From e17fdb5ddfdd4275e785bf4266653243e76e000d Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Wed, 10 Feb 2016 00:36:06 +0100
Subject: Add Top-Level Wrapper Makefile

Change-Id: Ie3431986ddb42db8d331fcb3d34250a6ec9d9a02
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100644 Makefile

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..b7c3e27f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,141 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+WS_ROOT=$(CURDIR)
+BR=$(WS_ROOT)/build-root
+CCACHE_DIR?=$(BR)/.ccache
+V?=0
+GDB?=gdb
+
+MINIMAL_STARTUP_CONF="unix { interactive } dpdk { no-pci socket-mem 1024 }"
+
+DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
+DEB_DEPENDS += debhelper dkms openjdk-7-jdk git libtool libganglia1-dev libapr1-dev
+DEB_DEPENDS += libconfuse-dev git-review
+
+
+.PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
+.PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
+
+help:
+	@echo "Make Targets:"
+	@echo " bootstrap           - prepare tree for build"
+	@echo " wipe                - wipe all products of debug build "
+	@echo " wipe-release        - wipe all products of release build "
+	@echo " build               - build debug binaries"
+	@echo " build-release       - build release binaries"
+	@echo " rebuild             - wipe and build debug binares"
+	@echo " rebuild-release     - wipe and build release binares"
+	@echo " run                 - run debug binary"
+	@echo " run-release         - run release binary"
+	@echo " debug               - run debug binary with debugger"
+	@echo " debug-release       - run release binary with debugger"
+	@echo " build-vat           - build vpp-api-test tool"
+	@echo " run-vat             - run vpp-api-test tool"
+	@echo " pkg-deb             - build DEB packages"
+	@echo " pkg-rpm             - build RPM packages"
+	@echo ""
+	@echo "Make Arguments:"
+	@echo " V=[0|1]             - set build verbosity level"
+	@echo " STARTUP_CONF=<path> - startup configuration file"
+	@echo "                       (e.g. /etc/vpp/startup.conf)"
+	@echo " GDB=<path>          - gdb binary to use for debugging"
+	@echo ""
+	@echo "Current Argumernt Values:"
+	@echo " V            = $(V)"
+	@echo " STARTUP_CONF = $(STARTUP_CONF)"
+	@echo " GDB          = $(GDB)"
+
+$(BR)/.bootstrap.ok:
+ifeq ("$(shell lsb_release -si)", "Ubuntu")
+	@MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
+	if [ -n "$$MISSING" ] ; then \
+	  echo "\nPlease install missing packages: \n$$MISSING\n" ; \
+	  exit 1 ; \
+	fi ; \
+	exit 0
+endif
+	@echo "SOURCE_PATH = $(WS_ROOT)"                   > $(BR)/build-config.mk
+	@echo "#!/bin/bash\n"                              > $(BR)/path_setup
+	@echo 'export PATH=$(BR)/tools/ccache-bin:$$PATH' >> $(BR)/path_setup
+	@echo 'export PATH=$(BR)/tools/bin:$$PATH'        >> $(BR)/path_setup
+	@echo 'export CCACHE_DIR=$(CCACHE_DIR)'           >> $(BR)/path_setup
+	
+ifeq ("$(wildcard /usr/bin/ccache )","")
+	@echo "WARNING: Please install ccache AYEC and re-run this script"
+else
+	@rm -rf $(BR)/tools/ccache-bin
+	@mkdir -p $(BR)/tools/ccache-bin
+	@ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/gcc
+	@ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/g++
+endif
+	@make -C $(BR) V=$(V) is_build_tool=yes vppapigen-install
+	@touch $@
+
+bootstrap: $(BR)/.bootstrap.ok
+
+define make
+	@make -C $(BR) V=$(V) PLATFORM=vpp TAG=$(1) $(2)
+endef
+
+build: $(BR)/.bootstrap.ok
+	$(call make,vpp_debug,vpp-install)
+
+wipe: $(BR)/.bootstrap.ok
+	$(call make,vpp_debug,vpp-wipe)
+
+rebuild: wipe build
+
+build-release: $(BR)/.bootstrap.ok
+	$(call make,vpp,vpp-install)
+
+wipe-release: $(BR)/.bootstrap.ok
+	$(call make,vpp,vpp-wipe)
+
+rebuild-release: wipe-release build-release
+
+ifeq ("$(wildcard $(STARTUP_CONF))","")
+define run
+	@echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
+	@echo "         Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
+	@sudo $(1) $(MINIMAL_STARTUP_CONF)
+endef
+else
+define run
+	@sudo $(1) -c $(STARTUP_CONF)
+endef
+endif
+
+run:
+	$(call run, $(BR)/install-vpp_debug-native/vpp/bin/vpp)
+
+run-release:
+	$(call run, $(BR)/install-vpp-native/vpp/bin/vpp)
+
+debug:
+	$(call run, $(GDB) --args $(BR)/install-vpp_debug-native/vpp/bin/vpp)
+
+debug-release:
+	$(call run, $(GDB) --args $(BR)/install-vpp-native/vpp/bin/vpp)
+
+build-vat:
+	$(call make,vpp_debug,vpp-api-test-install)
+
+run-vat:
+	@sudo $(BR)/install-vpp_debug-native/vpp-api-test/bin/vpp_api_test
+
+pkg-deb:
+	$(call make,vpp,install-deb)
+
+pkg-rpm:
+	$(call make,vpp,install-rpm)
-- 
cgit 1.2.3-korg


From eef4d99bcd0ad868145af76ca1ad2595ecc3ad19 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Tue, 23 Feb 2016 22:04:50 +0100
Subject: Few improvements in toplevel Makefile

Change-Id: I896aed32499cd7159c4b6f3b165cab4e579f6153
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b7c3e27f..35190a1c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,10 +19,15 @@ GDB?=gdb
 
 MINIMAL_STARTUP_CONF="unix { interactive } dpdk { no-pci socket-mem 1024 }"
 
+GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
+
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms openjdk-7-jdk git libtool libganglia1-dev libapr1-dev
 DEB_DEPENDS += libconfuse-dev git-review
 
+ifneq ("$(wildcard $(STARTUP_DIR)/startup.conf),"")
+        STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
+endif
 
 .PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
@@ -49,11 +54,15 @@ help:
 	@echo " V=[0|1]             - set build verbosity level"
 	@echo " STARTUP_CONF=<path> - startup configuration file"
 	@echo "                       (e.g. /etc/vpp/startup.conf)"
+	@echo " STARTUP_DIR=<path>  - startup drectory (e.g. /etc/vpp)"
+	@echo "                       It also sets STARTUP_CONF if"
+	@echo "                       startup.conf file is present"
 	@echo " GDB=<path>          - gdb binary to use for debugging"
 	@echo ""
 	@echo "Current Argumernt Values:"
 	@echo " V            = $(V)"
 	@echo " STARTUP_CONF = $(STARTUP_CONF)"
+	@echo " STARTUP_DIR  = $(STARTUP_DIR)"
 	@echo " GDB          = $(GDB)"
 
 $(BR)/.bootstrap.ok:
@@ -104,15 +113,16 @@ wipe-release: $(BR)/.bootstrap.ok
 
 rebuild-release: wipe-release build-release
 
+STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run
 	@echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
 	@echo "         Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
-	@sudo $(1) $(MINIMAL_STARTUP_CONF)
+	@cd $(STARTUP_DIR) && sudo $(1) $(MINIMAL_STARTUP_CONF)
 endef
 else
 define run
-	@sudo $(1) -c $(STARTUP_CONF)
+	@cd $(STARTUP_DIR) && sudo $(1) -c $(STARTUP_CONF)
 endef
 endif
 
@@ -123,10 +133,10 @@ run-release:
 	$(call run, $(BR)/install-vpp-native/vpp/bin/vpp)
 
 debug:
-	$(call run, $(GDB) --args $(BR)/install-vpp_debug-native/vpp/bin/vpp)
+	$(call run, $(GDB) $(GDB_ARGS) --args $(BR)/install-vpp_debug-native/vpp/bin/vpp)
 
 debug-release:
-	$(call run, $(GDB) --args $(BR)/install-vpp-native/vpp/bin/vpp)
+	$(call run, $(GDB) $(GDB_ARGS) --args $(BR)/install-vpp-native/vpp/bin/vpp)
 
 build-vat:
 	$(call make,vpp_debug,vpp-api-test-install)
-- 
cgit 1.2.3-korg


From ebb27fb4809a51711e05323faccb15165e610e10 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Thu, 25 Feb 2016 16:26:01 +0100
Subject: add install-dep target to toplevel Makefile

Change-Id: I9dbe6676086ef083729bec1774f544498d1ec3e5
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 35190a1c..024a1393 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,7 @@ endif
 help:
 	@echo "Make Targets:"
 	@echo " bootstrap           - prepare tree for build"
+	@echo " install-dep         - install software dependencies"
 	@echo " wipe                - wipe all products of debug build "
 	@echo " wipe-release        - wipe all products of release build "
 	@echo " build               - build debug binaries"
@@ -70,6 +71,7 @@ ifeq ("$(shell lsb_release -si)", "Ubuntu")
 	@MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
 	if [ -n "$$MISSING" ] ; then \
 	  echo "\nPlease install missing packages: \n$$MISSING\n" ; \
+	  echo "by executing \"make install-dep\"\n" ; \
 	  exit 1 ; \
 	fi ; \
 	exit 0
@@ -93,6 +95,13 @@ endif
 
 bootstrap: $(BR)/.bootstrap.ok
 
+install-dep:
+ifeq ("$(shell lsb_release -si)", "Ubuntu")
+	@sudo apt-get install $(DEB_DEPENDS)
+else
+	$(error "This option currently works only on Ubuntu systems")
+endif
+
 define make
 	@make -C $(BR) V=$(V) PLATFORM=vpp TAG=$(1) $(2)
 endef
-- 
cgit 1.2.3-korg


From e6f9023ff020cf8faacef17007a19de51e03e30d Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Wed, 16 Mar 2016 22:49:05 +0100
Subject: Few additions to top-level Makefile

* Added option to specify target platform (e.g. export PLATFORM=vpp_lite)
* Added ctags targed to (re)build ctags database
* Added cscope targed to (re)build cscope database

Change-Id: I93feb7b458abe9fbd93000f75b7be24e3865f089
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 48 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 14 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 024a1393..ee40bfeb 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ BR=$(WS_ROOT)/build-root
 CCACHE_DIR?=$(BR)/.ccache
 V?=0
 GDB?=gdb
+PLATFORM?=vpp
 
 MINIMAL_STARTUP_CONF="unix { interactive } dpdk { no-pci socket-mem 1024 }"
 
@@ -23,7 +24,7 @@ GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms openjdk-7-jdk git libtool libganglia1-dev libapr1-dev
-DEB_DEPENDS += libconfuse-dev git-review
+DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
 
 ifneq ("$(wildcard $(STARTUP_DIR)/startup.conf),"")
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
@@ -31,6 +32,7 @@ endif
 
 .PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
+.PHONY: ctags cscope
 
 help:
 	@echo "Make Targets:"
@@ -50,6 +52,8 @@ help:
 	@echo " run-vat             - run vpp-api-test tool"
 	@echo " pkg-deb             - build DEB packages"
 	@echo " pkg-rpm             - build RPM packages"
+	@echo " ctags               - (re)generate ctags database"
+	@echo " cscope              - (re)generate cscope database"
 	@echo ""
 	@echo "Make Arguments:"
 	@echo " V=[0|1]             - set build verbosity level"
@@ -59,12 +63,14 @@ help:
 	@echo "                       It also sets STARTUP_CONF if"
 	@echo "                       startup.conf file is present"
 	@echo " GDB=<path>          - gdb binary to use for debugging"
+	@echo " PLATFORM=<name>     - target platform. default is vpp"
 	@echo ""
 	@echo "Current Argumernt Values:"
 	@echo " V            = $(V)"
 	@echo " STARTUP_CONF = $(STARTUP_CONF)"
 	@echo " STARTUP_DIR  = $(STARTUP_DIR)"
 	@echo " GDB          = $(GDB)"
+	@echo " PLATFORM     = $(PLATFORM)"
 
 $(BR)/.bootstrap.ok:
 ifeq ("$(shell lsb_release -si)", "Ubuntu")
@@ -103,22 +109,22 @@ else
 endif
 
 define make
-	@make -C $(BR) V=$(V) PLATFORM=vpp TAG=$(1) $(2)
+	@make -C $(BR) V=$(V) PLATFORM=$(PLATFORM) TAG=$(1) $(2)
 endef
 
 build: $(BR)/.bootstrap.ok
-	$(call make,vpp_debug,vpp-install)
+	$(call make,$(PLATFORM)_debug,vpp-install)
 
 wipe: $(BR)/.bootstrap.ok
-	$(call make,vpp_debug,vpp-wipe)
+	$(call make,$(PLATFORM)_debug,vpp-wipe)
 
 rebuild: wipe build
 
 build-release: $(BR)/.bootstrap.ok
-	$(call make,vpp,vpp-install)
+	$(call make,$(PLATFORM),vpp-install)
 
 wipe-release: $(BR)/.bootstrap.ok
-	$(call make,vpp,vpp-wipe)
+	$(call make,$(PLATFORM),vpp-wipe)
 
 rebuild-release: wipe-release build-release
 
@@ -135,26 +141,40 @@ define run
 endef
 endif
 
+%.files: .FORCE
+	@find . \( -name '*\.[chyS]' -o -name '*\.java' -o -name '*\.lex' \) -and \
+		\( -not -path './build-root*' -o -path \
+		'./build-root/build-vpp_debug-native/dpdk*' \) > $@
+
+.FORCE:
+
 run:
-	$(call run, $(BR)/install-vpp_debug-native/vpp/bin/vpp)
+	$(call run, $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp)
 
 run-release:
-	$(call run, $(BR)/install-vpp-native/vpp/bin/vpp)
+	$(call run, $(BR)/install-$(PLATFORM)-native/vpp/bin/vpp)
 
 debug:
-	$(call run, $(GDB) $(GDB_ARGS) --args $(BR)/install-vpp_debug-native/vpp/bin/vpp)
+	$(call run, $(GDB) $(GDB_ARGS) --args $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp)
 
 debug-release:
-	$(call run, $(GDB) $(GDB_ARGS) --args $(BR)/install-vpp-native/vpp/bin/vpp)
+	$(call run, $(GDB) $(GDB_ARGS) --args $(BR)/install-$(PLATFORM)-native/vpp/bin/vpp)
 
 build-vat:
-	$(call make,vpp_debug,vpp-api-test-install)
+	$(call make,$(PLATFORM)_debug,vpp-api-test-install)
 
 run-vat:
-	@sudo $(BR)/install-vpp_debug-native/vpp-api-test/bin/vpp_api_test
+	@sudo $(BR)/install-$(PLATFORM)_debug-native/vpp-api-test/bin/vpp_api_test
 
 pkg-deb:
-	$(call make,vpp,install-deb)
+	$(call make,$(PLATFORM),install-deb)
 
 pkg-rpm:
-	$(call make,vpp,install-rpm)
+	$(call make,$(PLATFORM),install-rpm)
+
+ctags: ctags.files
+	@ctags --totals --tag-relative -L $<
+	@rm $<
+
+cscope: cscope.files
+	@cscope -b -q -v
-- 
cgit 1.2.3-korg


From 76a66c1f06db0386aff887de6cbd0687256fb17f Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Thu, 17 Mar 2016 20:37:27 -0700
Subject: Add -y to apt-get install for install-dep target

This allows install-dep to be run non-interactively

Change-Id: I5c3e55958ed16dd3d128bbad9f317d9f2428d41a
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ee40bfeb..9b387552 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,7 @@ bootstrap: $(BR)/.bootstrap.ok
 
 install-dep:
 ifeq ("$(shell lsb_release -si)", "Ubuntu")
-	@sudo apt-get install $(DEB_DEPENDS)
+	@sudo apt-get -y install $(DEB_DEPENDS)
 else
 	$(error "This option currently works only on Ubuntu systems")
 endif
-- 
cgit 1.2.3-korg


From 84eda9de0bb3798a86c2c1dac11dd861916a1615 Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Tue, 22 Mar 2016 16:09:29 -0500
Subject: Add build-root/*.rpm to .gitignore

Change-Id: I88398b5e538271efa4657851bf53c9b76a56b432
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 .gitignore |  1 +
 Makefile   | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/.gitignore b/.gitignore
index b2e2c62e..5d1a597a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 /build-root/path_setup
 /build-root/build-config.mk
 /build-root/*.deb
+/build-root/*.rpm
 /build-root/*.changes
 /build-config.mk
 /dpdk/*.tar.gz
diff --git a/Makefile b/Makefile
index 9b387552..109ed6d4 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,11 @@ DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms openjdk-7-jdk git libtool libganglia1-dev libapr1-dev
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
 
+RPM_DEPENDS_GROUPS = 'Development Tools'
+RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel
+RPM_DEPENDS += openssl-devel epel-release apr-devel
+EPEL_DEPENDS = libconfuse-devel ganglia-devel
+
 ifneq ("$(wildcard $(STARTUP_DIR)/startup.conf),"")
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
 endif
@@ -104,8 +109,12 @@ bootstrap: $(BR)/.bootstrap.ok
 install-dep:
 ifeq ("$(shell lsb_release -si)", "Ubuntu")
 	@sudo apt-get -y install $(DEB_DEPENDS)
+else ifneq ("$(wildcard /etc/redhat-release)","")
+	@sudo yum groupinstall -y $(RPM_DEPENDS_GROUPS)
+	@sudo yum install -y $(RPM_DEPENDS)
+	@sudo yum install -y --enablerepo=epel $(EPEL_DEPENDS)
 else
-	$(error "This option currently works only on Ubuntu systems")
+	$(error "This option currently works only on Ubuntu or Centos systems")
 endif
 
 define make
-- 
cgit 1.2.3-korg


From 3c79e65bd65d574b3f1fefb964101c1f2927369e Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Mon, 28 Mar 2016 14:53:19 -0500
Subject: Fix epl-release in make install-dep for rpm

Change-Id: I01a7421dc58ee6683eb84482bb92dd6a519a21e8
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 109ed6d4..a9b4d9ab 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
 
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel
-RPM_DEPENDS += openssl-devel epel-release apr-devel
+RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ("$(wildcard $(STARTUP_DIR)/startup.conf),"")
-- 
cgit 1.2.3-korg


From 0df78dda5ae1e1e082c2e0ea282ba5494c3d4b31 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Tue, 29 Mar 2016 22:37:02 +0200
Subject: Add DPDK 16.04-rc2 support

Can be used by specifying DPDK_VERSION=16.04-rc2 in the make command line

Change-Id: I657b44d7ca22f1ef57756e7703088020fab12bc6
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                              | 3 ++-
 dpdk/Makefile                         | 5 ++++-
 vnet/vnet/devices/virtio/vhost-user.h | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a9b4d9ab..31222caf 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
-ifneq ("$(wildcard $(STARTUP_DIR)/startup.conf),"")
+ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
 endif
 
@@ -76,6 +76,7 @@ help:
 	@echo " STARTUP_DIR  = $(STARTUP_DIR)"
 	@echo " GDB          = $(GDB)"
 	@echo " PLATFORM     = $(PLATFORM)"
+	@echo " DPDK_VERSION = $(DPDK_VERSION)"
 
 $(BR)/.bootstrap.ok:
 ifeq ("$(shell lsb_release -si)", "Ubuntu")
diff --git a/dpdk/Makefile b/dpdk/Makefile
index e6e2b5f8..316efc01 100644
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -29,6 +29,7 @@ DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.gz
 DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL)
 DPDK_2.1.0_TARBALL_MD5_CKSUM := 205a0d12bfd6eb717d57506272f43519
 DPDK_2.2.0_TARBALL_MD5_CKSUM := 22e2fd68cd5504f43fe9a5a6fd6dd938
+DPDK_16.04-rc2_TARBALL_MD5_CKSUM := a642985d2694d8cf8fdfdf0723be3406
 DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION)
 DPDK_TARGET := x86_64-native-linuxapp-gcc
 JOBS := $(shell grep processor /proc/cpuinfo | wc -l)
@@ -82,7 +83,7 @@ all: build
 
 $(B)/custom-config: $(B)/.patch.ok Makefile
 	@echo --- generating custom config from $(DPDK_SOURCE)/config/common_linuxapp ---
-	@cp $(DPDK_SOURCE)/config/common_linuxapp $@ 
+	@cpp -undef -ffreestanding -x assembler-with-cpp $(DPDK_SOURCE)/config/common_linuxapp $@
 	$(call set,RTE_MACHINE,$(DPDK_MACHINE))
 	$(call set,RTE_ARCH,"x86_64")
 	$(call set,RTE_ARCH_X86_64,y)
@@ -145,11 +146,13 @@ $(B)/.extract.ok: $(B)/.download.ok
 extract: $(B)/.extract.ok
 
 $(B)/.patch.ok: $(B)/.extract.ok
+ifneq ($(wildcard $(CURDIR)/dpdk-$(DPDK_VERSION)_patches/*.patch),)
 	@echo --- patching ---
 	for f in $(CURDIR)/dpdk-$(DPDK_VERSION)_patches/*.patch ; do \
 		echo Applying patch: $$(basename $$f) ; \
 		patch -p1 -d $(DPDK_SOURCE) < $$f ; \
 	done
+endif
 	@touch $@
 
 .PHONY: patch
diff --git a/vnet/vnet/devices/virtio/vhost-user.h b/vnet/vnet/devices/virtio/vhost-user.h
index be011165..d6d55731 100644
--- a/vnet/vnet/devices/virtio/vhost-user.h
+++ b/vnet/vnet/devices/virtio/vhost-user.h
@@ -78,11 +78,11 @@ typedef struct vhost_user_memory {
   vhost_user_memory_region_t regions[VHOST_MEMORY_MAX_NREGIONS];
 } vhost_user_memory_t;
 
-typedef struct vhost_vring_state { 
+typedef struct {
   unsigned int index, num;
 } vhost_vring_state_t;
 
-typedef struct vhost_vring_addr {
+typedef struct {
   unsigned int index, flags;
   u64 desc_user_addr, used_user_addr, avail_user_addr, log_guest_addr;
 } vhost_vring_addr_t;
-- 
cgit 1.2.3-korg


From 95db5635710ac3239d8bf400e74ef1a4ceca5bc9 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Mon, 11 Apr 2016 19:29:39 +0200
Subject: Fix dependency install on Ubuntu 16.04

Change-Id: I2a915a64c65ee78658ee782c0f16963024b8b2eb
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 31222caf..4641b720 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ MINIMAL_STARTUP_CONF="unix { interactive } dpdk { no-pci socket-mem 1024 }"
 GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
-DEB_DEPENDS += debhelper dkms openjdk-7-jdk git libtool libganglia1-dev libapr1-dev
+DEB_DEPENDS += debhelper dkms default-jdk git libtool libganglia1-dev libapr1-dev
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
 
 RPM_DEPENDS_GROUPS = 'Development Tools'
-- 
cgit 1.2.3-korg


From 7a2a378d2dcdba900651b02859b686cafe6dfd22 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Fri, 15 Apr 2016 20:24:55 +0200
Subject: dpdk socket-mem handling optimizations

 - introduces default socket-mem size of 512 MB per socket
 - default socket-mem value is applied to all discovered CPU sockets
 - fixes bug when < 1024 socket-mem parameter is specified
 - for socket-mem < 1024 code prefers 2 MB pages
 - improves handling of manualy specified socket-mem values

Change-Id: I9ef848108d7dd1228fbd82a5be49eb5277a93683
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                           |   2 +-
 vnet/vnet/devices/dpdk/dpdk_priv.h |   1 -
 vnet/vnet/devices/dpdk/init.c      | 147 ++++++++++++++++++++-----------------
 3 files changed, 82 insertions(+), 68 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 4641b720..b53941b4 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ V?=0
 GDB?=gdb
 PLATFORM?=vpp
 
-MINIMAL_STARTUP_CONF="unix { interactive } dpdk { no-pci socket-mem 1024 }"
+MINIMAL_STARTUP_CONF="unix { interactive }"
 
 GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
 
diff --git a/vnet/vnet/devices/dpdk/dpdk_priv.h b/vnet/vnet/devices/dpdk/dpdk_priv.h
index e284503e..a0fa38a4 100644
--- a/vnet/vnet/devices/dpdk/dpdk_priv.h
+++ b/vnet/vnet/devices/dpdk/dpdk_priv.h
@@ -45,7 +45,6 @@ _(force-ranks, r)
 _(huge-dir)                                     \
 _(proc-type)                                    \
 _(file-prefix)                                  \
-_(socket-mem)                                   \
 _(vdev)
 
 static inline u32
diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c
index 716377c1..58bc7a1e 100644
--- a/vnet/vnet/devices/dpdk/init.c
+++ b/vnet/vnet/devices/dpdk/init.c
@@ -783,38 +783,6 @@ dpdk_bind_devices_to_uio (dpdk_main_t * dm)
   vec_free (pci_addr);
 }
 
-static u32
-get_node_free_hugepages_num (u32 node, u32 page_size)
-{
-  FILE * fp;
-  u8 * tmp;
-
-  tmp = format (0, "/sys/devices/system/node/node%u/hugepages/hugepages-%ukB/"
-                "free_hugepages%c", node, page_size, 0);
-  fp = fopen ((char *) tmp, "r");
-  vec_free(tmp);
-
-  if (fp != NULL)
-    {
-      u8 * buffer = 0;
-      u32 pages_avail = 0;
-
-      vec_validate (buffer, 256-1);
-      if (fgets ((char *)buffer, 256, fp))
-        {
-          unformat_input_t in;
-          unformat_init_string (&in, (char *) buffer, strlen ((char *) buffer));
-          unformat(&in, "%u", &pages_avail);
-          unformat_free (&in);
-        }
-      vec_free(buffer);
-      fclose(fp);
-      return pages_avail;
-    }
-
-  return 0;
-}
-
 static clib_error_t *
 dpdk_config (vlib_main_t * vm, unformat_input_t * input)
 {
@@ -910,6 +878,8 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
         ;
       else if (unformat (input, "uio-driver %s", &dm->uio_driver_name))
 	;
+      else if (unformat (input, "socket-mem %s", &socket_mem))
+	;
       else if (unformat (input, "vhost-user-coalesce-frames %d", &dm->vhost_coalesce_frames))
         ;
       else if (unformat (input, "vhost-user-coalesce-time %f", &dm->vhost_coalesce_time))
@@ -937,8 +907,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
               huge_dir = 1;                           \
             else if (!strncmp(#a, "file-prefix", 11)) \
               file_prefix = 1;                        \
-            else if (!strncmp(#a, "socket-mem", 10))  \
-              socket_mem = vec_dup (s);               \
 	    tmp = format (0, "--%s%c", #a, 0);	      \
 	    vec_add1 (dm->eal_init_args, tmp);	      \
 	    vec_add1 (s, 0);			      \
@@ -982,56 +950,97 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
     }
 
   if (!dm->uio_driver_name)
-    dm->uio_driver_name = format (0, "igb_uio");
+    dm->uio_driver_name = format (0, "igb_uio%c", 0);
 
   /*
    * Use 1G huge pages if available.
    */
   if (!no_huge && !huge_dir)
     {
-      uword * mem_by_socket = hash_create (0, sizeof (uword));
-      uword c;
+      u32 x, * mem_by_socket = 0;
+      uword c = 0;
       u8 use_1g = 1;
       u8 use_2m = 1;
+      u8 less_than_1g = 1;
       int rv;
 
       umount(DEFAULT_HUGE_DIR);
 
       /* Process "socket-mem" parameter value */
       if (vec_len (socket_mem))
-        {
-          unformat_input_t in;
-          unformat_init_vector(&in, socket_mem);
-          unformat(&in, "%U", unformat_socket_mem, &mem_by_socket);
-          unformat_free(&in);
-        }
+	{
+	  unformat_input_t in;
+	  unformat_init_vector(&in, socket_mem);
+	  while (unformat_check_input (&in) != UNFORMAT_END_OF_INPUT)
+	    {
+	      if (unformat (&in, "%u,", &x))
+		;
+	      else if (unformat (&in, "%u", &x))
+		;
+	      else if (unformat (&in, ","))
+		x = 0;
+	      else
+		break;
+
+	      vec_add1(mem_by_socket, x);
+
+	      if (x > 1023)
+		less_than_1g = 0;
+	    }
+	  unformat_free(&in);
+	}
       else
-        use_1g = 0;
+	{
+	  clib_bitmap_foreach (c, tm->cpu_socket_bitmap, (
+	    {
+	      vec_validate(mem_by_socket, c);
+	      mem_by_socket[c] = 512; /* default per-socket mem */
+	    }
+	  ));
+	}
 
       /* check if available enough 1GB pages for each socket */
-      clib_bitmap_foreach (c, tm->cpu_socket_bitmap, ({
-         uword * p = hash_get (mem_by_socket, c);
-         if (p)
-           {
-             u32 mem = p[0];
-             if (mem)
-               {
-                 u32 pages_num_1g = mem / 1024;
-                 u32 pages_num_2m = mem / 2;
-                 u32 pages_avail;
-
-                 pages_avail = get_node_free_hugepages_num(c, 1048576);
-                 if (!pages_avail || !(pages_avail >= pages_num_1g))
-                   use_1g = 0;
-
-                 pages_avail = get_node_free_hugepages_num(c, 2048);
-                 if (!pages_avail || !(pages_avail >= pages_num_2m))
-                   use_2m = 0;
-              }
-           }
+      clib_bitmap_foreach (c, tm->cpu_socket_bitmap, (
+        {
+	  u32 pages_avail, page_size, mem;
+	  u8 *s = 0;
+	  char * path = "/sys/devices/system/node/node%u/hugepages/"
+			"hugepages-%ukB/free_hugepages%c";
+
+	  vec_validate(mem_by_socket, c);
+	  mem = mem_by_socket[c];
+
+	  page_size = 1024;
+	  pages_avail = 0;
+	  s = format (s, path, c, page_size * 1024, 0);
+	  read_sys_fs ((char *) s, "%u", &pages_avail);
+	  vec_reset_length (s);
+
+	  if (page_size * pages_avail < mem)
+	    use_1g = 0;
+
+	  page_size = 2;
+	  pages_avail = 0;
+	  s = format (s, path, c, page_size * 1024, 0);
+	  read_sys_fs ((char *) s, "%u", &pages_avail);
+	  vec_reset_length (s);
+
+	  if (page_size * pages_avail < mem)
+	    use_2m = 0;
+
+	  vec_free(s);
       }));
+      _vec_len (mem_by_socket) = c + 1;
 
-      hash_free (mem_by_socket);
+      /* regenerate socket_mem string */
+      vec_free (socket_mem);
+      vec_foreach_index (x, mem_by_socket)
+	socket_mem = format (socket_mem, "%s%u",
+			     socket_mem ? "," : "",
+			     mem_by_socket[x]);
+      socket_mem = format (socket_mem, "%c", 0);
+
+      vec_free (mem_by_socket);
 
       rv = mkdir(VPP_RUN_DIR, 0755);
       if (rv && errno != EEXIST)
@@ -1049,7 +1058,7 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
           goto done;
         }
 
-      if (use_1g)
+      if (use_1g && !(less_than_1g && use_2m))
         {
           rv = mount("none", DEFAULT_HUGE_DIR, "hugetlbfs", 0, "pagesize=1G");
         }
@@ -1156,6 +1165,12 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
   tmp = format (0, "%u%c", tm->main_lcore, 0);
   vec_add1 (dm->eal_init_args, tmp);
 
+  /* set socket-mem */
+  tmp = format (0, "--socket-mem%c", 0);
+  vec_add1 (dm->eal_init_args, tmp);
+  tmp = format (0, "%s%c", socket_mem, 0);
+  vec_add1 (dm->eal_init_args, tmp);
+
   /* NULL terminate the "argv" vector, in case of stupidity */
   vec_add1 (dm->eal_init_args, 0);
   _vec_len(dm->eal_init_args) -= 1;
-- 
cgit 1.2.3-korg


From 6855f6cdfee8c479f1e0ae440ce87a91ff41a708 Mon Sep 17 00:00:00 2001
From: Ole Troan <ot@cisco.com>
Date: Sat, 9 Apr 2016 03:16:30 +0200
Subject: Python-API: Inital commit of Python bindings for the VPP API. See:
 https://wiki.fd.io/view/VPP/Python_API

Change-Id: If135fc32208c7031787e1935b399d930e0e1ea1f
Signed-off-by: Ole Troan <ot@cisco.com>
---
 Makefile                                           |     2 +-
 build-data/packages/vpp-api.mk                     |    23 +
 build-data/packages/vpp-japi.mk                    |    23 -
 build-data/platforms/virl.mk                       |     2 +-
 build-data/platforms/vpp.mk                        |     2 +-
 build-data/platforms/vpp_lite.mk                   |     2 +-
 vlib-api/vlibmemory/api.h                          |     7 +
 vlib-api/vlibmemory/memory_shared.c                |    14 +-
 vnet/vnet/map/examples/test_map.py                 |   141 +
 vpp-api/Makefile.am                                |     2 +
 vpp-api/configure.ac                               |    15 +
 vpp-api/java/Makefile.am                           |    93 +
 vpp-api/java/configure.ac                          |    19 +
 .../japi/org/openvpp/vppjapi/vppApiCallbacks.java  |    35 +
 .../openvpp/vppjapi/vppBridgeDomainDetails.java    |    30 +
 .../vppjapi/vppBridgeDomainInterfaceDetails.java   |    21 +
 vpp-api/java/japi/org/openvpp/vppjapi/vppConn.java |   237 +
 .../japi/org/openvpp/vppjapi/vppIPv4Address.java   |    26 +
 .../japi/org/openvpp/vppjapi/vppIPv6Address.java   |    27 +
 .../org/openvpp/vppjapi/vppInterfaceCounters.java  |    77 +
 .../org/openvpp/vppjapi/vppInterfaceDetails.java   |    71 +
 .../java/japi/org/openvpp/vppjapi/vppL2Fib.java    |    35 +
 .../java/japi/org/openvpp/vppjapi/vppVersion.java  |    31 +
 .../org/openvpp/vppjapi/vppVxlanTunnelDetails.java |    33 +
 vpp-api/java/japi/test/demo.java                   |   170 +
 vpp-api/java/japi/test/vppApi.java                 |    52 +
 vpp-api/java/japi/vppjni.c                         |  1900 ++++
 vpp-api/java/japi/vppjni.h                         |   308 +
 vpp-api/java/japi/vppjni_bridge_domain.h           |   510 +
 vpp-api/java/japi/vppjni_env.c                     |   111 +
 vpp-api/java/japi/vppjni_env.h                     |   118 +
 vpp-api/java/m4/ax_check_java_home.m4              |    80 +
 vpp-api/java/m4/ax_check_java_plugin.m4            |   101 +
 vpp-api/java/m4/ax_java_check_class.m4             |    85 +
 vpp-api/java/m4/ax_java_options.m4                 |    48 +
 vpp-api/java/m4/ax_libgcj_jar.m4                   |    83 +
 vpp-api/java/m4/ax_prog_jar.m4                     |    49 +
 vpp-api/java/m4/ax_prog_java.m4                    |   115 +
 vpp-api/java/m4/ax_prog_java_cc.m4                 |   104 +
 vpp-api/java/m4/ax_prog_java_works.m4              |   134 +
 vpp-api/java/m4/ax_prog_javac.m4                   |    79 +
 vpp-api/java/m4/ax_prog_javac_works.m4             |    72 +
 vpp-api/java/m4/ax_prog_javadoc.m4                 |    50 +
 vpp-api/java/m4/ax_prog_javah.m4                   |    64 +
 vpp-api/java/m4/ax_try_compile_java.m4             |    55 +
 vpp-api/java/m4/ax_try_run_java.m4                 |    56 +
 vpp-api/python/Makefile.am                         |    49 +
 vpp-api/python/README.rst                          |     0
 vpp-api/python/pneum/api-gen.py                    |   337 +
 vpp-api/python/pneum/pneum.c                       |   239 +
 vpp-api/python/pneum/pneum.h                       |    24 +
 vpp-api/python/pneum/test_pneum.c                  |   136 +
 vpp-api/python/setup.py                            |    21 +
 vpp-api/python/tests/test_papi.py                  |   125 +
 vpp-api/python/vpp_papi/__init__.py                |     2 +
 vpp-api/python/vpp_papi/pneum_wrap.c               |   120 +
 vpp-japi/Makefile.am                               |    93 -
 vpp-japi/configure.ac                              |    19 -
 .../japi/org/openvpp/vppjapi/vppApiCallbacks.java  |    35 -
 .../openvpp/vppjapi/vppBridgeDomainDetails.java    |    30 -
 .../vppjapi/vppBridgeDomainInterfaceDetails.java   |    21 -
 vpp-japi/japi/org/openvpp/vppjapi/vppConn.java     |   237 -
 .../japi/org/openvpp/vppjapi/vppIPv4Address.java   |    26 -
 .../japi/org/openvpp/vppjapi/vppIPv6Address.java   |    27 -
 .../org/openvpp/vppjapi/vppInterfaceCounters.java  |    77 -
 .../org/openvpp/vppjapi/vppInterfaceDetails.java   |    71 -
 vpp-japi/japi/org/openvpp/vppjapi/vppL2Fib.java    |    35 -
 vpp-japi/japi/org/openvpp/vppjapi/vppVersion.java  |    31 -
 .../org/openvpp/vppjapi/vppVxlanTunnelDetails.java |    33 -
 vpp-japi/japi/test/demo.java                       |   170 -
 vpp-japi/japi/test/vppApi.java                     |    52 -
 vpp-japi/japi/vppjni.c                             |  1900 ----
 vpp-japi/japi/vppjni.h                             |   308 -
 vpp-japi/japi/vppjni_bridge_domain.h               |   510 -
 vpp-japi/japi/vppjni_env.c                         |   111 -
 vpp-japi/japi/vppjni_env.h                         |   118 -
 vpp-japi/libtool                                   | 10083 -------------------
 vpp-japi/m4/ax_check_java_home.m4                  |    80 -
 vpp-japi/m4/ax_check_java_plugin.m4                |   101 -
 vpp-japi/m4/ax_java_check_class.m4                 |    85 -
 vpp-japi/m4/ax_java_options.m4                     |    48 -
 vpp-japi/m4/ax_libgcj_jar.m4                       |    83 -
 vpp-japi/m4/ax_prog_jar.m4                         |    49 -
 vpp-japi/m4/ax_prog_java.m4                        |   115 -
 vpp-japi/m4/ax_prog_java_cc.m4                     |   104 -
 vpp-japi/m4/ax_prog_java_works.m4                  |   134 -
 vpp-japi/m4/ax_prog_javac.m4                       |    79 -
 vpp-japi/m4/ax_prog_javac_works.m4                 |    72 -
 vpp-japi/m4/ax_prog_javadoc.m4                     |    50 -
 vpp-japi/m4/ax_prog_javah.m4                       |    64 -
 vpp-japi/m4/ax_try_compile_java.m4                 |    55 -
 vpp-japi/m4/ax_try_run_java.m4                     |    56 -
 vpp/api/api.c                                      |    18 +-
 vppapigen/lex.c                                    |    33 +-
 vppapigen/node.c                                   |    59 +-
 vppapigen/node.h                                   |     1 +
 96 files changed, 6428 insertions(+), 15210 deletions(-)
 create mode 100644 build-data/packages/vpp-api.mk
 delete mode 100644 build-data/packages/vpp-japi.mk
 create mode 100755 vnet/vnet/map/examples/test_map.py
 create mode 100644 vpp-api/Makefile.am
 create mode 100644 vpp-api/configure.ac
 create mode 100644 vpp-api/java/Makefile.am
 create mode 100644 vpp-api/java/configure.ac
 create mode 100644 vpp-api/java/japi/org/openvpp/vppjapi/vppApiCallbacks.java
 create mode 100644 vpp-api/java/japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java
 create mode 100644 vpp-api/java/japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java
 create mode 100644 vpp-api/java/japi/org/openvpp/vppjapi/vppConn.java
 create mode 100644 vpp-api/java/japi/org/openvpp/vppjapi/vppIPv4Address.java
 create mode 100644 vpp-api/java/japi/org/openvpp/vppjapi/vppIPv6Address.java
 create mode 100644 vpp-api/java/japi/org/openvpp/vppjapi/vppInterfaceCounters.java
 create mode 100644 vpp-api/java/japi/org/openvpp/vppjapi/vppInterfaceDetails.java
 create mode 100644 vpp-api/java/japi/org/openvpp/vppjapi/vppL2Fib.java
 create mode 100644 vpp-api/java/japi/org/openvpp/vppjapi/vppVersion.java
 create mode 100644 vpp-api/java/japi/org/openvpp/vppjapi/vppVxlanTunnelDetails.java
 create mode 100644 vpp-api/java/japi/test/demo.java
 create mode 100644 vpp-api/java/japi/test/vppApi.java
 create mode 100644 vpp-api/java/japi/vppjni.c
 create mode 100644 vpp-api/java/japi/vppjni.h
 create mode 100644 vpp-api/java/japi/vppjni_bridge_domain.h
 create mode 100644 vpp-api/java/japi/vppjni_env.c
 create mode 100644 vpp-api/java/japi/vppjni_env.h
 create mode 100644 vpp-api/java/m4/ax_check_java_home.m4
 create mode 100644 vpp-api/java/m4/ax_check_java_plugin.m4
 create mode 100644 vpp-api/java/m4/ax_java_check_class.m4
 create mode 100644 vpp-api/java/m4/ax_java_options.m4
 create mode 100644 vpp-api/java/m4/ax_libgcj_jar.m4
 create mode 100644 vpp-api/java/m4/ax_prog_jar.m4
 create mode 100644 vpp-api/java/m4/ax_prog_java.m4
 create mode 100644 vpp-api/java/m4/ax_prog_java_cc.m4
 create mode 100644 vpp-api/java/m4/ax_prog_java_works.m4
 create mode 100644 vpp-api/java/m4/ax_prog_javac.m4
 create mode 100644 vpp-api/java/m4/ax_prog_javac_works.m4
 create mode 100644 vpp-api/java/m4/ax_prog_javadoc.m4
 create mode 100644 vpp-api/java/m4/ax_prog_javah.m4
 create mode 100644 vpp-api/java/m4/ax_try_compile_java.m4
 create mode 100644 vpp-api/java/m4/ax_try_run_java.m4
 create mode 100644 vpp-api/python/Makefile.am
 create mode 100644 vpp-api/python/README.rst
 create mode 100755 vpp-api/python/pneum/api-gen.py
 create mode 100644 vpp-api/python/pneum/pneum.c
 create mode 100644 vpp-api/python/pneum/pneum.h
 create mode 100644 vpp-api/python/pneum/test_pneum.c
 create mode 100644 vpp-api/python/setup.py
 create mode 100755 vpp-api/python/tests/test_papi.py
 create mode 100644 vpp-api/python/vpp_papi/__init__.py
 create mode 100644 vpp-api/python/vpp_papi/pneum_wrap.c
 delete mode 100644 vpp-japi/Makefile.am
 delete mode 100644 vpp-japi/configure.ac
 delete mode 100644 vpp-japi/japi/org/openvpp/vppjapi/vppApiCallbacks.java
 delete mode 100644 vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java
 delete mode 100644 vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java
 delete mode 100644 vpp-japi/japi/org/openvpp/vppjapi/vppConn.java
 delete mode 100644 vpp-japi/japi/org/openvpp/vppjapi/vppIPv4Address.java
 delete mode 100644 vpp-japi/japi/org/openvpp/vppjapi/vppIPv6Address.java
 delete mode 100644 vpp-japi/japi/org/openvpp/vppjapi/vppInterfaceCounters.java
 delete mode 100644 vpp-japi/japi/org/openvpp/vppjapi/vppInterfaceDetails.java
 delete mode 100644 vpp-japi/japi/org/openvpp/vppjapi/vppL2Fib.java
 delete mode 100644 vpp-japi/japi/org/openvpp/vppjapi/vppVersion.java
 delete mode 100644 vpp-japi/japi/org/openvpp/vppjapi/vppVxlanTunnelDetails.java
 delete mode 100644 vpp-japi/japi/test/demo.java
 delete mode 100644 vpp-japi/japi/test/vppApi.java
 delete mode 100644 vpp-japi/japi/vppjni.c
 delete mode 100644 vpp-japi/japi/vppjni.h
 delete mode 100644 vpp-japi/japi/vppjni_bridge_domain.h
 delete mode 100644 vpp-japi/japi/vppjni_env.c
 delete mode 100644 vpp-japi/japi/vppjni_env.h
 delete mode 100755 vpp-japi/libtool
 delete mode 100644 vpp-japi/m4/ax_check_java_home.m4
 delete mode 100644 vpp-japi/m4/ax_check_java_plugin.m4
 delete mode 100644 vpp-japi/m4/ax_java_check_class.m4
 delete mode 100644 vpp-japi/m4/ax_java_options.m4
 delete mode 100644 vpp-japi/m4/ax_libgcj_jar.m4
 delete mode 100644 vpp-japi/m4/ax_prog_jar.m4
 delete mode 100644 vpp-japi/m4/ax_prog_java.m4
 delete mode 100644 vpp-japi/m4/ax_prog_java_cc.m4
 delete mode 100644 vpp-japi/m4/ax_prog_java_works.m4
 delete mode 100644 vpp-japi/m4/ax_prog_javac.m4
 delete mode 100644 vpp-japi/m4/ax_prog_javac_works.m4
 delete mode 100644 vpp-japi/m4/ax_prog_javadoc.m4
 delete mode 100644 vpp-japi/m4/ax_prog_javah.m4
 delete mode 100644 vpp-japi/m4/ax_try_compile_java.m4
 delete mode 100644 vpp-japi/m4/ax_try_run_java.m4

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b53941b4..68652836 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ endif
 	@echo 'export PATH=$(BR)/tools/ccache-bin:$$PATH' >> $(BR)/path_setup
 	@echo 'export PATH=$(BR)/tools/bin:$$PATH'        >> $(BR)/path_setup
 	@echo 'export CCACHE_DIR=$(CCACHE_DIR)'           >> $(BR)/path_setup
-	
+
 ifeq ("$(wildcard /usr/bin/ccache )","")
 	@echo "WARNING: Please install ccache AYEC and re-run this script"
 else
diff --git a/build-data/packages/vpp-api.mk b/build-data/packages/vpp-api.mk
new file mode 100644
index 00000000..f1841648
--- /dev/null
+++ b/build-data/packages/vpp-api.mk
@@ -0,0 +1,23 @@
+vpp-api_configure_depend =			\
+	vppinfra-install			\
+	svm-install				\
+	vlib-api-install			\
+	vlib-install				\
+	vnet-install				\
+	vpp-install
+
+vpp-api_CPPFLAGS = $(call installed_includes_fn,	\
+	vppinfra					\
+	svm						\
+	vlib						\
+	vlib-api					\
+	vnet						\
+	vpp)
+
+vpp-api_LDFLAGS = $(call installed_libs_fn,	\
+	vppinfra				\
+	svm					\
+	vlib					\
+	vlib-api)
+
+vpp-api_CPPFLAGS += -I/usr/lib/jvm/java-7-openjdk-amd64/include
diff --git a/build-data/packages/vpp-japi.mk b/build-data/packages/vpp-japi.mk
deleted file mode 100644
index 6f69baa0..00000000
--- a/build-data/packages/vpp-japi.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-vpp-japi_configure_depend =			\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
-	vpp-install
-
-vpp-japi_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra					\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp)
-
-vpp-japi_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra				\
-	svm					\
-	vlib					\
-	vlib-api)
-
-vpp-japi_CPPFLAGS += -I/usr/lib/jvm/java-7-openjdk-amd64/include
diff --git a/build-data/platforms/virl.mk b/build-data/platforms/virl.mk
index f47f3691..3d5274a8 100644
--- a/build-data/platforms/virl.mk
+++ b/build-data/platforms/virl.mk
@@ -18,7 +18,7 @@ virl_native_tools = vppapigen
 virl_uses_dpdk = yes
 
 virl_root_packages = vpp vlib vlib-api vnet svm dpdk vpp-api-test \
-	vpp-japi 
+	vpp-api 
 
 vpp_configure_args_virl = --with-dpdk
 vnet_configure_args_virl = --with-dpdk --with-virl
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 04a697d3..c381be19 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -21,7 +21,7 @@ vpp_uses_dpdk = yes
 # vpp_enable_tests = yes
 
 vpp_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \
-	vpp-japi gmod
+	vpp-api gmod
 
 vpp_configure_args_vpp = --with-dpdk
 vnet_configure_args_vpp = --with-dpdk
diff --git a/build-data/platforms/vpp_lite.mk b/build-data/platforms/vpp_lite.mk
index 9376aa35..4183700e 100644
--- a/build-data/platforms/vpp_lite.mk
+++ b/build-data/platforms/vpp_lite.mk
@@ -18,7 +18,7 @@ vpp_lite_native_tools = vppapigen
 vpp_lite_uses_dpdk = no
 
 vpp_lite_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \
-	vpp-japi gmod
+	vpp-api gmod
 
 vlib_configure_args_vpp_lite = --with-pre-data=128
 
diff --git a/vlib-api/vlibmemory/api.h b/vlib-api/vlibmemory/api.h
index 117bf433..516d321f 100644
--- a/vlib-api/vlibmemory/api.h
+++ b/vlib-api/vlibmemory/api.h
@@ -86,6 +86,13 @@ typedef struct vl_shmem_hdr_ {
 
 } vl_shmem_hdr_t;
 
+/* Note that the size of the structure is 16 bytes, with 4 bytes of padding after data[0]. */
+typedef struct msgbuf_ {
+    unix_shared_memory_queue_t *q;
+    u32 data_len;
+    u8 data[0];
+} msgbuf_t;
+
 #define VL_SHM_VERSION 2
 
 #define VL_API_EPOCH_MASK 0xFF
diff --git a/vlib-api/vlibmemory/memory_shared.c b/vlib-api/vlibmemory/memory_shared.c
index ecd5cff7..a3219431 100644
--- a/vlib-api/vlibmemory/memory_shared.c
+++ b/vlib-api/vlibmemory/memory_shared.c
@@ -21,6 +21,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <unistd.h>
 #include <signal.h>
@@ -38,11 +39,6 @@
 #include <vlibmemory/vl_memory_api_h.h>
 #undef vl_typedefs
 
-typedef struct msgbuf_ {
-    unix_shared_memory_queue_t *q;
-    u8 data[0];
-} msgbuf_t;
-
 static inline void *vl_msg_api_alloc_internal(int nbytes, int pool)
 {
     int i;
@@ -119,12 +115,13 @@ static inline void *vl_msg_api_alloc_internal(int nbytes, int pool)
 
     pthread_mutex_lock (&am->vlib_rp->mutex);
     oldheap = svm_push_data_heap (am->vlib_rp);
-    rv = clib_mem_alloc(nbytes + sizeof(msgbuf_t));
+    rv = clib_mem_alloc(nbytes);
     rv->q = 0;
     svm_pop_heap (oldheap);
     pthread_mutex_unlock (&am->vlib_rp->mutex);
 
  out:
+    rv->data_len = htonl(nbytes - sizeof(msgbuf_t));
     return(rv->data);
 }
 
@@ -152,7 +149,8 @@ void vl_msg_api_free(void *a)
     void *oldheap;
     api_main_t *am = &api_main;
     
-    rv = (msgbuf_t *)(((u8 *)a) - sizeof(*rv));
+    rv = (msgbuf_t *)(((u8 *)a) - offsetof(msgbuf_t, data));
+
     /*
      * Here's the beauty of the scheme.  Only one proc/thread has
      * control of a given message buffer. To free a buffer, we just clear the 
@@ -176,7 +174,7 @@ static void vl_msg_api_free_nolock (void *a)
     void *oldheap;
     api_main_t *am = &api_main;
     
-    rv = (msgbuf_t *)(((u8 *)a) - sizeof(*rv));
+    rv = (msgbuf_t *)(((u8 *)a) - offsetof(msgbuf_t, data));
     /*
      * Here's the beauty of the scheme.  Only one proc/thread has
      * control of a given message buffer. To free a buffer, we just clear the 
diff --git a/vnet/vnet/map/examples/test_map.py b/vnet/vnet/map/examples/test_map.py
new file mode 100755
index 00000000..21388d49
--- /dev/null
+++ b/vnet/vnet/map/examples/test_map.py
@@ -0,0 +1,141 @@
+#!/usr/bin/env python
+
+import time,argparse,sys,cmd, unittest
+from ipaddress import *
+
+parser = argparse.ArgumentParser(description='VPP MAP test')
+parser.add_argument('-i', nargs='*', action="store", dest="inputdir")
+args = parser.parse_args()
+
+for dir in args.inputdir:
+    sys.path.append(dir)
+from vpp_papi import *
+
+#
+# 1:1 Shared IPv4 address, shared BR (16) VPP CLI
+#
+def lw46_shared(ip4_pfx_str, ip6_pfx_str, ip6_src_str, ea_bits_len, psid_offset, psid_len, ip6_src_ecmp = False):
+    ip4_pfx = ip_network(ip4_pfx_str)
+    ip6_src = ip_address(ip6_src_str)
+    ip6_dst = ip_network(ip6_pfx_str)
+    ip6_nul = IPv6Address(u'0::0')
+    mod = ip4_pfx.num_addresses / 1024
+
+    for i in range(ip4_pfx.num_addresses):
+        a = time.clock()
+        t = map_add_domain(0, ip6_nul.packed, ip4_pfx[i].packed, ip6_src.packed, 0, 32, 128, ea_bits_len, psid_offset, psid_len, 0, 0)
+        #print "Return from map_add_domain", t
+        if t == None:
+            print "map_add_domain failed"
+            continue
+        if t.retval != 0:
+            print "map_add_domain failed", t
+            continue
+        for psid in range(0x1 << int(psid_len)):
+            r = map_add_del_rule(0, t.index, 1, (ip6_dst[(i * (0x1<<int(psid_len))) + psid]).packed, psid)
+            #print "Return from map_add_del_rule", r
+
+        if ip6_src_ecmp and not i % mod:
+            ip6_src = ip6_src + 1
+
+        print "Running time:", time.clock() - a
+
+class TestMAP(unittest.TestCase):
+    '''
+    def test_delete_all(self):
+        t = map_domain_dump(0)
+        self.assertNotEqual(t, None)
+        print "Number of domains configured: ", len(t)
+        for d in t:
+            ts = map_del_domain(0, d.domainindex)
+            self.assertNotEqual(ts, None)
+        t = map_domain_dump(0)
+        self.assertNotEqual(t, None)
+        print "Number of domains configured: ", len(t)
+        self.assertEqual(len(t), 0)
+
+    '''
+
+    def test_a_million_rules(self):
+        ip4_pfx = u'192.0.2.0/24'
+        ip6_pfx = u'2001:db8::/32'
+        ip6_src = u'2001:db8::1'
+        psid_offset = 6
+        psid_len = 6
+        ea_bits_len = 0
+        lw46_shared(ip4_pfx, ip6_pfx, ip6_src, ea_bits_len, psid_offset, psid_len)
+
+#
+# RX thread, that should sit on blocking vpe_api_read()
+
+# 
+
+
+#
+#
+#
+import threading
+class RXThread (threading.Thread):
+    def __init__(self):
+        threading.Thread.__init__(self)
+
+    def run(self):
+        print "Starting "
+        i = 0
+        while True:
+            msg = vpe_api_read()
+            if msg:
+                #print msg
+                id = unpack('>H', msg[0:2])
+                size = unpack('>H', msg[2:4])
+                print "Received", id, "of size", size
+                i += 1
+                #del msg
+                continue
+
+            #time.sleep(0.001)
+        return
+
+# Create RX thread
+rxthread = RXThread()
+rxthread.setDaemon(True)
+        
+print "Connect", connect_to_vpe("client124")
+import timeit
+rxthread.start()
+print "After thread started"
+
+#pneum_kill_thread()
+print "After thread killed"
+
+#t = show_version(0)
+#print "Result from show version", t
+
+print timeit.timeit('t = show_version(0)', number=1000, setup="from __main__ import show_version")
+time.sleep(10)
+#print timeit.timeit('control_ping(0)', number=10, setup="from __main__ import control_ping")
+
+
+disconnect_from_vpe()
+sys.exit()
+
+
+print t.program, t.version,t.builddate,t.builddirectory
+
+'''
+
+t = map_domain_dump(0)
+if not t:
+    print('show map domain failed')
+
+for d in t:
+    print("IP6 prefix:",str(IPv6Address(d.ip6prefix)))
+    print( "IP4 prefix:",str(IPv4Address(d.ip4prefix)))
+'''
+
+suite = unittest.TestLoader().loadTestsFromTestCase(TestMAP)
+unittest.TextTestRunner(verbosity=2).run(suite)
+
+disconnect_from_vpe()
+
+
diff --git a/vpp-api/Makefile.am b/vpp-api/Makefile.am
new file mode 100644
index 00000000..5b326540
--- /dev/null
+++ b/vpp-api/Makefile.am
@@ -0,0 +1,2 @@
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = java python
diff --git a/vpp-api/configure.ac b/vpp-api/configure.ac
new file mode 100644
index 00000000..31ee6656
--- /dev/null
+++ b/vpp-api/configure.ac
@@ -0,0 +1,15 @@
+AC_INIT(vpp-api, 1.0.0)
+LT_INIT
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_SUBDIRS([java])
+AM_INIT_AUTOMAKE
+AM_SILENT_RULES
+
+AM_PROG_AS
+AC_PROG_CC
+AM_PROG_CC_C_O
+
+AC_OUTPUT([python/Makefile])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+
diff --git a/vpp-api/java/Makefile.am b/vpp-api/java/Makefile.am
new file mode 100644
index 00000000..0e16b72b
--- /dev/null
+++ b/vpp-api/java/Makefile.am
@@ -0,0 +1,93 @@
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+AUTOMAKE_OPTIONS = foreign subdir-objects
+ACLOCAL_AMFLAGS = -I m4
+AM_CFLAGS = -Wall 
+
+noinst_PROGRAMS = 
+BUILT_SOURCES =
+bin_PROGRAMS = 
+CLEANFILES = 
+lib_LTLIBRARIES = 
+
+nobase_include_HEADERS =		\
+  japi/org_openvpp_vppjapi_vppApi.h	\
+  japi/org_openvpp_vppjapi_vppConn.h
+
+lib_LTLIBRARIES += libvppjni.la
+
+libvppjni_la_SOURCES = japi/vppjni.c japi/vppapi.c japi/vppjni_env.h japi/vppjni_env.c
+libvppjni_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
+	              -lpthread -lm -lrt
+libvppjni_la_LDFLAGS = -module
+libvppjni_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+
+jarfile = vppjapi-$(PACKAGE_VERSION).jar
+packagedir = org/openvpp/vppjapi
+JAVAROOT = .
+
+$(jarfile): libvppjni.la
+	cd .libs ; $(JAR) cf $(JARFLAGS) ../$@ libvppjni.so.0.0.0 ../$(packagedir)/*.class ; cd ..
+
+BUILT_SOURCES += japi/org_openvpp_vppjapi_vppConn.h japi/vppapi.c 
+
+japi/org_openvpp_vppjapi_vppConn.h: 					\
+    japi/org/openvpp/vppjapi/vppVersion.java 				\
+    japi/org/openvpp/vppjapi/vppInterfaceDetails.java 			\
+    japi/org/openvpp/vppjapi/vppInterfaceCounters.java 			\
+    japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java 		\
+    japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java	\
+    japi/org/openvpp/vppjapi/vppL2Fib.java 				\
+    japi/org/openvpp/vppjapi/vppIPv4Address.java 			\
+    japi/org/openvpp/vppjapi/vppIPv6Address.java 			\
+    japi/org/openvpp/vppjapi/vppVxlanTunnelDetails.java 		\
+    japi/org/openvpp/vppjapi/vppConn.java 				\
+    japi/org/openvpp/vppjapi/vppApiCallbacks.java 			\
+    ../../vpp/api/vpe.api.h
+	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppVersion.java ;				\
+	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppVersion ;						\
+	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppInterfaceDetails.java ;			\
+	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppInterfaceDetails ;					\
+	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppInterfaceCounters.java ;		\
+	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppInterfaceCounters ;				\
+	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java ;	\
+	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppBridgeDomainInterfaceDetails ;			\
+	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java ;		\
+	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppBridgeDomainDetails ;				\
+	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppL2Fib.java ;				\
+	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppL2Fib ;						\
+	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppIPv4Address.java ;			\
+	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppIPv4Address ;					\
+	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppIPv6Address.java ;			\
+	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppIPv6Address ;					\
+	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppVxlanTunnelDetails.java ;		\
+	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppVxlanTunnelDetails ;				\
+	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppConn.java ;				\
+	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppConn ;
+
+japi/vppapi.c: japi/org_openvpp_vppjapi_vppConn.h
+	pushd .. ; dir=`pwd` ; popd ;								\
+	instdir=`echo $${dir} | sed -e 's:build-root/build:build-root/install:'` ;		\
+	vppapigen --input $${instdir}/../vpp/api/vpe.api --jni  japi/vppapi.c --app vpe ;	\
+	vppapigen --input $${instdir}/../vpp/api/vpe.api --java japi/vppApi.java --app vpe ;	\
+	$(JAVAC) -classpath . -d . japi/vppApi.java ;						\
+	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppApi ;				\
+	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppApiCallbacks.java ;	\
+	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppApiCallbacks ;
+
+demo = japi/test/demo.class
+$(demo): $(jarfile)
+	$(JAVAC) -cp $(jarfile) -d $(JAVAROOT) @srcdir@/japi/test/demo.java
+
+all-local: $(jarfile) $(demo)
diff --git a/vpp-api/java/configure.ac b/vpp-api/java/configure.ac
new file mode 100644
index 00000000..1607061d
--- /dev/null
+++ b/vpp-api/java/configure.ac
@@ -0,0 +1,19 @@
+AC_INIT(vpp-japi, 1.0.0)
+LT_INIT
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE
+AM_SILENT_RULES
+
+AM_PROG_AS
+AC_PROG_CC
+AM_PROG_CC_C_O
+
+AX_PROG_JAVAC
+AX_PROG_JAVAH
+AX_PROG_JAR
+AX_PROG_JAVADOC
+AX_PROG_JAVA
+AX_CHECK_JAVA_HOME
+
+AC_OUTPUT([Makefile])
+
diff --git a/vpp-api/java/japi/org/openvpp/vppjapi/vppApiCallbacks.java b/vpp-api/java/japi/org/openvpp/vppjapi/vppApiCallbacks.java
new file mode 100644
index 00000000..df5b9533
--- /dev/null
+++ b/vpp-api/java/japi/org/openvpp/vppjapi/vppApiCallbacks.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+import java.io.IOException;
+import org.openvpp.vppjapi.vppApi;
+
+public abstract class vppApiCallbacks extends vppApi {
+     public vppApiCallbacks(String clientName) throws IOException {
+         super(clientName);
+     }
+/* Disabled!
+ *
+ * public abstract void interfaceDetails(
+            int ifIndex, String interfaceName, int supIfIndex, byte[] physAddr,
+            byte adminUp, byte linkUp, byte linkDuplex, byte linkSpeed,
+            int subId, byte subDot1ad, byte subNumberOfTags, int subOuterVlanId, int subInnerVlanId,
+            byte subExactMatch, byte subDefault, byte subOuterVlanIdAny, byte subInnerVlanIdAny,
+            int vtrOp, int vtrPushDot1q, int vtrTag1, int vtrTag2);
+ */
+
+}
diff --git a/vpp-api/java/japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java b/vpp-api/java/japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java
new file mode 100644
index 00000000..db859a07
--- /dev/null
+++ b/vpp-api/java/japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+import org.openvpp.vppjapi.vppBridgeDomainInterfaceDetails;
+
+public final class vppBridgeDomainDetails {
+    public String name;
+    public int bdId;
+    public boolean flood;
+    public boolean uuFlood;
+    public boolean forward;
+    public boolean learn;
+    public boolean arpTerm;
+    public String bviInterfaceName;
+    public vppBridgeDomainInterfaceDetails[] interfaces;
+}
diff --git a/vpp-api/java/japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java b/vpp-api/java/japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java
new file mode 100644
index 00000000..ab99ee45
--- /dev/null
+++ b/vpp-api/java/japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+public final class vppBridgeDomainInterfaceDetails {
+    public String interfaceName;
+    public byte splitHorizonGroup;
+}
diff --git a/vpp-api/java/japi/org/openvpp/vppjapi/vppConn.java b/vpp-api/java/japi/org/openvpp/vppjapi/vppConn.java
new file mode 100644
index 00000000..3e8c12a9
--- /dev/null
+++ b/vpp-api/java/japi/org/openvpp/vppjapi/vppConn.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.Set;
+
+import org.openvpp.vppjapi.vppVersion;
+import org.openvpp.vppjapi.vppInterfaceDetails;
+import org.openvpp.vppjapi.vppInterfaceCounters;
+import org.openvpp.vppjapi.vppBridgeDomainDetails;
+import org.openvpp.vppjapi.vppIPv4Address;
+import org.openvpp.vppjapi.vppIPv6Address;
+import org.openvpp.vppjapi.vppVxlanTunnelDetails;
+
+public class vppConn implements AutoCloseable {
+    private static final String LIBNAME = "libvppjni.so.0.0.0";
+
+    static {
+        try {
+            loadLibrary();
+        } catch (Exception e) {
+            System.out.printf("Can't find vpp jni library: %s\n", LIBNAME);
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
+    private static void loadStream(final InputStream is) throws IOException {
+        final Set<PosixFilePermission> perms = PosixFilePermissions.fromString("rwxr-x---");
+        final Path p = Files.createTempFile(LIBNAME, null, PosixFilePermissions.asFileAttribute(perms));
+        try {
+            Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
+
+            try {
+                Runtime.getRuntime().load(p.toString());
+            } catch (UnsatisfiedLinkError e) {
+                throw new IOException(String.format("Failed to load library %s", p), e);
+            }
+        } finally {
+            try {
+                Files.deleteIfExists(p);
+            } catch (IOException e) {
+            }
+        }
+    }
+
+    private static void loadLibrary() throws IOException {
+      try (final InputStream is = vppConn.class.getResourceAsStream('/' + LIBNAME)) {
+          if (is == null) {
+              throw new IOException(String.format("Failed to open library resource %s",
+                                                LIBNAME));
+          }
+          loadStream(is);
+        }
+    }
+
+    private static vppConn currentConnection = null;
+    private final String clientName;
+    private volatile boolean disconnected = false;
+
+    // Hidden on purpose to prevent external instantiation
+    vppConn(final String clientName) throws IOException {
+        this.clientName = clientName;
+
+        synchronized (vppConn.class) {
+            if (currentConnection != null) {
+                throw new IOException("Already connected as " + currentConnection.clientName);
+            }
+
+            final int ret = clientConnect(clientName);
+            if (ret != 0) {
+                throw new IOException("Connection returned error " + ret);
+            }
+
+            currentConnection = this;
+        }
+    }
+
+    @Override
+    public synchronized final void close() {
+        if (!disconnected) {
+            disconnected = true;
+
+            synchronized (vppConn.class) {
+                clientDisconnect();
+                currentConnection = null;
+            }
+        }
+    }
+
+    /**
+     * Check if this instance is connected.
+     *
+     * @throws IllegalStateException if this instance was disconnected.
+     */
+    protected final void checkConnected() {
+        if (disconnected) {
+            throw new IllegalStateException("Disconnected client " + clientName);
+        }
+    }
+
+    public final int getRetval(int context, int release) {
+        checkConnected();
+        return getRetval0(context, release);
+    }
+
+    public final String getInterfaceList (String nameFilter) {
+        checkConnected();
+        return getInterfaceList0(nameFilter);
+    }
+
+    public final int swIfIndexFromName (String interfaceName) {
+        checkConnected();
+        return swIfIndexFromName0(interfaceName);
+    }
+
+    public final String interfaceNameFromSwIfIndex (int swIfIndex) {
+        checkConnected();
+        return interfaceNameFromSwIfIndex0(swIfIndex);
+    }
+
+    public final void clearInterfaceTable () {
+        checkConnected();
+        clearInterfaceTable0();
+    }
+
+    public final vppInterfaceDetails[] swInterfaceDump (byte nameFilterValid, byte [] nameFilter) {
+        checkConnected();
+        return swInterfaceDump0(nameFilterValid, nameFilter);
+    }
+
+    public final int bridgeDomainIdFromName(String bridgeDomain) {
+        checkConnected();
+        return bridgeDomainIdFromName0(bridgeDomain);
+    }
+
+    public final int findOrAddBridgeDomainId(String bridgeDomain) {
+        checkConnected();
+        return findOrAddBridgeDomainId0(bridgeDomain);
+    }
+
+    public final vppVersion getVppVersion() {
+        checkConnected();
+        return getVppVersion0();
+    }
+
+    public final vppInterfaceCounters getInterfaceCounters(int swIfIndex) {
+        checkConnected();
+        return getInterfaceCounters0(swIfIndex);
+    }
+
+    public final int[] bridgeDomainDump(int bdId) {
+        checkConnected();
+        return bridgeDomainDump0(bdId);
+    }
+
+    public final vppBridgeDomainDetails getBridgeDomainDetails(int bdId) {
+        checkConnected();
+        return getBridgeDomainDetails0(bdId);
+    }
+
+    public final vppL2Fib[] l2FibTableDump(int bdId) {
+        checkConnected();
+        return l2FibTableDump0(bdId);
+    }
+
+    public final int bridgeDomainIdFromInterfaceName(String interfaceName) {
+        checkConnected();
+        return bridgeDomainIdFromInterfaceName0(interfaceName);
+    }
+
+    public final vppIPv4Address[] ipv4AddressDump(String interfaceName) {
+        checkConnected();
+        return ipv4AddressDump0(interfaceName);
+    }
+
+    public final vppIPv6Address[] ipv6AddressDump(String interfaceName) {
+        checkConnected();
+        return ipv6AddressDump0(interfaceName);
+    }
+
+    public final vppVxlanTunnelDetails[] vxlanTunnelDump(int swIfIndex) {
+        checkConnected();
+        return vxlanTunnelDump0(swIfIndex);
+    }
+
+    public final int setInterfaceDescription(String ifName, String ifDesc) {
+        checkConnected();
+        return setInterfaceDescription0(ifName, ifDesc);
+    }
+
+    public final String getInterfaceDescription(String ifName) {
+        checkConnected();
+        return getInterfaceDescription0(ifName);
+    }
+
+    private static native int clientConnect(String clientName);
+    private static native void clientDisconnect();
+    private static native int getRetval0(int context, int release);
+    private static native String getInterfaceList0(String nameFilter);
+    private static native int swIfIndexFromName0(String interfaceName);
+    private static native String interfaceNameFromSwIfIndex0(int swIfIndex);
+    private static native void clearInterfaceTable0();
+    private static native vppInterfaceDetails[] swInterfaceDump0(byte nameFilterValid, byte [] nameFilter);
+    private static native int bridgeDomainIdFromName0(String bridgeDomain);
+    private static native int findOrAddBridgeDomainId0(String bridgeDomain);
+    private static native vppVersion getVppVersion0();
+    private static native vppInterfaceCounters getInterfaceCounters0(int swIfIndex);
+    private static native int[] bridgeDomainDump0(int bdId);
+    private static native vppBridgeDomainDetails getBridgeDomainDetails0(int bdId);
+    private static native vppL2Fib[] l2FibTableDump0(int bdId);
+    private static native int bridgeDomainIdFromInterfaceName0(String interfaceName);
+    private static native vppIPv4Address[] ipv4AddressDump0(String interfaceName);
+    private static native vppIPv6Address[] ipv6AddressDump0(String interfaceName);
+    private static native vppVxlanTunnelDetails[] vxlanTunnelDump0(int swIfIndex);
+    private static native int setInterfaceDescription0(String ifName, String ifDesc);
+    private static native String getInterfaceDescription0(String ifName);
+}
diff --git a/vpp-api/java/japi/org/openvpp/vppjapi/vppIPv4Address.java b/vpp-api/java/japi/org/openvpp/vppjapi/vppIPv4Address.java
new file mode 100644
index 00000000..046ceab5
--- /dev/null
+++ b/vpp-api/java/japi/org/openvpp/vppjapi/vppIPv4Address.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+public final class vppIPv4Address {
+    public final int ip;
+    public final byte prefixLength;
+
+    public vppIPv4Address(int ip, byte prefixLength) {
+        this.ip = ip;
+        this.prefixLength = prefixLength;
+    }
+}
diff --git a/vpp-api/java/japi/org/openvpp/vppjapi/vppIPv6Address.java b/vpp-api/java/japi/org/openvpp/vppjapi/vppIPv6Address.java
new file mode 100644
index 00000000..6690a5db
--- /dev/null
+++ b/vpp-api/java/japi/org/openvpp/vppjapi/vppIPv6Address.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+public class vppIPv6Address {
+    // FIXME: this is dangerous
+    public final byte[] ip;
+    public final byte prefixLength;
+
+    public vppIPv6Address(byte[] ip, byte prefixLength) {
+        this.ip = ip;
+        this.prefixLength = prefixLength;
+    }
+}
diff --git a/vpp-api/java/japi/org/openvpp/vppjapi/vppInterfaceCounters.java b/vpp-api/java/japi/org/openvpp/vppjapi/vppInterfaceCounters.java
new file mode 100644
index 00000000..b2687fb8
--- /dev/null
+++ b/vpp-api/java/japi/org/openvpp/vppjapi/vppInterfaceCounters.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+public final class vppInterfaceCounters {
+
+    public final long rxOctets;
+    public final long rxIp4;
+    public final long rxIp6;
+    public final long rxUnicast;
+    public final long rxMulticast;
+    public final long rxBroadcast;
+    public final long rxDiscard;
+    public final long rxFifoFull;
+    public final long rxError;
+    public final long rxUnknownProto;
+    public final long rxMiss;
+
+    public final long txOctets;
+    public final long txIp4;
+    public final long txIp6;
+    public final long txUnicast;
+    public final long txMulticast;
+    public final long txBroadcast;
+    public final long txDiscard;
+    public final long txFifoFull;
+    public final long txError;
+    public final long txUnknownProto;
+    public final long txMiss;
+
+    public vppInterfaceCounters(
+            long rxOctets, long rxIp4, long rxIp6, long rxUni, long rxMulti,
+            long rxBcast, long rxDiscard, long rxFifoFull, long rxError,
+            long rxUnknownProto, long rxMiss,
+            long txOctets, long txIp4, long txIp6, long txUni, long txMulti,
+            long txBcast, long txDiscard, long txFifoFull, long txError,
+            long txUnknownProto, long txMiss)
+    {
+        this.rxOctets = rxOctets;
+        this.rxIp4 = rxIp4;
+        this.rxIp6 = rxIp6;
+        this.rxUnicast = rxUni;
+        this.rxMulticast = rxMulti;
+        this.rxBroadcast = rxBcast;
+        this.rxDiscard = rxDiscard;
+        this.rxFifoFull = rxFifoFull;
+        this.rxError = rxError;
+        this.rxUnknownProto = rxUnknownProto;
+        this.rxMiss = rxMiss;
+
+        this.txOctets = txOctets;
+        this.txIp4 = txIp4;
+        this.txIp6 = txIp6;
+        this.txUnicast = txUni;
+        this.txMulticast = txMulti;
+        this.txBroadcast = txBcast;
+        this.txDiscard = txDiscard;
+        this.txFifoFull = txFifoFull;
+        this.txError = txError;
+        this.txUnknownProto = txUnknownProto;
+        this.txMiss = txMiss;
+    }
+}
+
diff --git a/vpp-api/java/japi/org/openvpp/vppjapi/vppInterfaceDetails.java b/vpp-api/java/japi/org/openvpp/vppjapi/vppInterfaceDetails.java
new file mode 100644
index 00000000..742dd25a
--- /dev/null
+++ b/vpp-api/java/japi/org/openvpp/vppjapi/vppInterfaceDetails.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+public final class vppInterfaceDetails {
+    public final int ifIndex;
+    public final String interfaceName;
+    public final int supIfIndex;
+    // FIXME: this is dangerous
+    public final byte[] physAddr;
+    public final byte adminUp;
+    public final byte linkUp;
+    public final byte linkDuplex;
+    public final byte linkSpeed;
+    public final int subId;
+    public final byte subDot1ad;
+    public final byte subNumberOfTags;
+    public final int subOuterVlanId;
+    public final int subInnerVlanId;
+    public final byte subExactMatch;
+    public final byte subDefault;
+    public final byte subOuterVlanIdAny;
+    public final byte subInnerVlanIdAny;
+    public final int vtrOp;
+    public final int vtrPushDot1q;
+    public final int vtrTag1;
+    public final int vtrTag2;
+    public final int linkMtu;
+
+    public vppInterfaceDetails(int ifIndex, String interfaceName, int supIfIndex, byte[] physAddr, byte adminUp,
+            byte linkUp, byte linkDuplex, byte linkSpeed, int subId, byte subDot1ad, byte subNumberOfTags,
+            int subOuterVlanId, int subInnerVlanId, byte subExactMatch, byte subDefault, byte subOuterVlanIdAny,
+            byte subInnerVlanIdAny, int vtrOp, int vtrPushDot1q, int vtrTag1, int vtrTag2, int linkMtu)
+    {
+        this.ifIndex = ifIndex;
+        this.interfaceName = interfaceName;
+        this.supIfIndex = supIfIndex;
+        this.physAddr = physAddr;
+        this.adminUp = adminUp;
+        this.linkUp = linkUp;
+        this.linkDuplex = linkDuplex;
+        this.linkSpeed = linkSpeed;
+        this.subId = subId;
+        this.subDot1ad = subDot1ad;
+        this.subNumberOfTags = subNumberOfTags;
+        this.subOuterVlanId = subOuterVlanId;
+        this.subInnerVlanId = subInnerVlanId;
+        this.subExactMatch = subExactMatch;
+        this.subDefault = subDefault;
+        this.subOuterVlanIdAny = subOuterVlanIdAny;
+        this.subInnerVlanIdAny = subInnerVlanIdAny;
+        this.vtrOp = vtrOp;
+        this.vtrPushDot1q = vtrPushDot1q;
+        this.vtrTag1 = vtrTag1;
+        this.vtrTag2 = vtrTag2;
+        this.linkMtu = linkMtu;
+    }
+}
diff --git a/vpp-api/java/japi/org/openvpp/vppjapi/vppL2Fib.java b/vpp-api/java/japi/org/openvpp/vppjapi/vppL2Fib.java
new file mode 100644
index 00000000..b38d801e
--- /dev/null
+++ b/vpp-api/java/japi/org/openvpp/vppjapi/vppL2Fib.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+public final class vppL2Fib {
+    // FIXME: this is dangerous
+    public final byte[] physAddress;
+    public final boolean staticConfig;
+    public final String outgoingInterface;
+    public final boolean filter;
+    public final boolean bridgedVirtualInterface;
+
+    public vppL2Fib(byte[] physAddress, boolean staticConfig,
+            String outgoingInterface, boolean filter,
+            boolean bridgedVirtualInterface) {
+        this.physAddress = physAddress;
+        this.staticConfig = staticConfig;
+        this.outgoingInterface = outgoingInterface;
+        this.filter = filter;
+        this.bridgedVirtualInterface = bridgedVirtualInterface;
+    }
+}
diff --git a/vpp-api/java/japi/org/openvpp/vppjapi/vppVersion.java b/vpp-api/java/japi/org/openvpp/vppjapi/vppVersion.java
new file mode 100644
index 00000000..6408dee2
--- /dev/null
+++ b/vpp-api/java/japi/org/openvpp/vppjapi/vppVersion.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+public final class vppVersion {
+    public final String programName;
+    public final String buildDirectory;
+    public final String gitBranch;
+    public final String buildDate;
+
+    public vppVersion(String progName, String buildDir, String gitBranch, String buildDate) {
+        this.programName = progName;
+        this.buildDirectory = buildDir;
+        this.gitBranch = gitBranch;
+        this.buildDate = buildDate;
+    }
+}
+
diff --git a/vpp-api/java/japi/org/openvpp/vppjapi/vppVxlanTunnelDetails.java b/vpp-api/java/japi/org/openvpp/vppjapi/vppVxlanTunnelDetails.java
new file mode 100644
index 00000000..dd81e98c
--- /dev/null
+++ b/vpp-api/java/japi/org/openvpp/vppjapi/vppVxlanTunnelDetails.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+public final class vppVxlanTunnelDetails {
+    public final int srcAddress;
+    public final int dstAddress;
+    public final int encapVrfId;
+    public final int vni;
+    public final int decapNextIndex;
+
+    public vppVxlanTunnelDetails(int srcAddress, int dstAddress,
+            int encapVrfId, int vni, int decapNextIndex) {
+        this.srcAddress = srcAddress;
+        this.dstAddress = dstAddress;
+        this.encapVrfId = encapVrfId;
+        this.vni = vni;
+        this.decapNextIndex = decapNextIndex;
+    }
+}
diff --git a/vpp-api/java/japi/test/demo.java b/vpp-api/java/japi/test/demo.java
new file mode 100644
index 00000000..ea1db84b
--- /dev/null
+++ b/vpp-api/java/japi/test/demo.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.openvpp.vppjapi.*;
+
+public class demo {
+    public static void main (String[] args) throws Exception {
+        vppApi api = new vppApi ("JavaTest");
+        System.out.printf ("Connected OK...");
+
+        String intlist;
+        int [] contexts;
+        int i, limit;
+        int trips;
+        int rv, errors, saved_error;
+        long before, after;
+
+        if (false)
+        {
+            intlist = api.getInterfaceList ("");
+            System.out.printf ("Unfiltered interface list:\n%s", intlist);
+            
+            trips = 0;
+            
+            contexts = new int[6];
+            
+            for (i = 0; i < 6; i++)
+            {
+                contexts[i] = api.swInterfaceSetFlags 
+                    (5 + i /* sw_if_index */,
+                     (byte)1 /* admin_up */,
+                     (byte)1 /* link_up (ignored) */,
+                     (byte)0 /* deleted */);
+            }
+            
+            /* Thread.sleep (1); */
+            errors = 0;
+            saved_error = 0;
+            
+            for (i = 0; i < 6; i ++)
+            {
+                while (true)
+                {
+                    rv = api.getRetval (contexts[i], 1 /* release */);
+                    if (rv != -77)
+                        break;
+                    Thread.sleep (1);
+                    trips++;
+                }
+                if (rv < 0)
+                {
+                    saved_error = rv;
+                    errors++;
+                }
+            }
+            
+            if (errors == 0)
+                System.out.printf ("intfcs up...\n");
+            else
+                System.out.printf 
+                    ("%d errors, last error %d...\n", errors, saved_error);
+        }
+        
+        limit = 250000;
+        saved_error = 0;
+        errors = 0;
+        contexts = new int [limit];
+        byte [] address = new byte [4];
+        byte [] zeros = new byte [4];
+
+        address[0] = (byte)192;
+        address[1] = (byte)168;
+        address[2] = (byte)2;
+        address[3] = (byte)1;
+
+        for (i = 0; i < 4; i++)
+            zeros[i] = 0;
+
+        System.out.printf ("start %d route ops ...", limit);
+
+        before = System.currentTimeMillis();
+
+        for (i = 0; i < limit; i++) {
+            contexts[i] = api.ipAddDelRoute 
+                (0 /* int nextHopSwIfIndex */, 
+                 0 /* int vrfId */, 
+                 0 /* int lookupInVrf */, 
+                 0 /* int resolveAttempts */, 
+                 0 /* int classifyTableIndex */, 
+                 (byte)0 /* byte createVrfIfNeeded */, 
+                 (byte)0 /* byte resolveIfNeeded */, 
+                 (byte)1 /* byte isAdd */, 
+                 (byte)1 /* byte isDrop */, 
+                 (byte)0 /* byte isIpv6 */, 
+                 (byte)0 /* byte isLocal */, 
+                 (byte)0 /* byte isClassify */, 
+                 (byte)0 /* byte isMultipath */, 
+                 (byte)0 /* byte notLast */, 
+                 (byte)0 /* byte nextHopWeight */, 
+                 (byte)32 /* byte dstAddressLength */, 
+                 address, 
+                 zeros);
+            
+            address[3] += 1;
+            if (address[3] == 0)
+            {
+                address[2] += 1;
+                if (address[2] == 0)
+                {
+                    address[1] += 1;
+                    {
+                        if (address[1] == 0)
+                        {
+                            address[0] += 1;
+                        }
+                    }
+                }
+            }
+        }
+
+        trips = 0;
+                        
+        for (i = 0; i < limit; i++)
+        {
+            while (true)
+            {
+                rv = api.getRetval (contexts[i], 1 /* release */);
+                if (rv != -77)
+                    break;
+                Thread.sleep (1);
+                trips++;
+            }
+            if (rv < 0)
+            {
+                saved_error = rv;
+                errors++;
+            }
+        }
+
+        after = System.currentTimeMillis();
+
+
+        if (errors == 0)
+            System.out.printf ("done %d route ops (all OK)...\n", limit);
+        else
+            System.out.printf 
+                ("%d errors, last error %d...\n", errors, saved_error);
+        
+        System.out.printf ("result in %d trips\n", trips);
+
+        System.out.printf ("%d routes in %d milliseconds, %d routes/msec\n",
+                           limit, after - before, 
+                           limit / (after - before));
+
+        api.close();
+        System.out.printf ("Done...\n");
+    }
+}
diff --git a/vpp-api/java/japi/test/vppApi.java b/vpp-api/java/japi/test/vppApi.java
new file mode 100644
index 00000000..87af3292
--- /dev/null
+++ b/vpp-api/java/japi/test/vppApi.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.net.InetAddress;
+import org.openvpp.vppjapi.*;
+
+public class vppApi {
+
+    native int controlPing();
+    native void test (byte[] array, byte[] array2);
+
+    public static void main (String[] args) throws Exception {
+        vppConn api = new vppConn ();
+        String ipv6 = "db01::feed";
+        String ipv4 = "192.168.1.1";
+        InetAddress addr6 = InetAddress.getByName(ipv6);
+        InetAddress addr4 = InetAddress.getByName(ipv4);
+        byte[] ip4bytes = addr4.getAddress();
+        byte[] ip6bytes = addr6.getAddress();
+        int rv;
+
+        api.test(ip4bytes,ip6bytes);
+
+        rv = api.clientConnect ("JavaTest");
+        if (rv == 0)
+            System.out.printf ("Connected OK...");
+        else
+        {
+            System.out.printf ("clientConnect returned %d\n", rv);
+            System.exit (1);
+        }
+        rv = api.controlPing();
+        System.out.printf ("data plane pid is %d\n", rv);
+
+        Thread.sleep (5000);
+
+        api.clientDisconnect();
+        System.out.printf ("Done...\n");
+    }
+}
diff --git a/vpp-api/java/japi/vppjni.c b/vpp-api/java/japi/vppjni.c
new file mode 100644
index 00000000..9c9437d2
--- /dev/null
+++ b/vpp-api/java/japi/vppjni.c
@@ -0,0 +1,1900 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define _GNU_SOURCE /* for strcasestr(3) */
+#include <vnet/vnet.h>
+
+#define vl_api_version(n,v) static u32 vpe_api_version = (v);
+#include <api/vpe.api.h>
+#undef vl_api_version
+
+#include <jni.h>
+#include <japi/vppjni.h>
+#include <japi/vppjni_bridge_domain.h>
+#include <japi/vppjni_env.h>
+#include <japi/org_openvpp_vppjapi_vppConn.h>
+#include <japi/org_openvpp_vppjapi_vppApi.h>
+
+#include <api/vpe_msg_enum.h>
+#define vl_typedefs             /* define message structures */
+#include <api/vpe_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun
+#include <api/vpe_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <api/vpe_all_api_h.h>
+#undef vl_printfun
+
+#define VPPJNI_DEBUG 0
+
+#if VPPJNI_DEBUG == 1
+  #define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
+#else
+  #define DEBUG_LOG(...)
+#endif
+
+static int connect_to_vpe(char *name);
+
+/*
+ * The Java runtime isn't compile w/ -fstack-protector,
+ * so we have to supply missing external references for the
+ * regular vpp libraries. Weak reference in case folks get religion
+ * at a later date...
+ */
+void __stack_chk_guard (void) __attribute__((weak));
+void __stack_chk_guard (void) {  }
+
+BIND_JAPI_CLASS(vppBridgeDomainDetails, "()V");
+BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, arpTerm);
+BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, flood);
+BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, forward);
+BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, learn);
+BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, uuFlood);
+BIND_JAPI_INT_FIELD(vppBridgeDomainDetails, bdId);
+BIND_JAPI_STRING_FIELD(vppBridgeDomainDetails, name);
+BIND_JAPI_STRING_FIELD(vppBridgeDomainDetails, bviInterfaceName);
+BIND_JAPI_OBJ_FIELD(vppBridgeDomainDetails, interfaces, "[Lorg/openvpp/vppjapi/vppBridgeDomainInterfaceDetails;");
+
+BIND_JAPI_CLASS(vppBridgeDomainInterfaceDetails, "()V");
+BIND_JAPI_BYTE_FIELD(vppBridgeDomainInterfaceDetails, splitHorizonGroup);
+BIND_JAPI_STRING_FIELD(vppBridgeDomainInterfaceDetails, interfaceName);
+
+BIND_JAPI_CLASS(vppInterfaceCounters, "(JJJJJJJJJJJJJJJJJJJJJJ)V");
+BIND_JAPI_CLASS(vppInterfaceDetails, "(ILjava/lang/String;I[BBBBBIBBIIBBBBIIIII)V");
+BIND_JAPI_CLASS(vppIPv4Address, "(IB)V");
+BIND_JAPI_CLASS(vppIPv6Address, "([BB)V");
+BIND_JAPI_CLASS(vppL2Fib, "([BZLjava/lang/String;ZZ)V");
+BIND_JAPI_CLASS(vppVersion, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+BIND_JAPI_CLASS(vppVxlanTunnelDetails, "(IIIII)V");
+
+void vl_client_add_api_signatures (vl_api_memclnt_create_t *mp)
+{
+    /*
+     * Send the main API signature in slot 0. This bit of code must
+     * match the checks in ../vpe/api/api.c: vl_msg_api_version_check().
+     */
+    mp->api_versions[0] = clib_host_to_net_u32 (vpe_api_version);
+}
+
+/* Note: non-static, called once to set up the initial intfc table */
+static int sw_interface_dump (vppjni_main_t * jm)
+{
+    vl_api_sw_interface_dump_t *mp;
+    f64 timeout;
+    hash_pair_t * p;
+    name_sort_t * nses = 0, * ns;
+    sw_interface_subif_t * sub = NULL;
+
+    /* Toss the old name table */
+    hash_foreach_pair (p, jm->sw_if_index_by_interface_name,
+    ({
+        vec_add2 (nses, ns, 1);
+        ns->name = (u8 *)(p->key);
+        ns->value = (u32) p->value[0];
+    }));
+
+    hash_free (jm->sw_if_index_by_interface_name);
+
+    vec_foreach (ns, nses)
+        vec_free (ns->name);
+
+    vec_free (nses);
+
+    vec_foreach (sub, jm->sw_if_subif_table) {
+        vec_free (sub->interface_name);
+    }
+    vec_free (jm->sw_if_subif_table);
+
+    /* recreate the interface name hash table */
+    jm->sw_if_index_by_interface_name
+      = hash_create_string (0, sizeof(uword));
+
+    /* Get list of ethernets */
+    M(SW_INTERFACE_DUMP, sw_interface_dump);
+    mp->name_filter_valid = 1;
+    strncpy ((char *) mp->name_filter, "Ether", sizeof(mp->name_filter-1));
+    S;
+
+    /* and local / loopback interfaces */
+    M(SW_INTERFACE_DUMP, sw_interface_dump);
+    mp->name_filter_valid = 1;
+    strncpy ((char *) mp->name_filter, "lo", sizeof(mp->name_filter-1));
+    S;
+
+    /* and vxlan tunnel interfaces */
+    M(SW_INTERFACE_DUMP, sw_interface_dump);
+    mp->name_filter_valid = 1;
+    strncpy ((char *) mp->name_filter, "vxlan", sizeof(mp->name_filter-1));
+    S;
+
+    /* and tap tunnel interfaces */
+    M(SW_INTERFACE_DUMP, sw_interface_dump);
+    mp->name_filter_valid = 1;
+    strncpy ((char *) mp->name_filter, "tap", sizeof(mp->name_filter-1));
+    S;
+
+    /* and host (af_packet) interfaces */
+    M(SW_INTERFACE_DUMP, sw_interface_dump);
+    mp->name_filter_valid = 1;
+    strncpy ((char *) mp->name_filter, "host", sizeof(mp->name_filter-1));
+    S;
+
+    /* and l2tpv3 tunnel interfaces */
+    M(SW_INTERFACE_DUMP, sw_interface_dump);
+    mp->name_filter_valid = 1;
+    strncpy ((char *) mp->name_filter, "l2tpv3_tunnel",
+             sizeof(mp->name_filter-1));
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+        vl_api_control_ping_t * mp;
+        M(CONTROL_PING, control_ping);
+        S;
+    }
+    W;
+}
+
+JNIEXPORT jobject JNICALL Java_org_openvpp_vppjapi_vppConn_getVppVersion0
+  (JNIEnv *env, jobject obj)
+{
+    vppjni_main_t * jm = &vppjni_main;
+
+    vppjni_lock (jm, 11);
+    jstring progName = (*env)->NewStringUTF(env, (char *)jm->program_name);
+    jstring buildDir = (*env)->NewStringUTF(env, (char *)jm->build_directory);
+    jstring version = (*env)->NewStringUTF(env, (char *)jm->version);
+    jstring buildDate = (*env)->NewStringUTF(env, (char *)jm->build_date);
+    vppjni_unlock (jm);
+
+    return vppVersionObject(env, progName, buildDir, version, buildDate);
+}
+
+static int jm_show_version (vppjni_main_t *jm)
+{
+    int rv;
+    vl_api_show_version_t *mp;
+    f64 timeout;
+
+    vppjni_lock (jm, 10);
+    M(SHOW_VERSION, show_version);
+
+    S;
+    vppjni_unlock (jm);
+    WNR;
+    return rv;
+}
+
+static int jm_stats_enable_disable (vppjni_main_t *jm, u8 enable)
+{
+    vl_api_want_stats_t * mp;
+    f64 timeout;
+    int rv;
+
+    vppjni_lock (jm, 13);
+
+    M(WANT_STATS, want_stats);
+
+    mp->enable_disable = enable;
+
+    S;
+    vppjni_unlock (jm);
+    WNR;
+
+    // already subscribed / already disabled (it's ok)
+    if (rv == -2 || rv == -3)
+        rv = 0;
+    return rv;
+}
+
+JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_setInterfaceDescription0
+  (JNIEnv *env, jobject obj, jstring ifName, jstring ifDesc)
+{
+    int rv = 0;
+    vppjni_main_t * jm = &vppjni_main;
+    uword * p;
+    u32 sw_if_index = ~0;
+    sw_if_config_t *cfg;
+
+    const char *if_name_str = (*env)->GetStringUTFChars (env, ifName, 0);
+    const char *if_desc_str = (*env)->GetStringUTFChars (env, ifDesc, 0);
+
+    vppjni_lock (jm, 23);
+
+    p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name_str);
+    if (p == 0) {
+        rv = -1;
+        goto out;
+    }
+    sw_if_index = (jint) p[0];
+
+    u8 *if_desc = 0;
+    vec_validate_init_c_string (if_desc, if_desc_str, strlen(if_desc_str));
+    (*env)->ReleaseStringUTFChars (env, ifDesc, if_desc_str);
+
+    p = hash_get (jm->sw_if_config_by_sw_if_index, sw_if_index);
+    if (p != 0) {
+        cfg = (sw_if_config_t *) (p[0]);
+        if (cfg->desc)
+            vec_free(cfg->desc);
+    } else {
+        cfg = (sw_if_config_t *) clib_mem_alloc(sizeof(sw_if_config_t));
+        hash_set (jm->sw_if_config_by_sw_if_index, sw_if_index, cfg);
+    }
+
+    cfg->desc = if_desc;
+
+out:
+    (*env)->ReleaseStringUTFChars (env, ifName, if_name_str);
+    vppjni_unlock (jm);
+    return rv;
+}
+
+JNIEXPORT jstring JNICALL Java_org_openvpp_vppjapi_vppConn_getInterfaceDescription0
+(JNIEnv * env, jobject obj, jstring ifName)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    u32 sw_if_index = ~0;
+    uword * p;
+    jstring ifDesc = NULL;
+    const char *if_name_str = (*env)->GetStringUTFChars (env, ifName, 0);
+    if (!if_name_str)
+        return NULL;
+
+    vppjni_lock (jm, 24);
+    p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name_str);
+    if (p == 0)
+        goto out;
+
+    sw_if_index = (jint) p[0];
+
+    p = hash_get (jm->sw_if_config_by_sw_if_index, sw_if_index);
+    if (p == 0)
+        goto out;
+
+    sw_if_config_t *cfg = (sw_if_config_t *) (p[0]);
+    u8 * s = format (0, "%s%c", cfg->desc, 0);
+    ifDesc = (*env)->NewStringUTF(env, (char *)s);
+
+out:
+    vppjni_unlock (jm);
+
+    return ifDesc;
+}
+
+JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_clientConnect
+  (JNIEnv *env, jobject obj, jstring clientName)
+{
+    int rv;
+    const char *client_name;
+    void vl_msg_reply_handler_hookup(void);
+    vppjni_main_t * jm = &vppjni_main;
+    api_main_t * am = &api_main;
+    u8 * heap;
+    mheap_t * h;
+    f64 timeout;
+
+    /*
+     * Bail out now if we're not running as root
+     */
+    if (geteuid() != 0)
+        return -1;
+
+    if (jm->is_connected)
+        return -2;
+
+    client_name = (*env)->GetStringUTFChars(env, clientName, 0);
+    if (!client_name)
+        return -3;
+
+    if (jm->heap == 0)
+        clib_mem_init (0, 128<<20);
+
+    heap = clib_mem_get_per_cpu_heap();
+    h = mheap_header (heap);
+
+    clib_time_init (&jm->clib_time);
+
+    rv = connect_to_vpe ((char *) client_name);
+
+    if (rv < 0)
+        clib_warning ("connection failed, rv %d", rv);
+
+    (*env)->ReleaseStringUTFChars (env, clientName, client_name);
+
+    if (rv == 0) {
+        vl_msg_reply_handler_hookup ();
+        jm->is_connected = 1;
+        /* make the main heap thread-safe */
+        h->flags |= MHEAP_FLAG_THREAD_SAFE;
+
+        jm->reply_hash = hash_create (0, sizeof (uword));
+        //jm->callback_hash = hash_create (0, sizeof (uword));
+        //jm->ping_hash = hash_create (0, sizeof (uword));
+        jm->api_main = am;
+        vjbd_main_init(&jm->vjbd_main);
+        jm->sw_if_index_by_interface_name =
+            hash_create_string (0, sizeof (uword));
+        jm->sw_if_config_by_sw_if_index =
+            hash_create (0, sizeof (uword));
+
+        {
+            // call control ping first to attach rx thread to java thread
+            vl_api_control_ping_t * mp;
+            M(CONTROL_PING, control_ping);
+            S;
+            WNR;
+
+            if (rv != 0) {
+                clib_warning ("first control ping failed: %d", rv);
+            }
+        }
+        rv = jm_show_version(jm);
+        if (rv != 0)
+            clib_warning ("unable to retrieve vpp version (rv: %d)", rv);
+        rv = sw_interface_dump(jm);
+        if (rv != 0)
+            clib_warning ("unable to retrieve interface list (rv: %d)", rv);
+        rv = jm_stats_enable_disable(jm, 1);
+        if (rv != 0)
+            clib_warning ("unable to subscribe to stats (rv: %d)", rv);
+    }
+    DEBUG_LOG ("clientConnect result: %d", rv);
+
+    return rv;
+}
+
+JNIEXPORT void JNICALL Java_org_openvpp_vppjapi_vppConn_clientDisconnect
+  (JNIEnv *env, jobject obj)
+{
+    u8 *save_heap;
+    vppjni_main_t * jm = &vppjni_main;
+    vl_client_disconnect_from_vlib();
+
+    save_heap = jm->heap;
+    memset (jm, 0, sizeof (*jm));
+    jm->heap = save_heap;
+}
+
+void vl_api_generic_reply_handler (vl_api_generic_reply_t *mp)
+{
+    api_main_t * am = &api_main;
+    u16 msg_id = clib_net_to_host_u16 (mp->_vl_msg_id);
+    trace_cfg_t *cfgp;
+    i32 retval = clib_net_to_host_u32 (mp->retval);
+    int total_bytes = sizeof(mp);
+    vppjni_main_t * jm = &vppjni_main;
+    u8 * saved_reply = 0;
+    u32 context = clib_host_to_net_u32 (mp->context);
+
+    cfgp = am->api_trace_cfg + msg_id;
+
+    if (!cfgp)
+        clib_warning ("msg id %d: no trace configuration\n", msg_id);
+    else
+        total_bytes = cfgp->size;
+
+    jm->context_id_received = context;
+
+    DEBUG_LOG ("Received generic reply for msg id %d", msg_id);
+
+    /* A generic reply, successful, we're done */
+    if (retval >= 0 && total_bytes == sizeof(*mp))
+        return;
+
+    /* Save the reply */
+    vec_validate (saved_reply, total_bytes - 1);
+    memcpy (saved_reply, mp, total_bytes);
+
+    vppjni_lock (jm, 2);
+    hash_set (jm->reply_hash, context, saved_reply);
+    jm->saved_reply_count ++;
+    vppjni_unlock (jm);
+}
+
+JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_getRetval0
+(JNIEnv * env, jobject obj, jint context, jint release)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    vl_api_generic_reply_t * mp;
+    uword * p;
+    int rv = 0;
+
+    /* Dunno yet? */
+    if (context > jm->context_id_received)
+        return (VNET_API_ERROR_RESPONSE_NOT_READY);
+
+    vppjni_lock (jm, 1);
+    p = hash_get (jm->reply_hash, context);
+
+    /*
+     * Two cases: a generic "yes" reply - won't be in the hash table
+     * or "no", or "more data" which will be in the table.
+     */
+    if (p == 0)
+        goto out;
+
+    mp = (vl_api_generic_reply_t *) (p[0]);
+    rv = clib_net_to_host_u32 (mp->retval);
+
+    if (release) {
+        u8 * free_me = (u8 *) mp;
+        vec_free (free_me);
+        hash_unset (jm->reply_hash, context);
+        jm->saved_reply_count --;
+    }
+
+out:
+    vppjni_unlock (jm);
+    return (rv);
+}
+
+static int
+name_sort_cmp (void * a1, void * a2)
+{
+    name_sort_t * n1 = a1;
+    name_sort_t * n2 = a2;
+
+    return strcmp ((char *)n1->name, (char *)n2->name);
+}
+
+JNIEXPORT jstring JNICALL Java_org_openvpp_vppjapi_vppConn_getInterfaceList0
+  (JNIEnv * env, jobject obj, jstring name_filter)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    jstring rv;
+    hash_pair_t * p;
+    name_sort_t * nses = 0, * ns;
+    const char *this_name;
+    u8 * s = 0;
+    const char * nf = (*env)->GetStringUTFChars (env, name_filter, NULL);
+    if (!nf)
+        return NULL;
+
+    vppjni_lock (jm, 4);
+
+    hash_foreach_pair (p, jm->sw_if_index_by_interface_name,
+            ({
+                this_name = (const char *)(p->key);
+                if (strlen (nf) == 0 || strcasestr (this_name, nf)) {
+                    vec_add2 (nses, ns, 1);
+                    ns->name = (u8 *)(p->key);
+                    ns->value = (u32) p->value[0];
+                }
+            }));
+
+    vec_sort_with_function (nses, name_sort_cmp);
+
+    vec_foreach (ns, nses)
+        s = format (s, "%s: %d, ", ns->name, ns->value);
+
+    _vec_len (s) = vec_len (s) - 2;
+    vec_terminate_c_string (s);
+    vppjni_unlock (jm);
+
+    vec_free (nses);
+
+    (*env)->ReleaseStringUTFChars (env, name_filter, nf);
+
+    rv = (*env)->NewStringUTF (env, (char *) s);
+    vec_free (s);
+
+    return rv;
+}
+
+JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_swIfIndexFromName0
+  (JNIEnv * env, jobject obj, jstring interfaceName)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    jint rv = -1;
+    const char * if_name = (*env)->GetStringUTFChars (env, interfaceName, NULL);
+    if (if_name) {
+        uword * p;
+
+        vppjni_lock (jm, 5);
+
+        p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name);
+
+        if (p != 0)
+            rv = (jint) p[0];
+
+        vppjni_unlock (jm);
+
+        (*env)->ReleaseStringUTFChars (env, interfaceName, if_name);
+    }
+
+    return rv;
+}
+
+JNIEXPORT jobject JNICALL Java_org_openvpp_vppjapi_vppConn_getInterfaceCounters0
+(JNIEnv * env, jobject obj, jint swIfIndex)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    sw_interface_stats_t *s;
+    u32 sw_if_index = swIfIndex;
+    jobject result = NULL;
+
+    vppjni_lock (jm, 16);
+
+    if (sw_if_index >= vec_len(jm->sw_if_stats_by_sw_if_index)) {
+        goto out;
+    }
+    s = &jm->sw_if_stats_by_sw_if_index[sw_if_index];
+    if (!s->valid) {
+        goto out;
+    }
+
+    result = vppInterfaceCountersObject(env,
+            s->rx.octets, s->rx.pkts.ip4, s->rx.pkts.ip6, s->rx.pkts.unicast,
+            s->rx.pkts.multicast, s->rx.pkts.broadcast, s->rx.pkts.discard,
+            s->rx.pkts.fifo_full, s->rx.pkts.error, s->rx.pkts.unknown_proto,
+            s->rx.pkts.miss,
+            s->tx.octets, s->tx.pkts.ip4, s->tx.pkts.ip6, s->tx.pkts.unicast,
+            s->tx.pkts.multicast, s->tx.pkts.broadcast, s->tx.pkts.discard,
+            s->tx.pkts.fifo_full, s->tx.pkts.error, s->tx.pkts.unknown_proto,
+            s->tx.pkts.miss);
+
+out:
+    vppjni_unlock (jm);
+    return result;
+}
+
+JNIEXPORT jstring JNICALL Java_org_openvpp_vppjapi_vppConn_interfaceNameFromSwIfIndex0
+(JNIEnv * env, jobject obj, jint swIfIndex)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    sw_interface_details_t *sw_if_details;
+    u32 sw_if_index;
+    jstring ifname = NULL;
+
+    vppjni_lock (jm, 8);
+
+    sw_if_index = swIfIndex;
+
+    if (sw_if_index >= vec_len(jm->sw_if_table)) {
+        goto out;
+    }
+    sw_if_details = &jm->sw_if_table[sw_if_index];
+    if (!sw_if_details->valid) {
+        goto out;
+    }
+
+    u8 * s = format (0, "%s%c", sw_if_details->interface_name, 0);
+    ifname = (*env)->NewStringUTF(env, (char *)s);
+
+out:
+    vppjni_unlock (jm);
+
+    return ifname;
+}
+
+JNIEXPORT void JNICALL Java_org_openvpp_vppjapi_vppConn_clearInterfaceTable0
+(JNIEnv * env, jobject obj)
+{
+    vppjni_main_t * jm = &vppjni_main;
+
+    vppjni_lock (jm, 21);
+
+    vec_reset_length(jm->sw_if_table);
+
+    vppjni_unlock (jm);
+}
+
+static jobjectArray sw_if_dump_get_interfaces ();
+
+JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_swInterfaceDump0
+(JNIEnv * env, jobject obj, jbyte name_filter_valid, jbyteArray name_filter)
+{
+    vppjni_main_t *jm = &vppjni_main;
+    f64 timeout;
+    vl_api_sw_interface_dump_t * mp;
+    u32 my_context_id;
+    int rv;
+    rv = vppjni_sanity_check (jm);
+    if (rv) {
+        clib_warning("swInterfaceDump sanity_check rv = %d", rv);
+        return NULL;
+    }
+
+    vppjni_lock (jm, 7);
+    my_context_id = vppjni_get_context_id (jm);
+    jsize cnt = (*env)->GetArrayLength (env, name_filter);
+
+    M(SW_INTERFACE_DUMP, sw_interface_dump);
+    mp->context = clib_host_to_net_u32 (my_context_id);
+    mp->name_filter_valid = name_filter_valid;
+
+    if (cnt > sizeof(mp->name_filter))
+        cnt = sizeof(mp->name_filter);
+
+    (*env)->GetByteArrayRegion(env, name_filter, 0, cnt, (jbyte *)mp->name_filter);
+
+    DEBUG_LOG ("interface filter (%d, %s, len: %d)", mp->name_filter_valid, (char *)mp->name_filter, cnt);
+
+    jm->collect_indices = 1;
+
+    S;
+    {
+        // now send control ping so we know when it ends
+        vl_api_control_ping_t * mp;
+        M(CONTROL_PING, control_ping);
+        mp->context = clib_host_to_net_u32 (my_context_id);
+
+        S;
+    }
+    vppjni_unlock (jm);
+    WNR;
+
+    vppjni_lock (jm, 7);
+    jobjectArray result = sw_if_dump_get_interfaces(env);
+    vppjni_unlock (jm);
+    return result;
+}
+
+static jobjectArray sw_if_dump_get_interfaces (JNIEnv * env)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    sw_interface_details_t *sw_if_details;
+    u32 i;
+
+    int len = vec_len(jm->sw_if_dump_if_indices);
+
+    jobjectArray ifArray = vppInterfaceDetailsArray(env, len);
+
+    for (i = 0; i < len; i++) {
+        u32 sw_if_index = jm->sw_if_dump_if_indices[i];
+        ASSERT(sw_if_index < vec_len(jm->sw_if_table));
+        sw_if_details = &jm->sw_if_table[sw_if_index];
+        ASSERT(sw_if_details->valid);
+
+        u8 * s = format (0, "%s%c", sw_if_details->interface_name, 0);
+
+        jstring ifname = (*env)->NewStringUTF(env, (char *)s);
+        jint ifIndex = sw_if_details->sw_if_index;
+        jint supIfIndex = sw_if_details->sup_sw_if_index;
+        jbyteArray physAddr = (*env)->NewByteArray(env,
+                sw_if_details->l2_address_length);
+        (*env)->SetByteArrayRegion(env, physAddr, 0,
+                sw_if_details->l2_address_length,
+                (signed char*)sw_if_details->l2_address);
+        jint subId = sw_if_details->sub_id;
+        jint subOuterVlanId = sw_if_details->sub_outer_vlan_id;
+        jint subInnerVlanId = sw_if_details->sub_inner_vlan_id;
+        jint vtrOp = sw_if_details->vtr_op;
+        jint vtrPushDot1q = sw_if_details->vtr_push_dot1q;
+        jint vtrTag1 = sw_if_details->vtr_tag1;
+        jint vtrTag2 = sw_if_details->vtr_tag2;
+        jint linkMtu = sw_if_details->link_mtu;
+
+        jbyte adminUpDown = sw_if_details->admin_up_down;
+        jbyte linkUpDown = sw_if_details->link_up_down;
+        jbyte linkDuplex = sw_if_details->link_duplex;
+        jbyte linkSpeed = sw_if_details->link_speed;
+        jbyte subDot1ad = sw_if_details->sub_dot1ad;
+        jbyte subNumberOfTags = sw_if_details->sub_number_of_tags;
+        jbyte subExactMatch = sw_if_details->sub_exact_match;
+        jbyte subDefault = sw_if_details->sub_default;
+        jbyte subOuterVlanIdAny = sw_if_details->sub_outer_vlan_id_any;
+        jbyte subInnerVlanIdAny = sw_if_details->sub_inner_vlan_id_any;
+
+        jobject ifObj = vppInterfaceDetailsObject(env,
+                ifIndex, ifname,
+                supIfIndex, physAddr, adminUpDown, linkUpDown,
+                linkDuplex, linkSpeed, subId, subDot1ad,
+                subNumberOfTags, subOuterVlanId, subInnerVlanId,
+                subExactMatch, subDefault, subOuterVlanIdAny,
+                subInnerVlanIdAny, vtrOp, vtrPushDot1q, vtrTag1, vtrTag2, linkMtu);
+        (*env)->SetObjectArrayElement(env, ifArray, i, ifObj);
+    }
+
+    jm->collect_indices = 0;
+    vec_reset_length(jm->sw_if_dump_if_indices);
+    return ifArray;
+}
+
+JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_findOrAddBridgeDomainId0
+  (JNIEnv * env, jobject obj, jstring bridgeDomain)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    jint rv = -1;
+    const char * bdName = (*env)->GetStringUTFChars (env, bridgeDomain, NULL);
+    if (bdName) {
+        static u8 * bd_name = 0;
+
+        vec_validate_init_c_string (bd_name, bdName, strlen(bdName));
+        (*env)->ReleaseStringUTFChars (env, bridgeDomain, bdName);
+
+        vppjni_lock (jm, 6);
+        rv = (jint)vjbd_find_or_add_bd (&jm->vjbd_main, bd_name);
+        vppjni_unlock (jm);
+
+        _vec_len(bd_name) = 0;
+    }
+    return rv;
+}
+
+JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_bridgeDomainIdFromName0
+  (JNIEnv * env, jobject obj, jstring bridgeDomain)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    jint rv = -1;
+    const char * bdName = (*env)->GetStringUTFChars (env, bridgeDomain, NULL);
+    if (bdName) {
+        static u8 * bd_name = 0;
+
+        vec_validate_init_c_string (bd_name, bdName, strlen(bdName));
+        (*env)->ReleaseStringUTFChars (env, bridgeDomain, bdName);
+
+        vppjni_lock (jm, 20);
+        rv = (jint)vjbd_id_from_name(&jm->vjbd_main, (u8 *)bd_name);
+        vppjni_unlock (jm);
+
+        _vec_len(bd_name) = 0;
+    }
+
+    return rv;
+}
+
+JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_bridgeDomainIdFromInterfaceName0
+  (JNIEnv * env, jobject obj, jstring interfaceName)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    vjbd_main_t * bdm = &jm->vjbd_main;
+    u32 sw_if_index;
+    jint rv = -1;
+    const char * if_name;
+    uword * p;
+
+    if_name = (*env)->GetStringUTFChars (env, interfaceName, NULL);
+
+    vppjni_lock (jm, 14);
+
+    p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name);
+
+    if (p != 0) {
+        sw_if_index = (jint) p[0];
+        p = hash_get (bdm->bd_id_by_sw_if_index, sw_if_index);
+        if (p != 0) {
+            rv = (jint) p[0];
+        }
+    }
+
+    vppjni_unlock (jm);
+
+    (*env)->ReleaseStringUTFChars (env, interfaceName, if_name);
+
+    return rv;
+}
+
+/*
+ * Special-case: build the interface table, maintain
+ * the next loopback sw_if_index vbl.
+ */
+static void vl_api_sw_interface_details_t_handler
+(vl_api_sw_interface_details_t * mp)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    static sw_interface_details_t empty_sw_if_details = {0,};
+    sw_interface_details_t *sw_if_details;
+    u32 sw_if_index;
+
+    vppjni_lock (jm, 1);
+
+    sw_if_index = ntohl (mp->sw_if_index);
+
+    u8 * s = format (0, "%s%c", mp->interface_name, 0);
+
+    if (jm->collect_indices) {
+        u32 pos = vec_len(jm->sw_if_dump_if_indices);
+        vec_validate(jm->sw_if_dump_if_indices, pos);
+        jm->sw_if_dump_if_indices[pos] = sw_if_index;
+    }
+
+    vec_validate_init_empty(jm->sw_if_table, sw_if_index, empty_sw_if_details);
+    sw_if_details = &jm->sw_if_table[sw_if_index];
+    sw_if_details->valid = 1;
+
+    snprintf((char *)sw_if_details->interface_name,
+            sizeof(sw_if_details->interface_name), "%s", (char *)s);
+    sw_if_details->sw_if_index = sw_if_index;
+    sw_if_details->sup_sw_if_index = ntohl(mp->sup_sw_if_index);
+    sw_if_details->l2_address_length = ntohl (mp->l2_address_length);
+    ASSERT(sw_if_details->l2_address_length <= sizeof(sw_if_details->l2_address));
+    memcpy(sw_if_details->l2_address, mp->l2_address,
+            sw_if_details->l2_address_length);
+    sw_if_details->sub_id = ntohl (mp->sub_id);
+    sw_if_details->sub_outer_vlan_id = ntohl (mp->sub_outer_vlan_id);
+    sw_if_details->sub_inner_vlan_id = ntohl (mp->sub_inner_vlan_id);
+    sw_if_details->vtr_op = ntohl (mp->vtr_op);
+    sw_if_details->vtr_push_dot1q = ntohl (mp->vtr_push_dot1q);
+    sw_if_details->vtr_tag1 = ntohl (mp->vtr_tag1);
+    sw_if_details->vtr_tag2 = ntohl (mp->vtr_tag2);
+
+    sw_if_details->admin_up_down = mp->admin_up_down;
+    sw_if_details->link_up_down = mp->link_up_down;
+    sw_if_details->link_duplex = mp->link_duplex;
+    sw_if_details->link_speed = mp->link_speed;
+    sw_if_details->sub_dot1ad = mp->sub_dot1ad;
+    sw_if_details->sub_number_of_tags = mp->sub_number_of_tags;
+    sw_if_details->sub_exact_match = mp->sub_exact_match;
+    sw_if_details->sub_default = mp->sub_default;
+    sw_if_details->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any;
+    sw_if_details->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any;
+
+    hash_set_mem (jm->sw_if_index_by_interface_name, s, sw_if_index);
+    DEBUG_LOG ("Got interface %s", (char *)s);
+
+    /* In sub interface case, fill the sub interface table entry */
+    if (mp->sw_if_index != mp->sup_sw_if_index) {
+        sw_interface_subif_t * sub = NULL;
+
+        vec_add2(jm->sw_if_subif_table, sub, 1);
+
+        vec_validate(sub->interface_name, strlen((char *)s) + 1);
+        strncpy((char *)sub->interface_name, (char *)s,
+                vec_len(sub->interface_name));
+        sub->sw_if_index = ntohl(mp->sw_if_index);
+        sub->sub_id = ntohl(mp->sub_id);
+
+        sub->sub_dot1ad = mp->sub_dot1ad;
+        sub->sub_number_of_tags = mp->sub_number_of_tags;
+        sub->sub_outer_vlan_id = ntohs(mp->sub_outer_vlan_id);
+        sub->sub_inner_vlan_id = ntohs(mp->sub_inner_vlan_id);
+        sub->sub_exact_match = mp->sub_exact_match;
+        sub->sub_default = mp->sub_default;
+        sub->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any;
+        sub->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any;
+
+        /* vlan tag rewrite */
+        sub->vtr_op = ntohl(mp->vtr_op);
+        sub->vtr_push_dot1q = ntohl(mp->vtr_push_dot1q);
+        sub->vtr_tag1 = ntohl(mp->vtr_tag1);
+        sub->vtr_tag2 = ntohl(mp->vtr_tag2);
+    }
+    vppjni_unlock (jm);
+}
+
+static void vl_api_sw_interface_set_flags_t_handler
+(vl_api_sw_interface_set_flags_t * mp)
+{
+  /* $$$ nothing for the moment */
+}
+
+static jintArray create_array_of_bd_ids(JNIEnv * env, jint bd_id)
+{
+    vppjni_main_t *jm = &vppjni_main;
+    vjbd_main_t * bdm = &jm->vjbd_main;
+    u32 *buf = NULL;
+    u32 i;
+
+    if (bd_id != ~0) {
+        vec_add1(buf, bd_id);
+    } else {
+        for (i = 0; i < vec_len(bdm->bd_oper); i++) {
+            u32 bd_id = bdm->bd_oper[i].bd_id;
+            vec_add1(buf, bd_id);
+        }
+    }
+
+    jintArray bdidArray = (*env)->NewIntArray(env, vec_len(buf));
+    if (!bdidArray) {
+        goto out;
+    }
+
+    (*env)->SetIntArrayRegion(env, bdidArray, 0, vec_len(buf), (int*)buf);
+
+out:
+    vec_free(buf);
+    return bdidArray;
+}
+
+static void bridge_domain_oper_free(void)
+{
+    vppjni_main_t *jm = &vppjni_main;
+    vjbd_main_t *bdm = &jm->vjbd_main;
+    u32 i;
+
+    for (i = 0; i < vec_len(bdm->bd_oper); i++) {
+        vec_free(bdm->bd_oper->l2fib_oper);
+    }
+    vec_reset_length(bdm->bd_oper);
+    hash_free(bdm->bd_id_by_sw_if_index);
+    hash_free(bdm->oper_bd_index_by_bd_id);
+}
+
+JNIEXPORT jintArray JNICALL Java_org_openvpp_vppjapi_vppConn_bridgeDomainDump0
+(JNIEnv * env, jobject obj, jint bd_id)
+{
+    vppjni_main_t *jm = &vppjni_main;
+    vl_api_bridge_domain_dump_t * mp;
+    u32 my_context_id;
+    f64 timeout;
+    int rv;
+    rv = vppjni_sanity_check (jm);
+    if (rv) return NULL;
+
+    vppjni_lock (jm, 15);
+
+    if (~0 == bd_id) {
+        bridge_domain_oper_free();
+    }
+
+    my_context_id = vppjni_get_context_id (jm);
+    M(BRIDGE_DOMAIN_DUMP, bridge_domain_dump);
+    mp->context = clib_host_to_net_u32 (my_context_id);
+    mp->bd_id = clib_host_to_net_u32(bd_id);
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+        vl_api_control_ping_t * mp;
+        M(CONTROL_PING, control_ping);
+        S;
+    }
+
+    WNR;
+    if (0 != rv) {
+        return NULL;
+    }
+
+    jintArray ret = create_array_of_bd_ids(env, bd_id);
+
+    vppjni_unlock (jm);
+
+    return ret;
+}
+
+static void
+vl_api_bridge_domain_details_t_handler (vl_api_bridge_domain_details_t * mp)
+{
+    vppjni_main_t *jm = &vppjni_main;
+    vjbd_main_t * bdm = &jm->vjbd_main;
+    vjbd_oper_t * bd_oper;
+    u32 bd_id, bd_index;
+
+    bd_id = ntohl (mp->bd_id);
+
+    bd_index = vec_len(bdm->bd_oper);
+    vec_validate (bdm->bd_oper, bd_index);
+    bd_oper = vec_elt_at_index(bdm->bd_oper, bd_index);
+
+    hash_set(bdm->oper_bd_index_by_bd_id, bd_id, bd_index);
+
+    bd_oper->bd_id = bd_id;
+    bd_oper->flood = mp->flood != 0;
+    bd_oper->forward = mp->forward != 0;
+    bd_oper->learn =  mp->learn != 0;
+    bd_oper->uu_flood = mp->uu_flood != 0;
+    bd_oper->arp_term = mp->arp_term != 0;
+    bd_oper->bvi_sw_if_index = ntohl (mp->bvi_sw_if_index);
+    bd_oper->n_sw_ifs = ntohl (mp->n_sw_ifs);
+
+    bd_oper->bd_sw_if_oper = 0;
+}
+
+static void
+vl_api_bridge_domain_sw_if_details_t_handler
+(vl_api_bridge_domain_sw_if_details_t * mp)
+{
+    vppjni_main_t *jm = &vppjni_main;
+    vjbd_main_t * bdm = &jm->vjbd_main;
+    bd_sw_if_oper_t * bd_sw_if_oper;
+    u32 bd_id, sw_if_index;
+
+    bd_id = ntohl (mp->bd_id);
+    sw_if_index = ntohl (mp->sw_if_index);
+
+    uword *p;
+    p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id);
+    if (p == 0) {
+        clib_warning("Invalid bd_id %d in bridge_domain_sw_if_details_t_handler", bd_id);
+        return;
+    }
+    u32 oper_bd_index = (jint) p[0];
+    vjbd_oper_t *bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index);
+
+    u32 len = vec_len(bd_oper->bd_sw_if_oper);
+    vec_validate(bd_oper->bd_sw_if_oper, len);
+    bd_sw_if_oper = &bd_oper->bd_sw_if_oper[len];
+    bd_sw_if_oper->bd_id = bd_id;
+    bd_sw_if_oper->sw_if_index = sw_if_index;
+    bd_sw_if_oper->shg = mp->shg;
+
+    hash_set(bdm->bd_id_by_sw_if_index, sw_if_index, bd_id);
+}
+
+static const char* interface_name_from_sw_if_index(u32 sw_if_index)
+{
+    vppjni_main_t *jm = &vppjni_main;
+
+    if (sw_if_index >= vec_len(jm->sw_if_table)) {
+        return NULL;
+    }
+    if (!jm->sw_if_table[sw_if_index].valid) {
+        return NULL;
+    }
+    return (const char*)jm->sw_if_table[sw_if_index].interface_name;
+}
+
+JNIEXPORT jobject JNICALL Java_org_openvpp_vppjapi_vppConn_getBridgeDomainDetails0
+(JNIEnv * env, jobject obj, jint bdId)
+{
+    vppjni_main_t *jm = &vppjni_main;
+    vjbd_main_t * bdm = &jm->vjbd_main;
+    u32 oper_bd_index;
+    u32 bd_id = bdId;
+    jobject rv = NULL;
+    uword *p;
+
+    vppjni_lock (jm, 16);
+
+    p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id);
+    if (p == 0) {
+        rv = NULL;
+        goto out;
+    }
+    oper_bd_index = (jint) p[0];
+
+    vjbd_oper_t *bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index);
+
+
+    /* setting BridgeDomainDetails */
+
+    jobject bddObj = vppBridgeDomainDetailsObject(env);
+
+    u8 *vec_bd_name = vjbd_oper_name_from_id(bdm, bd_id);
+    if (NULL == vec_bd_name) {
+        rv = NULL;
+        goto out;
+    }
+    char *str_bd_name = (char*)format (0, "%s%c", vec_bd_name, 0);
+    vec_free(vec_bd_name);
+    jstring bdName = (*env)->NewStringUTF(env, str_bd_name);
+    vec_free(str_bd_name);
+    if (NULL == bdName) {
+        rv = NULL;
+        goto out;
+    }
+
+    set_vppBridgeDomainDetails_name(env, bddObj, bdName);
+    set_vppBridgeDomainDetails_bdId(env, bddObj, bdId);
+    set_vppBridgeDomainDetails_flood(env, bddObj, (jboolean)bd_oper->flood);
+    set_vppBridgeDomainDetails_uuFlood(env, bddObj, (jboolean)bd_oper->uu_flood);
+    set_vppBridgeDomainDetails_forward(env, bddObj, (jboolean)bd_oper->forward);
+    set_vppBridgeDomainDetails_learn(env, bddObj, (jboolean)bd_oper->learn);
+    set_vppBridgeDomainDetails_arpTerm(env, bddObj, (jboolean)bd_oper->arp_term);
+
+    jstring bviInterfaceName = NULL;
+    if (~0 != bd_oper->bvi_sw_if_index) {
+        const char *str_if_name = interface_name_from_sw_if_index(bd_oper->bvi_sw_if_index);
+        if (NULL == str_if_name) {
+            clib_warning("Could not get interface name for sw_if_index %d", bd_oper->bvi_sw_if_index);
+            rv = NULL;
+            goto out;
+        }
+        bviInterfaceName = (*env)->NewStringUTF(env, str_if_name);
+        if (NULL == bviInterfaceName) {
+            rv = NULL;
+            goto out;
+        }
+    }
+
+    set_vppBridgeDomainDetails_bviInterfaceName(env, bddObj, bviInterfaceName);
+
+    /* setting BridgeDomainInterfaceDetails */
+
+    u32 len = vec_len(bd_oper->bd_sw_if_oper);
+    ASSERT(len == bd_oper->n_sw_ifs);
+
+    jobjectArray bdidArray = vppBridgeDomainInterfaceDetailsArray(env, len);
+
+    u32 i;
+    for (i = 0; i < len; i++) {
+        bd_sw_if_oper_t *sw_if_oper = &bd_oper->bd_sw_if_oper[i];
+
+        jobject bdidObj = vppBridgeDomainInterfaceDetailsObject(env);
+        (*env)->SetObjectArrayElement(env, bdidArray, i, bdidObj);
+
+        u32 sw_if_index = sw_if_oper->sw_if_index;
+        const char *str_if_name = interface_name_from_sw_if_index(sw_if_index);
+        if (NULL == str_if_name) {
+            rv = NULL;
+            goto out;
+        }
+        jstring interfaceName = (*env)->NewStringUTF(env, str_if_name);
+        if (NULL == interfaceName) {
+            rv = NULL;
+            goto out;
+        }
+
+        set_vppBridgeDomainInterfaceDetails_interfaceName(env, bdidObj, interfaceName);
+        set_vppBridgeDomainInterfaceDetails_splitHorizonGroup(env, bdidObj, (jbyte)sw_if_oper->shg);
+    }
+
+    set_vppBridgeDomainDetails_interfaces(env, bddObj, bdidArray);
+
+    rv = bddObj;
+
+out:
+
+    vppjni_unlock (jm);
+
+    return rv;
+}
+
+static jobject l2_fib_create_object(JNIEnv *env, bd_l2fib_oper_t *l2_fib)
+{
+    u32 sw_if_index = l2_fib->sw_if_index;
+    const char *str_if_name = interface_name_from_sw_if_index(sw_if_index);
+    if (NULL == str_if_name) {
+        return NULL;
+    }
+    jstring interfaceName = (*env)->NewStringUTF(env, str_if_name);
+    if (NULL == interfaceName) {
+        return NULL;
+    }
+
+    jbyteArray physAddr = (*env)->NewByteArray(env, 6);
+    (*env)->SetByteArrayRegion(env, physAddr, 0, 6,
+            (signed char*)l2_fib->mac_addr.fields.mac);
+    jboolean staticConfig = !l2_fib->learned;
+    jstring outgoingInterface = interfaceName;
+    jboolean filter = l2_fib->filter;
+    jboolean bridgedVirtualInterface = l2_fib->bvi;
+
+    return vppL2FibObject(env, physAddr, staticConfig, outgoingInterface, filter, bridgedVirtualInterface);
+}
+
+JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_l2FibTableDump0
+(JNIEnv * env, jobject obj, jint bd_id)
+{
+    vppjni_main_t *jm = &vppjni_main;
+    vjbd_main_t * bdm = &jm->vjbd_main;
+    vl_api_l2_fib_table_dump_t *mp;
+    jobjectArray l2FibArray = NULL;
+    vjbd_oper_t *bd_oper;
+    u32 oper_bd_index;
+    uword *p;
+    f64 timeout;
+    int rv;
+    u32 i;
+
+    vppjni_lock (jm, 17);
+
+    //vjbd_l2fib_oper_reset (bdm);
+
+    p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id);
+    if (p == 0) {
+        goto done;
+    }
+    oper_bd_index = p[0];
+    bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index);
+    vec_reset_length (bd_oper->l2fib_oper);
+
+    /* Get list of l2 fib table entries */
+    M(L2_FIB_TABLE_DUMP, l2_fib_table_dump);
+    mp->bd_id = ntohl(bd_id);
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+        vl_api_control_ping_t * mp;
+        M(CONTROL_PING, control_ping);
+        S;
+    }
+
+    WNR;
+    if (0 != rv) {
+        goto done;
+    }
+
+    u32 count = vec_len(bd_oper->l2fib_oper);
+    bd_l2fib_oper_t *l2fib_oper = bd_oper->l2fib_oper;
+
+    l2FibArray = vppL2FibArray(env, count);
+    for (i = 0; i < count; i++) {
+        bd_l2fib_oper_t *l2_fib = &l2fib_oper[i];
+        jobject l2FibObj = l2_fib_create_object(env, l2_fib);
+        (*env)->SetObjectArrayElement(env, l2FibArray, i, l2FibObj);
+    }
+
+done:
+    vppjni_unlock (jm);
+
+    return l2FibArray;
+}
+
+static void
+vl_api_l2_fib_table_entry_t_handler (vl_api_l2_fib_table_entry_t * mp)
+{
+    //static u8 * mac_addr;
+    vppjni_main_t *jm = &vppjni_main;
+    vjbd_main_t * bdm = &jm->vjbd_main;
+    vjbd_oper_t * bd_oper;
+    u32 bd_id, oper_bd_index;
+    //uword mhash_val_l2fi;
+    bd_l2fib_oper_t * l2fib_oper;
+    l2fib_u64_mac_t * l2fe_u64_mac = (l2fib_u64_mac_t *)&mp->mac;
+
+    bd_id = ntohl (mp->bd_id);
+
+    uword *p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id);
+    if (p == 0) {
+        return;
+    }
+    oper_bd_index = (jint) p[0];
+    bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index);
+
+#if 0
+    vec_validate (mac_addr, MAC_ADDRESS_SIZE);
+    memcpy (mac_addr, l2fe_u64_mac->fields.mac, MAC_ADDRESS_SIZE);
+    mhash_val_l2fi = vec_len (bd_oper->l2fib_oper);
+    if (mhash_elts (&bd_oper->l2fib_index_by_mac) == 0)
+        mhash_init (&bd_oper->l2fib_index_by_mac, sizeof (u32), MAC_ADDRESS_SIZE);
+    mhash_set_mem (&bd_oper->l2fib_index_by_mac, mac_addr, &mhash_val_l2fi, 0);
+#endif
+
+    vec_add2 (bd_oper->l2fib_oper, l2fib_oper, 1);
+
+    l2fib_oper->bd_id = bd_id;
+    l2fib_oper->mac_addr.raw = l2fib_mac_to_u64 (l2fe_u64_mac->fields.mac);
+    l2fib_oper->sw_if_index = ntohl (mp->sw_if_index);
+    l2fib_oper->learned = !mp->static_mac;
+    l2fib_oper->filter = mp->filter_mac;
+    l2fib_oper->bvi = mp->bvi_mac;
+}
+
+static int ipAddressDump
+(JNIEnv * env, jobject obj, jstring interfaceName, jboolean isIPv6)
+{
+    vppjni_main_t *jm = &vppjni_main;
+    vl_api_ip_address_dump_t * mp;
+    const char *if_name;
+    u32 my_context_id;
+    u32 sw_if_index;
+    f64 timeout;
+    uword *p;
+    int rv = 0;
+
+    if (NULL == interfaceName) {
+        return -1;
+    }
+
+    if_name = (*env)->GetStringUTFChars (env, interfaceName, NULL);
+    if (!if_name) {
+        return -1;
+    }
+
+    p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name);
+    (*env)->ReleaseStringUTFChars (env, interfaceName, if_name);
+    if (p == 0) {
+        return -1;
+    }
+    sw_if_index = (u32) p[0];
+
+    rv = vppjni_sanity_check (jm);
+    if (0 != rv) {
+        return rv;
+    }
+
+    my_context_id = vppjni_get_context_id (jm);
+    M(IP_ADDRESS_DUMP, ip_address_dump);
+    mp->context = clib_host_to_net_u32 (my_context_id);
+    mp->sw_if_index = clib_host_to_net_u32(sw_if_index);
+    mp->is_ipv6 = isIPv6;
+    jm->is_ipv6 = isIPv6;
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+      vl_api_control_ping_t * mp;
+      M(CONTROL_PING, control_ping);
+      S;
+    }
+
+    WNR;
+
+    return rv;
+}
+
+JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_ipv4AddressDump0
+(JNIEnv * env, jobject obj, jstring interfaceName)
+{
+    vppjni_main_t *jm = &vppjni_main;
+    jobject returnArray = NULL;
+    int i;
+
+    vppjni_lock (jm, 18);
+
+    vec_reset_length(jm->ipv4_addresses);
+
+    if (0 != ipAddressDump(env, obj, interfaceName, 0)) {
+        goto done;
+    }
+
+    u32 count = vec_len(jm->ipv4_addresses);
+    ipv4_address_t *ipv4_address = jm->ipv4_addresses;
+
+    jobjectArray ipv4AddressArray = vppIPv4AddressArray(env, count);
+
+    for (i = 0; i < count; i++) {
+        ipv4_address_t *address = &ipv4_address[i];
+
+        jint ip = address->ip;
+        jbyte prefixLength = address->prefix_length;
+
+        jobject ipv4AddressObj = vppIPv4AddressObject(env, ip, prefixLength);
+
+        (*env)->SetObjectArrayElement(env, ipv4AddressArray, i, ipv4AddressObj);
+    }
+
+    returnArray = ipv4AddressArray;
+
+done:
+    vppjni_unlock (jm);
+    return returnArray;
+}
+
+JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_ipv6AddressDump0
+(JNIEnv * env, jobject obj, jstring interfaceName)
+{
+    vppjni_main_t *jm = &vppjni_main;
+    jobject returnArray = NULL;
+    int i;
+
+    vppjni_lock (jm, 19);
+
+    vec_reset_length(jm->ipv6_addresses);
+
+    if (0 != ipAddressDump(env, obj, interfaceName, 1)) {
+        goto done;
+    }
+
+    u32 count = vec_len(jm->ipv6_addresses);
+    ipv6_address_t *ipv6_address = jm->ipv6_addresses;
+
+    jobjectArray ipv6AddressArray = vppIPv6AddressArray(env, count);
+
+    for (i = 0; i < count; i++) {
+        ipv6_address_t *address = &ipv6_address[i];
+
+        jbyteArray ip = (*env)->NewByteArray(env, 16);
+        (*env)->SetByteArrayRegion(env, ip, 0, 16,
+                (signed char*)address->ip);
+
+        jbyte prefixLength = address->prefix_length;
+
+        jobject ipv6AddressObj = vppIPv6AddressObject(env, ip, prefixLength);
+
+        (*env)->SetObjectArrayElement(env, ipv6AddressArray, i, ipv6AddressObj);
+    }
+
+    returnArray = ipv6AddressArray;
+
+done:
+    vppjni_unlock (jm);
+    return returnArray;
+}
+
+static void vl_api_ip_address_details_t_handler (vl_api_ip_address_details_t * mp)
+{
+    vppjni_main_t * jm = &vppjni_main;
+
+    if (!jm->is_ipv6) {
+        ipv4_address_t *address = 0;
+        vec_add2(jm->ipv4_addresses, address, 1);
+        memcpy(&address->ip, mp->ip, 4);
+        address->prefix_length = mp->prefix_length;
+    } else {
+        ipv6_address_t *address = 0;
+        vec_add2(jm->ipv6_addresses, address, 1);
+        memcpy(address->ip, mp->ip, 16);
+        address->prefix_length = mp->prefix_length;
+    }
+}
+
+#define VXLAN_TUNNEL_INTERFACE_NAME_PREFIX "vxlan_tunnel"
+
+JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_vxlanTunnelDump0
+(JNIEnv * env, jobject obj, jint swIfIndex)
+{
+    vppjni_main_t *jm = &vppjni_main;
+    vl_api_vxlan_tunnel_dump_t * mp;
+    jobjectArray returnArray = NULL;
+    u32 my_context_id;
+    f64 timeout;
+    int rv = 0;
+    int i;
+
+    vppjni_lock (jm, 22);
+
+    vec_reset_length(jm->vxlan_tunnel_details);
+
+    my_context_id = vppjni_get_context_id (jm);
+    M(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump);
+    mp->context = clib_host_to_net_u32 (my_context_id);
+    mp->sw_if_index = clib_host_to_net_u32 (swIfIndex);
+    S;
+
+    /* Use a control ping for synchronization */
+    {
+      vl_api_control_ping_t * mp;
+      M(CONTROL_PING, control_ping);
+      S;
+    }
+
+    WNR;
+    if (0 != rv) {
+        goto done;
+    }
+
+    u32 count = vec_len(jm->vxlan_tunnel_details);
+
+    jobjectArray vxlanTunnelDetailsArray = vppVxlanTunnelDetailsArray(env, count);
+
+    for (i = 0; i < count; i++) {
+        vxlan_tunnel_details_t *details = &jm->vxlan_tunnel_details[i];
+
+        jint src_address = details->src_address;
+        jint dst_address = details->dst_address;
+        jint encap_vrf_id = details->encap_vrf_id;
+        jint vni = details->vni;
+        jint decap_next_index = details->decap_next_index;
+
+        jobject vxlanTunnelDetailsObj = vppVxlanTunnelDetailsObject(env,
+                src_address, dst_address, encap_vrf_id, vni, decap_next_index);
+
+        (*env)->SetObjectArrayElement(env, vxlanTunnelDetailsArray, i,
+                vxlanTunnelDetailsObj);
+    }
+
+    returnArray = vxlanTunnelDetailsArray;
+
+done:
+    vppjni_unlock (jm);
+    return returnArray;
+}
+
+static void vl_api_vxlan_tunnel_details_t_handler
+(vl_api_vxlan_tunnel_details_t * mp)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    vxlan_tunnel_details_t *tunnel_details;
+
+    vec_add2(jm->vxlan_tunnel_details, tunnel_details, 1);
+    tunnel_details->src_address = ntohl(mp->src_address);
+    tunnel_details->dst_address = ntohl(mp->dst_address);
+    tunnel_details->encap_vrf_id = ntohl(mp->encap_vrf_id);
+    tunnel_details->vni = ntohl(mp->vni);
+    tunnel_details->decap_next_index = ntohl(mp->decap_next_index);
+}
+
+/* cleanup handler for RX thread */
+static void cleanup_rx_thread(void *arg)
+{
+    vppjni_main_t * jm = &vppjni_main;
+
+    vppjni_lock (jm, 99);
+
+    int getEnvStat = (*jm->jvm)->GetEnv(jm->jvm, (void **)&(jm->jenv), JNI_VERSION_1_6);
+    if (getEnvStat == JNI_EVERSION) {
+        clib_warning ("Unsupported JNI version\n");
+        jm->retval = -999;
+        goto out;
+    } else if (getEnvStat != JNI_EDETACHED) {
+        (*jm->jvm)->DetachCurrentThread(jm->jvm);
+    }
+out:
+    vppjni_unlock (jm);
+}
+
+static void
+vl_api_show_version_reply_t_handler (vl_api_show_version_reply_t * mp)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    i32 retval = ntohl(mp->retval);
+
+    if (retval >= 0) {
+        DEBUG_LOG ("show version request succeeded(%d)");
+        strncpy((char*)jm->program_name, (const char*)mp->program,
+                sizeof(jm->program_name)-1);
+        jm->program_name[sizeof(jm->program_name)-1] = 0;
+
+        strncpy((char*)jm->build_directory, (const char*)mp->build_directory,
+                sizeof(jm->build_directory)-1);
+        jm->build_directory[sizeof(jm->build_directory)-1] = 0;
+
+        strncpy((char*)jm->version, (const char*)mp->version,
+                sizeof(jm->version)-1);
+        jm->version[sizeof(jm->version)-1] = 0;
+
+        strncpy((char*)jm->build_date, (const char*)mp->build_date,
+                sizeof(jm->build_date)-1);
+        jm->build_date[sizeof(jm->build_date)-1] = 0;
+    } else {
+        clib_error ("show version request failed(%d)", retval);
+    }
+    jm->retval = retval;
+    jm->result_ready = 1;
+}
+
+static void vl_api_want_stats_reply_t_handler (vl_api_want_stats_reply_t * mp)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    jm->retval = mp->retval; // FIXME: vpp api does not do ntohl on this retval
+    jm->result_ready = 1;
+}
+
+// control ping needs to be very first thing called
+// to attach rx thread to java thread
+static void vl_api_control_ping_reply_t_handler
+(vl_api_control_ping_reply_t * mp)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    i32 retval = ntohl(mp->retval);
+    jm->retval = retval;
+
+    // attach to java thread if not attached
+    int getEnvStat = (*jm->jvm)->GetEnv(jm->jvm, (void **)&(jm->jenv), JNI_VERSION_1_6);
+    if (getEnvStat == JNI_EDETACHED) {
+        if ((*jm->jvm)->AttachCurrentThread(jm->jvm, (void **)&(jm->jenv), NULL) != 0) {
+            clib_warning("Failed to attach thread\n");
+            jm->retval = -999;
+            goto out;
+        }
+
+        // workaround as we can't use pthread_cleanup_push
+        pthread_key_create(&jm->cleanup_rx_thread_key, cleanup_rx_thread);
+        // destructor is only called if the value of key is non null
+        pthread_setspecific(jm->cleanup_rx_thread_key, (void *)1);
+    } else if (getEnvStat == JNI_EVERSION) {
+        clib_warning ("Unsupported JNI version\n");
+        jm->retval = -999;
+        goto out;
+    }
+    // jm->jenv is now stable global reference that can be reused (only within RX thread)
+
+#if 0
+    // ! callback system removed for now
+    //
+    // get issuer msg-id
+    p = hash_get (jm->ping_hash, context);
+    if (p != 0) { // ping marks end of some dump call
+        JNIEnv *env = jm->jenv;
+        u16 msg_id = (u16)p[0];
+
+        // we will no longer need this
+        hash_unset (jm->ping_hash, context);
+
+        // get original caller obj
+        p = hash_get (jm->callback_hash, context);
+
+        if (p == 0) // don't have callback stored
+            goto out;
+
+        jobject obj = (jobject)p[0]; // object that called original call
+
+        switch (msg_id) {
+            case VL_API_SW_INTERFACE_DUMP:
+                if (0 != sw_if_dump_call_all_callbacks(obj)) {
+                    goto out2;
+                }
+                break;
+            default:
+                clib_warning("Unhandled control ping issuer msg-id: %d", msg_id);
+                goto out2;
+                break;
+        }
+out2:
+        // free the saved obj
+        hash_unset (jm->callback_hash, context);
+        // delete global reference
+        (*env)->DeleteGlobalRef(env, obj);
+    }
+#endif
+
+out:
+    jm->result_ready = 1;
+}
+
+#define VPPJNI_DEBUG_COUNTERS 0
+
+static void vl_api_vnet_interface_counters_t_handler
+(vl_api_vnet_interface_counters_t *mp)
+{
+    vppjni_main_t *jm = &vppjni_main;
+    CLIB_UNUSED(char *counter_name);
+    u32 count, sw_if_index;
+    int i;
+    static sw_interface_stats_t empty_stats = {0, };
+
+    vppjni_lock (jm, 12);
+    count = ntohl (mp->count);
+    sw_if_index = ntohl (mp->first_sw_if_index);
+    if (mp->is_combined == 0) {
+        u64 * vp, v;
+        vp = (u64 *) mp->data;
+
+        for (i = 0; i < count; i++) {
+            sw_interface_details_t *sw_if = NULL;
+
+            v = clib_mem_unaligned (vp, u64);
+            v = clib_net_to_host_u64 (v);
+            vp++;
+
+            if (sw_if_index < vec_len(jm->sw_if_table))
+                sw_if = vec_elt_at_index(jm->sw_if_table, sw_if_index);
+
+            if (sw_if /* && (sw_if->admin_up_down == 1)*/ && sw_if->interface_name[0] != 0) {
+                vec_validate_init_empty(jm->sw_if_stats_by_sw_if_index, sw_if_index, empty_stats);
+                sw_interface_stats_t * s = vec_elt_at_index(jm->sw_if_stats_by_sw_if_index, sw_if_index);
+
+                s->sw_if_index = sw_if_index;
+                s->valid = 1;
+
+                switch (mp->vnet_counter_type) {
+                    case  VNET_INTERFACE_COUNTER_DROP:
+                        counter_name = "drop";
+                        s->rx.pkts.discard = v;
+                        break;
+                    case  VNET_INTERFACE_COUNTER_PUNT:
+                        counter_name = "punt";
+                        s->rx.pkts.unknown_proto = v;
+                        break;
+                    case  VNET_INTERFACE_COUNTER_IP4:
+                        counter_name = "ip4";
+                        s->rx.pkts.ip4 = v;
+                        break;
+                    case  VNET_INTERFACE_COUNTER_IP6:
+                        counter_name = "ip6";
+                        s->rx.pkts.ip6 = v;
+                        break;
+                    case  VNET_INTERFACE_COUNTER_RX_NO_BUF:
+                        counter_name = "rx-no-buf";
+                        s->rx.pkts.fifo_full = v;
+                        break;
+                    case  VNET_INTERFACE_COUNTER_RX_MISS:
+                        counter_name = "rx-miss";
+                        s->rx.pkts.miss = v;
+                        break;
+                    case  VNET_INTERFACE_COUNTER_RX_ERROR:
+                        counter_name = "rx-error";
+                        s->rx.pkts.error = v;
+                        break;
+                    case  VNET_INTERFACE_COUNTER_TX_ERROR:
+                        counter_name = "tx-error (fifo-full)";
+                        s->tx.pkts.fifo_full = v;
+                        break;
+                    default:
+                        counter_name = "bogus";
+                        break;
+                }
+
+#if VPPJNI_DEBUG_COUNTERS == 1
+                clib_warning ("%s (%d): %s (%lld)\n", sw_if->interface_name, s->sw_if_index,
+                        counter_name, v);
+#endif
+            }
+            sw_if_index++;
+        }
+    } else {
+        vlib_counter_t *vp;
+        u64 packets, bytes;
+        vp = (vlib_counter_t *) mp->data;
+
+        for (i = 0; i < count; i++) {
+            sw_interface_details_t *sw_if = NULL;
+
+            packets = clib_mem_unaligned (&vp->packets, u64);
+            packets = clib_net_to_host_u64 (packets);
+            bytes = clib_mem_unaligned (&vp->bytes, u64);
+            bytes = clib_net_to_host_u64 (bytes);
+            vp++;
+
+            if (sw_if_index < vec_len(jm->sw_if_table))
+                sw_if = vec_elt_at_index(jm->sw_if_table, sw_if_index);
+
+            if (sw_if /* && (sw_if->admin_up_down == 1) */ && sw_if->interface_name[0] != 0) {
+                vec_validate_init_empty(jm->sw_if_stats_by_sw_if_index, sw_if_index, empty_stats);
+                sw_interface_stats_t * s = vec_elt_at_index(jm->sw_if_stats_by_sw_if_index, sw_if_index);
+
+                s->valid = 1;
+                s->sw_if_index = sw_if_index;
+
+                switch (mp->vnet_counter_type) {
+                    case  VNET_INTERFACE_COUNTER_RX:
+                        s->rx.pkts.unicast = packets;
+                        s->rx.octets = bytes;
+                        counter_name = "rx";
+                        break;
+
+                    case  VNET_INTERFACE_COUNTER_TX:
+                        s->tx.pkts.unicast = packets;
+                        s->tx.octets = bytes;
+                        counter_name = "tx";
+                        break;
+
+                    default:
+                        counter_name = "bogus";
+                        break;
+                }
+
+#if VPPJNI_DEBUG_COUNTERS == 1
+                clib_warning ("%s (%d): %s.packets %lld\n",
+                        sw_if->interface_name,
+                        sw_if_index, counter_name, packets);
+                clib_warning ("%s (%d): %s.bytes %lld\n",
+                        sw_if->interface_name,
+                        sw_if_index, counter_name, bytes);
+#endif
+            }
+            sw_if_index++;
+        }
+    }
+    vppjni_unlock (jm);
+}
+
+jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+    vppjni_main_t * jm = &vppjni_main;
+    JNIEnv* env;
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_6) != JNI_OK) {
+        return JNI_ERR;
+    }
+
+    if (vppjni_init(env) != 0) {
+        return JNI_ERR;
+    }
+
+    jm->jvm = vm;
+    return JNI_VERSION_1_6;
+}
+
+void JNI_OnUnload(JavaVM *vm, void *reserved) {
+    vppjni_main_t * jm = &vppjni_main;
+    JNIEnv* env;
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_6) != JNI_OK) {
+        return;
+    }
+
+    vppjni_uninit(env);
+
+    jm->jenv = NULL;
+    jm->jvm = NULL;
+}
+
+#define foreach_vpe_api_msg                             \
+_(CONTROL_PING_REPLY, control_ping_reply)               \
+_(SW_INTERFACE_DETAILS, sw_interface_details)           \
+_(SHOW_VERSION_REPLY, show_version_reply)               \
+_(WANT_STATS_REPLY, want_stats_reply)                   \
+_(VNET_INTERFACE_COUNTERS, vnet_interface_counters)     \
+_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags)       \
+_(BRIDGE_DOMAIN_DETAILS, bridge_domain_details)         \
+_(BRIDGE_DOMAIN_SW_IF_DETAILS, bridge_domain_sw_if_details) \
+_(L2_FIB_TABLE_ENTRY, l2_fib_table_entry)               \
+_(IP_ADDRESS_DETAILS, ip_address_details)               \
+_(VXLAN_TUNNEL_DETAILS, vxlan_tunnel_details)
+
+static int connect_to_vpe(char *name)
+{
+    vppjni_main_t * jm = &vppjni_main;
+    api_main_t * am = &api_main;
+
+    if (vl_client_connect_to_vlib("/vpe-api", name, 32) < 0)
+        return -1;
+
+    jm->my_client_index = am->my_client_index;
+    jm->vl_input_queue = am->shmem_hdr->vl_input_queue;
+
+#define _(N,n)                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,     \
+            vl_api_##n##_t_handler,	            \
+            vl_noop_handler,                    \
+            vl_api_##n##_t_endian,              \
+            vl_api_##n##_t_print,               \
+            sizeof(vl_api_##n##_t), 1);
+    foreach_vpe_api_msg;
+#undef _
+
+    return 0;
+}
+
+/* Format an IP6 address. */
+u8 * format_ip6_address (u8 * s, va_list * args)
+{
+    ip6_address_t * a = va_arg (*args, ip6_address_t *);
+    u32 max_zero_run = 0, this_zero_run = 0;
+    int max_zero_run_index = -1, this_zero_run_index=0;
+    int in_zero_run = 0, i;
+    int last_double_colon = 0;
+
+    /* Ugh, this is a pain. Scan forward looking for runs of 0's */
+    for (i = 0; i < ARRAY_LEN (a->as_u16); i++) {
+        if (a->as_u16[i] == 0) {
+            if (in_zero_run) {
+                this_zero_run++;
+            } else {
+                in_zero_run = 1;
+                this_zero_run =1;
+                this_zero_run_index = i;
+            }
+        } else {
+            if (in_zero_run) {
+                /* offer to compress the biggest run of > 1 zero */
+                if (this_zero_run > max_zero_run && this_zero_run > 1) {
+                    max_zero_run_index = this_zero_run_index;
+                    max_zero_run = this_zero_run;
+                }
+            }
+            in_zero_run = 0;
+            this_zero_run = 0;
+        }
+    }
+
+    if (in_zero_run) {
+        if (this_zero_run > max_zero_run && this_zero_run > 1) {
+            max_zero_run_index = this_zero_run_index;
+            max_zero_run = this_zero_run;
+        }
+    }
+
+    for (i = 0; i < ARRAY_LEN (a->as_u16); i++) {
+        if (i == max_zero_run_index) {
+            s = format (s, "::");
+            i += max_zero_run - 1;
+            last_double_colon = 1;
+        } else {
+            s = format (s, "%s%x",
+                    (last_double_colon || i == 0) ? "" : ":",
+                    clib_net_to_host_u16 (a->as_u16[i]));
+            last_double_colon = 0;
+        }
+    }
+
+    return s;
+}
+
+/* Format an IP4 address. */
+u8 * format_ip4_address (u8 * s, va_list * args)
+{
+    u8 * a = va_arg (*args, u8 *);
+    return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
+}
+
+
diff --git a/vpp-api/java/japi/vppjni.h b/vpp-api/java/japi/vppjni.h
new file mode 100644
index 00000000..bd0683ae
--- /dev/null
+++ b/vpp-api/java/japi/vppjni.h
@@ -0,0 +1,308 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_vppjni_h__
+#define __included_vppjni_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <jni.h>
+#include <japi/vppjni_bridge_domain.h>
+
+typedef struct {
+    u8 * name;
+    u32 value;
+} name_sort_t;
+
+typedef struct {
+    u8 valid; // used in a vector of sw_interface_details_t
+
+    u8 interface_name[64];
+    u32 sw_if_index;
+    u32 sup_sw_if_index;
+    u32 l2_address_length;
+    u8 l2_address[8];
+    u8 admin_up_down;
+    u8 link_up_down;
+    u8 link_duplex;
+    u8 link_speed;
+    u16 link_mtu;
+    u32 sub_id;
+    u8 sub_dot1ad;
+    u8 sub_number_of_tags;
+    u16 sub_outer_vlan_id;
+    u16 sub_inner_vlan_id;
+    u8 sub_exact_match;
+    u8 sub_default;
+    u8 sub_outer_vlan_id_any;
+    u8 sub_inner_vlan_id_any;
+    u32 vtr_op;
+    u32 vtr_push_dot1q;
+    u32 vtr_tag1;
+    u32 vtr_tag2;
+} sw_interface_details_t;
+
+typedef struct {
+    u8 * interface_name;
+    u32 sw_if_index;
+    /* 
+     * Subinterface ID. A number 0-N to uniquely identify 
+     * this subinterface under the super interface
+     */
+    u32 sub_id;
+
+    /* 0 = dot1q, 1=dot1ad */
+    u8 sub_dot1ad;
+
+    /* Number of tags 0-2 */
+    u8 sub_number_of_tags;
+    u16 sub_outer_vlan_id;
+    u16 sub_inner_vlan_id;
+    u8 sub_exact_match;
+    u8 sub_default;
+    u8 sub_outer_vlan_id_any;
+    u8 sub_inner_vlan_id_any;
+
+    /* vlan tag rewrite */
+    u32 vtr_op;
+    u32 vtr_push_dot1q;
+    u32 vtr_tag1;
+    u32 vtr_tag2;
+} sw_interface_subif_t;
+
+typedef struct {
+    u8 *desc;
+} sw_if_config_t;
+
+typedef struct {
+    u32 ip;
+    u8 prefix_length;
+} ipv4_address_t;
+
+typedef struct {
+    u8 ip[16];
+    u8 prefix_length;
+} ipv6_address_t;
+
+typedef struct {
+  u64 ip4;
+  u64 ip6;
+  u64 unicast;
+  u64 multicast;
+  u64 broadcast;
+  u64 discard;
+  u64 fifo_full;
+  u64 error;
+  u64 unknown_proto;
+  u64 miss;
+} packet_counters_t;
+
+typedef struct {
+  u64 octets;
+  packet_counters_t pkts;
+} if_counters_t;
+
+typedef struct {
+  u8 valid;
+  u32 sw_if_index;
+  if_counters_t rx;
+  if_counters_t tx;
+} sw_interface_stats_t;
+
+typedef struct {
+    u32 src_address;
+    u32 dst_address;
+    u32 encap_vrf_id;
+    u32 vni;
+    u32 decap_next_index;
+} vxlan_tunnel_details_t;
+
+
+typedef struct {
+  /* Context IDs */
+  volatile u32 context_id_sent;
+  volatile u32 context_id_received;
+
+  /* Spinlock */
+  volatile u32 lock;
+  u32 tag;
+
+  /* To recycle pseudo-synchronous message code from vpp_api_test... */
+  volatile u32 result_ready;
+  volatile i32 retval;
+  volatile u8 *shmem_result;
+
+  /* thread cleanup */
+  pthread_key_t cleanup_rx_thread_key;
+  /* attachment of rx thread to java thread */
+  JNIEnv *jenv;
+  JavaVM *jvm;
+  uword *callback_hash;     // map context_id => jobject
+  uword *ping_hash;         // map ping context_id => msg type called
+
+  /* Timestamp */
+  clib_time_t clib_time;
+
+  /* connected indication */
+  u8 is_connected;
+
+  /* context -> non-trivial reply hash */
+  uword * reply_hash;
+  u32 saved_reply_count;
+
+  /* interface name map */
+  uword * sw_if_index_by_interface_name;
+
+  /* interface counters */
+  sw_interface_stats_t * sw_if_stats_by_sw_if_index;
+
+  /* interface table */
+  sw_interface_details_t * sw_if_table;
+
+  uword * sw_if_config_by_sw_if_index;
+
+  /* interface indices of responses to one sw_if_dump request */
+  u8 collect_indices;
+  u32 * sw_if_dump_if_indices;
+
+  /* program name, build_dir, version */
+  u8 program_name[32];
+  u8 build_directory[256];
+  u8 version[32];
+  u8 build_date[32];
+
+  /* subinterface table */
+  sw_interface_subif_t * sw_if_subif_table;
+
+  /* used in ip_address_dump request and response handling */
+  ipv4_address_t *ipv4_addresses;
+  ipv6_address_t *ipv6_addresses;
+  u8 is_ipv6;
+
+  /* used in vxlan_tunnel_dump request and response handling */
+  vxlan_tunnel_details_t *vxlan_tunnel_details;
+
+  /* main heap */
+  u8 * heap;
+
+  /* convenience */
+  unix_shared_memory_queue_t * vl_input_queue;
+  api_main_t * api_main;
+  u32 my_client_index;
+
+  vjbd_main_t vjbd_main;
+} vppjni_main_t;
+
+vppjni_main_t vppjni_main __attribute__((aligned (64)));
+
+
+static inline u32 vppjni_get_context_id (vppjni_main_t * jm)
+{
+  u32 my_context_id;
+  my_context_id = __sync_add_and_fetch (&jm->context_id_sent, 1);
+  return my_context_id;
+}
+
+static inline void vppjni_lock (vppjni_main_t * jm, u32 tag)
+{
+  while (__sync_lock_test_and_set (&jm->lock, 1))
+    ;
+  jm->tag = tag;
+}
+
+static inline void vppjni_unlock (vppjni_main_t * jm)
+{
+  jm->tag = 0;
+  CLIB_MEMORY_BARRIER();
+  jm->lock = 0;
+}
+
+static inline f64 vppjni_time_now (vppjni_main_t *jm)
+{
+  return clib_time_now (&jm->clib_time);
+}
+
+static inline int vppjni_sanity_check (vppjni_main_t * jm)
+{
+  if (!jm->is_connected)
+    return VNET_API_ERROR_NOT_CONNECTED;
+  return 0;
+}
+
+#define __PACKED(x) x __attribute__((packed))
+
+typedef __PACKED(struct _vl_api_generic_reply {
+  u16 _vl_msg_id;
+  u32 context;
+  i32 retval;
+  u8 data[0];
+}) vl_api_generic_reply_t;
+
+void vl_api_generic_reply_handler (vl_api_generic_reply_t *mp);
+
+/* M: construct, but don't yet send a message */
+
+#define M(T,t)                                  \
+do {                                            \
+  jm->result_ready = 0;                         \
+  mp = vl_msg_api_alloc(sizeof(*mp));           \
+  memset (mp, 0, sizeof (*mp));                 \
+  mp->_vl_msg_id = ntohs (VL_API_##T);          \
+  mp->client_index = jm->my_client_index;       \
+ } while(0);
+
+#define M2(T,t,n)                               \
+do {                                            \
+  jm->result_ready = 0;                         \
+  mp = vl_msg_api_alloc(sizeof(*mp)+(n));       \
+  memset (mp, 0, sizeof (*mp));                 \
+  mp->_vl_msg_id = ntohs (VL_API_##T);          \
+  mp->client_index = jm->my_client_index;       \
+ } while(0);
+
+
+/* S: send a message */
+#define S (vl_msg_api_send_shmem (jm->vl_input_queue, (u8 *)&mp))
+
+/* W: wait for results, with timeout */
+#define W                                       \
+  do {                                          \
+    timeout = vppjni_time_now (jm) + 1.0;       \
+                                                \
+    while (vppjni_time_now (jm) < timeout) {    \
+      if (jm->result_ready == 1) {              \
+        return (jm->retval);                    \
+      }                                         \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
+/* WNR: wait for results, with timeout (without returning) */
+#define WNR                                     \
+  do {                                          \
+    timeout = vppjni_time_now (jm) + 1.0;       \
+                                                \
+    rv = -99;                                   \
+    while (vppjni_time_now (jm) < timeout) {    \
+      if (jm->result_ready == 1) {              \
+        rv = (jm->retval);                      \
+        break;                                  \
+      }                                         \
+    }                                           \
+} while(0);
+
+#endif /* __included_vppjni_h__ */
diff --git a/vpp-api/java/japi/vppjni_bridge_domain.h b/vpp-api/java/japi/vppjni_bridge_domain.h
new file mode 100644
index 00000000..b614a5be
--- /dev/null
+++ b/vpp-api/java/japi/vppjni_bridge_domain.h
@@ -0,0 +1,510 @@
+/*---------------------------------------------------------------------------
+ * Copyright (c) 2009-2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *---------------------------------------------------------------------------
+ */
+
+#ifndef __included_vppjni_bridge_domain_h__
+#define __included_vppjni_bridge_domain_h__
+
+#include <vlib/vlib.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/mhash.h>
+
+/*
+ * The L2fib key is the mac address and bridge domain ID
+ */
+#define MAC_ADDRESS_SIZE  6
+
+typedef struct {
+  union {
+    struct {
+      u16 unused1;
+      u8  mac[MAC_ADDRESS_SIZE]; 
+    } fields;
+    u64 raw;
+  };
+} l2fib_u64_mac_t;
+
+/* 
+ * The l2fib entry results
+ */
+typedef struct {
+  u32 bd_id;
+  l2fib_u64_mac_t mac_addr;
+  u32 sw_if_index;
+  u8  learned:1;
+  u8  bvi:1;
+  u8  filter:1;      // drop packets to/from this mac
+  u8  unused1:5;
+} bd_l2fib_oper_t;
+
+typedef struct {
+  u32 bd_id;
+  u8 * bd_name;
+} bd_local_cfg_t;
+
+typedef struct {
+  u32 bd_id;
+  u32 sw_if_index;
+  u32 shg;
+} bd_sw_if_oper_t;
+
+typedef struct {
+  u32 bd_id;
+  u8 flood:1;
+  u8 forward:1;
+  u8 learn:1;
+  u8 uu_flood:1;
+  u8 arp_term:1;
+  u8 unused1:3;
+  u32 bvi_sw_if_index;
+  u32 n_sw_ifs;
+  bd_sw_if_oper_t * bd_sw_if_oper;
+  f64 last_sync_time;
+  mhash_t l2fib_index_by_mac;
+  bd_l2fib_oper_t * l2fib_oper;	// vector indexed by l2fib_index
+} vjbd_oper_t;
+
+#define BD_OPER_REFRESH_INTERVAL  	2.0
+#define BD_OPER_L2FIB_REFRESH_INTERVAL	5.0
+
+typedef struct {
+  u32 next_bd_id;
+  uword * bd_index_bitmap;
+  uword * bd_index_by_id;
+  mhash_t bd_id_by_name;
+  bd_local_cfg_t * local_cfg;		// vector indexed by bd_index
+  vjbd_oper_t * bd_oper;		// vector indexed by oper_bd_index
+  f64 bd_oper_last_sync_all_time;
+  bd_sw_if_oper_t * sw_if_oper;	// vector indexed by sw_if_index
+  f64 l2fib_oper_last_sync_time;
+  uword * bd_id_by_sw_if_index;
+  uword * oper_bd_index_by_bd_id;
+} vjbd_main_t;
+
+extern vjbd_main_t vjbd_main;
+
+always_inline
+u64 l2fib_mac_to_u64 (u8 * mac_address) {
+  u64 temp;
+
+  // The mac address in memory is A:B:C:D:E:F
+  // The bd id in register is H:L
+#if CLIB_ARCH_IS_LITTLE_ENDIAN
+  // Create the in-register key as F:E:D:C:B:A:H:L
+  // In memory the key is L:H:A:B:C:D:E:F
+  temp = *((u64 *)(mac_address - 2));
+  temp = (temp & ~0xffff);
+#else
+  // Create the in-register key as H:L:A:B:C:D:E:F
+  // In memory the key is H:L:A:B:C:D:E:F
+  temp = *((u64 *)(mac_address)) >> 16;
+#endif
+
+  return temp;
+}
+
+static_always_inline void vjbd_main_init (vjbd_main_t *bdm)
+{
+  bdm->bd_index_by_id = hash_create (0, sizeof(uword));
+  mhash_init_vec_string (&bdm->bd_id_by_name, sizeof (u32));
+  bdm->bd_id_by_sw_if_index = hash_create (0, sizeof (u32));
+  bdm->oper_bd_index_by_bd_id = hash_create (0, sizeof (u32));
+}
+
+static_always_inline u32 vjbd_id_is_valid (vjbd_main_t * bdm, u32 bd_id)
+{
+  return ((bd_id != 0) && (bd_id != ~0) && (bd_id <= bdm->next_bd_id));
+}
+
+static_always_inline u32 vjbd_index_is_free (vjbd_main_t * bdm, u16 bd_index)
+{
+  u32 bd_id = vec_elt_at_index(bdm->local_cfg, bd_index)->bd_id;
+
+  return (!clib_bitmap_get (bdm->bd_index_bitmap, (bd_index)) &&
+          (bd_index < vec_len (bdm->local_cfg)) &&
+          ((bd_id == 0) || (bd_id == ~0)));
+}
+
+static_always_inline u32 vjbd_index_is_valid (vjbd_main_t * bdm, u16 bd_index)
+{
+  return (clib_bitmap_get (bdm->bd_index_bitmap, bd_index) &&
+          (bd_index < vec_len (bdm->local_cfg)));
+}
+
+static_always_inline u32 vjbd_id_from_name (vjbd_main_t * bdm,
+                                            const u8 * bd_name)
+{
+  u32 bd_id;
+  uword * p;
+
+  ASSERT (vec_c_string_is_terminated (bd_name));
+
+  if (bdm->next_bd_id == 0)
+    return ~0;
+
+  p = mhash_get (&bdm->bd_id_by_name, (void *)bd_name);
+  if (p)
+    {
+      bd_id = p[0];
+      ASSERT (vjbd_id_is_valid (bdm, bd_id));
+    }
+  else
+    bd_id = ~0;
+
+  return bd_id;
+}
+
+static_always_inline u32 vjbd_index_from_id (vjbd_main_t * bdm, u32 bd_id)
+{
+  uword * p;
+  u16 bd_index;
+
+  ASSERT (vjbd_id_is_valid (bdm, bd_id));
+
+  p = hash_get (bdm->bd_index_by_id, bd_id);
+
+  ASSERT (p); // there is always an index associated with a valid bd_id
+  bd_index = p[0];
+
+  ASSERT (vjbd_index_is_valid (bdm, bd_index));
+
+  return bd_index;
+}
+
+static_always_inline u32 vjbd_id_from_index (vjbd_main_t * bdm, u16 bd_index)
+{
+  u32 bd_id;
+
+  ASSERT (vjbd_index_is_valid (bdm, bd_index));
+
+  bd_id = vec_elt_at_index(bdm->local_cfg, bd_index)->bd_id;
+
+  ASSERT (vjbd_id_is_valid (bdm, bd_id));
+
+  return bd_id;
+}
+
+static_always_inline u8 * vjbd_name_from_id (vjbd_main_t * bdm, u32 bd_id)
+{
+  u16 bd_index = vjbd_index_from_id (bdm, bd_id);
+
+  return vec_elt_at_index(bdm->local_cfg, bd_index)->bd_name;
+}
+
+static_always_inline u8 * vjbd_oper_name_from_id (vjbd_main_t * bdm, u32 bd_id)
+{
+    if (vjbd_id_is_valid (bdm, bd_id)) {
+        return format(0, "%s", vjbd_name_from_id(bdm, bd_id));
+    } else {
+        return format(0, "BridgeDomainOper%d", bd_id);
+    }
+}
+
+static_always_inline vjbd_oper_t * vjbd_oper_from_id (vjbd_main_t * bdm,
+                                                  u32 bd_id)
+{
+  u16 bd_index = vjbd_index_from_id (bdm, bd_id);
+  return vec_elt_at_index (bdm->bd_oper, bd_index);
+}
+
+static_always_inline void vjbd_oper_maybe_sync_from_vpp (vjbd_main_t * bdm, 
+                                                       u32 bd_id)
+{
+#ifdef VPPJNI_OPER
+  vppjni_vpe_api_msg_main_t *ovam = ovam_get_main ();
+
+  if (bd_id == ~0)
+    {
+      if ((ovam_time_now (ovam) - bdm->bd_oper_last_sync_all_time) >
+          BD_OPER_REFRESH_INTERVAL)
+        {
+          ovam_bridge_domain_dump (bd_id);
+          bdm->bd_oper_last_sync_all_time = ovam_time_now (ovam);
+        }
+    }
+    
+  else 
+    {
+      vjbd_oper_t * bd_oper = vjbd_oper_from_id (bdm, bd_id);
+
+      if ((ovam_time_now (ovam) - bd_oper->last_sync_time) >
+          BD_OPER_REFRESH_INTERVAL)
+        {
+          ovam_bridge_domain_dump (bd_id);
+
+          bd_oper->last_sync_time = ovam_time_now (ovam);
+        }
+    }
+#endif
+}
+
+static_always_inline u32 vjbd_id_from_sw_if_index (vjbd_main_t * bdm,
+                                                 u32 sw_if_index)
+{
+  bd_sw_if_oper_t * bd_sw_if_oper;
+  u32 bd_id = ~0;
+
+  vjbd_oper_maybe_sync_from_vpp (bdm, ~0);
+  if (sw_if_index < vec_len (bdm->sw_if_oper))
+    {
+      bd_sw_if_oper = vec_elt_at_index (bdm->sw_if_oper, sw_if_index);
+      bd_id = bd_sw_if_oper->bd_id;
+    }
+
+  return bd_id;
+}
+
+static_always_inline u8 * vjbd_name_from_sw_if_index (vjbd_main_t * bdm,
+                                                    u32 sw_if_index)
+{
+  u32 bd_id, bd_index;
+  u8 * bd_name = 0;
+  
+  /* DAW-FIXME:
+  ASSERT (ovam_sw_if_index_valid (ovam_get_main(), sw_if_index));
+  */
+  vjbd_oper_maybe_sync_from_vpp (bdm, ~0);
+  bd_id = vjbd_id_from_sw_if_index (bdm, sw_if_index);
+  if (vjbd_id_is_valid (bdm, bd_id))
+    {
+      bd_index = vjbd_index_from_id (bdm, bd_id);
+      bd_name = vec_elt_at_index (bdm->local_cfg, bd_index)->bd_name;
+    }
+
+  return bd_name;
+}
+
+static_always_inline u32 
+vjbd_oper_l2fib_index_from_mac (vjbd_oper_t * bd_oper, u8 * mac)
+{
+  u32 l2fib_index;
+  uword * p;
+
+  p = mhash_get (&bd_oper->l2fib_index_by_mac, mac);
+  if (p)
+    {
+      l2fib_index = p[0];
+      ASSERT (l2fib_index < vec_len (bd_oper->l2fib_oper));
+    }
+  else
+    l2fib_index = ~0;
+
+  return l2fib_index;
+}
+
+static_always_inline u32 vjbd_local_cfg_next_id (vjbd_main_t * bdm, 
+                                               u32 bd_id)
+{
+  u32 i, end = vec_len (bdm->local_cfg);
+  u32 next_bd_id = 0;
+
+  if ((bd_id == 0) || vjbd_id_is_valid (bdm, bd_id))
+    for (i = 0; i < end; i++)
+      {
+        u32 curr_bd_id = bdm->local_cfg[i].bd_id;
+        if ((curr_bd_id != ~0) && (curr_bd_id > bd_id) && 
+            ((next_bd_id == 0) || (curr_bd_id < next_bd_id)))
+          next_bd_id = curr_bd_id;
+      }
+
+  return next_bd_id;
+}
+
+static_always_inline u32 vjbd_sw_if_oper_next_index (vjbd_main_t * bdm, 
+                                                   u32 start, u32 bd_id)
+{
+  u32 i, end = vec_len (bdm->sw_if_oper);
+
+  if (vjbd_id_is_valid (bdm, bd_id))
+    for (i = start; i < end; i++)
+      if (bdm->sw_if_oper[i].bd_id == bd_id)
+        return i;
+
+  return ~0;
+}
+
+static_always_inline void 
+vjbd_oper_l2fib_maybe_sync_from_vpp (vjbd_main_t * bdm)
+{
+#ifdef VPPJNI_OPER
+  vppjni_vpe_api_msg_main_t *ovam = ovam_get_main ();
+  if ((ovam_time_now (ovam) - bdm->l2fib_oper_last_sync_time) >
+      BD_OPER_L2FIB_REFRESH_INTERVAL)
+    {
+      ovam_l2fib_table_dump ();
+      bdm->l2fib_oper_last_sync_time = ovam_time_now (ovam);
+    }
+#endif
+}
+
+static_always_inline void vjbd_l2fib_oper_reset (vjbd_main_t * bdm)
+{
+  vjbd_oper_t * bd_oper;
+
+  vec_foreach (bd_oper, bdm->bd_oper)
+    {
+      mhash_init (&bd_oper->l2fib_index_by_mac, sizeof (u32), MAC_ADDRESS_SIZE);
+      vec_reset_length (bd_oper->l2fib_oper);      
+    }
+}
+
+static_always_inline void vjbd_oper_reset (vjbd_main_t * bdm, u32 bd_id)
+{
+  u16 bd_index;
+  u32 si, len;
+  vjbd_oper_t * bd_oper;
+  u32 end;
+
+  if (!bdm->bd_oper)
+    {
+      ASSERT (vec_len (bdm->sw_if_oper) == 0);
+      return;
+    }
+
+  if (bd_id == ~0)
+    {
+      bdm->bd_oper_last_sync_all_time = 0.0;
+      bd_index = 0;
+      end = vec_len (bdm->bd_oper);
+    }
+  else
+    {
+      bd_index = vjbd_index_from_id (bdm, bd_id);
+      end = bd_index + 1;
+    }
+
+  for (; bd_index < end; bd_index++)
+    {
+      bd_oper = vec_elt_at_index (bdm->bd_oper, bd_index);
+      bd_oper->last_sync_time = 0.0;
+
+      len = vec_len (bdm->sw_if_oper);
+      for (si = vjbd_sw_if_oper_next_index (bdm, 0, bd_id);
+           (si != ~0) && (si < len);
+           si = vjbd_sw_if_oper_next_index (bdm, si + 1, bd_id))
+        {
+          bd_sw_if_oper_t * bd_sw_if_oper;
+
+          bd_sw_if_oper = vec_elt_at_index (bdm->sw_if_oper, si);
+          bd_sw_if_oper->bd_id = ~0;
+        }
+    }
+}
+
+static_always_inline void 
+vjbd_sw_if_add_del (u32 sw_if_index ,u32 bd_id, u8 bvi, u8 shg, u8 is_add)
+{
+  vjbd_main_t * bdm = &vjbd_main;
+  u16 bd_index = vjbd_index_from_id (bdm, bd_id);
+  vjbd_oper_t * bd_oper = vec_elt_at_index (bdm->bd_oper, bd_index);
+  bd_sw_if_oper_t * bd_sw_if_oper;
+  
+  ASSERT (vjbd_id_is_valid (bdm, bd_id));
+  /* DAW-FIXME
+  ASSERT (ovam_sw_if_index_valid (ovam_get_main (), sw_if_index));
+  */
+
+  vec_validate (bdm->sw_if_oper, sw_if_index);
+  bd_sw_if_oper = vec_elt_at_index (bdm->sw_if_oper, sw_if_index);
+  if (is_add)
+    {
+      bd_sw_if_oper->bd_id = bd_id;
+      bd_sw_if_oper->shg = shg;
+      bd_oper->bvi_sw_if_index = bvi ? sw_if_index : ~0;
+    }
+  else
+    {
+      bd_sw_if_oper->bd_id = 0;
+      bd_sw_if_oper->shg = 0;
+      if (bd_oper->bvi_sw_if_index == sw_if_index)
+        bd_oper->bvi_sw_if_index = ~0;
+    }
+}
+
+static_always_inline u32 vjbd_id_sw_if_count (vjbd_main_t * bdm, u32 bd_id)
+{
+  u32 count = 0, i, end = vec_len (bdm->sw_if_oper);
+
+  if (vjbd_id_is_valid (bdm, bd_id))
+    for (count = i = 0; i < end; i++)
+      if (bdm->sw_if_oper[i].bd_id == bd_id)
+        count++;
+
+  return count;
+}
+
+static_always_inline u32 vjbd_find_or_add_bd (vjbd_main_t * bdm, u8 * bd_name)
+{
+  u16 bd_index;
+  u32 bd_id;
+  bd_local_cfg_t * bd_local_cfg;
+  uword mhash_val_bd_id;
+
+  bd_id = vjbd_id_from_name (bdm, bd_name);
+  if (bd_id != ~0)
+    return bd_id;
+
+  mhash_val_bd_id = bd_id = ++bdm->next_bd_id;
+  mhash_set_mem (&bdm->bd_id_by_name, (void *)bd_name, &mhash_val_bd_id, 0);
+
+  bd_index = clib_bitmap_first_clear (bdm->bd_index_bitmap);
+  vec_validate (bdm->local_cfg, bd_index);
+  vec_validate (bdm->bd_oper, bd_index);
+
+  ASSERT (vjbd_index_is_free (bdm, bd_index));
+
+  bd_local_cfg = vec_elt_at_index (bdm->local_cfg, bd_index);
+  bd_local_cfg->bd_id = bd_id;
+  vec_validate_init_c_string (bd_local_cfg->bd_name, bd_name,
+                              vec_len (bd_name) - 1);
+  hash_set (bdm->bd_index_by_id, bd_id, bd_index);
+  bdm->bd_index_bitmap = clib_bitmap_set (bdm->bd_index_bitmap,
+                                          bd_index, 1);
+  return bd_id;
+}
+
+static_always_inline void vjbd_delete_bd (vjbd_main_t * bdm, u32 bd_id)
+{
+  u16 bd_index;
+  bd_local_cfg_t * bd_local_cfg;
+
+  ASSERT (vjbd_id_is_valid (bdm, bd_id));
+
+  // bd must not have any members before deleting
+  ASSERT (!vjbd_id_sw_if_count (bdm, bd_id));
+
+  bd_index = vjbd_index_from_id (bdm, bd_id);
+  bd_local_cfg = vec_elt_at_index (bdm->local_cfg, bd_index);
+  vjbd_oper_reset (bdm, bd_id);
+
+  mhash_unset (&bdm->bd_id_by_name, vjbd_name_from_id (bdm, bd_id), 0);
+  bdm->bd_index_bitmap = clib_bitmap_set (bdm->bd_index_bitmap,
+                                          bd_index, 0);
+  hash_unset (bdm->bd_index_by_id, bd_id);
+  bd_local_cfg->bd_id = ~0;
+  vec_validate_init_c_string (bd_local_cfg->bd_name, "", 0);
+
+  if (clib_bitmap_is_zero (bdm->bd_index_bitmap))
+    {
+      vec_reset_length (bdm->local_cfg);
+      vec_reset_length (bdm->bd_oper);
+    }
+
+  /* Force a resync of all bd_oper data. */
+  bdm->bd_oper_last_sync_all_time = 0.0;
+  vjbd_oper_maybe_sync_from_vpp (bdm, ~0);
+}
+
+#endif /* __included_vppjni_vpp_bridge_domain_h__ */
diff --git a/vpp-api/java/japi/vppjni_env.c b/vpp-api/java/japi/vppjni_env.c
new file mode 100644
index 00000000..1c4ea6eb
--- /dev/null
+++ b/vpp-api/java/japi/vppjni_env.c
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <jni.h>
+
+#include "vppjni_env.h"
+
+// Head of the class registration list.
+static vppjni_class_t *class_head;
+// Head of the class registration list.
+static vppjni_field_t *field_head;
+
+void vppjni_register_class(vppjni_class_t *ptr)
+{
+    vppjni_class_t **where = &class_head;
+    while (*where != NULL) {
+        where = &((*where)->next);
+    }
+    *where = ptr;
+}
+
+void vppjni_register_field(vppjni_field_t *ptr) {
+    vppjni_field_t **where = &field_head;
+    while (*where != NULL) {
+        where = &((*where)->next);
+    }
+    *where = ptr;
+}
+
+jobject vppjni_new_object(JNIEnv *env, const vppjni_class_t *ptr, va_list ap) {
+    jobject obj = (*env)->NewObjectV(env, ptr->jclass, ptr->jinit, ap);
+    if ((*env)->ExceptionCheck(env)) {
+        (*env)->ExceptionDescribe(env);
+        return NULL;
+    }
+
+    return obj;
+}
+
+int vppjni_init(JNIEnv *env)
+{
+    vppjni_class_t *cwlk;
+    vppjni_field_t *fwlk;
+
+    for (cwlk = class_head; cwlk != NULL; cwlk = cwlk->next) {
+        jclass cls;
+        jmethodID method;
+
+        cls = (*env)->FindClass(env, cwlk->fqcn);
+        if ((*env)->ExceptionCheck(env)) {
+            (*env)->ExceptionDescribe(env);
+            vppjni_uninit(env);
+            return JNI_ERR;
+        }
+
+        method = (*env)->GetMethodID(env, cls, "<init>", cwlk->init_sig);
+        if ((*env)->ExceptionCheck(env)) {
+            (*env)->ExceptionDescribe(env);
+            vppjni_uninit(env);
+            return JNI_ERR;
+        }
+
+        cwlk->jclass = (*env)->NewGlobalRef(env, cls);
+        if (cwlk->jclass == NULL) {
+            vppjni_uninit(env);
+            return JNI_ERR;
+        }
+        cwlk->jinit = method;
+    }
+
+    for (fwlk = field_head; fwlk != NULL; fwlk = fwlk->next) {
+        fwlk->jfield = (*env)->GetFieldID(env, fwlk->clsref->jclass, fwlk->name, fwlk->type);
+        if ((*env)->ExceptionCheck(env)) {
+            (*env)->ExceptionDescribe(env);
+            vppjni_uninit(env);
+            return JNI_ERR;
+        }
+    }
+
+    return 0;
+}
+
+void vppjni_uninit(JNIEnv *env) {
+    vppjni_class_t *cwlk;
+    vppjni_field_t *fwlk;
+
+    for (fwlk = field_head; fwlk != NULL; fwlk = fwlk->next) {
+        fwlk->jfield = NULL;
+    }
+
+    for (cwlk = class_head; cwlk != NULL; cwlk = cwlk->next) {
+        if (cwlk->jclass != NULL ) {
+            (*env)->DeleteGlobalRef(env, cwlk->jclass);
+        }
+
+        cwlk->jclass = NULL;
+        cwlk->jinit = NULL;
+    }
+}
+
diff --git a/vpp-api/java/japi/vppjni_env.h b/vpp-api/java/japi/vppjni_env.h
new file mode 100644
index 00000000..44029c2c
--- /dev/null
+++ b/vpp-api/java/japi/vppjni_env.h
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Utilities for accessing Java classes/method/fields in an efficient
+ * manner.
+ */
+
+/*
+ * A potentially-uninitialized reference to a Java class
+ */
+typedef struct vppjni_class {
+    // Fully-Qualified Class Name
+    const char          *fqcn;
+    // Constructor signature
+    const char          *init_sig;
+    // Global reference to class handle
+    jclass              jclass;
+    // Constructor method handle
+    jmethodID           jinit;
+    // Next item in linked list
+    struct vppjni_class *next;
+} vppjni_class_t;
+
+typedef struct jenv_field {
+    // Field name
+    const char           *name;
+    // Field type
+    const char           *type;
+    // Defining class reference
+    const vppjni_class_t *clsref;
+    // Field handle
+    jfieldID             jfield;
+    // Next item in linked list
+    struct jenv_field    *next;
+} vppjni_field_t;
+
+#define VPPJNI_CLASS_SYMBOL(name) vppjni_class_##name
+#define VPPJNI_CLASS_INIT(name) vppjni_class_##name##_init
+#define BIND_JAPI_CLASS(name, sig) \
+    static vppjni_class_t VPPJNI_CLASS_SYMBOL(name); \
+    static void VPPJNI_CLASS_INIT(name)(void) __attribute__((__constructor__)); \
+    static void VPPJNI_CLASS_INIT(name)() \
+    { \
+        VPPJNI_CLASS_SYMBOL(name).fqcn = "org/openvpp/vppjapi/" #name; \
+        VPPJNI_CLASS_SYMBOL(name).init_sig = sig; \
+        vppjni_register_class(&VPPJNI_CLASS_SYMBOL(name)); \
+    } \
+    static __attribute__((unused)) jobject name##Array(JNIEnv *env, jsize length) \
+    { \
+        return (*env)->NewObjectArray(env, length, VPPJNI_CLASS_SYMBOL(name).jclass, NULL); \
+    } \
+    static jobject name##Object(JNIEnv *env, ...) \
+    { \
+        va_list ap; \
+        va_start(ap, env); \
+        jobject obj = vppjni_new_object(env, &VPPJNI_CLASS_SYMBOL(name), ap); \
+        va_end(ap); \
+        return obj; \
+    }
+
+#define VPPJNI_FIELD_SYMBOL(cls, name) vppjni_field_##cls##_##name
+#define VPPJNI_FIELD_INIT(cls, name) vppjni_field_##cls##_##name##_init
+#define BIND_JAPI_FIELD(cls, field, sig) \
+    static vppjni_field_t VPPJNI_FIELD_SYMBOL(cls, field); \
+        static void VPPJNI_FIELD_INIT(cls, field)(void) __attribute__((__constructor__)); \
+    static void VPPJNI_FIELD_INIT(cls, field)() \
+    { \
+        VPPJNI_FIELD_SYMBOL(cls, field).name = #field; \
+        VPPJNI_FIELD_SYMBOL(cls, field).type = sig; \
+        VPPJNI_FIELD_SYMBOL(cls, field).clsref = &VPPJNI_CLASS_SYMBOL(cls); \
+        vppjni_register_field(&VPPJNI_FIELD_SYMBOL(cls, field)); \
+    }
+#define BIND_JAPI_BOOL_FIELD(cls, field) \
+    BIND_JAPI_FIELD(cls, field, "Z"); \
+    static void set_##cls##_##field(JNIEnv *env, jobject obj, jboolean value) \
+    { \
+        (*env)->SetBooleanField(env, obj, VPPJNI_FIELD_SYMBOL(cls, field).jfield, value); \
+    }
+#define BIND_JAPI_BYTE_FIELD(cls, field) \
+    BIND_JAPI_FIELD(cls, field, "B"); \
+    static void set_##cls##_##field(JNIEnv *env, jobject obj, jbyte value) \
+    { \
+        (*env)->SetByteField(env, obj, VPPJNI_FIELD_SYMBOL(cls, field).jfield, value); \
+    }
+#define BIND_JAPI_INT_FIELD(cls, field) \
+    BIND_JAPI_FIELD(cls, field, "I"); \
+    static void set_##cls##_##field(JNIEnv *env, jobject obj, jint value) \
+    { \
+        (*env)->SetIntField(env, obj, VPPJNI_FIELD_SYMBOL(cls, field).jfield, value); \
+    }
+#define BIND_JAPI_OBJ_FIELD(cls, field, sig) \
+    BIND_JAPI_FIELD(cls, field, sig); \
+    static void set_##cls##_##field(JNIEnv *env, jobject obj, jobject value) \
+    { \
+        (*env)->SetObjectField(env, obj, VPPJNI_FIELD_SYMBOL(cls, field).jfield, value); \
+    }
+#define BIND_JAPI_STRING_FIELD(cls, field) \
+    BIND_JAPI_OBJ_FIELD(cls, field, "Ljava/lang/String;")
+
+jobject vppjni_new_object(JNIEnv *env, const vppjni_class_t *ptr, va_list ap) __attribute__ ((visibility ("hidden")));
+void vppjni_register_class(vppjni_class_t *ptr) __attribute__ ((visibility ("hidden")));
+void vppjni_register_field(vppjni_field_t *ptr) __attribute__ ((visibility ("hidden")));
+int vppjni_init(JNIEnv *env) __attribute__ ((visibility ("hidden")));
+void vppjni_uninit(JNIEnv *env) __attribute__ ((visibility ("hidden")));
+
diff --git a/vpp-api/java/m4/ax_check_java_home.m4 b/vpp-api/java/m4/ax_check_java_home.m4
new file mode 100644
index 00000000..cfe8f589
--- /dev/null
+++ b/vpp-api/java/m4/ax_check_java_home.m4
@@ -0,0 +1,80 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_check_java_home.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_JAVA_HOME
+#
+# DESCRIPTION
+#
+#   Check for Sun Java (JDK / JRE) installation, where the 'java' VM is in.
+#   If found, set environment variable JAVA_HOME = Java installation home,
+#   else left JAVA_HOME untouch, which in most case means JAVA_HOME is
+#   empty.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Gleen Salmon <gleensalmon@yahoo.com>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 6
+
+AU_ALIAS([AC_CHECK_JAVA_HOME], [AX_CHECK_JAVA_HOME])
+
+AC_DEFUN([AX_CHECK_JAVA_HOME],
+[AC_MSG_CHECKING([for JAVA_HOME])
+# We used a fake loop so that we can use "break" to exit when the result
+# is found.
+while true
+do
+  # If the user defined JAVA_HOME, don't touch it.
+  test "${JAVA_HOME+set}" = set && break
+
+  # On Mac OS X 10.5 and following, run /usr/libexec/java_home to get
+  # the value of JAVA_HOME to use.
+  # (http://developer.apple.com/library/mac/#qa/qa2001/qa1170.html).
+  JAVA_HOME=`/usr/libexec/java_home 2>/dev/null`
+  test x"$JAVA_HOME" != x && break
+
+  # See if we can find the java executable, and compute from there.
+  TRY_JAVA_HOME=`ls -dr /usr/java/* 2> /dev/null | head -n 1`
+  if test x$TRY_JAVA_HOME != x; then
+    PATH=$PATH:$TRY_JAVA_HOME/bin
+  fi
+  AC_PATH_PROG([JAVA_PATH_NAME], [java])
+  if test "x$JAVA_PATH_NAME" != x; then
+    JAVA_HOME=`echo $JAVA_PATH_NAME | sed "s/\(.*\)[[/]]bin[[/]]java.*/\1/"`
+    break
+  fi
+
+  AC_MSG_NOTICE([Could not compute JAVA_HOME])
+  break
+done
+AC_MSG_RESULT([$JAVA_HOME])
+])
diff --git a/vpp-api/java/m4/ax_check_java_plugin.m4 b/vpp-api/java/m4/ax_check_java_plugin.m4
new file mode 100644
index 00000000..920753e5
--- /dev/null
+++ b/vpp-api/java/m4/ax_check_java_plugin.m4
@@ -0,0 +1,101 @@
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_check_java_plugin.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_JAVA_PLUGIN(<shell-variable>)
+#
+# DESCRIPTION
+#
+#   This macro sets <shell-variable> to empty on failure and to a compatible
+#   version of plugin.jar otherwise. Directories searched are /usr/java/*
+#   and /usr/local/java/*, which are assumed to be j{dk,re} installations.
+#   Apply the shell variable as you see fit. If sun changes things so
+#   <jre>/lib/plugin.jar is not the magic file it will stop working.
+#
+#   This macro assumes that unzip, zipinfo or pkzipc is available (and can
+#   list the contents of the jar archive). The first two are assumed to work
+#   similarly enough to the infozip versisonms. The pkzipc version is
+#   assumed to work if I undertstand the documentation on pkware's site but
+#   YMMV. I do not have access to pwkware's version to test it.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Duncan Simpson <dps@simpson.demon.co.uk>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 7
+
+AU_ALIAS([DPS_CHECK_PLUGIN], [AX_CHECK_JAVA_PLUGIN])
+AC_DEFUN([AX_CHECK_JAVA_PLUGIN],
+[AC_REQUIRE([AC_PROG_AWK])
+AC_REQUIRE([AC_PROG_FGREP])
+AC_CHECK_PROG(ZIPINFO,[zipinfo unzip pkzipc])
+AC_MSG_CHECKING([for the java plugin])
+case "x$ZIPINFO" in
+[*/zipinfo)]
+	zipinf="zipinfo -1" ;;
+[*/unzip)]
+	zipinf="unzip -l";;
+[*/pkzipc)]
+	ziping="unzipc -view";;
+[x*)]
+	AC_MSG_RESULT([skiped, none of zipinfo, unzip and pkzipc found])
+	AC_SUBST($1,[])
+	zipinf="";;
+esac
+if test "x$zipinf" != "x"; then
+jplugin=""
+for jhome in `ls -dr /usr/java/* /usr/local/java/* 2> /dev/null`; do
+for jfile in lib/plugin.jar jre/lib/plugin.jar; do
+if test "x$jplugin" = "x" && test -f "$jhome/$jfile"; then
+eval "$zipinf $jhome/$jfile | $AWK '{ print \$NF; }' | $FGREP netscape/javascript/JSObject" >/dev/null 2>/dev/null
+if test $? -eq 0; then
+dnl Some version of gcj (and javac) refuse to work with some files
+dnl that pass this test. To stop this problem make sure that the compiler
+dnl still works with this jar file in the classpath
+cat << \EOF > Test.java
+/* [#]line __oline__ "configure" */
+public class Test {
+}
+EOF
+if eval "$JAVAC -classpath $jhome/$jfile Test.java 2>/dev/null >/dev/null" && test -f Test.class; then
+jplugin="$jhome/$jfile"
+fi
+rm -f Test.java Test.class
+fi; fi; done; done
+if test "x$jplugin" != "x"; then
+AC_SUBST($1,$jplugin)
+AC_MSG_RESULT($jplugin)
+else
+AC_MSG_RESULT([java plugin not found])
+AC_SUBST($1,[])
+fi
+fi
+])
diff --git a/vpp-api/java/m4/ax_java_check_class.m4 b/vpp-api/java/m4/ax_java_check_class.m4
new file mode 100644
index 00000000..917638ae
--- /dev/null
+++ b/vpp-api/java/m4/ax_java_check_class.m4
@@ -0,0 +1,85 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_java_check_class.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_JAVA_CHECK_CLASS(<class>,<action-if-found>,<action-if-not-found>)
+#
+# DESCRIPTION
+#
+#   Test if a Java class is available. Based on AX_PROG_JAVAC_WORKS. This
+#   version uses a cache variable which is both compiler, options and
+#   classpath dependent (so if you switch from javac to gcj it correctly
+#   notices and redoes the test).
+#
+#   The macro tries to compile a minimal program importing <class>. Some
+#   newer compilers moan about the failure to use this but fail or produce a
+#   class file anyway. All moaing is sunk to /dev/null since I only wanted
+#   to know if the class could be imported. This is a recommended followup
+#   to AX_CHECK_JAVA_PLUGIN with classpath appropriately adjusted.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Duncan Simpson <dps@simpson.demon.co.uk>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 9
+
+AU_ALIAS([DPS_JAVA_CHECK_CLASS], [AX_JAVA_CHECK_CLASS])
+AC_DEFUN([AX_JAVA_CHECK_CLASS],[
+m4_define([cache_val],[m4_translit(ax_cv_have_java_class_$1, " ." ,"__")])
+if test "x$CLASSPATH" != "x"; then
+xtra=" with classpath ${CLASSPATH}"
+xopts=`echo ${CLASSPATH} | ${SED} 's/^ *://'`
+xopts="-classpath $xopts"
+else xtra=""; xopts=""; fi
+cache_var="cache_val"AS_TR_SH([_Jc_${JAVAC}_Cp_${CLASSPATH}])
+AC_CACHE_CHECK([if the $1 class is available$xtra], [$cache_var], [
+JAVA_TEST=Test.java
+CLASS_TEST=Test.class
+cat << \EOF > $JAVA_TEST
+/* [#]xline __oline__ "configure" */
+import $1;
+public class Test {
+}
+EOF
+if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $xopts $JAVA_TEST) >/dev/null 2>&1; then
+  eval "${cache_var}=yes"
+else
+  eval "${cache_var}=no"
+  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
+  cat $JAVA_TEST >&AS_MESSAGE_LOG_FD
+fi
+rm -f $JAVA_TEST $CLASS_TEST
+])
+if eval 'test "x$'${cache_var}'" = "xyes"'; then
+$2
+true; else
+$3
+false; fi])
diff --git a/vpp-api/java/m4/ax_java_options.m4 b/vpp-api/java/m4/ax_java_options.m4
new file mode 100644
index 00000000..36c10d92
--- /dev/null
+++ b/vpp-api/java/m4/ax_java_options.m4
@@ -0,0 +1,48 @@
+# ===========================================================================
+#      http://www.gnu.org/software/autoconf-archive/ax_java_options.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_JAVA_OPTIONS
+#
+# DESCRIPTION
+#
+#   AX_JAVA_OPTIONS adds configure command line options used for Java m4
+#   macros. This Macro is optional.
+#
+#   Note: This is part of the set of autoconf M4 macros for Java programs.
+#   It is VERY IMPORTANT that you download the whole set, some macros depend
+#   on other. Unfortunately, the autoconf archive does not support the
+#   concept of set of macros, so I had to break it for submission. The
+#   general documentation, as well as the sample configure.in, is included
+#   in the AX_PROG_JAVA macro.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Devin Weaver <ktohg@tritarget.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 6
+
+AU_ALIAS([AC_JAVA_OPTIONS], [AX_JAVA_OPTIONS])
+AC_DEFUN([AX_JAVA_OPTIONS],[
+AC_ARG_WITH(java-prefix,
+                        [  --with-java-prefix=PFX  prefix where Java runtime is installed (optional)])
+AC_ARG_WITH(javac-flags,
+                        [  --with-javac-flags=FLAGS flags to pass to the Java compiler (optional)])
+AC_ARG_WITH(java-flags,
+                        [  --with-java-flags=FLAGS flags to pass to the Java VM (optional)])
+JAVAPREFIX=$with_java_prefix
+JAVACFLAGS=$with_javac_flags
+JAVAFLAGS=$with_java_flags
+AC_SUBST(JAVAPREFIX)dnl
+AC_SUBST(JAVACFLAGS)dnl
+AC_SUBST(JAVAFLAGS)dnl
+AC_SUBST(JAVA)dnl
+AC_SUBST(JAVAC)dnl
+])
diff --git a/vpp-api/java/m4/ax_libgcj_jar.m4 b/vpp-api/java/m4/ax_libgcj_jar.m4
new file mode 100644
index 00000000..5e942857
--- /dev/null
+++ b/vpp-api/java/m4/ax_libgcj_jar.m4
@@ -0,0 +1,83 @@
+# ===========================================================================
+#       http://www.gnu.org/software/autoconf-archive/ax_libgcj_jar.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_LIBGCJ_JAR
+#
+# DESCRIPTION
+#
+#   Locate libgcj.jar so you can place it before everything else when using
+#   gcj.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Duncan Simpson <dps@simpson.demon.co.uk>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 9
+
+AU_ALIAS([DPS_LIBGCJ_JAR], [AX_LIBGCJ_JAR])
+AC_DEFUN([AX_LIBGCJ_JAR],
+[
+AC_REQUIRE([AC_EXEEXT])
+AC_REQUIRE([AX_PROG_JAVAC])
+AC_REQUIRE([AC_PROG_FGREP])
+AC_PROG_SED
+if test "x$SED" = "x"; then
+AC_MSG_WARN([sed not avaiable, so libgcj.jar test skipped])
+else
+AC_MSG_CHECKING([if $JAVAC is gcj]);
+jc=`eval "[echo x$JAVAC | $SED 's/^x.*\\/\\([^/]*\\)\$/x\\1/;s/^ *\\([^ ]*\\) .*$/\\1/;s/"$EXEEXT"$//']"`
+if test "x$jc" != "xxgcj"; then
+AC_MSG_RESULT(no)
+else
+AC_MSG_RESULT(yes)
+AC_MSG_CHECKING([libgcj.jar location])
+save_cp="$CLASSPATH";
+unset CLASSPATH;
+AC_MSG_CHECKING([gcj default classpath])
+cat << \EOF > Test.java
+/* [#]line __oline__ "configure" */
+public class Test {
+}
+EOF
+lgcj=`eval "[$JAVAC -v -C Test.java 2>&1 | $FGREP \\(system\\) | $SED 's/^ *\\([^ ]*\\) .*$/\\1/;s/\\.jar\\//.jar/']"`;
+if test -f Test.class && test "x$lgcj" != "x"; then
+AC_MSG_RESULT($lgcj)
+$1="$lgcj:"
+else
+AC_MSG_RESULT(failed)
+$1=""
+fi
+if test "x$save_cp" != "x"; then CLASSPATH="$save_cp"; fi
+rm -f Test.java Test.class
+fi
+fi
+])
diff --git a/vpp-api/java/m4/ax_prog_jar.m4 b/vpp-api/java/m4/ax_prog_jar.m4
new file mode 100644
index 00000000..3c60fcaf
--- /dev/null
+++ b/vpp-api/java/m4/ax_prog_jar.m4
@@ -0,0 +1,49 @@
+# ===========================================================================
+#        http://www.gnu.org/software/autoconf-archive/ax_prog_jar.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_JAR
+#
+# DESCRIPTION
+#
+#   AX_PROG_JAR tests for an existing jar program. It uses the environment
+#   variable JAR then tests in sequence various common jar programs.
+#
+#   If you want to force a specific compiler:
+#
+#   - at the configure.in level, set JAR=yourcompiler before calling
+#   AX_PROG_JAR
+#
+#   - at the configure level, setenv JAR
+#
+#   You can use the JAR variable in your Makefile.in, with @JAR@.
+#
+#   Note: This macro depends on the autoconf M4 macros for Java programs. It
+#   is VERY IMPORTANT that you download that whole set, some macros depend
+#   on other. Unfortunately, the autoconf archive does not support the
+#   concept of set of macros, so I had to break it for submission.
+#
+#   The general documentation of those macros, as well as the sample
+#   configure.in, is included in the AX_PROG_JAVA macro.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Egon Willighagen <e.willighagen@science.ru.nl>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 7
+
+AU_ALIAS([AC_PROG_JAR], [AX_PROG_JAR])
+AC_DEFUN([AX_PROG_JAR],[
+AS_IF([test "x$JAVAPREFIX" = x],
+      [test "x$JAR" = x && AC_CHECK_PROGS([JAR], [jar])],
+      [test "x$JAR" = x && AC_CHECK_PROGS([JAR], [jar], [], [$JAVAPREFIX/bin])])
+test "x$JAR" = x && AC_MSG_ERROR([no acceptable jar program found in \$PATH])
+AC_PROVIDE([$0])dnl
+])
diff --git a/vpp-api/java/m4/ax_prog_java.m4 b/vpp-api/java/m4/ax_prog_java.m4
new file mode 100644
index 00000000..03961db5
--- /dev/null
+++ b/vpp-api/java/m4/ax_prog_java.m4
@@ -0,0 +1,115 @@
+# ===========================================================================
+#       http://www.gnu.org/software/autoconf-archive/ax_prog_java.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_JAVA
+#
+# DESCRIPTION
+#
+#   Here is a summary of the main macros:
+#
+#   AX_PROG_JAVAC: finds a Java compiler.
+#
+#   AX_PROG_JAVA: finds a Java virtual machine.
+#
+#   AX_CHECK_CLASS: finds if we have the given class (beware of CLASSPATH!).
+#
+#   AX_CHECK_RQRD_CLASS: finds if we have the given class and stops
+#   otherwise.
+#
+#   AX_TRY_COMPILE_JAVA: attempt to compile user given source.
+#
+#   AX_TRY_RUN_JAVA: attempt to compile and run user given source.
+#
+#   AX_JAVA_OPTIONS: adds Java configure options.
+#
+#   AX_PROG_JAVA tests an existing Java virtual machine. It uses the
+#   environment variable JAVA then tests in sequence various common Java
+#   virtual machines. For political reasons, it starts with the free ones.
+#   You *must* call [AX_PROG_JAVAC] before.
+#
+#   If you want to force a specific VM:
+#
+#   - at the configure.in level, set JAVA=yourvm before calling AX_PROG_JAVA
+#
+#     (but after AC_INIT)
+#
+#   - at the configure level, setenv JAVA
+#
+#   You can use the JAVA variable in your Makefile.in, with @JAVA@.
+#
+#   *Warning*: its success or failure can depend on a proper setting of the
+#   CLASSPATH env. variable.
+#
+#   TODO: allow to exclude virtual machines (rationale: most Java programs
+#   cannot run with some VM like kaffe).
+#
+#   Note: This is part of the set of autoconf M4 macros for Java programs.
+#   It is VERY IMPORTANT that you download the whole set, some macros depend
+#   on other. Unfortunately, the autoconf archive does not support the
+#   concept of set of macros, so I had to break it for submission.
+#
+#   A Web page, with a link to the latest CVS snapshot is at
+#   <http://www.internatif.org/bortzmeyer/autoconf-Java/>.
+#
+#   This is a sample configure.in Process this file with autoconf to produce
+#   a configure script.
+#
+#     AC_INIT(UnTag.java)
+#
+#     dnl Checks for programs.
+#     AC_CHECK_CLASSPATH
+#     AX_PROG_JAVAC
+#     AX_PROG_JAVA
+#
+#     dnl Checks for classes
+#     AX_CHECK_RQRD_CLASS(org.xml.sax.Parser)
+#     AX_CHECK_RQRD_CLASS(com.jclark.xml.sax.Driver)
+#
+#     AC_OUTPUT(Makefile)
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 9
+
+AU_ALIAS([AC_PROG_JAVA], [AX_PROG_JAVA])
+AC_DEFUN([AX_PROG_JAVA],[
+m4_define([m4_ax_prog_java_list], [kaffe java])dnl
+AS_IF([test "x$JAVAPREFIX" = x],
+      [test x$JAVA = x && AC_CHECK_PROGS([JAVA], [m4_ax_prog_java_list])],
+      [test x$JAVA = x && AC_CHECK_PROGS([JAVA], [m4_ax_prog_java_list], [], [$JAVAPREFIX/bin])])
+test x$JAVA = x && AC_MSG_ERROR([no acceptable Java virtual machine found in \$PATH])
+m4_undefine([m4_ax_prog_java_list])dnl
+AX_PROG_JAVA_WORKS
+AC_PROVIDE([$0])dnl
+])
diff --git a/vpp-api/java/m4/ax_prog_java_cc.m4 b/vpp-api/java/m4/ax_prog_java_cc.m4
new file mode 100644
index 00000000..3df064ff
--- /dev/null
+++ b/vpp-api/java/m4/ax_prog_java_cc.m4
@@ -0,0 +1,104 @@
+# ===========================================================================
+#      http://www.gnu.org/software/autoconf-archive/ax_prog_java_cc.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_JAVA_CC
+#
+# DESCRIPTION
+#
+#   Finds the appropriate java compiler on your path. By preference the java
+#   compiler is gcj, then jikes then javac.
+#
+#   The macro can take one argument specifying a space separated list of
+#   java compiler names.
+#
+#   For example:
+#
+#     AX_PROG_JAVA_CC(javac, gcj)
+#
+#   The macro also sets the compiler options variable: JAVA_CC_OPTS to
+#   something sensible:
+#
+#    - for GCJ it sets it to: @GCJ_OPTS@
+#      (if GCJ_OPTS is not yet defined then it is set to "-C")
+#
+#    - no other compiler has applicable options yet
+#
+#   Here's an example configure.in:
+#
+#     AC_INIT(Makefile.in)
+#     AX_PROG_JAVA_CC()
+#     AC_OUTPUT(Makefile)
+#     dnl End.
+#
+#   And here's the start of the Makefile.in:
+#
+#     PROJECT_ROOT      := @srcdir@
+#     # Tool definitions.
+#     JAVAC             := @JAVA_CC@
+#     JAVAC_OPTS        := @JAVA_CC_OPTS@
+#     JAR_TOOL          := @jar_tool@
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Nic Ferrier <nferrier@tapsellferrier.co.uk>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 4
+
+# AX_PROG_JAVA_CC([COMPILER ...])
+# --------------------------
+# COMPILER ... is a space separated list of java compilers to search for.
+# This just gives the user an opportunity to specify an alternative
+# search list for the java compiler.
+AU_ALIAS([AC_PROG_JAVA_CC], [AX_PROG_JAVA_CC])
+AC_DEFUN([AX_PROG_JAVA_CC],
+[AC_ARG_VAR([JAVA_CC],                [java compiler command])dnl
+AC_ARG_VAR([JAVA_CC_FLAGS],           [java compiler flags])dnl
+m4_ifval([$1],
+      [AC_CHECK_TOOLS(JAVA_CC, [$1])],
+[AC_CHECK_TOOL(JAVA_CC, gcj)
+if test -z "$JAVA_CC"; then
+  AC_CHECK_TOOL(JAVA_CC, javac)
+fi
+if test -z "$JAVA_CC"; then
+  AC_CHECK_TOOL(JAVA_CC, jikes)
+fi
+])
+
+if test "$JAVA_CC" = "gcj"; then
+   if test "$GCJ_OPTS" = ""; then
+      AC_SUBST(GCJ_OPTS,-C)
+   fi
+   AC_SUBST(JAVA_CC_OPTS, @GCJ_OPTS@,
+        [Define the compilation options for GCJ])
+fi
+test -z "$JAVA_CC" && AC_MSG_ERROR([no acceptable java compiler found in \$PATH])
+])# AX_PROG_JAVA_CC
diff --git a/vpp-api/java/m4/ax_prog_java_works.m4 b/vpp-api/java/m4/ax_prog_java_works.m4
new file mode 100644
index 00000000..54e132af
--- /dev/null
+++ b/vpp-api/java/m4/ax_prog_java_works.m4
@@ -0,0 +1,134 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_prog_java_works.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_JAVA_WORKS
+#
+# DESCRIPTION
+#
+#   Internal use ONLY.
+#
+#   Note: This is part of the set of autoconf M4 macros for Java programs.
+#   It is VERY IMPORTANT that you download the whole set, some macros depend
+#   on other. Unfortunately, the autoconf archive does not support the
+#   concept of set of macros, so I had to break it for submission. The
+#   general documentation, as well as the sample configure.in, is included
+#   in the AX_PROG_JAVA macro.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 9
+
+AU_ALIAS([AC_PROG_JAVA_WORKS], [AX_PROG_JAVA_WORKS])
+AC_DEFUN([AX_PROG_JAVA_WORKS], [
+AC_PATH_PROG(UUDECODE, uudecode, [no])
+if test x$UUDECODE != xno; then
+AC_CACHE_CHECK([if uudecode can decode base 64 file], ac_cv_prog_uudecode_base64, [
+dnl /**
+dnl  * Test.java: used to test if java compiler works.
+dnl  */
+dnl public class Test
+dnl {
+dnl
+dnl public static void
+dnl main( String[] argv )
+dnl {
+dnl     System.exit (0);
+dnl }
+dnl
+dnl }
+cat << \EOF > Test.uue
+begin-base64 644 Test.class
+yv66vgADAC0AFQcAAgEABFRlc3QHAAQBABBqYXZhL2xhbmcvT2JqZWN0AQAE
+bWFpbgEAFihbTGphdmEvbGFuZy9TdHJpbmc7KVYBAARDb2RlAQAPTGluZU51
+bWJlclRhYmxlDAAKAAsBAARleGl0AQAEKEkpVgoADQAJBwAOAQAQamF2YS9s
+YW5nL1N5c3RlbQEABjxpbml0PgEAAygpVgwADwAQCgADABEBAApTb3VyY2VG
+aWxlAQAJVGVzdC5qYXZhACEAAQADAAAAAAACAAkABQAGAAEABwAAACEAAQAB
+AAAABQO4AAyxAAAAAQAIAAAACgACAAAACgAEAAsAAQAPABAAAQAHAAAAIQAB
+AAEAAAAFKrcAErEAAAABAAgAAAAKAAIAAAAEAAQABAABABMAAAACABQ=
+====
+EOF
+if $UUDECODE Test.uue; then
+        ac_cv_prog_uudecode_base64=yes
+else
+        echo "configure: __oline__: uudecode had trouble decoding base 64 file 'Test.uue'" >&AS_MESSAGE_LOG_FD
+        echo "configure: failed file was:" >&AS_MESSAGE_LOG_FD
+        cat Test.uue >&AS_MESSAGE_LOG_FD
+        ac_cv_prog_uudecode_base64=no
+fi
+rm -f Test.uue])
+fi
+if test x$ac_cv_prog_uudecode_base64 != xyes; then
+        rm -f Test.class
+        AC_MSG_WARN([I have to compile Test.class from scratch])
+        if test x$ac_cv_prog_javac_works = xno; then
+                AC_MSG_ERROR([Cannot compile java source. $JAVAC does not work properly])
+        fi
+        if test x$ac_cv_prog_javac_works = x; then
+                AX_PROG_JAVAC
+        fi
+fi
+AC_CACHE_CHECK(if $JAVA works, ac_cv_prog_java_works, [
+JAVA_TEST=Test.java
+CLASS_TEST=Test.class
+TEST=Test
+changequote(, )dnl
+cat << \EOF > $JAVA_TEST
+/* [#]line __oline__ "configure" */
+public class Test {
+public static void main (String args[]) {
+        System.exit (0);
+} }
+EOF
+changequote([, ])dnl
+if test x$ac_cv_prog_uudecode_base64 != xyes; then
+        if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) && test -s $CLASS_TEST; then
+                :
+        else
+          echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
+          cat $JAVA_TEST >&AS_MESSAGE_LOG_FD
+          AC_MSG_ERROR(The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?))
+        fi
+fi
+if AC_TRY_COMMAND($JAVA -classpath . $JAVAFLAGS $TEST) >/dev/null 2>&1; then
+  ac_cv_prog_java_works=yes
+else
+  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
+  cat $JAVA_TEST >&AS_MESSAGE_LOG_FD
+  AC_MSG_ERROR(The Java VM $JAVA failed (see config.log, check the CLASSPATH?))
+fi
+rm -fr $JAVA_TEST $CLASS_TEST Test.uue
+])
+AC_PROVIDE([$0])dnl
+]
+)
diff --git a/vpp-api/java/m4/ax_prog_javac.m4 b/vpp-api/java/m4/ax_prog_javac.m4
new file mode 100644
index 00000000..d061243c
--- /dev/null
+++ b/vpp-api/java/m4/ax_prog_javac.m4
@@ -0,0 +1,79 @@
+# ===========================================================================
+#       http://www.gnu.org/software/autoconf-archive/ax_prog_javac.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_JAVAC
+#
+# DESCRIPTION
+#
+#   AX_PROG_JAVAC tests an existing Java compiler. It uses the environment
+#   variable JAVAC then tests in sequence various common Java compilers. For
+#   political reasons, it starts with the free ones.
+#
+#   If you want to force a specific compiler:
+#
+#   - at the configure.in level, set JAVAC=yourcompiler before calling
+#   AX_PROG_JAVAC
+#
+#   - at the configure level, setenv JAVAC
+#
+#   You can use the JAVAC variable in your Makefile.in, with @JAVAC@.
+#
+#   *Warning*: its success or failure can depend on a proper setting of the
+#   CLASSPATH env. variable.
+#
+#   TODO: allow to exclude compilers (rationale: most Java programs cannot
+#   compile with some compilers like guavac).
+#
+#   Note: This is part of the set of autoconf M4 macros for Java programs.
+#   It is VERY IMPORTANT that you download the whole set, some macros depend
+#   on other. Unfortunately, the autoconf archive does not support the
+#   concept of set of macros, so I had to break it for submission. The
+#   general documentation, as well as the sample configure.in, is included
+#   in the AX_PROG_JAVA macro.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 7
+
+AU_ALIAS([AC_PROG_JAVAC], [AX_PROG_JAVAC])
+AC_DEFUN([AX_PROG_JAVAC],[
+m4_define([m4_ax_prog_javac_list],["gcj -C" guavac jikes javac])dnl
+AS_IF([test "x$JAVAPREFIX" = x],
+      [test "x$JAVAC" = x && AC_CHECK_PROGS([JAVAC], [m4_ax_prog_javac_list])],
+      [test "x$JAVAC" = x && AC_CHECK_PROGS([JAVAC], [m4_ax_prog_javac_list], [], [$JAVAPREFIX/bin])])
+m4_undefine([m4_ax_prog_javac_list])dnl
+test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH])
+AX_PROG_JAVAC_WORKS
+AC_PROVIDE([$0])dnl
+])
diff --git a/vpp-api/java/m4/ax_prog_javac_works.m4 b/vpp-api/java/m4/ax_prog_javac_works.m4
new file mode 100644
index 00000000..7dfa1e37
--- /dev/null
+++ b/vpp-api/java/m4/ax_prog_javac_works.m4
@@ -0,0 +1,72 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_prog_javac_works.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_JAVAC_WORKS
+#
+# DESCRIPTION
+#
+#   Internal use ONLY.
+#
+#   Note: This is part of the set of autoconf M4 macros for Java programs.
+#   It is VERY IMPORTANT that you download the whole set, some macros depend
+#   on other. Unfortunately, the autoconf archive does not support the
+#   concept of set of macros, so I had to break it for submission. The
+#   general documentation, as well as the sample configure.in, is included
+#   in the AX_PROG_JAVA macro.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 6
+
+AU_ALIAS([AC_PROG_JAVAC_WORKS], [AX_PROG_JAVAC_WORKS])
+AC_DEFUN([AX_PROG_JAVAC_WORKS],[
+AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [
+JAVA_TEST=Test.java
+CLASS_TEST=Test.class
+cat << \EOF > $JAVA_TEST
+/* [#]line __oline__ "configure" */
+public class Test {
+}
+EOF
+if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) >/dev/null 2>&1; then
+  ac_cv_prog_javac_works=yes
+else
+  AC_MSG_ERROR([The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)])
+  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
+  cat $JAVA_TEST >&AS_MESSAGE_LOG_FD
+fi
+rm -f $JAVA_TEST $CLASS_TEST
+])
+AC_PROVIDE([$0])dnl
+])
diff --git a/vpp-api/java/m4/ax_prog_javadoc.m4 b/vpp-api/java/m4/ax_prog_javadoc.m4
new file mode 100644
index 00000000..bcb6045a
--- /dev/null
+++ b/vpp-api/java/m4/ax_prog_javadoc.m4
@@ -0,0 +1,50 @@
+# ===========================================================================
+#      http://www.gnu.org/software/autoconf-archive/ax_prog_javadoc.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_JAVADOC
+#
+# DESCRIPTION
+#
+#   AX_PROG_JAVADOC tests for an existing javadoc generator. It uses the
+#   environment variable JAVADOC then tests in sequence various common
+#   javadoc generator.
+#
+#   If you want to force a specific compiler:
+#
+#   - at the configure.in level, set JAVADOC=yourgenerator before calling
+#   AX_PROG_JAVADOC
+#
+#   - at the configure level, setenv JAVADOC
+#
+#   You can use the JAVADOC variable in your Makefile.in, with @JAVADOC@.
+#
+#   Note: This macro depends on the autoconf M4 macros for Java programs. It
+#   is VERY IMPORTANT that you download that whole set, some macros depend
+#   on other. Unfortunately, the autoconf archive does not support the
+#   concept of set of macros, so I had to break it for submission.
+#
+#   The general documentation of those macros, as well as the sample
+#   configure.in, is included in the AX_PROG_JAVA macro.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Egon Willighagen <e.willighagen@science.ru.nl>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 8
+
+AU_ALIAS([AC_PROG_JAVADOC], [AX_PROG_JAVADOC])
+AC_DEFUN([AX_PROG_JAVADOC],[
+AS_IF([test "x$JAVAPREFIX" = x],
+      [test "x$JAVADOC" = x && AC_CHECK_PROGS([JAVADOC], [javadoc])],
+      [test "x$JAVADOC" = x && AC_CHECK_PROGS([JAVADOC], [javadoc], [], [$JAVAPREFIX/bin])])
+test "x$JAVADOC" = x && AC_MSG_ERROR([no acceptable javadoc generator found in \$PATH])
+AC_PROVIDE([$0])dnl
+])
diff --git a/vpp-api/java/m4/ax_prog_javah.m4 b/vpp-api/java/m4/ax_prog_javah.m4
new file mode 100644
index 00000000..cefc616d
--- /dev/null
+++ b/vpp-api/java/m4/ax_prog_javah.m4
@@ -0,0 +1,64 @@
+# ===========================================================================
+#       http://www.gnu.org/software/autoconf-archive/ax_prog_javah.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_JAVAH
+#
+# DESCRIPTION
+#
+#   AX_PROG_JAVAH tests the availability of the javah header generator and
+#   looks for the jni.h header file. If available, JAVAH is set to the full
+#   path of javah and CPPFLAGS is updated accordingly.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Luc Maisonobe <luc@spaceroots.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 8
+
+AU_ALIAS([AC_PROG_JAVAH], [AX_PROG_JAVAH])
+AC_DEFUN([AX_PROG_JAVAH],[
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CPP])dnl
+AC_PATH_PROG(JAVAH,javah)
+AS_IF([test -n "$ac_cv_path_JAVAH"],
+      [
+        AC_TRY_CPP([#include <jni.h>],,[
+        ac_save_CPPFLAGS="$CPPFLAGS"
+		_ACJAVAH_FOLLOW_SYMLINKS("$ac_cv_path_JAVAH")
+        ax_prog_javah_bin_dir=`AS_DIRNAME([$_ACJAVAH_FOLLOWED])`
+        ac_dir="`AS_DIRNAME([$ax_prog_javah_bin_dir])`/include"
+        AS_CASE([$build_os],
+                [cygwin*],
+                [ac_machdep=win32],
+                [ac_machdep=`AS_ECHO($build_os) | sed 's,[[-0-9]].*,,'`])
+        CPPFLAGS="$ac_save_CPPFLAGS -I$ac_dir -I$ac_dir/$ac_machdep"
+        AC_TRY_CPP([#include <jni.h>],
+                   ac_save_CPPFLAGS="$CPPFLAGS",
+                   AC_MSG_WARN([unable to include <jni.h>]))
+        CPPFLAGS="$ac_save_CPPFLAGS"])
+      ])
+])
+
+AC_DEFUN([_ACJAVAH_FOLLOW_SYMLINKS],[
+# find the include directory relative to the javac executable
+_cur="$1"
+while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do
+        AC_MSG_CHECKING([symlink for $_cur])
+        _slink=`ls -ld "$_cur" | sed 's/.* -> //'`
+        case "$_slink" in
+        /*) _cur="$_slink";;
+        # 'X' avoids triggering unwanted echo options.
+        *) _cur=`echo "X$_cur" | sed -e 's/^X//' -e 's:[[^/]]*$::'`"$_slink";;
+        esac
+        AC_MSG_RESULT([$_cur])
+done
+_ACJAVAH_FOLLOWED="$_cur"
+])
diff --git a/vpp-api/java/m4/ax_try_compile_java.m4 b/vpp-api/java/m4/ax_try_compile_java.m4
new file mode 100644
index 00000000..a8ed6b2a
--- /dev/null
+++ b/vpp-api/java/m4/ax_try_compile_java.m4
@@ -0,0 +1,55 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_try_compile_java.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_TRY_COMPILE_JAVA
+#
+# DESCRIPTION
+#
+#   AX_TRY_COMPILE_JAVA attempt to compile user given source.
+#
+#   *Warning*: its success or failure can depend on a proper setting of the
+#   CLASSPATH env. variable.
+#
+#   Note: This is part of the set of autoconf M4 macros for Java programs.
+#   It is VERY IMPORTANT that you download the whole set, some macros depend
+#   on other. Unfortunately, the autoconf archive does not support the
+#   concept of set of macros, so I had to break it for submission. The
+#   general documentation, as well as the sample configure.in, is included
+#   in the AX_PROG_JAVA macro.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Devin Weaver <ktohg@tritarget.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 8
+
+AU_ALIAS([AC_TRY_COMPILE_JAVA], [AX_TRY_COMPILE_JAVA])
+AC_DEFUN([AX_TRY_COMPILE_JAVA],[
+AC_REQUIRE([AX_PROG_JAVAC])dnl
+cat << \EOF > Test.java
+/* [#]line __oline__ "configure" */
+ifelse([$1], , , [import $1;])
+public class Test {
+[$2]
+}
+EOF
+if AC_TRY_COMMAND($JAVAC $JAVACFLAGS Test.java) && test -s Test.class
+then
+dnl Don't remove the temporary files here, so they can be examined.
+  ifelse([$3], , :, [$3])
+else
+  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
+  cat Test.java >&AS_MESSAGE_LOG_FD
+ifelse([$4], , , [  rm -fr Test.java Test.class
+  $4
+])dnl
+fi
+rm -fr Test.java Test.class])
diff --git a/vpp-api/java/m4/ax_try_run_java.m4 b/vpp-api/java/m4/ax_try_run_java.m4
new file mode 100644
index 00000000..c680f03f
--- /dev/null
+++ b/vpp-api/java/m4/ax_try_run_java.m4
@@ -0,0 +1,56 @@
+# ===========================================================================
+#      http://www.gnu.org/software/autoconf-archive/ax_try_run_java.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_TRY_RUN_JAVA
+#
+# DESCRIPTION
+#
+#   AX_TRY_RUN_JAVA attempt to compile and run user given source.
+#
+#   *Warning*: its success or failure can depend on a proper setting of the
+#   CLASSPATH env. variable.
+#
+#   Note: This is part of the set of autoconf M4 macros for Java programs.
+#   It is VERY IMPORTANT that you download the whole set, some macros depend
+#   on other. Unfortunately, the autoconf archive does not support the
+#   concept of set of macros, so I had to break it for submission. The
+#   general documentation, as well as the sample configure.in, is included
+#   in the AX_PROG_JAVA macro.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Devin Weaver <ktohg@tritarget.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 2
+
+AU_ALIAS([AC_TRY_RUN_JAVA], [AX_TRY_RUN_JAVA])
+AC_DEFUN([AX_TRY_RUN_JAVA],[
+AC_REQUIRE([AX_PROG_JAVAC])dnl
+AC_REQUIRE([AX_PROG_JAVA])dnl
+cat << \EOF > Test.java
+/* [#]line __oline__ "configure" */
+ifelse([$1], , , [include $1;])
+public class Test {
+[$2]
+}
+EOF
+if AC_TRY_COMMAND($JAVAC $JAVACFLAGS Test.java) && test -s Test.class && ($JAVA $JAVAFLAGS Test; exit) 2>/dev/null
+then
+dnl Don't remove the temporary files here, so they can be examined.
+  ifelse([$3], , :, [$3])
+else
+  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
+  cat Test.java >&AS_MESSAGE_LOG_FD
+ifelse([$4], , , [  rm -fr Test.java Test.class
+  $4
+])dnl
+fi
+rm -fr Test.java Test.class])
diff --git a/vpp-api/python/Makefile.am b/vpp-api/python/Makefile.am
new file mode 100644
index 00000000..b96ff3d9
--- /dev/null
+++ b/vpp-api/python/Makefile.am
@@ -0,0 +1,49 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+AUTOMAKE_OPTIONS = foreign subdir-objects
+ACLOCAL_AMFLAGS = -I m4
+AM_CFLAGS = -Wall 
+
+BUILT_SOURCES =
+bin_PROGRAMS = 
+CLEANFILES = 
+lib_LTLIBRARIES = 
+noinst_PROGRAMS = test_pneum
+nobase_include_HEADERS = pneum/pneum.h
+
+#
+# Python binding
+#
+lib_LTLIBRARIES += libpneum.la
+libpneum_la_SOURCES = pneum/pneum.c
+libpneum_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra -lpthread -lm -lrt
+libpneum_la_LDFLAGS = -module
+libpneum_la_CPPFLAGS =
+
+BUILT_SOURCES += vpp_papi.py
+
+vpp_papi.py: $(prefix)/../vpp/api/vpe.api pneum/api-gen.py
+	@echo "  PYTHON API";                                            	  \
+	$(CC) $(CPPFLAGS) -E -P -C -x c $<			                  \
+	| vppapigen --input - --python defs_$@;                                   \
+	echo "#include <api/vpe_msg_enum.h>"                                      \
+	| $(CC) $(CPPFLAGS) -E -P -x c - | grep VL_API                            \
+	| @srcdir@/pneum/api-gen.py -i defs_$@ > @srcdir@/vpp_papi/$@
+
+#
+# Test client
+#
+noinst_PROGRAMS += test_pneum
+test_pneum_SOURCES = pneum/pneum.c pneum/test_pneum.c
+test_pneum_LDADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra -lpthread -lm -lrt
diff --git a/vpp-api/python/README.rst b/vpp-api/python/README.rst
new file mode 100644
index 00000000..e69de29b
diff --git a/vpp-api/python/pneum/api-gen.py b/vpp-api/python/pneum/api-gen.py
new file mode 100755
index 00000000..bbc9c329
--- /dev/null
+++ b/vpp-api/python/pneum/api-gen.py
@@ -0,0 +1,337 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import argparse, sys, os, importlib, pprint
+
+parser = argparse.ArgumentParser(description='VPP Python API generator')
+parser.add_argument('-i', action="store", dest="inputfile")
+parser.add_argument('-c', '--cfile', action="store")
+args = parser.parse_args()
+
+sys.path.append(".")
+
+inputfile = args.inputfile.replace('.py', '')
+cfg = importlib.import_module(inputfile, package=None)
+
+# https://docs.python.org/3/library/struct.html
+format_struct = {'u8': 'B',
+                 'u16' : 'H',
+                 'u32' : 'I',
+                 'i32' : 'i',
+                 'u64' : 'Q',
+                 'f64' : 'd',
+                 'vl_api_ip4_fib_counter_t' : 'IBQQ',
+                 'vl_api_ip6_fib_counter_t' : 'QQBQQ',
+                 };
+type_size = {'u8':   1,
+             'u16' : 2,
+             'u32' : 4,
+             'i32' : 4,
+             'u64' : 8,
+             'f64' : 8,
+             'vl_api_ip4_fib_counter_t' : 21,
+             'vl_api_ip6_fib_counter_t' : 33,
+};
+
+def get_args(t):
+    args = None
+    for i in t:
+        arg = i[1]
+        arg = arg.replace('_','')
+        if args == None:
+            args = arg
+            continue
+        args = args + ', ' +  arg
+    return args
+
+def get_pack(t):
+    bytecount = 0
+    pack = '>'
+    tup = u''
+    j = -1
+    for i in t:
+        j += 1
+        if len(i) is 3:
+            size = type_size[i[0]]
+            bytecount += size * int(i[2])
+            if i[2] == '0':
+                tup += 'msg[' + str(bytecount) + ':],'
+                continue
+            if size == 1:
+                n = i[2] * size
+                pack += str(n) + 's'
+                tup += 'tr[' + str(j) + '],'
+                continue
+            pack += format_struct[i[0]] * int(i[2])
+            tup += 'tr[' + str(j) + ':' + str(j + int(i[2])) + '],'
+            j += int(i[2]) - 1
+        else:
+            bytecount += type_size[i[0]]
+            pack += format_struct[i[0]]
+            tup += 'tr[' + str(j) + '],'
+    return pack, bytecount, tup
+
+def get_reply_func(f):
+    if f['name']+'_reply' in func_name:
+        return func_name[f['name']+'_reply']
+    if f['name'].find('_dump') > 0:
+        r = f['name'].replace('_dump','_details')
+        if r in func_name:
+            return func_name[r]
+    return None
+
+def get_enums():
+    # Read enums from stdin
+    enums_by_name = {}
+    enums_by_index = {}
+    i = 1
+    for l in sys.stdin:
+        l = l.replace(',\n','')
+        print l, "=", i
+
+        l = l.replace('VL_API_','').lower()
+        enums_by_name[l] = i
+        enums_by_index[i] = l
+
+        i += 1
+    return enums_by_name, enums_by_index
+
+def get_definitions():
+    # Pass 1
+    func_list = []
+    func_name = {}
+    i = 1
+    for a in cfg.vppapidef:
+        pack, packlen, tup = get_pack(a[1:])
+        func_name[a[0]] = dict([('name', a[0]), ('args', get_args(a[4:])), ('full_args', get_args(a[1:])), ('pack', pack), ('packlen', packlen), ('tup', tup)])
+        func_list.append(func_name[a[0]])  # Indexed by name
+    return func_list, func_name
+
+def generate_c_macros(func_list, enums_by_name):
+    file = open(args.cfile, 'w+')
+    print >>file, "#define foreach_api_msg \\"
+    for f in func_list:
+        if not f['name'] in enums_by_name:
+            continue
+        print >>file, "_(" + f['name'].upper() + ", " + f['name'] + ") \\"
+    print >>file, '''
+void pneum_set_handlers(void) {
+#define _(N,n)							\\
+  api_func_table[VL_API_##N] = sizeof(vl_api_##n##_t);
+  foreach_api_msg;
+#undef _
+}
+    '''
+
+#
+# XXX:Deal with empty arrays
+# Print array with a hash of 'decode' and 'multipart'
+# Simplify to do only decode for now. And deduce multipart from _dump?
+#
+def decode_function_print(name, args, pack, packlen, tup):
+
+    print(u'def ' + name + u'_decode(msg):')
+    print(u"    n = namedtuple('" + name + "', '" + args + "')" +
+    '''
+    if not n:
+        return None
+    ''')
+    print(u"    tr = unpack('" + pack + "', msg[:" + str(packlen) + "])")
+    print(u"    r = n._make((" + tup + "))" +
+    '''
+    if not r:
+        return None
+    return r
+    ''')
+
+def function_print(name, id, args, pack, multipart):
+    if not args:
+        args = ""
+        print "def", name + "(async = False):"
+    else:
+        print "def", name + "(" + args + ",async = False):"
+    print "    global waiting_for_reply"
+    print "    context = get_context(" + id + ")"
+
+    print '''
+    results[context] = {}
+    results[context]['e'] = threading.Event()
+    results[context]['e'].clear()
+    results[context]['r'] = []
+    waiting_for_reply = True
+    '''
+    if multipart == True:
+        print "    results[context]['m'] = True"
+
+    print "    vpp_api.write(pack('" + pack + "', " + id + ", 0, context, " + args + "))"
+
+    if multipart == True:
+        print "    vpp_api.write(pack('>HII', VL_API_CONTROL_PING, 0, context))"
+
+    print '''
+    if not async:
+        results[context]['e'].wait(5)
+        return results[context]['r']
+    return context
+    '''
+
+#
+# Should dynamically create size
+#
+def api_table_print (name, msg_id):
+    f = name + '_decode'
+    print('api_func_table[' + msg_id + '] = ' + f)
+
+#
+# Generate the main Python file
+#
+
+print '''#!/usr/bin/env python3
+
+import sys, time, threading, signal, os, logging
+from struct import *
+from collections import namedtuple
+
+#
+# Import C API shared object
+#
+import vpp_api
+
+context = 0
+results = {}
+waiting_for_reply = False
+
+#
+# XXX: Make this return a unique number
+#
+def get_context(id):
+    global context
+    context += 1
+    return context
+
+def msg_handler(msg):
+    global result, context, event_callback, waiting_for_reply
+    if not msg:
+        logging.warning('vpp_api.read failed')
+        return
+
+    id = unpack('>H', msg[0:2])
+    logging.debug('Received message', id[0])
+    if id[0] == VL_API_RX_THREAD_EXIT:
+        logging.info("We got told to leave")
+        return;
+
+    #
+    # Decode message and returns a tuple.
+    #
+    logging.debug('api_func', api_func_table[id[0]])
+    r = api_func_table[id[0]](msg)
+    if not r:
+        logging.warning('Message decode failed', id[0])
+        return
+
+    if 'context' in r._asdict():
+        if r.context > 0:
+            context = r.context
+
+    #
+    # XXX: Call provided callback for event
+    # Are we guaranteed to not get an event during processing of other messages?
+    # How to differentiate what's a callback message and what not? Context = 0?
+    #
+    logging.debug('R:', context, r, waiting_for_reply)
+    if waiting_for_reply == False:
+        event_callback(r)
+        return
+
+    #
+    # Collect results until control ping
+    #
+    if id[0] == VL_API_CONTROL_PING_REPLY:
+        results[context]['e'].set()
+        waiting_for_reply = False
+        return
+    if not context in results:
+        logging.warning('Not expecting results for this context', context)
+        return
+    if 'm' in results[context]:
+        results[context]['r'].append(r)
+        return
+
+    results[context]['r'] = r
+    results[context]['e'].set()
+    waiting_for_reply = False
+
+def connect(name):
+    signal.alarm(3) # 3 second
+    rv = vpp_api.connect(name, msg_handler)
+    signal.alarm(0)
+    logging.info("Connect:", rv)
+    return rv
+
+def disconnect():
+    rv = vpp_api.disconnect()
+    logging.info("Disconnected")
+    return rv
+
+def register_event_callback(callback):
+    global event_callback
+    event_callback = callback
+'''
+
+enums_by_name, enums_by_index = get_enums()
+func_list, func_name = get_definitions()
+
+#
+# Not needed with the new msg_size field.
+# generate_c_macros(func_list, enums_by_name)
+#
+
+pp = pprint.PrettyPrinter(indent=4)
+#print 'enums_by_index =', pp.pprint(enums_by_index)
+#print 'func_name =', pp.pprint(func_name)
+
+# Pass 2
+
+#
+# 1) The VPE API lacks a clear definition of what messages are reply messages
+# 2) Length is missing, and has to be pre-known or in case of variable sized ones calculated per message type
+#
+for f in func_list:
+    #if f['name'].find('_reply') > 0 or f['name'].find('_details') > 0:
+    decode_function_print(f['name'], f['full_args'], f['pack'], f['packlen'], f['tup'])
+
+    #r = get_reply_func(f)
+    #if not r:
+    #    #
+    #    # XXX: Functions here are not taken care of. E.g. events
+    #    #
+    #    print('Missing function', f)
+    #    continue
+
+    if f['name'].find('_dump') > 0:
+        f['multipart'] = True
+    else:
+        f['multipart'] = False
+    msg_id_in = 'VL_API_' + f['name'].upper()
+    function_print(f['name'], msg_id_in, f['args'], f['pack'], f['multipart'])
+
+
+print "api_func_table = [0] * 10000"
+for f in func_list:
+    #    if f['name'].find('_reply') > 0 or f['name'].find('_details') > 0:
+    msg_id_in = 'VL_API_' + f['name'].upper()
+    api_table_print(f['name'], msg_id_in)
diff --git a/vpp-api/python/pneum/pneum.c b/vpp-api/python/pneum/pneum.c
new file mode 100644
index 00000000..971c79bf
--- /dev/null
+++ b/vpp-api/python/pneum/pneum.c
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. 
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <signal.h>
+#include <setjmp.h>
+#include <stdbool.h>
+
+#include <vnet/vnet.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#include <api/vpe_msg_enum.h>
+
+#include "pneum.h"
+
+#define vl_typedefs             /* define message structures */
+#include <api/vpe_all_api_h.h> 
+#undef vl_typedefs
+
+#define vl_endianfun             /* define message structures */
+#include <api/vpe_all_api_h.h> 
+#undef vl_endianfun
+
+typedef struct {
+  u8 rx_thread_jmpbuf_valid;
+  u8 connected_to_vlib;
+  jmp_buf rx_thread_jmpbuf;
+  pthread_t rx_thread_handle;
+} pneum_main_t;
+
+pneum_main_t pneum_main;
+
+extern int wrap_pneum_callback(char *data, int len);
+
+/* 
+ * Satisfy external references when -lvlib is not available.
+ */
+void vlib_cli_output (struct vlib_main_t * vm, char * fmt, ...)
+{
+  clib_warning ("vlib_cli_output callled...");
+}
+
+#define vl_api_version(n,v) static u32 vpe_api_version = v;
+#include <api/vpe.api.h>
+#undef vl_api_version
+void
+vl_client_add_api_signatures (vl_api_memclnt_create_t *mp)
+{
+  /*
+   * Send the main API signature in slot 0. This bit of code must
+   * match the checks in ../vpe/api/api.c: vl_msg_api_version_check().
+   */
+  mp->api_versions[0] = clib_host_to_net_u32 (vpe_api_version);
+}
+
+static void
+pneum_api_handler (void *msg)
+{
+  u16 id = ntohs(*((u16 *)msg));
+
+  if (id == VL_API_RX_THREAD_EXIT) {
+    pneum_main_t *pm = &pneum_main;
+    vl_msg_api_free(msg);
+    longjmp(pm->rx_thread_jmpbuf, 1);
+  }
+  msgbuf_t *msgbuf = (msgbuf_t *)(((u8 *)msg) - offsetof(msgbuf_t, data));
+  int l = ntohl(msgbuf->data_len);
+  if (l == 0)
+    clib_warning("Message ID %d has wrong length: %d\n", id, l);
+    
+  /* Call Python callback */
+  (void)wrap_pneum_callback(msg, l);
+  vl_msg_api_free(msg);
+}
+
+static void *
+pneum_rx_thread_fn (void *arg)
+{
+  unix_shared_memory_queue_t *q;
+  pneum_main_t *pm = &pneum_main;
+  api_main_t *am = &api_main;
+  uword msg;
+
+  q = am->vl_input_queue;
+
+  /* So we can make the rx thread terminate cleanly */
+  if (setjmp(pm->rx_thread_jmpbuf) == 0) {
+    pm->rx_thread_jmpbuf_valid = 1;
+    while (1)
+      while (!unix_shared_memory_queue_sub(q, (u8 *)&msg, 0))
+        pneum_api_handler((void *)msg);
+  }
+  pthread_exit(0);
+}
+
+int
+pneum_connect (char *name)
+{
+  int rv = 0;
+  pneum_main_t *pm = &pneum_main;
+
+  /*
+   * Bail out now if we're not running as root
+   */
+  if (geteuid() != 0)
+    return (-1);
+
+  if ((rv = vl_client_api_map("/vpe-api"))) {
+    clib_warning ("vl_client_api map rv %d", rv);
+    return rv;
+  }
+
+  if (vl_client_connect(name, 0, 32) < 0) {
+    vl_client_api_unmap();
+    return (-1);
+  }
+
+  /* Start the rx queue thread */
+  rv = pthread_create(&pm->rx_thread_handle, NULL, pneum_rx_thread_fn, 0);
+  if (rv) {
+    clib_warning("pthread_create returned %d", rv);
+    vl_client_api_unmap();
+    return (-1);
+  }
+
+  pm->connected_to_vlib = 1;
+
+  return (0);
+}
+
+int
+pneum_disconnect (void)
+{
+  api_main_t *am = &api_main;
+  pneum_main_t *pm = &pneum_main;
+
+  fformat (stdout,"disconnecting from vpe \n");
+
+  if (pm->rx_thread_jmpbuf_valid) {
+    vl_api_rx_thread_exit_t *ep;
+    uword junk;
+    ep = vl_msg_api_alloc (sizeof (*ep));
+    ep->_vl_msg_id = ntohs(VL_API_RX_THREAD_EXIT);
+    vl_msg_api_send_shmem(am->vl_input_queue, (u8 *)&ep);
+    pthread_join(pm->rx_thread_handle, (void **) &junk);
+  }
+  if (pm->connected_to_vlib) {
+    vl_client_disconnect();
+    vl_client_api_unmap();
+  }
+  memset (pm, 0, sizeof (*pm));
+
+  return (0);
+}
+
+int
+pneum_read (char **p, int *l)
+{
+  unix_shared_memory_queue_t *q;
+  api_main_t *am = &api_main;
+  uword msg;
+
+  *l = 0;
+
+  if (am->our_pid == 0) return (-1);
+
+  q = am->vl_input_queue;
+  int rv = unix_shared_memory_queue_sub(q, (u8 *)&msg, 0);
+  if (rv == 0) {
+    u16 msg_id = ntohs(*((u16 *)msg));
+    msgbuf_t *msgbuf = (msgbuf_t *)(((u8 *)msg) - offsetof(msgbuf_t, data));
+    *l = ntohl(msgbuf->data_len);
+    if (*l == 0) {
+      printf("Unregistered API message: %d\n", msg_id);
+      return (-1);
+    }
+    *p = (char *)msg;
+  } else {
+    printf("Read failed with %d\n", rv);
+  }  
+  return (rv);
+}
+
+/*
+ * XXX: Makes the assumption that client_index is the first member
+ */
+typedef VL_API_PACKED(struct _vl_api_header {
+  u16 _vl_msg_id;
+  u32 client_index;
+}) vl_api_header_t;
+
+static unsigned int
+pneum_client_index (void)
+{
+  return (api_main.my_client_index);
+}
+
+int
+pneum_write (char *p, int l)
+{
+  int rv = -1;
+  api_main_t *am = &api_main;
+  vl_api_header_t *mp = vl_msg_api_alloc(l);
+  unix_shared_memory_queue_t *q;
+
+  if (!mp) return (-1);
+  memcpy(mp, p, l);
+  mp->client_index = pneum_client_index();
+  q = am->shmem_hdr->vl_input_queue;
+  rv = unix_shared_memory_queue_add(q, (u8 *)&mp, 0);
+  if (rv != 0) {
+    printf("vpe_api_write fails: %d\n", rv);
+    /* Clear message */
+    vl_msg_api_free(mp);
+  }
+  return (rv);
+}
diff --git a/vpp-api/python/pneum/pneum.h b/vpp-api/python/pneum/pneum.h
new file mode 100644
index 00000000..b99cbd4e
--- /dev/null
+++ b/vpp-api/python/pneum/pneum.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_pneum_h__
+#define __included_pneum_h__
+
+unsigned int vpe_client_index(void);
+int pneum_connect(char *name);
+int pneum_disconnect(void);
+int pneum_read(char **data, int *l);
+int pneum_write(char *data, int len);
+
+#endif
diff --git a/vpp-api/python/pneum/test_pneum.c b/vpp-api/python/pneum/test_pneum.c
new file mode 100644
index 00000000..18627b3f
--- /dev/null
+++ b/vpp-api/python/pneum/test_pneum.c
@@ -0,0 +1,136 @@
+/*
+ *------------------------------------------------------------------
+ * test_pneum.c
+ * 
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. 
+ *------------------------------------------------------------------
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <netdb.h>
+
+#include <time.h>       /* time_t, time (for timestamp in second) */
+#include <sys/timeb.h>  /* ftime, timeb (for timestamp in millisecond) */
+#include <sys/time.h>   /* gettimeofday, timeval (for timestamp in microsecond) */
+
+#include <vnet/vnet.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vnet/ip/ip.h>
+
+#include <api/vpe_msg_enum.h>
+#include <signal.h>
+#include <setjmp.h>
+#include "pneum.h"
+
+#define vl_typedefs             /* define message structures */
+#include <api/vpe_all_api_h.h> 
+#undef vl_typedefs
+
+volatile int sigterm_received = 0;
+volatile u32 result_ready;
+volatile u16 result_msg_id;
+
+/* M_NOALLOC: construct, but don't yet send a message */
+
+#define M_NOALLOC(T,t)                          \
+  do {						\
+    result_ready = 0;                           \
+    memset (mp, 0, sizeof (*mp));		\
+    mp->_vl_msg_id = ntohs (VL_API_##T);	\
+    mp->client_index = am->my_client_index;	\
+  } while(0);
+
+
+
+int
+wrap_pneum_callback (char *data, int len)
+{
+  //printf("Callback %d\n", len);
+  result_ready = 1;
+  result_msg_id = ntohs(*((u16 *)data));
+  return (0);
+}
+
+int main (int argc, char ** argv)
+{
+  api_main_t * am = &api_main;
+  vl_api_show_version_t message;
+  vl_api_show_version_t *mp;
+  int async = 1;
+  int rv = pneum_connect("pneum_client");
+
+  if (rv != 0) {
+    printf("Connect failed: %d\n", rv);
+    exit(rv);
+  }
+ 
+ struct timeb timer_msec;
+  long long int timestamp_msec_start; /* timestamp in millisecond. */
+  if (!ftime(&timer_msec)) {
+    timestamp_msec_start = ((long long int) timer_msec.time) * 1000ll + 
+      (long long int) timer_msec.millitm;
+  }
+  else {
+    timestamp_msec_start = -1;
+  }
+
+ 
+  /*
+   * Test vpe_api_write and vpe_api_read to send and recv message for an
+   * API 
+   */
+  int i;
+  long int no_msgs = 10000;
+  mp = &message;
+
+  for (i = 0; i < no_msgs; i++) {
+    /* Construct the API message */
+    M_NOALLOC(SHOW_VERSION, show_version);
+    pneum_write((char *)mp, sizeof(*mp));
+    if (!async)
+      while (result_ready == 0);
+  }
+  if (async) {
+    vl_api_control_ping_t control;
+    vl_api_control_ping_t *mp;
+    mp = &control;
+    M_NOALLOC(CONTROL_PING, control_ping);
+    pneum_write((char *)mp, sizeof(*mp));
+
+    while (result_msg_id != VL_API_CONTROL_PING_REPLY);
+  }
+
+  long long int timestamp_msec_end; /* timestamp in millisecond. */
+  if (!ftime(&timer_msec)) {
+    timestamp_msec_end = ((long long int) timer_msec.time) * 1000ll + 
+      (long long int) timer_msec.millitm;
+  }
+  else {
+    timestamp_msec_end = -1;
+  }
+  
+  printf("Took %lld msec, %lld msgs/msec \n", (timestamp_msec_end - timestamp_msec_start),
+	 no_msgs/(timestamp_msec_end - timestamp_msec_start));
+  fformat(stdout, "Exiting...\n");
+  pneum_disconnect();
+  exit (0);
+}
diff --git a/vpp-api/python/setup.py b/vpp-api/python/setup.py
new file mode 100644
index 00000000..d890ba70
--- /dev/null
+++ b/vpp-api/python/setup.py
@@ -0,0 +1,21 @@
+from distutils.core import setup, Extension
+
+module1 = Extension('vpp_api',
+                    define_macros = [('MAJOR_VERSION', '1'),
+                                     ('MINOR_VERSION', '0')],
+                    include_dirs = ['pneum'],
+                    libraries = ['pneum'],
+                    library_dirs = ['../../build-root/install-vpp_debug-native/vpp-api/lib64'],
+                    sources = ['vpp_papi/pneum_wrap.c'])
+
+setup (name = 'vpp_papi',
+       version = '1.0',
+       description = 'VPP Python binding',
+       author = 'Ole Troan',
+       author_email = 'ot@cisco.com',
+       #url = 'https://docs.python.org/extending/building',
+       packages=['vpp_papi'],
+       long_description = '''
+VPP Python language binding.
+''',
+       ext_modules = [module1])
diff --git a/vpp-api/python/tests/test_papi.py b/vpp-api/python/tests/test_papi.py
new file mode 100755
index 00000000..ec51f093
--- /dev/null
+++ b/vpp-api/python/tests/test_papi.py
@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+
+import vpp_papi
+import unittest, sys, time, threading, struct, logging
+from ipaddress import *
+
+papi_event = threading.Event()
+def papi_event_handler(result):
+    if result.vlmsgid == vpp_papi.VL_API_SW_INTERFACE_SET_FLAGS:
+        papi_event.set()
+        return
+    if result.vlmsgid == vpp_papi.VL_API_VNET_INTERFACE_COUNTERS:
+        format = '>' + str(int(len(result.data) / 8)) + 'Q'
+        counters = struct.unpack(format, result.data)
+        print('Counters:', counters)
+        return
+
+    print('Unknown message id:', result.vlmsgid)
+
+class TestPAPI(unittest.TestCase):
+
+    def setUp(self):
+        r = vpp_papi.connect("test_papi")
+        self.assertEqual(r, 0)
+
+    def tearDown(self):
+        r = vpp_papi.disconnect()
+        self.assertEqual(r, 0)
+        
+    def test_show_version(self):
+        t = vpp_papi.show_version()
+        program = t.program.decode().rstrip('\x00')
+        self.assertEqual('vpe', program)
+
+    #
+    # Add a few MAP domains, then dump them later
+    #
+    def test_map(self):
+        t = vpp_papi.map_summary_stats()
+        print(t)
+        ip6 = IPv6Address(u'2001:db8::1').packed
+        ip4 = IPv4Address(u'10.0.0.0').packed
+        ip6_src = IPv6Address(u'2001:db9::1').packed
+        t = vpp_papi.map_add_domain(ip6, ip4, ip6_src, 32, 24, 128, 0, 0, 6, 0, 0)
+        print(t)
+        self.assertEqual(t.retval, 0)
+
+        ip4 = IPv4Address(u'10.0.1.0').packed
+        t = vpp_papi.map_add_domain(ip6, ip4, ip6_src, 32, 24, 128, 0, 0, 6, 0, 0)
+        print(t)
+        self.assertEqual(t.retval, 0)
+
+        t = vpp_papi.map_summary_stats()
+        print(t)
+        self.assertEqual(t.totalbindings, 2)
+
+        t = vpp_papi.map_domain_dump()
+        print (t)
+        self.assertEqual(len(t), 2)
+
+    def test_sw_interface_dump(self):
+        #
+        # Dump interfaces
+        #
+        t = vpp_papi.sw_interface_dump(0, b'ignored')
+        for interface in t:
+            if interface.vlmsgid == vpp_papi.VL_API_SW_INTERFACE_DETAILS:
+                print(interface.interfacename.decode())
+
+    def test_want_interface_events(self):
+        pid = 123
+        vpp_papi.register_event_callback(papi_event_handler)
+        papi_event.clear()
+        t = vpp_papi.want_interface_events(True, pid)
+        print (t)
+        print('Setting interface up')
+        t = vpp_papi.sw_interface_set_flags(0, 1, 1, 0)
+        print (t)
+        self.assertEqual(papi_event.wait(5), True)
+        t = vpp_papi.sw_interface_set_flags(0, 0, 0, 0)
+        print (t)
+        self.assertEqual(papi_event.wait(5), True)
+
+    @unittest.skip("not quite ready yet")
+    def test_want_stats(self):
+        pid = 123
+        vpp_papi.register_event_callback(papi_event_handler)
+        papi_event.clear()
+        t = vpp_papi.want_stats(True, pid)
+
+        print (t)
+
+        #
+        # Wait for some stats
+        #
+        self.assertEqual(papi_event.wait(30), True)
+        t = vpp_papi.want_stats(False, pid)
+        print (t)
+
+    def test_tap(self):
+        pid = 123
+        vpp_papi.register_event_callback(papi_event_handler)
+        papi_event.clear()
+        t = vpp_papi.want_stats(True, pid)
+
+        print (t)
+
+        t = vpp_papi.tap_connect(1, b'tap', b'foo', 1, 0)
+        print (t)
+        self.assertEqual(t.retval, 0)
+        swifindex = t.swifindex
+
+        t = vpp_papi.sw_interface_set_flags(swifindex, 1, 1, 0)
+        print (t)
+        self.assertEqual(t.retval, 0)        
+
+        ip6 = IPv6Address(u'2001:db8::1').packed
+        t = vpp_papi.sw_interface_add_del_address(swifindex, 1, 1, 0, 16, ip6)
+        print (t)
+        time.sleep(40)
+
+
+if __name__ == '__main__':
+    #logging.basicConfig(level=logging.DEBUG)
+    unittest.main()
diff --git a/vpp-api/python/vpp_papi/__init__.py b/vpp-api/python/vpp_papi/__init__.py
new file mode 100644
index 00000000..8be644d7
--- /dev/null
+++ b/vpp-api/python/vpp_papi/__init__.py
@@ -0,0 +1,2 @@
+__import__('pkg_resources').declare_namespace(__name__)
+from .vpp_papi import *
diff --git a/vpp-api/python/vpp_papi/pneum_wrap.c b/vpp-api/python/vpp_papi/pneum_wrap.c
new file mode 100644
index 00000000..09d972d4
--- /dev/null
+++ b/vpp-api/python/vpp_papi/pneum_wrap.c
@@ -0,0 +1,120 @@
+#include <Python.h>
+#include "pneum.h"
+
+static PyObject *pneum_callback = NULL;
+
+int
+wrap_pneum_callback (char *data, int len)
+{
+  PyGILState_STATE gstate;
+  PyObject *result;//, *arglist;
+
+  gstate = PyGILState_Ensure();
+
+  /* Time to call the callback */
+  result = PyObject_CallFunction(pneum_callback, "y#", data, len);
+  if (result)
+    Py_DECREF(result);
+  else
+    PyErr_Print();
+
+  PyGILState_Release(gstate);
+  return (0);
+}
+
+static PyObject *
+wrap_connect (PyObject *self, PyObject *args)
+{
+  char *name;
+  int rv;
+  PyObject *temp;
+
+  if (!PyArg_ParseTuple(args, "sO:set_callback", &name, &temp))
+    return (NULL);
+  
+  if (!PyCallable_Check(temp)) {
+    PyErr_SetString(PyExc_TypeError, "parameter must be callable");
+    return NULL;
+  }
+
+  Py_XINCREF(temp);         /* Add a reference to new callback */
+  Py_XDECREF(pneum_callback);  /* Dispose of previous callback */
+  pneum_callback = temp;       /* Remember new callback */
+
+  Py_BEGIN_ALLOW_THREADS
+  rv = pneum_connect(name);
+  Py_END_ALLOW_THREADS
+  return PyLong_FromLong(rv);
+}
+
+static PyObject *
+wrap_disconnect (PyObject *self, PyObject *args)
+{
+  int rv;
+  Py_BEGIN_ALLOW_THREADS
+  rv = pneum_disconnect();
+  Py_END_ALLOW_THREADS
+  return PyLong_FromLong(rv);
+}
+static PyObject *
+wrap_write (PyObject *self, PyObject *args)
+{
+  char *data;
+  int len, rv;
+
+  if (!PyArg_ParseTuple(args, "s#", &data, &len)) 
+    return NULL;     
+  Py_BEGIN_ALLOW_THREADS
+  rv = pneum_write(data, len);
+  Py_END_ALLOW_THREADS
+
+  return PyLong_FromLong(rv);
+}
+
+void vl_msg_api_free(void *);
+
+static PyObject *
+wrap_read (PyObject *self, PyObject *args)
+{
+  char *data;
+  int len, rv;
+
+  Py_BEGIN_ALLOW_THREADS
+  rv = pneum_read(&data, &len);
+  Py_END_ALLOW_THREADS
+
+  if (rv != 0) { Py_RETURN_NONE; }
+
+  PyObject *ret = Py_BuildValue("y#", data, len);
+  if (!ret) { Py_RETURN_NONE; }
+
+  vl_msg_api_free(data);
+  return ret;
+}
+
+static PyMethodDef vpp_api_Methods[] = {
+  {"connect", wrap_connect, METH_VARARGS, "Connect to the VPP API."},
+  {"disconnect", wrap_disconnect, METH_VARARGS, "Disconnect from the VPP API."},
+  {"write", wrap_write, METH_VARARGS, "Write data to the VPP API."},
+  {"read", wrap_read, METH_VARARGS, "Read data from the VPP API."},
+  {NULL, NULL, 0, NULL}        /* Sentinel */
+};
+
+static struct PyModuleDef vpp_api_module = {
+  PyModuleDef_HEAD_INIT,
+  "vpp_api",   /* name of module */
+   NULL, /* module documentation, may be NULL */
+  -1,       /* size of per-interpreter state of the module,
+	       or -1 if the module keeps state in global variables. */
+  vpp_api_Methods
+};
+
+PyMODINIT_FUNC
+PyInit_vpp_api (void)
+{
+  /* Ensure threading is initialised */
+  if (!PyEval_ThreadsInitialized()) {
+    PyEval_InitThreads();
+  }
+  return PyModule_Create(&vpp_api_module);
+}
diff --git a/vpp-japi/Makefile.am b/vpp-japi/Makefile.am
deleted file mode 100644
index f1eb37da..00000000
--- a/vpp-japi/Makefile.am
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-ACLOCAL_AMFLAGS = -I m4
-AM_CFLAGS = -Wall 
-
-noinst_PROGRAMS = 
-BUILT_SOURCES =
-bin_PROGRAMS = 
-CLEANFILES = 
-lib_LTLIBRARIES = 
-
-nobase_include_HEADERS =		\
-  japi/org_openvpp_vppjapi_vppApi.h	\
-  japi/org_openvpp_vppjapi_vppConn.h
-
-lib_LTLIBRARIES += libvppjni.la
-
-libvppjni_la_SOURCES = japi/vppjni.c japi/vppapi.c japi/vppjni_env.h japi/vppjni_env.c
-libvppjni_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
-	              -lpthread -lm -lrt
-libvppjni_la_LDFLAGS = -module
-libvppjni_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-
-jarfile = vppjapi-$(PACKAGE_VERSION).jar
-packagedir = org/openvpp/vppjapi
-JAVAROOT = .
-
-$(jarfile): libvppjni.la
-	cd .libs ; $(JAR) cf $(JARFLAGS) ../$@ libvppjni.so.0.0.0 ../$(packagedir)/*.class ; cd ..
-
-BUILT_SOURCES += japi/org_openvpp_vppjapi_vppConn.h japi/vppapi.c 
-
-japi/org_openvpp_vppjapi_vppConn.h: 					\
-    japi/org/openvpp/vppjapi/vppVersion.java 				\
-    japi/org/openvpp/vppjapi/vppInterfaceDetails.java 			\
-    japi/org/openvpp/vppjapi/vppInterfaceCounters.java 			\
-    japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java 		\
-    japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java	\
-    japi/org/openvpp/vppjapi/vppL2Fib.java 				\
-    japi/org/openvpp/vppjapi/vppIPv4Address.java 			\
-    japi/org/openvpp/vppjapi/vppIPv6Address.java 			\
-    japi/org/openvpp/vppjapi/vppVxlanTunnelDetails.java 		\
-    japi/org/openvpp/vppjapi/vppConn.java 				\
-    japi/org/openvpp/vppjapi/vppApiCallbacks.java 			\
-    ../vpp/api/vpe.api.h
-	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppVersion.java ;				\
-	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppVersion ;						\
-	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppInterfaceDetails.java ;			\
-	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppInterfaceDetails ;					\
-	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppInterfaceCounters.java ;		\
-	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppInterfaceCounters ;				\
-	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java ;	\
-	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppBridgeDomainInterfaceDetails ;			\
-	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java ;		\
-	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppBridgeDomainDetails ;				\
-	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppL2Fib.java ;				\
-	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppL2Fib ;						\
-	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppIPv4Address.java ;			\
-	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppIPv4Address ;					\
-	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppIPv6Address.java ;			\
-	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppIPv6Address ;					\
-	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppVxlanTunnelDetails.java ;		\
-	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppVxlanTunnelDetails ;				\
-	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppConn.java ;				\
-	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppConn ;
-
-japi/vppapi.c: japi/org_openvpp_vppjapi_vppConn.h
-	pushd .. ; dir=`pwd` ; popd ;								\
-	instdir=`echo $${dir} | sed -e 's:build-root/build:build-root/install:'` ;		\
-	vppapigen --input $${instdir}/vpp/api/vpe.api --jni  japi/vppapi.c --app vpe ;		\
-	vppapigen --input $${instdir}/vpp/api/vpe.api --java japi/vppApi.java --app vpe ;	\
-	$(JAVAC) -classpath . -d . japi/vppApi.java ;						\
-	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppApi ;				\
-	$(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppApiCallbacks.java ;	\
-	$(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppApiCallbacks ;
-
-demo = japi/test/demo.class
-$(demo): $(jarfile)
-	$(JAVAC) -cp $(jarfile) -d $(JAVAROOT) @srcdir@/japi/test/demo.java
-
-all-local: $(jarfile) $(demo)
diff --git a/vpp-japi/configure.ac b/vpp-japi/configure.ac
deleted file mode 100644
index 1607061d..00000000
--- a/vpp-japi/configure.ac
+++ /dev/null
@@ -1,19 +0,0 @@
-AC_INIT(vpp-japi, 1.0.0)
-LT_INIT
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES
-
-AM_PROG_AS
-AC_PROG_CC
-AM_PROG_CC_C_O
-
-AX_PROG_JAVAC
-AX_PROG_JAVAH
-AX_PROG_JAR
-AX_PROG_JAVADOC
-AX_PROG_JAVA
-AX_CHECK_JAVA_HOME
-
-AC_OUTPUT([Makefile])
-
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppApiCallbacks.java b/vpp-japi/japi/org/openvpp/vppjapi/vppApiCallbacks.java
deleted file mode 100644
index df5b9533..00000000
--- a/vpp-japi/japi/org/openvpp/vppjapi/vppApiCallbacks.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openvpp.vppjapi;
-
-import java.io.IOException;
-import org.openvpp.vppjapi.vppApi;
-
-public abstract class vppApiCallbacks extends vppApi {
-     public vppApiCallbacks(String clientName) throws IOException {
-         super(clientName);
-     }
-/* Disabled!
- *
- * public abstract void interfaceDetails(
-            int ifIndex, String interfaceName, int supIfIndex, byte[] physAddr,
-            byte adminUp, byte linkUp, byte linkDuplex, byte linkSpeed,
-            int subId, byte subDot1ad, byte subNumberOfTags, int subOuterVlanId, int subInnerVlanId,
-            byte subExactMatch, byte subDefault, byte subOuterVlanIdAny, byte subInnerVlanIdAny,
-            int vtrOp, int vtrPushDot1q, int vtrTag1, int vtrTag2);
- */
-
-}
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java b/vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java
deleted file mode 100644
index db859a07..00000000
--- a/vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openvpp.vppjapi;
-
-import org.openvpp.vppjapi.vppBridgeDomainInterfaceDetails;
-
-public final class vppBridgeDomainDetails {
-    public String name;
-    public int bdId;
-    public boolean flood;
-    public boolean uuFlood;
-    public boolean forward;
-    public boolean learn;
-    public boolean arpTerm;
-    public String bviInterfaceName;
-    public vppBridgeDomainInterfaceDetails[] interfaces;
-}
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java b/vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java
deleted file mode 100644
index ab99ee45..00000000
--- a/vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openvpp.vppjapi;
-
-public final class vppBridgeDomainInterfaceDetails {
-    public String interfaceName;
-    public byte splitHorizonGroup;
-}
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppConn.java b/vpp-japi/japi/org/openvpp/vppjapi/vppConn.java
deleted file mode 100644
index 3e8c12a9..00000000
--- a/vpp-japi/japi/org/openvpp/vppjapi/vppConn.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openvpp.vppjapi;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.PosixFilePermission;
-import java.nio.file.attribute.PosixFilePermissions;
-import java.util.Set;
-
-import org.openvpp.vppjapi.vppVersion;
-import org.openvpp.vppjapi.vppInterfaceDetails;
-import org.openvpp.vppjapi.vppInterfaceCounters;
-import org.openvpp.vppjapi.vppBridgeDomainDetails;
-import org.openvpp.vppjapi.vppIPv4Address;
-import org.openvpp.vppjapi.vppIPv6Address;
-import org.openvpp.vppjapi.vppVxlanTunnelDetails;
-
-public class vppConn implements AutoCloseable {
-    private static final String LIBNAME = "libvppjni.so.0.0.0";
-
-    static {
-        try {
-            loadLibrary();
-        } catch (Exception e) {
-            System.out.printf("Can't find vpp jni library: %s\n", LIBNAME);
-            throw new ExceptionInInitializerError(e);
-        }
-    }
-
-    private static void loadStream(final InputStream is) throws IOException {
-        final Set<PosixFilePermission> perms = PosixFilePermissions.fromString("rwxr-x---");
-        final Path p = Files.createTempFile(LIBNAME, null, PosixFilePermissions.asFileAttribute(perms));
-        try {
-            Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
-
-            try {
-                Runtime.getRuntime().load(p.toString());
-            } catch (UnsatisfiedLinkError e) {
-                throw new IOException(String.format("Failed to load library %s", p), e);
-            }
-        } finally {
-            try {
-                Files.deleteIfExists(p);
-            } catch (IOException e) {
-            }
-        }
-    }
-
-    private static void loadLibrary() throws IOException {
-      try (final InputStream is = vppConn.class.getResourceAsStream('/' + LIBNAME)) {
-          if (is == null) {
-              throw new IOException(String.format("Failed to open library resource %s",
-                                                LIBNAME));
-          }
-          loadStream(is);
-        }
-    }
-
-    private static vppConn currentConnection = null;
-    private final String clientName;
-    private volatile boolean disconnected = false;
-
-    // Hidden on purpose to prevent external instantiation
-    vppConn(final String clientName) throws IOException {
-        this.clientName = clientName;
-
-        synchronized (vppConn.class) {
-            if (currentConnection != null) {
-                throw new IOException("Already connected as " + currentConnection.clientName);
-            }
-
-            final int ret = clientConnect(clientName);
-            if (ret != 0) {
-                throw new IOException("Connection returned error " + ret);
-            }
-
-            currentConnection = this;
-        }
-    }
-
-    @Override
-    public synchronized final void close() {
-        if (!disconnected) {
-            disconnected = true;
-
-            synchronized (vppConn.class) {
-                clientDisconnect();
-                currentConnection = null;
-            }
-        }
-    }
-
-    /**
-     * Check if this instance is connected.
-     *
-     * @throws IllegalStateException if this instance was disconnected.
-     */
-    protected final void checkConnected() {
-        if (disconnected) {
-            throw new IllegalStateException("Disconnected client " + clientName);
-        }
-    }
-
-    public final int getRetval(int context, int release) {
-        checkConnected();
-        return getRetval0(context, release);
-    }
-
-    public final String getInterfaceList (String nameFilter) {
-        checkConnected();
-        return getInterfaceList0(nameFilter);
-    }
-
-    public final int swIfIndexFromName (String interfaceName) {
-        checkConnected();
-        return swIfIndexFromName0(interfaceName);
-    }
-
-    public final String interfaceNameFromSwIfIndex (int swIfIndex) {
-        checkConnected();
-        return interfaceNameFromSwIfIndex0(swIfIndex);
-    }
-
-    public final void clearInterfaceTable () {
-        checkConnected();
-        clearInterfaceTable0();
-    }
-
-    public final vppInterfaceDetails[] swInterfaceDump (byte nameFilterValid, byte [] nameFilter) {
-        checkConnected();
-        return swInterfaceDump0(nameFilterValid, nameFilter);
-    }
-
-    public final int bridgeDomainIdFromName(String bridgeDomain) {
-        checkConnected();
-        return bridgeDomainIdFromName0(bridgeDomain);
-    }
-
-    public final int findOrAddBridgeDomainId(String bridgeDomain) {
-        checkConnected();
-        return findOrAddBridgeDomainId0(bridgeDomain);
-    }
-
-    public final vppVersion getVppVersion() {
-        checkConnected();
-        return getVppVersion0();
-    }
-
-    public final vppInterfaceCounters getInterfaceCounters(int swIfIndex) {
-        checkConnected();
-        return getInterfaceCounters0(swIfIndex);
-    }
-
-    public final int[] bridgeDomainDump(int bdId) {
-        checkConnected();
-        return bridgeDomainDump0(bdId);
-    }
-
-    public final vppBridgeDomainDetails getBridgeDomainDetails(int bdId) {
-        checkConnected();
-        return getBridgeDomainDetails0(bdId);
-    }
-
-    public final vppL2Fib[] l2FibTableDump(int bdId) {
-        checkConnected();
-        return l2FibTableDump0(bdId);
-    }
-
-    public final int bridgeDomainIdFromInterfaceName(String interfaceName) {
-        checkConnected();
-        return bridgeDomainIdFromInterfaceName0(interfaceName);
-    }
-
-    public final vppIPv4Address[] ipv4AddressDump(String interfaceName) {
-        checkConnected();
-        return ipv4AddressDump0(interfaceName);
-    }
-
-    public final vppIPv6Address[] ipv6AddressDump(String interfaceName) {
-        checkConnected();
-        return ipv6AddressDump0(interfaceName);
-    }
-
-    public final vppVxlanTunnelDetails[] vxlanTunnelDump(int swIfIndex) {
-        checkConnected();
-        return vxlanTunnelDump0(swIfIndex);
-    }
-
-    public final int setInterfaceDescription(String ifName, String ifDesc) {
-        checkConnected();
-        return setInterfaceDescription0(ifName, ifDesc);
-    }
-
-    public final String getInterfaceDescription(String ifName) {
-        checkConnected();
-        return getInterfaceDescription0(ifName);
-    }
-
-    private static native int clientConnect(String clientName);
-    private static native void clientDisconnect();
-    private static native int getRetval0(int context, int release);
-    private static native String getInterfaceList0(String nameFilter);
-    private static native int swIfIndexFromName0(String interfaceName);
-    private static native String interfaceNameFromSwIfIndex0(int swIfIndex);
-    private static native void clearInterfaceTable0();
-    private static native vppInterfaceDetails[] swInterfaceDump0(byte nameFilterValid, byte [] nameFilter);
-    private static native int bridgeDomainIdFromName0(String bridgeDomain);
-    private static native int findOrAddBridgeDomainId0(String bridgeDomain);
-    private static native vppVersion getVppVersion0();
-    private static native vppInterfaceCounters getInterfaceCounters0(int swIfIndex);
-    private static native int[] bridgeDomainDump0(int bdId);
-    private static native vppBridgeDomainDetails getBridgeDomainDetails0(int bdId);
-    private static native vppL2Fib[] l2FibTableDump0(int bdId);
-    private static native int bridgeDomainIdFromInterfaceName0(String interfaceName);
-    private static native vppIPv4Address[] ipv4AddressDump0(String interfaceName);
-    private static native vppIPv6Address[] ipv6AddressDump0(String interfaceName);
-    private static native vppVxlanTunnelDetails[] vxlanTunnelDump0(int swIfIndex);
-    private static native int setInterfaceDescription0(String ifName, String ifDesc);
-    private static native String getInterfaceDescription0(String ifName);
-}
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppIPv4Address.java b/vpp-japi/japi/org/openvpp/vppjapi/vppIPv4Address.java
deleted file mode 100644
index 046ceab5..00000000
--- a/vpp-japi/japi/org/openvpp/vppjapi/vppIPv4Address.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openvpp.vppjapi;
-
-public final class vppIPv4Address {
-    public final int ip;
-    public final byte prefixLength;
-
-    public vppIPv4Address(int ip, byte prefixLength) {
-        this.ip = ip;
-        this.prefixLength = prefixLength;
-    }
-}
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppIPv6Address.java b/vpp-japi/japi/org/openvpp/vppjapi/vppIPv6Address.java
deleted file mode 100644
index 6690a5db..00000000
--- a/vpp-japi/japi/org/openvpp/vppjapi/vppIPv6Address.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openvpp.vppjapi;
-
-public class vppIPv6Address {
-    // FIXME: this is dangerous
-    public final byte[] ip;
-    public final byte prefixLength;
-
-    public vppIPv6Address(byte[] ip, byte prefixLength) {
-        this.ip = ip;
-        this.prefixLength = prefixLength;
-    }
-}
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppInterfaceCounters.java b/vpp-japi/japi/org/openvpp/vppjapi/vppInterfaceCounters.java
deleted file mode 100644
index b2687fb8..00000000
--- a/vpp-japi/japi/org/openvpp/vppjapi/vppInterfaceCounters.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openvpp.vppjapi;
-
-public final class vppInterfaceCounters {
-
-    public final long rxOctets;
-    public final long rxIp4;
-    public final long rxIp6;
-    public final long rxUnicast;
-    public final long rxMulticast;
-    public final long rxBroadcast;
-    public final long rxDiscard;
-    public final long rxFifoFull;
-    public final long rxError;
-    public final long rxUnknownProto;
-    public final long rxMiss;
-
-    public final long txOctets;
-    public final long txIp4;
-    public final long txIp6;
-    public final long txUnicast;
-    public final long txMulticast;
-    public final long txBroadcast;
-    public final long txDiscard;
-    public final long txFifoFull;
-    public final long txError;
-    public final long txUnknownProto;
-    public final long txMiss;
-
-    public vppInterfaceCounters(
-            long rxOctets, long rxIp4, long rxIp6, long rxUni, long rxMulti,
-            long rxBcast, long rxDiscard, long rxFifoFull, long rxError,
-            long rxUnknownProto, long rxMiss,
-            long txOctets, long txIp4, long txIp6, long txUni, long txMulti,
-            long txBcast, long txDiscard, long txFifoFull, long txError,
-            long txUnknownProto, long txMiss)
-    {
-        this.rxOctets = rxOctets;
-        this.rxIp4 = rxIp4;
-        this.rxIp6 = rxIp6;
-        this.rxUnicast = rxUni;
-        this.rxMulticast = rxMulti;
-        this.rxBroadcast = rxBcast;
-        this.rxDiscard = rxDiscard;
-        this.rxFifoFull = rxFifoFull;
-        this.rxError = rxError;
-        this.rxUnknownProto = rxUnknownProto;
-        this.rxMiss = rxMiss;
-
-        this.txOctets = txOctets;
-        this.txIp4 = txIp4;
-        this.txIp6 = txIp6;
-        this.txUnicast = txUni;
-        this.txMulticast = txMulti;
-        this.txBroadcast = txBcast;
-        this.txDiscard = txDiscard;
-        this.txFifoFull = txFifoFull;
-        this.txError = txError;
-        this.txUnknownProto = txUnknownProto;
-        this.txMiss = txMiss;
-    }
-}
-
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppInterfaceDetails.java b/vpp-japi/japi/org/openvpp/vppjapi/vppInterfaceDetails.java
deleted file mode 100644
index 742dd25a..00000000
--- a/vpp-japi/japi/org/openvpp/vppjapi/vppInterfaceDetails.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openvpp.vppjapi;
-
-public final class vppInterfaceDetails {
-    public final int ifIndex;
-    public final String interfaceName;
-    public final int supIfIndex;
-    // FIXME: this is dangerous
-    public final byte[] physAddr;
-    public final byte adminUp;
-    public final byte linkUp;
-    public final byte linkDuplex;
-    public final byte linkSpeed;
-    public final int subId;
-    public final byte subDot1ad;
-    public final byte subNumberOfTags;
-    public final int subOuterVlanId;
-    public final int subInnerVlanId;
-    public final byte subExactMatch;
-    public final byte subDefault;
-    public final byte subOuterVlanIdAny;
-    public final byte subInnerVlanIdAny;
-    public final int vtrOp;
-    public final int vtrPushDot1q;
-    public final int vtrTag1;
-    public final int vtrTag2;
-    public final int linkMtu;
-
-    public vppInterfaceDetails(int ifIndex, String interfaceName, int supIfIndex, byte[] physAddr, byte adminUp,
-            byte linkUp, byte linkDuplex, byte linkSpeed, int subId, byte subDot1ad, byte subNumberOfTags,
-            int subOuterVlanId, int subInnerVlanId, byte subExactMatch, byte subDefault, byte subOuterVlanIdAny,
-            byte subInnerVlanIdAny, int vtrOp, int vtrPushDot1q, int vtrTag1, int vtrTag2, int linkMtu)
-    {
-        this.ifIndex = ifIndex;
-        this.interfaceName = interfaceName;
-        this.supIfIndex = supIfIndex;
-        this.physAddr = physAddr;
-        this.adminUp = adminUp;
-        this.linkUp = linkUp;
-        this.linkDuplex = linkDuplex;
-        this.linkSpeed = linkSpeed;
-        this.subId = subId;
-        this.subDot1ad = subDot1ad;
-        this.subNumberOfTags = subNumberOfTags;
-        this.subOuterVlanId = subOuterVlanId;
-        this.subInnerVlanId = subInnerVlanId;
-        this.subExactMatch = subExactMatch;
-        this.subDefault = subDefault;
-        this.subOuterVlanIdAny = subOuterVlanIdAny;
-        this.subInnerVlanIdAny = subInnerVlanIdAny;
-        this.vtrOp = vtrOp;
-        this.vtrPushDot1q = vtrPushDot1q;
-        this.vtrTag1 = vtrTag1;
-        this.vtrTag2 = vtrTag2;
-        this.linkMtu = linkMtu;
-    }
-}
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppL2Fib.java b/vpp-japi/japi/org/openvpp/vppjapi/vppL2Fib.java
deleted file mode 100644
index b38d801e..00000000
--- a/vpp-japi/japi/org/openvpp/vppjapi/vppL2Fib.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openvpp.vppjapi;
-
-public final class vppL2Fib {
-    // FIXME: this is dangerous
-    public final byte[] physAddress;
-    public final boolean staticConfig;
-    public final String outgoingInterface;
-    public final boolean filter;
-    public final boolean bridgedVirtualInterface;
-
-    public vppL2Fib(byte[] physAddress, boolean staticConfig,
-            String outgoingInterface, boolean filter,
-            boolean bridgedVirtualInterface) {
-        this.physAddress = physAddress;
-        this.staticConfig = staticConfig;
-        this.outgoingInterface = outgoingInterface;
-        this.filter = filter;
-        this.bridgedVirtualInterface = bridgedVirtualInterface;
-    }
-}
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppVersion.java b/vpp-japi/japi/org/openvpp/vppjapi/vppVersion.java
deleted file mode 100644
index 6408dee2..00000000
--- a/vpp-japi/japi/org/openvpp/vppjapi/vppVersion.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openvpp.vppjapi;
-
-public final class vppVersion {
-    public final String programName;
-    public final String buildDirectory;
-    public final String gitBranch;
-    public final String buildDate;
-
-    public vppVersion(String progName, String buildDir, String gitBranch, String buildDate) {
-        this.programName = progName;
-        this.buildDirectory = buildDir;
-        this.gitBranch = gitBranch;
-        this.buildDate = buildDate;
-    }
-}
-
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppVxlanTunnelDetails.java b/vpp-japi/japi/org/openvpp/vppjapi/vppVxlanTunnelDetails.java
deleted file mode 100644
index dd81e98c..00000000
--- a/vpp-japi/japi/org/openvpp/vppjapi/vppVxlanTunnelDetails.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openvpp.vppjapi;
-
-public final class vppVxlanTunnelDetails {
-    public final int srcAddress;
-    public final int dstAddress;
-    public final int encapVrfId;
-    public final int vni;
-    public final int decapNextIndex;
-
-    public vppVxlanTunnelDetails(int srcAddress, int dstAddress,
-            int encapVrfId, int vni, int decapNextIndex) {
-        this.srcAddress = srcAddress;
-        this.dstAddress = dstAddress;
-        this.encapVrfId = encapVrfId;
-        this.vni = vni;
-        this.decapNextIndex = decapNextIndex;
-    }
-}
diff --git a/vpp-japi/japi/test/demo.java b/vpp-japi/japi/test/demo.java
deleted file mode 100644
index ea1db84b..00000000
--- a/vpp-japi/japi/test/demo.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.openvpp.vppjapi.*;
-
-public class demo {
-    public static void main (String[] args) throws Exception {
-        vppApi api = new vppApi ("JavaTest");
-        System.out.printf ("Connected OK...");
-
-        String intlist;
-        int [] contexts;
-        int i, limit;
-        int trips;
-        int rv, errors, saved_error;
-        long before, after;
-
-        if (false)
-        {
-            intlist = api.getInterfaceList ("");
-            System.out.printf ("Unfiltered interface list:\n%s", intlist);
-            
-            trips = 0;
-            
-            contexts = new int[6];
-            
-            for (i = 0; i < 6; i++)
-            {
-                contexts[i] = api.swInterfaceSetFlags 
-                    (5 + i /* sw_if_index */,
-                     (byte)1 /* admin_up */,
-                     (byte)1 /* link_up (ignored) */,
-                     (byte)0 /* deleted */);
-            }
-            
-            /* Thread.sleep (1); */
-            errors = 0;
-            saved_error = 0;
-            
-            for (i = 0; i < 6; i ++)
-            {
-                while (true)
-                {
-                    rv = api.getRetval (contexts[i], 1 /* release */);
-                    if (rv != -77)
-                        break;
-                    Thread.sleep (1);
-                    trips++;
-                }
-                if (rv < 0)
-                {
-                    saved_error = rv;
-                    errors++;
-                }
-            }
-            
-            if (errors == 0)
-                System.out.printf ("intfcs up...\n");
-            else
-                System.out.printf 
-                    ("%d errors, last error %d...\n", errors, saved_error);
-        }
-        
-        limit = 250000;
-        saved_error = 0;
-        errors = 0;
-        contexts = new int [limit];
-        byte [] address = new byte [4];
-        byte [] zeros = new byte [4];
-
-        address[0] = (byte)192;
-        address[1] = (byte)168;
-        address[2] = (byte)2;
-        address[3] = (byte)1;
-
-        for (i = 0; i < 4; i++)
-            zeros[i] = 0;
-
-        System.out.printf ("start %d route ops ...", limit);
-
-        before = System.currentTimeMillis();
-
-        for (i = 0; i < limit; i++) {
-            contexts[i] = api.ipAddDelRoute 
-                (0 /* int nextHopSwIfIndex */, 
-                 0 /* int vrfId */, 
-                 0 /* int lookupInVrf */, 
-                 0 /* int resolveAttempts */, 
-                 0 /* int classifyTableIndex */, 
-                 (byte)0 /* byte createVrfIfNeeded */, 
-                 (byte)0 /* byte resolveIfNeeded */, 
-                 (byte)1 /* byte isAdd */, 
-                 (byte)1 /* byte isDrop */, 
-                 (byte)0 /* byte isIpv6 */, 
-                 (byte)0 /* byte isLocal */, 
-                 (byte)0 /* byte isClassify */, 
-                 (byte)0 /* byte isMultipath */, 
-                 (byte)0 /* byte notLast */, 
-                 (byte)0 /* byte nextHopWeight */, 
-                 (byte)32 /* byte dstAddressLength */, 
-                 address, 
-                 zeros);
-            
-            address[3] += 1;
-            if (address[3] == 0)
-            {
-                address[2] += 1;
-                if (address[2] == 0)
-                {
-                    address[1] += 1;
-                    {
-                        if (address[1] == 0)
-                        {
-                            address[0] += 1;
-                        }
-                    }
-                }
-            }
-        }
-
-        trips = 0;
-                        
-        for (i = 0; i < limit; i++)
-        {
-            while (true)
-            {
-                rv = api.getRetval (contexts[i], 1 /* release */);
-                if (rv != -77)
-                    break;
-                Thread.sleep (1);
-                trips++;
-            }
-            if (rv < 0)
-            {
-                saved_error = rv;
-                errors++;
-            }
-        }
-
-        after = System.currentTimeMillis();
-
-
-        if (errors == 0)
-            System.out.printf ("done %d route ops (all OK)...\n", limit);
-        else
-            System.out.printf 
-                ("%d errors, last error %d...\n", errors, saved_error);
-        
-        System.out.printf ("result in %d trips\n", trips);
-
-        System.out.printf ("%d routes in %d milliseconds, %d routes/msec\n",
-                           limit, after - before, 
-                           limit / (after - before));
-
-        api.close();
-        System.out.printf ("Done...\n");
-    }
-}
diff --git a/vpp-japi/japi/test/vppApi.java b/vpp-japi/japi/test/vppApi.java
deleted file mode 100644
index 87af3292..00000000
--- a/vpp-japi/japi/test/vppApi.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.net.InetAddress;
-import org.openvpp.vppjapi.*;
-
-public class vppApi {
-
-    native int controlPing();
-    native void test (byte[] array, byte[] array2);
-
-    public static void main (String[] args) throws Exception {
-        vppConn api = new vppConn ();
-        String ipv6 = "db01::feed";
-        String ipv4 = "192.168.1.1";
-        InetAddress addr6 = InetAddress.getByName(ipv6);
-        InetAddress addr4 = InetAddress.getByName(ipv4);
-        byte[] ip4bytes = addr4.getAddress();
-        byte[] ip6bytes = addr6.getAddress();
-        int rv;
-
-        api.test(ip4bytes,ip6bytes);
-
-        rv = api.clientConnect ("JavaTest");
-        if (rv == 0)
-            System.out.printf ("Connected OK...");
-        else
-        {
-            System.out.printf ("clientConnect returned %d\n", rv);
-            System.exit (1);
-        }
-        rv = api.controlPing();
-        System.out.printf ("data plane pid is %d\n", rv);
-
-        Thread.sleep (5000);
-
-        api.clientDisconnect();
-        System.out.printf ("Done...\n");
-    }
-}
diff --git a/vpp-japi/japi/vppjni.c b/vpp-japi/japi/vppjni.c
deleted file mode 100644
index 9c9437d2..00000000
--- a/vpp-japi/japi/vppjni.c
+++ /dev/null
@@ -1,1900 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#define _GNU_SOURCE /* for strcasestr(3) */
-#include <vnet/vnet.h>
-
-#define vl_api_version(n,v) static u32 vpe_api_version = (v);
-#include <api/vpe.api.h>
-#undef vl_api_version
-
-#include <jni.h>
-#include <japi/vppjni.h>
-#include <japi/vppjni_bridge_domain.h>
-#include <japi/vppjni_env.h>
-#include <japi/org_openvpp_vppjapi_vppConn.h>
-#include <japi/org_openvpp_vppjapi_vppApi.h>
-
-#include <api/vpe_msg_enum.h>
-#define vl_typedefs             /* define message structures */
-#include <api/vpe_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun
-#include <api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <api/vpe_all_api_h.h>
-#undef vl_printfun
-
-#define VPPJNI_DEBUG 0
-
-#if VPPJNI_DEBUG == 1
-  #define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
-#else
-  #define DEBUG_LOG(...)
-#endif
-
-static int connect_to_vpe(char *name);
-
-/*
- * The Java runtime isn't compile w/ -fstack-protector,
- * so we have to supply missing external references for the
- * regular vpp libraries. Weak reference in case folks get religion
- * at a later date...
- */
-void __stack_chk_guard (void) __attribute__((weak));
-void __stack_chk_guard (void) {  }
-
-BIND_JAPI_CLASS(vppBridgeDomainDetails, "()V");
-BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, arpTerm);
-BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, flood);
-BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, forward);
-BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, learn);
-BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, uuFlood);
-BIND_JAPI_INT_FIELD(vppBridgeDomainDetails, bdId);
-BIND_JAPI_STRING_FIELD(vppBridgeDomainDetails, name);
-BIND_JAPI_STRING_FIELD(vppBridgeDomainDetails, bviInterfaceName);
-BIND_JAPI_OBJ_FIELD(vppBridgeDomainDetails, interfaces, "[Lorg/openvpp/vppjapi/vppBridgeDomainInterfaceDetails;");
-
-BIND_JAPI_CLASS(vppBridgeDomainInterfaceDetails, "()V");
-BIND_JAPI_BYTE_FIELD(vppBridgeDomainInterfaceDetails, splitHorizonGroup);
-BIND_JAPI_STRING_FIELD(vppBridgeDomainInterfaceDetails, interfaceName);
-
-BIND_JAPI_CLASS(vppInterfaceCounters, "(JJJJJJJJJJJJJJJJJJJJJJ)V");
-BIND_JAPI_CLASS(vppInterfaceDetails, "(ILjava/lang/String;I[BBBBBIBBIIBBBBIIIII)V");
-BIND_JAPI_CLASS(vppIPv4Address, "(IB)V");
-BIND_JAPI_CLASS(vppIPv6Address, "([BB)V");
-BIND_JAPI_CLASS(vppL2Fib, "([BZLjava/lang/String;ZZ)V");
-BIND_JAPI_CLASS(vppVersion, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
-BIND_JAPI_CLASS(vppVxlanTunnelDetails, "(IIIII)V");
-
-void vl_client_add_api_signatures (vl_api_memclnt_create_t *mp)
-{
-    /*
-     * Send the main API signature in slot 0. This bit of code must
-     * match the checks in ../vpe/api/api.c: vl_msg_api_version_check().
-     */
-    mp->api_versions[0] = clib_host_to_net_u32 (vpe_api_version);
-}
-
-/* Note: non-static, called once to set up the initial intfc table */
-static int sw_interface_dump (vppjni_main_t * jm)
-{
-    vl_api_sw_interface_dump_t *mp;
-    f64 timeout;
-    hash_pair_t * p;
-    name_sort_t * nses = 0, * ns;
-    sw_interface_subif_t * sub = NULL;
-
-    /* Toss the old name table */
-    hash_foreach_pair (p, jm->sw_if_index_by_interface_name,
-    ({
-        vec_add2 (nses, ns, 1);
-        ns->name = (u8 *)(p->key);
-        ns->value = (u32) p->value[0];
-    }));
-
-    hash_free (jm->sw_if_index_by_interface_name);
-
-    vec_foreach (ns, nses)
-        vec_free (ns->name);
-
-    vec_free (nses);
-
-    vec_foreach (sub, jm->sw_if_subif_table) {
-        vec_free (sub->interface_name);
-    }
-    vec_free (jm->sw_if_subif_table);
-
-    /* recreate the interface name hash table */
-    jm->sw_if_index_by_interface_name
-      = hash_create_string (0, sizeof(uword));
-
-    /* Get list of ethernets */
-    M(SW_INTERFACE_DUMP, sw_interface_dump);
-    mp->name_filter_valid = 1;
-    strncpy ((char *) mp->name_filter, "Ether", sizeof(mp->name_filter-1));
-    S;
-
-    /* and local / loopback interfaces */
-    M(SW_INTERFACE_DUMP, sw_interface_dump);
-    mp->name_filter_valid = 1;
-    strncpy ((char *) mp->name_filter, "lo", sizeof(mp->name_filter-1));
-    S;
-
-    /* and vxlan tunnel interfaces */
-    M(SW_INTERFACE_DUMP, sw_interface_dump);
-    mp->name_filter_valid = 1;
-    strncpy ((char *) mp->name_filter, "vxlan", sizeof(mp->name_filter-1));
-    S;
-
-    /* and tap tunnel interfaces */
-    M(SW_INTERFACE_DUMP, sw_interface_dump);
-    mp->name_filter_valid = 1;
-    strncpy ((char *) mp->name_filter, "tap", sizeof(mp->name_filter-1));
-    S;
-
-    /* and host (af_packet) interfaces */
-    M(SW_INTERFACE_DUMP, sw_interface_dump);
-    mp->name_filter_valid = 1;
-    strncpy ((char *) mp->name_filter, "host", sizeof(mp->name_filter-1));
-    S;
-
-    /* and l2tpv3 tunnel interfaces */
-    M(SW_INTERFACE_DUMP, sw_interface_dump);
-    mp->name_filter_valid = 1;
-    strncpy ((char *) mp->name_filter, "l2tpv3_tunnel",
-             sizeof(mp->name_filter-1));
-    S;
-
-    /* Use a control ping for synchronization */
-    {
-        vl_api_control_ping_t * mp;
-        M(CONTROL_PING, control_ping);
-        S;
-    }
-    W;
-}
-
-JNIEXPORT jobject JNICALL Java_org_openvpp_vppjapi_vppConn_getVppVersion0
-  (JNIEnv *env, jobject obj)
-{
-    vppjni_main_t * jm = &vppjni_main;
-
-    vppjni_lock (jm, 11);
-    jstring progName = (*env)->NewStringUTF(env, (char *)jm->program_name);
-    jstring buildDir = (*env)->NewStringUTF(env, (char *)jm->build_directory);
-    jstring version = (*env)->NewStringUTF(env, (char *)jm->version);
-    jstring buildDate = (*env)->NewStringUTF(env, (char *)jm->build_date);
-    vppjni_unlock (jm);
-
-    return vppVersionObject(env, progName, buildDir, version, buildDate);
-}
-
-static int jm_show_version (vppjni_main_t *jm)
-{
-    int rv;
-    vl_api_show_version_t *mp;
-    f64 timeout;
-
-    vppjni_lock (jm, 10);
-    M(SHOW_VERSION, show_version);
-
-    S;
-    vppjni_unlock (jm);
-    WNR;
-    return rv;
-}
-
-static int jm_stats_enable_disable (vppjni_main_t *jm, u8 enable)
-{
-    vl_api_want_stats_t * mp;
-    f64 timeout;
-    int rv;
-
-    vppjni_lock (jm, 13);
-
-    M(WANT_STATS, want_stats);
-
-    mp->enable_disable = enable;
-
-    S;
-    vppjni_unlock (jm);
-    WNR;
-
-    // already subscribed / already disabled (it's ok)
-    if (rv == -2 || rv == -3)
-        rv = 0;
-    return rv;
-}
-
-JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_setInterfaceDescription0
-  (JNIEnv *env, jobject obj, jstring ifName, jstring ifDesc)
-{
-    int rv = 0;
-    vppjni_main_t * jm = &vppjni_main;
-    uword * p;
-    u32 sw_if_index = ~0;
-    sw_if_config_t *cfg;
-
-    const char *if_name_str = (*env)->GetStringUTFChars (env, ifName, 0);
-    const char *if_desc_str = (*env)->GetStringUTFChars (env, ifDesc, 0);
-
-    vppjni_lock (jm, 23);
-
-    p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name_str);
-    if (p == 0) {
-        rv = -1;
-        goto out;
-    }
-    sw_if_index = (jint) p[0];
-
-    u8 *if_desc = 0;
-    vec_validate_init_c_string (if_desc, if_desc_str, strlen(if_desc_str));
-    (*env)->ReleaseStringUTFChars (env, ifDesc, if_desc_str);
-
-    p = hash_get (jm->sw_if_config_by_sw_if_index, sw_if_index);
-    if (p != 0) {
-        cfg = (sw_if_config_t *) (p[0]);
-        if (cfg->desc)
-            vec_free(cfg->desc);
-    } else {
-        cfg = (sw_if_config_t *) clib_mem_alloc(sizeof(sw_if_config_t));
-        hash_set (jm->sw_if_config_by_sw_if_index, sw_if_index, cfg);
-    }
-
-    cfg->desc = if_desc;
-
-out:
-    (*env)->ReleaseStringUTFChars (env, ifName, if_name_str);
-    vppjni_unlock (jm);
-    return rv;
-}
-
-JNIEXPORT jstring JNICALL Java_org_openvpp_vppjapi_vppConn_getInterfaceDescription0
-(JNIEnv * env, jobject obj, jstring ifName)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    u32 sw_if_index = ~0;
-    uword * p;
-    jstring ifDesc = NULL;
-    const char *if_name_str = (*env)->GetStringUTFChars (env, ifName, 0);
-    if (!if_name_str)
-        return NULL;
-
-    vppjni_lock (jm, 24);
-    p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name_str);
-    if (p == 0)
-        goto out;
-
-    sw_if_index = (jint) p[0];
-
-    p = hash_get (jm->sw_if_config_by_sw_if_index, sw_if_index);
-    if (p == 0)
-        goto out;
-
-    sw_if_config_t *cfg = (sw_if_config_t *) (p[0]);
-    u8 * s = format (0, "%s%c", cfg->desc, 0);
-    ifDesc = (*env)->NewStringUTF(env, (char *)s);
-
-out:
-    vppjni_unlock (jm);
-
-    return ifDesc;
-}
-
-JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_clientConnect
-  (JNIEnv *env, jobject obj, jstring clientName)
-{
-    int rv;
-    const char *client_name;
-    void vl_msg_reply_handler_hookup(void);
-    vppjni_main_t * jm = &vppjni_main;
-    api_main_t * am = &api_main;
-    u8 * heap;
-    mheap_t * h;
-    f64 timeout;
-
-    /*
-     * Bail out now if we're not running as root
-     */
-    if (geteuid() != 0)
-        return -1;
-
-    if (jm->is_connected)
-        return -2;
-
-    client_name = (*env)->GetStringUTFChars(env, clientName, 0);
-    if (!client_name)
-        return -3;
-
-    if (jm->heap == 0)
-        clib_mem_init (0, 128<<20);
-
-    heap = clib_mem_get_per_cpu_heap();
-    h = mheap_header (heap);
-
-    clib_time_init (&jm->clib_time);
-
-    rv = connect_to_vpe ((char *) client_name);
-
-    if (rv < 0)
-        clib_warning ("connection failed, rv %d", rv);
-
-    (*env)->ReleaseStringUTFChars (env, clientName, client_name);
-
-    if (rv == 0) {
-        vl_msg_reply_handler_hookup ();
-        jm->is_connected = 1;
-        /* make the main heap thread-safe */
-        h->flags |= MHEAP_FLAG_THREAD_SAFE;
-
-        jm->reply_hash = hash_create (0, sizeof (uword));
-        //jm->callback_hash = hash_create (0, sizeof (uword));
-        //jm->ping_hash = hash_create (0, sizeof (uword));
-        jm->api_main = am;
-        vjbd_main_init(&jm->vjbd_main);
-        jm->sw_if_index_by_interface_name =
-            hash_create_string (0, sizeof (uword));
-        jm->sw_if_config_by_sw_if_index =
-            hash_create (0, sizeof (uword));
-
-        {
-            // call control ping first to attach rx thread to java thread
-            vl_api_control_ping_t * mp;
-            M(CONTROL_PING, control_ping);
-            S;
-            WNR;
-
-            if (rv != 0) {
-                clib_warning ("first control ping failed: %d", rv);
-            }
-        }
-        rv = jm_show_version(jm);
-        if (rv != 0)
-            clib_warning ("unable to retrieve vpp version (rv: %d)", rv);
-        rv = sw_interface_dump(jm);
-        if (rv != 0)
-            clib_warning ("unable to retrieve interface list (rv: %d)", rv);
-        rv = jm_stats_enable_disable(jm, 1);
-        if (rv != 0)
-            clib_warning ("unable to subscribe to stats (rv: %d)", rv);
-    }
-    DEBUG_LOG ("clientConnect result: %d", rv);
-
-    return rv;
-}
-
-JNIEXPORT void JNICALL Java_org_openvpp_vppjapi_vppConn_clientDisconnect
-  (JNIEnv *env, jobject obj)
-{
-    u8 *save_heap;
-    vppjni_main_t * jm = &vppjni_main;
-    vl_client_disconnect_from_vlib();
-
-    save_heap = jm->heap;
-    memset (jm, 0, sizeof (*jm));
-    jm->heap = save_heap;
-}
-
-void vl_api_generic_reply_handler (vl_api_generic_reply_t *mp)
-{
-    api_main_t * am = &api_main;
-    u16 msg_id = clib_net_to_host_u16 (mp->_vl_msg_id);
-    trace_cfg_t *cfgp;
-    i32 retval = clib_net_to_host_u32 (mp->retval);
-    int total_bytes = sizeof(mp);
-    vppjni_main_t * jm = &vppjni_main;
-    u8 * saved_reply = 0;
-    u32 context = clib_host_to_net_u32 (mp->context);
-
-    cfgp = am->api_trace_cfg + msg_id;
-
-    if (!cfgp)
-        clib_warning ("msg id %d: no trace configuration\n", msg_id);
-    else
-        total_bytes = cfgp->size;
-
-    jm->context_id_received = context;
-
-    DEBUG_LOG ("Received generic reply for msg id %d", msg_id);
-
-    /* A generic reply, successful, we're done */
-    if (retval >= 0 && total_bytes == sizeof(*mp))
-        return;
-
-    /* Save the reply */
-    vec_validate (saved_reply, total_bytes - 1);
-    memcpy (saved_reply, mp, total_bytes);
-
-    vppjni_lock (jm, 2);
-    hash_set (jm->reply_hash, context, saved_reply);
-    jm->saved_reply_count ++;
-    vppjni_unlock (jm);
-}
-
-JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_getRetval0
-(JNIEnv * env, jobject obj, jint context, jint release)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    vl_api_generic_reply_t * mp;
-    uword * p;
-    int rv = 0;
-
-    /* Dunno yet? */
-    if (context > jm->context_id_received)
-        return (VNET_API_ERROR_RESPONSE_NOT_READY);
-
-    vppjni_lock (jm, 1);
-    p = hash_get (jm->reply_hash, context);
-
-    /*
-     * Two cases: a generic "yes" reply - won't be in the hash table
-     * or "no", or "more data" which will be in the table.
-     */
-    if (p == 0)
-        goto out;
-
-    mp = (vl_api_generic_reply_t *) (p[0]);
-    rv = clib_net_to_host_u32 (mp->retval);
-
-    if (release) {
-        u8 * free_me = (u8 *) mp;
-        vec_free (free_me);
-        hash_unset (jm->reply_hash, context);
-        jm->saved_reply_count --;
-    }
-
-out:
-    vppjni_unlock (jm);
-    return (rv);
-}
-
-static int
-name_sort_cmp (void * a1, void * a2)
-{
-    name_sort_t * n1 = a1;
-    name_sort_t * n2 = a2;
-
-    return strcmp ((char *)n1->name, (char *)n2->name);
-}
-
-JNIEXPORT jstring JNICALL Java_org_openvpp_vppjapi_vppConn_getInterfaceList0
-  (JNIEnv * env, jobject obj, jstring name_filter)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    jstring rv;
-    hash_pair_t * p;
-    name_sort_t * nses = 0, * ns;
-    const char *this_name;
-    u8 * s = 0;
-    const char * nf = (*env)->GetStringUTFChars (env, name_filter, NULL);
-    if (!nf)
-        return NULL;
-
-    vppjni_lock (jm, 4);
-
-    hash_foreach_pair (p, jm->sw_if_index_by_interface_name,
-            ({
-                this_name = (const char *)(p->key);
-                if (strlen (nf) == 0 || strcasestr (this_name, nf)) {
-                    vec_add2 (nses, ns, 1);
-                    ns->name = (u8 *)(p->key);
-                    ns->value = (u32) p->value[0];
-                }
-            }));
-
-    vec_sort_with_function (nses, name_sort_cmp);
-
-    vec_foreach (ns, nses)
-        s = format (s, "%s: %d, ", ns->name, ns->value);
-
-    _vec_len (s) = vec_len (s) - 2;
-    vec_terminate_c_string (s);
-    vppjni_unlock (jm);
-
-    vec_free (nses);
-
-    (*env)->ReleaseStringUTFChars (env, name_filter, nf);
-
-    rv = (*env)->NewStringUTF (env, (char *) s);
-    vec_free (s);
-
-    return rv;
-}
-
-JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_swIfIndexFromName0
-  (JNIEnv * env, jobject obj, jstring interfaceName)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    jint rv = -1;
-    const char * if_name = (*env)->GetStringUTFChars (env, interfaceName, NULL);
-    if (if_name) {
-        uword * p;
-
-        vppjni_lock (jm, 5);
-
-        p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name);
-
-        if (p != 0)
-            rv = (jint) p[0];
-
-        vppjni_unlock (jm);
-
-        (*env)->ReleaseStringUTFChars (env, interfaceName, if_name);
-    }
-
-    return rv;
-}
-
-JNIEXPORT jobject JNICALL Java_org_openvpp_vppjapi_vppConn_getInterfaceCounters0
-(JNIEnv * env, jobject obj, jint swIfIndex)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    sw_interface_stats_t *s;
-    u32 sw_if_index = swIfIndex;
-    jobject result = NULL;
-
-    vppjni_lock (jm, 16);
-
-    if (sw_if_index >= vec_len(jm->sw_if_stats_by_sw_if_index)) {
-        goto out;
-    }
-    s = &jm->sw_if_stats_by_sw_if_index[sw_if_index];
-    if (!s->valid) {
-        goto out;
-    }
-
-    result = vppInterfaceCountersObject(env,
-            s->rx.octets, s->rx.pkts.ip4, s->rx.pkts.ip6, s->rx.pkts.unicast,
-            s->rx.pkts.multicast, s->rx.pkts.broadcast, s->rx.pkts.discard,
-            s->rx.pkts.fifo_full, s->rx.pkts.error, s->rx.pkts.unknown_proto,
-            s->rx.pkts.miss,
-            s->tx.octets, s->tx.pkts.ip4, s->tx.pkts.ip6, s->tx.pkts.unicast,
-            s->tx.pkts.multicast, s->tx.pkts.broadcast, s->tx.pkts.discard,
-            s->tx.pkts.fifo_full, s->tx.pkts.error, s->tx.pkts.unknown_proto,
-            s->tx.pkts.miss);
-
-out:
-    vppjni_unlock (jm);
-    return result;
-}
-
-JNIEXPORT jstring JNICALL Java_org_openvpp_vppjapi_vppConn_interfaceNameFromSwIfIndex0
-(JNIEnv * env, jobject obj, jint swIfIndex)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    sw_interface_details_t *sw_if_details;
-    u32 sw_if_index;
-    jstring ifname = NULL;
-
-    vppjni_lock (jm, 8);
-
-    sw_if_index = swIfIndex;
-
-    if (sw_if_index >= vec_len(jm->sw_if_table)) {
-        goto out;
-    }
-    sw_if_details = &jm->sw_if_table[sw_if_index];
-    if (!sw_if_details->valid) {
-        goto out;
-    }
-
-    u8 * s = format (0, "%s%c", sw_if_details->interface_name, 0);
-    ifname = (*env)->NewStringUTF(env, (char *)s);
-
-out:
-    vppjni_unlock (jm);
-
-    return ifname;
-}
-
-JNIEXPORT void JNICALL Java_org_openvpp_vppjapi_vppConn_clearInterfaceTable0
-(JNIEnv * env, jobject obj)
-{
-    vppjni_main_t * jm = &vppjni_main;
-
-    vppjni_lock (jm, 21);
-
-    vec_reset_length(jm->sw_if_table);
-
-    vppjni_unlock (jm);
-}
-
-static jobjectArray sw_if_dump_get_interfaces ();
-
-JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_swInterfaceDump0
-(JNIEnv * env, jobject obj, jbyte name_filter_valid, jbyteArray name_filter)
-{
-    vppjni_main_t *jm = &vppjni_main;
-    f64 timeout;
-    vl_api_sw_interface_dump_t * mp;
-    u32 my_context_id;
-    int rv;
-    rv = vppjni_sanity_check (jm);
-    if (rv) {
-        clib_warning("swInterfaceDump sanity_check rv = %d", rv);
-        return NULL;
-    }
-
-    vppjni_lock (jm, 7);
-    my_context_id = vppjni_get_context_id (jm);
-    jsize cnt = (*env)->GetArrayLength (env, name_filter);
-
-    M(SW_INTERFACE_DUMP, sw_interface_dump);
-    mp->context = clib_host_to_net_u32 (my_context_id);
-    mp->name_filter_valid = name_filter_valid;
-
-    if (cnt > sizeof(mp->name_filter))
-        cnt = sizeof(mp->name_filter);
-
-    (*env)->GetByteArrayRegion(env, name_filter, 0, cnt, (jbyte *)mp->name_filter);
-
-    DEBUG_LOG ("interface filter (%d, %s, len: %d)", mp->name_filter_valid, (char *)mp->name_filter, cnt);
-
-    jm->collect_indices = 1;
-
-    S;
-    {
-        // now send control ping so we know when it ends
-        vl_api_control_ping_t * mp;
-        M(CONTROL_PING, control_ping);
-        mp->context = clib_host_to_net_u32 (my_context_id);
-
-        S;
-    }
-    vppjni_unlock (jm);
-    WNR;
-
-    vppjni_lock (jm, 7);
-    jobjectArray result = sw_if_dump_get_interfaces(env);
-    vppjni_unlock (jm);
-    return result;
-}
-
-static jobjectArray sw_if_dump_get_interfaces (JNIEnv * env)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    sw_interface_details_t *sw_if_details;
-    u32 i;
-
-    int len = vec_len(jm->sw_if_dump_if_indices);
-
-    jobjectArray ifArray = vppInterfaceDetailsArray(env, len);
-
-    for (i = 0; i < len; i++) {
-        u32 sw_if_index = jm->sw_if_dump_if_indices[i];
-        ASSERT(sw_if_index < vec_len(jm->sw_if_table));
-        sw_if_details = &jm->sw_if_table[sw_if_index];
-        ASSERT(sw_if_details->valid);
-
-        u8 * s = format (0, "%s%c", sw_if_details->interface_name, 0);
-
-        jstring ifname = (*env)->NewStringUTF(env, (char *)s);
-        jint ifIndex = sw_if_details->sw_if_index;
-        jint supIfIndex = sw_if_details->sup_sw_if_index;
-        jbyteArray physAddr = (*env)->NewByteArray(env,
-                sw_if_details->l2_address_length);
-        (*env)->SetByteArrayRegion(env, physAddr, 0,
-                sw_if_details->l2_address_length,
-                (signed char*)sw_if_details->l2_address);
-        jint subId = sw_if_details->sub_id;
-        jint subOuterVlanId = sw_if_details->sub_outer_vlan_id;
-        jint subInnerVlanId = sw_if_details->sub_inner_vlan_id;
-        jint vtrOp = sw_if_details->vtr_op;
-        jint vtrPushDot1q = sw_if_details->vtr_push_dot1q;
-        jint vtrTag1 = sw_if_details->vtr_tag1;
-        jint vtrTag2 = sw_if_details->vtr_tag2;
-        jint linkMtu = sw_if_details->link_mtu;
-
-        jbyte adminUpDown = sw_if_details->admin_up_down;
-        jbyte linkUpDown = sw_if_details->link_up_down;
-        jbyte linkDuplex = sw_if_details->link_duplex;
-        jbyte linkSpeed = sw_if_details->link_speed;
-        jbyte subDot1ad = sw_if_details->sub_dot1ad;
-        jbyte subNumberOfTags = sw_if_details->sub_number_of_tags;
-        jbyte subExactMatch = sw_if_details->sub_exact_match;
-        jbyte subDefault = sw_if_details->sub_default;
-        jbyte subOuterVlanIdAny = sw_if_details->sub_outer_vlan_id_any;
-        jbyte subInnerVlanIdAny = sw_if_details->sub_inner_vlan_id_any;
-
-        jobject ifObj = vppInterfaceDetailsObject(env,
-                ifIndex, ifname,
-                supIfIndex, physAddr, adminUpDown, linkUpDown,
-                linkDuplex, linkSpeed, subId, subDot1ad,
-                subNumberOfTags, subOuterVlanId, subInnerVlanId,
-                subExactMatch, subDefault, subOuterVlanIdAny,
-                subInnerVlanIdAny, vtrOp, vtrPushDot1q, vtrTag1, vtrTag2, linkMtu);
-        (*env)->SetObjectArrayElement(env, ifArray, i, ifObj);
-    }
-
-    jm->collect_indices = 0;
-    vec_reset_length(jm->sw_if_dump_if_indices);
-    return ifArray;
-}
-
-JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_findOrAddBridgeDomainId0
-  (JNIEnv * env, jobject obj, jstring bridgeDomain)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    jint rv = -1;
-    const char * bdName = (*env)->GetStringUTFChars (env, bridgeDomain, NULL);
-    if (bdName) {
-        static u8 * bd_name = 0;
-
-        vec_validate_init_c_string (bd_name, bdName, strlen(bdName));
-        (*env)->ReleaseStringUTFChars (env, bridgeDomain, bdName);
-
-        vppjni_lock (jm, 6);
-        rv = (jint)vjbd_find_or_add_bd (&jm->vjbd_main, bd_name);
-        vppjni_unlock (jm);
-
-        _vec_len(bd_name) = 0;
-    }
-    return rv;
-}
-
-JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_bridgeDomainIdFromName0
-  (JNIEnv * env, jobject obj, jstring bridgeDomain)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    jint rv = -1;
-    const char * bdName = (*env)->GetStringUTFChars (env, bridgeDomain, NULL);
-    if (bdName) {
-        static u8 * bd_name = 0;
-
-        vec_validate_init_c_string (bd_name, bdName, strlen(bdName));
-        (*env)->ReleaseStringUTFChars (env, bridgeDomain, bdName);
-
-        vppjni_lock (jm, 20);
-        rv = (jint)vjbd_id_from_name(&jm->vjbd_main, (u8 *)bd_name);
-        vppjni_unlock (jm);
-
-        _vec_len(bd_name) = 0;
-    }
-
-    return rv;
-}
-
-JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_bridgeDomainIdFromInterfaceName0
-  (JNIEnv * env, jobject obj, jstring interfaceName)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    vjbd_main_t * bdm = &jm->vjbd_main;
-    u32 sw_if_index;
-    jint rv = -1;
-    const char * if_name;
-    uword * p;
-
-    if_name = (*env)->GetStringUTFChars (env, interfaceName, NULL);
-
-    vppjni_lock (jm, 14);
-
-    p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name);
-
-    if (p != 0) {
-        sw_if_index = (jint) p[0];
-        p = hash_get (bdm->bd_id_by_sw_if_index, sw_if_index);
-        if (p != 0) {
-            rv = (jint) p[0];
-        }
-    }
-
-    vppjni_unlock (jm);
-
-    (*env)->ReleaseStringUTFChars (env, interfaceName, if_name);
-
-    return rv;
-}
-
-/*
- * Special-case: build the interface table, maintain
- * the next loopback sw_if_index vbl.
- */
-static void vl_api_sw_interface_details_t_handler
-(vl_api_sw_interface_details_t * mp)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    static sw_interface_details_t empty_sw_if_details = {0,};
-    sw_interface_details_t *sw_if_details;
-    u32 sw_if_index;
-
-    vppjni_lock (jm, 1);
-
-    sw_if_index = ntohl (mp->sw_if_index);
-
-    u8 * s = format (0, "%s%c", mp->interface_name, 0);
-
-    if (jm->collect_indices) {
-        u32 pos = vec_len(jm->sw_if_dump_if_indices);
-        vec_validate(jm->sw_if_dump_if_indices, pos);
-        jm->sw_if_dump_if_indices[pos] = sw_if_index;
-    }
-
-    vec_validate_init_empty(jm->sw_if_table, sw_if_index, empty_sw_if_details);
-    sw_if_details = &jm->sw_if_table[sw_if_index];
-    sw_if_details->valid = 1;
-
-    snprintf((char *)sw_if_details->interface_name,
-            sizeof(sw_if_details->interface_name), "%s", (char *)s);
-    sw_if_details->sw_if_index = sw_if_index;
-    sw_if_details->sup_sw_if_index = ntohl(mp->sup_sw_if_index);
-    sw_if_details->l2_address_length = ntohl (mp->l2_address_length);
-    ASSERT(sw_if_details->l2_address_length <= sizeof(sw_if_details->l2_address));
-    memcpy(sw_if_details->l2_address, mp->l2_address,
-            sw_if_details->l2_address_length);
-    sw_if_details->sub_id = ntohl (mp->sub_id);
-    sw_if_details->sub_outer_vlan_id = ntohl (mp->sub_outer_vlan_id);
-    sw_if_details->sub_inner_vlan_id = ntohl (mp->sub_inner_vlan_id);
-    sw_if_details->vtr_op = ntohl (mp->vtr_op);
-    sw_if_details->vtr_push_dot1q = ntohl (mp->vtr_push_dot1q);
-    sw_if_details->vtr_tag1 = ntohl (mp->vtr_tag1);
-    sw_if_details->vtr_tag2 = ntohl (mp->vtr_tag2);
-
-    sw_if_details->admin_up_down = mp->admin_up_down;
-    sw_if_details->link_up_down = mp->link_up_down;
-    sw_if_details->link_duplex = mp->link_duplex;
-    sw_if_details->link_speed = mp->link_speed;
-    sw_if_details->sub_dot1ad = mp->sub_dot1ad;
-    sw_if_details->sub_number_of_tags = mp->sub_number_of_tags;
-    sw_if_details->sub_exact_match = mp->sub_exact_match;
-    sw_if_details->sub_default = mp->sub_default;
-    sw_if_details->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any;
-    sw_if_details->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any;
-
-    hash_set_mem (jm->sw_if_index_by_interface_name, s, sw_if_index);
-    DEBUG_LOG ("Got interface %s", (char *)s);
-
-    /* In sub interface case, fill the sub interface table entry */
-    if (mp->sw_if_index != mp->sup_sw_if_index) {
-        sw_interface_subif_t * sub = NULL;
-
-        vec_add2(jm->sw_if_subif_table, sub, 1);
-
-        vec_validate(sub->interface_name, strlen((char *)s) + 1);
-        strncpy((char *)sub->interface_name, (char *)s,
-                vec_len(sub->interface_name));
-        sub->sw_if_index = ntohl(mp->sw_if_index);
-        sub->sub_id = ntohl(mp->sub_id);
-
-        sub->sub_dot1ad = mp->sub_dot1ad;
-        sub->sub_number_of_tags = mp->sub_number_of_tags;
-        sub->sub_outer_vlan_id = ntohs(mp->sub_outer_vlan_id);
-        sub->sub_inner_vlan_id = ntohs(mp->sub_inner_vlan_id);
-        sub->sub_exact_match = mp->sub_exact_match;
-        sub->sub_default = mp->sub_default;
-        sub->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any;
-        sub->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any;
-
-        /* vlan tag rewrite */
-        sub->vtr_op = ntohl(mp->vtr_op);
-        sub->vtr_push_dot1q = ntohl(mp->vtr_push_dot1q);
-        sub->vtr_tag1 = ntohl(mp->vtr_tag1);
-        sub->vtr_tag2 = ntohl(mp->vtr_tag2);
-    }
-    vppjni_unlock (jm);
-}
-
-static void vl_api_sw_interface_set_flags_t_handler
-(vl_api_sw_interface_set_flags_t * mp)
-{
-  /* $$$ nothing for the moment */
-}
-
-static jintArray create_array_of_bd_ids(JNIEnv * env, jint bd_id)
-{
-    vppjni_main_t *jm = &vppjni_main;
-    vjbd_main_t * bdm = &jm->vjbd_main;
-    u32 *buf = NULL;
-    u32 i;
-
-    if (bd_id != ~0) {
-        vec_add1(buf, bd_id);
-    } else {
-        for (i = 0; i < vec_len(bdm->bd_oper); i++) {
-            u32 bd_id = bdm->bd_oper[i].bd_id;
-            vec_add1(buf, bd_id);
-        }
-    }
-
-    jintArray bdidArray = (*env)->NewIntArray(env, vec_len(buf));
-    if (!bdidArray) {
-        goto out;
-    }
-
-    (*env)->SetIntArrayRegion(env, bdidArray, 0, vec_len(buf), (int*)buf);
-
-out:
-    vec_free(buf);
-    return bdidArray;
-}
-
-static void bridge_domain_oper_free(void)
-{
-    vppjni_main_t *jm = &vppjni_main;
-    vjbd_main_t *bdm = &jm->vjbd_main;
-    u32 i;
-
-    for (i = 0; i < vec_len(bdm->bd_oper); i++) {
-        vec_free(bdm->bd_oper->l2fib_oper);
-    }
-    vec_reset_length(bdm->bd_oper);
-    hash_free(bdm->bd_id_by_sw_if_index);
-    hash_free(bdm->oper_bd_index_by_bd_id);
-}
-
-JNIEXPORT jintArray JNICALL Java_org_openvpp_vppjapi_vppConn_bridgeDomainDump0
-(JNIEnv * env, jobject obj, jint bd_id)
-{
-    vppjni_main_t *jm = &vppjni_main;
-    vl_api_bridge_domain_dump_t * mp;
-    u32 my_context_id;
-    f64 timeout;
-    int rv;
-    rv = vppjni_sanity_check (jm);
-    if (rv) return NULL;
-
-    vppjni_lock (jm, 15);
-
-    if (~0 == bd_id) {
-        bridge_domain_oper_free();
-    }
-
-    my_context_id = vppjni_get_context_id (jm);
-    M(BRIDGE_DOMAIN_DUMP, bridge_domain_dump);
-    mp->context = clib_host_to_net_u32 (my_context_id);
-    mp->bd_id = clib_host_to_net_u32(bd_id);
-    S;
-
-    /* Use a control ping for synchronization */
-    {
-        vl_api_control_ping_t * mp;
-        M(CONTROL_PING, control_ping);
-        S;
-    }
-
-    WNR;
-    if (0 != rv) {
-        return NULL;
-    }
-
-    jintArray ret = create_array_of_bd_ids(env, bd_id);
-
-    vppjni_unlock (jm);
-
-    return ret;
-}
-
-static void
-vl_api_bridge_domain_details_t_handler (vl_api_bridge_domain_details_t * mp)
-{
-    vppjni_main_t *jm = &vppjni_main;
-    vjbd_main_t * bdm = &jm->vjbd_main;
-    vjbd_oper_t * bd_oper;
-    u32 bd_id, bd_index;
-
-    bd_id = ntohl (mp->bd_id);
-
-    bd_index = vec_len(bdm->bd_oper);
-    vec_validate (bdm->bd_oper, bd_index);
-    bd_oper = vec_elt_at_index(bdm->bd_oper, bd_index);
-
-    hash_set(bdm->oper_bd_index_by_bd_id, bd_id, bd_index);
-
-    bd_oper->bd_id = bd_id;
-    bd_oper->flood = mp->flood != 0;
-    bd_oper->forward = mp->forward != 0;
-    bd_oper->learn =  mp->learn != 0;
-    bd_oper->uu_flood = mp->uu_flood != 0;
-    bd_oper->arp_term = mp->arp_term != 0;
-    bd_oper->bvi_sw_if_index = ntohl (mp->bvi_sw_if_index);
-    bd_oper->n_sw_ifs = ntohl (mp->n_sw_ifs);
-
-    bd_oper->bd_sw_if_oper = 0;
-}
-
-static void
-vl_api_bridge_domain_sw_if_details_t_handler
-(vl_api_bridge_domain_sw_if_details_t * mp)
-{
-    vppjni_main_t *jm = &vppjni_main;
-    vjbd_main_t * bdm = &jm->vjbd_main;
-    bd_sw_if_oper_t * bd_sw_if_oper;
-    u32 bd_id, sw_if_index;
-
-    bd_id = ntohl (mp->bd_id);
-    sw_if_index = ntohl (mp->sw_if_index);
-
-    uword *p;
-    p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id);
-    if (p == 0) {
-        clib_warning("Invalid bd_id %d in bridge_domain_sw_if_details_t_handler", bd_id);
-        return;
-    }
-    u32 oper_bd_index = (jint) p[0];
-    vjbd_oper_t *bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index);
-
-    u32 len = vec_len(bd_oper->bd_sw_if_oper);
-    vec_validate(bd_oper->bd_sw_if_oper, len);
-    bd_sw_if_oper = &bd_oper->bd_sw_if_oper[len];
-    bd_sw_if_oper->bd_id = bd_id;
-    bd_sw_if_oper->sw_if_index = sw_if_index;
-    bd_sw_if_oper->shg = mp->shg;
-
-    hash_set(bdm->bd_id_by_sw_if_index, sw_if_index, bd_id);
-}
-
-static const char* interface_name_from_sw_if_index(u32 sw_if_index)
-{
-    vppjni_main_t *jm = &vppjni_main;
-
-    if (sw_if_index >= vec_len(jm->sw_if_table)) {
-        return NULL;
-    }
-    if (!jm->sw_if_table[sw_if_index].valid) {
-        return NULL;
-    }
-    return (const char*)jm->sw_if_table[sw_if_index].interface_name;
-}
-
-JNIEXPORT jobject JNICALL Java_org_openvpp_vppjapi_vppConn_getBridgeDomainDetails0
-(JNIEnv * env, jobject obj, jint bdId)
-{
-    vppjni_main_t *jm = &vppjni_main;
-    vjbd_main_t * bdm = &jm->vjbd_main;
-    u32 oper_bd_index;
-    u32 bd_id = bdId;
-    jobject rv = NULL;
-    uword *p;
-
-    vppjni_lock (jm, 16);
-
-    p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id);
-    if (p == 0) {
-        rv = NULL;
-        goto out;
-    }
-    oper_bd_index = (jint) p[0];
-
-    vjbd_oper_t *bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index);
-
-
-    /* setting BridgeDomainDetails */
-
-    jobject bddObj = vppBridgeDomainDetailsObject(env);
-
-    u8 *vec_bd_name = vjbd_oper_name_from_id(bdm, bd_id);
-    if (NULL == vec_bd_name) {
-        rv = NULL;
-        goto out;
-    }
-    char *str_bd_name = (char*)format (0, "%s%c", vec_bd_name, 0);
-    vec_free(vec_bd_name);
-    jstring bdName = (*env)->NewStringUTF(env, str_bd_name);
-    vec_free(str_bd_name);
-    if (NULL == bdName) {
-        rv = NULL;
-        goto out;
-    }
-
-    set_vppBridgeDomainDetails_name(env, bddObj, bdName);
-    set_vppBridgeDomainDetails_bdId(env, bddObj, bdId);
-    set_vppBridgeDomainDetails_flood(env, bddObj, (jboolean)bd_oper->flood);
-    set_vppBridgeDomainDetails_uuFlood(env, bddObj, (jboolean)bd_oper->uu_flood);
-    set_vppBridgeDomainDetails_forward(env, bddObj, (jboolean)bd_oper->forward);
-    set_vppBridgeDomainDetails_learn(env, bddObj, (jboolean)bd_oper->learn);
-    set_vppBridgeDomainDetails_arpTerm(env, bddObj, (jboolean)bd_oper->arp_term);
-
-    jstring bviInterfaceName = NULL;
-    if (~0 != bd_oper->bvi_sw_if_index) {
-        const char *str_if_name = interface_name_from_sw_if_index(bd_oper->bvi_sw_if_index);
-        if (NULL == str_if_name) {
-            clib_warning("Could not get interface name for sw_if_index %d", bd_oper->bvi_sw_if_index);
-            rv = NULL;
-            goto out;
-        }
-        bviInterfaceName = (*env)->NewStringUTF(env, str_if_name);
-        if (NULL == bviInterfaceName) {
-            rv = NULL;
-            goto out;
-        }
-    }
-
-    set_vppBridgeDomainDetails_bviInterfaceName(env, bddObj, bviInterfaceName);
-
-    /* setting BridgeDomainInterfaceDetails */
-
-    u32 len = vec_len(bd_oper->bd_sw_if_oper);
-    ASSERT(len == bd_oper->n_sw_ifs);
-
-    jobjectArray bdidArray = vppBridgeDomainInterfaceDetailsArray(env, len);
-
-    u32 i;
-    for (i = 0; i < len; i++) {
-        bd_sw_if_oper_t *sw_if_oper = &bd_oper->bd_sw_if_oper[i];
-
-        jobject bdidObj = vppBridgeDomainInterfaceDetailsObject(env);
-        (*env)->SetObjectArrayElement(env, bdidArray, i, bdidObj);
-
-        u32 sw_if_index = sw_if_oper->sw_if_index;
-        const char *str_if_name = interface_name_from_sw_if_index(sw_if_index);
-        if (NULL == str_if_name) {
-            rv = NULL;
-            goto out;
-        }
-        jstring interfaceName = (*env)->NewStringUTF(env, str_if_name);
-        if (NULL == interfaceName) {
-            rv = NULL;
-            goto out;
-        }
-
-        set_vppBridgeDomainInterfaceDetails_interfaceName(env, bdidObj, interfaceName);
-        set_vppBridgeDomainInterfaceDetails_splitHorizonGroup(env, bdidObj, (jbyte)sw_if_oper->shg);
-    }
-
-    set_vppBridgeDomainDetails_interfaces(env, bddObj, bdidArray);
-
-    rv = bddObj;
-
-out:
-
-    vppjni_unlock (jm);
-
-    return rv;
-}
-
-static jobject l2_fib_create_object(JNIEnv *env, bd_l2fib_oper_t *l2_fib)
-{
-    u32 sw_if_index = l2_fib->sw_if_index;
-    const char *str_if_name = interface_name_from_sw_if_index(sw_if_index);
-    if (NULL == str_if_name) {
-        return NULL;
-    }
-    jstring interfaceName = (*env)->NewStringUTF(env, str_if_name);
-    if (NULL == interfaceName) {
-        return NULL;
-    }
-
-    jbyteArray physAddr = (*env)->NewByteArray(env, 6);
-    (*env)->SetByteArrayRegion(env, physAddr, 0, 6,
-            (signed char*)l2_fib->mac_addr.fields.mac);
-    jboolean staticConfig = !l2_fib->learned;
-    jstring outgoingInterface = interfaceName;
-    jboolean filter = l2_fib->filter;
-    jboolean bridgedVirtualInterface = l2_fib->bvi;
-
-    return vppL2FibObject(env, physAddr, staticConfig, outgoingInterface, filter, bridgedVirtualInterface);
-}
-
-JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_l2FibTableDump0
-(JNIEnv * env, jobject obj, jint bd_id)
-{
-    vppjni_main_t *jm = &vppjni_main;
-    vjbd_main_t * bdm = &jm->vjbd_main;
-    vl_api_l2_fib_table_dump_t *mp;
-    jobjectArray l2FibArray = NULL;
-    vjbd_oper_t *bd_oper;
-    u32 oper_bd_index;
-    uword *p;
-    f64 timeout;
-    int rv;
-    u32 i;
-
-    vppjni_lock (jm, 17);
-
-    //vjbd_l2fib_oper_reset (bdm);
-
-    p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id);
-    if (p == 0) {
-        goto done;
-    }
-    oper_bd_index = p[0];
-    bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index);
-    vec_reset_length (bd_oper->l2fib_oper);
-
-    /* Get list of l2 fib table entries */
-    M(L2_FIB_TABLE_DUMP, l2_fib_table_dump);
-    mp->bd_id = ntohl(bd_id);
-    S;
-
-    /* Use a control ping for synchronization */
-    {
-        vl_api_control_ping_t * mp;
-        M(CONTROL_PING, control_ping);
-        S;
-    }
-
-    WNR;
-    if (0 != rv) {
-        goto done;
-    }
-
-    u32 count = vec_len(bd_oper->l2fib_oper);
-    bd_l2fib_oper_t *l2fib_oper = bd_oper->l2fib_oper;
-
-    l2FibArray = vppL2FibArray(env, count);
-    for (i = 0; i < count; i++) {
-        bd_l2fib_oper_t *l2_fib = &l2fib_oper[i];
-        jobject l2FibObj = l2_fib_create_object(env, l2_fib);
-        (*env)->SetObjectArrayElement(env, l2FibArray, i, l2FibObj);
-    }
-
-done:
-    vppjni_unlock (jm);
-
-    return l2FibArray;
-}
-
-static void
-vl_api_l2_fib_table_entry_t_handler (vl_api_l2_fib_table_entry_t * mp)
-{
-    //static u8 * mac_addr;
-    vppjni_main_t *jm = &vppjni_main;
-    vjbd_main_t * bdm = &jm->vjbd_main;
-    vjbd_oper_t * bd_oper;
-    u32 bd_id, oper_bd_index;
-    //uword mhash_val_l2fi;
-    bd_l2fib_oper_t * l2fib_oper;
-    l2fib_u64_mac_t * l2fe_u64_mac = (l2fib_u64_mac_t *)&mp->mac;
-
-    bd_id = ntohl (mp->bd_id);
-
-    uword *p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id);
-    if (p == 0) {
-        return;
-    }
-    oper_bd_index = (jint) p[0];
-    bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index);
-
-#if 0
-    vec_validate (mac_addr, MAC_ADDRESS_SIZE);
-    memcpy (mac_addr, l2fe_u64_mac->fields.mac, MAC_ADDRESS_SIZE);
-    mhash_val_l2fi = vec_len (bd_oper->l2fib_oper);
-    if (mhash_elts (&bd_oper->l2fib_index_by_mac) == 0)
-        mhash_init (&bd_oper->l2fib_index_by_mac, sizeof (u32), MAC_ADDRESS_SIZE);
-    mhash_set_mem (&bd_oper->l2fib_index_by_mac, mac_addr, &mhash_val_l2fi, 0);
-#endif
-
-    vec_add2 (bd_oper->l2fib_oper, l2fib_oper, 1);
-
-    l2fib_oper->bd_id = bd_id;
-    l2fib_oper->mac_addr.raw = l2fib_mac_to_u64 (l2fe_u64_mac->fields.mac);
-    l2fib_oper->sw_if_index = ntohl (mp->sw_if_index);
-    l2fib_oper->learned = !mp->static_mac;
-    l2fib_oper->filter = mp->filter_mac;
-    l2fib_oper->bvi = mp->bvi_mac;
-}
-
-static int ipAddressDump
-(JNIEnv * env, jobject obj, jstring interfaceName, jboolean isIPv6)
-{
-    vppjni_main_t *jm = &vppjni_main;
-    vl_api_ip_address_dump_t * mp;
-    const char *if_name;
-    u32 my_context_id;
-    u32 sw_if_index;
-    f64 timeout;
-    uword *p;
-    int rv = 0;
-
-    if (NULL == interfaceName) {
-        return -1;
-    }
-
-    if_name = (*env)->GetStringUTFChars (env, interfaceName, NULL);
-    if (!if_name) {
-        return -1;
-    }
-
-    p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name);
-    (*env)->ReleaseStringUTFChars (env, interfaceName, if_name);
-    if (p == 0) {
-        return -1;
-    }
-    sw_if_index = (u32) p[0];
-
-    rv = vppjni_sanity_check (jm);
-    if (0 != rv) {
-        return rv;
-    }
-
-    my_context_id = vppjni_get_context_id (jm);
-    M(IP_ADDRESS_DUMP, ip_address_dump);
-    mp->context = clib_host_to_net_u32 (my_context_id);
-    mp->sw_if_index = clib_host_to_net_u32(sw_if_index);
-    mp->is_ipv6 = isIPv6;
-    jm->is_ipv6 = isIPv6;
-    S;
-
-    /* Use a control ping for synchronization */
-    {
-      vl_api_control_ping_t * mp;
-      M(CONTROL_PING, control_ping);
-      S;
-    }
-
-    WNR;
-
-    return rv;
-}
-
-JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_ipv4AddressDump0
-(JNIEnv * env, jobject obj, jstring interfaceName)
-{
-    vppjni_main_t *jm = &vppjni_main;
-    jobject returnArray = NULL;
-    int i;
-
-    vppjni_lock (jm, 18);
-
-    vec_reset_length(jm->ipv4_addresses);
-
-    if (0 != ipAddressDump(env, obj, interfaceName, 0)) {
-        goto done;
-    }
-
-    u32 count = vec_len(jm->ipv4_addresses);
-    ipv4_address_t *ipv4_address = jm->ipv4_addresses;
-
-    jobjectArray ipv4AddressArray = vppIPv4AddressArray(env, count);
-
-    for (i = 0; i < count; i++) {
-        ipv4_address_t *address = &ipv4_address[i];
-
-        jint ip = address->ip;
-        jbyte prefixLength = address->prefix_length;
-
-        jobject ipv4AddressObj = vppIPv4AddressObject(env, ip, prefixLength);
-
-        (*env)->SetObjectArrayElement(env, ipv4AddressArray, i, ipv4AddressObj);
-    }
-
-    returnArray = ipv4AddressArray;
-
-done:
-    vppjni_unlock (jm);
-    return returnArray;
-}
-
-JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_ipv6AddressDump0
-(JNIEnv * env, jobject obj, jstring interfaceName)
-{
-    vppjni_main_t *jm = &vppjni_main;
-    jobject returnArray = NULL;
-    int i;
-
-    vppjni_lock (jm, 19);
-
-    vec_reset_length(jm->ipv6_addresses);
-
-    if (0 != ipAddressDump(env, obj, interfaceName, 1)) {
-        goto done;
-    }
-
-    u32 count = vec_len(jm->ipv6_addresses);
-    ipv6_address_t *ipv6_address = jm->ipv6_addresses;
-
-    jobjectArray ipv6AddressArray = vppIPv6AddressArray(env, count);
-
-    for (i = 0; i < count; i++) {
-        ipv6_address_t *address = &ipv6_address[i];
-
-        jbyteArray ip = (*env)->NewByteArray(env, 16);
-        (*env)->SetByteArrayRegion(env, ip, 0, 16,
-                (signed char*)address->ip);
-
-        jbyte prefixLength = address->prefix_length;
-
-        jobject ipv6AddressObj = vppIPv6AddressObject(env, ip, prefixLength);
-
-        (*env)->SetObjectArrayElement(env, ipv6AddressArray, i, ipv6AddressObj);
-    }
-
-    returnArray = ipv6AddressArray;
-
-done:
-    vppjni_unlock (jm);
-    return returnArray;
-}
-
-static void vl_api_ip_address_details_t_handler (vl_api_ip_address_details_t * mp)
-{
-    vppjni_main_t * jm = &vppjni_main;
-
-    if (!jm->is_ipv6) {
-        ipv4_address_t *address = 0;
-        vec_add2(jm->ipv4_addresses, address, 1);
-        memcpy(&address->ip, mp->ip, 4);
-        address->prefix_length = mp->prefix_length;
-    } else {
-        ipv6_address_t *address = 0;
-        vec_add2(jm->ipv6_addresses, address, 1);
-        memcpy(address->ip, mp->ip, 16);
-        address->prefix_length = mp->prefix_length;
-    }
-}
-
-#define VXLAN_TUNNEL_INTERFACE_NAME_PREFIX "vxlan_tunnel"
-
-JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_vxlanTunnelDump0
-(JNIEnv * env, jobject obj, jint swIfIndex)
-{
-    vppjni_main_t *jm = &vppjni_main;
-    vl_api_vxlan_tunnel_dump_t * mp;
-    jobjectArray returnArray = NULL;
-    u32 my_context_id;
-    f64 timeout;
-    int rv = 0;
-    int i;
-
-    vppjni_lock (jm, 22);
-
-    vec_reset_length(jm->vxlan_tunnel_details);
-
-    my_context_id = vppjni_get_context_id (jm);
-    M(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump);
-    mp->context = clib_host_to_net_u32 (my_context_id);
-    mp->sw_if_index = clib_host_to_net_u32 (swIfIndex);
-    S;
-
-    /* Use a control ping for synchronization */
-    {
-      vl_api_control_ping_t * mp;
-      M(CONTROL_PING, control_ping);
-      S;
-    }
-
-    WNR;
-    if (0 != rv) {
-        goto done;
-    }
-
-    u32 count = vec_len(jm->vxlan_tunnel_details);
-
-    jobjectArray vxlanTunnelDetailsArray = vppVxlanTunnelDetailsArray(env, count);
-
-    for (i = 0; i < count; i++) {
-        vxlan_tunnel_details_t *details = &jm->vxlan_tunnel_details[i];
-
-        jint src_address = details->src_address;
-        jint dst_address = details->dst_address;
-        jint encap_vrf_id = details->encap_vrf_id;
-        jint vni = details->vni;
-        jint decap_next_index = details->decap_next_index;
-
-        jobject vxlanTunnelDetailsObj = vppVxlanTunnelDetailsObject(env,
-                src_address, dst_address, encap_vrf_id, vni, decap_next_index);
-
-        (*env)->SetObjectArrayElement(env, vxlanTunnelDetailsArray, i,
-                vxlanTunnelDetailsObj);
-    }
-
-    returnArray = vxlanTunnelDetailsArray;
-
-done:
-    vppjni_unlock (jm);
-    return returnArray;
-}
-
-static void vl_api_vxlan_tunnel_details_t_handler
-(vl_api_vxlan_tunnel_details_t * mp)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    vxlan_tunnel_details_t *tunnel_details;
-
-    vec_add2(jm->vxlan_tunnel_details, tunnel_details, 1);
-    tunnel_details->src_address = ntohl(mp->src_address);
-    tunnel_details->dst_address = ntohl(mp->dst_address);
-    tunnel_details->encap_vrf_id = ntohl(mp->encap_vrf_id);
-    tunnel_details->vni = ntohl(mp->vni);
-    tunnel_details->decap_next_index = ntohl(mp->decap_next_index);
-}
-
-/* cleanup handler for RX thread */
-static void cleanup_rx_thread(void *arg)
-{
-    vppjni_main_t * jm = &vppjni_main;
-
-    vppjni_lock (jm, 99);
-
-    int getEnvStat = (*jm->jvm)->GetEnv(jm->jvm, (void **)&(jm->jenv), JNI_VERSION_1_6);
-    if (getEnvStat == JNI_EVERSION) {
-        clib_warning ("Unsupported JNI version\n");
-        jm->retval = -999;
-        goto out;
-    } else if (getEnvStat != JNI_EDETACHED) {
-        (*jm->jvm)->DetachCurrentThread(jm->jvm);
-    }
-out:
-    vppjni_unlock (jm);
-}
-
-static void
-vl_api_show_version_reply_t_handler (vl_api_show_version_reply_t * mp)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    i32 retval = ntohl(mp->retval);
-
-    if (retval >= 0) {
-        DEBUG_LOG ("show version request succeeded(%d)");
-        strncpy((char*)jm->program_name, (const char*)mp->program,
-                sizeof(jm->program_name)-1);
-        jm->program_name[sizeof(jm->program_name)-1] = 0;
-
-        strncpy((char*)jm->build_directory, (const char*)mp->build_directory,
-                sizeof(jm->build_directory)-1);
-        jm->build_directory[sizeof(jm->build_directory)-1] = 0;
-
-        strncpy((char*)jm->version, (const char*)mp->version,
-                sizeof(jm->version)-1);
-        jm->version[sizeof(jm->version)-1] = 0;
-
-        strncpy((char*)jm->build_date, (const char*)mp->build_date,
-                sizeof(jm->build_date)-1);
-        jm->build_date[sizeof(jm->build_date)-1] = 0;
-    } else {
-        clib_error ("show version request failed(%d)", retval);
-    }
-    jm->retval = retval;
-    jm->result_ready = 1;
-}
-
-static void vl_api_want_stats_reply_t_handler (vl_api_want_stats_reply_t * mp)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    jm->retval = mp->retval; // FIXME: vpp api does not do ntohl on this retval
-    jm->result_ready = 1;
-}
-
-// control ping needs to be very first thing called
-// to attach rx thread to java thread
-static void vl_api_control_ping_reply_t_handler
-(vl_api_control_ping_reply_t * mp)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    i32 retval = ntohl(mp->retval);
-    jm->retval = retval;
-
-    // attach to java thread if not attached
-    int getEnvStat = (*jm->jvm)->GetEnv(jm->jvm, (void **)&(jm->jenv), JNI_VERSION_1_6);
-    if (getEnvStat == JNI_EDETACHED) {
-        if ((*jm->jvm)->AttachCurrentThread(jm->jvm, (void **)&(jm->jenv), NULL) != 0) {
-            clib_warning("Failed to attach thread\n");
-            jm->retval = -999;
-            goto out;
-        }
-
-        // workaround as we can't use pthread_cleanup_push
-        pthread_key_create(&jm->cleanup_rx_thread_key, cleanup_rx_thread);
-        // destructor is only called if the value of key is non null
-        pthread_setspecific(jm->cleanup_rx_thread_key, (void *)1);
-    } else if (getEnvStat == JNI_EVERSION) {
-        clib_warning ("Unsupported JNI version\n");
-        jm->retval = -999;
-        goto out;
-    }
-    // jm->jenv is now stable global reference that can be reused (only within RX thread)
-
-#if 0
-    // ! callback system removed for now
-    //
-    // get issuer msg-id
-    p = hash_get (jm->ping_hash, context);
-    if (p != 0) { // ping marks end of some dump call
-        JNIEnv *env = jm->jenv;
-        u16 msg_id = (u16)p[0];
-
-        // we will no longer need this
-        hash_unset (jm->ping_hash, context);
-
-        // get original caller obj
-        p = hash_get (jm->callback_hash, context);
-
-        if (p == 0) // don't have callback stored
-            goto out;
-
-        jobject obj = (jobject)p[0]; // object that called original call
-
-        switch (msg_id) {
-            case VL_API_SW_INTERFACE_DUMP:
-                if (0 != sw_if_dump_call_all_callbacks(obj)) {
-                    goto out2;
-                }
-                break;
-            default:
-                clib_warning("Unhandled control ping issuer msg-id: %d", msg_id);
-                goto out2;
-                break;
-        }
-out2:
-        // free the saved obj
-        hash_unset (jm->callback_hash, context);
-        // delete global reference
-        (*env)->DeleteGlobalRef(env, obj);
-    }
-#endif
-
-out:
-    jm->result_ready = 1;
-}
-
-#define VPPJNI_DEBUG_COUNTERS 0
-
-static void vl_api_vnet_interface_counters_t_handler
-(vl_api_vnet_interface_counters_t *mp)
-{
-    vppjni_main_t *jm = &vppjni_main;
-    CLIB_UNUSED(char *counter_name);
-    u32 count, sw_if_index;
-    int i;
-    static sw_interface_stats_t empty_stats = {0, };
-
-    vppjni_lock (jm, 12);
-    count = ntohl (mp->count);
-    sw_if_index = ntohl (mp->first_sw_if_index);
-    if (mp->is_combined == 0) {
-        u64 * vp, v;
-        vp = (u64 *) mp->data;
-
-        for (i = 0; i < count; i++) {
-            sw_interface_details_t *sw_if = NULL;
-
-            v = clib_mem_unaligned (vp, u64);
-            v = clib_net_to_host_u64 (v);
-            vp++;
-
-            if (sw_if_index < vec_len(jm->sw_if_table))
-                sw_if = vec_elt_at_index(jm->sw_if_table, sw_if_index);
-
-            if (sw_if /* && (sw_if->admin_up_down == 1)*/ && sw_if->interface_name[0] != 0) {
-                vec_validate_init_empty(jm->sw_if_stats_by_sw_if_index, sw_if_index, empty_stats);
-                sw_interface_stats_t * s = vec_elt_at_index(jm->sw_if_stats_by_sw_if_index, sw_if_index);
-
-                s->sw_if_index = sw_if_index;
-                s->valid = 1;
-
-                switch (mp->vnet_counter_type) {
-                    case  VNET_INTERFACE_COUNTER_DROP:
-                        counter_name = "drop";
-                        s->rx.pkts.discard = v;
-                        break;
-                    case  VNET_INTERFACE_COUNTER_PUNT:
-                        counter_name = "punt";
-                        s->rx.pkts.unknown_proto = v;
-                        break;
-                    case  VNET_INTERFACE_COUNTER_IP4:
-                        counter_name = "ip4";
-                        s->rx.pkts.ip4 = v;
-                        break;
-                    case  VNET_INTERFACE_COUNTER_IP6:
-                        counter_name = "ip6";
-                        s->rx.pkts.ip6 = v;
-                        break;
-                    case  VNET_INTERFACE_COUNTER_RX_NO_BUF:
-                        counter_name = "rx-no-buf";
-                        s->rx.pkts.fifo_full = v;
-                        break;
-                    case  VNET_INTERFACE_COUNTER_RX_MISS:
-                        counter_name = "rx-miss";
-                        s->rx.pkts.miss = v;
-                        break;
-                    case  VNET_INTERFACE_COUNTER_RX_ERROR:
-                        counter_name = "rx-error";
-                        s->rx.pkts.error = v;
-                        break;
-                    case  VNET_INTERFACE_COUNTER_TX_ERROR:
-                        counter_name = "tx-error (fifo-full)";
-                        s->tx.pkts.fifo_full = v;
-                        break;
-                    default:
-                        counter_name = "bogus";
-                        break;
-                }
-
-#if VPPJNI_DEBUG_COUNTERS == 1
-                clib_warning ("%s (%d): %s (%lld)\n", sw_if->interface_name, s->sw_if_index,
-                        counter_name, v);
-#endif
-            }
-            sw_if_index++;
-        }
-    } else {
-        vlib_counter_t *vp;
-        u64 packets, bytes;
-        vp = (vlib_counter_t *) mp->data;
-
-        for (i = 0; i < count; i++) {
-            sw_interface_details_t *sw_if = NULL;
-
-            packets = clib_mem_unaligned (&vp->packets, u64);
-            packets = clib_net_to_host_u64 (packets);
-            bytes = clib_mem_unaligned (&vp->bytes, u64);
-            bytes = clib_net_to_host_u64 (bytes);
-            vp++;
-
-            if (sw_if_index < vec_len(jm->sw_if_table))
-                sw_if = vec_elt_at_index(jm->sw_if_table, sw_if_index);
-
-            if (sw_if /* && (sw_if->admin_up_down == 1) */ && sw_if->interface_name[0] != 0) {
-                vec_validate_init_empty(jm->sw_if_stats_by_sw_if_index, sw_if_index, empty_stats);
-                sw_interface_stats_t * s = vec_elt_at_index(jm->sw_if_stats_by_sw_if_index, sw_if_index);
-
-                s->valid = 1;
-                s->sw_if_index = sw_if_index;
-
-                switch (mp->vnet_counter_type) {
-                    case  VNET_INTERFACE_COUNTER_RX:
-                        s->rx.pkts.unicast = packets;
-                        s->rx.octets = bytes;
-                        counter_name = "rx";
-                        break;
-
-                    case  VNET_INTERFACE_COUNTER_TX:
-                        s->tx.pkts.unicast = packets;
-                        s->tx.octets = bytes;
-                        counter_name = "tx";
-                        break;
-
-                    default:
-                        counter_name = "bogus";
-                        break;
-                }
-
-#if VPPJNI_DEBUG_COUNTERS == 1
-                clib_warning ("%s (%d): %s.packets %lld\n",
-                        sw_if->interface_name,
-                        sw_if_index, counter_name, packets);
-                clib_warning ("%s (%d): %s.bytes %lld\n",
-                        sw_if->interface_name,
-                        sw_if_index, counter_name, bytes);
-#endif
-            }
-            sw_if_index++;
-        }
-    }
-    vppjni_unlock (jm);
-}
-
-jint JNI_OnLoad(JavaVM *vm, void *reserved) {
-    vppjni_main_t * jm = &vppjni_main;
-    JNIEnv* env;
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_6) != JNI_OK) {
-        return JNI_ERR;
-    }
-
-    if (vppjni_init(env) != 0) {
-        return JNI_ERR;
-    }
-
-    jm->jvm = vm;
-    return JNI_VERSION_1_6;
-}
-
-void JNI_OnUnload(JavaVM *vm, void *reserved) {
-    vppjni_main_t * jm = &vppjni_main;
-    JNIEnv* env;
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_6) != JNI_OK) {
-        return;
-    }
-
-    vppjni_uninit(env);
-
-    jm->jenv = NULL;
-    jm->jvm = NULL;
-}
-
-#define foreach_vpe_api_msg                             \
-_(CONTROL_PING_REPLY, control_ping_reply)               \
-_(SW_INTERFACE_DETAILS, sw_interface_details)           \
-_(SHOW_VERSION_REPLY, show_version_reply)               \
-_(WANT_STATS_REPLY, want_stats_reply)                   \
-_(VNET_INTERFACE_COUNTERS, vnet_interface_counters)     \
-_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags)       \
-_(BRIDGE_DOMAIN_DETAILS, bridge_domain_details)         \
-_(BRIDGE_DOMAIN_SW_IF_DETAILS, bridge_domain_sw_if_details) \
-_(L2_FIB_TABLE_ENTRY, l2_fib_table_entry)               \
-_(IP_ADDRESS_DETAILS, ip_address_details)               \
-_(VXLAN_TUNNEL_DETAILS, vxlan_tunnel_details)
-
-static int connect_to_vpe(char *name)
-{
-    vppjni_main_t * jm = &vppjni_main;
-    api_main_t * am = &api_main;
-
-    if (vl_client_connect_to_vlib("/vpe-api", name, 32) < 0)
-        return -1;
-
-    jm->my_client_index = am->my_client_index;
-    jm->vl_input_queue = am->shmem_hdr->vl_input_queue;
-
-#define _(N,n)                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,     \
-            vl_api_##n##_t_handler,	            \
-            vl_noop_handler,                    \
-            vl_api_##n##_t_endian,              \
-            vl_api_##n##_t_print,               \
-            sizeof(vl_api_##n##_t), 1);
-    foreach_vpe_api_msg;
-#undef _
-
-    return 0;
-}
-
-/* Format an IP6 address. */
-u8 * format_ip6_address (u8 * s, va_list * args)
-{
-    ip6_address_t * a = va_arg (*args, ip6_address_t *);
-    u32 max_zero_run = 0, this_zero_run = 0;
-    int max_zero_run_index = -1, this_zero_run_index=0;
-    int in_zero_run = 0, i;
-    int last_double_colon = 0;
-
-    /* Ugh, this is a pain. Scan forward looking for runs of 0's */
-    for (i = 0; i < ARRAY_LEN (a->as_u16); i++) {
-        if (a->as_u16[i] == 0) {
-            if (in_zero_run) {
-                this_zero_run++;
-            } else {
-                in_zero_run = 1;
-                this_zero_run =1;
-                this_zero_run_index = i;
-            }
-        } else {
-            if (in_zero_run) {
-                /* offer to compress the biggest run of > 1 zero */
-                if (this_zero_run > max_zero_run && this_zero_run > 1) {
-                    max_zero_run_index = this_zero_run_index;
-                    max_zero_run = this_zero_run;
-                }
-            }
-            in_zero_run = 0;
-            this_zero_run = 0;
-        }
-    }
-
-    if (in_zero_run) {
-        if (this_zero_run > max_zero_run && this_zero_run > 1) {
-            max_zero_run_index = this_zero_run_index;
-            max_zero_run = this_zero_run;
-        }
-    }
-
-    for (i = 0; i < ARRAY_LEN (a->as_u16); i++) {
-        if (i == max_zero_run_index) {
-            s = format (s, "::");
-            i += max_zero_run - 1;
-            last_double_colon = 1;
-        } else {
-            s = format (s, "%s%x",
-                    (last_double_colon || i == 0) ? "" : ":",
-                    clib_net_to_host_u16 (a->as_u16[i]));
-            last_double_colon = 0;
-        }
-    }
-
-    return s;
-}
-
-/* Format an IP4 address. */
-u8 * format_ip4_address (u8 * s, va_list * args)
-{
-    u8 * a = va_arg (*args, u8 *);
-    return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
-}
-
-
diff --git a/vpp-japi/japi/vppjni.h b/vpp-japi/japi/vppjni.h
deleted file mode 100644
index bd0683ae..00000000
--- a/vpp-japi/japi/vppjni.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_vppjni_h__
-#define __included_vppjni_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/api_errno.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <jni.h>
-#include <japi/vppjni_bridge_domain.h>
-
-typedef struct {
-    u8 * name;
-    u32 value;
-} name_sort_t;
-
-typedef struct {
-    u8 valid; // used in a vector of sw_interface_details_t
-
-    u8 interface_name[64];
-    u32 sw_if_index;
-    u32 sup_sw_if_index;
-    u32 l2_address_length;
-    u8 l2_address[8];
-    u8 admin_up_down;
-    u8 link_up_down;
-    u8 link_duplex;
-    u8 link_speed;
-    u16 link_mtu;
-    u32 sub_id;
-    u8 sub_dot1ad;
-    u8 sub_number_of_tags;
-    u16 sub_outer_vlan_id;
-    u16 sub_inner_vlan_id;
-    u8 sub_exact_match;
-    u8 sub_default;
-    u8 sub_outer_vlan_id_any;
-    u8 sub_inner_vlan_id_any;
-    u32 vtr_op;
-    u32 vtr_push_dot1q;
-    u32 vtr_tag1;
-    u32 vtr_tag2;
-} sw_interface_details_t;
-
-typedef struct {
-    u8 * interface_name;
-    u32 sw_if_index;
-    /* 
-     * Subinterface ID. A number 0-N to uniquely identify 
-     * this subinterface under the super interface
-     */
-    u32 sub_id;
-
-    /* 0 = dot1q, 1=dot1ad */
-    u8 sub_dot1ad;
-
-    /* Number of tags 0-2 */
-    u8 sub_number_of_tags;
-    u16 sub_outer_vlan_id;
-    u16 sub_inner_vlan_id;
-    u8 sub_exact_match;
-    u8 sub_default;
-    u8 sub_outer_vlan_id_any;
-    u8 sub_inner_vlan_id_any;
-
-    /* vlan tag rewrite */
-    u32 vtr_op;
-    u32 vtr_push_dot1q;
-    u32 vtr_tag1;
-    u32 vtr_tag2;
-} sw_interface_subif_t;
-
-typedef struct {
-    u8 *desc;
-} sw_if_config_t;
-
-typedef struct {
-    u32 ip;
-    u8 prefix_length;
-} ipv4_address_t;
-
-typedef struct {
-    u8 ip[16];
-    u8 prefix_length;
-} ipv6_address_t;
-
-typedef struct {
-  u64 ip4;
-  u64 ip6;
-  u64 unicast;
-  u64 multicast;
-  u64 broadcast;
-  u64 discard;
-  u64 fifo_full;
-  u64 error;
-  u64 unknown_proto;
-  u64 miss;
-} packet_counters_t;
-
-typedef struct {
-  u64 octets;
-  packet_counters_t pkts;
-} if_counters_t;
-
-typedef struct {
-  u8 valid;
-  u32 sw_if_index;
-  if_counters_t rx;
-  if_counters_t tx;
-} sw_interface_stats_t;
-
-typedef struct {
-    u32 src_address;
-    u32 dst_address;
-    u32 encap_vrf_id;
-    u32 vni;
-    u32 decap_next_index;
-} vxlan_tunnel_details_t;
-
-
-typedef struct {
-  /* Context IDs */
-  volatile u32 context_id_sent;
-  volatile u32 context_id_received;
-
-  /* Spinlock */
-  volatile u32 lock;
-  u32 tag;
-
-  /* To recycle pseudo-synchronous message code from vpp_api_test... */
-  volatile u32 result_ready;
-  volatile i32 retval;
-  volatile u8 *shmem_result;
-
-  /* thread cleanup */
-  pthread_key_t cleanup_rx_thread_key;
-  /* attachment of rx thread to java thread */
-  JNIEnv *jenv;
-  JavaVM *jvm;
-  uword *callback_hash;     // map context_id => jobject
-  uword *ping_hash;         // map ping context_id => msg type called
-
-  /* Timestamp */
-  clib_time_t clib_time;
-
-  /* connected indication */
-  u8 is_connected;
-
-  /* context -> non-trivial reply hash */
-  uword * reply_hash;
-  u32 saved_reply_count;
-
-  /* interface name map */
-  uword * sw_if_index_by_interface_name;
-
-  /* interface counters */
-  sw_interface_stats_t * sw_if_stats_by_sw_if_index;
-
-  /* interface table */
-  sw_interface_details_t * sw_if_table;
-
-  uword * sw_if_config_by_sw_if_index;
-
-  /* interface indices of responses to one sw_if_dump request */
-  u8 collect_indices;
-  u32 * sw_if_dump_if_indices;
-
-  /* program name, build_dir, version */
-  u8 program_name[32];
-  u8 build_directory[256];
-  u8 version[32];
-  u8 build_date[32];
-
-  /* subinterface table */
-  sw_interface_subif_t * sw_if_subif_table;
-
-  /* used in ip_address_dump request and response handling */
-  ipv4_address_t *ipv4_addresses;
-  ipv6_address_t *ipv6_addresses;
-  u8 is_ipv6;
-
-  /* used in vxlan_tunnel_dump request and response handling */
-  vxlan_tunnel_details_t *vxlan_tunnel_details;
-
-  /* main heap */
-  u8 * heap;
-
-  /* convenience */
-  unix_shared_memory_queue_t * vl_input_queue;
-  api_main_t * api_main;
-  u32 my_client_index;
-
-  vjbd_main_t vjbd_main;
-} vppjni_main_t;
-
-vppjni_main_t vppjni_main __attribute__((aligned (64)));
-
-
-static inline u32 vppjni_get_context_id (vppjni_main_t * jm)
-{
-  u32 my_context_id;
-  my_context_id = __sync_add_and_fetch (&jm->context_id_sent, 1);
-  return my_context_id;
-}
-
-static inline void vppjni_lock (vppjni_main_t * jm, u32 tag)
-{
-  while (__sync_lock_test_and_set (&jm->lock, 1))
-    ;
-  jm->tag = tag;
-}
-
-static inline void vppjni_unlock (vppjni_main_t * jm)
-{
-  jm->tag = 0;
-  CLIB_MEMORY_BARRIER();
-  jm->lock = 0;
-}
-
-static inline f64 vppjni_time_now (vppjni_main_t *jm)
-{
-  return clib_time_now (&jm->clib_time);
-}
-
-static inline int vppjni_sanity_check (vppjni_main_t * jm)
-{
-  if (!jm->is_connected)
-    return VNET_API_ERROR_NOT_CONNECTED;
-  return 0;
-}
-
-#define __PACKED(x) x __attribute__((packed))
-
-typedef __PACKED(struct _vl_api_generic_reply {
-  u16 _vl_msg_id;
-  u32 context;
-  i32 retval;
-  u8 data[0];
-}) vl_api_generic_reply_t;
-
-void vl_api_generic_reply_handler (vl_api_generic_reply_t *mp);
-
-/* M: construct, but don't yet send a message */
-
-#define M(T,t)                                  \
-do {                                            \
-  jm->result_ready = 0;                         \
-  mp = vl_msg_api_alloc(sizeof(*mp));           \
-  memset (mp, 0, sizeof (*mp));                 \
-  mp->_vl_msg_id = ntohs (VL_API_##T);          \
-  mp->client_index = jm->my_client_index;       \
- } while(0);
-
-#define M2(T,t,n)                               \
-do {                                            \
-  jm->result_ready = 0;                         \
-  mp = vl_msg_api_alloc(sizeof(*mp)+(n));       \
-  memset (mp, 0, sizeof (*mp));                 \
-  mp->_vl_msg_id = ntohs (VL_API_##T);          \
-  mp->client_index = jm->my_client_index;       \
- } while(0);
-
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (jm->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W                                       \
-  do {                                          \
-    timeout = vppjni_time_now (jm) + 1.0;       \
-                                                \
-    while (vppjni_time_now (jm) < timeout) {    \
-      if (jm->result_ready == 1) {              \
-        return (jm->retval);                    \
-      }                                         \
-    }                                           \
-    return -99;                                 \
-} while(0);
-
-/* WNR: wait for results, with timeout (without returning) */
-#define WNR                                     \
-  do {                                          \
-    timeout = vppjni_time_now (jm) + 1.0;       \
-                                                \
-    rv = -99;                                   \
-    while (vppjni_time_now (jm) < timeout) {    \
-      if (jm->result_ready == 1) {              \
-        rv = (jm->retval);                      \
-        break;                                  \
-      }                                         \
-    }                                           \
-} while(0);
-
-#endif /* __included_vppjni_h__ */
diff --git a/vpp-japi/japi/vppjni_bridge_domain.h b/vpp-japi/japi/vppjni_bridge_domain.h
deleted file mode 100644
index b614a5be..00000000
--- a/vpp-japi/japi/vppjni_bridge_domain.h
+++ /dev/null
@@ -1,510 +0,0 @@
-/*---------------------------------------------------------------------------
- * Copyright (c) 2009-2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------
- */
-
-#ifndef __included_vppjni_bridge_domain_h__
-#define __included_vppjni_bridge_domain_h__
-
-#include <vlib/vlib.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/mhash.h>
-
-/*
- * The L2fib key is the mac address and bridge domain ID
- */
-#define MAC_ADDRESS_SIZE  6
-
-typedef struct {
-  union {
-    struct {
-      u16 unused1;
-      u8  mac[MAC_ADDRESS_SIZE]; 
-    } fields;
-    u64 raw;
-  };
-} l2fib_u64_mac_t;
-
-/* 
- * The l2fib entry results
- */
-typedef struct {
-  u32 bd_id;
-  l2fib_u64_mac_t mac_addr;
-  u32 sw_if_index;
-  u8  learned:1;
-  u8  bvi:1;
-  u8  filter:1;      // drop packets to/from this mac
-  u8  unused1:5;
-} bd_l2fib_oper_t;
-
-typedef struct {
-  u32 bd_id;
-  u8 * bd_name;
-} bd_local_cfg_t;
-
-typedef struct {
-  u32 bd_id;
-  u32 sw_if_index;
-  u32 shg;
-} bd_sw_if_oper_t;
-
-typedef struct {
-  u32 bd_id;
-  u8 flood:1;
-  u8 forward:1;
-  u8 learn:1;
-  u8 uu_flood:1;
-  u8 arp_term:1;
-  u8 unused1:3;
-  u32 bvi_sw_if_index;
-  u32 n_sw_ifs;
-  bd_sw_if_oper_t * bd_sw_if_oper;
-  f64 last_sync_time;
-  mhash_t l2fib_index_by_mac;
-  bd_l2fib_oper_t * l2fib_oper;	// vector indexed by l2fib_index
-} vjbd_oper_t;
-
-#define BD_OPER_REFRESH_INTERVAL  	2.0
-#define BD_OPER_L2FIB_REFRESH_INTERVAL	5.0
-
-typedef struct {
-  u32 next_bd_id;
-  uword * bd_index_bitmap;
-  uword * bd_index_by_id;
-  mhash_t bd_id_by_name;
-  bd_local_cfg_t * local_cfg;		// vector indexed by bd_index
-  vjbd_oper_t * bd_oper;		// vector indexed by oper_bd_index
-  f64 bd_oper_last_sync_all_time;
-  bd_sw_if_oper_t * sw_if_oper;	// vector indexed by sw_if_index
-  f64 l2fib_oper_last_sync_time;
-  uword * bd_id_by_sw_if_index;
-  uword * oper_bd_index_by_bd_id;
-} vjbd_main_t;
-
-extern vjbd_main_t vjbd_main;
-
-always_inline
-u64 l2fib_mac_to_u64 (u8 * mac_address) {
-  u64 temp;
-
-  // The mac address in memory is A:B:C:D:E:F
-  // The bd id in register is H:L
-#if CLIB_ARCH_IS_LITTLE_ENDIAN
-  // Create the in-register key as F:E:D:C:B:A:H:L
-  // In memory the key is L:H:A:B:C:D:E:F
-  temp = *((u64 *)(mac_address - 2));
-  temp = (temp & ~0xffff);
-#else
-  // Create the in-register key as H:L:A:B:C:D:E:F
-  // In memory the key is H:L:A:B:C:D:E:F
-  temp = *((u64 *)(mac_address)) >> 16;
-#endif
-
-  return temp;
-}
-
-static_always_inline void vjbd_main_init (vjbd_main_t *bdm)
-{
-  bdm->bd_index_by_id = hash_create (0, sizeof(uword));
-  mhash_init_vec_string (&bdm->bd_id_by_name, sizeof (u32));
-  bdm->bd_id_by_sw_if_index = hash_create (0, sizeof (u32));
-  bdm->oper_bd_index_by_bd_id = hash_create (0, sizeof (u32));
-}
-
-static_always_inline u32 vjbd_id_is_valid (vjbd_main_t * bdm, u32 bd_id)
-{
-  return ((bd_id != 0) && (bd_id != ~0) && (bd_id <= bdm->next_bd_id));
-}
-
-static_always_inline u32 vjbd_index_is_free (vjbd_main_t * bdm, u16 bd_index)
-{
-  u32 bd_id = vec_elt_at_index(bdm->local_cfg, bd_index)->bd_id;
-
-  return (!clib_bitmap_get (bdm->bd_index_bitmap, (bd_index)) &&
-          (bd_index < vec_len (bdm->local_cfg)) &&
-          ((bd_id == 0) || (bd_id == ~0)));
-}
-
-static_always_inline u32 vjbd_index_is_valid (vjbd_main_t * bdm, u16 bd_index)
-{
-  return (clib_bitmap_get (bdm->bd_index_bitmap, bd_index) &&
-          (bd_index < vec_len (bdm->local_cfg)));
-}
-
-static_always_inline u32 vjbd_id_from_name (vjbd_main_t * bdm,
-                                            const u8 * bd_name)
-{
-  u32 bd_id;
-  uword * p;
-
-  ASSERT (vec_c_string_is_terminated (bd_name));
-
-  if (bdm->next_bd_id == 0)
-    return ~0;
-
-  p = mhash_get (&bdm->bd_id_by_name, (void *)bd_name);
-  if (p)
-    {
-      bd_id = p[0];
-      ASSERT (vjbd_id_is_valid (bdm, bd_id));
-    }
-  else
-    bd_id = ~0;
-
-  return bd_id;
-}
-
-static_always_inline u32 vjbd_index_from_id (vjbd_main_t * bdm, u32 bd_id)
-{
-  uword * p;
-  u16 bd_index;
-
-  ASSERT (vjbd_id_is_valid (bdm, bd_id));
-
-  p = hash_get (bdm->bd_index_by_id, bd_id);
-
-  ASSERT (p); // there is always an index associated with a valid bd_id
-  bd_index = p[0];
-
-  ASSERT (vjbd_index_is_valid (bdm, bd_index));
-
-  return bd_index;
-}
-
-static_always_inline u32 vjbd_id_from_index (vjbd_main_t * bdm, u16 bd_index)
-{
-  u32 bd_id;
-
-  ASSERT (vjbd_index_is_valid (bdm, bd_index));
-
-  bd_id = vec_elt_at_index(bdm->local_cfg, bd_index)->bd_id;
-
-  ASSERT (vjbd_id_is_valid (bdm, bd_id));
-
-  return bd_id;
-}
-
-static_always_inline u8 * vjbd_name_from_id (vjbd_main_t * bdm, u32 bd_id)
-{
-  u16 bd_index = vjbd_index_from_id (bdm, bd_id);
-
-  return vec_elt_at_index(bdm->local_cfg, bd_index)->bd_name;
-}
-
-static_always_inline u8 * vjbd_oper_name_from_id (vjbd_main_t * bdm, u32 bd_id)
-{
-    if (vjbd_id_is_valid (bdm, bd_id)) {
-        return format(0, "%s", vjbd_name_from_id(bdm, bd_id));
-    } else {
-        return format(0, "BridgeDomainOper%d", bd_id);
-    }
-}
-
-static_always_inline vjbd_oper_t * vjbd_oper_from_id (vjbd_main_t * bdm,
-                                                  u32 bd_id)
-{
-  u16 bd_index = vjbd_index_from_id (bdm, bd_id);
-  return vec_elt_at_index (bdm->bd_oper, bd_index);
-}
-
-static_always_inline void vjbd_oper_maybe_sync_from_vpp (vjbd_main_t * bdm, 
-                                                       u32 bd_id)
-{
-#ifdef VPPJNI_OPER
-  vppjni_vpe_api_msg_main_t *ovam = ovam_get_main ();
-
-  if (bd_id == ~0)
-    {
-      if ((ovam_time_now (ovam) - bdm->bd_oper_last_sync_all_time) >
-          BD_OPER_REFRESH_INTERVAL)
-        {
-          ovam_bridge_domain_dump (bd_id);
-          bdm->bd_oper_last_sync_all_time = ovam_time_now (ovam);
-        }
-    }
-    
-  else 
-    {
-      vjbd_oper_t * bd_oper = vjbd_oper_from_id (bdm, bd_id);
-
-      if ((ovam_time_now (ovam) - bd_oper->last_sync_time) >
-          BD_OPER_REFRESH_INTERVAL)
-        {
-          ovam_bridge_domain_dump (bd_id);
-
-          bd_oper->last_sync_time = ovam_time_now (ovam);
-        }
-    }
-#endif
-}
-
-static_always_inline u32 vjbd_id_from_sw_if_index (vjbd_main_t * bdm,
-                                                 u32 sw_if_index)
-{
-  bd_sw_if_oper_t * bd_sw_if_oper;
-  u32 bd_id = ~0;
-
-  vjbd_oper_maybe_sync_from_vpp (bdm, ~0);
-  if (sw_if_index < vec_len (bdm->sw_if_oper))
-    {
-      bd_sw_if_oper = vec_elt_at_index (bdm->sw_if_oper, sw_if_index);
-      bd_id = bd_sw_if_oper->bd_id;
-    }
-
-  return bd_id;
-}
-
-static_always_inline u8 * vjbd_name_from_sw_if_index (vjbd_main_t * bdm,
-                                                    u32 sw_if_index)
-{
-  u32 bd_id, bd_index;
-  u8 * bd_name = 0;
-  
-  /* DAW-FIXME:
-  ASSERT (ovam_sw_if_index_valid (ovam_get_main(), sw_if_index));
-  */
-  vjbd_oper_maybe_sync_from_vpp (bdm, ~0);
-  bd_id = vjbd_id_from_sw_if_index (bdm, sw_if_index);
-  if (vjbd_id_is_valid (bdm, bd_id))
-    {
-      bd_index = vjbd_index_from_id (bdm, bd_id);
-      bd_name = vec_elt_at_index (bdm->local_cfg, bd_index)->bd_name;
-    }
-
-  return bd_name;
-}
-
-static_always_inline u32 
-vjbd_oper_l2fib_index_from_mac (vjbd_oper_t * bd_oper, u8 * mac)
-{
-  u32 l2fib_index;
-  uword * p;
-
-  p = mhash_get (&bd_oper->l2fib_index_by_mac, mac);
-  if (p)
-    {
-      l2fib_index = p[0];
-      ASSERT (l2fib_index < vec_len (bd_oper->l2fib_oper));
-    }
-  else
-    l2fib_index = ~0;
-
-  return l2fib_index;
-}
-
-static_always_inline u32 vjbd_local_cfg_next_id (vjbd_main_t * bdm, 
-                                               u32 bd_id)
-{
-  u32 i, end = vec_len (bdm->local_cfg);
-  u32 next_bd_id = 0;
-
-  if ((bd_id == 0) || vjbd_id_is_valid (bdm, bd_id))
-    for (i = 0; i < end; i++)
-      {
-        u32 curr_bd_id = bdm->local_cfg[i].bd_id;
-        if ((curr_bd_id != ~0) && (curr_bd_id > bd_id) && 
-            ((next_bd_id == 0) || (curr_bd_id < next_bd_id)))
-          next_bd_id = curr_bd_id;
-      }
-
-  return next_bd_id;
-}
-
-static_always_inline u32 vjbd_sw_if_oper_next_index (vjbd_main_t * bdm, 
-                                                   u32 start, u32 bd_id)
-{
-  u32 i, end = vec_len (bdm->sw_if_oper);
-
-  if (vjbd_id_is_valid (bdm, bd_id))
-    for (i = start; i < end; i++)
-      if (bdm->sw_if_oper[i].bd_id == bd_id)
-        return i;
-
-  return ~0;
-}
-
-static_always_inline void 
-vjbd_oper_l2fib_maybe_sync_from_vpp (vjbd_main_t * bdm)
-{
-#ifdef VPPJNI_OPER
-  vppjni_vpe_api_msg_main_t *ovam = ovam_get_main ();
-  if ((ovam_time_now (ovam) - bdm->l2fib_oper_last_sync_time) >
-      BD_OPER_L2FIB_REFRESH_INTERVAL)
-    {
-      ovam_l2fib_table_dump ();
-      bdm->l2fib_oper_last_sync_time = ovam_time_now (ovam);
-    }
-#endif
-}
-
-static_always_inline void vjbd_l2fib_oper_reset (vjbd_main_t * bdm)
-{
-  vjbd_oper_t * bd_oper;
-
-  vec_foreach (bd_oper, bdm->bd_oper)
-    {
-      mhash_init (&bd_oper->l2fib_index_by_mac, sizeof (u32), MAC_ADDRESS_SIZE);
-      vec_reset_length (bd_oper->l2fib_oper);      
-    }
-}
-
-static_always_inline void vjbd_oper_reset (vjbd_main_t * bdm, u32 bd_id)
-{
-  u16 bd_index;
-  u32 si, len;
-  vjbd_oper_t * bd_oper;
-  u32 end;
-
-  if (!bdm->bd_oper)
-    {
-      ASSERT (vec_len (bdm->sw_if_oper) == 0);
-      return;
-    }
-
-  if (bd_id == ~0)
-    {
-      bdm->bd_oper_last_sync_all_time = 0.0;
-      bd_index = 0;
-      end = vec_len (bdm->bd_oper);
-    }
-  else
-    {
-      bd_index = vjbd_index_from_id (bdm, bd_id);
-      end = bd_index + 1;
-    }
-
-  for (; bd_index < end; bd_index++)
-    {
-      bd_oper = vec_elt_at_index (bdm->bd_oper, bd_index);
-      bd_oper->last_sync_time = 0.0;
-
-      len = vec_len (bdm->sw_if_oper);
-      for (si = vjbd_sw_if_oper_next_index (bdm, 0, bd_id);
-           (si != ~0) && (si < len);
-           si = vjbd_sw_if_oper_next_index (bdm, si + 1, bd_id))
-        {
-          bd_sw_if_oper_t * bd_sw_if_oper;
-
-          bd_sw_if_oper = vec_elt_at_index (bdm->sw_if_oper, si);
-          bd_sw_if_oper->bd_id = ~0;
-        }
-    }
-}
-
-static_always_inline void 
-vjbd_sw_if_add_del (u32 sw_if_index ,u32 bd_id, u8 bvi, u8 shg, u8 is_add)
-{
-  vjbd_main_t * bdm = &vjbd_main;
-  u16 bd_index = vjbd_index_from_id (bdm, bd_id);
-  vjbd_oper_t * bd_oper = vec_elt_at_index (bdm->bd_oper, bd_index);
-  bd_sw_if_oper_t * bd_sw_if_oper;
-  
-  ASSERT (vjbd_id_is_valid (bdm, bd_id));
-  /* DAW-FIXME
-  ASSERT (ovam_sw_if_index_valid (ovam_get_main (), sw_if_index));
-  */
-
-  vec_validate (bdm->sw_if_oper, sw_if_index);
-  bd_sw_if_oper = vec_elt_at_index (bdm->sw_if_oper, sw_if_index);
-  if (is_add)
-    {
-      bd_sw_if_oper->bd_id = bd_id;
-      bd_sw_if_oper->shg = shg;
-      bd_oper->bvi_sw_if_index = bvi ? sw_if_index : ~0;
-    }
-  else
-    {
-      bd_sw_if_oper->bd_id = 0;
-      bd_sw_if_oper->shg = 0;
-      if (bd_oper->bvi_sw_if_index == sw_if_index)
-        bd_oper->bvi_sw_if_index = ~0;
-    }
-}
-
-static_always_inline u32 vjbd_id_sw_if_count (vjbd_main_t * bdm, u32 bd_id)
-{
-  u32 count = 0, i, end = vec_len (bdm->sw_if_oper);
-
-  if (vjbd_id_is_valid (bdm, bd_id))
-    for (count = i = 0; i < end; i++)
-      if (bdm->sw_if_oper[i].bd_id == bd_id)
-        count++;
-
-  return count;
-}
-
-static_always_inline u32 vjbd_find_or_add_bd (vjbd_main_t * bdm, u8 * bd_name)
-{
-  u16 bd_index;
-  u32 bd_id;
-  bd_local_cfg_t * bd_local_cfg;
-  uword mhash_val_bd_id;
-
-  bd_id = vjbd_id_from_name (bdm, bd_name);
-  if (bd_id != ~0)
-    return bd_id;
-
-  mhash_val_bd_id = bd_id = ++bdm->next_bd_id;
-  mhash_set_mem (&bdm->bd_id_by_name, (void *)bd_name, &mhash_val_bd_id, 0);
-
-  bd_index = clib_bitmap_first_clear (bdm->bd_index_bitmap);
-  vec_validate (bdm->local_cfg, bd_index);
-  vec_validate (bdm->bd_oper, bd_index);
-
-  ASSERT (vjbd_index_is_free (bdm, bd_index));
-
-  bd_local_cfg = vec_elt_at_index (bdm->local_cfg, bd_index);
-  bd_local_cfg->bd_id = bd_id;
-  vec_validate_init_c_string (bd_local_cfg->bd_name, bd_name,
-                              vec_len (bd_name) - 1);
-  hash_set (bdm->bd_index_by_id, bd_id, bd_index);
-  bdm->bd_index_bitmap = clib_bitmap_set (bdm->bd_index_bitmap,
-                                          bd_index, 1);
-  return bd_id;
-}
-
-static_always_inline void vjbd_delete_bd (vjbd_main_t * bdm, u32 bd_id)
-{
-  u16 bd_index;
-  bd_local_cfg_t * bd_local_cfg;
-
-  ASSERT (vjbd_id_is_valid (bdm, bd_id));
-
-  // bd must not have any members before deleting
-  ASSERT (!vjbd_id_sw_if_count (bdm, bd_id));
-
-  bd_index = vjbd_index_from_id (bdm, bd_id);
-  bd_local_cfg = vec_elt_at_index (bdm->local_cfg, bd_index);
-  vjbd_oper_reset (bdm, bd_id);
-
-  mhash_unset (&bdm->bd_id_by_name, vjbd_name_from_id (bdm, bd_id), 0);
-  bdm->bd_index_bitmap = clib_bitmap_set (bdm->bd_index_bitmap,
-                                          bd_index, 0);
-  hash_unset (bdm->bd_index_by_id, bd_id);
-  bd_local_cfg->bd_id = ~0;
-  vec_validate_init_c_string (bd_local_cfg->bd_name, "", 0);
-
-  if (clib_bitmap_is_zero (bdm->bd_index_bitmap))
-    {
-      vec_reset_length (bdm->local_cfg);
-      vec_reset_length (bdm->bd_oper);
-    }
-
-  /* Force a resync of all bd_oper data. */
-  bdm->bd_oper_last_sync_all_time = 0.0;
-  vjbd_oper_maybe_sync_from_vpp (bdm, ~0);
-}
-
-#endif /* __included_vppjni_vpp_bridge_domain_h__ */
diff --git a/vpp-japi/japi/vppjni_env.c b/vpp-japi/japi/vppjni_env.c
deleted file mode 100644
index 1c4ea6eb..00000000
--- a/vpp-japi/japi/vppjni_env.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <jni.h>
-
-#include "vppjni_env.h"
-
-// Head of the class registration list.
-static vppjni_class_t *class_head;
-// Head of the class registration list.
-static vppjni_field_t *field_head;
-
-void vppjni_register_class(vppjni_class_t *ptr)
-{
-    vppjni_class_t **where = &class_head;
-    while (*where != NULL) {
-        where = &((*where)->next);
-    }
-    *where = ptr;
-}
-
-void vppjni_register_field(vppjni_field_t *ptr) {
-    vppjni_field_t **where = &field_head;
-    while (*where != NULL) {
-        where = &((*where)->next);
-    }
-    *where = ptr;
-}
-
-jobject vppjni_new_object(JNIEnv *env, const vppjni_class_t *ptr, va_list ap) {
-    jobject obj = (*env)->NewObjectV(env, ptr->jclass, ptr->jinit, ap);
-    if ((*env)->ExceptionCheck(env)) {
-        (*env)->ExceptionDescribe(env);
-        return NULL;
-    }
-
-    return obj;
-}
-
-int vppjni_init(JNIEnv *env)
-{
-    vppjni_class_t *cwlk;
-    vppjni_field_t *fwlk;
-
-    for (cwlk = class_head; cwlk != NULL; cwlk = cwlk->next) {
-        jclass cls;
-        jmethodID method;
-
-        cls = (*env)->FindClass(env, cwlk->fqcn);
-        if ((*env)->ExceptionCheck(env)) {
-            (*env)->ExceptionDescribe(env);
-            vppjni_uninit(env);
-            return JNI_ERR;
-        }
-
-        method = (*env)->GetMethodID(env, cls, "<init>", cwlk->init_sig);
-        if ((*env)->ExceptionCheck(env)) {
-            (*env)->ExceptionDescribe(env);
-            vppjni_uninit(env);
-            return JNI_ERR;
-        }
-
-        cwlk->jclass = (*env)->NewGlobalRef(env, cls);
-        if (cwlk->jclass == NULL) {
-            vppjni_uninit(env);
-            return JNI_ERR;
-        }
-        cwlk->jinit = method;
-    }
-
-    for (fwlk = field_head; fwlk != NULL; fwlk = fwlk->next) {
-        fwlk->jfield = (*env)->GetFieldID(env, fwlk->clsref->jclass, fwlk->name, fwlk->type);
-        if ((*env)->ExceptionCheck(env)) {
-            (*env)->ExceptionDescribe(env);
-            vppjni_uninit(env);
-            return JNI_ERR;
-        }
-    }
-
-    return 0;
-}
-
-void vppjni_uninit(JNIEnv *env) {
-    vppjni_class_t *cwlk;
-    vppjni_field_t *fwlk;
-
-    for (fwlk = field_head; fwlk != NULL; fwlk = fwlk->next) {
-        fwlk->jfield = NULL;
-    }
-
-    for (cwlk = class_head; cwlk != NULL; cwlk = cwlk->next) {
-        if (cwlk->jclass != NULL ) {
-            (*env)->DeleteGlobalRef(env, cwlk->jclass);
-        }
-
-        cwlk->jclass = NULL;
-        cwlk->jinit = NULL;
-    }
-}
-
diff --git a/vpp-japi/japi/vppjni_env.h b/vpp-japi/japi/vppjni_env.h
deleted file mode 100644
index 44029c2c..00000000
--- a/vpp-japi/japi/vppjni_env.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Utilities for accessing Java classes/method/fields in an efficient
- * manner.
- */
-
-/*
- * A potentially-uninitialized reference to a Java class
- */
-typedef struct vppjni_class {
-    // Fully-Qualified Class Name
-    const char          *fqcn;
-    // Constructor signature
-    const char          *init_sig;
-    // Global reference to class handle
-    jclass              jclass;
-    // Constructor method handle
-    jmethodID           jinit;
-    // Next item in linked list
-    struct vppjni_class *next;
-} vppjni_class_t;
-
-typedef struct jenv_field {
-    // Field name
-    const char           *name;
-    // Field type
-    const char           *type;
-    // Defining class reference
-    const vppjni_class_t *clsref;
-    // Field handle
-    jfieldID             jfield;
-    // Next item in linked list
-    struct jenv_field    *next;
-} vppjni_field_t;
-
-#define VPPJNI_CLASS_SYMBOL(name) vppjni_class_##name
-#define VPPJNI_CLASS_INIT(name) vppjni_class_##name##_init
-#define BIND_JAPI_CLASS(name, sig) \
-    static vppjni_class_t VPPJNI_CLASS_SYMBOL(name); \
-    static void VPPJNI_CLASS_INIT(name)(void) __attribute__((__constructor__)); \
-    static void VPPJNI_CLASS_INIT(name)() \
-    { \
-        VPPJNI_CLASS_SYMBOL(name).fqcn = "org/openvpp/vppjapi/" #name; \
-        VPPJNI_CLASS_SYMBOL(name).init_sig = sig; \
-        vppjni_register_class(&VPPJNI_CLASS_SYMBOL(name)); \
-    } \
-    static __attribute__((unused)) jobject name##Array(JNIEnv *env, jsize length) \
-    { \
-        return (*env)->NewObjectArray(env, length, VPPJNI_CLASS_SYMBOL(name).jclass, NULL); \
-    } \
-    static jobject name##Object(JNIEnv *env, ...) \
-    { \
-        va_list ap; \
-        va_start(ap, env); \
-        jobject obj = vppjni_new_object(env, &VPPJNI_CLASS_SYMBOL(name), ap); \
-        va_end(ap); \
-        return obj; \
-    }
-
-#define VPPJNI_FIELD_SYMBOL(cls, name) vppjni_field_##cls##_##name
-#define VPPJNI_FIELD_INIT(cls, name) vppjni_field_##cls##_##name##_init
-#define BIND_JAPI_FIELD(cls, field, sig) \
-    static vppjni_field_t VPPJNI_FIELD_SYMBOL(cls, field); \
-        static void VPPJNI_FIELD_INIT(cls, field)(void) __attribute__((__constructor__)); \
-    static void VPPJNI_FIELD_INIT(cls, field)() \
-    { \
-        VPPJNI_FIELD_SYMBOL(cls, field).name = #field; \
-        VPPJNI_FIELD_SYMBOL(cls, field).type = sig; \
-        VPPJNI_FIELD_SYMBOL(cls, field).clsref = &VPPJNI_CLASS_SYMBOL(cls); \
-        vppjni_register_field(&VPPJNI_FIELD_SYMBOL(cls, field)); \
-    }
-#define BIND_JAPI_BOOL_FIELD(cls, field) \
-    BIND_JAPI_FIELD(cls, field, "Z"); \
-    static void set_##cls##_##field(JNIEnv *env, jobject obj, jboolean value) \
-    { \
-        (*env)->SetBooleanField(env, obj, VPPJNI_FIELD_SYMBOL(cls, field).jfield, value); \
-    }
-#define BIND_JAPI_BYTE_FIELD(cls, field) \
-    BIND_JAPI_FIELD(cls, field, "B"); \
-    static void set_##cls##_##field(JNIEnv *env, jobject obj, jbyte value) \
-    { \
-        (*env)->SetByteField(env, obj, VPPJNI_FIELD_SYMBOL(cls, field).jfield, value); \
-    }
-#define BIND_JAPI_INT_FIELD(cls, field) \
-    BIND_JAPI_FIELD(cls, field, "I"); \
-    static void set_##cls##_##field(JNIEnv *env, jobject obj, jint value) \
-    { \
-        (*env)->SetIntField(env, obj, VPPJNI_FIELD_SYMBOL(cls, field).jfield, value); \
-    }
-#define BIND_JAPI_OBJ_FIELD(cls, field, sig) \
-    BIND_JAPI_FIELD(cls, field, sig); \
-    static void set_##cls##_##field(JNIEnv *env, jobject obj, jobject value) \
-    { \
-        (*env)->SetObjectField(env, obj, VPPJNI_FIELD_SYMBOL(cls, field).jfield, value); \
-    }
-#define BIND_JAPI_STRING_FIELD(cls, field) \
-    BIND_JAPI_OBJ_FIELD(cls, field, "Ljava/lang/String;")
-
-jobject vppjni_new_object(JNIEnv *env, const vppjni_class_t *ptr, va_list ap) __attribute__ ((visibility ("hidden")));
-void vppjni_register_class(vppjni_class_t *ptr) __attribute__ ((visibility ("hidden")));
-void vppjni_register_field(vppjni_field_t *ptr) __attribute__ ((visibility ("hidden")));
-int vppjni_init(JNIEnv *env) __attribute__ ((visibility ("hidden")));
-void vppjni_uninit(JNIEnv *env) __attribute__ ((visibility ("hidden")));
-
diff --git a/vpp-japi/libtool b/vpp-japi/libtool
deleted file mode 100755
index 5f65406b..00000000
--- a/vpp-japi/libtool
+++ /dev/null
@@ -1,10083 +0,0 @@
-#! /bin/sh
-
-# libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (vpp-japi) 0.1
-# Libtool was configured on host tf-ucs-3:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags=""
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Which release of libtool.m4 was used?
-macro_version=2.4.2
-macro_revision=1.3337
-
-# Whether or not to build shared libraries.
-build_libtool_libs=yes
-
-# Whether or not to build static libraries.
-build_old_libs=yes
-
-# What type of objects to build.
-pic_mode=default
-
-# Whether or not to optimize for fast installation.
-fast_install=yes
-
-# Shell to use when invoking shell scripts.
-SHELL="/bin/sh"
-
-# An echo program that protects backslashes.
-ECHO="printf %s\\n"
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=":"
-
-# The host system.
-host_alias=
-host=x86_64-unknown-linux-gnu
-host_os=linux-gnu
-
-# The build system.
-build_alias=
-build=x86_64-unknown-linux-gnu
-build_os=linux-gnu
-
-# A sed program that does not truncate output.
-SED="/bin/sed"
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP="/bin/grep"
-
-# An ERE matcher.
-EGREP="/bin/grep -E"
-
-# A literal string matcher.
-FGREP="/bin/grep -F"
-
-# A BSD- or MS-compatible name lister.
-NM="/usr/bin/nm -B"
-
-# Whether we need soft or hard links.
-LN_S="ln -s"
-
-# What is the maximum length of a command?
-max_cmd_len=1572864
-
-# Object file suffix (normally "o").
-objext=o
-
-# Executable file suffix (normally "").
-exeext=
-
-# whether the shell understands "unset".
-lt_unset=unset
-
-# turn spaces into newlines.
-SP2NL="tr \\040 \\012"
-
-# turn newlines into spaces.
-NL2SP="tr \\015\\012 \\040\\040"
-
-# convert $build file names to $host format.
-to_host_file_cmd=func_convert_file_noop
-
-# convert $build files to toolchain format.
-to_tool_file_cmd=func_convert_file_noop
-
-# An object symbol dumper.
-OBJDUMP="objdump"
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
-
-# Command to use when deplibs_check_method = "file_magic".
-file_magic_cmd="\$MAGIC_CMD"
-
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=""
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob="no"
-
-# DLL creation program.
-DLLTOOL="false"
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd="printf %s\\n"
-
-# The archiver.
-AR="ar"
-
-# Flags to create an archive.
-AR_FLAGS="cru"
-
-# How to feed a file listing to the archiver.
-archiver_list_spec="@"
-
-# A symbol stripping program.
-STRIP="strip"
-
-# Commands used to install an old-style archive.
-RANLIB="ranlib"
-old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$tool_oldlib"
-old_postuninstall_cmds=""
-
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=no
-
-# A C compiler.
-LTCC="gcc"
-
-# LTCC compiler flags.
-LTCFLAGS="-g -O2"
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[	 ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[	 ][	 ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'"
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[ABCDGIRSTW]* .* \\(.*\\)\$/extern char \\1;/p'"
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/  {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (void *) \\&\\2},/p'"
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/  {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/  {\"\\2\", (void *) \\&\\2},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/  {\"lib\\2\", (void *) \\&\\2},/p'"
-
-# Specify filename containing input files for $NM.
-nm_file_list_spec="@"
-
-# The root where to search for dependent libraries,and in which our libraries should be installed.
-lt_sysroot=
-
-# The name of the directory that contains temporary libtool files.
-objdir=.libs
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=file
-
-# Must we lock files when doing compilation?
-need_locks="no"
-
-# Manifest tool.
-MANIFEST_TOOL=":"
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=""
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=""
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=""
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=""
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=""
-
-# Old archive suffix (normally "a").
-libext=a
-
-# Shared library suffix (normally ".so").
-shrext_cmds=".so"
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=""
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=no
-
-# Do we need a version for libraries?
-need_version=no
-
-# Library versioning type.
-version_type=linux
-
-# Shared library runtime path variable.
-runpath_var=LD_RUN_PATH
-
-# Shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
-
-# Format of library name prefix.
-libname_spec="lib\$name"
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
-
-# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}\${shared_ext}\$major"
-
-# Permission mode override for installation of shared libraries.
-install_override_mode=""
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=""
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=""
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=""
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.8 /usr/lib/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib "
-
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/x86_64-linux-gnu/libfakeroot /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu/mesa-egl /usr/lib/nvidia-346 /usr/lib32/nvidia-346 /usr/lib/x86_64-linux-gnu/mir/clientplatform/mesa /lib32 /usr/lib32 "
-
-# Whether dlopen is supported.
-dlopen_support=unknown
-
-# Whether dlopen of programs is supported.
-dlopen_self=unknown
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=unknown
-
-# Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
-
-
-# The linker used to build libraries.
-LD="/usr/bin/ld -m elf_x86_64"
-
-# How to create reloadable object files.
-reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-
-# Commands used to build an old-style archive.
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"
-
-# A language specific compiler.
-CC="gcc"
-
-# Is the compiler the GNU compiler?
-with_gcc=yes
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin"
-
-# Additional compiler flags for building library objects.
-pic_flag=" -fPIC -DPIC"
-
-# How to pass a linker flag through the compiler.
-wl="-Wl,"
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=no
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object="no"
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=""
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=""
-
-# Commands used to build a shared archive.
-archive_cmds="\$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-archive_expsym_cmds="echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
-	    cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
-	    echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
-	    \$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=""
-module_expsym_cmds=""
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld="yes"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=""
-
-# Flag to hardcode $libdir into a binary during linking.
-# This must work even if $libdir does not exist
-hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=""
-
-# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=no
-
-# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting ${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=no
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=no
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=unsupported
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=no
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=no
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=no
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=no
-
-# The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*"
-
-# Symbols that must always be exported.
-include_expsyms=""
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=""
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=""
-
-# Specify filename containing input files.
-file_list_spec=""
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=immediate
-
-# ### END LIBTOOL CONFIG
-
-
-# libtool (GNU libtool) 2.4.2
-# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-#       --config             show all configuration variables
-#       --debug              enable verbose shell tracing
-#   -n, --dry-run            display commands without modifying any files
-#       --features           display basic configuration information and exit
-#       --mode=MODE          use operation mode MODE
-#       --preserve-dup-deps  don't remove duplicate dependency libraries
-#       --quiet, --silent    don't print informational messages
-#       --no-quiet, --no-silent
-#                            print informational messages (default)
-#       --no-warn            don't display warning messages
-#       --tag=TAG            use configuration variables from tag TAG
-#   -v, --verbose            print more informational messages than default
-#       --no-verbose         don't print the extra informational messages
-#       --version            print version information
-#   -h, --help, --help-all   print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-#         clean              remove files from the build directory
-#         compile            compile a source file into a libtool object
-#         execute            automatically set library path, then run a program
-#         finish             complete the installation of libtool libraries
-#         install            install libraries or executables
-#         link               create a library or an executable
-#         uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.  When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#         host-triplet:	$host
-#         shell:		$SHELL
-#         compiler:		$LTCC
-#         compiler flags:		$LTCFLAGS
-#         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
-#         automake:	$automake_version
-#         autoconf:	$autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
-
-PROGRAM=libtool
-PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
-TIMESTAMP=""
-package_revision=1.3337
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
-	  export $lt_var
-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
-	fi"
-done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-
-$lt_unset CDPATH
-
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-
-
-: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac
-} # Extended-shell func_dirname implementation
-
-
-# func_basename file
-func_basename ()
-{
-    func_basename_result="${1##*/}"
-} # Extended-shell func_basename implementation
-
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac
-    func_basename_result="${1##*/}"
-} # Extended-shell func_dirname_and_basename implementation
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary parameter first.
-    func_stripname_result=${3}
-    func_stripname_result=${func_stripname_result#"${1}"}
-    func_stripname_result=${func_stripname_result%"${2}"}
-} # Extended-shell func_stripname implementation
-
-
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
-		s@/\./@/@g
-		t dotsl
-		s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
-
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-#             value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
-  # Start from root dir and reassemble the path.
-  func_normal_abspath_result=
-  func_normal_abspath_tpath=$1
-  func_normal_abspath_altnamespace=
-  case $func_normal_abspath_tpath in
-    "")
-      # Empty path, that just means $cwd.
-      func_stripname '' '/' "`pwd`"
-      func_normal_abspath_result=$func_stripname_result
-      return
-    ;;
-    # The next three entries are used to spot a run of precisely
-    # two leading slashes without using negated character classes;
-    # we take advantage of case's first-match behaviour.
-    ///*)
-      # Unusual form of absolute path, do nothing.
-    ;;
-    //*)
-      # Not necessarily an ordinary path; POSIX reserves leading '//'
-      # and for example Cygwin uses it to access remote file shares
-      # over CIFS/SMB, so we conserve a leading double slash if found.
-      func_normal_abspath_altnamespace=/
-    ;;
-    /*)
-      # Absolute path, do nothing.
-    ;;
-    *)
-      # Relative path, prepend $cwd.
-      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-    ;;
-  esac
-  # Cancel out all the simple stuff to save iterations.  We also want
-  # the path to end with a slash for ease of parsing, so make sure
-  # there is one (and only one) here.
-  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-  while :; do
-    # Processed it all yet?
-    if test "$func_normal_abspath_tpath" = / ; then
-      # If we ascended to the root using ".." the result may be empty now.
-      if test -z "$func_normal_abspath_result" ; then
-        func_normal_abspath_result=/
-      fi
-      break
-    fi
-    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcar"`
-    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcdr"`
-    # Figure out what to do with it
-    case $func_normal_abspath_tcomponent in
-      "")
-        # Trailing empty path component, ignore it.
-      ;;
-      ..)
-        # Parent dir; strip last assembled component from result.
-        func_dirname "$func_normal_abspath_result"
-        func_normal_abspath_result=$func_dirname_result
-      ;;
-      *)
-        # Actual path component, append it.
-        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-      ;;
-    esac
-  done
-  # Restore leading double-slash if one was found on entry.
-  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
-
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-#             value returned in "$func_relative_path_result"
-func_relative_path ()
-{
-  func_relative_path_result=
-  func_normal_abspath "$1"
-  func_relative_path_tlibdir=$func_normal_abspath_result
-  func_normal_abspath "$2"
-  func_relative_path_tbindir=$func_normal_abspath_result
-
-  # Ascend the tree starting from libdir
-  while :; do
-    # check if we have found a prefix of bindir
-    case $func_relative_path_tbindir in
-      $func_relative_path_tlibdir)
-        # found an exact match
-        func_relative_path_tcancelled=
-        break
-        ;;
-      $func_relative_path_tlibdir*)
-        # found a matching prefix
-        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-        func_relative_path_tcancelled=$func_stripname_result
-        if test -z "$func_relative_path_result"; then
-          func_relative_path_result=.
-        fi
-        break
-        ;;
-      *)
-        func_dirname $func_relative_path_tlibdir
-        func_relative_path_tlibdir=${func_dirname_result}
-        if test "x$func_relative_path_tlibdir" = x ; then
-          # Have to descend all the way to the root!
-          func_relative_path_result=../$func_relative_path_result
-          func_relative_path_tcancelled=$func_relative_path_tbindir
-          break
-        fi
-        func_relative_path_result=../$func_relative_path_result
-        ;;
-    esac
-  done
-
-  # Now calculate path; take care to avoid doubling-up slashes.
-  func_stripname '' '/' "$func_relative_path_result"
-  func_relative_path_result=$func_stripname_result
-  func_stripname '/' '/' "$func_relative_path_tcancelled"
-  if test "x$func_stripname_result" != x ; then
-    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-  fi
-
-  # Normalisation. If bindir is libdir, return empty string,
-  # else relative path ending with a slash; either way, target
-  # file name can be directly appended.
-  if test ! -z "$func_relative_path_result"; then
-    func_stripname './' '' "$func_relative_path_result/"
-    func_relative_path_result=$func_stripname_result
-  fi
-}
-
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-
-# Make sure we have an absolute path for reexecution:
-case $progpath in
-  [\\/]*|[A-Za-z]:\\*) ;;
-  *[\\/]*)
-     progdir=$func_dirname_result
-     progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
-     ;;
-  *)
-     save_IFS="$IFS"
-     IFS=${PATH_SEPARATOR-:}
-     for progdir in $PATH; do
-       IFS="$save_IFS"
-       test -x "$progdir/$progname" && break
-     done
-     IFS="$save_IFS"
-     test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
-     ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes.  A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
-
-# Standard options:
-opt_dry_run=false
-opt_help=false
-opt_quiet=false
-opt_verbose=false
-opt_warning=:
-
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
-
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $opt_verbose && func_echo ${1+"$@"}
-
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
-}
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
-
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
-
-    # bash bug again:
-    :
-}
-
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
-
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
-}
-help="Try \`$progname --help' for more information."  ## default
-
-
-# func_grep expression filename
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_mkdir_p directory-path
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    my_directory_path="$1"
-    my_dir_list=
-
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
-      esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
-        # ...make a list in topmost first order.  Use a colon delimited
-	# list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
-
-        # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
-      done
-      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
-
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
-      done
-      IFS="$save_mkdir_p_IFS"
-
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
-    fi
-}
-
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$opt_dry_run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-        save_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-    fi
-
-    $ECHO "$my_tmpdir"
-}
-
-
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
-{
-    case $1 in
-      *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-        ;;
-      *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-    esac
-}
-
-
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
-    case $1 in
-      *[\\\`\"]*)
-	my_arg=`$ECHO "$1" | $SED \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        my_arg="$1" ;;
-    esac
-
-    case $my_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        my_arg="\"$my_arg\""
-        ;;
-    esac
-
-    func_quote_for_expand_result="$my_arg"
-}
-
-
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.  Use the saved locale for evaluation.
-func_show_eval_locale ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-	    $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result.  All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
-  case $1 in
-  [0-9]* | *[!a-zA-Z0-9_]*)
-    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-    ;;
-  * )
-    func_tr_sh_result=$1
-    ;;
-  esac
-}
-
-
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $opt_debug
-
-    $SED -n '/(C)/!b go
-	:more
-	/\./!{
-	  N
-	  s/\n# / /
-	  b more
-	}
-	:go
-	/^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-	s/^# *$//
-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
-}
-
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    echo
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
-}
-
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
-func_help ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-	:print
-        s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
-	p
-	d
-     }
-     /^# .* home page:/b print
-     /^# General help using/b print
-     ' < "$progpath"
-    ret=$?
-    if test -z "$1"; then
-      exit $ret
-    fi
-}
-
-# func_missing_arg argname
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
-    $opt_debug
-
-    func_error "missing argument for $1."
-    exit_cmd=exit
-}
-
-
-# func_split_short_opt shortopt
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
-{
-    func_split_short_opt_arg=${1#??}
-    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
-} # Extended-shell func_split_short_opt implementation
-
-
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
-{
-    func_split_long_opt_name=${1%%=*}
-    func_split_long_opt_arg=${1#*=}
-} # Extended-shell func_split_long_opt implementation
-
-exit_cmd=:
-
-
-
-
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-    eval "${1}+=\${2}"
-} # Extended-shell func_append implementation
-
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
-    func_quote_for_eval "${2}"
-    eval "${1}+=\\ \$func_quote_for_eval_result"
-} # Extended-shell func_append_quoted implementation
-
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-    func_arith_result=$(( $* ))
-} # Extended-shell func_arith implementation
-
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-    func_len_result=${#1}
-} # Extended-shell func_len implementation
-
-
-# func_lo2o object
-func_lo2o ()
-{
-    case ${1} in
-      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-      *)    func_lo2o_result=${1} ;;
-    esac
-} # Extended-shell func_lo2o implementation
-
-
-# func_xform libobj-or-source
-func_xform ()
-{
-    func_xform_result=${1%.*}.lo
-} # Extended-shell func_xform implementation
-
-
-# func_fatal_configuration arg...
-# Echo program name prefixed message to standard error, followed by
-# a configuration failure hint, and exit.
-func_fatal_configuration ()
-{
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
-}
-
-
-# func_config
-# Display the configuration for all the tags in this script.
-func_config ()
-{
-    re_begincf='^# ### BEGIN LIBTOOL'
-    re_endcf='^# ### END LIBTOOL'
-
-    # Default configuration.
-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-    done
-
-    exit $?
-}
-
-# func_features
-# Display the features supported by this script.
-func_features ()
-{
-    echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      echo "enable shared libraries"
-    else
-      echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      echo "enable static libraries"
-    else
-      echo "disable static libraries"
-    fi
-
-    exit $?
-}
-
-# func_enable_tag tagname
-# Verify that TAGNAME is valid, and either flag an error and exit, or
-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
-# variable here.
-func_enable_tag ()
-{
-  # Global variable:
-  tagname="$1"
-
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
-  # Validate tagname.
-  case $tagname in
-    *[!-_A-Za-z0-9,/]*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
-
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
-    *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
-
-	# Evaluate the configuration.  Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
-      else
-	func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
-}
-
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-    fi
-
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
-  shift; set dummy --mode clean ${1+"$@"}; shift
-  ;;
-compile|compil|compi|comp|com|co|c)
-  shift; set dummy --mode compile ${1+"$@"}; shift
-  ;;
-execute|execut|execu|exec|exe|ex|e)
-  shift; set dummy --mode execute ${1+"$@"}; shift
-  ;;
-finish|finis|fini|fin|fi|f)
-  shift; set dummy --mode finish ${1+"$@"}; shift
-  ;;
-install|instal|insta|inst|ins|in|i)
-  shift; set dummy --mode install ${1+"$@"}; shift
-  ;;
-link|lin|li|l)
-  shift; set dummy --mode link ${1+"$@"}; shift
-  ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-  shift; set dummy --mode uninstall ${1+"$@"}; shift
-  ;;
-esac
-
-
-
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
-
-
-# Parse options once, thoroughly.  This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
-{
-  # this just eases exit handling
-  while test $# -gt 0; do
-    opt="$1"
-    shift
-    case $opt in
-      --debug|-x)	opt_debug='set -x'
-			func_echo "enabling shell trace mode"
-			$opt_debug
-			;;
-      --dry-run|--dryrun|-n)
-			opt_dry_run=:
-			;;
-      --config)
-			opt_config=:
-func_config
-			;;
-      --dlopen|-dlopen)
-			optarg="$1"
-			opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
-			shift
-			;;
-      --preserve-dup-deps)
-			opt_preserve_dup_deps=:
-			;;
-      --features)
-			opt_features=:
-func_features
-			;;
-      --finish)
-			opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
-			;;
-      --help)
-			opt_help=:
-			;;
-      --help-all)
-			opt_help_all=:
-opt_help=': help-all'
-			;;
-      --mode)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_mode="$optarg"
-case $optarg in
-  # Valid mode arguments:
-  clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
-  # Catch anything else as an error
-  *) func_error "invalid argument for $opt"
-     exit_cmd=exit
-     break
-     ;;
-esac
-			shift
-			;;
-      --no-silent|--no-quiet)
-			opt_silent=false
-preserve_args+=" $opt"
-			;;
-      --no-warning|--no-warn)
-			opt_warning=false
-preserve_args+=" $opt"
-			;;
-      --no-verbose)
-			opt_verbose=false
-preserve_args+=" $opt"
-			;;
-      --silent|--quiet)
-			opt_silent=:
-preserve_args+=" $opt"
-        opt_verbose=false
-			;;
-      --verbose|-v)
-			opt_verbose=:
-preserve_args+=" $opt"
-opt_silent=false
-			;;
-      --tag)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_tag="$optarg"
-preserve_args+=" $opt $optarg"
-func_enable_tag "$optarg"
-			shift
-			;;
-
-      -\?|-h)		func_usage				;;
-      --help)		func_help				;;
-      --version)	func_version				;;
-
-      # Separate optargs to long options:
-      --*=*)
-			func_split_long_opt "$opt"
-			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      # Separate non-argument short options:
-      -\?*|-h*|-n*|-v*)
-			func_split_short_opt "$opt"
-			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      --)		break					;;
-      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
-      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
-    esac
-  done
-
-  # Validate options:
-
-  # save first non-option argument
-  if test "$#" -gt 0; then
-    nonopt="$opt"
-    shift
-  fi
-
-  # preserve --debug
-  test "$opt_debug" = : || preserve_args+=" --debug"
-
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-      ;;
-  esac
-
-  $opt_help || {
-    # Sanity checks first:
-    func_check_version_match
-
-    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-      func_fatal_configuration "not configured to build any kind of library"
-    fi
-
-    # Darwin sucks
-    eval std_shrext=\"$shrext_cmds\"
-
-    # Only execute mode is allowed to have -dlopen flags.
-    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-      func_error "unrecognized option \`-dlopen'"
-      $ECHO "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Change the help message to a mode-specific one.
-    generic_help="$help"
-    help="Try \`$progname --help --mode=$opt_mode' for more information."
-  }
-
-
-  # Bail if the options were screwed
-  $exit_cmd $EXIT_FAILURE
-}
-
-
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_lalib_p ()
-{
-    test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-}
-
-# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function implements the same check as func_lalib_p without
-# resorting to external programs.  To this end, it redirects stdin and
-# closes it afterwards, without saving the original file descriptor.
-# As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
-func_lalib_unsafe_p ()
-{
-    lalib_p=no
-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-	for lalib_p_l in 1 2 3 4
-	do
-	    read lalib_p_line
-	    case "$lalib_p_line" in
-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-	    esac
-	done
-	exec 0<&5 5<&-
-    fi
-    test "$lalib_p" = yes
-}
-
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
-    func_lalib_p "$1"
-}
-
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
-    func_ltwrapper_exec_suffix=
-    case $1 in
-    *.exe) ;;
-    *) func_ltwrapper_exec_suffix=.exe ;;
-    esac
-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
-    func_dirname_and_basename "$1" "" "."
-    func_stripname '' '.exe' "$func_basename_result"
-    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-}
-
-# func_ltwrapper_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
-    $opt_debug
-    save_ifs=$IFS; IFS='~'
-    for cmd in $1; do
-      IFS=$save_ifs
-      eval cmd=\"$cmd\"
-      func_show_eval "$cmd" "${2-:}"
-    done
-    IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# Note that it is not necessary on cygwin/mingw to append a dot to
-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
-func_source ()
-{
-    $opt_debug
-    case $1 in
-    */* | *\\*)	. "$1" ;;
-    *)		. "./$1" ;;
-    esac
-}
-
-
-# func_resolve_sysroot PATH
-# Replace a leading = in PATH with a sysroot.  Store the result into
-# func_resolve_sysroot_result
-func_resolve_sysroot ()
-{
-  func_resolve_sysroot_result=$1
-  case $func_resolve_sysroot_result in
-  =*)
-    func_stripname '=' '' "$func_resolve_sysroot_result"
-    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-    ;;
-  esac
-}
-
-# func_replace_sysroot PATH
-# If PATH begins with the sysroot, replace it with = and
-# store the result into func_replace_sysroot_result.
-func_replace_sysroot ()
-{
-  case "$lt_sysroot:$1" in
-  ?*:"$lt_sysroot"*)
-    func_stripname "$lt_sysroot" '' "$1"
-    func_replace_sysroot_result="=$func_stripname_result"
-    ;;
-  *)
-    # Including no sysroot.
-    func_replace_sysroot_result=$1
-    ;;
-  esac
-}
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    $opt_debug
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	func_append_quoted CC_quoted "$arg"
-      done
-      CC_expanded=`func_echo_all $CC`
-      CC_quoted_expanded=`func_echo_all $CC_quoted`
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	      # Double-quote args containing other shell metacharacters.
-	      func_append_quoted CC_quoted "$arg"
-	    done
-	    CC_expanded=`func_echo_all $CC`
-	    CC_quoted_expanded=`func_echo_all $CC_quoted`
-	    case "$@ " in
-	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
-#	else
-#	  func_verbose "using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
-    else
-      write_lobj=none
-    fi
-
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
-
-    $opt_dry_run || {
-      cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
-      $MV "${write_libobj}T" "${write_libobj}"
-    }
-}
-
-
-##################################################
-# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-##################################################
-
-# func_convert_core_file_wine_to_w32 ARG
-# Helper function used by file name conversion functions when $build is *nix,
-# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-# correctly configured wine environment available, with the winepath program
-# in $build's $PATH.
-#
-# ARG is the $build file name to be converted to w32 format.
-# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-# be empty on error (or when ARG is empty)
-func_convert_core_file_wine_to_w32 ()
-{
-  $opt_debug
-  func_convert_core_file_wine_to_w32_result="$1"
-  if test -n "$1"; then
-    # Unfortunately, winepath does not exit with a non-zero error code, so we
-    # are forced to check the contents of stdout. On the other hand, if the
-    # command is not found, the shell will set an exit code of 127 and print
-    # *an error message* to stdout. So we must check for both error code of
-    # zero AND non-empty stdout, which explains the odd construction:
-    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
-      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$lt_sed_naive_backslashify"`
-    else
-      func_convert_core_file_wine_to_w32_result=
-    fi
-  fi
-}
-# end: func_convert_core_file_wine_to_w32
-
-
-# func_convert_core_path_wine_to_w32 ARG
-# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-# configured wine environment available, with the winepath program in $build's
-# $PATH. Assumes ARG has no leading or trailing path separator characters.
-#
-# ARG is path to be converted from $build format to win32.
-# Result is available in $func_convert_core_path_wine_to_w32_result.
-# Unconvertible file (directory) names in ARG are skipped; if no directory names
-# are convertible, then the result may be empty.
-func_convert_core_path_wine_to_w32 ()
-{
-  $opt_debug
-  # unfortunately, winepath doesn't convert paths, only file names
-  func_convert_core_path_wine_to_w32_result=""
-  if test -n "$1"; then
-    oldIFS=$IFS
-    IFS=:
-    for func_convert_core_path_wine_to_w32_f in $1; do
-      IFS=$oldIFS
-      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
-        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
-        else
-          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-        fi
-      fi
-    done
-    IFS=$oldIFS
-  fi
-}
-# end: func_convert_core_path_wine_to_w32
-
-
-# func_cygpath ARGS...
-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-# (2), returns the Cygwin file name or path in func_cygpath_result (input
-# file name or path is assumed to be in w32 format, as previously converted
-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-# or path in func_cygpath_result (input file name or path is assumed to be in
-# Cygwin format). Returns an empty string on error.
-#
-# ARGS are passed to cygpath, with the last one being the file name or path to
-# be converted.
-#
-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-# environment variable; do not put it in $PATH.
-func_cygpath ()
-{
-  $opt_debug
-  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-    if test "$?" -ne 0; then
-      # on failure, ensure result is empty
-      func_cygpath_result=
-    fi
-  else
-    func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
-  fi
-}
-#end: func_cygpath
-
-
-# func_convert_core_msys_to_w32 ARG
-# Convert file name or path ARG from MSYS format to w32 format.  Return
-# result in func_convert_core_msys_to_w32_result.
-func_convert_core_msys_to_w32 ()
-{
-  $opt_debug
-  # awkward: cmd appends spaces to result
-  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-}
-#end: func_convert_core_msys_to_w32
-
-
-# func_convert_file_check ARG1 ARG2
-# Verify that ARG1 (a file name in $build format) was converted to $host
-# format in ARG2. Otherwise, emit an error message, but continue (resetting
-# func_to_host_file_result to ARG1).
-func_convert_file_check ()
-{
-  $opt_debug
-  if test -z "$2" && test -n "$1" ; then
-    func_error "Could not determine host file name corresponding to"
-    func_error "  \`$1'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback:
-    func_to_host_file_result="$1"
-  fi
-}
-# end func_convert_file_check
-
-
-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-# Verify that FROM_PATH (a path in $build format) was converted to $host
-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-# func_to_host_file_result to a simplistic fallback value (see below).
-func_convert_path_check ()
-{
-  $opt_debug
-  if test -z "$4" && test -n "$3"; then
-    func_error "Could not determine the host path corresponding to"
-    func_error "  \`$3'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback.  This is a deliberately simplistic "conversion" and
-    # should not be "improved".  See libtool.info.
-    if test "x$1" != "x$2"; then
-      lt_replace_pathsep_chars="s|$1|$2|g"
-      func_to_host_path_result=`echo "$3" |
-        $SED -e "$lt_replace_pathsep_chars"`
-    else
-      func_to_host_path_result="$3"
-    fi
-  fi
-}
-# end func_convert_path_check
-
-
-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-# and appending REPL if ORIG matches BACKPAT.
-func_convert_path_front_back_pathsep ()
-{
-  $opt_debug
-  case $4 in
-  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
-    ;;
-  esac
-  case $4 in
-  $2 ) func_to_host_path_result+="$3"
-    ;;
-  esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $build to $host FILE NAME CONVERSION FUNCTIONS #
-##################################################
-# invoked via `$to_host_file_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# Result will be available in $func_to_host_file_result.
-
-
-# func_to_host_file ARG
-# Converts the file name ARG from $build format to $host format. Return result
-# in func_to_host_file_result.
-func_to_host_file ()
-{
-  $opt_debug
-  $to_host_file_cmd "$1"
-}
-# end func_to_host_file
-
-
-# func_to_tool_file ARG LAZY
-# converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result.  If the conversion in use is listed
-# in (the comma separated) LAZY, no conversion takes place.
-func_to_tool_file ()
-{
-  $opt_debug
-  case ,$2, in
-    *,"$to_tool_file_cmd",*)
-      func_to_tool_file_result=$1
-      ;;
-    *)
-      $to_tool_file_cmd "$1"
-      func_to_tool_file_result=$func_to_host_file_result
-      ;;
-  esac
-}
-# end func_to_tool_file
-
-
-# func_convert_file_noop ARG
-# Copy ARG to func_to_host_file_result.
-func_convert_file_noop ()
-{
-  func_to_host_file_result="$1"
-}
-# end func_convert_file_noop
-
-
-# func_convert_file_msys_to_w32 ARG
-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_file_result.
-func_convert_file_msys_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_w32
-
-
-# func_convert_file_cygwin_to_w32 ARG
-# Convert file name ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_file_cygwin_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-    # LT_CYGPATH in this case.
-    func_to_host_file_result=`cygpath -m "$1"`
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_cygwin_to_w32
-
-
-# func_convert_file_nix_to_w32 ARG
-# Convert file name ARG from *nix to w32 format.  Requires a wine environment
-# and a working winepath. Returns result in func_to_host_file_result.
-func_convert_file_nix_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_file_wine_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_w32
-
-
-# func_convert_file_msys_to_cygwin ARG
-# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_file_msys_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_cygwin
-
-
-# func_convert_file_nix_to_cygwin ARG
-# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
-# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
-# in func_to_host_file_result.
-func_convert_file_nix_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-    func_convert_core_file_wine_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_cygwin
-
-
-#############################################
-# $build to $host PATH CONVERSION FUNCTIONS #
-#############################################
-# invoked via `$to_host_path_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# The result will be available in $func_to_host_path_result.
-#
-# Path separators are also converted from $build format to $host format.  If
-# ARG begins or ends with a path separator character, it is preserved (but
-# converted to $host format) on output.
-#
-# All path conversion functions are named using the following convention:
-#   file name conversion function    : func_convert_file_X_to_Y ()
-#   path conversion function         : func_convert_path_X_to_Y ()
-# where, for any given $build/$host combination the 'X_to_Y' value is the
-# same.  If conversion functions are added for new $build/$host combinations,
-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-# will break.
-
-
-# func_init_to_host_path_cmd
-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-# appropriate value, based on the value of $to_host_file_cmd.
-to_host_path_cmd=
-func_init_to_host_path_cmd ()
-{
-  $opt_debug
-  if test -z "$to_host_path_cmd"; then
-    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-    to_host_path_cmd="func_convert_path_${func_stripname_result}"
-  fi
-}
-
-
-# func_to_host_path ARG
-# Converts the path ARG from $build format to $host format. Return result
-# in func_to_host_path_result.
-func_to_host_path ()
-{
-  $opt_debug
-  func_init_to_host_path_cmd
-  $to_host_path_cmd "$1"
-}
-# end func_to_host_path
-
-
-# func_convert_path_noop ARG
-# Copy ARG to func_to_host_path_result.
-func_convert_path_noop ()
-{
-  func_to_host_path_result="$1"
-}
-# end func_convert_path_noop
-
-
-# func_convert_path_msys_to_w32 ARG
-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_path_result.
-func_convert_path_msys_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from ARG.  MSYS
-    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-    # and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_msys_to_w32
-
-
-# func_convert_path_cygwin_to_w32 ARG
-# Convert path ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_path_cygwin_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_cygwin_to_w32
-
-
-# func_convert_path_nix_to_w32 ARG
-# Convert path ARG from *nix to w32 format.  Requires a wine environment and
-# a working winepath.  Returns result in func_to_host_file_result.
-func_convert_path_nix_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_nix_to_w32
-
-
-# func_convert_path_msys_to_cygwin ARG
-# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_path_msys_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_msys_to_cygwin
-
-
-# func_convert_path_nix_to_cygwin ARG
-# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
-# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
-# func_to_host_file_result.
-func_convert_path_nix_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from
-    # ARG. msys behavior is inconsistent here, cygpath turns them
-    # into '.;' and ';.', and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_nix_to_cygwin
-
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
-    $opt_debug
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-    pie_flag=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-pie | -fpie | -fPIE)
-          pie_flag+=" $arg"
-	  continue
-	  ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  later+=" $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  func_stripname '-Wc,' '' "$arg"
-	  args=$func_stripname_result
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
-	    IFS="$save_ifs"
-	    func_append_quoted lastarg "$arg"
-	  done
-	  IFS="$save_ifs"
-	  func_stripname ' ' '' "$lastarg"
-	  lastarg=$func_stripname_result
-
-	  # Add the arguments to base_compile.
-	  base_compile+=" $lastarg"
-	  continue
-	  ;;
-
-	*)
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      func_append_quoted base_compile "$lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
-      ;;
-    target)
-      func_fatal_error "you must specify a target with \`-o'"
-      ;;
-    *)
-      # Get the name of the library object.
-      test -z "$libobj" && {
-	func_basename "$srcfile"
-	libobj="$func_basename_result"
-      }
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    case $libobj in
-    *.[cCFSifmso] | \
-    *.ada | *.adb | *.ads | *.asm | \
-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
-      func_xform "$libobj"
-      libobj=$func_xform_result
-      ;;
-    esac
-
-    case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-    *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	continue
-	;;
-
-      -static)
-	build_libtool_libs=no
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
-      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
-    func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
-    lobj=${xdir}$objdir/$objname
-
-    test -z "$base_compile" && \
-      func_fatal_help "you must specify a compilation command"
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$ECHO "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-      removelist+=" $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
-    fi
-
-    $opt_dry_run || $RM $removelist
-    removelist+=" $lockfile"
-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
-    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-    srcfile=$func_to_tool_file_result
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      func_mkdir_p "$xdir$objdir"
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command+=" -o $lobj"
-      fi
-
-      func_show_eval_locale "$command"	\
-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	func_show_eval '$MV "$output_obj" "$lobj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-	suppress_output=' >/dev/null 2>&1'
-      fi
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile$pie_flag"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command+=" -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command+="$suppress_output"
-      func_show_eval_locale "$command" \
-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	func_show_eval '$MV "$output_obj" "$obj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-    fi
-
-    $opt_dry_run || {
-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-
-      # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
-	removelist=$lockfile
-        $RM "$lockfile"
-      fi
-    }
-
-    exit $EXIT_SUCCESS
-}
-
-$opt_help || {
-  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
-}
-
-func_mode_help ()
-{
-    # We need to display help for each of the modes.
-    case $opt_mode in
-      "")
-        # Generic help is extracted from the usage comments
-        # at the start of this file.
-        func_help
-        ;;
-
-      clean)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      compile)
-      $ECHO \
-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to build PIC objects only
-  -prefer-non-pic   try to build non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
-  -Wc,FLAG          pass FLAG directly to the compiler
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-        ;;
-
-      execute)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-        ;;
-
-      finish)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-        ;;
-
-      install)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The following components of INSTALL-COMMAND are treated specially:
-
-  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-        ;;
-
-      link)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -bindir BINDIR    specify path to binaries directory (for systems where
-                    libraries must be found in the PATH setting at runtime)
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -shared           only do dynamic linking of libtool libraries
-  -shrext SUFFIX    override the standard shared library file extension
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-  -weak LIBNAME     declare that the target provides the LIBNAME interface
-  -Wc,FLAG
-  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-  -Wl,FLAG
-  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
-  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-        ;;
-
-      uninstall)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      *)
-        func_fatal_help "invalid operation mode \`$opt_mode'"
-        ;;
-    esac
-
-    echo
-    $ECHO "Try \`$progname --help' for more information about other modes."
-}
-
-# Now that we've collected a possible --mode arg, show help if necessary
-if $opt_help; then
-  if test "$opt_help" = :; then
-    func_mode_help
-  else
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	func_mode_help
-      done
-    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	echo
-	func_mode_help
-      done
-    } |
-    sed '1d
-      /^When reporting/,/^Report/{
-	H
-	d
-      }
-      $x
-      /information about other modes/d
-      /more detailed .*MODE/d
-      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
-  fi
-  exit $?
-fi
-
-
-# func_mode_execute arg...
-func_mode_execute ()
-{
-    $opt_debug
-    # The first argument is the command name.
-    cmd="$nonopt"
-    test -z "$cmd" && \
-      func_fatal_help "you must specify a COMMAND"
-
-    # Handle -dlopen flags immediately.
-    for file in $opt_dlopen; do
-      test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
-
-      dir=
-      case $file in
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-	func_source "$file"
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && \
-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir+="/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-	;;
-
-      *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -* | *.la | *.lo ) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if func_ltwrapper_script_p "$file"; then
-	  func_source "$file"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	elif func_ltwrapper_executable_p "$file"; then
-	  func_ltwrapper_scriptname "$file"
-	  func_source "$func_ltwrapper_scriptname_result"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      func_append_quoted args "$file"
-    done
-
-    if test "X$opt_dry_run" = Xfalse; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-                $lt_var=\$save_$lt_var; export $lt_var
-	      else
-		$lt_unset $lt_var
-	      fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	echo "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $opt_debug
-    libs=
-    libdirs=
-    admincmds=
-
-    for opt in "$nonopt" ${1+"$@"}
-    do
-      if test -d "$opt"; then
-	libdirs+=" $opt"
-
-      elif test -f "$opt"; then
-	if func_lalib_unsafe_p "$opt"; then
-	  libs+=" $opt"
-	else
-	  func_warning "\`$opt' is not a valid libtool archive"
-	fi
-
-      else
-	func_fatal_error "invalid argument \`$opt'"
-      fi
-    done
-
-    if test -n "$libs"; then
-      if test -n "$lt_sysroot"; then
-        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
-      else
-        sysroot_cmd=
-      fi
-
-      # Remove sysroot references
-      if $opt_dry_run; then
-        for lib in $libs; do
-          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
-        done
-      else
-        tmpdir=`func_mktempdir`
-        for lib in $libs; do
-	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
-	    > $tmpdir/tmp-la
-	  mv -f $tmpdir/tmp-la $lib
-	done
-        ${RM}r "$tmpdir"
-      fi
-    fi
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || admincmds+="
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      echo "----------------------------------------------------------------------"
-      echo "Libraries have been installed in:"
-      for libdir in $libdirs; do
-	$ECHO "   $libdir"
-      done
-      echo
-      echo "If you ever happen to want to link against installed libraries"
-      echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-      echo "flag during linking and do at least one of the following:"
-      if test -n "$shlibpath_var"; then
-	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-	echo "     during execution"
-      fi
-      if test -n "$runpath_var"; then
-	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-	echo "     during linking"
-      fi
-      if test -n "$hardcode_libdir_flag_spec"; then
-	libdir=LIBDIR
-	eval flag=\"$hardcode_libdir_flag_spec\"
-
-	$ECHO "   - use the \`$flag' linker flag"
-      fi
-      if test -n "$admincmds"; then
-	$ECHO "   - have your system administrator run these commands:$admincmds"
-      fi
-      if test -f /etc/ld.so.conf; then
-	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-      fi
-      echo
-
-      echo "See any operating system documentation about shared libraries for"
-      case $host in
-	solaris2.[6789]|solaris2.1[0-9])
-	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	  echo "pages."
-	  ;;
-	*)
-	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
-	  ;;
-      esac
-      echo "----------------------------------------------------------------------"
-    fi
-    exit $EXIT_SUCCESS
-}
-
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
-
-
-# func_mode_install arg...
-func_mode_install ()
-{
-    $opt_debug
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac; then
-      # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
-      arg=$1
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    install_prog+="$func_quote_for_eval_result"
-    install_shared_prog=$install_prog
-    case " $install_prog " in
-      *[\\\ /]cp\ *) install_cp=: ;;
-      *) install_cp=false ;;
-    esac
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    no_mode=:
-    for arg
-    do
-      arg2=
-      if test -n "$dest"; then
-	files+=" $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f)
-	if $install_cp; then :; else
-	  prev=$arg
-	fi
-	;;
-      -g | -m | -o)
-	prev=$arg
-	;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
-	    arg2=$install_override_mode
-	    no_mode=false
-	  fi
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      install_prog+=" $func_quote_for_eval_result"
-      if test -n "$arg2"; then
-	func_quote_for_eval "$arg2"
-      fi
-      install_shared_prog+=" $func_quote_for_eval_result"
-    done
-
-    test -z "$install_prog" && \
-      func_fatal_help "you must specify an install program"
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
-
-    if test -n "$install_override_mode" && $no_mode; then
-      if $install_cp; then :; else
-	func_quote_for_eval "$install_override_mode"
-	install_shared_prog+=" -m $func_quote_for_eval_result"
-      fi
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	func_fatal_help "no file or destination specified"
-      else
-	func_fatal_help "you must specify a destination"
-      fi
-    fi
-
-    # Strip any trailing slash from the destination.
-    func_stripname '' '/' "$dest"
-    dest=$func_stripname_result
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files; shift
-      test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs+=" $file"
-	;;
-
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$file' is not a valid libtool archive"
-
-	library_names=
-	old_library=
-	relink_command=
-	func_source "$file"
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs+=" $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs+=" $libdir" ;;
-	  esac
-	fi
-
-	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
-	dir+="$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  func_warning "relinking \`$file'"
-	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names; shift
-	if test -n "$1"; then
-	  realname="$1"
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-	      'exit $?'
-	  tstripme="$stripme"
-	  case $host_os in
-	  cygwin* | mingw* | pw32* | cegcc*)
-	    case $realname in
-	    *.dll.a)
-	      tstripme=""
-	      ;;
-	    esac
-	    ;;
-	  esac
-	  if test -n "$tstripme" && test -n "$striplib"; then
-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  func_execute_cmds "$postinstall_cmds" 'exit $?'
-	fi
-
-	# Install the pseudo-library for information purposes.
-	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs+=" $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  func_lo2o "$destfile"
-	  staticdest=$func_lo2o_result
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	test -n "$destfile" && \
-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  func_lo2o "$file"
-	  staticobj=$func_lo2o_result
-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      func_stripname '' '.exe' "$file"
-	      file=$func_stripname_result
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin* | *mingw*)
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      wrapper=$func_ltwrapper_scriptname_result
-	    else
-	      func_stripname '' '.exe' "$file"
-	      wrapper=$func_stripname_result
-	    fi
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if func_ltwrapper_script_p "$wrapper"; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  func_source "$wrapper"
-
-	  # Check the variables that should have been set.
-	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      func_source "$lib"
-	    fi
-	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  func_source "$wrapper"
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
-	        tmpdir=`func_mktempdir`
-		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
-	        # Replace the output file specification.
-	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
-
-	        $opt_silent || {
-	          func_quote_for_expand "$relink_command"
-		  eval "func_echo $func_quote_for_expand_result"
-	        }
-	        if eval "$relink_command"; then :
-	          else
-		  func_error "error: relink \`$file' with the above command before installing it"
-		  $opt_dry_run || ${RM}r "$tmpdir"
-		  continue
-	        fi
-	        file="$outputname"
-	      else
-	        func_warning "cannot relink \`$file'"
-	      fi
-	    }
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    func_stripname '' '.exe' "$destfile"
-	    destfile=$func_stripname_result
-	    ;;
-	  esac
-	  ;;
-	esac
-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-	$opt_dry_run || if test -n "$outputname"; then
-	  ${RM}r "$tmpdir"
-	fi
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      func_basename "$file"
-      name="$func_basename_result"
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-      tool_oldlib=$func_to_tool_file_result
-
-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
-      fi
-
-      # Do each command in the postinstall commands.
-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-    done
-
-    test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# a dlpreopen symbol table.
-func_generate_dlsyms ()
-{
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
-    my_dlsyms=
-
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
-      else
-	func_error "not configured to extract global symbols from dlpreopened files"
-      fi
-    fi
-
-    if test -n "$my_dlsyms"; then
-      case $my_dlsyms in
-      "") ;;
-      *.c)
-	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
-
-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-	# Parse the name list into a source file.
-	func_verbose "creating $output_objdir/$my_dlsyms"
-
-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-/* External symbol declarations for the compiler. */\
-"
-
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
-
-	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	  for progfile in $progfiles; do
-	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
-	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -n "$exclude_expsyms"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  if test -n "$export_symbols_regex"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  # Prepare the list of exported symbols
-	  if test -z "$export_symbols"; then
-	    export_symbols="$output_objdir/$outputname.exp"
-	    $opt_dry_run || {
-	      $RM $export_symbols
-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	      case $host in
-	      *cygwin* | *mingw* | *cegcc* )
-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-	        ;;
-	      esac
-	    }
-	  else
-	    $opt_dry_run || {
-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	      case $host in
-	        *cygwin* | *mingw* | *cegcc* )
-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-	          ;;
-	      esac
-	    }
-	  fi
-	fi
-
-	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
-	  func_basename "$dlprefile"
-	  name="$func_basename_result"
-          case $host in
-	    *cygwin* | *mingw* | *cegcc* )
-	      # if an import library, we need to obtain dlname
-	      if func_win32_import_lib_p "$dlprefile"; then
-	        func_tr_sh "$dlprefile"
-	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-	        dlprefile_dlbasename=""
-	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
-	          # Use subshell, to avoid clobbering current variable values
-	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-	          if test -n "$dlprefile_dlname" ; then
-	            func_basename "$dlprefile_dlname"
-	            dlprefile_dlbasename="$func_basename_result"
-	          else
-	            # no lafile. user explicitly requested -dlpreopen <import library>.
-	            $sharedlib_from_linklib_cmd "$dlprefile"
-	            dlprefile_dlbasename=$sharedlib_from_linklib_result
-	          fi
-	        fi
-	        $opt_dry_run || {
-	          if test -n "$dlprefile_dlbasename" ; then
-	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-	          else
-	            func_warning "Could not compute DLL name from $name"
-	            eval '$ECHO ": $name " >> "$nlist"'
-	          fi
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-	        }
-	      else # not an import lib
-	        $opt_dry_run || {
-	          eval '$ECHO ": $name " >> "$nlist"'
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	        }
-	      fi
-	    ;;
-	    *)
-	      $opt_dry_run || {
-	        eval '$ECHO ": $name " >> "$nlist"'
-	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	      }
-	    ;;
-          esac
-	done
-
-	$opt_dry_run || {
-	  # Make sure we have at least an empty file.
-	  test -f "$nlist" || : > "$nlist"
-
-	  if test -n "$exclude_expsyms"; then
-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	    $MV "$nlist"T "$nlist"
-	  fi
-
-	  # Try sorting and uniquifying the output.
-	  if $GREP -v "^: " < "$nlist" |
-	      if sort -k 3 </dev/null >/dev/null 2>&1; then
-		sort -k 3
-	      else
-		sort +2
-	      fi |
-	      uniq > "$nlist"S; then
-	    :
-	  else
-	    $GREP -v "^: " < "$nlist" > "$nlist"S
-	  fi
-
-	  if test -f "$nlist"S; then
-	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-	  else
-	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
-	  fi
-
-	  echo >> "$output_objdir/$my_dlsyms" "\
-
-/* The mapping between symbol names and symbols.  */
-typedef struct {
-  const char *name;
-  void *address;
-} lt_dlsymlist;
-extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
-LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
-
-	  case $need_lib_prefix in
-	  no)
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  *)
-	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  esac
-	  echo >> "$output_objdir/$my_dlsyms" "\
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	} # !$opt_dry_run
-
-	pic_flag_for_symtable=
-	case "$compile_command " in
-	*" -static "*) ;;
-	*)
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-	  *-*-hpux*)
-	    pic_flag_for_symtable=" $pic_flag"  ;;
-	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
-	    ;;
-	  esac
-	  ;;
-	esac
-	symtab_cflags=
-	for arg in $LTCFLAGS; do
-	  case $arg in
-	  -pie | -fpie | -fPIE) ;;
-	  *) symtab_cflags+=" $arg" ;;
-	  esac
-	done
-
-	# Now compile the dynamic symbol file.
-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-
-	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
-
-	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
-	case $host in
-	*cygwin* | *mingw* | *cegcc* )
-	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	  else
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  fi
-	  ;;
-	*)
-	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  ;;
-	esac
-	;;
-      *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
-	;;
-      esac
-    else
-      # We keep going just in case the user didn't refer to
-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-      # really was required.
-
-      # Nullify the symbol file.
-      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-    fi
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-# Despite the name, also deal with 64 bit binaries.
-func_win32_libid ()
-{
-  $opt_debug
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      func_to_tool_file "$1" func_convert_file_msys_to_w32
-      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-	$SED -n -e '
-	    1,100{
-		/ I /{
-		    s,.*,import,
-		    p
-		    q
-		}
-	    }'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $ECHO "$win32_libid_type"
-}
-
-# func_cygming_dll_for_implib ARG
-#
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib ()
-{
-  $opt_debug
-  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-}
-
-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-#
-# The is the core of a fallback implementation of a
-# platform-specific function to extract the name of the
-# DLL associated with the specified import library LIBNAME.
-#
-# SECTION_NAME is either .idata$6 or .idata$7, depending
-# on the platform and compiler that created the implib.
-#
-# Echos the name of the DLL associated with the
-# specified import library.
-func_cygming_dll_for_implib_fallback_core ()
-{
-  $opt_debug
-  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-    $SED '/^Contents of section '"$match_literal"':/{
-      # Place marker at beginning of archive member dllname section
-      s/.*/====MARK====/
-      p
-      d
-    }
-    # These lines can sometimes be longer than 43 characters, but
-    # are always uninteresting
-    /:[	 ]*file format pe[i]\{,1\}-/d
-    /^In archive [^:]*:/d
-    # Ensure marker is printed
-    /^====MARK====/p
-    # Remove all lines with less than 43 characters
-    /^.\{43\}/!d
-    # From remaining lines, remove first 43 characters
-    s/^.\{43\}//' |
-    $SED -n '
-      # Join marker and all lines until next marker into a single line
-      /^====MARK====/ b para
-      H
-      $ b para
-      b
-      :para
-      x
-      s/\n//g
-      # Remove the marker
-      s/^====MARK====//
-      # Remove trailing dots and whitespace
-      s/[\. \t]*$//
-      # Print
-      /./p' |
-    # we now have a list, one entry per line, of the stringified
-    # contents of the appropriate section of all members of the
-    # archive which possess that section. Heuristic: eliminate
-    # all those which have a first or second character that is
-    # a '.' (that is, objdump's representation of an unprintable
-    # character.) This should work for all archives with less than
-    # 0x302f exports -- but will fail for DLLs whose name actually
-    # begins with a literal '.' or a single character followed by
-    # a '.'.
-    #
-    # Of those that remain, print the first one.
-    $SED -e '/^\./d;/^.\./d;q'
-}
-
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-  test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-  test -n "$func_cygming_ms_implib_tmp"
-}
-
-# func_cygming_dll_for_implib_fallback ARG
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-#
-# This fallback implementation is for use when $DLLTOOL
-# does not support the --identify-strict option.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib_fallback ()
-{
-  $opt_debug
-  if func_cygming_gnu_implib_p "$1" ; then
-    # binutils import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-  elif func_cygming_ms_implib_p "$1" ; then
-    # ms-generated import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-  else
-    # unknown
-    sharedlib_from_linklib_result=""
-  fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    if test "$lock_old_archive_extraction" = yes; then
-      lockfile=$f_ex_an_ar_oldlib.lock
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    fi
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
-		   'stat=$?; rm -f "$lockfile"; exit $stat'
-    if test "$lock_old_archive_extraction" = yes; then
-      $opt_dry_run || rm -f "$lockfile"
-    fi
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-    fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    $opt_debug
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  func_arith $extracted_serial + 1
-	  extracted_serial=$func_arith_result
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      func_mkdir_p "$my_xdir"
-
-      case $host in
-      *-darwin*)
-	func_verbose "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	$opt_dry_run || {
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
-	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-	  if test -n "$darwin_arches"; then
-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
-	      $LIPO -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    $RM -rf unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd $darwin_orig_dir
-	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	} # !$opt_dry_run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-	;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-    done
-
-    func_extract_archives_result="$my_oldobjs"
-}
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=${1-no}
-
-	$ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='$macro_version'
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    file=\"\$0\""
-
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-    $ECHO "\
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-    ECHO=\"$qECHO\"
-  fi
-
-# Very basic option parsing. These options are (a) specific to
-# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
-# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's $0 value, followed by "$@".
-lt_option_debug=
-func_parse_lt_options ()
-{
-  lt_script_arg0=\$0
-  shift
-  for lt_opt
-  do
-    case \"\$lt_opt\" in
-    --lt-debug) lt_option_debug=1 ;;
-    --lt-dump-script)
-        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
-        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-        cat \"\$lt_dump_D/\$lt_dump_F\"
-        exit 0
-      ;;
-    --lt-*)
-        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-        exit 1
-      ;;
-    esac
-  done
-
-  # Print the debug banner immediately:
-  if test -n \"\$lt_option_debug\"; then
-    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
-  fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
-  lt_dump_args_N=1;
-  for lt_arg
-  do
-    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
-    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-  done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-"
-  case $host in
-  # Backslashes separate directories on plain windows
-  *-*-mingw | *-*-os2* | *-cegcc*)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-    ;;
-
-  *)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-    ;;
-  esac
-  $ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from \$@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
-  case \" \$* \" in
-  *\\ --lt-*)
-    for lt_wr_arg
-    do
-      case \$lt_wr_arg in
-      --lt-*) ;;
-      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-      esac
-      shift
-    done ;;
-  esac
-  func_exec_program_core \${1+\"\$@\"}
-}
-
-  # Parse options
-  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-  done
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-    # special case for '.'
-    if test \"\$thisdir\" = \".\"; then
-      thisdir=\`pwd\`
-    fi
-    # remove .libs from thisdir
-    case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
-    $objdir )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $ECHO "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $MKDIR \"\$progdir\"
-    else
-      $RM \"\$progdir/\$file\"
-    fi"
-
-	  $ECHO "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$ECHO \"\$relink_command_output\" >&2
-	$RM \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $RM \"\$progdir/\$program\";
-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $RM \"\$progdir/\$file\"
-  fi"
-	else
-	  $ECHO "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$ECHO "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# fixup the dll searchpath if we need to.
-	#
-	# Fix the DLL searchpath if we need to.  Do this before prepending
-	# to shlibpath, because on Windows, both are PATH and uninstalled
-	# libraries must come first.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $ECHO "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	$ECHO "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-      func_exec_program \${1+\"\$@\"}
-    fi
-  else
-    # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-}
-
-
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-	cat <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-*/
-EOF
-	    cat <<"EOF"
-#ifdef _MSC_VER
-# define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _MSC_VER
-# include <direct.h>
-# include <process.h>
-# include <io.h>
-#else
-# include <unistd.h>
-# include <stdint.h>
-# ifdef __CYGWIN__
-#  include <io.h>
-# endif
-#endif
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
-# ifdef __STRICT_ANSI__
-int _putenv (const char *);
-# endif
-#elif defined(__CYGWIN__)
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
-/* #elif defined (other platforms) ... */
-#endif
-
-/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-#  define _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#elif defined(__MINGW32__)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-#elif defined(__CYGWIN__)
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
-#endif
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-/* path handling portability macros */
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-#if defined(LT_DEBUGWRAPPER)
-static int lt_debug = 1;
-#else
-static int lt_debug = 0;
-#endif
-
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-void lt_fatal (const char *file, int line, const char *message, ...);
-static const char *nonnull (const char *s);
-static const char *nonempty (const char *s);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
-EOF
-
-	    cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
-const char * LIB_PATH_VARNAME = "$shlibpath_var";
-EOF
-
-	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_path "$temp_rpath"
-	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * LIB_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test -n "$dllsearchpath"; then
-              func_to_host_path "$dllsearchpath:"
-	      cat <<EOF
-const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * EXE_PATH_VARNAME = "";
-const char * EXE_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test "$fast_install" = yes; then
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-EOF
-	    else
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-EOF
-	    fi
-
-
-	    cat <<"EOF"
-
-#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-
-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int  newargc;
-  char *tmp_pathspec;
-  char *actual_cwrapper_path;
-  char *actual_cwrapper_name;
-  char *target_name;
-  char *lt_argv_zero;
-  intptr_t rval = 127;
-
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  newargz = XMALLOC (char *, argc + 1);
-
-  /* very simple arg parsing; don't want to rely on getopt
-   * also, copy all non cwrapper options to newargz, except
-   * argz[0], which is handled differently
-   */
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (strcmp (argv[i], dumpscript_opt) == 0)
-	{
-EOF
-	    case "$host" in
-	      *mingw* | *cygwin* )
-		# make stdout use "unix" line endings
-		echo "          setmode(1,_O_BINARY);"
-		;;
-	      esac
-
-	    cat <<"EOF"
-	  lt_dump_script (stdout);
-	  return 0;
-	}
-      if (strcmp (argv[i], debug_opt) == 0)
-	{
-          lt_debug = 1;
-          continue;
-	}
-      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal (__FILE__, __LINE__,
-		    "unrecognized %s option: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
-    }
-  newargz[++newargc] = NULL;
-
-EOF
-	    cat <<EOF
-  /* The GNU banner must be the first non-error debug message */
-  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
-EOF
-	    cat <<"EOF"
-  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
-
-  tmp_pathspec = find_executable (argv[0]);
-  if (tmp_pathspec == NULL)
-    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (before symlink chase) at: %s\n",
-		  tmp_pathspec);
-
-  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (after symlink chase) at: %s\n",
-		  actual_cwrapper_path);
-  XFREE (tmp_pathspec);
-
-  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
-  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-
-  /* wrapper name transforms */
-  strendzap (actual_cwrapper_name, ".exe");
-  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-  XFREE (actual_cwrapper_name);
-  actual_cwrapper_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  /* target_name transforms -- use actual target program name; might have lt- prefix */
-  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-  strendzap (target_name, ".exe");
-  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-  XFREE (target_name);
-  target_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(main) libtool target name: %s\n",
-		  target_name);
-EOF
-
-	    cat <<EOF
-  newargz[0] =
-    XMALLOC (char, (strlen (actual_cwrapper_path) +
-		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-  strcpy (newargz[0], actual_cwrapper_path);
-  strcat (newargz[0], "$objdir");
-  strcat (newargz[0], "/");
-EOF
-
-	    cat <<"EOF"
-  /* stop here, and copy so we don't have to do this twice */
-  tmp_pathspec = xstrdup (newargz[0]);
-
-  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-  strcat (newargz[0], actual_cwrapper_name);
-
-  /* DO want the lt- prefix here if it exists, so use target_name */
-  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-  XFREE (tmp_pathspec);
-  tmp_pathspec = NULL;
-EOF
-
-	    case $host_os in
-	      mingw*)
-	    cat <<"EOF"
-  {
-    char* p;
-    while ((p = strchr (newargz[0], '\\')) != NULL)
-      {
-	*p = '/';
-      }
-    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-      {
-	*p = '/';
-      }
-  }
-EOF
-	    ;;
-	    esac
-
-	    cat <<"EOF"
-  XFREE (target_name);
-  XFREE (actual_cwrapper_path);
-  XFREE (actual_cwrapper_name);
-
-  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
-     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
-     because on Windows, both *_VARNAMEs are PATH but uninstalled
-     libraries must come first. */
-  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-
-  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
-		  nonnull (lt_argv_zero));
-  for (i = 0; i < newargc; i++)
-    {
-      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
-		      i, nonnull (newargz[i]));
-    }
-
-EOF
-
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-  /* execv doesn't actually work on mingw as expected on unix */
-  newargz = prepare_spawn (newargz);
-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-  if (rval == -1)
-    {
-      /* failed to start process */
-      lt_debugprintf (__FILE__, __LINE__,
-		      "(main) failed to launch target \"%s\": %s\n",
-		      lt_argv_zero, nonnull (strerror (errno)));
-      return 127;
-    }
-  return rval;
-EOF
-		;;
-	      *)
-		cat <<"EOF"
-  execv (lt_argv_zero, newargz);
-  return rval; /* =127, but avoids unused variable warning */
-EOF
-		;;
-	    esac
-
-	    cat <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void *p = (void *) malloc (num);
-  if (!p)
-    lt_fatal (__FILE__, __LINE__, "memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-			  string) : NULL;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable (const char *path)
-{
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0)
-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-    return 1;
-  else
-    return 0;
-}
-
-int
-make_executable (const char *path)
-{
-  int rval = 0;
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if (stat (path, &st) >= 0)
-    {
-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-    }
-  return rval;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise
-   Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
-  int has_slash = 0;
-  const char *p;
-  const char *p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char *concat_name;
-
-  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-                  nonempty (wrapper));
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable (concat_name))
-	return concat_name;
-      XFREE (concat_name);
-    }
-  else
-    {
-#endif
-      if (IS_DIR_SEPARATOR (wrapper[0]))
-	{
-	  concat_name = xstrdup (wrapper);
-	  if (check_executable (concat_name))
-	    return concat_name;
-	  XFREE (concat_name);
-	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-    }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-      {
-	has_slash = 1;
-	break;
-      }
-  if (!has_slash)
-    {
-      /* no slashes; search PATH */
-      const char *path = getenv ("PATH");
-      if (path != NULL)
-	{
-	  for (p = path; *p; p = p_next)
-	    {
-	      const char *q;
-	      size_t p_len;
-	      for (q = p; *q; q++)
-		if (IS_PATH_SEPARATOR (*q))
-		  break;
-	      p_len = q - p;
-	      p_next = (*q == '\0' ? q : q + 1);
-	      if (p_len == 0)
-		{
-		  /* empty path: current directory */
-		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-                              nonnull (strerror (errno)));
-		  tmp_len = strlen (tmp);
-		  concat_name =
-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, tmp, tmp_len);
-		  concat_name[tmp_len] = '/';
-		  strcpy (concat_name + tmp_len + 1, wrapper);
-		}
-	      else
-		{
-		  concat_name =
-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, p, p_len);
-		  concat_name[p_len] = '/';
-		  strcpy (concat_name + p_len + 1, wrapper);
-		}
-	      if (check_executable (concat_name))
-		return concat_name;
-	      XFREE (concat_name);
-	    }
-	}
-      /* not found in PATH; assume curdir */
-    }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-              nonnull (strerror (errno)));
-  tmp_len = strlen (tmp);
-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable (concat_name))
-    return concat_name;
-  XFREE (concat_name);
-  return NULL;
-}
-
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
-  return xstrdup (pathspec);
-#else
-  char buf[LT_PATHMAX];
-  struct stat s;
-  char *tmp_pathspec = xstrdup (pathspec);
-  char *p;
-  int has_symlinks = 0;
-  while (strlen (tmp_pathspec) && !has_symlinks)
-    {
-      lt_debugprintf (__FILE__, __LINE__,
-		      "checking path component for symlinks: %s\n",
-		      tmp_pathspec);
-      if (lstat (tmp_pathspec, &s) == 0)
-	{
-	  if (S_ISLNK (s.st_mode) != 0)
-	    {
-	      has_symlinks = 1;
-	      break;
-	    }
-
-	  /* search backwards for last DIR_SEPARATOR */
-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    p--;
-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    {
-	      /* no more DIR_SEPARATORS left */
-	      break;
-	    }
-	  *p = '\0';
-	}
-      else
-	{
-	  lt_fatal (__FILE__, __LINE__,
-		    "error accessing file \"%s\": %s",
-		    tmp_pathspec, nonnull (strerror (errno)));
-	}
-    }
-  XFREE (tmp_pathspec);
-
-  if (!has_symlinks)
-    {
-      return xstrdup (pathspec);
-    }
-
-  tmp_pathspec = realpath (pathspec, buf);
-  if (tmp_pathspec == 0)
-    {
-      lt_fatal (__FILE__, __LINE__,
-		"could not follow symlinks for %s", pathspec);
-    }
-  return xstrdup (tmp_pathspec);
-#endif
-}
-
-char *
-strendzap (char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert (str != NULL);
-  assert (pat != NULL);
-
-  len = strlen (str);
-  patlen = strlen (pat);
-
-  if (patlen <= len)
-    {
-      str += len - patlen;
-      if (strcmp (str, pat) == 0)
-	*str = '\0';
-    }
-  return str;
-}
-
-void
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
-{
-  va_list args;
-  if (lt_debug)
-    {
-      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-      va_start (args, fmt);
-      (void) vfprintf (stderr, fmt, args);
-      va_end (args);
-    }
-}
-
-static void
-lt_error_core (int exit_status, const char *file,
-	       int line, const char *mode,
-	       const char *message, va_list ap)
-{
-  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *file, int line, const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-  va_end (ap);
-}
-
-static const char *
-nonnull (const char *s)
-{
-  return s ? s : "(null)";
-}
-
-static const char *
-nonempty (const char *s)
-{
-  return (s && !*s) ? "(empty)" : nonnull (s);
-}
-
-void
-lt_setenv (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_setenv) setting '%s' to '%s'\n",
-                  nonnull (name), nonnull (value));
-  {
-#ifdef HAVE_SETENV
-    /* always make a copy, for consistency with !HAVE_SETENV */
-    char *str = xstrdup (value);
-    setenv (name, str, 1);
-#else
-    int len = strlen (name) + 1 + strlen (value) + 1;
-    char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-        {
-          new_value[len-1] = '\0';
-        }
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-EOF
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-
-/* Prepares an argument vector before calling spawn().
-   Note that spawn() does not by itself call the command interpreter
-     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-         GetVersionEx(&v);
-         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-      }) ? "cmd.exe" : "command.com").
-   Instead it simply concatenates the arguments, separated by ' ', and calls
-   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
-   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-   special way:
-   - Space and tab are interpreted as delimiters. They are not treated as
-     delimiters if they are surrounded by double quotes: "...".
-   - Unescaped double quotes are removed from the input. Their only effect is
-     that within double quotes, space and tab are treated like normal
-     characters.
-   - Backslashes not followed by double quotes are not special.
-   - But 2*n+1 backslashes followed by a double quote become
-     n backslashes followed by a double quote (n >= 0):
-       \" -> "
-       \\\" -> \"
-       \\\\\" -> \\"
- */
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-char **
-prepare_spawn (char **argv)
-{
-  size_t argc;
-  char **new_argv;
-  size_t i;
-
-  /* Count number of arguments.  */
-  for (argc = 0; argv[argc] != NULL; argc++)
-    ;
-
-  /* Allocate new argument vector.  */
-  new_argv = XMALLOC (char *, argc + 1);
-
-  /* Put quoted arguments into the new argument vector.  */
-  for (i = 0; i < argc; i++)
-    {
-      const char *string = argv[i];
-
-      if (string[0] == '\0')
-	new_argv[i] = xstrdup ("\"\"");
-      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
-	{
-	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
-	  size_t length;
-	  unsigned int backslashes;
-	  const char *s;
-	  char *quoted_string;
-	  char *p;
-
-	  length = 0;
-	  backslashes = 0;
-	  if (quote_around)
-	    length++;
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		length += backslashes + 1;
-	      length++;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    length += backslashes + 1;
-
-	  quoted_string = XMALLOC (char, length + 1);
-
-	  p = quoted_string;
-	  backslashes = 0;
-	  if (quote_around)
-	    *p++ = '"';
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		{
-		  unsigned int j;
-		  for (j = backslashes + 1; j > 0; j--)
-		    *p++ = '\\';
-		}
-	      *p++ = c;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    {
-	      unsigned int j;
-	      for (j = backslashes; j > 0; j--)
-		*p++ = '\\';
-	      *p++ = '"';
-	    }
-	  *p = '\0';
-
-	  new_argv[i] = quoted_string;
-	}
-      else
-	new_argv[i] = (char *) string;
-    }
-  new_argv[argc] = NULL;
-
-  return new_argv;
-}
-EOF
-		;;
-	    esac
-
-            cat <<"EOF"
-void lt_dump_script (FILE* f)
-{
-EOF
-	    func_emit_wrapper yes |
-	      $SED -n -e '
-s/^\(.\{79\}\)\(..*\)/\1\
-\2/
-h
-s/\([\\"]\)/\\\1/g
-s/$/\\n/
-s/\([^\n]*\).*/  fputs ("\1", f);/p
-g
-D'
-            cat <<"EOF"
-}
-EOF
-}
-# end: func_emit_cwrapperexe_src
-
-# func_win32_import_lib_p ARG
-# True if ARG is an import lib, as indicated by $file_magic_cmd
-func_win32_import_lib_p ()
-{
-    $opt_debug
-    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-    *import*) : ;;
-    *) false ;;
-    esac
-}
-
-# func_mode_link arg...
-func_mode_link ()
-{
-    $opt_debug
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
-
-    avoid_version=no
-    bindir=
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    weak_libs=
-    single_module="${wl}-single_module"
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	break
-	;;
-      -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    func_warning "complete static linking is impossible in this configuration"
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      libtool_args+=" $func_quote_for_eval_result"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command+=" @OUTPUT@"
-	  finalize_command+=" @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	bindir)
-	  bindir="$arg"
-	  prev=
-	  continue
-	  ;;
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command+=" @SYMFILE@"
-	    finalize_command+=" @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles+=" $arg"
-	    else
-	      dlprefiles+=" $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	framework)
-	  case $host in
-	    *-*-darwin*)
-	      case "$deplibs " in
-		*" $qarg.ltframework "*) ;;
-		*) deplibs+=" $qarg.ltframework" # this is fixed later
-		   ;;
-	      esac
-	      ;;
-	  esac
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat "$save_arg"`
-	    do
-#	      moreargs+=" $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if func_lalib_unsafe_p "$arg"; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		func_source "$arg"
-
-		if test -z "$pic_object" ||
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none &&
-		   test "$non_pic_object" = none; then
-		  func_fatal_error "cannot find name of object for \`$arg'"
-		fi
-
-		# Extract subdirectory from the argument.
-		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles+=" $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles+=" $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs+=" $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects+=" $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  non_pic_objects+=" $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if $opt_dry_run; then
-		  # Extract subdirectory from the argument.
-		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
-
-		  func_lo2o "$arg"
-		  pic_object=$xdir$objdir/$func_lo2o_result
-		  non_pic_object=$xdir$func_lo2o_result
-		  libobjs+=" $pic_object"
-		  non_pic_objects+=" $non_pic_object"
-	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
-		fi
-	      fi
-	    done
-	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    func_fatal_error "only absolute run-paths are allowed"
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath+=" $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath+=" $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	shrext)
-	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	weak)
-	  weak_libs+=" $arg"
-	  prev=
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags+=" $qarg"
-	  compiler_flags+=" $qarg"
-	  prev=
-	  compile_command+=" $qarg"
-	  finalize_command+=" $qarg"
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags+=" $qarg"
-	  prev=
-	  compile_command+=" $qarg"
-	  finalize_command+=" $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags+=" $qarg"
-	  compiler_flags+=" $wl$qarg"
-	  prev=
-	  compile_command+=" $wl$qarg"
-	  finalize_command+=" $wl$qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  # See comment for -static flag below, for more details.
-	  compile_command+=" $link_static_flag"
-	  finalize_command+=" $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -bindir)
-	prev=bindir
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework)
-	prev=framework
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command+=" $arg"
-	  finalize_command+=" $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	func_stripname "-L" '' "$arg"
-	if test -z "$func_stripname_result"; then
-	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between \`-L' and \`$1'"
-	  else
-	    func_fatal_error "need path for \`-L' option"
-	  fi
-	fi
-	func_resolve_sysroot "$func_stripname_result"
-	dir=$func_resolve_sysroot_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "* | *" $arg "*)
-	  # Will only happen for absolute or sysroot arguments
-	  ;;
-	*)
-	  # Preserve sysroot, but never include relative directories
-	  case $dir in
-	    [\\/]* | [A-Za-z]:[\\/]* | =*) deplibs+=" $arg" ;;
-	    *) deplibs+=" -L$dir" ;;
-	  esac
-	  lib_search_path+=" $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  ::) dllsearchpath=$dir;;
-	  *) dllsearchpath+=":$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath+=":$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs+=" System.ltframework"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs+=" $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot|--sysroot)
-	compiler_flags+=" $arg"
-	compile_command+=" $arg"
-	finalize_command+=" $arg"
-	prev=xcompiler
-	continue
-	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	compiler_flags+=" $arg"
-	compile_command+=" $arg"
-	finalize_command+=" $arg"
-	case "$new_inherited_linker_flags " in
-	    *" $arg "*) ;;
-	    * ) new_inherited_linker_flags+=" $arg" ;;
-	esac
-	continue
-	;;
-
-      -multi_module)
-	single_module="${wl}-multi_module"
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "\`-no-install' is ignored for $host"
-	  func_warning "assuming \`-no-fast-install' instead"
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	func_stripname '-R' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	=*)
-	  func_stripname '=' '' "$dir"
-	  dir=$lt_sysroot$func_stripname_result
-	  ;;
-	*)
-	  func_fatal_error "only absolute run-paths are allowed"
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath+=" $dir" ;;
-	esac
-	continue
-	;;
-
-      -shared)
-	# The effects of -shared are defined in a previous loop.
-	continue
-	;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -weak)
-        prev=weak
-	continue
-	;;
-
-      -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  arg+=" $func_quote_for_eval_result"
-	  compiler_flags+=" $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  arg+=" $wl$func_quote_for_eval_result"
-	  compiler_flags+=" $wl$func_quote_for_eval_result"
-	  linker_flags+=" $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # -msg_* for osf cc
-      -msg_*)
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      # Flags to be passed through unchanged, with rationale:
-      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-      # -r[0-9][0-9]*        specify processor for the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-      # -q*                  compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-      # -F/path              path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-      # @file                GCC response files
-      # -tp=*                Portland pgcc target processor selection
-      # --sysroot=*          for sysroot support
-      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-        compile_command+=" $arg"
-        finalize_command+=" $arg"
-        compiler_flags+=" $arg"
-        continue
-        ;;
-
-      # Some other compiler flag.
-      -* | +*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs+=" $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if func_lalib_unsafe_p "$arg"; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  func_source "$arg"
-
-	  if test -z "$pic_object" ||
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none &&
-	     test "$non_pic_object" = none; then
-	    func_fatal_error "cannot find name of object for \`$arg'"
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles+=" $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles+=" $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs+=" $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects+=" $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    non_pic_objects+=" $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if $opt_dry_run; then
-	    # Extract subdirectory from the argument.
-	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
-
-	    func_lo2o "$arg"
-	    pic_object=$xdir$objdir/$func_lo2o_result
-	    non_pic_object=$xdir$func_lo2o_result
-	    libobjs+=" $pic_object"
-	    non_pic_objects+=" $non_pic_object"
-	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs+=" $arg"
-	old_deplibs+=" $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	func_resolve_sysroot "$arg"
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles+=" $func_resolve_sysroot_result"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles+=" $func_resolve_sysroot_result"
-	  prev=
-	else
-	  deplibs+=" $func_resolve_sysroot_result"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command+=" $arg"
-	finalize_command+=" $arg"
-      fi
-    done # argument parsing loop
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command+=" $arg"
-      finalize_command+=" $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
-    func_to_tool_file "$output_objdir/"
-    tool_output_objdir=$func_to_tool_file_result
-    # Create the object directory.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if $opt_preserve_dup_deps ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs+=" $deplib" ;;
-	esac
-      fi
-      libs+=" $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if $opt_duplicate_compiler_generated_deps; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs+=" $pre_post_deps" ;;
-	  esac
-	  pre_post_deps+=" $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-
-    case $linkmode in
-    lib)
-	passes="conv dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-
-    for pass in $passes; do
-      # The preopen pass in lib mode reverses $deplibs; put it back here
-      # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
-	## FIXME: Find the place where the list is rebuilt in the wrong
-	##        order, and fix it there properly
-        tmp_deplibs=
-	for deplib in $deplibs; do
-	  tmp_deplibs="$deplib $tmp_deplibs"
-	done
-	deplibs="$tmp_deplibs"
-      fi
-
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
-	esac
-      fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
-	# Collect and forward deplibs of preopened libtool libs
-	for lib in $dlprefiles; do
-	  # Ignore non-libtool-libs
-	  dependency_libs=
-	  func_resolve_sysroot "$lib"
-	  case $lib in
-	  *.la)	func_source "$func_resolve_sysroot_result" ;;
-	  esac
-
-	  # Collect preopened libtool deplibs, except any this library
-	  # has declared as weak libs
-	  for deplib in $dependency_libs; do
-	    func_basename "$deplib"
-            deplib_base=$func_basename_result
-	    case " $weak_libs " in
-	    *" $deplib_base "*) ;;
-	    *) deplibs+=" $deplib" ;;
-	    esac
-	  done
-	done
-	libs="$dlprefiles"
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    compiler_flags+=" $deplib"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags+=" $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
-	    continue
-	  fi
-	  func_stripname '-l' '' "$deplib"
-	  name=$func_stripname_result
-	  if test "$linkmode" = lib; then
-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	  else
-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	  fi
-	  for searchdir in $searchdirs; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if func_lalib_p "$lib"; then
-		  library_names=
-		  old_library=
-		  func_source "$lib"
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-		;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags+=" $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    newlib_search_path+=" $func_resolve_sysroot_result"
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    newlib_search_path+=" $func_resolve_sysroot_result"
-	    ;;
-	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    func_stripname '-R' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    dir=$func_resolve_sysroot_result
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath+=" $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la)
-	  func_resolve_sysroot "$deplib"
-	  lib=$func_resolve_sysroot_result
-	  ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    # Linking convenience modules into shared libraries is allowed,
-	    # but linking other static libraries is non-portable.
-	    case " $dlpreconveniencelibs " in
-	    *" $deplib "*) ;;
-	    *)
-	      valid_a_lib=no
-	      case $deplibs_check_method in
-		match_pattern*)
-		  set dummy $deplibs_check_method; shift
-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=yes
-		  fi
-		;;
-		pass_all)
-		  valid_a_lib=yes
-		;;
-	      esac
-	      if test "$valid_a_lib" != yes; then
-		echo
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because the file extensions .$libext of this argument makes me believe"
-		echo "*** that it is just a static archive that I should not use here."
-	      else
-		echo
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
-	      fi
-	      ;;
-	    esac
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles+=" $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles+=" $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
-
-	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	func_source "$lib"
-
-	# Convert "-framework foo" to "foo.ltframework"
-	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-	    case " $new_inherited_linker_flags " in
-	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) new_inherited_linker_flags+=" $tmp_inherited_linker_flag";;
-	    esac
-	  done
-	fi
-	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles+=" $dlopen"
-	  test -n "$dlpreopen" && dlprefiles+=" $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience+=" $ladir/$objdir/$old_library"
-	    old_convenience+=" $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      if $opt_preserve_dup_deps ; then
-		case "$tmp_libs " in
-		*" $deplib "*) specialdeplibs+=" $deplib" ;;
-		esac
-	      fi
-	      tmp_libs+=" $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	if test -n "$old_library" &&
-	   { test "$prefer_static_libs" = yes ||
-	     test "$prefer_static_libs,$installed" = "built,no"; }; then
-	  linklib=$old_library
-	else
-	  for l in $old_library $library_names; do
-	    linklib="$l"
-	  done
-	fi
-	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for \`$lib'"
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles+=" $lib $dependency_libs"
-	  else
-	    newdlfiles+=" $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of \`$ladir'"
-	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	func_basename "$lib"
-	laname="$func_basename_result"
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library \`$lib' was moved."
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$lt_sysroot$libdir"
-	    absdir="$lt_sysroot$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    notinst_path+=" $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    notinst_path+=" $abs_ladir"
-	  fi
-	fi # $installed = yes
-	func_stripname 'lib' '.la' "$laname"
-	name=$func_stripname_result
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir" && test "$linkmode" = prog; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-	  fi
-	  case "$host" in
-	    # special handling for platforms with PE-DLLs.
-	    *cygwin* | *mingw* | *cegcc* )
-	      # Linker will automatically link against shared library if both
-	      # static and shared are present.  Therefore, ensure we extract
-	      # symbols from the import library if a shared library is present
-	      # (otherwise, the dlopen module name will be incorrect).  We do
-	      # this by putting the import library name into $newdlprefiles.
-	      # We recover the dlopen module name by 'saving' the la file
-	      # name in a special purpose variable, and (later) extracting the
-	      # dlname from the la file.
-	      if test -n "$dlname"; then
-	        func_tr_sh "$dir/$linklib"
-	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
-	        newdlprefiles+=" $dir/$linklib"
-	      else
-	        newdlprefiles+=" $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          dlpreconveniencelibs+=" $dir/$old_library"
-	      fi
-	    ;;
-	    * )
-	      # Prefer using a static library (so that no silly _DYNAMIC symbols
-	      # are required to link).
-	      if test -n "$old_library"; then
-	        newdlprefiles+=" $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          dlpreconveniencelibs+=" $dir/$old_library"
-	      # Otherwise, use the dlname, so that lt_dlopen finds it.
-	      elif test -n "$dlname"; then
-	        newdlprefiles+=" $dir/$dlname"
-	      else
-	        newdlprefiles+=" $dir/$linklib"
-	      fi
-	    ;;
-	  esac
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path+=" $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) func_stripname '-L' '' "$deplib"
-	         func_resolve_sysroot "$func_stripname_result"
-	         newlib_search_path+=" $func_resolve_sysroot_result"
-		 ;;
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs+=" $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs+=" $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
-	      *"$absdir:"*) ;;
-	      *) temp_rpath+="$absdir:" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath+=" $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath+=" $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
-	      # No point in relinking DLLs because paths are not encoded
-	      notinst_deplibs+=" $lib"
-	      need_relink=no
-	    ;;
-	  *)
-	    if test "$installed" = no; then
-	      notinst_deplibs+=" $lib"
-	      need_relink=yes
-	    fi
-	    ;;
-	  esac
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on some
-	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
-	  for dlpremoduletest in $dlprefiles; do
-	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
-	      break
-	    fi
-	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    echo
-	    if test "$linkmode" = prog; then
-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $ECHO "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath+=" $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath+=" $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    shift
-	    realname="$1"
-	    shift
-	    libname=`eval "\\$ECHO \"$libname_spec\""`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
-	        func_arith $current - $age
-		major=$func_arith_result
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    func_basename "$soroot"
-	    soname="$func_basename_result"
-	    func_stripname 'lib' '.dll' "$soname"
-	    newlib=libimp-$func_stripname_result.a
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      func_verbose "extracting exported symbol list from \`$soname'"
-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for \`$soname'"
-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
-		    # link against it, someone is ignoring the earlier warnings
-		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null ; then
-		      if test "X$dlopenmodule" != "X$lib"; then
-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
-			  echo
-			  echo "*** And there doesn't seem to be a static archive available"
-			  echo "*** The link will probably fail, sorry"
-			else
-			  add="$dir/$old_library"
-			fi
-		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$absdir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      add_dir+=" -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      func_fatal_configuration "unsupported hardcode properties"
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath+="$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath+="$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath+="$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
-	      else
-		add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    add_dir+=" -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    echo
-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      echo "*** But as you try to build a module library, libtool will still create "
-	      echo "*** a static module, that should work as long as the dlopening application"
-	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		echo
-		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		echo "*** not find such a program.  So, this module is probably useless."
-		echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) func_stripname '-R' '' "$libdir"
-	           temp_xrpath=$func_stripname_result
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath+=" $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs+=" $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path+=" $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    case $deplib in
-              -L*) func_stripname '-L' '' "$deplib"
-                   func_resolve_sysroot "$func_stripname_result";;
-              *) func_resolve_sysroot "$deplib" ;;
-            esac
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $func_resolve_sysroot_result "*)
-                specialdeplibs+=" $func_resolve_sysroot_result" ;;
-	      esac
-	    fi
-	    tmp_libs+=" $func_resolve_sysroot_result"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      path=
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-	        func_resolve_sysroot "$deplib"
-	        deplib=$func_resolve_sysroot_result
-	        func_dirname "$deplib" "" "."
-		dir=$func_dirname_result
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if $GREP "^installed=no" $deplib > /dev/null; then
-		case $host in
-		*-*-darwin*)
-		  depdepl=
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$absdir/$objdir/$depdepl" ; then
-		      depdepl="$absdir/$objdir/$depdepl"
-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-                      if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                      fi
-		      compiler_flags+=" ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      linker_flags+=" -dylib_file ${darwin_install_name}:${depdepl}"
-		      path=
-		    fi
-		  fi
-		  ;;
-		*)
-		  path="-L$absdir/$objdir"
-		  ;;
-		esac
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
-		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
-
-		  path="-L$absdir"
-		fi
-		;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-	else
-	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	fi
-      fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path+=" $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs+=" $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs+=" $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs+=" $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-    fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
-
-      test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs+="$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
-
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  func_stripname '' '.la' "$outputname"
-	  name=$func_stripname_result
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  func_stripname '' '.la' "$outputname"
-	  libname=$func_stripname_result
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
-	else
-	  echo
-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-	  $ECHO "*** objects $objs is not portable!"
-	  libobjs+=" $objs"
-	fi
-      fi
-
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
-
-      set dummy $rpath
-      shift
-      test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
-
-      install_libdir="$1"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
-
-	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	shift
-	IFS="$save_ifs"
-
-	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$1"
-	  number_minor="$2"
-	  number_revision="$3"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  # correct linux to gnu/linux during the next big refactor
-	  darwin|linux|osf|windows|none)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|qnx|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_minor"
-	    lt_irix_increment=no
-	    ;;
-	  *)
-	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "CURRENT \`$current' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "REVISION \`$revision' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "AGE \`$age' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  func_arith $current + 1
-	  minor_current=$func_arith_result
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
-	    func_arith $current - $age
-	  else
-	    func_arith $current - $age + 1
-	  fi
-	  major=$func_arith_result
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    func_arith $revision - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux) # correct to gnu/linux during the next big refactor
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    func_arith $current - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring+=":${current}.0"
-	  ;;
-
-	qnx)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  func_arith $current - $age
-	  major=$func_arith_result
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-
-      fi
-
-      func_generate_dlsyms "$libname" "$libname" "yes"
-      libobjs+=" $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
-
-      if test "$opt_mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$ECHO "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext | *.gcno)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-		 then
-		   continue
-		 fi
-	       fi
-	       removelist+=" $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	test -n "$removelist" && \
-	  func_show_eval "${RM}r \$removelist"
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs+=" $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  func_replace_sysroot "$libdir"
-	  temp_xrpath+=" -R$func_replace_sysroot_result"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath+=" $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles+=" $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles+=" $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs+=" System.ltframework"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
-	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs+=" -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $opt_dry_run || $RM conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $opt_dry_run || $RM conftest
-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs+=" $i"
-		    i=""
-		    ;;
-		  esac
-		fi
-		if test -n "$i" ; then
-		  libname=`eval "\\$ECHO \"$libname_spec\""`
-		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		  set dummy $deplib_matches; shift
-		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs+=" $i"
-		  else
-		    droppeddeps=yes
-		    echo
-		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    echo "*** I have the capability to make that library automatically link in when"
-		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which I believe you do not have"
-		    echo "*** because a test_compile did reveal that the linker did not use it for"
-		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-		;;
-	      *)
-		newdeplibs+=" $i"
-		;;
-	      esac
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		$opt_dry_run || $RM conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs+=" $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval "\\$ECHO \"$libname_spec\""`
-		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		    set dummy $deplib_matches; shift
-		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs+=" $i"
-		    else
-		      droppeddeps=yes
-		      echo
-		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      echo "*** I have the capability to make that library automatically link in when"
-		      echo "*** you link to this library.  But I can only do this if you have a"
-		      echo "*** shared version of the library, which you do not appear to have"
-		      echo "*** because a test_compile did reveal that the linker did not use this one"
-		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  echo
-		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  echo "*** make it link in!  You will probably need to install it or some"
-		  echo "*** library that it depends on before this library will be fully"
-		  echo "*** functional.  Installing it before continuing would be even better."
-		fi
-		;;
-	      *)
-		newdeplibs+=" $i"
-		;;
-	      esac
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method; shift
-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs+=" $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		if test -n "$file_magic_glob"; then
-		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
-		else
-		  libnameglob=$libname
-		fi
-		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  if test "$want_nocaseglob" = yes; then
-		    shopt -s nocaseglob
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		    $nocaseglob
-		  else
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		  fi
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null |
-			 $GREP " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-			 $SED -e 10q |
-			 $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs+=" $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      newdeplibs+=" $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method; shift
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs+=" $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
-		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs+=" $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      newdeplibs+=" $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
-	    done
-	  fi
-	  case $tmp_deplibs in
-	  *[!\	\ ]*)
-	    echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	    ;;
-	  esac
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    echo
-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    echo "*** a static module, that should work as long as the dlopening"
-	    echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      echo
-	      echo "*** Since this library must not contain undefined symbols,"
-	      echo "*** because either the platform does not support them or"
-	      echo "*** it was explicitly requested with -no-undefined,"
-	      echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-      case $host in
-	*-*-darwin*)
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  ;;
-      esac
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs+=" -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs+=" $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs+=" $deplib" ;;
-	esac
-      done
-      deplibs="$new_libs"
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	# Remove ${wl} instances when linking with ld.
-	# FIXME: should test the right _cmds variable.
-	case $archive_cmds in
-	  *\$LD\ *) wl= ;;
-        esac
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		func_replace_sysroot "$libdir"
-		libdir=$func_replace_sysroot_result
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs+="$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath+=" $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath+=" $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath+="$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	shift
-	realname="$1"
-	shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  linknames+=" $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	test "X$libobjs" = "X " && libobjs=
-
-	delfiles=
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols="$output_objdir/$libname.uexp"
-	  delfiles+=" $export_symbols"
-	fi
-
-	orig_export_symbols=
-	case $host_os in
-	cygwin* | mingw* | cegcc*)
-	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-	      # and it's NOT already a .def file. Must figure out
-	      # which of the given symbols are data symbols and tag
-	      # them as such. So, trigger use of export_symbols_cmds.
-	      # export_symbols gets reassigned inside the "prepare
-	      # the list of exported symbols" if statement, so the
-	      # include_expsyms logic still works.
-	      orig_export_symbols="$export_symbols"
-	      export_symbols=
-	      always_export_symbols=yes
-	    fi
-	  fi
-	  ;;
-	esac
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $opt_dry_run || $RM $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd1 in $cmds; do
-	      IFS="$save_ifs"
-	      # Take the normal branch if the nm_file_list_spec branch
-	      # doesn't work or if tool conversion is not needed.
-	      case $nm_file_list_spec~$to_tool_file_cmd in
-		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
-		  try_normal_branch=yes
-		  eval cmd=\"$cmd1\"
-		  func_len " $cmd"
-		  len=$func_len_result
-		  ;;
-		*)
-		  try_normal_branch=no
-		  ;;
-	      esac
-	      if test "$try_normal_branch" = yes \
-		 && { test "$len" -lt "$max_cmd_len" \
-		      || test "$max_cmd_len" -le -1; }
-	      then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	      elif test -n "$nm_file_list_spec"; then
-		func_basename "$output"
-		output_la=$func_basename_result
-		save_libobjs=$libobjs
-		save_output=$output
-		output=${output_objdir}/${output_la}.nm
-		func_to_tool_file "$output"
-		libobjs=$nm_file_list_spec$func_to_tool_file_result
-		delfiles+=" $output"
-		func_verbose "creating $NM input file list: $output"
-		for obj in $save_libobjs; do
-		  func_to_tool_file "$obj"
-		  $ECHO "$func_to_tool_file_result"
-		done > "$output"
-		eval cmd=\"$cmd1\"
-		func_show_eval "$cmd" 'exit $?'
-		output=$save_output
-		libobjs=$save_libobjs
-		skipped_export=false
-	      else
-		# The command line is too long to execute in one step.
-		func_verbose "using reloadable object file for export list..."
-		skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols="$export_symbols"
-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	fi
-
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands which not all seds can handle. GNU sed should be fine
-	  # though. Also, the filter scales superlinearly with the number of
-	  # global variables. join(1) would be nice here, but unfortunately
-	  # isn't a blessed tool.
-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  delfiles+=" $export_symbols $output_objdir/$libname.filter"
-	  export_symbols=$output_objdir/$libname.def
-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-	  case " $convenience " in
-	  *" $test_deplib "*) ;;
-	  *)
-	    tmp_deplibs+=" $test_deplib"
-	    ;;
-	  esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
-	    test -z "$libobjs"; then
-	    # extract the archives, so we have objects to list.
-	    # TODO: could optimize this to just extract one archive.
-	    whole_archive_flag_spec=
-	  fi
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated+=" $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    libobjs+=" $func_extract_archives_result"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags+=" $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$opt_mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval test_cmds=\"$archive_expsym_cmds\"
-	    cmds=$archive_expsym_cmds
-	  else
-	    eval test_cmds=\"$archive_cmds\"
-	    cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   func_len " $test_cmds" &&
-	   len=$func_len_result &&
-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise
-	  # or, if using GNU ld and skipped_export is not :, use a linker
-	  # script.
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  func_basename "$output"
-	  output_la=$func_basename_result
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  last_robj=
-	  k=1
-
-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
-	    func_verbose "creating GNU ld script: $output"
-	    echo 'INPUT (' > $output
-	    for obj in $save_libobjs
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    echo ')' >> $output
-	    delfiles+=" $output"
-	    func_to_tool_file "$output"
-	    output=$func_to_tool_file_result
-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	    output=${output_objdir}/${output_la}.lnk
-	    func_verbose "creating linker input file list: $output"
-	    : > $output
-	    set x $save_libobjs
-	    shift
-	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
-	      firstobj="$1 "
-	      shift
-	    fi
-	    for obj
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    delfiles+=" $output"
-	    func_to_tool_file "$output"
-	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
-	  else
-	    if test -n "$save_libobjs"; then
-	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
-	      eval test_cmds=\"$reload_cmds\"
-	      func_len " $test_cmds"
-	      len0=$func_len_result
-	      len=$len0
-
-	      # Loop over the list of objects to be linked.
-	      for obj in $save_libobjs
-	      do
-		func_len " $obj"
-		func_arith $len + $func_len_result
-		len=$func_arith_result
-		if test "X$objlist" = X ||
-		   test "$len" -lt "$max_cmd_len"; then
-		  objlist+=" $obj"
-		else
-		  # The command $test_cmds is almost too long, add a
-		  # command to the queue.
-		  if test "$k" -eq 1 ; then
-		    # The first file doesn't have a previous command to add.
-		    reload_objs=$objlist
-		    eval concat_cmds=\"$reload_cmds\"
-		  else
-		    # All subsequent reloadable object files will link in
-		    # the last one created.
-		    reload_objs="$objlist $last_robj"
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
-		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
-		  func_arith $k + 1
-		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=" $obj"
-		  func_len " $last_robj"
-		  func_arith $len0 + $func_len_result
-		  len=$func_arith_result
-		fi
-	      done
-	      # Handle the remaining objects by creating one last
-	      # reloadable object file.  All subsequent reloadable object
-	      # files will link in the last one created.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      reload_objs="$objlist $last_robj"
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
-	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
-	      fi
-	      delfiles+=" $output"
-
-	    else
-	      output=
-	    fi
-
-	    if ${skipped_export-false}; then
-	      func_verbose "generating symbol list for \`$libname.la'"
-	      export_symbols="$output_objdir/$libname.exp"
-	      $opt_dry_run || $RM $export_symbols
-	      libobjs=$output
-	      # Append the command to create the export file.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	      if test -n "$last_robj"; then
-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	    fi
-
-	    test -n "$save_libobjs" &&
-	      func_verbose "creating a temporary reloadable object file: $output"
-
-	    # Loop through the commands generated above and execute them.
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
-	      }
-	      $opt_dry_run || eval "$cmd" || {
-		lt_exit=$?
-
-		# Restore the uninstalled library and exit
-		if test "$opt_mode" = relink; then
-		  ( cd "$output_objdir" && \
-		    $RM "${realname}T" && \
-		    $MV "${realname}U" "$realname" )
-		fi
-
-		exit $lt_exit
-	      }
-	    done
-	    IFS="$save_ifs"
-
-	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-
-          if ${skipped_export-false}; then
-	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols="$export_symbols"
-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	    fi
-
-	    if test -n "$orig_export_symbols"; then
-	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands which not all seds can handle. GNU sed should be fine
-	      # though. Also, the filter scales superlinearly with the number of
-	      # global variables. join(1) would be nice here, but unfortunately
-	      # isn't a blessed tool.
-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      delfiles+=" $export_symbols $output_objdir/$libname.filter"
-	      export_symbols=$output_objdir/$libname.def
-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	    fi
-	  fi
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	      cmds=$archive_expsym_cmds
-	    else
-	      cmds=$archive_cmds
-	    fi
-	  fi
-	fi
-
-	if test -n "$delfiles"; then
-	  # Append the command to remove temporary files to $cmds.
-	  eval cmds=\"\$cmds~\$RM $delfiles\"
-	fi
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  generated+=" $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  libobjs+=" $func_extract_archives_result"
-	  test "X$libobjs" = "X " && libobjs=
-	fi
-
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $opt_silent || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
-	  }
-	  $opt_dry_run || eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$opt_mode" = relink; then
-	      ( cd "$output_objdir" && \
-	        $RM "${realname}T" && \
-		$MV "${realname}U" "$realname" )
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$opt_mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      func_show_eval '${RM}r "$gentop"'
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
-
-      case $output in
-      *.lo)
-	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
-
-	libobj=$output
-	func_lo2o "$libobj"
-	obj=$func_lo2o_result
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
-	else
-	  gentop="$output_objdir/${obj}x"
-	  generated+=" $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # If we're not building shared, we need to use non_pic_objs
-      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      func_execute_cmds "$reload_cmds" 'exit $?'
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
-
-      if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	          output=$func_stripname_result.exe;;
-      esac
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
-
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	;;
-      esac
-
-      case $host in
-      *-*-darwin*)
-	# Don't allow lazy linking, it breaks C++ global constructors
-	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-	    10.[0123])
-	      compile_command+=" ${wl}-bind_at_load"
-	      finalize_command+=" ${wl}-bind_at_load"
-	    ;;
-	  esac
-	fi
-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs+=" -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs+=" $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs+=" $deplib" ;;
-	esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      compile_command+=" $compile_deplibs"
-      finalize_command+=" $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath+=" $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs+="$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath+=" $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath+=" $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  ::) dllsearchpath=$libdir;;
-	  *) dllsearchpath+=":$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath+=":$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs+="$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath+=" $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath+=" $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-      fi
-
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
-
-      wrappers_required=yes
-      case $host in
-      *cegcc* | *mingw32ce*)
-        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
-      *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      esac
-      if test "$wrappers_required" = no; then
-	# Replace the output file specification.
-	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-	fi
-
-	exit $exit_status
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath+="$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath+="$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	func_show_eval "$link_command" 'exit $?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      func_show_eval "$link_command" 'exit $?'
-
-      if test -n "$postlink_cmds"; then
-	func_to_tool_file "$output_objdir/$outputname"
-	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	func_execute_cmds "$postlink_cmds" 'exit $?'
-      fi
-
-      # Now create the wrapper script.
-      func_verbose "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if not in dry run mode.
-      $opt_dry_run || {
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) func_stripname '' '.exe' "$output"
-	         output=$func_stripname_result ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    func_stripname '' '.exe' "$outputname"
-	    outputname=$func_stripname_result ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    func_dirname_and_basename "$output" "" "."
-	    output_name=$func_basename_result
-	    output_path=$func_dirname_result
-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	    cwrapper="$output_path/$output_name.exe"
-	    $RM $cwrappersource $cwrapper
-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_cwrapperexe_src > $cwrappersource
-
-	    # The wrapper executable is built using the $host compiler,
-	    # because it contains $host paths and files. If cross-
-	    # compiling, it, like the target executable, must be
-	    # executed on the $host or under an emulation environment.
-	    $opt_dry_run || {
-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-	      $STRIP $cwrapper
-	    }
-
-	    # Now, create the wrapper script for func_source use:
-	    func_ltwrapper_scriptname $cwrapper
-	    $RM $func_ltwrapper_scriptname_result
-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-	    $opt_dry_run || {
-	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host" ; then
-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-	      else
-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-	      fi
-	    }
-	  ;;
-	  * )
-	    $RM $output
-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_wrapper no > $output
-	    chmod +x $output
-	  ;;
-	esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    oldobjs+=" $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated+=" $gentop"
-
-	func_extract_archives $gentop $addlibs
-	oldobjs+=" $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	cmds=$old_archive_from_new_cmds
-      else
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  generated+=" $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  oldobjs+=" $func_extract_archives_result"
-	fi
-
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      func_basename "$obj"
-	      $ECHO "$func_basename_result"
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  echo "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
-	  generated+=" $gentop"
-	  func_mkdir_p "$gentop"
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    func_basename "$obj"
-	    objbase="$func_basename_result"
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		func_arith $counter + 1
-		counter=$func_arith_result
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      oldobjs+=" $gentop/$newobj"
-	      ;;
-	    *) oldobjs+=" $obj" ;;
-	    esac
-	  done
-	fi
-	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-	tool_oldlib=$func_to_tool_file_result
-	eval cmds=\"$old_archive_cmds\"
-
-	func_len " $cmds"
-	len=$func_len_result
-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	elif test -n "$archiver_list_spec"; then
-	  func_verbose "using command file archive linking..."
-	  for obj in $oldobjs
-	  do
-	    func_to_tool_file "$obj"
-	    $ECHO "$func_to_tool_file_result"
-	  done > $output_objdir/$libname.libcmd
-	  func_to_tool_file "$output_objdir/$libname.libcmd"
-	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  func_verbose "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  eval test_cmds=\"$old_archive_cmds\"
-	  func_len " $test_cmds"
-	  len0=$func_len_result
-	  len=$len0
-	  for obj in $save_oldobjs
-	  do
-	    func_len " $obj"
-	    func_arith $len + $func_len_result
-	    len=$func_arith_result
-	    objlist+=" $obj"
-	    if test "$len" -lt "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-		RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	      len=$len0
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
-
-    test -n "$generated" && \
-      func_show_eval "${RM}r$generated"
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      func_verbose "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-      # Only create the output if not a dry run.
-      $opt_dry_run || {
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		func_basename "$deplib"
-		name="$func_basename_result"
-		func_resolve_sysroot "$deplib"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		newdependency_libs+=" ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      -L*)
-		func_stripname -L '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		newdependency_libs+=" -L$func_replace_sysroot_result"
-		;;
-	      -R*)
-		func_stripname -R '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		newdependency_libs+=" -R$func_replace_sysroot_result"
-		;;
-	      *) newdependency_libs+=" $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-
-	    for lib in $dlfiles; do
-	      case $lib in
-	      *.la)
-	        func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlfiles+=" ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      *) newdlfiles+=" $lib" ;;
-	      esac
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-	      *.la)
-		# Only pass preopened files to the pseudo-archive (for
-		# eventual linking with the app. that links it) if we
-		# didn't already link the preopened objects directly into
-		# the library:
-		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlprefiles+=" ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      esac
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles+=" $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles+=" $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $RM $output
-	  # place dlname in correct position for cygwin
-	  # In fact, it would be nice if we could use this code for all target
-	  # systems that can't hard-code library paths into their executables
-	  # and that have no shared library path variable independent of PATH,
-	  # but it turns out we can't easily determine that from inspecting
-	  # libtool variables, so we have to hard-code the OSs to which it
-	  # applies here; at the moment, that means platforms that use the PE
-	  # object format with DLL files.  See the long comment at the top of
-	  # tests/bindir.at for full details.
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-	      # If a -bindir argument was supplied, place the dll there.
-	      if test "x$bindir" != x ;
-	      then
-		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result$dlname
-	      else
-		# Otherwise fall back on heuristic.
-		tdlname=../bin/$dlname
-	      fi
-	      ;;
-	  esac
-	  $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $ECHO >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      }
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
-
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-    func_mode_link ${1+"$@"}
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $opt_debug
-    RM="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) RM+=" $arg"; rmforce=yes ;;
-      -*) RM+=" $arg" ;;
-      *) files+=" $arg" ;;
-      esac
-    done
-
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
-
-    rmdirs=
-
-    for file in $files; do
-      func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	odir="$objdir"
-      else
-	odir="$dir/$objdir"
-      fi
-      func_basename "$file"
-      name="$func_basename_result"
-      test "$opt_mode" = uninstall && odir="$dir"
-
-      # Remember odir for removal later, being careful to avoid duplicates
-      if test "$opt_mode" = clean; then
-	case " $rmdirs " in
-	  *" $odir "*) ;;
-	  *) rmdirs+=" $odir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if { test -L "$file"; } >/dev/null 2>&1 ||
-	 { test -h "$file"; } >/dev/null 2>&1 ||
-	 test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	  func_source $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles+=" $odir/$n"
-	  done
-	  test -n "$old_library" && rmfiles+=" $odir/$old_library"
-
-	  case "$opt_mode" in
-	  clean)
-	    case " $library_names " in
-	    *" $dlname "*) ;;
-	    *) test -n "$dlname" && rmfiles+=" $odir/$dlname" ;;
-	    esac
-	    test -n "$libdir" && rmfiles+=" $odir/$name $odir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if func_lalib_p "$file"; then
-
-	  # Read the .lo file
-	  func_source $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; then
-	    rmfiles+=" $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" &&
-	     test "$non_pic_object" != none; then
-	    rmfiles+=" $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$opt_mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    func_stripname '' '.exe' "$file"
-	    file=$func_stripname_result
-	    func_stripname '' '.exe' "$name"
-	    noexename=$func_stripname_result
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles+=" $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if func_ltwrapper_p "$file"; then
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      relink_command=
-	      func_source $func_ltwrapper_scriptname_result
-	      rmfiles+=" $func_ltwrapper_scriptname_result"
-	    else
-	      relink_command=
-	      func_source $dir/$noexename
-	    fi
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles+=" $odir/$name $odir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles+=" $odir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles+=" $odir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      func_show_eval "$RM $rmfiles" 'exit_status=1'
-    done
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	func_show_eval "rmdir $dir >/dev/null 2>&1"
-      fi
-    done
-
-    exit $exit_status
-}
-
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
-
-test -z "$opt_mode" && {
-  help="$generic_help"
-  func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$opt_mode'"
-
-if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
-  exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
-# vi:sw=2
-
diff --git a/vpp-japi/m4/ax_check_java_home.m4 b/vpp-japi/m4/ax_check_java_home.m4
deleted file mode 100644
index cfe8f589..00000000
--- a/vpp-japi/m4/ax_check_java_home.m4
+++ /dev/null
@@ -1,80 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_check_java_home.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_JAVA_HOME
-#
-# DESCRIPTION
-#
-#   Check for Sun Java (JDK / JRE) installation, where the 'java' VM is in.
-#   If found, set environment variable JAVA_HOME = Java installation home,
-#   else left JAVA_HOME untouch, which in most case means JAVA_HOME is
-#   empty.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Gleen Salmon <gleensalmon@yahoo.com>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 6
-
-AU_ALIAS([AC_CHECK_JAVA_HOME], [AX_CHECK_JAVA_HOME])
-
-AC_DEFUN([AX_CHECK_JAVA_HOME],
-[AC_MSG_CHECKING([for JAVA_HOME])
-# We used a fake loop so that we can use "break" to exit when the result
-# is found.
-while true
-do
-  # If the user defined JAVA_HOME, don't touch it.
-  test "${JAVA_HOME+set}" = set && break
-
-  # On Mac OS X 10.5 and following, run /usr/libexec/java_home to get
-  # the value of JAVA_HOME to use.
-  # (http://developer.apple.com/library/mac/#qa/qa2001/qa1170.html).
-  JAVA_HOME=`/usr/libexec/java_home 2>/dev/null`
-  test x"$JAVA_HOME" != x && break
-
-  # See if we can find the java executable, and compute from there.
-  TRY_JAVA_HOME=`ls -dr /usr/java/* 2> /dev/null | head -n 1`
-  if test x$TRY_JAVA_HOME != x; then
-    PATH=$PATH:$TRY_JAVA_HOME/bin
-  fi
-  AC_PATH_PROG([JAVA_PATH_NAME], [java])
-  if test "x$JAVA_PATH_NAME" != x; then
-    JAVA_HOME=`echo $JAVA_PATH_NAME | sed "s/\(.*\)[[/]]bin[[/]]java.*/\1/"`
-    break
-  fi
-
-  AC_MSG_NOTICE([Could not compute JAVA_HOME])
-  break
-done
-AC_MSG_RESULT([$JAVA_HOME])
-])
diff --git a/vpp-japi/m4/ax_check_java_plugin.m4 b/vpp-japi/m4/ax_check_java_plugin.m4
deleted file mode 100644
index 920753e5..00000000
--- a/vpp-japi/m4/ax_check_java_plugin.m4
+++ /dev/null
@@ -1,101 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_check_java_plugin.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_JAVA_PLUGIN(<shell-variable>)
-#
-# DESCRIPTION
-#
-#   This macro sets <shell-variable> to empty on failure and to a compatible
-#   version of plugin.jar otherwise. Directories searched are /usr/java/*
-#   and /usr/local/java/*, which are assumed to be j{dk,re} installations.
-#   Apply the shell variable as you see fit. If sun changes things so
-#   <jre>/lib/plugin.jar is not the magic file it will stop working.
-#
-#   This macro assumes that unzip, zipinfo or pkzipc is available (and can
-#   list the contents of the jar archive). The first two are assumed to work
-#   similarly enough to the infozip versisonms. The pkzipc version is
-#   assumed to work if I undertstand the documentation on pkware's site but
-#   YMMV. I do not have access to pwkware's version to test it.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Duncan Simpson <dps@simpson.demon.co.uk>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 7
-
-AU_ALIAS([DPS_CHECK_PLUGIN], [AX_CHECK_JAVA_PLUGIN])
-AC_DEFUN([AX_CHECK_JAVA_PLUGIN],
-[AC_REQUIRE([AC_PROG_AWK])
-AC_REQUIRE([AC_PROG_FGREP])
-AC_CHECK_PROG(ZIPINFO,[zipinfo unzip pkzipc])
-AC_MSG_CHECKING([for the java plugin])
-case "x$ZIPINFO" in
-[*/zipinfo)]
-	zipinf="zipinfo -1" ;;
-[*/unzip)]
-	zipinf="unzip -l";;
-[*/pkzipc)]
-	ziping="unzipc -view";;
-[x*)]
-	AC_MSG_RESULT([skiped, none of zipinfo, unzip and pkzipc found])
-	AC_SUBST($1,[])
-	zipinf="";;
-esac
-if test "x$zipinf" != "x"; then
-jplugin=""
-for jhome in `ls -dr /usr/java/* /usr/local/java/* 2> /dev/null`; do
-for jfile in lib/plugin.jar jre/lib/plugin.jar; do
-if test "x$jplugin" = "x" && test -f "$jhome/$jfile"; then
-eval "$zipinf $jhome/$jfile | $AWK '{ print \$NF; }' | $FGREP netscape/javascript/JSObject" >/dev/null 2>/dev/null
-if test $? -eq 0; then
-dnl Some version of gcj (and javac) refuse to work with some files
-dnl that pass this test. To stop this problem make sure that the compiler
-dnl still works with this jar file in the classpath
-cat << \EOF > Test.java
-/* [#]line __oline__ "configure" */
-public class Test {
-}
-EOF
-if eval "$JAVAC -classpath $jhome/$jfile Test.java 2>/dev/null >/dev/null" && test -f Test.class; then
-jplugin="$jhome/$jfile"
-fi
-rm -f Test.java Test.class
-fi; fi; done; done
-if test "x$jplugin" != "x"; then
-AC_SUBST($1,$jplugin)
-AC_MSG_RESULT($jplugin)
-else
-AC_MSG_RESULT([java plugin not found])
-AC_SUBST($1,[])
-fi
-fi
-])
diff --git a/vpp-japi/m4/ax_java_check_class.m4 b/vpp-japi/m4/ax_java_check_class.m4
deleted file mode 100644
index 917638ae..00000000
--- a/vpp-japi/m4/ax_java_check_class.m4
+++ /dev/null
@@ -1,85 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_java_check_class.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_JAVA_CHECK_CLASS(<class>,<action-if-found>,<action-if-not-found>)
-#
-# DESCRIPTION
-#
-#   Test if a Java class is available. Based on AX_PROG_JAVAC_WORKS. This
-#   version uses a cache variable which is both compiler, options and
-#   classpath dependent (so if you switch from javac to gcj it correctly
-#   notices and redoes the test).
-#
-#   The macro tries to compile a minimal program importing <class>. Some
-#   newer compilers moan about the failure to use this but fail or produce a
-#   class file anyway. All moaing is sunk to /dev/null since I only wanted
-#   to know if the class could be imported. This is a recommended followup
-#   to AX_CHECK_JAVA_PLUGIN with classpath appropriately adjusted.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Duncan Simpson <dps@simpson.demon.co.uk>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 9
-
-AU_ALIAS([DPS_JAVA_CHECK_CLASS], [AX_JAVA_CHECK_CLASS])
-AC_DEFUN([AX_JAVA_CHECK_CLASS],[
-m4_define([cache_val],[m4_translit(ax_cv_have_java_class_$1, " ." ,"__")])
-if test "x$CLASSPATH" != "x"; then
-xtra=" with classpath ${CLASSPATH}"
-xopts=`echo ${CLASSPATH} | ${SED} 's/^ *://'`
-xopts="-classpath $xopts"
-else xtra=""; xopts=""; fi
-cache_var="cache_val"AS_TR_SH([_Jc_${JAVAC}_Cp_${CLASSPATH}])
-AC_CACHE_CHECK([if the $1 class is available$xtra], [$cache_var], [
-JAVA_TEST=Test.java
-CLASS_TEST=Test.class
-cat << \EOF > $JAVA_TEST
-/* [#]xline __oline__ "configure" */
-import $1;
-public class Test {
-}
-EOF
-if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $xopts $JAVA_TEST) >/dev/null 2>&1; then
-  eval "${cache_var}=yes"
-else
-  eval "${cache_var}=no"
-  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-  cat $JAVA_TEST >&AS_MESSAGE_LOG_FD
-fi
-rm -f $JAVA_TEST $CLASS_TEST
-])
-if eval 'test "x$'${cache_var}'" = "xyes"'; then
-$2
-true; else
-$3
-false; fi])
diff --git a/vpp-japi/m4/ax_java_options.m4 b/vpp-japi/m4/ax_java_options.m4
deleted file mode 100644
index 36c10d92..00000000
--- a/vpp-japi/m4/ax_java_options.m4
+++ /dev/null
@@ -1,48 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_java_options.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_JAVA_OPTIONS
-#
-# DESCRIPTION
-#
-#   AX_JAVA_OPTIONS adds configure command line options used for Java m4
-#   macros. This Macro is optional.
-#
-#   Note: This is part of the set of autoconf M4 macros for Java programs.
-#   It is VERY IMPORTANT that you download the whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission. The
-#   general documentation, as well as the sample configure.in, is included
-#   in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Devin Weaver <ktohg@tritarget.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 6
-
-AU_ALIAS([AC_JAVA_OPTIONS], [AX_JAVA_OPTIONS])
-AC_DEFUN([AX_JAVA_OPTIONS],[
-AC_ARG_WITH(java-prefix,
-                        [  --with-java-prefix=PFX  prefix where Java runtime is installed (optional)])
-AC_ARG_WITH(javac-flags,
-                        [  --with-javac-flags=FLAGS flags to pass to the Java compiler (optional)])
-AC_ARG_WITH(java-flags,
-                        [  --with-java-flags=FLAGS flags to pass to the Java VM (optional)])
-JAVAPREFIX=$with_java_prefix
-JAVACFLAGS=$with_javac_flags
-JAVAFLAGS=$with_java_flags
-AC_SUBST(JAVAPREFIX)dnl
-AC_SUBST(JAVACFLAGS)dnl
-AC_SUBST(JAVAFLAGS)dnl
-AC_SUBST(JAVA)dnl
-AC_SUBST(JAVAC)dnl
-])
diff --git a/vpp-japi/m4/ax_libgcj_jar.m4 b/vpp-japi/m4/ax_libgcj_jar.m4
deleted file mode 100644
index 5e942857..00000000
--- a/vpp-japi/m4/ax_libgcj_jar.m4
+++ /dev/null
@@ -1,83 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_libgcj_jar.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_LIBGCJ_JAR
-#
-# DESCRIPTION
-#
-#   Locate libgcj.jar so you can place it before everything else when using
-#   gcj.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Duncan Simpson <dps@simpson.demon.co.uk>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 9
-
-AU_ALIAS([DPS_LIBGCJ_JAR], [AX_LIBGCJ_JAR])
-AC_DEFUN([AX_LIBGCJ_JAR],
-[
-AC_REQUIRE([AC_EXEEXT])
-AC_REQUIRE([AX_PROG_JAVAC])
-AC_REQUIRE([AC_PROG_FGREP])
-AC_PROG_SED
-if test "x$SED" = "x"; then
-AC_MSG_WARN([sed not avaiable, so libgcj.jar test skipped])
-else
-AC_MSG_CHECKING([if $JAVAC is gcj]);
-jc=`eval "[echo x$JAVAC | $SED 's/^x.*\\/\\([^/]*\\)\$/x\\1/;s/^ *\\([^ ]*\\) .*$/\\1/;s/"$EXEEXT"$//']"`
-if test "x$jc" != "xxgcj"; then
-AC_MSG_RESULT(no)
-else
-AC_MSG_RESULT(yes)
-AC_MSG_CHECKING([libgcj.jar location])
-save_cp="$CLASSPATH";
-unset CLASSPATH;
-AC_MSG_CHECKING([gcj default classpath])
-cat << \EOF > Test.java
-/* [#]line __oline__ "configure" */
-public class Test {
-}
-EOF
-lgcj=`eval "[$JAVAC -v -C Test.java 2>&1 | $FGREP \\(system\\) | $SED 's/^ *\\([^ ]*\\) .*$/\\1/;s/\\.jar\\//.jar/']"`;
-if test -f Test.class && test "x$lgcj" != "x"; then
-AC_MSG_RESULT($lgcj)
-$1="$lgcj:"
-else
-AC_MSG_RESULT(failed)
-$1=""
-fi
-if test "x$save_cp" != "x"; then CLASSPATH="$save_cp"; fi
-rm -f Test.java Test.class
-fi
-fi
-])
diff --git a/vpp-japi/m4/ax_prog_jar.m4 b/vpp-japi/m4/ax_prog_jar.m4
deleted file mode 100644
index 3c60fcaf..00000000
--- a/vpp-japi/m4/ax_prog_jar.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-# ===========================================================================
-#        http://www.gnu.org/software/autoconf-archive/ax_prog_jar.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAR
-#
-# DESCRIPTION
-#
-#   AX_PROG_JAR tests for an existing jar program. It uses the environment
-#   variable JAR then tests in sequence various common jar programs.
-#
-#   If you want to force a specific compiler:
-#
-#   - at the configure.in level, set JAR=yourcompiler before calling
-#   AX_PROG_JAR
-#
-#   - at the configure level, setenv JAR
-#
-#   You can use the JAR variable in your Makefile.in, with @JAR@.
-#
-#   Note: This macro depends on the autoconf M4 macros for Java programs. It
-#   is VERY IMPORTANT that you download that whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission.
-#
-#   The general documentation of those macros, as well as the sample
-#   configure.in, is included in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Egon Willighagen <e.willighagen@science.ru.nl>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 7
-
-AU_ALIAS([AC_PROG_JAR], [AX_PROG_JAR])
-AC_DEFUN([AX_PROG_JAR],[
-AS_IF([test "x$JAVAPREFIX" = x],
-      [test "x$JAR" = x && AC_CHECK_PROGS([JAR], [jar])],
-      [test "x$JAR" = x && AC_CHECK_PROGS([JAR], [jar], [], [$JAVAPREFIX/bin])])
-test "x$JAR" = x && AC_MSG_ERROR([no acceptable jar program found in \$PATH])
-AC_PROVIDE([$0])dnl
-])
diff --git a/vpp-japi/m4/ax_prog_java.m4 b/vpp-japi/m4/ax_prog_java.m4
deleted file mode 100644
index 03961db5..00000000
--- a/vpp-japi/m4/ax_prog_java.m4
+++ /dev/null
@@ -1,115 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_prog_java.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAVA
-#
-# DESCRIPTION
-#
-#   Here is a summary of the main macros:
-#
-#   AX_PROG_JAVAC: finds a Java compiler.
-#
-#   AX_PROG_JAVA: finds a Java virtual machine.
-#
-#   AX_CHECK_CLASS: finds if we have the given class (beware of CLASSPATH!).
-#
-#   AX_CHECK_RQRD_CLASS: finds if we have the given class and stops
-#   otherwise.
-#
-#   AX_TRY_COMPILE_JAVA: attempt to compile user given source.
-#
-#   AX_TRY_RUN_JAVA: attempt to compile and run user given source.
-#
-#   AX_JAVA_OPTIONS: adds Java configure options.
-#
-#   AX_PROG_JAVA tests an existing Java virtual machine. It uses the
-#   environment variable JAVA then tests in sequence various common Java
-#   virtual machines. For political reasons, it starts with the free ones.
-#   You *must* call [AX_PROG_JAVAC] before.
-#
-#   If you want to force a specific VM:
-#
-#   - at the configure.in level, set JAVA=yourvm before calling AX_PROG_JAVA
-#
-#     (but after AC_INIT)
-#
-#   - at the configure level, setenv JAVA
-#
-#   You can use the JAVA variable in your Makefile.in, with @JAVA@.
-#
-#   *Warning*: its success or failure can depend on a proper setting of the
-#   CLASSPATH env. variable.
-#
-#   TODO: allow to exclude virtual machines (rationale: most Java programs
-#   cannot run with some VM like kaffe).
-#
-#   Note: This is part of the set of autoconf M4 macros for Java programs.
-#   It is VERY IMPORTANT that you download the whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission.
-#
-#   A Web page, with a link to the latest CVS snapshot is at
-#   <http://www.internatif.org/bortzmeyer/autoconf-Java/>.
-#
-#   This is a sample configure.in Process this file with autoconf to produce
-#   a configure script.
-#
-#     AC_INIT(UnTag.java)
-#
-#     dnl Checks for programs.
-#     AC_CHECK_CLASSPATH
-#     AX_PROG_JAVAC
-#     AX_PROG_JAVA
-#
-#     dnl Checks for classes
-#     AX_CHECK_RQRD_CLASS(org.xml.sax.Parser)
-#     AX_CHECK_RQRD_CLASS(com.jclark.xml.sax.Driver)
-#
-#     AC_OUTPUT(Makefile)
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 9
-
-AU_ALIAS([AC_PROG_JAVA], [AX_PROG_JAVA])
-AC_DEFUN([AX_PROG_JAVA],[
-m4_define([m4_ax_prog_java_list], [kaffe java])dnl
-AS_IF([test "x$JAVAPREFIX" = x],
-      [test x$JAVA = x && AC_CHECK_PROGS([JAVA], [m4_ax_prog_java_list])],
-      [test x$JAVA = x && AC_CHECK_PROGS([JAVA], [m4_ax_prog_java_list], [], [$JAVAPREFIX/bin])])
-test x$JAVA = x && AC_MSG_ERROR([no acceptable Java virtual machine found in \$PATH])
-m4_undefine([m4_ax_prog_java_list])dnl
-AX_PROG_JAVA_WORKS
-AC_PROVIDE([$0])dnl
-])
diff --git a/vpp-japi/m4/ax_prog_java_cc.m4 b/vpp-japi/m4/ax_prog_java_cc.m4
deleted file mode 100644
index 3df064ff..00000000
--- a/vpp-japi/m4/ax_prog_java_cc.m4
+++ /dev/null
@@ -1,104 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_prog_java_cc.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAVA_CC
-#
-# DESCRIPTION
-#
-#   Finds the appropriate java compiler on your path. By preference the java
-#   compiler is gcj, then jikes then javac.
-#
-#   The macro can take one argument specifying a space separated list of
-#   java compiler names.
-#
-#   For example:
-#
-#     AX_PROG_JAVA_CC(javac, gcj)
-#
-#   The macro also sets the compiler options variable: JAVA_CC_OPTS to
-#   something sensible:
-#
-#    - for GCJ it sets it to: @GCJ_OPTS@
-#      (if GCJ_OPTS is not yet defined then it is set to "-C")
-#
-#    - no other compiler has applicable options yet
-#
-#   Here's an example configure.in:
-#
-#     AC_INIT(Makefile.in)
-#     AX_PROG_JAVA_CC()
-#     AC_OUTPUT(Makefile)
-#     dnl End.
-#
-#   And here's the start of the Makefile.in:
-#
-#     PROJECT_ROOT      := @srcdir@
-#     # Tool definitions.
-#     JAVAC             := @JAVA_CC@
-#     JAVAC_OPTS        := @JAVA_CC_OPTS@
-#     JAR_TOOL          := @jar_tool@
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Nic Ferrier <nferrier@tapsellferrier.co.uk>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-# AX_PROG_JAVA_CC([COMPILER ...])
-# --------------------------
-# COMPILER ... is a space separated list of java compilers to search for.
-# This just gives the user an opportunity to specify an alternative
-# search list for the java compiler.
-AU_ALIAS([AC_PROG_JAVA_CC], [AX_PROG_JAVA_CC])
-AC_DEFUN([AX_PROG_JAVA_CC],
-[AC_ARG_VAR([JAVA_CC],                [java compiler command])dnl
-AC_ARG_VAR([JAVA_CC_FLAGS],           [java compiler flags])dnl
-m4_ifval([$1],
-      [AC_CHECK_TOOLS(JAVA_CC, [$1])],
-[AC_CHECK_TOOL(JAVA_CC, gcj)
-if test -z "$JAVA_CC"; then
-  AC_CHECK_TOOL(JAVA_CC, javac)
-fi
-if test -z "$JAVA_CC"; then
-  AC_CHECK_TOOL(JAVA_CC, jikes)
-fi
-])
-
-if test "$JAVA_CC" = "gcj"; then
-   if test "$GCJ_OPTS" = ""; then
-      AC_SUBST(GCJ_OPTS,-C)
-   fi
-   AC_SUBST(JAVA_CC_OPTS, @GCJ_OPTS@,
-        [Define the compilation options for GCJ])
-fi
-test -z "$JAVA_CC" && AC_MSG_ERROR([no acceptable java compiler found in \$PATH])
-])# AX_PROG_JAVA_CC
diff --git a/vpp-japi/m4/ax_prog_java_works.m4 b/vpp-japi/m4/ax_prog_java_works.m4
deleted file mode 100644
index 54e132af..00000000
--- a/vpp-japi/m4/ax_prog_java_works.m4
+++ /dev/null
@@ -1,134 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_prog_java_works.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAVA_WORKS
-#
-# DESCRIPTION
-#
-#   Internal use ONLY.
-#
-#   Note: This is part of the set of autoconf M4 macros for Java programs.
-#   It is VERY IMPORTANT that you download the whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission. The
-#   general documentation, as well as the sample configure.in, is included
-#   in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 9
-
-AU_ALIAS([AC_PROG_JAVA_WORKS], [AX_PROG_JAVA_WORKS])
-AC_DEFUN([AX_PROG_JAVA_WORKS], [
-AC_PATH_PROG(UUDECODE, uudecode, [no])
-if test x$UUDECODE != xno; then
-AC_CACHE_CHECK([if uudecode can decode base 64 file], ac_cv_prog_uudecode_base64, [
-dnl /**
-dnl  * Test.java: used to test if java compiler works.
-dnl  */
-dnl public class Test
-dnl {
-dnl
-dnl public static void
-dnl main( String[] argv )
-dnl {
-dnl     System.exit (0);
-dnl }
-dnl
-dnl }
-cat << \EOF > Test.uue
-begin-base64 644 Test.class
-yv66vgADAC0AFQcAAgEABFRlc3QHAAQBABBqYXZhL2xhbmcvT2JqZWN0AQAE
-bWFpbgEAFihbTGphdmEvbGFuZy9TdHJpbmc7KVYBAARDb2RlAQAPTGluZU51
-bWJlclRhYmxlDAAKAAsBAARleGl0AQAEKEkpVgoADQAJBwAOAQAQamF2YS9s
-YW5nL1N5c3RlbQEABjxpbml0PgEAAygpVgwADwAQCgADABEBAApTb3VyY2VG
-aWxlAQAJVGVzdC5qYXZhACEAAQADAAAAAAACAAkABQAGAAEABwAAACEAAQAB
-AAAABQO4AAyxAAAAAQAIAAAACgACAAAACgAEAAsAAQAPABAAAQAHAAAAIQAB
-AAEAAAAFKrcAErEAAAABAAgAAAAKAAIAAAAEAAQABAABABMAAAACABQ=
-====
-EOF
-if $UUDECODE Test.uue; then
-        ac_cv_prog_uudecode_base64=yes
-else
-        echo "configure: __oline__: uudecode had trouble decoding base 64 file 'Test.uue'" >&AS_MESSAGE_LOG_FD
-        echo "configure: failed file was:" >&AS_MESSAGE_LOG_FD
-        cat Test.uue >&AS_MESSAGE_LOG_FD
-        ac_cv_prog_uudecode_base64=no
-fi
-rm -f Test.uue])
-fi
-if test x$ac_cv_prog_uudecode_base64 != xyes; then
-        rm -f Test.class
-        AC_MSG_WARN([I have to compile Test.class from scratch])
-        if test x$ac_cv_prog_javac_works = xno; then
-                AC_MSG_ERROR([Cannot compile java source. $JAVAC does not work properly])
-        fi
-        if test x$ac_cv_prog_javac_works = x; then
-                AX_PROG_JAVAC
-        fi
-fi
-AC_CACHE_CHECK(if $JAVA works, ac_cv_prog_java_works, [
-JAVA_TEST=Test.java
-CLASS_TEST=Test.class
-TEST=Test
-changequote(, )dnl
-cat << \EOF > $JAVA_TEST
-/* [#]line __oline__ "configure" */
-public class Test {
-public static void main (String args[]) {
-        System.exit (0);
-} }
-EOF
-changequote([, ])dnl
-if test x$ac_cv_prog_uudecode_base64 != xyes; then
-        if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) && test -s $CLASS_TEST; then
-                :
-        else
-          echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-          cat $JAVA_TEST >&AS_MESSAGE_LOG_FD
-          AC_MSG_ERROR(The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?))
-        fi
-fi
-if AC_TRY_COMMAND($JAVA -classpath . $JAVAFLAGS $TEST) >/dev/null 2>&1; then
-  ac_cv_prog_java_works=yes
-else
-  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-  cat $JAVA_TEST >&AS_MESSAGE_LOG_FD
-  AC_MSG_ERROR(The Java VM $JAVA failed (see config.log, check the CLASSPATH?))
-fi
-rm -fr $JAVA_TEST $CLASS_TEST Test.uue
-])
-AC_PROVIDE([$0])dnl
-]
-)
diff --git a/vpp-japi/m4/ax_prog_javac.m4 b/vpp-japi/m4/ax_prog_javac.m4
deleted file mode 100644
index d061243c..00000000
--- a/vpp-japi/m4/ax_prog_javac.m4
+++ /dev/null
@@ -1,79 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_prog_javac.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAVAC
-#
-# DESCRIPTION
-#
-#   AX_PROG_JAVAC tests an existing Java compiler. It uses the environment
-#   variable JAVAC then tests in sequence various common Java compilers. For
-#   political reasons, it starts with the free ones.
-#
-#   If you want to force a specific compiler:
-#
-#   - at the configure.in level, set JAVAC=yourcompiler before calling
-#   AX_PROG_JAVAC
-#
-#   - at the configure level, setenv JAVAC
-#
-#   You can use the JAVAC variable in your Makefile.in, with @JAVAC@.
-#
-#   *Warning*: its success or failure can depend on a proper setting of the
-#   CLASSPATH env. variable.
-#
-#   TODO: allow to exclude compilers (rationale: most Java programs cannot
-#   compile with some compilers like guavac).
-#
-#   Note: This is part of the set of autoconf M4 macros for Java programs.
-#   It is VERY IMPORTANT that you download the whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission. The
-#   general documentation, as well as the sample configure.in, is included
-#   in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 7
-
-AU_ALIAS([AC_PROG_JAVAC], [AX_PROG_JAVAC])
-AC_DEFUN([AX_PROG_JAVAC],[
-m4_define([m4_ax_prog_javac_list],["gcj -C" guavac jikes javac])dnl
-AS_IF([test "x$JAVAPREFIX" = x],
-      [test "x$JAVAC" = x && AC_CHECK_PROGS([JAVAC], [m4_ax_prog_javac_list])],
-      [test "x$JAVAC" = x && AC_CHECK_PROGS([JAVAC], [m4_ax_prog_javac_list], [], [$JAVAPREFIX/bin])])
-m4_undefine([m4_ax_prog_javac_list])dnl
-test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH])
-AX_PROG_JAVAC_WORKS
-AC_PROVIDE([$0])dnl
-])
diff --git a/vpp-japi/m4/ax_prog_javac_works.m4 b/vpp-japi/m4/ax_prog_javac_works.m4
deleted file mode 100644
index 7dfa1e37..00000000
--- a/vpp-japi/m4/ax_prog_javac_works.m4
+++ /dev/null
@@ -1,72 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_prog_javac_works.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAVAC_WORKS
-#
-# DESCRIPTION
-#
-#   Internal use ONLY.
-#
-#   Note: This is part of the set of autoconf M4 macros for Java programs.
-#   It is VERY IMPORTANT that you download the whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission. The
-#   general documentation, as well as the sample configure.in, is included
-#   in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 6
-
-AU_ALIAS([AC_PROG_JAVAC_WORKS], [AX_PROG_JAVAC_WORKS])
-AC_DEFUN([AX_PROG_JAVAC_WORKS],[
-AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [
-JAVA_TEST=Test.java
-CLASS_TEST=Test.class
-cat << \EOF > $JAVA_TEST
-/* [#]line __oline__ "configure" */
-public class Test {
-}
-EOF
-if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) >/dev/null 2>&1; then
-  ac_cv_prog_javac_works=yes
-else
-  AC_MSG_ERROR([The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)])
-  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-  cat $JAVA_TEST >&AS_MESSAGE_LOG_FD
-fi
-rm -f $JAVA_TEST $CLASS_TEST
-])
-AC_PROVIDE([$0])dnl
-])
diff --git a/vpp-japi/m4/ax_prog_javadoc.m4 b/vpp-japi/m4/ax_prog_javadoc.m4
deleted file mode 100644
index bcb6045a..00000000
--- a/vpp-japi/m4/ax_prog_javadoc.m4
+++ /dev/null
@@ -1,50 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_prog_javadoc.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAVADOC
-#
-# DESCRIPTION
-#
-#   AX_PROG_JAVADOC tests for an existing javadoc generator. It uses the
-#   environment variable JAVADOC then tests in sequence various common
-#   javadoc generator.
-#
-#   If you want to force a specific compiler:
-#
-#   - at the configure.in level, set JAVADOC=yourgenerator before calling
-#   AX_PROG_JAVADOC
-#
-#   - at the configure level, setenv JAVADOC
-#
-#   You can use the JAVADOC variable in your Makefile.in, with @JAVADOC@.
-#
-#   Note: This macro depends on the autoconf M4 macros for Java programs. It
-#   is VERY IMPORTANT that you download that whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission.
-#
-#   The general documentation of those macros, as well as the sample
-#   configure.in, is included in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Egon Willighagen <e.willighagen@science.ru.nl>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 8
-
-AU_ALIAS([AC_PROG_JAVADOC], [AX_PROG_JAVADOC])
-AC_DEFUN([AX_PROG_JAVADOC],[
-AS_IF([test "x$JAVAPREFIX" = x],
-      [test "x$JAVADOC" = x && AC_CHECK_PROGS([JAVADOC], [javadoc])],
-      [test "x$JAVADOC" = x && AC_CHECK_PROGS([JAVADOC], [javadoc], [], [$JAVAPREFIX/bin])])
-test "x$JAVADOC" = x && AC_MSG_ERROR([no acceptable javadoc generator found in \$PATH])
-AC_PROVIDE([$0])dnl
-])
diff --git a/vpp-japi/m4/ax_prog_javah.m4 b/vpp-japi/m4/ax_prog_javah.m4
deleted file mode 100644
index cefc616d..00000000
--- a/vpp-japi/m4/ax_prog_javah.m4
+++ /dev/null
@@ -1,64 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_prog_javah.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAVAH
-#
-# DESCRIPTION
-#
-#   AX_PROG_JAVAH tests the availability of the javah header generator and
-#   looks for the jni.h header file. If available, JAVAH is set to the full
-#   path of javah and CPPFLAGS is updated accordingly.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Luc Maisonobe <luc@spaceroots.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 8
-
-AU_ALIAS([AC_PROG_JAVAH], [AX_PROG_JAVAH])
-AC_DEFUN([AX_PROG_JAVAH],[
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CPP])dnl
-AC_PATH_PROG(JAVAH,javah)
-AS_IF([test -n "$ac_cv_path_JAVAH"],
-      [
-        AC_TRY_CPP([#include <jni.h>],,[
-        ac_save_CPPFLAGS="$CPPFLAGS"
-		_ACJAVAH_FOLLOW_SYMLINKS("$ac_cv_path_JAVAH")
-        ax_prog_javah_bin_dir=`AS_DIRNAME([$_ACJAVAH_FOLLOWED])`
-        ac_dir="`AS_DIRNAME([$ax_prog_javah_bin_dir])`/include"
-        AS_CASE([$build_os],
-                [cygwin*],
-                [ac_machdep=win32],
-                [ac_machdep=`AS_ECHO($build_os) | sed 's,[[-0-9]].*,,'`])
-        CPPFLAGS="$ac_save_CPPFLAGS -I$ac_dir -I$ac_dir/$ac_machdep"
-        AC_TRY_CPP([#include <jni.h>],
-                   ac_save_CPPFLAGS="$CPPFLAGS",
-                   AC_MSG_WARN([unable to include <jni.h>]))
-        CPPFLAGS="$ac_save_CPPFLAGS"])
-      ])
-])
-
-AC_DEFUN([_ACJAVAH_FOLLOW_SYMLINKS],[
-# find the include directory relative to the javac executable
-_cur="$1"
-while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do
-        AC_MSG_CHECKING([symlink for $_cur])
-        _slink=`ls -ld "$_cur" | sed 's/.* -> //'`
-        case "$_slink" in
-        /*) _cur="$_slink";;
-        # 'X' avoids triggering unwanted echo options.
-        *) _cur=`echo "X$_cur" | sed -e 's/^X//' -e 's:[[^/]]*$::'`"$_slink";;
-        esac
-        AC_MSG_RESULT([$_cur])
-done
-_ACJAVAH_FOLLOWED="$_cur"
-])
diff --git a/vpp-japi/m4/ax_try_compile_java.m4 b/vpp-japi/m4/ax_try_compile_java.m4
deleted file mode 100644
index a8ed6b2a..00000000
--- a/vpp-japi/m4/ax_try_compile_java.m4
+++ /dev/null
@@ -1,55 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_try_compile_java.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_TRY_COMPILE_JAVA
-#
-# DESCRIPTION
-#
-#   AX_TRY_COMPILE_JAVA attempt to compile user given source.
-#
-#   *Warning*: its success or failure can depend on a proper setting of the
-#   CLASSPATH env. variable.
-#
-#   Note: This is part of the set of autoconf M4 macros for Java programs.
-#   It is VERY IMPORTANT that you download the whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission. The
-#   general documentation, as well as the sample configure.in, is included
-#   in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Devin Weaver <ktohg@tritarget.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 8
-
-AU_ALIAS([AC_TRY_COMPILE_JAVA], [AX_TRY_COMPILE_JAVA])
-AC_DEFUN([AX_TRY_COMPILE_JAVA],[
-AC_REQUIRE([AX_PROG_JAVAC])dnl
-cat << \EOF > Test.java
-/* [#]line __oline__ "configure" */
-ifelse([$1], , , [import $1;])
-public class Test {
-[$2]
-}
-EOF
-if AC_TRY_COMMAND($JAVAC $JAVACFLAGS Test.java) && test -s Test.class
-then
-dnl Don't remove the temporary files here, so they can be examined.
-  ifelse([$3], , :, [$3])
-else
-  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-  cat Test.java >&AS_MESSAGE_LOG_FD
-ifelse([$4], , , [  rm -fr Test.java Test.class
-  $4
-])dnl
-fi
-rm -fr Test.java Test.class])
diff --git a/vpp-japi/m4/ax_try_run_java.m4 b/vpp-japi/m4/ax_try_run_java.m4
deleted file mode 100644
index c680f03f..00000000
--- a/vpp-japi/m4/ax_try_run_java.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_try_run_java.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_TRY_RUN_JAVA
-#
-# DESCRIPTION
-#
-#   AX_TRY_RUN_JAVA attempt to compile and run user given source.
-#
-#   *Warning*: its success or failure can depend on a proper setting of the
-#   CLASSPATH env. variable.
-#
-#   Note: This is part of the set of autoconf M4 macros for Java programs.
-#   It is VERY IMPORTANT that you download the whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission. The
-#   general documentation, as well as the sample configure.in, is included
-#   in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Devin Weaver <ktohg@tritarget.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 2
-
-AU_ALIAS([AC_TRY_RUN_JAVA], [AX_TRY_RUN_JAVA])
-AC_DEFUN([AX_TRY_RUN_JAVA],[
-AC_REQUIRE([AX_PROG_JAVAC])dnl
-AC_REQUIRE([AX_PROG_JAVA])dnl
-cat << \EOF > Test.java
-/* [#]line __oline__ "configure" */
-ifelse([$1], , , [include $1;])
-public class Test {
-[$2]
-}
-EOF
-if AC_TRY_COMMAND($JAVAC $JAVACFLAGS Test.java) && test -s Test.class && ($JAVA $JAVAFLAGS Test; exit) 2>/dev/null
-then
-dnl Don't remove the temporary files here, so they can be examined.
-  ifelse([$3], , :, [$3])
-else
-  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-  cat Test.java >&AS_MESSAGE_LOG_FD
-ifelse([$4], , , [  rm -fr Test.java Test.class
-  $4
-])dnl
-fi
-rm -fr Test.java Test.class])
diff --git a/vpp/api/api.c b/vpp/api/api.c
index b47214f0..cf2b8f44 100644
--- a/vpp/api/api.c
+++ b/vpp/api/api.c
@@ -5365,8 +5365,8 @@ vl_api_map_domain_dump_t_handler
   }
 
   pool_foreach(d, mm->domains, ({
+    /* Make sure every field is initiated (or don't skip the memset()) */
     rmp = vl_msg_api_alloc (sizeof (*rmp));
-    memset (rmp, 0, sizeof (*rmp));
     rmp->_vl_msg_id = ntohs(VL_API_MAP_DOMAIN_DETAILS);
     rmp->domain_index = htonl(d - mm->domains);
     rmp->ea_bits_len = d->ea_bits_len;
@@ -5462,15 +5462,15 @@ vl_api_map_summary_stats_t_handler (
 
     map_domain_counter_unlock (mm);
 
-    /* Note: in HOST byte order! */
-    rmp->total_pkts[MAP_DOMAIN_COUNTER_RX] = total_pkts[MAP_DOMAIN_COUNTER_RX];
-    rmp->total_bytes[MAP_DOMAIN_COUNTER_RX] = total_bytes[MAP_DOMAIN_COUNTER_RX];
-    rmp->total_pkts[MAP_DOMAIN_COUNTER_TX] = total_pkts[MAP_DOMAIN_COUNTER_TX];
-    rmp->total_bytes[MAP_DOMAIN_COUNTER_TX] = total_bytes[MAP_DOMAIN_COUNTER_TX];
-    rmp->total_bindings = pool_elts(mm->domains);
+    /* Note: in network byte order! */
+    rmp->total_pkts[MAP_DOMAIN_COUNTER_RX] = clib_host_to_net_u64(total_pkts[MAP_DOMAIN_COUNTER_RX]);
+    rmp->total_bytes[MAP_DOMAIN_COUNTER_RX] = clib_host_to_net_u64(total_bytes[MAP_DOMAIN_COUNTER_RX]);
+    rmp->total_pkts[MAP_DOMAIN_COUNTER_TX] = clib_host_to_net_u64(total_pkts[MAP_DOMAIN_COUNTER_TX]);
+    rmp->total_bytes[MAP_DOMAIN_COUNTER_TX] = clib_host_to_net_u64(total_bytes[MAP_DOMAIN_COUNTER_TX]);
+    rmp->total_bindings = clib_host_to_net_u64(pool_elts(mm->domains));
     rmp->total_ip4_fragments = 0; // Not yet implemented. Should be a simple counter.
-    rmp->total_security_check[MAP_DOMAIN_COUNTER_TX] = map_error_counter_get(ip4_map_node.index, MAP_ERROR_ENCAP_SEC_CHECK);
-    rmp->total_security_check[MAP_DOMAIN_COUNTER_RX] = map_error_counter_get(ip4_map_node.index, MAP_ERROR_DECAP_SEC_CHECK);
+    rmp->total_security_check[MAP_DOMAIN_COUNTER_TX] = clib_host_to_net_u64(map_error_counter_get(ip4_map_node.index, MAP_ERROR_ENCAP_SEC_CHECK));
+    rmp->total_security_check[MAP_DOMAIN_COUNTER_RX] = clib_host_to_net_u64(map_error_counter_get(ip4_map_node.index, MAP_ERROR_DECAP_SEC_CHECK));
 
     vl_msg_api_send_shmem(q, (u8 *)&rmp);
 }
diff --git a/vppapigen/lex.c b/vppapigen/lex.c
index b41eb5ec..f1d49a87 100644
--- a/vppapigen/lex.c
+++ b/vppapigen/lex.c
@@ -28,7 +28,7 @@
 #include "node.h"
 #include "gram.h"
 
-FILE *ifp, *ofp, *javafp, *jnifp;
+FILE *ifp, *ofp, *javafp, *jnifp, *pythonfp;
 char *java_class = "vppApi";
 char *vlib_app_name = "vpp";
 int dump_tree;
@@ -260,6 +260,7 @@ int main (int argc, char **argv)
     char *ofile=0;
     char *jofile=0;
     char *jnifile=0;
+    char *pythonfile=0;
     char *show_name=0;
 
     while (curarg < argc) {
@@ -364,6 +365,23 @@ int main (int argc, char **argv)
             }
             continue;
         }
+        if (!strncmp (argv [curarg], "--python", 8)) {
+            curarg++;
+            if (curarg < argc) {
+                pythonfp = fopen (argv[curarg], "w");
+                if (pythonfp == NULL) {
+                    fprintf (stderr, "Couldn't open python output file %s\n",
+                         argv[curarg]);
+                    exit (1);
+                }
+                pythonfile = argv[curarg];
+                curarg++;
+            } else {
+                fprintf(stderr, "Missing filename after --python\n");
+                exit(1);
+            }
+            continue;
+        }
         if (!strncmp (argv [curarg], "--app", 4)) {
             curarg++;
             if (curarg < argc) {
@@ -399,6 +417,9 @@ int main (int argc, char **argv)
     if (jnifp == NULL) {
         jnifile = 0;
     }
+    if (pythonfp == NULL) {
+        pythonfile = 0;
+    }
     if (ifp == NULL) {
         fprintf(stderr, "No input file specified...\n");
         exit(1);
@@ -424,6 +445,10 @@ int main (int argc, char **argv)
             printf ("Java native bindings written to %s\n", jnifile);
             fclose (jnifp);
         }
+        if (pythonfile) {
+            printf ("Python bindings written to %s\n", pythonfile);
+            fclose (pythonfp);
+        }
     }
     else {
         fclose (ifp);
@@ -441,6 +466,10 @@ int main (int argc, char **argv)
             printf ("Removing %s\n", jnifile);
             unlink (jnifile);
         }
+        if (pythonfile) {
+            printf ("Removing %s\n", pythonfile);
+            unlink (pythonfile);
+        }
         exit (1);
     }
     exit (0);
@@ -452,7 +481,7 @@ int main (int argc, char **argv)
 static void usage (char *progname)
 {
     fprintf (stderr, 
-             "usage: %s --input <filename> [--output <filename>]\n%s",
+             "usage: %s --input <filename> [--output <filename>] [--python <filename>]\n%s",
              progname,
              "          [--yydebug] [--dump-tree]\n");
     exit (1);
diff --git a/vppapigen/node.c b/vppapigen/node.c
index 3a32abec..ffe5d77e 100644
--- a/vppapigen/node.c
+++ b/vppapigen/node.c
@@ -34,6 +34,7 @@
 FILE *ofp;
 FILE *javafp;
 FILE *jnifp;
+FILE *pythonfp;
 char *java_class;
 time_t starttime;
 char *vlib_app_name;
@@ -161,6 +162,12 @@ void primtype_recursive_generate(node_t *this, enum passid which, FILE *ofp,
         current_java_methodfun = vftp->java_method_function;
         break;
 
+    case PYTHON_PASS:
+        fputs("('", pythonfp);
+        fputs((char *)type_name, pythonfp);
+        fputs("', ", pythonfp);
+        break;
+
     default:
         fprintf(stderr, "primtype_recursive_generate: unimp pass %d\n", which);
         break;
@@ -876,6 +883,20 @@ void node_define_generate (node_t *this, enum passid which, FILE *fp)
         fprintf (fp, "}\n\n");
         break;
 
+    case PYTHON_PASS:
+      fprintf(fp, "('%s',\n", CDATA0);
+        child = this->deeper;
+        indent += 4;
+        while (child) {
+            node_vft_t *vftp = the_vft[child->type];
+            indent_me(fp);
+            vftp->generate(child, which, fp);
+            child = child->peer;
+        }
+        indent -= 4;
+        fprintf(fp, "),\n\n");
+        break;
+
     default:
         fprintf(stderr, "node_define_generate: unimp pass %d\n", which);
         break;
@@ -1032,6 +1053,9 @@ void node_scalar_generate (node_t *this, enum passid which, FILE *fp)
             }
         }
         break;
+    case PYTHON_PASS:
+        fprintf(fp, "'%s'),\n", CDATA0);
+        break;
 
     default:
         fprintf(stderr, "node_scalar_generate: unimp pass %d\n", which);
@@ -1136,6 +1160,9 @@ void node_vector_generate (node_t *this, enum passid which, FILE *fp)
         indent_me(fp);
         fprintf(fp, "}\n");
         break;
+    case PYTHON_PASS:
+        fprintf(fp, "'%s', '%d'),\n", CDATA0, IDATA1);
+        break;
 
     default:
         fprintf(stderr, "node_vector_generate: unimp pass %d\n", which);
@@ -1216,6 +1243,14 @@ void node_complex_generate (node_t *this, enum passid which, FILE *fp)
         fprintf(fp, "%s_endian(&a->%s%s);\n", 
                 CDATA0, union_prefix, member_name);
         break;
+    case PYTHON_PASS:
+        fprintf(fp, "('%s',", CDATA0);
+        deeper = this->deeper;
+        if (deeper) {
+            vftp = the_vft[deeper->type];
+            vftp->generate(deeper, which, fp);
+        }
+        break;
 
     default:
         fprintf(stderr, "node_complex_generate unimp pass %d...\n", which);
@@ -1767,14 +1802,14 @@ void add_msg_ids(YYSTYPE a1)
     while (np) {
         if (np->type == NODE_DEFINE) {
             if (!(np->flags & NODE_FLAG_TYPEONLY)) {
-                /* add the parse tree for "u16 _vl_msg_id" */
+	        /* add the parse tree for "u16 _vl_msg_id" */
                 new_u16 = make_node(NODE_U16);
                 new_u16->peer = np->deeper;
                 np->deeper = new_u16;
                 new_vbl = make_node(NODE_SCALAR);
                 new_vbl->data[0] = sxerox("_vl_msg_id");
                 new_u16->deeper = new_vbl;
-            }
+	    }
         }
         np = np->peer;
     }
@@ -1988,6 +2023,23 @@ void generate_jni_bottom_boilerplate(FILE *fp)
     fputs (hookup_boilerplate, fp);
 }
 
+void generate_python (YYSTYPE a1, FILE *fp)
+{
+  node_t *np = (node_t *)a1;
+  node_vft_t *vftp;
+  fprintf (fp, "vppapidef = [\n");
+  /* Walk the top-level node-list */
+  while (np) {
+    if (np->type == NODE_DEFINE && !(np->flags & NODE_FLAG_TYPEONLY)) {
+      /* Yeah, this is pedantic */
+      vftp = the_vft[np->type];
+      vftp->generate(np, PYTHON_PASS, fp);
+    }
+    np = np->peer;
+  }
+  fprintf (fp, "\n]\n");
+}
+
 void generate(YYSTYPE a1)
 {
     if (dump_tree) {
@@ -2020,4 +2072,7 @@ void generate(YYSTYPE a1)
         generate_jni_code(a1, jnifp);
         generate_jni_bottom_boilerplate(jnifp);
     }
+    if (pythonfp) {
+      generate_python(a1, pythonfp);
+    }
 }
diff --git a/vppapigen/node.h b/vppapigen/node.h
index 670b5aff..1f5a153c 100644
--- a/vppapigen/node.h
+++ b/vppapigen/node.h
@@ -63,6 +63,7 @@ enum passid {
     PRINTFUN_PASS,
     JAVA_METHOD_PASS,
     JAVA_JNI_PASS,
+    PYTHON_PASS,
 };
 
 extern void *make_node (enum node_subclass type);
-- 
cgit 1.2.3-korg


From 0777915b2a98ea6353e6c0951c3aa195d4751d35 Mon Sep 17 00:00:00 2001
From: Srivatsa Sangli <srivrama@cisco.com>
Date: Fri, 15 Apr 2016 13:59:00 -0700
Subject: ubuntu 16.04 build support. Supporting systemd with vpp.service
 files.

Incorporating review comments : modified debian/control dependencies

Change-Id: Ib2fe85d81eb7f1803ef8f54294c7c18cd07c61ba
Signed-off-by: Srivatsa Sangli <srivrama@cisco.com>
---
 Makefile                                   |  2 +-
 build-root/deb/debian/control              |  2 +-
 build-root/deb/debian/rules                |  2 +-
 build-root/deb/debian/vpp.service          | 14 +++++++++++
 build-root/vagrant/bootstrap.ubuntu1604.sh | 39 ++++++++++++++++++++++++++++++
 5 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 build-root/deb/debian/vpp.service
 create mode 100644 build-root/vagrant/bootstrap.ubuntu1604.sh

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 68652836..fd1d0ff9 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ MINIMAL_STARTUP_CONF="unix { interactive }"
 GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
-DEB_DEPENDS += debhelper dkms default-jdk git libtool libganglia1-dev libapr1-dev
+DEB_DEPENDS += debhelper dkms default-jdk git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
 
 RPM_DEPENDS_GROUPS = 'Development Tools'
diff --git a/build-root/deb/debian/control b/build-root/deb/debian/control
index cf22fd02..97464e42 100644
--- a/build-root/deb/debian/control
+++ b/build-root/deb/debian/control
@@ -2,7 +2,7 @@ Source: vpp
 Section: net
 Priority: extra
 Maintainer: Cisco OpenVPP Packaging Team <bogus.address@cisco.com>
-Build-Depends: debhelper (>= 9), dkms
+Build-Depends: debhelper (>= 9), dkms, dh-systemd
 Standards-Version: 3.9.4
 
 Package: vpp
diff --git a/build-root/deb/debian/rules b/build-root/deb/debian/rules
index bcee0121..b5afbdb6 100755
--- a/build-root/deb/debian/rules
+++ b/build-root/deb/debian/rules
@@ -18,7 +18,7 @@ include /usr/share/dpkg/default.mk
 
 # main packaging script based on dh7 syntax
 %:
-	dh $@ --with dkms
+	dh $@ --with dkms --with systemd
 
 override_dh_install:
 	dh_install --exclude .git
diff --git a/build-root/deb/debian/vpp.service b/build-root/deb/debian/vpp.service
new file mode 100644
index 00000000..a2849296
--- /dev/null
+++ b/build-root/deb/debian/vpp.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=vector packet processing engine
+After=network.target
+
+[Service]
+Type=simple
+ExecStartPre=-/bin/rm -f /dev/shm/* 
+ExecStartPre=-/sbin/modprobe igb_uio
+ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf
+ExecStopPost=/bin/rm -f /dev/shm/*
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/build-root/vagrant/bootstrap.ubuntu1604.sh b/build-root/vagrant/bootstrap.ubuntu1604.sh
new file mode 100644
index 00000000..2e607f1e
--- /dev/null
+++ b/build-root/vagrant/bootstrap.ubuntu1604.sh
@@ -0,0 +1,39 @@
+# Fix grub-pc on Virtualbox with Ubuntu
+export DEBIAN_FRONTEND=noninteractive
+
+# Standard update + upgrade dance
+apt-get update
+apt-get upgrade -y
+
+# Fix the silly notion that /bin/sh should point to dash by pointing it to bash
+
+sudo update-alternatives --install /bin/sh sh /bin/bash 100
+
+cd /vpp
+sudo -H -u vagrant make install-dep
+
+# Install useful but non-mandatory tools
+apt-get install -y emacs  git-review gdb gdbserver
+
+sudo -H -u vagrant make bootstrap
+sudo -H -u vagrant make pkg-deb
+(cd build-root/;dpkg -i *.deb)
+
+# Capture all the interface IPs, in case we need them later
+ifconfig -a > ~vagrant/ifconfiga
+chown vagrant:vagrant ~vagrant/ifconfiga
+
+# Disable all ethernet interfaces other than the default route
+# interface so VPP will use those interfaces.  The VPP auto-blacklist
+# algorithm prevents the use of any physical interface contained in the
+# routing table (i.e. "route --inet --inet6") preventing the theft of
+# the management ethernet interface by VPP from the kernel.
+for intf in $(ls /sys/class/net) ; do
+    if [ -d /sys/class/net/$intf/device ] && 
+        [ "$(route --inet --inet6 | grep default | grep $intf)" == "" ] ; then
+        ifconfig $intf down
+    fi
+done
+
+systemctl start vpp
+cat /vagrant/README
-- 
cgit 1.2.3-korg


From 6b1d7c55d694fc6c0a262d6e1279fe207164e1b5 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Tue, 26 Apr 2016 18:19:47 +0200
Subject: Make automake silent rules default

Change-Id: Ia504ccdac1deac20f20cf7fb76f78b2d8c505474
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                               | 3 +--
 build-root/scripts/make-plugin-toolkit | 2 +-
 svm/configure.ac                       | 2 +-
 vlib-api/configure.ac                  | 2 +-
 vlib/configure.ac                      | 2 +-
 vnet/configure.ac                      | 2 +-
 vpp-api/configure.ac                   | 2 +-
 vpp-api/java/configure.ac              | 2 +-
 vpp/configure.ac                       | 2 +-
 vppinfra/configure.ac                  | 2 +-
 10 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index fd1d0ff9..a222567e 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,6 @@
 WS_ROOT=$(CURDIR)
 BR=$(WS_ROOT)/build-root
 CCACHE_DIR?=$(BR)/.ccache
-V?=0
 GDB?=gdb
 PLATFORM?=vpp
 
@@ -119,7 +118,7 @@ else
 endif
 
 define make
-	@make -C $(BR) V=$(V) PLATFORM=$(PLATFORM) TAG=$(1) $(2)
+	@make -C $(BR) PLATFORM=$(PLATFORM) TAG=$(1) $(2)
 endef
 
 build: $(BR)/.bootstrap.ok
diff --git a/build-root/scripts/make-plugin-toolkit b/build-root/scripts/make-plugin-toolkit
index 14e9eda2..e1d6fcfb 100755
--- a/build-root/scripts/make-plugin-toolkit
+++ b/build-root/scripts/make-plugin-toolkit
@@ -26,7 +26,7 @@ make PLATFORM=vpp sample-plugin-find-source
 
 make PLATFORM=vpp TAG=vpp wipe-all
 echo Build vpp forwarder production package
-make PLATFORM=vpp TAG=vpp V=0 strip_sumbols=yes install-packages
+make PLATFORM=vpp TAG=vpp strip_sumbols=yes install-packages
 
 tmp_dir="`mktemp -d /tmp/plugin-XXXXXX`"
 trap "rm -rf $tmp_dir" err 
diff --git a/svm/configure.ac b/svm/configure.ac
index 8db58214..b3948176 100644
--- a/svm/configure.ac
+++ b/svm/configure.ac
@@ -2,7 +2,7 @@ AC_INIT(svm, 1.0)
 LT_INIT
 AM_INIT_AUTOMAKE
 
-AM_SILENT_RULES
+AM_SILENT_RULES([yes])
 
 AM_PROG_AS
 AC_PROG_CC_C_O
diff --git a/vlib-api/configure.ac b/vlib-api/configure.ac
index b5f3157a..ab21f894 100644
--- a/vlib-api/configure.ac
+++ b/vlib-api/configure.ac
@@ -2,7 +2,7 @@ AC_INIT(vlibapi, 1.0)
 LT_INIT
 AM_INIT_AUTOMAKE
 
-AM_SILENT_RULES
+AM_SILENT_RULES([yes])
 
 AC_PROG_CC
 AM_PROG_CC_C_O
diff --git a/vlib/configure.ac b/vlib/configure.ac
index 1a45d33e..4f32a21c 100644
--- a/vlib/configure.ac
+++ b/vlib/configure.ac
@@ -1,7 +1,7 @@
 AC_INIT(vlib, 1.1)
 LT_INIT
 AM_INIT_AUTOMAKE
-AM_SILENT_RULES
+AM_SILENT_RULES([yes])
 
 AC_PROG_CC
 AM_PROG_CC_C_O
diff --git a/vnet/configure.ac b/vnet/configure.ac
index bc1922b9..8f8b91f7 100644
--- a/vnet/configure.ac
+++ b/vnet/configure.ac
@@ -3,7 +3,7 @@ AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADERS(config/config.h)
 LT_INIT
 AM_INIT_AUTOMAKE
-AM_SILENT_RULES
+AM_SILENT_RULES([yes])
 
 AC_PROG_CC
 AM_PROG_CC_C_O
diff --git a/vpp-api/configure.ac b/vpp-api/configure.ac
index 31ee6656..9f8c3ed3 100644
--- a/vpp-api/configure.ac
+++ b/vpp-api/configure.ac
@@ -3,7 +3,7 @@ LT_INIT
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SUBDIRS([java])
 AM_INIT_AUTOMAKE
-AM_SILENT_RULES
+AM_SILENT_RULES([yes])
 
 AM_PROG_AS
 AC_PROG_CC
diff --git a/vpp-api/java/configure.ac b/vpp-api/java/configure.ac
index 1607061d..02f25702 100644
--- a/vpp-api/java/configure.ac
+++ b/vpp-api/java/configure.ac
@@ -2,7 +2,7 @@ AC_INIT(vpp-japi, 1.0.0)
 LT_INIT
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
-AM_SILENT_RULES
+AM_SILENT_RULES([yes])
 
 AM_PROG_AS
 AC_PROG_CC
diff --git a/vpp/configure.ac b/vpp/configure.ac
index 5b72eea6..3eb7bb7c 100644
--- a/vpp/configure.ac
+++ b/vpp/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT(vpp, 1.1)
 AM_INIT_AUTOMAKE
-AM_SILENT_RULES
+AM_SILENT_RULES([yes])
 
 AM_PROG_AS
 AC_PROG_CC
diff --git a/vppinfra/configure.ac b/vppinfra/configure.ac
index 712186af..88720f71 100644
--- a/vppinfra/configure.ac
+++ b/vppinfra/configure.ac
@@ -5,7 +5,7 @@ AC_CONFIG_HEADERS(config/config.h)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([gnu no-dist-gzip dist-bzip2])
-AM_SILENT_RULES
+AM_SILENT_RULES([yes])
 
 # Checks for programs.
 AC_PROG_CC
-- 
cgit 1.2.3-korg


From 473bf23be85e861f95d69992b09b0b7d7a6efa2e Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Wed, 27 Apr 2016 16:19:03 -0400
Subject: Update Makefile to add debuginfo RPMs for gdb

Change-Id: I29d8cc839565999e2fabe09d29c40e09aa1ea784
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a222567e..caf93dda 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ DEB_DEPENDS += debhelper dkms default-jdk git libtool libganglia1-dev libapr1-de
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
 
 RPM_DEPENDS_GROUPS = 'Development Tools'
-RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel
+RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
@@ -113,6 +113,7 @@ else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo yum groupinstall -y $(RPM_DEPENDS_GROUPS)
 	@sudo yum install -y $(RPM_DEPENDS)
 	@sudo yum install -y --enablerepo=epel $(EPEL_DEPENDS)
+	@sudo debuginfo-install glibc-2.17-106.el7_2.4.x86_64 openssl-libs-1.0.1e-51.el7_2.4.x86_64 zlib-1.2.7-15.el7.x86_64
 else
 	$(error "This option currently works only on Ubuntu or Centos systems")
 endif
-- 
cgit 1.2.3-korg


From 60c63c7b537260c88225848bd42f0c34a618671d Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Tue, 26 Apr 2016 08:01:31 +0200
Subject: VPP-8: Set java-8 for JNI

Change-Id: Ia81713a72e3c48b1d97bbf3f20a908bbc4ebd3b1
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 Makefile                       | 15 ++++++++++++++-
 build-data/packages/vpp-api.mk |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index caf93dda..3aeea8fe 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ MINIMAL_STARTUP_CONF="unix { interactive }"
 GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
-DEB_DEPENDS += debhelper dkms default-jdk git libtool libganglia1-dev libapr1-dev dh-systemd
+DEB_DEPENDS += debhelper dkms openjdk-8-jdk git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
 
 RPM_DEPENDS_GROUPS = 'Development Tools'
@@ -77,8 +77,19 @@ help:
 	@echo " PLATFORM     = $(PLATFORM)"
 	@echo " DPDK_VERSION = $(DPDK_VERSION)"
 
+# openjdk-8-jdk is not available in 14.04 repos by default
+define use_ppa_for_jdk8
+if [ "$(shell lsb_release -r | awk '{print $$2}')"=="14.04" ]; then \
+	sudo apt install software-properties-common; \
+	sudo add-apt-repository -y ppa:openjdk-r/ppa; \
+	sudo apt update; \
+fi;
+endef
+
 $(BR)/.bootstrap.ok:
 ifeq ("$(shell lsb_release -si)", "Ubuntu")
+	$(use_ppa_for_jdk8)
+
 	@MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
 	if [ -n "$$MISSING" ] ; then \
 	  echo "\nPlease install missing packages: \n$$MISSING\n" ; \
@@ -108,6 +119,7 @@ bootstrap: $(BR)/.bootstrap.ok
 
 install-dep:
 ifeq ("$(shell lsb_release -si)", "Ubuntu")
+	$(use_ppa_for_jdk8)
 	@sudo apt-get -y install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo yum groupinstall -y $(RPM_DEPENDS_GROUPS)
@@ -188,3 +200,4 @@ ctags: ctags.files
 
 cscope: cscope.files
 	@cscope -b -q -v
+
diff --git a/build-data/packages/vpp-api.mk b/build-data/packages/vpp-api.mk
index f1841648..4937023a 100644
--- a/build-data/packages/vpp-api.mk
+++ b/build-data/packages/vpp-api.mk
@@ -20,4 +20,4 @@ vpp-api_LDFLAGS = $(call installed_libs_fn,	\
 	vlib					\
 	vlib-api)
 
-vpp-api_CPPFLAGS += -I/usr/lib/jvm/java-7-openjdk-amd64/include
+vpp-api_CPPFLAGS += -I/usr/lib/jvm/java-8-openjdk-amd64/include
-- 
cgit 1.2.3-korg


From 7226b84d7418fcbb9b8dd42045aa7a5f18da9679 Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Thu, 28 Apr 2016 18:23:43 -0400
Subject: Fix for java8 releated breakage in make install-dep

Change-Id: I17ae3c7031a820746a3785a35b440e17430d0ac5
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 3aeea8fe..53930928 100644
--- a/Makefile
+++ b/Makefile
@@ -80,9 +80,9 @@ help:
 # openjdk-8-jdk is not available in 14.04 repos by default
 define use_ppa_for_jdk8
 if [ "$(shell lsb_release -r | awk '{print $$2}')"=="14.04" ]; then \
-	sudo apt install software-properties-common; \
+	sudo apt-get -y install software-properties-common; \
 	sudo add-apt-repository -y ppa:openjdk-r/ppa; \
-	sudo apt update; \
+	sudo apt-get update; \
 fi;
 endef
 
-- 
cgit 1.2.3-korg


From 45a42b5d7f6940fbd93d6b3413c2d943e497a0b1 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Thu, 28 Apr 2016 12:29:33 +0200
Subject: HONEYCOMB-10: jVpp - the new java API. Java code generation

The old japi has two main drawbacks:

* it is not fully generated (requres manual coding for
every new api call that returns data other thanstatus code)

* it is not asynchronous from Java perspective (requires
active wait loops - big overhead due to JNI boundary being
crossed lots of times).

The new api is lightweight (fully generated except for connect,
disconenct and ping) and truly asynchronous (uses callbacks,
utilities that offer java.util.concurrent.Future interface
are also provided).

Change-Id: I531080ef651e8a74f19210490c71d161221ab600
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 Makefile                                           |   6 +
 vpp-api/java/jvpp/gen/callback_gen.py              |  89 ++++++++
 vpp-api/java/jvpp/gen/dto_gen.py                   | 143 +++++++++++++
 vpp-api/java/jvpp/gen/jvpp_callback_facade_gen.py  | 236 +++++++++++++++++++++
 vpp-api/java/jvpp/gen/jvpp_future_facade_gen.py    | 184 ++++++++++++++++
 vpp-api/java/jvpp/gen/jvpp_impl_gen.py             | 140 ++++++++++++
 vpp-api/java/jvpp/gen/util.py                      | 173 +++++++++++++++
 .../java/jvpp/org/openvpp/jvpp/VppConnection.java  |  37 ++++
 .../jvpp/org/openvpp/jvpp/VppJNIConnection.java    | 144 +++++++++++++
 .../org/openvpp/jvpp/callback/JVppCallback.java    |  23 ++
 .../java/jvpp/org/openvpp/jvpp/dto/JVppDump.java   |  24 +++
 .../java/jvpp/org/openvpp/jvpp/dto/JVppReply.java  |  24 +++
 .../jvpp/org/openvpp/jvpp/dto/JVppReplyDump.java   |  25 +++
 .../jvpp/org/openvpp/jvpp/dto/JVppRequest.java     |  33 +++
 .../jvpp/org/openvpp/jvpp/future/FutureJVpp.java   |  36 ++++
 .../org/openvpp/jvpp/future/FutureJVppFacade.java  | 110 ++++++++++
 .../org/openvpp/jvpp/test/CallbackApiTest.java     |  87 ++++++++
 .../openvpp/jvpp/test/CallbackJVppFacadeTest.java  |  67 ++++++
 .../org/openvpp/jvpp/test/ControlPingTest.java     |  53 +++++
 .../jvpp/org/openvpp/jvpp/test/FutureApiTest.java  | 124 +++++++++++
 20 files changed, 1758 insertions(+)
 create mode 100644 vpp-api/java/jvpp/gen/callback_gen.py
 create mode 100644 vpp-api/java/jvpp/gen/dto_gen.py
 create mode 100644 vpp-api/java/jvpp/gen/jvpp_callback_facade_gen.py
 create mode 100644 vpp-api/java/jvpp/gen/jvpp_future_facade_gen.py
 create mode 100644 vpp-api/java/jvpp/gen/jvpp_impl_gen.py
 create mode 100644 vpp-api/java/jvpp/gen/util.py
 create mode 100644 vpp-api/java/jvpp/org/openvpp/jvpp/VppConnection.java
 create mode 100644 vpp-api/java/jvpp/org/openvpp/jvpp/VppJNIConnection.java
 create mode 100644 vpp-api/java/jvpp/org/openvpp/jvpp/callback/JVppCallback.java
 create mode 100644 vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppDump.java
 create mode 100644 vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppReply.java
 create mode 100644 vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppReplyDump.java
 create mode 100644 vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppRequest.java
 create mode 100644 vpp-api/java/jvpp/org/openvpp/jvpp/future/FutureJVpp.java
 create mode 100644 vpp-api/java/jvpp/org/openvpp/jvpp/future/FutureJVppFacade.java
 create mode 100644 vpp-api/java/jvpp/org/openvpp/jvpp/test/CallbackApiTest.java
 create mode 100644 vpp-api/java/jvpp/org/openvpp/jvpp/test/CallbackJVppFacadeTest.java
 create mode 100644 vpp-api/java/jvpp/org/openvpp/jvpp/test/ControlPingTest.java
 create mode 100644 vpp-api/java/jvpp/org/openvpp/jvpp/test/FutureApiTest.java

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 53930928..f4b46f8e 100644
--- a/Makefile
+++ b/Makefile
@@ -96,6 +96,9 @@ ifeq ("$(shell lsb_release -si)", "Ubuntu")
 	  echo "by executing \"make install-dep\"\n" ; \
 	  exit 1 ; \
 	fi ; \
+	if [ "$(shell lsb_release -r | awk '{print $$2}')"=="14.04" ]; then \
+		sudo update-alternatives --set javah /usr/lib/jvm/java-8-openjdk-amd64/bin/javah ; \
+	fi ; \
 	exit 0
 endif
 	@echo "SOURCE_PATH = $(WS_ROOT)"                   > $(BR)/build-config.mk
@@ -121,6 +124,9 @@ install-dep:
 ifeq ("$(shell lsb_release -si)", "Ubuntu")
 	$(use_ppa_for_jdk8)
 	@sudo apt-get -y install $(DEB_DEPENDS)
+	if [ "$(shell lsb_release -r | awk '{print $$2}')"=="14.04" ]; then \
+		update-alternatives --set javah /usr/lib/jvm/java-8-openjdk-amd64/bin/javah ; \
+	fi ; \
 else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo yum groupinstall -y $(RPM_DEPENDS_GROUPS)
 	@sudo yum install -y $(RPM_DEPENDS)
diff --git a/vpp-api/java/jvpp/gen/callback_gen.py b/vpp-api/java/jvpp/gen/callback_gen.py
new file mode 100644
index 00000000..218ac622
--- /dev/null
+++ b/vpp-api/java/jvpp/gen/callback_gen.py
@@ -0,0 +1,89 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import util
+from string import Template
+
+from util import remove_suffix
+
+callback_suffix = "Callback"
+
+callback_template = Template("""
+package $base_package.$callback_package;
+
+/**
+ * $docs
+ */
+public interface $cls_name extends $base_package.$callback_package.JVppCallback {
+
+    $callback_method
+
+}
+""")
+
+global_callback_template = Template("""
+package $base_package.$callback_package;
+
+/**
+ *
+ *
+ * Global aggregated callback interface
+ */
+public interface JVppGlobalCallback extends $callbacks {
+}
+""")
+
+
+def generate_callbacks(func_list, base_package, callback_package, dto_package):
+    """ Generates callback interfaces """
+    print "Generating Callback interfaces"
+
+    if not os.path.exists(callback_package):
+        raise Exception("%s folder is missing" % callback_package)
+
+    callbacks = []
+    for func in func_list:
+
+        if util.is_notification(func['name']) or util.is_ignored(func['name']):
+            # FIXME handle notifications
+            continue
+
+        camel_case_name_with_suffix = util.underscore_to_camelcase_upper(func['name'])
+        if not util.is_reply(camel_case_name_with_suffix):
+            continue
+
+        camel_case_name = util.remove_reply_suffix(camel_case_name_with_suffix)
+        callbacks.append("{0}.{1}.{2}".format(base_package, callback_package, camel_case_name + callback_suffix))
+        callback_path = os.path.join(callback_package, camel_case_name + callback_suffix + ".java")
+        callback_file = open(callback_path, 'w')
+
+        reply_type = "%s.%s.%s" % (base_package, dto_package, camel_case_name_with_suffix)
+        method = "void on{0}({1} reply);".format(camel_case_name_with_suffix, reply_type)
+        callback_file.write(
+            callback_template.substitute(docs='Generated from ' + str(func),
+                                         cls_name=camel_case_name + callback_suffix,
+                                         callback_method=method,
+                                         base_package=base_package,
+                                         callback_package=callback_package))
+        callback_file.flush()
+        callback_file.close()
+
+    callback_file = open(os.path.join(callback_package, "JVppGlobalCallback.java"), 'w')
+    callback_file.write(global_callback_template.substitute(callbacks=", ".join(callbacks),
+                                                            base_package=base_package,
+                                                            callback_package=callback_package))
+    callback_file.flush()
+    callback_file.close()
diff --git a/vpp-api/java/jvpp/gen/dto_gen.py b/vpp-api/java/jvpp/gen/dto_gen.py
new file mode 100644
index 00000000..17fde68a
--- /dev/null
+++ b/vpp-api/java/jvpp/gen/dto_gen.py
@@ -0,0 +1,143 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os, util
+from string import Template
+
+dto_template = Template("""
+package $base_package.$dto_package;
+
+/**
+ * $docs
+ */
+public final class $cls_name implements $base_package.$dto_package.$base_type {
+
+$fields
+$methods
+}
+""")
+
+field_template = Template("""    public $type $name;\n""")
+
+send_template = Template("""    @Override
+    public int send(final $base_package.JVpp jvpp) {
+        return jvpp.$method_name($args);
+    }\n""")
+
+
+def generate_dtos(func_list, base_package, dto_package):
+    """ Generates dto objects in a dedicated package """
+    print "Generating DTOs"
+
+    if not os.path.exists(dto_package):
+        raise Exception("%s folder is missing" % dto_package)
+
+    for func in func_list:
+        camel_case_dto_name = util.underscore_to_camelcase_upper(func['name'])
+        camel_case_method_name = util.underscore_to_camelcase(func['name'])
+        dto_path = os.path.join(dto_package, camel_case_dto_name + ".java")
+
+        if util.is_notification(func['name']) or util.is_ignored(func['name']):
+            # TODO handle notifications
+            continue
+
+        fields = ""
+        for t in zip(func['types'], func['args']):
+            fields += field_template.substitute(type=util.jni_2_java_type_mapping[t[0]],
+                                                name=util.underscore_to_camelcase(t[1]))
+        methods = ""
+        base_type = ""
+        if util.is_reply(camel_case_dto_name):
+            request_dto_name = get_request_name(camel_case_dto_name, func['name'])
+            if util.is_details(camel_case_dto_name):
+                # FIXME assumption that dump calls end with "Dump" suffix. Not enforced in vpe.api
+                base_type += "JVppReply<%s.%s.%s>" % (base_package, dto_package, request_dto_name + "Dump")
+                generate_dump_reply_dto(request_dto_name, base_package, dto_package, camel_case_dto_name,
+                                        camel_case_method_name, func)
+            else:
+                base_type += "JVppReply<%s.%s.%s>" % (base_package, dto_package, request_dto_name)
+        else:
+            args = "" if fields is "" else "this"
+            methods = send_template.substitute(method_name=camel_case_method_name,
+                                               base_package=base_package,
+                                               args=args)
+            if util.is_dump(camel_case_dto_name):
+                base_type += "JVppDump"
+            else:
+                base_type += "JVppRequest"
+
+        dto_file = open(dto_path, 'w')
+        dto_file.write(dto_template.substitute(docs='Generated from ' + str(func),
+                                               cls_name=camel_case_dto_name,
+                                               fields=fields,
+                                               methods=methods,
+                                               base_package=base_package,
+                                               base_type=base_type,
+                                               dto_package=dto_package))
+        dto_file.flush()
+        dto_file.close()
+
+    flush_dump_reply_dtos()
+
+
+dump_dto_suffix = "ReplyDump"
+dump_reply_artificial_dtos = {}
+
+
+# Returns request name or special one from unconventional_naming_rep_req map
+def get_request_name(camel_case_dto_name, func_name):
+    return util.underscore_to_camelcase_upper(
+        util.unconventional_naming_rep_req[func_name]) if func_name in util.unconventional_naming_rep_req \
+        else util.remove_reply_suffix(camel_case_dto_name)
+
+
+def flush_dump_reply_dtos():
+    for dump_reply_artificial_dto in dump_reply_artificial_dtos.values():
+        dto_path = os.path.join(dump_reply_artificial_dto['dto_package'],
+                                dump_reply_artificial_dto['cls_name'] + ".java")
+        dto_file = open(dto_path, 'w')
+        dto_file.write(dto_template.substitute(docs=dump_reply_artificial_dto['docs'],
+                                               cls_name=dump_reply_artificial_dto['cls_name'],
+                                               fields=dump_reply_artificial_dto['fields'],
+                                               methods=dump_reply_artificial_dto['methods'],
+                                               base_package=dump_reply_artificial_dto['base_package'],
+                                               base_type=dump_reply_artificial_dto['base_type'],
+                                               dto_package=dump_reply_artificial_dto['dto_package']))
+        dto_file.flush()
+        dto_file.close()
+
+
+def generate_dump_reply_dto(request_dto_name, base_package, dto_package, camel_case_dto_name, camel_case_method_name,
+                            func):
+    base_type = "JVppReplyDump<%s.%s.%s, %s.%s.%s>" % (
+        base_package, dto_package, util.remove_reply_suffix(camel_case_dto_name) + "Dump",
+        base_package, dto_package, camel_case_dto_name)
+    fields = "    public java.util.List<%s> %s = new java.util.ArrayList<>();" % (camel_case_dto_name, camel_case_method_name)
+    cls_name = camel_case_dto_name + dump_dto_suffix
+
+    # In case of already existing artificial reply dump DTO, just update it
+    # Used for sub-dump dtos
+    if request_dto_name in dump_reply_artificial_dtos.keys():
+        dump_reply_artificial_dtos[request_dto_name]['fields'] = \
+            dump_reply_artificial_dtos[request_dto_name]['fields'] + '\n' + fields
+    else:
+        dump_reply_artificial_dtos[request_dto_name] = ({'docs': 'Dump reply wrapper generated from ' + str(func),
+                                                         'cls_name': cls_name,
+                                                         'fields': fields,
+                                                         'methods': "",
+                                                         'base_package': base_package,
+                                                         'base_type': base_type,
+                                                         'dto_package': dto_package,
+                                                         })
diff --git a/vpp-api/java/jvpp/gen/jvpp_callback_facade_gen.py b/vpp-api/java/jvpp/gen/jvpp_callback_facade_gen.py
new file mode 100644
index 00000000..731bd894
--- /dev/null
+++ b/vpp-api/java/jvpp/gen/jvpp_callback_facade_gen.py
@@ -0,0 +1,236 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os, util
+from string import Template
+
+import callback_gen
+import dto_gen
+
+jvpp_ifc_template = Template("""
+package $base_package.$callback_facade_package;
+
+public interface CallbackJVpp extends java.lang.AutoCloseable {
+
+    @Override
+    void close();
+
+    // TODO add send
+
+$methods
+}
+""")
+
+jvpp_impl_template = Template("""
+package $base_package.$callback_facade_package;
+
+public final class CallbackJVppFacade implements $base_package.$callback_facade_package.CallbackJVpp {
+
+    private final $base_package.JVpp jvpp;
+    private final java.util.Map<Integer, $base_package.$callback_package.JVppCallback> callbacks;
+
+    public CallbackJVppFacade(final $base_package.JVpp jvpp,
+                              java.util.Map<Integer, $base_package.$callback_package.JVppCallback> callbacks) {
+        if(jvpp == null) {
+            throw new java.lang.NullPointerException("jvpp is null");
+        }
+        this.jvpp = jvpp;
+        this.callbacks = callbacks;
+    }
+
+    @Override
+    public void close() {
+    }
+
+    // TODO add send()
+
+$methods
+}
+""")
+
+method_template = Template(
+    """    void $name($base_package.$dto_package.$request request, $base_package.$callback_package.$callback callback);""")
+method_impl_template = Template("""    public final void $name($base_package.$dto_package.$request request, $base_package.$callback_package.$callback callback) {
+        synchronized (callbacks) {
+            callbacks.put(jvpp.$name(request), callback);
+        }
+    }
+""")
+
+no_arg_method_template = Template("""    void $name($base_package.$callback_package.$callback callback);""")
+no_arg_method_impl_template = Template("""    public final void $name($base_package.$callback_package.$callback callback) {
+        synchronized (callbacks) {
+            callbacks.put(jvpp.$name(), callback);
+        }
+    }
+""")
+
+
+def generate_jvpp(func_list, base_package, dto_package, callback_package, callback_facade_package):
+    """ Generates callback facade """
+    print "Generating JVpp callback facade"
+
+    if os.path.exists(callback_facade_package):
+        util.remove_folder(callback_facade_package)
+
+    os.mkdir(callback_facade_package)
+
+    methods = []
+    methods_impl = []
+    for func in func_list:
+
+        if util.is_notification(func['name']) or util.is_ignored(func['name']):
+            # TODO handle notifications
+            continue
+
+        camel_case_name = util.underscore_to_camelcase(func['name'])
+        camel_case_name_upper = util.underscore_to_camelcase_upper(func['name'])
+        if util.is_reply(camel_case_name):
+            continue
+
+        # Strip suffix for dump calls
+        callback_type = get_request_name(camel_case_name_upper, func['name']) + callback_gen.callback_suffix
+
+        if len(func['args']) == 0:
+            methods.append(no_arg_method_template.substitute(name=camel_case_name,
+                                                             base_package=base_package,
+                                                             dto_package=dto_package,
+                                                             callback_package=callback_package,
+                                                             callback=callback_type))
+            methods_impl.append(no_arg_method_impl_template.substitute(name=camel_case_name,
+                                                                       base_package=base_package,
+                                                                       dto_package=dto_package,
+                                                                       callback_package=callback_package,
+                                                                       callback=callback_type))
+        else:
+            methods.append(method_template.substitute(name=camel_case_name,
+                                                      request=camel_case_name_upper,
+                                                      base_package=base_package,
+                                                      dto_package=dto_package,
+                                                      callback_package=callback_package,
+                                                      callback=callback_type))
+            methods_impl.append(method_impl_template.substitute(name=camel_case_name,
+                                                                request=camel_case_name_upper,
+                                                                base_package=base_package,
+                                                                dto_package=dto_package,
+                                                                callback_package=callback_package,
+                                                                callback=callback_type))
+
+    join = os.path.join(callback_facade_package, "CallbackJVpp.java")
+    jvpp_file = open(join, 'w')
+    jvpp_file.write(
+        jvpp_ifc_template.substitute(methods="\n".join(methods),
+                                     base_package=base_package,
+                                     dto_package=dto_package,
+                                     callback_facade_package=callback_facade_package))
+    jvpp_file.flush()
+    jvpp_file.close()
+
+    jvpp_file = open(os.path.join(callback_facade_package, "CallbackJVppFacade.java"), 'w')
+    jvpp_file.write(jvpp_impl_template.substitute(methods="\n".join(methods_impl),
+                                                  base_package=base_package,
+                                                  dto_package=dto_package,
+                                                  callback_package=callback_package,
+                                                  callback_facade_package=callback_facade_package))
+    jvpp_file.flush()
+    jvpp_file.close()
+
+    generate_callback(func_list, base_package, dto_package, callback_package, callback_facade_package)
+
+
+jvpp_facade_callback_template = Template("""
+package $base_package.$callback_facade_package;
+
+/**
+ * Async facade callback setting values to future objects
+ */
+public final class CallbackJVppFacadeCallback implements $base_package.$callback_package.JVppGlobalCallback {
+
+    private final java.util.Map<Integer, $base_package.$callback_package.JVppCallback> requests;
+
+    public CallbackJVppFacadeCallback(final java.util.Map<Integer, $base_package.$callback_package.JVppCallback> requestMap) {
+        this.requests = requestMap;
+    }
+
+$methods
+}
+""")
+
+jvpp_facade_callback_method_template = Template("""
+    @Override
+    @SuppressWarnings("unchecked")
+    public void on$callback_dto($base_package.$dto_package.$callback_dto reply) {
+
+        $base_package.$callback_package.$callback callback;
+        synchronized(requests) {
+            callback = ($base_package.$callback_package.$callback) requests.remove(reply.context);
+        }
+
+        if(callback != null) {
+            callback.on$callback_dto(reply);
+        }
+    }
+""")
+
+
+def generate_callback(func_list, base_package, dto_package, callback_package, callback_facade_package):
+    callbacks = []
+    for func in func_list:
+
+        if util.is_notification(func['name']) or util.is_ignored(func['name']):
+            # TODO handle notifications
+            continue
+
+        camel_case_name_with_suffix = util.underscore_to_camelcase_upper(func['name'])
+        if not util.is_reply(camel_case_name_with_suffix):
+            continue
+
+        callbacks.append(jvpp_facade_callback_method_template.substitute(base_package=base_package,
+                                                                         dto_package=dto_package,
+                                                                         callback_package=callback_package,
+                                                                         callback=util.remove_reply_suffix(camel_case_name_with_suffix) + callback_gen.callback_suffix,
+                                                                         callback_dto=camel_case_name_with_suffix))
+
+    jvpp_file = open(os.path.join(callback_facade_package, "CallbackJVppFacadeCallback.java"), 'w')
+    jvpp_file.write(jvpp_facade_callback_template.substitute(base_package=base_package,
+                                                             dto_package=dto_package,
+                                                             callback_package=callback_package,
+                                                             methods="".join(callbacks),
+                                                             callback_facade_package=callback_facade_package))
+    jvpp_file.flush()
+    jvpp_file.close()
+
+
+# Returns request name or special one from unconventional_naming_rep_req map
+def get_request_name(camel_case_dto_name, func_name):
+    if func_name in reverse_dict(util.unconventional_naming_rep_req):
+        request_name = util.underscore_to_camelcase_upper(reverse_dict(util.unconventional_naming_rep_req)[func_name])
+    else:
+        request_name = camel_case_dto_name
+    return remove_suffix(request_name)
+
+
+def reverse_dict(map):
+    return dict((v, k) for k, v in map.iteritems())
+
+
+def remove_suffix(name):
+    if util.is_reply(name):
+        return util.remove_reply_suffix(name)
+    else:
+        if util.is_dump(name):
+            return util.remove_suffix(name, util.dump_suffix)
+        else:
+            return name
diff --git a/vpp-api/java/jvpp/gen/jvpp_future_facade_gen.py b/vpp-api/java/jvpp/gen/jvpp_future_facade_gen.py
new file mode 100644
index 00000000..2aae5b80
--- /dev/null
+++ b/vpp-api/java/jvpp/gen/jvpp_future_facade_gen.py
@@ -0,0 +1,184 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os, util
+from string import Template
+
+import dto_gen
+
+jvpp_facade_callback_template = Template("""
+package $base_package.$future_package;
+
+/**
+ * Async facade callback setting values to future objects
+ */
+public final class FutureJVppFacadeCallback implements $base_package.$callback_package.JVppGlobalCallback {
+
+    private final java.util.Map<java.lang.Integer, java.util.concurrent.CompletableFuture<? extends $base_package.$dto_package.JVppReply<?>>> requests;
+
+    public FutureJVppFacadeCallback(final java.util.Map<java.lang.Integer, java.util.concurrent.CompletableFuture<? extends $base_package.$dto_package.JVppReply<?>>> requestMap) {
+        this.requests = requestMap;
+    }
+
+$methods
+}
+""")
+
+jvpp_facade_callback_method_template = Template("""
+    @Override
+    @SuppressWarnings("unchecked")
+    public void on$callback_dto($base_package.$dto_package.$callback_dto reply) {
+        final java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>> completableFuture;
+
+        synchronized(requests) {
+            completableFuture = (java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>>) requests.get(reply.context);
+        }
+
+        if(completableFuture != null) {
+            if(reply.retval < 0) {
+                completableFuture.completeExceptionally(new Exception("Invocation of " + $base_package.$dto_package.$callback_dto.class
+                    + " failed with value " + reply.retval));
+            } else {
+                completableFuture.complete(reply);
+            }
+
+            synchronized(requests) {
+                requests.remove(reply.context);
+            }
+        }
+    }
+""")
+
+# TODO reuse common parts with generic method callback
+jvpp_facade_control_ping_method_template = Template("""
+    @Override
+    @SuppressWarnings("unchecked")
+    public void on$callback_dto($base_package.$dto_package.$callback_dto reply) {
+        final java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>> completableFuture;
+
+        synchronized(requests) {
+            completableFuture = (java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>>) requests.get(reply.context);
+        }
+
+        if(completableFuture != null) {
+            // Finish dump call
+            if (completableFuture instanceof $base_package.$future_package.FutureJVppFacade.CompletableDumpFuture) {
+                completableFuture.complete((($base_package.$future_package.FutureJVppFacade.CompletableDumpFuture) completableFuture).getReplyDump());
+                // Remove future mapped to dump call context id
+                synchronized(requests) {
+                    requests.remove((($base_package.$future_package.FutureJVppFacade.CompletableDumpFuture) completableFuture).getContextId());
+                }
+            } else {
+                if(reply.retval < 0) {
+                    completableFuture.completeExceptionally(new Exception("Invocation of " + $base_package.$dto_package.$callback_dto.class
+                        + " failed with value " + reply.retval));
+                } else {
+                    completableFuture.complete(reply);
+                }
+            }
+
+            synchronized(requests) {
+                requests.remove(reply.context);
+            }
+        }
+    }
+""")
+
+jvpp_facade_details_callback_method_template = Template("""
+    @Override
+    @SuppressWarnings("unchecked")
+    public void on$callback_dto($base_package.$dto_package.$callback_dto reply) {
+        final FutureJVppFacade.CompletableDumpFuture<$base_package.$dto_package.$callback_dto_reply_dump> completableFuture;
+
+        synchronized(requests) {
+            completableFuture = ($base_package.$future_package.FutureJVppFacade.CompletableDumpFuture<$base_package.$dto_package.$callback_dto_reply_dump>) requests.get(reply.context);
+        }
+
+        if(completableFuture != null) {
+            $base_package.$dto_package.$callback_dto_reply_dump replyDump = completableFuture.getReplyDump();
+            if(replyDump == null) {
+                replyDump = new $base_package.$dto_package.$callback_dto_reply_dump();
+                completableFuture.setReplyDump(replyDump);
+            }
+
+            replyDump.$callback_dto_field.add(reply);
+        }
+    }
+""")
+
+
+def generate_jvpp(func_list, base_package, dto_package, callback_package, future_facade_package):
+    """ Generates JVpp interface and JNI implementation """
+    print "Generating JVpp future facade"
+
+    if not os.path.exists(future_facade_package):
+        raise Exception("%s folder is missing" % future_facade_package)
+
+    callbacks = []
+    for func in func_list:
+
+        if util.is_notification(func['name']) or util.is_ignored(func['name']):
+            # TODO handle notifications
+            continue
+
+        camel_case_name_with_suffix = util.underscore_to_camelcase_upper(func['name'])
+        if not util.is_reply(camel_case_name_with_suffix):
+            continue
+
+        if util.is_details(camel_case_name_with_suffix):
+            camel_case_method_name = util.underscore_to_camelcase(func['name'])
+            camel_case_request_name = get_standard_dump_reply_name(util.underscore_to_camelcase_upper(func['name']),
+                                                                   func['name'])
+            callbacks.append(jvpp_facade_details_callback_method_template.substitute(base_package=base_package,
+                                                                                     dto_package=dto_package,
+                                                                                     callback_dto=camel_case_name_with_suffix,
+                                                                                     callback_dto_field=camel_case_method_name,
+                                                                                     callback_dto_reply_dump=camel_case_request_name + dto_gen.dump_dto_suffix,
+                                                                                     future_package=future_facade_package))
+        else:
+            if util.is_control_ping(camel_case_name_with_suffix):
+                callbacks.append(jvpp_facade_control_ping_method_template.substitute(base_package=base_package,
+                                                                                     dto_package=dto_package,
+                                                                                     callback_dto=camel_case_name_with_suffix,
+                                                                                     future_package=future_facade_package))
+            else:
+                callbacks.append(jvpp_facade_callback_method_template.substitute(base_package=base_package,
+                                                                                 dto_package=dto_package,
+                                                                                 callback_dto=camel_case_name_with_suffix))
+
+    jvpp_file = open(os.path.join(future_facade_package, "FutureJVppFacadeCallback.java"), 'w')
+    jvpp_file.write(jvpp_facade_callback_template.substitute(base_package=base_package,
+                                                             dto_package=dto_package,
+                                                             callback_package=callback_package,
+                                                             methods="".join(callbacks),
+                                                             future_package=future_facade_package))
+    jvpp_file.flush()
+    jvpp_file.close()
+
+
+# Returns request name or special one from unconventional_naming_rep_req map
+def get_standard_dump_reply_name(camel_case_dto_name, func_name):
+    # FIXME this is a hotfix for sub-details callbacks
+    # FIXME also for L2FibTableEntry
+    # It's all because unclear mapping between
+    #  request -> reply,
+    #  dump -> reply, details,
+    #  notification_start -> reply, notifications
+
+    # vpe.api needs to be "standardized" so we can parse the information and create maps before generating java code
+    suffix = func_name.split("_")[-1]
+    return util.underscore_to_camelcase_upper(
+        util.unconventional_naming_rep_req[func_name]) + util.underscore_to_camelcase_upper(suffix) if func_name in util.unconventional_naming_rep_req \
+        else camel_case_dto_name
diff --git a/vpp-api/java/jvpp/gen/jvpp_impl_gen.py b/vpp-api/java/jvpp/gen/jvpp_impl_gen.py
new file mode 100644
index 00000000..5446a694
--- /dev/null
+++ b/vpp-api/java/jvpp/gen/jvpp_impl_gen.py
@@ -0,0 +1,140 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os, util
+from string import Template
+
+jvpp_ifc_template = Template("""
+package $base_package;
+
+public interface JVpp extends java.lang.AutoCloseable {
+
+    /**
+     * Generic dispatch method for sending requests to VPP
+     */
+    int send($base_package.$dto_package.JVppRequest request);
+
+    @Override
+    void close();
+
+$methods
+}
+""")
+
+jvpp_impl_template = Template("""
+package $base_package;
+
+public final class JVppImpl implements $base_package.JVpp {
+
+    private final $base_package.VppConnection connection;
+
+    public JVppImpl(final $base_package.VppConnection connection) {
+        if(connection == null) {
+            throw new java.lang.NullPointerException("Connection is null");
+        }
+        this.connection = connection;
+    }
+
+    @Override
+    public void close() {
+        connection.close();
+    }
+
+    @Override
+    public int send($base_package.$dto_package.JVppRequest request) {
+        return request.send(this);
+    }
+
+$methods
+}
+""")
+
+method_template = Template("""    int $name($base_package.$dto_package.$request request);""")
+method_native_template = Template(
+    """    private static native int ${name}0($base_package.$dto_package.$request request);""")
+method_impl_template = Template("""    public final int $name($base_package.$dto_package.$request request) {
+        if(request == null) {
+            throw new java.lang.NullPointerException("Null request object");
+        }
+        connection.checkActive();
+        return ${name}0(request);
+    }
+""")
+
+no_arg_method_template = Template("""    int $name();""")
+no_arg_method_native_template = Template("""    private static native int ${name}0();""")
+no_arg_method_impl_template = Template("""    public final int $name() {
+        connection.checkActive();
+        return ${name}0();
+    }
+""")
+
+
+def generate_jvpp(func_list, base_package, dto_package):
+    """ Generates JVpp interface and JNI implementation """
+    print "Generating JVpp"
+
+    methods = []
+    methods_impl = []
+    for func in func_list:
+
+        if util.is_notification(func['name']) or util.is_ignored(func['name']):
+            # TODO handle notifications
+            continue
+
+        camel_case_name = util.underscore_to_camelcase(func['name'])
+        camel_case_name_upper = util.underscore_to_camelcase_upper(func['name'])
+        if util.is_reply(camel_case_name):
+            continue
+
+        if len(func['args']) == 0:
+            methods.append(no_arg_method_template.substitute(name=camel_case_name,
+                                                             base_package=base_package,
+                                                             dto_package=dto_package))
+            methods_impl.append(
+                no_arg_method_native_template.substitute(name=camel_case_name,
+                                                         base_package=base_package,
+                                                         dto_package=dto_package))
+            methods_impl.append(no_arg_method_impl_template.substitute(name=camel_case_name,
+                                                                       base_package=base_package,
+                                                                       dto_package=dto_package))
+        else:
+            methods.append(method_template.substitute(name=camel_case_name,
+                                                      request=camel_case_name_upper,
+                                                      base_package=base_package,
+                                                      dto_package=dto_package))
+            methods_impl.append(method_native_template.substitute(name=camel_case_name,
+                                                                  request=camel_case_name_upper,
+                                                                  base_package=base_package,
+                                                                  dto_package=dto_package))
+            methods_impl.append(method_impl_template.substitute(name=camel_case_name,
+                                                                request=camel_case_name_upper,
+                                                                base_package=base_package,
+                                                                dto_package=dto_package))
+
+    jvpp_file = open("JVpp.java", 'w')
+    jvpp_file.write(
+        jvpp_ifc_template.substitute(methods="\n".join(methods),
+                                     base_package=base_package,
+                                     dto_package=dto_package))
+    jvpp_file.flush()
+    jvpp_file.close()
+
+    jvpp_file = open("JVppImpl.java", 'w')
+    jvpp_file.write(jvpp_impl_template.substitute(methods="\n".join(methods_impl),
+                                                  base_package=base_package,
+                                                  dto_package=dto_package))
+    jvpp_file.flush()
+    jvpp_file.close()
diff --git a/vpp-api/java/jvpp/gen/util.py b/vpp-api/java/jvpp/gen/util.py
new file mode 100644
index 00000000..17dc2ed9
--- /dev/null
+++ b/vpp-api/java/jvpp/gen/util.py
@@ -0,0 +1,173 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+from os import removedirs
+
+
+def underscore_to_camelcase(name):
+    name = name.title().replace("_", "")
+    return name[0].lower() + name[1:]
+
+
+def underscore_to_camelcase_upper(name):
+    name = name.title().replace("_", "")
+    return name[0].upper() + name[1:]
+
+
+def remove_folder(folder):
+    """ Remove folder with all its files """
+    for root, dirs, files in os.walk(folder, topdown=False):
+        for name in files:
+            os.remove(os.path.join(root, name))
+        removedirs(folder)
+
+
+reply_suffixes = ("reply", "details", "l2fibtableentry")
+
+
+def is_reply(name):
+    return name.lower().endswith(reply_suffixes)
+
+
+def is_details(name):
+    return name.lower().endswith(reply_suffixes[1]) or name.lower().endswith(reply_suffixes[2])
+
+dump_suffix = "dump"
+
+
+def is_dump(name):
+    return name.lower().endswith(dump_suffix)
+
+
+def get_reply_suffix(name):
+    for reply_suffix in reply_suffixes:
+        if name.lower().endswith(reply_suffix):
+            if reply_suffix == reply_suffixes[2]:
+                # FIXME workaround for l2_fib_table_entry
+                return 'entry'
+            else:
+                return reply_suffix
+
+# http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/types.html
+jni_2_java_type_mapping = {'jbyte': 'byte',
+                           'jbyteArray': 'byte[]',
+                           'jchar': 'char',
+                           'jcharArray': 'char[]',
+                           'jshort': 'short',
+                           'jshortArray': 'short[]',
+                           'jint': 'int',
+                           'jintArray': 'int[]',
+                           'jlong': 'long',
+                           'jlongArray': 'long[]',
+                           'jdouble': 'double',
+                           'jdoubleArray': 'double[]',
+                           'jfloat': 'float',
+                           'jfloatArray': 'float[]',
+                           'void': 'void',
+                           'jstring': 'java.lang.String',
+                           'jobject': 'java.lang.Object',
+                           'jobjectArray': 'java.lang.Object[]'
+                           }
+
+# https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/types.html#type_signatures
+jni_2_signature_mapping = {'jbyte': 'B',
+                           'jbyteArray': '[B',
+                           'jchar': 'C',
+                           'jcharArray': '[C',
+                           'jshort': 'S',
+                           'jshortArray': '[S',
+                           'jint': 'I',
+                           'jintArray': '[I',
+                           'jlong': 'J',
+                           'jlongArray': '[J',
+                           'jdouble': 'D',
+                           'jdoubleArray': '[D',
+                           'jfloat': 'F',
+                           'jfloatArray': '[F'
+                           }
+
+# https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#Get_type_Field_routines
+jni_field_accessors = {
+    'jbyte': 'ByteField',
+    'jbyteArray': 'ObjectField',
+    'jchar': 'CharField',
+    'jcharArray': 'ObjectField',
+    'jshort': 'ShortField',
+    'jshortArray': 'ObjectField',
+    'jint': 'IntField',
+    'jintArray': 'ObjectField',
+    'jlong': 'LongField',
+    'jlongArray': 'ObjectField',
+    'jdouble': 'DoubleField',
+    'jdoubleArray': 'ObjectField',
+    'jfloat': 'FloatField',
+    'jfloatArray': 'ObjectField'
+}
+
+# TODO watch out for unsigned types
+# http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/types.html
+vpp_2_jni_type_mapping = {'u8': 'jbyte',  # fixme
+                          'i8': 'jbyte',
+                          'u16': 'jchar',
+                          'i16': 'jshort',
+                          'u32': 'jint',  # fixme
+                          'i32': 'jint',
+                          'u64': 'jlong',  # fixme
+                          'i64': 'jlong',
+                          'f64': 'jdouble'
+                          }
+
+# vpe.api calls that do not follow naming conventions and have to be handled exceptionally when finding reply -> request mapping
+# FIXME in vpe.api
+unconventional_naming_rep_req = {
+                                 'cli_reply': 'cli_request',
+                                 'vnet_summary_stats_reply': 'vnet_get_summary_stats',
+                                 # This below is actually a sub-details callback. We cannot derive the mapping of dump request
+                                 # belonging to this sub-details from naming conventions. We need special mapping
+                                 'bridge_domain_sw_if_details': 'bridge_domain',
+                                 # This is standard dump call + details reply. However it's not called details but entry
+                                 'l2_fib_table_entry': 'l2_fib_table'
+                                 }
+
+#
+# FIXME no convention in the naming of events (notifications) in vpe.api
+notifications_message_suffixes = ("event", "counters")
+notification_messages = ["from_netconf_client", "from_netconf_server", "to_netconf_client", "to_netconf_server"]
+
+# messages that must be ignored. These messages are INSUFFICIENTLY marked as disabled in vpe.api
+# FIXME
+ignored_messages = ["is_address_reachable"]
+
+
+def is_notification(param):
+    return param.lower().endswith(notifications_message_suffixes) or param.lower() in notification_messages
+
+
+def is_ignored(param):
+    return param.lower() in ignored_messages
+
+
+def remove_reply_suffix(camel_case_name_with_suffix):
+    return remove_suffix(camel_case_name_with_suffix, get_reply_suffix(camel_case_name_with_suffix))
+
+
+def remove_suffix(camel_case_name_with_suffix, suffix):
+    suffix_length = len(suffix)
+    return camel_case_name_with_suffix[:-suffix_length] if suffix_length != 0 else camel_case_name_with_suffix
+
+
+def is_control_ping(camel_case_name_with_suffix):
+    return "controlping" in camel_case_name_with_suffix.lower()
diff --git a/vpp-api/java/jvpp/org/openvpp/jvpp/VppConnection.java b/vpp-api/java/jvpp/org/openvpp/jvpp/VppConnection.java
new file mode 100644
index 00000000..72ff62c9
--- /dev/null
+++ b/vpp-api/java/jvpp/org/openvpp/jvpp/VppConnection.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.jvpp;
+
+/**
+ * Representation of a management connection to VPP.
+ * Connection is initiated when instance is created, closed with close().
+ */
+public interface VppConnection extends AutoCloseable {
+
+    /**
+     * Check if this instance connection is active.
+     *
+     * @throws IllegalStateException if this instance was disconnected.
+     */
+    void checkActive();
+
+    /**
+     * Closes Vpp connection.
+     */
+    @Override
+    void close();
+}
diff --git a/vpp-api/java/jvpp/org/openvpp/jvpp/VppJNIConnection.java b/vpp-api/java/jvpp/org/openvpp/jvpp/VppJNIConnection.java
new file mode 100644
index 00000000..9e07cc76
--- /dev/null
+++ b/vpp-api/java/jvpp/org/openvpp/jvpp/VppJNIConnection.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.jvpp;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
+import org.openvpp.jvpp.callback.JVppCallback;
+
+/**
+ * JNI based representation of a management connection to VPP
+ */
+public final class VppJNIConnection implements VppConnection {
+    private final static Logger LOG = Logger.getLogger(VppJNIConnection.class.getName());
+    private static final String LIBNAME = "libjvpp.so.0.0.0";
+
+    static {
+        try {
+            loadLibrary();
+        } catch (Exception e) {
+            LOG.severe("Can't find vpp jni library: " + LIBNAME);
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
+    private static void loadStream(final InputStream is) throws IOException {
+        final Set<PosixFilePermission> perms = PosixFilePermissions.fromString("rwxr-x---");
+        final Path p = Files.createTempFile(LIBNAME, null, PosixFilePermissions.asFileAttribute(perms));
+        try {
+            Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
+
+            try {
+                Runtime.getRuntime().load(p.toString());
+            } catch (UnsatisfiedLinkError e) {
+                throw new IOException("Failed to load library " + p, e);
+            }
+        } finally {
+            try {
+                Files.deleteIfExists(p);
+            } catch (IOException e) {
+            }
+        }
+    }
+
+    private static void loadLibrary() throws IOException {
+        try (final InputStream is = VppJNIConnection.class.getResourceAsStream('/' + LIBNAME)) {
+            if (is == null) {
+                throw new IOException("Failed to open library resource " + LIBNAME);
+            }
+            loadStream(is);
+        }
+    }
+
+    private final String clientName;
+    private volatile boolean disconnected = false;
+
+    private VppJNIConnection(final String clientName) {
+        if (clientName == null) {
+            throw new NullPointerException("Null clientName");
+        }
+        this.clientName = clientName;
+    }
+
+    /**
+     * Guarded by VppJNIConnection.class
+     */
+    private static final Map<String, VppJNIConnection> connections = new HashMap<>();
+
+    /**
+     * Create a new Vpp connection identified by clientName parameter.
+     *
+     * Multiple instances are allowed since this class is not a singleton
+     * (VPP allows multiple management connections).
+     *
+     * However only a single connection per clientName is allowed.
+     *
+     * @param clientName identifier of vpp connection
+     * @param callback global callback to receive response calls from vpp
+     *
+     * @return new Vpp connection
+     * @throws IOException in case the connection could not be established, or there already is a connection with the same name
+     */
+    public static VppJNIConnection create(final String clientName, final JVppCallback callback) throws IOException {
+        synchronized (VppJNIConnection.class) {
+            if(connections.containsKey(clientName)) {
+                throw new IOException("Client " + clientName + " already connected");
+            }
+
+            final VppJNIConnection vppJNIConnection = new VppJNIConnection(clientName);
+            final int ret = clientConnect(clientName, callback);
+            if (ret != 0) {
+                throw new IOException("Connection returned error " + ret);
+            }
+            connections.put(clientName, vppJNIConnection);
+            return vppJNIConnection;
+        }
+    }
+
+    @Override
+    public final void checkActive() {
+        if (disconnected) {
+            throw new IllegalStateException("Disconnected client " + clientName);
+        }
+    }
+
+    @Override
+    public synchronized final void close() {
+        if (!disconnected) {
+            disconnected = true;
+            try {
+                clientDisconnect();
+            } finally {
+                synchronized (VppJNIConnection.class) {
+                    connections.remove(clientName);
+                }
+            }
+        }
+    }
+
+    private static native int clientConnect(String clientName, JVppCallback callback);
+    private static native void clientDisconnect();
+}
diff --git a/vpp-api/java/jvpp/org/openvpp/jvpp/callback/JVppCallback.java b/vpp-api/java/jvpp/org/openvpp/jvpp/callback/JVppCallback.java
new file mode 100644
index 00000000..c17f2e0a
--- /dev/null
+++ b/vpp-api/java/jvpp/org/openvpp/jvpp/callback/JVppCallback.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.jvpp.callback;
+
+/**
+* Base JVppCallback interface
+*/
+public interface JVppCallback {
+}
diff --git a/vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppDump.java b/vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppDump.java
new file mode 100644
index 00000000..295bbba8
--- /dev/null
+++ b/vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppDump.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.jvpp.dto;
+
+/**
+* Base interface for all dump requests
+*/
+public interface JVppDump extends JVppRequest {
+
+}
diff --git a/vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppReply.java b/vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppReply.java
new file mode 100644
index 00000000..2f4964c4
--- /dev/null
+++ b/vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppReply.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.jvpp.dto;
+
+/**
+* Base interface for all reply DTOs
+*/
+public interface JVppReply<REQ extends JVppRequest> {
+
+}
diff --git a/vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppReplyDump.java b/vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppReplyDump.java
new file mode 100644
index 00000000..4aecedc1
--- /dev/null
+++ b/vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppReplyDump.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.jvpp.dto;
+
+/**
+* Base interface for all dump replies
+*/
+public interface JVppReplyDump<REQ extends JVppRequest, RESP extends JVppReply<REQ>>
+    extends JVppReply<REQ> {
+
+}
diff --git a/vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppRequest.java b/vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppRequest.java
new file mode 100644
index 00000000..8cd1534a
--- /dev/null
+++ b/vpp-api/java/jvpp/org/openvpp/jvpp/dto/JVppRequest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.jvpp.dto;
+
+import org.openvpp.jvpp.JVpp;
+
+/**
+* Base interface for all request DTOs
+*/
+public interface JVppRequest {
+
+    /**
+     * Invoke current operation asynchronously on VPP
+     *
+     * @return context id of this request. Can be used to track incomming response
+     */
+    int send(JVpp jvpp);
+
+}
diff --git a/vpp-api/java/jvpp/org/openvpp/jvpp/future/FutureJVpp.java b/vpp-api/java/jvpp/org/openvpp/jvpp/future/FutureJVpp.java
new file mode 100644
index 00000000..d860bc2d
--- /dev/null
+++ b/vpp-api/java/jvpp/org/openvpp/jvpp/future/FutureJVpp.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.jvpp.future;
+
+
+import java.util.concurrent.CompletionStage;
+import org.openvpp.jvpp.dto.JVppReply;
+import org.openvpp.jvpp.dto.JVppRequest;
+
+/**
+* Future facade on top of JVpp
+*/
+public interface FutureJVpp {
+
+    /**
+     * Invoke asynchronous operation on VPP
+     *
+     * @return CompletionStage with future result of an async VPP call
+     */
+    <REQ extends JVppRequest, REPLY extends JVppReply<REQ>> CompletionStage<REPLY> send(REQ req);
+
+}
diff --git a/vpp-api/java/jvpp/org/openvpp/jvpp/future/FutureJVppFacade.java b/vpp-api/java/jvpp/org/openvpp/jvpp/future/FutureJVppFacade.java
new file mode 100644
index 00000000..5b8222c4
--- /dev/null
+++ b/vpp-api/java/jvpp/org/openvpp/jvpp/future/FutureJVppFacade.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.jvpp.future;
+
+
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import org.openvpp.jvpp.JVpp;
+import org.openvpp.jvpp.dto.ControlPing;
+import org.openvpp.jvpp.dto.JVppDump;
+import org.openvpp.jvpp.dto.JVppReply;
+import org.openvpp.jvpp.dto.JVppReplyDump;
+import org.openvpp.jvpp.dto.JVppRequest;
+
+/**
+* Future facade on top of JVpp
+*/
+public final class FutureJVppFacade implements FutureJVpp {
+
+    private final JVpp jvpp;
+
+    /**
+     * Guarded by self
+     */
+    private final Map<Integer, CompletableFuture<? extends JVppReply<?>>> requests;
+
+    public FutureJVppFacade(final JVpp jvpp,
+                     final Map<Integer, CompletableFuture<? extends JVppReply<?>>> requestMap) {
+        // TODO use guava's preconditions for nonNull and state checks
+        // However adding guava as a dependency requires better build system for Java in VPP project
+        // Currently it's just invocation of javac
+        if(jvpp == null) {
+            throw new NullPointerException("Null jvpp");
+        }
+        this.jvpp = jvpp;
+        if(requestMap == null) {
+            throw new NullPointerException("Null requestMap");
+        }
+        // Request map represents the shared state between this facade and it's callback
+        // where facade puts futures in and callback completes + removes them
+        // TODO what if the call never completes ?
+        this.requests = requestMap;
+    }
+
+    // TODO use Optional in Future, java8
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <REQ extends JVppRequest, REPLY extends JVppReply<REQ>> CompletionStage<REPLY> send(REQ req) {
+        synchronized(requests) {
+            final int contextId = jvpp.send(req);
+
+            final CompletableFuture<REPLY> replyCompletableFuture;
+            if(req instanceof JVppDump) {
+                replyCompletableFuture = (CompletableFuture<REPLY>) new CompletableDumpFuture<>(contextId);
+            } else {
+                replyCompletableFuture = new CompletableFuture<>();
+            }
+
+            requests.put(contextId, replyCompletableFuture);
+            if(req instanceof JVppDump) {
+                requests.put(jvpp.send(new ControlPing()), replyCompletableFuture);
+            }
+            return replyCompletableFuture;
+        }
+    }
+
+    static final class CompletableDumpFuture<T extends JVppReplyDump<?, ?>> extends CompletableFuture<T> {
+        // TODO make this final
+        // The reason why this is not final is the instantiation of ReplyDump DTOs
+        // Their instantiation must be generated, so currently the DTOs are created in callback and set when first dump reponses
+        // is returned. Because in callback we have method per response, but here where requests are invoked there is only
+        // a single generic send method that does not have enough information to create the DTO
+        // This can be final as soon as we provide specific send methods here
+        private T replyDump;
+        private final long contextId;
+
+        CompletableDumpFuture(final long contextId) {
+            this.contextId = contextId;
+        }
+
+        long getContextId() {
+            return contextId;
+        }
+
+        T getReplyDump() {
+            return replyDump;
+        }
+
+        void setReplyDump(final T replyDump) {
+            this.replyDump = replyDump;
+        }
+    }
+
+}
diff --git a/vpp-api/java/jvpp/org/openvpp/jvpp/test/CallbackApiTest.java b/vpp-api/java/jvpp/org/openvpp/jvpp/test/CallbackApiTest.java
new file mode 100644
index 00000000..5ac4b69a
--- /dev/null
+++ b/vpp-api/java/jvpp/org/openvpp/jvpp/test/CallbackApiTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.jvpp.test;
+
+import org.openvpp.jvpp.JVpp;
+import org.openvpp.jvpp.JVppImpl;
+import org.openvpp.jvpp.VppJNIConnection;
+import org.openvpp.jvpp.callback.GetNodeIndexCallback;
+import org.openvpp.jvpp.callback.ShowVersionCallback;
+import org.openvpp.jvpp.callback.SwInterfaceCallback;
+import org.openvpp.jvpp.dto.GetNodeIndex;
+import org.openvpp.jvpp.dto.GetNodeIndexReply;
+import org.openvpp.jvpp.dto.ShowVersion;
+import org.openvpp.jvpp.dto.ShowVersionReply;
+import org.openvpp.jvpp.dto.SwInterfaceDetails;
+import org.openvpp.jvpp.dto.SwInterfaceDump;
+
+public class CallbackApiTest {
+
+    private static class TestCallback implements GetNodeIndexCallback, ShowVersionCallback, SwInterfaceCallback {
+
+        @Override
+        public void onGetNodeIndexReply(final GetNodeIndexReply msg) {
+            System.out.printf("Received GetNodeIndexReply: context=%d, retval=%d, nodeIndex=%d\n",
+                    msg.context, msg.retval, msg.nodeIndex);
+        }
+        @Override
+        public void onShowVersionReply(final ShowVersionReply msg) {
+            System.out.printf("Received ShowVersionReply: context=%d, retval=%d, program=%s, version=%s, " +
+                    "buildDate=%s, buildDirectory=%s\n",
+                    msg.context, msg.retval, new String(msg.program), new String(msg.version),
+                    new String(msg.buildDate), new String(msg.buildDirectory));
+        }
+
+        @Override
+        public void onSwInterfaceDetails(final SwInterfaceDetails msg) {
+            System.out.printf("Received SwInterfaceDetails: interfaceName=%s, l2AddressLength=%d, adminUpDown=%d, " +
+                    "linkUpDown=%d, linkSpeed=%d, linkMtu=%d\n",
+                    new String(msg.interfaceName), msg.l2AddressLength, msg.adminUpDown,
+                    msg.linkUpDown, msg.linkSpeed, (int)msg.linkMtu);
+        }
+    }
+
+    private static void testCallbackApi() throws Exception {
+        System.out.println("Testing Java callback API");
+        JVpp jvpp = new JVppImpl(VppJNIConnection.create("CallbackApiTest", new TestCallback()));
+        System.out.println("Successfully connected to VPP");
+
+        System.out.println("Sending ShowVersion request...");
+        jvpp.send(new ShowVersion());
+
+        System.out.println("Sending GetNodeIndex request...");
+        GetNodeIndex getNodeIndexRequest = new GetNodeIndex();
+        getNodeIndexRequest.nodeName = "node0".getBytes();
+        jvpp.send(getNodeIndexRequest);
+
+        System.out.println("Sending SwInterfaceDump request...");
+        SwInterfaceDump swInterfaceDumpRequest = new SwInterfaceDump();
+        swInterfaceDumpRequest.nameFilterValid = 0;
+        swInterfaceDumpRequest.nameFilter = "".getBytes();
+        jvpp.send(swInterfaceDumpRequest);
+
+        Thread.sleep(5000);
+
+        System.out.println("Disconnecting...");
+        jvpp.close();
+        Thread.sleep(1000);
+    }
+
+    public static void main(String[] args) throws Exception {
+        testCallbackApi();
+    }
+}
diff --git a/vpp-api/java/jvpp/org/openvpp/jvpp/test/CallbackJVppFacadeTest.java b/vpp-api/java/jvpp/org/openvpp/jvpp/test/CallbackJVppFacadeTest.java
new file mode 100644
index 00000000..df3b0e70
--- /dev/null
+++ b/vpp-api/java/jvpp/org/openvpp/jvpp/test/CallbackJVppFacadeTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.jvpp.test;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.openvpp.jvpp.JVpp;
+import org.openvpp.jvpp.JVppImpl;
+import org.openvpp.jvpp.VppJNIConnection;
+import org.openvpp.jvpp.callback.JVppCallback;
+import org.openvpp.jvpp.callback.ShowVersionCallback;
+import org.openvpp.jvpp.callfacade.CallbackJVppFacade;
+import org.openvpp.jvpp.callfacade.CallbackJVppFacadeCallback;
+
+/**
+ * CallbackJVppFacade together with CallbackJVppFacadeCallback allow for setting different callback for each request.
+ * This is more convenient than the approach shown in CallbackApiTest.
+ */
+public class CallbackJVppFacadeTest {
+
+    private static ShowVersionCallback showVersionCallback1 = msg ->
+            System.out.printf("ShowVersionCallback1 received ShowVersionReply: context=%d, retval=%d, program=%s," +
+                            "version=%s, buildDate=%s, buildDirectory=%s\n", msg.context, msg.retval, new String(msg.program),
+                    new String(msg.version), new String(msg.buildDate), new String(msg.buildDirectory));
+
+    private static ShowVersionCallback showVersionCallback2 = msg ->
+            System.out.printf("ShowVersionCallback2 received ShowVersionReply: context=%d, retval=%d, program=%s," +
+                            "version=%s, buildDate=%s, buildDirectory=%s\n", msg.context, msg.retval, new String(msg.program),
+                    new String(msg.version), new String(msg.buildDate), new String(msg.buildDirectory));
+
+    private static void testCallbackFacade() throws Exception {
+        System.out.println("Testing CallbackJVppFacade");
+
+        final Map<Integer, JVppCallback> callbackMap = new HashMap<>();
+        JVpp impl = new JVppImpl(VppJNIConnection.create("CallbackApiTest", new CallbackJVppFacadeCallback(callbackMap)));
+        CallbackJVppFacade jvpp = new CallbackJVppFacade(impl, callbackMap);
+        System.out.println("Successfully connected to VPP");
+
+        jvpp.showVersion(showVersionCallback1);
+        jvpp.showVersion(showVersionCallback2);
+
+
+        Thread.sleep(2000);
+
+        System.out.println("Disconnecting...");
+        impl.close();
+        Thread.sleep(1000);
+    }
+
+    public static void main(String[] args) throws Exception {
+        testCallbackFacade();
+    }
+}
diff --git a/vpp-api/java/jvpp/org/openvpp/jvpp/test/ControlPingTest.java b/vpp-api/java/jvpp/org/openvpp/jvpp/test/ControlPingTest.java
new file mode 100644
index 00000000..f1bd41de
--- /dev/null
+++ b/vpp-api/java/jvpp/org/openvpp/jvpp/test/ControlPingTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.jvpp.test;
+
+import org.openvpp.jvpp.JVpp;
+import org.openvpp.jvpp.JVppImpl;
+import org.openvpp.jvpp.VppJNIConnection;
+import org.openvpp.jvpp.callback.ControlPingCallback;
+import org.openvpp.jvpp.dto.ControlPing;
+import org.openvpp.jvpp.dto.ControlPingReply;
+
+public class ControlPingTest {
+
+    private static void testControlPing() throws Exception {
+        System.out.println("Testing ControlPing using Java callback API");
+
+        JVpp jvpp = new JVppImpl(VppJNIConnection.create("ControlPingTest", new ControlPingCallback() {
+            @Override
+            public void onControlPingReply(final ControlPingReply reply) {
+                System.out.printf("Received ControlPingReply: context=%d, retval=%d, clientIndex=%d vpePid=%d\n",
+                        reply.context, reply.retval, reply.clientIndex, reply.vpePid);
+            }
+        }));
+        System.out.println("Successfully connected to VPP");
+        Thread.sleep(1000);
+
+        jvpp.send(new ControlPing());
+
+        Thread.sleep(2000);
+
+        System.out.println("Disconnecting...");
+        jvpp.close();
+        Thread.sleep(1000);
+    }
+
+    public static void main(String[] args) throws Exception {
+        testControlPing();
+    }
+}
diff --git a/vpp-api/java/jvpp/org/openvpp/jvpp/test/FutureApiTest.java b/vpp-api/java/jvpp/org/openvpp/jvpp/test/FutureApiTest.java
new file mode 100644
index 00000000..b5b36d58
--- /dev/null
+++ b/vpp-api/java/jvpp/org/openvpp/jvpp/test/FutureApiTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.jvpp.test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+import org.openvpp.jvpp.VppJNIConnection;
+import org.openvpp.jvpp.dto.GetNodeIndex;
+import org.openvpp.jvpp.dto.GetNodeIndexReply;
+import org.openvpp.jvpp.dto.JVppReply;
+import org.openvpp.jvpp.dto.ShowVersion;
+import org.openvpp.jvpp.dto.ShowVersionReply;
+import org.openvpp.jvpp.dto.SwInterfaceDetails;
+import org.openvpp.jvpp.dto.SwInterfaceDetailsReplyDump;
+import org.openvpp.jvpp.dto.SwInterfaceDump;
+import org.openvpp.jvpp.future.FutureJVppFacade;
+import org.openvpp.jvpp.future.FutureJVppFacadeCallback;
+
+public class FutureApiTest {
+
+    private static void testShowVersion(final FutureJVppFacade jvpp) {
+        System.out.println("Sending ShowVersion request...");
+        try {
+            final Future<JVppReply<ShowVersion>> replyFuture = jvpp.send(new ShowVersion()).toCompletableFuture();
+            final ShowVersionReply reply = (ShowVersionReply) replyFuture.get(); // TODO can we get rid of that cast?
+            System.out.printf("Received ShowVersionReply: context=%d, retval=%d, program=%s, " +
+                            "version=%s, buildDate=%s, buildDirectory=%s\n",
+                    reply.context, reply.retval, new String(reply.program), new String(reply.version),
+                    new String(reply.buildDate), new String(reply.buildDirectory));
+        } catch (Exception e) {
+            System.err.printf("ShowVersion request failed:\n");
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * This test will fail with some error code if node 'node0' is not defined.
+     * TODO: consider adding error messages specific for given api calls
+     */
+    private static void testGetNodeIndex(final FutureJVppFacade jvpp) {
+        System.out.println("Sending GetNodeIndex request...");
+        try {
+            final GetNodeIndex request = new GetNodeIndex();
+            request.nodeName = "node0".getBytes();
+            final Future<JVppReply<GetNodeIndex>> replyFuture = jvpp.send(request).toCompletableFuture();
+            final GetNodeIndexReply reply = (GetNodeIndexReply) replyFuture.get();
+            System.out.printf("Received GetNodeIndexReply: context=%d, retval=%d, nodeIndex=%d\n",
+                    reply.context, reply.retval, reply.nodeIndex);
+        } catch (Exception e) {
+            System.err.printf("GetNodeIndex request failed:\n");
+            e.printStackTrace();
+        }
+    }
+
+    private static void testSwInterfaceDump(final FutureJVppFacade jvpp) {
+        System.out.println("Sending SwInterfaceDump request...");
+        try {
+            final SwInterfaceDump request = new SwInterfaceDump();
+            request.nameFilterValid = 0;
+            request.nameFilter = "".getBytes();
+            final Future<JVppReply<SwInterfaceDump>> replyFuture = jvpp.send(request).toCompletableFuture();
+            final SwInterfaceDetailsReplyDump reply = (SwInterfaceDetailsReplyDump) replyFuture.get();
+
+            if (reply == null) {
+                throw new IllegalStateException("SwInterfaceDetailsReplyDump is null!");
+            }
+            if (reply.swInterfaceDetails == null) {
+                throw new IllegalStateException("SwInterfaceDetailsReplyDump.swInterfaceDetails is null!");
+            }
+
+            for (SwInterfaceDetails details : reply.swInterfaceDetails) {
+                if (details == null) {
+                    throw new IllegalStateException("reply.swInterfaceDetails contains null element!");
+                }
+
+                System.out.printf("Received SwInterfaceDetails: interfaceName=%s, l2AddressLength=%d, adminUpDown=%d, " +
+                                "linkUpDown=%d, linkSpeed=%d, linkMtu=%d\n",
+                        new String(details.interfaceName), details.l2AddressLength, details.adminUpDown,
+                        details.linkUpDown, details.linkSpeed, (int) details.linkMtu);
+            }
+        } catch (Exception e) {
+            System.err.printf("SwInterfaceDump request failed:\n");
+            e.printStackTrace();
+        }
+    }
+
+    private static void testFutureApi() throws Exception {
+        System.out.println("Testing Java future API");
+
+        final Map<Integer, CompletableFuture<? extends JVppReply<?>>>  map = new HashMap<>();
+        final org.openvpp.jvpp.JVppImpl impl =
+                new org.openvpp.jvpp.JVppImpl(VppJNIConnection.create("FutureApiTest", new FutureJVppFacadeCallback(map)));
+        final FutureJVppFacade jvpp = new FutureJVppFacade(impl, map);
+        System.out.println("Successfully connected to VPP");
+
+        testShowVersion(jvpp);
+        testGetNodeIndex(jvpp);
+        testSwInterfaceDump(jvpp);
+
+        System.out.println("Disconnecting...");
+        // TODO we should consider adding jvpp.close(); to the facade
+        impl.close();
+    }
+
+    public static void main(String[] args) throws Exception {
+        testFutureApi();
+    }
+}
-- 
cgit 1.2.3-korg


From f86abbb936908a724be6d4e61e3720fd44b7d956 Mon Sep 17 00:00:00 2001
From: "Keith Burns (alagalah)" <alagalah@gmail.com>
Date: Mon, 2 May 2016 10:20:53 -0700
Subject: VPP-33 Removing javah from Makefile. Merged as fix for Gerrit 884

Change-Id: I2d9d6a607ffa1a8788c1ce79770db8b2b9bae6fb
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
---
 Makefile | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f4b46f8e..53930928 100644
--- a/Makefile
+++ b/Makefile
@@ -96,9 +96,6 @@ ifeq ("$(shell lsb_release -si)", "Ubuntu")
 	  echo "by executing \"make install-dep\"\n" ; \
 	  exit 1 ; \
 	fi ; \
-	if [ "$(shell lsb_release -r | awk '{print $$2}')"=="14.04" ]; then \
-		sudo update-alternatives --set javah /usr/lib/jvm/java-8-openjdk-amd64/bin/javah ; \
-	fi ; \
 	exit 0
 endif
 	@echo "SOURCE_PATH = $(WS_ROOT)"                   > $(BR)/build-config.mk
@@ -124,9 +121,6 @@ install-dep:
 ifeq ("$(shell lsb_release -si)", "Ubuntu")
 	$(use_ppa_for_jdk8)
 	@sudo apt-get -y install $(DEB_DEPENDS)
-	if [ "$(shell lsb_release -r | awk '{print $$2}')"=="14.04" ]; then \
-		update-alternatives --set javah /usr/lib/jvm/java-8-openjdk-amd64/bin/javah ; \
-	fi ; \
 else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo yum groupinstall -y $(RPM_DEPENDS_GROUPS)
 	@sudo yum install -y $(RPM_DEPENDS)
-- 
cgit 1.2.3-korg


From c5e8681b320884f780508458ebff873761d5e04a Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Mon, 2 May 2016 19:40:27 +0200
Subject: Re-do java-8 handling, add unattended switch to toplevel Makefile

Change-Id: Ifaea353be5b42bb6edbcfa0506d02b721c00e392
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                    | 39 +++++++++++++++++++++------------------
 build-root/vagrant/build.sh |  2 +-
 2 files changed, 22 insertions(+), 19 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 53930928..f9a95437 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,12 @@ MINIMAL_STARTUP_CONF="unix { interactive }"
 
 GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
 
+#
+# OS Detection
+#
+OS_ID        = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms openjdk-8-jdk git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
@@ -34,6 +40,10 @@ ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
 endif
 
+ifeq ($(findstring y,$(UNATTENDED)),y)
+CONFIRM=-y
+endif
+
 .PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
 .PHONY: ctags cscope
@@ -77,19 +87,8 @@ help:
 	@echo " PLATFORM     = $(PLATFORM)"
 	@echo " DPDK_VERSION = $(DPDK_VERSION)"
 
-# openjdk-8-jdk is not available in 14.04 repos by default
-define use_ppa_for_jdk8
-if [ "$(shell lsb_release -r | awk '{print $$2}')"=="14.04" ]; then \
-	sudo apt-get -y install software-properties-common; \
-	sudo add-apt-repository -y ppa:openjdk-r/ppa; \
-	sudo apt-get update; \
-fi;
-endef
-
 $(BR)/.bootstrap.ok:
-ifeq ("$(shell lsb_release -si)", "Ubuntu")
-	$(use_ppa_for_jdk8)
-
+ifeq ($(OS_ID),ubuntu)
 	@MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
 	if [ -n "$$MISSING" ] ; then \
 	  echo "\nPlease install missing packages: \n$$MISSING\n" ; \
@@ -118,13 +117,17 @@ endif
 bootstrap: $(BR)/.bootstrap.ok
 
 install-dep:
-ifeq ("$(shell lsb_release -si)", "Ubuntu")
-	$(use_ppa_for_jdk8)
-	@sudo apt-get -y install $(DEB_DEPENDS)
+ifeq ($(OS_ID),ubuntu)
+ifeq ($(OS_VERSION_ID),14.04)
+	@sudo apt-get $(CONFIRM) install software-properties-common
+	@sudo add-apt-repository $(CONFIRM) ppa:openjdk-r/ppa
+	@sudo apt-get update
+endif
+	@sudo apt-get $(CONFIRM) install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
-	@sudo yum groupinstall -y $(RPM_DEPENDS_GROUPS)
-	@sudo yum install -y $(RPM_DEPENDS)
-	@sudo yum install -y --enablerepo=epel $(EPEL_DEPENDS)
+	@sudo yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
+	@sudo yum install $(CONFIRM) $(RPM_DEPENDS)
+	@sudo yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS)
 	@sudo debuginfo-install glibc-2.17-106.el7_2.4.x86_64 openssl-libs-1.0.1e-51.el7_2.4.x86_64 zlib-1.2.7-15.el7.x86_64
 else
 	$(error "This option currently works only on Ubuntu or Centos systems")
diff --git a/build-root/vagrant/build.sh b/build-root/vagrant/build.sh
index 45a7eb4d..aaaa62f6 100755
--- a/build-root/vagrant/build.sh
+++ b/build-root/vagrant/build.sh
@@ -34,7 +34,7 @@ echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION
 
 # Install dependencies
 cd $VPP_DIR
-make install-dep
+make UNATTENDED=yes install-dep
 
 # Really really clean things up so we can be sure
 # that the build works even when switching distros
-- 
cgit 1.2.3-korg


From d6a779c41160f5ff50a6bfa2114bedcca12605e0 Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Tue, 3 May 2016 16:47:50 -0500
Subject: Fix for unattended in Makefile

Also works around verify

Change-Id: I79ac470ec3fa9943c3a0913ebfaaf91176eb9a81
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 Makefile                    |  2 +-
 build-root/vagrant/build.sh | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f9a95437..226c7951 100644
--- a/Makefile
+++ b/Makefile
@@ -128,7 +128,7 @@ else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
 	@sudo yum install $(CONFIRM) $(RPM_DEPENDS)
 	@sudo yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS)
-	@sudo debuginfo-install glibc-2.17-106.el7_2.4.x86_64 openssl-libs-1.0.1e-51.el7_2.4.x86_64 zlib-1.2.7-15.el7.x86_64
+	@sudo debuginfo-install $(CONFIRM) glibc-2.17-106.el7_2.4.x86_64 openssl-libs-1.0.1e-51.el7_2.4.x86_64 zlib-1.2.7-15.el7.x86_64
 else
 	$(error "This option currently works only on Ubuntu or Centos systems")
 endif
diff --git a/build-root/vagrant/build.sh b/build-root/vagrant/build.sh
index aaaa62f6..7fd7e3a6 100755
--- a/build-root/vagrant/build.sh
+++ b/build-root/vagrant/build.sh
@@ -42,6 +42,18 @@ make wipe
 (cd build-root/;make distclean)
 rm -f build-root/.bootstrap.ok
 
+if [ $DISTRIB_ID == "CentOS" ]; then
+    echo rpm -V apr-devel
+    rpm -V apr-devel
+    if [ $? != 0 ]; then sudo yum reinstall -y apr-devel;fi
+    echo rpm -V ganglia-devel
+    rpm -V ganglia-devel
+    if [ $? != 0 ]; then sudo yum reinstall -y ganglia-devel;fi
+    echo rpm -V libconfuse-devel
+    rpm -V libconfuse-devel
+    if [ $? != 0 ]; then sudo yum reinstall -y libconfuse-devel;fi
+fi
+
 # Build and install packaging
 $SUDOCMD make bootstrap
 if [ $DISTRIB_ID == "Ubuntu" ]; then
-- 
cgit 1.2.3-korg


From 027103e561a1a04c348a2507129e943297748e2a Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Thu, 5 May 2016 18:03:27 -0500
Subject: Switch to using -headless JDK

By default, jdks bring a bunch of UI related things
we don't need, so switch to headeless.

Also, use default-jdk-headless for Ubuntu after 14.04.
Use openjdk-8-jdk-headless for Ubuntu 14.04.

Change-Id: I3cf14c39c9f59dc2f1beba8dfb19971f4b67f5a6
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 226c7951..8050f876 100644
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,13 @@ OS_ID        = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"
 OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
-DEB_DEPENDS += debhelper dkms openjdk-8-jdk git libtool libganglia1-dev libapr1-dev dh-systemd
+DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
+ifeq ($(OS_VERSION_ID),14.04)
+	DEB_DEPENDS += openjdk-8-jdk-headless
+else
+	DEB_DEPENDS += default-jdk-headless
+endif
 
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
-- 
cgit 1.2.3-korg


From b585097048884e063ac25aecc26a6802ee3faa4d Mon Sep 17 00:00:00 2001
From: Chris Luke <chrisy@flirble.org>
Date: Tue, 3 May 2016 16:34:59 -0400
Subject: VPP-57 Add Doxygen to VPP

- Configures Doxygen.
- Adds a source filter to do magic on our use of the preprocessor to do
  constructor stuff to make Doxygen grok it better.
- Adds a convenience helper to the root Makefile.
- Adds a README.md to the root directory (and which Doxygem uses as its
  "mainpage".
- Add several other documentative files.
- Currently using SVG for call graphs, though this may have a
  load-time performance impact in browsers.

Change-Id: I25fc6fb5bf634319dcb36a7f0e32031921c125ac
Signed-off-by: Chris Luke <chrisy@flirble.org>
---
 .gitignore                   |    3 +
 Makefile                     |   25 +
 README.md                    |   94 ++
 doxygen/assets/doxy-vpp.css  |   47 +
 doxygen/assets/logo_fdio.png |  Bin 0 -> 3092 bytes
 doxygen/dir.dox.sample       |    6 +
 doxygen/doxygen.cfg          | 2433 ++++++++++++++++++++++++++++++++++++++++++
 doxygen/filter_c.py          |   37 +
 doxygen/layout.xml           |  194 ++++
 svm/dir.dox                  |    5 +
 vlib/dir.dox                 |    5 +
 vlib/example/dir.dox         |    6 +
 vlib/vlib/dir.dox            |    5 +
 vlib/vlib/unix/cli.c         |  176 ++-
 vpp/vnet/main.c              |    8 -
 vppinfra/dir.dox             |    3 +
 vppinfra/tools/dir.dox       |    3 +
 vppinfra/vppinfra/dir.dox    |    3 +
 vppinfra/vppinfra/vec.h      |    4 +-
 19 files changed, 2996 insertions(+), 61 deletions(-)
 create mode 100644 README.md
 create mode 100644 doxygen/assets/doxy-vpp.css
 create mode 100644 doxygen/assets/logo_fdio.png
 create mode 100644 doxygen/dir.dox.sample
 create mode 100644 doxygen/doxygen.cfg
 create mode 100755 doxygen/filter_c.py
 create mode 100644 doxygen/layout.xml
 create mode 100644 svm/dir.dox
 create mode 100644 vlib/dir.dox
 create mode 100644 vlib/example/dir.dox
 create mode 100644 vlib/vlib/dir.dox
 create mode 100644 vppinfra/dir.dox
 create mode 100644 vppinfra/tools/dir.dox
 create mode 100644 vppinfra/vppinfra/dir.dox

(limited to 'Makefile')

diff --git a/.gitignore b/.gitignore
index a104623c..e3182fd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,6 @@ test-driver
 # cscope and ctags
 /cscope.*
 /tags
+
+# Generated documentation
+/build-root/docs
diff --git a/Makefile b/Makefile
index 8050f876..dee25667 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,9 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
+#RPM_DEPENDS += doxygen # TODO
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
+#EPEL_DEPENDS += graphviz # TODO
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
@@ -209,3 +211,26 @@ ctags: ctags.files
 cscope: cscope.files
 	@cscope -b -q -v
 
+
+DOXY_INPUT = \
+	README.md \
+	vppinfra \
+	svm \
+	vlib \
+	vlib-api \
+	vnet \
+	vpp \
+	vpp-api
+
+.PHONY: doxygen
+doxygen:
+	@mkdir -p "$(BR)/docs"
+	ROOT="$(WS_ROOT)" \
+	     BUILD_ROOT="$(BR)" \
+	     INPUT="$(addprefix $(WS_ROOT)/,$(DOXY_INPUT))" \
+	     HTML=YES \
+	     VERSION="`git describe --tags --dirty`" \
+	     doxygen doxygen/doxygen.cfg
+
+wipe-doxygen:
+	rm -rf "$(BR)/docs"
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..2a71d27e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,94 @@
+Vector Packet Processing
+========================
+
+## Introduction.
+
+The VPP platform is an extensible framework that provides out-of-the-box
+production quality switch/router functionality. It is the open source version
+of Cisco's Vector Packet Processing (VPP) technology: a high performance,
+packet-processing stack that can run on commodity CPUs.
+
+The benefits of this implementation of VPP are its high performance, proven
+technology, its modularity and flexibility, and rich feature set.
+
+For more information on VPP and its features please visit the
+[FD.io website](http://fd.io/) and
+[What is VPP?](https://wiki.fd.io/view/VPP/What_is_VPP%3F) pages.
+
+
+## Directory layout.
+
+Directory name         | Description
+---------------------- | -------------------------------------------
+     build-data        | Build metadata
+     build-root        | Build output directory
+     doxygen           | Documentation generator configuration
+     dpdk              | DPDK patches and build infrastructure
+     g2                | Event log visualization tool
+     gmod              | perf related?
+     perftool          | Performance tool
+     sample-plugin     | A sample plugin
+@ref svm               | Shared virtual memory allocation library
+     test              | Unit tests
+@ref vlib              | VPP application library source
+@ref vlib-api          | VPP API library source
+@ref vnet              | VPP networking source
+@ref vpp               | VPP application source
+@ref vpp-api           | VPP application API source
+     vppapigen         | VPP API generator source
+     vpp-api-test      | VPP API test program source
+@ref vppinfra          | VPP core library source
+
+(If the page you are viewing is not generated by Doxygen then
+ignore any @@ref labels in the above table.)
+
+
+## Getting started.
+
+In general anyone interested in building, developing or running VPP should
+consult the [VPP wiki](https://wiki.fd.io/view/VPP) for more complete
+documentation.
+
+In particular, readers are recommended to take a look at [Pulling, Building,
+Running, Hacking, Pushing](https://wiki.fd.io/view/VPP/Pulling,_Building,_Run
+ning,_Hacking_and_Pushing_VPP_Code) which provides extensive step-by-step
+coverage of the topic.
+
+For the impatient, some salient information is distilled below.
+
+
+### Quick-start: On an existing Linux host.
+
+To install system dependencies, build VPP and then install it, simply run the
+build script. This should be performed a non-privileged user with `sudo`
+access from the project base directory:
+
+    ./build-root/vagrant/build.sh
+
+If you want a more fine-grained approach because you intend to do some
+development work, the `Makefile` in the root directory of the source tree
+provides several convenience shortcuts as `make` targets that may be of
+interest. To see the available targets run:
+
+    make
+
+
+### Quick-start: Vagrant.
+
+The directory `build-root/vagrant` contains a `VagrantFile` and supporting
+scripts to bootstrap a working VPP inside a Vagrant-managed Virtual Machine.
+This VM can then be used to test concepts with VPP or as a development
+platform to extend VPP. Some obvious caveats apply when using a VM for VPP
+since its performance will never match that of bare metal; if your work is
+timing or performance sensitive, consider using bare metal in addition or
+instead of the VM.
+
+For this to work you will need a working installation of Vagrant. Instructions
+for this can be found [on the Setting up Vagrant wiki page]
+(https://wiki.fd.io/view/DEV/Setting_Up_Vagrant).
+
+
+## More information.
+
+Visit the [VPP wiki](https://wiki.fd.io/view/VPP) for details on more
+advanced building strategies and development notes.
diff --git a/doxygen/assets/doxy-vpp.css b/doxygen/assets/doxy-vpp.css
new file mode 100644
index 00000000..3b74eb6f
--- /dev/null
+++ b/doxygen/assets/doxy-vpp.css
@@ -0,0 +1,47 @@
+/* VPP CSS overrides */
+
+body, table, div, p, dl {
+	font: initial;
+	font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif;
+	font-size: small;
+}
+
+code, tt {
+	font: initial;
+	font-family: Consolas, Courier, monospace;
+	font-size: small;
+}
+
+pre {
+	font-size: 105%;
+}
+
+
+.title {
+	font: initial;
+	font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif;
+	font-size: 150%;
+	font-weight: bold;
+}
+
+
+.mdescLeft, .mdescRight,
+.memItemLeft, .memItemRight,
+.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
+	font-family: Consolas, Courier, monospace;
+}
+
+.memname {
+	font-family: Consolas, Courier, monospace;
+	font-weight: bold;
+	font-size: 105%;
+}
+
+.paramname {
+	font-family: Consolas, Courier, monospace;
+	font-weight: bold;
+}
+
+a.el {
+	font-family: Consolas, Courier, monospace;
+}
diff --git a/doxygen/assets/logo_fdio.png b/doxygen/assets/logo_fdio.png
new file mode 100644
index 00000000..ddfef2c7
Binary files /dev/null and b/doxygen/assets/logo_fdio.png differ
diff --git a/doxygen/dir.dox.sample b/doxygen/dir.dox.sample
new file mode 100644
index 00000000..8dc0fee7
--- /dev/null
+++ b/doxygen/dir.dox.sample
@@ -0,0 +1,6 @@
+/* Doxygen directory documentation */
+/**
+@dir
+@brief Someone please fix this description
+@todo This directory needs a description.
+*/
diff --git a/doxygen/doxygen.cfg b/doxygen/doxygen.cfg
new file mode 100644
index 00000000..6d6bb6cc
--- /dev/null
+++ b/doxygen/doxygen.cfg
@@ -0,0 +1,2433 @@
+# Doxyfile 1.8.11
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "FD.io VPP"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = $(VERSION)
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "Vector Packet Processing"
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           = $(ROOT)/doxygen/assets/logo_fdio.png
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = $(BUILD_ROOT)/docs
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = YES
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = $(ROOT)
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    = $(ROOT)
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      = def=C
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = NO
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = YES
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 50
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            = $(ROOT)/doxygen/layout.xml
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = $(INPUT)
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
+# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
+
+FILE_PATTERNS          = *.md *.c *.h *.def *.inc *.S *.dox
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = YES
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = */test/* *_test.c test_*.c
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        = _ _*
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *.c *.h
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             = $(ROOT)/doxygen/assets
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        = *.c=$(ROOT)/doxygen/filter_c.py
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE = $(ROOT)/README.md
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = NO
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse-libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  = $(ROOT)/doxygen/assets/doxy-vpp.css
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 230
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 255
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = YES
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "FD.io VPP"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = io.fd.vpp
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = io.fd.vpp
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = YES
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = io.fd.vpp
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = YES
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = YES
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  = *.h *.def
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = \
+	_DOXYGEN _DPDK CLIB_DEBUG CLIB_UNIX __attribute__(x)= \
+	__x86_64__ __X86_64__ __linux__ __LINUX__ __64BIT__ __64bit__ \
+	__ORDER_LITTLE_ENDIAN__=1234 \
+	__BYTE_ORDER__=1234 \
+	__FLOAT_WORD_ORDER__=1234
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       = $(BUILD_ROOT)/docs/vpp.doxytags
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: YES.
+
+HAVE_DOT               = YES
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = YES
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = YES
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = svg
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = YES
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 3
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
+
diff --git a/doxygen/filter_c.py b/doxygen/filter_c.py
new file mode 100755
index 00000000..5a812a55
--- /dev/null
+++ b/doxygen/filter_c.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+
+import sys, re
+
+if len(sys.argv) < 2:
+    sys.stderr.write("Usage: %s <filename>\n" % (sys.argv[0]))
+    sys.exit(1)
+
+patterns = [
+    # Search for VLIB_CLI_COMMAND, extract its parameter and add a docblock for it
+    ( re.compile("(?P<m>VLIB_CLI_COMMAND)\s*[(](?P<name>[a-zA-Z0-9_]+)(,[^)]*)?[)]"), r"/** @brief (@em constructor) \g<m> (\g<name>) */ vlib_cli_command_t \g<name>"),
+
+    # Search for VLIB_REGISTER_NODE, extract its parameter and add a docblock for it
+    ( re.compile("(?P<m>VLIB_REGISTER_NODE)\s*[(](?P<name>[a-zA-Z0-9_]+)(,[^)]*)?[)]"), r"/** @brief (@em constructor) \g<m> (\g<name>) */ vlib_node_registration_t \g<name>"),
+
+    # Search for VLIB_INIT_FUNCTION, extract its parameter and add a docblock for it
+    ( re.compile("(?P<m>VLIB_INIT_FUNCTION)\s*[(](?P<name>[a-zA-Z0-9_]+)[)]"), r"/** @brief (@em constructor) \g<m> (@ref \g<name>) */ vlib_init_function_t * _vlib_init_function_\g<name>"),
+    ( re.compile("(?P<m>VLIB_DECLARE_INIT_FUNCTION)\s*[(](?P<name>[a-zA-Z0-9_]+)[)]"), r"/** @brief (@em constructor) \g<m> (@ref \g<name>) */ vlib_init_function_t * _vlib_init_function_\g<name>"),
+
+    # Search for VLIB_LOOP_ENTER_FUNCTION, extract the 1st parameter (ignore any others) and add a docblock for it
+    ( re.compile("(?P<m>VLIB_MAIN_LOOP_ENTER_FUNCTION)\s*[(](?P<name>[a-zA-Z0-9_]+)(,[^)]*)?[)]"), r"/** @brief (@em constructor) \g<m> (@ref \g<name>) */ _vlib_main_loop_enter_\g<name>"),
+    ( re.compile("(?P<m>VLIB_MAIN_LOOP_EXIT_FUNCTION)\s*[(](?P<name>[a-zA-Z0-9_]+)(,[^)]*)?[)]"), r"/** @brief (@em constructor) \g<m> (@ref \g<name>) */ _vlib_main_loop_exit_\g<name>"),
+
+    # Search for VLIB_CONFIG_FUNCTION, extract the 1st parameter (ignore any others) and add a docblock for it
+    ( re.compile("(?P<m>VLIB_CONFIG_FUNCTION)\s*[(](?P<name>[a-zA-Z0-9_]+),\s*(?P<n>\"[^\"]+\")(,[^)]*)?[)]"), r"/** @brief (@em constructor) \g<m> (\g<name>, \g<n>) */ vlib_config_function_runtime_t _vlib_config_function_\g<name>"),
+    ( re.compile("(?P<m>VLIB_EARLY_CONFIG_FUNCTION)\s*[(](?P<name>[a-zA-Z0-9_]+),\s*(?P<n>\"[^\"]+\")(,[^)]*)?[)]"), r"/** @brief (@em constructor) \g<m> (\g<name>, \g<n>) */ vlib_config_function_runtime_t _vlib_config_function_\g<name>"),
+
+    # Search for "format_thing" and "unformat_thing" when used as a function pointer and add parens
+    ( re.compile("(?P<pre>(^|,)\s*)(?P<name>(un)?format_[a-zA-Z0-9_]+)(?P<post>\s*(,|$))") , r"\g<pre>\g<name>()\g<post>" ),
+]
+
+with open(sys.argv[1]) as fd:
+    for line in fd:
+        str = line
+        for p in patterns:
+            str = p[0].sub(p[1], str)
+        sys.stdout.write(str)
diff --git a/doxygen/layout.xml b/doxygen/layout.xml
new file mode 100644
index 00000000..e91f4dab
--- /dev/null
+++ b/doxygen/layout.xml
@@ -0,0 +1,194 @@
+<doxygenlayout version="1.0">
+  <!-- Generated by doxygen 1.8.11 -->
+  <!-- Navigation index tabs for HTML output -->
+  <navindex>
+    <tab type="mainpage" visible="yes" title=""/>
+    <tab type="pages" visible="yes" title="" intro=""/>
+    <tab type="modules" visible="yes" title="" intro=""/>
+    <tab type="namespaces" visible="yes" title="">
+      <tab type="namespacelist" visible="yes" title="" intro=""/>
+      <tab type="namespacemembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="classes" visible="yes" title="">
+      <tab type="classlist" visible="yes" title="" intro=""/>
+      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
+      <tab type="hierarchy" visible="yes" title="" intro=""/>
+      <tab type="classmembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="files" visible="yes" title="Source">
+      <tab type="filelist" visible="yes" title="Files" intro=""/>
+      <tab type="globals" visible="yes" title="Symbols" intro=""/>
+    </tab>
+    <tab type="examples" visible="yes" title="" intro=""/>
+  </navindex>
+
+  <!-- Layout definition for a class page -->
+  <class>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <inheritancegraph visible="$CLASS_GRAPH"/>
+    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
+    <memberdecl>
+      <nestedclasses visible="yes" title=""/>
+      <publictypes title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <publicslots title=""/>
+      <signals title=""/>
+      <publicmethods title=""/>
+      <publicstaticmethods title=""/>
+      <publicattributes title=""/>
+      <publicstaticattributes title=""/>
+      <protectedtypes title=""/>
+      <protectedslots title=""/>
+      <protectedmethods title=""/>
+      <protectedstaticmethods title=""/>
+      <protectedattributes title=""/>
+      <protectedstaticattributes title=""/>
+      <packagetypes title=""/>
+      <packagemethods title=""/>
+      <packagestaticmethods title=""/>
+      <packageattributes title=""/>
+      <packagestaticattributes title=""/>
+      <properties title=""/>
+      <events title=""/>
+      <privatetypes title=""/>
+      <privateslots title=""/>
+      <privatemethods title=""/>
+      <privatestaticmethods title=""/>
+      <privateattributes title=""/>
+      <privatestaticattributes title=""/>
+      <friends title=""/>
+      <related title="" subtitle=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <constructors title=""/>
+      <functions title=""/>
+      <related title=""/>
+      <variables title=""/>
+      <properties title=""/>
+      <events title=""/>
+    </memberdef>
+    <allmemberslink visible="yes"/>
+    <usedfiles visible="$SHOW_USED_FILES"/>
+    <authorsection visible="yes"/>
+  </class>
+
+  <!-- Layout definition for a namespace page -->
+  <namespace>
+    <briefdescription visible="yes"/>
+    <memberdecl>
+      <nestednamespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </namespace>
+
+  <!-- Layout definition for a file page -->
+  <file>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <includegraph visible="$INCLUDE_GRAPH"/>
+    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
+    <sourcelink visible="yes"/>
+    <memberdecl>
+      <classes visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection/>
+  </file>
+
+  <!-- Layout definition for a group page -->
+  <group>
+    <briefdescription visible="yes"/>
+    <groupgraph visible="$GROUP_GRAPHS"/>
+    <memberdecl>
+      <nestedgroups visible="yes" title=""/>
+      <dirs visible="yes" title=""/>
+      <files visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <pagedocs/>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </group>
+
+  <!-- Layout definition for a directory page -->
+  <directory>
+    <briefdescription visible="yes"/>
+    <directorygraph visible="yes"/>
+    <memberdecl>
+      <dirs visible="yes"/>
+      <files visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+  </directory>
+</doxygenlayout>
diff --git a/svm/dir.dox b/svm/dir.dox
new file mode 100644
index 00000000..ab84cb50
--- /dev/null
+++ b/svm/dir.dox
@@ -0,0 +1,5 @@
+/* Doxygen directory documentation */
+/**
+@dir
+@brief Shared virtual memory allocation library.
+*/
diff --git a/vlib/dir.dox b/vlib/dir.dox
new file mode 100644
index 00000000..6db842ad
--- /dev/null
+++ b/vlib/dir.dox
@@ -0,0 +1,5 @@
+/* Doxygen directory documentation */
+/**
+@dir
+@brief VLIB application library.
+*/
diff --git a/vlib/example/dir.dox b/vlib/example/dir.dox
new file mode 100644
index 00000000..8dc0fee7
--- /dev/null
+++ b/vlib/example/dir.dox
@@ -0,0 +1,6 @@
+/* Doxygen directory documentation */
+/**
+@dir
+@brief Someone please fix this description
+@todo This directory needs a description.
+*/
diff --git a/vlib/vlib/dir.dox b/vlib/vlib/dir.dox
new file mode 100644
index 00000000..765b4a05
--- /dev/null
+++ b/vlib/vlib/dir.dox
@@ -0,0 +1,5 @@
+/* Doxygen directory documentation */
+/**
+@dir
+@brief VLIB application library source.
+*/
diff --git a/vlib/vlib/unix/cli.c b/vlib/vlib/unix/cli.c
index b0c950cb..70ffdec7 100644
--- a/vlib/vlib/unix/cli.c
+++ b/vlib/vlib/unix/cli.c
@@ -36,6 +36,12 @@
  *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+/**
+ * @file vlib/vlib/unix/cli.c
+ * @brief Unix stdin/socket command line interface.
+ * Provides a command line interface so humans can interact with VPP.
+ * This is predominantly a debugging and testing mechanism.
+ */
 
 #include <vlib/vlib.h>
 #include <vlib/unix/unix.h>
@@ -50,23 +56,31 @@
 #include <arpa/telnet.h>
 #include <sys/ioctl.h>
 
-/* ANSI Escape code. */
+/** ANSI escape code. */
 #define ESC "\x1b"
 
-/* ANSI Control Sequence Introducer. */
+/** ANSI Control Sequence Introducer. */
 #define CSI ESC "["
 
-/* ANSI sequences. */
+/** ANSI clear screen. */
 #define ANSI_CLEAR      CSI "2J" CSI "1;1H"
+/** ANSI reset color settings. */
 #define ANSI_RESET      CSI "0m"
+/** ANSI Start bold text. */
 #define ANSI_BOLD       CSI "1m"
+/** ANSI Stop bold text. */
 #define ANSI_DIM        CSI "2m"
+/** ANSI Start dark red text. */
 #define ANSI_DRED       ANSI_DIM CSI "31m"
+/** ANSI Start bright red text. */
 #define ANSI_BRED       ANSI_BOLD CSI "31m"
-#define ANSI_CLEAR      CSI "2J" CSI "1;1H"
+/** ANSI clear line cursor is on. */
 #define ANSI_CLEARLINE  CSI "2K"
+/** ANSI scroll screen down one line. */
 #define ANSI_SCROLLDN   CSI "1T"
+/** ANSI save cursor position. */
 #define ANSI_SAVECURSOR CSI "s"
+/** ANSI restore cursor position if previously saved. */
 #define ANSI_RESTCURSOR CSI "u"
 
 /** Maximum depth into a byte stream from which to compile a Telnet
@@ -77,9 +91,10 @@
 #define UNIX_CLI_STDIN_FD 0
 
 
+/** A CLI banner line. */
 typedef struct {
-  u8 * line;
-  u32 length;
+  u8 * line;    /**< The line to print. */
+  u32 length;   /**< The length of the line without terminating NUL. */
 } unix_cli_banner_t;
 
 #define _(a) { .line = (u8 *)(a), .length = sizeof(a) - 1 }
@@ -104,12 +119,13 @@ _("\n")
 
 /** Unix CLI session. */
 typedef struct {
+  /** The file index held by unix.c */
   u32 unix_file_index;
 
-  /* Vector of output pending write to file descriptor. */
+  /** Vector of output pending write to file descriptor. */
   u8 * output_vector;
 
-  /* Vector of input saved by Unix input node to be processed by
+  /** Vector of input saved by Unix input node to be processed by
      CLI process. */
   u8 * input_vector;
 
@@ -118,48 +134,55 @@ typedef struct {
   u8 * current_command;
   i32 excursion;
 
-  /* Maximum number of history entries this session will store. */
+  /** Maximum number of history entries this session will store. */
   u32 history_limit;
 
-  /* Current command line counter */
+  /** Current command line counter */
   u32 command_number;
 
   u8 * search_key;
   int search_mode;
 
-  /* Position of the insert cursor on the current input line */
+  /** Position of the insert cursor on the current input line */
   u32 cursor;
 
-  /* Line mode or char mode */
+  /** Line mode or char mode */
   u8 line_mode;
 
-  /* Set if the CRLF mode wants CR + LF */
+  /** Set if the CRLF mode wants CR + LF */
   u8 crlf_mode;
 
-  /* Can we do ANSI output? */
+  /** Can we do ANSI output? */
   u8 ansi_capable;
 
-  /* Has the session started? */
+  /** Has the session started? */
   u8 started;
 
-  /* Disable the pager? */
+  /** Disable the pager? */
   u8 no_pager;
 
-  /* Pager buffer */
+  /** Pager buffer */
   u8 ** pager_vector;
 
-  /* Lines currently displayed */
+  /** Lines currently displayed */
   u32 pager_lines;
 
-  /* Line number of top of page */
+  /** Line number of top of page */
   u32 pager_start;
 
-  /* Terminal size */
-  u32 width, height;
+  /** Terminal width */
+  u32 width;
 
+  /** Terminal height */
+  u32 height;
+
+  /** Process node identifier */
   u32 process_node_index;
 } unix_cli_file_t;
 
+/** Resets the pager buffer and other data.
+ * @param f The CLI session whose pager needs to be reset.
+ */
 always_inline void
 unix_cli_pager_reset (unix_cli_file_t *f)
 {
@@ -174,6 +197,9 @@ unix_cli_pager_reset (unix_cli_file_t *f)
   f->pager_vector = 0;
 }
 
+/** Release storage used by a CLI session.
+ * @param f The CLI session whose storage needs to be released.
+ */
 always_inline void
 unix_cli_file_free (unix_cli_file_t * f)
 {
@@ -182,15 +208,15 @@ unix_cli_file_free (unix_cli_file_t * f)
   unix_cli_pager_reset(f);
 }
 
-/* CLI actions */
+/** CLI actions */
 typedef enum {
-  UNIX_CLI_PARSE_ACTION_NOACTION = 0,
-  UNIX_CLI_PARSE_ACTION_CRLF,
-  UNIX_CLI_PARSE_ACTION_TAB,
-  UNIX_CLI_PARSE_ACTION_ERASE,
-  UNIX_CLI_PARSE_ACTION_ERASERIGHT,
-  UNIX_CLI_PARSE_ACTION_UP,
-  UNIX_CLI_PARSE_ACTION_DOWN,
+  UNIX_CLI_PARSE_ACTION_NOACTION = 0,  /**< No action */
+  UNIX_CLI_PARSE_ACTION_CRLF,          /**< Carriage return, newline or enter */
+  UNIX_CLI_PARSE_ACTION_TAB,           /**< Tab key */
+  UNIX_CLI_PARSE_ACTION_ERASE,         /**< Erase cursor left */
+  UNIX_CLI_PARSE_ACTION_ERASERIGHT,    /**< Erase cursor right */
+  UNIX_CLI_PARSE_ACTION_UP,            /**< Up arrow */
+  UNIX_CLI_PARSE_ACTION_DOWN,          /**< Down arrow */
   UNIX_CLI_PARSE_ACTION_LEFT,
   UNIX_CLI_PARSE_ACTION_RIGHT,
   UNIX_CLI_PARSE_ACTION_HOME,
@@ -230,13 +256,22 @@ typedef struct {
   unix_cli_parse_action_t action;   /**< Action to take when matched. */
 } unix_cli_parse_actions_t;
 
-/** \brief Given a capital ASCII letter character return a NUL terminated
+/** @brief Given a capital ASCII letter character return a @c NUL terminated
  * string with the control code for that letter.
- * \example CTL('A') returns { 0x01, 0x00 } as a u8[].
+ *
+ * @param c An ASCII character.
+ * @return A @c NUL terminated string of type @c u8[].
+ *
+ * @par Example
+ *     @c CTL('A') returns <code>{ 0x01, 0x00 }</code> as a @c u8[].
  */
 #define CTL(c) (u8[]){ (c) - '@', 0 }
 
 #define _(a,b) { .input = (u8 *)(a), .len = sizeof(a) - 1, .action = (b) }
+/**
+ * Patterns to match on a CLI input stream.
+ * @showinitializer
+ */
 static unix_cli_parse_actions_t unix_cli_parse_strings[] = {
  /* Line handling */
  _( "\r\n",   UNIX_CLI_PARSE_ACTION_CRLF ),       /* Must be before '\r' */
@@ -294,6 +329,11 @@ static unix_cli_parse_actions_t unix_cli_parse_strings[] = {
  _( "\0",     UNIX_CLI_PARSE_ACTION_NOACTION ),   /* NUL */
  _( NULL,     UNIX_CLI_PARSE_ACTION_NOMATCH )
 };
+
+/**
+ * Patterns to match when a CLI session is in the pager.
+ * @showinitializer
+ */
 static unix_cli_parse_actions_t unix_cli_parse_pager[] = {
  /* Line handling */
  _( "\r\n",   UNIX_CLI_PARSE_ACTION_PAGER_CRLF ),       /* Must be before '\r' */
@@ -331,49 +371,54 @@ static unix_cli_parse_actions_t unix_cli_parse_pager[] = {
 };
 #undef _
 
+/** CLI session events. */
 typedef enum {
-  UNIX_CLI_PROCESS_EVENT_READ_READY,
-  UNIX_CLI_PROCESS_EVENT_QUIT,
+  UNIX_CLI_PROCESS_EVENT_READ_READY,  /**< A file descriptor has data to be read. */
+  UNIX_CLI_PROCESS_EVENT_QUIT,        /**< A CLI session wants to close. */
 } unix_cli_process_event_type_t;
 
+/** CLI global state. */
 typedef struct {
-  /* Prompt string for CLI. */
+  /** Prompt string for CLI. */
   u8 * cli_prompt;
 
+  /** Vec pool of CLI sessions. */
   unix_cli_file_t * cli_file_pool;
 
+  /** Vec pool of unused session indices. */
   u32 * unused_cli_process_node_indices;
 
-  /* The session index of the stdin cli */
+  /** The session index of the stdin cli */
   u32 stdin_cli_file_index;
 
-  /* File pool index of current input. */
+  /** File pool index of current input. */
   u32 current_input_file_index;
 } unix_cli_main_t;
 
+/** CLI global state */
 static unix_cli_main_t unix_cli_main;
 
 /**
  * \brief Search for a byte sequence in the action list.
  *
- * Searches unix_cli_parse_actions[] for a match with the bytes in \c input
- * of maximum length \c ilen . When a match is made \c *matched indicates how
- * many bytes were matched. Returns a value from the enum
- * \c unix_cli_parse_action_t to indicate whether no match was found, a
- * partial match was found or a complete match was found and what action,
- * if any, should be taken.
+ * Searches the @ref unix_cli_parse_actions_t list in @a a for a match with
+ * the bytes in @a input of maximum length @a ilen bytes.
+ * When a match is made @a *matched indicates how many bytes were matched.
+ * Returns a value from the enum @ref unix_cli_parse_action_t to indicate
+ * whether no match was found, a partial match was found or a complete
+ * match was found and what action, if any, should be taken.
  *
- * @param a       Actions list to search within.
- * @param input   String fragment to search for.
- * @param ilen    Length of the string in 'input'.
- * @param matched Pointer to an integer that will contain the number of
- *                bytes matched when a complete match is found.
+ * @param[in]  a        Actions list to search within.
+ * @param[in]  input    String fragment to search for.
+ * @param[in]  ilen     Length of the string in 'input'.
+ * @param[out] matched  Pointer to an integer that will contain the number
+ *                      of bytes matched when a complete match is found.
  *
- * @return Action from \v unix_cli_parse_action_t that the string fragment
+ * @return Action from @ref unix_cli_parse_action_t that the string fragment
  *         matches.
- *         \c UNIX_CLI_PARSE_ACTION_PARTIALMATCH is returned when the whole
- *         input string matches the start of at least one action.
- *         \c UNIX_CLI_PARSE_ACTION_NOMATCH is returned when there is no
+ *         @ref UNIX_CLI_PARSE_ACTION_PARTIALMATCH is returned when the
+ *         whole input string matches the start of at least one action.
+ *         @ref UNIX_CLI_PARSE_ACTION_NOMATCH is returned when there is no
  *         match at all.
  */
 static unix_cli_parse_action_t
@@ -1845,6 +1890,11 @@ static clib_error_t * unix_cli_read_ready (unix_file_t * uf)
   return /* no error */ 0;
 }
 
+/** Store a new CLI session.
+ * @param name The name of the session.
+ * @param fd   The file descriptor for the session I/O.
+ * @return The session ID.
+ */
 static u32 unix_cli_file_add (unix_cli_main_t * cm, char * name, int fd)
 {
   unix_main_t * um = &unix_main;
@@ -1905,6 +1955,7 @@ static u32 unix_cli_file_add (unix_cli_main_t * cm, char * name, int fd)
   return cf - cm->cli_file_pool;
 }
 
+/** Telnet listening socket has a new connection. */
 static clib_error_t * unix_cli_listen_read_ready (unix_file_t * uf)
 {
   unix_main_t * um = &unix_main;
@@ -1977,6 +2028,9 @@ static clib_error_t * unix_cli_listen_read_ready (unix_file_t * uf)
   return error;
 }
 
+/** The system terminal has informed us that the window size
+ * has changed.
+ */
 static void
 unix_cli_resize_interrupt (int signum)
 {
@@ -1992,6 +2046,7 @@ unix_cli_resize_interrupt (int signum)
   cf->height = ws.ws_row;
 }
 
+/** Handle configuration directives in the @em unix section. */
 static clib_error_t *
 unix_cli_config (vlib_main_t * vm, unformat_input_t * input)
 {
@@ -2109,6 +2164,9 @@ unix_cli_config (vlib_main_t * vm, unformat_input_t * input)
 
 VLIB_CONFIG_FUNCTION (unix_cli_config, "unix-cli");
 
+/** Called when VPP is shutting down, this resets the system
+ * terminal state, if previously saved.
+ */
 static clib_error_t *
 unix_cli_exit (vlib_main_t * vm)
 {
@@ -2123,6 +2181,11 @@ unix_cli_exit (vlib_main_t * vm)
 
 VLIB_MAIN_LOOP_EXIT_FUNCTION (unix_cli_exit);
 
+/** Set the CLI prompt.
+ * @param The C string to set the prompt to.
+ * @note This setting is global; it impacts all current
+ *       and future CLI sessions.
+ */
 void vlib_unix_cli_set_prompt (char * prompt)
 {
   char * fmt = (prompt[strlen(prompt)-1] == ' ') ? "%s" : "%s ";
@@ -2132,6 +2195,10 @@ void vlib_unix_cli_set_prompt (char * prompt)
   cm->cli_prompt = format (0, fmt, prompt);
 }
 
+/** CLI command to quit the terminal session.
+ * @note If this is a stdin session then this will
+ *       shutdown VPP also.
+ */
 static clib_error_t *
 unix_cli_quit (vlib_main_t * vm,
 	       unformat_input_t * input,
@@ -2152,6 +2219,7 @@ VLIB_CLI_COMMAND (unix_cli_quit_command, static) = {
   .function = unix_cli_quit,
 };
 
+/** CLI command to execute a VPP command script. */
 static clib_error_t *
 unix_cli_exec (vlib_main_t * vm,
 	       unformat_input_t * input,
@@ -2217,6 +2285,7 @@ VLIB_CLI_COMMAND (cli_exec, static) = {
   .is_mp_safe = 1,
 };
 
+/** CLI command to show various unix error statistics. */
 static clib_error_t *
 unix_show_errors (vlib_main_t * vm,
 		  unformat_input_t * input,
@@ -2285,6 +2354,7 @@ VLIB_CLI_COMMAND (cli_unix_show_errors, static) = {
   .function = unix_show_errors,
 };
 
+/** CLI command to show session command history. */
 static clib_error_t *
 unix_cli_show_history (vlib_main_t * vm,
       unformat_input_t * input,
@@ -2316,6 +2386,7 @@ VLIB_CLI_COMMAND (cli_unix_cli_show_history, static) = {
   .function = unix_cli_show_history,
 };
 
+/** CLI command to show terminal status. */
 static clib_error_t *
 unix_cli_show_terminal (vlib_main_t * vm,
       unformat_input_t * input,
@@ -2358,6 +2429,7 @@ VLIB_CLI_COMMAND (cli_unix_cli_show_terminal, static) = {
   .function = unix_cli_show_terminal,
 };
 
+/** CLI command to set terminal pager settings. */
 static clib_error_t *
 unix_cli_set_terminal_pager (vlib_main_t * vm,
       unformat_input_t * input,
@@ -2398,6 +2470,7 @@ VLIB_CLI_COMMAND (cli_unix_cli_set_terminal_pager, static) = {
   .function = unix_cli_set_terminal_pager,
 };
 
+/** CLI command to set terminal history settings. */
 static clib_error_t *
 unix_cli_set_terminal_history (vlib_main_t * vm,
       unformat_input_t * input,
@@ -2446,6 +2519,7 @@ VLIB_CLI_COMMAND (cli_unix_cli_set_terminal_history, static) = {
   .function = unix_cli_set_terminal_history,
 };
 
+/** CLI command to set terminal ANSI settings. */
 static clib_error_t *
 unix_cli_set_terminal_ansi (vlib_main_t * vm,
       unformat_input_t * input,
diff --git a/vpp/vnet/main.c b/vpp/vnet/main.c
index 2e08aa53..f707994b 100644
--- a/vpp/vnet/main.c
+++ b/vpp/vnet/main.c
@@ -23,14 +23,6 @@
 #include <vnet/devices/dpdk/dpdk.h>
 #endif
 
-/** \mainpage Virtual Packet Edge Documentation
- * \section intro_sec Introduction
- * 
- * VPE is a specific vector packet processing application,
- * designed to steer packets to/from tenant virtual machines.
- *
- */
-
 static void
 vpe_main_init (vlib_main_t * vm)
 {
diff --git a/vppinfra/dir.dox b/vppinfra/dir.dox
new file mode 100644
index 00000000..de59898c
--- /dev/null
+++ b/vppinfra/dir.dox
@@ -0,0 +1,3 @@
+/** @dir
+ * @brief VPP infrastructure library and tools.
+ */
diff --git a/vppinfra/tools/dir.dox b/vppinfra/tools/dir.dox
new file mode 100644
index 00000000..1a641f9b
--- /dev/null
+++ b/vppinfra/tools/dir.dox
@@ -0,0 +1,3 @@
+/** @dir
+ * @brief VPP instrastructure tools.
+ */
diff --git a/vppinfra/vppinfra/dir.dox b/vppinfra/vppinfra/dir.dox
new file mode 100644
index 00000000..b1bb90cd
--- /dev/null
+++ b/vppinfra/vppinfra/dir.dox
@@ -0,0 +1,3 @@
+/** @dir
+ * @brief VPP infrastructure library source.
+ */
diff --git a/vppinfra/vppinfra/vec.h b/vppinfra/vppinfra/vec.h
index 0c3237d3..7017358f 100644
--- a/vppinfra/vppinfra/vec.h
+++ b/vppinfra/vppinfra/vec.h
@@ -916,7 +916,7 @@ do {								\
   } while (0)
 
 
-/** \brief .
+/** \brief Test whether a vector is a NULL terminated c-string.
 
     @param V (possibly NULL) pointer to a vector. 
     @return BOOLEAN indicating if the vector c-string is null terminated.
@@ -924,7 +924,7 @@ do {								\
 #define vec_c_string_is_terminated(V)                   \
   (((V) != 0) && (vec_len (V) != 0) && ((V)[vec_len ((V)) - 1] == 0))
 
-/** \brief (If necessary) Null terminate a vector containing a c-string.
+/** \brief (If necessary) NULL terminate a vector containing a c-string.
 
     @param V (possibly NULL) pointer to a vector. 
     @return V (value-result macro parameter)
-- 
cgit 1.2.3-korg


From 1d1644c260808293a5629922201546763c3e2b64 Mon Sep 17 00:00:00 2001
From: Chris Luke <chrisy@flirble.org>
Date: Fri, 13 May 2016 13:41:36 -0400
Subject: VPP-57 Add doxygen build dependencies

Change-Id: I764d8a440c050d753e0380e139f489d3085f17f4
Signed-off-by: Chris Luke <chrisy@flirble.org>
---
 Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index dee25667..94fb621e 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@ OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
+DEB_DEPENDS += doxygen graphviz
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -39,9 +40,8 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-#RPM_DEPENDS += doxygen # TODO
+RPM_DEPENDS += doxygen graphviz
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
-#EPEL_DEPENDS += graphviz # TODO
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
@@ -53,7 +53,7 @@ endif
 
 .PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
-.PHONY: ctags cscope
+.PHONY: ctags cscope doxygen wipe-doxygen
 
 help:
 	@echo "Make Targets:"
@@ -75,6 +75,8 @@ help:
 	@echo " pkg-rpm             - build RPM packages"
 	@echo " ctags               - (re)generate ctags database"
 	@echo " cscope              - (re)generate cscope database"
+	@echo " doxygen             - (re)generate documentation"
+	@echo " wipe-doxygen        - wipe all generated documentation"
 	@echo ""
 	@echo "Make Arguments:"
 	@echo " V=[0|1]             - set build verbosity level"
@@ -212,6 +214,10 @@ cscope: cscope.files
 	@cscope -b -q -v
 
 
+#
+# Build the documentation
+#
+
 DOXY_INPUT = \
 	README.md \
 	vppinfra \
@@ -222,7 +228,6 @@ DOXY_INPUT = \
 	vpp \
 	vpp-api
 
-.PHONY: doxygen
 doxygen:
 	@mkdir -p "$(BR)/docs"
 	ROOT="$(WS_ROOT)" \
-- 
cgit 1.2.3-korg


From ed18a1c84071b063c960324005353e9a2c36c872 Mon Sep 17 00:00:00 2001
From: Dave Wallace <dwallacelf@gmail.com>
Date: Fri, 13 May 2016 19:00:29 -0400
Subject: VPP-65: Fix top-level "make install-dep" to work behind a firewall /
 proxy-server on Ubuntu.

Change-Id: I3f662455728adb81ca5a079540d8a9c615a5b977
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 94fb621e..2dd38fdd 100644
--- a/Makefile
+++ b/Makefile
@@ -128,11 +128,11 @@ bootstrap: $(BR)/.bootstrap.ok
 install-dep:
 ifeq ($(OS_ID),ubuntu)
 ifeq ($(OS_VERSION_ID),14.04)
-	@sudo apt-get $(CONFIRM) install software-properties-common
-	@sudo add-apt-repository $(CONFIRM) ppa:openjdk-r/ppa
-	@sudo apt-get update
+	@sudo -E apt-get $(CONFIRM) install software-properties-common
+	@sudo -E add-apt-repository $(CONFIRM) ppa:openjdk-r/ppa
+	@sudo -E apt-get update
 endif
-	@sudo apt-get $(CONFIRM) install $(DEB_DEPENDS)
+	@sudo -E apt-get $(CONFIRM) install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
 	@sudo yum install $(CONFIRM) $(RPM_DEPENDS)
-- 
cgit 1.2.3-korg


From 3535222f979742d65c28a312d415aa6831f816d6 Mon Sep 17 00:00:00 2001
From: Pierre Pfister <ppfister@cisco.com>
Date: Fri, 27 May 2016 10:30:13 +0100
Subject: VPP-94: Add build-data directory for plugins and Makefile target

Commit e36af5f3153 moved sample-plugin a dedicated directory.
The build system could not find sources for sample-plugin-* targets.
This commit adds a dedicated build-data/packages directory for
plugins and moves sample-plugin.mk there.

Change-Id: I9e3ee8858580e86ff6d4f7317300df0a5e239a01
Signed-off-by: Pierre Pfister <ppfister@cisco.com>
---
 Makefile                                     |  8 ++++-
 build-data/packages/sample-plugin.mk         | 47 ----------------------------
 build-root/bootstrap.sh                      |  2 +-
 plugins/build-data/packages/sample-plugin.mk | 47 ++++++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 49 deletions(-)
 delete mode 100644 build-data/packages/sample-plugin.mk
 create mode 100644 plugins/build-data/packages/sample-plugin.mk

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 2dd38fdd..d3088d24 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@ ifeq ($(OS_ID),ubuntu)
 	fi ; \
 	exit 0
 endif
-	@echo "SOURCE_PATH = $(WS_ROOT)"                   > $(BR)/build-config.mk
+	@echo "SOURCE_PATH = $(WS_ROOT) $(WS_ROOT)/plugins"> $(BR)/build-config.mk
 	@echo "#!/bin/bash\n"                              > $(BR)/path_setup
 	@echo 'export PATH=$(BR)/tools/ccache-bin:$$PATH' >> $(BR)/path_setup
 	@echo 'export PATH=$(BR)/tools/bin:$$PATH'        >> $(BR)/path_setup
@@ -162,6 +162,12 @@ wipe-release: $(BR)/.bootstrap.ok
 
 rebuild-release: wipe-release build-release
 
+plugins: $(BR)/.bootstrap.ok
+	$(call make,$(PLATFORM)_debug,sample-plugin-install)
+
+plugins-release: $(BR)/.bootstrap.ok
+	$(call make,$(PLATFORM),sample-plugin-install)
+
 STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run
diff --git a/build-data/packages/sample-plugin.mk b/build-data/packages/sample-plugin.mk
deleted file mode 100644
index 047a26f5..00000000
--- a/build-data/packages/sample-plugin.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-sample-plugin_configure_depend =		\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
-	vpp-install				\
-	vpp-api-test-install
-
-sample-plugin_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra					\
-	openssl						\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp						\
-        vpp-api-test)
-
-sample-plugin_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra					\
-	openssl						\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp						\
-	vpp-api-test)
-
-sample-plugin_post_install = \
-	mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins ; 	\
-	cp $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/*.so 			\
-	  $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins
-
-sample-plugin_image_include = echo $(arch_lib_dir)/vlib_plugins
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-sample-plugin_configure_args = --with-dpdk
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-sample-plugin_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-sample-plugin_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-sample-plugin_configure_depend += dpdk-install
-sample-plugin_CPPFLAGS += $(call installed_includes_fn, dpdk)
-sample-plugin_LDFLAGS += $(call installed_libs_fn, dpdk)
-endif
-endif
diff --git a/build-root/bootstrap.sh b/build-root/bootstrap.sh
index f83734fd..2419b6ae 100755
--- a/build-root/bootstrap.sh
+++ b/build-root/bootstrap.sh
@@ -12,7 +12,7 @@ ADD_TO_PATH="$build_root/tools/ccache-bin:$build_root/tools/bin"
 
 # Construct build-config.mk
 cd $build_root
-echo SOURCE_PATH = $wsroot > build-config.mk
+echo SOURCE_PATH = $wsroot $wsroot/plugins/ > build-config.mk
 echo 
 echo Saving PATH settings in `pwd`/path_setup
 echo Source this file later, as needed
diff --git a/plugins/build-data/packages/sample-plugin.mk b/plugins/build-data/packages/sample-plugin.mk
new file mode 100644
index 00000000..047a26f5
--- /dev/null
+++ b/plugins/build-data/packages/sample-plugin.mk
@@ -0,0 +1,47 @@
+sample-plugin_configure_depend =		\
+	vppinfra-install			\
+	svm-install				\
+	vlib-api-install			\
+	vlib-install				\
+	vnet-install				\
+	vpp-install				\
+	vpp-api-test-install
+
+sample-plugin_CPPFLAGS = $(call installed_includes_fn,	\
+	vppinfra					\
+	openssl						\
+	svm						\
+	vlib						\
+	vlib-api					\
+	vnet						\
+	vpp						\
+        vpp-api-test)
+
+sample-plugin_LDFLAGS = $(call installed_libs_fn,	\
+	vppinfra					\
+	openssl						\
+	svm						\
+	vlib						\
+	vlib-api					\
+	vnet						\
+	vpp						\
+	vpp-api-test)
+
+sample-plugin_post_install = \
+	mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins ; 	\
+	cp $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/*.so 			\
+	  $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins
+
+sample-plugin_image_include = echo $(arch_lib_dir)/vlib_plugins
+
+ifneq ($($(PLATFORM)_uses_dpdk),no)
+sample-plugin_configure_args = --with-dpdk
+ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
+sample-plugin_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
+sample-plugin_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
+else
+sample-plugin_configure_depend += dpdk-install
+sample-plugin_CPPFLAGS += $(call installed_includes_fn, dpdk)
+sample-plugin_LDFLAGS += $(call installed_libs_fn, dpdk)
+endif
+endif
-- 
cgit 1.2.3-korg


From 1aa310fe3f06b5bdc27b71d1cde9d71d79e9bd85 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Mon, 13 Jun 2016 21:06:20 +0200
Subject: Cleanup /dev/shm before starting VPP from top-level Makefile

Change-Id: I3a8b85ad033707552b9df7d0d08548517a8571ce
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d3088d24..2d6429c0 100644
--- a/Makefile
+++ b/Makefile
@@ -173,10 +173,12 @@ ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run
 	@echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
 	@echo "         Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
+	@sudo rm -f /dev/shm/vpe-api /dev/shm/db /dev/shm/global_vm
 	@cd $(STARTUP_DIR) && sudo $(1) $(MINIMAL_STARTUP_CONF)
 endef
 else
 define run
+	@sudo rm -f /dev/shm/vpe-api /dev/shm/db /dev/shm/global_vm
 	@cd $(STARTUP_DIR) && sudo $(1) -c $(STARTUP_CONF)
 endef
 endif
-- 
cgit 1.2.3-korg


From 3b3688f9d3a640a169e9c7fc858d36ab3aeb147e Mon Sep 17 00:00:00 2001
From: Ole Troan <ot@cisco.com>
Date: Wed, 15 Jun 2016 14:29:08 +0200
Subject: 6rd: Move to plugin

- Change toplevel plugins make target. Now builds all plugins under
  plugins/. (Apart from sample-plugin).
- Move sixrd code to plugins directory and make necessary changes to
  make it a plugin
- Remove 6rd hooks from IP lookup code

Change-Id: I447e92e3bee240cd8de01d0abac2e1708e8c27d1
Signed-off-by: Ole Troan <ot@cisco.com>
---
 Makefile                          |   6 +-
 build-data/packages/plugins.mk    |  38 ++++
 plugins/Makefile.am               |  35 ++++
 plugins/configure.ac              |  23 +++
 plugins/plugins/sixrd/ip4_sixrd.c | 127 +++++++++++++
 plugins/plugins/sixrd/ip6_sixrd.c | 129 +++++++++++++
 plugins/plugins/sixrd/sixrd.c     | 379 ++++++++++++++++++++++++++++++++++++++
 plugins/plugins/sixrd/sixrd.h     | 144 +++++++++++++++
 vlib/vlib/unix/plugin.c           |  11 +-
 vnet/Makefile.am                  |   6 +-
 vnet/vnet/ip/lookup.c             |   1 -
 vnet/vnet/ip/lookup.h             |   5 -
 vnet/vnet/map/ip4_sixrd.c         | 127 -------------
 vnet/vnet/map/ip6_sixrd.c         | 129 -------------
 vnet/vnet/map/sixrd.c             | 355 -----------------------------------
 vnet/vnet/map/sixrd.h             | 141 --------------
 16 files changed, 887 insertions(+), 769 deletions(-)
 create mode 100644 build-data/packages/plugins.mk
 create mode 100644 plugins/Makefile.am
 create mode 100644 plugins/configure.ac
 create mode 100644 plugins/plugins/sixrd/ip4_sixrd.c
 create mode 100644 plugins/plugins/sixrd/ip6_sixrd.c
 create mode 100644 plugins/plugins/sixrd/sixrd.c
 create mode 100644 plugins/plugins/sixrd/sixrd.h
 delete mode 100644 vnet/vnet/map/ip4_sixrd.c
 delete mode 100644 vnet/vnet/map/ip6_sixrd.c
 delete mode 100644 vnet/vnet/map/sixrd.c
 delete mode 100644 vnet/vnet/map/sixrd.h

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 2d6429c0..c3380e74 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ endif
 
 .PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
-.PHONY: ctags cscope doxygen wipe-doxygen
+.PHONY: ctags cscope doxygen wipe-doxygen plugins plugins-release
 
 help:
 	@echo "Make Targets:"
@@ -163,10 +163,10 @@ wipe-release: $(BR)/.bootstrap.ok
 rebuild-release: wipe-release build-release
 
 plugins: $(BR)/.bootstrap.ok
-	$(call make,$(PLATFORM)_debug,sample-plugin-install)
+	$(call make,$(PLATFORM)_debug,plugins-install)
 
 plugins-release: $(BR)/.bootstrap.ok
-	$(call make,$(PLATFORM),sample-plugin-install)
+	$(call make,$(PLATFORM),plugins-install)
 
 STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
diff --git a/build-data/packages/plugins.mk b/build-data/packages/plugins.mk
new file mode 100644
index 00000000..f0698629
--- /dev/null
+++ b/build-data/packages/plugins.mk
@@ -0,0 +1,38 @@
+plugins_configure_depend = 			\
+    vppinfra-install 				\
+    vlib-api-install 				\
+    vlib-install 
+
+plugins_CPPFLAGS = $(call installed_includes_fn, 	\
+    vppinfra 					\
+    vlib 					\
+    vlib-api)
+
+plugins_LDFLAGS = $(call installed_libs_fn, 	\
+    vppinfra					\
+    vlib					\
+    vlib-api)
+
+ifeq ($($(PLATFORM)_enable_tests),yes)
+plugins_configure_args += --enable-tests
+endif
+
+# Platform dependent configure flags
+plugins_configure_args += $(plugins_configure_args_$(PLATFORM))
+
+# include & link with openssl only if needed
+ifneq ($($(PLATFORM)_uses_openssl),no)
+plugins_CPPFLAGS += $(call installed_includes_fn, openssl)
+plugins_LDFLAGS += $(call installed_libs_fn, openssl)
+endif
+
+ifneq ($($(PLATFORM)_uses_dpdk),no)
+ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
+plugins_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
+plugins_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
+else
+plugins_configure_depend += dpdk-install
+plugins_CPPFLAGS += $(call installed_includes_fn, dpdk)
+plugins_LDFLAGS += $(call installed_libs_fn, dpdk)
+endif
+endif
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
new file mode 100644
index 00000000..e72b8635
--- /dev/null
+++ b/plugins/Makefile.am
@@ -0,0 +1,35 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+AUTOMAKE_OPTIONS = foreign subdir-objects
+
+AM_CFLAGS = -Wall -I@TOOLKIT_INCLUDE@
+
+
+########################################
+# SIXRD (RFC5969)
+########################################
+libsixrd_plugin_la_SOURCES = plugins/sixrd/sixrd.c plugins/sixrd/ip4_sixrd.c plugins/sixrd/ip6_sixrd.c
+nobase_include_HEADERS = plugins/sixrd/sixrd.h
+
+libsixrd_plugin_la_LDFLAGS = -module
+BUILT_SOURCES =
+
+lib_LTLIBRARIES = libsixrd_plugin.la
+
+if WITH_PLUGIN_TOOLKIT
+install-data-hook:
+	mkdir /usr/lib/vpp_plugins || true
+	mkdir /usr/lib/vpp_api_test_plugins || true
+	cp $(prefix)/lib/sixrd_plugin.so.*.*.* /usr/lib/vpp_plugins
+endif
diff --git a/plugins/configure.ac b/plugins/configure.ac
new file mode 100644
index 00000000..bf01aacb
--- /dev/null
+++ b/plugins/configure.ac
@@ -0,0 +1,23 @@
+AC_INIT(core_plugins, 1.0)
+LT_INIT
+AM_INIT_AUTOMAKE
+
+AM_PROG_AS
+AC_PROG_CC
+AM_PROG_CC_C_O
+
+AC_ARG_ENABLE(tests,
+              AC_HELP_STRING([--enable-tests], [Build unit tests]),
+              [enable_tests=1],
+              [enable_tests=0])
+
+AC_ARG_WITH(plugin-toolkit,
+            AC_HELP_STRING([--with-plugin-toolkit],
+            [build using the vpp toolkit]),
+            [with_plugin_toolkit=${prefix}/include],
+            [with_plugin_toolkit=.])
+
+AC_SUBST(TOOLKIT_INCLUDE,[${with_plugin_toolkit}])
+AM_CONDITIONAL(WITH_PLUGIN_TOOLKIT, test "$with_plugin_toolkit" != ".")
+AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" = "1")
+AC_OUTPUT([Makefile])
diff --git a/plugins/plugins/sixrd/ip4_sixrd.c b/plugins/plugins/sixrd/ip4_sixrd.c
new file mode 100644
index 00000000..2fb8015d
--- /dev/null
+++ b/plugins/plugins/sixrd/ip4_sixrd.c
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------
+ * Copyright (c) 2009-2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *---------------------------------------------------------------------------
+ */
+#include "sixrd.h"
+
+static vlib_node_registration_t ip4_sixrd_node;
+
+typedef enum {
+  IP4_SIXRD_NEXT_IP6_LOOKUP,
+  IP4_SIXRD_NEXT_DROP,
+  IP4_SIXRD_N_NEXT,
+} ip4_sixrd_next_t;
+
+/*
+ * ip4_sixrd_sec_check
+ */
+static_always_inline void
+ip4_sixrd_sec_check (sixrd_domain_t *d, ip4_address_t sa4, ip6_address_t sa6, u8 *error)
+{
+  u32 a = sixrd_get_addr(d, sa6.as_u64[0]);
+  clib_warning("Security check: %U %U", format_ip4_address, &a, format_ip4_address, &sa4);
+  if (PREDICT_FALSE(sixrd_get_addr(d, sa6.as_u64[0]) != sa4.as_u32))
+    *error = SIXRD_ERROR_SEC_CHECK;
+}
+
+/*
+ * ip4_sixrd
+ */
+static uword
+ip4_sixrd (vlib_main_t *vm,
+	   vlib_node_runtime_t *node,
+	   vlib_frame_t *frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node = vlib_node_get_runtime(vm, ip4_sixrd_node.index);
+  u32 decap = 0;
+
+  from = vlib_frame_vector_args(frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  while (n_left_from > 0) {
+    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
+
+    /* Single loop */
+    while (n_left_from > 0 && n_left_to_next > 0) {
+      u32 pi0;
+      vlib_buffer_t *p0;
+      u8 error0 = SIXRD_ERROR_NONE;
+      sixrd_domain_t *d0 = 0;
+      ip4_header_t *ip40;
+      ip6_header_t *ip60;
+      u32 sixrd_domain_index0 = ~0;
+      u32 next0;
+
+      pi0 = to_next[0] = from[0];
+      from += 1;
+      n_left_from -= 1;
+      to_next +=1;
+      n_left_to_next -= 1;
+
+      p0 = vlib_get_buffer(vm, pi0);
+      ip40 = vlib_buffer_get_current(p0);
+
+      /* Throw away anything that isn't IP in IP. */
+      if (PREDICT_TRUE(ip40->protocol == IP_PROTOCOL_IPV6 && clib_net_to_host_u16(ip40->length) >= 60)) {
+	vlib_buffer_advance(p0, sizeof(ip4_header_t));
+	ip60 = vlib_buffer_get_current(p0);
+	d0 = ip4_sixrd_get_domain(vnet_buffer(p0)->ip.adj_index[VLIB_TX], (ip6_address_t *)&ip60->src_address,
+				&sixrd_domain_index0, &error0);
+      } else {
+	error0 = SIXRD_ERROR_BAD_PROTOCOL;
+      }
+      if (d0) {
+	/* SIXRD inbound security check */
+	ip4_sixrd_sec_check(d0, ip40->src_address, ip60->src_address, &error0);
+      }
+
+      next0 = error0 == SIXRD_ERROR_NONE ? IP4_SIXRD_NEXT_IP6_LOOKUP : IP4_SIXRD_NEXT_DROP;
+
+      if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED)) {
+	sixrd_trace_t *tr = vlib_add_trace(vm, node, p0, sizeof(*tr));
+	tr->sixrd_domain_index = sixrd_domain_index0;
+      }
+
+      p0->error = error_node->errors[error0];
+      if (PREDICT_TRUE(error0 == SIXRD_ERROR_NONE)) decap++;
+      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next, n_left_to_next, pi0, next0);
+
+    }
+    vlib_put_next_frame(vm, node, next_index, n_left_to_next);
+  }
+  vlib_node_increment_counter(vm, ip4_sixrd_node.index, SIXRD_ERROR_DECAPSULATED, decap);
+
+  return frame->n_vectors;
+}
+
+static char *sixrd_error_strings[] = {
+#define _(sym,string) string,
+  foreach_sixrd_error
+#undef _
+};
+
+VLIB_REGISTER_NODE(ip4_sixrd_node,static) = {
+  .function = ip4_sixrd,
+  .name = "ip4-sixrd",
+  .vector_size = sizeof(u32),
+  .format_trace = format_sixrd_trace,
+  .n_errors = SIXRD_N_ERROR,
+  .error_strings = sixrd_error_strings,
+  .n_next_nodes = IP4_SIXRD_N_NEXT,
+  .next_nodes = {
+    [IP4_SIXRD_NEXT_IP6_LOOKUP] = "ip6-lookup",
+    [IP4_SIXRD_NEXT_DROP] = "error-drop",
+  },
+};
diff --git a/plugins/plugins/sixrd/ip6_sixrd.c b/plugins/plugins/sixrd/ip6_sixrd.c
new file mode 100644
index 00000000..36f3fab3
--- /dev/null
+++ b/plugins/plugins/sixrd/ip6_sixrd.c
@@ -0,0 +1,129 @@
+/*---------------------------------------------------------------------------
+ * Copyright (c) 2009-2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *---------------------------------------------------------------------------
+ */
+/*
+ * Defines used for testing various optimisation schemes
+ */
+#define SIXRD_ENCAP_DUAL 0
+
+#include "sixrd.h"
+
+static vlib_node_registration_t ip6_sixrd_node;
+
+typedef enum {
+  IP6_SIXRD_NEXT_IP4_LOOKUP,
+  IP6_SIXRD_NEXT_DROP,
+  IP6_SIXRD_N_NEXT,
+} ip6_sixrd_next_t;
+
+/*
+ * ip6_sixrd
+ */
+static uword
+ip6_sixrd (vlib_main_t *vm,
+	   vlib_node_runtime_t *node,
+	   vlib_frame_t *frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node = vlib_node_get_runtime(vm, ip6_sixrd_node.index);
+  u32 encap = 0;
+  from = vlib_frame_vector_args(frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0) {
+    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
+
+    while (n_left_from > 0 && n_left_to_next > 0) {
+      u32 pi0;
+      vlib_buffer_t *p0;
+      sixrd_domain_t *d0;
+      u8 error0 = SIXRD_ERROR_NONE;
+      ip6_header_t *ip60;
+      ip4_header_t *ip4h0;
+      u32 next0 = IP6_SIXRD_NEXT_IP4_LOOKUP;
+      u32 sixrd_domain_index0 = ~0;
+
+      pi0 = to_next[0] = from[0];
+      from += 1;
+      n_left_from -= 1;
+      to_next +=1;
+      n_left_to_next -= 1;
+
+      p0 = vlib_get_buffer(vm, pi0);
+      ip60 = vlib_buffer_get_current(p0);
+      //      p0->current_length = clib_net_to_host_u16(ip40->length);
+      d0 = ip6_sixrd_get_domain(vnet_buffer(p0)->ip.adj_index[VLIB_TX], &sixrd_domain_index0);
+      ASSERT(d0);
+
+      /* SIXRD calc */
+      u64 dal60 = clib_net_to_host_u64(ip60->dst_address.as_u64[0]);
+      u32 da40 = sixrd_get_addr(d0, dal60);
+      u16 len = clib_net_to_host_u16(ip60->payload_length) + 60;
+      if (da40 == 0) error0 = SIXRD_ERROR_UNKNOWN;
+
+      /* construct ipv4 header */
+      vlib_buffer_advance(p0, - (sizeof(ip4_header_t)));
+      ip4h0 = vlib_buffer_get_current(p0);
+      vnet_buffer(p0)->sw_if_index[VLIB_TX] = (u32)~0;
+      ip4h0->ip_version_and_header_length = 0x45;
+      ip4h0->tos = 0;
+      ip4h0->length = clib_host_to_net_u16(len);
+      ip4h0->fragment_id = 0;
+      ip4h0->flags_and_fragment_offset = 0;
+      ip4h0->ttl = 0x40;
+      ip4h0->protocol = IP_PROTOCOL_IPV6;
+      ip4h0->src_address = d0->ip4_src;
+      ip4h0->dst_address.as_u32 = clib_host_to_net_u32(da40);
+      ip4h0->checksum = ip4_header_checksum(ip4h0);
+
+      next0 = error0 == SIXRD_ERROR_NONE ? IP6_SIXRD_NEXT_IP4_LOOKUP : IP6_SIXRD_NEXT_DROP;
+
+      if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED)) {
+	sixrd_trace_t *tr = vlib_add_trace(vm, node, p0, sizeof(*tr));
+	tr->sixrd_domain_index = sixrd_domain_index0;
+      }
+
+      p0->error = error_node->errors[error0];
+      if (PREDICT_TRUE(error0 == SIXRD_ERROR_NONE)) encap++;
+
+      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next, n_left_to_next, pi0, next0);
+    }
+    vlib_put_next_frame(vm, node, next_index, n_left_to_next);  
+  }
+  vlib_node_increment_counter(vm, ip6_sixrd_node.index, SIXRD_ERROR_ENCAPSULATED, encap);
+
+  return frame->n_vectors;
+}
+
+static char *sixrd_error_strings[] = {
+#define _(sym,string) string,
+  foreach_sixrd_error
+#undef _
+};
+
+VLIB_REGISTER_NODE(ip6_sixrd_node,static) = {
+  .function = ip6_sixrd,
+  .name = "ip6-sixrd",
+  .vector_size = sizeof(u32),
+  .format_trace = format_sixrd_trace,
+  .n_errors = SIXRD_N_ERROR,
+  .error_strings = sixrd_error_strings,
+  .n_next_nodes = IP6_SIXRD_N_NEXT,
+  .next_nodes = {
+    [IP6_SIXRD_NEXT_IP4_LOOKUP] = "ip4-lookup",
+    [IP6_SIXRD_NEXT_DROP] = "error-drop",
+  },
+};
diff --git a/plugins/plugins/sixrd/sixrd.c b/plugins/plugins/sixrd/sixrd.c
new file mode 100644
index 00000000..8ebdb32b
--- /dev/null
+++ b/plugins/plugins/sixrd/sixrd.c
@@ -0,0 +1,379 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "sixrd.h"
+#include <vnet/plugin/plugin.h>
+
+/*
+ * This code supports the following sixrd modes:
+ * 
+ * 32 EA bits (Complete IPv4 address is embedded):
+ *   ea_bits_len = 32
+ * IPv4 suffix is embedded:
+ *   ea_bits_len = < 32
+ * No embedded address bits (1:1 mode):
+ *   ea_bits_len = 0
+ */
+
+int
+sixrd_create_domain (ip6_address_t *ip6_prefix,
+                   u8 ip6_prefix_len,
+                   ip4_address_t *ip4_prefix,
+                   u8 ip4_prefix_len,
+                   ip4_address_t *ip4_src,
+                   u32 *sixrd_domain_index,
+		     u16 mtu)
+{
+  sixrd_main_t *mm = &sixrd_main;
+  ip4_main_t *im4 = &ip4_main;
+  ip6_main_t *im6 = &ip6_main;
+  sixrd_domain_t *d;
+  ip_adjacency_t adj;
+  ip4_add_del_route_args_t args4;
+  ip6_add_del_route_args_t args6;
+  u32 *p;
+
+  /* Get domain index */
+  pool_get_aligned(mm->domains, d, CLIB_CACHE_LINE_BYTES);
+  memset(d, 0, sizeof (*d));
+  *sixrd_domain_index = d - mm->domains;
+
+  /* Init domain struct */
+  d->ip4_prefix.as_u32 = ip4_prefix->as_u32;
+  d->ip4_prefix_len = ip4_prefix_len;
+  d->ip6_prefix = *ip6_prefix;
+  d->ip6_prefix_len = ip6_prefix_len;
+  d->ip4_src = *ip4_src;
+  d->mtu = mtu;
+
+  if (ip4_prefix_len < 32)
+    d->shift = 64 - ip6_prefix_len + (32 - ip4_prefix_len);
+    
+  /* Init IP adjacency */
+  memset(&adj, 0, sizeof(adj));
+  adj.explicit_fib_index = ~0;
+  p = (u32 *)&adj.rewrite_data[0];
+  *p = (u32) (*sixrd_domain_index);
+
+  /* Create ip6 adjacency */
+  memset(&args6, 0, sizeof(args6));
+  args6.table_index_or_table_id = 0;
+  args6.flags = IP6_ROUTE_FLAG_ADD;
+  args6.dst_address.as_u64[0] = ip6_prefix->as_u64[0];
+  args6.dst_address.as_u64[1] = ip6_prefix->as_u64[1];
+  args6.dst_address_length = ip6_prefix_len;
+  args6.adj_index = ~0;
+  args6.add_adj = &adj;
+  args6.n_add_adj = 1;
+  adj.lookup_next_index = mm->ip6_lookup_next_index;
+  ip6_add_del_route(im6, &args6);
+
+  /* Multiple SIXRD domains may share same source IPv4 TEP */
+  uword *q = ip4_get_route(im4, 0, 0, (u8 *)ip4_src, 32);
+  if (q) {
+    u32 ai = q[0];
+    ip_lookup_main_t *lm4 = &ip4_main.lookup_main;
+    ip_adjacency_t *adj4 = ip_get_adjacency(lm4, ai);
+    if (adj4->lookup_next_index != mm->ip4_lookup_next_index) {
+      clib_warning("BR source address already assigned: %U", format_ip4_address, ip4_src);
+      pool_put(mm->domains, d);
+      return -1;
+    }
+    /* Shared source */
+    p = (u32 *)&adj4->rewrite_data[0];
+    p[0] = ~0;
+
+    /* Add refcount, so we don't accidentially delete the route underneath someone */
+    p[1]++;
+  } else {
+    /* Create ip4 adjacency. */
+    memset(&args4, 0, sizeof(args4));
+    args4.table_index_or_table_id = 0;
+    args4.flags = IP4_ROUTE_FLAG_ADD;
+    args4.dst_address.as_u32 = ip4_src->as_u32;
+    args4.dst_address_length = 32;
+    args4.adj_index = ~0;
+    args4.add_adj = &adj;
+    args4.n_add_adj = 1;
+    adj.lookup_next_index = mm->ip4_lookup_next_index;
+    ip4_add_del_route(im4, &args4);
+  }
+
+  return 0;
+}
+
+/*
+ * sixrd_delete_domain
+ */
+int
+sixrd_delete_domain (u32 sixrd_domain_index)
+{
+  sixrd_main_t *mm = &sixrd_main;
+  ip4_main_t *im4 = &ip4_main;
+  ip6_main_t *im6 = &ip6_main;
+  sixrd_domain_t *d;
+  ip_adjacency_t adj;
+  ip4_add_del_route_args_t args4;
+  ip6_add_del_route_args_t args6;
+
+  if (pool_is_free_index(mm->domains, sixrd_domain_index)) {
+    clib_warning("SIXRD domain delete: domain does not exist: %d", sixrd_domain_index);
+    return -1;
+  }
+
+  d = pool_elt_at_index(mm->domains, sixrd_domain_index);
+
+  memset(&adj, 0, sizeof(adj));
+  adj.explicit_fib_index = ~0;
+
+  /* Delete ip6 adjacency */
+  memset(&args6, 0, sizeof (args6));
+  args6.table_index_or_table_id = 0;
+  args6.flags = IP6_ROUTE_FLAG_DEL;
+  args6.dst_address.as_u64[0] = d->ip6_prefix.as_u64[0];
+  args6.dst_address.as_u64[1] = d->ip6_prefix.as_u64[1];
+  args6.dst_address_length = d->ip6_prefix_len;
+  args6.adj_index = 0;
+  args6.add_adj = &adj;
+  args6.n_add_adj = 0;
+  ip6_add_del_route(im6, &args6);
+
+  /* Delete ip4 adjacency */
+  uword *q = ip4_get_route(im4, 0, 0, (u8 *)&d->ip4_src, 32);
+  if (q) {
+    u32 ai = q[0];
+    ip_lookup_main_t *lm4 = &ip4_main.lookup_main;
+    ip_adjacency_t *adj4 = ip_get_adjacency(lm4, ai);
+
+    u32 *p = (u32 *)&adj4->rewrite_data[0];
+    /* Delete route when no other domains use this source */
+    if (p[1] == 0) {
+      memset(&args4, 0, sizeof(args4));
+      args4.table_index_or_table_id = 0;
+      args4.flags = IP4_ROUTE_FLAG_DEL;
+      args4.dst_address.as_u32 = d->ip4_prefix.as_u32;
+      args4.dst_address_length = d->ip4_prefix_len;
+      args4.adj_index = 0;
+      args4.add_adj = &adj;
+      args4.n_add_adj = 0;
+      ip4_add_del_route(im4, &args4);
+    }
+    p[1]--;
+  }
+
+  pool_put(mm->domains, d);
+
+  return 0;
+}
+
+static clib_error_t *
+sixrd_add_domain_command_fn (vlib_main_t *vm,
+                           unformat_input_t *input,
+                           vlib_cli_command_t *cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ip4_address_t ip4_prefix;
+  ip6_address_t ip6_prefix;
+  ip4_address_t ip4_src;
+  u32 ip6_prefix_len, ip4_prefix_len, sixrd_domain_index;
+  u32 num_m_args = 0;
+  /* Optional arguments */
+  u32 mtu = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user(input, unformat_line_input, line_input))
+    return 0;
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat(line_input, "ip6-pfx %U/%d", unformat_ip6_address, &ip6_prefix, &ip6_prefix_len))
+      num_m_args++;
+    else if (unformat(line_input, "ip4-pfx %U/%d", unformat_ip4_address, &ip4_prefix, &ip4_prefix_len))
+      num_m_args++;
+    else if (unformat(line_input, "ip4-src %U", unformat_ip4_address, &ip4_src))
+      num_m_args++;
+    else if (unformat(line_input, "mtu %d", &mtu))
+      num_m_args++;
+    else
+      return clib_error_return(0, "unknown input `%U'",
+                               format_unformat_error, input);
+  }
+  unformat_free(line_input);
+
+  if (num_m_args < 3)
+    return clib_error_return(0, "mandatory argument(s) missing");
+
+  sixrd_create_domain(&ip6_prefix, ip6_prefix_len, &ip4_prefix, ip4_prefix_len,
+		      &ip4_src, &sixrd_domain_index, mtu);
+
+  return 0;
+}
+
+static clib_error_t *
+sixrd_del_domain_command_fn (vlib_main_t *vm,
+			   unformat_input_t *input,
+			   vlib_cli_command_t *cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 num_m_args = 0;
+  u32 sixrd_domain_index;
+
+  /* Get a line of input. */
+  if (! unformat_user(input, unformat_line_input, line_input))
+    return 0;
+ 
+  while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat(line_input, "index %d", &sixrd_domain_index))
+      num_m_args++;
+    else
+      return clib_error_return(0, "unknown input `%U'",
+				format_unformat_error, input);
+  }
+  unformat_free(line_input);
+
+  if (num_m_args != 1)
+    return clib_error_return(0, "mandatory argument(s) missing");
+
+  sixrd_delete_domain(sixrd_domain_index);
+
+  return 0;
+}
+
+static u8 *
+format_sixrd_domain (u8 *s, va_list *args)
+{
+  sixrd_domain_t *d = va_arg(*args, sixrd_domain_t *);
+  sixrd_main_t *mm = &sixrd_main;
+
+  s = format(s,
+	     "[%d] ip6-pfx %U/%d ip4-pfx %U/%d ip4-src %U mtu %d",
+	     d - mm->domains,
+	     format_ip6_address, &d->ip6_prefix, d->ip6_prefix_len,
+	     format_ip4_address, &d->ip4_prefix, d->ip4_prefix_len,
+	     format_ip4_address, &d->ip4_src, d->mtu);
+
+  return s;
+}
+
+static clib_error_t *
+show_sixrd_domain_command_fn (vlib_main_t *vm, unformat_input_t *input, vlib_cli_command_t *cmd)
+{
+  sixrd_main_t *mm = &sixrd_main;
+  sixrd_domain_t *d;
+
+  if (pool_elts(mm->domains) == 0)
+    vlib_cli_output(vm, "No SIXRD domains are configured...");
+
+  pool_foreach(d, mm->domains, ({vlib_cli_output(vm, "%U", format_sixrd_domain, d);}));
+
+  return 0;
+
+}
+
+static clib_error_t *
+show_sixrd_stats_command_fn (vlib_main_t *vm, unformat_input_t *input, vlib_cli_command_t *cmd)
+{
+  sixrd_main_t *mm = &sixrd_main;
+  sixrd_domain_t *d;
+  int domains = 0, domaincount = 0;
+  if (pool_elts (mm->domains) == 0)
+    vlib_cli_output (vm, "No SIXRD domains are configured...");
+
+  pool_foreach(d, mm->domains, ({
+    domains += sizeof(*d);
+    domaincount++;
+  }));
+
+  vlib_cli_output(vm, "SIXRD domains structure: %d\n", sizeof (sixrd_domain_t));
+  vlib_cli_output(vm, "SIXRD domains: %d (%d bytes)\n", domaincount, domains);
+
+  return 0;
+}
+
+/*
+ * packet trace format function
+ */
+u8 *
+format_sixrd_trace (u8 *s, va_list *args)
+{
+  CLIB_UNUSED(vlib_main_t *vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED(vlib_node_t *node) = va_arg (*args, vlib_node_t *);
+  sixrd_trace_t *t = va_arg (*args, sixrd_trace_t *);
+  u32 sixrd_domain_index = t->sixrd_domain_index;
+
+  s = format(s, "SIXRD domain index: %d", sixrd_domain_index);
+
+  return s;
+}
+
+VLIB_CLI_COMMAND(sixrd_add_domain_command, static) = {
+  .path = "sixrd add domain",
+  .short_help = 
+  "sixrd add domain ip6-pfx <ip6-pfx> ip4-pfx <ip4-pfx> ip4-src <ip4-addr>",
+  .function = sixrd_add_domain_command_fn,
+};
+
+VLIB_CLI_COMMAND(sixrd_del_command, static) = {
+  .path = "sixrd del domain",
+  .short_help = 
+  "sixrd del domain index <domain>",
+  .function = sixrd_del_domain_command_fn,
+};
+
+VLIB_CLI_COMMAND(show_sixrd_domain_command, static) = {
+  .path = "show sixrd domain",
+  .function = show_sixrd_domain_command_fn,
+};
+
+VLIB_CLI_COMMAND(show_sixrd_stats_command, static) = {
+  .path = "show sixrd stats",
+  .function = show_sixrd_stats_command_fn,
+};
+
+/* 
+ * This routine exists to convince the vlib plugin framework that
+ * we haven't accidentally copied a random .dll into the plugin directory.
+ *
+ * Also collects global variable pointers passed from the vpp engine
+ */
+clib_error_t * 
+vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
+                      int from_early_init)
+{
+  clib_error_t * error = 0;
+  sixrd_main_t *mm = &sixrd_main;
+
+  mm->vnet_main = vnet_get_main();
+  mm->vlib_main = vm;
+
+  return error;
+}
+
+static clib_error_t * sixrd_init (vlib_main_t * vm)
+{
+  clib_error_t * error = 0;
+  sixrd_main_t *mm = &sixrd_main;
+
+  vlib_node_t * ip6_lookup_node = vlib_get_node_by_name(vm, (u8 *)"ip6-lookup");
+  vlib_node_t * ip4_lookup_node = vlib_get_node_by_name(vm, (u8 *)"ip4-lookup");
+  vlib_node_t * ip6_sixrd_node = vlib_get_node_by_name(vm, (u8 *)"ip6-sixrd");
+  vlib_node_t * ip4_sixrd_node = vlib_get_node_by_name(vm, (u8 *)"ip4-sixrd");
+  ASSERT(ip6_lookup_node && ip4_lookup_node && ip6_sixrd_node && ip4_sixrd_node);
+
+  mm->ip6_lookup_next_index = vlib_node_add_next(vm, ip6_lookup_node->index, ip6_sixrd_node->index);
+  mm->ip4_lookup_next_index = vlib_node_add_next(vm, ip4_lookup_node->index, ip4_sixrd_node->index);
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (sixrd_init);
diff --git a/plugins/plugins/sixrd/sixrd.h b/plugins/plugins/sixrd/sixrd.h
new file mode 100644
index 00000000..1581649c
--- /dev/null
+++ b/plugins/plugins/sixrd/sixrd.h
@@ -0,0 +1,144 @@
+/*---------------------------------------------------------------------------
+ * Copyright (c) 2009-2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *---------------------------------------------------------------------------
+ */
+#include <stdbool.h>
+#include <vppinfra/error.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+
+int sixrd_create_domain(ip6_address_t *ip6_prefix, u8 ip6_prefix_len,
+			ip4_address_t *ip4_prefix, u8 ip4_prefix_len,
+			ip4_address_t *ip4_src, u32 *sixrd_domain_index, u16 mtu);
+int sixrd_delete_domain(u32 sixrd_domain_index);
+u8 *format_sixrd_trace(u8 *s, va_list *args);
+
+typedef struct {
+  ip6_address_t ip6_prefix;
+  ip4_address_t ip4_prefix;
+  ip4_address_t ip4_src;
+  u8 ip6_prefix_len;
+  u8 ip4_prefix_len;
+
+  /* helpers */
+  u8 shift;
+
+  u16 mtu;
+} sixrd_domain_t;
+
+typedef struct {
+  /* pool of SIXRD domains */
+  sixrd_domain_t *domains;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+
+  u32 ip4_lookup_next_index;
+  u32 ip6_lookup_next_index;
+} sixrd_main_t;
+
+#define foreach_sixrd_error				\
+  /* Must be first. */					\
+ _(NONE, "valid SIXRD packets")				\
+ _(BAD_PROTOCOL, "bad protocol")			\
+ _(WRONG_ICMP_TYPE, "wrong icmp type")			\
+ _(SEC_CHECK, "security check failed")			\
+ _(ICMP, "unable to translate ICMP")			\
+ _(UNKNOWN, "unknown")					\
+ _(NO_DOMAIN, "no domain")				\
+ _(ENCAPSULATED, "encapsulated")			\
+ _(DECAPSULATED, "decapsulated")			\
+ _(TRANSLATED_4TO6, "translated 4 to 6")		\
+ _(TRANSLATED_6TO4, "translated 6 to 4")		\
+ _(FRAGMENT, "fragment handling error")			\
+ _(FRAGMENT_QUEUED, "dropped, missing first fragment")	\
+ _(FRAGMENTED, "packets requiring fragmentation")	\
+ _(FRAGMENT_PARTS, "fragment parts")                    \
+ _(MALFORMED, "malformed packet")
+
+typedef enum {
+#define _(sym,str) SIXRD_ERROR_##sym,
+   foreach_sixrd_error
+#undef _
+   SIXRD_N_ERROR,
+ } sixrd_error_t;
+
+typedef struct {
+  u32 sixrd_domain_index;
+} sixrd_trace_t;
+
+sixrd_main_t sixrd_main;
+
+/*
+ * sixrd_get_addr
+ */
+static_always_inline u32
+sixrd_get_addr (sixrd_domain_t *d, u64 dal)
+{
+
+  /* 1:1 mode */
+  if (d->ip4_prefix_len == 32) return (d->ip4_prefix.as_u32);
+
+  /* Grab 32 - ip4_prefix_len bits out of IPv6 address from offset ip6_prefix_len */
+  return (d->ip4_prefix.as_u32 | (u32)(dal >> d->shift));
+}
+
+/*
+ * Get the SIXRD domain from an IPv6 lookup adjacency.
+ */
+static_always_inline sixrd_domain_t *
+ip6_sixrd_get_domain (u32 adj_index, u32 *sixrd_domain_index)
+{
+  sixrd_main_t *mm = &sixrd_main;
+  ip_lookup_main_t *lm = &ip6_main.lookup_main;
+  ip_adjacency_t *adj = ip_get_adjacency(lm, adj_index);
+  ASSERT(adj);
+  uword *p = (uword *)adj->rewrite_data;
+  ASSERT(p);
+  *sixrd_domain_index = p[0];
+  return pool_elt_at_index(mm->domains, p[0]);
+}
+
+/*
+ * Get the SIXRD domain from an IPv4 lookup adjacency.
+ * If the IPv4 address is not shared, no lookup is required.
+ * The IPv6 address is used otherwise.
+ */
+static_always_inline sixrd_domain_t *
+ip4_sixrd_get_domain (u32 adj_index, ip6_address_t *addr,
+		      u32 *sixrd_domain_index, u8 *error)
+{
+  sixrd_main_t *mm = &sixrd_main;
+  ip6_main_t *im6 = &ip6_main;
+  ip_lookup_main_t *lm4 = &ip4_main.lookup_main;
+  ip_lookup_main_t *lm6 = &ip6_main.lookup_main;
+  ip_adjacency_t *adj = ip_get_adjacency(lm4, adj_index);
+  ASSERT(adj);
+  uword *p = (uword *)adj->rewrite_data;
+  ASSERT(p);
+  *sixrd_domain_index = p[0];
+  if (p[0] != ~0)
+    return pool_elt_at_index(mm->domains, p[0]);
+
+  u32 ai = ip6_fib_lookup_with_table(im6, 0, addr);
+  ip_adjacency_t *adj6 = ip_get_adjacency (lm6, ai);
+  if (PREDICT_TRUE(adj6->lookup_next_index == IP_LOOKUP_NEXT_SIXRD)) {
+    uword *p = (uword *)adj6->rewrite_data;
+    *sixrd_domain_index = p[0];
+    return pool_elt_at_index(mm->domains, *sixrd_domain_index);
+  }
+  *error = SIXRD_ERROR_NO_DOMAIN;
+  return NULL;
+}
diff --git a/vlib/vlib/unix/plugin.c b/vlib/vlib/unix/plugin.c
index 3411ef34..93bfbb71 100644
--- a/vlib/vlib/unix/plugin.c
+++ b/vlib/vlib/unix/plugin.c
@@ -61,11 +61,13 @@ load_one_plugin (plugin_main_t *pm, plugin_info_t *pi, int from_early_init)
   
   pi->handle = handle;
 
+
   register_handle = dlsym (pi->handle, "vlib_plugin_register");
   if (register_handle == 0)
     {
       dlclose (handle);
-      return 0;
+      clib_warning("Plugin missing vlib_plugin_register: %s\n", (char *)pi->name);
+      return 1;
     }
 
   fp = register_handle;
@@ -148,9 +150,12 @@ int vlib_load_new_plugins (plugin_main_t *pm, int from_early_init)
 
           plugin_name = format (0, "%s/%s%c", plugin_path[i],
                                 entry->d_name, 0);
-          
+
+	  /* Only accept .so */
+	  char * ext = strrchr((const char *)plugin_name, '.');
           /* unreadable */
-          if (stat ((char *)plugin_name, &statb) < 0)
+	  if(!ext || (strcmp(ext, ".so") != 0) ||
+	     stat ((char *)plugin_name, &statb) < 0)
             {
             ignore:
               vec_free (plugin_name);
diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index 3d9e07da..b758c7f1 100644
--- a/vnet/Makefile.am
+++ b/vnet/Makefile.am
@@ -346,15 +346,11 @@ libvnet_la_SOURCES +=                           \
  vnet/map/map.c                                 \
  vnet/map/ip4_map.c                             \
  vnet/map/ip6_map.c                             \
- vnet/map/sixrd.c                               \
- vnet/map/ip4_sixrd.c                           \
- vnet/map/ip6_sixrd.c                           \
  vnet/map/ip4_map_t.c                           \
  vnet/map/ip6_map_t.c
 
 nobase_include_HEADERS +=                       \
- vnet/map/map.h                                 \
- vnet/map/sixrd.h
+ vnet/map/map.h
 
 ########################################
 # Tunnel protocol: gre
diff --git a/vnet/vnet/ip/lookup.c b/vnet/vnet/ip/lookup.c
index 5a56870f..2d9e01f2 100644
--- a/vnet/vnet/ip/lookup.c
+++ b/vnet/vnet/ip/lookup.c
@@ -947,7 +947,6 @@ u8 * format_ip_lookup_next (u8 * s, va_list * args)
     case IP_LOOKUP_NEXT_CLASSIFY: t = "classify"; break;
     case IP_LOOKUP_NEXT_MAP: t = "map"; break;
     case IP_LOOKUP_NEXT_MAP_T: t = "map-t"; break;
-    case IP_LOOKUP_NEXT_SIXRD: t = "sixrd"; break;
     case IP_LOOKUP_NEXT_INDIRECT: t="indirect"; break;
     case IP_LOOKUP_NEXT_REWRITE:
       break;
diff --git a/vnet/vnet/ip/lookup.h b/vnet/vnet/ip/lookup.h
index a7aef9f5..35c19a77 100644
--- a/vnet/vnet/ip/lookup.h
+++ b/vnet/vnet/ip/lookup.h
@@ -76,9 +76,6 @@ typedef enum {
   /* This packet needs to go to MAP with Translation - RFC7599 */
   IP_LOOKUP_NEXT_MAP_T,
 
-  /* This packets needs to go to 6RD (RFC5969) */
-  IP_LOOKUP_NEXT_SIXRD,
-
   /* This packets needs to go to indirect next hop */
   IP_LOOKUP_NEXT_INDIRECT,
 
@@ -109,7 +106,6 @@ typedef enum {
     [IP_LOOKUP_NEXT_CLASSIFY] = "ip4-classify",			\
     [IP_LOOKUP_NEXT_MAP] = "ip4-map",				\
     [IP_LOOKUP_NEXT_MAP_T] = "ip4-map-t",			\
-    [IP_LOOKUP_NEXT_SIXRD] = "ip4-sixrd",			\
     [IP_LOOKUP_NEXT_INDIRECT] = "ip4-indirect",			\
     [IP_LOOKUP_NEXT_ICMP_ERROR] = "ip4-icmp-error",		\
 }
@@ -124,7 +120,6 @@ typedef enum {
     [IP_LOOKUP_NEXT_CLASSIFY] = "ip6-classify",			\
     [IP_LOOKUP_NEXT_MAP] = "ip6-map",				\
     [IP_LOOKUP_NEXT_MAP_T] = "ip6-map-t",			\
-    [IP_LOOKUP_NEXT_SIXRD] = "ip6-sixrd",			\
     [IP_LOOKUP_NEXT_INDIRECT] = "ip6-indirect",			\
     [IP_LOOKUP_NEXT_ICMP_ERROR] = "ip6-icmp-error",		\
     [IP6_LOOKUP_NEXT_HOP_BY_HOP] = "ip6-hop-by-hop",		\
diff --git a/vnet/vnet/map/ip4_sixrd.c b/vnet/vnet/map/ip4_sixrd.c
deleted file mode 100644
index 2fb8015d..00000000
--- a/vnet/vnet/map/ip4_sixrd.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*---------------------------------------------------------------------------
- * Copyright (c) 2009-2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------
- */
-#include "sixrd.h"
-
-static vlib_node_registration_t ip4_sixrd_node;
-
-typedef enum {
-  IP4_SIXRD_NEXT_IP6_LOOKUP,
-  IP4_SIXRD_NEXT_DROP,
-  IP4_SIXRD_N_NEXT,
-} ip4_sixrd_next_t;
-
-/*
- * ip4_sixrd_sec_check
- */
-static_always_inline void
-ip4_sixrd_sec_check (sixrd_domain_t *d, ip4_address_t sa4, ip6_address_t sa6, u8 *error)
-{
-  u32 a = sixrd_get_addr(d, sa6.as_u64[0]);
-  clib_warning("Security check: %U %U", format_ip4_address, &a, format_ip4_address, &sa4);
-  if (PREDICT_FALSE(sixrd_get_addr(d, sa6.as_u64[0]) != sa4.as_u32))
-    *error = SIXRD_ERROR_SEC_CHECK;
-}
-
-/*
- * ip4_sixrd
- */
-static uword
-ip4_sixrd (vlib_main_t *vm,
-	   vlib_node_runtime_t *node,
-	   vlib_frame_t *frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node = vlib_node_get_runtime(vm, ip4_sixrd_node.index);
-  u32 decap = 0;
-
-  from = vlib_frame_vector_args(frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  while (n_left_from > 0) {
-    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
-
-    /* Single loop */
-    while (n_left_from > 0 && n_left_to_next > 0) {
-      u32 pi0;
-      vlib_buffer_t *p0;
-      u8 error0 = SIXRD_ERROR_NONE;
-      sixrd_domain_t *d0 = 0;
-      ip4_header_t *ip40;
-      ip6_header_t *ip60;
-      u32 sixrd_domain_index0 = ~0;
-      u32 next0;
-
-      pi0 = to_next[0] = from[0];
-      from += 1;
-      n_left_from -= 1;
-      to_next +=1;
-      n_left_to_next -= 1;
-
-      p0 = vlib_get_buffer(vm, pi0);
-      ip40 = vlib_buffer_get_current(p0);
-
-      /* Throw away anything that isn't IP in IP. */
-      if (PREDICT_TRUE(ip40->protocol == IP_PROTOCOL_IPV6 && clib_net_to_host_u16(ip40->length) >= 60)) {
-	vlib_buffer_advance(p0, sizeof(ip4_header_t));
-	ip60 = vlib_buffer_get_current(p0);
-	d0 = ip4_sixrd_get_domain(vnet_buffer(p0)->ip.adj_index[VLIB_TX], (ip6_address_t *)&ip60->src_address,
-				&sixrd_domain_index0, &error0);
-      } else {
-	error0 = SIXRD_ERROR_BAD_PROTOCOL;
-      }
-      if (d0) {
-	/* SIXRD inbound security check */
-	ip4_sixrd_sec_check(d0, ip40->src_address, ip60->src_address, &error0);
-      }
-
-      next0 = error0 == SIXRD_ERROR_NONE ? IP4_SIXRD_NEXT_IP6_LOOKUP : IP4_SIXRD_NEXT_DROP;
-
-      if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED)) {
-	sixrd_trace_t *tr = vlib_add_trace(vm, node, p0, sizeof(*tr));
-	tr->sixrd_domain_index = sixrd_domain_index0;
-      }
-
-      p0->error = error_node->errors[error0];
-      if (PREDICT_TRUE(error0 == SIXRD_ERROR_NONE)) decap++;
-      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next, n_left_to_next, pi0, next0);
-
-    }
-    vlib_put_next_frame(vm, node, next_index, n_left_to_next);
-  }
-  vlib_node_increment_counter(vm, ip4_sixrd_node.index, SIXRD_ERROR_DECAPSULATED, decap);
-
-  return frame->n_vectors;
-}
-
-static char *sixrd_error_strings[] = {
-#define _(sym,string) string,
-  foreach_sixrd_error
-#undef _
-};
-
-VLIB_REGISTER_NODE(ip4_sixrd_node,static) = {
-  .function = ip4_sixrd,
-  .name = "ip4-sixrd",
-  .vector_size = sizeof(u32),
-  .format_trace = format_sixrd_trace,
-  .n_errors = SIXRD_N_ERROR,
-  .error_strings = sixrd_error_strings,
-  .n_next_nodes = IP4_SIXRD_N_NEXT,
-  .next_nodes = {
-    [IP4_SIXRD_NEXT_IP6_LOOKUP] = "ip6-lookup",
-    [IP4_SIXRD_NEXT_DROP] = "error-drop",
-  },
-};
diff --git a/vnet/vnet/map/ip6_sixrd.c b/vnet/vnet/map/ip6_sixrd.c
deleted file mode 100644
index 36f3fab3..00000000
--- a/vnet/vnet/map/ip6_sixrd.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*---------------------------------------------------------------------------
- * Copyright (c) 2009-2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------
- */
-/*
- * Defines used for testing various optimisation schemes
- */
-#define SIXRD_ENCAP_DUAL 0
-
-#include "sixrd.h"
-
-static vlib_node_registration_t ip6_sixrd_node;
-
-typedef enum {
-  IP6_SIXRD_NEXT_IP4_LOOKUP,
-  IP6_SIXRD_NEXT_DROP,
-  IP6_SIXRD_N_NEXT,
-} ip6_sixrd_next_t;
-
-/*
- * ip6_sixrd
- */
-static uword
-ip6_sixrd (vlib_main_t *vm,
-	   vlib_node_runtime_t *node,
-	   vlib_frame_t *frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node = vlib_node_get_runtime(vm, ip6_sixrd_node.index);
-  u32 encap = 0;
-  from = vlib_frame_vector_args(frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0) {
-    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
-
-    while (n_left_from > 0 && n_left_to_next > 0) {
-      u32 pi0;
-      vlib_buffer_t *p0;
-      sixrd_domain_t *d0;
-      u8 error0 = SIXRD_ERROR_NONE;
-      ip6_header_t *ip60;
-      ip4_header_t *ip4h0;
-      u32 next0 = IP6_SIXRD_NEXT_IP4_LOOKUP;
-      u32 sixrd_domain_index0 = ~0;
-
-      pi0 = to_next[0] = from[0];
-      from += 1;
-      n_left_from -= 1;
-      to_next +=1;
-      n_left_to_next -= 1;
-
-      p0 = vlib_get_buffer(vm, pi0);
-      ip60 = vlib_buffer_get_current(p0);
-      //      p0->current_length = clib_net_to_host_u16(ip40->length);
-      d0 = ip6_sixrd_get_domain(vnet_buffer(p0)->ip.adj_index[VLIB_TX], &sixrd_domain_index0);
-      ASSERT(d0);
-
-      /* SIXRD calc */
-      u64 dal60 = clib_net_to_host_u64(ip60->dst_address.as_u64[0]);
-      u32 da40 = sixrd_get_addr(d0, dal60);
-      u16 len = clib_net_to_host_u16(ip60->payload_length) + 60;
-      if (da40 == 0) error0 = SIXRD_ERROR_UNKNOWN;
-
-      /* construct ipv4 header */
-      vlib_buffer_advance(p0, - (sizeof(ip4_header_t)));
-      ip4h0 = vlib_buffer_get_current(p0);
-      vnet_buffer(p0)->sw_if_index[VLIB_TX] = (u32)~0;
-      ip4h0->ip_version_and_header_length = 0x45;
-      ip4h0->tos = 0;
-      ip4h0->length = clib_host_to_net_u16(len);
-      ip4h0->fragment_id = 0;
-      ip4h0->flags_and_fragment_offset = 0;
-      ip4h0->ttl = 0x40;
-      ip4h0->protocol = IP_PROTOCOL_IPV6;
-      ip4h0->src_address = d0->ip4_src;
-      ip4h0->dst_address.as_u32 = clib_host_to_net_u32(da40);
-      ip4h0->checksum = ip4_header_checksum(ip4h0);
-
-      next0 = error0 == SIXRD_ERROR_NONE ? IP6_SIXRD_NEXT_IP4_LOOKUP : IP6_SIXRD_NEXT_DROP;
-
-      if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED)) {
-	sixrd_trace_t *tr = vlib_add_trace(vm, node, p0, sizeof(*tr));
-	tr->sixrd_domain_index = sixrd_domain_index0;
-      }
-
-      p0->error = error_node->errors[error0];
-      if (PREDICT_TRUE(error0 == SIXRD_ERROR_NONE)) encap++;
-
-      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next, n_left_to_next, pi0, next0);
-    }
-    vlib_put_next_frame(vm, node, next_index, n_left_to_next);  
-  }
-  vlib_node_increment_counter(vm, ip6_sixrd_node.index, SIXRD_ERROR_ENCAPSULATED, encap);
-
-  return frame->n_vectors;
-}
-
-static char *sixrd_error_strings[] = {
-#define _(sym,string) string,
-  foreach_sixrd_error
-#undef _
-};
-
-VLIB_REGISTER_NODE(ip6_sixrd_node,static) = {
-  .function = ip6_sixrd,
-  .name = "ip6-sixrd",
-  .vector_size = sizeof(u32),
-  .format_trace = format_sixrd_trace,
-  .n_errors = SIXRD_N_ERROR,
-  .error_strings = sixrd_error_strings,
-  .n_next_nodes = IP6_SIXRD_N_NEXT,
-  .next_nodes = {
-    [IP6_SIXRD_NEXT_IP4_LOOKUP] = "ip4-lookup",
-    [IP6_SIXRD_NEXT_DROP] = "error-drop",
-  },
-};
diff --git a/vnet/vnet/map/sixrd.c b/vnet/vnet/map/sixrd.c
deleted file mode 100644
index 26b4eea9..00000000
--- a/vnet/vnet/map/sixrd.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "sixrd.h"
-
-/*
- * This code supports the following sixrd modes:
- * 
- * 32 EA bits (Complete IPv4 address is embedded):
- *   ea_bits_len = 32
- * IPv4 suffix is embedded:
- *   ea_bits_len = < 32
- * No embedded address bits (1:1 mode):
- *   ea_bits_len = 0
- */
-
-int
-sixrd_create_domain (ip6_address_t *ip6_prefix,
-                   u8 ip6_prefix_len,
-                   ip4_address_t *ip4_prefix,
-                   u8 ip4_prefix_len,
-                   ip4_address_t *ip4_src,
-                   u32 *sixrd_domain_index,
-		     u16 mtu)
-{
-  sixrd_main_t *mm = &sixrd_main;
-  ip4_main_t *im4 = &ip4_main;
-  ip6_main_t *im6 = &ip6_main;
-  sixrd_domain_t *d;
-  ip_adjacency_t adj;
-  ip4_add_del_route_args_t args4;
-  ip6_add_del_route_args_t args6;
-  u32 *p;
-
-  /* Get domain index */
-  pool_get_aligned(mm->domains, d, CLIB_CACHE_LINE_BYTES);
-  memset(d, 0, sizeof (*d));
-  *sixrd_domain_index = d - mm->domains;
-
-  /* Init domain struct */
-  d->ip4_prefix.as_u32 = ip4_prefix->as_u32;
-  d->ip4_prefix_len = ip4_prefix_len;
-  d->ip6_prefix = *ip6_prefix;
-  d->ip6_prefix_len = ip6_prefix_len;
-  d->ip4_src = *ip4_src;
-  d->mtu = mtu;
-
-  if (ip4_prefix_len < 32)
-    d->shift = 64 - ip6_prefix_len + (32 - ip4_prefix_len);
-    
-  /* Init IP adjacency */
-  memset(&adj, 0, sizeof(adj));
-  adj.explicit_fib_index = ~0;
-  adj.lookup_next_index = IP_LOOKUP_NEXT_SIXRD;
-  p = (u32 *)&adj.rewrite_data[0];
-  *p = (u32) (*sixrd_domain_index);
-
-  /* Create ip6 adjacency */
-  memset(&args6, 0, sizeof(args6));
-  args6.table_index_or_table_id = 0;
-  args6.flags = IP6_ROUTE_FLAG_ADD;
-  args6.dst_address.as_u64[0] = ip6_prefix->as_u64[0];
-  args6.dst_address.as_u64[1] = ip6_prefix->as_u64[1];
-  args6.dst_address_length = ip6_prefix_len;
-  args6.adj_index = ~0;
-  args6.add_adj = &adj;
-  args6.n_add_adj = 1;
-  ip6_add_del_route(im6, &args6);
-
-  /* Multiple SIXRD domains may share same source IPv4 TEP */
-  uword *q = ip4_get_route(im4, 0, 0, (u8 *)ip4_src, 32);
-  if (q) {
-    u32 ai = q[0];
-    ip_lookup_main_t *lm4 = &ip4_main.lookup_main;
-    ip_adjacency_t *adj4 = ip_get_adjacency(lm4, ai);
-    if (adj4->lookup_next_index != IP_LOOKUP_NEXT_SIXRD) {
-      clib_warning("BR source address already assigned: %U", format_ip4_address, ip4_src);
-      pool_put(mm->domains, d);
-      return -1;
-    }
-    /* Shared source */
-    p = (u32 *)&adj4->rewrite_data[0];
-    p[0] = ~0;
-
-    /* Add refcount, so we don't accidentially delete the route underneath someone */
-    p[1]++;
-  } else {
-    /* Create ip4 adjacency. */
-    memset(&args4, 0, sizeof(args4));
-    args4.table_index_or_table_id = 0;
-    args4.flags = IP4_ROUTE_FLAG_ADD;
-    args4.dst_address.as_u32 = ip4_src->as_u32;
-    args4.dst_address_length = 32;
-    args4.adj_index = ~0;
-    args4.add_adj = &adj;
-    args4.n_add_adj = 1;
-    ip4_add_del_route(im4, &args4);
-  }
-
-  return 0;
-}
-
-/*
- * sixrd_delete_domain
- */
-int
-sixrd_delete_domain (u32 sixrd_domain_index)
-{
-  sixrd_main_t *mm = &sixrd_main;
-  ip4_main_t *im4 = &ip4_main;
-  ip6_main_t *im6 = &ip6_main;
-  sixrd_domain_t *d;
-  ip_adjacency_t adj;
-  ip4_add_del_route_args_t args4;
-  ip6_add_del_route_args_t args6;
-
-  if (pool_is_free_index(mm->domains, sixrd_domain_index)) {
-    clib_warning("SIXRD domain delete: domain does not exist: %d", sixrd_domain_index);
-    return -1;
-  }
-
-  d = pool_elt_at_index(mm->domains, sixrd_domain_index);
-
-  memset(&adj, 0, sizeof(adj));
-  adj.explicit_fib_index = ~0;
-  adj.lookup_next_index = IP_LOOKUP_NEXT_SIXRD;
-
-  /* Delete ip6 adjacency */
-  memset(&args6, 0, sizeof (args6));
-  args6.table_index_or_table_id = 0;
-  args6.flags = IP6_ROUTE_FLAG_DEL;
-  args6.dst_address.as_u64[0] = d->ip6_prefix.as_u64[0];
-  args6.dst_address.as_u64[1] = d->ip6_prefix.as_u64[1];
-  args6.dst_address_length = d->ip6_prefix_len;
-  args6.adj_index = 0;
-  args6.add_adj = &adj;
-  args6.n_add_adj = 0;
-  ip6_add_del_route(im6, &args6);
-
-  /* Delete ip4 adjacency */
-  uword *q = ip4_get_route(im4, 0, 0, (u8 *)&d->ip4_src, 32);
-  if (q) {
-    u32 ai = q[0];
-    ip_lookup_main_t *lm4 = &ip4_main.lookup_main;
-    ip_adjacency_t *adj4 = ip_get_adjacency(lm4, ai);
-
-    u32 *p = (u32 *)&adj4->rewrite_data[0];
-    /* Delete route when no other domains use this source */
-    if (p[1] == 0) {
-      memset(&args4, 0, sizeof(args4));
-      args4.table_index_or_table_id = 0;
-      args4.flags = IP4_ROUTE_FLAG_DEL;
-      args4.dst_address.as_u32 = d->ip4_prefix.as_u32;
-      args4.dst_address_length = d->ip4_prefix_len;
-      args4.adj_index = 0;
-      args4.add_adj = &adj;
-      args4.n_add_adj = 0;
-      ip4_add_del_route(im4, &args4);
-    }
-    p[1]--;
-  }
-
-  pool_put(mm->domains, d);
-
-  return 0;
-}
-
-static clib_error_t *
-sixrd_add_domain_command_fn (vlib_main_t *vm,
-                           unformat_input_t *input,
-                           vlib_cli_command_t *cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ip4_address_t ip4_prefix;
-  ip6_address_t ip6_prefix;
-  ip4_address_t ip4_src;
-  u32 ip6_prefix_len, ip4_prefix_len, sixrd_domain_index;
-  u32 num_m_args = 0;
-  /* Optional arguments */
-  u32 mtu = 0;
-
-  /* Get a line of input. */
-  if (!unformat_user(input, unformat_line_input, line_input))
-    return 0;
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat(line_input, "ip6-pfx %U/%d", unformat_ip6_address, &ip6_prefix, &ip6_prefix_len))
-      num_m_args++;
-    else if (unformat(line_input, "ip4-pfx %U/%d", unformat_ip4_address, &ip4_prefix, &ip4_prefix_len))
-      num_m_args++;
-    else if (unformat(line_input, "ip4-src %U", unformat_ip4_address, &ip4_src))
-      num_m_args++;
-    else if (unformat(line_input, "mtu %d", &mtu))
-      num_m_args++;
-    else
-      return clib_error_return(0, "unknown input `%U'",
-                               format_unformat_error, input);
-  }
-  unformat_free(line_input);
-
-  if (num_m_args < 3)
-    return clib_error_return(0, "mandatory argument(s) missing");
-
-  sixrd_create_domain(&ip6_prefix, ip6_prefix_len, &ip4_prefix, ip4_prefix_len,
-		      &ip4_src, &sixrd_domain_index, mtu);
-
-  return 0;
-}
-
-static clib_error_t *
-sixrd_del_domain_command_fn (vlib_main_t *vm,
-			   unformat_input_t *input,
-			   vlib_cli_command_t *cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u32 num_m_args = 0;
-  u32 sixrd_domain_index;
-
-  /* Get a line of input. */
-  if (! unformat_user(input, unformat_line_input, line_input))
-    return 0;
- 
-  while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat(line_input, "index %d", &sixrd_domain_index))
-      num_m_args++;
-    else
-      return clib_error_return(0, "unknown input `%U'",
-				format_unformat_error, input);
-  }
-  unformat_free(line_input);
-
-  if (num_m_args != 1)
-    return clib_error_return(0, "mandatory argument(s) missing");
-
-  sixrd_delete_domain(sixrd_domain_index);
-
-  return 0;
-}
-
-static u8 *
-format_sixrd_domain (u8 *s, va_list *args)
-{
-  sixrd_domain_t *d = va_arg(*args, sixrd_domain_t *);
-  sixrd_main_t *mm = &sixrd_main;
-
-  s = format(s,
-	     "[%d] ip6-pfx %U/%d ip4-pfx %U/%d ip4-src %U mtu %d",
-	     d - mm->domains,
-	     format_ip6_address, &d->ip6_prefix, d->ip6_prefix_len,
-	     format_ip4_address, &d->ip4_prefix, d->ip4_prefix_len,
-	     format_ip4_address, &d->ip4_src, d->mtu);
-
-  return s;
-}
-
-static clib_error_t *
-show_sixrd_domain_command_fn (vlib_main_t *vm, unformat_input_t *input, vlib_cli_command_t *cmd)
-{
-  sixrd_main_t *mm = &sixrd_main;
-  sixrd_domain_t *d;
-
-  if (pool_elts(mm->domains) == 0)
-    vlib_cli_output(vm, "No SIXRD domains are configured...");
-
-  pool_foreach(d, mm->domains, ({vlib_cli_output(vm, "%U", format_sixrd_domain, d);}));
-
-  return 0;
-
-}
-
-static clib_error_t *
-show_sixrd_stats_command_fn (vlib_main_t *vm, unformat_input_t *input, vlib_cli_command_t *cmd)
-{
-  sixrd_main_t *mm = &sixrd_main;
-  sixrd_domain_t *d;
-  int domains = 0, domaincount = 0;
-  if (pool_elts (mm->domains) == 0)
-    vlib_cli_output (vm, "No SIXRD domains are configured...");
-
-  pool_foreach(d, mm->domains, ({
-    domains += sizeof(*d);
-    domaincount++;
-  }));
-
-  vlib_cli_output(vm, "SIXRD domains structure: %d\n", sizeof (sixrd_domain_t));
-  vlib_cli_output(vm, "SIXRD domains: %d (%d bytes)\n", domaincount, domains);
-
-  return 0;
-}
-
-/*
- * packet trace format function
- */
-u8 *
-format_sixrd_trace (u8 *s, va_list *args)
-{
-  CLIB_UNUSED(vlib_main_t *vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED(vlib_node_t *node) = va_arg (*args, vlib_node_t *);
-  sixrd_trace_t *t = va_arg (*args, sixrd_trace_t *);
-  u32 sixrd_domain_index = t->sixrd_domain_index;
-
-  s = format(s, "SIXRD domain index: %d", sixrd_domain_index);
-
-  return s;
-}
-
-VLIB_CLI_COMMAND(sixrd_add_domain_command, static) = {
-  .path = "sixrd add domain",
-  .short_help = 
-  "sixrd add domain ip6-pfx <ip6-pfx> ip4-pfx <ip4-pfx> ip4-src <ip4-addr>",
-  .function = sixrd_add_domain_command_fn,
-};
-
-VLIB_CLI_COMMAND(sixrd_del_command, static) = {
-  .path = "sixrd del domain",
-  .short_help = 
-  "sixrd del domain index <domain>",
-  .function = sixrd_del_domain_command_fn,
-};
-
-VLIB_CLI_COMMAND(show_sixrd_domain_command, static) = {
-  .path = "show sixrd domain",
-  .function = show_sixrd_domain_command_fn,
-};
-
-VLIB_CLI_COMMAND(show_sixrd_stats_command, static) = {
-  .path = "show sixrd stats",
-  .function = show_sixrd_stats_command_fn,
-};
-
-/*
- * sixrd_init
- */
-clib_error_t *sixrd_init (vlib_main_t *vm)
-{
-  sixrd_main_t *mm = &sixrd_main;
-
-  mm->vnet_main = vnet_get_main();
-  mm->vlib_main = vm;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION(sixrd_init);
diff --git a/vnet/vnet/map/sixrd.h b/vnet/vnet/map/sixrd.h
deleted file mode 100644
index 388ba4d2..00000000
--- a/vnet/vnet/map/sixrd.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*---------------------------------------------------------------------------
- * Copyright (c) 2009-2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------
- */
-#include <stdbool.h>
-#include <vppinfra/error.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-
-int sixrd_create_domain(ip6_address_t *ip6_prefix, u8 ip6_prefix_len,
-			ip4_address_t *ip4_prefix, u8 ip4_prefix_len,
-			ip4_address_t *ip4_src, u32 *sixrd_domain_index, u16 mtu);
-int sixrd_delete_domain(u32 sixrd_domain_index);
-u8 *format_sixrd_trace(u8 *s, va_list *args);
-
-typedef struct {
-  ip6_address_t ip6_prefix;
-  ip4_address_t ip4_prefix;
-  ip4_address_t ip4_src;
-  u8 ip6_prefix_len;
-  u8 ip4_prefix_len;
-
-  /* helpers */
-  u8 shift;
-
-  u16 mtu;
-} sixrd_domain_t;
-
-typedef struct {
-  /* pool of SIXRD domains */
-  sixrd_domain_t *domains;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} sixrd_main_t;
-
-#define foreach_sixrd_error				\
-  /* Must be first. */					\
- _(NONE, "valid SIXRD packets")				\
- _(BAD_PROTOCOL, "bad protocol")			\
- _(WRONG_ICMP_TYPE, "wrong icmp type")			\
- _(SEC_CHECK, "security check failed")			\
- _(ICMP, "unable to translate ICMP")			\
- _(UNKNOWN, "unknown")					\
- _(NO_DOMAIN, "no domain")				\
- _(ENCAPSULATED, "encapsulated")			\
- _(DECAPSULATED, "decapsulated")			\
- _(TRANSLATED_4TO6, "translated 4 to 6")		\
- _(TRANSLATED_6TO4, "translated 6 to 4")		\
- _(FRAGMENT, "fragment handling error")			\
- _(FRAGMENT_QUEUED, "dropped, missing first fragment")	\
- _(FRAGMENTED, "packets requiring fragmentation")	\
- _(FRAGMENT_PARTS, "fragment parts")                    \
- _(MALFORMED, "malformed packet")
-
-typedef enum {
-#define _(sym,str) SIXRD_ERROR_##sym,
-   foreach_sixrd_error
-#undef _
-   SIXRD_N_ERROR,
- } sixrd_error_t;
-
-typedef struct {
-  u32 sixrd_domain_index;
-} sixrd_trace_t;
-
-sixrd_main_t sixrd_main;
-
-/*
- * sixrd_get_addr
- */
-static_always_inline u32
-sixrd_get_addr (sixrd_domain_t *d, u64 dal)
-{
-
-  /* 1:1 mode */
-  if (d->ip4_prefix_len == 32) return (d->ip4_prefix.as_u32);
-
-  /* Grab 32 - ip4_prefix_len bits out of IPv6 address from offset ip6_prefix_len */
-  return (d->ip4_prefix.as_u32 | (u32)(dal >> d->shift));
-}
-
-/*
- * Get the SIXRD domain from an IPv6 lookup adjacency.
- */
-static_always_inline sixrd_domain_t *
-ip6_sixrd_get_domain (u32 adj_index, u32 *sixrd_domain_index)
-{
-  sixrd_main_t *mm = &sixrd_main;
-  ip_lookup_main_t *lm = &ip6_main.lookup_main;
-  ip_adjacency_t *adj = ip_get_adjacency(lm, adj_index);
-  ASSERT(adj);
-  uword *p = (uword *)adj->rewrite_data;
-  ASSERT(p);
-  *sixrd_domain_index = p[0];
-  return pool_elt_at_index(mm->domains, p[0]);
-}
-
-/*
- * Get the SIXRD domain from an IPv4 lookup adjacency.
- * If the IPv4 address is not shared, no lookup is required.
- * The IPv6 address is used otherwise.
- */
-static_always_inline sixrd_domain_t *
-ip4_sixrd_get_domain (u32 adj_index, ip6_address_t *addr,
-		      u32 *sixrd_domain_index, u8 *error)
-{
-  sixrd_main_t *mm = &sixrd_main;
-  ip6_main_t *im6 = &ip6_main;
-  ip_lookup_main_t *lm4 = &ip4_main.lookup_main;
-  ip_lookup_main_t *lm6 = &ip6_main.lookup_main;
-  ip_adjacency_t *adj = ip_get_adjacency(lm4, adj_index);
-  ASSERT(adj);
-  uword *p = (uword *)adj->rewrite_data;
-  ASSERT(p);
-  *sixrd_domain_index = p[0];
-  if (p[0] != ~0)
-    return pool_elt_at_index(mm->domains, p[0]);
-
-  u32 ai = ip6_fib_lookup_with_table(im6, 0, addr);
-  ip_adjacency_t *adj6 = ip_get_adjacency (lm6, ai);
-  if (PREDICT_TRUE(adj6->lookup_next_index == IP_LOOKUP_NEXT_SIXRD)) {
-    uword *p = (uword *)adj6->rewrite_data;
-    *sixrd_domain_index = p[0];
-    return pool_elt_at_index(mm->domains, *sixrd_domain_index);
-  }
-  *error = SIXRD_ERROR_NO_DOMAIN;
-  return NULL;
-}
-- 
cgit 1.2.3-korg


From f289ca6bc6be76216a23320dab8aa4ce4b284c05 Mon Sep 17 00:00:00 2001
From: "Keith Burns (alagalah)" <alagalah@gmail.com>
Date: Fri, 17 Jun 2016 12:54:17 -0700
Subject: Updated Makefile so install-dep doesn't prompt

Change-Id: I8e5f4d120c9add636054e740f2a8aa3a0f8bb7d1
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c3380e74..94ba90d0 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,7 @@ endif
 
 ifeq ($(findstring y,$(UNATTENDED)),y)
 CONFIRM=-y
+FORCE=--force-yes
 endif
 
 .PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
@@ -128,11 +129,11 @@ bootstrap: $(BR)/.bootstrap.ok
 install-dep:
 ifeq ($(OS_ID),ubuntu)
 ifeq ($(OS_VERSION_ID),14.04)
-	@sudo -E apt-get $(CONFIRM) install software-properties-common
-	@sudo -E add-apt-repository $(CONFIRM) ppa:openjdk-r/ppa
+	@sudo -E apt-get $(CONFIRM) $(FORCE) install software-properties-common
+	@sudo -E add-apt-repository ppa:openjdk-r/ppa $(CONFIRM)
 	@sudo -E apt-get update
 endif
-	@sudo -E apt-get $(CONFIRM) install $(DEB_DEPENDS)
+	@sudo -E apt-get $(CONFIRM) $(FORCE) install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
 	@sudo yum install $(CONFIRM) $(RPM_DEPENDS)
-- 
cgit 1.2.3-korg


From 4b72a5812c1068234314ccf4179ea91afe849b40 Mon Sep 17 00:00:00 2001
From: "Keith Burns (alagalah)" <alagalah@gmail.com>
Date: Sat, 2 Jul 2016 17:54:36 -0700
Subject: Add gtags option to use ctags. Hidden option in Makefile

Change-Id: I6b01c1f2beec37d7aaad1ab9dab303835a9feb49
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 94ba90d0..ad604765 100644
--- a/Makefile
+++ b/Makefile
@@ -219,6 +219,9 @@ ctags: ctags.files
 	@ctags --totals --tag-relative -L $<
 	@rm $<
 
+gtags: ctags
+	@gtags --gtagslabel=ctags
+
 cscope: cscope.files
 	@cscope -b -q -v
 
-- 
cgit 1.2.3-korg


From a7775387b18ede6b9a0ddaa8c994d2401de0e238 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Thu, 7 Jul 2016 17:56:48 +0200
Subject: Set plugin path properly when using toplevel makefile to run/debug
 vpp

Change-Id: Ib6f7dd9d7e1d9f2f2108a8b89421149e4435d5ec
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ad604765..49a73861 100644
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,8 @@ help:
 	@echo " wipe-release        - wipe all products of release build "
 	@echo " build               - build debug binaries"
 	@echo " build-release       - build release binaries"
+	@echo " plugins             - build debug plugin binaries"
+	@echo " plugins-release     - build release plugin binaries"
 	@echo " rebuild             - wipe and build debug binares"
 	@echo " rebuild-release     - wipe and build release binares"
 	@echo " run                 - run debug binary"
@@ -75,6 +77,7 @@ help:
 	@echo " pkg-deb             - build DEB packages"
 	@echo " pkg-rpm             - build RPM packages"
 	@echo " ctags               - (re)generate ctags database"
+	@echo " gtags               - (re)generate gtags database"
 	@echo " cscope              - (re)generate cscope database"
 	@echo " doxygen             - (re)generate documentation"
 	@echo " wipe-doxygen        - wipe all generated documentation"
@@ -174,13 +177,13 @@ ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run
 	@echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
 	@echo "         Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
-	@sudo rm -f /dev/shm/vpe-api /dev/shm/db /dev/shm/global_vm
-	@cd $(STARTUP_DIR) && sudo $(1) $(MINIMAL_STARTUP_CONF)
+	@cd $(STARTUP_DIR) && \
+	  sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) plugin_path $(1)/plugins/lib64
 endef
 else
 define run
-	@sudo rm -f /dev/shm/vpe-api /dev/shm/db /dev/shm/global_vm
-	@cd $(STARTUP_DIR) && sudo $(1) -c $(STARTUP_CONF)
+	@cd $(STARTUP_DIR) && \
+	  sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(1)/plugins/lib64
 endef
 endif
 
@@ -192,16 +195,16 @@ endif
 .FORCE:
 
 run:
-	$(call run, $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp)
+	$(call run, $(BR)/install-$(PLATFORM)_debug-native)
 
 run-release:
-	$(call run, $(BR)/install-$(PLATFORM)-native/vpp/bin/vpp)
+	$(call run, $(BR)/install-$(PLATFORM)-native)
 
 debug:
-	$(call run, $(GDB) $(GDB_ARGS) --args $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp)
+	$(call run, $(BR)/install-$(PLATFORM)_debug-native,$(GDB) $(GDB_ARGS) --args)
 
 debug-release:
-	$(call run, $(GDB) $(GDB_ARGS) --args $(BR)/install-$(PLATFORM)-native/vpp/bin/vpp)
+	$(call run, $(BR)/install-$(PLATFORM)-native,$(GDB) $(GDB_ARGS) --args)
 
 build-vat:
 	$(call make,$(PLATFORM)_debug,vpp-api-test-install)
-- 
cgit 1.2.3-korg


From 905a7f5520a64aad545c8dd02796b56f88ed2d38 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Thu, 7 Jul 2016 20:27:49 +0200
Subject: Multiple changes in the plugin build infra

- configure.ac - some plugins are enabled by default
- Plugin .so files are placed into corresponding subdirs
- WITH_PLUGIN_TOOLKIT macro is retired - not needed anymore
- plugins/build-data is removed
- plugin makefiles are not building static libs anymore
- plugin makefiles are not installing header files to /usr/include
  anymore

Change-Id: I55681bd9ce34811f7eb1b2b24d9f0ca42df1cf04
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                                     |  6 ++--
 build-data/platforms/vpp.mk                  |  4 +--
 build-root/bootstrap.sh                      |  2 +-
 plugins/build-data/packages/ioam-plugin.mk   | 47 ----------------------------
 plugins/build-data/packages/sample-plugin.mk | 47 ----------------------------
 plugins/build-data/packages/sixrd-plugin.mk  | 47 ----------------------------
 plugins/build-data/packages/vcgn-plugin.mk   | 47 ----------------------------
 plugins/configure.ac                         | 36 ++++++++++++---------
 plugins/ioam-plugin/Makefile.am              | 23 +++++++-------
 plugins/ioam-plugin/configure.ac             | 11 +------
 plugins/sample-plugin/Makefile.am            | 25 ++++++++-------
 plugins/sample-plugin/configure.ac           | 11 +------
 plugins/sixrd-plugin/Makefile.am             | 19 ++++++-----
 plugins/sixrd-plugin/configure.ac            | 11 +------
 plugins/snat-plugin/Makefile.am              | 32 +++++++++----------
 plugins/snat-plugin/configure.ac             | 12 +------
 plugins/vcgn-plugin/Makefile.am              | 14 ++++-----
 plugins/vcgn-plugin/configure.ac             | 11 +------
 18 files changed, 84 insertions(+), 321 deletions(-)
 delete mode 100644 plugins/build-data/packages/ioam-plugin.mk
 delete mode 100644 plugins/build-data/packages/sample-plugin.mk
 delete mode 100644 plugins/build-data/packages/sixrd-plugin.mk
 delete mode 100644 plugins/build-data/packages/vcgn-plugin.mk

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 49a73861..a1c63078 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ ifeq ($(OS_ID),ubuntu)
 	fi ; \
 	exit 0
 endif
-	@echo "SOURCE_PATH = $(WS_ROOT) $(WS_ROOT)/plugins"> $(BR)/build-config.mk
+	@echo "SOURCE_PATH = $(WS_ROOT)"                   > $(BR)/build-config.mk
 	@echo "#!/bin/bash\n"                              > $(BR)/path_setup
 	@echo 'export PATH=$(BR)/tools/ccache-bin:$$PATH' >> $(BR)/path_setup
 	@echo 'export PATH=$(BR)/tools/bin:$$PATH'        >> $(BR)/path_setup
@@ -178,12 +178,12 @@ define run
 	@echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
 	@echo "         Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
 	@cd $(STARTUP_DIR) && \
-	  sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) plugin_path $(1)/plugins/lib64
+	  sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) plugin_path $(1)/plugins/lib64/vpp_plugins
 endef
 else
 define run
 	@cd $(STARTUP_DIR) && \
-	  sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(1)/plugins/lib64
+	  sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(1)/plugins/lib64/vpp_plugins
 endef
 endif
 
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 45f74d33..fb1867c7 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -38,9 +38,7 @@ vnet_configure_args_vpp = --with-dpdk
 # Set these parameters carefully. The vlib_buffer_t is 128 bytes, i.e.
 vlib_configure_args_vpp = --with-pre-data=128
 
-# Enable plugins here, and no place else, via multiple --enable-XXX-plugin
-# stanzas.
-plugins_configure_args_vpp = --with-dpdk --enable-sixrd-plugin 
+plugins_configure_args_vpp = --with-dpdk
 
 # DPDK configuration parameters
 # vpp_uses_external_dpdk = yes
diff --git a/build-root/bootstrap.sh b/build-root/bootstrap.sh
index 2419b6ae..f83734fd 100755
--- a/build-root/bootstrap.sh
+++ b/build-root/bootstrap.sh
@@ -12,7 +12,7 @@ ADD_TO_PATH="$build_root/tools/ccache-bin:$build_root/tools/bin"
 
 # Construct build-config.mk
 cd $build_root
-echo SOURCE_PATH = $wsroot $wsroot/plugins/ > build-config.mk
+echo SOURCE_PATH = $wsroot > build-config.mk
 echo 
 echo Saving PATH settings in `pwd`/path_setup
 echo Source this file later, as needed
diff --git a/plugins/build-data/packages/ioam-plugin.mk b/plugins/build-data/packages/ioam-plugin.mk
deleted file mode 100644
index 1ebe8184..00000000
--- a/plugins/build-data/packages/ioam-plugin.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-ioam-plugin_configure_depend =		\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
-	vpp-install				\
-	vpp-api-test-install
-
-ioam-plugin_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra					\
-	openssl						\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp						\
-        vpp-api-test)
-
-ioam-plugin_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra					\
-	openssl						\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp						\
-	vpp-api-test)
-
-ioam-plugin_post_install = \
-	mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins ; 	\
-	cp $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/*.so 			\
-	  $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins
-
-ioam-plugin_image_include = echo $(arch_lib_dir)/vlib_plugins
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-ioam-plugin_configure_args = --with-dpdk
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-ioam-plugin_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-ioam-plugin_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-ioam-plugin_configure_depend += dpdk-install
-ioam-plugin_CPPFLAGS += $(call installed_includes_fn, dpdk)
-ioam-plugin_LDFLAGS += $(call installed_libs_fn, dpdk)
-endif
-endif
diff --git a/plugins/build-data/packages/sample-plugin.mk b/plugins/build-data/packages/sample-plugin.mk
deleted file mode 100644
index 047a26f5..00000000
--- a/plugins/build-data/packages/sample-plugin.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-sample-plugin_configure_depend =		\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
-	vpp-install				\
-	vpp-api-test-install
-
-sample-plugin_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra					\
-	openssl						\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp						\
-        vpp-api-test)
-
-sample-plugin_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra					\
-	openssl						\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp						\
-	vpp-api-test)
-
-sample-plugin_post_install = \
-	mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins ; 	\
-	cp $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/*.so 			\
-	  $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins
-
-sample-plugin_image_include = echo $(arch_lib_dir)/vlib_plugins
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-sample-plugin_configure_args = --with-dpdk
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-sample-plugin_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-sample-plugin_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-sample-plugin_configure_depend += dpdk-install
-sample-plugin_CPPFLAGS += $(call installed_includes_fn, dpdk)
-sample-plugin_LDFLAGS += $(call installed_libs_fn, dpdk)
-endif
-endif
diff --git a/plugins/build-data/packages/sixrd-plugin.mk b/plugins/build-data/packages/sixrd-plugin.mk
deleted file mode 100644
index 186d9b8f..00000000
--- a/plugins/build-data/packages/sixrd-plugin.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-sixrd-plugin_configure_depend =		\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
-	vpp-install				\
-	vpp-api-test-install
-
-sixrd-plugin_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra					\
-	openssl						\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp						\
-        vpp-api-test)
-
-sixrd-plugin_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra					\
-	openssl						\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp						\
-	vpp-api-test)
-
-sixrd-plugin_post_install = \
-	mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins ; 	\
-	cp $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/*.so 			\
-	  $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins
-
-sixrd-plugin_image_include = echo $(arch_lib_dir)/vlib_plugins
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-sixrd-plugin_configure_args = --with-dpdk
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-sixrd-plugin_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-sixrd-plugin_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-sixrd-plugin_configure_depend += dpdk-install
-sixrd-plugin_CPPFLAGS += $(call installed_includes_fn, dpdk)
-sixrd-plugin_LDFLAGS += $(call installed_libs_fn, dpdk)
-endif
-endif
diff --git a/plugins/build-data/packages/vcgn-plugin.mk b/plugins/build-data/packages/vcgn-plugin.mk
deleted file mode 100644
index cd865c15..00000000
--- a/plugins/build-data/packages/vcgn-plugin.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-vcgn-plugin_configure_depend =		\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
-	vpp-install				\
-	vpp-api-test-install
-
-vcgn-plugin_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra					\
-	openssl						\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp						\
-        vpp-api-test)
-
-vcgn-plugin_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra					\
-	openssl						\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp						\
-	vpp-api-test)
-
-vcgn-plugin_post_install = \
-	mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins ; 	\
-	cp $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/*.so 			\
-	  $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins
-
-vcgn-plugin_image_include = echo $(arch_lib_dir)/vlib_plugins
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-vcgn-plugin_configure_args = --with-dpdk
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-vcgn-plugin_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-vcgn-plugin_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-vcgn-plugin_configure_depend += dpdk-install
-vcgn-plugin_CPPFLAGS += $(call installed_includes_fn, dpdk)
-vcgn-plugin_LDFLAGS += $(call installed_libs_fn, dpdk)
-endif
-endif
diff --git a/plugins/configure.ac b/plugins/configure.ac
index 7aff9875..f10d1803 100644
--- a/plugins/configure.ac
+++ b/plugins/configure.ac
@@ -11,25 +11,29 @@ AC_ARG_ENABLE(tests,
               [enable_tests=1],
               [enable_tests=0])
 
-AC_ARG_WITH(plugin-toolkit,
-            AC_HELP_STRING([--with-plugin-toolkit],
-            [build using the vpp toolkit]),
-            [with_plugin_toolkit=${prefix}/include],
-            [with_plugin_toolkit=.])
-
 AC_ARG_WITH(dpdk,
             AC_HELP_STRING([--with-dpdk],[Use the Intel dpdk]),
             [with_dpdk=1],
             [with_dpdk=0])
 
-AC_SUBST(TOOLKIT_INCLUDE,[${with_plugin_toolkit}])
-AM_CONDITIONAL(WITH_PLUGIN_TOOLKIT, test "$with_plugin_toolkit" != ".")
 AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" = "1")
 
 AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1")
 AC_SUBST(DPDK,["-DDPDK=${with_dpdk}"])
 
-AC_DEFUN([PLUGIN],
+AC_DEFUN([PLUGIN_ENABLED],
+[
+   AC_ARG_ENABLE($1_plugin,
+       AC_HELP_STRING([--disable-$1-plugin], [Do not build $1 plugin]),
+              [enable_the_plugin=0],
+              [enable_the_plugin=1])
+if test "x$enable_the_plugin" = x1; then
+   AC_CONFIG_SUBDIRS($1-plugin)
+fi
+AM_CONDITIONAL(ENABLE_$1_PLUGIN, test "$enable_the_plugin" = "1")
+])
+
+AC_DEFUN([PLUGIN_DISABLED],
 [
    AC_ARG_ENABLE($1_plugin,
        AC_HELP_STRING([--enable-$1-plugin], [Build $1 plugin]),
@@ -42,7 +46,7 @@ AM_CONDITIONAL(ENABLE_$1_PLUGIN, test "$enable_the_plugin" = "1")
 ])
 
 # To add a new plugin subdirectory:
-# 
+#
 # add PLUGIN(new) below, and
 # add the following to Makefile.am:
 #
@@ -50,10 +54,12 @@ AM_CONDITIONAL(ENABLE_$1_PLUGIN, test "$enable_the_plugin" = "1")
 # SUBDIRS += new-plugin
 # endif
 
-PLUGIN(sample)
-PLUGIN(sixrd)
-PLUGIN(ioam)
-PLUGIN(vcgn)
-PLUGIN(snat)
+PLUGIN_ENABLED(sixrd)
+PLUGIN_ENABLED(ioam)
+PLUGIN_ENABLED(snat)
+
+# Disabled plugins, require --enable-XXX-plugin
+PLUGIN_DISABLED(vcgn)
+PLUGIN_DISABLED(sample)
 
 AC_OUTPUT([Makefile])
diff --git a/plugins/ioam-plugin/Makefile.am b/plugins/ioam-plugin/Makefile.am
index e62525f1..47ff1167 100644
--- a/plugins/ioam-plugin/Makefile.am
+++ b/plugins/ioam-plugin/Makefile.am
@@ -13,7 +13,8 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CFLAGS = -Wall -I@TOOLKIT_INCLUDE@
+AM_CFLAGS = -Wall
+AM_LDFLAGS = -module -shared -avoid-version
 
 ########################################
 # iOAM Proof of Transit
@@ -26,8 +27,6 @@ ioam_pot_plugin_la_SOURCES =			\
 	ioam/lib-pot/math64.h			\
 	ioam/lib-pot/pot_api.c
 
-ioam_pot_plugin_la_LDFLAGS = -module
-
 BUILT_SOURCES =					\
 	ioam/lib-pot/pot.api.h
 
@@ -38,7 +37,7 @@ SUFFIXES = .api.h .api
 	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
 	| vppapigen --input - --output $@ --show-name $@
 
-nobase_include_HEADERS =			\
+noinst_HEADERS =				\
   ioam/lib-pot/pot_all_api_h.h			\
   ioam/lib-pot/pot_msg_enum.h			\
   ioam/lib-pot/pot.api.h			\
@@ -49,14 +48,14 @@ ioam_pot_test_plugin_la_SOURCES =		\
 	ioam/lib-pot/pot_test.c			\
 	ioam/lib-pot/pot_plugin.api.h
 
-ioam_pot_test_plugin_la_LDFLAGS = -module
+vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
+vpppluginsdir = ${libdir}/vpp_plugins
+
+vppapitestplugins_LTLIBRARIES = ioam_pot_test_plugin.la
+vppplugins_LTLIBRARIES = ioam_pot_plugin.la
 
-lib_LTLIBRARIES = ioam_pot_plugin.la ioam_pot_test_plugin.la
 
-if WITH_PLUGIN_TOOLKIT
+# Remove *.la files
 install-data-hook:
-	mkdir /usr/lib/vpp_plugins || true
-	mkdir /usr/lib/vpp_api_test_plugins || true
-	cp -L $(prefix)/lib/ioam_pot_plugin.so /usr/lib/vpp_plugins
-	cp -L $(prefix)/lib/ioam_pot_test_plugin.so /usr/lib/vpp_api_test_plugins
-endif
+	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
+	@(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
diff --git a/plugins/ioam-plugin/configure.ac b/plugins/ioam-plugin/configure.ac
index 8c828575..27fda734 100644
--- a/plugins/ioam-plugin/configure.ac
+++ b/plugins/ioam-plugin/configure.ac
@@ -1,17 +1,8 @@
 AC_INIT(ioam_plugin, 1.0)
 LT_INIT
 AM_INIT_AUTOMAKE
+AC_PREFIX_DEFAULT([/usr])
 
-AM_PROG_AS
 AC_PROG_CC
-AM_PROG_CC_C_O
 
-AC_ARG_WITH(plugin-toolkit,
-            AC_HELP_STRING([--with-plugin-toolkit],
-            [build using the vpp toolkit]),
-            [with_plugin_toolkit=${prefix}/include],
-            [with_plugin_toolkit=.])
-
-AC_SUBST(TOOLKIT_INCLUDE,[${with_plugin_toolkit}])
-AM_CONDITIONAL(WITH_PLUGIN_TOOLKIT, test "$with_plugin_toolkit" != ".")
 AC_OUTPUT([Makefile])
diff --git a/plugins/sample-plugin/Makefile.am b/plugins/sample-plugin/Makefile.am
index 30b17194..0b213791 100644
--- a/plugins/sample-plugin/Makefile.am
+++ b/plugins/sample-plugin/Makefile.am
@@ -13,12 +13,17 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CFLAGS = -Wall -I@TOOLKIT_INCLUDE@
+AM_CFLAGS = -Wall
+AM_LDFLAGS = -module -shared -avoid-version
+
+vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
+vpppluginsdir = ${libdir}/vpp_plugins
+
+vppapitestplugins_LTLIBRARIES = sample_test_plugin.la
+vppplugins_LTLIBRARIES = sample_plugin.la
 
-lib_LTLIBRARIES = sample_plugin.la sample_test_plugin.la
 sample_plugin_la_SOURCES = sample/sample.c sample/node.c \
-	sample/sample_plugin.api.h 
-sample_plugin_la_LDFLAGS = -module
+	sample/sample_plugin.api.h
 
 BUILT_SOURCES = sample/sample.api.h
 
@@ -29,18 +34,14 @@ SUFFIXES = .api.h .api
 	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
 	| vppapigen --input - --output $@ --show-name $@
 
-nobase_include_HEADERS =			\
+noinst_HEADERS =				\
   sample/sample_all_api_h.h			\
   sample/sample_msg_enum.h			\
   sample/sample.api.h
 
 sample_test_plugin_la_SOURCES = sample/sample_test.c sample/sample_plugin.api.h
-sample_test_plugin_la_LDFLAGS = -module
 
-if WITH_PLUGIN_TOOLKIT
+# Remove *.la files
 install-data-hook:
-	mkdir /usr/lib/vpp_plugins || true
-	mkdir /usr/lib/vpp_api_test_plugins || true
-	cp -L $(prefix)/lib/sample_plugin.so /usr/lib/vpp_plugins
-	cp -L $(prefix)/lib/sample_test_plugin.so /usr/lib/vpp_api_test_plugins
-endif
+	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
+	@(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
diff --git a/plugins/sample-plugin/configure.ac b/plugins/sample-plugin/configure.ac
index a8257305..43642732 100644
--- a/plugins/sample-plugin/configure.ac
+++ b/plugins/sample-plugin/configure.ac
@@ -2,17 +2,8 @@ AC_INIT(sample_plugin, 1.0)
 LT_INIT
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
+AC_PREFIX_DEFAULT([/usr])
 
-AM_PROG_AS
 AC_PROG_CC
-AM_PROG_CC_C_O
 
-AC_ARG_WITH(plugin-toolkit,
-            AC_HELP_STRING([--with-plugin-toolkit],
-            [build using the vpp toolkit]),
-            [with_plugin_toolkit=${prefix}/include],
-            [with_plugin_toolkit=.])
-
-AC_SUBST(TOOLKIT_INCLUDE,[${with_plugin_toolkit}])
-AM_CONDITIONAL(WITH_PLUGIN_TOOLKIT, test "$with_plugin_toolkit" != ".")
 AC_OUTPUT([Makefile])
diff --git a/plugins/sixrd-plugin/Makefile.am b/plugins/sixrd-plugin/Makefile.am
index c2fae798..71c8da48 100644
--- a/plugins/sixrd-plugin/Makefile.am
+++ b/plugins/sixrd-plugin/Makefile.am
@@ -13,25 +13,24 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CFLAGS = -Wall -I@TOOLKIT_INCLUDE@
+AM_CFLAGS = -Wall
+AM_LDFLAGS = -module -shared -avoid-version
 
 libsixrd_plugin_la_SOURCES =			\
 	sixrd/sixrd.c				\
 	sixrd/ip4_sixrd.c			\
 	sixrd/ip6_sixrd.c
 
-nobase_include_HEADERS =			\
+noinst_HEADERS =				\
 	sixrd/sixrd.h
 
-libsixrd_plugin_la_LDFLAGS = -module
-
 BUILT_SOURCES =
 
-lib_LTLIBRARIES = libsixrd_plugin.la
+vpppluginsdir = ${libdir}/vpp_plugins
+
+vppplugins_LTLIBRARIES = libsixrd_plugin.la
+
 
-if WITH_PLUGIN_TOOLKIT
+# Remove *.la files
 install-data-hook:
-	mkdir /usr/lib/vpp_plugins || true
-	mkdir /usr/lib/vpp_api_test_plugins || true
-	cp -L $(prefix)/lib/libsixrd_plugin.so /usr/lib/vpp_plugins
-endif
+	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
diff --git a/plugins/sixrd-plugin/configure.ac b/plugins/sixrd-plugin/configure.ac
index 1652c87f..3aa4c425 100644
--- a/plugins/sixrd-plugin/configure.ac
+++ b/plugins/sixrd-plugin/configure.ac
@@ -2,17 +2,8 @@ AC_INIT(sixrd_plugin, 1.0)
 LT_INIT
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
+AC_PREFIX_DEFAULT([/usr])
 
-AM_PROG_AS
 AC_PROG_CC
-AM_PROG_CC_C_O
 
-AC_ARG_WITH(plugin-toolkit,
-            AC_HELP_STRING([--with-plugin-toolkit],
-            [build using the vpp toolkit]),
-            [with_plugin_toolkit=${prefix}/include],
-            [with_plugin_toolkit=.])
-
-AC_SUBST(TOOLKIT_INCLUDE,[${with_plugin_toolkit}])
-AM_CONDITIONAL(WITH_PLUGIN_TOOLKIT, test "$with_plugin_toolkit" != ".")
 AC_OUTPUT([Makefile])
diff --git a/plugins/snat-plugin/Makefile.am b/plugins/snat-plugin/Makefile.am
index 11b0839a..0fe694cf 100644
--- a/plugins/snat-plugin/Makefile.am
+++ b/plugins/snat-plugin/Makefile.am
@@ -3,9 +3,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,16 +14,19 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CFLAGS = -Wall -I@TOOLKIT_INCLUDE@ @DPDK@
+AM_CFLAGS = -Wall @DPDK@
+AM_LDFLAGS = -module -shared -avoid-version
 
-lib_LTLIBRARIES = snat_plugin.la snat_test_plugin.la
+vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
+vpppluginsdir = ${libdir}/vpp_plugins
+
+vppapitestplugins_LTLIBRARIES = snat_test_plugin.la
+vppplugins_LTLIBRARIES = snat_plugin.la
 
 snat_plugin_la_SOURCES = snat/snat.c		\
         snat/in2out.c				\
         snat/out2in.c				\
-	snat/snat_plugin.api.h 
-
-snat_plugin_la_LDFLAGS = -module
+	snat/snat_plugin.api.h
 
 BUILT_SOURCES = snat/snat.api.h
 
@@ -34,22 +37,15 @@ SUFFIXES = .api.h .api
 	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
 	| vppapigen --input - --output $@ --show-name $@
 
-nobase_include_HEADERS =			\
+noinst_HEADERS =			\
   snat/snat_all_api_h.h			\
   snat/snat_msg_enum.h			\
   snat/snat.api.h
 
 snat_test_plugin_la_SOURCES = \
   snat/snat_test.c snat/snat_plugin.api.h
-snat_test_plugin_la_LDFLAGS = -module
 
-if WITH_PLUGIN_TOOLKIT
+# Remove *.la files
 install-data-hook:
-	mkdir /usr/lib/vpp_plugins || true
-	mkdir /usr/lib/vpp_api_test_plugins || true
-	cp -L $(prefix)/lib/snat_plugin.so /usr/lib/vpp_plugins
-	cp -L $(prefix)/lib/snat_test_plugin.so \
-		/usr/lib/vpp_api_test_plugins
-	rm -f $(prefix)/lib/snat_plugin.*
-	rm -f $(prefix)/lib/snat_test_plugin.*
-endif
+	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
+	@(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
diff --git a/plugins/snat-plugin/configure.ac b/plugins/snat-plugin/configure.ac
index e10b18ac..9af139e4 100644
--- a/plugins/snat-plugin/configure.ac
+++ b/plugins/snat-plugin/configure.ac
@@ -1,11 +1,10 @@
 AC_INIT(snat_plugin, 1.0)
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
+AC_PREFIX_DEFAULT([/usr])
 
 AC_PROG_LIBTOOL
-AM_PROG_AS
 AC_PROG_CC
-AM_PROG_CC_C_O
 
 AC_ARG_WITH(dpdk,
             AC_HELP_STRING([--with-dpdk],[Use the Intel dpdk]),
@@ -15,13 +14,4 @@ AC_ARG_WITH(dpdk,
 AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1")
 AC_SUBST(DPDK,["-DDPDK=${with_dpdk}"])
 
-AC_ARG_WITH(plugin-toolkit,
-            AC_HELP_STRING([--with-plugin-toolkit],
-            [build using the vpp toolkit]),
-            [with_plugin_toolkit=${prefix}/include],
-            [with_plugin_toolkit=.])
-
-AC_SUBST(TOOLKIT_INCLUDE,[${with_plugin_toolkit}])
-AM_CONDITIONAL(WITH_PLUGIN_TOOLKIT, test "$with_plugin_toolkit" != ".")
-
 AC_OUTPUT([Makefile])
diff --git a/plugins/vcgn-plugin/Makefile.am b/plugins/vcgn-plugin/Makefile.am
index f9705d05..927f35b6 100644
--- a/plugins/vcgn-plugin/Makefile.am
+++ b/plugins/vcgn-plugin/Makefile.am
@@ -13,7 +13,8 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CFLAGS = -Wall -I@TOOLKIT_INCLUDE@
+AM_CFLAGS = -Wall
+AM_LDFLAGS = -module -shared -avoid-version
 
 ########################################
 # Virtual Carrier Grade NAT
@@ -87,13 +88,10 @@ nobase_include_HEADERS =			\
 	vcgn/tcp_header_definitions.h		\
 	vcgn/vcgn_db.h
 
-libvcgn_plugin_la_LDFLAGS = -module
+vpppluginsdir = ${libdir}/vpp_plugins
 
-lib_LTLIBRARIES = libvcgn_plugin.la
+vppplugins_LTLIBRARIES = libvcgn_plugin.la
 
-if WITH_PLUGIN_TOOLKIT
+# Remove *.la files
 install-data-hook:
-	mkdir /usr/lib/vpp_plugins || true
-	mkdir /usr/lib/vpp_api_test_plugins || true
-	cp -L $(prefix)/lib/libvcgn_plugin.so /usr/lib/vpp_plugins
-endif
+	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
diff --git a/plugins/vcgn-plugin/configure.ac b/plugins/vcgn-plugin/configure.ac
index 5bc8bd9d..f9c365af 100644
--- a/plugins/vcgn-plugin/configure.ac
+++ b/plugins/vcgn-plugin/configure.ac
@@ -2,17 +2,8 @@ AC_INIT(vcgn_plugin, 1.0)
 LT_INIT
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
+AC_PREFIX_DEFAULT([/usr])
 
-AM_PROG_AS
 AC_PROG_CC
-AM_PROG_CC_C_O
 
-AC_ARG_WITH(plugin-toolkit,
-            AC_HELP_STRING([--with-plugin-toolkit],
-            [build using the vpp toolkit]),
-            [with_plugin_toolkit=${prefix}/include],
-            [with_plugin_toolkit=.])
-
-AC_SUBST(TOOLKIT_INCLUDE,[${with_plugin_toolkit}])
-AM_CONDITIONAL(WITH_PLUGIN_TOOLKIT, test "$with_plugin_toolkit" != ".")
 AC_OUTPUT([Makefile])
-- 
cgit 1.2.3-korg


From 4aa76c1c16609fb0e6f2c02128dceb5ae8c533e7 Mon Sep 17 00:00:00 2001
From: Chris Luke <chrisy@flirble.org>
Date: Mon, 25 Jul 2016 19:58:27 -0400
Subject: Fix missing include dirs in doxygen

Also allow a developer to alter the directories scanned at runtime to
facilitate shorter run-times when writing documentation.

Change-Id: I2a09519661a3abe1fbc0cfc294000934852af951
Signed-off-by: Chris Luke <chrisy@flirble.org>
---
 Makefile            | 2 +-
 doxygen/doxygen.cfg | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a1c63078..4e3d65bc 100644
--- a/Makefile
+++ b/Makefile
@@ -233,7 +233,7 @@ cscope: cscope.files
 # Build the documentation
 #
 
-DOXY_INPUT = \
+DOXY_INPUT ?= \
 	README.md \
 	vppinfra \
 	svm \
diff --git a/doxygen/doxygen.cfg b/doxygen/doxygen.cfg
index cc10a9d4..85c68291 100644
--- a/doxygen/doxygen.cfg
+++ b/doxygen/doxygen.cfg
@@ -2022,7 +2022,7 @@ SEARCH_INCLUDES        = YES
 # preprocessor.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           =
+INCLUDE_PATH           = $(INPUT)
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
-- 
cgit 1.2.3-korg


From 5f9dcff39d5e25c6bef30d569e405635633f3c69 Mon Sep 17 00:00:00 2001
From: Ole Troan <ot@cisco.com>
Date: Mon, 1 Aug 2016 04:59:13 +0200
Subject: VPP Python language binding - plugin support

- Moved Python generator tool to tools directory
- Added build-vpp-api Makefile target
- Generator now only creates a Python representation of the .api
  the rest of the framework is in the vpp_papi script
- Each plugin has its own namespace.
- Plugin Python files are installed in vpp_papi_plugins for easy
  use inside the build tree.

Change-Id: I272c83bb7e5d5e416bdbd8a790a3cc35c5a04e38
Signed-off-by: Ole Troan <ot@cisco.com>
---
 .gitignore                              |   4 +-
 Makefile                                |   6 +-
 build-data/platforms.mk                 |  18 ++-
 plugins/ioam-plugin/Makefile.am         |  11 +-
 plugins/snat-plugin/Makefile.am         |  11 +-
 vlib-api/Makefile.am                    |   4 +
 vpp-api/python/Makefile.am              |  45 ++++--
 vpp-api/python/pneum/pneum.c            |  20 +--
 vpp-api/python/pneum/pneum.h            |   5 +-
 vpp-api/python/setup.cfg                |   7 +
 vpp-api/python/setup.py                 |  19 +--
 vpp-api/python/tests/test_base.py       |   7 +
 vpp-api/python/tests/test_modules.py    |  17 ++
 vpp-api/python/tests/test_papi.py       | 158 +++++++++----------
 vpp-api/python/vpp_papi/__init__.py     |   4 +-
 vpp-api/python/vpp_papi/pneum_wrap.c    |  29 +++-
 vpp-api/python/vpp_papi/vpp_api_base.py |  97 ++++++++++++
 vpp-api/python/vpp_papi/vpp_papi.py     | 155 ++++++++++++++++++
 vpp/vpp-api/api.c                       |  12 +-
 vppapigen/Makefile.am                   |   1 +
 vppapigen/lex.c                         |   8 +-
 vppapigen/node.c                        |   5 +
 vppapigen/pyvppapigen.py                | 271 ++++++++++++++++++++++++++++++++
 23 files changed, 757 insertions(+), 157 deletions(-)
 create mode 100644 vpp-api/python/setup.cfg
 create mode 100644 vpp-api/python/tests/test_base.py
 create mode 100755 vpp-api/python/tests/test_modules.py
 create mode 100644 vpp-api/python/vpp_papi/vpp_api_base.py
 create mode 100644 vpp-api/python/vpp_papi/vpp_papi.py
 create mode 100755 vppapigen/pyvppapigen.py

(limited to 'Makefile')

diff --git a/.gitignore b/.gitignore
index 42526183..8cbf1e61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@
 /build-root/*.rpm
 /build-root/*.changes
 /build-config.mk
-/vpp-api/python/vpp_papi/vpp_papi.py
 /dpdk/*.tar.gz
 /dpdk/*.tar.xz
 /path_setup
@@ -51,7 +50,7 @@ test-driver
 .settings
 # stop autotools ignore
 
-# OSX and some IDE 
+# OSX and some IDE
 .DS_Store
 .idea/
 .project
@@ -63,6 +62,7 @@ test-driver
 GPATH
 GRTAGS
 GTAGS
+TAGS
 
 # Generated documentation
 /build-root/docs
diff --git a/Makefile b/Makefile
index 4e3d65bc..39930651 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ endif
 
 .PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
-.PHONY: ctags cscope doxygen wipe-doxygen plugins plugins-release
+.PHONY: ctags cscope doxygen wipe-doxygen plugins plugins-release build-vpp-api
 
 help:
 	@echo "Make Targets:"
@@ -73,6 +73,7 @@ help:
 	@echo " debug               - run debug binary with debugger"
 	@echo " debug-release       - run release binary with debugger"
 	@echo " build-vat           - build vpp-api-test tool"
+	@echo " build-vpp-api       - build vpp-api"
 	@echo " run-vat             - run vpp-api-test tool"
 	@echo " pkg-deb             - build DEB packages"
 	@echo " pkg-rpm             - build RPM packages"
@@ -172,6 +173,9 @@ plugins: $(BR)/.bootstrap.ok
 plugins-release: $(BR)/.bootstrap.ok
 	$(call make,$(PLATFORM),plugins-install)
 
+build-vpp-api: $(BR)/.bootstrap.ok
+	$(call make,$(PLATFORM)_debug,vpp-api-install)
+
 STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index cd65f67c..36cfc878 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -56,14 +56,16 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	   >> deb/debian/vpp.install ;					\
 									\
 	: dev package needs a couple of additions ;			\
-    echo ../build-tool-native/vppapigen/vppapigen /usr/bin		\
-       >> deb/debian/vpp-dev.install ;				\
-    echo ../../vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin    \
-       >> deb/debian/vpp-dev.install ;				 \
-    for i in $$(ls ../vpp-api/java/jvpp/gen/jvppgen/*.py); do \
-    	echo ../$${i} /usr/lib/python2.7/dist-packages/jvppgen \
-    	   >> deb/debian/vpp-dev.install; \
-   	done; \
+	echo ../build-tool-native/vppapigen/vppapigen /usr/bin		\
+	   >> deb/debian/vpp-dev.install ;				\
+	echo ../../vppapigen/pyvppapigen.py /usr/bin			\
+           >> deb/debian/vpp-dev.install ;				\
+	echo ../../vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin		\
+	   >> deb/debian/vpp-dev.install ;				\
+	for i in $$(ls ../vpp-api/java/jvpp/gen/jvppgen/*.py); do	\
+	   echo ../$${i} /usr/lib/python2.7/dist-packages/jvppgen	\
+	       >> deb/debian/vpp-dev.install;				\
+	done;								\
 									\
 	: generate changelog;						\
 	./scripts/generate-deb-changelog 				\
diff --git a/plugins/ioam-plugin/Makefile.am b/plugins/ioam-plugin/Makefile.am
index 2ea29e00..68e79248 100644
--- a/plugins/ioam-plugin/Makefile.am
+++ b/plugins/ioam-plugin/Makefile.am
@@ -28,7 +28,7 @@ ioam_pot_plugin_la_SOURCES =			\
 	ioam/lib-pot/pot_api.c
 
 BUILT_SOURCES =					\
-	ioam/lib-pot/pot.api.h
+	ioam/lib-pot/pot.api.h ioam/lib-pot/pot.py
 
 SUFFIXES = .api.h .api
 
@@ -37,6 +37,15 @@ SUFFIXES = .api.h .api
 	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
 	| vppapigen --input - --output $@ --show-name $@
 
+%.py: %.api
+	$(info Creating Python binding for $@)
+	$(CC) $(CPPFLAGS) -E -P -C -x c $<				\
+	| vppapigen --input - --python -				\
+	| pyvppapigen.py --input - > $@
+
+pyapidir = ${prefix}/vpp_papi_plugins
+pyapi_DATA = ioam/lib-pot/pot.py
+
 noinst_HEADERS =				\
   ioam/lib-pot/pot_all_api_h.h			\
   ioam/lib-pot/pot_msg_enum.h			\
diff --git a/plugins/snat-plugin/Makefile.am b/plugins/snat-plugin/Makefile.am
index 0fe694cf..91fec414 100644
--- a/plugins/snat-plugin/Makefile.am
+++ b/plugins/snat-plugin/Makefile.am
@@ -28,7 +28,7 @@ snat_plugin_la_SOURCES = snat/snat.c		\
         snat/out2in.c				\
 	snat/snat_plugin.api.h
 
-BUILT_SOURCES = snat/snat.api.h
+BUILT_SOURCES = snat/snat.api.h snat/snat.py
 
 SUFFIXES = .api.h .api
 
@@ -37,6 +37,15 @@ SUFFIXES = .api.h .api
 	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
 	| vppapigen --input - --output $@ --show-name $@
 
+%.py: %.api
+	$(info Creating Python binding for $@)
+	$(CC) $(CPPFLAGS) -E -P -C -x c $<				\
+	| vppapigen --input - --python -				\
+	| pyvppapigen.py --input - > $@
+
+pyapidir = ${prefix}/vpp_papi_plugins
+pyapi_DATA = snat/snat.py
+
 noinst_HEADERS =			\
   snat/snat_all_api_h.h			\
   snat/snat_msg_enum.h			\
diff --git a/vlib-api/Makefile.am b/vlib-api/Makefile.am
index 4b0129a3..5bc00e74 100644
--- a/vlib-api/Makefile.am
+++ b/vlib-api/Makefile.am
@@ -75,3 +75,7 @@ SUFFIXES = .api.h .api
 	mkdir -p `dirname $@` ;					\
 	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
 	| vppapigen --input - --output $@ --show-name $@
+
+# install the API definition, so we can produce java bindings, etc.
+apidir = $(prefix)/vlibmemory
+api_DATA = vlibmemory/memclnt.api
diff --git a/vpp-api/python/Makefile.am b/vpp-api/python/Makefile.am
index 4d2d221d..eb589335 100644
--- a/vpp-api/python/Makefile.am
+++ b/vpp-api/python/Makefile.am
@@ -13,33 +13,50 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I m4
-AM_CFLAGS = -Wall 
+AM_CFLAGS = -Wall
 
 BUILT_SOURCES =
-bin_PROGRAMS = 
-CLEANFILES = 
-lib_LTLIBRARIES = 
+bin_PROGRAMS =
+CLEANFILES =
+lib_LTLIBRARIES =
 noinst_PROGRAMS = test_pneum
 nobase_include_HEADERS = pneum/pneum.h
 
 #
-# Python binding
+# Python / C extension
 #
+lib_LTLIBRARIES += vpp_api.la
+vpp_api_la_SOURCES = pneum/pneum.c vpp_papi/pneum_wrap.c
+vpp_api_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra -lpthread -lm -lrt
+vpp_api_la_LDFLAGS = -module $(shell python-config --ldflags)
+vpp_api_la_CPPFLAGS = $(shell python-config --includes)
+
+# Kept around for setuptools based install.
 lib_LTLIBRARIES += libpneum.la
-libpneum_la_SOURCES = pneum/pneum.c
+libpneum_la_SOURCES = pneum/pneum.c setup.py
 libpneum_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra -lpthread -lm -lrt
 libpneum_la_LDFLAGS = -module
 libpneum_la_CPPFLAGS =
 
-BUILT_SOURCES += vpp_papi.py
+#
+# Core VPP API
+#
+BUILT_SOURCES +=					\
+	$(prefix)/../vpp/vpp-api/vpe.py			\
+	$(prefix)/../vlib-api/vlibmemory/memclnt.py
 
-vpp_papi.py: $(prefix)/../vpp/vpp-api/vpe.api pneum/api-gen.py
-	@echo "  PYTHON API";                                            	  \
-	$(CC) $(CPPFLAGS) -E -P -C -x c $<			                  \
-	| vppapigen --input - --python defs_$@;                                   \
-	echo "#include <vpp-api/vpe_msg_enum.h>"                                      \
-	| $(CC) $(CPPFLAGS) -E -P -x c - | grep VL_API                            \
-	| @srcdir@/pneum/api-gen.py -i defs_$@ > @srcdir@/vpp_papi/$@
+%.py: %.api
+	$(info Creating Python binding for $@)
+	$(CC) $(CPPFLAGS) -E -P -C -x c $<	\
+	| vppapigen --input - --python -	\
+	| pyvppapigen.py --input - > $@
+
+#
+# TODO: Support both Python 2 and 3.
+install-exec-local:
+	cd $(srcdir); \
+	mkdir -p $(prefix)/lib/python2.7/site-packages; \
+	PYTHONUSERBASE=$(prefix) python setup.py install --user
 
 #
 # Test client
diff --git a/vpp-api/python/pneum/pneum.c b/vpp-api/python/pneum/pneum.c
index ac518493..2637d43f 100644
--- a/vpp-api/python/pneum/pneum.c
+++ b/vpp-api/python/pneum/pneum.c
@@ -10,7 +10,7 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License. 
+ * limitations under the License.
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -36,11 +36,11 @@
 #include "pneum.h"
 
 #define vl_typedefs             /* define message structures */
-#include <vpp-api/vpe_all_api_h.h> 
+#include <vpp-api/vpe_all_api_h.h>
 #undef vl_typedefs
 
 #define vl_endianfun             /* define message structures */
-#include <vpp-api/vpe_all_api_h.h> 
+#include <vpp-api/vpe_all_api_h.h>
 #undef vl_endianfun
 
 typedef struct {
@@ -54,12 +54,12 @@ pneum_main_t pneum_main;
 
 extern int wrap_pneum_callback(char *data, int len);
 
-/* 
+/*
  * Satisfy external references when -lvlib is not available.
  */
 void vlib_cli_output (struct vlib_main_t * vm, char * fmt, ...)
 {
-  clib_warning ("vlib_cli_output callled...");
+  clib_warning ("vlib_cli_output called...");
 }
 
 #define vl_api_version(n,v) static u32 vpe_api_version = v;
@@ -89,7 +89,7 @@ pneum_api_handler (void *msg)
   int l = ntohl(msgbuf->data_len);
   if (l == 0)
     clib_warning("Message ID %d has wrong length: %d\n", id, l);
-    
+
   /* Call Python callback */
   (void)wrap_pneum_callback(msg, l);
   vl_msg_api_free(msg);
@@ -121,12 +121,6 @@ pneum_connect (char *name)
   int rv = 0;
   pneum_main_t *pm = &pneum_main;
 
-  /*
-   * Bail out now if we're not running as root
-   */
-  if (geteuid() != 0)
-    return (-1);
-
   if ((rv = vl_client_api_map("/vpe-api"))) {
     clib_warning ("vl_client_api map rv %d", rv);
     return rv;
@@ -199,7 +193,7 @@ pneum_read (char **p, int *l)
     *p = (char *)msg;
   } else {
     printf("Read failed with %d\n", rv);
-  }  
+  }
   return (rv);
 }
 
diff --git a/vpp-api/python/pneum/pneum.h b/vpp-api/python/pneum/pneum.h
index b99cbd4e..75fccf84 100644
--- a/vpp-api/python/pneum/pneum.h
+++ b/vpp-api/python/pneum/pneum.h
@@ -12,10 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef __included_pneum_h__
-#define __included_pneum_h__
+#ifndef included_pneum_h
+#define included_pneum_h
 
-unsigned int vpe_client_index(void);
 int pneum_connect(char *name);
 int pneum_disconnect(void);
 int pneum_read(char **data, int *l);
diff --git a/vpp-api/python/setup.cfg b/vpp-api/python/setup.cfg
new file mode 100644
index 00000000..5e19e8c5
--- /dev/null
+++ b/vpp-api/python/setup.cfg
@@ -0,0 +1,7 @@
+[bdist_wheel]
+# This flag says that the code is written to work on both Python 2 and Python
+# 3. If at all possible, it is good practice to do this. If you cannot, you
+# will need to generate wheels for each Python version that you support.
+universal=0
+
+
diff --git a/vpp-api/python/setup.py b/vpp-api/python/setup.py
index d890ba70..e369a0cb 100644
--- a/vpp-api/python/setup.py
+++ b/vpp-api/python/setup.py
@@ -1,21 +1,16 @@
-from distutils.core import setup, Extension
-
-module1 = Extension('vpp_api',
-                    define_macros = [('MAJOR_VERSION', '1'),
-                                     ('MINOR_VERSION', '0')],
-                    include_dirs = ['pneum'],
-                    libraries = ['pneum'],
-                    library_dirs = ['../../build-root/install-vpp_debug-native/vpp-api/lib64'],
-                    sources = ['vpp_papi/pneum_wrap.c'])
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
 
 setup (name = 'vpp_papi',
-       version = '1.0',
+       version = '1.1',
        description = 'VPP Python binding',
        author = 'Ole Troan',
        author_email = 'ot@cisco.com',
        #url = 'https://docs.python.org/extending/building',
+       test_suite = 'tests',
        packages=['vpp_papi'],
        long_description = '''
 VPP Python language binding.
-''',
-       ext_modules = [module1])
+''',)
diff --git a/vpp-api/python/tests/test_base.py b/vpp-api/python/tests/test_base.py
new file mode 100644
index 00000000..8ff5dd47
--- /dev/null
+++ b/vpp-api/python/tests/test_base.py
@@ -0,0 +1,7 @@
+# Manipulate sys.path to allow tests be run inside the build environment.
+import os, sys, glob
+scriptdir = os.path.dirname(os.path.realpath(__file__))
+sys.path.append(os.path.dirname(glob.glob(scriptdir+'/../../../build-root/install*/vpp-api/lib64/vpp_api.so')[0]))
+sys.path.append(os.path.dirname(glob.glob(scriptdir+'/../../../build-root/install*/vlib-api/vlibmemory/memclnt.py')[0]))
+sys.path.append(os.path.dirname(glob.glob(scriptdir+'/../../../build-root/install*/vpp/vpp-api/vpe.py')[0]))
+sys.path.append(glob.glob(scriptdir+'/../../../build-root/install*/plugins/vpp_papi_plugins')[0])
diff --git a/vpp-api/python/tests/test_modules.py b/vpp-api/python/tests/test_modules.py
new file mode 100755
index 00000000..f3066b29
--- /dev/null
+++ b/vpp-api/python/tests/test_modules.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+from __future__ import print_function
+import unittest
+import test_base
+import vpp_papi
+import pot, snat
+print('Plugins:')
+vpp_papi.plugin_show()
+r = vpp_papi.connect('ole')
+
+r = vpp_papi.show_version()
+print('R:', r)
+
+r = snat.snat_interface_add_del_feature(1, 1, 1)
+print('R:', r)
+
+vpp_papi.disconnect()
diff --git a/vpp-api/python/tests/test_papi.py b/vpp-api/python/tests/test_papi.py
index bede7171..ab90eeaa 100755
--- a/vpp-api/python/tests/test_papi.py
+++ b/vpp-api/python/tests/test_papi.py
@@ -1,102 +1,104 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
-import vpp_papi
+from __future__ import print_function
 import unittest, sys, time, threading, struct, logging
+import test_base
+import vpp_papi
 from ipaddress import *
 
 papi_event = threading.Event()
+print(vpp_papi.VL_API_SW_INTERFACE_SET_FLAGS)
 def papi_event_handler(result):
-    if result.vl_msg_id == vpp_papi.VL_API_SW_INTERFACE_SET_FLAGS:
-        papi_event.set()
+    if result.vl_msg_id == vpp_papi.vpe.VL_API_SW_INTERFACE_SET_FLAGS:
         return
-    if result.vl_msg_id == vpp_papi.VL_API_VNET_INTERFACE_COUNTERS:
-        format = '>' + str(int(len(result.data) / 8)) + 'Q'
-        counters = struct.unpack(format, result.data)
-        print('Counters:', counters)
+    if result.vl_msg_id == vpp_papi.vpe.VL_API_VNET_INTERFACE_COUNTERS:
+        print('Interface counters', result)
         return
-    if result.vl_msg_id == vpp_papi.VL_API_VNET_IP6_FIB_COUNTERS:
-        print('IP6 FIB Counters:', result.count, len(result.c), len(result))
-        i = 0
-        # FIB counters allocate a large (1000 bytes) block so message length does not match reality
-        for c in struct.iter_unpack('>16sBQQ', result.c):
-            # In Python 3.5 we can use a tuple for prefix, length
-            print(str(IPv6Address(c[0])) + '/' + str(c[1]), str(c[2]), str(c[3]))
-            i += 1
-            if i >= result.count:
-                break
+    if result.vl_msg_id == vpp_papi.vpe.VL_API_VNET_IP6_FIB_COUNTERS:
+        print('IPv6 FIB counters', result)
+        papi_event.set()
         return
 
     print('Unknown message id:', result.vl_msg_id)
 
+import glob, subprocess
 class TestPAPI(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        #
+        # Start main VPP process
+        cls.vpp_bin = glob.glob(test_base.scriptdir+'/../../../build-root/install-vpp*-native/vpp/bin/vpp')[0]
+        print("VPP BIN:", cls.vpp_bin)
+        cls.vpp = subprocess.Popen([cls.vpp_bin, "unix", "nodaemon"], stderr=subprocess.PIPE)
+        print('Started VPP')
+        # For some reason unless we let VPP start up the API cannot connect.
+        time.sleep(0.3)
+    @classmethod
+    def tearDownClass(cls):
+        cls.vpp.terminate()
 
     def setUp(self):
+        print("Connecting API")
         r = vpp_papi.connect("test_papi")
         self.assertEqual(r, 0)
 
     def tearDown(self):
         r = vpp_papi.disconnect()
         self.assertEqual(r, 0)
-        
+
+    #
+    # The tests themselves
+    #
+
+    #
+    # Basic request / reply
+    #
     def test_show_version(self):
         t = vpp_papi.show_version()
+        print('T', t);
         program = t.program.decode().rstrip('\x00')
         self.assertEqual('vpe', program)
 
     #
-    # Add a few MAP domains, then dump them later
+    # Details / Dump
     #
-    def test_map(self):
-        t = vpp_papi.map_summary_stats()
-        print(t)
-        ip6 = IPv6Address(u'2001:db8::1').packed
-        ip4 = IPv4Address(u'10.0.0.0').packed
-        ip6_src = IPv6Address(u'2001:db9::1').packed
-        t = vpp_papi.map_add_domain(ip6, ip4, ip6_src, 32, 24, 128, 0, 0, 6, 0, 0)
-        print(t)
-        self.assertEqual(t.retval, 0)
+    def test_details_dump(self):
+        t = vpp_papi.sw_interface_dump(0, b'')
+        print('Dump/details T', t)
 
-        ip4 = IPv4Address(u'10.0.1.0').packed
-        t = vpp_papi.map_add_domain(ip6, ip4, ip6_src, 32, 24, 128, 0, 0, 6, 0, 0)
+    #
+    # Arrays
+    #
+    def test_arrays(self):
+        t = vpp_papi.vnet_get_summary_stats()
+        print('Summary stats', t)
+        print('Packets:', t.total_pkts[0])
+        print('Packets:', t.total_pkts[1])
+    #
+    # Variable sized arrays and counters
+    #
+    #@unittest.skip("stats")
+    def test_want_stats(self):
+        pid = 123
+        vpp_papi.register_event_callback(papi_event_handler)
+        papi_event.clear()
+
+        # Need to configure IPv6 to get som IPv6 FIB stats
+        t = vpp_papi.create_loopback('')
         print(t)
         self.assertEqual(t.retval, 0)
 
-        t = vpp_papi.map_summary_stats()
+        ifindex = t.sw_if_index
+        addr = str(IPv6Address('1::1').packed)
+        t = vpp_papi.sw_interface_add_del_address(ifindex, 1, 1, 0, 16, addr)
         print(t)
-        self.assertEqual(t.total_bindings, 2)
-
-        t = vpp_papi.map_domain_dump()
-        print (t)
-        self.assertEqual(len(t), 2)
-
-    def test_sw_interface_dump(self):
-        #
-        # Dump interfaces
-        #
-        t = vpp_papi.sw_interface_dump(0, b'ignored')
-        for interface in t:
-            if interface.vl_msg_id == vpp_papi.VL_API_SW_INTERFACE_DETAILS:
-                print(interface.interface_name.decode())
+        self.assertEqual(t.retval, 0)
 
-    def test_want_interface_events(self):
-        pid = 123
-        vpp_papi.register_event_callback(papi_event_handler)
-        papi_event.clear()
-        t = vpp_papi.want_interface_events(True, pid)
-        print (t)
-        print('Setting interface up')
-        t = vpp_papi.sw_interface_set_flags(0, 1, 1, 0)
-        print (t)
-        self.assertEqual(papi_event.wait(5), True)
-        t = vpp_papi.sw_interface_set_flags(0, 0, 0, 0)
-        print (t)
-        self.assertEqual(papi_event.wait(5), True)
+        # Check if interface is up
+        # XXX: Add new API to query interface state based on ifindex, instead of dump all.
+        t = vpp_papi.sw_interface_set_flags(ifindex, 1, 1, 0)
+        self.assertEqual(t.retval, 0)
 
-    @unittest.skip("not quite ready yet")
-    def test_want_stats(self):
-        pid = 123
-        vpp_papi.register_event_callback(papi_event_handler)
-        papi_event.clear()
         t = vpp_papi.want_stats(True, pid)
 
         print (t)
@@ -104,33 +106,17 @@ class TestPAPI(unittest.TestCase):
         #
         # Wait for some stats
         #
-        self.assertEqual(papi_event.wait(30), True)
+        self.assertEqual(papi_event.wait(15), True)
         t = vpp_papi.want_stats(False, pid)
         print (t)
 
-    def test_tap(self):
-        pid = 123
-        vpp_papi.register_event_callback(papi_event_handler)
-        papi_event.clear()
-        t = vpp_papi.want_stats(True, pid)
-
-        print (t)
-
-        t = vpp_papi.tap_connect(1, b'tap', b'foo', 1, 0)
-        print (t)
-        self.assertEqual(t.retval, 0)
-        swifindex = t.sw_if_index
-
-        t = vpp_papi.sw_interface_set_flags(swifindex, 1, 1, 0)
-        print (t)
-        self.assertEqual(t.retval, 0)        
-
-        ip6 = IPv6Address(u'2001:db8::1').packed
-        t = vpp_papi.sw_interface_add_del_address(swifindex, 1, 1, 0, 16, ip6)
-        print (t)
-        time.sleep(40)
 
+    #
+    # Plugins?
+    #
 
 if __name__ == '__main__':
     #logging.basicConfig(level=logging.DEBUG)
     unittest.main()
+def test_papi():
+    print('test')
diff --git a/vpp-api/python/vpp_papi/__init__.py b/vpp-api/python/vpp_papi/__init__.py
index 8be644d7..19d78a3a 100644
--- a/vpp-api/python/vpp_papi/__init__.py
+++ b/vpp-api/python/vpp_papi/__init__.py
@@ -1,2 +1,4 @@
 __import__('pkg_resources').declare_namespace(__name__)
-from .vpp_papi import *
+from . vpp_papi import *
+
+
diff --git a/vpp-api/python/vpp_papi/pneum_wrap.c b/vpp-api/python/vpp_papi/pneum_wrap.c
index d1795aa1..7a511974 100644
--- a/vpp-api/python/vpp_papi/pneum_wrap.c
+++ b/vpp-api/python/vpp_papi/pneum_wrap.c
@@ -1,5 +1,20 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include <Python.h>
-#include "pneum.h"
+#include "../pneum/pneum.h"
 
 static PyObject *pneum_callback = NULL;
 
@@ -35,7 +50,7 @@ wrap_connect (PyObject *self, PyObject *args)
 
   if (!PyArg_ParseTuple(args, "sO:set_callback", &name, &temp))
     return (NULL);
-  
+
   if (!PyCallable_Check(temp)) {
     PyErr_SetString(PyExc_TypeError, "parameter must be callable");
     return NULL;
@@ -66,8 +81,8 @@ wrap_write (PyObject *self, PyObject *args)
   char *data;
   int len, rv;
 
-  if (!PyArg_ParseTuple(args, "s#", &data, &len)) 
-    return NULL;     
+  if (!PyArg_ParseTuple(args, "s#", &data, &len))
+    return NULL;
   Py_BEGIN_ALLOW_THREADS
   rv = pneum_write(data, len);
   Py_END_ALLOW_THREADS
@@ -117,16 +132,16 @@ initvpp_api (void)
 {
 #if PY_VERSION_HEX >= 0x03000000
   static struct PyModuleDef vpp_api_module = {
-# if PY_VERSION_HEX >= 0x03020000
+#if PY_VERSION_HEX >= 0x03020000
     PyModuleDef_HEAD_INIT,
-# else
+#else
     {
       PyObject_HEAD_INIT(NULL)
       NULL, /* m_init */
       0,    /* m_index */
       NULL, /* m_copy */
     },
-# endif
+#endif
     (char *) "vpp_api",
     NULL,
     -1,
diff --git a/vpp-api/python/vpp_papi/vpp_api_base.py b/vpp-api/python/vpp_papi/vpp_api_base.py
new file mode 100644
index 00000000..a1ef87a3
--- /dev/null
+++ b/vpp-api/python/vpp_papi/vpp_api_base.py
@@ -0,0 +1,97 @@
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Module storing all global variables, shared between main module and plugins
+#
+import threading
+
+#
+# Global variables
+#
+results = {}
+waiting_for_reply = False
+plugins = {}
+
+class ContextId(object):
+    def __init__(self):
+        self.context = 0
+    def __call__(self, id):
+        self.context += 1
+        return self.context
+get_context = ContextId()
+
+def waiting_for_reply_clear():
+    global waiting_for_reply
+    waiting_for_reply = False
+
+def waiting_for_reply_set():
+    global waiting_for_reply
+    waiting_for_reply = True
+
+def is_waiting_for_reply():
+    return waiting_for_reply
+
+def event_callback_set(callback):
+    global event_callback
+    event_callback = callback
+
+def event_callback_call(r):
+    global event_callback
+    event_callback(r)
+
+def results_event_set(context):
+    results[context]['e'].set()
+
+def results_event_clear(context):
+    results[context]['e'].clear()
+
+def results_event_wait(context, timeout):
+    results[context]['e'].wait(timeout)
+
+def results_set(context, r):
+    results[context]['r'] = r
+
+def results_append(context, r):
+    results[context]['r'].append(r)
+
+def is_results_context(context):
+    return context in results
+
+def is_results_more(context):
+    return 'm' in results[context]
+
+def results_more_set(context):
+    results[context]['m'] = True
+
+def results_prepare(context):
+    results[context] = {}
+    results[context]['e'] = threading.Event()
+    results[context]['e'].clear()
+    results[context]['r'] = []
+
+def results_get(context):
+    return results[context]['r']
+
+def plugin_register(name, func_table, name_to_id_table, version, msg_id_base_set):
+    plugins[name] = {}
+    p = plugins[name]
+    p['func_table'] = func_table
+    p['name_to_id_table'] = name_to_id_table
+    p['version'] = version
+    p['msg_id_base_set'] = msg_id_base_set
+
+def plugin_show():
+    for p in plugins:
+        print(p)
diff --git a/vpp-api/python/vpp_papi/vpp_papi.py b/vpp-api/python/vpp_papi/vpp_papi.py
new file mode 100644
index 00000000..6a7a358f
--- /dev/null
+++ b/vpp-api/python/vpp_papi/vpp_papi.py
@@ -0,0 +1,155 @@
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Import C API shared object
+#
+from __future__ import print_function
+
+import signal, logging, os, sys
+from struct import *
+
+scriptdir = os.path.dirname(os.path.realpath(__file__))
+sys.path.append(scriptdir)
+import vpp_api
+from vpp_api_base import *
+
+# Import API definitions. The core VPE API is imported into main namespace
+import memclnt
+from vpe import *
+vpe = sys.modules['vpe']
+
+def msg_handler(msg):
+    if not msg:
+        logging.warning('vpp_api.read failed')
+        return
+
+    id = unpack('>H', msg[0:2])
+    logging.debug('Received message', id[0])
+    if id[0] == memclnt.VL_API_RX_THREAD_EXIT:
+        logging.info("We got told to leave")
+        return;
+
+    #
+    # Decode message and returns a tuple.
+    #
+    logging.debug('api_func', api_func_table[id[0]])
+    r = api_func_table[id[0]](msg)
+    if not r:
+        logging.warning('Message decode failed', id[0])
+        return
+
+    if 'context' in r._asdict():
+        if r.context > 0:
+            context = r.context
+
+    #
+    # XXX: Call provided callback for event
+    # Are we guaranteed to not get an event during processing of other messages?
+    # How to differentiate what's a callback message and what not? Context = 0?
+    #
+    if not is_waiting_for_reply():
+        event_callback_call(r)
+        return
+
+    #
+    # Collect results until control ping
+    #
+    if id[0] == vpe.VL_API_CONTROL_PING_REPLY:
+        results_event_set(context)
+        waiting_for_reply_clear()
+        return
+    if not is_results_context(context):
+        logging.warning('Not expecting results for this context', context)
+        return
+    if is_results_more(context):
+        results_append(context, r)
+        return
+
+    results_set(context, r)
+    results_event_set(context)
+    waiting_for_reply_clear()
+
+def connect(name):
+    signal.alarm(3) # 3 second
+    rv = vpp_api.connect(name, msg_handler)
+    signal.alarm(0)
+    logging.info("Connect:", rv)
+
+    #
+    # Assign message id space for plugins
+    #
+    plugin_map_plugins()
+
+    return rv
+
+def disconnect():
+    rv = vpp_api.disconnect()
+    logging.info("Disconnected")
+    return rv
+
+def register_event_callback(callback):
+    event_callback_set(callback)
+
+def plugin_name_to_id(plugin, name_to_id_table, base):
+    try:
+        m = globals()[plugin]
+    except KeyError:
+        m = sys.modules[plugin]
+    for name in name_to_id_table:
+        setattr(m, name, name_to_id_table[name] + base)
+
+def plugin_map_plugins():
+    for p in plugins:
+        if p == 'memclnt' or p == 'vpe':
+            continue
+
+        #
+        # Find base
+        # Update api table
+        #
+        version = plugins[p]['version']
+        name = p + '_' + format(version, '08x')
+        r = memclnt.get_first_msg_id(name.encode('ascii'))
+
+        ## TODO: Add error handling
+        if r.retval != 0:
+            print('Failed getting first msg id for:', p)
+            continue
+
+        # Set base
+        base = r.first_msg_id
+        msg_id_base_set = plugins[p]['msg_id_base_set']
+        msg_id_base_set(base)
+        plugins[p]['base'] = base
+        func_table = plugins[p]['func_table']
+        i = r.first_msg_id
+        for entry in func_table:
+            api_func_table.insert(i, entry)
+            i += 1
+        plugin_name_to_id(p, plugins[p]['name_to_id_table'], base)
+
+#
+# Set up core API
+#
+memclnt.msg_id_base_set(1)
+plugins['memclnt']['base'] = 1
+msg_id_base_set(len(plugins['memclnt']['func_table']) + 1)
+plugins['vpe']['base'] = len(plugins['memclnt']['func_table']) + 1
+api_func_table = []
+api_func_table.append(None)
+api_func_table[1:] = plugins['memclnt']['func_table'] + plugins['vpe']['func_table']
+plugin_name_to_id('memclnt', plugins['memclnt']['name_to_id_table'], 1)
+plugin_name_to_id('vpe', plugins['vpe']['name_to_id_table'], plugins['vpe']['base'])
+#logging.basicConfig(level=logging.DEBUG)
diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c
index 1de1b55f..2ba5ee40 100644
--- a/vpp/vpp-api/api.c
+++ b/vpp/vpp-api/api.c
@@ -2887,12 +2887,12 @@ vl_api_vnet_get_summary_stats_t_handler (vl_api_vnet_get_summary_stats_t * mp)
   }
   vnet_interface_counter_unlock (im);
 
-  /* Note: in HOST byte order! */
-  rmp->total_pkts[VLIB_RX] = total_pkts[VLIB_RX];
-  rmp->total_bytes[VLIB_RX] = total_bytes[VLIB_RX];
-  rmp->total_pkts[VLIB_TX] = total_pkts[VLIB_TX];
-  rmp->total_bytes[VLIB_TX] = total_bytes[VLIB_TX];
-  rmp->vector_rate = vlib_last_vector_length_per_node (sm->vlib_main);
+  rmp->total_pkts[VLIB_RX] = clib_host_to_net_u64 (total_pkts[VLIB_RX]);
+  rmp->total_bytes[VLIB_RX] = clib_host_to_net_u64 (total_bytes[VLIB_RX]);
+  rmp->total_pkts[VLIB_TX] = clib_host_to_net_u64 (total_pkts[VLIB_TX]);
+  rmp->total_bytes[VLIB_TX] = clib_host_to_net_u64 (total_bytes[VLIB_TX]);
+  rmp->vector_rate =
+    clib_host_to_net_u64 (vlib_last_vector_length_per_node (sm->vlib_main));
 
   vl_msg_api_send_shmem (q, (u8 *) & rmp);
 }
diff --git a/vppapigen/Makefile.am b/vppapigen/Makefile.am
index 42530015..066e1c30 100644
--- a/vppapigen/Makefile.am
+++ b/vppapigen/Makefile.am
@@ -14,6 +14,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 bin_PROGRAMS = vppapigen
+bin_SCRIPTS =  pyvppapigen.py
 
 BUILT_SOURCES = gram.h
 
diff --git a/vppapigen/lex.c b/vppapigen/lex.c
index 88744ff1..b011044d 100644
--- a/vppapigen/lex.c
+++ b/vppapigen/lex.c
@@ -331,13 +331,17 @@ int main (int argc, char **argv)
         if (!strncmp (argv [curarg], "--python", 8)) {
             curarg++;
             if (curarg < argc) {
-                pythonfp = fopen (argv[curarg], "w");
+	        if (!strcmp(argv[curarg], "-")) {
+		    pythonfp = stdout;
+		} else {
+		    pythonfp = fopen(argv[curarg], "w");
+		    pythonfile = argv[curarg];
+		}
                 if (pythonfp == NULL) {
                     fprintf (stderr, "Couldn't open python output file %s\n",
                          argv[curarg]);
                     exit (1);
                 }
-                pythonfile = argv[curarg];
                 curarg++;
             } else {
                 fprintf(stderr, "Missing filename after --python\n");
diff --git a/vppapigen/node.c b/vppapigen/node.c
index e66fdce8..420a128c 100644
--- a/vppapigen/node.c
+++ b/vppapigen/node.c
@@ -1339,6 +1339,11 @@ void generate_python (YYSTYPE a1, FILE *fp)
     np = np->peer;
   }
   fprintf (fp, "\n]\n");
+
+  /*
+   * API CRC signature
+   */
+  fprintf (fp, "vl_api_version = 0x%08x\n\n", (unsigned int)input_crc);
 }
 
 void generate(YYSTYPE a1)
diff --git a/vppapigen/pyvppapigen.py b/vppapigen/pyvppapigen.py
new file mode 100755
index 00000000..e216169d
--- /dev/null
+++ b/vppapigen/pyvppapigen.py
@@ -0,0 +1,271 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+from __future__ import print_function
+import argparse, sys, os, importlib, pprint
+
+parser = argparse.ArgumentParser(description='VPP Python API generator')
+parser.add_argument('-i', '--input', action="store", dest="inputfile", type=argparse.FileType('r'))
+parser.add_argument('-c', '--cfile', action="store")
+args = parser.parse_args()
+
+#
+# Read API definitions file into vppapidefs
+#
+exec(args.inputfile.read())
+
+# https://docs.python.org/3/library/struct.html
+format_struct = {'u8': 'B',
+                 'u16' : 'H',
+                 'u32' : 'I',
+                 'i32' : 'i',
+                 'u64' : 'Q',
+                 'f64' : 'd',
+                 'vl_api_ip4_fib_counter_t' : 'IBQQ',
+                 'vl_api_ip6_fib_counter_t' : 'QQBQQ',
+                 };
+#
+# NB: If new types are introduced in vpe.api, these must be updated.
+#
+type_size = {'u8':   1,
+             'u16' : 2,
+             'u32' : 4,
+             'i32' : 4,
+             'u64' : 8,
+             'f64' : 8,
+             'vl_api_ip4_fib_counter_t' : 21,
+             'vl_api_ip6_fib_counter_t' : 33,
+};
+
+def eprint(*args, **kwargs):
+    print(*args, file=sys.stderr, **kwargs)
+
+def get_args(t):
+    argslist = []
+    for i in t:
+        if i[1][0] == '_':
+            argslist.append(i[1][1:])
+        else:
+            argslist.append(i[1])
+
+    return argslist
+
+def get_pack(f):
+    zeroarray = False
+    bytecount = 0
+    pack = ''
+    elements = 1
+    if len(f) is 3 or len(f) is 4:  # TODO: add support for variable length arrays (VPP-162)
+        size = type_size[f[0]]
+        bytecount += size * int(f[2])
+        # Check if we have a zero length array
+        if f[2] == '0':
+            # If len 3 zero array
+            elements = 0;
+            pack += format_struct[f[0]]
+            bytecount = size
+        elif size == 1:
+            n = f[2] * size
+            pack += str(n) + 's'
+        else:
+            pack += format_struct[f[0]] * int(f[2])
+            elements = int(f[2])
+    else:
+        bytecount += type_size[f[0]]
+        pack += format_struct[f[0]]
+    return (pack, elements, bytecount)
+
+
+'''
+def get_reply_func(f):
+    if f['name']+'_reply' in func_name:
+        return func_name[f['name']+'_reply']
+    if f['name'].find('_dump') > 0:
+        r = f['name'].replace('_dump','_details')
+        if r in func_name:
+            return func_name[r]
+    return None
+'''
+
+def footer_print():
+    print('''
+def msg_id_base_set(b):
+    global base
+    base = b
+
+import os
+name = os.path.splitext(os.path.basename(__file__))[0]
+    ''')
+    print(u"plugin_register(name, api_func_table, api_name_to_id,", vl_api_version, ", msg_id_base_set)")
+
+def api_table_print(name, i):
+    msg_id_in = 'VL_API_' + name.upper()
+    fstr = name + '_decode'
+    print('api_func_table.append(' + fstr + ')')
+    print('api_name_to_id["' + msg_id_in + '"] =', i)
+    print('')
+
+def encode_print(name, id, t):
+    total = 0
+    args = get_args(t)
+    pack = '>'
+    for i, f in enumerate(t):
+        p, elements, size = get_pack(f)
+        pack += p
+        total += size
+
+    if name.find('_dump') > 0:
+        multipart = True
+    else:
+        multipart = False
+
+    if len(args) < 4:
+        print(u"def", name + "(async = False):")
+    else:
+        print(u"def", name + "(" + ', '.join(args[3:]) + ", async = False):")
+    print(u"    global base")
+    print(u"    context = get_context(base + " + id + ")")
+
+    print('''
+    results_prepare(context)
+    waiting_for_reply_set()
+    ''')
+    if multipart == True:
+        print(u"    results_more_set(context)")
+
+    ### TODO deal with zeroarray!!!
+    #if zeroarray == True:
+    #    print(u"    vpp_api.write(pack('" + pack + "', " + id + ", 0, context, " + ', '.join(args[3:-1]) + ") + " + args[-1] + ")")
+    #else:
+    print(u"    vpp_api.write(pack('" + pack + "', base + " + id + ", 0, context, " + ', '.join(args[3:]) + "))")
+
+    if multipart == True:
+        print(u"    vpp_api.write(pack('>HII', VL_API_CONTROL_PING, 0, context))")
+
+    print('''
+    if not async:
+        results_event_wait(context, 5)
+        return results_get(context)
+    return context
+    ''')
+
+def get_normal_pack(t, i, pack, offset):
+    while t:
+        f = t.pop(0)
+        i += 1
+        if len(f) >= 3:
+            return t, i, pack, offset, f
+        p, elements, size = get_pack(f)
+        pack += p
+        offset += size
+    return t, i, pack, offset, None
+
+def decode_print(name, t):
+    #
+    # Generate code for each element
+    #
+    print(u'def ' + name + u'_decode(msg):')
+    total = 0
+    args = get_args(t)
+    print(u"    n = namedtuple('" + name + "', '" + ', '.join(args) + "')")
+    print(u"    res = []")
+
+    pack = '>'
+    start = 0
+    end = 0
+    offset = 0
+    t = list(t)
+    i = 0
+    while t:
+        t, i, pack, offset, array = get_normal_pack(t, i, pack, offset)
+        if array:
+            p, elements, size = get_pack(array)
+
+            # Byte string
+            if elements > 0 and type_size[array[0]] == 1:
+                pack += p
+                offset += size * elements
+                continue
+
+            # Dump current pack string
+            if pack != '>':
+                print(u"    tr = unpack_from('" + pack + "', msg[" + str(start) + ":])")
+                print(u"    res.extend(list(tr))")
+                start += offset
+            pack = '>'
+
+            if elements == 0:
+                # This has to be the last element
+                if len(array) == 3:
+                    print(u"    res.append(msg[" + str(offset) + ":])")
+                    if len(t) > 0:
+                        eprint('WARNING: Variable length array must be last element in message', name, array)
+
+                    continue
+                if size == 1 or len(p) == 1:
+                    # Do it as a bytestring.
+                    if p == 'B':
+                        p = 's'
+                    # XXX: Assume that length parameter is the previous field. Add validation.
+                    print(u"    c = res[" + str(i - 2) + "]")
+                    print(u"    tr = unpack_from('>' + str(c) + '" + p + "', msg[" + str(start) + ":])")
+                    print(u"    res.append(tr)")
+                    continue
+                print(u"    tr2 = []")
+                print(u"    offset = " + str(total))
+                print(u"    for j in range(res[" + str(i - 2) + "]):")
+                print(u"        tr2.append(unpack_from('>" + p + "', msg[" + str(start) + ":], offset))")
+                print(u"        offset += " + str(size))
+                print(u"    res.append(tr2)")
+                continue
+
+            # Missing something!!
+            print(u"    tr = unpack_from('>" + p + "', msg[" + str(start) + ":])")
+            start += size
+
+            print(u"    res.append(tr)")
+
+    if pack != '>':
+        print(u"    tr = unpack_from('" + pack + "', msg[" + str(start) + ":])")
+        print(u"    res.extend(list(tr))")
+    print(u"    return n._make(res)")
+    print('')
+
+#
+# Generate the main Python file
+#
+def main():
+    print('''
+#
+# AUTO-GENERATED FILE. PLEASE DO NOT EDIT.
+#
+from vpp_api_base import *
+from struct import *
+from collections import namedtuple
+import vpp_api
+api_func_table = []
+api_name_to_id = {}
+    ''')
+
+    for i, a in enumerate(vppapidef):
+        name = a[0]
+        encode_print(name, str(i), a[1:])
+        decode_print(name, a[1:])
+        api_table_print(name, i)
+    footer_print()
+
+if __name__ == "__main__":
+    main()
-- 
cgit 1.2.3-korg


From 1557dfe8440c30319eaef6c2c13070ecc9e6eb5b Mon Sep 17 00:00:00 2001
From: Ole Troan <ot@cisco.com>
Date: Wed, 24 Aug 2016 21:10:46 +0200
Subject: Adding python-dev dependency to main Makefile.

Change-Id: I9968015acfc2cc63f97dee25538a9b3e61fac5b6
Signed-off-by: Ole Troan <ot@cisco.com>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 39930651..f12a0da8 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
-DEB_DEPENDS += doxygen graphviz
+DEB_DEPENDS += doxygen graphviz python-dev
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -40,7 +40,7 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += doxygen graphviz
+RPM_DEPENDS += doxygen graphviz python-devel
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
-- 
cgit 1.2.3-korg


From 54ccf2261cb1f4afd966b7b1e92689183cb17836 Mon Sep 17 00:00:00 2001
From: Chris Luke <chrisy@flirble.org>
Date: Mon, 25 Jul 2016 16:38:11 -0400
Subject: VPP-221 CLI auto-documentation infrastructure

As a step before Doxygen, extract CLI-related struct initializers
from the code and parse that into a summary of the CLI commands
available with the provided help text, such as it is. At the moment
this only renders this into an indexed Markdown file that Doxygen
then picks up but later we can use this information to enrich the
existing VLIB_CLI_COMMAND macro documentor as well as provide
runtime documentation to VPP that is stored on disk outside the
binary image.

Additionally support a comment block immediately prior to
VLIB_CLI_COMMAND CLI command definitions in the form /*? ... ?*/
that can be used to include long-form documentation without having
it compiled into VPP.

Examples of documenting CLI commands can be found in
vlib/vlib/unix/cli.c which, whilst not perfect, should provide a
starting point. Screen captures of sample output can be seen at
https://chrisy.flirble.org/vpp/doxy-cli-example.png and
https://chrisy.flirble.org/vpp/doxy-cli-index.png .

Next, shift the Doxygen root makefile targets to their own Makefile.
The primary reason for this is that the siphon targets do dependency
tracking which means it needs to generate those dependencies whenever
make is run; that is pointless if we're not going to generate any
documentation. This includes the package dependencies since they since
they sometimes unnecessarily interfere with the code build in some cases
at the moment; later we will look to building a Python venv to host the
Python modules we use.

One final remark: In future we may consider deprecating .long_help
in the VLIB_CLI_COMMAND structure entirely but add perhaps .usage_help.
.short_help would be reserved for a summary of the command function
and .usage_help provide the syntax of that command. These changes would
provide great semantic value to the automaticly generated CLI
documentation. I could also see having .long_help replaced by a
mechanism that reads it from disk at runtime with a rudimentary
Markdown/Doxygen filter so that we can use the same text that is used in
the published documentation.

Change-Id: I80d6fe349b47dce649fa77d21ffec0ddb45c7bbf
Signed-off-by: Chris Luke <chrisy@flirble.org>
---
 .gitignore                 |   3 +
 Makefile                   |  38 +++---
 doxygen/Makefile           | 122 +++++++++++++++++
 doxygen/dir.dox.sample     |   3 +-
 doxygen/doxygen.cfg        |  13 ++
 doxygen/filter_c.py        |  24 +++-
 doxygen/siphon_generate.py | 313 +++++++++++++++++++++++++++++++++++++++++++
 doxygen/siphon_process.py  | 323 +++++++++++++++++++++++++++++++++++++++++++++
 vlib/vlib/dir.dox          |   2 +
 vlib/vlib/unix/cli.c       | 160 ++++++++++++++++------
 vlib/vlib/unix/dir.dox     |  27 ++++
 11 files changed, 963 insertions(+), 65 deletions(-)
 create mode 100644 doxygen/Makefile
 create mode 100755 doxygen/siphon_generate.py
 create mode 100755 doxygen/siphon_process.py
 create mode 100644 vlib/vlib/unix/dir.dox

(limited to 'Makefile')

diff --git a/.gitignore b/.gitignore
index 0a009d1d..a86a50c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *~
+*.sw[op]
 
 /build-root/.ccache
 /build-root/build-*/
@@ -66,6 +67,8 @@ TAGS
 
 # Generated documentation
 /build-root/docs
+/build-root/.doxygen-bootstrap.ok
+/build-root/.doxygen-siphon.dep
 
 # indent backup files
 *.BAK
diff --git a/Makefile b/Makefile
index f12a0da8..5808a333 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
-DEB_DEPENDS += doxygen graphviz python-dev
+DEB_DEPENDS += python-dev
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -40,7 +40,7 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += doxygen graphviz python-devel
+RPM_DEPENDS += python-devel
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
@@ -54,7 +54,7 @@ endif
 
 .PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
-.PHONY: ctags cscope doxygen wipe-doxygen plugins plugins-release build-vpp-api
+.PHONY: ctags cscope plugins plugins-release build-vpp-api
 
 help:
 	@echo "Make Targets:"
@@ -81,6 +81,7 @@ help:
 	@echo " gtags               - (re)generate gtags database"
 	@echo " cscope              - (re)generate cscope database"
 	@echo " doxygen             - (re)generate documentation"
+	@echo " bootstrap-doxygen   - setup Doxygen dependencies"
 	@echo " wipe-doxygen        - wipe all generated documentation"
 	@echo ""
 	@echo "Make Arguments:"
@@ -237,24 +238,21 @@ cscope: cscope.files
 # Build the documentation
 #
 
-DOXY_INPUT ?= \
-	README.md \
-	vppinfra \
-	svm \
-	vlib \
-	vlib-api \
-	vnet \
-	vpp \
-	vpp-api
+# Doxygen configuration and our utility scripts
+export DOXY_DIR ?= $(WS_ROOT)/doxygen
+
+define make-doxy
+	@WS_ROOT="$(WS_ROOT)" BR="$(BR)" make -C $(DOXY_DIR) $@
+endef
+
+.PHONY: bootstrap-doxygen doxygen wipe-doxygen
+
+bootstrap-doxygen:
+	$(call make-doxy)
 
 doxygen:
-	@mkdir -p "$(BR)/docs"
-	ROOT="$(WS_ROOT)" \
-	     BUILD_ROOT="$(BR)" \
-	     INPUT="$(addprefix $(WS_ROOT)/,$(DOXY_INPUT))" \
-	     HTML=YES \
-	     VERSION="`git describe --tags --dirty`" \
-	     doxygen doxygen/doxygen.cfg
+	$(call make-doxy)
 
 wipe-doxygen:
-	rm -rf "$(BR)/docs"
+	$(call make-doxy)
+
diff --git a/doxygen/Makefile b/doxygen/Makefile
new file mode 100644
index 00000000..7bdc8ee9
--- /dev/null
+++ b/doxygen/Makefile
@@ -0,0 +1,122 @@
+# Copyright (c) 2016 Comcast Cable Communications Management, LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Build the documentation
+#
+
+# These should be passed in by the root Makefile
+WS_ROOT ?= $(CURDIR)/..
+BR ?= $(WS_ROOT)/build-root
+
+# Package dependencies
+DOC_DEB_DEPENDS = doxygen graphviz python-pyparsing
+DOC_RPM_DEPENDS = doxygen graphviz pyparsing
+
+# Doxygen configuration and our utility scripts
+DOXY_DIR ?= $(WS_ROOT)/doxygen
+
+# Input directories and files
+DOXY_INPUT ?= \
+	README.md \
+	vppinfra \
+	svm \
+	vlib \
+	vlib-api \
+	vnet \
+	vpp \
+	vpp-api \
+	plugins
+
+# Target directory for doxygen output
+DOXY_OUTPUT ?= $(BR)/docs
+
+# Siphoned fragments end up in here
+SIPHON_INPUT ?= $(DOXY_OUTPUT)/siphon_fragments
+
+# Siphoned fragements are processed into here
+SIPHON_OUTPUT ?= $(DOXY_OUTPUT)/siphon_docs
+
+# Extra document inputs that are processed in addition to DOXY_INPUT
+EXTRA_DOXY_INPUT += $(SIPHON_OUTPUT)
+
+# All the siphon types we know about
+SIPHONS ?= clicmd
+
+SIPHON_FILES = $(addprefix $(SIPHON_INPUT)/,$(addsuffix .siphon,$(SIPHONS)))
+SIPHON_DOCS = $(addprefix $(SIPHON_OUTPUT)/,$(addsuffix .md,$(SIPHONS)))
+
+$(BR)/.doxygen-bootstrap.ok:
+ifeq ($(OS_ID),ubuntu)
+	@sudo -E apt-get $(CONFIRM) $(FORCE) install $(DOC_DEB_DEPENDS)
+else ifneq ("$(wildcard /etc/redhat-release)","")
+	@sudo yum install $(CONFIRM) $(DOC_RPM_DEPENDS)
+else
+	$(error "This option currently works only on Ubuntu or Centos systems")
+endif
+	@touch $@
+
+.PHONY: bootstrap-doxygen
+bootstrap-doxygen: $(BR)/.doxygen-bootstrap.ok
+
+.DELETE_ON_ERROR: $(BR)/.doxygen-siphon.dep
+$(BR)/.doxygen-siphon.dep: Makefile
+	set -e; rm -f "$@"; for input in $(DOXY_INPUT); do \
+		find "$(WS_ROOT)/$$input" -type f \
+			\( -name '*.[ch]' -or -name '*.dox' \) \
+			-print | sed -e "s/^/\$$(SIPHON_FILES): /" >> $@; \
+	done
+
+# Include the source -> siphon dependencies
+-include $(BR)/.doxygen-siphon.dep
+
+.NOTPARALLEL: $(SIPHON_FILES)
+$(SIPHON_FILES): $(DOXY_DIR)/siphon_generate.py $(BR)/.doxygen-bootstrap.ok
+	@rm -rf "$(SIPHON_INPUT)" "$(SIPHON_OUTPUT)"
+	@mkdir -p "$(SIPHON_INPUT)" "$(SIPHON_OUTPUT)"
+	set -e; for input in $(DOXY_INPUT); do \
+		cd "$(WS_ROOT)"; \
+		find "$$input" -type f \
+			\( -name '*.[ch]' -or -name '*.dox' \) \
+			-print >> $(SIPHON_INPUT)/files; \
+	done
+	set -e; cd "$(WS_ROOT)"; $(DOXY_DIR)/siphon_generate.py \
+		--output="$(SIPHON_INPUT)" \
+		"@$(SIPHON_INPUT)/files"
+
+
+.DELETE_ON_ERROR: $(SIPHON_DOCS)
+$(SIPHON_OUTPUT)/%.md: $(SIPHON_INPUT)/%.siphon $(DOXY_DIR)/siphon_process.py
+	set -e; cd "$(WS_ROOT)"; \
+		$(DOXY_DIR)/siphon_process.py --type=$(basename $(notdir $<)) \
+			--output="$(SIPHON_OUTPUT)" $< > $@
+
+# This target can be used just to generate the siphoned docs
+.PHONY: doxygen-siphon
+doxygen-siphon: $(SIPHON_DOCS)
+
+# Generate the doxygen docs
+doxygen: $(SIPHON_DOCS)
+	@mkdir -p "$(DOXY_OUTPUT)"
+	set -e; cd "$(WS_ROOT)"; \
+	    ROOT="$(WS_ROOT)" \
+	    BUILD_ROOT="$(BR)" \
+	    INPUT="$(addprefix $(WS_ROOT)/,$(DOXY_INPUT)) $(EXTRA_DOXY_INPUT)" \
+	    HTML=YES \
+	    VERSION="`git describe --tags --dirty`" \
+	    doxygen $(DOXY_DIR)/doxygen.cfg
+
+wipe-doxygen:
+	rm -rf "$(BR)/docs" "$(BR)/.doxygen-siphon.d"
+
diff --git a/doxygen/dir.dox.sample b/doxygen/dir.dox.sample
index 41e84d7b..500fe595 100644
--- a/doxygen/dir.dox.sample
+++ b/doxygen/dir.dox.sample
@@ -18,7 +18,7 @@
 
 /**
 @dir
-@brief Someone please fix this description
+@brief Someone please fix this description.
 @todo This directory needs a description.
 
 This is where you would document the contents of a directory.
@@ -26,3 +26,4 @@ This is where you would document the contents of a directory.
 This looks like a C file but it is not part of the build; it is purely
 for documentation.
 */
+/*? %%clicmd:group_label CLI section description%% ?*/
diff --git a/doxygen/doxygen.cfg b/doxygen/doxygen.cfg
index 0eadbd73..82687cac 100644
--- a/doxygen/doxygen.cfg
+++ b/doxygen/doxygen.cfg
@@ -229,8 +229,21 @@ TAB_SIZE               = 8
 # newlines.
 
 ALIASES                =
+
+## Indexes VPP graph nodes
 ALIASES += "node=@xrefitem nodes \"Node Identifier\" \"Node Identifiers\" @c "
 
+## Formatting for CLI commands and output
+ALIASES += "clistart=<code><pre>"
+ALIASES += "cliend=</pre></code>"
+
+## Formatting for CLI example paragraphs
+ALIASES += "cliexpar=@par Example usage"
+ALIASES += "cliexcmd{1}=@clistart<b>vpp# <em>\1</em></b>@cliend"
+ALIASES += "cliexstart{1}=@cliexcmd{\1}@clistart"
+ALIASES += "cliexend=@cliend"
+
+
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding "class=itcl::class"
 # will allow you to use the command class in the itcl::class meaning.
diff --git a/doxygen/filter_c.py b/doxygen/filter_c.py
index db1681c9..733fdefb 100755
--- a/doxygen/filter_c.py
+++ b/doxygen/filter_c.py
@@ -15,13 +15,13 @@
 
 # Filter for .c files to make various preprocessor tricks Doxygenish
 
-import sys, re
+import os, sys, re
 
 if len(sys.argv) < 2:
     sys.stderr.write("Usage: %s <filename>\n" % (sys.argv[0]))
     sys.exit(1)
 
-patterns = [
+replace_patterns = [
     # Search for VLIB_CLI_COMMAND, extract its parameter and add a docblock for it
     ( re.compile("(?P<m>VLIB_CLI_COMMAND)\s*[(](?P<name>[a-zA-Z0-9_]+)(,[^)]*)?[)]"), r"/** @brief (@em constructor) \g<m> (\g<name>) */ vlib_cli_command_t \g<name>"),
 
@@ -44,9 +44,25 @@ patterns = [
     ( re.compile("(?P<pre>(^|,)\s*)(?P<name>(un)?format_[a-zA-Z0-9_]+)(?P<post>\s*(,|$))") , r"\g<pre>\g<name>()\g<post>" ),
 ]
 
-with open(sys.argv[1]) as fd:
+
+filename = sys.argv[1]
+cwd = os.getcwd()
+if filename[0:len(cwd)] == cwd:
+    filename = filename[len(cwd):]
+    if filename[0] == "/":
+        filename = filename[1:]
+
+with open(filename) as fd:
+    line_num = 0
+
     for line in fd:
+        line_num += 1
         str = line[:-1] # filter \n
-        for p in patterns:
+
+        # Look for search/replace patterns
+        for p in replace_patterns:
             str = p[0].sub(p[1], str)
+
         sys.stdout.write(str+"\n")
+
+# All done
diff --git a/doxygen/siphon_generate.py b/doxygen/siphon_generate.py
new file mode 100755
index 00000000..457757b5
--- /dev/null
+++ b/doxygen/siphon_generate.py
@@ -0,0 +1,313 @@
+#!/usr/bin/env python
+# Copyright (c) 2016 Comcast Cable Communications Management, LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Looks for preprocessor macros with struct initializers and siphons them
+# off into another file for later parsing; ostensibly to generate
+# documentation from struct initializer data.
+
+import os, sys, re, argparse, json
+
+DEFAULT_OUTPUT = "build-root/docs/siphons"
+DEFAULT_PREFIX = os.getcwd()
+
+ap = argparse.ArgumentParser()
+ap.add_argument("--output", '-o', metavar="directory", default=DEFAULT_OUTPUT,
+        help="Output directory for .siphon files [%s]" % DEFAULT_OUTPUT)
+ap.add_argument("--input-prefix", metavar="path", default=DEFAULT_PREFIX,
+        help="Prefix to strip from input pathnames [%s]" % DEFAULT_PREFIX)
+ap.add_argument("input", nargs='+', metavar="input_file",
+        help="Input C source files")
+args = ap.parse_args()
+
+"""Patterns that match the start of code blocks we want to siphon"""
+siphon_patterns = [
+    ( re.compile("(?P<m>VLIB_CLI_COMMAND)\s*[(](?P<name>[a-zA-Z0-9_]+)(,[^)]*)?[)]"), "clicmd" ),
+]
+
+"""Matches a siphon comment block start"""
+siphon_block_start = re.compile("^\s*/\*\?\s*(.*)$")
+
+"""Matches a siphon comment block stop"""
+siphon_block_stop = re.compile("^(.*)\s*\?\*/\s*$")
+
+"""Siphon block directive delimiter"""
+siphon_block_delimiter = "%%"
+
+"""Matches a siphon block directive such as '%clicmd:group_label Debug CLI%'"""
+siphon_block_directive = re.compile("(%s)\s*([a-zA-Z0-9_:]+)\s+(.*)\s*(%s)" % \
+        (siphon_block_delimiter, siphon_block_delimiter))
+
+"""Matches the start of an initializer block"""
+siphon_initializer = re.compile("\s*=")
+
+"""
+count open and close braces in str
+return (0, index) when braces were found and count becomes 0.
+index indicates the position at which the last closing brace was
+found.
+return (-1, -1) if a closing brace is found before any opening one.
+return (count, -1) if not all opening braces are closed, count is the
+current depth
+"""
+def count_braces(str, count=0, found=False):
+    for index in range(0, len(str)):
+        if str[index] == '{':
+            count += 1;
+            found = True
+        elif str[index] == '}':
+            if count == 0:
+                # means we never found an open brace
+                return (-1, -1)
+            count -= 1;
+
+        if count == 0 and found:
+            return (count, index)
+
+    return (count, -1)
+
+# Collated output for each siphon
+output = {}
+
+# Pre-process file names in case they indicate a file with
+# a list of files
+files = []
+for filename in args.input:
+    if filename.startswith('@'):
+        with open(filename[1:], 'r') as fp:
+            lines = fp.readlines()
+            for line in lines:
+                files.append(line.strip())
+            lines = None
+    else:
+        files.append(filename)
+
+# Iterate all the input files we've been given
+for filename in files:
+    # Strip the current directory off the start of the
+    # filename for brevity
+    if filename[0:len(args.input_prefix)] == args.input_prefix:
+        filename = filename[len(args.input_prefix):]
+        if filename[0] == "/":
+            filename = filename[1:]
+
+    # Work out the abbreviated directory name
+    directory = os.path.dirname(filename)
+    if directory[0:2] == "./":
+        directory = directory[2:]
+    elif directory[0:len(args.input_prefix)] == args.input_prefix:
+        directory = directory[len(args.input_prefix):]
+    if directory[0] == "/":
+    	directory = directory[1:]
+
+    # Open the file and explore its contents...
+    sys.stderr.write("Siphoning from %s...\n" % filename)
+    directives = {}
+    with open(filename) as fd:
+        siphon = None
+        close_siphon = None
+        siphon_block = ""
+        in_block = False
+        line_num = 0
+        siphon_line = 0
+
+        for line in fd:
+            line_num += 1
+            str = line[:-1] # filter \n
+
+            """See if there is a block directive and if so extract it"""
+            def process_block_directive(str, directives):
+                m = siphon_block_directive.search(str)
+                if m is not None:
+                    k = m.group(2)
+                    v = m.group(3).strip()
+                    directives[k] = v
+                    # Return only the parts we did not match
+                    return str[0:m.start(1)] + str[m.end(4):]
+
+                return str
+
+            def process_block_prefix(str):
+                if str.startswith(" * "):
+                    str = str[3:]
+                elif str == " *":
+                    str = ""
+                return str
+                
+            if not in_block:
+                # See if the line contains the start of a siphon doc block
+                m = siphon_block_start.search(str)
+                if m is not None:
+                    in_block = True
+                    t = m.group(1)
+
+                    # Now check if the block closes on the same line
+                    m = siphon_block_stop.search(t)
+                    if m is not None:
+                        t = m.group(1)
+                        in_block = False
+
+                    # Check for directives
+                    t = process_block_directive(t, directives)
+
+                    # Filter for normal comment prefixes
+                    t = process_block_prefix(t)
+
+                    # Add what is left
+                    siphon_block += t
+
+                    # Skip to next line
+                    continue
+
+            else:
+                # Check to see if we have an end block marker
+                m = siphon_block_stop.search(str)
+                if m is not None:
+                    in_block = False
+                    t = m.group(1)
+                else:
+                    t = str
+
+                # Check for directives
+                t = process_block_directive(t, directives)
+
+                # Filter for normal comment prefixes
+                t = process_block_prefix(t)
+
+                # Add what is left
+                siphon_block += t + "\n"
+
+                # Skip to next line
+                continue
+
+
+            if siphon is None:
+                # Look for blocks we need to siphon
+                for p in siphon_patterns:
+                    if p[0].match(str):
+                        siphon = [ p[1], str + "\n", 0 ]
+                        siphon_line = line_num
+
+                        # see if we have an initializer
+                        m = siphon_initializer.search(str)
+                        if m is not None:
+                            # count the braces on this line
+                            (count, index) = count_braces(str[m.start():])
+                            siphon[2] = count
+                            # TODO - it's possible we have the initializer all on the first line
+                            # we should check for it, but also account for the possibility that
+                            # the open brace is on the next line
+                            #if count == 0:
+                            #    # braces balanced
+                            #    close_siphon = siphon
+                            #    siphon = None
+                        else:
+                            # no initializer: close the siphon right now
+                            close_siphon = siphon
+                            siphon = None
+            else:
+                # See if we should end the siphon here - do we have balanced
+                # braces?
+                (count, index) = count_braces(str, count=siphon[2], found=True)
+                if count == 0:
+                    # braces balanced - add the substring and close the siphon
+                    siphon[1] += str[:index+1] + ";\n"
+                    close_siphon = siphon
+                    siphon = None
+                else:
+                    # add the whole string, move on
+                    siphon[2] = count
+                    siphon[1] += str + "\n"
+
+            if close_siphon is not None:
+                # Write the siphoned contents to the right place
+                siphon_name = close_siphon[0]
+                if siphon_name not in output:
+                    output[siphon_name] = {
+                        "global": {},
+                        "items": [],
+                        "file": "%s/%s.siphon" % (args.output, close_siphon[0])
+                    }
+
+                # Copy directives for the file
+                details = {}
+                for key in directives:
+                    if ":" in key:
+                        (sn, label) = key.split(":")
+                        if sn == siphon_name:
+                            details[label] = directives[key]
+                    else:
+                        details[key] = directives[key]
+
+                # Copy details for this block
+                details['file'] = filename
+                details['line_start'] = siphon_line
+                details['line_end'] = line_num
+                details['siphon_block'] = siphon_block.strip()
+
+                # Some defaults
+                if "group" not in details:
+                    if "group_label" in details:
+                        # use the filename since group labels are mostly of file scope
+                        details['group'] = details['file']
+                    else:
+			details['group'] = directory
+
+                if "group_label" not in details:
+                    details['group_label'] = details['group']
+
+                details["block"] = close_siphon[1]
+
+                # Store the item
+                output[siphon_name]['items'].append(details)
+
+                # All done
+                close_siphon = None
+                siphon_block = ""
+
+        # Update globals
+        for key in directives.keys():
+            if ':' not in key:
+                continue
+
+            if filename.endswith("/dir.dox"):
+                # very special! use the parent directory name
+                l = directory
+            else:
+                l = filename
+
+            (sn, label) = key.split(":")
+
+            if sn not in output:
+                output[sn] = {}
+            if 'global' not in output[sn]:
+                output[sn]['global'] = {}
+            if l not in output[sn]['global']:
+                output[sn]['global'][l] = {}
+            if 'file' not in output[sn]:
+                output[sn]['file'] = "%s/%s.siphon" % (args.output, sn)
+            if 'items' not in output[sn]:
+                output[sn]['items'] = []
+
+            output[sn]['global'][l][label] = directives[key]
+
+
+# Write out the data
+for siphon in output.keys():
+    sys.stderr.write("Saving siphon %s...\n" % siphon)
+    s = output[siphon]
+    with open(s['file'], "a") as fp:
+        json.dump(s, fp, separators=(',', ': '), indent=4, sort_keys=True)
+
+# All done
diff --git a/doxygen/siphon_process.py b/doxygen/siphon_process.py
new file mode 100755
index 00000000..80add4b9
--- /dev/null
+++ b/doxygen/siphon_process.py
@@ -0,0 +1,323 @@
+#!/usr/bin/env python
+# Copyright (c) 2016 Comcast Cable Communications Management, LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Filter for .siphon files that are generated by other filters.
+# The idea is to siphon off certain initializers so that we can better
+# auto-document the contents of that initializer.
+
+import os, sys, re, argparse, cgi, json
+import pyparsing as pp
+
+import pprint
+
+DEFAULT_SIPHON ="clicmd"
+DEFAULT_OUTPUT = None
+DEFAULT_PREFIX = os.getcwd()
+
+siphon_map = {
+    'clicmd': "VLIB_CLI_COMMAND",
+}
+
+ap = argparse.ArgumentParser()
+ap.add_argument("--type", '-t', metavar="siphon_type", default=DEFAULT_SIPHON,
+        choices=siphon_map.keys(),
+        help="Siphon type to process [%s]" % DEFAULT_SIPHON)
+ap.add_argument("--output", '-o', metavar="directory", default=DEFAULT_OUTPUT,
+        help="Output directory for .md files [%s]" % DEFAULT_OUTPUT)
+ap.add_argument("--input-prefix", metavar="path", default=DEFAULT_PREFIX,
+        help="Prefix to strip from input pathnames [%s]" % DEFAULT_PREFIX)
+ap.add_argument("input", nargs='+', metavar="input_file",
+        help="Input .siphon files")
+args = ap.parse_args()
+
+if args.output is None:
+    sys.stderr.write("Error: Siphon processor requires --output to be set.")
+    sys.exit(1)
+
+
+def clicmd_index_sort(cfg, group, dec):
+    if group in dec and 'group_label' in dec[group]:
+        return dec[group]['group_label']
+    return group
+
+def clicmd_index_header(cfg):
+    s = "# CLI command index\n"
+    s += "\n[TOC]\n"
+    return s
+
+def clicmd_index_section(cfg, group, md):
+    return "\n@subpage %s\n\n" % md
+
+def clicmd_index_entry(cfg, meta, item):
+    v = item["value"]
+    return "* [%s](@ref %s)\n" % (v["path"], meta["label"])
+
+def clicmd_sort(cfg, meta, item):
+    return item['value']['path']
+
+def clicmd_header(cfg, group, md, dec):
+    if group in dec and 'group_label' in dec[group]:
+        label = dec[group]['group_label']
+    else:
+        label = group
+    return "\n@page %s %s\n" % (md, label)
+
+def clicmd_format(cfg, meta, item):
+    v = item["value"]
+    s = "\n@section %s %s\n" % (meta['label'], v['path'])
+
+    # The text from '.short_help = '.
+    # Later we should split this into short_help and usage_help
+    # since the latter is how it is primarily used but the former
+    # is also needed.
+    if "short_help" in v:
+        tmp = v["short_help"].strip()
+
+        # Bit hacky. Add a trailing period if it doesn't have one.
+        if tmp[-1] != ".":
+            tmp += "."
+
+        s += "### Summary/usage\n    %s\n\n" % tmp
+
+    # This is seldom used and will likely be deprecated
+    if "long_help" in v:
+        tmp = v["long_help"]
+
+        s += "### Long help\n    %s\n\n" % tmp
+
+    # Extracted from the code in /*? ... ?*/ blocks
+    if "siphon_block" in item["meta"]:
+        sb = item["meta"]["siphon_block"]
+
+        if sb != "":
+            # hack. still needed?
+            sb = sb.replace("\n", "\\n")
+            try:
+                sb = json.loads('"'+sb+'"')
+                s += "### Description\n%s\n\n" % sb
+            except:
+                pass
+
+    # Gives some developer-useful linking
+    if "item" in meta or "function" in v:
+        s += "### Declaration and implementation\n\n"
+
+        if "item" in meta:
+            s += "Declaration: @ref %s (%s:%d)\n\n" % \
+                (meta['item'], meta["file"], int(item["meta"]["line_start"]))
+
+        if "function" in v:
+            s += "Implementation: @ref %s.\n\n" % v["function"]
+
+    return s
+
+
+siphons = {
+    "VLIB_CLI_COMMAND": {
+        "index_sort_key": clicmd_index_sort,
+        "index_header": clicmd_index_header,
+        "index_section": clicmd_index_section,
+        "index_entry": clicmd_index_entry,
+        'sort_key': clicmd_sort,
+        "header": clicmd_header,
+        "format": clicmd_format,
+    }
+}
+
+
+# PyParsing definition for our struct initializers which look like this:
+# VLIB_CLI_COMMAND (show_sr_tunnel_command, static) = {
+#    .path = "show sr tunnel",
+#    .short_help = "show sr tunnel [name <sr-tunnel-name>]",
+#    .function = show_sr_tunnel_fn,
+#};
+def getMacroInitializerBNF():
+    cs = pp.Forward()
+    ident = pp.Word(pp.alphas + "_", pp.alphas + pp.nums + "_")
+    intNum = pp.Word(pp.nums)
+    hexNum = pp.Literal("0x") + pp.Word(pp.hexnums)
+    octalNum = pp.Literal("0") + pp.Word("01234567")
+    integer = (hexNum | octalNum | intNum) + \
+        pp.Optional(pp.Literal("ULL") | pp.Literal("LL") | pp.Literal("L"))
+    floatNum = pp.Regex(r'\d+(\.\d*)?([eE]\d+)?') + pp.Optional(pp.Literal("f"))
+    char = pp.Literal("'") + pp.Word(pp.printables, exact=1) + pp.Literal("'")
+    arrayIndex = integer | ident
+
+    lbracket = pp.Literal("(").suppress()
+    rbracket = pp.Literal(")").suppress()
+    lbrace = pp.Literal("{").suppress()
+    rbrace = pp.Literal("}").suppress()
+    comma = pp.Literal(",").suppress()
+    equals = pp.Literal("=").suppress()
+    dot = pp.Literal(".").suppress()
+    semicolon = pp.Literal(";").suppress()
+
+    # initializer := { [member = ] (variable | expression | { initializer } ) }
+    typeName = ident
+    varName = ident
+
+    typeSpec = pp.Optional("unsigned") + \
+               pp.oneOf("int long short float double char u8 i8 void") + \
+               pp.Optional(pp.Word("*"), default="")
+    typeCast = pp.Combine( "(" + ( typeSpec | typeName ) + ")" ).suppress()
+
+    string = pp.Combine(pp.OneOrMore(pp.QuotedString(quoteChar='"',
+        escChar='\\', multiline=True)), adjacent=False)
+    literal = pp.Optional(typeCast) + (integer | floatNum | char | string)
+    var = pp.Combine(pp.Optional(typeCast) + varName + pp.Optional("[" + arrayIndex + "]"))
+
+    expr = (literal | var) # TODO
+
+
+    member = pp.Combine(dot + varName + pp.Optional("[" + arrayIndex + "]"))
+    value = (expr | cs)
+
+    entry = pp.Group(pp.Optional(member + equals, default="") + value)
+    entries = (pp.ZeroOrMore(entry + comma) + entry + pp.Optional(comma)) | \
+              (pp.ZeroOrMore(entry + comma))
+
+    cs << (lbrace + entries + rbrace)
+
+    macroName = ident
+    params = pp.Group(pp.ZeroOrMore(expr + comma) + expr)
+    macroParams = lbracket + params + rbracket
+
+    mi = macroName + pp.Optional(macroParams) + equals + pp.Group(cs) + semicolon
+    mi.ignore(pp.cppStyleComment)
+    return mi
+
+
+mi = getMacroInitializerBNF()
+
+# Parse the input file into a more usable dictionary structure
+cmds = {}
+line_num = 0
+line_start = 0
+for filename in args.input:
+    sys.stderr.write("Parsing items in file \"%s\"...\n" % filename)
+    data = None
+    with open(filename, "r") as fd:
+        data = json.load(fd)
+
+    cmds['_global'] = data['global']
+
+    # iterate the items loaded and regroup it
+    for item in data["items"]:
+        try:
+            o = mi.parseString(item['block']).asList()
+        except:
+            sys.stderr.write("Exception parsing item: %s\n%s\n" \
+                    % (json.dumps(item, separators=(',', ': '), indent=4),
+                        item['block']))
+            raise
+
+        group = item['group']
+        file = item['file']
+        macro = o[0]
+        param = o[1][0]
+
+        if group not in cmds:
+            cmds[group] = {}
+
+        if file not in cmds[group]:
+            cmds[group][file] = {}
+
+        if macro not in cmds[group][file]:
+            cmds[group][file][macro] = {}
+
+        c = {
+            'params': o[2],
+            'meta': {},
+            'value': {},
+        }
+
+        for key in item:
+            if key == 'block':
+                continue
+            c['meta'][key] = item[key]
+
+        for i in c['params']:
+            c['value'][i[0]] = cgi.escape(i[1])
+
+        cmds[group][file][macro][param] = c
+
+
+# Write the header for this siphon type
+cfg = siphons[siphon_map[args.type]]
+sys.stdout.write(cfg["index_header"](cfg))
+contents = ""
+
+def group_sort_key(item):
+    if "index_sort_key" in cfg:
+        return cfg["index_sort_key"](cfg, item, cmds['_global'])
+    return item
+
+# Iterate the dictionary and process it
+for group in sorted(cmds.keys(), key=group_sort_key):
+    if group.startswith('_'):
+        continue
+
+    sys.stderr.write("Processing items in group \"%s\"...\n" % group)
+
+    cfg = siphons[siphon_map[args.type]]
+    md = group.replace("/", "_").replace(".", "_")
+    sys.stdout.write(cfg["index_section"](cfg, group, md))
+
+    if "header" in cfg:
+        dec = cmds['_global']
+        contents += cfg["header"](cfg, group, md, dec)
+
+    for file in sorted(cmds[group].keys()):
+        if group.startswith('_'):
+            continue
+
+        sys.stderr.write("- Processing items in file \"%s\"...\n" % file)
+
+        for macro in sorted(cmds[group][file].keys()):
+            if macro != siphon_map[args.type]:
+                continue
+            sys.stderr.write("-- Processing items in macro \"%s\"...\n" % macro)
+            cfg = siphons[macro]
+
+            meta = {
+                "group": group,
+                "file": file,
+                "macro": macro,
+                "md": md,
+            }
+
+            def item_sort_key(item):
+                if "sort_key" in cfg:
+                    return cfg["sort_key"](cfg, meta, cmds[group][file][macro][item])
+                return item
+
+            for param in sorted(cmds[group][file][macro].keys(), key=item_sort_key):
+                sys.stderr.write("--- Processing item \"%s\"...\n" % param)
+
+                meta["item"] = param
+
+                # mangle "md" and the item to make a reference label
+                meta["label"] = "%s___%s" % (meta["md"], param)
+
+                if "index_entry" in cfg:
+                    s = cfg["index_entry"](cfg, meta, cmds[group][file][macro][param])
+                    sys.stdout.write(s)
+
+                if "format" in cfg:
+                    contents += cfg["format"](cfg, meta, cmds[group][file][macro][param])
+
+sys.stdout.write(contents)
+
+# All done
diff --git a/vlib/vlib/dir.dox b/vlib/vlib/dir.dox
index 8ca47cd7..4806e7a9 100644
--- a/vlib/vlib/dir.dox
+++ b/vlib/vlib/dir.dox
@@ -19,3 +19,5 @@
 @dir
 @brief VLIB application library source.
 */
+/*? %%clicmd:group_label VLIB application library%% ?*/
+
diff --git a/vlib/vlib/unix/cli.c b/vlib/vlib/unix/cli.c
index 92bb8bc3..bf09ee0c 100644
--- a/vlib/vlib/unix/cli.c
+++ b/vlib/vlib/unix/cli.c
@@ -42,6 +42,7 @@
  * Provides a command line interface so humans can interact with VPP.
  * This is predominantly a debugging and testing mechanism.
  */
+/*? %%clicmd:group_label Debug CLI %% ?*/
 
 #include <vlib/vlib.h>
 #include <vlib/unix/unix.h>
@@ -146,9 +147,13 @@ typedef struct
      CLI process. */
   u8 *input_vector;
 
+  /** This session has command history. */
   u8 has_history;
+  /** Array of vectors of commands in the history. */
   u8 **command_history;
+  /** The command currently pointed at by the history cursor. */
   u8 *current_command;
+  /** How far from the end of the history array the user has browsed. */
   i32 excursion;
 
   /** Maximum number of history entries this session will store. */
@@ -157,7 +162,12 @@ typedef struct
   /** Current command line counter */
   u32 command_number;
 
+  /** The string being searched for in the history. */
   u8 *search_key;
+  /** If non-zero then the CLI is searching in the history array.
+   * - @c -1 means search backwards.
+   * - @c 1 means search forwards.
+   */
   int search_mode;
 
   /** Position of the insert cursor on the current input line */
@@ -232,41 +242,41 @@ unix_cli_file_free (unix_cli_file_t * f)
 /** CLI actions */
 typedef enum
 {
-  UNIX_CLI_PARSE_ACTION_NOACTION = 0,  /**< No action */
-  UNIX_CLI_PARSE_ACTION_CRLF,	       /**< Carriage return, newline or enter */
-  UNIX_CLI_PARSE_ACTION_TAB,	       /**< Tab key */
-  UNIX_CLI_PARSE_ACTION_ERASE,	       /**< Erase cursor left */
-  UNIX_CLI_PARSE_ACTION_ERASERIGHT,    /**< Erase cursor right */
-  UNIX_CLI_PARSE_ACTION_UP,	       /**< Up arrow */
-  UNIX_CLI_PARSE_ACTION_DOWN,	       /**< Down arrow */
-  UNIX_CLI_PARSE_ACTION_LEFT,
-  UNIX_CLI_PARSE_ACTION_RIGHT,
-  UNIX_CLI_PARSE_ACTION_HOME,
-  UNIX_CLI_PARSE_ACTION_END,
-  UNIX_CLI_PARSE_ACTION_WORDLEFT,
-  UNIX_CLI_PARSE_ACTION_WORDRIGHT,
-  UNIX_CLI_PARSE_ACTION_ERASELINELEFT,
-  UNIX_CLI_PARSE_ACTION_ERASELINERIGHT,
-  UNIX_CLI_PARSE_ACTION_CLEAR,
-  UNIX_CLI_PARSE_ACTION_REVSEARCH,
-  UNIX_CLI_PARSE_ACTION_FWDSEARCH,
-  UNIX_CLI_PARSE_ACTION_YANK,
-  UNIX_CLI_PARSE_ACTION_TELNETIAC,
-
-  UNIX_CLI_PARSE_ACTION_PAGER_CRLF,
-  UNIX_CLI_PARSE_ACTION_PAGER_QUIT,
-  UNIX_CLI_PARSE_ACTION_PAGER_NEXT,
-  UNIX_CLI_PARSE_ACTION_PAGER_DN,
-  UNIX_CLI_PARSE_ACTION_PAGER_UP,
-  UNIX_CLI_PARSE_ACTION_PAGER_TOP,
-  UNIX_CLI_PARSE_ACTION_PAGER_BOTTOM,
-  UNIX_CLI_PARSE_ACTION_PAGER_PGDN,
-  UNIX_CLI_PARSE_ACTION_PAGER_PGUP,
-  UNIX_CLI_PARSE_ACTION_PAGER_REDRAW,
-  UNIX_CLI_PARSE_ACTION_PAGER_SEARCH,
-
-  UNIX_CLI_PARSE_ACTION_PARTIALMATCH,
-  UNIX_CLI_PARSE_ACTION_NOMATCH
+  UNIX_CLI_PARSE_ACTION_NOACTION = 0,	/**< No action */
+  UNIX_CLI_PARSE_ACTION_CRLF,		/**< Carriage return, newline or enter */
+  UNIX_CLI_PARSE_ACTION_TAB,		/**< Tab key */
+  UNIX_CLI_PARSE_ACTION_ERASE,		/**< Erase cursor left */
+  UNIX_CLI_PARSE_ACTION_ERASERIGHT,	/**< Erase cursor right */
+  UNIX_CLI_PARSE_ACTION_UP,		/**< Up arrow */
+  UNIX_CLI_PARSE_ACTION_DOWN,		/**< Down arrow */
+  UNIX_CLI_PARSE_ACTION_LEFT,		/**< Left arrow */
+  UNIX_CLI_PARSE_ACTION_RIGHT,		/**< Right arrow */
+  UNIX_CLI_PARSE_ACTION_HOME,		/**< Home key (jump to start of line) */
+  UNIX_CLI_PARSE_ACTION_END,		/**< End key (jump to end of line) */
+  UNIX_CLI_PARSE_ACTION_WORDLEFT,	/**< Jump cursor to start of left word */
+  UNIX_CLI_PARSE_ACTION_WORDRIGHT,	/**< Jump cursor to start of right word */
+  UNIX_CLI_PARSE_ACTION_ERASELINELEFT,	/**< Erase line to left of cursor */
+  UNIX_CLI_PARSE_ACTION_ERASELINERIGHT,	/**< Erase line to right & including cursor */
+  UNIX_CLI_PARSE_ACTION_CLEAR,		/**< Clear the terminal */
+  UNIX_CLI_PARSE_ACTION_REVSEARCH,	/**< Search backwards in command history */
+  UNIX_CLI_PARSE_ACTION_FWDSEARCH,	/**< Search forwards in command history */
+  UNIX_CLI_PARSE_ACTION_YANK,		/**< Undo last erase action */
+  UNIX_CLI_PARSE_ACTION_TELNETIAC,	/**< Telnet control code */
+
+  UNIX_CLI_PARSE_ACTION_PAGER_CRLF,	/**< Enter pressed (CR, CRLF, LF, etc) */
+  UNIX_CLI_PARSE_ACTION_PAGER_QUIT,	/**< Exit the pager session */
+  UNIX_CLI_PARSE_ACTION_PAGER_NEXT,	/**< Scroll to next page */
+  UNIX_CLI_PARSE_ACTION_PAGER_DN,	/**< Scroll to next line */
+  UNIX_CLI_PARSE_ACTION_PAGER_UP,	/**< Scroll to previous line */
+  UNIX_CLI_PARSE_ACTION_PAGER_TOP,	/**< Scroll to first line */
+  UNIX_CLI_PARSE_ACTION_PAGER_BOTTOM,	/**< Scroll to last line */
+  UNIX_CLI_PARSE_ACTION_PAGER_PGDN,	/**< Scroll to next page */
+  UNIX_CLI_PARSE_ACTION_PAGER_PGUP,	/**< Scroll to previous page */
+  UNIX_CLI_PARSE_ACTION_PAGER_REDRAW,	/**< Clear and redraw the page on the terminal */
+  UNIX_CLI_PARSE_ACTION_PAGER_SEARCH,	/**< Search the pager buffer */
+
+  UNIX_CLI_PARSE_ACTION_PARTIALMATCH,	/**< Action parser found a partial match */
+  UNIX_CLI_PARSE_ACTION_NOMATCH		/**< Action parser did not find any match */
 } unix_cli_parse_action_t;
 
 /** @brief Mapping of input buffer strings to action values.
@@ -485,6 +495,9 @@ unix_cli_match_action (unix_cli_parse_actions_t * a,
 }
 
 
+/** Add bytes to the output vector and then flagg the I/O system that bytes
+ * are available to be sent.
+ */
 static void
 unix_cli_add_pending_output (unix_file_t * uf,
 			     unix_cli_file_t * cf,
@@ -502,6 +515,9 @@ unix_cli_add_pending_output (unix_file_t * uf,
     }
 }
 
+/** Delete all bytes from the output vector and flag the I/O system
+ * that no more bytes are available to be sent.
+ */
 static void
 unix_cli_del_pending_output (unix_file_t * uf,
 			     unix_cli_file_t * cf, uword n_bytes)
@@ -983,13 +999,13 @@ unix_vlib_cli_output (uword cli_file_index, u8 * buffer, uword buffer_bytes)
 
 /** Identify whether a terminal type is ANSI capable.
  *
- * Compares the string given in @term with a list of terminal types known
+ * Compares the string given in @c term with a list of terminal types known
  * to support ANSI escape sequences.
  *
  * This list contains, for example, @c xterm, @c screen and @c ansi.
  *
  * @param term A string with a terminal type in it.
- * @param len The length of the string in @term.
+ * @param len The length of the string in @c term.
  *
  * @return @c 1 if the terminal type is recognized as supporting ANSI
  *         terminal sequences; @c 0 otherwise.
@@ -2059,6 +2075,10 @@ done:
     goto more;
 }
 
+/** Destroy a CLI session.
+ * @note If we destroy the @c stdin session this additionally signals
+ *       the shutdown of VPP.
+ */
 static void
 unix_cli_kill (unix_cli_main_t * cm, uword cli_file_index)
 {
@@ -2088,6 +2108,7 @@ unix_cli_kill (unix_cli_main_t * cm, uword cli_file_index)
   pool_put (cm->cli_file_pool, cf);
 }
 
+/** Handle system events. */
 static uword
 unix_cli_process (vlib_main_t * vm,
 		  vlib_node_runtime_t * rt, vlib_frame_t * f)
@@ -2130,6 +2151,8 @@ done:
   return 0;
 }
 
+/** Called when a CLI session file descriptor can be written to without
+ * blocking. */
 static clib_error_t *
 unix_cli_write_ready (unix_file_t * uf)
 {
@@ -2152,6 +2175,7 @@ unix_cli_write_ready (unix_file_t * uf)
   return /* no error */ 0;
 }
 
+/** Called when a CLI session file descriptor has data to be read. */
 static clib_error_t *
 unix_cli_read_ready (unix_file_t * uf)
 {
@@ -2482,8 +2506,8 @@ unix_cli_config (vlib_main_t * vm, unformat_input_t * input)
 
 VLIB_CONFIG_FUNCTION (unix_cli_config, "unix-cli");
 
-/** Called when VPP is shutting down, this resets the system
- * terminal state, if previously saved.
+/** Called when VPP is shutting down, this restores the system
+ * terminal state if previously saved.
  */
 static clib_error_t *
 unix_cli_exit (vlib_main_t * vm)
@@ -2500,7 +2524,7 @@ unix_cli_exit (vlib_main_t * vm)
 VLIB_MAIN_LOOP_EXIT_FUNCTION (unix_cli_exit);
 
 /** Set the CLI prompt.
- * @param The C string to set the prompt to.
+ * @param prompt The C string to set the prompt to.
  * @note This setting is global; it impacts all current
  *       and future CLI sessions.
  */
@@ -2531,6 +2555,12 @@ unix_cli_quit (vlib_main_t * vm,
   return 0;
 }
 
+/*?
+ * Terminates the current CLI session.
+ *
+ * If VPP is running in @em interactive mode and this is the console session
+ * (that is, the session on @c stdin) then this will also terminate VPP.
+?*/
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (unix_cli_quit_command, static) = {
   .path = "quit",
@@ -2597,6 +2627,13 @@ done:
   return error;
 }
 
+/*?
+ * Executes a sequence of CLI commands which are read from a file.
+ *
+ * If a command is unrecognised or otherwise invalid then the usual CLI
+ * feedback will be generated, however execution of subsequent commands
+ * from the file will continue.
+?*/
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (cli_exec, static) = {
   .path = "exec",
@@ -2706,6 +2743,9 @@ unix_cli_show_history (vlib_main_t * vm,
   return 0;
 }
 
+/*?
+ * Displays the command history for the current session, if any.
+?*/
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (cli_unix_cli_show_history, static) = {
   .path = "history",
@@ -2755,6 +2795,24 @@ unix_cli_show_terminal (vlib_main_t * vm,
   return 0;
 }
 
+/*?
+ * Displays various information about the state of the current terminal
+ * session.
+ *
+ * @cliexpar
+ * @cliexstart{show terminal}
+ * Terminal name:   unix-cli-stdin
+ * Terminal mode:   char-by-char
+ * Terminal width:  123
+ * Terminal height: 48
+ * ANSI capable:    yes
+ * History enabled: yes
+ * History limit:   50
+ * Pager enabled:   yes
+ * Pager limit:     100000
+ * CRLF mode:       LF
+ * @cliexend
+?*/
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (cli_unix_cli_show_terminal, static) = {
   .path = "show terminal",
@@ -2799,6 +2857,13 @@ unix_cli_set_terminal_pager (vlib_main_t * vm,
   return 0;
 }
 
+/*?
+ * Enables or disables the terminal pager for this session. Generally
+ * this defaults to enabled.
+ *
+ * Additionally allows the pager buffer size to be set; though note that
+ * this value is set globally and not per session.
+?*/
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (cli_unix_cli_set_terminal_pager, static) = {
   .path = "set terminal pager",
@@ -2850,6 +2915,13 @@ unix_cli_set_terminal_history (vlib_main_t * vm,
   return 0;
 }
 
+/*?
+ * Enables or disables the command history function of the current
+ * terminal. Generally this defaults to enabled.
+ *
+ * This command also allows the maximum size of the history buffer for
+ * this session to be altered.
+?*/
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (cli_unix_cli_set_terminal_history, static) = {
   .path = "set terminal history",
@@ -2880,6 +2952,14 @@ unix_cli_set_terminal_ansi (vlib_main_t * vm,
   return 0;
 }
 
+/*?
+ * Enables or disables the use of ANSI control sequences by this terminal.
+ * The default will vary based on terminal detection at the start of the
+ * session.
+ *
+ * ANSI control sequences are used in a small number of places to provide,
+ * for example, color text output and to control the cursor in the pager.
+?*/
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (cli_unix_cli_set_terminal_ansi, static) = {
   .path = "set terminal ansi",
diff --git a/vlib/vlib/unix/dir.dox b/vlib/vlib/unix/dir.dox
new file mode 100644
index 00000000..cdded0f1
--- /dev/null
+++ b/vlib/vlib/unix/dir.dox
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Doxygen directory documentation */
+
+/**
+@dir
+@brief VLIB Unix interface
+
+VLIB application library Unix interface layer.
+
+*/
+/*? %%clicmd:group_label VLIB Unix stuff%% ?*/
+
-- 
cgit 1.2.3-korg


From e0d802bc5356594d4e9621ca4cf8cfa8069d9e8e Mon Sep 17 00:00:00 2001
From: Chris Luke <chrisy@flirble.org>
Date: Wed, 31 Aug 2016 10:04:58 -0400
Subject: VPP-221 Loosen Doxygen CLI command struct parser

Make the struct parser slighty slightly more accomodating of
whitespace in places it has no business being.

Also add missing OS_ID thing to Doxygen makefile.

Change-Id: Id3d198fd926f7a6c2ed40bc2d08907aad5d5ac33
Signed-off-by: Chris Luke <chrisy@flirble.org>
---
 Makefile                  | 2 +-
 doxygen/Makefile          | 1 +
 doxygen/siphon_process.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5808a333..f218cb08 100644
--- a/Makefile
+++ b/Makefile
@@ -242,7 +242,7 @@ cscope: cscope.files
 export DOXY_DIR ?= $(WS_ROOT)/doxygen
 
 define make-doxy
-	@WS_ROOT="$(WS_ROOT)" BR="$(BR)" make -C $(DOXY_DIR) $@
+	@OS_ID="$(OS_ID)" WS_ROOT="$(WS_ROOT)" BR="$(BR)" make -C $(DOXY_DIR) $@
 endef
 
 .PHONY: bootstrap-doxygen doxygen wipe-doxygen
diff --git a/doxygen/Makefile b/doxygen/Makefile
index 7bdc8ee9..8e916526 100644
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -19,6 +19,7 @@
 # These should be passed in by the root Makefile
 WS_ROOT ?= $(CURDIR)/..
 BR ?= $(WS_ROOT)/build-root
+OS_ID ?= $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 
 # Package dependencies
 DOC_DEB_DEPENDS = doxygen graphviz python-pyparsing
diff --git a/doxygen/siphon_process.py b/doxygen/siphon_process.py
index 80add4b9..82a166d3 100755
--- a/doxygen/siphon_process.py
+++ b/doxygen/siphon_process.py
@@ -181,7 +181,7 @@ def getMacroInitializerBNF():
     expr = (literal | var) # TODO
 
 
-    member = pp.Combine(dot + varName + pp.Optional("[" + arrayIndex + "]"))
+    member = pp.Combine(dot + varName + pp.Optional("[" + arrayIndex + "]"), adjacent=False)
     value = (expr | cs)
 
     entry = pp.Group(pp.Optional(member + equals, default="") + value)
-- 
cgit 1.2.3-korg


From 24704851584a2b1db4545a2a3cd3fc73dff2ce5f Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Wed, 7 Sep 2016 13:10:50 +0200
Subject: checkstyle: improve speed by checking only recently changed files

This change makes checkstyle much faster by checking only recently
changed files. It only checks files changed in last commit and files
which are localy modified. Old behavior is preserved by specifying
argument "--full" when invoking script.

In addition "make checkstyle" and "make "fixstyle" actions are added
to the top-level Makefile.

Change-Id: I7d86225bd282f32ee508e7f52692a3778ac8dcda
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                         |  7 +++++++
 build-root/scripts/checkstyle.sh | 21 ++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f218cb08..b3bd8d3c 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,8 @@ help:
 	@echo " ctags               - (re)generate ctags database"
 	@echo " gtags               - (re)generate gtags database"
 	@echo " cscope              - (re)generate cscope database"
+	@echo " checkstyle          - check coding style"
+	@echo " fixstyle            - fix coding style"
 	@echo " doxygen             - (re)generate documentation"
 	@echo " bootstrap-doxygen   - setup Doxygen dependencies"
 	@echo " wipe-doxygen        - wipe all generated documentation"
@@ -233,6 +235,11 @@ gtags: ctags
 cscope: cscope.files
 	@cscope -b -q -v
 
+checkstyle:
+	@build-root/scripts/checkstyle.sh
+
+fixstyle:
+	@build-root/scripts/checkstyle.sh --fix
 
 #
 # Build the documentation
diff --git a/build-root/scripts/checkstyle.sh b/build-root/scripts/checkstyle.sh
index df72cdb2..60129676 100755
--- a/build-root/scripts/checkstyle.sh
+++ b/build-root/scripts/checkstyle.sh
@@ -3,14 +3,29 @@
 VPP_DIR=`dirname $0`/../../
 EXIT_CODE=0
 FIX="0"
+FULL="0"
 CHECKSTYLED_FILES=""
 UNCHECKSTYLED_FILES=""
 
 # If the user provides --fix, then actually fix things
 # Note: this is meant for use outside of the CI Jobs, by users cleaning things up
 
-if [ $# -gt 0 ] && [ ${1} == '--fix' ]; then
-    FIX="1"
+while true; do
+	case ${1} in
+		--fix)
+			FIX="1"
+			;;
+		--full)
+			FULL="1"
+			;;
+	esac
+	shift || break
+done
+
+if [ "${FULL}" == "1" ]; then
+	FILELIST=$(git ls-tree -r HEAD --name-only)
+else
+	FILELIST=$((git diff HEAD~1.. --name-only; git ls-files -m ) | sort -u)
 fi
 
 # Check to make sure we have indent.  Exit if we don't with an error message, but
@@ -24,7 +39,7 @@ indent --version
 
 cd ${VPP_DIR}
 git status
-for i in `git ls-tree -r HEAD --name-only`;do
+for i in ${FILELIST}; do
     if [ -f ${i} ] && [ ${i} != "build-root/scripts/checkstyle.sh" ] && [ ${i} != "build-root/emacs-lisp/fix-coding-style.el" ]; then
         grep -q "fd.io coding-style-patch-verification: ON" ${i}
         if [ $? == 0 ]; then
-- 
cgit 1.2.3-korg


From 36d25063828f65a6e864bc56b488bef3c4abcaa4 Mon Sep 17 00:00:00 2001
From: Chris Luke <chrisy@flirble.org>
Date: Thu, 22 Sep 2016 20:52:26 -0400
Subject: Enable doc building on MacOS

Simple tweak to the Makefiles to allow "make doxygen" to work
natively on Macs - assuming the appropriate things have been
installed first, which it tests for.

Change-Id: I1a3e72759d533270a0512de38595c3bc3f71dee0
Signed-off-by: Chris Luke <chrisy@flirble.org>
---
 Makefile         |  3 +++
 doxygen/Makefile | 26 +++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b3bd8d3c..59f14e3e 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,11 @@ GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
 #
 # OS Detection
 #
+# We allow Darwin (MacOS) for docs generation; VPP build will still fail.
+ifneq ($(shell uname),Darwin)
 OS_ID        = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+endif
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
diff --git a/doxygen/Makefile b/doxygen/Makefile
index 97225f3c..7031e84d 100644
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -23,11 +23,20 @@ all: doxygen
 # These should be passed in by the root Makefile
 WS_ROOT ?= $(CURDIR)/..
 BR ?= $(WS_ROOT)/build-root
+
+# We support MacOS for docs generation
+ifeq ($(shell uname),Darwin)
+OS_ID = darwin
+endif
+
+# Work out the OS if we haven't already
 OS_ID ?= $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 
 # Package dependencies
 DOC_DEB_DEPENDS = doxygen graphviz python-pyparsing python-jinja2
 DOC_RPM_DEPENDS = doxygen graphviz pyparsing python-jinja2
+DOC_MAC_BIN_DEPENDS = doxygen dot git
+DOC_MAC_PY_DEPENDS = pyparsing jinja2
 
 # Doxygen configuration and our utility scripts
 DOXY_DIR ?= $(WS_ROOT)/doxygen
@@ -130,8 +139,23 @@ ifeq ($(OS_ID),ubuntu)
 	fi
 else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo yum install $(CONFIRM) $(DOC_RPM_DEPENDS)
+else ifeq ($(OS_ID),darwin)
+	@set -e; \
+	for bin in $(DOC_MAC_BIN_DEPENDS); do \
+		which -s $${bin} || (\
+			echo "Program '$${bin}' not found, please install it."; \
+			false; \
+		); \
+	done
+	@set -e; \
+	for py in $(DOC_MAC_PY_DEPENDS); do \
+		python -c "import $${py}" >/dev/null 2>&1 || (\
+			echo "Python package '$${py}' not found, please install it."; \
+			false; \
+		); \
+	done
 else
-	$(error "This option currently works only on Ubuntu or Centos systems")
+	$(error "Building documentation currently works only on Ubuntu, CentOS or MacOS systems.")
 endif
 	@touch $@
 
-- 
cgit 1.2.3-korg


From f56b77a0764222cc45a9df572df901067a273356 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Mon, 3 Oct 2016 19:44:57 +0200
Subject: test: new test infrastructure

Change-Id: I73ca19c431743f6b39669c583d9222a6559346ef
Signed-off-by: Jan Gelety <jgelety@cisco.com>
Signed-off-by: Juraj Sloboda <jsloboda@cisco.com>
Signed-off-by: Stefan Kobza <skobza@cisco.com>
Signed-off-by: Matej Klotton <mklotton@cisco.com>
Signed-off-by: Maciek Konstantynowicz <mkonstan@cisco.com>
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                        |  33 +++
 test/Makefile                   |   3 +
 test/framework.py               | 621 ++++++++++++++++++++++++++++++++++++++++
 test/run_tests.py               |  12 +
 test/scapy_handlers/__init__.py |   0
 test/scapy_handlers/vxlan.py    |  17 ++
 test/template_bd.py             | 106 +++++++
 test/test_infra.md              | 145 ++++++++++
 test/test_ip.py                 | 261 +++++++++++++++++
 test/test_ip6.py                | 281 ++++++++++++++++++
 test/test_l2bd.py               | 473 ++++++++++++++++++++++++++++++
 test/test_l2xc.py               | 243 ++++++++++++++++
 test/test_vxlan.py              | 102 +++++++
 test/util.py                    | 139 +++++++++
 14 files changed, 2436 insertions(+)
 create mode 100644 test/Makefile
 create mode 100644 test/framework.py
 create mode 100644 test/run_tests.py
 create mode 100644 test/scapy_handlers/__init__.py
 create mode 100644 test/scapy_handlers/vxlan.py
 create mode 100644 test/template_bd.py
 create mode 100644 test/test_infra.md
 create mode 100644 test/test_ip.py
 create mode 100644 test/test_ip6.py
 create mode 100644 test/test_l2bd.py
 create mode 100644 test/test_l2xc.py
 create mode 100644 test/test_vxlan.py
 create mode 100644 test/util.py

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 59f14e3e..912ad1a9 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,7 @@ endif
 .PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
 .PHONY: ctags cscope plugins plugins-release build-vpp-api
+.PHONY: test test-debug retest retest-debug
 
 help:
 	@echo "Make Targets:"
@@ -75,6 +76,10 @@ help:
 	@echo " run-release         - run release binary"
 	@echo " debug               - run debug binary with debugger"
 	@echo " debug-release       - run release binary with debugger"
+	@echo " test                - build and run functional tests"
+	@echo " test-debug          - build and run functional tests (debug build)"
+	@echo " retest              - run functional tests"
+	@echo " retest-debug        - run functional tests (debug build)"
 	@echo " build-vat           - build vpp-api-test tool"
 	@echo " build-vpp-api       - build vpp-api"
 	@echo " run-vat             - run vpp-api-test tool"
@@ -98,6 +103,7 @@ help:
 	@echo "                       startup.conf file is present"
 	@echo " GDB=<path>          - gdb binary to use for debugging"
 	@echo " PLATFORM=<name>     - target platform. default is vpp"
+	@echo " TEST=<name>         - only run specific test"
 	@echo ""
 	@echo "Current Argumernt Values:"
 	@echo " V            = $(V)"
@@ -182,6 +188,33 @@ plugins-release: $(BR)/.bootstrap.ok
 build-vpp-api: $(BR)/.bootstrap.ok
 	$(call make,$(PLATFORM)_debug,vpp-api-install)
 
+define test
+	@sudo make -C test \
+	  VPP_TEST_BIN=$(BR)/install-$(1)-native/vpp/bin/vpp \
+	  VPP_TEST_API_TEST_BIN=$(BR)/install-$(1)-native/vpp-api-test/bin/vpp_api_test \
+	  V=$(V) TEST=$(TEST)
+endef
+
+test:
+ifeq ($(OS_ID),ubuntu)
+	@sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
+endif
+	@make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite vpp-install vpp-api-test-install
+	$(call test,vpp_lite)
+
+test-debug:
+ifeq ($(OS_ID),ubuntu)
+	@sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
+endif
+	@make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite_debug vpp-install vpp-api-test-install
+	$(call test,vpp_lite_debug)
+
+retest:
+	$(call test,vpp_lite)
+
+retest-debug:
+	$(call test,vpp_lite_debug)
+
 STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run
diff --git a/test/Makefile b/test/Makefile
new file mode 100644
index 00000000..7cbcf97a
--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,3 @@
+
+all:
+	@python run_tests.py discover -p test_$(TEST)"*.py"
diff --git a/test/framework.py b/test/framework.py
new file mode 100644
index 00000000..67f8a058
--- /dev/null
+++ b/test/framework.py
@@ -0,0 +1,621 @@
+#!/usr/bin/env python
+## @package framework
+#  Module to handle test case execution.
+#
+#  The module provides a set of tools for constructing and running tests and
+#  representing the results.
+
+import logging
+logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
+
+import os
+import subprocess
+import unittest
+from inspect import getdoc
+
+from scapy.utils import wrpcap, rdpcap
+from scapy.packet import Raw
+
+## Static variables to store color formatting strings.
+#
+#  These variables (RED, GREEN, YELLOW and LPURPLE) are used to configure
+#  the color of the text to be printed in the terminal. Variable END is used
+#  to revert the text color to the default one.
+RED = '\033[91m'
+GREEN = '\033[92m'
+YELLOW = '\033[93m'
+LPURPLE = '\033[94m'
+END = '\033[0m'
+
+## Private class to create packet info object.
+#
+#  Help process information about the next packet.
+#  Set variables to default values.
+class _PacketInfo(object):
+    index = -1
+    src = -1
+    dst = -1
+    data = None
+    ## @var index
+    #  Integer variable to store the index of the packet.
+    ## @var src
+    #  Integer variable to store the index of the source packet generator
+    #  interface of the packet.
+    ## @var dst
+    #  Integer variable to store the index of the destination packet generator
+    #  interface of the packet.
+    ## @var data
+    #  Object variable to store the copy of the former packet.
+
+## Subclass of the python unittest.TestCase class.
+#
+#  This subclass is a base class for test cases that are implemented as classes.
+#  It provides methods to create and run test case.
+class VppTestCase(unittest.TestCase):
+
+    ## Class method to set class constants necessary to run test case.
+    #  @param cls The class pointer.
+    @classmethod
+    def setUpConstants(cls):
+        cls.vpp_bin = os.getenv('VPP_TEST_BIN', "vpp")
+        cls.vpp_api_test_bin = os.getenv("VPP_TEST_API_TEST_BIN",
+                                         "vpp-api-test")
+        cls.vpp_cmdline = [cls.vpp_bin, "unix", "nodaemon", "api-segment", "{",
+                           "prefix", "unittest", "}"]
+        cls.vpp_api_test_cmdline = [cls.vpp_api_test_bin, "chroot", "prefix",
+                                    "unittest"]
+        try:
+            cls.verbose = int(os.getenv("V", 0))
+        except:
+            cls.verbose = 0
+
+        ## @var vpp_bin
+        #  String variable to store the path to vpp (vector packet processor).
+        ## @var vpp_api_test_bin
+        #  String variable to store the path to vpp_api_test (vpp API test tool).
+        ## @var vpp_cmdline
+        #  List of command line attributes for vpp.
+        ## @var vpp_api_test_cmdline
+        #  List of command line attributes for vpp_api_test.
+        ## @var verbose
+        #  Integer variable to store required verbosity level.
+
+    ## Class method to start the test case.
+    #  1. Initiate test case constants and set test case variables to default
+    #  values.
+    #  2. Remove files from the shared memory.
+    #  3. Start vpp as a subprocess.
+    #  @param cls The class pointer.
+    @classmethod
+    def setUpClass(cls):
+        cls.setUpConstants()
+        cls.pg_streams = []
+        cls.MY_MACS = {}
+        cls.MY_IP4S = {}
+        cls.MY_IP6S = {}
+        cls.VPP_MACS = {}
+        cls.VPP_IP4S = {}
+        cls.VPP_IP6S = {}
+        cls.packet_infos = {}
+        print "=================================================================="
+        print YELLOW + getdoc(cls) + END
+        print "=================================================================="
+        os.system("rm -f /dev/shm/unittest-global_vm")
+        os.system("rm -f /dev/shm/unittest-vpe-api")
+        os.system("rm -f /dev/shm/unittest-db")
+        cls.vpp = subprocess.Popen(cls.vpp_cmdline, stderr=subprocess.PIPE)
+        ## @var pg_streams
+        #  List variable to store packet-generator streams for interfaces.
+        ## @var MY_MACS
+        #  Dictionary variable to store host MAC addresses connected to packet
+        #  generator interfaces.
+        ## @var MY_IP4S
+        #  Dictionary variable to store host IPv4 addresses connected to packet
+        #  generator interfaces.
+        ## @var MY_IP6S
+        #  Dictionary variable to store host IPv6 addresses connected to packet
+        #  generator interfaces.
+        ## @var VPP_MACS
+        #  Dictionary variable to store VPP MAC addresses of the packet
+        #  generator interfaces.
+        ## @var VPP_IP4S
+        #  Dictionary variable to store VPP IPv4 addresses of the packet
+        #  generator interfaces.
+        ## @var VPP_IP6S
+        #  Dictionary variable to store VPP IPv6 addresses of the packet
+        #  generator interfaces.
+        ## @var vpp
+        #  Test case object variable to store file descriptor of running vpp
+        #  subprocess with open pipe to the standard error stream per
+        #  VppTestCase object.
+
+    ## Class method to do cleaning when all tests (test_) defined for
+    #  VppTestCase class are finished.
+    #  1. Terminate vpp and kill all vpp instances.
+    #  2. Remove files from the shared memory.
+    #  @param cls The class pointer.
+    @classmethod
+    def quit(cls):
+        cls.vpp.terminate()
+        cls.vpp = None
+        os.system("rm -f /dev/shm/unittest-global_vm")
+        os.system("rm -f /dev/shm/unittest-vpe-api")
+        os.system("rm -f /dev/shm/unittest-db")
+
+    ## Class method to define tear down action of the VppTestCase class.
+    #  @param cls The class pointer.
+    @classmethod
+    def tearDownClass(cls):
+        cls.quit()
+
+    ## Method to define tear down VPP actions of the test case.
+    #  @param self The object pointer.
+    def tearDown(self):
+        self.cli(2, "show int")
+        self.cli(2, "show trace")
+        self.cli(2, "show hardware")
+        self.cli(2, "show ip arp")
+        self.cli(2, "show ip fib")
+        self.cli(2, "show error")
+        self.cli(2, "show run")
+
+    ## Method to define setup action of the test case.
+    #  @param self The object pointer.
+    def setUp(self):
+        self.cli(2, "clear trace")
+
+    ## Class method to print logs.
+    #  Based on set level of verbosity print text in the terminal.
+    #  @param cls The class pointer.
+    #  @param s String variable to store text to be printed.
+    #  @param v Integer variable to store required level of verbosity.
+    @classmethod
+    def log(cls, s, v=1):
+        if cls.verbose >= v:
+            print "LOG: " + LPURPLE + s + END
+
+    ## Class method to execute api commands.
+    #  Based on set level of verbosity print the output of the api command in
+    #  the terminal.
+    #  @param cls The class pointer.
+    #  @param s String variable to store api command string.
+    @classmethod
+    def api(cls, s):
+        p = subprocess.Popen(cls.vpp_api_test_cmdline,
+                             stdout=subprocess.PIPE,
+                             stdin=subprocess.PIPE,
+                             stderr=subprocess.PIPE)
+        if cls.verbose > 0:
+            print "API: " + RED + s + END
+        p.stdin.write(s)
+        out = p.communicate()[0]
+        out = out.replace("vat# ", "", 2)
+        if cls.verbose > 0:
+            if len(out) > 1:
+                print YELLOW + out + END
+        ## @var p
+        #  Object variable to store file descriptor of vpp_api_test subprocess
+        #  with open pipes to the standard output, inputs and error streams.
+        ## @var out
+        #  Tuple variable to store standard output of vpp_api_test subprocess
+        #  where the string "vat# " is replaced by empty string later.
+
+    ## Class method to execute cli commands.
+    #  Based on set level of verbosity of the log and verbosity defined by
+    #  environmental variable execute the cli command and print the output in
+    #  the terminal.
+    #  CLI command is executed via vpp API test tool (exec + cli_command)
+    #  @param cls The class pointer.
+    #  @param v Integer variable to store required level of verbosity.
+    #  @param s String variable to store cli command string.
+    @classmethod
+    def cli(cls, v, s):
+        if cls.verbose < v:
+            return
+        p = subprocess.Popen(cls.vpp_api_test_cmdline,
+                             stdout=subprocess.PIPE,
+                             stdin=subprocess.PIPE,
+                             stderr=subprocess.PIPE)
+        if cls.verbose > 0:
+            print "CLI: " + RED + s + END
+        p.stdin.write('exec ' + s)
+        out = p.communicate()[0]
+        out = out.replace("vat# ", "", 2)
+        if cls.verbose > 0:
+            if len(out) > 1:
+                print YELLOW + out + END
+        ## @var p
+        #  Object variable to store file descriptor of vpp_api_test subprocess
+        #  with open pipes to the standard output, inputs and error streams.
+        ## @var out
+        #  Tuple variable to store standard output of vpp_api_test subprocess
+        #  where the string "vat# " is replaced by empty string later.
+
+    ## Class method to create incoming packet stream for the packet-generator
+    #  interface.
+    #  Delete old /tmp/pgX_in.pcap file if exists and create the empty one and
+    #  fill it with provided packets and add it to pg_streams list.
+    #  @param cls The class pointer.
+    #  @param i Integer variable to store the index of the packet-generator
+    #  interface to create packet stream for.
+    #  @param pkts List variable to store packets to be added to the stream.
+    @classmethod
+    def pg_add_stream(cls, i, pkts):
+        os.system("sudo rm -f /tmp/pg%u_in.pcap" % i)
+        wrpcap("/tmp/pg%u_in.pcap" % i, pkts)
+        # no equivalent API command
+        cls.cli(0, "packet-generator new pcap /tmp/pg%u_in.pcap source pg%u"
+                   " name pcap%u" % (i, i, i))
+        cls.pg_streams.append('pcap%u' % i)
+
+    ## Class method to enable packet capturing for the packet-generator
+    #  interface.
+    #  Delete old /tmp/pgX_out.pcap file if exists and set the packet-generator
+    #  to capture outgoing packets to /tmp/pgX_out.pcap file.
+    #  @param cls The class pointer.
+    #  @param args List variable to store the indexes of the packet-generator
+    #  interfaces to start packet capturing for.
+    @classmethod
+    def pg_enable_capture(cls, args):
+        for i in args:
+            os.system("sudo rm -f /tmp/pg%u_out.pcap" % i)
+            cls.cli(0, "packet-generator capture pg%u pcap /tmp/pg%u_out.pcap"
+                    % (i, i))
+
+    ## Class method to start packet sending.
+    #  Start to send packets for all defined pg streams. Delete every stream
+    #  from the stream list when sent and clear the pg_streams list.
+    #  @param cls The class pointer.
+    @classmethod
+    def pg_start(cls):
+        cls.cli(2, "trace add pg-input 50")  # 50 is maximum
+        cls.cli(0, 'packet-generator enable')
+        for stream in cls.pg_streams:
+            cls.cli(0, 'packet-generator delete %s' % stream)
+        cls.pg_streams = []
+
+    ## Class method to return captured packets.
+    #  Return packet captured for the defined packet-generator interface. Open
+    #  the corresponding pcap file (/tmp/pgX_out.pcap), read the content and
+    #  store captured packets to output variable.
+    #  @param cls The class pointer.
+    #  @param o Integer variable to store the index of the packet-generator
+    #  interface.
+    #  @return output List of packets captured on the defined packet-generator
+    #  interface. If the corresponding pcap file (/tmp/pgX_out.pcap) does not
+    #  exist return empty list.
+    @classmethod
+    def pg_get_capture(cls, o):
+        pcap_filename = "/tmp/pg%u_out.pcap" % o
+        try:
+            output = rdpcap(pcap_filename)
+        except IOError:  # TODO
+            cls.log("WARNING: File %s does not exist, probably because no"
+                    " packets arrived" % pcap_filename)
+            return []
+        return output
+        ## @var pcap_filename
+        #  File descriptor to the corresponding pcap file.
+
+    ## Class method to create packet-generator interfaces.
+    #  Create packet-generator interfaces and add host MAC addresses connected
+    #  to these packet-generator interfaces to the MY_MACS dictionary.
+    #  @param cls The class pointer.
+    #  @param args List variable to store the indexes of the packet-generator
+    #  interfaces to be created.
+    @classmethod
+    def create_interfaces(cls, args):
+        for i in args:
+            cls.MY_MACS[i] = "02:00:00:00:ff:%02x" % i
+            cls.log("My MAC address is %s" % (cls.MY_MACS[i]))
+            cls.api("pg_create_interface if_id %u" % i)
+            cls.api("sw_interface_set_flags pg%u admin-up" % i)
+
+    ## Static method to extend packet to specified size
+    #  Extend provided packet to the specified size (including Ethernet FCS).
+    #  The packet is extended by adding corresponding number of spaces to the
+    #  packet payload.
+    #  NOTE: Currently works only when Raw layer is present.
+    #  @param packet Variable to store packet object.
+    #  @param size Integer variable to store the required size of the packet.
+    @staticmethod
+    def extend_packet(packet, size):
+        packet_len = len(packet) + 4
+        extend = size - packet_len
+        if extend > 0:
+            packet[Raw].load += ' ' * extend
+        ## @var packet_len
+        #  Integer variable to store the current packet length including
+        #  Ethernet FCS.
+        ## @var extend
+        #  Integer variable to store the size of the packet extension.
+
+    ## Method to add packet info object to the packet_infos list.
+    #  Extend the existing packet_infos list with the given information from
+    #  the packet.
+    #  @param self The object pointer.
+    #  @param info Object to store required information from the packet.
+    def add_packet_info_to_list(self, info):
+        info.index = len(self.packet_infos)
+        self.packet_infos[info.index] = info
+        ## @var info.index
+        # Info object attribute to store the packet order in the stream.
+        ## @var packet_infos
+        #  List variable to store required information from packets.
+
+    ## Method to create packet info object.
+    #  Create the existing packet_infos list with the given information from
+    #  the packet.
+    #  @param self The object pointer.
+    #  @param pg_id Integer variable to store the index of the packet-generator
+    #  interface.
+    def create_packet_info(self, pg_id, target_id):
+        info = _PacketInfo()
+        self.add_packet_info_to_list(info)
+        info.src = pg_id
+        info.dst = target_id
+        return info
+        ## @var info
+        #  Object to store required information from packet.
+        ## @var info.src
+        #  Info object attribute to store the index of the source packet
+        #  generator interface of the packet.
+        ## @var info.dst
+        #  Info object attribute to store the index of the destination packet
+        #  generator interface of the packet.
+
+    ## Static method to return packet info string.
+    #  Create packet info string from the provided info object that will be put
+    #  to the packet payload.
+    #  @param info Object to store required information from the packet.
+    #  @return String of information about packet's order in the stream, source
+    #  and destination packet generator interface.
+    @staticmethod
+    def info_to_payload(info):
+        return "%d %d %d" % (info.index, info.src, info.dst)
+
+    ## Static method to create packet info object from the packet payload.
+    #  Create packet info object and set its attribute values based on data
+    #  gained from the packet payload.
+    #  @param payload String variable to store packet payload.
+    #  @return info Object to store required information about the packet.
+    @staticmethod
+    def payload_to_info(payload):
+        numbers = payload.split()
+        info = _PacketInfo()
+        info.index = int(numbers[0])
+        info.src = int(numbers[1])
+        info.dst = int(numbers[2])
+        return info
+        ## @var info.index
+        #  Info object attribute to store the packet order in the stream.
+        ## @var info.src
+        #  Info object attribute to store the index of the source packet
+        #  generator interface of the packet.
+        ## @var info.dst
+        #  Info object attribute to store the index of the destination packet
+        #  generator interface of the packet.
+
+    ## Method to return packet info object of the next packet in
+    #  the packet_infos list.
+    #  Get the next packet info object from the packet_infos list by increasing
+    #  the packet_infos list index by one.
+    #  @param self The object pointer.
+    #  @param info Object to store required information about the packet.
+    #  @return packet_infos[next_index] Next info object from the packet_infos
+    #  list with stored information about packets. Return None if the end of
+    #  the list is reached.
+    def get_next_packet_info(self, info):
+        if info is None:
+            next_index = 0
+        else:
+            next_index = info.index + 1
+        if next_index == len(self.packet_infos):
+            return None
+        else:
+            return self.packet_infos[next_index]
+        ## @var next_index
+        #  Integer variable to store the index of the next info object.
+
+    ## Method to return packet info object of the next packet with the required
+    #  source packet generator interface.
+    #  Iterate over the packet_infos list and search for the next packet info
+    #  object with the required source packet generator interface.
+    #  @param self The object pointer.
+    #  @param src_pg Integer variable to store index of requested source packet
+    #  generator interface.
+    #  @param info Object to store required information about the packet.
+    #  @return packet_infos[next_index] Next info object from the packet_infos
+    #  list with stored information about packets. Return None if the end of
+    #  the list is reached.
+    def get_next_packet_info_for_interface(self, src_pg, info):
+        while True:
+            info = self.get_next_packet_info(info)
+            if info is None:
+                return None
+            if info.src == src_pg:
+                return info
+        ## @var info.src
+        #  Info object attribute to store the index of the source packet
+        #  generator interface of the packet.
+
+    ## Method to return packet info object of the next packet with required
+    #  source and destination packet generator interfaces.
+    #  Search for the next packet info object with the required source and
+    #  destination packet generator interfaces.
+    #  @param self The object pointer.
+    #  @param src_pg Integer variable to store the index of the requested source
+    #  packet generator interface.
+    #  @param dst_pg Integer variable to store the index of the requested source
+    #  packet generator interface.
+    #  @param info Object to store required information about the packet.
+    #  @return info Object with the info about the next packet with with
+    #  required source and destination packet generator interfaces. Return None
+    #  if there is no other packet with required data.
+    def get_next_packet_info_for_interface2(self, src_pg, dst_pg, info):
+        while True:
+            info = self.get_next_packet_info_for_interface(src_pg, info)
+            if info is None:
+                return None
+            if info.dst == dst_pg:
+                return info
+        ## @var info.dst
+        #  Info object attribute to store the index of the destination packet
+        #  generator interface of the packet.
+
+
+## Subclass of the python unittest.TestResult class.
+#
+#  This subclass provides methods to compile information about which tests have
+#  succeeded and which have failed.
+class VppTestResult(unittest.TestResult):
+    ## The constructor.
+    #  @param stream File descriptor to store where to report test results. Set
+    #  to the standard error stream by default.
+    #  @param descriptions Boolean variable to store information if to use test
+    #  case descriptions.
+    #  @param verbosity Integer variable to store required verbosity level.
+    def __init__(self, stream, descriptions, verbosity):
+        unittest.TestResult.__init__(self, stream, descriptions, verbosity)
+        self.stream = stream
+        self.descriptions = descriptions
+        self.verbosity = verbosity
+        self.result_string = None
+        ## @var result_string
+        #  String variable to store the test case result string.
+
+
+    ## Method called when the test case succeeds.
+    #  Run the default implementation (that does nothing) and set the result
+    #  string in case of test case success.
+    #  @param self The object pointer.
+    #  @param test Object variable to store the test case instance.
+    def addSuccess(self, test):
+        unittest.TestResult.addSuccess(self, test)
+        self.result_string = GREEN + "OK" + END
+        ## @var result_string
+        #  String variable to store the test case result string.
+
+    ## Method called when the test case signals a failure.
+    #  Run the default implementation that appends a tuple (test, formatted_err)
+    #  to the instance's failures attribute, where formatted_err is a formatted
+    #  traceback derived from err and set the result string in case of test case
+    #  success.
+    #  @param self The object pointer.
+    #  @param test Object variable to store the test case instance.
+    #  @param err Tuple variable to store the error data:
+    #  (type, value, traceback).
+    def addFailure(self, test, err):
+        unittest.TestResult.addFailure(self, test, err)
+        self.result_string = RED + "FAIL" + END
+        ## @var result_string
+        #  String variable to store the test case result string.
+
+    ## Method called when the test case raises an unexpected exception.
+    #  Run the default implementation that appends a tuple (test, formatted_err)
+    #  to the instance's error attribute, where formatted_err is a formatted
+    #  traceback derived from err and set the result string in case of test case
+    #  unexpected failure.
+    #  @param self The object pointer.
+    #  @param test Object variable to store the test case instance.
+    #  @param err Tuple variable to store the error data:
+    #  (type, value, traceback).
+    def addError(self, test, err):
+        unittest.TestResult.addError(self, test, err)
+        self.result_string = RED + "ERROR" + END
+        ## @var result_string
+        #  String variable to store the test case result string.
+
+    ## Method to get the description of the test case.
+    #  Used to get the description string from the test case object.
+    #  @param self The object pointer.
+    #  @param test Object variable to store the test case instance.
+    #  @return String of the short description if exist otherwise return test
+    #  case name string.
+    def getDescription(self, test):
+        # TODO: if none print warning not raise exception
+        short_description = test.shortDescription()
+        if self.descriptions and short_description:
+            return short_description
+        else:
+            return str(test)
+        ## @var short_description
+        #  String variable to store the short description of the test case.
+
+    ## Method called when the test case is about to be run.
+    #  Run the default implementation and based on the set verbosity level write
+    #  the starting string to the output stream.
+    #  @param self The object pointer.
+    #  @param test Object variable to store the test case instance.
+    def startTest(self, test):
+        unittest.TestResult.startTest(self, test)
+        if self.verbosity > 0:
+            self.stream.writeln("Starting " + self.getDescription(test) + " ...")
+            self.stream.writeln("------------------------------------------------------------------")
+
+    ## Method called after the test case has been executed.
+    #  Run the default implementation and based on the set verbosity level write
+    #  the result string to the output stream.
+    #  @param self The object pointer.
+    #  @param test Object variable to store the test case instance.
+    def stopTest(self, test):
+        unittest.TestResult.stopTest(self, test)
+        if self.verbosity > 0:
+            self.stream.writeln("------------------------------------------------------------------")
+            self.stream.writeln("%-60s%s" % (self.getDescription(test), self.result_string))
+            self.stream.writeln("------------------------------------------------------------------")
+        else:
+            self.stream.writeln("%-60s%s" % (self.getDescription(test), self.result_string))
+
+    ## Method to write errors and failures information to the output stream.
+    #  Write content of errors and failures lists to the output stream.
+    #  @param self The object pointer.
+    def printErrors(self):
+        self.stream.writeln()
+        self.printErrorList('ERROR', self.errors)
+        self.printErrorList('FAIL', self.failures)
+        ## @var errors
+        #  List variable containing 2-tuples of TestCase instances and strings
+        #  holding formatted tracebacks. Each tuple represents a test which
+        #  raised an unexpected exception.
+        ## @var failures
+        #  List variable containing 2-tuples of TestCase instances and strings
+        #  holding formatted tracebacks. Each tuple represents a test where
+        #  a failure was explicitly signalled using the TestCase.assert*()
+        #  methods.
+
+    ## Method to write the error information to the output stream.
+    #  Write content of error lists to the output stream together with error
+    #  type and test case description.
+    #  @param self The object pointer.
+    #  @param flavour String variable to store error type.
+    #  @param errors List variable to store 2-tuples of TestCase instances and
+    #  strings holding formatted tracebacks.
+    def printErrorList(self, flavour, errors):
+        for test, err in errors:
+            self.stream.writeln('=' * 70)
+            self.stream.writeln("%s: %s" % (flavour, self.getDescription(test)))
+            self.stream.writeln('-' * 70)
+            self.stream.writeln("%s" % err)
+        ## @var test
+        #  Object variable to store the test case instance.
+        ## @var err
+        #  String variable to store formatted tracebacks.
+
+
+## Subclass of the python unittest.TextTestRunner class.
+#
+#  A basic test runner implementation which prints results on standard error.
+class VppTestRunner(unittest.TextTestRunner):
+    ##  Class object variable to store the results of a set of tests.
+    resultclass = VppTestResult
+
+    ## Method to run the test.
+    #  Print debug message in the terminal and run the standard run() method
+    #  of the test runner collecting the result into the test result object.
+    #  @param self The object pointer.
+    #  @param test Object variable to store the test case instance.
+    #  @return Test result object of the VppTestRunner.
+    def run(self, test):
+        print "Running tests using custom test runner"  # debug message
+        return super(VppTestRunner, self).run(test)
diff --git a/test/run_tests.py b/test/run_tests.py
new file mode 100644
index 00000000..8f2174b1
--- /dev/null
+++ b/test/run_tests.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+import os
+import unittest
+from framework import VppTestRunner
+
+if __name__ == '__main__':
+    try:
+        verbose = int(os.getenv("V", 0))
+    except:
+        verbose = 0
+    unittest.main(testRunner=VppTestRunner, module=None, verbosity=verbose)
diff --git a/test/scapy_handlers/__init__.py b/test/scapy_handlers/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/test/scapy_handlers/vxlan.py b/test/scapy_handlers/vxlan.py
new file mode 100644
index 00000000..bf86f179
--- /dev/null
+++ b/test/scapy_handlers/vxlan.py
@@ -0,0 +1,17 @@
+from scapy.fields import BitField, XByteField, X3BytesField
+from scapy.packet import Packet, bind_layers
+from scapy.layers.l2 import Ether
+from scapy.layers.inet import UDP
+
+
+class VXLAN(Packet):
+    name = "VXLAN"
+    fields_desc = [BitField("flags", 0x08000000, 32),
+                   X3BytesField("vni", 0),
+                   XByteField("reserved", 0x00)]
+
+    def mysummary(self):
+        return self.sprintf("VXLAN (vni=%VXLAN.vni%)")
+
+bind_layers(UDP, VXLAN, dport=4789)
+bind_layers(VXLAN, Ether)
diff --git a/test/template_bd.py b/test/template_bd.py
new file mode 100644
index 00000000..473c4228
--- /dev/null
+++ b/test/template_bd.py
@@ -0,0 +1,106 @@
+#!/usr/bin/env python
+
+from abc import abstractmethod
+
+from scapy.layers.l2 import Ether, Raw
+from scapy.layers.inet import IP, UDP
+
+
+class BridgeDomain(object):
+    def __init__(self):
+        ## Ethernet frame which is send to pg0 interface and is forwarded to pg1
+        self.payload_0_1 = (
+            Ether(src='00:00:00:00:00:01', dst='00:00:00:00:00:02') /
+            IP(src='1.2.3.4', dst='4.3.2.1') /
+            UDP(sport=10000, dport=20000) /
+            Raw('\xa5' * 100))
+
+        ## Ethernet frame which is send to pg1 interface and is forwarded to pg0
+        self.payload_1_0 = (
+            Ether(src='00:00:00:00:00:02', dst='00:00:00:00:00:01') /
+            IP(src='4.3.2.1', dst='1.2.3.4') /
+            UDP(sport=20000, dport=10000) /
+            Raw('\xa5' * 100))
+
+    ## Test case must implement this method, so template known how to send
+    #  encapsulated frame.
+    @abstractmethod
+    def encapsulate(self, pkt):
+        pass
+
+    ## Test case must implement this method, so template known how to get
+    #  original payload.
+    @abstractmethod
+    def decapsulate(self, pkt):
+        pass
+
+    ## Test case must implement this method, so template known how if the
+    #  received frame is corectly encapsulated.
+    @abstractmethod
+    def check_encapsulation(self, pkt):
+        pass
+
+    ## On pg0 interface are encapsulated frames, on pg1 are testing frames
+    #  without encapsulation
+    def test_decap(self):
+        ## Prepare Ethernet frame that will be send encapsulated.
+        pkt_to_send = self.encapsulate(self.payload_0_1)
+
+        ## Add packet to list of packets.
+        self.pg_add_stream(0, [pkt_to_send, ])
+
+        ## Enable Packet Capture on both ports.
+        self.pg_enable_capture([0, 1])
+
+        ## Start all streams
+        self.pg_start()
+
+        ## Pick first received frame and check if is same as non-encapsulated
+        #  frame.
+        out = self.pg_get_capture(1)
+        self.assertEqual(len(out), 1,
+                         'Invalid number of packets on '
+                         'output: {}'.format(len(out)))
+        pkt = out[0]
+
+        # TODO: add error messages
+        self.assertEqual(pkt[Ether].src, self.payload_0_1[Ether].src)
+        self.assertEqual(pkt[Ether].dst, self.payload_0_1[Ether].dst)
+        self.assertEqual(pkt[IP].src, self.payload_0_1[IP].src)
+        self.assertEqual(pkt[IP].dst, self.payload_0_1[IP].dst)
+        self.assertEqual(pkt[UDP].sport, self.payload_0_1[UDP].sport)
+        self.assertEqual(pkt[UDP].dport, self.payload_0_1[UDP].dport)
+        self.assertEqual(pkt[Raw], self.payload_0_1[Raw])
+
+    ## Send non-encapsulated Ethernet frame from pg1 interface and expect
+    #  encapsulated frame on pg0. On pg0 interface are encapsulated frames,
+    #  on pg1 are testing frames without encapsulation.
+    def test_encap(self):
+        ## Create packet generator stream.
+        self.pg_add_stream(1, [self.payload_1_0])
+
+        ## Enable Packet Capture on both ports.
+        self.pg_enable_capture([0, 1])
+
+        ## Start all streams.
+        self.pg_start()
+
+        ## Pick first received frame and check if is corectly encapsulated.
+        out = self.pg_get_capture(0)
+        self.assertEqual(len(out), 1,
+                         'Invalid number of packets on '
+                         'output: {}'.format(len(out)))
+        rcvd = out[0]
+        self.check_encapsulation(rcvd)
+
+        ## Get original frame from received packet and check if is same as
+        #  sended frame.
+        rcvd_payload = self.decapsulate(rcvd)
+        # TODO: add error messages
+        self.assertEqual(rcvd_payload[Ether].src, self.payload_1_0[Ether].src)
+        self.assertEqual(rcvd_payload[Ether].dst, self.payload_1_0[Ether].dst)
+        self.assertEqual(rcvd_payload[IP].src, self.payload_1_0[IP].src)
+        self.assertEqual(rcvd_payload[IP].dst, self.payload_1_0[IP].dst)
+        self.assertEqual(rcvd_payload[UDP].sport, self.payload_1_0[UDP].sport)
+        self.assertEqual(rcvd_payload[UDP].dport, self.payload_1_0[UDP].dport)
+        self.assertEqual(rcvd_payload[Raw], self.payload_1_0[Raw])
diff --git a/test/test_infra.md b/test/test_infra.md
new file mode 100644
index 00000000..371d48b0
--- /dev/null
+++ b/test/test_infra.md
@@ -0,0 +1,145 @@
+# VPP Functional Test Infra
+
+## Running VPP tests
+VPP functional tests are triggered by `make test` command run in the git vpp source directory. Following Linux environment variables are used by the current VPP functional test infrastructure:
+
+- `TEST=<name>` - run only specific test identified by filename `test/test_<name>.py`
+-  `V=[0|1|2]` - set verbosity level. `0` for minimal verbosity, `1` for increased verbosity, `2` for maximum verbosity. Default value is 0.
+
+Example of running tests:
+
+```
+~/src/vpp-test-infra$ make test V=1 TEST=vxlan
+```
+
+All tests listed in `test/` directory are run by default. To run selected tests you can set variable TEST when starting tests.
+
+## Overview
+The main functionality of the test framework is defined in [framework.py](test/framework.py) file. The implementation of the test framework uses classes and methods from Python module *unittest*.
+
+Three main classes are defined to support the overall test automation:
+
+* **class VppTestCase(unittest.TestCase)** - a sub-class of *unittest.TestCase* class. Provides methods to create and run test case. These methods can be divided into 5 groups:
+    1. Methods to control test case setup and tear down:
+        * *def setUpConstants(cls):*
+        * *def setUpClass(cls):*
+        * *def quit(cls):*
+        * *def tearDownClass(cls):*
+        * *def tearDown(self):*
+        * *def setUp(self):*
+
+    2. Methods to create VPP packet generator interfaces:
+        * *def create_interfaces(cls, args):*
+
+    3. Methods to execute VPP commands and print logs in the output (terminal for now):
+        * *def log(cls, s, v=1):*
+        * *def api(cls, s):*
+        * *def cli(cls, v, s):*
+
+    4. Methods to control packet stream generation and capturing:
+        * *def pg_add_stream(cls, i, pkts):*
+        * *def pg_enable_capture(cls, args):*
+        * *def pg_start(cls):*
+        * *def pg_get_capture(cls, o):*
+
+    5. Methods to create and verify packets:
+        * *def extend_packet(packet, size):*
+        * *def add_packet_info_to_list(self, info):*
+        * *def create_packet_info(self, pg_id, target_id):*
+        * *def info_to_payload(info):*
+        * *def payload_to_info(payload):*
+        * *def get_next_packet_info(self, info):*
+        * *def get_next_packet_info_for_interface(self, src_pg, info):*
+        * *def get_next_packet_info_for_interface2(self, src_pg, dst_pg, info):*
+
+* **class VppTestResult(unittest.TestResult)** - a sub-class of *unittest.TestResult* class. Provides methods to compile information about the tests that have succeeded and the ones that have failed. These methods can be divided into 4 groups:
+    1. Processing test case result:
+        * *def addSuccess(self, test):*
+        * *def addFailure(self, test, err):*
+        * *def addError(self, test, err):*
+
+    2. Processing test case description:
+        * *def getDescription(self, test):*
+
+    3. Processing test case start and stop:
+        * *def startTest(self, test):*
+        * *def stopTest(self, test):*
+
+    4. Printing error and failure information:
+        * *def printErrors(self):*
+        * *def printErrorList(self, flavour, errors):*
+
+* **class VppTestRunner(unittest.TextTestRunner)** - a sub-class of *unittest.TextTestRunner* class. Provides basic test runner implementation that prints results on standard error stream. Contains one method:
+    * *def run(self, test):*
+
+In addition [util.py] (test/util.py) file defines number of common methods useful for many test cases. All of these methods are currently contained in one class:
+
+* **class Util(object)**:
+    * *def resolve_arp(cls, args):*
+    * *def resolve_icmpv6_nd(cls, args):*
+    * *def config_ip4(cls, args):*
+    * *def config_ip6(cls, args):*
+
+## Interaction with VPP
+VPP is started from command line as a sub-process during the test case setup phase. Command line attributes to start VPP are stored in class variable *vpp_cmdline*.
+To get an overview of VPP command line attributes, visit section [Command-line Arguments](https://wiki.fd.io/view/VPP/Command-line_Arguments) on VPP wiki page.
+
+Current VPP test infrastructure is using two ways to interact with VPP for configuration, operational status check, tracing and logging.
+
+### Using API commands
+API commands are executed by VPP API test tool that is started from command line as a sub-process. Command line attributes to start VPP API test tool are stored in class variable *vpp_api_test_cmdline*.
+When executed, API command and its possible output are printed in the terminal if verbosity level is greater then 0.
+
+Example:
+
+```
+cls.api("sw_interface_set_flags pg1 admin-up")
+```
+
+will print in the terminal
+
+```
+API: sw_interface_set_flags pg1 admin-up
+```
+
+### Using CLI commands
+CLI commands are executed via VPP API test tool by sending API command "*exec + cli_command*". It is possible to set verbosity level for executing specific CLI commands, so that the CLI command is executed only and only if its associated verbosity level is equal or lower then the verbosity level set in the system.
+
+Similarly to API commands, when executed, CLI command and its possible output are printed in the terminal if verbosity level is greater then 0.
+
+Example I - CLI command will be executed always (its verbosity is 0):
+
+```
+cls.cli(0, "show l2fib")
+```
+
+Example II - CLI command will be executed only if the verbosity level is set to 2:
+
+```
+self.cli(2, "show l2fib verbose")
+```
+
+## Logging
+It is possible to log some additional information in the terminal for different verbosity levels.
+
+Example I - verbosity level of the log is set to default value (0):
+
+```
+self.log("Verifying capture %u" % i)
+```
+
+will be always printed in the terminal:
+
+```
+LOG: Verifying capture 0
+```
+
+Example II - the log will be printed in the terminal only if the verbosity level is set to 2:
+
+```
+self.log("Got packet on port %u: src=%u (id=%u)"
+                         % (o, payload_info.src, payload_info.index), 2)
+```
+
+---
+***END***
diff --git a/test/test_ip.py b/test/test_ip.py
new file mode 100644
index 00000000..3a2c9011
--- /dev/null
+++ b/test/test_ip.py
@@ -0,0 +1,261 @@
+#!/usr/bin/env python
+
+import logging
+logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
+
+import unittest
+from framework import VppTestCase, VppTestRunner
+from util import Util
+
+from scapy.packet import Raw
+from scapy.layers.l2 import Ether, ARP, Dot1Q
+from scapy.layers.inet import IP, UDP
+
+
+class TestIPv4(Util, VppTestCase):
+    """ IPv4 Test Case """
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestIPv4, cls).setUpClass()
+
+        try:
+            cls.create_interfaces_and_subinterfaces()
+
+            # configure IPv4 on hardware interfaces
+            cls.config_ip4(cls.interfaces)
+
+            cls.config_ip4_on_software_interfaces(cls.interfaces)
+
+            # resolve ARP using hardware interfaces
+            cls.resolve_arp(cls.interfaces)
+
+            # let VPP know MAC addresses of peer (sub)interfaces
+            cls.resolve_arp_on_software_interfaces(cls.interfaces)
+
+            # config 2M FIB enries
+            cls.config_fib_entries(2000000)
+
+        except Exception as e:
+            super(TestIPv4, cls).tearDownClass()
+            raise
+
+    def tearDown(self):
+        self.cli(2, "show int")
+        self.cli(2, "show trace")
+        self.cli(2, "show hardware")
+        self.cli(2, "show ip arp")
+        # self.cli(2, "show ip fib")  # 2M entries
+        self.cli(2, "show error")
+        self.cli(2, "show run")
+
+    @classmethod
+    def create_vlan_subif(cls, pg_index, vlan):
+        cls.api("create_vlan_subif pg%u vlan %u" % (pg_index, vlan))
+
+    @classmethod
+    def create_dot1ad_subif(cls, pg_index, sub_id, outer_vlan_id, inner_vlan_id):
+        cls.api("create_subif pg%u sub_id %u outer_vlan_id %u inner_vlan_id %u dot1ad"
+                 % (pg_index, sub_id, outer_vlan_id, inner_vlan_id))
+
+    class SoftInt(object):
+        pass
+
+    class HardInt(SoftInt):
+        pass
+
+    class Subint(SoftInt):
+        def __init__(self, sub_id):
+            self.sub_id = sub_id
+
+    class Dot1QSubint(Subint):
+        def __init__(self, sub_id, vlan=None):
+            if vlan is None:
+                vlan = sub_id
+            super(TestIPv4.Dot1QSubint, self).__init__(sub_id)
+            self.vlan = vlan
+
+    class Dot1ADSubint(Subint):
+        def __init__(self, sub_id, outer_vlan, inner_vlan):
+            super(TestIPv4.Dot1ADSubint, self).__init__(sub_id)
+            self.outer_vlan = outer_vlan
+            self.inner_vlan = inner_vlan
+
+    @classmethod
+    def create_interfaces_and_subinterfaces(cls):
+        cls.interfaces = range(3)
+
+        cls.create_interfaces(cls.interfaces)
+
+        # Make vpp_api_test see interfaces created using debug CLI (in function create_interfaces)
+        cls.api("sw_interface_dump")
+
+        cls.INT_DETAILS = dict()
+
+        cls.INT_DETAILS[0] = cls.HardInt()
+
+        cls.INT_DETAILS[1] = cls.Dot1QSubint(100)
+        cls.create_vlan_subif(1, cls.INT_DETAILS[1].vlan)
+
+        # FIXME: Wrong packet format/wrong layer on output of interface 2
+        #self.INT_DETAILS[2] = self.Dot1ADSubint(10, 200, 300)
+        #self.create_dot1ad_subif(2, self.INT_DETAILS[2].sub_id, self.INT_DETAILS[2].outer_vlan, self.INT_DETAILS[2].inner_vlan)
+
+        # Use dor1q for now
+        cls.INT_DETAILS[2] = cls.Dot1QSubint(200)
+        cls.create_vlan_subif(2, cls.INT_DETAILS[2].vlan)
+
+        for i in cls.interfaces:
+            det = cls.INT_DETAILS[i]
+            if isinstance(det, cls.Subint):
+                cls.api("sw_interface_set_flags pg%u.%u admin-up" % (i, det.sub_id))
+
+    # IP adresses on subinterfaces
+    MY_SOFT_IP4S = {}
+    VPP_SOFT_IP4S = {}
+
+    @classmethod
+    def config_ip4_on_software_interfaces(cls, args):
+        for i in args:
+            cls.MY_SOFT_IP4S[i] = "172.17.%u.2" % i
+            cls.VPP_SOFT_IP4S[i] = "172.17.%u.1" % i
+            if isinstance(cls.INT_DETAILS[i], cls.Subint):
+                interface = "pg%u.%u" % (i, cls.INT_DETAILS[i].sub_id)
+            else:
+                interface = "pg%u" % i
+            cls.api("sw_interface_add_del_address %s %s/24" % (interface, cls.VPP_SOFT_IP4S[i]))
+            cls.log("My subinterface IPv4 address is %s" % (cls.MY_SOFT_IP4S[i]))
+
+    # let VPP know MAC addresses of peer (sub)interfaces
+    @classmethod
+    def resolve_arp_on_software_interfaces(cls, args):
+        for i in args:
+            ip = cls.VPP_SOFT_IP4S[i]
+            cls.log("Sending ARP request for %s on port %u" % (ip, i))
+            packet = (Ether(dst="ff:ff:ff:ff:ff:ff", src=cls.MY_MACS[i]) /
+                      ARP(op=ARP.who_has, pdst=ip, psrc=cls.MY_SOFT_IP4S[i], hwsrc=cls.MY_MACS[i]))
+
+            cls.add_dot1_layers(i, packet)
+
+            cls.pg_add_stream(i, packet)
+            cls.pg_enable_capture([i])
+
+            cls.cli(2, "trace add pg-input 1")
+            cls.pg_start()
+
+            # We don't need to read output
+
+    @classmethod
+    def config_fib_entries(cls, count):
+        n_int = len(cls.interfaces)
+        for i in cls.interfaces:
+            cls.api("ip_add_del_route 10.0.0.1/32 via %s count %u" % (cls.VPP_SOFT_IP4S[i], count / n_int))
+
+    @classmethod
+    def add_dot1_layers(cls, i, packet):
+        assert(type(packet) is Ether)
+        payload = packet.payload
+        det = cls.INT_DETAILS[i]
+        if isinstance(det, cls.Dot1QSubint):
+            packet.remove_payload()
+            packet.add_payload(Dot1Q(vlan=det.sub_id) / payload)
+        elif isinstance(det, cls.Dot1ADSubint):
+            packet.remove_payload()
+            packet.add_payload(Dot1Q(vlan=det.outer_vlan) / Dot1Q(vlan=det.inner_vlan) / payload)
+            packet.type = 0x88A8
+
+    def remove_dot1_layers(self, i, packet):
+        self.assertEqual(type(packet), Ether)
+        payload = packet.payload
+        det = self.INT_DETAILS[i]
+        if isinstance(det, self.Dot1QSubint):
+            self.assertEqual(type(payload), Dot1Q)
+            self.assertEqual(payload.vlan, self.INT_DETAILS[i].vlan)
+            payload = payload.payload
+        elif isinstance(det, self.Dot1ADSubint):  # TODO: change 88A8 type
+            self.assertEqual(type(payload), Dot1Q)
+            self.assertEqual(payload.vlan, self.INT_DETAILS[i].outer_vlan)
+            payload = payload.payload
+            self.assertEqual(type(payload), Dot1Q)
+            self.assertEqual(payload.vlan, self.INT_DETAILS[i].inner_vlan)
+            payload = payload.payload
+        packet.remove_payload()
+        packet.add_payload(payload)
+
+    def create_stream(self, pg_id):
+        pg_targets = [None] * 3
+        pg_targets[0] = [1, 2]
+        pg_targets[1] = [0, 2]
+        pg_targets[2] = [0, 1]
+        pkts = []
+        for i in range(0, 257):
+            target_pg_id = pg_targets[pg_id][i % 2]
+            info = self.create_packet_info(pg_id, target_pg_id)
+            payload = self.info_to_payload(info)
+            p = (Ether(dst=self.VPP_MACS[pg_id], src=self.MY_MACS[pg_id]) /
+                 IP(src=self.MY_SOFT_IP4S[pg_id], dst=self.MY_SOFT_IP4S[target_pg_id]) /
+                 UDP(sport=1234, dport=1234) /
+                 Raw(payload))
+            info.data = p.copy()
+            self.add_dot1_layers(pg_id, p)
+            if not isinstance(self.INT_DETAILS[pg_id], self.Subint):
+                packet_sizes = [64, 512, 1518, 9018]
+            else:
+                packet_sizes = [64, 512, 1518+4, 9018+4]
+            size = packet_sizes[(i / 2) % len(packet_sizes)]
+            self.extend_packet(p, size)
+            pkts.append(p)
+        return pkts
+
+    def verify_capture(self, o, capture):
+        last_info = {}
+        for i in self.interfaces:
+            last_info[i] = None
+        for packet in capture:
+            self.remove_dot1_layers(o, packet)  # Check VLAN tags and Ethernet header
+            self.assertTrue(Dot1Q not in packet)
+            try:
+                ip = packet[IP]
+                udp = packet[UDP]
+                payload_info = self.payload_to_info(str(packet[Raw]))
+                packet_index = payload_info.index
+                src_pg = payload_info.src
+                dst_pg = payload_info.dst
+                self.assertEqual(dst_pg, o)
+                self.log("Got packet on port %u: src=%u (id=%u)" % (o, src_pg, packet_index), 2)
+                next_info = self.get_next_packet_info_for_interface2(src_pg, dst_pg, last_info[src_pg])
+                last_info[src_pg] = next_info
+                self.assertTrue(next_info is not None)
+                self.assertEqual(packet_index, next_info.index)
+                saved_packet = next_info.data
+                # Check standard fields
+                self.assertEqual(ip.src, saved_packet[IP].src)
+                self.assertEqual(ip.dst, saved_packet[IP].dst)
+                self.assertEqual(udp.sport, saved_packet[UDP].sport)
+                self.assertEqual(udp.dport, saved_packet[UDP].dport)
+            except:
+                self.log("Unexpected or invalid packet:")
+                packet.show()
+                raise
+        for i in self.interfaces:
+            remaining_packet = self.get_next_packet_info_for_interface2(i, o, last_info[i])
+            self.assertTrue(remaining_packet is None, "Port %u: Packet expected from source %u didn't arrive" % (o, i))
+
+    def test_fib(self):
+        """ IPv4 FIB test """
+
+        for i in self.interfaces:
+            pkts = self.create_stream(i)
+            self.pg_add_stream(i, pkts)
+
+        self.pg_enable_capture(self.interfaces)
+        self.pg_start()
+
+        for i in self.interfaces:
+            out = self.pg_get_capture(i)
+            self.log("Verifying capture %u" % i)
+            self.verify_capture(i, out)
+
+
+if __name__ == '__main__':
+    unittest.main(testRunner = VppTestRunner)
diff --git a/test/test_ip6.py b/test/test_ip6.py
new file mode 100644
index 00000000..38808a9e
--- /dev/null
+++ b/test/test_ip6.py
@@ -0,0 +1,281 @@
+#!/usr/bin/env python
+
+import logging
+logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
+
+import unittest
+from framework import VppTestCase, VppTestRunner
+from util import Util
+
+from scapy.packet import Raw
+from scapy.layers.l2 import Ether, Dot1Q
+from scapy.layers.inet6 import (IPv6, UDP,
+    ICMPv6ND_NS, ICMPv6NDOptSrcLLAddr,
+    ICMPv6ND_NA, ICMPv6NDOptDstLLAddr)
+
+
+@unittest.skip('Not finished yet.\n')
+class TestIPv6(Util, VppTestCase):
+    """ IPv6 Test Case """
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestIPv6, cls).setUpClass()
+
+        try:
+            cls.create_interfaces_and_subinterfaces()
+
+            # configure IPv6 on hardware interfaces
+            cls.config_ip6(cls.interfaces)
+
+            cls.config_ip6_on_software_interfaces(cls.interfaces)
+
+            # resolve ICMPv6 ND using hardware interfaces
+            cls.resolve_icmpv6_nd(cls.interfaces)
+
+            # let VPP know MAC addresses of peer (sub)interfaces
+            # cls.resolve_icmpv6_nd_on_software_interfaces(cls.interfaces)
+            cls.send_neighbour_advertisement_on_software_interfaces(cls.interfaces)
+
+            # config 2M FIB enries
+            #cls.config_fib_entries(2000000)
+            cls.config_fib_entries(1000000)
+
+        except Exception as e:
+            super(TestIPv6, cls).tearDownClass()
+            raise
+
+    def tearDown(self):
+        self.cli(2, "show int")
+        self.cli(2, "show trace")
+        self.cli(2, "show hardware")
+        self.cli(2, "show ip arp")
+        # self.cli(2, "show ip fib")  # 2M entries
+        self.cli(2, "show error")
+        self.cli(2, "show run")
+
+    @classmethod
+    def create_vlan_subif(cls, pg_index, vlan):
+        cls.api("create_vlan_subif pg%u vlan %u" % (pg_index, vlan))
+
+    @classmethod
+    def create_dot1ad_subif(cls, pg_index, sub_id, outer_vlan_id, inner_vlan_id):
+        cls.api("create_subif pg%u sub_id %u outer_vlan_id %u inner_vlan_id %u dot1ad"
+                 % (pg_index, sub_id, outer_vlan_id, inner_vlan_id))
+
+    class SoftInt(object):
+        pass
+
+    class HardInt(SoftInt):
+        pass
+
+    class Subint(SoftInt):
+        def __init__(self, sub_id):
+            self.sub_id = sub_id
+
+    class Dot1QSubint(Subint):
+        def __init__(self, sub_id, vlan=None):
+            if vlan is None:
+                vlan = sub_id
+            super(TestIPv6.Dot1QSubint, self).__init__(sub_id)
+            self.vlan = vlan
+
+    class Dot1ADSubint(Subint):
+        def __init__(self, sub_id, outer_vlan, inner_vlan):
+            super(TestIPv6.Dot1ADSubint, self).__init__(sub_id)
+            self.outer_vlan = outer_vlan
+            self.inner_vlan = inner_vlan
+
+    @classmethod
+    def create_interfaces_and_subinterfaces(cls):
+        cls.interfaces = range(3)
+
+        cls.create_interfaces(cls.interfaces)
+
+        # Make vpp_api_test see interfaces created using debug CLI (in function create_interfaces)
+        cls.api("sw_interface_dump")
+
+        cls.INT_DETAILS = dict()
+
+        cls.INT_DETAILS[0] = cls.HardInt()
+
+        cls.INT_DETAILS[1] = cls.Dot1QSubint(100)
+        cls.create_vlan_subif(1, cls.INT_DETAILS[1].vlan)
+
+        # FIXME: Wrong packet format/wrong layer on output of interface 2
+        #self.INT_DETAILS[2] = self.Dot1ADSubint(10, 200, 300)
+        #self.create_dot1ad_subif(2, self.INT_DETAILS[2].sub_id, self.INT_DETAILS[2].outer_vlan, self.INT_DETAILS[2].inner_vlan)
+
+        # Use dor1q for now
+        cls.INT_DETAILS[2] = cls.Dot1QSubint(200)
+        cls.create_vlan_subif(2, cls.INT_DETAILS[2].vlan)
+
+        for i in cls.interfaces:
+            det = cls.INT_DETAILS[i]
+            if isinstance(det, cls.Subint):
+                cls.api("sw_interface_set_flags pg%u.%u admin-up" % (i, det.sub_id))
+
+    # IP adresses on subinterfaces
+    MY_SOFT_IP6S = {}
+    VPP_SOFT_IP6S = {}
+
+    @classmethod
+    def config_ip6_on_software_interfaces(cls, args):
+        for i in args:
+            cls.MY_SOFT_IP6S[i] = "fd01:%u::2" % i
+            cls.VPP_SOFT_IP6S[i] = "fd01:%u::1" % i
+            if isinstance(cls.INT_DETAILS[i], cls.Subint):
+                interface = "pg%u.%u" % (i, cls.INT_DETAILS[i].sub_id)
+            else:
+                interface = "pg%u" % i
+            cls.api("sw_interface_add_del_address %s %s/32" % (interface, cls.VPP_SOFT_IP6S[i]))
+            cls.log("My subinterface IPv6 address is %s" % (cls.MY_SOFT_IP6S[i]))
+
+    # let VPP know MAC addresses of peer (sub)interfaces
+    @classmethod
+    def resolve_icmpv6_nd_on_software_interfaces(cls, args):
+        for i in args:
+            ip = cls.VPP_SOFT_IP6S[i]
+            cls.log("Sending ICMPv6ND_NS request for %s on port %u" % (ip, i))
+            nd_req = (Ether(dst="ff:ff:ff:ff:ff:ff", src=cls.MY_MACS[i]) /
+                      IPv6(src=cls.MY_SOFT_IP6S[i], dst=ip) /
+                      ICMPv6ND_NS(tgt=ip) /
+                      ICMPv6NDOptSrcLLAddr(lladdr=cls.MY_MACS[i]))
+            cls.pg_add_stream(i, nd_req)
+            cls.pg_enable_capture([i])
+
+            cls.cli(2, "trace add pg-input 1")
+            cls.pg_start()
+
+            # We don't need to read output
+
+    # let VPP know MAC addresses of peer (sub)interfaces
+    @classmethod
+    def send_neighbour_advertisement_on_software_interfaces(cls, args):
+        for i in args:
+            ip = cls.VPP_SOFT_IP6S[i]
+            cls.log("Sending ICMPv6ND_NA message for %s on port %u" % (ip, i))
+            pkt = (Ether(dst="ff:ff:ff:ff:ff:ff", src=cls.MY_MACS[i]) /
+                   IPv6(src=cls.MY_SOFT_IP6S[i], dst=ip) /
+                   ICMPv6ND_NA(tgt=ip, R=0, S=0) /
+                   ICMPv6NDOptDstLLAddr(lladdr=cls.MY_MACS[i]))
+            cls.pg_add_stream(i, pkt)
+            cls.pg_enable_capture([i])
+
+            cls.cli(2, "trace add pg-input 1")
+            cls.pg_start()
+
+    @classmethod
+    def config_fib_entries(cls, count):
+        n_int = len(cls.interfaces)
+        for i in cls.interfaces:
+            cls.api("ip_add_del_route fd02::1/128 via %s count %u" % (cls.VPP_SOFT_IP6S[i], count / n_int))
+
+    @classmethod
+    def add_dot1_layers(cls, i, packet):
+        assert(type(packet) is Ether)
+        payload = packet.payload
+        det = cls.INT_DETAILS[i]
+        if isinstance(det, cls.Dot1QSubint):
+            packet.remove_payload()
+            packet.add_payload(Dot1Q(vlan=det.sub_id) / payload)
+        elif isinstance(det, cls.Dot1ADSubint):
+            packet.remove_payload()
+            packet.add_payload(Dot1Q(vlan=det.outer_vlan) / Dot1Q(vlan=det.inner_vlan) / payload)
+            packet.type = 0x88A8
+
+    def remove_dot1_layers(self, i, packet):
+        self.assertEqual(type(packet), Ether)
+        payload = packet.payload
+        det = self.INT_DETAILS[i]
+        if isinstance(det, self.Dot1QSubint):
+            self.assertEqual(type(payload), Dot1Q)
+            self.assertEqual(payload.vlan, self.INT_DETAILS[i].vlan)
+            payload = payload.payload
+        elif isinstance(det, self.Dot1ADSubint):  # TODO: change 88A8 type
+            self.assertEqual(type(payload), Dot1Q)
+            self.assertEqual(payload.vlan, self.INT_DETAILS[i].outer_vlan)
+            payload = payload.payload
+            self.assertEqual(type(payload), Dot1Q)
+            self.assertEqual(payload.vlan, self.INT_DETAILS[i].inner_vlan)
+            payload = payload.payload
+        packet.remove_payload()
+        packet.add_payload(payload)
+
+    def create_stream(self, pg_id):
+        pg_targets = [None] * 3
+        pg_targets[0] = [1, 2]
+        pg_targets[1] = [0, 2]
+        pg_targets[2] = [0, 1]
+        pkts = []
+        for i in range(0, 257):
+            target_pg_id = pg_targets[pg_id][i % 2]
+            info = self.create_packet_info(pg_id, target_pg_id)
+            payload = self.info_to_payload(info)
+            p = (Ether(dst=self.VPP_MACS[pg_id], src=self.MY_MACS[pg_id]) /
+                 IPv6(src=self.MY_SOFT_IP6S[pg_id], dst=self.MY_SOFT_IP6S[target_pg_id]) /
+                 UDP(sport=1234, dport=1234) /
+                 Raw(payload))
+            info.data = p.copy()
+            self.add_dot1_layers(pg_id, p)
+            if not isinstance(self.INT_DETAILS[pg_id], self.Subint):
+                packet_sizes = [76, 512, 1518, 9018]
+            else:
+                packet_sizes = [76, 512, 1518+4, 9018+4]
+            size = packet_sizes[(i / 2) % len(packet_sizes)]
+            self.extend_packet(p, size)
+            pkts.append(p)
+        return pkts
+
+    def verify_capture(self, o, capture):
+        last_info = {}
+        for i in self.interfaces:
+            last_info[i] = None
+        for packet in capture:
+            self.remove_dot1_layers(o, packet)  # Check VLAN tags and Ethernet header
+            self.assertTrue(Dot1Q not in packet)
+            try:
+                ip = packet[IPv6]
+                udp = packet[UDP]
+                payload_info = self.payload_to_info(str(packet[Raw]))
+                packet_index = payload_info.index
+                src_pg = payload_info.src
+                dst_pg = payload_info.dst
+                self.assertEqual(dst_pg, o)
+                self.log("Got packet on port %u: src=%u (id=%u)" % (o, src_pg, packet_index), 2)
+                next_info = self.get_next_packet_info_for_interface2(src_pg, dst_pg, last_info[src_pg])
+                last_info[src_pg] = next_info
+                self.assertTrue(next_info is not None)
+                self.assertEqual(packet_index, next_info.index)
+                saved_packet = next_info.data
+                # Check standard fields
+                self.assertEqual(ip.src, saved_packet[IPv6].src)
+                self.assertEqual(ip.dst, saved_packet[IPv6].dst)
+                self.assertEqual(udp.sport, saved_packet[UDP].sport)
+                self.assertEqual(udp.dport, saved_packet[UDP].dport)
+            except:
+                self.log("Unexpected or invalid packet:")
+                packet.show()
+                raise
+        for i in self.interfaces:
+            remaining_packet = self.get_next_packet_info_for_interface2(i, o, last_info[i])
+            self.assertTrue(remaining_packet is None, "Port %u: Packet expected from source %u didn't arrive" % (o, i))
+
+    def test_fib(self):
+        """ IPv6 FIB test """
+
+        for i in self.interfaces:
+            pkts = self.create_stream(i)
+            self.pg_add_stream(i, pkts)
+
+        self.pg_enable_capture(self.interfaces)
+        self.pg_start()
+
+        for i in self.interfaces:
+            out = self.pg_get_capture(i)
+            self.log("Verifying capture %u" % i)
+            self.verify_capture(i, out)
+
+
+if __name__ == '__main__':
+    unittest.main(testRunner = VppTestRunner)
diff --git a/test/test_l2bd.py b/test/test_l2bd.py
new file mode 100644
index 00000000..c2b73a4d
--- /dev/null
+++ b/test/test_l2bd.py
@@ -0,0 +1,473 @@
+#!/usr/bin/env python
+## @file test_l2bd.py
+#  Module to provide L2 bridge domain test case.
+#
+#  The module provides a set of tools for L2 bridge domain tests.
+
+import logging
+logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
+
+import unittest
+import random
+
+from framework import *
+from scapy.all import *
+
+
+## Subclass of the VppTestCase class.
+#
+#  This subclass is a class for L2 bridge domain test cases. It provides methods
+#  to create interfaces, configure L2 bridge domain, create and verify packet
+#  streams.
+class TestL2bd(VppTestCase):
+    """ L2BD Test Case """
+
+    ## Test variables
+    interf_nr = 3           # Number of interfaces
+    bd_id = 1               # Bridge domain ID
+    mac_entries = 100       # Number of MAC entries for bridge-domain to learn
+    dot1q_sub_id = 100      # SubID of dot1q sub-interface
+    dot1q_tag = 100         # VLAN tag for dot1q sub-interface
+    dot1ad_sub_id = 200     # SubID of dot1ad sub-interface
+    dot1ad_outer_tag = 200  # VLAN S-tag for dot1ad sub-interface
+    dot1ad_inner_tag = 300  # VLAN C-tag for dot1ad sub-interface
+    pkts_per_burst = 257    # Number of packets per burst
+
+    ## Class method to start the test case.
+    #  Overrides setUpClass method in VppTestCase class.
+    #  Python try..except statement is used to ensure that the tear down of
+    #  the class will be executed even if exception is raised.
+    #  @param cls The class pointer.
+    @classmethod
+    def setUpClass(cls):
+        super(TestL2bd, cls).setUpClass()
+
+        try:
+            ## Create interfaces and sub-interfaces
+            cls.create_interfaces_and_subinterfaces(TestL2bd.interf_nr)
+
+            ## Create BD with MAC learning enabled and put interfaces and
+            #  sub-interfaces to this BD
+            cls.api("bridge_domain_add_del bd_id %u learn 1" % TestL2bd.bd_id)
+            for i in cls.interfaces:
+                if isinstance(cls.INT_DETAILS[i], cls.Subint):
+                    interface = "pg%u.%u" % (i, cls.INT_DETAILS[i].sub_id)
+                else:
+                    interface = "pg%u" % i
+                cls.api("sw_interface_set_l2_bridge %s bd_id %u"
+                        % (interface, TestL2bd.bd_id))
+
+            ## Make the BD learn a number of MAC entries specified by the test
+            # variable <mac_entries>.
+            cls.create_mac_entries(TestL2bd.mac_entries)
+            cls.cli(0, "show l2fib")
+
+        except Exception as e:
+          super(TestL2bd, cls).tearDownClass()
+          raise e
+
+    ## Method to define tear down VPP actions of the test case.
+    #  Overrides tearDown method in VppTestCase class.
+    #  @param self The object pointer.
+    def tearDown(self):
+        self.cli(2, "show int")
+        self.cli(2, "show trace")
+        self.cli(2, "show hardware")
+        self.cli(2, "show l2fib verbose")
+        self.cli(2, "show error")
+        self.cli(2, "show run")
+        self.cli(2, "show bridge-domain 1 detail")
+
+    ## Class method to create VLAN sub-interface.
+    #  Uses VPP API command to create VLAN sub-interface.
+    #  @param cls The class pointer.
+    #  @param pg_index Integer variable to store the index of the packet
+    #  generator interface to create VLAN sub-interface on.
+    #  @param vlan_id Integer variable to store required VLAN tag value.
+    @classmethod
+    def create_vlan_subif(cls, pg_index, vlan_id):
+        cls.api("create_vlan_subif pg%u vlan %u" % (pg_index, vlan_id))
+
+    ## Class method to create dot1ad sub-interface.
+    #  Use VPP API command to create dot1ad sub-interface.
+    #  @param cls The class pointer.
+    #  @param pg_index Integer variable to store the index of the packet
+    #  generator interface to create dot1ad sub-interface on.
+    #  @param outer_vlan_id Integer variable to store required outer VLAN tag
+    #  value (S-TAG).
+    #  @param inner_vlan_id Integer variable to store required inner VLAN tag
+    #  value (C-TAG).
+    @classmethod
+    def create_dot1ad_subif(cls, pg_index, sub_id, outer_vlan_id,
+                            inner_vlan_id):
+        cls.api("create_subif pg%u sub_id %u outer_vlan_id %u inner_vlan_id"
+                " %u dot1ad" % (pg_index, sub_id, outer_vlan_id, inner_vlan_id))
+
+    ## Base class for interface.
+    #  To define object representation of the interface.
+    class Interface(object):
+        pass
+
+    ## Sub-class of the interface class.
+    #  To define object representation of the HW interface.
+    class HardInt(Interface):
+        pass
+
+    ## Sub-class of the interface class.
+    #  To define object representation of the SW interface.
+    class SoftInt(Interface):
+        pass
+
+    ## Sub-class of the SW interface class.
+    #  To represent the general sub-interface.
+    class Subint(SoftInt):
+        ## The constructor.
+        #  @param sub_id Integer variable to store sub-interface ID.
+        def __init__(self, sub_id):
+            self.sub_id = sub_id
+
+    ## Sub-class of the SW interface class.
+    #  To represent dot1q sub-interface.
+    class Dot1QSubint(Subint):
+        ## The constructor.
+        #  @param sub_id Integer variable to store sub-interface ID.
+        #  @param vlan Integer variable (optional) to store VLAN tag value. Set
+        #  to sub_id value when VLAN tag value not provided.
+        def __init__(self, sub_id, vlan=None):
+            if vlan is None:
+                vlan = sub_id
+            super(TestL2bd.Dot1QSubint, self).__init__(sub_id)
+            self.vlan = vlan
+
+    ## Sub-class of the SW interface class.
+    #  To represent dot1ad sub-interface.
+    class Dot1ADSubint(Subint):
+        ## The constructor.
+        #  @param sub_id Integer variable to store sub-interface ID.
+        #  @param outer_vlan Integer variable to store outer VLAN tag value.
+        #  @param inner_vlan Integer variable to store inner VLAN tag value.
+        def __init__(self, sub_id, outer_vlan, inner_vlan):
+            super(TestL2bd.Dot1ADSubint, self).__init__(sub_id)
+            self.outer_vlan = outer_vlan
+            self.inner_vlan = inner_vlan
+
+    ## Class method to create interfaces and sub-interfaces.
+    #  Current implementation: create three interfaces, then create Dot1Q
+    #  sub-interfaces for the second and the third interface with VLAN tags
+    #  equal to their sub-interface IDs. Set sub-interfaces status to admin-up.
+    #  @param cls The class pointer.
+    #  @param int_nr Integer variable to store the number of interfaces to be
+    #  created.
+    # TODO: Parametrize required numbers of dot1q and dot1ad to be created.
+    @classmethod
+    def create_interfaces_and_subinterfaces(cls, int_nr):
+        ## A class list variable to store interface indexes.
+        cls.interfaces = range(int_nr)
+
+        # Create interfaces
+        cls.create_interfaces(cls.interfaces)
+
+        # Make vpp_api_test see interfaces created using debug CLI (in function
+        # create_interfaces)
+        cls.api("sw_interface_dump")
+
+        ## A class dictionary variable to store data about interfaces.
+        #  First create an empty dictionary then store interface data there.
+        cls.INT_DETAILS = dict()
+
+        # 1st interface is untagged - no sub-interface required
+        cls.INT_DETAILS[0] = cls.HardInt()
+
+        # 2nd interface is dot1q tagged
+        cls.INT_DETAILS[1] = cls.Dot1QSubint(TestL2bd.dot1q_sub_id,
+                                             TestL2bd.dot1q_tag)
+        cls.create_vlan_subif(1, cls.INT_DETAILS[1].vlan)
+
+        # 3rd interface is dot1ad tagged
+        # FIXME: Wrong packet format/wrong layer on output of interface 2
+        #self.INT_DETAILS[2] = self.Dot1ADSubint(TestL2bd.dot1ad_sub_id, TestL2bd.dot1ad_outer_tag, TestL2bd.dot1ad_inner_tag)
+        #self.create_dot1ad_subif(2, self.INT_DETAILS[2].sub_id, self.INT_DETAILS[2].outer_vlan, self.INT_DETAILS[2].inner_vlan)
+
+        # Use dot1q for now.
+        cls.INT_DETAILS[2] = cls.Dot1QSubint(TestL2bd.dot1ad_sub_id,
+                                             TestL2bd.dot1ad_outer_tag)
+        cls.create_vlan_subif(2, cls.INT_DETAILS[2].vlan)
+
+        for i in cls.interfaces:
+            if isinstance(cls.INT_DETAILS[i], cls.Subint):
+                cls.api("sw_interface_set_flags pg%u.%u admin-up"
+                        % (i, cls.INT_DETAILS[i].sub_id))
+        ## @var interfaces
+        #  List variable to store interface indexes.
+        ## @var INT_DETAILS
+        #  Dictionary variable to store data about interfaces.
+
+    ## Class method for bridge-domain to learn defined number of MAC addresses.
+    #  Create required number of host MAC addresses and distribute them among
+    #  interfaces. Create host IPv4 address for every host MAC address. Create
+    #  L2 MAC packet stream with host MAC addresses per interface to let
+    #  the bridge domain learn these MAC addresses.
+    #  @param cls The class pointer.
+    #  @param count Integer variable to store the number of MAC addresses to be
+    #  created.
+    @classmethod
+    def create_mac_entries(cls, count):
+        n_int = len(cls.interfaces)
+        macs_per_if = count / n_int
+        for i in cls.interfaces:
+            start_nr = macs_per_if*i
+            end_nr = count if i == (n_int - 1) else macs_per_if*(i+1)
+            cls.MY_MACS[i] = []
+            cls.MY_IP4S[i] = []
+            packets = []
+            for j in range(start_nr, end_nr):
+                cls.MY_MACS[i].append("00:00:00:ff:%02x:%02x" % (i, j))
+                cls.MY_IP4S[i].append("172.17.1%02x.%u" % (i, j))
+                packet = (Ether(dst="ff:ff:ff:ff:ff:ff", src=cls.MY_MACS[i]))
+                packets.append(packet)
+            cls.pg_add_stream(i, packets)
+        # Based on the verbosity level set in the system print the log.
+        cls.log("Sending broadcast eth frames for MAC learning", 1)
+        cls.pg_start()
+        # Packet stream capturing is not started as we don't need to read
+        #  the output.
+        ## @var n_int
+        #  Integer variable to store the number of interfaces.
+        ## @var macs_per_if
+        #  Integer variable to store the number of MAC addresses per interface.
+        ## @var start_nr
+        #  Integer variable to store the starting number of the range used to
+        #  generate MAC addresses for the interface.
+        ## @var end_nr
+        #  Integer variable to store the ending number of the range used to
+        #  generate MAC addresses for the interface.
+        ## @var MY_MACS
+        #  Dictionary variable to store list of MAC addresses per interface.
+        ## @var MY_IP4S
+        #  Dictionary variable to store list of IPv4 addresses per interface.
+
+    ## Class method to add dot1q or dot1ad layer to the packet.
+    #  Based on sub-interface data of the defined interface add dot1q or dot1ad
+    #  Ethernet header layer to the packet.
+    #  @param cls The class pointer.
+    #  @param i Integer variable to store the index of the interface.
+    #  @param packet Object variable to store the packet where to add dot1q or
+    #  dot1ad layer.
+    # TODO: Move this class method to utils.py.
+    @classmethod
+    def add_dot1_layers(cls, i, packet):
+        assert(type(packet) is Ether)
+        payload = packet.payload
+        if isinstance(cls.INT_DETAILS[i], cls.Dot1QSubint):
+            packet.remove_payload()
+            packet.add_payload(Dot1Q(vlan=cls.INT_DETAILS[i].vlan) / payload)
+        elif isinstance(cls.INT_DETAILS[i], cls.Dot1ADSubint):
+            packet.remove_payload()
+            packet.add_payload(Dot1Q(vlan=cls.INT_DETAILS[i].outer_vlan,
+                                     type=0x8100) /
+                               Dot1Q(vlan=cls.INT_DETAILS[i].inner_vlan) /
+                               payload)
+            packet.type = 0x88A8
+        ## @var payload
+        #  Object variable to store payload of the packet.
+        ## @var INT_DETAILS
+        #  Dictionary variable to store data about interfaces.
+        ## @var Dot1QSubint
+        #  Class variable representing dot1q sub-interfaces.
+        ## @var Dot1ADSubint
+        #  Class variable representing dot1ad sub-interfaces.
+
+    ## Method to remove dot1q or dot1ad layer from the packet.
+    #  Based on sub-interface data of the defined interface remove dot1q or
+    #  dot1ad layer from the packet.
+    #  @param cls The class pointer.
+    #  @param i Integer variable to store the index of the interface.
+    #  @param packet Object variable to store the packet where to remove dot1q
+    #  or dot1ad layer.
+    def remove_dot1_layers(self, i, packet):
+        self.assertEqual(type(packet), Ether)
+        payload = packet.payload
+        if isinstance(self.INT_DETAILS[i], self.Dot1QSubint):
+            self.assertEqual(type(payload), Dot1Q)
+            self.assertEqual(payload.vlan, self.INT_DETAILS[i].vlan)
+            payload = payload.payload
+        elif isinstance(self.INT_DETAILS[i], self.Dot1ADSubint):  # TODO: change 88A8 type
+            self.assertEqual(type(payload), Dot1Q)
+            self.assertEqual(payload.vlan, self.INT_DETAILS[i].outer_vlan)
+            payload = payload.payload
+            self.assertEqual(type(payload), Dot1Q)
+            self.assertEqual(payload.vlan, self.INT_DETAILS[i].inner_vlan)
+            payload = payload.payload
+        packet.remove_payload()
+        packet.add_payload(payload)
+        ## @var payload
+        #  Object variable to store payload of the packet.
+        ## @var INT_DETAILS
+        #  Dictionary variable to store data about interfaces.
+        ## @var Dot1QSubint
+        #  Class variable representing dot1q sub-interfaces.
+        ## @var Dot1ADSubint
+        #  Class variable representing dot1ad sub-interfaces.
+
+    ## Method to create packet stream for the packet generator interface.
+    #  Create input packet stream for the given packet generator interface with
+    #  packets of different length targeted for all other created packet
+    #  generator interfaces.
+    #  @param self The object pointer.
+    #  @param pg_id Integer variable to store the index of the interface to
+    #  create the input packet stream.
+    #  @return pkts List variable to store created input stream of packets.
+    def create_stream(self, pg_id):
+        # TODO: use variables to create lists based on interface number
+        pg_targets = [None] * 3
+        pg_targets[0] = [1, 2]
+        pg_targets[1] = [0, 2]
+        pg_targets[2] = [0, 1]
+        pkts = []
+        for i in range(0, TestL2bd.pkts_per_burst):
+            target_pg_id = pg_targets[pg_id][i % 2]
+            target_host_id = random.randrange(len(self.MY_MACS[target_pg_id]))
+            source_host_id = random.randrange(len(self.MY_MACS[pg_id]))
+            pkt_info = self.create_packet_info(pg_id, target_pg_id)
+            payload = self.info_to_payload(pkt_info)
+            p = (Ether(dst=self.MY_MACS[target_pg_id][target_host_id],
+                       src=self.MY_MACS[pg_id][source_host_id]) /
+                 IP(src=self.MY_IP4S[pg_id][source_host_id],
+                    dst=self.MY_IP4S[target_pg_id][target_host_id]) /
+                 UDP(sport=1234, dport=1234) /
+                 Raw(payload))
+            pkt_info.data = p.copy()
+            self.add_dot1_layers(pg_id, p)
+            if not isinstance(self.INT_DETAILS[pg_id], self.Subint):
+                packet_sizes = [64, 512, 1518, 9018]
+            else:
+                packet_sizes = [64, 512, 1518+4, 9018+4]
+            size = packet_sizes[(i / 2) % len(packet_sizes)]
+            self.extend_packet(p, size)
+            pkts.append(p)
+        return pkts
+        ## @var pg_targets
+        #  List variable to store list of indexes of target packet generator
+        #  interfaces for every source packet generator interface.
+        ## @var target_pg_id
+        #  Integer variable to store the index of the random target packet
+        #  generator interfaces.
+        ## @var target_host_id
+        #  Integer variable to store the index of the randomly chosen
+        #  destination host MAC/IPv4 address.
+        ## @var source_host_id
+        #  Integer variable to store the index of the randomly chosen source
+        #  host MAC/IPv4 address.
+        ## @var pkt_info
+        #  Object variable to store the information about the generated packet.
+        ## @var payload
+        #  String variable to store the payload of the packet to be generated.
+        ## @var p
+        #  Object variable to store the generated packet.
+        ## @var packet_sizes
+        #  List variable to store required packet sizes.
+        ## @var size
+        #  List variable to store required packet sizes.
+
+    ## Method to verify packet stream received on the packet generator interface.
+    #  Verify packet-by-packet the output stream captured on a given packet
+    #  generator (pg) interface using following packet payload data - order of
+    #  packet in the stream, index of the source and destination pg interface,
+    #  src and dst host IPv4 addresses and src port and dst port values of UDP
+    #  layer.
+    #  @param self The object pointer.
+    #  @param o Integer variable to store the index of the interface to
+    #  verify the output packet stream.
+    #  @param capture List variable to store the captured output packet stream.
+    def verify_capture(self, o, capture):
+        last_info = {}
+        for i in self.interfaces:
+            last_info[i] = None
+        for packet in capture:
+            try:
+                ip = packet[IP]
+                udp = packet[UDP]
+                payload_info = self.payload_to_info(str(packet[Raw]))
+                # Check VLAN tags and Ethernet header
+                # TODO: Rework to check VLAN tag(s) and do not remove them
+                self.remove_dot1_layers(payload_info.src, packet)
+                self.assertTrue(Dot1Q not in packet)
+                self.assertEqual(payload_info.dst, o)
+                self.log("Got packet on port %u: src=%u (id=%u)"
+                         % (o, payload_info.src, payload_info.index), 2)
+                next_info = self.get_next_packet_info_for_interface2(
+                    payload_info.src, payload_info.dst,
+                    last_info[payload_info.src])
+                last_info[payload_info.src] = next_info
+                self.assertTrue(next_info is not None)
+                self.assertEqual(payload_info.index, next_info.index)
+                # Check standard fields
+                self.assertEqual(ip.src, next_info.data[IP].src)
+                self.assertEqual(ip.dst, next_info.data[IP].dst)
+                self.assertEqual(udp.sport, next_info.data[UDP].sport)
+                self.assertEqual(udp.dport, next_info.data[UDP].dport)
+            except:
+                self.log("Unexpected or invalid packet:")
+                packet.show()
+                raise
+        for i in self.interfaces:
+            remaining_packet = self.get_next_packet_info_for_interface2(
+                i, o, last_info[i])
+            self.assertTrue(remaining_packet is None,
+                            "Port %u: Packet expected from source %u didn't"
+                            " arrive" % (o, i))
+        ## @var last_info
+        #  Dictionary variable to store verified packets per packet generator
+        #  interface.
+        ## @var ip
+        #  Object variable to store the IP layer of the packet.
+        ## @var udp
+        #  Object variable to store the UDP layer of the packet.
+        ## @var payload_info
+        #  Object variable to store required information about the packet.
+        ## @var next_info
+        #  Object variable to store information about next packet.
+        ## @var remaining_packet
+        #  Object variable to store information about remaining packet.
+
+    ## Method defining VPP L2 bridge domain test case.
+    #  Contains execution steps of the test case.
+    #  @param self The object pointer.
+    def test_l2bd(self):
+        """ L2BD MAC learning test
+
+        1.config
+            MAC learning enabled
+            learn 100 MAC enries
+            3 interfaces: untagged, dot1q, dot1ad (dot1q used instead of dot1ad
+             in the first version)
+
+        2.sending l2 eth pkts between 3 interface
+            64B, 512B, 1518B, 9200B (ether_size)
+            burst of 257 pkts per interface
+        """
+
+        ## Create incoming packet streams for packet-generator interfaces
+        for i in self.interfaces:
+            pkts = self.create_stream(i)
+            self.pg_add_stream(i, pkts)
+
+        ## Enable packet capture and start packet sending
+        self.pg_enable_capture(self.interfaces)
+        self.pg_start()
+
+        ## Verify outgoing packet streams per packet-generator interface
+        for i in self.interfaces:
+            out = self.pg_get_capture(i)
+            self.log("Verifying capture %u" % i)
+            self.verify_capture(i, out)
+        ## @var pkts
+        #  List variable to store created input stream of packets for the packet
+        #  generator interface.
+        ## @var out
+        #  List variable to store captured output stream of packets for
+        #  the packet generator interface.
+
+
+if __name__ == '__main__':
+    unittest.main(testRunner = VppTestRunner)
diff --git a/test/test_l2xc.py b/test/test_l2xc.py
new file mode 100644
index 00000000..f5fc8743
--- /dev/null
+++ b/test/test_l2xc.py
@@ -0,0 +1,243 @@
+#!/usr/bin/env python
+## @file test_l2xc.py
+#  Module to provide L2 cross-connect test case.
+#
+#  The module provides a set of tools for L2 cross-connect tests.
+
+import logging
+logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
+
+import unittest
+import random
+from framework import VppTestCase, VppTestRunner
+from scapy.layers.l2 import Ether, Raw
+from scapy.layers.inet import IP, UDP
+
+
+## Subclass of the VppTestCase class.
+#
+#  This subclass is a class for L2 cross-connect test cases. It provides methods
+#  to create interfaces, configuring L2 cross-connects, creating and verifying
+#  packet streams.
+class TestL2xc(VppTestCase):
+    """ L2XC Test Case """
+
+    # Test variables
+    interf_nr = 4           # Number of interfaces
+    hosts_nr = 10           # Number of hosts
+    pkts_per_burst = 257    # Number of packets per burst
+
+    ## Class method to start the test case.
+    #  Overrides setUpClass method in VppTestCase class.
+    #  There is used try..except statement to ensure that the tear down of
+    #  the class will be executed even if any exception is raised.
+    #  @param cls The class pointer.
+    @classmethod
+    def setUpClass(cls):
+        super(TestL2xc, cls).setUpClass()
+
+        try:
+            ## Create interfaces
+            cls.interfaces = range(TestL2xc.interf_nr)
+            cls.create_interfaces(cls.interfaces)
+
+            ## Create bi-directional cross-connects between pg0 and pg1
+            cls.api("sw_interface_set_l2_xconnect rx pg0 tx pg1 enable")
+            cls.api("sw_interface_set_l2_xconnect rx pg1 tx pg0 enable")
+
+            ## Create bi-directional cross-connects between pg2 and pg3
+            cls.api("sw_interface_set_l2_xconnect rx pg2 tx pg3 enable")
+            cls.api("sw_interface_set_l2_xconnect rx pg3 tx pg2 enable")
+
+            cls.cli(0, "show l2patch")
+
+            ## Create host MAC and IPv4 lists
+            cls.create_host_lists(TestL2xc.hosts_nr)
+
+        except Exception as e:
+            cls.tearDownClass()
+            raise e
+
+    ## Method to define tear down VPP actions of the test case.
+    #  Overrides tearDown method in VppTestCase class.
+    #  @param self The object pointer.
+    def tearDown(self):
+        self.cli(2, "show int")
+        self.cli(2, "show trace")
+        self.cli(2, "show hardware")
+        self.cli(2, "show l2patch")
+        self.cli(2, "show error")
+        self.cli(2, "show run")
+
+    ## Class method to create required number of MAC and IPv4 addresses.
+    #  Create required number of host MAC addresses and distribute them among
+    #  interfaces. Create host IPv4 address for every host MAC address too.
+    #  @param cls The class pointer.
+    #  @param count Integer variable to store the number of MAC addresses to be
+    #  created.
+    @classmethod
+    def create_host_lists(cls, count):
+        for i in cls.interfaces:
+            cls.MY_MACS[i] = []
+            cls.MY_IP4S[i] = []
+            for j in range(0, count):
+                cls.MY_MACS[i].append("00:00:00:ff:%02x:%02x" % (i, j))
+                cls.MY_IP4S[i].append("172.17.1%02x.%u" % (i, j))
+        ## @var MY_MACS
+        #  Dictionary variable to store list of MAC addresses per interface.
+        ## @var MY_IP4S
+        #  Dictionary variable to store list of IPv4 addresses per interface.
+
+    ## Method to create packet stream for the packet generator interface.
+    #  Create input packet stream for the given packet generator interface with
+    #  packets of different length targeted for all other created packet
+    #  generator interfaces.
+    #  @param self The object pointer.
+    #  @param pg_id Integer variable to store the index of the interface to
+    #  create the input packet stream.
+    #  @return pkts List variable to store created input stream of packets.
+    def create_stream(self, pg_id):
+        # TODO: use variables to create lists based on interface number
+        pg_targets = [None] * 4
+        pg_targets[0] = [1]
+        pg_targets[1] = [0]
+        pg_targets[2] = [3]
+        pg_targets[3] = [2]
+        pkts = []
+        for i in range(0, TestL2xc.pkts_per_burst):
+            target_pg_id = pg_targets[pg_id][0]
+            target_host_id = random.randrange(len(self.MY_MACS[target_pg_id]))
+            source_host_id = random.randrange(len(self.MY_MACS[pg_id]))
+            pkt_info = self.create_packet_info(pg_id, target_pg_id)
+            payload = self.info_to_payload(pkt_info)
+            p = (Ether(dst=self.MY_MACS[target_pg_id][target_host_id],
+                       src=self.MY_MACS[pg_id][source_host_id]) /
+                 IP(src=self.MY_IP4S[pg_id][source_host_id],
+                    dst=self.MY_IP4S[target_pg_id][target_host_id]) /
+                 UDP(sport=1234, dport=1234) /
+                 Raw(payload))
+            pkt_info.data = p.copy()
+            packet_sizes = [64, 512, 1518, 9018]
+            size = packet_sizes[(i / 2) % len(packet_sizes)]
+            self.extend_packet(p, size)
+            pkts.append(p)
+        return pkts
+        ## @var pg_targets
+        #  List variable to store list of indexes of target packet generator
+        #  interfaces for every source packet generator interface.
+        ## @var target_pg_id
+        #  Integer variable to store the index of the random target packet
+        #  generator interfaces.
+        ## @var target_host_id
+        #  Integer variable to store the index of the randomly chosen
+        #  destination host MAC/IPv4 address.
+        ## @var source_host_id
+        #  Integer variable to store the index of the randomly chosen source
+        #  host MAC/IPv4 address.
+        ## @var pkt_info
+        #  Object variable to store the information about the generated packet.
+        ## @var payload
+        #  String variable to store the payload of the packet to be generated.
+        ## @var p
+        #  Object variable to store the generated packet.
+        ## @var packet_sizes
+        #  List variable to store required packet sizes.
+        ## @var size
+        #  List variable to store required packet sizes.
+
+    ## Method to verify packet stream received on the packet generator interface.
+    #  Verify packet-by-packet the output stream captured on a given packet
+    #  generator (pg) interface using following packet payload data - order of
+    #  packet in the stream, index of the source and destination pg interface,
+    #  src and dst host IPv4 addresses and src port and dst port values of UDP
+    #  layer.
+    #  @param self The object pointer.
+    #  @param o Integer variable to store the index of the interface to
+    #  verify the output packet stream.
+    #  @param capture List variable to store the captured output packet stream.
+    def verify_capture(self, o, capture):
+        last_info = {}
+        for i in self.interfaces:
+            last_info[i] = None
+        for packet in capture:
+            try:
+                ip = packet[IP]
+                udp = packet[UDP]
+                payload_info = self.payload_to_info(str(packet[Raw]))
+                self.assertEqual(payload_info.dst, o)
+                self.log("Got packet on port %u: src=%u (id=%u)"
+                         % (o, payload_info.src, payload_info.index), 2)
+                next_info = self.get_next_packet_info_for_interface2(
+                    payload_info.src, payload_info.dst,
+                    last_info[payload_info.src])
+                last_info[payload_info.src] = next_info
+                self.assertTrue(next_info is not None)
+                self.assertEqual(payload_info.index, next_info.index)
+                # Check standard fields
+                self.assertEqual(ip.src, next_info.data[IP].src)
+                self.assertEqual(ip.dst, next_info.data[IP].dst)
+                self.assertEqual(udp.sport, next_info.data[UDP].sport)
+                self.assertEqual(udp.dport, next_info.data[UDP].dport)
+            except:
+                self.log("Unexpected or invalid packet:")
+                packet.show()
+                raise
+        for i in self.interfaces:
+            remaining_packet = self.get_next_packet_info_for_interface2(
+                i, o, last_info[i])
+            self.assertTrue(remaining_packet is None,
+                            "Port %u: Packet expected from source %u didn't"
+                            " arrive" % (o, i))
+        ## @var last_info
+        #  Dictionary variable to store verified packets per packet generator
+        #  interface.
+        ## @var ip
+        #  Object variable to store the IP layer of the packet.
+        ## @var udp
+        #  Object variable to store the UDP layer of the packet.
+        ## @var payload_info
+        #  Object variable to store required information about the packet.
+        ## @var next_info
+        #  Object variable to store information about next packet.
+        ## @var remaining_packet
+        #  Object variable to store information about remaining packet.
+
+    ## Method defining L2 cross-connect test case.
+    #  Contains steps of the test case.
+    #  @param self The object pointer.
+    def test_l2xc(self):
+        """ L2XC test
+
+        Test scenario:
+        1.config
+            2 pairs of 2 interfaces, l2xconnected
+
+        2.sending l2 eth packets between 4 interfaces
+            64B, 512B, 1518B, 9018B (ether_size)
+            burst of packets per interface
+        """
+
+        ## Create incoming packet streams for packet-generator interfaces
+        for i in self.interfaces:
+            pkts = self.create_stream(i)
+            self.pg_add_stream(i, pkts)
+
+        ## Enable packet capturing and start packet sending
+        self.pg_enable_capture(self.interfaces)
+        self.pg_start()
+
+        ## Verify outgoing packet streams per packet-generator interface
+        for i in self.interfaces:
+            out = self.pg_get_capture(i)
+            self.log("Verifying capture %u" % i)
+            self.verify_capture(i, out)
+        ## @var pkts
+        #  List variable to store created input stream of packets for the packet
+        #  generator interface.
+        ## @var out
+        #  List variable to store captured output stream of packets for
+        #  the packet generator interface.
+
+
+if __name__ == '__main__':
+    unittest.main(testRunner = VppTestRunner)
diff --git a/test/test_vxlan.py b/test/test_vxlan.py
new file mode 100644
index 00000000..1db34927
--- /dev/null
+++ b/test/test_vxlan.py
@@ -0,0 +1,102 @@
+#!/usr/bin/env python
+
+import unittest
+from framework import VppTestCase, VppTestRunner
+from util import Util
+from template_bd import BridgeDomain
+
+from scapy.layers.l2 import Ether
+from scapy.layers.inet import IP, UDP
+from scapy_handlers.vxlan import VXLAN
+
+
+## TestVxlan is a subclass of BridgeDomain, Util, VppTestCase classes.
+#
+#  TestVxlan class defines VXLAN test cases for VXLAN encapsulation,
+#  decapsulation and VXLAN tunnel termination in L2 bridge-domain.
+class TestVxlan(BridgeDomain, Util, VppTestCase):
+    """ VXLAN Test Case """
+
+    ## Method to initialize all parent classes.
+    #
+    #  Initialize BridgeDomain objects, set documentation string for inherited
+    #  tests and initialize VppTestCase object which must be called after
+    #  doc strings are set.
+    def __init__(self, *args):
+        BridgeDomain.__init__(self)
+        self.test_decap.__func__.__doc__ = ' VXLAN BD decapsulation '
+        self.test_encap.__func__.__doc__ = ' VXLAN BD encapsulation '
+        VppTestCase.__init__(self, *args)
+
+    ## Method for VXLAN encapsulate function.
+    #
+    #  Encapsulate the original payload frame by adding VXLAN header with its
+    #  UDP, IP and Ethernet fields.
+    def encapsulate(self, pkt):
+        return (Ether(src=self.MY_MACS[0], dst=self.VPP_MACS[0]) /
+                IP(src=self.MY_IP4S[0], dst=self.VPP_IP4S[0]) /
+                UDP(sport=4789, dport=4789, chksum=0) /
+                VXLAN(vni=1) /
+                pkt)
+
+    ## Method for VXLAN decapsulate function.
+    #
+    #  Decapsulate the original payload frame by removing VXLAN header with
+    #  its UDP, IP and Ethernet fields.
+    def decapsulate(self, pkt):
+        return pkt[VXLAN].payload
+
+    ## Method for checking VXLAN encapsulation.
+    #
+    def check_encapsulation(self, pkt):
+        # TODO: add error messages
+        ## Verify source MAC is VPP_MAC and destination MAC is MY_MAC resolved
+        #  by VPP using ARP.
+        self.assertEqual(pkt[Ether].src, self.VPP_MACS[0])
+        self.assertEqual(pkt[Ether].dst, self.MY_MACS[0])
+        ## Verify VXLAN tunnel source IP is VPP_IP and destination IP is MY_IP.
+        self.assertEqual(pkt[IP].src, self.VPP_IP4S[0])
+        self.assertEqual(pkt[IP].dst, self.MY_IP4S[0])
+        ## Verify UDP destination port is VXLAN 4789, source UDP port could be
+        #  arbitrary.
+        self.assertEqual(pkt[UDP].dport, 4789)
+        # TODO: checksum check
+        ## Verify VNI, based on configuration it must be 1.
+        self.assertEqual(pkt[VXLAN].vni, 1)
+
+    ## Class method to start the VXLAN test case.
+    #  Overrides setUpClass method in VppTestCase class.
+    #  Python try..except statement is used to ensure that the tear down of
+    #  the class will be executed even if exception is raised.
+    #  @param cls The class pointer.
+    @classmethod
+    def setUpClass(cls):
+        super(TestVxlan, cls).setUpClass()
+        try:
+            ## Create 2 pg interfaces.
+            cls.create_interfaces(range(2))
+            ## Configure IPv4 addresses on VPP pg0.
+            cls.config_ip4([0])
+            ## Resolve MAC address for VPP's IP address on pg0.
+            cls.resolve_arp([0])
+
+            ## Create VXLAN VTEP on VPP pg0, and put vxlan_tunnel0 and pg1
+            #  into BD.
+            cls.api("vxlan_add_del_tunnel src %s dst %s vni 1" %
+                    (cls.VPP_IP4S[0], cls.MY_IP4S[0]))
+            cls.api("sw_interface_set_l2_bridge vxlan_tunnel0 bd_id 1")
+            cls.api("sw_interface_set_l2_bridge pg1 bd_id 1")
+        except:
+            ## In case setUpClass fails run tear down.
+            cls.tearDownClass()
+            raise
+
+    ## Method to define VPP actions before tear down of the test case.
+    #  Overrides tearDown method in VppTestCase class.
+    #  @param self The object pointer.
+    def tearDown(self):
+        super(TestVxlan, self).tearDown()
+        self.cli(2, "show bridge-domain 1 detail")
+
+if __name__ == '__main__':
+    unittest.main(testRunner=VppTestRunner)
diff --git a/test/util.py b/test/util.py
new file mode 100644
index 00000000..c72a3965
--- /dev/null
+++ b/test/util.py
@@ -0,0 +1,139 @@
+## @package util
+#  Module with common functions that should be used by the test cases.
+#
+#  The module provides a set of tools for setup the test environment
+
+from scapy.layers.l2 import Ether, ARP
+from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6NDOptSrcLLAddr
+
+
+## Util class
+#
+#  Test cases that want to use methods defined in Util class should
+#  inherit this class.
+#
+#  class Example(Util, VppTestCase):
+#      pass
+class Util(object):
+
+    ## Class method to send ARP Request for each VPP IPv4 address in
+    #  order to determine VPP interface MAC address to IPv4 bindings.
+    #
+    #  Resolved MAC address is saved to the VPP_MACS dictionary with interface
+    #  index as a key. ARP Request is sent from MAC in MY_MACS dictionary with
+    #  interface index as a key.
+    #  @param cls The class pointer.
+    #  @param args List variable to store indices of VPP interfaces.
+    @classmethod
+    def resolve_arp(cls, args):
+        for i in args:
+            ip = cls.VPP_IP4S[i]
+            cls.log("Sending ARP request for %s on port %u" % (ip, i))
+            arp_req = (Ether(dst="ff:ff:ff:ff:ff:ff", src=cls.MY_MACS[i]) /
+                       ARP(op=ARP.who_has, pdst=ip,
+                           psrc=cls.MY_IP4S[i], hwsrc=cls.MY_MACS[i]))
+            cls.pg_add_stream(i, arp_req)
+            cls.pg_enable_capture([i])
+
+            cls.cli(2, "trace add pg-input 1")
+            cls.pg_start()
+            arp_reply = cls.pg_get_capture(i)[0]
+            if arp_reply[ARP].op == ARP.is_at:
+                cls.log("VPP pg%u MAC address is %s " % (i, arp_reply[ARP].hwsrc))
+                cls.VPP_MACS[i] = arp_reply[ARP].hwsrc
+            else:
+                cls.log("No ARP received on port %u" % i)
+            cls.cli(2, "show trace")
+            ## @var ip
+            #  <TODO add description>
+            ## @var arp_req
+            #  <TODO add description>
+            ## @var arp_reply
+            #  <TODO add description>
+            ## @var VPP_MACS
+            #  <TODO add description>
+
+    ## Class method to send ND request for each VPP IPv6 address in
+    #  order to determine VPP MAC address to IPv6 bindings.
+    #
+    #  Resolved MAC address is saved to the VPP_MACS dictionary with interface
+    #  index as a key. ND Request is sent from MAC in MY_MACS dictionary with
+    #  interface index as a key.
+    #  @param cls The class pointer.
+    #  @param args List variable to store indices of VPP interfaces.
+    @classmethod
+    def resolve_icmpv6_nd(cls, args):
+        for i in args:
+            ip = cls.VPP_IP6S[i]
+            cls.log("Sending ICMPv6ND_NS request for %s on port %u" % (ip, i))
+            nd_req = (Ether(dst="ff:ff:ff:ff:ff:ff", src=cls.MY_MACS[i]) /
+                      IPv6(src=cls.MY_IP6S[i], dst=ip) /
+                      ICMPv6ND_NS(tgt=ip) /
+                      ICMPv6NDOptSrcLLAddr(lladdr=cls.MY_MACS[i]))
+            cls.pg_add_stream(i, nd_req)
+            cls.pg_enable_capture([i])
+
+            cls.cli(2, "trace add pg-input 1")
+            cls.pg_start()
+            nd_reply = cls.pg_get_capture(i)[0]
+            icmpv6_na = nd_reply['ICMPv6 Neighbor Discovery - Neighbor Advertisement']
+            dst_ll_addr = icmpv6_na['ICMPv6 Neighbor Discovery Option - Destination Link-Layer Address']
+            cls.VPP_MACS[i] = dst_ll_addr.lladdr
+            ## @var ip
+            #  <TODO add description>
+            ## @var nd_req
+            #  <TODO add description>
+            ## @var nd_reply
+            #  <TODO add description>
+            ## @var icmpv6_na
+            #  <TODO add description>
+            ## @var dst_ll_addr
+            #  <TODO add description>
+            ## @var VPP_MACS
+            #  <TODO add description>
+
+    ## Class method to configure IPv4 addresses on VPP interfaces.
+    #
+    #  Set dictionary variables MY_IP4S and VPP_IP4S to IPv4 addresses
+    #  calculated using interface VPP interface index as a parameter.
+    #  /24 IPv4 prefix is used, with VPP interface address host part set
+    #  to .1 and MY address set to .2.
+    #  Used IPv4 prefix scheme: 172.16.{VPP-interface-index}.0/24.
+    #  @param cls The class pointer.
+    #  @param args List variable to store indices of VPP interfaces.
+    @classmethod
+    def config_ip4(cls, args):
+        for i in args:
+            cls.MY_IP4S[i] = "172.16.%u.2" % i
+            cls.VPP_IP4S[i] = "172.16.%u.1" % i
+            cls.api("sw_interface_add_del_address pg%u %s/24" % (i, cls.VPP_IP4S[i]))
+            cls.log("My IPv4 address is %s" % (cls.MY_IP4S[i]))
+            ## @var MY_IP4S
+            #  Dictionary variable to store host IPv4 addresses connected to packet
+            #  generator interfaces.
+            ## @var VPP_IP4S
+            #  Dictionary variable to store VPP IPv4 addresses of the packet
+            #  generator interfaces.
+
+    ## Class method to configure IPv6 addresses on VPP interfaces.
+    #
+    #  Set dictionary variables MY_IP6S and VPP_IP6S to IPv6 addresses
+    #  calculated using interface VPP interface index as a parameter.
+    #  /64 IPv6 prefix is used, with VPP interface address host part set
+    #  to ::1 and MY address set to ::2.
+    #  Used IPv6 prefix scheme: fd10:{VPP-interface-index}::0/64.
+    #  @param cls The class pointer.
+    #  @param args List variable to store indices of VPP interfaces.
+    @classmethod
+    def config_ip6(cls, args):
+        for i in args:
+            cls.MY_IP6S[i] = "fd10:%u::2" % i
+            cls.VPP_IP6S[i] = "fd10:%u::1" % i
+            cls.api("sw_interface_add_del_address pg%u %s/64" % (i, cls.VPP_IP6S[i]))
+            cls.log("My IPv6 address is %s" % (cls.MY_IP6S[i]))
+            ## @var MY_IP6S
+            #  Dictionary variable to store host IPv6 addresses connected to packet
+            #  generator interfaces.
+            ## @var VPP_IP6S
+            #  Dictionary variable to store VPP IPv6 addresses of the packet
+            #  generator interfaces.
-- 
cgit 1.2.3-korg


From b80f9d1b7335f8d32adc0798f26a450419e44695 Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Wed, 5 Oct 2016 14:05:33 +0200
Subject: don't require root privileges when running the tests

Change-Id: Ib67bf1a898e3c1e4038698f1cb068ae9099d7921
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 Makefile          | 2 +-
 test/framework.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 912ad1a9..3db644e0 100644
--- a/Makefile
+++ b/Makefile
@@ -189,7 +189,7 @@ build-vpp-api: $(BR)/.bootstrap.ok
 	$(call make,$(PLATFORM)_debug,vpp-api-install)
 
 define test
-	@sudo make -C test \
+	@make -C test \
 	  VPP_TEST_BIN=$(BR)/install-$(1)-native/vpp/bin/vpp \
 	  VPP_TEST_API_TEST_BIN=$(BR)/install-$(1)-native/vpp-api-test/bin/vpp_api_test \
 	  V=$(V) TEST=$(TEST)
diff --git a/test/framework.py b/test/framework.py
index 67f8a058..0ee266ec 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -241,7 +241,7 @@ class VppTestCase(unittest.TestCase):
     #  @param pkts List variable to store packets to be added to the stream.
     @classmethod
     def pg_add_stream(cls, i, pkts):
-        os.system("sudo rm -f /tmp/pg%u_in.pcap" % i)
+        os.system("rm -f /tmp/pg%u_in.pcap" % i)
         wrpcap("/tmp/pg%u_in.pcap" % i, pkts)
         # no equivalent API command
         cls.cli(0, "packet-generator new pcap /tmp/pg%u_in.pcap source pg%u"
@@ -258,7 +258,7 @@ class VppTestCase(unittest.TestCase):
     @classmethod
     def pg_enable_capture(cls, args):
         for i in args:
-            os.system("sudo rm -f /tmp/pg%u_out.pcap" % i)
+            os.system("rm -f /tmp/pg%u_out.pcap" % i)
             cls.cli(0, "packet-generator capture pg%u pcap /tmp/pg%u_out.pcap"
                     % (i, i))
 
-- 
cgit 1.2.3-korg


From cd8e318a7656c84ab1ff02090bf1616ca7513fdc Mon Sep 17 00:00:00 2001
From: Pierre Pfister <ppfister@cisco.com>
Date: Fri, 7 Oct 2016 16:30:03 +0100
Subject: Test Infra: Add plugin support

This patch adds plugin path to vpp commandline arguments
when 'make test' is run.
Hence, test cases can test plugins.

Change-Id: Ib90efa1f62e03b45b84533c49c7a5d040aa8cddf
Signed-off-by: Pierre Pfister <ppfister@cisco.com>
---
 Makefile          | 5 +++--
 test/framework.py | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 3db644e0..4b7170d2 100644
--- a/Makefile
+++ b/Makefile
@@ -192,6 +192,7 @@ define test
 	@make -C test \
 	  VPP_TEST_BIN=$(BR)/install-$(1)-native/vpp/bin/vpp \
 	  VPP_TEST_API_TEST_BIN=$(BR)/install-$(1)-native/vpp-api-test/bin/vpp_api_test \
+	  VPP_TEST_PLUGIN_PATH=$(BR)/install-$(1)-native/plugins/lib64/vpp_plugins \
 	  V=$(V) TEST=$(TEST)
 endef
 
@@ -199,14 +200,14 @@ test:
 ifeq ($(OS_ID),ubuntu)
 	@sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
 endif
-	@make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite vpp-install vpp-api-test-install
+	@make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite plugins-install vpp-install vpp-api-test-install
 	$(call test,vpp_lite)
 
 test-debug:
 ifeq ($(OS_ID),ubuntu)
 	@sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
 endif
-	@make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite_debug vpp-install vpp-api-test-install
+	@make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite_debug plugins-install vpp-install vpp-api-test-install
 	$(call test,vpp_lite_debug)
 
 retest:
diff --git a/test/framework.py b/test/framework.py
index 0ee266ec..8bfb5513 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -58,10 +58,14 @@ class VppTestCase(unittest.TestCase):
     @classmethod
     def setUpConstants(cls):
         cls.vpp_bin = os.getenv('VPP_TEST_BIN', "vpp")
+        cls.plugin_path = os.getenv('VPP_TEST_PLUGIN_PATH')
         cls.vpp_api_test_bin = os.getenv("VPP_TEST_API_TEST_BIN",
                                          "vpp-api-test")
         cls.vpp_cmdline = [cls.vpp_bin, "unix", "nodaemon", "api-segment", "{",
                            "prefix", "unittest", "}"]
+        if cls.plugin_path is not None:
+            cls.vpp_cmdline.extend(["plugin_path", cls.plugin_path])
+
         cls.vpp_api_test_cmdline = [cls.vpp_api_test_bin, "chroot", "prefix",
                                     "unittest"]
         try:
-- 
cgit 1.2.3-korg


From 53194292b0e4d0a0b0a7a6defe59e6e77548bc55 Mon Sep 17 00:00:00 2001
From: Peter Ginchev <pginchev@cisco.com>
Date: Fri, 14 Oct 2016 10:23:37 +0300
Subject: Fix test target build

Change-Id: Ib06b40292858f32df9c62e747808e0ef140bd9dd
Signed-off-by: Peter Ginchev <pginchev@cisco.com>
---
 Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 4b7170d2..93277bec 100644
--- a/Makefile
+++ b/Makefile
@@ -196,18 +196,22 @@ define test
 	  V=$(V) TEST=$(TEST)
 endef
 
-test:
+test: bootstrap
 ifeq ($(OS_ID),ubuntu)
-	@sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
+	@if ! (dpkg -l python-dev python-scapy &> /dev/null); then \
+	  sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy; \
+	fi
 endif
-	@make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite plugins-install vpp-install vpp-api-test-install
+	@make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite vpp-api-install plugins-install vpp-install vpp-api-test-install
 	$(call test,vpp_lite)
 
-test-debug:
+test-debug: bootstrap
 ifeq ($(OS_ID),ubuntu)
-	@sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
+	@if ! (dpkg -l python-dev python-scapy &> /dev/null); then \
+	  sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy; \
+	fi
 endif
-	@make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite_debug plugins-install vpp-install vpp-api-test-install
+	@make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite_debug vpp-api-install plugins-install vpp-install vpp-api-test-install
 	$(call test,vpp_lite_debug)
 
 retest:
-- 
cgit 1.2.3-korg


From f62ae1288a776527c7f7ba3951531fbd07bc63da Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Tue, 11 Oct 2016 11:47:09 +0200
Subject: refactor test framework

Change-Id: I31da3b1857b6399f9899276a2d99cdd19436296c
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Signed-off-by: Matej Klotton <mklotton@cisco.com>
Signed-off-by: Jan Gelety <jgelety@cisco.com>
Signed-off-by: Juraj Sloboda <jsloboda@cisco.com>
---
 Makefile                  |  41 ++-
 build-root/Makefile       |   1 +
 test/Makefile             |  23 +-
 test/doc/Makefile         | 229 ++++++++++++
 test/doc/conf.py          | 340 ++++++++++++++++++
 test/doc/index.rst        |  22 ++
 test/framework.py         | 873 ++++++++++++++++++++--------------------------
 test/hook.py              | 128 +++++++
 test/template_bd.py       | 120 +++----
 test/test_ip.py           | 302 ++++++----------
 test/test_ip6.py          | 323 ++++++-----------
 test/test_l2bd.py         | 539 ++++++++--------------------
 test/test_l2xc.py         | 276 ++++++---------
 test/test_lb.py           | 252 ++++++-------
 test/test_vxlan.py        | 106 +++---
 test/util.py              | 152 +-------
 test/vpp_interface.py     | 240 +++++++++++++
 test/vpp_papi_provider.py | 316 +++++++++++++++++
 test/vpp_pg_interface.py  |  99 ++++++
 test/vpp_sub_interface.py | 143 ++++++++
 20 files changed, 2658 insertions(+), 1867 deletions(-)
 create mode 100644 test/doc/Makefile
 create mode 100644 test/doc/conf.py
 create mode 100644 test/doc/index.rst
 create mode 100644 test/hook.py
 create mode 100644 test/vpp_interface.py
 create mode 100644 test/vpp_papi_provider.py
 create mode 100644 test/vpp_pg_interface.py
 create mode 100644 test/vpp_sub_interface.py

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 93277bec..54b0f29d 100644
--- a/Makefile
+++ b/Makefile
@@ -188,37 +188,36 @@ plugins-release: $(BR)/.bootstrap.ok
 build-vpp-api: $(BR)/.bootstrap.ok
 	$(call make,$(PLATFORM)_debug,vpp-api-install)
 
+PYTHON_PATH=$(BR)/python
+
 define test
-	@make -C test \
-	  VPP_TEST_BIN=$(BR)/install-$(1)-native/vpp/bin/vpp \
-	  VPP_TEST_API_TEST_BIN=$(BR)/install-$(1)-native/vpp-api-test/bin/vpp_api_test \
-	  VPP_TEST_PLUGIN_PATH=$(BR)/install-$(1)-native/plugins/lib64/vpp_plugins \
-	  V=$(V) TEST=$(TEST)
+	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-api-install plugins-install vpp-install vpp-api-test-install,)
+	make -C test \
+	  VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
+	  VPP_TEST_API_TEST_BIN=$(BR)/install-$(2)-native/vpp-api-test/bin/vpp_api_test \
+	  VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/plugins/lib64/vpp_plugins \
+	  LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp-api/lib64/ \
+	  WS_ROOT=$(WS_ROOT) I=$(I) V=$(V) TEST=$(TEST) PYTHON_PATH=$(PYTHON_PATH) $(3)
 endef
 
 test: bootstrap
-ifeq ($(OS_ID),ubuntu)
-	@if ! (dpkg -l python-dev python-scapy &> /dev/null); then \
-	  sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy; \
-	fi
-endif
-	@make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite vpp-api-install plugins-install vpp-install vpp-api-test-install
-	$(call test,vpp_lite)
+	$(call test,vpp_lite,vpp_lite,test)
 
 test-debug: bootstrap
-ifeq ($(OS_ID),ubuntu)
-	@if ! (dpkg -l python-dev python-scapy &> /dev/null); then \
-	  sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy; \
-	fi
-endif
-	@make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite_debug vpp-api-install plugins-install vpp-install vpp-api-test-install
-	$(call test,vpp_lite_debug)
+	$(call test,vpp_lite,vpp_lite_debug,test)
+
+test-doc:
+	make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite vpp-api-install plugins-install vpp-install vpp-api-test-install
+	make -C test PYTHON_PATH=$(PYTHON_PATH) LD_LIBRARY_PATH=$(BR)/install-vpp_lite-native/vpp-api/lib64/ doc
+
+test-clean:
+	make -C test clean
 
 retest:
-	$(call test,vpp_lite)
+	$(call test,vpp_lite,vpp_lite,retest)
 
 retest-debug:
-	$(call test,vpp_lite_debug)
+	$(call test,vpp_lite,vpp_lite_debug,retest)
 
 STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
diff --git a/build-root/Makefile b/build-root/Makefile
index 97fb43d4..6e26e90e 100644
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -1164,6 +1164,7 @@ distclean:
 	rm -rf $(MU_BUILD_ROOT_DIR)/*.deb
 	rm -rf $(MU_BUILD_ROOT_DIR)/*.rpm
 	rm -rf $(MU_BUILD_ROOT_DIR)/*.changes
+	rm -rf $(MU_BUILD_ROOT_DIR)/python
 	if [ -e /usr/bin/dh ];then (cd $(MU_BUILD_ROOT_DIR)/deb/;debian/rules clean); fi
 	rm -f $(MU_BUILD_ROOT_DIR)/deb/debian/*.install
 	rm -f $(MU_BUILD_ROOT_DIR)/deb/debian/*.dkms
diff --git a/test/Makefile b/test/Makefile
index 7cbcf97a..c90679e8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,3 +1,22 @@
+PYTHON_VENV_PATH=$(PYTHON_PATH)/virtualenv
 
-all:
-	@python run_tests.py discover -p test_$(TEST)"*.py"
+test: clean
+	@virtualenv $(PYTHON_VENV_PATH)
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install scapy"
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install pexpect"
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && cd $(WS_ROOT)/vpp-api/python && python setup.py install"
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py discover -p test_$(TEST)\"*.py\""
+
+retest: clean
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py discover -p test_$(TEST)\"*.py\""
+
+.PHONY: clean doc
+
+clean:
+	@rm -f /dev/shm/vpp-unittest-*
+	@rm -rf /tmp/vpp-unittest-*
+
+doc:
+	@virtualenv $(PYTHON_VENV_PATH)
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install sphinx"
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && make -C doc html"
diff --git a/test/doc/Makefile b/test/doc/Makefile
new file mode 100644
index 00000000..00655389
--- /dev/null
+++ b/test/doc/Makefile
@@ -0,0 +1,229 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: regen-api-doc
+regen-api-doc:
+	sphinx-apidoc -o . ..
+
+.PHONY: help
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  applehelp  to make an Apple Help Book"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  epub3      to make an epub3"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+	@echo "  dummy      to check syntax errors of document sources"
+
+.PHONY: clean
+clean:
+	rm -rf $(BUILDDIR)/*
+
+.PHONY: html
+html: regen-api-doc
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+.PHONY: dirhtml
+dirhtml: regen-api-doc
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+.PHONY: singlehtml
+singlehtml: regen-api-doc
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+.PHONY: pickle
+pickle: regen-api-doc
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+.PHONY: json
+json: regen-api-doc
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+.PHONY: htmlhelp
+htmlhelp: regen-api-doc
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+.PHONY: qthelp
+qthelp: regen-api-doc
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/VPPtestframework.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/VPPtestframework.qhc"
+
+.PHONY: applehelp
+applehelp: regen-api-doc
+	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
+	@echo
+	@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
+	@echo "N.B. You won't be able to view it unless you put it in" \
+	      "~/Library/Documentation/Help or install it in your application" \
+	      "bundle."
+
+.PHONY: devhelp
+devhelp: regen-api-doc
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/VPPtestframework"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/VPPtestframework"
+	@echo "# devhelp"
+
+.PHONY: epub
+epub: regen-api-doc
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+.PHONY: epub3
+epub3:
+	$(SPHINXBUILD) -b epub3 $(ALLSPHINXOPTS) $(BUILDDIR)/epub3
+	@echo
+	@echo "Build finished. The epub3 file is in $(BUILDDIR)/epub3."
+
+.PHONY: latex
+latex: regen-api-doc
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+.PHONY: latexpdf
+latexpdf: regen-api-doc
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+.PHONY: latexpdfja
+latexpdfja: regen-api-doc
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+.PHONY: text
+text: regen-api-doc
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+.PHONY: man
+man: regen-api-doc
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+.PHONY: texinfo
+texinfo: regen-api-doc
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+.PHONY: info
+info: regen-api-doc
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+.PHONY: gettext
+gettext: regen-api-doc
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+.PHONY: changes
+changes: regen-api-doc
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+.PHONY: linkcheck
+linkcheck: regen-api-doc
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+.PHONY: doctest
+doctest: regen-api-doc
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+.PHONY: coverage
+coverage: regen-api-doc
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+.PHONY: xml
+xml: regen-api-doc
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+.PHONY: pseudoxml
+pseudoxml: regen-api-doc
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
+
+.PHONY: dummy
+dummy: regen-api-doc
+	$(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILDDIR)/dummy
+	@echo
+	@echo "Build finished. Dummy builder generates no files."
diff --git a/test/doc/conf.py b/test/doc/conf.py
new file mode 100644
index 00000000..aa841714
--- /dev/null
+++ b/test/doc/conf.py
@@ -0,0 +1,340 @@
+# -*- coding: utf-8 -*-
+#
+# VPP test framework documentation build configuration file, created by
+# sphinx-quickstart on Thu Oct 13 08:45:03 2016.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+import os
+import sys
+sys.path.insert(0, os.path.abspath('..'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'sphinx.ext.autodoc',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#
+# source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'VPP test framework'
+copyright = u'2016, VPP team'
+author = u'VPP team'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = u'0.1'
+# The full version, including alpha/beta/rc tags.
+release = u'0.1'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#
+# today = ''
+#
+# Else, today_fmt is used as the format for a strftime call.
+#
+# today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#
+# default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#
+# add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#
+# add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#
+# show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+# modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+# keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+# html_theme_path = []
+
+# The name for this set of Sphinx documents.
+# "<project> v<release> documentation" by default.
+#
+# html_title = u'VPP test framework v0.1'
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#
+# html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#
+# html_logo = None
+
+# The name of an image file (relative to this directory) to use as a favicon of
+# the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#
+# html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#
+# html_extra_path = []
+
+# If not None, a 'Last updated on:' timestamp is inserted at every page
+# bottom, using the given strftime format.
+# The empty string is equivalent to '%b %d, %Y'.
+#
+# html_last_updated_fmt = None
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#
+# html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#
+# html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#
+# html_additional_pages = {}
+
+# If false, no module index is generated.
+#
+# html_domain_indices = True
+
+# If false, no index is generated.
+#
+# html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#
+# html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#
+# html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#
+# html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#
+# html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#
+# html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+# html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
+#   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr', 'zh'
+#
+# html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# 'ja' uses this config value.
+# 'zh' user can custom change `jieba` dictionary path.
+#
+# html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#
+# html_search_scorer = 'scorer.js'
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'VPPtestframeworkdoc'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+     # The paper size ('letterpaper' or 'a4paper').
+     #
+     # 'papersize': 'letterpaper',
+
+     # The font size ('10pt', '11pt' or '12pt').
+     #
+     # 'pointsize': '10pt',
+
+     # Additional stuff for the LaTeX preamble.
+     #
+     # 'preamble': '',
+
+     # Latex figure (float) alignment
+     #
+     # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'VPPtestframework.tex', u'VPP test framework Documentation',
+     u'VPP team', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#
+# latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#
+# latex_use_parts = False
+
+# If true, show page references after internal links.
+#
+# latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#
+# latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#
+# latex_appendices = []
+
+# It false, will not define \strong, \code, 	itleref, \crossref ... but only
+# \sphinxstrong, ..., \sphinxtitleref, ... To help avoid clash with user added
+# packages.
+#
+# latex_keep_old_macro_names = True
+
+# If false, no module index is generated.
+#
+# latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'vpptestframework', u'VPP test framework Documentation',
+     [author], 1)
+]
+
+# If true, show URL addresses after external links.
+#
+# man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'VPPtestframework', u'VPP test framework Documentation',
+     author, 'VPPtestframework', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#
+# texinfo_appendices = []
+
+# If false, no module index is generated.
+#
+# texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#
+# texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#
+# texinfo_no_detailmenu = False
diff --git a/test/doc/index.rst b/test/doc/index.rst
new file mode 100644
index 00000000..c18357a4
--- /dev/null
+++ b/test/doc/index.rst
@@ -0,0 +1,22 @@
+.. VPP test framework documentation master file, created by
+   sphinx-quickstart on Thu Oct 13 08:45:03 2016.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to VPP test framework's documentation!
+==============================================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   modules.rst
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
diff --git a/test/framework.py b/test/framework.py
index 5cf2a250..02ffb7ad 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -1,424 +1,315 @@
 #!/usr/bin/env python
-## @package framework
-#  Module to handle test case execution.
-#
-#  The module provides a set of tools for constructing and running tests and
-#  representing the results.
-
-import logging
-logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
 
+from abc import *
 import os
 import sys
 import subprocess
 import unittest
+import tempfile
+import resource
+from time import sleep
 from inspect import getdoc
+from hook import PollHook
+from vpp_pg_interface import VppPGInterface
+from vpp_papi_provider import VppPapiProvider
 
-from scapy.utils import wrpcap, rdpcap
 from scapy.packet import Raw
 
-## Static variables to store color formatting strings.
+from logging import *
+
+"""
+  Test framework module.
+
+  The module provides a set of tools for constructing and running tests and
+  representing the results.
+"""
+
+handler = StreamHandler(sys.stdout)
+getLogger().addHandler(handler)
+try:
+    verbose = int(os.getenv("V", 0))
+except:
+    verbose = 0
+# 40 = ERROR, 30 = WARNING, 20 = INFO, 10 = DEBUG, 0 = NOTSET (all messages)
+getLogger().setLevel(40 - 10 * verbose)
+getLogger("scapy.runtime").addHandler(handler)
+getLogger("scapy.runtime").setLevel(ERROR)
+
+# Static variables to store color formatting strings.
 #
-#  These variables (RED, GREEN, YELLOW and LPURPLE) are used to configure
-#  the color of the text to be printed in the terminal. Variable END is used
-#  to revert the text color to the default one.
+# These variables (RED, GREEN, YELLOW and LPURPLE) are used to configure
+# the color of the text to be printed in the terminal. Variable COLOR_RESET
+# is used to revert the text color to the default one.
 if hasattr(sys.stdout, 'isatty') and sys.stdout.isatty():
     RED = '\033[91m'
     GREEN = '\033[92m'
     YELLOW = '\033[93m'
     LPURPLE = '\033[94m'
-    END = '\033[0m'
+    COLOR_RESET = '\033[0m'
 else:
     RED = ''
     GREEN = ''
     YELLOW = ''
     LPURPLE = ''
-    END = ''
+    COLOR_RESET = ''
+
+
+""" @var formatting delimiter consisting of '=' characters """
+double_line_delim = '=' * 70
+""" @var formatting delimiter consisting of '-' characters """
+single_line_delim = '-' * 70
 
 
-## Private class to create packet info object.
-#
-#  Help process information about the next packet.
-#  Set variables to default values.
 class _PacketInfo(object):
+    """Private class to create packet info object.
+
+    Help process information about the next packet.
+    Set variables to default values.
+    @property index
+      Integer variable to store the index of the packet.
+    @property src
+      Integer variable to store the index of the source packet generator
+      interface of the packet.
+    @property dst
+      Integer variable to store the index of the destination packet generator
+      interface of the packet.
+    @property data
+      Object variable to store the copy of the former packet.
+
+
+    """
     index = -1
     src = -1
     dst = -1
     data = None
-    ## @var index
-    #  Integer variable to store the index of the packet.
-    ## @var src
-    #  Integer variable to store the index of the source packet generator
-    #  interface of the packet.
-    ## @var dst
-    #  Integer variable to store the index of the destination packet generator
-    #  interface of the packet.
-    ## @var data
-    #  Object variable to store the copy of the former packet.
-
-## Subclass of the python unittest.TestCase class.
-#
-#  This subclass is a base class for test cases that are implemented as classes.
-#  It provides methods to create and run test case.
+
+
 class VppTestCase(unittest.TestCase):
+    """
+    Subclass of the python unittest.TestCase class.
+
+    This subclass is a base class for test cases that are implemented as classes
+    It provides methods to create and run test case.
+
+    """
+
+    @property
+    def packet_infos(self):
+        """List of packet infos"""
+        return self._packet_infos
+
+    @packet_infos.setter
+    def packet_infos(self, value):
+        self._packet_infos = value
+
+    @classmethod
+    def instance(cls):
+        """Return the instance of this testcase"""
+        return cls.test_instance
 
-    ## Class method to set class constants necessary to run test case.
-    #  @param cls The class pointer.
     @classmethod
     def setUpConstants(cls):
+        """ Set-up the test case class based on environment variables """
+        try:
+            cls.interactive = True if int(os.getenv("I")) > 0 else False
+        except:
+            cls.interactive = False
+        if cls.interactive and resource.getrlimit(resource.RLIMIT_CORE)[0] <= 0:
+            # give a heads up if this is actually useless
+            critical("WARNING: core size limit is set 0, core files will NOT "
+                     "be created")
         cls.vpp_bin = os.getenv('VPP_TEST_BIN', "vpp")
         cls.plugin_path = os.getenv('VPP_TEST_PLUGIN_PATH')
-        cls.vpp_api_test_bin = os.getenv("VPP_TEST_API_TEST_BIN",
-                                         "vpp-api-test")
-        cls.vpp_cmdline = [cls.vpp_bin, "unix", "nodaemon", "api-segment", "{",
-                           "prefix", "unittest", "}"]
+        cls.vpp_cmdline = [cls.vpp_bin, "unix", "nodaemon",
+                           "api-segment", "{", "prefix", cls.shm_prefix, "}"]
         if cls.plugin_path is not None:
             cls.vpp_cmdline.extend(["plugin_path", cls.plugin_path])
+        info("vpp_cmdline: %s" % cls.vpp_cmdline)
 
-        cls.vpp_api_test_cmdline = [cls.vpp_api_test_bin, "chroot", "prefix",
-                                    "unittest"]
-        try:
-            cls.verbose = int(os.getenv("V", 0))
-        except:
-            cls.verbose = 0
-
-        ## @var vpp_bin
-        #  String variable to store the path to vpp (vector packet processor).
-        ## @var vpp_api_test_bin
-        #  String variable to store the path to vpp_api_test (vpp API test tool).
-        ## @var vpp_cmdline
-        #  List of command line attributes for vpp.
-        ## @var vpp_api_test_cmdline
-        #  List of command line attributes for vpp_api_test.
-        ## @var verbose
-        #  Integer variable to store required verbosity level.
-
-    ## Class method to start the test case.
-    #  1. Initiate test case constants and set test case variables to default
-    #  values.
-    #  2. Remove files from the shared memory.
-    #  3. Start vpp as a subprocess.
-    #  @param cls The class pointer.
     @classmethod
     def setUpClass(cls):
+        """
+        Perform class setup before running the testcase
+        Remove shared memory files, start vpp and connect the vpp-api
+        """
+        cls.tempdir = tempfile.mkdtemp(
+            prefix='vpp-unittest-' + cls.__name__ + '-')
+        cls.shm_prefix = cls.tempdir.split("/")[-1]
+        os.chdir(cls.tempdir)
+        info("Temporary dir is %s, shm prefix is %s",
+             cls.tempdir, cls.shm_prefix)
         cls.setUpConstants()
         cls.pg_streams = []
-        cls.MY_MACS = {}
-        cls.MY_IP4S = {}
-        cls.MY_IP6S = {}
-        cls.VPP_MACS = {}
-        cls.VPP_IP4S = {}
-        cls.VPP_IP6S = {}
         cls.packet_infos = {}
-        print "=================================================================="
-        print YELLOW + getdoc(cls) + END
-        print "=================================================================="
-        os.system("rm -f /dev/shm/unittest-global_vm")
-        os.system("rm -f /dev/shm/unittest-vpe-api")
-        os.system("rm -f /dev/shm/unittest-db")
-        cls.vpp = subprocess.Popen(cls.vpp_cmdline, stderr=subprocess.PIPE)
-        ## @var pg_streams
-        #  List variable to store packet-generator streams for interfaces.
-        ## @var MY_MACS
-        #  Dictionary variable to store host MAC addresses connected to packet
-        #  generator interfaces.
-        ## @var MY_IP4S
-        #  Dictionary variable to store host IPv4 addresses connected to packet
-        #  generator interfaces.
-        ## @var MY_IP6S
-        #  Dictionary variable to store host IPv6 addresses connected to packet
-        #  generator interfaces.
-        ## @var VPP_MACS
-        #  Dictionary variable to store VPP MAC addresses of the packet
-        #  generator interfaces.
-        ## @var VPP_IP4S
-        #  Dictionary variable to store VPP IPv4 addresses of the packet
-        #  generator interfaces.
-        ## @var VPP_IP6S
-        #  Dictionary variable to store VPP IPv6 addresses of the packet
-        #  generator interfaces.
-        ## @var vpp
-        #  Test case object variable to store file descriptor of running vpp
-        #  subprocess with open pipe to the standard error stream per
-        #  VppTestCase object.
-
-    ## Class method to do cleaning when all tests (test_) defined for
-    #  VppTestCase class are finished.
-    #  1. Terminate vpp and kill all vpp instances.
-    #  2. Remove files from the shared memory.
-    #  @param cls The class pointer.
+        cls.verbose = 0
+        print(double_line_delim)
+        print(YELLOW + getdoc(cls) + COLOR_RESET)
+        print(double_line_delim)
+        # need to catch exceptions here because if we raise, then the cleanup
+        # doesn't get called and we might end with a zombie vpp
+        try:
+            cls.vpp = subprocess.Popen(cls.vpp_cmdline, stderr=subprocess.PIPE)
+            debug("Spawned VPP with PID: %d" % cls.vpp.pid)
+            cls.vpp_dead = False
+            cls.vapi = VppPapiProvider(cls.shm_prefix, cls.shm_prefix)
+            cls.vapi.register_hook(PollHook(cls))
+            cls.vapi.connect()
+        except:
+            cls.vpp.terminate()
+            del cls.vpp
+
     @classmethod
     def quit(cls):
-        cls.vpp.terminate()
-        cls.vpp = None
-        os.system("rm -f /dev/shm/unittest-global_vm")
-        os.system("rm -f /dev/shm/unittest-vpe-api")
-        os.system("rm -f /dev/shm/unittest-db")
-
-    ## Class method to define tear down action of the VppTestCase class.
-    #  @param cls The class pointer.
+        """
+        Disconnect vpp-api, kill vpp and cleanup shared memory files
+        """
+        if hasattr(cls, 'vpp'):
+            cls.vapi.disconnect()
+            cls.vpp.poll()
+            if cls.vpp.returncode is None:
+                cls.vpp.terminate()
+            del cls.vpp
+
     @classmethod
     def tearDownClass(cls):
+        """ Perform final cleanup after running all tests in this test-case """
         cls.quit()
 
-    ## Method to define tear down VPP actions of the test case.
-    #  @param self The object pointer.
     def tearDown(self):
-        self.cli(2, "show int")
-        self.cli(2, "show trace")
-        self.cli(2, "show hardware")
-        self.cli(2, "show ip arp")
-        self.cli(2, "show ip fib")
-        self.cli(2, "show error")
-        self.cli(2, "show run")
-
-    ## Method to define setup action of the test case.
-    #  @param self The object pointer.
+        """ Show various debug prints after each test """
+        if not self.vpp_dead:
+            info(self.vapi.cli("show int"))
+            info(self.vapi.cli("show trace"))
+            info(self.vapi.cli("show hardware"))
+            info(self.vapi.cli("show error"))
+            info(self.vapi.cli("show run"))
+
     def setUp(self):
-        self.cli(2, "clear trace")
+        """ Clear trace before running each test"""
+        self.vapi.cli("clear trace")
+        # store the test instance inside the test class - so that objects
+        # holding the class can access instance methods (like assertEqual)
+        type(self).test_instance = self
 
-    ## Class method to print logs.
-    #  Based on set level of verbosity print text in the terminal.
-    #  @param cls The class pointer.
-    #  @param s String variable to store text to be printed.
-    #  @param v Integer variable to store required level of verbosity.
-    @classmethod
-    def log(cls, s, v=1):
-        if cls.verbose >= v:
-            print "LOG: " + LPURPLE + s + END
-
-    ## Class method to execute api commands.
-    #  Based on set level of verbosity print the output of the api command in
-    #  the terminal.
-    #  @param cls The class pointer.
-    #  @param s String variable to store api command string.
-    @classmethod
-    def api(cls, s):
-        p = subprocess.Popen(cls.vpp_api_test_cmdline,
-                             stdout=subprocess.PIPE,
-                             stdin=subprocess.PIPE,
-                             stderr=subprocess.PIPE)
-        if cls.verbose > 0:
-            print "API: " + RED + s + END
-        p.stdin.write(s)
-        out = p.communicate()[0]
-        out = out.replace("vat# ", "", 2)
-        if cls.verbose > 0:
-            if len(out) > 1:
-                print YELLOW + out + END
-        ## @var p
-        #  Object variable to store file descriptor of vpp_api_test subprocess
-        #  with open pipes to the standard output, inputs and error streams.
-        ## @var out
-        #  Tuple variable to store standard output of vpp_api_test subprocess
-        #  where the string "vat# " is replaced by empty string later.
-
-    ## Class method to execute cli commands.
-    #  Based on set level of verbosity of the log and verbosity defined by
-    #  environmental variable execute the cli command and print the output in
-    #  the terminal.
-    #  CLI command is executed via vpp API test tool (exec + cli_command)
-    #  @param cls The class pointer.
-    #  @param v Integer variable to store required level of verbosity.
-    #  @param s String variable to store cli command string.
-    @classmethod
-    def cli(cls, v, s):
-        if cls.verbose < v:
-            return
-        p = subprocess.Popen(cls.vpp_api_test_cmdline,
-                             stdout=subprocess.PIPE,
-                             stdin=subprocess.PIPE,
-                             stderr=subprocess.PIPE)
-        if cls.verbose > 0:
-            print "CLI: " + RED + s + END
-        p.stdin.write('exec ' + s)
-        out = p.communicate()[0]
-        out = out.replace("vat# ", "", 2)
-        if cls.verbose > 0:
-            if len(out) > 1:
-                print YELLOW + out + END
-        ## @var p
-        #  Object variable to store file descriptor of vpp_api_test subprocess
-        #  with open pipes to the standard output, inputs and error streams.
-        ## @var out
-        #  Tuple variable to store standard output of vpp_api_test subprocess
-        #  where the string "vat# " is replaced by empty string later.
-
-    ## Class method to create incoming packet stream for the packet-generator
-    #  interface.
-    #  Delete old /tmp/pgX_in.pcap file if exists and create the empty one and
-    #  fill it with provided packets and add it to pg_streams list.
-    #  @param cls The class pointer.
-    #  @param i Integer variable to store the index of the packet-generator
-    #  interface to create packet stream for.
-    #  @param pkts List variable to store packets to be added to the stream.
     @classmethod
-    def pg_add_stream(cls, i, pkts):
-        os.system("rm -f /tmp/pg%u_in.pcap" % i)
-        wrpcap("/tmp/pg%u_in.pcap" % i, pkts)
-        # no equivalent API command
-        cls.cli(0, "packet-generator new pcap /tmp/pg%u_in.pcap source pg%u"
-                   " name pcap%u" % (i, i, i))
-        cls.pg_streams.append('pcap%u' % i)
-
-    ## Class method to enable packet capturing for the packet-generator
-    #  interface.
-    #  Delete old /tmp/pgX_out.pcap file if exists and set the packet-generator
-    #  to capture outgoing packets to /tmp/pgX_out.pcap file.
-    #  @param cls The class pointer.
-    #  @param args List variable to store the indexes of the packet-generator
-    #  interfaces to start packet capturing for.
-    @classmethod
-    def pg_enable_capture(cls, args):
-        for i in args:
-            os.system("rm -f /tmp/pg%u_out.pcap" % i)
-            cls.cli(0, "packet-generator capture pg%u pcap /tmp/pg%u_out.pcap"
-                    % (i, i))
-
-    ## Class method to start packet sending.
-    #  Start to send packets for all defined pg streams. Delete every stream
-    #  from the stream list when sent and clear the pg_streams list.
-    #  @param cls The class pointer.
+    def pg_enable_capture(cls, interfaces):
+        """
+        Enable capture on packet-generator interfaces
+
+        :param interfaces: iterable interface indexes
+
+        """
+        for i in interfaces:
+            i.enable_capture()
+
     @classmethod
     def pg_start(cls):
-        cls.cli(2, "trace add pg-input 50")  # 50 is maximum
-        cls.cli(0, 'packet-generator enable')
+        """
+        Enable the packet-generator and send all prepared packet streams
+        Remove the packet streams afterwards
+        """
+        cls.vapi.cli("trace add pg-input 50")  # 50 is maximum
+        cls.vapi.cli('packet-generator enable')
+        sleep(1)  # give VPP some time to process the packets
         for stream in cls.pg_streams:
-            cls.cli(0, 'packet-generator delete %s' % stream)
+            cls.vapi.cli('packet-generator delete %s' % stream)
         cls.pg_streams = []
 
-    ## Class method to return captured packets.
-    #  Return packet captured for the defined packet-generator interface. Open
-    #  the corresponding pcap file (/tmp/pgX_out.pcap), read the content and
-    #  store captured packets to output variable.
-    #  @param cls The class pointer.
-    #  @param o Integer variable to store the index of the packet-generator
-    #  interface.
-    #  @return output List of packets captured on the defined packet-generator
-    #  interface. If the corresponding pcap file (/tmp/pgX_out.pcap) does not
-    #  exist return empty list.
-    @classmethod
-    def pg_get_capture(cls, o):
-        pcap_filename = "/tmp/pg%u_out.pcap" % o
-        try:
-            output = rdpcap(pcap_filename)
-        except IOError:  # TODO
-            cls.log("WARNING: File %s does not exist, probably because no"
-                    " packets arrived" % pcap_filename)
-            return []
-        return output
-        ## @var pcap_filename
-        #  File descriptor to the corresponding pcap file.
-
-    ## Class method to create packet-generator interfaces.
-    #  Create packet-generator interfaces and add host MAC addresses connected
-    #  to these packet-generator interfaces to the MY_MACS dictionary.
-    #  @param cls The class pointer.
-    #  @param args List variable to store the indexes of the packet-generator
-    #  interfaces to be created.
     @classmethod
-    def create_interfaces(cls, args):
-        for i in args:
-            cls.MY_MACS[i] = "02:00:00:00:ff:%02x" % i
-            cls.log("My MAC address is %s" % (cls.MY_MACS[i]))
-            cls.api("pg_create_interface if_id %u" % i)
-            cls.api("sw_interface_set_flags pg%u admin-up" % i)
-
-    ## Static method to extend packet to specified size
-    #  Extend provided packet to the specified size (including Ethernet FCS).
-    #  The packet is extended by adding corresponding number of spaces to the
-    #  packet payload.
-    #  NOTE: Currently works only when Raw layer is present.
-    #  @param packet Variable to store packet object.
-    #  @param size Integer variable to store the required size of the packet.
+    def create_pg_interfaces(cls, interfaces):
+        """
+        Create packet-generator interfaces
+
+        :param interfaces: iterable indexes of the interfaces
+
+        """
+        result = []
+        for i in interfaces:
+            intf = VppPGInterface(cls, i)
+            setattr(cls, intf.name, intf)
+            result.append(intf)
+        cls.pg_interfaces = result
+        return result
+
     @staticmethod
     def extend_packet(packet, size):
+        """
+        Extend packet to given size by padding with spaces
+        NOTE: Currently works only when Raw layer is present.
+
+        :param packet: packet
+        :param size: target size
+
+        """
         packet_len = len(packet) + 4
         extend = size - packet_len
         if extend > 0:
             packet[Raw].load += ' ' * extend
-        ## @var packet_len
-        #  Integer variable to store the current packet length including
-        #  Ethernet FCS.
-        ## @var extend
-        #  Integer variable to store the size of the packet extension.
-
-    ## Method to add packet info object to the packet_infos list.
-    #  Extend the existing packet_infos list with the given information from
-    #  the packet.
-    #  @param self The object pointer.
-    #  @param info Object to store required information from the packet.
+
     def add_packet_info_to_list(self, info):
+        """
+        Add packet info to the testcase's packet info list
+
+        :param info: packet info
+
+        """
         info.index = len(self.packet_infos)
         self.packet_infos[info.index] = info
-        ## @var info.index
-        # Info object attribute to store the packet order in the stream.
-        ## @var packet_infos
-        #  List variable to store required information from packets.
-
-    ## Method to create packet info object.
-    #  Create the existing packet_infos list with the given information from
-    #  the packet.
-    #  @param self The object pointer.
-    #  @param pg_id Integer variable to store the index of the packet-generator
-    #  interface.
-    def create_packet_info(self, pg_id, target_id):
+
+    def create_packet_info(self, src_pg_index, dst_pg_index):
+        """
+        Create packet info object containing the source and destination indexes
+        and add it to the testcase's packet info list
+
+        :param src_pg_index: source packet-generator index
+        :param dst_pg_index: destination packet-generator index
+
+        :returns: _PacketInfo object
+
+        """
         info = _PacketInfo()
         self.add_packet_info_to_list(info)
-        info.src = pg_id
-        info.dst = target_id
+        info.src = src_pg_index
+        info.dst = dst_pg_index
         return info
-        ## @var info
-        #  Object to store required information from packet.
-        ## @var info.src
-        #  Info object attribute to store the index of the source packet
-        #  generator interface of the packet.
-        ## @var info.dst
-        #  Info object attribute to store the index of the destination packet
-        #  generator interface of the packet.
-
-    ## Static method to return packet info string.
-    #  Create packet info string from the provided info object that will be put
-    #  to the packet payload.
-    #  @param info Object to store required information from the packet.
-    #  @return String of information about packet's order in the stream, source
-    #  and destination packet generator interface.
+
     @staticmethod
     def info_to_payload(info):
+        """
+        Convert _PacketInfo object to packet payload
+
+        :param info: _PacketInfo object
+
+        :returns: string containing serialized data from packet info
+        """
         return "%d %d %d" % (info.index, info.src, info.dst)
 
-    ## Static method to create packet info object from the packet payload.
-    #  Create packet info object and set its attribute values based on data
-    #  gained from the packet payload.
-    #  @param payload String variable to store packet payload.
-    #  @return info Object to store required information about the packet.
     @staticmethod
     def payload_to_info(payload):
+        """
+        Convert packet payload to _PacketInfo object
+
+        :param payload: packet payload
+
+        :returns: _PacketInfo object containing de-serialized data from payload
+
+        """
         numbers = payload.split()
         info = _PacketInfo()
         info.index = int(numbers[0])
         info.src = int(numbers[1])
         info.dst = int(numbers[2])
         return info
-        ## @var info.index
-        #  Info object attribute to store the packet order in the stream.
-        ## @var info.src
-        #  Info object attribute to store the index of the source packet
-        #  generator interface of the packet.
-        ## @var info.dst
-        #  Info object attribute to store the index of the destination packet
-        #  generator interface of the packet.
-
-    ## Method to return packet info object of the next packet in
-    #  the packet_infos list.
-    #  Get the next packet info object from the packet_infos list by increasing
-    #  the packet_infos list index by one.
-    #  @param self The object pointer.
-    #  @param info Object to store required information about the packet.
-    #  @return packet_infos[next_index] Next info object from the packet_infos
-    #  list with stored information about packets. Return None if the end of
-    #  the list is reached.
+
     def get_next_packet_info(self, info):
+        """
+        Iterate over the packet info list stored in the testcase
+        Start iteration with first element if info is None
+        Continue based on index in info if info is specified
+
+        :param info: info or None
+        :returns: next info in list or None if no more infos
+        """
         if info is None:
             next_index = 0
         else:
@@ -427,208 +318,208 @@ class VppTestCase(unittest.TestCase):
             return None
         else:
             return self.packet_infos[next_index]
-        ## @var next_index
-        #  Integer variable to store the index of the next info object.
-
-    ## Method to return packet info object of the next packet with the required
-    #  source packet generator interface.
-    #  Iterate over the packet_infos list and search for the next packet info
-    #  object with the required source packet generator interface.
-    #  @param self The object pointer.
-    #  @param src_pg Integer variable to store index of requested source packet
-    #  generator interface.
-    #  @param info Object to store required information about the packet.
-    #  @return packet_infos[next_index] Next info object from the packet_infos
-    #  list with stored information about packets. Return None if the end of
-    #  the list is reached.
-    def get_next_packet_info_for_interface(self, src_pg, info):
+
+    def get_next_packet_info_for_interface(self, src_index, info):
+        """
+        Search the packet info list for the next packet info with same source
+        interface index
+
+        :param src_index: source interface index to search for
+        :param info: packet info - where to start the search
+        :returns: packet info or None
+
+        """
         while True:
             info = self.get_next_packet_info(info)
             if info is None:
                 return None
-            if info.src == src_pg:
+            if info.src == src_index:
                 return info
-        ## @var info.src
-        #  Info object attribute to store the index of the source packet
-        #  generator interface of the packet.
-
-    ## Method to return packet info object of the next packet with required
-    #  source and destination packet generator interfaces.
-    #  Search for the next packet info object with the required source and
-    #  destination packet generator interfaces.
-    #  @param self The object pointer.
-    #  @param src_pg Integer variable to store the index of the requested source
-    #  packet generator interface.
-    #  @param dst_pg Integer variable to store the index of the requested source
-    #  packet generator interface.
-    #  @param info Object to store required information about the packet.
-    #  @return info Object with the info about the next packet with with
-    #  required source and destination packet generator interfaces. Return None
-    #  if there is no other packet with required data.
-    def get_next_packet_info_for_interface2(self, src_pg, dst_pg, info):
+
+    def get_next_packet_info_for_interface2(self, src_index, dst_index, info):
+        """
+        Search the packet info list for the next packet info with same source
+        and destination interface indexes
+
+        :param src_index: source interface index to search for
+        :param dst_index: destination interface index to search for
+        :param info: packet info - where to start the search
+        :returns: packet info or None
+
+        """
         while True:
-            info = self.get_next_packet_info_for_interface(src_pg, info)
+            info = self.get_next_packet_info_for_interface(src_index, info)
             if info is None:
                 return None
-            if info.dst == dst_pg:
+            if info.dst == dst_index:
                 return info
-        ## @var info.dst
-        #  Info object attribute to store the index of the destination packet
-        #  generator interface of the packet.
 
 
-## Subclass of the python unittest.TestResult class.
-#
-#  This subclass provides methods to compile information about which tests have
-#  succeeded and which have failed.
 class VppTestResult(unittest.TestResult):
-    ## The constructor.
-    #  @param stream File descriptor to store where to report test results. Set
-    #  to the standard error stream by default.
-    #  @param descriptions Boolean variable to store information if to use test
-    #  case descriptions.
-    #  @param verbosity Integer variable to store required verbosity level.
+    """
+    @property result_string
+     String variable to store the test case result string.
+    @property errors
+     List variable containing 2-tuples of TestCase instances and strings
+     holding formatted tracebacks. Each tuple represents a test which
+     raised an unexpected exception.
+    @property failures
+     List variable containing 2-tuples of TestCase instances and strings
+     holding formatted tracebacks. Each tuple represents a test where
+     a failure was explicitly signalled using the TestCase.assert*()
+     methods.
+    """
+
     def __init__(self, stream, descriptions, verbosity):
+        """
+        :param stream File descriptor to store where to report test results. Set
+            to the standard error stream by default.
+        :param descriptions Boolean variable to store information if to use test
+            case descriptions.
+        :param verbosity Integer variable to store required verbosity level.
+        """
         unittest.TestResult.__init__(self, stream, descriptions, verbosity)
         self.stream = stream
         self.descriptions = descriptions
         self.verbosity = verbosity
         self.result_string = None
-        ## @var result_string
-        #  String variable to store the test case result string.
-
 
-    ## Method called when the test case succeeds.
-    #  Run the default implementation (that does nothing) and set the result
-    #  string in case of test case success.
-    #  @param self The object pointer.
-    #  @param test Object variable to store the test case instance.
     def addSuccess(self, test):
+        """
+        Record a test succeeded result
+
+        :param test:
+
+        """
         unittest.TestResult.addSuccess(self, test)
-        self.result_string = GREEN + "OK" + END
-        ## @var result_string
-        #  String variable to store the test case result string.
-
-    ## Method called when the test case signals a failure.
-    #  Run the default implementation that appends a tuple (test, formatted_err)
-    #  to the instance's failures attribute, where formatted_err is a formatted
-    #  traceback derived from err and set the result string in case of test case
-    #  success.
-    #  @param self The object pointer.
-    #  @param test Object variable to store the test case instance.
-    #  @param err Tuple variable to store the error data:
-    #  (type, value, traceback).
+        self.result_string = GREEN + "OK" + COLOR_RESET
+
+    def addSkip(self, test, reason):
+        """
+        Record a test skipped.
+
+        :param test:
+        :param reason:
+
+        """
+        unittest.TestResult.addSkip(self, test, reason)
+        self.result_string = YELLOW + "SKIP" + COLOR_RESET
+
     def addFailure(self, test, err):
+        """
+        Record a test failed result
+
+        :param test:
+        :param err: error message
+
+        """
         unittest.TestResult.addFailure(self, test, err)
-        self.result_string = RED + "FAIL" + END
-        ## @var result_string
-        #  String variable to store the test case result string.
-
-    ## Method called when the test case raises an unexpected exception.
-    #  Run the default implementation that appends a tuple (test, formatted_err)
-    #  to the instance's error attribute, where formatted_err is a formatted
-    #  traceback derived from err and set the result string in case of test case
-    #  unexpected failure.
-    #  @param self The object pointer.
-    #  @param test Object variable to store the test case instance.
-    #  @param err Tuple variable to store the error data:
-    #  (type, value, traceback).
+        if hasattr(test, 'tempdir'):
+            self.result_string = RED + "FAIL" + COLOR_RESET + \
+                ' [ temp dir used by test case: ' + test.tempdir + ' ]'
+        else:
+            self.result_string = RED + "FAIL" + COLOR_RESET + ' [no temp dir]'
+
     def addError(self, test, err):
+        """
+        Record a test error result
+
+        :param test:
+        :param err: error message
+
+        """
         unittest.TestResult.addError(self, test, err)
-        self.result_string = RED + "ERROR" + END
-        ## @var result_string
-        #  String variable to store the test case result string.
-
-    ## Method to get the description of the test case.
-    #  Used to get the description string from the test case object.
-    #  @param self The object pointer.
-    #  @param test Object variable to store the test case instance.
-    #  @return String of the short description if exist otherwise return test
-    #  case name string.
+        if hasattr(test, 'tempdir'):
+            self.result_string = RED + "ERROR" + COLOR_RESET + \
+                ' [ temp dir used by test case: ' + test.tempdir + ' ]'
+        else:
+            self.result_string = RED + "ERROR" + COLOR_RESET + ' [no temp dir]'
+
     def getDescription(self, test):
+        """
+        Get test description
+
+        :param test:
+        :returns: test description
+
+        """
         # TODO: if none print warning not raise exception
         short_description = test.shortDescription()
         if self.descriptions and short_description:
             return short_description
         else:
             return str(test)
-        ## @var short_description
-        #  String variable to store the short description of the test case.
-
-    ## Method called when the test case is about to be run.
-    #  Run the default implementation and based on the set verbosity level write
-    #  the starting string to the output stream.
-    #  @param self The object pointer.
-    #  @param test Object variable to store the test case instance.
+
     def startTest(self, test):
+        """
+        Start a test
+
+        :param test:
+
+        """
         unittest.TestResult.startTest(self, test)
         if self.verbosity > 0:
-            self.stream.writeln("Starting " + self.getDescription(test) + " ...")
-            self.stream.writeln("------------------------------------------------------------------")
-
-    ## Method called after the test case has been executed.
-    #  Run the default implementation and based on the set verbosity level write
-    #  the result string to the output stream.
-    #  @param self The object pointer.
-    #  @param test Object variable to store the test case instance.
+            self.stream.writeln(
+                "Starting " + self.getDescription(test) + " ...")
+            self.stream.writeln(single_line_delim)
+
     def stopTest(self, test):
+        """
+        Stop a test
+
+        :param test:
+
+        """
         unittest.TestResult.stopTest(self, test)
         if self.verbosity > 0:
-            self.stream.writeln("------------------------------------------------------------------")
-            self.stream.writeln("%-60s%s" % (self.getDescription(test), self.result_string))
-            self.stream.writeln("------------------------------------------------------------------")
+            self.stream.writeln(single_line_delim)
+            self.stream.writeln("%-60s%s" %
+                                (self.getDescription(test), self.result_string))
+            self.stream.writeln(single_line_delim)
         else:
-            self.stream.writeln("%-60s%s" % (self.getDescription(test), self.result_string))
+            self.stream.writeln("%-60s%s" %
+                                (self.getDescription(test), self.result_string))
 
-    ## Method to write errors and failures information to the output stream.
-    #  Write content of errors and failures lists to the output stream.
-    #  @param self The object pointer.
     def printErrors(self):
+        """
+        Print errors from running the test case
+        """
         self.stream.writeln()
         self.printErrorList('ERROR', self.errors)
         self.printErrorList('FAIL', self.failures)
-        ## @var errors
-        #  List variable containing 2-tuples of TestCase instances and strings
-        #  holding formatted tracebacks. Each tuple represents a test which
-        #  raised an unexpected exception.
-        ## @var failures
-        #  List variable containing 2-tuples of TestCase instances and strings
-        #  holding formatted tracebacks. Each tuple represents a test where
-        #  a failure was explicitly signalled using the TestCase.assert*()
-        #  methods.
-
-    ## Method to write the error information to the output stream.
-    #  Write content of error lists to the output stream together with error
-    #  type and test case description.
-    #  @param self The object pointer.
-    #  @param flavour String variable to store error type.
-    #  @param errors List variable to store 2-tuples of TestCase instances and
-    #  strings holding formatted tracebacks.
+
     def printErrorList(self, flavour, errors):
+        """
+        Print error list to the output stream together with error type
+        and test case description.
+
+        :param flavour: error type
+        :param errors: iterable errors
+
+        """
         for test, err in errors:
-            self.stream.writeln('=' * 70)
-            self.stream.writeln("%s: %s" % (flavour, self.getDescription(test)))
-            self.stream.writeln('-' * 70)
+            self.stream.writeln(double_line_delim)
+            self.stream.writeln("%s: %s" %
+                                (flavour, self.getDescription(test)))
+            self.stream.writeln(single_line_delim)
             self.stream.writeln("%s" % err)
-        ## @var test
-        #  Object variable to store the test case instance.
-        ## @var err
-        #  String variable to store formatted tracebacks.
 
 
-## Subclass of the python unittest.TextTestRunner class.
-#
-#  A basic test runner implementation which prints results on standard error.
 class VppTestRunner(unittest.TextTestRunner):
-    ##  Class object variable to store the results of a set of tests.
-    resultclass = VppTestResult
-
-    ## Method to run the test.
-    #  Print debug message in the terminal and run the standard run() method
-    #  of the test runner collecting the result into the test result object.
-    #  @param self The object pointer.
-    #  @param test Object variable to store the test case instance.
-    #  @return Test result object of the VppTestRunner.
+    """
+    A basic test runner implementation which prints results on standard error.
+    """
+    @property
+    def resultclass(self):
+        """Class maintaining the results of the tests"""
+        return VppTestResult
+
     def run(self, test):
-        print "Running tests using custom test runner"  # debug message
+        """
+        Run the tests
+
+        :param test:
+
+        """
+        print("Running tests using custom test runner")  # debug message
         return super(VppTestRunner, self).run(test)
diff --git a/test/hook.py b/test/hook.py
new file mode 100644
index 00000000..9489aa9d
--- /dev/null
+++ b/test/hook.py
@@ -0,0 +1,128 @@
+import signal
+import os
+import pexpect
+from logging import *
+
+
+class Hook(object):
+    """
+    Generic hooks before/after API/CLI calls
+    """
+
+    def before_api(self, api_name, api_args):
+        """
+        Function called before API call
+        Emit a debug message describing the API name and arguments
+
+        @param api_name: name of the API
+        @param api_args: tuple containing the API arguments
+        """
+        debug("API: %s (%s)" % (api_name, api_args))
+
+    def after_api(self, api_name, api_args):
+        """
+        Function called after API call
+
+        @param api_name: name of the API
+        @param api_args: tuple containing the API arguments
+        """
+        pass
+
+    def before_cli(self, cli):
+        """
+        Function called before CLI call
+        Emit a debug message describing the CLI
+
+        @param cli: CLI string
+        """
+        debug("CLI: %s" % (cli))
+
+    def after_cli(self, cli):
+        """
+        Function called after CLI call
+        """
+        pass
+
+
+class VppDiedError(Exception):
+    pass
+
+
+class PollHook(Hook):
+    """ Hook which checks if the vpp subprocess is alive """
+
+    def __init__(self, testcase):
+        self.vpp_dead = False
+        self.testcase = testcase
+
+    def spawn_gdb(self, gdb_path, core_path):
+        gdb_cmdline = gdb_path + ' ' + self.testcase.vpp_bin + ' ' + core_path
+        gdb = pexpect.spawn(gdb_cmdline)
+        gdb.interact()
+        try:
+            gdb.terminate(True)
+        except:
+            pass
+        if gdb.isalive():
+            raise Exception("GDB refused to die...")
+
+    def on_crash(self, core_path):
+        if self.testcase.interactive:
+            gdb_path = '/usr/bin/gdb'
+            if os.path.isfile(gdb_path) and os.access(gdb_path, os.X_OK):
+                # automatically attach gdb
+                self.spawn_gdb(gdb_path, core_path)
+                return
+            else:
+                error("Debugger '%s' does not exist or is not an executable.." %
+                      gdb_path)
+
+        critical('core file present, debug with: gdb ' +
+                 self.testcase.vpp_bin + ' ' + core_path)
+
+    def poll_vpp(self):
+        """
+        Poll the vpp status and throw an exception if it's not running
+        :raises VppDiedError: exception if VPP is not running anymore
+        """
+        if self.vpp_dead:
+            # already dead, nothing to do
+            return
+
+        self.testcase.vpp.poll()
+        if self.testcase.vpp.returncode is not None:
+            signaldict = dict(
+                (k, v) for v, k in reversed(sorted(signal.__dict__.items()))
+                if v.startswith('SIG') and not v.startswith('SIG_'))
+            msg = "VPP subprocess died unexpectedly with returncode %d [%s]" % (
+                self.testcase.vpp.returncode,
+                signaldict[abs(self.testcase.vpp.returncode)])
+            critical(msg)
+            core_path = self.testcase.tempdir + '/core'
+            if os.path.isfile(core_path):
+                self.on_crash(core_path)
+            self.testcase.vpp_dead = True
+            raise VppDiedError(msg)
+
+    def after_api(self, api_name, api_args):
+        """
+        Check if VPP died after executing an API
+
+        :param api_name: name of the API
+        :param api_args: tuple containing the API arguments
+        :raises VppDiedError: exception if VPP is not running anymore
+
+        """
+        super(PollHook, self).after_api(api_name, api_args)
+        self.poll_vpp()
+
+    def after_cli(self, cli):
+        """
+        Check if VPP died after executing a CLI
+
+        :param cli: CLI string
+        :raises Exception: exception if VPP is not running anymore
+
+        """
+        super(PollHook, self).after_cli(cli)
+        self.poll_vpp()
diff --git a/test/template_bd.py b/test/template_bd.py
index 473c4228..6c6fb3da 100644
--- a/test/template_bd.py
+++ b/test/template_bd.py
@@ -7,100 +7,94 @@ from scapy.layers.inet import IP, UDP
 
 
 class BridgeDomain(object):
-    def __init__(self):
-        ## Ethernet frame which is send to pg0 interface and is forwarded to pg1
-        self.payload_0_1 = (
-            Ether(src='00:00:00:00:00:01', dst='00:00:00:00:00:02') /
-            IP(src='1.2.3.4', dst='4.3.2.1') /
-            UDP(sport=10000, dport=20000) /
-            Raw('\xa5' * 100))
-
-        ## Ethernet frame which is send to pg1 interface and is forwarded to pg0
-        self.payload_1_0 = (
-            Ether(src='00:00:00:00:00:02', dst='00:00:00:00:00:01') /
-            IP(src='4.3.2.1', dst='1.2.3.4') /
-            UDP(sport=20000, dport=10000) /
-            Raw('\xa5' * 100))
-
-    ## Test case must implement this method, so template known how to send
-    #  encapsulated frame.
+    """ Bridge domain abstraction """
+
+    @property
+    def frame_pg0_to_pg1(self):
+        """ Ethernet frame sent from pg0 and expected to arrive at pg1 """
+        return (Ether(src='00:00:00:00:00:01', dst='00:00:00:00:00:02') /
+                IP(src='1.2.3.4', dst='4.3.2.1') /
+                UDP(sport=10000, dport=20000) /
+                Raw('\xa5' * 100))
+
+    @property
+    def frame_pg1_to_pg0(self):
+        """ Ethernet frame sent from pg1 and expected to arrive at pg0 """
+        return (Ether(src='00:00:00:00:00:02', dst='00:00:00:00:00:01') /
+                IP(src='4.3.2.1', dst='1.2.3.4') /
+                UDP(sport=20000, dport=10000) /
+                Raw('\xa5' * 100))
+
     @abstractmethod
     def encapsulate(self, pkt):
+        """ Encapsulate packet """
         pass
 
-    ## Test case must implement this method, so template known how to get
-    #  original payload.
     @abstractmethod
     def decapsulate(self, pkt):
+        """ Decapsulate packet """
         pass
 
-    ## Test case must implement this method, so template known how if the
-    #  received frame is corectly encapsulated.
     @abstractmethod
     def check_encapsulation(self, pkt):
+        """ Verify the encapsulation """
         pass
 
-    ## On pg0 interface are encapsulated frames, on pg1 are testing frames
-    #  without encapsulation
     def test_decap(self):
-        ## Prepare Ethernet frame that will be send encapsulated.
-        pkt_to_send = self.encapsulate(self.payload_0_1)
+        """ Decapsulation test
+        Send encapsulated frames from pg0
+        Verify receipt of decapsulated frames on pg1
+        """
+
+        encapsulated_pkt = self.encapsulate(self.frame_pg0_to_pg1)
 
-        ## Add packet to list of packets.
-        self.pg_add_stream(0, [pkt_to_send, ])
+        self.pg0.add_stream([encapsulated_pkt, ])
 
-        ## Enable Packet Capture on both ports.
-        self.pg_enable_capture([0, 1])
+        self.pg1.enable_capture()
 
-        ## Start all streams
         self.pg_start()
 
-        ## Pick first received frame and check if is same as non-encapsulated
-        #  frame.
-        out = self.pg_get_capture(1)
+        # Pick first received frame and check if it's the non-encapsulated frame
+        out = self.pg1.get_capture()
         self.assertEqual(len(out), 1,
                          'Invalid number of packets on '
                          'output: {}'.format(len(out)))
         pkt = out[0]
 
         # TODO: add error messages
-        self.assertEqual(pkt[Ether].src, self.payload_0_1[Ether].src)
-        self.assertEqual(pkt[Ether].dst, self.payload_0_1[Ether].dst)
-        self.assertEqual(pkt[IP].src, self.payload_0_1[IP].src)
-        self.assertEqual(pkt[IP].dst, self.payload_0_1[IP].dst)
-        self.assertEqual(pkt[UDP].sport, self.payload_0_1[UDP].sport)
-        self.assertEqual(pkt[UDP].dport, self.payload_0_1[UDP].dport)
-        self.assertEqual(pkt[Raw], self.payload_0_1[Raw])
-
-    ## Send non-encapsulated Ethernet frame from pg1 interface and expect
-    #  encapsulated frame on pg0. On pg0 interface are encapsulated frames,
-    #  on pg1 are testing frames without encapsulation.
+        self.assertEqual(pkt[Ether].src, self.frame_pg0_to_pg1[Ether].src)
+        self.assertEqual(pkt[Ether].dst, self.frame_pg0_to_pg1[Ether].dst)
+        self.assertEqual(pkt[IP].src, self.frame_pg0_to_pg1[IP].src)
+        self.assertEqual(pkt[IP].dst, self.frame_pg0_to_pg1[IP].dst)
+        self.assertEqual(pkt[UDP].sport, self.frame_pg0_to_pg1[UDP].sport)
+        self.assertEqual(pkt[UDP].dport, self.frame_pg0_to_pg1[UDP].dport)
+        self.assertEqual(pkt[Raw], self.frame_pg0_to_pg1[Raw])
+
     def test_encap(self):
-        ## Create packet generator stream.
-        self.pg_add_stream(1, [self.payload_1_0])
+        """ Encapsulation test
+        Send frames from pg1
+        Verify receipt of encapsulated frames on pg0
+        """
+        self.pg1.add_stream([self.frame_pg1_to_pg0])
 
-        ## Enable Packet Capture on both ports.
-        self.pg_enable_capture([0, 1])
+        self.pg0.enable_capture()
 
-        ## Start all streams.
         self.pg_start()
 
-        ## Pick first received frame and check if is corectly encapsulated.
-        out = self.pg_get_capture(0)
+        # Pick first received frame and check if it's corectly encapsulated.
+        out = self.pg0.get_capture()
         self.assertEqual(len(out), 1,
                          'Invalid number of packets on '
                          'output: {}'.format(len(out)))
-        rcvd = out[0]
-        self.check_encapsulation(rcvd)
+        pkt = out[0]
+        self.check_encapsulation(pkt)
 
-        ## Get original frame from received packet and check if is same as
-        #  sended frame.
-        rcvd_payload = self.decapsulate(rcvd)
+        payload = self.decapsulate(pkt)
         # TODO: add error messages
-        self.assertEqual(rcvd_payload[Ether].src, self.payload_1_0[Ether].src)
-        self.assertEqual(rcvd_payload[Ether].dst, self.payload_1_0[Ether].dst)
-        self.assertEqual(rcvd_payload[IP].src, self.payload_1_0[IP].src)
-        self.assertEqual(rcvd_payload[IP].dst, self.payload_1_0[IP].dst)
-        self.assertEqual(rcvd_payload[UDP].sport, self.payload_1_0[UDP].sport)
-        self.assertEqual(rcvd_payload[UDP].dport, self.payload_1_0[UDP].dport)
-        self.assertEqual(rcvd_payload[Raw], self.payload_1_0[Raw])
+        self.assertEqual(payload[Ether].src, self.frame_pg1_to_pg0[Ether].src)
+        self.assertEqual(payload[Ether].dst, self.frame_pg1_to_pg0[Ether].dst)
+        self.assertEqual(payload[IP].src, self.frame_pg1_to_pg0[IP].src)
+        self.assertEqual(payload[IP].dst, self.frame_pg1_to_pg0[IP].dst)
+        self.assertEqual(payload[UDP].sport, self.frame_pg1_to_pg0[UDP].sport)
+        self.assertEqual(payload[UDP].dport, self.frame_pg1_to_pg0[UDP].dport)
+        self.assertEqual(payload[Raw], self.frame_pg1_to_pg0[Raw])
diff --git a/test/test_ip.py b/test/test_ip.py
index 3a2c9011..48155a5a 100644
--- a/test/test_ip.py
+++ b/test/test_ip.py
@@ -1,230 +1,125 @@
 #!/usr/bin/env python
 
-import logging
-logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
-
 import unittest
+import socket
+from logging import *
+
 from framework import VppTestCase, VppTestRunner
-from util import Util
+from vpp_sub_interface import VppSubInterface, VppDot1QSubint, VppDot1ADSubint
 
 from scapy.packet import Raw
-from scapy.layers.l2 import Ether, ARP, Dot1Q
+from scapy.layers.l2 import Ether, Dot1Q, ARP
 from scapy.layers.inet import IP, UDP
 
 
-class TestIPv4(Util, VppTestCase):
+class TestIPv4(VppTestCase):
     """ IPv4 Test Case """
 
     @classmethod
     def setUpClass(cls):
         super(TestIPv4, cls).setUpClass()
 
-        try:
-            cls.create_interfaces_and_subinterfaces()
-
-            # configure IPv4 on hardware interfaces
-            cls.config_ip4(cls.interfaces)
-
-            cls.config_ip4_on_software_interfaces(cls.interfaces)
-
-            # resolve ARP using hardware interfaces
-            cls.resolve_arp(cls.interfaces)
-
-            # let VPP know MAC addresses of peer (sub)interfaces
-            cls.resolve_arp_on_software_interfaces(cls.interfaces)
-
-            # config 2M FIB enries
-            cls.config_fib_entries(2000000)
-
-        except Exception as e:
-            super(TestIPv4, cls).tearDownClass()
-            raise
-
-    def tearDown(self):
-        self.cli(2, "show int")
-        self.cli(2, "show trace")
-        self.cli(2, "show hardware")
-        self.cli(2, "show ip arp")
-        # self.cli(2, "show ip fib")  # 2M entries
-        self.cli(2, "show error")
-        self.cli(2, "show run")
-
-    @classmethod
-    def create_vlan_subif(cls, pg_index, vlan):
-        cls.api("create_vlan_subif pg%u vlan %u" % (pg_index, vlan))
-
-    @classmethod
-    def create_dot1ad_subif(cls, pg_index, sub_id, outer_vlan_id, inner_vlan_id):
-        cls.api("create_subif pg%u sub_id %u outer_vlan_id %u inner_vlan_id %u dot1ad"
-                 % (pg_index, sub_id, outer_vlan_id, inner_vlan_id))
-
-    class SoftInt(object):
-        pass
-
-    class HardInt(SoftInt):
-        pass
-
-    class Subint(SoftInt):
-        def __init__(self, sub_id):
-            self.sub_id = sub_id
-
-    class Dot1QSubint(Subint):
-        def __init__(self, sub_id, vlan=None):
-            if vlan is None:
-                vlan = sub_id
-            super(TestIPv4.Dot1QSubint, self).__init__(sub_id)
-            self.vlan = vlan
-
-    class Dot1ADSubint(Subint):
-        def __init__(self, sub_id, outer_vlan, inner_vlan):
-            super(TestIPv4.Dot1ADSubint, self).__init__(sub_id)
-            self.outer_vlan = outer_vlan
-            self.inner_vlan = inner_vlan
-
-    @classmethod
-    def create_interfaces_and_subinterfaces(cls):
-        cls.interfaces = range(3)
-
-        cls.create_interfaces(cls.interfaces)
+    def setUp(self):
+        super(TestIPv4, self).setUp()
 
-        # Make vpp_api_test see interfaces created using debug CLI (in function create_interfaces)
-        cls.api("sw_interface_dump")
+        # create 3 pg interfaces
+        self.create_pg_interfaces(range(3))
 
-        cls.INT_DETAILS = dict()
+        # create 2 subinterfaces for pg1 and pg2
+        self.sub_interfaces = [
+            VppDot1QSubint(self, self.pg1, 100),
+            VppDot1ADSubint(self, self.pg2, 200, 300, 400)]
 
-        cls.INT_DETAILS[0] = cls.HardInt()
+        # packet flows mapping pg0 -> pg1.sub, pg2.sub, etc.
+        self.flows = dict()
+        self.flows[self.pg0] = [self.pg1.sub_if, self.pg2.sub_if]
+        self.flows[self.pg1.sub_if] = [self.pg0, self.pg2.sub_if]
+        self.flows[self.pg2.sub_if] = [self.pg0, self.pg1.sub_if]
 
-        cls.INT_DETAILS[1] = cls.Dot1QSubint(100)
-        cls.create_vlan_subif(1, cls.INT_DETAILS[1].vlan)
+        # packet sizes
+        self.pg_if_packet_sizes = [64, 512, 1518, 9018]
+        self.sub_if_packet_sizes = [64, 512, 1518 + 4, 9018 + 4]
 
-        # FIXME: Wrong packet format/wrong layer on output of interface 2
-        #self.INT_DETAILS[2] = self.Dot1ADSubint(10, 200, 300)
-        #self.create_dot1ad_subif(2, self.INT_DETAILS[2].sub_id, self.INT_DETAILS[2].outer_vlan, self.INT_DETAILS[2].inner_vlan)
+        self.interfaces = list(self.pg_interfaces)
+        self.interfaces.extend(self.sub_interfaces)
 
-        # Use dor1q for now
-        cls.INT_DETAILS[2] = cls.Dot1QSubint(200)
-        cls.create_vlan_subif(2, cls.INT_DETAILS[2].vlan)
-
-        for i in cls.interfaces:
-            det = cls.INT_DETAILS[i]
-            if isinstance(det, cls.Subint):
-                cls.api("sw_interface_set_flags pg%u.%u admin-up" % (i, det.sub_id))
-
-    # IP adresses on subinterfaces
-    MY_SOFT_IP4S = {}
-    VPP_SOFT_IP4S = {}
-
-    @classmethod
-    def config_ip4_on_software_interfaces(cls, args):
-        for i in args:
-            cls.MY_SOFT_IP4S[i] = "172.17.%u.2" % i
-            cls.VPP_SOFT_IP4S[i] = "172.17.%u.1" % i
-            if isinstance(cls.INT_DETAILS[i], cls.Subint):
-                interface = "pg%u.%u" % (i, cls.INT_DETAILS[i].sub_id)
-            else:
-                interface = "pg%u" % i
-            cls.api("sw_interface_add_del_address %s %s/24" % (interface, cls.VPP_SOFT_IP4S[i]))
-            cls.log("My subinterface IPv4 address is %s" % (cls.MY_SOFT_IP4S[i]))
-
-    # let VPP know MAC addresses of peer (sub)interfaces
-    @classmethod
-    def resolve_arp_on_software_interfaces(cls, args):
-        for i in args:
-            ip = cls.VPP_SOFT_IP4S[i]
-            cls.log("Sending ARP request for %s on port %u" % (ip, i))
-            packet = (Ether(dst="ff:ff:ff:ff:ff:ff", src=cls.MY_MACS[i]) /
-                      ARP(op=ARP.who_has, pdst=ip, psrc=cls.MY_SOFT_IP4S[i], hwsrc=cls.MY_MACS[i]))
-
-            cls.add_dot1_layers(i, packet)
-
-            cls.pg_add_stream(i, packet)
-            cls.pg_enable_capture([i])
-
-            cls.cli(2, "trace add pg-input 1")
-            cls.pg_start()
-
-            # We don't need to read output
-
-    @classmethod
-    def config_fib_entries(cls, count):
-        n_int = len(cls.interfaces)
-        for i in cls.interfaces:
-            cls.api("ip_add_del_route 10.0.0.1/32 via %s count %u" % (cls.VPP_SOFT_IP4S[i], count / n_int))
-
-    @classmethod
-    def add_dot1_layers(cls, i, packet):
-        assert(type(packet) is Ether)
-        payload = packet.payload
-        det = cls.INT_DETAILS[i]
-        if isinstance(det, cls.Dot1QSubint):
-            packet.remove_payload()
-            packet.add_payload(Dot1Q(vlan=det.sub_id) / payload)
-        elif isinstance(det, cls.Dot1ADSubint):
-            packet.remove_payload()
-            packet.add_payload(Dot1Q(vlan=det.outer_vlan) / Dot1Q(vlan=det.inner_vlan) / payload)
-            packet.type = 0x88A8
+        # setup all interfaces
+        for i in self.interfaces:
+            i.admin_up()
+            i.config_ip4()
+            i.resolve_arp()
 
-    def remove_dot1_layers(self, i, packet):
-        self.assertEqual(type(packet), Ether)
-        payload = packet.payload
-        det = self.INT_DETAILS[i]
-        if isinstance(det, self.Dot1QSubint):
-            self.assertEqual(type(payload), Dot1Q)
-            self.assertEqual(payload.vlan, self.INT_DETAILS[i].vlan)
-            payload = payload.payload
-        elif isinstance(det, self.Dot1ADSubint):  # TODO: change 88A8 type
-            self.assertEqual(type(payload), Dot1Q)
-            self.assertEqual(payload.vlan, self.INT_DETAILS[i].outer_vlan)
-            payload = payload.payload
-            self.assertEqual(type(payload), Dot1Q)
-            self.assertEqual(payload.vlan, self.INT_DETAILS[i].inner_vlan)
-            payload = payload.payload
-        packet.remove_payload()
-        packet.add_payload(payload)
+        # config 2M FIB enries
+        self.config_fib_entries(200)
 
-    def create_stream(self, pg_id):
-        pg_targets = [None] * 3
-        pg_targets[0] = [1, 2]
-        pg_targets[1] = [0, 2]
-        pg_targets[2] = [0, 1]
+    def tearDown(self):
+        super(TestIPv4, self).tearDown()
+        if not self.vpp_dead:
+            info(self.vapi.cli("show ip arp"))
+            # info(self.vapi.cli("show ip fib"))  # many entries
+
+    def config_fib_entries(self, count):
+        n_int = len(self.interfaces)
+        percent = 0
+        counter = 0.0
+        dest_addr = socket.inet_pton(socket.AF_INET, "10.0.0.1")
+        dest_addr_len = 32
+        for i in self.interfaces:
+            next_hop_address = i.local_ip4n
+            for j in range(count / n_int):
+                self.vapi.ip_add_del_route(
+                    dest_addr, dest_addr_len, next_hop_address)
+                counter = counter + 1
+                if counter / count * 100 > percent:
+                    info("Configure %d FIB entries .. %d%% done" %
+                         (count, percent))
+                    percent = percent + 1
+
+    def create_stream(self, src_if, packet_sizes):
         pkts = []
         for i in range(0, 257):
-            target_pg_id = pg_targets[pg_id][i % 2]
-            info = self.create_packet_info(pg_id, target_pg_id)
+            dst_if = self.flows[src_if][i % 2]
+            info = self.create_packet_info(
+                src_if.sw_if_index, dst_if.sw_if_index)
             payload = self.info_to_payload(info)
-            p = (Ether(dst=self.VPP_MACS[pg_id], src=self.MY_MACS[pg_id]) /
-                 IP(src=self.MY_SOFT_IP4S[pg_id], dst=self.MY_SOFT_IP4S[target_pg_id]) /
+            p = (Ether(dst=src_if.local_mac, src=src_if.remote_mac) /
+                 IP(src=src_if.remote_ip4, dst=dst_if.remote_ip4) /
                  UDP(sport=1234, dport=1234) /
                  Raw(payload))
             info.data = p.copy()
-            self.add_dot1_layers(pg_id, p)
-            if not isinstance(self.INT_DETAILS[pg_id], self.Subint):
-                packet_sizes = [64, 512, 1518, 9018]
-            else:
-                packet_sizes = [64, 512, 1518+4, 9018+4]
-            size = packet_sizes[(i / 2) % len(packet_sizes)]
+            if isinstance(src_if, VppSubInterface):
+                p = src_if.add_dot1_layer(p)
+            size = packet_sizes[(i // 2) % len(packet_sizes)]
             self.extend_packet(p, size)
             pkts.append(p)
         return pkts
 
-    def verify_capture(self, o, capture):
-        last_info = {}
+    def verify_capture(self, dst_if, capture):
+        info("Verifying capture on interface %s" % dst_if.name)
+        last_info = dict()
         for i in self.interfaces:
-            last_info[i] = None
+            last_info[i.sw_if_index] = None
+        is_sub_if = False
+        dst_sw_if_index = dst_if.sw_if_index
+        if hasattr(dst_if, 'parent'):
+            is_sub_if = True
         for packet in capture:
-            self.remove_dot1_layers(o, packet)  # Check VLAN tags and Ethernet header
+            if is_sub_if:
+                # Check VLAN tags and Ethernet header
+                packet = dst_if.remove_dot1_layer(packet)
             self.assertTrue(Dot1Q not in packet)
             try:
                 ip = packet[IP]
                 udp = packet[UDP]
                 payload_info = self.payload_to_info(str(packet[Raw]))
                 packet_index = payload_info.index
-                src_pg = payload_info.src
-                dst_pg = payload_info.dst
-                self.assertEqual(dst_pg, o)
-                self.log("Got packet on port %u: src=%u (id=%u)" % (o, src_pg, packet_index), 2)
-                next_info = self.get_next_packet_info_for_interface2(src_pg, dst_pg, last_info[src_pg])
-                last_info[src_pg] = next_info
+                self.assertEqual(payload_info.dst, dst_sw_if_index)
+                debug("Got packet on port %s: src=%u (id=%u)" %
+                      (dst_if.name, payload_info.src, packet_index))
+                next_info = self.get_next_packet_info_for_interface2(
+                    payload_info.src, dst_sw_if_index,
+                    last_info[payload_info.src])
+                last_info[payload_info.src] = next_info
                 self.assertTrue(next_info is not None)
                 self.assertEqual(packet_index, next_info.index)
                 saved_packet = next_info.data
@@ -234,28 +129,37 @@ class TestIPv4(Util, VppTestCase):
                 self.assertEqual(udp.sport, saved_packet[UDP].sport)
                 self.assertEqual(udp.dport, saved_packet[UDP].dport)
             except:
-                self.log("Unexpected or invalid packet:")
-                packet.show()
+                error("Unexpected or invalid packet:")
+                error(packet.show())
                 raise
         for i in self.interfaces:
-            remaining_packet = self.get_next_packet_info_for_interface2(i, o, last_info[i])
-            self.assertTrue(remaining_packet is None, "Port %u: Packet expected from source %u didn't arrive" % (o, i))
+            remaining_packet = self.get_next_packet_info_for_interface2(
+                i.sw_if_index, dst_sw_if_index, last_info[i.sw_if_index])
+            self.assertTrue(
+                remaining_packet is None,
+                "Interface %s: Packet expected from interface %s didn't arrive" %
+                (dst_if.name, i.name))
 
     def test_fib(self):
         """ IPv4 FIB test """
 
-        for i in self.interfaces:
-            pkts = self.create_stream(i)
-            self.pg_add_stream(i, pkts)
+        pkts = self.create_stream(self.pg0, self.pg_if_packet_sizes)
+        self.pg0.add_stream(pkts)
+
+        for i in self.sub_interfaces:
+            pkts = self.create_stream(i, self.sub_if_packet_sizes)
+            i.parent.add_stream(pkts)
 
-        self.pg_enable_capture(self.interfaces)
+        self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
 
-        for i in self.interfaces:
-            out = self.pg_get_capture(i)
-            self.log("Verifying capture %u" % i)
-            self.verify_capture(i, out)
+        pkts = self.pg0.get_capture()
+        self.verify_capture(self.pg0, pkts)
+
+        for i in self.sub_interfaces:
+            pkts = i.parent.get_capture()
+            self.verify_capture(i, pkts)
 
 
 if __name__ == '__main__':
-    unittest.main(testRunner = VppTestRunner)
+    unittest.main(testRunner=VppTestRunner)
diff --git a/test/test_ip6.py b/test/test_ip6.py
index 38808a9e..92bb350d 100644
--- a/test/test_ip6.py
+++ b/test/test_ip6.py
@@ -1,250 +1,126 @@
 #!/usr/bin/env python
 
-import logging
-logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
-
 import unittest
+import socket
+from logging import *
+
 from framework import VppTestCase, VppTestRunner
-from util import Util
+from vpp_sub_interface import VppSubInterface, VppDot1QSubint, VppDot1ADSubint
 
 from scapy.packet import Raw
 from scapy.layers.l2 import Ether, Dot1Q
-from scapy.layers.inet6 import (IPv6, UDP,
-    ICMPv6ND_NS, ICMPv6NDOptSrcLLAddr,
-    ICMPv6ND_NA, ICMPv6NDOptDstLLAddr)
+from scapy.layers.inet6 import ICMPv6ND_NS, IPv6, UDP
 
 
-@unittest.skip('Not finished yet.\n')
-class TestIPv6(Util, VppTestCase):
+class TestIPv6(VppTestCase):
     """ IPv6 Test Case """
 
     @classmethod
     def setUpClass(cls):
         super(TestIPv6, cls).setUpClass()
 
-        try:
-            cls.create_interfaces_and_subinterfaces()
-
-            # configure IPv6 on hardware interfaces
-            cls.config_ip6(cls.interfaces)
-
-            cls.config_ip6_on_software_interfaces(cls.interfaces)
-
-            # resolve ICMPv6 ND using hardware interfaces
-            cls.resolve_icmpv6_nd(cls.interfaces)
-
-            # let VPP know MAC addresses of peer (sub)interfaces
-            # cls.resolve_icmpv6_nd_on_software_interfaces(cls.interfaces)
-            cls.send_neighbour_advertisement_on_software_interfaces(cls.interfaces)
-
-            # config 2M FIB enries
-            #cls.config_fib_entries(2000000)
-            cls.config_fib_entries(1000000)
-
-        except Exception as e:
-            super(TestIPv6, cls).tearDownClass()
-            raise
-
-    def tearDown(self):
-        self.cli(2, "show int")
-        self.cli(2, "show trace")
-        self.cli(2, "show hardware")
-        self.cli(2, "show ip arp")
-        # self.cli(2, "show ip fib")  # 2M entries
-        self.cli(2, "show error")
-        self.cli(2, "show run")
-
-    @classmethod
-    def create_vlan_subif(cls, pg_index, vlan):
-        cls.api("create_vlan_subif pg%u vlan %u" % (pg_index, vlan))
-
-    @classmethod
-    def create_dot1ad_subif(cls, pg_index, sub_id, outer_vlan_id, inner_vlan_id):
-        cls.api("create_subif pg%u sub_id %u outer_vlan_id %u inner_vlan_id %u dot1ad"
-                 % (pg_index, sub_id, outer_vlan_id, inner_vlan_id))
-
-    class SoftInt(object):
-        pass
-
-    class HardInt(SoftInt):
-        pass
-
-    class Subint(SoftInt):
-        def __init__(self, sub_id):
-            self.sub_id = sub_id
-
-    class Dot1QSubint(Subint):
-        def __init__(self, sub_id, vlan=None):
-            if vlan is None:
-                vlan = sub_id
-            super(TestIPv6.Dot1QSubint, self).__init__(sub_id)
-            self.vlan = vlan
-
-    class Dot1ADSubint(Subint):
-        def __init__(self, sub_id, outer_vlan, inner_vlan):
-            super(TestIPv6.Dot1ADSubint, self).__init__(sub_id)
-            self.outer_vlan = outer_vlan
-            self.inner_vlan = inner_vlan
-
-    @classmethod
-    def create_interfaces_and_subinterfaces(cls):
-        cls.interfaces = range(3)
-
-        cls.create_interfaces(cls.interfaces)
+    def setUp(self):
+        super(TestIPv6, self).setUp()
 
-        # Make vpp_api_test see interfaces created using debug CLI (in function create_interfaces)
-        cls.api("sw_interface_dump")
+        # create 3 pg interfaces
+        self.create_pg_interfaces(range(3))
 
-        cls.INT_DETAILS = dict()
+        # create 2 subinterfaces for p1 and pg2
+        self.sub_interfaces = [
+            VppDot1QSubint(self, self.pg1, 100),
+            VppDot1QSubint(self, self.pg2, 200)]
+            # TODO: VppDot1ADSubint(self, self.pg2, 200, 300, 400)
 
-        cls.INT_DETAILS[0] = cls.HardInt()
+        # packet flows mapping pg0 -> pg1.sub, pg2.sub, etc.
+        self.flows = dict()
+        self.flows[self.pg0] = [self.pg1.sub_if, self.pg2.sub_if]
+        self.flows[self.pg1.sub_if] = [self.pg0, self.pg2.sub_if]
+        self.flows[self.pg2.sub_if] = [self.pg0, self.pg1.sub_if]
 
-        cls.INT_DETAILS[1] = cls.Dot1QSubint(100)
-        cls.create_vlan_subif(1, cls.INT_DETAILS[1].vlan)
+        # packet sizes
+        self.pg_if_packet_sizes = [64, 512, 1518, 9018]
+        self.sub_if_packet_sizes = [64, 512, 1518 + 4, 9018 + 4]
 
-        # FIXME: Wrong packet format/wrong layer on output of interface 2
-        #self.INT_DETAILS[2] = self.Dot1ADSubint(10, 200, 300)
-        #self.create_dot1ad_subif(2, self.INT_DETAILS[2].sub_id, self.INT_DETAILS[2].outer_vlan, self.INT_DETAILS[2].inner_vlan)
+        self.interfaces = list(self.pg_interfaces)
+        self.interfaces.extend(self.sub_interfaces)
 
-        # Use dor1q for now
-        cls.INT_DETAILS[2] = cls.Dot1QSubint(200)
-        cls.create_vlan_subif(2, cls.INT_DETAILS[2].vlan)
-
-        for i in cls.interfaces:
-            det = cls.INT_DETAILS[i]
-            if isinstance(det, cls.Subint):
-                cls.api("sw_interface_set_flags pg%u.%u admin-up" % (i, det.sub_id))
-
-    # IP adresses on subinterfaces
-    MY_SOFT_IP6S = {}
-    VPP_SOFT_IP6S = {}
-
-    @classmethod
-    def config_ip6_on_software_interfaces(cls, args):
-        for i in args:
-            cls.MY_SOFT_IP6S[i] = "fd01:%u::2" % i
-            cls.VPP_SOFT_IP6S[i] = "fd01:%u::1" % i
-            if isinstance(cls.INT_DETAILS[i], cls.Subint):
-                interface = "pg%u.%u" % (i, cls.INT_DETAILS[i].sub_id)
-            else:
-                interface = "pg%u" % i
-            cls.api("sw_interface_add_del_address %s %s/32" % (interface, cls.VPP_SOFT_IP6S[i]))
-            cls.log("My subinterface IPv6 address is %s" % (cls.MY_SOFT_IP6S[i]))
-
-    # let VPP know MAC addresses of peer (sub)interfaces
-    @classmethod
-    def resolve_icmpv6_nd_on_software_interfaces(cls, args):
-        for i in args:
-            ip = cls.VPP_SOFT_IP6S[i]
-            cls.log("Sending ICMPv6ND_NS request for %s on port %u" % (ip, i))
-            nd_req = (Ether(dst="ff:ff:ff:ff:ff:ff", src=cls.MY_MACS[i]) /
-                      IPv6(src=cls.MY_SOFT_IP6S[i], dst=ip) /
-                      ICMPv6ND_NS(tgt=ip) /
-                      ICMPv6NDOptSrcLLAddr(lladdr=cls.MY_MACS[i]))
-            cls.pg_add_stream(i, nd_req)
-            cls.pg_enable_capture([i])
-
-            cls.cli(2, "trace add pg-input 1")
-            cls.pg_start()
-
-            # We don't need to read output
-
-    # let VPP know MAC addresses of peer (sub)interfaces
-    @classmethod
-    def send_neighbour_advertisement_on_software_interfaces(cls, args):
-        for i in args:
-            ip = cls.VPP_SOFT_IP6S[i]
-            cls.log("Sending ICMPv6ND_NA message for %s on port %u" % (ip, i))
-            pkt = (Ether(dst="ff:ff:ff:ff:ff:ff", src=cls.MY_MACS[i]) /
-                   IPv6(src=cls.MY_SOFT_IP6S[i], dst=ip) /
-                   ICMPv6ND_NA(tgt=ip, R=0, S=0) /
-                   ICMPv6NDOptDstLLAddr(lladdr=cls.MY_MACS[i]))
-            cls.pg_add_stream(i, pkt)
-            cls.pg_enable_capture([i])
-
-            cls.cli(2, "trace add pg-input 1")
-            cls.pg_start()
-
-    @classmethod
-    def config_fib_entries(cls, count):
-        n_int = len(cls.interfaces)
-        for i in cls.interfaces:
-            cls.api("ip_add_del_route fd02::1/128 via %s count %u" % (cls.VPP_SOFT_IP6S[i], count / n_int))
-
-    @classmethod
-    def add_dot1_layers(cls, i, packet):
-        assert(type(packet) is Ether)
-        payload = packet.payload
-        det = cls.INT_DETAILS[i]
-        if isinstance(det, cls.Dot1QSubint):
-            packet.remove_payload()
-            packet.add_payload(Dot1Q(vlan=det.sub_id) / payload)
-        elif isinstance(det, cls.Dot1ADSubint):
-            packet.remove_payload()
-            packet.add_payload(Dot1Q(vlan=det.outer_vlan) / Dot1Q(vlan=det.inner_vlan) / payload)
-            packet.type = 0x88A8
+        # setup all interfaces
+        for i in self.interfaces:
+            i.admin_up()
+            i.config_ip6()
+            i.resolve_ndp()
 
-    def remove_dot1_layers(self, i, packet):
-        self.assertEqual(type(packet), Ether)
-        payload = packet.payload
-        det = self.INT_DETAILS[i]
-        if isinstance(det, self.Dot1QSubint):
-            self.assertEqual(type(payload), Dot1Q)
-            self.assertEqual(payload.vlan, self.INT_DETAILS[i].vlan)
-            payload = payload.payload
-        elif isinstance(det, self.Dot1ADSubint):  # TODO: change 88A8 type
-            self.assertEqual(type(payload), Dot1Q)
-            self.assertEqual(payload.vlan, self.INT_DETAILS[i].outer_vlan)
-            payload = payload.payload
-            self.assertEqual(type(payload), Dot1Q)
-            self.assertEqual(payload.vlan, self.INT_DETAILS[i].inner_vlan)
-            payload = payload.payload
-        packet.remove_payload()
-        packet.add_payload(payload)
+        # config 2M FIB enries
+        self.config_fib_entries(200)
 
-    def create_stream(self, pg_id):
-        pg_targets = [None] * 3
-        pg_targets[0] = [1, 2]
-        pg_targets[1] = [0, 2]
-        pg_targets[2] = [0, 1]
+    def tearDown(self):
+        super(TestIPv6, self).tearDown()
+        if not self.vpp_dead:
+            info(self.vapi.cli("show ip6 neighbors"))
+            # info(self.vapi.cli("show ip6 fib"))  # many entries
+
+    def config_fib_entries(self, count):
+        n_int = len(self.interfaces)
+        percent = 0
+        counter = 0.0
+        dest_addr = socket.inet_pton(socket.AF_INET6, "fd02::1")
+        dest_addr_len = 128
+        for i in self.interfaces:
+            next_hop_address = i.local_ip6n
+            for j in range(count / n_int):
+                self.vapi.ip_add_del_route(
+                    dest_addr, dest_addr_len, next_hop_address, is_ipv6=1)
+                counter = counter + 1
+                if counter / count * 100 > percent:
+                    info("Configure %d FIB entries .. %d%% done" %
+                         (count, percent))
+                    percent = percent + 1
+
+    def create_stream(self, src_if, packet_sizes):
         pkts = []
         for i in range(0, 257):
-            target_pg_id = pg_targets[pg_id][i % 2]
-            info = self.create_packet_info(pg_id, target_pg_id)
+            dst_if = self.flows[src_if][i % 2]
+            info = self.create_packet_info(
+                src_if.sw_if_index, dst_if.sw_if_index)
             payload = self.info_to_payload(info)
-            p = (Ether(dst=self.VPP_MACS[pg_id], src=self.MY_MACS[pg_id]) /
-                 IPv6(src=self.MY_SOFT_IP6S[pg_id], dst=self.MY_SOFT_IP6S[target_pg_id]) /
+            p = (Ether(dst=src_if.local_mac, src=src_if.remote_mac) /
+                 IPv6(src=src_if.remote_ip6, dst=dst_if.remote_ip6) /
                  UDP(sport=1234, dport=1234) /
                  Raw(payload))
             info.data = p.copy()
-            self.add_dot1_layers(pg_id, p)
-            if not isinstance(self.INT_DETAILS[pg_id], self.Subint):
-                packet_sizes = [76, 512, 1518, 9018]
-            else:
-                packet_sizes = [76, 512, 1518+4, 9018+4]
-            size = packet_sizes[(i / 2) % len(packet_sizes)]
+            if isinstance(src_if, VppSubInterface):
+                p = src_if.add_dot1_layer(p)
+            size = packet_sizes[(i // 2) % len(packet_sizes)]
             self.extend_packet(p, size)
             pkts.append(p)
         return pkts
 
-    def verify_capture(self, o, capture):
-        last_info = {}
+    def verify_capture(self, dst_if, capture):
+        info("Verifying capture on interface %s" % dst_if.name)
+        last_info = dict()
         for i in self.interfaces:
-            last_info[i] = None
+            last_info[i.sw_if_index] = None
+        is_sub_if = False
+        dst_sw_if_index = dst_if.sw_if_index
+        if hasattr(dst_if, 'parent'):
+            is_sub_if = True
         for packet in capture:
-            self.remove_dot1_layers(o, packet)  # Check VLAN tags and Ethernet header
+            if is_sub_if:
+                # Check VLAN tags and Ethernet header
+                packet = dst_if.remove_dot1_layer(packet)
             self.assertTrue(Dot1Q not in packet)
             try:
                 ip = packet[IPv6]
                 udp = packet[UDP]
                 payload_info = self.payload_to_info(str(packet[Raw]))
                 packet_index = payload_info.index
-                src_pg = payload_info.src
-                dst_pg = payload_info.dst
-                self.assertEqual(dst_pg, o)
-                self.log("Got packet on port %u: src=%u (id=%u)" % (o, src_pg, packet_index), 2)
-                next_info = self.get_next_packet_info_for_interface2(src_pg, dst_pg, last_info[src_pg])
-                last_info[src_pg] = next_info
+                self.assertEqual(payload_info.dst, dst_sw_if_index)
+                debug("Got packet on port %s: src=%u (id=%u)" %
+                      (dst_if.name, payload_info.src, packet_index))
+                next_info = self.get_next_packet_info_for_interface2(
+                    payload_info.src, dst_sw_if_index,
+                    last_info[payload_info.src])
+                last_info[payload_info.src] = next_info
                 self.assertTrue(next_info is not None)
                 self.assertEqual(packet_index, next_info.index)
                 saved_packet = next_info.data
@@ -254,28 +130,37 @@ class TestIPv6(Util, VppTestCase):
                 self.assertEqual(udp.sport, saved_packet[UDP].sport)
                 self.assertEqual(udp.dport, saved_packet[UDP].dport)
             except:
-                self.log("Unexpected or invalid packet:")
-                packet.show()
+                error("Unexpected or invalid packet:")
+                error(packet.show())
                 raise
         for i in self.interfaces:
-            remaining_packet = self.get_next_packet_info_for_interface2(i, o, last_info[i])
-            self.assertTrue(remaining_packet is None, "Port %u: Packet expected from source %u didn't arrive" % (o, i))
+            remaining_packet = self.get_next_packet_info_for_interface2(
+                i.sw_if_index, dst_sw_if_index, last_info[i.sw_if_index])
+            self.assertTrue(
+                remaining_packet is None,
+                "Interface %s: Packet expected from interface %s didn't arrive" %
+                (dst_if.name, i.name))
 
     def test_fib(self):
         """ IPv6 FIB test """
 
-        for i in self.interfaces:
-            pkts = self.create_stream(i)
-            self.pg_add_stream(i, pkts)
+        pkts = self.create_stream(self.pg0, self.pg_if_packet_sizes)
+        self.pg0.add_stream(pkts)
+
+        for i in self.sub_interfaces:
+            pkts = self.create_stream(i, self.sub_if_packet_sizes)
+            i.parent.add_stream(pkts)
 
-        self.pg_enable_capture(self.interfaces)
+        self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
 
-        for i in self.interfaces:
-            out = self.pg_get_capture(i)
-            self.log("Verifying capture %u" % i)
-            self.verify_capture(i, out)
+        pkts = self.pg0.get_capture()
+        self.verify_capture(self.pg0, pkts)
+
+        for i in self.sub_interfaces:
+            pkts = i.parent.get_capture()
+            self.verify_capture(i, pkts)
 
 
 if __name__ == '__main__':
-    unittest.main(testRunner = VppTestRunner)
+    unittest.main(testRunner=VppTestRunner)
diff --git a/test/test_l2bd.py b/test/test_l2bd.py
index c2b73a4d..0fced5d9 100644
--- a/test/test_l2bd.py
+++ b/test/test_l2bd.py
@@ -1,438 +1,187 @@
 #!/usr/bin/env python
-## @file test_l2bd.py
-#  Module to provide L2 bridge domain test case.
-#
-#  The module provides a set of tools for L2 bridge domain tests.
-
-import logging
-logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
 
 import unittest
+from logging import *
 import random
 
-from framework import *
-from scapy.all import *
+from scapy.packet import Raw
+from scapy.layers.l2 import Ether, Dot1Q
+from scapy.layers.inet import IP, UDP
+
+from framework import VppTestCase, VppTestRunner
+from vpp_sub_interface import VppDot1QSubint
+from util import TestHost
 
 
-## Subclass of the VppTestCase class.
-#
-#  This subclass is a class for L2 bridge domain test cases. It provides methods
-#  to create interfaces, configure L2 bridge domain, create and verify packet
-#  streams.
 class TestL2bd(VppTestCase):
     """ L2BD Test Case """
 
-    ## Test variables
-    interf_nr = 3           # Number of interfaces
-    bd_id = 1               # Bridge domain ID
-    mac_entries = 100       # Number of MAC entries for bridge-domain to learn
-    dot1q_sub_id = 100      # SubID of dot1q sub-interface
-    dot1q_tag = 100         # VLAN tag for dot1q sub-interface
-    dot1ad_sub_id = 200     # SubID of dot1ad sub-interface
-    dot1ad_outer_tag = 200  # VLAN S-tag for dot1ad sub-interface
-    dot1ad_inner_tag = 300  # VLAN C-tag for dot1ad sub-interface
-    pkts_per_burst = 257    # Number of packets per burst
+    # Test variables
+    bd_id = 1                 # Bridge domain ID
+    mac_entries_count = 100   # Number of MAC entries for bridge-domain to learn
+    dot1q_sub_id = 100        # SubID of dot1q sub-interface
+    dot1q_tag = 100           # VLAN tag for dot1q sub-interface
+    dot1ad_sub_id = 200       # SubID of dot1ad sub-interface
+    dot1ad_outer_tag = 200    # VLAN S-tag for dot1ad sub-interface
+    dot1ad_inner_tag = 300    # VLAN C-tag for dot1ad sub-interface
+    pkts_per_burst = 257      # Number of packets per burst
 
-    ## Class method to start the test case.
-    #  Overrides setUpClass method in VppTestCase class.
-    #  Python try..except statement is used to ensure that the tear down of
-    #  the class will be executed even if exception is raised.
-    #  @param cls The class pointer.
     @classmethod
     def setUpClass(cls):
         super(TestL2bd, cls).setUpClass()
 
-        try:
-            ## Create interfaces and sub-interfaces
-            cls.create_interfaces_and_subinterfaces(TestL2bd.interf_nr)
-
-            ## Create BD with MAC learning enabled and put interfaces and
-            #  sub-interfaces to this BD
-            cls.api("bridge_domain_add_del bd_id %u learn 1" % TestL2bd.bd_id)
-            for i in cls.interfaces:
-                if isinstance(cls.INT_DETAILS[i], cls.Subint):
-                    interface = "pg%u.%u" % (i, cls.INT_DETAILS[i].sub_id)
-                else:
-                    interface = "pg%u" % i
-                cls.api("sw_interface_set_l2_bridge %s bd_id %u"
-                        % (interface, TestL2bd.bd_id))
-
-            ## Make the BD learn a number of MAC entries specified by the test
-            # variable <mac_entries>.
-            cls.create_mac_entries(TestL2bd.mac_entries)
-            cls.cli(0, "show l2fib")
-
-        except Exception as e:
-          super(TestL2bd, cls).tearDownClass()
-          raise e
-
-    ## Method to define tear down VPP actions of the test case.
-    #  Overrides tearDown method in VppTestCase class.
-    #  @param self The object pointer.
-    def tearDown(self):
-        self.cli(2, "show int")
-        self.cli(2, "show trace")
-        self.cli(2, "show hardware")
-        self.cli(2, "show l2fib verbose")
-        self.cli(2, "show error")
-        self.cli(2, "show run")
-        self.cli(2, "show bridge-domain 1 detail")
-
-    ## Class method to create VLAN sub-interface.
-    #  Uses VPP API command to create VLAN sub-interface.
-    #  @param cls The class pointer.
-    #  @param pg_index Integer variable to store the index of the packet
-    #  generator interface to create VLAN sub-interface on.
-    #  @param vlan_id Integer variable to store required VLAN tag value.
-    @classmethod
-    def create_vlan_subif(cls, pg_index, vlan_id):
-        cls.api("create_vlan_subif pg%u vlan %u" % (pg_index, vlan_id))
-
-    ## Class method to create dot1ad sub-interface.
-    #  Use VPP API command to create dot1ad sub-interface.
-    #  @param cls The class pointer.
-    #  @param pg_index Integer variable to store the index of the packet
-    #  generator interface to create dot1ad sub-interface on.
-    #  @param outer_vlan_id Integer variable to store required outer VLAN tag
-    #  value (S-TAG).
-    #  @param inner_vlan_id Integer variable to store required inner VLAN tag
-    #  value (C-TAG).
-    @classmethod
-    def create_dot1ad_subif(cls, pg_index, sub_id, outer_vlan_id,
-                            inner_vlan_id):
-        cls.api("create_subif pg%u sub_id %u outer_vlan_id %u inner_vlan_id"
-                " %u dot1ad" % (pg_index, sub_id, outer_vlan_id, inner_vlan_id))
-
-    ## Base class for interface.
-    #  To define object representation of the interface.
-    class Interface(object):
-        pass
+    def setUp(self):
+        super(TestL2bd, self).setUp()
 
-    ## Sub-class of the interface class.
-    #  To define object representation of the HW interface.
-    class HardInt(Interface):
-        pass
+        # create 3 pg interfaces
+        self.create_pg_interfaces(range(3))
 
-    ## Sub-class of the interface class.
-    #  To define object representation of the SW interface.
-    class SoftInt(Interface):
-        pass
+        # create 2 sub-interfaces for pg1 and pg2
+        self.sub_interfaces = [
+            VppDot1QSubint(self, self.pg1, TestL2bd.dot1q_sub_id),
+            VppDot1QSubint(self, self.pg2, TestL2bd.dot1ad_sub_id)]
 
-    ## Sub-class of the SW interface class.
-    #  To represent the general sub-interface.
-    class Subint(SoftInt):
-        ## The constructor.
-        #  @param sub_id Integer variable to store sub-interface ID.
-        def __init__(self, sub_id):
-            self.sub_id = sub_id
-
-    ## Sub-class of the SW interface class.
-    #  To represent dot1q sub-interface.
-    class Dot1QSubint(Subint):
-        ## The constructor.
-        #  @param sub_id Integer variable to store sub-interface ID.
-        #  @param vlan Integer variable (optional) to store VLAN tag value. Set
-        #  to sub_id value when VLAN tag value not provided.
-        def __init__(self, sub_id, vlan=None):
-            if vlan is None:
-                vlan = sub_id
-            super(TestL2bd.Dot1QSubint, self).__init__(sub_id)
-            self.vlan = vlan
-
-    ## Sub-class of the SW interface class.
-    #  To represent dot1ad sub-interface.
-    class Dot1ADSubint(Subint):
-        ## The constructor.
-        #  @param sub_id Integer variable to store sub-interface ID.
-        #  @param outer_vlan Integer variable to store outer VLAN tag value.
-        #  @param inner_vlan Integer variable to store inner VLAN tag value.
-        def __init__(self, sub_id, outer_vlan, inner_vlan):
-            super(TestL2bd.Dot1ADSubint, self).__init__(sub_id)
-            self.outer_vlan = outer_vlan
-            self.inner_vlan = inner_vlan
-
-    ## Class method to create interfaces and sub-interfaces.
-    #  Current implementation: create three interfaces, then create Dot1Q
-    #  sub-interfaces for the second and the third interface with VLAN tags
-    #  equal to their sub-interface IDs. Set sub-interfaces status to admin-up.
-    #  @param cls The class pointer.
-    #  @param int_nr Integer variable to store the number of interfaces to be
-    #  created.
-    # TODO: Parametrize required numbers of dot1q and dot1ad to be created.
-    @classmethod
-    def create_interfaces_and_subinterfaces(cls, int_nr):
-        ## A class list variable to store interface indexes.
-        cls.interfaces = range(int_nr)
+        # packet flows mapping pg0 -> pg1, pg2, etc.
+        self.flows = dict()
+        self.flows[self.pg0] = [self.pg1, self.pg2]
+        self.flows[self.pg1] = [self.pg0, self.pg2]
+        self.flows[self.pg2] = [self.pg0, self.pg1]
 
-        # Create interfaces
-        cls.create_interfaces(cls.interfaces)
+        # packet sizes
+        self.pg_if_packet_sizes = [64, 512, 1518, 9018]
+        self.sub_if_packet_sizes = [64, 512, 1518 + 4, 9018 + 4]
 
-        # Make vpp_api_test see interfaces created using debug CLI (in function
-        # create_interfaces)
-        cls.api("sw_interface_dump")
+        self.interfaces = list(self.pg_interfaces)
+        self.interfaces.extend(self.sub_interfaces)
 
-        ## A class dictionary variable to store data about interfaces.
-        #  First create an empty dictionary then store interface data there.
-        cls.INT_DETAILS = dict()
+        # Create BD with MAC learning enabled and put interfaces and
+        #  sub-interfaces to this BD
+        for pg_if in self.pg_interfaces:
+            sw_if_index = pg_if.sub_if.sw_if_index if hasattr(pg_if, 'sub_if') \
+                else pg_if.sw_if_index
+            self.vapi.sw_interface_set_l2_bridge(sw_if_index,
+                                                 bd_id=TestL2bd.bd_id)
 
-        # 1st interface is untagged - no sub-interface required
-        cls.INT_DETAILS[0] = cls.HardInt()
+        # setup all interfaces
+        for i in self.interfaces:
+            i.admin_up()
 
-        # 2nd interface is dot1q tagged
-        cls.INT_DETAILS[1] = cls.Dot1QSubint(TestL2bd.dot1q_sub_id,
-                                             TestL2bd.dot1q_tag)
-        cls.create_vlan_subif(1, cls.INT_DETAILS[1].vlan)
+        # mapping between packet-generator index and lists of test hosts
+        self.hosts_by_pg_idx = dict()
 
-        # 3rd interface is dot1ad tagged
-        # FIXME: Wrong packet format/wrong layer on output of interface 2
-        #self.INT_DETAILS[2] = self.Dot1ADSubint(TestL2bd.dot1ad_sub_id, TestL2bd.dot1ad_outer_tag, TestL2bd.dot1ad_inner_tag)
-        #self.create_dot1ad_subif(2, self.INT_DETAILS[2].sub_id, self.INT_DETAILS[2].outer_vlan, self.INT_DETAILS[2].inner_vlan)
+        # create test host entries and inject packets to learn MAC entries in
+        # the bridge-domain
+        self.create_hosts_and_learn(TestL2bd.mac_entries_count)
+        info(self.vapi.cli("show l2fib"))
 
-        # Use dot1q for now.
-        cls.INT_DETAILS[2] = cls.Dot1QSubint(TestL2bd.dot1ad_sub_id,
-                                             TestL2bd.dot1ad_outer_tag)
-        cls.create_vlan_subif(2, cls.INT_DETAILS[2].vlan)
+    def tearDown(self):
+        super(TestL2bd, self).tearDown()
+        if not self.vpp_dead:
+            info(self.vapi.cli("show l2fib verbose"))
+            info(self.vapi.cli("show bridge-domain %s detail" % self.bd_id))
 
-        for i in cls.interfaces:
-            if isinstance(cls.INT_DETAILS[i], cls.Subint):
-                cls.api("sw_interface_set_flags pg%u.%u admin-up"
-                        % (i, cls.INT_DETAILS[i].sub_id))
-        ## @var interfaces
-        #  List variable to store interface indexes.
-        ## @var INT_DETAILS
-        #  Dictionary variable to store data about interfaces.
+    def create_hosts_and_learn(self, count):
+        """
+        Create required number of host MAC addresses and distribute them among
+        interfaces. Create host IPv4 address for every host MAC address. Create
+        L2 MAC packet stream with host MAC addresses per interface to let
+        the bridge domain learn these MAC addresses.
 
-    ## Class method for bridge-domain to learn defined number of MAC addresses.
-    #  Create required number of host MAC addresses and distribute them among
-    #  interfaces. Create host IPv4 address for every host MAC address. Create
-    #  L2 MAC packet stream with host MAC addresses per interface to let
-    #  the bridge domain learn these MAC addresses.
-    #  @param cls The class pointer.
-    #  @param count Integer variable to store the number of MAC addresses to be
-    #  created.
-    @classmethod
-    def create_mac_entries(cls, count):
-        n_int = len(cls.interfaces)
+        :param count: Integer number of hosts to create MAC/IPv4 addresses for.
+        """
+        n_int = len(self.pg_interfaces)
         macs_per_if = count / n_int
-        for i in cls.interfaces:
-            start_nr = macs_per_if*i
-            end_nr = count if i == (n_int - 1) else macs_per_if*(i+1)
-            cls.MY_MACS[i] = []
-            cls.MY_IP4S[i] = []
+        i = -1
+        for pg_if in self.pg_interfaces:
+            i += 1
+            start_nr = macs_per_if * i
+            end_nr = count if i == (n_int - 1) else macs_per_if * (i + 1)
+            self.hosts_by_pg_idx[pg_if.sw_if_index] = []
+            hosts = self.hosts_by_pg_idx[pg_if.sw_if_index]
             packets = []
             for j in range(start_nr, end_nr):
-                cls.MY_MACS[i].append("00:00:00:ff:%02x:%02x" % (i, j))
-                cls.MY_IP4S[i].append("172.17.1%02x.%u" % (i, j))
-                packet = (Ether(dst="ff:ff:ff:ff:ff:ff", src=cls.MY_MACS[i]))
+                host = TestHost(
+                    "00:00:00:ff:%02x:%02x" % (pg_if.sw_if_index, j),
+                    "172.17.1%02x.%u" % (pg_if.sw_if_index, j))
+                packet = (Ether(dst="ff:ff:ff:ff:ff:ff", src=host.mac))
+                hosts.append(host)
+                if hasattr(pg_if, 'sub_if'):
+                    packet = pg_if.sub_if.add_dot1_layer(packet)
                 packets.append(packet)
-            cls.pg_add_stream(i, packets)
-        # Based on the verbosity level set in the system print the log.
-        cls.log("Sending broadcast eth frames for MAC learning", 1)
-        cls.pg_start()
-        # Packet stream capturing is not started as we don't need to read
-        #  the output.
-        ## @var n_int
-        #  Integer variable to store the number of interfaces.
-        ## @var macs_per_if
-        #  Integer variable to store the number of MAC addresses per interface.
-        ## @var start_nr
-        #  Integer variable to store the starting number of the range used to
-        #  generate MAC addresses for the interface.
-        ## @var end_nr
-        #  Integer variable to store the ending number of the range used to
-        #  generate MAC addresses for the interface.
-        ## @var MY_MACS
-        #  Dictionary variable to store list of MAC addresses per interface.
-        ## @var MY_IP4S
-        #  Dictionary variable to store list of IPv4 addresses per interface.
-
-    ## Class method to add dot1q or dot1ad layer to the packet.
-    #  Based on sub-interface data of the defined interface add dot1q or dot1ad
-    #  Ethernet header layer to the packet.
-    #  @param cls The class pointer.
-    #  @param i Integer variable to store the index of the interface.
-    #  @param packet Object variable to store the packet where to add dot1q or
-    #  dot1ad layer.
-    # TODO: Move this class method to utils.py.
-    @classmethod
-    def add_dot1_layers(cls, i, packet):
-        assert(type(packet) is Ether)
-        payload = packet.payload
-        if isinstance(cls.INT_DETAILS[i], cls.Dot1QSubint):
-            packet.remove_payload()
-            packet.add_payload(Dot1Q(vlan=cls.INT_DETAILS[i].vlan) / payload)
-        elif isinstance(cls.INT_DETAILS[i], cls.Dot1ADSubint):
-            packet.remove_payload()
-            packet.add_payload(Dot1Q(vlan=cls.INT_DETAILS[i].outer_vlan,
-                                     type=0x8100) /
-                               Dot1Q(vlan=cls.INT_DETAILS[i].inner_vlan) /
-                               payload)
-            packet.type = 0x88A8
-        ## @var payload
-        #  Object variable to store payload of the packet.
-        ## @var INT_DETAILS
-        #  Dictionary variable to store data about interfaces.
-        ## @var Dot1QSubint
-        #  Class variable representing dot1q sub-interfaces.
-        ## @var Dot1ADSubint
-        #  Class variable representing dot1ad sub-interfaces.
-
-    ## Method to remove dot1q or dot1ad layer from the packet.
-    #  Based on sub-interface data of the defined interface remove dot1q or
-    #  dot1ad layer from the packet.
-    #  @param cls The class pointer.
-    #  @param i Integer variable to store the index of the interface.
-    #  @param packet Object variable to store the packet where to remove dot1q
-    #  or dot1ad layer.
-    def remove_dot1_layers(self, i, packet):
-        self.assertEqual(type(packet), Ether)
-        payload = packet.payload
-        if isinstance(self.INT_DETAILS[i], self.Dot1QSubint):
-            self.assertEqual(type(payload), Dot1Q)
-            self.assertEqual(payload.vlan, self.INT_DETAILS[i].vlan)
-            payload = payload.payload
-        elif isinstance(self.INT_DETAILS[i], self.Dot1ADSubint):  # TODO: change 88A8 type
-            self.assertEqual(type(payload), Dot1Q)
-            self.assertEqual(payload.vlan, self.INT_DETAILS[i].outer_vlan)
-            payload = payload.payload
-            self.assertEqual(type(payload), Dot1Q)
-            self.assertEqual(payload.vlan, self.INT_DETAILS[i].inner_vlan)
-            payload = payload.payload
-        packet.remove_payload()
-        packet.add_payload(payload)
-        ## @var payload
-        #  Object variable to store payload of the packet.
-        ## @var INT_DETAILS
-        #  Dictionary variable to store data about interfaces.
-        ## @var Dot1QSubint
-        #  Class variable representing dot1q sub-interfaces.
-        ## @var Dot1ADSubint
-        #  Class variable representing dot1ad sub-interfaces.
+            pg_if.add_stream(packets)
+        info("Sending broadcast eth frames for MAC learning")
+        self.pg_start()
 
-    ## Method to create packet stream for the packet generator interface.
-    #  Create input packet stream for the given packet generator interface with
-    #  packets of different length targeted for all other created packet
-    #  generator interfaces.
-    #  @param self The object pointer.
-    #  @param pg_id Integer variable to store the index of the interface to
-    #  create the input packet stream.
-    #  @return pkts List variable to store created input stream of packets.
-    def create_stream(self, pg_id):
-        # TODO: use variables to create lists based on interface number
-        pg_targets = [None] * 3
-        pg_targets[0] = [1, 2]
-        pg_targets[1] = [0, 2]
-        pg_targets[2] = [0, 1]
+    def create_stream(self, src_if, packet_sizes):
         pkts = []
         for i in range(0, TestL2bd.pkts_per_burst):
-            target_pg_id = pg_targets[pg_id][i % 2]
-            target_host_id = random.randrange(len(self.MY_MACS[target_pg_id]))
-            source_host_id = random.randrange(len(self.MY_MACS[pg_id]))
-            pkt_info = self.create_packet_info(pg_id, target_pg_id)
+            dst_if = self.flows[src_if][i % 2]
+            dst_host = random.choice(self.hosts_by_pg_idx[dst_if.sw_if_index])
+            src_host = random.choice(self.hosts_by_pg_idx[src_if.sw_if_index])
+            pkt_info = self.create_packet_info(
+                src_if.sw_if_index, dst_if.sw_if_index)
             payload = self.info_to_payload(pkt_info)
-            p = (Ether(dst=self.MY_MACS[target_pg_id][target_host_id],
-                       src=self.MY_MACS[pg_id][source_host_id]) /
-                 IP(src=self.MY_IP4S[pg_id][source_host_id],
-                    dst=self.MY_IP4S[target_pg_id][target_host_id]) /
+            p = (Ether(dst=dst_host.mac, src=src_host.mac) /
+                 IP(src=src_host.ip4, dst=dst_host.ip4) /
                  UDP(sport=1234, dport=1234) /
                  Raw(payload))
             pkt_info.data = p.copy()
-            self.add_dot1_layers(pg_id, p)
-            if not isinstance(self.INT_DETAILS[pg_id], self.Subint):
-                packet_sizes = [64, 512, 1518, 9018]
-            else:
-                packet_sizes = [64, 512, 1518+4, 9018+4]
+            if hasattr(src_if, 'sub_if'):
+                p = src_if.sub_if.add_dot1_layer(p)
             size = packet_sizes[(i / 2) % len(packet_sizes)]
             self.extend_packet(p, size)
             pkts.append(p)
         return pkts
-        ## @var pg_targets
-        #  List variable to store list of indexes of target packet generator
-        #  interfaces for every source packet generator interface.
-        ## @var target_pg_id
-        #  Integer variable to store the index of the random target packet
-        #  generator interfaces.
-        ## @var target_host_id
-        #  Integer variable to store the index of the randomly chosen
-        #  destination host MAC/IPv4 address.
-        ## @var source_host_id
-        #  Integer variable to store the index of the randomly chosen source
-        #  host MAC/IPv4 address.
-        ## @var pkt_info
-        #  Object variable to store the information about the generated packet.
-        ## @var payload
-        #  String variable to store the payload of the packet to be generated.
-        ## @var p
-        #  Object variable to store the generated packet.
-        ## @var packet_sizes
-        #  List variable to store required packet sizes.
-        ## @var size
-        #  List variable to store required packet sizes.
 
-    ## Method to verify packet stream received on the packet generator interface.
-    #  Verify packet-by-packet the output stream captured on a given packet
-    #  generator (pg) interface using following packet payload data - order of
-    #  packet in the stream, index of the source and destination pg interface,
-    #  src and dst host IPv4 addresses and src port and dst port values of UDP
-    #  layer.
-    #  @param self The object pointer.
-    #  @param o Integer variable to store the index of the interface to
-    #  verify the output packet stream.
-    #  @param capture List variable to store the captured output packet stream.
-    def verify_capture(self, o, capture):
-        last_info = {}
-        for i in self.interfaces:
-            last_info[i] = None
+    def verify_capture(self, pg_if, capture):
+        last_info = dict()
+        for i in self.pg_interfaces:
+            last_info[i.sw_if_index] = None
+        dst_sw_if_index = pg_if.sw_if_index
         for packet in capture:
+            payload_info = self.payload_to_info(str(packet[Raw]))
+            src_sw_if_index = payload_info.src
+            src_if = None
+            for ifc in self.pg_interfaces:
+                if ifc != pg_if:
+                    if ifc.sw_if_index == src_sw_if_index:
+                        src_if = ifc
+                        break
+            if hasattr(src_if, 'sub_if'):
+                # Check VLAN tags and Ethernet header
+                packet = src_if.sub_if.remove_dot1_layer(packet)
+            self.assertTrue(Dot1Q not in packet)
             try:
                 ip = packet[IP]
                 udp = packet[UDP]
-                payload_info = self.payload_to_info(str(packet[Raw]))
-                # Check VLAN tags and Ethernet header
-                # TODO: Rework to check VLAN tag(s) and do not remove them
-                self.remove_dot1_layers(payload_info.src, packet)
-                self.assertTrue(Dot1Q not in packet)
-                self.assertEqual(payload_info.dst, o)
-                self.log("Got packet on port %u: src=%u (id=%u)"
-                         % (o, payload_info.src, payload_info.index), 2)
+                packet_index = payload_info.index
+                self.assertEqual(payload_info.dst, dst_sw_if_index)
+                debug("Got packet on port %s: src=%u (id=%u)" %
+                      (pg_if.name, payload_info.src, packet_index))
                 next_info = self.get_next_packet_info_for_interface2(
-                    payload_info.src, payload_info.dst,
+                    payload_info.src, dst_sw_if_index,
                     last_info[payload_info.src])
                 last_info[payload_info.src] = next_info
                 self.assertTrue(next_info is not None)
-                self.assertEqual(payload_info.index, next_info.index)
+                self.assertEqual(packet_index, next_info.index)
+                saved_packet = next_info.data
                 # Check standard fields
-                self.assertEqual(ip.src, next_info.data[IP].src)
-                self.assertEqual(ip.dst, next_info.data[IP].dst)
-                self.assertEqual(udp.sport, next_info.data[UDP].sport)
-                self.assertEqual(udp.dport, next_info.data[UDP].dport)
+                self.assertEqual(ip.src, saved_packet[IP].src)
+                self.assertEqual(ip.dst, saved_packet[IP].dst)
+                self.assertEqual(udp.sport, saved_packet[UDP].sport)
+                self.assertEqual(udp.dport, saved_packet[UDP].dport)
             except:
-                self.log("Unexpected or invalid packet:")
-                packet.show()
+                error("Unexpected or invalid packet:")
+                error(packet.show())
                 raise
-        for i in self.interfaces:
+        for i in self.pg_interfaces:
             remaining_packet = self.get_next_packet_info_for_interface2(
-                i, o, last_info[i])
-            self.assertTrue(remaining_packet is None,
-                            "Port %u: Packet expected from source %u didn't"
-                            " arrive" % (o, i))
-        ## @var last_info
-        #  Dictionary variable to store verified packets per packet generator
-        #  interface.
-        ## @var ip
-        #  Object variable to store the IP layer of the packet.
-        ## @var udp
-        #  Object variable to store the UDP layer of the packet.
-        ## @var payload_info
-        #  Object variable to store required information about the packet.
-        ## @var next_info
-        #  Object variable to store information about next packet.
-        ## @var remaining_packet
-        #  Object variable to store information about remaining packet.
+                i, dst_sw_if_index, last_info[i.sw_if_index])
+            self.assertTrue(
+                remaining_packet is None,
+                "Port %u: Packet expected from source %u didn't arrive" %
+                (dst_sw_if_index, i.sw_if_index))
 
-    ## Method defining VPP L2 bridge domain test case.
-    #  Contains execution steps of the test case.
-    #  @param self The object pointer.
     def test_l2bd(self):
         """ L2BD MAC learning test
 
@@ -447,27 +196,23 @@ class TestL2bd(VppTestCase):
             burst of 257 pkts per interface
         """
 
-        ## Create incoming packet streams for packet-generator interfaces
-        for i in self.interfaces:
-            pkts = self.create_stream(i)
-            self.pg_add_stream(i, pkts)
+        # Create incoming packet streams for packet-generator interfaces
+        for i in self.pg_interfaces:
+            packet_sizes = self.sub_if_packet_sizes if hasattr(i, 'sub_if') \
+                else self.pg_if_packet_sizes
+            pkts = self.create_stream(i, packet_sizes)
+            i.add_stream(pkts)
 
-        ## Enable packet capture and start packet sending
-        self.pg_enable_capture(self.interfaces)
+        # Enable packet capture and start packet sending
+        self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
 
-        ## Verify outgoing packet streams per packet-generator interface
-        for i in self.interfaces:
-            out = self.pg_get_capture(i)
-            self.log("Verifying capture %u" % i)
-            self.verify_capture(i, out)
-        ## @var pkts
-        #  List variable to store created input stream of packets for the packet
-        #  generator interface.
-        ## @var out
-        #  List variable to store captured output stream of packets for
-        #  the packet generator interface.
+        # Verify outgoing packet streams per packet-generator interface
+        for i in self.pg_interfaces:
+            capture = i.get_capture()
+            info("Verifying capture on interface %s" % i.name)
+            self.verify_capture(i, capture)
 
 
 if __name__ == '__main__':
-    unittest.main(testRunner = VppTestRunner)
+    unittest.main(testRunner=VppTestRunner)
diff --git a/test/test_l2xc.py b/test/test_l2xc.py
index f5fc8743..d448a04d 100644
--- a/test/test_l2xc.py
+++ b/test/test_l2xc.py
@@ -1,210 +1,152 @@
 #!/usr/bin/env python
-## @file test_l2xc.py
-#  Module to provide L2 cross-connect test case.
-#
-#  The module provides a set of tools for L2 cross-connect tests.
-
-import logging
-logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
 
 import unittest
 import random
-from framework import VppTestCase, VppTestRunner
-from scapy.layers.l2 import Ether, Raw
+
+from scapy.packet import Raw
+from scapy.layers.l2 import Ether
 from scapy.layers.inet import IP, UDP
+from logging import *
+
+from framework import VppTestCase, VppTestRunner
+from util import TestHost
 
 
-## Subclass of the VppTestCase class.
-#
-#  This subclass is a class for L2 cross-connect test cases. It provides methods
-#  to create interfaces, configuring L2 cross-connects, creating and verifying
-#  packet streams.
 class TestL2xc(VppTestCase):
     """ L2XC Test Case """
 
     # Test variables
-    interf_nr = 4           # Number of interfaces
     hosts_nr = 10           # Number of hosts
     pkts_per_burst = 257    # Number of packets per burst
 
-    ## Class method to start the test case.
-    #  Overrides setUpClass method in VppTestCase class.
-    #  There is used try..except statement to ensure that the tear down of
-    #  the class will be executed even if any exception is raised.
-    #  @param cls The class pointer.
     @classmethod
     def setUpClass(cls):
         super(TestL2xc, cls).setUpClass()
 
-        try:
-            ## Create interfaces
-            cls.interfaces = range(TestL2xc.interf_nr)
-            cls.create_interfaces(cls.interfaces)
+    def setUp(self):
+        super(TestL2xc, self).setUp()
 
-            ## Create bi-directional cross-connects between pg0 and pg1
-            cls.api("sw_interface_set_l2_xconnect rx pg0 tx pg1 enable")
-            cls.api("sw_interface_set_l2_xconnect rx pg1 tx pg0 enable")
+        # create 4 pg interfaces
+        self.create_pg_interfaces(range(4))
 
-            ## Create bi-directional cross-connects between pg2 and pg3
-            cls.api("sw_interface_set_l2_xconnect rx pg2 tx pg3 enable")
-            cls.api("sw_interface_set_l2_xconnect rx pg3 tx pg2 enable")
+        # packet flows mapping pg0 -> pg1, pg2 -> pg3, etc.
+        self.flows = dict()
+        self.flows[self.pg0] = [self.pg1]
+        self.flows[self.pg1] = [self.pg0]
+        self.flows[self.pg2] = [self.pg3]
+        self.flows[self.pg3] = [self.pg2]
 
-            cls.cli(0, "show l2patch")
+        # packet sizes
+        self.pg_if_packet_sizes = [64, 512, 1518, 9018]
 
-            ## Create host MAC and IPv4 lists
-            cls.create_host_lists(TestL2xc.hosts_nr)
+        self.interfaces = list(self.pg_interfaces)
 
-        except Exception as e:
-            cls.tearDownClass()
-            raise e
+        # Create bi-directional cross-connects between pg0 and pg1
+        self.vapi.sw_interface_set_l2_xconnect(
+            self.pg0.sw_if_index, self.pg1.sw_if_index, enable=1)
+        self.vapi.sw_interface_set_l2_xconnect(
+            self.pg1.sw_if_index, self.pg0.sw_if_index, enable=1)
+
+        # Create bi-directional cross-connects between pg2 and pg3
+        self.vapi.sw_interface_set_l2_xconnect(
+            self.pg2.sw_if_index, self.pg3.sw_if_index, enable=1)
+        self.vapi.sw_interface_set_l2_xconnect(
+            self.pg3.sw_if_index, self.pg2.sw_if_index, enable=1)
+
+        info(self.vapi.cli("show l2patch"))
+
+        # mapping between packet-generator index and lists of test hosts
+        self.hosts_by_pg_idx = dict()
+
+        # Create host MAC and IPv4 lists
+        # self.MY_MACS = dict()
+        # self.MY_IP4S = dict()
+        self.create_host_lists(TestL2xc.hosts_nr)
+
+        # setup all interfaces
+        for i in self.interfaces:
+            i.admin_up()
 
-    ## Method to define tear down VPP actions of the test case.
-    #  Overrides tearDown method in VppTestCase class.
-    #  @param self The object pointer.
     def tearDown(self):
-        self.cli(2, "show int")
-        self.cli(2, "show trace")
-        self.cli(2, "show hardware")
-        self.cli(2, "show l2patch")
-        self.cli(2, "show error")
-        self.cli(2, "show run")
-
-    ## Class method to create required number of MAC and IPv4 addresses.
-    #  Create required number of host MAC addresses and distribute them among
-    #  interfaces. Create host IPv4 address for every host MAC address too.
-    #  @param cls The class pointer.
-    #  @param count Integer variable to store the number of MAC addresses to be
-    #  created.
-    @classmethod
-    def create_host_lists(cls, count):
-        for i in cls.interfaces:
-            cls.MY_MACS[i] = []
-            cls.MY_IP4S[i] = []
+        super(TestL2xc, self).tearDown()
+        if not self.vpp_dead:
+            info(self.vapi.cli("show l2patch"))
+
+    def create_host_lists(self, count):
+        """ Method to create required number of MAC and IPv4 addresses.
+        Create required number of host MAC addresses and distribute them among
+        interfaces. Create host IPv4 address for every host MAC address too.
+
+        :param count: Number of hosts to create MAC and IPv4 addresses for.
+        Type: int
+        """
+        for pg_if in self.pg_interfaces:
+            # self.MY_MACS[i.sw_if_index] = []
+            # self.MY_IP4S[i.sw_if_index] = []
+            self.hosts_by_pg_idx[pg_if.sw_if_index] = []
+            hosts = self.hosts_by_pg_idx[pg_if.sw_if_index]
             for j in range(0, count):
-                cls.MY_MACS[i].append("00:00:00:ff:%02x:%02x" % (i, j))
-                cls.MY_IP4S[i].append("172.17.1%02x.%u" % (i, j))
-        ## @var MY_MACS
-        #  Dictionary variable to store list of MAC addresses per interface.
-        ## @var MY_IP4S
-        #  Dictionary variable to store list of IPv4 addresses per interface.
-
-    ## Method to create packet stream for the packet generator interface.
-    #  Create input packet stream for the given packet generator interface with
-    #  packets of different length targeted for all other created packet
-    #  generator interfaces.
-    #  @param self The object pointer.
-    #  @param pg_id Integer variable to store the index of the interface to
-    #  create the input packet stream.
-    #  @return pkts List variable to store created input stream of packets.
-    def create_stream(self, pg_id):
-        # TODO: use variables to create lists based on interface number
-        pg_targets = [None] * 4
-        pg_targets[0] = [1]
-        pg_targets[1] = [0]
-        pg_targets[2] = [3]
-        pg_targets[3] = [2]
+                host = TestHost(
+                    "00:00:00:ff:%02x:%02x" % (pg_if.sw_if_index, j),
+                    "172.17.1%02x.%u" % (pg_if.sw_if_index, j))
+                hosts.append(host)
+
+    def create_stream(self, src_if, packet_sizes):
         pkts = []
         for i in range(0, TestL2xc.pkts_per_burst):
-            target_pg_id = pg_targets[pg_id][0]
-            target_host_id = random.randrange(len(self.MY_MACS[target_pg_id]))
-            source_host_id = random.randrange(len(self.MY_MACS[pg_id]))
-            pkt_info = self.create_packet_info(pg_id, target_pg_id)
+            dst_if = self.flows[src_if][0]
+            dst_host = random.choice(self.hosts_by_pg_idx[dst_if.sw_if_index])
+            src_host = random.choice(self.hosts_by_pg_idx[src_if.sw_if_index])
+            pkt_info = self.create_packet_info(
+                src_if.sw_if_index, dst_if.sw_if_index)
             payload = self.info_to_payload(pkt_info)
-            p = (Ether(dst=self.MY_MACS[target_pg_id][target_host_id],
-                       src=self.MY_MACS[pg_id][source_host_id]) /
-                 IP(src=self.MY_IP4S[pg_id][source_host_id],
-                    dst=self.MY_IP4S[target_pg_id][target_host_id]) /
+            p = (Ether(dst=dst_host.mac, src=src_host.mac) /
+                 IP(src=src_host.ip4, dst=dst_host.ip4) /
                  UDP(sport=1234, dport=1234) /
                  Raw(payload))
             pkt_info.data = p.copy()
-            packet_sizes = [64, 512, 1518, 9018]
             size = packet_sizes[(i / 2) % len(packet_sizes)]
             self.extend_packet(p, size)
             pkts.append(p)
         return pkts
-        ## @var pg_targets
-        #  List variable to store list of indexes of target packet generator
-        #  interfaces for every source packet generator interface.
-        ## @var target_pg_id
-        #  Integer variable to store the index of the random target packet
-        #  generator interfaces.
-        ## @var target_host_id
-        #  Integer variable to store the index of the randomly chosen
-        #  destination host MAC/IPv4 address.
-        ## @var source_host_id
-        #  Integer variable to store the index of the randomly chosen source
-        #  host MAC/IPv4 address.
-        ## @var pkt_info
-        #  Object variable to store the information about the generated packet.
-        ## @var payload
-        #  String variable to store the payload of the packet to be generated.
-        ## @var p
-        #  Object variable to store the generated packet.
-        ## @var packet_sizes
-        #  List variable to store required packet sizes.
-        ## @var size
-        #  List variable to store required packet sizes.
-
-    ## Method to verify packet stream received on the packet generator interface.
-    #  Verify packet-by-packet the output stream captured on a given packet
-    #  generator (pg) interface using following packet payload data - order of
-    #  packet in the stream, index of the source and destination pg interface,
-    #  src and dst host IPv4 addresses and src port and dst port values of UDP
-    #  layer.
-    #  @param self The object pointer.
-    #  @param o Integer variable to store the index of the interface to
-    #  verify the output packet stream.
-    #  @param capture List variable to store the captured output packet stream.
-    def verify_capture(self, o, capture):
-        last_info = {}
+
+    def verify_capture(self, pg_if, capture):
+        last_info = dict()
         for i in self.interfaces:
-            last_info[i] = None
+            last_info[i.sw_if_index] = None
+        dst_sw_if_index = pg_if.sw_if_index
         for packet in capture:
             try:
                 ip = packet[IP]
                 udp = packet[UDP]
                 payload_info = self.payload_to_info(str(packet[Raw]))
-                self.assertEqual(payload_info.dst, o)
-                self.log("Got packet on port %u: src=%u (id=%u)"
-                         % (o, payload_info.src, payload_info.index), 2)
+                packet_index = payload_info.index
+                self.assertEqual(payload_info.dst, dst_sw_if_index)
+                debug("Got packet on port %s: src=%u (id=%u)" %
+                      (pg_if.name, payload_info.src, packet_index))
                 next_info = self.get_next_packet_info_for_interface2(
-                    payload_info.src, payload_info.dst,
+                    payload_info.src, dst_sw_if_index,
                     last_info[payload_info.src])
                 last_info[payload_info.src] = next_info
                 self.assertTrue(next_info is not None)
-                self.assertEqual(payload_info.index, next_info.index)
+                self.assertEqual(packet_index, next_info.index)
+                saved_packet = next_info.data
                 # Check standard fields
-                self.assertEqual(ip.src, next_info.data[IP].src)
-                self.assertEqual(ip.dst, next_info.data[IP].dst)
-                self.assertEqual(udp.sport, next_info.data[UDP].sport)
-                self.assertEqual(udp.dport, next_info.data[UDP].dport)
+                self.assertEqual(ip.src, saved_packet[IP].src)
+                self.assertEqual(ip.dst, saved_packet[IP].dst)
+                self.assertEqual(udp.sport, saved_packet[UDP].sport)
+                self.assertEqual(udp.dport, saved_packet[UDP].dport)
             except:
-                self.log("Unexpected or invalid packet:")
+                error("Unexpected or invalid packet:")
                 packet.show()
                 raise
         for i in self.interfaces:
             remaining_packet = self.get_next_packet_info_for_interface2(
-                i, o, last_info[i])
+                i, dst_sw_if_index, last_info[i.sw_if_index])
             self.assertTrue(remaining_packet is None,
                             "Port %u: Packet expected from source %u didn't"
-                            " arrive" % (o, i))
-        ## @var last_info
-        #  Dictionary variable to store verified packets per packet generator
-        #  interface.
-        ## @var ip
-        #  Object variable to store the IP layer of the packet.
-        ## @var udp
-        #  Object variable to store the UDP layer of the packet.
-        ## @var payload_info
-        #  Object variable to store required information about the packet.
-        ## @var next_info
-        #  Object variable to store information about next packet.
-        ## @var remaining_packet
-        #  Object variable to store information about remaining packet.
-
-    ## Method defining L2 cross-connect test case.
-    #  Contains steps of the test case.
-    #  @param self The object pointer.
+                            " arrive" % (dst_sw_if_index, i.sw_if_index))
+
     def test_l2xc(self):
         """ L2XC test
 
@@ -217,27 +159,21 @@ class TestL2xc(VppTestCase):
             burst of packets per interface
         """
 
-        ## Create incoming packet streams for packet-generator interfaces
+        # Create incoming packet streams for packet-generator interfaces
         for i in self.interfaces:
-            pkts = self.create_stream(i)
-            self.pg_add_stream(i, pkts)
+            pkts = self.create_stream(i, self.pg_if_packet_sizes)
+            i.add_stream(pkts)
 
-        ## Enable packet capturing and start packet sending
-        self.pg_enable_capture(self.interfaces)
+        # Enable packet capturing and start packet sending
+        self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
 
-        ## Verify outgoing packet streams per packet-generator interface
-        for i in self.interfaces:
-            out = self.pg_get_capture(i)
-            self.log("Verifying capture %u" % i)
-            self.verify_capture(i, out)
-        ## @var pkts
-        #  List variable to store created input stream of packets for the packet
-        #  generator interface.
-        ## @var out
-        #  List variable to store captured output stream of packets for
-        #  the packet generator interface.
+        # Verify outgoing packet streams per packet-generator interface
+        for i in self.pg_interfaces:
+            capture = i.get_capture()
+            info("Verifying capture on interface %s" % i.name)
+            self.verify_capture(i, capture)
 
 
 if __name__ == '__main__':
-    unittest.main(testRunner = VppTestRunner)
+    unittest.main(testRunner=VppTestRunner)
diff --git a/test/test_lb.py b/test/test_lb.py
index eb308195..76fdd693 100644
--- a/test/test_lb.py
+++ b/test/test_lb.py
@@ -1,27 +1,30 @@
-import unittest
-import time
 import socket
-from framework import VppTestCase, VppTestRunner
-from util import Util
+import unittest
+from logging import *
 
-from scapy.packet import Raw
-from scapy.layers.l2 import Ether, GRE
 from scapy.layers.inet import IP, UDP
 from scapy.layers.inet6 import IPv6
+from scapy.layers.l2 import Ether, GRE
+from scapy.packet import Raw
+
+from framework import VppTestCase
+
+""" TestLB is a subclass of  VPPTestCase classes.
+
+ TestLB class defines Load Balancer test cases for:
+  - IP4 to GRE4 encap
+  - IP4 to GRE6 encap
+  - IP6 to GRE4 encap
+  - IP6 to GRE6 encap
+
+ As stated in comments below, GRE has issues with IPv6.
+ All test cases involving IPv6 are executed, but
+ received packets are not parsed and checked.
+
+"""
 
-## TestLB is a subclass of Util and VPPTestCase classes.
-#
-#  TestLB class defines Load Balancer test cases for:
-#   - IP4 to GRE4 encap
-#   - IP4 to GRE6 encap
-#   - IP6 to GRE4 encap
-#   - IP6 to GRE6 encap
-#
-#  As stated in comments below, GRE has issues with IPv6.
-#  All test cases involving IPv6 are executed, but
-#  received packets are not parsed and checked.
-#
-class TestLB(Util, VppTestCase):
+
+class TestLB(VppTestCase):
     """ Load Balancer Test Case """
 
     @classmethod
@@ -32,61 +35,73 @@ class TestLB(Util, VppTestCase):
         cls.packets = range(100)
 
         try:
-            cls.create_interfaces([0,1])
-            cls.api("sw_interface_dump")
-            cls.config_ip4([0,1])
-            cls.config_ip6([0,1])
-            cls.resolve_arp([0,1])
-            cls.resolve_icmpv6_nd([0,1])
-            cls.cli(0, "ip route add 10.0.0.0/24 via %s pg1" % (cls.MY_IP4S[1]))
-            cls.cli(0, "ip route add 2002::/16 via %s pg1" % (cls.MY_IP6S[1]))
-            cls.cli(0, "lb conf buckets-log2 20 ip4-src-address 39.40.41.42 ip6-src-address fd00:f00d::1")
-
-        except Exception as e:
+            cls.create_pg_interfaces(range(2))
+            cls.interfaces = list(cls.pg_interfaces)
+
+            for i in cls.interfaces:
+                i.admin_up()
+                i.config_ip4()
+                i.config_ip6()
+                i.disable_ipv6_ra()
+                i.resolve_arp()
+                i.resolve_ndp()
+            dst4 = socket.inet_pton(socket.AF_INET, "10.0.0.0")
+            dst6 = socket.inet_pton(socket.AF_INET6, "2002::")
+            cls.vapi.ip_add_del_route(dst4, 24, cls.pg1.remote_ip4n)
+            cls.vapi.ip_add_del_route(dst6, 16, cls.pg1.remote_ip6n, is_ipv6=1)
+            cls.vapi.cli("lb conf ip4-src-address 39.40.41.42")
+            cls.vapi.cli("lb conf ip6-src-address 2004::1")
+        except Exception:
             super(TestLB, cls).tearDownClass()
             raise
 
     def tearDown(self):
-        self.cli(2, "show int")
-        self.cli(2, "show trace")
-        self.cli(2, "show lb vip verbose")
+        super(TestLB, self).tearDown()
+        if not self.vpp_dead:
+            info(self.vapi.cli("show lb vip verbose"))
 
     def getIPv4Flow(self, id):
         return (IP(dst="90.0.%u.%u" % (id / 255, id % 255),
-              src="40.0.%u.%u" % (id / 255, id % 255)) /
+                   src="40.0.%u.%u" % (id / 255, id % 255)) /
                 UDP(sport=10000 + id, dport=20000 + id))
 
     def getIPv6Flow(self, id):
         return (IPv6(dst="2001::%u" % (id), src="fd00:f00d:ffff::%u" % (id)) /
-            UDP(sport=10000 + id, dport=20000 + id))
+                UDP(sport=10000 + id, dport=20000 + id))
 
-    def generatePackets(self, isv4):
+    def generatePackets(self, src_if, isv4):
         pkts = []
         for pktid in self.packets:
-            info = self.create_packet_info(0, pktid)
+            info = self.create_packet_info(src_if.sw_if_index, pktid)
             payload = self.info_to_payload(info)
             ip = self.getIPv4Flow(pktid) if isv4 else self.getIPv6Flow(pktid)
-            packet=(Ether(dst=self.VPP_MACS[0], src=self.MY_MACS[0]) /
-                    ip / Raw(payload))
+            packet = (Ether(dst=src_if.local_mac, src=src_if.remote_mac) /
+                      ip /
+                      Raw(payload))
             self.extend_packet(packet, 128)
             info.data = packet.copy()
             pkts.append(packet)
         return pkts
 
     def checkInner(self, gre, isv4):
+        IPver = IP if isv4 else IPv6
         self.assertEqual(gre.proto, 0x0800 if isv4 else 0x86DD)
         self.assertEqual(gre.flags, 0)
         self.assertEqual(gre.version, 0)
-        inner = gre[IP] if isv4 else gre[IPv6]
-        payload_info = self.payload_to_info(str(gre[Raw]))
+        inner = IPver(str(gre.payload))
+        payload_info = self.payload_to_info(str(inner[Raw]))
         packet_index = payload_info.index
-        self.info = self.get_next_packet_info_for_interface2(0, payload_info.dst, self.info)
-        self.assertEqual(str(inner), str(self.info.data[IP]))
+        self.info = self.get_next_packet_info_for_interface2(self.pg0.sw_if_index,
+                                                             payload_info.dst,
+                                                             self.info)
+        self.assertEqual(str(inner), str(self.info.data[IPver]))
 
     def checkCapture(self, gre4, isv4):
-        out = self.pg_get_capture(0)
-        self.assertEqual(len(out), 0)
-        out = self.pg_get_capture(1)
+        out = self.pg0.get_capture()
+        # This check is edited because RA appears in output, maybe disable RA?
+        # self.assertEqual(len(out), 0)
+        self.assertLess(len(out), 20)
+        out = self.pg1.get_capture()
         self.assertEqual(len(out), len(self.packets))
 
         load = [0] * len(self.ass)
@@ -97,8 +112,6 @@ class TestLB(Util, VppTestCase):
                 gre = None
                 if gre4:
                     ip = p[IP]
-                    gre = p[GRE]
-                    inner = gre[IP] if isv4 else gre[IPv6]
                     asid = int(ip.dst.split(".")[3])
                     self.assertEqual(ip.version, 4)
                     self.assertEqual(ip.flags, 0)
@@ -106,105 +119,108 @@ class TestLB(Util, VppTestCase):
                     self.assertEqual(ip.dst, "10.0.0.%u" % asid)
                     self.assertEqual(ip.proto, 47)
                     self.assertEqual(len(ip.options), 0)
-                    self.assertTrue(ip.ttl >= 64)
+                    self.assertGreaterEqual(ip.ttl, 64)
+                    gre = p[GRE]
                 else:
                     ip = p[IPv6]
-                    gre = p[GRE]
-                    inner = gre[IP] if isv4 else gre[IPv6]
                     asid = ip.dst.split(":")
                     asid = asid[len(asid) - 1]
-                    asid = 0 if asid=="" else int(asid)
+                    asid = 0 if asid == "" else int(asid)
                     self.assertEqual(ip.version, 6)
-                    # Todo: Given scapy... I will do that when it works.
+                    self.assertEqual(ip.tc, 0)
+                    self.assertEqual(ip.fl, 0)
+                    self.assertEqual(ip.src, "2004::1")
+                    self.assertEqual(
+                        socket.inet_pton(socket.AF_INET6, ip.dst),
+                        socket.inet_pton(socket.AF_INET6, "2002::%u" % asid)
+                    )
+                    self.assertEqual(ip.nh, 47)
+                    self.assertGreaterEqual(ip.hlim, 64)
+                    # self.assertEqual(len(ip.options), 0)
+                    gre = GRE(str(p[IPv6].payload))
                 self.checkInner(gre, isv4)
                 load[asid] += 1
             except:
-                self.log("Unexpected or invalid packet:")
+                error("Unexpected or invalid packet:")
                 p.show()
                 raise
 
         # This is just to roughly check that the balancing algorithm
         # is not completly biased.
         for asid in self.ass:
-            if load[asid] < len(self.packets)/(len(self.ass)*2):
-                self.log("ASS is not balanced: load[%d] = %d" % (asid, load[asid]))
+            if load[asid] < len(self.packets) / (len(self.ass) * 2):
+                self.log(
+                    "ASS is not balanced: load[%d] = %d" % (asid, load[asid]))
                 raise Exception("Load Balancer algorithm is biased")
 
-
     def test_lb_ip4_gre4(self):
         """ Load Balancer IP4 GRE4 """
+        try:
+            self.vapi.cli("lb vip 90.0.0.0/8 encap gre4")
+            for asid in self.ass:
+                self.vapi.cli("lb as 90.0.0.0/8 10.0.0.%u" % (asid))
 
-        return
-        self.cli(0, "lb vip 90.0.0.0/8 encap gre4")
-        for asid in self.ass:
-            self.cli(0, "lb as 90.0.0.0/8 10.0.0.%u" % (asid))
-
-        self.pg_add_stream(0, self.generatePackets(1))
-        self.pg_enable_capture([0,1])
-        self.pg_start()
-        self.checkCapture(1, 1)
-
-        for asid in self.ass:
-            self.cli(0, "lb as 90.0.0.0/8 10.0.0.%u del" % (asid))
-        self.cli(0, "lb vip 90.0.0.0/8 encap gre4 del")
+            self.pg0.add_stream(self.generatePackets(self.pg0, isv4=True))
+            self.pg_enable_capture(self.pg_interfaces)
+            self.pg_start()
+            self.checkCapture(gre4=True, isv4=True)
 
+        finally:
+            for asid in self.ass:
+                self.vapi.cli("lb as 90.0.0.0/8 10.0.0.%u del" % (asid))
+            self.vapi.cli("lb vip 90.0.0.0/8 encap gre4 del")
 
     def test_lb_ip6_gre4(self):
         """ Load Balancer IP6 GRE4 """
 
-        self.cli(0, "lb vip 2001::/16 encap gre4")
-        for asid in self.ass:
-            self.cli(0, "lb as 2001::/16 10.0.0.%u" % (asid))
-
-        self.pg_add_stream(0, self.generatePackets(0))
-        self.pg_enable_capture([0,1])
-        self.pg_start()
-
-        # Scapy fails parsing IPv6 over GRE.
-        # This check is therefore disabled for now.
-        #self.checkCapture(1, 0)
+        try:
+            self.vapi.cli("lb vip 2001::/16 encap gre4")
+            for asid in self.ass:
+                self.vapi.cli("lb as 2001::/16 10.0.0.%u" % (asid))
 
-        for asid in self.ass:
-            self.cli(0, "lb as 2001::/16 10.0.0.%u del" % (asid))
-        self.cli(0, "lb vip 2001::/16 encap gre4 del")
+            self.pg0.add_stream(self.generatePackets(self.pg0, isv4=False))
+            self.pg_enable_capture(self.pg_interfaces)
+            self.pg_start()
 
+            self.checkCapture(gre4=True, isv4=False)
+        finally:
+            for asid in self.ass:
+                self.vapi.cli("lb as 2001::/16 10.0.0.%u del" % (asid))
+            self.vapi.cli("lb vip 2001::/16 encap gre4 del")
 
     def test_lb_ip4_gre6(self):
         """ Load Balancer IP4 GRE6 """
-
-        self.cli(0, "lb vip 90.0.0.0/8 encap gre6")
-        for asid in self.ass:
-            self.cli(0, "lb as 90.0.0.0/8 2002::%u" % (asid))
-
-        self.pg_add_stream(0, self.generatePackets(1))
-        self.pg_enable_capture([0,1])
-        self.pg_start()
-
-        # Scapy fails parsing GRE over IPv6.
-        # This check is therefore disabled for now.
-        # One can easily patch layers/inet6.py to fix the issue.
-        #self.checkCapture(0, 1)
-
-        for asid in self.ass:
-            self.cli(0, "lb as 90.0.0.0/8 2002::%u" % (asid))
-        self.cli(0, "lb vip 90.0.0.0/8 encap gre6 del")
+        try:
+            self.vapi.cli("lb vip 90.0.0.0/8 encap gre6")
+            for asid in self.ass:
+                self.vapi.cli("lb as 90.0.0.0/8 2002::%u" % (asid))
+
+            self.pg0.add_stream(self.generatePackets(self.pg0, isv4=True))
+            self.pg_enable_capture(self.pg_interfaces)
+            self.pg_start()
+
+            # Scapy fails parsing GRE over IPv6.
+            # This check is therefore disabled for now.
+            # One can easily patch layers/inet6.py to fix the issue.
+            self.checkCapture(gre4=False, isv4=True)
+        finally:
+            for asid in self.ass:
+                self.vapi.cli("lb as 90.0.0.0/8 2002::%u" % (asid))
+            self.vapi.cli("lb vip 90.0.0.0/8 encap gre6 del")
 
     def test_lb_ip6_gre6(self):
         """ Load Balancer IP6 GRE6 """
-
-        self.cli(0, "lb vip 2001::/16 encap gre6")
-        for asid in self.ass:
-            self.cli(0, "lb as 2001::/16 2002::%u" % (asid))
-
-        self.pg_add_stream(0, self.generatePackets(0))
-        self.pg_enable_capture([0,1])
-        self.pg_start()
-
-        # Scapy fails parsing IPv6 over GRE and IPv6 over GRE.
-        # This check is therefore disabled for now.
-        #self.checkCapture(0, 0)
-
-        for asid in self.ass:
-            self.cli(0, "lb as 2001::/16 2002::%u del" % (asid))
-        self.cli(0, "lb vip 2001::/16 encap gre6 del")
-
+        try:
+            self.vapi.cli("lb vip 2001::/16 encap gre6")
+            for asid in self.ass:
+                self.vapi.cli("lb as 2001::/16 2002::%u" % (asid))
+
+            self.pg0.add_stream(self.generatePackets(self.pg0, isv4=False))
+            self.pg_enable_capture(self.pg_interfaces)
+            self.pg_start()
+
+            self.checkCapture(gre4=False, isv4=False)
+        finally:
+            for asid in self.ass:
+                self.vapi.cli("lb as 2001::/16 2002::%u del" % (asid))
+            self.vapi.cli("lb vip 2001::/16 encap gre6 del")
diff --git a/test/test_vxlan.py b/test/test_vxlan.py
index 1db34927..cb7e7acf 100644
--- a/test/test_vxlan.py
+++ b/test/test_vxlan.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 import unittest
+from logging import *
 from framework import VppTestCase, VppTestRunner
-from util import Util
 from template_bd import BridgeDomain
 
 from scapy.layers.l2 import Ether
@@ -10,61 +10,49 @@ from scapy.layers.inet import IP, UDP
 from scapy_handlers.vxlan import VXLAN
 
 
-## TestVxlan is a subclass of BridgeDomain, Util, VppTestCase classes.
-#
-#  TestVxlan class defines VXLAN test cases for VXLAN encapsulation,
-#  decapsulation and VXLAN tunnel termination in L2 bridge-domain.
-class TestVxlan(BridgeDomain, Util, VppTestCase):
+class TestVxlan(BridgeDomain, VppTestCase):
     """ VXLAN Test Case """
 
-    ## Method to initialize all parent classes.
-    #
-    #  Initialize BridgeDomain objects, set documentation string for inherited
-    #  tests and initialize VppTestCase object which must be called after
-    #  doc strings are set.
     def __init__(self, *args):
         BridgeDomain.__init__(self)
-        self.test_decap.__func__.__doc__ = ' VXLAN BD decapsulation '
-        self.test_encap.__func__.__doc__ = ' VXLAN BD encapsulation '
         VppTestCase.__init__(self, *args)
 
-    ## Method for VXLAN encapsulate function.
-    #
-    #  Encapsulate the original payload frame by adding VXLAN header with its
-    #  UDP, IP and Ethernet fields.
     def encapsulate(self, pkt):
-        return (Ether(src=self.MY_MACS[0], dst=self.VPP_MACS[0]) /
-                IP(src=self.MY_IP4S[0], dst=self.VPP_IP4S[0]) /
-                UDP(sport=4789, dport=4789, chksum=0) /
-                VXLAN(vni=1) /
+        """
+        Encapsulate the original payload frame by adding VXLAN header with its
+        UDP, IP and Ethernet fields
+        """
+        return (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
+                IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) /
+                UDP(sport=self.dport, dport=self.dport, chksum=0) /
+                VXLAN(vni=self.vni) /
                 pkt)
 
-    ## Method for VXLAN decapsulate function.
-    #
-    #  Decapsulate the original payload frame by removing VXLAN header with
-    #  its UDP, IP and Ethernet fields.
     def decapsulate(self, pkt):
+        """
+        Decapsulate the original payload frame by removing VXLAN header
+        """
         return pkt[VXLAN].payload
 
-    ## Method for checking VXLAN encapsulation.
+    # Method for checking VXLAN encapsulation.
     #
     def check_encapsulation(self, pkt):
         # TODO: add error messages
-        ## Verify source MAC is VPP_MAC and destination MAC is MY_MAC resolved
+        # Verify source MAC is VPP_MAC and destination MAC is MY_MAC resolved
         #  by VPP using ARP.
-        self.assertEqual(pkt[Ether].src, self.VPP_MACS[0])
-        self.assertEqual(pkt[Ether].dst, self.MY_MACS[0])
-        ## Verify VXLAN tunnel source IP is VPP_IP and destination IP is MY_IP.
-        self.assertEqual(pkt[IP].src, self.VPP_IP4S[0])
-        self.assertEqual(pkt[IP].dst, self.MY_IP4S[0])
-        ## Verify UDP destination port is VXLAN 4789, source UDP port could be
+        self.assertEqual(pkt[Ether].src, self.pg0.local_mac)
+        self.assertEqual(pkt[Ether].dst, self.pg0.remote_mac)
+        # Verify VXLAN tunnel source IP is VPP_IP and destination IP is MY_IP.
+        self.assertEqual(pkt[IP].src, self.pg0.local_ip4)
+        self.assertEqual(pkt[IP].dst, self.pg0.remote_ip4)
+        # Verify UDP destination port is VXLAN 4789, source UDP port could be
         #  arbitrary.
-        self.assertEqual(pkt[UDP].dport, 4789)
+        self.assertEqual(pkt[UDP].dport, type(self).dport)
         # TODO: checksum check
-        ## Verify VNI, based on configuration it must be 1.
-        self.assertEqual(pkt[VXLAN].vni, 1)
+        # Verify VNI, based on configuration it must be 1.
+        self.assertEqual(pkt[VXLAN].vni, type(self).vni)
 
-    ## Class method to start the VXLAN test case.
+    # Class method to start the VXLAN test case.
     #  Overrides setUpClass method in VppTestCase class.
     #  Python try..except statement is used to ensure that the tear down of
     #  the class will be executed even if exception is raised.
@@ -72,31 +60,41 @@ class TestVxlan(BridgeDomain, Util, VppTestCase):
     @classmethod
     def setUpClass(cls):
         super(TestVxlan, cls).setUpClass()
+
         try:
-            ## Create 2 pg interfaces.
-            cls.create_interfaces(range(2))
-            ## Configure IPv4 addresses on VPP pg0.
-            cls.config_ip4([0])
-            ## Resolve MAC address for VPP's IP address on pg0.
-            cls.resolve_arp([0])
-
-            ## Create VXLAN VTEP on VPP pg0, and put vxlan_tunnel0 and pg1
+            cls.dport = 4789
+            cls.vni = 1
+
+            # Create 2 pg interfaces.
+            cls.create_pg_interfaces(range(2))
+            cls.pg0.admin_up()
+            cls.pg1.admin_up()
+
+            # Configure IPv4 addresses on VPP pg0.
+            cls.pg0.config_ip4()
+
+            # Resolve MAC address for VPP's IP address on pg0.
+            cls.pg0.resolve_arp()
+
+            # Create VXLAN VTEP on VPP pg0, and put vxlan_tunnel0 and pg1
             #  into BD.
-            cls.api("vxlan_add_del_tunnel src %s dst %s vni 1" %
-                    (cls.VPP_IP4S[0], cls.MY_IP4S[0]))
-            cls.api("sw_interface_set_l2_bridge vxlan_tunnel0 bd_id 1")
-            cls.api("sw_interface_set_l2_bridge pg1 bd_id 1")
-        except:
-            ## In case setUpClass fails run tear down.
-            cls.tearDownClass()
+            r = cls.vapi.vxlan_add_del_tunnel(
+                src_addr=cls.pg0.local_ip4n,
+                dst_addr=cls.pg0.remote_ip4n,
+                vni=cls.vni)
+            cls.vapi.sw_interface_set_l2_bridge(r.sw_if_index, bd_id=1)
+            cls.vapi.sw_interface_set_l2_bridge(cls.pg1.sw_if_index, bd_id=1)
+        except Exception:
+            super(TestVxlan, cls).tearDownClass()
             raise
 
-    ## Method to define VPP actions before tear down of the test case.
+    # Method to define VPP actions before tear down of the test case.
     #  Overrides tearDown method in VppTestCase class.
     #  @param self The object pointer.
     def tearDown(self):
         super(TestVxlan, self).tearDown()
-        self.cli(2, "show bridge-domain 1 detail")
+        if not self.vpp_dead:
+            info(self.vapi.cli("show bridge-domain 1 detail"))
 
 if __name__ == '__main__':
     unittest.main(testRunner=VppTestRunner)
diff --git a/test/util.py b/test/util.py
index c72a3965..8d7c9202 100644
--- a/test/util.py
+++ b/test/util.py
@@ -1,139 +1,25 @@
-## @package util
-#  Module with common functions that should be used by the test cases.
-#
-#  The module provides a set of tools for setup the test environment
+from logging import *
 
-from scapy.layers.l2 import Ether, ARP
-from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6NDOptSrcLLAddr
 
+class TestHost(object):
+    """ Generic test host "connected" to VPP. """
 
-## Util class
-#
-#  Test cases that want to use methods defined in Util class should
-#  inherit this class.
-#
-#  class Example(Util, VppTestCase):
-#      pass
-class Util(object):
+    @property
+    def mac(self):
+        """ MAC address """
+        return self._mac
 
-    ## Class method to send ARP Request for each VPP IPv4 address in
-    #  order to determine VPP interface MAC address to IPv4 bindings.
-    #
-    #  Resolved MAC address is saved to the VPP_MACS dictionary with interface
-    #  index as a key. ARP Request is sent from MAC in MY_MACS dictionary with
-    #  interface index as a key.
-    #  @param cls The class pointer.
-    #  @param args List variable to store indices of VPP interfaces.
-    @classmethod
-    def resolve_arp(cls, args):
-        for i in args:
-            ip = cls.VPP_IP4S[i]
-            cls.log("Sending ARP request for %s on port %u" % (ip, i))
-            arp_req = (Ether(dst="ff:ff:ff:ff:ff:ff", src=cls.MY_MACS[i]) /
-                       ARP(op=ARP.who_has, pdst=ip,
-                           psrc=cls.MY_IP4S[i], hwsrc=cls.MY_MACS[i]))
-            cls.pg_add_stream(i, arp_req)
-            cls.pg_enable_capture([i])
+    @property
+    def ip4(self):
+        """ IPv4 address """
+        return self._ip4
 
-            cls.cli(2, "trace add pg-input 1")
-            cls.pg_start()
-            arp_reply = cls.pg_get_capture(i)[0]
-            if arp_reply[ARP].op == ARP.is_at:
-                cls.log("VPP pg%u MAC address is %s " % (i, arp_reply[ARP].hwsrc))
-                cls.VPP_MACS[i] = arp_reply[ARP].hwsrc
-            else:
-                cls.log("No ARP received on port %u" % i)
-            cls.cli(2, "show trace")
-            ## @var ip
-            #  <TODO add description>
-            ## @var arp_req
-            #  <TODO add description>
-            ## @var arp_reply
-            #  <TODO add description>
-            ## @var VPP_MACS
-            #  <TODO add description>
+    @property
+    def ip6(self):
+        """ IPv6 address """
+        return self._ip6
 
-    ## Class method to send ND request for each VPP IPv6 address in
-    #  order to determine VPP MAC address to IPv6 bindings.
-    #
-    #  Resolved MAC address is saved to the VPP_MACS dictionary with interface
-    #  index as a key. ND Request is sent from MAC in MY_MACS dictionary with
-    #  interface index as a key.
-    #  @param cls The class pointer.
-    #  @param args List variable to store indices of VPP interfaces.
-    @classmethod
-    def resolve_icmpv6_nd(cls, args):
-        for i in args:
-            ip = cls.VPP_IP6S[i]
-            cls.log("Sending ICMPv6ND_NS request for %s on port %u" % (ip, i))
-            nd_req = (Ether(dst="ff:ff:ff:ff:ff:ff", src=cls.MY_MACS[i]) /
-                      IPv6(src=cls.MY_IP6S[i], dst=ip) /
-                      ICMPv6ND_NS(tgt=ip) /
-                      ICMPv6NDOptSrcLLAddr(lladdr=cls.MY_MACS[i]))
-            cls.pg_add_stream(i, nd_req)
-            cls.pg_enable_capture([i])
-
-            cls.cli(2, "trace add pg-input 1")
-            cls.pg_start()
-            nd_reply = cls.pg_get_capture(i)[0]
-            icmpv6_na = nd_reply['ICMPv6 Neighbor Discovery - Neighbor Advertisement']
-            dst_ll_addr = icmpv6_na['ICMPv6 Neighbor Discovery Option - Destination Link-Layer Address']
-            cls.VPP_MACS[i] = dst_ll_addr.lladdr
-            ## @var ip
-            #  <TODO add description>
-            ## @var nd_req
-            #  <TODO add description>
-            ## @var nd_reply
-            #  <TODO add description>
-            ## @var icmpv6_na
-            #  <TODO add description>
-            ## @var dst_ll_addr
-            #  <TODO add description>
-            ## @var VPP_MACS
-            #  <TODO add description>
-
-    ## Class method to configure IPv4 addresses on VPP interfaces.
-    #
-    #  Set dictionary variables MY_IP4S and VPP_IP4S to IPv4 addresses
-    #  calculated using interface VPP interface index as a parameter.
-    #  /24 IPv4 prefix is used, with VPP interface address host part set
-    #  to .1 and MY address set to .2.
-    #  Used IPv4 prefix scheme: 172.16.{VPP-interface-index}.0/24.
-    #  @param cls The class pointer.
-    #  @param args List variable to store indices of VPP interfaces.
-    @classmethod
-    def config_ip4(cls, args):
-        for i in args:
-            cls.MY_IP4S[i] = "172.16.%u.2" % i
-            cls.VPP_IP4S[i] = "172.16.%u.1" % i
-            cls.api("sw_interface_add_del_address pg%u %s/24" % (i, cls.VPP_IP4S[i]))
-            cls.log("My IPv4 address is %s" % (cls.MY_IP4S[i]))
-            ## @var MY_IP4S
-            #  Dictionary variable to store host IPv4 addresses connected to packet
-            #  generator interfaces.
-            ## @var VPP_IP4S
-            #  Dictionary variable to store VPP IPv4 addresses of the packet
-            #  generator interfaces.
-
-    ## Class method to configure IPv6 addresses on VPP interfaces.
-    #
-    #  Set dictionary variables MY_IP6S and VPP_IP6S to IPv6 addresses
-    #  calculated using interface VPP interface index as a parameter.
-    #  /64 IPv6 prefix is used, with VPP interface address host part set
-    #  to ::1 and MY address set to ::2.
-    #  Used IPv6 prefix scheme: fd10:{VPP-interface-index}::0/64.
-    #  @param cls The class pointer.
-    #  @param args List variable to store indices of VPP interfaces.
-    @classmethod
-    def config_ip6(cls, args):
-        for i in args:
-            cls.MY_IP6S[i] = "fd10:%u::2" % i
-            cls.VPP_IP6S[i] = "fd10:%u::1" % i
-            cls.api("sw_interface_add_del_address pg%u %s/64" % (i, cls.VPP_IP6S[i]))
-            cls.log("My IPv6 address is %s" % (cls.MY_IP6S[i]))
-            ## @var MY_IP6S
-            #  Dictionary variable to store host IPv6 addresses connected to packet
-            #  generator interfaces.
-            ## @var VPP_IP6S
-            #  Dictionary variable to store VPP IPv6 addresses of the packet
-            #  generator interfaces.
+    def __init__(self, mac=None, ip4=None, ip6=None):
+        self._mac = mac
+        self._ip4 = ip4
+        self._ip6 = ip6
diff --git a/test/vpp_interface.py b/test/vpp_interface.py
new file mode 100644
index 00000000..c596ab5a
--- /dev/null
+++ b/test/vpp_interface.py
@@ -0,0 +1,240 @@
+from abc import abstractmethod, ABCMeta
+import socket
+from logging import info, error
+from scapy.layers.l2 import Ether, ARP
+
+from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6ND_NA, ICMPv6NDOptSrcLLAddr, ICMPv6NDOptDstLLAddr
+
+
+class VppInterface(object):
+    """
+    Generic VPP interface
+    """
+    __metaclass__ = ABCMeta
+
+    @property
+    def sw_if_index(self):
+        """Interface index assigned by VPP"""
+        return self._sw_if_index
+
+    @property
+    def remote_mac(self):
+        """MAC-address of the remote interface "connected" to this interface"""
+        return self._remote_mac
+
+    @property
+    def local_mac(self):
+        """MAC-address of the VPP interface"""
+        return self._local_mac
+
+    @property
+    def local_ip4(self):
+        """Local IPv4 address on VPP interface (string)"""
+        return self._local_ip4
+
+    @property
+    def local_ip4n(self):
+        """Local IPv4 address - raw, suitable as API parameter"""
+        return self._local_ip4n
+
+    @property
+    def remote_ip4(self):
+        """IPv4 address of remote peer "connected" to this interface"""
+        return self._remote_ip4
+
+    @property
+    def remote_ip4n(self):
+        """IPv4 address of remote peer - raw, suitable as API parameter"""
+        return self._remote_ip4n
+
+    @property
+    def local_ip6(self):
+        """Local IPv6 address on VPP interface (string)"""
+        return self._local_ip6
+
+    @property
+    def local_ip6n(self):
+        """Local IPv6 address - raw, suitable as API parameter"""
+        return self._local_ip6n
+
+    @property
+    def remote_ip6(self):
+        """IPv6 address of remote peer "connected" to this interface"""
+        return self._remote_ip6
+
+    @property
+    def remote_ip6n(self):
+        """IPv6 address of remote peer - raw, suitable as API parameter"""
+        return self._remote_ip6n
+
+    @property
+    def name(self):
+        """Name of the interface"""
+        return self._name
+
+    @property
+    def dump(self):
+        """Raw result of sw_interface_dump for this interface"""
+        return self._dump
+
+    @property
+    def test(self):
+        """Test case creating this interface"""
+        return self._test
+
+    def post_init_setup(self):
+        """Additional setup run after creating an interface object"""
+        self._remote_mac = "02:00:00:00:ff:%02x" % self.sw_if_index
+
+        self._local_ip4 = "172.16.%u.1" % self.sw_if_index
+        self._local_ip4n = socket.inet_pton(socket.AF_INET, self.local_ip4)
+        self._remote_ip4 = "172.16.%u.2" % self.sw_if_index
+        self._remote_ip4n = socket.inet_pton(socket.AF_INET, self.remote_ip4)
+
+        self._local_ip6 = "fd01:%u::1" % self.sw_if_index
+        self._local_ip6n = socket.inet_pton(socket.AF_INET6, self.local_ip6)
+        self._remote_ip6 = "fd01:%u::2" % self.sw_if_index
+        self._remote_ip6n = socket.inet_pton(socket.AF_INET6, self.remote_ip6)
+
+        r = self.test.vapi.sw_interface_dump()
+        for intf in r:
+            if intf.sw_if_index == self.sw_if_index:
+                self._name = intf.interface_name.split(b'\0', 1)[0]
+                self._local_mac = ':'.join(intf.l2_address.encode('hex')[i:i + 2]
+                                           for i in range(0, 12, 2))
+                self._dump = intf
+                break
+        else:
+            raise Exception(
+                "Could not find interface with sw_if_index %d "
+                "in interface dump %s" %
+                (self.sw_if_index, repr(r)))
+
+    @abstractmethod
+    def __init__(self, test, index):
+        self._test = test
+        self.post_init_setup()
+        info("New %s, MAC=%s, remote_ip4=%s, local_ip4=%s" %
+             (self.__name__, self.remote_mac, self.remote_ip4, self.local_ip4))
+
+    def config_ip4(self):
+        """Configure IPv4 address on the VPP interface"""
+        addr = self.local_ip4n
+        addr_len = 24
+        self.test.vapi.sw_interface_add_del_address(
+            self.sw_if_index, addr, addr_len)
+
+    def config_ip6(self):
+        """Configure IPv6 address on the VPP interface"""
+        addr = self._local_ip6n
+        addr_len = 64
+        self.test.vapi.sw_interface_add_del_address(
+            self.sw_if_index, addr, addr_len, is_ipv6=1)
+
+    def disable_ipv6_ra(self):
+        """Configure IPv6 RA suppress on the VPP interface"""
+        self.test.vapi.sw_interface_ra_suppress(self.sw_if_index)
+
+    def create_arp_req(self):
+        """Create ARP request applicable for this interface"""
+        return (Ether(dst="ff:ff:ff:ff:ff:ff", src=self.remote_mac) /
+                ARP(op=ARP.who_has, pdst=self.local_ip4,
+                    psrc=self.remote_ip4, hwsrc=self.remote_mac))
+
+    def create_ndp_req(self):
+        return (Ether(dst="ff:ff:ff:ff:ff:ff", src=self.remote_mac) /
+              IPv6(src=self.remote_ip6, dst=self.local_ip6) /
+              ICMPv6ND_NS(tgt=self.local_ip6) /
+              ICMPv6NDOptSrcLLAddr(lladdr=self.remote_mac))
+
+    def resolve_arp(self, pg_interface=None):
+        """Resolve ARP using provided packet-generator interface
+
+        :param pg_interface: interface used to resolve, if None then this
+            interface is used
+
+        """
+        if pg_interface is None:
+            pg_interface = self
+        info("Sending ARP request for %s on port %s" %
+             (self.local_ip4, pg_interface.name))
+        arp_req = self.create_arp_req()
+        pg_interface.add_stream(arp_req)
+        pg_interface.enable_capture()
+        self.test.pg_start()
+        info(self.test.vapi.cli("show trace"))
+        arp_reply = pg_interface.get_capture()
+        if arp_reply is None or len(arp_reply) == 0:
+            info("No ARP received on port %s" % pg_interface.name)
+            return
+        arp_reply = arp_reply[0]
+        # Make Dot1AD packet content recognizable to scapy
+        if arp_reply.type == 0x88a8:
+            arp_reply.type = 0x8100
+            arp_reply = Ether(str(arp_reply))
+        try:
+            if arp_reply[ARP].op == ARP.is_at:
+                info("VPP %s MAC address is %s " %
+                     (self.name, arp_reply[ARP].hwsrc))
+                self._local_mac = arp_reply[ARP].hwsrc
+            else:
+                info("No ARP received on port %s" % pg_interface.name)
+        except:
+            error("Unexpected response to ARP request:")
+            error(arp_reply.show())
+            raise
+
+    def resolve_ndp(self, pg_interface=None):
+        """Resolve NDP using provided packet-generator interface
+
+        :param pg_interface: interface used to resolve, if None then this
+            interface is used
+
+        """
+        if pg_interface is None:
+            pg_interface = self
+        info("Sending NDP request for %s on port %s" %
+             (self.local_ip6, pg_interface.name))
+        ndp_req = self.create_ndp_req()
+        pg_interface.add_stream(ndp_req)
+        pg_interface.enable_capture()
+        self.test.pg_start()
+        info(self.test.vapi.cli("show trace"))
+        ndp_reply = pg_interface.get_capture()
+        if ndp_reply is None or len(ndp_reply) == 0:
+            info("No NDP received on port %s" % pg_interface.name)
+            return
+        ndp_reply = ndp_reply[0]
+        # Make Dot1AD packet content recognizable to scapy
+        if ndp_reply.type == 0x88a8:
+            ndp_reply.type = 0x8100
+            ndp_reply = Ether(str(ndp_reply))
+        try:
+            ndp_na = ndp_reply[ICMPv6ND_NA]
+            opt = ndp_na[ICMPv6NDOptDstLLAddr]
+            info("VPP %s MAC address is %s " %
+                 (self.name, opt.lladdr))
+            self._local_mac = opt.lladdr
+        except:
+            error("Unexpected response to NDP request:")
+            error(ndp_reply.show())
+            raise
+
+    def admin_up(self):
+        """ Put interface ADMIN-UP """
+        self.test.vapi.sw_interface_set_flags(self.sw_if_index, admin_up_down=1)
+
+    def add_sub_if(self, sub_if):
+        """
+        Register a sub-interface with this interface
+
+        :param sub_if: sub-interface
+
+        """
+        if not hasattr(self, 'sub_if'):
+            self.sub_if = sub_if
+        else:
+            if isinstance(self.sub_if, list):
+                self.sub_if.append(sub_if)
+            else:
+                self.sub_if = sub_if
diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
new file mode 100644
index 00000000..b83cd43f
--- /dev/null
+++ b/test/vpp_papi_provider.py
@@ -0,0 +1,316 @@
+import vpp_papi
+from logging import error
+from hook import Hook
+
+# from vnet/vnet/mpls/mpls_types.h
+MPLS_IETF_MAX_LABEL = 0xfffff
+MPLS_LABEL_INVALID = MPLS_IETF_MAX_LABEL + 1
+
+
+class VppPapiProvider(object):
+    """VPP-api provider using vpp-papi
+
+    @property hook: hook object providing before and after api/cli hooks
+
+
+    """
+
+    def __init__(self, name, shm_prefix):
+        self.hook = Hook()
+        self.name = name
+        self.shm_prefix = shm_prefix
+
+    def register_hook(self, hook):
+        """Replace hook registration with new hook
+
+        :param hook:
+
+        """
+        self.hook = hook
+
+    def connect(self):
+        """Connect the API to VPP"""
+        vpp_papi.connect(self.name, self.shm_prefix)
+
+    def disconnect(self):
+        """Disconnect the API from VPP"""
+        vpp_papi.disconnect()
+
+    def api(self, api_fn, api_args, expected_retval=0):
+        """Call API function and check it's return value
+        Call the appropriate hooks before and after the API call
+
+        :param api_fn: API function to call
+        :param api_args: tuple of API function arguments
+        :param expected_retval: Expected return value (Default value = 0)
+        :returns: reply from the API
+
+        """
+        self.hook.before_api(api_fn.__name__, api_args)
+        reply = api_fn(*api_args)
+        if hasattr(reply, 'retval') and reply.retval != expected_retval:
+            msg = "API call failed, expected retval == %d, got %s" % (
+                expected_retval, repr(reply))
+            error(msg)
+            raise Exception(msg)
+        self.hook.after_api(api_fn.__name__, api_args)
+        return reply
+
+    def cli(self, cli):
+        """Execute a CLI, calling the before/after hooks appropriately
+
+        :param cli: CLI to execute
+        :returns: CLI output
+
+        """
+        self.hook.before_cli(cli)
+        cli += '\n'
+        r = vpp_papi.cli_inband(len(cli), cli)
+        self.hook.after_cli(cli)
+        if(hasattr(r, 'reply')):
+            return r.reply[0].decode().rstrip('\x00')
+
+    def show_version(self):
+        """ """
+        return vpp_papi.show_version()
+
+    def pg_create_interface(self, pg_index):
+        """
+
+        :param pg_index:
+
+        """
+        return self.api(vpp_papi.pg_create_interface, (pg_index, ))
+
+    def sw_interface_dump(self, filter=None):
+        """
+
+        :param filter:  (Default value = None)
+
+        """
+        if filter is not None:
+            args = (1, filter)
+        else:
+            args = (0, b'')
+        return self.api(vpp_papi.sw_interface_dump, args)
+
+    def sw_interface_add_del_address(self, sw_if_index, addr, addr_len,
+                                     is_ipv6=0, is_add=1, del_all=0):
+        """
+
+        :param addr: param is_ipv6:  (Default value = 0)
+        :param sw_if_index:
+        :param addr_len:
+        :param is_ipv6:  (Default value = 0)
+        :param is_add:  (Default value = 1)
+        :param del_all:  (Default value = 0)
+
+        """
+        return self.api(vpp_papi.sw_interface_add_del_address,
+                        (sw_if_index, is_add, is_ipv6, del_all, addr_len, addr))
+
+    def sw_interface_ra_suppress(self, sw_if_index):
+        suppress = 1
+        managed = 0
+        other = 0
+        ll_option = 0
+        send_unicast = 0
+        cease = 0
+        is_no = 0
+        default_router = 0
+        max_interval = 0
+        min_interval = 0
+        lifetime = 0
+        initial_count = 0
+        initial_interval = 0
+        async = False
+        return self.api(vpp_papi.sw_interface_ip6nd_ra_config,
+                        (sw_if_index, suppress, managed, other,
+                         ll_option, send_unicast, cease, is_no,
+                         default_router, max_interval, min_interval,
+                         lifetime, initial_count, initial_interval, async))
+
+
+    def vxlan_add_del_tunnel(
+            self,
+            src_addr,
+            dst_addr,
+            is_add=1,
+            is_ipv6=0,
+            encap_vrf_id=0,
+            decap_next_index=0xFFFFFFFF,
+            vni=0):
+        """
+
+        :param dst_addr:
+        :param src_addr:
+        :param is_add:  (Default value = 1)
+        :param is_ipv6:  (Default value = 0)
+        :param encap_vrf_id:  (Default value = 0)
+        :param decap_next_index:  (Default value = 0xFFFFFFFF)
+        :param vni:  (Default value = 0)
+
+        """
+        return self.api(vpp_papi.vxlan_add_del_tunnel,
+                        (is_add, is_ipv6, src_addr, dst_addr, encap_vrf_id,
+                         decap_next_index, vni))
+
+    def sw_interface_set_l2_bridge(self, sw_if_index, bd_id,
+                                   shg=0, bvi=0, enable=1):
+        """
+
+        :param bd_id:
+        :param sw_if_index:
+        :param shg:  (Default value = 0)
+        :param bvi:  (Default value = 0)
+        :param enable:  (Default value = 1)
+
+        """
+        return self.api(vpp_papi.sw_interface_set_l2_bridge,
+                        (sw_if_index, bd_id, shg, bvi, enable))
+
+    def sw_interface_set_l2_xconnect(self, rx_sw_if_index, tx_sw_if_index,
+                                     enable):
+        """Create or delete unidirectional cross-connect from Tx interface to
+        Rx interface.
+
+        :param rx_sw_if_index: Software interface index of Rx interface.
+        :param tx_sw_if_index: Software interface index of Tx interface.
+        :param enable: Create cross-connect if equal to 1, delete cross-connect
+        if equal to 0.
+        :type rx_sw_if_index: str or int
+        :type rx_sw_if_index: str or int
+        :type enable: int
+
+        """
+        return self.api(vpp_papi.sw_interface_set_l2_xconnect,
+                        (rx_sw_if_index, tx_sw_if_index, enable))
+
+    def sw_interface_set_flags(self, sw_if_index, admin_up_down,
+                               link_up_down=0, deleted=0):
+        """
+
+        :param admin_up_down:
+        :param sw_if_index:
+        :param link_up_down:  (Default value = 0)
+        :param deleted:  (Default value = 0)
+
+        """
+        return self.api(vpp_papi.sw_interface_set_flags,
+                        (sw_if_index, admin_up_down, link_up_down, deleted))
+
+    def create_subif(self, sw_if_index, sub_id, outer_vlan, inner_vlan,
+                     no_tags=0, one_tag=0, two_tags=0, dot1ad=0, exact_match=0,
+                     default_sub=0, outer_vlan_id_any=0, inner_vlan_id_any=0):
+        """Create subinterface
+        from vpe.api: set dot1ad = 0 for dot1q, set dot1ad = 1 for dot1ad
+
+        :param sub_id: param inner_vlan:
+        :param sw_if_index:
+        :param outer_vlan:
+        :param inner_vlan:
+        :param no_tags:  (Default value = 0)
+        :param one_tag:  (Default value = 0)
+        :param two_tags:  (Default value = 0)
+        :param dot1ad:  (Default value = 0)
+        :param exact_match:  (Default value = 0)
+        :param default_sub:  (Default value = 0)
+        :param outer_vlan_id_any:  (Default value = 0)
+        :param inner_vlan_id_any:  (Default value = 0)
+
+        """
+        return self.api(
+            vpp_papi.create_subif,
+            (sw_if_index,
+             sub_id,
+             no_tags,
+             one_tag,
+             two_tags,
+             dot1ad,
+             exact_match,
+             default_sub,
+             outer_vlan_id_any,
+             inner_vlan_id_any,
+             outer_vlan,
+             inner_vlan))
+
+    def create_vlan_subif(self, sw_if_index, vlan):
+        """
+
+        :param vlan:
+        :param sw_if_index:
+
+        """
+        return self.api(vpp_papi.create_vlan_subif, (sw_if_index, vlan))
+
+    def ip_add_del_route(
+            self,
+            dst_address,
+            dst_address_length,
+            next_hop_address,
+            next_hop_sw_if_index=0xFFFFFFFF,
+            table_id=0,
+            resolve_attempts=0,
+            classify_table_index=0xFFFFFFFF,
+            next_hop_out_label=MPLS_LABEL_INVALID,
+            next_hop_table_id=0,
+            create_vrf_if_needed=0,
+            resolve_if_needed=0,
+            is_add=1,
+            is_drop=0,
+            is_ipv6=0,
+            is_local=0,
+            is_classify=0,
+            is_multipath=0,
+            is_resolve_host=0,
+            is_resolve_attached=0,
+            not_last=0,
+            next_hop_weight=1):
+        """
+
+        :param dst_address_length:
+        :param next_hop_sw_if_index:  (Default value = 0xFFFFFFFF)
+        :param dst_address:
+        :param next_hop_address:
+        :param next_hop_sw_if_index:  (Default value = 0xFFFFFFFF)
+        :param vrf_id:  (Default value = 0)
+        :param lookup_in_vrf:  (Default value = 0)
+        :param resolve_attempts:  (Default value = 0)
+        :param classify_table_index:  (Default value = 0xFFFFFFFF)
+        :param create_vrf_if_needed:  (Default value = 0)
+        :param resolve_if_needed:  (Default value = 0)
+        :param is_add:  (Default value = 1)
+        :param is_drop:  (Default value = 0)
+        :param is_ipv6:  (Default value = 0)
+        :param is_local:  (Default value = 0)
+        :param is_classify:  (Default value = 0)
+        :param is_multipath:  (Default value = 0)
+        :param is_resolve_host:  (Default value = 0)
+        :param is_resolve_attached:  (Default value = 0)
+        :param not_last:  (Default value = 0)
+        :param next_hop_weight:  (Default value = 1)
+
+        """
+        return self.api(
+            vpp_papi.ip_add_del_route,
+            (next_hop_sw_if_index,
+             table_id,
+             resolve_attempts,
+             classify_table_index,
+             next_hop_out_label,
+             next_hop_table_id,
+             create_vrf_if_needed,
+             resolve_if_needed,
+             is_add,
+             is_drop,
+             is_ipv6,
+             is_local,
+             is_classify,
+             is_multipath,
+             is_resolve_host,
+             is_resolve_attached,
+             not_last,
+             next_hop_weight,
+             dst_address_length,
+             dst_address,
+             next_hop_address))
diff --git a/test/vpp_pg_interface.py b/test/vpp_pg_interface.py
new file mode 100644
index 00000000..fc4080d2
--- /dev/null
+++ b/test/vpp_pg_interface.py
@@ -0,0 +1,99 @@
+import os
+from logging import error
+from scapy.utils import wrpcap, rdpcap
+from vpp_interface import VppInterface
+
+
+class VppPGInterface(VppInterface):
+    """
+    VPP packet-generator interface
+    """
+
+    @property
+    def pg_index(self):
+        """packet-generator interface index assigned by VPP"""
+        return self._pg_index
+
+    @property
+    def out_path(self):
+        """pcap file path - captured packets"""
+        return self._out_path
+
+    @property
+    def in_path(self):
+        """ pcap file path - injected packets"""
+        return self._in_path
+
+    @property
+    def capture_cli(self):
+        """CLI string to start capture on this interface"""
+        return self._capture_cli
+
+    @property
+    def cap_name(self):
+        """capture name for this interface"""
+        return self._cap_name
+
+    @property
+    def input_cli(self):
+        """CLI string to load the injected packets"""
+        return self._input_cli
+
+    def post_init_setup(self):
+        """ Perform post-init setup for super class and add our own setup """
+        super(VppPGInterface, self).post_init_setup()
+        self._out_path = self.test.tempdir + "/pg%u_out.pcap" % self.sw_if_index
+        self._in_path = self.test.tempdir + "/pg%u_in.pcap" % self.sw_if_index
+        self._capture_cli = "packet-generator capture pg%u pcap %s" % (
+            self.pg_index, self.out_path)
+        self._cap_name = "pcap%u" % self.sw_if_index
+        self._input_cli = "packet-generator new pcap %s source pg%u name %s" % (
+            self.in_path, self.pg_index, self.cap_name)
+
+    def __init__(self, test, pg_index):
+        """ Create VPP packet-generator interface """
+        self._pg_index = pg_index
+        self._test = test
+        r = self.test.vapi.pg_create_interface(self.pg_index)
+        self._sw_if_index = r.sw_if_index
+        self.post_init_setup()
+
+    def enable_capture(self):
+        """ Enable capture on this packet-generator interface"""
+        try:
+            os.unlink(self.out_path)
+        except:
+            pass
+        # FIXME this should be an API, but no such exists atm
+        self.test.vapi.cli(self.capture_cli)
+
+    def add_stream(self, pkts):
+        """
+        Add a stream of packets to this packet-generator
+
+        :param pkts: iterable packets
+
+        """
+        try:
+            os.remove(self.in_path)
+        except:
+            pass
+        wrpcap(self.in_path, pkts)
+        # FIXME this should be an API, but no such exists atm
+        self.test.vapi.cli(self.input_cli)
+        self.test.pg_streams.append(self.cap_name)
+        self.test.vapi.cli("trace add pg-input %d" % len(pkts))
+
+    def get_capture(self):
+        """
+        Get captured packets
+
+        :returns: iterable packets
+        """
+        try:
+            output = rdpcap(self.out_path)
+        except IOError:  # TODO
+            error("File %s does not exist, probably because no"
+                  " packets arrived" % self.out_path)
+            return []
+        return output
diff --git a/test/vpp_sub_interface.py b/test/vpp_sub_interface.py
new file mode 100644
index 00000000..cd98a68c
--- /dev/null
+++ b/test/vpp_sub_interface.py
@@ -0,0 +1,143 @@
+from scapy.layers.l2 import Ether, Dot1Q
+from abc import abstractmethod, ABCMeta
+from vpp_interface import VppInterface
+
+
+class VppSubInterface(VppInterface):
+    __metaclass__ = ABCMeta
+
+    @property
+    def parent(self):
+        """Parent interface for this sub-interface"""
+        return self._parent
+
+    @property
+    def sub_id(self):
+        """Sub-interface ID"""
+        return self._sub_id
+
+    def __init__(self, test, parent, sub_id):
+        self._test = test
+        self._parent = parent
+        self._parent.add_sub_if(self)
+        self._sub_id = sub_id
+
+    @abstractmethod
+    def create_arp_req(self):
+        pass
+
+    @abstractmethod
+    def create_ndp_req(self):
+        pass
+
+    def resolve_arp(self):
+        super(VppSubInterface, self).resolve_arp(self.parent)
+
+    def resolve_ndp(self):
+        super(VppSubInterface, self).resolve_ndp(self.parent)
+
+    @abstractmethod
+    def add_dot1_layer(self, pkt):
+        pass
+
+
+class VppDot1QSubint(VppSubInterface):
+
+    @property
+    def vlan(self):
+        """VLAN tag"""
+        return self._vlan
+
+    def __init__(self, test, parent, sub_id, vlan=None):
+        if vlan is None:
+            vlan = sub_id
+        super(VppDot1QSubint, self).__init__(test, parent, sub_id)
+        self._vlan = vlan
+        r = self.test.vapi.create_vlan_subif(parent.sw_if_index, self.vlan)
+        self._sw_if_index = r.sw_if_index
+        self.post_init_setup()
+
+    def create_arp_req(self):
+        packet = VppInterface.create_arp_req(self)
+        return self.add_dot1_layer(packet)
+
+    def create_ndp_req(self):
+        packet = VppInterface.create_ndp_req(self)
+        return self.add_dot1_layer(packet)
+
+    def add_dot1_layer(self, packet):
+        payload = packet.payload
+        packet.remove_payload()
+        packet.add_payload(Dot1Q(vlan=self.sub_id) / payload)
+        return packet
+
+    def remove_dot1_layer(self, packet):
+        payload = packet.payload
+        self.test.instance().assertEqual(type(payload), Dot1Q)
+        self.test.instance().assertEqual(payload.vlan, self.vlan)
+        payload = payload.payload
+        packet.remove_payload()
+        packet.add_payload(payload)
+        return packet
+
+
+class VppDot1ADSubint(VppSubInterface):
+
+    @property
+    def outer_vlan(self):
+        """Outer VLAN tag"""
+        return self._outer_vlan
+
+    @property
+    def inner_vlan(self):
+        """Inner VLAN tag"""
+        return self._inner_vlan
+
+    def __init__(self, test, parent, sub_id, outer_vlan, inner_vlan):
+        super(VppDot1ADSubint, self).__init__(test, parent, sub_id)
+        self.DOT1AD_TYPE = 0x88A8
+        self.DOT1Q_TYPE = 0x8100
+        self._outer_vlan = outer_vlan
+        self._inner_vlan = inner_vlan
+        r = self.test.vapi.create_subif(
+            parent.sw_if_index,
+            self.sub_id,
+            self.outer_vlan,
+            self.inner_vlan,
+            dot1ad=1,
+            two_tags=1,
+            exact_match=1)
+        self._sw_if_index = r.sw_if_index
+        self.post_init_setup()
+
+    def create_arp_req(self):
+        packet = VppInterface.create_arp_req(self)
+        return self.add_dot1_layer(packet)
+
+    def create_ndp_req(self):
+        packet = VppInterface.create_ndp_req(self)
+        return self.add_dot1_layer(packet)
+
+    def add_dot1_layer(self, packet):
+        payload = packet.payload
+        packet.remove_payload()
+        packet.add_payload(Dot1Q(vlan=self.outer_vlan) /
+                           Dot1Q(vlan=self.inner_vlan) / payload)
+        packet.type = self.DOT1AD_TYPE
+        return packet
+
+    def remove_dot1_layer(self, packet):
+        self.test.instance().assertEqual(type(packet), Ether)
+        self.test.instance().assertEqual(packet.type, self.DOT1AD_TYPE)
+        packet.type = self.DOT1Q_TYPE
+        packet = Ether(str(packet))
+        payload = packet.payload
+        self.test.instance().assertEqual(type(payload), Dot1Q)
+        self.test.instance().assertEqual(payload.vlan, self.outer_vlan)
+        payload = payload.payload
+        self.test.instance().assertEqual(type(payload), Dot1Q)
+        self.test.instance().assertEqual(payload.vlan, self.inner_vlan)
+        payload = payload.payload
+        packet.remove_payload()
+        packet.add_payload(payload)
+        return packet
-- 
cgit 1.2.3-korg


From 277b89c946e6fdc764ee48726fcd3df1c189eda9 Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Fri, 28 Oct 2016 13:20:27 +0200
Subject: add vpp debugging support to test framework improve test
 documentation

Change-Id: Ia9678aa2532ecb4cb33736aedb4a31aa3f2a3f93
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 .gitignore                |   2 +
 Makefile                  |  27 ++++--
 test/Makefile             |  50 +++++++++--
 test/doc/Makefile         | 188 +++++++++++++++++++++-------------------
 test/doc/conf.py          |   1 +
 test/framework.py         | 214 ++++++++++++++++++++++++++++++++--------------
 test/hook.py              | 112 ++++++++++++++++++++++--
 test/log.py               |  71 +++++++++++++++
 test/test_l2bd.py         |   2 +-
 test/test_l2xc.py         |  12 ++-
 test/vpp_papi_provider.py |  19 +++-
 11 files changed, 510 insertions(+), 188 deletions(-)
 create mode 100644 test/log.py

(limited to 'Makefile')

diff --git a/.gitignore b/.gitignore
index e88652cd..126780bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@
 /build-root/*.deb
 /build-root/*.rpm
 /build-root/*.changes
+/build-root/test-doc/
+/build-roit/python/
 /build-config.mk
 /dpdk/*.tar.gz
 /dpdk/*.tar.xz
diff --git a/Makefile b/Makefile
index 54b0f29d..3a6c7834 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ endif
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
-DEB_DEPENDS += python-dev
+DEB_DEPENDS += python-dev python-virtualenv
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -58,7 +58,7 @@ endif
 .PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
 .PHONY: ctags cscope plugins plugins-release build-vpp-api
-.PHONY: test test-debug retest retest-debug
+.PHONY: test test-debug retest retest-debug test-doc test-wipe-doc test-help test-wipe
 
 help:
 	@echo "Make Targets:"
@@ -78,8 +78,10 @@ help:
 	@echo " debug-release       - run release binary with debugger"
 	@echo " test                - build and run functional tests"
 	@echo " test-debug          - build and run functional tests (debug build)"
+	@echo " test-wipe           - wipe files generated by unit tests"
 	@echo " retest              - run functional tests"
 	@echo " retest-debug        - run functional tests (debug build)"
+	@echo " test-help           - show help on test framework"
 	@echo " build-vat           - build vpp-api-test tool"
 	@echo " build-vpp-api       - build vpp-api"
 	@echo " run-vat             - run vpp-api-test tool"
@@ -93,6 +95,8 @@ help:
 	@echo " doxygen             - (re)generate documentation"
 	@echo " bootstrap-doxygen   - setup Doxygen dependencies"
 	@echo " wipe-doxygen        - wipe all generated documentation"
+	@echo " test-doc            - generate documentation for test framework"
+	@echo " test-wipe-doc       - wipe documentation for test framework"
 	@echo ""
 	@echo "Make Arguments:"
 	@echo " V=[0|1]             - set build verbosity level"
@@ -105,7 +109,7 @@ help:
 	@echo " PLATFORM=<name>     - target platform. default is vpp"
 	@echo " TEST=<name>         - only run specific test"
 	@echo ""
-	@echo "Current Argumernt Values:"
+	@echo "Current Argument Values:"
 	@echo " V            = $(V)"
 	@echo " STARTUP_CONF = $(STARTUP_CONF)"
 	@echo " STARTUP_DIR  = $(STARTUP_DIR)"
@@ -188,7 +192,7 @@ plugins-release: $(BR)/.bootstrap.ok
 build-vpp-api: $(BR)/.bootstrap.ok
 	$(call make,$(PLATFORM)_debug,vpp-api-install)
 
-PYTHON_PATH=$(BR)/python
+VPP_PYTHON_PREFIX=$(BR)/python
 
 define test
 	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-api-install plugins-install vpp-install vpp-api-test-install,)
@@ -197,7 +201,7 @@ define test
 	  VPP_TEST_API_TEST_BIN=$(BR)/install-$(2)-native/vpp-api-test/bin/vpp_api_test \
 	  VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/plugins/lib64/vpp_plugins \
 	  LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp-api/lib64/ \
-	  WS_ROOT=$(WS_ROOT) I=$(I) V=$(V) TEST=$(TEST) PYTHON_PATH=$(PYTHON_PATH) $(3)
+	  WS_ROOT=$(WS_ROOT) V=$(V) TEST=$(TEST) VPP_PYTHON_PREFIX=$(VPP_PYTHON_PREFIX) $(3)
 endef
 
 test: bootstrap
@@ -206,12 +210,17 @@ test: bootstrap
 test-debug: bootstrap
 	$(call test,vpp_lite,vpp_lite_debug,test)
 
+test-help:
+	@make -C test help
+
+test-wipe:
+	@make -C test wipe
+
 test-doc:
-	make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite vpp-api-install plugins-install vpp-install vpp-api-test-install
-	make -C test PYTHON_PATH=$(PYTHON_PATH) LD_LIBRARY_PATH=$(BR)/install-vpp_lite-native/vpp-api/lib64/ doc
+	@make -C test WS_ROOT=$(WS_ROOT) BR=$(BR) VPP_PYTHON_PREFIX=$(VPP_PYTHON_PREFIX) doc
 
-test-clean:
-	make -C test clean
+test-wipe-doc:
+	@make -C test wipe-doc BR=$(BR)
 
 retest:
 	$(call test,vpp_lite,vpp_lite,retest)
diff --git a/test/Makefile b/test/Makefile
index c90679e8..63cee203 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,22 +1,58 @@
-PYTHON_VENV_PATH=$(PYTHON_PATH)/virtualenv
+.PHONY: verify-python-path
 
-test: clean
+verify-python-path:
+ifndef VPP_PYTHON_PREFIX
+	$(error VPP_PYTHON_PREFIX is not set)
+endif
+
+PYTHON_VENV_PATH=$(VPP_PYTHON_PREFIX)/virtualenv
+
+test: wipe verify-python-path
 	@virtualenv $(PYTHON_VENV_PATH)
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install scapy"
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install pexpect"
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && cd $(WS_ROOT)/vpp-api/python && python setup.py install"
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py discover -p test_$(TEST)\"*.py\""
 
-retest: clean
+retest: wipe verify-python-path
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py discover -p test_$(TEST)\"*.py\""
 
-.PHONY: clean doc
+.PHONY: wipe doc
 
-clean:
+wipe: verify-python-path
 	@rm -f /dev/shm/vpp-unittest-*
 	@rm -rf /tmp/vpp-unittest-*
 
-doc:
+doc: verify-python-path
 	@virtualenv $(PYTHON_VENV_PATH)
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install sphinx"
-	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && make -C doc html"
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && make -C doc WS_ROOT=$(WS_ROOT) BR=$(BR) NO_VPP_PAPI=1 html"
+
+wipe-doc:
+	@make -C doc wipe BR=$(BR)
+
+help:
+	@echo "Running tests:"
+	@echo ""
+	@echo " test                - build and run functional tests"
+	@echo " test-debug          - build and run functional tests (debug build)"
+	@echo " retest              - run functional tests"
+	@echo " retest-debug        - run functional tests (debug build)"
+	@echo " wipe-test           - wipe (temporary) files generated by unit tests"
+	@echo ""
+	@echo "Arguments controlling test runs:"
+	@echo " V=[0|1|2]            - set test verbosity level"
+	@echo " DEBUG=<type>         - set VPP debugging kind"
+	@echo "    DEBUG=core        - detect coredump and load it in gdb on crash"
+	@echo "    DEBUG=gdb         - allow easy debugging by printing VPP PID "
+	@echo "                        and waiting for user input before running "
+	@echo "                        and tearing down a testcase"
+	@echo "    DEBUG=gdbserver   - run gdb inside a gdb server, otherwise "
+	@echo "                        same as above"
+	@echo " STEP=[yes|no]        - ease debugging by stepping through a testcase "
+	@echo " TEST=<name>          - only run specific test"
+	@echo ""
+	@echo "Creating test documentation"
+	@echo " test-doc            - generate documentation for test framework"
+	@echo " wipe-test-doc       - wipe documentation for test framework"
+	@echo ""
diff --git a/test/doc/Makefile b/test/doc/Makefile
index 00655389..809abef8 100644
--- a/test/doc/Makefile
+++ b/test/doc/Makefile
@@ -3,20 +3,34 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
+SRC_DOC_DIR = $(WS_ROOT)/test/doc
+SPHINXBUILD = sphinx-build
 PAPER         =
-BUILDDIR      = _build
+BUILD_DOC_ROOT = $(BR)/test-doc
+BUILD_DOC_DIR = $(BUILD_DOC_ROOT)/build
+API_DOC_GEN_DIR = $(BUILD_DOC_ROOT)/apidoc
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+ALLSPHINXOPTS   = -d $(BUILD_DOC_DIR)/.sphinx-cache $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(API_DOC_GEN_DIR) -c $(SRC_DOC_DIR)
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+INDEX_REL_PATH:=$(shell realpath --relative-to=$(API_DOC_GEN_DIR) $(SRC_DOC_DIR)/index.rst)
+IN_VENV:=$(shell if pip -V | grep "virtualenv" 2>&1 > /dev/null; then echo 1; else echo 0; fi)
+
+.PHONY: verify-virtualenv
+verify-virtualenv:
+ifeq ($(IN_VENV),0)
+	$(error "Not running inside virtualenv (are you running 'make test-doc' from root?)")
+endif
 
 .PHONY: regen-api-doc
-regen-api-doc:
-	sphinx-apidoc -o . ..
+regen-api-doc: verify-virtualenv
+	@mkdir -p $(API_DOC_GEN_DIR)
+	#@echo ".. include:: $(INDEX_REL_PATH)" > $(API_DOC_GEN_DIR)/index.rst
+	@cp $(SRC_DOC_DIR)/index.rst $(API_DOC_GEN_DIR)
+	sphinx-apidoc -o $(API_DOC_GEN_DIR) ..
 
 .PHONY: help
 help:
@@ -48,182 +62,182 @@ help:
 	@echo "  coverage   to run coverage check of the documentation (if enabled)"
 	@echo "  dummy      to check syntax errors of document sources"
 
-.PHONY: clean
-clean:
-	rm -rf $(BUILDDIR)/*
+.PHONY: wipe
+wipe:
+	rm -rf $(BUILD_DOC_ROOT)
 
 .PHONY: html
-html: regen-api-doc
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+html: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/html
 	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+	@echo "Build finished. The HTML pages are in $(BUILD_DOC_DIR)/html."
 
 .PHONY: dirhtml
-dirhtml: regen-api-doc
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+dirhtml: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/dirhtml
 	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+	@echo "Build finished. The HTML pages are in $(BUILD_DOC_DIR)/dirhtml."
 
 .PHONY: singlehtml
-singlehtml: regen-api-doc
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+singlehtml: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/singlehtml
 	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+	@echo "Build finished. The HTML page is in $(BUILD_DOC_DIR)/singlehtml."
 
 .PHONY: pickle
-pickle: regen-api-doc
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+pickle: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/pickle
 	@echo
 	@echo "Build finished; now you can process the pickle files."
 
 .PHONY: json
-json: regen-api-doc
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+json: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/json
 	@echo
 	@echo "Build finished; now you can process the JSON files."
 
 .PHONY: htmlhelp
-htmlhelp: regen-api-doc
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+htmlhelp: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/htmlhelp
 	@echo
 	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+	      ".hhp project file in $(BUILD_DOC_DIR)/htmlhelp."
 
 .PHONY: qthelp
-qthelp: regen-api-doc
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+qthelp: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/qthelp
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/VPPtestframework.qhcp"
+	      ".qhcp project file in $(BUILD_DOC_DIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILD_DOC_DIR)/qthelp/VPPtestframework.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/VPPtestframework.qhc"
+	@echo "# assistant -collectionFile $(BUILD_DOC_DIR)/qthelp/VPPtestframework.qhc"
 
 .PHONY: applehelp
-applehelp: regen-api-doc
-	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
+applehelp: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/applehelp
 	@echo
-	@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
+	@echo "Build finished. The help book is in $(BUILD_DOC_DIR)/applehelp."
 	@echo "N.B. You won't be able to view it unless you put it in" \
 	      "~/Library/Documentation/Help or install it in your application" \
 	      "bundle."
 
 .PHONY: devhelp
-devhelp: regen-api-doc
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+devhelp: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
 	@echo "# mkdir -p $$HOME/.local/share/devhelp/VPPtestframework"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/VPPtestframework"
+	@echo "# ln -s $(BUILD_DOC_DIR)/devhelp $$HOME/.local/share/devhelp/VPPtestframework"
 	@echo "# devhelp"
 
 .PHONY: epub
-epub: regen-api-doc
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+epub: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/epub
 	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+	@echo "Build finished. The epub file is in $(BUILD_DOC_DIR)/epub."
 
 .PHONY: epub3
 epub3:
-	$(SPHINXBUILD) -b epub3 $(ALLSPHINXOPTS) $(BUILDDIR)/epub3
+	$(SPHINXBUILD) -b epub3 $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/epub3
 	@echo
-	@echo "Build finished. The epub3 file is in $(BUILDDIR)/epub3."
+	@echo "Build finished. The epub3 file is in $(BUILD_DOC_DIR)/epub3."
 
 .PHONY: latex
-latex: regen-api-doc
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+latex: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/latex
 	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Build finished; the LaTeX files are in $(BUILD_DOC_DIR)/latex."
 	@echo "Run \`make' in that directory to run these through (pdf)latex" \
 	      "(use \`make latexpdf' here to do that automatically)."
 
 .PHONY: latexpdf
-latexpdf: regen-api-doc
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+latexpdf: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/latex
 	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+	$(MAKE) -C $(BUILD_DOC_DIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILD_DOC_DIR)/latex."
 
 .PHONY: latexpdfja
-latexpdfja: regen-api-doc
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+latexpdfja: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/latex
 	@echo "Running LaTeX files through platex and dvipdfmx..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+	$(MAKE) -C $(BUILD_DOC_DIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILD_DOC_DIR)/latex."
 
 .PHONY: text
-text: regen-api-doc
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+text: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/text
 	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+	@echo "Build finished. The text files are in $(BUILD_DOC_DIR)/text."
 
 .PHONY: man
-man: regen-api-doc
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+man: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/man
 	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+	@echo "Build finished. The manual pages are in $(BUILD_DOC_DIR)/man."
 
 .PHONY: texinfo
-texinfo: regen-api-doc
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+texinfo: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/texinfo
 	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Build finished. The Texinfo files are in $(BUILD_DOC_DIR)/texinfo."
 	@echo "Run \`make' in that directory to run these through makeinfo" \
 	      "(use \`make info' here to do that automatically)."
 
 .PHONY: info
-info: regen-api-doc
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+info: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/texinfo
 	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+	make -C $(BUILD_DOC_DIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILD_DOC_DIR)/texinfo."
 
 .PHONY: gettext
-gettext: regen-api-doc
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+gettext: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILD_DOC_DIR)/locale
 	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+	@echo "Build finished. The message catalogs are in $(BUILD_DOC_DIR)/locale."
 
 .PHONY: changes
-changes: regen-api-doc
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+changes: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/changes
 	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
+	@echo "The overview file is in $(BUILD_DOC_DIR)/changes."
 
 .PHONY: linkcheck
-linkcheck: regen-api-doc
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+linkcheck: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/linkcheck
 	@echo
 	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
+	      "or in $(BUILD_DOC_DIR)/linkcheck/output.txt."
 
 .PHONY: doctest
-doctest: regen-api-doc
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+doctest: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
+	      "results in $(BUILD_DOC_DIR)/doctest/output.txt."
 
 .PHONY: coverage
-coverage: regen-api-doc
-	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+coverage: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/coverage
 	@echo "Testing of coverage in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/coverage/python.txt."
+	      "results in $(BUILD_DOC_DIR)/coverage/python.txt."
 
 .PHONY: xml
-xml: regen-api-doc
-	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+xml: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/xml
 	@echo
-	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+	@echo "Build finished. The XML files are in $(BUILD_DOC_DIR)/xml."
 
 .PHONY: pseudoxml
-pseudoxml: regen-api-doc
-	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+pseudoxml: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/pseudoxml
 	@echo
-	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
+	@echo "Build finished. The pseudo-XML files are in $(BUILD_DOC_DIR)/pseudoxml."
 
 .PHONY: dummy
-dummy: regen-api-doc
-	$(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILDDIR)/dummy
+dummy: regen-api-doc verify-virtualenv
+	$(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/dummy
 	@echo
 	@echo "Build finished. Dummy builder generates no files."
diff --git a/test/doc/conf.py b/test/doc/conf.py
index aa841714..cec9ddee 100644
--- a/test/doc/conf.py
+++ b/test/doc/conf.py
@@ -20,6 +20,7 @@ import os
 import sys
 sys.path.insert(0, os.path.abspath('..'))
 
+
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
diff --git a/test/framework.py b/test/framework.py
index 02ffb7ad..5f75e010 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -2,20 +2,20 @@
 
 from abc import *
 import os
-import sys
 import subprocess
 import unittest
 import tempfile
+import time
 import resource
 from time import sleep
+from Queue import Queue
+from threading import Thread
 from inspect import getdoc
-from hook import PollHook
+from hook import StepHook, PollHook
 from vpp_pg_interface import VppPGInterface
 from vpp_papi_provider import VppPapiProvider
-
 from scapy.packet import Raw
-
-from logging import *
+from log import *
 
 """
   Test framework module.
@@ -24,41 +24,6 @@ from logging import *
   representing the results.
 """
 
-handler = StreamHandler(sys.stdout)
-getLogger().addHandler(handler)
-try:
-    verbose = int(os.getenv("V", 0))
-except:
-    verbose = 0
-# 40 = ERROR, 30 = WARNING, 20 = INFO, 10 = DEBUG, 0 = NOTSET (all messages)
-getLogger().setLevel(40 - 10 * verbose)
-getLogger("scapy.runtime").addHandler(handler)
-getLogger("scapy.runtime").setLevel(ERROR)
-
-# Static variables to store color formatting strings.
-#
-# These variables (RED, GREEN, YELLOW and LPURPLE) are used to configure
-# the color of the text to be printed in the terminal. Variable COLOR_RESET
-# is used to revert the text color to the default one.
-if hasattr(sys.stdout, 'isatty') and sys.stdout.isatty():
-    RED = '\033[91m'
-    GREEN = '\033[92m'
-    YELLOW = '\033[93m'
-    LPURPLE = '\033[94m'
-    COLOR_RESET = '\033[0m'
-else:
-    RED = ''
-    GREEN = ''
-    YELLOW = ''
-    LPURPLE = ''
-    COLOR_RESET = ''
-
-
-""" @var formatting delimiter consisting of '=' characters """
-double_line_delim = '=' * 70
-""" @var formatting delimiter consisting of '-' characters """
-single_line_delim = '-' * 70
-
 
 class _PacketInfo(object):
     """Private class to create packet info object.
@@ -84,6 +49,11 @@ class _PacketInfo(object):
     data = None
 
 
+def pump_output(out, queue):
+    for line in iter(out.readline, b''):
+        queue.put(line)
+
+
 class VppTestCase(unittest.TestCase):
     """
     Subclass of the python unittest.TestCase class.
@@ -107,24 +77,86 @@ class VppTestCase(unittest.TestCase):
         """Return the instance of this testcase"""
         return cls.test_instance
 
+    @classmethod
+    def set_debug_flags(cls, d):
+        cls.debug_core = False
+        cls.debug_gdb = False
+        cls.debug_gdbserver = False
+        if d is None:
+            return
+        dl = d.lower()
+        if dl == "core":
+            if resource.getrlimit(resource.RLIMIT_CORE)[0] <= 0:
+                # give a heads up if this is actually useless
+                cls.logger.critical("WARNING: core size limit is set 0, core "
+                                    "files will NOT be created")
+            cls.debug_core = True
+        elif dl == "gdb":
+            cls.debug_gdb = True
+        elif dl == "gdbserver":
+            cls.debug_gdbserver = True
+        else:
+            raise Exception("Unrecognized DEBUG option: '%s'" % d)
+
     @classmethod
     def setUpConstants(cls):
         """ Set-up the test case class based on environment variables """
         try:
-            cls.interactive = True if int(os.getenv("I")) > 0 else False
+            s = os.getenv("STEP")
+            cls.step = True if s.lower() in ("y", "yes", "1") else False
         except:
-            cls.interactive = False
-        if cls.interactive and resource.getrlimit(resource.RLIMIT_CORE)[0] <= 0:
-            # give a heads up if this is actually useless
-            critical("WARNING: core size limit is set 0, core files will NOT "
-                     "be created")
+            cls.step = False
+        try:
+            d = os.getenv("DEBUG")
+        except:
+            d = None
+        cls.set_debug_flags(d)
         cls.vpp_bin = os.getenv('VPP_TEST_BIN', "vpp")
         cls.plugin_path = os.getenv('VPP_TEST_PLUGIN_PATH')
         cls.vpp_cmdline = [cls.vpp_bin, "unix", "nodaemon",
                            "api-segment", "{", "prefix", cls.shm_prefix, "}"]
         if cls.plugin_path is not None:
             cls.vpp_cmdline.extend(["plugin_path", cls.plugin_path])
-        info("vpp_cmdline: %s" % cls.vpp_cmdline)
+        cls.logger.info("vpp_cmdline: %s" % cls.vpp_cmdline)
+
+    @classmethod
+    def wait_for_enter(cls):
+        if cls.debug_gdbserver:
+            print(double_line_delim)
+            print("Spawned GDB server with PID: %d" % cls.vpp.pid)
+        elif cls.debug_gdb:
+            print(double_line_delim)
+            print("Spawned VPP with PID: %d" % cls.vpp.pid)
+        else:
+            cls.logger.debug("Spawned VPP with PID: %d" % cls.vpp.pid)
+            return
+        print(single_line_delim)
+        print("You can debug the VPP using e.g.:")
+        if cls.debug_gdbserver:
+            print("gdb " + cls.vpp_bin + " -ex 'target remote localhost:7777'")
+            print("Now is the time to attach a gdb by running the above "
+                  "command, set up breakpoints etc. and then resume VPP from "
+                  "within gdb by issuing the 'continue' command")
+        elif cls.debug_gdb:
+            print("gdb " + cls.vpp_bin + " -ex 'attach %s'" % cls.vpp.pid)
+            print("Now is the time to attach a gdb by running the above "
+                  "command and set up breakpoints etc.")
+        print(single_line_delim)
+        raw_input("Press ENTER to continue running the testcase...")
+
+    @classmethod
+    def run_vpp(cls):
+        cmdline = cls.vpp_cmdline
+
+        if cls.debug_gdbserver:
+            cmdline = ['gdbserver', 'localhost:7777'] + cls.vpp_cmdline
+            cls.logger.info("Gdbserver cmdline is %s", " ".join(cmdline))
+
+        cls.vpp = subprocess.Popen(cmdline,
+                                   stdout=subprocess.PIPE,
+                                   stderr=subprocess.PIPE,
+                                   bufsize=1)
+        cls.wait_for_enter()
 
     @classmethod
     def setUpClass(cls):
@@ -132,37 +164,66 @@ class VppTestCase(unittest.TestCase):
         Perform class setup before running the testcase
         Remove shared memory files, start vpp and connect the vpp-api
         """
+        cls.logger = getLogger(cls.__name__)
         cls.tempdir = tempfile.mkdtemp(
             prefix='vpp-unittest-' + cls.__name__ + '-')
         cls.shm_prefix = cls.tempdir.split("/")[-1]
         os.chdir(cls.tempdir)
-        info("Temporary dir is %s, shm prefix is %s",
-             cls.tempdir, cls.shm_prefix)
+        cls.logger.info("Temporary dir is %s, shm prefix is %s",
+                        cls.tempdir, cls.shm_prefix)
         cls.setUpConstants()
         cls.pg_streams = []
         cls.packet_infos = {}
         cls.verbose = 0
         print(double_line_delim)
-        print(YELLOW + getdoc(cls) + COLOR_RESET)
+        print(colorize(getdoc(cls), YELLOW))
         print(double_line_delim)
         # need to catch exceptions here because if we raise, then the cleanup
         # doesn't get called and we might end with a zombie vpp
         try:
-            cls.vpp = subprocess.Popen(cls.vpp_cmdline, stderr=subprocess.PIPE)
-            debug("Spawned VPP with PID: %d" % cls.vpp.pid)
+            cls.run_vpp()
             cls.vpp_dead = False
             cls.vapi = VppPapiProvider(cls.shm_prefix, cls.shm_prefix)
-            cls.vapi.register_hook(PollHook(cls))
-            cls.vapi.connect()
+            if cls.step:
+                cls.vapi.register_hook(StepHook(cls))
+            else:
+                cls.vapi.register_hook(PollHook(cls))
+            time.sleep(0.1)
+            try:
+                cls.vapi.connect()
+            except:
+                if cls.debug_gdbserver:
+                    print(colorize("You're running VPP inside gdbserver but "
+                                   "VPP-API connection failed, did you forget "
+                                   "to 'continue' VPP from within gdb?", RED))
+                raise
+            cls.vpp_stdout_queue = Queue()
+            cls.vpp_stdout_reader_thread = Thread(
+                target=pump_output, args=(cls.vpp.stdout, cls.vpp_stdout_queue))
+            cls.vpp_stdout_reader_thread.start()
+            cls.vpp_stderr_queue = Queue()
+            cls.vpp_stderr_reader_thread = Thread(
+                target=pump_output, args=(cls.vpp.stderr, cls.vpp_stderr_queue))
+            cls.vpp_stderr_reader_thread.start()
         except:
             cls.vpp.terminate()
             del cls.vpp
+            raise
 
     @classmethod
     def quit(cls):
         """
         Disconnect vpp-api, kill vpp and cleanup shared memory files
         """
+        if (cls.debug_gdbserver or cls.debug_gdb) and hasattr(cls, 'vpp'):
+            cls.vpp.poll()
+            if cls.vpp.returncode is None:
+                print(double_line_delim)
+                print("VPP or GDB server is still running")
+                print(single_line_delim)
+                raw_input("When done debugging, press ENTER to kill the process"
+                          " and finish running the testcase...")
+
         if hasattr(cls, 'vpp'):
             cls.vapi.disconnect()
             cls.vpp.poll()
@@ -170,6 +231,29 @@ class VppTestCase(unittest.TestCase):
                 cls.vpp.terminate()
             del cls.vpp
 
+        if hasattr(cls, 'vpp_stdout_queue'):
+            cls.logger.info(single_line_delim)
+            cls.logger.info('VPP output to stdout while running %s:',
+                            cls.__name__)
+            cls.logger.info(single_line_delim)
+            f = open(cls.tempdir + '/vpp_stdout.txt', 'w')
+            while not cls.vpp_stdout_queue.empty():
+                line = cls.vpp_stdout_queue.get_nowait()
+                f.write(line)
+                cls.logger.info('VPP stdout: %s' % line.rstrip('\n'))
+
+        if hasattr(cls, 'vpp_stderr_queue'):
+            cls.logger.info(single_line_delim)
+            cls.logger.info('VPP output to stderr while running %s:',
+                            cls.__name__)
+            cls.logger.info(single_line_delim)
+            f = open(cls.tempdir + '/vpp_stderr.txt', 'w')
+            while not cls.vpp_stderr_queue.empty():
+                line = cls.vpp_stderr_queue.get_nowait()
+                f.write(line)
+                cls.logger.info('VPP stderr: %s' % line.rstrip('\n'))
+            cls.logger.info(single_line_delim)
+
     @classmethod
     def tearDownClass(cls):
         """ Perform final cleanup after running all tests in this test-case """
@@ -178,11 +262,11 @@ class VppTestCase(unittest.TestCase):
     def tearDown(self):
         """ Show various debug prints after each test """
         if not self.vpp_dead:
-            info(self.vapi.cli("show int"))
-            info(self.vapi.cli("show trace"))
-            info(self.vapi.cli("show hardware"))
-            info(self.vapi.cli("show error"))
-            info(self.vapi.cli("show run"))
+            self.logger.info(self.vapi.cli("show int"))
+            self.logger.info(self.vapi.cli("show trace"))
+            self.logger.info(self.vapi.cli("show hardware"))
+            self.logger.info(self.vapi.cli("show error"))
+            self.logger.info(self.vapi.cli("show run"))
 
     def setUp(self):
         """ Clear trace before running each test"""
@@ -392,7 +476,7 @@ class VppTestResult(unittest.TestResult):
 
         """
         unittest.TestResult.addSuccess(self, test)
-        self.result_string = GREEN + "OK" + COLOR_RESET
+        self.result_string = colorize("OK", GREEN)
 
     def addSkip(self, test, reason):
         """
@@ -403,7 +487,7 @@ class VppTestResult(unittest.TestResult):
 
         """
         unittest.TestResult.addSkip(self, test, reason)
-        self.result_string = YELLOW + "SKIP" + COLOR_RESET
+        self.result_string = colorize("SKIP", YELLOW)
 
     def addFailure(self, test, err):
         """
@@ -415,10 +499,10 @@ class VppTestResult(unittest.TestResult):
         """
         unittest.TestResult.addFailure(self, test, err)
         if hasattr(test, 'tempdir'):
-            self.result_string = RED + "FAIL" + COLOR_RESET + \
+            self.result_string = colorize("FAIL", RED) + \
                 ' [ temp dir used by test case: ' + test.tempdir + ' ]'
         else:
-            self.result_string = RED + "FAIL" + COLOR_RESET + ' [no temp dir]'
+            self.result_string = colorize("FAIL", RED) + ' [no temp dir]'
 
     def addError(self, test, err):
         """
@@ -430,10 +514,10 @@ class VppTestResult(unittest.TestResult):
         """
         unittest.TestResult.addError(self, test, err)
         if hasattr(test, 'tempdir'):
-            self.result_string = RED + "ERROR" + COLOR_RESET + \
+            self.result_string = colorize("ERROR", RED) + \
                 ' [ temp dir used by test case: ' + test.tempdir + ' ]'
         else:
-            self.result_string = RED + "ERROR" + COLOR_RESET + ' [no temp dir]'
+            self.result_string = colorize("ERROR", RED) + ' [no temp dir]'
 
     def getDescription(self, test):
         """
diff --git a/test/hook.py b/test/hook.py
index 9489aa9d..3ae14737 100644
--- a/test/hook.py
+++ b/test/hook.py
@@ -1,7 +1,8 @@
 import signal
 import os
 import pexpect
-from logging import *
+import traceback
+from log import *
 
 
 class Hook(object):
@@ -9,6 +10,9 @@ class Hook(object):
     Generic hooks before/after API/CLI calls
     """
 
+    def __init__(self, logger):
+        self.logger = logger
+
     def before_api(self, api_name, api_args):
         """
         Function called before API call
@@ -17,7 +21,8 @@ class Hook(object):
         @param api_name: name of the API
         @param api_args: tuple containing the API arguments
         """
-        debug("API: %s (%s)" % (api_name, api_args))
+        self.logger.debug("API: %s (%s)" %
+                          (api_name, api_args), extra={'color': RED})
 
     def after_api(self, api_name, api_args):
         """
@@ -35,7 +40,7 @@ class Hook(object):
 
         @param cli: CLI string
         """
-        debug("CLI: %s" % (cli))
+        self.logger.debug("CLI: %s" % (cli), extra={'color': RED})
 
     def after_cli(self, cli):
         """
@@ -54,6 +59,7 @@ class PollHook(Hook):
     def __init__(self, testcase):
         self.vpp_dead = False
         self.testcase = testcase
+        self.logger = testcase.logger
 
     def spawn_gdb(self, gdb_path, core_path):
         gdb_cmdline = gdb_path + ' ' + self.testcase.vpp_bin + ' ' + core_path
@@ -74,11 +80,12 @@ class PollHook(Hook):
                 self.spawn_gdb(gdb_path, core_path)
                 return
             else:
-                error("Debugger '%s' does not exist or is not an executable.." %
-                      gdb_path)
+                self.logger.error(
+                    "Debugger '%s' does not exist or is not an executable.." %
+                    gdb_path)
 
-        critical('core file present, debug with: gdb ' +
-                 self.testcase.vpp_bin + ' ' + core_path)
+        self.logger.critical('core file present, debug with: gdb ' +
+                             self.testcase.vpp_bin + ' ' + core_path)
 
     def poll_vpp(self):
         """
@@ -97,7 +104,7 @@ class PollHook(Hook):
             msg = "VPP subprocess died unexpectedly with returncode %d [%s]" % (
                 self.testcase.vpp.returncode,
                 signaldict[abs(self.testcase.vpp.returncode)])
-            critical(msg)
+            self.logger.critical(msg)
             core_path = self.testcase.tempdir + '/core'
             if os.path.isfile(core_path):
                 self.on_crash(core_path)
@@ -126,3 +133,92 @@ class PollHook(Hook):
         """
         super(PollHook, self).after_cli(cli)
         self.poll_vpp()
+
+
+class StepHook(PollHook):
+    """ Hook which requires user to press ENTER before doing any API/CLI """
+
+    def __init__(self, testcase):
+        self.skip_stack = None
+        self.skip_num = None
+        self.skip_count = 0
+        super(StepHook, self).__init__(testcase)
+
+    def skip(self):
+        if self.skip_stack is None:
+            return False
+        stack = traceback.extract_stack()
+        counter = 0
+        skip = True
+        for e in stack:
+            if counter > self.skip_num:
+                break
+            if e[0] != self.skip_stack[counter][0]:
+                skip = False
+            if e[1] != self.skip_stack[counter][1]:
+                skip = False
+            counter += 1
+        if skip:
+            self.skip_count += 1
+            return True
+        else:
+            print("%d API/CLI calls skipped in specified stack "
+                  "frame" % self.skip_count)
+            self.skip_count = 0
+            self.skip_stack = None
+            self.skip_num = None
+            return False
+
+    def user_input(self):
+        print('number\tfunction\tfile\tcode')
+        counter = 0
+        stack = traceback.extract_stack()
+        for e in stack:
+            print('%02d.\t%s\t%s:%d\t[%s]' % (counter, e[2], e[0], e[1], e[3]))
+            counter += 1
+        print(single_line_delim)
+        print("You can enter a number of stack frame chosen from above")
+        print("Calls in/below that stack frame will be not be stepped anymore")
+        print(single_line_delim)
+        while True:
+            choice = raw_input("Enter your choice, if any, and press ENTER to "
+                               "continue running the testcase...")
+            if choice == "":
+                choice = None
+            try:
+                if choice is not None:
+                    num = int(choice)
+            except:
+                print("Invalid input")
+                continue
+            if choice is not None and (num < 0 or num >= len(stack)):
+                print("Invalid choice")
+                continue
+            break
+        if choice is not None:
+            self.skip_stack = stack
+            self.skip_num = num
+
+    def before_cli(self, cli):
+        """ Wait for ENTER before executing CLI """
+        if self.skip():
+            print("Skip pause before executing CLI: %s" % cli)
+        else:
+            print(double_line_delim)
+            print("Test paused before executing CLI: %s" % cli)
+            print(single_line_delim)
+            self.user_input()
+        super(StepHook, self).before_cli(cli)
+
+    def before_api(self, api_name, api_args):
+        """ Wait for ENTER before executing API """
+        if self.skip():
+            print("Skip pause before executing API: %s (%s)"
+                  % (api_name, api_args))
+        else:
+            print(double_line_delim)
+            print("Test paused before executing API: %s (%s)"
+                  % (api_name, api_args))
+            print(single_line_delim)
+            self.user_input()
+        super(StepHook, self).before_api(api_name, api_args)
diff --git a/test/log.py b/test/log.py
new file mode 100644
index 00000000..38610b7e
--- /dev/null
+++ b/test/log.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+
+import sys
+import os
+import logging
+
+""" @var formatting delimiter consisting of '=' characters """
+double_line_delim = '=' * 70
+""" @var formatting delimiter consisting of '-' characters """
+single_line_delim = '-' * 70
+
+
+def colorize(msg, color):
+    return color + msg + COLOR_RESET
+
+
+class ColorFormatter(logging.Formatter):
+
+    def init(self, fmt=None, datefmt=None):
+        super(ColorFormatter, self).__init__(fmt, datefmt)
+
+    def format(self, record):
+        message = super(ColorFormatter, self).format(record)
+        if hasattr(record, 'color'):
+            message = colorize(message, record.color)
+        return message
+
+handler = logging.StreamHandler(sys.stdout)
+handler.setFormatter(ColorFormatter())
+
+global_logger = logging.getLogger()
+global_logger.addHandler(handler)
+try:
+    verbose = int(os.getenv("V", 0))
+except:
+    verbose = 0
+
+# 40 = ERROR, 30 = WARNING, 20 = INFO, 10 = DEBUG, 0 = NOTSET (all messages)
+if verbose >= 2:
+    log_level = 10
+elif verbose == 1:
+    log_level = 20
+else:
+    log_level = 40
+
+scapy_logger = logging.getLogger("scapy.runtime")
+scapy_logger.setLevel(logging.ERROR)
+
+
+def getLogger(name):
+    logger = logging.getLogger(name)
+    logger.setLevel(log_level)
+    return logger
+
+# Static variables to store color formatting strings.
+#
+# These variables (RED, GREEN, YELLOW and LPURPLE) are used to configure
+# the color of the text to be printed in the terminal. Variable COLOR_RESET
+# is used to revert the text color to the default one.
+if hasattr(sys.stdout, 'isatty') and sys.stdout.isatty():
+    RED = '\033[91m'
+    GREEN = '\033[92m'
+    YELLOW = '\033[93m'
+    LPURPLE = '\033[94m'
+    COLOR_RESET = '\033[0m'
+else:
+    RED = ''
+    GREEN = ''
+    YELLOW = ''
+    LPURPLE = ''
+    COLOR_RESET = ''
diff --git a/test/test_l2bd.py b/test/test_l2bd.py
index 0fced5d9..53e1ee05 100644
--- a/test/test_l2bd.py
+++ b/test/test_l2bd.py
@@ -189,7 +189,7 @@ class TestL2bd(VppTestCase):
             MAC learning enabled
             learn 100 MAC enries
             3 interfaces: untagged, dot1q, dot1ad (dot1q used instead of dot1ad
-             in the first version)
+            in the first version)
 
         2.sending l2 eth pkts between 3 interface
             64B, 512B, 1518B, 9200B (ether_size)
diff --git a/test/test_l2xc.py b/test/test_l2xc.py
index d448a04d..35c7a818 100644
--- a/test/test_l2xc.py
+++ b/test/test_l2xc.py
@@ -78,7 +78,6 @@ class TestL2xc(VppTestCase):
         interfaces. Create host IPv4 address for every host MAC address too.
 
         :param count: Number of hosts to create MAC and IPv4 addresses for.
-        Type: int
         """
         for pg_if in self.pg_interfaces:
             # self.MY_MACS[i.sw_if_index] = []
@@ -151,12 +150,11 @@ class TestL2xc(VppTestCase):
         """ L2XC test
 
         Test scenario:
-        1.config
-            2 pairs of 2 interfaces, l2xconnected
-
-        2.sending l2 eth packets between 4 interfaces
-            64B, 512B, 1518B, 9018B (ether_size)
-            burst of packets per interface
+            1. config
+               2 pairs of 2 interfaces, l2xconnected
+            2. sending l2 eth packets between 4 interfaces
+               64B, 512B, 1518B, 9018B (ether_size)
+               burst of packets per interface
         """
 
         # Create incoming packet streams for packet-generator interfaces
diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 454f3edc..261a0f4a 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -1,7 +1,19 @@
-import vpp_papi
+import os
 from logging import error
 from hook import Hook
 
+do_import = True
+try:
+    no_vpp_papi = os.getenv("NO_VPP_PAPI")
+    if no_vpp_papi == "1":
+        do_import = False
+except:
+    pass
+
+if do_import:
+    import vpp_papi
+
+
 # from vnet/vnet/mpls/mpls_types.h
 MPLS_IETF_MAX_LABEL = 0xfffff
 MPLS_LABEL_INVALID = MPLS_IETF_MAX_LABEL + 1
@@ -16,7 +28,7 @@ class VppPapiProvider(object):
     """
 
     def __init__(self, name, shm_prefix):
-        self.hook = Hook()
+        self.hook = Hook("vpp-papi-provider")
         self.name = name
         self.shm_prefix = shm_prefix
 
@@ -130,7 +142,6 @@ class VppPapiProvider(object):
                          default_router, max_interval, min_interval,
                          lifetime, initial_count, initial_interval, async))
 
-
     def vxlan_add_del_tunnel(
             self,
             src_addr,
@@ -177,7 +188,7 @@ class VppPapiProvider(object):
         :param rx_sw_if_index: Software interface index of Rx interface.
         :param tx_sw_if_index: Software interface index of Tx interface.
         :param enable: Create cross-connect if equal to 1, delete cross-connect
-        if equal to 0.
+                       if equal to 0.
         :type rx_sw_if_index: str or int
         :type rx_sw_if_index: str or int
         :type enable: int
-- 
cgit 1.2.3-korg


From 20a29c7b4d1b5b68112498bee21ee7f3fe123b13 Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Thu, 13 Oct 2016 18:36:50 -0400
Subject: VPP-498: Prepare vpp RPM packaging for use by downstream distros.

Change spec to add new macros to get rid of relative dir reference and
use vpp version. Store version string in .version to store metadata in
dist archive. New script to create dist archive.
Add dist and wipedist targets to Makefile for builds of source RPMs.

Change-Id: I7cf0164f0cb094ec70f3dc323ed7fa2ee82bd902
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 Makefile                   | 21 ++++++++++++++++++--
 build-data/platforms.mk    |  6 +++++-
 build-root/rpm/vpp.spec    | 48 ++++++++++++++++++++++++++++------------------
 build-root/scripts/verdist | 31 ++++++++++++++++++++++++++++++
 build-root/scripts/version | 45 ++++++++++++++++++++++++++++++++++---------
 5 files changed, 120 insertions(+), 31 deletions(-)
 create mode 100755 build-root/scripts/verdist

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 3a6c7834..98700864 100644
--- a/Makefile
+++ b/Makefile
@@ -167,10 +167,27 @@ define make
 	@make -C $(BR) PLATFORM=$(PLATFORM) TAG=$(1) $(2)
 endef
 
+$(BR)/scripts/.version:
+ifneq ("$(wildcard /etc/redhat-release)","")
+	$(shell $(BR)/scripts/version rpm-string > $(BR)/scripts/.version)
+else
+	$(shell $(BR)/scripts/version > $(BR)/scripts/.version)
+endif
+
+dist:	$(BR)/scripts/.version
+	$(MAKE) verstring=$(PLATFORM)-$(shell cat $(BR)/scripts/.version) prefix=$(PLATFORM) distversion
+
+distversion:	$(BR)/scripts/.version
+	$(BR)/scripts/verdist ${BR} ${prefix}-$(shell $(BR)/scripts/version rpm-version) ${verstring}
+	mv $(verstring).tar.gz $(BR)/rpm
+
 build: $(BR)/.bootstrap.ok
 	$(call make,$(PLATFORM)_debug,vpp-install)
 
-wipe: $(BR)/.bootstrap.ok
+wipedist:
+	$(RM) $(BR)/scripts/.version $(BR)/rpm/*.tar.gz
+
+wipe: wipedist $(BR)/.bootstrap.ok
 	$(call make,$(PLATFORM)_debug,vpp-wipe)
 
 rebuild: wipe build
@@ -271,7 +288,7 @@ run-vat:
 pkg-deb:
 	$(call make,$(PLATFORM),install-deb)
 
-pkg-rpm:
+pkg-rpm: dist
 	$(call make,$(PLATFORM),install-rpm)
 
 ctags: ctags.files
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 9d878151..16e61e3f 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -89,7 +89,11 @@ install-rpm: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	      $(ROOT_PACKAGES))	|| exit 1;				\
 									\
 	cd rpm ;							\
+	mkdir -p SOURCES ;                                              \
+	if test -f *.tar.gz ; then mv *.tar.gz SOURCES ; fi ;           \
 	rpmbuild -bb --define "_topdir $$PWD" --define			\
-		"_install_dir $(INSTALL_PREFIX)$(ARCH)" vpp.spec ;	\
+		"_install_dir $(INSTALL_PREFIX)$(ARCH)"                 \
+		--define "_mu_build_root_dir $(MU_BUILD_ROOT_DIR)"      \
+		vpp.spec ;                                              \
 	mv $$(find RPMS -name \*.rpm -type f) ..
 
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index 8c4f4f05..7f0e2a34 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -1,5 +1,6 @@
-%define _vpp_install_dir ../%{_install_dir}
-%define _vpp_build_dir   ../build-tool-native
+%define _mu_build_dir    %{_mu_build_root_dir}
+%define _vpp_install_dir %{_install_dir}
+%define _vpp_build_dir   build-tool-native
 %define _unitdir         /lib/systemd/system
 %define _topdir          %(pwd)
 %define _builddir        %{_topdir}
@@ -27,6 +28,8 @@ Release: %{_release}
 Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python
 BuildRequires: systemd
 
+Source: %{name}-%{_version}-%{_release}.tar.gz
+
 %description
 This package provides VPP executables: vpp, vpp_api_test, vpp_json_test
 vpp - the vector packet engine
@@ -76,6 +79,13 @@ Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
 %description python-api
 This package contains the python bindings for the vpp api
 
+%prep
+%setup -q -n %{name}-%{_version}
+
+%build
+make bootstrap
+make build-release
+
 %pre
 # Add the vpp group
 groupadd -f -r vpp
@@ -86,22 +96,22 @@ groupadd -f -r vpp
 #
 mkdir -p -m755 %{buildroot}%{_bindir}
 mkdir -p -m755 %{buildroot}%{_unitdir}
-install -p -m 755 %{_vpp_install_dir}/*/bin/* %{buildroot}%{_bindir}
-install -p -m 755 %{_vpp_build_dir}/vppapigen/vppapigen %{buildroot}%{_bindir}
-install -p -m 755 ../../vppapigen/pyvppapigen.py %{buildroot}%{_bindir}
+install -p -m 755 %{_mu_build_dir}/%{_vpp_install_dir}/*/bin/* %{buildroot}%{_bindir}
+install -p -m 755 %{_mu_build_dir}/%{_vpp_build_dir}/vppapigen/vppapigen %{buildroot}%{_bindir}
+install -p -m 755 %{_mu_build_dir}/../vppapigen/pyvppapigen.py %{buildroot}%{_bindir}
 #
 # configs
 #
 mkdir -p -m755 %{buildroot}/etc/vpp
 mkdir -p -m755 %{buildroot}/etc/sysctl.d
-install -p -m 644 vpp.service %{buildroot}%{_unitdir}
-install -p -m 644 ../../vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf
-install -p -m 644 ../../vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
+install -p -m 644 %{_mu_build_dir}/rpm/vpp.service %{buildroot}%{_unitdir}
+install -p -m 644 %{_mu_build_dir}/../vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf
+install -p -m 644 %{_mu_build_dir}/../vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
 #
 # libraries
 #
 mkdir -p -m755 %{buildroot}%{_libdir}
-for file in $(find %{_vpp_install_dir}/*/lib* -type f -name '*.so.*.*.*' -print )
+for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/lib* -type f -name '*.so.*.*.*' -print )
 do
 	install -p -m 755 $file %{buildroot}%{_libdir}
 done
@@ -116,7 +126,7 @@ done
 
 # Python bindings
 mkdir -p -m755 %{buildroot}%{python2_sitelib}/vpp_papi
-for file in $(find %{_vpp_install_dir}/*/lib/python2.7/site-packages/ -type f -print | grep -v pyc | grep -v pyo)
+for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/lib/python2.7/site-packages/ -type f -print | grep -v pyc | grep -v pyo)
 do
 	install -p -m 666 $file %{buildroot}%{python2_sitelib}/vpp_papi/
 done
@@ -124,7 +134,7 @@ done
 #
 # devel
 #
-for dir in $(find %{_vpp_install_dir}/*/include/ -maxdepth 0 -type d -print | grep -v dpdk)
+for dir in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/include/ -maxdepth 0 -type d -print | grep -v dpdk)
 do
 	for subdir in $(cd ${dir} && find . -type d -print)
 	do
@@ -137,16 +147,16 @@ do
 done
 
 mkdir -p -m755 %{buildroot}%{python2_sitelib}/jvppgen
-install -p -m755 ../../vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin
-for i in $(ls ../../vpp-api/java/jvpp/gen/jvppgen/*.py); do
+install -p -m755 %{_mu_build_dir}/../vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin
+for i in $(ls %{_mu_build_dir}/../vpp-api/java/jvpp/gen/jvppgen/*.py); do
    install -p -m666 ${i} %{buildroot}%{python2_sitelib}/jvppgen
 done;
 
 # sample plugin
 mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/sample
-for file in $(cd %{_vpp_install_dir}/../../sample-plugin && find -type f -print)
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../sample-plugin && find -type f -print)
 do
-	install -p -m 644 %{_vpp_install_dir}/../../sample-plugin/$file \
+	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../sample-plugin/$file \
 	   %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/$file
 done
 
@@ -156,15 +166,15 @@ done
 # 
 mkdir -p -m755 %{buildroot}/usr/lib/vpp_plugins
 mkdir -p -m755 %{buildroot}/usr/lib/vpp_api_test_plugins
-for file in $(cd %{_vpp_install_dir}/plugins/lib64/vpp_plugins && find -type f -print)
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_plugins && find -type f -print)
 do
-        install -p -m 644 %{_vpp_install_dir}/plugins/lib64/vpp_plugins/$file \
+        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_plugins/$file \
            %{buildroot}/usr/lib/vpp_plugins/$file
 done
 
-for file in $(cd %{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins && find -type f -print)
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins && find -type f -print)
 do
-        install -p -m 644 %{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins/$file \
+        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins/$file \
            %{buildroot}/usr/lib/vpp_api_test_plugins/$file
 done
 
diff --git a/build-root/scripts/verdist b/build-root/scripts/verdist
new file mode 100755
index 00000000..9d1f1b5a
--- /dev/null
+++ b/build-root/scripts/verdist
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+#
+# Add version to dist tarball.
+#
+BR=$1
+prefix=$2
+verstring=$3
+BASE=`pwd`
+
+git rev-parse 2> /dev/null
+if [ $? == 0 ]; then
+    git archive --prefix=${prefix}/ HEAD | gzip -9 > ${verstring}.tar.gz
+else
+    cd ..
+    tar -c ${prefix} | gzip -9 > ${verstring}.tar.gz
+    cp ${verstring}.tar.gz $BASE
+    cd $BASE
+fi
+
+mkdir ${BASE}/tmp
+cd ${BASE}/tmp
+tar -xzf ${BASE}/${verstring}.tar.gz
+rm ${BASE}/${verstring}.tar.gz
+
+cp ${BR}/scripts/.version ${BASE}/tmp/${prefix}/build-root/scripts
+tar -c ${prefix} | gzip -9 > ${verstring}.tar.gz
+mv ${verstring}.tar.gz ${BASE}
+
+cd ${BASE}
+rm -rf tmp
diff --git a/build-root/scripts/version b/build-root/scripts/version
index 84ee5dbe..af447286 100755
--- a/build-root/scripts/version
+++ b/build-root/scripts/version
@@ -1,8 +1,32 @@
 #!/bin/bash
 
-TAG=$(git describe | cut -d- -f1 | sed -e 's/^v//')
-ADD=$(git describe | cut -s -d- -f2)
-CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4)
+path=$( cd "$(dirname "${BASH_SOURCE}")" ; pwd -P )
+
+cd "$path"
+
+git rev-parse 2> /dev/null
+if [ $? == 0 ]; then
+    vstring=$(git describe)
+elif [ -f .version ]; then
+    vstring=$(cat .version)
+else
+    if [ -f ../rpm/*.gz ]; then
+        vstring=$(ls ../rpm/*.gz)
+    else
+        exit 1
+    fi
+fi
+
+TAG=$(echo ${vstring} | cut -d- -f1 | sed -e 's/^v//')
+ADD=$(echo ${vstring} | cut -s -d- -f2)
+
+git rev-parse 2> /dev/null
+if [ $? == 0 ]; then
+    CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4)
+else
+    CMT=$(echo ${vstring} | cut -s -d- -f3,4)
+fi
+CMTR=$(echo $CMT | sed 's/-/_/')
 
 if [ -n "${BUILD_NUMBER}" ]; then
        BLD="~b${BUILD_NUMBER}"
@@ -15,13 +39,16 @@ fi
 
 if [ "$1" = "rpm-release" ]; then
   [ -z "${ADD}" ] && echo release && exit
-  CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4 | sed 's/-/_/')
-  echo ${ADD}${CMT:+~${CMT}}${BLD}
+  echo ${ADD}${CMTR:+~${CMTR}}${BLD}
   exit
 fi
 
-if [ -n "${ADD}" ]; then
-  echo ${TAG}-${ADD}${CMT:+~${CMT}}${BLD}
-else
-  echo ${TAG}
+  if [ -n "${ADD}" ]; then
+    if [ "$1" = "rpm-string" ]; then
+      echo ${TAG}-${ADD}${CMTR:+~${CMTR}}${BLD}
+    else
+      echo ${TAG}-${ADD}${CMT:+~${CMT}}${BLD}
+    fi
+  else
+    echo ${TAG}
 fi
-- 
cgit 1.2.3-korg


From 778c2765c8ea5c6628f6d668847f0b9ae06dbf3d Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Tue, 8 Nov 2016 02:00:28 +0100
Subject: Improve test framework documentation

Change-Id: I06f0cbbbdd29e04a07f1db6807b3e16f1d41e8d2
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 Makefile                       |   2 +-
 test/Makefile                  |   8 +--
 test/doc/Makefile              |  61 +++++++---------
 test/doc/conf.py               |   6 +-
 test/doc/framework.rst         |   7 ++
 test/doc/hook.rst              |   7 ++
 test/doc/index.rst             | 157 +++++++++++++++++++++++++++++++++++++++--
 test/doc/log.rst               |   7 ++
 test/doc/modules.rst           |  24 +++++++
 test/doc/run_tests.rst         |   7 ++
 test/doc/scapy_handlers.rst    |  22 ++++++
 test/doc/template_bd.rst       |   7 ++
 test/doc/test_ip.rst           |   7 ++
 test/doc/test_ip6.rst          |   7 ++
 test/doc/test_l2bd.rst         |   7 ++
 test/doc/test_l2xc.rst         |   7 ++
 test/doc/test_lb.rst           |   7 ++
 test/doc/test_mpls.rst         |   7 ++
 test/doc/test_vxlan.rst        |   7 ++
 test/doc/util.rst              |   7 ++
 test/doc/vpp_interface.rst     |   7 ++
 test/doc/vpp_papi_provider.rst |   7 ++
 test/doc/vpp_pg_interface.rst  |   7 ++
 test/doc/vpp_sub_interface.rst |   7 ++
 test/test_infra.md             | 145 -------------------------------------
 test/vpp_pg_interface.py       |  41 +++++++++--
 26 files changed, 386 insertions(+), 199 deletions(-)
 create mode 100644 test/doc/framework.rst
 create mode 100644 test/doc/hook.rst
 create mode 100644 test/doc/log.rst
 create mode 100644 test/doc/modules.rst
 create mode 100644 test/doc/run_tests.rst
 create mode 100644 test/doc/scapy_handlers.rst
 create mode 100644 test/doc/template_bd.rst
 create mode 100644 test/doc/test_ip.rst
 create mode 100644 test/doc/test_ip6.rst
 create mode 100644 test/doc/test_l2bd.rst
 create mode 100644 test/doc/test_l2xc.rst
 create mode 100644 test/doc/test_lb.rst
 create mode 100644 test/doc/test_mpls.rst
 create mode 100644 test/doc/test_vxlan.rst
 create mode 100644 test/doc/util.rst
 create mode 100644 test/doc/vpp_interface.rst
 create mode 100644 test/doc/vpp_papi_provider.rst
 create mode 100644 test/doc/vpp_pg_interface.rst
 create mode 100644 test/doc/vpp_sub_interface.rst
 delete mode 100644 test/test_infra.md

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 98700864..5064686c 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ endif
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
-DEB_DEPENDS += python-dev python-virtualenv
+DEB_DEPENDS += python-dev python-virtualenv python-pip
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else
diff --git a/test/Makefile b/test/Makefile
index 63cee203..aac637d3 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -6,11 +6,11 @@ ifndef VPP_PYTHON_PREFIX
 endif
 
 PYTHON_VENV_PATH=$(VPP_PYTHON_PREFIX)/virtualenv
+PYTHON_DEPENDS=scapy pexpect
 
 test: wipe verify-python-path
 	@virtualenv $(PYTHON_VENV_PATH)
-	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install scapy"
-	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install pexpect"
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install $(PYTHON_DEPENDS)"
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && cd $(WS_ROOT)/vpp-api/python && python setup.py install"
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py discover -p test_$(TEST)\"*.py\""
 
@@ -19,13 +19,13 @@ retest: wipe verify-python-path
 
 .PHONY: wipe doc
 
-wipe: verify-python-path
+wipe:
 	@rm -f /dev/shm/vpp-unittest-*
 	@rm -rf /tmp/vpp-unittest-*
 
 doc: verify-python-path
 	@virtualenv $(PYTHON_VENV_PATH)
-	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install sphinx"
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install $(PYTHON_DEPENDS) sphinx"
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && make -C doc WS_ROOT=$(WS_ROOT) BR=$(BR) NO_VPP_PAPI=1 html"
 
 wipe-doc:
diff --git a/test/doc/Makefile b/test/doc/Makefile
index 809abef8..3b4c02b8 100644
--- a/test/doc/Makefile
+++ b/test/doc/Makefile
@@ -8,15 +8,13 @@ SPHINXBUILD = sphinx-build
 PAPER         =
 BUILD_DOC_ROOT = $(BR)/test-doc
 BUILD_DOC_DIR = $(BUILD_DOC_ROOT)/build
-API_DOC_GEN_DIR = $(BUILD_DOC_ROOT)/apidoc
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILD_DOC_DIR)/.sphinx-cache $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(API_DOC_GEN_DIR) -c $(SRC_DOC_DIR)
+ALLSPHINXOPTS   = -d $(BUILD_DOC_DIR)/.sphinx-cache $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SRC_DOC_DIR)
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-INDEX_REL_PATH:=$(shell realpath --relative-to=$(API_DOC_GEN_DIR) $(SRC_DOC_DIR)/index.rst)
 IN_VENV:=$(shell if pip -V | grep "virtualenv" 2>&1 > /dev/null; then echo 1; else echo 0; fi)
 
 .PHONY: verify-virtualenv
@@ -25,13 +23,6 @@ ifeq ($(IN_VENV),0)
 	$(error "Not running inside virtualenv (are you running 'make test-doc' from root?)")
 endif
 
-.PHONY: regen-api-doc
-regen-api-doc: verify-virtualenv
-	@mkdir -p $(API_DOC_GEN_DIR)
-	#@echo ".. include:: $(INDEX_REL_PATH)" > $(API_DOC_GEN_DIR)/index.rst
-	@cp $(SRC_DOC_DIR)/index.rst $(API_DOC_GEN_DIR)
-	sphinx-apidoc -o $(API_DOC_GEN_DIR) ..
-
 .PHONY: help
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -67,44 +58,44 @@ wipe:
 	rm -rf $(BUILD_DOC_ROOT)
 
 .PHONY: html
-html: regen-api-doc verify-virtualenv
+html: verify-virtualenv
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILD_DOC_DIR)/html."
 
 .PHONY: dirhtml
-dirhtml: regen-api-doc verify-virtualenv
+dirhtml: verify-virtualenv
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/dirhtml
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILD_DOC_DIR)/dirhtml."
 
 .PHONY: singlehtml
-singlehtml: regen-api-doc verify-virtualenv
+singlehtml: verify-virtualenv
 	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/singlehtml
 	@echo
 	@echo "Build finished. The HTML page is in $(BUILD_DOC_DIR)/singlehtml."
 
 .PHONY: pickle
-pickle: regen-api-doc verify-virtualenv
+pickle: verify-virtualenv
 	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/pickle
 	@echo
 	@echo "Build finished; now you can process the pickle files."
 
 .PHONY: json
-json: regen-api-doc verify-virtualenv
+json: verify-virtualenv
 	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/json
 	@echo
 	@echo "Build finished; now you can process the JSON files."
 
 .PHONY: htmlhelp
-htmlhelp: regen-api-doc verify-virtualenv
+htmlhelp: verify-virtualenv
 	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/htmlhelp
 	@echo
 	@echo "Build finished; now you can run HTML Help Workshop with the" \
 	      ".hhp project file in $(BUILD_DOC_DIR)/htmlhelp."
 
 .PHONY: qthelp
-qthelp: regen-api-doc verify-virtualenv
+qthelp: verify-virtualenv
 	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/qthelp
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
@@ -114,7 +105,7 @@ qthelp: regen-api-doc verify-virtualenv
 	@echo "# assistant -collectionFile $(BUILD_DOC_DIR)/qthelp/VPPtestframework.qhc"
 
 .PHONY: applehelp
-applehelp: regen-api-doc verify-virtualenv
+applehelp: verify-virtualenv
 	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/applehelp
 	@echo
 	@echo "Build finished. The help book is in $(BUILD_DOC_DIR)/applehelp."
@@ -123,7 +114,7 @@ applehelp: regen-api-doc verify-virtualenv
 	      "bundle."
 
 .PHONY: devhelp
-devhelp: regen-api-doc verify-virtualenv
+devhelp: verify-virtualenv
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/devhelp
 	@echo
 	@echo "Build finished."
@@ -133,7 +124,7 @@ devhelp: regen-api-doc verify-virtualenv
 	@echo "# devhelp"
 
 .PHONY: epub
-epub: regen-api-doc verify-virtualenv
+epub: verify-virtualenv
 	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/epub
 	@echo
 	@echo "Build finished. The epub file is in $(BUILD_DOC_DIR)/epub."
@@ -145,7 +136,7 @@ epub3:
 	@echo "Build finished. The epub3 file is in $(BUILD_DOC_DIR)/epub3."
 
 .PHONY: latex
-latex: regen-api-doc verify-virtualenv
+latex: verify-virtualenv
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/latex
 	@echo
 	@echo "Build finished; the LaTeX files are in $(BUILD_DOC_DIR)/latex."
@@ -153,33 +144,33 @@ latex: regen-api-doc verify-virtualenv
 	      "(use \`make latexpdf' here to do that automatically)."
 
 .PHONY: latexpdf
-latexpdf: regen-api-doc verify-virtualenv
+latexpdf: verify-virtualenv
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/latex
 	@echo "Running LaTeX files through pdflatex..."
 	$(MAKE) -C $(BUILD_DOC_DIR)/latex all-pdf
 	@echo "pdflatex finished; the PDF files are in $(BUILD_DOC_DIR)/latex."
 
 .PHONY: latexpdfja
-latexpdfja: regen-api-doc verify-virtualenv
+latexpdfja: verify-virtualenv
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/latex
 	@echo "Running LaTeX files through platex and dvipdfmx..."
 	$(MAKE) -C $(BUILD_DOC_DIR)/latex all-pdf-ja
 	@echo "pdflatex finished; the PDF files are in $(BUILD_DOC_DIR)/latex."
 
 .PHONY: text
-text: regen-api-doc verify-virtualenv
+text: verify-virtualenv
 	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/text
 	@echo
 	@echo "Build finished. The text files are in $(BUILD_DOC_DIR)/text."
 
 .PHONY: man
-man: regen-api-doc verify-virtualenv
+man: verify-virtualenv
 	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/man
 	@echo
 	@echo "Build finished. The manual pages are in $(BUILD_DOC_DIR)/man."
 
 .PHONY: texinfo
-texinfo: regen-api-doc verify-virtualenv
+texinfo: verify-virtualenv
 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/texinfo
 	@echo
 	@echo "Build finished. The Texinfo files are in $(BUILD_DOC_DIR)/texinfo."
@@ -187,57 +178,57 @@ texinfo: regen-api-doc verify-virtualenv
 	      "(use \`make info' here to do that automatically)."
 
 .PHONY: info
-info: regen-api-doc verify-virtualenv
+info: verify-virtualenv
 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/texinfo
 	@echo "Running Texinfo files through makeinfo..."
 	make -C $(BUILD_DOC_DIR)/texinfo info
 	@echo "makeinfo finished; the Info files are in $(BUILD_DOC_DIR)/texinfo."
 
 .PHONY: gettext
-gettext: regen-api-doc verify-virtualenv
+gettext: verify-virtualenv
 	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILD_DOC_DIR)/locale
 	@echo
 	@echo "Build finished. The message catalogs are in $(BUILD_DOC_DIR)/locale."
 
 .PHONY: changes
-changes: regen-api-doc verify-virtualenv
+changes: verify-virtualenv
 	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/changes
 	@echo
 	@echo "The overview file is in $(BUILD_DOC_DIR)/changes."
 
 .PHONY: linkcheck
-linkcheck: regen-api-doc verify-virtualenv
+linkcheck: verify-virtualenv
 	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/linkcheck
 	@echo
 	@echo "Link check complete; look for any errors in the above output " \
 	      "or in $(BUILD_DOC_DIR)/linkcheck/output.txt."
 
 .PHONY: doctest
-doctest: regen-api-doc verify-virtualenv
+doctest: verify-virtualenv
 	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in $(BUILD_DOC_DIR)/doctest/output.txt."
 
 .PHONY: coverage
-coverage: regen-api-doc verify-virtualenv
+coverage: verify-virtualenv
 	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/coverage
 	@echo "Testing of coverage in the sources finished, look at the " \
 	      "results in $(BUILD_DOC_DIR)/coverage/python.txt."
 
 .PHONY: xml
-xml: regen-api-doc verify-virtualenv
+xml: verify-virtualenv
 	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/xml
 	@echo
 	@echo "Build finished. The XML files are in $(BUILD_DOC_DIR)/xml."
 
 .PHONY: pseudoxml
-pseudoxml: regen-api-doc verify-virtualenv
+pseudoxml: verify-virtualenv
 	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/pseudoxml
 	@echo
 	@echo "Build finished. The pseudo-XML files are in $(BUILD_DOC_DIR)/pseudoxml."
 
 .PHONY: dummy
-dummy: regen-api-doc verify-virtualenv
+dummy: verify-virtualenv
 	$(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/dummy
 	@echo
 	@echo "Build finished. Dummy builder generates no files."
diff --git a/test/doc/conf.py b/test/doc/conf.py
index cec9ddee..96ea50fe 100644
--- a/test/doc/conf.py
+++ b/test/doc/conf.py
@@ -88,11 +88,11 @@ exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
 #
-# default_role = None
+default_role = 'any'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 #
-# add_function_parentheses = True
+add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
@@ -156,7 +156,7 @@ html_theme = 'alabaster'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = []
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
diff --git a/test/doc/framework.rst b/test/doc/framework.rst
new file mode 100644
index 00000000..ce5e16e2
--- /dev/null
+++ b/test/doc/framework.rst
@@ -0,0 +1,7 @@
+framework module
+================
+
+.. automodule:: framework
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/hook.rst b/test/doc/hook.rst
new file mode 100644
index 00000000..f856e519
--- /dev/null
+++ b/test/doc/hook.rst
@@ -0,0 +1,7 @@
+hook module
+===========
+
+.. automodule:: hook
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/index.rst b/test/doc/index.rst
index c18357a4..323b608f 100644
--- a/test/doc/index.rst
+++ b/test/doc/index.rst
@@ -1,15 +1,158 @@
-.. VPP test framework documentation master file, created by
-   sphinx-quickstart on Thu Oct 13 08:45:03 2016.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
+.. _unittest: https://docs.python.org/2/library/unittest.html
+.. _TestCase: https://docs.python.org/2/library/unittest.html#unittest.TestCase
+.. _AssertionError: https://docs.python.org/2/library/exceptions.html#exceptions.AssertionError
+.. _SkipTest: https://docs.python.org/2/library/unittest.html#unittest.SkipTest
+.. _virtualenv: http://docs.python-guide.org/en/latest/dev/virtualenvs/
+.. _scapy: http://www.secdev.org/projects/scapy/
 
-Welcome to VPP test framework's documentation!
-==============================================
+.. |vtf| replace:: VPP Test Framework
 
-Contents:
+|vtf|
+=====
 
+Overview
+########
+
+The goal of the |vtf| is to ease writing, running and debugging
+unit tests for the VPP. For this, python was chosen as a high level language
+allowing rapid development with scapy_ providing the necessary tool for creating
+and dissecting packets.
+
+Anatomy of a test case
+######################
+
+Python's unittest_ is used as the base framework upon which the VPP test
+framework is built. A test suite in the |vtf| constists of multiple classes
+derived from `VppTestCase`, which is itself derived from TestCase_.
+The test class defines one or more test functions, which act as test cases.
+
+Function flow when running a test case is:
+
+1. `setUpClass <VppTestCase.setUpClass>`:
+   This function is called once for each test class, allowing a one-time test
+   setup to be executed. If this functions throws an exception,
+   none of the test functions are executed.
+2. `setUp <VppTestCase.setUp>`:
+   The setUp function runs before each of the test functions. If this function
+   throws an exception other than AssertionError_ or SkipTest_, then this is
+   considered an error, not a test failure.
+3. *test_<name>*:
+   This is the guts of the test case. It should execute the test scenario
+   and use the various assert functions from the unittest framework to check
+   necessary.
+4. `tearDown <VppTestCase.tearDown>`:
+   The tearDown function is called after each test function with the purpose
+   of doing partial cleanup.
+5. `tearDownClass <VppTestCase.tearDownClass>`:
+   Method called once after running all of the test funnctions to perform
+   the final cleanup.
+
+Test temporary directory and VPP life cycle
+################################################
+
+Test separation is achieved by separating the test files and vpp instances.
+Each test creates a temporary directory and it's name is used to create
+a shared memory prefix which is used to run a VPP instance.
+This way, there is no conflict between any other VPP instances running
+on the box and the test VPP. Any temporary files created by the test case
+are stored in this temporary test directory.
+
+Virtual environment
+###################
+
+Virtualenv_ is a python module which provides a means to crate an environment
+containing the dependencies required by the |vtf|, allowing a separation
+from any existing system-wide packages. |vtf|'s Makefile automatically
+creates a virtualenv_ inside build-root and installs the required packages
+in that environment. The environment is entered whenever executing a test
+via one of the make test targets.
+
+Naming conventions
+##################
+
+Most unit tests do some kind of packet manipulation - sending and receiving
+packets between VPP and virtual hosts connected to the VPP. Referring
+to the sides, addresses, etc.. is always done as if looking from the VPP side,
+thus:
+
+* *local_* prefix is used for the VPP side.
+  So e.g. `local_ip4 <VppInterface.local_ip4>` address is the IPv4 address
+  assigned to the VPP interface.
+* *remote_* prefix is used for the virtual host side.
+  So e.g. `remote_mac <VppInterface.remote_mac>` address is the MAC address
+  assigned to the virtual host connected to the VPP.
+
+Packet flow in the |vtf|
+########################
+
+Test framework -> VPP
+~~~~~~~~~~~~~~~~~~~~~
+
+|vtf| doesn't send any packets to VPP directly. Traffic is instead injected
+using packet-generator interfaces, represented by the `VppPGInterface` class.
+Packets are written into a temporary .pcap file, which is then read by the VPP
+and the packets are injected into the VPP world.
+
+VPP -> test framework
+~~~~~~~~~~~~~~~~~~~~~
+
+Similarly, VPP doesn't send any packets to |vtf| directly. Instead, packet
+capture feature is used to capture and write traffic to a temporary .pcap file,
+which is then read and analyzed by the |vtf|.
+
+Test framework objects
+######################
+
+The following objects provide VPP abstraction and provide a means to do
+common tasks easily in the test cases.
+
+* `VppInterface`: abstract class representing generic VPP interface
+  and contains some common functionality, which is then used by derived classes
+* `VppPGInterface`: class representing VPP packet-generator interface.
+  The interface is created/destroyed when the object is created/destroyed.
+* `VppSubInterface`: VPP sub-interface abstract class, containing common
+  functionality for e.g. `VppDot1QSubint` and `VppDot1ADSubint` classes
+
+How VPP API/CLI is called
+#########################
+
+Vpp provides python bindings in a python module called vpp-papi, which the test
+framework installs in the virtual environment. A shim layer represented by
+the `VppPapiProvider` class is built on top of the vpp-papi, serving these
+purposes:
+
+1. Automatic return value checks:
+   After each API is called, the return value is checked against the expected
+   return value (by default 0, but can be overridden) and an exception
+   is raised if the check fails.
+2. Automatic call of hooks:
+
+   a. `before_cli <Hook.before_cli>` and `before_api <Hook.before_api>` hooks
+      are used for debug logging and stepping through the test
+   b. `after_cli <Hook.after_cli>` and `after_api <Hook.after_api>` hooks
+      are used for monitoring the vpp process for crashes
+3. Simplification of API calls:
+   Many of the VPP APIs take a lot of parameters and by providing sane defaults
+   for these, the API is much easier to use in the common case and the code is
+   more readable. E.g. ip_add_del_route API takes ~25 parameters, of which
+   in the common case, only 3 are needed.
+
+Example: how to add a new test
+##############################
+
+In this example, we will describe how to add a new test case which tests VPP...
+
+1. Add a new file called...
+2. Add a setUpClass function containing...
+3. Add the test code in test...
+4. Run the test...
+
+|vtf| module documentation
+##########################
+ 
 .. toctree::
    :maxdepth: 2
+   :glob:
 
    modules.rst
 
diff --git a/test/doc/log.rst b/test/doc/log.rst
new file mode 100644
index 00000000..5965d5ad
--- /dev/null
+++ b/test/doc/log.rst
@@ -0,0 +1,7 @@
+log module
+==========
+
+.. automodule:: log
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/modules.rst b/test/doc/modules.rst
new file mode 100644
index 00000000..6d456d7f
--- /dev/null
+++ b/test/doc/modules.rst
@@ -0,0 +1,24 @@
+test
+====
+
+.. toctree::
+   :maxdepth: 4
+
+   framework
+   hook
+   log
+   run_tests
+   scapy_handlers
+   template_bd
+   test_ip
+   test_ip6
+   test_l2bd
+   test_l2xc
+   test_lb
+   test_mpls
+   test_vxlan
+   util
+   vpp_interface
+   vpp_papi_provider
+   vpp_pg_interface
+   vpp_sub_interface
diff --git a/test/doc/run_tests.rst b/test/doc/run_tests.rst
new file mode 100644
index 00000000..30cec4e3
--- /dev/null
+++ b/test/doc/run_tests.rst
@@ -0,0 +1,7 @@
+run_tests module
+================
+
+.. automodule:: run_tests
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/scapy_handlers.rst b/test/doc/scapy_handlers.rst
new file mode 100644
index 00000000..6717326a
--- /dev/null
+++ b/test/doc/scapy_handlers.rst
@@ -0,0 +1,22 @@
+scapy_handlers package
+======================
+
+Submodules
+----------
+
+scapy_handlers.vxlan module
+---------------------------
+
+.. automodule:: scapy_handlers.vxlan
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: scapy_handlers
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/template_bd.rst b/test/doc/template_bd.rst
new file mode 100644
index 00000000..e173d27a
--- /dev/null
+++ b/test/doc/template_bd.rst
@@ -0,0 +1,7 @@
+template_bd module
+==================
+
+.. automodule:: template_bd
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/test_ip.rst b/test/doc/test_ip.rst
new file mode 100644
index 00000000..a1e97b86
--- /dev/null
+++ b/test/doc/test_ip.rst
@@ -0,0 +1,7 @@
+test_ip module
+==============
+
+.. automodule:: test_ip
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/test_ip6.rst b/test/doc/test_ip6.rst
new file mode 100644
index 00000000..63461c3c
--- /dev/null
+++ b/test/doc/test_ip6.rst
@@ -0,0 +1,7 @@
+test_ip6 module
+===============
+
+.. automodule:: test_ip6
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/test_l2bd.rst b/test/doc/test_l2bd.rst
new file mode 100644
index 00000000..8a80dfe6
--- /dev/null
+++ b/test/doc/test_l2bd.rst
@@ -0,0 +1,7 @@
+test_l2bd module
+================
+
+.. automodule:: test_l2bd
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/test_l2xc.rst b/test/doc/test_l2xc.rst
new file mode 100644
index 00000000..caf99bad
--- /dev/null
+++ b/test/doc/test_l2xc.rst
@@ -0,0 +1,7 @@
+test_l2xc module
+================
+
+.. automodule:: test_l2xc
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/test_lb.rst b/test/doc/test_lb.rst
new file mode 100644
index 00000000..e134b29c
--- /dev/null
+++ b/test/doc/test_lb.rst
@@ -0,0 +1,7 @@
+test_lb module
+==============
+
+.. automodule:: test_lb
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/test_mpls.rst b/test/doc/test_mpls.rst
new file mode 100644
index 00000000..e4c8ce0e
--- /dev/null
+++ b/test/doc/test_mpls.rst
@@ -0,0 +1,7 @@
+test_mpls module
+================
+
+.. automodule:: test_mpls
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/test_vxlan.rst b/test/doc/test_vxlan.rst
new file mode 100644
index 00000000..7f40c319
--- /dev/null
+++ b/test/doc/test_vxlan.rst
@@ -0,0 +1,7 @@
+test_vxlan module
+=================
+
+.. automodule:: test_vxlan
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/util.rst b/test/doc/util.rst
new file mode 100644
index 00000000..d8ad0d14
--- /dev/null
+++ b/test/doc/util.rst
@@ -0,0 +1,7 @@
+util module
+===========
+
+.. automodule:: util
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/vpp_interface.rst b/test/doc/vpp_interface.rst
new file mode 100644
index 00000000..32bb009b
--- /dev/null
+++ b/test/doc/vpp_interface.rst
@@ -0,0 +1,7 @@
+vpp_interface module
+====================
+
+.. automodule:: vpp_interface
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/vpp_papi_provider.rst b/test/doc/vpp_papi_provider.rst
new file mode 100644
index 00000000..c9efe85a
--- /dev/null
+++ b/test/doc/vpp_papi_provider.rst
@@ -0,0 +1,7 @@
+vpp_papi_provider module
+========================
+
+.. automodule:: vpp_papi_provider
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/vpp_pg_interface.rst b/test/doc/vpp_pg_interface.rst
new file mode 100644
index 00000000..85f54f62
--- /dev/null
+++ b/test/doc/vpp_pg_interface.rst
@@ -0,0 +1,7 @@
+vpp_pg_interface module
+=======================
+
+.. automodule:: vpp_pg_interface
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/doc/vpp_sub_interface.rst b/test/doc/vpp_sub_interface.rst
new file mode 100644
index 00000000..5ff5300b
--- /dev/null
+++ b/test/doc/vpp_sub_interface.rst
@@ -0,0 +1,7 @@
+vpp_sub_interface module
+========================
+
+.. automodule:: vpp_sub_interface
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/test/test_infra.md b/test/test_infra.md
deleted file mode 100644
index 371d48b0..00000000
--- a/test/test_infra.md
+++ /dev/null
@@ -1,145 +0,0 @@
-# VPP Functional Test Infra
-
-## Running VPP tests
-VPP functional tests are triggered by `make test` command run in the git vpp source directory. Following Linux environment variables are used by the current VPP functional test infrastructure:
-
-- `TEST=<name>` - run only specific test identified by filename `test/test_<name>.py`
--  `V=[0|1|2]` - set verbosity level. `0` for minimal verbosity, `1` for increased verbosity, `2` for maximum verbosity. Default value is 0.
-
-Example of running tests:
-
-```
-~/src/vpp-test-infra$ make test V=1 TEST=vxlan
-```
-
-All tests listed in `test/` directory are run by default. To run selected tests you can set variable TEST when starting tests.
-
-## Overview
-The main functionality of the test framework is defined in [framework.py](test/framework.py) file. The implementation of the test framework uses classes and methods from Python module *unittest*.
-
-Three main classes are defined to support the overall test automation:
-
-* **class VppTestCase(unittest.TestCase)** - a sub-class of *unittest.TestCase* class. Provides methods to create and run test case. These methods can be divided into 5 groups:
-    1. Methods to control test case setup and tear down:
-        * *def setUpConstants(cls):*
-        * *def setUpClass(cls):*
-        * *def quit(cls):*
-        * *def tearDownClass(cls):*
-        * *def tearDown(self):*
-        * *def setUp(self):*
-
-    2. Methods to create VPP packet generator interfaces:
-        * *def create_interfaces(cls, args):*
-
-    3. Methods to execute VPP commands and print logs in the output (terminal for now):
-        * *def log(cls, s, v=1):*
-        * *def api(cls, s):*
-        * *def cli(cls, v, s):*
-
-    4. Methods to control packet stream generation and capturing:
-        * *def pg_add_stream(cls, i, pkts):*
-        * *def pg_enable_capture(cls, args):*
-        * *def pg_start(cls):*
-        * *def pg_get_capture(cls, o):*
-
-    5. Methods to create and verify packets:
-        * *def extend_packet(packet, size):*
-        * *def add_packet_info_to_list(self, info):*
-        * *def create_packet_info(self, pg_id, target_id):*
-        * *def info_to_payload(info):*
-        * *def payload_to_info(payload):*
-        * *def get_next_packet_info(self, info):*
-        * *def get_next_packet_info_for_interface(self, src_pg, info):*
-        * *def get_next_packet_info_for_interface2(self, src_pg, dst_pg, info):*
-
-* **class VppTestResult(unittest.TestResult)** - a sub-class of *unittest.TestResult* class. Provides methods to compile information about the tests that have succeeded and the ones that have failed. These methods can be divided into 4 groups:
-    1. Processing test case result:
-        * *def addSuccess(self, test):*
-        * *def addFailure(self, test, err):*
-        * *def addError(self, test, err):*
-
-    2. Processing test case description:
-        * *def getDescription(self, test):*
-
-    3. Processing test case start and stop:
-        * *def startTest(self, test):*
-        * *def stopTest(self, test):*
-
-    4. Printing error and failure information:
-        * *def printErrors(self):*
-        * *def printErrorList(self, flavour, errors):*
-
-* **class VppTestRunner(unittest.TextTestRunner)** - a sub-class of *unittest.TextTestRunner* class. Provides basic test runner implementation that prints results on standard error stream. Contains one method:
-    * *def run(self, test):*
-
-In addition [util.py] (test/util.py) file defines number of common methods useful for many test cases. All of these methods are currently contained in one class:
-
-* **class Util(object)**:
-    * *def resolve_arp(cls, args):*
-    * *def resolve_icmpv6_nd(cls, args):*
-    * *def config_ip4(cls, args):*
-    * *def config_ip6(cls, args):*
-
-## Interaction with VPP
-VPP is started from command line as a sub-process during the test case setup phase. Command line attributes to start VPP are stored in class variable *vpp_cmdline*.
-To get an overview of VPP command line attributes, visit section [Command-line Arguments](https://wiki.fd.io/view/VPP/Command-line_Arguments) on VPP wiki page.
-
-Current VPP test infrastructure is using two ways to interact with VPP for configuration, operational status check, tracing and logging.
-
-### Using API commands
-API commands are executed by VPP API test tool that is started from command line as a sub-process. Command line attributes to start VPP API test tool are stored in class variable *vpp_api_test_cmdline*.
-When executed, API command and its possible output are printed in the terminal if verbosity level is greater then 0.
-
-Example:
-
-```
-cls.api("sw_interface_set_flags pg1 admin-up")
-```
-
-will print in the terminal
-
-```
-API: sw_interface_set_flags pg1 admin-up
-```
-
-### Using CLI commands
-CLI commands are executed via VPP API test tool by sending API command "*exec + cli_command*". It is possible to set verbosity level for executing specific CLI commands, so that the CLI command is executed only and only if its associated verbosity level is equal or lower then the verbosity level set in the system.
-
-Similarly to API commands, when executed, CLI command and its possible output are printed in the terminal if verbosity level is greater then 0.
-
-Example I - CLI command will be executed always (its verbosity is 0):
-
-```
-cls.cli(0, "show l2fib")
-```
-
-Example II - CLI command will be executed only if the verbosity level is set to 2:
-
-```
-self.cli(2, "show l2fib verbose")
-```
-
-## Logging
-It is possible to log some additional information in the terminal for different verbosity levels.
-
-Example I - verbosity level of the log is set to default value (0):
-
-```
-self.log("Verifying capture %u" % i)
-```
-
-will be always printed in the terminal:
-
-```
-LOG: Verifying capture 0
-```
-
-Example II - the log will be printed in the terminal only if the verbosity level is set to 2:
-
-```
-self.log("Got packet on port %u: src=%u (id=%u)"
-                         % (o, payload_info.src, payload_info.index), 2)
-```
-
----
-***END***
diff --git a/test/vpp_pg_interface.py b/test/vpp_pg_interface.py
index fc4080d2..c9e4076d 100644
--- a/test/vpp_pg_interface.py
+++ b/test/vpp_pg_interface.py
@@ -1,4 +1,5 @@
 import os
+import time
 from logging import error
 from scapy.utils import wrpcap, rdpcap
 from vpp_interface import VppInterface
@@ -39,11 +40,27 @@ class VppPGInterface(VppInterface):
         """CLI string to load the injected packets"""
         return self._input_cli
 
+    @property
+    def in_history_counter(self):
+        """Self-incrementing counter used when renaming old pcap files"""
+        v = self._in_history_counter
+        self._in_history_counter += 1
+        return v
+
+    @property
+    def out_history_counter(self):
+        """Self-incrementing counter used when renaming old pcap files"""
+        v = self._out_history_counter
+        self._out_history_counter += 1
+        return v
+
     def post_init_setup(self):
         """ Perform post-init setup for super class and add our own setup """
         super(VppPGInterface, self).post_init_setup()
-        self._out_path = self.test.tempdir + "/pg%u_out.pcap" % self.sw_if_index
-        self._in_path = self.test.tempdir + "/pg%u_in.pcap" % self.sw_if_index
+        self._out_file = "pg%u_out.pcap" % self.sw_if_index
+        self._out_path = self.test.tempdir + "/" + self._out_file
+        self._in_file = "pg%u_in.pcap" % self.sw_if_index
+        self._in_path = self.test.tempdir + "/" + self._in_file
         self._capture_cli = "packet-generator capture pg%u pcap %s" % (
             self.pg_index, self.out_path)
         self._cap_name = "pcap%u" % self.sw_if_index
@@ -52,6 +69,8 @@ class VppPGInterface(VppInterface):
 
     def __init__(self, test, pg_index):
         """ Create VPP packet-generator interface """
+        self._in_history_counter = 0
+        self._out_history_counter = 0
         self._pg_index = pg_index
         self._test = test
         r = self.test.vapi.pg_create_interface(self.pg_index)
@@ -61,7 +80,14 @@ class VppPGInterface(VppInterface):
     def enable_capture(self):
         """ Enable capture on this packet-generator interface"""
         try:
-            os.unlink(self.out_path)
+            if os.path.isfile(self.out_path):
+                os.rename(self.out_path,
+                          "%s/history.[timestamp:%f].[%s-counter:%04d].%s" %
+                          (self.test.tempdir,
+                           time.time(),
+                           self.name,
+                           self.out_history_counter,
+                           self._out_file))
         except:
             pass
         # FIXME this should be an API, but no such exists atm
@@ -75,7 +101,14 @@ class VppPGInterface(VppInterface):
 
         """
         try:
-            os.remove(self.in_path)
+            if os.path.isfile(self.in_path):
+                os.rename(self.in_path,
+                          "%s/history.[timestamp:%f].[%s-counter:%04d].%s" %
+                          (self.test.tempdir,
+                           time.time(),
+                           self.name,
+                           self.in_history_counter,
+                           self._in_file))
         except:
             pass
         wrpcap(self.in_path, pkts)
-- 
cgit 1.2.3-korg


From 4cecc611bedde8a9a1b2ad1454dd84f30a1652cb Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Fri, 11 Nov 2016 23:31:55 +0100
Subject: Add 'make verify' target to top-level makefile

Change-Id: I992df2b6ded9533d32f5f936e6d651055061f054
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5064686c..6b1f13a7 100644
--- a/Makefile
+++ b/Makefile
@@ -329,3 +329,7 @@ doxygen:
 wipe-doxygen:
 	$(call make-doxy)
 
+verify: $(BR)/.bootstrap.ok
+	@sudo -E apt-get $(CONFIRM) $(FORCE) install clang
+	@make -C build-root CC=clang PLATFORM=vpp TAG=vpp wipe-all install-packages
+	@make -C build-root CC=clang PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
-- 
cgit 1.2.3-korg


From 7f3c36bb852017c2edbeb609a5e10446a7605157 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Fri, 11 Nov 2016 23:59:48 +0100
Subject: Use gcc for start in 'make verify'

Change-Id: I8ef5f8aeb9af5127337163c4767bfa92b62f8175
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6b1f13a7..5d20bd23 100644
--- a/Makefile
+++ b/Makefile
@@ -330,6 +330,5 @@ wipe-doxygen:
 	$(call make-doxy)
 
 verify: $(BR)/.bootstrap.ok
-	@sudo -E apt-get $(CONFIRM) $(FORCE) install clang
-	@make -C build-root CC=clang PLATFORM=vpp TAG=vpp wipe-all install-packages
-	@make -C build-root CC=clang PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
+	@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
+	@make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
-- 
cgit 1.2.3-korg


From e30872e6606b4ce6fe1d6ff44be69e590427e45f Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Sat, 12 Nov 2016 01:23:55 +0100
Subject: Add clang to 'make verify'

Change-Id: I9ba84632da93ffb7713064db51f2888fc212713a
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                    | 18 ++++++++++++++++++
 build-data/platforms/vpp.mk |  5 +++++
 2 files changed, 23 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5d20bd23..41a45c88 100644
--- a/Makefile
+++ b/Makefile
@@ -329,6 +329,24 @@ doxygen:
 wipe-doxygen:
 	$(call make-doxy)
 
+define banner
+	@echo "========================================================================"
+	@echo " $(1)"
+	@echo "========================================================================"
+	@echo " "
+endef
+
 verify: $(BR)/.bootstrap.ok
+ifeq ($(OS_ID),ubuntu)
+ifeq ($(OS_VERSION_ID),16.04)
+	$(call banner,"Installing dependencies")
+	@sudo -E apt-get update
+	@sudo -E apt-get $(CONFIRM) $(FORCE) install clang
+	$(call banner,"Building for PLATFORM=vpp using clang")
+	@make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
+endif
+endif
+	$(call banner,"Building for PLATFORM=vpp using gcc")
 	@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
+	$(call banner,"Building for PLATFORM=vpp_lite using gcc")
 	@make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 977c4c32..4fe7cc8f 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -56,6 +56,11 @@ vpp_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE) \
 vpp_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE) \
 	-fstack-protector -fPIC -Werror
 
+vpp_clang_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE) \
+	-fstack-protector -fPIC -Werror
+vpp_clang_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE) \
+	-fstack-protector -fPIC -Werror
+
 vpp_gcov_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \
 	-fPIC -Werror -fprofile-arcs -ftest-coverage
 vpp_gcov_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \
-- 
cgit 1.2.3-korg


From 86d87c40dd97ced69c939299204fadf1859a2f50 Mon Sep 17 00:00:00 2001
From: Matej Klotton <mklotton@cisco.com>
Date: Fri, 11 Nov 2016 11:38:55 +0100
Subject: Update test documentation.

- update IRB, IPv4, ipv6 doc
- revert 778c2765c8ea5c6628f6d668847f0b9ae06dbf3d

Change-Id: I9af5ed9329ce5fe01392cf28d5bf321cfc647e48
Signed-off-by: Matej Klotton <mklotton@cisco.com>
---
 Makefile                       |  2 +-
 test/doc/Makefile              | 61 +++++++++++++++++-------------
 test/doc/framework.rst         |  7 ----
 test/doc/hook.rst              |  7 ----
 test/doc/index.rst             | 10 ++---
 test/doc/log.rst               |  7 ----
 test/doc/modules.rst           | 24 ------------
 test/doc/run_tests.rst         |  7 ----
 test/doc/scapy_handlers.rst    | 22 -----------
 test/doc/template_bd.rst       |  7 ----
 test/doc/test_ip4.rst          |  7 ----
 test/doc/test_ip6.rst          |  7 ----
 test/doc/test_l2bd.rst         |  7 ----
 test/doc/test_l2xc.rst         |  7 ----
 test/doc/test_lb.rst           |  7 ----
 test/doc/test_mpls.rst         |  7 ----
 test/doc/test_vxlan.rst        |  7 ----
 test/doc/util.rst              |  7 ----
 test/doc/vpp_interface.rst     |  7 ----
 test/doc/vpp_papi_provider.rst |  7 ----
 test/doc/vpp_pg_interface.rst  |  7 ----
 test/doc/vpp_sub_interface.rst |  7 ----
 test/framework.py              | 27 ++++----------
 test/test_ip4.py               | 78 +++++++++++++++++++++++++++++---------
 test/test_ip4_irb.py           | 83 +++++++++++++++++++++++++----------------
 test/test_ip6.py               | 77 ++++++++++++++++++++++++++++++--------
 test/vpp_interface.py          | 85 +++++++++++++++++++++++++++---------------
 test/vpp_lo_interface.py       |  4 +-
 28 files changed, 277 insertions(+), 315 deletions(-)
 delete mode 100644 test/doc/framework.rst
 delete mode 100644 test/doc/hook.rst
 delete mode 100644 test/doc/log.rst
 delete mode 100644 test/doc/modules.rst
 delete mode 100644 test/doc/run_tests.rst
 delete mode 100644 test/doc/scapy_handlers.rst
 delete mode 100644 test/doc/template_bd.rst
 delete mode 100644 test/doc/test_ip4.rst
 delete mode 100644 test/doc/test_ip6.rst
 delete mode 100644 test/doc/test_l2bd.rst
 delete mode 100644 test/doc/test_l2xc.rst
 delete mode 100644 test/doc/test_lb.rst
 delete mode 100644 test/doc/test_mpls.rst
 delete mode 100644 test/doc/test_vxlan.rst
 delete mode 100644 test/doc/util.rst
 delete mode 100644 test/doc/vpp_interface.rst
 delete mode 100644 test/doc/vpp_papi_provider.rst
 delete mode 100644 test/doc/vpp_pg_interface.rst
 delete mode 100644 test/doc/vpp_sub_interface.rst

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 41a45c88..4e084d4d 100644
--- a/Makefile
+++ b/Makefile
@@ -212,7 +212,7 @@ build-vpp-api: $(BR)/.bootstrap.ok
 VPP_PYTHON_PREFIX=$(BR)/python
 
 define test
-	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-api-install plugins-install vpp-install vpp-api-test-install,)
+	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-api-install plugins-install vpp-install,)
 	make -C test \
 	  VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
 	  VPP_TEST_API_TEST_BIN=$(BR)/install-$(2)-native/vpp-api-test/bin/vpp_api_test \
diff --git a/test/doc/Makefile b/test/doc/Makefile
index 3b4c02b8..809abef8 100644
--- a/test/doc/Makefile
+++ b/test/doc/Makefile
@@ -8,13 +8,15 @@ SPHINXBUILD = sphinx-build
 PAPER         =
 BUILD_DOC_ROOT = $(BR)/test-doc
 BUILD_DOC_DIR = $(BUILD_DOC_ROOT)/build
+API_DOC_GEN_DIR = $(BUILD_DOC_ROOT)/apidoc
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILD_DOC_DIR)/.sphinx-cache $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SRC_DOC_DIR)
+ALLSPHINXOPTS   = -d $(BUILD_DOC_DIR)/.sphinx-cache $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(API_DOC_GEN_DIR) -c $(SRC_DOC_DIR)
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+INDEX_REL_PATH:=$(shell realpath --relative-to=$(API_DOC_GEN_DIR) $(SRC_DOC_DIR)/index.rst)
 IN_VENV:=$(shell if pip -V | grep "virtualenv" 2>&1 > /dev/null; then echo 1; else echo 0; fi)
 
 .PHONY: verify-virtualenv
@@ -23,6 +25,13 @@ ifeq ($(IN_VENV),0)
 	$(error "Not running inside virtualenv (are you running 'make test-doc' from root?)")
 endif
 
+.PHONY: regen-api-doc
+regen-api-doc: verify-virtualenv
+	@mkdir -p $(API_DOC_GEN_DIR)
+	#@echo ".. include:: $(INDEX_REL_PATH)" > $(API_DOC_GEN_DIR)/index.rst
+	@cp $(SRC_DOC_DIR)/index.rst $(API_DOC_GEN_DIR)
+	sphinx-apidoc -o $(API_DOC_GEN_DIR) ..
+
 .PHONY: help
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -58,44 +67,44 @@ wipe:
 	rm -rf $(BUILD_DOC_ROOT)
 
 .PHONY: html
-html: verify-virtualenv
+html: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILD_DOC_DIR)/html."
 
 .PHONY: dirhtml
-dirhtml: verify-virtualenv
+dirhtml: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/dirhtml
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILD_DOC_DIR)/dirhtml."
 
 .PHONY: singlehtml
-singlehtml: verify-virtualenv
+singlehtml: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/singlehtml
 	@echo
 	@echo "Build finished. The HTML page is in $(BUILD_DOC_DIR)/singlehtml."
 
 .PHONY: pickle
-pickle: verify-virtualenv
+pickle: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/pickle
 	@echo
 	@echo "Build finished; now you can process the pickle files."
 
 .PHONY: json
-json: verify-virtualenv
+json: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/json
 	@echo
 	@echo "Build finished; now you can process the JSON files."
 
 .PHONY: htmlhelp
-htmlhelp: verify-virtualenv
+htmlhelp: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/htmlhelp
 	@echo
 	@echo "Build finished; now you can run HTML Help Workshop with the" \
 	      ".hhp project file in $(BUILD_DOC_DIR)/htmlhelp."
 
 .PHONY: qthelp
-qthelp: verify-virtualenv
+qthelp: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/qthelp
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
@@ -105,7 +114,7 @@ qthelp: verify-virtualenv
 	@echo "# assistant -collectionFile $(BUILD_DOC_DIR)/qthelp/VPPtestframework.qhc"
 
 .PHONY: applehelp
-applehelp: verify-virtualenv
+applehelp: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/applehelp
 	@echo
 	@echo "Build finished. The help book is in $(BUILD_DOC_DIR)/applehelp."
@@ -114,7 +123,7 @@ applehelp: verify-virtualenv
 	      "bundle."
 
 .PHONY: devhelp
-devhelp: verify-virtualenv
+devhelp: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/devhelp
 	@echo
 	@echo "Build finished."
@@ -124,7 +133,7 @@ devhelp: verify-virtualenv
 	@echo "# devhelp"
 
 .PHONY: epub
-epub: verify-virtualenv
+epub: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/epub
 	@echo
 	@echo "Build finished. The epub file is in $(BUILD_DOC_DIR)/epub."
@@ -136,7 +145,7 @@ epub3:
 	@echo "Build finished. The epub3 file is in $(BUILD_DOC_DIR)/epub3."
 
 .PHONY: latex
-latex: verify-virtualenv
+latex: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/latex
 	@echo
 	@echo "Build finished; the LaTeX files are in $(BUILD_DOC_DIR)/latex."
@@ -144,33 +153,33 @@ latex: verify-virtualenv
 	      "(use \`make latexpdf' here to do that automatically)."
 
 .PHONY: latexpdf
-latexpdf: verify-virtualenv
+latexpdf: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/latex
 	@echo "Running LaTeX files through pdflatex..."
 	$(MAKE) -C $(BUILD_DOC_DIR)/latex all-pdf
 	@echo "pdflatex finished; the PDF files are in $(BUILD_DOC_DIR)/latex."
 
 .PHONY: latexpdfja
-latexpdfja: verify-virtualenv
+latexpdfja: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/latex
 	@echo "Running LaTeX files through platex and dvipdfmx..."
 	$(MAKE) -C $(BUILD_DOC_DIR)/latex all-pdf-ja
 	@echo "pdflatex finished; the PDF files are in $(BUILD_DOC_DIR)/latex."
 
 .PHONY: text
-text: verify-virtualenv
+text: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/text
 	@echo
 	@echo "Build finished. The text files are in $(BUILD_DOC_DIR)/text."
 
 .PHONY: man
-man: verify-virtualenv
+man: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/man
 	@echo
 	@echo "Build finished. The manual pages are in $(BUILD_DOC_DIR)/man."
 
 .PHONY: texinfo
-texinfo: verify-virtualenv
+texinfo: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/texinfo
 	@echo
 	@echo "Build finished. The Texinfo files are in $(BUILD_DOC_DIR)/texinfo."
@@ -178,57 +187,57 @@ texinfo: verify-virtualenv
 	      "(use \`make info' here to do that automatically)."
 
 .PHONY: info
-info: verify-virtualenv
+info: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/texinfo
 	@echo "Running Texinfo files through makeinfo..."
 	make -C $(BUILD_DOC_DIR)/texinfo info
 	@echo "makeinfo finished; the Info files are in $(BUILD_DOC_DIR)/texinfo."
 
 .PHONY: gettext
-gettext: verify-virtualenv
+gettext: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILD_DOC_DIR)/locale
 	@echo
 	@echo "Build finished. The message catalogs are in $(BUILD_DOC_DIR)/locale."
 
 .PHONY: changes
-changes: verify-virtualenv
+changes: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/changes
 	@echo
 	@echo "The overview file is in $(BUILD_DOC_DIR)/changes."
 
 .PHONY: linkcheck
-linkcheck: verify-virtualenv
+linkcheck: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/linkcheck
 	@echo
 	@echo "Link check complete; look for any errors in the above output " \
 	      "or in $(BUILD_DOC_DIR)/linkcheck/output.txt."
 
 .PHONY: doctest
-doctest: verify-virtualenv
+doctest: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in $(BUILD_DOC_DIR)/doctest/output.txt."
 
 .PHONY: coverage
-coverage: verify-virtualenv
+coverage: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/coverage
 	@echo "Testing of coverage in the sources finished, look at the " \
 	      "results in $(BUILD_DOC_DIR)/coverage/python.txt."
 
 .PHONY: xml
-xml: verify-virtualenv
+xml: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/xml
 	@echo
 	@echo "Build finished. The XML files are in $(BUILD_DOC_DIR)/xml."
 
 .PHONY: pseudoxml
-pseudoxml: verify-virtualenv
+pseudoxml: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/pseudoxml
 	@echo
 	@echo "Build finished. The pseudo-XML files are in $(BUILD_DOC_DIR)/pseudoxml."
 
 .PHONY: dummy
-dummy: verify-virtualenv
+dummy: regen-api-doc verify-virtualenv
 	$(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILD_DOC_DIR)/dummy
 	@echo
 	@echo "Build finished. Dummy builder generates no files."
diff --git a/test/doc/framework.rst b/test/doc/framework.rst
deleted file mode 100644
index ce5e16e2..00000000
--- a/test/doc/framework.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-framework module
-================
-
-.. automodule:: framework
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/hook.rst b/test/doc/hook.rst
deleted file mode 100644
index f856e519..00000000
--- a/test/doc/hook.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-hook module
-===========
-
-.. automodule:: hook
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/index.rst b/test/doc/index.rst
index 323b608f..8cbe961f 100644
--- a/test/doc/index.rst
+++ b/test/doc/index.rst
@@ -22,7 +22,7 @@ Anatomy of a test case
 ######################
 
 Python's unittest_ is used as the base framework upon which the VPP test
-framework is built. A test suite in the |vtf| constists of multiple classes
+framework is built. A test suite in the |vtf| consists of multiple classes
 derived from `VppTestCase`, which is itself derived from TestCase_.
 The test class defines one or more test functions, which act as test cases.
 
@@ -44,11 +44,11 @@ Function flow when running a test case is:
    The tearDown function is called after each test function with the purpose
    of doing partial cleanup.
 5. `tearDownClass <VppTestCase.tearDownClass>`:
-   Method called once after running all of the test funnctions to perform
+   Method called once after running all of the test functions to perform
    the final cleanup.
 
 Test temporary directory and VPP life cycle
-################################################
+###########################################
 
 Test separation is achieved by separating the test files and vpp instances.
 Each test creates a temporary directory and it's name is used to create
@@ -60,7 +60,7 @@ are stored in this temporary test directory.
 Virtual environment
 ###################
 
-Virtualenv_ is a python module which provides a means to crate an environment
+Virtualenv_ is a python module which provides a means to create an environment
 containing the dependencies required by the |vtf|, allowing a separation
 from any existing system-wide packages. |vtf|'s Makefile automatically
 creates a virtualenv_ inside build-root and installs the required packages
@@ -72,7 +72,7 @@ Naming conventions
 
 Most unit tests do some kind of packet manipulation - sending and receiving
 packets between VPP and virtual hosts connected to the VPP. Referring
-to the sides, addresses, etc.. is always done as if looking from the VPP side,
+to the sides, addresses, etc. is always done as if looking from the VPP side,
 thus:
 
 * *local_* prefix is used for the VPP side.
diff --git a/test/doc/log.rst b/test/doc/log.rst
deleted file mode 100644
index 5965d5ad..00000000
--- a/test/doc/log.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-log module
-==========
-
-.. automodule:: log
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/modules.rst b/test/doc/modules.rst
deleted file mode 100644
index 773283e3..00000000
--- a/test/doc/modules.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-test
-====
-
-.. toctree::
-   :maxdepth: 4
-
-   framework
-   hook
-   log
-   run_tests
-   scapy_handlers
-   template_bd
-   test_ip4
-   test_ip6
-   test_l2bd
-   test_l2xc
-   test_lb
-   test_mpls
-   test_vxlan
-   util
-   vpp_interface
-   vpp_papi_provider
-   vpp_pg_interface
-   vpp_sub_interface
diff --git a/test/doc/run_tests.rst b/test/doc/run_tests.rst
deleted file mode 100644
index 30cec4e3..00000000
--- a/test/doc/run_tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-run_tests module
-================
-
-.. automodule:: run_tests
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/scapy_handlers.rst b/test/doc/scapy_handlers.rst
deleted file mode 100644
index 6717326a..00000000
--- a/test/doc/scapy_handlers.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-scapy_handlers package
-======================
-
-Submodules
-----------
-
-scapy_handlers.vxlan module
----------------------------
-
-.. automodule:: scapy_handlers.vxlan
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: scapy_handlers
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/template_bd.rst b/test/doc/template_bd.rst
deleted file mode 100644
index e173d27a..00000000
--- a/test/doc/template_bd.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-template_bd module
-==================
-
-.. automodule:: template_bd
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/test_ip4.rst b/test/doc/test_ip4.rst
deleted file mode 100644
index c3c3a23a..00000000
--- a/test/doc/test_ip4.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-test_ip module
-==============
-
-.. automodule:: test_ip4
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/test_ip6.rst b/test/doc/test_ip6.rst
deleted file mode 100644
index 63461c3c..00000000
--- a/test/doc/test_ip6.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-test_ip6 module
-===============
-
-.. automodule:: test_ip6
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/test_l2bd.rst b/test/doc/test_l2bd.rst
deleted file mode 100644
index 8a80dfe6..00000000
--- a/test/doc/test_l2bd.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-test_l2bd module
-================
-
-.. automodule:: test_l2bd
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/test_l2xc.rst b/test/doc/test_l2xc.rst
deleted file mode 100644
index caf99bad..00000000
--- a/test/doc/test_l2xc.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-test_l2xc module
-================
-
-.. automodule:: test_l2xc
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/test_lb.rst b/test/doc/test_lb.rst
deleted file mode 100644
index e134b29c..00000000
--- a/test/doc/test_lb.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-test_lb module
-==============
-
-.. automodule:: test_lb
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/test_mpls.rst b/test/doc/test_mpls.rst
deleted file mode 100644
index e4c8ce0e..00000000
--- a/test/doc/test_mpls.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-test_mpls module
-================
-
-.. automodule:: test_mpls
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/test_vxlan.rst b/test/doc/test_vxlan.rst
deleted file mode 100644
index 7f40c319..00000000
--- a/test/doc/test_vxlan.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-test_vxlan module
-=================
-
-.. automodule:: test_vxlan
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/util.rst b/test/doc/util.rst
deleted file mode 100644
index d8ad0d14..00000000
--- a/test/doc/util.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-util module
-===========
-
-.. automodule:: util
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/vpp_interface.rst b/test/doc/vpp_interface.rst
deleted file mode 100644
index 32bb009b..00000000
--- a/test/doc/vpp_interface.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-vpp_interface module
-====================
-
-.. automodule:: vpp_interface
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/vpp_papi_provider.rst b/test/doc/vpp_papi_provider.rst
deleted file mode 100644
index c9efe85a..00000000
--- a/test/doc/vpp_papi_provider.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-vpp_papi_provider module
-========================
-
-.. automodule:: vpp_papi_provider
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/vpp_pg_interface.rst b/test/doc/vpp_pg_interface.rst
deleted file mode 100644
index 85f54f62..00000000
--- a/test/doc/vpp_pg_interface.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-vpp_pg_interface module
-=======================
-
-.. automodule:: vpp_pg_interface
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/doc/vpp_sub_interface.rst b/test/doc/vpp_sub_interface.rst
deleted file mode 100644
index 5ff5300b..00000000
--- a/test/doc/vpp_sub_interface.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-vpp_sub_interface module
-========================
-
-.. automodule:: vpp_sub_interface
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/test/framework.py b/test/framework.py
index fdb600c4..227428ef 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -29,22 +29,15 @@ class _PacketInfo(object):
 
     Help process information about the next packet.
     Set variables to default values.
-    @property index
-      Integer variable to store the index of the packet.
-    @property src
-      Integer variable to store the index of the source packet generator
-      interface of the packet.
-    @property dst
-      Integer variable to store the index of the destination packet generator
-      interface of the packet.
-    @property data
-      Object variable to store the copy of the former packet.
-
-
     """
+    #: Store the index of the packet.
     index = -1
+    #: Store the index of the source packet generator interface of the packet.
     src = -1
+    #: Store the index of the destination packet generator interface
+    #: of the packet.
     dst = -1
+    #: Store the copy of the former packet.
     data = None
 
 
@@ -54,12 +47,8 @@ def pump_output(out, queue):
 
 
 class VppTestCase(unittest.TestCase):
-    """
-    Subclass of the python unittest.TestCase class.
-
-    This subclass is a base class for test cases that are implemented as classes
-    It provides methods to create and run test case.
-
+    """This subclass is a base class for VPP test cases that are implemented as
+    classes. It provides methods to create and run test case.
     """
 
     @property
@@ -189,7 +178,7 @@ class VppTestCase(unittest.TestCase):
         cls.packet_infos = {}
         cls.verbose = 0
         print(double_line_delim)
-        print(colorize(getdoc(cls), YELLOW))
+        print(colorize(getdoc(cls).splitlines()[0], YELLOW))
         print(double_line_delim)
         # need to catch exceptions here because if we raise, then the cleanup
         # doesn't get called and we might end with a zombie vpp
diff --git a/test/test_ip4.py b/test/test_ip4.py
index 48155a5a..36a907a6 100644
--- a/test/test_ip4.py
+++ b/test/test_ip4.py
@@ -2,24 +2,38 @@
 
 import unittest
 import socket
-from logging import *
 
 from framework import VppTestCase, VppTestRunner
+from vpp_interface import VppInterface
 from vpp_sub_interface import VppSubInterface, VppDot1QSubint, VppDot1ADSubint
 
 from scapy.packet import Raw
-from scapy.layers.l2 import Ether, Dot1Q, ARP
+from scapy.layers.l2 import Ether, Dot1Q
 from scapy.layers.inet import IP, UDP
 
 
 class TestIPv4(VppTestCase):
     """ IPv4 Test Case """
 
-    @classmethod
-    def setUpClass(cls):
-        super(TestIPv4, cls).setUpClass()
-
     def setUp(self):
+        """
+        Perform test setup before test case.
+
+        **Config:**
+            - create 3 pg interfaces
+                - untagged pg0 interface
+                - Dot1Q subinterface on pg1
+                - Dot1AD subinterface on pg2
+            - setup interfaces:
+                - put it into UP state
+                - set IPv4 addresses
+                - resolve neighbor address using ARP
+            - configure 200 fib entries
+
+        :ivar list interfaces: pg interfaces and subinterfaces.
+        :ivar dict flows: IPv4 packet flows in test.
+        :ivar list pg_if_packet_sizes: packet sizes in test.
+        """
         super(TestIPv4, self).setUp()
 
         # create 3 pg interfaces
@@ -49,16 +63,26 @@ class TestIPv4(VppTestCase):
             i.config_ip4()
             i.resolve_arp()
 
-        # config 2M FIB enries
+        # config 2M FIB entries
         self.config_fib_entries(200)
 
     def tearDown(self):
+        """Run standard test teardown and log ``show ip arp``."""
         super(TestIPv4, self).tearDown()
         if not self.vpp_dead:
-            info(self.vapi.cli("show ip arp"))
+            self.logger.info(self.vapi.cli("show ip arp"))
             # info(self.vapi.cli("show ip fib"))  # many entries
 
     def config_fib_entries(self, count):
+        """For each interface add to the FIB table *count* routes to
+        "10.0.0.1/32" destination with interface's local address as next-hop
+        address.
+
+        :param int count: Number of FIB entries.
+
+        - *TODO:* check if the next-hop address shouldn't be remote address
+          instead of local address.
+        """
         n_int = len(self.interfaces)
         percent = 0
         counter = 0.0
@@ -69,13 +93,18 @@ class TestIPv4(VppTestCase):
             for j in range(count / n_int):
                 self.vapi.ip_add_del_route(
                     dest_addr, dest_addr_len, next_hop_address)
-                counter = counter + 1
+                counter += 1
                 if counter / count * 100 > percent:
-                    info("Configure %d FIB entries .. %d%% done" %
-                         (count, percent))
-                    percent = percent + 1
+                    self.logger.info("Configure %d FIB entries .. %d%% done" %
+                                     (count, percent))
+                    percent += 1
 
     def create_stream(self, src_if, packet_sizes):
+        """Create input packet stream for defined interface.
+
+        :param VppInterface src_if: Interface to create packet stream for.
+        :param list packet_sizes: Required packet sizes.
+        """
         pkts = []
         for i in range(0, 257):
             dst_if = self.flows[src_if][i % 2]
@@ -95,7 +124,13 @@ class TestIPv4(VppTestCase):
         return pkts
 
     def verify_capture(self, dst_if, capture):
-        info("Verifying capture on interface %s" % dst_if.name)
+        """Verify captured input packet stream for defined interface.
+
+        :param VppInterface dst_if: Interface to verify captured packet stream
+                                    for.
+        :param list capture: Captured packet stream.
+        """
+        self.logger.info("Verifying capture on interface %s" % dst_if.name)
         last_info = dict()
         for i in self.interfaces:
             last_info[i.sw_if_index] = None
@@ -114,8 +149,8 @@ class TestIPv4(VppTestCase):
                 payload_info = self.payload_to_info(str(packet[Raw]))
                 packet_index = payload_info.index
                 self.assertEqual(payload_info.dst, dst_sw_if_index)
-                debug("Got packet on port %s: src=%u (id=%u)" %
-                      (dst_if.name, payload_info.src, packet_index))
+                self.logger.debug("Got packet on port %s: src=%u (id=%u)" %
+                                  (dst_if.name, payload_info.src, packet_index))
                 next_info = self.get_next_packet_info_for_interface2(
                     payload_info.src, dst_sw_if_index,
                     last_info[payload_info.src])
@@ -129,8 +164,8 @@ class TestIPv4(VppTestCase):
                 self.assertEqual(udp.sport, saved_packet[UDP].sport)
                 self.assertEqual(udp.dport, saved_packet[UDP].dport)
             except:
-                error("Unexpected or invalid packet:")
-                error(packet.show())
+                self.logger.error("Unexpected or invalid packet:")
+                self.logger.error(packet.show())
                 raise
         for i in self.interfaces:
             remaining_packet = self.get_next_packet_info_for_interface2(
@@ -141,7 +176,14 @@ class TestIPv4(VppTestCase):
                 (dst_if.name, i.name))
 
     def test_fib(self):
-        """ IPv4 FIB test """
+        """ IPv4 FIB test
+
+        Test scenario:
+
+            - Create IPv4 stream for pg0 interface
+            - Create IPv4 tagged streams for pg1's and pg2's subinterface.
+            - Send and verify received packets on each interface.
+        """
 
         pkts = self.create_stream(self.pg0, self.pg_if_packet_sizes)
         self.pg0.add_stream(pkts)
diff --git a/test/test_ip4_irb.py b/test/test_ip4_irb.py
index 412575db..cf2bb150 100644
--- a/test/test_ip4_irb.py
+++ b/test/test_ip4_irb.py
@@ -1,39 +1,51 @@
 #!/usr/bin/env python
+"""IRB Test Case HLD:
+
+**config**
+    - L2 MAC learning enabled in l2bd
+    - 2 routed interfaces untagged, bvi (Bridge Virtual Interface)
+    - 2 bridged interfaces in l2bd with bvi
+
+**test**
+    - sending ip4 eth pkts between routed interfaces
+        - 2 routed interfaces
+        - 2 bridged interfaces
+
+    - 64B, 512B, 1518B, 9200B (ether_size)
+
+    - burst of pkts per interface
+        - 257pkts per burst
+        - routed pkts hitting different FIB entries
+        - bridged pkts hitting different MAC entries
+
+**verify**
+    - all packets received correctly
+
+"""
+
 import unittest
-from random import choice, randint
+from random import choice
 
 from scapy.packet import Raw
 from scapy.layers.l2 import Ether
 from scapy.layers.inet import IP, UDP
-from logging import *
 
 from framework import VppTestCase, VppTestRunner
 
-""" IRB Test Case
-
-config
-    L2 MAC learning enabled in l2bd
-    2 routed interfaces untagged, bvi
-    2 bridged interfaces in l2bd with bvi
-test
-    sending ip4 eth pkts between routed interfaces
-        2 routed interfaces
-        2 bridged interfaces
-    64B, 512B, 1518B, 9200B (ether_size)
-    burst of pkts per interface
-        257pkts per burst
-        routed pkts hitting different FIB entries
-        bridged pkts hitting different MAC entries
-verify
-    all packets received correctly
-"""
-
 
 class TestIpIrb(VppTestCase):
-    """ IRB Test Case """
+    """IRB Test Case"""
 
     @classmethod
     def setUpClass(cls):
+        """
+        #. Create BD with MAC learning enabled and put interfaces to this BD.
+        #. Configure IPv4 addresses on loopback interface and routed interface.
+        #. Configure MAC address binding to IPv4 neighbors on loop0.
+        #. Configure MAC address on pg2.
+        #. Loopback BVI interface has remote hosts, one half of hosts are
+           behind pg0 second behind pg1.
+        """
         super(TestIpIrb, cls).setUpClass()
 
         cls.pg_if_packet_sizes = [64, 512, 1518, 9018]  # packet sizes
@@ -58,27 +70,34 @@ class TestIpIrb(VppTestCase):
         cls.vapi.sw_interface_set_l2_bridge(
             cls.pg1.sw_if_index, bd_id=cls.bd_id)
 
+        # Configure IPv4 addresses on loopback interface and routed interface
         cls.loop0.config_ip4()
         cls.pg2.config_ip4()
 
-        # configure MAC address binding to IPv4 neighbors on loop0
+        # Configure MAC address binding to IPv4 neighbors on loop0
         cls.loop0.generate_remote_hosts(cls.remote_hosts_count)
-        cls.loop0.configure_extend_ipv4_mac_binding()
+        cls.loop0.configure_ipv4_neighbors()
         # configure MAC address on pg2
         cls.pg2.resolve_arp()
 
-        # one half of hosts are behind pg0 second behind pg1
+        # Loopback BVI interface has remote hosts, one half of hosts are behind
+        # pg0 second behind pg1
         half = cls.remote_hosts_count // 2
         cls.pg0.remote_hosts = cls.loop0.remote_hosts[:half]
         cls.pg1.remote_hosts = cls.loop0.remote_hosts[half:]
 
     def tearDown(self):
+        """Run standard test teardown and log ``show l2patch``,
+        ``show l2fib verbose``,``show bridge-domain <bd_id> detail``,
+        ``show ip arp``.
+        """
         super(TestIpIrb, self).tearDown()
         if not self.vpp_dead:
-            info(self.vapi.cli("show l2patch"))
-            info(self.vapi.cli("show l2fib verbose"))
-            info(self.vapi.cli("show bridge-domain %s detail" % self.bd_id))
-            info(self.vapi.cli("show ip arp"))
+            self.logger.info(self.vapi.cli("show l2patch"))
+            self.logger.info(self.vapi.cli("show l2fib verbose"))
+            self.logger.info(self.vapi.cli("show bridge-domain %s detail" %
+                                           self.bd_id))
+            self.logger.info(self.vapi.cli("show ip arp"))
 
     def create_stream(self, src_ip_if, dst_ip_if, packet_sizes):
         pkts = []
@@ -200,8 +219,8 @@ class TestIpIrb(VppTestCase):
         """ IPv4 IRB test 1
 
         Test scenario:
-            ip traffic from pg2 interface must ends in both pg0 and pg1
-            - arp entry present in loop0 interface for dst IP
+            - ip traffic from pg2 interface must ends in both pg0 and pg1
+            - arp entry present in loop0 interface for destination IP
             - no l2 entree configured, pg0 and pg1 are same
         """
 
@@ -224,7 +243,7 @@ class TestIpIrb(VppTestCase):
         """ IPv4 IRB test 2
 
         Test scenario:
-            ip traffic from pg0 and pg1 ends on pg2
+            - ip traffic from pg0 and pg1 ends on pg2
         """
 
         stream1 = self.create_stream_l2_to_ip(
diff --git a/test/test_ip6.py b/test/test_ip6.py
index 92bb350d..bff829b7 100644
--- a/test/test_ip6.py
+++ b/test/test_ip6.py
@@ -2,14 +2,13 @@
 
 import unittest
 import socket
-from logging import *
 
 from framework import VppTestCase, VppTestRunner
-from vpp_sub_interface import VppSubInterface, VppDot1QSubint, VppDot1ADSubint
+from vpp_sub_interface import VppSubInterface, VppDot1QSubint
 
 from scapy.packet import Raw
 from scapy.layers.l2 import Ether, Dot1Q
-from scapy.layers.inet6 import ICMPv6ND_NS, IPv6, UDP
+from scapy.layers.inet6 import IPv6, UDP
 
 
 class TestIPv6(VppTestCase):
@@ -20,6 +19,26 @@ class TestIPv6(VppTestCase):
         super(TestIPv6, cls).setUpClass()
 
     def setUp(self):
+        """
+        Perform test setup before test case.
+
+        **Config:**
+            - create 3 pg interfaces
+                - untagged pg0 interface
+                - Dot1Q subinterface on pg1
+                - Dot1AD subinterface on pg2
+            - setup interfaces:
+                - put it into UP state
+                - set IPv6 addresses
+                - resolve neighbor address using NDP
+            - configure 200 fib entries
+
+        :ivar list interfaces: pg interfaces and subinterfaces.
+        :ivar dict flows: IPv4 packet flows in test.
+        :ivar list pg_if_packet_sizes: packet sizes in test.
+
+        *TODO:* Create AD sub interface
+        """
         super(TestIPv6, self).setUp()
 
         # create 3 pg interfaces
@@ -28,8 +47,9 @@ class TestIPv6(VppTestCase):
         # create 2 subinterfaces for p1 and pg2
         self.sub_interfaces = [
             VppDot1QSubint(self, self.pg1, 100),
-            VppDot1QSubint(self, self.pg2, 200)]
+            VppDot1QSubint(self, self.pg2, 200)
             # TODO: VppDot1ADSubint(self, self.pg2, 200, 300, 400)
+        ]
 
         # packet flows mapping pg0 -> pg1.sub, pg2.sub, etc.
         self.flows = dict()
@@ -50,16 +70,26 @@ class TestIPv6(VppTestCase):
             i.config_ip6()
             i.resolve_ndp()
 
-        # config 2M FIB enries
+        # config 2M FIB entries
         self.config_fib_entries(200)
 
     def tearDown(self):
+        """Run standard test teardown and log ``show ip6 neighbors``."""
         super(TestIPv6, self).tearDown()
         if not self.vpp_dead:
-            info(self.vapi.cli("show ip6 neighbors"))
+            self.logger.info(self.vapi.cli("show ip6 neighbors"))
             # info(self.vapi.cli("show ip6 fib"))  # many entries
 
     def config_fib_entries(self, count):
+        """For each interface add to the FIB table *count* routes to
+        "fd02::1/128" destination with interface's local address as next-hop
+        address.
+
+        :param int count: Number of FIB entries.
+
+        - *TODO:* check if the next-hop address shouldn't be remote address
+          instead of local address.
+        """
         n_int = len(self.interfaces)
         percent = 0
         counter = 0.0
@@ -70,13 +100,18 @@ class TestIPv6(VppTestCase):
             for j in range(count / n_int):
                 self.vapi.ip_add_del_route(
                     dest_addr, dest_addr_len, next_hop_address, is_ipv6=1)
-                counter = counter + 1
+                counter += 1
                 if counter / count * 100 > percent:
-                    info("Configure %d FIB entries .. %d%% done" %
+                    self.logger.info("Configure %d FIB entries .. %d%% done" %
                          (count, percent))
-                    percent = percent + 1
+                    percent += 1
 
     def create_stream(self, src_if, packet_sizes):
+        """Create input packet stream for defined interface.
+
+        :param VppInterface src_if: Interface to create packet stream for.
+        :param list packet_sizes: Required packet sizes.
+        """
         pkts = []
         for i in range(0, 257):
             dst_if = self.flows[src_if][i % 2]
@@ -96,7 +131,13 @@ class TestIPv6(VppTestCase):
         return pkts
 
     def verify_capture(self, dst_if, capture):
-        info("Verifying capture on interface %s" % dst_if.name)
+        """Verify captured input packet stream for defined interface.
+
+        :param VppInterface dst_if: Interface to verify captured packet stream
+                                    for.
+        :param list capture: Captured packet stream.
+        """
+        self.logger.info("Verifying capture on interface %s" % dst_if.name)
         last_info = dict()
         for i in self.interfaces:
             last_info[i.sw_if_index] = None
@@ -115,8 +156,8 @@ class TestIPv6(VppTestCase):
                 payload_info = self.payload_to_info(str(packet[Raw]))
                 packet_index = payload_info.index
                 self.assertEqual(payload_info.dst, dst_sw_if_index)
-                debug("Got packet on port %s: src=%u (id=%u)" %
-                      (dst_if.name, payload_info.src, packet_index))
+                self.logger.debug("Got packet on port %s: src=%u (id=%u)" %
+                                  (dst_if.name, payload_info.src, packet_index))
                 next_info = self.get_next_packet_info_for_interface2(
                     payload_info.src, dst_sw_if_index,
                     last_info[payload_info.src])
@@ -130,8 +171,8 @@ class TestIPv6(VppTestCase):
                 self.assertEqual(udp.sport, saved_packet[UDP].sport)
                 self.assertEqual(udp.dport, saved_packet[UDP].dport)
             except:
-                error("Unexpected or invalid packet:")
-                error(packet.show())
+                self.logger.error("Unexpected or invalid packet:")
+                self.logger.error(packet.show())
                 raise
         for i in self.interfaces:
             remaining_packet = self.get_next_packet_info_for_interface2(
@@ -142,7 +183,13 @@ class TestIPv6(VppTestCase):
                 (dst_if.name, i.name))
 
     def test_fib(self):
-        """ IPv6 FIB test """
+        """ IPv6 FIB test
+
+        Test scenario:
+            - Create IPv6 stream for pg0 interface
+            - Create IPv6 tagged streams for pg1's and pg2's subinterface.
+            - Send and verify received packets on each interface.
+        """
 
         pkts = self.create_stream(self.pg0, self.pg_if_packet_sizes)
         self.pg0.add_stream(pkts)
diff --git a/test/vpp_interface.py b/test/vpp_interface.py
index d74248a3..30ef8ae7 100644
--- a/test/vpp_interface.py
+++ b/test/vpp_interface.py
@@ -6,59 +6,57 @@ from util import Host
 
 
 class VppInterface(object):
-    """
-    Generic VPP interface
-    """
+    """Generic VPP interface."""
     __metaclass__ = ABCMeta
 
     @property
     def sw_if_index(self):
-        """Interface index assigned by VPP"""
+        """Interface index assigned by VPP."""
         return self._sw_if_index
 
     @property
     def remote_mac(self):
-        """MAC-address of the remote interface "connected" to this interface"""
+        """MAC-address of the remote interface "connected" to this interface."""
         return self._remote_hosts[0].mac
 
     @property
     def local_mac(self):
-        """MAC-address of the VPP interface"""
+        """MAC-address of the VPP interface."""
         return self._local_mac
 
     @property
     def local_ip4(self):
-        """Local IPv4 address on VPP interface (string)"""
+        """Local IPv4 address on VPP interface (string)."""
         return self._local_ip4
 
     @property
     def local_ip4n(self):
-        """Local IPv4 address - raw, suitable as API parameter"""
+        """Local IPv4 address - raw, suitable as API parameter."""
         return socket.inet_pton(socket.AF_INET, self._local_ip4)
 
     @property
     def remote_ip4(self):
-        """IPv4 address of remote peer "connected" to this interface"""
+        """IPv4 address of remote peer "connected" to this interface."""
         return self._remote_hosts[0].ip4
 
     @property
     def remote_ip4n(self):
-        """IPv4 address of remote peer - raw, suitable as API parameter"""
+        """IPv4 address of remote peer - raw, suitable as API parameter."""
         return socket.inet_pton(socket.AF_INET, self.remote_ip4)
 
     @property
     def local_ip6(self):
-        """Local IPv6 address on VPP interface (string)"""
+        """Local IPv6 address on VPP interface (string)."""
         return self._local_ip6
 
     @property
     def local_ip6n(self):
-        """Local IPv6 address - raw, suitable as API parameter"""
+        """Local IPv6 address - raw, suitable as API parameter."""
         return socket.inet_pton(socket.AF_INET6, self.local_ip6)
 
     @property
     def remote_ip6(self):
-        """IPv6 address of remote peer "connected" to this interface"""
+        """IPv6 address of remote peer "connected" to this interface."""
         return self._remote_hosts[0].ip6
 
     @property
@@ -68,17 +66,17 @@ class VppInterface(object):
 
     @property
     def name(self):
-        """Name of the interface"""
+        """Name of the interface."""
         return self._name
 
     @property
     def dump(self):
-        """Raw result of sw_interface_dump for this interface"""
+        """RAW result of sw_interface_dump for this interface."""
         return self._dump
 
     @property
     def test(self):
-        """Test case creating this interface"""
+        """Test case creating this interface."""
         return self._test
 
     @property
@@ -88,20 +86,44 @@ class VppInterface(object):
 
     @remote_hosts.setter
     def remote_hosts(self, value):
+        """
+        :param list value: List of remote hosts.
+        """
         self._remote_hosts = value
-        #TODO: set hosts_by dicts
+        self._hosts_by_mac = {}
+        self._hosts_by_ip4 = {}
+        self._hosts_by_ip6 = {}
+        for host in self._remote_hosts:
+            self._hosts_by_mac[host.mac] = host
+            self._hosts_by_ip4[host.ip4] = host
+            self._hosts_by_ip6[host.ip6] = host
 
     def host_by_mac(self, mac):
+        """
+        :param ip: MAC address to find host by.
+        :return: Host object assigned to interface.
+        """
         return self._hosts_by_mac[mac]
 
     def host_by_ip4(self, ip):
+        """
+        :param ip: IPv4 address to find host by.
+        :return: Host object assigned to interface.
+        """
         return self._hosts_by_ip4[ip]
 
     def host_by_ip6(self, ip):
+        """
+        :param ip: IPv6 address to find host by.
+        :return: Host object assigned to interface.
+        """
         return self._hosts_by_ip6[ip]
 
     def generate_remote_hosts(self, count=1):
-        """Generate and add remote hosts for the interface."""
+        """Generate and add remote hosts for the interface.
+
+        :param int count: Number of generated remote hosts.
+        """
         self._remote_hosts = []
         self._hosts_by_mac = {}
         self._hosts_by_ip4 = {}
@@ -117,7 +139,7 @@ class VppInterface(object):
             self._hosts_by_ip6[ip6] = host
 
     def post_init_setup(self):
-        """Additional setup run after creating an interface object"""
+        """Additional setup run after creating an interface object."""
 
         self.generate_remote_hosts()
 
@@ -149,21 +171,21 @@ class VppInterface(object):
              (self.__name__, self.remote_mac, self.remote_ip4, self.local_ip4))
 
     def config_ip4(self):
-        """Configure IPv4 address on the VPP interface"""
+        """Configure IPv4 address on the VPP interface."""
         addr = self.local_ip4n
         addr_len = 24
         self.test.vapi.sw_interface_add_del_address(
             self.sw_if_index, addr, addr_len)
 
-    def configure_extend_ipv4_mac_binding(self):
-        """Configure neighbor MAC to IPv4 addresses."""
+    def configure_ipv4_neighbors(self):
+        """For every remote host assign neighbor's MAC to IPv4 addresses."""
         for host in self._remote_hosts:
             macn = host.mac.replace(":", "").decode('hex')
             ipn = host.ip4n
             self.test.vapi.ip_neighbor_add_del(self.sw_if_index, macn, ipn)
 
     def config_ip6(self):
-        """Configure IPv6 address on the VPP interface"""
+        """Configure IPv6 address on the VPP interface."""
         addr = self._local_ip6n
         addr_len = 64
         self.test.vapi.sw_interface_add_del_address(
@@ -171,30 +193,31 @@ class VppInterface(object):
 
     def set_table_ip4(self, table_id):
         """Set the interface in a IPv4 Table.
-        Must be called before configuring IP4 addresses"""
+
+        .. note:: Must be called before configuring IP4 addresses."""
         self.test.vapi.sw_interface_set_table(
             self.sw_if_index, 0, table_id)
 
     def set_table_ip6(self, table_id):
         """Set the interface in a IPv6 Table.
-        Must be called before configuring IP6 addresses"""
+
+        .. note:: Must be called before configuring IP6 addresses.
+        """
         self.test.vapi.sw_interface_set_table(
             self.sw_if_index, 1, table_id)
 
     def disable_ipv6_ra(self):
-        """Configure IPv6 RA suppress on the VPP interface"""
+        """Configure IPv6 RA suppress on the VPP interface."""
         self.test.vapi.sw_interface_ra_suppress(self.sw_if_index)
 
     def admin_up(self):
-        """ Put interface ADMIN-UP """
+        """Put interface ADMIN-UP."""
         self.test.vapi.sw_interface_set_flags(self.sw_if_index, admin_up_down=1)
 
     def add_sub_if(self, sub_if):
-        """
-        Register a sub-interface with this interface
+        """Register a sub-interface with this interface.
 
         :param sub_if: sub-interface
-
         """
         if not hasattr(self, 'sub_if'):
             self.sub_if = sub_if
@@ -205,6 +228,6 @@ class VppInterface(object):
                 self.sub_if = sub_if
 
     def enable_mpls(self):
-        """Enable MPLS on the VPP interface"""
+        """Enable MPLS on the VPP interface."""
         self.test.vapi.sw_interface_enable_disable_mpls(
             self.sw_if_index)
diff --git a/test/vpp_lo_interface.py b/test/vpp_lo_interface.py
index ed9ac725..ef815251 100644
--- a/test/vpp_lo_interface.py
+++ b/test/vpp_lo_interface.py
@@ -3,9 +3,7 @@ from vpp_interface import VppInterface
 
 
 class VppLoInterface(VppInterface):
-    """
-    VPP loopback interface
-    """
+    """VPP loopback interface."""
 
     def __init__(self, test, lo_index):
         """ Create VPP loopback interface """
-- 
cgit 1.2.3-korg


From c21d59fa3354c2a1f7f4510793605104c9348e1c Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Sat, 19 Nov 2016 12:04:34 +0100
Subject: make: call install-dep on unatteded invocation

Change-Id: I7a3c21c47f49b56b6435397e731d4da961ef8ffd
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 4e084d4d..10b210c1 100644
--- a/Makefile
+++ b/Makefile
@@ -118,6 +118,9 @@ help:
 	@echo " DPDK_VERSION = $(DPDK_VERSION)"
 
 $(BR)/.bootstrap.ok:
+ifeq ($(findstring y,$(UNATTENDED)),y)
+	make install-dep
+endif
 ifeq ($(OS_ID),ubuntu)
 	@MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
 	if [ -n "$$MISSING" ] ; then \
@@ -341,6 +344,7 @@ ifeq ($(OS_ID),ubuntu)
 ifeq ($(OS_VERSION_ID),16.04)
 	$(call banner,"Installing dependencies")
 	@sudo -E apt-get update
+	@make install-dep
 	@sudo -E apt-get $(CONFIRM) $(FORCE) install clang
 	$(call banner,"Building for PLATFORM=vpp using clang")
 	@make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
-- 
cgit 1.2.3-korg


From cfce8fa44378cb6843a8e9f5bb6aff8dd5fc5cf7 Mon Sep 17 00:00:00 2001
From: Ed Warnicke <hagbard@gmail.com>
Date: Tue, 22 Nov 2016 17:48:13 +0000
Subject: Added make test to make verify

Change-Id: If5dcfc330a7df69b2c811ce5a8a48c2e0f968270
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 10b210c1..12e8904c 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel
+RPM_DEPENDS += python-devel python-virtualenv
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
@@ -339,12 +339,11 @@ define banner
 	@echo " "
 endef
 
-verify: $(BR)/.bootstrap.ok
+verify: install-dep $(BR)/.bootstrap.ok
 ifeq ($(OS_ID),ubuntu)
 ifeq ($(OS_VERSION_ID),16.04)
 	$(call banner,"Installing dependencies")
 	@sudo -E apt-get update
-	@make install-dep
 	@sudo -E apt-get $(CONFIRM) $(FORCE) install clang
 	$(call banner,"Building for PLATFORM=vpp using clang")
 	@make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
@@ -354,3 +353,4 @@ endif
 	@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
 	$(call banner,"Building for PLATFORM=vpp_lite using gcc")
 	@make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
+	@make test
-- 
cgit 1.2.3-korg


From ddff8a4ee423cf76b14278edee75d5fa369300c0 Mon Sep 17 00:00:00 2001
From: Ed Warnicke <hagbard@gmail.com>
Date: Tue, 22 Nov 2016 17:57:30 +0000
Subject: Have make verify check deb and rpm builds

Change-Id: I7fe3558118835240ecd155609821f9de2d609553
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
---
 Makefile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 12e8904c..f6dcfc2d 100644
--- a/Makefile
+++ b/Makefile
@@ -340,6 +340,11 @@ define banner
 endef
 
 verify: install-dep $(BR)/.bootstrap.ok
+	$(call banner,"Building for PLATFORM=vpp using gcc")
+	@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
+	$(call banner,"Building for PLATFORM=vpp_lite using gcc")
+	@make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
+	@make test
 ifeq ($(OS_ID),ubuntu)
 ifeq ($(OS_VERSION_ID),16.04)
 	$(call banner,"Installing dependencies")
@@ -348,9 +353,10 @@ ifeq ($(OS_VERSION_ID),16.04)
 	$(call banner,"Building for PLATFORM=vpp using clang")
 	@make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
 endif
+	@make pkg-deb
 endif
-	$(call banner,"Building for PLATFORM=vpp using gcc")
-	@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
-	$(call banner,"Building for PLATFORM=vpp_lite using gcc")
-	@make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
-	@make test
+ifeq ($(OS_ID),centos)
+	@make pkg-rpm
+endif
+
+
-- 
cgit 1.2.3-korg


From 31a64e55c20e18b447679779e614ef804b3e0169 Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Wed, 30 Nov 2016 16:53:58 -0600
Subject: Temporarily remove make test

Change-Id: I2b8c3c99f1358c53721790f8c6aefa7123c4959d
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f6dcfc2d..55ecc42b 100644
--- a/Makefile
+++ b/Makefile
@@ -344,7 +344,6 @@ verify: install-dep $(BR)/.bootstrap.ok
 	@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
 	$(call banner,"Building for PLATFORM=vpp_lite using gcc")
 	@make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
-	@make test
 ifeq ($(OS_ID),ubuntu)
 ifeq ($(OS_VERSION_ID),16.04)
 	$(call banner,"Installing dependencies")
-- 
cgit 1.2.3-korg


From 10389371b317da0cf87df383ba8431729f8f8932 Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Wed, 30 Nov 2016 17:45:42 -0600
Subject: Add banner for building deb and rpm packages to verify

Change-Id: I03fd6f32ad720a6a2443c6b350c8890dec579229
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 55ecc42b..24b0af30 100644
--- a/Makefile
+++ b/Makefile
@@ -352,9 +352,11 @@ ifeq ($(OS_VERSION_ID),16.04)
 	$(call banner,"Building for PLATFORM=vpp using clang")
 	@make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
 endif
+	$(call banner,"Building deb packages")
 	@make pkg-deb
 endif
 ifeq ($(OS_ID),centos)
+	$(call banner,"Building rpm packages")
 	@make pkg-rpm
 endif
 
-- 
cgit 1.2.3-korg


From 7e3a875c94b180ef4d9dc99a7fcc8a73c348969b Mon Sep 17 00:00:00 2001
From: Ole Troan <ot@cisco.com>
Date: Mon, 5 Dec 2016 10:27:09 +0100
Subject: API: Adapt make test to Python API changes.

Change the test wrapper script for the updated Python API.
All tests but the L2BD multi instance runs fine.
That is currently skipped.

I see intermittent failures when an MLD message is received
before the ND NA in MPLS and IPV6 FIB tests.

Change-Id: If809877c9abdf596dbb0a419ce5429552f63d212
Signed-off-by: Ole Troan <ot@cisco.com>
---
 Makefile                            |   1 +
 test/test_l2bd_multi_instance.py    |   5 +
 test/vpp_papi_provider.py           | 359 +++++++++++++++++++-----------------
 vpp-api/python/pneum/pneum.c        |   6 +
 vpp-api/python/pneum/pneum.h        |   2 +
 vpp-api/python/vpp_papi/vpp_papi.py |  52 +++++-
 6 files changed, 249 insertions(+), 176 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 24b0af30..d535389a 100644
--- a/Makefile
+++ b/Makefile
@@ -220,6 +220,7 @@ define test
 	  VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
 	  VPP_TEST_API_TEST_BIN=$(BR)/install-$(2)-native/vpp-api-test/bin/vpp_api_test \
 	  VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/plugins/lib64/vpp_plugins \
+	  VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
 	  LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp-api/lib64/ \
 	  WS_ROOT=$(WS_ROOT) V=$(V) TEST=$(TEST) VPP_PYTHON_PREFIX=$(VPP_PYTHON_PREFIX) $(3)
 endef
diff --git a/test/test_l2bd_multi_instance.py b/test/test_l2bd_multi_instance.py
index 5f489ca0..11cd4603 100644
--- a/test/test_l2bd_multi_instance.py
+++ b/test/test_l2bd_multi_instance.py
@@ -405,6 +405,7 @@ class TestL2bdMultiInst(VppTestCase):
             else:
                 self.logger.error("Unknown interface: %s" % pg_if.name)
 
+    @unittest.skip("Crashes VPP")
     def test_l2bd_inst_01(self):
         """ L2BD Multi-instance test 1 - create 5 BDs
         """
@@ -421,6 +422,7 @@ class TestL2bdMultiInst(VppTestCase):
         # self.vapi.cli("clear trace")
         self.run_verify_test()
 
+    @unittest.skip("Crashes VPP")
     def test_l2bd_inst_02(self):
         """ L2BD Multi-instance test 2 - update data of 5 BDs
         """
@@ -447,6 +449,7 @@ class TestL2bdMultiInst(VppTestCase):
         self.verify_bd(self.bd_list[4], learn=False, forward=True,
                        flood=True, uu_flood=True)
 
+    @unittest.skip("Crashes VPP")
     def test_l2bd_inst_03(self):
         """ L2BD Multi-instance 3 - delete 2 BDs
         """
@@ -463,6 +466,7 @@ class TestL2bdMultiInst(VppTestCase):
         # Test 3
         self.run_verify_test()
 
+    @unittest.skip("Crashes VPP")
     def test_l2bd_inst_04(self):
         """ L2BD Multi-instance test 4 - add 2 BDs
         """
@@ -479,6 +483,7 @@ class TestL2bdMultiInst(VppTestCase):
         # self.vapi.cli("clear trace")
         self.run_verify_test()
 
+    @unittest.skip("Crashes VPP")
     def test_l2bd_inst_05(self):
         """ L2BD Multi-instance 5 - delete 5 BDs
         """
diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 51cc20ba..8acfcaa6 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -1,4 +1,4 @@
-import os
+import os, fnmatch
 import array
 from hook import Hook
 
@@ -11,8 +11,7 @@ except:
     pass
 
 if do_import:
-    import vpp_papi
-
+    from vpp_papi import VPP
 
 # from vnet/vnet/mpls/mpls_types.h
 MPLS_IETF_MAX_LABEL = 0xfffff
@@ -21,8 +20,6 @@ MPLS_LABEL_INVALID = MPLS_IETF_MAX_LABEL + 1
 class L2_VTR_OP:
     L2_POP_1 = 3
 
-need_swap = True if os.sys.byteorder == 'little' else False
-
 class VppPapiProvider(object):
     """VPP-api provider using vpp-papi
 
@@ -36,6 +33,14 @@ class VppPapiProvider(object):
         self.name = name
         self.shm_prefix = shm_prefix
         self.test_class = test_class
+        jsonfiles = []
+
+        install_dir=os.getenv('VPP_TEST_INSTALL_PATH')
+        for root, dirnames, filenames in os.walk(install_dir):
+            for filename in fnmatch.filter(filenames, '*.api.json'):
+                jsonfiles.append(os.path.join(root, filename))
+
+        self.papi = VPP(jsonfiles)
 
     def register_hook(self, hook):
         """Replace hook registration with new hook
@@ -47,11 +52,11 @@ class VppPapiProvider(object):
 
     def connect(self):
         """Connect the API to VPP"""
-        vpp_papi.connect(self.name, self.shm_prefix)
+        self.papi.connect(self.name, self.shm_prefix)
 
     def disconnect(self):
         """Disconnect the API from VPP"""
-        vpp_papi.disconnect()
+        self.papi.disconnect()
 
     def api(self, api_fn, api_args, expected_retval=0):
         """Call API function and check it's return value
@@ -64,7 +69,7 @@ class VppPapiProvider(object):
 
         """
         self.hook.before_api(api_fn.__name__, api_args)
-        reply = api_fn(*api_args)
+        reply = api_fn(**api_args)
         if hasattr(reply, 'retval') and reply.retval != expected_retval:
             msg = "API call failed, expected retval == %d, got %s" % (
                 expected_retval, repr(reply))
@@ -83,10 +88,10 @@ class VppPapiProvider(object):
         """
         self.hook.before_cli(cli)
         cli += '\n'
-        r = vpp_papi.cli_inband(len(cli), cli)
+        r = self.papi.cli_inband(length=len(cli), cmd=cli)
         self.hook.after_cli(cli)
         if hasattr(r, 'reply'):
-            return r.reply[0].decode().rstrip('\x00')
+            return r.reply.decode().rstrip('\x00')
 
     def ppcli(self, cli):
         """
@@ -102,7 +107,7 @@ class VppPapiProvider(object):
 
     def show_version(self):
         """ """
-        return vpp_papi.show_version()
+        return self.papi.show_version()
 
     def pg_create_interface(self, pg_index):
         """
@@ -110,7 +115,8 @@ class VppPapiProvider(object):
         :param pg_index:
 
         """
-        return self.api(vpp_papi.pg_create_interface, (pg_index, ))
+        return self.api(self.papi.pg_create_interface,
+                        { "interface_id" : pg_index })
 
     def sw_interface_dump(self, filter=None):
         """
@@ -119,10 +125,10 @@ class VppPapiProvider(object):
 
         """
         if filter is not None:
-            args = (1, filter)
+            args = {"name_filter_valid" : 1, "name_filter" : filter}
         else:
-            args = (0, b'')
-        return self.api(vpp_papi.sw_interface_dump, args)
+            args = {}
+        return self.api(self.papi.sw_interface_dump, args)
 
     def sw_interface_set_table(self, sw_if_index, is_ipv6, table_id):
         """
@@ -133,8 +139,9 @@ class VppPapiProvider(object):
         :param table_id:
 
         """
-        return self.api(vpp_papi.sw_interface_set_table,
-                        (sw_if_index, is_ipv6, table_id))
+        return self.api(self.papi.sw_interface_set_table,
+                        { 'sw_if_index' : sw_if_index, 'is_ipv6' : is_ipv6,
+                          'vrf_id' : table_id})
 
     def sw_interface_add_del_address(self, sw_if_index, addr, addr_len,
                                      is_ipv6=0, is_add=1, del_all=0):
@@ -148,8 +155,13 @@ class VppPapiProvider(object):
         :param del_all:  (Default value = 0)
 
         """
-        return self.api(vpp_papi.sw_interface_add_del_address,
-                        (sw_if_index, is_add, is_ipv6, del_all, addr_len, addr))
+        return self.api(self.papi.sw_interface_add_del_address,
+                        { 'sw_if_index' : sw_if_index,
+                          'is_add' : is_add,
+                          'is_ipv6' : is_ipv6,
+                          'del_all' : del_all,
+                          'address_length' : addr_len,
+                          'address' : addr})
 
     def sw_interface_enable_disable_mpls(self, sw_if_index,
                                          is_enable=1):
@@ -159,29 +171,13 @@ class VppPapiProvider(object):
         :param is_enable:  (Default value = 1)
 
         """
-        return self.api(vpp_papi.sw_interface_set_mpls_enable,
-                        (sw_if_index, is_enable))
+        return self.api(self.papi.sw_interface_set_mpls_enable,
+                        {'sw_if_index' : sw_if_index,
+                         'enable' : is_enable })
 
     def sw_interface_ra_suppress(self, sw_if_index):
-        suppress = 1
-        managed = 0
-        other = 0
-        ll_option = 0
-        send_unicast = 0
-        cease = 0
-        is_no = 0
-        default_router = 0
-        max_interval = 0
-        min_interval = 0
-        lifetime = 0
-        initial_count = 0
-        initial_interval = 0
-        async = False
-        return self.api(vpp_papi.sw_interface_ip6nd_ra_config,
-                        (sw_if_index, suppress, managed, other,
-                         ll_option, send_unicast, cease, is_no,
-                         default_router, max_interval, min_interval,
-                         lifetime, initial_count, initial_interval, async))
+        return self.api(self.papi.sw_interface_ip6nd_ra_config,
+                        {'sw_if_index' : sw_if_index })
 
     def vxlan_add_del_tunnel(
             self,
@@ -205,9 +201,15 @@ class VppPapiProvider(object):
         :param vni:  (Default value = 0)
 
         """
-        return self.api(vpp_papi.vxlan_add_del_tunnel,
-                        (is_add, is_ipv6, src_addr, dst_addr, mcast_sw_if_index,
-			 encap_vrf_id, decap_next_index, vni))
+        return self.api(self.papi.vxlan_add_del_tunnel,
+                        {'is_add' : is_add,
+                         'is_ipv6' : is_ipv6,
+                         'src_address' : src_addr,
+                         'dst_address' : dst_addr,
+                         'mcast_sw_if_index' : mcast_sw_if_index,
+			 'encap_vrf_id' : encap_vrf_id,
+                         'decap_next_index' : decap_next_index,
+                         'vni' : vni})
 
     def bridge_domain_add_del(self, bd_id, flood=1, uu_flood=1, forward=1,
                               learn=1, arp_term=0, is_add=1):
@@ -226,9 +228,14 @@ class VppPapiProvider(object):
             (Default value = 1)
         :param int is_add: Add or delete flag. (Default value = 1)
         """
-        return self.api(vpp_papi.bridge_domain_add_del,
-                        (bd_id, flood, uu_flood, forward, learn, arp_term,
-                         is_add))
+        return self.api(self.papi.bridge_domain_add_del,
+                        { 'bd_id' : bd_id,
+                          'flood' : flood,
+                          'uu_flood' : uu_flood,
+                          'forward' : forward,
+                          'learn' : learn,
+                          'arp_term' : arp_term,
+                          'is_add' : is_add})
 
     def l2fib_add_del(self, mac, bd_id, sw_if_index, is_add=1, static_mac=0,
                       filter_mac=0, bvi_mac=0):
@@ -246,9 +253,14 @@ class VppPapiProvider(object):
         :param int bvi_mac: Set to 1 to create entry that points to BVI
             interface. (Default value = 0)
         """
-        return self.api(vpp_papi.l2fib_add_del,
-                        (self._convert_mac(mac), bd_id, sw_if_index, is_add,
-                         static_mac, filter_mac, bvi_mac))
+        return self.api(self.papi.l2fib_add_del,
+                        { 'mac' : self._convert_mac(mac),
+                          'bd_id' : bd_id,
+                          'sw_if_index' : sw_if_index,
+                          'is_add' : is_add,
+                          'static_mac' : static_mac,
+                          'filter_mac' : filter_mac,
+                          'bvi_mac' : bvi_mac })
 
     def sw_interface_set_l2_bridge(self, sw_if_index, bd_id,
                                    shg=0, bvi=0, enable=1):
@@ -261,8 +273,12 @@ class VppPapiProvider(object):
             (Default value = 0)
         :param int enable: Add or remove interface. (Default value = 1)
         """
-        return self.api(vpp_papi.sw_interface_set_l2_bridge,
-                        (sw_if_index, bd_id, shg, bvi, enable))
+        return self.api(self.papi.sw_interface_set_l2_bridge,
+                        { 'rx_sw_if_index' : sw_if_index,
+                          'bd_id' : bd_id,
+                          'shg' : shg,
+                          'bvi' : bvi,
+                          'enable' : enable })
 
     def bridge_flags(self, bd_id, is_set, feature_bitmap):
         """Enable/disable required feature of the bridge domain with defined ID.
@@ -276,7 +292,10 @@ class VppPapiProvider(object):
             - uu-flood (1 << 3) or
             - arp-term (1 << 4).
         """
-        return self.api(vpp_papi.bridge_flags, (bd_id, is_set, feature_bitmap))
+        return self.api(self.papi.bridge_flags,
+                        {'bd_id' : bd_id,
+                         'is_set' : is_set,
+                         'feature_bitmap' : feature_bitmap })
 
     def bridge_domain_dump(self, bd_id=0):
         """
@@ -285,7 +304,8 @@ class VppPapiProvider(object):
             existing bridge domains returned)
         :return: Dictionary of bridge domain(s) data.
         """
-        return self.api(vpp_papi.bridge_domain_dump, (bd_id, ))
+        return self.api(self.papi.bridge_domain_dump,
+                        {'bd_id' : bd_id })
 
     def sw_interface_set_l2_xconnect(self, rx_sw_if_index, tx_sw_if_index,
                                      enable):
@@ -298,8 +318,10 @@ class VppPapiProvider(object):
             cross-connect if equal to 0.
 
         """
-        return self.api(vpp_papi.sw_interface_set_l2_xconnect,
-                        (rx_sw_if_index, tx_sw_if_index, enable))
+        return self.api(self.papi.sw_interface_set_l2_xconnect,
+                        { 'rx_sw_if_index' : rx_sw_if_index,
+                          'tx_sw_if_index' : tx_sw_if_index,
+                          'enable' : enable })
 
     def sw_interface_set_l2_tag_rewrite(self, sw_if_index, vtr_oper, push=0, tag1=0, tag2=0):
         """L2 interface vlan tag rewrite configure request
@@ -312,8 +334,12 @@ class VppPapiProvider(object):
         :param tag2 - Needed for any push 2 or translate x-2 vtr ops
 
         """
-        return self.api(vpp_papi.l2_interface_vlan_tag_rewrite,
-                        (sw_if_index, vtr_oper, push, tag1, tag2))
+        return self.api(self.papi.l2_interface_vlan_tag_rewrite,
+                        { 'sw_if_index' : sw_if_index,
+                          'vtr_op' : vtr_oper,
+                          'push_dot1q' : push,
+                          'tag1' : tag1,
+                          'tag2' : tag2 })
 
     def sw_interface_set_flags(self, sw_if_index, admin_up_down,
                                link_up_down=0, deleted=0):
@@ -325,8 +351,11 @@ class VppPapiProvider(object):
         :param deleted:  (Default value = 0)
 
         """
-        return self.api(vpp_papi.sw_interface_set_flags,
-                        (sw_if_index, admin_up_down, link_up_down, deleted))
+        return self.api(self.papi.sw_interface_set_flags,
+                        { 'sw_if_index' : sw_if_index,
+                          'admin_up_down' : admin_up_down,
+                          'link_up_down' : link_up_down,
+                          'deleted' : deleted })
 
     def create_subif(self, sw_if_index, sub_id, outer_vlan, inner_vlan,
                      no_tags=0, one_tag=0, two_tags=0, dot1ad=0, exact_match=0,
@@ -349,26 +378,27 @@ class VppPapiProvider(object):
 
         """
         return self.api(
-            vpp_papi.create_subif,
-            (sw_if_index,
-             sub_id,
-             no_tags,
-             one_tag,
-             two_tags,
-             dot1ad,
-             exact_match,
-             default_sub,
-             outer_vlan_id_any,
-             inner_vlan_id_any,
-             outer_vlan,
-             inner_vlan))
+            self.papi.create_subif,
+            { 'sw_if_index' : sw_if_index,
+              'sub_id' : sub_id,
+              'no_tags' : no_tags,
+              'one_tag' : one_tag,
+              'two_tags' : two_tags,
+              'dot1ad' : dot1ad,
+              'exact_match' : exact_match,
+              'default_sub' : default_sub,
+              'outer_vlan_id_any' : outer_vlan_id_any,
+              'inner_vlan_id_any' : inner_vlan_id_any,
+              'outer_vlan_id' : outer_vlan,
+              'inner_vlan_id' : inner_vlan })
 
     def delete_subif(self, sw_if_index):
         """Delete subinterface
 
         :param sw_if_index:
         """
-        return self.api(vpp_papi.delete_subif, ([sw_if_index]))
+        return self.api(self.papi.delete_subif,
+                        { 'sw_if_index' : sw_if_index })
 
     def create_vlan_subif(self, sw_if_index, vlan):
         """
@@ -377,14 +407,17 @@ class VppPapiProvider(object):
         :param sw_if_index:
 
         """
-        return self.api(vpp_papi.create_vlan_subif, (sw_if_index, vlan))
+        return self.api(self.papi.create_vlan_subif,
+                        {'sw_if_index' : sw_if_index,
+                         'vlan_id' : vlan })
 
     def create_loopback(self, mac=''):
         """
 
         :param mac: (Optional)
         """
-        return self.api(vpp_papi.create_loopback, (mac,))
+        return self.api(self.papi.create_loopback,
+                        { 'mac_address' : mac })
 
     def ip_add_del_route(
             self,
@@ -434,36 +467,32 @@ class VppPapiProvider(object):
         :param next_hop_weight:  (Default value = 1)
 
         """
-        stack = array.array('I', next_hop_out_label_stack)
-        if need_swap:
-            stack.byteswap()
-        stack = stack.tostring()
 
         return self.api(
-            vpp_papi.ip_add_del_route,
-            (next_hop_sw_if_index,
-             table_id,
-             classify_table_index,
-             next_hop_table_id,
-             create_vrf_if_needed,
-             is_add,
-             is_drop,
-             is_unreach,
-             is_prohibit,
-             is_ipv6,
-             is_local,
-             is_classify,
-             is_multipath,
-             is_resolve_host,
-             is_resolve_attached,
-             not_last,
-             next_hop_weight,
-             dst_address_length,
-             dst_address,
-             next_hop_address,
-             next_hop_n_out_labels,
-             next_hop_via_label,
-             stack))
+            self.papi.ip_add_del_route,
+            { 'next_hop_sw_if_index' : next_hop_sw_if_index,
+              'table_id' : table_id,
+              'classify_table_index' : classify_table_index,
+              'next_hop_table_id' : next_hop_table_id,
+              'create_vrf_if_needed' : create_vrf_if_needed,
+              'is_add' : is_add,
+              'is_drop' : is_drop,
+              'is_unreach' : is_unreach,
+              'is_prohibit' : is_prohibit,
+              'is_ipv6' : is_ipv6,
+              'is_local' : is_local,
+              'is_classify' : is_classify,
+              'is_multipath' : is_multipath,
+              'is_resolve_host' : is_resolve_host,
+              'is_resolve_attached' : is_resolve_attached,
+              'not_last' : not_last,
+              'next_hop_weight' : next_hop_weight,
+              'dst_address_length' : dst_address_length,
+              'dst_address' : dst_address,
+              'next_hop_address' : next_hop_address,
+              'next_hop_n_out_labels' : next_hop_n_out_labels,
+              'next_hop_via_label' : next_hop_via_label,
+              'next_hop_out_label_stack' : next_hop_out_label_stack })
 
     def ip_neighbor_add_del(self,
                             sw_if_index,
@@ -486,15 +515,15 @@ class VppPapiProvider(object):
         """
 
         return self.api(
-            vpp_papi.ip_neighbor_add_del,
-            (vrf_id,
-             sw_if_index,
-             is_add,
-             is_ipv6,
-             is_static,
-             mac_address,
-             dst_address
-             )
+            self.papi.ip_neighbor_add_del,
+            { 'vrf_id' : vrf_id,
+              'sw_if_index' : sw_if_index,
+              'is_add' : is_add,
+              'is_ipv6' : is_ipv6,
+              'is_static' : is_static,
+              'mac_address' : mac_address,
+              'dst_address' : dst_address
+             }
         )
 
     def sw_interface_span_enable_disable(
@@ -506,7 +535,10 @@ class VppPapiProvider(object):
         :param enable
 
         """
-        return self.api(vpp_papi.sw_interface_span_enable_disable, (sw_if_index_from, sw_if_index_to, enable ))
+        return self.api(self.papi.sw_interface_span_enable_disable,
+                        { 'sw_if_index_from' : sw_if_index_from,
+                          'sw_if_index_to' : sw_if_index_to,
+                          'enable' : enable })
 
     def gre_tunnel_add_del(self,
                            src_address,
@@ -526,13 +558,13 @@ class VppPapiProvider(object):
         """
 
         return self.api(
-            vpp_papi.gre_add_del_tunnel,
-            (is_add,
-             is_ip6,
-             is_teb,
-             src_address,
-             dst_address,
-             outer_fib_id)
+            self.papi.gre_add_del_tunnel,
+            { 'is_add' : is_add,
+              'is_ipv6' : is_ip6,
+              'teb' : is_teb,
+              'src_address' : src_address,
+              'dst_address' : dst_address,
+              'outer_fib_id' : outer_fib_id }
         )
 
     def mpls_route_add_del(
@@ -580,31 +612,27 @@ class VppPapiProvider(object):
         :param next_hop_weight:  (Default value = 1)
 
         """
-        stack = array.array('I', next_hop_out_label_stack)
-        if need_swap:
-            stack.byteswap()
-        stack = stack.tostring()
 
         return self.api(
-            vpp_papi.mpls_route_add_del,
-            (label,
-             eos,
-             table_id,
-             classify_table_index,
-             create_vrf_if_needed,
-             is_add,
-             is_classify,
-             is_multipath,
-             is_resolve_host,
-             is_resolve_attached,
-             next_hop_proto_is_ip4,
-             next_hop_weight,
-             next_hop_address,
-             next_hop_n_out_labels,
-             next_hop_sw_if_index,
-             next_hop_table_id,
-             next_hop_via_label,
-             stack))
+            self.papi.mpls_route_add_del,
+            { 'mr_label' : label,
+              'mr_eos' : eos,
+              'mr_table_id' : table_id,
+              'mr_classify_table_index' : classify_table_index,
+              'mr_create_table_if_needed' : create_vrf_if_needed,
+              'mr_is_add' : is_add,
+              'mr_is_classify' : is_classify,
+              'mr_is_multipath' : is_multipath,
+              'mr_is_resolve_host' : is_resolve_host,
+              'mr_is_resolve_attached' : is_resolve_attached,
+              'mr_next_hop_proto_is_ip4' : next_hop_proto_is_ip4,
+              'mr_next_hop_weight' : next_hop_weight,
+              'mr_next_hop' : next_hop_address,
+              'mr_next_hop_n_out_labels' : next_hop_n_out_labels,
+              'mr_next_hop_sw_if_index' : next_hop_sw_if_index,
+              'mr_next_hop_table_id' : next_hop_table_id,
+              'mr_next_hop_via_label' : next_hop_via_label,
+              'mr_next_hop_out_label_stack' : next_hop_out_label_stack })
 
     def mpls_ip_bind_unbind(
             self,
@@ -619,15 +647,15 @@ class VppPapiProvider(object):
         """
         """
         return self.api(
-            vpp_papi.mpls_ip_bind_unbind,
-            (table_id,
-             label,
-             ip_table_id,
-             create_vrf_if_needed,
-             is_bind,
-             is_ip4,
-             dst_address_length,
-             dst_address))
+            self.papi.mpls_ip_bind_unbind,
+            {'mb_mpls_table_id' : table_id,
+             'mb_label' : label,
+             'mb_ip_table_id' : ip_table_id,
+             'mb_create_table_if_needed' : create_vrf_if_needed,
+             'mb_is_bind' : is_bind,
+             'mb_is_ip4' : is_ip4,
+             'mb_address_length' : dst_address_length,
+             'mb_address' : dst_address})
 
     def mpls_tunnel_add_del(
             self,
@@ -666,23 +694,18 @@ class VppPapiProvider(object):
         :param next_hop_weight:  (Default value = 1)
 
         """
-        stack = array.array('I', next_hop_out_label_stack)
-        if need_swap:
-            stack.byteswap()
-        stack = stack.tostring()
-
         return self.api(
-            vpp_papi.mpls_tunnel_add_del,
-            (tun_sw_if_index,
-             is_add,
-             l2_only,
-             next_hop_proto_is_ip4,
-             next_hop_weight,
-             next_hop_address,
-             next_hop_n_out_labels,
-             next_hop_sw_if_index,
-             next_hop_table_id,
-             stack))
+            self.papi.mpls_tunnel_add_del,
+            {'mt_sw_if_index' : tun_sw_if_index,
+              'mt_is_add' : is_add,
+              'mt_l2_only' : l2_only,
+              'mt_next_hop_proto_is_ip4' : next_hop_proto_is_ip4,
+              'mt_next_hop_weight' : next_hop_weight,
+              'mt_next_hop' : next_hop_address,
+              'mt_next_hop_n_out_labels' : next_hop_n_out_labels,
+              'mt_next_hop_sw_if_index' :next_hop_sw_if_index,
+              'mt_next_hop_table_id' : next_hop_table_id,
+              'mt_next_hop_out_label_stack' : next_hop_out_label_stack })
 
         return self.api(vpp_papi.sw_interface_span_enable_disable,
                         (sw_if_index_from, sw_if_index_to, enable))
diff --git a/vpp-api/python/pneum/pneum.c b/vpp-api/python/pneum/pneum.c
index 3b545530..39fdf260 100644
--- a/vpp-api/python/pneum/pneum.c
+++ b/vpp-api/python/pneum/pneum.c
@@ -248,3 +248,9 @@ pneum_write (char *p, int l)
   }
   return (rv);
 }
+
+uint32_t
+pneum_get_msg_index (unsigned char * name)
+{
+  return vl_api_get_msg_index (name);
+}
diff --git a/vpp-api/python/pneum/pneum.h b/vpp-api/python/pneum/pneum.h
index 00585eb7..a347bd25 100644
--- a/vpp-api/python/pneum/pneum.h
+++ b/vpp-api/python/pneum/pneum.h
@@ -15,6 +15,7 @@
 #ifndef included_pneum_h
 #define included_pneum_h
 
+#include <stdint.h>
 #include <vppinfra/types.h>
 
 typedef void (*pneum_callback_t)(unsigned char * data, int len);
@@ -25,5 +26,6 @@ int pneum_write(char *data, int len);
 void pneum_free(void * msg);
 uword * pneum_msg_table_get_hash (void);
 int pneum_msg_table_size(void);
+uint32_t pneum_get_msg_index(unsigned char * name);
 
 #endif
diff --git a/vpp-api/python/vpp_papi/vpp_papi.py b/vpp-api/python/vpp_papi/vpp_papi.py
index f4b0aa17..ffe159fd 100644
--- a/vpp-api/python/vpp_papi/vpp_papi.py
+++ b/vpp-api/python/vpp_papi/vpp_papi.py
@@ -110,6 +110,11 @@ class VPP():
     def __struct_type_encode(self, msgdef, buf, offset, kwargs):
         off = offset
         size = 0
+
+        for k in kwargs:
+            if k not in msgdef['args']:
+                raise ValueError(1, 'Invalid field-name in message call ' + k)
+
         for k,v in msgdef['args'].iteritems():
             off += size
             if k in kwargs:
@@ -143,7 +148,7 @@ class VPP():
                         v.pack_into(buf, off, kwargs[k])
                         size = v.size
             else:
-                size = v.size
+                size = v.size if not type(v) is list else 0
 
         return off + size - offset
 
@@ -262,7 +267,6 @@ class VPP():
     def _load_dictionary(self):
         self.vpp_dictionary = {}
         self.vpp_dictionary_maxid = 0
-
         d = vpp_api.msg_table()
 
         if not d:
@@ -273,14 +277,16 @@ class VPP():
             self.vpp_dictionary[name] = { 'id' : i, 'crc' : crc }
             self.vpp_dictionary_maxid = max(self.vpp_dictionary_maxid, i)
 
-    def connect(self, name, chroot_prefix = None):
+    def connect(self, name, chroot_prefix = None, async = False):
+        msg_handler = self.msg_handler if not async else self.msg_handler_async
         if not chroot_prefix:
-            rv = vpp_api.connect(name, self.msg_handler)
+            rv = vpp_api.connect(name, msg_handler)
         else:
-            rv = vpp_api.connect(name, self.msg_handler, chroot_prefix)
+            rv = vpp_api.connect(name, msg_handler, chroot_prefix)
 
         if rv != 0:
             raise IOError(2, 'Connect failed')
+        self.connected = True
 
         self._load_dictionary()
         self._register_functions()
@@ -289,8 +295,6 @@ class VPP():
         self.control_ping_index = self.vpp_dictionary['control_ping']['id']
         self.control_ping_msgdef = self.messages['control_ping']
 
-        self.connected = True
-
     def disconnect(self):
         rv = vpp_api.disconnect()
         return rv
@@ -348,7 +352,7 @@ class VPP():
             return
 
         if not context in self.results:
-            eprint('Not expecting results for this context', context)
+            eprint('Not expecting results for this context', context, r)
             return
 
         if 'm' in self.results[context]:
@@ -358,6 +362,27 @@ class VPP():
         self.results[context]['r'] = r
         self.results[context]['e'].set()
 
+    def msg_handler_async(self, msg):
+        if not msg:
+            eprint('vpp_api.read failed')
+            return
+
+        i, ci = self.header.unpack_from(msg, 0)
+        if self.id_names[i] == 'rx_thread_exit':
+            return;
+
+        #
+        # Decode message and returns a tuple.
+        #
+        msgdef = self.id_msgdef[i]
+        if not msgdef:
+            raise IOError(2, 'Reply message undefined')
+
+        r = self.decode(msgdef, msg)
+        msgname = type(r).__name__
+
+        self.event_callback(msgname, r)
+
     def _control_ping(self, context):
         self._write(self.encode(self.control_ping_msgdef,
                         { '_vl_msg_id' : self.control_ping_index,
@@ -385,6 +410,17 @@ class VPP():
         self.results_clean(context)
         return r
 
+    def _call_vpp_async(self, i, msgdef, multipart, **kwargs):
+        if not 'context' in kwargs:
+            context = self.get_context()
+            kwargs['context'] = context
+        else:
+            context = kwargs['context']
+        kwargs['_vl_msg_id'] = i
+        b = self.encode(msgdef, kwargs)
+
+        self._write(b)
+
     def register_event_callback(self, callback):
         self.event_callback = callback
 
-- 
cgit 1.2.3-korg


From 0e3c0de1ed87f3cdf16e26e05e39ea6eebeafb18 Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Thu, 29 Sep 2016 14:43:44 +0200
Subject: BFD: basic asynchronous session up/down

This is a work-in-progress basic BFD session handling. Only
asynchronous mode is supported at the moment. Setting the session flags
doesn't work.

Change-Id: Idba27f721b5c35be5a66a6d202a63d23ff7ecf6f
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 Makefile                             |   2 +
 test/bfd.py                          | 216 ++++++++
 test/framework.py                    |  28 ++
 test/hook.py                         |  20 +-
 test/template_bd.py                  |   3 +-
 test/test_bfd.py                     | 273 +++++++++++
 test/util.py                         |  22 +
 test/vpp_object.py                   |  79 +++
 test/vpp_papi_provider.py            | 435 +++++++++-------
 test/vpp_pg_interface.py             |  40 +-
 vlib-api/vlibapi/api_helper_macros.h |   3 +-
 vnet/Makefile.am                     |  16 +
 vnet/vnet/api_errno.h                |   4 +-
 vnet/vnet/bfd/bfd_api.h              |  46 ++
 vnet/vnet/bfd/bfd_debug.h            |  80 +++
 vnet/vnet/bfd/bfd_doc.md             |   1 +
 vnet/vnet/bfd/bfd_main.c             | 928 +++++++++++++++++++++++++++++++++++
 vnet/vnet/bfd/bfd_main.h             | 218 ++++++++
 vnet/vnet/bfd/bfd_protocol.c         |  74 +++
 vnet/vnet/bfd/bfd_protocol.h         | 154 ++++++
 vnet/vnet/bfd/bfd_udp.c              | 610 +++++++++++++++++++++++
 vnet/vnet/bfd/bfd_udp.h              |  56 +++
 vnet/vnet/bfd/dir.dox                |  18 +
 vnet/vnet/buffer.h                   |   4 +
 vnet/vnet/ip/ip4_forward.c           |  12 +-
 vnet/vnet/ip/udp.h                   |   2 +
 vpp/vpp-api/api.c                    | 168 ++++++-
 vpp/vpp-api/vpe.api                  | 185 +++++++
 vppinfra/vppinfra/mhash.c            |   4 +-
 vppinfra/vppinfra/mhash.h            |   4 +-
 30 files changed, 3504 insertions(+), 201 deletions(-)
 create mode 100644 test/bfd.py
 create mode 100644 test/test_bfd.py
 create mode 100644 test/vpp_object.py
 create mode 100644 vnet/vnet/bfd/bfd_api.h
 create mode 100644 vnet/vnet/bfd/bfd_debug.h
 create mode 100644 vnet/vnet/bfd/bfd_doc.md
 create mode 100644 vnet/vnet/bfd/bfd_main.c
 create mode 100644 vnet/vnet/bfd/bfd_main.h
 create mode 100644 vnet/vnet/bfd/bfd_protocol.c
 create mode 100644 vnet/vnet/bfd/bfd_protocol.h
 create mode 100644 vnet/vnet/bfd/bfd_udp.c
 create mode 100644 vnet/vnet/bfd/bfd_udp.h
 create mode 100644 vnet/vnet/bfd/dir.dox

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d535389a..00699a76 100644
--- a/Makefile
+++ b/Makefile
@@ -214,6 +214,8 @@ build-vpp-api: $(BR)/.bootstrap.ok
 
 VPP_PYTHON_PREFIX=$(BR)/python
 
+
+	#$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install ,)
 define test
 	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-api-install plugins-install vpp-install,)
 	make -C test \
diff --git a/test/bfd.py b/test/bfd.py
new file mode 100644
index 00000000..beacd80f
--- /dev/null
+++ b/test/bfd.py
@@ -0,0 +1,216 @@
+from socket import AF_INET, AF_INET6
+from scapy.all import *
+from scapy.packet import *
+from scapy.fields import *
+from framework import *
+from vpp_object import *
+from util import NumericConstant
+
+
+class BFDDiagCode(NumericConstant):
+    """ BFD Diagnostic Code """
+    no_diagnostic = 0
+    control_detection_time_expired = 1
+    echo_function_failed = 2
+    neighbor_signaled_session_down = 3
+    forwarding_plane_reset = 4
+    path_down = 5
+    concatenated_path_down = 6
+    administratively_down = 7
+    reverse_concatenated_path_down = 8
+
+    desc_dict = {
+        no_diagnostic: "No diagnostic",
+        control_detection_time_expired: "Control Detection Time Expired",
+        echo_function_failed: "Echo Function Failed",
+        neighbor_signaled_session_down: "Neighbor Signaled Session Down",
+        forwarding_plane_reset: "Forwarding Plane Reset",
+        path_down: "Path Down",
+        concatenated_path_down: "Concatenated Path Down",
+        administratively_down: "Administratively Down",
+        reverse_concatenated_path_down: "Reverse Concatenated Path Down",
+    }
+
+    def __init__(self, value):
+        NumericConstant.__init__(self, value)
+
+
+class BFDState(NumericConstant):
+    """ BFD State """
+    admin_down = 0
+    down = 1
+    init = 2
+    up = 3
+
+    desc_dict = {
+        admin_down: "AdminDown",
+        down: "Down",
+        init: "Init",
+        up: "Up",
+    }
+
+    def __init__(self, value):
+        NumericConstant.__init__(self, value)
+
+
+class BFD(Packet):
+
+    udp_dport = 3784  #: BFD destination port per RFC 5881
+    udp_sport_min = 49152  #: BFD source port min value per RFC 5881
+    udp_sport_max = 65535  #: BFD source port max value per RFC 5881
+
+    name = "BFD"
+
+    fields_desc = [
+        BitField("version", 1, 3),
+        BitEnumField("diag", 0, 5, BFDDiagCode.desc_dict),
+        BitEnumField("state", 0, 2, BFDState.desc_dict),
+        FlagsField("flags", 0, 6, ['P', 'F', 'C', 'A', 'D', 'M']),
+        XByteField("detect_mult", 0),
+        XByteField("length", 24),
+        BitField("my_discriminator", 0, 32),
+        BitField("your_discriminator", 0, 32),
+        BitField("desired_min_tx_interval", 0, 32),
+        BitField("required_min_rx_interval", 0, 32),
+        BitField("required_min_echo_rx_interval", 0, 32)]
+
+    def mysummary(self):
+        return self.sprintf("BFD(my_disc=%BFD.my_discriminator%,"
+                            "your_disc=%BFD.your_discriminator%)")
+
+# glue the BFD packet class to scapy parser
+bind_layers(UDP, BFD, dport=BFD.udp_dport)
+
+
+class VppBFDUDPSession(VppObject):
+    """ Represents BFD UDP session in VPP """
+
+    @property
+    def test(self):
+        """ Test which created this session """
+        return self._test
+
+    @property
+    def interface(self):
+        """ Interface on which this session lives """
+        return self._interface
+
+    @property
+    def af(self):
+        """ Address family - AF_INET or AF_INET6 """
+        return self._af
+
+    @property
+    def bs_index(self):
+        """ BFD session index from VPP """
+        if self._bs_index is not None:
+            return self._bs_index
+        raise NotConfiguredException("not configured")
+
+    @property
+    def local_addr(self):
+        """ BFD session local address (VPP address) """
+        if self._local_addr is None:
+            return self._interface.local_ip4
+        return self._local_addr
+
+    @property
+    def local_addr_n(self):
+        """ BFD session local address (VPP address) - raw, suitable for API """
+        if self._local_addr is None:
+            return self._interface.local_ip4n
+        return self._local_addr_n
+
+    @property
+    def peer_addr(self):
+        """ BFD session peer address """
+        return self._peer_addr
+
+    @property
+    def peer_addr_n(self):
+        """ BFD session peer address - raw, suitable for API """
+        return self._peer_addr_n
+
+    @property
+    def state(self):
+        """ BFD session state """
+        result = self.test.vapi.bfd_udp_session_dump()
+        session = None
+        for s in result:
+            if s.sw_if_index == self.interface.sw_if_index:
+                if self.af == AF_INET \
+                        and s.is_ipv6 == 0 \
+                        and self.interface.local_ip4n == s.local_addr[:4] \
+                        and self.interface.remote_ip4n == s.peer_addr[:4]:
+                    session = s
+                    break
+        if session is None:
+            raise Exception(
+                "Could not find BFD session in VPP response: %s" % repr(result))
+        return session.state
+
+    @property
+    def desired_min_tx(self):
+        return self._desired_min_tx
+
+    @property
+    def required_min_rx(self):
+        return self._required_min_rx
+
+    @property
+    def detect_mult(self):
+        return self._detect_mult
+
+    def __init__(self, test, interface, peer_addr, local_addr=None, af=AF_INET):
+        self._test = test
+        self._interface = interface
+        self._af = af
+        self._local_addr = local_addr
+        self._peer_addr = peer_addr
+        self._peer_addr_n = socket.inet_pton(af, peer_addr)
+        self._bs_index = None
+        self._desired_min_tx = 200000  # 0.2s
+        self._required_min_rx = 200000  # 0.2s
+        self._detect_mult = 3  # 3 packets need to be missed
+
+    def add_vpp_config(self):
+        is_ipv6 = 1 if AF_INET6 == self.af else 0
+        result = self.test.vapi.bfd_udp_add(
+            self._interface.sw_if_index,
+            self.desired_min_tx,
+            self.required_min_rx,
+            self.detect_mult,
+            self.local_addr_n,
+            self.peer_addr_n,
+            is_ipv6=is_ipv6)
+        self._bs_index = result.bs_index
+
+    def query_vpp_config(self):
+        result = self.test.vapi.bfd_udp_session_dump()
+        session = None
+        for s in result:
+            if s.sw_if_index == self.interface.sw_if_index:
+                if self.af == AF_INET \
+                        and s.is_ipv6 == 0 \
+                        and self.interface.local_ip4n == s.local_addr[:4] \
+                        and self.interface.remote_ip4n == s.peer_addr[:4]:
+                    session = s
+                    break
+        if session is None:
+            return False
+        return True
+
+    def remove_vpp_config(self):
+        if hasattr(self, '_bs_index'):
+            is_ipv6 = 1 if AF_INET6 == self._af else 0
+            self.test.vapi.bfd_udp_del(
+                self._interface.sw_if_index,
+                self.local_addr_n,
+                self.peer_addr_n,
+                is_ipv6=is_ipv6)
+
+    def object_id(self):
+        return "bfd-udp-%d" % self.bs_index
+
+    def admin_up(self):
+        self.test.vapi.bfd_session_set_flags(self.bs_index, 1)
diff --git a/test/framework.py b/test/framework.py
index b3cbb08a..aa4f2fdf 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -462,6 +462,34 @@ class VppTestCase(unittest.TestCase):
             if info.dst == dst_index:
                 return info
 
+    def assert_equal(self, real_value, expected_value, name_or_class=None):
+        if name_or_class is None:
+            self.assertEqual(real_value, expected_value, msg)
+            return
+        try:
+            msg = "Invalid %s: %d('%s') does not match expected value %d('%s')"
+            msg = msg % (getdoc(name_or_class).strip(),
+                         real_value, str(name_or_class(real_value)),
+                         expected_value, str(name_or_class(expected_value)))
+        except:
+            msg = "Invalid %s: %s does not match expected value %s" % (
+                name_or_class, real_value, expected_value)
+
+        self.assertEqual(real_value, expected_value, msg)
+
+    def assert_in_range(
+            self,
+            real_value,
+            expected_min,
+            expected_max,
+            name=None):
+        if name is None:
+            msg = None
+        else:
+            msg = "Invalid %s: %s out of range <%s,%s>" % (
+                name, real_value, expected_min, expected_max)
+        self.assertTrue(expected_min <= real_value <= expected_max, msg)
+
 
 class VppTestResult(unittest.TestResult):
     """
diff --git a/test/hook.py b/test/hook.py
index 90e9bbf5..f3e5f880 100644
--- a/test/hook.py
+++ b/test/hook.py
@@ -100,9 +100,13 @@ class PollHook(Hook):
             signaldict = dict(
                 (k, v) for v, k in reversed(sorted(signal.__dict__.items()))
                 if v.startswith('SIG') and not v.startswith('SIG_'))
+
+            if self.testcase.vpp.returncode in signaldict:
+                s = signaldict[abs(self.testcase.vpp.returncode)]
+            else:
+                s = "unknown"
             msg = "VPP subprocess died unexpectedly with returncode %d [%s]" % (
-                self.testcase.vpp.returncode,
-                signaldict[abs(self.testcase.vpp.returncode)])
+                self.testcase.vpp.returncode, s)
             self.logger.critical(msg)
             core_path = self.testcase.tempdir + '/core'
             if os.path.isfile(core_path):
@@ -110,27 +114,27 @@ class PollHook(Hook):
             self.testcase.vpp_dead = True
             raise VppDiedError(msg)
 
-    def after_api(self, api_name, api_args):
+    def before_api(self, api_name, api_args):
         """
-        Check if VPP died after executing an API
+        Check if VPP died before executing an API
 
         :param api_name: name of the API
         :param api_args: tuple containing the API arguments
         :raises VppDiedError: exception if VPP is not running anymore
 
         """
-        super(PollHook, self).after_api(api_name, api_args)
+        super(PollHook, self).before_api(api_name, api_args)
         self.poll_vpp()
 
-    def after_cli(self, cli):
+    def before_cli(self, cli):
         """
-        Check if VPP died after executing a CLI
+        Check if VPP died before executing a CLI
 
         :param cli: CLI string
         :raises Exception: exception if VPP is not running anymore
 
         """
-        super(PollHook, self).after_cli(cli)
+        super(PollHook, self).before_cli(cli)
         self.poll_vpp()
 
 
diff --git a/test/template_bd.py b/test/template_bd.py
index 6c6fb3da..01e8b855 100644
--- a/test/template_bd.py
+++ b/test/template_bd.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from abc import abstractmethod
+from abc import abstractmethod, ABCMeta
 
 from scapy.layers.l2 import Ether, Raw
 from scapy.layers.inet import IP, UDP
@@ -8,6 +8,7 @@ from scapy.layers.inet import IP, UDP
 
 class BridgeDomain(object):
     """ Bridge domain abstraction """
+    __metaclass__ = ABCMeta
 
     @property
     def frame_pg0_to_pg1(self):
diff --git a/test/test_bfd.py b/test/test_bfd.py
new file mode 100644
index 00000000..20d3aea5
--- /dev/null
+++ b/test/test_bfd.py
@@ -0,0 +1,273 @@
+#!/usr/bin/env python
+
+import unittest
+import time
+from random import randint
+from bfd import *
+from framework import *
+from util import ppp
+
+
+class BFDCLITestCase(VppTestCase):
+    """Bidirectional Forwarding Detection (BFD) - CLI"""
+
+    @classmethod
+    def setUpClass(cls):
+        super(BFDCLITestCase, cls).setUpClass()
+
+        try:
+            cls.create_pg_interfaces([0])
+            cls.pg0.config_ip4()
+            cls.pg0.resolve_arp()
+
+        except Exception:
+            super(BFDCLITestCase, cls).tearDownClass()
+            raise
+
+    def test_add_bfd(self):
+        """ create a BFD session """
+        session = VppBFDUDPSession(self, self.pg0, self.pg0.remote_ip4)
+        session.add_vpp_config()
+        self.logger.debug("Session state is %s" % str(session.state))
+        session.remove_vpp_config()
+        session = VppBFDUDPSession(self, self.pg0, self.pg0.remote_ip4)
+        session.add_vpp_config()
+        self.logger.debug("Session state is %s" % str(session.state))
+        session.remove_vpp_config()
+
+    def test_double_add(self):
+        """ create the same BFD session twice (negative case) """
+        session = VppBFDUDPSession(self, self.pg0, self.pg0.remote_ip4)
+        session.add_vpp_config()
+        try:
+            session.add_vpp_config()
+        except:
+            session.remove_vpp_config()
+            return
+        session.remove_vpp_config()
+        raise Exception("Expected failure while adding duplicate "
+                        "configuration")
+
+
+def create_packet(interface, ttl=255, src_port=50000, **kwargs):
+    p = (Ether(src=interface.remote_mac, dst=interface.local_mac) /
+         IP(src=interface.remote_ip4, dst=interface.local_ip4, ttl=ttl) /
+         UDP(sport=src_port, dport=BFD.udp_dport) /
+         BFD(*kwargs))
+    return p
+
+
+def verify_ip(test, packet, local_ip, remote_ip):
+    """ Verify correctness of IP layer. """
+    ip = packet[IP]
+    test.assert_equal(ip.src, local_ip, "IP source address")
+    test.assert_equal(ip.dst, remote_ip, "IP destination address")
+    test.assert_equal(ip.ttl, 255, "IP TTL")
+
+
+def verify_udp(test, packet):
+    """ Verify correctness of UDP layer. """
+    udp = packet[UDP]
+    test.assert_equal(udp.dport, BFD.udp_dport, "UDP destination port")
+    test.assert_in_range(udp.sport, BFD.udp_sport_min, BFD.udp_sport_max,
+                         "UDP source port")
+
+
+class BFDTestSession(object):
+
+    def __init__(self, test, interface, detect_mult=3):
+        self.test = test
+        self.interface = interface
+        self.bfd_values = {
+            'my_discriminator': 0,
+            'desired_min_tx_interval': 500000,
+            'detect_mult': detect_mult,
+            'diag': BFDDiagCode.no_diagnostic,
+        }
+
+    def update(self, **kwargs):
+        self.bfd_values.update(kwargs)
+
+    def create_packet(self):
+        packet = create_packet(self.interface)
+        for name, value in self.bfd_values.iteritems():
+            packet[BFD].setfieldval(name, value)
+        return packet
+
+    def send_packet(self):
+        p = self.create_packet()
+        self.test.logger.debug(ppp("Sending packet:", p))
+        self.test.pg0.add_stream([p])
+        self.test.pg_start()
+
+    def verify_packet(self, packet):
+        """ Verify correctness of BFD layer. """
+        bfd = packet[BFD]
+        self.test.assert_equal(bfd.version, 1, "BFD version")
+        self.test.assert_equal(bfd.your_discriminator,
+                               self.bfd_values['my_discriminator'],
+                               "BFD - your discriminator")
+
+
+class BFDTestCase(VppTestCase):
+    """Bidirectional Forwarding Detection (BFD)"""
+
+    @classmethod
+    def setUpClass(cls):
+        super(BFDTestCase, cls).setUpClass()
+        try:
+            cls.create_pg_interfaces([0, 1])
+            cls.pg0.config_ip4()
+            cls.pg0.generate_remote_hosts()
+            cls.pg0.configure_ipv4_neighbors()
+            cls.pg0.admin_up()
+            cls.pg0.resolve_arp()
+
+        except Exception:
+            super(BFDTestCase, cls).tearDownClass()
+            raise
+
+    def setUp(self):
+        self.vapi.want_bfd_events()
+        self.vpp_session = VppBFDUDPSession(self, self.pg0, self.pg0.remote_ip4)
+        self.vpp_session.add_vpp_config()
+        self.vpp_session.admin_up()
+        self.test_session = BFDTestSession(self, self.pg0)
+
+    def tearDown(self):
+        self.vapi.want_bfd_events(enable_disable=0)
+        if not self.vpp_dead:
+            self.vpp_session.remove_vpp_config()
+        super(BFDTestCase, self).tearDown()
+
+    def verify_event(self, event, expected_state):
+        """ Verify correctness of event values. """
+        e = event
+        self.logger.debug("Event: %s" % repr(e))
+        self.assert_equal(e.bs_index, self.vpp_session.bs_index,
+                          "BFD session index")
+        self.assert_equal(e.sw_if_index, self.vpp_session.interface.sw_if_index,
+                          "BFD interface index")
+        is_ipv6 = 0
+        if self.vpp_session.af == AF_INET6:
+            is_ipv6 = 1
+        self.assert_equal(e.is_ipv6, is_ipv6, "is_ipv6")
+        if self.vpp_session.af == AF_INET:
+            self.assert_equal(e.local_addr[:4], self.vpp_session.local_addr_n,
+                              "Local IPv4 address")
+            self.assert_equal(e.peer_addr[:4], self.vpp_session.peer_addr_n,
+                              "Peer IPv4 address")
+        else:
+            self.assert_equal(e.local_addr, self.vpp_session.local_addr_n,
+                              "Local IPv6 address")
+            self.assert_equal(e.peer_addr, self.vpp_session.peer_addr_n,
+                              "Peer IPv6 address")
+        self.assert_equal(e.state, expected_state, BFDState)
+
+    def wait_for_bfd_packet(self, timeout=1):
+        p = self.pg0.wait_for_packet(timeout=timeout)
+        bfd = p[BFD]
+        if bfd is None:
+            raise Exception(ppp("Unexpected or invalid BFD packet:", p))
+        if bfd.payload:
+            raise Exception(ppp("Unexpected payload in BFD packet:", bfd))
+        verify_ip(self, p, self.pg0.local_ip4, self.pg0.remote_ip4)
+        verify_udp(self, p)
+        self.test_session.verify_packet(p)
+        return p
+
+    def test_slow_timer(self):
+        """ Slow timer """
+
+        self.pg_enable_capture([self.pg0])
+        expected_packets = 10
+        self.logger.info("Waiting for %d BFD packets" % expected_packets)
+        self.wait_for_bfd_packet()
+        for i in range(expected_packets):
+            before = time.time()
+            self.wait_for_bfd_packet()
+            after = time.time()
+            self.assert_in_range(
+                after - before, 0.75, 1, "time between slow packets")
+            before = after
+
+    def test_zero_remote_min_rx(self):
+        """ Zero RemoteMinRxInterval """
+        self.pg_enable_capture([self.pg0])
+        p = self.wait_for_bfd_packet()
+        self.test_session.update(my_discriminator=randint(0, 40000000),
+                                 your_discriminator=p[BFD].my_discriminator,
+                                 state=BFDState.init,
+                                 required_min_rx_interval=0)
+        self.test_session.send_packet()
+        e = self.vapi.wait_for_event(1, "bfd_udp_session_details")
+        self.verify_event(e, expected_state=BFDState.up)
+
+        try:
+            p = self.pg0.wait_for_packet(timeout=1)
+        except:
+            return
+        raise Exception(ppp("Received unexpected BFD packet:", p))
+
+    def bfd_conn_up(self):
+        self.pg_enable_capture([self.pg0])
+        self.logger.info("Waiting for slow hello")
+        p = self.wait_for_bfd_packet()
+        self.logger.info("Sending Init")
+        self.test_session.update(my_discriminator=randint(0, 40000000),
+                                 your_discriminator=p[BFD].my_discriminator,
+                                 state=BFDState.init,
+                                 required_min_rx_interval=500000)
+        self.test_session.send_packet()
+        self.logger.info("Waiting for event")
+        e = self.vapi.wait_for_event(1, "bfd_udp_session_details")
+        self.verify_event(e, expected_state=BFDState.up)
+        self.logger.info("Session is Up")
+        self.test_session.update(state=BFDState.up)
+
+    def test_conn_up(self):
+        """ Basic connection up """
+        self.bfd_conn_up()
+
+    def test_hold_up(self):
+        """ Hold BFD up """
+        self.bfd_conn_up()
+        for i in range(5):
+            self.wait_for_bfd_packet()
+            self.test_session.send_packet()
+
+    def test_conn_down(self):
+        """ Session down after inactivity """
+        self.bfd_conn_up()
+        self.wait_for_bfd_packet()
+        self.assert_equal(
+            0, len(self.vapi.collect_events()),
+            "number of bfd events")
+        self.wait_for_bfd_packet()
+        self.assert_equal(
+            0, len(self.vapi.collect_events()),
+            "number of bfd events")
+        e = self.vapi.wait_for_event(1, "bfd_udp_session_details")
+        self.verify_event(e, expected_state=BFDState.down)
+
+    @unittest.skip("this test is not working yet")
+    def test_large_required_min_rx(self):
+        self.bfd_conn_up()
+        interval = 5000000
+        self.test_session.update(required_min_rx_interval=interval)
+        self.test_session.send_packet()
+        now = time.time()
+        count = 1
+        while time.time() < now + interval / 1000000:
+            try:
+                p = self.wait_for_bfd_packet()
+                if count > 1:
+                    self.logger.error(ppp("Received unexpected packet:", p))
+                count += 1
+            except:
+                pass
+        self.assert_equal(count, 1, "number of packets received")
+
+
+if __name__ == '__main__':
+    unittest.main(testRunner=VppTestRunner)
diff --git a/test/util.py b/test/util.py
index 643377f5..f6c6acd4 100644
--- a/test/util.py
+++ b/test/util.py
@@ -1,5 +1,6 @@
 import socket
 import sys
+from abc import abstractmethod, ABCMeta
 from cStringIO import StringIO
 
 
@@ -14,6 +15,27 @@ def ppp(headline, packet):
     return o.getvalue()
 
 
+class NumericConstant(object):
+    __metaclass__ = ABCMeta
+
+    desc_dict = {}
+
+    @abstractmethod
+    def __init__(self, value):
+        self._value = value
+
+    def __int__(self):
+        return self._value
+
+    def __long__(self):
+        return self._value
+
+    def __str__(self):
+        if self._value in self.desc_dict:
+            return self.desc_dict[self._value]
+        return ""
+
+
 class Host(object):
     """ Generic test host "connected" to VPPs interface. """
 
diff --git a/test/vpp_object.py b/test/vpp_object.py
new file mode 100644
index 00000000..2b71fc1f
--- /dev/null
+++ b/test/vpp_object.py
@@ -0,0 +1,79 @@
+from abc import ABCMeta, abstractmethod
+
+
+class VppObject(object):
+    """ Abstract vpp object """
+    __metaclass__ = ABCMeta
+
+    def __init__(self):
+        VppObjectRegistry().register(self)
+
+    @abstractmethod
+    def add_vpp_config(self):
+        """ Add the configuration for this object to vpp. """
+        pass
+
+    @abstractmethod
+    def query_vpp_config(self):
+        """Query the vpp configuration.
+
+        :return: True if the object is configured"""
+        pass
+
+    @abstractmethod
+    def remove_vpp_config(self):
+        """ Remove the configuration for this object from vpp. """
+        pass
+
+    @abstractmethod
+    def object_id(self):
+        """ Return a unique string representing this object. """
+        pass
+
+
+class VppObjectRegistry(object):
+    """ Class which handles automatic configuration cleanup. """
+    _shared_state = {}
+
+    def __init__(self):
+        self.__dict__ = self._shared_state
+        if not hasattr(self, "_object_registry"):
+            self._object_registry = []
+        if not hasattr(self, "_object_dict"):
+            self._object_dict = dict()
+
+    def register(self, o):
+        """ Register an object in the registry. """
+        if not o.unique_id() in self._object_dict:
+            self._object_registry.append(o)
+            self._object_dict[o.unique_id()] = o
+        else:
+            print "not adding duplicate %s" % o
+
+    def remove_vpp_config(self, logger):
+        """
+        Remove configuration (if present) from vpp and then remove all objects
+        from the registry.
+        """
+        if not self._object_registry:
+            logger.info("No objects registered for auto-cleanup.")
+            return
+        logger.info("Removing VPP configuration for registered objects")
+        for o in reversed(self._object_registry):
+            if o.query_vpp_config():
+                logger.info("Removing %s", o)
+                o.remove_vpp_config()
+            else:
+                logger.info("Skipping %s, configuration not present", o)
+        failed = []
+        for o in self._object_registry:
+            if o.query_vpp_config():
+                failed.append(o)
+        self._object_registry = []
+        self._object_dict = dict()
+        if failed:
+            logger.error("Couldn't remove configuration for object(s):")
+            for x in failed:
+                logger.error(repr(x))
+            raise Exception("Couldn't remove configuration for object(s): %s" %
+                            (", ".join(str(x) for x in failed)))
diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 2f931803..5e80a03e 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -1,7 +1,12 @@
-import os, fnmatch
-import array
+import os
+import fnmatch
+import time
 from hook import Hook
 
+# Sphinx creates auto-generated documentation by importing the python source
+# files and collecting the docstrings from them. The NO_VPP_PAPI flag allows the
+# vpp_papi_provider.py file to be importable without having to build the whole
+# vpp api if the user only wishes to generate the test documentation.
 do_import = True
 try:
     no_vpp_papi = os.getenv("NO_VPP_PAPI")
@@ -17,9 +22,11 @@ if do_import:
 MPLS_IETF_MAX_LABEL = 0xfffff
 MPLS_LABEL_INVALID = MPLS_IETF_MAX_LABEL + 1
 
+
 class L2_VTR_OP:
     L2_POP_1 = 3
 
+
 class VppPapiProvider(object):
     """VPP-api provider using vpp-papi
 
@@ -35,12 +42,13 @@ class VppPapiProvider(object):
         self.test_class = test_class
         jsonfiles = []
 
-        install_dir=os.getenv('VPP_TEST_INSTALL_PATH')
+        install_dir = os.getenv('VPP_TEST_INSTALL_PATH')
         for root, dirnames, filenames in os.walk(install_dir):
             for filename in fnmatch.filter(filenames, '*.api.json'):
                 jsonfiles.append(os.path.join(root, filename))
 
         self.papi = VPP(jsonfiles)
+        self._events = list()
 
     def register_hook(self, hook):
         """Replace hook registration with new hook
@@ -50,9 +58,35 @@ class VppPapiProvider(object):
         """
         self.hook = hook
 
+    def collect_events(self):
+        e = self._events
+        self._events = list()
+        return e
+
+    def wait_for_event(self, timeout, name=None):
+        limit = time.time() + timeout
+        while time.time() < limit:
+            if self._events:
+                e = self._events.pop(0)
+                if name and type(e).__name__ != name:
+                    raise Exception(
+                        "Unexpected event received: %s, expected: %s" %
+                        (type(e).__name__, name))
+                return e
+            time.sleep(0)  # yield
+        if name is not None:
+            raise Exception("Event %s did not occur within timeout" % name)
+        raise Exception("Event did not occur within timeout")
+
+    def __call__(self, name, event):
+        # FIXME use the name instead of relying on type(e).__name__ ?
+        # FIXME #2 if this throws, it is eaten silently, Ole?
+        self._events.append(event)
+
     def connect(self):
         """Connect the API to VPP"""
         self.papi.connect(self.name, self.shm_prefix)
+        self.papi.register_event_callback(self)
 
     def disconnect(self):
         """Disconnect the API from VPP"""
@@ -73,7 +107,7 @@ class VppPapiProvider(object):
         if hasattr(reply, 'retval') and reply.retval != expected_retval:
             msg = "API call failed, expected retval == %d, got %s" % (
                 expected_retval, repr(reply))
-            self.test_class.test_instance.logger.error(msg)
+            self.test_class.logger.error(msg)
             raise Exception(msg)
         self.hook.after_api(api_fn.__name__, api_args)
         return reply
@@ -116,7 +150,7 @@ class VppPapiProvider(object):
 
         """
         return self.api(self.papi.pg_create_interface,
-                        { "interface_id" : pg_index })
+                        {"interface_id": pg_index})
 
     def sw_interface_dump(self, filter=None):
         """
@@ -125,7 +159,7 @@ class VppPapiProvider(object):
 
         """
         if filter is not None:
-            args = {"name_filter_valid" : 1, "name_filter" : filter}
+            args = {"name_filter_valid": 1, "name_filter": filter}
         else:
             args = {}
         return self.api(self.papi.sw_interface_dump, args)
@@ -140,8 +174,8 @@ class VppPapiProvider(object):
 
         """
         return self.api(self.papi.sw_interface_set_table,
-                        { 'sw_if_index' : sw_if_index, 'is_ipv6' : is_ipv6,
-                          'vrf_id' : table_id})
+                        {'sw_if_index': sw_if_index, 'is_ipv6': is_ipv6,
+                         'vrf_id': table_id})
 
     def sw_interface_add_del_address(self, sw_if_index, addr, addr_len,
                                      is_ipv6=0, is_add=1, del_all=0):
@@ -156,12 +190,12 @@ class VppPapiProvider(object):
 
         """
         return self.api(self.papi.sw_interface_add_del_address,
-                        { 'sw_if_index' : sw_if_index,
-                          'is_add' : is_add,
-                          'is_ipv6' : is_ipv6,
-                          'del_all' : del_all,
-                          'address_length' : addr_len,
-                          'address' : addr})
+                        {'sw_if_index': sw_if_index,
+                         'is_add': is_add,
+                         'is_ipv6': is_ipv6,
+                         'del_all': del_all,
+                         'address_length': addr_len,
+                         'address': addr})
 
     def sw_interface_enable_disable_mpls(self, sw_if_index,
                                          is_enable=1):
@@ -172,12 +206,12 @@ class VppPapiProvider(object):
 
         """
         return self.api(self.papi.sw_interface_set_mpls_enable,
-                        {'sw_if_index' : sw_if_index,
-                         'enable' : is_enable })
+                        {'sw_if_index': sw_if_index,
+                         'enable': is_enable})
 
     def sw_interface_ra_suppress(self, sw_if_index):
         return self.api(self.papi.sw_interface_ip6nd_ra_config,
-                        {'sw_if_index' : sw_if_index })
+                        {'sw_if_index': sw_if_index})
 
     def vxlan_add_del_tunnel(
             self,
@@ -202,14 +236,14 @@ class VppPapiProvider(object):
 
         """
         return self.api(self.papi.vxlan_add_del_tunnel,
-                        {'is_add' : is_add,
-                         'is_ipv6' : is_ipv6,
-                         'src_address' : src_addr,
-                         'dst_address' : dst_addr,
-                         'mcast_sw_if_index' : mcast_sw_if_index,
-			 'encap_vrf_id' : encap_vrf_id,
-                         'decap_next_index' : decap_next_index,
-                         'vni' : vni})
+                        {'is_add': is_add,
+                         'is_ipv6': is_ipv6,
+                         'src_address': src_addr,
+                         'dst_address': dst_addr,
+                         'mcast_sw_if_index': mcast_sw_if_index,
+                         'encap_vrf_id': encap_vrf_id,
+                         'decap_next_index': decap_next_index,
+                         'vni': vni})
 
     def bridge_domain_add_del(self, bd_id, flood=1, uu_flood=1, forward=1,
                               learn=1, arp_term=0, is_add=1):
@@ -229,13 +263,13 @@ class VppPapiProvider(object):
         :param int is_add: Add or delete flag. (Default value = 1)
         """
         return self.api(self.papi.bridge_domain_add_del,
-                        { 'bd_id' : bd_id,
-                          'flood' : flood,
-                          'uu_flood' : uu_flood,
-                          'forward' : forward,
-                          'learn' : learn,
-                          'arp_term' : arp_term,
-                          'is_add' : is_add})
+                        {'bd_id': bd_id,
+                         'flood': flood,
+                         'uu_flood': uu_flood,
+                         'forward': forward,
+                         'learn': learn,
+                         'arp_term': arp_term,
+                         'is_add': is_add})
 
     def l2fib_add_del(self, mac, bd_id, sw_if_index, is_add=1, static_mac=0,
                       filter_mac=0, bvi_mac=0):
@@ -254,13 +288,13 @@ class VppPapiProvider(object):
             interface. (Default value = 0)
         """
         return self.api(self.papi.l2fib_add_del,
-                        { 'mac' : self._convert_mac(mac),
-                          'bd_id' : bd_id,
-                          'sw_if_index' : sw_if_index,
-                          'is_add' : is_add,
-                          'static_mac' : static_mac,
-                          'filter_mac' : filter_mac,
-                          'bvi_mac' : bvi_mac })
+                        {'mac': self._convert_mac(mac),
+                         'bd_id': bd_id,
+                         'sw_if_index': sw_if_index,
+                         'is_add': is_add,
+                         'static_mac': static_mac,
+                         'filter_mac': filter_mac,
+                         'bvi_mac': bvi_mac})
 
     def sw_interface_set_l2_bridge(self, sw_if_index, bd_id,
                                    shg=0, bvi=0, enable=1):
@@ -274,11 +308,11 @@ class VppPapiProvider(object):
         :param int enable: Add or remove interface. (Default value = 1)
         """
         return self.api(self.papi.sw_interface_set_l2_bridge,
-                        { 'rx_sw_if_index' : sw_if_index,
-                          'bd_id' : bd_id,
-                          'shg' : shg,
-                          'bvi' : bvi,
-                          'enable' : enable })
+                        {'rx_sw_if_index': sw_if_index,
+                         'bd_id': bd_id,
+                         'shg': shg,
+                         'bvi': bvi,
+                         'enable': enable})
 
     def bridge_flags(self, bd_id, is_set, feature_bitmap):
         """Enable/disable required feature of the bridge domain with defined ID.
@@ -293,9 +327,9 @@ class VppPapiProvider(object):
             - arp-term (1 << 4).
         """
         return self.api(self.papi.bridge_flags,
-                        {'bd_id' : bd_id,
-                         'is_set' : is_set,
-                         'feature_bitmap' : feature_bitmap })
+                        {'bd_id': bd_id,
+                         'is_set': is_set,
+                         'feature_bitmap': feature_bitmap})
 
     def bridge_domain_dump(self, bd_id=0):
         """
@@ -305,7 +339,7 @@ class VppPapiProvider(object):
         :return: Dictionary of bridge domain(s) data.
         """
         return self.api(self.papi.bridge_domain_dump,
-                        {'bd_id' : bd_id })
+                        {'bd_id': bd_id})
 
     def sw_interface_set_l2_xconnect(self, rx_sw_if_index, tx_sw_if_index,
                                      enable):
@@ -319,11 +353,17 @@ class VppPapiProvider(object):
 
         """
         return self.api(self.papi.sw_interface_set_l2_xconnect,
-                        { 'rx_sw_if_index' : rx_sw_if_index,
-                          'tx_sw_if_index' : tx_sw_if_index,
-                          'enable' : enable })
+                        {'rx_sw_if_index': rx_sw_if_index,
+                         'tx_sw_if_index': tx_sw_if_index,
+                         'enable': enable})
 
-    def sw_interface_set_l2_tag_rewrite(self, sw_if_index, vtr_oper, push=0, tag1=0, tag2=0):
+    def sw_interface_set_l2_tag_rewrite(
+            self,
+            sw_if_index,
+            vtr_oper,
+            push=0,
+            tag1=0,
+            tag2=0):
         """L2 interface vlan tag rewrite configure request
         :param client_index - opaque cookie to identify the sender
         :param context - sender context, to match reply w/ request
@@ -335,11 +375,11 @@ class VppPapiProvider(object):
 
         """
         return self.api(self.papi.l2_interface_vlan_tag_rewrite,
-                        { 'sw_if_index' : sw_if_index,
-                          'vtr_op' : vtr_oper,
-                          'push_dot1q' : push,
-                          'tag1' : tag1,
-                          'tag2' : tag2 })
+                        {'sw_if_index': sw_if_index,
+                         'vtr_op': vtr_oper,
+                         'push_dot1q': push,
+                         'tag1': tag1,
+                         'tag2': tag2})
 
     def sw_interface_set_flags(self, sw_if_index, admin_up_down,
                                link_up_down=0, deleted=0):
@@ -352,10 +392,10 @@ class VppPapiProvider(object):
 
         """
         return self.api(self.papi.sw_interface_set_flags,
-                        { 'sw_if_index' : sw_if_index,
-                          'admin_up_down' : admin_up_down,
-                          'link_up_down' : link_up_down,
-                          'deleted' : deleted })
+                        {'sw_if_index': sw_if_index,
+                         'admin_up_down': admin_up_down,
+                         'link_up_down': link_up_down,
+                         'deleted': deleted})
 
     def create_subif(self, sw_if_index, sub_id, outer_vlan, inner_vlan,
                      no_tags=0, one_tag=0, two_tags=0, dot1ad=0, exact_match=0,
@@ -379,18 +419,18 @@ class VppPapiProvider(object):
         """
         return self.api(
             self.papi.create_subif,
-            { 'sw_if_index' : sw_if_index,
-              'sub_id' : sub_id,
-              'no_tags' : no_tags,
-              'one_tag' : one_tag,
-              'two_tags' : two_tags,
-              'dot1ad' : dot1ad,
-              'exact_match' : exact_match,
-              'default_sub' : default_sub,
-              'outer_vlan_id_any' : outer_vlan_id_any,
-              'inner_vlan_id_any' : inner_vlan_id_any,
-              'outer_vlan_id' : outer_vlan,
-              'inner_vlan_id' : inner_vlan })
+            {'sw_if_index': sw_if_index,
+             'sub_id': sub_id,
+             'no_tags': no_tags,
+             'one_tag': one_tag,
+             'two_tags': two_tags,
+             'dot1ad': dot1ad,
+             'exact_match': exact_match,
+             'default_sub': default_sub,
+             'outer_vlan_id_any': outer_vlan_id_any,
+             'inner_vlan_id_any': inner_vlan_id_any,
+             'outer_vlan_id': outer_vlan,
+             'inner_vlan_id': inner_vlan})
 
     def delete_subif(self, sw_if_index):
         """Delete subinterface
@@ -398,7 +438,7 @@ class VppPapiProvider(object):
         :param sw_if_index:
         """
         return self.api(self.papi.delete_subif,
-                        { 'sw_if_index' : sw_if_index })
+                        {'sw_if_index': sw_if_index})
 
     def create_vlan_subif(self, sw_if_index, vlan):
         """
@@ -408,8 +448,8 @@ class VppPapiProvider(object):
 
         """
         return self.api(self.papi.create_vlan_subif,
-                        {'sw_if_index' : sw_if_index,
-                         'vlan_id' : vlan })
+                        {'sw_if_index': sw_if_index,
+                         'vlan_id': vlan})
 
     def create_loopback(self, mac=''):
         """
@@ -417,7 +457,7 @@ class VppPapiProvider(object):
         :param mac: (Optional)
         """
         return self.api(self.papi.create_loopback,
-                        { 'mac_address' : mac })
+                        {'mac_address': mac})
 
     def ip_add_del_route(
             self,
@@ -428,9 +468,9 @@ class VppPapiProvider(object):
             table_id=0,
             next_hop_table_id=0,
             next_hop_weight=1,
-            next_hop_n_out_labels = 0,
-            next_hop_out_label_stack = [],
-            next_hop_via_label = MPLS_LABEL_INVALID,
+            next_hop_n_out_labels=0,
+            next_hop_out_label_stack=[],
+            next_hop_via_label=MPLS_LABEL_INVALID,
             create_vrf_if_needed=0,
             is_resolve_host=0,
             is_resolve_attached=0,
@@ -470,29 +510,29 @@ class VppPapiProvider(object):
 
         return self.api(
             self.papi.ip_add_del_route,
-            { 'next_hop_sw_if_index' : next_hop_sw_if_index,
-              'table_id' : table_id,
-              'classify_table_index' : classify_table_index,
-              'next_hop_table_id' : next_hop_table_id,
-              'create_vrf_if_needed' : create_vrf_if_needed,
-              'is_add' : is_add,
-              'is_drop' : is_drop,
-              'is_unreach' : is_unreach,
-              'is_prohibit' : is_prohibit,
-              'is_ipv6' : is_ipv6,
-              'is_local' : is_local,
-              'is_classify' : is_classify,
-              'is_multipath' : is_multipath,
-              'is_resolve_host' : is_resolve_host,
-              'is_resolve_attached' : is_resolve_attached,
-              'not_last' : not_last,
-              'next_hop_weight' : next_hop_weight,
-              'dst_address_length' : dst_address_length,
-              'dst_address' : dst_address,
-              'next_hop_address' : next_hop_address,
-              'next_hop_n_out_labels' : next_hop_n_out_labels,
-              'next_hop_via_label' : next_hop_via_label,
-              'next_hop_out_label_stack' : next_hop_out_label_stack })
+            {'next_hop_sw_if_index': next_hop_sw_if_index,
+             'table_id': table_id,
+             'classify_table_index': classify_table_index,
+             'next_hop_table_id': next_hop_table_id,
+             'create_vrf_if_needed': create_vrf_if_needed,
+             'is_add': is_add,
+             'is_drop': is_drop,
+             'is_unreach': is_unreach,
+             'is_prohibit': is_prohibit,
+             'is_ipv6': is_ipv6,
+             'is_local': is_local,
+             'is_classify': is_classify,
+             'is_multipath': is_multipath,
+             'is_resolve_host': is_resolve_host,
+             'is_resolve_attached': is_resolve_attached,
+             'not_last': not_last,
+             'next_hop_weight': next_hop_weight,
+             'dst_address_length': dst_address_length,
+             'dst_address': dst_address,
+             'next_hop_address': next_hop_address,
+             'next_hop_n_out_labels': next_hop_n_out_labels,
+             'next_hop_via_label': next_hop_via_label,
+             'next_hop_out_label_stack': next_hop_out_label_stack})
 
     def ip_neighbor_add_del(self,
                             sw_if_index,
@@ -516,13 +556,13 @@ class VppPapiProvider(object):
 
         return self.api(
             self.papi.ip_neighbor_add_del,
-            { 'vrf_id' : vrf_id,
-              'sw_if_index' : sw_if_index,
-              'is_add' : is_add,
-              'is_ipv6' : is_ipv6,
-              'is_static' : is_static,
-              'mac_address' : mac_address,
-              'dst_address' : dst_address
+            {'vrf_id': vrf_id,
+             'sw_if_index': sw_if_index,
+             'is_add': is_add,
+             'is_ipv6': is_ipv6,
+             'is_static': is_static,
+             'mac_address': mac_address,
+             'dst_address': dst_address
              }
         )
 
@@ -536,9 +576,9 @@ class VppPapiProvider(object):
 
         """
         return self.api(self.papi.sw_interface_span_enable_disable,
-                        { 'sw_if_index_from' : sw_if_index_from,
-                          'sw_if_index_to' : sw_if_index_to,
-                          'state' : state })
+                        {'sw_if_index_from': sw_if_index_from,
+                         'sw_if_index_to': sw_if_index_to,
+                         'state': state})
 
     def gre_tunnel_add_del(self,
                            src_address,
@@ -559,12 +599,12 @@ class VppPapiProvider(object):
 
         return self.api(
             self.papi.gre_add_del_tunnel,
-            { 'is_add' : is_add,
-              'is_ipv6' : is_ip6,
-              'teb' : is_teb,
-              'src_address' : src_address,
-              'dst_address' : dst_address,
-              'outer_fib_id' : outer_fib_id }
+            {'is_add': is_add,
+             'is_ipv6': is_ip6,
+             'teb': is_teb,
+             'src_address': src_address,
+             'dst_address': dst_address,
+             'outer_fib_id': outer_fib_id}
         )
 
     def mpls_route_add_del(
@@ -577,9 +617,9 @@ class VppPapiProvider(object):
             table_id=0,
             next_hop_table_id=0,
             next_hop_weight=1,
-            next_hop_n_out_labels = 0,
-            next_hop_out_label_stack = [],
-            next_hop_via_label = MPLS_LABEL_INVALID,
+            next_hop_n_out_labels=0,
+            next_hop_out_label_stack=[],
+            next_hop_via_label=MPLS_LABEL_INVALID,
             create_vrf_if_needed=0,
             is_resolve_host=0,
             is_resolve_attached=0,
@@ -615,24 +655,24 @@ class VppPapiProvider(object):
 
         return self.api(
             self.papi.mpls_route_add_del,
-            { 'mr_label' : label,
-              'mr_eos' : eos,
-              'mr_table_id' : table_id,
-              'mr_classify_table_index' : classify_table_index,
-              'mr_create_table_if_needed' : create_vrf_if_needed,
-              'mr_is_add' : is_add,
-              'mr_is_classify' : is_classify,
-              'mr_is_multipath' : is_multipath,
-              'mr_is_resolve_host' : is_resolve_host,
-              'mr_is_resolve_attached' : is_resolve_attached,
-              'mr_next_hop_proto_is_ip4' : next_hop_proto_is_ip4,
-              'mr_next_hop_weight' : next_hop_weight,
-              'mr_next_hop' : next_hop_address,
-              'mr_next_hop_n_out_labels' : next_hop_n_out_labels,
-              'mr_next_hop_sw_if_index' : next_hop_sw_if_index,
-              'mr_next_hop_table_id' : next_hop_table_id,
-              'mr_next_hop_via_label' : next_hop_via_label,
-              'mr_next_hop_out_label_stack' : next_hop_out_label_stack })
+            {'mr_label': label,
+             'mr_eos': eos,
+             'mr_table_id': table_id,
+             'mr_classify_table_index': classify_table_index,
+             'mr_create_table_if_needed': create_vrf_if_needed,
+             'mr_is_add': is_add,
+             'mr_is_classify': is_classify,
+             'mr_is_multipath': is_multipath,
+             'mr_is_resolve_host': is_resolve_host,
+             'mr_is_resolve_attached': is_resolve_attached,
+             'mr_next_hop_proto_is_ip4': next_hop_proto_is_ip4,
+             'mr_next_hop_weight': next_hop_weight,
+             'mr_next_hop': next_hop_address,
+             'mr_next_hop_n_out_labels': next_hop_n_out_labels,
+             'mr_next_hop_sw_if_index': next_hop_sw_if_index,
+             'mr_next_hop_table_id': next_hop_table_id,
+             'mr_next_hop_via_label': next_hop_via_label,
+             'mr_next_hop_out_label_stack': next_hop_out_label_stack})
 
     def mpls_ip_bind_unbind(
             self,
@@ -648,14 +688,14 @@ class VppPapiProvider(object):
         """
         return self.api(
             self.papi.mpls_ip_bind_unbind,
-            {'mb_mpls_table_id' : table_id,
-             'mb_label' : label,
-             'mb_ip_table_id' : ip_table_id,
-             'mb_create_table_if_needed' : create_vrf_if_needed,
-             'mb_is_bind' : is_bind,
-             'mb_is_ip4' : is_ip4,
-             'mb_address_length' : dst_address_length,
-             'mb_address' : dst_address})
+            {'mb_mpls_table_id': table_id,
+             'mb_label': label,
+             'mb_ip_table_id': ip_table_id,
+             'mb_create_table_if_needed': create_vrf_if_needed,
+             'mb_is_bind': is_bind,
+             'mb_is_ip4': is_ip4,
+             'mb_address_length': dst_address_length,
+             'mb_address': dst_address})
 
     def mpls_tunnel_add_del(
             self,
@@ -665,9 +705,9 @@ class VppPapiProvider(object):
             next_hop_sw_if_index=0xFFFFFFFF,
             next_hop_table_id=0,
             next_hop_weight=1,
-            next_hop_n_out_labels = 0,
-            next_hop_out_label_stack = [],
-            next_hop_via_label = MPLS_LABEL_INVALID,
+            next_hop_n_out_labels=0,
+            next_hop_out_label_stack=[],
+            next_hop_via_label=MPLS_LABEL_INVALID,
             create_vrf_if_needed=0,
             is_add=1,
             l2_only=0):
@@ -696,19 +736,16 @@ class VppPapiProvider(object):
         """
         return self.api(
             self.papi.mpls_tunnel_add_del,
-            {'mt_sw_if_index' : tun_sw_if_index,
-              'mt_is_add' : is_add,
-              'mt_l2_only' : l2_only,
-              'mt_next_hop_proto_is_ip4' : next_hop_proto_is_ip4,
-              'mt_next_hop_weight' : next_hop_weight,
-              'mt_next_hop' : next_hop_address,
-              'mt_next_hop_n_out_labels' : next_hop_n_out_labels,
-              'mt_next_hop_sw_if_index' :next_hop_sw_if_index,
-              'mt_next_hop_table_id' : next_hop_table_id,
-              'mt_next_hop_out_label_stack' : next_hop_out_label_stack })
-
-        return self.api(vpp_papi.sw_interface_span_enable_disable,
-                        (sw_if_index_from, sw_if_index_to, enable))
+            {'mt_sw_if_index': tun_sw_if_index,
+             'mt_is_add': is_add,
+             'mt_l2_only': l2_only,
+             'mt_next_hop_proto_is_ip4': next_hop_proto_is_ip4,
+             'mt_next_hop_weight': next_hop_weight,
+             'mt_next_hop': next_hop_address,
+             'mt_next_hop_n_out_labels': next_hop_n_out_labels,
+             'mt_next_hop_sw_if_index': next_hop_sw_if_index,
+             'mt_next_hop_table_id': next_hop_table_id,
+             'mt_next_hop_out_label_stack': next_hop_out_label_stack})
 
     def snat_interface_add_del_feature(
             self,
@@ -723,9 +760,9 @@ class VppPapiProvider(object):
         """
         return self.api(
             self.papi.snat_interface_add_del_feature,
-            {'is_add' : is_add,
-             'is_inside' : is_inside,
-             'sw_if_index' : sw_if_index})
+            {'is_add': is_add,
+             'is_inside': is_inside,
+             'sw_if_index': sw_if_index})
 
     def snat_add_static_mapping(
             self,
@@ -750,14 +787,14 @@ class VppPapiProvider(object):
         """
         return self.api(
             self.papi.snat_add_static_mapping,
-            {'is_add' : is_add,
-             'is_ip4' : is_ip4,
-             'addr_only' : addr_only,
-             'local_ip_address' : local_ip,
-             'external_ip_address' : external_ip,
-             'local_port' : local_port,
-             'external_port' : external_port,
-             'vrf_id' : vrf_id})
+            {'is_add': is_add,
+             'is_ip4': is_ip4,
+             'addr_only': addr_only,
+             'local_ip_address': local_ip,
+             'external_ip_address': external_ip,
+             'local_port': local_port,
+             'external_port': external_port,
+             'vrf_id': vrf_id})
 
     def snat_add_address_range(
             self,
@@ -774,10 +811,10 @@ class VppPapiProvider(object):
         """
         return self.api(
             self.papi.snat_add_address_range,
-            {'is_ip4' : is_ip4,
-             'first_ip_address' : first_ip_address,
-             'last_ip_address' : last_ip_address,
-             'is_add' : is_add})
+            {'is_ip4': is_ip4,
+             'first_ip_address': first_ip_address,
+             'last_ip_address': last_ip_address,
+             'is_add': is_add})
 
     def snat_address_dump(self):
         """Dump S-NAT addresses
@@ -796,3 +833,43 @@ class VppPapiProvider(object):
         :return: Dictionary of S-NAT static mappings
         """
         return self.api(self.papi.snat_static_mapping_dump, {})
+
+    def control_ping(self):
+        self.api(self.papi.control_ping)
+
+    def bfd_udp_add(self, sw_if_index, desired_min_tx, required_min_rx,
+                    detect_mult, local_addr, peer_addr, is_ipv6=0):
+        return self.api(self.papi.bfd_udp_add,
+                        {
+                            'sw_if_index': sw_if_index,
+                            'desired_min_tx': desired_min_tx,
+                            'required_min_rx': required_min_rx,
+                            'local_addr': local_addr,
+                            'peer_addr': peer_addr,
+                            'is_ipv6': is_ipv6,
+                            'detect_mult': detect_mult,
+                        })
+
+    def bfd_udp_del(self, sw_if_index, local_addr, peer_addr, is_ipv6=0):
+        return self.api(self.papi.bfd_udp_del,
+                        {
+                            'sw_if_index': sw_if_index,
+                            'local_addr': local_addr,
+                            'peer_addr': peer_addr,
+                            'is_ipv6': is_ipv6,
+                        })
+
+    def bfd_udp_session_dump(self):
+        return self.api(self.papi.bfd_udp_session_dump, {})
+
+    def bfd_session_set_flags(self, bs_idx, admin_up_down):
+        return self.api(self.papi.bfd_session_set_flags, {
+            'bs_index': bs_idx,
+            'admin_up_down': admin_up_down,
+        })
+
+    def want_bfd_events(self, enable_disable=1):
+        return self.api(self.papi.want_bfd_events, {
+            'enable_disable': enable_disable,
+            'pid': os.getpid(),
+        })
diff --git a/test/vpp_pg_interface.py b/test/vpp_pg_interface.py
index 533c4603..012f5768 100644
--- a/test/vpp_pg_interface.py
+++ b/test/vpp_pg_interface.py
@@ -1,10 +1,10 @@
 import os
 import time
-from scapy.utils import wrpcap, rdpcap
+from scapy.utils import wrpcap, rdpcap, PcapReader
 from vpp_interface import VppInterface
 
 from scapy.layers.l2 import Ether, ARP
-from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6ND_NA, \
+from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6ND_NA,\
     ICMPv6NDOptSrcLLAddr, ICMPv6NDOptDstLLAddr
 from util import ppp
 
@@ -93,6 +93,7 @@ class VppPGInterface(VppInterface):
             pass
         # FIXME this should be an API, but no such exists atm
         self.test.vapi.cli(self.capture_cli)
+        self._pcap_reader = None
 
     def add_stream(self, pkts):
         """
@@ -132,6 +133,41 @@ class VppPGInterface(VppInterface):
             return []
         return output
 
+    def wait_for_packet(self, timeout):
+        """
+        Wait for next packet captured with a timeout
+
+        :param timeout: How long to wait for the packet
+
+        :returns: Captured packet if no packet arrived within timeout
+        :raises Exception: if no packet arrives within timeout
+        """
+        limit = time.time() + timeout
+        if self._pcap_reader is None:
+            self.test.logger.debug("Waiting for the capture file to appear")
+            while time.time() < limit:
+                if os.path.isfile(self.out_path):
+                    break
+                time.sleep(0)  # yield
+            if os.path.isfile(self.out_path):
+                self.test.logger.debug("Capture file appeared after %fs" %
+                                       (time.time() - (limit - timeout)))
+                self._pcap_reader = PcapReader(self.out_path)
+            else:
+                self.test.logger.debug("Timeout - capture file still nowhere")
+                raise Exception("Packet didn't arrive within timeout")
+
+        self.test.logger.debug("Waiting for packet")
+        while time.time() < limit:
+            p = self._pcap_reader.recv()
+            if p is not None:
+                self.test.logger.debug("Packet received after %fs",
+                                       (time.time() - (limit - timeout)))
+                return p
+            time.sleep(0)  # yield
+        self.test.logger.debug("Timeout - no packets received")
+        raise Exception("Packet didn't arrive within timeout")
+
     def create_arp_req(self):
         """Create ARP request applicable for this interface"""
         return (Ether(dst="ff:ff:ff:ff:ff:ff", src=self.remote_mac) /
diff --git a/vlib-api/vlibapi/api_helper_macros.h b/vlib-api/vlibapi/api_helper_macros.h
index a1475656..16f34cfc 100644
--- a/vlib-api/vlibapi/api_helper_macros.h
+++ b/vlib-api/vlibapi/api_helper_macros.h
@@ -197,7 +197,8 @@ _(to_netconf_server)                            \
 _(from_netconf_server)                          \
 _(to_netconf_client)                            \
 _(from_netconf_client)                          \
-_(oam_events)
+_(oam_events)                                   \
+_(bfd_events)
 
 /* WARNING: replicated in vpp/stats.h */
 typedef struct
diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index eb7f8ef1..4e4b2c0a 100644
--- a/vnet/Makefile.am
+++ b/vnet/Makefile.am
@@ -349,6 +349,22 @@ nobase_include_HEADERS +=			\
  vnet/ip/udp.h					\
  vnet/ip/udp_packet.h
 
+########################################
+# Bidirectional Forwarding Detection
+########################################
+
+nobase_include_HEADERS +=                       \
+ vnet/bfd/bfd_protocol.h			\
+ vnet/bfd/bfd_main.h                            \
+ vnet/bfd/bfd_api.h                            \
+ vnet/bfd/bfd_udp.h
+
+libvnet_la_SOURCES +=				\
+ vnet/bfd/bfd_api.h                            \
+ vnet/bfd/bfd_udp.c                             \
+ vnet/bfd/bfd_main.c                            \
+ vnet/bfd/bfd_protocol.c
+
 ########################################
 # Layer 3 protocol: IPSec
 ########################################
diff --git a/vnet/vnet/api_errno.h b/vnet/vnet/api_errno.h
index 50d6f731..65e3e591 100644
--- a/vnet/vnet/api_errno.h
+++ b/vnet/vnet/api_errno.h
@@ -90,7 +90,9 @@ _(EXCEEDED_NUMBER_OF_PORTS_CAPACITY, -96, "Operation would exceed capacity of nu
 _(INVALID_ADDRESS_FAMILY, -97, "Invalid address family")                \
 _(INVALID_SUB_SW_IF_INDEX, -98, "Invalid sub-interface sw_if_index")    \
 _(TABLE_TOO_BIG, -99, "Table too big")                                  \
-_(CANNOT_ENABLE_DISABLE_FEATURE, -100, "Cannot enable/disable feature")
+_(CANNOT_ENABLE_DISABLE_FEATURE, -100, "Cannot enable/disable feature") \
+_(BFD_EEXIST, -101, "Duplicate BFD session") \
+_(BFD_NOENT, -102, "No such BFD session")
 
 typedef enum
 {
diff --git a/vnet/vnet/bfd/bfd_api.h b/vnet/vnet/bfd/bfd_api.h
new file mode 100644
index 00000000..cfcd04f3
--- /dev/null
+++ b/vnet/vnet/bfd/bfd_api.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief BFD global declarations
+ */
+#ifndef __included_bfd_api_h__
+#define __included_bfd_api_h__
+
+#include <vnet/api_errno.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/bfd/bfd_udp.h>
+
+vnet_api_error_t bfd_udp_add_session (u32 sw_if_index, u32 desired_min_tx_us,
+				      u32 required_min_rx_us, u8 detect_mult,
+				      const ip46_address_t * local_addr,
+				      const ip46_address_t * peer_addr);
+
+vnet_api_error_t bfd_udp_del_session (u32 sw_if_index,
+				      const ip46_address_t * local_addr,
+				      const ip46_address_t * peer_addr);
+
+vnet_api_error_t bfd_session_set_flags (u32 bs_index, u8 admin_up_down);
+
+#endif /* __included_bfd_api_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vnet/vnet/bfd/bfd_debug.h b/vnet/vnet/bfd/bfd_debug.h
new file mode 100644
index 00000000..c11e6d9f
--- /dev/null
+++ b/vnet/vnet/bfd/bfd_debug.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief BFD global declarations
+ */
+#ifndef __included_bfd_debug_h__
+#define __included_bfd_debug_h__
+
+/* controls debug prints */
+#define BFD_DEBUG (0)
+
+#if BFD_DEBUG
+#define BFD_DEBUG_FILE_DEF              \
+  static const char *__file = NULL;     \
+  if (!__file)                          \
+    {                                   \
+      __file = strrchr (__FILE__, '/'); \
+      if (__file)                       \
+        {                               \
+          ++__file;                     \
+        }                               \
+      else                              \
+        {                               \
+          __file = __FILE__;            \
+        }                               \
+    }
+
+#define BFD_DBG(fmt, ...)                                                \
+  do                                                                     \
+    {                                                                    \
+      BFD_DEBUG_FILE_DEF                                                 \
+      u8 *_s = NULL;                                                     \
+      vlib_main_t *vm = vlib_get_main ();                                \
+      _s = format (_s, "%6.02f:DBG:%s:%d:%s():" fmt, vlib_time_now (vm), \
+                   __file, __LINE__, __func__, ##__VA_ARGS__);           \
+      printf ("%s\n", _s);                                               \
+      vec_free (_s);                                                     \
+    }                                                                    \
+  while (0);
+
+#define BFD_ERR(fmt, ...)                                                \
+  do                                                                     \
+    {                                                                    \
+      BFD_DEBUG_FILE_DEF                                                 \
+      u8 *_s = NULL;                                                     \
+      vlib_main_t *vm = vlib_get_main ();                                \
+      _s = format (_s, "%6.02f:ERR:%s:%d:%s():" fmt, vlib_time_now (vm), \
+                   __file, __LINE__, __func__, ##__VA_ARGS__);           \
+      printf ("%s\n", _s);                                               \
+      vec_free (_s);                                                     \
+    }                                                                    \
+  while (0);
+
+#else
+#define BFD_DBG(...)
+#define BFD_ERR(...)
+#endif
+
+#endif /* __included_bfd_debug_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vnet/vnet/bfd/bfd_doc.md b/vnet/vnet/bfd/bfd_doc.md
new file mode 100644
index 00000000..1333ed77
--- /dev/null
+++ b/vnet/vnet/bfd/bfd_doc.md
@@ -0,0 +1 @@
+TODO
diff --git a/vnet/vnet/bfd/bfd_main.c b/vnet/vnet/bfd/bfd_main.c
new file mode 100644
index 00000000..a72d6fed
--- /dev/null
+++ b/vnet/vnet/bfd/bfd_main.c
@@ -0,0 +1,928 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief BFD nodes implementation
+ */
+
+#include <vppinfra/random.h>
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/bfd/bfd_debug.h>
+#include <vnet/bfd/bfd_protocol.h>
+#include <vnet/bfd/bfd_main.h>
+
+static u64
+bfd_us_to_clocks (bfd_main_t * bm, u64 us)
+{
+  return bm->cpu_cps * ((f64) us / USEC_PER_SECOND);
+}
+
+static vlib_node_registration_t bfd_process_node;
+
+typedef enum
+{
+#define F(t, n) BFD_OUTPUT_##t,
+  foreach_bfd_transport (F)
+#undef F
+    BFD_OUTPUT_N_NEXT,
+} bfd_output_next_t;
+
+static u32 bfd_next_index_by_transport[] = {
+#define F(t, n) [BFD_TRANSPORT_##t] = BFD_OUTPUT_##t,
+  foreach_bfd_transport (F)
+#undef F
+};
+
+/*
+ * We actually send all bfd pkts to the "error" node after scanning
+ * them, so the graph node has only one next-index. The "error-drop"
+ * node automatically bumps our per-node packet counters for us.
+ */
+typedef enum
+{
+  BFD_INPUT_NEXT_NORMAL,
+  BFD_INPUT_N_NEXT,
+} bfd_input_next_t;
+
+static void bfd_on_state_change (bfd_main_t * bm, bfd_session_t * bs,
+				 u64 now);
+
+static void
+bfd_set_defaults (bfd_main_t * bm, bfd_session_t * bs)
+{
+  bs->local_state = BFD_STATE_down;
+  bs->local_diag = BFD_DIAG_CODE_no_diag;
+  bs->remote_state = BFD_STATE_down;
+  bs->local_demand = 0;
+  bs->remote_discr = 0;
+  bs->desired_min_tx_us = BFD_DEFAULT_DESIRED_MIN_TX_US;
+  bs->desired_min_tx_clocks = bfd_us_to_clocks (bm, bs->desired_min_tx_us);
+  bs->remote_min_rx_us = 1;
+  bs->remote_demand = 0;
+}
+
+static void
+bfd_set_diag (bfd_session_t * bs, bfd_diag_code_e code)
+{
+  if (bs->local_diag != code)
+    {
+      BFD_DBG ("set local_diag, bs_idx=%d: '%d:%s'", bs->bs_idx, code,
+	       bfd_diag_code_string (code));
+      bs->local_diag = code;
+    }
+}
+
+static void
+bfd_set_state (bfd_main_t * bm, bfd_session_t * bs, bfd_state_e new_state)
+{
+  if (bs->local_state != new_state)
+    {
+      BFD_DBG ("Change state, bs_idx=%d: %s->%s", bs->bs_idx,
+	       bfd_state_string (bs->local_state),
+	       bfd_state_string (new_state));
+      bs->local_state = new_state;
+      bfd_on_state_change (bm, bs, clib_cpu_time_now ());
+    }
+}
+
+static void
+bfd_recalc_tx_interval (bfd_main_t * bm, bfd_session_t * bs)
+{
+  if (!bs->local_demand)
+    {
+      bs->transmit_interval_clocks =
+	clib_max (bs->desired_min_tx_clocks, bs->remote_min_rx_clocks);
+    }
+  else
+    {
+      /* TODO */
+    }
+  BFD_DBG ("Recalculated transmit interval %lu clocks/%.2fs",
+	   bs->transmit_interval_clocks,
+	   bs->transmit_interval_clocks / bm->cpu_cps);
+}
+
+static void
+bfd_calc_next_tx (bfd_main_t * bm, bfd_session_t * bs, u64 now)
+{
+  if (!bs->local_demand)
+    {
+      if (bs->local_detect_mult > 1)
+	{
+	  /* common case - 75-100% of transmit interval */
+	  bs->tx_timeout_clocks = now +
+	    (1 - .25 * (random_f64 (&bm->random_seed))) *
+	    bs->transmit_interval_clocks;
+	}
+      else
+	{
+	  /* special case - 75-90% of transmit interval */
+	  bs->tx_timeout_clocks =
+	    now +
+	    (.9 - .15 * (random_f64 (&bm->random_seed))) *
+	    bs->transmit_interval_clocks;
+	}
+    }
+  else
+    {
+      /* TODO */
+    }
+  if (bs->tx_timeout_clocks)
+    {
+      BFD_DBG ("Next transmit in %lu clocks/%.02fs@%lu",
+	       bs->tx_timeout_clocks - now,
+	       (bs->tx_timeout_clocks - now) / bm->cpu_cps,
+	       bs->tx_timeout_clocks);
+    }
+}
+
+static void
+bfd_recalc_detection_time (bfd_main_t * bm, bfd_session_t * bs)
+{
+  if (!bs->local_demand)
+    {
+      bs->detection_time_clocks =
+	bs->remote_detect_mult *
+	bfd_us_to_clocks (bm, clib_max (bs->required_min_rx_us,
+					bs->remote_desired_min_tx_us));
+    }
+  else
+    {
+      bs->detection_time_clocks =
+	bs->local_detect_mult *
+	bfd_us_to_clocks (bm,
+			  clib_max (bs->desired_min_tx_us,
+				    bs->remote_min_rx_us));
+    }
+  BFD_DBG ("Recalculated detection time %lu clocks/%.2fs",
+	   bs->detection_time_clocks,
+	   bs->detection_time_clocks / bm->cpu_cps);
+}
+
+static void
+bfd_set_timer (bfd_main_t * bm, bfd_session_t * bs, u64 now)
+{
+  u64 next = 0;
+  u64 rx_timeout = 0;
+  if (BFD_STATE_up == bs->local_state)
+    {
+      rx_timeout = bs->last_rx_clocks + bs->detection_time_clocks;
+    }
+  if (bs->tx_timeout_clocks && rx_timeout)
+    {
+      next = clib_min (bs->tx_timeout_clocks, rx_timeout);
+    }
+  else if (bs->tx_timeout_clocks)
+    {
+      next = bs->tx_timeout_clocks;
+    }
+  else if (rx_timeout)
+    {
+      next = rx_timeout;
+    }
+  BFD_DBG ("bs_idx=%u, tx_timeout=%lu, rx_timeout=%lu, next=%s", bs->bs_idx,
+	   bs->tx_timeout_clocks, rx_timeout,
+	   next == bs->tx_timeout_clocks ? "tx" : "rx");
+  if (next && (next < bs->wheel_time_clocks || !bs->wheel_time_clocks))
+    {
+      if (bs->wheel_time_clocks)
+	{
+	  timing_wheel_delete (&bm->wheel, bs->bs_idx);
+	}
+      bs->wheel_time_clocks = next;
+      BFD_DBG ("timing_wheel_insert(%p, %lu (%ld clocks/%.2fs in the "
+	       "future), %u);",
+	       &bm->wheel, bs->wheel_time_clocks,
+	       (i64) bs->wheel_time_clocks - clib_cpu_time_now (),
+	       (i64) (bs->wheel_time_clocks - clib_cpu_time_now ()) /
+	       bm->cpu_cps, bs->bs_idx);
+      timing_wheel_insert (&bm->wheel, bs->wheel_time_clocks, bs->bs_idx);
+    }
+}
+
+static void
+bfd_set_desired_min_tx (bfd_main_t * bm, bfd_session_t * bs, u64 now,
+			u32 desired_min_tx_us)
+{
+  bs->desired_min_tx_us = desired_min_tx_us;
+  bs->desired_min_tx_clocks = bfd_us_to_clocks (bm, bs->desired_min_tx_us);
+  BFD_DBG ("Set desired min tx to %uus/%lu clocks/%.2fs",
+	   bs->desired_min_tx_us, bs->desired_min_tx_clocks,
+	   bs->desired_min_tx_clocks / bm->cpu_cps);
+  bfd_recalc_detection_time (bm, bs);
+  bfd_recalc_tx_interval (bm, bs);
+  bfd_calc_next_tx (bm, bs, now);
+  bfd_set_timer (bm, bs, now);
+}
+
+void
+bfd_session_start (bfd_main_t * bm, bfd_session_t * bs)
+{
+  BFD_DBG ("%U", format_bfd_session, bs);
+  bfd_recalc_tx_interval (bm, bs);
+  vlib_process_signal_event (bm->vlib_main, bm->bfd_process_node_index,
+			     BFD_EVENT_NEW_SESSION, bs->bs_idx);
+}
+
+vnet_api_error_t
+bfd_del_session (uword bs_idx)
+{
+  const bfd_main_t *bm = &bfd_main;
+  if (!pool_is_free_index (bm->sessions, bs_idx))
+    {
+      bfd_session_t *bs = pool_elt_at_index (bm->sessions, bs_idx);
+      pool_put (bm->sessions, bs);
+      return 0;
+    }
+  else
+    {
+      BFD_ERR ("no such session");
+      return VNET_API_ERROR_BFD_NOENT;
+    }
+  return 0;
+}
+
+const char *
+bfd_diag_code_string (bfd_diag_code_e diag)
+{
+#define F(n, t, s)             \
+  case BFD_DIAG_CODE_NAME (t): \
+    return s;
+  switch (diag)
+    {
+    foreach_bfd_diag_code (F)}
+  return "UNKNOWN";
+#undef F
+}
+
+const char *
+bfd_state_string (bfd_state_e state)
+{
+#define F(n, t, s)         \
+  case BFD_STATE_NAME (t): \
+    return s;
+  switch (state)
+    {
+    foreach_bfd_state (F)}
+  return "UNKNOWN";
+#undef F
+}
+
+vnet_api_error_t
+bfd_session_set_flags (u32 bs_idx, u8 admin_up_down)
+{
+  bfd_main_t *bm = &bfd_main;
+  if (pool_is_free_index (bm->sessions, bs_idx))
+    {
+      BFD_ERR ("invalid bs_idx=%u", bs_idx);
+      return VNET_API_ERROR_BFD_NOENT;
+    }
+  bfd_session_t *bs = pool_elt_at_index (bm->sessions, bs_idx);
+  if (admin_up_down)
+    {
+      bfd_set_state (bm, bs, BFD_STATE_down);
+    }
+  else
+    {
+      bfd_set_diag (bs, BFD_DIAG_CODE_neighbor_sig_down);
+      bfd_set_state (bm, bs, BFD_STATE_admin_down);
+    }
+  return 0;
+}
+
+u8 *
+bfd_input_format_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  const bfd_input_trace_t *t = va_arg (*args, bfd_input_trace_t *);
+  const bfd_pkt_t *pkt = (bfd_pkt_t *) t->data;
+  if (t->len > STRUCT_SIZE_OF (bfd_pkt_t, head))
+    {
+      s = format (s, "BFD v%u, diag=%u(%s), state=%u(%s),\n"
+		  "    flags=(P:%u, F:%u, C:%u, A:%u, D:%u, M:%u), detect_mult=%u, "
+		  "length=%u\n",
+		  bfd_pkt_get_version (pkt), bfd_pkt_get_diag_code (pkt),
+		  bfd_diag_code_string (bfd_pkt_get_diag_code (pkt)),
+		  bfd_pkt_get_state (pkt),
+		  bfd_state_string (bfd_pkt_get_state (pkt)),
+		  bfd_pkt_get_poll (pkt), bfd_pkt_get_final (pkt),
+		  bfd_pkt_get_control_plane_independent (pkt),
+		  bfd_pkt_get_auth_present (pkt), bfd_pkt_get_demand (pkt),
+		  bfd_pkt_get_multipoint (pkt), pkt->head.detect_mult,
+		  pkt->head.length);
+      if (t->len >= sizeof (bfd_pkt_t)
+	  && pkt->head.length >= sizeof (bfd_pkt_t))
+	{
+	  s = format (s, "    my discriminator: %u\n", pkt->my_disc);
+	  s = format (s, "    your discriminator: %u\n", pkt->your_disc);
+	  s = format (s, "    desired min tx interval: %u\n",
+		      clib_net_to_host_u32 (pkt->des_min_tx));
+	  s = format (s, "    required min rx interval: %u\n",
+		      clib_net_to_host_u32 (pkt->req_min_rx));
+	  s = format (s, "    required min echo rx interval: %u\n",
+		      clib_net_to_host_u32 (pkt->req_min_echo_rx));
+	}
+    }
+
+  return s;
+}
+
+static void
+bfd_on_state_change (bfd_main_t * bm, bfd_session_t * bs, u64 now)
+{
+  BFD_DBG ("State changed: %U", format_bfd_session, bs);
+  bfd_event (bm, bs);
+  switch (bs->local_state)
+    {
+    case BFD_STATE_admin_down:
+      bfd_set_desired_min_tx (bm, bs, now,
+			      clib_max (bs->config_desired_min_tx_us,
+					BFD_DEFAULT_DESIRED_MIN_TX_US));
+      break;
+    case BFD_STATE_down:
+      bfd_set_desired_min_tx (bm, bs, now,
+			      clib_max (bs->config_desired_min_tx_us,
+					BFD_DEFAULT_DESIRED_MIN_TX_US));
+      break;
+    case BFD_STATE_init:
+      bfd_set_desired_min_tx (bm, bs, now,
+			      clib_max (bs->config_desired_min_tx_us,
+					BFD_DEFAULT_DESIRED_MIN_TX_US));
+      break;
+    case BFD_STATE_up:
+      bfd_set_desired_min_tx (bm, bs, now, bs->config_desired_min_tx_us);
+      break;
+    }
+}
+
+static void
+bfd_add_transport_layer (vlib_main_t * vm, vlib_buffer_t * b,
+			 bfd_session_t * bs)
+{
+  switch (bs->transport)
+    {
+    case BFD_TRANSPORT_UDP4:
+      /* fallthrough */
+    case BFD_TRANSPORT_UDP6:
+      BFD_DBG ("Transport bfd via udp, bs_idx=%u", bs->bs_idx);
+      bfd_add_udp_transport (vm, b, &bs->udp);
+      break;
+    }
+}
+
+static vlib_buffer_t *
+bfd_create_frame (vlib_main_t * vm, vlib_node_runtime_t * rt,
+		  bfd_session_t * bs)
+{
+  u32 bi;
+  if (vlib_buffer_alloc (vm, &bi, 1) != 1)
+    {
+      clib_warning ("buffer allocation failure");
+      return NULL;
+    }
+
+  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+  ASSERT (b->current_data == 0);
+
+  u32 *to_next;
+  u32 n_left_to_next;
+
+  vlib_get_next_frame (vm, rt, bfd_next_index_by_transport[bs->transport],
+		       to_next, n_left_to_next);
+
+  to_next[0] = bi;
+  n_left_to_next -= 1;
+
+  vlib_put_next_frame (vm, rt, bfd_next_index_by_transport[bs->transport],
+		       n_left_to_next);
+  return b;
+}
+
+static void
+bfd_init_control_frame (vlib_buffer_t * b, bfd_session_t * bs)
+{
+  bfd_pkt_t *pkt = vlib_buffer_get_current (b);
+  const u32 bfd_length = 24;
+  memset (pkt, 0, sizeof (*pkt));
+
+  bfd_pkt_set_version (pkt, 1);
+  bfd_pkt_set_diag_code (pkt, bs->local_diag);
+  bfd_pkt_set_state (pkt, bs->local_state);
+  if (bs->local_demand && BFD_STATE_up == bs->local_state &&
+      BFD_STATE_up == bs->remote_state)
+    {
+      bfd_pkt_set_demand (pkt);
+    }
+  pkt->head.detect_mult = bs->local_detect_mult;
+  pkt->head.length = clib_host_to_net_u32 (bfd_length);
+  pkt->my_disc = bs->local_discr;
+  pkt->your_disc = bs->remote_discr;
+  pkt->des_min_tx = clib_host_to_net_u32 (bs->desired_min_tx_us);
+  pkt->req_min_rx = clib_host_to_net_u32 (bs->required_min_rx_us);
+  pkt->req_min_echo_rx = clib_host_to_net_u32 (0);	/* FIXME */
+  b->current_length = bfd_length;
+}
+
+static void
+bfd_send_periodic (vlib_main_t * vm, vlib_node_runtime_t * rt,
+		   bfd_main_t * bm, bfd_session_t * bs, u64 now)
+{
+  if (!bs->remote_min_rx_us)
+    {
+      BFD_DBG
+	("bfd.RemoteMinRxInterval is zero, not sending periodic control "
+	 "frame");
+      return;
+    }
+  /* FIXME
+     A system MUST NOT periodically transmit BFD Control packets if Demand
+     mode is active on the remote system (bfd.RemoteDemandMode is 1,
+     bfd.SessionState is Up, and bfd.RemoteSessionState is Up) and a Poll
+     Sequence is not being transmitted.
+   */
+  if (now >= bs->tx_timeout_clocks)
+    {
+      BFD_DBG ("Send periodic control frame for bs_idx=%lu", bs->bs_idx);
+      vlib_buffer_t *b = bfd_create_frame (vm, rt, bs);
+      if (!b)
+	{
+	  return;
+	}
+      bfd_init_control_frame (b, bs);
+      bfd_add_transport_layer (vm, b, bs);
+      bfd_calc_next_tx (bm, bs, now);
+    }
+  else
+    {
+      BFD_DBG ("No need to send control frame now");
+    }
+  bfd_set_timer (bm, bs, now);
+}
+
+void
+bfd_send_final (vlib_main_t * vm, vlib_buffer_t * b, bfd_session_t * bs)
+{
+  BFD_DBG ("Send final control frame for bs_idx=%lu", bs->bs_idx);
+  bfd_init_control_frame (b, bs);
+  bfd_pkt_set_final (vlib_buffer_get_current (b));
+  bfd_add_transport_layer (vm, b, bs);
+}
+
+static void
+bfd_check_rx_timeout (bfd_main_t * bm, bfd_session_t * bs, u64 now)
+{
+  if (bs->last_rx_clocks + bs->detection_time_clocks < now)
+    {
+      BFD_DBG ("Rx timeout, session goes down");
+      bfd_set_diag (bs, BFD_DIAG_CODE_det_time_exp);
+      bfd_set_state (bm, bs, BFD_STATE_down);
+    }
+}
+
+void
+bfd_on_timeout (vlib_main_t * vm, vlib_node_runtime_t * rt, bfd_main_t * bm,
+		bfd_session_t * bs, u64 now)
+{
+  BFD_DBG ("Timeout for bs_idx=%lu", bs->bs_idx);
+  switch (bs->local_state)
+    {
+    case BFD_STATE_admin_down:
+      BFD_ERR ("Unexpected timeout when in %s state",
+	       bfd_state_string (bs->local_state));
+      abort ();
+      break;
+    case BFD_STATE_down:
+      bfd_send_periodic (vm, rt, bm, bs, now);
+      break;
+    case BFD_STATE_init:
+      BFD_ERR ("Unexpected timeout when in %s state",
+	       bfd_state_string (bs->local_state));
+      abort ();
+      break;
+    case BFD_STATE_up:
+      bfd_check_rx_timeout (bm, bs, now);
+      bfd_send_periodic (vm, rt, bm, bs, now);
+      break;
+    }
+}
+
+/*
+ * bfd input routine
+ */
+bfd_error_t
+bfd_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0)
+{
+  // bfd_main_t *bm = &bfd_main;
+  bfd_error_t e;
+
+  /* find our interface */
+  bfd_session_t *s = NULL;
+  // bfd_get_intf (lm, vnet_buffer (b0)->sw_if_index[VLIB_RX]);
+
+  if (!s)
+    {
+      /* bfd disabled on this interface, we're done */
+      return BFD_ERROR_DISABLED;
+    }
+
+  /* Actually scan the packet */
+  e = BFD_ERROR_NONE;		// bfd_packet_scan (lm, n, vlib_buffer_get_current (b0));
+
+  return e;
+}
+
+/*
+ * bfd process node function
+ */
+static uword
+bfd_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  bfd_main_t *bm = &bfd_main;
+  u32 *expired = 0;
+  uword event_type, *event_data = 0;
+
+  /* So we can send events to the bfd process */
+  bm->bfd_process_node_index = bfd_process_node.index;
+
+  while (1)
+    {
+      u64 now = clib_cpu_time_now ();
+      u64 next_expire = timing_wheel_next_expiring_elt_time (&bm->wheel);
+      BFD_DBG ("timing_wheel_next_expiring_elt_time(%p) returns %lu",
+	       &bm->wheel, next_expire);
+      if ((i64) next_expire < 0)
+	{
+	  BFD_DBG ("wait for event without timeout");
+	  (void) vlib_process_wait_for_event (vm);
+	}
+      else
+	{
+	  f64 timeout = ((i64) next_expire - (i64) now) / bm->cpu_cps;
+	  BFD_DBG ("wait for event with timeout %.02f", timeout);
+	  ASSERT (timeout > 0);
+	  (void) vlib_process_wait_for_event_or_clock (vm, timeout);
+	}
+      event_type = vlib_process_get_events (vm, &event_data);
+      now = clib_cpu_time_now ();
+      switch (event_type)
+	{
+	case ~0:		/* no events => timeout */
+	  /* nothing to do here */
+	  break;
+	case BFD_EVENT_RESCHEDULE:
+	  /* nothing to do here - reschedule is done automatically after
+	   * each event or timeout */
+	  break;
+	case BFD_EVENT_NEW_SESSION:
+	  do
+	    {
+	      bfd_session_t *bs =
+		pool_elt_at_index (bm->sessions, *event_data);
+	      bfd_send_periodic (vm, rt, bm, bs, now);
+	    }
+	  while (0);
+	  break;
+	default:
+	  clib_warning ("BUG: event type 0x%wx", event_type);
+	  break;
+	}
+      BFD_DBG ("advancing wheel, now is %lu", now);
+      BFD_DBG ("timing_wheel_advance (%p, %lu, %p, 0);", &bm->wheel, now,
+	       expired);
+      expired = timing_wheel_advance (&bm->wheel, now, expired, 0);
+      BFD_DBG ("Expired %d elements", vec_len (expired));
+      u32 *p = NULL;
+      vec_foreach (p, expired)
+      {
+	const u32 bs_idx = *p;
+	if (!pool_is_free_index (bm->sessions, bs_idx))
+	  {
+	    bfd_session_t *bs = pool_elt_at_index (bm->sessions, bs_idx);
+	    bs->wheel_time_clocks = 0;	/* no longer scheduled */
+	    bfd_on_timeout (vm, rt, bm, bs, now);
+	  }
+      }
+      if (expired)
+	{
+	  _vec_len (expired) = 0;
+	}
+      if (event_data)
+	{
+	  _vec_len (event_data) = 0;
+	}
+    }
+
+  return 0;
+}
+
+/*
+ * bfd process node declaration
+ */
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (bfd_process_node, static) = {
+  .function = bfd_process,
+  .type = VLIB_NODE_TYPE_PROCESS,
+  .name = "bfd-process",
+  .n_next_nodes = BFD_OUTPUT_N_NEXT,
+  .next_nodes =
+      {
+#define F(t, n) [BFD_OUTPUT_##t] = n,
+          foreach_bfd_transport (F)
+#undef F
+      },
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+bfd_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
+{
+  // bfd_main_t *bm = &bfd_main;
+  // vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
+    {
+      /* TODO */
+    }
+  return 0;
+}
+
+VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (bfd_sw_interface_up_down);
+
+static clib_error_t *
+bfd_hw_interface_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+  // bfd_main_t *bm = &bfd_main;
+  if (flags & VNET_HW_INTERFACE_FLAG_LINK_UP)
+    {
+      /* TODO */
+    }
+  return 0;
+}
+
+VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (bfd_hw_interface_up_down);
+
+/*
+ * setup function
+ */
+static clib_error_t *
+bfd_main_init (vlib_main_t * vm)
+{
+  bfd_main_t *bm = &bfd_main;
+  bm->random_seed = random_default_seed ();
+  bm->vlib_main = vm;
+  bm->vnet_main = vnet_get_main ();
+  memset (&bm->wheel, 0, sizeof (bm->wheel));
+  bm->cpu_cps = 2590000000;	// vm->clib_time.clocks_per_second;
+  BFD_DBG ("cps is %.2f", bm->cpu_cps);
+  const u64 now = clib_cpu_time_now ();
+  timing_wheel_init (&bm->wheel, now, bm->cpu_cps);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (bfd_main_init);
+
+bfd_session_t *
+bfd_get_session (bfd_main_t * bm, bfd_transport_t t)
+{
+  bfd_session_t *result;
+  pool_get (bm->sessions, result);
+  result->bs_idx = result - bm->sessions;
+  result->transport = t;
+  result->local_discr = random_u32 (&bm->random_seed);
+  bfd_set_defaults (bm, result);
+  hash_set (bm->session_by_disc, result->local_discr, result->bs_idx);
+  return result;
+}
+
+void
+bfd_put_session (bfd_main_t * bm, bfd_session_t * bs)
+{
+  hash_unset (bm->session_by_disc, bs->local_discr);
+  pool_put (bm->sessions, bs);
+}
+
+bfd_session_t *
+bfd_find_session_by_idx (bfd_main_t * bm, uword bs_idx)
+{
+  if (!pool_is_free_index (bm->sessions, bs_idx))
+    {
+      return pool_elt_at_index (bm->sessions, bs_idx);
+    }
+  return NULL;
+}
+
+bfd_session_t *
+bfd_find_session_by_disc (bfd_main_t * bm, u32 disc)
+{
+  uword *p = hash_get (bfd_main.session_by_disc, disc);
+  if (p)
+    {
+      return pool_elt_at_index (bfd_main.sessions, *p);
+    }
+  return NULL;
+}
+
+/**
+ * @brief verify bfd packet - common checks
+ *
+ * @param pkt
+ *
+ * @return 1 if bfd packet is valid
+ */
+int
+bfd_verify_pkt_common (const bfd_pkt_t * pkt)
+{
+  if (1 != bfd_pkt_get_version (pkt))
+    {
+      BFD_ERR ("BFD verification failed - unexpected version: '%d'",
+	       bfd_pkt_get_version (pkt));
+      return 0;
+    }
+  if (pkt->head.length < sizeof (bfd_pkt_t) ||
+      (bfd_pkt_get_auth_present (pkt) &&
+       pkt->head.length < sizeof (bfd_pkt_with_auth_t)))
+    {
+      BFD_ERR ("BFD verification failed - unexpected length: '%d' (auth "
+	       "present: %d)",
+	       pkt->head.length, bfd_pkt_get_auth_present (pkt));
+      return 0;
+    }
+  if (!pkt->head.detect_mult)
+    {
+      BFD_ERR ("BFD verification failed - unexpected detect-mult: '%d'",
+	       pkt->head.detect_mult);
+      return 0;
+    }
+  if (bfd_pkt_get_multipoint (pkt))
+    {
+      BFD_ERR ("BFD verification failed - unexpected multipoint: '%d'",
+	       bfd_pkt_get_multipoint (pkt));
+      return 0;
+    }
+  if (!pkt->my_disc)
+    {
+      BFD_ERR ("BFD verification failed - unexpected my-disc: '%d'",
+	       pkt->my_disc);
+      return 0;
+    }
+  if (!pkt->your_disc)
+    {
+      const u8 pkt_state = bfd_pkt_get_state (pkt);
+      if (pkt_state != BFD_STATE_down && pkt_state != BFD_STATE_admin_down)
+	{
+	  BFD_ERR ("BFD verification failed - unexpected state: '%s' "
+		   "(your-disc is zero)", bfd_state_string (pkt_state));
+	  return 0;
+	}
+    }
+  return 1;
+}
+
+/**
+ * @brief verify bfd packet - authentication
+ *
+ * @param pkt
+ *
+ * @return 1 if bfd packet is valid
+ */
+int
+bfd_verify_pkt_session (const bfd_pkt_t * pkt, u16 pkt_size,
+			const bfd_session_t * bs)
+{
+  const bfd_pkt_with_auth_t *with_auth = (bfd_pkt_with_auth_t *) pkt;
+  if (!bfd_pkt_get_auth_present (pkt))
+    {
+      if (pkt_size > sizeof (*pkt))
+	{
+	  BFD_ERR ("BFD verification failed - unexpected packet size '%d' "
+		   "(auth not present)", pkt_size);
+	  return 0;
+	}
+    }
+  else
+    {
+      if (!with_auth->auth.type)
+	{
+	  BFD_ERR ("BFD verification failed - unexpected auth type: '%d'",
+		   with_auth->auth.type);
+	  return 0;
+	}
+      /* TODO FIXME - implement the actual verification */
+    }
+  return 1;
+}
+
+void
+bfd_consume_pkt (bfd_main_t * bm, const bfd_pkt_t * pkt, u32 bs_idx)
+{
+  bfd_session_t *bs = bfd_find_session_by_idx (bm, bs_idx);
+  if (!bs)
+    {
+      return;
+    }
+  BFD_DBG ("Scanning bfd packet, bs_idx=%d", bs->bs_idx);
+  bs->remote_discr = pkt->my_disc;
+  bs->remote_state = bfd_pkt_get_state (pkt);
+  bs->remote_demand = bfd_pkt_get_demand (pkt);
+  bs->remote_min_rx_us = clib_net_to_host_u32 (pkt->req_min_rx);
+  bs->remote_min_rx_clocks = bfd_us_to_clocks (bm, bs->remote_min_rx_us);
+  BFD_DBG ("Set remote min rx to %lu clocks/%.2fs", bs->remote_min_rx_clocks,
+	   bs->remote_min_rx_clocks / bm->cpu_cps);
+  bs->remote_desired_min_tx_us = clib_net_to_host_u32 (pkt->des_min_tx);
+  bs->remote_detect_mult = pkt->head.detect_mult;
+  bfd_recalc_detection_time (bm, bs);
+  bs->last_rx_clocks = clib_cpu_time_now ();
+  /* FIXME
+     If the Required Min Echo RX Interval field is zero, the
+     transmission of Echo packets, if any, MUST cease.
+
+     If a Poll Sequence is being transmitted by the local system and
+     the Final (F) bit in the received packet is set, the Poll Sequence
+     MUST be terminated.
+   */
+  /* FIXME 6.8.2 */
+  /* FIXME 6.8.4 */
+  if (BFD_STATE_admin_down == bs->local_state)
+    return;
+  if (BFD_STATE_admin_down == bs->remote_state)
+    {
+      bfd_set_diag (bs, BFD_DIAG_CODE_neighbor_sig_down);
+      bfd_set_state (bm, bs, BFD_STATE_down);
+    }
+  else if (BFD_STATE_down == bs->local_state)
+    {
+      if (BFD_STATE_down == bs->remote_state)
+	{
+	  bfd_set_state (bm, bs, BFD_STATE_init);
+	}
+      else if (BFD_STATE_init == bs->remote_state)
+	{
+	  bfd_set_state (bm, bs, BFD_STATE_up);
+	}
+    }
+  else if (BFD_STATE_init == bs->local_state)
+    {
+      if (BFD_STATE_up == bs->remote_state ||
+	  BFD_STATE_init == bs->remote_state)
+	{
+	  bfd_set_state (bm, bs, BFD_STATE_up);
+	}
+    }
+  else				/* BFD_STATE_up == bs->local_state */
+    {
+      if (BFD_STATE_down == bs->remote_state)
+	{
+	  bfd_set_diag (bs, BFD_DIAG_CODE_neighbor_sig_down);
+	  bfd_set_state (bm, bs, BFD_STATE_down);
+	}
+    }
+}
+
+u8 *
+format_bfd_session (u8 * s, va_list * args)
+{
+  const bfd_session_t *bs = va_arg (*args, bfd_session_t *);
+  return format (s, "BFD(%u): bfd.SessionState=%s, "
+		 "bfd.RemoteSessionState=%s, "
+		 "bfd.LocalDiscr=%u, "
+		 "bfd.RemoteDiscr=%u, "
+		 "bfd.LocalDiag=%s, "
+		 "bfd.DesiredMinTxInterval=%u, "
+		 "bfd.RequiredMinRxInterval=%u, "
+		 "bfd.RemoteMinRxInterval=%u, "
+		 "bfd.DemandMode=%s, "
+		 "bfd.RemoteDemandMode=%s, "
+		 "bfd.DetectMult=%u, ",
+		 bs->bs_idx, bfd_state_string (bs->local_state),
+		 bfd_state_string (bs->remote_state), bs->local_discr,
+		 bs->remote_discr, bfd_diag_code_string (bs->local_diag),
+		 bs->desired_min_tx_us, bs->required_min_rx_us,
+		 bs->remote_min_rx_us, (bs->local_demand ? "yes" : "no"),
+		 (bs->remote_demand ? "yes" : "no"), bs->local_detect_mult);
+}
+
+bfd_main_t bfd_main;
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vnet/vnet/bfd/bfd_main.h b/vnet/vnet/bfd/bfd_main.h
new file mode 100644
index 00000000..727903bd
--- /dev/null
+++ b/vnet/vnet/bfd/bfd_main.h
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief BFD global declarations
+ */
+#ifndef __included_bfd_main_h__
+#define __included_bfd_main_h__
+
+#include <vppinfra/timing_wheel.h>
+#include <vnet/vnet.h>
+#include <vnet/bfd/bfd_protocol.h>
+#include <vnet/bfd/bfd_udp.h>
+
+#define foreach_bfd_transport(F) \
+  F (UDP4, "ip4-rewrite")  \
+  F (UDP6, "ip6-rewrite")
+
+typedef enum
+{
+#define F(t, n) BFD_TRANSPORT_##t,
+  foreach_bfd_transport (F)
+#undef F
+} bfd_transport_t;
+
+#define foreach_bfd_mode(F) \
+  F (asynchronous)          \
+  F (demand)
+
+typedef enum
+{
+#define F(x) BFD_MODE_##x,
+  foreach_bfd_mode (F)
+#undef F
+} bfd_mode_e;
+
+typedef struct
+{
+  /* index in bfd_main.sessions pool */
+  uword bs_idx;
+
+  /* session state */
+  bfd_state_e local_state;
+
+  /* local diagnostics */
+  bfd_diag_code_e local_diag;
+
+  /* remote session state */
+  bfd_state_e remote_state;
+
+  /* local discriminator */
+  u32 local_discr;
+
+  /* remote discriminator */
+  u32 remote_discr;
+
+  /* configured desired min tx interval (microseconds) */
+  u32 config_desired_min_tx_us;
+
+  /* desired min tx interval (microseconds) */
+  u32 desired_min_tx_us;
+
+  /* desired min tx interval (clocks) */
+  u64 desired_min_tx_clocks;
+
+  /* required min rx interval */
+  u32 required_min_rx_us;
+
+  /* remote min rx interval (microseconds) */
+  u32 remote_min_rx_us;
+
+  /* remote min rx interval (clocks) */
+  u64 remote_min_rx_clocks;
+
+  /* remote desired min tx interval */
+  u32 remote_desired_min_tx_us;
+
+  /* 1 if in demand mode, 0 otherwise */
+  u8 local_demand;
+
+  /* 1 if remote system sets demand mode, 0 otherwise */
+  u8 remote_demand;
+
+  u8 local_detect_mult;
+  u8 remote_detect_mult;
+
+  /* set to value of timer in timing wheel, 0 if not set */
+  u64 wheel_time_clocks;
+
+  /* transmit interval */
+  u64 transmit_interval_clocks;
+
+  /* next time at which to transmit a packet */
+  u64 tx_timeout_clocks;
+
+  /* timestamp of last packet received */
+  u64 last_rx_clocks;
+
+  /* detection time */
+  u64 detection_time_clocks;
+
+  /* transport type for this session */
+  bfd_transport_t transport;
+
+  union
+  {
+    bfd_udp_session_t udp;
+  };
+} bfd_session_t;
+
+typedef struct
+{
+  u32 client_index;
+  u32 client_pid;
+} event_subscriber_t;
+
+typedef struct
+{
+  /* pool of bfd sessions context data */
+  bfd_session_t *sessions;
+
+  /* timing wheel for scheduling timeouts */
+  timing_wheel_t wheel;
+
+  /* hashmap - bfd session by discriminator */
+  u32 *session_by_disc;
+
+  /* background process node index */
+  u32 bfd_process_node_index;
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+
+  /* cpu clocks per second */
+  f64 cpu_cps;
+
+  /* for generating random numbers */
+  u32 random_seed;
+
+  /* pool of event subscribers */
+  //event_subscriber_t *subscribers;
+
+} bfd_main_t;
+
+extern bfd_main_t bfd_main;
+
+/* Packet counters */
+#define foreach_bfd_error(F)               \
+  F (NONE, "good bfd packets (processed)") \
+  F (BAD, "invalid bfd packets")           \
+  F (DISABLED, "bfd packets received on disabled interfaces")
+
+typedef enum
+{
+#define F(sym, str) BFD_ERROR_##sym,
+  foreach_bfd_error (F)
+#undef F
+    BFD_N_ERROR,
+} bfd_error_t;
+
+/* bfd packet trace capture */
+typedef struct
+{
+  u32 len;
+  u8 data[400];
+} bfd_input_trace_t;
+
+enum
+{
+  BFD_EVENT_RESCHEDULE = 1,
+  BFD_EVENT_NEW_SESSION,
+} bfd_process_event_e;
+
+bfd_error_t bfd_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0);
+u8 *bfd_input_format_trace (u8 * s, va_list * args);
+
+bfd_session_t *bfd_get_session (bfd_main_t * bm, bfd_transport_t t);
+void bfd_put_session (bfd_main_t * bm, bfd_session_t * bs);
+bfd_session_t *bfd_find_session_by_idx (bfd_main_t * bm, uword bs_idx);
+bfd_session_t *bfd_find_session_by_disc (bfd_main_t * bm, u32 disc);
+void bfd_session_start (bfd_main_t * bm, bfd_session_t * bs);
+void bfd_consume_pkt (bfd_main_t * bm, const bfd_pkt_t * bfd, u32 bs_idx);
+int bfd_verify_pkt_common (const bfd_pkt_t * pkt);
+int bfd_verify_pkt_session (const bfd_pkt_t * pkt, u16 pkt_size,
+			    const bfd_session_t * bs);
+void bfd_event (bfd_main_t * bm, bfd_session_t * bs);
+void bfd_send_final (vlib_main_t * vm, vlib_buffer_t * b, bfd_session_t * bs);
+u8 *format_bfd_session (u8 * s, va_list * args);
+
+
+#define USEC_PER_MS 1000LL
+#define USEC_PER_SECOND (1000 * USEC_PER_MS)
+
+/* default, slow transmission interval for BFD packets, per spec at least 1s */
+#define BFD_DEFAULT_DESIRED_MIN_TX_US USEC_PER_SECOND
+
+#endif /* __included_bfd_main_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vnet/vnet/bfd/bfd_protocol.c b/vnet/vnet/bfd/bfd_protocol.c
new file mode 100644
index 00000000..ede9536f
--- /dev/null
+++ b/vnet/vnet/bfd/bfd_protocol.c
@@ -0,0 +1,74 @@
+#include <vnet/bfd/bfd_protocol.h>
+
+u8 bfd_pkt_get_version (const bfd_pkt_t *pkt)
+{
+  return pkt->head.vers_diag >> 5;
+}
+
+void bfd_pkt_set_version (bfd_pkt_t *pkt, int version)
+{
+  pkt->head.vers_diag =
+      (version << 5) | (pkt->head.vers_diag & ((1 << 5) - 1));
+}
+
+u8 bfd_pkt_get_diag_code (const bfd_pkt_t *pkt)
+{
+  return pkt->head.vers_diag & ((1 << 5) - 1);
+}
+
+void bfd_pkt_set_diag_code (bfd_pkt_t *pkt, int value)
+{
+  pkt->head.vers_diag =
+      (pkt->head.vers_diag & ~((1 << 5) - 1)) | (value & ((1 << 5) - 1));
+}
+
+u8 bfd_pkt_get_state (const bfd_pkt_t *pkt)
+{
+  return pkt->head.sta_flags >> 6;
+}
+
+void bfd_pkt_set_state (bfd_pkt_t *pkt, int value)
+{
+  pkt->head.sta_flags = (value << 6) | (pkt->head.sta_flags & ((1 << 6) - 1));
+}
+
+u8 bfd_pkt_get_poll (const bfd_pkt_t *pkt)
+{
+  return (pkt->head.sta_flags >> 5) & 1;
+}
+
+void bfd_pkt_set_final (bfd_pkt_t *pkt) { pkt->head.sta_flags |= 1 << 5; }
+
+u8 bfd_pkt_get_final (const bfd_pkt_t *pkt)
+{
+  return (pkt->head.sta_flags >> 4) & 1;
+}
+
+void bfd_pkt_set_poll (bfd_pkt_t *pkt);
+u8 bfd_pkt_get_control_plane_independent (const bfd_pkt_t *pkt)
+{
+  return (pkt->head.sta_flags >> 3) & 1;
+}
+
+void bfd_pkt_set_control_plane_independent (bfd_pkt_t *pkt);
+
+u8 bfd_pkt_get_auth_present (const bfd_pkt_t *pkt)
+{
+  return (pkt->head.sta_flags >> 2) & 1;
+}
+
+void bfd_pkt_set_auth_present (bfd_pkt_t *pkt);
+
+u8 bfd_pkt_get_demand (const bfd_pkt_t *pkt)
+{
+  return (pkt->head.sta_flags >> 1) & 1;
+}
+
+void bfd_pkt_set_demand (bfd_pkt_t *pkt) { pkt->head.sta_flags |= 1 << 1; }
+
+u8 bfd_pkt_get_multipoint (const bfd_pkt_t *pkt)
+{
+  return pkt->head.sta_flags & 1;
+}
+
+void bfd_pkt_set_multipoint (bfd_pkt_t *pkt);
diff --git a/vnet/vnet/bfd/bfd_protocol.h b/vnet/vnet/bfd/bfd_protocol.h
new file mode 100644
index 00000000..cf751b3b
--- /dev/null
+++ b/vnet/vnet/bfd/bfd_protocol.h
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_bfd_protocol_h__
+#define __included_bfd_protocol_h__
+/**
+ * @file
+ * @brief BFD protocol declarations
+ */
+
+#include <vppinfra/types.h>
+#include <vppinfra/clib.h>
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  /*
+   An optional Authentication Section MAY be present:
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |   Auth Type   |   Auth Len    |    Authentication Data...     |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  */
+  u8 type;
+  u8 len;
+  u8 data[0];
+}) bfd_auth_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  /*
+     The Mandatory Section of a BFD Control packet has the following
+     format:
+
+      0                   1                   2                   3
+      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     |Vers |  Diag   |Sta|P|F|C|A|D|M|  Detect Mult  |    Length     |
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     |                       My Discriminator                        |
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     |                      Your Discriminator                       |
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     |                    Desired Min TX Interval                    |
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     |                   Required Min RX Interval                    |
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     |                 Required Min Echo RX Interval                 |
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  */
+  struct
+  {
+    u8 vers_diag;
+    u8 sta_flags;
+    u8 detect_mult;
+    u8 length;
+  } head;
+  u32 my_disc;
+  u32 your_disc;
+  u32 des_min_tx;
+  u32 req_min_rx;
+  u32 req_min_echo_rx;
+}) bfd_pkt_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  bfd_pkt_t pkt;
+  bfd_auth_t auth;
+}) bfd_pkt_with_auth_t;
+/* *INDENT-ON* */
+
+u8 bfd_pkt_get_version (const bfd_pkt_t * pkt);
+void bfd_pkt_set_version (bfd_pkt_t * pkt, int version);
+u8 bfd_pkt_get_diag_code (const bfd_pkt_t * pkt);
+void bfd_pkt_set_diag_code (bfd_pkt_t * pkt, int value);
+u8 bfd_pkt_get_state (const bfd_pkt_t * pkt);
+void bfd_pkt_set_state (bfd_pkt_t * pkt, int value);
+u8 bfd_pkt_get_poll (const bfd_pkt_t * pkt);
+void bfd_pkt_set_final (bfd_pkt_t * pkt);
+u8 bfd_pkt_get_final (const bfd_pkt_t * pkt);
+void bfd_pkt_set_poll (bfd_pkt_t * pkt);
+u8 bfd_pkt_get_control_plane_independent (const bfd_pkt_t * pkt);
+void bfd_pkt_set_control_plane_independent (bfd_pkt_t * pkt);
+u8 bfd_pkt_get_auth_present (const bfd_pkt_t * pkt);
+void bfd_pkt_set_auth_present (bfd_pkt_t * pkt);
+u8 bfd_pkt_get_demand (const bfd_pkt_t * pkt);
+void bfd_pkt_set_demand (bfd_pkt_t * pkt);
+u8 bfd_pkt_get_multipoint (const bfd_pkt_t * pkt);
+void bfd_pkt_set_multipoint (bfd_pkt_t * pkt);
+
+/* BFD diagnostic codes */
+#define foreach_bfd_diag_code(F)                             \
+  F (0, no_diag, "No Diagnostic")                            \
+  F (1, det_time_exp, "Control Detection Time Expired")      \
+  F (2, echo_failed, "Echo Function Failed")                 \
+  F (3, neighbor_sig_down, "Neighbor Signaled Session Down") \
+  F (4, fwd_plain_reset, "Forwarding Plane Reset")           \
+  F (5, path_down, "Path Down")                              \
+  F (6, concat_path_down, "Concatenated Path Down")          \
+  F (7, admin_down, "Administratively Down")                 \
+  F (8, reverse_concat_path_down, "Reverse Concatenated Path Down")
+
+#define BFD_DIAG_CODE_NAME(t) BFD_DIAG_CODE_##t
+
+typedef enum
+{
+#define F(n, t, s) BFD_DIAG_CODE_NAME (t) = n,
+  foreach_bfd_diag_code (F)
+#undef F
+} bfd_diag_code_e;
+
+const char *bfd_diag_code_string (bfd_diag_code_e diag);
+
+/* BFD state values */
+#define foreach_bfd_state(F)     \
+  F (0, admin_down, "AdminDown") \
+  F (1, down, "Down")            \
+  F (2, init, "Init")            \
+  F (3, up, "Up")
+
+#define BFD_STATE_NAME(t) BFD_STATE_##t
+
+typedef enum
+{
+#define F(n, t, s) BFD_STATE_NAME (t) = n,
+  foreach_bfd_state (F)
+#undef F
+} bfd_state_e;
+
+const char *bfd_state_string (bfd_state_e state);
+
+#endif /* __included_bfd_protocol_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vnet/vnet/bfd/bfd_udp.c b/vnet/vnet/bfd/bfd_udp.c
new file mode 100644
index 00000000..ded33425
--- /dev/null
+++ b/vnet/vnet/bfd/bfd_udp.c
@@ -0,0 +1,610 @@
+#include <vppinfra/types.h>
+#include <vlibmemory/api.h>
+#include <vlib/vlib.h>
+#include <vlib/buffer.h>
+#include <vnet/ip/format.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/ip/udp_packet.h>
+#include <vnet/ip/lookup.h>
+#include <vnet/ip/icmp46_packet.h>
+#include <vnet/ip/ip4.h>
+#include <vnet/ip/ip6.h>
+#include <vnet/ip/udp.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/adj/adj.h>
+#include <vnet/adj/adj_nbr.h>
+#include <vnet/bfd/bfd_debug.h>
+#include <vnet/bfd/bfd_udp.h>
+#include <vnet/bfd/bfd_main.h>
+#include <vnet/bfd/bfd_api.h>
+
+typedef struct
+{
+  bfd_main_t *bfd_main;
+  /* hashmap - bfd session index by bfd key - used for CLI/API lookup, where
+   * discriminator is unknown */
+  mhash_t bfd_session_idx_by_bfd_key;
+} bfd_udp_main_t;
+
+bfd_udp_main_t bfd_udp_main;
+
+void bfd_udp_transport_to_buffer (vlib_main_t *vm, vlib_buffer_t *b,
+                                  bfd_udp_session_t *bus)
+{
+  udp_header_t *udp;
+  u16 udp_length, ip_length;
+  bfd_udp_key_t *key = &bus->key;
+
+  b->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
+  if (ip46_address_is_ip4 (&key->local_addr))
+    {
+      ip4_header_t *ip4;
+      const size_t data_size = sizeof (*ip4) + sizeof (*udp);
+      vlib_buffer_advance (b, -data_size);
+      ip4 = vlib_buffer_get_current (b);
+      udp = (udp_header_t *)(ip4 + 1);
+      memset (ip4, 0, data_size);
+      ip4->ip_version_and_header_length = 0x45;
+      ip4->ttl = 255;
+      ip4->protocol = IP_PROTOCOL_UDP;
+      ip4->src_address.as_u32 = key->local_addr.ip4.as_u32;
+      ip4->dst_address.as_u32 = key->peer_addr.ip4.as_u32;
+
+      udp->src_port = clib_host_to_net_u16 (50000); /* FIXME */
+      udp->dst_port = clib_host_to_net_u16 (UDP_DST_PORT_bfd4);
+
+      /* fix ip length, checksum and udp length */
+      ip_length = vlib_buffer_length_in_chain (vm, b);
+
+      ip4->length = clib_host_to_net_u16 (ip_length);
+      ip4->checksum = ip4_header_checksum (ip4);
+
+      udp_length = ip_length - (sizeof (*ip4));
+      udp->length = clib_host_to_net_u16 (udp_length);
+    }
+  else
+    {
+      BFD_ERR ("not implemented");
+      abort ();
+    }
+}
+
+void bfd_add_udp_transport (vlib_main_t *vm, vlib_buffer_t *b,
+                            bfd_udp_session_t *bus)
+{
+  vnet_buffer (b)->ip.adj_index[VLIB_RX] = bus->adj_index;
+  vnet_buffer (b)->ip.adj_index[VLIB_TX] = bus->adj_index;
+  bfd_udp_transport_to_buffer (vm, b, bus);
+}
+
+static bfd_session_t *bfd_lookup_session (bfd_udp_main_t *bum,
+                                          const bfd_udp_key_t *key)
+{
+  uword *p = mhash_get (&bum->bfd_session_idx_by_bfd_key, key);
+  if (p)
+    {
+      return bfd_find_session_by_idx (bum->bfd_main, *p);
+    }
+  return 0;
+}
+
+static vnet_api_error_t
+bfd_udp_add_session_internal (bfd_udp_main_t *bum, u32 sw_if_index,
+                              u32 desired_min_tx_us, u32 required_min_rx_us,
+                              u8 detect_mult, const ip46_address_t *local_addr,
+                              const ip46_address_t *peer_addr)
+{
+  vnet_sw_interface_t *sw_if =
+      vnet_get_sw_interface (vnet_get_main (), sw_if_index);
+  /* get a pool entry and if we end up not needing it, give it back */
+  bfd_transport_t t = BFD_TRANSPORT_UDP4;
+  if (!ip46_address_is_ip4 (local_addr))
+    {
+      t = BFD_TRANSPORT_UDP6;
+    }
+  bfd_session_t *bs = bfd_get_session (bum->bfd_main, t);
+  bfd_udp_session_t *bus = &bs->udp;
+  memset (bus, 0, sizeof (*bus));
+  bfd_udp_key_t *key = &bus->key;
+  key->sw_if_index = sw_if->sw_if_index;
+  key->local_addr.as_u64[0] = local_addr->as_u64[0];
+  key->local_addr.as_u64[1] = local_addr->as_u64[1];
+  key->peer_addr.as_u64[0] = peer_addr->as_u64[0];
+  key->peer_addr.as_u64[1] = peer_addr->as_u64[1];
+  const bfd_session_t *tmp = bfd_lookup_session (bum, key);
+  if (tmp)
+    {
+      BFD_ERR ("duplicate bfd-udp session, existing bs_idx=%d", tmp->bs_idx);
+      bfd_put_session (bum->bfd_main, bs);
+      return VNET_API_ERROR_BFD_EEXIST;
+    }
+  key->sw_if_index = sw_if->sw_if_index;
+  mhash_set (&bum->bfd_session_idx_by_bfd_key, key, bs->bs_idx, NULL);
+  BFD_DBG ("session created, bs_idx=%u, sw_if_index=%d, local=%U, peer=%U",
+           bs->bs_idx, key->sw_if_index, format_ip46_address, &key->local_addr,
+           IP46_TYPE_ANY, format_ip46_address, &key->peer_addr, IP46_TYPE_ANY);
+  if (BFD_TRANSPORT_UDP4 == t)
+    {
+      bus->adj_index = adj_nbr_add_or_lock (FIB_PROTOCOL_IP4, VNET_LINK_IP4,
+                                            &key->peer_addr, key->sw_if_index);
+      BFD_DBG ("adj_nbr_add_or_lock(FIB_PROTOCOL_IP4, VNET_LINK_IP4, %U, %d) "
+               "returns %d",
+               format_ip46_address, &key->peer_addr, IP46_TYPE_ANY,
+               key->sw_if_index, bus->adj_index);
+    }
+  else
+    {
+      bus->adj_index = adj_nbr_add_or_lock (FIB_PROTOCOL_IP6, VNET_LINK_IP6,
+                                            &key->peer_addr, key->sw_if_index);
+      BFD_DBG ("adj_nbr_add_or_lock(FIB_PROTOCOL_IP6, VNET_LINK_IP6, %U, %d) "
+               "returns %d",
+               format_ip46_address, &key->peer_addr, IP46_TYPE_ANY,
+               key->sw_if_index, bus->adj_index);
+    }
+  bs->config_desired_min_tx_us = desired_min_tx_us;
+  bs->required_min_rx_us = required_min_rx_us;
+  bs->local_detect_mult = detect_mult;
+  bfd_session_start (bum->bfd_main, bs);
+  return 0;
+}
+
+static vnet_api_error_t
+bfd_udp_validate_api_input (u32 sw_if_index, const ip46_address_t *local_addr,
+                            const ip46_address_t *peer_addr)
+{
+  vnet_sw_interface_t *sw_if =
+      vnet_get_sw_interface (vnet_get_main (), sw_if_index);
+  u8 local_ip_valid = 0;
+  ip_interface_address_t *ia = NULL;
+  if (!sw_if)
+    {
+      BFD_ERR ("got NULL sw_if");
+      return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+    }
+  if (ip46_address_is_ip4 (local_addr))
+    {
+      if (!ip46_address_is_ip4 (peer_addr))
+        {
+          BFD_ERR ("IP family mismatch");
+          return VNET_API_ERROR_INVALID_ARGUMENT;
+        }
+      ip4_main_t *im = &ip4_main;
+
+      /* *INDENT-OFF* */
+      foreach_ip_interface_address (
+          &im->lookup_main, ia, sw_if_index, 0 /* honor unnumbered */, ({
+            ip4_address_t *x =
+                ip_interface_address_get_address (&im->lookup_main, ia);
+            if (x->as_u32 == local_addr->ip4.as_u32)
+              {
+                /* valid address for this interface */
+                local_ip_valid = 1;
+                break;
+              }
+          }));
+      /* *INDENT-ON* */
+    }
+  else
+    {
+      if (ip46_address_is_ip4 (peer_addr))
+        {
+          BFD_ERR ("IP family mismatch");
+          return VNET_API_ERROR_INVALID_ARGUMENT;
+        }
+      ip6_main_t *im = &ip6_main;
+      /* *INDENT-OFF* */
+      foreach_ip_interface_address (
+          &im->lookup_main, ia, sw_if_index, 0 /* honor unnumbered */, ({
+            ip6_address_t *x =
+                ip_interface_address_get_address (&im->lookup_main, ia);
+            if (local_addr->ip6.as_u64[0] == x->as_u64[0] &&
+                local_addr->ip6.as_u64[1] == x->as_u64[1])
+              {
+                /* valid address for this interface */
+                local_ip_valid = 1;
+                break;
+              }
+          }));
+      /* *INDENT-ON* */
+    }
+
+  if (!local_ip_valid)
+    {
+      BFD_ERR ("address not found on interface");
+      return VNET_API_ERROR_ADDRESS_NOT_FOUND_FOR_INTERFACE;
+    }
+
+  return 0;
+}
+
+vnet_api_error_t bfd_udp_add_session (u32 sw_if_index, u32 desired_min_tx_us,
+                                      u32 required_min_rx_us, u8 detect_mult,
+                                      const ip46_address_t *local_addr,
+                                      const ip46_address_t *peer_addr)
+{
+  vnet_api_error_t rv =
+      bfd_udp_validate_api_input (sw_if_index, local_addr, peer_addr);
+  if (rv)
+    {
+      return rv;
+    }
+  if (detect_mult < 1)
+    {
+      BFD_ERR ("detect_mult < 1");
+      return VNET_API_ERROR_INVALID_ARGUMENT;
+    }
+  if (desired_min_tx_us < 1)
+    {
+      BFD_ERR ("desired_min_tx_us < 1");
+      return VNET_API_ERROR_INVALID_ARGUMENT;
+    }
+  return bfd_udp_add_session_internal (&bfd_udp_main, sw_if_index,
+                                       desired_min_tx_us, required_min_rx_us,
+                                       detect_mult, local_addr, peer_addr);
+}
+
+vnet_api_error_t bfd_udp_del_session (u32 sw_if_index,
+                                      const ip46_address_t *local_addr,
+                                      const ip46_address_t *peer_addr)
+{
+  vnet_api_error_t rv =
+      bfd_udp_validate_api_input (sw_if_index, local_addr, peer_addr);
+  if (rv)
+    {
+      return rv;
+    }
+  bfd_udp_main_t *bum = &bfd_udp_main;
+  vnet_sw_interface_t *sw_if =
+      vnet_get_sw_interface (vnet_get_main (), sw_if_index);
+  bfd_udp_key_t key;
+  memset (&key, 0, sizeof (key));
+  key.sw_if_index = sw_if->sw_if_index;
+  key.local_addr.as_u64[0] = local_addr->as_u64[0];
+  key.local_addr.as_u64[1] = local_addr->as_u64[1];
+  key.peer_addr.as_u64[0] = peer_addr->as_u64[0];
+  key.peer_addr.as_u64[1] = peer_addr->as_u64[1];
+  bfd_session_t *tmp = bfd_lookup_session (bum, &key);
+  if (tmp)
+    {
+      BFD_DBG ("free bfd-udp session, bs_idx=%d", tmp->bs_idx);
+      mhash_unset (&bum->bfd_session_idx_by_bfd_key, &key, NULL);
+      adj_unlock (tmp->udp.adj_index);
+      bfd_put_session (bum->bfd_main, tmp);
+    }
+  else
+    {
+      BFD_ERR ("no such session");
+      return VNET_API_ERROR_BFD_NOENT;
+    }
+  return 0;
+}
+
+typedef enum {
+  BFD_UDP_INPUT_NEXT_NORMAL,
+  BFD_UDP_INPUT_NEXT_REPLY,
+  BFD_UDP_INPUT_N_NEXT,
+} bfd_udp_input_next_t;
+
+/* Packet counters */
+#define foreach_bfd_udp_error(F)           \
+  F (NONE, "good bfd packets (processed)") \
+  F (BAD, "invalid bfd packets")           \
+  F (DISABLED, "bfd packets received on disabled interfaces")
+
+#define F(sym, string) static char BFD_UDP_ERR_##sym##_STR[] = string;
+foreach_bfd_udp_error (F);
+#undef F
+
+static char *bfd_udp_error_strings[] = {
+#define F(sym, string) BFD_UDP_ERR_##sym##_STR,
+  foreach_bfd_udp_error (F)
+#undef F
+};
+
+typedef enum {
+#define F(sym, str) BFD_UDP_ERROR_##sym,
+  foreach_bfd_udp_error (F)
+#undef F
+      BFD_UDP_N_ERROR,
+} bfd_udp_error_t;
+
+static void bfd_udp4_find_headers (vlib_buffer_t *b, const ip4_header_t **ip4,
+                                   const udp_header_t **udp)
+{
+  *ip4 = vnet_buffer (b)->ip.header;
+  *udp = (udp_header_t *)((*ip4) + 1);
+}
+
+static bfd_udp_error_t bfd_udp4_verify_transport (const ip4_header_t *ip4,
+                                                  const udp_header_t *udp,
+                                                  const bfd_session_t *bs)
+{
+  const bfd_udp_session_t *bus = &bs->udp;
+  const bfd_udp_key_t *key = &bus->key;
+  if (ip4->src_address.as_u32 != key->peer_addr.ip4.as_u32)
+    {
+      BFD_ERR ("IP src addr mismatch, got %U, expected %U", format_ip4_address,
+               ip4->src_address.as_u32, format_ip4_address,
+               key->peer_addr.ip4.as_u32);
+      return BFD_UDP_ERROR_BAD;
+    }
+  if (ip4->dst_address.as_u32 != key->local_addr.ip4.as_u32)
+    {
+      BFD_ERR ("IP dst addr mismatch, got %U, expected %U", format_ip4_address,
+               ip4->dst_address.as_u32, format_ip4_address,
+               key->local_addr.ip4.as_u32);
+      return BFD_UDP_ERROR_BAD;
+    }
+  const u8 expected_ttl = 255;
+  if (ip4->ttl != expected_ttl)
+    {
+      BFD_ERR ("IP unexpected TTL value %d, expected %d", ip4->ttl,
+               expected_ttl);
+      return BFD_UDP_ERROR_BAD;
+    }
+  if (clib_net_to_host_u16 (udp->src_port) < 49152 ||
+      clib_net_to_host_u16 (udp->src_port) > 65535)
+    {
+      BFD_ERR ("Invalid UDP src port %d, out of range <49152,65535>",
+               udp->src_port);
+    }
+  return BFD_UDP_ERROR_NONE;
+}
+
+typedef struct
+{
+  u32 bs_idx;
+  bfd_pkt_t pkt;
+} bfd_rpc_update_t;
+
+static void bfd_rpc_update_session_cb (const bfd_rpc_update_t *a)
+{
+  bfd_consume_pkt (bfd_udp_main.bfd_main, &a->pkt, a->bs_idx);
+}
+
+static void bfd_rpc_update_session (u32 bs_idx, const bfd_pkt_t *pkt)
+{
+  /* packet length was already verified to be correct by the caller */
+  const u32 data_size = sizeof (bfd_rpc_update_t) -
+                        STRUCT_SIZE_OF (bfd_rpc_update_t, pkt) +
+                        pkt->head.length;
+  u8 data[data_size];
+  bfd_rpc_update_t *update = (bfd_rpc_update_t *)data;
+  update->bs_idx = bs_idx;
+  clib_memcpy (&update->pkt, pkt, pkt->head.length);
+  vl_api_rpc_call_main_thread (bfd_rpc_update_session_cb, data, data_size);
+}
+
+static bfd_udp_error_t bfd_udp4_scan (vlib_main_t *vm, vlib_node_runtime_t *rt,
+                                      vlib_buffer_t *b, bfd_session_t **bs_out)
+{
+  const bfd_pkt_t *pkt = vlib_buffer_get_current (b);
+  if (sizeof (*pkt) > b->current_length)
+    {
+      BFD_ERR (
+          "Payload size %d too small to hold bfd packet of minimum size %d",
+          b->current_length, sizeof (*pkt));
+      return BFD_UDP_ERROR_BAD;
+    }
+  const ip4_header_t *ip4;
+  const udp_header_t *udp;
+  bfd_udp4_find_headers (b, &ip4, &udp);
+  if (!ip4 || !udp)
+    {
+      BFD_ERR ("Couldn't find ip4 or udp header");
+      return BFD_UDP_ERROR_BAD;
+    }
+  if (!bfd_verify_pkt_common (pkt))
+    {
+      return BFD_UDP_ERROR_BAD;
+    }
+  bfd_session_t *bs = NULL;
+  if (pkt->your_disc)
+    {
+      BFD_DBG ("Looking up BFD session using discriminator %u",
+               pkt->your_disc);
+      bs = bfd_find_session_by_disc (bfd_udp_main.bfd_main, pkt->your_disc);
+    }
+  else
+    {
+      bfd_udp_key_t key;
+      memset (&key, 0, sizeof (key));
+      key.sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_RX];
+      key.local_addr.ip4.as_u32 = ip4->dst_address.as_u32;
+      key.peer_addr.ip4.as_u32 = ip4->src_address.as_u32;
+      BFD_DBG ("Looking up BFD session using key (sw_if_index=%u, local=%U, "
+               "peer=%U)",
+               key.sw_if_index, format_ip4_address, key.local_addr.ip4.as_u8,
+               format_ip4_address, key.peer_addr.ip4.as_u8);
+      bs = bfd_lookup_session (&bfd_udp_main, &key);
+    }
+  if (!bs)
+    {
+      BFD_ERR ("BFD session lookup failed - no session matches BFD pkt");
+      return BFD_UDP_ERROR_BAD;
+    }
+  BFD_DBG ("BFD session found, bs_idx=%d", bs->bs_idx);
+  if (!bfd_verify_pkt_session (pkt, b->current_length, bs))
+    {
+      return BFD_UDP_ERROR_BAD;
+    }
+  bfd_udp_error_t err;
+  if (BFD_UDP_ERROR_NONE != (err = bfd_udp4_verify_transport (ip4, udp, bs)))
+    {
+      return err;
+    }
+  bfd_rpc_update_session (bs->bs_idx, pkt);
+  *bs_out = bs;
+  return BFD_UDP_ERROR_NONE;
+}
+
+static bfd_udp_error_t bfd_udp6_scan (vlib_main_t *vm, vlib_buffer_t *b)
+{
+  /* TODO */
+  return BFD_UDP_ERROR_BAD;
+}
+
+/*
+ * Process a frame of bfd packets
+ * Expect 1 packet / frame
+ */
+static uword bfd_udp_input (vlib_main_t *vm, vlib_node_runtime_t *rt,
+                            vlib_frame_t *f, int is_ipv6)
+{
+  u32 n_left_from, *from;
+  bfd_input_trace_t *t0;
+
+  from = vlib_frame_vector_args (f); /* array of buffer indices */
+  n_left_from = f->n_vectors;        /* number of buffer indices */
+
+  while (n_left_from > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      u32 next0, error0;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+
+      bfd_session_t *bs = NULL;
+
+      /* If this pkt is traced, snapshot the data */
+      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+        {
+          int len;
+          t0 = vlib_add_trace (vm, rt, b0, sizeof (*t0));
+          len = (b0->current_length < sizeof (t0->data)) ? b0->current_length
+                                                         : sizeof (t0->data);
+          t0->len = len;
+          clib_memcpy (t0->data, vlib_buffer_get_current (b0), len);
+        }
+
+      /* scan this bfd pkt. error0 is the counter index to bmp */
+      if (is_ipv6)
+        {
+          error0 = bfd_udp6_scan (vm, b0);
+        }
+      else
+        {
+          error0 = bfd_udp4_scan (vm, rt, b0, &bs);
+        }
+      b0->error = rt->errors[error0];
+
+      next0 = BFD_UDP_INPUT_NEXT_NORMAL;
+      if (BFD_UDP_ERROR_NONE == error0)
+        {
+	  /* if everything went fine, check for poll bit, if present, re-use
+	     the buffer and based on (now update) session parameters, send the
+	     final packet back */
+          const bfd_pkt_t *pkt = vlib_buffer_get_current (b0);
+          if (bfd_pkt_get_poll (pkt))
+            {
+              bfd_send_final (vm, b0, bs);
+	      next0 = BFD_UDP_INPUT_NEXT_REPLY;
+            }
+        }
+      vlib_set_next_frame_buffer (vm, rt, next0, bi0);
+
+      from += 1;
+      n_left_from -= 1;
+    }
+
+  return f->n_vectors;
+}
+
+static uword bfd_udp4_input (vlib_main_t *vm, vlib_node_runtime_t *rt,
+                             vlib_frame_t *f)
+{
+  return bfd_udp_input (vm, rt, f, 0);
+}
+
+/*
+ * bfd input graph node declaration
+ */
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (bfd_udp4_input_node, static) = {
+  .function = bfd_udp4_input,
+  .name = "bfd-udp4-input",
+  .vector_size = sizeof (u32),
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = BFD_UDP_N_ERROR,
+  .error_strings = bfd_udp_error_strings,
+
+  .format_trace = bfd_input_format_trace,
+
+  .n_next_nodes = BFD_UDP_INPUT_N_NEXT,
+  .next_nodes =
+      {
+              [BFD_UDP_INPUT_NEXT_NORMAL] = "error-drop",
+              [BFD_UDP_INPUT_NEXT_REPLY] = "ip4-lookup",
+      },
+};
+/* *INDENT-ON* */
+
+static uword bfd_udp6_input (vlib_main_t *vm, vlib_node_runtime_t *rt,
+                             vlib_frame_t *f)
+{
+  return bfd_udp_input (vm, rt, f, 1);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (bfd_udp6_input_node, static) = {
+  .function = bfd_udp6_input,
+  .name = "bfd-udp6-input",
+  .vector_size = sizeof (u32),
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = BFD_UDP_N_ERROR,
+  .error_strings = bfd_udp_error_strings,
+
+  .format_trace = bfd_input_format_trace,
+
+  .n_next_nodes = BFD_UDP_INPUT_N_NEXT,
+  .next_nodes =
+      {
+              [BFD_UDP_INPUT_NEXT_NORMAL] = "error-drop",
+              [BFD_UDP_INPUT_NEXT_REPLY] = "ip6-lookup",
+      },
+};
+/* *INDENT-ON* */
+
+static clib_error_t *bfd_sw_interface_up_down (vnet_main_t *vnm,
+                                               u32 sw_if_index, u32 flags)
+{
+  // vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
+    {
+      /* TODO */
+    }
+  return 0;
+}
+
+VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (bfd_sw_interface_up_down);
+
+static clib_error_t *bfd_hw_interface_up_down (vnet_main_t *vnm,
+                                               u32 hw_if_index, u32 flags)
+{
+  if (flags & VNET_HW_INTERFACE_FLAG_LINK_UP)
+    {
+      /* TODO */
+    }
+  return 0;
+}
+
+VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (bfd_hw_interface_up_down);
+
+/*
+ * setup function
+ */
+static clib_error_t *bfd_udp_init (vlib_main_t *vm)
+{
+  mhash_init (&bfd_udp_main.bfd_session_idx_by_bfd_key, sizeof (uword),
+              sizeof (bfd_udp_key_t));
+  bfd_udp_main.bfd_main = &bfd_main;
+  udp_register_dst_port (vm, UDP_DST_PORT_bfd4, bfd_udp4_input_node.index, 1);
+  udp_register_dst_port (vm, UDP_DST_PORT_bfd6, bfd_udp6_input_node.index, 0);
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (bfd_udp_init);
diff --git a/vnet/vnet/bfd/bfd_udp.h b/vnet/vnet/bfd/bfd_udp.h
new file mode 100644
index 00000000..51f5327b
--- /dev/null
+++ b/vnet/vnet/bfd/bfd_udp.h
@@ -0,0 +1,56 @@
+/* * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief BFD global declarations
+ */
+
+#ifndef __included_bfd_udp_h__
+#define __included_bfd_udp_h__
+
+#include <vppinfra/clib.h>
+#include <vnet/adj/adj_types.h>
+#include <vnet/ip/ip6_packet.h>
+
+#define BFD_UDP_KEY_BODY
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+
+  u32 sw_if_index;
+  ip46_address_t local_addr;
+  ip46_address_t peer_addr;
+
+}) bfd_udp_key_t;
+/* *INDENT-ON* */
+
+typedef struct
+{
+  bfd_udp_key_t key;
+
+  adj_index_t adj_index;
+} bfd_udp_session_t;
+
+void bfd_add_udp_transport (vlib_main_t * vm, vlib_buffer_t * b,
+			    bfd_udp_session_t * bs);
+
+#endif /* __included_bfd_udp_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vnet/vnet/bfd/dir.dox b/vnet/vnet/bfd/dir.dox
new file mode 100644
index 00000000..ed656b52
--- /dev/null
+++ b/vnet/vnet/bfd/dir.dox
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ @dir vnet/vnet/bfd
+ @brief Bidirectional Forwarding Detection (BFD) implementation
+*/
diff --git a/vnet/vnet/buffer.h b/vnet/vnet/buffer.h
index 898c94ee..82806bba 100644
--- a/vnet/vnet/buffer.h
+++ b/vnet/vnet/buffer.h
@@ -143,7 +143,11 @@ typedef struct
 	  u8 code;
 	  u32 data;
 	} icmp;
+
+	/* IP header - saved by ip*_local nodes */
+	void *header;
       };
+
     } ip;
 
     /*
diff --git a/vnet/vnet/ip/ip4_forward.c b/vnet/vnet/ip/ip4_forward.c
index fc7b3496..38729c8e 100644
--- a/vnet/vnet/ip/ip4_forward.c
+++ b/vnet/vnet/ip/ip4_forward.c
@@ -1472,9 +1472,12 @@ ip4_local (vlib_main_t * vm,
 	  ip0 = vlib_buffer_get_current (p0);
 	  ip1 = vlib_buffer_get_current (p1);
 
-	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
-                                vnet_buffer(p0)->sw_if_index[VLIB_RX]);
-	  fib_index1 = vec_elt (im->fib_index_by_sw_if_index,
+          vnet_buffer (p0)->ip.header = ip0;
+          vnet_buffer (p1)->ip.header = ip1;
+
+          fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
+                                vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+          fib_index1 = vec_elt (im->fib_index_by_sw_if_index,
                                 vnet_buffer(p1)->sw_if_index[VLIB_RX]);
 
 	  mtrie0 = &ip4_fib_get (fib_index0)->mtrie;
@@ -1679,6 +1682,8 @@ ip4_local (vlib_main_t * vm,
 
 	  ip0 = vlib_buffer_get_current (p0);
 
+          vnet_buffer (p0)->ip.header = ip0;
+
 	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
                                 vnet_buffer(p0)->sw_if_index[VLIB_RX]);
 
@@ -3294,4 +3299,3 @@ VLIB_CLI_COMMAND (set_ip_classify_command, static) = {
     .function = set_ip_classify_command_fn,
 };
 /* *INDENT-ON* */
-
diff --git a/vnet/vnet/ip/udp.h b/vnet/vnet/ip/udp.h
index 4de30f1d..f8ff777e 100644
--- a/vnet/vnet/ip/udp.h
+++ b/vnet/vnet/ip/udp.h
@@ -37,6 +37,7 @@ typedef enum {
 _ (67, dhcp_to_server)                          \
 _ (68, dhcp_to_client)                          \
 _ (500, ikev2)                                  \
+_ (3784, bfd4)                                   \
 _ (4341, lisp_gpe)                              \
 _ (4342, lisp_cp)                          	\
 _ (4739, ipfix)                                 \
@@ -49,6 +50,7 @@ _ (6633, vpath_3)
 #define foreach_udp6_dst_port                   \
 _ (547, dhcpv6_to_server)                       \
 _ (546, dhcpv6_to_client)			\
+_ (3784, bfd6)                                   \
 _ (4341, lisp_gpe6)                             \
 _ (4342, lisp_cp6)                          	\
 _ (4790, vxlan6_gpe)      \
diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c
index b7753092..a5ac060a 100644
--- a/vpp/vpp-api/api.c
+++ b/vpp/vpp-api/api.c
@@ -117,6 +117,8 @@
 #include <vpp-api/vpe_msg_enum.h>
 #include <vnet/span/span.h>
 
+#include <vnet/bfd/bfd_main.h>
+#include <vnet/bfd/bfd_api.h>
 #include <vnet/fib/ip6_fib.h>
 #include <vnet/fib/ip4_fib.h>
 #include <vnet/fib/fib_api.h>
@@ -302,7 +304,12 @@ _(PUNT, punt)                                                           \
 _(FLOW_CLASSIFY_SET_INTERFACE, flow_classify_set_interface)             \
 _(FLOW_CLASSIFY_DUMP, flow_classify_dump)                               \
 _(IPSEC_SPD_DUMP, ipsec_spd_dump)                                       \
-_(FEATURE_ENABLE_DISABLE, feature_enable_disable)
+_(FEATURE_ENABLE_DISABLE, feature_enable_disable)                       \
+_(BFD_UDP_ADD, bfd_udp_add)                                             \
+_(BFD_UDP_DEL, bfd_udp_del)                                             \
+_(BFD_UDP_SESSION_DUMP, bfd_udp_session_dump)                           \
+_(BFD_SESSION_SET_FLAGS, bfd_session_set_flags)                         \
+_(WANT_BFD_EVENTS, want_bfd_events)
 
 #define QUOTE_(x) #x
 #define QUOTE(x) QUOTE_(x)
@@ -343,6 +350,7 @@ vl_api_memclnt_delete_callback (u32 client_index)
 }
 
 pub_sub_handler (oam_events, OAM_EVENTS);
+pub_sub_handler (bfd_events, BFD_EVENTS);
 
 #define RESOLUTION_EVENT 1
 #define RESOLUTION_PENDING_EVENT 2
@@ -6766,6 +6774,163 @@ static void
   BAD_SW_IF_INDEX_LABEL;
 
   REPLY_MACRO (VL_API_L2_INTERFACE_PBB_TAG_REWRITE_REPLY);
+
+}
+
+static void
+vl_api_bfd_udp_add_t_handler (vl_api_bfd_udp_add_t * mp)
+{
+  vl_api_bfd_udp_add_reply_t *rmp;
+  int rv;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  ip46_address_t local_addr;
+  memset (&local_addr, 0, sizeof (local_addr));
+  ip46_address_t peer_addr;
+  memset (&peer_addr, 0, sizeof (peer_addr));
+  if (mp->is_ipv6)
+    {
+      clib_memcpy (&local_addr.ip6, mp->local_addr, sizeof (local_addr.ip6));
+      clib_memcpy (&peer_addr.ip6, mp->peer_addr, sizeof (peer_addr.ip6));
+    }
+  else
+    {
+      clib_memcpy (&local_addr.ip4, mp->local_addr, sizeof (local_addr.ip4));
+      clib_memcpy (&peer_addr.ip4, mp->peer_addr, sizeof (peer_addr.ip4));
+    }
+
+  rv = bfd_udp_add_session (clib_net_to_host_u32 (mp->sw_if_index),
+			    clib_net_to_host_u32 (mp->desired_min_tx),
+			    clib_net_to_host_u32 (mp->required_min_rx),
+			    mp->detect_mult, &local_addr, &peer_addr);
+
+  BAD_SW_IF_INDEX_LABEL;
+  REPLY_MACRO (VL_API_BFD_UDP_ADD_REPLY);
+}
+
+static void
+vl_api_bfd_udp_del_t_handler (vl_api_bfd_udp_del_t * mp)
+{
+  vl_api_bfd_udp_del_reply_t *rmp;
+  int rv;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  ip46_address_t local_addr;
+  memset (&local_addr, 0, sizeof (local_addr));
+  ip46_address_t peer_addr;
+  memset (&peer_addr, 0, sizeof (peer_addr));
+  if (mp->is_ipv6)
+    {
+      clib_memcpy (&local_addr.ip6, mp->local_addr, sizeof (local_addr.ip6));
+      clib_memcpy (&peer_addr.ip6, mp->peer_addr, sizeof (peer_addr.ip6));
+    }
+  else
+    {
+      clib_memcpy (&local_addr.ip4, mp->local_addr, sizeof (local_addr.ip4));
+      clib_memcpy (&peer_addr.ip4, mp->peer_addr, sizeof (peer_addr.ip4));
+    }
+
+  rv =
+    bfd_udp_del_session (clib_net_to_host_u32 (mp->sw_if_index), &local_addr,
+			 &peer_addr);
+
+  BAD_SW_IF_INDEX_LABEL;
+  REPLY_MACRO (VL_API_BFD_UDP_DEL_REPLY);
+}
+
+void
+send_bfd_udp_session_details (unix_shared_memory_queue_t * q, u32 context,
+			      bfd_session_t * bs)
+{
+  if (bs->transport != BFD_TRANSPORT_UDP4 &&
+      bs->transport != BFD_TRANSPORT_UDP6)
+    {
+      return;
+    }
+
+  vl_api_bfd_udp_session_details_t *mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_BFD_UDP_SESSION_DETAILS);
+  mp->context = context;
+  mp->bs_index = clib_host_to_net_u32 (bs->bs_idx);
+  mp->state = bs->local_state;
+  bfd_udp_session_t *bus = &bs->udp;
+  bfd_udp_key_t *key = &bus->key;
+  mp->sw_if_index = clib_host_to_net_u32 (key->sw_if_index);
+  mp->is_ipv6 = !(ip46_address_is_ip4 (&key->local_addr));
+  if (mp->is_ipv6)
+    {
+      clib_memcpy (mp->local_addr, &key->local_addr,
+		   sizeof (key->local_addr));
+      clib_memcpy (mp->peer_addr, &key->peer_addr, sizeof (key->peer_addr));
+    }
+  else
+    {
+      clib_memcpy (mp->local_addr, &key->local_addr.ip4.data,
+		   sizeof (&key->local_addr.ip4.data));
+      clib_memcpy (mp->peer_addr, &key->peer_addr.ip4.data,
+		   sizeof (&key->peer_addr.ip4.data));
+    }
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+void
+bfd_event (bfd_main_t * bm, bfd_session_t * bs)
+{
+  vpe_api_main_t *vam = &vpe_api_main;
+  vpe_client_registration_t *reg;
+  unix_shared_memory_queue_t *q;
+  /* *INDENT-OFF* */
+  pool_foreach (reg, vam->bfd_events_registrations, ({
+                  q = vl_api_client_index_to_input_queue (reg->client_index);
+                  if (q)
+                    {
+                      switch (bs->transport)
+                        {
+                        case BFD_TRANSPORT_UDP4:
+                        /* fallthrough */
+                        case BFD_TRANSPORT_UDP6:
+                          send_bfd_udp_session_details (q, 0, bs);
+                        }
+                    }
+                }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_bfd_udp_session_dump_t_handler (vl_api_bfd_udp_session_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+
+  if (q == 0)
+    return;
+
+  bfd_session_t *bs = NULL;
+  /* *INDENT-OFF* */
+  pool_foreach (bs, bfd_main.sessions, ({
+                  if (bs->transport == BFD_TRANSPORT_UDP4 ||
+                      bs->transport == BFD_TRANSPORT_UDP6)
+                    send_bfd_udp_session_details (q, mp->context, bs);
+                }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_bfd_session_set_flags_t_handler (vl_api_bfd_session_set_flags_t * mp)
+{
+  vl_api_bfd_session_set_flags_reply_t *rmp;
+  int rv;
+
+  rv =
+    bfd_session_set_flags (clib_net_to_host_u32 (mp->bs_index),
+			   mp->admin_up_down);
+
+  REPLY_MACRO (VL_API_BFD_SESSION_SET_FLAGS_REPLY);
 }
 
 static void
@@ -7090,6 +7255,7 @@ vpe_api_init (vlib_main_t * vm)
   am->to_netconf_client_registration_hash = hash_create (0, sizeof (uword));
   am->from_netconf_client_registration_hash = hash_create (0, sizeof (uword));
   am->oam_events_registration_hash = hash_create (0, sizeof (uword));
+  am->bfd_events_registration_hash = hash_create (0, sizeof (uword));
 
   vl_api_init (vm);
   vl_set_memory_region_name ("/vpe-api");
diff --git a/vpp/vpp-api/vpe.api b/vpp/vpp-api/vpe.api
index 1c33f70b..b13c2606 100644
--- a/vpp/vpp-api/vpe.api
+++ b/vpp/vpp-api/vpe.api
@@ -4656,6 +4656,191 @@ define feature_enable_disable_reply
     i32 retval;
 };
 
+/** \brief Configure BFD feature
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param slow_timer - slow timer (seconds)
+    @param min_tx - desired min tx interval
+    @param min_rx - desired min rx interval
+    @param detect_mult - desired detection multiplier
+*/
+define bfd_set_config {
+  u32 client_index;
+  u32 context;
+  u32 slow_timer;
+  u32 min_tx;
+  u32 min_rx;
+  u8 detect_mult;
+};
+
+/** \brief Configure BFD feature response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define bfd_set_config_reply {
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Get BFD configuration
+*/
+define bfd_get_config {
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Get BFD configuration response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+    @param slow_timer - slow timer (seconds)
+    @param min_tx - desired min tx interval
+    @param min_rx - desired min rx interval
+    @param detect_mult - desired detection multiplier
+*/
+define bfd_get_config_reply {
+  u32 client_index;
+  u32 context;
+  u32 slow_timer;
+  u32 min_tx;
+  u32 min_rx;
+  u8 detect_mult;
+};
+
+/** \brief Add UDP BFD session on interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - sw index of the interface
+    @param desired_min_tx - desired min transmit interval (microseconds)
+    @param required_min_rx - required min receive interval (microseconds)
+    @param detect_mult - detect multiplier (# of packets missed between connection goes down)
+    @param local_addr - local address
+    @param peer_addr - peer address
+    @param is_ipv6 - local_addr, peer_addr are IPv6 if non-zero, otherwise IPv4
+*/
+define bfd_udp_add {
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u32 desired_min_tx;
+  u32 required_min_rx;
+  u8 local_addr[16];
+  u8 peer_addr[16];
+  u8 is_ipv6;
+  u8 detect_mult;
+};
+
+/** \brief Add UDP BFD session response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+    @param bs_index - index of the session created
+*/
+define bfd_udp_add_reply {
+  u32 context;
+  i32 retval;
+  u32 bs_index;
+};
+
+/** \brief Delete UDP BFD session on interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - sw index of the interface
+    @param local_addr - local address
+    @param peer_addr - peer address
+    @param is_ipv6 - local_addr, peer_addr are IPv6 if non-zero, otherwise IPv4
+*/
+define bfd_udp_del {
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 local_addr[16];
+  u8 peer_addr[16];
+  u8 is_ipv6;
+};
+
+/** \brief Delete UDP BFD session response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define bfd_udp_del_reply {
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Get all BFD sessions
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define bfd_udp_session_dump {
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief BFD session details structure
+    @param context - sender context, to match reply w/ request
+    @param bs_index - index of the session
+    @param sw_if_index - sw index of the interface
+    @param local_addr - local address
+    @param peer_addr - peer address
+    @param is_ipv6 - local_addr, peer_addr are IPv6 if non-zero, otherwise IPv4
+    @param state - session state
+*/
+define bfd_udp_session_details {
+  u32 context;
+  u32 bs_index; 
+  u32 sw_if_index;
+  u8 local_addr[16];
+  u8 peer_addr[16];
+  u8 is_ipv6;
+  u8 state;
+};
+
+/** \brief Set flags of BFD session
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param bs_index - index of the bfd session to set flags on
+    @param admin_up_down - set the admin state, 1 = up, 0 = down
+*/
+define bfd_session_set_flags {
+  u32 client_index;
+  u32 context;
+  u32 bs_index;
+  u8 admin_up_down;
+};
+
+/** \brief Reply to bfd_session_set_flags 
+    @param context - sender context which was passed in the request
+    @param retval - return code of the set flags request
+*/
+define bfd_session_set_flags_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Register for BFD events
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param enable_disable - 1 => register for events, 0 => cancel registration
+    @param pid - sender's pid
+*/
+define want_bfd_events
+{
+  u32 client_index;
+  u32 context;
+  u32 enable_disable;
+  u32 pid;
+};
+
+/** \brief Reply for BFD events registration
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define want_bfd_events_reply
+{
+  u32 context;
+  i32 retval;
+};
+
 /*
  * Local Variables:
  * eval: (c-set-style "gnu")
diff --git a/vppinfra/vppinfra/mhash.c b/vppinfra/vppinfra/mhash.c
index 84517e19..c917e164 100644
--- a/vppinfra/vppinfra/mhash.c
+++ b/vppinfra/vppinfra/mhash.c
@@ -223,7 +223,7 @@ mhash_init (mhash_t * h, uword n_value_bytes, uword n_key_bytes)
 }
 
 static uword
-mhash_set_tmp_key (mhash_t * h, void *key)
+mhash_set_tmp_key (mhash_t * h, const void *key)
 {
   u8 *key_tmp;
   int my_cpu = os_get_cpu_number ();
@@ -251,7 +251,7 @@ mhash_set_tmp_key (mhash_t * h, void *key)
 }
 
 hash_pair_t *
-mhash_get_pair (mhash_t * h, void *key)
+mhash_get_pair (mhash_t * h, const void *key)
 {
   uword ikey;
   mhash_sanitize_hash_user (h);
diff --git a/vppinfra/vppinfra/mhash.h b/vppinfra/vppinfra/mhash.h
index 8ce8454b..102adf4e 100644
--- a/vppinfra/vppinfra/mhash.h
+++ b/vppinfra/vppinfra/mhash.h
@@ -101,13 +101,13 @@ mhash_key_to_mem (mhash_t * h, uword key)
   return vec_elt_at_index (h->key_vector_or_heap, key);
 }
 
-hash_pair_t *mhash_get_pair (mhash_t * h, void *key);
+hash_pair_t *mhash_get_pair (mhash_t * h, const void *key);
 uword mhash_set_mem (mhash_t * h, void *key, uword * new_value,
 		     uword * old_value);
 uword mhash_unset (mhash_t * h, void *key, uword * old_value);
 
 always_inline uword *
-mhash_get (mhash_t * h, void *key)
+mhash_get (mhash_t * h, const void *key)
 {
   hash_pair_t *p = mhash_get_pair (h, key);
   return p ? &p->value[0] : 0;
-- 
cgit 1.2.3-korg


From 0279b29f327c15a1c6b2d8ede228790c1a7d3814 Mon Sep 17 00:00:00 2001
From: Juraj Sloboda <jsloboda@cisco.com>
Date: Wed, 16 Nov 2016 19:50:24 +0100
Subject: Add make test code coverage reporting using gcov

Change-Id: Ia8247841fdbe76e1d888aab49ae213b4216af273
Signed-off-by: Juraj Sloboda <jsloboda@cisco.com>
---
 .gitignore                       |  1 +
 Makefile                         | 15 +++++++++++++--
 build-data/platforms/vpp_lite.mk |  5 +++++
 test/Makefile                    | 29 +++++++++++++++++++++++++----
 4 files changed, 44 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/.gitignore b/.gitignore
index cec432c5..c12eedfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 /build-root/*.rpm
 /build-root/*.changes
 /build-root/test-doc/
+/build-root/test-cov/
 /build-root/python/
 /build-config.mk
 /dpdk/*.tar.gz
diff --git a/Makefile b/Makefile
index 00699a76..50155664 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ endif
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
-DEB_DEPENDS += python-dev python-virtualenv python-pip
+DEB_DEPENDS += python-dev python-virtualenv python-pip lcov
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -43,7 +43,7 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel python-virtualenv
+RPM_DEPENDS += python-devel python-virtualenv lcov
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
@@ -59,6 +59,7 @@ endif
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
 .PHONY: ctags cscope plugins plugins-release build-vpp-api
 .PHONY: test test-debug retest retest-debug test-doc test-wipe-doc test-help test-wipe
+.PHONY: test-cov test-wipe-cov
 
 help:
 	@echo "Make Targets:"
@@ -97,6 +98,8 @@ help:
 	@echo " wipe-doxygen        - wipe all generated documentation"
 	@echo " test-doc            - generate documentation for test framework"
 	@echo " test-wipe-doc       - wipe documentation for test framework"
+	@echo " test-cov            - generate code coverage report for test framework"
+	@echo " test-wipe-cov       - wipe code coverage report for test framework"
 	@echo ""
 	@echo "Make Arguments:"
 	@echo " V=[0|1]             - set build verbosity level"
@@ -219,6 +222,8 @@ VPP_PYTHON_PREFIX=$(BR)/python
 define test
 	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-api-install plugins-install vpp-install,)
 	make -C test \
+	  BR=$(BR) \
+	  VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
 	  VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
 	  VPP_TEST_API_TEST_BIN=$(BR)/install-$(2)-native/vpp-api-test/bin/vpp_api_test \
 	  VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/plugins/lib64/vpp_plugins \
@@ -245,6 +250,12 @@ test-doc:
 test-wipe-doc:
 	@make -C test wipe-doc BR=$(BR)
 
+test-cov:
+	$(call test,vpp_lite,vpp_lite_gcov,cov)
+
+test-wipe-cov:
+	@make -C test wipe-cov BR=$(BR)
+
 retest:
 	$(call test,vpp_lite,vpp_lite,retest)
 
diff --git a/build-data/platforms/vpp_lite.mk b/build-data/platforms/vpp_lite.mk
index 94e69511..ef2ec444 100644
--- a/build-data/platforms/vpp_lite.mk
+++ b/build-data/platforms/vpp_lite.mk
@@ -44,3 +44,8 @@ vpp_lite_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE)
 	-fstack-protector -fPIC -Werror
 vpp_lite_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE) \
 	-fstack-protector -fPIC -Werror
+
+vpp_lite_gcov_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \
+	-fPIC -Werror -fprofile-arcs -ftest-coverage
+vpp_lite_gcov_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \
+	-fPIC -Werror -coverage
diff --git a/test/Makefile b/test/Makefile
index de6aaa7a..7561a009 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -8,6 +8,7 @@ endif
 PYTHON_VENV_PATH=$(VPP_PYTHON_PREFIX)/virtualenv
 PYTHON_DEPENDS=scapy==2.3.3 pexpect
 SCAPY_SOURCE=$(WS_ROOT)/build-root/python/virtualenv/lib/python2.7/site-packages/
+BUILD_COV_DIR = $(BR)/test-cov
 
 
 .pip-install.ok:
@@ -30,11 +31,15 @@ SCAPY_SOURCE=$(WS_ROOT)/build-root/python/virtualenv/lib/python2.7/site-packages
 PHONIES=.install.ok .pip-patch.ok .pip-install.ok
 .PHONY: $(PHONIES)
 
-test: reset verify-python-path .install.ok
+define retest-func
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py discover -p test_$(TEST)\"*.py\""
+endef
+
+test: reset verify-python-path .install.ok
+	$(call retest-func)
 
 retest: reset verify-python-path
-	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py discover -p test_$(TEST)\"*.py\""
+	$(call retest-func)
 
 .PHONY: wipe doc
 
@@ -53,6 +58,18 @@ doc: verify-python-path
 wipe-doc:
 	@make -C doc wipe BR=$(BR)
 
+cov: wipe-cov reset verify-python-path .install.ok
+	@lcov --zerocounters --directory $(VPP_TEST_BUILD_DIR)
+	$(call retest-func)
+	@mkdir $(BUILD_COV_DIR)
+	@lcov --capture --directory $(VPP_TEST_BUILD_DIR) --output-file $(BUILD_COV_DIR)/coverage.info
+	@genhtml $(BUILD_COV_DIR)/coverage.info --output-directory $(BUILD_COV_DIR)/html
+	@echo
+	@echo "Build finished. Code coverage report is in $(BUILD_COV_DIR)/html/index.html"
+
+wipe-cov: wipe
+	@rm -rf $(BUILD_COV_DIR)
+
 help:
 	@echo "Running tests:"
 	@echo ""
@@ -60,7 +77,7 @@ help:
 	@echo " test-debug          - build and run functional tests (debug build)"
 	@echo " retest              - run functional tests"
 	@echo " retest-debug        - run functional tests (debug build)"
-	@echo " wipe-test           - wipe (temporary) files generated by unit tests"
+	@echo " test-wipe           - wipe (temporary) files generated by unit tests"
 	@echo ""
 	@echo "Arguments controlling test runs:"
 	@echo " V=[0|1|2]            - set test verbosity level"
@@ -76,5 +93,9 @@ help:
 	@echo ""
 	@echo "Creating test documentation"
 	@echo " test-doc            - generate documentation for test framework"
-	@echo " wipe-test-doc       - wipe documentation for test framework"
+	@echo " test-wipe-doc       - wipe documentation for test framework"
+	@echo ""
+	@echo "Creating test code coverage report"
+	@echo " test-cov            - generate code coverage report for test framework"
+	@echo " test-wipe-cov       - wipe code coverage report for test framework"
 	@echo ""
-- 
cgit 1.2.3-korg


From 9225dee9655ce607130f9bab5472441b72e25858 Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Mon, 12 Dec 2016 08:36:58 +0100
Subject: make test: improve robustness and performance

Introduce an API which asserts empty capture for interface.
Throw exception in old API if the capture does not exist, thus
making it clear if the test expects packets to arrive or not.
Improve performance by not doing sleeps after starting the packet
generator, rather lazily deleting captures when needed.
Fix wrong usage of packet.show() in various tests.

Change-Id: I456cb23316eef99b3f35f80344fe595c4db9a21c
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 Makefile                         |  4 +-
 test/framework.py                | 41 ++++++++++++++------
 test/test_bfd.py                 |  2 +-
 test/test_gre.py                 | 62 +++++++++++-------------------
 test/test_l2_fib.py              | 14 ++-----
 test/test_l2bd_multi_instance.py | 22 +++++------
 test/test_l2xc_multi_instance.py | 31 ++++++---------
 test/test_lb.py                  | 16 +++++---
 test/test_mpls.py                | 29 +++-----------
 test/test_snat.py                | 24 +++++-------
 test/util.py                     | 22 +++++++++++
 test/vpp_pg_interface.py         | 82 +++++++++++++++++++++++++++++-----------
 12 files changed, 189 insertions(+), 160 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 50155664..1c7534cf 100644
--- a/Makefile
+++ b/Makefile
@@ -217,8 +217,6 @@ build-vpp-api: $(BR)/.bootstrap.ok
 
 VPP_PYTHON_PREFIX=$(BR)/python
 
-
-	#$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install ,)
 define test
 	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-api-install plugins-install vpp-install,)
 	make -C test \
@@ -250,7 +248,7 @@ test-doc:
 test-wipe-doc:
 	@make -C test wipe-doc BR=$(BR)
 
-test-cov:
+test-cov: bootstrap
 	$(call test,vpp_lite,vpp_lite_gcov,cov)
 
 test-wipe-cov:
diff --git a/test/framework.py b/test/framework.py
index 2618b267..1c3e56cc 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -5,7 +5,6 @@ import unittest
 import tempfile
 import time
 import resource
-from time import sleep
 from collections import deque
 from threading import Thread
 from inspect import getdoc
@@ -181,7 +180,8 @@ class VppTestCase(unittest.TestCase):
         cls.logger.info("Temporary dir is %s, shm prefix is %s",
                         cls.tempdir, cls.shm_prefix)
         cls.setUpConstants()
-        cls.pg_streams = []
+        cls._captures = []
+        cls._zombie_captures = []
         cls.packet_infos = {}
         cls.verbose = 0
         cls.vpp_dead = False
@@ -312,17 +312,36 @@ class VppTestCase(unittest.TestCase):
             i.enable_capture()
 
     @classmethod
-    def pg_start(cls, sleep_time=1):
-        """
-        Enable the packet-generator and send all prepared packet streams
-        Remove the packet streams afterwards
-        """
+    def register_capture(cls, cap_name):
+        """ Register a capture in the testclass """
+        # add to the list of captures with current timestamp
+        cls._captures.append((time.time(), cap_name))
+        # filter out from zombies
+        cls._zombie_captures = [(stamp, name)
+                                for (stamp, name) in cls._zombie_captures
+                                if name != cap_name]
+
+    @classmethod
+    def pg_start(cls):
+        """ Remove any zombie captures and enable the packet generator """
+        # how long before capture is allowed to be deleted - otherwise vpp
+        # crashes - 100ms seems enough (this shouldn't be needed at all)
+        capture_ttl = 0.1
+        now = time.time()
+        for stamp, cap_name in cls._zombie_captures:
+            wait = stamp + capture_ttl - now
+            if wait > 0:
+                cls.logger.debug("Waiting for %ss before deleting capture %s",
+                                 wait, cap_name)
+                time.sleep(wait)
+                now = time.time()
+            cls.logger.debug("Removing zombie capture %s" % cap_name)
+            cls.vapi.cli('packet-generator delete %s' % cap_name)
+
         cls.vapi.cli("trace add pg-input 50")  # 50 is maximum
         cls.vapi.cli('packet-generator enable')
-        sleep(sleep_time)  # give VPP some time to process the packets
-        for stream in cls.pg_streams:
-            cls.vapi.cli('packet-generator delete %s' % stream)
-        cls.pg_streams = []
+        cls._zombie_captures = cls._captures
+        cls._captures = []
 
     @classmethod
     def create_pg_interfaces(cls, interfaces):
diff --git a/test/test_bfd.py b/test/test_bfd.py
index bf0e88dd..c1095d22 100644
--- a/test/test_bfd.py
+++ b/test/test_bfd.py
@@ -98,7 +98,7 @@ class BFDTestSession(object):
         p = self.create_packet()
         self.test.logger.debug(ppp("Sending packet:", p))
         self.test.pg0.add_stream([p])
-        self.test.pg_start(sleep_time=0)
+        self.test.pg_start()
 
     def verify_packet(self, packet):
         """ Verify correctness of BFD layer. """
diff --git a/test/test_gre.py b/test/test_gre.py
index 0b508285..59d03e93 100644
--- a/test/test_gre.py
+++ b/test/test_gre.py
@@ -1,22 +1,22 @@
 #!/usr/bin/env python
 
 import unittest
-import socket
 from logging import *
 
 from framework import VppTestCase, VppTestRunner
-from vpp_sub_interface import VppSubInterface, VppDot1QSubint, VppDot1ADSubint
+from vpp_sub_interface import VppDot1QSubint
 from vpp_gre_interface import VppGreInterface
 from vpp_ip_route import IpRoute, RoutePath
 from vpp_papi_provider import L2_VTR_OP
 
 from scapy.packet import Raw
-from scapy.layers.l2 import Ether, Dot1Q, ARP, GRE
+from scapy.layers.l2 import Ether, Dot1Q, GRE
 from scapy.layers.inet import IP, UDP
-from scapy.layers.inet6 import ICMPv6ND_NS, ICMPv6ND_RA, IPv6, UDP
-from scapy.contrib.mpls import MPLS
+from scapy.layers.inet6 import ICMPv6ND_RA, IPv6
 from scapy.volatile import RandMAC, RandIP
 
+from util import ppp, ppc
+
 
 class TestGRE(VppTestCase):
     """ GRE Test Case """
@@ -131,7 +131,7 @@ class TestGRE(VppTestCase):
 
     def verify_filter(self, capture, sent):
         if not len(capture) == len(sent):
-            # filter out any IPv6 RAs from the captur
+            # filter out any IPv6 RAs from the capture
             for p in capture:
                 if (p.haslayer(ICMPv6ND_RA)):
                     capture.remove(p)
@@ -163,8 +163,8 @@ class TestGRE(VppTestCase):
                 self.assertEqual(rx_ip.ttl + 1, tx_ip.ttl)
 
             except:
-                rx.show()
-                tx.show()
+                self.logger.error(ppp("Rx:", rx))
+                self.logger.error(ppp("Tx:", tx))
                 raise
 
     def verify_tunneled_l2o4(self, src_if, capture, sent,
@@ -196,8 +196,8 @@ class TestGRE(VppTestCase):
                 self.assertEqual(rx_ip.ttl, tx_ip.ttl)
 
             except:
-                rx.show()
-                tx.show()
+                self.logger.error(ppp("Rx:", rx))
+                self.logger.error(ppp("Tx:", tx))
                 raise
 
     def verify_tunneled_vlano4(self, src_if, capture, sent,
@@ -206,7 +206,7 @@ class TestGRE(VppTestCase):
             capture = self.verify_filter(capture, sent)
             self.assertEqual(len(capture), len(sent))
         except:
-            capture.show()
+            ppc("Unexpected packets captured:", capture)
             raise
 
         for i in range(len(capture)):
@@ -237,8 +237,8 @@ class TestGRE(VppTestCase):
                 self.assertEqual(rx_ip.ttl, tx_ip.ttl)
 
             except:
-                rx.show()
-                tx.show()
+                self.logger.error(ppp("Rx:", rx))
+                self.logger.error(ppp("Tx:", tx))
                 raise
 
     def verify_decapped_4o4(self, src_if, capture, sent):
@@ -261,8 +261,8 @@ class TestGRE(VppTestCase):
                 self.assertEqual(rx_ip.ttl + 1, tx_ip.ttl)
 
             except:
-                rx.show()
-                tx.show()
+                self.logger.error(ppp("Rx:", rx))
+                self.logger.error(ppp("Tx:", tx))
                 raise
 
     def verify_decapped_6o4(self, src_if, capture, sent):
@@ -284,8 +284,8 @@ class TestGRE(VppTestCase):
                 self.assertEqual(rx_ip.hlim + 1, tx_ip.hlim)
 
             except:
-                rx.show()
-                tx.show()
+                self.logger.error(ppp("Rx:", rx))
+                self.logger.error(ppp("Tx:", tx))
                 raise
 
     def test_gre(self):
@@ -333,14 +333,8 @@ class TestGRE(VppTestCase):
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
 
-        rx = self.pg0.get_capture()
-
-        try:
-            self.assertEqual(0, len(rx))
-        except:
-            error("GRE packets forwarded without DIP resolved")
-            error(rx.show())
-            raise
+        self.pg0.assert_nothing_captured(
+            remark="GRE packets forwarded without DIP resolved")
 
         #
         # Add a route that resolves the tunnel's destination
@@ -397,13 +391,8 @@ class TestGRE(VppTestCase):
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
 
-        rx = self.pg0.get_capture()
-        try:
-            self.assertEqual(0, len(rx))
-        except:
-            error("GRE packets forwarded despite no SRC address match")
-            error(rx.show())
-            raise
+        self.pg0.assert_nothing_captured(
+            remark="GRE packets forwarded despite no SRC address match")
 
         #
         # Configure IPv6 on the PG interface so we can route IPv6
@@ -427,13 +416,8 @@ class TestGRE(VppTestCase):
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
 
-        rx = self.pg0.get_capture()
-        try:
-            self.assertEqual(0, len(rx))
-        except:
-            error("IPv6 GRE packets forwarded despite IPv6 not enabled on tunnel")
-            error(rx.show())
-            raise
+        self.pg0.assert_nothing_captured(remark="IPv6 GRE packets forwarded "
+                                         "despite IPv6 not enabled on tunnel")
 
         #
         # Enable IPv6 on the tunnel
diff --git a/test/test_l2_fib.py b/test/test_l2_fib.py
index eb4f4e32..4855a3ea 100644
--- a/test/test_l2_fib.py
+++ b/test/test_l2_fib.py
@@ -68,7 +68,7 @@ from scapy.layers.l2 import Ether
 from scapy.layers.inet import IP, UDP
 
 from framework import VppTestCase, VppTestRunner
-from util import Host
+from util import Host, ppp
 
 
 class TestL2fib(VppTestCase):
@@ -282,8 +282,7 @@ class TestL2fib(VppTestCase):
                 self.assertEqual(udp.sport, saved_packet[UDP].sport)
                 self.assertEqual(udp.dport, saved_packet[UDP].dport)
             except:
-                self.logger.error("Unexpected or invalid packet:")
-                self.logger.error(packet.show())
+                self.logger.error(ppp("Unexpected or invalid packet:", packet))
                 raise
         for i in self.pg_interfaces:
             remaining_packet = self.get_next_packet_info_for_interface2(
@@ -327,14 +326,7 @@ class TestL2fib(VppTestCase):
         # Verify
         # Verify outgoing packet streams per packet-generator interface
         for i in self.pg_interfaces:
-            capture = i.get_capture()
-            self.logger.info("Verifying capture on interface %s" % i.name)
-            try:
-                self.assertEqual(len(capture), 0)
-            except AssertionError:
-                self.logger.error("The capture on interface %s is not empty!"
-                                  % i.name)
-                raise AssertionError("%d != 0" % len(capture))
+            i.assert_nothing_captured(remark="outgoing interface")
 
     def test_l2_fib_01(self):
         """ L2 FIB test 1 - program 100 MAC addresses
diff --git a/test/test_l2bd_multi_instance.py b/test/test_l2bd_multi_instance.py
index 417df9e1..1272d765 100644
--- a/test/test_l2bd_multi_instance.py
+++ b/test/test_l2bd_multi_instance.py
@@ -70,7 +70,8 @@ from scapy.layers.l2 import Ether
 from scapy.layers.inet import IP, UDP
 
 from framework import VppTestCase, VppTestRunner
-from util import Host
+from util import Host, ppp
+
 
 @unittest.skip("Crashes VPP")
 class TestL2bdMultiInst(VppTestCase):
@@ -92,12 +93,12 @@ class TestL2bdMultiInst(VppTestCase):
             # Packet flows mapping pg0 -> pg1, pg2 etc.
             cls.flows = dict()
             for i in range(0, len(cls.pg_interfaces), 3):
-                cls.flows[cls.pg_interfaces[i]] = [cls.pg_interfaces[i+1],
-                                                   cls.pg_interfaces[i+2]]
-                cls.flows[cls.pg_interfaces[i+1]] = [cls.pg_interfaces[i],
-                                                     cls.pg_interfaces[i+2]]
-                cls.flows[cls.pg_interfaces[i+2]] = [cls.pg_interfaces[i],
-                                                     cls.pg_interfaces[i+1]]
+                cls.flows[cls.pg_interfaces[i]] = [cls.pg_interfaces[i + 1],
+                                                   cls.pg_interfaces[i + 2]]
+                cls.flows[cls.pg_interfaces[i + 1]] = [cls.pg_interfaces[i],
+                                                       cls.pg_interfaces[i + 2]]
+                cls.flows[cls.pg_interfaces[i + 2]] = [cls.pg_interfaces[i],
+                                                       cls.pg_interfaces[i + 1]]
 
             # Mapping between packet-generator index and lists of test hosts
             cls.hosts_by_pg_idx = dict()
@@ -188,7 +189,7 @@ class TestL2bdMultiInst(VppTestCase):
             if self.bd_deleted_list.count(bd_id) == 1:
                 self.bd_deleted_list.remove(bd_id)
             for j in range(3):
-                pg_if = self.pg_interfaces[(i+start-1)*3+j]
+                pg_if = self.pg_interfaces[(i + start - 1) * 3 + j]
                 self.vapi.sw_interface_set_l2_bridge(pg_if.sw_if_index,
                                                      bd_id=bd_id)
                 self.logger.info("pg-interface %s added to bridge domain ID %d"
@@ -221,7 +222,7 @@ class TestL2bdMultiInst(VppTestCase):
             if self.bd_deleted_list.count(bd_id) == 0:
                 self.bd_deleted_list.append(bd_id)
             for j in range(3):
-                pg_if = self.pg_interfaces[(i+start-1)*3+j]
+                pg_if = self.pg_interfaces[(i + start - 1) * 3 + j]
                 self.pg_in_bd.remove(pg_if)
                 self.pg_not_in_bd.append(pg_if)
             self.logger.info("Bridge domain ID %d deleted" % bd_id)
@@ -290,8 +291,7 @@ class TestL2bdMultiInst(VppTestCase):
                 self.assertEqual(udp.sport, saved_packet[UDP].sport)
                 self.assertEqual(udp.dport, saved_packet[UDP].dport)
             except:
-                self.logger.error("Unexpected or invalid packet:")
-                self.logger.error(packet.show())
+                self.logger.error(ppp("Unexpected or invalid packet:", packet))
                 raise
         for i in self.pg_interfaces:
             remaining_packet = self.get_next_packet_info_for_interface2(
diff --git a/test/test_l2xc_multi_instance.py b/test/test_l2xc_multi_instance.py
index 4de76917..2e55674e 100644
--- a/test/test_l2xc_multi_instance.py
+++ b/test/test_l2xc_multi_instance.py
@@ -56,7 +56,7 @@ from scapy.layers.l2 import Ether
 from scapy.layers.inet import IP, UDP
 
 from framework import VppTestCase, VppTestRunner
-from util import Host
+from util import Host, ppp
 
 
 class TestL2xcMultiInst(VppTestCase):
@@ -79,7 +79,7 @@ class TestL2xcMultiInst(VppTestCase):
             cls.flows = dict()
             for i in range(len(cls.pg_interfaces)):
                 delta = 1 if i % 2 == 0 else -1
-                cls.flows[cls.pg_interfaces[i]] = [cls.pg_interfaces[i+delta]]
+                cls.flows[cls.pg_interfaces[i]] = [cls.pg_interfaces[i + delta]]
 
             # Mapping between packet-generator index and lists of test hosts
             cls.hosts_by_pg_idx = dict()
@@ -155,9 +155,9 @@ class TestL2xcMultiInst(VppTestCase):
         (Default value = 0)
         """
         for i in range(count):
-            rx_if = self.pg_interfaces[i+start]
+            rx_if = self.pg_interfaces[i + start]
             delta = 1 if i % 2 == 0 else -1
-            tx_if = self.pg_interfaces[i+start+delta]
+            tx_if = self.pg_interfaces[i + start + delta]
             self.vapi.sw_interface_set_l2_xconnect(rx_if.sw_if_index,
                                                    tx_if.sw_if_index, 1)
             self.logger.info("Cross-connect from %s to %s created"
@@ -177,9 +177,9 @@ class TestL2xcMultiInst(VppTestCase):
         (Default value = 0)
         """
         for i in range(count):
-            rx_if = self.pg_interfaces[i+start]
+            rx_if = self.pg_interfaces[i + start]
             delta = 1 if i % 2 == 0 else -1
-            tx_if = self.pg_interfaces[i+start+delta]
+            tx_if = self.pg_interfaces[i + start + delta]
             self.vapi.sw_interface_set_l2_xconnect(rx_if.sw_if_index,
                                                    tx_if.sw_if_index, 0)
             self.logger.info("Cross-connect from %s to %s deleted"
@@ -253,8 +253,7 @@ class TestL2xcMultiInst(VppTestCase):
                 self.assertEqual(udp.sport, saved_packet[UDP].sport)
                 self.assertEqual(udp.dport, saved_packet[UDP].dport)
             except:
-                self.logger.error("Unexpected or invalid packet:")
-                self.logger.error(packet.show())
+                self.logger.error(ppp("Unexpected or invalid packet:", packet))
                 raise
         for i in self.pg_interfaces:
             remaining_packet = self.get_next_packet_info_for_interface2(
@@ -291,21 +290,15 @@ class TestL2xcMultiInst(VppTestCase):
         # Verify
         # Verify outgoing packet streams per packet-generator interface
         for pg_if in self.pg_interfaces:
-            capture = pg_if.get_capture()
             if pg_if in self.pg_in_xc:
-                if len(capture) == 0:
-                    raise RuntimeError("Interface %s is cross-connect sink but "
-                                       "the capture is empty!" % pg_if.name)
+                capture = pg_if.get_capture(
+                    remark="interface is a cross-connect sink")
                 self.verify_capture(pg_if, capture)
             elif pg_if in self.pg_not_in_xc:
-                try:
-                    self.assertEqual(len(capture), 0)
-                except AssertionError:
-                    raise RuntimeError("Interface %s is not cross-connect sink "
-                                       "but the capture is not empty!"
-                                       % pg_if.name)
+                pg_if.assert_nothing_captured(
+                    remark="interface is not a cross-connect sink")
             else:
-                self.logger.error("Unknown interface: %s" % pg_if.name)
+                raise Exception("Unexpected interface: %s" % pg_if.name)
 
     def test_l2xc_inst_01(self):
         """ L2XC Multi-instance test 1 - create 10 cross-connects
diff --git a/test/test_lb.py b/test/test_lb.py
index 3e7f5e13..7037d80c 100644
--- a/test/test_lb.py
+++ b/test/test_lb.py
@@ -1,7 +1,7 @@
 import socket
 
 from scapy.layers.inet import IP, UDP
-from scapy.layers.inet6 import IPv6
+from scapy.layers.inet6 import ICMPv6ND_RA, IPv6
 from scapy.layers.l2 import Ether, GRE
 from scapy.packet import Raw
 
@@ -95,10 +95,16 @@ class TestLB(VppTestCase):
         self.assertEqual(str(inner), str(self.info.data[IPver]))
 
     def checkCapture(self, gre4, isv4):
-        out = self.pg0.get_capture()
-        # This check is edited because RA appears in output, maybe disable RA?
-        # self.assertEqual(len(out), 0)
-        self.assertLess(len(out), 20)
+        # RA might appear in capture
+        try:
+            out = self.pg0.get_capture()
+            # filter out any IPv6 RAs from the capture
+            for p in out:
+                if (p.haslayer(ICMPv6ND_RA)):
+                    out.remove(p)
+            self.assertEqual(len(out), 0)
+        except:
+            pass
         out = self.pg1.get_capture()
         self.assertEqual(len(out), len(self.packets))
 
diff --git a/test/test_mpls.py b/test/test_mpls.py
index 24fc4129..6d5eeb2b 100644
--- a/test/test_mpls.py
+++ b/test/test_mpls.py
@@ -11,8 +11,6 @@ from scapy.layers.l2 import Ether
 from scapy.layers.inet import IP, UDP, ICMP
 from scapy.layers.inet6 import IPv6
 from scapy.contrib.mpls import MPLS
-from util import ppp
-
 
 class TestMPLS(VppTestCase):
     """ MPLS Test Case """
@@ -60,7 +58,7 @@ class TestMPLS(VppTestCase):
                 else:
                     p = p / MPLS(label=mpls_labels[ii], ttl=mpls_ttl, s=0)
             if not ping:
-                p = (p / IP(src=src_if.local_ip4, dst=src_if.remote_ip4) / 
+                p = (p / IP(src=src_if.local_ip4, dst=src_if.remote_ip4) /
                      UDP(sport=1234, dport=1234) /
                      Raw(payload))
             else:
@@ -331,14 +329,8 @@ class TestMPLS(VppTestCase):
 
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
-
-        rx = self.pg0.get_capture()
-        try:
-            self.assertEqual(0, len(rx))
-        except:
-            self.logger.error("MPLS non-EOS packets popped and forwarded")
-            self.logger.error(ppp("", rx))
-            raise
+        self.pg0.assert_nothing_captured(
+            remark="MPLS non-EOS packets popped and forwarded")
 
         #
         # A recursive EOS x-connect, which resolves through another x-connect
@@ -586,8 +578,7 @@ class TestMPLS(VppTestCase):
             0,  # next-hop-table-id
             1,  # next-hop-weight
             2,  # num-out-labels,
-            [44, 46]
-        )
+            [44, 46])
         self.vapi.sw_interface_set_flags(reply.sw_if_index, admin_up_down=1)
 
         #
@@ -606,8 +597,7 @@ class TestMPLS(VppTestCase):
             0,  # next-hop-table-id
             1,  # next-hop-weight
             0,  # num-out-labels,
-            []  # out-label
-        )
+            [])  # out-label
 
         self.vapi.cli("clear trace")
         tx = self.create_stream_ip4(self.pg0, "10.0.0.3")
@@ -632,14 +622,7 @@ class TestMPLS(VppTestCase):
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
 
-        rx = self.pg0.get_capture()
-
-        try:
-            self.assertEqual(0, len(rx))
-        except:
-            self.logger.error("MPLS TTL=0 packets forwarded")
-            self.logger.error(ppp("", rx))
-            raise
+        self.pg0.assert_nothing_captured(remark="MPLS TTL=0 packets forwarded")
 
         #
         # a stream with a non-zero MPLS TTL
diff --git a/test/test_snat.py b/test/test_snat.py
index 5cc76f6c..fdd81f02 100644
--- a/test/test_snat.py
+++ b/test/test_snat.py
@@ -2,12 +2,12 @@
 
 import socket
 import unittest
-from logging import *
 
 from framework import VppTestCase, VppTestRunner
 
 from scapy.layers.inet import IP, TCP, UDP, ICMP
 from scapy.layers.l2 import Ether
+from util import ppp
 
 
 class TestSNAT(VppTestCase):
@@ -88,7 +88,7 @@ class TestSNAT(VppTestCase):
         :param dst_ip: Destination IP address (Default use global SNAT address)
         """
         if dst_ip is None:
-             dst_ip=self.snat_addr
+            dst_ip = self.snat_addr
         pkts = []
         # TCP
         p = (Ether(dst=out_if.local_mac, src=out_if.remote_mac) /
@@ -145,8 +145,8 @@ class TestSNAT(VppTestCase):
                         self.assertNotEqual(packet[ICMP].id, self.icmp_id_in)
                     self.icmp_id_out = packet[ICMP].id
             except:
-                error("Unexpected or invalid packet (outside network):")
-                error(packet.show())
+                self.logger.error(ppp("Unexpected or invalid packet "
+                                      "(outside network):", packet))
                 raise
 
     def verify_capture_in(self, capture, in_if, packet_num=3):
@@ -168,8 +168,8 @@ class TestSNAT(VppTestCase):
                 else:
                     self.assertEqual(packet[ICMP].id, self.icmp_id_in)
             except:
-                error("Unexpected or invalid packet (inside network):")
-                error(packet.show())
+                self.logger.error(ppp("Unexpected or invalid packet "
+                                      "(inside network):", packet))
                 raise
 
     def clear_snat(self):
@@ -410,11 +410,10 @@ class TestSNAT(VppTestCase):
         self.pg0.add_stream(pkts)
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
-        capture = self.pg3.get_capture()
-        self.verify_capture_out(capture, packet_num=0)
+        self.pg3.assert_nothing_captured()
 
     def test_multiple_inside_interfaces(self):
-        """ SNAT multiple inside interfaces with non-overlapping address space """
+        """SNAT multiple inside interfaces with non-overlapping address space"""
 
         self.snat_add_address(self.snat_addr)
         self.vapi.snat_interface_add_del_feature(self.pg0.sw_if_index)
@@ -566,8 +565,7 @@ class TestSNAT(VppTestCase):
             self.assertEqual(tcp.dport, server_in_port)
             host_out_port = tcp.sport
         except:
-            error("Unexpected or invalid packet:")
-            error(p.show())
+            self.logger.error(ppp("Unexpected or invalid packet:", p))
             raise
 
         # send reply from server to host
@@ -588,11 +586,9 @@ class TestSNAT(VppTestCase):
             self.assertEqual(tcp.sport, server_out_port)
             self.assertEqual(tcp.dport, host_in_port)
         except:
-            error("Unexpected or invalid packet:")
-            error(p.show())
+            self.logger.error(ppp("Unexpected or invalid packet:"), p)
             raise
 
-
     def tearDown(self):
         super(TestSNAT, self).tearDown()
         if not self.vpp_dead:
diff --git a/test/util.py b/test/util.py
index f6c6acd4..0ac23760 100644
--- a/test/util.py
+++ b/test/util.py
@@ -15,6 +15,28 @@ def ppp(headline, packet):
     return o.getvalue()
 
 
+def ppc(headline, capture, limit=10):
+    """ Return string containing ppp() printout for a capture.
+
+    :param headline: printed as first line of output
+    :param capture: packets to print
+    :param limit: limit the print to # of packets
+    """
+    if not capture:
+        return headline
+    result = headline + "\n"
+    count = 1
+    for p in capture:
+        result.append(ppp("Packet #%s:" % count, p))
+        count += 1
+        if count >= limit:
+            break
+    if limit < len(capture):
+        result.append(
+            "Capture contains %s packets in total, of which %s were printed" %
+            (len(capture), limit))
+
+
 class NumericConstant(object):
     __metaclass__ = ABCMeta
 
diff --git a/test/vpp_pg_interface.py b/test/vpp_pg_interface.py
index 2ebcbb57..44bd1a2d 100644
--- a/test/vpp_pg_interface.py
+++ b/test/vpp_pg_interface.py
@@ -6,7 +6,7 @@ from vpp_interface import VppInterface
 from scapy.layers.l2 import Ether, ARP
 from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6ND_NA,\
     ICMPv6NDOptSrcLLAddr, ICMPv6NDOptDstLLAddr
-from util import ppp
+from util import ppp, ppc
 
 
 class VppPGInterface(VppInterface):
@@ -114,25 +114,71 @@ class VppPGInterface(VppInterface):
         except:
             pass
         wrpcap(self.in_path, pkts)
+        self.test.register_capture(self.cap_name)
         # FIXME this should be an API, but no such exists atm
         self.test.vapi.cli(self.input_cli)
-        self.test.pg_streams.append(self.cap_name)
-        self.test.vapi.cli("trace add pg-input %d" % len(pkts))
 
-    def get_capture(self):
+    def get_capture(self, remark=None):
         """
         Get captured packets
 
         :returns: iterable packets
         """
         try:
+            self.wait_for_capture_file()
             output = rdpcap(self.out_path)
         except IOError:  # TODO
-            self.test.logger.error("File %s does not exist, probably because no"
+            self.test.logger.debug("File %s does not exist, probably because no"
                                    " packets arrived" % self.out_path)
-            return []
+            if remark:
+                raise Exception("No packets captured on %s(%s)" %
+                                (self.name, remark))
+            else:
+                raise Exception("No packets captured on %s" % self.name)
         return output
 
+    def assert_nothing_captured(self, remark=None):
+        if os.path.isfile(self.out_path):
+            try:
+                capture = self.get_capture()
+                self.test.logger.error(
+                    ppc("Unexpected packets captured:", capture))
+            except:
+                pass
+            if remark:
+                raise AssertionError(
+                    "Capture file present for interface %s(%s)" %
+                    (self.name, remark))
+            else:
+                raise AssertionError("Capture file present for interface %s" %
+                                     self.name)
+
+    def wait_for_capture_file(self, timeout=1):
+        """
+        Wait until pcap capture file appears
+
+        :param timeout: How long to wait for the packet (default 1s)
+
+        :raises Exception: if the capture file does not appear within timeout
+        """
+        limit = time.time() + timeout
+        if not os.path.isfile(self.out_path):
+            self.test.logger.debug(
+                "Waiting for capture file to appear, timeout is %ss", timeout)
+        else:
+            self.test.logger.debug("Capture file already exists")
+            return
+        while time.time() < limit:
+            if os.path.isfile(self.out_path):
+                break
+            time.sleep(0)  # yield
+        if os.path.isfile(self.out_path):
+            self.test.logger.debug("Capture file appeared after %fs" %
+                                   (time.time() - (limit - timeout)))
+        else:
+            self.test.logger.debug("Timeout - capture file still nowhere")
+            raise Exception("Capture file did not appear within timeout")
+
     def wait_for_packet(self, timeout):
         """
         Wait for next packet captured with a timeout
@@ -144,18 +190,8 @@ class VppPGInterface(VppInterface):
         """
         limit = time.time() + timeout
         if self._pcap_reader is None:
-            self.test.logger.debug("Waiting for the capture file to appear")
-            while time.time() < limit:
-                if os.path.isfile(self.out_path):
-                    break
-                time.sleep(0)  # yield
-            if os.path.isfile(self.out_path):
-                self.test.logger.debug("Capture file appeared after %fs" %
-                                       (time.time() - (limit - timeout)))
-                self._pcap_reader = PcapReader(self.out_path)
-            else:
-                self.test.logger.debug("Timeout - capture file still nowhere")
-                raise Exception("Packet didn't arrive within timeout")
+            self.wait_for_capture_file(timeout)
+            self._pcap_reader = PcapReader(self.out_path)
 
         self.test.logger.debug("Waiting for packet")
         while time.time() < limit:
@@ -197,11 +233,11 @@ class VppPGInterface(VppInterface):
         pg_interface.enable_capture()
         self.test.pg_start()
         self.test.logger.info(self.test.vapi.cli("show trace"))
-        arp_reply = pg_interface.get_capture()
-        if arp_reply is None or len(arp_reply) == 0:
-            self.test.logger.info(
-                "No ARP received on port %s" %
-                pg_interface.name)
+        try:
+            arp_reply = pg_interface.get_capture()
+        except:
+            self.test.logger.info("No ARP received on port %s" %
+                                  pg_interface.name)
             return
         arp_reply = arp_reply[0]
         # Make Dot1AD packet content recognizable to scapy
-- 
cgit 1.2.3-korg


From a1bd0230d2412223141486192ee0d4632bfe8710 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Mon, 19 Dec 2016 19:08:11 +0100
Subject: Remove RPATH from binaries before creating .deb and .rpm packages

Change-Id: I684d4eabac03e049524204864c985e14eea8d92e
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                        |  4 ++--
 build-root/deb/debian/control   |  2 +-
 build-root/deb/debian/rules     |  1 +
 build-root/rpm/vpp.spec         |  7 ++++++-
 build-root/scripts/remove-rpath | 24 ++++++++++++++++++++++++
 5 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100755 build-root/scripts/remove-rpath

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1c7534cf..b3ffaf30 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ endif
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
-DEB_DEPENDS += python-dev python-virtualenv python-pip lcov
+DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -43,7 +43,7 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel python-virtualenv lcov
+RPM_DEPENDS += python-devel python-virtualenv lcov chrpath
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
diff --git a/build-root/deb/debian/control b/build-root/deb/debian/control
index 988d2764..643774e3 100644
--- a/build-root/deb/debian/control
+++ b/build-root/deb/debian/control
@@ -2,7 +2,7 @@ Source: vpp
 Section: net
 Priority: extra
 Maintainer: Cisco OpenVPP Packaging Team <bogus.address@cisco.com>
-Build-Depends: debhelper (>= 9), dkms, dh-systemd
+Build-Depends: debhelper (>= 9), dkms, dh-systemd, chrpath
 Standards-Version: 3.9.4
 
 Package: vpp
diff --git a/build-root/deb/debian/rules b/build-root/deb/debian/rules
index 4ecd38f7..186fa840 100755
--- a/build-root/deb/debian/rules
+++ b/build-root/deb/debian/rules
@@ -22,6 +22,7 @@ include /usr/share/dpkg/default.mk
 
 override_dh_install:
 	dh_install --exclude .git
+	../scripts/remove-rpath .
 
 override_dh_strip:
 	dh_strip --dbg-package=vpp-dbg
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index 4a351348..ed382349 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -26,7 +26,7 @@ License: MIT
 Version: %{_version}
 Release: %{_release}
 Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python
-BuildRequires: systemd
+BuildRequires: systemd, chrpath
 
 Source: %{name}-%{_version}-%{_release}.tar.gz
 
@@ -189,6 +189,11 @@ do
 	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
 done
 
+#
+# remove RPATH from ELF binaries
+#
+%{_mu_build_dir}/scripts/remove-rpath %{buildroot}
+
 %post
 sysctl --system
 %systemd_post vpp.service
diff --git a/build-root/scripts/remove-rpath b/build-root/scripts/remove-rpath
new file mode 100755
index 00000000..bda3d60d
--- /dev/null
+++ b/build-root/scripts/remove-rpath
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+if [ -z $1 ]; then
+	echo "Please specify path"
+	exit 1
+fi
+
+which chrpath &> /dev/null
+
+if [ $? -ne 0 ] ; then
+	echo "Please install chrpath tool"
+	exit 1
+fi
+
+libs=$(find $1 -type f -name \*.so)
+execs=$(find $1 -type f -path \*/bin/\* )
+
+for i in $libs $execs; do
+	chrpath $i 2> /dev/null | grep -q build-root
+	if [ $? -eq 0 ] ; then
+		chrpath $i
+	fi
+done
+
-- 
cgit 1.2.3-korg


From 1a9b5b71cddac0a26d788f8d1e66076666087888 Mon Sep 17 00:00:00 2001
From: Ray Kinsella <ray.kinsella@intel.com>
Date: Wed, 21 Dec 2016 14:25:40 +0000
Subject: vagrant: Fixing sudo related vagrant errors

The dpkg sudo trigger appears to want to run interactively despite the noninteractive
debconf setting. This is a problem upstream for vagrant also, see.

https://github.com/hashicorp/terraform/issues/9763

Incorporating the recommended fix to Vagrantfile from upstream

https://github.com/hashicorp/terraform/pull/9783

Change-Id: I8da8522fc9e80fc3bd268b347a786054ad019170
Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
---
 Makefile                     |  2 +-
 build-root/vagrant/update.sh | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b3ffaf30..292b0d28 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ endif
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
-DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath
+DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else
diff --git a/build-root/vagrant/update.sh b/build-root/vagrant/update.sh
index 77bf49a7..2a377398 100755
--- a/build-root/vagrant/update.sh
+++ b/build-root/vagrant/update.sh
@@ -25,21 +25,24 @@ fi
 
 # Do initial setup for the system
 if [ $DISTRIB_ID == "Ubuntu" ]; then
-    # Fix grub-pc on Virtualbox with Ubuntu
+
+    export DEBIAN_PRIORITY=critical
     export DEBIAN_FRONTEND=noninteractive
+    export DEBCONF_NONINTERACTIVE_SEEN=true
+    APT_OPTS="--assume-yes --no-install-suggests --no-install-recommends -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\""
 
     # Standard update + upgrade dance
-    apt-get update
-    apt-get upgrade -y
+    apt-get update ${APT_OPTS} >/dev/null
+    apt-get upgrade ${APT_OPTS} >/dev/null
 
     # Fix the silly notion that /bin/sh should point to dash by pointing it to bash
 
     update-alternatives --install /bin/sh sh /bin/bash 100
 
     # Install useful but non-mandatory tools
-    apt-get install -y emacs  git-review gdb gdbserver
+    apt-get install -y emacs git-review gdb gdbserver
 elif [ $DISTRIB_ID == "CentOS" ]; then
     # Standard update + upgrade dance
     yum check-update
     yum update -y
-fi
\ No newline at end of file
+fi
-- 
cgit 1.2.3-korg


From 7cd468a3d7dee7d6c92f69a0bb7061ae208ec727 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Mon, 19 Dec 2016 23:05:39 +0100
Subject: Reorganize source tree to use single autotools instance

Change-Id: I7b51f88292e057c6443b12224486f2d0c9f8ae23
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                                           |     4 +-
 build-data/packages/cavium-dpdk.mk                 |    55 -
 build-data/packages/g2.mk                          |     6 +-
 build-data/packages/gmod.mk                        |     6 +-
 build-data/packages/perftool.mk                    |     5 +-
 build-data/packages/plugins.mk                     |    25 +-
 build-data/packages/src.mk                         |     0
 build-data/packages/svm.mk                         |     5 -
 build-data/packages/vlib-api-cavium-dpdk.mk        |     6 -
 build-data/packages/vlib-api.mk                    |     4 -
 build-data/packages/vlib-cavium-dpdk.mk            |     7 -
 build-data/packages/vlib.mk                        |    16 -
 build-data/packages/vnet-cavium-dpdk.mk            |    29 -
 build-data/packages/vpp-api-test-cavium-dpdk.mk    |    32 -
 build-data/packages/vpp-api-test.mk                |    39 -
 build-data/packages/vpp-api.mk                     |    16 +-
 build-data/packages/vpp-cavium-dpdk.mk             |    30 -
 build-data/packages/vpp.mk                         |    29 +-
 build-data/packages/vppinfra.mk                    |     5 -
 build-data/platforms.mk                            |     6 +-
 build-data/platforms/vpp.mk                        |     4 +-
 build-data/platforms/vpp_lite.mk                   |     3 +-
 build-data/suffix-rules.mk                         |    27 -
 build-root/bootstrap.sh                            |     2 +-
 build-root/packages/src.mk                         |     4 +
 build-root/packages/tools.mk                       |     3 +
 build-root/packages/vppapigen.mk                   |     5 -
 build-root/rpm/vpp.spec                            |    24 +-
 build-root/scripts/find-plugins-contents           |     6 +-
 build-root/scripts/find-python-api-contents        |     2 +-
 g2/Makefile.am                                     |    34 -
 g2/clib.c                                          |   154 -
 g2/configure.ac                                    |    12 -
 g2/cpel.c                                          |   470 -
 g2/cpel.h                                          |    83 -
 g2/events.c                                        |   475 -
 g2/g2.h                                            |   195 -
 g2/g2version.c                                     |    19 -
 g2/main.c                                          |   196 -
 g2/menu1.c                                         |   565 -
 g2/mkversion.c                                     |    77 -
 g2/pointsel.c                                      |   854 -
 g2/props.c                                         |   279 -
 g2/props.h                                         |    21 -
 g2/view1.c                                         |  3077 ----
 gmod/gmod/mod_vpp.c                                |     2 +-
 perftool/Makefile.am                               |    44 -
 perftool/c2cpel.c                                  |   248 -
 perftool/configure.ac                              |    12 -
 perftool/cpel.h                                    |    83 -
 perftool/cpel_util.c                               |   456 -
 perftool/cpel_util.h                               |    68 -
 perftool/cpelatency.c                              |   927 -
 perftool/cpeldump.c                                |   638 -
 perftool/cpelinreg.c                               |   892 -
 perftool/cpelstate.c                               |   822 -
 perftool/delsvec.c                                 |   315 -
 perftool/linreg.c                                  |    78 -
 perftool/new.cpel                                  |   Bin 1672 -> 0 bytes
 perftool/new.elog                                  |   Bin 4525 -> 0 bytes
 perftool/props.c                                   |   280 -
 plugins/Makefile.am                                |    12 -
 plugins/configure.ac                               |     3 -
 plugins/flowperpkt-plugin/Makefile.am              |    64 -
 plugins/flowperpkt-plugin/configure.ac             |     9 -
 .../flowperpkt-plugin/flowperpkt/flowperpkt.api    |    42 -
 plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c  |   671 -
 plugins/flowperpkt-plugin/flowperpkt/flowperpkt.h  |    90 -
 .../flowperpkt/flowperpkt_all_api_h.h              |    18 -
 .../flowperpkt/flowperpkt_msg_enum.h               |    31 -
 .../flowperpkt-plugin/flowperpkt/flowperpkt_test.c |   234 -
 plugins/flowperpkt-plugin/flowperpkt/l2_node.c     |   561 -
 plugins/flowperpkt-plugin/flowperpkt/node.c        |   574 -
 plugins/flowperpkt-plugin/flowperpkt_plugin_doc.md |    13 -
 plugins/ila-plugin/Makefile.am                     |    29 -
 plugins/ila-plugin/configure.ac                    |     9 -
 plugins/ila-plugin/ila/ila.c                       |  1070 --
 plugins/ila-plugin/ila/ila.h                       |   116 -
 plugins/sixrd-plugin/Makefile.am                   |    38 -
 plugins/sixrd-plugin/configure.ac                  |     9 -
 plugins/sixrd-plugin/sixrd/ip4_sixrd.c             |   127 -
 plugins/sixrd-plugin/sixrd/ip6_sixrd.c             |   129 -
 plugins/sixrd-plugin/sixrd/sixrd.c                 |   369 -
 plugins/sixrd-plugin/sixrd/sixrd.h                 |   141 -
 plugins/sixrd-plugin/sixrd/sixrd_dpo.c             |   132 -
 plugins/sixrd-plugin/sixrd/sixrd_dpo.h             |    61 -
 src/Makefile.am                                    |   101 +
 src/configure.ac                                   |   195 +
 src/examples/vlib/dir.dox                          |    22 +
 src/examples/vlib/main_stub.c                      |   418 +
 src/examples/vlib/mc_test.c                        |   384 +
 src/examples/vlib/plex_test.c                      |   527 +
 src/g2.am                                          |    32 +
 src/perftool.am                                    |    41 +
 src/plugins/Makefile.am                            |    60 +
 src/plugins/flowperpkt.am                          |    38 +
 src/plugins/flowperpkt/flowperpkt.api              |    42 +
 src/plugins/flowperpkt/flowperpkt.c                |   671 +
 src/plugins/flowperpkt/flowperpkt.h                |    90 +
 src/plugins/flowperpkt/flowperpkt_all_api_h.h      |    18 +
 src/plugins/flowperpkt/flowperpkt_msg_enum.h       |    31 +
 src/plugins/flowperpkt/flowperpkt_plugin_doc.md    |    13 +
 src/plugins/flowperpkt/flowperpkt_test.c           |   234 +
 src/plugins/flowperpkt/l2_node.c                   |   561 +
 src/plugins/flowperpkt/node.c                      |   574 +
 src/plugins/ila.am                                 |    20 +
 src/plugins/ila/ila.c                              |  1070 ++
 src/plugins/ila/ila.h                              |   116 +
 src/plugins/sixrd.am                               |    26 +
 src/plugins/sixrd/ip4_sixrd.c                      |   127 +
 src/plugins/sixrd/ip6_sixrd.c                      |   129 +
 src/plugins/sixrd/sixrd.c                          |   369 +
 src/plugins/sixrd/sixrd.h                          |   141 +
 src/plugins/sixrd/sixrd_dpo.c                      |   132 +
 src/plugins/sixrd/sixrd_dpo.h                      |    61 +
 src/scripts/vnet/arp4                              |    21 +
 src/scripts/vnet/arp4-mpls                         |    24 +
 src/scripts/vnet/arp6                              |    21 +
 src/scripts/vnet/bvi                               |    76 +
 src/scripts/vnet/dhcp/dhcpd.conf                   |     8 +
 src/scripts/vnet/dhcp/left-ping-target.sh          |     4 +
 src/scripts/vnet/dhcp/leftpeer.conf                |    17 +
 src/scripts/vnet/icmp                              |    16 +
 src/scripts/vnet/icmp6                             |    16 +
 src/scripts/vnet/ige                               |    19 +
 src/scripts/vnet/ip6                               |    15 +
 src/scripts/vnet/ip6-hbh                           |    84 +
 src/scripts/vnet/ixge                              |    15 +
 src/scripts/vnet/l2efpfilter                       |    83 +
 src/scripts/vnet/l2efpfilter_perf                  |    58 +
 src/scripts/vnet/l2fib                             |    46 +
 src/scripts/vnet/l2fib_perf                        |    29 +
 src/scripts/vnet/l2fib_xc                          |    31 +
 src/scripts/vnet/l2flood                           |    42 +
 src/scripts/vnet/l2tp                              |   134 +
 src/scripts/vnet/leftpeer/leftpeer-classify        |     8 +
 src/scripts/vnet/leftpeer/leftpeer-classify6       |     5 +
 src/scripts/vnet/leftpeer/leftpeer-classifyl2      |     8 +
 src/scripts/vnet/leftpeer/leftpeer-dhcp            |    23 +
 src/scripts/vnet/leftpeer/leftpeer-ioam.conf       |    15 +
 src/scripts/vnet/leftpeer/leftpeer-l3vxlan.conf    |    12 +
 src/scripts/vnet/leftpeer/leftpeer-lisp.conf       |    18 +
 src/scripts/vnet/leftpeer/leftpeer-mpls.conf       |    17 +
 src/scripts/vnet/leftpeer/leftpeer-sr.conf         |    24 +
 src/scripts/vnet/leftpeer/leftpeer-vxlan.conf      |    17 +
 src/scripts/vnet/leftpeer/leftpeer.script          |     9 +
 src/scripts/vnet/lfib/ip4-to-mpls                  |    26 +
 src/scripts/vnet/lfib/mpls-pop-to-mpls             |    28 +
 src/scripts/vnet/lfib/mpls-to-ip4                  |    27 +
 src/scripts/vnet/lfib/mpls-to-mpls                 |    26 +
 src/scripts/vnet/mpls-o-ethernet/leftpeer.conf     |    17 +
 src/scripts/vnet/mpls-o-ethernet/pg                |    10 +
 src/scripts/vnet/mpls-o-ethernet/rightpeer.conf    |    15 +
 src/scripts/vnet/mpls-o-ethernet/single.conf       |    17 +
 src/scripts/vnet/mpls-o-gre/dhcpd.conf             |   116 +
 src/scripts/vnet/mpls-o-gre/leftpeer.conf          |    14 +
 src/scripts/vnet/mpls-o-gre/rightpeer.conf         |    14 +
 src/scripts/vnet/mpls-tunnel                       |    87 +
 src/scripts/vnet/pcap                              |    18 +
 src/scripts/vnet/probe4                            |    11 +
 src/scripts/vnet/probe6                            |     7 +
 src/scripts/vnet/rewrite                           |    62 +
 src/scripts/vnet/rightpeer/rightpeer-ioam.conf     |    14 +
 src/scripts/vnet/rightpeer/rightpeer-l3vxlan.conf  |     9 +
 src/scripts/vnet/rightpeer/rightpeer-lisp.conf     |    16 +
 src/scripts/vnet/rightpeer/rightpeer-mpls-l2.conf  |    24 +
 src/scripts/vnet/rightpeer/rightpeer-mpls.conf     |    17 +
 src/scripts/vnet/rightpeer/rightpeer-sr.conf       |    28 +
 src/scripts/vnet/rightpeer/rightpeer-vxlan.conf    |    16 +
 src/scripts/vnet/rightpeer/rightpeer.script        |     9 +
 src/scripts/vnet/rpf                               |    18 +
 src/scripts/vnet/rtt-test                          |    31 +
 src/scripts/vnet/snat                              |    34 +
 src/scripts/vnet/snat_static                       |    44 +
 src/scripts/vnet/snat_static_with_port             |    44 +
 src/scripts/vnet/source_and_port_range_check       |    63 +
 src/scripts/vnet/speed                             |    14 +
 src/scripts/vnet/sr/left-linux-ping.sh             |     3 +
 src/scripts/vnet/sr/leftpeer.conf                  |    27 +
 src/scripts/vnet/sr/right-linux-ping.sh            |     4 +
 src/scripts/vnet/sr/rightpeer.conf                 |    22 +
 src/scripts/vnet/sr/srlocal.sh                     |     4 +
 src/scripts/vnet/srp                               |    27 +
 src/scripts/vnet/tcp                               |    16 +
 src/scripts/vnet/tcp-test                          |     6 +
 src/scripts/vnet/tf-ucs-1                          |    16 +
 src/scripts/vnet/urpf                              |    86 +
 src/scripts/vnet/virl/ip6sr.virl                   |   874 +
 src/scripts/vnet/virl/ip6sr_notes.txt              |    38 +
 src/scripts/vnet/virl/mplsogre.virl                |   319 +
 src/scripts/vnet/virl/simple.virl                  |   389 +
 src/scripts/vnet/vlan                              |    23 +
 src/scripts/vppctl                                 |   121 +
 src/suffix-rules.mk                                |    27 +
 src/svm.am                                         |    31 +
 src/svm/dir.dox                                    |    21 +
 src/svm/persist.c                                  |   258 +
 src/svm/ssvm.c                                     |   178 +
 src/svm/ssvm.h                                     |   155 +
 src/svm/svm.c                                      |  1237 ++
 src/svm/svm.h                                      |   207 +
 src/svm/svm_test.c                                 |    79 +
 src/svm/svmdb.c                                    |   671 +
 src/svm/svmdb.h                                    |   135 +
 src/svm/svmdbtool.c                                |   537 +
 src/svm/svmtool.c                                  |   528 +
 src/tests/vnet/README                              |    10 +
 src/tests/vnet/lisp-cp/test_cp_serdes.c            |   639 +
 src/tests/vnet/lisp-cp/test_lisp_types.c           |   565 +
 src/tests/vnet/lisp-gpe/test.c                     |    18 +
 src/tools/elftool/dir.dox                          |    19 +
 src/tools/elftool/elftool.c                        |   464 +
 src/tools/g2/clib.c                                |   154 +
 src/tools/g2/configure.ac                          |    12 +
 src/tools/g2/cpel.c                                |   470 +
 src/tools/g2/cpel.h                                |    83 +
 src/tools/g2/events.c                              |   475 +
 src/tools/g2/g2.h                                  |   195 +
 src/tools/g2/g2version.c                           |    19 +
 src/tools/g2/main.c                                |   196 +
 src/tools/g2/menu1.c                               |   565 +
 src/tools/g2/mkversion.c                           |    77 +
 src/tools/g2/pointsel.c                            |   854 +
 src/tools/g2/props.c                               |   279 +
 src/tools/g2/props.h                               |    21 +
 src/tools/g2/view1.c                               |  3077 ++++
 src/tools/perftool/c2cpel.c                        |   248 +
 src/tools/perftool/configure.ac                    |    12 +
 src/tools/perftool/cpel.h                          |    83 +
 src/tools/perftool/cpel_util.c                     |   456 +
 src/tools/perftool/cpel_util.h                     |    68 +
 src/tools/perftool/cpelatency.c                    |   927 +
 src/tools/perftool/cpeldump.c                      |   638 +
 src/tools/perftool/cpelinreg.c                     |   892 +
 src/tools/perftool/cpelstate.c                     |   822 +
 src/tools/perftool/delsvec.c                       |   315 +
 src/tools/perftool/linreg.c                        |    78 +
 src/tools/perftool/new.cpel                        |   Bin 0 -> 1672 bytes
 src/tools/perftool/new.elog                        |   Bin 0 -> 4525 bytes
 src/tools/perftool/props.c                         |   280 +
 src/tools/vppapigen/configure.ac                   |    14 +
 src/tools/vppapigen/gram.y                         |    90 +
 src/tools/vppapigen/lex.c                          |  1067 ++
 src/tools/vppapigen/lex.h                          |    50 +
 src/tools/vppapigen/node.c                         |  1527 ++
 src/tools/vppapigen/node.h                         |    94 +
 src/vat/api_format.c                               | 17829 +++++++++++++++++++
 src/vat/json_format.c                              |   304 +
 src/vat/json_format.h                              |   254 +
 src/vat/json_test.c                                |    75 +
 src/vat/main.c                                     |   421 +
 src/vat/plugin.c                                   |   201 +
 src/vat/plugin.h                                   |    61 +
 src/vat/plugin_api.c                               |   216 +
 src/vat/restart.c                                  |   246 +
 src/vat/vat.h                                      |   257 +
 src/vlib-api.am                                    |    73 +
 src/vlib.am                                        |   103 +
 src/vlib/buffer.c                                  |  1987 +++
 src/vlib/buffer.h                                  |   417 +
 src/vlib/buffer_funcs.h                            |   755 +
 src/vlib/buffer_node.h                             |   337 +
 src/vlib/cli.c                                     |  1173 ++
 src/vlib/cli.h                                     |   192 +
 src/vlib/cli_funcs.h                               |    58 +
 src/vlib/counter.c                                 |   151 +
 src/vlib/counter.h                                 |   379 +
 src/vlib/defs.h                                    |    82 +
 src/vlib/dir.dox                                   |    23 +
 src/vlib/elog_samples.c                            |   122 +
 src/vlib/error.c                                   |   338 +
 src/vlib/error.h                                   |   101 +
 src/vlib/error_funcs.h                             |    88 +
 src/vlib/format.c                                  |   196 +
 src/vlib/format_funcs.h                            |    75 +
 src/vlib/global_funcs.h                            |    45 +
 src/vlib/i2c.c                                     |   231 +
 src/vlib/i2c.h                                     |    67 +
 src/vlib/init.c                                    |   168 +
 src/vlib/init.h                                    |   238 +
 src/vlib/lex.c                                     |   271 +
 src/vlib/lex.h                                     |   145 +
 src/vlib/main.c                                    |  1703 ++
 src/vlib/main.h                                    |   333 +
 src/vlib/mc.c                                      |  2609 +++
 src/vlib/mc.h                                      |   687 +
 src/vlib/node.c                                    |   631 +
 src/vlib/node.h                                    |   725 +
 src/vlib/node_cli.c                                |   466 +
 src/vlib/node_format.c                             |   187 +
 src/vlib/node_funcs.h                              |  1130 ++
 src/vlib/parse.c                                   |  1007 ++
 src/vlib/parse.h                                   |   221 +
 src/vlib/parse_builtin.c                           |   150 +
 src/vlib/pci/linux_pci.c                           |   642 +
 src/vlib/pci/pci.c                                 |   264 +
 src/vlib/pci/pci.h                                 |   251 +
 src/vlib/pci/pci_config.h                          |   731 +
 src/vlib/physmem.h                                 |   108 +
 src/vlib/threads.c                                 |  1492 ++
 src/vlib/threads.h                                 |   470 +
 src/vlib/threads_cli.c                             |   579 +
 src/vlib/trace.c                                   |   545 +
 src/vlib/trace.h                                   |   100 +
 src/vlib/trace_funcs.h                             |   185 +
 src/vlib/unix/cj.c                                 |   271 +
 src/vlib/unix/cj.h                                 |    79 +
 src/vlib/unix/cli.c                                |  2989 ++++
 src/vlib/unix/dir.dox                              |    28 +
 src/vlib/unix/input.c                              |   265 +
 src/vlib/unix/main.c                               |   557 +
 src/vlib/unix/mc_socket.c                          |  1049 ++
 src/vlib/unix/mc_socket.h                          |   137 +
 src/vlib/unix/physmem.c                            |   470 +
 src/vlib/unix/physmem.h                            |    65 +
 src/vlib/unix/plugin.c                             |   260 +
 src/vlib/unix/plugin.h                             |    98 +
 src/vlib/unix/unix.h                               |   232 +
 src/vlib/unix/util.c                               |   231 +
 src/vlib/vlib.h                                    |    86 +
 src/vlib/vlib_process_doc.h                        |   147 +
 src/vlibapi/api.h                                  |   281 +
 src/vlibapi/api_helper_macros.h                    |   243 +
 src/vlibapi/api_shared.c                           |  1375 ++
 src/vlibapi/node_serialize.c                       |   399 +
 src/vlibmemory/api.h                               |   163 +
 src/vlibmemory/memclnt.api                         |    91 +
 src/vlibmemory/memory_client.c                     |   283 +
 src/vlibmemory/memory_shared.c                     |   852 +
 src/vlibmemory/memory_vlib.c                       |  1346 ++
 src/vlibmemory/unix_shared_memory_queue.c          |   324 +
 src/vlibmemory/unix_shared_memory_queue.h          |    69 +
 src/vlibmemory/vl_memory_api_h.h                   |    32 +
 src/vlibmemory/vl_memory_msg_enum.h                |    42 +
 src/vlibsocket/api.h                               |    87 +
 src/vlibsocket/sock_test.c                         |   155 +
 src/vlibsocket/sockclnt.api                        |    50 +
 src/vlibsocket/sockclnt_vlib.c                     |   209 +
 src/vlibsocket/socksvr_vlib.c                      |   706 +
 src/vlibsocket/vl_socket_api_h.h                   |    33 +
 src/vlibsocket/vl_socket_msg_enum.h                |    42 +
 src/vnet.am                                        |   972 +
 src/vnet/adj/adj.c                                 |   454 +
 src/vnet/adj/adj.h                                 |   122 +
 src/vnet/adj/adj_glean.c                           |   285 +
 src/vnet/adj/adj_glean.h                           |    61 +
 src/vnet/adj/adj_internal.h                        |   104 +
 src/vnet/adj/adj_l2.c                              |   194 +
 src/vnet/adj/adj_l2.h                              |    24 +
 src/vnet/adj/adj_midchain.c                        |   559 +
 src/vnet/adj/adj_midchain.h                        |   102 +
 src/vnet/adj/adj_nbr.c                             |  1087 ++
 src/vnet/adj/adj_nbr.h                             |   176 +
 src/vnet/adj/adj_rewrite.c                         |    53 +
 src/vnet/adj/adj_rewrite.h                         |    49 +
 src/vnet/adj/adj_types.h                           |    53 +
 src/vnet/api_errno.h                               |   113 +
 src/vnet/bfd/bfd.api                               |   205 +
 src/vnet/bfd/bfd_api.c                             |   262 +
 src/vnet/bfd/bfd_api.h                             |    46 +
 src/vnet/bfd/bfd_debug.h                           |    79 +
 src/vnet/bfd/bfd_doc.md                            |     1 +
 src/vnet/bfd/bfd_main.c                            |   969 +
 src/vnet/bfd/bfd_main.h                            |   220 +
 src/vnet/bfd/bfd_protocol.c                        |    74 +
 src/vnet/bfd/bfd_protocol.h                        |   154 +
 src/vnet/bfd/bfd_udp.c                             |   639 +
 src/vnet/bfd/bfd_udp.h                             |    56 +
 src/vnet/bfd/dir.dox                               |    18 +
 src/vnet/buffer.h                                  |   381 +
 src/vnet/cdp/cdp.pg                                |     7 +
 src/vnet/cdp/cdp_input.c                           |   506 +
 src/vnet/cdp/cdp_node.c                            |   208 +
 src/vnet/cdp/cdp_node.h                            |   147 +
 src/vnet/cdp/cdp_periodic.c                        |   512 +
 src/vnet/cdp/cdp_protocol.h                        |   186 +
 src/vnet/classify/README                           |   180 +
 src/vnet/classify/flow_classify.c                  |   212 +
 src/vnet/classify/flow_classify.h                  |    51 +
 src/vnet/classify/flow_classify_node.c             |   338 +
 src/vnet/classify/input_acl.c                      |   283 +
 src/vnet/classify/input_acl.h                      |    54 +
 src/vnet/classify/ip_classify.c                    |   365 +
 src/vnet/classify/policer_classify.c               |   227 +
 src/vnet/classify/policer_classify.h               |    55 +
 src/vnet/classify/vnet_classify.c                  |  2436 +++
 src/vnet/classify/vnet_classify.h                  |   523 +
 src/vnet/config.c                                  |   361 +
 src/vnet/config.h                                  |   176 +
 src/vnet/cop/cop.c                                 |   387 +
 src/vnet/cop/cop.h                                 |    89 +
 src/vnet/cop/ip4_whitelist.c                       |   356 +
 src/vnet/cop/ip6_whitelist.c                       |   298 +
 src/vnet/cop/node1.c                               |   319 +
 src/vnet/devices/af_packet/af_packet.api           |    71 +
 src/vnet/devices/af_packet/af_packet.c             |   366 +
 src/vnet/devices/af_packet/af_packet.h             |    69 +
 src/vnet/devices/af_packet/af_packet_api.c         |   143 +
 src/vnet/devices/af_packet/cli.c                   |   144 +
 src/vnet/devices/af_packet/device.c                |   250 +
 src/vnet/devices/af_packet/node.c                  |   288 +
 src/vnet/devices/devices.c                         |    91 +
 src/vnet/devices/devices.h                         |    53 +
 src/vnet/devices/dpdk/cli.c                        |  1296 ++
 src/vnet/devices/dpdk/device.c                     |   840 +
 src/vnet/devices/dpdk/dpdk.h                       |   534 +
 src/vnet/devices/dpdk/dpdk_priv.h                  |   132 +
 src/vnet/devices/dpdk/format.c                     |   763 +
 src/vnet/devices/dpdk/hqos.c                       |   775 +
 src/vnet/devices/dpdk/init.c                       |  1803 ++
 src/vnet/devices/dpdk/ipsec/cli.c                  |   141 +
 src/vnet/devices/dpdk/ipsec/crypto_node.c          |   210 +
 src/vnet/devices/dpdk/ipsec/dir.dox                |    18 +
 .../devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md    |    73 +
 src/vnet/devices/dpdk/ipsec/esp.h                  |   295 +
 src/vnet/devices/dpdk/ipsec/esp_decrypt.c          |   583 +
 src/vnet/devices/dpdk/ipsec/esp_encrypt.c          |   598 +
 src/vnet/devices/dpdk/ipsec/ipsec.c                |   313 +
 src/vnet/devices/dpdk/ipsec/ipsec.h                |   227 +
 src/vnet/devices/dpdk/node.c                       |   687 +
 src/vnet/devices/dpdk/qos_doc.md                   |   404 +
 src/vnet/devices/netmap/cli.c                      |   146 +
 src/vnet/devices/netmap/device.c                   |   261 +
 src/vnet/devices/netmap/net_netmap.h               |   650 +
 src/vnet/devices/netmap/netmap.api                 |    74 +
 src/vnet/devices/netmap/netmap.c                   |   316 +
 src/vnet/devices/netmap/netmap.h                   |   164 +
 src/vnet/devices/netmap/netmap_api.c               |   137 +
 src/vnet/devices/netmap/node.c                     |   300 +
 src/vnet/devices/nic/ixge.c                        |  2938 +++
 src/vnet/devices/nic/ixge.h                        |  1293 ++
 src/vnet/devices/nic/sfp.c                         |   117 +
 src/vnet/devices/nic/sfp.h                         |   117 +
 src/vnet/devices/ssvm/node.c                       |   343 +
 src/vnet/devices/ssvm/ssvm_eth.c                   |   491 +
 src/vnet/devices/ssvm/ssvm_eth.h                   |   141 +
 src/vnet/devices/virtio/dir.dox                    |    27 +
 src/vnet/devices/virtio/vhost-user.c               |  3314 ++++
 src/vnet/devices/virtio/vhost-user.h               |   350 +
 src/vnet/devices/virtio/vhost_user.api             |   125 +
 src/vnet/devices/virtio/vhost_user_api.c           |   262 +
 src/vnet/dhcp/client.c                             |  1031 ++
 src/vnet/dhcp/client.h                             |   118 +
 src/vnet/dhcp/packet.h                             |    61 +
 src/vnet/dhcp/proxy.h                              |    92 +
 src/vnet/dhcp/proxy_error.def                      |    30 +
 src/vnet/dhcp/proxy_node.c                         |  1114 ++
 src/vnet/dhcpv6/packet.h                           |   183 +
 src/vnet/dhcpv6/proxy.h                            |    95 +
 src/vnet/dhcpv6/proxy_error.def                    |    29 +
 src/vnet/dhcpv6/proxy_node.c                       |  1191 ++
 src/vnet/dpo/classify_dpo.c                        |   131 +
 src/vnet/dpo/classify_dpo.h                        |    56 +
 src/vnet/dpo/dpo.c                                 |   500 +
 src/vnet/dpo/dpo.h                                 |   381 +
 src/vnet/dpo/drop_dpo.c                            |   106 +
 src/vnet/dpo/drop_dpo.h                            |    31 +
 src/vnet/dpo/ip_null_dpo.c                         |   408 +
 src/vnet/dpo/ip_null_dpo.h                         |    56 +
 src/vnet/dpo/load_balance.c                        |   993 ++
 src/vnet/dpo/load_balance.h                        |   211 +
 src/vnet/dpo/load_balance_map.c                    |   575 +
 src/vnet/dpo/load_balance_map.h                    |    79 +
 src/vnet/dpo/lookup_dpo.c                          |  1185 ++
 src/vnet/dpo/lookup_dpo.h                          |   108 +
 src/vnet/dpo/mpls_label_dpo.c                      |   570 +
 src/vnet/dpo/mpls_label_dpo.h                      |   101 +
 src/vnet/dpo/punt_dpo.c                            |   100 +
 src/vnet/dpo/punt_dpo.h                            |    30 +
 src/vnet/dpo/receive_dpo.c                         |   165 +
 src/vnet/dpo/receive_dpo.h                         |    62 +
 src/vnet/ethernet/arp.c                            |  2355 +++
 src/vnet/ethernet/arp_packet.h                     |   173 +
 src/vnet/ethernet/dir.dox                          |    24 +
 src/vnet/ethernet/error.def                        |    46 +
 src/vnet/ethernet/ethernet.h                       |   561 +
 src/vnet/ethernet/format.c                         |   366 +
 src/vnet/ethernet/init.c                           |   128 +
 src/vnet/ethernet/interface.c                      |   730 +
 src/vnet/ethernet/mac_swap.c                       |   397 +
 src/vnet/ethernet/node.c                           |  1368 ++
 src/vnet/ethernet/packet.h                         |   152 +
 src/vnet/ethernet/pg.c                             |   183 +
 src/vnet/ethernet/types.def                        |   113 +
 src/vnet/feature/feature.c                         |   463 +
 src/vnet/feature/feature.h                         |   382 +
 src/vnet/feature/registration.c                    |   301 +
 src/vnet/fib/fib.c                                 |    41 +
 src/vnet/fib/fib.h                                 |   652 +
 src/vnet/fib/fib_api.h                             |    54 +
 src/vnet/fib/fib_attached_export.c                 |   572 +
 src/vnet/fib/fib_attached_export.h                 |    57 +
 src/vnet/fib/fib_entry.c                           |  1503 ++
 src/vnet/fib/fib_entry.h                           |   530 +
 src/vnet/fib/fib_entry_cover.c                     |   225 +
 src/vnet/fib/fib_entry_cover.h                     |    47 +
 src/vnet/fib/fib_entry_delegate.c                  |   149 +
 src/vnet/fib/fib_entry_delegate.h                  |   124 +
 src/vnet/fib/fib_entry_src.c                       |  1456 ++
 src/vnet/fib/fib_entry_src.h                       |   296 +
 src/vnet/fib/fib_entry_src_adj.c                   |   207 +
 src/vnet/fib/fib_entry_src_api.c                   |   119 +
 src/vnet/fib/fib_entry_src_default.c               |   121 +
 src/vnet/fib/fib_entry_src_default_route.c         |    58 +
 src/vnet/fib/fib_entry_src_interface.c             |   195 +
 src/vnet/fib/fib_entry_src_lisp.c                  |   133 +
 src/vnet/fib/fib_entry_src_mpls.c                  |   196 +
 src/vnet/fib/fib_entry_src_rr.c                    |   293 +
 src/vnet/fib/fib_entry_src_special.c               |    71 +
 src/vnet/fib/fib_internal.h                        |    69 +
 src/vnet/fib/fib_node.c                            |   277 +
 src/vnet/fib/fib_node.h                            |   371 +
 src/vnet/fib/fib_node_list.c                       |   390 +
 src/vnet/fib/fib_node_list.h                       |    64 +
 src/vnet/fib/fib_path.c                            |  2001 +++
 src/vnet/fib/fib_path.h                            |   158 +
 src/vnet/fib/fib_path_ext.c                        |   231 +
 src/vnet/fib/fib_path_ext.h                        |    69 +
 src/vnet/fib/fib_path_list.c                       |  1223 ++
 src/vnet/fib/fib_path_list.h                       |   158 +
 src/vnet/fib/fib_table.c                           |  1104 ++
 src/vnet/fib/fib_table.h                           |   732 +
 src/vnet/fib/fib_test.c                            |  7112 ++++++++
 src/vnet/fib/fib_types.c                           |   326 +
 src/vnet/fib/fib_types.h                           |   340 +
 src/vnet/fib/fib_urpf_list.c                       |   260 +
 src/vnet/fib/fib_urpf_list.h                       |   146 +
 src/vnet/fib/fib_walk.c                            |  1108 ++
 src/vnet/fib/fib_walk.h                            |    58 +
 src/vnet/fib/ip4_fib.c                             |   664 +
 src/vnet/fib/ip4_fib.h                             |   141 +
 src/vnet/fib/ip6_fib.c                             |   784 +
 src/vnet/fib/ip6_fib.h                             |   130 +
 src/vnet/fib/mpls_fib.c                            |   439 +
 src/vnet/fib/mpls_fib.h                            |   106 +
 src/vnet/flow/flow_report.c                        |   502 +
 src/vnet/flow/flow_report.h                        |   145 +
 src/vnet/flow/flow_report_classify.c               |   529 +
 src/vnet/flow/flow_report_classify.h               |   122 +
 src/vnet/flow/ipfix_info_elements.h                |   429 +
 src/vnet/flow/ipfix_packet.h                       |   188 +
 src/vnet/global_funcs.h                            |    32 +
 src/vnet/gre/error.def                             |    23 +
 src/vnet/gre/gre.api                               |    57 +
 src/vnet/gre/gre.c                                 |   455 +
 src/vnet/gre/gre.h                                 |   235 +
 src/vnet/gre/gre_api.c                             |   204 +
 src/vnet/gre/interface.c                           |   606 +
 src/vnet/gre/node.c                                |   531 +
 src/vnet/gre/packet.h                              |    55 +
 src/vnet/gre/pg.c                                  |    77 +
 src/vnet/handoff.c                                 |   594 +
 src/vnet/handoff.h                                 |   259 +
 src/vnet/hdlc/error.def                            |    42 +
 src/vnet/hdlc/hdlc.c                               |   249 +
 src/vnet/hdlc/hdlc.h                               |   127 +
 src/vnet/hdlc/node.c                               |   351 +
 src/vnet/hdlc/packet.h                             |    72 +
 src/vnet/hdlc/pg.c                                 |   105 +
 src/vnet/interface.api                             |   339 +
 src/vnet/interface.c                               |  1398 ++
 src/vnet/interface.h                               |   658 +
 src/vnet/interface_api.c                           |   725 +
 src/vnet/interface_cli.c                           |  1165 ++
 src/vnet/interface_format.c                        |   401 +
 src/vnet/interface_funcs.h                         |   318 +
 src/vnet/interface_output.c                        |  1404 ++
 src/vnet/ip/dir.dox                                |    26 +
 src/vnet/ip/format.c                               |   121 +
 src/vnet/ip/format.h                               |   114 +
 src/vnet/ip/icmp4.c                                |   784 +
 src/vnet/ip/icmp4.h                                |    60 +
 src/vnet/ip/icmp46_packet.h                        |   398 +
 src/vnet/ip/icmp6.c                                |   882 +
 src/vnet/ip/icmp6.h                                |    86 +
 src/vnet/ip/igmp_packet.h                          |   155 +
 src/vnet/ip/ip.api                                 |   434 +
 src/vnet/ip/ip.h                                   |   195 +
 src/vnet/ip/ip4.h                                  |   322 +
 src/vnet/ip/ip46_cli.c                             |   236 +
 src/vnet/ip/ip4_error.h                            |    95 +
 src/vnet/ip/ip4_format.c                           |   256 +
 src/vnet/ip/ip4_forward.c                          |  3345 ++++
 src/vnet/ip/ip4_input.c                            |   507 +
 src/vnet/ip/ip4_mtrie.c                            |   568 +
 src/vnet/ip/ip4_mtrie.h                            |   188 +
 src/vnet/ip/ip4_packet.h                           |   384 +
 src/vnet/ip/ip4_pg.c                               |   387 +
 src/vnet/ip/ip4_source_and_port_range_check.c      |  1415 ++
 src/vnet/ip/ip4_source_check.c                     |   573 +
 src/vnet/ip/ip4_test.c                             |   340 +
 src/vnet/ip/ip6.h                                  |   476 +
 src/vnet/ip/ip6_error.h                            |    92 +
 src/vnet/ip/ip6_format.c                           |   383 +
 src/vnet/ip/ip6_forward.c                          |  3402 ++++
 src/vnet/ip/ip6_hop_by_hop.c                       |  1194 ++
 src/vnet/ip/ip6_hop_by_hop.h                       |   217 +
 src/vnet/ip/ip6_hop_by_hop_packet.h                |    66 +
 src/vnet/ip/ip6_input.c                            |   353 +
 src/vnet/ip/ip6_neighbor.c                         |  4088 +++++
 src/vnet/ip/ip6_neighbor.h                         |    52 +
 src/vnet/ip/ip6_packet.h                           |   499 +
 src/vnet/ip/ip6_pg.c                               |   231 +
 src/vnet/ip/ip_api.c                               |  1196 ++
 src/vnet/ip/ip_checksum.c                          |   228 +
 src/vnet/ip/ip_frag.c                              |   581 +
 src/vnet/ip/ip_frag.h                              |    96 +
 src/vnet/ip/ip_init.c                              |   152 +
 src/vnet/ip/ip_input_acl.c                         |   450 +
 src/vnet/ip/ip_packet.h                            |   180 +
 src/vnet/ip/ip_source_and_port_range_check.h       |   148 +
 src/vnet/ip/lookup.c                               |   967 +
 src/vnet/ip/lookup.h                               |   498 +
 src/vnet/ip/ping.c                                 |   888 +
 src/vnet/ip/ping.h                                 |   108 +
 src/vnet/ip/ports.def                              |   757 +
 src/vnet/ip/protocols.def                          |   162 +
 src/vnet/ip/punt.c                                 |   323 +
 src/vnet/ip/punt.h                                 |    43 +
 src/vnet/ip/punt_error.def                         |    19 +
 src/vnet/ip/tcp_packet.h                           |   138 +
 src/vnet/ip/udp.h                                  |   313 +
 src/vnet/ip/udp_error.def                          |    21 +
 src/vnet/ip/udp_format.c                           |    91 +
 src/vnet/ip/udp_init.c                             |    71 +
 src/vnet/ip/udp_local.c                            |   645 +
 src/vnet/ip/udp_packet.h                           |    65 +
 src/vnet/ip/udp_pg.c                               |   237 +
 src/vnet/ipsec-gre/dir.dox                         |    18 +
 src/vnet/ipsec-gre/error.def                       |    26 +
 src/vnet/ipsec-gre/interface.c                     |   311 +
 src/vnet/ipsec-gre/ipsec_gre.api                   |    79 +
 src/vnet/ipsec-gre/ipsec_gre.c                     |   407 +
 src/vnet/ipsec-gre/ipsec_gre.h                     |   114 +
 src/vnet/ipsec-gre/ipsec_gre_api.c                 |   190 +
 src/vnet/ipsec-gre/ipsec_gre_doc.md                |    74 +
 src/vnet/ipsec-gre/node.c                          |   433 +
 src/vnet/ipsec/esp.h                               |   320 +
 src/vnet/ipsec/esp_decrypt.c                       |   430 +
 src/vnet/ipsec/esp_encrypt.c                       |   425 +
 src/vnet/ipsec/ikev2.c                             |  2186 +++
 src/vnet/ipsec/ikev2.h                             |   410 +
 src/vnet/ipsec/ikev2_cli.c                         |   479 +
 src/vnet/ipsec/ikev2_crypto.c                      |   765 +
 src/vnet/ipsec/ikev2_format.c                      |   155 +
 src/vnet/ipsec/ikev2_payload.c                     |   535 +
 src/vnet/ipsec/ikev2_priv.h                        |   321 +
 src/vnet/ipsec/ipsec.api                           |   457 +
 src/vnet/ipsec/ipsec.c                             |   581 +
 src/vnet/ipsec/ipsec.h                             |   344 +
 src/vnet/ipsec/ipsec_api.c                         |   537 +
 src/vnet/ipsec/ipsec_cli.c                         |   807 +
 src/vnet/ipsec/ipsec_format.c                      |   141 +
 src/vnet/ipsec/ipsec_if.c                          |   372 +
 src/vnet/ipsec/ipsec_if_in.c                       |   175 +
 src/vnet/ipsec/ipsec_if_out.c                      |   161 +
 src/vnet/ipsec/ipsec_input.c                       |   455 +
 src/vnet/ipsec/ipsec_output.c                      |   478 +
 src/vnet/l2/dir.dox                                |    24 +
 src/vnet/l2/feat_bitmap.c                          |   185 +
 src/vnet/l2/feat_bitmap.h                          |    96 +
 src/vnet/l2/l2.api                                 |    38 +
 src/vnet/l2/l2_api.c                               |   140 +
 src/vnet/l2/l2_bd.c                                |  1079 ++
 src/vnet/l2/l2_bd.h                                |   150 +
 src/vnet/l2/l2_bvi.c                               |    40 +
 src/vnet/l2/l2_bvi.h                               |   117 +
 src/vnet/l2/l2_classify.h                          |   116 +
 src/vnet/l2/l2_efp_filter.c                        |   614 +
 src/vnet/l2/l2_efp_filter.h                        |    33 +
 src/vnet/l2/l2_fib.c                               |   857 +
 src/vnet/l2/l2_fib.h                               |   341 +
 src/vnet/l2/l2_flood.c                             |   568 +
 src/vnet/l2/l2_flood.h                             |    35 +
 src/vnet/l2/l2_fwd.c                               |   544 +
 src/vnet/l2/l2_fwd.h                               |    36 +
 src/vnet/l2/l2_input.c                             |  1116 ++
 src/vnet/l2/l2_input.h                             |   266 +
 src/vnet/l2/l2_input_acl.c                         |   434 +
 src/vnet/l2/l2_input_classify.c                    |   655 +
 src/vnet/l2/l2_input_vtr.c                         |   401 +
 src/vnet/l2/l2_input_vtr.h                         |    54 +
 src/vnet/l2/l2_learn.c                             |   597 +
 src/vnet/l2/l2_learn.h                             |    64 +
 src/vnet/l2/l2_output.c                            |   708 +
 src/vnet/l2/l2_output.h                            |   285 +
 src/vnet/l2/l2_output_acl.c                        |   358 +
 src/vnet/l2/l2_output_classify.c                   |   657 +
 src/vnet/l2/l2_patch.c                             |   452 +
 src/vnet/l2/l2_rw.c                                |   719 +
 src/vnet/l2/l2_rw.h                                |    95 +
 src/vnet/l2/l2_vtr.c                               |   770 +
 src/vnet/l2/l2_vtr.h                               |   270 +
 src/vnet/l2/l2_xcrw.c                              |   591 +
 src/vnet/l2/l2_xcrw.h                              |    91 +
 src/vnet/l2tp/decap.c                              |   309 +
 src/vnet/l2tp/encap.c                              |   238 +
 src/vnet/l2tp/l2tp.api                             |   126 +
 src/vnet/l2tp/l2tp.c                               |   739 +
 src/vnet/l2tp/l2tp.h                               |   147 +
 src/vnet/l2tp/l2tp_api.c                           |   267 +
 src/vnet/l2tp/packet.h                             |    44 +
 src/vnet/l2tp/pg.c                                 |   106 +
 src/vnet/l3_types.h                                |    59 +
 src/vnet/lawful-intercept/lawful_intercept.c       |   112 +
 src/vnet/lawful-intercept/lawful_intercept.h       |    45 +
 src/vnet/lawful-intercept/node.c                   |   275 +
 src/vnet/lisp-cp/control.c                         |  4950 +++++
 src/vnet/lisp-cp/control.h                         |   314 +
 src/vnet/lisp-cp/gid_dictionary.c                  |   865 +
 src/vnet/lisp-cp/gid_dictionary.h                  |   120 +
 src/vnet/lisp-cp/lisp.api                          |   835 +
 src/vnet/lisp-cp/lisp_api.c                        |  1257 ++
 src/vnet/lisp-cp/lisp_cp_dpo.c                     |   117 +
 src/vnet/lisp-cp/lisp_cp_dpo.h                     |    45 +
 src/vnet/lisp-cp/lisp_cp_messages.h                |   613 +
 src/vnet/lisp-cp/lisp_msg_serdes.c                 |   372 +
 src/vnet/lisp-cp/lisp_msg_serdes.h                 |    58 +
 src/vnet/lisp-cp/lisp_types.c                      |  1574 ++
 src/vnet/lisp-cp/lisp_types.h                      |   354 +
 src/vnet/lisp-cp/packets.c                         |   269 +
 src/vnet/lisp-cp/packets.h                         |    82 +
 src/vnet/lisp-gpe/decap.c                          |   501 +
 src/vnet/lisp-gpe/dir.dox                          |    26 +
 src/vnet/lisp-gpe/interface.c                      |   709 +
 src/vnet/lisp-gpe/lisp_gpe.api                     |   143 +
 src/vnet/lisp-gpe/lisp_gpe.c                       |   327 +
 src/vnet/lisp-gpe/lisp_gpe.h                       |   257 +
 src/vnet/lisp-gpe/lisp_gpe_adjacency.c             |   542 +
 src/vnet/lisp-gpe/lisp_gpe_adjacency.h             |   136 +
 src/vnet/lisp-gpe/lisp_gpe_api.c                   |   304 +
 src/vnet/lisp-gpe/lisp_gpe_error.def               |    18 +
 src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c             |  1053 ++
 src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h             |   188 +
 src/vnet/lisp-gpe/lisp_gpe_packet.h                |   149 +
 src/vnet/lisp-gpe/lisp_gpe_sub_interface.c         |   278 +
 src/vnet/lisp-gpe/lisp_gpe_sub_interface.h         |   157 +
 src/vnet/lisp-gpe/lisp_gpe_tenant.c                |   330 +
 src/vnet/lisp-gpe/lisp_gpe_tenant.h                |    88 +
 src/vnet/lisp-gpe/lisp_gpe_tunnel.c                |   289 +
 src/vnet/lisp-gpe/lisp_gpe_tunnel.h                |    89 +
 src/vnet/lisp-gpe/rfc.txt                          |   826 +
 src/vnet/llc/llc.c                                 |   241 +
 src/vnet/llc/llc.h                                 |   194 +
 src/vnet/llc/node.c                                |   331 +
 src/vnet/llc/pg.c                                  |   113 +
 src/vnet/lldp/dir.dox                              |    18 +
 src/vnet/lldp/lldp_cli.c                           |   646 +
 src/vnet/lldp/lldp_doc.md                          |    84 +
 src/vnet/lldp/lldp_input.c                         |   302 +
 src/vnet/lldp/lldp_node.c                          |   341 +
 src/vnet/lldp/lldp_node.h                          |   145 +
 src/vnet/lldp/lldp_output.c                        |   216 +
 src/vnet/lldp/lldp_protocol.h                      |   142 +
 src/vnet/map/examples/gen-rules.py                 |   186 +
 src/vnet/map/examples/health_check.c               |   109 +
 src/vnet/map/examples/test_map.py                  |   141 +
 src/vnet/map/gen-rules.py                          |   107 +
 src/vnet/map/ip4_map.c                             |   813 +
 src/vnet/map/ip4_map_t.c                           |  1363 ++
 src/vnet/map/ip6_map.c                             |  1269 ++
 src/vnet/map/ip6_map_t.c                           |  1517 ++
 src/vnet/map/map.api                               |   178 +
 src/vnet/map/map.c                                 |  2166 +++
 src/vnet/map/map.h                                 |   591 +
 src/vnet/map/map_api.c                             |   295 +
 src/vnet/map/map_doc.md                            |    69 +
 src/vnet/map/map_dpo.c                             |   191 +
 src/vnet/map/map_dpo.h                             |    67 +
 src/vnet/map/test.c                                |   205 +
 src/vnet/mcast/mcast.c                             |   565 +
 src/vnet/mcast/mcast.h                             |    50 +
 src/vnet/mcast/mcast_test.c                        |   149 +
 src/vnet/misc.c                                    |   124 +
 src/vnet/mpls/error.def                            |    31 +
 src/vnet/mpls/interface.c                          |   121 +
 src/vnet/mpls/mpls.c                               |   511 +
 src/vnet/mpls/mpls.h                               |   172 +
 src/vnet/mpls/mpls_features.c                      |   156 +
 src/vnet/mpls/mpls_lookup.c                        |   531 +
 src/vnet/mpls/mpls_output.c                        |   479 +
 src/vnet/mpls/mpls_tunnel.c                        |   787 +
 src/vnet/mpls/mpls_tunnel.h                        |    98 +
 src/vnet/mpls/mpls_types.h                         |    39 +
 src/vnet/mpls/node.c                               |   303 +
 src/vnet/mpls/packet.h                             |   125 +
 src/vnet/mpls/pg.c                                 |    71 +
 src/vnet/osi/node.c                                |   326 +
 src/vnet/osi/osi.c                                 |   201 +
 src/vnet/osi/osi.h                                 |   171 +
 src/vnet/osi/pg.c                                  |   106 +
 src/vnet/pg/cli.c                                  |   636 +
 src/vnet/pg/edit.c                                 |   186 +
 src/vnet/pg/edit.h                                 |   210 +
 src/vnet/pg/example.script                         |     6 +
 src/vnet/pg/init.c                                 |    72 +
 src/vnet/pg/input.c                                |  1667 ++
 src/vnet/pg/output.c                               |    85 +
 src/vnet/pg/pg.h                                   |   383 +
 src/vnet/pg/stream.c                               |   497 +
 src/vnet/pipeline.h                                |   456 +
 src/vnet/plugin/p1.c                               |    52 +
 src/vnet/plugin/plugin.h                           |    32 +
 src/vnet/policer/node_funcs.c                      |   938 +
 src/vnet/policer/police.h                          |   214 +
 src/vnet/policer/policer.c                         |   528 +
 src/vnet/policer/policer.h                         |   107 +
 src/vnet/policer/xlate.c                           |  1505 ++
 src/vnet/policer/xlate.h                           |   186 +
 src/vnet/ppp/error.def                             |    42 +
 src/vnet/ppp/node.c                                |   368 +
 src/vnet/ppp/packet.h                              |   199 +
 src/vnet/ppp/pg.c                                  |   114 +
 src/vnet/ppp/ppp.c                                 |   261 +
 src/vnet/ppp/ppp.h                                 |   135 +
 src/vnet/replication.c                             |   293 +
 src/vnet/replication.h                             |   136 +
 src/vnet/rewrite.c                                 |   329 +
 src/vnet/rewrite.h                                 |   305 +
 src/vnet/snap/node.c                               |   353 +
 src/vnet/snap/pg.c                                 |   116 +
 src/vnet/snap/snap.c                               |   204 +
 src/vnet/snap/snap.h                               |   209 +
 src/vnet/span/node.c                               |   286 +
 src/vnet/span/span.api                             |    60 +
 src/vnet/span/span.c                               |   197 +
 src/vnet/span/span.h                               |    62 +
 src/vnet/span/span.md                              |    65 +
 src/vnet/span/span_api.c                           |   153 +
 src/vnet/sr/dir.dox                                |    25 +
 src/vnet/sr/examples/sr_multicastmap.script        |     4 +
 src/vnet/sr/rfc_draft_05.txt                       |  1265 ++
 src/vnet/sr/sr.c                                   |  3333 ++++
 src/vnet/sr/sr.h                                   |   262 +
 src/vnet/sr/sr_error.def                           |    20 +
 src/vnet/sr/sr_fix_dst_error.def                   |    17 +
 src/vnet/sr/sr_packet.h                            |   251 +
 src/vnet/sr/sr_replicate.c                         |   490 +
 src/vnet/srp/format.c                              |   147 +
 src/vnet/srp/interface.c                           |   458 +
 src/vnet/srp/node.c                                |   932 +
 src/vnet/srp/packet.h                              |   204 +
 src/vnet/srp/pg.c                                  |   157 +
 src/vnet/srp/srp.h                                 |   222 +
 src/vnet/unix/gdb_funcs.c                          |   171 +
 src/vnet/unix/pcap.c                               |   241 +
 src/vnet/unix/pcap.h                               |   230 +
 src/vnet/unix/pcap2pg.c                            |   182 +
 src/vnet/unix/tap.api                              |   123 +
 src/vnet/unix/tap_api.c                            |   257 +
 src/vnet/unix/tapcli.c                             |  1328 ++
 src/vnet/unix/tapcli.h                             |    52 +
 src/vnet/unix/tuntap.c                             |  1000 ++
 src/vnet/unix/tuntap.h                             |    36 +
 src/vnet/vnet.h                                    |    96 +
 src/vnet/vnet_all_api_h.h                          |    57 +
 src/vnet/vnet_msg_enum.h                           |    37 +
 src/vnet/vxlan-gpe/decap.c                         |   733 +
 src/vnet/vxlan-gpe/dir.dox                         |    32 +
 src/vnet/vxlan-gpe/encap.c                         |   388 +
 src/vnet/vxlan-gpe/vxlan-gpe-rfc.txt               |   868 +
 src/vnet/vxlan-gpe/vxlan_gpe.api                   |    61 +
 src/vnet/vxlan-gpe/vxlan_gpe.c                     |   659 +
 src/vnet/vxlan-gpe/vxlan_gpe.h                     |   221 +
 src/vnet/vxlan-gpe/vxlan_gpe_api.c                 |   249 +
 src/vnet/vxlan-gpe/vxlan_gpe_error.def             |    16 +
 src/vnet/vxlan-gpe/vxlan_gpe_packet.h              |   110 +
 src/vnet/vxlan/decap.c                             |  1130 ++
 src/vnet/vxlan/dir.dox                             |    24 +
 src/vnet/vxlan/encap.c                             |   553 +
 src/vnet/vxlan/vxlan.api                           |    81 +
 src/vnet/vxlan/vxlan.c                             |   899 +
 src/vnet/vxlan/vxlan.h                             |   199 +
 src/vnet/vxlan/vxlan_api.c                         |   253 +
 src/vnet/vxlan/vxlan_error.def                     |    17 +
 src/vnet/vxlan/vxlan_packet.h                      |    69 +
 src/vpp-api-test.am                                |    64 +
 src/vpp-api/python/Makefile.am                     |    60 +
 src/vpp-api/python/README.rst                      |     0
 src/vpp-api/python/pneum/pneum.c                   |   259 +
 src/vpp-api/python/pneum/pneum.h                   |    31 +
 src/vpp-api/python/pneum/test_pneum.c              |   143 +
 src/vpp-api/python/setup.cfg                       |     5 +
 src/vpp-api/python/setup.py                        |    34 +
 src/vpp-api/python/tests/test_cli.py               |    52 +
 src/vpp-api/python/tests/test_modules.py           |    18 +
 src/vpp-api/python/tests/test_papi.py              |   119 +
 src/vpp-api/python/tests/test_version.py           |    35 +
 src/vpp-api/python/tests/test_vpp_papi2.py         |   487 +
 src/vpp-api/python/vpp_papi/__init__.py            |     3 +
 src/vpp-api/python/vpp_papi/pneum_wrap.c           |   200 +
 src/vpp-api/python/vpp_papi/vpp_papi.py            |   450 +
 src/vpp.am                                         |   159 +
 src/vpp/api/api.c                                  |  4922 +++++
 src/vpp/api/api_format.c                           |     1 +
 src/vpp/api/api_main.c                             |   192 +
 src/vpp/api/custom_dump.c                          |  3139 ++++
 src/vpp/api/gmon.c                                 |   319 +
 src/vpp/api/json_format.c                          |   304 +
 src/vpp/api/json_format.h                          |   254 +
 src/vpp/api/summary_stats_client.c                 |   302 +
 src/vpp/api/test_client.c                          |  1531 ++
 src/vpp/api/test_ha.c                              |   249 +
 src/vpp/api/vat.h                                  |     1 +
 src/vpp/api/vpe.api                                |  2782 +++
 src/vpp/api/vpe_all_api_h.h                        |    37 +
 src/vpp/api/vpe_msg_enum.h                         |    37 +
 src/vpp/api/vpp_get_metrics.c                      |   253 +
 src/vpp/app/l2t.c                                  |   557 +
 src/vpp/app/l2t_l2.c                               |   267 +
 src/vpp/app/sticky_hash.c                          |   581 +
 src/vpp/app/version.c                              |   102 +
 src/vpp/app/vpe_cli.c                              |   123 +
 src/vpp/conf/80-vpp.conf                           |    15 +
 src/vpp/conf/startup.conf                          |    99 +
 src/vpp/conf/startup.uiopcigeneric.conf            |    18 +
 src/vpp/oam/oam.c                                  |   648 +
 src/vpp/oam/oam.h                                  |    96 +
 src/vpp/stats/stats.c                              |   987 +
 src/vpp/stats/stats.h                              |    76 +
 src/vpp/vnet/main.c                                |   415 +
 src/vppapigen.am                                   |    27 +
 src/vppinfra.am                                    |   276 +
 src/vppinfra/README                                |    43 +
 src/vppinfra/anneal.c                              |   172 +
 src/vppinfra/anneal.h                              |    89 +
 src/vppinfra/asm_mips.h                            |   351 +
 src/vppinfra/asm_x86.c                             |  1947 ++
 src/vppinfra/asm_x86.h                             |   125 +
 src/vppinfra/backtrace.c                           |   267 +
 src/vppinfra/bihash_24_8.h                         |    85 +
 src/vppinfra/bihash_8_8.h                          |    98 +
 src/vppinfra/bihash_doc.h                          |   149 +
 src/vppinfra/bihash_template.c                     |   455 +
 src/vppinfra/bihash_template.h                     |   214 +
 src/vppinfra/bitmap.h                              |   774 +
 src/vppinfra/bitops.h                              |   179 +
 src/vppinfra/byte_order.h                          |   202 +
 src/vppinfra/cache.h                               |   104 +
 src/vppinfra/clib.h                                |   359 +
 src/vppinfra/cpu.c                                 |   133 +
 src/vppinfra/cpu.h                                 |   112 +
 src/vppinfra/dir.dox                               |    19 +
 src/vppinfra/dlist.h                               |   156 +
 src/vppinfra/elf.c                                 |  2040 +++
 src/vppinfra/elf.h                                 |  1062 ++
 src/vppinfra/elf_clib.c                            |   377 +
 src/vppinfra/elf_clib.h                            |   144 +
 src/vppinfra/elog.c                                |  1061 ++
 src/vppinfra/elog.h                                |   460 +
 src/vppinfra/error.c                               |   292 +
 src/vppinfra/error.h                               |   201 +
 src/vppinfra/error_bootstrap.h                     |   106 +
 src/vppinfra/fheap.c                               |   473 +
 src/vppinfra/fheap.h                               |   140 +
 src/vppinfra/fifo.c                                |   137 +
 src/vppinfra/fifo.h                                |   304 +
 src/vppinfra/format.c                              |   814 +
 src/vppinfra/format.h                              |   331 +
 src/vppinfra/graph.c                               |   182 +
 src/vppinfra/graph.h                               |   127 +
 src/vppinfra/hash.c                                |  1095 ++
 src/vppinfra/hash.h                                |   699 +
 src/vppinfra/heap.c                                |   828 +
 src/vppinfra/heap.h                                |   357 +
 src/vppinfra/longjmp.S                             |   690 +
 src/vppinfra/longjmp.h                             |   124 +
 src/vppinfra/macros.c                              |   266 +
 src/vppinfra/macros.h                              |    54 +
 src/vppinfra/math.h                                |    63 +
 src/vppinfra/md5.c                                 |   317 +
 src/vppinfra/md5.h                                 |    57 +
 src/vppinfra/mem.h                                 |   291 +
 src/vppinfra/mem_mheap.c                           |   165 +
 src/vppinfra/memcheck.h                            |   317 +
 src/vppinfra/memcpy_avx.h                          |   293 +
 src/vppinfra/memcpy_sse3.h                         |   355 +
 src/vppinfra/mhash.c                               |   408 +
 src/vppinfra/mhash.h                               |   179 +
 src/vppinfra/mheap.c                               |  1649 ++
 src/vppinfra/mheap.h                               |    94 +
 src/vppinfra/mheap_bootstrap.h                     |   374 +
 src/vppinfra/mod_test_hash.c                       |    27 +
 src/vppinfra/os.h                                  |    72 +
 src/vppinfra/pfhash.c                              |   689 +
 src/vppinfra/pfhash.h                              |   276 +
 src/vppinfra/phash.c                               |  1017 ++
 src/vppinfra/phash.h                               |   194 +
 src/vppinfra/pipeline.h                            |   176 +
 src/vppinfra/pool.h                                |   405 +
 src/vppinfra/ptclosure.c                           |   125 +
 src/vppinfra/ptclosure.h                           |    40 +
 src/vppinfra/qhash.c                               |   858 +
 src/vppinfra/qhash.h                               |   169 +
 src/vppinfra/qsort.c                               |   269 +
 src/vppinfra/random.c                              |    51 +
 src/vppinfra/random.h                              |   178 +
 src/vppinfra/random_buffer.c                       |    86 +
 src/vppinfra/random_buffer.h                       |   118 +
 src/vppinfra/random_isaac.c                        |   434 +
 src/vppinfra/random_isaac.h                        |    81 +
 src/vppinfra/serialize.c                           |  1254 ++
 src/vppinfra/serialize.h                           |   443 +
 src/vppinfra/slist.c                               |   336 +
 src/vppinfra/slist.h                               |   145 +
 src/vppinfra/smp.c                                 |   325 +
 src/vppinfra/smp.h                                 |    81 +
 src/vppinfra/smp_fifo.c                            |    91 +
 src/vppinfra/smp_fifo.h                            |   313 +
 src/vppinfra/socket.c                              |   422 +
 src/vppinfra/socket.h                              |   160 +
 src/vppinfra/sparse_vec.h                          |   244 +
 src/vppinfra/std-formats.c                         |   330 +
 src/vppinfra/string.c                              |    94 +
 src/vppinfra/string.h                              |    83 +
 src/vppinfra/test_bihash_template.c                |   297 +
 src/vppinfra/test_dlist.c                          |   193 +
 src/vppinfra/test_elf.c                            |   217 +
 src/vppinfra/test_elog.c                           |   262 +
 src/vppinfra/test_fifo.c                           |   144 +
 src/vppinfra/test_format.c                         |   199 +
 src/vppinfra/test_hash.c                           |   458 +
 src/vppinfra/test_heap.c                           |   198 +
 src/vppinfra/test_longjmp.c                        |   129 +
 src/vppinfra/test_macros.c                         |    64 +
 src/vppinfra/test_md5.c                            |   141 +
 src/vppinfra/test_mheap.c                          |   242 +
 src/vppinfra/test_pfhash.c                         |   322 +
 src/vppinfra/test_phash.c                          |   149 +
 src/vppinfra/test_pool.c                           |    86 +
 src/vppinfra/test_pool_iterate.c                   |    59 +
 src/vppinfra/test_ptclosure.c                      |   212 +
 src/vppinfra/test_qhash.c                          |   333 +
 src/vppinfra/test_random.c                         |   148 +
 src/vppinfra/test_random_isaac.c                   |   142 +
 src/vppinfra/test_serialize.c                      |   274 +
 src/vppinfra/test_slist.c                          |   228 +
 src/vppinfra/test_socket.c                         |   134 +
 src/vppinfra/test_time.c                           |   104 +
 src/vppinfra/test_timing_wheel.c                   |   389 +
 src/vppinfra/test_vec.c                            |  1159 ++
 src/vppinfra/test_vec.h                            |   243 +
 src/vppinfra/test_vhash.c                          |   757 +
 src/vppinfra/test_zvec.c                           |   117 +
 src/vppinfra/time.c                                |   226 +
 src/vppinfra/time.h                                |   298 +
 src/vppinfra/timer.c                               |   322 +
 src/vppinfra/timer.h                               |    46 +
 src/vppinfra/timing_wheel.c                        |   750 +
 src/vppinfra/timing_wheel.h                        |   155 +
 src/vppinfra/types.h                               |   174 +
 src/vppinfra/unformat.c                            |  1077 ++
 src/vppinfra/unix-formats.c                        |   918 +
 src/vppinfra/unix-kelog.c                          |   415 +
 src/vppinfra/unix-misc.c                           |   242 +
 src/vppinfra/unix.h                                |    64 +
 src/vppinfra/unix_error.def                        |   145 +
 src/vppinfra/valgrind.h                            |  4030 +++++
 src/vppinfra/vec.c                                 |   171 +
 src/vppinfra/vec.h                                 |   973 +
 src/vppinfra/vec_bootstrap.h                       |   201 +
 src/vppinfra/vector.c                              |    54 +
 src/vppinfra/vector.h                              |   268 +
 src/vppinfra/vector_altivec.h                      |   178 +
 src/vppinfra/vector_funcs.h                        |   334 +
 src/vppinfra/vector_iwmmxt.h                       |   149 +
 src/vppinfra/vector_neon.h                         |    71 +
 src/vppinfra/vector_sse2.h                         |   711 +
 src/vppinfra/vhash.c                               |   772 +
 src/vppinfra/vhash.h                               |   850 +
 src/vppinfra/vm_linux_kernel.h                     |    78 +
 src/vppinfra/vm_standalone.h                       |    74 +
 src/vppinfra/vm_unix.h                             |   106 +
 src/vppinfra/xxhash.h                              |    86 +
 src/vppinfra/xy.h                                  |    56 +
 src/vppinfra/zvec.c                                |   442 +
 src/vppinfra/zvec.h                                |   166 +
 svm/Makefile.am                                    |    30 -
 svm/configure.ac                                   |     7 -
 svm/dir.dox                                        |    21 -
 svm/persist.c                                      |   258 -
 svm/ssvm.c                                         |   178 -
 svm/ssvm.h                                         |   155 -
 svm/svm.c                                          |  1237 --
 svm/svm.h                                          |   207 -
 svm/svm_test.c                                     |    79 -
 svm/svmdb.c                                        |   671 -
 svm/svmdb.h                                        |   135 -
 svm/svmdbtool.c                                    |   537 -
 svm/svmtool.c                                      |   528 -
 vlib-api/Makefile.am                               |    84 -
 vlib-api/configure.ac                              |     9 -
 vlib-api/suffix-rules.mk                           |     1 -
 vlib-api/vlibapi/api.h                             |   281 -
 vlib-api/vlibapi/api_helper_macros.h               |   243 -
 vlib-api/vlibapi/api_shared.c                      |  1375 --
 vlib-api/vlibapi/node_serialize.c                  |   399 -
 vlib-api/vlibmemory/api.h                          |   163 -
 vlib-api/vlibmemory/memclnt.api                    |    91 -
 vlib-api/vlibmemory/memory_client.c                |   283 -
 vlib-api/vlibmemory/memory_shared.c                |   852 -
 vlib-api/vlibmemory/memory_vlib.c                  |  1346 --
 vlib-api/vlibmemory/unix_shared_memory_queue.c     |   324 -
 vlib-api/vlibmemory/unix_shared_memory_queue.h     |    69 -
 vlib-api/vlibmemory/vl_memory_api_h.h              |    32 -
 vlib-api/vlibmemory/vl_memory_msg_enum.h           |    42 -
 vlib-api/vlibsocket/api.h                          |    87 -
 vlib-api/vlibsocket/sock_test.c                    |   155 -
 vlib-api/vlibsocket/sockclnt.api                   |    50 -
 vlib-api/vlibsocket/sockclnt_vlib.c                |   209 -
 vlib-api/vlibsocket/socksvr_vlib.c                 |   706 -
 vlib-api/vlibsocket/vl_socket_api_h.h              |    33 -
 vlib-api/vlibsocket/vl_socket_msg_enum.h           |    42 -
 vlib/.gitignore                                    |     1 -
 vlib/Makefile.am                                   |   104 -
 vlib/configure.ac                                  |    25 -
 vlib/dir.dox                                       |    21 -
 vlib/example/dir.dox                               |    22 -
 vlib/example/main_stub.c                           |   418 -
 vlib/example/mc_test.c                             |   384 -
 vlib/example/plex_test.c                           |   527 -
 vlib/vlib/buffer.c                                 |  1987 ---
 vlib/vlib/buffer.h                                 |   417 -
 vlib/vlib/buffer_funcs.h                           |   755 -
 vlib/vlib/buffer_node.h                            |   337 -
 vlib/vlib/cli.c                                    |  1173 --
 vlib/vlib/cli.h                                    |   192 -
 vlib/vlib/cli_funcs.h                              |    58 -
 vlib/vlib/counter.c                                |   151 -
 vlib/vlib/counter.h                                |   379 -
 vlib/vlib/defs.h                                   |    82 -
 vlib/vlib/dir.dox                                  |    23 -
 vlib/vlib/elog_samples.c                           |   122 -
 vlib/vlib/error.c                                  |   338 -
 vlib/vlib/error.h                                  |   101 -
 vlib/vlib/error_funcs.h                            |    88 -
 vlib/vlib/format.c                                 |   196 -
 vlib/vlib/format_funcs.h                           |    75 -
 vlib/vlib/global_funcs.h                           |    45 -
 vlib/vlib/i2c.c                                    |   231 -
 vlib/vlib/i2c.h                                    |    67 -
 vlib/vlib/init.c                                   |   168 -
 vlib/vlib/init.h                                   |   238 -
 vlib/vlib/lex.c                                    |   271 -
 vlib/vlib/lex.h                                    |   145 -
 vlib/vlib/main.c                                   |  1703 --
 vlib/vlib/main.h                                   |   333 -
 vlib/vlib/mc.c                                     |  2609 ---
 vlib/vlib/mc.h                                     |   687 -
 vlib/vlib/node.c                                   |   631 -
 vlib/vlib/node.h                                   |   725 -
 vlib/vlib/node_cli.c                               |   466 -
 vlib/vlib/node_format.c                            |   187 -
 vlib/vlib/node_funcs.h                             |  1130 --
 vlib/vlib/parse.c                                  |  1007 --
 vlib/vlib/parse.h                                  |   221 -
 vlib/vlib/parse_builtin.c                          |   150 -
 vlib/vlib/pci/linux_pci.c                          |   642 -
 vlib/vlib/pci/pci.c                                |   264 -
 vlib/vlib/pci/pci.h                                |   251 -
 vlib/vlib/pci/pci_config.h                         |   731 -
 vlib/vlib/physmem.h                                |   108 -
 vlib/vlib/threads.c                                |  1492 --
 vlib/vlib/threads.h                                |   470 -
 vlib/vlib/threads_cli.c                            |   579 -
 vlib/vlib/trace.c                                  |   545 -
 vlib/vlib/trace.h                                  |   100 -
 vlib/vlib/trace_funcs.h                            |   185 -
 vlib/vlib/unix/cj.c                                |   271 -
 vlib/vlib/unix/cj.h                                |    79 -
 vlib/vlib/unix/cli.c                               |  2989 ----
 vlib/vlib/unix/dir.dox                             |    28 -
 vlib/vlib/unix/input.c                             |   265 -
 vlib/vlib/unix/main.c                              |   557 -
 vlib/vlib/unix/mc_socket.c                         |  1049 --
 vlib/vlib/unix/mc_socket.h                         |   137 -
 vlib/vlib/unix/physmem.c                           |   470 -
 vlib/vlib/unix/physmem.h                           |    65 -
 vlib/vlib/unix/plugin.c                            |   260 -
 vlib/vlib/unix/plugin.h                            |    98 -
 vlib/vlib/unix/unix.h                              |   232 -
 vlib/vlib/unix/util.c                              |   231 -
 vlib/vlib/vlib.h                                   |    86 -
 vlib/vlib/vlib_process_doc.h                       |   147 -
 vnet/.gitignore                                    |     1 -
 vnet/Makefile.am                                   |   993 --
 vnet/configure.ac                                  |    49 -
 vnet/etc/scripts/arp4                              |    21 -
 vnet/etc/scripts/arp4-mpls                         |    24 -
 vnet/etc/scripts/arp6                              |    21 -
 vnet/etc/scripts/bvi                               |    76 -
 vnet/etc/scripts/dhcp/dhcpd.conf                   |     8 -
 vnet/etc/scripts/dhcp/left-ping-target.sh          |     4 -
 vnet/etc/scripts/dhcp/leftpeer.conf                |    17 -
 vnet/etc/scripts/icmp                              |    16 -
 vnet/etc/scripts/icmp6                             |    16 -
 vnet/etc/scripts/ige                               |    19 -
 vnet/etc/scripts/ip6                               |    15 -
 vnet/etc/scripts/ip6-hbh                           |    84 -
 vnet/etc/scripts/ixge                              |    15 -
 vnet/etc/scripts/l2efpfilter                       |    83 -
 vnet/etc/scripts/l2efpfilter_perf                  |    58 -
 vnet/etc/scripts/l2fib                             |    46 -
 vnet/etc/scripts/l2fib_perf                        |    29 -
 vnet/etc/scripts/l2fib_xc                          |    31 -
 vnet/etc/scripts/l2flood                           |    42 -
 vnet/etc/scripts/l2tp                              |   134 -
 vnet/etc/scripts/leftpeer/leftpeer-classify        |     8 -
 vnet/etc/scripts/leftpeer/leftpeer-classify6       |     5 -
 vnet/etc/scripts/leftpeer/leftpeer-classifyl2      |     8 -
 vnet/etc/scripts/leftpeer/leftpeer-dhcp            |    23 -
 vnet/etc/scripts/leftpeer/leftpeer-ioam.conf       |    15 -
 vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf    |    12 -
 vnet/etc/scripts/leftpeer/leftpeer-lisp.conf       |    18 -
 vnet/etc/scripts/leftpeer/leftpeer-mpls.conf       |    17 -
 vnet/etc/scripts/leftpeer/leftpeer-sr.conf         |    24 -
 vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf      |    17 -
 vnet/etc/scripts/leftpeer/leftpeer.script          |     9 -
 vnet/etc/scripts/lfib/ip4-to-mpls                  |    26 -
 vnet/etc/scripts/lfib/mpls-pop-to-mpls             |    28 -
 vnet/etc/scripts/lfib/mpls-to-ip4                  |    27 -
 vnet/etc/scripts/lfib/mpls-to-mpls                 |    26 -
 vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf     |    17 -
 vnet/etc/scripts/mpls-o-ethernet/pg                |    10 -
 vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf    |    15 -
 vnet/etc/scripts/mpls-o-ethernet/single.conf       |    17 -
 vnet/etc/scripts/mpls-o-gre/dhcpd.conf             |   116 -
 vnet/etc/scripts/mpls-o-gre/leftpeer.conf          |    14 -
 vnet/etc/scripts/mpls-o-gre/rightpeer.conf         |    14 -
 vnet/etc/scripts/mpls-tunnel                       |    87 -
 vnet/etc/scripts/pcap                              |    18 -
 vnet/etc/scripts/probe4                            |    11 -
 vnet/etc/scripts/probe6                            |     7 -
 vnet/etc/scripts/rewrite                           |    62 -
 vnet/etc/scripts/rightpeer/rightpeer-ioam.conf     |    14 -
 vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf  |     9 -
 vnet/etc/scripts/rightpeer/rightpeer-lisp.conf     |    16 -
 vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf  |    24 -
 vnet/etc/scripts/rightpeer/rightpeer-mpls.conf     |    17 -
 vnet/etc/scripts/rightpeer/rightpeer-sr.conf       |    28 -
 vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf    |    16 -
 vnet/etc/scripts/rightpeer/rightpeer.script        |     9 -
 vnet/etc/scripts/rpf                               |    18 -
 vnet/etc/scripts/rtt-test                          |    31 -
 vnet/etc/scripts/snat                              |    34 -
 vnet/etc/scripts/snat_static                       |    44 -
 vnet/etc/scripts/snat_static_with_port             |    44 -
 vnet/etc/scripts/source_and_port_range_check       |    63 -
 vnet/etc/scripts/speed                             |    14 -
 vnet/etc/scripts/sr/left-linux-ping.sh             |     3 -
 vnet/etc/scripts/sr/leftpeer.conf                  |    27 -
 vnet/etc/scripts/sr/right-linux-ping.sh            |     4 -
 vnet/etc/scripts/sr/rightpeer.conf                 |    22 -
 vnet/etc/scripts/sr/srlocal.sh                     |     4 -
 vnet/etc/scripts/srp                               |    27 -
 vnet/etc/scripts/tcp                               |    16 -
 vnet/etc/scripts/tcp-test                          |     6 -
 vnet/etc/scripts/tf-ucs-1                          |    16 -
 vnet/etc/scripts/urpf                              |    86 -
 vnet/etc/scripts/virl/ip6sr.virl                   |   874 -
 vnet/etc/scripts/virl/ip6sr_notes.txt              |    38 -
 vnet/etc/scripts/virl/mplsogre.virl                |   319 -
 vnet/etc/scripts/virl/simple.virl                  |   389 -
 vnet/etc/scripts/vlan                              |    23 -
 vnet/suffix-rules.mk                               |     1 -
 vnet/test/README                                   |    10 -
 vnet/test/lisp-cp/test_cp_serdes.c                 |   635 -
 vnet/test/lisp-cp/test_lisp_types.c                |   561 -
 vnet/test/lisp-gpe/test.c                          |    18 -
 vnet/vnet/adj/adj.c                                |   454 -
 vnet/vnet/adj/adj.h                                |   122 -
 vnet/vnet/adj/adj_glean.c                          |   285 -
 vnet/vnet/adj/adj_glean.h                          |    61 -
 vnet/vnet/adj/adj_internal.h                       |   104 -
 vnet/vnet/adj/adj_l2.c                             |   194 -
 vnet/vnet/adj/adj_l2.h                             |    24 -
 vnet/vnet/adj/adj_midchain.c                       |   559 -
 vnet/vnet/adj/adj_midchain.h                       |   102 -
 vnet/vnet/adj/adj_nbr.c                            |  1087 --
 vnet/vnet/adj/adj_nbr.h                            |   176 -
 vnet/vnet/adj/adj_rewrite.c                        |    53 -
 vnet/vnet/adj/adj_rewrite.h                        |    49 -
 vnet/vnet/adj/adj_types.h                          |    53 -
 vnet/vnet/api_errno.h                              |   113 -
 vnet/vnet/bfd/bfd.api                              |   205 -
 vnet/vnet/bfd/bfd_api.c                            |   262 -
 vnet/vnet/bfd/bfd_api.h                            |    46 -
 vnet/vnet/bfd/bfd_debug.h                          |    79 -
 vnet/vnet/bfd/bfd_doc.md                           |     1 -
 vnet/vnet/bfd/bfd_main.c                           |   969 -
 vnet/vnet/bfd/bfd_main.h                           |   220 -
 vnet/vnet/bfd/bfd_protocol.c                       |    74 -
 vnet/vnet/bfd/bfd_protocol.h                       |   154 -
 vnet/vnet/bfd/bfd_udp.c                            |   639 -
 vnet/vnet/bfd/bfd_udp.h                            |    56 -
 vnet/vnet/bfd/dir.dox                              |    18 -
 vnet/vnet/buffer.h                                 |   381 -
 vnet/vnet/cdp/cdp.pg                               |     7 -
 vnet/vnet/cdp/cdp_input.c                          |   506 -
 vnet/vnet/cdp/cdp_node.c                           |   208 -
 vnet/vnet/cdp/cdp_node.h                           |   147 -
 vnet/vnet/cdp/cdp_periodic.c                       |   512 -
 vnet/vnet/cdp/cdp_protocol.h                       |   186 -
 vnet/vnet/classify/README                          |   180 -
 vnet/vnet/classify/flow_classify.c                 |   212 -
 vnet/vnet/classify/flow_classify.h                 |    51 -
 vnet/vnet/classify/flow_classify_node.c            |   338 -
 vnet/vnet/classify/input_acl.c                     |   283 -
 vnet/vnet/classify/input_acl.h                     |    54 -
 vnet/vnet/classify/ip_classify.c                   |   365 -
 vnet/vnet/classify/policer_classify.c              |   227 -
 vnet/vnet/classify/policer_classify.h              |    55 -
 vnet/vnet/classify/vnet_classify.c                 |  2436 ---
 vnet/vnet/classify/vnet_classify.h                 |   523 -
 vnet/vnet/config.c                                 |   361 -
 vnet/vnet/config.h                                 |   176 -
 vnet/vnet/cop/cop.c                                |   387 -
 vnet/vnet/cop/cop.h                                |    89 -
 vnet/vnet/cop/ip4_whitelist.c                      |   356 -
 vnet/vnet/cop/ip6_whitelist.c                      |   298 -
 vnet/vnet/cop/node1.c                              |   319 -
 vnet/vnet/devices/af_packet/af_packet.api          |    71 -
 vnet/vnet/devices/af_packet/af_packet.c            |   366 -
 vnet/vnet/devices/af_packet/af_packet.h            |    69 -
 vnet/vnet/devices/af_packet/af_packet_api.c        |   143 -
 vnet/vnet/devices/af_packet/cli.c                  |   144 -
 vnet/vnet/devices/af_packet/device.c               |   250 -
 vnet/vnet/devices/af_packet/node.c                 |   288 -
 vnet/vnet/devices/devices.c                        |    91 -
 vnet/vnet/devices/devices.h                        |    53 -
 vnet/vnet/devices/dpdk/cli.c                       |  1296 --
 vnet/vnet/devices/dpdk/device.c                    |   840 -
 vnet/vnet/devices/dpdk/dpdk.h                      |   534 -
 vnet/vnet/devices/dpdk/dpdk_priv.h                 |   132 -
 vnet/vnet/devices/dpdk/format.c                    |   763 -
 vnet/vnet/devices/dpdk/hqos.c                      |   775 -
 vnet/vnet/devices/dpdk/init.c                      |  1803 --
 vnet/vnet/devices/dpdk/ipsec/cli.c                 |   141 -
 vnet/vnet/devices/dpdk/ipsec/crypto_node.c         |   210 -
 vnet/vnet/devices/dpdk/ipsec/dir.dox               |    18 -
 .../devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md    |    73 -
 vnet/vnet/devices/dpdk/ipsec/esp.h                 |   295 -
 vnet/vnet/devices/dpdk/ipsec/esp_decrypt.c         |   583 -
 vnet/vnet/devices/dpdk/ipsec/esp_encrypt.c         |   598 -
 vnet/vnet/devices/dpdk/ipsec/ipsec.c               |   313 -
 vnet/vnet/devices/dpdk/ipsec/ipsec.h               |   227 -
 vnet/vnet/devices/dpdk/node.c                      |   687 -
 vnet/vnet/devices/dpdk/qos_doc.md                  |   404 -
 vnet/vnet/devices/netmap/cli.c                     |   146 -
 vnet/vnet/devices/netmap/device.c                  |   261 -
 vnet/vnet/devices/netmap/net_netmap.h              |   650 -
 vnet/vnet/devices/netmap/netmap.api                |    74 -
 vnet/vnet/devices/netmap/netmap.c                  |   316 -
 vnet/vnet/devices/netmap/netmap.h                  |   164 -
 vnet/vnet/devices/netmap/netmap_api.c              |   137 -
 vnet/vnet/devices/netmap/node.c                    |   300 -
 vnet/vnet/devices/nic/ixge.c                       |  2938 ---
 vnet/vnet/devices/nic/ixge.h                       |  1293 --
 vnet/vnet/devices/nic/sfp.c                        |   117 -
 vnet/vnet/devices/nic/sfp.h                        |   117 -
 vnet/vnet/devices/ssvm/node.c                      |   343 -
 vnet/vnet/devices/ssvm/ssvm_eth.c                  |   491 -
 vnet/vnet/devices/ssvm/ssvm_eth.h                  |   141 -
 vnet/vnet/devices/virtio/dir.dox                   |    27 -
 vnet/vnet/devices/virtio/vhost-user.c              |  3314 ----
 vnet/vnet/devices/virtio/vhost-user.h              |   350 -
 vnet/vnet/devices/virtio/vhost_user.api            |   125 -
 vnet/vnet/devices/virtio/vhost_user_api.c          |   262 -
 vnet/vnet/dhcp/client.c                            |  1031 --
 vnet/vnet/dhcp/client.h                            |   118 -
 vnet/vnet/dhcp/packet.h                            |    61 -
 vnet/vnet/dhcp/proxy.h                             |    92 -
 vnet/vnet/dhcp/proxy_error.def                     |    30 -
 vnet/vnet/dhcp/proxy_node.c                        |  1114 --
 vnet/vnet/dhcpv6/packet.h                          |   183 -
 vnet/vnet/dhcpv6/proxy.h                           |    95 -
 vnet/vnet/dhcpv6/proxy_error.def                   |    29 -
 vnet/vnet/dhcpv6/proxy_node.c                      |  1191 --
 vnet/vnet/dpo/classify_dpo.c                       |   131 -
 vnet/vnet/dpo/classify_dpo.h                       |    56 -
 vnet/vnet/dpo/dpo.c                                |   500 -
 vnet/vnet/dpo/dpo.h                                |   381 -
 vnet/vnet/dpo/drop_dpo.c                           |   106 -
 vnet/vnet/dpo/drop_dpo.h                           |    31 -
 vnet/vnet/dpo/ip_null_dpo.c                        |   408 -
 vnet/vnet/dpo/ip_null_dpo.h                        |    56 -
 vnet/vnet/dpo/load_balance.c                       |   993 --
 vnet/vnet/dpo/load_balance.h                       |   211 -
 vnet/vnet/dpo/load_balance_map.c                   |   575 -
 vnet/vnet/dpo/load_balance_map.h                   |    79 -
 vnet/vnet/dpo/lookup_dpo.c                         |  1185 --
 vnet/vnet/dpo/lookup_dpo.h                         |   108 -
 vnet/vnet/dpo/mpls_label_dpo.c                     |   570 -
 vnet/vnet/dpo/mpls_label_dpo.h                     |   101 -
 vnet/vnet/dpo/punt_dpo.c                           |   100 -
 vnet/vnet/dpo/punt_dpo.h                           |    30 -
 vnet/vnet/dpo/receive_dpo.c                        |   165 -
 vnet/vnet/dpo/receive_dpo.h                        |    62 -
 vnet/vnet/ethernet/arp.c                           |  2355 ---
 vnet/vnet/ethernet/arp_packet.h                    |   173 -
 vnet/vnet/ethernet/dir.dox                         |    24 -
 vnet/vnet/ethernet/error.def                       |    46 -
 vnet/vnet/ethernet/ethernet.h                      |   561 -
 vnet/vnet/ethernet/format.c                        |   366 -
 vnet/vnet/ethernet/init.c                          |   128 -
 vnet/vnet/ethernet/interface.c                     |   730 -
 vnet/vnet/ethernet/mac_swap.c                      |   397 -
 vnet/vnet/ethernet/node.c                          |  1368 --
 vnet/vnet/ethernet/packet.h                        |   152 -
 vnet/vnet/ethernet/pg.c                            |   183 -
 vnet/vnet/ethernet/types.def                       |   113 -
 vnet/vnet/feature/feature.c                        |   463 -
 vnet/vnet/feature/feature.h                        |   382 -
 vnet/vnet/feature/registration.c                   |   301 -
 vnet/vnet/fib/fib.c                                |    41 -
 vnet/vnet/fib/fib.h                                |   652 -
 vnet/vnet/fib/fib_api.h                            |    54 -
 vnet/vnet/fib/fib_attached_export.c                |   572 -
 vnet/vnet/fib/fib_attached_export.h                |    57 -
 vnet/vnet/fib/fib_entry.c                          |  1503 --
 vnet/vnet/fib/fib_entry.h                          |   530 -
 vnet/vnet/fib/fib_entry_cover.c                    |   225 -
 vnet/vnet/fib/fib_entry_cover.h                    |    47 -
 vnet/vnet/fib/fib_entry_delegate.c                 |   149 -
 vnet/vnet/fib/fib_entry_delegate.h                 |   124 -
 vnet/vnet/fib/fib_entry_src.c                      |  1456 --
 vnet/vnet/fib/fib_entry_src.h                      |   296 -
 vnet/vnet/fib/fib_entry_src_adj.c                  |   207 -
 vnet/vnet/fib/fib_entry_src_api.c                  |   119 -
 vnet/vnet/fib/fib_entry_src_default.c              |   121 -
 vnet/vnet/fib/fib_entry_src_default_route.c        |    58 -
 vnet/vnet/fib/fib_entry_src_interface.c            |   195 -
 vnet/vnet/fib/fib_entry_src_lisp.c                 |   133 -
 vnet/vnet/fib/fib_entry_src_mpls.c                 |   196 -
 vnet/vnet/fib/fib_entry_src_rr.c                   |   293 -
 vnet/vnet/fib/fib_entry_src_special.c              |    71 -
 vnet/vnet/fib/fib_internal.h                       |    69 -
 vnet/vnet/fib/fib_node.c                           |   277 -
 vnet/vnet/fib/fib_node.h                           |   371 -
 vnet/vnet/fib/fib_node_list.c                      |   390 -
 vnet/vnet/fib/fib_node_list.h                      |    64 -
 vnet/vnet/fib/fib_path.c                           |  2001 ---
 vnet/vnet/fib/fib_path.h                           |   158 -
 vnet/vnet/fib/fib_path_ext.c                       |   231 -
 vnet/vnet/fib/fib_path_ext.h                       |    69 -
 vnet/vnet/fib/fib_path_list.c                      |  1223 --
 vnet/vnet/fib/fib_path_list.h                      |   158 -
 vnet/vnet/fib/fib_table.c                          |  1104 --
 vnet/vnet/fib/fib_table.h                          |   732 -
 vnet/vnet/fib/fib_test.c                           |  7112 --------
 vnet/vnet/fib/fib_types.c                          |   326 -
 vnet/vnet/fib/fib_types.h                          |   340 -
 vnet/vnet/fib/fib_urpf_list.c                      |   260 -
 vnet/vnet/fib/fib_urpf_list.h                      |   146 -
 vnet/vnet/fib/fib_walk.c                           |  1108 --
 vnet/vnet/fib/fib_walk.h                           |    58 -
 vnet/vnet/fib/ip4_fib.c                            |   664 -
 vnet/vnet/fib/ip4_fib.h                            |   141 -
 vnet/vnet/fib/ip6_fib.c                            |   784 -
 vnet/vnet/fib/ip6_fib.h                            |   130 -
 vnet/vnet/fib/mpls_fib.c                           |   439 -
 vnet/vnet/fib/mpls_fib.h                           |   106 -
 vnet/vnet/flow/flow_report.c                       |   502 -
 vnet/vnet/flow/flow_report.h                       |   145 -
 vnet/vnet/flow/flow_report_classify.c              |   529 -
 vnet/vnet/flow/flow_report_classify.h              |   122 -
 vnet/vnet/flow/ipfix_info_elements.h               |   429 -
 vnet/vnet/flow/ipfix_packet.h                      |   188 -
 vnet/vnet/global_funcs.h                           |    32 -
 vnet/vnet/gre/error.def                            |    23 -
 vnet/vnet/gre/gre.api                              |    57 -
 vnet/vnet/gre/gre.c                                |   455 -
 vnet/vnet/gre/gre.h                                |   235 -
 vnet/vnet/gre/gre_api.c                            |   204 -
 vnet/vnet/gre/interface.c                          |   606 -
 vnet/vnet/gre/node.c                               |   531 -
 vnet/vnet/gre/packet.h                             |    55 -
 vnet/vnet/gre/pg.c                                 |    77 -
 vnet/vnet/handoff.c                                |   594 -
 vnet/vnet/handoff.h                                |   259 -
 vnet/vnet/hdlc/error.def                           |    42 -
 vnet/vnet/hdlc/hdlc.c                              |   249 -
 vnet/vnet/hdlc/hdlc.h                              |   127 -
 vnet/vnet/hdlc/node.c                              |   351 -
 vnet/vnet/hdlc/packet.h                            |    72 -
 vnet/vnet/hdlc/pg.c                                |   105 -
 vnet/vnet/interface.api                            |   339 -
 vnet/vnet/interface.c                              |  1398 --
 vnet/vnet/interface.h                              |   658 -
 vnet/vnet/interface_api.c                          |   725 -
 vnet/vnet/interface_cli.c                          |  1165 --
 vnet/vnet/interface_format.c                       |   401 -
 vnet/vnet/interface_funcs.h                        |   318 -
 vnet/vnet/interface_output.c                       |  1404 --
 vnet/vnet/ip/dir.dox                               |    26 -
 vnet/vnet/ip/format.c                              |   121 -
 vnet/vnet/ip/format.h                              |   114 -
 vnet/vnet/ip/icmp4.c                               |   784 -
 vnet/vnet/ip/icmp4.h                               |    60 -
 vnet/vnet/ip/icmp46_packet.h                       |   398 -
 vnet/vnet/ip/icmp6.c                               |   882 -
 vnet/vnet/ip/icmp6.h                               |    86 -
 vnet/vnet/ip/igmp_packet.h                         |   155 -
 vnet/vnet/ip/ip.api                                |   434 -
 vnet/vnet/ip/ip.h                                  |   195 -
 vnet/vnet/ip/ip4.h                                 |   322 -
 vnet/vnet/ip/ip46_cli.c                            |   236 -
 vnet/vnet/ip/ip4_error.h                           |    95 -
 vnet/vnet/ip/ip4_format.c                          |   256 -
 vnet/vnet/ip/ip4_forward.c                         |  3345 ----
 vnet/vnet/ip/ip4_input.c                           |   507 -
 vnet/vnet/ip/ip4_mtrie.c                           |   568 -
 vnet/vnet/ip/ip4_mtrie.h                           |   188 -
 vnet/vnet/ip/ip4_packet.h                          |   384 -
 vnet/vnet/ip/ip4_pg.c                              |   387 -
 vnet/vnet/ip/ip4_source_and_port_range_check.c     |  1415 --
 vnet/vnet/ip/ip4_source_check.c                    |   573 -
 vnet/vnet/ip/ip4_test.c                            |   340 -
 vnet/vnet/ip/ip6.h                                 |   476 -
 vnet/vnet/ip/ip6_error.h                           |    92 -
 vnet/vnet/ip/ip6_format.c                          |   383 -
 vnet/vnet/ip/ip6_forward.c                         |  3402 ----
 vnet/vnet/ip/ip6_hop_by_hop.c                      |  1194 --
 vnet/vnet/ip/ip6_hop_by_hop.h                      |   217 -
 vnet/vnet/ip/ip6_hop_by_hop_packet.h               |    66 -
 vnet/vnet/ip/ip6_input.c                           |   353 -
 vnet/vnet/ip/ip6_neighbor.c                        |  4088 -----
 vnet/vnet/ip/ip6_neighbor.h                        |    52 -
 vnet/vnet/ip/ip6_packet.h                          |   499 -
 vnet/vnet/ip/ip6_pg.c                              |   231 -
 vnet/vnet/ip/ip_api.c                              |  1196 --
 vnet/vnet/ip/ip_checksum.c                         |   228 -
 vnet/vnet/ip/ip_frag.c                             |   581 -
 vnet/vnet/ip/ip_frag.h                             |    96 -
 vnet/vnet/ip/ip_init.c                             |   152 -
 vnet/vnet/ip/ip_input_acl.c                        |   450 -
 vnet/vnet/ip/ip_packet.h                           |   180 -
 vnet/vnet/ip/ip_source_and_port_range_check.h      |   148 -
 vnet/vnet/ip/lookup.c                              |   967 -
 vnet/vnet/ip/lookup.h                              |   498 -
 vnet/vnet/ip/ping.c                                |   888 -
 vnet/vnet/ip/ping.h                                |   108 -
 vnet/vnet/ip/ports.def                             |   757 -
 vnet/vnet/ip/protocols.def                         |   162 -
 vnet/vnet/ip/punt.c                                |   323 -
 vnet/vnet/ip/punt.h                                |    43 -
 vnet/vnet/ip/punt_error.def                        |    19 -
 vnet/vnet/ip/tcp_packet.h                          |   138 -
 vnet/vnet/ip/udp.h                                 |   313 -
 vnet/vnet/ip/udp_error.def                         |    21 -
 vnet/vnet/ip/udp_format.c                          |    91 -
 vnet/vnet/ip/udp_init.c                            |    71 -
 vnet/vnet/ip/udp_local.c                           |   645 -
 vnet/vnet/ip/udp_packet.h                          |    65 -
 vnet/vnet/ip/udp_pg.c                              |   237 -
 vnet/vnet/ipsec-gre/dir.dox                        |    18 -
 vnet/vnet/ipsec-gre/error.def                      |    26 -
 vnet/vnet/ipsec-gre/interface.c                    |   311 -
 vnet/vnet/ipsec-gre/ipsec_gre.api                  |    79 -
 vnet/vnet/ipsec-gre/ipsec_gre.c                    |   407 -
 vnet/vnet/ipsec-gre/ipsec_gre.h                    |   114 -
 vnet/vnet/ipsec-gre/ipsec_gre_api.c                |   190 -
 vnet/vnet/ipsec-gre/ipsec_gre_doc.md               |    74 -
 vnet/vnet/ipsec-gre/node.c                         |   433 -
 vnet/vnet/ipsec/esp.h                              |   320 -
 vnet/vnet/ipsec/esp_decrypt.c                      |   430 -
 vnet/vnet/ipsec/esp_encrypt.c                      |   425 -
 vnet/vnet/ipsec/ikev2.c                            |  2186 ---
 vnet/vnet/ipsec/ikev2.h                            |   410 -
 vnet/vnet/ipsec/ikev2_cli.c                        |   479 -
 vnet/vnet/ipsec/ikev2_crypto.c                     |   765 -
 vnet/vnet/ipsec/ikev2_format.c                     |   155 -
 vnet/vnet/ipsec/ikev2_payload.c                    |   535 -
 vnet/vnet/ipsec/ikev2_priv.h                       |   321 -
 vnet/vnet/ipsec/ipsec.api                          |   457 -
 vnet/vnet/ipsec/ipsec.c                            |   581 -
 vnet/vnet/ipsec/ipsec.h                            |   344 -
 vnet/vnet/ipsec/ipsec_api.c                        |   537 -
 vnet/vnet/ipsec/ipsec_cli.c                        |   807 -
 vnet/vnet/ipsec/ipsec_format.c                     |   141 -
 vnet/vnet/ipsec/ipsec_if.c                         |   372 -
 vnet/vnet/ipsec/ipsec_if_in.c                      |   175 -
 vnet/vnet/ipsec/ipsec_if_out.c                     |   161 -
 vnet/vnet/ipsec/ipsec_input.c                      |   455 -
 vnet/vnet/ipsec/ipsec_output.c                     |   478 -
 vnet/vnet/l2/dir.dox                               |    24 -
 vnet/vnet/l2/feat_bitmap.c                         |   185 -
 vnet/vnet/l2/feat_bitmap.h                         |    96 -
 vnet/vnet/l2/l2.api                                |    38 -
 vnet/vnet/l2/l2_api.c                              |   140 -
 vnet/vnet/l2/l2_bd.c                               |  1079 --
 vnet/vnet/l2/l2_bd.h                               |   150 -
 vnet/vnet/l2/l2_bvi.c                              |    40 -
 vnet/vnet/l2/l2_bvi.h                              |   117 -
 vnet/vnet/l2/l2_classify.h                         |   116 -
 vnet/vnet/l2/l2_efp_filter.c                       |   614 -
 vnet/vnet/l2/l2_efp_filter.h                       |    33 -
 vnet/vnet/l2/l2_fib.c                              |   857 -
 vnet/vnet/l2/l2_fib.h                              |   341 -
 vnet/vnet/l2/l2_flood.c                            |   568 -
 vnet/vnet/l2/l2_flood.h                            |    35 -
 vnet/vnet/l2/l2_fwd.c                              |   544 -
 vnet/vnet/l2/l2_fwd.h                              |    36 -
 vnet/vnet/l2/l2_input.c                            |  1116 --
 vnet/vnet/l2/l2_input.h                            |   266 -
 vnet/vnet/l2/l2_input_acl.c                        |   434 -
 vnet/vnet/l2/l2_input_classify.c                   |   655 -
 vnet/vnet/l2/l2_input_vtr.c                        |   401 -
 vnet/vnet/l2/l2_input_vtr.h                        |    54 -
 vnet/vnet/l2/l2_learn.c                            |   597 -
 vnet/vnet/l2/l2_learn.h                            |    64 -
 vnet/vnet/l2/l2_output.c                           |   708 -
 vnet/vnet/l2/l2_output.h                           |   285 -
 vnet/vnet/l2/l2_output_acl.c                       |   358 -
 vnet/vnet/l2/l2_output_classify.c                  |   657 -
 vnet/vnet/l2/l2_patch.c                            |   452 -
 vnet/vnet/l2/l2_rw.c                               |   719 -
 vnet/vnet/l2/l2_rw.h                               |    95 -
 vnet/vnet/l2/l2_vtr.c                              |   770 -
 vnet/vnet/l2/l2_vtr.h                              |   270 -
 vnet/vnet/l2/l2_xcrw.c                             |   591 -
 vnet/vnet/l2/l2_xcrw.h                             |    91 -
 vnet/vnet/l2tp/decap.c                             |   309 -
 vnet/vnet/l2tp/encap.c                             |   238 -
 vnet/vnet/l2tp/l2tp.api                            |   126 -
 vnet/vnet/l2tp/l2tp.c                              |   739 -
 vnet/vnet/l2tp/l2tp.h                              |   147 -
 vnet/vnet/l2tp/l2tp_api.c                          |   267 -
 vnet/vnet/l2tp/packet.h                            |    44 -
 vnet/vnet/l2tp/pg.c                                |   106 -
 vnet/vnet/l3_types.h                               |    59 -
 vnet/vnet/lawful-intercept/lawful_intercept.c      |   112 -
 vnet/vnet/lawful-intercept/lawful_intercept.h      |    45 -
 vnet/vnet/lawful-intercept/node.c                  |   275 -
 vnet/vnet/lisp-cp/control.c                        |  4950 -----
 vnet/vnet/lisp-cp/control.h                        |   314 -
 vnet/vnet/lisp-cp/gid_dictionary.c                 |   865 -
 vnet/vnet/lisp-cp/gid_dictionary.h                 |   120 -
 vnet/vnet/lisp-cp/lisp.api                         |   835 -
 vnet/vnet/lisp-cp/lisp_api.c                       |  1257 --
 vnet/vnet/lisp-cp/lisp_cp_dpo.c                    |   117 -
 vnet/vnet/lisp-cp/lisp_cp_dpo.h                    |    45 -
 vnet/vnet/lisp-cp/lisp_cp_messages.h               |   613 -
 vnet/vnet/lisp-cp/lisp_msg_serdes.c                |   372 -
 vnet/vnet/lisp-cp/lisp_msg_serdes.h                |    58 -
 vnet/vnet/lisp-cp/lisp_types.c                     |  1574 --
 vnet/vnet/lisp-cp/lisp_types.h                     |   354 -
 vnet/vnet/lisp-cp/packets.c                        |   269 -
 vnet/vnet/lisp-cp/packets.h                        |    82 -
 vnet/vnet/lisp-gpe/decap.c                         |   501 -
 vnet/vnet/lisp-gpe/dir.dox                         |    26 -
 vnet/vnet/lisp-gpe/interface.c                     |   709 -
 vnet/vnet/lisp-gpe/lisp_gpe.api                    |   143 -
 vnet/vnet/lisp-gpe/lisp_gpe.c                      |   327 -
 vnet/vnet/lisp-gpe/lisp_gpe.h                      |   257 -
 vnet/vnet/lisp-gpe/lisp_gpe_adjacency.c            |   542 -
 vnet/vnet/lisp-gpe/lisp_gpe_adjacency.h            |   136 -
 vnet/vnet/lisp-gpe/lisp_gpe_api.c                  |   304 -
 vnet/vnet/lisp-gpe/lisp_gpe_error.def              |    18 -
 vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.c            |  1053 --
 vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.h            |   188 -
 vnet/vnet/lisp-gpe/lisp_gpe_packet.h               |   149 -
 vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.c        |   278 -
 vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.h        |   157 -
 vnet/vnet/lisp-gpe/lisp_gpe_tenant.c               |   330 -
 vnet/vnet/lisp-gpe/lisp_gpe_tenant.h               |    88 -
 vnet/vnet/lisp-gpe/lisp_gpe_tunnel.c               |   289 -
 vnet/vnet/lisp-gpe/lisp_gpe_tunnel.h               |    89 -
 vnet/vnet/lisp-gpe/rfc.txt                         |   826 -
 vnet/vnet/llc/llc.c                                |   241 -
 vnet/vnet/llc/llc.h                                |   194 -
 vnet/vnet/llc/node.c                               |   331 -
 vnet/vnet/llc/pg.c                                 |   113 -
 vnet/vnet/lldp/dir.dox                             |    18 -
 vnet/vnet/lldp/lldp_cli.c                          |   646 -
 vnet/vnet/lldp/lldp_doc.md                         |    84 -
 vnet/vnet/lldp/lldp_input.c                        |   302 -
 vnet/vnet/lldp/lldp_node.c                         |   341 -
 vnet/vnet/lldp/lldp_node.h                         |   145 -
 vnet/vnet/lldp/lldp_output.c                       |   216 -
 vnet/vnet/lldp/lldp_protocol.h                     |   142 -
 vnet/vnet/map/examples/gen-rules.py                |   186 -
 vnet/vnet/map/examples/health_check.c              |   109 -
 vnet/vnet/map/examples/test_map.py                 |   141 -
 vnet/vnet/map/gen-rules.py                         |   107 -
 vnet/vnet/map/ip4_map.c                            |   813 -
 vnet/vnet/map/ip4_map_t.c                          |  1363 --
 vnet/vnet/map/ip6_map.c                            |  1269 --
 vnet/vnet/map/ip6_map_t.c                          |  1517 --
 vnet/vnet/map/map.api                              |   178 -
 vnet/vnet/map/map.c                                |  2166 ---
 vnet/vnet/map/map.h                                |   591 -
 vnet/vnet/map/map_api.c                            |   295 -
 vnet/vnet/map/map_doc.md                           |    69 -
 vnet/vnet/map/map_dpo.c                            |   191 -
 vnet/vnet/map/map_dpo.h                            |    67 -
 vnet/vnet/map/test.c                               |   205 -
 vnet/vnet/mcast/mcast.c                            |   565 -
 vnet/vnet/mcast/mcast.h                            |    50 -
 vnet/vnet/mcast/mcast_test.c                       |   149 -
 vnet/vnet/misc.c                                   |   124 -
 vnet/vnet/mpls/error.def                           |    31 -
 vnet/vnet/mpls/interface.c                         |   121 -
 vnet/vnet/mpls/mpls.c                              |   511 -
 vnet/vnet/mpls/mpls.h                              |   172 -
 vnet/vnet/mpls/mpls_features.c                     |   156 -
 vnet/vnet/mpls/mpls_lookup.c                       |   531 -
 vnet/vnet/mpls/mpls_output.c                       |   479 -
 vnet/vnet/mpls/mpls_tunnel.c                       |   787 -
 vnet/vnet/mpls/mpls_tunnel.h                       |    98 -
 vnet/vnet/mpls/mpls_types.h                        |    39 -
 vnet/vnet/mpls/node.c                              |   303 -
 vnet/vnet/mpls/packet.h                            |   125 -
 vnet/vnet/mpls/pg.c                                |    71 -
 vnet/vnet/osi/node.c                               |   326 -
 vnet/vnet/osi/osi.c                                |   201 -
 vnet/vnet/osi/osi.h                                |   171 -
 vnet/vnet/osi/pg.c                                 |   106 -
 vnet/vnet/pg/cli.c                                 |   636 -
 vnet/vnet/pg/edit.c                                |   186 -
 vnet/vnet/pg/edit.h                                |   210 -
 vnet/vnet/pg/example.script                        |     6 -
 vnet/vnet/pg/init.c                                |    72 -
 vnet/vnet/pg/input.c                               |  1667 --
 vnet/vnet/pg/output.c                              |    85 -
 vnet/vnet/pg/pg.h                                  |   383 -
 vnet/vnet/pg/stream.c                              |   497 -
 vnet/vnet/pipeline.h                               |   456 -
 vnet/vnet/plugin/p1.c                              |    52 -
 vnet/vnet/plugin/plugin.h                          |    32 -
 vnet/vnet/policer/node_funcs.c                     |   938 -
 vnet/vnet/policer/police.h                         |   214 -
 vnet/vnet/policer/policer.c                        |   528 -
 vnet/vnet/policer/policer.h                        |   107 -
 vnet/vnet/policer/xlate.c                          |  1505 --
 vnet/vnet/policer/xlate.h                          |   186 -
 vnet/vnet/ppp/error.def                            |    42 -
 vnet/vnet/ppp/node.c                               |   368 -
 vnet/vnet/ppp/packet.h                             |   199 -
 vnet/vnet/ppp/pg.c                                 |   114 -
 vnet/vnet/ppp/ppp.c                                |   261 -
 vnet/vnet/ppp/ppp.h                                |   135 -
 vnet/vnet/replication.c                            |   293 -
 vnet/vnet/replication.h                            |   136 -
 vnet/vnet/rewrite.c                                |   329 -
 vnet/vnet/rewrite.h                                |   305 -
 vnet/vnet/snap/node.c                              |   353 -
 vnet/vnet/snap/pg.c                                |   116 -
 vnet/vnet/snap/snap.c                              |   204 -
 vnet/vnet/snap/snap.h                              |   209 -
 vnet/vnet/span/node.c                              |   286 -
 vnet/vnet/span/span.api                            |    60 -
 vnet/vnet/span/span.c                              |   197 -
 vnet/vnet/span/span.h                              |    62 -
 vnet/vnet/span/span.md                             |    65 -
 vnet/vnet/span/span_api.c                          |   153 -
 vnet/vnet/sr/dir.dox                               |    25 -
 vnet/vnet/sr/examples/sr_multicastmap.script       |     4 -
 vnet/vnet/sr/rfc_draft_05.txt                      |  1265 --
 vnet/vnet/sr/sr.c                                  |  3333 ----
 vnet/vnet/sr/sr.h                                  |   262 -
 vnet/vnet/sr/sr_error.def                          |    20 -
 vnet/vnet/sr/sr_fix_dst_error.def                  |    17 -
 vnet/vnet/sr/sr_packet.h                           |   251 -
 vnet/vnet/sr/sr_replicate.c                        |   490 -
 vnet/vnet/srp/format.c                             |   147 -
 vnet/vnet/srp/interface.c                          |   458 -
 vnet/vnet/srp/node.c                               |   932 -
 vnet/vnet/srp/packet.h                             |   204 -
 vnet/vnet/srp/pg.c                                 |   157 -
 vnet/vnet/srp/srp.h                                |   222 -
 vnet/vnet/unix/gdb_funcs.c                         |   171 -
 vnet/vnet/unix/pcap.c                              |   241 -
 vnet/vnet/unix/pcap.h                              |   230 -
 vnet/vnet/unix/pcap2pg.c                           |   182 -
 vnet/vnet/unix/tap.api                             |   123 -
 vnet/vnet/unix/tap_api.c                           |   257 -
 vnet/vnet/unix/tapcli.c                            |  1328 --
 vnet/vnet/unix/tapcli.h                            |    52 -
 vnet/vnet/unix/tuntap.c                            |  1000 --
 vnet/vnet/unix/tuntap.h                            |    36 -
 vnet/vnet/vnet.h                                   |    96 -
 vnet/vnet/vnet_all_api_h.h                         |    57 -
 vnet/vnet/vnet_msg_enum.h                          |    37 -
 vnet/vnet/vxlan-gpe/decap.c                        |   733 -
 vnet/vnet/vxlan-gpe/dir.dox                        |    32 -
 vnet/vnet/vxlan-gpe/encap.c                        |   388 -
 vnet/vnet/vxlan-gpe/vxlan-gpe-rfc.txt              |   868 -
 vnet/vnet/vxlan-gpe/vxlan_gpe.api                  |    61 -
 vnet/vnet/vxlan-gpe/vxlan_gpe.c                    |   659 -
 vnet/vnet/vxlan-gpe/vxlan_gpe.h                    |   221 -
 vnet/vnet/vxlan-gpe/vxlan_gpe_api.c                |   249 -
 vnet/vnet/vxlan-gpe/vxlan_gpe_error.def            |    16 -
 vnet/vnet/vxlan-gpe/vxlan_gpe_packet.h             |   110 -
 vnet/vnet/vxlan/decap.c                            |  1130 --
 vnet/vnet/vxlan/dir.dox                            |    24 -
 vnet/vnet/vxlan/encap.c                            |   553 -
 vnet/vnet/vxlan/vxlan.api                          |    81 -
 vnet/vnet/vxlan/vxlan.c                            |   899 -
 vnet/vnet/vxlan/vxlan.h                            |   199 -
 vnet/vnet/vxlan/vxlan_api.c                        |   253 -
 vnet/vnet/vxlan/vxlan_error.def                    |    17 -
 vnet/vnet/vxlan/vxlan_packet.h                     |    69 -
 vpp-api-test/Makefile.am                           |    37 -
 vpp-api-test/configure.ac                          |    40 -
 vpp-api-test/scripts/vppctl                        |   121 -
 vpp-api-test/vat/api_format.c                      | 17827 ------------------
 vpp-api-test/vat/json_format.c                     |   304 -
 vpp-api-test/vat/json_format.h                     |   254 -
 vpp-api-test/vat/json_test.c                       |    75 -
 vpp-api-test/vat/main.c                            |   418 -
 vpp-api-test/vat/plugin.c                          |   201 -
 vpp-api-test/vat/plugin.h                          |    61 -
 vpp-api-test/vat/plugin_api.c                      |   216 -
 vpp-api-test/vat/restart.c                         |   246 -
 vpp-api-test/vat/vat.h                             |   257 -
 vpp-api/Makefile.am                                |     4 +-
 vpp-api/configure.ac                               |     1 -
 vpp-api/java/Makefile.am                           |     3 +-
 vpp-api/java/jvpp-core/jvpp_core.c                 |     8 +-
 vpp-api/java/jvpp-registry/jvpp_registry.c         |    10 +-
 vpp-api/java/jvpp/gen/jvpp_gen.py                  |     5 +
 vpp-api/python/Makefile.am                         |    51 -
 vpp-api/python/README.rst                          |     0
 vpp-api/python/pneum/pneum.c                       |   259 -
 vpp-api/python/pneum/pneum.h                       |    31 -
 vpp-api/python/pneum/test_pneum.c                  |   143 -
 vpp-api/python/setup.cfg                           |     5 -
 vpp-api/python/setup.py                            |    34 -
 vpp-api/python/tests/test_cli.py                   |    52 -
 vpp-api/python/tests/test_modules.py               |    18 -
 vpp-api/python/tests/test_papi.py                  |   119 -
 vpp-api/python/tests/test_version.py               |    35 -
 vpp-api/python/tests/test_vpp_papi2.py             |   487 -
 vpp-api/python/vpp_papi/__init__.py                |     3 -
 vpp-api/python/vpp_papi/pneum_wrap.c               |   200 -
 vpp-api/python/vpp_papi/vpp_papi.py                |   450 -
 vpp/Makefile.am                                    |   166 -
 vpp/app/l2t.c                                      |   557 -
 vpp/app/l2t_l2.c                                   |   267 -
 vpp/app/sticky_hash.c                              |   581 -
 vpp/app/version.c                                  |   102 -
 vpp/app/vpe_cli.c                                  |   123 -
 vpp/conf/80-vpp.conf                               |    15 -
 vpp/conf/startup.conf                              |    99 -
 vpp/conf/startup.uiopcigeneric.conf                |    18 -
 vpp/configure.ac                                   |    80 -
 vpp/oam/oam.c                                      |   648 -
 vpp/oam/oam.h                                      |    96 -
 vpp/stats/stats.c                                  |   987 -
 vpp/stats/stats.h                                  |    76 -
 vpp/suffix-rules.mk                                |     1 -
 vpp/vnet/main.c                                    |   414 -
 vpp/vpp-api/api.c                                  |  4921 -----
 vpp/vpp-api/api_format.c                           |     1 -
 vpp/vpp-api/api_main.c                             |   192 -
 vpp/vpp-api/custom_dump.c                          |  3139 ----
 vpp/vpp-api/gmon.c                                 |   319 -
 vpp/vpp-api/json_format.c                          |   304 -
 vpp/vpp-api/json_format.h                          |   254 -
 vpp/vpp-api/summary_stats_client.c                 |   302 -
 vpp/vpp-api/test_client.c                          |  1531 --
 vpp/vpp-api/test_ha.c                              |   249 -
 vpp/vpp-api/vat.h                                  |     1 -
 vpp/vpp-api/vpe.api                                |  2782 ---
 vpp/vpp-api/vpe_all_api_h.h                        |    37 -
 vpp/vpp-api/vpe_msg_enum.h                         |    37 -
 vpp/vpp-api/vpp_get_metrics.c                      |   253 -
 vppapigen/Makefile.am                              |    29 -
 vppapigen/configure.ac                             |    14 -
 vppapigen/gram.y                                   |    90 -
 vppapigen/lex.c                                    |  1067 --
 vppapigen/lex.h                                    |    50 -
 vppapigen/node.c                                   |  1531 --
 vppapigen/node.h                                   |    94 -
 vppinfra/.gitignore                                |     1 -
 vppinfra/INSTALL                                   |   236 -
 vppinfra/Make.defs                                 |   129 -
 vppinfra/Makefile.am                               |   275 -
 vppinfra/README                                    |    43 -
 vppinfra/configure.ac                              |    52 -
 vppinfra/dir.dox                                   |    19 -
 vppinfra/mkinstalldirs                             |   111 -
 vppinfra/tools/dir.dox                             |    19 -
 vppinfra/tools/elftool.c                           |   464 -
 vppinfra/unix_error.def                            |   145 -
 vppinfra/vppinfra/anneal.c                         |   172 -
 vppinfra/vppinfra/anneal.h                         |    89 -
 vppinfra/vppinfra/asm_mips.h                       |   351 -
 vppinfra/vppinfra/asm_x86.c                        |  1947 --
 vppinfra/vppinfra/asm_x86.h                        |   125 -
 vppinfra/vppinfra/backtrace.c                      |   267 -
 vppinfra/vppinfra/bihash_24_8.h                    |    85 -
 vppinfra/vppinfra/bihash_8_8.h                     |    98 -
 vppinfra/vppinfra/bihash_doc.h                     |   149 -
 vppinfra/vppinfra/bihash_template.c                |   455 -
 vppinfra/vppinfra/bihash_template.h                |   214 -
 vppinfra/vppinfra/bitmap.h                         |   774 -
 vppinfra/vppinfra/bitops.h                         |   179 -
 vppinfra/vppinfra/byte_order.h                     |   202 -
 vppinfra/vppinfra/cache.h                          |   104 -
 vppinfra/vppinfra/clib.h                           |   359 -
 vppinfra/vppinfra/cpu.c                            |   133 -
 vppinfra/vppinfra/cpu.h                            |   112 -
 vppinfra/vppinfra/dir.dox                          |    19 -
 vppinfra/vppinfra/dlist.h                          |   156 -
 vppinfra/vppinfra/elf.c                            |  2040 ---
 vppinfra/vppinfra/elf.h                            |  1062 --
 vppinfra/vppinfra/elf_clib.c                       |   377 -
 vppinfra/vppinfra/elf_clib.h                       |   144 -
 vppinfra/vppinfra/elog.c                           |  1061 --
 vppinfra/vppinfra/elog.h                           |   460 -
 vppinfra/vppinfra/error.c                          |   292 -
 vppinfra/vppinfra/error.h                          |   201 -
 vppinfra/vppinfra/error_bootstrap.h                |   106 -
 vppinfra/vppinfra/fheap.c                          |   473 -
 vppinfra/vppinfra/fheap.h                          |   140 -
 vppinfra/vppinfra/fifo.c                           |   137 -
 vppinfra/vppinfra/fifo.h                           |   304 -
 vppinfra/vppinfra/format.c                         |   814 -
 vppinfra/vppinfra/format.h                         |   331 -
 vppinfra/vppinfra/graph.c                          |   182 -
 vppinfra/vppinfra/graph.h                          |   127 -
 vppinfra/vppinfra/hash.c                           |  1095 --
 vppinfra/vppinfra/hash.h                           |   699 -
 vppinfra/vppinfra/heap.c                           |   828 -
 vppinfra/vppinfra/heap.h                           |   357 -
 vppinfra/vppinfra/longjmp.S                        |   690 -
 vppinfra/vppinfra/longjmp.h                        |   124 -
 vppinfra/vppinfra/macros.c                         |   266 -
 vppinfra/vppinfra/macros.h                         |    54 -
 vppinfra/vppinfra/math.h                           |    63 -
 vppinfra/vppinfra/md5.c                            |   317 -
 vppinfra/vppinfra/md5.h                            |    57 -
 vppinfra/vppinfra/mem.h                            |   291 -
 vppinfra/vppinfra/mem_mheap.c                      |   165 -
 vppinfra/vppinfra/memcheck.h                       |   317 -
 vppinfra/vppinfra/memcpy_avx.h                     |   293 -
 vppinfra/vppinfra/memcpy_sse3.h                    |   355 -
 vppinfra/vppinfra/mhash.c                          |   408 -
 vppinfra/vppinfra/mhash.h                          |   179 -
 vppinfra/vppinfra/mheap.c                          |  1649 --
 vppinfra/vppinfra/mheap.h                          |    94 -
 vppinfra/vppinfra/mheap_bootstrap.h                |   374 -
 vppinfra/vppinfra/mod_test_hash.c                  |    27 -
 vppinfra/vppinfra/os.h                             |    72 -
 vppinfra/vppinfra/pfhash.c                         |   689 -
 vppinfra/vppinfra/pfhash.h                         |   276 -
 vppinfra/vppinfra/phash.c                          |  1017 --
 vppinfra/vppinfra/phash.h                          |   194 -
 vppinfra/vppinfra/pipeline.h                       |   176 -
 vppinfra/vppinfra/pool.h                           |   405 -
 vppinfra/vppinfra/ptclosure.c                      |   125 -
 vppinfra/vppinfra/ptclosure.h                      |    40 -
 vppinfra/vppinfra/qhash.c                          |   858 -
 vppinfra/vppinfra/qhash.h                          |   169 -
 vppinfra/vppinfra/qsort.c                          |   269 -
 vppinfra/vppinfra/random.c                         |    51 -
 vppinfra/vppinfra/random.h                         |   178 -
 vppinfra/vppinfra/random_buffer.c                  |    86 -
 vppinfra/vppinfra/random_buffer.h                  |   118 -
 vppinfra/vppinfra/random_isaac.c                   |   434 -
 vppinfra/vppinfra/random_isaac.h                   |    81 -
 vppinfra/vppinfra/serialize.c                      |  1254 --
 vppinfra/vppinfra/serialize.h                      |   443 -
 vppinfra/vppinfra/slist.c                          |   336 -
 vppinfra/vppinfra/slist.h                          |   145 -
 vppinfra/vppinfra/smp.c                            |   325 -
 vppinfra/vppinfra/smp.h                            |    81 -
 vppinfra/vppinfra/smp_fifo.c                       |    91 -
 vppinfra/vppinfra/smp_fifo.h                       |   313 -
 vppinfra/vppinfra/socket.c                         |   422 -
 vppinfra/vppinfra/socket.h                         |   160 -
 vppinfra/vppinfra/sparse_vec.h                     |   244 -
 vppinfra/vppinfra/std-formats.c                    |   330 -
 vppinfra/vppinfra/string.c                         |    94 -
 vppinfra/vppinfra/string.h                         |    83 -
 vppinfra/vppinfra/test_bihash_template.c           |   297 -
 vppinfra/vppinfra/test_dlist.c                     |   193 -
 vppinfra/vppinfra/test_elf.c                       |   217 -
 vppinfra/vppinfra/test_elog.c                      |   262 -
 vppinfra/vppinfra/test_fifo.c                      |   144 -
 vppinfra/vppinfra/test_format.c                    |   199 -
 vppinfra/vppinfra/test_hash.c                      |   458 -
 vppinfra/vppinfra/test_heap.c                      |   198 -
 vppinfra/vppinfra/test_longjmp.c                   |   129 -
 vppinfra/vppinfra/test_macros.c                    |    64 -
 vppinfra/vppinfra/test_md5.c                       |   141 -
 vppinfra/vppinfra/test_mheap.c                     |   242 -
 vppinfra/vppinfra/test_pfhash.c                    |   322 -
 vppinfra/vppinfra/test_phash.c                     |   149 -
 vppinfra/vppinfra/test_pool.c                      |    86 -
 vppinfra/vppinfra/test_pool_iterate.c              |    59 -
 vppinfra/vppinfra/test_ptclosure.c                 |   212 -
 vppinfra/vppinfra/test_qhash.c                     |   333 -
 vppinfra/vppinfra/test_random.c                    |   148 -
 vppinfra/vppinfra/test_random_isaac.c              |   142 -
 vppinfra/vppinfra/test_serialize.c                 |   274 -
 vppinfra/vppinfra/test_slist.c                     |   228 -
 vppinfra/vppinfra/test_socket.c                    |   134 -
 vppinfra/vppinfra/test_time.c                      |   104 -
 vppinfra/vppinfra/test_timing_wheel.c              |   389 -
 vppinfra/vppinfra/test_vec.c                       |  1159 --
 vppinfra/vppinfra/test_vec.h                       |   243 -
 vppinfra/vppinfra/test_vhash.c                     |   757 -
 vppinfra/vppinfra/test_zvec.c                      |   117 -
 vppinfra/vppinfra/time.c                           |   226 -
 vppinfra/vppinfra/time.h                           |   298 -
 vppinfra/vppinfra/timer.c                          |   322 -
 vppinfra/vppinfra/timer.h                          |    46 -
 vppinfra/vppinfra/timing_wheel.c                   |   750 -
 vppinfra/vppinfra/timing_wheel.h                   |   155 -
 vppinfra/vppinfra/types.h                          |   174 -
 vppinfra/vppinfra/unformat.c                       |  1077 --
 vppinfra/vppinfra/unix-formats.c                   |   918 -
 vppinfra/vppinfra/unix-kelog.c                     |   415 -
 vppinfra/vppinfra/unix-misc.c                      |   242 -
 vppinfra/vppinfra/unix.h                           |    64 -
 vppinfra/vppinfra/valgrind.h                       |  4030 -----
 vppinfra/vppinfra/vec.c                            |   171 -
 vppinfra/vppinfra/vec.h                            |   973 -
 vppinfra/vppinfra/vec_bootstrap.h                  |   201 -
 vppinfra/vppinfra/vector.c                         |    54 -
 vppinfra/vppinfra/vector.h                         |   268 -
 vppinfra/vppinfra/vector_altivec.h                 |   178 -
 vppinfra/vppinfra/vector_funcs.h                   |   334 -
 vppinfra/vppinfra/vector_iwmmxt.h                  |   149 -
 vppinfra/vppinfra/vector_neon.h                    |    71 -
 vppinfra/vppinfra/vector_sse2.h                    |   711 -
 vppinfra/vppinfra/vhash.c                          |   772 -
 vppinfra/vppinfra/vhash.h                          |   850 -
 vppinfra/vppinfra/vm_linux_kernel.h                |    78 -
 vppinfra/vppinfra/vm_standalone.h                  |    74 -
 vppinfra/vppinfra/vm_unix.h                        |   106 -
 vppinfra/vppinfra/xxhash.h                         |    86 -
 vppinfra/vppinfra/xy.h                             |    56 -
 vppinfra/vppinfra/zvec.c                           |   442 -
 vppinfra/vppinfra/zvec.h                           |   166 -
 2038 files changed, 380675 insertions(+), 381455 deletions(-)
 delete mode 100644 build-data/packages/cavium-dpdk.mk
 create mode 100644 build-data/packages/src.mk
 delete mode 100644 build-data/packages/svm.mk
 delete mode 100644 build-data/packages/vlib-api-cavium-dpdk.mk
 delete mode 100644 build-data/packages/vlib-api.mk
 delete mode 100644 build-data/packages/vlib-cavium-dpdk.mk
 delete mode 100644 build-data/packages/vlib.mk
 delete mode 100644 build-data/packages/vnet-cavium-dpdk.mk
 delete mode 100644 build-data/packages/vpp-api-test-cavium-dpdk.mk
 delete mode 100644 build-data/packages/vpp-api-test.mk
 delete mode 100644 build-data/packages/vpp-cavium-dpdk.mk
 delete mode 100644 build-data/packages/vppinfra.mk
 delete mode 100644 build-data/suffix-rules.mk
 create mode 100644 build-root/packages/src.mk
 create mode 100644 build-root/packages/tools.mk
 delete mode 100644 build-root/packages/vppapigen.mk
 delete mode 100644 g2/Makefile.am
 delete mode 100644 g2/clib.c
 delete mode 100644 g2/configure.ac
 delete mode 100644 g2/cpel.c
 delete mode 100644 g2/cpel.h
 delete mode 100644 g2/events.c
 delete mode 100644 g2/g2.h
 delete mode 100644 g2/g2version.c
 delete mode 100644 g2/main.c
 delete mode 100644 g2/menu1.c
 delete mode 100644 g2/mkversion.c
 delete mode 100644 g2/pointsel.c
 delete mode 100644 g2/props.c
 delete mode 100644 g2/props.h
 delete mode 100644 g2/view1.c
 delete mode 100644 perftool/Makefile.am
 delete mode 100644 perftool/c2cpel.c
 delete mode 100644 perftool/configure.ac
 delete mode 100644 perftool/cpel.h
 delete mode 100644 perftool/cpel_util.c
 delete mode 100644 perftool/cpel_util.h
 delete mode 100644 perftool/cpelatency.c
 delete mode 100644 perftool/cpeldump.c
 delete mode 100644 perftool/cpelinreg.c
 delete mode 100644 perftool/cpelstate.c
 delete mode 100644 perftool/delsvec.c
 delete mode 100644 perftool/linreg.c
 delete mode 100644 perftool/new.cpel
 delete mode 100644 perftool/new.elog
 delete mode 100644 perftool/props.c
 delete mode 100644 plugins/flowperpkt-plugin/Makefile.am
 delete mode 100644 plugins/flowperpkt-plugin/configure.ac
 delete mode 100644 plugins/flowperpkt-plugin/flowperpkt/flowperpkt.api
 delete mode 100644 plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c
 delete mode 100644 plugins/flowperpkt-plugin/flowperpkt/flowperpkt.h
 delete mode 100644 plugins/flowperpkt-plugin/flowperpkt/flowperpkt_all_api_h.h
 delete mode 100644 plugins/flowperpkt-plugin/flowperpkt/flowperpkt_msg_enum.h
 delete mode 100644 plugins/flowperpkt-plugin/flowperpkt/flowperpkt_test.c
 delete mode 100644 plugins/flowperpkt-plugin/flowperpkt/l2_node.c
 delete mode 100644 plugins/flowperpkt-plugin/flowperpkt/node.c
 delete mode 100644 plugins/flowperpkt-plugin/flowperpkt_plugin_doc.md
 delete mode 100644 plugins/ila-plugin/Makefile.am
 delete mode 100644 plugins/ila-plugin/configure.ac
 delete mode 100644 plugins/ila-plugin/ila/ila.c
 delete mode 100644 plugins/ila-plugin/ila/ila.h
 delete mode 100644 plugins/sixrd-plugin/Makefile.am
 delete mode 100644 plugins/sixrd-plugin/configure.ac
 delete mode 100644 plugins/sixrd-plugin/sixrd/ip4_sixrd.c
 delete mode 100644 plugins/sixrd-plugin/sixrd/ip6_sixrd.c
 delete mode 100644 plugins/sixrd-plugin/sixrd/sixrd.c
 delete mode 100644 plugins/sixrd-plugin/sixrd/sixrd.h
 delete mode 100644 plugins/sixrd-plugin/sixrd/sixrd_dpo.c
 delete mode 100644 plugins/sixrd-plugin/sixrd/sixrd_dpo.h
 create mode 100644 src/Makefile.am
 create mode 100644 src/configure.ac
 create mode 100644 src/examples/vlib/dir.dox
 create mode 100644 src/examples/vlib/main_stub.c
 create mode 100644 src/examples/vlib/mc_test.c
 create mode 100644 src/examples/vlib/plex_test.c
 create mode 100644 src/g2.am
 create mode 100644 src/perftool.am
 create mode 100644 src/plugins/Makefile.am
 create mode 100644 src/plugins/flowperpkt.am
 create mode 100644 src/plugins/flowperpkt/flowperpkt.api
 create mode 100644 src/plugins/flowperpkt/flowperpkt.c
 create mode 100644 src/plugins/flowperpkt/flowperpkt.h
 create mode 100644 src/plugins/flowperpkt/flowperpkt_all_api_h.h
 create mode 100644 src/plugins/flowperpkt/flowperpkt_msg_enum.h
 create mode 100644 src/plugins/flowperpkt/flowperpkt_plugin_doc.md
 create mode 100644 src/plugins/flowperpkt/flowperpkt_test.c
 create mode 100644 src/plugins/flowperpkt/l2_node.c
 create mode 100644 src/plugins/flowperpkt/node.c
 create mode 100644 src/plugins/ila.am
 create mode 100644 src/plugins/ila/ila.c
 create mode 100644 src/plugins/ila/ila.h
 create mode 100644 src/plugins/sixrd.am
 create mode 100644 src/plugins/sixrd/ip4_sixrd.c
 create mode 100644 src/plugins/sixrd/ip6_sixrd.c
 create mode 100644 src/plugins/sixrd/sixrd.c
 create mode 100644 src/plugins/sixrd/sixrd.h
 create mode 100644 src/plugins/sixrd/sixrd_dpo.c
 create mode 100644 src/plugins/sixrd/sixrd_dpo.h
 create mode 100644 src/scripts/vnet/arp4
 create mode 100644 src/scripts/vnet/arp4-mpls
 create mode 100644 src/scripts/vnet/arp6
 create mode 100644 src/scripts/vnet/bvi
 create mode 100644 src/scripts/vnet/dhcp/dhcpd.conf
 create mode 100644 src/scripts/vnet/dhcp/left-ping-target.sh
 create mode 100644 src/scripts/vnet/dhcp/leftpeer.conf
 create mode 100644 src/scripts/vnet/icmp
 create mode 100644 src/scripts/vnet/icmp6
 create mode 100644 src/scripts/vnet/ige
 create mode 100644 src/scripts/vnet/ip6
 create mode 100644 src/scripts/vnet/ip6-hbh
 create mode 100644 src/scripts/vnet/ixge
 create mode 100644 src/scripts/vnet/l2efpfilter
 create mode 100644 src/scripts/vnet/l2efpfilter_perf
 create mode 100644 src/scripts/vnet/l2fib
 create mode 100644 src/scripts/vnet/l2fib_perf
 create mode 100644 src/scripts/vnet/l2fib_xc
 create mode 100644 src/scripts/vnet/l2flood
 create mode 100644 src/scripts/vnet/l2tp
 create mode 100755 src/scripts/vnet/leftpeer/leftpeer-classify
 create mode 100644 src/scripts/vnet/leftpeer/leftpeer-classify6
 create mode 100644 src/scripts/vnet/leftpeer/leftpeer-classifyl2
 create mode 100644 src/scripts/vnet/leftpeer/leftpeer-dhcp
 create mode 100644 src/scripts/vnet/leftpeer/leftpeer-ioam.conf
 create mode 100644 src/scripts/vnet/leftpeer/leftpeer-l3vxlan.conf
 create mode 100644 src/scripts/vnet/leftpeer/leftpeer-lisp.conf
 create mode 100644 src/scripts/vnet/leftpeer/leftpeer-mpls.conf
 create mode 100644 src/scripts/vnet/leftpeer/leftpeer-sr.conf
 create mode 100644 src/scripts/vnet/leftpeer/leftpeer-vxlan.conf
 create mode 100644 src/scripts/vnet/leftpeer/leftpeer.script
 create mode 100644 src/scripts/vnet/lfib/ip4-to-mpls
 create mode 100644 src/scripts/vnet/lfib/mpls-pop-to-mpls
 create mode 100644 src/scripts/vnet/lfib/mpls-to-ip4
 create mode 100644 src/scripts/vnet/lfib/mpls-to-mpls
 create mode 100644 src/scripts/vnet/mpls-o-ethernet/leftpeer.conf
 create mode 100644 src/scripts/vnet/mpls-o-ethernet/pg
 create mode 100644 src/scripts/vnet/mpls-o-ethernet/rightpeer.conf
 create mode 100644 src/scripts/vnet/mpls-o-ethernet/single.conf
 create mode 100644 src/scripts/vnet/mpls-o-gre/dhcpd.conf
 create mode 100644 src/scripts/vnet/mpls-o-gre/leftpeer.conf
 create mode 100644 src/scripts/vnet/mpls-o-gre/rightpeer.conf
 create mode 100644 src/scripts/vnet/mpls-tunnel
 create mode 100644 src/scripts/vnet/pcap
 create mode 100644 src/scripts/vnet/probe4
 create mode 100644 src/scripts/vnet/probe6
 create mode 100644 src/scripts/vnet/rewrite
 create mode 100644 src/scripts/vnet/rightpeer/rightpeer-ioam.conf
 create mode 100644 src/scripts/vnet/rightpeer/rightpeer-l3vxlan.conf
 create mode 100644 src/scripts/vnet/rightpeer/rightpeer-lisp.conf
 create mode 100644 src/scripts/vnet/rightpeer/rightpeer-mpls-l2.conf
 create mode 100644 src/scripts/vnet/rightpeer/rightpeer-mpls.conf
 create mode 100644 src/scripts/vnet/rightpeer/rightpeer-sr.conf
 create mode 100644 src/scripts/vnet/rightpeer/rightpeer-vxlan.conf
 create mode 100644 src/scripts/vnet/rightpeer/rightpeer.script
 create mode 100644 src/scripts/vnet/rpf
 create mode 100644 src/scripts/vnet/rtt-test
 create mode 100644 src/scripts/vnet/snat
 create mode 100644 src/scripts/vnet/snat_static
 create mode 100644 src/scripts/vnet/snat_static_with_port
 create mode 100644 src/scripts/vnet/source_and_port_range_check
 create mode 100644 src/scripts/vnet/speed
 create mode 100755 src/scripts/vnet/sr/left-linux-ping.sh
 create mode 100644 src/scripts/vnet/sr/leftpeer.conf
 create mode 100755 src/scripts/vnet/sr/right-linux-ping.sh
 create mode 100644 src/scripts/vnet/sr/rightpeer.conf
 create mode 100755 src/scripts/vnet/sr/srlocal.sh
 create mode 100644 src/scripts/vnet/srp
 create mode 100644 src/scripts/vnet/tcp
 create mode 100644 src/scripts/vnet/tcp-test
 create mode 100644 src/scripts/vnet/tf-ucs-1
 create mode 100644 src/scripts/vnet/urpf
 create mode 100644 src/scripts/vnet/virl/ip6sr.virl
 create mode 100644 src/scripts/vnet/virl/ip6sr_notes.txt
 create mode 100644 src/scripts/vnet/virl/mplsogre.virl
 create mode 100644 src/scripts/vnet/virl/simple.virl
 create mode 100644 src/scripts/vnet/vlan
 create mode 100755 src/scripts/vppctl
 create mode 100644 src/suffix-rules.mk
 create mode 100644 src/svm.am
 create mode 100644 src/svm/dir.dox
 create mode 100644 src/svm/persist.c
 create mode 100644 src/svm/ssvm.c
 create mode 100644 src/svm/ssvm.h
 create mode 100644 src/svm/svm.c
 create mode 100644 src/svm/svm.h
 create mode 100644 src/svm/svm_test.c
 create mode 100644 src/svm/svmdb.c
 create mode 100644 src/svm/svmdb.h
 create mode 100644 src/svm/svmdbtool.c
 create mode 100644 src/svm/svmtool.c
 create mode 100644 src/tests/vnet/README
 create mode 100644 src/tests/vnet/lisp-cp/test_cp_serdes.c
 create mode 100644 src/tests/vnet/lisp-cp/test_lisp_types.c
 create mode 100644 src/tests/vnet/lisp-gpe/test.c
 create mode 100644 src/tools/elftool/dir.dox
 create mode 100644 src/tools/elftool/elftool.c
 create mode 100644 src/tools/g2/clib.c
 create mode 100644 src/tools/g2/configure.ac
 create mode 100644 src/tools/g2/cpel.c
 create mode 100644 src/tools/g2/cpel.h
 create mode 100644 src/tools/g2/events.c
 create mode 100644 src/tools/g2/g2.h
 create mode 100644 src/tools/g2/g2version.c
 create mode 100644 src/tools/g2/main.c
 create mode 100644 src/tools/g2/menu1.c
 create mode 100644 src/tools/g2/mkversion.c
 create mode 100644 src/tools/g2/pointsel.c
 create mode 100644 src/tools/g2/props.c
 create mode 100644 src/tools/g2/props.h
 create mode 100644 src/tools/g2/view1.c
 create mode 100644 src/tools/perftool/c2cpel.c
 create mode 100644 src/tools/perftool/configure.ac
 create mode 100644 src/tools/perftool/cpel.h
 create mode 100644 src/tools/perftool/cpel_util.c
 create mode 100644 src/tools/perftool/cpel_util.h
 create mode 100644 src/tools/perftool/cpelatency.c
 create mode 100644 src/tools/perftool/cpeldump.c
 create mode 100644 src/tools/perftool/cpelinreg.c
 create mode 100644 src/tools/perftool/cpelstate.c
 create mode 100644 src/tools/perftool/delsvec.c
 create mode 100644 src/tools/perftool/linreg.c
 create mode 100644 src/tools/perftool/new.cpel
 create mode 100644 src/tools/perftool/new.elog
 create mode 100644 src/tools/perftool/props.c
 create mode 100644 src/tools/vppapigen/configure.ac
 create mode 100644 src/tools/vppapigen/gram.y
 create mode 100644 src/tools/vppapigen/lex.c
 create mode 100644 src/tools/vppapigen/lex.h
 create mode 100644 src/tools/vppapigen/node.c
 create mode 100644 src/tools/vppapigen/node.h
 create mode 100644 src/vat/api_format.c
 create mode 100644 src/vat/json_format.c
 create mode 100644 src/vat/json_format.h
 create mode 100644 src/vat/json_test.c
 create mode 100644 src/vat/main.c
 create mode 100644 src/vat/plugin.c
 create mode 100644 src/vat/plugin.h
 create mode 100644 src/vat/plugin_api.c
 create mode 100644 src/vat/restart.c
 create mode 100644 src/vat/vat.h
 create mode 100644 src/vlib-api.am
 create mode 100644 src/vlib.am
 create mode 100644 src/vlib/buffer.c
 create mode 100644 src/vlib/buffer.h
 create mode 100644 src/vlib/buffer_funcs.h
 create mode 100644 src/vlib/buffer_node.h
 create mode 100644 src/vlib/cli.c
 create mode 100644 src/vlib/cli.h
 create mode 100644 src/vlib/cli_funcs.h
 create mode 100644 src/vlib/counter.c
 create mode 100644 src/vlib/counter.h
 create mode 100644 src/vlib/defs.h
 create mode 100644 src/vlib/dir.dox
 create mode 100644 src/vlib/elog_samples.c
 create mode 100644 src/vlib/error.c
 create mode 100644 src/vlib/error.h
 create mode 100644 src/vlib/error_funcs.h
 create mode 100644 src/vlib/format.c
 create mode 100644 src/vlib/format_funcs.h
 create mode 100644 src/vlib/global_funcs.h
 create mode 100644 src/vlib/i2c.c
 create mode 100644 src/vlib/i2c.h
 create mode 100644 src/vlib/init.c
 create mode 100644 src/vlib/init.h
 create mode 100644 src/vlib/lex.c
 create mode 100644 src/vlib/lex.h
 create mode 100644 src/vlib/main.c
 create mode 100644 src/vlib/main.h
 create mode 100644 src/vlib/mc.c
 create mode 100644 src/vlib/mc.h
 create mode 100644 src/vlib/node.c
 create mode 100644 src/vlib/node.h
 create mode 100644 src/vlib/node_cli.c
 create mode 100644 src/vlib/node_format.c
 create mode 100644 src/vlib/node_funcs.h
 create mode 100644 src/vlib/parse.c
 create mode 100644 src/vlib/parse.h
 create mode 100644 src/vlib/parse_builtin.c
 create mode 100644 src/vlib/pci/linux_pci.c
 create mode 100644 src/vlib/pci/pci.c
 create mode 100644 src/vlib/pci/pci.h
 create mode 100644 src/vlib/pci/pci_config.h
 create mode 100644 src/vlib/physmem.h
 create mode 100644 src/vlib/threads.c
 create mode 100644 src/vlib/threads.h
 create mode 100644 src/vlib/threads_cli.c
 create mode 100644 src/vlib/trace.c
 create mode 100644 src/vlib/trace.h
 create mode 100644 src/vlib/trace_funcs.h
 create mode 100644 src/vlib/unix/cj.c
 create mode 100644 src/vlib/unix/cj.h
 create mode 100644 src/vlib/unix/cli.c
 create mode 100644 src/vlib/unix/dir.dox
 create mode 100644 src/vlib/unix/input.c
 create mode 100644 src/vlib/unix/main.c
 create mode 100644 src/vlib/unix/mc_socket.c
 create mode 100644 src/vlib/unix/mc_socket.h
 create mode 100644 src/vlib/unix/physmem.c
 create mode 100644 src/vlib/unix/physmem.h
 create mode 100644 src/vlib/unix/plugin.c
 create mode 100644 src/vlib/unix/plugin.h
 create mode 100644 src/vlib/unix/unix.h
 create mode 100644 src/vlib/unix/util.c
 create mode 100644 src/vlib/vlib.h
 create mode 100644 src/vlib/vlib_process_doc.h
 create mode 100644 src/vlibapi/api.h
 create mode 100644 src/vlibapi/api_helper_macros.h
 create mode 100644 src/vlibapi/api_shared.c
 create mode 100644 src/vlibapi/node_serialize.c
 create mode 100644 src/vlibmemory/api.h
 create mode 100644 src/vlibmemory/memclnt.api
 create mode 100644 src/vlibmemory/memory_client.c
 create mode 100644 src/vlibmemory/memory_shared.c
 create mode 100644 src/vlibmemory/memory_vlib.c
 create mode 100644 src/vlibmemory/unix_shared_memory_queue.c
 create mode 100644 src/vlibmemory/unix_shared_memory_queue.h
 create mode 100644 src/vlibmemory/vl_memory_api_h.h
 create mode 100644 src/vlibmemory/vl_memory_msg_enum.h
 create mode 100644 src/vlibsocket/api.h
 create mode 100644 src/vlibsocket/sock_test.c
 create mode 100644 src/vlibsocket/sockclnt.api
 create mode 100644 src/vlibsocket/sockclnt_vlib.c
 create mode 100644 src/vlibsocket/socksvr_vlib.c
 create mode 100644 src/vlibsocket/vl_socket_api_h.h
 create mode 100644 src/vlibsocket/vl_socket_msg_enum.h
 create mode 100644 src/vnet.am
 create mode 100644 src/vnet/adj/adj.c
 create mode 100644 src/vnet/adj/adj.h
 create mode 100644 src/vnet/adj/adj_glean.c
 create mode 100644 src/vnet/adj/adj_glean.h
 create mode 100644 src/vnet/adj/adj_internal.h
 create mode 100644 src/vnet/adj/adj_l2.c
 create mode 100644 src/vnet/adj/adj_l2.h
 create mode 100644 src/vnet/adj/adj_midchain.c
 create mode 100644 src/vnet/adj/adj_midchain.h
 create mode 100644 src/vnet/adj/adj_nbr.c
 create mode 100644 src/vnet/adj/adj_nbr.h
 create mode 100644 src/vnet/adj/adj_rewrite.c
 create mode 100644 src/vnet/adj/adj_rewrite.h
 create mode 100644 src/vnet/adj/adj_types.h
 create mode 100644 src/vnet/api_errno.h
 create mode 100644 src/vnet/bfd/bfd.api
 create mode 100644 src/vnet/bfd/bfd_api.c
 create mode 100644 src/vnet/bfd/bfd_api.h
 create mode 100644 src/vnet/bfd/bfd_debug.h
 create mode 100644 src/vnet/bfd/bfd_doc.md
 create mode 100644 src/vnet/bfd/bfd_main.c
 create mode 100644 src/vnet/bfd/bfd_main.h
 create mode 100644 src/vnet/bfd/bfd_protocol.c
 create mode 100644 src/vnet/bfd/bfd_protocol.h
 create mode 100644 src/vnet/bfd/bfd_udp.c
 create mode 100644 src/vnet/bfd/bfd_udp.h
 create mode 100644 src/vnet/bfd/dir.dox
 create mode 100644 src/vnet/buffer.h
 create mode 100644 src/vnet/cdp/cdp.pg
 create mode 100644 src/vnet/cdp/cdp_input.c
 create mode 100644 src/vnet/cdp/cdp_node.c
 create mode 100644 src/vnet/cdp/cdp_node.h
 create mode 100644 src/vnet/cdp/cdp_periodic.c
 create mode 100644 src/vnet/cdp/cdp_protocol.h
 create mode 100644 src/vnet/classify/README
 create mode 100644 src/vnet/classify/flow_classify.c
 create mode 100644 src/vnet/classify/flow_classify.h
 create mode 100644 src/vnet/classify/flow_classify_node.c
 create mode 100644 src/vnet/classify/input_acl.c
 create mode 100644 src/vnet/classify/input_acl.h
 create mode 100644 src/vnet/classify/ip_classify.c
 create mode 100644 src/vnet/classify/policer_classify.c
 create mode 100644 src/vnet/classify/policer_classify.h
 create mode 100644 src/vnet/classify/vnet_classify.c
 create mode 100644 src/vnet/classify/vnet_classify.h
 create mode 100644 src/vnet/config.c
 create mode 100644 src/vnet/config.h
 create mode 100644 src/vnet/cop/cop.c
 create mode 100644 src/vnet/cop/cop.h
 create mode 100644 src/vnet/cop/ip4_whitelist.c
 create mode 100644 src/vnet/cop/ip6_whitelist.c
 create mode 100644 src/vnet/cop/node1.c
 create mode 100644 src/vnet/devices/af_packet/af_packet.api
 create mode 100644 src/vnet/devices/af_packet/af_packet.c
 create mode 100644 src/vnet/devices/af_packet/af_packet.h
 create mode 100644 src/vnet/devices/af_packet/af_packet_api.c
 create mode 100644 src/vnet/devices/af_packet/cli.c
 create mode 100644 src/vnet/devices/af_packet/device.c
 create mode 100644 src/vnet/devices/af_packet/node.c
 create mode 100644 src/vnet/devices/devices.c
 create mode 100644 src/vnet/devices/devices.h
 create mode 100644 src/vnet/devices/dpdk/cli.c
 create mode 100644 src/vnet/devices/dpdk/device.c
 create mode 100644 src/vnet/devices/dpdk/dpdk.h
 create mode 100644 src/vnet/devices/dpdk/dpdk_priv.h
 create mode 100644 src/vnet/devices/dpdk/format.c
 create mode 100644 src/vnet/devices/dpdk/hqos.c
 create mode 100755 src/vnet/devices/dpdk/init.c
 create mode 100644 src/vnet/devices/dpdk/ipsec/cli.c
 create mode 100644 src/vnet/devices/dpdk/ipsec/crypto_node.c
 create mode 100644 src/vnet/devices/dpdk/ipsec/dir.dox
 create mode 100644 src/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md
 create mode 100644 src/vnet/devices/dpdk/ipsec/esp.h
 create mode 100644 src/vnet/devices/dpdk/ipsec/esp_decrypt.c
 create mode 100644 src/vnet/devices/dpdk/ipsec/esp_encrypt.c
 create mode 100644 src/vnet/devices/dpdk/ipsec/ipsec.c
 create mode 100644 src/vnet/devices/dpdk/ipsec/ipsec.h
 create mode 100644 src/vnet/devices/dpdk/node.c
 create mode 100644 src/vnet/devices/dpdk/qos_doc.md
 create mode 100644 src/vnet/devices/netmap/cli.c
 create mode 100644 src/vnet/devices/netmap/device.c
 create mode 100644 src/vnet/devices/netmap/net_netmap.h
 create mode 100644 src/vnet/devices/netmap/netmap.api
 create mode 100644 src/vnet/devices/netmap/netmap.c
 create mode 100644 src/vnet/devices/netmap/netmap.h
 create mode 100644 src/vnet/devices/netmap/netmap_api.c
 create mode 100644 src/vnet/devices/netmap/node.c
 create mode 100644 src/vnet/devices/nic/ixge.c
 create mode 100644 src/vnet/devices/nic/ixge.h
 create mode 100644 src/vnet/devices/nic/sfp.c
 create mode 100644 src/vnet/devices/nic/sfp.h
 create mode 100644 src/vnet/devices/ssvm/node.c
 create mode 100644 src/vnet/devices/ssvm/ssvm_eth.c
 create mode 100644 src/vnet/devices/ssvm/ssvm_eth.h
 create mode 100644 src/vnet/devices/virtio/dir.dox
 create mode 100644 src/vnet/devices/virtio/vhost-user.c
 create mode 100644 src/vnet/devices/virtio/vhost-user.h
 create mode 100644 src/vnet/devices/virtio/vhost_user.api
 create mode 100644 src/vnet/devices/virtio/vhost_user_api.c
 create mode 100644 src/vnet/dhcp/client.c
 create mode 100644 src/vnet/dhcp/client.h
 create mode 100644 src/vnet/dhcp/packet.h
 create mode 100644 src/vnet/dhcp/proxy.h
 create mode 100644 src/vnet/dhcp/proxy_error.def
 create mode 100644 src/vnet/dhcp/proxy_node.c
 create mode 100644 src/vnet/dhcpv6/packet.h
 create mode 100644 src/vnet/dhcpv6/proxy.h
 create mode 100644 src/vnet/dhcpv6/proxy_error.def
 create mode 100644 src/vnet/dhcpv6/proxy_node.c
 create mode 100644 src/vnet/dpo/classify_dpo.c
 create mode 100644 src/vnet/dpo/classify_dpo.h
 create mode 100644 src/vnet/dpo/dpo.c
 create mode 100644 src/vnet/dpo/dpo.h
 create mode 100644 src/vnet/dpo/drop_dpo.c
 create mode 100644 src/vnet/dpo/drop_dpo.h
 create mode 100644 src/vnet/dpo/ip_null_dpo.c
 create mode 100644 src/vnet/dpo/ip_null_dpo.h
 create mode 100644 src/vnet/dpo/load_balance.c
 create mode 100644 src/vnet/dpo/load_balance.h
 create mode 100644 src/vnet/dpo/load_balance_map.c
 create mode 100644 src/vnet/dpo/load_balance_map.h
 create mode 100644 src/vnet/dpo/lookup_dpo.c
 create mode 100644 src/vnet/dpo/lookup_dpo.h
 create mode 100644 src/vnet/dpo/mpls_label_dpo.c
 create mode 100644 src/vnet/dpo/mpls_label_dpo.h
 create mode 100644 src/vnet/dpo/punt_dpo.c
 create mode 100644 src/vnet/dpo/punt_dpo.h
 create mode 100644 src/vnet/dpo/receive_dpo.c
 create mode 100644 src/vnet/dpo/receive_dpo.h
 create mode 100644 src/vnet/ethernet/arp.c
 create mode 100644 src/vnet/ethernet/arp_packet.h
 create mode 100644 src/vnet/ethernet/dir.dox
 create mode 100644 src/vnet/ethernet/error.def
 create mode 100644 src/vnet/ethernet/ethernet.h
 create mode 100644 src/vnet/ethernet/format.c
 create mode 100644 src/vnet/ethernet/init.c
 create mode 100644 src/vnet/ethernet/interface.c
 create mode 100644 src/vnet/ethernet/mac_swap.c
 create mode 100755 src/vnet/ethernet/node.c
 create mode 100644 src/vnet/ethernet/packet.h
 create mode 100644 src/vnet/ethernet/pg.c
 create mode 100644 src/vnet/ethernet/types.def
 create mode 100644 src/vnet/feature/feature.c
 create mode 100644 src/vnet/feature/feature.h
 create mode 100644 src/vnet/feature/registration.c
 create mode 100644 src/vnet/fib/fib.c
 create mode 100644 src/vnet/fib/fib.h
 create mode 100644 src/vnet/fib/fib_api.h
 create mode 100644 src/vnet/fib/fib_attached_export.c
 create mode 100644 src/vnet/fib/fib_attached_export.h
 create mode 100644 src/vnet/fib/fib_entry.c
 create mode 100644 src/vnet/fib/fib_entry.h
 create mode 100644 src/vnet/fib/fib_entry_cover.c
 create mode 100644 src/vnet/fib/fib_entry_cover.h
 create mode 100644 src/vnet/fib/fib_entry_delegate.c
 create mode 100644 src/vnet/fib/fib_entry_delegate.h
 create mode 100644 src/vnet/fib/fib_entry_src.c
 create mode 100644 src/vnet/fib/fib_entry_src.h
 create mode 100644 src/vnet/fib/fib_entry_src_adj.c
 create mode 100644 src/vnet/fib/fib_entry_src_api.c
 create mode 100644 src/vnet/fib/fib_entry_src_default.c
 create mode 100644 src/vnet/fib/fib_entry_src_default_route.c
 create mode 100644 src/vnet/fib/fib_entry_src_interface.c
 create mode 100644 src/vnet/fib/fib_entry_src_lisp.c
 create mode 100644 src/vnet/fib/fib_entry_src_mpls.c
 create mode 100644 src/vnet/fib/fib_entry_src_rr.c
 create mode 100644 src/vnet/fib/fib_entry_src_special.c
 create mode 100644 src/vnet/fib/fib_internal.h
 create mode 100644 src/vnet/fib/fib_node.c
 create mode 100644 src/vnet/fib/fib_node.h
 create mode 100644 src/vnet/fib/fib_node_list.c
 create mode 100644 src/vnet/fib/fib_node_list.h
 create mode 100644 src/vnet/fib/fib_path.c
 create mode 100644 src/vnet/fib/fib_path.h
 create mode 100644 src/vnet/fib/fib_path_ext.c
 create mode 100644 src/vnet/fib/fib_path_ext.h
 create mode 100644 src/vnet/fib/fib_path_list.c
 create mode 100644 src/vnet/fib/fib_path_list.h
 create mode 100644 src/vnet/fib/fib_table.c
 create mode 100644 src/vnet/fib/fib_table.h
 create mode 100644 src/vnet/fib/fib_test.c
 create mode 100644 src/vnet/fib/fib_types.c
 create mode 100644 src/vnet/fib/fib_types.h
 create mode 100644 src/vnet/fib/fib_urpf_list.c
 create mode 100644 src/vnet/fib/fib_urpf_list.h
 create mode 100644 src/vnet/fib/fib_walk.c
 create mode 100644 src/vnet/fib/fib_walk.h
 create mode 100644 src/vnet/fib/ip4_fib.c
 create mode 100644 src/vnet/fib/ip4_fib.h
 create mode 100644 src/vnet/fib/ip6_fib.c
 create mode 100644 src/vnet/fib/ip6_fib.h
 create mode 100644 src/vnet/fib/mpls_fib.c
 create mode 100644 src/vnet/fib/mpls_fib.h
 create mode 100644 src/vnet/flow/flow_report.c
 create mode 100644 src/vnet/flow/flow_report.h
 create mode 100644 src/vnet/flow/flow_report_classify.c
 create mode 100644 src/vnet/flow/flow_report_classify.h
 create mode 100644 src/vnet/flow/ipfix_info_elements.h
 create mode 100644 src/vnet/flow/ipfix_packet.h
 create mode 100644 src/vnet/global_funcs.h
 create mode 100644 src/vnet/gre/error.def
 create mode 100644 src/vnet/gre/gre.api
 create mode 100644 src/vnet/gre/gre.c
 create mode 100644 src/vnet/gre/gre.h
 create mode 100644 src/vnet/gre/gre_api.c
 create mode 100644 src/vnet/gre/interface.c
 create mode 100644 src/vnet/gre/node.c
 create mode 100644 src/vnet/gre/packet.h
 create mode 100644 src/vnet/gre/pg.c
 create mode 100644 src/vnet/handoff.c
 create mode 100644 src/vnet/handoff.h
 create mode 100644 src/vnet/hdlc/error.def
 create mode 100644 src/vnet/hdlc/hdlc.c
 create mode 100644 src/vnet/hdlc/hdlc.h
 create mode 100644 src/vnet/hdlc/node.c
 create mode 100644 src/vnet/hdlc/packet.h
 create mode 100644 src/vnet/hdlc/pg.c
 create mode 100644 src/vnet/interface.api
 create mode 100644 src/vnet/interface.c
 create mode 100644 src/vnet/interface.h
 create mode 100644 src/vnet/interface_api.c
 create mode 100644 src/vnet/interface_cli.c
 create mode 100644 src/vnet/interface_format.c
 create mode 100644 src/vnet/interface_funcs.h
 create mode 100644 src/vnet/interface_output.c
 create mode 100644 src/vnet/ip/dir.dox
 create mode 100644 src/vnet/ip/format.c
 create mode 100644 src/vnet/ip/format.h
 create mode 100644 src/vnet/ip/icmp4.c
 create mode 100644 src/vnet/ip/icmp4.h
 create mode 100644 src/vnet/ip/icmp46_packet.h
 create mode 100644 src/vnet/ip/icmp6.c
 create mode 100644 src/vnet/ip/icmp6.h
 create mode 100644 src/vnet/ip/igmp_packet.h
 create mode 100644 src/vnet/ip/ip.api
 create mode 100644 src/vnet/ip/ip.h
 create mode 100644 src/vnet/ip/ip4.h
 create mode 100644 src/vnet/ip/ip46_cli.c
 create mode 100644 src/vnet/ip/ip4_error.h
 create mode 100644 src/vnet/ip/ip4_format.c
 create mode 100644 src/vnet/ip/ip4_forward.c
 create mode 100644 src/vnet/ip/ip4_input.c
 create mode 100644 src/vnet/ip/ip4_mtrie.c
 create mode 100644 src/vnet/ip/ip4_mtrie.h
 create mode 100644 src/vnet/ip/ip4_packet.h
 create mode 100644 src/vnet/ip/ip4_pg.c
 create mode 100644 src/vnet/ip/ip4_source_and_port_range_check.c
 create mode 100644 src/vnet/ip/ip4_source_check.c
 create mode 100644 src/vnet/ip/ip4_test.c
 create mode 100644 src/vnet/ip/ip6.h
 create mode 100644 src/vnet/ip/ip6_error.h
 create mode 100644 src/vnet/ip/ip6_format.c
 create mode 100644 src/vnet/ip/ip6_forward.c
 create mode 100644 src/vnet/ip/ip6_hop_by_hop.c
 create mode 100644 src/vnet/ip/ip6_hop_by_hop.h
 create mode 100644 src/vnet/ip/ip6_hop_by_hop_packet.h
 create mode 100644 src/vnet/ip/ip6_input.c
 create mode 100644 src/vnet/ip/ip6_neighbor.c
 create mode 100644 src/vnet/ip/ip6_neighbor.h
 create mode 100644 src/vnet/ip/ip6_packet.h
 create mode 100644 src/vnet/ip/ip6_pg.c
 create mode 100644 src/vnet/ip/ip_api.c
 create mode 100644 src/vnet/ip/ip_checksum.c
 create mode 100644 src/vnet/ip/ip_frag.c
 create mode 100644 src/vnet/ip/ip_frag.h
 create mode 100644 src/vnet/ip/ip_init.c
 create mode 100644 src/vnet/ip/ip_input_acl.c
 create mode 100644 src/vnet/ip/ip_packet.h
 create mode 100644 src/vnet/ip/ip_source_and_port_range_check.h
 create mode 100644 src/vnet/ip/lookup.c
 create mode 100644 src/vnet/ip/lookup.h
 create mode 100644 src/vnet/ip/ping.c
 create mode 100644 src/vnet/ip/ping.h
 create mode 100644 src/vnet/ip/ports.def
 create mode 100644 src/vnet/ip/protocols.def
 create mode 100644 src/vnet/ip/punt.c
 create mode 100644 src/vnet/ip/punt.h
 create mode 100644 src/vnet/ip/punt_error.def
 create mode 100644 src/vnet/ip/tcp_packet.h
 create mode 100644 src/vnet/ip/udp.h
 create mode 100644 src/vnet/ip/udp_error.def
 create mode 100644 src/vnet/ip/udp_format.c
 create mode 100644 src/vnet/ip/udp_init.c
 create mode 100644 src/vnet/ip/udp_local.c
 create mode 100644 src/vnet/ip/udp_packet.h
 create mode 100644 src/vnet/ip/udp_pg.c
 create mode 100644 src/vnet/ipsec-gre/dir.dox
 create mode 100644 src/vnet/ipsec-gre/error.def
 create mode 100644 src/vnet/ipsec-gre/interface.c
 create mode 100644 src/vnet/ipsec-gre/ipsec_gre.api
 create mode 100644 src/vnet/ipsec-gre/ipsec_gre.c
 create mode 100644 src/vnet/ipsec-gre/ipsec_gre.h
 create mode 100644 src/vnet/ipsec-gre/ipsec_gre_api.c
 create mode 100644 src/vnet/ipsec-gre/ipsec_gre_doc.md
 create mode 100644 src/vnet/ipsec-gre/node.c
 create mode 100644 src/vnet/ipsec/esp.h
 create mode 100644 src/vnet/ipsec/esp_decrypt.c
 create mode 100644 src/vnet/ipsec/esp_encrypt.c
 create mode 100644 src/vnet/ipsec/ikev2.c
 create mode 100644 src/vnet/ipsec/ikev2.h
 create mode 100644 src/vnet/ipsec/ikev2_cli.c
 create mode 100644 src/vnet/ipsec/ikev2_crypto.c
 create mode 100644 src/vnet/ipsec/ikev2_format.c
 create mode 100644 src/vnet/ipsec/ikev2_payload.c
 create mode 100644 src/vnet/ipsec/ikev2_priv.h
 create mode 100644 src/vnet/ipsec/ipsec.api
 create mode 100644 src/vnet/ipsec/ipsec.c
 create mode 100644 src/vnet/ipsec/ipsec.h
 create mode 100644 src/vnet/ipsec/ipsec_api.c
 create mode 100644 src/vnet/ipsec/ipsec_cli.c
 create mode 100644 src/vnet/ipsec/ipsec_format.c
 create mode 100644 src/vnet/ipsec/ipsec_if.c
 create mode 100644 src/vnet/ipsec/ipsec_if_in.c
 create mode 100644 src/vnet/ipsec/ipsec_if_out.c
 create mode 100644 src/vnet/ipsec/ipsec_input.c
 create mode 100644 src/vnet/ipsec/ipsec_output.c
 create mode 100644 src/vnet/l2/dir.dox
 create mode 100644 src/vnet/l2/feat_bitmap.c
 create mode 100644 src/vnet/l2/feat_bitmap.h
 create mode 100644 src/vnet/l2/l2.api
 create mode 100644 src/vnet/l2/l2_api.c
 create mode 100644 src/vnet/l2/l2_bd.c
 create mode 100644 src/vnet/l2/l2_bd.h
 create mode 100644 src/vnet/l2/l2_bvi.c
 create mode 100644 src/vnet/l2/l2_bvi.h
 create mode 100644 src/vnet/l2/l2_classify.h
 create mode 100644 src/vnet/l2/l2_efp_filter.c
 create mode 100644 src/vnet/l2/l2_efp_filter.h
 create mode 100644 src/vnet/l2/l2_fib.c
 create mode 100644 src/vnet/l2/l2_fib.h
 create mode 100644 src/vnet/l2/l2_flood.c
 create mode 100644 src/vnet/l2/l2_flood.h
 create mode 100644 src/vnet/l2/l2_fwd.c
 create mode 100644 src/vnet/l2/l2_fwd.h
 create mode 100644 src/vnet/l2/l2_input.c
 create mode 100644 src/vnet/l2/l2_input.h
 create mode 100644 src/vnet/l2/l2_input_acl.c
 create mode 100644 src/vnet/l2/l2_input_classify.c
 create mode 100644 src/vnet/l2/l2_input_vtr.c
 create mode 100644 src/vnet/l2/l2_input_vtr.h
 create mode 100644 src/vnet/l2/l2_learn.c
 create mode 100644 src/vnet/l2/l2_learn.h
 create mode 100644 src/vnet/l2/l2_output.c
 create mode 100644 src/vnet/l2/l2_output.h
 create mode 100644 src/vnet/l2/l2_output_acl.c
 create mode 100644 src/vnet/l2/l2_output_classify.c
 create mode 100644 src/vnet/l2/l2_patch.c
 create mode 100644 src/vnet/l2/l2_rw.c
 create mode 100644 src/vnet/l2/l2_rw.h
 create mode 100644 src/vnet/l2/l2_vtr.c
 create mode 100644 src/vnet/l2/l2_vtr.h
 create mode 100644 src/vnet/l2/l2_xcrw.c
 create mode 100644 src/vnet/l2/l2_xcrw.h
 create mode 100644 src/vnet/l2tp/decap.c
 create mode 100644 src/vnet/l2tp/encap.c
 create mode 100644 src/vnet/l2tp/l2tp.api
 create mode 100644 src/vnet/l2tp/l2tp.c
 create mode 100644 src/vnet/l2tp/l2tp.h
 create mode 100644 src/vnet/l2tp/l2tp_api.c
 create mode 100644 src/vnet/l2tp/packet.h
 create mode 100644 src/vnet/l2tp/pg.c
 create mode 100644 src/vnet/l3_types.h
 create mode 100644 src/vnet/lawful-intercept/lawful_intercept.c
 create mode 100644 src/vnet/lawful-intercept/lawful_intercept.h
 create mode 100644 src/vnet/lawful-intercept/node.c
 create mode 100644 src/vnet/lisp-cp/control.c
 create mode 100644 src/vnet/lisp-cp/control.h
 create mode 100644 src/vnet/lisp-cp/gid_dictionary.c
 create mode 100644 src/vnet/lisp-cp/gid_dictionary.h
 create mode 100644 src/vnet/lisp-cp/lisp.api
 create mode 100644 src/vnet/lisp-cp/lisp_api.c
 create mode 100644 src/vnet/lisp-cp/lisp_cp_dpo.c
 create mode 100644 src/vnet/lisp-cp/lisp_cp_dpo.h
 create mode 100644 src/vnet/lisp-cp/lisp_cp_messages.h
 create mode 100644 src/vnet/lisp-cp/lisp_msg_serdes.c
 create mode 100644 src/vnet/lisp-cp/lisp_msg_serdes.h
 create mode 100644 src/vnet/lisp-cp/lisp_types.c
 create mode 100644 src/vnet/lisp-cp/lisp_types.h
 create mode 100644 src/vnet/lisp-cp/packets.c
 create mode 100644 src/vnet/lisp-cp/packets.h
 create mode 100644 src/vnet/lisp-gpe/decap.c
 create mode 100644 src/vnet/lisp-gpe/dir.dox
 create mode 100644 src/vnet/lisp-gpe/interface.c
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe.api
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe.c
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe.h
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe_adjacency.c
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe_adjacency.h
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe_api.c
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe_error.def
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe_packet.h
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe_sub_interface.c
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe_sub_interface.h
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe_tenant.c
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe_tenant.h
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe_tunnel.c
 create mode 100644 src/vnet/lisp-gpe/lisp_gpe_tunnel.h
 create mode 100644 src/vnet/lisp-gpe/rfc.txt
 create mode 100644 src/vnet/llc/llc.c
 create mode 100644 src/vnet/llc/llc.h
 create mode 100644 src/vnet/llc/node.c
 create mode 100644 src/vnet/llc/pg.c
 create mode 100644 src/vnet/lldp/dir.dox
 create mode 100644 src/vnet/lldp/lldp_cli.c
 create mode 100644 src/vnet/lldp/lldp_doc.md
 create mode 100644 src/vnet/lldp/lldp_input.c
 create mode 100644 src/vnet/lldp/lldp_node.c
 create mode 100644 src/vnet/lldp/lldp_node.h
 create mode 100644 src/vnet/lldp/lldp_output.c
 create mode 100644 src/vnet/lldp/lldp_protocol.h
 create mode 100755 src/vnet/map/examples/gen-rules.py
 create mode 100644 src/vnet/map/examples/health_check.c
 create mode 100755 src/vnet/map/examples/test_map.py
 create mode 100755 src/vnet/map/gen-rules.py
 create mode 100644 src/vnet/map/ip4_map.c
 create mode 100644 src/vnet/map/ip4_map_t.c
 create mode 100644 src/vnet/map/ip6_map.c
 create mode 100644 src/vnet/map/ip6_map_t.c
 create mode 100644 src/vnet/map/map.api
 create mode 100644 src/vnet/map/map.c
 create mode 100644 src/vnet/map/map.h
 create mode 100644 src/vnet/map/map_api.c
 create mode 100644 src/vnet/map/map_doc.md
 create mode 100644 src/vnet/map/map_dpo.c
 create mode 100644 src/vnet/map/map_dpo.h
 create mode 100644 src/vnet/map/test.c
 create mode 100644 src/vnet/mcast/mcast.c
 create mode 100644 src/vnet/mcast/mcast.h
 create mode 100644 src/vnet/mcast/mcast_test.c
 create mode 100644 src/vnet/misc.c
 create mode 100644 src/vnet/mpls/error.def
 create mode 100644 src/vnet/mpls/interface.c
 create mode 100644 src/vnet/mpls/mpls.c
 create mode 100644 src/vnet/mpls/mpls.h
 create mode 100644 src/vnet/mpls/mpls_features.c
 create mode 100644 src/vnet/mpls/mpls_lookup.c
 create mode 100644 src/vnet/mpls/mpls_output.c
 create mode 100644 src/vnet/mpls/mpls_tunnel.c
 create mode 100644 src/vnet/mpls/mpls_tunnel.h
 create mode 100644 src/vnet/mpls/mpls_types.h
 create mode 100644 src/vnet/mpls/node.c
 create mode 100644 src/vnet/mpls/packet.h
 create mode 100644 src/vnet/mpls/pg.c
 create mode 100644 src/vnet/osi/node.c
 create mode 100644 src/vnet/osi/osi.c
 create mode 100644 src/vnet/osi/osi.h
 create mode 100644 src/vnet/osi/pg.c
 create mode 100644 src/vnet/pg/cli.c
 create mode 100644 src/vnet/pg/edit.c
 create mode 100644 src/vnet/pg/edit.h
 create mode 100644 src/vnet/pg/example.script
 create mode 100644 src/vnet/pg/init.c
 create mode 100644 src/vnet/pg/input.c
 create mode 100644 src/vnet/pg/output.c
 create mode 100644 src/vnet/pg/pg.h
 create mode 100644 src/vnet/pg/stream.c
 create mode 100644 src/vnet/pipeline.h
 create mode 100644 src/vnet/plugin/p1.c
 create mode 100644 src/vnet/plugin/plugin.h
 create mode 100644 src/vnet/policer/node_funcs.c
 create mode 100644 src/vnet/policer/police.h
 create mode 100644 src/vnet/policer/policer.c
 create mode 100644 src/vnet/policer/policer.h
 create mode 100644 src/vnet/policer/xlate.c
 create mode 100644 src/vnet/policer/xlate.h
 create mode 100644 src/vnet/ppp/error.def
 create mode 100644 src/vnet/ppp/node.c
 create mode 100644 src/vnet/ppp/packet.h
 create mode 100644 src/vnet/ppp/pg.c
 create mode 100644 src/vnet/ppp/ppp.c
 create mode 100644 src/vnet/ppp/ppp.h
 create mode 100644 src/vnet/replication.c
 create mode 100644 src/vnet/replication.h
 create mode 100644 src/vnet/rewrite.c
 create mode 100644 src/vnet/rewrite.h
 create mode 100644 src/vnet/snap/node.c
 create mode 100644 src/vnet/snap/pg.c
 create mode 100644 src/vnet/snap/snap.c
 create mode 100644 src/vnet/snap/snap.h
 create mode 100644 src/vnet/span/node.c
 create mode 100644 src/vnet/span/span.api
 create mode 100644 src/vnet/span/span.c
 create mode 100644 src/vnet/span/span.h
 create mode 100644 src/vnet/span/span.md
 create mode 100644 src/vnet/span/span_api.c
 create mode 100644 src/vnet/sr/dir.dox
 create mode 100644 src/vnet/sr/examples/sr_multicastmap.script
 create mode 100644 src/vnet/sr/rfc_draft_05.txt
 create mode 100644 src/vnet/sr/sr.c
 create mode 100644 src/vnet/sr/sr.h
 create mode 100644 src/vnet/sr/sr_error.def
 create mode 100644 src/vnet/sr/sr_fix_dst_error.def
 create mode 100644 src/vnet/sr/sr_packet.h
 create mode 100644 src/vnet/sr/sr_replicate.c
 create mode 100644 src/vnet/srp/format.c
 create mode 100644 src/vnet/srp/interface.c
 create mode 100644 src/vnet/srp/node.c
 create mode 100644 src/vnet/srp/packet.h
 create mode 100644 src/vnet/srp/pg.c
 create mode 100644 src/vnet/srp/srp.h
 create mode 100644 src/vnet/unix/gdb_funcs.c
 create mode 100644 src/vnet/unix/pcap.c
 create mode 100644 src/vnet/unix/pcap.h
 create mode 100644 src/vnet/unix/pcap2pg.c
 create mode 100644 src/vnet/unix/tap.api
 create mode 100644 src/vnet/unix/tap_api.c
 create mode 100644 src/vnet/unix/tapcli.c
 create mode 100644 src/vnet/unix/tapcli.h
 create mode 100644 src/vnet/unix/tuntap.c
 create mode 100644 src/vnet/unix/tuntap.h
 create mode 100644 src/vnet/vnet.h
 create mode 100644 src/vnet/vnet_all_api_h.h
 create mode 100644 src/vnet/vnet_msg_enum.h
 create mode 100644 src/vnet/vxlan-gpe/decap.c
 create mode 100644 src/vnet/vxlan-gpe/dir.dox
 create mode 100644 src/vnet/vxlan-gpe/encap.c
 create mode 100644 src/vnet/vxlan-gpe/vxlan-gpe-rfc.txt
 create mode 100644 src/vnet/vxlan-gpe/vxlan_gpe.api
 create mode 100644 src/vnet/vxlan-gpe/vxlan_gpe.c
 create mode 100644 src/vnet/vxlan-gpe/vxlan_gpe.h
 create mode 100644 src/vnet/vxlan-gpe/vxlan_gpe_api.c
 create mode 100644 src/vnet/vxlan-gpe/vxlan_gpe_error.def
 create mode 100644 src/vnet/vxlan-gpe/vxlan_gpe_packet.h
 create mode 100644 src/vnet/vxlan/decap.c
 create mode 100644 src/vnet/vxlan/dir.dox
 create mode 100644 src/vnet/vxlan/encap.c
 create mode 100644 src/vnet/vxlan/vxlan.api
 create mode 100644 src/vnet/vxlan/vxlan.c
 create mode 100644 src/vnet/vxlan/vxlan.h
 create mode 100644 src/vnet/vxlan/vxlan_api.c
 create mode 100644 src/vnet/vxlan/vxlan_error.def
 create mode 100644 src/vnet/vxlan/vxlan_packet.h
 create mode 100644 src/vpp-api-test.am
 create mode 100644 src/vpp-api/python/Makefile.am
 create mode 100644 src/vpp-api/python/README.rst
 create mode 100644 src/vpp-api/python/pneum/pneum.c
 create mode 100644 src/vpp-api/python/pneum/pneum.h
 create mode 100644 src/vpp-api/python/pneum/test_pneum.c
 create mode 100644 src/vpp-api/python/setup.cfg
 create mode 100644 src/vpp-api/python/setup.py
 create mode 100755 src/vpp-api/python/tests/test_cli.py
 create mode 100755 src/vpp-api/python/tests/test_modules.py
 create mode 100755 src/vpp-api/python/tests/test_papi.py
 create mode 100755 src/vpp-api/python/tests/test_version.py
 create mode 100755 src/vpp-api/python/tests/test_vpp_papi2.py
 create mode 100644 src/vpp-api/python/vpp_papi/__init__.py
 create mode 100644 src/vpp-api/python/vpp_papi/pneum_wrap.c
 create mode 100644 src/vpp-api/python/vpp_papi/vpp_papi.py
 create mode 100644 src/vpp.am
 create mode 100644 src/vpp/api/api.c
 create mode 120000 src/vpp/api/api_format.c
 create mode 100644 src/vpp/api/api_main.c
 create mode 100644 src/vpp/api/custom_dump.c
 create mode 100644 src/vpp/api/gmon.c
 create mode 100644 src/vpp/api/json_format.c
 create mode 100644 src/vpp/api/json_format.h
 create mode 100644 src/vpp/api/summary_stats_client.c
 create mode 100644 src/vpp/api/test_client.c
 create mode 100644 src/vpp/api/test_ha.c
 create mode 120000 src/vpp/api/vat.h
 create mode 100644 src/vpp/api/vpe.api
 create mode 100644 src/vpp/api/vpe_all_api_h.h
 create mode 100644 src/vpp/api/vpe_msg_enum.h
 create mode 100644 src/vpp/api/vpp_get_metrics.c
 create mode 100644 src/vpp/app/l2t.c
 create mode 100644 src/vpp/app/l2t_l2.c
 create mode 100644 src/vpp/app/sticky_hash.c
 create mode 100644 src/vpp/app/version.c
 create mode 100644 src/vpp/app/vpe_cli.c
 create mode 100644 src/vpp/conf/80-vpp.conf
 create mode 100644 src/vpp/conf/startup.conf
 create mode 100644 src/vpp/conf/startup.uiopcigeneric.conf
 create mode 100644 src/vpp/oam/oam.c
 create mode 100644 src/vpp/oam/oam.h
 create mode 100644 src/vpp/stats/stats.c
 create mode 100644 src/vpp/stats/stats.h
 create mode 100644 src/vpp/vnet/main.c
 create mode 100644 src/vppapigen.am
 create mode 100644 src/vppinfra.am
 create mode 100644 src/vppinfra/README
 create mode 100644 src/vppinfra/anneal.c
 create mode 100644 src/vppinfra/anneal.h
 create mode 100644 src/vppinfra/asm_mips.h
 create mode 100644 src/vppinfra/asm_x86.c
 create mode 100644 src/vppinfra/asm_x86.h
 create mode 100644 src/vppinfra/backtrace.c
 create mode 100644 src/vppinfra/bihash_24_8.h
 create mode 100644 src/vppinfra/bihash_8_8.h
 create mode 100644 src/vppinfra/bihash_doc.h
 create mode 100644 src/vppinfra/bihash_template.c
 create mode 100644 src/vppinfra/bihash_template.h
 create mode 100644 src/vppinfra/bitmap.h
 create mode 100644 src/vppinfra/bitops.h
 create mode 100644 src/vppinfra/byte_order.h
 create mode 100644 src/vppinfra/cache.h
 create mode 100644 src/vppinfra/clib.h
 create mode 100644 src/vppinfra/cpu.c
 create mode 100644 src/vppinfra/cpu.h
 create mode 100644 src/vppinfra/dir.dox
 create mode 100644 src/vppinfra/dlist.h
 create mode 100644 src/vppinfra/elf.c
 create mode 100644 src/vppinfra/elf.h
 create mode 100644 src/vppinfra/elf_clib.c
 create mode 100644 src/vppinfra/elf_clib.h
 create mode 100644 src/vppinfra/elog.c
 create mode 100644 src/vppinfra/elog.h
 create mode 100644 src/vppinfra/error.c
 create mode 100644 src/vppinfra/error.h
 create mode 100644 src/vppinfra/error_bootstrap.h
 create mode 100644 src/vppinfra/fheap.c
 create mode 100644 src/vppinfra/fheap.h
 create mode 100644 src/vppinfra/fifo.c
 create mode 100644 src/vppinfra/fifo.h
 create mode 100644 src/vppinfra/format.c
 create mode 100644 src/vppinfra/format.h
 create mode 100644 src/vppinfra/graph.c
 create mode 100644 src/vppinfra/graph.h
 create mode 100644 src/vppinfra/hash.c
 create mode 100644 src/vppinfra/hash.h
 create mode 100644 src/vppinfra/heap.c
 create mode 100644 src/vppinfra/heap.h
 create mode 100644 src/vppinfra/longjmp.S
 create mode 100644 src/vppinfra/longjmp.h
 create mode 100644 src/vppinfra/macros.c
 create mode 100644 src/vppinfra/macros.h
 create mode 100644 src/vppinfra/math.h
 create mode 100644 src/vppinfra/md5.c
 create mode 100644 src/vppinfra/md5.h
 create mode 100644 src/vppinfra/mem.h
 create mode 100644 src/vppinfra/mem_mheap.c
 create mode 100644 src/vppinfra/memcheck.h
 create mode 100644 src/vppinfra/memcpy_avx.h
 create mode 100644 src/vppinfra/memcpy_sse3.h
 create mode 100644 src/vppinfra/mhash.c
 create mode 100644 src/vppinfra/mhash.h
 create mode 100644 src/vppinfra/mheap.c
 create mode 100644 src/vppinfra/mheap.h
 create mode 100644 src/vppinfra/mheap_bootstrap.h
 create mode 100644 src/vppinfra/mod_test_hash.c
 create mode 100644 src/vppinfra/os.h
 create mode 100644 src/vppinfra/pfhash.c
 create mode 100644 src/vppinfra/pfhash.h
 create mode 100644 src/vppinfra/phash.c
 create mode 100644 src/vppinfra/phash.h
 create mode 100644 src/vppinfra/pipeline.h
 create mode 100644 src/vppinfra/pool.h
 create mode 100644 src/vppinfra/ptclosure.c
 create mode 100644 src/vppinfra/ptclosure.h
 create mode 100644 src/vppinfra/qhash.c
 create mode 100644 src/vppinfra/qhash.h
 create mode 100644 src/vppinfra/qsort.c
 create mode 100644 src/vppinfra/random.c
 create mode 100644 src/vppinfra/random.h
 create mode 100644 src/vppinfra/random_buffer.c
 create mode 100644 src/vppinfra/random_buffer.h
 create mode 100644 src/vppinfra/random_isaac.c
 create mode 100644 src/vppinfra/random_isaac.h
 create mode 100644 src/vppinfra/serialize.c
 create mode 100644 src/vppinfra/serialize.h
 create mode 100644 src/vppinfra/slist.c
 create mode 100644 src/vppinfra/slist.h
 create mode 100644 src/vppinfra/smp.c
 create mode 100644 src/vppinfra/smp.h
 create mode 100644 src/vppinfra/smp_fifo.c
 create mode 100644 src/vppinfra/smp_fifo.h
 create mode 100644 src/vppinfra/socket.c
 create mode 100644 src/vppinfra/socket.h
 create mode 100644 src/vppinfra/sparse_vec.h
 create mode 100644 src/vppinfra/std-formats.c
 create mode 100644 src/vppinfra/string.c
 create mode 100644 src/vppinfra/string.h
 create mode 100644 src/vppinfra/test_bihash_template.c
 create mode 100644 src/vppinfra/test_dlist.c
 create mode 100644 src/vppinfra/test_elf.c
 create mode 100644 src/vppinfra/test_elog.c
 create mode 100644 src/vppinfra/test_fifo.c
 create mode 100644 src/vppinfra/test_format.c
 create mode 100644 src/vppinfra/test_hash.c
 create mode 100644 src/vppinfra/test_heap.c
 create mode 100644 src/vppinfra/test_longjmp.c
 create mode 100644 src/vppinfra/test_macros.c
 create mode 100644 src/vppinfra/test_md5.c
 create mode 100644 src/vppinfra/test_mheap.c
 create mode 100644 src/vppinfra/test_pfhash.c
 create mode 100644 src/vppinfra/test_phash.c
 create mode 100644 src/vppinfra/test_pool.c
 create mode 100644 src/vppinfra/test_pool_iterate.c
 create mode 100644 src/vppinfra/test_ptclosure.c
 create mode 100644 src/vppinfra/test_qhash.c
 create mode 100644 src/vppinfra/test_random.c
 create mode 100644 src/vppinfra/test_random_isaac.c
 create mode 100644 src/vppinfra/test_serialize.c
 create mode 100644 src/vppinfra/test_slist.c
 create mode 100644 src/vppinfra/test_socket.c
 create mode 100644 src/vppinfra/test_time.c
 create mode 100644 src/vppinfra/test_timing_wheel.c
 create mode 100644 src/vppinfra/test_vec.c
 create mode 100644 src/vppinfra/test_vec.h
 create mode 100644 src/vppinfra/test_vhash.c
 create mode 100644 src/vppinfra/test_zvec.c
 create mode 100644 src/vppinfra/time.c
 create mode 100644 src/vppinfra/time.h
 create mode 100644 src/vppinfra/timer.c
 create mode 100644 src/vppinfra/timer.h
 create mode 100644 src/vppinfra/timing_wheel.c
 create mode 100644 src/vppinfra/timing_wheel.h
 create mode 100644 src/vppinfra/types.h
 create mode 100644 src/vppinfra/unformat.c
 create mode 100644 src/vppinfra/unix-formats.c
 create mode 100644 src/vppinfra/unix-kelog.c
 create mode 100644 src/vppinfra/unix-misc.c
 create mode 100644 src/vppinfra/unix.h
 create mode 100644 src/vppinfra/unix_error.def
 create mode 100644 src/vppinfra/valgrind.h
 create mode 100644 src/vppinfra/vec.c
 create mode 100644 src/vppinfra/vec.h
 create mode 100644 src/vppinfra/vec_bootstrap.h
 create mode 100644 src/vppinfra/vector.c
 create mode 100644 src/vppinfra/vector.h
 create mode 100644 src/vppinfra/vector_altivec.h
 create mode 100644 src/vppinfra/vector_funcs.h
 create mode 100644 src/vppinfra/vector_iwmmxt.h
 create mode 100644 src/vppinfra/vector_neon.h
 create mode 100644 src/vppinfra/vector_sse2.h
 create mode 100644 src/vppinfra/vhash.c
 create mode 100644 src/vppinfra/vhash.h
 create mode 100644 src/vppinfra/vm_linux_kernel.h
 create mode 100644 src/vppinfra/vm_standalone.h
 create mode 100644 src/vppinfra/vm_unix.h
 create mode 100644 src/vppinfra/xxhash.h
 create mode 100644 src/vppinfra/xy.h
 create mode 100644 src/vppinfra/zvec.c
 create mode 100644 src/vppinfra/zvec.h
 delete mode 100644 svm/Makefile.am
 delete mode 100644 svm/configure.ac
 delete mode 100644 svm/dir.dox
 delete mode 100644 svm/persist.c
 delete mode 100644 svm/ssvm.c
 delete mode 100644 svm/ssvm.h
 delete mode 100644 svm/svm.c
 delete mode 100644 svm/svm.h
 delete mode 100644 svm/svm_test.c
 delete mode 100644 svm/svmdb.c
 delete mode 100644 svm/svmdb.h
 delete mode 100644 svm/svmdbtool.c
 delete mode 100644 svm/svmtool.c
 delete mode 100644 vlib-api/Makefile.am
 delete mode 100644 vlib-api/configure.ac
 delete mode 120000 vlib-api/suffix-rules.mk
 delete mode 100644 vlib-api/vlibapi/api.h
 delete mode 100644 vlib-api/vlibapi/api_helper_macros.h
 delete mode 100644 vlib-api/vlibapi/api_shared.c
 delete mode 100644 vlib-api/vlibapi/node_serialize.c
 delete mode 100644 vlib-api/vlibmemory/api.h
 delete mode 100644 vlib-api/vlibmemory/memclnt.api
 delete mode 100644 vlib-api/vlibmemory/memory_client.c
 delete mode 100644 vlib-api/vlibmemory/memory_shared.c
 delete mode 100644 vlib-api/vlibmemory/memory_vlib.c
 delete mode 100644 vlib-api/vlibmemory/unix_shared_memory_queue.c
 delete mode 100644 vlib-api/vlibmemory/unix_shared_memory_queue.h
 delete mode 100644 vlib-api/vlibmemory/vl_memory_api_h.h
 delete mode 100644 vlib-api/vlibmemory/vl_memory_msg_enum.h
 delete mode 100644 vlib-api/vlibsocket/api.h
 delete mode 100644 vlib-api/vlibsocket/sock_test.c
 delete mode 100644 vlib-api/vlibsocket/sockclnt.api
 delete mode 100644 vlib-api/vlibsocket/sockclnt_vlib.c
 delete mode 100644 vlib-api/vlibsocket/socksvr_vlib.c
 delete mode 100644 vlib-api/vlibsocket/vl_socket_api_h.h
 delete mode 100644 vlib-api/vlibsocket/vl_socket_msg_enum.h
 delete mode 100644 vlib/.gitignore
 delete mode 100644 vlib/Makefile.am
 delete mode 100644 vlib/configure.ac
 delete mode 100644 vlib/dir.dox
 delete mode 100644 vlib/example/dir.dox
 delete mode 100644 vlib/example/main_stub.c
 delete mode 100644 vlib/example/mc_test.c
 delete mode 100644 vlib/example/plex_test.c
 delete mode 100644 vlib/vlib/buffer.c
 delete mode 100644 vlib/vlib/buffer.h
 delete mode 100644 vlib/vlib/buffer_funcs.h
 delete mode 100644 vlib/vlib/buffer_node.h
 delete mode 100644 vlib/vlib/cli.c
 delete mode 100644 vlib/vlib/cli.h
 delete mode 100644 vlib/vlib/cli_funcs.h
 delete mode 100644 vlib/vlib/counter.c
 delete mode 100644 vlib/vlib/counter.h
 delete mode 100644 vlib/vlib/defs.h
 delete mode 100644 vlib/vlib/dir.dox
 delete mode 100644 vlib/vlib/elog_samples.c
 delete mode 100644 vlib/vlib/error.c
 delete mode 100644 vlib/vlib/error.h
 delete mode 100644 vlib/vlib/error_funcs.h
 delete mode 100644 vlib/vlib/format.c
 delete mode 100644 vlib/vlib/format_funcs.h
 delete mode 100644 vlib/vlib/global_funcs.h
 delete mode 100644 vlib/vlib/i2c.c
 delete mode 100644 vlib/vlib/i2c.h
 delete mode 100644 vlib/vlib/init.c
 delete mode 100644 vlib/vlib/init.h
 delete mode 100644 vlib/vlib/lex.c
 delete mode 100644 vlib/vlib/lex.h
 delete mode 100644 vlib/vlib/main.c
 delete mode 100644 vlib/vlib/main.h
 delete mode 100644 vlib/vlib/mc.c
 delete mode 100644 vlib/vlib/mc.h
 delete mode 100644 vlib/vlib/node.c
 delete mode 100644 vlib/vlib/node.h
 delete mode 100644 vlib/vlib/node_cli.c
 delete mode 100644 vlib/vlib/node_format.c
 delete mode 100644 vlib/vlib/node_funcs.h
 delete mode 100644 vlib/vlib/parse.c
 delete mode 100644 vlib/vlib/parse.h
 delete mode 100644 vlib/vlib/parse_builtin.c
 delete mode 100644 vlib/vlib/pci/linux_pci.c
 delete mode 100644 vlib/vlib/pci/pci.c
 delete mode 100644 vlib/vlib/pci/pci.h
 delete mode 100644 vlib/vlib/pci/pci_config.h
 delete mode 100644 vlib/vlib/physmem.h
 delete mode 100644 vlib/vlib/threads.c
 delete mode 100644 vlib/vlib/threads.h
 delete mode 100644 vlib/vlib/threads_cli.c
 delete mode 100644 vlib/vlib/trace.c
 delete mode 100644 vlib/vlib/trace.h
 delete mode 100644 vlib/vlib/trace_funcs.h
 delete mode 100644 vlib/vlib/unix/cj.c
 delete mode 100644 vlib/vlib/unix/cj.h
 delete mode 100644 vlib/vlib/unix/cli.c
 delete mode 100644 vlib/vlib/unix/dir.dox
 delete mode 100644 vlib/vlib/unix/input.c
 delete mode 100644 vlib/vlib/unix/main.c
 delete mode 100644 vlib/vlib/unix/mc_socket.c
 delete mode 100644 vlib/vlib/unix/mc_socket.h
 delete mode 100644 vlib/vlib/unix/physmem.c
 delete mode 100644 vlib/vlib/unix/physmem.h
 delete mode 100644 vlib/vlib/unix/plugin.c
 delete mode 100644 vlib/vlib/unix/plugin.h
 delete mode 100644 vlib/vlib/unix/unix.h
 delete mode 100644 vlib/vlib/unix/util.c
 delete mode 100644 vlib/vlib/vlib.h
 delete mode 100644 vlib/vlib/vlib_process_doc.h
 delete mode 100644 vnet/.gitignore
 delete mode 100644 vnet/Makefile.am
 delete mode 100644 vnet/configure.ac
 delete mode 100644 vnet/etc/scripts/arp4
 delete mode 100644 vnet/etc/scripts/arp4-mpls
 delete mode 100644 vnet/etc/scripts/arp6
 delete mode 100644 vnet/etc/scripts/bvi
 delete mode 100644 vnet/etc/scripts/dhcp/dhcpd.conf
 delete mode 100644 vnet/etc/scripts/dhcp/left-ping-target.sh
 delete mode 100644 vnet/etc/scripts/dhcp/leftpeer.conf
 delete mode 100644 vnet/etc/scripts/icmp
 delete mode 100644 vnet/etc/scripts/icmp6
 delete mode 100644 vnet/etc/scripts/ige
 delete mode 100644 vnet/etc/scripts/ip6
 delete mode 100644 vnet/etc/scripts/ip6-hbh
 delete mode 100644 vnet/etc/scripts/ixge
 delete mode 100644 vnet/etc/scripts/l2efpfilter
 delete mode 100644 vnet/etc/scripts/l2efpfilter_perf
 delete mode 100644 vnet/etc/scripts/l2fib
 delete mode 100644 vnet/etc/scripts/l2fib_perf
 delete mode 100644 vnet/etc/scripts/l2fib_xc
 delete mode 100644 vnet/etc/scripts/l2flood
 delete mode 100644 vnet/etc/scripts/l2tp
 delete mode 100755 vnet/etc/scripts/leftpeer/leftpeer-classify
 delete mode 100644 vnet/etc/scripts/leftpeer/leftpeer-classify6
 delete mode 100644 vnet/etc/scripts/leftpeer/leftpeer-classifyl2
 delete mode 100644 vnet/etc/scripts/leftpeer/leftpeer-dhcp
 delete mode 100644 vnet/etc/scripts/leftpeer/leftpeer-ioam.conf
 delete mode 100644 vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf
 delete mode 100644 vnet/etc/scripts/leftpeer/leftpeer-lisp.conf
 delete mode 100644 vnet/etc/scripts/leftpeer/leftpeer-mpls.conf
 delete mode 100644 vnet/etc/scripts/leftpeer/leftpeer-sr.conf
 delete mode 100644 vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf
 delete mode 100644 vnet/etc/scripts/leftpeer/leftpeer.script
 delete mode 100644 vnet/etc/scripts/lfib/ip4-to-mpls
 delete mode 100644 vnet/etc/scripts/lfib/mpls-pop-to-mpls
 delete mode 100644 vnet/etc/scripts/lfib/mpls-to-ip4
 delete mode 100644 vnet/etc/scripts/lfib/mpls-to-mpls
 delete mode 100644 vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf
 delete mode 100644 vnet/etc/scripts/mpls-o-ethernet/pg
 delete mode 100644 vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf
 delete mode 100644 vnet/etc/scripts/mpls-o-ethernet/single.conf
 delete mode 100644 vnet/etc/scripts/mpls-o-gre/dhcpd.conf
 delete mode 100644 vnet/etc/scripts/mpls-o-gre/leftpeer.conf
 delete mode 100644 vnet/etc/scripts/mpls-o-gre/rightpeer.conf
 delete mode 100644 vnet/etc/scripts/mpls-tunnel
 delete mode 100644 vnet/etc/scripts/pcap
 delete mode 100644 vnet/etc/scripts/probe4
 delete mode 100644 vnet/etc/scripts/probe6
 delete mode 100644 vnet/etc/scripts/rewrite
 delete mode 100644 vnet/etc/scripts/rightpeer/rightpeer-ioam.conf
 delete mode 100644 vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf
 delete mode 100644 vnet/etc/scripts/rightpeer/rightpeer-lisp.conf
 delete mode 100644 vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf
 delete mode 100644 vnet/etc/scripts/rightpeer/rightpeer-mpls.conf
 delete mode 100644 vnet/etc/scripts/rightpeer/rightpeer-sr.conf
 delete mode 100644 vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf
 delete mode 100644 vnet/etc/scripts/rightpeer/rightpeer.script
 delete mode 100644 vnet/etc/scripts/rpf
 delete mode 100644 vnet/etc/scripts/rtt-test
 delete mode 100644 vnet/etc/scripts/snat
 delete mode 100644 vnet/etc/scripts/snat_static
 delete mode 100644 vnet/etc/scripts/snat_static_with_port
 delete mode 100644 vnet/etc/scripts/source_and_port_range_check
 delete mode 100644 vnet/etc/scripts/speed
 delete mode 100755 vnet/etc/scripts/sr/left-linux-ping.sh
 delete mode 100644 vnet/etc/scripts/sr/leftpeer.conf
 delete mode 100755 vnet/etc/scripts/sr/right-linux-ping.sh
 delete mode 100644 vnet/etc/scripts/sr/rightpeer.conf
 delete mode 100755 vnet/etc/scripts/sr/srlocal.sh
 delete mode 100644 vnet/etc/scripts/srp
 delete mode 100644 vnet/etc/scripts/tcp
 delete mode 100644 vnet/etc/scripts/tcp-test
 delete mode 100644 vnet/etc/scripts/tf-ucs-1
 delete mode 100644 vnet/etc/scripts/urpf
 delete mode 100644 vnet/etc/scripts/virl/ip6sr.virl
 delete mode 100644 vnet/etc/scripts/virl/ip6sr_notes.txt
 delete mode 100644 vnet/etc/scripts/virl/mplsogre.virl
 delete mode 100644 vnet/etc/scripts/virl/simple.virl
 delete mode 100644 vnet/etc/scripts/vlan
 delete mode 120000 vnet/suffix-rules.mk
 delete mode 100644 vnet/test/README
 delete mode 100644 vnet/test/lisp-cp/test_cp_serdes.c
 delete mode 100644 vnet/test/lisp-cp/test_lisp_types.c
 delete mode 100644 vnet/test/lisp-gpe/test.c
 delete mode 100644 vnet/vnet/adj/adj.c
 delete mode 100644 vnet/vnet/adj/adj.h
 delete mode 100644 vnet/vnet/adj/adj_glean.c
 delete mode 100644 vnet/vnet/adj/adj_glean.h
 delete mode 100644 vnet/vnet/adj/adj_internal.h
 delete mode 100644 vnet/vnet/adj/adj_l2.c
 delete mode 100644 vnet/vnet/adj/adj_l2.h
 delete mode 100644 vnet/vnet/adj/adj_midchain.c
 delete mode 100644 vnet/vnet/adj/adj_midchain.h
 delete mode 100644 vnet/vnet/adj/adj_nbr.c
 delete mode 100644 vnet/vnet/adj/adj_nbr.h
 delete mode 100644 vnet/vnet/adj/adj_rewrite.c
 delete mode 100644 vnet/vnet/adj/adj_rewrite.h
 delete mode 100644 vnet/vnet/adj/adj_types.h
 delete mode 100644 vnet/vnet/api_errno.h
 delete mode 100644 vnet/vnet/bfd/bfd.api
 delete mode 100644 vnet/vnet/bfd/bfd_api.c
 delete mode 100644 vnet/vnet/bfd/bfd_api.h
 delete mode 100644 vnet/vnet/bfd/bfd_debug.h
 delete mode 100644 vnet/vnet/bfd/bfd_doc.md
 delete mode 100644 vnet/vnet/bfd/bfd_main.c
 delete mode 100644 vnet/vnet/bfd/bfd_main.h
 delete mode 100644 vnet/vnet/bfd/bfd_protocol.c
 delete mode 100644 vnet/vnet/bfd/bfd_protocol.h
 delete mode 100644 vnet/vnet/bfd/bfd_udp.c
 delete mode 100644 vnet/vnet/bfd/bfd_udp.h
 delete mode 100644 vnet/vnet/bfd/dir.dox
 delete mode 100644 vnet/vnet/buffer.h
 delete mode 100644 vnet/vnet/cdp/cdp.pg
 delete mode 100644 vnet/vnet/cdp/cdp_input.c
 delete mode 100644 vnet/vnet/cdp/cdp_node.c
 delete mode 100644 vnet/vnet/cdp/cdp_node.h
 delete mode 100644 vnet/vnet/cdp/cdp_periodic.c
 delete mode 100644 vnet/vnet/cdp/cdp_protocol.h
 delete mode 100644 vnet/vnet/classify/README
 delete mode 100644 vnet/vnet/classify/flow_classify.c
 delete mode 100644 vnet/vnet/classify/flow_classify.h
 delete mode 100644 vnet/vnet/classify/flow_classify_node.c
 delete mode 100644 vnet/vnet/classify/input_acl.c
 delete mode 100644 vnet/vnet/classify/input_acl.h
 delete mode 100644 vnet/vnet/classify/ip_classify.c
 delete mode 100644 vnet/vnet/classify/policer_classify.c
 delete mode 100644 vnet/vnet/classify/policer_classify.h
 delete mode 100644 vnet/vnet/classify/vnet_classify.c
 delete mode 100644 vnet/vnet/classify/vnet_classify.h
 delete mode 100644 vnet/vnet/config.c
 delete mode 100644 vnet/vnet/config.h
 delete mode 100644 vnet/vnet/cop/cop.c
 delete mode 100644 vnet/vnet/cop/cop.h
 delete mode 100644 vnet/vnet/cop/ip4_whitelist.c
 delete mode 100644 vnet/vnet/cop/ip6_whitelist.c
 delete mode 100644 vnet/vnet/cop/node1.c
 delete mode 100644 vnet/vnet/devices/af_packet/af_packet.api
 delete mode 100644 vnet/vnet/devices/af_packet/af_packet.c
 delete mode 100644 vnet/vnet/devices/af_packet/af_packet.h
 delete mode 100644 vnet/vnet/devices/af_packet/af_packet_api.c
 delete mode 100644 vnet/vnet/devices/af_packet/cli.c
 delete mode 100644 vnet/vnet/devices/af_packet/device.c
 delete mode 100644 vnet/vnet/devices/af_packet/node.c
 delete mode 100644 vnet/vnet/devices/devices.c
 delete mode 100644 vnet/vnet/devices/devices.h
 delete mode 100644 vnet/vnet/devices/dpdk/cli.c
 delete mode 100644 vnet/vnet/devices/dpdk/device.c
 delete mode 100644 vnet/vnet/devices/dpdk/dpdk.h
 delete mode 100644 vnet/vnet/devices/dpdk/dpdk_priv.h
 delete mode 100644 vnet/vnet/devices/dpdk/format.c
 delete mode 100644 vnet/vnet/devices/dpdk/hqos.c
 delete mode 100755 vnet/vnet/devices/dpdk/init.c
 delete mode 100644 vnet/vnet/devices/dpdk/ipsec/cli.c
 delete mode 100644 vnet/vnet/devices/dpdk/ipsec/crypto_node.c
 delete mode 100644 vnet/vnet/devices/dpdk/ipsec/dir.dox
 delete mode 100644 vnet/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md
 delete mode 100644 vnet/vnet/devices/dpdk/ipsec/esp.h
 delete mode 100644 vnet/vnet/devices/dpdk/ipsec/esp_decrypt.c
 delete mode 100644 vnet/vnet/devices/dpdk/ipsec/esp_encrypt.c
 delete mode 100644 vnet/vnet/devices/dpdk/ipsec/ipsec.c
 delete mode 100644 vnet/vnet/devices/dpdk/ipsec/ipsec.h
 delete mode 100644 vnet/vnet/devices/dpdk/node.c
 delete mode 100644 vnet/vnet/devices/dpdk/qos_doc.md
 delete mode 100644 vnet/vnet/devices/netmap/cli.c
 delete mode 100644 vnet/vnet/devices/netmap/device.c
 delete mode 100644 vnet/vnet/devices/netmap/net_netmap.h
 delete mode 100644 vnet/vnet/devices/netmap/netmap.api
 delete mode 100644 vnet/vnet/devices/netmap/netmap.c
 delete mode 100644 vnet/vnet/devices/netmap/netmap.h
 delete mode 100644 vnet/vnet/devices/netmap/netmap_api.c
 delete mode 100644 vnet/vnet/devices/netmap/node.c
 delete mode 100644 vnet/vnet/devices/nic/ixge.c
 delete mode 100644 vnet/vnet/devices/nic/ixge.h
 delete mode 100644 vnet/vnet/devices/nic/sfp.c
 delete mode 100644 vnet/vnet/devices/nic/sfp.h
 delete mode 100644 vnet/vnet/devices/ssvm/node.c
 delete mode 100644 vnet/vnet/devices/ssvm/ssvm_eth.c
 delete mode 100644 vnet/vnet/devices/ssvm/ssvm_eth.h
 delete mode 100644 vnet/vnet/devices/virtio/dir.dox
 delete mode 100644 vnet/vnet/devices/virtio/vhost-user.c
 delete mode 100644 vnet/vnet/devices/virtio/vhost-user.h
 delete mode 100644 vnet/vnet/devices/virtio/vhost_user.api
 delete mode 100644 vnet/vnet/devices/virtio/vhost_user_api.c
 delete mode 100644 vnet/vnet/dhcp/client.c
 delete mode 100644 vnet/vnet/dhcp/client.h
 delete mode 100644 vnet/vnet/dhcp/packet.h
 delete mode 100644 vnet/vnet/dhcp/proxy.h
 delete mode 100644 vnet/vnet/dhcp/proxy_error.def
 delete mode 100644 vnet/vnet/dhcp/proxy_node.c
 delete mode 100644 vnet/vnet/dhcpv6/packet.h
 delete mode 100644 vnet/vnet/dhcpv6/proxy.h
 delete mode 100644 vnet/vnet/dhcpv6/proxy_error.def
 delete mode 100644 vnet/vnet/dhcpv6/proxy_node.c
 delete mode 100644 vnet/vnet/dpo/classify_dpo.c
 delete mode 100644 vnet/vnet/dpo/classify_dpo.h
 delete mode 100644 vnet/vnet/dpo/dpo.c
 delete mode 100644 vnet/vnet/dpo/dpo.h
 delete mode 100644 vnet/vnet/dpo/drop_dpo.c
 delete mode 100644 vnet/vnet/dpo/drop_dpo.h
 delete mode 100644 vnet/vnet/dpo/ip_null_dpo.c
 delete mode 100644 vnet/vnet/dpo/ip_null_dpo.h
 delete mode 100644 vnet/vnet/dpo/load_balance.c
 delete mode 100644 vnet/vnet/dpo/load_balance.h
 delete mode 100644 vnet/vnet/dpo/load_balance_map.c
 delete mode 100644 vnet/vnet/dpo/load_balance_map.h
 delete mode 100644 vnet/vnet/dpo/lookup_dpo.c
 delete mode 100644 vnet/vnet/dpo/lookup_dpo.h
 delete mode 100644 vnet/vnet/dpo/mpls_label_dpo.c
 delete mode 100644 vnet/vnet/dpo/mpls_label_dpo.h
 delete mode 100644 vnet/vnet/dpo/punt_dpo.c
 delete mode 100644 vnet/vnet/dpo/punt_dpo.h
 delete mode 100644 vnet/vnet/dpo/receive_dpo.c
 delete mode 100644 vnet/vnet/dpo/receive_dpo.h
 delete mode 100644 vnet/vnet/ethernet/arp.c
 delete mode 100644 vnet/vnet/ethernet/arp_packet.h
 delete mode 100644 vnet/vnet/ethernet/dir.dox
 delete mode 100644 vnet/vnet/ethernet/error.def
 delete mode 100644 vnet/vnet/ethernet/ethernet.h
 delete mode 100644 vnet/vnet/ethernet/format.c
 delete mode 100644 vnet/vnet/ethernet/init.c
 delete mode 100644 vnet/vnet/ethernet/interface.c
 delete mode 100644 vnet/vnet/ethernet/mac_swap.c
 delete mode 100755 vnet/vnet/ethernet/node.c
 delete mode 100644 vnet/vnet/ethernet/packet.h
 delete mode 100644 vnet/vnet/ethernet/pg.c
 delete mode 100644 vnet/vnet/ethernet/types.def
 delete mode 100644 vnet/vnet/feature/feature.c
 delete mode 100644 vnet/vnet/feature/feature.h
 delete mode 100644 vnet/vnet/feature/registration.c
 delete mode 100644 vnet/vnet/fib/fib.c
 delete mode 100644 vnet/vnet/fib/fib.h
 delete mode 100644 vnet/vnet/fib/fib_api.h
 delete mode 100644 vnet/vnet/fib/fib_attached_export.c
 delete mode 100644 vnet/vnet/fib/fib_attached_export.h
 delete mode 100644 vnet/vnet/fib/fib_entry.c
 delete mode 100644 vnet/vnet/fib/fib_entry.h
 delete mode 100644 vnet/vnet/fib/fib_entry_cover.c
 delete mode 100644 vnet/vnet/fib/fib_entry_cover.h
 delete mode 100644 vnet/vnet/fib/fib_entry_delegate.c
 delete mode 100644 vnet/vnet/fib/fib_entry_delegate.h
 delete mode 100644 vnet/vnet/fib/fib_entry_src.c
 delete mode 100644 vnet/vnet/fib/fib_entry_src.h
 delete mode 100644 vnet/vnet/fib/fib_entry_src_adj.c
 delete mode 100644 vnet/vnet/fib/fib_entry_src_api.c
 delete mode 100644 vnet/vnet/fib/fib_entry_src_default.c
 delete mode 100644 vnet/vnet/fib/fib_entry_src_default_route.c
 delete mode 100644 vnet/vnet/fib/fib_entry_src_interface.c
 delete mode 100644 vnet/vnet/fib/fib_entry_src_lisp.c
 delete mode 100644 vnet/vnet/fib/fib_entry_src_mpls.c
 delete mode 100644 vnet/vnet/fib/fib_entry_src_rr.c
 delete mode 100644 vnet/vnet/fib/fib_entry_src_special.c
 delete mode 100644 vnet/vnet/fib/fib_internal.h
 delete mode 100644 vnet/vnet/fib/fib_node.c
 delete mode 100644 vnet/vnet/fib/fib_node.h
 delete mode 100644 vnet/vnet/fib/fib_node_list.c
 delete mode 100644 vnet/vnet/fib/fib_node_list.h
 delete mode 100644 vnet/vnet/fib/fib_path.c
 delete mode 100644 vnet/vnet/fib/fib_path.h
 delete mode 100644 vnet/vnet/fib/fib_path_ext.c
 delete mode 100644 vnet/vnet/fib/fib_path_ext.h
 delete mode 100644 vnet/vnet/fib/fib_path_list.c
 delete mode 100644 vnet/vnet/fib/fib_path_list.h
 delete mode 100644 vnet/vnet/fib/fib_table.c
 delete mode 100644 vnet/vnet/fib/fib_table.h
 delete mode 100644 vnet/vnet/fib/fib_test.c
 delete mode 100644 vnet/vnet/fib/fib_types.c
 delete mode 100644 vnet/vnet/fib/fib_types.h
 delete mode 100644 vnet/vnet/fib/fib_urpf_list.c
 delete mode 100644 vnet/vnet/fib/fib_urpf_list.h
 delete mode 100644 vnet/vnet/fib/fib_walk.c
 delete mode 100644 vnet/vnet/fib/fib_walk.h
 delete mode 100644 vnet/vnet/fib/ip4_fib.c
 delete mode 100644 vnet/vnet/fib/ip4_fib.h
 delete mode 100644 vnet/vnet/fib/ip6_fib.c
 delete mode 100644 vnet/vnet/fib/ip6_fib.h
 delete mode 100644 vnet/vnet/fib/mpls_fib.c
 delete mode 100644 vnet/vnet/fib/mpls_fib.h
 delete mode 100644 vnet/vnet/flow/flow_report.c
 delete mode 100644 vnet/vnet/flow/flow_report.h
 delete mode 100644 vnet/vnet/flow/flow_report_classify.c
 delete mode 100644 vnet/vnet/flow/flow_report_classify.h
 delete mode 100644 vnet/vnet/flow/ipfix_info_elements.h
 delete mode 100644 vnet/vnet/flow/ipfix_packet.h
 delete mode 100644 vnet/vnet/global_funcs.h
 delete mode 100644 vnet/vnet/gre/error.def
 delete mode 100644 vnet/vnet/gre/gre.api
 delete mode 100644 vnet/vnet/gre/gre.c
 delete mode 100644 vnet/vnet/gre/gre.h
 delete mode 100644 vnet/vnet/gre/gre_api.c
 delete mode 100644 vnet/vnet/gre/interface.c
 delete mode 100644 vnet/vnet/gre/node.c
 delete mode 100644 vnet/vnet/gre/packet.h
 delete mode 100644 vnet/vnet/gre/pg.c
 delete mode 100644 vnet/vnet/handoff.c
 delete mode 100644 vnet/vnet/handoff.h
 delete mode 100644 vnet/vnet/hdlc/error.def
 delete mode 100644 vnet/vnet/hdlc/hdlc.c
 delete mode 100644 vnet/vnet/hdlc/hdlc.h
 delete mode 100644 vnet/vnet/hdlc/node.c
 delete mode 100644 vnet/vnet/hdlc/packet.h
 delete mode 100644 vnet/vnet/hdlc/pg.c
 delete mode 100644 vnet/vnet/interface.api
 delete mode 100644 vnet/vnet/interface.c
 delete mode 100644 vnet/vnet/interface.h
 delete mode 100644 vnet/vnet/interface_api.c
 delete mode 100644 vnet/vnet/interface_cli.c
 delete mode 100644 vnet/vnet/interface_format.c
 delete mode 100644 vnet/vnet/interface_funcs.h
 delete mode 100644 vnet/vnet/interface_output.c
 delete mode 100644 vnet/vnet/ip/dir.dox
 delete mode 100644 vnet/vnet/ip/format.c
 delete mode 100644 vnet/vnet/ip/format.h
 delete mode 100644 vnet/vnet/ip/icmp4.c
 delete mode 100644 vnet/vnet/ip/icmp4.h
 delete mode 100644 vnet/vnet/ip/icmp46_packet.h
 delete mode 100644 vnet/vnet/ip/icmp6.c
 delete mode 100644 vnet/vnet/ip/icmp6.h
 delete mode 100644 vnet/vnet/ip/igmp_packet.h
 delete mode 100644 vnet/vnet/ip/ip.api
 delete mode 100644 vnet/vnet/ip/ip.h
 delete mode 100644 vnet/vnet/ip/ip4.h
 delete mode 100644 vnet/vnet/ip/ip46_cli.c
 delete mode 100644 vnet/vnet/ip/ip4_error.h
 delete mode 100644 vnet/vnet/ip/ip4_format.c
 delete mode 100644 vnet/vnet/ip/ip4_forward.c
 delete mode 100644 vnet/vnet/ip/ip4_input.c
 delete mode 100644 vnet/vnet/ip/ip4_mtrie.c
 delete mode 100644 vnet/vnet/ip/ip4_mtrie.h
 delete mode 100644 vnet/vnet/ip/ip4_packet.h
 delete mode 100644 vnet/vnet/ip/ip4_pg.c
 delete mode 100644 vnet/vnet/ip/ip4_source_and_port_range_check.c
 delete mode 100644 vnet/vnet/ip/ip4_source_check.c
 delete mode 100644 vnet/vnet/ip/ip4_test.c
 delete mode 100644 vnet/vnet/ip/ip6.h
 delete mode 100644 vnet/vnet/ip/ip6_error.h
 delete mode 100644 vnet/vnet/ip/ip6_format.c
 delete mode 100644 vnet/vnet/ip/ip6_forward.c
 delete mode 100644 vnet/vnet/ip/ip6_hop_by_hop.c
 delete mode 100644 vnet/vnet/ip/ip6_hop_by_hop.h
 delete mode 100644 vnet/vnet/ip/ip6_hop_by_hop_packet.h
 delete mode 100644 vnet/vnet/ip/ip6_input.c
 delete mode 100644 vnet/vnet/ip/ip6_neighbor.c
 delete mode 100644 vnet/vnet/ip/ip6_neighbor.h
 delete mode 100644 vnet/vnet/ip/ip6_packet.h
 delete mode 100644 vnet/vnet/ip/ip6_pg.c
 delete mode 100644 vnet/vnet/ip/ip_api.c
 delete mode 100644 vnet/vnet/ip/ip_checksum.c
 delete mode 100644 vnet/vnet/ip/ip_frag.c
 delete mode 100644 vnet/vnet/ip/ip_frag.h
 delete mode 100644 vnet/vnet/ip/ip_init.c
 delete mode 100644 vnet/vnet/ip/ip_input_acl.c
 delete mode 100644 vnet/vnet/ip/ip_packet.h
 delete mode 100644 vnet/vnet/ip/ip_source_and_port_range_check.h
 delete mode 100644 vnet/vnet/ip/lookup.c
 delete mode 100644 vnet/vnet/ip/lookup.h
 delete mode 100644 vnet/vnet/ip/ping.c
 delete mode 100644 vnet/vnet/ip/ping.h
 delete mode 100644 vnet/vnet/ip/ports.def
 delete mode 100644 vnet/vnet/ip/protocols.def
 delete mode 100644 vnet/vnet/ip/punt.c
 delete mode 100644 vnet/vnet/ip/punt.h
 delete mode 100644 vnet/vnet/ip/punt_error.def
 delete mode 100644 vnet/vnet/ip/tcp_packet.h
 delete mode 100644 vnet/vnet/ip/udp.h
 delete mode 100644 vnet/vnet/ip/udp_error.def
 delete mode 100644 vnet/vnet/ip/udp_format.c
 delete mode 100644 vnet/vnet/ip/udp_init.c
 delete mode 100644 vnet/vnet/ip/udp_local.c
 delete mode 100644 vnet/vnet/ip/udp_packet.h
 delete mode 100644 vnet/vnet/ip/udp_pg.c
 delete mode 100644 vnet/vnet/ipsec-gre/dir.dox
 delete mode 100644 vnet/vnet/ipsec-gre/error.def
 delete mode 100644 vnet/vnet/ipsec-gre/interface.c
 delete mode 100644 vnet/vnet/ipsec-gre/ipsec_gre.api
 delete mode 100644 vnet/vnet/ipsec-gre/ipsec_gre.c
 delete mode 100644 vnet/vnet/ipsec-gre/ipsec_gre.h
 delete mode 100644 vnet/vnet/ipsec-gre/ipsec_gre_api.c
 delete mode 100644 vnet/vnet/ipsec-gre/ipsec_gre_doc.md
 delete mode 100644 vnet/vnet/ipsec-gre/node.c
 delete mode 100644 vnet/vnet/ipsec/esp.h
 delete mode 100644 vnet/vnet/ipsec/esp_decrypt.c
 delete mode 100644 vnet/vnet/ipsec/esp_encrypt.c
 delete mode 100644 vnet/vnet/ipsec/ikev2.c
 delete mode 100644 vnet/vnet/ipsec/ikev2.h
 delete mode 100644 vnet/vnet/ipsec/ikev2_cli.c
 delete mode 100644 vnet/vnet/ipsec/ikev2_crypto.c
 delete mode 100644 vnet/vnet/ipsec/ikev2_format.c
 delete mode 100644 vnet/vnet/ipsec/ikev2_payload.c
 delete mode 100644 vnet/vnet/ipsec/ikev2_priv.h
 delete mode 100644 vnet/vnet/ipsec/ipsec.api
 delete mode 100644 vnet/vnet/ipsec/ipsec.c
 delete mode 100644 vnet/vnet/ipsec/ipsec.h
 delete mode 100644 vnet/vnet/ipsec/ipsec_api.c
 delete mode 100644 vnet/vnet/ipsec/ipsec_cli.c
 delete mode 100644 vnet/vnet/ipsec/ipsec_format.c
 delete mode 100644 vnet/vnet/ipsec/ipsec_if.c
 delete mode 100644 vnet/vnet/ipsec/ipsec_if_in.c
 delete mode 100644 vnet/vnet/ipsec/ipsec_if_out.c
 delete mode 100644 vnet/vnet/ipsec/ipsec_input.c
 delete mode 100644 vnet/vnet/ipsec/ipsec_output.c
 delete mode 100644 vnet/vnet/l2/dir.dox
 delete mode 100644 vnet/vnet/l2/feat_bitmap.c
 delete mode 100644 vnet/vnet/l2/feat_bitmap.h
 delete mode 100644 vnet/vnet/l2/l2.api
 delete mode 100644 vnet/vnet/l2/l2_api.c
 delete mode 100644 vnet/vnet/l2/l2_bd.c
 delete mode 100644 vnet/vnet/l2/l2_bd.h
 delete mode 100644 vnet/vnet/l2/l2_bvi.c
 delete mode 100644 vnet/vnet/l2/l2_bvi.h
 delete mode 100644 vnet/vnet/l2/l2_classify.h
 delete mode 100644 vnet/vnet/l2/l2_efp_filter.c
 delete mode 100644 vnet/vnet/l2/l2_efp_filter.h
 delete mode 100644 vnet/vnet/l2/l2_fib.c
 delete mode 100644 vnet/vnet/l2/l2_fib.h
 delete mode 100644 vnet/vnet/l2/l2_flood.c
 delete mode 100644 vnet/vnet/l2/l2_flood.h
 delete mode 100644 vnet/vnet/l2/l2_fwd.c
 delete mode 100644 vnet/vnet/l2/l2_fwd.h
 delete mode 100644 vnet/vnet/l2/l2_input.c
 delete mode 100644 vnet/vnet/l2/l2_input.h
 delete mode 100644 vnet/vnet/l2/l2_input_acl.c
 delete mode 100644 vnet/vnet/l2/l2_input_classify.c
 delete mode 100644 vnet/vnet/l2/l2_input_vtr.c
 delete mode 100644 vnet/vnet/l2/l2_input_vtr.h
 delete mode 100644 vnet/vnet/l2/l2_learn.c
 delete mode 100644 vnet/vnet/l2/l2_learn.h
 delete mode 100644 vnet/vnet/l2/l2_output.c
 delete mode 100644 vnet/vnet/l2/l2_output.h
 delete mode 100644 vnet/vnet/l2/l2_output_acl.c
 delete mode 100644 vnet/vnet/l2/l2_output_classify.c
 delete mode 100644 vnet/vnet/l2/l2_patch.c
 delete mode 100644 vnet/vnet/l2/l2_rw.c
 delete mode 100644 vnet/vnet/l2/l2_rw.h
 delete mode 100644 vnet/vnet/l2/l2_vtr.c
 delete mode 100644 vnet/vnet/l2/l2_vtr.h
 delete mode 100644 vnet/vnet/l2/l2_xcrw.c
 delete mode 100644 vnet/vnet/l2/l2_xcrw.h
 delete mode 100644 vnet/vnet/l2tp/decap.c
 delete mode 100644 vnet/vnet/l2tp/encap.c
 delete mode 100644 vnet/vnet/l2tp/l2tp.api
 delete mode 100644 vnet/vnet/l2tp/l2tp.c
 delete mode 100644 vnet/vnet/l2tp/l2tp.h
 delete mode 100644 vnet/vnet/l2tp/l2tp_api.c
 delete mode 100644 vnet/vnet/l2tp/packet.h
 delete mode 100644 vnet/vnet/l2tp/pg.c
 delete mode 100644 vnet/vnet/l3_types.h
 delete mode 100644 vnet/vnet/lawful-intercept/lawful_intercept.c
 delete mode 100644 vnet/vnet/lawful-intercept/lawful_intercept.h
 delete mode 100644 vnet/vnet/lawful-intercept/node.c
 delete mode 100644 vnet/vnet/lisp-cp/control.c
 delete mode 100644 vnet/vnet/lisp-cp/control.h
 delete mode 100644 vnet/vnet/lisp-cp/gid_dictionary.c
 delete mode 100644 vnet/vnet/lisp-cp/gid_dictionary.h
 delete mode 100644 vnet/vnet/lisp-cp/lisp.api
 delete mode 100644 vnet/vnet/lisp-cp/lisp_api.c
 delete mode 100644 vnet/vnet/lisp-cp/lisp_cp_dpo.c
 delete mode 100644 vnet/vnet/lisp-cp/lisp_cp_dpo.h
 delete mode 100644 vnet/vnet/lisp-cp/lisp_cp_messages.h
 delete mode 100644 vnet/vnet/lisp-cp/lisp_msg_serdes.c
 delete mode 100644 vnet/vnet/lisp-cp/lisp_msg_serdes.h
 delete mode 100644 vnet/vnet/lisp-cp/lisp_types.c
 delete mode 100644 vnet/vnet/lisp-cp/lisp_types.h
 delete mode 100644 vnet/vnet/lisp-cp/packets.c
 delete mode 100644 vnet/vnet/lisp-cp/packets.h
 delete mode 100644 vnet/vnet/lisp-gpe/decap.c
 delete mode 100644 vnet/vnet/lisp-gpe/dir.dox
 delete mode 100644 vnet/vnet/lisp-gpe/interface.c
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe.api
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe.c
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe.h
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe_adjacency.c
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe_adjacency.h
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe_api.c
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe_error.def
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.h
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe_packet.h
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.c
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.h
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe_tenant.c
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe_tenant.h
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe_tunnel.c
 delete mode 100644 vnet/vnet/lisp-gpe/lisp_gpe_tunnel.h
 delete mode 100644 vnet/vnet/lisp-gpe/rfc.txt
 delete mode 100644 vnet/vnet/llc/llc.c
 delete mode 100644 vnet/vnet/llc/llc.h
 delete mode 100644 vnet/vnet/llc/node.c
 delete mode 100644 vnet/vnet/llc/pg.c
 delete mode 100644 vnet/vnet/lldp/dir.dox
 delete mode 100644 vnet/vnet/lldp/lldp_cli.c
 delete mode 100644 vnet/vnet/lldp/lldp_doc.md
 delete mode 100644 vnet/vnet/lldp/lldp_input.c
 delete mode 100644 vnet/vnet/lldp/lldp_node.c
 delete mode 100644 vnet/vnet/lldp/lldp_node.h
 delete mode 100644 vnet/vnet/lldp/lldp_output.c
 delete mode 100644 vnet/vnet/lldp/lldp_protocol.h
 delete mode 100755 vnet/vnet/map/examples/gen-rules.py
 delete mode 100644 vnet/vnet/map/examples/health_check.c
 delete mode 100755 vnet/vnet/map/examples/test_map.py
 delete mode 100755 vnet/vnet/map/gen-rules.py
 delete mode 100644 vnet/vnet/map/ip4_map.c
 delete mode 100644 vnet/vnet/map/ip4_map_t.c
 delete mode 100644 vnet/vnet/map/ip6_map.c
 delete mode 100644 vnet/vnet/map/ip6_map_t.c
 delete mode 100644 vnet/vnet/map/map.api
 delete mode 100644 vnet/vnet/map/map.c
 delete mode 100644 vnet/vnet/map/map.h
 delete mode 100644 vnet/vnet/map/map_api.c
 delete mode 100644 vnet/vnet/map/map_doc.md
 delete mode 100644 vnet/vnet/map/map_dpo.c
 delete mode 100644 vnet/vnet/map/map_dpo.h
 delete mode 100644 vnet/vnet/map/test.c
 delete mode 100644 vnet/vnet/mcast/mcast.c
 delete mode 100644 vnet/vnet/mcast/mcast.h
 delete mode 100644 vnet/vnet/mcast/mcast_test.c
 delete mode 100644 vnet/vnet/misc.c
 delete mode 100644 vnet/vnet/mpls/error.def
 delete mode 100644 vnet/vnet/mpls/interface.c
 delete mode 100644 vnet/vnet/mpls/mpls.c
 delete mode 100644 vnet/vnet/mpls/mpls.h
 delete mode 100644 vnet/vnet/mpls/mpls_features.c
 delete mode 100644 vnet/vnet/mpls/mpls_lookup.c
 delete mode 100644 vnet/vnet/mpls/mpls_output.c
 delete mode 100644 vnet/vnet/mpls/mpls_tunnel.c
 delete mode 100644 vnet/vnet/mpls/mpls_tunnel.h
 delete mode 100644 vnet/vnet/mpls/mpls_types.h
 delete mode 100644 vnet/vnet/mpls/node.c
 delete mode 100644 vnet/vnet/mpls/packet.h
 delete mode 100644 vnet/vnet/mpls/pg.c
 delete mode 100644 vnet/vnet/osi/node.c
 delete mode 100644 vnet/vnet/osi/osi.c
 delete mode 100644 vnet/vnet/osi/osi.h
 delete mode 100644 vnet/vnet/osi/pg.c
 delete mode 100644 vnet/vnet/pg/cli.c
 delete mode 100644 vnet/vnet/pg/edit.c
 delete mode 100644 vnet/vnet/pg/edit.h
 delete mode 100644 vnet/vnet/pg/example.script
 delete mode 100644 vnet/vnet/pg/init.c
 delete mode 100644 vnet/vnet/pg/input.c
 delete mode 100644 vnet/vnet/pg/output.c
 delete mode 100644 vnet/vnet/pg/pg.h
 delete mode 100644 vnet/vnet/pg/stream.c
 delete mode 100644 vnet/vnet/pipeline.h
 delete mode 100644 vnet/vnet/plugin/p1.c
 delete mode 100644 vnet/vnet/plugin/plugin.h
 delete mode 100644 vnet/vnet/policer/node_funcs.c
 delete mode 100644 vnet/vnet/policer/police.h
 delete mode 100644 vnet/vnet/policer/policer.c
 delete mode 100644 vnet/vnet/policer/policer.h
 delete mode 100644 vnet/vnet/policer/xlate.c
 delete mode 100644 vnet/vnet/policer/xlate.h
 delete mode 100644 vnet/vnet/ppp/error.def
 delete mode 100644 vnet/vnet/ppp/node.c
 delete mode 100644 vnet/vnet/ppp/packet.h
 delete mode 100644 vnet/vnet/ppp/pg.c
 delete mode 100644 vnet/vnet/ppp/ppp.c
 delete mode 100644 vnet/vnet/ppp/ppp.h
 delete mode 100644 vnet/vnet/replication.c
 delete mode 100644 vnet/vnet/replication.h
 delete mode 100644 vnet/vnet/rewrite.c
 delete mode 100644 vnet/vnet/rewrite.h
 delete mode 100644 vnet/vnet/snap/node.c
 delete mode 100644 vnet/vnet/snap/pg.c
 delete mode 100644 vnet/vnet/snap/snap.c
 delete mode 100644 vnet/vnet/snap/snap.h
 delete mode 100644 vnet/vnet/span/node.c
 delete mode 100644 vnet/vnet/span/span.api
 delete mode 100644 vnet/vnet/span/span.c
 delete mode 100644 vnet/vnet/span/span.h
 delete mode 100644 vnet/vnet/span/span.md
 delete mode 100644 vnet/vnet/span/span_api.c
 delete mode 100644 vnet/vnet/sr/dir.dox
 delete mode 100644 vnet/vnet/sr/examples/sr_multicastmap.script
 delete mode 100644 vnet/vnet/sr/rfc_draft_05.txt
 delete mode 100644 vnet/vnet/sr/sr.c
 delete mode 100644 vnet/vnet/sr/sr.h
 delete mode 100644 vnet/vnet/sr/sr_error.def
 delete mode 100644 vnet/vnet/sr/sr_fix_dst_error.def
 delete mode 100644 vnet/vnet/sr/sr_packet.h
 delete mode 100644 vnet/vnet/sr/sr_replicate.c
 delete mode 100644 vnet/vnet/srp/format.c
 delete mode 100644 vnet/vnet/srp/interface.c
 delete mode 100644 vnet/vnet/srp/node.c
 delete mode 100644 vnet/vnet/srp/packet.h
 delete mode 100644 vnet/vnet/srp/pg.c
 delete mode 100644 vnet/vnet/srp/srp.h
 delete mode 100644 vnet/vnet/unix/gdb_funcs.c
 delete mode 100644 vnet/vnet/unix/pcap.c
 delete mode 100644 vnet/vnet/unix/pcap.h
 delete mode 100644 vnet/vnet/unix/pcap2pg.c
 delete mode 100644 vnet/vnet/unix/tap.api
 delete mode 100644 vnet/vnet/unix/tap_api.c
 delete mode 100644 vnet/vnet/unix/tapcli.c
 delete mode 100644 vnet/vnet/unix/tapcli.h
 delete mode 100644 vnet/vnet/unix/tuntap.c
 delete mode 100644 vnet/vnet/unix/tuntap.h
 delete mode 100644 vnet/vnet/vnet.h
 delete mode 100644 vnet/vnet/vnet_all_api_h.h
 delete mode 100644 vnet/vnet/vnet_msg_enum.h
 delete mode 100644 vnet/vnet/vxlan-gpe/decap.c
 delete mode 100644 vnet/vnet/vxlan-gpe/dir.dox
 delete mode 100644 vnet/vnet/vxlan-gpe/encap.c
 delete mode 100644 vnet/vnet/vxlan-gpe/vxlan-gpe-rfc.txt
 delete mode 100644 vnet/vnet/vxlan-gpe/vxlan_gpe.api
 delete mode 100644 vnet/vnet/vxlan-gpe/vxlan_gpe.c
 delete mode 100644 vnet/vnet/vxlan-gpe/vxlan_gpe.h
 delete mode 100644 vnet/vnet/vxlan-gpe/vxlan_gpe_api.c
 delete mode 100644 vnet/vnet/vxlan-gpe/vxlan_gpe_error.def
 delete mode 100644 vnet/vnet/vxlan-gpe/vxlan_gpe_packet.h
 delete mode 100644 vnet/vnet/vxlan/decap.c
 delete mode 100644 vnet/vnet/vxlan/dir.dox
 delete mode 100644 vnet/vnet/vxlan/encap.c
 delete mode 100644 vnet/vnet/vxlan/vxlan.api
 delete mode 100644 vnet/vnet/vxlan/vxlan.c
 delete mode 100644 vnet/vnet/vxlan/vxlan.h
 delete mode 100644 vnet/vnet/vxlan/vxlan_api.c
 delete mode 100644 vnet/vnet/vxlan/vxlan_error.def
 delete mode 100644 vnet/vnet/vxlan/vxlan_packet.h
 delete mode 100644 vpp-api-test/Makefile.am
 delete mode 100644 vpp-api-test/configure.ac
 delete mode 100755 vpp-api-test/scripts/vppctl
 delete mode 100644 vpp-api-test/vat/api_format.c
 delete mode 100644 vpp-api-test/vat/json_format.c
 delete mode 100644 vpp-api-test/vat/json_format.h
 delete mode 100644 vpp-api-test/vat/json_test.c
 delete mode 100644 vpp-api-test/vat/main.c
 delete mode 100644 vpp-api-test/vat/plugin.c
 delete mode 100644 vpp-api-test/vat/plugin.h
 delete mode 100644 vpp-api-test/vat/plugin_api.c
 delete mode 100644 vpp-api-test/vat/restart.c
 delete mode 100644 vpp-api-test/vat/vat.h
 delete mode 100644 vpp-api/python/Makefile.am
 delete mode 100644 vpp-api/python/README.rst
 delete mode 100644 vpp-api/python/pneum/pneum.c
 delete mode 100644 vpp-api/python/pneum/pneum.h
 delete mode 100644 vpp-api/python/pneum/test_pneum.c
 delete mode 100644 vpp-api/python/setup.cfg
 delete mode 100644 vpp-api/python/setup.py
 delete mode 100755 vpp-api/python/tests/test_cli.py
 delete mode 100755 vpp-api/python/tests/test_modules.py
 delete mode 100755 vpp-api/python/tests/test_papi.py
 delete mode 100755 vpp-api/python/tests/test_version.py
 delete mode 100755 vpp-api/python/tests/test_vpp_papi2.py
 delete mode 100644 vpp-api/python/vpp_papi/__init__.py
 delete mode 100644 vpp-api/python/vpp_papi/pneum_wrap.c
 delete mode 100644 vpp-api/python/vpp_papi/vpp_papi.py
 delete mode 100644 vpp/Makefile.am
 delete mode 100644 vpp/app/l2t.c
 delete mode 100644 vpp/app/l2t_l2.c
 delete mode 100644 vpp/app/sticky_hash.c
 delete mode 100644 vpp/app/version.c
 delete mode 100644 vpp/app/vpe_cli.c
 delete mode 100644 vpp/conf/80-vpp.conf
 delete mode 100644 vpp/conf/startup.conf
 delete mode 100644 vpp/conf/startup.uiopcigeneric.conf
 delete mode 100644 vpp/configure.ac
 delete mode 100644 vpp/oam/oam.c
 delete mode 100644 vpp/oam/oam.h
 delete mode 100644 vpp/stats/stats.c
 delete mode 100644 vpp/stats/stats.h
 delete mode 120000 vpp/suffix-rules.mk
 delete mode 100644 vpp/vnet/main.c
 delete mode 100644 vpp/vpp-api/api.c
 delete mode 120000 vpp/vpp-api/api_format.c
 delete mode 100644 vpp/vpp-api/api_main.c
 delete mode 100644 vpp/vpp-api/custom_dump.c
 delete mode 100644 vpp/vpp-api/gmon.c
 delete mode 100644 vpp/vpp-api/json_format.c
 delete mode 100644 vpp/vpp-api/json_format.h
 delete mode 100644 vpp/vpp-api/summary_stats_client.c
 delete mode 100644 vpp/vpp-api/test_client.c
 delete mode 100644 vpp/vpp-api/test_ha.c
 delete mode 120000 vpp/vpp-api/vat.h
 delete mode 100644 vpp/vpp-api/vpe.api
 delete mode 100644 vpp/vpp-api/vpe_all_api_h.h
 delete mode 100644 vpp/vpp-api/vpe_msg_enum.h
 delete mode 100644 vpp/vpp-api/vpp_get_metrics.c
 delete mode 100644 vppapigen/Makefile.am
 delete mode 100644 vppapigen/configure.ac
 delete mode 100644 vppapigen/gram.y
 delete mode 100644 vppapigen/lex.c
 delete mode 100644 vppapigen/lex.h
 delete mode 100644 vppapigen/node.c
 delete mode 100644 vppapigen/node.h
 delete mode 100644 vppinfra/.gitignore
 delete mode 100644 vppinfra/INSTALL
 delete mode 100644 vppinfra/Make.defs
 delete mode 100644 vppinfra/Makefile.am
 delete mode 100644 vppinfra/README
 delete mode 100644 vppinfra/configure.ac
 delete mode 100644 vppinfra/dir.dox
 delete mode 100755 vppinfra/mkinstalldirs
 delete mode 100644 vppinfra/tools/dir.dox
 delete mode 100644 vppinfra/tools/elftool.c
 delete mode 100644 vppinfra/unix_error.def
 delete mode 100644 vppinfra/vppinfra/anneal.c
 delete mode 100644 vppinfra/vppinfra/anneal.h
 delete mode 100644 vppinfra/vppinfra/asm_mips.h
 delete mode 100644 vppinfra/vppinfra/asm_x86.c
 delete mode 100644 vppinfra/vppinfra/asm_x86.h
 delete mode 100644 vppinfra/vppinfra/backtrace.c
 delete mode 100644 vppinfra/vppinfra/bihash_24_8.h
 delete mode 100644 vppinfra/vppinfra/bihash_8_8.h
 delete mode 100644 vppinfra/vppinfra/bihash_doc.h
 delete mode 100644 vppinfra/vppinfra/bihash_template.c
 delete mode 100644 vppinfra/vppinfra/bihash_template.h
 delete mode 100644 vppinfra/vppinfra/bitmap.h
 delete mode 100644 vppinfra/vppinfra/bitops.h
 delete mode 100644 vppinfra/vppinfra/byte_order.h
 delete mode 100644 vppinfra/vppinfra/cache.h
 delete mode 100644 vppinfra/vppinfra/clib.h
 delete mode 100644 vppinfra/vppinfra/cpu.c
 delete mode 100644 vppinfra/vppinfra/cpu.h
 delete mode 100644 vppinfra/vppinfra/dir.dox
 delete mode 100644 vppinfra/vppinfra/dlist.h
 delete mode 100644 vppinfra/vppinfra/elf.c
 delete mode 100644 vppinfra/vppinfra/elf.h
 delete mode 100644 vppinfra/vppinfra/elf_clib.c
 delete mode 100644 vppinfra/vppinfra/elf_clib.h
 delete mode 100644 vppinfra/vppinfra/elog.c
 delete mode 100644 vppinfra/vppinfra/elog.h
 delete mode 100644 vppinfra/vppinfra/error.c
 delete mode 100644 vppinfra/vppinfra/error.h
 delete mode 100644 vppinfra/vppinfra/error_bootstrap.h
 delete mode 100644 vppinfra/vppinfra/fheap.c
 delete mode 100644 vppinfra/vppinfra/fheap.h
 delete mode 100644 vppinfra/vppinfra/fifo.c
 delete mode 100644 vppinfra/vppinfra/fifo.h
 delete mode 100644 vppinfra/vppinfra/format.c
 delete mode 100644 vppinfra/vppinfra/format.h
 delete mode 100644 vppinfra/vppinfra/graph.c
 delete mode 100644 vppinfra/vppinfra/graph.h
 delete mode 100644 vppinfra/vppinfra/hash.c
 delete mode 100644 vppinfra/vppinfra/hash.h
 delete mode 100644 vppinfra/vppinfra/heap.c
 delete mode 100644 vppinfra/vppinfra/heap.h
 delete mode 100644 vppinfra/vppinfra/longjmp.S
 delete mode 100644 vppinfra/vppinfra/longjmp.h
 delete mode 100644 vppinfra/vppinfra/macros.c
 delete mode 100644 vppinfra/vppinfra/macros.h
 delete mode 100644 vppinfra/vppinfra/math.h
 delete mode 100644 vppinfra/vppinfra/md5.c
 delete mode 100644 vppinfra/vppinfra/md5.h
 delete mode 100644 vppinfra/vppinfra/mem.h
 delete mode 100644 vppinfra/vppinfra/mem_mheap.c
 delete mode 100644 vppinfra/vppinfra/memcheck.h
 delete mode 100644 vppinfra/vppinfra/memcpy_avx.h
 delete mode 100644 vppinfra/vppinfra/memcpy_sse3.h
 delete mode 100644 vppinfra/vppinfra/mhash.c
 delete mode 100644 vppinfra/vppinfra/mhash.h
 delete mode 100644 vppinfra/vppinfra/mheap.c
 delete mode 100644 vppinfra/vppinfra/mheap.h
 delete mode 100644 vppinfra/vppinfra/mheap_bootstrap.h
 delete mode 100644 vppinfra/vppinfra/mod_test_hash.c
 delete mode 100644 vppinfra/vppinfra/os.h
 delete mode 100644 vppinfra/vppinfra/pfhash.c
 delete mode 100644 vppinfra/vppinfra/pfhash.h
 delete mode 100644 vppinfra/vppinfra/phash.c
 delete mode 100644 vppinfra/vppinfra/phash.h
 delete mode 100644 vppinfra/vppinfra/pipeline.h
 delete mode 100644 vppinfra/vppinfra/pool.h
 delete mode 100644 vppinfra/vppinfra/ptclosure.c
 delete mode 100644 vppinfra/vppinfra/ptclosure.h
 delete mode 100644 vppinfra/vppinfra/qhash.c
 delete mode 100644 vppinfra/vppinfra/qhash.h
 delete mode 100644 vppinfra/vppinfra/qsort.c
 delete mode 100644 vppinfra/vppinfra/random.c
 delete mode 100644 vppinfra/vppinfra/random.h
 delete mode 100644 vppinfra/vppinfra/random_buffer.c
 delete mode 100644 vppinfra/vppinfra/random_buffer.h
 delete mode 100644 vppinfra/vppinfra/random_isaac.c
 delete mode 100644 vppinfra/vppinfra/random_isaac.h
 delete mode 100644 vppinfra/vppinfra/serialize.c
 delete mode 100644 vppinfra/vppinfra/serialize.h
 delete mode 100644 vppinfra/vppinfra/slist.c
 delete mode 100644 vppinfra/vppinfra/slist.h
 delete mode 100644 vppinfra/vppinfra/smp.c
 delete mode 100644 vppinfra/vppinfra/smp.h
 delete mode 100644 vppinfra/vppinfra/smp_fifo.c
 delete mode 100644 vppinfra/vppinfra/smp_fifo.h
 delete mode 100644 vppinfra/vppinfra/socket.c
 delete mode 100644 vppinfra/vppinfra/socket.h
 delete mode 100644 vppinfra/vppinfra/sparse_vec.h
 delete mode 100644 vppinfra/vppinfra/std-formats.c
 delete mode 100644 vppinfra/vppinfra/string.c
 delete mode 100644 vppinfra/vppinfra/string.h
 delete mode 100644 vppinfra/vppinfra/test_bihash_template.c
 delete mode 100644 vppinfra/vppinfra/test_dlist.c
 delete mode 100644 vppinfra/vppinfra/test_elf.c
 delete mode 100644 vppinfra/vppinfra/test_elog.c
 delete mode 100644 vppinfra/vppinfra/test_fifo.c
 delete mode 100644 vppinfra/vppinfra/test_format.c
 delete mode 100644 vppinfra/vppinfra/test_hash.c
 delete mode 100644 vppinfra/vppinfra/test_heap.c
 delete mode 100644 vppinfra/vppinfra/test_longjmp.c
 delete mode 100644 vppinfra/vppinfra/test_macros.c
 delete mode 100644 vppinfra/vppinfra/test_md5.c
 delete mode 100644 vppinfra/vppinfra/test_mheap.c
 delete mode 100644 vppinfra/vppinfra/test_pfhash.c
 delete mode 100644 vppinfra/vppinfra/test_phash.c
 delete mode 100644 vppinfra/vppinfra/test_pool.c
 delete mode 100644 vppinfra/vppinfra/test_pool_iterate.c
 delete mode 100644 vppinfra/vppinfra/test_ptclosure.c
 delete mode 100644 vppinfra/vppinfra/test_qhash.c
 delete mode 100644 vppinfra/vppinfra/test_random.c
 delete mode 100644 vppinfra/vppinfra/test_random_isaac.c
 delete mode 100644 vppinfra/vppinfra/test_serialize.c
 delete mode 100644 vppinfra/vppinfra/test_slist.c
 delete mode 100644 vppinfra/vppinfra/test_socket.c
 delete mode 100644 vppinfra/vppinfra/test_time.c
 delete mode 100644 vppinfra/vppinfra/test_timing_wheel.c
 delete mode 100644 vppinfra/vppinfra/test_vec.c
 delete mode 100644 vppinfra/vppinfra/test_vec.h
 delete mode 100644 vppinfra/vppinfra/test_vhash.c
 delete mode 100644 vppinfra/vppinfra/test_zvec.c
 delete mode 100644 vppinfra/vppinfra/time.c
 delete mode 100644 vppinfra/vppinfra/time.h
 delete mode 100644 vppinfra/vppinfra/timer.c
 delete mode 100644 vppinfra/vppinfra/timer.h
 delete mode 100644 vppinfra/vppinfra/timing_wheel.c
 delete mode 100644 vppinfra/vppinfra/timing_wheel.h
 delete mode 100644 vppinfra/vppinfra/types.h
 delete mode 100644 vppinfra/vppinfra/unformat.c
 delete mode 100644 vppinfra/vppinfra/unix-formats.c
 delete mode 100644 vppinfra/vppinfra/unix-kelog.c
 delete mode 100644 vppinfra/vppinfra/unix-misc.c
 delete mode 100644 vppinfra/vppinfra/unix.h
 delete mode 100644 vppinfra/vppinfra/valgrind.h
 delete mode 100644 vppinfra/vppinfra/vec.c
 delete mode 100644 vppinfra/vppinfra/vec.h
 delete mode 100644 vppinfra/vppinfra/vec_bootstrap.h
 delete mode 100644 vppinfra/vppinfra/vector.c
 delete mode 100644 vppinfra/vppinfra/vector.h
 delete mode 100644 vppinfra/vppinfra/vector_altivec.h
 delete mode 100644 vppinfra/vppinfra/vector_funcs.h
 delete mode 100644 vppinfra/vppinfra/vector_iwmmxt.h
 delete mode 100644 vppinfra/vppinfra/vector_neon.h
 delete mode 100644 vppinfra/vppinfra/vector_sse2.h
 delete mode 100644 vppinfra/vppinfra/vhash.c
 delete mode 100644 vppinfra/vppinfra/vhash.h
 delete mode 100644 vppinfra/vppinfra/vm_linux_kernel.h
 delete mode 100644 vppinfra/vppinfra/vm_standalone.h
 delete mode 100644 vppinfra/vppinfra/vm_unix.h
 delete mode 100644 vppinfra/vppinfra/xxhash.h
 delete mode 100644 vppinfra/vppinfra/xy.h
 delete mode 100644 vppinfra/vppinfra/zvec.c
 delete mode 100644 vppinfra/vppinfra/zvec.h

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 292b0d28..1b75779a 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ endif
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
-DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
+DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
@@ -147,7 +147,7 @@ else
 	@ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/gcc
 	@ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/g++
 endif
-	@make -C $(BR) V=$(V) is_build_tool=yes vppapigen-install
+	@make -C $(BR) V=$(V) is_build_tool=yes tools-install
 	@touch $@
 
 bootstrap: $(BR)/.bootstrap.ok
diff --git a/build-data/packages/cavium-dpdk.mk b/build-data/packages/cavium-dpdk.mk
deleted file mode 100644
index ce8ee228..00000000
--- a/build-data/packages/cavium-dpdk.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# Temporary until Cavium upstreams their work
-
-cavium-dpdk_configure =							\
-  src_dir=$(call find_source_fn,$(PACKAGE_SOURCE)) ;			\
-  dst_dir=$(PACKAGE_BUILD_DIR) ;					\
-  tar -C $${src_dir} -cf - . | tar -C $${dst_dir} -xf - ;		\
-  cd $${dst_dir} ;							\
-  : colossal hemorrhoid to configure headroom	;			\
-  if [ x$($(PACKAGE)_configure_args_$(PLATFORM)) = "x" ] ; then		\
-    HR=256 ;								\
-  else									\
-     dpdk_configure_args=$($(PACKAGE)_configure_args_$(PLATFORM)) ;	\
-     if [ $$dpdk_configure_args = "--with-headroom=256" ] ; then	\
-	HR=256 ;							\
-     elif [ $$dpdk_configure_args = "--with-headroom=384" ] ; then	\
-	HR=384 ;							\
-     else								\
-	HR=256 ;							\
-     fi ;								\
-  fi ;									\
-  env HR=$$HR								\
-     spp -o								\
-  $(PACKAGE_BUILD_DIR)/config/common_linuxapp				\
-  $(PACKAGE_BUILD_DIR)/config/common_linuxapp.spp			\
-	;								\
-  env $(CONFIGURE_ENV)							\
-    make config T=arm64-thunderx-linuxapp-gcc RTE_ARCH=arm64		\
-        CC=aarch64-thunderx-linux-gnu-gcc V=0				\
-        RTE_SDK=$(PACKAGE_BUILD_DIR)					\
-        RTE_TARGET=arm-default-linuxapp-gcc
-
-# Note: add e.g. "-O0" to EXTRA_CFLAGS if desired: EXTRA_CFLAGS='-g -O0'
-
-cavium-dpdk_make_args = install T=arm64-thunderx-linuxapp-gcc RTE_ARCH=arm64 \
-        CC=aarch64-thunderx-linux-gnu-gcc V=0				     \
-        RTE_SDK=$(PACKAGE_BUILD_DIR)					     \
-        RTE_TARGET=arm-default-linuxapp-gcc
-
-cavium-dpdk_install =						\
-  src_dir=$(PACKAGE_BUILD_DIR) ;				\
-  dst_dir=$(PACKAGE_INSTALL_DIR) ;				\
-  tar -h -C $${src_dir}/arm64-thunderx-linuxapp-gcc -cf - .	\
-    | tar -C $${dst_dir} -xf - 
-
-# dpdk libraries end up in .../lib not .../lib64. Fix it.
-cavium-dpdk_post_install =							\
-  if [ "$(arch_lib_dir)" != "lib" ] ; then					\
-     mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir) ;				\
-     cd $(PACKAGE_INSTALL_DIR)/lib		     ;				\
-     tar cf - . | ( cd $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir); tar xf - ) ;	\
-  fi 
-
-# nothing to install, all static libraries
-cavium-dpdk_image_include = echo
-
diff --git a/build-data/packages/g2.mk b/build-data/packages/g2.mk
index 258eff1d..9b760e63 100644
--- a/build-data/packages/g2.mk
+++ b/build-data/packages/g2.mk
@@ -1,5 +1,3 @@
-g2_configure_depend = vppinfra-install
+g2_source = src
 
-g2_CPPFLAGS = $(call installed_includes_fn, vppinfra)
-
-g2_LDFLAGS = $(call installed_libs_fn, vppinfra)
+g2_configure_args = --disable-vlib --disable-svm --enable-g2
diff --git a/build-data/packages/gmod.mk b/build-data/packages/gmod.mk
index a6ba42d0..6fa7e0f1 100644
--- a/build-data/packages/gmod.mk
+++ b/build-data/packages/gmod.mk
@@ -1,9 +1,9 @@
-gmod_configure_depend = vppinfra-install svm-install
+gmod_configure_depend = vpp-install
 
 gmod_configure_args = --libdir=$(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/ganglia
 
-gmod_CPPFLAGS = $(call installed_includes_fn, vppinfra svm)
+gmod_CPPFLAGS = $(call installed_includes_fn, vpp)
 gmod_CPPFLAGS += -I/usr/include/apr-1.0 -I/usr/include/apr-1 -I/usr/include
-gmod_LDFLAGS = $(call installed_libs_fn, vppinfra svm)
+gmod_LDFLAGS = $(call installed_libs_fn, vpp)
 
 gmod_image_include = echo $(arch_lib_dir)/ganglia/libgmodvpp.so etc
diff --git a/build-data/packages/perftool.mk b/build-data/packages/perftool.mk
index 300f902b..e582c316 100644
--- a/build-data/packages/perftool.mk
+++ b/build-data/packages/perftool.mk
@@ -1,5 +1,4 @@
-perftool_configure_depend = vppinfra-install
+perftool_source = src
 
-perftool_CPPFLAGS = $(call installed_includes_fn, vppinfra)
+perftool_configure_args = --disable-vlib --disable-svm --enable-perftool
 
-perftool_LDFLAGS = $(call installed_libs_fn, vppinfra)
diff --git a/build-data/packages/plugins.mk b/build-data/packages/plugins.mk
index 44a8e2bd..b4d67a28 100644
--- a/build-data/packages/plugins.mk
+++ b/build-data/packages/plugins.mk
@@ -1,24 +1,13 @@
 plugins_configure_depend = 			\
-    vppinfra-install 				\
-    vlib-api-install 				\
-    vpp-api-test-install 			\
-    vnet-install                                \
-    vlib-install 				\
-    vpp-api-install
+    vpp-api-install				\
+    vpp-install
 
-plugins_CPPFLAGS = $(call installed_includes_fn, 	\
-    vppinfra 					\
-    vlib 					\
-    vnet 					\
-    svm 					\
-    vpp-api-test 				\
-    vlib-api 				\
-    vpp-api)					
+plugins_CPPFLAGS = $(call installed_includes_fn, \
+    vpp  \
+    vpp-api)
 
-plugins_LDFLAGS = $(call installed_libs_fn, 	\
-    vppinfra					\
-    vlib					\
-    vlib-api)
+plugins_LDFLAGS = $(call installed_libs_fn,     \
+    vpp)
 
 ifeq ($($(PLATFORM)_enable_tests),yes)
 plugins_configure_args += --enable-tests
diff --git a/build-data/packages/src.mk b/build-data/packages/src.mk
new file mode 100644
index 00000000..e69de29b
diff --git a/build-data/packages/svm.mk b/build-data/packages/svm.mk
deleted file mode 100644
index 3971fe82..00000000
--- a/build-data/packages/svm.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-svm_top_srcdir = $(call find_source_fn,svm)
-svm_configure_depend = vppinfra-install
-
-svm_CPPFLAGS = $(call installed_includes_fn, vppinfra)
-svm_LDFLAGS = $(call installed_libs_fn, vppinfra)
diff --git a/build-data/packages/vlib-api-cavium-dpdk.mk b/build-data/packages/vlib-api-cavium-dpdk.mk
deleted file mode 100644
index 7a4fe2cd..00000000
--- a/build-data/packages/vlib-api-cavium-dpdk.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-vlib-api-cavium-dpdk_source = vlib-api
-
-vlib-api-cavium-dpdk_configure_depend = vppinfra-install svm-install vlib-cavium-dpdk-install
-
-vlib-api-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn, vppinfra svm vlib-cavium-dpdk)
-vlib-api-cavium-dpdk_LDFLAGS = $(call installed_libs_fn, vppinfra svm vlib-cavium-dpdk)
diff --git a/build-data/packages/vlib-api.mk b/build-data/packages/vlib-api.mk
deleted file mode 100644
index 29b0d17d..00000000
--- a/build-data/packages/vlib-api.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-vlib-api_configure_depend = vppinfra-install svm-install vlib-install
-
-vlib-api_CPPFLAGS = $(call installed_includes_fn, vppinfra svm vlib)
-vlib-api_LDFLAGS = $(call installed_libs_fn, vppinfra svm vlib)
diff --git a/build-data/packages/vlib-cavium-dpdk.mk b/build-data/packages/vlib-cavium-dpdk.mk
deleted file mode 100644
index 0f2f132d..00000000
--- a/build-data/packages/vlib-cavium-dpdk.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-vlib-cavium-dpdk_source = vlib
-vlib-cavium-dpdk_configure_depend = vppinfra-install cavium-dpdk-install
-
-vlib-cavium-dpdk_configure_args += --with-dpdk
-
-vlib-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn, vppinfra cavium-dpdk)
-vlib-cavium-dpdk_LDFLAGS = $(call installed_libs_fn, vppinfra cavium-dpdk)
diff --git a/build-data/packages/vlib.mk b/build-data/packages/vlib.mk
deleted file mode 100644
index 2172708d..00000000
--- a/build-data/packages/vlib.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-vlib_configure_depend = vppinfra-install
-
-vlib_CPPFLAGS = $(call installed_includes_fn, vppinfra)
-vlib_LDFLAGS = $(call installed_libs_fn, vppinfra)
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-vlib_configure_args += --with-dpdk
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-vlib_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-vlib_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-vlib_configure_depend += dpdk-install
-vlib_CPPFLAGS += $(call installed_includes_fn, dpdk)
-vlib_LDFLAGS += $(call installed_libs_fn, dpdk)
-endif
-endif
diff --git a/build-data/packages/vnet-cavium-dpdk.mk b/build-data/packages/vnet-cavium-dpdk.mk
deleted file mode 100644
index 4c35b04d..00000000
--- a/build-data/packages/vnet-cavium-dpdk.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-vnet-cavium-dpdk_source = vnet
-
-vnet-cavium-dpdk_configure_depend =		\
-    vppinfra-install				\
-    cavium-dpdk-install				\
-    svm-install					\
-    vlib-api-cavium-dpdk-install		\
-    vlib-cavium-dpdk-install 
-
-
-vnet-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn,	\
-    vppinfra							\
-    cavium-dpdk							\
-    openssl							\
-    svm								\
-    vlib-cavium-dpdk						\
-    vlib-api-cavium-dpdk)
-
-vnet-cavium-dpdk_LDFLAGS = $(call installed_libs_fn,	\
-    vppinfra						\
-    cavium-dpdk						\
-    openssl						\
-    svm							\
-    vlib-cavium-dpdk					\
-    vlib-api-cavium-dpdk)
-
-# Platform dependent configure flags
-vnet-cavium-dpdk_configure_args += $(vnet-cavium-dpdk_configure_args_$(PLATFORM))
-
diff --git a/build-data/packages/vpp-api-test-cavium-dpdk.mk b/build-data/packages/vpp-api-test-cavium-dpdk.mk
deleted file mode 100644
index e352317f..00000000
--- a/build-data/packages/vpp-api-test-cavium-dpdk.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-vpp-api-test-cavium-dpdk_source = vpp-api-test
-
-vpp-api-test-cavium-dpdk_configure_depend =	\
-	vppinfra-install			\
-	cavium-dpdk-install			\
-	svm-install				\
-	vlib-api-cavium-dpdk-install		\
-	vlib-cavium-dpdk-install		\
-	vnet-cavium-dpdk-install		\
-	vpp-cavium-dpdk-install
-
-# 
-vpp-api-test-cavium-dpdk_configure_args = --with-dpdk 
-
-vpp-api-test-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra							\
-	cavium-dpdk							\
-	svm								\
-	vlib-cavium-dpdk						\
-	vlib-api-cavium-dpdk						\
-	vnet-cavium-dpdk						\
-	vpp-cavium-dpdk)
-
-vpp-api-test-cavium-dpdk_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra						\
-	cavium-dpdk						\
-	svm							\
-	vlib-cavium-dpdk					\
-	vlib-api-cavium-dpdk					\
-	vnet-cavium-dpdk					\
-	vpp-cavium-dpdk)
-
diff --git a/build-data/packages/vpp-api-test.mk b/build-data/packages/vpp-api-test.mk
deleted file mode 100644
index c9eae367..00000000
--- a/build-data/packages/vpp-api-test.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-vpp-api-test_configure_depend =			\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
-	vpp-install
-
-vpp-api-test_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra					\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp)
-
-vpp-api-test_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra					\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp)
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-vpp-api-test_configure_args = --with-dpdk
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-vpp-api-test_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-vpp-api-test_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-vpp-api-test_configure_depend += dpdk-install
-vpp-api-test_CPPFLAGS += $(call installed_includes_fn, dpdk)
-vpp-api-test_LDFLAGS += $(call installed_libs_fn, dpdk)
-endif
-endif
-ifeq ($($(PLATFORM)_uses_dpdk_cryptodev),yes)
-vpp-api-test_configure_args += --with-dpdk-crypto
-endif
-
diff --git a/build-data/packages/vpp-api.mk b/build-data/packages/vpp-api.mk
index 4937023a..d9e8d72e 100644
--- a/build-data/packages/vpp-api.mk
+++ b/build-data/packages/vpp-api.mk
@@ -1,23 +1,9 @@
 vpp-api_configure_depend =			\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
 	vpp-install
 
 vpp-api_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra					\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
 	vpp)
 
-vpp-api_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra				\
-	svm					\
-	vlib					\
-	vlib-api)
+vpp-api_LDFLAGS =
 
 vpp-api_CPPFLAGS += -I/usr/lib/jvm/java-8-openjdk-amd64/include
diff --git a/build-data/packages/vpp-cavium-dpdk.mk b/build-data/packages/vpp-cavium-dpdk.mk
deleted file mode 100644
index 704e3a95..00000000
--- a/build-data/packages/vpp-cavium-dpdk.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-vpp-cavium-dpdk_source = vpp
-
-vpp-cavium-dpdk_configure_depend =		\
-	vppinfra-install			\
-	cavium-dpdk-install			\
-	svm-install				\
-	vlib-api-cavium-dpdk-install		\
-	vlib-cavium-dpdk-install		\
-	vnet-cavium-dpdk-install
-
-# Platform dependent configure flags
-vpp-cavium-dpdk_configure_args += $(vpp-cavium-dpdk_configure_args_$(PLATFORM))
-
-vpp-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra						\
-	cavium-dpdk						\
-        openssl							\
-	svm							\
-	vlib-cavium-dpdk					\
-	vlib-api-cavium-dpdk					\
-	vnet-cavium-dpdk)
-
-vpp-cavium-dpdk_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra					\
-	cavium-dpdk					\
-	openssl						\
-	svm						\
-	vlib-cavium-dpdk				\
-	vlib-api-cavium-dpdk				\
-	vnet-cavium-dpdk)
diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index a3d60528..fe68cd82 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -1,11 +1,5 @@
-vpp_configure_depend =				\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
+vpp_source = src
 
-# 
 ifeq ($($(PLATFORM)_dpdk_shared_lib),yes)
 vpp_configure_args = --enable-dpdk-shared
 else
@@ -16,25 +10,8 @@ endif
 vpp_configure_args += $(vpp_configure_args_$(PLATFORM))
 
 
-vpp_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra				\
-	svm					\
-	vlib					\
-	vlib-api				\
-	vnet)
-
-vpp_LDFLAGS = $(call installed_libs_fn,		\
-	vppinfra				\
-	svm					\
-	vlib					\
-	vlib-api				\
-	vnet)
-
-# include & link with openssl only if needed
-ifneq ($($(PLATFORM)_uses_openssl),no)
-vpp_CPPFLAGS += $(call installed_includes_fn, openssl)
-vpp_LDFLAGS += $(call installed_libs_fn, openssl)
-endif
+vpp_CPPFLAGS =
+vpp_LDFLAGS =
 
 ifneq ($($(PLATFORM)_uses_dpdk),no)
 ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
diff --git a/build-data/packages/vppinfra.mk b/build-data/packages/vppinfra.mk
deleted file mode 100644
index 6ca6eb24..00000000
--- a/build-data/packages/vppinfra.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-
-ifeq ($($(PLATFORM)_enable_tests),yes)
-vppinfra_configure_args += --enable-tests
-endif
-
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index a568c7a0..88dd3ed8 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -60,15 +60,15 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	 deb/debian/vpp-dpdk-dev.install ;				\
 									\
 	: bin package needs startup config ; 				\
-	echo ../../vpp/conf/startup.conf /etc/vpp 			\
+	echo ../../src/vpp/conf/startup.conf /etc/vpp 			\
 	   >> deb/debian/vpp.install ;					\
 									\
 	: and sysctl config ; 						\
-	echo ../../vpp/conf/80-vpp.conf /etc/sysctl.d 			\
+	echo ../../src/vpp/conf/80-vpp.conf /etc/sysctl.d 		\
 	   >> deb/debian/vpp.install ;					\
 									\
 	: dev package needs a couple of additions ;			\
-	echo ../build-tool-native/vppapigen/vppapigen /usr/bin		\
+	echo ../build-tool-native/tools/vppapigen /usr/bin		\
 	   >> deb/debian/vpp-dev.install ;				\
 	echo ../../vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin		\
 	   >> deb/debian/vpp-dev.install ;				\
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 97ddc57d..513a4db4 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -29,11 +29,9 @@ vpp_uses_dpdk = yes
 # Uncoment to enable building unit tests
 # vpp_enable_tests = yes
 
-vpp_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \
-	vpp-api gmod plugins
+vpp_root_packages = vpp vpp-api gmod plugins
 
 vpp_configure_args_vpp = --with-dpdk
-vnet_configure_args_vpp = --with-dpdk
 
 # Set these parameters carefully. The vlib_buffer_t is 128 bytes, i.e.
 vlib_configure_args_vpp = --with-pre-data=128
diff --git a/build-data/platforms/vpp_lite.mk b/build-data/platforms/vpp_lite.mk
index ef2ec444..55805d10 100644
--- a/build-data/platforms/vpp_lite.mk
+++ b/build-data/platforms/vpp_lite.mk
@@ -27,8 +27,7 @@ vpp_lite_uses_dpdk = no
 # Uncoment to enable building unit tests
 #vpp_lite_enable_tests = yes
 
-vpp_lite_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \
-	vpp-api gmod
+vpp_lite_root_packages = vpp vpp-api gmod
 
 vlib_configure_args_vpp_lite = --with-pre-data=128
 
diff --git a/build-data/suffix-rules.mk b/build-data/suffix-rules.mk
deleted file mode 100644
index e3eeb922..00000000
--- a/build-data/suffix-rules.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Shared suffix rules
-# Please do not set "SUFFIXES = .api.h .api" here
-
-%.api.h: %.api
-	@echo "  APIGEN  " $@ ;					\
-	mkdir -p `dirname $@` ;					\
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
-	| vppapigen --input - --output $@ --show-name $@
-
-%.api.json: %.api
-	@echo "  JSON APIGEN  " $@ ;				\
-	mkdir -p `dirname $@` ;					\
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
-	| vppapigen --input - --json $@
diff --git a/build-root/bootstrap.sh b/build-root/bootstrap.sh
index f83734fd..2949c180 100755
--- a/build-root/bootstrap.sh
+++ b/build-root/bootstrap.sh
@@ -45,7 +45,7 @@ cd $wsroot
 
 cd $build_root
 echo Compile native tools
-for tool in vppapigen
+for tool in tools
 do
     make V=0 is_build_tool=yes $tool-install
 done
diff --git a/build-root/packages/src.mk b/build-root/packages/src.mk
new file mode 100644
index 00000000..db48ed58
--- /dev/null
+++ b/build-root/packages/src.mk
@@ -0,0 +1,4 @@
+# nothing
+
+
+
diff --git a/build-root/packages/tools.mk b/build-root/packages/tools.mk
new file mode 100644
index 00000000..506e024b
--- /dev/null
+++ b/build-root/packages/tools.mk
@@ -0,0 +1,3 @@
+tools_source = src
+tools_configure_args = --disable-vlib
+
diff --git a/build-root/packages/vppapigen.mk b/build-root/packages/vppapigen.mk
deleted file mode 100644
index 0d284631..00000000
--- a/build-root/packages/vppapigen.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-vppapigen_configure_depend = vppinfra-install
-
-vppapigen_CPPFLAGS = $(call installed_includes_fn, vppinfra)
-
-vppapigen_LDFLAGS = $(call installed_libs_fn, vppinfra)
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index 194d205f..654424c0 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -97,12 +97,10 @@ groupadd -f -r vpp
 mkdir -p -m755 %{buildroot}%{_bindir}
 mkdir -p -m755 %{buildroot}%{_unitdir}
 install -p -m 755 %{_mu_build_dir}/%{_vpp_install_dir}/*/bin/* %{buildroot}%{_bindir}
-install -p -m 755 %{_mu_build_dir}/%{_vpp_build_dir}/vppapigen/vppapigen %{buildroot}%{_bindir}
+install -p -m 755 %{_mu_build_dir}/%{_vpp_build_dir}/tools/vppapigen %{buildroot}%{_bindir}
 
-# core api
+# api
 mkdir -p -m755 %{buildroot}/usr/share/vpp/api
-install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/vpp-api/vpe.api.json %{buildroot}/usr/share/vpp/api
-install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vlib-api/vlibmemory/memclnt.api.json %{buildroot}/usr/share/vpp/api
 
 #
 # configs
@@ -110,8 +108,8 @@ install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vlib-api/vlibmemory/memcl
 mkdir -p -m755 %{buildroot}/etc/vpp
 mkdir -p -m755 %{buildroot}/etc/sysctl.d
 install -p -m 644 %{_mu_build_dir}/rpm/vpp.service %{buildroot}%{_unitdir}
-install -p -m 644 %{_mu_build_dir}/../vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf
-install -p -m 644 %{_mu_build_dir}/../vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
+install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf
+install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
 #
 # libraries
 #
@@ -128,7 +126,7 @@ do
 	( cd %{buildroot}%{_libdir} && 
           ln -fs $file $(echo $file | sed -e 's/\(\.so\)\.[0-9]\+.*/\1/') )
 done
-for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vnet -type f -name '*.api.json' -print )
+for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/vpp/api  -type f -name '*.api.json' -print )
 do
 	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
 done
@@ -178,12 +176,24 @@ do
            %{buildroot}/usr/lib/vpp_plugins/$file
 done
 
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins && find -type f -print)
+do
+        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins/$file \
+           %{buildroot}/usr/lib/vpp_plugins/$file
+done
+
 for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins && find -type f -print)
 do
         install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins/$file \
            %{buildroot}/usr/lib/vpp_api_test_plugins/$file
 done
 
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins && find -type f -print)
+do
+        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins/$file \
+           %{buildroot}/usr/lib/vpp_api_test_plugins/$file
+done
+
 for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/plugins -type f -name '*.api.json' -print )
 do
 	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
diff --git a/build-root/scripts/find-plugins-contents b/build-root/scripts/find-plugins-contents
index a5a52acf..4108f790 100755
--- a/build-root/scripts/find-plugins-contents
+++ b/build-root/scripts/find-plugins-contents
@@ -2,14 +2,14 @@
 
 rm -f $2
 
-for i in ${1}/plugins/lib64/vpp_plugins/*.so; do
+for i in ${1}/{plugins,vpp}/lib64/vpp_plugins/*.so; do
 	echo ../${i} /usr/lib/vpp_plugins >> ${2}
 done
 
-for i in ${1}/plugins/lib64/vpp_api_test_plugins/*.so; do
+for i in ${1}/{plugins,vpp}/lib64/vpp_api_test_plugins/*.so; do
 	echo ../${i} /usr/lib/vpp_api_test_plugins >> ${2}
 done
 
-for i in $(find ${1}/plugins -name *.api.json -type f -print); do
+for i in $(find ${1}/plugins ${1}/vpp/share/vpp/api/plugins/ -name *.api.json -type f -print); do
     echo ../${i} /usr/share/vpp/api/ >> ${2}
 done
diff --git a/build-root/scripts/find-python-api-contents b/build-root/scripts/find-python-api-contents
index 9b390e75..24e8532c 100755
--- a/build-root/scripts/find-python-api-contents
+++ b/build-root/scripts/find-python-api-contents
@@ -2,7 +2,7 @@
 
 rm -f $2
 
-for i in $(find ${1}/vpp-api/lib/python2.7/site-packages/ -type f -print); do
+for i in $(find ${1}/{vpp,vpp-api}/lib/python2.7/site-packages/ -type f -print); do
     echo ../${i} /usr/lib/python2.7/site-packages/vpp_papi >> ${2}
 done
 
diff --git a/g2/Makefile.am b/g2/Makefile.am
deleted file mode 100644
index 8457c272..00000000
--- a/g2/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign
-
-bin_PROGRAMS = g2
-
-AM_CFLAGS = -Wall 
-
-g2_SOURCES =					\
-  clib.c					\
-  cpel.c					\
-  cpel.h					\
-  events.c					\
-  g2.h						\
-  main.c					\
-  menu1.c					\
-  pointsel.c					\
-  props.c					\
-  props.h					\
-  g2version.c					\
-  view1.c
-
-g2_LDADD = $(g2_LIBS) -lvppinfra -lpthread -lm
diff --git a/g2/clib.c b/g2/clib.c
deleted file mode 100644
index d0cd6195..00000000
--- a/g2/clib.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2009-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/fcntl.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/elog.h>
-#include <pwd.h>
-#include <stdarg.h>
-#include <time.h>
-#include "cpel.h"
-#include "g2.h"
-
-int widest_track_format;
-
-typedef struct bound_track_ {
-    u32 track;
-    u8  *track_str;
-} bound_track_t;
-
-bound_track_t *bound_tracks;
-
-uword *the_evtdef_hash; /* (event-id, event-definition) hash */
-uword *the_trackdef_hash; /* (track-id, track-definition) hash */
-
-elog_main_t elog_main;
-
-void *get_clib_event (unsigned int datum)
-{
-    elog_event_t *ep = vec_elt_at_index (elog_main.events, datum);
-    return (void *)ep;
-}
-
-/*
- * read_clib_file
- */
-int read_clib_file(char *clib_file)
-{
-    static FILE *ofp;
-    clib_error_t *error = 0;
-    int i;
-    elog_main_t *em = &elog_main;
-    double starttime, delta;
-
-    vec_free(em->events);
-    vec_free(em->event_types);
-    if (the_trackdef_hash)
-        hash_free(the_trackdef_hash);
-
-    the_trackdef_hash = hash_create (0, sizeof (uword));
-
-    error = elog_read_file (&elog_main, clib_file);
-
-    if (error) {
-        fformat(stderr, "%U", format_clib_error, error);
-        return (1);
-    }
-
-    if (ofp == NULL) {
-        ofp = fdopen(2, "w");
-        if (ofp == NULL) {
-            fprintf(stderr, "Couldn't fdopen(2)?\n");
-            exit(1);
-        }
-    }
-
-    em = &elog_main;
-
-    for (i = 0; i < vec_len (em->tracks); i++) {
-        u32 track_code;
-        bound_track_t * btp;
-        elog_track_t * t;
-        uword * p;
-        int track_strlen;
-
-        t = &em->tracks[i];
-        track_code = i;
-        p = hash_get(the_trackdef_hash, track_code);
-        if (p) {
-            fprintf(ofp, "track %d redefined, retain first definition\n",
-                    track_code);
-            continue;
-        }
-        vec_add2(bound_tracks, btp, 1);
-        btp->track = track_code;
-        btp->track_str = t->name;
-        hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
-
-        track_strlen = strlen((char *)btp->track_str);
-        if (track_strlen > widest_track_format)
-            widest_track_format = track_strlen;
-    }
-
-    initialize_events();
-
-    for (i = 0; i < vec_len (em->event_types); i++) {
-        elog_event_type_t *ep;
-        u8 *tmp;
-
-        ep = vec_elt_at_index(em->event_types, i);
-        tmp = (u8 *) vec_dup(ep->format);
-        vec_add1(tmp,0);
-        add_event_from_clib_file (ep->type_index_plus_one, (char *) tmp, i);
-        vec_free(tmp);
-    }
-
-    finalize_events();
-
-    em->events = elog_get_events (em);
-
-    cpel_event_init(vec_len(em->events));
-
-    starttime = em->events[0].time;
-
-    for (i = 0; i < vec_len (em->events); i++) {
-        elog_event_t *ep;
-
-        ep = vec_elt_at_index(em->events, i);
-
-        delta = ep->time - starttime;
-
-        add_clib_event (delta, ep->track, ep->type + 1, i);
-    }
-
-    cpel_event_finalize();
-
-    set_pid_ax_width(8*widest_track_format);
-
-    return(0);
-}
diff --git a/g2/configure.ac b/g2/configure.ac
deleted file mode 100644
index c8af7747..00000000
--- a/g2/configure.ac
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_INIT(g2, 3.0)
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_CHECK_LIB([vppinfra], [clib_mem_get_page_size],,
-        AC_MSG_ERROR([Please install the vpp-lib package]))
-AC_CHECK_HEADER([vppinfra/clib.h],,
-        AC_MSG_ERROR([Please install the vpp-dev package]))
-
-PKG_CHECK_MODULES(g2, gtk+-2.0)
-
-AC_OUTPUT([Makefile])
diff --git a/g2/cpel.c b/g2/cpel.c
deleted file mode 100644
index 8bcc91e6..00000000
--- a/g2/cpel.c
+++ /dev/null
@@ -1,470 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2005-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/fcntl.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <pwd.h>
-#include <stdarg.h>
-#include <time.h>
-#include "cpel.h"
-#include "g2.h"
-
-typedef struct bound_event_ {
-    u32 event_code;
-    u8  *event_str;
-    u8  *datum_str;
-} bound_event_t;
-
-bound_event_t *bound_events;
-
-int widest_track_format=8;
-
-typedef struct bound_track_ {
-    u32 track;
-    u8  *track_str;
-} bound_track_t;
-
-bound_track_t *bound_tracks;
-
-uword *the_strtab_hash; /* (name, base-VA) hash of all string tables */
-uword *the_evtdef_hash; /* (event-id, event-definition) hash */
-uword *the_trackdef_hash; /* (track-id, track-definition) hash */
-u8 *event_strtab;         /* event string-table */
-
-void fatal(char *s)
-{
-    fprintf(stderr, "%s", s);
-    exit(1);
-}
-
-typedef enum {
-    PASS1=1,
-    PASS2=2,
-} pass_t;
-
-typedef struct {
-    int (*pass1)(cpel_section_header_t *, int, FILE *);
-    int (*pass2)(cpel_section_header_t *, int, FILE *);
-} section_processor_t;
-
-int bad_section(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    fprintf(ofp, "Bad (type 0) section, skipped...\n");
-    return(0);
-}
-
-int noop_pass(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    return(0);
-}
-
-int strtab_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    uword *p;
-    u8 *strtab_data_area = (u8 *)(sh+1);
-    
-    /* Multiple string tables with the same name are Bad... */
-    p = hash_get_mem(the_strtab_hash, strtab_data_area);
-    if (p) {
-        fprintf(ofp, "Duplicate string table name %s", strtab_data_area);
-    }
-    /*
-     * Looks funny, but we really do want key = first string in the
-     * table, value = address(first string in the table) 
-     */
-    hash_set_mem(the_strtab_hash, strtab_data_area, strtab_data_area);
-    if (verbose) {
-        fprintf(ofp, "String Table %s\n", strtab_data_area);
-    }
-    return(0);
-}
-
-int evtdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    int i, nevents;
-    event_definition_section_header_t *edh;
-    event_definition_t *ep;
-    u8 *this_strtab;
-    u32 event_code;
-    uword *p;
-    bound_event_t *bp;
-
-    edh = (event_definition_section_header_t *)(sh+1);
-    nevents = ntohl(edh->number_of_event_definitions);
-    
-    if (verbose) {
-        fprintf(ofp, "Event Definition Section: %d definitions\n",
-                nevents);
-    }
-
-    p = hash_get_mem(the_strtab_hash, edh->string_table_name);
-    if (!p) {
-        fprintf(ofp, "Fatal: couldn't find string table\n");
-        return(1);
-    }
-    this_strtab = (u8 *)p[0];
-
-    initialize_events();
-
-    ep = (event_definition_t *)(edh+1);
-    
-    for (i = 0; i < nevents; i++) {
-        event_code = ntohl(ep->event);
-        p = hash_get(the_evtdef_hash, event_code);
-        if (p) {
-            fprintf(ofp, "Event %d redefined, retain first definition\n",
-                    event_code);
-            continue;
-        }
-        vec_add2(bound_events, bp, 1);
-        bp->event_code = event_code;
-        bp->event_str = this_strtab + ntohl(ep->event_format);
-        bp->datum_str = this_strtab + ntohl(ep->datum_format);
-        hash_set(the_evtdef_hash, event_code, bp - bound_events);
-
-        add_event_from_cpel_file(event_code, (char *) bp->event_str, 
-                                 (char *)bp->datum_str);
-
-        ep++;
-    }
-
-    finalize_events();
-    return (0);
-}
-
-int trackdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    int i, nevents;
-    track_definition_section_header_t *tdh;
-    track_definition_t *tp;
-    u8 *this_strtab;
-    u32 track_code;
-    uword *p;
-    bound_track_t *btp;
-    int track_strlen;
-
-    tdh = (track_definition_section_header_t *)(sh+1);
-    nevents = ntohl(tdh->number_of_track_definitions);
-    
-    if (verbose) {
-        fprintf(ofp, "Track Definition Section: %d definitions\n",
-                nevents);
-    }
-
-    p = hash_get_mem(the_strtab_hash, tdh->string_table_name);
-    if (!p) {
-        fprintf(ofp, "Fatal: couldn't find string table\n");
-        return(1);
-    }
-    this_strtab = (u8 *)p[0];
-
-    tp = (track_definition_t *)(tdh+1);
-    
-    for (i = 0; i < nevents; i++) {
-        track_code = ntohl(tp->track);
-        p = hash_get(the_trackdef_hash, track_code);
-        if (p) {
-            fprintf(ofp, "track %d redefined, retain first definition\n",
-                    track_code);
-            continue;
-        }
-        vec_add2(bound_tracks, btp, 1);
-        btp->track = track_code;
-        btp->track_str = this_strtab + ntohl(tp->track_format);
-        hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
-
-        track_strlen = strlen((char *)btp->track_str);
-        if (track_strlen > widest_track_format)
-            widest_track_format = track_strlen;
-        tp++;
-    }
-    return (0);
-}
-
-int unsupported_pass (cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    if (verbose) {
-        fprintf(ofp, "Unsupported type %d section\n",
-                ntohl(sh->section_type));
-    }
-    return(0);
-}
-
-int event_pass2(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    event_section_header_t *eh;
-    u32 event_code, track_code, datum;
-    u64 starttime = ~0ULL;
-    int nevents;
-    int i;
-    event_entry_t *ep;
-    u64 now;
-    u64 delta;
-    u32 time0, time1;
-    double d;
-    uword *p;
-
-    eh = (event_section_header_t *)(sh+1);
-    nevents = ntohl(eh->number_of_events);
-    ticks_per_ns = ntohl(eh->clock_ticks_per_second)/1e9;
-    ep = (event_entry_t *)(eh+1);
-
-    p = hash_get_mem(the_strtab_hash, eh->string_table_name);
-    if (!p) {
-        fprintf(ofp, "Fatal: couldn't find string table\n");
-        return(1);
-    }
-    event_strtab = (u8 *)p[0];
-
-    cpel_event_init(nevents);
-
-    for (i = 0; i < nevents; i++) {
-        time0 = ntohl (ep->time[0]);
-        time1 = ntohl (ep->time[1]);
-
-        now = (((u64) time0)<<32) | time1;
-        
-        /* Convert from bus ticks to usec */
-        d = now;
-        d /= ticks_per_ns;
-
-        now = d;
-
-        if (starttime == ~0ULL)
-            starttime = now;
-        
-        delta = now - starttime;
-
-        /* Delta = time since first event, in usec */
-        event_code = ntohl(ep->event_code);
-        track_code = ntohl(ep->track);
-        datum = ntohl(ep->event_datum);
-
-        add_cpel_event(delta, track_code, event_code, datum);
-
-        ep++;
-    }
-    cpel_event_finalize();
-    return(0);
-}
-
-char *strtab_ref(unsigned long datum)
-{
-    return ((char *)(event_strtab + datum));
-}
-
-/* 
- * Note: If necessary, add passes / columns to this table to 
- * handle section order dependencies.
- */
-
-section_processor_t processors[CPEL_NUM_SECTION_TYPES+1] =
-{
-    {bad_section,	noop_pass}, 		/* type 0 -- f**ked */
-    {strtab_pass1, 	noop_pass}, 		/* type 1 -- STRTAB */
-    {unsupported_pass,  noop_pass}, 		/* type 2 -- SYMTAB */
-    {evtdef_pass1,      noop_pass},             /* type 3 -- EVTDEF */
-    {trackdef_pass1,    noop_pass},		/* type 4 -- TRACKDEF */
-    {noop_pass,         event_pass2},           /* type 5 -- EVENTS */
-};
-
-
-int process_section(cpel_section_header_t *sh, int verbose, FILE *ofp,
-                    pass_t pass)
-{
-    u32 type;
-    type = ntohl(sh->section_type);
-    int rv;
-    int (*fp)(cpel_section_header_t *, int, FILE *);
-
-    if (type > CPEL_NUM_SECTION_TYPES) {
-        fprintf(stderr, "Unknown section type %d\n", type);
-        return(1);
-    }
-    switch(pass) {
-    case PASS1:
-        fp = processors[type].pass1;
-        break;
-
-    case PASS2:
-        fp = processors[type].pass2;
-        break;
-        
-    default:
-        fprintf(stderr, "Unknown pass %d\n", pass);
-        return(1);
-    }
-
-    rv = (*fp)(sh, verbose, ofp);
-
-    return(rv);
-}
-
-int cpel_dump_file_header(cpel_file_header_t *fh, int verbose, FILE *ofp)
-{
-    time_t file_time;
-
-    if (verbose) {
-        fprintf(ofp, "CPEL file: %s-endian, version %d\n",
-                ((fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) ? 
-                 "little" : "big"), 
-                fh->endian_version & CPEL_FILE_VERSION_MASK);
-
-        file_time = ntohl(fh->file_date);
-
-        fprintf(ofp, "File created %s", ctime(&file_time));
-    }
-
-    return(0);
-}
-
-
-int cpel_process(u8 *cpel, int verbose, FILE *ofp)
-{
-    cpel_file_header_t *fh;
-    cpel_section_header_t *sh;
-    u16 nsections;
-    u32 section_size;
-    int i;
-
-    /* First, the file header */
-    fh = (cpel_file_header_t *)cpel;
-    if (fh->endian_version != CPEL_FILE_VERSION) {
-        if (fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) {
-            fprintf(stderr, "Little endian data format not supported\n");
-            return(1);
-        }
-        fprintf(stderr, "Unsupported file version 0x%x\n", 
-                fh->endian_version);
-        return(1);
-    }
-    cpel_dump_file_header(fh, verbose, ofp);
-    nsections = ntohs(fh->nsections);
-
-    /*
-     * Take two passes through the file. PASS1 builds
-     * data structures, PASS2 actually dumps the file.
-     * Just in case the sections are in an unobvious order.
-     */
-    sh = (cpel_section_header_t *)(fh+1);
-    for (i = 0; i < nsections; i++) {
-        section_size = ntohl(sh->data_length);
-
-        if(verbose) {
-            fprintf(ofp, "Section type %d, size %d\n", ntohl(sh->section_type),
-                    section_size);
-        }
-
-        if(process_section(sh, verbose, ofp, PASS1))
-            return(1);
-
-        sh++;
-        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
-    }
-
-    sh = (cpel_section_header_t *)(fh+1);
-    for (i = 0; i < nsections; i++) {
-        if(process_section(sh, verbose, ofp, PASS2))
-            return(1);
-        section_size = ntohl(sh->data_length);
-        sh++;
-        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
-    }
-
-
-    return(0);
-}
-
-/*
- * read_cpel_file
- */
-int read_cpel_file(char *cpel_file)
-{
-    int verbose = 0;
-    int rv;
-    static u8 *cpel;
-    static unsigned long size;
-    static FILE *ofp;
-
-    if (cpel) {
-        unmapfile((char *)cpel, size);
-        hash_free(the_strtab_hash);
-        the_strtab_hash = 0;
-        hash_free(the_evtdef_hash);
-        the_evtdef_hash = 0;
-        hash_free(the_trackdef_hash);
-        the_trackdef_hash = 0;
-    }
-
-    cpel = (u8 *)mapfile((char *)cpel_file, &size);
-    if (cpel == 0) {
-        fprintf(stderr, "Couldn't map %s...\n", cpel_file);
-        exit(1);
-    }
-
-    if (ofp == NULL) {
-        ofp = fdopen(2, "w");
-        if (ofp == NULL) {
-            fprintf(stderr, "Couldn't fdopen(2)?\n");
-            exit(1);
-        }
-    }
-
-    the_strtab_hash = hash_create_string (0, sizeof (uword));
-    the_evtdef_hash = hash_create (0, sizeof (uword));
-    the_trackdef_hash = hash_create (0, sizeof (uword));
-
-    rv = cpel_process(cpel, verbose, ofp);
-
-    set_pid_ax_width(8*widest_track_format);
-
-    return(rv);
-}
-
-static bound_track_t generic_hex_track = {0, (u8 *) "0x%08x"};
-static bound_track_t generic_decimal_track = {0, (u8 *) "%8ld"};
-
-/*
- * get_track_label
- */
-char *get_track_label(unsigned long track)
-{
-    uword *p;
-    bound_track_t *tp;
-
-    p = hash_get(the_trackdef_hash, track);
-    if (p) {
-        tp = &bound_tracks[p[0]];
-    } else {
-        if (track > 65535) 
-            tp = &generic_hex_track;
-        else
-            tp = &generic_decimal_track;
-    }
-    return((char *)tp->track_str);
-}
diff --git a/g2/cpel.h b/g2/cpel.h
deleted file mode 100644
index 73e4aea5..00000000
--- a/g2/cpel.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2005-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _CPEL_H_
-#define _CPEL_H_ 1
-
-typedef struct cpel_file_header_ {
-    unsigned char endian_version;
-    unsigned char pad;
-    unsigned short nsections;
-    unsigned file_date;
-} cpel_file_header_t;
-
-#define CPEL_FILE_LITTLE_ENDIAN	0x80
-#define CPEL_FILE_VERSION       0x01
-#define CPEL_FILE_VERSION_MASK  0x7F
-
-typedef struct cpel_section_header_ {
-    unsigned int section_type;
-    unsigned int data_length;        /* does NOT include type and itself */
-} cpel_section_header_t;
-
-#define CPEL_SECTION_STRTAB	1
-/* string at offset 0 is the name of the table */
-
-#define CPEL_SECTION_SYMTAB     2
-#define CPEL_SECTION_EVTDEF     3
-
-typedef struct event_definition_section_header_ {
-    char string_table_name[64];
-    unsigned int number_of_event_definitions;
-} event_definition_section_header_t;
-
-typedef struct event_definition_ {
-    unsigned int event;
-    unsigned int event_format;
-    unsigned int datum_format;
-} event_definition_t;
-
-#define CPEL_SECTION_TRACKDEF   4
-
-typedef struct track_definition_section_header_ {
-    char string_table_name[64];
-    unsigned int number_of_track_definitions;
-} track_definition_section_header_t;
-
-typedef struct track_definition_ {
-    unsigned int track;
-    unsigned int track_format;
-} track_definition_t;
-
-#define CPEL_SECTION_EVENT      5
-
-typedef struct event_section_header_ {
-    char string_table_name[64];
-    unsigned int number_of_events;
-    unsigned int clock_ticks_per_second;
-} event_section_header_t;
-
-typedef struct event_entry_ {
-    unsigned int time[2];
-    unsigned int track;
-    unsigned int event_code;
-    unsigned int event_datum;
-} event_entry_t;
-
-#define CPEL_NUM_SECTION_TYPES 5
-
-#endif /* _CPEL_H_ */
-
diff --git a/g2/events.c b/g2/events.c
deleted file mode 100644
index d4333bb0..00000000
--- a/g2/events.c
+++ /dev/null
@@ -1,475 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2005-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-#include <sys/mman.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <gtk/gtk.h>
-#include "g2.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-
-/*
- * globals
- */
-boolean g_little_endian;
-event_t *g_events;
-ulong g_nevents;
-pid_sort_t *g_pids;
-pid_sort_t *g_original_pids;
-int g_npids;
-pid_data_t *g_pid_data_list;
-
-/*
- * locals
- */
-pid_data_t **s_pidhash;
-
-/*
- * config parameters
- */
-
-double ticks_per_ns=1000.0;
-boolean ticks_per_ns_set;
-
-/****************************************************************************
-* event_init
-****************************************************************************/
-
-void event_init(void)
-{
-    ulong endian;
-    char *ep;
-    char *askstr;
-    int tmp;
-
-    ep = (char *)&endian;
-    endian = 0x12345678;
-    if (*ep != 0x12)
-        g_little_endian = TRUE;
-    else
-        g_little_endian = FALSE;
-
-    askstr = getprop("dont_ask_ticks_per_ns_initially");
-    
-    if (askstr && (*askstr == 't' || *askstr == 'T')) {
-        tmp = atol(getprop_default("ticks_per_ns", 0));
-        if (tmp > 0) {
-            ticks_per_ns = tmp;
-            ticks_per_ns_set = TRUE;
-        }
-    }
-}
-
-/****************************************************************************
-* find_or_add_pid
-****************************************************************************/
-
-pid_data_t *find_or_add_pid (ulong pid)
-{
-    pid_data_t *pp;
-    ulong bucket;
-
-    bucket = pid % PIDHASH_NBUCKETS;
-
-    pp = s_pidhash[bucket];
-
-    if (pp == 0) {
-        pp = g_malloc0(sizeof(pid_data_t));
-        pp->pid_value = pid;
-        s_pidhash[bucket] = pp;
-        g_npids++;
-        return(pp);
-    }
-    while (pp) {
-        if (pp->pid_value == pid)
-            return(pp);
-        pp = pp->next;
-    }
-
-    pp = g_malloc0(sizeof(pid_data_t));
-    pp->pid_value = pid;
-    pp->next = s_pidhash[bucket];
-    s_pidhash[bucket] = pp;
-    g_npids++;
-    return(pp);
-}
-
-/****************************************************************************
-* pid_cmp
-****************************************************************************/
-
-int pid_cmp(const void *a1, const void *a2)
-{
-    pid_sort_t *p1 = (pid_sort_t *)a1;
-    pid_sort_t *p2 = (pid_sort_t *)a2;
-
-    if (p1->pid_value < p2->pid_value)
-        return(-1);
-    else if (p1->pid_value == p2->pid_value)
-        return(0);
-    else
-        return(1);
-}
-
-/****************************************************************************
-* make_sorted_pid_vector
-****************************************************************************/
-
-static void make_sorted_pid_vector(void)
-{
-    pid_data_t *pp;
-    pid_data_t **p_previous;
-    pid_sort_t *psp;
-    int i;
-
-    psp = g_pids = g_malloc(sizeof(pid_sort_t)*g_npids);
-
-    for (i = 0; i < PIDHASH_NBUCKETS; i++) {
-        pp = s_pidhash[i];
-        while(pp) {
-            psp->pid = pp;
-            psp->pid_value = pp->pid_value;
-            psp++;
-            pp = pp->next;
-        }
-    }
-
-    qsort(&g_pids[0], g_npids, sizeof(pid_sort_t), pid_cmp);
-
-    /* put the sort order into the pid objects */
-    psp = g_pids;
-
-    /*
-     * This is rather gross.
-     *
-     * We happen to know that whenever this function is called, the hash table
-     * structure itself is immediately torn down. So the "next" pointers in the
-     * pid_data_t elements are about to become useless.
-     *
-     * So we re-use them, to link all the pid_data_t elements together into a
-     * single unified linked list, with g_pid_data_list pointing to the head.
-     * This means we can walk all the pid_data_t objects if we really want to.
-     * Reading snapshots from disk is one example.
-     *
-     * Alternatively we could just leave the hash table in place; this is
-     * far nicer, but as it happens, trading O(n) lookups for O(1) lookups
-     * isn't actually a problem for the restricted post-tear-down usage. So for
-     * now we take the memory savings and swap our hash table for a list.
-     */
-    p_previous = &g_pid_data_list;
-    for (i = 0; i < g_npids; i++) {
-        pp = psp->pid;
-        pp->pid_index = i;
-        *p_previous = pp;
-        p_previous = &pp->next;
-        psp++;
-    }
-    *p_previous = NULL;
-
-    /*
-     * Squirrel away original (sorted) vector, so we can
-     * toggle between "chase" mode, snapshots, and the original
-     * display method on short notice 
-     */
-    g_original_pids = g_malloc(sizeof(pid_sort_t)*g_npids);
-    memcpy (g_original_pids, g_pids, sizeof(pid_sort_t)*g_npids); 
-}
-
-/****************************************************************************
-* read_events
-****************************************************************************/
-
-void read_events(char *filename)
-{
-    ulong *ulp;
-    ulong size;
-    event_t *ep;
-    raw_event_t *rep;
-    ulonglong start_time=0ULL;
-    ulonglong low_time;
-    boolean once=TRUE;
-    int i;
-    char tmpbuf [128];
-
-    ulp = (ulong *)mapfile(filename, &size);
-
-    if (ulp == NULL) {
-        sprintf(tmpbuf, "Couldn't open %s\n", filename);
-        infobox("Read Event Log Failure", tmpbuf);
-        return;
-    }
-
-    g_nevents = ntohl(*ulp);
-
-    if (size != (g_nevents*sizeof(raw_event_t) + sizeof(g_nevents))) {
-        sprintf(tmpbuf, "%s was damaged, or isn't an event log.\n", filename);
-        infobox("Bad Input File", tmpbuf);
-        g_nevents = 0;
-        unmapfile((char *)ulp, size);
-        return;
-    }
-
-    rep = (raw_event_t *)(ulp+1);
-
-    if (g_events)
-        g_free(g_events);
-
-    g_events = (event_t *)g_malloc(g_nevents * sizeof(event_t));
-    ep = g_events;
-
-    while (g_npids > 0) {
-        g_free((g_pids + g_npids-1)->pid);
-        g_npids--;
-    }
-    if (g_pids) {
-        g_free(g_pids);
-        g_free(g_original_pids);
-        g_pids = 0;
-        g_original_pids = 0;
-    }
-
-    s_pidhash = (pid_data_t **)g_malloc0(
-        PIDHASH_NBUCKETS*sizeof(pid_data_t *));
-
-    /* $$$ add a SEGV handler... */
-    for (i = 0; i < g_nevents; i++) {
-        if (once) {
-            once = FALSE;
-            start_time = ((ulonglong)ntohl(rep->time[0]));
-            start_time <<= 32;
-            low_time = ntohl(rep->time[1]);
-            low_time &= 0xFFFFFFFF;
-            start_time |= low_time;
-            ep->time = 0LL;
-        } else {
-            ep->time = ((ulonglong)ntohl(rep->time[0]));
-            ep->time <<= 32;
-            low_time = ntohl(rep->time[1]);
-            low_time &= 0xFFFFFFFF;
-            ep->time |= low_time;
-            ep->time -= start_time;
-            ep->time /= ticks_per_ns;
-        }
-        ep->code = ntohl(rep->code);
-        ep->pid = find_or_add_pid(ntohl(rep->pid));
-        ep->datum = ntohl(rep->datum);
-        ep->flags = 0;
-        ep++;
-        rep++;
-    }
-
-    unmapfile((char *)ulp, size);
-    
-    make_sorted_pid_vector();
-    g_free(s_pidhash);
-    s_pidhash = 0;
-
-    /* Give the view-1 world a chance to reset a few things... */
-    view1_read_events_callback();
-}
-
-static event_t *add_ep;
-
-/****************************************************************************
-* cpel_event_init
-****************************************************************************/
-void cpel_event_init (ulong nevents)
-{
-    g_nevents = nevents;
-    if (g_events)
-        g_free(g_events);
-    add_ep = g_events = (event_t *)g_malloc(g_nevents * sizeof(event_t));
-    while (g_npids > 0) {
-        g_free((g_pids + g_npids-1)->pid);
-        g_npids--;
-    }
-    if (g_pids) {
-        g_free(g_pids);
-        g_free(g_original_pids);
-        g_pids = 0;
-        g_original_pids = 0;
-    }
-    s_pidhash = (pid_data_t **)g_malloc0(
-        PIDHASH_NBUCKETS*sizeof(pid_data_t *));
-}
-
-/****************************************************************************
-* add_cpel_event
-****************************************************************************/
-
-void add_cpel_event(ulonglong delta, ulong track, ulong event, ulong datum)
-{
-    event_t *ep;
-
-    ep = add_ep++;
-    ep->time = delta;
-    ep->pid = find_or_add_pid(track);
-    ep->code = event;
-    ep->datum = datum;
-    ep->flags = 0;
-}
-
-/****************************************************************************
-* add_clib_event
-****************************************************************************/
-
-void add_clib_event(double delta, unsigned short track, 
-                    unsigned short event, unsigned int index)
-{
-    event_t *ep;
-
-    ep = add_ep++;
-    ep->time = (ulonglong) (delta * 1e9); /* time in intger nanoseconds */
-    ep->pid = find_or_add_pid(track);
-    ep->code = event;
-    ep->datum = index;
-    ep->flags = EVENT_FLAG_CLIB;
-}
-
-/****************************************************************************
-* cpel_event_finalize
-****************************************************************************/
-
-void cpel_event_finalize(void)
-{
-    make_sorted_pid_vector();
-    g_free(s_pidhash);
-    s_pidhash = 0;
-    
-    /* Give the view-1 world a chance to reset a few things... */
-    view1_read_events_callback();
-}
-
-/****************************************************************************
-* mapfile
-****************************************************************************/
-
-char *mapfile (char *file, ulong *sizep)
-{
-    struct stat statb;
-    char *rv;
-    int maphfile;
-    size_t mapfsize;
-    
-    maphfile = open (file, O_RDONLY);
-
-    if (maphfile < 0)
-        return (NULL);
-
-    if (fstat (maphfile, &statb) < 0) {
-        return (NULL);
-    }
-
-    /* Don't try to mmap directories, FIFOs, semaphores, etc. */
-    if (! (statb.st_mode & S_IFREG)) {
-        return (NULL);
-    }
-
-    mapfsize = statb.st_size;
-
-    if (mapfsize < 3) {
-        close (maphfile);
-        return (NULL);
-    }
-
-    rv = mmap (0, mapfsize, PROT_READ, MAP_SHARED, maphfile, 0);
-
-    if (rv == 0) {
-        g_error ("%s mapping problem, I quit...\n", file);
-    }
-
-    close (maphfile);
-
-    if (madvise (rv, mapfsize, MADV_SEQUENTIAL) < 0) {
-        return (rv);
-    }
-
-    if (sizep) {
-        *sizep = mapfsize;
-    }
-    return (rv);
-}
-
-/****************************************************************************
-* unmapfile
-****************************************************************************/
-
-boolean unmapfile (char *addr, ulong size)
-{
-    if (munmap (addr, size) < 0) {
-        g_warning("Unmap error, addr 0x%lx size 0x%x\n", 
-                  (unsigned long) addr, (unsigned int)size);
-        return(FALSE);
-    }
-    return(TRUE);
-}
-
-/****************************************************************************
-* find_event_index
-* Binary search for first event whose time is >= t
-****************************************************************************/
-
-int find_event_index (ulonglong t)
-{
-    int index, bottom, top;
-    event_t *ep;
-
-    bottom = g_nevents-1;
-    top = 0;
-
-    while (1) {
-	index = (bottom + top) / 2;
-
-        ep = (g_events + index);
-
-        if (ep->time == t)
-            return(index);
-
-        if (top >= bottom) {
-            while (index > 0 && ep->time > t) {
-                ep--;
-                index--;
-            }
-            while (index < g_nevents && ep->time < t) {
-                ep++;
-                index++;
-            }
-            return(index);
-        }
-
-        if (ep->time < t)
-            top = index + 1;
-        else 
-            bottom = index - 1;
-    }
-}
-
-/****************************************************************************
-* events_about
-****************************************************************************/
-
-void events_about (char *tmpbuf)
-{
-    sprintf(tmpbuf+strlen(tmpbuf), "%d total events, %.3f ticks per us\n", 
-            (int)g_nevents, ticks_per_ns);
-}
diff --git a/g2/g2.h b/g2/g2.h
deleted file mode 100644
index 1ab42191..00000000
--- a/g2/g2.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2005-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * typedefs and so forth
- */
-#include <sys/types.h>
-#include <gtk-2.0/gtk/gtk.h>
-#include <stdio.h>
-#include "props.h"
-
-typedef char boolean;
-typedef unsigned long long ulonglong;
-
-/*
- * main.c
- */
-
-GtkWidget *g_mainwindow;
-GtkWidget *g_mainvbox;
-GtkWidget *g_mainhbox;
-
-/*
- * pointsel.c
- */
-void point_selector_init(void);
-boolean read_event_definitions (char *filename);
-char *sxerox(char *);
-void pointsel_about(char *);
-void pointsel_next_snapshot(void);
-void initialize_events(void);
-void finalize_events(void);
-
-#define NEVENTS 100000
-
-typedef struct event_def_ {
-    ulong event;
-    char *name;
-    char *format;
-    boolean selected;
-    boolean is_clib;
-    char pad[2];
-} event_def_t;
-
-event_def_t *find_event_definition (ulong code);
-
-event_def_t g_eventdefs[NEVENTS];
-
-/*
- * config params
- */
-int c_maxpointsel;        /* max # points shown in selector dlg */
-gint c_view1_draw_width;
-gint c_view1_draw_height;
-
-/*
- * menu1.c
- */
-
-void menu1_init(void);
-void modal_dialog (char *label_text, char *retry_text, char *default_value, 
-                   boolean (*cb)(char *));
-void infobox(char *label_text, char *text);
-/*
- * view1.c
- */
-GdkFont *g_font;
-GdkColor fg_black, bg_white;
-void view1_init(void);
-void view1_display(void);
-void view1_read_events_callback(void);
-void view1_display_when_idle(void);
-void view1_print_callback(GtkToggleButton *item, gpointer data);
-void view1_about(char *);
-void set_pid_ax_width(int width);
-void set_window_title(const char *filename);
-
-enum view1_tbox_fn {
-    TBOX_DRAW_BOXED = 1,        /* note: order counts */
-	TBOX_DRAW_EVENT,
-    TBOX_DRAW_PLAIN,
-    TBOX_PRINT_BOXED,
-	TBOX_PRINT_EVENT,
-    TBOX_PRINT_PLAIN,           /* end restriction */
-    TBOX_GETRECT_BOXED,
-	TBOX_GETRECT_EVENT,
-    TBOX_GETRECT_PLAIN,
-};
-
-enum view1_line_fn {
-    LINE_DRAW_BLACK = 1,
-    LINE_DRAW_WHITE,
-    LINE_PRINT,
-};
-
-GdkRectangle *tbox (char *s, int x, int y, enum view1_tbox_fn function);
-void line (int x1, int y1, int x2, int y2, enum view1_line_fn function);
-gint view1_handle_key_press_event (GtkWidget *widget, GdkEventKey *event);
-
-/*
- * events.c
- */
-
-void events_about (char *);
-
-typedef struct raw_event {
-    unsigned long time[2];
-    unsigned long pid;
-    unsigned long code;
-    unsigned long datum;
-} raw_event_t;
-
-void event_init(void);
-char *mapfile (char *file, ulong *sizep);
-boolean unmapfile (char *addr, ulong size);
-void read_events (char *);
-int find_event_index (ulonglong t);
-int read_cpel_file(char *file);
-int read_clib_file(char *file);
-void cpel_event_init(ulong);
-void add_event_from_cpel_file(ulong, char * , char *);
-void add_event_from_clib_file(unsigned int event, char *name, 
-                              unsigned int vec_index);
-void add_cpel_event(ulonglong delta, ulong, ulong, ulong);
-void add_clib_event(double delta, unsigned short track, 
-                    unsigned short event, unsigned int index);
-void cpel_event_finalize(void);
-void *get_clib_event (unsigned int datum);
-
-typedef struct pid_data {
-    struct pid_data *next;
-    ulong pid_value;            /* The actual pid value */
-    ulong pid_index;            /* Index in pid sort order */
-} pid_data_t;
-    
-#define EVENT_FLAG_SELECT 	0x00000001 /* This event is selected */
-#define EVENT_FLAG_SEARCHRSLT   0x00000002 /* This event is the search rslt */
-#define EVENT_FLAG_CLIB         0x00000004 /* clib event */
-
-typedef struct pid_sort {
-    struct pid_data *pid;
-    ulong pid_value;
-    /*
-     * This is a bit of a hack, since this is used only by the view:
-     */
-    unsigned color_index;
-} pid_sort_t;
-
-typedef struct event {
-    ulonglong time;
-    ulong code;
-    pid_data_t *pid;
-    ulong datum;
-    ulong flags;
-} event_t;
-
-
-boolean g_little_endian;
-event_t *g_events;
-ulong g_nevents;
-pid_sort_t *g_pids;
-pid_sort_t *g_original_pids;
-int g_npids;
-pid_data_t *g_pid_data_list;
-
-#define PIDHASH_NBUCKETS	20021 /* Should be prime */
-
-boolean ticks_per_ns_set;
-double ticks_per_ns;
-
-/*
- * version.c
- */
-const char *version_string;
-const char *minor_v_string;
-
-/*
- * cpel.c
- */
-char *get_track_label(unsigned long);
-int widest_track_format;
-char *strtab_ref(unsigned long);
diff --git a/g2/g2version.c b/g2/g2version.c
deleted file mode 100644
index 4b6f9313..00000000
--- a/g2/g2version.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2005-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-const char *version_string = "G2 (x86_64 GNU/Linux) major version 3.0";
-const char *minor_v_string = 
-    "Built Wed Feb  3 10:58:12 EST 2016";
diff --git a/g2/main.c b/g2/main.c
deleted file mode 100644
index a782e17f..00000000
--- a/g2/main.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2005-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "g2.h"
-#include "props.h"
-#include <pwd.h>
-#include <strings.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-/*
- * globals
- */
-
-GtkWidget *g_mainwindow;        /* The main window */
-
-/* Graphical object heirarchy
- *
- * [main window]
- *   [main vbox]
- *     [main (e.g. file) menubar]
- *     [view hbox] 
- *     [view bottom menu]
- */
-
-GtkWidget *g_mainvbox;
-GtkWidget *g_mainhbox;
-
-gint delete_event(GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-    /* Allow window to be destroyed */
-    return(FALSE);
-}
-
-void destroy(GtkWidget *widget, gpointer data)
-{
-    gtk_main_quit();
-}
-
-int main (int argc, char **argv)
-{
-    char tmpbuf [128];
-    struct passwd *pw;
-    char *event_file = 0;
-    char *cpel_file = 0;
-    char *clib_file =0;
-    char *title = "none";
-    int curarg=1;
-    char *homedir;
-    
-    gtk_init(&argc, &argv);
-
-    homedir = getenv ("HOME");
-    tmpbuf[0] = 0;
-
-    if (homedir) {
-        sprintf(tmpbuf, "%s/.g2", homedir);
-    } else {
-        pw = getpwuid(geteuid());
-        if (pw) {
-            sprintf(tmpbuf, "%s/.g2", pw->pw_dir);
-        }
-    }
-    if (tmpbuf[0])
-        readprops(tmpbuf);
-
-    g_mainwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-    gtk_signal_connect (GTK_OBJECT(g_mainwindow), "delete_event",
-                        GTK_SIGNAL_FUNC (delete_event), NULL);
-
-    gtk_signal_connect (GTK_OBJECT(g_mainwindow), "destroy",
-                        GTK_SIGNAL_FUNC (destroy), NULL);
-
-    gtk_container_set_border_width(GTK_CONTAINER(g_mainwindow), 5);
-
-    g_mainvbox = gtk_vbox_new(FALSE, 0);
-    g_mainhbox = gtk_hbox_new(FALSE, 0);
-
-    /* 
-     * init routines
-     */
-
-    menu1_init();
-    point_selector_init();
-    view1_init();
-    event_init();
-
-    /* 
-     * Now that we're ready to rock 'n roll, see if we've been asked to
-     * press a few buttons...
-     */
-    
-    while (curarg < argc) {
-        if (!strncmp(argv[curarg], "--cpel-input", 4)) {
-            curarg++;
-            if (curarg < argc) {
-                cpel_file = argv[curarg];
-                curarg++;
-                break;
-            }
-            g_error("Missing filename after --cpel-input");
-        }
-        if (!strncmp(argv[curarg], "--clib-input", 4)) {
-            curarg++;
-            if (curarg < argc) {
-                clib_file = argv[curarg];
-                curarg++;
-                break;
-            }
-            g_error("Missing filename after --cpel-input");
-        }
-
-        if (!strncmp(argv[curarg], "--pointdefs", 3)) {
-            curarg++;
-            if (curarg < argc) {
-                read_event_definitions(argv[curarg]);
-                curarg++;
-                continue;
-            }
-            g_error ("Missing filename after --pointdefs\n");
-        }
-        if (!strncmp(argv[curarg], "--event-log", 3)) {
-            curarg++;
-            if (curarg < argc) {
-                event_file = argv[curarg];
-                curarg++;
-                continue;
-            }
-            g_error ("Missing filename after --event-log\n");
-        }
-
-        if (!strncmp(argv[curarg], "--ticks-per-us", 3)) {
-            curarg++;
-            if (curarg < argc) {
-                ticks_per_ns = 0.0;
-                ticks_per_ns = atof(argv[curarg]);
-                if (ticks_per_ns == 0.0) {
-                    g_error("ticks-per-ns (%s) didn't convert properly\n",
-                            argv[curarg]);
-                }
-                ticks_per_ns_set = TRUE;
-                curarg++;
-                continue;
-            }
-            g_error ("Missing filename after --event-log\n");
-        }
-
-        fprintf(stderr, 
-                "g2 [--pointdefs <filename>] [--event-log <filename>]\n");
-        fprintf(stderr, "   [--ticks-per-us <value>]\n");
-        fprintf(stderr, 
-                "   [--cpel-input <filename>] [--clib-input <filename]>\n");
-        fprintf(stderr, 
-                "%s\n%s\n", version_string, minor_v_string);
-        exit(0);
-    }
-
-    if (clib_file) {
-        read_clib_file (clib_file);
-        title = clib_file;
-    } else if (cpel_file) {
-        read_cpel_file(cpel_file);
-        title = cpel_file;
-    } else if (event_file) {
-        read_events(event_file);
-        title = event_file;
-    }
-
-    set_window_title(title);
-
-    gtk_signal_connect (GTK_OBJECT (g_mainwindow), "key_press_event",
-                        (GtkSignalFunc) view1_handle_key_press_event, NULL);
-    gtk_container_add(GTK_CONTAINER(g_mainvbox), g_mainhbox);
-    gtk_widget_show(g_mainhbox);
-    gtk_container_add(GTK_CONTAINER(g_mainwindow), g_mainvbox);
-    gtk_widget_show(g_mainvbox);
-    gtk_widget_show(g_mainwindow);
-
-    gtk_main();
-    return(0);
-}
diff --git a/g2/menu1.c b/g2/menu1.c
deleted file mode 100644
index fce81fa6..00000000
--- a/g2/menu1.c
+++ /dev/null
@@ -1,565 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2006-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <gtk/gtk.h>
-#define GTK_ENABLE_BROKEN // DGMS
-#include <gtk/gtktext.h>
-#include <stdlib.h>
-#include "g2.h"
-#include <string.h>
-
-/*
- * locals
- */
-static GtkWidget *s_mainmenubar;
-static GtkWidget *s_filemenu;
-static GtkWidget *s_readdefs;
-static GtkWidget *s_readevents;
-static GtkWidget *s_readeventsclock;
-static GtkWidget *s_readcpel;
-static GtkWidget *s_readclib;
-static GtkWidget *s_print;
-static GtkWidget *s_quit;
-
-static GtkWidget *s_mainfilemenu;
-static GtkWidget *s_help_general;
-static GtkWidget *s_help_about;
-static GtkWidget *s_mainhelpmenu;
-static GtkWidget *s_helpmenu;
-
-static GtkWidget *s_filesel;
-static GtkWidget *s_eventsel;
-
-typedef struct md_ {
-    GtkWidget *entry;
-    GtkWidget *label;
-    GtkWidget *dialog;
-    boolean (*callback)(char *);
-    char *retry_text;
-} md_t;
-
-char *general_help = "\n"
-"G2 is a performance event visualization tool.\n"
-"\n"
-"To view CPEL-format event data:\n"
-"g2 --cpel <filename>\n"
-"or use the File Menu->Read CPEL file option.\n"
-"\n"
-"To view vppinfra-format (.../open-repo/vppinfra/vppinfra/elog.h) event data:\n"
-"g2 --clib <filename>\n"
-"or use the File Menu->Read clib file option.\n"
-"\n"
-"To toggle event detail boxes, left-mouse-click on an event.\n"
-"\n"
-"To zoom to an area, depress the left mouse button. Move the\n"
-"mouse. Release the mouse.\n"
-"\n"
-"To use the time ruler, depress the right mouse button.  Move the\n"
-"mouse. Release when done.\n"
-"\n"
-"To push a track to the bottom, <ctrl><left-mouse>\n"
-"\n"
-"To pull a track to the top, <shift><left-mouse>\n"
-"\n"
-"To selectively color/uncolor a track, <ctrl><shift><left-mouse>\n"
-"\n"
-"To make the mouse scrollwheel faster, press <shift>\n"
-"\n"
-"Hotkeys, supposedly Quake-like:\n"
-"      w - zoom-in\n"
-"      s - zoom-out\n"
-"      a - pan-left\n"
-"      d - pan-right\n"
-"      r - pan-up\n"
-"      f - pan-down\n"
-"      t - less traces\n"
-"      g - more traces\n"
-"\n"
-"      e - toggle summary-mode\n"
-"      c - toggle color-mode\n"
-"\n"
-"      x - take snapshot\n"
-"      z - go to next snapshot\n"
-"      p - put snapshots to snapshots.g2 \n"
-"      l - load snapshots from snapshots.g2\n"
-"\n"
-"<ctrl>q - quit\n"
-"Send comments / bug reports to the \"fd.io\" mailing list.\n";
-
-/****************************************************************************
-* debug_dialog_callback
-****************************************************************************/
-
-boolean debug_dialog_callback (char *s)
-{
-    g_print("Dialog result: %s", s);
-    return (TRUE);
-}
-
-/****************************************************************************
-* get_dialog_value
-****************************************************************************/
-
-static void get_dialog_value (GtkWidget *dialog, gpointer user_data)
-{
-    md_t *md = (md_t *)user_data;
-    char * cb_arg;
-    
-    cb_arg = (char *) gtk_entry_get_text(GTK_ENTRY(md->entry));
-
-    if ((*md->callback)(cb_arg)) {
-	gtk_grab_remove(md->dialog);
-	gtk_widget_destroy(md->dialog);
-    } else {
-	gtk_label_set_text (GTK_LABEL(md->label), md->retry_text);
-    }
-}
-
-/****************************************************************************
-* modal_dialog
-****************************************************************************/
-
-void modal_dialog (char *label_text, char *retry_text, char *default_value, 
-                   boolean (*cb)(char *))
-{
-    GtkWidget *dialog, *label, *ok_button, *entry;
-    static md_t dlg;
-    md_t *md = &dlg;
-
-    dialog = gtk_dialog_new();
-    label = gtk_label_new(label_text);
-
-    entry = gtk_entry_new();
-    if (default_value)
-        gtk_entry_set_text(GTK_ENTRY(entry), default_value);
-
-    ok_button = gtk_button_new_with_label("OK");
-
-    md->entry = entry;
-    md->label = label;
-    md->retry_text = retry_text;
-    md->dialog = dialog;
-    if (cb)
-	md->callback = cb;
-    else
-	md->callback = debug_dialog_callback;
-
-    gtk_signal_connect (GTK_OBJECT (ok_button), "clicked", 
-                        GTK_SIGNAL_FUNC(get_dialog_value), (gpointer) md);
-
-    gtk_signal_connect (GTK_OBJECT (entry), "activate", 
-                        GTK_SIGNAL_FUNC(get_dialog_value), (gpointer) md);
-
-    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
-		      entry);
-
-    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
-		      ok_button);
-    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label);
-    gtk_widget_show_all(dialog);
-    gtk_widget_grab_focus(entry);
-    gtk_grab_add(dialog);
-}
-
-/****************************************************************************
-* get_eventdef_name
-****************************************************************************/
-
-static void get_eventdef_name (GtkFileSelection *sel, gpointer user_data)
-{
-    char *filename = (char *) gtk_file_selection_get_filename (
-        GTK_FILE_SELECTION(s_filesel));
-    read_event_definitions(filename);
-    set_window_title(filename);
-}
-
-/****************************************************************************
-* read_eventdef_callback
-****************************************************************************/
-
-static void read_eventdef_callback(GtkToggleButton *item, gpointer data)
-{
-    
-    s_filesel = gtk_file_selection_new("Read Event Definitions From...");
-    
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(s_filesel), 
-				    "../h/elog.h");
-
-    gtk_signal_connect (GTK_OBJECT (
-        GTK_FILE_SELECTION(s_filesel)->ok_button),
-                        "clicked", 
-                        GTK_SIGNAL_FUNC(get_eventdef_name), NULL);
-                            
-    gtk_signal_connect_object (GTK_OBJECT (
-        GTK_FILE_SELECTION(s_filesel)->ok_button),
-                               "clicked", 
-                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                               (gpointer) s_filesel);
-    
-    gtk_signal_connect_object (GTK_OBJECT (
-        GTK_FILE_SELECTION(s_filesel)->cancel_button),
-                               "clicked", 
-                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                               (gpointer) s_filesel);
-    gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(s_filesel));
-    gtk_widget_show (s_filesel);
-}
-
-/****************************************************************************
-* get_events_name
-****************************************************************************/
-
-static void get_events_name (GtkFileSelection *sel, gpointer user_data)
-{
-    char *filename = (char *) gtk_file_selection_get_filename (
-        GTK_FILE_SELECTION(s_eventsel));
-    read_events(filename);
-    view1_display_when_idle();
-}
-
-
-/****************************************************************************
-* get_ticks_per_ns
-****************************************************************************/
-
-static boolean get_ticks_per_ns (char *value)
-{
-    double rv;
-
-    rv = atof (value);
-
-    if (rv == 0.0 || rv > 100000)
-	return(FALSE);
-
-    ticks_per_ns = rv;
-    ticks_per_ns_set = TRUE;
-
-    gtk_widget_show(s_eventsel);
-    return(TRUE);
-}
-
-/****************************************************************************
-* read_events_callback
-****************************************************************************/
-
-static void read_events_callback(GtkToggleButton *item, gpointer data)
-{
-    char tmpbuf [32];
-
-    s_eventsel = gtk_file_selection_new("Read Events From...");
-    
-    gtk_signal_connect (GTK_OBJECT (
-        GTK_FILE_SELECTION(s_eventsel)->ok_button),
-                        "clicked", 
-                        GTK_SIGNAL_FUNC(get_events_name), NULL);
-                            
-    gtk_signal_connect_object (GTK_OBJECT (
-        GTK_FILE_SELECTION(s_eventsel)->ok_button),
-                               "clicked", 
-                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                               (gpointer) s_eventsel);
-    
-    gtk_signal_connect_object (GTK_OBJECT (
-        GTK_FILE_SELECTION(s_eventsel)->cancel_button),
-                               "clicked", 
-                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                               (gpointer) s_eventsel);
-    gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(s_eventsel));
-
-    if (ticks_per_ns_set)
-	gtk_widget_show (s_eventsel);
-    else {
-	sprintf(tmpbuf, "%.3f", ticks_per_ns);
-	modal_dialog ("Please enter clock ticks per nanosecond",
-		      "Invalid: Please enter clock ticks per nanosecond",
-		      tmpbuf, get_ticks_per_ns);
-    }
-}
-
-/****************************************************************************
-* read_eventclock_callback
-****************************************************************************/
-
-static void read_eventsclock_callback(GtkToggleButton *item, gpointer data)
-{
-    ticks_per_ns_set = FALSE;
-    read_events_callback(item, data);
-}
-
-/****************************************************************************
-* infobox_size_request
-****************************************************************************/
-
-void infobox_size_request (GtkWidget *widget, GtkRequisition *req,
-                           gpointer user_data)
-{
-    char *text = (char *)user_data;
-    char *cp;
-    int widest_line_in_chars;
-    int w;
-    int nlines;
-    
-    /*
-     * You'd think that the string extent function would work here.
-     * You'd be wrong. 
-     */
-    nlines = w = widest_line_in_chars = 0;
-    for (cp = text; *cp; cp++) {
-        if (*cp == '\n') {
-            if (w > widest_line_in_chars) {
-                widest_line_in_chars = w;
-            }
-            w = 0;
-            nlines++;
-        }
-        w++;
-    }
-
-    nlines++;
-
-    req->width = (widest_line_in_chars * 8) + 20;
-    req->height = (nlines * 13) + 10;
-}
-
-/****************************************************************************
-* infobox
-****************************************************************************/
-
-void infobox(char *label_text, char *text)
-{
-    GtkWidget *dialog, *label, *ok_button, *entry;
-    GtkWidget *box;
-
-    dialog = gtk_dialog_new();
-    label = gtk_label_new(label_text);
-
-    entry = gtk_text_new(NULL, NULL);
-
-    gtk_signal_connect (GTK_OBJECT (entry), "size-request", 
-                        GTK_SIGNAL_FUNC(infobox_size_request), 
-                        (gpointer) text);
-
-    gtk_text_insert(GTK_TEXT(entry), g_font, &fg_black, &bg_white,
-                    text, -1);
-
-    gtk_text_set_editable(GTK_TEXT(entry), FALSE);
-
-    ok_button = gtk_button_new_with_label("OK");
-
-    gtk_signal_connect_object (GTK_OBJECT (ok_button), "clicked", 
-                               GTK_SIGNAL_FUNC(gtk_widget_destroy), 
-                               (gpointer) GTK_OBJECT(dialog));
-
-    box = gtk_vbox_new(FALSE, 5);
-
-
-    gtk_box_pack_start(GTK_BOX(box), entry, TRUE, TRUE, 0);
-    gtk_box_pack_start(GTK_BOX(box), ok_button, FALSE, FALSE, 0);
-
-    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
-		      box);
-
-    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label);
-    gtk_widget_show_all(dialog);
-}
-
-/****************************************************************************
-* help_general_callback
-****************************************************************************/
-
-static void help_general_callback(GtkToggleButton *item, gpointer data)
-{
-    infobox("General Help", general_help);
-}
-
-/****************************************************************************
-* help_about_callback
-****************************************************************************/
-
-static void help_about_callback(GtkToggleButton *item, gpointer data)
-{
-    char tmpbuf [1024];
-    sprintf (tmpbuf, "G2 -- Graphical Event Viewer\n\n");
-    view1_about(tmpbuf);
-    pointsel_about(tmpbuf);
-    events_about(tmpbuf);
-    sprintf (tmpbuf+strlen(tmpbuf), "\n%s\n", version_string);
-    sprintf (tmpbuf+strlen(tmpbuf), "%s\n", minor_v_string);
-    infobox("About", tmpbuf);
-}
-
-
-/****************************************************************************
-* get_cpel_name
-****************************************************************************/
-
-static void get_cpel_name (GtkFileSelection *sel, gpointer user_data)
-{
-    char *filename = (char *)gtk_file_selection_get_filename (
-        GTK_FILE_SELECTION(s_filesel));
-    read_cpel_file(filename);
-    set_window_title(filename);
-}
-
-/****************************************************************************
-* get_clib_name
-****************************************************************************/
-
-static void get_clib_name (GtkFileSelection *sel, gpointer user_data)
-{
-    char *filename = (char *) gtk_file_selection_get_filename (
-        GTK_FILE_SELECTION(s_filesel));
-    read_clib_file(filename);
-    set_window_title(filename);
-}
-
-/****************************************************************************
-* read_cpel_callback
-****************************************************************************/
-
-static void read_cpel_callback(GtkToggleButton *item, gpointer data)
-{
-    
-    s_filesel = gtk_file_selection_new("Read CPEL data from...");
-    
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(s_filesel), 
-				    "cpel.out");
-
-    gtk_signal_connect (GTK_OBJECT (
-        GTK_FILE_SELECTION(s_filesel)->ok_button),
-                        "clicked", 
-                        GTK_SIGNAL_FUNC(get_cpel_name), NULL);
-                            
-    gtk_signal_connect_object (GTK_OBJECT (
-        GTK_FILE_SELECTION(s_filesel)->ok_button),
-                               "clicked", 
-                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                               (gpointer) s_filesel);
-    
-    gtk_signal_connect_object (GTK_OBJECT (
-        GTK_FILE_SELECTION(s_filesel)->cancel_button),
-                               "clicked", 
-                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                               (gpointer) s_filesel);
-    gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(s_filesel));
-    gtk_widget_show (s_filesel);
-}
-
-/****************************************************************************
-* read_clib_callback
-****************************************************************************/
-
-static void read_clib_callback(GtkToggleButton *item, gpointer data)
-{
-    
-    s_filesel = gtk_file_selection_new("Read clib data From...");
-    
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(s_filesel), 
-				    "clib.out");
-
-    gtk_signal_connect (GTK_OBJECT (
-        GTK_FILE_SELECTION(s_filesel)->ok_button),
-                        "clicked", 
-                        GTK_SIGNAL_FUNC(get_clib_name), NULL);
-                            
-    gtk_signal_connect_object (GTK_OBJECT (
-        GTK_FILE_SELECTION(s_filesel)->ok_button),
-                               "clicked", 
-                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                               (gpointer) s_filesel);
-    
-    gtk_signal_connect_object (GTK_OBJECT (
-        GTK_FILE_SELECTION(s_filesel)->cancel_button),
-                               "clicked", 
-                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                               (gpointer) s_filesel);
-    gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(s_filesel));
-    gtk_widget_show (s_filesel);
-}
-
-/****************************************************************************
-* menu1_init
-****************************************************************************/
-
-void menu1_init(void)
-{
-
-    s_filemenu = gtk_menu_new();
-
-    s_readcpel = gtk_menu_item_new_with_label 
-	("Read CPEL file");
-    gtk_menu_append(GTK_MENU(s_filemenu), s_readcpel);
-    gtk_signal_connect(GTK_OBJECT(s_readcpel), "activate", 
-                       GTK_SIGNAL_FUNC(read_cpel_callback), 0);
-
-    s_readclib = gtk_menu_item_new_with_label 
-	("Read CLIB file");
-    gtk_menu_append(GTK_MENU(s_filemenu), s_readclib);
-    gtk_signal_connect(GTK_OBJECT(s_readclib), "activate", 
-                       GTK_SIGNAL_FUNC(read_clib_callback), 0);
-    
-    s_readdefs = gtk_menu_item_new_with_label ("Read Event Definitions");
-    gtk_menu_append(GTK_MENU(s_filemenu), s_readdefs);
-    gtk_signal_connect(GTK_OBJECT(s_readdefs), "activate", 
-                       GTK_SIGNAL_FUNC(read_eventdef_callback), 0);
-    
-    s_readevents = gtk_menu_item_new_with_label ("Read Event Log");
-    gtk_menu_append(GTK_MENU(s_filemenu), s_readevents);
-    gtk_signal_connect(GTK_OBJECT(s_readevents), "activate", 
-                       GTK_SIGNAL_FUNC(read_events_callback), 0);
-    
-    s_readeventsclock = gtk_menu_item_new_with_label 
-	("Read Event Log with Different Clock Rate");
-    gtk_menu_append(GTK_MENU(s_filemenu), s_readeventsclock);
-    gtk_signal_connect(GTK_OBJECT(s_readeventsclock), "activate", 
-                       GTK_SIGNAL_FUNC(read_eventsclock_callback), 0);
-
-    s_print = gtk_menu_item_new_with_label ("Print");
-    gtk_menu_append(GTK_MENU(s_filemenu), s_print);
-    gtk_signal_connect(GTK_OBJECT(s_print), "activate", 
-                       GTK_SIGNAL_FUNC(view1_print_callback), 0);
-    
-    s_quit = gtk_menu_item_new_with_label ("Exit");
-    gtk_menu_append(GTK_MENU(s_filemenu), s_quit);
-    gtk_signal_connect(GTK_OBJECT(s_quit), "activate", 
-                       GTK_SIGNAL_FUNC(gtk_main_quit), 0);
-
-    s_mainfilemenu = gtk_menu_item_new_with_label("File");
-    gtk_menu_item_set_submenu(GTK_MENU_ITEM(s_mainfilemenu), s_filemenu);
-
-    s_helpmenu = gtk_menu_new();
-
-    s_help_general = gtk_menu_item_new_with_label ("General");
-    gtk_menu_append(GTK_MENU(s_helpmenu), s_help_general);
-    gtk_signal_connect(GTK_OBJECT(s_help_general), "activate", 
-                       GTK_SIGNAL_FUNC(help_general_callback), 0);
-
-    s_help_about = gtk_menu_item_new_with_label ("About");
-    gtk_menu_append(GTK_MENU(s_helpmenu), s_help_about);
-    gtk_signal_connect(GTK_OBJECT(s_help_about), "activate", 
-                       GTK_SIGNAL_FUNC(help_about_callback), 0);
-
-    s_mainhelpmenu = gtk_menu_item_new_with_label("Help");
-    gtk_menu_item_set_submenu(GTK_MENU_ITEM(s_mainhelpmenu), s_helpmenu);
-
-    s_mainmenubar = gtk_menu_bar_new();
-    gtk_menu_bar_append(GTK_MENU_BAR(s_mainmenubar), s_mainfilemenu);
-    gtk_menu_bar_append(GTK_MENU_BAR(s_mainmenubar), s_mainhelpmenu);
-    gtk_widget_show_all(s_mainmenubar);
-
-    gtk_box_pack_start(GTK_BOX(g_mainvbox), s_mainmenubar, FALSE, FALSE, 0);
-}
diff --git a/g2/mkversion.c b/g2/mkversion.c
deleted file mode 100644
index 3523fbe6..00000000
--- a/g2/mkversion.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 1997-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <time.h>
-#include <string.h>
-
-int main (int argc, char **argv)
-{
-    time_t now;
-    FILE *ofp;
-    char *dateval;
-    char *username;
-    char *userstr;
-    char *datestr;
-    int i;
-    char propname[32];
-    char *propvalue;
-    char timestr[64];
-    char *cp;
-
-    if (argc < 4) {
-        printf ("usage: mkversion ostype version outputfile\n");
-        exit (1);
-    }
-
-    ofp = fopen (argv[3], "w");
-    if (ofp == NULL) {
-        printf ("Couldn't create %s\n", argv[3]);
-        exit (1);
-    }
-
-    now = time (0);
-    
-    fprintf (ofp, "/*\n");
-    fprintf (ofp, " * G2 Version Stamp, %s",
-             ctime (&now));
-    fprintf (ofp, " * Automatically generated, hand edits are pointless.\n");
-    fprintf (ofp, " */\n\n");
-
-    fprintf (ofp, 
-            "const char *version_string = \"G2 (%s) major version %s\";\n",
-             argv[1], argv[2]);
-    
-    username = (char *) cuserid (0);
-
-    strcpy(timestr, ctime(&now));
-    
-    cp = timestr;
-
-    while (*cp) {
-        cp++;
-    }
-    if (*--cp == '\n')
-        *cp = 0;
-
-    fprintf (ofp,
-             "const char *minor_v_string = \"Built by %s at %s\";\n",
-             username, timestr);
-    
-    exit (0);
-}
-
-    
diff --git a/g2/pointsel.c b/g2/pointsel.c
deleted file mode 100644
index 018dc213..00000000
--- a/g2/pointsel.c
+++ /dev/null
@@ -1,854 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2005-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <strings.h>
-#include <ctype.h>
-#include <string.h>
-#include <gtk/gtk.h>
-#include "g2.h"
-
-/*
- * globals
- */
-event_def_t g_eventdefs[NEVENTS];
-
-/*
- * locals
- */
-static GtkWidget *s_pointselbox;
-static FILE *s_hfp;
-static FILE *s_elog_hfp;
-static int s_basenum;
-static GtkWidget *s_event_buttons[NEVENTS];
-static int s_min_shown_pointsel;
-static int s_max_shown_pointsel;
-static GtkWidget *s_allbutton;
-static GtkWidget *s_nonebutton;
-static GtkWidget *s_pointselbuttons;
-static GtkWidget *s_ps_vscroll;
-static GtkObject *s_ps_vsadj;
-static int g_neventdefs;
-
-enum button_click {
-    ALL_BUTTON=1,
-    NONE_BUTTON,
-};
-
-/*
- * config params
- */
-int c_maxpointsel;
-
-/****************************************************************************
-* recompute_vscrollbar
-****************************************************************************/
-
-static void recompute_ps_vscrollbar (void)
-{
-    GtkAdjustment *adj;
-    ulong limit;
-
-    adj = GTK_ADJUSTMENT(s_ps_vsadj);
-
-#ifdef NOTDEF
-    /* This seems like the right calculation, but seems not to work */
-    if (g_neventdefs > c_maxpointsel)
-        limit = g_neventdefs - c_maxpointsel;
-    else
-        limit = g_neventdefs;
-#else
-    limit = g_neventdefs-1;
-#endif
-
-    adj->lower = (gfloat)0.00;
-    adj->upper = (gfloat)limit;
-    adj->value = (gfloat)0.00;
-    adj->step_increment = (gfloat)1.00;
-    adj->page_increment = (gfloat)(c_maxpointsel / 3);
-    adj->page_size = (gfloat)c_maxpointsel;
-    gtk_adjustment_changed(adj);
-    gtk_adjustment_value_changed(adj);
-    gtk_widget_show(s_ps_vscroll);
-}
-
-/****************************************************************************
-* point_select_callback
-****************************************************************************/
-
-static void point_select_callback(GtkToggleButton *item, gpointer data)
-{
-    int i = (int) (unsigned long long) data;
-
-    g_eventdefs[i].selected = gtk_toggle_button_get_active(
-        GTK_TOGGLE_BUTTON(s_event_buttons[i]));
-    view1_display_when_idle();
-}
-
-/****************************************************************************
-* up_button
-****************************************************************************/
-
-static void up_button(void)
-{
-    int i;
-    int increment = c_maxpointsel/4;
-
-    if (s_min_shown_pointsel == 0)
-        return;
-
-    s_min_shown_pointsel -= increment;
-
-    if (s_min_shown_pointsel < 0)
-        s_min_shown_pointsel = 0;
-
-    s_max_shown_pointsel = s_min_shown_pointsel + c_maxpointsel;
-
-    for (i = 0; i < g_neventdefs; i++) {
-        if (i >= s_min_shown_pointsel &&
-            i <= s_max_shown_pointsel)
-            gtk_widget_show(s_event_buttons[i]);
-        else
-            gtk_widget_hide(s_event_buttons[i]);
-    }
-
-}
-
-#ifdef NOTDEF
-/****************************************************************************
-* down_button
-****************************************************************************/
-
-static void down_button(void)
-{
-    int i;
-    int increment = c_maxpointsel/4;
-
-    if (s_max_shown_pointsel == g_neventdefs)
-        return;
-
-    s_max_shown_pointsel += increment;
-
-    if (s_max_shown_pointsel >= g_neventdefs)
-        s_max_shown_pointsel = (g_neventdefs-1);
-
-    s_min_shown_pointsel = s_max_shown_pointsel - c_maxpointsel;
-
-    if (s_min_shown_pointsel < 0)
-        s_min_shown_pointsel = 0;
-
-    for (i = 0; i < g_neventdefs; i++) {
-        if (i >= s_min_shown_pointsel &&
-            i <= s_max_shown_pointsel)
-            gtk_widget_show(s_event_buttons[i]);
-        else
-            gtk_widget_hide(s_event_buttons[i]);
-    }
-
-}
-#endif
-
-/****************************************************************************
-* button_click_callback
-****************************************************************************/
-
-static void button_click_callback(GtkButton *item, gpointer data)
-{
-    int i;
-    enum button_click click = (enum button_click)data;
-
-    switch (click) {
-    case ALL_BUTTON:
-        for (i = 0; i < g_neventdefs; i++) {
-            gtk_toggle_button_set_active (
-                GTK_TOGGLE_BUTTON(s_event_buttons[i]), TRUE);
-            g_eventdefs[i].selected = TRUE;
-        }
-        break;
-
-    case NONE_BUTTON:
-        for (i = 0; i < g_neventdefs; i++) {
-            gtk_toggle_button_set_active (
-                GTK_TOGGLE_BUTTON(s_event_buttons[i]), FALSE);
-            g_eventdefs[i].selected = FALSE;
-        }
-        break;
-    }
-}
-
-/****************************************************************************
-* scroll_callback
-****************************************************************************/
-
-static void scroll_callback (GtkAdjustment *adj, GtkWidget *notused)
-{
-    int i;
-
-    s_min_shown_pointsel = (int)adj->value;
-    s_max_shown_pointsel = s_min_shown_pointsel + c_maxpointsel;
-
-    for (i = 0; i < g_neventdefs; i++) {
-        if (i >= s_min_shown_pointsel &&
-            i <= s_max_shown_pointsel)
-            gtk_widget_show(s_event_buttons[i]);
-        else
-            gtk_widget_hide(s_event_buttons[i]);
-    }
-}
-
-/****************************************************************************
-* point_selector_init
-****************************************************************************/
-
-void point_selector_init(void)
-{
-
-    c_maxpointsel = atol(getprop_default("event_selector_lines", "20"));
-
-    s_pointselbox = gtk_vbox_new(FALSE,5);
-
-    s_pointselbuttons = gtk_hbox_new(FALSE,5);
-
-    s_allbutton = gtk_button_new_with_label("ALL");
-    gtk_widget_show(s_allbutton);
-    s_nonebutton = gtk_button_new_with_label("NONE");
-    gtk_widget_show(s_nonebutton);
-
-    gtk_signal_connect (GTK_OBJECT(s_allbutton), "clicked",
-                        GTK_SIGNAL_FUNC(button_click_callback), 
-                        (gpointer) ALL_BUTTON);
-
-    gtk_signal_connect (GTK_OBJECT(s_nonebutton), "clicked",
-                        GTK_SIGNAL_FUNC(button_click_callback), 
-                        (gpointer) NONE_BUTTON);
-
-    gtk_box_pack_start(GTK_BOX(s_pointselbuttons), s_allbutton, FALSE, 
-                       FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(s_pointselbuttons), s_nonebutton, FALSE, 
-                       FALSE, 0);
-    
-    gtk_widget_show(s_pointselbuttons);
-    gtk_widget_ref(s_pointselbuttons); 
-
-    gtk_box_pack_start(GTK_BOX(s_pointselbox), s_pointselbuttons, FALSE, 
-                       FALSE, 0);
-
-    gtk_box_pack_end (GTK_BOX(g_mainhbox), s_pointselbox, 
-                       FALSE, FALSE, 0);
-
-    s_ps_vsadj = gtk_adjustment_new(0.0 /* initial value */, 
-                                    0.0 /* minimum value */,
-                                    2000.0 /* maximum value */,
-                                    0.1 /* step increment */, 
-                                    10.0/* page increment */, 
-                                    10.0/* page size */);
-    
-    s_ps_vscroll = gtk_vscrollbar_new (GTK_ADJUSTMENT(s_ps_vsadj));
-    gtk_signal_connect (GTK_OBJECT (s_ps_vsadj), "value-changed",
-                        GTK_SIGNAL_FUNC (scroll_callback), 
-                        (gpointer)s_ps_vscroll);
-    gtk_box_pack_end(GTK_BOX(g_mainhbox), s_ps_vscroll, FALSE, FALSE, 0);
-}
-
-/****************************************************************************
-* sxerox
-****************************************************************************/
-
-char *sxerox (char *s)
-{
-    char *rv;
-
-    /* Note: g_malloc does or dies... */
-    rv = (char *)g_malloc(strlen(s)+1);
-    strcpy (rv, s);
-    return (rv);
-}
-
-/****************************************************************************
-* reset_point_selector
-****************************************************************************/
-
-static void reset_point_selector(void)
-{
-    int i;
-
-    gtk_widget_hide(s_pointselbox);
-    gtk_widget_hide(s_pointselbuttons);
-    gtk_widget_hide(s_ps_vscroll);
-    gtk_container_remove(GTK_CONTAINER(s_pointselbox), 
-                         s_pointselbuttons);
-    
-    for (i = 0; i < g_neventdefs; i++) {
-        if (s_event_buttons[i]) {
-            gtk_container_remove(GTK_CONTAINER(s_pointselbox), 
-                                 s_event_buttons[i]);
-            s_event_buttons[i] = 0;
-        }
-    }
-}
-
-/****************************************************************************
-* create_point_selector
-****************************************************************************/
-
-static void create_point_selector(void)
-{
-    int i;
-    char tmpbuf [1024];
-    event_def_t *ep;
-    GtkWidget *wp;
-
-    for (i = 0; i < g_neventdefs; i++) {
-        ep = &g_eventdefs[i];
-        sprintf(tmpbuf, "[%lu] %s", ep->event, 
-                ep->name ? ep->name : "(none)");
-        /* Hack to reduce width of point selectors */
-        if (strlen(tmpbuf) > 50) {
-            tmpbuf[50] = 0;
-        }
-
-        wp = gtk_check_button_new_with_label (tmpbuf);
-        s_event_buttons[i] = wp;
-        gtk_signal_connect (GTK_OBJECT(wp), "toggled",
-                            GTK_SIGNAL_FUNC(point_select_callback), 
-                            (gpointer) (unsigned long long) i);
-        gtk_toggle_button_set_active (
-            GTK_TOGGLE_BUTTON(wp), TRUE);
-        gtk_box_pack_start(GTK_BOX(s_pointselbox), wp, FALSE, FALSE, 0);
-    }
-
-    /* set up scroll parameters by faking an up-button */
-    s_min_shown_pointsel = 1;
-    up_button();
-
-    gtk_box_pack_start(GTK_BOX(s_pointselbox), s_pointselbuttons, FALSE, 
-                       FALSE, 0);
-    gtk_widget_show(s_pointselbuttons);
-    gtk_widget_show(s_pointselbox);
-    gtk_widget_show(s_ps_vscroll);
-}
-
-/****************************************************************************
-* remove_all_events
-****************************************************************************/
-
-static void remove_all_events(void)
-{
-    event_def_t *ep;
-    int i;
-
-    for (i = 0; i < g_neventdefs; i++) {
-        ep = &g_eventdefs[i];
-        if (!ep->is_clib) {
-            if (ep->name)
-                g_free(ep->name);
-            if(ep->format)
-                g_free(ep->format);
-        }
-    }
-    g_neventdefs = 0;
-}
-
-/****************************************************************************
-* add_event
-****************************************************************************/
-
-static void add_event(ulong event, char *name, char *format)
-{
-    int i;
-    event_def_t *ep;
-
-    if (g_neventdefs >= NEVENTS) {
-        g_error("Too many event definitions, increase NEVENTS!");
-        /*NOTREACHED*/
-    }
-        
-    /* Simple dup check, probably not needed very often */
-    for (i = 0; i < g_neventdefs; i++) {
-        if (g_eventdefs[i].event == event) {
-            g_warning("Duplicate def event %lu: first definition retained\n",
-                      event);
-            return;
-        }
-    }
-
-    ep = &g_eventdefs[g_neventdefs++];
-
-    ep->event = event;
-    ep->name = sxerox(name);
-    ep->format = sxerox(format);
-    ep->selected = TRUE;
-}
-
-/****************************************************************************
-* add_event_from_cpel_file
-****************************************************************************/
-
-void add_event_from_cpel_file(ulong event, char *event_format, 
-                              char *datum_format)
-{
-    event_def_t *ep;
-
-    if (g_neventdefs >= NEVENTS) {
-        g_error("Too many event definitions, increase NEVENTS!");
-        /*NOTREACHED*/
-    }
-
-    ep = &g_eventdefs[g_neventdefs++];
-
-    ep->event = event;
-    /*
-     * Duplicate the strings for backward compatibility. Otherwise,
-     * the g_free above will barf because the name/format strings are
-     * actually in mmap'ed memory 
-     */
-    ep->name = sxerox(event_format);
-    ep->format = sxerox(datum_format);
-    ep->selected = TRUE;
-}
-
-/****************************************************************************
-* add_event_from_clib_file
-****************************************************************************/
-
-void add_event_from_clib_file(unsigned int event, char *name, 
-                              unsigned int vec_index)
-{
-    event_def_t *ep;
-
-    if (g_neventdefs >= NEVENTS) {
-        g_error("Too many event definitions, increase NEVENTS!");
-        /*NOTREACHED*/
-    }
-
-    ep = &g_eventdefs[g_neventdefs++];
-
-    ep->event = event;
-
-    ep->name = sxerox(name);
-    ep->format = (void *)(unsigned long long) vec_index;
-    ep->selected = TRUE;
-    ep->is_clib = TRUE;
-}
-
-/****************************************************************************
-* read_header_file - eats header file lines of the form
-*
-*     #define EVENT_FOO  123	/ * name: %d * /
-*
-****************************************************************************/
-
-static void read_header_file (void)
-{
-    char tmpbuf [1024];
-    char *name, *format;
-    char *cp;
-    unsigned long event;
-    int ev_num_flag;
-
-    while (fgets (tmpbuf, sizeof (tmpbuf), s_hfp))
-    {
-        cp = tmpbuf;
-        ev_num_flag = 0;
-
-        if (strncmp (cp, "#define", 7))
-            continue;
-
-        /* skip #define */
-        while (*cp && !(isspace ((int)*cp)))
-            cp++;
-
-        if (*cp == 0)
-            continue;
-
-        /* skip ws after #define */
-        while (*cp && isspace ((int)*cp))
-            cp++;
-            
-        if (*cp == 0)
-            continue;
-
-        /* skip symbolic name */
-        while (*cp && !(isspace ((int)*cp)))
-            cp++;
-
-        if (*cp == 0)
-            continue;
-
-        /* skip ws after symbolic name */
-        while (*cp && isspace ((int)*cp))
-            cp++;
-            
-        if (*cp == 0)
-            continue;
-
-        event = 0;
-
-        if (!strncmp(cp, "EV_NUM", 6)) {
-            cp += 6;
-            ev_num_flag = 1;
-
-            while (*cp && *cp != '(')
-                cp++;
-            
-            if (*cp == 0)
-                continue;
-
-            cp++; 
-
-            while (*cp && isspace ((int)*cp))
-                cp++;
-            
-        } 
-
-        /* eat event code. */
-        while (*cp && isdigit ((int)*cp))
-        {
-            event = event * 10 + (*cp - '0');
-            cp++;
-        }
-
-        if (*cp == 0)
-            continue;
-
-        if (ev_num_flag) {
-            while (*cp && *cp != ')')
-                cp++;
-            if (*cp == 0)
-                continue;
-            cp++;
-            event += s_basenum;
-        }
-
-        /* skip ws after event code */
-        while (*cp && isspace ((int)*cp))
-            cp++;
-            
-        if (*cp != '/')
-            continue;
-
-        cp++;
-
-        if (*cp != '*')
-            continue;
-
-        cp++;
-
-        /* skip ws after comment start */
-        while (*cp && isspace ((int)*cp))
-            cp++;
-
-        if (*cp == 0)
-            continue;
-
-        name = cp;
-
-        /* accumulate name */
-        while (*cp && *cp != ':' && *cp != '*')
-            cp++;
-
-        if (*cp == 0)
-            continue;
-
-        *cp++ = 0;
-        
-        /* skip ws after name: */
-        while (*cp && isspace ((int)*cp))
-            cp++;
-        
-        if (*cp == 0 || *cp == '/')
-        {
-            format = " ";
-            goto write_it;
-        }
-
-        format = cp;
-        
-        /* accumulate format string */
-        while (*cp && !isspace ((int)*cp))
-            cp++;
-
-        *cp = 0;
-
-    write_it:
-
-        add_event (event, name, format);
-    }
-}
-
-/****************************************************************************
-* read_header_files - eats header file lines of the form
-*
-*     #define FILE1_BASE  100	/ * pointdefs: ../vpn/vpn_points.h * /
-*
-****************************************************************************/
-
-static boolean read_header_files (void)
-{
-    char *cp, *name;
-    char tmpbuf [1024];
-    int basenum;
-    boolean rv=FALSE;
-
-    while (fgets (tmpbuf, sizeof (tmpbuf), s_elog_hfp))
-    {
-        cp = tmpbuf;
-
-        if (strncmp (cp, "#define", 7))
-            continue;
-
-        cp += 7;
-
-        /* skip ws after #define */
-        while (*cp && isspace ((int)*cp))
-            cp++;
-
-        if (*cp == 0)
-            continue;
-
-        /* skip EV_COMPxxx_START */
-        while (*cp && !isspace((int)*cp))
-            cp++;
-
-        if (*cp == 0)
-            continue;
-
-        /* skip ws after EV_COMPxxx_START */
-        while (*cp && isspace ((int)*cp))
-            cp++;
-        
-        if (*cp == 0)
-            continue;
-        
-        basenum = atol (cp);
-        
-        /* skip #define */
-        while (*cp && (*cp != '/'))
-            cp++;
-
-        if (*cp == 0)
-            continue;
-
-        cp++;
-        if (*cp != '*')
-            continue;
-
-        cp++;
-
-        /* skip ws after comment start */
-        while (*cp && isspace ((int)*cp))
-            cp++;
-
-        if (*cp == 0)
-            continue;
-
-        if (strncmp (cp, "pointdefs:", 10))
-            continue;
-
-        cp += 10;
-
-        /* skip ws after comment start */
-        while (*cp && isspace ((int)*cp))
-            cp++;
-
-        name = cp;
-
-        while (*cp && !isspace ((int)*cp))
-            cp++;
-       
-        *cp = 0;
-
-        s_hfp = fopen (name, "rt");
-
-        if (s_hfp == NULL) {
-            g_warning ("Couldn't open header file %s\n", name);
-            continue;
-        }
-        rv = TRUE;
-
-        s_basenum = basenum;
-
-        read_header_file();
-
-        fclose (s_hfp);
-    }
-    return(rv);
-}
-
-/****************************************************************************
-* event_def_cmp
-****************************************************************************/
-
-int event_def_cmp(const void *a1, const void *a2)
-{
-    event_def_t *e1 = (event_def_t *)a1;
-    event_def_t *e2 = (event_def_t *)a2;
-
-    if (e1->event < e2->event)
-        return(-1);
-    else if (e1->event == e2->event)
-        return(0);
-    else
-        return(1);
-}
-
-/****************************************************************************
-* sort_event_definitions
-****************************************************************************/
-
-void sort_event_definitions(void)
-{
-    qsort(&g_eventdefs[0], g_neventdefs, sizeof(event_def_t), event_def_cmp);
-}
-
-static boolean remove_needed=TRUE;
-
-void finalize_events(void)
-{
-    sort_event_definitions();
-    create_point_selector();
-    recompute_ps_vscrollbar();
-    view1_display_when_idle();
-    remove_needed = TRUE;
-}
-
-void initialize_events(void)
-{
-    if (remove_needed) {
-        reset_point_selector();
-        remove_all_events();
-        remove_needed = FALSE;
-    }
-}
-
-/****************************************************************************
-* read_event_definitions
-****************************************************************************/
-
-boolean read_event_definitions (char *filename)
-{
-    char tmpbuf [128];
-
-    initialize_events();
-
-    s_elog_hfp = fopen (filename, "rt");
-    if (s_elog_hfp == NULL) {
-        sprintf (tmpbuf, "Couldn't open %s\n", filename);
-        infobox ("Open Failed", tmpbuf);
-        return(FALSE);
-    }
-    /* Presume "elog.h".  Note fallthrough... */
-    if (read_header_files()) {
-        sort_event_definitions();
-        create_point_selector();
-        recompute_ps_vscrollbar();
-        fclose(s_elog_hfp);
-        view1_display_when_idle();
-        remove_needed = TRUE;
-        return(TRUE);
-    }
-    fclose(s_elog_hfp);
-
-    s_hfp = fopen (filename, "rt");
-    if (s_hfp == NULL) {
-        sprintf (tmpbuf, "Couldn't open %s\n", filename);
-        infobox ("Read Event Definition Failure", tmpbuf);
-        return(FALSE);
-    }
-
-    read_header_file();
-
-    /* Happens if the user feeds us the wrong file, for example */
-    if (g_neventdefs == 0) {
-        sprintf (tmpbuf, "No event definitions found in %s\n", filename);
-        infobox ("No Event Definitions?", tmpbuf);
-        return(FALSE);
-    }
-    finalize_events();
-    return(TRUE);
-}
-
-static event_def_t dummy_event;
-static char dummy_string[32];
-
-/****************************************************************************
-* find_event_definition
-* Binary search for first event whose time is >= t
-****************************************************************************/
-
-event_def_t *find_event_definition (ulong code)
-{
-    int index, bottom, top;
-    event_def_t *edp;
-
-    if (g_neventdefs == 0)
-        goto use_dummy;
-
-    bottom = g_neventdefs-1;
-    top = 0;
-
-    while (1) {
-	index = (bottom + top) / 2;
-
-        edp = (g_eventdefs + index);
-        
-        if (edp->event == code)
-            return(edp);
-
-        if (top >= bottom) {
-        use_dummy:
-            edp = &dummy_event;
-            edp->selected = TRUE;
-            edp->event = code;
-            edp->format = "0x%x";
-            sprintf (dummy_string, "E%lu", code);
-            edp->name = &dummy_string[0];
-            return(edp);
-        }
-
-        if (edp->event < code)
-            top = index + 1;
-        else 
-            bottom = index - 1;
-    }
-}
-
-/****************************************************************************
-* pointsel_next_snapshot
-* Set dialog buttons from snapshot
-****************************************************************************/
-
-void pointsel_next_snapshot(void)
-{
-    int i;
-    
-    for (i = 0; i < g_neventdefs; i++) {
-        gtk_toggle_button_set_active (
-            GTK_TOGGLE_BUTTON(s_event_buttons[i]), 
-            g_eventdefs[i].selected);
-    }
-}
-
-/****************************************************************************
-* pointsel_about
-****************************************************************************/
-
-void pointsel_about (char *tmpbuf)
-{
-    sprintf (tmpbuf+strlen(tmpbuf), "%d event definitions\n", 
-             g_neventdefs);
-}
diff --git a/g2/props.c b/g2/props.c
deleted file mode 100644
index a23dc050..00000000
--- a/g2/props.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 1997-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <stdio.h>
-#include <ctype.h>
-#include <malloc.h>
-#include <time.h>
-#include <gtk/gtk.h>
-#include <string.h>
-
-static char *sxerox (char *s);
-void exit(int);
-
-#define NBUCKETS 97
-
-typedef struct prop_ {
-    struct prop_ *next;
-    char *name;
-    char *value;
-} prop_t;
-
-static prop_t *buckets [NBUCKETS];
-static int hash_shifts[4] = {24, 16, 8, 0};
-
-/*
- * getprop 
- */
-
-char *getprop (char *name)
-{
-    unsigned char *cp;
-    unsigned long hash=0;
-    prop_t *bp;
-    int i=0;
-
-    for (cp = (unsigned char *) name; *cp; cp++)
-        hash ^= (*cp)<<(hash_shifts[(i++)&0x3]);
-
-    bp = buckets [hash%NBUCKETS];
-
-    while (bp && strcmp (bp->name, name)) {
-        bp = bp->next;
-    }
-
-    if (bp == NULL)
-        return (0);
-    else
-        return (bp->value);
-}
-
-/*
- * getprop_default
- */
-
-char *getprop_default (char *name, char *def)
-{
-    char *rv;
-    rv = getprop (name);
-    if (rv)
-        return (rv);
-    else
-        return (def);
-}
-
-/*
- * addprop
- */
-
-void addprop (char *name, char *value)
-{
-    unsigned char *cp;
-    unsigned long hash=0;
-    prop_t **bpp;
-    prop_t *bp;
-    int i=0;
-
-    bp = (prop_t *)g_malloc (sizeof (prop_t));
-
-    bp->next = 0;
-    bp->name = sxerox (name);
-    bp->value = sxerox (value);
-
-    for (cp = (unsigned char *)name; *cp; cp++)
-        hash ^= (*cp)<<(hash_shifts[(i++)&0x3]);
-
-    bpp = &buckets [hash%NBUCKETS];
-
-    if (*bpp == NULL)
-        *bpp = bp;
-    else {
-        bp->next = *bpp;
-        *bpp = bp;
-    }
-}
-
-/*
- * sxerox 
- */
-
-static char *sxerox (char *s)
-{
-    char *rv = (char *) g_malloc (strlen (s) + 1);
-    strcpy (rv, s);
-    return rv;
-}
-
-/*
- * readprops 
- */
-
-#define START 0
-#define READNAME  1
-#define READVALUE 2
-#define C_COMMENT 3
-#define CPP_COMMENT 4
-
-int readprops (char *filename)
-{
-    FILE *ifp;
-    unsigned char c;
-    int state=START;
-    int linenum=1;
-    char namebuf [128];
-    char valbuf [512];
-    int i;
-
-    ifp = fopen (filename, "r");
-
-    if (ifp == NULL)
-        return (-1);
-
-    while (1) {
-
-    readchar:
-        c = getc (ifp);
-
-    again:
-        switch (state) {
-        case START:
-            if (feof (ifp)) {
-                fclose (ifp);
-                return (0);
-            }
-
-            if (c == ' ' || c == '\t')
-                goto readchar;
-
-            if (c == '\n') {
-                linenum++;
-                goto readchar;
-            }
-            if (isalpha (c) || (c == '_')) {
-                state = READNAME;
-                goto again;
-            }
-            if (c == '/') {
-                c = getc (ifp);
-                if (c == '/') {
-                    state = CPP_COMMENT;
-                    goto readchar;
-                } else if (c == '*') {
-                    state = C_COMMENT;
-                    goto readchar;
-                } else {
-                    fprintf (stderr, "unknown token '/' line %d\n",
-                             linenum);
-                    exit (1);
-                }
-            }
-            fprintf (stderr, "unknown token '%c' line %d\n",
-                     c, linenum);
-            exit (1);
-            break;
-            
-        case CPP_COMMENT:
-            while (1) {
-                c = getc (ifp);
-                if (feof (ifp))
-                    return (0);
-                if (c == '\n') {
-                    linenum++;
-                    state = START;
-                    goto readchar;
-                }
-            }
-            break;
-
-        case C_COMMENT:
-            while (1) {
-                c = getc (ifp);
-                if (feof (ifp)) {
-                    fprintf (stderr, "unterminated comment, line %d\n",
-                             linenum);
-                    exit (1);
-                }
-                if (c == '*') {
-                staragain:
-                    c = getc (ifp);
-                    if (c == '/') {
-                        state = START;
-                        goto readchar;
-                    }
-                    if (c == '*')
-                        goto staragain;
-                }
-            }
-            break;
-                    
-        case READNAME:
-            i = 0;
-            namebuf[i++] = c;
-            while (1) {
-                c = getc (ifp);
-                if (feof (ifp)) {
-                    fprintf (stderr, "EOF while reading a name, line %d\n",
-                             linenum);
-                    exit (1);
-                }
-                if ((!isalnum (c)) && (c != '_')) {
-                    namebuf [i] = 0;
-                    state = READVALUE;
-                    goto again;
-                }
-                namebuf [i++] = c;
-            }
-            break;
-
-        case READVALUE:
-            i = 0;
-            while ((c == ' ') || (c == '\t') || (c == '=')) {
-                c = getc (ifp);
-                if (feof (ifp)) {
-                    fprintf (stderr, "EOF while reading a value, line %d\n",
-                             linenum);
-                    exit (1);
-                }
-            }
-            goto firsttime;
-            while (1) {
-                c = getc (ifp);
-
-            firsttime:
-                if (c == '\\') {
-                    c = getc (ifp);
-                    if (feof (ifp)) {
-                        fprintf (stderr, "EOF after '\\', line %d\n",
-                                 linenum);
-                        exit (1);
-                    }
-                    valbuf[i++] = c;
-                    continue;
-                }
-                if (c == '\n') {
-                    linenum++;
-                    while (valbuf [i-1] == ' ' || valbuf[i-1] == '\t')
-                        i--;
-                    valbuf[i] = 0;
-                    addprop (namebuf, valbuf);
-                    state = START;
-                    goto readchar;
-                }
-                valbuf[i++] = c;
-            }
-
-        }
-    }
-}
diff --git a/g2/props.h b/g2/props.h
deleted file mode 100644
index 6289941d..00000000
--- a/g2/props.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 1997-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-extern char *getprop (char *name);
-extern char *getprop_default (char *name, char *def);
-extern void addprop (char *name, char *value);
-extern int readprops (char *filename);
-extern int writeprops (char *filename);
diff --git a/g2/view1.c b/g2/view1.c
deleted file mode 100644
index ec394cc3..00000000
--- a/g2/view1.c
+++ /dev/null
@@ -1,3077 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2005-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include "g2.h"
-#include <time.h>
-#include <string.h>
-#include <vppinfra/format.h>
-#include <vppinfra/elog.h>
-
-/*
- * The main event display view.
- * 
- * Important variables:
- *
- * "da" -- the drawing area, aka the screen representation of the
- *         event view.
- *
- * "pm" -- the backing pixmap for the drawing area. Note that
- *         all graphics operations target this backing
- *         store, then call gtk_widget_draw to copy a rectangle from
- *         the backing store onto the screen.
- *
- * "s_v1" -- pointer to the current v1_geometry_t object.
- * 
- * Box heirarchy:
- * s_view1_vbox
- *     s_view1_hbox
- *         da  s_view1_vmenubox
- *                  s_view1_topbutton("Top")
- *                  s_view1_vscroll (vertical scrollbar)
- *                  s_view1_bottombutton("Bottom")
- *     s_view1_hmenubox
- *         s_view1_startbutton("Start");
- *         s_view1_hscroll(horizontal scrollbar)
- *         s_view1_endbutton("End")
- *         s_view1_zoominbutton("Zoomin")
- *         s_view1_searchbutton("Search")
- *         s_view1_searchagainbutton("Search Again")
- *         s_view1_zoomoutbutton("Zoomout")
- *     s_view1_label
- */
-
-/*
- * Globals
- */
-
-GdkFont *g_font;                /* a fixed-width font to use */
-GdkColor fg_black = {0, 0, 0, 0};
-GdkColor bg_white = {0, 65535, 65535, 65535};
-static boolean summary_mode = TRUE; /* start out in summary mode */
-static boolean color_mode   = FALSE; /* start out in color mode   */
-
-/*
- * Locals
- */
-
-/* 
- * user_data values passed to view1_button_click_callback,
- * which is used by the various action buttons noted above
- */
-enum view1_button_click {
-    TOP_BUTTON=1,
-    BOTTOM_BUTTON,
-    START_BUTTON,
-    ZOOMIN_BUTTON,
-    SEARCH_BUTTON,
-    SEARCH_AGAIN_BUTTON,
-    ZOOMOUT_BUTTON,
-    END_BUTTON,
-    MORE_TRACES_BUTTON,
-    LESS_TRACES_BUTTON,
-    SNAP_BUTTON,
-    NEXT_BUTTON,
-    DEL_BUTTON,
-    CHASE_EVENT_BUTTON,
-    CHASE_DATUM_BUTTON,
-    CHASE_TRACK_BUTTON,
-    UNCHASE_BUTTON,
-    FORWARD_BUTTON,
-    BACKWARD_BUTTON,
-    SUMMARY_BUTTON,
-    NOSUMMARY_BUTTON,
-};
-
-enum chase_mode {
-    CHASE_EVENT=1,
-    CHASE_DATUM,
-    CHASE_TRACK,
-};
-
-enum sc_dir {
-    SRCH_CHASE_FORWARD = 0,
-    SRCH_CHASE_BACKWARD = 1,
-};
-
-static GtkWidget *s_view1_hbox; /* see box heirarchy chart */
-static GtkWidget *s_view1_vbox; /* see box heirarchy chart */
-static GtkWidget *da;           /* main drawing area */
-static GdkPixmap *pm;           /* and its backing pixmap */
-static GdkCursor *norm_cursor;  /* the "normal" cursor */
-
-/*
- * view geometry parameters
- *
- * Remember:
- *    Y increases down the page.
- *    Strip origin is at the top
- *    Payday is Friday
- *    Don't put your fingers in your mouth.
- *
- * Most of these values are in pixels
- */
-
-typedef struct v1_geometry {
-    int pid_ax_width;           /* Width of the PID axis */
-    int time_ax_height;         /* Height of the time axis */
-    int time_ax_spacing;        /* TimeAxis: Space between tick-marks */
-    int strip_height;           /* Height of a regular PID trace */
-    int pop_offset;             /* Vertical offset of the detail box */
-    int pid_ax_offset;          /* Vertical offset of the PID axis */
-    int event_offset;           /* Vertical offset of the event boxes */
-    int total_height;           /* total height of da, see configure_event */
-    int total_width;            /* ditto, for width */
-    
-    /* Derived values */
-    int first_pid_index;        /* Index of first displayed PID */
-    int npids;                  /* Max number of displayed pids */
-    ulonglong minvistime;       /* in usec */
-    ulonglong maxvistime;       /* in usec */
-} v1_geometry_t;
-
-
-/* The active geometry object */
-static v1_geometry_t s_v1record; 
-static v1_geometry_t *s_v1 = &s_v1record; 
-
-/* The color array */
-static GdkColor *s_color;
-
-/* Snapshot ring */
-typedef struct snapshot {
-    struct snapshot *next;
-    /* Screen geometry */
-    v1_geometry_t geometry;
-    boolean show_event[NEVENTS];
-    pid_sort_t *pidvec;
-    /*
-     * Note: not worth recomputing the vertical scrollbar, just save
-     *  its value here
-     */
-    gfloat vscroll_value;
-    boolean summary_mode;
-    boolean color_mode;
-} snapshot_t;
-
-static snapshot_t *s_snapshots;
-static snapshot_t *s_cursnap;
-static event_t *s_last_selected_event;
-
-/*
- * various widgets, see the box heirarchy chart above
- * The toolkit keeps track of these things, we could lose many of 
- * these pointers. 
- */
-static GtkWidget *s_view1_vmenubox;
-static GtkWidget *s_view1_topbutton;
-static GtkWidget *s_view1_bottombutton;
-static GtkWidget *s_view1_more_traces_button;
-static GtkWidget *s_view1_less_traces_button;
-
-static GtkWidget *s_view1_hmenubox;
-static GtkWidget *s_view1_hmenubox2;
-static GtkWidget *s_view1_startbutton;
-static GtkWidget *s_view1_zoominbutton;
-static GtkWidget *s_view1_searchbutton;
-static GtkWidget *s_view1_srchagainbutton;
-static GtkWidget *s_view1_zoomoutbutton;
-static GtkWidget *s_view1_endbutton;
-
-static GtkWidget *s_view1_snapbutton;
-static GtkWidget *s_view1_nextbutton;
-static GtkWidget *s_view1_delbutton;
-
-static GtkWidget *s_view1_chase_event_button;
-static GtkWidget *s_view1_chase_datum_button;
-static GtkWidget *s_view1_chase_track_button;
-static GtkWidget *s_view1_unchasebutton;
-
-static GtkWidget *s_view1_forward_button;
-static GtkWidget *s_view1_backward_button;
-
-static GtkWidget *s_view1_summary_button;
-static GtkWidget *s_view1_nosummary_button;
-
-static GtkWidget *s_view1_hscroll;
-static GtkObject *s_view1_hsadj;
-
-static GtkWidget *s_view1_vscroll;
-static GtkObject *s_view1_vsadj;
-
-static GtkWidget *s_view1_label;
-
-/*
- * Search context 
- */
-static ulong s_srchcode;        /* search event code */
-static int s_srchindex;         /* last hit was at this event index */
-static boolean s_result_up;     /* The SEARCH RESULT dongle is displayed */
-static boolean s_srchfail_up;   /* The status line "Search Failed" is up */
-static int srch_chase_dir;      /* search/chase dir, 0=>forward */
-
-
-/*
- * Print context 
- */
-static int s_print_offset;      /* Magic offset added to line, tbox fn codes */
-static FILE *s_printfp;         
-
-/*
- * Forward reference prototypes
- */
-static void display_pid_axis(v1_geometry_t *vp);
-static void display_event_data(v1_geometry_t *vp);
-static void display_time_axis(v1_geometry_t *vp);
-static void view1_button_click_callback(GtkButton *item, gpointer data);
-
-/*
- * config params
- */
-
-gint c_view1_draw_width;
-gint c_view1_draw_height;
-
-/*
- * Zoom-In / Time Ruler cursor
- */
-
-#define zi_width 32
-#define zi_height 32
-#define zi_x_hot 22
-#define zi_y_hot 14
-static unsigned char zi_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
-   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
-   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
-   0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x88, 0x00,
-   0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0xc0, 0x00,
-   0x00, 0xfc, 0xff, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0xa0, 0x00,
-   0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x84, 0x00,
-   0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
-   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
-   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-static unsigned char zi_bkgd[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
-   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
-   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
-   0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x88, 0x00,
-   0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0xc0, 0x00,
-   0x00, 0xfc, 0xff, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0xa0, 0x00,
-   0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x84, 0x00,
-   0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
-   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
-   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-static GdkCursor *zi_cursor;
-static GdkPixmap *zi_source, *zi_mask;
-
-/* 
- * Frequently-used small computations, best
- * done correctly once and instantiated.
- */
-
-/****************************************************************************
-* dtime_per_pixel
-****************************************************************************/
-
-static inline double dtime_per_pixel(v1_geometry_t *vp)
-{
-    return ((double)(vp->maxvistime - vp->minvistime)) /
-        ((double)(vp->total_width - vp->pid_ax_width));
-}
-
-/****************************************************************************
-* message_line
-* Changes the status line.  Pass "" to clear the status line.
-****************************************************************************/
-
-void message_line (char *s)
-{
-    gtk_label_set_text (GTK_LABEL(s_view1_label), s);
-}
-
-/****************************************************************************
-* set_window_title
-* Changes the window title to include the specified filename.
-****************************************************************************/
-
-void set_window_title (const char *filename)
-{
-    char title[128];
-    snprintf(title, sizeof(title), "g2 (%s)", filename);
-    gtk_window_set_title(GTK_WINDOW(g_mainwindow), title);
-}
-
-/****************************************************************************
-* recompute_hscrollbar
-* Adjust the horizontal scrollbar's adjustment object.
-* 
-* GtkAdjustments are really cool, but have to be set up exactly
-* right or the various client objects screw up completely.
-*
-* Note: this function is *not* called when the user clicks the scrollbar.
-****************************************************************************/
-
-static void recompute_hscrollbar (void)
-{
-    ulonglong current_width;
-    ulonglong event_incdec;
-    GtkAdjustment *adj;
-    event_t *ep;
-
-    if (g_nevents == 0)
-        return;
-
-    ep = (g_events + (g_nevents-1));
-    current_width = s_v1->maxvistime - s_v1->minvistime;
-    event_incdec = (current_width) / 6;
-
-    adj = GTK_ADJUSTMENT(s_view1_hsadj);
-
-    /* 
-     * Structure member decoder ring
-     * -----------------------------
-     * lower             the minimum possible value
-     * value             the current value
-     * upper             the maximum possible value
-     * step_increment    end button click increment
-     * page_increment    click in trough increment
-     * page_size         size of currently visible area
-     */
-
-    adj->lower = (gfloat)0.00;  
-    adj->value = (gfloat)s_v1->minvistime;
-
-    /* Minor click: move about 1/6 of a page */
-    adj->step_increment = (gfloat)event_incdec;
-
-    /* Major click: move about 1/3 of a page. */
-    adj->page_increment = (gfloat)(2*event_incdec);
-
-    /* allow the user to go a bit past the end */
-    adj->upper = adj->page_increment/3 + (gfloat)(ep->time);
-    adj->page_size = (gfloat)(current_width);
-
-    /*
-     * Tell all clients (e.g. the visible scrollbar) to 
-     * make themselves look right 
-     */
-    gtk_adjustment_changed(adj);
-    gtk_adjustment_value_changed(adj);
-}
-
-/****************************************************************************
-* recompute_vscrollbar
-* Ditto, for the vertical scrollbar
-****************************************************************************/
-
-static void recompute_vscrollbar (void)
-{
-    GtkAdjustment *adj;
-
-    adj = GTK_ADJUSTMENT(s_view1_vsadj);
-
-    adj->lower = (gfloat)0.00;
-    adj->upper = (gfloat)g_npids;
-    adj->value = (gfloat)0.00;
-    adj->step_increment = 1.00;
-    adj->page_increment = (gfloat)(s_v1->npids / 3);
-    adj->page_size = (gfloat)s_v1->npids;
-    gtk_adjustment_changed(adj);
-    gtk_adjustment_value_changed(adj);
-}
-
-/****************************************************************************
-* format_popbox_string
-****************************************************************************/
-
-elog_main_t elog_main;
-
-void format_popbox_string (char *tmpbuf, int len, event_t *ep, event_def_t *edp)
-{
-    char *fp;
-
-#ifdef NOTDEF
-    sprintf(tmpbuf,"%d:", ep->code);
-#endif
-    if (ep->flags & EVENT_FLAG_CLIB) {
-        elog_event_t *eep;
-        u8 *s;
-
-        eep = get_clib_event (ep->datum);
-        
-        s = format (0, "%U", format_elog_event, &elog_main, eep);
-        memcpy (tmpbuf, s, vec_len(s));
-        tmpbuf[vec_len(s)] = 0;
-        vec_free(s);
-        return;
-    }
-
-    snprintf(tmpbuf, len, "%s", edp->name);
-    fp = edp->format;
-    /* Make sure there's a real format string. If so, add it */
-    while (fp && *fp) {
-        if (*fp != ' ') {
-            snprintf(tmpbuf+strlen(tmpbuf), len - strlen(tmpbuf), ": ");
-            /* %s only supported for cpel files */
-            if (fp[1] == 's') {
-                snprintf(tmpbuf+strlen(tmpbuf), len - strlen(tmpbuf), 
-                         edp->format, strtab_ref(ep->datum));
-            } else {
-                snprintf(tmpbuf+strlen(tmpbuf), len - strlen(tmpbuf), 
-                        edp->format, ep->datum);
-            }
-            return;
-        }
-        fp++;
-    }
-}
-
-/****************************************************************************
- * add_snapshot
- ****************************************************************************/
-
-static void add_snapshot(void)
-{
-    int i;
-    snapshot_t *new = g_malloc(sizeof(snapshot_t));
-
-    memcpy(&new->geometry, s_v1, sizeof(new->geometry));
-    for (i = 0; i < NEVENTS; i++) {
-        new->show_event[i] = g_eventdefs[i].selected;
-    }
-    new->pidvec = g_malloc(sizeof(pid_sort_t)*g_npids);
-    memcpy(new->pidvec, g_pids, sizeof(pid_sort_t)*g_npids);
-    new->vscroll_value =  GTK_ADJUSTMENT(s_view1_vsadj)->value;
-    new->summary_mode = summary_mode;
-    new->color_mode = color_mode;
-
-    if (s_snapshots) {
-        new->next = s_snapshots;
-        s_snapshots = new;
-    } else {
-        new->next = 0;
-        s_snapshots = new;
-    }
-    s_cursnap = new;
-}
-
-/****************************************************************************
- * next_snapshot
- ****************************************************************************/
-
-static void next_snapshot(void)
-{
-    snapshot_t *next;
-    int i;
-    pid_sort_t *psp;
-    pid_data_t *pp;
-
-    if (!s_snapshots) {
-        infobox("No snapshots", "\nNo snapshots in the ring...\n");        
-        return;
-    }
-    
-    next = s_cursnap->next;
-    if (next == 0)
-        next = s_snapshots;
-
-    s_cursnap = next;
-
-    memcpy(s_v1, &next->geometry, sizeof(next->geometry));
-    for (i = 0; i < NEVENTS; i++) {
-        g_eventdefs[i].selected = next->show_event[i];
-    }
-    memcpy(g_pids, next->pidvec, sizeof(pid_sort_t)*g_npids);
-    color_mode = next->color_mode;
-    /*
-     * Update summary mode via a button push so that the button state is
-     * updated accordingly. (Should ideally clean up the view/controller
-     * separation properly one day.)
-     */
-    if (summary_mode != next->summary_mode) {
-        view1_button_click_callback
-            (NULL, (gpointer)(unsigned long long)
-             (summary_mode ? NOSUMMARY_BUTTON : SUMMARY_BUTTON));
-    }
-
-    /* Fix the pid structure index mappings */
-    psp = g_pids;
-
-    for (i = 0; i < g_npids; i++) {
-        pp = psp->pid;
-        pp->pid_index = i;
-        psp++;
-    }
-    GTK_ADJUSTMENT(s_view1_vsadj)->value = next->vscroll_value;
-    gtk_adjustment_value_changed(GTK_ADJUSTMENT(s_view1_vsadj));
-    recompute_hscrollbar();
-    pointsel_next_snapshot();
-    view1_display_when_idle();
-}
-
-
-/****************************************************************************
- * del_snapshot
- ****************************************************************************/
-
-static void del_snapshot(void)
-{
-    snapshot_t *prev;
-    snapshot_t *this;
-
-    if (!s_snapshots) {
-        infobox("No snapshots", "\nNo snapshots to delete...\n");        
-        return;
-    }
-
-    prev = NULL;
-    this = s_snapshots;
-
-    while (this && this != s_cursnap) {
-        prev = this;
-        this = this->next;
-    }
-
-    if (this != s_cursnap) {
-        infobox("BUG", "\nSnapshot AWOL!\n");        
-        return;
-    }
- 
-    s_cursnap = this->next;
-
-    /* middle of the list? */
-    if (prev) {
-        prev->next = this->next;
-        g_free(this->pidvec);
-        g_free(this);
-    } else { /* start of the list */
-        s_snapshots = this->next;
-        g_free(this->pidvec);
-        g_free(this);
-    }
-    
-    /* Note: both will be NULL after last delete */
-    if (s_cursnap == NULL)
-        s_cursnap = s_snapshots;
-}
-
-/****************************************************************************
- * write_snapshot
- *
- * VERY primitive right now - not endian or version independent, and only
- * writes to "snapshots.g2" in the current directory
- ****************************************************************************/
-static void write_snapshot(void)
-{
-    FILE *file = NULL;
-    snapshot_t *snap;
-    char *error = NULL;
-    int records = 0;
-    
-    if (s_snapshots == NULL) {
-        error = "No snapshots defined";
-        errno = 0;
-    }
-
-    if (!error) {
-        file = fopen("snapshots.g2", "w");
-        if (file == NULL) {
-            error = "Unable to open snapshots.g2";
-        }
-    }
-
-    /*
-     * Simply serialize the arch-dependent binary data, without a care in the
-     * world. Don't come running to me if you try to read it and crash.
-     */
-    for (snap = s_snapshots; !error && snap != NULL; snap = snap->next) {
-        if (fwrite(&snap->geometry, 
-                   sizeof(snap->geometry), 1, file) != 1 ||
-            fwrite(&snap->show_event, 
-                   sizeof(snap->show_event), 1, file) != 1 ||
-            fwrite(snap->pidvec, 
-                   sizeof(pid_sort_t) * g_npids, 1, file) != 1 ||
-            fwrite(&snap->vscroll_value, 
-                   sizeof(snap->vscroll_value), 1, file) != 1 ||
-            fwrite(&snap->summary_mode,  
-                   sizeof(snap->summary_mode),   1, file) != 1 ||
-            fwrite(&snap->color_mode,  
-                   sizeof(snap->color_mode),   1, file) != 1) {
-            error = "Error writing data";
-        }
-        records++;
-    }
-
-    if (!error) {
-        if (fclose(file)) {
-            error = "Unable to close file";
-        }
-    }
-
-    if (error) {
-        infobox(error, strerror(errno));
-    } else {
-        char buf[64];
-        snprintf(buf, sizeof(buf), "Wrote %d snapshots to snapshots.g2", 
-                 records);
-        message_line(buf);
-    }
-}
-
-/****************************************************************************
- * read_snapshot
- *
- * VERY primitive right now - not endian or version independent, and only reads
- * from "snapshots.g2" in the current directory
- ****************************************************************************/
-static void read_snapshot(void)
-{
-    FILE *file;
-    snapshot_t *snap, *next_snap;
-    snapshot_t *new_snaps = NULL;
-    char *error = NULL;
-    int len, i, records = 0;
-    pid_data_t *pp;
-
-    file = fopen("snapshots.g2", "r");
-    if (file == NULL) {
-        error = "Unable to open snapshots.g2";
-    }
-
-    /*
-     * Read in the snapshots and link them together. We insert them backwards,
-     * but that's tolerable. If the data is in anyway not what we expect, we'll
-     * probably crash. Sorry.
-     */
-    while (!error && !feof(file)) {
-        snap = g_malloc(sizeof(*snap));
-        snap->pidvec = NULL; /* so we can free this if there's an error */
-
-        len = fread(&snap->geometry, sizeof(snap->geometry), 1, file);
-        if (len == 0) {
-            /* EOF */
-            g_free(snap);
-            break;
-        } else {
-            /* insert into list straight away */
-            snap->next = new_snaps;
-            new_snaps = snap;
-        }
-        if (len != 1) {
-            error = "Problem reading first item from file";
-            break;
-        }
-        if (fread(&snap->show_event, sizeof(snap->show_event), 1, file) != 1) {
-            error = "Problem reading second item from file";
-            break;
-        }
-        len = sizeof(pid_sort_t) * g_npids;
-        snap->pidvec = g_malloc(len);
-        if (fread(snap->pidvec, len, 1, file) != 1) {
-            error = "Problem reading third item from file";
-            break;
-        }
-        if (fread(&snap->vscroll_value, 
-                  sizeof(snap->vscroll_value), 1, file) != 1 ||
-            fread(&snap->summary_mode,  
-                  sizeof(snap->summary_mode),  1, file) != 1 ||
-            fread(&snap->color_mode,  
-                  sizeof(snap->color_mode),  1, file) != 1) {
-            error = "Problem reading final items from file";
-            break;
-        }
-
-        /*
-         * Fix up the pointers from the sorted pid vector back into our pid
-         * data objects, by walking the linked list of pid_data_t objects for
-         * every one looking for a match. This is O(n^2) grossness, but in real
-         * life there aren't that many pids, and it seems zippy enough.
-         */
-        for (i = 0; i < g_npids; i++) {
-            for (pp = g_pid_data_list; pp != NULL; pp = pp->next) {
-                if (pp->pid_value == snap->pidvec[i].pid_value) {
-                    break;
-                }
-            }
-            if (pp != NULL) {
-                snap->pidvec[i].pid = pp;
-            } else {
-                error = "Snapshot file referenced unknown pids";
-                break;
-            }
-        }
-
-        records++;
-    }
-
-    if (!error) {
-        if (fclose(file)) {
-            error = "Unable to close file";
-        }
-    }
-        
-    if (error) {
-        /*
-         * Problem - clear up any detritus
-         */
-        infobox(error, strerror(errno));
-        for (snap = new_snaps; snap != NULL; snap = next_snap) {
-            next_snap = snap->next;
-            g_free(snap);
-            g_free(snap->pidvec);
-        }
-    } else {
-        /*
-         * Success! trash the old snapshots and replace with the new
-         */
-        for (snap = s_snapshots; snap != NULL; snap = next_snap) {
-            next_snap = snap->next;
-            g_free(snap->pidvec);
-            g_free(snap);
-        }
-        
-        s_cursnap = s_snapshots = new_snaps;
-    }
-
-    if (error) {
-        infobox(error, strerror(errno));
-    } else {
-        char buf[64];
-        snprintf(buf, sizeof(buf), 
-                 "Read %d snapshots from snapshots.g2", records);
-        message_line(buf);
-    }
-}
-
-/****************************************************************************
-* set_color
-*
-* Set the color for the specified pid_index, or COLOR_DEFAULT to return it
-* to the usual black.
-****************************************************************************/
-#define COLOR_DEFAULT (-1)
-static void set_color(int pid_index)
-{
-    if (pid_index == COLOR_DEFAULT || !color_mode) {
-        gdk_gc_set_foreground(da->style->black_gc, &fg_black);
-    } else {
-        gdk_gc_set_foreground(da->style->black_gc, 
-                              &s_color[g_pids[pid_index].color_index]);
-    }
-}
-
-/****************************************************************************
-* toggle_event_select
-****************************************************************************/
-
-static void toggle_event_select(GdkEventButton *event, v1_geometry_t *vp)
-{
-    int pid_index, start_index;
-    int x, y;
-    GdkRectangle *rp;
-    GdkRectangle hit_rect;
-    GdkRectangle dummy;
-    event_t *ep;
-    event_def_t *edp;
-    char tmpbuf [1024];
-    double time_per_pixel;
-
-    if (g_nevents == 0)
-        return;
-
-    time_per_pixel = dtime_per_pixel(vp);
-
-    start_index = find_event_index (vp->minvistime);
-
-    /* Too far right? */
-    if (start_index >= g_nevents)
-        return;
-    
-    /* 
-     * To see if the mouse hit a visible event, use a variant
-     * of the event display loop.
-     */
-
-    hit_rect.x = (int)event->x;
-    hit_rect.y = (int)event->y;
-    hit_rect.width = 1;
-    hit_rect.height = 1;
-    
-    ep = (g_events + start_index);
-    
-    while ((ep->time < vp->maxvistime) && 
-           (ep < (g_events + g_nevents))) {
-        pid_index = ep->pid->pid_index;
-        
-        /* First filter: pid out of range */
-        if ((pid_index < vp->first_pid_index) ||
-            (pid_index >= vp->first_pid_index + vp->npids)) {
-            ep++;
-            continue;
-        }
-
-        /* Second filter: event hidden */
-        edp = find_event_definition (ep->code);
-        if (!edp->selected) {
-            ep++;
-            continue;
-        }
-        
-        /* 
-         * At this point, we know that the point is at least on the
-         * screen. See if the mouse hit within the bounding box 
-         */
-
-        /* 
-         * $$$$ maybe keep looping until off the edge,
-         * maintain a "best hit", then declare that one the winner?
-         */
-
-        pid_index -= vp->first_pid_index;
-        
-        y = pid_index*vp->strip_height + vp->event_offset;
-        
-        x = vp->pid_ax_width + 
-            (int)(((double)(ep->time - vp->minvistime)) / time_per_pixel);
-
-        /* Perhaps we're trying to toggle the detail box? */
-        if (ep->flags & EVENT_FLAG_SELECT) {
-            /* Figure out the dimensions of the detail box */
-            format_popbox_string(tmpbuf, sizeof(tmpbuf), ep, edp);
-            rp = tbox(tmpbuf, x, y - vp->pop_offset, TBOX_GETRECT_BOXED);
-            if (gdk_rectangle_intersect(rp, &hit_rect, &dummy)) {
-                ep->flags &= ~EVENT_FLAG_SELECT;
-                view1_display_when_idle();
-                break;
-            }
-        } 
-
-        sprintf(tmpbuf, "%ld", ep->code);
-
-        /* Figure out the dimensions of the regular box */
-        rp = tbox(tmpbuf, x, y, TBOX_GETRECT_EVENT);
-
-        if (gdk_rectangle_intersect(rp, &hit_rect, &dummy)) {
-            /* we hit the rectangle. */
-            if (ep->flags & EVENT_FLAG_SELECT) {
-                ep->flags &= ~EVENT_FLAG_SELECT;
-                view1_display_when_idle();
-                break;
-            } else {
-                set_color(ep->pid->pid_index);
-
-                /* It wasn't selected, so put up the detail box */
-                format_popbox_string(tmpbuf, sizeof(tmpbuf), ep, edp);
-                tbox(tmpbuf, x, y - vp->pop_offset, TBOX_DRAW_BOXED);
-                line(x, y-vp->pop_offset, x, y, LINE_DRAW_BLACK);
-                ep->flags |= EVENT_FLAG_SELECT;
-                ep->flags &= ~EVENT_FLAG_SEARCHRSLT;
-                s_last_selected_event = ep;
-            }
-            break;
-        }
-        ep++;
-    }
-}
-
-/****************************************************************************
-* move_current_track
-****************************************************************************/
-
-typedef enum { MOVE_TOP, MOVE_BOTTOM } move_type;
-
-static void move_current_track(GdkEventButton *event, 
-                               v1_geometry_t  *vp,
-                               move_type       type)
-{
-    int i;
-    int pid_index;
-    int y, delta_y;
-    pid_sort_t *new_pidvec;
-    pid_sort_t *psp;
-    pid_sort_t *pold, *pnew;
-    pid_data_t *pp;
-
-    if (g_nevents == 0)
-        return;
-
-    /* Scan pid/track axis locations, looking for a match */
-    for (i = 0; i < vp->npids; i++) {
-        y = i*vp->strip_height + vp->pid_ax_offset;
-        delta_y = y - event->y;
-        if (delta_y < 0)
-            delta_y = -delta_y;
-        if (delta_y < 10) {
-            goto found;
-        }
-
-    }
-    infobox("NOTE", "\nNo PID/Track In Range\nPlease Try Again");
-    return;
-    
- found:
-    pid_index = i + vp->first_pid_index;
-
-    new_pidvec = g_malloc(sizeof(pid_sort_t)*g_npids);
-    pold = g_pids;
-    pnew = new_pidvec;
-
-    if (type == MOVE_TOP) {
-        /* move to top */
-        *pnew++ = g_pids[pid_index];
-        for (i = 0; i < pid_index; i++)
-            *pnew++ = *pold++;
-        pold++;
-        i++;
-        for (; i < g_npids; i++)
-            *pnew++ = *pold++;
-    } else {
-        /* move to bottom */
-        for (i = 0; i < pid_index; i++)
-            *pnew++ = *pold++;
-        pold++;
-        i++;
-        for (; i < g_npids; i++)
-            *pnew++ = *pold++;
-        *pnew = g_pids[pid_index];
-    }
-
-    g_free(g_pids);
-    g_pids = new_pidvec;
-
-    /*
-     * Revert the pid_index mapping to an identity map, 
-     */
-    psp = g_pids;
-
-    for (i = 0; i < g_npids; i++) {
-        pp = psp->pid;
-        pp->pid_index = i;
-        psp++;
-    }
-    view1_display_when_idle();
-}
-
-/****************************************************************************
-* zoom_event
-* Process a zoom gesture. The use of doubles is required to avoid 
-* truncating the various variable values, which in turn would lead to
-* some pretty random-looking zoom responses.
-****************************************************************************/
-
-void zoom_event(GdkEventButton *e1, GdkEventButton *e2, v1_geometry_t *vp)
-{
-    double xrange;
-    double time_per_pixel;
-    double width_in_pixels;
-    double center_on_time, width_in_time;
-    double center_on_pixel;
-
-    /* 
-     * Clip the zoom area to the event display area. 
-     * Otherwise, center_on_time - width_in_time is in hyperspace
-     * to the left of zero 
-     */
-       
-    if (e1->x < vp->pid_ax_width)
-	e1->x = vp->pid_ax_width;
-    
-    if (e2->x < vp->pid_ax_width)
-	e2->x = vp->pid_ax_width;
-
-    if (e2->x == e1->x)
-	goto loser_zoom_repaint;
-
-    xrange = (double) (e2->x - e1->x);
-    if (xrange < 0.00)
-        xrange = -xrange;
-
-    /* Actually, width in pixels of half the zoom area */
-    width_in_pixels = xrange / 2.00;
-    time_per_pixel = dtime_per_pixel(vp);
-    width_in_time = width_in_pixels * time_per_pixel;
-
-    /* Center the screen on the center of the zoom area */
-    center_on_pixel = (double)((e2->x + e1->x) / 2.00) - 
-        (double)vp->pid_ax_width;
-    center_on_time = center_on_pixel*time_per_pixel + (double)vp->minvistime;
-
-    /*
-     * Transform back to 64-bit integer microseconds, reset the
-     * scrollbar, schedule a repaint. 
-     */
-    vp->minvistime = (ulonglong)(center_on_time - width_in_time);
-    vp->maxvistime = (ulonglong)(center_on_time + width_in_time);
-
-loser_zoom_repaint:
-    recompute_hscrollbar();
-    
-    view1_display_when_idle();
-}
-
-/****************************************************************************
-* scroll_y
-*
-* Scroll up or down by the specified delta
-*
-****************************************************************************/
-static void scroll_y(int delta)
-{
-    int new_index = s_v1->first_pid_index + delta;
-    if (new_index + s_v1->npids > g_npids)
-        new_index = g_npids - s_v1->npids;
-    if (new_index < 0)
-        new_index = 0;
-    
-    if (new_index != s_v1->first_pid_index) {
-        s_v1->first_pid_index = new_index;
-        GTK_ADJUSTMENT(s_view1_vsadj)->value = (gdouble)new_index;
-        gtk_adjustment_value_changed(GTK_ADJUSTMENT(s_view1_vsadj));
-        view1_display_when_idle();
-    }
-}
-
-/****************************************************************************
-* view1_handle_key_press_event
-* Relevant definitions in: /usr/include/gtk-1.2/gdk/gdktypes.h
-*
-* This routine implements hotkeys for the Quake generation:
-*
-*   W - zoom in
-*   S - zoom out
-*   A - pan left
-*   D - pan right
-*   R - pan up
-*   F - pan down
-*   T - more traces
-*   G - fewer traces
-*
-*   E - toggle summary mode
-*   C - toggle color mode
-*
-*   X - take snapshot
-*   Z - next snapshot
-*   P - persist snapshots to file
-*   L - load snapshots from file
-*
-* ctrl-Q - exit
-*
-****************************************************************************/
-gint
-view1_handle_key_press_event (GtkWidget *widget, GdkEventKey *event)
-{
-    long long delta;
-
-    switch (event->keyval) {
-        case GDK_w: // zoom in
-            view1_button_click_callback(NULL, (gpointer)ZOOMIN_BUTTON);
-            break;
-
-        case GDK_s: // zoom out
-            view1_button_click_callback(NULL, (gpointer)ZOOMOUT_BUTTON);
-            break;
-
-        case GDK_a: // pan left
-            delta = (s_v1->maxvistime - s_v1->minvistime) / 6;
-            if (s_v1->minvistime < delta) {
-                delta = s_v1->minvistime;
-            }
-            s_v1->minvistime -= delta;
-            s_v1->maxvistime -= delta;
-            recompute_hscrollbar();
-            break;
-
-        case GDK_d: // pan right
-            delta = (s_v1->maxvistime - s_v1->minvistime) / 6;
-            if (s_v1->maxvistime + delta > g_events[g_nevents - 1].time) {
-                /*
-                 * @@@ this doesn't seem to quite reach the far right hand
-                 * side correctly - not sure why.
-                 */
-                delta = g_events[g_nevents - 1].time - s_v1->maxvistime;
-            }
-            s_v1->minvistime += delta;
-            s_v1->maxvistime += delta;
-            recompute_hscrollbar();
-            break;
-
-        case GDK_r: // pan up
-            scroll_y(-1);
-            break;
-
-        case GDK_f: // pan down
-            scroll_y(+1);
-            break;
-
-        case GDK_t: // fewer tracks
-            view1_button_click_callback(NULL, (gpointer)LESS_TRACES_BUTTON);
-            break;
-
-        case GDK_g: // more tracks
-            view1_button_click_callback(NULL, (gpointer)MORE_TRACES_BUTTON);
-            break;
-
-        case GDK_e: // toggle summary mode
-            view1_button_click_callback
-                (NULL, (gpointer)(unsigned long long)
-                 (summary_mode ? NOSUMMARY_BUTTON : SUMMARY_BUTTON));
-            break;
-
-        case GDK_c: // toggle color mode
-            color_mode ^= 1;
-            view1_display_when_idle();
-            break;
-
-        case GDK_p: // persist snapshots
-            write_snapshot();
-            break;
-
-        case GDK_l: // load snapshots
-            read_snapshot();
-            break;
-
-        case GDK_x: // take snapshot
-            view1_button_click_callback(NULL, (gpointer)SNAP_BUTTON);
-            break;
-
-        case GDK_z: // next snapshot
-            view1_button_click_callback(NULL, (gpointer)NEXT_BUTTON);
-            break;
-
-        case GDK_q: // ctrl-q is exit
-            if (event->state & GDK_CONTROL_MASK) {
-                gtk_main_quit();
-            }
-            break;
-    }
-    return TRUE;
-}
-
-/****************************************************************************
-* button_press_event
-* Relevant definitions in: /usr/include/gtk-1.2/gdk/gdktypes.h
-*
-* This routine implements three functions: zoom-to-area, time ruler, and
-* show/hide event detail popup. 
-*
-* The left mouse button (button 1) has two simultaneous functions: event 
-* detail popup, and zoom-to-area. If the press and release events occur
-* within a small delta-x, it's a detail popup event.  Otherwise, it's
-* an area zoom.
-*
-* The right mouse button (button 3) implements the time ruler.
-****************************************************************************/
-
-static gint
-button_press_event (GtkWidget *widget, GdkEventButton *event)
-{
-    static GdkEventButton press1_event;
-    static boolean press1_valid;
-    static GdkEventButton press3_event;
-    static guint32 last_truler_time;
-    static boolean press3_valid;
-    static boolean zoom_bar_up;
-    int time_ax_y, xdelta;
-    char tmpbuf [128];
-    double time_per_pixel;
-
-    time_ax_y = 0;
-
-    switch(event->type) {
-    case GDK_BUTTON_PRESS:
-        /* Capture the appropriate starting point */
-        if (event->button == 1) {
-            press1_valid = TRUE;
-            press1_event = *event;
-            return(TRUE);
-        }
-        if (event->button == 3) {
-            press3_valid = TRUE;
-            press3_event = *event;
-            return(TRUE);
-        }
-        return(TRUE);
-
-    case GDK_BUTTON_RELEASE:
-        /* Time ruler */
-        if (press3_valid) {
-            press3_valid = FALSE;
-            /* Fix the cursor, and repaint the screen from scratch */
-            gdk_window_set_cursor (da->window, norm_cursor);
-            view1_display_when_idle();
-            return(TRUE);
-        }
-        /* Event select / zoom-to-area */
-        if (press1_valid) {
-            press1_valid = FALSE;
-            xdelta = (int)(press1_event.x - event->x);
-            if (xdelta < 0)
-                xdelta = -xdelta;
-
-            /* is the mouse more or less where it started? */
-            if (xdelta < 10) {
-                /* Control-left-mouse => sink the track */
-                /* Shift-left-mouse => raise the track */
-                if ((press1_event.state & GDK_CONTROL_MASK) ==
-                    GDK_CONTROL_MASK) {
-                    move_current_track(event, s_v1, MOVE_BOTTOM);
-                } else if ((press1_event.state & GDK_SHIFT_MASK) ==
-                           GDK_SHIFT_MASK) {
-                    move_current_track(event, s_v1, MOVE_TOP);
-                } else {
-                    /* No modifiers: toggle the event */
-                    toggle_event_select(event, s_v1);
-                }
-                /* Repaint to get rid of the zoom bar */
-                if (zoom_bar_up) {
-                    /* Fix the cursor and leave. No zoom */
-                    gdk_window_set_cursor (da->window, norm_cursor);
-                    zoom_bar_up = FALSE;
-                    break;
-                }
-            } else { /* mouse moved enough to zoom */
-                zoom_event(&press1_event, event, s_v1);
-                gdk_window_set_cursor (da->window, norm_cursor);
-                zoom_bar_up = FALSE;
-            }
-        }  else if (event->button == 4) {
-            /* scroll wheel up */
-            scroll_y(event->state & GDK_SHIFT_MASK ? -10 : -1);
-        } else if (event->button == 5) {
-            /* scroll wheel down */
-            scroll_y(event->state & GDK_SHIFT_MASK ? +10 : +1);
-        }
-        return(TRUE);
-
-    case GDK_MOTION_NOTIFY:
-        /* Button one followed by motion: draw zoom fence and fix cursor */
-        if (press1_valid) {
-            /* Fence, cursor already set */
-            if (zoom_bar_up)
-                return(TRUE);
-            
-            xdelta = (int)(press1_event.x - event->x);
-            if (xdelta < 0)
-                xdelta = -xdelta;
-            
-            /* Haven't moved enough to declare a zoom sequence yet */
-            if (xdelta < 10) 
-                return(TRUE);
-            
-            /* Draw the zoom fence, use the key-down X coordinate */
-            time_ax_y = s_v1->npids * s_v1->strip_height + s_v1->pid_ax_offset;
-            
-            line((int)(press1_event.x), s_v1->pop_offset, 
-                 (int)(press1_event.x), time_ax_y, LINE_DRAW_BLACK);
-            tbox("Zoom From Here...", (int)(press1_event.x), s_v1->pop_offset,
-                 TBOX_DRAW_BOXED);
-            gdk_window_set_cursor(da->window, zi_cursor);
-            zoom_bar_up = TRUE;
-            return(TRUE);
-        }
-        if (press3_valid) {
-            double nsec;
-
-            gdk_window_set_cursor(da->window, zi_cursor);
-
-            /* 
-             * Some filtration is needed on Solaris, or the server will hang
-             */
-            if (event->time - last_truler_time < 75)
-                return(TRUE);
-
-            last_truler_time = event->time;
-
-            line((int)(press3_event.x), s_v1->pop_offset, 
-                 (int)(press3_event.x), time_ax_y, LINE_DRAW_BLACK);
-
-            xdelta = (int)(press3_event.x - event->x);
-            if (xdelta < 0)
-                xdelta = -xdelta;
-            
-            time_per_pixel = ((double)(s_v1->maxvistime - s_v1->minvistime)) / 
-                ((double)(s_v1->total_width - s_v1->pid_ax_width)); 
-
-            time_ax_y = s_v1->npids * s_v1->strip_height + s_v1->pid_ax_offset;
-
-            line((int)(press3_event.x), s_v1->pop_offset, 
-                 (int)(press3_event.x), time_ax_y, LINE_DRAW_BLACK);
-            /*
-             * Note: use a fixed-width format so it looks like we're
-             * erasing and redrawing the box. 
-             */
-            nsec = ((double)xdelta)*time_per_pixel;
-            if (nsec >1e9) {
-                sprintf(tmpbuf, "%8.3f sec ", nsec/1e9);
-            } else if (nsec > 1e6) {
-                sprintf(tmpbuf, "%8.3f msec", nsec/1e6);
-            } else if (nsec > 1e3) {
-                sprintf(tmpbuf, "%8.3f usec", nsec/1e3);
-            } else {
-                sprintf(tmpbuf, "%8.0f nsec", nsec);
-            }
-            tbox(tmpbuf, (int)(press3_event.x), s_v1->pop_offset,
-                 TBOX_DRAW_BOXED);
-            return(TRUE);
-        }
-
-    default:
-        break;
-#ifdef DEBUG
-        g_print("button:\ttype = %d\n", event->type);
-        g_print("\twindow = 0x%x\n", event->window);
-        g_print("\tsend_event = %d\n", event->send_event);
-        g_print("\ttime = %d\n", event->time);
-        g_print("\tx = %6.2f\n", event->x);
-        g_print("\ty = %6.2f\n", event->y);
-        g_print("\tpressure = %6.2f\n", event->pressure);
-        g_print("\txtilt = %6.2f\n", event->xtilt);
-        g_print("\tytilt = %6.2f\n", event->ytilt);
-        g_print("\tstate = %d\n", event->state);
-        g_print("\tbutton = %d\n", event->button);
-        g_print("\tsource = %d\n", event->source);
-        g_print("\tdeviceid = %d\n", event->deviceid);
-        g_print("\tx_root = %6.2f\n", event->x_root);
-        g_print("\ty_root = %6.2f\n", event->y_root);
-        return(TRUE);
-#endif
-    }
-
-    view1_display_when_idle();
-
-    return(TRUE);
-}
-
-/****************************************************************************
-* configure_event
-* Happens when the window manager resizes the viewer's main window.
-****************************************************************************/
-
-static gint
-configure_event (GtkWidget *widget, GdkEventConfigure *event)
-{
-    /* Toss the previous drawing area backing store pixmap */
-    if (pm)
-        gdk_pixmap_unref(pm);
-    
-    /* Create a new pixmap, paint it */
-    pm = gdk_pixmap_new(widget->window,
-                        widget->allocation.width,
-                        widget->allocation.height,
-                        -1);
-    gdk_draw_rectangle (pm,
-                        widget->style->white_gc,
-                        TRUE,
-                        0, 0,
-                        widget->allocation.width,
-                        widget->allocation.height);
-
-    /* Reset the view geometry parameters, as required */
-    s_v1->total_width = widget->allocation.width;
-    s_v1->total_height = widget->allocation.height;
-    s_v1->npids = (s_v1->total_height - s_v1->time_ax_height) / 
-        s_v1->strip_height;
-
-    /* Schedule a repaint */
-    view1_display_when_idle();
-    return(TRUE);
-}
-
-/****************************************************************************
-* expose_event
-* Use backing store to fix the screen.
-****************************************************************************/
-static gint expose_event (GtkWidget *widget, GdkEventExpose *event)
-{
-    gdk_draw_pixmap(widget->window,
-                    widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-                    pm,
-                    event->area.x, event->area.y,
-                    event->area.x, event->area.y,
-                    event->area.width, event->area.height);
-    
-    return(FALSE);
-}
-
-/****************************************************************************
-* event_search_internal
-* This routine searches forward from s_srchindex, looking for s_srchcode;
-* wraps at the end of the buffer.
-****************************************************************************/
-
-boolean event_search_internal (void)
-{
-    event_t *ep;
-    int i;
-    int index;
-    int pid_index;
-    boolean full_redisplay = FALSE;
-    ulonglong current_width;
-    char tmpbuf [64];
-
-    /* No events yet?  Act like the search worked, to avoid a loop */
-    if (g_nevents == 0)
-        return(TRUE);
-
-    ep = (g_events + s_srchindex);
-    ep->flags &= ~EVENT_FLAG_SEARCHRSLT;
-
-    /* 
-     * Assume the user wants to search [plus or minus]
-     * from where they are.
-     */
-#ifdef notdef
-    if (ep->time < s_v1->minvistime)
-        s_srchindex = find_event_index (s_v1->minvistime);
-#endif
-
-    for (i = 1; i <= g_nevents; i++) {
-        index = (srch_chase_dir == SRCH_CHASE_BACKWARD) ?
-            (s_srchindex - i) % g_nevents :
-            (i + s_srchindex) % g_nevents;
-        
-        ep = (g_events + index);
-        
-        if (ep->code == s_srchcode) {
-            if (s_srchfail_up)
-                message_line("");
-            s_srchindex = index;
-            pid_index = ep->pid->pid_index;
-            
-            /* Need a vertical scroll? */
-            if ((pid_index < s_v1->first_pid_index) ||
-                (pid_index >= s_v1->first_pid_index + s_v1->npids)) {
-                if (pid_index > (g_npids - s_v1->npids))
-                    pid_index = (g_npids - s_v1->npids);
-                s_v1->first_pid_index = pid_index;
-                GTK_ADJUSTMENT(s_view1_vsadj)->value = 
-                    (gdouble)s_v1->first_pid_index;
-                gtk_adjustment_value_changed(GTK_ADJUSTMENT(s_view1_vsadj));
-                full_redisplay = TRUE;
-            }
-            
-            /* Need a horizontal scroll? */
-            if (ep->time < s_v1->minvistime || ep->time > s_v1->maxvistime) {
-                current_width = (s_v1->maxvistime - s_v1->minvistime);
-                if (ep->time < ((current_width+1) / 2)) {
-                    s_v1->minvistime = 0ll;
-                    s_v1->maxvistime = current_width;
-                } else {
-                    s_v1->minvistime = ep->time - ((current_width+1)/2);
-                    s_v1->maxvistime = ep->time + ((current_width+1)/2);
-                }
-                recompute_hscrollbar();
-                full_redisplay = TRUE;
-            }
-            ep->flags |= EVENT_FLAG_SEARCHRSLT;
-            full_redisplay = TRUE;
-
-#ifdef NOTDEF
-            if (!full_redisplay){
-                if (!s_result_up) {
-                    s_result_up = TRUE;
-                    time_per_pixel = dtime_per_pixel(s_v1);
-                    
-                    y = pid_index*s_v1->strip_height + s_v1->event_offset;
-                    x = s_v1->pid_ax_width + 
-                        (int)(((double)(ep->time - s_v1->minvistime)) / 
-                              time_per_pixel);
-                    sprintf(tmpbuf, "SEARCH RESULT");
-                    tbox(tmpbuf, x, y - s_v1->pop_offset, TBOX_DRAW_BOXED);
-                    line(x, y-s_v1->pop_offset, x, y, LINE_DRAW_BLACK);
-                } else {
-                    full_redisplay = TRUE;
-                }
-            }
-#endif
-
-            if (full_redisplay)
-                view1_display_when_idle();
-            return(TRUE);
-        }
-    }
-    sprintf (tmpbuf, "Search for event %ld failed...\n", s_srchcode);
-    message_line(tmpbuf);
-    s_srchfail_up = TRUE;
-    return(TRUE);
-}
-
-/****************************************************************************
-* event_search_callback
-****************************************************************************/
-
-boolean event_search_callback (char *s)
-{
-    /* No events yet?  Act like the search worked, to avoid a loop */
-    if (g_nevents == 0)
-        return(TRUE);
-
-    s_srchcode = atol(s);
-    
-    if (s_srchcode == 0)
-        return(FALSE);
-
-    return(event_search_internal());
-}
-
-/****************************************************************************
-* event_search
-****************************************************************************/
-
-static void event_search (void)
-{
-    modal_dialog ("Event Search: Please Enter Event Code",
-                  "Invalid: Please Reenter Event Code", NULL,
-                  event_search_callback);
-}
-
-/****************************************************************************
-* init_track_colors
-****************************************************************************/
-static void init_track_colors(void)
-{
-    int         i;
-    unsigned    hash;
-    char       *label_char;
-    unsigned    RGB[3];
-    gboolean    dont_care[g_npids];
-
-    /*
-     * If we've already allocated the colors once, then in theory we should
-     * just be able to re-order the GCs already created to match the new track
-     * order; the track -> color mapping doesn't currently change at runtime.
-     * However, it's easier just to allocate everything from fresh. As a nod in
-     * the direction of politeness towards our poor abused X server, we at
-     * least mop up the previously allocated GCs first, although in practice
-     * even omitting this didn't seem to cause a problem. 
-     */
-    if (s_color != NULL ) {
-        gdk_colormap_free_colors(gtk_widget_get_colormap(da), 
-                                 s_color, g_npids);
-        memset(s_color, 0, sizeof(GdkColor) * g_npids);
-    } else {
-        /*
-         * First time through: allocate the array to hold the GCs.
-         */
-        s_color = g_malloc(sizeof(GdkColor) * g_npids);
-    }
-
-    /*
-     * Go through and assign a color for each track.
-     */
-    for (i = 0; i < g_npids; i++) {
-        /*
-         * We compute the color from a hash of the thread name. That way we get
-         * a distribution of different colors, and the same thread has the same
-         * color across multiple data sets. Unfortunately, even though the
-         * process name and thread id are invariant across data sets, the
-         * process id isn't, so we want to exclude that from the hash. Since
-         * the pid appears in parentheses after the process name and tid, we
-         * can just stop at the '(' character.
-         *
-         * We could create a substring and use the CLIB Jenkins hash, but given
-         * we're hashing ascii data, a suitable Bernstein hash is pretty much
-         * just as good, and it's easiest just to compute it inline.
-         */
-        label_char = get_track_label(g_pids[i].pid_value);
-        hash = 0;
-        while (*label_char != '\0' && *label_char != '(') {
-            hash = hash * 33 + *label_char++;
-        }
-        hash += hash >> 5;    /* even out the lower order bits a touch */
-
-        /*
-         * OK, now we have our hash. We get the color by using the first three
-         * bytes of the hash for the RGB values (expanded from 8 to 16 bits),
-         * and then use the fourth byte to choose one of R, G, B and mask this
-         * one down. This ensures the color can't be too close to white and
-         * therefore hard to see.
-         *
-         * We also drop the top bit of the green, since bright green on its own
-         * is hard to see against white. Generally we err on the side of
-         * keeping it dark, rather than using the full spectrum of colors. This
-         * does result in something of a preponderance of muddy colors and a
-         * bit of a lack of cheery bright ones, but at least you can read
-         * everything. It would be nice to do better.
-         */
-        RGB[0] = (hash & 0xff000000) >> 16;
-        RGB[1] = (hash & 0x007f0000) >> 8;
-        RGB[2] = (hash & 0x0000ff00);
-        RGB[hash % 3] &= 0x1fff;
-
-        {
-            GdkColor color = {0, RGB[0], RGB[1], RGB[2]};
-            s_color[i] = color;
-            g_pids[i].color_index = i;
-        }
-    }
-
-    /*
-     * Actually allocate the colors in one bulk operation. We ignore the return
-     * values.
-     */
-    gdk_colormap_alloc_colors(gtk_widget_get_colormap(da), 
-                              s_color, g_npids, FALSE, TRUE, dont_care);
-}
-
-
-/****************************************************************************
-* chase_event_etc
-* Reorder the pid_index fields so the viewer "chases" the last selected
-* event.
-****************************************************************************/
-
-static void chase_event_etc(enum chase_mode mode)
-{
-    pid_sort_t *psp, *new_pidvec;
-    pid_data_t *pp;
-    event_t *ep;
-    int pids_mapped;
-    ulong code_to_chase;
-    ulong datum_to_chase;
-    ulong pid_to_chase;
-    int i;
-    int winner;
-
-    if (!s_last_selected_event) {
-        infobox("No selected event", 
-                "\nPlease select an event and try again...\n");
-        return;
-    }
-
-    /* Clear all index assignments */
-    psp = g_pids;
-    for (i = 0; i < g_npids; i++) {
-        pp = psp->pid;
-        pp->pid_index = 0xFFFFFFFF;
-        psp++;
-    }
-
-    ep = s_last_selected_event;
-    code_to_chase = ep->code;
-    datum_to_chase = ep->datum;
-    pid_to_chase = ep->pid->pid_value;
-    pids_mapped = 0;
-    new_pidvec = g_malloc(sizeof(pid_sort_t)*g_npids);
-
-    while (1) {
-        if (srch_chase_dir == SRCH_CHASE_FORWARD) {
-            if (ep >= g_events + g_nevents)
-                break;
-        } else {
-            if (ep < g_events)
-                break;
-        }
-
-        winner = 0;
-        switch(mode) {
-        case CHASE_EVENT:
-            if (ep->code == code_to_chase) {
-                winner = 1;
-            }
-            break;
-
-        case CHASE_DATUM:
-            if (ep->datum == datum_to_chase) {
-                winner = 1;
-            }
-            break;
-
-        case CHASE_TRACK:
-            if (ep->pid->pid_value == pid_to_chase) {
-                winner = 1;
-            }
-            break;
-
-        default:
-            infobox("BUG", "unknown mode in chase_event_etc\n");
-            break;
-        }
-
-        if (winner) {
-            if (ep->pid->pid_index == 0xFFFFFFFF) {
-                ep->pid->pid_index = pids_mapped;
-                new_pidvec[pids_mapped].pid = ep->pid;
-                new_pidvec[pids_mapped].pid_value = ep->pid->pid_value;
-                new_pidvec[pids_mapped].color_index = 0;
-                pids_mapped++;
-                if (pids_mapped == g_npids)
-                    break;
-            }
-        }
-        if (srch_chase_dir == SRCH_CHASE_FORWARD)
-            ep++;
-        else
-            ep--;
-    }
-
-    /* Pass 2, first-to-last, to collect stragglers */
-    ep = g_events;
-
-    while (ep < g_events + g_nevents) {
-        if (ep->pid->pid_index == 0xFFFFFFFF) {
-            ep->pid->pid_index = pids_mapped;
-            new_pidvec[pids_mapped].pid = ep->pid;
-            new_pidvec[pids_mapped].pid_value = ep->pid->pid_value;
-            new_pidvec[pids_mapped].color_index = 0;
-            pids_mapped++;
-            if (pids_mapped == g_npids)
-                break;
-        }
-        ep++;
-    }
-
-    if (pids_mapped != g_npids) {
-        infobox("BUG", "\nDidn't map all pids in chase_event_etc\n");
-    }
-
-    g_free (g_pids);
-    g_pids = new_pidvec;
-    
-    /*
-     * The new g_pids vector contains the "chase" sort, so we revert
-     * the pid_index mapping to an identity map 
-     */
-    psp = g_pids;
-
-    for (i = 0; i < g_npids; i++) {
-        pp = psp->pid;
-        pp->pid_index = i;
-        psp++;
-    }
-
-    /* AutoScroll the PID axis so we show the first "chased" event */
-    s_v1->first_pid_index = 0;
-    GTK_ADJUSTMENT(s_view1_vsadj)->value = 0.00;
-    gtk_adjustment_value_changed(GTK_ADJUSTMENT(s_view1_vsadj));
-    init_track_colors();
-    view1_display_when_idle();
-}
-
-/****************************************************************************
-* unchase_event_etc
-* Copy g_original_pids to g_pids, revert index mapping
-****************************************************************************/
-static void unchase_event_etc(void)
-{
-    int i;
-    pid_sort_t *psp;
-    pid_data_t *pp;
-
-    memcpy (g_pids, g_original_pids, sizeof(pid_sort_t)*g_npids); 
-
-    /* Fix the pid structure index mappings */
-    psp = g_pids;
-
-    for (i = 0; i < g_npids; i++) {
-        pp = psp->pid;
-        pp->pid_index = i;
-        psp++;
-    }
-
-    /* Scroll PID axis to the top */
-    s_v1->first_pid_index = 0;
-    GTK_ADJUSTMENT(s_view1_vsadj)->value = 0.00;
-    gtk_adjustment_value_changed(GTK_ADJUSTMENT(s_view1_vsadj));
-    init_track_colors();
-    view1_display_when_idle();
-}
-
-/****************************************************************************
-* print_ps_header
-* To fit a reasonable-sized landscape mode plot onto letter-size paper,
-* scale everything by .75.
-****************************************************************************/
-
-static void print_ps_header (v1_geometry_t *vp, char *filename)
-{
-    time_t now;
-
-    now = time(0);
-
-    fprintf(s_printfp, "%%%%!PS-Adobe-3.0 EPSF-3.0\n");
-    fprintf(s_printfp, "%%%%Creator: G2 Event Viewer\n");
-    fprintf(s_printfp, "%%%%Title: %s\n", filename);
-    fprintf(s_printfp, "%%%%CreationDate: %s", ctime(&now));
-    fprintf(s_printfp, "%%%%DocumentData: Clean7Bit\n");
-    fprintf(s_printfp, "%%%%Origin: 0 0\n");
-    fprintf(s_printfp, "%%%%BoundingBox: 0 0 %d %d\n", vp->total_height, 
-           vp->total_width);
-    fprintf(s_printfp, "%%%%LanguageLevel: 2\n");
-    fprintf(s_printfp, "%%%%Pages: 1\n");
-    fprintf(s_printfp, "%%%%Page: 1 1\n");
-    fprintf(s_printfp, "%%%%EOF\n");
-    fprintf(s_printfp, "/Times-Roman findfont\n");
-    fprintf(s_printfp, "12 scalefont\n");
-    fprintf(s_printfp, "setfont\n");
-    fprintf(s_printfp, ".75 .75 scale\n");
-}
-
-/****************************************************************************
-* xrt
-* Xcoordinate rotate and translate.  We need to emit postscript that
-* has a reasonable aspect ratio for printing.  To do that, we rotate the
-* intended picture by 90 degrees, using the standard 2D rotation 
-* formula:
-* 
-*     Xr = x*cos(theta) - y*sin(theta);
-*     Yr = x*sin(theta) + y*cos(theta);
-*
-* If we let theta = 90, this reduces to
-*     Xr = -y
-*     Yr =  x
-*
-* Translate back to the origin in X by adding Ymax, yielding
-*     Xrt = Ymax - y
-****************************************************************************/
-
-static inline int xrt(int x, int y)
-{
-    return (s_v1->total_height - y);
-}
-
-static inline int yrt(int x, int y)
-{
-    return(x);
-}
-
-/****************************************************************************
-* print_screen_callback
-****************************************************************************/
-
-static boolean print_screen_callback(char *filename)
-{
-    s_printfp = fopen (filename, "wt");
-
-    if (s_printfp == NULL)
-        return(FALSE);
-
-    /*
-     * This variable allows us to magically turn the view1 display
-     * code into a print-driver, with a minimum of fuss. The idea is to
-     * magically change TBOX_DRAW_XXX into TBOX_PRINT_XXX by adding
-     * the required value, aka s_print_offset.
-     * Make sure to fix g2.h if you mess here, or vice versa.
-     */
-    s_print_offset = TBOX_PRINT_PLAIN - TBOX_DRAW_PLAIN;
-
-    print_ps_header(s_v1, filename);
-
-    display_pid_axis(s_v1);
-    display_event_data(s_v1);
-    display_time_axis(s_v1);
-
-    fclose (s_printfp);
-    s_printfp = 0;
-    s_print_offset = 0;
-
-    /* For tactile feedback */
-    view1_display_when_idle();
-    return(TRUE);
-}
-
-/****************************************************************************
-* view1_button_click_callback 
-****************************************************************************/
-
-static void view1_button_click_callback(GtkButton *item, gpointer data)
-{
-    enum view1_button_click click = (enum view1_button_click) data;
-    event_t *ep;
-    ulonglong event_incdec;
-    ulonglong current_width;
-    ulonglong zoom_delta;
-
-
-    current_width = s_v1->maxvistime - s_v1->minvistime;
-    event_incdec = (current_width) / 3;
-
-    if (event_incdec == 0LL)
-        event_incdec = 1;
-
-    zoom_delta = (s_v1->maxvistime - s_v1->minvistime) / 6;
-
-    switch(click) {
-    case TOP_BUTTON:
-        /* First PID to top of window */
-        s_v1->first_pid_index = 0;
-        GTK_ADJUSTMENT(s_view1_vsadj)->value = 0.00;
-        gtk_adjustment_value_changed(GTK_ADJUSTMENT(s_view1_vsadj));
-        break;
-
-    case BOTTOM_BUTTON:
-        s_v1->first_pid_index = g_npids - s_v1->npids;
-        if (s_v1->first_pid_index < 0)
-            s_v1->first_pid_index = 0;
-        GTK_ADJUSTMENT(s_view1_vsadj)->value = (gdouble)s_v1->first_pid_index;
-        gtk_adjustment_value_changed(GTK_ADJUSTMENT(s_view1_vsadj));
-        break;
-
-    case SNAP_BUTTON:
-        add_snapshot();
-        break;
-
-    case NEXT_BUTTON:
-        next_snapshot();
-        break;
-
-    case DEL_BUTTON:
-        del_snapshot();
-        break;
-
-    case CHASE_EVENT_BUTTON:
-        chase_event_etc(CHASE_EVENT);
-        break;
-
-    case CHASE_DATUM_BUTTON:
-        chase_event_etc(CHASE_DATUM);
-        break;
-
-    case CHASE_TRACK_BUTTON:
-        chase_event_etc(CHASE_TRACK);
-        break;
-
-    case UNCHASE_BUTTON:
-        unchase_event_etc();
-        break;
-
-    case START_BUTTON:
-    start_button:
-        s_v1->minvistime = 0LL;
-        s_v1->maxvistime = current_width;
-        recompute_hscrollbar();
-        break;
-
-    case ZOOMIN_BUTTON:
-        s_v1->minvistime += zoom_delta;
-        s_v1->maxvistime -= zoom_delta;
-        recompute_hscrollbar();
-        break;
-
-    case SEARCH_AGAIN_BUTTON:
-        if (s_srchcode) {
-            event_search_internal();
-            break;
-        }
-        /* NOTE FALLTHROUGH */
-
-    case SEARCH_BUTTON:
-        event_search();
-        break;
-
-    case ZOOMOUT_BUTTON:
-        if (zoom_delta == 0LL)
-            zoom_delta = 1;
-
-        if (s_v1->minvistime >= zoom_delta) {
-            s_v1->minvistime -= zoom_delta;
-            s_v1->maxvistime += zoom_delta;
-        } else {
-            s_v1->minvistime = 0;
-            s_v1->maxvistime += zoom_delta*2;
-        }
-        
-        if ((s_v1->maxvistime - s_v1->minvistime) * 8 > 
-            g_events[g_nevents-1].time * 9) {
-            s_v1->minvistime = 0;
-            s_v1->maxvistime = g_events[g_nevents-1].time * 9 / 8;
-        }
-        recompute_hscrollbar();
-        break;
-
-    case END_BUTTON:
-        ep = (g_events + g_nevents - 1);
-        s_v1->maxvistime = ep->time + event_incdec/3;
-        s_v1->minvistime = s_v1->maxvistime - current_width;
-        if (s_v1->minvistime > s_v1->maxvistime)
-            goto start_button;
-        recompute_hscrollbar();
-        break;
-
-    case MORE_TRACES_BUTTON:
-	/* Reduce the strip height to fit more traces on screen */
-	s_v1->strip_height -= 1;
-
-	if (s_v1->strip_height < 1) {
-	    s_v1->strip_height = 1;
-	}
-
-	/* Recalculate the number of strips on the screen */
-	s_v1->npids = (s_v1->total_height - s_v1->time_ax_height) / 
-	    s_v1->strip_height;
-	recompute_vscrollbar();
-	break;
-
-    case LESS_TRACES_BUTTON:
-	/* Increase the strip height to fit fewer on the screen */
-	s_v1->strip_height += 1;
-	if (s_v1->strip_height > 80) {
-	    s_v1->strip_height = 80;
-	}
-
-	/* Recalculate the number of strips on the screen */
-	s_v1->npids = (s_v1->total_height - s_v1->time_ax_height) / 
-	    s_v1->strip_height;
-	recompute_vscrollbar();
-	break;
-
-    case FORWARD_BUTTON:
-        srch_chase_dir = SRCH_CHASE_FORWARD;
-        gtk_widget_hide (s_view1_forward_button);
-        gtk_widget_show (s_view1_backward_button);
-        break;
-
-    case BACKWARD_BUTTON:
-        srch_chase_dir = SRCH_CHASE_BACKWARD;
-        gtk_widget_show (s_view1_forward_button);
-        gtk_widget_hide (s_view1_backward_button);
-        break;
-
-    case SUMMARY_BUTTON:
-        summary_mode = TRUE;
-        gtk_widget_hide (s_view1_summary_button);
-        gtk_widget_show (s_view1_nosummary_button);
-        break;
-
-    case NOSUMMARY_BUTTON:
-        summary_mode = FALSE;
-        gtk_widget_show (s_view1_summary_button);
-        gtk_widget_hide (s_view1_nosummary_button);
-        break;
-    }
-
-    view1_display_when_idle();
-}
-
-/****************************************************************************
-* view1_print_callback
-****************************************************************************/
-
-void view1_print_callback (GtkToggleButton *notused, gpointer nu2)
-{
-    modal_dialog("Print Screen (PostScript format) to file:",
-                 "Invalid file: Print Screen to file:",
-                 "g2.ps", print_screen_callback);
-}
-
-/****************************************************************************
-* view1_hscroll
-****************************************************************************/
-
-static void view1_hscroll (GtkAdjustment *adj, GtkWidget *notused)
-{
-    ulonglong current_width;
-
-    current_width = (s_v1->maxvistime - s_v1->minvistime);
-
-    s_v1->minvistime = (ulonglong)(adj->value);
-    s_v1->maxvistime = s_v1->minvistime + current_width;
-    
-    view1_display_when_idle();
-
-#ifdef NOTDEF
-    g_print ("adj->lower = %.2f\n", adj->lower);
-    g_print ("adj->upper = %.2f\n", adj->upper);
-    g_print ("adj->value = %.2f\n", adj->value);
-    g_print ("adj->step_increment = %.2f\n", adj->step_increment);
-    g_print ("adj->page_increment = %.2f\n", adj->page_increment);
-    g_print ("adj->page_size = %.2f\n", adj->page_size);
-#endif
-}
-
-/****************************************************************************
-* view1_vscroll
-****************************************************************************/
-
-static void view1_vscroll (GtkAdjustment *adj, GtkWidget *notused)
-{
-    s_v1->first_pid_index = (int)adj->value;
-    view1_display_when_idle();
-}
-
-void set_pid_ax_width(int width)
-{
-    s_v1->pid_ax_width = width;
-    view1_display_when_idle();
-}
-
-/****************************************************************************
-* view1_init
-****************************************************************************/
-
-void view1_init(void)
-{
-
-    c_view1_draw_width = atol(getprop_default("drawbox_width", "700"));
-    c_view1_draw_height = atol(getprop_default("drawbox_height", "400"));
-
-    s_v1->pid_ax_width = 80;
-    s_v1->time_ax_height = 80;
-    s_v1->time_ax_spacing = 100;
-    s_v1->strip_height = 25;
-    s_v1->pop_offset = 20;
-    s_v1->pid_ax_offset = 34;
-    s_v1->event_offset = 40;
-    s_v1->total_height = c_view1_draw_height;
-    s_v1->total_width = c_view1_draw_width;
-    s_v1->first_pid_index = 0;
-
-    s_v1->npids = (s_v1->total_height - s_v1->time_ax_height) / 
-        s_v1->strip_height;
-
-    s_v1->minvistime = 0;
-    s_v1->maxvistime = 200;
-
-    s_view1_vbox = gtk_vbox_new(FALSE, 5);
-
-    s_view1_hbox = gtk_hbox_new(FALSE, 5);
-
-    da = gtk_drawing_area_new();
-    gtk_drawing_area_size(GTK_DRAWING_AREA(da), c_view1_draw_width, 
-                          c_view1_draw_height);
-    
-#ifdef NOTDEF
-    gtk_signal_connect (GTK_OBJECT (da), "motion_notify_event",
-                        (GtkSignalFunc) motion_notify_event, NULL);
-#endif
-
-    gtk_signal_connect (GTK_OBJECT (da), "expose_event",
-                        (GtkSignalFunc) expose_event, NULL);
-
-    gtk_signal_connect (GTK_OBJECT(da),"configure_event",
-                        (GtkSignalFunc) configure_event, NULL);
-
-    gtk_signal_connect (GTK_OBJECT (da), "button_press_event",
-                        (GtkSignalFunc) button_press_event, NULL);
-    
-    gtk_signal_connect (GTK_OBJECT (da), "button_release_event",
-                        (GtkSignalFunc) button_press_event, NULL);
-    
-    gtk_signal_connect (GTK_OBJECT (da), "motion_notify_event",
-                        (GtkSignalFunc) button_press_event, NULL);
-    
-    gtk_widget_set_events (da, GDK_BUTTON_PRESS_MASK 
-                           | GDK_BUTTON_RELEASE_MASK | GDK_EXPOSURE_MASK 
-                           | GDK_BUTTON_MOTION_MASK);
-
-
-    gtk_box_pack_start(GTK_BOX(s_view1_hbox), da, TRUE, TRUE, 0);
-
-    g_font = gdk_font_load ("8x13");
-    if (g_font == NULL) {
-        g_error("Couldn't load 8x13 font...\n");
-    }
-    gdk_font_ref(g_font);
-
-    /* PID axis menu */
-    s_view1_vmenubox = gtk_vbox_new(FALSE, 5);
-
-    s_view1_vsadj = gtk_adjustment_new(0.0 /* initial value */, 
-                                       0.0 /* minimum value */,
-                                       2000.0 /* maximum value */,
-                                       0.1 /* step increment */, 
-                                       10.0/* page increment */, 
-                                       10.0/* page size */);
-
-    s_view1_vscroll = gtk_vscrollbar_new (GTK_ADJUSTMENT(s_view1_vsadj));
-
-    gtk_signal_connect (GTK_OBJECT (s_view1_vsadj), "value-changed",
-                        GTK_SIGNAL_FUNC (view1_vscroll), 
-                        (gpointer)s_view1_vscroll);
-
-    s_view1_topbutton = gtk_button_new_with_label("Top");
-    s_view1_bottombutton = gtk_button_new_with_label("Bottom");
-
-    gtk_signal_connect (GTK_OBJECT(s_view1_topbutton), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) TOP_BUTTON);
-    
-    gtk_signal_connect (GTK_OBJECT(s_view1_bottombutton), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) BOTTOM_BUTTON);
-
-    /* More Traces button and Less Traces button */
-    s_view1_more_traces_button = gtk_button_new_with_label("More Traces");
-    s_view1_less_traces_button = gtk_button_new_with_label("Less Traces");
-    gtk_signal_connect (GTK_OBJECT(s_view1_more_traces_button), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) MORE_TRACES_BUTTON);
-    gtk_signal_connect (GTK_OBJECT(s_view1_less_traces_button), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) LESS_TRACES_BUTTON);
-    
-#ifdef NOTDEF
-    /* Trick to bottom-justify the menu: */
-    s_view1_pad1 = gtk_vbox_new(FALSE, 0);
-    gtk_box_pack_start (GTK_BOX(s_view1_vmenubox), s_view1_pad1,
-                        TRUE, FALSE, 0);
-
-#endif
-    
-    gtk_box_pack_start (GTK_BOX(s_view1_vmenubox), s_view1_topbutton,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_vmenubox), s_view1_vscroll,
-                        TRUE, TRUE, 0);
-    
-    gtk_box_pack_start (GTK_BOX(s_view1_vmenubox), s_view1_bottombutton,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_vmenubox), s_view1_more_traces_button,
-                        FALSE, FALSE, 0);
-    
-    gtk_box_pack_start (GTK_BOX(s_view1_vmenubox), s_view1_less_traces_button,
-                        FALSE, FALSE, 0);
-    
-    gtk_box_pack_start (GTK_BOX(s_view1_hbox), s_view1_vmenubox,
-                        FALSE, FALSE, 0);
-
-    /* Time axis menu */
-
-    s_view1_hmenubox = gtk_hbox_new(FALSE, 5);
-    
-    s_view1_startbutton = gtk_button_new_with_label("Start");
-
-    s_view1_zoominbutton = gtk_button_new_with_label("ZoomIn");
-
-    s_view1_searchbutton = gtk_button_new_with_label("Search");
-
-    s_view1_srchagainbutton = gtk_button_new_with_label("Search Again");
-
-    s_view1_zoomoutbutton = gtk_button_new_with_label("ZoomOut");
-
-    s_view1_endbutton = gtk_button_new_with_label("End");
-
-    gtk_signal_connect (GTK_OBJECT(s_view1_startbutton), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) START_BUTTON);
-    
-    gtk_signal_connect (GTK_OBJECT(s_view1_zoominbutton), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) ZOOMIN_BUTTON);
-    
-    gtk_signal_connect (GTK_OBJECT(s_view1_searchbutton), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) SEARCH_BUTTON);
-    
-    gtk_signal_connect (GTK_OBJECT(s_view1_srchagainbutton), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) SEARCH_AGAIN_BUTTON);
-    
-    gtk_signal_connect (GTK_OBJECT(s_view1_zoomoutbutton), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) ZOOMOUT_BUTTON);
-    
-    gtk_signal_connect (GTK_OBJECT(s_view1_endbutton), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) END_BUTTON);
-    
-    s_view1_hsadj = gtk_adjustment_new(0.0 /* initial value */, 
-                                       0.0 /* minimum value */,
-                                       2000.0 /* maximum value */,
-                                       0.1 /* step increment */, 
-                                       10.0/* page increment */, 
-                                       10.0/* page size */);
-
-    s_view1_hscroll = gtk_hscrollbar_new (GTK_ADJUSTMENT(s_view1_hsadj));
-
-    gtk_signal_connect (GTK_OBJECT (s_view1_hsadj), "value-changed",
-                        GTK_SIGNAL_FUNC (view1_hscroll), 
-                        (gpointer)s_view1_hscroll);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox), s_view1_startbutton,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox), s_view1_hscroll,
-                        TRUE, TRUE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox), s_view1_endbutton,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox), s_view1_zoominbutton,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox), s_view1_searchbutton,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox), s_view1_srchagainbutton,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox), s_view1_zoomoutbutton,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_vbox), s_view1_hbox, 
-                        TRUE, TRUE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_vbox), s_view1_hmenubox,
-                        FALSE, FALSE, 0);
-
-
-    s_view1_hmenubox2 = gtk_hbox_new(FALSE, 5);
-
-    s_view1_snapbutton = gtk_button_new_with_label("Snap");
-
-    s_view1_nextbutton = gtk_button_new_with_label("Next");
-
-    s_view1_delbutton = gtk_button_new_with_label("Del");
-
-    s_view1_chase_event_button = gtk_button_new_with_label("ChaseEvent");
-
-    s_view1_chase_datum_button = gtk_button_new_with_label("ChaseDatum");
-
-    s_view1_chase_track_button = gtk_button_new_with_label("ChaseTrack");
-
-    s_view1_unchasebutton = gtk_button_new_with_label("NoChase");
-
-    s_view1_forward_button = gtk_button_new_with_label("->SrchChase(is<-)");
-    s_view1_backward_button = gtk_button_new_with_label("<-SrchChase(is->)");
-
-    s_view1_summary_button = gtk_button_new_with_label("Summary");
-    s_view1_nosummary_button = gtk_button_new_with_label("NoSummary");
-
-    gtk_signal_connect (GTK_OBJECT(s_view1_snapbutton), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) SNAP_BUTTON);
-
-    gtk_signal_connect (GTK_OBJECT(s_view1_nextbutton), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) NEXT_BUTTON);
-
-    gtk_signal_connect (GTK_OBJECT(s_view1_delbutton), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) DEL_BUTTON);
-
-    gtk_signal_connect (GTK_OBJECT(s_view1_chase_event_button), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) CHASE_EVENT_BUTTON);
-
-    gtk_signal_connect (GTK_OBJECT(s_view1_chase_datum_button), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) CHASE_DATUM_BUTTON);
-
-    gtk_signal_connect (GTK_OBJECT(s_view1_chase_track_button), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) CHASE_TRACK_BUTTON);
-
-    gtk_signal_connect (GTK_OBJECT(s_view1_unchasebutton), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) UNCHASE_BUTTON);
-
-    gtk_signal_connect (GTK_OBJECT(s_view1_forward_button), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) FORWARD_BUTTON);
-
-    gtk_signal_connect (GTK_OBJECT(s_view1_backward_button), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) BACKWARD_BUTTON);
-
-    gtk_signal_connect (GTK_OBJECT(s_view1_summary_button), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) SUMMARY_BUTTON);
-
-    gtk_signal_connect (GTK_OBJECT(s_view1_nosummary_button), "clicked",
-                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
-                        (gpointer) NOSUMMARY_BUTTON);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_vbox), s_view1_hmenubox2,
-                        FALSE, FALSE, 0);
-    
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_snapbutton,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_nextbutton,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_delbutton,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_chase_event_button,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_chase_datum_button,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_chase_track_button,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_unchasebutton,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_forward_button,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_backward_button,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_summary_button,
-                        FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_nosummary_button,
-                        FALSE, FALSE, 0);
-
-    s_view1_label = gtk_label_new(NULL);
-
-    gtk_box_pack_start (GTK_BOX(s_view1_vbox), s_view1_label,
-			FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX(g_mainhbox), s_view1_vbox,
-                        TRUE, TRUE, 0);
-
-    gtk_widget_show_all (s_view1_vbox);
-    GTK_WIDGET_SET_FLAGS(da, GTK_CAN_FOCUS);
-    gtk_widget_grab_focus(da);
-
-    gtk_widget_hide (s_view1_forward_button);
-    gtk_widget_hide (summary_mode ? s_view1_summary_button
-                                  : s_view1_nosummary_button);
-
-    zi_source = gdk_bitmap_create_from_data (NULL, (char *)zi_bits, zi_width, 
-                                             zi_height);
-    zi_mask = gdk_bitmap_create_from_data (NULL, (char *)zi_bkgd, zi_width,
-                                           zi_height);
-
-    zi_cursor = (GdkCursor *) gdk_cursor_new_from_pixmap (zi_source, 
-                                                          zi_mask, &fg_black,
-                                                          &bg_white, zi_x_hot,
-                                                          zi_y_hot);
-    gdk_pixmap_unref (zi_source);
-    gdk_pixmap_unref (zi_mask);
-
-    norm_cursor = (GdkCursor *) gdk_cursor_new (GDK_TOP_LEFT_ARROW);
-}
-
-/****************************************************************************
-* line_print
-****************************************************************************/
-
-void line_print (int x1, int y1, int x2, int y2)
-{
-    fprintf(s_printfp, "newpath\n");
-    fprintf(s_printfp, "%d %d moveto\n", xrt(x1, s_v1->total_height - y1), 
-            yrt(x1, s_v1->total_height - y1));
-
-    fprintf(s_printfp, "%d %d lineto\n", xrt (x2, s_v1->total_height - y2),
-            yrt (x2, s_v1->total_height - y2));
-    fprintf(s_printfp, "1 setlinewidth\n");
-    fprintf(s_printfp, "stroke\n");
-}
-
-/****************************************************************************
-* tbox_print
-****************************************************************************/
-GdkRectangle *tbox_print (char *s, int x, int y, enum view1_tbox_fn function,
-                          GdkRectangle *rp)
-{
-    if (function == TBOX_PRINT_BOXED) {
-        rp->width -= 4;
-    }
-
-    if ((function == TBOX_PRINT_BOXED) ||
-	(function == TBOX_PRINT_EVENT)) {
-
-        fprintf(s_printfp, "newpath\n");
-        fprintf(s_printfp, "0 setlinewidth\n");
-        fprintf(s_printfp, "%d %d moveto\n", 
-                xrt(rp->x, s_v1->total_height - rp->y),
-                yrt(rp->x, s_v1->total_height - rp->y));
-        
-        fprintf(s_printfp, "%d %d lineto\n", 
-                xrt (rp->x+rp->width, s_v1->total_height - rp->y),
-                yrt (rp->x+rp->width, s_v1->total_height - rp->y));
-
-        fprintf(s_printfp, "%d %d lineto\n", 
-                xrt(rp->x+rp->width, s_v1->total_height - (rp->y+rp->height)),
-                yrt(rp->x+rp->width, s_v1->total_height - (rp->y+rp->height)));
-
-        fprintf(s_printfp, "%d %d lineto\n", 
-                xrt(rp->x, s_v1->total_height - (rp->y+rp->height)),
-                yrt(rp->x, s_v1->total_height - (rp->y+rp->height)));
-
-        fprintf(s_printfp, "%d %d lineto\n", 
-                xrt(rp->x, s_v1->total_height - rp->y),
-                yrt(rp->x, s_v1->total_height - rp->y));
-
-        fprintf(s_printfp, "stroke\n");
-    }
-
-    if ((function == TBOX_PRINT_BOXED) ||
-	(function == TBOX_PRINT_PLAIN)) {
-
-        fprintf(s_printfp, "newpath\n");
-        fprintf(s_printfp, "%d %d moveto\n", 
-                xrt(x, s_v1->total_height - (y-2)),
-                yrt(x, s_v1->total_height - (y-2)));
-        fprintf(s_printfp, "gsave\n");
-        fprintf(s_printfp, "90 rotate\n");
-        fprintf(s_printfp, "(%s) show\n", s);
-        fprintf(s_printfp, "grestore\n");
-    }
-
-    return(rp);
-}    
-
-/****************************************************************************
-* tbox - draws an optionally boxed string whose lower lefthand 
-* corner is at (x, y).  As usual, Y is backwards.
-****************************************************************************/
-
-GdkRectangle *tbox (char *s, int x, int y, enum view1_tbox_fn function)
-{
-    static GdkRectangle update_rect;
-    gint lbearing, rbearing, width, ascent, descent;
-
-    gdk_string_extents (g_font, s,
-                        &lbearing, &rbearing,
-                        &width, &ascent, &descent);
-
-    /*
-     * If we have enough room to display full size events, then just
-     * use the BOXED function instead of the EVENT function.
-     */
-    if (s_v1->strip_height > 9) {
-	switch (function) {
-	case TBOX_DRAW_EVENT:    function = TBOX_DRAW_BOXED;    break;
-	case TBOX_GETRECT_EVENT: function = TBOX_GETRECT_BOXED; break;
-	case TBOX_PRINT_EVENT:   function = TBOX_PRINT_BOXED;   break;
-	default:
-            break;
-	    /* Nothing */
-	}
-    }
-    
-    switch (function) {
-    case TBOX_DRAW_BOXED:
-        gdk_draw_rectangle (pm, da->style->white_gc, TRUE,
-                            x, y - (ascent+descent+3), width + 2, 
-                            ascent + descent + 3);
-        
-        gdk_draw_rectangle (pm, da->style->black_gc, FALSE,
-                            x, y - (ascent+descent+3), width + 2, 
-                            ascent + descent + 3);
-        
-        gdk_draw_string (pm, g_font, da->style->black_gc,
-                         x + 1, y - 1, (const gchar *)s);
-        /* NOTE FALLTHROUGH */
-    case TBOX_GETRECT_BOXED:
-        update_rect.x = x;
-        update_rect.y = y -(ascent+descent+3);
-        update_rect.width = width + 3;
-        update_rect.height = ascent + descent + 4;
-        if (function == TBOX_DRAW_BOXED)
-            gtk_widget_draw (da, &update_rect);
-        break;
-
-    case TBOX_DRAW_EVENT:
-	/* We have a small event to draw...no text */
-        gdk_draw_rectangle (pm, da->style->black_gc, FALSE,
-                            x, y - 1, 3, 3);
-        /* NOTE FALLTHROUGH */
-    case TBOX_GETRECT_EVENT:
-        update_rect.x = x;
-        update_rect.y = y - 1;
-        update_rect.width = 4;
-        update_rect.height = 4;
-        if (function == TBOX_DRAW_EVENT)
-            gtk_widget_draw (da, &update_rect);
-	break;
-		
-        
-    case TBOX_DRAW_PLAIN:
-        
-        gdk_draw_string (pm, g_font, da->style->black_gc,
-                         x + 1, y - 1, (const gchar *)s);
-        /* NOTE FALLTHROUGH */
-    case TBOX_GETRECT_PLAIN:
-        update_rect.x = x;
-        update_rect.y = y -(ascent+descent+1);
-        update_rect.width = width;
-        update_rect.height = ascent + descent;
-        if (function == TBOX_DRAW_PLAIN)
-            gtk_widget_draw (da, &update_rect);
-        break;
-
-    case TBOX_PRINT_BOXED:
-        update_rect.x = x;
-        update_rect.y = y -(ascent+descent+3);
-        update_rect.width = width + 3;
-        update_rect.height = ascent + descent + 4;
-        /* note fallthrough */
-    case TBOX_PRINT_PLAIN:
-        return(tbox_print(s, x, y, function, &update_rect));
-
-    case TBOX_PRINT_EVENT:
-	/* We have a small event box to print...no text */
-        update_rect.x = x;
-        update_rect.y = y - 1;
-        update_rect.width = 4;
-        update_rect.height = 4;
-        return(tbox_print(s, x, y, function, &update_rect));
-    }
-    return(&update_rect);
-}
-
-/****************************************************************************
-* line
-*
-* For lines there is a primitive batching facility, that doesn't update
-* the drawing area until the batch is complete. This is handy for drawing
-* the pid axis and for summary mode.
-*
-* line_batch_mode contains the state for this:
-*
-*   BATCH_OFF:      no batching, update for every line
-*   BATCH_NEW:      just entered a batch, so initialize the area to update from
-*                   scratch
-*   BATCH_EXISTING: have drawn at least one line in batch mode, so the update
-*                   area should only be expanded from now on to include the
-*                   union of the "rectangular hull" of all lines
-****************************************************************************/
-
-static enum { BATCH_OFF, BATCH_NEW, BATCH_EXISTING } line_batch_mode;
-static int line_batch_count;
-static int line_minx, line_miny, line_maxx, line_maxy;
-
-void line_batch_start (void)
-{
-    line_batch_mode = BATCH_NEW;
-    line_batch_count = 0;
-}
-
-void line_batch_end (void)
-{
-    GdkRectangle update_rect;
-    if (line_batch_count > 0) {
-        update_rect.x = line_minx;
-        update_rect.y = line_miny;
-        update_rect.width = (line_maxx - line_minx) + 1;
-        update_rect.height = (line_maxy - line_miny) + 1;
-        gtk_widget_draw (da, &update_rect);
-    }
-    line_batch_mode = BATCH_OFF;
-}
-
-void line (int x1, int y1, int x2, int y2, enum view1_line_fn function)
-{
-    GdkRectangle update_rect;
-    GdkGC *gc = NULL;
-
-    switch(function) {
-    case LINE_DRAW_BLACK:
-        gc = da->style->black_gc;
-        break;
-
-    case LINE_DRAW_WHITE:
-        gc = da->style->white_gc;
-        break;
-
-    case LINE_PRINT:
-        line_print (x1, y1, x2, y2);
-        return;
-    }
-
-    gdk_draw_line (pm, gc, x1, y1, x2, y2);
-
-    switch (line_batch_mode) {
-        case BATCH_OFF:
-            update_rect.x = x1;
-            update_rect.y = y1;
-            update_rect.width = (x2-x1) + 1;
-            update_rect.height = (y2-y1) + 1;
-            gtk_widget_draw (da, &update_rect);
-            break;
-
-        case BATCH_NEW:
-            line_minx = x1;
-            line_maxx = x2;
-            line_miny = y1;
-            line_maxy = y2;
-            line_batch_mode = BATCH_EXISTING;
-            line_batch_count = 1;
-            break;
-
-        case BATCH_EXISTING:
-            if (line_minx > x1)
-                line_minx = x1;
-            if (line_miny > y1)
-                line_miny = y1;
-            if (line_maxx < x2)
-                line_maxx = x2;
-            if (line_maxy < y2)
-                line_maxy = y2;
-            line_batch_count++;
-            break;
-    }
-}
-
-
-/****************************************************************************
-* display_pid_axis
-****************************************************************************/
-
-static void display_pid_axis(v1_geometry_t *vp)
-{
-    int y, i, label_tick;
-    int last_printed_y = -vp->strip_height;
-    pid_sort_t *pp;
-    int pid_index;
-    char *label_fmt;
-    char tmpbuf [128];    
-
-    /* No pids yet? Outta here */
-    if (g_pids == NULL)
-        return;
-
-    line_batch_start();
-
-    for (i = 0; i < vp->npids; i++) {
-        pid_index = vp->first_pid_index + i;
-        if (pid_index >= g_npids)
-            break;
-
-        set_color(pid_index);
-        pp = (g_pids + pid_index);
-
-        label_fmt = get_track_label(pp->pid_value);
-        snprintf(tmpbuf, sizeof(tmpbuf)-1, label_fmt, pp->pid_value);
-
-        y = i*vp->strip_height + vp->pid_ax_offset;
-
-	/*
-	 * Have we incremented enough space to have another label not
-	 * overlap the previous label?
-	 */
-	if (y - last_printed_y > 9) {
-	    /* Draw label */
-	    tbox(tmpbuf, 0, y +4, TBOX_DRAW_PLAIN+s_print_offset);
-
-	    last_printed_y = y;
-
-	    /*
-	     * And let the line stick out a bit more to indicate this label
-	     * relates to the following line.
-	     */
-	    label_tick = 4;
-	}
-	else {
-	    label_tick = 0;
-	}
-
-        /* Draw axis line, but only if the lines aren't too close together */
-	if (vp->strip_height > 4) {
-	    line(vp->pid_ax_width - label_tick, y+4*s_print_offset,
-		 vp->total_width, y+4*s_print_offset,
-		 LINE_DRAW_BLACK+s_print_offset);
-	}
-    }
-
-    set_color(COLOR_DEFAULT);
-    line_batch_end();
-}
-
-/****************************************************************************
-* view1_read_events_callback
-* New event data just showed up, reset a few things.
-****************************************************************************/
-
-void view1_read_events_callback(void)
-{
-    int max_vis_index;
-
-    s_v1->first_pid_index = 0;
-
-    max_vis_index = 300;
-    if (max_vis_index > g_nevents)
-        max_vis_index = g_nevents-1;
-    
-    s_v1->minvistime = 0LL;
-    s_v1->maxvistime = (g_events[g_nevents - 1].time * 9)/ 8;
-    s_srchindex = 0;
-    s_srchcode = 0;
-    s_last_selected_event = 0;
-
-    init_track_colors();
-
-    recompute_hscrollbar();
-    recompute_vscrollbar();
-}
-
-/****************************************************************************
-* display_event_data
-****************************************************************************/
-
-static void display_event_data(v1_geometry_t *vp)
-{
-    int start_index;
-    int pid_index;
-    int x, y;
-    event_t *ep;
-    event_def_t *edp;
-    double time_per_pixel;
-    char tmpbuf[1024];
-    GdkRectangle *print_rect;
-    int *last_x_used;
-
-    /* Happens if one loads the event def header first, for example. */
-    if (g_nevents == 0)
-        return;
-
-    time_per_pixel = dtime_per_pixel(vp);
-
-    start_index = find_event_index (vp->minvistime);
-
-    /* Scrolled too far right? */
-    if (start_index >= g_nevents)
-        return;
-
-    ep = (g_events + start_index);
-
-    if (s_print_offset || summary_mode) {
-        last_x_used = (int *)g_malloc0(vp->npids * sizeof(int));
-    } else {
-        last_x_used = NULL;
-    }
-
-    line_batch_start();
-
-    while (ep < (g_events + g_nevents) &&
-           (ep->time < vp->maxvistime)) {
-        pid_index = ep->pid->pid_index;
-        set_color(pid_index);
-    
-        /* First filter: pid out of range */
-        if ((pid_index < vp->first_pid_index) ||
-            (pid_index >= vp->first_pid_index + vp->npids)) {
-            ep++;
-            continue;
-        }
-
-        /* Second filter: event hidden */
-        edp = find_event_definition (ep->code);
-        if (!edp->selected) {
-            ep++;
-            continue;
-        }
-        
-        /* Display it... */
-
-        pid_index -= vp->first_pid_index;
-        
-        y = pid_index*vp->strip_height + vp->event_offset;
-        
-        x = vp->pid_ax_width + 
-            (int)(((double)(ep->time - vp->minvistime)) / time_per_pixel);
-
-        if (last_x_used != NULL && x < last_x_used[pid_index]) {
-            ep++;
-            continue;
-        }
-
-        if (ep->flags & (EVENT_FLAG_SELECT | EVENT_FLAG_SEARCHRSLT)) {
-            if (ep->flags & EVENT_FLAG_SELECT) {
-                format_popbox_string(tmpbuf, sizeof(tmpbuf), ep, edp);
-#ifdef NOTDEF
-                sprintf(tmpbuf, edp->name);
-                sprintf(tmpbuf+strlen(tmpbuf), ": ");
-                sprintf(tmpbuf+strlen(tmpbuf), edp->format, ep->datum);
-#endif
-            } else {
-                sprintf(tmpbuf, "SEARCH RESULT");
-            }
-            print_rect = tbox(tmpbuf, x, y - vp->pop_offset, 
-                              TBOX_DRAW_BOXED+s_print_offset);
-            line(x, y-vp->pop_offset, x, y, LINE_DRAW_BLACK+s_print_offset);
-            if (last_x_used != NULL)
-                last_x_used[pid_index] = x + print_rect->width;
-        } 
-        if (summary_mode) {
-            int delta = vp->strip_height / 3;
-            if (delta < 1)
-                delta = 1;
-            y = pid_index*vp->strip_height + vp->pid_ax_offset;
-            line(x, y - delta, x, y + delta, LINE_DRAW_BLACK);
-            last_x_used[pid_index] = x + 1;
-        } else {
-            sprintf(tmpbuf, "%ld", ep->code);
-            print_rect = tbox(tmpbuf, x, y, TBOX_DRAW_EVENT+s_print_offset);
-            if (last_x_used != NULL)
-                last_x_used[pid_index] = x + print_rect->width;
-        }
-
-        ep++;
-    }
-    if (last_x_used)
-        g_free(last_x_used);
-    line_batch_end();
-    set_color(COLOR_DEFAULT);
-}
-
-/****************************************************************************
-* display_clear
-****************************************************************************/
-
-static void display_clear(void)
-{
-    GdkRectangle update_rect;
-
-    gdk_draw_rectangle (pm, da->style->white_gc, TRUE,
-                        0, 0, da->allocation.width,
-                        da->allocation.height);
-
-    update_rect.x = 0;
-    update_rect.y = 0;
-    update_rect.width = da->allocation.width;
-    update_rect.height = da->allocation.height;
-
-    gtk_widget_draw (da, &update_rect);
-}
-
-/****************************************************************************
-* display_time_axis
-****************************************************************************/
-
-static void display_time_axis(v1_geometry_t *vp)
-{
-    int x, y, i;
-    int xoffset, nticks;
-    char tmpbuf [128];
-    double unit_divisor;
-    double time;
-    char *units;
-    double time_per_pixel;
-
-    y = vp->npids * vp->strip_height + vp->pid_ax_offset;
-
-    x = vp->pid_ax_width;
-
-    nticks = (vp->total_width - vp->pid_ax_width) / vp->time_ax_spacing;
-
-    time_per_pixel = dtime_per_pixel(vp);
-
-    units = "ns";
-    unit_divisor = 1.00;
-        
-    if ((vp->maxvistime / unit_divisor) > 1000) {
-        units = "us";
-        unit_divisor = 1000.00;
-    }
-
-    if ((vp->maxvistime / unit_divisor) > 1000) {
-        units = "ms";
-        unit_divisor = 1000.00*1000.00;
-    }
-    if ((vp->maxvistime / unit_divisor) > 1000) {
-        units = "s";
-        unit_divisor = 1000.00*1000.00*1000.00;
-    }
-
-    /* Draw line */
-    line(x, y, vp->total_width, y, LINE_DRAW_BLACK+s_print_offset);
-
-    xoffset = 0;
-    
-    for (i = 0; i < nticks; i++) {
-        /* Tick mark */
-        line(x+xoffset, y-3, x+xoffset, y+3, LINE_DRAW_BLACK+s_print_offset);
-
-        time = (double)(x + xoffset - vp->pid_ax_width);
-        time *= time_per_pixel;
-        time += (double)(vp->minvistime);
-        time /= unit_divisor;
-
-        sprintf (tmpbuf, "%.2f%s", time, units);
-
-        tbox(tmpbuf, x+xoffset, y+15, TBOX_DRAW_PLAIN+s_print_offset);
-        
-        xoffset += vp->time_ax_spacing;
-    }
-}
-
-/****************************************************************************
-* clear_scoreboard
-* Forget about any temporary displays, they're gone now...
-****************************************************************************/
-
-static void clear_scoreboard(void)
-{
-    s_result_up = FALSE;
-}
-
-/****************************************************************************
-* view1_display
-****************************************************************************/
-
-void view1_display(void)
-{
-    display_clear();
-    display_pid_axis(s_v1);
-    display_event_data(s_v1);
-    display_time_axis(s_v1);
-    clear_scoreboard();
-}
-
-static gint idle_tag;
-
-/****************************************************************************
-* view1_display_eventually
-****************************************************************************/
-
-static void view1_display_eventually(void)
-{
-    gtk_idle_remove(idle_tag);
-    idle_tag = 0;
-    view1_display();
-}
-
-
-/****************************************************************************
-* view1_display_when_idle
-****************************************************************************/
-
-void view1_display_when_idle(void)
-{
-    if (idle_tag == 0) {
-        idle_tag = gtk_idle_add((GtkFunction) view1_display_eventually, 0);
-    }
-}
-
-/****************************************************************************
-* view1_about
-****************************************************************************/
-
-void view1_about (char *tmpbuf)
-{
-    int nsnaps;
-    snapshot_t *snaps;
-
-    sprintf(tmpbuf+strlen(tmpbuf), "Minvistime %lld\nMaxvistime %lld\n",
-            s_v1->minvistime, s_v1->maxvistime);
-    sprintf(tmpbuf+strlen(tmpbuf), "Strip Height %d\n", 
-            s_v1->strip_height);
-
-    for (nsnaps = 0, snaps = s_snapshots; snaps; snaps = snaps->next) {
-        nsnaps++;
-    }
-    sprintf(tmpbuf+strlen(tmpbuf), "%d snapshots in the ring\n", nsnaps);
-}
diff --git a/gmod/gmod/mod_vpp.c b/gmod/gmod/mod_vpp.c
index 4a1da83c..572f9ef5 100644
--- a/gmod/gmod/mod_vpp.c
+++ b/gmod/gmod/mod_vpp.c
@@ -21,7 +21,7 @@
 #include <vppinfra/clib.h>
 #include <vppinfra/vec.h>
 #include <vppinfra/hash.h>
-#include <svmdb.h>
+#include <svm/svmdb.h>
 #include <errno.h>
 
 mmodule vpp_module;
diff --git a/perftool/Makefile.am b/perftool/Makefile.am
deleted file mode 100644
index ac652aa6..00000000
--- a/perftool/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign
-AM_CFLAGS = -Wall 
-
-bin_PROGRAMS = c2cpel cpelatency cpeldump cpelinreg cpelstate
-
-lib_LTLIBRARIES = libcperf.la
-
-libcperf_la_SOURCES = delsvec.c linreg.c props.c cpel_util.c
-
-TOOL_LIBS = libcperf.la -lvppinfra -lm
-
-c2cpel_SOURCE = c2cpel.c
-c2cpel_LDADD = $(TOOL_LIBS)
-
-cpelatency_SOURCE = cpelatency.c
-cpelatency_LDADD = $(TOOL_LIBS)
-
-cpeldump_SOURCE = cpeldump.c
-cpeldump_LDADD = $(TOOL_LIBS)
-
-cpelinreg_SOURCE = cpelinreg.c
-cpelinreg_LDADD = $(TOOL_LIBS)
-
-cpelstate_SOURCE = cpelstate.c
-cpelstate_LDADD = $(TOOL_LIBS)
-
-
-
-
-
-
diff --git a/perftool/c2cpel.c b/perftool/c2cpel.c
deleted file mode 100644
index 38e6fe52..00000000
--- a/perftool/c2cpel.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2006-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/fcntl.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/elog.h>
-#include <pwd.h>
-#include <stdarg.h>
-#include <time.h>
-#include "cpel.h"
-#include "cpel_util.h"
-
-static elog_main_t elog_main;
-
-/*
- * convert_clib_file
- */
-void convert_clib_file(char *clib_file)
-{
-    clib_error_t *error = 0;
-    int i;
-    elog_main_t *em = &elog_main;
-    double starttime, delta;
-
-    error = elog_read_file (&elog_main, clib_file);
-
-    if (error) {
-        clib_warning("%U", format_clib_error, error);
-        exit (1);
-    }
-
-    em = &elog_main;
-
-    starttime = em->events[0].time;
-
-    for (i = 0; i < vec_len (em->events); i++) {
-        elog_event_t *e;        /* clib event */
-        evt_t *ep;              /* xxx2cpel event */
-        u8 *s;
-        u64 timestamp;
-        elog_event_type_t *t;
-        u8 *brief_event_name;
-        u8 *track_name;
-        int j;
-
-        e = vec_elt_at_index(em->events, i);
-
-        /* Seconds since start of log */
-        delta = e->time - starttime;
-        
-        /* u64 nanoseconds since start of log */
-        timestamp = delta * 1e9;
-
-        s = format (0, "%U%c", format_elog_event, em, e, 0);
-
-        /* allocate an event instance */
-        vec_add2(the_events, ep, 1);
-        ep->timestamp = timestamp;
-        
-        /* convert string event code to a real number */
-        t = vec_elt_at_index (em->event_types, e->type);
-
-        /* 
-         * Construct a reasonable event name.
-         * Truncate the format string at the first whitespace break
-         * or printf format character.
-         */
-        brief_event_name = format (0, "%s", t->format);
-
-        for (j = 0; j < vec_len (brief_event_name); j++) {
-            if (brief_event_name[j] == ' ' ||
-                brief_event_name[j] == '%' ||
-                brief_event_name[j] == '(') {
-                brief_event_name[j] = 0;
-                break;
-            }
-        }
-        /* Throw away that much of the formatted event */
-        vec_delete (s, j+1, 0);
-
-        ep->event_id = find_or_add_event(brief_event_name, "%s");
-
-        track_name = format (0, "%U%c", format_elog_track, em, e, 0);
-
-        ep->track_id = find_or_add_track (track_name);
-
-        ep->datum = find_or_add_strtab(s);
-
-        vec_free (track_name);
-        vec_free(brief_event_name);
-        vec_free(s);
-    }
-}
-
-u8 *vec_basename (char *s)
-{
-    u8 * rv;
-    char *cp = s;
-
-    while (*cp)
-        cp++;
-
-    cp--;
-
-    while (cp > s && *cp != '/')
-        cp--;
-
-    if (cp > s)
-        cp++;
-
-    rv = format (0, "%s", cp);
-    return rv;
-}
-
-
-int event_compare (const void *a0, const void *a1)
-{
-    evt_t *e0 = (evt_t *)a0;
-    evt_t *e1 = (evt_t *)a1;
-
-    if (e0->timestamp < e1->timestamp)
-        return -1;
-    else if (e0->timestamp > e1->timestamp)
-        return 1;
-    return 0;
-}
-
-int main (int argc, char **argv)
-{
-    int curarg=1;
-    char **inputfiles = 0;
-    char *outputfile = 0;
-    FILE *ofp;
-
-    if (argc < 3)
-        goto usage;
-
-    while (curarg < argc) {
-        if (!strncmp(argv[curarg], "--input-file", 3)) {
-            curarg++;
-            if (curarg < argc) {
-                vec_add1 (inputfiles, argv[curarg]);
-                curarg++;
-                continue;
-            }
-            clib_warning("Missing filename after --input-file\n");
-            exit (1);
-        }
-
-        if (!strncmp(argv[curarg], "--output-file", 3)) {
-            curarg ++;
-            if (curarg < argc) {
-                outputfile = argv[curarg];
-                curarg ++;
-                continue;
-            }
-            clib_warning("Missing filename after --output-file\n");
-            exit(1);
-        }
-        vec_add1 (inputfiles, argv[curarg]);
-        curarg++;
-        continue;
-
-    usage:
-        fformat(stderr, 
-                "c2cpel [--input-file] <filename> --output-file <filename>\n");
-        exit(1);
-    }
-
-    if (vec_len(inputfiles) == 0 || outputfile == 0)
-        goto usage;
-        
-    if (vec_len(inputfiles) > 1)
-        goto usage;
-
-    cpel_util_init();
-
-    convert_clib_file (inputfiles[0]);
-
-    ofp = fopen (outputfile, "w");
-    if (ofp == NULL) {
-        clib_unix_warning ("couldn't create %s", outputfile);
-        exit (1);
-    }
-    
-    alpha_sort_tracks();
-    fixup_event_tracks();
-
-    /*
-     * Four sections: string-table, event definitions, track defs, events. 
-     */
-    if (!write_cpel_header(ofp, 4)) {
-        clib_warning ("Error writing cpel header to %s...\n", outputfile);
-        unlink(outputfile);
-        exit(1);
-    }
-
-    if (!write_string_table(ofp)) {
-        clib_warning ("Error writing string table to %s...\n", outputfile);
-        unlink(outputfile);
-        exit(1);
-    }
-
-    if (!write_event_defs(ofp)) {
-        clib_warning ("Error writing event defs to %s...\n", outputfile);
-        unlink(outputfile);
-        exit(1);
-    }
-
-    if (!write_track_defs(ofp)) {
-        clib_warning ("Error writing track defs to %s...\n", outputfile);
-        unlink(outputfile);
-        exit(1);
-    }
-
-    if (!write_events(ofp, (u64) 1e9)) {
-        clib_warning ("Error writing events to %s...\n", outputfile);
-        unlink(outputfile);
-        exit(1);
-        
-    }
-    fclose(ofp);
-    exit (0);
-}
diff --git a/perftool/configure.ac b/perftool/configure.ac
deleted file mode 100644
index f4a98697..00000000
--- a/perftool/configure.ac
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_INIT(perftool, 2.0)
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_CHECK_LIB([vppinfra], [clib_mem_get_page_size],,
-        AC_MSG_ERROR([Please install the vpp-lib package]))
-AC_CHECK_HEADER([vppinfra/clib.h],,
-        AC_MSG_ERROR([Please install the vpp-dev package]))
-
-AM_PROG_LIBTOOL
-
-AC_OUTPUT([Makefile])
diff --git a/perftool/cpel.h b/perftool/cpel.h
deleted file mode 100644
index 0bfb1a68..00000000
--- a/perftool/cpel.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2005-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _CPEL_H_
-#define _CPEL_H_ 1
-
-typedef struct cpel_file_header_ {
-    unsigned char endian_version;
-    unsigned char pad;
-    unsigned short nsections;
-    unsigned int file_date;
-} cpel_file_header_t;
-
-#define CPEL_FILE_LITTLE_ENDIAN	0x80
-#define CPEL_FILE_VERSION       0x01
-#define CPEL_FILE_VERSION_MASK  0x7F
-
-typedef struct cpel_section_header_ {
-    unsigned int section_type;
-    unsigned int data_length;        /* does NOT include type and itself */
-} cpel_section_header_t;
-
-#define CPEL_SECTION_STRTAB	1
-/* string at offset 0 is the name of the table */
-
-#define CPEL_SECTION_SYMTAB     2
-#define CPEL_SECTION_EVTDEF     3
-
-typedef struct event_definition_section_header_ {
-    char string_table_name[64];
-    unsigned int number_of_event_definitions;
-} event_definition_section_header_t;
-
-typedef struct event_definition_ {
-    unsigned int event;
-    unsigned int event_format;
-    unsigned int datum_format;
-} event_definition_t;
-
-#define CPEL_SECTION_TRACKDEF   4
-
-typedef struct track_definition_section_header_ {
-    char string_table_name[64];
-    unsigned int number_of_track_definitions;
-} track_definition_section_header_t;
-
-typedef struct track_definition_ {
-    unsigned int track;
-    unsigned int track_format;
-} track_definition_t;
-
-#define CPEL_SECTION_EVENT      5
-
-typedef struct event_section_header_ {
-    char string_table_name[64];
-    unsigned int number_of_events;
-    unsigned int clock_ticks_per_second;
-} event_section_header_t;
-
-typedef struct event_entry_ {
-    unsigned int time[2];
-    unsigned int track;
-    unsigned int event_code;
-    unsigned int event_datum;
-} event_entry_t;
-
-#define CPEL_NUM_SECTION_TYPES 5
-
-#endif /* _CPEL_H_ */
-
diff --git a/perftool/cpel_util.c b/perftool/cpel_util.c
deleted file mode 100644
index 7ee9b6e2..00000000
--- a/perftool/cpel_util.c
+++ /dev/null
@@ -1,456 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2006-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/fcntl.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/byte_order.h>
-#include <pwd.h>
-#include <stdarg.h>
-#include <time.h>
-#include "cpel.h"
-#include "cpel_util.h"
-
-evt_t *the_events;
-
-track_t *the_tracks;
-u32 *track_alpha_map;
-
-event_definition_t *the_event_definitions;
-i64 min_timestamp;
-
-/* Hash tables, used to find previous instances of the same items */
-uword *the_track_hash;
-uword *the_msg_event_hash;
-uword *the_strtab_hash;
-uword *the_pidtid_hash;
-uword *the_pid_to_name_hash;
-u8 *the_strtab;
-
-uword *the_event_id_bitmap;
-
-/*
- * find_or_add_strtab
- * Finds or adds a string to the string table
- */
-u32 find_or_add_strtab(void *s_arg)
-{
-    uword *p;
-    int len;
-    u8 *this_string;
-    u8 *scopy=0;
-    char *s = s_arg;
-
-    p = hash_get_mem(the_strtab_hash, s);
-    if (p) {
-        return (p[0]);
-    }
-
-    /*
-     * Here's a CLIB bear-trap. We can't add the string-table 
-     * strings to the to the hash table (directly), since it 
-     * expands and moves periodically. All of the hash table
-     * entries turn into dangling references, yadda yadda. 
-     */
-
-    len = strlen(s)+1;
-    vec_add2(the_strtab, this_string, len);
-    memcpy(this_string, s, len);
-    
-    /* Make a copy which won't be moving around... */
-    vec_validate(scopy, len);
-    memcpy(scopy, s, len);
-
-    hash_set_mem(the_strtab_hash, scopy, this_string - the_strtab);
-
-    return(this_string - the_strtab);
-}
-
-/*
- * find_or_add_track
- * returns index in track table
- */
-u32 find_or_add_track(void *s_arg)
-{
-    uword *p;
-    track_t *this_track;
-    u8 *copy_s;
-    char *s=s_arg;
-
-    p = hash_get_mem(the_track_hash, s);
-    if (p) {
-        return (p[0]);
-    }
-    vec_add2(the_tracks, this_track, 1);
-
-    this_track->original_index = this_track - the_tracks;
-    this_track->strtab_offset = find_or_add_strtab(s);
-
-    copy_s = (u8 *)vec_dup(s);
-
-    hash_set_mem(the_track_hash, copy_s, this_track - the_tracks);
-    return(this_track - the_tracks);
-}
-
-/* 
- * find_or_add_event
- * Adds an event to the event definition vector and add it to
- * the event hash table
- */
-
-u32 find_or_add_event(void *s_arg, char *datum_format)
-{
-    uword *p;
-    u8 *copy_s;
-    event_definition_t *this_event_definition;
-    u32 event_id;
-    char *s=s_arg;
-
-    p = hash_get_mem(the_msg_event_hash, s);
-    if (p) {
-        return (p[0]);
-    }
-    vec_add2(the_event_definitions, this_event_definition, 1);
-
-    /* Allocate a new event-id */
-    event_id = clib_bitmap_first_clear (the_event_id_bitmap);
-    the_event_id_bitmap = clib_bitmap_set(the_event_id_bitmap, event_id, 1);
-    this_event_definition->event = event_id;
-    this_event_definition->event_format = find_or_add_strtab(s);
-    this_event_definition->datum_format = find_or_add_strtab(datum_format);
-
-    copy_s = (u8 *)vec_dup(s);
-
-    hash_set_mem(the_msg_event_hash, copy_s, event_id);
-
-    return(event_id);
-}
-
-/*
- * write_string_table
- */
-int write_string_table(FILE *ofp)
-{
-    cpel_section_header_t sh;
-
-    /* Round up string table size */
-    while (vec_len(the_strtab) & 0x7)
-        vec_add1(the_strtab, 0);
-
-    sh.section_type = ntohl(CPEL_SECTION_STRTAB);
-    sh.data_length = ntohl(vec_len(the_strtab));
-    
-    if (fwrite(&sh, sizeof(sh), 1, ofp) != 1)
-        return(0);
-    
-    if (fwrite(the_strtab, 1, vec_len(the_strtab), ofp) != 
-        vec_len(the_strtab))
-        return(0);
-
-    return(1);
-}
-
-/*
- * write_cpel_header
- */
-int write_cpel_header(FILE *ofp, u32 nsections)
-{
-    cpel_file_header_t h;
-    
-    h.endian_version = CPEL_FILE_VERSION;
-    h.pad = 0; 
-    h.nsections = ntohs(nsections);
-    h.file_date = ntohl(time(0));
-    if (fwrite(&h, sizeof(h), 1, ofp) != 1)
-        return (0);
-
-    return(1);
-}
-
-/* 
- * write_event_defs
- */
-int write_event_defs(FILE *ofp)
-{
-    cpel_section_header_t sh;
-    event_definition_section_header_t edsh;
-    event_definition_t *this_event_definition;
-    int i;
-
-    /* Next, the event definitions */
-    sh.section_type = ntohl(CPEL_SECTION_EVTDEF);
-    sh.data_length = ntohl(vec_len(the_event_definitions)
-                           *sizeof(the_event_definitions[0]) 
-                           + sizeof(event_definition_section_header_t));
-
-    if (fwrite(&sh, sizeof(sh), 1, ofp) != 1)
-        return(0);
-
-    memset(&edsh, 0, sizeof(edsh));
-
-    strcpy(edsh.string_table_name, "FileStrtab");
-    edsh.number_of_event_definitions = ntohl(vec_len(the_event_definitions));
-    
-    if (fwrite(&edsh, sizeof(edsh), 1, ofp) != 1)
-        return(0);
-
-    for (i = 0; i < vec_len(the_event_definitions); i++) {
-        this_event_definition = &the_event_definitions[i];
-        /* Endian fixup */
-        this_event_definition->event = ntohl(this_event_definition->event);
-        this_event_definition->event_format = 
-            ntohl(this_event_definition->event_format);
-        this_event_definition->datum_format =
-            ntohl(this_event_definition->datum_format);
-
-        if (fwrite(this_event_definition, sizeof(the_event_definitions[0]), 
-                   1, ofp) != 1)
-            return(0);
-    }
-    return(1);
-}
-
-/*
- * ntohll
- */
-u64 ntohll (u64 x) {
-    if (clib_arch_is_little_endian)
-	x = ((((x >> 0) & 0xff) << 56)
-	     | (((x >> 8) & 0xff) << 48)
-	     | (((x >> 16) & 0xff) << 40)
-	     | (((x >> 24) & 0xff) << 32)
-	     | (((x >> 32) & 0xff) << 24)
-	     | (((x >> 40) & 0xff) << 16)
-	     | (((x >> 48) & 0xff) << 8)
-	     | (((x >> 56) & 0xff) << 0));
-    
-    return x;
-}
-
-/* 
- * write_events
- */
-int write_events(FILE *ofp, u64 clock_ticks_per_second)
-{
-    cpel_section_header_t sh;
-    event_section_header_t eh;
-    u32 number_of_events;
-    int i;
-    event_entry_t e;
-    u64 net_timestamp;
-    evt_t *this_event;
-    u32 time0, time1;
-
-    number_of_events = vec_len(the_events);
-
-    sh.section_type = ntohl(CPEL_SECTION_EVENT);
-    sh.data_length = ntohl(number_of_events * sizeof(e) +
-                           sizeof(event_section_header_t));
-
-    if (fwrite(&sh, sizeof(sh), 1, ofp) != 1)
-        return(0);
-    
-    memset(&eh, 0, sizeof(eh));
-    strcpy(eh.string_table_name, "FileStrtab");
-    eh.number_of_events = ntohl(number_of_events);
-    eh.clock_ticks_per_second = ntohl(clock_ticks_per_second);
-    
-    if (fwrite(&eh, sizeof(eh), 1, ofp) != 1)
-        return(0);
-
-    for (i = 0; i < number_of_events; i++) {
-        this_event = &the_events[i];
-        net_timestamp = ntohll(this_event->timestamp);
-    
-        time1 = net_timestamp>>32;
-        time0 = net_timestamp & 0xFFFFFFFF;
-        
-        e.time[0] = time0;
-        e.time[1] = time1;
-        e.track = ntohl(this_event->track_id);
-        e.event_code = ntohl(this_event->event_id);
-        e.event_datum = ntohl(this_event->datum);
-        
-        if (fwrite(&e, sizeof(e), 1, ofp) != 1)
-            return(0);
-    }
-    return(1);
-}
-
-/*
- * write_track_defs
- */
-int write_track_defs(FILE *ofp)
-{
-    cpel_section_header_t sh;
-    track_definition_section_header_t tdsh;
-    track_definition_t record;
-    track_definition_t *this_track_definition = &record;
-    int i;
-    event_definition_section_header_t edsh;
-
-    /* Next, the event definitions */
-    sh.section_type = ntohl(CPEL_SECTION_TRACKDEF);
-    sh.data_length = ntohl(vec_len(the_tracks)
-                           *sizeof(this_track_definition[0]) 
-                           + sizeof(track_definition_section_header_t));
-
-    if (fwrite(&sh, sizeof(sh), 1, ofp) != 1)
-        return(0);
-
-    memset(&tdsh, 0, sizeof(tdsh));
-
-    strcpy(tdsh.string_table_name, "FileStrtab");
-    tdsh.number_of_track_definitions = ntohl(vec_len(the_tracks));
-    
-    if (fwrite(&tdsh, sizeof(edsh), 1, ofp) != 1)
-        return(0);
-
-    for (i = 0; i < vec_len(the_tracks); i++) {
-        this_track_definition->track = ntohl(i);
-        this_track_definition->track_format = 
-            ntohl(the_tracks[i].strtab_offset);
-
-        if (fwrite(this_track_definition, sizeof(this_track_definition[0]),
-                   1, ofp) != 1)
-            return(0);
-    }
-    return(1);
-}
-
-void cpel_util_init (void)
-{
-    u8 *eventstr;
-
-    the_strtab_hash = hash_create_string (0, sizeof (uword));
-    the_msg_event_hash = hash_create_string (0, sizeof (uword));
-    the_track_hash = hash_create_string (0, sizeof (uword));
-    the_pidtid_hash = hash_create_string (0, sizeof(uword));
-    the_pid_to_name_hash = hash_create(0, sizeof(uword));
-    
-    /* Must be first, or no supper... */
-    find_or_add_strtab("FileStrtab");
-
-    /* Historical canned events, no longer used. */
-    if (0) {
-        /* event 0 (not used) */
-        eventstr = format(0, "PlaceholderNotUsed");
-        vec_add1(eventstr, 0);
-        find_or_add_event(eventstr, "%s");
-        vec_free(eventstr);
-        
-        /* event 1 (thread on CPU) */
-        eventstr = format(0, "THREAD/THRUNNING");
-        vec_add1(eventstr, 0);
-        find_or_add_event(eventstr, "%s");
-        vec_free(eventstr);
-        
-        /* event 2 (thread ready) */
-        eventstr = format(0, "THREAD/THREADY");
-        vec_add1(eventstr, 0);
-        find_or_add_event(eventstr, "%s");
-        vec_free(eventstr);
-        
-        /* event 3 (function enter) */
-        eventstr = format(0, "FUNC/ENTER");
-        vec_add1(eventstr, 0);
-        find_or_add_event(eventstr, "0x%x");
-        vec_free(eventstr);
-        
-        /* event 4 (function enter) */
-        eventstr = format(0, "FUNC/EXIT");
-        vec_add1(eventstr, 0);
-        find_or_add_event(eventstr, "0x%x");
-        vec_free(eventstr);
-    }
-}
-
-/*
- * alpha_compare_tracks
- */
-static int alpha_compare_tracks(const void *a1, const void *a2)
-{
-    int i;
-    track_t *t1 = (track_t *)a1;
-    track_t *t2 = (track_t *)a2;
-    u8 *s1 = &the_strtab[t1->strtab_offset];
-    u8 *s2 = &the_strtab[t2->strtab_offset];
-
-    for (i = 0; s1[i] && s2[i]; i++) {
-        if (s1[i] < s2[i])
-            return(-1);
-        if (s1[i] > s2[i])
-            return(1);
-    }
-    return(0);
-}
-
-/*
- * alpha_sort_tracks
- * Alphabetically sort tracks, set up a mapping
- * vector so we can quickly map the original track index to
- * the new/improved/alpha-sorted index
- */
-void alpha_sort_tracks(void)
-{
-    track_t *this_track;
-    int i;
-
-    qsort(the_tracks, vec_len(the_tracks), sizeof(track_t),
-          alpha_compare_tracks);
-
-    vec_validate(track_alpha_map, vec_len(the_tracks));
-    _vec_len(track_alpha_map) = vec_len(the_tracks);
-
-    for (i = 0; i < vec_len(the_tracks); i++) {
-        this_track = &the_tracks[i];
-        track_alpha_map[this_track->original_index] = i;
-    }
-}
-
-/*
- * fixup_event_tracks
- * Use the track alpha mapping to account for the alphabetic
- * sort performed by the previous routine
- */
-void fixup_event_tracks(void)
-{
-    int i;
-    u32 old_track;
-
-    for (i = 0; i < vec_len(the_events); i++) {
-        old_track = the_events[i].track_id;
-        the_events[i].track_id = track_alpha_map[old_track];
-    }
-}
-
-/* Indispensable for debugging in gdb... */
-
-u32 vl(void *x)
-{
-    return vec_len(x);
-}
diff --git a/perftool/cpel_util.h b/perftool/cpel_util.h
deleted file mode 100644
index b76f7a4b..00000000
--- a/perftool/cpel_util.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2006-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __cpel_util_h__
-#define __cpel_util_h__
-
-/*
- * Our idea of an event, as opposed to a CPEL event
- */
-typedef struct evt_ {
-    u64 timestamp;
-    u32 track_id;               
-    u32 event_id;
-    u32 datum;
-} evt_t;
-
-evt_t *the_events;
-
-/*
- * Track object, so we can sort the tracks alphabetically and
- * fix the events later 
- */
-typedef struct track_ {
-    u32 original_index;
-    u32 strtab_offset;
-} track_t;
-
-track_t *the_tracks;
-u32 *track_alpha_map;
-
-event_definition_t *the_event_definitions;
-i64 min_timestamp;
-
-/* Hash tables, used to find previous instances of the same items */
-uword *the_track_hash;
-uword *the_msg_event_hash;
-uword *the_strtab_hash;
-uword *the_pidtid_hash;
-uword *the_pid_to_name_hash;
-u8 *the_strtab;
-
-u32 find_or_add_strtab(void *s_arg);
-u32 find_or_add_track(void *s_arg);
-u32 find_or_add_event(void *s_arg, char *datum_format);
-int write_string_table(FILE *ofp);
-int write_cpel_header(FILE *ofp, u32 nsections);
-int write_event_defs(FILE *ofp);
-u64 ntohll (u64 x);
-int write_events(FILE *ofp, u64 clock_ticks_per_second);
-int write_track_defs(FILE *ofp);
-void cpel_util_init (void);
-void alpha_sort_tracks(void);
-void fixup_event_tracks(void);
-
-#endif /* __cpel_util_h__ */
diff --git a/perftool/cpelatency.c b/perftool/cpelatency.c
deleted file mode 100644
index f40a1fb1..00000000
--- a/perftool/cpelatency.c
+++ /dev/null
@@ -1,927 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2006-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/fcntl.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <pwd.h>
-#include <stdarg.h>
-#include <time.h>
-#include "cpel.h"
-#include <math.h>
-
-char *time_format = "%.03d:%.02d:%.02d:%.03d:%.03d ";
-static char version[] = "cpelatency 2.0";
-
-#define USEC_PER_MS 1000LL
-#define USEC_PER_SECOND (1000*USEC_PER_MS)
-#define USEC_PER_MINUTE (60*USEC_PER_SECOND)
-#define USEC_PER_HOUR (60*USEC_PER_MINUTE)
-
-uword *the_strtab_hash; /* (name, base-VA) hash of all string tables */
-uword *the_evtdef_hash; /* (event-id, event-definition) hash */
-uword *the_trackdef_hash;      /* (track-id, track-definition) hash */
-uword *the_pidtid_hash;         /* ("pid:xxx tid:yy", track-definition) hash */
-
-f64 ticks_per_us;
-u32 start_event_code = 2;       /* default: XR thread ready event */
-u32 end_event_code = 1;         /* default: XR thread running event */
-int exclude_kernel_from_summary_stats=1;
-int summary_stats_only;
-int scatterplot;
-u8 *name_filter;
-int have_trackdefs;
-
-typedef enum {
-    SORT_MAX_TIME=1,
-    SORT_MAX_OCCURRENCES,
-    SORT_NAME,
-} sort_t;
-
-sort_t sort_type = SORT_MAX_TIME;
-
-int widest_name_format=5;
-int widest_track_format=20;
-
-typedef struct bound_event_ {
-    u32 event_code;
-    u8  *event_str;
-    u8  *datum_str;
-    u32  is_strtab_ref;
-} bound_event_t;
-
-bound_event_t *bound_events;
-
-typedef struct bound_track_ {
-    u32 track;
-    u8  *track_str;
-    u64 state_start_ticks;
-    u64 *ticks_in_state; /* vector of state occurrences */
-    f64  mean_ticks_in_state;
-    f64  variance_ticks_in_state;
-    f64  total_ticks_in_state;
-} bound_track_t;
-
-bound_track_t *bound_tracks;
-
-void fatal(char *s)
-{
-    fprintf(stderr, "%s", s);
-    exit(1);
-}
-
-typedef enum {
-    PASS1=1,
-    PASS2=2,
-} pass_t;
-
-typedef struct {
-    int (*pass1)(cpel_section_header_t *, int, FILE *);
-    int (*pass2)(cpel_section_header_t *, int, FILE *);
-} section_processor_t;
-
-int bad_section(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    fprintf(ofp, "Bad (type 0) section, skipped...\n");
-    return(0);
-}
-
-int noop_pass(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    return(0);
-}
-
-int strtab_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    uword *p;
-    u8 *strtab_data_area = (u8 *)(sh+1);
-    
-    /* Multiple string tables with the same name are Bad... */
-    p = hash_get_mem(the_strtab_hash, strtab_data_area);
-    if (p) {
-        fprintf(ofp, "Duplicate string table name %s", strtab_data_area);
-    }
-    /*
-     * Looks funny, but we really do want key = first string in the
-     * table, value = address(first string in the table) 
-     */
-    hash_set_mem(the_strtab_hash, strtab_data_area, strtab_data_area);
-    if (verbose) {
-        fprintf(ofp, "String Table %s\n", strtab_data_area);
-    }
-    return(0);
-}
-
-int evtdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    int i, nevents;
-    event_definition_section_header_t *edh;
-    event_definition_t *ep;
-    u8 *this_strtab;
-    u32 event_code;
-    uword *p;
-    bound_event_t *bp;
-    int thislen;
-
-    edh = (event_definition_section_header_t *)(sh+1);
-    nevents = ntohl(edh->number_of_event_definitions);
-    
-    if (verbose) {
-        fprintf(ofp, "Event Definition Section: %d definitions\n",
-                nevents);
-    }
-
-    p = hash_get_mem(the_strtab_hash, edh->string_table_name);
-    if (!p) {
-        fprintf(ofp, "Fatal: couldn't find string table\n");
-        return(1);
-    }
-    this_strtab = (u8 *)p[0];
-
-    ep = (event_definition_t *)(edh+1);
-    
-    for (i = 0; i < nevents; i++) {
-        event_code = ntohl(ep->event);
-        p = hash_get(the_evtdef_hash, event_code);
-        if (p) {
-            fprintf(ofp, "Event %d redefined, retain first definition\n",
-                    event_code);
-            continue;
-        }
-        vec_add2(bound_events, bp, 1);
-        bp->event_code = event_code;
-        bp->event_str = this_strtab + ntohl(ep->event_format);
-        bp->datum_str = this_strtab + ntohl(ep->datum_format);
-        bp->is_strtab_ref = 0;
-        /* Decide if the datum format is a %s format => strtab reference */
-        {
-            int j;
-            int seen_percent=0;
-
-            for (j = 0; j < strlen((char *) bp->datum_str); j++) {
-                if (bp->datum_str[j] == '%'){
-                    seen_percent=1;
-                    continue;
-                }
-                if (seen_percent && bp->datum_str[j] == 's') {
-                    bp->is_strtab_ref = 1;
-                }
-            }
-        }
-        
-        hash_set(the_evtdef_hash, event_code, bp - bound_events);
-
-        thislen = strlen((char *) bp->event_str);
-        if (thislen > widest_name_format)
-            widest_name_format = thislen;
-
-        ep++;
-    }
-    return (0);
-}
-
-int trackdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    int i, nevents;
-    track_definition_section_header_t *tdh;
-    track_definition_t *tp;
-    u8 *this_strtab;
-    u32 track_code;
-    uword *p;
-    bound_track_t *btp;
-    int thislen;
-    u8 *pidstr;
-    u8 *pidtid_str;
-    u8 *cp;
-    int tid, pid;
-
-    tdh = (track_definition_section_header_t *)(sh+1);
-    nevents = ntohl(tdh->number_of_track_definitions);
-    
-    if (verbose) {
-        fprintf(ofp, "Track Definition Section: %d definitions\n",
-                nevents);
-    }
-
-    p = hash_get_mem(the_strtab_hash, tdh->string_table_name);
-    if (!p) {
-        fprintf(ofp, "Fatal: couldn't find string table\n");
-        return(1);
-    }
-    this_strtab = (u8 *)p[0];
-
-    tp = (track_definition_t *)(tdh+1);
-    
-    for (i = 0; i < nevents; i++) {
-        track_code = ntohl(tp->track);
-        p = hash_get(the_trackdef_hash, track_code);
-        if (p) {
-            fprintf(stderr, "track %d redefined, retain first definition\n",
-                    track_code);
-            continue;
-        }
-        vec_add2(bound_tracks, btp, 1);
-        btp->track = track_code;
-        btp->track_str = this_strtab + ntohl(tp->track_format);
-        hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
-
-        if (verbose) {
-            fprintf(stderr, "adding track '%s'\n", btp->track_str);
-        }
-
-        thislen = strlen((char *) btp->track_str);
-        if (thislen > widest_track_format)
-            widest_track_format = thislen;
-
-        /* convert track_str "eth_server t11(20498)" to "pid:20498 tid:11" */
-        cp = btp->track_str;
-        while (*cp && *cp != '(')
-            cp++;
-        if (!*cp) {
-            fprintf(stderr, "error canonicalizing '%s'\n", btp->track_str);
-            goto out;
-        }
-        pidstr = cp+1;          /* remember location of PID */
-
-        while (cp > btp->track_str && *cp != 't')
-            cp--;
-
-        if (cp == btp->track_str) {
-            fprintf(stderr, "error canonicalizing '%s'\n", btp->track_str);
-            goto out;
-        }
-        tid = atol((char *)(cp+1));
-        pid = atol((char *) pidstr);
-        pidtid_str = format(0, "pid:%d tid:%d", pid, tid);
-        vec_add1(pidtid_str, 0);
-
-        /* 
-         * Note: duplicates are possible due to thread create / 
-         * thread destroy operations.
-         */
-        p = hash_get_mem(the_pidtid_hash, pidtid_str);
-        if (p) {
-            vec_free(pidtid_str);
-            goto out;
-        }
-        hash_set_mem(the_pidtid_hash, pidtid_str, btp - bound_tracks);
-
-    out:
-        tp++;
-    }
-    have_trackdefs = 1;
-    return (0);
-}
-
-int unsupported_pass (cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    if (verbose) {
-        fprintf(ofp, "Unsupported type %d section\n",
-                ntohl(sh->section_type));
-    }
-    return(0);
-}
-
-int event_pass2(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    event_section_header_t *eh;
-    int nevents;
-    int i;
-    uword *p;
-    event_entry_t *ep;
-    u64 now;
-    u32 time0, time1;
-    u32 track_code;
-    u8 *this_strtab;
-    u64 ticks_in_state;
-    bound_track_t *btp;
-    bound_track_t *state_track=0;
-    u8 *pidtid_str;
-    u8 *pidtid_dup;
-    u8 *ecp;
-    u32 event_code;
-
-    eh = (event_section_header_t *)(sh+1);
-    nevents = ntohl(eh->number_of_events);
-    ticks_per_us = ((double)ntohl(eh->clock_ticks_per_second)) / 1e6;
-
-    if (verbose) {
-        fprintf(ofp, "%.3f ticks_per_us\n", ticks_per_us);
-    }
-
-    ep = (event_entry_t *)(eh+1);
-
-    p = hash_get_mem(the_strtab_hash, eh->string_table_name);
-    if (!p) {
-        fprintf(ofp, "Fatal: couldn't find string table\n");
-        return(1);
-    }
-    this_strtab = (u8 *)p[0];
-
-    /*
-     * Some logger implementation that doesn't produce
-     * trackdef sections, synthesize the bound_tracks vector
-     */
-    if (!have_trackdefs) {
-        for (i = 0; i < nevents; i++) {
-            track_code = ntohl(ep->track);
-            pidtid_dup = format(0, "%d", track_code);
-            vec_add1(pidtid_dup, 0);
-            p = hash_get_mem(the_pidtid_hash, pidtid_dup);
-            if (!p) {
-                vec_add2(bound_tracks, btp, 1);
-                btp->track = track_code;
-                btp->track_str = pidtid_dup;
-                hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
-                hash_set_mem(the_pidtid_hash, pidtid_dup, btp - bound_tracks);
-            } else {
-                vec_free(pidtid_dup);
-            }
-            ep++;
-        }
-    }
-
-    ep = (event_entry_t *)(eh+1);
-
-    for (i = 0; i < nevents; i++) {
-        time0 = ntohl (ep->time[0]);
-        time1 = ntohl (ep->time[1]);
-
-        now = (((u64) time0)<<32) | time1;
-        
-        event_code = ntohl(ep->event_code);
-
-        /* Find the corresponding track via the pidtid hash table */
-        if (event_code == start_event_code || event_code == end_event_code) {
-            if (have_trackdefs) {
-                pidtid_str = this_strtab + ntohl(ep->event_datum);
-                pidtid_dup = format(0, (char *) pidtid_str);
-                vec_add1(pidtid_dup, 0);
-                ecp = &pidtid_dup[vec_len(pidtid_dup)-1];
-                while (*--ecp == ' ')
-                    *ecp = 0;
-            } else {
-                pidtid_dup = format(0, "%d", ntohl(ep->track));
-                vec_add1(pidtid_dup, 0);
-            }
-
-            p = hash_get_mem(the_pidtid_hash, pidtid_dup);
-            if (!p) {
-                fprintf(stderr, "warning: couldn't find '%s'\n",
-                        pidtid_dup);
-                vec_free(pidtid_dup);
-                ep++;
-                continue;
-            }
-            state_track = &bound_tracks[p[0]];
-        }
-        /* Found the start-event code ? */
-        if (event_code == start_event_code) {
-            state_track->state_start_ticks = now;
-        } else if (event_code == end_event_code) {
-            /*
-             * Add a ticks-in-state record, unless
-             * e.g. the log started with the exit event
-             */
-            if (state_track->state_start_ticks) {
-                ticks_in_state = now - state_track->state_start_ticks;
-                vec_add1(state_track->ticks_in_state, ticks_in_state);
-                state_track->state_start_ticks = 0;
-            }
-            /* Otherwise, nothing */
-        }
-        ep++;
-    }
-    return(0);
-}
-
-/* 
- * Note: If necessary, add passes / columns to this table to 
- * handle section order dependencies.
- */
-
-section_processor_t processors[CPEL_NUM_SECTION_TYPES+1] =
-{
-    {bad_section,	noop_pass}, 		/* type 0 -- f**ked */
-    {strtab_pass1, 	noop_pass}, 		/* type 1 -- STRTAB */
-    {unsupported_pass,  noop_pass}, 		/* type 2 -- SYMTAB */
-    {evtdef_pass1,      noop_pass},             /* type 3 -- EVTDEF */
-    {trackdef_pass1,    noop_pass},		/* type 4 -- TRACKDEF */
-    {noop_pass,         event_pass2},           /* type 5 -- EVENTS */
-};
-
-
-int process_section(cpel_section_header_t *sh, int verbose, FILE *ofp,
-                    pass_t pass)
-{
-    u32 type;
-    type = ntohl(sh->section_type);
-    int rv;
-    int (*fp)(cpel_section_header_t *, int, FILE *);
-
-    if (type > CPEL_NUM_SECTION_TYPES) {
-        fprintf(stderr, "Unknown section type %d\n", type);
-        return(1);
-    }
-    switch(pass) {
-    case PASS1:
-        fp = processors[type].pass1;
-        break;
-
-    case PASS2:
-        fp = processors[type].pass2;
-        break;
-        
-    default:
-        fprintf(stderr, "Unknown pass %d\n", pass);
-        return(1);
-    }
-
-    rv = (*fp)(sh, verbose, ofp);
-
-    return(rv);
-}
-
-int cpel_dump_file_header(cpel_file_header_t *fh, int verbose, FILE *ofp)
-{
-    time_t file_time;
-
-    if (verbose) {
-        fprintf(ofp, "CPEL file: %s-endian, version %d\n",
-                ((fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) ? 
-                 "little" : "big"), 
-                fh->endian_version & CPEL_FILE_VERSION_MASK);
-
-        file_time = ntohl(fh->file_date);
-        
-        fprintf(ofp, "File created %s", ctime(&file_time));
-        fprintf(ofp, "File has %d sections\n", 
-                ntohs(fh->nsections));
-    }
-
-    return(0);
-}
-
-
-int cpel_dump(u8 *cpel, int verbose, FILE *ofp)
-{
-    cpel_file_header_t *fh;
-    cpel_section_header_t *sh;
-    u16 nsections;
-    u32 section_size;
-    int i;
-
-    /* First, the file header */
-    fh = (cpel_file_header_t *)cpel;
-    if (fh->endian_version != CPEL_FILE_VERSION) {
-        if (fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) {
-            fprintf(stderr, "Little endian data format not supported\n");
-            return(1);
-        }
-        fprintf(stderr, "Unsupported file version 0x%x\n", 
-                fh->endian_version);
-        return(1);
-    }
-    cpel_dump_file_header(fh, verbose, ofp);
-    nsections = ntohs(fh->nsections);
-
-    /*
-     * Take two passes through the file. PASS1 builds
-     * data structures, PASS2 actually dumps the file.
-     * Just in case the sections are in an unobvious order.
-     */
-    sh = (cpel_section_header_t *)(fh+1);
-    for (i = 0; i < nsections; i++) {
-        section_size = ntohl(sh->data_length);
-
-        if(verbose) {
-            fprintf(ofp, "Section type %d, size %d\n", ntohl(sh->section_type),
-                    section_size);
-        }
-
-        if(process_section(sh, verbose, ofp, PASS1))
-            return(1);
-
-        sh++;
-        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
-    }
-
-    sh = (cpel_section_header_t *)(fh+1);
-    for (i = 0; i < nsections; i++) {
-        if(process_section(sh, verbose, ofp, PASS2))
-            return(1);
-        section_size = ntohl(sh->data_length);
-        sh++;
-        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
-    }
-    return(0);
-}
-
-void compute_state_statistics(int verbose, FILE *ofp)
-{
-    int i, j;
-    bound_track_t *bp;
-    f64 fticks;
-
-    /* Across the bound tracks */
-    for (i = 0; i < vec_len(bound_tracks); i++) {
-        bp = &bound_tracks[i];
-        bp->mean_ticks_in_state = 0.0;
-        bp->variance_ticks_in_state = 0.0;
-        bp->total_ticks_in_state = 0.0;
-        for (j = 0; j < vec_len(bp->ticks_in_state); j++) {
-            bp->total_ticks_in_state += (f64) bp->ticks_in_state[j];
-        }
-        /* Compute mean */
-        if (vec_len(bp->ticks_in_state)) {
-            bp->mean_ticks_in_state = bp->total_ticks_in_state / 
-                ((f64) vec_len(bp->ticks_in_state));
-        }
-        /* Accumulate sum: (Xi-Xbar)**2 */
-        for (j = 0; j < vec_len(bp->ticks_in_state); j++) {
-            fticks = bp->ticks_in_state[j];
-            bp->variance_ticks_in_state += 
-                (fticks - bp->mean_ticks_in_state)*
-                (fticks - bp->mean_ticks_in_state);
-        }
-        /* Compute s**2, the unbiased estimator of sigma**2 */
-        if (vec_len(bp->ticks_in_state) > 1) {
-            bp->variance_ticks_in_state /= (f64) 
-                (vec_len(bp->ticks_in_state)-1);
-        }
-    }
-}
-
-int track_compare_max (const void *arg1, const void *arg2)
-{
-    bound_track_t *a1 = (bound_track_t *)arg1;
-    bound_track_t *a2 = (bound_track_t *)arg2;
-    f64 v1, v2;
-
-    v1 = a1->total_ticks_in_state;
-    v2 = a2->total_ticks_in_state;
-    
-    if (v1 < v2)
-        return (1);
-    else if (v1 == v2)
-        return (0);
-    else return (-1);
-}
-
-int track_compare_occurrences (const void *arg1, const void *arg2)
-{
-    bound_track_t *a1 = (bound_track_t *)arg1;
-    bound_track_t *a2 = (bound_track_t *)arg2;
-    f64 v1, v2;
-
-    v1 = (f64) vec_len(a1->ticks_in_state);
-    v2 = (f64) vec_len(a2->ticks_in_state);
-    
-    if (v1 < v2)
-        return (1);
-    else if (v1 == v2)
-        return (0);
-    else return (-1);
-}
-
-int track_compare_name (const void *arg1, const void *arg2)
-{
-    bound_track_t *a1 = (bound_track_t *)arg1;
-    bound_track_t *a2 = (bound_track_t *)arg2;
-
-    return (strcmp((char *)(a1->track_str), (char *)(a2->track_str)));
-}
-
-void sort_state_statistics(sort_t type, FILE *ofp)
-{
-    int (*compare)(const void *, const void *);
-
-    if (summary_stats_only)
-        return;
-
-    switch(type) {
-    case SORT_MAX_TIME:
-        fprintf(ofp, "Results sorted by max time in state.\n\n");
-        compare = track_compare_max;
-        break;
-
-    case SORT_MAX_OCCURRENCES:
-        fprintf(ofp, "Results sorted by max occurrences of state.\n\n");
-        compare = track_compare_occurrences;
-        break;
-
-    case SORT_NAME:
-        compare = track_compare_name;
-        fprintf(ofp, "Results sorted by process name, thread ID, PID\n\n");
-        break;
-
-    default:
-        fatal("sort type not set?");
-    }
-    
-    qsort (bound_tracks, vec_len(bound_tracks), 
-           sizeof (bound_track_t), compare);    
-}
-
-void print_state_statistics(int verbose, FILE *ofp)
-{
-    int i,j;
-    u8 *trackpad;
-    bound_track_t *bp;
-    f64 total_time = 0.0;
-    f64 total_switches = 0.0;
-
-    trackpad = format(0, "%%-%ds ", widest_track_format);
-    vec_add1(trackpad, 0);
-
-    if (!summary_stats_only) {
-        fprintf(ofp, (char *)trackpad, "ProcName Thread(PID)");
-        fprintf(ofp, "  Mean(us)     Stdev(us)   Total(us)      N\n");
-    }
-        
-    for (i = 0; i < vec_len(bound_tracks); i++) {
-        bp = &bound_tracks[i];
-        if (bp->mean_ticks_in_state == 0.0)
-            continue;
-
-        if (name_filter &&
-            strncmp((char *)bp->track_str, (char *)name_filter, 
-                    strlen((char *)name_filter)))
-            continue;
-
-        /*
-         * Exclude kernel threads (e.g. idle thread) from
-         * state statistics 
-         */
-        if (exclude_kernel_from_summary_stats && 
-            !strncmp((char *) bp->track_str, "kernel ", 7))
-            continue;
-
-        total_switches += (f64) vec_len(bp->ticks_in_state);
-        
-        if (!summary_stats_only) {
-            fprintf(ofp, (char *) trackpad, bp->track_str);
-            fprintf(ofp, "%10.3f +- %10.3f", 
-                    bp->mean_ticks_in_state / ticks_per_us,
-                    sqrt(bp->variance_ticks_in_state) 
-                    / ticks_per_us);
-            fprintf(ofp, "%12.3f", 
-                    bp->total_ticks_in_state / ticks_per_us);
-            fprintf(ofp, "%8d\n", vec_len(bp->ticks_in_state));
-        }
-
-        if (scatterplot) {
-            for (j = 0; j < vec_len(bp->ticks_in_state); j++) {
-                fprintf(ofp, "%.3f\n", 
-                        (f64)bp->ticks_in_state[j] / ticks_per_us);
-            }
-        }
-
-        total_time += bp->total_ticks_in_state;
-    }
-    
-    if (!summary_stats_only)
-        fprintf(ofp, "\n");
-    fprintf(ofp, "Note: the following statistics %s kernel-thread activity.\n",
-            exclude_kernel_from_summary_stats ? "exclude" : "include");
-    if (name_filter)
-        fprintf(ofp, 
-                "Note: only pid/proc/threads matching '%s' are included.\n",
-                name_filter);
-
-    fprintf(ofp, 
-      "Total time in state: %10.3f (us), Total state occurrences: %.0f\n", 
-            total_time / ticks_per_us, total_switches);
-    fprintf(ofp, "Average time in state: %10.3f (us)\n",
-            (total_time / total_switches) / ticks_per_us);
-    fprintf(ofp, "State start event: %d, state end event: %d\n",
-            start_event_code, end_event_code);
-}
-
-char *mapfile (char *file)
-{
-    struct stat statb;
-    char *rv;
-    int maphfile;
-    size_t mapfsize;
-    
-    maphfile = open (file, O_RDONLY);
-
-    if (maphfile < 0)
-    {
-        fprintf (stderr, "Couldn't read %s, skipping it...\n", file);
-        return (NULL);
-    }
-
-    if (fstat (maphfile, &statb) < 0)
-    {
-        fprintf (stderr, "Couldn't get size of %s, skipping it...\n", file);
-        return (NULL);
-    }
-
-    /* Don't try to mmap directories, FIFOs, semaphores, etc. */
-    if (! (statb.st_mode & S_IFREG)) {
-        fprintf (stderr, "%s is not a regular file, skipping it...\n", file);
-        return (NULL);
-    }
-
-    mapfsize = statb.st_size;
-
-    if (mapfsize < 3)
-    {
-        fprintf (stderr, "%s zero-length, skipping it...\n", file);
-        close (maphfile);
-        return (NULL);
-    }
-
-    rv = mmap (0, mapfsize, PROT_READ, MAP_SHARED, maphfile, 0);
-
-    if (rv == 0)
-    {
-        fprintf (stderr, "%s problem mapping, I quit...\n", file);
-        exit (-1);
-    }
-    close (maphfile);
-    return (rv);
-}
-
-/*
- * main 
- */
-int main (int argc, char **argv)
-{
-    char *cpel_file = 0;
-    char *outputfile = 0;
-    FILE *ofp;
-    char *cpel;
-    int verbose=0;
-    int curarg=1;
-
-    while (curarg < argc) {
-        if (!strncmp(argv[curarg], "--input-file", 3)) {
-            curarg++;
-            if (curarg < argc) {
-                cpel_file = argv[curarg];
-                curarg++;
-                continue;
-            }
-            fatal("Missing filename after --input-file\n");
-        }
-        if (!strncmp(argv[curarg], "--output-file", 3)) {
-            curarg ++;
-            if (curarg < argc) {
-                outputfile = argv[curarg];
-                curarg ++;
-                continue;
-            }
-            fatal("Missing filename after --output-file\n");
-        }
-        if (!strncmp(argv[curarg], "--verbose", 3)) {
-            curarg++;
-            verbose++;
-            continue;
-        }
-        if (!strncmp(argv[curarg], "--scatterplot", 4)) {
-            curarg++;
-            scatterplot=1;
-            continue;
-        }
-
-        if (!strncmp(argv[curarg], "--start-event", 4)) {
-            curarg++;
-            if (curarg < argc) {
-                start_event_code = atol(argv[curarg]);
-                curarg ++;
-                continue;
-            }
-            fatal("Missing integer after --start-event\n");
-        }
-        if (!strncmp(argv[curarg], "--end-event", 4)) {
-            curarg++;
-            if (curarg < argc) {
-                end_event_code = atol(argv[curarg]);
-                curarg ++;
-                continue;
-            }
-            fatal("Missing integer after --end-event\n");
-        }
-        if (!strncmp(argv[curarg], "--max-time-sort", 7)) {
-            sort_type = SORT_MAX_TIME;
-            curarg++;
-            continue;
-        }
-        if (!strncmp(argv[curarg], "--max-occurrence-sort", 7)) {
-            sort_type = SORT_MAX_OCCURRENCES;
-            curarg++;
-            continue;
-        }
-        if (!strncmp(argv[curarg], "--name-sort", 3)) {
-            sort_type = SORT_NAME;
-            curarg++;
-            continue;
-        }
-        if (!strncmp(argv[curarg], "--kernel-included", 3)) {
-            exclude_kernel_from_summary_stats = 0;
-            curarg++;
-            continue;
-        }
-        if (!strncmp(argv[curarg], "--summary", 3)) {
-            summary_stats_only=1;
-            curarg++;
-            continue;
-        }
-        if (!strncmp(argv[curarg], "--filter", 3)) {
-            curarg ++;
-            if (curarg < argc) {
-                name_filter = (u8 *) argv[curarg];
-                curarg ++;
-                continue;
-            }
-            fatal("Missing filter string after --filter\n");
-        }
-        
-
-    usage:
-        fprintf(stderr, 
-          "cpelatency --input-file <filename> [--output-file <filename>]\n");
-        fprintf(stderr, 
-          "          [--start-event <decimal>] [--verbose]\n");
-        fprintf(stderr, 
-          "          [--end-event <decimal>]\n");
-        fprintf(stderr, 
-          "          [--max-time-sort(default) | --max-occurrence-sort |\n");
-
-        fprintf(stderr, 
-          "           --name-sort-sort] [--kernel-included]\n");
-
-        fprintf(stderr, 
-          "          [--summary-stats-only] [--scatterplot]\n");
-
-        fprintf(stderr, "%s\n", version);
-        exit(1);
-    }
-
-    if (cpel_file == 0)
-        goto usage;
-
-    cpel = mapfile(cpel_file);
-    if (cpel == 0) {
-        fprintf(stderr, "Couldn't map %s...\n", cpel_file);
-        exit(1);
-    }
-
-    if (!outputfile) {
-        ofp = fdopen(1, "w");
-        if (ofp == NULL) {
-            fprintf(stderr, "Couldn't fdopen(1)?\n");
-            exit(1);
-        }
-    } else {
-        ofp = fopen(outputfile, "w");
-        if (ofp == NULL) {
-            fprintf(stderr, "Couldn't create %s...\n", outputfile);
-            exit(1);
-        }
-    }
-
-    the_strtab_hash = hash_create_string (0, sizeof (uword));
-    the_evtdef_hash = hash_create (0, sizeof (uword));
-    the_trackdef_hash = hash_create (0, sizeof (uword));
-    the_pidtid_hash = hash_create_string (0, sizeof(uword));
-
-    if (cpel_dump((u8 *)cpel, verbose, ofp)) {
-        if (outputfile)
-            unlink(outputfile);
-    }
-
-    compute_state_statistics(verbose, ofp);
-    sort_state_statistics(sort_type, ofp);
-    print_state_statistics(verbose, ofp);
-
-    fclose(ofp);
-    return(0);
-}
diff --git a/perftool/cpeldump.c b/perftool/cpeldump.c
deleted file mode 100644
index 9011bd03..00000000
--- a/perftool/cpeldump.c
+++ /dev/null
@@ -1,638 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2006-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/fcntl.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <pwd.h>
-#include <stdarg.h>
-#include <time.h>
-#include "cpel.h"
-
-char *time_format = "%.03d:%.02d:%.02d:%.03d:%.03d ";
-static char version[] = "cpeldump 2.0";
-
-#define USEC_PER_MS 1000LL
-#define USEC_PER_SECOND (1000*USEC_PER_MS)
-#define USEC_PER_MINUTE (60*USEC_PER_SECOND)
-#define USEC_PER_HOUR (60*USEC_PER_MINUTE)
-
-uword *the_strtab_hash; /* (name, base-VA) hash of all string tables */
-uword *the_evtdef_hash; /* (event-id, event-definition) hash */
-uword *the_trackdef_hash; /* (track-id, track-definition) hash */
-
-int widest_name_format=5;
-int widest_track_format=5;
-
-typedef struct bound_event_ {
-    u32 event_code;
-    u8  *event_str;
-    u8  *datum_str;
-    u32  is_strtab_ref;
-} bound_event_t;
-
-bound_event_t *bound_events;
-
-typedef struct bound_track_ {
-    u32 track;
-    u8  *track_str;
-} bound_track_t;
-
-bound_track_t *bound_tracks;
-
-void fatal(char *s)
-{
-    fprintf(stderr, "%s", s);
-    exit(1);
-}
-
-typedef enum {
-    PASS1=1,
-    PASS2=2,
-} pass_t;
-
-typedef struct {
-    int (*pass1)(cpel_section_header_t *, int, FILE *);
-    int (*pass2)(cpel_section_header_t *, int, FILE *);
-} section_processor_t;
-
-int bad_section(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    fprintf(ofp, "Bad (type 0) section, skipped...\n");
-    return(0);
-}
-
-int noop_pass(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    return(0);
-}
-
-int strtab_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    uword *p;
-    u8 *strtab_data_area = (u8 *)(sh+1);
-    
-    /* Multiple string tables with the same name are Bad... */
-    p = hash_get_mem(the_strtab_hash, strtab_data_area);
-    if (p) {
-        fprintf(ofp, "Duplicate string table name %s", strtab_data_area);
-    }
-    /*
-     * Looks funny, but we really do want key = first string in the
-     * table, value = address(first string in the table) 
-     */
-    hash_set_mem(the_strtab_hash, strtab_data_area, strtab_data_area);
-    if (verbose) {
-        fprintf(stderr, "String Table %s\n", strtab_data_area);
-    }
-    return(0);
-}
-
-int evtdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    int i, nevents;
-    event_definition_section_header_t *edh;
-    event_definition_t *ep;
-    u8 *this_strtab;
-    u32 event_code;
-    uword *p;
-    bound_event_t *bp;
-    int thislen;
-
-    edh = (event_definition_section_header_t *)(sh+1);
-    nevents = ntohl(edh->number_of_event_definitions);
-    
-    if (verbose) {
-        fprintf(stderr, "Event Definition Section: %d definitions\n",
-                nevents);
-    }
-
-    p = hash_get_mem(the_strtab_hash, edh->string_table_name);
-    if (!p) {
-        fprintf(ofp, "Fatal: couldn't find string table\n");
-        return(1);
-    }
-    this_strtab = (u8 *)p[0];
-
-    ep = (event_definition_t *)(edh+1);
-    
-    for (i = 0; i < nevents; i++) {
-        event_code = ntohl(ep->event);
-        p = hash_get(the_evtdef_hash, event_code);
-        if (p) {
-            fprintf(ofp, "Event %d redefined, retain first definition\n",
-                    event_code);
-            continue;
-        }
-        vec_add2(bound_events, bp, 1);
-        bp->event_code = event_code;
-        bp->event_str = this_strtab + ntohl(ep->event_format);
-        bp->datum_str = this_strtab + ntohl(ep->datum_format);
-        bp->is_strtab_ref = 0;
-        /* Decide if the datum format is a %s format => strtab reference */
-        {
-            int j;
-            int seen_percent=0;
-
-            for (j = 0; j < strlen((char *)bp->datum_str); j++) {
-                if (bp->datum_str[j] == '%'){
-                    seen_percent=1;
-                    continue;
-                }
-                if (seen_percent && bp->datum_str[j] == 's') {
-                    bp->is_strtab_ref = 1;
-                }
-            }
-        }
-        
-        hash_set(the_evtdef_hash, event_code, bp - bound_events);
-
-        thislen = strlen((char *)bp->event_str);
-        if (thislen > widest_name_format)
-            widest_name_format = thislen;
-
-        ep++;
-    }
-    return (0);
-}
-
-int trackdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    int i, nevents;
-    track_definition_section_header_t *tdh;
-    track_definition_t *tp;
-    u8 *this_strtab;
-    u32 track_code;
-    uword *p;
-    bound_track_t *btp;
-    int thislen;
-
-    tdh = (track_definition_section_header_t *)(sh+1);
-    nevents = ntohl(tdh->number_of_track_definitions);
-    
-    if (verbose) {
-        fprintf(stderr, "Track Definition Section: %d definitions\n",
-                nevents);
-    }
-
-    p = hash_get_mem(the_strtab_hash, tdh->string_table_name);
-    if (!p) {
-        fprintf(ofp, "Fatal: couldn't find string table\n");
-        return(1);
-    }
-    this_strtab = (u8 *)p[0];
-
-    tp = (track_definition_t *)(tdh+1);
-    
-    for (i = 0; i < nevents; i++) {
-        track_code = ntohl(tp->track);
-        p = hash_get(the_trackdef_hash, track_code);
-        if (p) {
-            fprintf(ofp, "track %d redefined, retain first definition\n",
-                    track_code);
-            continue;
-        }
-        vec_add2(bound_tracks, btp, 1);
-        btp->track = track_code;
-        btp->track_str = this_strtab + ntohl(tp->track_format);
-        hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
-
-        thislen = strlen((char *)btp->track_str);
-        if (thislen > widest_track_format)
-            widest_track_format = thislen;
-        tp++;
-    }
-    return (0);
-}
-
-int unsupported_pass (cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    if (verbose) {
-        fprintf(stderr, "Unsupported type %d section\n",
-                ntohl(sh->section_type));
-    }
-    return(0);
-}
-
-int event_pass2(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    event_section_header_t *eh;
-    f64 ticks_per_us;
-    u32 event_code, track_code;
-    u64 starttime = 0xFFFFFFFFFFFFFFFFULL;
-    int nevents;
-    int i;
-    uword *p;
-    event_entry_t *ep;
-    u64 now;
-    u64 delta;
-    u32 hours, minutes, seconds, msec, usec;
-    u32 time0, time1;
-    double d;
-    bound_event_t *bp;
-    bound_event_t generic_event;
-    bound_track_t *tp=0;
-    bound_track_t generic_track;
-    u32 last_track_code;
-    u8 *s, *evtpad, *trackpad;
-    u8 *this_strtab;
-
-    generic_event.event_str = (u8 *)"%d";
-    generic_event.datum_str = (u8 *)"0x%08x";
-    generic_event.is_strtab_ref = 0;
-
-    generic_track.track_str = (u8 *)"%d";
-    last_track_code = 0xdeadbeef;
-
-    eh = (event_section_header_t *)(sh+1);
-    nevents = ntohl(eh->number_of_events);
-    ticks_per_us = ((double)ntohl(eh->clock_ticks_per_second)) / 1e6;
-
-    if (verbose) {
-        fprintf(stderr, "Event section: %d events, %.3f ticks_per_us\n", 
-                nevents, ticks_per_us);
-    }
-
-    ep = (event_entry_t *)(eh+1);
-
-    p = hash_get_mem(the_strtab_hash, eh->string_table_name);
-    if (!p) {
-        fprintf(ofp, "Fatal: couldn't find string table\n");
-        return(1);
-    }
-    this_strtab = (u8 *)p[0];
-
-    evtpad = format(0, "%%-%ds ", widest_name_format);
-    vec_add1(evtpad, 0);
-    trackpad = format(0, "%%-%ds ", widest_track_format);
-    vec_add1(trackpad, 0);
-
-    for (i = 0; i < nevents; i++) {
-        time0 = ntohl (ep->time[0]);
-        time1 = ntohl (ep->time[1]);
-
-        now = (((u64) time0)<<32) | time1;
-        
-        /* Convert from bus ticks to usec */
-        d = now;
-        d /= ticks_per_us;
-
-        now = d;
-
-        if (starttime == 0xFFFFFFFFFFFFFFFFULL)
-            starttime = now;
-        
-        delta = now - starttime;
-
-        /* Delta = time since first event, in usec */
-
-        hours = delta / USEC_PER_HOUR;
-        if (hours) 
-            delta -= ((u64) hours * USEC_PER_HOUR);
-        minutes = delta / USEC_PER_MINUTE;
-        if (minutes)
-            delta -= ((u64) minutes * USEC_PER_MINUTE);
-        seconds = delta / USEC_PER_SECOND;
-        if (seconds)
-            delta -= ((u64) seconds * USEC_PER_SECOND);
-        msec = delta / USEC_PER_MS;
-        if (msec)
-            delta -= ((u64) msec * USEC_PER_MS);
-
-        usec = delta;
-
-        /* Output the timestamp */
-        fprintf(ofp, time_format, hours, minutes, seconds, msec, usec);
-
-        /* output the track */
-        track_code = ntohl(ep->track);
-
-        if (track_code != last_track_code) {
-            p = hash_get(the_trackdef_hash, track_code);
-            if (p) {
-                tp = &bound_tracks[p[0]];
-            } else {
-                tp = &generic_track;
-            }
-        }
-        s = format(0, (char *)tp->track_str, track_code);
-        vec_add1(s, 0);
-        fprintf(ofp, (char *)trackpad, s);
-        vec_free(s);
-
-        /* output the event and datum */
-        if (0 && verbose) {
-            fprintf(stderr, "raw event code %d, raw event datum 0x%x\n",
-                    ntohl(ep->event_code), ntohl(ep->event_datum));
-        }
-
-        event_code = ntohl(ep->event_code);
-        p = hash_get(the_evtdef_hash, event_code);
-        if (p) {
-            bp = &bound_events[p[0]];
-        } else {
-            bp = &generic_event;
-        }
-        s = format(0, (char *)bp->event_str, ntohl(ep->event_code));
-        vec_add1(s, 0);
-        fprintf(ofp, (char *)evtpad, s);
-        vec_free(s);
-        if (bp->is_strtab_ref) {
-            fprintf(ofp, (char *) bp->datum_str, 
-                    &this_strtab[ntohl(ep->event_datum)]);
-        } else {
-            fprintf(ofp, (char *) bp->datum_str, ntohl(ep->event_datum));
-        }
-        fputs("\n", ofp);
-        ep++;
-    }
-    vec_free(evtpad);
-    vec_free(trackpad);
-    return(0);
-}
-
-/* 
- * Note: If necessary, add passes / columns to this table to 
- * handle section order dependencies.
- */
-
-section_processor_t processors[CPEL_NUM_SECTION_TYPES+1] =
-{
-    {bad_section,	noop_pass}, 		/* type 0 -- f**ked */
-    {strtab_pass1, 	noop_pass}, 		/* type 1 -- STRTAB */
-    {unsupported_pass,  noop_pass}, 		/* type 2 -- SYMTAB */
-    {evtdef_pass1,      noop_pass},             /* type 3 -- EVTDEF */
-    {trackdef_pass1,    noop_pass},		/* type 4 -- TRACKDEF */
-    {noop_pass,         event_pass2},           /* type 5 -- EVENTS */
-};
-
-
-int process_section(cpel_section_header_t *sh, int verbose, FILE *ofp,
-                    pass_t pass)
-{
-    u32 type;
-    type = ntohl(sh->section_type);
-    int rv;
-    int (*fp)(cpel_section_header_t *, int, FILE *);
-
-    if (type > CPEL_NUM_SECTION_TYPES) {
-        fprintf(stderr, "Unknown section type %d\n", type);
-        return(1);
-    }
-    switch(pass) {
-    case PASS1:
-        fp = processors[type].pass1;
-        break;
-
-    case PASS2:
-        fp = processors[type].pass2;
-        break;
-        
-    default:
-        fprintf(stderr, "Unknown pass %d\n", pass);
-        return(1);
-    }
-
-    rv = (*fp)(sh, verbose, ofp);
-
-    return(rv);
-}
-
-int cpel_dump_file_header(cpel_file_header_t *fh, int verbose, FILE *ofp)
-{
-    time_t file_time;
-
-    if (verbose) {
-        fprintf(stderr, "CPEL file: %s-endian, version %d\n",
-                ((fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) ? 
-                 "little" : "big"), 
-                fh->endian_version & CPEL_FILE_VERSION_MASK);
-        
-        file_time = ntohl(fh->file_date);
-        
-        fprintf(stderr, "File created %s", ctime(&file_time));
-        fprintf(stderr, "File has %d sections\n", 
-                ntohs(fh->nsections));
-    }
-
-    return(0);
-}
-
-
-int cpel_dump(u8 *cpel, int verbose, FILE *ofp)
-{
-    cpel_file_header_t *fh;
-    cpel_section_header_t *sh;
-    u16 nsections;
-    u32 section_size;
-    int i;
-
-    /* First, the file header */
-    fh = (cpel_file_header_t *)cpel;
-    if (fh->endian_version != CPEL_FILE_VERSION) {
-        if (fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) {
-            fprintf(stderr, "Little endian data format not supported\n");
-            return(1);
-        }
-        fprintf(stderr, "Unsupported file version 0x%x\n", 
-                fh->endian_version);
-        return(1);
-    }
-    cpel_dump_file_header(fh, verbose, ofp);
-    nsections = ntohs(fh->nsections);
-
-    /*
-     * Take two passes through the file. PASS1 builds
-     * data structures, PASS2 actually dumps the file.
-     * Just in case the sections are in an unobvious order.
-     */
-    sh = (cpel_section_header_t *)(fh+1);
-    for (i = 0; i < nsections; i++) {
-        section_size = ntohl(sh->data_length);
-
-        if(verbose) {
-            fprintf(stderr, 
-                    "Section type %d, size %d\n", ntohl(sh->section_type),
-                    section_size);
-        }
-
-        if(process_section(sh, verbose, ofp, PASS1))
-            return(1);
-
-        sh++;
-        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
-    }
-
-    sh = (cpel_section_header_t *)(fh+1);
-    for (i = 0; i < nsections; i++) {
-        if(process_section(sh, verbose, ofp, PASS2))
-            return(1);
-        section_size = ntohl(sh->data_length);
-        sh++;
-        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
-    }
-    return(0);
-}
-
-
-char *mapfile (char *file)
-{
-    struct stat statb;
-    char *rv;
-    int maphfile;
-    size_t mapfsize;
-    
-    maphfile = open (file, O_RDONLY);
-
-    if (maphfile < 0)
-    {
-        fprintf (stderr, "Couldn't read %s, skipping it...\n", file);
-        return (NULL);
-    }
-
-    if (fstat (maphfile, &statb) < 0)
-    {
-        fprintf (stderr, "Couldn't get size of %s, skipping it...\n", file);
-        return (NULL);
-    }
-
-    /* Don't try to mmap directories, FIFOs, semaphores, etc. */
-    if (! (statb.st_mode & S_IFREG)) {
-        fprintf (stderr, "%s is not a regular file, skipping it...\n", file);
-        return (NULL);
-    }
-
-    mapfsize = statb.st_size;
-
-    if (mapfsize < 3)
-    {
-        fprintf (stderr, "%s zero-length, skipping it...\n", file);
-        close (maphfile);
-        return (NULL);
-    }
-
-    rv = mmap (0, mapfsize, PROT_READ, MAP_SHARED, maphfile, 0);
-
-    if (rv == 0)
-    {
-        fprintf (stderr, "%s problem mapping, I quit...\n", file);
-        exit (-1);
-    }
-    close (maphfile);
-    return (rv);
-}
-
-/*
- * main 
- */
-int main (int argc, char **argv)
-{
-    char *cpel_file = 0;
-    char *outputfile = 0;
-    FILE *ofp;
-    char *cpel;
-    int verbose=0;
-    int curarg=1;
-
-    while (curarg < argc) {
-        if (!strncmp(argv[curarg], "--input-file", 3)) {
-            curarg++;
-            if (curarg < argc) {
-                cpel_file = argv[curarg];
-                curarg++;
-                continue;
-            }
-            fatal("Missing filename after --input-file\n");
-        }
-        if (!strncmp(argv[curarg], "--output-file", 3)) {
-            curarg ++;
-            if (curarg < argc) {
-                outputfile = argv[curarg];
-                curarg ++;
-                continue;
-            }
-            fatal("Missing filename after --output-file\n");
-        }
-        if (!strncmp(argv[curarg], "--verbose", 3)) {
-            curarg++;
-            verbose = 1;
-            continue;
-        }
-
-    usage:
-        fprintf(stderr, 
-          "cpeldump --input-file <filename> [--output-file <filename>]\n");
-        fprintf(stderr, "%s\n", version);
-        exit(1);
-    }
-
-    if (cpel_file == 0)
-        goto usage;
-
-    cpel = mapfile(cpel_file);
-    if (cpel == 0) {
-        fprintf(stderr, "Couldn't map %s...\n", cpel_file);
-        exit(1);
-    }
-
-    if (!outputfile) {
-        ofp = fdopen(1, "w");
-        if (ofp == NULL) {
-            fprintf(stderr, "Couldn't fdopen(1)?\n");
-            exit(1);
-        }
-    } else {
-        ofp = fopen(outputfile, "w");
-        if (ofp == NULL) {
-            fprintf(stderr, "Couldn't create %s...\n", outputfile);
-            exit(1);
-        }
-    }
-
-    the_strtab_hash = hash_create_string (0, sizeof (uword));
-    the_evtdef_hash = hash_create (0, sizeof (uword));
-    the_trackdef_hash = hash_create (0, sizeof (uword));
-
-#ifdef TEST_TRACK_INFO
-    {
-        bound_track_t *btp;
-        vec_add2(bound_tracks, btp, 1);
-        btp->track = 0;
-        btp->track_str = "cpu %d";
-        hash_set(the_trackdef_hash, 0, btp - bound_tracks);
-        hash_set(the_trackdef_hash, 1, btp - bound_tracks);
-    }
-#endif
-
-    if (cpel_dump((u8 *)cpel, verbose, ofp)) {
-        if (outputfile)
-            unlink(outputfile);
-    }
-
-    fclose(ofp);
-    return(0);
-}
diff --git a/perftool/cpelinreg.c b/perftool/cpelinreg.c
deleted file mode 100644
index 115afad7..00000000
--- a/perftool/cpelinreg.c
+++ /dev/null
@@ -1,892 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2008-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Search for O(N**2) functions bracketed by before/after
- * events. The "before" event's datum is used as a tag, e.g. which function
- * did we call that's strongly O(N).
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/fcntl.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <pwd.h>
-#include <stdarg.h>
-#include <time.h>
-#include "cpel.h"
-
-FILE *g_ifp;
-char *g_ifile;
-
-typedef unsigned long long ulonglong;
-
-void process_traces (void);
-void record_instance (ulong tag, ulonglong time);
-void report_actors (void);
-void scatterplot_data(void);
-int entry_event, exit_event;
-int nokey;
-char *version = "cpelinreg 2.0";
-int model_these[10];
-int model_index;
-int summary_stats;
-ulonglong first_start_time;
-ulonglong last_end_time;
-ulonglong total_time;
-ulong scatterkey;
-int inline_mokus;
-
-typedef struct bound_track_ {
-    u32 track_code;
-    u32 *start_datum;
-    u8  *dup_event;
-    int state;
-    u64 *start_time;
-    u64 thread_timestamp;
-    u64 time_thread_on_cpu;
-} bound_track_t;
-
-bound_track_t *bound_tracks;
-uword *the_trackdef_hash;
-
-
-#define MAXSTACK 128
-
-typedef struct instance_ {
-    struct instance_ *next;
-    ulonglong time;
-}instance_t;
-
-typedef struct actor_ {
-    struct actor_ *next;
-    ulong key;
-    struct instance_ *first;
-    struct instance_ *last;
-    double a;
-    double b;
-    double min;
-    double max;
-    double mean;
-    double r;
-    ulong ninst;
-} actor_t;
-
-#define NBUCKETS 1811
-
-actor_t *hash[NBUCKETS];
-
-actor_t *find_or_create_actor (ulong key)
-{
-    ulong bucket;
-    actor_t *ap;
-    u8 *mem;
-
-    bucket = key % NBUCKETS;
-
-    ap = hash[bucket];
-
-    if (ap == NULL) {
-        /* Ensure 8-byte alignment to avoid (double) alignment faults */
-        mem = malloc(sizeof(*ap) + 4);
-        if (((uword)(mem)) & 0x7)
-            mem += 4;
-        ap = (actor_t *)mem;
-
-        if (ap == NULL) {
-            fprintf (stderr, "out of memory...\n");
-            exit (1);
-        }
-        ap->next = 0;
-        ap->key = key;
-        ap->first = 0;
-        ap->last = 0;
-        ap->a = 0.00;
-        ap->b = 0.00;
-        hash [bucket] = ap;
-        return (ap);
-    }
-    
-    while (ap) {
-        if (ap->key == key)
-            return (ap);
-        ap = ap->next;
-    }
-
-    mem = malloc(sizeof(*ap)+4);
-    if (((uword)(mem) & 0x7))
-        mem += 4;
-    ap = (actor_t *)mem;
-
-    if (ap == NULL) {
-        fprintf (stderr, "out of memory...\n");
-        exit (1);
-    }
-    ap->key = key;
-    ap->first = 0;
-    ap->last = 0;
-    ap->a = 0.00;
-    ap->b = 0.00;
-
-    ap->next = hash[bucket];
-    hash[bucket] = ap;
-
-    return (ap);
-}
-
-void record_instance (ulong key, ulonglong time)
-{
-    actor_t *ap;
-    instance_t *ip;
-
-    if (nokey)
-        key = 0;
-
-    ap = find_or_create_actor (key);
-
-    ip = (instance_t *)malloc(sizeof(*ip));
-    if (ip == NULL) {
-        fprintf (stderr, "out of memory...\n");
-        exit (1);
-    }
-    ip->time = time;
-    ip->next = 0;
-
-    if (ap->first == 0) {
-        ap->first = ip;
-        ap->last = ip;
-        ap->ninst = 1;
-    } else {
-        ap->last->next = ip;
-        ap->last = ip;
-        ap->ninst++;
-    }
-}
-
-#define NINSTANCE 200000
-
-double x[NINSTANCE];
-double y[NINSTANCE];
-
-int actor_compare (const void *arg1, const void *arg2)
-{
-    double e10k1, e10k2;
-    actor_t **a1 = (actor_t **)arg1;
-    actor_t **a2 = (actor_t **)arg2;
-    double ninst1, ninst2;
-
-    ninst1 = ((double)((*a1)->ninst));
-    ninst2 = ((double)((*a2)->ninst));
-    
-    e10k1 = ninst1 * ((*a1)->mean);
-    e10k2 = ninst2 * ((*a2)->mean);
-
-    if (e10k1 < e10k2)
-        return (1);
-    else if (e10k1 == e10k2)
-        return (0);
-    else
-        return (-1);
-}
-
-void report_actors (void)
-{
-    int i;
-    actor_t *ap;
-    instance_t *ip;
-    int nactors = 0;
-    int ninstance;
-    actor_t **actor_vector;
-    double e10k;
-    extern void linreg (double *x, double *y, int nitems, double *a, double *b,
-                        double *minp, double *maxp, double *meanp, double *r);
-
-    for (i = 0; i < NBUCKETS; i++) {
-        ap = hash[i];
-        if (ap == NULL)
-            continue;
-        while (ap) {
-            nactors++;
-            ninstance = 0;
-
-            ip = ap->first;
-
-            while (ip) {
-                if (ninstance < NINSTANCE) {
-                    x[ninstance] = ninstance;
-                    y[ninstance] = ((double)ip->time);
-                    ninstance++;
-                }
-                ip = ip->next;
-            }
-            if (ninstance > 1) {
-#if DEBUG > 0
-                int j;
-                
-                for (j = 0; j < ninstance; j++) {
-                    printf("x[%d] = %10.2f, y[%d] = %10.2f\n",
-                           j, x[j], j, y[j]);
-                }
-#endif                    
-                
-                linreg (x, y, ninstance, &ap->a, &ap->b, &ap->min,
-                        &ap->max, &ap->mean, &ap->r);
-            } else {
-                ap->a = 0.00;
-                ap->b = 0.00;
-            }
-            
-            ap = ap->next;
-        }
-    }
-            
-    actor_vector = (actor_t **)malloc (nactors*sizeof(*actor_vector));
-    nactors = 0;
-
-    for (i = 0; i < NBUCKETS; i++) {
-        ap = hash[i];
-        if (ap == NULL)
-            continue;
-        while (ap) {
-            if ((ap->a != 0.00) || (ap->b != 0.00)) {
-                actor_vector[nactors++] = ap;
-            }
-            ap = ap->next;
-        }
-    }
-        
-    qsort (actor_vector, nactors, sizeof (actor_t *), actor_compare);
-
-    if (summary_stats)
-        printf("NInst       Offset       Slope    T(Ninst)         Min         Max         Avg   %%InstTime           R    Key");
-    else
-        printf("NInst       Offset       Slope    T(Ninst)    Key");
-
-    for (i = 0; i < model_index; i++) {
-        printf ("T @ %-8d ", model_these[i]);
-    }
-
-    printf ("\n");
-
-    for (i = 0; i < nactors; i++) {
-        int j;
-        double ninst;
-        double pcttot;
-        ap = actor_vector[i];
-        ninst = ap->ninst;
-
-        e10k = ninst * (ap->a + ap->b*((ninst-1.0)/2.0));
-
-        if (ap->ninst) {
-            if (summary_stats) {
-                pcttot = (e10k / ((double)total_time)) * 100.0;
-                printf ("%6ld %11.2f %11.2f %11.2f %11.2f %11.2f %11.2f %11.2f %11.2f 0x%08lx ",
-                        ap->ninst, ap->a, ap->b, e10k, ap->min,
-                        ap->max, ap->mean, pcttot, ap->r, ap->key);
-            }
-            else
-                printf ("%6ld %11.2f %11.2f %11.2f 0x%08lx ",
-                        ap->ninst, ap->a, ap->b, e10k, ap->key);
-
-            for (j = 0; j < model_index; j++) {
-                ninst = model_these[j];
-                e10k = ninst * (ap->a + ap->b*((ninst-1.0)/2.0));
-                printf ("%10.2f ", e10k);
-            }
-            printf ("\n");
-        }
-    }
-}
-
-void scatterplot_data(void)
-{
-    actor_t *ap;
-    int i;
-    instance_t *ip;
-    double time;
-    int count=0;
-
-    for (i = 0; i < NBUCKETS; i++) {
-        ap = hash[i];
-        if (ap == NULL)
-            continue;
-        while (ap) {
-            if (ap->key == scatterkey){
-                ip = ap->first;
-                while (ip) {
-                    time = ((double)ip->time);
-                    printf ("%d\t%.0f\n", count++, time);
-                    ip = ip->next;
-                }
-                return;
-            }
-            ap = ap->next;
-        }
-    }
-}
-
-
-void fatal(char *s)
-{
-    fprintf(stderr, "%s", s);
-    fprintf(stderr, "\n");
-    exit(1);
-}
-
-typedef enum {
-    PASS1=1,
-} pass_t;
-
-typedef struct {
-    int (*pass1)(cpel_section_header_t *, int, FILE *);
-} section_processor_t;
-
-int bad_section(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    fprintf(ofp, "Bad (type 0) section, skipped...\n");
-    return(0);
-}
-
-int noop_pass(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    return(0);
-}
-
-int unsupported_pass (cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    if (verbose) {
-        fprintf(ofp, "Unsupported type %d section\n",
-                ntohl(sh->section_type));
-    }
-    return(0);
-}
-
-int trackdef_pass(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    int i, nevents;
-    track_definition_section_header_t *tdh;
-    track_definition_t *tp;
-    u32 track_code;
-    uword *p;
-    bound_track_t *btp;
-
-    tdh = (track_definition_section_header_t *)(sh+1);
-    nevents = ntohl(tdh->number_of_track_definitions);
-    
-    if (verbose) {
-        fprintf(stderr, "Track Definition Section: %d definitions\n",
-                nevents);
-    }
-
-    tp = (track_definition_t *)(tdh+1);
-    
-    for (i = 0; i < nevents; i++) {
-        track_code = ntohl(tp->track);
-        p = hash_get(the_trackdef_hash, track_code);
-        if (p) {
-            fprintf(ofp, "track %d redefined, retain first definition\n",
-                    track_code);
-            continue;
-        }
-        vec_add2(bound_tracks, btp, 1);
-        btp->track_code = track_code;
-        hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
-        tp++;
-    }
-    return (0);
-}
-
-
-int event_pass (cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    event_section_header_t *eh;
-    event_entry_t *ep;
-    f64 ticks_per_us;
-    long output_count;
-    long dup_events = 0;
-    ulonglong end_time = 0;
-    double t;
-    int sp, ancestor;
-    int nevents, i;
-    u64 now;
-    u64 time0, time1;
-    double d;
-    u32 last_track_code = 0xdeafb00b;
-    u32 track_code;
-    u32 event_code, event_datum;
-    bound_track_t *tp = 0;
-    uword *p;
-
-    output_count = 0;
-    total_time = 0;
-
-    eh = (event_section_header_t *)(sh+1);
-    nevents = ntohl(eh->number_of_events);
-    ticks_per_us = ((double)ntohl(eh->clock_ticks_per_second))/1e6;
-
-    if (verbose) {
-        fprintf(ofp, "%.3f ticks_per_us\n", ticks_per_us);
-    }
-
-    ep = (event_entry_t *)(eh+1);
-
-    time0 = ntohl (ep->time[0]);
-    time1 = ntohl (ep->time[1]);
-    
-    now = (((u64) time0)<<32) | time1;
-    d = now;
-    d /= ticks_per_us;
-    first_start_time = d;
-
-    for (i = 0; i < nevents; i++) {
-        time0 = ntohl (ep->time[0]);
-        time1 = ntohl (ep->time[1]);
-
-        now = (((u64) time0)<<32) | time1;
-        
-        /* Convert from bus ticks to usec */
-        d = now;
-        d /= ticks_per_us;
-
-        now = d;
-
-        track_code = ntohl(ep->track);
-        event_code = ntohl(ep->event_code);
-        event_datum = ntohl(ep->event_datum);
-
-        if (track_code != last_track_code) {
-            if (tp) {
-                tp->thread_timestamp += now - tp->time_thread_on_cpu;
-                tp->time_thread_on_cpu = 0;
-            }
-            p = hash_get(the_trackdef_hash, track_code);
-            if (!p) {
-                /* synthesize a new track */
-                vec_add2(bound_tracks, tp, 1);
-                tp->track_code = track_code;
-                hash_set(the_trackdef_hash, track_code, tp - bound_tracks);
-            } else {
-                tp = bound_tracks + p[0];
-            }
-            last_track_code = track_code;
-            tp->time_thread_on_cpu = now;
-        }
-
-        if (event_code != entry_event &&
-            event_code != exit_event) {
-            ep++;
-            continue;
-        }
-        
-    again:
-        switch (tp->state) {
-        case 0:                 /* not in state */
-            /* Another exit event? Stack pop */
-            if (event_code == exit_event) {
-                /* Only if we have something on the stack */
-                if (vec_len(tp->start_datum) > 0) {
-                    tp->state = 1;
-                    goto again;
-                } else {
-                    fprintf (stderr, 
-                             "End event before start event, key 0x%x.", 
-                             ntohl(ep->event_datum));
-                    fprintf (stderr, " Interpret results carefully...\n");
-                }
-            }
-
-            tp->state = 1;
-            if (vec_len(tp->start_datum) >= MAXSTACK) {
-                int j;
-
-                fprintf (stderr, "stack overflow..\n");
-                for (j = vec_len(tp->start_datum)-1; j >= 0; j--) {
-                    fprintf(stderr, "stack[%d]: datum 0x%x\n", 
-                            j, tp->start_datum[j]);
-                }
-                fprintf (stderr, 
-                         "Stack overflow... This occurs when "
-                         "(start, datum)...(end, datum) events\n"
-                         "are not properly paired.\n\n"
-                         "A typical scenario looks like this:\n\n"
-                         "    ...\n"
-                         "    ELOG(..., START_EVENT, datum);\n"
-                         "    if (condition)\n"
-                         "       return; /*oops, forgot the end event*/\n"
-                         "    ELOG(..., END_EVENT, datum);\n"
-                         "    ...\n\n"
-                         "The datum stack dump (above) should make it clear\n"
-                         "where to start looking for a sneak path...\n");
-
-                exit (1);
-            }
-            vec_add1(tp->start_datum, event_datum);
-            vec_add1(tp->start_time, (tp->thread_timestamp + (now - tp->time_thread_on_cpu)));
-#ifdef HAVING_TROUBLE
-            printf ("sp %lld key 0x%x start time %llu\n", 
-                    (long long) vec_len(tp->start_time)-1, event_datum, 
-                    (unsigned long long) 
-                    tp->start_time [vec_len(tp->start_time)-1]);
-            printf ("timestamp %llu, now %llu, thread on cpu %llu\n",
-                    (unsigned long long) tp->thread_timestamp, 
-                    (unsigned long long) now, 
-                    (unsigned long long) tp->time_thread_on_cpu);
-#endif
-            
-
-            
-            /* 
-             * Multiple identical enter events? If the user knows that
-             * gcc is producing bogus events due to inline functions,
-             * trash the duplicate.
-             */
-            if (inline_mokus 
-                && vec_len (tp->start_datum) > 1
-                && tp->start_datum [vec_len(tp->start_datum)-1] ==
-                tp->start_datum [vec_len(tp->start_datum)-2]) {
-                vec_add1 (tp->dup_event, 1);
-            } else {
-                vec_add1 (tp->dup_event, 0);
-            }
-
-
-            ep++;
-            continue;
-
-        case 1:                 /* in state */
-            /* Another entry event? Stack push*/
-            if (event_code == entry_event) {
-                tp->state = 0;
-                goto again;
-            }
-            
-            if (vec_len(tp->start_datum) == 0) {
-                fprintf (stderr, "Stack underflow...\n");
-                exit (1);
-            }
-
-            sp = vec_len(tp->start_time)-1;
-
-            end_time = tp->thread_timestamp + (now - tp->time_thread_on_cpu);
-
-            if (!tp->dup_event[sp]) {
-#ifdef HAVING_TROUBLE
-                printf ("sp %d key 0x%x charged %llu\n", sp, 
-                        tp->start_datum[sp], end_time - tp->start_time[sp]);
-                printf ("  start %llu, end %llu\n", (unsigned long long) tp->start_time[sp],
-                        (unsigned long long) end_time);
-#endif
-            
-                record_instance (tp->start_datum[sp], (end_time -
-                                                       tp->start_time[sp]));
-            
-                /* Factor out our time from surrounding services, if any */
-                for (ancestor = sp-1; ancestor >= 0; ancestor--) {
-#ifdef HAVING_TROUBLE
-                    printf ("Factor out %lld from key 0x%08x\n",
-                            (end_time - tp->start_time[sp]), tp->start_datum[ancestor]);
-#endif
-                    tp->start_time[ancestor] += (end_time - tp->start_time[sp]);
-                }
-                output_count++;
-                total_time += (end_time - tp->start_time[sp]);
-                tp->state = 0;
-            } else {
-                dup_events++;
-            }
-            _vec_len(tp->start_datum) = sp;
-            _vec_len(tp->start_time) = sp;
-            _vec_len(tp->dup_event) = sp;
-        }
-
-        ep++;
-    }
-    last_end_time = now;
-
-    if (scatterkey) {
-        scatterplot_data();
-        exit (0);
-    }
-
-    if (output_count) {
-        t = (double)total_time;
-        printf ("%ld instances of state, %.2f microseconds average\n",
-                output_count, t / output_count);
-
-        printf ("Total instrumented runtime: %.2f microseconds\n",
-                ((double)total_time));
-        printf ("Total runtime: %lld microseconds\n",
-                last_end_time - first_start_time);
-
-        t /= (double)(last_end_time - first_start_time);
-        t *= 100.0;
-
-        if (dup_events) {
-            printf ("Suppressed %ld duplicate state entry events\n",
-                    dup_events);
-        }
-        printf ("Instrumented code accounts for %.2f%% of total time.\n\n",
-                t);
-        report_actors();
-    } else {
-        printf ("No instances of state...\n");
-    }
-
-    return(0);
-}
-
-/* 
- * Note: If necessary, add passes / columns to this table to 
- * handle section order dependencies.
- */
-
-section_processor_t processors[CPEL_NUM_SECTION_TYPES+1] =
-{
-    {unsupported_pass},		/* type 0 -- f**ked */
-    {noop_pass}, 		/* type 1 -- STRTAB */
-    {noop_pass}, 		/* type 2 -- SYMTAB */
-    {noop_pass},                /* type 3 -- EVTDEF */
-    {trackdef_pass},		/* type 4 -- TRACKDEF */
-    {event_pass},               /* type 5 -- EVENTS */
-};
-
-int process_section(cpel_section_header_t *sh, int verbose, FILE *ofp,
-                    pass_t pass)
-{
-    u32 type;
-    type = ntohl(sh->section_type);
-    int rv;
-    int (*fp)(cpel_section_header_t *, int, FILE *);
-
-    if (type > CPEL_NUM_SECTION_TYPES) {
-        fprintf(stderr, "Unknown section type %d\n", type);
-        return(1);
-    }
-    switch(pass) {
-    case PASS1:
-        fp = processors[type].pass1;
-        break;
-
-    default:
-        fprintf(stderr, "Unknown pass %d\n", pass);
-        return(1);
-    }
-
-    rv = (*fp)(sh, verbose, ofp);
-
-    return(rv);
-}
-
-char *mapfile (char *file)
-{
-    struct stat statb;
-    char *rv;
-    int maphfile;
-    size_t mapfsize;
-    
-    maphfile = open (file, O_RDONLY);
-
-    if (maphfile < 0)
-    {
-        fprintf (stderr, "Couldn't read %s, skipping it...\n", file);
-        return (NULL);
-    }
-
-    if (fstat (maphfile, &statb) < 0)
-    {
-        fprintf (stderr, "Couldn't get size of %s, skipping it...\n", file);
-        return (NULL);
-    }
-
-    /* Don't try to mmap directories, FIFOs, semaphores, etc. */
-    if (! (statb.st_mode & S_IFREG)) {
-        fprintf (stderr, "%s is not a regular file, skipping it...\n", file);
-        return (NULL);
-    }
-
-    mapfsize = statb.st_size;
-
-    if (mapfsize < 3)
-    {
-        fprintf (stderr, "%s zero-length, skipping it...\n", file);
-        close (maphfile);
-        return (NULL);
-    }
-
-    rv = mmap (0, mapfsize, PROT_READ, MAP_SHARED, maphfile, 0);
-
-    if (rv == 0)
-    {
-        fprintf (stderr, "%s problem mapping, I quit...\n", file);
-        exit (-1);
-    }
-    close (maphfile);
-    return (rv);
-}
-
-int process_file (u8 *cpel, int verbose)
-{
-    cpel_file_header_t *fh;
-    cpel_section_header_t *sh;
-    u16 nsections;
-    u32 section_size;
-    int i;
-    FILE *ofp = stderr;
-
-    /* First, the file header */
-    fh = (cpel_file_header_t *)cpel;
-    if (fh->endian_version != CPEL_FILE_VERSION) {
-        if (fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) {
-            fprintf(stderr, "Little endian data format not supported\n");
-            return(1);
-        }
-        fprintf(stderr, "Unsupported file version 0x%x\n", 
-                fh->endian_version);
-        return(1);
-    }
-    nsections = ntohs(fh->nsections);
-
-    /*
-     * Take a passe through the file. 
-     */
-    sh = (cpel_section_header_t *)(fh+1);
-    for (i = 0; i < nsections; i++) {
-        section_size = ntohl(sh->data_length);
-
-        if(verbose) {
-            fprintf(ofp, "Section type %d, size %d\n", 
-                    ntohl(sh->section_type),
-                    section_size);
-        }
-
-        if(process_section(sh, verbose, ofp, PASS1))
-            return(1);
-
-        sh++;
-        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
-    }
-
-    return(0);
-}
-
-/****************************************************************************
-* main - 
-****************************************************************************/
-
-int main (int argc, char **argv)
-{
-    int curarg = 1;
-    u8 *cpel = 0;
-    int verbose = 0;
-
-    if (argc < 6)
-    {
-        fprintf (stderr, "usage: cpelinreg -i <file>\n");
-        fprintf (stderr, "       -s start-event --e end-event [-nokey]\n");
-        fprintf (stderr, "       [-m <ninst-to-model>][-xtra-stats]\n");
-        fprintf (stderr, "       [-keyscatterplot <hex-key>]\n\n");
-        fprintf (stderr, "%s\n", version);
-        exit (1);
-    }
-
-    while (curarg < argc) {
-        if (!strncmp (argv[curarg], "-ifile", 2)) {
-            curarg++;
-            g_ifile = argv[curarg++];
-            continue;
-        }
-        if (!strncmp (argv[curarg], "-start", 2)) {
-            curarg++;
-            entry_event = atol (argv [curarg++]);
-            continue;
-        }
-        if (!strncmp (argv[curarg], "-end", 2)) {
-            curarg++;
-            exit_event = atol (argv [curarg++]);
-            continue;
-        }
-
-        if (!strncmp(argv[curarg], "-badinlines", 2)) {
-            curarg++;
-            inline_mokus = 1;
-            continue;
-        }
-
-        if (!strncmp (argv[curarg], "-x", 2)) {
-            curarg++;
-            summary_stats=1;
-            continue;
-        }
-        if (!strncmp (argv[curarg], "-nokey", 2)) {
-            curarg++;
-            nokey = 1;
-            continue;
-        }
-        if (!strncmp (argv[curarg], "-keyscatterplot", 2)) {
-            curarg++;
-            sscanf (argv[curarg], "%lx", &scatterkey);
-            curarg++;
-            continue;
-        }
-
-        if (!strncmp (argv[curarg], "-model", 2)) {
-            if (model_index >= sizeof(model_these) / sizeof(int)) {
-                fprintf (stderr, "Too many model requests\n");
-                exit (1);
-            }
-            curarg++;
-            model_these[model_index++] = atol (argv [curarg++]);
-            continue;
-        }
-        if (!strncmp (argv[curarg], "-verbose", 2)) {
-            verbose++;
-            curarg++;
-            continue;
-        }
-
-        fprintf (stderr, "unknown switch '%s'\n", argv[curarg]);
-        exit (1);
-    }
-                
-    cpel = (u8 *)mapfile(g_ifile);
-
-    if (cpel == NULL)
-    {
-        fprintf (stderr, "Couldn't open %s\n", g_ifile);
-        exit (1);
-    }
-
-    printf ("Extracting state info from %s\nentry_event %d, exit_event %d\n",
-            g_ifile, entry_event, exit_event);
-    if (nokey) {
-        printf ("All state instances mapped to a single actor chain\n");
-    }
-
-    the_trackdef_hash = hash_create (0, sizeof (uword));
-
-    process_file(cpel, verbose);
-    exit (0);
-}
diff --git a/perftool/cpelstate.c b/perftool/cpelstate.c
deleted file mode 100644
index 3fd9ccb9..00000000
--- a/perftool/cpelstate.c
+++ /dev/null
@@ -1,822 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2006-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/fcntl.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <pwd.h>
-#include <stdarg.h>
-#include <time.h>
-#include "cpel.h"
-#include <math.h>
-
-char *time_format = "%.03d:%.02d:%.02d:%.03d:%.03d ";
-static char version[] = "cpelstate 2.0h";
-
-#define USEC_PER_MS 1000LL
-#define USEC_PER_SECOND (1000*USEC_PER_MS)
-#define USEC_PER_MINUTE (60*USEC_PER_SECOND)
-#define USEC_PER_HOUR (60*USEC_PER_MINUTE)
-
-uword *the_strtab_hash; /* (name, base-VA) hash of all string tables */
-uword *the_evtdef_hash; /* (event-id, event-definition) hash */
-uword *the_trackdef_hash; /* (track-id, track-definition) hash */
-
-f64 ticks_per_us;
-u32 state_event_code = 1;       /* default: XR thread-on-cpu */
-int exclude_kernel_from_summary_stats=1;
-int summary_stats_only;
-int scatterplot;
-u8 *name_filter;
-
-typedef enum {
-    SORT_MAX_TIME=1,
-    SORT_MAX_OCCURRENCES,
-    SORT_NAME,
-} sort_t;
-
-sort_t sort_type = SORT_MAX_TIME;
-
-int widest_name_format=5;
-int widest_track_format=5;
-
-typedef struct bound_event_ {
-    u32 event_code;
-    u8  *event_str;
-    u8  *datum_str;
-    u32  is_strtab_ref;
-} bound_event_t;
-
-bound_event_t *bound_events;
-
-typedef struct bound_track_ {
-    u32 track;
-    u8  *track_str;
-    u64 *ticks_in_state; /* vector of state occurrences */
-    f64  mean_ticks_in_state;
-    f64  variance_ticks_in_state;
-    f64  total_ticks_in_state;
-} bound_track_t;
-
-bound_track_t *bound_tracks;
-
-void fatal(char *s)
-{
-    fprintf(stderr, "%s", s);
-    exit(1);
-}
-
-typedef enum {
-    PASS1=1,
-    PASS2=2,
-} pass_t;
-
-typedef struct {
-    int (*pass1)(cpel_section_header_t *, int, FILE *);
-    int (*pass2)(cpel_section_header_t *, int, FILE *);
-} section_processor_t;
-
-int bad_section(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    fprintf(ofp, "Bad (type 0) section, skipped...\n");
-    return(0);
-}
-
-int noop_pass(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    return(0);
-}
-
-int strtab_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    uword *p;
-    u8 *strtab_data_area = (u8 *)(sh+1);
-    
-    /* Multiple string tables with the same name are Bad... */
-    p = hash_get_mem(the_strtab_hash, strtab_data_area);
-    if (p) {
-        fprintf(ofp, "Duplicate string table name %s", strtab_data_area);
-    }
-    /*
-     * Looks funny, but we really do want key = first string in the
-     * table, value = address(first string in the table) 
-     */
-    hash_set_mem(the_strtab_hash, strtab_data_area, strtab_data_area);
-    if (verbose) {
-        fprintf(ofp, "String Table %s\n", strtab_data_area);
-    }
-    return(0);
-}
-
-int evtdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    int i, nevents;
-    event_definition_section_header_t *edh;
-    event_definition_t *ep;
-    u8 *this_strtab;
-    u32 event_code;
-    uword *p;
-    bound_event_t *bp;
-    int thislen;
-
-    edh = (event_definition_section_header_t *)(sh+1);
-    nevents = ntohl(edh->number_of_event_definitions);
-    
-    if (verbose) {
-        fprintf(ofp, "Event Definition Section: %d definitions\n",
-                nevents);
-    }
-
-    p = hash_get_mem(the_strtab_hash, edh->string_table_name);
-    if (!p) {
-        fprintf(ofp, "Fatal: couldn't find string table\n");
-        return(1);
-    }
-    this_strtab = (u8 *)p[0];
-
-    ep = (event_definition_t *)(edh+1);
-    
-    for (i = 0; i < nevents; i++) {
-        event_code = ntohl(ep->event);
-        p = hash_get(the_evtdef_hash, event_code);
-        if (p) {
-            fprintf(ofp, "Event %d redefined, retain first definition\n",
-                    event_code);
-            continue;
-        }
-        vec_add2(bound_events, bp, 1);
-        bp->event_code = event_code;
-        bp->event_str = this_strtab + ntohl(ep->event_format);
-        bp->datum_str = this_strtab + ntohl(ep->datum_format);
-        bp->is_strtab_ref = 0;
-        /* Decide if the datum format is a %s format => strtab reference */
-        {
-            int j;
-            int seen_percent=0;
-
-            for (j = 0; j < strlen((char *)(bp->datum_str)); j++) {
-                if (bp->datum_str[j] == '%'){
-                    seen_percent=1;
-                    continue;
-                }
-                if (seen_percent && bp->datum_str[j] == 's') {
-                    bp->is_strtab_ref = 1;
-                }
-            }
-        }
-        
-        hash_set(the_evtdef_hash, event_code, bp - bound_events);
-
-        thislen = strlen((char *)bp->event_str);
-        if (thislen > widest_name_format)
-            widest_name_format = thislen;
-
-        ep++;
-    }
-    return (0);
-}
-
-int trackdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    int i, nevents;
-    track_definition_section_header_t *tdh;
-    track_definition_t *tp;
-    u8 *this_strtab;
-    u32 track_code;
-    uword *p;
-    bound_track_t *btp;
-    int thislen;
-
-    tdh = (track_definition_section_header_t *)(sh+1);
-    nevents = ntohl(tdh->number_of_track_definitions);
-    
-    if (verbose) {
-        fprintf(ofp, "Track Definition Section: %d definitions\n",
-                nevents);
-    }
-
-    p = hash_get_mem(the_strtab_hash, tdh->string_table_name);
-    if (!p) {
-        fprintf(ofp, "Fatal: couldn't find string table\n");
-        return(1);
-    }
-    this_strtab = (u8 *)p[0];
-
-    tp = (track_definition_t *)(tdh+1);
-    
-    for (i = 0; i < nevents; i++) {
-        track_code = ntohl(tp->track);
-        p = hash_get(the_trackdef_hash, track_code);
-        if (p) {
-            fprintf(ofp, "track %d redefined, retain first definition\n",
-                    track_code);
-            continue;
-        }
-        vec_add2(bound_tracks, btp, 1);
-        btp->track = track_code;
-        btp->track_str = this_strtab + ntohl(tp->track_format);
-        hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
-
-        thislen = strlen((char *)(btp->track_str));
-        if (thislen > widest_track_format)
-            widest_track_format = thislen;
-        tp++;
-    }
-    return (0);
-}
-
-int unsupported_pass (cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    if (verbose) {
-        fprintf(ofp, "Unsupported type %d section\n",
-                ntohl(sh->section_type));
-    }
-    return(0);
-}
-
-int event_pass2(cpel_section_header_t *sh, int verbose, FILE *ofp)
-{
-    event_section_header_t *eh;
-    u32 track_code;
-    int nevents;
-    int i;
-    uword *p;
-    event_entry_t *ep;
-    u64 now;
-    u32 time0, time1;
-    bound_track_t generic_track;
-    u32 last_track_code;
-    u64 state_start_ticks=0;
-    u64 ticks_in_state;
-    bound_track_t *state_track=0;
-    int in_state=0;
-    generic_track.track_str = (u8 *) "%d";
-    last_track_code = 0xdeafbeef;
-
-    eh = (event_section_header_t *)(sh+1);
-    nevents = ntohl(eh->number_of_events);
-    ticks_per_us = ((double)ntohl(eh->clock_ticks_per_second))/1e6;
-
-    if (verbose) {
-        fprintf(ofp, "%.3f ticks_per_us\n", ticks_per_us);
-    }
-
-    ep = (event_entry_t *)(eh+1);
-
-    p = hash_get_mem(the_strtab_hash, eh->string_table_name);
-    if (!p) {
-        fprintf(ofp, "Fatal: couldn't find string table\n");
-        return(1);
-    }
-
-    for (i = 0; i < nevents; i++) {
-        time0 = ntohl (ep->time[0]);
-        time1 = ntohl (ep->time[1]);
-
-        now = (((u64) time0)<<32) | time1;
-
-        /* Found the state-change event ? */
-        if (ntohl(ep->event_code) == state_event_code) {
-            /*
-             * Add a ticks-in-state record, unless
-             * this is the "prime mover" event instance 
-             */
-            if (in_state) {
-                ticks_in_state = now - state_start_ticks;
-                vec_add1(state_track->ticks_in_state, ticks_in_state);
-            }
-            /* switch to now-current track */
-            state_start_ticks = now;
-            track_code = ntohl(ep->track);
-            if (track_code != last_track_code) {
-                p = hash_get(the_trackdef_hash, track_code);
-                if (p) {
-                    state_track = &bound_tracks[p[0]];
-                } else {
-                    state_track = &generic_track;
-                }
-                last_track_code = track_code;
-            }
-            in_state = 1;
-        }
-        ep++;
-    }
-    return(0);
-}
-
-/* 
- * Note: If necessary, add passes / columns to this table to 
- * handle section order dependencies.
- */
-
-section_processor_t processors[CPEL_NUM_SECTION_TYPES+1] =
-{
-    {bad_section,	noop_pass}, 		/* type 0 -- f**ked */
-    {strtab_pass1, 	noop_pass}, 		/* type 1 -- STRTAB */
-    {unsupported_pass,  noop_pass}, 		/* type 2 -- SYMTAB */
-    {evtdef_pass1,      noop_pass},             /* type 3 -- EVTDEF */
-    {trackdef_pass1,    noop_pass},		/* type 4 -- TRACKDEF */
-    {noop_pass,         event_pass2},           /* type 5 -- EVENTS */
-};
-
-
-int process_section(cpel_section_header_t *sh, int verbose, FILE *ofp,
-                    pass_t pass)
-{
-    u32 type;
-    type = ntohl(sh->section_type);
-    int rv;
-    int (*fp)(cpel_section_header_t *, int, FILE *);
-
-    if (type > CPEL_NUM_SECTION_TYPES) {
-        fprintf(stderr, "Unknown section type %d\n", type);
-        return(1);
-    }
-    switch(pass) {
-    case PASS1:
-        fp = processors[type].pass1;
-        break;
-
-    case PASS2:
-        fp = processors[type].pass2;
-        break;
-        
-    default:
-        fprintf(stderr, "Unknown pass %d\n", pass);
-        return(1);
-    }
-
-    rv = (*fp)(sh, verbose, ofp);
-
-    return(rv);
-}
-
-int cpel_dump_file_header(cpel_file_header_t *fh, int verbose, FILE *ofp)
-{
-    time_t file_time;
-
-    if (verbose) {
-        fprintf(ofp, "CPEL file: %s-endian, version %d\n",
-                ((fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) ? 
-                 "little" : "big"), 
-                fh->endian_version & CPEL_FILE_VERSION_MASK);
-
-        file_time = ntohl(fh->file_date);
-        
-        fprintf(ofp, "File created %s", ctime(&file_time));
-        fprintf(ofp, "File has %d sections\n", 
-                ntohs(fh->nsections));
-    }
-
-    return(0);
-}
-
-
-int cpel_dump(u8 *cpel, int verbose, FILE *ofp)
-{
-    cpel_file_header_t *fh;
-    cpel_section_header_t *sh;
-    u16 nsections;
-    u32 section_size;
-    int i;
-
-    /* First, the file header */
-    fh = (cpel_file_header_t *)cpel;
-    if (fh->endian_version != CPEL_FILE_VERSION) {
-        if (fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) {
-            fprintf(stderr, "Little endian data format not supported\n");
-            return(1);
-        }
-        fprintf(stderr, "Unsupported file version 0x%x\n", 
-                fh->endian_version);
-        return(1);
-    }
-    cpel_dump_file_header(fh, verbose, ofp);
-    nsections = ntohs(fh->nsections);
-
-    /*
-     * Take two passes through the file. PASS1 builds
-     * data structures, PASS2 actually dumps the file.
-     * Just in case the sections are in an unobvious order.
-     */
-    sh = (cpel_section_header_t *)(fh+1);
-    for (i = 0; i < nsections; i++) {
-        section_size = ntohl(sh->data_length);
-
-        if(verbose) {
-            fprintf(ofp, "Section type %d, size %d\n", ntohl(sh->section_type),
-                    section_size);
-        }
-
-        if(process_section(sh, verbose, ofp, PASS1))
-            return(1);
-
-        sh++;
-        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
-    }
-
-    sh = (cpel_section_header_t *)(fh+1);
-    for (i = 0; i < nsections; i++) {
-        if(process_section(sh, verbose, ofp, PASS2))
-            return(1);
-        section_size = ntohl(sh->data_length);
-        sh++;
-        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
-    }
-    return(0);
-}
-
-void compute_state_statistics(int verbose, FILE *ofp)
-{
-    int i, j;
-    bound_track_t *bp;
-    f64 fticks;
-
-    /* Across the bound tracks */
-    for (i = 0; i < vec_len(bound_tracks); i++) {
-        bp = &bound_tracks[i];
-        bp->mean_ticks_in_state = 0.0;
-        bp->variance_ticks_in_state = 0.0;
-        bp->total_ticks_in_state = 0.0;
-        for (j = 0; j < vec_len(bp->ticks_in_state); j++) {
-            bp->total_ticks_in_state += (f64) bp->ticks_in_state[j];
-        }
-        /* Compute mean */
-        if (vec_len(bp->ticks_in_state)) {
-            bp->mean_ticks_in_state = bp->total_ticks_in_state / 
-                ((f64) vec_len(bp->ticks_in_state));
-        }
-        /* Accumulate sum: (Xi-Xbar)**2 */
-        for (j = 0; j < vec_len(bp->ticks_in_state); j++) {
-            fticks = bp->ticks_in_state[j];
-            bp->variance_ticks_in_state += 
-                (fticks - bp->mean_ticks_in_state)*
-                (fticks - bp->mean_ticks_in_state);
-        }
-        /* Compute s**2, the unbiased estimator of sigma**2 */
-        if (vec_len(bp->ticks_in_state) > 1) {
-            bp->variance_ticks_in_state /= (f64) 
-                (vec_len(bp->ticks_in_state)-1);
-        }
-    }
-}
-
-int track_compare_max (const void *arg1, const void *arg2)
-{
-    bound_track_t *a1 = (bound_track_t *)arg1;
-    bound_track_t *a2 = (bound_track_t *)arg2;
-    f64 v1, v2;
-
-    v1 = a1->total_ticks_in_state;
-    v2 = a2->total_ticks_in_state;
-    
-    if (v1 < v2)
-        return (1);
-    else if (v1 == v2)
-        return (0);
-    else return (-1);
-}
-
-int track_compare_occurrences (const void *arg1, const void *arg2)
-{
-    bound_track_t *a1 = (bound_track_t *)arg1;
-    bound_track_t *a2 = (bound_track_t *)arg2;
-    f64 v1, v2;
-
-    v1 = (f64) vec_len(a1->ticks_in_state);
-    v2 = (f64) vec_len(a2->ticks_in_state);
-    
-    if (v1 < v2)
-        return (1);
-    else if (v1 == v2)
-        return (0);
-    else return (-1);
-}
-
-int track_compare_name (const void *arg1, const void *arg2)
-{
-    bound_track_t *a1 = (bound_track_t *)arg1;
-    bound_track_t *a2 = (bound_track_t *)arg2;
-
-    return (strcmp((char *)(a1->track_str), (char *)(a2->track_str)));
-}
-
-void sort_state_statistics(sort_t type, FILE *ofp)
-{
-    int (*compare)(const void *, const void *)=0;
-
-    if (summary_stats_only)
-        return;
-
-    switch(type) {
-    case SORT_MAX_TIME:
-        fprintf(ofp, "Results sorted by max time in state.\n");
-        compare = track_compare_max;
-        break;
-
-    case SORT_MAX_OCCURRENCES:
-        fprintf(ofp, "Results sorted by max occurrences of state.\n");
-        compare = track_compare_occurrences;
-        break;
-
-    case SORT_NAME:
-        compare = track_compare_name;
-        fprintf(ofp, "Results sorted by process-id/name/thread ID\n");
-        break;
-
-    default:
-        fatal("sort type not set?");
-    }
-    
-    qsort (bound_tracks, vec_len(bound_tracks), 
-           sizeof (bound_track_t), compare);    
-}
-
-void print_state_statistics(int verbose, FILE *ofp)
-{
-    int i,j;
-    u8 *trackpad;
-    bound_track_t *bp;
-    f64 total_time = 0.0;
-    f64 total_switches = 0.0;
-
-    trackpad = format(0, "%%-%ds ", widest_track_format);
-    vec_add1(trackpad, 0);
-
-    if (!summary_stats_only) {
-        fprintf(ofp, (char *)trackpad, "ProcThread");
-        fprintf(ofp, "  Mean(us)     Stdev(us)   Total(us)      N\n");
-    }
-        
-    for (i = 0; i < vec_len(bound_tracks); i++) {
-        bp = &bound_tracks[i];
-        if (bp->mean_ticks_in_state == 0.0)
-            continue;
-
-        if (name_filter &&
-            strncmp((char *)(bp->track_str), (char *)name_filter, 
-                    strlen((char *)name_filter)))
-            continue;
-
-        /*
-         * Exclude kernel threads (e.g. idle thread) from
-         * state statistics 
-         */
-        if (exclude_kernel_from_summary_stats && 
-            !strncmp((char *)(bp->track_str), "kernel ", 7))
-            continue;
-
-        total_switches += (f64) vec_len(bp->ticks_in_state);
-        
-        if (!summary_stats_only) {
-            fprintf(ofp, (char *) trackpad, bp->track_str);
-            fprintf(ofp, "%10.3f +- %10.3f", 
-                    bp->mean_ticks_in_state / ticks_per_us,
-                    sqrt(bp->variance_ticks_in_state) 
-                    / (f64) ticks_per_us);
-            fprintf(ofp, "%12.3f", 
-                    bp->total_ticks_in_state / ticks_per_us);
-            fprintf(ofp, "%8d\n", (int)vec_len(bp->ticks_in_state));
-        }
-
-        if (scatterplot) {
-            for (j = 0; j < vec_len(bp->ticks_in_state); j++) {
-                fprintf(ofp, "%.3f\n", 
-                        (f64)bp->ticks_in_state[j] / ticks_per_us);
-            }
-        }
-
-        total_time += bp->total_ticks_in_state;
-    }
-    
-    if (!summary_stats_only)
-        fprintf(ofp, "\n");
-    fprintf(ofp, "Note: the following statistics %s kernel-thread activity.\n",
-            exclude_kernel_from_summary_stats ? "exclude" : "include");
-    if (name_filter)
-        fprintf(ofp, 
-                "Note: only pid/proc/threads matching '%s' are included.\n",
-                name_filter);
-
-    fprintf(ofp, 
-      "Total runtime: %10.3f (us), Total state switches: %.0f\n", 
-            total_time / ticks_per_us, total_switches);
-    fprintf(ofp, "Average time in state: %10.3f (us)\n",
-            (total_time / total_switches) / ticks_per_us);
-}
-
-char *mapfile (char *file)
-{
-    struct stat statb;
-    char *rv;
-    int maphfile;
-    size_t mapfsize;
-    
-    maphfile = open (file, O_RDONLY);
-
-    if (maphfile < 0)
-    {
-        fprintf (stderr, "Couldn't read %s, skipping it...\n", file);
-        return (NULL);
-    }
-
-    if (fstat (maphfile, &statb) < 0)
-    {
-        fprintf (stderr, "Couldn't get size of %s, skipping it...\n", file);
-        return (NULL);
-    }
-
-    /* Don't try to mmap directories, FIFOs, semaphores, etc. */
-    if (! (statb.st_mode & S_IFREG)) {
-        fprintf (stderr, "%s is not a regular file, skipping it...\n", file);
-        return (NULL);
-    }
-
-    mapfsize = statb.st_size;
-
-    if (mapfsize < 3)
-    {
-        fprintf (stderr, "%s zero-length, skipping it...\n", file);
-        close (maphfile);
-        return (NULL);
-    }
-
-    rv = mmap (0, mapfsize, PROT_READ, MAP_SHARED, maphfile, 0);
-
-    if (rv == 0)
-    {
-        fprintf (stderr, "%s problem mapping, I quit...\n", file);
-        exit (-1);
-    }
-    close (maphfile);
-    return (rv);
-}
-
-/*
- * main 
- */
-int main (int argc, char **argv)
-{
-    char *cpel_file = 0;
-    char *outputfile = 0;
-    FILE *ofp;
-    char *cpel;
-    int verbose=0;
-    int curarg=1;
-
-    while (curarg < argc) {
-        if (!strncmp(argv[curarg], "--input-file", 3)) {
-            curarg++;
-            if (curarg < argc) {
-                cpel_file = argv[curarg];
-                curarg++;
-                continue;
-            }
-            fatal("Missing filename after --input-file\n");
-        }
-        if (!strncmp(argv[curarg], "--output-file", 3)) {
-            curarg ++;
-            if (curarg < argc) {
-                outputfile = argv[curarg];
-                curarg ++;
-                continue;
-            }
-            fatal("Missing filename after --output-file\n");
-        }
-        if (!strncmp(argv[curarg], "--verbose", 3)) {
-            curarg++;
-            verbose++;
-            continue;
-        }
-        if (!strncmp(argv[curarg], "--scatterplot", 4)) {
-            curarg++;
-            scatterplot=1;
-            continue;
-        }
-
-        if (!strncmp(argv[curarg], "--state-event", 4)) {
-            curarg++;
-            if (curarg < argc) {
-                state_event_code = atol(argv[curarg]);
-                curarg ++;
-                continue;
-            }
-            fatal("Missing integer after --state-event\n");
-        }
-        if (!strncmp(argv[curarg], "--max-time-sort", 7)) {
-            sort_type = SORT_MAX_TIME;
-            curarg++;
-            continue;
-        }
-        if (!strncmp(argv[curarg], "--max-occurrence-sort", 7)) {
-            sort_type = SORT_MAX_OCCURRENCES;
-            curarg++;
-            continue;
-        }
-        if (!strncmp(argv[curarg], "--name-sort", 3)) {
-            sort_type = SORT_NAME;
-            curarg++;
-            continue;
-        }
-        if (!strncmp(argv[curarg], "--kernel-included", 3)) {
-            exclude_kernel_from_summary_stats = 0;
-            curarg++;
-            continue;
-        }
-        if (!strncmp(argv[curarg], "--summary", 3)) {
-            summary_stats_only=1;
-            curarg++;
-            continue;
-        }
-        if (!strncmp(argv[curarg], "--filter", 3)) {
-            curarg ++;
-            if (curarg < argc) {
-                name_filter = (u8 *)argv[curarg];
-                curarg ++;
-                continue;
-            }
-            fatal("Missing filter string after --filter\n");
-        }
-        
-
-    usage:
-        fprintf(stderr, 
-          "cpelstate --input-file <filename> [--output-file <filename>]\n");
-        fprintf(stderr, 
-          "          [--state-event <decimal>] [--verbose]\n");
-        fprintf(stderr, 
-          "          [--max-time-sort(default) | --max-occurrence-sort |\n");
-
-        fprintf(stderr, 
-          "           --name-sort-sort] [--kernel-included]\n");
-
-        fprintf(stderr, 
-          "          [--summary-stats-only] [--scatterplot]\n");
-
-        fprintf(stderr, "%s\n", version);
-        exit(1);
-    }
-
-    if (cpel_file == 0)
-        goto usage;
-
-    cpel = mapfile(cpel_file);
-    if (cpel == 0) {
-        fprintf(stderr, "Couldn't map %s...\n", cpel_file);
-        exit(1);
-    }
-
-    if (!outputfile) {
-        ofp = fdopen(1, "w");
-        if (ofp == NULL) {
-            fprintf(stderr, "Couldn't fdopen(1)?\n");
-            exit(1);
-        }
-    } else {
-        ofp = fopen(outputfile, "w");
-        if (ofp == NULL) {
-            fprintf(stderr, "Couldn't create %s...\n", outputfile);
-            exit(1);
-        }
-    }
-
-    the_strtab_hash = hash_create_string (0, sizeof (uword));
-    the_evtdef_hash = hash_create (0, sizeof (uword));
-    the_trackdef_hash = hash_create (0, sizeof (uword));
-
-    if (cpel_dump((u8 *) cpel, verbose, ofp)) {
-        if (outputfile)
-            unlink(outputfile);
-    }
-
-    compute_state_statistics(verbose, ofp);
-    sort_state_statistics(sort_type, ofp);
-    print_state_statistics(verbose, ofp);
-
-    fclose(ofp);
-    return(0);
-}
diff --git a/perftool/delsvec.c b/perftool/delsvec.c
deleted file mode 100644
index 724935d3..00000000
--- a/perftool/delsvec.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2006-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* Break up a delimited string into a vector of substrings */
-
-#include <stdio.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <stdarg.h>
-
-/*
- * #define UNIT_TESTS 1
- * #define MATCH_TRACE 1 
- */
-
-/*
- * delsvec
- * break up an input string into a vector of [null-terminated] u8 *'s
- * 
- * Each supplied delimiter character results in a string in the output
- * vector, unless the delimiters occur back-to-back.  When matched,
- * a whitespace character in the delimiter consumes an arbitrary
- * run of whitespace. See the unit tests at the end of this file
- * for a set of examples.
- *
- * Returns a u8 **, or NULL if the input fails to match.  It is assumed
- * that both input and fmt are C strings, not necessarily vectors.
- *
- * Output strings are both vectors and proper C strings.
- */
-
-static u8 **string_cache;
-static u8 **svec_cache;
-
-void delsvec_recycle_this_string (u8 *s)
-{
-    if (s) {
-        _vec_len (s) = 0;
-        vec_add1(string_cache, s);
-    }
-}
-
-void delsvec_recycle_this_svec (u8 **svec)
-{
-    if (svec) {
-        if (svec_cache) {
-            vec_free (svec_cache);
-        }
-        _vec_len (svec) = 0;
-        svec_cache = svec;
-    }
-}
-
-int pvl (char *a)
-{
-    return vec_len(a);
-}
-
-u8 **delsvec(void *input_arg, char *fmt)
-{
-    u8 **rv = 0;
-    int input_index=0;
-    u8 *this;
-    int dirflag=0;
-    int i;
-    u8 *input = input_arg;
-
-    if (svec_cache) {
-        rv = svec_cache;
-        svec_cache = 0;
-    }
-
-    while (fmt) {
-        dirflag=0;
-        if (vec_len (string_cache) > 0) {
-            this = string_cache [vec_len(string_cache)-1];
-            _vec_len (string_cache) = vec_len (string_cache) - 1;
-        } else 
-            this = 0;
-        /*
-         * '*' means one of two things: match the rest of the input, 
-         * or match as many characters as possible 
-         */
-        if (fmt[0] == '*') {
-            fmt++;
-            dirflag=1;
-            /*
-             * no more format: eat rest of string... 
-             */
-            if (!fmt[0]) {
-                for (;input[input_index]; input_index++)
-                    vec_add1(this, input[input_index]);
-                if (vec_len(this)) {
-                    vec_add1(this, 0);
-#ifdef MATCH_TRACE
-                    printf("final star-match adds: '%s'\n", this);
-#endif
-                    vec_add1(rv, this);
-                } else {
-                    vec_add1(string_cache, this);
-                }
-
-                return(rv);
-            }
-        }
-        /*
-         * Left-to-right scan, adding chars until next delimiter char 
-         * appears.
-         */
-        if (!dirflag) {
-            while (input[input_index]) {
-                if (input[input_index] == fmt[0]) {
-                    /* If we just (exact) matched a whitespace delimiter */
-                    if (fmt[0] == ' '){
-                        /* scan forward eating whitespace */
-                        while (input[input_index] == ' ' ||
-                               input[input_index] == '\t' ||
-                               input[input_index] == '\n')
-                            input_index++;
-                        input_index--;
-                    }
-                    goto found;
-                }
-                /* If we're looking for whitespace */
-                if (fmt[0] == ' ') {
-                    /* and we have whitespace */
-                    if (input[input_index] == ' ' ||
-                        input[input_index] == '\t' ||
-                        input[input_index] == '\n') {
-                        /* scan forward eating whitespace */
-                        while (input[input_index] == ' ' ||
-                               input[input_index] == '\t' ||
-                               input[input_index] == '\n') {
-                            input_index++;
-                        }
-                        input_index--;
-                        goto found;
-                    }
-                }
-                /* Not a delimiter, save it */
-                vec_add1(this, input[input_index]);
-                input_index++;
-            }
-            /*
-             * Fell off the wagon, clean up and bail out 
-             */
-        bail:
-
-#ifdef MATCH_TRACE
-            printf("failed, fmt[0] = '%c', input[%d]='%s'\n",
-                   fmt[0], input_index, &input[input_index]);
-#endif
-            delsvec_recycle_this_string(this);
-            for (i = 0; i < vec_len(rv); i++)
-                delsvec_recycle_this_string(rv[i]);
-            delsvec_recycle_this_svec(rv);
-            return(0);
-            
-        found:
-            /*
-             * Delimiter matched
-             */
-            input_index++;
-            fmt++;
-            /*
-             * If we actually accumulated non-delimiter characters,
-             * add them to the result vector
-             */
-            if (vec_len(this)) {
-                vec_add1(this, 0);
-#ifdef MATCH_TRACE
-                printf("match: add '%s'\n", this);
-#endif
-                vec_add1(rv, this);
-            } else {
-                vec_add1(string_cache, this);
-            }
-        } else { 
-            /*
-             * right-to-left scan, '*' not at 
-             * the end of the delimiter string 
-             */
-            i = input_index;
-            while (input[++i])
-                ; /* scan forward */
-            i--;
-            while (i > input_index) {
-                if (input[i] == fmt[0])
-                    goto found2;
-                
-                if (fmt[0] == ' ' || fmt[0] == '\t' ||
-                    fmt[0] == '\n') {
-                    if (input[i] == ' ' ||
-                        input[i] == '\t' ||
-                        input[i] == '\n')
-                        goto found2;
-                }
-                i--;
-            }
-            goto bail;
-
-        found2:
-            for (; input_index < i; input_index++) {
-                vec_add1(this, input[input_index]);
-            }
-            input_index++;
-            fmt++;
-            vec_add1(this, 0);
-#ifdef MATCH_TRACE
-                printf("inner '*' match: add '%s'\n", this);
-#endif
-            vec_add1(rv, this);
-        }
-    }
-    return (rv);
-}
-
-#ifdef UNIT_TESTS
-
-typedef struct utest_ {
-    char *string;
-    char *fmt;
-} utest_t;
-
-utest_t tests[] = {
-#ifdef NOTDEF
-    {"Dec  7 08:56",
-     "  :*"},
-    {"Dec 17 08:56",
-     "  :*"},
-    {"Dec  7 08:56:41.239 install/inst_repl 0/9/CPU0 t1  [40989] File List:Successfully blobbified file list. Took 1 milliseconds",
-     "  ::. / //  [] *"},
-    {"RP/0/9/CPU0:Dec  7 08:55:28.550 : sam_server[291]: SAM backs up digest list to memory file",
-     "///:  ::. : []: *"},
-    /* Expected to fail */
-    {"Dec  7 08:56:41.239 install/inst_repl 0/9/CPU0 t1  [40989] File List:Successfully blobbified file list. Took 1 milliseconds",
-     "///:  ::. : : *"},
-    /* Expected to fail */
-    {"RP/0/9/CPU0:Dec  7 08:55:28.550 : sam_server[291]: SAM backs up digest list to memory file",
-     "  ::. / //  [] *"},
-    {"THIS that and + theother", "*+ *"}, 
-    {"Dec 12 15:33:07.103 ifmgr/errors 0/RP0/CPU0 3# t2  Failed to open IM connection: No such file or directory", "  ::. / //   *"}, 
-    {"Dec 16 21:43:47.328 ifmgr/bulk 0/3/CPU0 t8  Bulk DPC async download complete. Partitions 1, node_count 1, total_out 0, out_offset 0, out_expected 0: No error","  ::. / //  *"},
-    {"t:0x53034bd6 CPU:00 PROCESS :PROCCREATE_NAME",
-     ": :  :*"},
-    {"                       pid:1", " *"},
-    {"t:0x53034cbb CPU:00 THREAD  :THCREATE      pid:1 tid:1",
-     ": :  : pid: tid:*"},
-    {"t:0x5303f950 CPU:00 COMM    :REC_PULSE     scoid:0x40000003 pid:364659",
-     ": :  : *"},
-    {"/hfr-base-3.3.85/lib/libttyconnection.dll 0xfc000000 0x0000306c 0xfc027000 0x000001c8    1", 
-     "     *"},
-    {"Feb 28 02:38:26.123 seqtrace 0/1/CPU0 t8  :msg_receive:ifmgr/t8:IMC_MSG_MTU_UPDATE:ppp_ma/t1", 
-     "  ::.  //  ::::*"},
-
-    {"Feb 28 02:38:26.123 seqtrace 0/1/CPU0 t8  :msg_send_event:call:ifmgr/t8:124/0:cdp/t1", 
-     "  ::.  //  :msg_send_event::::*"},
-
-    {"Feb 28 02:38:26.125 seqtrace 0/1/CPU0 t1  :msg_receive_event:cdp/t1:124/0", 
-     "  ::.  //  :msg_receive_event::*"}
-    {"t:0x645dd86d CPU:00 USREVENT:EVENT:100, d0:0x00000002 d1:0x00000000",
-     ": : USREVENT:EVENT:, d0: *"}
-    {"t:0x5303f950 CPU:00 COMM    :REC_PULSE     scoid:0x40000003 pid:364659",
-     ": :  : *"},
-    {"t:0x2ccf9f5a CPU:00 INT_ENTR:0x80000000 (-2147483648)       IP:0x002d8b18", 
-     ": : INT_ENTR:  IP:*"}
-    {"t:0xd473951c CPU:00 KER_EXIT:SCHED_GET/88 ret_val:2 sched_priority:10",
-     ": : KER_EXIT:SCHED_GET : sched_priority:*"}
-    {"t:0x00000123 CPU:01 SYSTEM  :FUNC_ENTER thisfn:0x40e62048 call_site:0x00000000",
-    ": : SYSTEM :FUNC_ thisfn: *"},
-    {"t:0x5af8de95 CPU:00 INT_HANDLER_ENTR:0x0000004d (77)       PID:8200 IP:0x00000000 AREA:0x0bf9b290", ": : INT_HANDLER_*"},
-#endif
-    {"t:0x6d1ff92f CPU:00 CONTROL: BUFFER sequence = 1053, num_events = 714",
-     ": : CONTROL*"},
-    {"t:0x6d1ff92f CPU:00 CONTROL :TIME msb:0x0000003c lsb(offset):0x6d1ff921",
-     ": : CONTROL*"},
-};
-
-int main (int argc, char **argv)
-{
-    int i, j;
-    u8 **svec;
-
-    for (j = 0; j < ARRAY_LEN(tests); j++) {
-        printf ("input string: '%s'\n", tests[j].string);
-        printf ("delimiter arg: '%s'\n", tests[j].fmt);
-        printf ("parse trace:\n");
-        svec = delsvec(tests[j].string, tests[j].fmt);
-        if (!svec) {
-            printf("index %d failed\n", j);
-            continue;
-        }
-        printf("%d substring vectors\n", vec_len(svec));
-        for (i = 0; i < vec_len(svec); i++) {
-            printf("[%d]: '%s'\n", i, svec[i]);
-        }
-        printf ("-------------------\n");
-    }
-    exit(0);
-}
-#endif
diff --git a/perftool/linreg.c b/perftool/linreg.c
deleted file mode 100644
index 084091bb..00000000
--- a/perftool/linreg.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2006-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* see "Numerical Recipies in C, 2nd ed." p 665 */
-
-#include <stdio.h>
-#include <math.h>
-
-/*
- * linreg
- * Linear regression of (xi, yi), returns parameters for least-squares
- * fit y = a + bx.  Also, compute Pearson's R.
- */
-void linreg (double *x, double *y, int nitems, double *a, double *b,
-             double *minp, double *maxp, double *meanp, double *r)
-{
-    double sx = 0.0;
-    double sy = 0.0;
-    double st2 = 0.0;
-    double min = y[0];
-    double max = 0.0;
-    double ss, meanx, meany, t;
-    double errx, erry, prodsum, sqerrx, sqerry;
-    int i;
-
-    *b = 0.0;
-    
-    for (i = 0; i < nitems; i++) {
-        sx += x[i];
-        sy += y[i];
-        if (y[i] < min)
-            min = y[i];
-        if (y[i] > max)
-            max = y[i];
-    }
-    ss = nitems;
-    meanx = sx / ss;
-    meany = *meanp = sy / ss;
-    *minp = min;
-    *maxp = max;
-
-    for (i = 0; i < nitems; i++) {
-        t = x[i] - meanx;
-        st2 += t*t;
-        *b += t*y[i];
-    }
-
-    *b /= st2;
-    *a = (sy-sx*(*b))/ss;
-
-    prodsum = 0.0;
-    sqerrx = 0.0;
-    sqerry = 0.0;
-
-    /* Compute numerator of Pearson's R */
-    for (i = 0; i < nitems; i++) {
-        errx = x[i] - meanx;
-        erry = y[i] - meany;
-        prodsum += errx * erry;
-        sqerrx += errx*errx;
-        sqerry += erry*erry;
-    }
-
-    *r = prodsum / (sqrt(sqerrx)*sqrt(sqerry));
-}
diff --git a/perftool/new.cpel b/perftool/new.cpel
deleted file mode 100644
index b0f35958..00000000
Binary files a/perftool/new.cpel and /dev/null differ
diff --git a/perftool/new.elog b/perftool/new.elog
deleted file mode 100644
index 2d99bb16..00000000
Binary files a/perftool/new.elog and /dev/null differ
diff --git a/perftool/props.c b/perftool/props.c
deleted file mode 100644
index 84af5b1c..00000000
--- a/perftool/props.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * Copyright (c) 2006-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <ctype.h>
-#include <malloc.h>
-#include <time.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-static char *sxerox (char *s);
-
-#define NBUCKETS 97
-
-typedef struct prop_ {
-    struct prop_ *next;
-    char *name;
-    char *value;
-} prop_t;
-
-static prop_t *buckets [NBUCKETS];
-static int hash_shifts[4] = {24, 16, 8, 0};
-
-/*
- * getprop 
- */
-
-char *getprop (char *name)
-{
-    unsigned char *cp;
-    unsigned long hash=0;
-    prop_t *bp;
-    int i=0;
-
-    for (cp = (unsigned char *) name; *cp; cp++)
-        hash ^= (*cp)<<(hash_shifts[(i++)&0x3]);
-
-    bp = buckets [hash%NBUCKETS];
-
-    while (bp && strcmp(bp->name, name)) {
-        bp = bp->next;
-    }
-
-    if (bp == NULL)
-        return (0);
-    else
-        return (bp->value);
-}
-
-/*
- * getprop_default
- */
-
-char *getprop_default (char *name, char *def)
-{
-    char *rv;
-    rv = getprop (name);
-    if (rv)
-        return (rv);
-    else
-        return (def);
-}
-
-/*
- * addprop
- */
-
-void addprop (char *name, char *value)
-{
-    unsigned char *cp;
-    unsigned long hash=0;
-    prop_t **bpp;
-    prop_t *bp;
-    int i=0;
-
-    bp = (prop_t *)malloc (sizeof (prop_t));
-
-    bp->next = 0;
-    bp->name = sxerox (name);
-    bp->value = sxerox (value);
-
-    for (cp = (unsigned char *)name; *cp; cp++)
-        hash ^= (*cp)<<(hash_shifts[(i++)&0x3]);
-
-    bpp = &buckets [hash%NBUCKETS];
-
-    if (*bpp == NULL)
-        *bpp = bp;
-    else {
-        bp->next = *bpp;
-        *bpp = bp;
-    }
-}
-
-/*
- * sxerox 
- */
-
-static char *sxerox (char *s)
-{
-    char *rv = (char *) malloc (strlen (s) + 1);
-    strcpy (rv, s);
-    return rv;
-}
-
-/*
- * readprops 
- */
-
-#define START 0
-#define READNAME  1
-#define READVALUE 2
-#define C_COMMENT 3
-#define CPP_COMMENT 4
-
-int readprops (char *filename)
-{
-    FILE *ifp;
-    unsigned char c;
-    int state=START;
-    int linenum=1;
-    char namebuf [128];
-    char valbuf [512];
-    int i;
-
-    ifp = fopen (filename, "r");
-
-    if (ifp == NULL)
-        return (-1);
-
-    while (1) {
-
-    readchar:
-        c = getc (ifp);
-
-    again:
-        switch (state) {
-        case START:
-            if (feof (ifp)) {
-                fclose (ifp);
-                return (0);
-            }
-
-            if (c == ' ' || c == '\t')
-                goto readchar;
-
-            if (c == '\n') {
-                linenum++;
-                goto readchar;
-            }
-            if (isalpha (c) || (c == '_')) {
-                state = READNAME;
-                goto again;
-            }
-            if (c == '/') {
-                c = getc (ifp);
-                if (c == '/') {
-                    state = CPP_COMMENT;
-                    goto readchar;
-                } else if (c == '*') {
-                    state = C_COMMENT;
-                    goto readchar;
-                } else {
-                    fprintf (stderr, "unknown token '/' line %d\n",
-                             linenum);
-                    exit(1);
-                }
-            }
-            fprintf (stderr, "unknown token '%c' line %d\n",
-                     c, linenum);
-            exit (1);
-            break;
-            
-        case CPP_COMMENT:
-            while (1) {
-                c = getc (ifp);
-                if (feof (ifp))
-                    return (0);
-                if (c == '\n') {
-                    linenum++;
-                    state = START;
-                    goto readchar;
-                }
-            }
-            break;
-
-        case C_COMMENT:
-            while (1) {
-                c = getc (ifp);
-                if (feof (ifp)) {
-                    fprintf (stderr, "unterminated comment, line %d\n",
-                             linenum);
-                    exit (1);
-                }
-                if (c == '*') {
-                staragain:
-                    c = getc (ifp);
-                    if (c == '/') {
-                        state = START;
-                        goto readchar;
-                    }
-                    if (c == '*')
-                        goto staragain;
-                }
-            }
-            break;
-                    
-        case READNAME:
-            i = 0;
-            namebuf[i++] = c;
-            while (1) {
-                c = getc (ifp);
-                if (feof (ifp)) {
-                    fprintf (stderr, "EOF while reading a name, line %d\n",
-                             linenum);
-                    exit (1);
-                }
-                if ((!isalnum (c)) && (c != '_')) {
-                    namebuf [i] = 0;
-                    state = READVALUE;
-                    goto again;
-                }
-                namebuf [i++] = c;
-            }
-            break;
-
-        case READVALUE:
-            i = 0;
-            while ((c == ' ') || (c == '\t') || (c == '=')) {
-                c = getc (ifp);
-                if (feof (ifp)) {
-                    fprintf (stderr, "EOF while reading a value, line %d\n",
-                             linenum);
-                    exit (1);
-                }
-            }
-            goto firsttime;
-            while (1) {
-                c = getc (ifp);
-
-            firsttime:
-                if (c == '\\') {
-                    c = getc (ifp);
-                    if (feof (ifp)) {
-                        fprintf (stderr, "EOF after '\\', line %d\n",
-                                 linenum);
-                        exit (1);
-                    }
-                    valbuf[i++] = c;
-                    continue;
-                }
-                if (c == '\n') {
-                    linenum++;
-                    while (valbuf [i-1] == ' ' || valbuf[i-1] == '\t')
-                        i--;
-                    valbuf[i] = 0;
-                    addprop (namebuf, valbuf);
-                    state = START;
-                    goto readchar;
-                }
-                valbuf[i++] = c;
-            }
-
-        }
-    }
-}
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 100f089e..a101e47f 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -28,10 +28,6 @@ if ENABLE_sample_PLUGIN
 SUBDIRS += sample-plugin
 endif
 
-if ENABLE_sixrd_PLUGIN
-SUBDIRS += sixrd-plugin
-endif
-
 if ENABLE_ioam_PLUGIN
 SUBDIRS += ioam-plugin
 endif
@@ -44,18 +40,10 @@ if ENABLE_snat_PLUGIN
 SUBDIRS += snat-plugin
 endif
 
-if ENABLE_ila_PLUGIN
-SUBDIRS += ila-plugin
-endif
-
 if ENABLE_lb_PLUGIN
 SUBDIRS += lb-plugin
 endif
 
-if ENABLE_flowperpkt_PLUGIN
-SUBDIRS += flowperpkt-plugin
-endif
-
 if ENABLE_acl_PLUGIN
 SUBDIRS += acl-plugin
 endif
diff --git a/plugins/configure.ac b/plugins/configure.ac
index 6e7d5b8a..9c631634 100644
--- a/plugins/configure.ac
+++ b/plugins/configure.ac
@@ -53,12 +53,9 @@ AM_CONDITIONAL(ENABLE_$1_PLUGIN, test "$enable_the_plugin" = "1")
 # SUBDIRS += new-plugin
 # endif
 
-PLUGIN_ENABLED(sixrd)
 PLUGIN_ENABLED(ioam)
 PLUGIN_ENABLED(snat)
-PLUGIN_ENABLED(ila)
 PLUGIN_ENABLED(lb)
-PLUGIN_ENABLED(flowperpkt)
 PLUGIN_ENABLED(acl)
 
 # Disabled plugins, require --enable-XXX-plugin
diff --git a/plugins/flowperpkt-plugin/Makefile.am b/plugins/flowperpkt-plugin/Makefile.am
deleted file mode 100644
index 9354e26f..00000000
--- a/plugins/flowperpkt-plugin/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-
-# Copyright (c) <current-year> <your-organization>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall
-AM_LDFLAGS = -module -shared -avoid-version
-
-vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
-vpppluginsdir = ${libdir}/vpp_plugins
-
-vppplugins_LTLIBRARIES = flowperpkt_plugin.la
-vppapitestplugins_LTLIBRARIES = flowperpkt_test_plugin.la
-
-flowperpkt_plugin_la_SOURCES = flowperpkt/flowperpkt.c  \
-        flowperpkt/l2_node.c \
-        flowperpkt/node.c \
-	flowperpkt/flowperpkt_plugin.api.h
-flowperpkt_plugin_la_LDFLAGS = -module
-
-BUILT_SOURCES =					\
-	flowperpkt/flowperpkt.api.h		\
-	flowperpkt/flowperpkt.api.json
-
-SUFFIXES = .api.h .api .api.json
-
-%.api.h: %.api
-	mkdir -p `dirname $@` ; \
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
-	| vppapigen --input - --output $@ --show-name $@
-
-%.api.json: %.api
-	@echo "  JSON APIGEN  " $@ ;				\
-	mkdir -p `dirname $@` ;					\
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
-	| vppapigen --input - --json $@
-
-apidir = $(prefix)/flowperpkt/
-api_DATA = flowperpkt/flowperpkt.api.json
-
-noinst_HEADERS =			\
-  flowperpkt/flowperpkt_all_api_h.h			\
-  flowperpkt/flowperpkt_msg_enum.h			\
-  flowperpkt/flowperpkt.api.h
-
-flowperpkt_test_plugin_la_SOURCES = \
-  flowperpkt/flowperpkt_test.c flowperpkt/flowperpkt_plugin.api.h
-
-# Remove *.la files
-install-data-hook:
-	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
-	@(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
-
diff --git a/plugins/flowperpkt-plugin/configure.ac b/plugins/flowperpkt-plugin/configure.ac
deleted file mode 100644
index 80546169..00000000
--- a/plugins/flowperpkt-plugin/configure.ac
+++ /dev/null
@@ -1,9 +0,0 @@
-
-AC_INIT(flowperpkt_plugin, 1.0)
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_PROG_LIBTOOL
-AC_PROG_CC
-
-AC_OUTPUT([Makefile])
diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.api b/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.api
deleted file mode 100644
index fa878f21..00000000
--- a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.api
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Define a simple enable-disable binary API to control the feature */
-
-/** \file
-    This file defines the vpp control-plane API messages
-    used to control the flowperpkt plugin
-*/
-
-/** \brief Enable / disable per-packet IPFIX recording on an interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add address if non-zero, else delete
-    @param is_ipv6 - if non-zero the address is ipv6, else ipv4
-    @param sw_if_index - index of the interface
-*/
-manual_print define flowperpkt_tx_interface_add_del
-{
-  /* Client identifier, set from api_main.my_client_index */
-  u32 client_index;
-
-  /* Arbitrary context, so client can match reply to request */
-  u32 context;
-
-  /* Enable / disable the feature */
-  u8 is_add;
-  u8 which;  /* 0 = ipv4, 1 = l2, 2 = ipv6 (not yet implemented) */
-
-  /* Interface handle */
-  u32 sw_if_index;
-};
-
-/** \brief Reply to enable/disable per-packet IPFIX recording messages
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define flowperpkt_tx_interface_add_del_reply
-{
-  /* From the request */
-  u32 context;
-
-  /* Return value, zero means all OK */
-  i32 retval;
-};
diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c b/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c
deleted file mode 100644
index fb71d5b0..00000000
--- a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c
+++ /dev/null
@@ -1,671 +0,0 @@
-/*
- * flowperpkt.c - per-packet data capture flow report plugin
- *
- * Copyright (c) <current-year> <your-organization>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @file
- * @brief Per-packet IPFIX flow record generator plugin
- *
- * This file implements vpp plugin registration mechanics,
- * debug CLI, and binary API handling.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/plugin/plugin.h>
-#include <flowperpkt/flowperpkt.h>
-
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-
-/* define message IDs */
-#include <flowperpkt/flowperpkt_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <flowperpkt/flowperpkt_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <flowperpkt/flowperpkt_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <flowperpkt/flowperpkt_all_api_h.h>
-#undef vl_printfun
-
-flowperpkt_main_t flowperpkt_main;
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <flowperpkt/flowperpkt_all_api_h.h>
-#undef vl_api_version
-
-/* Define the per-interface configurable features */
-/* *INDENT-OFF* */
-VNET_FEATURE_INIT (flow_perpacket_ipv4, static) =
-{
-  .arc_name = "ip4-output",
-  .node_name = "flowperpkt-ipv4",
-  .runs_before = VNET_FEATURES ("interface-output"),
-};
-
-VNET_FEATURE_INIT (flow_perpacket_l2, static) =
-{
-  .arc_name = "interface-output",
-  .node_name = "flowperpkt-l2",
-  .runs_before = VNET_FEATURES ("interface-tx"),
-};
-/* *INDENT-ON* */
-
-/*
- * A handy macro to set up a message reply.
- * Assumes that the following variables are available:
- * mp - pointer to request message
- * rmp - pointer to reply message type
- * rv - return value
- */
-#define REPLY_MACRO(t)                                          \
-do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
-    vl_api_client_index_to_input_queue (mp->client_index);      \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+fm->msg_id_base);               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-                                                                \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-/* Macro to finish up custom dump fns */
-#define FINISH                                  \
-    vec_add1 (s, 0);                            \
-    vl_print (handle, (char *)s);               \
-    vec_free (s);                               \
-    return handle;
-
-#define VALIDATE_SW_IF_INDEX(mp)				\
- do { u32 __sw_if_index = ntohl(mp->sw_if_index);		\
-    vnet_main_t *__vnm = vnet_get_main();                       \
-    if (pool_is_free_index(__vnm->interface_main.sw_interfaces, \
-                           __sw_if_index)) {                    \
-        rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
-        goto bad_sw_if_index;                                   \
-    }                                                           \
-} while(0);
-
-#define BAD_SW_IF_INDEX_LABEL                   \
-do {                                            \
-bad_sw_if_index:                                \
-    ;                                           \
-} while (0);
-
-/**
- * @brief Create an IPFIX template packet rewrite string
- * @param frm flow_report_main_t *
- * @param fr flow_report_t *
- * @param collector_address ip4_address_t * the IPFIX collector address
- * @param src_address ip4_address_t * the source address we should use
- * @param collector_port u16 the collector port we should use, host byte order
- * @returns u8 * vector containing the indicated IPFIX template packet
- */
-static inline u8 *
-flowperpkt_template_rewrite_inline (flow_report_main_t * frm,
-				    flow_report_t * fr,
-				    ip4_address_t * collector_address,
-				    ip4_address_t * src_address,
-				    u16 collector_port, int variant)
-{
-  ip4_header_t *ip;
-  udp_header_t *udp;
-  ipfix_message_header_t *h;
-  ipfix_set_header_t *s;
-  ipfix_template_header_t *t;
-  ipfix_field_specifier_t *f;
-  ipfix_field_specifier_t *first_field;
-  u8 *rewrite = 0;
-  ip4_ipfix_template_packet_t *tp;
-  u32 field_count = 0;
-  flow_report_stream_t *stream;
-  flowperpkt_main_t *fm = &flowperpkt_main;
-
-  stream = &frm->streams[fr->stream_index];
-
-  if (variant == FLOW_VARIANT_IPV4)
-    {
-      /*
-       * ip4 Supported Fields:
-       *
-       * ingressInterface, TLV type 10, u32
-       * egressInterface, TLV type 14, u32
-       * sourceIpv4Address, TLV type 8, u32
-       * destinationIPv4Address, TLV type 12, u32
-       * ipClassOfService, TLV type 5, u8
-       * flowStartNanoseconds, TLV type 156, dateTimeNanoseconds (f64)
-       *   Implementation: f64 nanoseconds since VPP started
-       *   warning: wireshark doesn't really understand this TLV
-       * dataLinkFrameSize, TLV type 312, u16
-       *   warning: wireshark doesn't understand this TLV at all
-       */
-
-      /* Currently 7 fields */
-      field_count += 7;
-
-      /* allocate rewrite space */
-      vec_validate_aligned
-	(rewrite,
-	 sizeof (ip4_ipfix_template_packet_t)
-	 + field_count * sizeof (ipfix_field_specifier_t) - 1,
-	 CLIB_CACHE_LINE_BYTES);
-    }
-  else if (variant == FLOW_VARIANT_L2)
-    {
-      /*
-       * L2 Supported Fields:
-       *
-       * ingressInterface, TLV type 10, u32
-       * egressInterface, TLV type 14, u32
-       * sourceMacAddress, TLV type 56, u8[6] we hope
-       * destinationMacAddress, TLV type 57, u8[6] we hope
-       * ethernetType, TLV type 256, u16
-       * flowStartNanoseconds, TLV type 156, dateTimeNanoseconds (f64)
-       *   Implementation: f64 nanoseconds since VPP started
-       *   warning: wireshark doesn't really understand this TLV
-       * dataLinkFrameSize, TLV type 312, u16
-       *   warning: wireshark doesn't understand this TLV at all
-       */
-
-      /* Currently 7 fields */
-      field_count += 7;
-
-      /* allocate rewrite space */
-      vec_validate_aligned
-	(rewrite,
-	 sizeof (ip4_ipfix_template_packet_t)
-	 + field_count * sizeof (ipfix_field_specifier_t) - 1,
-	 CLIB_CACHE_LINE_BYTES);
-    }
-
-  tp = (ip4_ipfix_template_packet_t *) rewrite;
-  ip = (ip4_header_t *) & tp->ip4;
-  udp = (udp_header_t *) (ip + 1);
-  h = (ipfix_message_header_t *) (udp + 1);
-  s = (ipfix_set_header_t *) (h + 1);
-  t = (ipfix_template_header_t *) (s + 1);
-  first_field = f = (ipfix_field_specifier_t *) (t + 1);
-
-  ip->ip_version_and_header_length = 0x45;
-  ip->ttl = 254;
-  ip->protocol = IP_PROTOCOL_UDP;
-  ip->src_address.as_u32 = src_address->as_u32;
-  ip->dst_address.as_u32 = collector_address->as_u32;
-  udp->src_port = clib_host_to_net_u16 (stream->src_port);
-  udp->dst_port = clib_host_to_net_u16 (collector_port);
-  udp->length = clib_host_to_net_u16 (vec_len (rewrite) - sizeof (*ip));
-
-  /* FIXUP: message header export_time */
-  /* FIXUP: message header sequence_number */
-  h->domain_id = clib_host_to_net_u32 (stream->domain_id);
-
-  /* Add TLVs to the template */
-  if (variant == FLOW_VARIANT_IPV4)
-    {
-      f->e_id_length =
-	ipfix_e_id_length (0 /* enterprise */ , ingressInterface,
-			   4);
-      f++;
-      f->e_id_length =
-	ipfix_e_id_length (0 /* enterprise */ , egressInterface,
-			   4);
-      f++;
-      f->e_id_length =
-	ipfix_e_id_length (0 /* enterprise */ , sourceIPv4Address,
-			   4);
-      f++;
-      f->e_id_length =
-	ipfix_e_id_length (0 /* enterprise */ , destinationIPv4Address, 4);
-      f++;
-      f->e_id_length =
-	ipfix_e_id_length (0 /* enterprise */ , ipClassOfService,
-			   1);
-      f++;
-      f->e_id_length =
-	ipfix_e_id_length (0 /* enterprise */ , flowStartNanoseconds,
-			   8);
-      f++;
-      f->e_id_length =
-	ipfix_e_id_length (0 /* enterprise */ , dataLinkFrameSize,
-			   2);
-      f++;
-    }
-  else if (variant == FLOW_VARIANT_L2)
-    {
-      f->e_id_length =
-	ipfix_e_id_length (0 /* enterprise */ , ingressInterface,
-			   4);
-      f++;
-      f->e_id_length =
-	ipfix_e_id_length (0 /* enterprise */ , egressInterface,
-			   4);
-      f++;
-      f->e_id_length =
-	ipfix_e_id_length (0 /* enterprise */ , sourceMacAddress,
-			   6);
-      f++;
-      f->e_id_length =
-	ipfix_e_id_length (0 /* enterprise */ , destinationMacAddress, 6);
-      f++;
-      f->e_id_length = ipfix_e_id_length (0 /* enterprise */ , ethernetType,
-					  2);
-      f++;
-      f->e_id_length =
-	ipfix_e_id_length (0 /* enterprise */ , flowStartNanoseconds,
-			   8);
-      f++;
-      f->e_id_length =
-	ipfix_e_id_length (0 /* enterprise */ , dataLinkFrameSize,
-			   2);
-      f++;
-    }
-
-  /* Extend in the obvious way, right here... */
-
-  /* Back to the template packet... */
-  ip = (ip4_header_t *) & tp->ip4;
-  udp = (udp_header_t *) (ip + 1);
-
-  ASSERT (f - first_field);
-  /* Field count in this template */
-  t->id_count = ipfix_id_count (fr->template_id, f - first_field);
-
-  if (variant == FLOW_VARIANT_IPV4)
-    fm->ipv4_report_id = fr->template_id;
-  else if (variant == FLOW_VARIANT_L2)
-    fm->l2_report_id = fr->template_id;
-
-  /* set length in octets */
-  s->set_id_length =
-    ipfix_set_id_length (2 /* set_id */ , (u8 *) f - (u8 *) s);
-
-  /* message length in octets */
-  h->version_length = version_length ((u8 *) f - (u8 *) h);
-
-  ip->length = clib_host_to_net_u16 ((u8 *) f - (u8 *) ip);
-  ip->checksum = ip4_header_checksum (ip);
-
-  return rewrite;
-}
-
-u8 *
-flowperpkt_template_rewrite_ipv4 (flow_report_main_t * frm,
-				  flow_report_t * fr,
-				  ip4_address_t * collector_address,
-				  ip4_address_t * src_address,
-				  u16 collector_port)
-{
-  return flowperpkt_template_rewrite_inline
-    (frm, fr, collector_address, src_address, collector_port,
-     FLOW_VARIANT_IPV4);
-}
-
-u8 *
-flowperpkt_template_rewrite_l2 (flow_report_main_t * frm,
-				flow_report_t * fr,
-				ip4_address_t * collector_address,
-				ip4_address_t * src_address,
-				u16 collector_port)
-{
-  return flowperpkt_template_rewrite_inline
-    (frm, fr, collector_address, src_address, collector_port,
-     FLOW_VARIANT_L2);
-}
-
-
-/**
- * @brief Flush accumulated data
- * @param frm flow_report_main_t *
- * @param fr flow_report_t *
- * @param f vlib_frame_t *
- *
- * <em>Notes:</em>
- * This function must simply return the incoming frame, or no template packets
- * will be sent.
- */
-vlib_frame_t *
-flowperpkt_data_callback_ipv4 (flow_report_main_t * frm,
-			       flow_report_t * fr,
-			       vlib_frame_t * f, u32 * to_next,
-			       u32 node_index)
-{
-  flowperpkt_flush_callback_ipv4 ();
-  return f;
-}
-
-vlib_frame_t *
-flowperpkt_data_callback_l2 (flow_report_main_t * frm,
-			     flow_report_t * fr,
-			     vlib_frame_t * f, u32 * to_next, u32 node_index)
-{
-  flowperpkt_flush_callback_l2 ();
-  return f;
-}
-
-/**
- * @brief configure / deconfigure the IPFIX flow-per-packet
- * @param fm flowperpkt_main_t * fm
- * @param sw_if_index u32 the desired interface
- * @param is_add int 1 to enable the feature, 0 to disable it
- * @returns 0 if successful, non-zero otherwise
- */
-
-static int flowperpkt_tx_interface_add_del_feature
-  (flowperpkt_main_t * fm, u32 sw_if_index, int which, int is_add)
-{
-  flow_report_main_t *frm = &flow_report_main;
-  vnet_flow_report_add_del_args_t _a, *a = &_a;
-  int rv;
-
-  if (which == FLOW_VARIANT_IPV4 && !fm->ipv4_report_created)
-    {
-      memset (a, 0, sizeof (*a));
-      a->rewrite_callback = flowperpkt_template_rewrite_ipv4;
-      a->flow_data_callback = flowperpkt_data_callback_ipv4;
-      a->is_add = 1;
-      a->domain_id = 1;		/*$$$$ config parameter */
-      a->src_port = 4739;	/*$$$$ config parameter */
-      fm->ipv4_report_created = 1;
-
-      rv = vnet_flow_report_add_del (frm, a);
-      if (rv)
-	{
-	  clib_warning ("vnet_flow_report_add_del returned %d", rv);
-	  return -1;
-	}
-    }
-  else if (which == FLOW_VARIANT_L2 && !fm->l2_report_created)
-    {
-      memset (a, 0, sizeof (*a));
-      a->rewrite_callback = flowperpkt_template_rewrite_l2;
-      a->flow_data_callback = flowperpkt_data_callback_l2;
-      a->is_add = 1;
-      a->domain_id = 1;		/*$$$$ config parameter */
-      a->src_port = 4739;	/*$$$$ config parameter */
-      fm->l2_report_created = 1;
-
-      rv = vnet_flow_report_add_del (frm, a);
-      if (rv)
-	{
-	  clib_warning ("vnet_flow_report_add_del returned %d", rv);
-	  return -1;
-	}
-    }
-
-  if (which == FLOW_VARIANT_IPV4)
-    vnet_feature_enable_disable ("ip4-output", "flowperpkt-ipv4",
-				 sw_if_index, is_add, 0, 0);
-  else if (which == FLOW_VARIANT_L2)
-    vnet_feature_enable_disable ("interface-output", "flowperpkt-l2",
-				 sw_if_index, is_add, 0, 0);
-
-  return 0;
-}
-
-/**
- * @brief API message handler
- * @param mp vl_api_flowperpkt_tx_interface_add_del_t * mp the api message
- */
-void vl_api_flowperpkt_tx_interface_add_del_t_handler
-  (vl_api_flowperpkt_tx_interface_add_del_t * mp)
-{
-  flowperpkt_main_t *fm = &flowperpkt_main;
-  vl_api_flowperpkt_tx_interface_add_del_reply_t *rmp;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  int rv = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  if (mp->which != FLOW_VARIANT_IPV4 && mp->which != FLOW_VARIANT_L2)
-    {
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto out;
-    }
-
-  rv = flowperpkt_tx_interface_add_del_feature (fm, sw_if_index, mp->which,
-						mp->is_add);
-out:
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_FLOWPERPKT_TX_INTERFACE_ADD_DEL_REPLY);
-}
-
-/**
- * @brief API message custom-dump function
- * @param mp vl_api_flowperpkt_tx_interface_add_del_t * mp the api message
- * @param handle void * print function handle
- * @returns u8 * output string
- */
-static void *vl_api_flowperpkt_tx_interface_add_del_t_print
-  (vl_api_flowperpkt_tx_interface_add_del_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: flowperpkt_tx_interface_add_del ");
-  s = format (s, "sw_if_index %d is_add %d which %d ",
-	      clib_host_to_net_u32 (mp->sw_if_index),
-	      (int) mp->is_add, (int) mp->which);
-  FINISH;
-}
-
-/* List of message types that this plugin understands */
-#define foreach_flowperpkt_plugin_api_msg                           \
-_(FLOWPERPKT_TX_INTERFACE_ADD_DEL, flowperpkt_tx_interface_add_del)
-
-/**
- * @brief plugin-api required function
- * @param vm vlib_main_t * vlib main data structure pointer
- * @param h vlib_plugin_handoff_t * handoff structure
- * @param from_early_init int notused
- *
- * <em>Notes:</em>
- * This routine exists to convince the vlib plugin framework that
- * we haven't accidentally copied a random .dll into the plugin directory.
- *
- * Also collects global variable pointers passed from the vpp engine
- */
-clib_error_t *
-vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
-		      int from_early_init)
-{
-  flowperpkt_main_t *fm = &flowperpkt_main;
-  clib_error_t *error = 0;
-
-  fm->vlib_main = vm;
-  fm->vnet_main = h->vnet_main;
-
-  return error;
-}
-
-static clib_error_t *
-flowperpkt_tx_interface_add_del_feature_command_fn (vlib_main_t * vm,
-						    unformat_input_t * input,
-						    vlib_cli_command_t * cmd)
-{
-  flowperpkt_main_t *fm = &flowperpkt_main;
-  u32 sw_if_index = ~0;
-  int is_add = 1;
-  u8 which = FLOW_VARIANT_IPV4;
-
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "disable"))
-	is_add = 0;
-      else if (unformat (input, "%U", unformat_vnet_sw_interface,
-			 fm->vnet_main, &sw_if_index));
-      else if (unformat (input, "l2"))
-	which = FLOW_VARIANT_L2;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "Please specify an interface...");
-
-  rv =
-    flowperpkt_tx_interface_add_del_feature (fm, sw_if_index, which, is_add);
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case VNET_API_ERROR_INVALID_SW_IF_INDEX:
-      return clib_error_return
-	(0, "Invalid interface, only works on physical ports");
-      break;
-
-    case VNET_API_ERROR_UNIMPLEMENTED:
-      return clib_error_return (0, "ip6 not supported");
-      break;
-
-    default:
-      return clib_error_return (0, "flowperpkt_enable_disable returned %d",
-				rv);
-    }
-  return 0;
-}
-
-/*?
- * '<em>flowperpkt feature add-del</em>' commands to enable/disable
- * per-packet IPFIX flow record generation on an interface
- *
- * @cliexpar
- * @parblock
- * To enable per-packet IPFIX flow-record generation on an interface:
- * @cliexcmd{flowperpkt feature add-del GigabitEthernet2/0/0}
- *
- * To disable per-packet IPFIX flow-record generation on an interface:
- * @cliexcmd{flowperpkt feature add-del GigabitEthernet2/0/0 disable}
- * @cliexend
- * @endparblock
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (flowperpkt_enable_disable_command, static) = {
-    .path = "flowperpkt feature add-del",
-    .short_help =
-    "flowperpkt feature add-del <interface-name> [disable]",
-    .function = flowperpkt_tx_interface_add_del_feature_command_fn,
-};
-/* *INDENT-ON* */
-
-/**
- * @brief Set up the API message handling tables
- * @param vm vlib_main_t * vlib main data structure pointer
- * @returns 0 to indicate all is well
- */
-static clib_error_t *
-flowperpkt_plugin_api_hookup (vlib_main_t * vm)
-{
-  flowperpkt_main_t *fm = &flowperpkt_main;
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + fm->msg_id_base),     \
-                           #n,					\
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_flowperpkt_plugin_api_msg;
-#undef _
-
-  return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <flowperpkt/flowperpkt_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (flowperpkt_main_t * fm, api_main_t * am)
-{
-#define _(id,n,crc) \
-  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + fm->msg_id_base);
-  foreach_vl_msg_name_crc_flowperpkt;
-#undef _
-}
-
-/**
- * @brief Set up the API message handling tables
- * @param vm vlib_main_t * vlib main data structure pointer
- * @returns 0 to indicate all is well, or a clib_error_t
- */
-static clib_error_t *
-flowperpkt_init (vlib_main_t * vm)
-{
-  flowperpkt_main_t *fm = &flowperpkt_main;
-  vlib_thread_main_t *tm = &vlib_thread_main;
-  clib_error_t *error = 0;
-  u32 num_threads;
-  u8 *name;
-
-  /* Construct the API name */
-  name = format (0, "flowperpkt_%08x%c", api_version, 0);
-
-  /* Ask for a correctly-sized block of API message decode slots */
-  fm->msg_id_base = vl_msg_api_get_msg_ids
-    ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-  /* Hook up message handlers */
-  error = flowperpkt_plugin_api_hookup (vm);
-
-  /* Add our API messages to the global name_crc hash table */
-  setup_message_id_table (fm, &api_main);
-
-  vec_free (name);
-
-  /* Decide how many worker threads we have */
-  num_threads = 1 /* main thread */  + tm->n_eal_threads;
-
-  /* Allocate per worker thread vectors */
-  vec_validate (fm->ipv4_buffers_per_worker, num_threads - 1);
-  vec_validate (fm->l2_buffers_per_worker, num_threads - 1);
-  vec_validate (fm->ipv4_frames_per_worker, num_threads - 1);
-  vec_validate (fm->l2_frames_per_worker, num_threads - 1);
-  vec_validate (fm->ipv4_next_record_offset_per_worker, num_threads - 1);
-  vec_validate (fm->l2_next_record_offset_per_worker, num_threads - 1);
-
-  /* Set up time reference pair */
-  fm->vlib_time_0 = vlib_time_now (vm);
-  fm->nanosecond_time_0 = unix_time_now_nsec ();
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (flowperpkt_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.h b/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.h
deleted file mode 100644
index 20f6939d..00000000
--- a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * flowperpkt.h - skeleton vpp engine plug-in header file
- *
- * Copyright (c) <current-year> <your-organization>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_flowperpkt_h__
-#define __included_flowperpkt_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vnet/flow/flow_report.h>
-#include <vnet/flow/flow_report_classify.h>
-
-/**
- * @file
- * @brief flow-per-packet plugin header file
- */
-typedef struct
-{
-  /** API message ID base */
-  u16 msg_id_base;
-
-  /** Have the reports [templates] been created? */
-  int ipv4_report_created;
-  int l2_report_created;
-
-  /** stream/template IDs */
-  u16 ipv4_report_id;
-  u16 l2_report_id;
-
-  /** ipfix buffers under construction, per-worker thread */
-  vlib_buffer_t **ipv4_buffers_per_worker;
-  vlib_buffer_t **l2_buffers_per_worker;
-
-  /** frames containing ipfix buffers, per-worker thread */
-  vlib_frame_t **ipv4_frames_per_worker;
-  vlib_frame_t **l2_frames_per_worker;
-
-  /** next record offset, per worker thread */
-  u16 *ipv4_next_record_offset_per_worker;
-  u16 *l2_next_record_offset_per_worker;
-
-  /** Time reference pair */
-  u64 nanosecond_time_0;
-  f64 vlib_time_0;
-
-  /** convenience vlib_main_t pointer */
-  vlib_main_t *vlib_main;
-  /** convenience vnet_main_t pointer */
-  vnet_main_t *vnet_main;
-} flowperpkt_main_t;
-
-typedef enum
-{
-  FLOW_VARIANT_IPV4,
-  FLOW_VARIANT_L2,
-  FLOW_N_VARIANTS,
-} flowperpkt_variant_t;
-
-extern flowperpkt_main_t flowperpkt_main;
-
-extern vlib_node_registration_t flowperpkt_ipv4_node;
-
-void flowperpkt_flush_callback_ipv4 (void);
-void flowperpkt_flush_callback_l2 (void);
-
-#endif /* __included_flowperpkt_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_all_api_h.h b/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_all_api_h.h
deleted file mode 100644
index 329c375a..00000000
--- a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_all_api_h.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * flowperpkt_all_api_h.h - plug-in api #include file
- *
- * Copyright (c) <current-year> <your-organization>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Include the generated file, see BUILT_SOURCES in Makefile.am */
-#include <flowperpkt/flowperpkt.api.h>
diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_msg_enum.h b/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_msg_enum.h
deleted file mode 100644
index 3177e77a..00000000
--- a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_msg_enum.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * flowperpkt_msg_enum.h - vpp engine plug-in message enumeration
- *
- * Copyright (c) <current-year> <your-organization>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_flowperpkt_msg_enum_h
-#define included_flowperpkt_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum
-{
-#include <flowperpkt/flowperpkt_all_api_h.h>
-  /* We'll want to know how many messages IDs we need... */
-  VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* included_flowperpkt_msg_enum_h */
diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_test.c b/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_test.c
deleted file mode 100644
index 716818ff..00000000
--- a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_test.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * flowperpkt.c - skeleton vpp-api-test plug-in
- *
- * Copyright (c) <current-year> <your-organization>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vat/vat.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-#include <vppinfra/error.h>
-
-/**
- * @file vpp_api_test plugin
- */
-
-uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
-
-/* Declare message IDs */
-#include <flowperpkt/flowperpkt_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <flowperpkt/flowperpkt_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun		/* define message structures */
-#include <flowperpkt/flowperpkt_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <flowperpkt/flowperpkt_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number. */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <flowperpkt/flowperpkt_all_api_h.h>
-#undef vl_api_version
-
-typedef struct
-{
-    /** API message ID base */
-  u16 msg_id_base;
-    /** vat_main_t pointer */
-  vat_main_t *vat_main;
-} flowperpkt_test_main_t;
-
-flowperpkt_test_main_t flowperpkt_test_main;
-
-#define foreach_standard_reply_retval_handler   \
-_(flowperpkt_tx_interface_add_del_reply)
-
-#define _(n)                                            \
-    static void vl_api_##n##_t_handler                  \
-    (vl_api_##n##_t * mp)                               \
-    {                                                   \
-        vat_main_t * vam = flowperpkt_test_main.vat_main;   \
-        i32 retval = ntohl(mp->retval);                 \
-        if (vam->async_mode) {                          \
-            vam->async_errors += (retval < 0);          \
-        } else {                                        \
-            vam->retval = retval;                       \
-            vam->result_ready = 1;                      \
-        }                                               \
-    }
-foreach_standard_reply_retval_handler;
-#undef _
-
-/*
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg               \
-_(FLOWPERPKT_TX_INTERFACE_ADD_DEL_REPLY,        \
-  flowperpkt_tx_interface_add_del_reply)
-
-
-/* M: construct, but don't yet send a message */
-
-#define M(T,t)                                                  \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp));                         \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-#define M2(T,t,n)                                               \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W                                       \
-do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
-                                                \
-    while (vat_time_now (vam) < timeout) {      \
-        if (vam->result_ready == 1) {           \
-            return (vam->retval);               \
-        }                                       \
-    }                                           \
-    return -99;                                 \
-} while(0);
-
-static int
-api_flowperpkt_tx_interface_add_del (vat_main_t * vam)
-{
-  flowperpkt_test_main_t *sm = &flowperpkt_test_main;
-  unformat_input_t *i = vam->input;
-  f64 timeout;
-  int enable_disable = 1;
-  u8 which = 0;			/* ipv4 by default */
-  u32 sw_if_index = ~0;
-  vl_api_flowperpkt_tx_interface_add_del_t *mp;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
-	;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	;
-      else if (unformat (i, "disable"))
-	enable_disable = 0;
-      else if (unformat (i, "l2"))
-	which = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    {
-      errmsg ("missing interface name / explicit sw_if_index number \n");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (FLOWPERPKT_TX_INTERFACE_ADD_DEL, flowperpkt_tx_interface_add_del);
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->is_add = enable_disable;
-  mp->which = which;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-}
-
-/*
- * List of messages that the api test plugin sends,
- * and that the data plane plugin processes
- */
-#define foreach_vpe_api_msg \
-_(flowperpkt_tx_interface_add_del, "<intfc> [disable]")
-
-void
-vat_api_hookup (vat_main_t * vam)
-{
-  flowperpkt_test_main_t *sm = &flowperpkt_test_main;
-  /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,                                  \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_reply_msg;
-#undef _
-
-  /* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
-  foreach_vpe_api_msg;
-#undef _
-
-  /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
-  foreach_vpe_api_msg;
-#undef _
-}
-
-clib_error_t *
-vat_plugin_register (vat_main_t * vam)
-{
-  flowperpkt_test_main_t *sm = &flowperpkt_test_main;
-  u8 *name;
-
-  sm->vat_main = vam;
-
-  /* Ask the vpp engine for the first assigned message-id */
-  name = format (0, "flowperpkt_%08x%c", api_version, 0);
-  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  /* Don't attempt to hook up API messages if the data plane plugin is AWOL */
-  if (sm->msg_id_base != (u16) ~ 0)
-    vat_api_hookup (vam);
-
-  vec_free (name);
-
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/flowperpkt-plugin/flowperpkt/l2_node.c b/plugins/flowperpkt-plugin/flowperpkt/l2_node.c
deleted file mode 100644
index 1c2f681e..00000000
--- a/plugins/flowperpkt-plugin/flowperpkt/l2_node.c
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
- * l2_node.c - l2 ipfix-per-packet graph node
- *
- * Copyright (c) <current-year> <your-organization>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-#include <flowperpkt/flowperpkt.h>
-
-/**
- * @file l2 flow record generator graph node
- */
-
-typedef struct
-{
-  /** interface handle */
-  u32 rx_sw_if_index;
-  u32 tx_sw_if_index;
-  /** src and dst L2 addresses */
-  u8 src_mac[6];
-  u8 dst_mac[6];
-  /** Ethertype */
-  u16 ethertype;
-  /** packet timestamp */
-  u64 timestamp;
-  /** size of the buffer */
-  u16 buffer_size;
-} flowperpkt_l2_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_flowperpkt_l2_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  flowperpkt_l2_trace_t *t = va_arg (*args, flowperpkt_l2_trace_t *);
-
-  s = format (s,
-	      "FLOWPERPKT-L2: rx_sw_if_index %d, tx_sw_if_index %d, src %U dst %U ethertype %0x2, timestamp %lld, size %d",
-	      t->rx_sw_if_index, t->tx_sw_if_index,
-	      format_ethernet_address, &t->src_mac,
-	      format_ethernet_address, &t->dst_mac,
-	      t->ethertype, t->timestamp, t->buffer_size);
-  return s;
-}
-
-vlib_node_registration_t flowperpkt_l2_node;
-
-/* No counters at the moment */
-#define foreach_flowperpkt_l2_error
-
-typedef enum
-{
-#define _(sym,str) FLOWPERPKT_ERROR_##sym,
-  foreach_flowperpkt_l2_error
-#undef _
-    FLOWPERPKT_N_ERROR,
-} flowperpkt_l2_error_t;
-
-static char *flowperpkt_l2_error_strings[] = {
-#define _(sym,string) string,
-  foreach_flowperpkt_l2_error
-#undef _
-};
-
-typedef enum
-{
-  FLOWPERPKT_L2_NEXT_DROP,
-  FLOWPERPKT_L2_NEXT_IP4_LOOKUP,
-  FLOWPERPKT_L2_N_NEXT,
-} flowperpkt_l2_next_t;
-
-/**
- * @brief add an entry to the flow record under construction
- * @param vm vlib_main_t * current worker thread main structure pointer
- * @param fm flowperpkt_main_t * flow-per-packet main structure pointer
- * @param sw_if_index u32 interface handle
- * @param tos u8 ToS bits from the packet
- * @param timestamp u64 timestamp, nanoseconds since 1/1/70
- * @param length u16 ip length of the packet
- * @param do_flush int 1 = flush all cached records, 0 = construct a record
- */
-
-static inline void
-add_to_flow_record_l2 (vlib_main_t * vm,
-		       vlib_node_runtime_t * node,
-		       flowperpkt_main_t * fm,
-		       u32 rx_sw_if_index, u32 tx_sw_if_index,
-		       u8 * src_mac, u8 * dst_mac,
-		       u16 ethertype, u64 timestamp, u16 length, int do_flush)
-{
-  u32 my_cpu_number = vm->cpu_index;
-  flow_report_main_t *frm = &flow_report_main;
-  ip4_header_t *ip;
-  udp_header_t *udp;
-  ip4_ipfix_template_packet_t *tp;
-  ipfix_message_header_t *h;
-  ipfix_set_header_t *s;
-  vlib_frame_t *f;
-  vlib_buffer_t *b0;
-  u16 offset;
-  u32 bi0;
-  vlib_buffer_free_list_t *fl;
-
-  /* Find or allocate a buffer */
-  b0 = fm->l2_buffers_per_worker[my_cpu_number];
-
-  /* Need to allocate a buffer? */
-  if (PREDICT_FALSE (b0 == 0))
-    {
-      /* Nothing to flush */
-      if (do_flush)
-	return;
-
-      /* $$$$ drop counter? */
-      if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
-	return;
-
-      /* Initialize the buffer */
-      b0 = fm->l2_buffers_per_worker[my_cpu_number] =
-	vlib_get_buffer (vm, bi0);
-      fl =
-	vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-      vlib_buffer_init_for_free_list (b0, fl);
-      VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
-      offset = 0;
-    }
-  else
-    {
-      /* use the current buffer */
-      bi0 = vlib_get_buffer_index (vm, b0);
-      offset = fm->l2_next_record_offset_per_worker[my_cpu_number];
-    }
-
-  /* Find or allocate a frame */
-  f = fm->l2_frames_per_worker[my_cpu_number];
-  if (PREDICT_FALSE (f == 0))
-    {
-      u32 *to_next;
-      f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
-      fm->l2_frames_per_worker[my_cpu_number] = f;
-
-      /* Enqueue the buffer */
-      to_next = vlib_frame_vector_args (f);
-      to_next[0] = bi0;
-      f->n_vectors = 1;
-    }
-
-  /* Fresh packet, construct header */
-  if (PREDICT_FALSE (offset == 0))
-    {
-      flow_report_stream_t *stream;
-
-      stream = &frm->streams[0];
-
-      b0->current_data = 0;
-      b0->current_length = sizeof (*ip) + sizeof (*udp) + sizeof (*h) +
-	sizeof (*s);
-      b0->flags |= (VLIB_BUFFER_TOTAL_LENGTH_VALID | VLIB_BUFFER_FLOW_REPORT);
-      vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] = frm->fib_index;
-
-      tp = vlib_buffer_get_current (b0);
-      ip = (ip4_header_t *) & tp->ip4;
-      udp = (udp_header_t *) (ip + 1);
-      h = (ipfix_message_header_t *) (udp + 1);
-      s = (ipfix_set_header_t *) (h + 1);
-
-      ip->ip_version_and_header_length = 0x45;
-      ip->ttl = 254;
-      ip->protocol = IP_PROTOCOL_UDP;
-      ip->flags_and_fragment_offset = 0;
-      ip->src_address.as_u32 = frm->src_address.as_u32;
-      ip->dst_address.as_u32 = frm->ipfix_collector.as_u32;
-      udp->src_port = clib_host_to_net_u16 (UDP_DST_PORT_ipfix);
-      udp->dst_port = clib_host_to_net_u16 (UDP_DST_PORT_ipfix);
-      udp->checksum = 0;
-
-      /* FIXUP: message header export_time */
-      h->export_time = (u32)
-	(((f64) frm->unix_time_0) +
-	 (vlib_time_now (frm->vlib_main) - frm->vlib_time_0));
-      h->export_time = clib_host_to_net_u32 (h->export_time);
-      h->domain_id = clib_host_to_net_u32 (stream->domain_id);
-
-      /* FIXUP: message header sequence_number */
-      h->sequence_number = stream->sequence_number++;
-      h->sequence_number = clib_host_to_net_u32 (h->sequence_number);
-
-      offset = (u32) (((u8 *) (s + 1)) - (u8 *) tp);
-    }
-
-  /* Add data, unless we're flushing stale data */
-  if (PREDICT_TRUE (do_flush == 0))
-    {
-
-      /* Add data */
-      /* Ingress interface */
-      {
-	u32 ingress_interface = clib_host_to_net_u32 (rx_sw_if_index);
-	clib_memcpy (b0->data + offset, &ingress_interface,
-		     sizeof (ingress_interface));
-	offset += sizeof (ingress_interface);
-      }
-      /* Egress interface */
-      {
-	u32 egress_interface = clib_host_to_net_u32 (tx_sw_if_index);
-	clib_memcpy (b0->data + offset, &egress_interface,
-		     sizeof (egress_interface));
-	offset += sizeof (egress_interface);
-      }
-      /* src mac address */
-      {
-	clib_memcpy (b0->data + offset, src_mac, 6);
-	offset += 6;
-      }
-      /* dst mac address */
-      {
-	clib_memcpy (b0->data + offset, dst_mac, 6);
-	offset += 6;
-      }
-
-      /* ethertype */
-      b0->data[offset++] = ethertype >> 8;
-      b0->data[offset++] = ethertype & 0xFF;
-
-      /* Timestamp */
-      clib_memcpy (b0->data + offset, &timestamp, sizeof (f64));
-      offset += sizeof (f64);
-
-      /* pkt size */
-      {
-	u16 pkt_size = clib_host_to_net_u16 (length);
-	clib_memcpy (b0->data + offset, &pkt_size, sizeof (pkt_size));
-	offset += sizeof (pkt_size);
-      }
-
-      b0->current_length +=
-	/* 2*sw_if_index + 2*mac + ethertype + timestamp + length = 32 */
-	2 * sizeof (u32) + 12 + sizeof (u16) + sizeof (f64) + sizeof (u16);
-
-    }
-  /* Time to flush the buffer? */
-  if (PREDICT_FALSE
-      (do_flush || (offset + 2 * sizeof (u32) + 12 + sizeof (u16) +
-		    +sizeof (f64) + sizeof (u16)) > frm->path_mtu))
-    {
-      tp = vlib_buffer_get_current (b0);
-      ip = (ip4_header_t *) & tp->ip4;
-      udp = (udp_header_t *) (ip + 1);
-      h = (ipfix_message_header_t *) (udp + 1);
-      s = (ipfix_set_header_t *) (h + 1);
-
-      s->set_id_length = ipfix_set_id_length (fm->l2_report_id,
-					      b0->current_length -
-					      (sizeof (*ip) + sizeof (*udp) +
-					       sizeof (*h)));
-      h->version_length = version_length (b0->current_length -
-					  (sizeof (*ip) + sizeof (*udp)));
-
-      ip->length = clib_host_to_net_u16 (b0->current_length);
-
-      ip->checksum = ip4_header_checksum (ip);
-      udp->length = clib_host_to_net_u16 (b0->current_length - sizeof (*ip));
-
-      if (frm->udp_checksum)
-	{
-	  /* RFC 7011 section 10.3.2. */
-	  udp->checksum = ip4_tcp_udp_compute_checksum (vm, b0, ip);
-	  if (udp->checksum == 0)
-	    udp->checksum = 0xffff;
-	}
-
-      ASSERT (ip->checksum == ip4_header_checksum (ip));
-
-      if (PREDICT_FALSE (vlib_get_trace_count (vm, node) > 0))
-	{
-	  vlib_trace_buffer (vm, node, FLOWPERPKT_L2_NEXT_IP4_LOOKUP, b0,
-			     0 /* follow chain */ );
-	  flowperpkt_l2_trace_t *t =
-	    vlib_add_trace (vm, node, b0, sizeof (*t));
-	  memset (t, 0, sizeof (*t));
-	  t->rx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  t->tx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	  t->buffer_size = b0->current_length;
-	}
-
-      vlib_put_frame_to_node (vm, ip4_lookup_node.index,
-			      fm->l2_frames_per_worker[my_cpu_number]);
-      fm->l2_frames_per_worker[my_cpu_number] = 0;
-      fm->l2_buffers_per_worker[my_cpu_number] = 0;
-      offset = 0;
-    }
-
-  fm->l2_next_record_offset_per_worker[my_cpu_number] = offset;
-}
-
-void
-flowperpkt_flush_callback_l2 (void)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  flowperpkt_main_t *fm = &flowperpkt_main;
-  vlib_node_runtime_t *node;
-  node = vlib_node_get_runtime (vm, flowperpkt_l2_node.index);
-
-  add_to_flow_record_l2 (vm, node, fm, 0 /* rx_sw_if_index */ ,
-			 0 /* tx_sw_if_index */ ,
-			 0 /* src mac */ ,
-			 0 /* dst mac */ ,
-			 0 /* ethertype */ ,
-			 0ULL /* timestamp */ ,
-			 0 /* length */ ,
-			 1 /* do_flush */ );
-}
-
-
-static uword
-flowperpkt_l2_node_fn (vlib_main_t * vm,
-		       vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  flowperpkt_l2_next_t next_index;
-  flowperpkt_main_t *fm = &flowperpkt_main;
-  u64 now;
-
-  now = (u64) ((vlib_time_now (vm) - fm->vlib_time_0) * 1e9);
-  now += fm->nanosecond_time_0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 next0 = FLOWPERPKT_L2_NEXT_DROP;
-	  u32 next1 = FLOWPERPKT_L2_NEXT_DROP;
-	  ethernet_header_t *eh0, *eh1;
-	  u16 len0, len1;
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX],
-			     &next0, b0);
-	  vnet_feature_next (vnet_buffer (b1)->sw_if_index[VLIB_TX],
-			     &next1, b1);
-
-	  eh0 = vlib_buffer_get_current (b0);
-	  len0 = vlib_buffer_length_in_chain (vm, b0);
-
-	  if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
-	    add_to_flow_record_l2 (vm, node, fm,
-				   vnet_buffer (b0)->sw_if_index[VLIB_RX],
-				   vnet_buffer (b0)->sw_if_index[VLIB_TX],
-				   eh0->src_address,
-				   eh0->dst_address,
-				   eh0->type, now, len0, 0 /* flush */ );
-
-	  eh1 = vlib_buffer_get_current (b0);
-	  len1 = vlib_buffer_length_in_chain (vm, b0);
-
-	  if (PREDICT_TRUE ((b1->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
-	    add_to_flow_record_l2 (vm, node, fm,
-				   vnet_buffer (b1)->sw_if_index[VLIB_RX],
-				   vnet_buffer (b1)->sw_if_index[VLIB_TX],
-				   eh1->src_address,
-				   eh1->dst_address,
-				   eh1->type, now, len1, 0 /* flush */ );
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  flowperpkt_l2_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->rx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-		  t->tx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-		  clib_memcpy (t->src_mac, eh0->src_address, 6);
-		  clib_memcpy (t->dst_mac, eh0->dst_address, 6);
-		  t->ethertype = clib_net_to_host_u16 (eh0->type);
-		  t->timestamp = now;
-		  t->buffer_size = len0;
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  flowperpkt_l2_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  t->rx_sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-		  t->tx_sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_TX];
-		  clib_memcpy (t->src_mac, eh1->src_address, 6);
-		  clib_memcpy (t->dst_mac, eh1->dst_address, 6);
-		  t->ethertype = clib_net_to_host_u16 (eh1->type);
-		  t->timestamp = now;
-		  t->buffer_size = len1;
-		}
-	    }
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0 = FLOWPERPKT_L2_NEXT_DROP;
-	  ethernet_header_t *eh0;
-	  u16 len0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX],
-			     &next0, b0);
-
-	  eh0 = vlib_buffer_get_current (b0);
-	  len0 = vlib_buffer_length_in_chain (vm, b0);
-
-	  if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
-	    add_to_flow_record_l2 (vm, node, fm,
-				   vnet_buffer (b0)->sw_if_index[VLIB_RX],
-				   vnet_buffer (b0)->sw_if_index[VLIB_TX],
-				   eh0->src_address,
-				   eh0->dst_address,
-				   eh0->type, now, len0, 0 /* flush */ );
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      flowperpkt_l2_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->rx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	      t->tx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	      clib_memcpy (t->src_mac, eh0->src_address, 6);
-	      clib_memcpy (t->dst_mac, eh0->dst_address, 6);
-	      t->ethertype = clib_net_to_host_u16 (eh0->type);
-	      t->timestamp = now;
-	      t->buffer_size = len0;
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return frame->n_vectors;
-}
-
-/**
- * @brief IPFIX l2 flow-per-packet graph node
- * @node flowperpkt-l2
- *
- * This is the IPFIX flow-record-per-packet node.
- *
- * @param vm    vlib_main_t corresponding to the current thread.
- * @param node  vlib_node_runtime_t data for this node.
- * @param frame vlib_frame_t whose contents should be dispatched.
- *
- * @par Graph mechanics: buffer metadata, next index usage
- *
- * <em>Uses:</em>
- * - <code>vnet_buffer(b)->ip.save_rewrite_length</code>
- *     - tells the node the length of the rewrite which was applied in
- *       ip4/6_rewrite_inline, allows the code to find the IP header without
- *       having to parse L2 headers, or make stupid assumptions about their
- *       length.
- * - <code>vnet_buffer(b)->flags & VLIB_BUFFER_FLOW_REPORT</code>
- *     - Used to suppress flow record generation for flow record packets.
- *
- * <em>Sets:</em>
- * - <code>vnet_buffer(b)->flags & VLIB_BUFFER_FLOW_REPORT</code>
- *     - To suppress flow record generation for flow record packets
- *
- * <em>Next Index:</em>
- * - Next configured output feature on the interface, usually
- *   "interface-output." Generated flow records head for ip4-lookup
- */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (flowperpkt_l2_node) = {
-  .function = flowperpkt_l2_node_fn,
-  .name = "flowperpkt-l2",
-  .vector_size = sizeof (u32),
-  .format_trace = format_flowperpkt_l2_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(flowperpkt_l2_error_strings),
-  .error_strings = flowperpkt_l2_error_strings,
-
-  .n_next_nodes = FLOWPERPKT_L2_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [FLOWPERPKT_L2_NEXT_DROP] = "error-drop",
-    [FLOWPERPKT_L2_NEXT_IP4_LOOKUP] = "ip4-lookup",
-  },
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/flowperpkt-plugin/flowperpkt/node.c b/plugins/flowperpkt-plugin/flowperpkt/node.c
deleted file mode 100644
index f77f087d..00000000
--- a/plugins/flowperpkt-plugin/flowperpkt/node.c
+++ /dev/null
@@ -1,574 +0,0 @@
-/*
- * node.c - ipv4 ipfix-per-packet graph node
- *
- * Copyright (c) <current-year> <your-organization>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-#include <flowperpkt/flowperpkt.h>
-
-/**
- * @file ipv4 flow record generator graph node
- */
-
-typedef struct
-{
-  /** interface handle */
-  u32 rx_sw_if_index;
-  u32 tx_sw_if_index;
-  u32 src_address;
-  u32 dst_address;
-  /** ToS bits */
-  u8 tos;
-  /** packet timestamp */
-  u64 timestamp;
-  /** size of the buffer */
-  u16 buffer_size;
-} flowperpkt_ipv4_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_flowperpkt_ipv4_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  flowperpkt_ipv4_trace_t *t = va_arg (*args, flowperpkt_ipv4_trace_t *);
-
-  s = format (s,
-	      "FLOWPERPKT-V4: rx_sw_if_index %d, tx_sw_if_index %d, src %U dst %U tos %0x2, timestamp %lld, size %d",
-	      t->rx_sw_if_index, t->tx_sw_if_index,
-	      format_ip4_address, &t->src_address,
-	      format_ip4_address, &t->dst_address,
-	      t->tos, t->timestamp, t->buffer_size);
-  return s;
-}
-
-vlib_node_registration_t flowperpkt_ipv4_node;
-
-/* No counters at the moment */
-#define foreach_flowperpkt_ipv4_error
-
-typedef enum
-{
-#define _(sym,str) FLOWPERPKT_ERROR_##sym,
-  foreach_flowperpkt_ipv4_error
-#undef _
-    FLOWPERPKT_N_ERROR,
-} flowperpkt_ipv4_error_t;
-
-static char *flowperpkt_ipv4_error_strings[] = {
-#define _(sym,string) string,
-  foreach_flowperpkt_ipv4_error
-#undef _
-};
-
-typedef enum
-{
-  FLOWPERPKT_IPV4_NEXT_DROP,
-  FLOWPERPKT_IPV4_NEXT_LOOKUP,
-  FLOWPERPKT_IPV4_N_NEXT,
-} flowperpkt_ipv4_next_t;
-
-/**
- * @brief add an entry to the flow record under construction
- * @param vm vlib_main_t * current worker thread main structure pointer
- * @param fm flowperpkt_main_t * flow-per-packet main structure pointer
- * @param sw_if_index u32 interface handle
- * @param tos u8 ToS bits from the packet
- * @param timestamp u64 timestamp, nanoseconds since 1/1/70
- * @param length u16 ip length of the packet
- * @param do_flush int 1 = flush all cached records, 0 = construct a record
- */
-
-static inline void
-add_to_flow_record_ipv4 (vlib_main_t * vm,
-			 vlib_node_runtime_t * node,
-			 flowperpkt_main_t * fm,
-			 u32 rx_sw_if_index, u32 tx_sw_if_index,
-			 u32 src_address, u32 dst_address,
-			 u8 tos, u64 timestamp, u16 length, int do_flush)
-{
-  u32 my_cpu_number = vm->cpu_index;
-  flow_report_main_t *frm = &flow_report_main;
-  ip4_header_t *ip;
-  udp_header_t *udp;
-  ip4_ipfix_template_packet_t *tp;
-  ipfix_message_header_t *h;
-  ipfix_set_header_t *s;
-  vlib_frame_t *f;
-  vlib_buffer_t *b0;
-  u16 offset;
-  u32 bi0;
-  vlib_buffer_free_list_t *fl;
-
-  /* Find or allocate a buffer */
-  b0 = fm->ipv4_buffers_per_worker[my_cpu_number];
-
-  /* Need to allocate a buffer? */
-  if (PREDICT_FALSE (b0 == 0))
-    {
-      /* Nothing to flush */
-      if (do_flush)
-	return;
-
-      /* $$$$ drop counter? */
-      if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
-	return;
-
-      /* Initialize the buffer */
-      b0 = fm->ipv4_buffers_per_worker[my_cpu_number] =
-	vlib_get_buffer (vm, bi0);
-      fl =
-	vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-      vlib_buffer_init_for_free_list (b0, fl);
-      VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
-      offset = 0;
-    }
-  else
-    {
-      /* use the current buffer */
-      bi0 = vlib_get_buffer_index (vm, b0);
-      offset = fm->ipv4_next_record_offset_per_worker[my_cpu_number];
-    }
-
-  /* Find or allocate a frame */
-  f = fm->ipv4_frames_per_worker[my_cpu_number];
-  if (PREDICT_FALSE (f == 0))
-    {
-      u32 *to_next;
-      f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
-      fm->ipv4_frames_per_worker[my_cpu_number] = f;
-
-      /* Enqueue the buffer */
-      to_next = vlib_frame_vector_args (f);
-      to_next[0] = bi0;
-      f->n_vectors = 1;
-    }
-
-  /* Fresh packet, construct header */
-  if (PREDICT_FALSE (offset == 0))
-    {
-      flow_report_stream_t *stream;
-
-      stream = &frm->streams[0];
-
-      b0->current_data = 0;
-      b0->current_length = sizeof (*ip) + sizeof (*udp) + sizeof (*h) +
-	sizeof (*s);
-      b0->flags |= (VLIB_BUFFER_TOTAL_LENGTH_VALID | VLIB_BUFFER_FLOW_REPORT);
-      vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] = frm->fib_index;
-
-      tp = vlib_buffer_get_current (b0);
-      ip = (ip4_header_t *) & tp->ip4;
-      udp = (udp_header_t *) (ip + 1);
-      h = (ipfix_message_header_t *) (udp + 1);
-      s = (ipfix_set_header_t *) (h + 1);
-
-      ip->ip_version_and_header_length = 0x45;
-      ip->ttl = 254;
-      ip->protocol = IP_PROTOCOL_UDP;
-      ip->flags_and_fragment_offset = 0;
-      ip->src_address.as_u32 = frm->src_address.as_u32;
-      ip->dst_address.as_u32 = frm->ipfix_collector.as_u32;
-      udp->src_port = clib_host_to_net_u16 (UDP_DST_PORT_ipfix);
-      udp->dst_port = clib_host_to_net_u16 (UDP_DST_PORT_ipfix);
-      udp->checksum = 0;
-
-      /* FIXUP: message header export_time */
-      h->export_time = (u32)
-	(((f64) frm->unix_time_0) +
-	 (vlib_time_now (frm->vlib_main) - frm->vlib_time_0));
-      h->export_time = clib_host_to_net_u32 (h->export_time);
-      h->domain_id = clib_host_to_net_u32 (stream->domain_id);
-
-      /* FIXUP: message header sequence_number */
-      h->sequence_number = stream->sequence_number++;
-      h->sequence_number = clib_host_to_net_u32 (h->sequence_number);
-
-      offset = (u32) (((u8 *) (s + 1)) - (u8 *) tp);
-    }
-
-  /* Add data, unless we're flushing stale data */
-  if (PREDICT_TRUE (do_flush == 0))
-    {
-
-      /* Add data */
-      /* Ingress interface */
-      {
-	u32 ingress_interface = clib_host_to_net_u32 (rx_sw_if_index);
-	clib_memcpy (b0->data + offset, &ingress_interface,
-		     sizeof (ingress_interface));
-	offset += sizeof (ingress_interface);
-      }
-      /* Egress interface */
-      {
-	u32 egress_interface = clib_host_to_net_u32 (tx_sw_if_index);
-	clib_memcpy (b0->data + offset, &egress_interface,
-		     sizeof (egress_interface));
-	offset += sizeof (egress_interface);
-      }
-      /* ip4 src address */
-      {
-	clib_memcpy (b0->data + offset, &src_address, sizeof (src_address));
-	offset += sizeof (src_address);
-      }
-      /* ip4 dst address */
-      {
-	clib_memcpy (b0->data + offset, &dst_address, sizeof (dst_address));
-	offset += sizeof (dst_address);
-      }
-
-      /* ToS */
-      b0->data[offset++] = tos;
-
-      /* Timestamp */
-      clib_memcpy (b0->data + offset, &timestamp, sizeof (f64));
-      offset += sizeof (f64);
-
-      /* pkt size */
-      {
-	u16 pkt_size = clib_host_to_net_u16 (length);
-	clib_memcpy (b0->data + offset, &pkt_size, sizeof (pkt_size));
-	offset += sizeof (pkt_size);
-      }
-
-      b0->current_length +=
-	/* sw_if_index + tos + timestamp + length = 15 */
-	4 * sizeof (u32) + sizeof (u8) + sizeof (f64) + sizeof (u16);
-
-    }
-  /* Time to flush the buffer? */
-  if (PREDICT_FALSE
-      (do_flush || (offset + 4 * sizeof (u32) + sizeof (u8)
-		    + sizeof (f64) + sizeof (u16)) > frm->path_mtu))
-    {
-      tp = vlib_buffer_get_current (b0);
-      ip = (ip4_header_t *) & tp->ip4;
-      udp = (udp_header_t *) (ip + 1);
-      h = (ipfix_message_header_t *) (udp + 1);
-      s = (ipfix_set_header_t *) (h + 1);
-
-      s->set_id_length = ipfix_set_id_length (fm->ipv4_report_id,
-					      b0->current_length -
-					      (sizeof (*ip) + sizeof (*udp) +
-					       sizeof (*h)));
-      h->version_length = version_length (b0->current_length -
-					  (sizeof (*ip) + sizeof (*udp)));
-
-      ip->length = clib_host_to_net_u16 (b0->current_length);
-
-      ip->checksum = ip4_header_checksum (ip);
-      udp->length = clib_host_to_net_u16 (b0->current_length - sizeof (*ip));
-
-      if (frm->udp_checksum)
-	{
-	  /* RFC 7011 section 10.3.2. */
-	  udp->checksum = ip4_tcp_udp_compute_checksum (vm, b0, ip);
-	  if (udp->checksum == 0)
-	    udp->checksum = 0xffff;
-	}
-
-      ASSERT (ip->checksum == ip4_header_checksum (ip));
-
-      if (PREDICT_FALSE (vlib_get_trace_count (vm, node) > 0))
-	{
-	  vlib_trace_buffer (vm, node, FLOWPERPKT_IPV4_NEXT_LOOKUP, b0,
-			     0 /* follow chain */ );
-	  flowperpkt_ipv4_trace_t *t =
-	    vlib_add_trace (vm, node, b0, sizeof (*t));
-	  t->rx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  t->tx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	  t->src_address = 0;
-	  t->dst_address = 0;
-	  t->tos = 0;
-	  t->timestamp = 0;
-	  t->buffer_size = b0->current_length;
-	}
-
-      vlib_put_frame_to_node (vm, ip4_lookup_node.index,
-			      fm->ipv4_frames_per_worker[my_cpu_number]);
-      fm->ipv4_frames_per_worker[my_cpu_number] = 0;
-      fm->ipv4_buffers_per_worker[my_cpu_number] = 0;
-      offset = 0;
-    }
-
-  fm->ipv4_next_record_offset_per_worker[my_cpu_number] = offset;
-}
-
-void
-flowperpkt_flush_callback_ipv4 (void)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  flowperpkt_main_t *fm = &flowperpkt_main;
-  vlib_node_runtime_t *node;
-  node = vlib_node_get_runtime (vm, flowperpkt_ipv4_node.index);
-
-  add_to_flow_record_ipv4 (vm, node, fm, 0 /* rx_sw_if_index */ ,
-			   0 /* tx_sw_if_index */ ,
-			   0 /* src_address */ ,
-			   0 /* dst_address */ ,
-			   0 /* ToS */ ,
-			   0ULL /* timestamp */ ,
-			   0 /* length */ ,
-			   1 /* do_flush */ );
-}
-
-
-static uword
-flowperpkt_ipv4_node_fn (vlib_main_t * vm,
-			 vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  flowperpkt_ipv4_next_t next_index;
-  flowperpkt_main_t *fm = &flowperpkt_main;
-  u64 now;
-
-  now = (u64) ((vlib_time_now (vm) - fm->vlib_time_0) * 1e9);
-  now += fm->nanosecond_time_0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 next0 = FLOWPERPKT_IPV4_NEXT_DROP;
-	  u32 next1 = FLOWPERPKT_IPV4_NEXT_DROP;
-	  ip4_header_t *ip0, *ip1;
-	  u16 len0, len1;
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX],
-			     &next0, b0);
-	  vnet_feature_next (vnet_buffer (b1)->sw_if_index[VLIB_TX],
-			     &next1, b1);
-
-	  ip0 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b0) +
-				  vnet_buffer (b0)->ip.save_rewrite_length);
-
-	  len0 = vlib_buffer_length_in_chain (vm, b0);
-
-	  if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
-	    add_to_flow_record_ipv4 (vm, node, fm,
-				     vnet_buffer (b0)->sw_if_index[VLIB_RX],
-				     vnet_buffer (b0)->sw_if_index[VLIB_TX],
-				     ip0->src_address.as_u32,
-				     ip0->dst_address.as_u32,
-				     ip0->tos, now, len0, 0 /* flush */ );
-
-	  ip1 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b1) +
-				  vnet_buffer (b1)->ip.save_rewrite_length);
-	  len1 = vlib_buffer_length_in_chain (vm, b1);
-
-	  if (PREDICT_TRUE ((b1->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
-	    add_to_flow_record_ipv4 (vm, node, fm,
-				     vnet_buffer (b1)->sw_if_index[VLIB_RX],
-				     vnet_buffer (b1)->sw_if_index[VLIB_TX],
-				     ip1->src_address.as_u32,
-				     ip1->dst_address.as_u32,
-				     ip1->tos, now, len1, 0 /* flush */ );
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  flowperpkt_ipv4_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->rx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-		  t->tx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-		  t->src_address = ip0->src_address.as_u32;
-		  t->dst_address = ip0->dst_address.as_u32;
-		  t->tos = ip0->tos;
-		  t->timestamp = now;
-		  t->buffer_size = len0;
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  flowperpkt_ipv4_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  t->rx_sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-		  t->tx_sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_TX];
-		  t->src_address = ip1->src_address.as_u32;
-		  t->dst_address = ip1->dst_address.as_u32;
-		  t->tos = ip1->tos;
-		  t->timestamp = now;
-		  t->buffer_size = len1;
-		}
-	    }
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0 = FLOWPERPKT_IPV4_NEXT_DROP;
-	  ip4_header_t *ip0;
-	  u16 len0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX],
-			     &next0, b0);
-
-	  ip0 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b0) +
-				  vnet_buffer (b0)->ip.save_rewrite_length);
-	  /*
-	   * egressInterface, TLV type 14, u32
-	   * ipClassOfService, TLV type 5, u8
-	   * flowStartNanoseconds, TLV type 156, dateTimeNanoseconds (f64)
-	   *   Implementation: f64 nanoseconds since VPP started
-	   * dataLinkFrameSize, TLV type 312, u16
-	   */
-	  len0 = vlib_buffer_length_in_chain (vm, b0);
-
-	  if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
-	    add_to_flow_record_ipv4 (vm, node, fm,
-				     vnet_buffer (b0)->sw_if_index[VLIB_RX],
-				     vnet_buffer (b0)->sw_if_index[VLIB_TX],
-				     ip0->src_address.as_u32,
-				     ip0->dst_address.as_u32,
-				     ip0->tos, now, len0, 0 /* flush */ );
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      flowperpkt_ipv4_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->rx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	      t->tx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	      t->src_address = ip0->src_address.as_u32;
-	      t->dst_address = ip0->dst_address.as_u32;
-	      t->tos = ip0->tos;
-	      t->timestamp = now;
-	      t->buffer_size = len0;
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return frame->n_vectors;
-}
-
-/**
- * @brief IPFIX ipv4 flow-per-packet graph node
- * @node flowperpkt-ipv4
- *
- * This is the IPFIX flow-record-per-packet node.
- *
- * @param vm    vlib_main_t corresponding to the current thread.
- * @param node  vlib_node_runtime_t data for this node.
- * @param frame vlib_frame_t whose contents should be dispatched.
- *
- * @par Graph mechanics: buffer metadata, next index usage
- *
- * <em>Uses:</em>
- * - <code>vnet_buffer(b)->ip.save_rewrite_length</code>
- *     - tells the node the length of the rewrite which was applied in
- *       ip4/6_rewrite_inline, allows the code to find the IP header without
- *       having to parse L2 headers, or make stupid assumptions about their
- *       length.
- * - <code>vnet_buffer(b)->flags & VLIB_BUFFER_FLOW_REPORT</code>
- *     - Used to suppress flow record generation for flow record packets.
- *
- * <em>Sets:</em>
- * - <code>vnet_buffer(b)->flags & VLIB_BUFFER_FLOW_REPORT</code>
- *     - To suppress flow record generation for flow record packets
- *
- * <em>Next Index:</em>
- * - Next configured output feature on the interface, usually
- *   "interface-output." Generated flow records head for ip4-lookup
- */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (flowperpkt_ipv4_node) = {
-  .function = flowperpkt_ipv4_node_fn,
-  .name = "flowperpkt-ipv4",
-  .vector_size = sizeof (u32),
-  .format_trace = format_flowperpkt_ipv4_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(flowperpkt_ipv4_error_strings),
-  .error_strings = flowperpkt_ipv4_error_strings,
-
-  .n_next_nodes = FLOWPERPKT_IPV4_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [FLOWPERPKT_IPV4_NEXT_DROP] = "error-drop",
-    /* Used only to trace ipfix data packets */
-    [FLOWPERPKT_IPV4_NEXT_LOOKUP] = "ip4-lookup",
-  },
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/flowperpkt-plugin/flowperpkt_plugin_doc.md b/plugins/flowperpkt-plugin/flowperpkt_plugin_doc.md
deleted file mode 100644
index ed76c45c..00000000
--- a/plugins/flowperpkt-plugin/flowperpkt_plugin_doc.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Per-packet IPFIX flow record plugin    {#flowperpkt_plugin_doc}
-===================================
-
-## Introduction
-
-This plugin generates one ipfix record entry per packet transmitted
-on interfaces which have the feature enabled
-
-## Sample configuration
-
-set ipfix exporter collector 192.168.6.2 src 192.168.6.1 template-interval 20 port 4739 path-mtu 1500
-
-flowperpkt feature add-del GigabitEthernet2/3/0
diff --git a/plugins/ila-plugin/Makefile.am b/plugins/ila-plugin/Makefile.am
deleted file mode 100644
index fe785df9..00000000
--- a/plugins/ila-plugin/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2016 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall
-AM_LDFLAGS = -module -shared -avoid-version
-
-vpppluginsdir = ${libdir}/vpp_plugins
-
-vppplugins_LTLIBRARIES = ila_plugin.la
-
-ila_plugin_la_SOURCES = ila/ila.c
-
-noinst_HEADERS = ila/ila.h
-
-# Remove *.la files
-install-data-hook:
-	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
diff --git a/plugins/ila-plugin/configure.ac b/plugins/ila-plugin/configure.ac
deleted file mode 100644
index 56016b4d..00000000
--- a/plugins/ila-plugin/configure.ac
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(ila_plugin, 1.0)
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-AC_PREFIX_DEFAULT([/usr])
-
-AC_PROG_LIBTOOL
-AC_PROG_CC
-
-AC_OUTPUT([Makefile])
diff --git a/plugins/ila-plugin/ila/ila.c b/plugins/ila-plugin/ila/ila.c
deleted file mode 100644
index 336f4cf5..00000000
--- a/plugins/ila-plugin/ila/ila.c
+++ /dev/null
@@ -1,1070 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <ila/ila.h>
-#include <vnet/plugin/plugin.h>
-#include <vnet/ip/lookup.h>
-#include <vnet/dpo/dpo.h>
-#include <vnet/fib/fib_table.h>
-
-static ila_main_t ila_main;
-
-#define ILA_TABLE_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
-#define ILA_TABLE_DEFAULT_HASH_MEMORY_SIZE (32<<20)
-
-#define foreach_ila_error \
- _(NONE, "valid ILA packets")
-
-typedef enum {
-#define _(sym,str) ILA_ERROR_##sym,
-  foreach_ila_error
-#undef _
-    ILA_N_ERROR,
-} ila_error_t;
-
-static char *ila_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ila_error
-#undef _
-};
-
-typedef enum {
-  ILA_ILA2SIR_NEXT_DROP,
-  ILA_ILA2SIR_N_NEXT,
-} ila_ila2sir_next_t;
-
-typedef struct {
-  u32 ila_index;
-  ip6_address_t initial_dst;
-  u32 adj_index;
-} ila_ila2sir_trace_t;
-
-static ila_entry_t ila_sir2ila_default_entry = {
-  .csum_mode = ILA_CSUM_MODE_NO_ACTION,
-  .type = ILA_TYPE_IID,
-  .dir = ILA_DIR_ILA2SIR, //Will pass the packet with no
-};
-
-/**
- * @brief Dynamically registered DPO Type for ILA
- */
-static dpo_type_t ila_dpo_type;
-
-/**
- * @brief Dynamically registered FIB node type for ILA
- */
-static fib_node_type_t ila_fib_node_type;
-
-u8 *
-format_half_ip6_address (u8 * s, va_list * va)
-{
-  u64 v = clib_net_to_host_u64 (va_arg (*va, u64));
-
-  return format (s, "%04x:%04x:%04x:%04x",
-		 v >> 48, (v >> 32) & 0xffff, (v >> 16) & 0xffff, v & 0xffff);
-
-}
-
-u8 *
-format_ila_direction (u8 * s, va_list * args)
-{
-  ila_direction_t t = va_arg (*args, ila_direction_t);
-#define _(i,n,st) \
-  if (t == ILA_DIR_##i) \
-    return format(s, st);
-  ila_foreach_direction
-#undef _
-    return format (s, "invalid_ila_direction");
-}
-
-static u8 *
-format_csum_mode (u8 * s, va_list * va)
-{
-  ila_csum_mode_t csum_mode = va_arg (*va, ila_csum_mode_t);
-  char *txt;
-
-  switch (csum_mode)
-    {
-#define _(i,n,st) \
-  case ILA_CSUM_MODE_##i: \
-    txt = st; \
-    break;
-      ila_csum_foreach_type
-#undef _
-    default:
-      txt = "invalid_ila_csum_mode";
-      break;
-    }
-  return format (s, txt);
-}
-
-u8 *
-format_ila_type (u8 * s, va_list * args)
-{
-  ila_type_t t = va_arg (*args, ila_type_t);
-#define _(i,n,st) \
-  if (t == ILA_TYPE_##i) \
-    return format(s, st);
-  ila_foreach_type
-#undef _
-    return format (s, "invalid_ila_type");
-}
-
-static u8 *
-format_ila_entry (u8 * s, va_list * va)
-{
-  vnet_main_t *vnm = va_arg (*va, vnet_main_t *);
-  ila_entry_t *e = va_arg (*va, ila_entry_t *);
-
-  if (!e)
-    {
-      return format (s, "%-15s%=40s%=40s%+16s%+18s%+11s", "Type", "SIR Address",
-		     "ILA Address", "Checksum Mode", "Direction", "Next DPO");
-    }
-  else if (vnm)
-    {
-      if (ip6_address_is_zero(&e->next_hop))
-	{
-	  return format (s, "%-15U%=40U%=40U%18U%11U%s",
-			 format_ila_type, e->type,
-			 format_ip6_address, &e->sir_address,
-			 format_ip6_address, &e->ila_address,
-			 format_csum_mode, e->csum_mode,
-			 format_ila_direction, e->dir,
-			 "n/a");
-	}
-      else
-	{
-	  return format (s, "%-15U%=40U%=40U%18U%11U%U",
-			 format_ila_type, e->type,
-			 format_ip6_address, &e->sir_address,
-			 format_ip6_address, &e->ila_address,
-			 format_csum_mode, e->csum_mode,
-			 format_ila_direction, e->dir,
-			 format_dpo_id, &e->ila_dpo, 0);
-	}
-    }
-
-  return NULL;
-}
-
-u8 *
-format_ila_ila2sir_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ila_ila2sir_trace_t *t = va_arg (*args, ila_ila2sir_trace_t *);
-  return format (s,
-		 "ILA -> SIR adj index: %d entry index: %d initial_dst: %U",
-		 t->adj_index, t->ila_index, format_ip6_address,
-		 &t->initial_dst);
-}
-
-static uword
-unformat_ila_direction (unformat_input_t * input, va_list * args)
-{
-  ila_direction_t *result = va_arg (*args, ila_direction_t *);
-#define _(i,n,s) \
-  if (unformat(input, s)) \
-      { \
-        *result = ILA_DIR_##i; \
-        return 1;\
-      }
-
-  ila_foreach_direction
-#undef _
-    return 0;
-}
-
-static uword
-unformat_ila_type (unformat_input_t * input, va_list * args)
-{
-  ila_type_t *result = va_arg (*args, ila_type_t *);
-#define _(i,n,s) \
-  if (unformat(input, s)) \
-      { \
-        *result = ILA_TYPE_##i; \
-        return 1;\
-      }
-
-  ila_foreach_type
-#undef _
-    return 0;
-}
-
-static uword
-unformat_ila_csum_mode (unformat_input_t * input, va_list * args)
-{
-  ila_csum_mode_t *result = va_arg (*args, ila_csum_mode_t *);
-  if (unformat (input, "none") || unformat (input, "no-action"))
-    {
-      *result = ILA_CSUM_MODE_NO_ACTION;
-      return 1;
-    }
-  if (unformat (input, "neutral-map"))
-    {
-      *result = ILA_CSUM_MODE_NEUTRAL_MAP;
-      return 1;
-    }
-  if (unformat (input, "adjust-transport"))
-    {
-      *result = ILA_CSUM_MODE_ADJUST_TRANSPORT;
-      return 1;
-    }
-  return 0;
-}
-
-static uword
-unformat_half_ip6_address (unformat_input_t * input, va_list * args)
-{
-  u64 *result = va_arg (*args, u64 *);
-  u32 a[4];
-
-  if (!unformat (input, "%x:%x:%x:%x", &a[0], &a[1], &a[2], &a[3]))
-    return 0;
-
-  if (a[0] > 0xFFFF || a[1] > 0xFFFF || a[2] > 0xFFFF || a[3] > 0xFFFF)
-    return 0;
-
-  *result = clib_host_to_net_u64 ((((u64) a[0]) << 48) |
-				  (((u64) a[1]) << 32) |
-				  (((u64) a[2]) << 16) | (((u64) a[3])));
-
-  return 1;
-}
-
-static vlib_node_registration_t ila_ila2sir_node;
-
-static uword
-ila_ila2sir (vlib_main_t * vm,
-	     vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  ila_main_t *ilm = &ila_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 pi0, pi1;
-	  vlib_buffer_t *p0, *p1;
-	  ila_entry_t *ie0, *ie1;
-	  ip6_header_t *ip60, *ip61;
-	  ip6_address_t *sir_address0, *sir_address1;
-
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-	    CLIB_PREFETCH (p2->data, sizeof (ip6_header_t), LOAD);
-	    CLIB_PREFETCH (p3->data, sizeof (ip6_header_t), LOAD);
-	  }
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-	  ip60 = vlib_buffer_get_current (p0);
-	  ip61 = vlib_buffer_get_current (p1);
-	  sir_address0 = &ip60->dst_address;
-	  sir_address1 = &ip61->dst_address;
-	  ie0 = pool_elt_at_index (ilm->entries,
-				   vnet_buffer (p0)->ip.adj_index[VLIB_TX]);
-	  ie1 = pool_elt_at_index (ilm->entries,
-				   vnet_buffer (p1)->ip.adj_index[VLIB_TX]);
-
-	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ila_ila2sir_trace_t *tr =
-		vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->ila_index = ie0 - ilm->entries;
-	      tr->initial_dst = ip60->dst_address;
-	      tr->adj_index = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-	    }
-
-	  if (PREDICT_FALSE (p1->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ila_ila2sir_trace_t *tr =
-		vlib_add_trace (vm, node, p1, sizeof (*tr));
-	      tr->ila_index = ie1 - ilm->entries;
-	      tr->initial_dst = ip61->dst_address;
-	      tr->adj_index = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
-	    }
-
-	  sir_address0 = (ie0->dir != ILA_DIR_SIR2ILA) ? &ie0->sir_address : sir_address0;
-	  sir_address1 = (ie1->dir != ILA_DIR_SIR2ILA) ? &ie1->sir_address : sir_address1;
-	  ip60->dst_address.as_u64[0] = sir_address0->as_u64[0];
-	  ip60->dst_address.as_u64[1] = sir_address0->as_u64[1];
-	  ip61->dst_address.as_u64[0] = sir_address1->as_u64[0];
-	  ip61->dst_address.as_u64[1] = sir_address1->as_u64[1];
-
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = ie0->ila_dpo.dpoi_index;
-	  vnet_buffer (p1)->ip.adj_index[VLIB_TX] = ie1->ila_dpo.dpoi_index;
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
-					   n_left_to_next, pi0, pi1,
-					   ie0->ila_dpo.dpoi_next_node,
-					   ie1->ila_dpo.dpoi_next_node);
-	}
-
-      /* Single loop */
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  ila_entry_t *ie0;
-	  ip6_header_t *ip60;
-	  ip6_address_t *sir_address0;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip60 = vlib_buffer_get_current (p0);
-	  sir_address0 = &ip60->dst_address;
-	  ie0 = pool_elt_at_index (ilm->entries,
-				   vnet_buffer (p0)->ip.adj_index[VLIB_TX]);
-
-	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ila_ila2sir_trace_t *tr =
-		vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->ila_index = ie0 ? (ie0 - ilm->entries) : ~0;
-	      tr->initial_dst = ip60->dst_address;
-	      tr->adj_index = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-	    }
-
-	  sir_address0 = (ie0->dir != ILA_DIR_SIR2ILA) ? &ie0->sir_address : sir_address0;
-	  ip60->dst_address.as_u64[0] = sir_address0->as_u64[0];
-	  ip60->dst_address.as_u64[1] = sir_address0->as_u64[1];
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = ie0->ila_dpo.dpoi_index;
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, pi0,
-					   ie0->ila_dpo.dpoi_next_node);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/** *INDENT-OFF* */
-VLIB_REGISTER_NODE (ila_ila2sir_node, static) =
-{
-  .function = ila_ila2sir,
-  .name = "ila-to-sir",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ila_ila2sir_trace,
-  .n_errors = ILA_N_ERROR,
-  .error_strings = ila_error_strings,
-  .n_next_nodes = ILA_ILA2SIR_N_NEXT,
-  .next_nodes =
-  {
-      [ILA_ILA2SIR_NEXT_DROP] = "error-drop"
-  },
-};
-/** *INDENT-ON* */
-
-typedef enum
-{
-  ILA_SIR2ILA_NEXT_DROP,
-  ILA_SIR2ILA_N_NEXT,
-} ila_sir2ila_next_t;
-
-typedef struct
-{
-  u32 ila_index;
-  ip6_address_t initial_dst;
-} ila_sir2ila_trace_t;
-
-u8 *
-format_ila_sir2ila_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ila_sir2ila_trace_t *t = va_arg (*args, ila_sir2ila_trace_t *);
-
-  return format (s, "SIR -> ILA entry index: %d initial_dst: %U",
-		 t->ila_index, format_ip6_address, &t->initial_dst);
-}
-
-static vlib_node_registration_t ila_sir2ila_node;
-
-static uword
-ila_sir2ila (vlib_main_t * vm,
-	     vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  ila_main_t *ilm = &ila_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 pi0, pi1;
-	  vlib_buffer_t *p0, *p1;
-	  ip6_header_t *ip60, *ip61;
-	  u32 next0 = ILA_SIR2ILA_NEXT_DROP;
-	  u32 next1 = ILA_SIR2ILA_NEXT_DROP;
-	  BVT (clib_bihash_kv) kv0, value0;
-	  BVT (clib_bihash_kv) kv1, value1;
-	  ila_entry_t *ie0 = &ila_sir2ila_default_entry;
-	  ila_entry_t *ie1 = &ila_sir2ila_default_entry;
-	  ip6_address_t *ila_address0, *ila_address1;
-
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-	    CLIB_PREFETCH (p2->data, sizeof (ip6_header_t), LOAD);
-	    CLIB_PREFETCH (p3->data, sizeof (ip6_header_t), LOAD);
-	  }
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-	  ip60 = vlib_buffer_get_current (p0);
-	  ip61 = vlib_buffer_get_current (p1);
-	  ila_address0 = &ip60->dst_address;
-	  ila_address1 = &ip61->dst_address;
-	  kv0.key[0] = ip60->dst_address.as_u64[0];
-	  kv0.key[1] = ip60->dst_address.as_u64[1];
-	  kv0.key[2] = 0;
-	  kv1.key[0] = ip61->dst_address.as_u64[0];
-	  kv1.key[1] = ip61->dst_address.as_u64[1];
-	  kv1.key[2] = 0;
-
-	  if (PREDICT_TRUE((BV (clib_bihash_search)
-	      (&ilm->id_to_entry_table, &kv0, &value0)) == 0)) {
-	      ie0 = &ilm->entries[value0.value];
-	      ila_address0 = (ie0->dir != ILA_DIR_ILA2SIR) ? &ie0->ila_address : ila_address0;
-	  }
-
-	  if ((BV (clib_bihash_search)
-	       (&ilm->id_to_entry_table, &kv1, &value1)) == 0) {
-	    ie1 = &ilm->entries[value1.value];
-	    ila_address1 = (ie1->dir != ILA_DIR_ILA2SIR) ? &ie1->ila_address : ila_address1;
-	  }
-
-	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ila_sir2ila_trace_t *tr =
-		vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->ila_index =
-		(ie0 != &ila_sir2ila_default_entry) ? (ie0 - ilm->entries) : ~0;
-	      tr->initial_dst = ip60->dst_address;
-	    }
-
-	  if (PREDICT_FALSE (p1->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ila_sir2ila_trace_t *tr =
-		vlib_add_trace (vm, node, p1, sizeof (*tr));
-	      tr->ila_index =
-		(ie1 != &ila_sir2ila_default_entry) ? (ie1 - ilm->entries) : ~0;
-	      tr->initial_dst = ip61->dst_address;
-	    }
-
-	  ip60->dst_address.as_u64[0] = ila_address0->as_u64[0];
-	  ip60->dst_address.as_u64[1] = ila_address0->as_u64[1];
-	  ip61->dst_address.as_u64[0] = ila_address1->as_u64[0];
-	  ip61->dst_address.as_u64[1] = ila_address1->as_u64[1];
-
-	  vnet_feature_next (vnet_buffer (p0)->sw_if_index[VLIB_RX], &next0, p0);
-	  vnet_feature_next (vnet_buffer (p1)->sw_if_index[VLIB_RX], &next1, p1);
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
-					   n_left_to_next, pi0, pi1, next0,
-					   next1);
-	}
-
-      /* Single loop */
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  ip6_header_t *ip60;
-	  u32 next0 = ILA_SIR2ILA_NEXT_DROP;
-	  BVT (clib_bihash_kv) kv0, value0;
-	  ila_entry_t *ie0 = &ila_sir2ila_default_entry;
-	  ip6_address_t *ila_address0;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip60 = vlib_buffer_get_current (p0);
-	  ila_address0 = &ip60->dst_address;
-
-	  kv0.key[0] = ip60->dst_address.as_u64[0];
-	  kv0.key[1] = ip60->dst_address.as_u64[1];
-	  kv0.key[2] = 0;
-
-	  if (PREDICT_TRUE((BV (clib_bihash_search)
-	       (&ilm->id_to_entry_table, &kv0, &value0)) == 0)) {
-	    ie0 = &ilm->entries[value0.value];
-	    ila_address0 = (ie0->dir != ILA_DIR_ILA2SIR) ? &ie0->ila_address : ila_address0;
-	  }
-
-	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ila_sir2ila_trace_t *tr =
-		vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->ila_index =
-		(ie0 != &ila_sir2ila_default_entry) ? (ie0 - ilm->entries) : ~0;
-	      tr->initial_dst = ip60->dst_address;
-	    }
-
-	  //This operation should do everything for any type (except vnid4 obviously)
-	  ip60->dst_address.as_u64[0] = ila_address0->as_u64[0];
-	  ip60->dst_address.as_u64[1] = ila_address0->as_u64[1];
-
-	  vnet_feature_next (vnet_buffer (p0)->sw_if_index[VLIB_RX], &next0, p0);
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, pi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/** *INDENT-OFF* */
-VLIB_REGISTER_NODE (ila_sir2ila_node, static) =
-{
-  .function = ila_sir2ila,.name = "sir-to-ila",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ila_sir2ila_trace,
-  .n_errors = ILA_N_ERROR,
-  .error_strings = ila_error_strings,
-  .n_next_nodes = ILA_SIR2ILA_N_NEXT,
-  .next_nodes =
-  {
-      [ILA_SIR2ILA_NEXT_DROP] = "error-drop"
-  },
-};
-/** *INDENT-ON* */
-
-/** *INDENT-OFF* */
-VNET_FEATURE_INIT (ila_sir2ila, static) =
-{
-  .arc_name = "ip6-unicast",
-  .node_name = "sir-to-ila",
-  .runs_before = VNET_FEATURES ("ip6-lookup"),
-};
-/** *INDENT-ON* */
-
-static void
-ila_entry_stack (ila_entry_t *ie)
-{
-    /*
-     * restack on the next-hop's FIB entry
-     */
-    dpo_stack(ila_dpo_type,
-	      DPO_PROTO_IP6,
-	      &ie->ila_dpo,
-	      fib_entry_contribute_ip_forwarding(
-		  ie->next_hop_fib_entry_index));
-}
-
-int
-ila_add_del_entry (ila_add_del_entry_args_t * args)
-{
-  ila_main_t *ilm = &ila_main;
-  BVT (clib_bihash_kv) kv, value;
-
-  //Sanity check
-  if (args->type == ILA_TYPE_IID || args->type == ILA_TYPE_LUID)
-    {
-      if ((args->sir_address.as_u8[8] >> 5) != args->type)
-	{
-	  clib_warning ("Incorrect SIR address (ILA type mismatch %d %d)",
-			args->sir_address.as_u8[8] >> 1, args->type);
-	  return -1;
-	}
-      if (args->sir_address.as_u8[8] & 0x10)
-	{
-	  clib_warning ("Checksum bit should not be set in SIR address");
-	  return -1;
-	}
-    }
-  else if (args->type == ILA_TYPE_VNIDM)
-    {
-      if (args->sir_address.as_u8[0] != 0xff ||
-	  (args->sir_address.as_u8[1] & 0xf0) != 0xf0)
-	{
-	  clib_warning ("SIR multicast address must start with fff");
-	  return -1;
-	}
-      if (args->sir_address.as_u16[1] || args->sir_address.as_u16[2] ||
-	  args->sir_address.as_u16[3] || args->sir_address.as_u16[4] ||
-	  args->sir_address.as_u16[5] || (args->sir_address.as_u8[12] & 0xf0))
-	{
-	  clib_warning ("SIR multicast address must start with fff");
-	  return -1;
-	}
-    }
-
-  if (!args->is_del)
-    {
-      ila_entry_t *e;
-      pool_get (ilm->entries, e);
-      e->type = args->type;
-      e->sir_address = args->sir_address;
-      e->next_hop = args->next_hop_address;
-      e->csum_mode = args->csum_mode;
-      e->dir = args->dir;
-
-      //Construct ILA address
-      switch (e->type)
-	{
-	case ILA_TYPE_IID:
-	  e->ila_address = e->sir_address;
-	  break;
-	case ILA_TYPE_LUID:
-	  e->ila_address.as_u64[0] = args->locator;
-	  e->ila_address.as_u64[1] = args->sir_address.as_u64[1];
-	  break;
-	case ILA_TYPE_VNID6:
-	  e->ila_address.as_u64[0] = args->locator;
-	  e->ila_address.as_u8[8] = (ILA_TYPE_VNID6 << 1);
-	  e->ila_address.as_u32[2] |= args->vnid;
-	  e->ila_address.as_u32[3] = args->sir_address.as_u32[3];
-	  break;
-	case ILA_TYPE_VNIDM:
-	  e->ila_address.as_u64[0] = args->locator;
-	  e->ila_address.as_u8[8] = (ILA_TYPE_VNIDM << 1);
-	  e->ila_address.as_u32[2] |= args->vnid;
-	  e->ila_address.as_u32[3] = args->sir_address.as_u32[3];
-	  e->ila_address.as_u8[12] |= args->sir_address.as_u8[2] << 4;
-	  break;
-	case ILA_TYPE_VNID4:
-	  clib_warning ("ILA type '%U' is not supported", format_ila_type,
-			e->type);
-	  return -1;
-	}
-
-      //Modify ILA checksum if necessary
-      if (e->csum_mode == ILA_CSUM_MODE_NEUTRAL_MAP)
-	{
-	  ip_csum_t csum = e->ila_address.as_u16[7];
-	  int i;
-	  for (i = 0; i < 4; i++)
-	    {
-	      csum = ip_csum_sub_even (csum, e->sir_address.as_u32[i]);
-	      csum = ip_csum_add_even (csum, e->ila_address.as_u32[i]);
-	    }
-	  csum = ip_csum_add_even (csum, clib_host_to_net_u16 (0x1000));
-	  e->ila_address.as_u16[7] = ip_csum_fold (csum);
-	  e->ila_address.as_u8[8] |= 0x10;
-	}
-
-      //Create entry with the sir address
-      kv.key[0] = e->sir_address.as_u64[0];
-      kv.key[1] = e->sir_address.as_u64[1];
-      kv.key[2] = 0;
-      kv.value = e - ilm->entries;
-      BV (clib_bihash_add_del) (&ilm->id_to_entry_table, &kv,
-				1 /* is_add */ );
-
-      if (!ip6_address_is_zero(&e->next_hop))
-	{
-	  /*
-	   * become a child of the FIB netry for the next-hop
-	   * so we are informed when its forwarding changes
-	   */
-	  fib_prefix_t next_hop = {
-	      .fp_addr = {
-		  .ip6 = e->next_hop,
-	      },
-	      .fp_len = 128,
-	      .fp_proto = FIB_PROTOCOL_IP6,
-	  };
-
-	  e->next_hop_fib_entry_index = 
-	      fib_table_entry_special_add(0,
-					  &next_hop,
-					  FIB_SOURCE_RR,
-					  FIB_ENTRY_FLAG_NONE,
-					  ADJ_INDEX_INVALID);
-	  e->next_hop_child_index =
-	      fib_entry_child_add(e->next_hop_fib_entry_index,
-				  ila_fib_node_type,
-				  e - ilm->entries);
-
-	  /*
-	   * Create a route that results in the ILA entry
-	   */
-	  dpo_id_t dpo = DPO_INVALID;
-	  fib_prefix_t pfx = {
-	      .fp_addr = {
-		  .ip6 = e->ila_address,
-	      },
-	      .fp_len = 128,
-	      .fp_proto = FIB_PROTOCOL_IP6,
-	  };
-
-	  dpo_set(&dpo, ila_dpo_type, DPO_PROTO_IP6, e - ilm->entries);
-
-	  fib_table_entry_special_dpo_add(0,
-					  &pfx,
-					  FIB_SOURCE_PLUGIN_HI,
-					  FIB_ENTRY_FLAG_EXCLUSIVE,
-					  &dpo);
-	  dpo_reset(&dpo);
-
-	  /*
-	   * finally stack the ILA entry so it will forward to the next-hop
-	   */
-	  ila_entry_stack (e);
-	}
-    }
-  else
-    {
-      ila_entry_t *e;
-      kv.key[0] = args->sir_address.as_u64[0];
-      kv.key[1] = args->sir_address.as_u64[1];
-      kv.key[2] = 0;
-
-      if ((BV (clib_bihash_search) (&ilm->id_to_entry_table, &kv, &value) <
-	   0))
-	{
-	  return -1;
-	}
-
-      e = &ilm->entries[value.value];
-
-      if (!ip6_address_is_zero(&e->next_hop))
-	{
-	  fib_prefix_t pfx = {
-	      .fp_addr = {
-		  .ip6 = e->ila_address,
-	      },
-	      .fp_len = 128,
-	      .fp_proto = FIB_PROTOCOL_IP6,
-	  };
-
-	  fib_table_entry_special_remove(0, &pfx, FIB_SOURCE_PLUGIN_HI);
-	  /*
-	   * remove this ILA entry as child of the FIB netry for the next-hop
-	   */
-	  fib_entry_child_remove(e->next_hop_fib_entry_index,
-				 e->next_hop_child_index);
-	  fib_table_entry_delete_index(e->next_hop_fib_entry_index,
-				       FIB_SOURCE_RR);
-	  e->next_hop_fib_entry_index = FIB_NODE_INDEX_INVALID;
-	}
-      dpo_reset (&e->ila_dpo);
-
-      BV (clib_bihash_add_del) (&ilm->id_to_entry_table, &kv,
-				0 /* is_add */ );
-      pool_put (ilm->entries, e);
-    }
-  return 0;
-}
-
-int
-ila_interface (u32 sw_if_index, u8 disable)
-{
-  vnet_feature_enable_disable ("ip4-unicast", "sir-to-ila", sw_if_index,
-			       !disable, 0, 0);
-  return 0;
-}
-
-clib_error_t *
-vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
-		      int from_early_init)
-{
-  clib_error_t *error = 0;
-
-  return error;
-}
-
-u8 *format_ila_dpo (u8 * s, va_list * va)
-{
-  index_t index = va_arg (*va, index_t);
-  CLIB_UNUSED(u32 indent) = va_arg (*va, u32);
-  ila_main_t *ilm = &ila_main;
-  ila_entry_t *ie = pool_elt_at_index (ilm->entries, index);
-  return format(s, "ILA: idx:%d sir:%U",
-		index,
-		format_ip6_address, &ie->sir_address);
-}
-
-/**
- * @brief no-op lock function.
- * The lifetime of the ILA entry is managed by the control plane
- */
-static void
-ila_dpo_lock (dpo_id_t *dpo)
-{
-}
-
-/**
- * @brief no-op unlock function.
- * The lifetime of the ILA entry is managed by the control plane
- */
-static void
-ila_dpo_unlock (dpo_id_t *dpo)
-{
-}
-
-const static dpo_vft_t ila_vft = {
-    .dv_lock = ila_dpo_lock,
-    .dv_unlock = ila_dpo_unlock,
-    .dv_format = format_ila_dpo,
-};
-const static char* const ila_ip6_nodes[] =
-{
-    "ila-to-sir",
-    NULL,
-};
-const static char* const * const ila_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP6]  = ila_ip6_nodes,
-};
-
-static fib_node_t *
-ila_fib_node_get_node (fib_node_index_t index)
-{
-  ila_main_t *ilm = &ila_main;
-  ila_entry_t *ie = pool_elt_at_index (ilm->entries, index);
-
-  return (&ie->ila_fib_node);
-}
-
-/**
- * @brief no-op unlock function.
- * The lifetime of the ILA entry is managed by the control plane
- */
-static void
-ila_fib_node_last_lock_gone (fib_node_t *node)
-{
-}
-
-static ila_entry_t *
-ila_entry_from_fib_node (fib_node_t *node)
-{
-    return ((ila_entry_t*)(((char*)node) -
-			   STRUCT_OFFSET_OF(ila_entry_t, ila_fib_node)));
-}
-
-/**
- * @brief
- * Callback function invoked when the forwarding changes for the ILA next-hop
- */
-static fib_node_back_walk_rc_t
-ila_fib_node_back_walk_notify (fib_node_t *node,
-			       fib_node_back_walk_ctx_t *ctx)
-{
-    ila_entry_stack(ila_entry_from_fib_node(node));
-
-    return (FIB_NODE_BACK_WALK_CONTINUE);
-}
-
-/*
- * ILA's FIB graph node virtual function table
- */
-static const fib_node_vft_t ila_fib_node_vft = {
-    .fnv_get = ila_fib_node_get_node,
-    .fnv_last_lock = ila_fib_node_last_lock_gone,
-    .fnv_back_walk = ila_fib_node_back_walk_notify,
-};
-
-clib_error_t *
-ila_init (vlib_main_t * vm)
-{
-  ila_main_t *ilm = &ila_main;
-  ilm->entries = NULL;
-
-  ilm->lookup_table_nbuckets = ILA_TABLE_DEFAULT_HASH_NUM_BUCKETS;
-  ilm->lookup_table_nbuckets = 1 << max_log2 (ilm->lookup_table_nbuckets);
-  ilm->lookup_table_size = ILA_TABLE_DEFAULT_HASH_MEMORY_SIZE;
-
-  BV (clib_bihash_init) (&ilm->id_to_entry_table,
-			 "ila id to entry index table",
-			 ilm->lookup_table_nbuckets, ilm->lookup_table_size);
-
-  ila_dpo_type = dpo_register_new_type(&ila_vft, ila_nodes);
-  ila_fib_node_type = fib_node_register_new_type(&ila_fib_node_vft);
-
-  return NULL;
-}
-
-VLIB_INIT_FUNCTION (ila_init);
-
-static clib_error_t *
-ila_entry_command_fn (vlib_main_t * vm,
-		      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ila_add_del_entry_args_t args = { 0 };
-  u8 next_hop_set = 0;
-  int ret;
-
-  args.type = ILA_TYPE_IID;
-  args.csum_mode = ILA_CSUM_MODE_NO_ACTION;
-  args.local_adj_index = ~0;
-  args.dir = ILA_DIR_BIDIR;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "type %U", unformat_ila_type, &args.type))
-	;
-      else if (unformat
-	       (line_input, "sir-address %U", unformat_ip6_address,
-		&args.sir_address))
-	;
-      else if (unformat
-	       (line_input, "locator %U", unformat_half_ip6_address,
-		&args.locator))
-	;
-      else if (unformat
-	       (line_input, "csum-mode %U", unformat_ila_csum_mode,
-		&args.csum_mode))
-	;
-      else if (unformat (line_input, "vnid %x", &args.vnid))
-	;
-      else if (unformat
-	       (line_input, "next-hop %U", unformat_ip6_address,
-		&args.next_hop_address))
-	;
-      else if (unformat
-	      (line_input, "direction %U", unformat_ila_direction, &args.dir))
-        next_hop_set = 1;
-      else if (unformat (line_input, "del"))
-	args.is_del = 1;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (!next_hop_set)
-      return clib_error_return (0, "Specified a next hop");
-
-  if ((ret = ila_add_del_entry (&args)))
-    return clib_error_return (0, "ila_add_del_entry returned error %d", ret);
-
-  return NULL;
-}
-
-VLIB_CLI_COMMAND (ila_entry_command, static) =
-{
-  .path = "ila entry",
-  .short_help = "ila entry [type <type>] [sir-address <address>] [locator <locator>] [vnid <hex-vnid>]"
-    " [adj-index <adj-index>] [next-hop <next-hop>] [direction (bidir|sir2ila|ila2sir)]"
-    " [csum-mode (no-action|neutral-map|transport-adjust)] [del]",
-  .function = ila_entry_command_fn,
-};
-
-static clib_error_t *
-ila_interface_command_fn (vlib_main_t * vm,
-			  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index = ~0;
-  u8 disable = 0;
-
-  if (!unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      return clib_error_return (0, "Invalid interface name");
-    }
-
-  if (unformat (input, "disable"))
-    {
-      disable = 1;
-    }
-
-  int ret;
-  if ((ret = ila_interface (sw_if_index, disable)))
-    return clib_error_return (0, "ila_interface returned error %d", ret);
-
-  return NULL;
-}
-
-VLIB_CLI_COMMAND (ila_interface_command, static) =
-{
-  .path = "ila interface",
-  .short_help = "ila interface <interface-name> [disable]",
-  .function = ila_interface_command_fn,
-};
-
-static clib_error_t *
-ila_show_entries_command_fn (vlib_main_t * vm,
-			     unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ila_main_t *ilm = &ila_main;
-  ila_entry_t *e;
-
-  vlib_cli_output (vm, "  %U\n", format_ila_entry, vnm, NULL);
-  pool_foreach (e, ilm->entries,
-    ({
-      vlib_cli_output (vm, "  %U\n", format_ila_entry, vnm, e);
-    }));
-
-  return NULL;
-}
-
-VLIB_CLI_COMMAND (ila_show_entries_command, static) =
-{
-  .path = "show ila entries",
-  .short_help = "show ila entries",
-  .function = ila_show_entries_command_fn,
-};
diff --git a/plugins/ila-plugin/ila/ila.h b/plugins/ila-plugin/ila/ila.h
deleted file mode 100644
index 26620983..00000000
--- a/plugins/ila-plugin/ila/ila.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ILA_H
-#define ILA_H
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/fib/fib_node.h>
-
-#include <vppinfra/bihash_24_8.h>
-#include <vppinfra/bihash_template.h>
-
-#define ila_foreach_type		\
-  _(IID, 0, "iid")			\
-  _(LUID, 1, "luid")			\
-  _(VNID4, 2, "vnid-ip4")		\
-  _(VNID6, 3, "vnid-ip6")		\
-  _(VNIDM, 4, "vnid-multicast")
-
-typedef enum {
-#define _(i,n,s) ILA_TYPE_##i = n,
-  ila_foreach_type
-#undef _
-} ila_type_t;
-
-#define ila_csum_foreach_type \
-_(NO_ACTION, 0, "no-action") \
-_(NEUTRAL_MAP, 1, "neutral-map") \
-_(ADJUST_TRANSPORT, 2, "adjust-transport")
-
-typedef enum {
-#define _(i,n,s) ILA_CSUM_MODE_##i = n,
-  ila_csum_foreach_type
-#undef _
-  ILA_CSUM_N_TYPES
-} ila_csum_mode_t;
-
-#define ila_foreach_direction \
-_(BIDIR, 0, "bidir") \
-_(SIR2ILA, 1, "sir2ila") \
-_(ILA2SIR, 2, "ila2sir")
-
-typedef enum {
-#define _(i,n,s) ILA_DIR_##i = n,
-  ila_foreach_direction
-#undef _
-} ila_direction_t;
-
-typedef struct {
-  /**
-   * Fib Node base class
-   */
-  fib_node_t ila_fib_node;
-  ila_type_t type;
-  ip6_address_t sir_address;
-  ip6_address_t ila_address;
-  ip6_address_t next_hop;
-  ila_csum_mode_t csum_mode;
-  ila_direction_t dir;
-
-  /**
-   * The FIB entry index for the next-hop
-   */
-  fib_node_index_t next_hop_fib_entry_index;
-
-  /**
-   * The child index on the FIB entry
-   */
-  u32 next_hop_child_index;
-
-  /**
-   * The next DPO in the grpah to follow
-   */
-  dpo_id_t ila_dpo;
-} ila_entry_t;
-
-typedef struct {
-  ila_entry_t *entries;		//Pool of ILA entries
-
-  u64 lookup_table_nbuckets;
-  u64 lookup_table_size;
-  clib_bihash_24_8_t id_to_entry_table;
-
-  u32 ip6_lookup_next_index;
-} ila_main_t;
-
-
-typedef struct {
-  ila_type_t type;
-  ip6_address_t sir_address;
-  ip6_address_t next_hop_address;
-  u64 locator;
-  u32 vnid;
-  u32 local_adj_index;
-  ila_csum_mode_t csum_mode;
-  ila_direction_t dir;
-  u8 is_del;
-} ila_add_del_entry_args_t;
-
-int ila_add_del_entry (ila_add_del_entry_args_t * args);
-int ila_interface (u32 sw_if_index, u8 disable);
-
-#endif //ILA_H
diff --git a/plugins/sixrd-plugin/Makefile.am b/plugins/sixrd-plugin/Makefile.am
deleted file mode 100644
index eb0d806a..00000000
--- a/plugins/sixrd-plugin/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall
-AM_LDFLAGS = -module -shared -avoid-version
-
-libsixrd_plugin_la_SOURCES =			\
-	sixrd/sixrd.c				\
-	sixrd/sixrd_dpo.c			\
-	sixrd/ip4_sixrd.c			\
-	sixrd/ip6_sixrd.c
-
-noinst_HEADERS =				\
-	sixrd/sixrd.h                           \
-	sixrd/sixrd_dpo.h
-
-BUILT_SOURCES =
-
-vpppluginsdir = ${libdir}/vpp_plugins
-
-vppplugins_LTLIBRARIES = libsixrd_plugin.la
-
-
-# Remove *.la files
-install-data-hook:
-	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
diff --git a/plugins/sixrd-plugin/configure.ac b/plugins/sixrd-plugin/configure.ac
deleted file mode 100644
index 3aa4c425..00000000
--- a/plugins/sixrd-plugin/configure.ac
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(sixrd_plugin, 1.0)
-LT_INIT
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-AC_PREFIX_DEFAULT([/usr])
-
-AC_PROG_CC
-
-AC_OUTPUT([Makefile])
diff --git a/plugins/sixrd-plugin/sixrd/ip4_sixrd.c b/plugins/sixrd-plugin/sixrd/ip4_sixrd.c
deleted file mode 100644
index 2fb8015d..00000000
--- a/plugins/sixrd-plugin/sixrd/ip4_sixrd.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*---------------------------------------------------------------------------
- * Copyright (c) 2009-2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------
- */
-#include "sixrd.h"
-
-static vlib_node_registration_t ip4_sixrd_node;
-
-typedef enum {
-  IP4_SIXRD_NEXT_IP6_LOOKUP,
-  IP4_SIXRD_NEXT_DROP,
-  IP4_SIXRD_N_NEXT,
-} ip4_sixrd_next_t;
-
-/*
- * ip4_sixrd_sec_check
- */
-static_always_inline void
-ip4_sixrd_sec_check (sixrd_domain_t *d, ip4_address_t sa4, ip6_address_t sa6, u8 *error)
-{
-  u32 a = sixrd_get_addr(d, sa6.as_u64[0]);
-  clib_warning("Security check: %U %U", format_ip4_address, &a, format_ip4_address, &sa4);
-  if (PREDICT_FALSE(sixrd_get_addr(d, sa6.as_u64[0]) != sa4.as_u32))
-    *error = SIXRD_ERROR_SEC_CHECK;
-}
-
-/*
- * ip4_sixrd
- */
-static uword
-ip4_sixrd (vlib_main_t *vm,
-	   vlib_node_runtime_t *node,
-	   vlib_frame_t *frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node = vlib_node_get_runtime(vm, ip4_sixrd_node.index);
-  u32 decap = 0;
-
-  from = vlib_frame_vector_args(frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  while (n_left_from > 0) {
-    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
-
-    /* Single loop */
-    while (n_left_from > 0 && n_left_to_next > 0) {
-      u32 pi0;
-      vlib_buffer_t *p0;
-      u8 error0 = SIXRD_ERROR_NONE;
-      sixrd_domain_t *d0 = 0;
-      ip4_header_t *ip40;
-      ip6_header_t *ip60;
-      u32 sixrd_domain_index0 = ~0;
-      u32 next0;
-
-      pi0 = to_next[0] = from[0];
-      from += 1;
-      n_left_from -= 1;
-      to_next +=1;
-      n_left_to_next -= 1;
-
-      p0 = vlib_get_buffer(vm, pi0);
-      ip40 = vlib_buffer_get_current(p0);
-
-      /* Throw away anything that isn't IP in IP. */
-      if (PREDICT_TRUE(ip40->protocol == IP_PROTOCOL_IPV6 && clib_net_to_host_u16(ip40->length) >= 60)) {
-	vlib_buffer_advance(p0, sizeof(ip4_header_t));
-	ip60 = vlib_buffer_get_current(p0);
-	d0 = ip4_sixrd_get_domain(vnet_buffer(p0)->ip.adj_index[VLIB_TX], (ip6_address_t *)&ip60->src_address,
-				&sixrd_domain_index0, &error0);
-      } else {
-	error0 = SIXRD_ERROR_BAD_PROTOCOL;
-      }
-      if (d0) {
-	/* SIXRD inbound security check */
-	ip4_sixrd_sec_check(d0, ip40->src_address, ip60->src_address, &error0);
-      }
-
-      next0 = error0 == SIXRD_ERROR_NONE ? IP4_SIXRD_NEXT_IP6_LOOKUP : IP4_SIXRD_NEXT_DROP;
-
-      if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED)) {
-	sixrd_trace_t *tr = vlib_add_trace(vm, node, p0, sizeof(*tr));
-	tr->sixrd_domain_index = sixrd_domain_index0;
-      }
-
-      p0->error = error_node->errors[error0];
-      if (PREDICT_TRUE(error0 == SIXRD_ERROR_NONE)) decap++;
-      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next, n_left_to_next, pi0, next0);
-
-    }
-    vlib_put_next_frame(vm, node, next_index, n_left_to_next);
-  }
-  vlib_node_increment_counter(vm, ip4_sixrd_node.index, SIXRD_ERROR_DECAPSULATED, decap);
-
-  return frame->n_vectors;
-}
-
-static char *sixrd_error_strings[] = {
-#define _(sym,string) string,
-  foreach_sixrd_error
-#undef _
-};
-
-VLIB_REGISTER_NODE(ip4_sixrd_node,static) = {
-  .function = ip4_sixrd,
-  .name = "ip4-sixrd",
-  .vector_size = sizeof(u32),
-  .format_trace = format_sixrd_trace,
-  .n_errors = SIXRD_N_ERROR,
-  .error_strings = sixrd_error_strings,
-  .n_next_nodes = IP4_SIXRD_N_NEXT,
-  .next_nodes = {
-    [IP4_SIXRD_NEXT_IP6_LOOKUP] = "ip6-lookup",
-    [IP4_SIXRD_NEXT_DROP] = "error-drop",
-  },
-};
diff --git a/plugins/sixrd-plugin/sixrd/ip6_sixrd.c b/plugins/sixrd-plugin/sixrd/ip6_sixrd.c
deleted file mode 100644
index 36f3fab3..00000000
--- a/plugins/sixrd-plugin/sixrd/ip6_sixrd.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*---------------------------------------------------------------------------
- * Copyright (c) 2009-2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------
- */
-/*
- * Defines used for testing various optimisation schemes
- */
-#define SIXRD_ENCAP_DUAL 0
-
-#include "sixrd.h"
-
-static vlib_node_registration_t ip6_sixrd_node;
-
-typedef enum {
-  IP6_SIXRD_NEXT_IP4_LOOKUP,
-  IP6_SIXRD_NEXT_DROP,
-  IP6_SIXRD_N_NEXT,
-} ip6_sixrd_next_t;
-
-/*
- * ip6_sixrd
- */
-static uword
-ip6_sixrd (vlib_main_t *vm,
-	   vlib_node_runtime_t *node,
-	   vlib_frame_t *frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node = vlib_node_get_runtime(vm, ip6_sixrd_node.index);
-  u32 encap = 0;
-  from = vlib_frame_vector_args(frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0) {
-    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
-
-    while (n_left_from > 0 && n_left_to_next > 0) {
-      u32 pi0;
-      vlib_buffer_t *p0;
-      sixrd_domain_t *d0;
-      u8 error0 = SIXRD_ERROR_NONE;
-      ip6_header_t *ip60;
-      ip4_header_t *ip4h0;
-      u32 next0 = IP6_SIXRD_NEXT_IP4_LOOKUP;
-      u32 sixrd_domain_index0 = ~0;
-
-      pi0 = to_next[0] = from[0];
-      from += 1;
-      n_left_from -= 1;
-      to_next +=1;
-      n_left_to_next -= 1;
-
-      p0 = vlib_get_buffer(vm, pi0);
-      ip60 = vlib_buffer_get_current(p0);
-      //      p0->current_length = clib_net_to_host_u16(ip40->length);
-      d0 = ip6_sixrd_get_domain(vnet_buffer(p0)->ip.adj_index[VLIB_TX], &sixrd_domain_index0);
-      ASSERT(d0);
-
-      /* SIXRD calc */
-      u64 dal60 = clib_net_to_host_u64(ip60->dst_address.as_u64[0]);
-      u32 da40 = sixrd_get_addr(d0, dal60);
-      u16 len = clib_net_to_host_u16(ip60->payload_length) + 60;
-      if (da40 == 0) error0 = SIXRD_ERROR_UNKNOWN;
-
-      /* construct ipv4 header */
-      vlib_buffer_advance(p0, - (sizeof(ip4_header_t)));
-      ip4h0 = vlib_buffer_get_current(p0);
-      vnet_buffer(p0)->sw_if_index[VLIB_TX] = (u32)~0;
-      ip4h0->ip_version_and_header_length = 0x45;
-      ip4h0->tos = 0;
-      ip4h0->length = clib_host_to_net_u16(len);
-      ip4h0->fragment_id = 0;
-      ip4h0->flags_and_fragment_offset = 0;
-      ip4h0->ttl = 0x40;
-      ip4h0->protocol = IP_PROTOCOL_IPV6;
-      ip4h0->src_address = d0->ip4_src;
-      ip4h0->dst_address.as_u32 = clib_host_to_net_u32(da40);
-      ip4h0->checksum = ip4_header_checksum(ip4h0);
-
-      next0 = error0 == SIXRD_ERROR_NONE ? IP6_SIXRD_NEXT_IP4_LOOKUP : IP6_SIXRD_NEXT_DROP;
-
-      if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED)) {
-	sixrd_trace_t *tr = vlib_add_trace(vm, node, p0, sizeof(*tr));
-	tr->sixrd_domain_index = sixrd_domain_index0;
-      }
-
-      p0->error = error_node->errors[error0];
-      if (PREDICT_TRUE(error0 == SIXRD_ERROR_NONE)) encap++;
-
-      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next, n_left_to_next, pi0, next0);
-    }
-    vlib_put_next_frame(vm, node, next_index, n_left_to_next);  
-  }
-  vlib_node_increment_counter(vm, ip6_sixrd_node.index, SIXRD_ERROR_ENCAPSULATED, encap);
-
-  return frame->n_vectors;
-}
-
-static char *sixrd_error_strings[] = {
-#define _(sym,string) string,
-  foreach_sixrd_error
-#undef _
-};
-
-VLIB_REGISTER_NODE(ip6_sixrd_node,static) = {
-  .function = ip6_sixrd,
-  .name = "ip6-sixrd",
-  .vector_size = sizeof(u32),
-  .format_trace = format_sixrd_trace,
-  .n_errors = SIXRD_N_ERROR,
-  .error_strings = sixrd_error_strings,
-  .n_next_nodes = IP6_SIXRD_N_NEXT,
-  .next_nodes = {
-    [IP6_SIXRD_NEXT_IP4_LOOKUP] = "ip4-lookup",
-    [IP6_SIXRD_NEXT_DROP] = "error-drop",
-  },
-};
diff --git a/plugins/sixrd-plugin/sixrd/sixrd.c b/plugins/sixrd-plugin/sixrd/sixrd.c
deleted file mode 100644
index 66e631a2..00000000
--- a/plugins/sixrd-plugin/sixrd/sixrd.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "sixrd.h"
-#include <vnet/plugin/plugin.h>
-
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/adj/adj.h>
-
-/*
- * This code supports the following sixrd modes:
- * 
- * 32 EA bits (Complete IPv4 address is embedded):
- *   ea_bits_len = 32
- * IPv4 suffix is embedded:
- *   ea_bits_len = < 32
- * No embedded address bits (1:1 mode):
- *   ea_bits_len = 0
- */
-
-int
-sixrd_create_domain (ip6_address_t *ip6_prefix,
-		     u8 ip6_prefix_len,
-		     ip4_address_t *ip4_prefix,
-		     u8 ip4_prefix_len,
-		     ip4_address_t *ip4_src,
-		     u32 *sixrd_domain_index,
-		     u16 mtu)
-{
-  dpo_id_t dpo_v6 = DPO_INVALID, dpo_v4 = DPO_INVALID;
-  sixrd_main_t *mm = &sixrd_main;
-  fib_node_index_t fei;
-  sixrd_domain_t *d;
-
-  /* Get domain index */
-  pool_get_aligned(mm->domains, d, CLIB_CACHE_LINE_BYTES);
-  memset(d, 0, sizeof (*d));
-  *sixrd_domain_index = d - mm->domains;
-
-  /* Init domain struct */
-  d->ip4_prefix.as_u32 = ip4_prefix->as_u32;
-  d->ip4_prefix_len = ip4_prefix_len;
-  d->ip6_prefix = *ip6_prefix;
-  d->ip6_prefix_len = ip6_prefix_len;
-  d->ip4_src = *ip4_src;
-  d->mtu = mtu;
-
-  if (ip4_prefix_len < 32)
-    d->shift = 64 - ip6_prefix_len + (32 - ip4_prefix_len);
-    
-  /* Create IPv6 route/adjacency */
-  fib_prefix_t pfx6 = {
-      .fp_proto = FIB_PROTOCOL_IP6,
-      .fp_len = d->ip6_prefix_len,
-      .fp_addr = {
-	  .ip6 = d->ip6_prefix,
-      },
-  };
-  sixrd_dpo_create(DPO_PROTO_IP6,
-		   *sixrd_domain_index,
-		   &dpo_v6);
-  fib_table_entry_special_dpo_add(0, &pfx6,
-				  FIB_SOURCE_SIXRD,
-				  FIB_ENTRY_FLAG_EXCLUSIVE,
-				  &dpo_v6);
-  dpo_reset (&dpo_v6);
-
-  /*
-   * Multiple SIXRD domains may share same source IPv4 TEP
-   * In this case the route will exist and be SixRD sourced.
-   * Find the adj (if any) already contributed and modify it
-   */
-  fib_prefix_t pfx4 = {
-      .fp_proto = FIB_PROTOCOL_IP4,
-      .fp_len = 32,
-      .fp_addr = {
-	  .ip4 = d->ip4_src,
-      },
-  };
-  fei = fib_table_lookup_exact_match(0, &pfx4);
-
-  if (FIB_NODE_INDEX_INVALID != fei)
-  {
-      dpo_id_t dpo = DPO_INVALID;
-
-      if (fib_entry_get_dpo_for_source (fei, FIB_SOURCE_SIXRD, &dpo))
-      {
-	  /*
-	   * modify the existing adj to indicate it's shared
-	   * skip to route add.
-	   * It is locked to pair with the unlock below.
-	   */
-	  const dpo_id_t *sd_dpo;
-	  sixrd_dpo_t *sd;
-
-	  ASSERT(DPO_LOAD_BALANCE == dpo.dpoi_type);
-
-	  sd_dpo = load_balance_get_bucket(dpo.dpoi_index, 0);
-	  sd = sixrd_dpo_get (sd_dpo->dpoi_index);
-
-	  sd->sd_domain = ~0;
-	  dpo_copy (&dpo_v4, sd_dpo);
-	  dpo_reset (&dpo);
-
-	  goto route_add;
-      }
-  }
-  /* first time addition of the route */
-  sixrd_dpo_create(DPO_PROTO_IP4,
-		   *sixrd_domain_index,
-		   &dpo_v4);
-
-route_add:
-  /*
-   * Create ip4 route. This is a reference counted add. If the prefix
-   * already exists and is SixRD sourced, it is now SixRD source n+1 times
-   * and will need to be removed n+1 times.
-   */
-  fib_table_entry_special_dpo_add(0, &pfx4,
-				  FIB_SOURCE_SIXRD,
-				  FIB_ENTRY_FLAG_EXCLUSIVE,
-				  &dpo_v4);
-  dpo_reset (&dpo_v4);
-
-  return 0;
-}
-
-/*
- * sixrd_delete_domain
- */
-int
-sixrd_delete_domain (u32 sixrd_domain_index)
-{
-  sixrd_main_t *mm = &sixrd_main;
-  sixrd_domain_t *d;
-
-  if (pool_is_free_index(mm->domains, sixrd_domain_index)) {
-    clib_warning("SIXRD domain delete: domain does not exist: %d",
-		 sixrd_domain_index);
-    return -1;
-  }
-
-  d = pool_elt_at_index(mm->domains, sixrd_domain_index);
-
-  fib_prefix_t pfx = {
-      .fp_proto = FIB_PROTOCOL_IP4,
-      .fp_len = 32,
-      .fp_addr = {
-	  .ip4 = d->ip4_src,
-      },
-  };
-  fib_table_entry_special_remove(0, &pfx, FIB_SOURCE_SIXRD);
-
-  fib_prefix_t pfx6 = {
-      .fp_proto = FIB_PROTOCOL_IP6,
-      .fp_len = d->ip6_prefix_len,
-      .fp_addr = {
-	  .ip6 = d->ip6_prefix,
-      },
-  };
-  fib_table_entry_special_remove(0, &pfx6, FIB_SOURCE_SIXRD);
-
-  pool_put(mm->domains, d);
-
-  return 0;
-}
-
-static clib_error_t *
-sixrd_add_domain_command_fn (vlib_main_t *vm,
-                           unformat_input_t *input,
-                           vlib_cli_command_t *cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ip4_address_t ip4_prefix;
-  ip6_address_t ip6_prefix;
-  ip4_address_t ip4_src;
-  u32 ip6_prefix_len=0, ip4_prefix_len=0, sixrd_domain_index;
-  u32 num_m_args = 0;
-  /* Optional arguments */
-  u32 mtu = 0;
-
-  /* Get a line of input. */
-  if (!unformat_user(input, unformat_line_input, line_input))
-    return 0;
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat(line_input, "ip6-pfx %U/%d", unformat_ip6_address, &ip6_prefix, &ip6_prefix_len))
-      num_m_args++;
-    else if (unformat(line_input, "ip4-pfx %U/%d", unformat_ip4_address, &ip4_prefix, &ip4_prefix_len))
-      num_m_args++;
-    else if (unformat(line_input, "ip4-src %U", unformat_ip4_address, &ip4_src))
-      num_m_args++;
-    else if (unformat(line_input, "mtu %d", &mtu))
-      num_m_args++;
-    else
-      return clib_error_return(0, "unknown input `%U'",
-                               format_unformat_error, input);
-  }
-  unformat_free(line_input);
-
-  if (num_m_args < 3)
-    return clib_error_return(0, "mandatory argument(s) missing");
-
-  sixrd_create_domain(&ip6_prefix, ip6_prefix_len, &ip4_prefix, ip4_prefix_len,
-		      &ip4_src, &sixrd_domain_index, mtu);
-
-  return 0;
-}
-
-static clib_error_t *
-sixrd_del_domain_command_fn (vlib_main_t *vm,
-			   unformat_input_t *input,
-			   vlib_cli_command_t *cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u32 num_m_args = 0;
-  u32 sixrd_domain_index;
-
-  /* Get a line of input. */
-  if (! unformat_user(input, unformat_line_input, line_input))
-    return 0;
- 
-  while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat(line_input, "index %d", &sixrd_domain_index))
-      num_m_args++;
-    else
-      return clib_error_return(0, "unknown input `%U'",
-				format_unformat_error, input);
-  }
-  unformat_free(line_input);
-
-  if (num_m_args != 1)
-    return clib_error_return(0, "mandatory argument(s) missing");
-
-  sixrd_delete_domain(sixrd_domain_index);
-
-  return 0;
-}
-
-static u8 *
-format_sixrd_domain (u8 *s, va_list *args)
-{
-  sixrd_domain_t *d = va_arg(*args, sixrd_domain_t *);
-  sixrd_main_t *mm = &sixrd_main;
-
-  s = format(s,
-	     "[%d] ip6-pfx %U/%d ip4-pfx %U/%d ip4-src %U mtu %d",
-	     d - mm->domains,
-	     format_ip6_address, &d->ip6_prefix, d->ip6_prefix_len,
-	     format_ip4_address, &d->ip4_prefix, d->ip4_prefix_len,
-	     format_ip4_address, &d->ip4_src, d->mtu);
-
-  return s;
-}
-
-static clib_error_t *
-show_sixrd_domain_command_fn (vlib_main_t *vm, unformat_input_t *input, vlib_cli_command_t *cmd)
-{
-  sixrd_main_t *mm = &sixrd_main;
-  sixrd_domain_t *d;
-
-  if (pool_elts(mm->domains) == 0)
-    vlib_cli_output(vm, "No SIXRD domains are configured...");
-
-  pool_foreach(d, mm->domains, ({vlib_cli_output(vm, "%U", format_sixrd_domain, d);}));
-
-  return 0;
-
-}
-
-static clib_error_t *
-show_sixrd_stats_command_fn (vlib_main_t *vm, unformat_input_t *input, vlib_cli_command_t *cmd)
-{
-  sixrd_main_t *mm = &sixrd_main;
-  sixrd_domain_t *d;
-  int domains = 0, domaincount = 0;
-  if (pool_elts (mm->domains) == 0)
-    vlib_cli_output (vm, "No SIXRD domains are configured...");
-
-  pool_foreach(d, mm->domains, ({
-    domains += sizeof(*d);
-    domaincount++;
-  }));
-
-  vlib_cli_output(vm, "SIXRD domains structure: %d\n", sizeof (sixrd_domain_t));
-  vlib_cli_output(vm, "SIXRD domains: %d (%d bytes)\n", domaincount, domains);
-
-  return 0;
-}
-
-/*
- * packet trace format function
- */
-u8 *
-format_sixrd_trace (u8 *s, va_list *args)
-{
-  CLIB_UNUSED(vlib_main_t *vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED(vlib_node_t *node) = va_arg (*args, vlib_node_t *);
-  sixrd_trace_t *t = va_arg (*args, sixrd_trace_t *);
-  u32 sixrd_domain_index = t->sixrd_domain_index;
-
-  s = format(s, "SIXRD domain index: %d", sixrd_domain_index);
-
-  return s;
-}
-
-VLIB_CLI_COMMAND(sixrd_add_domain_command, static) = {
-  .path = "sixrd add domain",
-  .short_help = 
-  "sixrd add domain ip6-pfx <ip6-pfx> ip4-pfx <ip4-pfx> ip4-src <ip4-addr>",
-  .function = sixrd_add_domain_command_fn,
-};
-
-VLIB_CLI_COMMAND(sixrd_del_command, static) = {
-  .path = "sixrd del domain",
-  .short_help = 
-  "sixrd del domain index <domain>",
-  .function = sixrd_del_domain_command_fn,
-};
-
-VLIB_CLI_COMMAND(show_sixrd_domain_command, static) = {
-  .path = "show sixrd domain",
-  .function = show_sixrd_domain_command_fn,
-};
-
-VLIB_CLI_COMMAND(show_sixrd_stats_command, static) = {
-  .path = "show sixrd stats",
-  .function = show_sixrd_stats_command_fn,
-};
-
-/* 
- * This routine exists to convince the vlib plugin framework that
- * we haven't accidentally copied a random .dll into the plugin directory.
- *
- * Also collects global variable pointers passed from the vpp engine
- */
-clib_error_t * 
-vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
-                      int from_early_init)
-{
-  clib_error_t * error = 0;
-  sixrd_main_t *mm = &sixrd_main;
-
-  mm->vnet_main = vnet_get_main();
-  mm->vlib_main = vm;
-
-  return error;
-}
-
-static clib_error_t * sixrd_init (vlib_main_t * vm)
-{
-  sixrd_dpo_module_init ();
-
-  return (NULL);
-}
-
-VLIB_INIT_FUNCTION (sixrd_init);
diff --git a/plugins/sixrd-plugin/sixrd/sixrd.h b/plugins/sixrd-plugin/sixrd/sixrd.h
deleted file mode 100644
index 56714c9e..00000000
--- a/plugins/sixrd-plugin/sixrd/sixrd.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*---------------------------------------------------------------------------
- * Copyright (c) 2009-2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------
- */
-#include <stdbool.h>
-#include <vppinfra/error.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/fib/ip6_fib.h>
-
-#include "sixrd_dpo.h"
-
-int sixrd_create_domain(ip6_address_t *ip6_prefix, u8 ip6_prefix_len,
-			ip4_address_t *ip4_prefix, u8 ip4_prefix_len,
-			ip4_address_t *ip4_src, u32 *sixrd_domain_index, u16 mtu);
-int sixrd_delete_domain(u32 sixrd_domain_index);
-u8 *format_sixrd_trace(u8 *s, va_list *args);
-
-typedef struct {
-  ip6_address_t ip6_prefix;
-  ip4_address_t ip4_prefix;
-  ip4_address_t ip4_src;
-  u8 ip6_prefix_len;
-  u8 ip4_prefix_len;
-
-  /* helpers */
-  u8 shift;
-
-  u16 mtu;
-} sixrd_domain_t;
-
-typedef struct {
-  /* pool of SIXRD domains */
-  sixrd_domain_t *domains;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} sixrd_main_t;
-
-#define foreach_sixrd_error				\
-  /* Must be first. */					\
- _(NONE, "valid SIXRD packets")				\
- _(BAD_PROTOCOL, "bad protocol")			\
- _(WRONG_ICMP_TYPE, "wrong icmp type")			\
- _(SEC_CHECK, "security check failed")			\
- _(ICMP, "unable to translate ICMP")			\
- _(UNKNOWN, "unknown")					\
- _(NO_DOMAIN, "no domain")				\
- _(ENCAPSULATED, "encapsulated")			\
- _(DECAPSULATED, "decapsulated")			\
- _(TRANSLATED_4TO6, "translated 4 to 6")		\
- _(TRANSLATED_6TO4, "translated 6 to 4")		\
- _(FRAGMENT, "fragment handling error")			\
- _(FRAGMENT_QUEUED, "dropped, missing first fragment")	\
- _(FRAGMENTED, "packets requiring fragmentation")	\
- _(FRAGMENT_PARTS, "fragment parts")                    \
- _(MALFORMED, "malformed packet")
-
-typedef enum {
-#define _(sym,str) SIXRD_ERROR_##sym,
-   foreach_sixrd_error
-#undef _
-   SIXRD_N_ERROR,
- } sixrd_error_t;
-
-typedef struct {
-  u32 sixrd_domain_index;
-} sixrd_trace_t;
-
-sixrd_main_t sixrd_main;
-
-/*
- * sixrd_get_addr
- */
-static_always_inline u32
-sixrd_get_addr (sixrd_domain_t *d, u64 dal)
-{
-
-  /* 1:1 mode */
-  if (d->ip4_prefix_len == 32) return (d->ip4_prefix.as_u32);
-
-  /* Grab 32 - ip4_prefix_len bits out of IPv6 address from offset ip6_prefix_len */
-  return (d->ip4_prefix.as_u32 | (u32)(dal >> d->shift));
-}
-
-/*
- * Get the SIXRD domain from an IPv6 lookup adjacency.
- */
-static_always_inline sixrd_domain_t *
-ip6_sixrd_get_domain (u32 sdi, u32 *sixrd_domain_index)
-{
-  sixrd_main_t *mm = &sixrd_main;
-  sixrd_dpo_t *sd;
-
-  sd = sixrd_dpo_get(sdi);
-
-  ASSERT(sd);
-  *sixrd_domain_index = sd->sd_domain;
-  return pool_elt_at_index(mm->domains, *sixrd_domain_index);
-}
-
-/*
- * Get the SIXRD domain from an IPv4 lookup adjacency.
- * If the IPv4 address is not shared, no lookup is required.
- * The IPv6 address is used otherwise.
- */
-static_always_inline sixrd_domain_t *
-ip4_sixrd_get_domain (u32 sdi, ip6_address_t *addr,
-		      u32 *sixrd_domain_index, u8 *error)
-{
-  sixrd_main_t *mm = &sixrd_main;
-  sixrd_dpo_t *sd;
-
-  sd = sixrd_dpo_get(sdi);
-  *sixrd_domain_index = sd->sd_domain;
-  if (*sixrd_domain_index != ~0)
-    return pool_elt_at_index(mm->domains, *sixrd_domain_index);
-
-  u32 lbi = ip6_fib_table_fwding_lookup(&ip6_main, 0, addr);
-  const dpo_id_t *dpo = load_balance_get_bucket(lbi, 0);
-  if (PREDICT_TRUE(dpo->dpoi_type == sixrd_dpo_type))
-    {
-      sd = sixrd_dpo_get(dpo->dpoi_index);
-      *sixrd_domain_index = sd->sd_domain;
-      return pool_elt_at_index(mm->domains, *sixrd_domain_index);
-    }
-  *error = SIXRD_ERROR_NO_DOMAIN;
-  return NULL;
-}
diff --git a/plugins/sixrd-plugin/sixrd/sixrd_dpo.c b/plugins/sixrd-plugin/sixrd/sixrd_dpo.c
deleted file mode 100644
index 88a07935..00000000
--- a/plugins/sixrd-plugin/sixrd/sixrd_dpo.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "sixrd_dpo.h"
-#include <vnet/ip/ip.h>
-
-/**
- * pool of all MPLS Label DPOs
- */
-sixrd_dpo_t *sixrd_dpo_pool;
-
-/**
- * The register SIXRD DPO type
- */
-dpo_type_t sixrd_dpo_type;
-
-static sixrd_dpo_t *
-sixrd_dpo_alloc (void)
-{
-    sixrd_dpo_t *sd;
-
-    pool_get_aligned(sixrd_dpo_pool, sd, CLIB_CACHE_LINE_BYTES);
-    memset(sd, 0, sizeof(*sd));
-
-    return (sd);
-}
-
-static index_t
-sixrd_dpo_get_index (sixrd_dpo_t *sd)
-{
-    return (sd - sixrd_dpo_pool);
-}
-
-void
-sixrd_dpo_create (dpo_proto_t dproto,
-		u32 domain_index,
-		dpo_id_t *dpo)
-{
-    sixrd_dpo_t *sd;
-
-    sd = sixrd_dpo_alloc();
-    sd->sd_domain = domain_index;
-    sd->sd_proto = dproto;
-
-    dpo_set(dpo,
-	    sixrd_dpo_type,
-	    dproto,
-	    sixrd_dpo_get_index(sd));
-}
-
-u8*
-format_sixrd_dpo (u8 *s, va_list *args)
-{
-    index_t index = va_arg (*args, index_t);
-    CLIB_UNUSED(u32 indent) = va_arg (*args, u32);
-    sixrd_dpo_t *sd;
-
-    sd = sixrd_dpo_get(index);
-
-    return (format(s, "sixrd:[%d]:%U domain:%d",
-		   index,
-                   format_dpo_proto, sd->sd_proto,
-		   sd->sd_domain));
-}
-
-
-static void
-sixrd_dpo_lock (dpo_id_t *dpo)
-{
-    sixrd_dpo_t *sd;
-
-    sd = sixrd_dpo_get(dpo->dpoi_index);
-
-    sd->sd_locks++;
-}
-
-static void
-sixrd_dpo_unlock (dpo_id_t *dpo)
-{
-    sixrd_dpo_t *sd;
-
-    sd = sixrd_dpo_get(dpo->dpoi_index);
-
-    sd->sd_locks--;
-
-    if (0 == sd->sd_locks)
-    {
-	pool_put(sixrd_dpo_pool, sd);
-    }
-}
-
-const static dpo_vft_t sd_vft = {
-    .dv_lock = sixrd_dpo_lock,
-    .dv_unlock = sixrd_dpo_unlock,
-    .dv_format = format_sixrd_dpo,
-};
-
-const static char* const sixrd_ip4_nodes[] =
-{
-    "ip4-sixrd",
-    NULL,
-};
-const static char* const sixrd_ip6_nodes[] =
-{
-    "ip6-sixrd",
-    NULL,
-};
-
-const static char* const * const sixrd_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = sixrd_ip4_nodes,
-    [DPO_PROTO_IP6]  = sixrd_ip6_nodes,
-    [DPO_PROTO_MPLS] = NULL,
-};
-
-void
-sixrd_dpo_module_init (void)
-{
-    sixrd_dpo_type = dpo_register_new_type(&sd_vft, sixrd_nodes);
-}
diff --git a/plugins/sixrd-plugin/sixrd/sixrd_dpo.h b/plugins/sixrd-plugin/sixrd/sixrd_dpo.h
deleted file mode 100644
index 17142288..00000000
--- a/plugins/sixrd-plugin/sixrd/sixrd_dpo.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __SIXRD_DPO_H__
-#define __SIXRD_DPO_H__
-
-#include <vnet/vnet.h>
-#include <vnet/dpo/dpo.h>
-
-/**
- * A representation of a 6RD DPO
- */
-typedef struct sixrd_dpo_t
-{
-    /**
-     * The dat-plane protocol
-     */
-    dpo_proto_t sd_proto;
-
-    /**
-     * the SIXRD domain index
-     */
-    u32 sd_domain;
-
-    /**
-     * Number of locks/users of the label
-     */
-    u16 sd_locks;
-} sixrd_dpo_t;
-
-extern void sixrd_dpo_create (dpo_proto_t dproto,
-			      u32 domain_index,
-			      dpo_id_t *dpo);
-
-/*
- * Encapsulation violation for fast data-path access
- */
-extern sixrd_dpo_t *sixrd_dpo_pool;
-extern dpo_type_t sixrd_dpo_type;
-
-static inline sixrd_dpo_t *
-sixrd_dpo_get (index_t index)
-{
-    return (pool_elt_at_index(sixrd_dpo_pool, index));
-}
-
-extern void sixrd_dpo_module_init(void);
-
-#endif
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 00000000..e691a539
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,101 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+###############################################################################
+# Global Defines
+###############################################################################
+
+AUTOMAKE_OPTIONS = foreign subdir-objects
+ACLOCAL_AMFLAGS = -I m4
+
+AM_CFLAGS = -Wall
+
+SUBDIRS = .
+SUFFIXES = .api.h .api .api.json
+API_FILES =
+noinst_HEADERS =
+dist_bin_SCRIPTS =
+lib_LTLIBRARIES =
+BUILT_SOURCES =
+
+###############################################################################
+# DPDK
+###############################################################################
+
+if WITH_DPDK
+if ENABLE_DPDK_SHARED
+DPDK_LD_FLAGS = -Wl,--whole-archive,-ldpdk,--no-whole-archive
+else
+DPDK_LD_FLAGS = -Wl,--whole-archive,-l:libdpdk.a,--no-whole-archive
+endif
+if WITH_DPDK_CRYPTO
+DPDK_LD_ADD = -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB
+endif
+if WITH_DPDK_MLX5_PMD
+DPDK_LD_FLAGS += -libverbs -lmlx5 -lnuma
+endif
+else
+DPDK_LD_FLAGS =
+DPDK_LD_ADD =
+endif
+
+###############################################################################
+# Components
+###############################################################################
+
+include vppinfra.am
+include vppapigen.am
+
+if ENABLE_PERFTOOL
+include perftool.am
+endif
+
+if ENABLE_G2
+include g2.am
+endif
+
+if ENABLE_SVM
+include svm.am
+endif
+
+if ENABLE_VLIB
+include vlib.am
+endif
+
+if ENABLE_SVM
+if ENABLE_VLIB
+include vlib-api.am
+include vnet.am
+include vpp.am
+include vpp-api-test.am
+
+SUBDIRS += vpp-api/python plugins
+
+###############################################################################
+# API
+###############################################################################
+
+include suffix-rules.mk
+
+# Set the suffix list
+apidir = $(prefix)/share/vpp/api/core
+
+api_DATA = \
+	$(patsubst %.api,%.api.json,$(API_FILES))
+
+BUILT_SOURCES += \
+	$(patsubst %.api,%.api.json,$(API_FILES)) \
+	$(patsubst %.api,%.api.h,$(API_FILES))
+
+endif # if ENABLE_VLIB
+endif # if ENABLE_SVM
diff --git a/src/configure.ac b/src/configure.ac
new file mode 100644
index 00000000..f8e4d94f
--- /dev/null
+++ b/src/configure.ac
@@ -0,0 +1,195 @@
+AC_INIT([vpp], [17.04], [vpp-dev@fd.io])
+LT_INIT
+AC_CONFIG_AUX_DIR([.])
+AM_INIT_AUTOMAKE([subdir-objects])
+AM_SILENT_RULES([yes])
+AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile])
+
+AC_PROG_CC
+AM_PROG_AS
+AM_PROG_LIBTOOL
+AC_PROG_YACC
+
+###############################################################################
+# Macros
+###############################################################################
+
+AC_DEFUN([ENABLE_ARG],
+[
+  AC_ARG_ENABLE($1,
+    AC_HELP_STRING(patsubst([--enable-$1],[_],[-]), $2),
+    [enable_$1=yes n_enable_$1=1],
+    [enable_$1=no n_enable_$1=0])
+  AM_CONDITIONAL(m4_toupper(ENABLE_$1), test "$enable_$1" = "yes")
+  m4_append([list_of_enabled], [$1], [, ])
+])
+
+AC_DEFUN([DISABLE_ARG],
+[
+  AC_ARG_ENABLE($1,
+    AC_HELP_STRING(patsubst([--disable-$1],[_],[-]), $2),
+    [enable_$1=no n_enable_$1=0],
+    [enable_$1=yes n_enable_$1=1])
+  AM_CONDITIONAL(m4_toupper(ENABLE_$1), test "$enable_$1" = "yes")
+  m4_append([list_of_enabled], [$1], [, ])
+])
+
+AC_DEFUN([WITH_ARG],
+[
+  AC_ARG_WITH($1,
+    AC_HELP_STRING(patsubst([--with-$1],[_],[-]), $2),
+    [with_$1=yes n_with_$1=1],
+    [with_$1=no n_with_$1=0])
+  AM_CONDITIONAL(m4_toupper(WITH_$1), test "$with_$1" = "yes")
+  m4_append([list_of_with], [$1], [, ])
+])
+
+AC_DEFUN([WITHOUT_ARG],
+[
+  AC_ARG_WITH($1,
+    AC_HELP_STRING(patsubst([--without-$1],[_],[-]), $2),
+    [with_$1=no n_with_$1=0],
+    [with_$1=yes n_with_$1=1])
+  AM_CONDITIONAL(m4_toupper(WITH_$1), test "$with_$1" = "yes")
+  m4_append([list_of_with], [$1], [, ])
+])
+
+AC_DEFUN([PLUGIN_ENABLED],
+[
+   AC_ARG_ENABLE($1_plugin,
+     AC_HELP_STRING([--disable-$1-plugin], [Do not build $1 plugin]),
+       [enable_$1_plugin=no],
+       [enable_$1_plugin=yes ])
+  AM_CONDITIONAL(m4_toupper(ENABLE_$1_PLUGIN), test "$enable_$1_plugin" = "yes")
+  m4_append([list_of_plugins], [$1], [, ])
+])
+
+AC_DEFUN([PLUGIN_DISABLED],
+[
+   AC_ARG_ENABLE($1_plugin,
+     AC_HELP_STRING([--enable-$1-plugin], [Build $1 plugin]),
+       [enable_$1_plugin=yes ],
+       [enable_$1_plugin=no])
+  AM_CONDITIONAL(m4_toupper((ENABLE_$1_PLUGIN), test "$enable_$1_plugin" = "yes")
+  m4_append([list_of_plugins], [$1], [, ])
+])
+
+AC_DEFUN([PRINT_VAL], [ AC_MSG_RESULT(AC_HELP_STRING($1,$2)) ])
+
+###############################################################################
+# configure arguments
+###############################################################################
+
+# --enable-X
+ENABLE_ARG(tests,	[Enable unit tests])
+ENABLE_ARG(dpdk_shared,	[Enable unit tests])
+ENABLE_ARG(perftool,	[Enable perftool])
+ENABLE_ARG(g2,		[Enable g2])
+
+# --disable-X
+DISABLE_ARG(vlib,	[Disable vlib and dependant libs and binaries])
+DISABLE_ARG(svm,	[Disable svm and dependant libs and binaries])
+
+# --with-X
+WITH_ARG(dpdk,		[Use use DPDK])
+WITH_ARG(dpdk_crypto,	[Use DPDK cryptodev])
+WITH_ARG(dpdk_mlx5_pmd,	[Use DPDK with mlx5 PMD])
+
+# --without-X
+WITHOUT_ARG(ipsec,	[Disable IPSec])
+WITHOUT_ARG(ipv6sr,	[Disable IPv6 SR])
+WITHOUT_ARG(apicli,	[Disable binary api CLI])
+
+AC_ARG_WITH(unix,
+            AC_HELP_STRING([--with-unix],[Compile unix version of clib]),
+	    [],
+	    [case $host_os in
+	      darwin* | linux*) with_unix=yes;;
+	      *) with_unix=no;;
+	      esac])
+
+AM_CONDITIONAL(WITH_UNIX, test "$with_unix" = "yes")
+
+AC_ARG_WITH(pre-data,
+            AC_HELP_STRING([--with-pre-data],[Set buffer rewrite space]),
+	    [case $with_pre_data in
+	       128) ;;
+	       256) ;;
+               *) with_pre_data="pre-data-not-set" ;;
+	     esac], [with_pre_data=128])
+
+###############################################################################
+# Substitutions and defines
+###############################################################################
+
+AC_SUBST(PRE_DATA_SIZE,		[$with_pre_data])
+AC_SUBST(APICLI,		[-DVPP_API_TEST_BUILTIN=${n_with_apicli}])
+
+AC_DEFINE_UNQUOTED(DPDK, 		[${n_with_dpdk}])
+AC_DEFINE_UNQUOTED(DPDK_SHARED_LIB,	[${n_enable_dpdk_shared}])
+AC_DEFINE_UNQUOTED(DPDK_CRYPTO,		[${n_with_dpdk_crypto}])
+AC_DEFINE_UNQUOTED(IPSEC,		[${n_with_ipsec}])
+AC_DEFINE_UNQUOTED(IPV6SR,		[${n_with_ipv6sr}])
+
+###############################################################################
+# Dependency checks
+###############################################################################
+
+AM_COND_IF([ENABLE_DPDK_SHARED],
+[
+  AC_CHECK_HEADERS([rte_config.h],
+    [],
+    [AC_MSG_ERROR([DPDK header files not found])],)
+  AC_CHECK_LIB( [dpdk], [rte_eal_init],
+    [],
+    [AC_MSG_ERROR([DPDK shared library not found])],)
+])
+
+AM_COND_IF([ENABLE_G2],
+[
+  PKG_CHECK_MODULES(g2, gtk+-2.0)
+])
+
+###############################################################################
+# Plugins
+###############################################################################
+
+PLUGIN_ENABLED(sixrd)
+PLUGIN_ENABLED(ila)
+PLUGIN_ENABLED(flowperpkt)
+
+###############################################################################
+# Output
+###############################################################################
+
+AC_OUTPUT
+
+AC_MSG_RESULT([==============================================================================])
+PRINT_VAL([version], $PACKAGE $VERSION)
+PRINT_VAL([prefix], ${prefix})
+PRINT_VAL([libdir], ${libdir})
+PRINT_VAL([includedir], ${includedir})
+PRINT_VAL([CFLAGS], ${CFLAGS})
+PRINT_VAL([CPPFLAGS], ${CPPFLAGS})
+PRINT_VAL([LDFLAGS], ${LDFLAGS})
+
+AC_MSG_RESULT([])
+AC_MSG_RESULT([with:])
+m4_foreach([x], m4_dquote(list_of_with), [
+  AC_MSG_RESULT(AC_HELP_STRING(x, m4_join([], [${with_], x, [}])))
+])
+
+AC_MSG_RESULT([])
+AC_MSG_RESULT([enabled:])
+m4_foreach([x], m4_dquote(list_of_enabled), [
+  AC_MSG_RESULT(AC_HELP_STRING(x, m4_join([], [${enable_], x, [}])))
+])
+
+AC_MSG_RESULT([])
+AC_MSG_RESULT([plugins:])
+m4_foreach([x], m4_dquote(list_of_plugins), [
+  AC_MSG_RESULT(AC_HELP_STRING(x, m4_join([], [${enable_], x, [_plugin}])))
+])
+AC_MSG_RESULT([==============================================================================])
+
+
diff --git a/src/examples/vlib/dir.dox b/src/examples/vlib/dir.dox
new file mode 100644
index 00000000..d3ac0ee4
--- /dev/null
+++ b/src/examples/vlib/dir.dox
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Doxygen directory documentation */
+/**
+@dir
+@brief Someone please fix this description
+@todo This directory needs a description.
+*/
diff --git a/src/examples/vlib/main_stub.c b/src/examples/vlib/main_stub.c
new file mode 100644
index 00000000..4d74bd77
--- /dev/null
+++ b/src/examples/vlib/main_stub.c
@@ -0,0 +1,418 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <math.h>
+
+int
+main (int argc, char *argv[])
+{
+  return vlib_unix_main (argc, argv);
+}
+
+static clib_error_t *
+main_stub_init (vlib_main_t * vm)
+{
+  clib_error_t *error;
+
+  if ((error =
+       unix_physmem_init (vm, /* fail_if_physical_memory_not_present */ 0)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, unix_cli_init)))
+    return error;
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (main_stub_init);
+
+#if 0
+/* Node test code. */
+typedef struct
+{
+  int scalar;
+  int vector[0];
+} my_frame_t;
+
+static u8 *
+format_my_node_frame (u8 * s, va_list * va)
+{
+  vlib_frame_t *f = va_arg (*va, vlib_frame_t *);
+  my_frame_t *g = vlib_frame_args (f);
+  int i;
+
+  s = format (s, "scalar %d, vector { ", g->scalar);
+  for (i = 0; i < f->n_vectors; i++)
+    s = format (s, "%d, ", g->vector[i]);
+  s = format (s, " }");
+
+  return s;
+}
+
+static uword
+my_func (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  vlib_node_t *node;
+  my_frame_t *y;
+  u32 i, n_left = 0;
+  static int serial;
+  int verbose;
+
+  node = vlib_get_node (vm, rt->node_index);
+
+  verbose = 0;
+
+  if (verbose && f)
+    vlib_cli_output (vm, "%v: call frame %p %U", node->name,
+		     f, format_my_node_frame, f);
+
+  if (rt->n_next_nodes > 0)
+    {
+      vlib_frame_t *next = vlib_get_next_frame (vm, rt, /* next index */ 0);
+      n_left = VLIB_FRAME_SIZE - next->n_vectors;
+      y = vlib_frame_args (next);
+      y->scalar = serial++;
+    }
+  else
+    y = 0;
+
+  for (i = 0; i < 5; i++)
+    {
+      if (y)
+	{
+	  ASSERT (n_left > 0);
+	  n_left--;
+	  y->vector[i] = y->scalar + i;
+	}
+    }
+  if (y)
+    vlib_put_next_frame (vm, rt, /* next index */ 0, n_left);
+
+  if (verbose)
+    vlib_cli_output (vm, "%v: return frame %p", node->name, f);
+
+  return i;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (my_node1,static) = {
+  .function = my_func,
+  .type = VLIB_NODE_TYPE_INPUT,
+  .name = "my-node1",
+  .scalar_size = sizeof (my_frame_t),
+  .vector_size = STRUCT_SIZE_OF (my_frame_t, vector[0]),
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "my-node2",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (my_node2,static) = {
+  .function = my_func,
+  .name = "my-node2",
+  .scalar_size = sizeof (my_frame_t),
+  .vector_size = STRUCT_SIZE_OF (my_frame_t, vector[0]),
+};
+/* *INDENT-ON* */
+
+#endif
+
+#if 0
+
+typedef enum
+{
+  MY_EVENT_TYPE1,
+  MY_EVENT_TYPE2,
+} my_process_completion_type_t;
+
+typedef struct
+{
+  int a;
+  f64 b;
+} my_process_event_data_t;
+
+static u8 *
+format_my_process_event_data (u8 * s, va_list * va)
+{
+  my_process_event_data_t *d = va_arg (*va, my_process_event_data_t *);
+  return format (s, "{ a %d b %.6f}", d->a, d->b);
+}
+
+static uword
+my_proc (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  vlib_node_t *node;
+  u32 i;
+
+  node = vlib_get_node (vm, rt->node_index);
+
+  vlib_cli_output (vm, "%v: call frame %p", node->name, f);
+
+  for (i = 0; i < 5; i++)
+    {
+      vlib_cli_output (vm, "%v: %d", node->name, i);
+      vlib_process_suspend (vm, 1e0 /* secs */ );
+    }
+
+  vlib_cli_output (vm, "%v: return frame %p", node->name, f);
+
+  if (0)
+    {
+      uword n_events_seen, type, *data = 0;
+
+      for (n_events_seen = 0; n_events_seen < 2;)
+	{
+	  vlib_process_wait_for_event (vm);
+	  type = vlib_process_get_events (vm, &data);
+	  n_events_seen += vec_len (data);
+	  vlib_cli_output (vm, "%U %v: completion #%d type %d data 0x%wx",
+			   format_time_interval, "h:m:s:u",
+			   vlib_time_now (vm), node->name, i, type, data[0]);
+	  _vec_len (data) = 0;
+	}
+
+      vec_free (data);
+    }
+  else
+    {
+      uword n_events_seen, i, type;
+      my_process_event_data_t *data;
+      for (n_events_seen = 0; n_events_seen < 2;)
+	{
+	  vlib_process_wait_for_event (vm);
+	  data = vlib_process_get_event_data (vm, &type);
+	  vec_foreach_index (i, data)
+	  {
+	    vlib_cli_output (vm, "%U event type %d data %U",
+			     format_time_interval, "h:m:s:u",
+			     vlib_time_now (vm), type,
+			     format_my_process_event_data, data);
+	  }
+	  n_events_seen += vec_len (data);
+	  vlib_process_put_event_data (vm, data);
+	}
+    }
+
+  return i;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (my_proc_node,static) = {
+  .function = my_proc,
+  .type = VLIB_NODE_TYPE_PROCESS,
+  .name = "my-proc",
+};
+/* *INDENT-ON* */
+
+static uword
+my_proc_input (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  static int i;
+
+  if (i++ < 2)
+    {
+      if (0)
+	vlib_process_signal_event (vm, my_proc_node.index,
+				   i == 1 ? MY_EVENT_TYPE1 : MY_EVENT_TYPE2,
+				   0x12340000 + i);
+      else
+	{
+	  my_process_event_data_t *d;
+	  f64 dt = 5;
+	  d = vlib_process_signal_event_at_time (vm,
+						 i * dt,
+						 my_proc_node.index,
+						 i ==
+						 1 ? MY_EVENT_TYPE1 :
+						 MY_EVENT_TYPE2,
+						 1 /* elts */ ,
+						 sizeof (d[0]));
+	  d->a = i;
+	  d->b = vlib_time_now (vm);
+	}
+    }
+  else
+    vlib_node_set_state (vm, rt->node_index, VLIB_NODE_STATE_DISABLED);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (my_proc_input_node,static) = {
+  .function = my_proc_input,
+  .type = VLIB_NODE_TYPE_INPUT,
+  .name = "my-proc-input",
+};
+/* *INDENT-ON* */
+
+static uword
+_unformat_farith (unformat_input_t * i, va_list * args)
+{
+  u32 prec = va_arg (*args, u32);
+  f64 *result = va_arg (*args, f64 *);
+  f64 tmp[2];
+
+  /* Binary operations in from lowest to highest precedence. */
+  char *binops[] = {
+    "+%U", "-%U", "/%U", "*%U", "^%U",
+  };
+
+  if (prec <= ARRAY_LEN (binops) - 1
+      && unformat_user (i, _unformat_farith, prec + 1, &tmp[0]))
+    {
+      int p;
+      for (p = prec; p < ARRAY_LEN (binops); p++)
+	{
+	  if (unformat (i, binops[p], _unformat_farith, prec + 0, &tmp[1]))
+	    {
+	      switch (binops[p][0])
+		{
+		case '+':
+		  result[0] = tmp[0] + tmp[1];
+		  break;
+		case '-':
+		  result[0] = tmp[0] - tmp[1];
+		  break;
+		case '/':
+		  result[0] = tmp[0] / tmp[1];
+		  break;
+		case '*':
+		  result[0] = tmp[0] * tmp[1];
+		  break;
+		case '^':
+		  result[0] = pow (tmp[0], tmp[1]);
+		  break;
+		default:
+		  abort ();
+		}
+	      return 1;
+	    }
+	}
+      result[0] = tmp[0];
+      return 1;
+    }
+
+  else if (unformat (i, "-%U", _unformat_farith, prec + 0, &tmp[0]))
+    {
+      result[0] = -tmp[0];
+      return 1;
+    }
+
+  else if (unformat (i, "(%U)", _unformat_farith, 0, &tmp[0]))
+    {
+      result[0] = tmp[0];
+      return 1;
+    }
+
+  else if (unformat (i, "%f", result))
+    return 1;
+
+  else
+    return 0;
+}
+
+static uword
+unformat_farith (unformat_input_t * i, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  f64 *result = va_arg (*args, f64 *);
+  return unformat_user (i, _unformat_farith, 0, result);
+}
+
+static uword
+unformat_integer (unformat_input_t * i, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  u32 *data = va_arg (*args, u32 *);
+  return unformat (i, "%d", data);
+}
+
+static VLIB_CLI_PARSE_RULE (my_parse_rule1) =
+{
+.name = "decimal_integer",.short_help =
+    "a decimal integer",.unformat_function = unformat_integer,.data_size =
+    sizeof (u32),};
+
+static VLIB_CLI_PARSE_RULE (my_parse_rule2) =
+{
+.name = "float_expression",.short_help =
+    "floating point expression",.unformat_function =
+    unformat_farith,.data_size = sizeof (f64),};
+
+static clib_error_t *
+bar_command (vlib_main_t * vm,
+	     unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  switch (cmd->function_arg)
+    {
+    case 2:
+      {
+	u32 *d, *e;
+	d = vlib_cli_get_parse_rule_result (vm, 0);
+	e = vlib_cli_get_parse_rule_result (vm, 1);
+	vlib_cli_output (vm, "bar2 %d %d", d[0], e[0]);
+	break;
+      }
+
+    case 1:
+      {
+	u32 *d = vlib_cli_get_parse_rule_result (vm, 0);
+	vlib_cli_output (vm, "bar1 %d", d[0]);
+	break;
+      }
+
+    case 3:
+      {
+	f64 *d = vlib_cli_get_parse_rule_result (vm, 0);
+	vlib_cli_output (vm, "expr %.6f", d[0]);
+      }
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (bar_command2, static) = {
+  .path = "bar %decimal_integer",
+  .short_help = "bar1 command",
+  .function = bar_command,
+  .function_arg = 1,
+};
+VLIB_CLI_COMMAND (bar_command1, static) = {
+  .path = "bar %decimal_integer %decimal_integer",
+  .short_help = "bar2 command",
+  .function = bar_command,
+  .function_arg = 2,
+};
+VLIB_CLI_COMMAND (bar_command3, static) = {
+  .path = "zap %float_expression",
+  .short_help = "bar3 command",
+  .function = bar_command,
+  .function_arg = 3,
+};
+/* *INDENT-ON* */
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/examples/vlib/mc_test.c b/src/examples/vlib/mc_test.c
new file mode 100644
index 00000000..e84a713c
--- /dev/null
+++ b/src/examples/vlib/mc_test.c
@@ -0,0 +1,384 @@
+/*
+ * mc_test.c: test program for vlib mc
+ *
+ * Copyright (c) 2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vlib/unix/mc_socket.h>
+#include <vppinfra/random.h>
+
+typedef struct
+{
+  u32 min_n_msg_bytes;
+  u32 max_n_msg_bytes;
+  u32 tx_serial;
+  u32 rx_serial;
+  u32 seed;
+  u32 verbose;
+  u32 validate;
+  u32 window_size;
+  f64 min_delay, max_delay;
+  f64 n_packets_to_send;
+} mc_test_main_t;
+
+always_inline u32
+choose_msg_size (mc_test_main_t * tm)
+{
+  u32 r = tm->min_n_msg_bytes;
+  if (tm->max_n_msg_bytes > tm->min_n_msg_bytes)
+    r +=
+      random_u32 (&tm->seed) % (1 + tm->max_n_msg_bytes -
+				tm->min_n_msg_bytes);
+  return r;
+}
+
+static mc_test_main_t mc_test_main;
+
+static void
+serialize_test_msg (serialize_main_t * m, va_list * va)
+{
+  mc_test_main_t *tm = &mc_test_main;
+  u32 n_bytes = choose_msg_size (tm);
+  u8 *msg;
+  int i;
+  serialize_integer (m, n_bytes, sizeof (n_bytes));
+  msg = serialize_get (m, n_bytes);
+  for (i = 0; i < n_bytes; i++)
+    msg[i] = i + tm->tx_serial;
+  tm->tx_serial += n_bytes;
+}
+
+static void
+unserialize_test_msg (serialize_main_t * m, va_list * va)
+{
+  mc_test_main_t *tm = &mc_test_main;
+  u32 i, n_bytes, dump_msg = tm->verbose;
+  u8 *p;
+  unserialize_integer (m, &n_bytes, sizeof (n_bytes));
+  p = unserialize_get (m, n_bytes);
+  if (tm->validate)
+    for (i = 0; i < n_bytes; i++)
+      if (p[i] != ((tm->rx_serial + i) & 0xff))
+	{
+	  clib_warning ("corrupt msg at offset %d", i);
+	  dump_msg = 1;
+	  break;
+	}
+  if (dump_msg)
+    clib_warning ("got %d bytes, %U", n_bytes, format_hex_bytes, p, n_bytes);
+  tm->rx_serial += n_bytes;
+}
+
+MC_SERIALIZE_MSG (test_msg, static) =
+{
+.name = "test_msg",.serialize = serialize_test_msg,.unserialize =
+    unserialize_test_msg,};
+
+#define SERIALIZE 1
+
+#define EVENT_JOIN_STREAM 	10
+#define EVENT_SEND_DATA 	11
+
+static void
+test_rx_callback (mc_main_t * mcm,
+		  mc_stream_t * stream,
+		  mc_peer_id_t peer_id, u32 buffer_index)
+{
+  if (SERIALIZE)
+    {
+      return mc_unserialize (mcm, stream, buffer_index);
+    }
+  else
+    {
+#if DEBUG > 1
+      vlib_main_t *vm = mcm->vlib_main;
+      vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
+      u8 *dp = vlib_buffer_get_current (b);
+
+      fformat (stdout, "RX from %U %U\n",
+	       stream->transport->format_peer_id, peer_id,
+	       format_hex_bytes, dp, tm->n_msg_bytes);
+
+#endif
+    }
+}
+
+static u8 *
+test_snapshot_callback (mc_main_t * mcm,
+			u8 * data_vector, u32 last_global_sequence_processed)
+{
+  if (SERIALIZE)
+    {
+      serialize_main_t m;
+
+      /* Append serialized data to data vector. */
+      serialize_open_vector (&m, data_vector);
+      m.stream.current_buffer_index = vec_len (data_vector);
+
+      return serialize_close_vector (&m);
+    }
+  else
+    return format (data_vector,
+		   "snapshot, last global seq 0x%x",
+		   last_global_sequence_processed);
+}
+
+static void
+test_handle_snapshot_callback (mc_main_t * mcm, u8 * data, u32 n_data_bytes)
+{
+  if (SERIALIZE)
+    {
+      serialize_main_t s;
+      unserialize_open_data (&s, data, n_data_bytes);
+    }
+  else
+    clib_warning ("snapshot `%*s'", n_data_bytes, data);
+}
+
+static mc_socket_main_t mc_socket_main;
+
+static uword
+mc_test_process (vlib_main_t * vm,
+		 vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  mc_test_main_t *tm = &mc_test_main;
+  mc_socket_main_t *msm = &mc_socket_main;
+  mc_main_t *mcm = &msm->mc_main;
+  uword event_type, *event_data = 0;
+  u32 data_serial = 0, stream_index;
+  f64 delay;
+  mc_stream_config_t config;
+  clib_error_t *error;
+  int i;
+  char *intfcs[] = { "eth1", "eth0", "ce" };
+
+  memset (&config, 0, sizeof (config));
+  config.name = "test";
+  config.window_size = tm->window_size;
+  config.rx_buffer = test_rx_callback;
+  config.catchup_snapshot = test_snapshot_callback;
+  config.catchup = test_handle_snapshot_callback;
+  stream_index = ~0;
+
+  msm->multicast_tx_ip4_address_host_byte_order = 0xefff0100;
+  msm->base_multicast_udp_port_host_byte_order = 0xffab;
+
+  error = mc_socket_main_init (&mc_socket_main, intfcs, ARRAY_LEN (intfcs));
+  if (error)
+    {
+      clib_error_report (error);
+      exit (1);
+    }
+
+  mcm->we_can_be_relay_master = 1;
+
+  while (1)
+    {
+      vlib_process_wait_for_event (vm);
+      event_type = vlib_process_get_events (vm, &event_data);
+
+      switch (event_type)
+	{
+	case EVENT_JOIN_STREAM:
+	  stream_index = mc_stream_join (mcm, &config);
+	  break;
+
+	case EVENT_SEND_DATA:
+	  {
+	    f64 times[2];
+
+	    if (stream_index == ~0)
+	      stream_index = mc_stream_join (mcm, &config);
+
+	    times[0] = vlib_time_now (vm);
+	    for (i = 0; i < event_data[0]; i++)
+	      {
+		u32 bi;
+		if (SERIALIZE)
+		  {
+		    mc_serialize_stream (mcm, stream_index, &test_msg,
+					 data_serial);
+		  }
+		else
+		  {
+		    u8 *mp;
+		    mp = mc_get_vlib_buffer (vm, sizeof (mp[0]), &bi);
+		    mp[0] = data_serial;
+		    mc_stream_send (mcm, stream_index, bi);
+		  }
+		if (tm->min_delay > 0)
+		  {
+		    delay =
+		      tm->min_delay +
+		      random_f64 (&tm->seed) * (tm->max_delay -
+						tm->min_delay);
+		    vlib_process_suspend (vm, delay);
+		  }
+		data_serial++;
+	      }
+	    times[1] = vlib_time_now (vm);
+	    clib_warning ("done sending %d; %.4e per sec",
+			  event_data[0],
+			  (f64) event_data[0] / (times[1] - times[0]));
+	    break;
+	  }
+
+	default:
+	  clib_warning ("bug");
+	  break;
+	}
+
+      if (event_data)
+	_vec_len (event_data) = 0;
+    }
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (mc_test_process_node, static) =
+{
+.function = mc_test_process,.type = VLIB_NODE_TYPE_PROCESS,.name =
+    "mc-test-process",};
+/* *INDENT-ON* */
+
+static clib_error_t *
+mc_test_command (vlib_main_t * vm,
+		 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  f64 npkts = 10;
+
+  if (unformat (input, "join"))
+    {
+      vlib_cli_output (vm, "Join stream...\n");
+      vlib_process_signal_event (vm, mc_test_process_node.index,
+				 EVENT_JOIN_STREAM, 0);
+      return 0;
+    }
+  else if (unformat (input, "send %f", &npkts) || unformat (input, "send"))
+    {
+      vlib_process_signal_event (vm, mc_test_process_node.index,
+				 EVENT_SEND_DATA, (uword) npkts);
+      vlib_cli_output (vm, "Send %.0f pkts...\n", npkts);
+
+      return 0;
+    }
+  else
+    return unformat_parse_error (input);
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (test_mc_command, static) =
+{
+.path = "test mc",.short_help = "Test mc command",.function =
+    mc_test_command,};
+/* *INDENT-ON* */
+
+static clib_error_t *
+mc_show_command (vlib_main_t * vm,
+		 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  mc_main_t *mcm = &mc_socket_main.mc_main;
+  vlib_cli_output (vm, "%U", format_mc_main, mcm);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_mc_command, static) =
+{
+.path = "show mc",.short_help = "Show mc command",.function =
+    mc_show_command,};
+/* *INDENT-ON* */
+
+static clib_error_t *
+mc_clear_command (vlib_main_t * vm,
+		  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  mc_main_t *mcm = &mc_socket_main.mc_main;
+  mc_clear_stream_stats (mcm);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (clear_mc_command, static) =
+{
+.path = "clear mc",.short_help = "Clear mc command",.function =
+    mc_clear_command,};
+/* *INDENT-ON* */
+
+static clib_error_t *
+mc_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  mc_test_main_t *tm = &mc_test_main;
+  mc_socket_main_t *msm = &mc_socket_main;
+  clib_error_t *error = 0;
+
+  tm->min_n_msg_bytes = 4;
+  tm->max_n_msg_bytes = 4;
+  tm->window_size = 8;
+  tm->seed = getpid ();
+  tm->verbose = 0;
+  tm->validate = 1;
+  tm->min_delay = 10e-6;
+  tm->max_delay = 10e-3;
+  tm->n_packets_to_send = 0;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "interface %s", &msm->multicast_interface_name))
+	;
+
+      else if (unformat (input, "n-bytes %d", &tm->max_n_msg_bytes))
+	tm->min_n_msg_bytes = tm->max_n_msg_bytes;
+      else if (unformat (input, "max-n-bytes %d", &tm->max_n_msg_bytes))
+	;
+      else if (unformat (input, "min-n-bytes %d", &tm->min_n_msg_bytes))
+	;
+      else if (unformat (input, "seed %d", &tm->seed))
+	;
+      else if (unformat (input, "window %d", &tm->window_size))
+	;
+      else if (unformat (input, "verbose"))
+	tm->verbose = 1;
+      else if (unformat (input, "no-validate"))
+	tm->validate = 0;
+      else if (unformat (input, "min-delay %f", &tm->min_delay))
+	;
+      else if (unformat (input, "max-delay %f", &tm->max_delay))
+	;
+      else if (unformat (input, "no-delay"))
+	tm->min_delay = tm->max_delay = 0;
+      else if (unformat (input, "n-packets %f", &tm->n_packets_to_send))
+	;
+
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+
+  if (tm->n_packets_to_send > 0)
+    vlib_process_signal_event (vm, mc_test_process_node.index,
+			       EVENT_SEND_DATA,
+			       (uword) tm->n_packets_to_send);
+
+  return error;
+}
+
+VLIB_CONFIG_FUNCTION (mc_config, "mc");
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/examples/vlib/plex_test.c b/src/examples/vlib/plex_test.c
new file mode 100644
index 00000000..ce0c8ef1
--- /dev/null
+++ b/src/examples/vlib/plex_test.c
@@ -0,0 +1,527 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/parse.h>
+#include <vlib/unix/unix.h>
+
+static u8 *
+format_value_v4_address (u8 * s, va_list * args)
+{
+  vlib_parse_value_t *v = va_arg (*args, vlib_parse_value_t *);
+  u32 a = v->value.as_uword;
+
+  s = format (s, "%d.%d.%d.%d",
+	      (a >> 24) & 0xFF,
+	      (a >> 16) & 0xFF, (a >> 8) & 0xFF, (a >> 0) & 0xFF);
+
+  return s;
+}
+
+static vlib_parse_match_t
+v4_address_match (vlib_parse_main_t * pm, vlib_parse_type_t * type,
+		  vlib_lex_token_t * t, vlib_parse_value_t * valuep)
+{
+  u32 digit;
+  u32 value = 0;
+  int i;
+
+  if (vec_len (pm->tokens) - (t - pm->tokens) < 7)
+    return VLIB_PARSE_MATCH_FAIL;
+
+  /* NUMBER DOT NUMBER DOT NUMBER DOT NUMBER */
+
+  for (i = 0; i < 7; i++)
+    {
+      if ((i & 1) == 0)
+	{
+	  if (t[i].token != VLIB_LEX_number)
+	    return VLIB_PARSE_MATCH_FAIL;
+	  if (t[i].value.as_uword > 0xff)
+	    return VLIB_PARSE_MATCH_FAIL;
+	  digit = t[i].value.as_uword;
+	  value = (value << 8) | digit;
+	}
+      else
+	{
+	  if (t[i].token != VLIB_LEX_dot)
+	    return VLIB_PARSE_MATCH_FAIL;
+	}
+    }
+  /* note: caller advances by 1 */
+  pm->current_token_index += 6;
+  valuep->value.as_uword = value;
+  return VLIB_PARSE_MATCH_VALUE;
+}
+
+PARSE_TYPE_INIT (v4_address, v4_address_match, 0, format_value_v4_address)
+     static u8 *format_value_v4_address_and_mask (u8 * s, va_list * args)
+{
+  vlib_parse_value_t *v = va_arg (*args, vlib_parse_value_t *);
+  u32 *a = v->value.as_pointer;
+
+  s = format (s, "%d.%d.%d.%d",
+	      (a[0] >> 24) & 0xFF,
+	      (a[0] >> 16) & 0xFF, (a[0] >> 8) & 0xFF, (a[0] >> 0) & 0xFF);
+  s = format (s, "/%d", a[1]);
+
+  return s;
+}
+
+static vlib_parse_match_t
+v4_address_and_mask_match (vlib_parse_main_t * pm, vlib_parse_type_t * type,
+			   vlib_lex_token_t * t, vlib_parse_value_t * valuep)
+{
+  u32 digit;
+  u32 address = 0;
+  u32 *rv = 0;
+  int i;
+
+  if (vec_len (pm->tokens) - (t - pm->tokens) < 9)
+    return VLIB_PARSE_MATCH_FAIL;
+
+  /* NUMBER DOT NUMBER DOT NUMBER DOT NUMBER */
+
+  for (i = 0; i < 7; i++)
+    {
+      if ((i & 1) == 0)
+	{
+	  if (t[i].token != VLIB_LEX_number)
+	    return VLIB_PARSE_MATCH_FAIL;
+	  if (t[i].value.as_uword > 0xff)
+	    return VLIB_PARSE_MATCH_FAIL;
+	  digit = t[i].value.as_uword;
+	  address = (address << 8) | digit;
+	}
+      else
+	{
+	  if (t[i].token != VLIB_LEX_dot)
+	    return VLIB_PARSE_MATCH_FAIL;
+	}
+    }
+
+  if (t[7].token != VLIB_LEX_slash || t[8].token != VLIB_LEX_number)
+    return VLIB_PARSE_MATCH_FAIL;
+
+  vec_add1 (rv, address);
+  vec_add1 (rv, t[8].value.as_uword);
+
+  /* note: caller advances by 1 */
+  pm->current_token_index += 8;
+  valuep->value.as_pointer = rv;
+  return VLIB_PARSE_MATCH_VALUE;
+}
+
+void
+v4_address_and_mask_cleanup (vlib_parse_value_t * valuep)
+{
+  u32 *trash = valuep->value.as_pointer;
+  vec_free (trash);
+}
+
+PARSE_TYPE_INIT (v4_address_and_mask, v4_address_and_mask_match,
+		 v4_address_and_mask_cleanup,
+		 format_value_v4_address_and_mask)
+     vlib_lex_main_t vlib_lex_main;
+
+
+
+     vlib_parse_match_t eval_factor0 (vlib_parse_main_t * pm,
+				      vlib_parse_item_t * item,
+				      vlib_parse_value_t * value)
+{
+  clib_warning ("%U", format_vlib_parse_value, pm);
+  return VLIB_PARSE_MATCH_RULE;
+}
+
+vlib_parse_match_t
+eval_factor1 (vlib_parse_main_t * pm,
+	      vlib_parse_item_t * item, vlib_parse_value_t * value)
+{
+  clib_warning ("%U", format_vlib_parse_value, pm);
+  return VLIB_PARSE_MATCH_RULE;
+}
+
+vlib_parse_match_t
+eval_factor2 (vlib_parse_main_t * pm,
+	      vlib_parse_item_t * item, vlib_parse_value_t * value)
+{
+  word a;
+  int index = vec_len (pm->parse_value) - 1;
+
+  a = pm->parse_value[index].value.as_word;
+
+  pm->parse_value[index].value.as_word = -a;
+  return VLIB_PARSE_MATCH_RULE;
+}
+
+vlib_parse_match_t
+eval_term0 (vlib_parse_main_t * pm,
+	    vlib_parse_item_t * item, vlib_parse_value_t * value)
+{
+  clib_warning ("%U", format_vlib_parse_value, pm);
+  return VLIB_PARSE_MATCH_RULE;
+}
+
+vlib_parse_match_t
+eval_term1 (vlib_parse_main_t * pm,
+	    vlib_parse_item_t * item, vlib_parse_value_t * value)
+{
+  uword a, b;
+  int index = vec_len (pm->parse_value) - 2;
+
+  a = pm->parse_value[index].value.as_uword;
+  b = pm->parse_value[index + 1].value.as_uword;
+
+  pm->parse_value[index].value.as_uword = a * b;
+  _vec_len (pm->parse_value) -= 1;
+  clib_warning ("%U", format_vlib_parse_value, pm);
+
+  return VLIB_PARSE_MATCH_RULE;
+}
+
+vlib_parse_match_t
+eval_term2 (vlib_parse_main_t * pm,
+	    vlib_parse_item_t * item, vlib_parse_value_t * value)
+{
+  uword a, b;
+  int index = vec_len (pm->parse_value) - 2;
+
+  a = pm->parse_value[index].value.as_uword;
+  b = pm->parse_value[index + 1].value.as_uword;
+
+  pm->parse_value[index].value.as_uword = a / b;
+  _vec_len (pm->parse_value) -= 1;
+  clib_warning ("%U", format_vlib_parse_value, pm);
+
+  return VLIB_PARSE_MATCH_RULE;
+}
+
+vlib_parse_match_t
+eval_exp0 (vlib_parse_main_t * pm,
+	   vlib_parse_item_t * item, vlib_parse_value_t * value)
+{
+  return VLIB_PARSE_MATCH_RULE;
+}
+
+vlib_parse_match_t
+eval_exp1 (vlib_parse_main_t * pm,
+	   vlib_parse_item_t * item, vlib_parse_value_t * value)
+{
+  uword a, b;
+  int index = vec_len (pm->parse_value) - 2;
+
+  a = pm->parse_value[index].value.as_uword;
+  b = pm->parse_value[index + 1].value.as_uword;
+
+  pm->parse_value[index].value.as_uword = a + b;
+  _vec_len (pm->parse_value) -= 1;
+  clib_warning ("%U", format_vlib_parse_value, pm);
+
+  return VLIB_PARSE_MATCH_RULE;
+}
+
+vlib_parse_match_t
+eval_exp2 (vlib_parse_main_t * pm,
+	   vlib_parse_item_t * item, vlib_parse_value_t * value)
+{
+  uword a, b;
+  int index = vec_len (pm->parse_value) - 2;
+
+  a = pm->parse_value[index].value.as_uword;
+  b = pm->parse_value[index + 1].value.as_uword;
+
+  pm->parse_value[index].value.as_uword = a - b;
+  _vec_len (pm->parse_value) -= 1;
+  clib_warning ("%U", format_vlib_parse_value, pm);
+
+  return VLIB_PARSE_MATCH_RULE;
+}
+
+vlib_parse_match_t
+eval_result (vlib_parse_main_t * pm,
+	     vlib_parse_item_t * item, vlib_parse_value_t * value)
+{
+  clib_warning ("%U", format_vlib_parse_value, pm);
+  return VLIB_PARSE_MATCH_DONE;
+}
+
+vlib_parse_match_t
+noop_match_rule (vlib_parse_main_t * pm,
+		 vlib_parse_item_t * item, vlib_parse_value_t * value)
+{
+  clib_warning ("%U", format_vlib_parse_value, pm);
+  return VLIB_PARSE_MATCH_RULE;
+}
+
+#if 0
+PARSE_INIT (t1, "moo", eval0);
+PARSE_INIT (t2, "moo cow mumble", eval1);
+PARSE_INIT (t3, "moo cow", eval2);
+PARSE_INIT (t4, "moo cow mumble grunch", eval3);
+#endif
+
+#if 0
+PARSE_INIT (r1, "eval <exp>", eval_result);
+
+PARSE_INIT (r2, "<exp> = <term><exp2>", eval_exp0);
+PARSE_INIT (r3, "<exp2> = <plus> <exp>", eval_exp1);
+PARSE_INIT (r4, "<exp2> = <minus> <exp>", eval_exp2);
+PARSE_INIT (r5, "<exp2> = ", noop_match_rule);
+PARSE_TYPE_INIT (exp, rule_match, 0, 0);
+PARSE_TYPE_INIT (exp2, rule_match, 0, 0);
+
+PARSE_INIT (r6, "<term> = <factor><term2>", eval_term0);
+PARSE_INIT (r7, "<term2> = <star> <term>", eval_term1);
+PARSE_INIT (r8, "<term2> = <slash> <term>", eval_term2);
+PARSE_INIT (r9, "<term2> = ", noop_match_rule);
+PARSE_TYPE_INIT (term, rule_match, 0, 0);
+PARSE_TYPE_INIT (term2, rule_match, 0, 0);
+
+PARSE_INIT (r11, "<factor> = <lpar> <exp> <rpar>", eval_factor1);
+PARSE_INIT (r10, "<factor> = <number>", eval_factor0);
+PARSE_INIT (r12, "<factor> = <minus> <factor>", eval_factor2);
+
+PARSE_TYPE_INIT (factor, rule_match, 0, 0);
+#endif
+
+PARSE_INIT (r1, "eval <exp>", eval_result);
+
+#if 1
+PARSE_INIT (r2, "<exp> = <term><exp2>", eval_exp0);
+PARSE_INIT (r3, "<exp2> = <plus> <exp>", eval_exp1);
+PARSE_INIT (r4, "<exp2> = <minus> <exp>", eval_exp2);
+PARSE_INIT (r5, "<exp2> = ", noop_match_rule);
+PARSE_TYPE_INIT (exp, rule_match, 0, 0);
+PARSE_TYPE_INIT (exp2, rule_match, 0, 0);
+
+PARSE_INIT (r6, "<term> = <factor><term2>", eval_term0);
+PARSE_INIT (r7, "<term2> = <star> <term>", eval_term1);
+PARSE_INIT (r8, "<term2> = <slash> <term>", eval_term2);
+PARSE_INIT (r9, "<term2> = ", noop_match_rule);
+PARSE_TYPE_INIT (term, rule_match, 0, 0);
+PARSE_TYPE_INIT (term2, rule_match, 0, 0);
+
+PARSE_INIT (r11, "<factor> = <lpar> <exp> <rpar>", eval_factor1);
+PARSE_INIT (r10, "<factor> = <number>", eval_factor0);
+PARSE_INIT (r12, "<factor> = <minus> <factor>", eval_factor2);
+
+PARSE_TYPE_INIT (factor, rule_match, 0, 0);
+#endif
+
+#if 0
+PARSE_TYPE_INIT (exp, rule_match, 0, 0);
+PARSE_INIT (r6, "<exp> = a b", eval_term0);
+PARSE_INIT (r7, "<exp> = c d", eval_term1);
+PARSE_INIT (r9, "<exp> = ", noop_match_rule);
+#endif
+
+#if 0
+#define foreach_rule_evaluator                  \
+_(0)                                            \
+_(1)                                            \
+_(2)						\
+_(3)
+
+#define _(n)                                            \
+vlib_parse_match_t eval##n (vlib_parse_main_t *pm,      \
+                            vlib_parse_item_t *item,    \
+                            vlib_parse_value_t *value)  \
+{                                                       \
+  clib_warning ("%U", format_vlib_parse_value, pm);     \
+  return VLIB_PARSE_MATCH_DONE;                         \
+}
+foreach_rule_evaluator
+#undef _
+PARSE_INIT (r1, "eval <moo>", eval_result);
+
+PARSE_INIT (r2, "<moo> = cow", eval0);
+PARSE_INIT (r4, "<moo> = ", eval1);
+PARSE_TYPE_INIT (moo, rule_match, 0, 0);
+#endif
+
+
+clib_error_t *
+test_init (vlib_main_t * vm)
+{
+  clib_error_t *error;
+
+  if ((error = vlib_call_init_function (vm, parse_init)))
+    return error;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (test_init);
+
+clib_error_t *
+vlib_stdlex_init (vlib_main_t * vm)
+{
+  vlib_lex_main_t *lm = &vlib_lex_main;
+  u16 top_index;
+  u16 slash_index, slash_star_index, slash_slash_index, slash_star_star_index;
+  u16 slash_token;
+  u16 word_index;
+  u16 zero_index, octal_index, decimal_index, hex_index, binary_index;
+
+  top_index = vlib_lex_add_table ("top");
+
+#define foreach_top_level_single_character_token        \
+  _('(', lpar)                                          \
+  _(')', rpar)                                          \
+  _(';', semi)                                          \
+  _('[', lbrack)                                        \
+  _(']', rbrack)                                        \
+  _('{', lcurly)                                        \
+  _('}', rcurly)                                        \
+  _('+', plus)                                          \
+  _('-', minus)                                         \
+  _('*', star)                                          \
+  _('%', percent)                                       \
+  _('@', atsign)                                        \
+  _(',', comma)                                         \
+  _('.', dot)                                           \
+  _('?', qmark)
+
+#define _(c,t) \
+  vlib_lex_set_action_range(top_index,c,c,VLIB_LEX_RETURN,vlib_lex_add_token(lm, #t), top_index);
+  foreach_top_level_single_character_token;
+#undef _
+
+  /* Numbers */
+  zero_index = vlib_lex_add_table ("zero");
+  octal_index = vlib_lex_add_table ("octal");
+  decimal_index = vlib_lex_add_table ("decimal");
+  hex_index = vlib_lex_add_table ("hex");
+  binary_index = vlib_lex_add_table ("binary");
+
+  /* Support 0x 0b 0t and 0123 [octal] */
+  vlib_lex_set_action_range (top_index, '0', '0', VLIB_LEX_START_NUMBER, 10,
+			     zero_index);
+  vlib_lex_set_action_range (top_index, '1', '9', VLIB_LEX_START_NUMBER, 10,
+			     decimal_index);
+
+  vlib_lex_set_action_range (zero_index, 0, 0x7F, VLIB_LEX_RETURN_AND_RESCAN,
+			     VLIB_LEX_number, top_index);
+
+  vlib_lex_set_action_range (zero_index, 'x', 'x', VLIB_LEX_IGNORE, ~0,
+			     hex_index);
+  vlib_lex_set_action_range (zero_index, 'b', 'b', VLIB_LEX_IGNORE, ~0,
+			     binary_index);
+  vlib_lex_set_action_range (zero_index, 't', 't', VLIB_LEX_IGNORE, ~0,
+			     decimal_index);
+  vlib_lex_set_action_range (zero_index, '0', '7', VLIB_LEX_START_NUMBER, 8,
+			     octal_index);
+
+  /* Octal */
+  vlib_lex_set_action_range (octal_index, 0, 0x7f, VLIB_LEX_RETURN_AND_RESCAN,
+			     VLIB_LEX_number, top_index);
+  vlib_lex_set_action_range (octal_index, '0', '7', VLIB_LEX_ADD_TO_NUMBER, 8,
+			     octal_index);
+
+  /* Decimal */
+  vlib_lex_set_action_range (decimal_index, 0, 0x7f,
+			     VLIB_LEX_RETURN_AND_RESCAN, VLIB_LEX_number,
+			     top_index);
+  vlib_lex_set_action_range (decimal_index, '0', '9', VLIB_LEX_ADD_TO_NUMBER,
+			     10, decimal_index);
+
+  /* Hex */
+  vlib_lex_set_action_range (hex_index, 0, 0x7f, VLIB_LEX_RETURN_AND_RESCAN,
+			     VLIB_LEX_number, top_index);
+  vlib_lex_set_action_range (hex_index, '0', '9', VLIB_LEX_ADD_TO_NUMBER, 16,
+			     hex_index);
+  vlib_lex_set_action_range (hex_index, 'a', 'f', VLIB_LEX_ADD_TO_NUMBER, 16,
+			     hex_index);
+  vlib_lex_set_action_range (hex_index, 'A', 'F', VLIB_LEX_ADD_TO_NUMBER, 16,
+			     hex_index);
+
+  /* Binary */
+  vlib_lex_set_action_range (binary_index, 0, 0x7f,
+			     VLIB_LEX_RETURN_AND_RESCAN, VLIB_LEX_number,
+			     top_index);
+  vlib_lex_set_action_range (binary_index, '0', '1', VLIB_LEX_ADD_TO_NUMBER,
+			     2, binary_index);
+
+  /* c/c++ comment syntax is the worst... */
+
+  slash_index = vlib_lex_add_table ("slash");
+  slash_star_index = vlib_lex_add_table ("slash_star");
+  slash_star_star_index = vlib_lex_add_table ("slash_star_star");
+  slash_slash_index = vlib_lex_add_table ("slash_slash");
+  slash_token = vlib_lex_add_token (lm, "slash");
+
+  /* Top level: see a slash, ignore, go to slash table */
+  vlib_lex_set_action_range (top_index, '/', '/', VLIB_LEX_IGNORE, ~0,
+			     slash_index);
+
+  /* default for slash table: return SLASH, go to top table */
+  vlib_lex_set_action_range (slash_index, 1, 0x7F, VLIB_LEX_RETURN_AND_RESCAN,
+			     slash_token, top_index);
+  /* see slash-slash, go to s-s table */
+  vlib_lex_set_action_range (slash_index, '/', '/', VLIB_LEX_IGNORE, ~0,
+			     slash_slash_index);
+  /* see slash-star, go to s-* table */
+  vlib_lex_set_action_range (slash_index, '*', '*', VLIB_LEX_IGNORE, ~0,
+			     slash_star_index);
+
+  /* EOL in s-s table, ignore, go to top table */
+  vlib_lex_set_action_range (slash_slash_index, '\n', '\n', VLIB_LEX_IGNORE,
+			     ~0, top_index);
+
+  /* slash-star blah blah star */
+  vlib_lex_set_action_range (slash_star_index, '*', '*', VLIB_LEX_IGNORE, ~0,
+			     slash_star_star_index);
+
+  /* slash star blah blah star slash */
+  vlib_lex_set_action_range (slash_star_star_index, '/', '/', VLIB_LEX_IGNORE,
+			     ~0, top_index);
+
+  /* LT, =, GT */
+  vlib_lex_set_action_range (top_index, '<', '<', VLIB_LEX_RETURN,
+			     VLIB_LEX_lt, top_index);
+  vlib_lex_set_action_range (top_index, '=', '=', VLIB_LEX_RETURN,
+			     VLIB_LEX_equals, top_index);
+  vlib_lex_set_action_range (top_index, '>', '>', VLIB_LEX_RETURN,
+			     VLIB_LEX_gt, top_index);
+
+  /* words, key and otherwise */
+  word_index = vlib_lex_add_table ("word");
+
+  vlib_lex_set_action_range (top_index, 'a', 'z', VLIB_LEX_ADD_TO_TOKEN, ~0,
+			     word_index);
+  vlib_lex_set_action_range (top_index, 'A', 'Z', VLIB_LEX_ADD_TO_TOKEN, ~0,
+			     word_index);
+
+  vlib_lex_set_action_range (word_index, 0, 0x7f, VLIB_LEX_KEYWORD_CHECK, ~0,
+			     top_index);
+
+  vlib_lex_set_action_range (word_index, 'a', 'z', VLIB_LEX_ADD_TO_TOKEN, ~0,
+			     word_index);
+  vlib_lex_set_action_range (word_index, 'A', 'Z', VLIB_LEX_ADD_TO_TOKEN, ~0,
+			     word_index);
+  vlib_lex_set_action_range (word_index, '_', '_', VLIB_LEX_ADD_TO_TOKEN, ~0,
+			     word_index);
+  vlib_lex_set_action_range (word_index, '0', '9', VLIB_LEX_ADD_TO_TOKEN, ~0,
+			     word_index);
+
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/g2.am b/src/g2.am
new file mode 100644
index 00000000..e7965733
--- /dev/null
+++ b/src/g2.am
@@ -0,0 +1,32 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bin_PROGRAMS += g2
+
+g2_SOURCES =					\
+  tools/g2/clib.c				\
+  tools/g2/cpel.c				\
+  tools/g2/cpel.h				\
+  tools/g2/events.c				\
+  tools/g2/g2.h					\
+  tools/g2/main.c				\
+  tools/g2/menu1.c				\
+  tools/g2/pointsel.c				\
+  tools/g2/props.c				\
+  tools/g2/props.h				\
+  tools/g2/g2version.c				\
+  tools/g2/view1.c
+
+g2_LDADD = $(g2_LIBS) libvppinfra.la -lpthread -lm
+
+# vi:syntax=automake
diff --git a/src/perftool.am b/src/perftool.am
new file mode 100644
index 00000000..09f1681a
--- /dev/null
+++ b/src/perftool.am
@@ -0,0 +1,41 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bin_PROGRAMS += c2cpel cpelatency cpeldump cpelinreg cpelstate
+
+lib_LTLIBRARIES += libcperf.la
+
+libcperf_la_SOURCES = \
+  tools/perftool/delsvec.c	\
+  tools/perftool/linreg.c	\
+  tools/perftool/props.c	\
+  tools/perftool/cpel_util.c
+
+PERFTOOL_LIBS = libcperf.la libvppinfra.la -lm
+
+c2cpel_SOURCES = tools/perftool/c2cpel.c
+c2cpel_LDADD = $(PERFTOOL_LIBS)
+
+cpelatency_SOURCES = tools/perftool/cpelatency.c
+cpelatency_LDADD = $(PERFTOOL_LIBS)
+
+cpeldump_SOURCES = tools/perftool/cpeldump.c
+cpeldump_LDADD = $(PERFTOOL_LIBS)
+
+cpelinreg_SOURCES = tools/perftool/cpelinreg.c
+cpelinreg_LDADD = $(PERFTOOL_LIBS)
+
+cpelstate_SOURCES = tools/perftool/cpelstate.c
+cpelstate_LDADD = $(PERFTOOL_LIBS)
+
+# vi:syntax=automake
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
new file mode 100644
index 00000000..ffc4b3ab
--- /dev/null
+++ b/src/plugins/Makefile.am
@@ -0,0 +1,60 @@
+
+# Copyright (c) <current-year> <your-organization>
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+AUTOMAKE_OPTIONS = foreign subdir-objects
+
+AM_CFLAGS = -Wall -I${top_srcdir} -I${top_builddir}
+AM_LDFLAGS = -module -shared -avoid-version
+SUFFIXES = .api.h .api .api.json
+API_FILES =
+BUILT_SOURCES =
+vppplugins_LTLIBRARIES =
+vppapitestplugins_LTLIBRARIES =
+noinst_HEADERS =
+
+vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
+vpppluginsdir = ${libdir}/vpp_plugins
+
+if ENABLE_FLOWPERPKT_PLUGIN
+include flowperpkt.am
+endif
+
+if ENABLE_ILA_PLUGIN
+include ila.am
+endif
+
+if ENABLE_SIXRD_PLUGIN
+include sixrd.am
+endif
+
+include ../suffix-rules.mk
+
+# Remove *.la files
+install-data-hook:
+	@-(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
+	@-(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
+
+###############################################################################
+# API
+###############################################################################
+
+apidir = $(prefix)/share/vpp/api/plugins
+
+api_DATA = \
+	$(patsubst %.api,%.api.json,$(API_FILES))
+
+BUILT_SOURCES += \
+	$(patsubst %.api,%.api.json,$(API_FILES)) \
+	$(patsubst %.api,%.api.h,$(API_FILES))
+
diff --git a/src/plugins/flowperpkt.am b/src/plugins/flowperpkt.am
new file mode 100644
index 00000000..a400603a
--- /dev/null
+++ b/src/plugins/flowperpkt.am
@@ -0,0 +1,38 @@
+
+# Copyright (c) <current-year> <your-organization>
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+vppplugins_LTLIBRARIES += flowperpkt_plugin.la
+vppapitestplugins_LTLIBRARIES += flowperpkt_test_plugin.la
+
+flowperpkt_plugin_la_SOURCES = flowperpkt/flowperpkt.c  \
+        flowperpkt/l2_node.c \
+        flowperpkt/node.c \
+	flowperpkt/flowperpkt_plugin.api.h
+
+BUILT_SOURCES +=				\
+	flowperpkt/flowperpkt.api.h		\
+	flowperpkt/flowperpkt.api.json
+
+noinst_HEADERS +=				\
+  flowperpkt/flowperpkt_all_api_h.h		\
+  flowperpkt/flowperpkt_msg_enum.h		\
+  flowperpkt/flowperpkt.api.h
+
+flowperpkt_test_plugin_la_SOURCES = \
+  flowperpkt/flowperpkt_test.c			\
+  flowperpkt/flowperpkt_plugin.api.h
+
+API_FILES += flowperpkt/flowperpkt.api
+
+# vi:syntax=automake
diff --git a/src/plugins/flowperpkt/flowperpkt.api b/src/plugins/flowperpkt/flowperpkt.api
new file mode 100644
index 00000000..fa878f21
--- /dev/null
+++ b/src/plugins/flowperpkt/flowperpkt.api
@@ -0,0 +1,42 @@
+/* Define a simple enable-disable binary API to control the feature */
+
+/** \file
+    This file defines the vpp control-plane API messages
+    used to control the flowperpkt plugin
+*/
+
+/** \brief Enable / disable per-packet IPFIX recording on an interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add address if non-zero, else delete
+    @param is_ipv6 - if non-zero the address is ipv6, else ipv4
+    @param sw_if_index - index of the interface
+*/
+manual_print define flowperpkt_tx_interface_add_del
+{
+  /* Client identifier, set from api_main.my_client_index */
+  u32 client_index;
+
+  /* Arbitrary context, so client can match reply to request */
+  u32 context;
+
+  /* Enable / disable the feature */
+  u8 is_add;
+  u8 which;  /* 0 = ipv4, 1 = l2, 2 = ipv6 (not yet implemented) */
+
+  /* Interface handle */
+  u32 sw_if_index;
+};
+
+/** \brief Reply to enable/disable per-packet IPFIX recording messages
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define flowperpkt_tx_interface_add_del_reply
+{
+  /* From the request */
+  u32 context;
+
+  /* Return value, zero means all OK */
+  i32 retval;
+};
diff --git a/src/plugins/flowperpkt/flowperpkt.c b/src/plugins/flowperpkt/flowperpkt.c
new file mode 100644
index 00000000..fb71d5b0
--- /dev/null
+++ b/src/plugins/flowperpkt/flowperpkt.c
@@ -0,0 +1,671 @@
+/*
+ * flowperpkt.c - per-packet data capture flow report plugin
+ *
+ * Copyright (c) <current-year> <your-organization>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file
+ * @brief Per-packet IPFIX flow record generator plugin
+ *
+ * This file implements vpp plugin registration mechanics,
+ * debug CLI, and binary API handling.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/plugin/plugin.h>
+#include <flowperpkt/flowperpkt.h>
+
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+
+/* define message IDs */
+#include <flowperpkt/flowperpkt_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <flowperpkt/flowperpkt_all_api_h.h>
+#undef vl_typedefs
+
+/* define generated endian-swappers */
+#define vl_endianfun
+#include <flowperpkt/flowperpkt_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <flowperpkt/flowperpkt_all_api_h.h>
+#undef vl_printfun
+
+flowperpkt_main_t flowperpkt_main;
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <flowperpkt/flowperpkt_all_api_h.h>
+#undef vl_api_version
+
+/* Define the per-interface configurable features */
+/* *INDENT-OFF* */
+VNET_FEATURE_INIT (flow_perpacket_ipv4, static) =
+{
+  .arc_name = "ip4-output",
+  .node_name = "flowperpkt-ipv4",
+  .runs_before = VNET_FEATURES ("interface-output"),
+};
+
+VNET_FEATURE_INIT (flow_perpacket_l2, static) =
+{
+  .arc_name = "interface-output",
+  .node_name = "flowperpkt-l2",
+  .runs_before = VNET_FEATURES ("interface-tx"),
+};
+/* *INDENT-ON* */
+
+/*
+ * A handy macro to set up a message reply.
+ * Assumes that the following variables are available:
+ * mp - pointer to request message
+ * rmp - pointer to reply message type
+ * rv - return value
+ */
+#define REPLY_MACRO(t)                                          \
+do {                                                            \
+    unix_shared_memory_queue_t * q =                            \
+    vl_api_client_index_to_input_queue (mp->client_index);      \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t)+fm->msg_id_base);               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+                                                                \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+/* Macro to finish up custom dump fns */
+#define FINISH                                  \
+    vec_add1 (s, 0);                            \
+    vl_print (handle, (char *)s);               \
+    vec_free (s);                               \
+    return handle;
+
+#define VALIDATE_SW_IF_INDEX(mp)				\
+ do { u32 __sw_if_index = ntohl(mp->sw_if_index);		\
+    vnet_main_t *__vnm = vnet_get_main();                       \
+    if (pool_is_free_index(__vnm->interface_main.sw_interfaces, \
+                           __sw_if_index)) {                    \
+        rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
+        goto bad_sw_if_index;                                   \
+    }                                                           \
+} while(0);
+
+#define BAD_SW_IF_INDEX_LABEL                   \
+do {                                            \
+bad_sw_if_index:                                \
+    ;                                           \
+} while (0);
+
+/**
+ * @brief Create an IPFIX template packet rewrite string
+ * @param frm flow_report_main_t *
+ * @param fr flow_report_t *
+ * @param collector_address ip4_address_t * the IPFIX collector address
+ * @param src_address ip4_address_t * the source address we should use
+ * @param collector_port u16 the collector port we should use, host byte order
+ * @returns u8 * vector containing the indicated IPFIX template packet
+ */
+static inline u8 *
+flowperpkt_template_rewrite_inline (flow_report_main_t * frm,
+				    flow_report_t * fr,
+				    ip4_address_t * collector_address,
+				    ip4_address_t * src_address,
+				    u16 collector_port, int variant)
+{
+  ip4_header_t *ip;
+  udp_header_t *udp;
+  ipfix_message_header_t *h;
+  ipfix_set_header_t *s;
+  ipfix_template_header_t *t;
+  ipfix_field_specifier_t *f;
+  ipfix_field_specifier_t *first_field;
+  u8 *rewrite = 0;
+  ip4_ipfix_template_packet_t *tp;
+  u32 field_count = 0;
+  flow_report_stream_t *stream;
+  flowperpkt_main_t *fm = &flowperpkt_main;
+
+  stream = &frm->streams[fr->stream_index];
+
+  if (variant == FLOW_VARIANT_IPV4)
+    {
+      /*
+       * ip4 Supported Fields:
+       *
+       * ingressInterface, TLV type 10, u32
+       * egressInterface, TLV type 14, u32
+       * sourceIpv4Address, TLV type 8, u32
+       * destinationIPv4Address, TLV type 12, u32
+       * ipClassOfService, TLV type 5, u8
+       * flowStartNanoseconds, TLV type 156, dateTimeNanoseconds (f64)
+       *   Implementation: f64 nanoseconds since VPP started
+       *   warning: wireshark doesn't really understand this TLV
+       * dataLinkFrameSize, TLV type 312, u16
+       *   warning: wireshark doesn't understand this TLV at all
+       */
+
+      /* Currently 7 fields */
+      field_count += 7;
+
+      /* allocate rewrite space */
+      vec_validate_aligned
+	(rewrite,
+	 sizeof (ip4_ipfix_template_packet_t)
+	 + field_count * sizeof (ipfix_field_specifier_t) - 1,
+	 CLIB_CACHE_LINE_BYTES);
+    }
+  else if (variant == FLOW_VARIANT_L2)
+    {
+      /*
+       * L2 Supported Fields:
+       *
+       * ingressInterface, TLV type 10, u32
+       * egressInterface, TLV type 14, u32
+       * sourceMacAddress, TLV type 56, u8[6] we hope
+       * destinationMacAddress, TLV type 57, u8[6] we hope
+       * ethernetType, TLV type 256, u16
+       * flowStartNanoseconds, TLV type 156, dateTimeNanoseconds (f64)
+       *   Implementation: f64 nanoseconds since VPP started
+       *   warning: wireshark doesn't really understand this TLV
+       * dataLinkFrameSize, TLV type 312, u16
+       *   warning: wireshark doesn't understand this TLV at all
+       */
+
+      /* Currently 7 fields */
+      field_count += 7;
+
+      /* allocate rewrite space */
+      vec_validate_aligned
+	(rewrite,
+	 sizeof (ip4_ipfix_template_packet_t)
+	 + field_count * sizeof (ipfix_field_specifier_t) - 1,
+	 CLIB_CACHE_LINE_BYTES);
+    }
+
+  tp = (ip4_ipfix_template_packet_t *) rewrite;
+  ip = (ip4_header_t *) & tp->ip4;
+  udp = (udp_header_t *) (ip + 1);
+  h = (ipfix_message_header_t *) (udp + 1);
+  s = (ipfix_set_header_t *) (h + 1);
+  t = (ipfix_template_header_t *) (s + 1);
+  first_field = f = (ipfix_field_specifier_t *) (t + 1);
+
+  ip->ip_version_and_header_length = 0x45;
+  ip->ttl = 254;
+  ip->protocol = IP_PROTOCOL_UDP;
+  ip->src_address.as_u32 = src_address->as_u32;
+  ip->dst_address.as_u32 = collector_address->as_u32;
+  udp->src_port = clib_host_to_net_u16 (stream->src_port);
+  udp->dst_port = clib_host_to_net_u16 (collector_port);
+  udp->length = clib_host_to_net_u16 (vec_len (rewrite) - sizeof (*ip));
+
+  /* FIXUP: message header export_time */
+  /* FIXUP: message header sequence_number */
+  h->domain_id = clib_host_to_net_u32 (stream->domain_id);
+
+  /* Add TLVs to the template */
+  if (variant == FLOW_VARIANT_IPV4)
+    {
+      f->e_id_length =
+	ipfix_e_id_length (0 /* enterprise */ , ingressInterface,
+			   4);
+      f++;
+      f->e_id_length =
+	ipfix_e_id_length (0 /* enterprise */ , egressInterface,
+			   4);
+      f++;
+      f->e_id_length =
+	ipfix_e_id_length (0 /* enterprise */ , sourceIPv4Address,
+			   4);
+      f++;
+      f->e_id_length =
+	ipfix_e_id_length (0 /* enterprise */ , destinationIPv4Address, 4);
+      f++;
+      f->e_id_length =
+	ipfix_e_id_length (0 /* enterprise */ , ipClassOfService,
+			   1);
+      f++;
+      f->e_id_length =
+	ipfix_e_id_length (0 /* enterprise */ , flowStartNanoseconds,
+			   8);
+      f++;
+      f->e_id_length =
+	ipfix_e_id_length (0 /* enterprise */ , dataLinkFrameSize,
+			   2);
+      f++;
+    }
+  else if (variant == FLOW_VARIANT_L2)
+    {
+      f->e_id_length =
+	ipfix_e_id_length (0 /* enterprise */ , ingressInterface,
+			   4);
+      f++;
+      f->e_id_length =
+	ipfix_e_id_length (0 /* enterprise */ , egressInterface,
+			   4);
+      f++;
+      f->e_id_length =
+	ipfix_e_id_length (0 /* enterprise */ , sourceMacAddress,
+			   6);
+      f++;
+      f->e_id_length =
+	ipfix_e_id_length (0 /* enterprise */ , destinationMacAddress, 6);
+      f++;
+      f->e_id_length = ipfix_e_id_length (0 /* enterprise */ , ethernetType,
+					  2);
+      f++;
+      f->e_id_length =
+	ipfix_e_id_length (0 /* enterprise */ , flowStartNanoseconds,
+			   8);
+      f++;
+      f->e_id_length =
+	ipfix_e_id_length (0 /* enterprise */ , dataLinkFrameSize,
+			   2);
+      f++;
+    }
+
+  /* Extend in the obvious way, right here... */
+
+  /* Back to the template packet... */
+  ip = (ip4_header_t *) & tp->ip4;
+  udp = (udp_header_t *) (ip + 1);
+
+  ASSERT (f - first_field);
+  /* Field count in this template */
+  t->id_count = ipfix_id_count (fr->template_id, f - first_field);
+
+  if (variant == FLOW_VARIANT_IPV4)
+    fm->ipv4_report_id = fr->template_id;
+  else if (variant == FLOW_VARIANT_L2)
+    fm->l2_report_id = fr->template_id;
+
+  /* set length in octets */
+  s->set_id_length =
+    ipfix_set_id_length (2 /* set_id */ , (u8 *) f - (u8 *) s);
+
+  /* message length in octets */
+  h->version_length = version_length ((u8 *) f - (u8 *) h);
+
+  ip->length = clib_host_to_net_u16 ((u8 *) f - (u8 *) ip);
+  ip->checksum = ip4_header_checksum (ip);
+
+  return rewrite;
+}
+
+u8 *
+flowperpkt_template_rewrite_ipv4 (flow_report_main_t * frm,
+				  flow_report_t * fr,
+				  ip4_address_t * collector_address,
+				  ip4_address_t * src_address,
+				  u16 collector_port)
+{
+  return flowperpkt_template_rewrite_inline
+    (frm, fr, collector_address, src_address, collector_port,
+     FLOW_VARIANT_IPV4);
+}
+
+u8 *
+flowperpkt_template_rewrite_l2 (flow_report_main_t * frm,
+				flow_report_t * fr,
+				ip4_address_t * collector_address,
+				ip4_address_t * src_address,
+				u16 collector_port)
+{
+  return flowperpkt_template_rewrite_inline
+    (frm, fr, collector_address, src_address, collector_port,
+     FLOW_VARIANT_L2);
+}
+
+
+/**
+ * @brief Flush accumulated data
+ * @param frm flow_report_main_t *
+ * @param fr flow_report_t *
+ * @param f vlib_frame_t *
+ *
+ * <em>Notes:</em>
+ * This function must simply return the incoming frame, or no template packets
+ * will be sent.
+ */
+vlib_frame_t *
+flowperpkt_data_callback_ipv4 (flow_report_main_t * frm,
+			       flow_report_t * fr,
+			       vlib_frame_t * f, u32 * to_next,
+			       u32 node_index)
+{
+  flowperpkt_flush_callback_ipv4 ();
+  return f;
+}
+
+vlib_frame_t *
+flowperpkt_data_callback_l2 (flow_report_main_t * frm,
+			     flow_report_t * fr,
+			     vlib_frame_t * f, u32 * to_next, u32 node_index)
+{
+  flowperpkt_flush_callback_l2 ();
+  return f;
+}
+
+/**
+ * @brief configure / deconfigure the IPFIX flow-per-packet
+ * @param fm flowperpkt_main_t * fm
+ * @param sw_if_index u32 the desired interface
+ * @param is_add int 1 to enable the feature, 0 to disable it
+ * @returns 0 if successful, non-zero otherwise
+ */
+
+static int flowperpkt_tx_interface_add_del_feature
+  (flowperpkt_main_t * fm, u32 sw_if_index, int which, int is_add)
+{
+  flow_report_main_t *frm = &flow_report_main;
+  vnet_flow_report_add_del_args_t _a, *a = &_a;
+  int rv;
+
+  if (which == FLOW_VARIANT_IPV4 && !fm->ipv4_report_created)
+    {
+      memset (a, 0, sizeof (*a));
+      a->rewrite_callback = flowperpkt_template_rewrite_ipv4;
+      a->flow_data_callback = flowperpkt_data_callback_ipv4;
+      a->is_add = 1;
+      a->domain_id = 1;		/*$$$$ config parameter */
+      a->src_port = 4739;	/*$$$$ config parameter */
+      fm->ipv4_report_created = 1;
+
+      rv = vnet_flow_report_add_del (frm, a);
+      if (rv)
+	{
+	  clib_warning ("vnet_flow_report_add_del returned %d", rv);
+	  return -1;
+	}
+    }
+  else if (which == FLOW_VARIANT_L2 && !fm->l2_report_created)
+    {
+      memset (a, 0, sizeof (*a));
+      a->rewrite_callback = flowperpkt_template_rewrite_l2;
+      a->flow_data_callback = flowperpkt_data_callback_l2;
+      a->is_add = 1;
+      a->domain_id = 1;		/*$$$$ config parameter */
+      a->src_port = 4739;	/*$$$$ config parameter */
+      fm->l2_report_created = 1;
+
+      rv = vnet_flow_report_add_del (frm, a);
+      if (rv)
+	{
+	  clib_warning ("vnet_flow_report_add_del returned %d", rv);
+	  return -1;
+	}
+    }
+
+  if (which == FLOW_VARIANT_IPV4)
+    vnet_feature_enable_disable ("ip4-output", "flowperpkt-ipv4",
+				 sw_if_index, is_add, 0, 0);
+  else if (which == FLOW_VARIANT_L2)
+    vnet_feature_enable_disable ("interface-output", "flowperpkt-l2",
+				 sw_if_index, is_add, 0, 0);
+
+  return 0;
+}
+
+/**
+ * @brief API message handler
+ * @param mp vl_api_flowperpkt_tx_interface_add_del_t * mp the api message
+ */
+void vl_api_flowperpkt_tx_interface_add_del_t_handler
+  (vl_api_flowperpkt_tx_interface_add_del_t * mp)
+{
+  flowperpkt_main_t *fm = &flowperpkt_main;
+  vl_api_flowperpkt_tx_interface_add_del_reply_t *rmp;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  int rv = 0;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  if (mp->which != FLOW_VARIANT_IPV4 && mp->which != FLOW_VARIANT_L2)
+    {
+      rv = VNET_API_ERROR_UNIMPLEMENTED;
+      goto out;
+    }
+
+  rv = flowperpkt_tx_interface_add_del_feature (fm, sw_if_index, mp->which,
+						mp->is_add);
+out:
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_FLOWPERPKT_TX_INTERFACE_ADD_DEL_REPLY);
+}
+
+/**
+ * @brief API message custom-dump function
+ * @param mp vl_api_flowperpkt_tx_interface_add_del_t * mp the api message
+ * @param handle void * print function handle
+ * @returns u8 * output string
+ */
+static void *vl_api_flowperpkt_tx_interface_add_del_t_print
+  (vl_api_flowperpkt_tx_interface_add_del_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: flowperpkt_tx_interface_add_del ");
+  s = format (s, "sw_if_index %d is_add %d which %d ",
+	      clib_host_to_net_u32 (mp->sw_if_index),
+	      (int) mp->is_add, (int) mp->which);
+  FINISH;
+}
+
+/* List of message types that this plugin understands */
+#define foreach_flowperpkt_plugin_api_msg                           \
+_(FLOWPERPKT_TX_INTERFACE_ADD_DEL, flowperpkt_tx_interface_add_del)
+
+/**
+ * @brief plugin-api required function
+ * @param vm vlib_main_t * vlib main data structure pointer
+ * @param h vlib_plugin_handoff_t * handoff structure
+ * @param from_early_init int notused
+ *
+ * <em>Notes:</em>
+ * This routine exists to convince the vlib plugin framework that
+ * we haven't accidentally copied a random .dll into the plugin directory.
+ *
+ * Also collects global variable pointers passed from the vpp engine
+ */
+clib_error_t *
+vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
+		      int from_early_init)
+{
+  flowperpkt_main_t *fm = &flowperpkt_main;
+  clib_error_t *error = 0;
+
+  fm->vlib_main = vm;
+  fm->vnet_main = h->vnet_main;
+
+  return error;
+}
+
+static clib_error_t *
+flowperpkt_tx_interface_add_del_feature_command_fn (vlib_main_t * vm,
+						    unformat_input_t * input,
+						    vlib_cli_command_t * cmd)
+{
+  flowperpkt_main_t *fm = &flowperpkt_main;
+  u32 sw_if_index = ~0;
+  int is_add = 1;
+  u8 which = FLOW_VARIANT_IPV4;
+
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "disable"))
+	is_add = 0;
+      else if (unformat (input, "%U", unformat_vnet_sw_interface,
+			 fm->vnet_main, &sw_if_index));
+      else if (unformat (input, "l2"))
+	which = FLOW_VARIANT_L2;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "Please specify an interface...");
+
+  rv =
+    flowperpkt_tx_interface_add_del_feature (fm, sw_if_index, which, is_add);
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case VNET_API_ERROR_INVALID_SW_IF_INDEX:
+      return clib_error_return
+	(0, "Invalid interface, only works on physical ports");
+      break;
+
+    case VNET_API_ERROR_UNIMPLEMENTED:
+      return clib_error_return (0, "ip6 not supported");
+      break;
+
+    default:
+      return clib_error_return (0, "flowperpkt_enable_disable returned %d",
+				rv);
+    }
+  return 0;
+}
+
+/*?
+ * '<em>flowperpkt feature add-del</em>' commands to enable/disable
+ * per-packet IPFIX flow record generation on an interface
+ *
+ * @cliexpar
+ * @parblock
+ * To enable per-packet IPFIX flow-record generation on an interface:
+ * @cliexcmd{flowperpkt feature add-del GigabitEthernet2/0/0}
+ *
+ * To disable per-packet IPFIX flow-record generation on an interface:
+ * @cliexcmd{flowperpkt feature add-del GigabitEthernet2/0/0 disable}
+ * @cliexend
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (flowperpkt_enable_disable_command, static) = {
+    .path = "flowperpkt feature add-del",
+    .short_help =
+    "flowperpkt feature add-del <interface-name> [disable]",
+    .function = flowperpkt_tx_interface_add_del_feature_command_fn,
+};
+/* *INDENT-ON* */
+
+/**
+ * @brief Set up the API message handling tables
+ * @param vm vlib_main_t * vlib main data structure pointer
+ * @returns 0 to indicate all is well
+ */
+static clib_error_t *
+flowperpkt_plugin_api_hookup (vlib_main_t * vm)
+{
+  flowperpkt_main_t *fm = &flowperpkt_main;
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + fm->msg_id_base),     \
+                           #n,					\
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_flowperpkt_plugin_api_msg;
+#undef _
+
+  return 0;
+}
+
+#define vl_msg_name_crc_list
+#include <flowperpkt/flowperpkt_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (flowperpkt_main_t * fm, api_main_t * am)
+{
+#define _(id,n,crc) \
+  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + fm->msg_id_base);
+  foreach_vl_msg_name_crc_flowperpkt;
+#undef _
+}
+
+/**
+ * @brief Set up the API message handling tables
+ * @param vm vlib_main_t * vlib main data structure pointer
+ * @returns 0 to indicate all is well, or a clib_error_t
+ */
+static clib_error_t *
+flowperpkt_init (vlib_main_t * vm)
+{
+  flowperpkt_main_t *fm = &flowperpkt_main;
+  vlib_thread_main_t *tm = &vlib_thread_main;
+  clib_error_t *error = 0;
+  u32 num_threads;
+  u8 *name;
+
+  /* Construct the API name */
+  name = format (0, "flowperpkt_%08x%c", api_version, 0);
+
+  /* Ask for a correctly-sized block of API message decode slots */
+  fm->msg_id_base = vl_msg_api_get_msg_ids
+    ((char *) name, VL_MSG_FIRST_AVAILABLE);
+
+  /* Hook up message handlers */
+  error = flowperpkt_plugin_api_hookup (vm);
+
+  /* Add our API messages to the global name_crc hash table */
+  setup_message_id_table (fm, &api_main);
+
+  vec_free (name);
+
+  /* Decide how many worker threads we have */
+  num_threads = 1 /* main thread */  + tm->n_eal_threads;
+
+  /* Allocate per worker thread vectors */
+  vec_validate (fm->ipv4_buffers_per_worker, num_threads - 1);
+  vec_validate (fm->l2_buffers_per_worker, num_threads - 1);
+  vec_validate (fm->ipv4_frames_per_worker, num_threads - 1);
+  vec_validate (fm->l2_frames_per_worker, num_threads - 1);
+  vec_validate (fm->ipv4_next_record_offset_per_worker, num_threads - 1);
+  vec_validate (fm->l2_next_record_offset_per_worker, num_threads - 1);
+
+  /* Set up time reference pair */
+  fm->vlib_time_0 = vlib_time_now (vm);
+  fm->nanosecond_time_0 = unix_time_now_nsec ();
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (flowperpkt_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/flowperpkt/flowperpkt.h b/src/plugins/flowperpkt/flowperpkt.h
new file mode 100644
index 00000000..20f6939d
--- /dev/null
+++ b/src/plugins/flowperpkt/flowperpkt.h
@@ -0,0 +1,90 @@
+/*
+ * flowperpkt.h - skeleton vpp engine plug-in header file
+ *
+ * Copyright (c) <current-year> <your-organization>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_flowperpkt_h__
+#define __included_flowperpkt_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vnet/flow/flow_report.h>
+#include <vnet/flow/flow_report_classify.h>
+
+/**
+ * @file
+ * @brief flow-per-packet plugin header file
+ */
+typedef struct
+{
+  /** API message ID base */
+  u16 msg_id_base;
+
+  /** Have the reports [templates] been created? */
+  int ipv4_report_created;
+  int l2_report_created;
+
+  /** stream/template IDs */
+  u16 ipv4_report_id;
+  u16 l2_report_id;
+
+  /** ipfix buffers under construction, per-worker thread */
+  vlib_buffer_t **ipv4_buffers_per_worker;
+  vlib_buffer_t **l2_buffers_per_worker;
+
+  /** frames containing ipfix buffers, per-worker thread */
+  vlib_frame_t **ipv4_frames_per_worker;
+  vlib_frame_t **l2_frames_per_worker;
+
+  /** next record offset, per worker thread */
+  u16 *ipv4_next_record_offset_per_worker;
+  u16 *l2_next_record_offset_per_worker;
+
+  /** Time reference pair */
+  u64 nanosecond_time_0;
+  f64 vlib_time_0;
+
+  /** convenience vlib_main_t pointer */
+  vlib_main_t *vlib_main;
+  /** convenience vnet_main_t pointer */
+  vnet_main_t *vnet_main;
+} flowperpkt_main_t;
+
+typedef enum
+{
+  FLOW_VARIANT_IPV4,
+  FLOW_VARIANT_L2,
+  FLOW_N_VARIANTS,
+} flowperpkt_variant_t;
+
+extern flowperpkt_main_t flowperpkt_main;
+
+extern vlib_node_registration_t flowperpkt_ipv4_node;
+
+void flowperpkt_flush_callback_ipv4 (void);
+void flowperpkt_flush_callback_l2 (void);
+
+#endif /* __included_flowperpkt_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/flowperpkt/flowperpkt_all_api_h.h b/src/plugins/flowperpkt/flowperpkt_all_api_h.h
new file mode 100644
index 00000000..329c375a
--- /dev/null
+++ b/src/plugins/flowperpkt/flowperpkt_all_api_h.h
@@ -0,0 +1,18 @@
+/*
+ * flowperpkt_all_api_h.h - plug-in api #include file
+ *
+ * Copyright (c) <current-year> <your-organization>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Include the generated file, see BUILT_SOURCES in Makefile.am */
+#include <flowperpkt/flowperpkt.api.h>
diff --git a/src/plugins/flowperpkt/flowperpkt_msg_enum.h b/src/plugins/flowperpkt/flowperpkt_msg_enum.h
new file mode 100644
index 00000000..3177e77a
--- /dev/null
+++ b/src/plugins/flowperpkt/flowperpkt_msg_enum.h
@@ -0,0 +1,31 @@
+/*
+ * flowperpkt_msg_enum.h - vpp engine plug-in message enumeration
+ *
+ * Copyright (c) <current-year> <your-organization>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_flowperpkt_msg_enum_h
+#define included_flowperpkt_msg_enum_h
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum
+{
+#include <flowperpkt/flowperpkt_all_api_h.h>
+  /* We'll want to know how many messages IDs we need... */
+  VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif /* included_flowperpkt_msg_enum_h */
diff --git a/src/plugins/flowperpkt/flowperpkt_plugin_doc.md b/src/plugins/flowperpkt/flowperpkt_plugin_doc.md
new file mode 100644
index 00000000..ed76c45c
--- /dev/null
+++ b/src/plugins/flowperpkt/flowperpkt_plugin_doc.md
@@ -0,0 +1,13 @@
+Per-packet IPFIX flow record plugin    {#flowperpkt_plugin_doc}
+===================================
+
+## Introduction
+
+This plugin generates one ipfix record entry per packet transmitted
+on interfaces which have the feature enabled
+
+## Sample configuration
+
+set ipfix exporter collector 192.168.6.2 src 192.168.6.1 template-interval 20 port 4739 path-mtu 1500
+
+flowperpkt feature add-del GigabitEthernet2/3/0
diff --git a/src/plugins/flowperpkt/flowperpkt_test.c b/src/plugins/flowperpkt/flowperpkt_test.c
new file mode 100644
index 00000000..716818ff
--- /dev/null
+++ b/src/plugins/flowperpkt/flowperpkt_test.c
@@ -0,0 +1,234 @@
+/*
+ * flowperpkt.c - skeleton vpp-api-test plug-in
+ *
+ * Copyright (c) <current-year> <your-organization>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vat/vat.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vppinfra/error.h>
+
+/**
+ * @file vpp_api_test plugin
+ */
+
+uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
+
+/* Declare message IDs */
+#include <flowperpkt/flowperpkt_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <flowperpkt/flowperpkt_all_api_h.h>
+#undef vl_typedefs
+
+/* declare message handlers for each api */
+
+#define vl_endianfun		/* define message structures */
+#include <flowperpkt/flowperpkt_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <flowperpkt/flowperpkt_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number. */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <flowperpkt/flowperpkt_all_api_h.h>
+#undef vl_api_version
+
+typedef struct
+{
+    /** API message ID base */
+  u16 msg_id_base;
+    /** vat_main_t pointer */
+  vat_main_t *vat_main;
+} flowperpkt_test_main_t;
+
+flowperpkt_test_main_t flowperpkt_test_main;
+
+#define foreach_standard_reply_retval_handler   \
+_(flowperpkt_tx_interface_add_del_reply)
+
+#define _(n)                                            \
+    static void vl_api_##n##_t_handler                  \
+    (vl_api_##n##_t * mp)                               \
+    {                                                   \
+        vat_main_t * vam = flowperpkt_test_main.vat_main;   \
+        i32 retval = ntohl(mp->retval);                 \
+        if (vam->async_mode) {                          \
+            vam->async_errors += (retval < 0);          \
+        } else {                                        \
+            vam->retval = retval;                       \
+            vam->result_ready = 1;                      \
+        }                                               \
+    }
+foreach_standard_reply_retval_handler;
+#undef _
+
+/*
+ * Table of message reply handlers, must include boilerplate handlers
+ * we just generated
+ */
+#define foreach_vpe_api_reply_msg               \
+_(FLOWPERPKT_TX_INTERFACE_ADD_DEL_REPLY,        \
+  flowperpkt_tx_interface_add_del_reply)
+
+
+/* M: construct, but don't yet send a message */
+
+#define M(T,t)                                                  \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp));                         \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+#define M2(T,t,n)                                               \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+/* S: send a message */
+#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
+
+/* W: wait for results, with timeout */
+#define W                                       \
+do {                                            \
+    timeout = vat_time_now (vam) + 1.0;         \
+                                                \
+    while (vat_time_now (vam) < timeout) {      \
+        if (vam->result_ready == 1) {           \
+            return (vam->retval);               \
+        }                                       \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
+static int
+api_flowperpkt_tx_interface_add_del (vat_main_t * vam)
+{
+  flowperpkt_test_main_t *sm = &flowperpkt_test_main;
+  unformat_input_t *i = vam->input;
+  f64 timeout;
+  int enable_disable = 1;
+  u8 which = 0;			/* ipv4 by default */
+  u32 sw_if_index = ~0;
+  vl_api_flowperpkt_tx_interface_add_del_t *mp;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+	;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	;
+      else if (unformat (i, "disable"))
+	enable_disable = 0;
+      else if (unformat (i, "l2"))
+	which = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    {
+      errmsg ("missing interface name / explicit sw_if_index number \n");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (FLOWPERPKT_TX_INTERFACE_ADD_DEL, flowperpkt_tx_interface_add_del);
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->is_add = enable_disable;
+  mp->which = which;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+}
+
+/*
+ * List of messages that the api test plugin sends,
+ * and that the data plane plugin processes
+ */
+#define foreach_vpe_api_msg \
+_(flowperpkt_tx_interface_add_del, "<intfc> [disable]")
+
+void
+vat_api_hookup (vat_main_t * vam)
+{
+  flowperpkt_test_main_t *sm = &flowperpkt_test_main;
+  /* Hook up handlers for replies from the data plane plug-in */
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,                                  \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_reply_msg;
+#undef _
+
+  /* API messages we can send */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+  foreach_vpe_api_msg;
+#undef _
+
+  /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+  foreach_vpe_api_msg;
+#undef _
+}
+
+clib_error_t *
+vat_plugin_register (vat_main_t * vam)
+{
+  flowperpkt_test_main_t *sm = &flowperpkt_test_main;
+  u8 *name;
+
+  sm->vat_main = vam;
+
+  /* Ask the vpp engine for the first assigned message-id */
+  name = format (0, "flowperpkt_%08x%c", api_version, 0);
+  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  /* Don't attempt to hook up API messages if the data plane plugin is AWOL */
+  if (sm->msg_id_base != (u16) ~ 0)
+    vat_api_hookup (vam);
+
+  vec_free (name);
+
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/flowperpkt/l2_node.c b/src/plugins/flowperpkt/l2_node.c
new file mode 100644
index 00000000..1c2f681e
--- /dev/null
+++ b/src/plugins/flowperpkt/l2_node.c
@@ -0,0 +1,561 @@
+/*
+ * l2_node.c - l2 ipfix-per-packet graph node
+ *
+ * Copyright (c) <current-year> <your-organization>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+#include <flowperpkt/flowperpkt.h>
+
+/**
+ * @file l2 flow record generator graph node
+ */
+
+typedef struct
+{
+  /** interface handle */
+  u32 rx_sw_if_index;
+  u32 tx_sw_if_index;
+  /** src and dst L2 addresses */
+  u8 src_mac[6];
+  u8 dst_mac[6];
+  /** Ethertype */
+  u16 ethertype;
+  /** packet timestamp */
+  u64 timestamp;
+  /** size of the buffer */
+  u16 buffer_size;
+} flowperpkt_l2_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_flowperpkt_l2_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  flowperpkt_l2_trace_t *t = va_arg (*args, flowperpkt_l2_trace_t *);
+
+  s = format (s,
+	      "FLOWPERPKT-L2: rx_sw_if_index %d, tx_sw_if_index %d, src %U dst %U ethertype %0x2, timestamp %lld, size %d",
+	      t->rx_sw_if_index, t->tx_sw_if_index,
+	      format_ethernet_address, &t->src_mac,
+	      format_ethernet_address, &t->dst_mac,
+	      t->ethertype, t->timestamp, t->buffer_size);
+  return s;
+}
+
+vlib_node_registration_t flowperpkt_l2_node;
+
+/* No counters at the moment */
+#define foreach_flowperpkt_l2_error
+
+typedef enum
+{
+#define _(sym,str) FLOWPERPKT_ERROR_##sym,
+  foreach_flowperpkt_l2_error
+#undef _
+    FLOWPERPKT_N_ERROR,
+} flowperpkt_l2_error_t;
+
+static char *flowperpkt_l2_error_strings[] = {
+#define _(sym,string) string,
+  foreach_flowperpkt_l2_error
+#undef _
+};
+
+typedef enum
+{
+  FLOWPERPKT_L2_NEXT_DROP,
+  FLOWPERPKT_L2_NEXT_IP4_LOOKUP,
+  FLOWPERPKT_L2_N_NEXT,
+} flowperpkt_l2_next_t;
+
+/**
+ * @brief add an entry to the flow record under construction
+ * @param vm vlib_main_t * current worker thread main structure pointer
+ * @param fm flowperpkt_main_t * flow-per-packet main structure pointer
+ * @param sw_if_index u32 interface handle
+ * @param tos u8 ToS bits from the packet
+ * @param timestamp u64 timestamp, nanoseconds since 1/1/70
+ * @param length u16 ip length of the packet
+ * @param do_flush int 1 = flush all cached records, 0 = construct a record
+ */
+
+static inline void
+add_to_flow_record_l2 (vlib_main_t * vm,
+		       vlib_node_runtime_t * node,
+		       flowperpkt_main_t * fm,
+		       u32 rx_sw_if_index, u32 tx_sw_if_index,
+		       u8 * src_mac, u8 * dst_mac,
+		       u16 ethertype, u64 timestamp, u16 length, int do_flush)
+{
+  u32 my_cpu_number = vm->cpu_index;
+  flow_report_main_t *frm = &flow_report_main;
+  ip4_header_t *ip;
+  udp_header_t *udp;
+  ip4_ipfix_template_packet_t *tp;
+  ipfix_message_header_t *h;
+  ipfix_set_header_t *s;
+  vlib_frame_t *f;
+  vlib_buffer_t *b0;
+  u16 offset;
+  u32 bi0;
+  vlib_buffer_free_list_t *fl;
+
+  /* Find or allocate a buffer */
+  b0 = fm->l2_buffers_per_worker[my_cpu_number];
+
+  /* Need to allocate a buffer? */
+  if (PREDICT_FALSE (b0 == 0))
+    {
+      /* Nothing to flush */
+      if (do_flush)
+	return;
+
+      /* $$$$ drop counter? */
+      if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
+	return;
+
+      /* Initialize the buffer */
+      b0 = fm->l2_buffers_per_worker[my_cpu_number] =
+	vlib_get_buffer (vm, bi0);
+      fl =
+	vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+      vlib_buffer_init_for_free_list (b0, fl);
+      VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+      offset = 0;
+    }
+  else
+    {
+      /* use the current buffer */
+      bi0 = vlib_get_buffer_index (vm, b0);
+      offset = fm->l2_next_record_offset_per_worker[my_cpu_number];
+    }
+
+  /* Find or allocate a frame */
+  f = fm->l2_frames_per_worker[my_cpu_number];
+  if (PREDICT_FALSE (f == 0))
+    {
+      u32 *to_next;
+      f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
+      fm->l2_frames_per_worker[my_cpu_number] = f;
+
+      /* Enqueue the buffer */
+      to_next = vlib_frame_vector_args (f);
+      to_next[0] = bi0;
+      f->n_vectors = 1;
+    }
+
+  /* Fresh packet, construct header */
+  if (PREDICT_FALSE (offset == 0))
+    {
+      flow_report_stream_t *stream;
+
+      stream = &frm->streams[0];
+
+      b0->current_data = 0;
+      b0->current_length = sizeof (*ip) + sizeof (*udp) + sizeof (*h) +
+	sizeof (*s);
+      b0->flags |= (VLIB_BUFFER_TOTAL_LENGTH_VALID | VLIB_BUFFER_FLOW_REPORT);
+      vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = frm->fib_index;
+
+      tp = vlib_buffer_get_current (b0);
+      ip = (ip4_header_t *) & tp->ip4;
+      udp = (udp_header_t *) (ip + 1);
+      h = (ipfix_message_header_t *) (udp + 1);
+      s = (ipfix_set_header_t *) (h + 1);
+
+      ip->ip_version_and_header_length = 0x45;
+      ip->ttl = 254;
+      ip->protocol = IP_PROTOCOL_UDP;
+      ip->flags_and_fragment_offset = 0;
+      ip->src_address.as_u32 = frm->src_address.as_u32;
+      ip->dst_address.as_u32 = frm->ipfix_collector.as_u32;
+      udp->src_port = clib_host_to_net_u16 (UDP_DST_PORT_ipfix);
+      udp->dst_port = clib_host_to_net_u16 (UDP_DST_PORT_ipfix);
+      udp->checksum = 0;
+
+      /* FIXUP: message header export_time */
+      h->export_time = (u32)
+	(((f64) frm->unix_time_0) +
+	 (vlib_time_now (frm->vlib_main) - frm->vlib_time_0));
+      h->export_time = clib_host_to_net_u32 (h->export_time);
+      h->domain_id = clib_host_to_net_u32 (stream->domain_id);
+
+      /* FIXUP: message header sequence_number */
+      h->sequence_number = stream->sequence_number++;
+      h->sequence_number = clib_host_to_net_u32 (h->sequence_number);
+
+      offset = (u32) (((u8 *) (s + 1)) - (u8 *) tp);
+    }
+
+  /* Add data, unless we're flushing stale data */
+  if (PREDICT_TRUE (do_flush == 0))
+    {
+
+      /* Add data */
+      /* Ingress interface */
+      {
+	u32 ingress_interface = clib_host_to_net_u32 (rx_sw_if_index);
+	clib_memcpy (b0->data + offset, &ingress_interface,
+		     sizeof (ingress_interface));
+	offset += sizeof (ingress_interface);
+      }
+      /* Egress interface */
+      {
+	u32 egress_interface = clib_host_to_net_u32 (tx_sw_if_index);
+	clib_memcpy (b0->data + offset, &egress_interface,
+		     sizeof (egress_interface));
+	offset += sizeof (egress_interface);
+      }
+      /* src mac address */
+      {
+	clib_memcpy (b0->data + offset, src_mac, 6);
+	offset += 6;
+      }
+      /* dst mac address */
+      {
+	clib_memcpy (b0->data + offset, dst_mac, 6);
+	offset += 6;
+      }
+
+      /* ethertype */
+      b0->data[offset++] = ethertype >> 8;
+      b0->data[offset++] = ethertype & 0xFF;
+
+      /* Timestamp */
+      clib_memcpy (b0->data + offset, &timestamp, sizeof (f64));
+      offset += sizeof (f64);
+
+      /* pkt size */
+      {
+	u16 pkt_size = clib_host_to_net_u16 (length);
+	clib_memcpy (b0->data + offset, &pkt_size, sizeof (pkt_size));
+	offset += sizeof (pkt_size);
+      }
+
+      b0->current_length +=
+	/* 2*sw_if_index + 2*mac + ethertype + timestamp + length = 32 */
+	2 * sizeof (u32) + 12 + sizeof (u16) + sizeof (f64) + sizeof (u16);
+
+    }
+  /* Time to flush the buffer? */
+  if (PREDICT_FALSE
+      (do_flush || (offset + 2 * sizeof (u32) + 12 + sizeof (u16) +
+		    +sizeof (f64) + sizeof (u16)) > frm->path_mtu))
+    {
+      tp = vlib_buffer_get_current (b0);
+      ip = (ip4_header_t *) & tp->ip4;
+      udp = (udp_header_t *) (ip + 1);
+      h = (ipfix_message_header_t *) (udp + 1);
+      s = (ipfix_set_header_t *) (h + 1);
+
+      s->set_id_length = ipfix_set_id_length (fm->l2_report_id,
+					      b0->current_length -
+					      (sizeof (*ip) + sizeof (*udp) +
+					       sizeof (*h)));
+      h->version_length = version_length (b0->current_length -
+					  (sizeof (*ip) + sizeof (*udp)));
+
+      ip->length = clib_host_to_net_u16 (b0->current_length);
+
+      ip->checksum = ip4_header_checksum (ip);
+      udp->length = clib_host_to_net_u16 (b0->current_length - sizeof (*ip));
+
+      if (frm->udp_checksum)
+	{
+	  /* RFC 7011 section 10.3.2. */
+	  udp->checksum = ip4_tcp_udp_compute_checksum (vm, b0, ip);
+	  if (udp->checksum == 0)
+	    udp->checksum = 0xffff;
+	}
+
+      ASSERT (ip->checksum == ip4_header_checksum (ip));
+
+      if (PREDICT_FALSE (vlib_get_trace_count (vm, node) > 0))
+	{
+	  vlib_trace_buffer (vm, node, FLOWPERPKT_L2_NEXT_IP4_LOOKUP, b0,
+			     0 /* follow chain */ );
+	  flowperpkt_l2_trace_t *t =
+	    vlib_add_trace (vm, node, b0, sizeof (*t));
+	  memset (t, 0, sizeof (*t));
+	  t->rx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  t->tx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	  t->buffer_size = b0->current_length;
+	}
+
+      vlib_put_frame_to_node (vm, ip4_lookup_node.index,
+			      fm->l2_frames_per_worker[my_cpu_number]);
+      fm->l2_frames_per_worker[my_cpu_number] = 0;
+      fm->l2_buffers_per_worker[my_cpu_number] = 0;
+      offset = 0;
+    }
+
+  fm->l2_next_record_offset_per_worker[my_cpu_number] = offset;
+}
+
+void
+flowperpkt_flush_callback_l2 (void)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  flowperpkt_main_t *fm = &flowperpkt_main;
+  vlib_node_runtime_t *node;
+  node = vlib_node_get_runtime (vm, flowperpkt_l2_node.index);
+
+  add_to_flow_record_l2 (vm, node, fm, 0 /* rx_sw_if_index */ ,
+			 0 /* tx_sw_if_index */ ,
+			 0 /* src mac */ ,
+			 0 /* dst mac */ ,
+			 0 /* ethertype */ ,
+			 0ULL /* timestamp */ ,
+			 0 /* length */ ,
+			 1 /* do_flush */ );
+}
+
+
+static uword
+flowperpkt_l2_node_fn (vlib_main_t * vm,
+		       vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  flowperpkt_l2_next_t next_index;
+  flowperpkt_main_t *fm = &flowperpkt_main;
+  u64 now;
+
+  now = (u64) ((vlib_time_now (vm) - fm->vlib_time_0) * 1e9);
+  now += fm->nanosecond_time_0;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 next0 = FLOWPERPKT_L2_NEXT_DROP;
+	  u32 next1 = FLOWPERPKT_L2_NEXT_DROP;
+	  ethernet_header_t *eh0, *eh1;
+	  u16 len0, len1;
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX],
+			     &next0, b0);
+	  vnet_feature_next (vnet_buffer (b1)->sw_if_index[VLIB_TX],
+			     &next1, b1);
+
+	  eh0 = vlib_buffer_get_current (b0);
+	  len0 = vlib_buffer_length_in_chain (vm, b0);
+
+	  if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
+	    add_to_flow_record_l2 (vm, node, fm,
+				   vnet_buffer (b0)->sw_if_index[VLIB_RX],
+				   vnet_buffer (b0)->sw_if_index[VLIB_TX],
+				   eh0->src_address,
+				   eh0->dst_address,
+				   eh0->type, now, len0, 0 /* flush */ );
+
+	  eh1 = vlib_buffer_get_current (b0);
+	  len1 = vlib_buffer_length_in_chain (vm, b0);
+
+	  if (PREDICT_TRUE ((b1->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
+	    add_to_flow_record_l2 (vm, node, fm,
+				   vnet_buffer (b1)->sw_if_index[VLIB_RX],
+				   vnet_buffer (b1)->sw_if_index[VLIB_TX],
+				   eh1->src_address,
+				   eh1->dst_address,
+				   eh1->type, now, len1, 0 /* flush */ );
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  flowperpkt_l2_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->rx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+		  t->tx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+		  clib_memcpy (t->src_mac, eh0->src_address, 6);
+		  clib_memcpy (t->dst_mac, eh0->dst_address, 6);
+		  t->ethertype = clib_net_to_host_u16 (eh0->type);
+		  t->timestamp = now;
+		  t->buffer_size = len0;
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  flowperpkt_l2_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->rx_sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+		  t->tx_sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_TX];
+		  clib_memcpy (t->src_mac, eh1->src_address, 6);
+		  clib_memcpy (t->dst_mac, eh1->dst_address, 6);
+		  t->ethertype = clib_net_to_host_u16 (eh1->type);
+		  t->timestamp = now;
+		  t->buffer_size = len1;
+		}
+	    }
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0 = FLOWPERPKT_L2_NEXT_DROP;
+	  ethernet_header_t *eh0;
+	  u16 len0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX],
+			     &next0, b0);
+
+	  eh0 = vlib_buffer_get_current (b0);
+	  len0 = vlib_buffer_length_in_chain (vm, b0);
+
+	  if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
+	    add_to_flow_record_l2 (vm, node, fm,
+				   vnet_buffer (b0)->sw_if_index[VLIB_RX],
+				   vnet_buffer (b0)->sw_if_index[VLIB_TX],
+				   eh0->src_address,
+				   eh0->dst_address,
+				   eh0->type, now, len0, 0 /* flush */ );
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      flowperpkt_l2_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->rx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	      t->tx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	      clib_memcpy (t->src_mac, eh0->src_address, 6);
+	      clib_memcpy (t->dst_mac, eh0->dst_address, 6);
+	      t->ethertype = clib_net_to_host_u16 (eh0->type);
+	      t->timestamp = now;
+	      t->buffer_size = len0;
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return frame->n_vectors;
+}
+
+/**
+ * @brief IPFIX l2 flow-per-packet graph node
+ * @node flowperpkt-l2
+ *
+ * This is the IPFIX flow-record-per-packet node.
+ *
+ * @param vm    vlib_main_t corresponding to the current thread.
+ * @param node  vlib_node_runtime_t data for this node.
+ * @param frame vlib_frame_t whose contents should be dispatched.
+ *
+ * @par Graph mechanics: buffer metadata, next index usage
+ *
+ * <em>Uses:</em>
+ * - <code>vnet_buffer(b)->ip.save_rewrite_length</code>
+ *     - tells the node the length of the rewrite which was applied in
+ *       ip4/6_rewrite_inline, allows the code to find the IP header without
+ *       having to parse L2 headers, or make stupid assumptions about their
+ *       length.
+ * - <code>vnet_buffer(b)->flags & VLIB_BUFFER_FLOW_REPORT</code>
+ *     - Used to suppress flow record generation for flow record packets.
+ *
+ * <em>Sets:</em>
+ * - <code>vnet_buffer(b)->flags & VLIB_BUFFER_FLOW_REPORT</code>
+ *     - To suppress flow record generation for flow record packets
+ *
+ * <em>Next Index:</em>
+ * - Next configured output feature on the interface, usually
+ *   "interface-output." Generated flow records head for ip4-lookup
+ */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (flowperpkt_l2_node) = {
+  .function = flowperpkt_l2_node_fn,
+  .name = "flowperpkt-l2",
+  .vector_size = sizeof (u32),
+  .format_trace = format_flowperpkt_l2_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(flowperpkt_l2_error_strings),
+  .error_strings = flowperpkt_l2_error_strings,
+
+  .n_next_nodes = FLOWPERPKT_L2_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [FLOWPERPKT_L2_NEXT_DROP] = "error-drop",
+    [FLOWPERPKT_L2_NEXT_IP4_LOOKUP] = "ip4-lookup",
+  },
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/flowperpkt/node.c b/src/plugins/flowperpkt/node.c
new file mode 100644
index 00000000..f77f087d
--- /dev/null
+++ b/src/plugins/flowperpkt/node.c
@@ -0,0 +1,574 @@
+/*
+ * node.c - ipv4 ipfix-per-packet graph node
+ *
+ * Copyright (c) <current-year> <your-organization>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+#include <flowperpkt/flowperpkt.h>
+
+/**
+ * @file ipv4 flow record generator graph node
+ */
+
+typedef struct
+{
+  /** interface handle */
+  u32 rx_sw_if_index;
+  u32 tx_sw_if_index;
+  u32 src_address;
+  u32 dst_address;
+  /** ToS bits */
+  u8 tos;
+  /** packet timestamp */
+  u64 timestamp;
+  /** size of the buffer */
+  u16 buffer_size;
+} flowperpkt_ipv4_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_flowperpkt_ipv4_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  flowperpkt_ipv4_trace_t *t = va_arg (*args, flowperpkt_ipv4_trace_t *);
+
+  s = format (s,
+	      "FLOWPERPKT-V4: rx_sw_if_index %d, tx_sw_if_index %d, src %U dst %U tos %0x2, timestamp %lld, size %d",
+	      t->rx_sw_if_index, t->tx_sw_if_index,
+	      format_ip4_address, &t->src_address,
+	      format_ip4_address, &t->dst_address,
+	      t->tos, t->timestamp, t->buffer_size);
+  return s;
+}
+
+vlib_node_registration_t flowperpkt_ipv4_node;
+
+/* No counters at the moment */
+#define foreach_flowperpkt_ipv4_error
+
+typedef enum
+{
+#define _(sym,str) FLOWPERPKT_ERROR_##sym,
+  foreach_flowperpkt_ipv4_error
+#undef _
+    FLOWPERPKT_N_ERROR,
+} flowperpkt_ipv4_error_t;
+
+static char *flowperpkt_ipv4_error_strings[] = {
+#define _(sym,string) string,
+  foreach_flowperpkt_ipv4_error
+#undef _
+};
+
+typedef enum
+{
+  FLOWPERPKT_IPV4_NEXT_DROP,
+  FLOWPERPKT_IPV4_NEXT_LOOKUP,
+  FLOWPERPKT_IPV4_N_NEXT,
+} flowperpkt_ipv4_next_t;
+
+/**
+ * @brief add an entry to the flow record under construction
+ * @param vm vlib_main_t * current worker thread main structure pointer
+ * @param fm flowperpkt_main_t * flow-per-packet main structure pointer
+ * @param sw_if_index u32 interface handle
+ * @param tos u8 ToS bits from the packet
+ * @param timestamp u64 timestamp, nanoseconds since 1/1/70
+ * @param length u16 ip length of the packet
+ * @param do_flush int 1 = flush all cached records, 0 = construct a record
+ */
+
+static inline void
+add_to_flow_record_ipv4 (vlib_main_t * vm,
+			 vlib_node_runtime_t * node,
+			 flowperpkt_main_t * fm,
+			 u32 rx_sw_if_index, u32 tx_sw_if_index,
+			 u32 src_address, u32 dst_address,
+			 u8 tos, u64 timestamp, u16 length, int do_flush)
+{
+  u32 my_cpu_number = vm->cpu_index;
+  flow_report_main_t *frm = &flow_report_main;
+  ip4_header_t *ip;
+  udp_header_t *udp;
+  ip4_ipfix_template_packet_t *tp;
+  ipfix_message_header_t *h;
+  ipfix_set_header_t *s;
+  vlib_frame_t *f;
+  vlib_buffer_t *b0;
+  u16 offset;
+  u32 bi0;
+  vlib_buffer_free_list_t *fl;
+
+  /* Find or allocate a buffer */
+  b0 = fm->ipv4_buffers_per_worker[my_cpu_number];
+
+  /* Need to allocate a buffer? */
+  if (PREDICT_FALSE (b0 == 0))
+    {
+      /* Nothing to flush */
+      if (do_flush)
+	return;
+
+      /* $$$$ drop counter? */
+      if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
+	return;
+
+      /* Initialize the buffer */
+      b0 = fm->ipv4_buffers_per_worker[my_cpu_number] =
+	vlib_get_buffer (vm, bi0);
+      fl =
+	vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+      vlib_buffer_init_for_free_list (b0, fl);
+      VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+      offset = 0;
+    }
+  else
+    {
+      /* use the current buffer */
+      bi0 = vlib_get_buffer_index (vm, b0);
+      offset = fm->ipv4_next_record_offset_per_worker[my_cpu_number];
+    }
+
+  /* Find or allocate a frame */
+  f = fm->ipv4_frames_per_worker[my_cpu_number];
+  if (PREDICT_FALSE (f == 0))
+    {
+      u32 *to_next;
+      f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
+      fm->ipv4_frames_per_worker[my_cpu_number] = f;
+
+      /* Enqueue the buffer */
+      to_next = vlib_frame_vector_args (f);
+      to_next[0] = bi0;
+      f->n_vectors = 1;
+    }
+
+  /* Fresh packet, construct header */
+  if (PREDICT_FALSE (offset == 0))
+    {
+      flow_report_stream_t *stream;
+
+      stream = &frm->streams[0];
+
+      b0->current_data = 0;
+      b0->current_length = sizeof (*ip) + sizeof (*udp) + sizeof (*h) +
+	sizeof (*s);
+      b0->flags |= (VLIB_BUFFER_TOTAL_LENGTH_VALID | VLIB_BUFFER_FLOW_REPORT);
+      vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = frm->fib_index;
+
+      tp = vlib_buffer_get_current (b0);
+      ip = (ip4_header_t *) & tp->ip4;
+      udp = (udp_header_t *) (ip + 1);
+      h = (ipfix_message_header_t *) (udp + 1);
+      s = (ipfix_set_header_t *) (h + 1);
+
+      ip->ip_version_and_header_length = 0x45;
+      ip->ttl = 254;
+      ip->protocol = IP_PROTOCOL_UDP;
+      ip->flags_and_fragment_offset = 0;
+      ip->src_address.as_u32 = frm->src_address.as_u32;
+      ip->dst_address.as_u32 = frm->ipfix_collector.as_u32;
+      udp->src_port = clib_host_to_net_u16 (UDP_DST_PORT_ipfix);
+      udp->dst_port = clib_host_to_net_u16 (UDP_DST_PORT_ipfix);
+      udp->checksum = 0;
+
+      /* FIXUP: message header export_time */
+      h->export_time = (u32)
+	(((f64) frm->unix_time_0) +
+	 (vlib_time_now (frm->vlib_main) - frm->vlib_time_0));
+      h->export_time = clib_host_to_net_u32 (h->export_time);
+      h->domain_id = clib_host_to_net_u32 (stream->domain_id);
+
+      /* FIXUP: message header sequence_number */
+      h->sequence_number = stream->sequence_number++;
+      h->sequence_number = clib_host_to_net_u32 (h->sequence_number);
+
+      offset = (u32) (((u8 *) (s + 1)) - (u8 *) tp);
+    }
+
+  /* Add data, unless we're flushing stale data */
+  if (PREDICT_TRUE (do_flush == 0))
+    {
+
+      /* Add data */
+      /* Ingress interface */
+      {
+	u32 ingress_interface = clib_host_to_net_u32 (rx_sw_if_index);
+	clib_memcpy (b0->data + offset, &ingress_interface,
+		     sizeof (ingress_interface));
+	offset += sizeof (ingress_interface);
+      }
+      /* Egress interface */
+      {
+	u32 egress_interface = clib_host_to_net_u32 (tx_sw_if_index);
+	clib_memcpy (b0->data + offset, &egress_interface,
+		     sizeof (egress_interface));
+	offset += sizeof (egress_interface);
+      }
+      /* ip4 src address */
+      {
+	clib_memcpy (b0->data + offset, &src_address, sizeof (src_address));
+	offset += sizeof (src_address);
+      }
+      /* ip4 dst address */
+      {
+	clib_memcpy (b0->data + offset, &dst_address, sizeof (dst_address));
+	offset += sizeof (dst_address);
+      }
+
+      /* ToS */
+      b0->data[offset++] = tos;
+
+      /* Timestamp */
+      clib_memcpy (b0->data + offset, &timestamp, sizeof (f64));
+      offset += sizeof (f64);
+
+      /* pkt size */
+      {
+	u16 pkt_size = clib_host_to_net_u16 (length);
+	clib_memcpy (b0->data + offset, &pkt_size, sizeof (pkt_size));
+	offset += sizeof (pkt_size);
+      }
+
+      b0->current_length +=
+	/* sw_if_index + tos + timestamp + length = 15 */
+	4 * sizeof (u32) + sizeof (u8) + sizeof (f64) + sizeof (u16);
+
+    }
+  /* Time to flush the buffer? */
+  if (PREDICT_FALSE
+      (do_flush || (offset + 4 * sizeof (u32) + sizeof (u8)
+		    + sizeof (f64) + sizeof (u16)) > frm->path_mtu))
+    {
+      tp = vlib_buffer_get_current (b0);
+      ip = (ip4_header_t *) & tp->ip4;
+      udp = (udp_header_t *) (ip + 1);
+      h = (ipfix_message_header_t *) (udp + 1);
+      s = (ipfix_set_header_t *) (h + 1);
+
+      s->set_id_length = ipfix_set_id_length (fm->ipv4_report_id,
+					      b0->current_length -
+					      (sizeof (*ip) + sizeof (*udp) +
+					       sizeof (*h)));
+      h->version_length = version_length (b0->current_length -
+					  (sizeof (*ip) + sizeof (*udp)));
+
+      ip->length = clib_host_to_net_u16 (b0->current_length);
+
+      ip->checksum = ip4_header_checksum (ip);
+      udp->length = clib_host_to_net_u16 (b0->current_length - sizeof (*ip));
+
+      if (frm->udp_checksum)
+	{
+	  /* RFC 7011 section 10.3.2. */
+	  udp->checksum = ip4_tcp_udp_compute_checksum (vm, b0, ip);
+	  if (udp->checksum == 0)
+	    udp->checksum = 0xffff;
+	}
+
+      ASSERT (ip->checksum == ip4_header_checksum (ip));
+
+      if (PREDICT_FALSE (vlib_get_trace_count (vm, node) > 0))
+	{
+	  vlib_trace_buffer (vm, node, FLOWPERPKT_IPV4_NEXT_LOOKUP, b0,
+			     0 /* follow chain */ );
+	  flowperpkt_ipv4_trace_t *t =
+	    vlib_add_trace (vm, node, b0, sizeof (*t));
+	  t->rx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  t->tx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	  t->src_address = 0;
+	  t->dst_address = 0;
+	  t->tos = 0;
+	  t->timestamp = 0;
+	  t->buffer_size = b0->current_length;
+	}
+
+      vlib_put_frame_to_node (vm, ip4_lookup_node.index,
+			      fm->ipv4_frames_per_worker[my_cpu_number]);
+      fm->ipv4_frames_per_worker[my_cpu_number] = 0;
+      fm->ipv4_buffers_per_worker[my_cpu_number] = 0;
+      offset = 0;
+    }
+
+  fm->ipv4_next_record_offset_per_worker[my_cpu_number] = offset;
+}
+
+void
+flowperpkt_flush_callback_ipv4 (void)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  flowperpkt_main_t *fm = &flowperpkt_main;
+  vlib_node_runtime_t *node;
+  node = vlib_node_get_runtime (vm, flowperpkt_ipv4_node.index);
+
+  add_to_flow_record_ipv4 (vm, node, fm, 0 /* rx_sw_if_index */ ,
+			   0 /* tx_sw_if_index */ ,
+			   0 /* src_address */ ,
+			   0 /* dst_address */ ,
+			   0 /* ToS */ ,
+			   0ULL /* timestamp */ ,
+			   0 /* length */ ,
+			   1 /* do_flush */ );
+}
+
+
+static uword
+flowperpkt_ipv4_node_fn (vlib_main_t * vm,
+			 vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  flowperpkt_ipv4_next_t next_index;
+  flowperpkt_main_t *fm = &flowperpkt_main;
+  u64 now;
+
+  now = (u64) ((vlib_time_now (vm) - fm->vlib_time_0) * 1e9);
+  now += fm->nanosecond_time_0;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 next0 = FLOWPERPKT_IPV4_NEXT_DROP;
+	  u32 next1 = FLOWPERPKT_IPV4_NEXT_DROP;
+	  ip4_header_t *ip0, *ip1;
+	  u16 len0, len1;
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX],
+			     &next0, b0);
+	  vnet_feature_next (vnet_buffer (b1)->sw_if_index[VLIB_TX],
+			     &next1, b1);
+
+	  ip0 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b0) +
+				  vnet_buffer (b0)->ip.save_rewrite_length);
+
+	  len0 = vlib_buffer_length_in_chain (vm, b0);
+
+	  if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
+	    add_to_flow_record_ipv4 (vm, node, fm,
+				     vnet_buffer (b0)->sw_if_index[VLIB_RX],
+				     vnet_buffer (b0)->sw_if_index[VLIB_TX],
+				     ip0->src_address.as_u32,
+				     ip0->dst_address.as_u32,
+				     ip0->tos, now, len0, 0 /* flush */ );
+
+	  ip1 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b1) +
+				  vnet_buffer (b1)->ip.save_rewrite_length);
+	  len1 = vlib_buffer_length_in_chain (vm, b1);
+
+	  if (PREDICT_TRUE ((b1->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
+	    add_to_flow_record_ipv4 (vm, node, fm,
+				     vnet_buffer (b1)->sw_if_index[VLIB_RX],
+				     vnet_buffer (b1)->sw_if_index[VLIB_TX],
+				     ip1->src_address.as_u32,
+				     ip1->dst_address.as_u32,
+				     ip1->tos, now, len1, 0 /* flush */ );
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  flowperpkt_ipv4_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->rx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+		  t->tx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+		  t->src_address = ip0->src_address.as_u32;
+		  t->dst_address = ip0->dst_address.as_u32;
+		  t->tos = ip0->tos;
+		  t->timestamp = now;
+		  t->buffer_size = len0;
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  flowperpkt_ipv4_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->rx_sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+		  t->tx_sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_TX];
+		  t->src_address = ip1->src_address.as_u32;
+		  t->dst_address = ip1->dst_address.as_u32;
+		  t->tos = ip1->tos;
+		  t->timestamp = now;
+		  t->buffer_size = len1;
+		}
+	    }
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0 = FLOWPERPKT_IPV4_NEXT_DROP;
+	  ip4_header_t *ip0;
+	  u16 len0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX],
+			     &next0, b0);
+
+	  ip0 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b0) +
+				  vnet_buffer (b0)->ip.save_rewrite_length);
+	  /*
+	   * egressInterface, TLV type 14, u32
+	   * ipClassOfService, TLV type 5, u8
+	   * flowStartNanoseconds, TLV type 156, dateTimeNanoseconds (f64)
+	   *   Implementation: f64 nanoseconds since VPP started
+	   * dataLinkFrameSize, TLV type 312, u16
+	   */
+	  len0 = vlib_buffer_length_in_chain (vm, b0);
+
+	  if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
+	    add_to_flow_record_ipv4 (vm, node, fm,
+				     vnet_buffer (b0)->sw_if_index[VLIB_RX],
+				     vnet_buffer (b0)->sw_if_index[VLIB_TX],
+				     ip0->src_address.as_u32,
+				     ip0->dst_address.as_u32,
+				     ip0->tos, now, len0, 0 /* flush */ );
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      flowperpkt_ipv4_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->rx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	      t->tx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	      t->src_address = ip0->src_address.as_u32;
+	      t->dst_address = ip0->dst_address.as_u32;
+	      t->tos = ip0->tos;
+	      t->timestamp = now;
+	      t->buffer_size = len0;
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return frame->n_vectors;
+}
+
+/**
+ * @brief IPFIX ipv4 flow-per-packet graph node
+ * @node flowperpkt-ipv4
+ *
+ * This is the IPFIX flow-record-per-packet node.
+ *
+ * @param vm    vlib_main_t corresponding to the current thread.
+ * @param node  vlib_node_runtime_t data for this node.
+ * @param frame vlib_frame_t whose contents should be dispatched.
+ *
+ * @par Graph mechanics: buffer metadata, next index usage
+ *
+ * <em>Uses:</em>
+ * - <code>vnet_buffer(b)->ip.save_rewrite_length</code>
+ *     - tells the node the length of the rewrite which was applied in
+ *       ip4/6_rewrite_inline, allows the code to find the IP header without
+ *       having to parse L2 headers, or make stupid assumptions about their
+ *       length.
+ * - <code>vnet_buffer(b)->flags & VLIB_BUFFER_FLOW_REPORT</code>
+ *     - Used to suppress flow record generation for flow record packets.
+ *
+ * <em>Sets:</em>
+ * - <code>vnet_buffer(b)->flags & VLIB_BUFFER_FLOW_REPORT</code>
+ *     - To suppress flow record generation for flow record packets
+ *
+ * <em>Next Index:</em>
+ * - Next configured output feature on the interface, usually
+ *   "interface-output." Generated flow records head for ip4-lookup
+ */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (flowperpkt_ipv4_node) = {
+  .function = flowperpkt_ipv4_node_fn,
+  .name = "flowperpkt-ipv4",
+  .vector_size = sizeof (u32),
+  .format_trace = format_flowperpkt_ipv4_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(flowperpkt_ipv4_error_strings),
+  .error_strings = flowperpkt_ipv4_error_strings,
+
+  .n_next_nodes = FLOWPERPKT_IPV4_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [FLOWPERPKT_IPV4_NEXT_DROP] = "error-drop",
+    /* Used only to trace ipfix data packets */
+    [FLOWPERPKT_IPV4_NEXT_LOOKUP] = "ip4-lookup",
+  },
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ila.am b/src/plugins/ila.am
new file mode 100644
index 00000000..d900f3eb
--- /dev/null
+++ b/src/plugins/ila.am
@@ -0,0 +1,20 @@
+# Copyright (c) 2016 Cisco Systems, Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+vppplugins_LTLIBRARIES += ila_plugin.la
+
+ila_plugin_la_SOURCES = ila/ila.c
+
+noinst_HEADERS += ila/ila.h
+
+# vi:syntax=automake
diff --git a/src/plugins/ila/ila.c b/src/plugins/ila/ila.c
new file mode 100644
index 00000000..336f4cf5
--- /dev/null
+++ b/src/plugins/ila/ila.c
@@ -0,0 +1,1070 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <ila/ila.h>
+#include <vnet/plugin/plugin.h>
+#include <vnet/ip/lookup.h>
+#include <vnet/dpo/dpo.h>
+#include <vnet/fib/fib_table.h>
+
+static ila_main_t ila_main;
+
+#define ILA_TABLE_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
+#define ILA_TABLE_DEFAULT_HASH_MEMORY_SIZE (32<<20)
+
+#define foreach_ila_error \
+ _(NONE, "valid ILA packets")
+
+typedef enum {
+#define _(sym,str) ILA_ERROR_##sym,
+  foreach_ila_error
+#undef _
+    ILA_N_ERROR,
+} ila_error_t;
+
+static char *ila_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ila_error
+#undef _
+};
+
+typedef enum {
+  ILA_ILA2SIR_NEXT_DROP,
+  ILA_ILA2SIR_N_NEXT,
+} ila_ila2sir_next_t;
+
+typedef struct {
+  u32 ila_index;
+  ip6_address_t initial_dst;
+  u32 adj_index;
+} ila_ila2sir_trace_t;
+
+static ila_entry_t ila_sir2ila_default_entry = {
+  .csum_mode = ILA_CSUM_MODE_NO_ACTION,
+  .type = ILA_TYPE_IID,
+  .dir = ILA_DIR_ILA2SIR, //Will pass the packet with no
+};
+
+/**
+ * @brief Dynamically registered DPO Type for ILA
+ */
+static dpo_type_t ila_dpo_type;
+
+/**
+ * @brief Dynamically registered FIB node type for ILA
+ */
+static fib_node_type_t ila_fib_node_type;
+
+u8 *
+format_half_ip6_address (u8 * s, va_list * va)
+{
+  u64 v = clib_net_to_host_u64 (va_arg (*va, u64));
+
+  return format (s, "%04x:%04x:%04x:%04x",
+		 v >> 48, (v >> 32) & 0xffff, (v >> 16) & 0xffff, v & 0xffff);
+
+}
+
+u8 *
+format_ila_direction (u8 * s, va_list * args)
+{
+  ila_direction_t t = va_arg (*args, ila_direction_t);
+#define _(i,n,st) \
+  if (t == ILA_DIR_##i) \
+    return format(s, st);
+  ila_foreach_direction
+#undef _
+    return format (s, "invalid_ila_direction");
+}
+
+static u8 *
+format_csum_mode (u8 * s, va_list * va)
+{
+  ila_csum_mode_t csum_mode = va_arg (*va, ila_csum_mode_t);
+  char *txt;
+
+  switch (csum_mode)
+    {
+#define _(i,n,st) \
+  case ILA_CSUM_MODE_##i: \
+    txt = st; \
+    break;
+      ila_csum_foreach_type
+#undef _
+    default:
+      txt = "invalid_ila_csum_mode";
+      break;
+    }
+  return format (s, txt);
+}
+
+u8 *
+format_ila_type (u8 * s, va_list * args)
+{
+  ila_type_t t = va_arg (*args, ila_type_t);
+#define _(i,n,st) \
+  if (t == ILA_TYPE_##i) \
+    return format(s, st);
+  ila_foreach_type
+#undef _
+    return format (s, "invalid_ila_type");
+}
+
+static u8 *
+format_ila_entry (u8 * s, va_list * va)
+{
+  vnet_main_t *vnm = va_arg (*va, vnet_main_t *);
+  ila_entry_t *e = va_arg (*va, ila_entry_t *);
+
+  if (!e)
+    {
+      return format (s, "%-15s%=40s%=40s%+16s%+18s%+11s", "Type", "SIR Address",
+		     "ILA Address", "Checksum Mode", "Direction", "Next DPO");
+    }
+  else if (vnm)
+    {
+      if (ip6_address_is_zero(&e->next_hop))
+	{
+	  return format (s, "%-15U%=40U%=40U%18U%11U%s",
+			 format_ila_type, e->type,
+			 format_ip6_address, &e->sir_address,
+			 format_ip6_address, &e->ila_address,
+			 format_csum_mode, e->csum_mode,
+			 format_ila_direction, e->dir,
+			 "n/a");
+	}
+      else
+	{
+	  return format (s, "%-15U%=40U%=40U%18U%11U%U",
+			 format_ila_type, e->type,
+			 format_ip6_address, &e->sir_address,
+			 format_ip6_address, &e->ila_address,
+			 format_csum_mode, e->csum_mode,
+			 format_ila_direction, e->dir,
+			 format_dpo_id, &e->ila_dpo, 0);
+	}
+    }
+
+  return NULL;
+}
+
+u8 *
+format_ila_ila2sir_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ila_ila2sir_trace_t *t = va_arg (*args, ila_ila2sir_trace_t *);
+  return format (s,
+		 "ILA -> SIR adj index: %d entry index: %d initial_dst: %U",
+		 t->adj_index, t->ila_index, format_ip6_address,
+		 &t->initial_dst);
+}
+
+static uword
+unformat_ila_direction (unformat_input_t * input, va_list * args)
+{
+  ila_direction_t *result = va_arg (*args, ila_direction_t *);
+#define _(i,n,s) \
+  if (unformat(input, s)) \
+      { \
+        *result = ILA_DIR_##i; \
+        return 1;\
+      }
+
+  ila_foreach_direction
+#undef _
+    return 0;
+}
+
+static uword
+unformat_ila_type (unformat_input_t * input, va_list * args)
+{
+  ila_type_t *result = va_arg (*args, ila_type_t *);
+#define _(i,n,s) \
+  if (unformat(input, s)) \
+      { \
+        *result = ILA_TYPE_##i; \
+        return 1;\
+      }
+
+  ila_foreach_type
+#undef _
+    return 0;
+}
+
+static uword
+unformat_ila_csum_mode (unformat_input_t * input, va_list * args)
+{
+  ila_csum_mode_t *result = va_arg (*args, ila_csum_mode_t *);
+  if (unformat (input, "none") || unformat (input, "no-action"))
+    {
+      *result = ILA_CSUM_MODE_NO_ACTION;
+      return 1;
+    }
+  if (unformat (input, "neutral-map"))
+    {
+      *result = ILA_CSUM_MODE_NEUTRAL_MAP;
+      return 1;
+    }
+  if (unformat (input, "adjust-transport"))
+    {
+      *result = ILA_CSUM_MODE_ADJUST_TRANSPORT;
+      return 1;
+    }
+  return 0;
+}
+
+static uword
+unformat_half_ip6_address (unformat_input_t * input, va_list * args)
+{
+  u64 *result = va_arg (*args, u64 *);
+  u32 a[4];
+
+  if (!unformat (input, "%x:%x:%x:%x", &a[0], &a[1], &a[2], &a[3]))
+    return 0;
+
+  if (a[0] > 0xFFFF || a[1] > 0xFFFF || a[2] > 0xFFFF || a[3] > 0xFFFF)
+    return 0;
+
+  *result = clib_host_to_net_u64 ((((u64) a[0]) << 48) |
+				  (((u64) a[1]) << 32) |
+				  (((u64) a[2]) << 16) | (((u64) a[3])));
+
+  return 1;
+}
+
+static vlib_node_registration_t ila_ila2sir_node;
+
+static uword
+ila_ila2sir (vlib_main_t * vm,
+	     vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  ila_main_t *ilm = &ila_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 pi0, pi1;
+	  vlib_buffer_t *p0, *p1;
+	  ila_entry_t *ie0, *ie1;
+	  ip6_header_t *ip60, *ip61;
+	  ip6_address_t *sir_address0, *sir_address1;
+
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+	    CLIB_PREFETCH (p2->data, sizeof (ip6_header_t), LOAD);
+	    CLIB_PREFETCH (p3->data, sizeof (ip6_header_t), LOAD);
+	  }
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+	  ip60 = vlib_buffer_get_current (p0);
+	  ip61 = vlib_buffer_get_current (p1);
+	  sir_address0 = &ip60->dst_address;
+	  sir_address1 = &ip61->dst_address;
+	  ie0 = pool_elt_at_index (ilm->entries,
+				   vnet_buffer (p0)->ip.adj_index[VLIB_TX]);
+	  ie1 = pool_elt_at_index (ilm->entries,
+				   vnet_buffer (p1)->ip.adj_index[VLIB_TX]);
+
+	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ila_ila2sir_trace_t *tr =
+		vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->ila_index = ie0 - ilm->entries;
+	      tr->initial_dst = ip60->dst_address;
+	      tr->adj_index = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+	    }
+
+	  if (PREDICT_FALSE (p1->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ila_ila2sir_trace_t *tr =
+		vlib_add_trace (vm, node, p1, sizeof (*tr));
+	      tr->ila_index = ie1 - ilm->entries;
+	      tr->initial_dst = ip61->dst_address;
+	      tr->adj_index = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
+	    }
+
+	  sir_address0 = (ie0->dir != ILA_DIR_SIR2ILA) ? &ie0->sir_address : sir_address0;
+	  sir_address1 = (ie1->dir != ILA_DIR_SIR2ILA) ? &ie1->sir_address : sir_address1;
+	  ip60->dst_address.as_u64[0] = sir_address0->as_u64[0];
+	  ip60->dst_address.as_u64[1] = sir_address0->as_u64[1];
+	  ip61->dst_address.as_u64[0] = sir_address1->as_u64[0];
+	  ip61->dst_address.as_u64[1] = sir_address1->as_u64[1];
+
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = ie0->ila_dpo.dpoi_index;
+	  vnet_buffer (p1)->ip.adj_index[VLIB_TX] = ie1->ila_dpo.dpoi_index;
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+					   n_left_to_next, pi0, pi1,
+					   ie0->ila_dpo.dpoi_next_node,
+					   ie1->ila_dpo.dpoi_next_node);
+	}
+
+      /* Single loop */
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  ila_entry_t *ie0;
+	  ip6_header_t *ip60;
+	  ip6_address_t *sir_address0;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip60 = vlib_buffer_get_current (p0);
+	  sir_address0 = &ip60->dst_address;
+	  ie0 = pool_elt_at_index (ilm->entries,
+				   vnet_buffer (p0)->ip.adj_index[VLIB_TX]);
+
+	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ila_ila2sir_trace_t *tr =
+		vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->ila_index = ie0 ? (ie0 - ilm->entries) : ~0;
+	      tr->initial_dst = ip60->dst_address;
+	      tr->adj_index = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+	    }
+
+	  sir_address0 = (ie0->dir != ILA_DIR_SIR2ILA) ? &ie0->sir_address : sir_address0;
+	  ip60->dst_address.as_u64[0] = sir_address0->as_u64[0];
+	  ip60->dst_address.as_u64[1] = sir_address0->as_u64[1];
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = ie0->ila_dpo.dpoi_index;
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, pi0,
+					   ie0->ila_dpo.dpoi_next_node);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/** *INDENT-OFF* */
+VLIB_REGISTER_NODE (ila_ila2sir_node, static) =
+{
+  .function = ila_ila2sir,
+  .name = "ila-to-sir",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ila_ila2sir_trace,
+  .n_errors = ILA_N_ERROR,
+  .error_strings = ila_error_strings,
+  .n_next_nodes = ILA_ILA2SIR_N_NEXT,
+  .next_nodes =
+  {
+      [ILA_ILA2SIR_NEXT_DROP] = "error-drop"
+  },
+};
+/** *INDENT-ON* */
+
+typedef enum
+{
+  ILA_SIR2ILA_NEXT_DROP,
+  ILA_SIR2ILA_N_NEXT,
+} ila_sir2ila_next_t;
+
+typedef struct
+{
+  u32 ila_index;
+  ip6_address_t initial_dst;
+} ila_sir2ila_trace_t;
+
+u8 *
+format_ila_sir2ila_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ila_sir2ila_trace_t *t = va_arg (*args, ila_sir2ila_trace_t *);
+
+  return format (s, "SIR -> ILA entry index: %d initial_dst: %U",
+		 t->ila_index, format_ip6_address, &t->initial_dst);
+}
+
+static vlib_node_registration_t ila_sir2ila_node;
+
+static uword
+ila_sir2ila (vlib_main_t * vm,
+	     vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  ila_main_t *ilm = &ila_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 pi0, pi1;
+	  vlib_buffer_t *p0, *p1;
+	  ip6_header_t *ip60, *ip61;
+	  u32 next0 = ILA_SIR2ILA_NEXT_DROP;
+	  u32 next1 = ILA_SIR2ILA_NEXT_DROP;
+	  BVT (clib_bihash_kv) kv0, value0;
+	  BVT (clib_bihash_kv) kv1, value1;
+	  ila_entry_t *ie0 = &ila_sir2ila_default_entry;
+	  ila_entry_t *ie1 = &ila_sir2ila_default_entry;
+	  ip6_address_t *ila_address0, *ila_address1;
+
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+	    CLIB_PREFETCH (p2->data, sizeof (ip6_header_t), LOAD);
+	    CLIB_PREFETCH (p3->data, sizeof (ip6_header_t), LOAD);
+	  }
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+	  ip60 = vlib_buffer_get_current (p0);
+	  ip61 = vlib_buffer_get_current (p1);
+	  ila_address0 = &ip60->dst_address;
+	  ila_address1 = &ip61->dst_address;
+	  kv0.key[0] = ip60->dst_address.as_u64[0];
+	  kv0.key[1] = ip60->dst_address.as_u64[1];
+	  kv0.key[2] = 0;
+	  kv1.key[0] = ip61->dst_address.as_u64[0];
+	  kv1.key[1] = ip61->dst_address.as_u64[1];
+	  kv1.key[2] = 0;
+
+	  if (PREDICT_TRUE((BV (clib_bihash_search)
+	      (&ilm->id_to_entry_table, &kv0, &value0)) == 0)) {
+	      ie0 = &ilm->entries[value0.value];
+	      ila_address0 = (ie0->dir != ILA_DIR_ILA2SIR) ? &ie0->ila_address : ila_address0;
+	  }
+
+	  if ((BV (clib_bihash_search)
+	       (&ilm->id_to_entry_table, &kv1, &value1)) == 0) {
+	    ie1 = &ilm->entries[value1.value];
+	    ila_address1 = (ie1->dir != ILA_DIR_ILA2SIR) ? &ie1->ila_address : ila_address1;
+	  }
+
+	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ila_sir2ila_trace_t *tr =
+		vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->ila_index =
+		(ie0 != &ila_sir2ila_default_entry) ? (ie0 - ilm->entries) : ~0;
+	      tr->initial_dst = ip60->dst_address;
+	    }
+
+	  if (PREDICT_FALSE (p1->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ila_sir2ila_trace_t *tr =
+		vlib_add_trace (vm, node, p1, sizeof (*tr));
+	      tr->ila_index =
+		(ie1 != &ila_sir2ila_default_entry) ? (ie1 - ilm->entries) : ~0;
+	      tr->initial_dst = ip61->dst_address;
+	    }
+
+	  ip60->dst_address.as_u64[0] = ila_address0->as_u64[0];
+	  ip60->dst_address.as_u64[1] = ila_address0->as_u64[1];
+	  ip61->dst_address.as_u64[0] = ila_address1->as_u64[0];
+	  ip61->dst_address.as_u64[1] = ila_address1->as_u64[1];
+
+	  vnet_feature_next (vnet_buffer (p0)->sw_if_index[VLIB_RX], &next0, p0);
+	  vnet_feature_next (vnet_buffer (p1)->sw_if_index[VLIB_RX], &next1, p1);
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+					   n_left_to_next, pi0, pi1, next0,
+					   next1);
+	}
+
+      /* Single loop */
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  ip6_header_t *ip60;
+	  u32 next0 = ILA_SIR2ILA_NEXT_DROP;
+	  BVT (clib_bihash_kv) kv0, value0;
+	  ila_entry_t *ie0 = &ila_sir2ila_default_entry;
+	  ip6_address_t *ila_address0;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip60 = vlib_buffer_get_current (p0);
+	  ila_address0 = &ip60->dst_address;
+
+	  kv0.key[0] = ip60->dst_address.as_u64[0];
+	  kv0.key[1] = ip60->dst_address.as_u64[1];
+	  kv0.key[2] = 0;
+
+	  if (PREDICT_TRUE((BV (clib_bihash_search)
+	       (&ilm->id_to_entry_table, &kv0, &value0)) == 0)) {
+	    ie0 = &ilm->entries[value0.value];
+	    ila_address0 = (ie0->dir != ILA_DIR_ILA2SIR) ? &ie0->ila_address : ila_address0;
+	  }
+
+	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ila_sir2ila_trace_t *tr =
+		vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->ila_index =
+		(ie0 != &ila_sir2ila_default_entry) ? (ie0 - ilm->entries) : ~0;
+	      tr->initial_dst = ip60->dst_address;
+	    }
+
+	  //This operation should do everything for any type (except vnid4 obviously)
+	  ip60->dst_address.as_u64[0] = ila_address0->as_u64[0];
+	  ip60->dst_address.as_u64[1] = ila_address0->as_u64[1];
+
+	  vnet_feature_next (vnet_buffer (p0)->sw_if_index[VLIB_RX], &next0, p0);
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, pi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/** *INDENT-OFF* */
+VLIB_REGISTER_NODE (ila_sir2ila_node, static) =
+{
+  .function = ila_sir2ila,.name = "sir-to-ila",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ila_sir2ila_trace,
+  .n_errors = ILA_N_ERROR,
+  .error_strings = ila_error_strings,
+  .n_next_nodes = ILA_SIR2ILA_N_NEXT,
+  .next_nodes =
+  {
+      [ILA_SIR2ILA_NEXT_DROP] = "error-drop"
+  },
+};
+/** *INDENT-ON* */
+
+/** *INDENT-OFF* */
+VNET_FEATURE_INIT (ila_sir2ila, static) =
+{
+  .arc_name = "ip6-unicast",
+  .node_name = "sir-to-ila",
+  .runs_before = VNET_FEATURES ("ip6-lookup"),
+};
+/** *INDENT-ON* */
+
+static void
+ila_entry_stack (ila_entry_t *ie)
+{
+    /*
+     * restack on the next-hop's FIB entry
+     */
+    dpo_stack(ila_dpo_type,
+	      DPO_PROTO_IP6,
+	      &ie->ila_dpo,
+	      fib_entry_contribute_ip_forwarding(
+		  ie->next_hop_fib_entry_index));
+}
+
+int
+ila_add_del_entry (ila_add_del_entry_args_t * args)
+{
+  ila_main_t *ilm = &ila_main;
+  BVT (clib_bihash_kv) kv, value;
+
+  //Sanity check
+  if (args->type == ILA_TYPE_IID || args->type == ILA_TYPE_LUID)
+    {
+      if ((args->sir_address.as_u8[8] >> 5) != args->type)
+	{
+	  clib_warning ("Incorrect SIR address (ILA type mismatch %d %d)",
+			args->sir_address.as_u8[8] >> 1, args->type);
+	  return -1;
+	}
+      if (args->sir_address.as_u8[8] & 0x10)
+	{
+	  clib_warning ("Checksum bit should not be set in SIR address");
+	  return -1;
+	}
+    }
+  else if (args->type == ILA_TYPE_VNIDM)
+    {
+      if (args->sir_address.as_u8[0] != 0xff ||
+	  (args->sir_address.as_u8[1] & 0xf0) != 0xf0)
+	{
+	  clib_warning ("SIR multicast address must start with fff");
+	  return -1;
+	}
+      if (args->sir_address.as_u16[1] || args->sir_address.as_u16[2] ||
+	  args->sir_address.as_u16[3] || args->sir_address.as_u16[4] ||
+	  args->sir_address.as_u16[5] || (args->sir_address.as_u8[12] & 0xf0))
+	{
+	  clib_warning ("SIR multicast address must start with fff");
+	  return -1;
+	}
+    }
+
+  if (!args->is_del)
+    {
+      ila_entry_t *e;
+      pool_get (ilm->entries, e);
+      e->type = args->type;
+      e->sir_address = args->sir_address;
+      e->next_hop = args->next_hop_address;
+      e->csum_mode = args->csum_mode;
+      e->dir = args->dir;
+
+      //Construct ILA address
+      switch (e->type)
+	{
+	case ILA_TYPE_IID:
+	  e->ila_address = e->sir_address;
+	  break;
+	case ILA_TYPE_LUID:
+	  e->ila_address.as_u64[0] = args->locator;
+	  e->ila_address.as_u64[1] = args->sir_address.as_u64[1];
+	  break;
+	case ILA_TYPE_VNID6:
+	  e->ila_address.as_u64[0] = args->locator;
+	  e->ila_address.as_u8[8] = (ILA_TYPE_VNID6 << 1);
+	  e->ila_address.as_u32[2] |= args->vnid;
+	  e->ila_address.as_u32[3] = args->sir_address.as_u32[3];
+	  break;
+	case ILA_TYPE_VNIDM:
+	  e->ila_address.as_u64[0] = args->locator;
+	  e->ila_address.as_u8[8] = (ILA_TYPE_VNIDM << 1);
+	  e->ila_address.as_u32[2] |= args->vnid;
+	  e->ila_address.as_u32[3] = args->sir_address.as_u32[3];
+	  e->ila_address.as_u8[12] |= args->sir_address.as_u8[2] << 4;
+	  break;
+	case ILA_TYPE_VNID4:
+	  clib_warning ("ILA type '%U' is not supported", format_ila_type,
+			e->type);
+	  return -1;
+	}
+
+      //Modify ILA checksum if necessary
+      if (e->csum_mode == ILA_CSUM_MODE_NEUTRAL_MAP)
+	{
+	  ip_csum_t csum = e->ila_address.as_u16[7];
+	  int i;
+	  for (i = 0; i < 4; i++)
+	    {
+	      csum = ip_csum_sub_even (csum, e->sir_address.as_u32[i]);
+	      csum = ip_csum_add_even (csum, e->ila_address.as_u32[i]);
+	    }
+	  csum = ip_csum_add_even (csum, clib_host_to_net_u16 (0x1000));
+	  e->ila_address.as_u16[7] = ip_csum_fold (csum);
+	  e->ila_address.as_u8[8] |= 0x10;
+	}
+
+      //Create entry with the sir address
+      kv.key[0] = e->sir_address.as_u64[0];
+      kv.key[1] = e->sir_address.as_u64[1];
+      kv.key[2] = 0;
+      kv.value = e - ilm->entries;
+      BV (clib_bihash_add_del) (&ilm->id_to_entry_table, &kv,
+				1 /* is_add */ );
+
+      if (!ip6_address_is_zero(&e->next_hop))
+	{
+	  /*
+	   * become a child of the FIB netry for the next-hop
+	   * so we are informed when its forwarding changes
+	   */
+	  fib_prefix_t next_hop = {
+	      .fp_addr = {
+		  .ip6 = e->next_hop,
+	      },
+	      .fp_len = 128,
+	      .fp_proto = FIB_PROTOCOL_IP6,
+	  };
+
+	  e->next_hop_fib_entry_index = 
+	      fib_table_entry_special_add(0,
+					  &next_hop,
+					  FIB_SOURCE_RR,
+					  FIB_ENTRY_FLAG_NONE,
+					  ADJ_INDEX_INVALID);
+	  e->next_hop_child_index =
+	      fib_entry_child_add(e->next_hop_fib_entry_index,
+				  ila_fib_node_type,
+				  e - ilm->entries);
+
+	  /*
+	   * Create a route that results in the ILA entry
+	   */
+	  dpo_id_t dpo = DPO_INVALID;
+	  fib_prefix_t pfx = {
+	      .fp_addr = {
+		  .ip6 = e->ila_address,
+	      },
+	      .fp_len = 128,
+	      .fp_proto = FIB_PROTOCOL_IP6,
+	  };
+
+	  dpo_set(&dpo, ila_dpo_type, DPO_PROTO_IP6, e - ilm->entries);
+
+	  fib_table_entry_special_dpo_add(0,
+					  &pfx,
+					  FIB_SOURCE_PLUGIN_HI,
+					  FIB_ENTRY_FLAG_EXCLUSIVE,
+					  &dpo);
+	  dpo_reset(&dpo);
+
+	  /*
+	   * finally stack the ILA entry so it will forward to the next-hop
+	   */
+	  ila_entry_stack (e);
+	}
+    }
+  else
+    {
+      ila_entry_t *e;
+      kv.key[0] = args->sir_address.as_u64[0];
+      kv.key[1] = args->sir_address.as_u64[1];
+      kv.key[2] = 0;
+
+      if ((BV (clib_bihash_search) (&ilm->id_to_entry_table, &kv, &value) <
+	   0))
+	{
+	  return -1;
+	}
+
+      e = &ilm->entries[value.value];
+
+      if (!ip6_address_is_zero(&e->next_hop))
+	{
+	  fib_prefix_t pfx = {
+	      .fp_addr = {
+		  .ip6 = e->ila_address,
+	      },
+	      .fp_len = 128,
+	      .fp_proto = FIB_PROTOCOL_IP6,
+	  };
+
+	  fib_table_entry_special_remove(0, &pfx, FIB_SOURCE_PLUGIN_HI);
+	  /*
+	   * remove this ILA entry as child of the FIB netry for the next-hop
+	   */
+	  fib_entry_child_remove(e->next_hop_fib_entry_index,
+				 e->next_hop_child_index);
+	  fib_table_entry_delete_index(e->next_hop_fib_entry_index,
+				       FIB_SOURCE_RR);
+	  e->next_hop_fib_entry_index = FIB_NODE_INDEX_INVALID;
+	}
+      dpo_reset (&e->ila_dpo);
+
+      BV (clib_bihash_add_del) (&ilm->id_to_entry_table, &kv,
+				0 /* is_add */ );
+      pool_put (ilm->entries, e);
+    }
+  return 0;
+}
+
+int
+ila_interface (u32 sw_if_index, u8 disable)
+{
+  vnet_feature_enable_disable ("ip4-unicast", "sir-to-ila", sw_if_index,
+			       !disable, 0, 0);
+  return 0;
+}
+
+clib_error_t *
+vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
+		      int from_early_init)
+{
+  clib_error_t *error = 0;
+
+  return error;
+}
+
+u8 *format_ila_dpo (u8 * s, va_list * va)
+{
+  index_t index = va_arg (*va, index_t);
+  CLIB_UNUSED(u32 indent) = va_arg (*va, u32);
+  ila_main_t *ilm = &ila_main;
+  ila_entry_t *ie = pool_elt_at_index (ilm->entries, index);
+  return format(s, "ILA: idx:%d sir:%U",
+		index,
+		format_ip6_address, &ie->sir_address);
+}
+
+/**
+ * @brief no-op lock function.
+ * The lifetime of the ILA entry is managed by the control plane
+ */
+static void
+ila_dpo_lock (dpo_id_t *dpo)
+{
+}
+
+/**
+ * @brief no-op unlock function.
+ * The lifetime of the ILA entry is managed by the control plane
+ */
+static void
+ila_dpo_unlock (dpo_id_t *dpo)
+{
+}
+
+const static dpo_vft_t ila_vft = {
+    .dv_lock = ila_dpo_lock,
+    .dv_unlock = ila_dpo_unlock,
+    .dv_format = format_ila_dpo,
+};
+const static char* const ila_ip6_nodes[] =
+{
+    "ila-to-sir",
+    NULL,
+};
+const static char* const * const ila_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP6]  = ila_ip6_nodes,
+};
+
+static fib_node_t *
+ila_fib_node_get_node (fib_node_index_t index)
+{
+  ila_main_t *ilm = &ila_main;
+  ila_entry_t *ie = pool_elt_at_index (ilm->entries, index);
+
+  return (&ie->ila_fib_node);
+}
+
+/**
+ * @brief no-op unlock function.
+ * The lifetime of the ILA entry is managed by the control plane
+ */
+static void
+ila_fib_node_last_lock_gone (fib_node_t *node)
+{
+}
+
+static ila_entry_t *
+ila_entry_from_fib_node (fib_node_t *node)
+{
+    return ((ila_entry_t*)(((char*)node) -
+			   STRUCT_OFFSET_OF(ila_entry_t, ila_fib_node)));
+}
+
+/**
+ * @brief
+ * Callback function invoked when the forwarding changes for the ILA next-hop
+ */
+static fib_node_back_walk_rc_t
+ila_fib_node_back_walk_notify (fib_node_t *node,
+			       fib_node_back_walk_ctx_t *ctx)
+{
+    ila_entry_stack(ila_entry_from_fib_node(node));
+
+    return (FIB_NODE_BACK_WALK_CONTINUE);
+}
+
+/*
+ * ILA's FIB graph node virtual function table
+ */
+static const fib_node_vft_t ila_fib_node_vft = {
+    .fnv_get = ila_fib_node_get_node,
+    .fnv_last_lock = ila_fib_node_last_lock_gone,
+    .fnv_back_walk = ila_fib_node_back_walk_notify,
+};
+
+clib_error_t *
+ila_init (vlib_main_t * vm)
+{
+  ila_main_t *ilm = &ila_main;
+  ilm->entries = NULL;
+
+  ilm->lookup_table_nbuckets = ILA_TABLE_DEFAULT_HASH_NUM_BUCKETS;
+  ilm->lookup_table_nbuckets = 1 << max_log2 (ilm->lookup_table_nbuckets);
+  ilm->lookup_table_size = ILA_TABLE_DEFAULT_HASH_MEMORY_SIZE;
+
+  BV (clib_bihash_init) (&ilm->id_to_entry_table,
+			 "ila id to entry index table",
+			 ilm->lookup_table_nbuckets, ilm->lookup_table_size);
+
+  ila_dpo_type = dpo_register_new_type(&ila_vft, ila_nodes);
+  ila_fib_node_type = fib_node_register_new_type(&ila_fib_node_vft);
+
+  return NULL;
+}
+
+VLIB_INIT_FUNCTION (ila_init);
+
+static clib_error_t *
+ila_entry_command_fn (vlib_main_t * vm,
+		      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ila_add_del_entry_args_t args = { 0 };
+  u8 next_hop_set = 0;
+  int ret;
+
+  args.type = ILA_TYPE_IID;
+  args.csum_mode = ILA_CSUM_MODE_NO_ACTION;
+  args.local_adj_index = ~0;
+  args.dir = ILA_DIR_BIDIR;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "type %U", unformat_ila_type, &args.type))
+	;
+      else if (unformat
+	       (line_input, "sir-address %U", unformat_ip6_address,
+		&args.sir_address))
+	;
+      else if (unformat
+	       (line_input, "locator %U", unformat_half_ip6_address,
+		&args.locator))
+	;
+      else if (unformat
+	       (line_input, "csum-mode %U", unformat_ila_csum_mode,
+		&args.csum_mode))
+	;
+      else if (unformat (line_input, "vnid %x", &args.vnid))
+	;
+      else if (unformat
+	       (line_input, "next-hop %U", unformat_ip6_address,
+		&args.next_hop_address))
+	;
+      else if (unformat
+	      (line_input, "direction %U", unformat_ila_direction, &args.dir))
+        next_hop_set = 1;
+      else if (unformat (line_input, "del"))
+	args.is_del = 1;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (!next_hop_set)
+      return clib_error_return (0, "Specified a next hop");
+
+  if ((ret = ila_add_del_entry (&args)))
+    return clib_error_return (0, "ila_add_del_entry returned error %d", ret);
+
+  return NULL;
+}
+
+VLIB_CLI_COMMAND (ila_entry_command, static) =
+{
+  .path = "ila entry",
+  .short_help = "ila entry [type <type>] [sir-address <address>] [locator <locator>] [vnid <hex-vnid>]"
+    " [adj-index <adj-index>] [next-hop <next-hop>] [direction (bidir|sir2ila|ila2sir)]"
+    " [csum-mode (no-action|neutral-map|transport-adjust)] [del]",
+  .function = ila_entry_command_fn,
+};
+
+static clib_error_t *
+ila_interface_command_fn (vlib_main_t * vm,
+			  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index = ~0;
+  u8 disable = 0;
+
+  if (!unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      return clib_error_return (0, "Invalid interface name");
+    }
+
+  if (unformat (input, "disable"))
+    {
+      disable = 1;
+    }
+
+  int ret;
+  if ((ret = ila_interface (sw_if_index, disable)))
+    return clib_error_return (0, "ila_interface returned error %d", ret);
+
+  return NULL;
+}
+
+VLIB_CLI_COMMAND (ila_interface_command, static) =
+{
+  .path = "ila interface",
+  .short_help = "ila interface <interface-name> [disable]",
+  .function = ila_interface_command_fn,
+};
+
+static clib_error_t *
+ila_show_entries_command_fn (vlib_main_t * vm,
+			     unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ila_main_t *ilm = &ila_main;
+  ila_entry_t *e;
+
+  vlib_cli_output (vm, "  %U\n", format_ila_entry, vnm, NULL);
+  pool_foreach (e, ilm->entries,
+    ({
+      vlib_cli_output (vm, "  %U\n", format_ila_entry, vnm, e);
+    }));
+
+  return NULL;
+}
+
+VLIB_CLI_COMMAND (ila_show_entries_command, static) =
+{
+  .path = "show ila entries",
+  .short_help = "show ila entries",
+  .function = ila_show_entries_command_fn,
+};
diff --git a/src/plugins/ila/ila.h b/src/plugins/ila/ila.h
new file mode 100644
index 00000000..26620983
--- /dev/null
+++ b/src/plugins/ila/ila.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ILA_H
+#define ILA_H
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/fib/fib_node.h>
+
+#include <vppinfra/bihash_24_8.h>
+#include <vppinfra/bihash_template.h>
+
+#define ila_foreach_type		\
+  _(IID, 0, "iid")			\
+  _(LUID, 1, "luid")			\
+  _(VNID4, 2, "vnid-ip4")		\
+  _(VNID6, 3, "vnid-ip6")		\
+  _(VNIDM, 4, "vnid-multicast")
+
+typedef enum {
+#define _(i,n,s) ILA_TYPE_##i = n,
+  ila_foreach_type
+#undef _
+} ila_type_t;
+
+#define ila_csum_foreach_type \
+_(NO_ACTION, 0, "no-action") \
+_(NEUTRAL_MAP, 1, "neutral-map") \
+_(ADJUST_TRANSPORT, 2, "adjust-transport")
+
+typedef enum {
+#define _(i,n,s) ILA_CSUM_MODE_##i = n,
+  ila_csum_foreach_type
+#undef _
+  ILA_CSUM_N_TYPES
+} ila_csum_mode_t;
+
+#define ila_foreach_direction \
+_(BIDIR, 0, "bidir") \
+_(SIR2ILA, 1, "sir2ila") \
+_(ILA2SIR, 2, "ila2sir")
+
+typedef enum {
+#define _(i,n,s) ILA_DIR_##i = n,
+  ila_foreach_direction
+#undef _
+} ila_direction_t;
+
+typedef struct {
+  /**
+   * Fib Node base class
+   */
+  fib_node_t ila_fib_node;
+  ila_type_t type;
+  ip6_address_t sir_address;
+  ip6_address_t ila_address;
+  ip6_address_t next_hop;
+  ila_csum_mode_t csum_mode;
+  ila_direction_t dir;
+
+  /**
+   * The FIB entry index for the next-hop
+   */
+  fib_node_index_t next_hop_fib_entry_index;
+
+  /**
+   * The child index on the FIB entry
+   */
+  u32 next_hop_child_index;
+
+  /**
+   * The next DPO in the grpah to follow
+   */
+  dpo_id_t ila_dpo;
+} ila_entry_t;
+
+typedef struct {
+  ila_entry_t *entries;		//Pool of ILA entries
+
+  u64 lookup_table_nbuckets;
+  u64 lookup_table_size;
+  clib_bihash_24_8_t id_to_entry_table;
+
+  u32 ip6_lookup_next_index;
+} ila_main_t;
+
+
+typedef struct {
+  ila_type_t type;
+  ip6_address_t sir_address;
+  ip6_address_t next_hop_address;
+  u64 locator;
+  u32 vnid;
+  u32 local_adj_index;
+  ila_csum_mode_t csum_mode;
+  ila_direction_t dir;
+  u8 is_del;
+} ila_add_del_entry_args_t;
+
+int ila_add_del_entry (ila_add_del_entry_args_t * args);
+int ila_interface (u32 sw_if_index, u8 disable);
+
+#endif //ILA_H
diff --git a/src/plugins/sixrd.am b/src/plugins/sixrd.am
new file mode 100644
index 00000000..0de45088
--- /dev/null
+++ b/src/plugins/sixrd.am
@@ -0,0 +1,26 @@
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+libsixrd_plugin_la_SOURCES =			\
+	sixrd/sixrd.c				\
+	sixrd/sixrd_dpo.c			\
+	sixrd/ip4_sixrd.c			\
+	sixrd/ip6_sixrd.c
+
+noinst_HEADERS +=				\
+	sixrd/sixrd.h                           \
+	sixrd/sixrd_dpo.h
+
+vppplugins_LTLIBRARIES += libsixrd_plugin.la
+
+# vi:syntax=automake
diff --git a/src/plugins/sixrd/ip4_sixrd.c b/src/plugins/sixrd/ip4_sixrd.c
new file mode 100644
index 00000000..2fb8015d
--- /dev/null
+++ b/src/plugins/sixrd/ip4_sixrd.c
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------
+ * Copyright (c) 2009-2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *---------------------------------------------------------------------------
+ */
+#include "sixrd.h"
+
+static vlib_node_registration_t ip4_sixrd_node;
+
+typedef enum {
+  IP4_SIXRD_NEXT_IP6_LOOKUP,
+  IP4_SIXRD_NEXT_DROP,
+  IP4_SIXRD_N_NEXT,
+} ip4_sixrd_next_t;
+
+/*
+ * ip4_sixrd_sec_check
+ */
+static_always_inline void
+ip4_sixrd_sec_check (sixrd_domain_t *d, ip4_address_t sa4, ip6_address_t sa6, u8 *error)
+{
+  u32 a = sixrd_get_addr(d, sa6.as_u64[0]);
+  clib_warning("Security check: %U %U", format_ip4_address, &a, format_ip4_address, &sa4);
+  if (PREDICT_FALSE(sixrd_get_addr(d, sa6.as_u64[0]) != sa4.as_u32))
+    *error = SIXRD_ERROR_SEC_CHECK;
+}
+
+/*
+ * ip4_sixrd
+ */
+static uword
+ip4_sixrd (vlib_main_t *vm,
+	   vlib_node_runtime_t *node,
+	   vlib_frame_t *frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node = vlib_node_get_runtime(vm, ip4_sixrd_node.index);
+  u32 decap = 0;
+
+  from = vlib_frame_vector_args(frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  while (n_left_from > 0) {
+    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
+
+    /* Single loop */
+    while (n_left_from > 0 && n_left_to_next > 0) {
+      u32 pi0;
+      vlib_buffer_t *p0;
+      u8 error0 = SIXRD_ERROR_NONE;
+      sixrd_domain_t *d0 = 0;
+      ip4_header_t *ip40;
+      ip6_header_t *ip60;
+      u32 sixrd_domain_index0 = ~0;
+      u32 next0;
+
+      pi0 = to_next[0] = from[0];
+      from += 1;
+      n_left_from -= 1;
+      to_next +=1;
+      n_left_to_next -= 1;
+
+      p0 = vlib_get_buffer(vm, pi0);
+      ip40 = vlib_buffer_get_current(p0);
+
+      /* Throw away anything that isn't IP in IP. */
+      if (PREDICT_TRUE(ip40->protocol == IP_PROTOCOL_IPV6 && clib_net_to_host_u16(ip40->length) >= 60)) {
+	vlib_buffer_advance(p0, sizeof(ip4_header_t));
+	ip60 = vlib_buffer_get_current(p0);
+	d0 = ip4_sixrd_get_domain(vnet_buffer(p0)->ip.adj_index[VLIB_TX], (ip6_address_t *)&ip60->src_address,
+				&sixrd_domain_index0, &error0);
+      } else {
+	error0 = SIXRD_ERROR_BAD_PROTOCOL;
+      }
+      if (d0) {
+	/* SIXRD inbound security check */
+	ip4_sixrd_sec_check(d0, ip40->src_address, ip60->src_address, &error0);
+      }
+
+      next0 = error0 == SIXRD_ERROR_NONE ? IP4_SIXRD_NEXT_IP6_LOOKUP : IP4_SIXRD_NEXT_DROP;
+
+      if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED)) {
+	sixrd_trace_t *tr = vlib_add_trace(vm, node, p0, sizeof(*tr));
+	tr->sixrd_domain_index = sixrd_domain_index0;
+      }
+
+      p0->error = error_node->errors[error0];
+      if (PREDICT_TRUE(error0 == SIXRD_ERROR_NONE)) decap++;
+      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next, n_left_to_next, pi0, next0);
+
+    }
+    vlib_put_next_frame(vm, node, next_index, n_left_to_next);
+  }
+  vlib_node_increment_counter(vm, ip4_sixrd_node.index, SIXRD_ERROR_DECAPSULATED, decap);
+
+  return frame->n_vectors;
+}
+
+static char *sixrd_error_strings[] = {
+#define _(sym,string) string,
+  foreach_sixrd_error
+#undef _
+};
+
+VLIB_REGISTER_NODE(ip4_sixrd_node,static) = {
+  .function = ip4_sixrd,
+  .name = "ip4-sixrd",
+  .vector_size = sizeof(u32),
+  .format_trace = format_sixrd_trace,
+  .n_errors = SIXRD_N_ERROR,
+  .error_strings = sixrd_error_strings,
+  .n_next_nodes = IP4_SIXRD_N_NEXT,
+  .next_nodes = {
+    [IP4_SIXRD_NEXT_IP6_LOOKUP] = "ip6-lookup",
+    [IP4_SIXRD_NEXT_DROP] = "error-drop",
+  },
+};
diff --git a/src/plugins/sixrd/ip6_sixrd.c b/src/plugins/sixrd/ip6_sixrd.c
new file mode 100644
index 00000000..36f3fab3
--- /dev/null
+++ b/src/plugins/sixrd/ip6_sixrd.c
@@ -0,0 +1,129 @@
+/*---------------------------------------------------------------------------
+ * Copyright (c) 2009-2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *---------------------------------------------------------------------------
+ */
+/*
+ * Defines used for testing various optimisation schemes
+ */
+#define SIXRD_ENCAP_DUAL 0
+
+#include "sixrd.h"
+
+static vlib_node_registration_t ip6_sixrd_node;
+
+typedef enum {
+  IP6_SIXRD_NEXT_IP4_LOOKUP,
+  IP6_SIXRD_NEXT_DROP,
+  IP6_SIXRD_N_NEXT,
+} ip6_sixrd_next_t;
+
+/*
+ * ip6_sixrd
+ */
+static uword
+ip6_sixrd (vlib_main_t *vm,
+	   vlib_node_runtime_t *node,
+	   vlib_frame_t *frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node = vlib_node_get_runtime(vm, ip6_sixrd_node.index);
+  u32 encap = 0;
+  from = vlib_frame_vector_args(frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0) {
+    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
+
+    while (n_left_from > 0 && n_left_to_next > 0) {
+      u32 pi0;
+      vlib_buffer_t *p0;
+      sixrd_domain_t *d0;
+      u8 error0 = SIXRD_ERROR_NONE;
+      ip6_header_t *ip60;
+      ip4_header_t *ip4h0;
+      u32 next0 = IP6_SIXRD_NEXT_IP4_LOOKUP;
+      u32 sixrd_domain_index0 = ~0;
+
+      pi0 = to_next[0] = from[0];
+      from += 1;
+      n_left_from -= 1;
+      to_next +=1;
+      n_left_to_next -= 1;
+
+      p0 = vlib_get_buffer(vm, pi0);
+      ip60 = vlib_buffer_get_current(p0);
+      //      p0->current_length = clib_net_to_host_u16(ip40->length);
+      d0 = ip6_sixrd_get_domain(vnet_buffer(p0)->ip.adj_index[VLIB_TX], &sixrd_domain_index0);
+      ASSERT(d0);
+
+      /* SIXRD calc */
+      u64 dal60 = clib_net_to_host_u64(ip60->dst_address.as_u64[0]);
+      u32 da40 = sixrd_get_addr(d0, dal60);
+      u16 len = clib_net_to_host_u16(ip60->payload_length) + 60;
+      if (da40 == 0) error0 = SIXRD_ERROR_UNKNOWN;
+
+      /* construct ipv4 header */
+      vlib_buffer_advance(p0, - (sizeof(ip4_header_t)));
+      ip4h0 = vlib_buffer_get_current(p0);
+      vnet_buffer(p0)->sw_if_index[VLIB_TX] = (u32)~0;
+      ip4h0->ip_version_and_header_length = 0x45;
+      ip4h0->tos = 0;
+      ip4h0->length = clib_host_to_net_u16(len);
+      ip4h0->fragment_id = 0;
+      ip4h0->flags_and_fragment_offset = 0;
+      ip4h0->ttl = 0x40;
+      ip4h0->protocol = IP_PROTOCOL_IPV6;
+      ip4h0->src_address = d0->ip4_src;
+      ip4h0->dst_address.as_u32 = clib_host_to_net_u32(da40);
+      ip4h0->checksum = ip4_header_checksum(ip4h0);
+
+      next0 = error0 == SIXRD_ERROR_NONE ? IP6_SIXRD_NEXT_IP4_LOOKUP : IP6_SIXRD_NEXT_DROP;
+
+      if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED)) {
+	sixrd_trace_t *tr = vlib_add_trace(vm, node, p0, sizeof(*tr));
+	tr->sixrd_domain_index = sixrd_domain_index0;
+      }
+
+      p0->error = error_node->errors[error0];
+      if (PREDICT_TRUE(error0 == SIXRD_ERROR_NONE)) encap++;
+
+      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next, n_left_to_next, pi0, next0);
+    }
+    vlib_put_next_frame(vm, node, next_index, n_left_to_next);  
+  }
+  vlib_node_increment_counter(vm, ip6_sixrd_node.index, SIXRD_ERROR_ENCAPSULATED, encap);
+
+  return frame->n_vectors;
+}
+
+static char *sixrd_error_strings[] = {
+#define _(sym,string) string,
+  foreach_sixrd_error
+#undef _
+};
+
+VLIB_REGISTER_NODE(ip6_sixrd_node,static) = {
+  .function = ip6_sixrd,
+  .name = "ip6-sixrd",
+  .vector_size = sizeof(u32),
+  .format_trace = format_sixrd_trace,
+  .n_errors = SIXRD_N_ERROR,
+  .error_strings = sixrd_error_strings,
+  .n_next_nodes = IP6_SIXRD_N_NEXT,
+  .next_nodes = {
+    [IP6_SIXRD_NEXT_IP4_LOOKUP] = "ip4-lookup",
+    [IP6_SIXRD_NEXT_DROP] = "error-drop",
+  },
+};
diff --git a/src/plugins/sixrd/sixrd.c b/src/plugins/sixrd/sixrd.c
new file mode 100644
index 00000000..66e631a2
--- /dev/null
+++ b/src/plugins/sixrd/sixrd.c
@@ -0,0 +1,369 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "sixrd.h"
+#include <vnet/plugin/plugin.h>
+
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/adj/adj.h>
+
+/*
+ * This code supports the following sixrd modes:
+ * 
+ * 32 EA bits (Complete IPv4 address is embedded):
+ *   ea_bits_len = 32
+ * IPv4 suffix is embedded:
+ *   ea_bits_len = < 32
+ * No embedded address bits (1:1 mode):
+ *   ea_bits_len = 0
+ */
+
+int
+sixrd_create_domain (ip6_address_t *ip6_prefix,
+		     u8 ip6_prefix_len,
+		     ip4_address_t *ip4_prefix,
+		     u8 ip4_prefix_len,
+		     ip4_address_t *ip4_src,
+		     u32 *sixrd_domain_index,
+		     u16 mtu)
+{
+  dpo_id_t dpo_v6 = DPO_INVALID, dpo_v4 = DPO_INVALID;
+  sixrd_main_t *mm = &sixrd_main;
+  fib_node_index_t fei;
+  sixrd_domain_t *d;
+
+  /* Get domain index */
+  pool_get_aligned(mm->domains, d, CLIB_CACHE_LINE_BYTES);
+  memset(d, 0, sizeof (*d));
+  *sixrd_domain_index = d - mm->domains;
+
+  /* Init domain struct */
+  d->ip4_prefix.as_u32 = ip4_prefix->as_u32;
+  d->ip4_prefix_len = ip4_prefix_len;
+  d->ip6_prefix = *ip6_prefix;
+  d->ip6_prefix_len = ip6_prefix_len;
+  d->ip4_src = *ip4_src;
+  d->mtu = mtu;
+
+  if (ip4_prefix_len < 32)
+    d->shift = 64 - ip6_prefix_len + (32 - ip4_prefix_len);
+    
+  /* Create IPv6 route/adjacency */
+  fib_prefix_t pfx6 = {
+      .fp_proto = FIB_PROTOCOL_IP6,
+      .fp_len = d->ip6_prefix_len,
+      .fp_addr = {
+	  .ip6 = d->ip6_prefix,
+      },
+  };
+  sixrd_dpo_create(DPO_PROTO_IP6,
+		   *sixrd_domain_index,
+		   &dpo_v6);
+  fib_table_entry_special_dpo_add(0, &pfx6,
+				  FIB_SOURCE_SIXRD,
+				  FIB_ENTRY_FLAG_EXCLUSIVE,
+				  &dpo_v6);
+  dpo_reset (&dpo_v6);
+
+  /*
+   * Multiple SIXRD domains may share same source IPv4 TEP
+   * In this case the route will exist and be SixRD sourced.
+   * Find the adj (if any) already contributed and modify it
+   */
+  fib_prefix_t pfx4 = {
+      .fp_proto = FIB_PROTOCOL_IP4,
+      .fp_len = 32,
+      .fp_addr = {
+	  .ip4 = d->ip4_src,
+      },
+  };
+  fei = fib_table_lookup_exact_match(0, &pfx4);
+
+  if (FIB_NODE_INDEX_INVALID != fei)
+  {
+      dpo_id_t dpo = DPO_INVALID;
+
+      if (fib_entry_get_dpo_for_source (fei, FIB_SOURCE_SIXRD, &dpo))
+      {
+	  /*
+	   * modify the existing adj to indicate it's shared
+	   * skip to route add.
+	   * It is locked to pair with the unlock below.
+	   */
+	  const dpo_id_t *sd_dpo;
+	  sixrd_dpo_t *sd;
+
+	  ASSERT(DPO_LOAD_BALANCE == dpo.dpoi_type);
+
+	  sd_dpo = load_balance_get_bucket(dpo.dpoi_index, 0);
+	  sd = sixrd_dpo_get (sd_dpo->dpoi_index);
+
+	  sd->sd_domain = ~0;
+	  dpo_copy (&dpo_v4, sd_dpo);
+	  dpo_reset (&dpo);
+
+	  goto route_add;
+      }
+  }
+  /* first time addition of the route */
+  sixrd_dpo_create(DPO_PROTO_IP4,
+		   *sixrd_domain_index,
+		   &dpo_v4);
+
+route_add:
+  /*
+   * Create ip4 route. This is a reference counted add. If the prefix
+   * already exists and is SixRD sourced, it is now SixRD source n+1 times
+   * and will need to be removed n+1 times.
+   */
+  fib_table_entry_special_dpo_add(0, &pfx4,
+				  FIB_SOURCE_SIXRD,
+				  FIB_ENTRY_FLAG_EXCLUSIVE,
+				  &dpo_v4);
+  dpo_reset (&dpo_v4);
+
+  return 0;
+}
+
+/*
+ * sixrd_delete_domain
+ */
+int
+sixrd_delete_domain (u32 sixrd_domain_index)
+{
+  sixrd_main_t *mm = &sixrd_main;
+  sixrd_domain_t *d;
+
+  if (pool_is_free_index(mm->domains, sixrd_domain_index)) {
+    clib_warning("SIXRD domain delete: domain does not exist: %d",
+		 sixrd_domain_index);
+    return -1;
+  }
+
+  d = pool_elt_at_index(mm->domains, sixrd_domain_index);
+
+  fib_prefix_t pfx = {
+      .fp_proto = FIB_PROTOCOL_IP4,
+      .fp_len = 32,
+      .fp_addr = {
+	  .ip4 = d->ip4_src,
+      },
+  };
+  fib_table_entry_special_remove(0, &pfx, FIB_SOURCE_SIXRD);
+
+  fib_prefix_t pfx6 = {
+      .fp_proto = FIB_PROTOCOL_IP6,
+      .fp_len = d->ip6_prefix_len,
+      .fp_addr = {
+	  .ip6 = d->ip6_prefix,
+      },
+  };
+  fib_table_entry_special_remove(0, &pfx6, FIB_SOURCE_SIXRD);
+
+  pool_put(mm->domains, d);
+
+  return 0;
+}
+
+static clib_error_t *
+sixrd_add_domain_command_fn (vlib_main_t *vm,
+                           unformat_input_t *input,
+                           vlib_cli_command_t *cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ip4_address_t ip4_prefix;
+  ip6_address_t ip6_prefix;
+  ip4_address_t ip4_src;
+  u32 ip6_prefix_len=0, ip4_prefix_len=0, sixrd_domain_index;
+  u32 num_m_args = 0;
+  /* Optional arguments */
+  u32 mtu = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user(input, unformat_line_input, line_input))
+    return 0;
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat(line_input, "ip6-pfx %U/%d", unformat_ip6_address, &ip6_prefix, &ip6_prefix_len))
+      num_m_args++;
+    else if (unformat(line_input, "ip4-pfx %U/%d", unformat_ip4_address, &ip4_prefix, &ip4_prefix_len))
+      num_m_args++;
+    else if (unformat(line_input, "ip4-src %U", unformat_ip4_address, &ip4_src))
+      num_m_args++;
+    else if (unformat(line_input, "mtu %d", &mtu))
+      num_m_args++;
+    else
+      return clib_error_return(0, "unknown input `%U'",
+                               format_unformat_error, input);
+  }
+  unformat_free(line_input);
+
+  if (num_m_args < 3)
+    return clib_error_return(0, "mandatory argument(s) missing");
+
+  sixrd_create_domain(&ip6_prefix, ip6_prefix_len, &ip4_prefix, ip4_prefix_len,
+		      &ip4_src, &sixrd_domain_index, mtu);
+
+  return 0;
+}
+
+static clib_error_t *
+sixrd_del_domain_command_fn (vlib_main_t *vm,
+			   unformat_input_t *input,
+			   vlib_cli_command_t *cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 num_m_args = 0;
+  u32 sixrd_domain_index;
+
+  /* Get a line of input. */
+  if (! unformat_user(input, unformat_line_input, line_input))
+    return 0;
+ 
+  while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat(line_input, "index %d", &sixrd_domain_index))
+      num_m_args++;
+    else
+      return clib_error_return(0, "unknown input `%U'",
+				format_unformat_error, input);
+  }
+  unformat_free(line_input);
+
+  if (num_m_args != 1)
+    return clib_error_return(0, "mandatory argument(s) missing");
+
+  sixrd_delete_domain(sixrd_domain_index);
+
+  return 0;
+}
+
+static u8 *
+format_sixrd_domain (u8 *s, va_list *args)
+{
+  sixrd_domain_t *d = va_arg(*args, sixrd_domain_t *);
+  sixrd_main_t *mm = &sixrd_main;
+
+  s = format(s,
+	     "[%d] ip6-pfx %U/%d ip4-pfx %U/%d ip4-src %U mtu %d",
+	     d - mm->domains,
+	     format_ip6_address, &d->ip6_prefix, d->ip6_prefix_len,
+	     format_ip4_address, &d->ip4_prefix, d->ip4_prefix_len,
+	     format_ip4_address, &d->ip4_src, d->mtu);
+
+  return s;
+}
+
+static clib_error_t *
+show_sixrd_domain_command_fn (vlib_main_t *vm, unformat_input_t *input, vlib_cli_command_t *cmd)
+{
+  sixrd_main_t *mm = &sixrd_main;
+  sixrd_domain_t *d;
+
+  if (pool_elts(mm->domains) == 0)
+    vlib_cli_output(vm, "No SIXRD domains are configured...");
+
+  pool_foreach(d, mm->domains, ({vlib_cli_output(vm, "%U", format_sixrd_domain, d);}));
+
+  return 0;
+
+}
+
+static clib_error_t *
+show_sixrd_stats_command_fn (vlib_main_t *vm, unformat_input_t *input, vlib_cli_command_t *cmd)
+{
+  sixrd_main_t *mm = &sixrd_main;
+  sixrd_domain_t *d;
+  int domains = 0, domaincount = 0;
+  if (pool_elts (mm->domains) == 0)
+    vlib_cli_output (vm, "No SIXRD domains are configured...");
+
+  pool_foreach(d, mm->domains, ({
+    domains += sizeof(*d);
+    domaincount++;
+  }));
+
+  vlib_cli_output(vm, "SIXRD domains structure: %d\n", sizeof (sixrd_domain_t));
+  vlib_cli_output(vm, "SIXRD domains: %d (%d bytes)\n", domaincount, domains);
+
+  return 0;
+}
+
+/*
+ * packet trace format function
+ */
+u8 *
+format_sixrd_trace (u8 *s, va_list *args)
+{
+  CLIB_UNUSED(vlib_main_t *vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED(vlib_node_t *node) = va_arg (*args, vlib_node_t *);
+  sixrd_trace_t *t = va_arg (*args, sixrd_trace_t *);
+  u32 sixrd_domain_index = t->sixrd_domain_index;
+
+  s = format(s, "SIXRD domain index: %d", sixrd_domain_index);
+
+  return s;
+}
+
+VLIB_CLI_COMMAND(sixrd_add_domain_command, static) = {
+  .path = "sixrd add domain",
+  .short_help = 
+  "sixrd add domain ip6-pfx <ip6-pfx> ip4-pfx <ip4-pfx> ip4-src <ip4-addr>",
+  .function = sixrd_add_domain_command_fn,
+};
+
+VLIB_CLI_COMMAND(sixrd_del_command, static) = {
+  .path = "sixrd del domain",
+  .short_help = 
+  "sixrd del domain index <domain>",
+  .function = sixrd_del_domain_command_fn,
+};
+
+VLIB_CLI_COMMAND(show_sixrd_domain_command, static) = {
+  .path = "show sixrd domain",
+  .function = show_sixrd_domain_command_fn,
+};
+
+VLIB_CLI_COMMAND(show_sixrd_stats_command, static) = {
+  .path = "show sixrd stats",
+  .function = show_sixrd_stats_command_fn,
+};
+
+/* 
+ * This routine exists to convince the vlib plugin framework that
+ * we haven't accidentally copied a random .dll into the plugin directory.
+ *
+ * Also collects global variable pointers passed from the vpp engine
+ */
+clib_error_t * 
+vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
+                      int from_early_init)
+{
+  clib_error_t * error = 0;
+  sixrd_main_t *mm = &sixrd_main;
+
+  mm->vnet_main = vnet_get_main();
+  mm->vlib_main = vm;
+
+  return error;
+}
+
+static clib_error_t * sixrd_init (vlib_main_t * vm)
+{
+  sixrd_dpo_module_init ();
+
+  return (NULL);
+}
+
+VLIB_INIT_FUNCTION (sixrd_init);
diff --git a/src/plugins/sixrd/sixrd.h b/src/plugins/sixrd/sixrd.h
new file mode 100644
index 00000000..56714c9e
--- /dev/null
+++ b/src/plugins/sixrd/sixrd.h
@@ -0,0 +1,141 @@
+/*---------------------------------------------------------------------------
+ * Copyright (c) 2009-2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *---------------------------------------------------------------------------
+ */
+#include <stdbool.h>
+#include <vppinfra/error.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/fib/ip6_fib.h>
+
+#include "sixrd_dpo.h"
+
+int sixrd_create_domain(ip6_address_t *ip6_prefix, u8 ip6_prefix_len,
+			ip4_address_t *ip4_prefix, u8 ip4_prefix_len,
+			ip4_address_t *ip4_src, u32 *sixrd_domain_index, u16 mtu);
+int sixrd_delete_domain(u32 sixrd_domain_index);
+u8 *format_sixrd_trace(u8 *s, va_list *args);
+
+typedef struct {
+  ip6_address_t ip6_prefix;
+  ip4_address_t ip4_prefix;
+  ip4_address_t ip4_src;
+  u8 ip6_prefix_len;
+  u8 ip4_prefix_len;
+
+  /* helpers */
+  u8 shift;
+
+  u16 mtu;
+} sixrd_domain_t;
+
+typedef struct {
+  /* pool of SIXRD domains */
+  sixrd_domain_t *domains;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} sixrd_main_t;
+
+#define foreach_sixrd_error				\
+  /* Must be first. */					\
+ _(NONE, "valid SIXRD packets")				\
+ _(BAD_PROTOCOL, "bad protocol")			\
+ _(WRONG_ICMP_TYPE, "wrong icmp type")			\
+ _(SEC_CHECK, "security check failed")			\
+ _(ICMP, "unable to translate ICMP")			\
+ _(UNKNOWN, "unknown")					\
+ _(NO_DOMAIN, "no domain")				\
+ _(ENCAPSULATED, "encapsulated")			\
+ _(DECAPSULATED, "decapsulated")			\
+ _(TRANSLATED_4TO6, "translated 4 to 6")		\
+ _(TRANSLATED_6TO4, "translated 6 to 4")		\
+ _(FRAGMENT, "fragment handling error")			\
+ _(FRAGMENT_QUEUED, "dropped, missing first fragment")	\
+ _(FRAGMENTED, "packets requiring fragmentation")	\
+ _(FRAGMENT_PARTS, "fragment parts")                    \
+ _(MALFORMED, "malformed packet")
+
+typedef enum {
+#define _(sym,str) SIXRD_ERROR_##sym,
+   foreach_sixrd_error
+#undef _
+   SIXRD_N_ERROR,
+ } sixrd_error_t;
+
+typedef struct {
+  u32 sixrd_domain_index;
+} sixrd_trace_t;
+
+sixrd_main_t sixrd_main;
+
+/*
+ * sixrd_get_addr
+ */
+static_always_inline u32
+sixrd_get_addr (sixrd_domain_t *d, u64 dal)
+{
+
+  /* 1:1 mode */
+  if (d->ip4_prefix_len == 32) return (d->ip4_prefix.as_u32);
+
+  /* Grab 32 - ip4_prefix_len bits out of IPv6 address from offset ip6_prefix_len */
+  return (d->ip4_prefix.as_u32 | (u32)(dal >> d->shift));
+}
+
+/*
+ * Get the SIXRD domain from an IPv6 lookup adjacency.
+ */
+static_always_inline sixrd_domain_t *
+ip6_sixrd_get_domain (u32 sdi, u32 *sixrd_domain_index)
+{
+  sixrd_main_t *mm = &sixrd_main;
+  sixrd_dpo_t *sd;
+
+  sd = sixrd_dpo_get(sdi);
+
+  ASSERT(sd);
+  *sixrd_domain_index = sd->sd_domain;
+  return pool_elt_at_index(mm->domains, *sixrd_domain_index);
+}
+
+/*
+ * Get the SIXRD domain from an IPv4 lookup adjacency.
+ * If the IPv4 address is not shared, no lookup is required.
+ * The IPv6 address is used otherwise.
+ */
+static_always_inline sixrd_domain_t *
+ip4_sixrd_get_domain (u32 sdi, ip6_address_t *addr,
+		      u32 *sixrd_domain_index, u8 *error)
+{
+  sixrd_main_t *mm = &sixrd_main;
+  sixrd_dpo_t *sd;
+
+  sd = sixrd_dpo_get(sdi);
+  *sixrd_domain_index = sd->sd_domain;
+  if (*sixrd_domain_index != ~0)
+    return pool_elt_at_index(mm->domains, *sixrd_domain_index);
+
+  u32 lbi = ip6_fib_table_fwding_lookup(&ip6_main, 0, addr);
+  const dpo_id_t *dpo = load_balance_get_bucket(lbi, 0);
+  if (PREDICT_TRUE(dpo->dpoi_type == sixrd_dpo_type))
+    {
+      sd = sixrd_dpo_get(dpo->dpoi_index);
+      *sixrd_domain_index = sd->sd_domain;
+      return pool_elt_at_index(mm->domains, *sixrd_domain_index);
+    }
+  *error = SIXRD_ERROR_NO_DOMAIN;
+  return NULL;
+}
diff --git a/src/plugins/sixrd/sixrd_dpo.c b/src/plugins/sixrd/sixrd_dpo.c
new file mode 100644
index 00000000..88a07935
--- /dev/null
+++ b/src/plugins/sixrd/sixrd_dpo.c
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "sixrd_dpo.h"
+#include <vnet/ip/ip.h>
+
+/**
+ * pool of all MPLS Label DPOs
+ */
+sixrd_dpo_t *sixrd_dpo_pool;
+
+/**
+ * The register SIXRD DPO type
+ */
+dpo_type_t sixrd_dpo_type;
+
+static sixrd_dpo_t *
+sixrd_dpo_alloc (void)
+{
+    sixrd_dpo_t *sd;
+
+    pool_get_aligned(sixrd_dpo_pool, sd, CLIB_CACHE_LINE_BYTES);
+    memset(sd, 0, sizeof(*sd));
+
+    return (sd);
+}
+
+static index_t
+sixrd_dpo_get_index (sixrd_dpo_t *sd)
+{
+    return (sd - sixrd_dpo_pool);
+}
+
+void
+sixrd_dpo_create (dpo_proto_t dproto,
+		u32 domain_index,
+		dpo_id_t *dpo)
+{
+    sixrd_dpo_t *sd;
+
+    sd = sixrd_dpo_alloc();
+    sd->sd_domain = domain_index;
+    sd->sd_proto = dproto;
+
+    dpo_set(dpo,
+	    sixrd_dpo_type,
+	    dproto,
+	    sixrd_dpo_get_index(sd));
+}
+
+u8*
+format_sixrd_dpo (u8 *s, va_list *args)
+{
+    index_t index = va_arg (*args, index_t);
+    CLIB_UNUSED(u32 indent) = va_arg (*args, u32);
+    sixrd_dpo_t *sd;
+
+    sd = sixrd_dpo_get(index);
+
+    return (format(s, "sixrd:[%d]:%U domain:%d",
+		   index,
+                   format_dpo_proto, sd->sd_proto,
+		   sd->sd_domain));
+}
+
+
+static void
+sixrd_dpo_lock (dpo_id_t *dpo)
+{
+    sixrd_dpo_t *sd;
+
+    sd = sixrd_dpo_get(dpo->dpoi_index);
+
+    sd->sd_locks++;
+}
+
+static void
+sixrd_dpo_unlock (dpo_id_t *dpo)
+{
+    sixrd_dpo_t *sd;
+
+    sd = sixrd_dpo_get(dpo->dpoi_index);
+
+    sd->sd_locks--;
+
+    if (0 == sd->sd_locks)
+    {
+	pool_put(sixrd_dpo_pool, sd);
+    }
+}
+
+const static dpo_vft_t sd_vft = {
+    .dv_lock = sixrd_dpo_lock,
+    .dv_unlock = sixrd_dpo_unlock,
+    .dv_format = format_sixrd_dpo,
+};
+
+const static char* const sixrd_ip4_nodes[] =
+{
+    "ip4-sixrd",
+    NULL,
+};
+const static char* const sixrd_ip6_nodes[] =
+{
+    "ip6-sixrd",
+    NULL,
+};
+
+const static char* const * const sixrd_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = sixrd_ip4_nodes,
+    [DPO_PROTO_IP6]  = sixrd_ip6_nodes,
+    [DPO_PROTO_MPLS] = NULL,
+};
+
+void
+sixrd_dpo_module_init (void)
+{
+    sixrd_dpo_type = dpo_register_new_type(&sd_vft, sixrd_nodes);
+}
diff --git a/src/plugins/sixrd/sixrd_dpo.h b/src/plugins/sixrd/sixrd_dpo.h
new file mode 100644
index 00000000..17142288
--- /dev/null
+++ b/src/plugins/sixrd/sixrd_dpo.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __SIXRD_DPO_H__
+#define __SIXRD_DPO_H__
+
+#include <vnet/vnet.h>
+#include <vnet/dpo/dpo.h>
+
+/**
+ * A representation of a 6RD DPO
+ */
+typedef struct sixrd_dpo_t
+{
+    /**
+     * The dat-plane protocol
+     */
+    dpo_proto_t sd_proto;
+
+    /**
+     * the SIXRD domain index
+     */
+    u32 sd_domain;
+
+    /**
+     * Number of locks/users of the label
+     */
+    u16 sd_locks;
+} sixrd_dpo_t;
+
+extern void sixrd_dpo_create (dpo_proto_t dproto,
+			      u32 domain_index,
+			      dpo_id_t *dpo);
+
+/*
+ * Encapsulation violation for fast data-path access
+ */
+extern sixrd_dpo_t *sixrd_dpo_pool;
+extern dpo_type_t sixrd_dpo_type;
+
+static inline sixrd_dpo_t *
+sixrd_dpo_get (index_t index)
+{
+    return (pool_elt_at_index(sixrd_dpo_pool, index));
+}
+
+extern void sixrd_dpo_module_init(void);
+
+#endif
diff --git a/src/scripts/vnet/arp4 b/src/scripts/vnet/arp4
new file mode 100644
index 00000000..acb20da3
--- /dev/null
+++ b/src/scripts/vnet/arp4
@@ -0,0 +1,21 @@
+packet-generator new {
+  name x
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    ICMP: 1.0.0.2 -> 2.0.0.2
+    ICMP echo_request
+    incrementing 100
+  }
+}
+
+trace add pg-input 100
+loop create
+loop create
+set int state loop0 up
+set int state loop1 up
+
+set int ip address loop0 1.0.0.1/24
+set int ip address loop1 2.0.0.1/24
diff --git a/src/scripts/vnet/arp4-mpls b/src/scripts/vnet/arp4-mpls
new file mode 100644
index 00000000..d3d39f3b
--- /dev/null
+++ b/src/scripts/vnet/arp4-mpls
@@ -0,0 +1,24 @@
+packet-generator new {
+  name x
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    ICMP: 1.0.0.2 -> 2.2.2.2
+    ICMP echo_request
+    incrementing 100
+  }
+}
+
+loop create
+loop create
+set int state loop0 up
+set int state loop1 up
+
+set int ip address loop0 1.0.0.1/24
+set int ip address loop1 2.0.0.1/24
+
+ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
+
+trace add pg-input 100
diff --git a/src/scripts/vnet/arp6 b/src/scripts/vnet/arp6
new file mode 100644
index 00000000..e6a98935
--- /dev/null
+++ b/src/scripts/vnet/arp6
@@ -0,0 +1,21 @@
+packet-generator new {
+  name x
+  limit 1
+  node ip6-input
+  size 64-64
+  no-recycle
+  data {
+    ICMP6: 2000::2 -> 2001::2
+    ICMP echo_request
+    incrementing 100
+  }
+}
+
+tr add pg-input 100
+loop create
+loop create
+set int state loop0 up
+set int state loop1 up
+
+set int ip address loop0 2000::1/64
+set int ip address loop1 2001::1/64
diff --git a/src/scripts/vnet/bvi b/src/scripts/vnet/bvi
new file mode 100644
index 00000000..2174da0d
--- /dev/null
+++ b/src/scripts/vnet/bvi
@@ -0,0 +1,76 @@
+
+
+set int state tuntap-0 down
+set int ip address GigabitEthernet2/1/0 1.2.3.4/24
+
+set int state GigabitEthernet2/1/0 up 
+cre sub GigabitEthernet2/1/0 1 dot1q 7 
+set int state GigabitEthernet2/1/0.1 up
+
+set int state GigabitEthernet2/2/0 up
+cre sub GigabitEthernet2/2/0 1 dot1q 9 
+set int state GigabitEthernet2/2/0.1 up
+
+
+loop create
+set int l2 bridge loop0 0 bvi
+set int ip table loop0 0
+set int state loop0 up
+
+
+set int l2 bridge GigabitEthernet2/1/0.1 0
+set int l2 bridge GigabitEthernet2/2/0.1 0
+
+set int l2 tag-rewrite GigabitEthernet2/1/0.1 pop 1
+set int l2 tag-rewrite GigabitEthernet2/2/0.1 pop 1 
+
+l2fib add 00:22:44:06:08:0a    0  GigabitEthernet2/1/0.1 static
+l2fib add 00:02:04:06:08:0a    0  GigabitEthernet2/2/0.1 static
+
+
+ip route table 0 8.0.0.1/32 via loop0
+set ip arp loop0 8.0.0.1 00:02:04:06:08:0a
+
+
+ip route add 1.2.3.3/32 via GigabitEthernet2/1/0 IP4: 00:15:17:61:73:47 -> 00:15:17:61:73:46
+
+cle er
+cle int
+cle run
+
+packet-generator new {
+  name bvi_to_l2 
+  limit 100
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/1/0
+  data {
+      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
+      GRE: 1.2.3.3 -> 8.0.0.1 mpls_unicast 
+  }
+}
+
+packet-generator new {
+  name l2_to_bvi
+  limit 50
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/2/0
+  data {
+      IP4: 0050.56b7.7c83 -> dead.0000.0000  vlan 9
+      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
+  }
+}
+
+packet-generator new {
+  name l2_to_bvi_via_flood
+  limit 25
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/2/0
+  data {
+      IP4: 0050.56b7.7c83 -> ffff.ffff.ffff  vlan 9
+      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
+  }
+}
+
diff --git a/src/scripts/vnet/dhcp/dhcpd.conf b/src/scripts/vnet/dhcp/dhcpd.conf
new file mode 100644
index 00000000..d4cb3ed7
--- /dev/null
+++ b/src/scripts/vnet/dhcp/dhcpd.conf
@@ -0,0 +1,8 @@
+# add at the bottom
+
+subnet 192.168.0.0 netmask 255.255.0.0 {
+   range 192.168.1.10 192.168.1.254;
+   option routers 192.168.1.1;
+   default-lease-time 15;
+   max-lease-time 15;
+}
diff --git a/src/scripts/vnet/dhcp/left-ping-target.sh b/src/scripts/vnet/dhcp/left-ping-target.sh
new file mode 100644
index 00000000..2edc2a50
--- /dev/null
+++ b/src/scripts/vnet/dhcp/left-ping-target.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# to obtain dhcp address from leftpeer
+dhclient -d -v eth1
diff --git a/src/scripts/vnet/dhcp/leftpeer.conf b/src/scripts/vnet/dhcp/leftpeer.conf
new file mode 100644
index 00000000..458eecf0
--- /dev/null
+++ b/src/scripts/vnet/dhcp/leftpeer.conf
@@ -0,0 +1,17 @@
+set int ip table GigabitEthernet2/2/0 12
+set int ip address GigabitEthernet2/2/0 192.168.1.1/24
+set int state GigabitEthernet2/2/0 up
+
+set int ip table GigabitEthernet2/7/0 11
+set int ip address GigabitEthernet2/7/0 192.168.2.1/24
+set int state GigabitEthernet2/7/0 up
+
+comment { set dhcp proxy server 1.2.3.4 src-address 1.2.3.5 add-option-82 rx-fib-id 0 server-fib-id 0 }
+
+comment { set dhcp proxy server 192.168.2.2 src-address 192.168.2.1 add-option-82 rx-fib-id 12 server-fib-id 11 }
+
+ip route add 0.0.0.0/24 table 11 via local
+ip route add 255.255.255.255/24 table 11 via local
+
+ip route add 0.0.0.0/24 table 12 via local
+ip route add 255.255.255.255/24 table 12 via local
diff --git a/src/scripts/vnet/icmp b/src/scripts/vnet/icmp
new file mode 100644
index 00000000..1e054e2d
--- /dev/null
+++ b/src/scripts/vnet/icmp
@@ -0,0 +1,16 @@
+packet-generator new {
+  name x
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    ICMP: 1.2.3.4 -> 5.6.7.8
+    ICMP echo_request
+    incrementing 100
+  }
+}
+
+tr add pg-input 100
+ip route 5.6.7.8/32 via local
+ip route 1.2.3.4/32 via local
diff --git a/src/scripts/vnet/icmp6 b/src/scripts/vnet/icmp6
new file mode 100644
index 00000000..2a65acba
--- /dev/null
+++ b/src/scripts/vnet/icmp6
@@ -0,0 +1,16 @@
+packet-generator new {
+  name x
+  limit 1
+  node ip6-input
+  size 64-64
+  no-recycle
+  data {
+    ICMP6: ::1 -> ::2
+    ICMP echo_request
+    incrementing 100
+  }
+}
+
+tr add pg-input 100
+ip route ::1/128 via local
+ip route ::2/128 via local
diff --git a/src/scripts/vnet/ige b/src/scripts/vnet/ige
new file mode 100644
index 00000000..80d045af
--- /dev/null
+++ b/src/scripts/vnet/ige
@@ -0,0 +1,19 @@
+packet-generator new {
+  name x
+  limit 1
+  node ip4-lookup
+  size 50-50
+  data {
+    ICMP: 1.0.0.1 -> 1.0.0.3 ttl 1
+    incrementing 30
+  }
+}
+
+comment { tr add pg-input 100 }
+set int ip address GigabitEthernet4/0/0 1.0.0.1/24
+set int ip address GigabitEthernet4/0/1 1.0.0.2/24
+set int state GigabitEthernet4/0/0 up
+set int state GigabitEthernet4/0/1 up
+
+ip route add 1.0.0.3/32 via GigabitEthernet4/0/1 IP4: 00:15:17:61:73:47 -> 00:15:17:61:73:46
+tr add ige-input 10
diff --git a/src/scripts/vnet/ip6 b/src/scripts/vnet/ip6
new file mode 100644
index 00000000..4f9f3ee5
--- /dev/null
+++ b/src/scripts/vnet/ip6
@@ -0,0 +1,15 @@
+packet-generator new {
+  name x
+  limit 1
+  node ethernet-input
+  size 64-64
+  no-recycle
+  data {
+    IP6: 1.2.3 -> 4.5.6
+    ICMP: ::1 -> ::2
+    ICMP echo_request
+    incrementing 100
+  }
+}
+
+tr add pg-input 100
diff --git a/src/scripts/vnet/ip6-hbh b/src/scripts/vnet/ip6-hbh
new file mode 100644
index 00000000..0c6de47f
--- /dev/null
+++ b/src/scripts/vnet/ip6-hbh
@@ -0,0 +1,84 @@
+tap connect tap0
+set int state tap-0 up
+set int ip address tap-0 1::1/64
+packet-generator new {
+  name hbh1
+  limit 1
+  node ip6-input
+  size 48-48
+  no-recycle
+  data {
+    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
+    hex 0x3B00010403040506
+    incrementing 100
+  }
+}
+packet-generator new {
+  name hbh2
+  limit 1
+  node ip6-input
+  size 48-48
+  no-recycle
+  data {
+    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
+    hex 0x3B00C10403040506
+    incrementing 100
+  }
+}
+
+packet-generator new {
+  name hbh3
+  limit 1
+  node ip6-input
+  size 48-48
+  no-recycle
+  data {
+    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
+    hex 0x3BffC10403040506
+    incrementing 100
+  }
+}
+
+packet-generator new {
+  name hbh4
+  limit 1
+  node ip6-input
+  size 64-64
+  no-recycle
+  data {
+    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
+    hex 0x3BffC10403040506
+    incrementing 100
+  }
+}
+
+packet-generator new {
+  name hbh5
+  limit 1
+  node ip6-input
+  size 56-56
+  no-recycle
+  data {
+    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
+    length 16
+    hex 0x3B010104030405060106030405060708
+    incrementing 100
+  }
+}
+
+packet-generator new {
+  name hbh6
+  limit 1
+  node ip6-input
+  size 56-56
+  no-recycle
+  data {
+    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
+    length 16
+    hex 0x3a00050200000100
+    ICMP echo_request
+    incrementing 100
+  }
+}
+
+tr add pg-input 100
diff --git a/src/scripts/vnet/ixge b/src/scripts/vnet/ixge
new file mode 100644
index 00000000..6722b536
--- /dev/null
+++ b/src/scripts/vnet/ixge
@@ -0,0 +1,15 @@
+packet-generator new {
+  name x
+  limit 1
+  node ip4-lookup
+  size 50-50
+  data {
+    ICMP: 1.0.0.1 -> 1.0.0.3 ttl 1
+    incrementing 30
+  }
+}
+
+comment { tr add pg-input 100 }
+set int ip address TenGigabitEthernet5/0/0 33.0.1.1/8
+set int state TenGigabitEthernet5/0/0 up
+
diff --git a/src/scripts/vnet/l2efpfilter b/src/scripts/vnet/l2efpfilter
new file mode 100644
index 00000000..307b4436
--- /dev/null
+++ b/src/scripts/vnet/l2efpfilter
@@ -0,0 +1,83 @@
+
+set int ip address GigabitEthernet2/1/0 1.2.3.4/24
+set int state GigabitEthernet2/1/0 up 
+set int state tuntap-0 down
+
+
+cre sub GigabitEthernet2/1/0 1 dot1q 1 
+cre sub GigabitEthernet2/1/0 2 dot1q 2 
+cre sub GigabitEthernet2/1/0 3 dot1q 3
+cre sub GigabitEthernet2/2/0 1 dot1q 1 
+cre sub GigabitEthernet2/2/0 100 dot1q 100 
+
+set int l2 bridge GigabitEthernet2/1/0 0
+set int l2 bridge GigabitEthernet2/1/0.1 0
+set int l2 bridge GigabitEthernet2/1/0.2 0
+set int l2 bridge GigabitEthernet2/1/0.3 0
+set int l2 bridge GigabitEthernet2/2/0 0
+set int l2 bridge GigabitEthernet2/2/0.1 0
+set int l2 bridge GigabitEthernet2/2/0.100 0
+
+set int l2 tag-rewrite GigabitEthernet2/2/0.1 push dot1q 50
+set int l2 tag-rewrite GigabitEthernet2/1/0.2 translate 1-1 dot1q 100
+set int l2 tag-rewrite GigabitEthernet2/1/0.3 translate 1-1 dot1q 99 
+
+set int l2 efp-filter GigabitEthernet2/2/0
+set int l2 efp-filter GigabitEthernet2/2/0.1
+set int l2 efp-filter GigabitEthernet2/2/0.100
+
+
+l2fib add 00:00:00:00:00:11    0  GigabitEthernet2/2/0.1 static
+l2fib add 00:00:00:00:00:22    0  GigabitEthernet2/2/0.100 static
+
+set int state GigabitEthernet2/1/0 up
+set int state GigabitEthernet2/1/0.1 up
+set int state GigabitEthernet2/1/0.2 up
+set int state GigabitEthernet2/1/0.3 up
+set int state GigabitEthernet2/2/0 up
+set int state GigabitEthernet2/2/0.1 up
+set int state GigabitEthernet2/2/0.100 up
+
+
+trace add pg-input 6
+
+clear error
+clear run
+clear int
+
+packet-generator new {
+  name pre_vtr_fail
+  limit 10
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/1/0
+  data {
+      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:11 vlan 1
+      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
+  }
+}
+
+packet-generator new {
+  name post_vtr_pass
+  limit 20
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/1/0
+  data {
+      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 2
+      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
+  }
+}
+
+packet-generator new {
+  name post_vtr_fail
+  limit 50
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/1/0
+  data {
+      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 3
+      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
+  }
+}
+
diff --git a/src/scripts/vnet/l2efpfilter_perf b/src/scripts/vnet/l2efpfilter_perf
new file mode 100644
index 00000000..b2f4b490
--- /dev/null
+++ b/src/scripts/vnet/l2efpfilter_perf
@@ -0,0 +1,58 @@
+
+set int ip address GigabitEthernet2/1/0 1.2.3.4/24
+set int state GigabitEthernet2/1/0 up 
+set int state tuntap-0 down
+
+
+cre sub GigabitEthernet2/1/0 1 dot1q 1 
+cre sub GigabitEthernet2/1/0 2 dot1q 2 
+cre sub GigabitEthernet2/1/0 3 dot1q 3
+cre sub GigabitEthernet2/2/0 1 dot1q 1 
+cre sub GigabitEthernet2/2/0 100 dot1q 100 
+
+set int l2 bridge GigabitEthernet2/1/0 0
+set int l2 bridge GigabitEthernet2/1/0.1 0
+set int l2 bridge GigabitEthernet2/1/0.2 0
+set int l2 bridge GigabitEthernet2/1/0.3 0
+set int l2 bridge GigabitEthernet2/2/0 0
+set int l2 bridge GigabitEthernet2/2/0.1 0
+set int l2 bridge GigabitEthernet2/2/0.100 0
+
+set int l2 tag-rewrite GigabitEthernet2/2/0.1 push dot1q 50
+set int l2 tag-rewrite GigabitEthernet2/1/0.2 translate 1-1 dot1q 100
+set int l2 tag-rewrite GigabitEthernet2/1/0.3 translate 1-1 dot1q 99 
+
+set int l2 efp-filter GigabitEthernet2/2/0
+set int l2 efp-filter GigabitEthernet2/2/0.1
+set int l2 efp-filter GigabitEthernet2/2/0.100
+
+
+l2fib add 00:00:00:00:00:11    0  GigabitEthernet2/2/0.1 static
+l2fib add 00:00:00:00:00:22    0  GigabitEthernet2/2/0.100 static
+
+set int state GigabitEthernet2/1/0 up
+set int state GigabitEthernet2/1/0.1 up
+set int state GigabitEthernet2/1/0.2 up
+set int state GigabitEthernet2/1/0.3 up
+set int state GigabitEthernet2/2/0 up
+set int state GigabitEthernet2/2/0.1 up
+set int state GigabitEthernet2/2/0.100 up
+
+
+trace add pg-input 6
+
+clear error
+clear run
+clear int
+
+packet-generator new {
+  name post_vtr_pass
+  limit 9111003
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/1/0
+  data {
+      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 2
+      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
+  }
+}
diff --git a/src/scripts/vnet/l2fib b/src/scripts/vnet/l2fib
new file mode 100644
index 00000000..81ede171
--- /dev/null
+++ b/src/scripts/vnet/l2fib
@@ -0,0 +1,46 @@
+
+set int ip address GigabitEthernet2/1/0 1.2.3.4/24
+set int state GigabitEthernet2/1/0 up 
+
+set int state GigabitEthernet2/2/0 up
+cre sub GigabitEthernet2/2/0 1 dot1q 9 
+set int state GigabitEthernet2/2/0.1 up
+set int state tuntap-0 down
+
+set int acl input GigabitEthernet2/1/0
+set int acl output GigabitEthernet2/1/0
+set int acl input GigabitEthernet2/2/0.1 
+set int acl output GigabitEthernet2/2/0.1
+
+set int l2 bridge GigabitEthernet2/1/0 0
+set int l2 bridge GigabitEthernet2/2/0.1 0
+
+set int l2 tag-rewrite GigabitEthernet2/1/0 push dot1q 50
+set int l2 tag-rewrite GigabitEthernet2/2/0.1 pop 1
+
+
+trace add pg-input 6
+
+clear error
+clear run
+clear int
+
+packet-generator new {
+  name new_input_if_index_mac_move
+  limit 4
+  no-recycle
+  node ethernet-input 
+  interface GigabitEthernet2/1/0
+  size 98-98
+  data { hex 0x00010203040500020406080a080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
+}
+
+packet-generator new {
+  name dmac_hit
+  limit 7
+  no-recycle
+  node ethernet-input 
+  interface GigabitEthernet2/2/0
+  size 98-98
+  data { hex 0x00020406080a00224406080a8100000981000011080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
+}
diff --git a/src/scripts/vnet/l2fib_perf b/src/scripts/vnet/l2fib_perf
new file mode 100644
index 00000000..638317ff
--- /dev/null
+++ b/src/scripts/vnet/l2fib_perf
@@ -0,0 +1,29 @@
+
+set int ip address GigabitEthernet2/1/0 1.2.3.4/24
+set int state GigabitEthernet2/1/0 up 
+
+set int state GigabitEthernet2/2/0 up
+cre sub GigabitEthernet2/2/0 1 dot1q 9 
+set int state GigabitEthernet2/2/0.1 up
+set int state tuntap-0 down
+
+set int l2 bridge GigabitEthernet2/1/0 0
+set int l2 bridge GigabitEthernet2/2/0.1 0
+
+l2fib add 00:22:44:06:08:0a    0  GigabitEthernet2/1/0   static
+l2fib add 00:02:04:06:08:0a    0  GigabitEthernet2/2/0.1 static
+
+cle er
+cle int
+cle run
+
+packet-generator new {
+  name perf
+  limit 9111003
+  no-recycle
+  node ethernet-input 
+  interface GigabitEthernet2/2/0.1 
+  size 98-98
+  data { hex 0x00224406080a00020406080a81000009080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
+}
+
diff --git a/src/scripts/vnet/l2fib_xc b/src/scripts/vnet/l2fib_xc
new file mode 100644
index 00000000..35d7342b
--- /dev/null
+++ b/src/scripts/vnet/l2fib_xc
@@ -0,0 +1,31 @@
+
+set int ip address GigabitEthernet2/1/0 1.2.3.4/24
+set int state GigabitEthernet2/1/0 up 
+
+set int state GigabitEthernet2/2/0 up
+cre sub GigabitEthernet2/2/0 1 dot1q 9 
+set int state GigabitEthernet2/2/0.1 up
+set int state tuntap-0 down
+
+set int acl input GigabitEthernet2/1/0
+set int acl output GigabitEthernet2/1/0
+set int acl input GigabitEthernet2/2/0.1 
+set int acl output GigabitEthernet2/2/0.1
+
+set int l2 xc GigabitEthernet2/1/0   GigabitEthernet2/2/0.1
+set int l2 xc GigabitEthernet2/2/0.1 GigabitEthernet2/1/0
+
+clear error
+clear run
+clear int
+
+packet-generator new {
+  name xc
+  limit 11
+  no-recycle
+  node ethernet-input 
+  interface GigabitEthernet2/1/0
+  size 98-98
+  data { hex 0x00010203040500020406080a080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
+}
+
diff --git a/src/scripts/vnet/l2flood b/src/scripts/vnet/l2flood
new file mode 100644
index 00000000..013462ce
--- /dev/null
+++ b/src/scripts/vnet/l2flood
@@ -0,0 +1,42 @@
+
+set int ip address GigabitEthernet2/1/0 1.2.3.4/24
+set int state GigabitEthernet2/1/0 up 
+set int state tuntap-0 down
+
+
+loop create
+cre sub loop0 1 dot1q 1 
+cre sub loop0 2 dot1q 2 
+cre sub loop0 3 dot1q 3 
+cre sub GigabitEthernet2/1/0 1 dot1q 1 
+
+
+set int l2 bridge loop0.1 7
+set int l2 bridge loop0.2 7
+set int l2 bridge loop0.3 7
+set int l2 bridge GigabitEthernet2/1/0.1 7
+
+loop cre
+set int l2 bridge loop1 7 bvi
+
+set int state GigabitEthernet2/1/0.1 up 
+
+trace add pg-input 6
+
+clear error
+clear run
+clear int
+
+packet-generator new {
+  name flood
+  limit 1
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/1/0
+  data {
+      IP4: 0050.56b7.7c83 -> ffff.ffff.ffff  vlan 1
+      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
+  }
+
+}
+
diff --git a/src/scripts/vnet/l2tp b/src/scripts/vnet/l2tp
new file mode 100644
index 00000000..337805aa
--- /dev/null
+++ b/src/scripts/vnet/l2tp
@@ -0,0 +1,134 @@
+
+set int ip address GigabitEthernet2/1/0 1.2.3.4/24
+set int state GigabitEthernet2/1/0 up 
+set int state tuntap-0 down
+
+
+cre sub GigabitEthernet2/1/0 1 dot1q 1 
+cre sub GigabitEthernet2/1/0 2 dot1q 2 
+cre sub GigabitEthernet2/1/0 3 dot1q 3
+cre sub GigabitEthernet2/2/0 1 dot1q 1 
+cre sub GigabitEthernet2/2/0 100 dot1q 100 
+
+
+set int l2 tag-rewrite GigabitEthernet2/1/0.1 pop 1
+set int l2 tag-rewrite GigabitEthernet2/1/0.2 pop 1
+
+
+l2tp session add client 11::1 our 22::2 l2-interface GigabitEthernet2/1/0.1
+l2tp session add client 11::1 our 22::3 l2-interface GigabitEthernet2/1/0.2 local-session-id 2 l2-sublayer-present
+
+ip route 11::1/128 via GigabitEthernet2/2/0
+set ip6 neighbor GigabitEthernet2/2/0 11::1 00:02:04:06:08:0a
+
+enable ip6 interface GigabitEthernet2/2/0 
+
+set int ip6 l2tpv3 GigabitEthernet2/2/0
+
+set int state GigabitEthernet2/1/0 up
+set int state GigabitEthernet2/1/0.1 up
+set int state GigabitEthernet2/1/0.2 up
+set int state GigabitEthernet2/1/0.3 up
+set int state GigabitEthernet2/2/0 up
+
+
+trace add pg-input 2
+
+clear error
+clear run
+clear int
+
+packet-generator new {
+  name decap
+  limit 10
+  size 200-200
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/2/0
+  data {
+      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
+      L2TP: 11::1 -> 22::2 
+      L2TP: session_id 1 cookie 0xffffffffffffffff 
+      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
+      UDP: 1.2.3.4 -> 5.6.7.8
+      incrementing 8
+  }
+}
+
+packet-generator new {
+  name decap_bad_sid
+  limit 30
+  size 200-200
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/2/0
+  data {
+      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
+      L2TP: 11::1 -> 22::2 
+      L2TP: session_id 0x999 cookie 0xffffffffffffffff
+      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
+      UDP: 1.2.3.4 -> 5.6.7.8
+      incrementing 8
+  }
+}
+
+packet-generator new {
+  name decap_bad_cookie
+  limit 50
+  size 200-200
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/2/0
+  data {
+      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
+      L2TP: 11::1 -> 22::2 
+      L2TP: session_id 1 cookie 0x3333ffffffffffff
+      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
+      UDP: 1.2.3.4 -> 5.6.7.8
+      incrementing 8
+  }
+}
+
+packet-generator new {
+  name encap
+  limit 100
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/1/0
+  data {
+      IP4: 0000.5555.0002 -> 00:00:dd:dd:00:02 vlan 1
+      UDP: 1.2.3.4 -> 5.6.7.8
+      incrementing 8
+  }
+}
+
+packet-generator new {
+  name decap_sublayer
+  limit 300
+  size 200-200
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/2/0
+  data {
+      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
+      L2TP: 11::1 -> 22::3
+      L2TP: session_id 2 cookie 0xffffffffffffffff l2_sublayer 0
+      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
+      UDP: 1.2.3.4 -> 5.6.7.8
+      incrementing 8
+  }
+}
+
+packet-generator new {
+  name encap_sublayer
+  limit 700
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/1/0
+  data {
+      IP4: 0000.5555.0002 -> 00:00:dd:dd:00:02 vlan 2
+      UDP: 1.2.3.4 -> 5.6.7.8
+      incrementing 8
+  }
+}
+
diff --git a/src/scripts/vnet/leftpeer/leftpeer-classify b/src/scripts/vnet/leftpeer/leftpeer-classify
new file mode 100755
index 00000000..74285912
--- /dev/null
+++ b/src/scripts/vnet/leftpeer/leftpeer-classify
@@ -0,0 +1,8 @@
+classify table mask l2 src l3 ip4 src buckets 2 miss-next local
+
+comment { classify table mask l3 ip4 src buckets 2 miss-next local }
+set ip classify intfc GigabitEthernet2/2/0 table-index 0
+set int ip address GigabitEthernet2/2/0 192.168.1.1/24
+set int state GigabitEthernet2/2/0 up
+
+classify session hit-next local table-index 0 match l2 src 00:50:56:b7:05:bb l3 ip4 src 192.168.1.2
diff --git a/src/scripts/vnet/leftpeer/leftpeer-classify6 b/src/scripts/vnet/leftpeer/leftpeer-classify6
new file mode 100644
index 00000000..6579d50d
--- /dev/null
+++ b/src/scripts/vnet/leftpeer/leftpeer-classify6
@@ -0,0 +1,5 @@
+classify table mask l3 ip6 src buckets 2 miss-next local
+set ip6 classify intfc GigabitEthernet2/2/0 table-index 0
+set int ip address GigabitEthernet2/2/0 db01::1/64
+set int state GigabitEthernet2/2/0 up
+classify session hit-next local table-index 0 match l3 ip6 src db01::2
diff --git a/src/scripts/vnet/leftpeer/leftpeer-classifyl2 b/src/scripts/vnet/leftpeer/leftpeer-classifyl2
new file mode 100644
index 00000000..6be4b1e5
--- /dev/null
+++ b/src/scripts/vnet/leftpeer/leftpeer-classifyl2
@@ -0,0 +1,8 @@
+set int ip address GigabitEthernet2/2/0 192.168.1.1/24
+set int state GigabitEthernet2/2/0 up
+
+classify table mask l3 ip4 src buckets 2 l2-miss-next ethernet
+
+classify session advance 14 l2-hit-next ip4 table-index 0 match l3 ip4 src 192.168.1.2
+
+set int l2 class intfc GigabitEthernet2/2/0 ip4-table 0
diff --git a/src/scripts/vnet/leftpeer/leftpeer-dhcp b/src/scripts/vnet/leftpeer/leftpeer-dhcp
new file mode 100644
index 00000000..c13a8f3a
--- /dev/null
+++ b/src/scripts/vnet/leftpeer/leftpeer-dhcp
@@ -0,0 +1,23 @@
+loop cre
+set int ip table loop0 12
+set int ip address loop0 192.168.1.1/24
+set int state loop0 up
+
+set int ip table GigabitEthernet2/2/0 12
+comment { set int ip address GigabitEthernet2/2/0 192.168.1.1/24 }
+set int unnumbered GigabitEthernet2/2/0 use loop0
+set int state GigabitEthernet2/2/0 up
+
+set int ip table GigabitEthernet2/7/0 11
+set int ip address GigabitEthernet2/7/0 192.168.2.1/24
+set int state GigabitEthernet2/7/0 up
+
+uncomment { set dhcp proxy server 1.2.3.4 src-address 1.2.3.5 add-option-82 rx-fib-id 0 server-fib-id 0 }
+
+uncomment { set dhcp proxy server 192.168.2.2 src-address 192.168.2.1 add-option-82 rx-fib-id 12 server-fib-id 11 }
+
+ip route add 0.0.0.0/24 table 11 via local
+ip route add 255.255.255.255/24 table 11 via local
+
+ip route add 0.0.0.0/24 table 12 via local
+ip route add 255.255.255.255/24 table 12 via local
diff --git a/src/scripts/vnet/leftpeer/leftpeer-ioam.conf b/src/scripts/vnet/leftpeer/leftpeer-ioam.conf
new file mode 100644
index 00000000..6c1b502c
--- /dev/null
+++ b/src/scripts/vnet/leftpeer/leftpeer-ioam.conf
@@ -0,0 +1,15 @@
+comment { connects to linux ping source eth1 addr db02::2/64 }
+set int ip address GigabitEthernet2/2/0 db02::1/64
+set int state GigabitEthernet2/2/0 up
+
+comment { connects to ioam domain rightpeer eth2 addr db03::3/64 }
+set int ip address GigabitEthernet2/3/0 db03::1/64
+set int state GigabitEthernet2/3/0 up
+
+ioam set rewrite trace-elts 2 pow
+
+set ip6 neighbor GigabitEthernet2/3/0 db03::3 00:50:56:b7:05:cb
+
+ip route add db04::0/64 via db03::3 
+
+ioam set destination db04::0/64 add 
diff --git a/src/scripts/vnet/leftpeer/leftpeer-l3vxlan.conf b/src/scripts/vnet/leftpeer/leftpeer-l3vxlan.conf
new file mode 100644
index 00000000..a75f9b4c
--- /dev/null
+++ b/src/scripts/vnet/leftpeer/leftpeer-l3vxlan.conf
@@ -0,0 +1,12 @@
+comment { tunnel to rightpeer 6.0.3.3 on vlan 101 }
+
+set int ip address GigabitEthernet2/3/0 6.0.3.1/24
+set int state GigabitEthernet2/3/0 up
+
+comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
+
+set int ip address GigabitEthernet2/2/0 6.0.2.1/24
+set int state GigabitEthernet2/2/0 up
+
+vxlan tunnel src 6.0.3.1 peer 6.0.3.3 vni 123 adj 6.0.4.4/24
+
diff --git a/src/scripts/vnet/leftpeer/leftpeer-lisp.conf b/src/scripts/vnet/leftpeer/leftpeer-lisp.conf
new file mode 100644
index 00000000..cb3180b7
--- /dev/null
+++ b/src/scripts/vnet/leftpeer/leftpeer-lisp.conf
@@ -0,0 +1,18 @@
+comment { vpe_phase2 configuration }
+
+comment { local client facing interface on vlan 100  }
+comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
+
+set int ip address GigabitEthernet2/2/0 6.0.2.1/24
+set int state GigabitEthernet2/2/0 up
+
+comment { tunnel to rightpeer on vlan 101 }
+set int ip address GigabitEthernet2/3/0 6.0.3.1/24
+set int state GigabitEthernet2/3/0 up
+
+lisp gpe tunnel src 6.0.3.1 dst 6.0.3.3 next-ip4 decap-next ip4 iid 1133
+set int ip address lisp_gpe_tunnel0 6.0.4.1/24
+set int state lisp_gpe_tunnel0 up
+
+lisp gpe tunnel src 6.0.3.3 dst 6.0.3.1 next-ip4 decap-next ip4 iid 3311 
+set int stat lisp_gpe_tunnel1 up
diff --git a/src/scripts/vnet/leftpeer/leftpeer-mpls.conf b/src/scripts/vnet/leftpeer/leftpeer-mpls.conf
new file mode 100644
index 00000000..74bce81b
--- /dev/null
+++ b/src/scripts/vnet/leftpeer/leftpeer-mpls.conf
@@ -0,0 +1,17 @@
+comment { vpe_phase2 configuration }
+
+comment { local client facing interface on vlan 100  }
+comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
+
+set int ip table GigabitEthernet2/2/0 1
+set int ip address GigabitEthernet2/2/0 6.0.2.1/24
+set int state GigabitEthernet2/2/0 up
+
+comment { tunnel to rightpeer on vlan 101 }
+set int ip address GigabitEthernet2/3/0 6.0.3.1/24
+set int state GigabitEthernet2/3/0 up
+
+mpls encap add label 30 fib 1 dest 6.0.3.3
+mpls decap add label 30 fib 1 
+
+create mpls gre tunnel src 6.0.3.1 dst 6.0.3.3 intfc 6.0.4.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/src/scripts/vnet/leftpeer/leftpeer-sr.conf b/src/scripts/vnet/leftpeer/leftpeer-sr.conf
new file mode 100644
index 00000000..a7b962d3
--- /dev/null
+++ b/src/scripts/vnet/leftpeer/leftpeer-sr.conf
@@ -0,0 +1,24 @@
+comment { test sr segment chunk-offset on }
+test sr hmac validate on
+
+comment { trunk to rightpeer }
+set int ip address GigabitEthernet2/3/0 db03::2/64
+enable ip6 interface GigabitEthernet2/3/0
+set int state GigabitEthernet2/3/0 up
+
+comment { subscriber linux-ping-source }
+set int ip address GigabitEthernet2/2/0 db02::2/64
+enable ip6 interface GigabitEthernet2/2/0
+set int state GigabitEthernet2/2/0 up
+
+sr hmac id 2 key Gozzer
+sr hmac id 3 key Hoser
+
+sr tunnel src db01::1 dst db04::1/128 next db03::1 next db04::1 tag db02::2 clean key Gozzer InPE 1
+
+tap connect srlocal hwaddr random
+set int ip6 table tap-0 1
+set int ip address tap-0 db04::99/64
+enable ip6 interface tap-0
+set int state tap-0 up
+ip route add table 1 db02::0/64 lookup in table 0
diff --git a/src/scripts/vnet/leftpeer/leftpeer-vxlan.conf b/src/scripts/vnet/leftpeer/leftpeer-vxlan.conf
new file mode 100644
index 00000000..d50e8bf4
--- /dev/null
+++ b/src/scripts/vnet/leftpeer/leftpeer-vxlan.conf
@@ -0,0 +1,17 @@
+comment { tunnel to rightpeer 6.0.3.3 on vlan 101 }
+
+set int ip address GigabitEthernet2/3/0 6.0.3.1/24
+set int state GigabitEthernet2/3/0 up
+
+comment { tunnel to thirdpeer 6.0.5.5 on vlan 105 }
+set int ip address GigabitEthernet2/7/0 6.0.5.1/24
+set int state GigabitEthernet2/7/0 up
+
+comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
+
+set int ip address GigabitEthernet2/2/0 6.0.2.1/24
+set int state GigabitEthernet2/2/0 up
+
+vxlan tunnel src 6.0.3.1 peer 6.0.3.3 peer 6.0.3.5 vni 123 
+vxlan l2 GigabitEthernet2/2/0 vni 123
+
diff --git a/src/scripts/vnet/leftpeer/leftpeer.script b/src/scripts/vnet/leftpeer/leftpeer.script
new file mode 100644
index 00000000..f08c8090
--- /dev/null
+++ b/src/scripts/vnet/leftpeer/leftpeer.script
@@ -0,0 +1,9 @@
+l2tp_set_lookup_key lookup_v6_src
+
+sw_interface_add_del_address GigabitEthernet2/3/0 db03::2/64
+sw_interface_set_flags GigabitEthernet2/3/0 admin-up
+
+comment sw_interface_add_del_address GigabitEthernet2/2/0 db02::2/64
+sw_interface_set_flags GigabitEthernet2/2/0 admin-up
+
+l2tp_session_add_del client_address db03::1 our_address db03::2 GigabitEthernet2/2/0 local_session_id 1 remote_session_id 3 local_cookie 11 remote_cookie 33
diff --git a/src/scripts/vnet/lfib/ip4-to-mpls b/src/scripts/vnet/lfib/ip4-to-mpls
new file mode 100644
index 00000000..85753797
--- /dev/null
+++ b/src/scripts/vnet/lfib/ip4-to-mpls
@@ -0,0 +1,26 @@
+packet-generator new {
+  name x
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    ICMP: 1.0.0.2 -> 2.2.2.2
+    ICMP echo_request
+    incrementing 100
+  }
+}
+
+loop create
+loop create
+set int state loop0 up
+set int state loop1 up
+
+set int ip address loop0 1.0.0.1/24
+set int ip address loop1 2.0.0.1/24
+
+set ip arp static loop1 2.0.0.2 dead.beef.babe
+set int mpls loop1 enable
+ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
+
+trace add pg-input 100
diff --git a/src/scripts/vnet/lfib/mpls-pop-to-mpls b/src/scripts/vnet/lfib/mpls-pop-to-mpls
new file mode 100644
index 00000000..2818ac13
--- /dev/null
+++ b/src/scripts/vnet/lfib/mpls-pop-to-mpls
@@ -0,0 +1,28 @@
+packet-generator new {
+  name x
+  limit 1
+  node mpls-input
+  size 72-72
+  no-recycle
+  data {
+   hex 0x0001e0ff0001f1ff4500004000000000400177ba010000020202020208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
+  }
+}
+
+loop create
+loop create
+set int state loop0 up
+set int state loop1 up
+
+set int ip address loop0 1.0.0.1/24
+set int ip address loop1 2.0.0.1/24
+
+set ip arp static loop1 2.0.0.2 dead.beef.babe
+set int mpls loop1 enable
+
+ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
+
+mpls local-label add 30 non-eos mpls-lookup-in-table 0
+mpls local-label add 31 2.2.2.2/32 
+
+trace add pg-input 100
diff --git a/src/scripts/vnet/lfib/mpls-to-ip4 b/src/scripts/vnet/lfib/mpls-to-ip4
new file mode 100644
index 00000000..24e235e0
--- /dev/null
+++ b/src/scripts/vnet/lfib/mpls-to-ip4
@@ -0,0 +1,27 @@
+packet-generator new {
+  name x
+  limit 1
+  node mpls-input
+  size 68-68
+  no-recycle
+  data {
+   hex 0x0001e1ff4500004000000000400177ba010000020202020208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
+  }
+}
+
+loop create
+loop create
+set int state loop0 up
+set int state loop1 up
+
+set int ip address loop0 1.0.0.1/24
+set int ip address loop1 2.0.0.1/24
+
+set ip arp static loop1 2.0.0.2 dead.beef.babe
+set int mpls loop1 enable
+
+ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
+
+mpls local-label add 30 eos ip4-lookup-in-table 0
+
+trace add pg-input 100
diff --git a/src/scripts/vnet/lfib/mpls-to-mpls b/src/scripts/vnet/lfib/mpls-to-mpls
new file mode 100644
index 00000000..497dbab3
--- /dev/null
+++ b/src/scripts/vnet/lfib/mpls-to-mpls
@@ -0,0 +1,26 @@
+packet-generator new {
+  name x
+  limit 1
+  node mpls-input
+  size 68-68
+  no-recycle
+  data {
+   hex 0x0001e1ff4500004000000000400177ba010000020200000208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
+  }
+}
+
+loop create
+loop create
+set int state loop0 up
+set int state loop1 up
+
+set int ip address loop0 1.0.0.1/24
+set int ip address loop1 2.0.0.1/24
+
+set ip arp static loop1 2.0.0.2 dead.beef.babe
+set int mpls loop1 enable
+
+ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
+mpls local-label add 30 2.2.2.2/32 
+
+trace add pg-input 100
diff --git a/src/scripts/vnet/mpls-o-ethernet/leftpeer.conf b/src/scripts/vnet/mpls-o-ethernet/leftpeer.conf
new file mode 100644
index 00000000..dd37b942
--- /dev/null
+++ b/src/scripts/vnet/mpls-o-ethernet/leftpeer.conf
@@ -0,0 +1,17 @@
+comment { vpe_phase2 configuration }
+
+comment { local client facing interface  }
+comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
+
+set int ip table GigabitEthernet2/2/0 1
+set int ip address GigabitEthernet2/2/0 6.0.2.1/24
+set int state GigabitEthernet2/2/0 up
+
+comment { tunnel to rightpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.1/24
+set int state GigabitEthernet2/3/0 up
+
+mpls encap add label 30 fib 1 dest 6.0.4.1
+mpls decap add label 30 fib 1
+
+create mpls ethernet tunnel dst 00:50:56:b7:05:cb adj 6.0.4.1/24 tx-intfc GigabitEthernet2/3/0 fib-id 1
diff --git a/src/scripts/vnet/mpls-o-ethernet/pg b/src/scripts/vnet/mpls-o-ethernet/pg
new file mode 100644
index 00000000..ba5397f7
--- /dev/null
+++ b/src/scripts/vnet/mpls-o-ethernet/pg
@@ -0,0 +1,10 @@
+packet-generator new {
+  name x
+  limit 1
+  node mpls-ethernet-input
+  size 68-68
+  no-recycle
+  data {
+   hex 0x0001e1ff4500004000000000400177ba010000020200000208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
+  }
+}
\ No newline at end of file
diff --git a/src/scripts/vnet/mpls-o-ethernet/rightpeer.conf b/src/scripts/vnet/mpls-o-ethernet/rightpeer.conf
new file mode 100644
index 00000000..7709ce4d
--- /dev/null
+++ b/src/scripts/vnet/mpls-o-ethernet/rightpeer.conf
@@ -0,0 +1,15 @@
+comment { local client facing interface }
+comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
+
+set int ip table GigabitEthernet2/4/0 1
+set int ip address GigabitEthernet2/4/0 6.0.4.1/24
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+mpls encap add label 30 fib 1 dest 6.0.2.1
+mpls decap add label 30 fib 1
+
+create mpls ethernet tunnel dst 00:50:56:b7:05:bf adj 6.0.2.1/24 tx-intfc GigabitEthernet2/3/0 fib-id 1
diff --git a/src/scripts/vnet/mpls-o-ethernet/single.conf b/src/scripts/vnet/mpls-o-ethernet/single.conf
new file mode 100644
index 00000000..2a25d355
--- /dev/null
+++ b/src/scripts/vnet/mpls-o-ethernet/single.conf
@@ -0,0 +1,17 @@
+comment { single node configuration }
+
+loop create
+loop create
+set int state loop0 up
+set int state loop1 up
+
+set int ip address loop0 1.0.0.1/24
+set int ip address loop1 2.0.0.1/24
+
+
+ip route add 2.2.2.2/32 via 2.0.0.2 loop1
+
+mpls encap add label 30 fib 0 dest 2.2.2.2
+mpls decap add label 30 fib 0
+
+create mpls ethernet tunnel dst 00:50:56:b7:05:cb adj 2.2.2.2/32 tx-intfc loop1 fib-id 0
diff --git a/src/scripts/vnet/mpls-o-gre/dhcpd.conf b/src/scripts/vnet/mpls-o-gre/dhcpd.conf
new file mode 100644
index 00000000..f0f659cd
--- /dev/null
+++ b/src/scripts/vnet/mpls-o-gre/dhcpd.conf
@@ -0,0 +1,116 @@
+#
+# Sample configuration file for ISC dhcpd for Debian
+#
+# Attention: If /etc/ltsp/dhcpd.conf exists, that will be used as
+# configuration file instead of this file.
+#
+#
+
+# The ddns-updates-style parameter controls whether or not the server will
+# attempt to do a DNS update when a lease is confirmed. We default to the
+# behavior of the version 2 packages ('none', since DHCP v2 didn't
+# have support for DDNS.)
+ddns-update-style none;
+
+# option definitions common to all supported networks...
+option domain-name "example.org";
+option domain-name-servers ns1.example.org, ns2.example.org;
+
+default-lease-time 600;
+max-lease-time 7200;
+
+# If this DHCP server is the official DHCP server for the local
+# network, the authoritative directive should be uncommented.
+#authoritative;
+
+# Use this to send dhcp log messages to a different log file (you also
+# have to hack syslog.conf to complete the redirection).
+log-facility local7;
+
+# No service will be given on this subnet, but declaring it helps the 
+# DHCP server to understand the network topology.
+
+#subnet 10.152.187.0 netmask 255.255.255.0 {
+#}
+
+# This is a very basic subnet declaration.
+
+#subnet 10.254.239.0 netmask 255.255.255.224 {
+#  range 10.254.239.10 10.254.239.20;
+#  option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
+#}
+
+# This declaration allows BOOTP clients to get dynamic addresses,
+# which we don't really recommend.
+
+#subnet 10.254.239.32 netmask 255.255.255.224 {
+#  range dynamic-bootp 10.254.239.40 10.254.239.60;
+#  option broadcast-address 10.254.239.31;
+#  option routers rtr-239-32-1.example.org;
+#}
+
+# A slightly different configuration for an internal subnet.
+#subnet 10.5.5.0 netmask 255.255.255.224 {
+#  range 10.5.5.26 10.5.5.30;
+#  option domain-name-servers ns1.internal.example.org;
+#  option domain-name "internal.example.org";
+#  option routers 10.5.5.1;
+#  option broadcast-address 10.5.5.31;
+#  default-lease-time 600;
+#  max-lease-time 7200;
+#}
+
+# Hosts which require special configuration options can be listed in
+# host statements.   If no address is specified, the address will be
+# allocated dynamically (if possible), but the host-specific information
+# will still come from the host declaration.
+
+#host passacaglia {
+#  hardware ethernet 0:0:c0:5d:bd:95;
+#  filename "vmunix.passacaglia";
+#  server-name "toccata.fugue.com";
+#}
+
+# Fixed IP addresses can also be specified for hosts.   These addresses
+# should not also be listed as being available for dynamic assignment.
+# Hosts for which fixed IP addresses have been specified can boot using
+# BOOTP or DHCP.   Hosts for which no fixed address is specified can only
+# be booted with DHCP, unless there is an address range on the subnet
+# to which a BOOTP client is connected which has the dynamic-bootp flag
+# set.
+#host fantasia {
+#  hardware ethernet 08:00:07:26:c0:a5;
+#  fixed-address fantasia.fugue.com;
+#}
+
+# You can declare a class of clients and then do address allocation
+# based on that.   The example below shows a case where all clients
+# in a certain class get addresses on the 10.17.224/24 subnet, and all
+# other clients get addresses on the 10.0.29/24 subnet.
+
+#class "foo" {
+#  match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
+#}
+
+#shared-network 224-29 {
+#  subnet 10.17.224.0 netmask 255.255.255.0 {
+#    option routers rtr-224.example.org;
+#  }
+#  subnet 10.0.29.0 netmask 255.255.255.0 {
+#    option routers rtr-29.example.org;
+#  }
+#  pool {
+#    allow members of "foo";
+#    range 10.17.224.10 10.17.224.250;
+#  }
+#  pool {
+#    deny members of "foo";
+#    range 10.0.29.10 10.0.29.230;
+#  }
+#}
+subnet 6.0.0.0 netmask 255.255.0.0 {
+   range 6.0.2.2 6.0.2.5;
+   option routers 6.0.2.1;
+   default-lease-time 15;
+   max-lease-time 15;
+}
diff --git a/src/scripts/vnet/mpls-o-gre/leftpeer.conf b/src/scripts/vnet/mpls-o-gre/leftpeer.conf
new file mode 100644
index 00000000..149c70c0
--- /dev/null
+++ b/src/scripts/vnet/mpls-o-gre/leftpeer.conf
@@ -0,0 +1,14 @@
+comment { left linux ping target configure at e.g. 6.0.2.2/24 }
+
+set int ip table GigabitEthernet2/2/0 1
+set int ip address GigabitEthernet2/2/0 6.0.2.1/24
+set int state GigabitEthernet2/2/0 up
+
+comment { tunnel to rightpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.1/24
+set int state GigabitEthernet2/3/0 up
+
+mpls encap add label 30 fib 1 dest 6.0.3.3
+mpls decap add label 30 fib 1
+
+create mpls gre tunnel src 6.0.3.1 dst 6.0.3.3 intfc 6.0.4.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/src/scripts/vnet/mpls-o-gre/rightpeer.conf b/src/scripts/vnet/mpls-o-gre/rightpeer.conf
new file mode 100644
index 00000000..b5bb597d
--- /dev/null
+++ b/src/scripts/vnet/mpls-o-gre/rightpeer.conf
@@ -0,0 +1,14 @@
+comment { right linux ping target configure  e.g. 6.0.4.4/24 }
+
+set int ip table GigabitEthernet2/4/0 1
+set int ip address GigabitEthernet2/4/0 6.0.4.1/24
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+mpls encap add label 30 fib 1 dest 6.0.3.1
+mpls decap add label 30 fib 1
+
+create mpls gre tunnel src 6.0.3.3 dst 6.0.3.1 intfc 6.0.2.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/src/scripts/vnet/mpls-tunnel b/src/scripts/vnet/mpls-tunnel
new file mode 100644
index 00000000..d04b2970
--- /dev/null
+++ b/src/scripts/vnet/mpls-tunnel
@@ -0,0 +1,87 @@
+packet-generator new {
+  name x0
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    ICMP: 1.0.0.2 -> 2.0.0.2
+    ICMP echo_request
+    incrementing 100
+  }
+}
+packet-generator new {
+  name x1
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    ICMP: 1.0.0.2 -> 2.0.1.2
+    ICMP echo_request
+    incrementing 100
+  }
+}
+packet-generator new {
+  name x2
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    ICMP: 1.0.0.2 -> 2.0.2.2
+    ICMP echo_request
+    incrementing 100
+  }
+}
+packet-generator new {
+  name x3
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    ICMP: 1.0.0.2 -> 2.0.3.2
+    ICMP echo_request
+    incrementing 100
+  }
+}
+
+
+
+trace add pg-input 100
+
+loop create
+set int state loop0 up
+
+set int ip address loop0 10.0.0.1/24
+set ip arp loop0 10.0.0.2 00:00:11:aa:bb:cc
+
+mpls tunnel add via 10.0.0.2 loop0 out-label 33 out-label 34 out-label 35 out-label 36
+set int state mpls-tunnel0 up
+set int ip addr  mpls-tunnel0 192.168.0.1/32
+ip route add 2.0.0.2/32 via 192.168.0.2 mpls-tunnel0
+
+
+mpls tunnel add via 10.0.0.2 out-label 33
+set int state mpls-tunnel1 up
+set int ip addr  mpls-tunnel1 192.168.1.1/32
+ip route add 2.0.1.2/32 via 192.168.1.2 mpls-tunnel1 out-label 99
+
+mpls tunnel add via 10.0.0.2 loop0 out-label 3
+set int state mpls-tunnel2 up
+set int ip addr  mpls-tunnel2 192.168.2.1/32
+ip route add 2.0.2.2/32 via 192.168.2.2 mpls-tunnel2
+
+
+mpls tunnel add l2-only via 10.0.0.2 loop0 out-label 234 out-label 0
+set int state mpls-tunnel3 up
+set int l2 bridge mpls-tunnel3 1
+
+loop create
+set int ip addr loop1 6.0.1.44/24
+set int l2 bridge loop1 1 bvi
+set int l2 learn loop1 disable
+set int state loop1 up
+
+ip route add 2.0.3.2/32 via 6.0.1.45 loop1
diff --git a/src/scripts/vnet/pcap b/src/scripts/vnet/pcap
new file mode 100644
index 00000000..692e5f27
--- /dev/null
+++ b/src/scripts/vnet/pcap
@@ -0,0 +1,18 @@
+packet-generator new {
+  name x
+  limit 1
+  node ethernet-input
+  no-recycle
+  pcap /home/eliot/pcap-data/ISIS_level1_adjacency.cap
+}
+
+packet-generator new {
+  name y
+  limit 1
+  node hdlc-input
+  no-recycle
+  pcap /home/eliot/pcap-data/ISIS_p2p_adjacency.cap
+}
+
+tr add pg-input 10
+
diff --git a/src/scripts/vnet/probe4 b/src/scripts/vnet/probe4
new file mode 100644
index 00000000..b530e0db
--- /dev/null
+++ b/src/scripts/vnet/probe4
@@ -0,0 +1,11 @@
+ethernet create-interfaces
+set int state fake-eth0 up
+set int ip address fake-eth0 1.0.0.1/24
+comment { error }
+comment { ip probe fake-eth0 1.0.0.1 }
+comment { ip probe fake-eth0 1.2.3.4 }
+comment { error }
+comment { ip probe fake-eth0 1.0.0.2 }
+
+
+
diff --git a/src/scripts/vnet/probe6 b/src/scripts/vnet/probe6
new file mode 100644
index 00000000..a5490c90
--- /dev/null
+++ b/src/scripts/vnet/probe6
@@ -0,0 +1,7 @@
+ethernet create-interfaces
+set int state fake-eth0 up
+set int ip address fake-eth0 2000::1/64
+comment { ip probe fake-eth0 2000::1 }
+
+
+
diff --git a/src/scripts/vnet/rewrite b/src/scripts/vnet/rewrite
new file mode 100644
index 00000000..d41b9dbf
--- /dev/null
+++ b/src/scripts/vnet/rewrite
@@ -0,0 +1,62 @@
+
+
+comment { test ipv4 port/vlan/qinq rewrites by generating arps }
+
+set int state tuntap-0 down
+
+set int ip address GigabitEthernet2/2/0 1.2.5.4/24
+
+cre sub GigabitEthernet2/2/0 1 dot1q 6 exact-match
+set int ip address GigabitEthernet2/2/0.1 1.2.6.4/24
+
+cre sub GigabitEthernet2/2/0 2 dot1ad 7 inner-dot1q 8 exact-match
+set int ip address GigabitEthernet2/2/0.2 1.2.7.4/24
+
+set int state GigabitEthernet2/1/0 up 
+set int state GigabitEthernet2/2/0 up
+set int state GigabitEthernet2/2/0.1 up
+set int state GigabitEthernet2/2/0.2 up
+
+trace add pg-input 2
+
+cle er
+cle int
+cle run
+
+packet-generator new {
+  name toport
+  limit 2
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/1/0
+  data {
+      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
+      GRE: 8.0.0.1 -> 1.2.5.6 mpls_unicast 
+  }
+}
+
+packet-generator new {
+  name tovlan
+  limit 2
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/1/0
+  data {
+      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
+      GRE: 8.0.0.1 -> 1.2.6.6 mpls_unicast 
+  }
+}
+
+packet-generator new {
+  name toqinq
+  limit 2
+  no-recycle
+  node ethernet-input
+  interface GigabitEthernet2/1/0
+  data {
+      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
+      GRE: 8.0.0.1 -> 1.2.7.6 mpls_unicast 
+  }
+}
+
+
diff --git a/src/scripts/vnet/rightpeer/rightpeer-ioam.conf b/src/scripts/vnet/rightpeer/rightpeer-ioam.conf
new file mode 100644
index 00000000..3e9a8d34
--- /dev/null
+++ b/src/scripts/vnet/rightpeer/rightpeer-ioam.conf
@@ -0,0 +1,14 @@
+comment { connects to right ping target eth3 addr db04::4/64 }
+set int ip address GigabitEthernet2/4/0 db04::1/64
+set int state GigabitEthernet2/4/0 up
+
+comment { connects to ioam domain leftpeer addr db03::1/64 }
+set int ip address GigabitEthernet2/3/0 db03::3/64
+set int state GigabitEthernet2/3/0 up
+
+set ip6 neighbor GigabitEthernet2/3/0 db03::1 00:50:56:b7:05:bf
+set ip6 neighbor GigabitEthernet2/4/0 db04::4 00:50:56:b7:05:d2
+
+ip route add db02::0/64 via db03::1
+
+ioam set destination db04::4/128 pop
diff --git a/src/scripts/vnet/rightpeer/rightpeer-l3vxlan.conf b/src/scripts/vnet/rightpeer/rightpeer-l3vxlan.conf
new file mode 100644
index 00000000..abba1ab0
--- /dev/null
+++ b/src/scripts/vnet/rightpeer/rightpeer-l3vxlan.conf
@@ -0,0 +1,9 @@
+set int ip address GigabitEthernet2/4/0 6.0.4.1/24 
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer on vlan 101 }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+vxlan tunnel src 6.0.3.3 peer 6.0.3.1 vni 123 adj 6.0.2.0/24
+
diff --git a/src/scripts/vnet/rightpeer/rightpeer-lisp.conf b/src/scripts/vnet/rightpeer/rightpeer-lisp.conf
new file mode 100644
index 00000000..961204a3
--- /dev/null
+++ b/src/scripts/vnet/rightpeer/rightpeer-lisp.conf
@@ -0,0 +1,16 @@
+comment { local client facing interface }
+comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
+
+set int ip address GigabitEthernet2/4/0 6.0.4.1/24
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+lisp gpe tunnel src 6.0.3.3 dst 6.0.3.1 next-ip4 decap-next ip4 iid 3311
+set int ip address lisp_gpe_tunnel0 6.0.2.3/24
+set int state lisp_gpe_tunnel0 up
+
+lisp gpe tunnel src 6.0.3.1 dst 6.0.3.3 next-ip4 decap-next ip4 iid 1133
+set int state lisp_gpe_tunnel1 up
diff --git a/src/scripts/vnet/rightpeer/rightpeer-mpls-l2.conf b/src/scripts/vnet/rightpeer/rightpeer-mpls-l2.conf
new file mode 100644
index 00000000..0ce38583
--- /dev/null
+++ b/src/scripts/vnet/rightpeer/rightpeer-mpls-l2.conf
@@ -0,0 +1,24 @@
+comment { vpe_phase1d configuration }
+
+comment { local client facing interface }
+comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
+
+set int ip table GigabitEthernet2/4/0 1
+set int ip address GigabitEthernet2/4/0 6.0.4.1/24
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+mpls encap add label 30 fib 1 dest 6.0.3.1
+mpls decap add label 30 next output GigabitEthernet2/4/0
+
+comment { create mpls gre tunnel src 6.0.3.3 dst 6.0.3.1 intfc 6.0.2.1/24 inner-fib-id 1 outer-fib-id 0 l2-only }
+
+comment {set int l2 xconnect GigabitEthernet2/4/0 mpls-gre0 }
+
+uncomment { create mpls ethernet tunnel dst 00:50:56:b7:05:bf adj 6.0.3.1/8 l2-only tx-intfc GigabitEthernet2/3/0 fib-id 1 }
+
+uncomment { set int l2 xconnect GigabitEthernet2/4/0 mpls-eth0 }
+
diff --git a/src/scripts/vnet/rightpeer/rightpeer-mpls.conf b/src/scripts/vnet/rightpeer/rightpeer-mpls.conf
new file mode 100644
index 00000000..fc97ba16
--- /dev/null
+++ b/src/scripts/vnet/rightpeer/rightpeer-mpls.conf
@@ -0,0 +1,17 @@
+comment { vpe_phase1d configuration }
+
+comment { local client facing interface }
+comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
+
+set int ip table GigabitEthernet2/4/0 1
+set int ip address GigabitEthernet2/4/0 6.0.4.1/24
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+mpls encap add label 30 fib 1 dest 6.0.3.1
+mpls decap add label 30 fib 1
+
+create mpls gre tunnel src 6.0.3.3 dst 6.0.3.1 intfc 6.0.2.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/src/scripts/vnet/rightpeer/rightpeer-sr.conf b/src/scripts/vnet/rightpeer/rightpeer-sr.conf
new file mode 100644
index 00000000..0b2a98bb
--- /dev/null
+++ b/src/scripts/vnet/rightpeer/rightpeer-sr.conf
@@ -0,0 +1,28 @@
+comment { test sr segment chunk-offset on }
+test sr hmac validate on
+
+comment { trunk to leftpeer }
+set int ip address GigabitEthernet2/3/0 db03::1/64
+enable ip6 interface GigabitEthernet2/3/0
+set int state GigabitEthernet2/3/0 up
+
+comment { subscriber right peer target }
+set int ip address GigabitEthernet2/4/0 db04::2/64
+
+comment { next address to fake out ND on shared LAN segment }
+comment { set int ip address GigabitEthernet2/4/0 db02::13/64 }
+
+enable ip6 interface GigabitEthernet2/4/0
+set int state GigabitEthernet2/4/0 up
+
+sr hmac id 2 key Gozzer
+sr hmac id 3 key Hoser
+
+sr tunnel src db04::1 dst db02::1/128 next db03::2 next db02::1 tag db04::2 clean key Hoser
+
+tap connect srlocal hwaddr random
+set int ip6 table tap-0 1
+set int ip address tap-0 db04::99/64
+enable ip6 interface tap-0
+set int state tap-0 up
+ip route add table 1 db02::0/64 lookup in table 0
diff --git a/src/scripts/vnet/rightpeer/rightpeer-vxlan.conf b/src/scripts/vnet/rightpeer/rightpeer-vxlan.conf
new file mode 100644
index 00000000..bd4c427e
--- /dev/null
+++ b/src/scripts/vnet/rightpeer/rightpeer-vxlan.conf
@@ -0,0 +1,16 @@
+
+comment { local client facing interface }
+
+comment { configure client lc4 eth1 }
+set int state GigabitEthernet2/4/0 up
+
+comment { tunnel to leftpeer }
+set int ip address GigabitEthernet2/3/0 6.0.3.3/24
+set int state GigabitEthernet2/3/0 up
+
+comment { tunnel to extra ping target }
+set int ip address GigabitEthernet2/7/0 6.0.5.3/24
+set int state GigabitEthernet2/3/0 up
+
+vxlan tunnel src 6.0.3.3 peer 6.0.3.1 peer 6.0.3.5 vni 123 
+vxlan l2 GigabitEthernet2/4/0 vni 123
diff --git a/src/scripts/vnet/rightpeer/rightpeer.script b/src/scripts/vnet/rightpeer/rightpeer.script
new file mode 100644
index 00000000..153988ce
--- /dev/null
+++ b/src/scripts/vnet/rightpeer/rightpeer.script
@@ -0,0 +1,9 @@
+l2tp_set_lookup_key lookup_v6_src
+
+sw_interface_add_del_address GigabitEthernet2/3/0 db03::1/64
+sw_interface_set_flags GigabitEthernet2/3/0 admin-up
+
+comment sw_interface_add_del_address GigabitEthernet2/4/0 db02::2/64
+sw_interface_set_flags GigabitEthernet2/4/0 admin-up
+
+l2tp_session_add_del client_address db03::2 our_address db03::1 GigabitEthernet2/4/0 local_session_id 3 remote_session_id 1 local_cookie 33 remote_cookie 11
diff --git a/src/scripts/vnet/rpf b/src/scripts/vnet/rpf
new file mode 100644
index 00000000..571c6b79
--- /dev/null
+++ b/src/scripts/vnet/rpf
@@ -0,0 +1,18 @@
+packet-generator new {
+  name x
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    ICMP: 1.2.3.4 -> 5.6.7.8
+    ICMP echo_request
+    incrementing 100
+  }
+}
+
+tr add pg-input 100
+set interface ip source-check pg/stream-0
+ip route 1.2.3.4/32 via pg/stream-0 0x01020304
+ip route 5.6.7.8/32 via drop
+
diff --git a/src/scripts/vnet/rtt-test b/src/scripts/vnet/rtt-test
new file mode 100644
index 00000000..5501b99d
--- /dev/null
+++ b/src/scripts/vnet/rtt-test
@@ -0,0 +1,31 @@
+set int state TenGigabitEthernet4/0/0 up
+set int state TenGigabitEthernet5/0/0 up
+
+set int ip address TenGigabitEthernet4/0/0 1.0.0.1/24
+set int ip address TenGigabitEthernet5/0/0 2.0.0.1/24
+
+ip route table 0 1.0.0.2/32 via TenGigabitEthernet4/0/0 IP4: 00:1b:21:74:5b:04 -> 00:1b:21:79:8e:bc
+ip route table 0 2.0.0.2/32 via TenGigabitEthernet5/0/0 IP4: 00:1b:21:79:8e:bc -> 00:1b:21:74:5b:04
+ip route table 1 2.0.0.2/32 via local
+ip route table 1 1.0.0.2/32 via local
+
+set int ip table TenGigabitEthernet5/0/0 1
+set int ip table TenGigabitEthernet4/0/0 1
+
+comment { trace add rtt-test-tx 100 }
+comment { trace add ixge-input 100 }
+comment { te rtt { 1.0.0.2 -> 2.0.0.2 count 1e4 rate 1e9 size 100 histogram-time 1e-5 } }
+
+packet-generator new {
+  name x
+  limit 1
+  node ip4-input
+  size 170-170
+  data {
+    ICMP: 1.0.0.2 -> 2.0.0.2
+    ICMP echo_request
+    incrementing 100
+  }
+}
+
+
diff --git a/src/scripts/vnet/snat b/src/scripts/vnet/snat
new file mode 100644
index 00000000..87fd699e
--- /dev/null
+++ b/src/scripts/vnet/snat
@@ -0,0 +1,34 @@
+packet-generator new {
+  name f1
+  limit 1000000
+  node ip4-input
+  size 64-64
+  no-recycle
+  worker 0
+  data {
+    UDP: 10.0.0.3 -> 172.16.1.2
+    UDP: 3000 -> 3001
+    length 128 checksum 0 incrementing 1
+  }
+}
+
+
+packet-generator new {
+  name f2
+  limit 1000000
+  node ip4-input
+  size 64-64
+  no-recycle
+  worker 1
+  data {
+    UDP: 10.0.0.3 -> 172.16.1.2
+    UDP: 3005 -> 3006
+    length 128 checksum 0 incrementing 1
+  }
+}
+
+snat add address 172.16.1.3
+ip route 172.16.1.2/32 via drop
+set int ip address pg0 10.0.0.1/24
+set int snat in pg0
+trace add pg-input 10
diff --git a/src/scripts/vnet/snat_static b/src/scripts/vnet/snat_static
new file mode 100644
index 00000000..8fe48bff
--- /dev/null
+++ b/src/scripts/vnet/snat_static
@@ -0,0 +1,44 @@
+create packet-generator interface pg0
+create packet-generator interface pg1
+
+packet-generator new {
+  name f1
+  limit 1000000
+  node ip4-input
+  size 64-64
+  no-recycle
+  worker 0
+  interface pg0
+  data {
+    UDP: 10.0.0.3 -> 172.16.1.2
+    UDP: 3000 -> 3001
+    length 128 checksum 0 incrementing 1
+  }
+}
+
+
+packet-generator new {
+  name f2
+  limit 1000000
+  node ip4-input
+  size 64-64
+  no-recycle
+  worker 1
+  interface pg1
+  data {
+    UDP: 172.16.1.2 -> 172.16.1.3
+    UDP: 3001 -> 3000
+    length 128 checksum 0 incrementing 1
+  }
+}
+
+snat add address 172.16.1.3
+snat add static mapping local 10.0.0.3 external 172.16.1.3
+set int ip address pg0 10.0.0.1/24
+set int ip address pg1 172.16.1.1/24
+set int state pg0 up
+set int state pg1 up
+set ip arp static pg0 10.0.0.3 abcd.abcd.abcd
+set ip arp static pg1 172.16.1.2 cdef.abcd.abcd
+set int snat in pg0 out pg1
+trace add pg-input 10
diff --git a/src/scripts/vnet/snat_static_with_port b/src/scripts/vnet/snat_static_with_port
new file mode 100644
index 00000000..f646145a
--- /dev/null
+++ b/src/scripts/vnet/snat_static_with_port
@@ -0,0 +1,44 @@
+create packet-generator interface pg0
+create packet-generator interface pg1
+
+packet-generator new {
+  name f1
+  limit 1000000
+  node ip4-input
+  size 64-64
+  no-recycle
+  worker 0
+  interface pg0
+  data {
+    UDP: 10.0.0.3 -> 172.16.1.2
+    UDP: 3000 -> 3001
+    length 128 checksum 0 incrementing 1
+  }
+}
+
+
+packet-generator new {
+  name f2
+  limit 1000000
+  node ip4-input
+  size 64-64
+  no-recycle
+  worker 1
+  interface pg1
+  data {
+    UDP: 172.16.1.2 -> 172.16.1.3
+    UDP: 3001 -> 3000
+    length 128 checksum 0 incrementing 1
+  }
+}
+
+snat add address 172.16.1.3
+snat add static mapping local 10.0.0.3 3000 external 172.16.1.3 3000
+set int ip address pg0 10.0.0.1/24
+set int ip address pg1 172.16.1.1/24
+set int state pg0 up
+set int state pg1 up
+set ip arp static pg0 10.0.0.3 abcd.abcd.abcd
+set ip arp static pg1 172.16.1.2 cdef.abcd.abcd
+set int snat in pg0 out pg1
+trace add pg-input 10
diff --git a/src/scripts/vnet/source_and_port_range_check b/src/scripts/vnet/source_and_port_range_check
new file mode 100644
index 00000000..dce227b4
--- /dev/null
+++ b/src/scripts/vnet/source_and_port_range_check
@@ -0,0 +1,63 @@
+
+create loop int
+
+set int state loop0 up
+set int ip addr loop0 10.10.10.10/32
+
+packet-generator new {
+  name deny-from-default-route
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    UDP: 1.2.3.4 -> 5.6.7.8
+    UDP: 3000 -> 3001
+    length 128 checksum 0 incrementing 1
+  }
+}
+
+packet-generator new {
+  name allow
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    UDP: 1.1.1.1 -> 5.6.7.8
+    UDP: 3000 -> 3001
+    length 128 checksum 0 incrementing 1
+  }
+}
+
+packet-generator new {
+  name deny-from-port-range
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    UDP: 1.1.1.1 -> 5.6.7.8
+    UDP: 6000 -> 6001
+    length 128 checksum 0 incrementing 1
+  }
+}
+
+set ip source-and-port-range-check 1.1.1.0/24 range 2000 - 3000 vrf 99
+
+set interface ip source-and-port-range-check pg0 udp-out-vrf 99
+
+ show ip source-and-port-range-check vrf 99 1.1.1.1
+
+set ip source-and-port-range-check 1.1.1.0/24 range 4000 - 5000 vrf 99
+
+set ip source-and-port-range-check 1.1.2.0/24 range 4000 - 5000 vrf 99
+
+show ip source-and-port-range-check vrf 99 1.1.1.1
+show ip source-and-port-range-check vrf 99 1.1.2.1
+
+set ip source-and-port-range-check 1.1.2.0/24 range 4000 - 5000 vrf 99 del
+
+show ip source-and-port-range-check vrf 99 1.1.2.1
+
+tr add pg-input 100
diff --git a/src/scripts/vnet/speed b/src/scripts/vnet/speed
new file mode 100644
index 00000000..d60d671f
--- /dev/null
+++ b/src/scripts/vnet/speed
@@ -0,0 +1,14 @@
+packet-generator new {
+  name x
+  limit 1
+  node ip4-input
+  size 50-50
+  data {
+    ICMP: 1.2.3.4 -> 5.6.7.8
+    ICMP echo_request
+    incrementing 100
+  }
+}
+
+tr add pg-input 100
+ip route 5.6.7.8/32 via pg/stream-0 000102030405060708090a0b0c0d
diff --git a/src/scripts/vnet/sr/left-linux-ping.sh b/src/scripts/vnet/sr/left-linux-ping.sh
new file mode 100755
index 00000000..55b83506
--- /dev/null
+++ b/src/scripts/vnet/sr/left-linux-ping.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+ifconfig eth2 inet6 add db02::1/64
+route -A inet6 add db04::1/128 gw db02::2
diff --git a/src/scripts/vnet/sr/leftpeer.conf b/src/scripts/vnet/sr/leftpeer.conf
new file mode 100644
index 00000000..9591d968
--- /dev/null
+++ b/src/scripts/vnet/sr/leftpeer.conf
@@ -0,0 +1,27 @@
+comment { test sr segment chunk-offset on }
+test sr hmac validate on
+
+comment { trunk to rightpeer }
+set int ip address GigabitEthernet2/3/0 db03::2/64
+enable ip6 interface GigabitEthernet2/3/0
+set int state GigabitEthernet2/3/0 up
+
+comment { subscriber left-linux-ping }
+set int ip address GigabitEthernet2/2/0 db02::2/64
+enable ip6 interface GigabitEthernet2/2/0
+set int state GigabitEthernet2/2/0 up
+
+sr hmac id 2 key Gozzer
+sr hmac id 3 key Hoser
+
+sr tunnel src db01::1 dst db04::1/128 next db03::1 next db04::1 tag db02::2 clean key Gozzer InPE 1
+
+comment { sr unaware service chaining to db03::5 }
+comment { sr tunnel src db01::1 dst db04::1/128 next db03::1 next db03::5 next db04::1 tag db02::2 clean key Gozzer InPE 1 }
+
+comment { tap connect srlocal hwaddr random }
+comment { set int ip6 table tap-0 1 }
+comment { set int ip address tap-0 db04::99/64 }
+comment { enable ip6 interface tap-0 }
+comment { set int state tap-0 up }
+comment { ip route add table 1 db02::0/64 lookup in table 0 }
diff --git a/src/scripts/vnet/sr/right-linux-ping.sh b/src/scripts/vnet/sr/right-linux-ping.sh
new file mode 100755
index 00000000..029368db
--- /dev/null
+++ b/src/scripts/vnet/sr/right-linux-ping.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+ifconfig eth1 inet6 add db04::1/64
+route -A inet6 add db02::1/128 gw db04::2
diff --git a/src/scripts/vnet/sr/rightpeer.conf b/src/scripts/vnet/sr/rightpeer.conf
new file mode 100644
index 00000000..6da7a7af
--- /dev/null
+++ b/src/scripts/vnet/sr/rightpeer.conf
@@ -0,0 +1,22 @@
+comment { trunk to leftpeer }
+set int ip address GigabitEthernet2/0/0 db03::1/64
+enable ip6 interface GigabitEthernet2/0/0
+set int state GigabitEthernet2/0/0 up
+
+comment { subscriber right-linux-ping }
+set int ip address GigabitEthernet2/2/0 db04::2/64
+
+comment { next address to fake out ND on shared LAN segment }
+set int ip address GigabitEthernet2/2/0 db02::13/64
+
+enable ip6 interface GigabitEthernet2/2/0
+set int state GigabitEthernet2/2/0 up
+
+sr tunnel src db04::1 dst db02::1/128 next db03::2 next db02::1 tag db04::2 clean
+
+tap connect srlocal hwaddr random
+set int ip6 table tap-0 1
+set int ip address tap-0 db04::99/64
+enable ip6 interface tap-0
+set int state tap-0 up
+ip route add table 1 db02::0/64 lookup in table 0
diff --git a/src/scripts/vnet/sr/srlocal.sh b/src/scripts/vnet/sr/srlocal.sh
new file mode 100755
index 00000000..2f568408
--- /dev/null
+++ b/src/scripts/vnet/sr/srlocal.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+ifconfig srlocal inet6 add db04::1/64
+route -6 add db02::0/64 gw db04::99
diff --git a/src/scripts/vnet/srp b/src/scripts/vnet/srp
new file mode 100644
index 00000000..7cc37011
--- /dev/null
+++ b/src/scripts/vnet/srp
@@ -0,0 +1,27 @@
+srp create-interfaces
+srp create-interfaces
+set int hw-class fake-srp0 srp
+set int hw-class fake-srp1 srp
+
+packet-generator new {
+  name x
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    ICMP: 1.0.0.2 -> 2.0.0.2
+    ICMP echo_request
+    incrementing 100
+  }
+}
+
+tr add pg-input 100
+set int state fake-srp0 up
+set int state fake-srp1 up
+
+set int ip address fake-srp0 1.0.0.1/24
+set int ip address fake-srp1 2.0.0.1/24
+
+
+
diff --git a/src/scripts/vnet/tcp b/src/scripts/vnet/tcp
new file mode 100644
index 00000000..a2ee8b2d
--- /dev/null
+++ b/src/scripts/vnet/tcp
@@ -0,0 +1,16 @@
+packet-generator new {
+  name x
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    TCP: 1.2.3.4 -> 5.6.7.8
+    TCP: 1234 -> 5678
+    incrementing 100
+  }
+}
+
+tr add pg-input 100
+ip route 5.6.7.8/32 via local
+ip route 1.2.3.4/32 via local
diff --git a/src/scripts/vnet/tcp-test b/src/scripts/vnet/tcp-test
new file mode 100644
index 00000000..52bfbcdd
--- /dev/null
+++ b/src/scripts/vnet/tcp-test
@@ -0,0 +1,6 @@
+int create-ethernet
+set int ip address fake-eth0 1.2.3.4/24
+set int state fake-eth0 up
+ip route 1.2.3.5/32 via local
+trace add tuntap-rx 100
+
diff --git a/src/scripts/vnet/tf-ucs-1 b/src/scripts/vnet/tf-ucs-1
new file mode 100644
index 00000000..efa5f2dc
--- /dev/null
+++ b/src/scripts/vnet/tf-ucs-1
@@ -0,0 +1,16 @@
+comment { connected to Ixia port 1}
+set int ip address TenGigabitEthernet4/0/0 1.0.0.2/8
+
+set int state TenGigabitEthernet4/0/0 up
+
+comment { connected to Ixia port 2}
+set int ip address TenGigabitEthernet4/0/1 2.0.0.2/8
+set int state TenGigabitEthernet4/0/1 up
+
+comment { connected to Ixia port 3}
+set int ip address TenGigabitEthernet6/0/0 3.0.0.2/8
+set int state TenGigabitEthernet6/0/0 up
+
+comment { connected to Ixia port 4}
+set int ip address TenGigabitEthernet6/0/1 4.0.0.2/8
+set int state TenGigabitEthernet6/0/1 up
diff --git a/src/scripts/vnet/urpf b/src/scripts/vnet/urpf
new file mode 100644
index 00000000..a4d87527
--- /dev/null
+++ b/src/scripts/vnet/urpf
@@ -0,0 +1,86 @@
+
+create loop int
+
+set int state loop0 up
+set int ip addr loop0 10.10.10.10/24
+
+packet-generator new {
+  name transit-deny
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    UDP: 1.2.3.4 -> 2.2.2.2
+    UDP: 3000 -> 3001
+    length 128 checksum 0 incrementing 1
+  }
+}
+
+packet-generator new {
+  name transit-allow
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    UDP: 1.1.1.1 -> 2.2.2.2
+    UDP: 3000 -> 3001
+    length 128 checksum 0 incrementing 1
+  }
+}
+
+packet-generator new {
+  name transit-allow-from-excemption
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    UDP: 11.11.12.13 -> 2.2.2.2
+    UDP: 6000 -> 6001
+    length 128 checksum 0 incrementing 1
+  }
+}
+
+packet-generator new {
+  name for-us-allow-from-excemption
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    UDP: 11.11.12.13 -> 10.10.10.10
+    UDP: 6000 -> 6001
+    length 128 checksum 0 incrementing 1
+  }
+}
+
+packet-generator new {
+  name for-us-allow
+  limit 1
+  node ip4-input
+  size 64-64
+  no-recycle
+  data {
+    UDP: 1.1.1.1 -> 10.10.10.10
+    UDP: 3000 -> 3001
+    length 128 checksum 0 incrementing 1
+  }
+}
+
+tr add pg-input 100
+
+set int ip addr pg0 10.10.11.10/24
+
+set interface ip source-check pg0 strict
+
+ip route add 1.1.1.1/32 via 10.10.11.11 pg0
+ip route add 2.2.2.2/32 via 10.10.10.11 loop0
+
+ip urpf-accept 11.11.0.0/16
+
+#set interface ip source-check pg0 strict del
+#set interface ip source-check pg0 loose
+
+#ip urpf-accept del 11.11.0.0/16
diff --git a/src/scripts/vnet/virl/ip6sr.virl b/src/scripts/vnet/virl/ip6sr.virl
new file mode 100644
index 00000000..5d4d1a0a
--- /dev/null
+++ b/src/scripts/vnet/virl/ip6sr.virl
@@ -0,0 +1,874 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<topology xmlns="http://www.cisco.com/VIRL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="0.9" xsi:schemaLocation="http://www.cisco.com/VIRL https://raw.github.com/CiscoVIRL/schema/v0.9/virl.xsd">
+    <extensions>
+        <entry key="management_network" type="String">flat</entry>
+        <entry key="AutoNetkit.address_family" type="String">dual_stack</entry>
+        <entry key="AutoNetkit.enable_routing" type="Boolean">false</entry>
+    </extensions>
+    <node name="iosv-1" type="SIMPLE" subtype="IOSv" location="195,78" ipv4="192.168.0.2" ipv6="::b:1:0:0:2">
+        <extensions>
+            <entry key="config" type="string">!
+! Last configuration change at 16:41:18 UTC Fri Mar 27 2015
+!
+version 15.4
+service timestamps debug datetime msec
+service timestamps log datetime msec
+no service password-encryption
+!
+hostname iosv-1
+!
+boot-start-marker
+boot-end-marker
+!
+!
+enable password cisco
+!
+no aaa new-model
+!
+!
+!
+mmi polling-interval 60
+no mmi auto-configure
+no mmi pvc
+mmi snmp-timeout 180
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+no ip domain lookup
+ip cef
+ipv6 unicast-routing
+ipv6 cef
+!
+multilink bundle-name authenticated
+!
+!
+cts logging verbose
+!
+!
+!
+redundancy
+!
+!
+! 
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+interface Loopback0
+ description Loopback
+ ip address 192.168.0.2 255.255.255.255
+ ipv6 address ::B:1:0:0:2/128
+!
+interface GigabitEthernet0/0
+ description OOB Management
+ ip address 172.16.1.193 255.255.255.0
+ duplex auto
+ speed auto
+ media-type rj45
+!
+interface GigabitEthernet0/1
+ description to vpp-1
+ ip address 10.0.0.5 255.255.255.252
+ duplex auto
+ speed auto
+ media-type rj45
+ ipv6 address ::A:1:1:0:6/126
+!
+ip forward-protocol nd
+!
+!
+no ip http server
+no ip http secure-server
+!
+! route to iosv-2
+ipv6 route ::A:1:1:0:16/128 ::A:1:1:0:7
+! route to iosv-4
+ipv6 route ::A:1:1:0:22/128 ::A:1:1:0:7
+!
+!
+!
+control-plane
+!
+banner exec `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+banner incoming `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+banner login `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+!
+line con 0
+ password cisco
+line aux 0
+line vty 0 4
+ exec-timeout 720 0
+ password cisco
+ login
+ transport input telnet ssh
+!
+no scheduler allocate
+!
+end</entry>
+            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.5" ipv6="::a:1:1:0:6" netPrefixLenV4="30" netPrefixLenV6="126"/>
+    </node>
+    <node name="iosv-2" type="SIMPLE" subtype="IOSv" location="667,82" ipv4="192.168.0.3" ipv6="::b:1:0:0:3">
+        <extensions>
+            <entry key="config" type="string">!
+! Last configuration change at 16:41:10 UTC Fri Mar 27 2015
+!
+version 15.4
+service timestamps debug datetime msec
+service timestamps log datetime msec
+no service password-encryption
+!
+hostname iosv-2
+!
+boot-start-marker
+boot-end-marker
+!
+!
+enable password cisco
+!
+no aaa new-model
+!
+!
+!
+mmi polling-interval 60
+no mmi auto-configure
+no mmi pvc
+mmi snmp-timeout 180
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+no ip domain lookup
+ip cef
+ipv6 unicast-routing
+ipv6 cef
+!
+multilink bundle-name authenticated
+!
+!
+cts logging verbose
+!
+!
+!
+redundancy
+!
+!
+! 
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+interface Loopback0
+ description Loopback
+ ip address 192.168.0.3 255.255.255.255
+ ipv6 address ::B:1:0:0:3/128
+!
+interface GigabitEthernet0/0
+ description OOB Management
+ ip address 172.16.1.191 255.255.255.0
+ duplex auto
+ speed auto
+ media-type rj45
+!
+interface GigabitEthernet0/1
+ description to vpp-2
+ ip address 10.0.0.21 255.255.255.252
+ duplex auto
+ speed auto
+ media-type rj45
+ ipv6 address ::A:1:1:0:16/126
+!
+ip forward-protocol nd
+!
+!
+no ip http server
+no ip http secure-server
+!
+ipv6 route ::A:1:1:0:6/128 ::A:1:1:0:17
+!
+!
+!
+control-plane
+!
+banner exec `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+banner incoming `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+banner login `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+!
+line con 0
+ password cisco
+line aux 0
+line vty 0 4
+ exec-timeout 720 0
+ password cisco
+ login
+ transport input telnet ssh
+!
+no scheduler allocate
+!
+end</entry>
+            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.21" ipv6="::a:1:1:0:16" netPrefixLenV4="30" netPrefixLenV6="126"/>
+    </node>
+    <node name="iosv-3" type="SIMPLE" subtype="IOSv" location="194,186" ipv4="192.168.0.6" ipv6="::b:1:0:0:4">
+        <extensions>
+            <entry key="config" type="string">!
+! Last configuration change at 16:27:43 UTC Fri Mar 27 2015
+!
+version 15.4
+service timestamps debug datetime msec
+service timestamps log datetime msec
+no service password-encryption
+!
+hostname iosv-3
+!
+boot-start-marker
+boot-end-marker
+!
+!
+enable password cisco
+!
+no aaa new-model
+!
+!
+!
+mmi polling-interval 60
+no mmi auto-configure
+no mmi pvc
+mmi snmp-timeout 180
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+no ip domain lookup
+ip cef
+ipv6 unicast-routing
+ipv6 cef
+!
+multilink bundle-name authenticated
+!
+!
+cts logging verbose
+!
+!
+!
+redundancy
+!
+!
+! 
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+interface Loopback0
+ description Loopback
+ ip address 192.168.0.6 255.255.255.255
+ ipv6 address ::B:1:0:0:4/128
+!
+interface GigabitEthernet0/0
+ description OOB Management
+ ip address 172.16.1.192 255.255.255.0
+ duplex auto
+ speed auto
+ media-type rj45
+!
+interface GigabitEthernet0/1
+ description to vpp-1
+ ip address 10.0.0.9 255.255.255.252
+ duplex auto
+ speed auto
+ media-type rj45
+ ipv6 address ::A:1:1:0:A/126
+!
+ip forward-protocol nd
+!
+!
+no ip http server
+no ip http secure-server
+!
+!
+!
+!
+control-plane
+!
+banner exec `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+banner incoming `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+banner login `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+!
+line con 0
+ password cisco
+line aux 0
+line vty 0 4
+ exec-timeout 720 0
+ password cisco
+ login
+ transport input telnet ssh
+!
+no scheduler allocate
+!
+end</entry>
+            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.9" ipv6="::a:1:1:0:a" netPrefixLenV4="30" netPrefixLenV6="126"/>
+    </node>
+    <node name="iosv-4" type="SIMPLE" subtype="IOSv" location="668,193" ipv4="192.168.0.8" ipv6="::b:1:0:0:5">
+        <extensions>
+            <entry key="config" type="string">!
+! Last configuration change at 16:27:43 UTC Fri Mar 27 2015
+!
+version 15.4
+service timestamps debug datetime msec
+service timestamps log datetime msec
+no service password-encryption
+!
+hostname iosv-4
+!
+boot-start-marker
+boot-end-marker
+!
+!
+enable password cisco
+!
+no aaa new-model
+!
+!
+!
+mmi polling-interval 60
+no mmi auto-configure
+no mmi pvc
+mmi snmp-timeout 180
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+no ip domain lookup
+ip cef
+ipv6 unicast-routing
+ipv6 cef
+!
+multilink bundle-name authenticated
+!
+!
+cts logging verbose
+!
+!
+!
+redundancy
+!
+!
+! 
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+interface Loopback0
+ description Loopback
+ ip address 192.168.0.8 255.255.255.255
+ ipv6 address ::B:1:0:0:5/128
+!
+interface GigabitEthernet0/0
+ description OOB Management
+ ip address 172.16.1.194 255.255.255.0
+ duplex auto
+ speed auto
+ media-type rj45
+!
+interface GigabitEthernet0/1
+ description to vpp-2
+ ip address 10.0.0.33 255.255.255.252
+ duplex auto
+ speed auto
+ media-type rj45
+ ipv6 address ::A:1:1:0:22/126
+!
+! Route to iosv-1
+ipv6 route ::A:1:1:0:6/128 ::A:1:1:0:23
+ip forward-protocol nd
+!
+!
+no ip http server
+no ip http secure-server
+!
+!
+!
+!
+control-plane
+!
+banner exec `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+banner incoming `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+banner login `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+!
+line con 0
+ password cisco
+line aux 0
+line vty 0 4
+ exec-timeout 720 0
+ password cisco
+ login
+ transport input telnet ssh
+!
+no scheduler allocate
+!
+end</entry>
+            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.33" ipv6="::a:1:1:0:22" netPrefixLenV4="30" netPrefixLenV6="126"/>
+    </node>
+    <node name="vpp-1" type="SIMPLE" subtype="vPP" location="302,140">
+        <extensions>
+            <entry key="config" type="string">#cloud-config
+bootcmd:
+- ln -s -t /etc/rc.d /etc/rc.local
+hostname: vpp-1
+manage_etc_hosts: true
+runcmd:
+- start ttyS0
+- systemctl start getty@ttyS0.service
+- systemctl start rc-local
+- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
+- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
+- service ssh restart
+- service sshd restart
+- sed -i 's/no-pci//' /cisco/etc/qn.conf
+- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
+users:
+- default
+- gecos: User configured by VIRL Configuration Engine 0.15.3
+  lock-passwd: false
+  name: cisco
+  plain-text-passwd: cisco
+  shell: /bin/bash
+  ssh-authorized-keys:
+  - VIRL-USER-SSH-PUBLIC-KEY
+  sudo: ALL=(ALL) ALL
+write_files:
+- path: /etc/init/ttyS0.conf
+  owner: root:root
+  content: |
+    # ttyS0 - getty
+    # This service maintains a getty on ttyS0 from the point the system is
+    # started until it is shut down again.
+    start on stopped rc or RUNLEVEL=[12345]
+    stop on runlevel [!12345]
+    respawn
+    exec /sbin/getty -L 115200 ttyS0 vt102
+  permissions: '0644'
+- path: /etc/systemd/system/dhclient@.service
+  content: |
+    [Unit]
+    Description=Run dhclient on %i interface
+    After=network.target
+    [Service]
+    Type=oneshot
+    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
+    RemainAfterExit=yes
+  owner: root:root
+  permissions: '0644'
+- path: /cisco/etc/vpp-server.conf
+  owner: root:root
+  permissions: '0644'
+  content: |-
+    set interface ip address GigabitEthernet0/4/0 10.0.0.6/30
+    set interface ip address GigabitEthernet0/4/0 ::a:1:1:0:7/126
+    set interface state GigabitEthernet0/4/0 up
+    set interface ip address GigabitEthernet0/5/0 10.0.0.10/30
+    set interface ip address GigabitEthernet0/5/0 ::a:1:1:0:b/126
+    set interface state GigabitEthernet0/5/0 up
+    set interface ip address GigabitEthernet0/6/0 10.0.0.13/30
+    set interface ip address GigabitEthernet0/6/0 ::a:1:1:0:e/126
+    set interface state GigabitEthernet0/6/0 up
+    set interface ip address GigabitEthernet0/7/0 10.0.0.17/30
+    set interface ip address GigabitEthernet0/7/0 ::a:1:1:0:12/126
+    set interface state GigabitEthernet0/7/0 up
+    sr tunnel src 0::a:1:1:0:6 dst 0::a:1:1:0:16/128 next 0::a:1:1:0:f next 0::a:1:1:0:1a next 0::a:1:1:0:16 tag 0::a:1:1:0:7 InPE 1 clean
+    sr tunnel src 0::a:1:1:0:6 dst 0::a:1:1:0:22/128 next 0::a:1:1:0:f next 0::a:1:1:0:1a next 0::a:1:1:0:22 tag 0::a:1:1:0:7 InPE 1 clean
+</entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.6" ipv6="::a:1:1:0:7" netPrefixLenV4="30" netPrefixLenV6="126"/>
+        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.10" ipv6="::a:1:1:0:b" netPrefixLenV4="30" netPrefixLenV6="126"/>
+        <interface id="2" name="GigabitEthernet0/6/0" ipv4="10.0.0.13" ipv6="::a:1:1:0:e" netPrefixLenV4="30" netPrefixLenV6="126"/>
+        <interface id="3" name="GigabitEthernet0/7/0" ipv4="10.0.0.17" ipv6="::a:1:1:0:12" netPrefixLenV4="30" netPrefixLenV6="126"/>
+    </node>
+    <node name="vpp-2" type="SIMPLE" subtype="vPP" location="541,147">
+        <extensions>
+            <entry key="config" type="string">#cloud-config
+bootcmd:
+- ln -s -t /etc/rc.d /etc/rc.local
+hostname: vpp-2
+manage_etc_hosts: true
+runcmd:
+- start ttyS0
+- systemctl start getty@ttyS0.service
+- systemctl start rc-local
+- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
+- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
+- service ssh restart
+- service sshd restart
+- sed -i 's/no-pci//' /cisco/etc/qn.conf
+- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
+users:
+- default
+- gecos: User configured by VIRL Configuration Engine 0.15.3
+  lock-passwd: false
+  name: cisco
+  plain-text-passwd: cisco
+  shell: /bin/bash
+  ssh-authorized-keys:
+  - VIRL-USER-SSH-PUBLIC-KEY
+  sudo: ALL=(ALL) ALL
+write_files:
+- path: /etc/init/ttyS0.conf
+  owner: root:root
+  content: |
+    # ttyS0 - getty
+    # This service maintains a getty on ttyS0 from the point the system is
+    # started until it is shut down again.
+    start on stopped rc or RUNLEVEL=[12345]
+    stop on runlevel [!12345]
+    respawn
+    exec /sbin/getty -L 115200 ttyS0 vt102
+  permissions: '0644'
+- path: /etc/systemd/system/dhclient@.service
+  content: |
+    [Unit]
+    Description=Run dhclient on %i interface
+    After=network.target
+    [Service]
+    Type=oneshot
+    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
+    RemainAfterExit=yes
+  owner: root:root
+  permissions: '0644'
+- path: /cisco/etc/vpp-server.conf
+  owner: root:root
+  permissions: '0644'
+  content: |-
+    set interface ip address GigabitEthernet0/4/0 10.0.0.25/30
+    set interface ip address GigabitEthernet0/4/0 ::a:1:1:0:1a/126
+    set interface state GigabitEthernet0/4/0 up
+    set interface ip address GigabitEthernet0/5/0 10.0.0.29/30
+    set interface ip address GigabitEthernet0/5/0 ::a:1:1:0:1e/126
+    set interface state GigabitEthernet0/5/0 up
+    set interface ip address GigabitEthernet0/6/0 10.0.0.22/30
+    set interface ip address GigabitEthernet0/6/0 ::a:1:1:0:17/126
+    set interface state GigabitEthernet0/6/0 up
+    set interface ip address GigabitEthernet0/7/0 10.0.0.34/30
+    set interface ip address GigabitEthernet0/7/0 ::a:1:1:0:23/126
+    set interface state GigabitEthernet0/7/0 up
+    sr tunnel src 0::a:1:1:0:16 dst 0::a:1:1:0:6/128 next 0::a:1:1:0:1b next 0::a:1:1:0:e next 0::a:1:1:0:6 tag 0::a:1:1:0:17 InPE 1 clean
+</entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.25" ipv6="::a:1:1:0:1a" netPrefixLenV4="30" netPrefixLenV6="126"/>
+        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.29" ipv6="::a:1:1:0:1e" netPrefixLenV4="30" netPrefixLenV6="126"/>
+        <interface id="2" name="GigabitEthernet0/6/0" ipv4="10.0.0.22" ipv6="::a:1:1:0:17" netPrefixLenV4="30" netPrefixLenV6="126"/>
+        <interface id="3" name="GigabitEthernet0/7/0" ipv4="10.0.0.34" ipv6="::a:1:1:0:23" netPrefixLenV4="30" netPrefixLenV6="126"/>
+    </node>
+    <node name="vpp-3" type="SIMPLE" subtype="vPP" location="415,89">
+        <extensions>
+            <entry key="config" type="string">#cloud-config
+bootcmd:
+- ln -s -t /etc/rc.d /etc/rc.local
+hostname: vpp-3
+manage_etc_hosts: true
+runcmd:
+- start ttyS0
+- systemctl start getty@ttyS0.service
+- systemctl start rc-local
+- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
+- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
+- service ssh restart
+- service sshd restart
+- sed -i 's/no-pci//' /cisco/etc/qn.conf
+- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
+users:
+- default
+- gecos: User configured by VIRL Configuration Engine 0.15.3
+  lock-passwd: false
+  name: cisco
+  plain-text-passwd: cisco
+  shell: /bin/bash
+  ssh-authorized-keys:
+  - VIRL-USER-SSH-PUBLIC-KEY
+  sudo: ALL=(ALL) ALL
+write_files:
+- path: /etc/init/ttyS0.conf
+  owner: root:root
+  content: |
+    # ttyS0 - getty
+    # This service maintains a getty on ttyS0 from the point the system is
+    # started until it is shut down again.
+    start on stopped rc or RUNLEVEL=[12345]
+    stop on runlevel [!12345]
+    respawn
+    exec /sbin/getty -L 115200 ttyS0 vt102
+  permissions: '0644'
+- path: /etc/systemd/system/dhclient@.service
+  content: |
+    [Unit]
+    Description=Run dhclient on %i interface
+    After=network.target
+    [Service]
+    Type=oneshot
+    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
+    RemainAfterExit=yes
+  owner: root:root
+  permissions: '0644'
+- path: /cisco/etc/vpp-server.conf
+  owner: root:root
+  permissions: '0644'
+  content: |-
+    set interface ip address GigabitEthernet0/4/0 10.0.0.14/30
+    set interface ip address GigabitEthernet0/4/0 ::a:1:1:0:f/126
+    set interface state GigabitEthernet0/4/0 up
+    set interface ip address GigabitEthernet0/5/0 10.0.0.26/30
+    set interface ip address GigabitEthernet0/5/0 ::a:1:1:0:1b/126
+    set interface state GigabitEthernet0/5/0 up
+    comment { fix src rpf drop screws}
+    ip route add ::a:1:1:0:6/128 via drop
+    ip route add ::a:1:1:0:16/128 via drop
+    ip route add ::a:1:1:0:22/128 via drop
+</entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.14" ipv6="::a:1:1:0:f" netPrefixLenV4="30" netPrefixLenV6="126"/>
+        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.26" ipv6="::a:1:1:0:1b" netPrefixLenV4="30" netPrefixLenV6="126"/>
+    </node>
+    <node name="vpp-4" type="SIMPLE" subtype="vPP" location="419,216">
+        <extensions>
+            <entry key="config" type="string">#cloud-config
+bootcmd:
+- ln -s -t /etc/rc.d /etc/rc.local
+hostname: vpp-4
+manage_etc_hosts: true
+runcmd:
+- start ttyS0
+- systemctl start getty@ttyS0.service
+- systemctl start rc-local
+- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
+- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
+- service ssh restart
+- service sshd restart
+- sed -i 's/no-pci//' /cisco/etc/qn.conf
+- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
+users:
+- default
+- gecos: User configured by VIRL Configuration Engine 0.15.3
+  lock-passwd: false
+  name: cisco
+  plain-text-passwd: cisco
+  shell: /bin/bash
+  ssh-authorized-keys:
+  - VIRL-USER-SSH-PUBLIC-KEY
+  sudo: ALL=(ALL) ALL
+write_files:
+- path: /etc/init/ttyS0.conf
+  owner: root:root
+  content: |
+    # ttyS0 - getty
+    # This service maintains a getty on ttyS0 from the point the system is
+    # started until it is shut down again.
+    start on stopped rc or RUNLEVEL=[12345]
+    stop on runlevel [!12345]
+    respawn
+    exec /sbin/getty -L 115200 ttyS0 vt102
+  permissions: '0644'
+- path: /etc/systemd/system/dhclient@.service
+  content: |
+    [Unit]
+    Description=Run dhclient on %i interface
+    After=network.target
+    [Service]
+    Type=oneshot
+    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
+    RemainAfterExit=yes
+  owner: root:root
+  permissions: '0644'
+- path: /cisco/etc/vpp-server.conf
+  owner: root:root
+  permissions: '0644'
+  content: |-
+    set interface ip address GigabitEthernet0/4/0 10.0.0.18/30
+    set interface ip address GigabitEthernet0/4/0 ::a:1:1:0:13/126
+    set interface state GigabitEthernet0/4/0 up
+    set interface ip address GigabitEthernet0/5/0 10.0.0.30/30
+    set interface ip address GigabitEthernet0/5/0 ::a:1:1:0:1f/126
+    set interface state GigabitEthernet0/5/0 up
+</entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.18" ipv6="::a:1:1:0:13" netPrefixLenV4="30" netPrefixLenV6="126"/>
+        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.30" ipv6="::a:1:1:0:1f" netPrefixLenV4="30" netPrefixLenV6="126"/>
+    </node>
+    <connection dst="/virl:topology/virl:node[5]/virl:interface[1]" src="/virl:topology/virl:node[1]/virl:interface[1]"/>
+    <connection dst="/virl:topology/virl:node[5]/virl:interface[2]" src="/virl:topology/virl:node[3]/virl:interface[1]"/>
+    <connection dst="/virl:topology/virl:node[7]/virl:interface[1]" src="/virl:topology/virl:node[5]/virl:interface[3]"/>
+    <connection dst="/virl:topology/virl:node[8]/virl:interface[1]" src="/virl:topology/virl:node[5]/virl:interface[4]"/>
+    <connection dst="/virl:topology/virl:node[6]/virl:interface[1]" src="/virl:topology/virl:node[7]/virl:interface[2]"/>
+    <connection dst="/virl:topology/virl:node[6]/virl:interface[2]" src="/virl:topology/virl:node[8]/virl:interface[2]"/>
+    <connection dst="/virl:topology/virl:node[2]/virl:interface[1]" src="/virl:topology/virl:node[6]/virl:interface[3]"/>
+    <connection dst="/virl:topology/virl:node[4]/virl:interface[1]" src="/virl:topology/virl:node[6]/virl:interface[4]"/>
+</topology>
diff --git a/src/scripts/vnet/virl/ip6sr_notes.txt b/src/scripts/vnet/virl/ip6sr_notes.txt
new file mode 100644
index 00000000..5febf2c6
--- /dev/null
+++ b/src/scripts/vnet/virl/ip6sr_notes.txt
@@ -0,0 +1,38 @@
+vpp-1, tunnel 1: iosv-1 vpp-1 vpp-3 vpp-2 iosv-2
+
+iosv-1
+::a:1:1:0:6
+
+to iosv2
+ipv6 route ::a:1:1:0:16/128 ::a:1:1:0:7
+to iosv4
+ipv6 route ::a:1:1:0:22/128 ::a:1:1:0:7
+
+vpp-1
+
+::a:1:1:0:7
+...
+::a:1:1:0:e
+
+sr tunnel src 0::a:1:1:0:6 dst 0::a:1:1:0:16/128 next 0::a:1:1:0:f next 0::a:1:1:0:1a next 0::a:1:1:0:16 tag 0::a:1:1:0:7 InPE 1 clean
+
+vpp-3
+::a:1:1:0:f
+..
+::a:1:1:0:1b
+
+comment {fix src rpf screws}
+ip route add ::a:1:1:0:6/128 via drop
+ip route add ::a:1:1:0:16/128 via drop
+ip route add ::a:1:1:0:22/128 via drop
+vpp-2
+::a:1:1:0:1a
+..
+::a:1:1:0:17
+
+sr tunnel src 0::a:1:1:0:16 dst 0::a:1:1:0:6/128 next 0::a:1:1:0:1b next 0::a:1:1:0:e next 0::a:1:1:0:6 tag 0::a:1:1:0:17 InPE 1 clean
+
+iosv-2
+::a:1:1:0:16
+
+ipv6 route ::a:1:1:0:6/128 ::a:1:1:0:17
diff --git a/src/scripts/vnet/virl/mplsogre.virl b/src/scripts/vnet/virl/mplsogre.virl
new file mode 100644
index 00000000..33dd0329
--- /dev/null
+++ b/src/scripts/vnet/virl/mplsogre.virl
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<topology xmlns="http://www.cisco.com/VIRL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="0.9" xsi:schemaLocation="http://www.cisco.com/VIRL https://raw.github.com/CiscoVIRL/schema/v0.9/virl.xsd">
+    <extensions>
+        <entry key="management_network" type="String">flat</entry>
+    </extensions>
+    <node name="vpp-1" type="SIMPLE" subtype="vPP" location="467,307" vmImage="vPP-hacker [445e503a-564e-4c14-93e1-9660957c539a]" vmFlavor="vPP-small [e7f7de38-54e3-46f1-92ef-92b0039c1c60]">
+        <extensions>
+            <entry key="config" type="string">#cloud-config
+bootcmd:
+- ln -s -t /etc/rc.d /etc/rc.local
+hostname: vpp-1
+manage_etc_hosts: true
+runcmd:
+- start ttyS0
+- systemctl start getty@ttyS0.service
+- systemctl start rc-local
+- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
+- echo &quot;UseDNS no&quot; &gt;&gt; /etc/ssh/sshd_config
+- service ssh restart
+- service sshd restart
+- sed -i 's/no-pci//' /cisco/etc/qn.conf
+- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
+users:
+- default
+- gecos: User configured by VIRL Configuration Engine 0.15.3
+  lock-passwd: false
+  name: cisco
+  plain-text-passwd: cisco
+  shell: /bin/bash
+  ssh-authorized-keys:
+  - VIRL-USER-SSH-PUBLIC-KEY
+  sudo: ALL=(ALL) ALL
+write_files:
+- path: /etc/init/ttyS0.conf
+  owner: root:root
+  content: |
+    # ttyS0 - getty
+    # This service maintains a getty on ttyS0 from the point the system is
+    # started until it is shut down again.
+    start on stopped rc or RUNLEVEL=[12345]
+    stop on runlevel [!12345]
+    respawn
+    exec /sbin/getty -L 115200 ttyS0 vt102
+  permissions: '0644'
+- path: /etc/systemd/system/dhclient@.service
+  content: |
+    [Unit]
+    Description=Run dhclient on %i interface
+    After=network.target
+    [Service]
+    Type=oneshot
+    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
+    RemainAfterExit=yes
+  owner: root:root
+  permissions: '0644'
+- path: /cisco/etc/vpp-server.conf
+  owner: root:root
+  permissions: '0644'
+  content: |-
+    set interface ip address GigabitEthernet0/4/0 10.0.0.6/30
+    set interface state GigabitEthernet0/4/0 up
+    set interface ip address GigabitEthernet0/5/0 10.0.0.9/30
+    set interface state GigabitEthernet0/5/0 up
+    mpls encap add label 30 fib 0 dest 10.0.0.10
+    mpls decap add label 30 fib 0 
+    create mpls gre tunnel src 10.0.0.9 dst 10.0.0.10 intfc 10.0.0.13/30 inner-fib-id 0 outer-fib-id 0
+</entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.6" netPrefixLenV4="30"/>
+        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.9" netPrefixLenV4="30"/>
+    </node>
+    <node name="vpp-2" type="SIMPLE" subtype="vPP" location="591,305" vmImage="vPP-hacker [445e503a-564e-4c14-93e1-9660957c539a]" vmFlavor="vPP-small [e7f7de38-54e3-46f1-92ef-92b0039c1c60]">
+        <extensions>
+            <entry key="config" type="string">#cloud-config
+bootcmd:
+- ln -s -t /etc/rc.d /etc/rc.local
+hostname: vpp-2
+manage_etc_hosts: true
+runcmd:
+- start ttyS0
+- systemctl start getty@ttyS0.service
+- systemctl start rc-local
+- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
+- echo &quot;UseDNS no&quot; &gt;&gt; /etc/ssh/sshd_config
+- service ssh restart
+- service sshd restart
+- sed -i 's/no-pci//' /cisco/etc/qn.conf
+- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
+users:
+- default
+- gecos: User configured by VIRL Configuration Engine 0.15.3
+  lock-passwd: false
+  name: cisco
+  plain-text-passwd: cisco
+  shell: /bin/bash
+  ssh-authorized-keys:
+  - VIRL-USER-SSH-PUBLIC-KEY
+  sudo: ALL=(ALL) ALL
+write_files:
+- path: /etc/init/ttyS0.conf
+  owner: root:root
+  content: |
+    # ttyS0 - getty
+    # This service maintains a getty on ttyS0 from the point the system is
+    # started until it is shut down again.
+    start on stopped rc or RUNLEVEL=[12345]
+    stop on runlevel [!12345]
+    respawn
+    exec /sbin/getty -L 115200 ttyS0 vt102
+  permissions: '0644'
+- path: /etc/systemd/system/dhclient@.service
+  content: |
+    [Unit]
+    Description=Run dhclient on %i interface
+    After=network.target
+    [Service]
+    Type=oneshot
+    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
+    RemainAfterExit=yes
+  owner: root:root
+  permissions: '0644'
+- path: /cisco/etc/vpp-server.conf
+  owner: root:root
+  permissions: '0644'
+  content: |-
+    set interface ip address GigabitEthernet0/4/0 10.0.0.10/30
+    set interface state GigabitEthernet0/4/0 up
+    set interface ip address GigabitEthernet0/5/0 10.0.0.14/30
+    set interface state GigabitEthernet0/5/0 up
+    mpls encap add label 30 fib 0 dest 10.0.0.9
+    mpls decap add label 30 fib 0 
+    create mpls gre tunnel src 10.0.0.10 dst 10.0.0.9 intfc 10.0.0.5/30 inner-fib-id 0 outer-fib-id 0
+</entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.10" netPrefixLenV4="30"/>
+        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.14" netPrefixLenV4="30"/>
+    </node>
+    <node name="iosv-1" type="SIMPLE" subtype="IOSv" location="326,311" ipv4="192.168.0.1">
+        <extensions>
+            <entry key="config" type="string">! IOS Config generated on 2015-03-03 17:26
+! by autonetkit_0.15.0
+!
+hostname iosv-1
+boot-start-marker
+boot-end-marker
+!
+no aaa new-model
+!
+!
+ip cef
+ipv6 unicast-routing
+ipv6 cef
+!
+!
+service timestamps debug datetime msec
+service timestamps log datetime msec
+no service password-encryption
+no service config
+enable password cisco
+ip classless
+ip subnet-zero
+no ip domain lookup
+line vty 0 4
+ transport input ssh telnet
+ exec-timeout 720 0
+ password cisco
+ login
+line con 0
+ password cisco
+!
+!
+interface Loopback0
+  description Loopback
+  ip address 192.168.0.1 255.255.255.255
+!
+interface GigabitEthernet0/0
+  description OOB Management
+  ! Configured on launch
+  no ip address
+  duplex auto
+  speed auto
+  no shutdown
+!
+interface GigabitEthernet0/1
+  description to vpp-1
+  ip address 10.0.0.5 255.255.255.252
+  ip ospf cost 1
+  duplex auto
+  speed auto
+  no shutdown
+!
+!
+!
+router ospf 1
+  network 192.168.0.1 0.0.0.0 area 0
+  log-adjacency-changes
+  passive-interface Loopback0
+  network 10.0.0.4 0.0.0.3 area 0
+!
+!
+router bgp 1
+  bgp router-id 192.168.0.1
+  no synchronization
+! ibgp
+  ! ibgp peers
+  !
+  neighbor 192.168.0.4 remote-as 1
+  neighbor 192.168.0.4 description iBGP peer iosv-2
+  neighbor 192.168.0.4 update-source Loopback0
+!
+!
+ !
+ address-family ipv4
+  network 192.168.0.1 mask 255.255.255.255
+  neighbor 192.168.0.4 activate
+ exit-address-family
+!
+!
+!
+ip route 10.0.0.13 255.255.255.255 10.0.0.6
+end
+</entry>
+            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.5" netPrefixLenV4="30"/>
+    </node>
+    <node name="iosv-2" type="SIMPLE" subtype="IOSv" location="741,307" ipv4="192.168.0.4">
+        <extensions>
+            <entry key="config" type="string">! IOS Config generated on 2015-03-03 17:26
+! by autonetkit_0.15.0
+!
+hostname iosv-2
+boot-start-marker
+boot-end-marker
+!
+no aaa new-model
+!
+!
+ip cef
+ipv6 unicast-routing
+ipv6 cef
+!
+!
+service timestamps debug datetime msec
+service timestamps log datetime msec
+no service password-encryption
+no service config
+enable password cisco
+ip classless
+ip subnet-zero
+no ip domain lookup
+line vty 0 4
+ transport input ssh telnet
+ exec-timeout 720 0
+ password cisco
+ login
+line con 0
+ password cisco
+!
+!
+interface Loopback0
+  description Loopback
+  ip address 192.168.0.4 255.255.255.255
+!
+interface GigabitEthernet0/0
+  description OOB Management
+  ! Configured on launch
+  no ip address
+  duplex auto
+  speed auto
+  no shutdown
+!
+interface GigabitEthernet0/1
+  description to vpp-2
+  ip address 10.0.0.13 255.255.255.252
+  ip ospf cost 1
+  duplex auto
+  speed auto
+  no shutdown
+!
+!
+!
+router ospf 1
+  network 192.168.0.4 0.0.0.0 area 0
+  log-adjacency-changes
+  passive-interface Loopback0
+  network 10.0.0.12 0.0.0.3 area 0
+!
+!
+router bgp 1
+  bgp router-id 192.168.0.4
+  no synchronization
+! ibgp
+  ! ibgp peers
+  !
+  neighbor 192.168.0.1 remote-as 1
+  neighbor 192.168.0.1 description iBGP peer iosv-1
+  neighbor 192.168.0.1 update-source Loopback0
+!
+!
+ !
+ address-family ipv4
+  network 192.168.0.4 mask 255.255.255.255
+  neighbor 192.168.0.1 activate
+ exit-address-family
+!
+!
+ip route 10.0.0.5 255.255.255.255 10.0.0.14
+!
+end
+</entry>
+            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.13" netPrefixLenV4="30"/>
+    </node>
+    <connection dst="/virl:topology/virl:node[1]/virl:interface[1]" src="/virl:topology/virl:node[3]/virl:interface[1]"/>
+    <connection dst="/virl:topology/virl:node[2]/virl:interface[1]" src="/virl:topology/virl:node[1]/virl:interface[2]"/>
+    <connection dst="/virl:topology/virl:node[4]/virl:interface[1]" src="/virl:topology/virl:node[2]/virl:interface[2]"/>
+</topology>
diff --git a/src/scripts/vnet/virl/simple.virl b/src/scripts/vnet/virl/simple.virl
new file mode 100644
index 00000000..6033c42c
--- /dev/null
+++ b/src/scripts/vnet/virl/simple.virl
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<topology xmlns="http://www.cisco.com/VIRL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="0.9" xsi:schemaLocation="http://www.cisco.com/VIRL https://raw.github.com/CiscoVIRL/schema/v0.9/virl.xsd">
+    <extensions>
+        <entry key="management_network" type="String">flat</entry>
+    </extensions>
+    <node name="iosv-1" type="SIMPLE" subtype="IOSv" location="427,219" ipv4="192.168.0.2">
+        <extensions>
+            <entry key="config" type="string">!
+! Last configuration change at 14:27:32 UTC Fri Mar 27 2015
+!
+version 15.4
+service timestamps debug datetime msec
+service timestamps log datetime msec
+no service password-encryption
+!
+hostname iosv-1
+!
+boot-start-marker
+boot-end-marker
+!
+!
+enable password cisco
+!
+no aaa new-model
+!
+!
+!
+mmi polling-interval 60
+no mmi auto-configure
+no mmi pvc
+mmi snmp-timeout 180
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+no ip domain lookup
+ip cef
+ipv6 unicast-routing
+ipv6 cef
+!
+multilink bundle-name authenticated
+!
+!
+cts logging verbose
+!
+!
+!
+redundancy
+!
+!
+! 
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+interface Loopback0
+ description Loopback
+ ip address 192.168.0.2 255.255.255.255
+!
+interface GigabitEthernet0/0
+ description OOB Management
+ ip address 172.16.1.167 255.255.255.0
+ duplex auto
+ speed auto
+ media-type rj45
+!
+interface GigabitEthernet0/1
+ description to vpp-1
+ ip address 10.0.0.5 255.255.255.252
+ ip ospf cost 1
+ duplex auto
+ speed auto
+ media-type rj45
+!
+router ospf 1
+ passive-interface Loopback0
+ network 10.0.0.4 0.0.0.3 area 0
+ network 192.168.0.2 0.0.0.0 area 0
+!
+router bgp 1
+ bgp router-id 192.168.0.2
+ bgp log-neighbor-changes
+ neighbor 192.168.0.3 remote-as 1
+ neighbor 192.168.0.3 description iBGP peer iosv-2
+ neighbor 192.168.0.3 update-source Loopback0
+ !
+ address-family ipv4
+  network 192.168.0.2 mask 255.255.255.255
+  neighbor 192.168.0.3 activate
+ exit-address-family
+!
+ip forward-protocol nd
+!
+!
+no ip http server
+no ip http secure-server
+ip route 10.0.0.9 255.255.255.255 10.0.0.6
+!
+!
+!
+!
+control-plane
+!
+banner exec `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+banner incoming `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+banner login `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+!
+line con 0
+ password cisco
+line aux 0
+line vty 0 4
+ exec-timeout 720 0
+ password cisco
+ login
+ transport input telnet ssh
+!
+no scheduler allocate
+!
+end</entry>
+            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.5" netPrefixLenV4="30"/>
+    </node>
+    <node name="iosv-2" type="SIMPLE" subtype="IOSv" location="704,221" ipv4="192.168.0.3">
+        <extensions>
+            <entry key="config" type="string">!
+! Last configuration change at 14:26:58 UTC Fri Mar 27 2015
+!
+version 15.4
+service timestamps debug datetime msec
+service timestamps log datetime msec
+no service password-encryption
+!
+hostname iosv-2
+!
+boot-start-marker
+boot-end-marker
+!
+!
+enable password cisco
+!
+no aaa new-model
+!
+!
+!
+mmi polling-interval 60
+no mmi auto-configure
+no mmi pvc
+mmi snmp-timeout 180
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+no ip domain lookup
+ip cef
+ipv6 unicast-routing
+ipv6 cef
+!
+multilink bundle-name authenticated
+!
+!
+cts logging verbose
+!
+!
+!
+redundancy
+!
+!
+! 
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+!
+interface Loopback0
+ description Loopback
+ ip address 192.168.0.3 255.255.255.255
+!
+interface GigabitEthernet0/0
+ description OOB Management
+ ip address 172.16.1.164 255.255.255.0
+ duplex auto
+ speed auto
+ media-type rj45
+!
+interface GigabitEthernet0/1
+ description to vpp-1
+ ip address 10.0.0.9 255.255.255.252
+ ip ospf cost 1
+ duplex auto
+ speed auto
+ media-type rj45
+!
+router ospf 1
+ passive-interface Loopback0
+ network 10.0.0.8 0.0.0.3 area 0
+ network 192.168.0.3 0.0.0.0 area 0
+!
+router bgp 1
+ bgp router-id 192.168.0.3
+ bgp log-neighbor-changes
+ neighbor 192.168.0.2 remote-as 1
+ neighbor 192.168.0.2 description iBGP peer iosv-1
+ neighbor 192.168.0.2 update-source Loopback0
+ !
+ address-family ipv4
+  network 192.168.0.3 mask 255.255.255.255
+  neighbor 192.168.0.2 activate
+ exit-address-family
+!
+ip forward-protocol nd
+!
+!
+no ip http server
+no ip http secure-server
+ip route 10.0.0.5 255.255.255.255 10.0.0.10
+!
+!
+!
+!
+control-plane
+!
+banner exec `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+banner incoming `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+banner login `
+**************************************************************************
+* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
+* education. IOSv is provided as-is and is not supported by Cisco's      *
+* Technical Advisory Center. Any use or disclosure, in whole or in part, *
+* of the IOSv Software or Documentation to any third party for any       *
+* purposes is expressly prohibited except as otherwise authorized by     *
+* Cisco in writing.                                                      *
+**************************************************************************`
+!
+line con 0
+ password cisco
+line aux 0
+line vty 0 4
+ exec-timeout 720 0
+ password cisco
+ login
+ transport input telnet ssh
+!
+no scheduler allocate
+!
+end</entry>
+            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.9" netPrefixLenV4="30"/>
+    </node>
+    <node name="vpp-1" type="SIMPLE" subtype="vPP" location="561,217">
+        <extensions>
+            <entry key="config" type="string">#cloud-config
+bootcmd:
+- ln -s -t /etc/rc.d /etc/rc.local
+hostname: vpp-1
+manage_etc_hosts: true
+runcmd:
+- start ttyS0
+- systemctl start getty@ttyS0.service
+- systemctl start rc-local
+- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
+- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
+- service ssh restart
+- service sshd restart
+- sed -i 's/no-pci//' /cisco/etc/qn.conf
+- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
+users:
+- default
+- gecos: User configured by VIRL Configuration Engine 0.15.3
+  lock-passwd: false
+  name: cisco
+  plain-text-passwd: cisco
+  shell: /bin/bash
+  ssh-authorized-keys:
+  - VIRL-USER-SSH-PUBLIC-KEY
+  sudo: ALL=(ALL) ALL
+write_files:
+- path: /etc/init/ttyS0.conf
+  owner: root:root
+  content: |
+    # ttyS0 - getty
+    # This service maintains a getty on ttyS0 from the point the system is
+    # started until it is shut down again.
+    start on stopped rc or RUNLEVEL=[12345]
+    stop on runlevel [!12345]
+    respawn
+    exec /sbin/getty -L 115200 ttyS0 vt102
+  permissions: '0644'
+- path: /etc/systemd/system/dhclient@.service
+  content: |
+    [Unit]
+    Description=Run dhclient on %i interface
+    After=network.target
+    [Service]
+    Type=oneshot
+    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
+    RemainAfterExit=yes
+  owner: root:root
+  permissions: '0644'
+- path: /cisco/etc/vpp-server.conf
+  owner: root:root
+  permissions: '0644'
+  content: |-
+    set interface ip address GigabitEthernet0/4/0 10.0.0.6/30
+    set interface state GigabitEthernet0/4/0 up
+    set interface ip address GigabitEthernet0/5/0 10.0.0.10/30
+    set interface state GigabitEthernet0/5/0 up
+</entry>
+        </extensions>
+        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.6" netPrefixLenV4="30"/>
+        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.10" netPrefixLenV4="30"/>
+    </node>
+    <connection dst="/virl:topology/virl:node[3]/virl:interface[1]" src="/virl:topology/virl:node[1]/virl:interface[1]"/>
+    <connection dst="/virl:topology/virl:node[2]/virl:interface[1]" src="/virl:topology/virl:node[3]/virl:interface[2]"/>
+</topology>
diff --git a/src/scripts/vnet/vlan b/src/scripts/vnet/vlan
new file mode 100644
index 00000000..076080a6
--- /dev/null
+++ b/src/scripts/vnet/vlan
@@ -0,0 +1,23 @@
+int create-ethernet
+int create-sub fake-eth0 1
+set int state fake-eth0 up
+set int state fake-eth0.1 up
+
+packet-generator new {
+  name x
+  limit 1
+  node ethernet-input
+  interface fake-eth0
+  size 64-64
+  no-recycle
+  data {
+    IP4: 1.2.3 -> 4.5.6 vlan 1
+    ICMP: 1.2.3.4 -> 5.6.7.8
+    ICMP echo_request
+    incrementing 100
+  }
+}
+
+tr add pg-input 100
+ip route 5.6.7.8/32 via local
+ip route 1.2.3.4/32 via local
diff --git a/src/scripts/vppctl b/src/scripts/vppctl
new file mode 100755
index 00000000..4fdf03c7
--- /dev/null
+++ b/src/scripts/vppctl
@@ -0,0 +1,121 @@
+#! /usr/bin/python
+'''
+Copyright 2016 Intel Corporation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
+
+from cmd import Cmd
+import os
+import subprocess
+import re
+import sys
+try:
+        import readline
+except ImportError:
+        readline = None
+
+persishist = os.path.expanduser('~/.vpphistory')
+persishist_size = 1000
+if not persishist:
+        os.mknod(persishist, stat.S_IFREG)
+
+class Vppctl(Cmd):
+
+        def historyWrite(self):
+                if readline:
+                        readline.set_history_length(persishist_size)
+                        readline.write_history_file(persishist)
+
+        def runVat(self, line):
+                input_prefix = "exec "
+                input_command = input_prefix + line
+                line_remove = '^load_one_plugin:'
+                s = '\n'
+                command = ['vpp_api_test']
+
+                if os.geteuid() != 0:
+                    command = ['sudo', 'vpp_api_test']
+
+                vpp_process = subprocess.Popen(command,
+                        stderr=subprocess.PIPE,
+                        stdin=subprocess.PIPE,
+                        stdout=subprocess.PIPE)
+                stdout_value = vpp_process.communicate(input_command)[0]
+
+                buffer_stdout = stdout_value.splitlines()
+
+                buffer_stdout[:]  = [b for b in buffer_stdout
+                        if line_remove not in b]
+
+                for i, num in enumerate(buffer_stdout):
+                        buffer_stdout[i] = num.replace('vat# ','')
+
+                stdout_value = s.join(buffer_stdout)
+                print stdout_value
+
+        def do_help(self, line):
+                self.runVat("help")
+
+        def default(self, line):
+                self.runVat(line)
+
+        def do_exit(self, line):
+                self.historyWrite()
+                raise SystemExit
+
+        def emptyline(self):
+                pass
+
+        def do_EOF(self,line):
+                self.historyWrite()
+                sys.stdout.write('\n')
+                raise SystemExit
+
+        def preloop(self):
+                if readline and os.path.exists(persishist):
+                        readline.read_history_file(persishist)
+
+        def postcmd(self, stop, line):
+                self.historyWrite()
+
+if __name__ == '__main__':
+        command_args = sys.argv
+
+
+        if not len(command_args) > 1:
+                prompt = Vppctl()
+                red_set = '\033[31m'
+                norm_set = '\033[0m'
+                if sys.stdout.isatty():
+                        prompt.prompt = 'vpp# '
+                        try:
+                                prompt.cmdloop(red_set + "    _______    _       " + norm_set + " _   _____  ___ \n" +
+                                        red_set + " __/ __/ _ \  (_)__   " + norm_set + " | | / / _ \/ _ \\\n" +
+                                        red_set + " _/ _// // / / / _ \\" + norm_set + "   | |/ / ___/ ___/\n" +
+                                        red_set + " /_/ /____(_)_/\___/   " + norm_set + "|___/_/  /_/   \n")
+                        except KeyboardInterrupt:
+                                sys.stdout.write('\n')
+                else:
+                        try:
+                                prompt.cmdloop()
+                        except KeyboardInterrupt:
+                                sys.stdout.write('\n')
+        else:
+                del command_args[0]
+                stdout_value = " ".join(command_args)
+                VatAddress = Vppctl()
+                VatAddress.runVat(stdout_value)
+
+
+
diff --git a/src/suffix-rules.mk b/src/suffix-rules.mk
new file mode 100644
index 00000000..e3eeb922
--- /dev/null
+++ b/src/suffix-rules.mk
@@ -0,0 +1,27 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Shared suffix rules
+# Please do not set "SUFFIXES = .api.h .api" here
+
+%.api.h: %.api
+	@echo "  APIGEN  " $@ ;					\
+	mkdir -p `dirname $@` ;					\
+	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
+	| vppapigen --input - --output $@ --show-name $@
+
+%.api.json: %.api
+	@echo "  JSON APIGEN  " $@ ;				\
+	mkdir -p `dirname $@` ;					\
+	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
+	| vppapigen --input - --json $@
diff --git a/src/svm.am b/src/svm.am
new file mode 100644
index 00000000..d91eaa27
--- /dev/null
+++ b/src/svm.am
@@ -0,0 +1,31 @@
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bin_PROGRAMS += svmtool svmdbtool
+
+nobase_include_HEADERS += svm/svm.h svm/ssvm.h svm/svmdb.h
+
+libsvmdir = ${libdir}
+libsvm_LTLIBRARIES = libsvm.la libsvmdb.la
+
+libsvm_la_SOURCES = svm/svm.c svm/ssvm.c
+
+svmtool_SOURCES = svm/svmtool.c
+svmtool_LDADD = libsvm.la libvppinfra.la -lpthread -lrt
+
+libsvmdb_la_SOURCES = svm/svmdb.c
+
+svmdbtool_SOURCES = svm/svmdbtool.c
+svmdbtool_LDADD = libsvmdb.la libsvm.la libvppinfra.la -lpthread -lrt
+
+# vi:syntax=automake
diff --git a/src/svm/dir.dox b/src/svm/dir.dox
new file mode 100644
index 00000000..83246979
--- /dev/null
+++ b/src/svm/dir.dox
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Doxygen directory documentation */
+/**
+@dir
+@brief Shared virtual memory allocation library.
+*/
diff --git a/src/svm/persist.c b/src/svm/persist.c
new file mode 100644
index 00000000..023c596b
--- /dev/null
+++ b/src/svm/persist.c
@@ -0,0 +1,258 @@
+/*
+ *------------------------------------------------------------------
+ * persist.c - persistent data structure storage test / demo code
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <time.h>
+#include <fcntl.h>
+#include <string.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/time.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/format.h>
+#include <vppinfra/serialize.h>
+#include <svmdb.h>
+
+typedef struct
+{
+  svmdb_client_t *c;
+} persist_main_t;
+
+persist_main_t persist_main;
+
+typedef struct
+{
+  u8 *string1;
+  u8 *string2;
+} demo_struct2_t;
+
+typedef struct
+{
+  demo_struct2_t *demo2;
+  u8 *name;
+} demo_struct1_t;
+
+/*
+ * Data structures in persistent shared memory, all the time
+ */
+clib_error_t *
+persist_malloc (persist_main_t * pm)
+{
+  demo_struct2_t *demo2;
+  demo_struct1_t *demo1;
+  time_t starttime = time (0);
+  char *datestring = ctime (&starttime);
+  void *oldheap;
+
+  /* Get back the root pointer */
+  demo1 = svmdb_local_get_variable_reference
+    (pm->c, SVMDB_NAMESPACE_VEC, "demo1_location");
+
+  /* It doesnt exist create our data structures */
+  if (demo1 == 0)
+    {
+      /* If you want MP / thread safety, lock the region... */
+      pthread_mutex_lock (&pm->c->db_rp->mutex);
+
+      /* Switch to the shared memory region heap */
+      oldheap = svm_push_data_heap (pm->c->db_rp);
+
+      /* Allocate the top-level structure as a single element vector */
+      vec_validate (demo1, 0);
+
+      /* Allocate the next-level structure as a plain old memory obj */
+      demo2 = clib_mem_alloc (sizeof (*demo2));
+
+      demo1->demo2 = demo2;
+      demo1->name = format (0, "My name is Ishmael%c", 0);
+      demo2->string1 = format (0, "Here is string1%c", 0);
+      demo2->string2 = format (0, "Born at %s%c", datestring, 0);
+
+      /* Back to the process-private heap */
+      svm_pop_heap (oldheap);
+      pthread_mutex_unlock (&pm->c->db_rp->mutex);
+
+      /*
+       * Set the root pointer. Note: this guy switches heaps, locks, etc.
+       * We allocated demo1 as a vector to make this "just work..."
+       */
+      svmdb_local_set_vec_variable (pm->c, "demo1_location",
+				    demo1, sizeof (demo1));
+
+    }
+  else
+    {
+      /* retrieve and print data from shared memory */
+      demo2 = demo1->demo2;
+      fformat (stdout, "name: %s\n", demo1->name);
+      fformat (stdout, "demo2 location: %llx\n", demo2);
+      fformat (stdout, "string1: %s\n", demo2->string1);
+      fformat (stdout, "string2: %s\n", demo2->string2);
+    }
+  return 0;
+}
+
+void
+unserialize_demo1 (serialize_main_t * sm, va_list * args)
+{
+  demo_struct1_t **result = va_arg (*args, demo_struct1_t **);
+  demo_struct1_t *demo1;
+  demo_struct2_t *demo2;
+
+  /* Allocate data structures in process private memory */
+  demo1 = clib_mem_alloc (sizeof (*demo1));
+  demo2 = clib_mem_alloc (sizeof (*demo2));
+  demo1->demo2 = demo2;
+
+  /* retrieve data from shared memory checkpoint */
+  unserialize_cstring (sm, (char **) &demo1->name);
+  unserialize_cstring (sm, (char **) &demo2->string1);
+  unserialize_cstring (sm, (char **) &demo2->string2);
+  *result = demo1;
+}
+
+void
+serialize_demo1 (serialize_main_t * sm, va_list * args)
+{
+  demo_struct1_t *demo1 = va_arg (*args, demo_struct1_t *);
+  demo_struct2_t *demo2 = demo1->demo2;
+
+  serialize_cstring (sm, (char *) demo1->name);
+  serialize_cstring (sm, (char *) demo2->string1);
+  serialize_cstring (sm, (char *) demo2->string2);
+}
+
+/* Serialize / unserialize variant */
+clib_error_t *
+persist_serialize (persist_main_t * pm)
+{
+  u8 *checkpoint;
+  serialize_main_t sm;
+
+  demo_struct2_t *demo2;
+  demo_struct1_t *demo1;
+  time_t starttime = time (0);
+  char *datestring = ctime (&starttime);
+
+  /* Get back the root pointer */
+  checkpoint = svmdb_local_get_vec_variable (pm->c, "demo1_checkpoint",
+					     sizeof (u8));
+
+  /* It doesnt exist create our data structures */
+  if (checkpoint == 0)
+    {
+      /* Allocate data structures in process-private memory */
+      demo1 = clib_mem_alloc (sizeof (*demo2));
+      vec_validate (demo1, 0);
+      demo2 = clib_mem_alloc (sizeof (*demo2));
+
+      demo1->demo2 = demo2;
+      demo1->name = format (0, "My name is Ishmael%c", 0);
+      demo2->string1 = format (0, "Here is string1%c", 0);
+      demo2->string2 = format (0, "Born at %s%c", datestring, 0);
+
+      /* Create checkpoint */
+      serialize_open_vector (&sm, checkpoint);
+      serialize (&sm, serialize_demo1, demo1);
+      checkpoint = serialize_close_vector (&sm);
+
+      /* Copy checkpoint into shared memory */
+      svmdb_local_set_vec_variable (pm->c, "demo1_checkpoint",
+				    checkpoint, sizeof (u8));
+      /* Toss the process-private-memory original.. */
+      vec_free (checkpoint);
+    }
+  else
+    {
+      /* Open the checkpoint */
+      unserialize_open_data (&sm, checkpoint, vec_len (checkpoint));
+      unserialize (&sm, unserialize_demo1, &demo1);
+
+      /* Toss the process-private-memory checkpoint copy */
+      vec_free (checkpoint);
+
+      /* Off we go... */
+      demo2 = demo1->demo2;
+      fformat (stdout, "name: %s\n", demo1->name);
+      fformat (stdout, "demo2 location: %llx\n", demo2);
+      fformat (stdout, "string1: %s\n", demo2->string1);
+      fformat (stdout, "string2: %s\n", demo2->string2);
+    }
+  return 0;
+}
+
+
+int
+main (int argc, char **argv)
+{
+  unformat_input_t _input, *input = &_input;
+  persist_main_t *pm = &persist_main;
+  clib_error_t *error = 0;
+
+  /* Make a 4mb database arena, chroot so it's truly private */
+  pm->c = svmdb_map_chroot_size ("/ptest", 4 << 20);
+
+  ASSERT (pm->c);
+
+  unformat_init_command_line (input, argv);
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "malloc"))
+	error = persist_malloc (pm);
+      else if (unformat (input, "serialize"))
+	error = persist_serialize (pm);
+      else
+	{
+	  error = clib_error_return (0, "Unknown flavor '%U'",
+				     format_unformat_error, input);
+	  break;
+	}
+    }
+
+  svmdb_unmap (pm->c);
+
+  if (error)
+    {
+      clib_error_report (error);
+      exit (1);
+    }
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/svm/ssvm.c b/src/svm/ssvm.c
new file mode 100644
index 00000000..6f409eb6
--- /dev/null
+++ b/src/svm/ssvm.c
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "ssvm.h"
+
+int
+ssvm_master_init (ssvm_private_t * ssvm, u32 master_index)
+{
+  int ssvm_fd;
+  u8 *ssvm_filename;
+  u8 junk = 0;
+  int flags;
+  ssvm_shared_header_t *sh;
+  u64 ticks = clib_cpu_time_now ();
+  u64 randomize_baseva;
+  void *oldheap;
+
+  if (ssvm->ssvm_size == 0)
+    return SSVM_API_ERROR_NO_SIZE;
+
+  ssvm_filename = format (0, "/dev/shm/%s%c", ssvm->name, 0);
+
+  unlink ((char *) ssvm_filename);
+
+  vec_free (ssvm_filename);
+
+  ssvm_fd = shm_open ((char *) ssvm->name, O_RDWR | O_CREAT | O_EXCL, 0777);
+
+  if (ssvm_fd < 0)
+    {
+      clib_unix_warning ("create segment '%s'", ssvm->name);
+      return SSVM_API_ERROR_CREATE_FAILURE;
+    }
+
+  if (lseek (ssvm_fd, ssvm->ssvm_size, SEEK_SET) < 0)
+    {
+      clib_unix_warning ("lseek");
+      close (ssvm_fd);
+      return SSVM_API_ERROR_SET_SIZE;
+    }
+
+  if (write (ssvm_fd, &junk, 1) != 1)
+    {
+      clib_unix_warning ("set ssvm size");
+      close (ssvm_fd);
+      return SSVM_API_ERROR_SET_SIZE;
+    }
+
+  flags = MAP_SHARED;
+  if (ssvm->requested_va)
+    flags |= MAP_FIXED;
+
+  randomize_baseva = (ticks & 15) * MMAP_PAGESIZE;
+
+  if (ssvm->requested_va)
+    ssvm->requested_va += randomize_baseva;
+
+  sh = ssvm->sh =
+    (ssvm_shared_header_t *) mmap ((void *) ssvm->requested_va,
+				   ssvm->ssvm_size, PROT_READ | PROT_WRITE,
+				   flags, ssvm_fd, 0);
+
+  if (ssvm->sh == MAP_FAILED)
+    {
+      clib_unix_warning ("mmap");
+      close (ssvm_fd);
+      return SSVM_API_ERROR_MMAP;
+    }
+
+  close (ssvm_fd);
+
+  ssvm->my_pid = getpid ();
+  sh->master_pid = ssvm->my_pid;
+  sh->ssvm_size = ssvm->ssvm_size;
+  sh->heap = mheap_alloc_with_flags
+    (((u8 *) sh) + MMAP_PAGESIZE, ssvm->ssvm_size - MMAP_PAGESIZE,
+     MHEAP_FLAG_DISABLE_VM | MHEAP_FLAG_THREAD_SAFE);
+
+  sh->ssvm_va = pointer_to_uword (sh);
+  sh->master_index = master_index;
+
+  oldheap = ssvm_push_heap (sh);
+  sh->name = format (0, "%s%c", ssvm->name, 0);
+  ssvm_pop_heap (oldheap);
+
+  ssvm->i_am_master = 1;
+
+  /* The application has to set set sh->ready... */
+  return 0;
+}
+
+int
+ssvm_slave_init (ssvm_private_t * ssvm, int timeout_in_seconds)
+{
+  struct stat stat;
+  int ssvm_fd = -1;
+  ssvm_shared_header_t *sh;
+
+  ssvm->i_am_master = 0;
+
+  while (timeout_in_seconds-- > 0)
+    {
+      if (ssvm_fd < 0)
+	ssvm_fd = shm_open ((char *) ssvm->name, O_RDWR, 0777);
+      if (ssvm_fd < 0)
+	{
+	  sleep (1);
+	  continue;
+	}
+      if (fstat (ssvm_fd, &stat) < 0)
+	{
+	  sleep (1);
+	  continue;
+	}
+
+      if (stat.st_size > 0)
+	goto map_it;
+    }
+  clib_warning ("slave timeout");
+  return SSVM_API_ERROR_SLAVE_TIMEOUT;
+
+map_it:
+  sh = (void *) mmap (0, MMAP_PAGESIZE, PROT_READ | PROT_WRITE, MAP_SHARED,
+		      ssvm_fd, 0);
+  if (sh == MAP_FAILED)
+    {
+      clib_unix_warning ("slave research mmap");
+      close (ssvm_fd);
+      return SSVM_API_ERROR_MMAP;
+    }
+
+  while (timeout_in_seconds-- > 0)
+    {
+      if (sh->ready)
+	goto re_map_it;
+    }
+  close (ssvm_fd);
+  munmap (sh, MMAP_PAGESIZE);
+  clib_warning ("slave timeout 2");
+  return SSVM_API_ERROR_SLAVE_TIMEOUT;
+
+re_map_it:
+  ssvm->requested_va = (u64) sh->ssvm_va;
+  ssvm->ssvm_size = sh->ssvm_size;
+  munmap (sh, MMAP_PAGESIZE);
+
+  sh = ssvm->sh = (void *) mmap ((void *) ssvm->requested_va, ssvm->ssvm_size,
+				 PROT_READ | PROT_WRITE,
+				 MAP_SHARED | MAP_FIXED, ssvm_fd, 0);
+
+  if (sh == MAP_FAILED)
+    {
+      clib_unix_warning ("slave final mmap");
+      close (ssvm_fd);
+      return SSVM_API_ERROR_MMAP;
+    }
+  sh->slave_pid = getpid ();
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/svm/ssvm.h b/src/svm/ssvm.h
new file mode 100644
index 00000000..9e61b9a0
--- /dev/null
+++ b/src/svm/ssvm.h
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_ssvm_h__
+#define __included_ssvm_h__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <time.h>
+#include <fcntl.h>
+#include <string.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/time.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/format.h>
+
+#define MMAP_PAGESIZE (4<<10)
+#define SSVM_N_OPAQUE 7
+
+typedef struct
+{
+  /* Spin-lock */
+  volatile u32 lock;
+  volatile u32 owner_pid;
+  int recursion_count;
+  u32 tag;			/* for debugging */
+
+  /* The allocation arena */
+  void *heap;
+
+  /* Segment must be mapped at this address, or no supper */
+  u64 ssvm_va;
+  /* The actual mmap size */
+  u64 ssvm_size;
+  u32 master_pid;
+  u32 slave_pid;
+  u8 *name;
+  void *opaque[SSVM_N_OPAQUE];
+
+  /* Set when the master application thinks it's time to make the donuts */
+  volatile u32 ready;
+
+  /* Needed to make unique MAC addresses, etc. */
+  u32 master_index;
+} ssvm_shared_header_t;
+
+typedef struct
+{
+  ssvm_shared_header_t *sh;
+  u64 ssvm_size;
+  u32 my_pid;
+  u32 vlib_hw_if_index;
+  u8 *name;
+  uword requested_va;
+  int i_am_master;
+  u32 per_interface_next_index;
+  u32 *rx_queue;
+} ssvm_private_t;
+
+always_inline void
+ssvm_lock (ssvm_shared_header_t * h, u32 my_pid, u32 tag)
+{
+  if (h->owner_pid == my_pid)
+    {
+      h->recursion_count++;
+      return;
+    }
+
+  while (__sync_lock_test_and_set (&h->lock, 1))
+    ;
+
+  h->owner_pid = my_pid;
+  h->recursion_count = 1;
+  h->tag = tag;
+}
+
+always_inline void
+ssvm_unlock (ssvm_shared_header_t * h)
+{
+  if (--h->recursion_count == 0)
+    {
+      h->owner_pid = 0;
+      h->tag = 0;
+      CLIB_MEMORY_BARRIER ();
+      h->lock = 0;
+    }
+}
+
+static inline void *
+ssvm_push_heap (ssvm_shared_header_t * sh)
+{
+  u8 *oldheap;
+  oldheap = clib_mem_set_heap (sh->heap);
+  return ((void *) oldheap);
+}
+
+static inline void
+ssvm_pop_heap (void *oldheap)
+{
+  clib_mem_set_heap (oldheap);
+}
+
+#define foreach_ssvm_api_error                  \
+_(NO_NAME, "No shared segment name", -10)       \
+_(NO_SIZE, "Size not set (master)", -11)        \
+_(CREATE_FAILURE, "Create failed", -12)		\
+_(SET_SIZE, "Set size failed", -13)		\
+_(MMAP, "mmap failed", -14)			\
+_(SLAVE_TIMEOUT, "Slave map timeout", -15)
+
+typedef enum
+{
+#define _(n,s,c) SSVM_API_ERROR_##n = c,
+  foreach_ssvm_api_error
+#undef _
+} ssvm_api_error_enum_t;
+
+#define SSVM_API_ERROR_NO_NAME	(-10)
+
+int ssvm_master_init (ssvm_private_t * ssvm, u32 master_index);
+int ssvm_slave_init (ssvm_private_t * ssvm, int timeout_in_seconds);
+
+#endif /* __included_ssvm_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/svm/svm.c b/src/svm/svm.c
new file mode 100644
index 00000000..e4ca98e1
--- /dev/null
+++ b/src/svm/svm.c
@@ -0,0 +1,1237 @@
+/*
+ *------------------------------------------------------------------
+ * svm.c - shared VM allocation, mmap(...MAP_FIXED...)
+ * library
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <time.h>
+#include <fcntl.h>
+#include <string.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/time.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/format.h>
+
+#include "svm.h"
+
+static svm_region_t *root_rp;
+static int root_rp_refcount;
+
+#define MAXLOCK 2
+static pthread_mutex_t *mutexes_held[MAXLOCK];
+static int nheld;
+
+svm_region_t *
+svm_get_root_rp (void)
+{
+  return root_rp;
+}
+
+#define MUTEX_DEBUG
+
+static void
+region_lock (svm_region_t * rp, int tag)
+{
+  pthread_mutex_lock (&rp->mutex);
+#ifdef MUTEX_DEBUG
+  rp->mutex_owner_pid = getpid ();
+  rp->mutex_owner_tag = tag;
+#endif
+  ASSERT (nheld < MAXLOCK);
+  /*
+   * Keep score of held mutexes so we can try to exit
+   * cleanly if the world comes to an end at the worst possible
+   * moment
+   */
+  mutexes_held[nheld++] = &rp->mutex;
+}
+
+static void
+region_unlock (svm_region_t * rp)
+{
+  int i, j;
+#ifdef MUTEX_DEBUG
+  rp->mutex_owner_pid = 0;
+  rp->mutex_owner_tag = 0;
+#endif
+
+  for (i = nheld - 1; i >= 0; i--)
+    {
+      if (mutexes_held[i] == &rp->mutex)
+	{
+	  for (j = i; j < MAXLOCK - 1; j++)
+	    mutexes_held[j] = mutexes_held[j + 1];
+	  nheld--;
+	  goto found;
+	}
+    }
+  ASSERT (0);
+
+found:
+  CLIB_MEMORY_BARRIER ();
+  pthread_mutex_unlock (&rp->mutex);
+}
+
+
+static u8 *
+format_svm_flags (u8 * s, va_list * args)
+{
+  uword f = va_arg (*args, uword);
+
+  if (f & SVM_FLAGS_MHEAP)
+    s = format (s, "MHEAP ");
+  if (f & SVM_FLAGS_FILE)
+    s = format (s, "FILE ");
+  if (f & SVM_FLAGS_NODATA)
+    s = format (s, "NODATA ");
+  if (f & SVM_FLAGS_NEED_DATA_INIT)
+    s = format (s, "INIT ");
+
+  return (s);
+}
+
+static u8 *
+format_svm_size (u8 * s, va_list * args)
+{
+  uword size = va_arg (*args, uword);
+
+  if (size >= (1 << 20))
+    {
+      s = format (s, "(%d mb)", size >> 20);
+    }
+  else if (size >= (1 << 10))
+    {
+      s = format (s, "(%d kb)", size >> 10);
+    }
+  else
+    {
+      s = format (s, "(%d bytes)", size);
+    }
+  return (s);
+}
+
+u8 *
+format_svm_region (u8 * s, va_list * args)
+{
+  svm_region_t *rp = va_arg (*args, svm_region_t *);
+  int verbose = va_arg (*args, int);
+  int i;
+  uword lo, hi;
+
+  s = format (s, "%s: base va 0x%x size 0x%x %U\n",
+	      rp->region_name, rp->virtual_base,
+	      rp->virtual_size, format_svm_size, rp->virtual_size);
+  s = format (s, "  user_ctx 0x%x, bitmap_size %d\n",
+	      rp->user_ctx, rp->bitmap_size);
+
+  if (verbose)
+    {
+      s = format (s, "  flags: 0x%x %U\n", rp->flags,
+		  format_svm_flags, rp->flags);
+      s = format (s,
+		  "  region_heap 0x%x data_base 0x%x data_heap 0x%x\n",
+		  rp->region_heap, rp->data_base, rp->data_heap);
+    }
+
+  s = format (s, "  %d clients, pids: ", vec_len (rp->client_pids));
+
+  for (i = 0; i < vec_len (rp->client_pids); i++)
+    s = format (s, "%d ", rp->client_pids[i]);
+
+  s = format (s, "\n");
+
+  if (verbose)
+    {
+      lo = hi = ~0;
+
+      s = format (s, "  VM in use: ");
+
+      for (i = 0; i < rp->bitmap_size; i++)
+	{
+	  if (clib_bitmap_get_no_check (rp->bitmap, i) != 0)
+	    {
+	      if (lo == ~0)
+		{
+		  hi = lo = rp->virtual_base + i * MMAP_PAGESIZE;
+		}
+	      else
+		{
+		  hi = rp->virtual_base + i * MMAP_PAGESIZE;
+		}
+	    }
+	  else
+	    {
+	      if (lo != ~0)
+		{
+		  hi = rp->virtual_base + i * MMAP_PAGESIZE - 1;
+		  s = format (s, "   0x%x - 0x%x (%dk)\n", lo, hi,
+			      (hi - lo) >> 10);
+		  lo = hi = ~0;
+		}
+	    }
+	}
+      s = format (s, "  rgn heap stats: %U", format_mheap,
+		  rp->region_heap, 0);
+      if ((rp->flags & SVM_FLAGS_MHEAP) && rp->data_heap)
+	{
+	  s = format (s, "\n  data heap stats: %U", format_mheap,
+		      rp->data_heap, 1);
+	}
+      s = format (s, "\n");
+    }
+
+  return (s);
+}
+
+/*
+ * rnd_pagesize
+ * Round to a pagesize multiple, presumably 4k works
+ */
+static u64
+rnd_pagesize (u64 size)
+{
+  u64 rv;
+
+  rv = (size + (MMAP_PAGESIZE - 1)) & ~(MMAP_PAGESIZE - 1);
+  return (rv);
+}
+
+/*
+ * svm_data_region_setup
+ */
+static int
+svm_data_region_create (svm_map_region_args_t * a, svm_region_t * rp)
+{
+  int fd;
+  u8 junk = 0;
+  uword map_size;
+
+  map_size = rp->virtual_size - (MMAP_PAGESIZE +
+				 (a->pvt_heap_size ? a->pvt_heap_size :
+				  SVM_PVT_MHEAP_SIZE));
+
+  if (a->flags & SVM_FLAGS_FILE)
+    {
+      struct stat statb;
+
+      fd = open (a->backing_file, O_RDWR | O_CREAT, 0777);
+
+      if (fd < 0)
+	{
+	  clib_unix_warning ("open");
+	  return -1;
+	}
+
+      if (fstat (fd, &statb) < 0)
+	{
+	  clib_unix_warning ("fstat");
+	  close (fd);
+	  return -2;
+	}
+
+      if (statb.st_mode & S_IFREG)
+	{
+	  if (statb.st_size == 0)
+	    {
+	      if (lseek (fd, map_size, SEEK_SET) == (off_t) - 1)
+		{
+		  clib_unix_warning ("seek region size");
+		  close (fd);
+		  return -3;
+		}
+	      if (write (fd, &junk, 1) != 1)
+		{
+		  clib_unix_warning ("set region size");
+		  close (fd);
+		  return -3;
+		}
+	    }
+	  else
+	    {
+	      map_size = rnd_pagesize (statb.st_size);
+	    }
+	}
+      else
+	{
+	  map_size = a->backing_mmap_size;
+	}
+
+      ASSERT (map_size <= rp->virtual_size -
+	      (MMAP_PAGESIZE + SVM_PVT_MHEAP_SIZE));
+
+      if (mmap (rp->data_base, map_size, PROT_READ | PROT_WRITE,
+		MAP_SHARED | MAP_FIXED, fd, 0) == MAP_FAILED)
+	{
+	  clib_unix_warning ("mmap");
+	  close (fd);
+	  return -3;
+	}
+      close (fd);
+      rp->backing_file = (char *) format (0, "%s\0", a->backing_file);
+      rp->flags |= SVM_FLAGS_FILE;
+    }
+
+  if (a->flags & SVM_FLAGS_MHEAP)
+    {
+      rp->data_heap =
+	mheap_alloc_with_flags ((void *) (rp->data_base), map_size,
+				MHEAP_FLAG_DISABLE_VM);
+      rp->flags |= SVM_FLAGS_MHEAP;
+    }
+  return 0;
+}
+
+static int
+svm_data_region_map (svm_map_region_args_t * a, svm_region_t * rp)
+{
+  int fd;
+  u8 junk = 0;
+  uword map_size;
+  struct stat statb;
+
+  map_size = rp->virtual_size -
+    (MMAP_PAGESIZE
+     + (a->pvt_heap_size ? a->pvt_heap_size : SVM_PVT_MHEAP_SIZE));
+
+  if (a->flags & SVM_FLAGS_FILE)
+    {
+
+      fd = open (a->backing_file, O_RDWR, 0777);
+
+      if (fd < 0)
+	{
+	  clib_unix_warning ("open");
+	  return -1;
+	}
+
+      if (fstat (fd, &statb) < 0)
+	{
+	  clib_unix_warning ("fstat");
+	  close (fd);
+	  return -2;
+	}
+
+      if (statb.st_mode & S_IFREG)
+	{
+	  if (statb.st_size == 0)
+	    {
+	      if (lseek (fd, map_size, SEEK_SET) == (off_t) - 1)
+		{
+		  clib_unix_warning ("seek region size");
+		  close (fd);
+		  return -3;
+		}
+	      if (write (fd, &junk, 1) != 1)
+		{
+		  clib_unix_warning ("set region size");
+		  close (fd);
+		  return -3;
+		}
+	    }
+	  else
+	    {
+	      map_size = rnd_pagesize (statb.st_size);
+	    }
+	}
+      else
+	{
+	  map_size = a->backing_mmap_size;
+	}
+
+      ASSERT (map_size <= rp->virtual_size
+	      - (MMAP_PAGESIZE
+		 +
+		 (a->pvt_heap_size ? a->pvt_heap_size : SVM_PVT_MHEAP_SIZE)));
+
+      if (mmap (rp->data_base, map_size, PROT_READ | PROT_WRITE,
+		MAP_SHARED | MAP_FIXED, fd, 0) == MAP_FAILED)
+	{
+	  clib_unix_warning ("mmap");
+	  close (fd);
+	  return -3;
+	}
+      close (fd);
+    }
+  return 0;
+}
+
+u8 *
+shm_name_from_svm_map_region_args (svm_map_region_args_t * a)
+{
+  u8 *path;
+  u8 *shm_name;
+  u8 *split_point;
+  u8 *mkdir_arg = 0;
+  int root_path_offset = 0;
+  int name_offset = 0;
+
+  if (a->root_path)
+    {
+      /* Tolerate present or absent slashes */
+      if (a->root_path[0] == '/')
+	root_path_offset++;
+
+      /* create the root_path under /dev/shm
+         iterate through path creating directories */
+
+      path = format (0, "/dev/shm/%s%c", &a->root_path[root_path_offset], 0);
+      split_point = path + 1;
+      vec_add1 (mkdir_arg, '-');
+
+      while (*split_point)
+	{
+	  while (*split_point && *split_point != '/')
+	    {
+	      vec_add1 (mkdir_arg, *split_point);
+	      split_point++;
+	    }
+	  vec_add1 (mkdir_arg, 0);
+
+	  /* ready to descend another level */
+	  mkdir_arg[vec_len (mkdir_arg) - 1] = '-';
+	  split_point++;
+	}
+      vec_free (mkdir_arg);
+      vec_free (path);
+
+      if (a->name[0] == '/')
+	name_offset = 1;
+
+      shm_name = format (0, "/%s-%s%c", a->root_path,
+			 &a->name[name_offset], 0);
+    }
+  else
+    shm_name = format (0, "%s%c", a->name, 0);
+  return (shm_name);
+}
+
+/*
+ * svm_map_region
+ */
+void *
+svm_map_region (svm_map_region_args_t * a)
+{
+  int svm_fd;
+  svm_region_t *rp;
+  pthread_mutexattr_t attr;
+  pthread_condattr_t cattr;
+  int deadman = 0;
+  u8 junk = 0;
+  void *oldheap;
+  int overhead_space;
+  int rv;
+  uword data_base;
+  int nbits, words, bit;
+  int pid_holding_region_lock;
+  u8 *shm_name;
+  int dead_region_recovery = 0;
+  int time_left;
+  struct stat stat;
+  struct timespec ts, tsrem;
+
+  if (CLIB_DEBUG > 1)
+    clib_warning ("[%d] map region %s", getpid (), a->name);
+
+  ASSERT ((a->size & ~(MMAP_PAGESIZE - 1)) == a->size);
+  ASSERT (a->name);
+
+  shm_name = shm_name_from_svm_map_region_args (a);
+
+  svm_fd = shm_open ((char *) shm_name, O_RDWR | O_CREAT | O_EXCL, 0777);
+
+  if (svm_fd >= 0)
+    {
+      if (fchmod (svm_fd, 0770) < 0)
+	clib_unix_warning ("segment chmod");
+      /* This turns out to fail harmlessly if the client starts first */
+      if (fchown (svm_fd, a->uid, a->gid) < 0)
+	clib_unix_warning ("segment chown [ok if client starts first]");
+
+      vec_free (shm_name);
+
+      if (lseek (svm_fd, a->size, SEEK_SET) == (off_t) - 1)
+	{
+	  clib_warning ("seek region size");
+	  close (svm_fd);
+	  return (0);
+	}
+      if (write (svm_fd, &junk, 1) != 1)
+	{
+	  clib_warning ("set region size");
+	  close (svm_fd);
+	  return (0);
+	}
+
+      rp = mmap ((void *) a->baseva, a->size,
+		 PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, svm_fd, 0);
+
+      if (rp == (svm_region_t *) MAP_FAILED)
+	{
+	  clib_unix_warning ("mmap create");
+	  close (svm_fd);
+	  return (0);
+	}
+      close (svm_fd);
+      memset (rp, 0, sizeof (*rp));
+
+      if (pthread_mutexattr_init (&attr))
+	clib_unix_warning ("mutexattr_init");
+
+      if (pthread_mutexattr_setpshared (&attr, PTHREAD_PROCESS_SHARED))
+	clib_unix_warning ("mutexattr_setpshared");
+
+      if (pthread_mutex_init (&rp->mutex, &attr))
+	clib_unix_warning ("mutex_init");
+
+      if (pthread_mutexattr_destroy (&attr))
+	clib_unix_warning ("mutexattr_destroy");
+
+      if (pthread_condattr_init (&cattr))
+	clib_unix_warning ("condattr_init");
+
+      if (pthread_condattr_setpshared (&cattr, PTHREAD_PROCESS_SHARED))
+	clib_unix_warning ("condattr_setpshared");
+
+      if (pthread_cond_init (&rp->condvar, &cattr))
+	clib_unix_warning ("cond_init");
+
+      if (pthread_condattr_destroy (&cattr))
+	clib_unix_warning ("condattr_destroy");
+
+      region_lock (rp, 1);
+
+      rp->virtual_base = a->baseva;
+      rp->virtual_size = a->size;
+
+      rp->region_heap =
+	mheap_alloc_with_flags ((void *) (a->baseva + MMAP_PAGESIZE),
+				(a->pvt_heap_size != 0) ?
+				a->pvt_heap_size : SVM_PVT_MHEAP_SIZE,
+				MHEAP_FLAG_DISABLE_VM);
+      oldheap = svm_push_pvt_heap (rp);
+
+      rp->region_name = (char *) format (0, "%s%c", a->name, 0);
+      vec_add1 (rp->client_pids, getpid ());
+
+      nbits = rp->virtual_size / MMAP_PAGESIZE;
+
+      ASSERT (nbits > 0);
+      rp->bitmap_size = nbits;
+      words = (nbits + BITS (uword) - 1) / BITS (uword);
+      vec_validate (rp->bitmap, words - 1);
+
+      overhead_space = MMAP_PAGESIZE /* header */  +
+	((a->pvt_heap_size != 0) ? a->pvt_heap_size : SVM_PVT_MHEAP_SIZE);
+
+      bit = 0;
+      data_base = (uword) rp->virtual_base;
+
+      if (a->flags & SVM_FLAGS_NODATA)
+	rp->flags |= SVM_FLAGS_NEED_DATA_INIT;
+
+      do
+	{
+	  clib_bitmap_set_no_check (rp->bitmap, bit, 1);
+	  bit++;
+	  overhead_space -= MMAP_PAGESIZE;
+	  data_base += MMAP_PAGESIZE;
+	}
+      while (overhead_space > 0);
+
+      rp->data_base = (void *) data_base;
+
+      /*
+       * Note: although the POSIX spec guarantees that only one
+       * process enters this block, we have to play games
+       * to hold off clients until e.g. the mutex is ready
+       */
+      rp->version = SVM_VERSION;
+
+      /* setup the data portion of the region */
+
+      rv = svm_data_region_create (a, rp);
+      if (rv)
+	{
+	  clib_warning ("data_region_create: %d", rv);
+	}
+
+      region_unlock (rp);
+
+      svm_pop_heap (oldheap);
+
+      return ((void *) rp);
+    }
+  else
+    {
+      svm_fd = shm_open ((char *) shm_name, O_RDWR, 0777);
+
+      vec_free (shm_name);
+
+      if (svm_fd < 0)
+	{
+	  perror ("svm_region_map(mmap open)");
+	  return (0);
+	}
+
+      time_left = 20;
+      while (1)
+	{
+	  if (0 != fstat (svm_fd, &stat))
+	    {
+	      clib_warning ("fstat failed: %d", errno);
+	      close (svm_fd);
+	      return (0);
+	    }
+	  if (stat.st_size > 0)
+	    {
+	      break;
+	    }
+	  if (0 == time_left)
+	    {
+	      clib_warning ("waiting for resize of shm file timed out");
+	      close (svm_fd);
+	      return (0);
+	    }
+	  ts.tv_sec = 0;
+	  ts.tv_nsec = 100000000;
+	  while (nanosleep (&ts, &tsrem) < 0)
+	    ts = tsrem;
+	  time_left--;
+	}
+
+      rp = mmap (0, MMAP_PAGESIZE,
+		 PROT_READ | PROT_WRITE, MAP_SHARED, svm_fd, 0);
+
+      if (rp == (svm_region_t *) MAP_FAILED)
+	{
+	  close (svm_fd);
+	  clib_warning ("mmap");
+	  return (0);
+	}
+      /*
+       * We lost the footrace to create this region; make sure
+       * the winner has crossed the finish line.
+       */
+      while (rp->version == 0 && deadman++ < 5)
+	{
+	  sleep (1);
+	}
+
+      /*
+       * <bleep>-ed?
+       */
+      if (rp->version == 0)
+	{
+	  clib_warning ("rp->version %d not %d", rp->version, SVM_VERSION);
+	  close (svm_fd);
+	  munmap (rp, a->size);
+	  return (0);
+	}
+      /* Remap now that the region has been placed */
+      a->baseva = rp->virtual_base;
+      a->size = rp->virtual_size;
+      munmap (rp, MMAP_PAGESIZE);
+
+      rp = (void *) mmap ((void *) a->baseva, a->size,
+			  PROT_READ | PROT_WRITE,
+			  MAP_SHARED | MAP_FIXED, svm_fd, 0);
+      if ((uword) rp == (uword) MAP_FAILED)
+	{
+	  clib_unix_warning ("mmap");
+	  close (svm_fd);
+	  return (0);
+	}
+
+      if ((uword) rp != rp->virtual_base)
+	{
+	  clib_warning ("mmap botch");
+	}
+
+      /*
+       * Try to fix the region mutex if it is held by
+       * a dead process
+       */
+      pid_holding_region_lock = rp->mutex_owner_pid;
+      if (pid_holding_region_lock && kill (pid_holding_region_lock, 0) < 0)
+	{
+	  clib_warning
+	    ("region %s mutex held by dead pid %d, tag %d, force unlock",
+	     rp->region_name, pid_holding_region_lock, rp->mutex_owner_tag);
+	  /* owner pid is nonexistent */
+	  rp->mutex.__data.__owner = 0;
+	  rp->mutex.__data.__lock = 0;
+	  dead_region_recovery = 1;
+	}
+
+      if (dead_region_recovery)
+	clib_warning ("recovery: attempt to re-lock region");
+
+      region_lock (rp, 2);
+      oldheap = svm_push_pvt_heap (rp);
+      vec_add1 (rp->client_pids, getpid ());
+
+      if (dead_region_recovery)
+	clib_warning ("recovery: attempt svm_data_region_map");
+
+      rv = svm_data_region_map (a, rp);
+      if (rv)
+	{
+	  clib_warning ("data_region_map: %d", rv);
+	}
+
+      if (dead_region_recovery)
+	clib_warning ("unlock and continue");
+
+      region_unlock (rp);
+
+      svm_pop_heap (oldheap);
+
+      return ((void *) rp);
+
+    }
+  return 0;			/* NOTREACHED */
+}
+
+static void
+svm_mutex_cleanup (void)
+{
+  int i;
+  for (i = 0; i < nheld; i++)
+    {
+      pthread_mutex_unlock (mutexes_held[i]);
+    }
+}
+
+static void
+svm_region_init_internal (svm_map_region_args_t * a)
+{
+  svm_region_t *rp;
+  u64 ticks = clib_cpu_time_now ();
+  uword randomize_baseva;
+
+  /* guard against klutz calls */
+  if (root_rp)
+    return;
+
+  root_rp_refcount++;
+
+  atexit (svm_mutex_cleanup);
+
+  /* Randomize the shared-VM base at init time */
+  if (MMAP_PAGESIZE <= (4 << 10))
+    randomize_baseva = (ticks & 15) * MMAP_PAGESIZE;
+  else
+    randomize_baseva = (ticks & 3) * MMAP_PAGESIZE;
+
+  a->baseva += randomize_baseva;
+
+  rp = svm_map_region (a);
+  ASSERT (rp);
+
+  region_lock (rp, 3);
+
+  /* Set up the main region data structures */
+  if (rp->flags & SVM_FLAGS_NEED_DATA_INIT)
+    {
+      svm_main_region_t *mp = 0;
+      void *oldheap;
+
+      rp->flags &= ~(SVM_FLAGS_NEED_DATA_INIT);
+
+      oldheap = svm_push_pvt_heap (rp);
+      vec_validate (mp, 0);
+      mp->name_hash = hash_create_string (0, sizeof (uword));
+      mp->root_path = a->root_path ? format (0, "%s%c", a->root_path, 0) : 0;
+      rp->data_base = mp;
+      svm_pop_heap (oldheap);
+    }
+  region_unlock (rp);
+  root_rp = rp;
+}
+
+void
+svm_region_init (void)
+{
+  svm_map_region_args_t _a, *a = &_a;
+
+  memset (a, 0, sizeof (*a));
+  a->root_path = 0;
+  a->name = SVM_GLOBAL_REGION_NAME;
+  a->baseva = SVM_GLOBAL_REGION_BASEVA;
+  a->size = SVM_GLOBAL_REGION_SIZE;
+  a->flags = SVM_FLAGS_NODATA;
+  a->uid = 0;
+  a->gid = 0;
+
+  svm_region_init_internal (a);
+}
+
+void
+svm_region_init_chroot (char *root_path)
+{
+  svm_map_region_args_t _a, *a = &_a;
+
+  memset (a, 0, sizeof (*a));
+  a->root_path = root_path;
+  a->name = SVM_GLOBAL_REGION_NAME;
+  a->baseva = SVM_GLOBAL_REGION_BASEVA;
+  a->size = SVM_GLOBAL_REGION_SIZE;
+  a->flags = SVM_FLAGS_NODATA;
+  a->uid = 0;
+  a->gid = 0;
+
+  svm_region_init_internal (a);
+}
+
+void
+svm_region_init_chroot_uid_gid (char *root_path, int uid, int gid)
+{
+  svm_map_region_args_t _a, *a = &_a;
+
+  memset (a, 0, sizeof (*a));
+  a->root_path = root_path;
+  a->name = SVM_GLOBAL_REGION_NAME;
+  a->baseva = SVM_GLOBAL_REGION_BASEVA;
+  a->size = SVM_GLOBAL_REGION_SIZE;
+  a->flags = SVM_FLAGS_NODATA;
+  a->uid = uid;
+  a->gid = gid;
+
+  svm_region_init_internal (a);
+}
+
+void
+svm_region_init_args (svm_map_region_args_t * a)
+{
+  svm_region_init_internal (a);
+}
+
+void *
+svm_region_find_or_create (svm_map_region_args_t * a)
+{
+  svm_main_region_t *mp;
+  svm_region_t *rp;
+  uword need_nbits;
+  int index, i;
+  void *oldheap;
+  uword *p;
+  u8 *name;
+  svm_subregion_t *subp;
+
+  ASSERT (root_rp);
+
+  a->size += MMAP_PAGESIZE +
+    ((a->pvt_heap_size != 0) ? a->pvt_heap_size : SVM_PVT_MHEAP_SIZE);
+  a->size = rnd_pagesize (a->size);
+
+  region_lock (root_rp, 4);
+  oldheap = svm_push_pvt_heap (root_rp);
+  mp = root_rp->data_base;
+
+  ASSERT (mp);
+
+  /* Map the named region from the correct chroot environment */
+  a->root_path = (char *) mp->root_path;
+
+  /*
+   * See if this region is already known. If it is, we're
+   * almost done...
+   */
+  p = hash_get_mem (mp->name_hash, a->name);
+
+  if (p)
+    {
+      rp = svm_map_region (a);
+      region_unlock (root_rp);
+      svm_pop_heap (oldheap);
+      return rp;
+    }
+
+  /* Create the region. */
+  ASSERT ((a->size & ~(MMAP_PAGESIZE - 1)) == a->size);
+
+  need_nbits = a->size / MMAP_PAGESIZE;
+
+  index = 1;			/* $$$ fixme, figure out how many bit to really skip */
+
+  /*
+   * Scan the virtual space allocation bitmap, looking for a large
+   * enough chunk
+   */
+  do
+    {
+      if (clib_bitmap_get_no_check (root_rp->bitmap, index) == 0)
+	{
+	  for (i = 0; i < (need_nbits - 1); i++)
+	    {
+	      if (clib_bitmap_get_no_check (root_rp->bitmap, index + i) == 1)
+		{
+		  index = index + i;
+		  goto next;
+		}
+	    }
+	  break;
+	}
+      index++;
+    next:;
+    }
+  while (index < root_rp->bitmap_size);
+
+  /* Completely out of VM? */
+  if (index >= root_rp->bitmap_size)
+    {
+      clib_warning ("region %s: not enough VM to allocate 0x%llx (%lld)",
+		    root_rp->region_name, a->size, a->size);
+      svm_pop_heap (oldheap);
+      region_unlock (root_rp);
+      return 0;
+    }
+
+  /*
+   * Mark virtual space allocated
+   */
+#if CLIB_DEBUG > 1
+  clib_warning ("set %d bits at index %d", need_nbits, index);
+#endif
+
+  for (i = 0; i < need_nbits; i++)
+    {
+      clib_bitmap_set_no_check (root_rp->bitmap, index + i, 1);
+    }
+
+  /* Place this region where it goes... */
+  a->baseva = root_rp->virtual_base + index * MMAP_PAGESIZE;
+
+  rp = svm_map_region (a);
+
+  pool_get (mp->subregions, subp);
+  name = format (0, "%s%c", a->name, 0);
+  subp->subregion_name = name;
+
+  hash_set_mem (mp->name_hash, name, subp - mp->subregions);
+
+  svm_pop_heap (oldheap);
+
+  region_unlock (root_rp);
+
+  return (rp);
+}
+
+/*
+ * svm_region_unmap
+ *
+ * Let go of the indicated region. If the calling process
+ * is the last customer, throw it away completely.
+ * The root region mutex guarantees atomicity with respect to
+ * a new region client showing up at the wrong moment.
+ */
+void
+svm_region_unmap (void *rp_arg)
+{
+  int i, mypid = getpid ();
+  int nclients_left;
+  void *oldheap;
+  uword virtual_base, virtual_size;
+  svm_region_t *rp = rp_arg;
+  char *name;
+
+  /*
+   * If we take a signal while holding one or more shared-memory
+   * mutexes, we may end up back here from an otherwise
+   * benign exit handler. Bail out to avoid a recursive
+   * mutex screw-up.
+   */
+  if (nheld)
+    return;
+
+  ASSERT (rp);
+  ASSERT (root_rp);
+
+  if (CLIB_DEBUG > 1)
+    clib_warning ("[%d] unmap region %s", getpid (), rp->region_name);
+
+  region_lock (root_rp, 5);
+  region_lock (rp, 6);
+
+  oldheap = svm_push_pvt_heap (rp);	/* nb vec_delete() in the loop */
+
+  /* Remove the caller from the list of mappers */
+  for (i = 0; i < vec_len (rp->client_pids); i++)
+    {
+      if (rp->client_pids[i] == mypid)
+	{
+	  vec_delete (rp->client_pids, 1, i);
+	  goto found;
+	}
+    }
+  clib_warning ("pid %d AWOL", mypid);
+
+found:
+
+  svm_pop_heap (oldheap);
+
+  nclients_left = vec_len (rp->client_pids);
+  virtual_base = rp->virtual_base;
+  virtual_size = rp->virtual_size;
+
+  if (nclients_left == 0)
+    {
+      int index, nbits, i;
+      svm_main_region_t *mp;
+      uword *p;
+      svm_subregion_t *subp;
+
+      /* Kill the region, last guy on his way out */
+
+      oldheap = svm_push_pvt_heap (root_rp);
+      name = vec_dup (rp->region_name);
+
+      virtual_base = rp->virtual_base;
+      virtual_size = rp->virtual_size;
+
+      /* Figure out which bits to clear in the root region bitmap */
+      index = (virtual_base - root_rp->virtual_base) / MMAP_PAGESIZE;
+
+      nbits = (virtual_size + MMAP_PAGESIZE - 1) / MMAP_PAGESIZE;
+
+#if CLIB_DEBUG > 1
+      clib_warning ("clear %d bits at index %d", nbits, index);
+#endif
+      /* Give back the allocated VM */
+      for (i = 0; i < nbits; i++)
+	{
+	  clib_bitmap_set_no_check (root_rp->bitmap, index + i, 0);
+	}
+
+      mp = root_rp->data_base;
+
+      p = hash_get_mem (mp->name_hash, name);
+
+      /* Better never happen ... */
+      if (p == NULL)
+	{
+	  region_unlock (rp);
+	  region_unlock (root_rp);
+	  svm_pop_heap (oldheap);
+	  clib_warning ("Region name '%s' not found?", name);
+	  return;
+	}
+
+      /* Remove from the root region subregion pool */
+      subp = mp->subregions + p[0];
+      pool_put (mp->subregions, subp);
+
+      hash_unset_mem (mp->name_hash, name);
+
+      vec_free (name);
+
+      region_unlock (rp);
+      shm_unlink (rp->region_name);
+      munmap ((void *) virtual_base, virtual_size);
+      region_unlock (root_rp);
+      svm_pop_heap (oldheap);
+      return;
+    }
+
+  region_unlock (rp);
+  region_unlock (root_rp);
+
+  munmap ((void *) virtual_base, virtual_size);
+}
+
+/*
+ * svm_region_exit
+ * There is no clean way to unlink the
+ * root region when all clients go away,
+ * so remove the pid entry and call it a day.
+ */
+void
+svm_region_exit ()
+{
+  void *oldheap;
+  int i, mypid = getpid ();
+  uword virtual_base, virtual_size;
+
+  /* It felt so nice we did it twice... */
+  if (root_rp == 0)
+    return;
+
+  if (--root_rp_refcount > 0)
+    return;
+
+  /*
+   * If we take a signal while holding one or more shared-memory
+   * mutexes, we may end up back here from an otherwise
+   * benign exit handler. Bail out to avoid a recursive
+   * mutex screw-up.
+   */
+  if (nheld)
+    return;
+
+  region_lock (root_rp, 7);
+  oldheap = svm_push_pvt_heap (root_rp);
+
+  virtual_base = root_rp->virtual_base;
+  virtual_size = root_rp->virtual_size;
+
+  for (i = 0; i < vec_len (root_rp->client_pids); i++)
+    {
+      if (root_rp->client_pids[i] == mypid)
+	{
+	  vec_delete (root_rp->client_pids, 1, i);
+	  goto found;
+	}
+    }
+  clib_warning ("pid %d AWOL", mypid);
+
+found:
+
+  region_unlock (root_rp);
+  svm_pop_heap (oldheap);
+
+  root_rp = 0;
+  munmap ((void *) virtual_base, virtual_size);
+}
+
+void
+svm_client_scan_this_region_nolock (svm_region_t * rp)
+{
+  int j;
+  int mypid = getpid ();
+  void *oldheap;
+
+  for (j = 0; j < vec_len (rp->client_pids); j++)
+    {
+      if (mypid == rp->client_pids[j])
+	continue;
+      if (rp->client_pids[j] && (kill (rp->client_pids[j], 0) < 0))
+	{
+	  clib_warning ("%s: cleanup ghost pid %d",
+			rp->region_name, rp->client_pids[j]);
+	  /* nb: client vec in rp->region_heap */
+	  oldheap = svm_push_pvt_heap (rp);
+	  vec_delete (rp->client_pids, 1, j);
+	  j--;
+	  svm_pop_heap (oldheap);
+	}
+    }
+}
+
+
+/*
+ * Scan svm regions for dead clients
+ */
+void
+svm_client_scan (char *root_path)
+{
+  int i, j;
+  svm_main_region_t *mp;
+  svm_map_region_args_t *a = 0;
+  svm_region_t *root_rp;
+  svm_region_t *rp;
+  svm_subregion_t *subp;
+  u8 *name = 0;
+  u8 **svm_names = 0;
+  void *oldheap;
+  int mypid = getpid ();
+
+  vec_validate (a, 0);
+
+  svm_region_init_chroot (root_path);
+
+  root_rp = svm_get_root_rp ();
+
+  pthread_mutex_lock (&root_rp->mutex);
+
+  mp = root_rp->data_base;
+
+  for (j = 0; j < vec_len (root_rp->client_pids); j++)
+    {
+      if (mypid == root_rp->client_pids[j])
+	continue;
+      if (root_rp->client_pids[j] && (kill (root_rp->client_pids[j], 0) < 0))
+	{
+	  clib_warning ("%s: cleanup ghost pid %d",
+			root_rp->region_name, root_rp->client_pids[j]);
+	  /* nb: client vec in root_rp->region_heap */
+	  oldheap = svm_push_pvt_heap (root_rp);
+	  vec_delete (root_rp->client_pids, 1, j);
+	  j--;
+	  svm_pop_heap (oldheap);
+	}
+    }
+
+  /*
+   * Snapshoot names, can't hold root rp mutex across
+   * find_or_create.
+   */
+  /* *INDENT-OFF* */
+  pool_foreach (subp, mp->subregions, ({
+        name = vec_dup (subp->subregion_name);
+        vec_add1(svm_names, name);
+      }));
+  /* *INDENT-ON* */
+
+  pthread_mutex_unlock (&root_rp->mutex);
+
+  for (i = 0; i < vec_len (svm_names); i++)
+    {
+      vec_validate (a, 0);
+      a->root_path = root_path;
+      a->name = (char *) svm_names[i];
+      rp = svm_region_find_or_create (a);
+      if (rp)
+	{
+	  pthread_mutex_lock (&rp->mutex);
+
+	  svm_client_scan_this_region_nolock (rp);
+
+	  pthread_mutex_unlock (&rp->mutex);
+	  svm_region_unmap (rp);
+	  vec_free (svm_names[i]);
+	}
+      vec_free (a);
+    }
+  vec_free (svm_names);
+
+  svm_region_exit ();
+
+  vec_free (a);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/svm/svm.h b/src/svm/svm.h
new file mode 100644
index 00000000..0b87dbcb
--- /dev/null
+++ b/src/svm/svm.h
@@ -0,0 +1,207 @@
+/*
+ *------------------------------------------------------------------
+ * svm.h - shared VM allocation, mmap(...MAP_FIXED...)
+ * brain police
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef __included_svm_h__
+#define __included_svm_h__
+
+#include <pthread.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/mem.h>
+
+#define MMAP_PAGESIZE (clib_mem_get_page_size())
+
+#define SVM_VERSION ((1<<16) | 1)	/* set to declare region ready. */
+
+#define SVM_FLAGS_MHEAP (1<<0)	/* region contains an mheap */
+#define SVM_FLAGS_FILE  (1<<1)	/* region backed by one or more files */
+#define SVM_FLAGS_NODATA (1<<2)	/* region will be further subdivided */
+#define SVM_FLAGS_NEED_DATA_INIT (1<<3)
+
+#define SVM_PVT_MHEAP_SIZE (128<<10)	/* region's private mheap (128k) */
+
+typedef struct svm_region_
+{
+  volatile uword version;
+  pthread_mutex_t mutex;
+  pthread_cond_t condvar;
+  int mutex_owner_pid;		/* in case of trouble */
+  int mutex_owner_tag;
+  uword flags;
+  uword virtual_base;		/* base of the region object */
+  uword virtual_size;
+  void *region_heap;
+  void *data_base;		/* data portion base address */
+  void *data_heap;		/* data heap, if any */
+  volatile void *user_ctx;	/* user context pointer */
+  /* stuff allocated in the region's heap */
+  uword bitmap_size;		/* nbits in virtual alloc bitmap */
+  uword *bitmap;		/* the bitmap */
+  char *region_name;
+  char *backing_file;
+  char **filenames;
+  uword *client_pids;
+  /* pad */
+
+  /* next page:
+   * (64K) clib heap for the region itself
+   *
+   * data_base -> whatever is in this region
+   */
+
+} svm_region_t;
+
+typedef struct svm_map_region_args_
+{
+  char *root_path;		/* NULL means use the truly global arena */
+  char *name;
+  u64 baseva;
+  u64 size;
+  u64 pvt_heap_size;
+  uword flags;
+  char *backing_file;
+  uword backing_mmap_size;
+  /* uid, gid to own the svm region(s) */
+  int uid;
+  int gid;
+} svm_map_region_args_t;
+
+
+/*
+ * Memory shared across all router instances. Packet buffers, etc
+ * Base should be "out of the way," and size should be big enough to
+ * cover everything we plan to put here.
+ */
+#define SVM_GLOBAL_REGION_BASEVA  0x30000000
+#define SVM_GLOBAL_REGION_SIZE    (64<<20)
+#define SVM_GLOBAL_REGION_NAME "/global_vm"
+
+/*
+ * Memory shared across individual router instances.
+ */
+#define SVM_OVERLAY_REGION_BASEVA \
+               (SVM_GLOBAL_REGION_BASEVA + SVM_GLOBAL_REGION_SIZE)
+#define SVM_OVERLAY_REGION_SIZE   (1<<20)
+#define SVM_OVERLAY_REGION_BASENAME "/overlay_vm"
+
+typedef struct
+{
+  u8 *subregion_name;
+} svm_subregion_t;
+
+typedef struct
+{
+  svm_subregion_t *subregions;	/* subregion pool */
+  uword *name_hash;
+  u8 *root_path;
+} svm_main_region_t;
+
+
+void *svm_region_find_or_create (svm_map_region_args_t * a);
+void svm_region_init (void);
+void svm_region_init_chroot (char *root_path);
+void svm_region_init_chroot_uid_gid (char *root_path, int uid, int gid);
+void svm_region_init_args (svm_map_region_args_t * a);
+void svm_region_exit (void);
+void svm_region_unmap (void *rp_arg);
+void svm_client_scan (char *root_path);
+void svm_client_scan_this_region_nolock (svm_region_t * rp);
+u8 *shm_name_from_svm_map_region_args (svm_map_region_args_t * a);
+
+static inline void *
+svm_mem_alloc (svm_region_t * rp, uword size)
+{
+  u8 *oldheap;
+  ASSERT (rp->flags & SVM_FLAGS_MHEAP);
+  u8 *rv;
+
+  pthread_mutex_lock (&rp->mutex);
+  oldheap = clib_mem_set_heap (rp->data_heap);
+  rv = clib_mem_alloc (size);
+  clib_mem_set_heap (oldheap);
+  pthread_mutex_unlock (&rp->mutex);
+  return (rv);
+}
+
+static inline void *
+svm_mem_alloc_aligned_at_offset (svm_region_t * rp,
+				 uword size, uword align, uword offset)
+{
+  u8 *oldheap;
+  ASSERT (rp->flags & SVM_FLAGS_MHEAP);
+  u8 *rv;
+
+  pthread_mutex_lock (&rp->mutex);
+  oldheap = clib_mem_set_heap (rp->data_heap);
+  rv = clib_mem_alloc_aligned_at_offset (size, align, offset,
+					 1 /* yes, call os_out_of_memory */ );
+  clib_mem_set_heap (oldheap);
+  pthread_mutex_unlock (&rp->mutex);
+  return (rv);
+}
+
+static inline void
+svm_mem_free (svm_region_t * rp, void *ptr)
+{
+  u8 *oldheap;
+  ASSERT (rp->flags & SVM_FLAGS_MHEAP);
+
+  pthread_mutex_lock (&rp->mutex);
+  oldheap = clib_mem_set_heap (rp->data_heap);
+  clib_mem_free (ptr);
+  clib_mem_set_heap (oldheap);
+  pthread_mutex_unlock (&rp->mutex);
+
+}
+
+static inline void *
+svm_push_pvt_heap (svm_region_t * rp)
+{
+  u8 *oldheap;
+  oldheap = clib_mem_set_heap (rp->region_heap);
+  return ((void *) oldheap);
+}
+
+static inline void *
+svm_push_data_heap (svm_region_t * rp)
+{
+  u8 *oldheap;
+  oldheap = clib_mem_set_heap (rp->data_heap);
+  return ((void *) oldheap);
+}
+
+static inline void
+svm_pop_heap (void *oldheap)
+{
+  clib_mem_set_heap (oldheap);
+}
+
+u8 *format_svm_region (u8 * s, va_list * args);
+
+svm_region_t *svm_get_root_rp (void);
+
+#endif /* __included_svm_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/svm/svm_test.c b/src/svm/svm_test.c
new file mode 100644
index 00000000..ab0b9e24
--- /dev/null
+++ b/src/svm/svm_test.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * svm_test.c -- brain police
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <time.h>
+#include <fcntl.h>
+#include <string.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/time.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+
+#include "svm.h"
+
+
+int
+main (int argc, char **argv)
+{
+  svm_region_t *root_rp, *rp;
+  svm_map_region_args_t *a = 0;
+
+  vec_validate (a, 0);
+
+  root_rp = svm_region_init ();
+
+  ASSERT (root_rp);
+
+  a->name = "/qvnet";
+  a->size = (4 << 10);
+
+  rp = svm_region_find_or_create (root_rp, a);
+
+  ASSERT (rp);
+
+  *((u32 *) rp->data_base) = 0xdeadbeef;
+  svm_region_unmap (root_rp, rp);
+
+  fformat (stdout, "exiting...\n");
+
+  exit (0);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/svm/svmdb.c b/src/svm/svmdb.c
new file mode 100644
index 00000000..03dfe7c3
--- /dev/null
+++ b/src/svm/svmdb.c
@@ -0,0 +1,671 @@
+/*
+ *------------------------------------------------------------------
+ * svmdb.c -- simple shared memory database
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <time.h>
+#include <fcntl.h>
+#include <string.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/time.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/format.h>
+#include <vppinfra/serialize.h>
+
+#include "svmdb.h"
+
+static void local_set_variable_nolock (svmdb_client_t * client,
+				       svmdb_namespace_t namespace,
+				       u8 * var, u8 * val, u32 elsize);
+
+always_inline void
+region_lock (svm_region_t * rp, int tag)
+{
+  pthread_mutex_lock (&rp->mutex);
+#ifdef MUTEX_DEBUG
+  rp->mutex_owner_pid = getpid ();
+  rp->mutex_owner_tag = tag;
+#endif
+}
+
+always_inline void
+region_unlock (svm_region_t * rp)
+{
+#ifdef MUTEX_DEBUG
+  rp->mutex_owner_pid = 0;
+  rp->mutex_owner_tag = 0;
+#endif
+  pthread_mutex_unlock (&rp->mutex);
+}
+
+svmdb_client_t *
+svmdb_map (svmdb_map_args_t * dba)
+{
+  svmdb_client_t *client = 0;
+  svm_map_region_args_t *a = 0;
+  svm_region_t *db_rp;
+  void *oldheap;
+  svmdb_shm_hdr_t *hp = 0;
+
+  vec_validate (client, 0);
+  vec_validate (a, 0);
+
+  svm_region_init_chroot_uid_gid (dba->root_path, dba->uid, dba->gid);
+
+  a->root_path = dba->root_path;
+  a->name = "/db";
+  a->size = dba->size ? dba->size : SVMDB_DEFAULT_SIZE;
+  a->flags = SVM_FLAGS_MHEAP;
+  a->uid = dba->uid;
+  a->gid = dba->gid;
+
+  db_rp = client->db_rp = svm_region_find_or_create (a);
+
+  ASSERT (db_rp);
+
+  vec_free (a);
+
+  region_lock (client->db_rp, 10);
+  /* Has someone else set up the shared-memory variable table? */
+  if (db_rp->user_ctx)
+    {
+      client->shm = (void *) db_rp->user_ctx;
+      client->pid = getpid ();
+      region_unlock (client->db_rp);
+      ASSERT (client->shm->version == SVMDB_SHM_VERSION);
+      return (client);
+    }
+  /* Nope, it's our problem... */
+
+  /* Add a bogus client (pid=0) so the svm won't be deallocated */
+  oldheap = svm_push_pvt_heap (db_rp);
+  vec_add1 (client->db_rp->client_pids, 0);
+  svm_pop_heap (oldheap);
+
+  oldheap = svm_push_data_heap (db_rp);
+
+  vec_validate (hp, 0);
+  hp->version = SVMDB_SHM_VERSION;
+  hp->namespaces[SVMDB_NAMESPACE_STRING]
+    = hash_create_string (0, sizeof (uword));
+  hp->namespaces[SVMDB_NAMESPACE_VEC]
+    = hash_create_string (0, sizeof (uword));
+
+  db_rp->user_ctx = hp;
+  client->shm = hp;
+
+  svm_pop_heap (oldheap);
+  region_unlock (client->db_rp);
+  client->pid = getpid ();
+
+  return (client);
+}
+
+void
+svmdb_unmap (svmdb_client_t * client)
+{
+  ASSERT (client);
+
+  if (!svm_get_root_rp ())
+    return;
+
+  svm_region_unmap ((void *) client->db_rp);
+  svm_region_exit ();
+  vec_free (client);
+}
+
+static void
+notify_value (svmdb_value_t * v, svmdb_action_t a)
+{
+  int i;
+  int rv;
+  union sigval sv;
+  u32 value;
+  u32 *dead_registrations = 0;
+
+  svmdb_notify_t *np;
+
+  for (i = 0; i < vec_len (v->notifications); i++)
+    {
+      np = vec_elt_at_index (v->notifications, i);
+      if (np->action == a)
+	{
+	  value = (np->action << 28) | (np->opaque);
+	  sv.sival_ptr = (void *) (uword) value;
+	  do
+	    {
+	      rv = 0;
+	      if (sigqueue (np->pid, np->signum, sv) == 0)
+		break;
+	      rv = errno;
+	    }
+	  while (rv == EAGAIN);
+	  if (rv == 0)
+	    continue;
+	  vec_add1 (dead_registrations, i);
+	}
+    }
+
+  for (i = 0; i < vec_len (dead_registrations); i++)
+    {
+      np = vec_elt_at_index (v->notifications, dead_registrations[i]);
+      clib_warning ("dead reg pid %d sig %d action %d opaque %x",
+		    np->pid, np->signum, np->action, np->opaque);
+      vec_delete (v->notifications, 1, dead_registrations[i]);
+    }
+  vec_free (dead_registrations);
+}
+
+int
+svmdb_local_add_del_notification (svmdb_client_t * client,
+				  svmdb_notification_args_t * a)
+{
+  uword *h;
+  void *oldheap;
+  hash_pair_t *hp;
+  svmdb_shm_hdr_t *shm;
+  u8 *dummy_value = 0;
+  svmdb_value_t *value;
+  svmdb_notify_t *np;
+  int i;
+  int rv = 0;
+
+  ASSERT (a->elsize);
+
+  region_lock (client->db_rp, 18);
+  shm = client->shm;
+  oldheap = svm_push_data_heap (client->db_rp);
+
+  h = shm->namespaces[a->nspace];
+
+  hp = hash_get_pair_mem (h, a->var);
+  if (hp == 0)
+    {
+      local_set_variable_nolock (client, a->nspace, (u8 *) a->var,
+				 dummy_value, a->elsize);
+      /* might have moved */
+      h = shm->namespaces[a->nspace];
+      hp = hash_get_pair_mem (h, a->var);
+      ASSERT (hp);
+    }
+
+  value = pool_elt_at_index (shm->values, hp->value[0]);
+
+  for (i = 0; i < vec_len (value->notifications); i++)
+    {
+      np = vec_elt_at_index (value->notifications, i);
+      if ((np->pid == client->pid)
+	  && (np->signum == a->signum)
+	  && (np->action == a->action) && (np->opaque == a->opaque))
+	{
+	  if (a->add_del == 0 /* delete */ )
+	    {
+	      vec_delete (value->notifications, 1, i);
+	      goto out;
+	    }
+	  else
+	    {			/* add */
+	      clib_warning
+		("%s: ignore dup reg pid %d signum %d action %d opaque %x",
+		 a->var, client->pid, a->signum, a->action, a->opaque);
+	      rv = -2;
+	      goto out;
+	    }
+	}
+    }
+  if (a->add_del == 0)
+    {
+      rv = -3;
+      goto out;
+    }
+
+  vec_add2 (value->notifications, np, 1);
+  np->pid = client->pid;
+  np->signum = a->signum;
+  np->action = a->action;
+  np->opaque = a->opaque;
+
+out:
+  svm_pop_heap (oldheap);
+  region_unlock (client->db_rp);
+  return rv;
+}
+
+
+static void
+local_unset_variable_nolock (svmdb_client_t * client,
+			     svmdb_namespace_t namespace, char *var)
+{
+  uword *h;
+  svmdb_value_t *oldvalue;
+  hash_pair_t *hp;
+
+  h = client->shm->namespaces[namespace];
+  hp = hash_get_pair_mem (h, var);
+  if (hp)
+    {
+      oldvalue = pool_elt_at_index (client->shm->values, hp->value[0]);
+      if (vec_len (oldvalue->notifications))
+	notify_value (oldvalue, SVMDB_ACTION_UNSET);
+      /* zero length value means unset */
+      _vec_len (oldvalue->value) = 0;
+    }
+  client->shm->namespaces[namespace] = h;
+}
+
+void
+svmdb_local_unset_string_variable (svmdb_client_t * client, char *var)
+{
+  void *oldheap;
+
+  region_lock (client->db_rp, 11);
+  oldheap = svm_push_data_heap (client->db_rp);
+  local_unset_variable_nolock (client, SVMDB_NAMESPACE_STRING, var);
+  svm_pop_heap (oldheap);
+  region_unlock (client->db_rp);
+}
+
+static void
+local_set_variable_nolock (svmdb_client_t * client,
+			   svmdb_namespace_t namespace,
+			   u8 * var, u8 * val, u32 elsize)
+{
+  uword *h;
+  hash_pair_t *hp;
+  u8 *name;
+  svmdb_shm_hdr_t *shm;
+
+  shm = client->shm;
+  h = shm->namespaces[namespace];
+  hp = hash_get_pair_mem (h, var);
+  if (hp)
+    {
+      svmdb_value_t *oldvalue;
+      oldvalue = pool_elt_at_index (client->shm->values, hp->value[0]);
+      vec_alloc (oldvalue->value, vec_len (val) * elsize);
+      clib_memcpy (oldvalue->value, val, vec_len (val) * elsize);
+      _vec_len (oldvalue->value) = vec_len (val);
+      notify_value (oldvalue, SVMDB_ACTION_SET);
+    }
+  else
+    {
+      svmdb_value_t *newvalue;
+      pool_get (shm->values, newvalue);
+      memset (newvalue, 0, sizeof (*newvalue));
+      newvalue->elsize = elsize;
+      vec_alloc (newvalue->value, vec_len (val) * elsize);
+      clib_memcpy (newvalue->value, val, vec_len (val) * elsize);
+      _vec_len (newvalue->value) = vec_len (val);
+      name = format (0, "%s%c", var, 0);
+      hash_set_mem (h, name, newvalue - shm->values);
+    }
+  shm->namespaces[namespace] = h;
+}
+
+void
+svmdb_local_set_string_variable (svmdb_client_t * client,
+				 char *var, char *val)
+{
+  void *oldheap;
+
+  region_lock (client->db_rp, 12);
+  oldheap = svm_push_data_heap (client->db_rp);
+
+  local_unset_variable_nolock (client, SVMDB_NAMESPACE_STRING, var);
+
+  local_set_variable_nolock (client, SVMDB_NAMESPACE_STRING,
+			     (u8 *) var, (u8 *) val, 1 /* elsize */ );
+  svm_pop_heap (oldheap);
+  region_unlock (client->db_rp);
+}
+
+static u8 *
+local_get_variable_nolock (svmdb_client_t * client,
+			   svmdb_namespace_t namespace, u8 * var)
+{
+  uword *h;
+  uword *p;
+  svmdb_shm_hdr_t *shm;
+  svmdb_value_t *oldvalue;
+
+  shm = client->shm;
+  h = shm->namespaces[namespace];
+  p = hash_get_mem (h, var);
+  if (p)
+    {
+      oldvalue = pool_elt_at_index (shm->values, p[0]);
+      notify_value (oldvalue, SVMDB_ACTION_GET);
+      return (oldvalue->value);
+    }
+  return 0;
+}
+
+void *
+svmdb_local_get_variable_reference (svmdb_client_t * client,
+				    svmdb_namespace_t namespace, char *var)
+{
+  u8 *rv;
+
+  region_lock (client->db_rp, 19);
+  rv = local_get_variable_nolock (client, namespace, (u8 *) var);
+  region_unlock (client->db_rp);
+  return (void *) rv;
+}
+
+char *
+svmdb_local_get_string_variable (svmdb_client_t * client, char *var)
+{
+  u8 *rv = 0;
+
+  region_lock (client->db_rp, 13);
+  rv = local_get_variable_nolock (client, SVMDB_NAMESPACE_STRING, (u8 *) var);
+
+  if (rv && vec_len (rv))
+    {
+      rv = format (0, "%s", rv);
+      vec_add1 (rv, 0);
+    }
+  region_unlock (client->db_rp);
+  return ((char *) rv);
+}
+
+void
+svmdb_local_dump_strings (svmdb_client_t * client)
+{
+  uword *h;
+  u8 *key;
+  u32 value;
+  svmdb_shm_hdr_t *shm = client->shm;
+
+  region_lock (client->db_rp, 14);
+
+  h = client->shm->namespaces[SVMDB_NAMESPACE_STRING];
+
+  /* *INDENT-OFF* */
+  hash_foreach_mem(key, value, h,
+  ({
+    svmdb_value_t *v = pool_elt_at_index (shm->values, value);
+
+    fformat(stdout, "%s: %s\n", key,
+            vec_len(v->value) ? v->value : (u8 *)"(nil)");
+  }));
+  /* *INDENT-ON* */
+  region_unlock (client->db_rp);
+}
+
+int
+svmdb_local_serialize_strings (svmdb_client_t * client, char *filename)
+{
+  uword *h;
+  u8 *key;
+  u32 value;
+  svmdb_shm_hdr_t *shm = client->shm;
+  serialize_main_t _sm, *sm = &_sm;
+  clib_error_t *error = 0;
+  u8 *sanitized_name = 0;
+  int fd = 0;
+
+  if (strstr (filename, "..") || index (filename, '/'))
+    {
+      error = clib_error_return (0, "Illegal characters in filename '%s'",
+				 filename);
+      goto out;
+    }
+
+  sanitized_name = format (0, "/tmp/%s%c", filename, 0);
+
+  fd = creat ((char *) sanitized_name, 0644);
+
+  if (fd < 0)
+    {
+      error = clib_error_return_unix (0, "Create '%s'", sanitized_name);
+      goto out;
+    }
+
+  serialize_open_unix_file_descriptor (sm, fd);
+
+  region_lock (client->db_rp, 20);
+
+  h = client->shm->namespaces[SVMDB_NAMESPACE_STRING];
+
+  serialize_likely_small_unsigned_integer (sm, hash_elts (h));
+
+  /* *INDENT-OFF* */
+  hash_foreach_mem(key, value, h,
+  ({
+    svmdb_value_t *v = pool_elt_at_index (shm->values, value);
+
+    /* Omit names with nil values */
+    if (vec_len(v->value))
+      {
+        serialize_cstring (sm, (char *)key);
+        serialize_cstring (sm, (char *)v->value);
+      }
+  }));
+  /* *INDENT-ON* */
+  region_unlock (client->db_rp);
+
+  serialize_close (sm);
+
+out:
+  if (fd > 0 && close (fd) < 0)
+    error = clib_error_return_unix (0, "close fd %d", fd);
+
+  if (error)
+    {
+      clib_error_report (error);
+      return -1;
+    }
+  return 0;
+}
+
+int
+svmdb_local_unserialize_strings (svmdb_client_t * client, char *filename)
+{
+  serialize_main_t _sm, *sm = &_sm;
+  void *oldheap;
+  clib_error_t *error = 0;
+  u8 *key, *value;
+  int fd = 0;
+  u32 nelts;
+  int i;
+
+  fd = open (filename, O_RDONLY);
+
+  if (fd < 0)
+    {
+      error = clib_error_return_unix (0, "Failed to open '%s'", filename);
+      goto out;
+    }
+
+  unserialize_open_unix_file_descriptor (sm, fd);
+
+  region_lock (client->db_rp, 21);
+  oldheap = svm_push_data_heap (client->db_rp);
+
+  nelts = unserialize_likely_small_unsigned_integer (sm);
+
+  for (i = 0; i < nelts; i++)
+    {
+      unserialize_cstring (sm, (char **) &key);
+      unserialize_cstring (sm, (char **) &value);
+      local_set_variable_nolock (client, SVMDB_NAMESPACE_STRING,
+				 key, value, 1 /* elsize */ );
+      vec_free (key);
+      vec_free (value);
+    }
+  svm_pop_heap (oldheap);
+  region_unlock (client->db_rp);
+
+  serialize_close (sm);
+
+out:
+  if (fd > 0 && close (fd) < 0)
+    error = clib_error_return_unix (0, "close fd %d", fd);
+
+  if (error)
+    {
+      clib_error_report (error);
+      return -1;
+    }
+  return 0;
+}
+
+void
+svmdb_local_unset_vec_variable (svmdb_client_t * client, char *var)
+{
+  void *oldheap;
+
+  region_lock (client->db_rp, 15);
+  oldheap = svm_push_data_heap (client->db_rp);
+  local_unset_variable_nolock (client, SVMDB_NAMESPACE_VEC, var);
+  svm_pop_heap (oldheap);
+  region_unlock (client->db_rp);
+}
+
+void
+svmdb_local_set_vec_variable (svmdb_client_t * client,
+			      char *var, void *val_arg, u32 elsize)
+{
+  u8 *val = (u8 *) val_arg;
+  void *oldheap;
+
+  region_lock (client->db_rp, 16);
+  oldheap = svm_push_data_heap (client->db_rp);
+
+  local_unset_variable_nolock (client, SVMDB_NAMESPACE_VEC, var);
+  local_set_variable_nolock (client, SVMDB_NAMESPACE_VEC, (u8 *) var,
+			     val, elsize);
+
+  svm_pop_heap (oldheap);
+  region_unlock (client->db_rp);
+}
+
+void *
+svmdb_local_get_vec_variable (svmdb_client_t * client, char *var, u32 elsize)
+{
+  u8 *rv = 0;
+  u8 *copy = 0;
+
+  region_lock (client->db_rp, 17);
+
+  rv = local_get_variable_nolock (client, SVMDB_NAMESPACE_VEC, (u8 *) var);
+
+  if (rv && vec_len (rv))
+    {
+      /* Make a copy in process-local memory */
+      vec_alloc (copy, vec_len (rv) * elsize);
+      clib_memcpy (copy, rv, vec_len (rv) * elsize);
+      _vec_len (copy) = vec_len (rv);
+      region_unlock (client->db_rp);
+      return (copy);
+    }
+  region_unlock (client->db_rp);
+  return (0);
+}
+
+void
+svmdb_local_dump_vecs (svmdb_client_t * client)
+{
+  uword *h;
+  u8 *key;
+  u32 value;
+  svmdb_shm_hdr_t *shm;
+
+  region_lock (client->db_rp, 17);
+  shm = client->shm;
+
+  h = client->shm->namespaces[SVMDB_NAMESPACE_VEC];
+
+  /* *INDENT-OFF* */
+  hash_foreach_mem(key, value, h,
+  ({
+    svmdb_value_t *v = pool_elt_at_index (shm->values, value);
+    (void) fformat(stdout, "%s:\n %U (%.2f)\n", key,
+                   format_hex_bytes, v->value,
+                   vec_len(v->value)*v->elsize, ((f64 *)(v->value))[0]);
+  }));
+  /* *INDENT-ON* */
+
+  region_unlock (client->db_rp);
+}
+
+void *
+svmdb_local_find_or_add_vec_variable (svmdb_client_t * client,
+				      char *var, u32 nbytes)
+{
+  void *oldheap;
+  u8 *rv = 0;
+
+  region_lock (client->db_rp, 18);
+  oldheap = svm_push_data_heap (client->db_rp);
+
+  rv = local_get_variable_nolock (client, SVMDB_NAMESPACE_VEC, (u8 *) var);
+
+  if (rv)
+    {
+      goto out;
+    }
+  else
+    {
+      uword *h;
+      u8 *name;
+      svmdb_shm_hdr_t *shm;
+      svmdb_value_t *newvalue;
+
+      shm = client->shm;
+      h = shm->namespaces[SVMDB_NAMESPACE_VEC];
+
+      pool_get (shm->values, newvalue);
+      memset (newvalue, 0, sizeof (*newvalue));
+      newvalue->elsize = 1;
+      vec_alloc (newvalue->value, nbytes);
+      _vec_len (newvalue->value) = nbytes;
+      name = format (0, "%s%c", var, 0);
+      hash_set_mem (h, name, newvalue - shm->values);
+      shm->namespaces[SVMDB_NAMESPACE_VEC] = h;
+      rv = newvalue->value;
+    }
+
+out:
+  svm_pop_heap (oldheap);
+  region_unlock (client->db_rp);
+  return (rv);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/svm/svmdb.h b/src/svm/svmdb.h
new file mode 100644
index 00000000..e02628a0
--- /dev/null
+++ b/src/svm/svmdb.h
@@ -0,0 +1,135 @@
+/*
+ *------------------------------------------------------------------
+ * svmdb.h - shared VM database
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef __included_svmdb_h__
+#define __included_svmdb_h__
+
+#include "svm.h"
+
+typedef enum
+{
+  SVMDB_ACTION_ILLEGAL = 0,
+  SVMDB_ACTION_GET,		/* not clear why anyone would care */
+  SVMDB_ACTION_SET,
+  SVMDB_ACTION_UNSET,
+} svmdb_action_t;
+
+typedef struct
+{
+  int pid;
+  int signum;
+  u32 action:4;
+  u32 opaque:28;
+} svmdb_notify_t;
+
+typedef struct
+{
+  u8 *value;
+  svmdb_notify_t *notifications;
+  u32 elsize;
+} svmdb_value_t;
+
+typedef enum
+{
+  SVMDB_NAMESPACE_STRING = 0,
+  SVMDB_NAMESPACE_VEC,
+  SVMDB_N_NAMESPACES,
+} svmdb_namespace_t;
+
+typedef struct
+{
+  uword version;
+  /* pool of values */
+  svmdb_value_t *values;
+  uword *namespaces[SVMDB_N_NAMESPACES];
+} svmdb_shm_hdr_t;
+
+#define SVMDB_SHM_VERSION 2
+
+typedef struct
+{
+  int flags;
+  int pid;
+  svm_region_t *db_rp;
+  svmdb_shm_hdr_t *shm;
+} svmdb_client_t;
+
+typedef struct
+{
+  int add_del;
+  svmdb_namespace_t nspace;
+  char *var;
+  u32 elsize;
+  int signum;
+  u32 action:4;
+  u32 opaque:28;
+} svmdb_notification_args_t;
+
+typedef struct
+{
+  char *root_path;
+  uword size;
+  u32 uid;
+  u32 gid;
+} svmdb_map_args_t;
+
+/*
+ * Must be a reasonable number, several mb smaller than
+ * SVM_GLOBAL_REGION_SIZE, or no donut for you...
+ */
+#define SVMDB_DEFAULT_SIZE (4<<20)
+
+svmdb_client_t *svmdb_map (svmdb_map_args_t *);
+
+void svmdb_unmap (svmdb_client_t * client);
+void svmdb_local_unset_string_variable (svmdb_client_t * client, char *var);
+void svmdb_local_set_string_variable (svmdb_client_t * client,
+				      char *var, char *val);
+char *svmdb_local_get_string_variable (svmdb_client_t * client, char *var);
+void *svmdb_local_get_variable_reference (svmdb_client_t * client,
+					  svmdb_namespace_t ns, char *var);
+
+void svmdb_local_dump_strings (svmdb_client_t * client);
+
+void svmdb_local_unset_vec_variable (svmdb_client_t * client, char *var);
+void svmdb_local_set_vec_variable (svmdb_client_t * client,
+				   char *var, void *val, u32 elsize);
+void *svmdb_local_get_vec_variable (svmdb_client_t * client, char *var,
+				    u32 elsize);
+void svmdb_local_dump_vecs (svmdb_client_t * client);
+
+int svmdb_local_add_del_notification (svmdb_client_t * client,
+				      svmdb_notification_args_t * args);
+
+void *svmdb_local_find_or_add_vec_variable (svmdb_client_t * client,
+					    char *var, u32 nbytes);
+
+int svmdb_local_serialize_strings (svmdb_client_t * client, char *filename);
+int svmdb_local_unserialize_strings (svmdb_client_t * client, char *filename);
+
+
+#endif /* __included_svmdb_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/svm/svmdbtool.c b/src/svm/svmdbtool.c
new file mode 100644
index 00000000..a0af15fc
--- /dev/null
+++ b/src/svm/svmdbtool.c
@@ -0,0 +1,537 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <pwd.h>
+#include <grp.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <time.h>
+#include <fcntl.h>
+#include <string.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/time.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/format.h>
+#include <vppinfra/serialize.h>
+#include "svmdb.h"
+
+typedef struct
+{
+  svmdb_map_args_t map_args;
+  int uid, gid;
+  uword size;
+} svmdbtool_main_t;
+
+svmdbtool_main_t svmdbtool_main;
+
+static inline svmdb_map_args_t *
+map_arg_setup (char *chroot_path)
+{
+  svmdbtool_main_t *sm = &svmdbtool_main;
+  svmdb_map_args_t *ma = &sm->map_args;
+
+  memset (ma, 0, sizeof (*ma));
+  ma->root_path = chroot_path;
+  ma->size = sm->size;
+  ma->uid = sm->uid;
+  ma->gid = sm->gid;
+  return ma;
+}
+
+static void
+get_string (char *chroot_path, u8 * vbl)
+{
+  svmdb_client_t *c;
+  char *rv;
+  svmdb_map_args_t *ma;
+
+  ma = map_arg_setup (chroot_path);
+
+  c = svmdb_map (ma);
+
+  rv = svmdb_local_get_string_variable (c, (char *) vbl);
+
+  fformat (stdout, "%s\n", rv ? rv : "UNSET");
+  vec_free (rv);
+  svmdb_unmap (c);
+}
+
+static void
+set_string (char *chroot_path, u8 * vbl, u8 * value)
+{
+  svmdb_client_t *c;
+  svmdb_map_args_t *ma;
+
+  ma = map_arg_setup (chroot_path);
+
+  c = svmdb_map (ma);
+  svmdb_local_set_string_variable (c, (char *) vbl, (char *) value);
+  svmdb_unmap (c);
+}
+
+static void
+unset_string (char *chroot_path, u8 * vbl)
+{
+  svmdb_client_t *c;
+  svmdb_map_args_t *ma;
+
+  ma = map_arg_setup (chroot_path);
+
+  c = svmdb_map (ma);
+  svmdb_local_unset_string_variable (c, (char *) vbl);
+  svmdb_unmap (c);
+}
+
+static void
+dump_strings (char *chroot_path)
+{
+  svmdb_client_t *c;
+  svmdb_map_args_t *ma;
+
+  ma = map_arg_setup (chroot_path);
+
+  c = svmdb_map (ma);
+  svmdb_local_dump_strings (c);
+  svmdb_unmap (c);
+}
+
+static void
+serialize_strings (char *chroot_path, char *filename)
+{
+  svmdb_client_t *c;
+  svmdb_map_args_t *ma;
+
+  ma = map_arg_setup (chroot_path);
+
+  c = svmdb_map (ma);
+  (void) svmdb_local_serialize_strings (c, filename);
+  svmdb_unmap (c);
+}
+
+static void
+unserialize_strings (char *chroot_path, char *filename)
+{
+  svmdb_client_t *c;
+  svmdb_map_args_t *ma;
+
+  ma = map_arg_setup (chroot_path);
+
+  c = svmdb_map (ma);
+  (void) svmdb_local_unserialize_strings (c, filename);
+  svmdb_unmap (c);
+}
+
+static void
+test_vlib_vec_rate (char *chroot_path, f64 vr)
+{
+  svmdb_client_t *c;
+  f64 *tv = 0;
+  svmdb_map_args_t *ma;
+
+  ma = map_arg_setup (chroot_path);
+
+  c = svmdb_map (ma);
+
+  vec_add1 (tv, vr);
+
+  svmdb_local_set_vec_variable (c, "vlib_vector_rate", (char *) tv,
+				sizeof (*tv));
+  svmdb_unmap (c);
+
+  vec_free (tv);
+}
+
+
+
+static void
+test_vec (char *chroot_path, u8 * vbl)
+{
+  svmdb_client_t *c;
+  u64 *tv = 0;
+  int i;
+  svmdb_map_args_t *ma;
+
+  ma = map_arg_setup (chroot_path);
+
+  c = svmdb_map (ma);
+
+  /* my amp goes to 11 */
+  for (i = 0; i < 11; i++)
+    {
+      vec_add1 (tv, i);
+    }
+
+  svmdb_local_set_vec_variable (c, (char *) vbl, (char *) tv, sizeof (tv[0]));
+  svmdb_unmap (c);
+
+  vec_free (tv);
+}
+
+static void
+fake_install (char *chroot_path, u8 * add_value)
+{
+  svmdb_client_t *c;
+  u8 *v = 0;
+  u8 **values = 0;
+  u8 *oldvalue;
+  u8 *value;
+  int nitems = 0, i;
+  serialize_main_t m;
+  svmdb_map_args_t *ma;
+
+  ma = map_arg_setup (chroot_path);
+
+  c = svmdb_map (ma);
+
+  oldvalue = svmdb_local_get_vec_variable (c, "installed_sw", 1);
+  if (oldvalue)
+    {
+      unserialize_open_data (&m, oldvalue, vec_len (oldvalue));
+      nitems = unserialize_likely_small_unsigned_integer (&m);
+      for (i = 0; i < nitems; i++)
+	{
+	  unserialize_cstring (&m, (char **) &value);
+	  vec_add1 (values, value);
+	}
+      vec_free (v);
+    }
+  nitems++;
+  value = format (0, "%s%c", add_value, 0);
+
+  vec_add1 (values, value);
+
+  fformat (stdout, "Resulting installed_sw vector:\n");
+
+  serialize_open_vector (&m, v);
+  serialize_likely_small_unsigned_integer (&m, vec_len (values));
+  for (i = 0; i < vec_len (values); i++)
+    {
+      fformat (stdout, "%s\n", values[i]);
+      serialize_cstring (&m, (char *) values[i]);
+    }
+
+  v = serialize_close_vector (&m);
+
+  svmdb_local_set_vec_variable (c, "installed_sw", v, sizeof (v[0]));
+  svmdb_unmap (c);
+
+  for (i = 0; i < vec_len (values); i++)
+    vec_free (values[i]);
+  vec_free (values);
+}
+
+static void
+sigaction_handler (int signum, siginfo_t * i, void *notused)
+{
+  u32 action, opaque;
+
+  action = (u32) (uword) i->si_ptr;
+  action >>= 28;
+  opaque = (u32) (uword) i->si_ptr;
+  opaque &= ~(0xF0000000);
+
+  clib_warning ("signal %d, action %d, opaque %x", signum, action, opaque);
+}
+
+static void
+test_reg (char *chroot_path, u8 * vbl)
+{
+  svmdb_client_t *c;
+  svmdb_notification_args_t args;
+  svmdb_notification_args_t *a = &args;
+  struct sigaction sa;
+  svmdb_map_args_t *ma;
+
+  ma = map_arg_setup (chroot_path);
+
+  memset (&sa, 0, sizeof (sa));
+  sa.sa_sigaction = sigaction_handler;
+  sa.sa_flags = SA_SIGINFO;
+  if (sigaction (SIGUSR2, &sa, 0) < 0)
+    {
+      clib_unix_warning ("sigaction");
+      return;
+    }
+
+  memset (a, 0, sizeof (*a));
+
+  c = svmdb_map (ma);
+
+  a->add_del = 1 /* add */ ;
+  a->nspace = SVMDB_NAMESPACE_STRING;
+  a->var = (char *) vbl;
+  a->elsize = 1;
+  a->signum = SIGUSR2;
+  a->action = SVMDB_ACTION_GET;
+  a->opaque = 0x0eadbeef;
+
+  svmdb_local_add_del_notification (c, a);
+
+  (void) svmdb_local_get_string_variable (c, (char *) vbl);
+
+  a->add_del = 0;		/* del */
+  svmdb_local_add_del_notification (c, a);
+
+
+
+  svmdb_unmap (c);
+}
+
+static void
+unset_vec (char *chroot_path, u8 * vbl)
+{
+  svmdb_client_t *c;
+  svmdb_map_args_t *ma;
+
+  ma = map_arg_setup (chroot_path);
+
+  c = svmdb_map (ma);
+
+  svmdb_local_unset_vec_variable (c, (char *) vbl);
+  svmdb_unmap (c);
+}
+
+static void
+dump_vecs (char *chroot_path)
+{
+  svmdb_client_t *c;
+  svmdb_map_args_t *ma;
+
+  ma = map_arg_setup (chroot_path);
+
+  c = svmdb_map (ma);
+
+  svmdb_local_dump_vecs (c);
+  svmdb_unmap (c);
+}
+
+static void
+crash_test (char *chroot_path)
+{
+  svmdb_client_t *c;
+  svmdb_map_args_t *ma;
+
+  ma = map_arg_setup (chroot_path);
+
+  c = svmdb_map (ma);
+
+  clib_warning ("Grab region mutex and crash deliberately!");
+  c->db_rp->mutex_owner_pid = getpid ();
+  c->db_rp->mutex_owner_tag = -13;
+  pthread_mutex_lock (&c->db_rp->mutex);
+
+  abort ();
+}
+
+static void
+map_with_size (char *chroot_path, uword size)
+{
+  svmdb_client_t *c;
+  svmdb_map_args_t *ma;
+
+  svmdbtool_main.size = size;
+  ma = map_arg_setup (chroot_path);
+
+  c = svmdb_map (ma);
+
+  svmdb_unmap (c);
+}
+
+int
+main (int argc, char **argv)
+{
+  unformat_input_t input;
+  int parsed = 0;
+  u8 *vbl = 0, *value = 0;
+  char *chroot_path = 0;
+  u8 *chroot_path_u8;
+  u8 *filename;
+  uword size;
+  f64 vr;
+  int uid, gid, rv;
+  struct passwd _pw, *pw;
+  struct group _grp, *grp;
+  char *s, buf[128];
+
+  svmdbtool_main.uid = geteuid ();
+  svmdbtool_main.gid = getegid ();
+
+  unformat_init_command_line (&input, argv);
+
+  while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (&input, "get-string %s", &vbl))
+	{
+	  get_string (chroot_path, vbl);
+	  vec_free (vbl);
+	  parsed++;
+	}
+      else if (unformat (&input, "set-string %s %s", &vbl, &value))
+	{
+	  set_string (chroot_path, vbl, value);
+	  vec_free (vbl);
+	  vec_free (value);
+	  parsed++;
+	}
+      else if (unformat (&input, "unset-string %s", &vbl))
+	{
+	  unset_string (chroot_path, vbl);
+	  vec_free (vbl);
+	  parsed++;
+	}
+      else if (unformat (&input, "dump-strings"))
+	{
+	  dump_strings (chroot_path);
+	  parsed++;
+	}
+      else if (unformat (&input, "unset-vec %s", &vbl))
+	{
+	  unset_vec (chroot_path, vbl);
+	  vec_free (vbl);
+	  parsed++;
+	}
+      else if (unformat (&input, "dump-vecs"))
+	{
+	  dump_vecs (chroot_path);
+	  parsed++;
+	}
+      else if (unformat (&input, "test-vec %s", &vbl))
+	{
+	  test_vec (chroot_path, vbl);
+	  // vec_free(vbl);
+	  parsed++;
+	}
+      else if (unformat (&input, "vlib-vec-rate %f", &vr))
+	{
+	  test_vlib_vec_rate (chroot_path, vr);
+	  parsed++;
+	}
+      else if (unformat (&input, "test-reg %s", &vbl))
+	{
+	  test_reg (chroot_path, vbl);
+	  parsed++;
+	}
+      else if (unformat (&input, "crash-test"))
+	{
+	  crash_test (chroot_path);
+	}
+      else if (unformat (&input, "chroot %s", &chroot_path_u8))
+	{
+	  chroot_path = (char *) chroot_path_u8;
+	}
+      else if (unformat (&input, "fake-install %s", &value))
+	{
+	  fake_install (chroot_path, value);
+	  parsed++;
+	}
+      else if (unformat (&input, "size %d", &size))
+	{
+	  map_with_size (chroot_path, size);
+	  parsed++;
+	}
+      else if (unformat (&input, "uid %d", &uid))
+	svmdbtool_main.uid = uid;
+      else if (unformat (&input, "gid %d", &gid))
+	svmdbtool_main.gid = gid;
+      else if (unformat (&input, "uid %s", &s))
+	{
+	  /* lookup the username */
+	  pw = NULL;
+	  rv = getpwnam_r (s, &_pw, buf, sizeof (buf), &pw);
+	  if (rv < 0)
+	    {
+	      fformat (stderr, "cannot fetch username %s", s);
+	      exit (1);
+	    }
+	  if (pw == NULL)
+	    {
+	      fformat (stderr, "username %s does not exist", s);
+	      exit (1);
+	    }
+	  vec_free (s);
+	  svmdbtool_main.uid = pw->pw_uid;
+	}
+      else if (unformat (&input, "gid %s", &s))
+	{
+	  /* lookup the group name */
+	  grp = NULL;
+	  rv = getgrnam_r (s, &_grp, buf, sizeof (buf), &grp);
+	  if (rv != 0)
+	    {
+	      fformat (stderr, "cannot fetch group %s", s);
+	      exit (1);
+	    }
+	  if (grp == NULL)
+	    {
+	      fformat (stderr, "group %s does not exist", s);
+	      exit (1);
+	    }
+	  vec_free (s);
+	  svmdbtool_main.gid = grp->gr_gid;
+	}
+      else if (unformat (&input, "serialize-strings %s", &filename))
+	{
+	  vec_add1 (filename, 0);
+	  serialize_strings (chroot_path, (char *) filename);
+	  parsed++;
+	}
+      else if (unformat (&input, "unserialize-strings %s", &filename))
+	{
+	  vec_add1 (filename, 0);
+	  unserialize_strings (chroot_path, (char *) filename);
+	  parsed++;
+	}
+      else
+	{
+	  break;
+	}
+    }
+
+  unformat_free (&input);
+
+  if (!parsed)
+    {
+      fformat (stdout, "%s: get-string <name> | set-string <name> <value>\n",
+	       argv[0]);
+      fformat (stdout, "      unset-string <name> | dump-strings\n");
+      fformat (stdout, "      test-vec <name> |\n");
+      fformat (stdout, "      unset-vec <name> | dump-vecs\n");
+      fformat (stdout, "      chroot <prefix> [uid <nnn-or-userid>]\n");
+      fformat (stdout, "      [gid <nnn-or-group-name>]\n");
+    }
+
+  exit (0);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/svm/svmtool.c b/src/svm/svmtool.c
new file mode 100644
index 00000000..b3195514
--- /dev/null
+++ b/src/svm/svmtool.c
@@ -0,0 +1,528 @@
+/*
+ *------------------------------------------------------------------
+ * svmtool.c
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <time.h>
+#include <fcntl.h>
+#include <string.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/time.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/format.h>
+
+#include "svm.h"
+
+
+
+/*
+ * format_all_svm_regions
+ * Maps / unmaps regions. Do NOT call from client code!
+ */
+u8 *
+format_all_svm_regions (u8 * s, va_list * args)
+{
+  int verbose = va_arg (*args, int);
+  svm_region_t *root_rp = svm_get_root_rp ();
+  svm_main_region_t *mp;
+  svm_subregion_t *subp;
+  svm_region_t *rp;
+  svm_map_region_args_t *a = 0;
+  u8 **svm_names = 0;
+  u8 *name = 0;
+  int i;
+
+  ASSERT (root_rp);
+
+  pthread_mutex_lock (&root_rp->mutex);
+
+  s = format (s, "%U", format_svm_region, root_rp, verbose);
+
+  mp = root_rp->data_base;
+
+  /*
+   * Snapshoot names, can't hold root rp mutex across
+   * find_or_create.
+   */
+  /* *INDENT-OFF* */
+  pool_foreach (subp, mp->subregions, ({
+        name = vec_dup (subp->subregion_name);
+        vec_add1(svm_names, name);
+      }));
+  /* *INDENT-ON* */
+
+  pthread_mutex_unlock (&root_rp->mutex);
+
+  for (i = 0; i < vec_len (svm_names); i++)
+    {
+      vec_validate (a, 0);
+      a->name = (char *) svm_names[i];
+      rp = svm_region_find_or_create (a);
+      if (rp)
+	{
+	  pthread_mutex_lock (&rp->mutex);
+	  s = format (s, "%U", format_svm_region, rp, verbose);
+	  pthread_mutex_unlock (&rp->mutex);
+	  svm_region_unmap (rp);
+	  vec_free (svm_names[i]);
+	}
+      vec_free (a);
+    }
+  vec_free (svm_names);
+  return (s);
+}
+
+void
+show (char *chroot_path, int verbose)
+{
+  svm_map_region_args_t *a = 0;
+
+  vec_validate (a, 0);
+
+  svm_region_init_chroot (chroot_path);
+
+  fformat (stdout, "My pid is %d\n", getpid ());
+
+  fformat (stdout, "%U", format_all_svm_regions, verbose);
+
+  svm_region_exit ();
+
+  vec_free (a);
+}
+
+
+static void *
+svm_map_region_nolock (svm_map_region_args_t * a)
+{
+  int svm_fd;
+  svm_region_t *rp;
+  int deadman = 0;
+  u8 *shm_name;
+
+  ASSERT ((a->size & ~(MMAP_PAGESIZE - 1)) == a->size);
+
+  shm_name = shm_name_from_svm_map_region_args (a);
+
+  svm_fd = shm_open ((char *) shm_name, O_RDWR, 0777);
+
+  if (svm_fd < 0)
+    {
+      perror ("svm_region_map(mmap open)");
+      return (0);
+    }
+  vec_free (shm_name);
+
+  rp = mmap (0, MMAP_PAGESIZE, PROT_READ | PROT_WRITE, MAP_SHARED, svm_fd, 0);
+
+  if (rp == (svm_region_t *) MAP_FAILED)
+    {
+      close (svm_fd);
+      clib_warning ("mmap");
+      return (0);
+    }
+  /*
+   * We lost the footrace to create this region; make sure
+   * the winner has crossed the finish line.
+   */
+  while (rp->version == 0 && deadman++ < 5)
+    {
+      sleep (1);
+    }
+
+  /*
+   * <bleep>-ed?
+   */
+  if (rp->version == 0)
+    {
+      clib_warning ("rp->version %d not %d", rp->version, SVM_VERSION);
+      munmap (rp, MMAP_PAGESIZE);
+      return (0);
+    }
+  /* Remap now that the region has been placed */
+  a->baseva = rp->virtual_base;
+  a->size = rp->virtual_size;
+  munmap (rp, MMAP_PAGESIZE);
+
+  rp = (void *) mmap ((void *) a->baseva, a->size,
+		      PROT_READ | PROT_WRITE,
+		      MAP_SHARED | MAP_FIXED, svm_fd, 0);
+  if ((uword) rp == (uword) MAP_FAILED)
+    {
+      clib_unix_warning ("mmap");
+      return (0);
+    }
+
+  if ((uword) rp != rp->virtual_base)
+    {
+      clib_warning ("mmap botch");
+    }
+
+  if (pthread_mutex_trylock (&rp->mutex))
+    {
+      clib_warning ("rp->mutex LOCKED by pid %d, tag %d, cleared...",
+		    rp->mutex_owner_pid, rp->mutex_owner_tag);
+      memset (&rp->mutex, 0, sizeof (rp->mutex));
+
+    }
+  else
+    {
+      clib_warning ("mutex OK...\n");
+      pthread_mutex_unlock (&rp->mutex);
+    }
+
+  return ((void *) rp);
+}
+
+/*
+ * rnd_pagesize
+ * Round to a pagesize multiple, presumably 4k works
+ */
+static u64
+rnd_pagesize (u64 size)
+{
+  u64 rv;
+
+  rv = (size + (MMAP_PAGESIZE - 1)) & ~(MMAP_PAGESIZE - 1);
+  return (rv);
+}
+
+#define MUTEX_DEBUG
+
+always_inline void
+region_lock (svm_region_t * rp, int tag)
+{
+  pthread_mutex_lock (&rp->mutex);
+#ifdef MUTEX_DEBUG
+  rp->mutex_owner_pid = getpid ();
+  rp->mutex_owner_tag = tag;
+#endif
+}
+
+always_inline void
+region_unlock (svm_region_t * rp)
+{
+#ifdef MUTEX_DEBUG
+  rp->mutex_owner_pid = 0;
+  rp->mutex_owner_tag = 0;
+#endif
+  pthread_mutex_unlock (&rp->mutex);
+}
+
+
+static void *
+svm_existing_region_map_nolock (void *root_arg, svm_map_region_args_t * a)
+{
+  svm_region_t *root_rp = root_arg;
+  svm_main_region_t *mp;
+  svm_region_t *rp;
+  void *oldheap;
+  uword *p;
+
+  a->size += MMAP_PAGESIZE +
+    (a->pvt_heap_size ? a->pvt_heap_size : SVM_PVT_MHEAP_SIZE);
+  a->size = rnd_pagesize (a->size);
+
+  region_lock (root_rp, 4);
+  oldheap = svm_push_pvt_heap (root_rp);
+  mp = root_rp->data_base;
+
+  ASSERT (mp);
+
+  p = hash_get_mem (mp->name_hash, a->name);
+
+  if (p)
+    {
+      rp = svm_map_region_nolock (a);
+      region_unlock (root_rp);
+      svm_pop_heap (oldheap);
+      return rp;
+    }
+  return 0;
+
+}
+
+static void
+trace (char *chroot_path, char *name, int enable_disable)
+{
+  svm_map_region_args_t *a = 0;
+  svm_region_t *db_rp;
+  void *oldheap;
+
+  vec_validate (a, 0);
+
+  svm_region_init_chroot (chroot_path);
+
+  a->name = name;
+  a->size = 1 << 20;
+  a->flags = SVM_FLAGS_MHEAP;
+
+  db_rp = svm_region_find_or_create (a);
+
+  ASSERT (db_rp);
+
+  region_lock (db_rp, 20);
+
+  oldheap = svm_push_data_heap (db_rp);
+
+  mheap_trace (db_rp->data_heap, enable_disable);
+
+  svm_pop_heap (oldheap);
+  region_unlock (db_rp);
+
+  svm_region_unmap ((void *) db_rp);
+  svm_region_exit ();
+  vec_free (a);
+}
+
+
+
+static void
+subregion_repair (char *chroot_path)
+{
+  int i;
+  svm_main_region_t *mp;
+  svm_map_region_args_t a;
+  svm_region_t *root_rp;
+  svm_region_t *rp;
+  svm_subregion_t *subp;
+  u8 *name = 0;
+  u8 **svm_names = 0;
+
+  svm_region_init_chroot (chroot_path);
+  root_rp = svm_get_root_rp ();
+
+  pthread_mutex_lock (&root_rp->mutex);
+
+  mp = root_rp->data_base;
+
+  /*
+   * Snapshoot names, can't hold root rp mutex across
+   * find_or_create.
+   */
+  /* *INDENT-OFF* */
+  pool_foreach (subp, mp->subregions, ({
+        name = vec_dup (subp->subregion_name);
+        vec_add1(svm_names, name);
+      }));
+  /* *INDENT-ON* */
+
+  pthread_mutex_unlock (&root_rp->mutex);
+
+  for (i = 0; i < vec_len (svm_names); i++)
+    {
+      memset (&a, 0, sizeof (a));
+      a.root_path = chroot_path;
+      a.name = (char *) svm_names[i];
+      fformat (stdout, "Checking %s region...\n", a.name);
+      rp = svm_existing_region_map_nolock (root_rp, &a);
+      if (rp)
+	{
+	  svm_region_unmap (rp);
+	  vec_free (svm_names[i]);
+	}
+    }
+  vec_free (svm_names);
+}
+
+void
+repair (char *chroot_path, int crash_root_region)
+{
+  svm_region_t *root_rp = 0;
+  svm_map_region_args_t *a = 0;
+  void *svm_map_region (svm_map_region_args_t * a);
+  int svm_fd;
+  u8 *shm_name;
+
+  fformat (stdout, "our pid: %d\n", getpid ());
+
+  vec_validate (a, 0);
+
+  a->root_path = chroot_path;
+  a->name = SVM_GLOBAL_REGION_NAME;
+  a->baseva = SVM_GLOBAL_REGION_BASEVA;
+  a->size = SVM_GLOBAL_REGION_SIZE;
+  a->flags = SVM_FLAGS_NODATA;
+
+  shm_name = shm_name_from_svm_map_region_args (a);
+
+  svm_fd = shm_open ((char *) shm_name, O_RDWR, 0777);
+
+  if (svm_fd < 0)
+    {
+      perror ("svm_region_map(mmap open)");
+      goto out;
+    }
+
+  vec_free (shm_name);
+
+  root_rp = mmap (0, MMAP_PAGESIZE,
+		  PROT_READ | PROT_WRITE, MAP_SHARED, svm_fd, 0);
+
+  if (root_rp == (svm_region_t *) MAP_FAILED)
+    {
+      close (svm_fd);
+      clib_warning ("mmap");
+      goto out;
+    }
+
+  /* Remap now that the region has been placed */
+  clib_warning ("remap to 0x%x", root_rp->virtual_base);
+
+  a->baseva = root_rp->virtual_base;
+  a->size = root_rp->virtual_size;
+  munmap (root_rp, MMAP_PAGESIZE);
+
+  root_rp = (void *) mmap ((void *) a->baseva, a->size,
+			   PROT_READ | PROT_WRITE,
+			   MAP_SHARED | MAP_FIXED, svm_fd, 0);
+  if ((uword) root_rp == (uword) MAP_FAILED)
+    {
+      clib_unix_warning ("mmap");
+      goto out;
+    }
+
+  close (svm_fd);
+
+  if ((uword) root_rp != root_rp->virtual_base)
+    {
+      clib_warning ("mmap botch");
+      goto out;
+    }
+
+  if (pthread_mutex_trylock (&root_rp->mutex))
+    {
+      clib_warning ("root_rp->mutex LOCKED by pid %d, tag %d, cleared...",
+		    root_rp->mutex_owner_pid, root_rp->mutex_owner_tag);
+      memset (&root_rp->mutex, 0, sizeof (root_rp->mutex));
+      goto out;
+    }
+  else
+    {
+      clib_warning ("root_rp->mutex OK...\n");
+      pthread_mutex_unlock (&root_rp->mutex);
+    }
+
+out:
+  vec_free (a);
+  /*
+   * Now that the root region is known to be OK,
+   * fix broken subregions
+   */
+  subregion_repair (chroot_path);
+
+  if (crash_root_region)
+    {
+      clib_warning ("Leaving root region locked on purpose...");
+      pthread_mutex_lock (&root_rp->mutex);
+      root_rp->mutex_owner_pid = getpid ();
+      root_rp->mutex_owner_tag = 99;
+    }
+  svm_region_exit ();
+}
+
+int
+main (int argc, char **argv)
+{
+  unformat_input_t input;
+  int parsed = 0;
+  char *name;
+  char *chroot_path = 0;
+  u8 *chroot_u8;
+
+  unformat_init_command_line (&input, argv);
+
+  while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (&input, "show-verbose"))
+	{
+	  show (chroot_path, 1);
+	  parsed++;
+	}
+      else if (unformat (&input, "show"))
+	{
+	  show (chroot_path, 0);
+	  parsed++;
+	}
+      else if (unformat (&input, "client-scan"))
+	{
+	  svm_client_scan (chroot_path);
+	  parsed++;
+	}
+      else if (unformat (&input, "repair"))
+	{
+	  repair (chroot_path, 0 /* fix it */ );
+	  parsed++;
+	}
+      else if (unformat (&input, "crash"))
+	{
+	  repair (chroot_path, 1 /* crash it */ );
+	  parsed++;
+	}
+      else if (unformat (&input, "trace-on %s", &name))
+	{
+	  trace (chroot_path, name, 1);
+	  parsed++;
+	}
+      else if (unformat (&input, "trace-off %s", &name))
+	{
+	  trace (chroot_path, name, 0);
+	  parsed++;
+	}
+      else if (unformat (&input, "chroot %s", &chroot_u8))
+	{
+	  chroot_path = (char *) chroot_u8;
+	}
+      else
+	{
+	  break;
+	}
+    }
+
+  unformat_free (&input);
+
+  if (!parsed)
+    {
+      fformat (stdout,
+	       "%s: show | show-verbose | client-scan | trace-on <region-name>\n",
+	       argv[0]);
+      fformat (stdout, "      trace-off <region-name>\n");
+    }
+  exit (0);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/tests/vnet/README b/src/tests/vnet/README
new file mode 100644
index 00000000..10579e50
--- /dev/null
+++ b/src/tests/vnet/README
@@ -0,0 +1,10 @@
+Unit test infrastructure for vnet
+
+To run unit tests do the following:
+
+  1. build vpp with 'vpp_enable_tests = yes' in build-data/platforms/vpp.mk
+
+  2. go to build-root/build-$tag-$arch/vnet
+
+  3. run
+    $ make check
diff --git a/src/tests/vnet/lisp-cp/test_cp_serdes.c b/src/tests/vnet/lisp-cp/test_cp_serdes.c
new file mode 100644
index 00000000..9d51dc8f
--- /dev/null
+++ b/src/tests/vnet/lisp-cp/test_cp_serdes.c
@@ -0,0 +1,639 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vppinfra/error.h>
+#include <vnet/lisp-cp/lisp_cp_messages.h>
+#include <vnet/lisp-cp/control.h>
+#include <vnet/lisp-cp/lisp_msg_serdes.h>
+#include <vlibapi/api.h>
+#include <vnet/lisp-cp/packets.h>
+
+/* FIXME */
+#include <vlibapi/api_helper_macros.h>
+vpe_api_main_t vpe_api_main;
+
+#define _assert(e)                    \
+  error = CLIB_ERROR_ASSERT (e);      \
+  if (error)                          \
+    goto done;
+
+static void print_chunk(u8 * b, int * offset, int c, char * des)
+{
+  int i, n = offset[0] + c;;
+  for (i = offset[0]; i < n; i++)
+  {
+    printf("0x%02x, ", b[i]);
+  }
+  printf(" // %s\n", des);
+  *offset += c;
+}
+
+void print_map_request(map_request_hdr_t * h)
+{
+#define pchunk(_count, _desc) \
+  print_chunk((u8 *)h, &offset, _count, _desc)
+
+  int offset = 0;
+
+  pchunk(4, "data");
+  pchunk(8, "Nonce");
+  pchunk(2, "Source-EID-AFI");
+  pchunk(4, "Source EID Address");
+  pchunk(2, "ITR-RLOC-AFI 1");
+  pchunk(4, "ITR-RLOC Address 1");
+  pchunk(2, "ITR-RLOC-AFI 2");
+  pchunk(16, "ITR-RLOC Address 2");
+  pchunk(1, "REC: reserved");
+  pchunk(1, "REC: EID mask-len");
+  pchunk(2, "REC: EID-prefix-AFI");
+  pchunk(4, "REC: EID-prefix");
+  printf("\n");
+}
+
+static clib_error_t * test_lisp_msg_push_ecm ()
+{
+  vlib_main_t * vm = vlib_get_main ();
+  clib_error_t * error = 0;
+  gid_address_t la, ra;
+  vlib_buffer_t * b = 0;
+  u32 buff_len = 900;
+  int lp = 0x15, rp = 0x14;
+
+  b = clib_mem_alloc (buff_len);
+  memset((u8 *)b, 0, buff_len);
+  b->current_length = buff_len;
+  b->current_data = sizeof(udp_header_t) + sizeof(ip4_header_t) +
+    sizeof(ecm_hdr_t) + 1;
+
+  la.type = GID_ADDR_IP_PREFIX;
+  la.ippref.addr.ip.v4.as_u32 = 0xa1b2c3d4;
+  la.ippref.addr.version = IP4;
+
+  ra.type = GID_ADDR_IP_PREFIX;
+  ra.ippref.addr.ip.v4.as_u32 = 0x90817263;
+  ra.ippref.addr.version = IP4;
+
+  ecm_hdr_t * lh = lisp_msg_push_ecm (vm, b, lp, rp, &la, &ra);
+
+  u8 expected_ecm_hdr[] = {
+    0x80, 0x00, 0x00, 0x00
+  };
+  _assert(0 == memcmp(expected_ecm_hdr, lh, sizeof(expected_ecm_hdr)));
+
+  ip4_header_t * ih = (ip4_header_t *) (lh + 1);
+  /* clear ip checksum */
+  memset((u8 *)ih + 10, 0, 2);
+
+  u8 expected_ip4_hdr[] = {
+    0x45,                   /* version; IHL */
+    0x00,                   /* services */
+    0x03, 0xa0,             /* total length */
+    0x00, 0x00,             /* identification */
+    0x40, 0x00,             /* flags; fragment offset*/
+    0xff,                   /* TTL */
+    0x11,                   /* protocol */
+    0x00, 0x00,             /* header checksum */
+    0xd4, 0xc3, 0xb2, 0xa1, /* src IP */
+    0x63, 0x72, 0x81, 0x90, /* dst IP */
+  };
+  _assert(0 == memcmp(ih, expected_ip4_hdr, sizeof(expected_ip4_hdr)));
+
+  udp_header_t * uh = (udp_header_t *) (ih + 1);
+  /* clear udp checksum */
+  memset((u8 *)uh + 6, 0, 2);
+
+  u8 expected_udp_hdr[] = {
+    0x00, 0x15, /* src port */
+    0x00, 0x14, /* dst port */
+    0x03, 0x8c, /* length */
+    0x00, 0x00, /* checksum */
+  };
+  _assert(0 == memcmp(uh, expected_udp_hdr, sizeof(expected_udp_hdr)));
+
+done:
+  clib_mem_free (b);
+  return error;
+}
+
+static clib_error_t * test_lisp_msg_parse_mapping_record ()
+{
+  clib_error_t * error = 0;
+  locator_t probed;
+  locator_t * locs = 0;
+  vlib_buffer_t * b = 0;
+  gid_address_t eid;
+  u32 buff_len = 500;
+
+  b = clib_mem_alloc (buff_len);
+  memset((u8 *)b, 0, buff_len);
+
+  u8 map_reply_records[] = {
+    /* 1. record */
+    0x01, 0x02, 0x03, 0x04, /* record TTL */
+    0x01,                   /* locator count */
+    0x00, 0x00, 0x00,       /* eid-mask-len; ... */
+    0x00, 0x00,             /* reserved; map-version num */
+    0x00, 0x01,             /* EID-Prefix-AFI */
+    0x33, 0x44, 0x55, 0x66, /* eid-prefix */
+    /* loc */
+    0x0a,                   /* prority */
+    0x0b,                   /* weight */
+    0x0c,                   /* m-prority */
+    0x0d,                   /* m-weight */
+    0x00, 0x00,             /* unused flags */
+    0x00, 0x01,             /* Loc-AFI */
+    0xaa, 0xbb, 0xcc, 0xdd, /* Loator */
+  };
+  b->current_length = buff_len;
+  clib_memcpy(b->data, map_reply_records, sizeof(map_reply_records));
+
+  lisp_msg_parse_mapping_record (b, &eid, &locs, &probed);
+  _assert(vec_len (locs) == 1);
+  _assert(eid.ippref.addr.ip.v4.as_u32 == 0x66554433);
+  _assert(locs[0].local == 0);
+  _assert(locs[0].address.ippref.addr.ip.v4.as_u32 == 0xddccbbaa);
+  _assert(locs[0].address.type == GID_ADDR_IP_PREFIX);
+  _assert(locs[0].priority == 0xa);
+  _assert(locs[0].weight == 0xb);
+  _assert(locs[0].mpriority == 0xc);
+  _assert(locs[0].mweight == 0xd);
+
+done:
+  clib_mem_free (b);
+  if (locs)
+    vec_free (locs);
+  return error;
+}
+
+static map_request_hdr_t *
+build_map_request (lisp_cp_main_t * lcm, vlib_buffer_t * b,
+                   gid_address_t * rlocs)
+{
+  gid_address_t _seid, * seid = &_seid;
+  gid_address_t _deid, * deid = &_deid;
+  u8 is_smr_invoked = 1;
+  u8 rloc_probe_set = 0;
+  u64 nonce = 0;
+  map_request_hdr_t * h = 0;
+  memset (deid, 0, sizeof (deid[0]));
+  memset (seid, 0, sizeof (seid[0]));
+
+  gid_address_type (seid) = GID_ADDR_IP_PREFIX;
+  ip_address_t * ip_addr = &gid_address_ip (seid);
+  ip_addr_v4 (ip_addr).as_u32 = 0x12345678;
+  seid->ippref.addr.version = IP4;
+
+  gid_address_type (deid) = GID_ADDR_IP_PREFIX;
+  ip_address_t * ip_addr2 = &gid_address_ip (deid);
+  ip_addr_v4 (ip_addr2).as_u32 = 0x9abcdef0;
+  deid->ippref.addr.version = IP4;
+  gid_address_ippref_len (deid) = 24;
+
+  h = lisp_msg_put_mreq (lcm, b, seid, deid, rlocs,
+                     is_smr_invoked, rloc_probe_set, &nonce);
+  vec_free(rlocs);
+  return h;
+}
+
+static void
+generate_rlocs (gid_address_t **rlocs, u32 * count)
+{
+  gid_address_t gid_addr_data, * gid_addr = &gid_addr_data;
+  memset (gid_addr, 0, sizeof (gid_addr[0]));
+  ip_address_t * addr = &gid_address_ip (gid_addr);
+
+  gid_address_type (gid_addr) = GID_ADDR_IP_PREFIX;
+
+  ip_addr_version (addr) = IP4;
+  ip_addr_v4 (addr).data_u32 = 0x10203040;
+  vec_add1 (rlocs[0], gid_addr[0]);
+
+  ip_addr_v6 (addr).as_u32[0] = 0xffeeddcc;
+  ip_addr_v6 (addr).as_u32[1] = 0xbbaa9988;
+  ip_addr_v6 (addr).as_u32[2] = 0x77665544;
+  ip_addr_v6 (addr).as_u32[3] = 0x33221100;
+  ip_addr_version (addr) = IP6;
+  vec_add1 (rlocs[0], gid_addr[0]);
+}
+
+static clib_error_t * test_lisp_msg_parse ()
+{
+  gid_address_t eid;
+  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
+  map_request_hdr_t *h;
+  gid_address_t gid;
+  clib_error_t * error = 0;
+  vlib_buffer_t * b;
+  gid_address_t * rlocs_decode = 0, * rlocs = 0;
+  u32 rloc_count_parse = 0;
+
+  u8 * data = clib_mem_alloc(500);
+  memset(data, 0, 500);
+  b = (vlib_buffer_t *) data;
+
+  generate_rlocs (&rlocs_decode, &rloc_count_parse);
+  h = build_map_request (lcm, b, rlocs_decode);
+
+  vlib_buffer_pull(b, sizeof(*h));
+  u32 len = lisp_msg_parse_addr(b, &gid);
+  _assert (len == 2 + 4
+      /* Source-EID-AFI field lenght + IPv4 address length */);
+  _assert (gid.ippref.addr.ip.v4.as_u32 == 0x12345678);
+  _assert (gid.ippref.addr.version == IP4);
+
+  u8 rloc_count = MREQ_ITR_RLOC_COUNT(h) + 1;
+  lisp_msg_parse_itr_rlocs (b, &rlocs, rloc_count);
+
+  _assert (vec_len (rlocs) == 2);
+  _assert (rlocs[0].ippref.addr.ip.v4.as_u32 == 0x10203040);
+  _assert (rlocs[0].ippref.addr.version == IP4);
+
+  _assert (rlocs[1].ippref.addr.ip.v6.as_u32[0] == 0xffeeddcc);
+  _assert (rlocs[1].ippref.addr.ip.v6.as_u32[1] == 0xbbaa9988);
+  _assert (rlocs[1].ippref.addr.ip.v6.as_u32[2] == 0x77665544);
+  _assert (rlocs[1].ippref.addr.ip.v6.as_u32[3] == 0x33221100);
+  _assert (rlocs[1].ippref.addr.version == IP6);
+
+  lisp_msg_parse_eid_rec (b, &eid);
+  _assert (eid.ippref.addr.ip.v4.as_u32 == 0x9abcdef0);
+  _assert (eid.ippref.addr.version == IP4);
+  _assert (eid.ippref.len == 24);
+
+done:
+  clib_mem_free (data);
+  if (rlocs)
+    vec_free (rlocs);
+  return error;
+}
+
+static clib_error_t * test_lisp_msg_put_mreq_with_lcaf ()
+{
+  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+  clib_error_t * error = 0;
+  map_request_hdr_t *h = 0;
+  gid_address_t * rlocs = 0;
+
+  ip_prefix_t ippref;
+  ip_prefix_version (&ippref) = IP4;
+  ip4_address_t * ip = &ip_prefix_v4 (&ippref);
+  ip->as_u32 = 0x11223344;
+
+  gid_address_t g =
+    {
+      .type = GID_ADDR_IP_PREFIX,
+      .ippref = ippref,
+      .vni = 0x90919293,
+      .vni_mask = 0x17
+    };
+  vec_add1 (rlocs, g);
+
+  u8 * data = clib_mem_alloc (500);
+  memset (data, 0, 500);
+
+  h = build_map_request (lcm, (vlib_buffer_t *) data, rlocs);
+
+  /* clear Nonce to simplify comparison */
+  memset ((u8 *)h + 4, 0, 8);
+
+  u8 expected_data[] =
+    {
+      0x10, 0x40, 0x00, 0x01, /* type; flags; IRC; REC count */
+      0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, /* nonce */
+      0x00, 0x01,             /* Source-EID-AFI */
+      0x78, 0x56, 0x34, 0x12, /* Source EID Address */
+
+      /* RLOCs */
+      0x40, 0x03,             /* AFI = LCAF*/
+      /* LCAF header*/
+      0x00, 0x00,             /* reserved1, flags */
+      0x02,                   /* type = Instance ID */
+      0x17,                   /* IID mask-len */
+      0x00, 0x0a,             /* lenght */
+      0x90, 0x91, 0x92, 0x93, /* IID / VNI */
+
+      0x00, 0x01,             /* AFI = ipv4 */
+      0x44, 0x33, 0x22, 0x11, /* ITR-RLOC Address 1 */
+
+      /* record */
+      0x00,                   /* reserved */
+      0x18,                   /* EID mask-len */
+      0x00, 0x01,             /* EID-prefix-AFI */
+      0xf0, 0xde, 0xbc, 0x9a, /* EID-prefix */
+    };
+
+  _assert (0 == memcmp (expected_data, (u8 *) h, sizeof (expected_data)));
+done:
+  clib_mem_free (data);
+  return error;
+}
+
+static clib_error_t * test_lisp_msg_put_mreq ()
+{
+  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
+  clib_error_t * error = 0;
+  map_request_hdr_t *h;
+  gid_address_t * rlocs = 0;
+  u32 rloc_count = 0;
+
+  u8 * data = clib_mem_alloc(500);
+  memset(data, 0, 500);
+
+  generate_rlocs (&rlocs, &rloc_count);
+  h = build_map_request (lcm, (vlib_buffer_t *) data, rlocs);
+
+  /* clear Nonce to simplify comparison */
+  memset((u8 *)h + 4, 0, 8);
+
+  print_map_request(h);
+
+  u8 expected_data[50] = {
+    0x10, 0x40, 0x01, 0x01, /* type; flags; IRC; REC count */
+    0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, /* nonce */
+    0x00, 0x01,             /* Source-EID-AFI */
+    0x78, 0x56, 0x34, 0x12, /* Source EID Address */
+
+    /* RLOCs */
+    0x00, 0x01,             /* ITR-RLOC-AFI 1 */
+    0x40, 0x30, 0x20, 0x10, /* ITR-RLOC Address 1 */
+    0x00, 0x02,             /* ITR-RLOC-AFI 2 */
+    0xcc, 0xdd, 0xee, 0xff,
+    0x88, 0x99, 0xaa, 0xbb,
+    0x44, 0x55, 0x66, 0x77,
+    0x00, 0x11, 0x22, 0x33, /* ITR-RLOC Address 2 */
+
+    /* record */
+    0x00,                   /* reserved */
+    0x18,                   /* EID mask-len */
+    0x00, 0x01,             /* EID-prefix-AFI */
+    0xf0, 0xde, 0xbc, 0x9a, /* EID-prefix */
+  };
+  _assert (0 == memcmp (expected_data, (u8 *) h, sizeof (expected_data)));
+
+done:
+  clib_mem_free (data);
+  return error;
+}
+
+/* generate a vector of eid records */
+static mapping_t *
+build_test_map_records ()
+{
+  mapping_t * records = 0;
+
+  mapping_t r = {
+    .ttl = 0x44332211,
+    .eid = {
+      .type = GID_ADDR_MAC,
+      .mac = {1, 2, 3, 4, 5, 6},
+      .vni = 0x0
+    }
+  };
+
+  locator_t loc = {
+    .weight = 1,
+    .priority = 2,
+    .local = 1,
+    .address = {
+      .type = GID_ADDR_IP_PREFIX,
+      .ippref = {
+        .addr = {
+          .ip.v4.as_u32 = 0x99887766,
+          .version = IP4
+        }
+      }
+    }
+  };
+  vec_add1 (r.locators, loc);
+  vec_add1 (records, r);
+
+  return records;
+}
+
+static void
+free_test_map_records (mapping_t * maps)
+{
+  mapping_t * map;
+  vec_foreach (map, maps)
+    {
+      vec_free (map->locators);
+    }
+  vec_free (maps);
+}
+
+static clib_error_t *
+test_lisp_map_register ()
+{
+  vlib_buffer_t *b;
+  clib_error_t * error = 0;
+  u64 nonce;
+  u32 msg_len = 0;
+  mapping_t * records = build_test_map_records ();
+
+  u8 * data = clib_mem_alloc(500);
+  memset(data, 0, 500);
+  b = (vlib_buffer_t *) data;
+
+  lisp_msg_put_map_register (b, records, 1 /* want map notify */,
+                            20 /* length of HMAC_SHA_1_96 */,
+                            &nonce, &msg_len);
+  free_test_map_records (records);
+
+  /* clear Nonce to simplify comparison */
+  memset((u8 *)b->data + 4, 0, 8);
+
+  /* clear authentication data */
+  memset ((u8 *)b->data + 16, 0, 20);
+
+  u8 expected_data[] = {
+    0x30, 0x00, 0x01, 0x01, /* type; rsvd; want notify; REC count */
+    0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, /* nonce */
+    0x00, 0x00, 0x00, 0x00, /* key id, auth data length:
+                              both are zeroes because those are set in another
+                              function (see auth_data_len_by_key_id())*/
+    0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, /* auth data */
+
+    /* first record */
+    0x44, 0x33, 0x22, 0x11, /* ttl */
+    0x01, 0x00, 0x00, 0x00, /* loc count, eid len, ACT, A */
+    0x00, 0x00, 0x40, 0x05, /* rsvd, map ver num, AFI = MAC */
+    0x01, 0x02, 0x03, 0x04,
+    0x05, 0x06,             /* MAC EID */
+
+    /* locator 1 */
+    0x02, 0x01, 0x00, 0x00, /* prio, weight, mprio, mweight */
+    0x00, 0x04, 0x00, 0x01, /* flags, AFI = ipv4 */
+    0x66, 0x77, 0x88, 0x99, /* ipv4 locator address */
+  };
+  _assert (0 == memcmp (expected_data, b->data, sizeof (expected_data)));
+done:
+  clib_mem_free (data);
+  return error;
+}
+
+static clib_error_t *
+test_lisp_parse_lcaf ()
+{
+  int i;
+  clib_error_t * error = 0;
+  gid_address_t eid;
+  locator_t * locs = 0;
+  locator_t probed;
+  vlib_buffer_t * b = 0;
+  u32 buff_len = 500;
+
+  b = clib_mem_alloc (buff_len);
+  memset ((u8 *)b, 0, buff_len);
+
+  u8 map_reply_records[] =
+    {
+      /* 1. record */
+      0x01, 0x02, 0x03, 0x04, /* record TTL */
+      0x03,                   /* locator count */
+      0x00, 0x00, 0x00,       /* eid-mask-len; ... */
+      0x00, 0x00,             /* reserved; map-version num */
+      0x00, 0x01,             /* EID-Prefix-AFI */
+      0x33, 0x44, 0x55, 0x66, /* eid-prefix */
+
+      /* 1st locator */
+      0x0a,                   /* prority */
+      0x0b,                   /* weight */
+      0x0c,                   /* m-prority */
+      0x0d,                   /* m-weight */
+      0x00, 0x00,             /* unused flags */
+      0x40, 0x03,             /* Loc-AFI = LCAF*/
+
+      /* LCAF header*/
+      0x00, 0x00,             /* reserved1, flags */
+      0x02,                   /* type = Instance ID */
+      0x18,                   /* IID mask-len */
+      0x00, 0x0a,             /* lenght */
+      /* LCAF Instance ID */
+      0x00, 0x00, 0x00, 0x09, /* iid */
+      0x00, 0x01,             /* AFI = ipv4 */
+      0x10, 0xbb, 0xcc, 0xdd, /* ipv4 loator address */
+
+      /* 2nd locator */
+      0x07,                   /* prority */
+      0x06,                   /* weight */
+      0x05,                   /* m-prority */
+      0x04,                   /* m-weight */
+      0x00, 0x00,             /* unused flags */
+      0x40, 0x03,             /* Loc-AFI = LCAF*/
+
+      /* LCAF header*/
+      0x00, 0x00,             /* reserved1, flags */
+      0x02,                   /* type = Instance ID */
+      0x18,                   /* IID mask-len */
+      0x00, 0x16,             /* iid length + next AFI lenght */
+      /* LCAF Instance ID */
+      0x22, 0x44, 0x66, 0x88, /* iid */
+      0x00, 0x02,             /* AFI = ipv6 */
+      0xcc, 0xdd, 0xee, 0xff,
+      0x88, 0x99, 0xaa, 0xbb,
+      0x44, 0x55, 0x66, 0x77,
+      0x00, 0x11, 0x22, 0x33, /* ipv6 locator address */
+
+      /* 3rd locator */
+      0x0a,                   /* prority */
+      0x0b,                   /* weight */
+      0x0c,                   /* m-prority */
+      0x0d,                   /* m-weight */
+      0x00, 0x00,             /* unused flags */
+      0x00, 0x01,             /* Loc-AFI */
+      0xaa, 0xbb, 0xcc, 0xdd, /* Loator */
+    };
+
+  b->current_length = buff_len;
+  memcpy (b->data, map_reply_records, sizeof (map_reply_records));
+
+  lisp_msg_parse_mapping_record (b, &eid, &locs, &probed);
+  _assert (vec_len (locs) == 3);
+  _assert (eid.ippref.addr.ip.v4.as_u32 == 0x66554433);
+
+  /* check 1st locator - an LCAF with ipv4 */
+  _assert (locs[0].local == 0);
+  _assert (locs[0].priority == 0xa);
+  _assert (locs[0].weight == 0xb);
+  _assert (locs[0].mpriority == 0xc);
+  _assert (locs[0].mweight == 0xd);
+
+  _assert (gid_address_type (&locs[0].address) == GID_ADDR_IP_PREFIX);
+  _assert (gid_address_vni (&locs[0].address) == 0x09);
+  ip_prefix_t * ip_pref = &gid_address_ippref (&locs[0].address);
+  _assert (IP4 == ip_prefix_version (ip_pref));
+
+  /* 2nd locator - LCAF entry with ipv6 address */
+  _assert (locs[1].local == 0);
+  _assert (locs[1].priority == 0x7);
+  _assert (locs[1].weight == 0x6);
+  _assert (locs[1].mpriority == 0x5);
+  _assert (locs[1].mweight == 0x4);
+
+  _assert (gid_address_type (&locs[1].address) == GID_ADDR_IP_PREFIX);
+  _assert (0x22446688 == gid_address_vni (&locs[1].address));
+  ip_pref = &gid_address_ippref (&locs[1].address);
+  _assert (IP6 == ip_prefix_version (ip_pref));
+
+  /* 3rd locator - simple ipv4 address */
+  _assert (gid_address_type (&locs[2].address) == GID_ADDR_IP_PREFIX);
+done:
+  clib_mem_free (b);
+
+  for (i = 0; i < 3; i++)
+    locator_free (&locs[i]);
+  vec_free (locs);
+  return error;
+}
+
+#define foreach_test_case                 \
+  _(lisp_msg_put_mreq)                    \
+  _(lisp_msg_put_mreq_with_lcaf)          \
+  _(lisp_msg_push_ecm)                    \
+  _(lisp_msg_parse)                       \
+  _(lisp_msg_parse_mapping_record)        \
+  _(lisp_parse_lcaf)                      \
+  _(lisp_map_register)
+
+int run_tests (void)
+{
+  clib_error_t * error;
+
+#define _(_test_name)                   \
+  error = test_ ## _test_name ();       \
+  if (error)                            \
+    {                                   \
+      clib_error_report (error);        \
+      return 0;                         \
+    }
+
+  foreach_test_case
+#undef _
+
+  return 0;
+}
+
+int main()
+{
+  return run_tests ();
+}
+#undef _assert
diff --git a/src/tests/vnet/lisp-cp/test_lisp_types.c b/src/tests/vnet/lisp-cp/test_lisp_types.c
new file mode 100644
index 00000000..5d910f66
--- /dev/null
+++ b/src/tests/vnet/lisp-cp/test_lisp_types.c
@@ -0,0 +1,565 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vppinfra/error.h>
+#include <vnet/lisp-cp/lisp_types.h>
+#include <vnet/lisp-cp/lisp_cp_messages.h>
+
+/* FIXME */
+#include <vlibapi/api_helper_macros.h>
+vpe_api_main_t vpe_api_main;
+
+#define _assert(e)                    \
+  error = CLIB_ERROR_ASSERT (e);      \
+  if (error)                          \
+    goto done;
+
+static clib_error_t * test_locator_type (void)
+{
+  clib_error_t * error = 0;
+  gid_address_t _gid_addr, * gid = &_gid_addr;
+  ip_prefix_t * ippref;
+  gid_address_type (gid) = GID_ADDR_IP_PREFIX;
+  gid_address_ippref_len (gid) = 24;
+  ippref = &gid_address_ippref (gid);
+  ip_prefix_version (ippref) = IP4;
+  ip_prefix_len (ippref) = 0;
+  ip4_address_t * ip4 = &ip_prefix_v4 (ippref);
+  ip4->as_u32 = 0x20304050;
+
+  /* local locator */
+  locator_t loc1, loc2 = {
+    .local = 1,
+    .state = 2,
+    .sw_if_index = 8,
+    .priority = 3,
+    .weight = 100,
+    .mpriority = 4,
+    .mweight = 101
+  };
+  locator_copy (&loc1, &loc2);
+  _assert (0 == locator_cmp (&loc1, &loc2));
+
+  /* remote locator */
+  loc2.local = 0;
+
+  ip_prefix_t nested_ippref;
+  ip_prefix_version (&nested_ippref) = IP4;
+  ip_prefix_len (&nested_ippref) = 0;
+  ip4 = &ip_prefix_v4 (&nested_ippref);
+  ip4->as_u32 = 0x33882299;
+  gid_address_t nested_gid =
+    {
+      .type = GID_ADDR_IP_PREFIX,
+      .ippref = nested_ippref
+    };
+
+  lcaf_t lcaf =
+    {
+      .type = LCAF_INSTANCE_ID,
+      .uni =
+        {
+          .vni_mask_len = 5,
+          .vni = 0xa1b2c3d4,
+          .gid_addr = &nested_gid
+        }
+    };
+  gid_address_type (gid) = GID_ADDR_LCAF;
+  gid_address_lcaf (gid) = lcaf;
+
+  loc2.address = gid[0];
+  locator_copy(&loc1, &loc2);
+
+  _assert (0 == locator_cmp (&loc1, &loc2));
+
+done:
+  locator_free (&loc1);
+  return error;
+}
+
+static clib_error_t * test_gid_parse_ip_pref ()
+{
+  clib_error_t * error = 0;
+  gid_address_t _gid_addr, * gid_addr = &_gid_addr;
+  gid_address_t _gid_addr_copy, * gid_addr_copy = &_gid_addr_copy;
+  u8 data[] =
+    {
+      0x00, 0x01,             /* AFI = IPv4 */
+      0x10, 0xbb, 0xcc, 0xdd, /* ipv4 address */
+    };
+
+  u32 len = gid_address_parse (data, gid_addr);
+  _assert (6 == len);
+  gid_address_copy (gid_addr_copy, gid_addr);
+  _assert (0 == gid_address_cmp (gid_addr_copy, gid_addr));
+done:
+  return error;
+}
+
+static clib_error_t * test_gid_parse_mac ()
+{
+  clib_error_t * error = 0;
+  gid_address_t _gid, * gid = &_gid;
+  gid_address_t _gid_copy, * gid_copy = &_gid_copy;
+
+  u8 data[] =
+    {
+      0x40, 0x05,             /* AFI = MAC address */
+      0x10, 0xbb, 0xcc, 0xdd, /* MAC */
+      0x77, 0x99,
+    };
+
+  u32 len = gid_address_parse (data, gid);
+  _assert (8 == len);
+  _assert (GID_ADDR_MAC == gid_address_type (gid));
+  gid_address_copy (gid_copy, gid);
+  _assert (0 == gid_address_cmp (gid_copy, gid));
+done:
+  return error;
+}
+
+static clib_error_t * test_gid_parse_lcaf ()
+{
+  clib_error_t * error = 0;
+  gid_address_t _gid_addr, * gid_addr = &_gid_addr;
+  gid_address_t _gid_addr_copy, * gid_addr_copy = &_gid_addr_copy;
+
+  memset (gid_addr, 0, sizeof (gid_addr[0]));
+  memset (gid_addr_copy, 0, sizeof (gid_addr_copy[0]));
+
+  u8 data[] =
+    {
+      0x40, 0x03,             /* AFI = LCAF*/
+
+      /* LCAF header*/
+      0x00, 0x00,             /* reserved1, flags */
+      0x02,                   /* type = Instance ID */
+      0x18,                   /* IID mask-len */
+      0x00, 0x0a,             /* iid length + next AFI lenght */
+      /* LCAF Instance ID */
+      0x00, 0x00, 0x00, 0x09, /* iid */
+      0x00, 0x01,             /* AFI = ipv4 */
+      0x10, 0xbb, 0xcc, 0xdd, /* ipv4 address */
+    };
+  u32 len = gid_address_parse (data, gid_addr);
+  _assert (18 == len);
+  gid_address_copy (gid_addr_copy, gid_addr);
+  _assert (0 == gid_address_cmp (gid_addr_copy, gid_addr));
+  _assert (GID_ADDR_IP_PREFIX == gid_address_type (gid_addr));
+  _assert (9 == gid_address_vni (gid_addr));
+  _assert (0x18 == gid_address_vni_mask (gid_addr));
+  _assert (0xddccbb10 == gid_addr->ippref.addr.ip.v4.as_u32);
+
+done:
+  gid_address_free (gid_addr);
+  gid_address_free (gid_addr_copy);
+  return error;
+}
+
+/* recursive LCAFs are not supported */
+#if 0
+static clib_error_t * test_gid_parse_lcaf_complex ()
+{
+  clib_error_t * error = 0;
+  gid_address_t _gid_addr, * gid_addr = &_gid_addr;
+  gid_address_t _gid_addr_copy, * gid_addr_copy = &_gid_addr_copy;
+
+  memset (gid_addr, 0, sizeof (gid_addr[0]));
+  memset (gid_addr_copy, 0, sizeof (gid_addr_copy[0]));
+
+  u8 data[] =
+    {
+      0x40, 0x03,             /* AFI = LCAF*/
+
+      /* LCAF header*/
+      0x00, 0x00,             /* reserved1, flags */
+      0x02,                   /* type = Instance ID */
+      0x18,                   /* IID mask-len */
+      0x00, 0x0a,             /* iid length + next AFI lenght */
+      /* LCAF Instance ID */
+      0x00, 0x00, 0x00, 0x0b, /* iid */
+
+      0x40, 0x03,             /* AFI = LCAF*/
+      /* LCAF header*/
+      0x00, 0x00,             /* reserved1, flags */
+      0x02,                   /* type = Instance ID */
+      0x17,                   /* IID mask-len */
+      0x00, 0x0a,             /* iid length + next AFI lenght */
+      /* LCAF Instance ID */
+      0x00, 0x00, 0x00, 0x0c, /* iid */
+
+      0x40, 0x03,             /* AFI = LCAF*/
+      /* LCAF header*/
+      0x00, 0x00,             /* reserved1, flags */
+      0x02,                   /* type = Instance ID */
+      0x16,                   /* IID mask-len */
+      0x00, 0x16,             /* iid length + next AFI lenght */
+      /* LCAF Instance ID */
+      0x00, 0x00, 0x00, 0x0d, /* iid */
+
+      0x00, 0x02,             /* AFI = IPv6 */
+
+      0x10, 0xbb, 0xcc, 0xdd,
+      0x10, 0xbb, 0xcc, 0xdd,
+      0x10, 0xbb, 0xcc, 0xdd,
+      0x10, 0xbb, 0xcc, 0xdd, /* ipv6 address */
+    };
+  u32 len = gid_address_parse (data, gid_addr);
+  _assert (54 == len);
+  _assert (gid_addr->type == GID_ADDR_LCAF);
+  gid_address_copy (gid_addr_copy, gid_addr);
+  _assert (0 == gid_address_cmp (gid_addr_copy, gid_addr));
+  _assert (gid_addr_copy->type == GID_ADDR_LCAF);
+
+  lcaf_t * lcaf = &gid_address_lcaf (gid_addr_copy);
+  _assert (lcaf->type == LCAF_INSTANCE_ID);
+  vni_t * v = (vni_t *) lcaf;
+  _assert (v->vni == 0x0b);
+  _assert (v->vni_mask_len == 0x18);
+
+  gid_address_t * tmp = vni_gid (v);
+  _assert (gid_address_type (tmp) == GID_ADDR_LCAF);
+  lcaf = &gid_address_lcaf (tmp);
+  _assert (lcaf->type == LCAF_INSTANCE_ID);
+
+  v = (vni_t *) lcaf;
+  _assert (v->vni == 0x0c);
+  _assert (v->vni_mask_len == 0x17);
+
+  tmp = vni_gid (v);
+  _assert (gid_address_type (tmp) == GID_ADDR_LCAF);
+  lcaf = &gid_address_lcaf (tmp);
+
+  _assert (lcaf->type == LCAF_INSTANCE_ID);
+  v = (vni_t *) lcaf;
+  _assert (v->vni == 0x0d);
+  _assert (v->vni_mask_len == 0x16);
+
+  tmp = vni_gid (v);
+  _assert (gid_address_type (tmp) == GID_ADDR_IP_PREFIX);
+
+  ip_prefix_t * ip_pref = &gid_address_ippref (tmp);
+  ip6_address_t * ip6 = &ip_prefix_v6 (ip_pref);
+  _assert (ip6->as_u32[0] == 0xddccbb10);
+  _assert (ip6->as_u32[1] == 0xddccbb10);
+  _assert (ip6->as_u32[2] == 0xddccbb10);
+  _assert (ip6->as_u32[3] == 0xddccbb10);
+  _assert (ip_prefix_version (ip_pref) == IP6);
+
+done:
+  gid_address_free (gid_addr);
+  gid_address_free (gid_addr_copy);
+  return error;
+}
+#endif
+
+#if 0 /* uncomment this once VNI is supported */
+static clib_error_t * test_write_mac_in_lcaf (void)
+{
+  clib_error_t * error = 0;
+
+  u8 * b = clib_mem_alloc(500);
+  memset(b, 0, 500);
+
+  gid_address_t g =
+    {
+      .mac = {0x1, 0x2, 0x3, 0x4, 0x5, 0x6},
+      .vni = 0x30,
+      .vni_mask = 0x10,
+      .type = GID_ADDR_MAC,
+    };
+
+  u16 len = gid_address_put (b, &g);
+  _assert (8 == len);
+
+  u8 expected[] =
+    {
+      0x40, 0x03,             /* AFI = LCAF */
+      0x00,                   /* reserved1 */
+      0x00,                   /* flags */
+      0x02,                   /* LCAF type = Instance ID */
+      0x20,                   /* IID/VNI mask len */
+      0x00, 0x0a,             /* length */
+      0x01, 0x02, 0x03, 0x04, /* Instance ID / VNI */
+
+      0x00, 0x06,             /* AFI = MAC */
+      0x01, 0x02, 0x03, 0x04,
+      0x05, 0x06              /* MAC */
+    }
+  _assert (0 == memcmp (expected, b, len));
+done:
+  clib_mem_free (b);
+  return error;
+}
+#endif
+
+static clib_error_t * test_mac_address_write (void)
+{
+  clib_error_t * error = 0;
+
+  u8 * b = clib_mem_alloc(500);
+  memset(b, 0, 500);
+
+  gid_address_t g =
+    {
+      .mac = {0x1, 0x2, 0x3, 0x4, 0x5, 0x6},
+      .type = GID_ADDR_MAC,
+    };
+
+  u16 len = gid_address_put (b, &g);
+  _assert (8 == len);
+
+  u8 expected[] =
+    {
+      0x40, 0x05,             /* AFI = MAC */
+      0x01, 0x02, 0x03, 0x04,
+      0x05, 0x06              /* MAC */
+    };
+  _assert (0 == memcmp (expected, b, len));
+done:
+  clib_mem_free (b);
+  return error;
+}
+
+static clib_error_t *
+test_src_dst_with_vni_serdes (void)
+{
+  clib_error_t * error = 0;
+  u8 * b = clib_mem_alloc (500);
+  memset (b, 0, 500);
+
+  fid_address_t src =
+    {
+      .type = FID_ADDR_IP_PREF,
+      .ippref =
+        {
+          .len = 24,
+          .addr =
+            {
+              .version = IP4,
+              .ip.v4.data = { 0x1, 0x2, 0x3, 0x0 }
+            }
+        }
+    };
+
+  fid_address_t dst =
+    {
+      .type = FID_ADDR_IP_PREF,
+      .ippref =
+        {
+          .len = 16,
+          .addr =
+            {
+              .version = IP4,
+              .ip.v4.data = { 0x9, 0x8, 0x0, 0x0 }
+            }
+        }
+    };
+
+  source_dest_t sd =
+    {
+      .src = src,
+      .dst = dst
+    };
+
+  gid_address_t g =
+    {
+      .sd = sd,
+      .type = GID_ADDR_SRC_DST,
+      .vni = 0x12345678,
+      .vni_mask = 0x9
+    };
+
+  u16 size_to_put = gid_address_size_to_put(&g);
+  _assert (36 == size_to_put);
+  _assert (0 == gid_address_len(&g));
+
+  u16 write_len = gid_address_put (b, &g);
+  printf("sizetoput %d; writelen %d\n", size_to_put, write_len);
+  _assert (size_to_put == write_len);
+
+  u8 expected_data[] =
+    {
+      0x40, 0x03, 0x00, 0x00,  /* AFI = LCAF, reserved1, flags */
+      0x02, 0x09, 0x00, 0x1c,  /* LCAF type = IID, IID mask-len, length */
+      0x12, 0x34, 0x56, 0x78,  /* reserved; source-ML, Dest-ML */
+
+      0x40, 0x03, 0x00, 0x00,  /* AFI = LCAF, reserved1, flags */
+      0x0c, 0x00, 0x00, 0x10,  /* LCAF type = source/dest key, rsvd, length */
+      0x00, 0x00, 0x18, 0x10,  /* reserved; source-ML, Dest-ML */
+
+      0x00, 0x01,              /* AFI = ip4 */
+      0x01, 0x02, 0x03, 0x00,  /* source */
+
+      0x00, 0x01,              /* AFI = ip4 */
+      0x09, 0x08, 0x00, 0x00,  /* destination */
+    };
+  _assert (0 == memcmp (expected_data, b, sizeof (expected_data)));
+
+  gid_address_t p;
+  memset (&p, 0, sizeof (p));
+  _assert (write_len == gid_address_parse (b, &p));
+  _assert (0 == gid_address_cmp (&g, &p));
+done:
+  clib_mem_free (b);
+  return error;
+}
+
+static clib_error_t *
+test_src_dst_serdes (void)
+{
+  clib_error_t * error = 0;
+
+  u8 * b = clib_mem_alloc (500);
+  memset (b, 0, 500);
+
+  fid_address_t src =
+    {
+      .type = FID_ADDR_MAC,
+      .mac = { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66 }
+    };
+
+  fid_address_t dst =
+    {
+      .type = FID_ADDR_MAC,
+      .mac = { 0x10, 0x21, 0x32, 0x43, 0x54, 0x65 }
+    };
+
+  source_dest_t sd =
+    {
+      .src = src,
+      .dst = dst
+    };
+
+  gid_address_t g =
+    {
+      .sd = sd,
+      .type = GID_ADDR_SRC_DST,
+      .vni = 0x0,
+      .vni_mask = 0x0
+    };
+
+  u16 size_to_put = gid_address_size_to_put(&g);
+  _assert (28 == size_to_put);
+  _assert (0 == gid_address_len(&g));
+
+  u16 write_len = gid_address_put (b, &g);
+  _assert (size_to_put == write_len);
+
+  u8 expected_data[] =
+    {
+      0x40, 0x03, 0x00, 0x00,  /* AFI = LCAF, reserved1, flags */
+      0x0c, 0x00, 0x00, 0x14,  /* LCAF type = source/dest key, rsvd, length */
+      0x00, 0x00, 0x00, 0x00,  /* reserved; source-ML, Dest-ML */
+
+      0x40, 0x05,              /* AFI = MAC */
+      0x11, 0x22, 0x33, 0x44,
+      0x55, 0x66,              /* source */
+
+      0x40, 0x05,              /* AFI = MAC */
+      0x10, 0x21, 0x32, 0x43,
+      0x54, 0x65,              /* destination */
+    };
+  _assert (0 == memcmp (expected_data, b, sizeof (expected_data)));
+
+  gid_address_t p;
+  memset (&p, 0, sizeof (p));
+  _assert (write_len == gid_address_parse (b, &p));
+  _assert (0 == gid_address_cmp (&g, &p));
+done:
+  clib_mem_free (b);
+  return error;
+}
+
+static clib_error_t * test_gid_address_write (void)
+{
+  clib_error_t * error = 0;
+  ip_prefix_t ippref_data, * ippref = &ippref_data;
+
+  u8 * b = clib_mem_alloc(500);
+  memset(b, 0, 500);
+
+  ip_prefix_version (ippref) = IP4;
+  ip_prefix_len (ippref) = 9;
+  ip4_address_t * ip4 = &ip_prefix_v4 (ippref);
+  ip4->as_u32 = 0xaabbccdd;
+
+  gid_address_t g =
+    {
+      .ippref = ippref[0],
+      .type = GID_ADDR_IP_PREFIX,
+      .vni = 0x01020304,
+      .vni_mask = 0x18
+    };
+
+  _assert (18 == gid_address_size_to_put (&g));
+  _assert (gid_address_len (&g) == 9);
+
+  u16 write_len = gid_address_put (b, &g);
+  _assert (18 == write_len);
+
+  u8 expected_gid_data[] =
+    {
+      0x40, 0x03,             /* AFI = LCAF */
+      0x00,                   /* reserved1 */
+      0x00,                   /* flags */
+      0x02,                   /* LCAF type = Instance ID */
+      0x18,                   /* IID/VNI mask len */
+      0x00, 0x0a,             /* length */
+      0x01, 0x02, 0x03, 0x04, /* Instance ID / VNI */
+
+      0x00, 0x01,             /* AFI = IPv4 */
+      0xdd, 0xcc, 0xbb, 0xaa, /* ipv4 addr */
+    };
+  _assert (0 == memcmp (expected_gid_data, b, sizeof (expected_gid_data)));
+done:
+  clib_mem_free (b);
+  return error;
+}
+
+#define foreach_test_case                 \
+  _(locator_type)                         \
+  _(gid_parse_ip_pref)                    \
+  _(gid_parse_mac)                        \
+  _(gid_parse_lcaf)                       \
+  _(mac_address_write)                    \
+  _(gid_address_write)                    \
+  _(src_dst_serdes)                       \
+  _(src_dst_with_vni_serdes)
+
+int run_tests (void)
+{
+  clib_error_t * error;
+
+#define _(_test_name)                   \
+  error = test_ ## _test_name ();       \
+  if (error)                            \
+    {                                   \
+      clib_error_report (error);        \
+      return 0;                         \
+    }
+
+  foreach_test_case
+#undef _
+
+  return 0;
+}
+
+int main()
+{
+  return run_tests ();
+}
+
diff --git a/src/tests/vnet/lisp-gpe/test.c b/src/tests/vnet/lisp-gpe/test.c
new file mode 100644
index 00000000..dde633ae
--- /dev/null
+++ b/src/tests/vnet/lisp-gpe/test.c
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+int main(int argc, char **argv) {
+    return 0;
+}
diff --git a/src/tools/elftool/dir.dox b/src/tools/elftool/dir.dox
new file mode 100644
index 00000000..40426e04
--- /dev/null
+++ b/src/tools/elftool/dir.dox
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/** @dir
+ * @brief VPP instrastructure tools.
+ */
diff --git a/src/tools/elftool/elftool.c b/src/tools/elftool/elftool.c
new file mode 100644
index 00000000..d9d3704b
--- /dev/null
+++ b/src/tools/elftool/elftool.c
@@ -0,0 +1,464 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2008 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/elf.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#ifndef CLIB_UNIX
+#error "unix only"
+#endif
+
+typedef struct {
+  elf_main_t elf_main;
+  char * input_file;
+  char * output_file;
+  char * set_interpreter;
+  char * set_rpath;
+  int unset_rpath;
+  int verbose;
+  int quiet;
+  int allow_elf_shared;
+  /* for use in the optimized / simplified case */
+  u64 file_size;
+  u64 interpreter_offset;
+  u64 rpath_offset;
+} elf_tool_main_t;
+
+static clib_error_t * elf_set_interpreter (elf_main_t * em, 
+                                           elf_tool_main_t * tm)
+{
+  elf_segment_t * g;
+  elf_section_t * s;
+  clib_error_t * error;
+  char * interp = tm->set_interpreter;
+
+  switch (em->first_header.file_type)
+    {
+    case ELF_EXEC:
+      break;
+
+    case ELF_SHARED:
+      if (tm->allow_elf_shared)
+        break;
+      /* Note flowthrough */
+    default:
+      return clib_error_return (0, "unacceptable file_type");    
+    }
+
+  vec_foreach (g, em->segments)
+    {
+      if (g->header.type == ELF_SEGMENT_INTERP)
+	break;
+    }
+
+  if (g >= vec_end (em->segments))
+    return clib_error_return (0, "interpreter not found");
+
+  if (g->header.memory_size < 1 + strlen (interp))
+    return clib_error_return (0, "given interpreter does not fit; must be less than %d bytes (`%s' given)",
+			      g->header.memory_size, interp);
+
+  error = elf_get_section_by_start_address (em, g->header.virtual_address, &s);
+  if (error)
+    return error;
+
+  /* Put in new null terminated string. */
+  memset (s->contents, 0, vec_len (s->contents));
+  clib_memcpy (s->contents, interp, strlen (interp));
+
+  return 0;
+}
+
+static void
+delete_rpath_for_section (elf_main_t * em, elf_section_t * s)
+{
+  elf64_dynamic_entry_t * e;
+  elf64_dynamic_entry_t * new_es = 0;
+
+  vec_foreach (e, em->dynamic_entries)
+    {
+      switch (e->type)
+	{
+	case ELF_DYNAMIC_ENTRY_RPATH:
+	case ELF_DYNAMIC_ENTRY_RUN_PATH:
+	  break;
+
+	default:
+	  vec_add1 (new_es, e[0]);
+	  break;
+	}
+    }
+
+  /* Pad so as to keep section size constant. */
+  {
+    elf64_dynamic_entry_t e_end;
+    e_end.type = ELF_DYNAMIC_ENTRY_END;
+    e_end.data = 0;
+    while (vec_len (new_es) < vec_len (em->dynamic_entries))
+      vec_add1 (new_es, e_end);
+  }
+
+  vec_free (em->dynamic_entries);
+  em->dynamic_entries = new_es;
+
+  elf_set_dynamic_entries (em);
+}
+
+static void delete_rpath (elf_main_t * em)
+{
+  elf_section_t * s;
+
+  vec_foreach (s, em->sections)
+    {
+      switch (s->header.type)
+	{
+	case ELF_SECTION_DYNAMIC:
+	  delete_rpath_for_section (em, s);
+	  break;
+
+	default:
+	  break;
+	}
+    }
+}
+
+static clib_error_t *
+set_rpath_for_section (elf_main_t * em, elf_section_t * s, char * new_rpath)
+{
+  elf64_dynamic_entry_t * e;
+  char * old_rpath;
+  int old_len, new_len = strlen (new_rpath);
+  u8 * new_string_table = vec_dup (em->dynamic_string_table);
+
+  vec_foreach (e, em->dynamic_entries)
+    {
+      switch (e->type)
+	{
+	case ELF_DYNAMIC_ENTRY_RPATH:
+	case ELF_DYNAMIC_ENTRY_RUN_PATH:
+	  old_rpath = (char *) new_string_table + e->data;
+	  old_len = strlen (old_rpath);
+	  if (old_len < new_len)
+	    return clib_error_return (0, "rpath of `%s' does not fit (old rpath `%s')",
+				      new_rpath, old_rpath);
+	  strcpy (old_rpath, new_rpath);
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  elf_set_section_contents (em, em->dynamic_string_table_section_index,
+			    new_string_table,
+			    vec_bytes (new_string_table));
+
+  return 0;
+}
+
+static clib_error_t *
+set_rpath (elf_main_t * em, char * rpath)
+{
+  clib_error_t * error = 0;
+  elf_section_t * s;
+
+  vec_foreach (s, em->sections)
+    {
+      switch (s->header.type)
+	{
+	case ELF_SECTION_DYNAMIC:
+	  error = set_rpath_for_section (em, s, rpath);
+	  if (error)
+	    return error;
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return error;
+}
+
+static clib_error_t *
+set_interpreter_rpath (elf_tool_main_t * tm)
+{
+  int ifd = -1, ofd = -1;
+  struct stat fd_stat;
+  u8 *idp = 0;                  /* warning be gone */
+  u64 mmap_length = 0, i;
+  u32 run_length;
+  u8 in_run;
+  u64 offset0 = 0, offset1 = 0;
+  clib_error_t * error = 0;
+  int fix_in_place = 0;
+
+  if (!strcmp (tm->input_file, tm->output_file))
+    fix_in_place = 1;
+
+  ifd = open (tm->input_file, O_RDWR);
+  if (ifd < 0)
+    {
+      error = clib_error_return_unix (0, "open `%s'", tm->input_file);
+      goto done;
+    }
+
+  if (fstat (ifd, &fd_stat) < 0)
+    {
+      error = clib_error_return_unix (0, "fstat `%s'", tm->input_file);
+      goto done;
+    }
+
+  if (!(fd_stat.st_mode & S_IFREG)) 
+    {
+      error = clib_error_return (0, "%s is not a regular file", tm->input_file);
+      goto done;
+    }
+
+  mmap_length = fd_stat.st_size;
+  if (mmap_length < 4)
+    {
+      error = clib_error_return (0, "%s too short", tm->input_file);
+      goto done;
+    }
+
+  /* COW-mapping, since we intend to write the fixups */
+  if (fix_in_place)
+    idp = mmap (0, mmap_length, PROT_READ | PROT_WRITE, MAP_SHARED, 
+              ifd, /* offset */ 0);
+  else
+    idp = mmap (0, mmap_length, PROT_READ | PROT_WRITE, MAP_PRIVATE, 
+              ifd, /* offset */ 0);
+  if (~pointer_to_uword (idp) == 0)
+    {
+      mmap_length = 0;
+      error = clib_error_return_unix (0, "mmap `%s'", tm->input_file);
+      goto done;
+    }
+  
+  if (idp[0] != 0x7f || idp[1] != 'E' || idp[2] != 'L' || idp[3] != 'F')
+    {
+      error = clib_error_return (0, "not an ELF file '%s'", tm->input_file);
+      goto done;
+    }
+
+  in_run = 0;
+  run_length = 0;
+
+  for (i = 0; i < mmap_length; i++)
+    {
+      if (idp[i] == '/')
+        {
+          if (in_run)
+            run_length++;
+          else
+            {
+              in_run = 1;
+              run_length = 1;
+            }
+        }
+      else
+        {
+          if (in_run && run_length >= 16)
+            {
+              if (offset0 == 0)
+                  offset0 = (i - run_length);
+              else if (offset1 == 0)
+                {
+                  offset1 = (i - run_length);
+                  goto found_both;
+                }
+            }
+          in_run = 0;
+          run_length = 0;
+        }
+    }
+
+  if (offset0 == 0)
+    {
+      error = clib_error_return (0, "no fixup markers in %s", 
+                                 tm->input_file);
+      goto done;
+    }
+
+ found_both:
+  if (0)
+    clib_warning ("offset0 %lld (0x%llx), offset1 %lld (0x%llx)", 
+                  offset0, offset0, offset1, offset1);
+
+  /* Executable file case */
+  if (offset0 && offset1)
+    {
+      tm->interpreter_offset = offset0;
+      tm->rpath_offset = offset1;
+    }
+  else /* shared library case */                         
+    {
+      tm->interpreter_offset = 0;
+      tm->rpath_offset = offset0;
+    }
+  
+  if (tm->interpreter_offset)
+    clib_memcpy (&idp[tm->interpreter_offset], tm->set_interpreter, 
+            strlen (tm->set_interpreter)+1);
+
+  if (tm->rpath_offset)
+    clib_memcpy (&idp[tm->rpath_offset], tm->set_rpath, 
+            strlen (tm->set_rpath)+1);
+
+  /* Write the output file... */
+  if (fix_in_place == 0)
+    {
+      ofd = open (tm->output_file, O_RDWR | O_CREAT | O_TRUNC, 0644);
+      if (ofd < 0)
+        {
+          error = clib_error_return_unix (0, "create `%s'", tm->output_file);
+          goto done;
+        }
+
+      if (write (ofd, idp, mmap_length) != mmap_length)
+        error = clib_error_return_unix (0, "write `%s'", tm->output_file);
+    }
+
+ done:
+  if (mmap_length > 0 && idp)
+    munmap (idp, mmap_length);
+  if (ifd >= 0)
+    close (ifd);
+  if (ofd >= 0)
+    close (ofd);
+  return error;
+}
+
+
+int main (int argc, char * argv[])
+{
+  elf_tool_main_t _tm, * tm = &_tm;
+  elf_main_t * em = &tm->elf_main;
+  unformat_input_t i;
+  clib_error_t * error = 0;
+
+  memset (tm, 0, sizeof (tm[0]));
+  unformat_init_command_line (&i, argv);
+
+  while (unformat_check_input (&i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (&i, "in %s", &tm->input_file))
+	;
+      else if (unformat (&i, "out %s", &tm->output_file))
+	;
+      else if (unformat (&i, "set-interpreter %s", &tm->set_interpreter))
+	;
+      else if (unformat (&i, "set-rpath %s", &tm->set_rpath))
+	;
+      else if (unformat (&i, "unset-rpath"))
+	tm->unset_rpath = 1;
+      else if (unformat (&i, "verbose"))
+	tm->verbose = ~0;
+      else if (unformat (&i, "verbose-symbols"))
+	tm->verbose |= FORMAT_ELF_MAIN_SYMBOLS;
+      else if (unformat (&i, "verbose-relocations"))
+	tm->verbose |= FORMAT_ELF_MAIN_RELOCATIONS;
+      else if (unformat (&i, "verbose-dynamic"))
+	tm->verbose |= FORMAT_ELF_MAIN_DYNAMIC;
+      else if (unformat (&i, "quiet"))
+	tm->quiet = 1;
+      else if (unformat (&i, "allow-elf-shared"))
+        tm->allow_elf_shared = 1;
+      else
+	{
+	  error = unformat_parse_error (&i);
+	  goto done;
+	}
+    }
+
+  if (! tm->input_file)
+    {
+      error = clib_error_return (0, "no input file");
+      goto done;
+    }
+
+  /* Do the typical case a stone-simple way... */
+  if (tm->quiet && tm->set_interpreter && tm->set_rpath && tm->output_file)
+    {
+      error = set_interpreter_rpath (tm);
+      goto done;
+    }
+
+  error = elf_read_file (em, tm->input_file);
+
+  if (error)
+    goto done;
+
+  if (tm->verbose)
+    fformat (stdout, "%U", format_elf_main, em, tm->verbose);
+
+  if (tm->set_interpreter)
+    {
+      error = elf_set_interpreter (em, tm);
+      if (error)
+	goto done;
+    }
+
+  if (tm->set_rpath)
+    {
+      error = set_rpath (em, tm->set_rpath);
+      if (error)
+	goto done;
+    }
+
+  if (tm->unset_rpath)
+    delete_rpath (em);
+
+  if (tm->output_file)
+    error = elf_write_file (em, tm->output_file);
+
+  elf_main_free (em);
+
+ done:
+  if (error)
+    {
+      if (tm->quiet == 0)
+        clib_error_report (error);
+      return 1;
+    }
+  else
+    return 0;
+}
diff --git a/src/tools/g2/clib.c b/src/tools/g2/clib.c
new file mode 100644
index 00000000..6454c84d
--- /dev/null
+++ b/src/tools/g2/clib.c
@@ -0,0 +1,154 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2009-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/elog.h>
+#include <pwd.h>
+#include <stdarg.h>
+#include <time.h>
+#include "cpel.h"
+#include "g2.h"
+
+int widest_track_format;
+
+typedef struct bound_track_ {
+    u32 track;
+    u8  *track_str;
+} bound_track_t;
+
+bound_track_t *bound_tracks;
+
+uword *the_evtdef_hash; /* (event-id, event-definition) hash */
+uword *the_trackdef_hash; /* (track-id, track-definition) hash */
+
+elog_main_t elog_main;
+
+void *get_clib_event (unsigned int datum)
+{
+    elog_event_t *ep = vec_elt_at_index (elog_main.events, datum);
+    return (void *)ep;
+}
+
+/*
+ * read_clib_file
+ */
+int read_clib_file(char *clib_file)
+{
+    static FILE *ofp;
+    clib_error_t *error = 0;
+    int i;
+    elog_main_t *em = &elog_main;
+    double starttime, delta;
+
+    vec_free(em->events);
+    vec_free(em->event_types);
+    if (the_trackdef_hash)
+        hash_free(the_trackdef_hash);
+
+    the_trackdef_hash = hash_create (0, sizeof (uword));
+
+    error = elog_read_file (&elog_main, clib_file);
+
+    if (error) {
+        fformat(stderr, "%U", format_clib_error, error);
+        return (1);
+    }
+
+    if (ofp == NULL) {
+        ofp = fdopen(2, "w");
+        if (ofp == NULL) {
+            fprintf(stderr, "Couldn't fdopen(2)?\n");
+            exit(1);
+        }
+    }
+
+    em = &elog_main;
+
+    for (i = 0; i < vec_len (em->tracks); i++) {
+        u32 track_code;
+        bound_track_t * btp;
+        elog_track_t * t;
+        uword * p;
+        int track_strlen;
+
+        t = &em->tracks[i];
+        track_code = i;
+        p = hash_get(the_trackdef_hash, track_code);
+        if (p) {
+            fprintf(ofp, "track %d redefined, retain first definition\n",
+                    track_code);
+            continue;
+        }
+        vec_add2(bound_tracks, btp, 1);
+        btp->track = track_code;
+        btp->track_str = (u8 *) t->name;
+        hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
+
+        track_strlen = strlen((char *)btp->track_str);
+        if (track_strlen > widest_track_format)
+            widest_track_format = track_strlen;
+    }
+
+    initialize_events();
+
+    for (i = 0; i < vec_len (em->event_types); i++) {
+        elog_event_type_t *ep;
+        u8 *tmp;
+
+        ep = vec_elt_at_index(em->event_types, i);
+        tmp = (u8 *) vec_dup(ep->format);
+        vec_add1(tmp,0);
+        add_event_from_clib_file (ep->type_index_plus_one, (char *) tmp, i);
+        vec_free(tmp);
+    }
+
+    finalize_events();
+
+    em->events = elog_get_events (em);
+
+    cpel_event_init(vec_len(em->events));
+
+    starttime = em->events[0].time;
+
+    for (i = 0; i < vec_len (em->events); i++) {
+        elog_event_t *ep;
+
+        ep = vec_elt_at_index(em->events, i);
+
+        delta = ep->time - starttime;
+
+        add_clib_event (delta, ep->track, ep->type + 1, i);
+    }
+
+    cpel_event_finalize();
+
+    set_pid_ax_width(8*widest_track_format);
+
+    return(0);
+}
diff --git a/src/tools/g2/configure.ac b/src/tools/g2/configure.ac
new file mode 100644
index 00000000..c8af7747
--- /dev/null
+++ b/src/tools/g2/configure.ac
@@ -0,0 +1,12 @@
+AC_INIT(g2, 3.0)
+AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
+
+AC_CHECK_LIB([vppinfra], [clib_mem_get_page_size],,
+        AC_MSG_ERROR([Please install the vpp-lib package]))
+AC_CHECK_HEADER([vppinfra/clib.h],,
+        AC_MSG_ERROR([Please install the vpp-dev package]))
+
+PKG_CHECK_MODULES(g2, gtk+-2.0)
+
+AC_OUTPUT([Makefile])
diff --git a/src/tools/g2/cpel.c b/src/tools/g2/cpel.c
new file mode 100644
index 00000000..8bcc91e6
--- /dev/null
+++ b/src/tools/g2/cpel.c
@@ -0,0 +1,470 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2005-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <pwd.h>
+#include <stdarg.h>
+#include <time.h>
+#include "cpel.h"
+#include "g2.h"
+
+typedef struct bound_event_ {
+    u32 event_code;
+    u8  *event_str;
+    u8  *datum_str;
+} bound_event_t;
+
+bound_event_t *bound_events;
+
+int widest_track_format=8;
+
+typedef struct bound_track_ {
+    u32 track;
+    u8  *track_str;
+} bound_track_t;
+
+bound_track_t *bound_tracks;
+
+uword *the_strtab_hash; /* (name, base-VA) hash of all string tables */
+uword *the_evtdef_hash; /* (event-id, event-definition) hash */
+uword *the_trackdef_hash; /* (track-id, track-definition) hash */
+u8 *event_strtab;         /* event string-table */
+
+void fatal(char *s)
+{
+    fprintf(stderr, "%s", s);
+    exit(1);
+}
+
+typedef enum {
+    PASS1=1,
+    PASS2=2,
+} pass_t;
+
+typedef struct {
+    int (*pass1)(cpel_section_header_t *, int, FILE *);
+    int (*pass2)(cpel_section_header_t *, int, FILE *);
+} section_processor_t;
+
+int bad_section(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    fprintf(ofp, "Bad (type 0) section, skipped...\n");
+    return(0);
+}
+
+int noop_pass(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    return(0);
+}
+
+int strtab_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    uword *p;
+    u8 *strtab_data_area = (u8 *)(sh+1);
+    
+    /* Multiple string tables with the same name are Bad... */
+    p = hash_get_mem(the_strtab_hash, strtab_data_area);
+    if (p) {
+        fprintf(ofp, "Duplicate string table name %s", strtab_data_area);
+    }
+    /*
+     * Looks funny, but we really do want key = first string in the
+     * table, value = address(first string in the table) 
+     */
+    hash_set_mem(the_strtab_hash, strtab_data_area, strtab_data_area);
+    if (verbose) {
+        fprintf(ofp, "String Table %s\n", strtab_data_area);
+    }
+    return(0);
+}
+
+int evtdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    int i, nevents;
+    event_definition_section_header_t *edh;
+    event_definition_t *ep;
+    u8 *this_strtab;
+    u32 event_code;
+    uword *p;
+    bound_event_t *bp;
+
+    edh = (event_definition_section_header_t *)(sh+1);
+    nevents = ntohl(edh->number_of_event_definitions);
+    
+    if (verbose) {
+        fprintf(ofp, "Event Definition Section: %d definitions\n",
+                nevents);
+    }
+
+    p = hash_get_mem(the_strtab_hash, edh->string_table_name);
+    if (!p) {
+        fprintf(ofp, "Fatal: couldn't find string table\n");
+        return(1);
+    }
+    this_strtab = (u8 *)p[0];
+
+    initialize_events();
+
+    ep = (event_definition_t *)(edh+1);
+    
+    for (i = 0; i < nevents; i++) {
+        event_code = ntohl(ep->event);
+        p = hash_get(the_evtdef_hash, event_code);
+        if (p) {
+            fprintf(ofp, "Event %d redefined, retain first definition\n",
+                    event_code);
+            continue;
+        }
+        vec_add2(bound_events, bp, 1);
+        bp->event_code = event_code;
+        bp->event_str = this_strtab + ntohl(ep->event_format);
+        bp->datum_str = this_strtab + ntohl(ep->datum_format);
+        hash_set(the_evtdef_hash, event_code, bp - bound_events);
+
+        add_event_from_cpel_file(event_code, (char *) bp->event_str, 
+                                 (char *)bp->datum_str);
+
+        ep++;
+    }
+
+    finalize_events();
+    return (0);
+}
+
+int trackdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    int i, nevents;
+    track_definition_section_header_t *tdh;
+    track_definition_t *tp;
+    u8 *this_strtab;
+    u32 track_code;
+    uword *p;
+    bound_track_t *btp;
+    int track_strlen;
+
+    tdh = (track_definition_section_header_t *)(sh+1);
+    nevents = ntohl(tdh->number_of_track_definitions);
+    
+    if (verbose) {
+        fprintf(ofp, "Track Definition Section: %d definitions\n",
+                nevents);
+    }
+
+    p = hash_get_mem(the_strtab_hash, tdh->string_table_name);
+    if (!p) {
+        fprintf(ofp, "Fatal: couldn't find string table\n");
+        return(1);
+    }
+    this_strtab = (u8 *)p[0];
+
+    tp = (track_definition_t *)(tdh+1);
+    
+    for (i = 0; i < nevents; i++) {
+        track_code = ntohl(tp->track);
+        p = hash_get(the_trackdef_hash, track_code);
+        if (p) {
+            fprintf(ofp, "track %d redefined, retain first definition\n",
+                    track_code);
+            continue;
+        }
+        vec_add2(bound_tracks, btp, 1);
+        btp->track = track_code;
+        btp->track_str = this_strtab + ntohl(tp->track_format);
+        hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
+
+        track_strlen = strlen((char *)btp->track_str);
+        if (track_strlen > widest_track_format)
+            widest_track_format = track_strlen;
+        tp++;
+    }
+    return (0);
+}
+
+int unsupported_pass (cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    if (verbose) {
+        fprintf(ofp, "Unsupported type %d section\n",
+                ntohl(sh->section_type));
+    }
+    return(0);
+}
+
+int event_pass2(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    event_section_header_t *eh;
+    u32 event_code, track_code, datum;
+    u64 starttime = ~0ULL;
+    int nevents;
+    int i;
+    event_entry_t *ep;
+    u64 now;
+    u64 delta;
+    u32 time0, time1;
+    double d;
+    uword *p;
+
+    eh = (event_section_header_t *)(sh+1);
+    nevents = ntohl(eh->number_of_events);
+    ticks_per_ns = ntohl(eh->clock_ticks_per_second)/1e9;
+    ep = (event_entry_t *)(eh+1);
+
+    p = hash_get_mem(the_strtab_hash, eh->string_table_name);
+    if (!p) {
+        fprintf(ofp, "Fatal: couldn't find string table\n");
+        return(1);
+    }
+    event_strtab = (u8 *)p[0];
+
+    cpel_event_init(nevents);
+
+    for (i = 0; i < nevents; i++) {
+        time0 = ntohl (ep->time[0]);
+        time1 = ntohl (ep->time[1]);
+
+        now = (((u64) time0)<<32) | time1;
+        
+        /* Convert from bus ticks to usec */
+        d = now;
+        d /= ticks_per_ns;
+
+        now = d;
+
+        if (starttime == ~0ULL)
+            starttime = now;
+        
+        delta = now - starttime;
+
+        /* Delta = time since first event, in usec */
+        event_code = ntohl(ep->event_code);
+        track_code = ntohl(ep->track);
+        datum = ntohl(ep->event_datum);
+
+        add_cpel_event(delta, track_code, event_code, datum);
+
+        ep++;
+    }
+    cpel_event_finalize();
+    return(0);
+}
+
+char *strtab_ref(unsigned long datum)
+{
+    return ((char *)(event_strtab + datum));
+}
+
+/* 
+ * Note: If necessary, add passes / columns to this table to 
+ * handle section order dependencies.
+ */
+
+section_processor_t processors[CPEL_NUM_SECTION_TYPES+1] =
+{
+    {bad_section,	noop_pass}, 		/* type 0 -- f**ked */
+    {strtab_pass1, 	noop_pass}, 		/* type 1 -- STRTAB */
+    {unsupported_pass,  noop_pass}, 		/* type 2 -- SYMTAB */
+    {evtdef_pass1,      noop_pass},             /* type 3 -- EVTDEF */
+    {trackdef_pass1,    noop_pass},		/* type 4 -- TRACKDEF */
+    {noop_pass,         event_pass2},           /* type 5 -- EVENTS */
+};
+
+
+int process_section(cpel_section_header_t *sh, int verbose, FILE *ofp,
+                    pass_t pass)
+{
+    u32 type;
+    type = ntohl(sh->section_type);
+    int rv;
+    int (*fp)(cpel_section_header_t *, int, FILE *);
+
+    if (type > CPEL_NUM_SECTION_TYPES) {
+        fprintf(stderr, "Unknown section type %d\n", type);
+        return(1);
+    }
+    switch(pass) {
+    case PASS1:
+        fp = processors[type].pass1;
+        break;
+
+    case PASS2:
+        fp = processors[type].pass2;
+        break;
+        
+    default:
+        fprintf(stderr, "Unknown pass %d\n", pass);
+        return(1);
+    }
+
+    rv = (*fp)(sh, verbose, ofp);
+
+    return(rv);
+}
+
+int cpel_dump_file_header(cpel_file_header_t *fh, int verbose, FILE *ofp)
+{
+    time_t file_time;
+
+    if (verbose) {
+        fprintf(ofp, "CPEL file: %s-endian, version %d\n",
+                ((fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) ? 
+                 "little" : "big"), 
+                fh->endian_version & CPEL_FILE_VERSION_MASK);
+
+        file_time = ntohl(fh->file_date);
+
+        fprintf(ofp, "File created %s", ctime(&file_time));
+    }
+
+    return(0);
+}
+
+
+int cpel_process(u8 *cpel, int verbose, FILE *ofp)
+{
+    cpel_file_header_t *fh;
+    cpel_section_header_t *sh;
+    u16 nsections;
+    u32 section_size;
+    int i;
+
+    /* First, the file header */
+    fh = (cpel_file_header_t *)cpel;
+    if (fh->endian_version != CPEL_FILE_VERSION) {
+        if (fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) {
+            fprintf(stderr, "Little endian data format not supported\n");
+            return(1);
+        }
+        fprintf(stderr, "Unsupported file version 0x%x\n", 
+                fh->endian_version);
+        return(1);
+    }
+    cpel_dump_file_header(fh, verbose, ofp);
+    nsections = ntohs(fh->nsections);
+
+    /*
+     * Take two passes through the file. PASS1 builds
+     * data structures, PASS2 actually dumps the file.
+     * Just in case the sections are in an unobvious order.
+     */
+    sh = (cpel_section_header_t *)(fh+1);
+    for (i = 0; i < nsections; i++) {
+        section_size = ntohl(sh->data_length);
+
+        if(verbose) {
+            fprintf(ofp, "Section type %d, size %d\n", ntohl(sh->section_type),
+                    section_size);
+        }
+
+        if(process_section(sh, verbose, ofp, PASS1))
+            return(1);
+
+        sh++;
+        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
+    }
+
+    sh = (cpel_section_header_t *)(fh+1);
+    for (i = 0; i < nsections; i++) {
+        if(process_section(sh, verbose, ofp, PASS2))
+            return(1);
+        section_size = ntohl(sh->data_length);
+        sh++;
+        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
+    }
+
+
+    return(0);
+}
+
+/*
+ * read_cpel_file
+ */
+int read_cpel_file(char *cpel_file)
+{
+    int verbose = 0;
+    int rv;
+    static u8 *cpel;
+    static unsigned long size;
+    static FILE *ofp;
+
+    if (cpel) {
+        unmapfile((char *)cpel, size);
+        hash_free(the_strtab_hash);
+        the_strtab_hash = 0;
+        hash_free(the_evtdef_hash);
+        the_evtdef_hash = 0;
+        hash_free(the_trackdef_hash);
+        the_trackdef_hash = 0;
+    }
+
+    cpel = (u8 *)mapfile((char *)cpel_file, &size);
+    if (cpel == 0) {
+        fprintf(stderr, "Couldn't map %s...\n", cpel_file);
+        exit(1);
+    }
+
+    if (ofp == NULL) {
+        ofp = fdopen(2, "w");
+        if (ofp == NULL) {
+            fprintf(stderr, "Couldn't fdopen(2)?\n");
+            exit(1);
+        }
+    }
+
+    the_strtab_hash = hash_create_string (0, sizeof (uword));
+    the_evtdef_hash = hash_create (0, sizeof (uword));
+    the_trackdef_hash = hash_create (0, sizeof (uword));
+
+    rv = cpel_process(cpel, verbose, ofp);
+
+    set_pid_ax_width(8*widest_track_format);
+
+    return(rv);
+}
+
+static bound_track_t generic_hex_track = {0, (u8 *) "0x%08x"};
+static bound_track_t generic_decimal_track = {0, (u8 *) "%8ld"};
+
+/*
+ * get_track_label
+ */
+char *get_track_label(unsigned long track)
+{
+    uword *p;
+    bound_track_t *tp;
+
+    p = hash_get(the_trackdef_hash, track);
+    if (p) {
+        tp = &bound_tracks[p[0]];
+    } else {
+        if (track > 65535) 
+            tp = &generic_hex_track;
+        else
+            tp = &generic_decimal_track;
+    }
+    return((char *)tp->track_str);
+}
diff --git a/src/tools/g2/cpel.h b/src/tools/g2/cpel.h
new file mode 100644
index 00000000..73e4aea5
--- /dev/null
+++ b/src/tools/g2/cpel.h
@@ -0,0 +1,83 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2005-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _CPEL_H_
+#define _CPEL_H_ 1
+
+typedef struct cpel_file_header_ {
+    unsigned char endian_version;
+    unsigned char pad;
+    unsigned short nsections;
+    unsigned file_date;
+} cpel_file_header_t;
+
+#define CPEL_FILE_LITTLE_ENDIAN	0x80
+#define CPEL_FILE_VERSION       0x01
+#define CPEL_FILE_VERSION_MASK  0x7F
+
+typedef struct cpel_section_header_ {
+    unsigned int section_type;
+    unsigned int data_length;        /* does NOT include type and itself */
+} cpel_section_header_t;
+
+#define CPEL_SECTION_STRTAB	1
+/* string at offset 0 is the name of the table */
+
+#define CPEL_SECTION_SYMTAB     2
+#define CPEL_SECTION_EVTDEF     3
+
+typedef struct event_definition_section_header_ {
+    char string_table_name[64];
+    unsigned int number_of_event_definitions;
+} event_definition_section_header_t;
+
+typedef struct event_definition_ {
+    unsigned int event;
+    unsigned int event_format;
+    unsigned int datum_format;
+} event_definition_t;
+
+#define CPEL_SECTION_TRACKDEF   4
+
+typedef struct track_definition_section_header_ {
+    char string_table_name[64];
+    unsigned int number_of_track_definitions;
+} track_definition_section_header_t;
+
+typedef struct track_definition_ {
+    unsigned int track;
+    unsigned int track_format;
+} track_definition_t;
+
+#define CPEL_SECTION_EVENT      5
+
+typedef struct event_section_header_ {
+    char string_table_name[64];
+    unsigned int number_of_events;
+    unsigned int clock_ticks_per_second;
+} event_section_header_t;
+
+typedef struct event_entry_ {
+    unsigned int time[2];
+    unsigned int track;
+    unsigned int event_code;
+    unsigned int event_datum;
+} event_entry_t;
+
+#define CPEL_NUM_SECTION_TYPES 5
+
+#endif /* _CPEL_H_ */
+
diff --git a/src/tools/g2/events.c b/src/tools/g2/events.c
new file mode 100644
index 00000000..d4333bb0
--- /dev/null
+++ b/src/tools/g2/events.c
@@ -0,0 +1,475 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2005-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/fcntl.h>
+#include <sys/mman.h>
+#include <arpa/inet.h>
+#include <stdio.h>
+#include <gtk/gtk.h>
+#include "g2.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+
+/*
+ * globals
+ */
+boolean g_little_endian;
+event_t *g_events;
+ulong g_nevents;
+pid_sort_t *g_pids;
+pid_sort_t *g_original_pids;
+int g_npids;
+pid_data_t *g_pid_data_list;
+
+/*
+ * locals
+ */
+pid_data_t **s_pidhash;
+
+/*
+ * config parameters
+ */
+
+double ticks_per_ns=1000.0;
+boolean ticks_per_ns_set;
+
+/****************************************************************************
+* event_init
+****************************************************************************/
+
+void event_init(void)
+{
+    ulong endian;
+    char *ep;
+    char *askstr;
+    int tmp;
+
+    ep = (char *)&endian;
+    endian = 0x12345678;
+    if (*ep != 0x12)
+        g_little_endian = TRUE;
+    else
+        g_little_endian = FALSE;
+
+    askstr = getprop("dont_ask_ticks_per_ns_initially");
+    
+    if (askstr && (*askstr == 't' || *askstr == 'T')) {
+        tmp = atol(getprop_default("ticks_per_ns", 0));
+        if (tmp > 0) {
+            ticks_per_ns = tmp;
+            ticks_per_ns_set = TRUE;
+        }
+    }
+}
+
+/****************************************************************************
+* find_or_add_pid
+****************************************************************************/
+
+pid_data_t *find_or_add_pid (ulong pid)
+{
+    pid_data_t *pp;
+    ulong bucket;
+
+    bucket = pid % PIDHASH_NBUCKETS;
+
+    pp = s_pidhash[bucket];
+
+    if (pp == 0) {
+        pp = g_malloc0(sizeof(pid_data_t));
+        pp->pid_value = pid;
+        s_pidhash[bucket] = pp;
+        g_npids++;
+        return(pp);
+    }
+    while (pp) {
+        if (pp->pid_value == pid)
+            return(pp);
+        pp = pp->next;
+    }
+
+    pp = g_malloc0(sizeof(pid_data_t));
+    pp->pid_value = pid;
+    pp->next = s_pidhash[bucket];
+    s_pidhash[bucket] = pp;
+    g_npids++;
+    return(pp);
+}
+
+/****************************************************************************
+* pid_cmp
+****************************************************************************/
+
+int pid_cmp(const void *a1, const void *a2)
+{
+    pid_sort_t *p1 = (pid_sort_t *)a1;
+    pid_sort_t *p2 = (pid_sort_t *)a2;
+
+    if (p1->pid_value < p2->pid_value)
+        return(-1);
+    else if (p1->pid_value == p2->pid_value)
+        return(0);
+    else
+        return(1);
+}
+
+/****************************************************************************
+* make_sorted_pid_vector
+****************************************************************************/
+
+static void make_sorted_pid_vector(void)
+{
+    pid_data_t *pp;
+    pid_data_t **p_previous;
+    pid_sort_t *psp;
+    int i;
+
+    psp = g_pids = g_malloc(sizeof(pid_sort_t)*g_npids);
+
+    for (i = 0; i < PIDHASH_NBUCKETS; i++) {
+        pp = s_pidhash[i];
+        while(pp) {
+            psp->pid = pp;
+            psp->pid_value = pp->pid_value;
+            psp++;
+            pp = pp->next;
+        }
+    }
+
+    qsort(&g_pids[0], g_npids, sizeof(pid_sort_t), pid_cmp);
+
+    /* put the sort order into the pid objects */
+    psp = g_pids;
+
+    /*
+     * This is rather gross.
+     *
+     * We happen to know that whenever this function is called, the hash table
+     * structure itself is immediately torn down. So the "next" pointers in the
+     * pid_data_t elements are about to become useless.
+     *
+     * So we re-use them, to link all the pid_data_t elements together into a
+     * single unified linked list, with g_pid_data_list pointing to the head.
+     * This means we can walk all the pid_data_t objects if we really want to.
+     * Reading snapshots from disk is one example.
+     *
+     * Alternatively we could just leave the hash table in place; this is
+     * far nicer, but as it happens, trading O(n) lookups for O(1) lookups
+     * isn't actually a problem for the restricted post-tear-down usage. So for
+     * now we take the memory savings and swap our hash table for a list.
+     */
+    p_previous = &g_pid_data_list;
+    for (i = 0; i < g_npids; i++) {
+        pp = psp->pid;
+        pp->pid_index = i;
+        *p_previous = pp;
+        p_previous = &pp->next;
+        psp++;
+    }
+    *p_previous = NULL;
+
+    /*
+     * Squirrel away original (sorted) vector, so we can
+     * toggle between "chase" mode, snapshots, and the original
+     * display method on short notice 
+     */
+    g_original_pids = g_malloc(sizeof(pid_sort_t)*g_npids);
+    memcpy (g_original_pids, g_pids, sizeof(pid_sort_t)*g_npids); 
+}
+
+/****************************************************************************
+* read_events
+****************************************************************************/
+
+void read_events(char *filename)
+{
+    ulong *ulp;
+    ulong size;
+    event_t *ep;
+    raw_event_t *rep;
+    ulonglong start_time=0ULL;
+    ulonglong low_time;
+    boolean once=TRUE;
+    int i;
+    char tmpbuf [128];
+
+    ulp = (ulong *)mapfile(filename, &size);
+
+    if (ulp == NULL) {
+        sprintf(tmpbuf, "Couldn't open %s\n", filename);
+        infobox("Read Event Log Failure", tmpbuf);
+        return;
+    }
+
+    g_nevents = ntohl(*ulp);
+
+    if (size != (g_nevents*sizeof(raw_event_t) + sizeof(g_nevents))) {
+        sprintf(tmpbuf, "%s was damaged, or isn't an event log.\n", filename);
+        infobox("Bad Input File", tmpbuf);
+        g_nevents = 0;
+        unmapfile((char *)ulp, size);
+        return;
+    }
+
+    rep = (raw_event_t *)(ulp+1);
+
+    if (g_events)
+        g_free(g_events);
+
+    g_events = (event_t *)g_malloc(g_nevents * sizeof(event_t));
+    ep = g_events;
+
+    while (g_npids > 0) {
+        g_free((g_pids + g_npids-1)->pid);
+        g_npids--;
+    }
+    if (g_pids) {
+        g_free(g_pids);
+        g_free(g_original_pids);
+        g_pids = 0;
+        g_original_pids = 0;
+    }
+
+    s_pidhash = (pid_data_t **)g_malloc0(
+        PIDHASH_NBUCKETS*sizeof(pid_data_t *));
+
+    /* $$$ add a SEGV handler... */
+    for (i = 0; i < g_nevents; i++) {
+        if (once) {
+            once = FALSE;
+            start_time = ((ulonglong)ntohl(rep->time[0]));
+            start_time <<= 32;
+            low_time = ntohl(rep->time[1]);
+            low_time &= 0xFFFFFFFF;
+            start_time |= low_time;
+            ep->time = 0LL;
+        } else {
+            ep->time = ((ulonglong)ntohl(rep->time[0]));
+            ep->time <<= 32;
+            low_time = ntohl(rep->time[1]);
+            low_time &= 0xFFFFFFFF;
+            ep->time |= low_time;
+            ep->time -= start_time;
+            ep->time /= ticks_per_ns;
+        }
+        ep->code = ntohl(rep->code);
+        ep->pid = find_or_add_pid(ntohl(rep->pid));
+        ep->datum = ntohl(rep->datum);
+        ep->flags = 0;
+        ep++;
+        rep++;
+    }
+
+    unmapfile((char *)ulp, size);
+    
+    make_sorted_pid_vector();
+    g_free(s_pidhash);
+    s_pidhash = 0;
+
+    /* Give the view-1 world a chance to reset a few things... */
+    view1_read_events_callback();
+}
+
+static event_t *add_ep;
+
+/****************************************************************************
+* cpel_event_init
+****************************************************************************/
+void cpel_event_init (ulong nevents)
+{
+    g_nevents = nevents;
+    if (g_events)
+        g_free(g_events);
+    add_ep = g_events = (event_t *)g_malloc(g_nevents * sizeof(event_t));
+    while (g_npids > 0) {
+        g_free((g_pids + g_npids-1)->pid);
+        g_npids--;
+    }
+    if (g_pids) {
+        g_free(g_pids);
+        g_free(g_original_pids);
+        g_pids = 0;
+        g_original_pids = 0;
+    }
+    s_pidhash = (pid_data_t **)g_malloc0(
+        PIDHASH_NBUCKETS*sizeof(pid_data_t *));
+}
+
+/****************************************************************************
+* add_cpel_event
+****************************************************************************/
+
+void add_cpel_event(ulonglong delta, ulong track, ulong event, ulong datum)
+{
+    event_t *ep;
+
+    ep = add_ep++;
+    ep->time = delta;
+    ep->pid = find_or_add_pid(track);
+    ep->code = event;
+    ep->datum = datum;
+    ep->flags = 0;
+}
+
+/****************************************************************************
+* add_clib_event
+****************************************************************************/
+
+void add_clib_event(double delta, unsigned short track, 
+                    unsigned short event, unsigned int index)
+{
+    event_t *ep;
+
+    ep = add_ep++;
+    ep->time = (ulonglong) (delta * 1e9); /* time in intger nanoseconds */
+    ep->pid = find_or_add_pid(track);
+    ep->code = event;
+    ep->datum = index;
+    ep->flags = EVENT_FLAG_CLIB;
+}
+
+/****************************************************************************
+* cpel_event_finalize
+****************************************************************************/
+
+void cpel_event_finalize(void)
+{
+    make_sorted_pid_vector();
+    g_free(s_pidhash);
+    s_pidhash = 0;
+    
+    /* Give the view-1 world a chance to reset a few things... */
+    view1_read_events_callback();
+}
+
+/****************************************************************************
+* mapfile
+****************************************************************************/
+
+char *mapfile (char *file, ulong *sizep)
+{
+    struct stat statb;
+    char *rv;
+    int maphfile;
+    size_t mapfsize;
+    
+    maphfile = open (file, O_RDONLY);
+
+    if (maphfile < 0)
+        return (NULL);
+
+    if (fstat (maphfile, &statb) < 0) {
+        return (NULL);
+    }
+
+    /* Don't try to mmap directories, FIFOs, semaphores, etc. */
+    if (! (statb.st_mode & S_IFREG)) {
+        return (NULL);
+    }
+
+    mapfsize = statb.st_size;
+
+    if (mapfsize < 3) {
+        close (maphfile);
+        return (NULL);
+    }
+
+    rv = mmap (0, mapfsize, PROT_READ, MAP_SHARED, maphfile, 0);
+
+    if (rv == 0) {
+        g_error ("%s mapping problem, I quit...\n", file);
+    }
+
+    close (maphfile);
+
+    if (madvise (rv, mapfsize, MADV_SEQUENTIAL) < 0) {
+        return (rv);
+    }
+
+    if (sizep) {
+        *sizep = mapfsize;
+    }
+    return (rv);
+}
+
+/****************************************************************************
+* unmapfile
+****************************************************************************/
+
+boolean unmapfile (char *addr, ulong size)
+{
+    if (munmap (addr, size) < 0) {
+        g_warning("Unmap error, addr 0x%lx size 0x%x\n", 
+                  (unsigned long) addr, (unsigned int)size);
+        return(FALSE);
+    }
+    return(TRUE);
+}
+
+/****************************************************************************
+* find_event_index
+* Binary search for first event whose time is >= t
+****************************************************************************/
+
+int find_event_index (ulonglong t)
+{
+    int index, bottom, top;
+    event_t *ep;
+
+    bottom = g_nevents-1;
+    top = 0;
+
+    while (1) {
+	index = (bottom + top) / 2;
+
+        ep = (g_events + index);
+
+        if (ep->time == t)
+            return(index);
+
+        if (top >= bottom) {
+            while (index > 0 && ep->time > t) {
+                ep--;
+                index--;
+            }
+            while (index < g_nevents && ep->time < t) {
+                ep++;
+                index++;
+            }
+            return(index);
+        }
+
+        if (ep->time < t)
+            top = index + 1;
+        else 
+            bottom = index - 1;
+    }
+}
+
+/****************************************************************************
+* events_about
+****************************************************************************/
+
+void events_about (char *tmpbuf)
+{
+    sprintf(tmpbuf+strlen(tmpbuf), "%d total events, %.3f ticks per us\n", 
+            (int)g_nevents, ticks_per_ns);
+}
diff --git a/src/tools/g2/g2.h b/src/tools/g2/g2.h
new file mode 100644
index 00000000..1ab42191
--- /dev/null
+++ b/src/tools/g2/g2.h
@@ -0,0 +1,195 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2005-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * typedefs and so forth
+ */
+#include <sys/types.h>
+#include <gtk-2.0/gtk/gtk.h>
+#include <stdio.h>
+#include "props.h"
+
+typedef char boolean;
+typedef unsigned long long ulonglong;
+
+/*
+ * main.c
+ */
+
+GtkWidget *g_mainwindow;
+GtkWidget *g_mainvbox;
+GtkWidget *g_mainhbox;
+
+/*
+ * pointsel.c
+ */
+void point_selector_init(void);
+boolean read_event_definitions (char *filename);
+char *sxerox(char *);
+void pointsel_about(char *);
+void pointsel_next_snapshot(void);
+void initialize_events(void);
+void finalize_events(void);
+
+#define NEVENTS 100000
+
+typedef struct event_def_ {
+    ulong event;
+    char *name;
+    char *format;
+    boolean selected;
+    boolean is_clib;
+    char pad[2];
+} event_def_t;
+
+event_def_t *find_event_definition (ulong code);
+
+event_def_t g_eventdefs[NEVENTS];
+
+/*
+ * config params
+ */
+int c_maxpointsel;        /* max # points shown in selector dlg */
+gint c_view1_draw_width;
+gint c_view1_draw_height;
+
+/*
+ * menu1.c
+ */
+
+void menu1_init(void);
+void modal_dialog (char *label_text, char *retry_text, char *default_value, 
+                   boolean (*cb)(char *));
+void infobox(char *label_text, char *text);
+/*
+ * view1.c
+ */
+GdkFont *g_font;
+GdkColor fg_black, bg_white;
+void view1_init(void);
+void view1_display(void);
+void view1_read_events_callback(void);
+void view1_display_when_idle(void);
+void view1_print_callback(GtkToggleButton *item, gpointer data);
+void view1_about(char *);
+void set_pid_ax_width(int width);
+void set_window_title(const char *filename);
+
+enum view1_tbox_fn {
+    TBOX_DRAW_BOXED = 1,        /* note: order counts */
+	TBOX_DRAW_EVENT,
+    TBOX_DRAW_PLAIN,
+    TBOX_PRINT_BOXED,
+	TBOX_PRINT_EVENT,
+    TBOX_PRINT_PLAIN,           /* end restriction */
+    TBOX_GETRECT_BOXED,
+	TBOX_GETRECT_EVENT,
+    TBOX_GETRECT_PLAIN,
+};
+
+enum view1_line_fn {
+    LINE_DRAW_BLACK = 1,
+    LINE_DRAW_WHITE,
+    LINE_PRINT,
+};
+
+GdkRectangle *tbox (char *s, int x, int y, enum view1_tbox_fn function);
+void line (int x1, int y1, int x2, int y2, enum view1_line_fn function);
+gint view1_handle_key_press_event (GtkWidget *widget, GdkEventKey *event);
+
+/*
+ * events.c
+ */
+
+void events_about (char *);
+
+typedef struct raw_event {
+    unsigned long time[2];
+    unsigned long pid;
+    unsigned long code;
+    unsigned long datum;
+} raw_event_t;
+
+void event_init(void);
+char *mapfile (char *file, ulong *sizep);
+boolean unmapfile (char *addr, ulong size);
+void read_events (char *);
+int find_event_index (ulonglong t);
+int read_cpel_file(char *file);
+int read_clib_file(char *file);
+void cpel_event_init(ulong);
+void add_event_from_cpel_file(ulong, char * , char *);
+void add_event_from_clib_file(unsigned int event, char *name, 
+                              unsigned int vec_index);
+void add_cpel_event(ulonglong delta, ulong, ulong, ulong);
+void add_clib_event(double delta, unsigned short track, 
+                    unsigned short event, unsigned int index);
+void cpel_event_finalize(void);
+void *get_clib_event (unsigned int datum);
+
+typedef struct pid_data {
+    struct pid_data *next;
+    ulong pid_value;            /* The actual pid value */
+    ulong pid_index;            /* Index in pid sort order */
+} pid_data_t;
+    
+#define EVENT_FLAG_SELECT 	0x00000001 /* This event is selected */
+#define EVENT_FLAG_SEARCHRSLT   0x00000002 /* This event is the search rslt */
+#define EVENT_FLAG_CLIB         0x00000004 /* clib event */
+
+typedef struct pid_sort {
+    struct pid_data *pid;
+    ulong pid_value;
+    /*
+     * This is a bit of a hack, since this is used only by the view:
+     */
+    unsigned color_index;
+} pid_sort_t;
+
+typedef struct event {
+    ulonglong time;
+    ulong code;
+    pid_data_t *pid;
+    ulong datum;
+    ulong flags;
+} event_t;
+
+
+boolean g_little_endian;
+event_t *g_events;
+ulong g_nevents;
+pid_sort_t *g_pids;
+pid_sort_t *g_original_pids;
+int g_npids;
+pid_data_t *g_pid_data_list;
+
+#define PIDHASH_NBUCKETS	20021 /* Should be prime */
+
+boolean ticks_per_ns_set;
+double ticks_per_ns;
+
+/*
+ * version.c
+ */
+const char *version_string;
+const char *minor_v_string;
+
+/*
+ * cpel.c
+ */
+char *get_track_label(unsigned long);
+int widest_track_format;
+char *strtab_ref(unsigned long);
diff --git a/src/tools/g2/g2version.c b/src/tools/g2/g2version.c
new file mode 100644
index 00000000..4b6f9313
--- /dev/null
+++ b/src/tools/g2/g2version.c
@@ -0,0 +1,19 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2005-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const char *version_string = "G2 (x86_64 GNU/Linux) major version 3.0";
+const char *minor_v_string = 
+    "Built Wed Feb  3 10:58:12 EST 2016";
diff --git a/src/tools/g2/main.c b/src/tools/g2/main.c
new file mode 100644
index 00000000..a782e17f
--- /dev/null
+++ b/src/tools/g2/main.c
@@ -0,0 +1,196 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2005-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "g2.h"
+#include "props.h"
+#include <pwd.h>
+#include <strings.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+/*
+ * globals
+ */
+
+GtkWidget *g_mainwindow;        /* The main window */
+
+/* Graphical object heirarchy
+ *
+ * [main window]
+ *   [main vbox]
+ *     [main (e.g. file) menubar]
+ *     [view hbox] 
+ *     [view bottom menu]
+ */
+
+GtkWidget *g_mainvbox;
+GtkWidget *g_mainhbox;
+
+gint delete_event(GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+    /* Allow window to be destroyed */
+    return(FALSE);
+}
+
+void destroy(GtkWidget *widget, gpointer data)
+{
+    gtk_main_quit();
+}
+
+int main (int argc, char **argv)
+{
+    char tmpbuf [128];
+    struct passwd *pw;
+    char *event_file = 0;
+    char *cpel_file = 0;
+    char *clib_file =0;
+    char *title = "none";
+    int curarg=1;
+    char *homedir;
+    
+    gtk_init(&argc, &argv);
+
+    homedir = getenv ("HOME");
+    tmpbuf[0] = 0;
+
+    if (homedir) {
+        sprintf(tmpbuf, "%s/.g2", homedir);
+    } else {
+        pw = getpwuid(geteuid());
+        if (pw) {
+            sprintf(tmpbuf, "%s/.g2", pw->pw_dir);
+        }
+    }
+    if (tmpbuf[0])
+        readprops(tmpbuf);
+
+    g_mainwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+    gtk_signal_connect (GTK_OBJECT(g_mainwindow), "delete_event",
+                        GTK_SIGNAL_FUNC (delete_event), NULL);
+
+    gtk_signal_connect (GTK_OBJECT(g_mainwindow), "destroy",
+                        GTK_SIGNAL_FUNC (destroy), NULL);
+
+    gtk_container_set_border_width(GTK_CONTAINER(g_mainwindow), 5);
+
+    g_mainvbox = gtk_vbox_new(FALSE, 0);
+    g_mainhbox = gtk_hbox_new(FALSE, 0);
+
+    /* 
+     * init routines
+     */
+
+    menu1_init();
+    point_selector_init();
+    view1_init();
+    event_init();
+
+    /* 
+     * Now that we're ready to rock 'n roll, see if we've been asked to
+     * press a few buttons...
+     */
+    
+    while (curarg < argc) {
+        if (!strncmp(argv[curarg], "--cpel-input", 4)) {
+            curarg++;
+            if (curarg < argc) {
+                cpel_file = argv[curarg];
+                curarg++;
+                break;
+            }
+            g_error("Missing filename after --cpel-input");
+        }
+        if (!strncmp(argv[curarg], "--clib-input", 4)) {
+            curarg++;
+            if (curarg < argc) {
+                clib_file = argv[curarg];
+                curarg++;
+                break;
+            }
+            g_error("Missing filename after --cpel-input");
+        }
+
+        if (!strncmp(argv[curarg], "--pointdefs", 3)) {
+            curarg++;
+            if (curarg < argc) {
+                read_event_definitions(argv[curarg]);
+                curarg++;
+                continue;
+            }
+            g_error ("Missing filename after --pointdefs\n");
+        }
+        if (!strncmp(argv[curarg], "--event-log", 3)) {
+            curarg++;
+            if (curarg < argc) {
+                event_file = argv[curarg];
+                curarg++;
+                continue;
+            }
+            g_error ("Missing filename after --event-log\n");
+        }
+
+        if (!strncmp(argv[curarg], "--ticks-per-us", 3)) {
+            curarg++;
+            if (curarg < argc) {
+                ticks_per_ns = 0.0;
+                ticks_per_ns = atof(argv[curarg]);
+                if (ticks_per_ns == 0.0) {
+                    g_error("ticks-per-ns (%s) didn't convert properly\n",
+                            argv[curarg]);
+                }
+                ticks_per_ns_set = TRUE;
+                curarg++;
+                continue;
+            }
+            g_error ("Missing filename after --event-log\n");
+        }
+
+        fprintf(stderr, 
+                "g2 [--pointdefs <filename>] [--event-log <filename>]\n");
+        fprintf(stderr, "   [--ticks-per-us <value>]\n");
+        fprintf(stderr, 
+                "   [--cpel-input <filename>] [--clib-input <filename]>\n");
+        fprintf(stderr, 
+                "%s\n%s\n", version_string, minor_v_string);
+        exit(0);
+    }
+
+    if (clib_file) {
+        read_clib_file (clib_file);
+        title = clib_file;
+    } else if (cpel_file) {
+        read_cpel_file(cpel_file);
+        title = cpel_file;
+    } else if (event_file) {
+        read_events(event_file);
+        title = event_file;
+    }
+
+    set_window_title(title);
+
+    gtk_signal_connect (GTK_OBJECT (g_mainwindow), "key_press_event",
+                        (GtkSignalFunc) view1_handle_key_press_event, NULL);
+    gtk_container_add(GTK_CONTAINER(g_mainvbox), g_mainhbox);
+    gtk_widget_show(g_mainhbox);
+    gtk_container_add(GTK_CONTAINER(g_mainwindow), g_mainvbox);
+    gtk_widget_show(g_mainvbox);
+    gtk_widget_show(g_mainwindow);
+
+    gtk_main();
+    return(0);
+}
diff --git a/src/tools/g2/menu1.c b/src/tools/g2/menu1.c
new file mode 100644
index 00000000..fce81fa6
--- /dev/null
+++ b/src/tools/g2/menu1.c
@@ -0,0 +1,565 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2006-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <gtk/gtk.h>
+#define GTK_ENABLE_BROKEN // DGMS
+#include <gtk/gtktext.h>
+#include <stdlib.h>
+#include "g2.h"
+#include <string.h>
+
+/*
+ * locals
+ */
+static GtkWidget *s_mainmenubar;
+static GtkWidget *s_filemenu;
+static GtkWidget *s_readdefs;
+static GtkWidget *s_readevents;
+static GtkWidget *s_readeventsclock;
+static GtkWidget *s_readcpel;
+static GtkWidget *s_readclib;
+static GtkWidget *s_print;
+static GtkWidget *s_quit;
+
+static GtkWidget *s_mainfilemenu;
+static GtkWidget *s_help_general;
+static GtkWidget *s_help_about;
+static GtkWidget *s_mainhelpmenu;
+static GtkWidget *s_helpmenu;
+
+static GtkWidget *s_filesel;
+static GtkWidget *s_eventsel;
+
+typedef struct md_ {
+    GtkWidget *entry;
+    GtkWidget *label;
+    GtkWidget *dialog;
+    boolean (*callback)(char *);
+    char *retry_text;
+} md_t;
+
+char *general_help = "\n"
+"G2 is a performance event visualization tool.\n"
+"\n"
+"To view CPEL-format event data:\n"
+"g2 --cpel <filename>\n"
+"or use the File Menu->Read CPEL file option.\n"
+"\n"
+"To view vppinfra-format (.../open-repo/vppinfra/vppinfra/elog.h) event data:\n"
+"g2 --clib <filename>\n"
+"or use the File Menu->Read clib file option.\n"
+"\n"
+"To toggle event detail boxes, left-mouse-click on an event.\n"
+"\n"
+"To zoom to an area, depress the left mouse button. Move the\n"
+"mouse. Release the mouse.\n"
+"\n"
+"To use the time ruler, depress the right mouse button.  Move the\n"
+"mouse. Release when done.\n"
+"\n"
+"To push a track to the bottom, <ctrl><left-mouse>\n"
+"\n"
+"To pull a track to the top, <shift><left-mouse>\n"
+"\n"
+"To selectively color/uncolor a track, <ctrl><shift><left-mouse>\n"
+"\n"
+"To make the mouse scrollwheel faster, press <shift>\n"
+"\n"
+"Hotkeys, supposedly Quake-like:\n"
+"      w - zoom-in\n"
+"      s - zoom-out\n"
+"      a - pan-left\n"
+"      d - pan-right\n"
+"      r - pan-up\n"
+"      f - pan-down\n"
+"      t - less traces\n"
+"      g - more traces\n"
+"\n"
+"      e - toggle summary-mode\n"
+"      c - toggle color-mode\n"
+"\n"
+"      x - take snapshot\n"
+"      z - go to next snapshot\n"
+"      p - put snapshots to snapshots.g2 \n"
+"      l - load snapshots from snapshots.g2\n"
+"\n"
+"<ctrl>q - quit\n"
+"Send comments / bug reports to the \"fd.io\" mailing list.\n";
+
+/****************************************************************************
+* debug_dialog_callback
+****************************************************************************/
+
+boolean debug_dialog_callback (char *s)
+{
+    g_print("Dialog result: %s", s);
+    return (TRUE);
+}
+
+/****************************************************************************
+* get_dialog_value
+****************************************************************************/
+
+static void get_dialog_value (GtkWidget *dialog, gpointer user_data)
+{
+    md_t *md = (md_t *)user_data;
+    char * cb_arg;
+    
+    cb_arg = (char *) gtk_entry_get_text(GTK_ENTRY(md->entry));
+
+    if ((*md->callback)(cb_arg)) {
+	gtk_grab_remove(md->dialog);
+	gtk_widget_destroy(md->dialog);
+    } else {
+	gtk_label_set_text (GTK_LABEL(md->label), md->retry_text);
+    }
+}
+
+/****************************************************************************
+* modal_dialog
+****************************************************************************/
+
+void modal_dialog (char *label_text, char *retry_text, char *default_value, 
+                   boolean (*cb)(char *))
+{
+    GtkWidget *dialog, *label, *ok_button, *entry;
+    static md_t dlg;
+    md_t *md = &dlg;
+
+    dialog = gtk_dialog_new();
+    label = gtk_label_new(label_text);
+
+    entry = gtk_entry_new();
+    if (default_value)
+        gtk_entry_set_text(GTK_ENTRY(entry), default_value);
+
+    ok_button = gtk_button_new_with_label("OK");
+
+    md->entry = entry;
+    md->label = label;
+    md->retry_text = retry_text;
+    md->dialog = dialog;
+    if (cb)
+	md->callback = cb;
+    else
+	md->callback = debug_dialog_callback;
+
+    gtk_signal_connect (GTK_OBJECT (ok_button), "clicked", 
+                        GTK_SIGNAL_FUNC(get_dialog_value), (gpointer) md);
+
+    gtk_signal_connect (GTK_OBJECT (entry), "activate", 
+                        GTK_SIGNAL_FUNC(get_dialog_value), (gpointer) md);
+
+    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
+		      entry);
+
+    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
+		      ok_button);
+    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label);
+    gtk_widget_show_all(dialog);
+    gtk_widget_grab_focus(entry);
+    gtk_grab_add(dialog);
+}
+
+/****************************************************************************
+* get_eventdef_name
+****************************************************************************/
+
+static void get_eventdef_name (GtkFileSelection *sel, gpointer user_data)
+{
+    char *filename = (char *) gtk_file_selection_get_filename (
+        GTK_FILE_SELECTION(s_filesel));
+    read_event_definitions(filename);
+    set_window_title(filename);
+}
+
+/****************************************************************************
+* read_eventdef_callback
+****************************************************************************/
+
+static void read_eventdef_callback(GtkToggleButton *item, gpointer data)
+{
+    
+    s_filesel = gtk_file_selection_new("Read Event Definitions From...");
+    
+    gtk_file_selection_set_filename(GTK_FILE_SELECTION(s_filesel), 
+				    "../h/elog.h");
+
+    gtk_signal_connect (GTK_OBJECT (
+        GTK_FILE_SELECTION(s_filesel)->ok_button),
+                        "clicked", 
+                        GTK_SIGNAL_FUNC(get_eventdef_name), NULL);
+                            
+    gtk_signal_connect_object (GTK_OBJECT (
+        GTK_FILE_SELECTION(s_filesel)->ok_button),
+                               "clicked", 
+                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
+                               (gpointer) s_filesel);
+    
+    gtk_signal_connect_object (GTK_OBJECT (
+        GTK_FILE_SELECTION(s_filesel)->cancel_button),
+                               "clicked", 
+                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
+                               (gpointer) s_filesel);
+    gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(s_filesel));
+    gtk_widget_show (s_filesel);
+}
+
+/****************************************************************************
+* get_events_name
+****************************************************************************/
+
+static void get_events_name (GtkFileSelection *sel, gpointer user_data)
+{
+    char *filename = (char *) gtk_file_selection_get_filename (
+        GTK_FILE_SELECTION(s_eventsel));
+    read_events(filename);
+    view1_display_when_idle();
+}
+
+
+/****************************************************************************
+* get_ticks_per_ns
+****************************************************************************/
+
+static boolean get_ticks_per_ns (char *value)
+{
+    double rv;
+
+    rv = atof (value);
+
+    if (rv == 0.0 || rv > 100000)
+	return(FALSE);
+
+    ticks_per_ns = rv;
+    ticks_per_ns_set = TRUE;
+
+    gtk_widget_show(s_eventsel);
+    return(TRUE);
+}
+
+/****************************************************************************
+* read_events_callback
+****************************************************************************/
+
+static void read_events_callback(GtkToggleButton *item, gpointer data)
+{
+    char tmpbuf [32];
+
+    s_eventsel = gtk_file_selection_new("Read Events From...");
+    
+    gtk_signal_connect (GTK_OBJECT (
+        GTK_FILE_SELECTION(s_eventsel)->ok_button),
+                        "clicked", 
+                        GTK_SIGNAL_FUNC(get_events_name), NULL);
+                            
+    gtk_signal_connect_object (GTK_OBJECT (
+        GTK_FILE_SELECTION(s_eventsel)->ok_button),
+                               "clicked", 
+                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
+                               (gpointer) s_eventsel);
+    
+    gtk_signal_connect_object (GTK_OBJECT (
+        GTK_FILE_SELECTION(s_eventsel)->cancel_button),
+                               "clicked", 
+                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
+                               (gpointer) s_eventsel);
+    gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(s_eventsel));
+
+    if (ticks_per_ns_set)
+	gtk_widget_show (s_eventsel);
+    else {
+	sprintf(tmpbuf, "%.3f", ticks_per_ns);
+	modal_dialog ("Please enter clock ticks per nanosecond",
+		      "Invalid: Please enter clock ticks per nanosecond",
+		      tmpbuf, get_ticks_per_ns);
+    }
+}
+
+/****************************************************************************
+* read_eventclock_callback
+****************************************************************************/
+
+static void read_eventsclock_callback(GtkToggleButton *item, gpointer data)
+{
+    ticks_per_ns_set = FALSE;
+    read_events_callback(item, data);
+}
+
+/****************************************************************************
+* infobox_size_request
+****************************************************************************/
+
+void infobox_size_request (GtkWidget *widget, GtkRequisition *req,
+                           gpointer user_data)
+{
+    char *text = (char *)user_data;
+    char *cp;
+    int widest_line_in_chars;
+    int w;
+    int nlines;
+    
+    /*
+     * You'd think that the string extent function would work here.
+     * You'd be wrong. 
+     */
+    nlines = w = widest_line_in_chars = 0;
+    for (cp = text; *cp; cp++) {
+        if (*cp == '\n') {
+            if (w > widest_line_in_chars) {
+                widest_line_in_chars = w;
+            }
+            w = 0;
+            nlines++;
+        }
+        w++;
+    }
+
+    nlines++;
+
+    req->width = (widest_line_in_chars * 8) + 20;
+    req->height = (nlines * 13) + 10;
+}
+
+/****************************************************************************
+* infobox
+****************************************************************************/
+
+void infobox(char *label_text, char *text)
+{
+    GtkWidget *dialog, *label, *ok_button, *entry;
+    GtkWidget *box;
+
+    dialog = gtk_dialog_new();
+    label = gtk_label_new(label_text);
+
+    entry = gtk_text_new(NULL, NULL);
+
+    gtk_signal_connect (GTK_OBJECT (entry), "size-request", 
+                        GTK_SIGNAL_FUNC(infobox_size_request), 
+                        (gpointer) text);
+
+    gtk_text_insert(GTK_TEXT(entry), g_font, &fg_black, &bg_white,
+                    text, -1);
+
+    gtk_text_set_editable(GTK_TEXT(entry), FALSE);
+
+    ok_button = gtk_button_new_with_label("OK");
+
+    gtk_signal_connect_object (GTK_OBJECT (ok_button), "clicked", 
+                               GTK_SIGNAL_FUNC(gtk_widget_destroy), 
+                               (gpointer) GTK_OBJECT(dialog));
+
+    box = gtk_vbox_new(FALSE, 5);
+
+
+    gtk_box_pack_start(GTK_BOX(box), entry, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(box), ok_button, FALSE, FALSE, 0);
+
+    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
+		      box);
+
+    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label);
+    gtk_widget_show_all(dialog);
+}
+
+/****************************************************************************
+* help_general_callback
+****************************************************************************/
+
+static void help_general_callback(GtkToggleButton *item, gpointer data)
+{
+    infobox("General Help", general_help);
+}
+
+/****************************************************************************
+* help_about_callback
+****************************************************************************/
+
+static void help_about_callback(GtkToggleButton *item, gpointer data)
+{
+    char tmpbuf [1024];
+    sprintf (tmpbuf, "G2 -- Graphical Event Viewer\n\n");
+    view1_about(tmpbuf);
+    pointsel_about(tmpbuf);
+    events_about(tmpbuf);
+    sprintf (tmpbuf+strlen(tmpbuf), "\n%s\n", version_string);
+    sprintf (tmpbuf+strlen(tmpbuf), "%s\n", minor_v_string);
+    infobox("About", tmpbuf);
+}
+
+
+/****************************************************************************
+* get_cpel_name
+****************************************************************************/
+
+static void get_cpel_name (GtkFileSelection *sel, gpointer user_data)
+{
+    char *filename = (char *)gtk_file_selection_get_filename (
+        GTK_FILE_SELECTION(s_filesel));
+    read_cpel_file(filename);
+    set_window_title(filename);
+}
+
+/****************************************************************************
+* get_clib_name
+****************************************************************************/
+
+static void get_clib_name (GtkFileSelection *sel, gpointer user_data)
+{
+    char *filename = (char *) gtk_file_selection_get_filename (
+        GTK_FILE_SELECTION(s_filesel));
+    read_clib_file(filename);
+    set_window_title(filename);
+}
+
+/****************************************************************************
+* read_cpel_callback
+****************************************************************************/
+
+static void read_cpel_callback(GtkToggleButton *item, gpointer data)
+{
+    
+    s_filesel = gtk_file_selection_new("Read CPEL data from...");
+    
+    gtk_file_selection_set_filename(GTK_FILE_SELECTION(s_filesel), 
+				    "cpel.out");
+
+    gtk_signal_connect (GTK_OBJECT (
+        GTK_FILE_SELECTION(s_filesel)->ok_button),
+                        "clicked", 
+                        GTK_SIGNAL_FUNC(get_cpel_name), NULL);
+                            
+    gtk_signal_connect_object (GTK_OBJECT (
+        GTK_FILE_SELECTION(s_filesel)->ok_button),
+                               "clicked", 
+                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
+                               (gpointer) s_filesel);
+    
+    gtk_signal_connect_object (GTK_OBJECT (
+        GTK_FILE_SELECTION(s_filesel)->cancel_button),
+                               "clicked", 
+                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
+                               (gpointer) s_filesel);
+    gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(s_filesel));
+    gtk_widget_show (s_filesel);
+}
+
+/****************************************************************************
+* read_clib_callback
+****************************************************************************/
+
+static void read_clib_callback(GtkToggleButton *item, gpointer data)
+{
+    
+    s_filesel = gtk_file_selection_new("Read clib data From...");
+    
+    gtk_file_selection_set_filename(GTK_FILE_SELECTION(s_filesel), 
+				    "clib.out");
+
+    gtk_signal_connect (GTK_OBJECT (
+        GTK_FILE_SELECTION(s_filesel)->ok_button),
+                        "clicked", 
+                        GTK_SIGNAL_FUNC(get_clib_name), NULL);
+                            
+    gtk_signal_connect_object (GTK_OBJECT (
+        GTK_FILE_SELECTION(s_filesel)->ok_button),
+                               "clicked", 
+                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
+                               (gpointer) s_filesel);
+    
+    gtk_signal_connect_object (GTK_OBJECT (
+        GTK_FILE_SELECTION(s_filesel)->cancel_button),
+                               "clicked", 
+                               GTK_SIGNAL_FUNC (gtk_widget_destroy),
+                               (gpointer) s_filesel);
+    gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(s_filesel));
+    gtk_widget_show (s_filesel);
+}
+
+/****************************************************************************
+* menu1_init
+****************************************************************************/
+
+void menu1_init(void)
+{
+
+    s_filemenu = gtk_menu_new();
+
+    s_readcpel = gtk_menu_item_new_with_label 
+	("Read CPEL file");
+    gtk_menu_append(GTK_MENU(s_filemenu), s_readcpel);
+    gtk_signal_connect(GTK_OBJECT(s_readcpel), "activate", 
+                       GTK_SIGNAL_FUNC(read_cpel_callback), 0);
+
+    s_readclib = gtk_menu_item_new_with_label 
+	("Read CLIB file");
+    gtk_menu_append(GTK_MENU(s_filemenu), s_readclib);
+    gtk_signal_connect(GTK_OBJECT(s_readclib), "activate", 
+                       GTK_SIGNAL_FUNC(read_clib_callback), 0);
+    
+    s_readdefs = gtk_menu_item_new_with_label ("Read Event Definitions");
+    gtk_menu_append(GTK_MENU(s_filemenu), s_readdefs);
+    gtk_signal_connect(GTK_OBJECT(s_readdefs), "activate", 
+                       GTK_SIGNAL_FUNC(read_eventdef_callback), 0);
+    
+    s_readevents = gtk_menu_item_new_with_label ("Read Event Log");
+    gtk_menu_append(GTK_MENU(s_filemenu), s_readevents);
+    gtk_signal_connect(GTK_OBJECT(s_readevents), "activate", 
+                       GTK_SIGNAL_FUNC(read_events_callback), 0);
+    
+    s_readeventsclock = gtk_menu_item_new_with_label 
+	("Read Event Log with Different Clock Rate");
+    gtk_menu_append(GTK_MENU(s_filemenu), s_readeventsclock);
+    gtk_signal_connect(GTK_OBJECT(s_readeventsclock), "activate", 
+                       GTK_SIGNAL_FUNC(read_eventsclock_callback), 0);
+
+    s_print = gtk_menu_item_new_with_label ("Print");
+    gtk_menu_append(GTK_MENU(s_filemenu), s_print);
+    gtk_signal_connect(GTK_OBJECT(s_print), "activate", 
+                       GTK_SIGNAL_FUNC(view1_print_callback), 0);
+    
+    s_quit = gtk_menu_item_new_with_label ("Exit");
+    gtk_menu_append(GTK_MENU(s_filemenu), s_quit);
+    gtk_signal_connect(GTK_OBJECT(s_quit), "activate", 
+                       GTK_SIGNAL_FUNC(gtk_main_quit), 0);
+
+    s_mainfilemenu = gtk_menu_item_new_with_label("File");
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(s_mainfilemenu), s_filemenu);
+
+    s_helpmenu = gtk_menu_new();
+
+    s_help_general = gtk_menu_item_new_with_label ("General");
+    gtk_menu_append(GTK_MENU(s_helpmenu), s_help_general);
+    gtk_signal_connect(GTK_OBJECT(s_help_general), "activate", 
+                       GTK_SIGNAL_FUNC(help_general_callback), 0);
+
+    s_help_about = gtk_menu_item_new_with_label ("About");
+    gtk_menu_append(GTK_MENU(s_helpmenu), s_help_about);
+    gtk_signal_connect(GTK_OBJECT(s_help_about), "activate", 
+                       GTK_SIGNAL_FUNC(help_about_callback), 0);
+
+    s_mainhelpmenu = gtk_menu_item_new_with_label("Help");
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(s_mainhelpmenu), s_helpmenu);
+
+    s_mainmenubar = gtk_menu_bar_new();
+    gtk_menu_bar_append(GTK_MENU_BAR(s_mainmenubar), s_mainfilemenu);
+    gtk_menu_bar_append(GTK_MENU_BAR(s_mainmenubar), s_mainhelpmenu);
+    gtk_widget_show_all(s_mainmenubar);
+
+    gtk_box_pack_start(GTK_BOX(g_mainvbox), s_mainmenubar, FALSE, FALSE, 0);
+}
diff --git a/src/tools/g2/mkversion.c b/src/tools/g2/mkversion.c
new file mode 100644
index 00000000..3523fbe6
--- /dev/null
+++ b/src/tools/g2/mkversion.c
@@ -0,0 +1,77 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 1997-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <time.h>
+#include <string.h>
+
+int main (int argc, char **argv)
+{
+    time_t now;
+    FILE *ofp;
+    char *dateval;
+    char *username;
+    char *userstr;
+    char *datestr;
+    int i;
+    char propname[32];
+    char *propvalue;
+    char timestr[64];
+    char *cp;
+
+    if (argc < 4) {
+        printf ("usage: mkversion ostype version outputfile\n");
+        exit (1);
+    }
+
+    ofp = fopen (argv[3], "w");
+    if (ofp == NULL) {
+        printf ("Couldn't create %s\n", argv[3]);
+        exit (1);
+    }
+
+    now = time (0);
+    
+    fprintf (ofp, "/*\n");
+    fprintf (ofp, " * G2 Version Stamp, %s",
+             ctime (&now));
+    fprintf (ofp, " * Automatically generated, hand edits are pointless.\n");
+    fprintf (ofp, " */\n\n");
+
+    fprintf (ofp, 
+            "const char *version_string = \"G2 (%s) major version %s\";\n",
+             argv[1], argv[2]);
+    
+    username = (char *) cuserid (0);
+
+    strcpy(timestr, ctime(&now));
+    
+    cp = timestr;
+
+    while (*cp) {
+        cp++;
+    }
+    if (*--cp == '\n')
+        *cp = 0;
+
+    fprintf (ofp,
+             "const char *minor_v_string = \"Built by %s at %s\";\n",
+             username, timestr);
+    
+    exit (0);
+}
+
+    
diff --git a/src/tools/g2/pointsel.c b/src/tools/g2/pointsel.c
new file mode 100644
index 00000000..018dc213
--- /dev/null
+++ b/src/tools/g2/pointsel.c
@@ -0,0 +1,854 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2005-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
+#include <ctype.h>
+#include <string.h>
+#include <gtk/gtk.h>
+#include "g2.h"
+
+/*
+ * globals
+ */
+event_def_t g_eventdefs[NEVENTS];
+
+/*
+ * locals
+ */
+static GtkWidget *s_pointselbox;
+static FILE *s_hfp;
+static FILE *s_elog_hfp;
+static int s_basenum;
+static GtkWidget *s_event_buttons[NEVENTS];
+static int s_min_shown_pointsel;
+static int s_max_shown_pointsel;
+static GtkWidget *s_allbutton;
+static GtkWidget *s_nonebutton;
+static GtkWidget *s_pointselbuttons;
+static GtkWidget *s_ps_vscroll;
+static GtkObject *s_ps_vsadj;
+static int g_neventdefs;
+
+enum button_click {
+    ALL_BUTTON=1,
+    NONE_BUTTON,
+};
+
+/*
+ * config params
+ */
+int c_maxpointsel;
+
+/****************************************************************************
+* recompute_vscrollbar
+****************************************************************************/
+
+static void recompute_ps_vscrollbar (void)
+{
+    GtkAdjustment *adj;
+    ulong limit;
+
+    adj = GTK_ADJUSTMENT(s_ps_vsadj);
+
+#ifdef NOTDEF
+    /* This seems like the right calculation, but seems not to work */
+    if (g_neventdefs > c_maxpointsel)
+        limit = g_neventdefs - c_maxpointsel;
+    else
+        limit = g_neventdefs;
+#else
+    limit = g_neventdefs-1;
+#endif
+
+    adj->lower = (gfloat)0.00;
+    adj->upper = (gfloat)limit;
+    adj->value = (gfloat)0.00;
+    adj->step_increment = (gfloat)1.00;
+    adj->page_increment = (gfloat)(c_maxpointsel / 3);
+    adj->page_size = (gfloat)c_maxpointsel;
+    gtk_adjustment_changed(adj);
+    gtk_adjustment_value_changed(adj);
+    gtk_widget_show(s_ps_vscroll);
+}
+
+/****************************************************************************
+* point_select_callback
+****************************************************************************/
+
+static void point_select_callback(GtkToggleButton *item, gpointer data)
+{
+    int i = (int) (unsigned long long) data;
+
+    g_eventdefs[i].selected = gtk_toggle_button_get_active(
+        GTK_TOGGLE_BUTTON(s_event_buttons[i]));
+    view1_display_when_idle();
+}
+
+/****************************************************************************
+* up_button
+****************************************************************************/
+
+static void up_button(void)
+{
+    int i;
+    int increment = c_maxpointsel/4;
+
+    if (s_min_shown_pointsel == 0)
+        return;
+
+    s_min_shown_pointsel -= increment;
+
+    if (s_min_shown_pointsel < 0)
+        s_min_shown_pointsel = 0;
+
+    s_max_shown_pointsel = s_min_shown_pointsel + c_maxpointsel;
+
+    for (i = 0; i < g_neventdefs; i++) {
+        if (i >= s_min_shown_pointsel &&
+            i <= s_max_shown_pointsel)
+            gtk_widget_show(s_event_buttons[i]);
+        else
+            gtk_widget_hide(s_event_buttons[i]);
+    }
+
+}
+
+#ifdef NOTDEF
+/****************************************************************************
+* down_button
+****************************************************************************/
+
+static void down_button(void)
+{
+    int i;
+    int increment = c_maxpointsel/4;
+
+    if (s_max_shown_pointsel == g_neventdefs)
+        return;
+
+    s_max_shown_pointsel += increment;
+
+    if (s_max_shown_pointsel >= g_neventdefs)
+        s_max_shown_pointsel = (g_neventdefs-1);
+
+    s_min_shown_pointsel = s_max_shown_pointsel - c_maxpointsel;
+
+    if (s_min_shown_pointsel < 0)
+        s_min_shown_pointsel = 0;
+
+    for (i = 0; i < g_neventdefs; i++) {
+        if (i >= s_min_shown_pointsel &&
+            i <= s_max_shown_pointsel)
+            gtk_widget_show(s_event_buttons[i]);
+        else
+            gtk_widget_hide(s_event_buttons[i]);
+    }
+
+}
+#endif
+
+/****************************************************************************
+* button_click_callback
+****************************************************************************/
+
+static void button_click_callback(GtkButton *item, gpointer data)
+{
+    int i;
+    enum button_click click = (enum button_click)data;
+
+    switch (click) {
+    case ALL_BUTTON:
+        for (i = 0; i < g_neventdefs; i++) {
+            gtk_toggle_button_set_active (
+                GTK_TOGGLE_BUTTON(s_event_buttons[i]), TRUE);
+            g_eventdefs[i].selected = TRUE;
+        }
+        break;
+
+    case NONE_BUTTON:
+        for (i = 0; i < g_neventdefs; i++) {
+            gtk_toggle_button_set_active (
+                GTK_TOGGLE_BUTTON(s_event_buttons[i]), FALSE);
+            g_eventdefs[i].selected = FALSE;
+        }
+        break;
+    }
+}
+
+/****************************************************************************
+* scroll_callback
+****************************************************************************/
+
+static void scroll_callback (GtkAdjustment *adj, GtkWidget *notused)
+{
+    int i;
+
+    s_min_shown_pointsel = (int)adj->value;
+    s_max_shown_pointsel = s_min_shown_pointsel + c_maxpointsel;
+
+    for (i = 0; i < g_neventdefs; i++) {
+        if (i >= s_min_shown_pointsel &&
+            i <= s_max_shown_pointsel)
+            gtk_widget_show(s_event_buttons[i]);
+        else
+            gtk_widget_hide(s_event_buttons[i]);
+    }
+}
+
+/****************************************************************************
+* point_selector_init
+****************************************************************************/
+
+void point_selector_init(void)
+{
+
+    c_maxpointsel = atol(getprop_default("event_selector_lines", "20"));
+
+    s_pointselbox = gtk_vbox_new(FALSE,5);
+
+    s_pointselbuttons = gtk_hbox_new(FALSE,5);
+
+    s_allbutton = gtk_button_new_with_label("ALL");
+    gtk_widget_show(s_allbutton);
+    s_nonebutton = gtk_button_new_with_label("NONE");
+    gtk_widget_show(s_nonebutton);
+
+    gtk_signal_connect (GTK_OBJECT(s_allbutton), "clicked",
+                        GTK_SIGNAL_FUNC(button_click_callback), 
+                        (gpointer) ALL_BUTTON);
+
+    gtk_signal_connect (GTK_OBJECT(s_nonebutton), "clicked",
+                        GTK_SIGNAL_FUNC(button_click_callback), 
+                        (gpointer) NONE_BUTTON);
+
+    gtk_box_pack_start(GTK_BOX(s_pointselbuttons), s_allbutton, FALSE, 
+                       FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(s_pointselbuttons), s_nonebutton, FALSE, 
+                       FALSE, 0);
+    
+    gtk_widget_show(s_pointselbuttons);
+    gtk_widget_ref(s_pointselbuttons); 
+
+    gtk_box_pack_start(GTK_BOX(s_pointselbox), s_pointselbuttons, FALSE, 
+                       FALSE, 0);
+
+    gtk_box_pack_end (GTK_BOX(g_mainhbox), s_pointselbox, 
+                       FALSE, FALSE, 0);
+
+    s_ps_vsadj = gtk_adjustment_new(0.0 /* initial value */, 
+                                    0.0 /* minimum value */,
+                                    2000.0 /* maximum value */,
+                                    0.1 /* step increment */, 
+                                    10.0/* page increment */, 
+                                    10.0/* page size */);
+    
+    s_ps_vscroll = gtk_vscrollbar_new (GTK_ADJUSTMENT(s_ps_vsadj));
+    gtk_signal_connect (GTK_OBJECT (s_ps_vsadj), "value-changed",
+                        GTK_SIGNAL_FUNC (scroll_callback), 
+                        (gpointer)s_ps_vscroll);
+    gtk_box_pack_end(GTK_BOX(g_mainhbox), s_ps_vscroll, FALSE, FALSE, 0);
+}
+
+/****************************************************************************
+* sxerox
+****************************************************************************/
+
+char *sxerox (char *s)
+{
+    char *rv;
+
+    /* Note: g_malloc does or dies... */
+    rv = (char *)g_malloc(strlen(s)+1);
+    strcpy (rv, s);
+    return (rv);
+}
+
+/****************************************************************************
+* reset_point_selector
+****************************************************************************/
+
+static void reset_point_selector(void)
+{
+    int i;
+
+    gtk_widget_hide(s_pointselbox);
+    gtk_widget_hide(s_pointselbuttons);
+    gtk_widget_hide(s_ps_vscroll);
+    gtk_container_remove(GTK_CONTAINER(s_pointselbox), 
+                         s_pointselbuttons);
+    
+    for (i = 0; i < g_neventdefs; i++) {
+        if (s_event_buttons[i]) {
+            gtk_container_remove(GTK_CONTAINER(s_pointselbox), 
+                                 s_event_buttons[i]);
+            s_event_buttons[i] = 0;
+        }
+    }
+}
+
+/****************************************************************************
+* create_point_selector
+****************************************************************************/
+
+static void create_point_selector(void)
+{
+    int i;
+    char tmpbuf [1024];
+    event_def_t *ep;
+    GtkWidget *wp;
+
+    for (i = 0; i < g_neventdefs; i++) {
+        ep = &g_eventdefs[i];
+        sprintf(tmpbuf, "[%lu] %s", ep->event, 
+                ep->name ? ep->name : "(none)");
+        /* Hack to reduce width of point selectors */
+        if (strlen(tmpbuf) > 50) {
+            tmpbuf[50] = 0;
+        }
+
+        wp = gtk_check_button_new_with_label (tmpbuf);
+        s_event_buttons[i] = wp;
+        gtk_signal_connect (GTK_OBJECT(wp), "toggled",
+                            GTK_SIGNAL_FUNC(point_select_callback), 
+                            (gpointer) (unsigned long long) i);
+        gtk_toggle_button_set_active (
+            GTK_TOGGLE_BUTTON(wp), TRUE);
+        gtk_box_pack_start(GTK_BOX(s_pointselbox), wp, FALSE, FALSE, 0);
+    }
+
+    /* set up scroll parameters by faking an up-button */
+    s_min_shown_pointsel = 1;
+    up_button();
+
+    gtk_box_pack_start(GTK_BOX(s_pointselbox), s_pointselbuttons, FALSE, 
+                       FALSE, 0);
+    gtk_widget_show(s_pointselbuttons);
+    gtk_widget_show(s_pointselbox);
+    gtk_widget_show(s_ps_vscroll);
+}
+
+/****************************************************************************
+* remove_all_events
+****************************************************************************/
+
+static void remove_all_events(void)
+{
+    event_def_t *ep;
+    int i;
+
+    for (i = 0; i < g_neventdefs; i++) {
+        ep = &g_eventdefs[i];
+        if (!ep->is_clib) {
+            if (ep->name)
+                g_free(ep->name);
+            if(ep->format)
+                g_free(ep->format);
+        }
+    }
+    g_neventdefs = 0;
+}
+
+/****************************************************************************
+* add_event
+****************************************************************************/
+
+static void add_event(ulong event, char *name, char *format)
+{
+    int i;
+    event_def_t *ep;
+
+    if (g_neventdefs >= NEVENTS) {
+        g_error("Too many event definitions, increase NEVENTS!");
+        /*NOTREACHED*/
+    }
+        
+    /* Simple dup check, probably not needed very often */
+    for (i = 0; i < g_neventdefs; i++) {
+        if (g_eventdefs[i].event == event) {
+            g_warning("Duplicate def event %lu: first definition retained\n",
+                      event);
+            return;
+        }
+    }
+
+    ep = &g_eventdefs[g_neventdefs++];
+
+    ep->event = event;
+    ep->name = sxerox(name);
+    ep->format = sxerox(format);
+    ep->selected = TRUE;
+}
+
+/****************************************************************************
+* add_event_from_cpel_file
+****************************************************************************/
+
+void add_event_from_cpel_file(ulong event, char *event_format, 
+                              char *datum_format)
+{
+    event_def_t *ep;
+
+    if (g_neventdefs >= NEVENTS) {
+        g_error("Too many event definitions, increase NEVENTS!");
+        /*NOTREACHED*/
+    }
+
+    ep = &g_eventdefs[g_neventdefs++];
+
+    ep->event = event;
+    /*
+     * Duplicate the strings for backward compatibility. Otherwise,
+     * the g_free above will barf because the name/format strings are
+     * actually in mmap'ed memory 
+     */
+    ep->name = sxerox(event_format);
+    ep->format = sxerox(datum_format);
+    ep->selected = TRUE;
+}
+
+/****************************************************************************
+* add_event_from_clib_file
+****************************************************************************/
+
+void add_event_from_clib_file(unsigned int event, char *name, 
+                              unsigned int vec_index)
+{
+    event_def_t *ep;
+
+    if (g_neventdefs >= NEVENTS) {
+        g_error("Too many event definitions, increase NEVENTS!");
+        /*NOTREACHED*/
+    }
+
+    ep = &g_eventdefs[g_neventdefs++];
+
+    ep->event = event;
+
+    ep->name = sxerox(name);
+    ep->format = (void *)(unsigned long long) vec_index;
+    ep->selected = TRUE;
+    ep->is_clib = TRUE;
+}
+
+/****************************************************************************
+* read_header_file - eats header file lines of the form
+*
+*     #define EVENT_FOO  123	/ * name: %d * /
+*
+****************************************************************************/
+
+static void read_header_file (void)
+{
+    char tmpbuf [1024];
+    char *name, *format;
+    char *cp;
+    unsigned long event;
+    int ev_num_flag;
+
+    while (fgets (tmpbuf, sizeof (tmpbuf), s_hfp))
+    {
+        cp = tmpbuf;
+        ev_num_flag = 0;
+
+        if (strncmp (cp, "#define", 7))
+            continue;
+
+        /* skip #define */
+        while (*cp && !(isspace ((int)*cp)))
+            cp++;
+
+        if (*cp == 0)
+            continue;
+
+        /* skip ws after #define */
+        while (*cp && isspace ((int)*cp))
+            cp++;
+            
+        if (*cp == 0)
+            continue;
+
+        /* skip symbolic name */
+        while (*cp && !(isspace ((int)*cp)))
+            cp++;
+
+        if (*cp == 0)
+            continue;
+
+        /* skip ws after symbolic name */
+        while (*cp && isspace ((int)*cp))
+            cp++;
+            
+        if (*cp == 0)
+            continue;
+
+        event = 0;
+
+        if (!strncmp(cp, "EV_NUM", 6)) {
+            cp += 6;
+            ev_num_flag = 1;
+
+            while (*cp && *cp != '(')
+                cp++;
+            
+            if (*cp == 0)
+                continue;
+
+            cp++; 
+
+            while (*cp && isspace ((int)*cp))
+                cp++;
+            
+        } 
+
+        /* eat event code. */
+        while (*cp && isdigit ((int)*cp))
+        {
+            event = event * 10 + (*cp - '0');
+            cp++;
+        }
+
+        if (*cp == 0)
+            continue;
+
+        if (ev_num_flag) {
+            while (*cp && *cp != ')')
+                cp++;
+            if (*cp == 0)
+                continue;
+            cp++;
+            event += s_basenum;
+        }
+
+        /* skip ws after event code */
+        while (*cp && isspace ((int)*cp))
+            cp++;
+            
+        if (*cp != '/')
+            continue;
+
+        cp++;
+
+        if (*cp != '*')
+            continue;
+
+        cp++;
+
+        /* skip ws after comment start */
+        while (*cp && isspace ((int)*cp))
+            cp++;
+
+        if (*cp == 0)
+            continue;
+
+        name = cp;
+
+        /* accumulate name */
+        while (*cp && *cp != ':' && *cp != '*')
+            cp++;
+
+        if (*cp == 0)
+            continue;
+
+        *cp++ = 0;
+        
+        /* skip ws after name: */
+        while (*cp && isspace ((int)*cp))
+            cp++;
+        
+        if (*cp == 0 || *cp == '/')
+        {
+            format = " ";
+            goto write_it;
+        }
+
+        format = cp;
+        
+        /* accumulate format string */
+        while (*cp && !isspace ((int)*cp))
+            cp++;
+
+        *cp = 0;
+
+    write_it:
+
+        add_event (event, name, format);
+    }
+}
+
+/****************************************************************************
+* read_header_files - eats header file lines of the form
+*
+*     #define FILE1_BASE  100	/ * pointdefs: ../vpn/vpn_points.h * /
+*
+****************************************************************************/
+
+static boolean read_header_files (void)
+{
+    char *cp, *name;
+    char tmpbuf [1024];
+    int basenum;
+    boolean rv=FALSE;
+
+    while (fgets (tmpbuf, sizeof (tmpbuf), s_elog_hfp))
+    {
+        cp = tmpbuf;
+
+        if (strncmp (cp, "#define", 7))
+            continue;
+
+        cp += 7;
+
+        /* skip ws after #define */
+        while (*cp && isspace ((int)*cp))
+            cp++;
+
+        if (*cp == 0)
+            continue;
+
+        /* skip EV_COMPxxx_START */
+        while (*cp && !isspace((int)*cp))
+            cp++;
+
+        if (*cp == 0)
+            continue;
+
+        /* skip ws after EV_COMPxxx_START */
+        while (*cp && isspace ((int)*cp))
+            cp++;
+        
+        if (*cp == 0)
+            continue;
+        
+        basenum = atol (cp);
+        
+        /* skip #define */
+        while (*cp && (*cp != '/'))
+            cp++;
+
+        if (*cp == 0)
+            continue;
+
+        cp++;
+        if (*cp != '*')
+            continue;
+
+        cp++;
+
+        /* skip ws after comment start */
+        while (*cp && isspace ((int)*cp))
+            cp++;
+
+        if (*cp == 0)
+            continue;
+
+        if (strncmp (cp, "pointdefs:", 10))
+            continue;
+
+        cp += 10;
+
+        /* skip ws after comment start */
+        while (*cp && isspace ((int)*cp))
+            cp++;
+
+        name = cp;
+
+        while (*cp && !isspace ((int)*cp))
+            cp++;
+       
+        *cp = 0;
+
+        s_hfp = fopen (name, "rt");
+
+        if (s_hfp == NULL) {
+            g_warning ("Couldn't open header file %s\n", name);
+            continue;
+        }
+        rv = TRUE;
+
+        s_basenum = basenum;
+
+        read_header_file();
+
+        fclose (s_hfp);
+    }
+    return(rv);
+}
+
+/****************************************************************************
+* event_def_cmp
+****************************************************************************/
+
+int event_def_cmp(const void *a1, const void *a2)
+{
+    event_def_t *e1 = (event_def_t *)a1;
+    event_def_t *e2 = (event_def_t *)a2;
+
+    if (e1->event < e2->event)
+        return(-1);
+    else if (e1->event == e2->event)
+        return(0);
+    else
+        return(1);
+}
+
+/****************************************************************************
+* sort_event_definitions
+****************************************************************************/
+
+void sort_event_definitions(void)
+{
+    qsort(&g_eventdefs[0], g_neventdefs, sizeof(event_def_t), event_def_cmp);
+}
+
+static boolean remove_needed=TRUE;
+
+void finalize_events(void)
+{
+    sort_event_definitions();
+    create_point_selector();
+    recompute_ps_vscrollbar();
+    view1_display_when_idle();
+    remove_needed = TRUE;
+}
+
+void initialize_events(void)
+{
+    if (remove_needed) {
+        reset_point_selector();
+        remove_all_events();
+        remove_needed = FALSE;
+    }
+}
+
+/****************************************************************************
+* read_event_definitions
+****************************************************************************/
+
+boolean read_event_definitions (char *filename)
+{
+    char tmpbuf [128];
+
+    initialize_events();
+
+    s_elog_hfp = fopen (filename, "rt");
+    if (s_elog_hfp == NULL) {
+        sprintf (tmpbuf, "Couldn't open %s\n", filename);
+        infobox ("Open Failed", tmpbuf);
+        return(FALSE);
+    }
+    /* Presume "elog.h".  Note fallthrough... */
+    if (read_header_files()) {
+        sort_event_definitions();
+        create_point_selector();
+        recompute_ps_vscrollbar();
+        fclose(s_elog_hfp);
+        view1_display_when_idle();
+        remove_needed = TRUE;
+        return(TRUE);
+    }
+    fclose(s_elog_hfp);
+
+    s_hfp = fopen (filename, "rt");
+    if (s_hfp == NULL) {
+        sprintf (tmpbuf, "Couldn't open %s\n", filename);
+        infobox ("Read Event Definition Failure", tmpbuf);
+        return(FALSE);
+    }
+
+    read_header_file();
+
+    /* Happens if the user feeds us the wrong file, for example */
+    if (g_neventdefs == 0) {
+        sprintf (tmpbuf, "No event definitions found in %s\n", filename);
+        infobox ("No Event Definitions?", tmpbuf);
+        return(FALSE);
+    }
+    finalize_events();
+    return(TRUE);
+}
+
+static event_def_t dummy_event;
+static char dummy_string[32];
+
+/****************************************************************************
+* find_event_definition
+* Binary search for first event whose time is >= t
+****************************************************************************/
+
+event_def_t *find_event_definition (ulong code)
+{
+    int index, bottom, top;
+    event_def_t *edp;
+
+    if (g_neventdefs == 0)
+        goto use_dummy;
+
+    bottom = g_neventdefs-1;
+    top = 0;
+
+    while (1) {
+	index = (bottom + top) / 2;
+
+        edp = (g_eventdefs + index);
+        
+        if (edp->event == code)
+            return(edp);
+
+        if (top >= bottom) {
+        use_dummy:
+            edp = &dummy_event;
+            edp->selected = TRUE;
+            edp->event = code;
+            edp->format = "0x%x";
+            sprintf (dummy_string, "E%lu", code);
+            edp->name = &dummy_string[0];
+            return(edp);
+        }
+
+        if (edp->event < code)
+            top = index + 1;
+        else 
+            bottom = index - 1;
+    }
+}
+
+/****************************************************************************
+* pointsel_next_snapshot
+* Set dialog buttons from snapshot
+****************************************************************************/
+
+void pointsel_next_snapshot(void)
+{
+    int i;
+    
+    for (i = 0; i < g_neventdefs; i++) {
+        gtk_toggle_button_set_active (
+            GTK_TOGGLE_BUTTON(s_event_buttons[i]), 
+            g_eventdefs[i].selected);
+    }
+}
+
+/****************************************************************************
+* pointsel_about
+****************************************************************************/
+
+void pointsel_about (char *tmpbuf)
+{
+    sprintf (tmpbuf+strlen(tmpbuf), "%d event definitions\n", 
+             g_neventdefs);
+}
diff --git a/src/tools/g2/props.c b/src/tools/g2/props.c
new file mode 100644
index 00000000..a23dc050
--- /dev/null
+++ b/src/tools/g2/props.c
@@ -0,0 +1,279 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 1997-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <stdio.h>
+#include <ctype.h>
+#include <malloc.h>
+#include <time.h>
+#include <gtk/gtk.h>
+#include <string.h>
+
+static char *sxerox (char *s);
+void exit(int);
+
+#define NBUCKETS 97
+
+typedef struct prop_ {
+    struct prop_ *next;
+    char *name;
+    char *value;
+} prop_t;
+
+static prop_t *buckets [NBUCKETS];
+static int hash_shifts[4] = {24, 16, 8, 0};
+
+/*
+ * getprop 
+ */
+
+char *getprop (char *name)
+{
+    unsigned char *cp;
+    unsigned long hash=0;
+    prop_t *bp;
+    int i=0;
+
+    for (cp = (unsigned char *) name; *cp; cp++)
+        hash ^= (*cp)<<(hash_shifts[(i++)&0x3]);
+
+    bp = buckets [hash%NBUCKETS];
+
+    while (bp && strcmp (bp->name, name)) {
+        bp = bp->next;
+    }
+
+    if (bp == NULL)
+        return (0);
+    else
+        return (bp->value);
+}
+
+/*
+ * getprop_default
+ */
+
+char *getprop_default (char *name, char *def)
+{
+    char *rv;
+    rv = getprop (name);
+    if (rv)
+        return (rv);
+    else
+        return (def);
+}
+
+/*
+ * addprop
+ */
+
+void addprop (char *name, char *value)
+{
+    unsigned char *cp;
+    unsigned long hash=0;
+    prop_t **bpp;
+    prop_t *bp;
+    int i=0;
+
+    bp = (prop_t *)g_malloc (sizeof (prop_t));
+
+    bp->next = 0;
+    bp->name = sxerox (name);
+    bp->value = sxerox (value);
+
+    for (cp = (unsigned char *)name; *cp; cp++)
+        hash ^= (*cp)<<(hash_shifts[(i++)&0x3]);
+
+    bpp = &buckets [hash%NBUCKETS];
+
+    if (*bpp == NULL)
+        *bpp = bp;
+    else {
+        bp->next = *bpp;
+        *bpp = bp;
+    }
+}
+
+/*
+ * sxerox 
+ */
+
+static char *sxerox (char *s)
+{
+    char *rv = (char *) g_malloc (strlen (s) + 1);
+    strcpy (rv, s);
+    return rv;
+}
+
+/*
+ * readprops 
+ */
+
+#define START 0
+#define READNAME  1
+#define READVALUE 2
+#define C_COMMENT 3
+#define CPP_COMMENT 4
+
+int readprops (char *filename)
+{
+    FILE *ifp;
+    unsigned char c;
+    int state=START;
+    int linenum=1;
+    char namebuf [128];
+    char valbuf [512];
+    int i;
+
+    ifp = fopen (filename, "r");
+
+    if (ifp == NULL)
+        return (-1);
+
+    while (1) {
+
+    readchar:
+        c = getc (ifp);
+
+    again:
+        switch (state) {
+        case START:
+            if (feof (ifp)) {
+                fclose (ifp);
+                return (0);
+            }
+
+            if (c == ' ' || c == '\t')
+                goto readchar;
+
+            if (c == '\n') {
+                linenum++;
+                goto readchar;
+            }
+            if (isalpha (c) || (c == '_')) {
+                state = READNAME;
+                goto again;
+            }
+            if (c == '/') {
+                c = getc (ifp);
+                if (c == '/') {
+                    state = CPP_COMMENT;
+                    goto readchar;
+                } else if (c == '*') {
+                    state = C_COMMENT;
+                    goto readchar;
+                } else {
+                    fprintf (stderr, "unknown token '/' line %d\n",
+                             linenum);
+                    exit (1);
+                }
+            }
+            fprintf (stderr, "unknown token '%c' line %d\n",
+                     c, linenum);
+            exit (1);
+            break;
+            
+        case CPP_COMMENT:
+            while (1) {
+                c = getc (ifp);
+                if (feof (ifp))
+                    return (0);
+                if (c == '\n') {
+                    linenum++;
+                    state = START;
+                    goto readchar;
+                }
+            }
+            break;
+
+        case C_COMMENT:
+            while (1) {
+                c = getc (ifp);
+                if (feof (ifp)) {
+                    fprintf (stderr, "unterminated comment, line %d\n",
+                             linenum);
+                    exit (1);
+                }
+                if (c == '*') {
+                staragain:
+                    c = getc (ifp);
+                    if (c == '/') {
+                        state = START;
+                        goto readchar;
+                    }
+                    if (c == '*')
+                        goto staragain;
+                }
+            }
+            break;
+                    
+        case READNAME:
+            i = 0;
+            namebuf[i++] = c;
+            while (1) {
+                c = getc (ifp);
+                if (feof (ifp)) {
+                    fprintf (stderr, "EOF while reading a name, line %d\n",
+                             linenum);
+                    exit (1);
+                }
+                if ((!isalnum (c)) && (c != '_')) {
+                    namebuf [i] = 0;
+                    state = READVALUE;
+                    goto again;
+                }
+                namebuf [i++] = c;
+            }
+            break;
+
+        case READVALUE:
+            i = 0;
+            while ((c == ' ') || (c == '\t') || (c == '=')) {
+                c = getc (ifp);
+                if (feof (ifp)) {
+                    fprintf (stderr, "EOF while reading a value, line %d\n",
+                             linenum);
+                    exit (1);
+                }
+            }
+            goto firsttime;
+            while (1) {
+                c = getc (ifp);
+
+            firsttime:
+                if (c == '\\') {
+                    c = getc (ifp);
+                    if (feof (ifp)) {
+                        fprintf (stderr, "EOF after '\\', line %d\n",
+                                 linenum);
+                        exit (1);
+                    }
+                    valbuf[i++] = c;
+                    continue;
+                }
+                if (c == '\n') {
+                    linenum++;
+                    while (valbuf [i-1] == ' ' || valbuf[i-1] == '\t')
+                        i--;
+                    valbuf[i] = 0;
+                    addprop (namebuf, valbuf);
+                    state = START;
+                    goto readchar;
+                }
+                valbuf[i++] = c;
+            }
+
+        }
+    }
+}
diff --git a/src/tools/g2/props.h b/src/tools/g2/props.h
new file mode 100644
index 00000000..6289941d
--- /dev/null
+++ b/src/tools/g2/props.h
@@ -0,0 +1,21 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 1997-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+extern char *getprop (char *name);
+extern char *getprop_default (char *name, char *def);
+extern void addprop (char *name, char *value);
+extern int readprops (char *filename);
+extern int writeprops (char *filename);
diff --git a/src/tools/g2/view1.c b/src/tools/g2/view1.c
new file mode 100644
index 00000000..ec394cc3
--- /dev/null
+++ b/src/tools/g2/view1.c
@@ -0,0 +1,3077 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2005-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include "g2.h"
+#include <time.h>
+#include <string.h>
+#include <vppinfra/format.h>
+#include <vppinfra/elog.h>
+
+/*
+ * The main event display view.
+ * 
+ * Important variables:
+ *
+ * "da" -- the drawing area, aka the screen representation of the
+ *         event view.
+ *
+ * "pm" -- the backing pixmap for the drawing area. Note that
+ *         all graphics operations target this backing
+ *         store, then call gtk_widget_draw to copy a rectangle from
+ *         the backing store onto the screen.
+ *
+ * "s_v1" -- pointer to the current v1_geometry_t object.
+ * 
+ * Box heirarchy:
+ * s_view1_vbox
+ *     s_view1_hbox
+ *         da  s_view1_vmenubox
+ *                  s_view1_topbutton("Top")
+ *                  s_view1_vscroll (vertical scrollbar)
+ *                  s_view1_bottombutton("Bottom")
+ *     s_view1_hmenubox
+ *         s_view1_startbutton("Start");
+ *         s_view1_hscroll(horizontal scrollbar)
+ *         s_view1_endbutton("End")
+ *         s_view1_zoominbutton("Zoomin")
+ *         s_view1_searchbutton("Search")
+ *         s_view1_searchagainbutton("Search Again")
+ *         s_view1_zoomoutbutton("Zoomout")
+ *     s_view1_label
+ */
+
+/*
+ * Globals
+ */
+
+GdkFont *g_font;                /* a fixed-width font to use */
+GdkColor fg_black = {0, 0, 0, 0};
+GdkColor bg_white = {0, 65535, 65535, 65535};
+static boolean summary_mode = TRUE; /* start out in summary mode */
+static boolean color_mode   = FALSE; /* start out in color mode   */
+
+/*
+ * Locals
+ */
+
+/* 
+ * user_data values passed to view1_button_click_callback,
+ * which is used by the various action buttons noted above
+ */
+enum view1_button_click {
+    TOP_BUTTON=1,
+    BOTTOM_BUTTON,
+    START_BUTTON,
+    ZOOMIN_BUTTON,
+    SEARCH_BUTTON,
+    SEARCH_AGAIN_BUTTON,
+    ZOOMOUT_BUTTON,
+    END_BUTTON,
+    MORE_TRACES_BUTTON,
+    LESS_TRACES_BUTTON,
+    SNAP_BUTTON,
+    NEXT_BUTTON,
+    DEL_BUTTON,
+    CHASE_EVENT_BUTTON,
+    CHASE_DATUM_BUTTON,
+    CHASE_TRACK_BUTTON,
+    UNCHASE_BUTTON,
+    FORWARD_BUTTON,
+    BACKWARD_BUTTON,
+    SUMMARY_BUTTON,
+    NOSUMMARY_BUTTON,
+};
+
+enum chase_mode {
+    CHASE_EVENT=1,
+    CHASE_DATUM,
+    CHASE_TRACK,
+};
+
+enum sc_dir {
+    SRCH_CHASE_FORWARD = 0,
+    SRCH_CHASE_BACKWARD = 1,
+};
+
+static GtkWidget *s_view1_hbox; /* see box heirarchy chart */
+static GtkWidget *s_view1_vbox; /* see box heirarchy chart */
+static GtkWidget *da;           /* main drawing area */
+static GdkPixmap *pm;           /* and its backing pixmap */
+static GdkCursor *norm_cursor;  /* the "normal" cursor */
+
+/*
+ * view geometry parameters
+ *
+ * Remember:
+ *    Y increases down the page.
+ *    Strip origin is at the top
+ *    Payday is Friday
+ *    Don't put your fingers in your mouth.
+ *
+ * Most of these values are in pixels
+ */
+
+typedef struct v1_geometry {
+    int pid_ax_width;           /* Width of the PID axis */
+    int time_ax_height;         /* Height of the time axis */
+    int time_ax_spacing;        /* TimeAxis: Space between tick-marks */
+    int strip_height;           /* Height of a regular PID trace */
+    int pop_offset;             /* Vertical offset of the detail box */
+    int pid_ax_offset;          /* Vertical offset of the PID axis */
+    int event_offset;           /* Vertical offset of the event boxes */
+    int total_height;           /* total height of da, see configure_event */
+    int total_width;            /* ditto, for width */
+    
+    /* Derived values */
+    int first_pid_index;        /* Index of first displayed PID */
+    int npids;                  /* Max number of displayed pids */
+    ulonglong minvistime;       /* in usec */
+    ulonglong maxvistime;       /* in usec */
+} v1_geometry_t;
+
+
+/* The active geometry object */
+static v1_geometry_t s_v1record; 
+static v1_geometry_t *s_v1 = &s_v1record; 
+
+/* The color array */
+static GdkColor *s_color;
+
+/* Snapshot ring */
+typedef struct snapshot {
+    struct snapshot *next;
+    /* Screen geometry */
+    v1_geometry_t geometry;
+    boolean show_event[NEVENTS];
+    pid_sort_t *pidvec;
+    /*
+     * Note: not worth recomputing the vertical scrollbar, just save
+     *  its value here
+     */
+    gfloat vscroll_value;
+    boolean summary_mode;
+    boolean color_mode;
+} snapshot_t;
+
+static snapshot_t *s_snapshots;
+static snapshot_t *s_cursnap;
+static event_t *s_last_selected_event;
+
+/*
+ * various widgets, see the box heirarchy chart above
+ * The toolkit keeps track of these things, we could lose many of 
+ * these pointers. 
+ */
+static GtkWidget *s_view1_vmenubox;
+static GtkWidget *s_view1_topbutton;
+static GtkWidget *s_view1_bottombutton;
+static GtkWidget *s_view1_more_traces_button;
+static GtkWidget *s_view1_less_traces_button;
+
+static GtkWidget *s_view1_hmenubox;
+static GtkWidget *s_view1_hmenubox2;
+static GtkWidget *s_view1_startbutton;
+static GtkWidget *s_view1_zoominbutton;
+static GtkWidget *s_view1_searchbutton;
+static GtkWidget *s_view1_srchagainbutton;
+static GtkWidget *s_view1_zoomoutbutton;
+static GtkWidget *s_view1_endbutton;
+
+static GtkWidget *s_view1_snapbutton;
+static GtkWidget *s_view1_nextbutton;
+static GtkWidget *s_view1_delbutton;
+
+static GtkWidget *s_view1_chase_event_button;
+static GtkWidget *s_view1_chase_datum_button;
+static GtkWidget *s_view1_chase_track_button;
+static GtkWidget *s_view1_unchasebutton;
+
+static GtkWidget *s_view1_forward_button;
+static GtkWidget *s_view1_backward_button;
+
+static GtkWidget *s_view1_summary_button;
+static GtkWidget *s_view1_nosummary_button;
+
+static GtkWidget *s_view1_hscroll;
+static GtkObject *s_view1_hsadj;
+
+static GtkWidget *s_view1_vscroll;
+static GtkObject *s_view1_vsadj;
+
+static GtkWidget *s_view1_label;
+
+/*
+ * Search context 
+ */
+static ulong s_srchcode;        /* search event code */
+static int s_srchindex;         /* last hit was at this event index */
+static boolean s_result_up;     /* The SEARCH RESULT dongle is displayed */
+static boolean s_srchfail_up;   /* The status line "Search Failed" is up */
+static int srch_chase_dir;      /* search/chase dir, 0=>forward */
+
+
+/*
+ * Print context 
+ */
+static int s_print_offset;      /* Magic offset added to line, tbox fn codes */
+static FILE *s_printfp;         
+
+/*
+ * Forward reference prototypes
+ */
+static void display_pid_axis(v1_geometry_t *vp);
+static void display_event_data(v1_geometry_t *vp);
+static void display_time_axis(v1_geometry_t *vp);
+static void view1_button_click_callback(GtkButton *item, gpointer data);
+
+/*
+ * config params
+ */
+
+gint c_view1_draw_width;
+gint c_view1_draw_height;
+
+/*
+ * Zoom-In / Time Ruler cursor
+ */
+
+#define zi_width 32
+#define zi_height 32
+#define zi_x_hot 22
+#define zi_y_hot 14
+static unsigned char zi_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
+   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
+   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
+   0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x88, 0x00,
+   0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0xc0, 0x00,
+   0x00, 0xfc, 0xff, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0xa0, 0x00,
+   0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x84, 0x00,
+   0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
+   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
+   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char zi_bkgd[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
+   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
+   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
+   0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x88, 0x00,
+   0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0xc0, 0x00,
+   0x00, 0xfc, 0xff, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0xa0, 0x00,
+   0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x84, 0x00,
+   0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
+   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
+   0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static GdkCursor *zi_cursor;
+static GdkPixmap *zi_source, *zi_mask;
+
+/* 
+ * Frequently-used small computations, best
+ * done correctly once and instantiated.
+ */
+
+/****************************************************************************
+* dtime_per_pixel
+****************************************************************************/
+
+static inline double dtime_per_pixel(v1_geometry_t *vp)
+{
+    return ((double)(vp->maxvistime - vp->minvistime)) /
+        ((double)(vp->total_width - vp->pid_ax_width));
+}
+
+/****************************************************************************
+* message_line
+* Changes the status line.  Pass "" to clear the status line.
+****************************************************************************/
+
+void message_line (char *s)
+{
+    gtk_label_set_text (GTK_LABEL(s_view1_label), s);
+}
+
+/****************************************************************************
+* set_window_title
+* Changes the window title to include the specified filename.
+****************************************************************************/
+
+void set_window_title (const char *filename)
+{
+    char title[128];
+    snprintf(title, sizeof(title), "g2 (%s)", filename);
+    gtk_window_set_title(GTK_WINDOW(g_mainwindow), title);
+}
+
+/****************************************************************************
+* recompute_hscrollbar
+* Adjust the horizontal scrollbar's adjustment object.
+* 
+* GtkAdjustments are really cool, but have to be set up exactly
+* right or the various client objects screw up completely.
+*
+* Note: this function is *not* called when the user clicks the scrollbar.
+****************************************************************************/
+
+static void recompute_hscrollbar (void)
+{
+    ulonglong current_width;
+    ulonglong event_incdec;
+    GtkAdjustment *adj;
+    event_t *ep;
+
+    if (g_nevents == 0)
+        return;
+
+    ep = (g_events + (g_nevents-1));
+    current_width = s_v1->maxvistime - s_v1->minvistime;
+    event_incdec = (current_width) / 6;
+
+    adj = GTK_ADJUSTMENT(s_view1_hsadj);
+
+    /* 
+     * Structure member decoder ring
+     * -----------------------------
+     * lower             the minimum possible value
+     * value             the current value
+     * upper             the maximum possible value
+     * step_increment    end button click increment
+     * page_increment    click in trough increment
+     * page_size         size of currently visible area
+     */
+
+    adj->lower = (gfloat)0.00;  
+    adj->value = (gfloat)s_v1->minvistime;
+
+    /* Minor click: move about 1/6 of a page */
+    adj->step_increment = (gfloat)event_incdec;
+
+    /* Major click: move about 1/3 of a page. */
+    adj->page_increment = (gfloat)(2*event_incdec);
+
+    /* allow the user to go a bit past the end */
+    adj->upper = adj->page_increment/3 + (gfloat)(ep->time);
+    adj->page_size = (gfloat)(current_width);
+
+    /*
+     * Tell all clients (e.g. the visible scrollbar) to 
+     * make themselves look right 
+     */
+    gtk_adjustment_changed(adj);
+    gtk_adjustment_value_changed(adj);
+}
+
+/****************************************************************************
+* recompute_vscrollbar
+* Ditto, for the vertical scrollbar
+****************************************************************************/
+
+static void recompute_vscrollbar (void)
+{
+    GtkAdjustment *adj;
+
+    adj = GTK_ADJUSTMENT(s_view1_vsadj);
+
+    adj->lower = (gfloat)0.00;
+    adj->upper = (gfloat)g_npids;
+    adj->value = (gfloat)0.00;
+    adj->step_increment = 1.00;
+    adj->page_increment = (gfloat)(s_v1->npids / 3);
+    adj->page_size = (gfloat)s_v1->npids;
+    gtk_adjustment_changed(adj);
+    gtk_adjustment_value_changed(adj);
+}
+
+/****************************************************************************
+* format_popbox_string
+****************************************************************************/
+
+elog_main_t elog_main;
+
+void format_popbox_string (char *tmpbuf, int len, event_t *ep, event_def_t *edp)
+{
+    char *fp;
+
+#ifdef NOTDEF
+    sprintf(tmpbuf,"%d:", ep->code);
+#endif
+    if (ep->flags & EVENT_FLAG_CLIB) {
+        elog_event_t *eep;
+        u8 *s;
+
+        eep = get_clib_event (ep->datum);
+        
+        s = format (0, "%U", format_elog_event, &elog_main, eep);
+        memcpy (tmpbuf, s, vec_len(s));
+        tmpbuf[vec_len(s)] = 0;
+        vec_free(s);
+        return;
+    }
+
+    snprintf(tmpbuf, len, "%s", edp->name);
+    fp = edp->format;
+    /* Make sure there's a real format string. If so, add it */
+    while (fp && *fp) {
+        if (*fp != ' ') {
+            snprintf(tmpbuf+strlen(tmpbuf), len - strlen(tmpbuf), ": ");
+            /* %s only supported for cpel files */
+            if (fp[1] == 's') {
+                snprintf(tmpbuf+strlen(tmpbuf), len - strlen(tmpbuf), 
+                         edp->format, strtab_ref(ep->datum));
+            } else {
+                snprintf(tmpbuf+strlen(tmpbuf), len - strlen(tmpbuf), 
+                        edp->format, ep->datum);
+            }
+            return;
+        }
+        fp++;
+    }
+}
+
+/****************************************************************************
+ * add_snapshot
+ ****************************************************************************/
+
+static void add_snapshot(void)
+{
+    int i;
+    snapshot_t *new = g_malloc(sizeof(snapshot_t));
+
+    memcpy(&new->geometry, s_v1, sizeof(new->geometry));
+    for (i = 0; i < NEVENTS; i++) {
+        new->show_event[i] = g_eventdefs[i].selected;
+    }
+    new->pidvec = g_malloc(sizeof(pid_sort_t)*g_npids);
+    memcpy(new->pidvec, g_pids, sizeof(pid_sort_t)*g_npids);
+    new->vscroll_value =  GTK_ADJUSTMENT(s_view1_vsadj)->value;
+    new->summary_mode = summary_mode;
+    new->color_mode = color_mode;
+
+    if (s_snapshots) {
+        new->next = s_snapshots;
+        s_snapshots = new;
+    } else {
+        new->next = 0;
+        s_snapshots = new;
+    }
+    s_cursnap = new;
+}
+
+/****************************************************************************
+ * next_snapshot
+ ****************************************************************************/
+
+static void next_snapshot(void)
+{
+    snapshot_t *next;
+    int i;
+    pid_sort_t *psp;
+    pid_data_t *pp;
+
+    if (!s_snapshots) {
+        infobox("No snapshots", "\nNo snapshots in the ring...\n");        
+        return;
+    }
+    
+    next = s_cursnap->next;
+    if (next == 0)
+        next = s_snapshots;
+
+    s_cursnap = next;
+
+    memcpy(s_v1, &next->geometry, sizeof(next->geometry));
+    for (i = 0; i < NEVENTS; i++) {
+        g_eventdefs[i].selected = next->show_event[i];
+    }
+    memcpy(g_pids, next->pidvec, sizeof(pid_sort_t)*g_npids);
+    color_mode = next->color_mode;
+    /*
+     * Update summary mode via a button push so that the button state is
+     * updated accordingly. (Should ideally clean up the view/controller
+     * separation properly one day.)
+     */
+    if (summary_mode != next->summary_mode) {
+        view1_button_click_callback
+            (NULL, (gpointer)(unsigned long long)
+             (summary_mode ? NOSUMMARY_BUTTON : SUMMARY_BUTTON));
+    }
+
+    /* Fix the pid structure index mappings */
+    psp = g_pids;
+
+    for (i = 0; i < g_npids; i++) {
+        pp = psp->pid;
+        pp->pid_index = i;
+        psp++;
+    }
+    GTK_ADJUSTMENT(s_view1_vsadj)->value = next->vscroll_value;
+    gtk_adjustment_value_changed(GTK_ADJUSTMENT(s_view1_vsadj));
+    recompute_hscrollbar();
+    pointsel_next_snapshot();
+    view1_display_when_idle();
+}
+
+
+/****************************************************************************
+ * del_snapshot
+ ****************************************************************************/
+
+static void del_snapshot(void)
+{
+    snapshot_t *prev;
+    snapshot_t *this;
+
+    if (!s_snapshots) {
+        infobox("No snapshots", "\nNo snapshots to delete...\n");        
+        return;
+    }
+
+    prev = NULL;
+    this = s_snapshots;
+
+    while (this && this != s_cursnap) {
+        prev = this;
+        this = this->next;
+    }
+
+    if (this != s_cursnap) {
+        infobox("BUG", "\nSnapshot AWOL!\n");        
+        return;
+    }
+ 
+    s_cursnap = this->next;
+
+    /* middle of the list? */
+    if (prev) {
+        prev->next = this->next;
+        g_free(this->pidvec);
+        g_free(this);
+    } else { /* start of the list */
+        s_snapshots = this->next;
+        g_free(this->pidvec);
+        g_free(this);
+    }
+    
+    /* Note: both will be NULL after last delete */
+    if (s_cursnap == NULL)
+        s_cursnap = s_snapshots;
+}
+
+/****************************************************************************
+ * write_snapshot
+ *
+ * VERY primitive right now - not endian or version independent, and only
+ * writes to "snapshots.g2" in the current directory
+ ****************************************************************************/
+static void write_snapshot(void)
+{
+    FILE *file = NULL;
+    snapshot_t *snap;
+    char *error = NULL;
+    int records = 0;
+    
+    if (s_snapshots == NULL) {
+        error = "No snapshots defined";
+        errno = 0;
+    }
+
+    if (!error) {
+        file = fopen("snapshots.g2", "w");
+        if (file == NULL) {
+            error = "Unable to open snapshots.g2";
+        }
+    }
+
+    /*
+     * Simply serialize the arch-dependent binary data, without a care in the
+     * world. Don't come running to me if you try to read it and crash.
+     */
+    for (snap = s_snapshots; !error && snap != NULL; snap = snap->next) {
+        if (fwrite(&snap->geometry, 
+                   sizeof(snap->geometry), 1, file) != 1 ||
+            fwrite(&snap->show_event, 
+                   sizeof(snap->show_event), 1, file) != 1 ||
+            fwrite(snap->pidvec, 
+                   sizeof(pid_sort_t) * g_npids, 1, file) != 1 ||
+            fwrite(&snap->vscroll_value, 
+                   sizeof(snap->vscroll_value), 1, file) != 1 ||
+            fwrite(&snap->summary_mode,  
+                   sizeof(snap->summary_mode),   1, file) != 1 ||
+            fwrite(&snap->color_mode,  
+                   sizeof(snap->color_mode),   1, file) != 1) {
+            error = "Error writing data";
+        }
+        records++;
+    }
+
+    if (!error) {
+        if (fclose(file)) {
+            error = "Unable to close file";
+        }
+    }
+
+    if (error) {
+        infobox(error, strerror(errno));
+    } else {
+        char buf[64];
+        snprintf(buf, sizeof(buf), "Wrote %d snapshots to snapshots.g2", 
+                 records);
+        message_line(buf);
+    }
+}
+
+/****************************************************************************
+ * read_snapshot
+ *
+ * VERY primitive right now - not endian or version independent, and only reads
+ * from "snapshots.g2" in the current directory
+ ****************************************************************************/
+static void read_snapshot(void)
+{
+    FILE *file;
+    snapshot_t *snap, *next_snap;
+    snapshot_t *new_snaps = NULL;
+    char *error = NULL;
+    int len, i, records = 0;
+    pid_data_t *pp;
+
+    file = fopen("snapshots.g2", "r");
+    if (file == NULL) {
+        error = "Unable to open snapshots.g2";
+    }
+
+    /*
+     * Read in the snapshots and link them together. We insert them backwards,
+     * but that's tolerable. If the data is in anyway not what we expect, we'll
+     * probably crash. Sorry.
+     */
+    while (!error && !feof(file)) {
+        snap = g_malloc(sizeof(*snap));
+        snap->pidvec = NULL; /* so we can free this if there's an error */
+
+        len = fread(&snap->geometry, sizeof(snap->geometry), 1, file);
+        if (len == 0) {
+            /* EOF */
+            g_free(snap);
+            break;
+        } else {
+            /* insert into list straight away */
+            snap->next = new_snaps;
+            new_snaps = snap;
+        }
+        if (len != 1) {
+            error = "Problem reading first item from file";
+            break;
+        }
+        if (fread(&snap->show_event, sizeof(snap->show_event), 1, file) != 1) {
+            error = "Problem reading second item from file";
+            break;
+        }
+        len = sizeof(pid_sort_t) * g_npids;
+        snap->pidvec = g_malloc(len);
+        if (fread(snap->pidvec, len, 1, file) != 1) {
+            error = "Problem reading third item from file";
+            break;
+        }
+        if (fread(&snap->vscroll_value, 
+                  sizeof(snap->vscroll_value), 1, file) != 1 ||
+            fread(&snap->summary_mode,  
+                  sizeof(snap->summary_mode),  1, file) != 1 ||
+            fread(&snap->color_mode,  
+                  sizeof(snap->color_mode),  1, file) != 1) {
+            error = "Problem reading final items from file";
+            break;
+        }
+
+        /*
+         * Fix up the pointers from the sorted pid vector back into our pid
+         * data objects, by walking the linked list of pid_data_t objects for
+         * every one looking for a match. This is O(n^2) grossness, but in real
+         * life there aren't that many pids, and it seems zippy enough.
+         */
+        for (i = 0; i < g_npids; i++) {
+            for (pp = g_pid_data_list; pp != NULL; pp = pp->next) {
+                if (pp->pid_value == snap->pidvec[i].pid_value) {
+                    break;
+                }
+            }
+            if (pp != NULL) {
+                snap->pidvec[i].pid = pp;
+            } else {
+                error = "Snapshot file referenced unknown pids";
+                break;
+            }
+        }
+
+        records++;
+    }
+
+    if (!error) {
+        if (fclose(file)) {
+            error = "Unable to close file";
+        }
+    }
+        
+    if (error) {
+        /*
+         * Problem - clear up any detritus
+         */
+        infobox(error, strerror(errno));
+        for (snap = new_snaps; snap != NULL; snap = next_snap) {
+            next_snap = snap->next;
+            g_free(snap);
+            g_free(snap->pidvec);
+        }
+    } else {
+        /*
+         * Success! trash the old snapshots and replace with the new
+         */
+        for (snap = s_snapshots; snap != NULL; snap = next_snap) {
+            next_snap = snap->next;
+            g_free(snap->pidvec);
+            g_free(snap);
+        }
+        
+        s_cursnap = s_snapshots = new_snaps;
+    }
+
+    if (error) {
+        infobox(error, strerror(errno));
+    } else {
+        char buf[64];
+        snprintf(buf, sizeof(buf), 
+                 "Read %d snapshots from snapshots.g2", records);
+        message_line(buf);
+    }
+}
+
+/****************************************************************************
+* set_color
+*
+* Set the color for the specified pid_index, or COLOR_DEFAULT to return it
+* to the usual black.
+****************************************************************************/
+#define COLOR_DEFAULT (-1)
+static void set_color(int pid_index)
+{
+    if (pid_index == COLOR_DEFAULT || !color_mode) {
+        gdk_gc_set_foreground(da->style->black_gc, &fg_black);
+    } else {
+        gdk_gc_set_foreground(da->style->black_gc, 
+                              &s_color[g_pids[pid_index].color_index]);
+    }
+}
+
+/****************************************************************************
+* toggle_event_select
+****************************************************************************/
+
+static void toggle_event_select(GdkEventButton *event, v1_geometry_t *vp)
+{
+    int pid_index, start_index;
+    int x, y;
+    GdkRectangle *rp;
+    GdkRectangle hit_rect;
+    GdkRectangle dummy;
+    event_t *ep;
+    event_def_t *edp;
+    char tmpbuf [1024];
+    double time_per_pixel;
+
+    if (g_nevents == 0)
+        return;
+
+    time_per_pixel = dtime_per_pixel(vp);
+
+    start_index = find_event_index (vp->minvistime);
+
+    /* Too far right? */
+    if (start_index >= g_nevents)
+        return;
+    
+    /* 
+     * To see if the mouse hit a visible event, use a variant
+     * of the event display loop.
+     */
+
+    hit_rect.x = (int)event->x;
+    hit_rect.y = (int)event->y;
+    hit_rect.width = 1;
+    hit_rect.height = 1;
+    
+    ep = (g_events + start_index);
+    
+    while ((ep->time < vp->maxvistime) && 
+           (ep < (g_events + g_nevents))) {
+        pid_index = ep->pid->pid_index;
+        
+        /* First filter: pid out of range */
+        if ((pid_index < vp->first_pid_index) ||
+            (pid_index >= vp->first_pid_index + vp->npids)) {
+            ep++;
+            continue;
+        }
+
+        /* Second filter: event hidden */
+        edp = find_event_definition (ep->code);
+        if (!edp->selected) {
+            ep++;
+            continue;
+        }
+        
+        /* 
+         * At this point, we know that the point is at least on the
+         * screen. See if the mouse hit within the bounding box 
+         */
+
+        /* 
+         * $$$$ maybe keep looping until off the edge,
+         * maintain a "best hit", then declare that one the winner?
+         */
+
+        pid_index -= vp->first_pid_index;
+        
+        y = pid_index*vp->strip_height + vp->event_offset;
+        
+        x = vp->pid_ax_width + 
+            (int)(((double)(ep->time - vp->minvistime)) / time_per_pixel);
+
+        /* Perhaps we're trying to toggle the detail box? */
+        if (ep->flags & EVENT_FLAG_SELECT) {
+            /* Figure out the dimensions of the detail box */
+            format_popbox_string(tmpbuf, sizeof(tmpbuf), ep, edp);
+            rp = tbox(tmpbuf, x, y - vp->pop_offset, TBOX_GETRECT_BOXED);
+            if (gdk_rectangle_intersect(rp, &hit_rect, &dummy)) {
+                ep->flags &= ~EVENT_FLAG_SELECT;
+                view1_display_when_idle();
+                break;
+            }
+        } 
+
+        sprintf(tmpbuf, "%ld", ep->code);
+
+        /* Figure out the dimensions of the regular box */
+        rp = tbox(tmpbuf, x, y, TBOX_GETRECT_EVENT);
+
+        if (gdk_rectangle_intersect(rp, &hit_rect, &dummy)) {
+            /* we hit the rectangle. */
+            if (ep->flags & EVENT_FLAG_SELECT) {
+                ep->flags &= ~EVENT_FLAG_SELECT;
+                view1_display_when_idle();
+                break;
+            } else {
+                set_color(ep->pid->pid_index);
+
+                /* It wasn't selected, so put up the detail box */
+                format_popbox_string(tmpbuf, sizeof(tmpbuf), ep, edp);
+                tbox(tmpbuf, x, y - vp->pop_offset, TBOX_DRAW_BOXED);
+                line(x, y-vp->pop_offset, x, y, LINE_DRAW_BLACK);
+                ep->flags |= EVENT_FLAG_SELECT;
+                ep->flags &= ~EVENT_FLAG_SEARCHRSLT;
+                s_last_selected_event = ep;
+            }
+            break;
+        }
+        ep++;
+    }
+}
+
+/****************************************************************************
+* move_current_track
+****************************************************************************/
+
+typedef enum { MOVE_TOP, MOVE_BOTTOM } move_type;
+
+static void move_current_track(GdkEventButton *event, 
+                               v1_geometry_t  *vp,
+                               move_type       type)
+{
+    int i;
+    int pid_index;
+    int y, delta_y;
+    pid_sort_t *new_pidvec;
+    pid_sort_t *psp;
+    pid_sort_t *pold, *pnew;
+    pid_data_t *pp;
+
+    if (g_nevents == 0)
+        return;
+
+    /* Scan pid/track axis locations, looking for a match */
+    for (i = 0; i < vp->npids; i++) {
+        y = i*vp->strip_height + vp->pid_ax_offset;
+        delta_y = y - event->y;
+        if (delta_y < 0)
+            delta_y = -delta_y;
+        if (delta_y < 10) {
+            goto found;
+        }
+
+    }
+    infobox("NOTE", "\nNo PID/Track In Range\nPlease Try Again");
+    return;
+    
+ found:
+    pid_index = i + vp->first_pid_index;
+
+    new_pidvec = g_malloc(sizeof(pid_sort_t)*g_npids);
+    pold = g_pids;
+    pnew = new_pidvec;
+
+    if (type == MOVE_TOP) {
+        /* move to top */
+        *pnew++ = g_pids[pid_index];
+        for (i = 0; i < pid_index; i++)
+            *pnew++ = *pold++;
+        pold++;
+        i++;
+        for (; i < g_npids; i++)
+            *pnew++ = *pold++;
+    } else {
+        /* move to bottom */
+        for (i = 0; i < pid_index; i++)
+            *pnew++ = *pold++;
+        pold++;
+        i++;
+        for (; i < g_npids; i++)
+            *pnew++ = *pold++;
+        *pnew = g_pids[pid_index];
+    }
+
+    g_free(g_pids);
+    g_pids = new_pidvec;
+
+    /*
+     * Revert the pid_index mapping to an identity map, 
+     */
+    psp = g_pids;
+
+    for (i = 0; i < g_npids; i++) {
+        pp = psp->pid;
+        pp->pid_index = i;
+        psp++;
+    }
+    view1_display_when_idle();
+}
+
+/****************************************************************************
+* zoom_event
+* Process a zoom gesture. The use of doubles is required to avoid 
+* truncating the various variable values, which in turn would lead to
+* some pretty random-looking zoom responses.
+****************************************************************************/
+
+void zoom_event(GdkEventButton *e1, GdkEventButton *e2, v1_geometry_t *vp)
+{
+    double xrange;
+    double time_per_pixel;
+    double width_in_pixels;
+    double center_on_time, width_in_time;
+    double center_on_pixel;
+
+    /* 
+     * Clip the zoom area to the event display area. 
+     * Otherwise, center_on_time - width_in_time is in hyperspace
+     * to the left of zero 
+     */
+       
+    if (e1->x < vp->pid_ax_width)
+	e1->x = vp->pid_ax_width;
+    
+    if (e2->x < vp->pid_ax_width)
+	e2->x = vp->pid_ax_width;
+
+    if (e2->x == e1->x)
+	goto loser_zoom_repaint;
+
+    xrange = (double) (e2->x - e1->x);
+    if (xrange < 0.00)
+        xrange = -xrange;
+
+    /* Actually, width in pixels of half the zoom area */
+    width_in_pixels = xrange / 2.00;
+    time_per_pixel = dtime_per_pixel(vp);
+    width_in_time = width_in_pixels * time_per_pixel;
+
+    /* Center the screen on the center of the zoom area */
+    center_on_pixel = (double)((e2->x + e1->x) / 2.00) - 
+        (double)vp->pid_ax_width;
+    center_on_time = center_on_pixel*time_per_pixel + (double)vp->minvistime;
+
+    /*
+     * Transform back to 64-bit integer microseconds, reset the
+     * scrollbar, schedule a repaint. 
+     */
+    vp->minvistime = (ulonglong)(center_on_time - width_in_time);
+    vp->maxvistime = (ulonglong)(center_on_time + width_in_time);
+
+loser_zoom_repaint:
+    recompute_hscrollbar();
+    
+    view1_display_when_idle();
+}
+
+/****************************************************************************
+* scroll_y
+*
+* Scroll up or down by the specified delta
+*
+****************************************************************************/
+static void scroll_y(int delta)
+{
+    int new_index = s_v1->first_pid_index + delta;
+    if (new_index + s_v1->npids > g_npids)
+        new_index = g_npids - s_v1->npids;
+    if (new_index < 0)
+        new_index = 0;
+    
+    if (new_index != s_v1->first_pid_index) {
+        s_v1->first_pid_index = new_index;
+        GTK_ADJUSTMENT(s_view1_vsadj)->value = (gdouble)new_index;
+        gtk_adjustment_value_changed(GTK_ADJUSTMENT(s_view1_vsadj));
+        view1_display_when_idle();
+    }
+}
+
+/****************************************************************************
+* view1_handle_key_press_event
+* Relevant definitions in: /usr/include/gtk-1.2/gdk/gdktypes.h
+*
+* This routine implements hotkeys for the Quake generation:
+*
+*   W - zoom in
+*   S - zoom out
+*   A - pan left
+*   D - pan right
+*   R - pan up
+*   F - pan down
+*   T - more traces
+*   G - fewer traces
+*
+*   E - toggle summary mode
+*   C - toggle color mode
+*
+*   X - take snapshot
+*   Z - next snapshot
+*   P - persist snapshots to file
+*   L - load snapshots from file
+*
+* ctrl-Q - exit
+*
+****************************************************************************/
+gint
+view1_handle_key_press_event (GtkWidget *widget, GdkEventKey *event)
+{
+    long long delta;
+
+    switch (event->keyval) {
+        case GDK_w: // zoom in
+            view1_button_click_callback(NULL, (gpointer)ZOOMIN_BUTTON);
+            break;
+
+        case GDK_s: // zoom out
+            view1_button_click_callback(NULL, (gpointer)ZOOMOUT_BUTTON);
+            break;
+
+        case GDK_a: // pan left
+            delta = (s_v1->maxvistime - s_v1->minvistime) / 6;
+            if (s_v1->minvistime < delta) {
+                delta = s_v1->minvistime;
+            }
+            s_v1->minvistime -= delta;
+            s_v1->maxvistime -= delta;
+            recompute_hscrollbar();
+            break;
+
+        case GDK_d: // pan right
+            delta = (s_v1->maxvistime - s_v1->minvistime) / 6;
+            if (s_v1->maxvistime + delta > g_events[g_nevents - 1].time) {
+                /*
+                 * @@@ this doesn't seem to quite reach the far right hand
+                 * side correctly - not sure why.
+                 */
+                delta = g_events[g_nevents - 1].time - s_v1->maxvistime;
+            }
+            s_v1->minvistime += delta;
+            s_v1->maxvistime += delta;
+            recompute_hscrollbar();
+            break;
+
+        case GDK_r: // pan up
+            scroll_y(-1);
+            break;
+
+        case GDK_f: // pan down
+            scroll_y(+1);
+            break;
+
+        case GDK_t: // fewer tracks
+            view1_button_click_callback(NULL, (gpointer)LESS_TRACES_BUTTON);
+            break;
+
+        case GDK_g: // more tracks
+            view1_button_click_callback(NULL, (gpointer)MORE_TRACES_BUTTON);
+            break;
+
+        case GDK_e: // toggle summary mode
+            view1_button_click_callback
+                (NULL, (gpointer)(unsigned long long)
+                 (summary_mode ? NOSUMMARY_BUTTON : SUMMARY_BUTTON));
+            break;
+
+        case GDK_c: // toggle color mode
+            color_mode ^= 1;
+            view1_display_when_idle();
+            break;
+
+        case GDK_p: // persist snapshots
+            write_snapshot();
+            break;
+
+        case GDK_l: // load snapshots
+            read_snapshot();
+            break;
+
+        case GDK_x: // take snapshot
+            view1_button_click_callback(NULL, (gpointer)SNAP_BUTTON);
+            break;
+
+        case GDK_z: // next snapshot
+            view1_button_click_callback(NULL, (gpointer)NEXT_BUTTON);
+            break;
+
+        case GDK_q: // ctrl-q is exit
+            if (event->state & GDK_CONTROL_MASK) {
+                gtk_main_quit();
+            }
+            break;
+    }
+    return TRUE;
+}
+
+/****************************************************************************
+* button_press_event
+* Relevant definitions in: /usr/include/gtk-1.2/gdk/gdktypes.h
+*
+* This routine implements three functions: zoom-to-area, time ruler, and
+* show/hide event detail popup. 
+*
+* The left mouse button (button 1) has two simultaneous functions: event 
+* detail popup, and zoom-to-area. If the press and release events occur
+* within a small delta-x, it's a detail popup event.  Otherwise, it's
+* an area zoom.
+*
+* The right mouse button (button 3) implements the time ruler.
+****************************************************************************/
+
+static gint
+button_press_event (GtkWidget *widget, GdkEventButton *event)
+{
+    static GdkEventButton press1_event;
+    static boolean press1_valid;
+    static GdkEventButton press3_event;
+    static guint32 last_truler_time;
+    static boolean press3_valid;
+    static boolean zoom_bar_up;
+    int time_ax_y, xdelta;
+    char tmpbuf [128];
+    double time_per_pixel;
+
+    time_ax_y = 0;
+
+    switch(event->type) {
+    case GDK_BUTTON_PRESS:
+        /* Capture the appropriate starting point */
+        if (event->button == 1) {
+            press1_valid = TRUE;
+            press1_event = *event;
+            return(TRUE);
+        }
+        if (event->button == 3) {
+            press3_valid = TRUE;
+            press3_event = *event;
+            return(TRUE);
+        }
+        return(TRUE);
+
+    case GDK_BUTTON_RELEASE:
+        /* Time ruler */
+        if (press3_valid) {
+            press3_valid = FALSE;
+            /* Fix the cursor, and repaint the screen from scratch */
+            gdk_window_set_cursor (da->window, norm_cursor);
+            view1_display_when_idle();
+            return(TRUE);
+        }
+        /* Event select / zoom-to-area */
+        if (press1_valid) {
+            press1_valid = FALSE;
+            xdelta = (int)(press1_event.x - event->x);
+            if (xdelta < 0)
+                xdelta = -xdelta;
+
+            /* is the mouse more or less where it started? */
+            if (xdelta < 10) {
+                /* Control-left-mouse => sink the track */
+                /* Shift-left-mouse => raise the track */
+                if ((press1_event.state & GDK_CONTROL_MASK) ==
+                    GDK_CONTROL_MASK) {
+                    move_current_track(event, s_v1, MOVE_BOTTOM);
+                } else if ((press1_event.state & GDK_SHIFT_MASK) ==
+                           GDK_SHIFT_MASK) {
+                    move_current_track(event, s_v1, MOVE_TOP);
+                } else {
+                    /* No modifiers: toggle the event */
+                    toggle_event_select(event, s_v1);
+                }
+                /* Repaint to get rid of the zoom bar */
+                if (zoom_bar_up) {
+                    /* Fix the cursor and leave. No zoom */
+                    gdk_window_set_cursor (da->window, norm_cursor);
+                    zoom_bar_up = FALSE;
+                    break;
+                }
+            } else { /* mouse moved enough to zoom */
+                zoom_event(&press1_event, event, s_v1);
+                gdk_window_set_cursor (da->window, norm_cursor);
+                zoom_bar_up = FALSE;
+            }
+        }  else if (event->button == 4) {
+            /* scroll wheel up */
+            scroll_y(event->state & GDK_SHIFT_MASK ? -10 : -1);
+        } else if (event->button == 5) {
+            /* scroll wheel down */
+            scroll_y(event->state & GDK_SHIFT_MASK ? +10 : +1);
+        }
+        return(TRUE);
+
+    case GDK_MOTION_NOTIFY:
+        /* Button one followed by motion: draw zoom fence and fix cursor */
+        if (press1_valid) {
+            /* Fence, cursor already set */
+            if (zoom_bar_up)
+                return(TRUE);
+            
+            xdelta = (int)(press1_event.x - event->x);
+            if (xdelta < 0)
+                xdelta = -xdelta;
+            
+            /* Haven't moved enough to declare a zoom sequence yet */
+            if (xdelta < 10) 
+                return(TRUE);
+            
+            /* Draw the zoom fence, use the key-down X coordinate */
+            time_ax_y = s_v1->npids * s_v1->strip_height + s_v1->pid_ax_offset;
+            
+            line((int)(press1_event.x), s_v1->pop_offset, 
+                 (int)(press1_event.x), time_ax_y, LINE_DRAW_BLACK);
+            tbox("Zoom From Here...", (int)(press1_event.x), s_v1->pop_offset,
+                 TBOX_DRAW_BOXED);
+            gdk_window_set_cursor(da->window, zi_cursor);
+            zoom_bar_up = TRUE;
+            return(TRUE);
+        }
+        if (press3_valid) {
+            double nsec;
+
+            gdk_window_set_cursor(da->window, zi_cursor);
+
+            /* 
+             * Some filtration is needed on Solaris, or the server will hang
+             */
+            if (event->time - last_truler_time < 75)
+                return(TRUE);
+
+            last_truler_time = event->time;
+
+            line((int)(press3_event.x), s_v1->pop_offset, 
+                 (int)(press3_event.x), time_ax_y, LINE_DRAW_BLACK);
+
+            xdelta = (int)(press3_event.x - event->x);
+            if (xdelta < 0)
+                xdelta = -xdelta;
+            
+            time_per_pixel = ((double)(s_v1->maxvistime - s_v1->minvistime)) / 
+                ((double)(s_v1->total_width - s_v1->pid_ax_width)); 
+
+            time_ax_y = s_v1->npids * s_v1->strip_height + s_v1->pid_ax_offset;
+
+            line((int)(press3_event.x), s_v1->pop_offset, 
+                 (int)(press3_event.x), time_ax_y, LINE_DRAW_BLACK);
+            /*
+             * Note: use a fixed-width format so it looks like we're
+             * erasing and redrawing the box. 
+             */
+            nsec = ((double)xdelta)*time_per_pixel;
+            if (nsec >1e9) {
+                sprintf(tmpbuf, "%8.3f sec ", nsec/1e9);
+            } else if (nsec > 1e6) {
+                sprintf(tmpbuf, "%8.3f msec", nsec/1e6);
+            } else if (nsec > 1e3) {
+                sprintf(tmpbuf, "%8.3f usec", nsec/1e3);
+            } else {
+                sprintf(tmpbuf, "%8.0f nsec", nsec);
+            }
+            tbox(tmpbuf, (int)(press3_event.x), s_v1->pop_offset,
+                 TBOX_DRAW_BOXED);
+            return(TRUE);
+        }
+
+    default:
+        break;
+#ifdef DEBUG
+        g_print("button:\ttype = %d\n", event->type);
+        g_print("\twindow = 0x%x\n", event->window);
+        g_print("\tsend_event = %d\n", event->send_event);
+        g_print("\ttime = %d\n", event->time);
+        g_print("\tx = %6.2f\n", event->x);
+        g_print("\ty = %6.2f\n", event->y);
+        g_print("\tpressure = %6.2f\n", event->pressure);
+        g_print("\txtilt = %6.2f\n", event->xtilt);
+        g_print("\tytilt = %6.2f\n", event->ytilt);
+        g_print("\tstate = %d\n", event->state);
+        g_print("\tbutton = %d\n", event->button);
+        g_print("\tsource = %d\n", event->source);
+        g_print("\tdeviceid = %d\n", event->deviceid);
+        g_print("\tx_root = %6.2f\n", event->x_root);
+        g_print("\ty_root = %6.2f\n", event->y_root);
+        return(TRUE);
+#endif
+    }
+
+    view1_display_when_idle();
+
+    return(TRUE);
+}
+
+/****************************************************************************
+* configure_event
+* Happens when the window manager resizes the viewer's main window.
+****************************************************************************/
+
+static gint
+configure_event (GtkWidget *widget, GdkEventConfigure *event)
+{
+    /* Toss the previous drawing area backing store pixmap */
+    if (pm)
+        gdk_pixmap_unref(pm);
+    
+    /* Create a new pixmap, paint it */
+    pm = gdk_pixmap_new(widget->window,
+                        widget->allocation.width,
+                        widget->allocation.height,
+                        -1);
+    gdk_draw_rectangle (pm,
+                        widget->style->white_gc,
+                        TRUE,
+                        0, 0,
+                        widget->allocation.width,
+                        widget->allocation.height);
+
+    /* Reset the view geometry parameters, as required */
+    s_v1->total_width = widget->allocation.width;
+    s_v1->total_height = widget->allocation.height;
+    s_v1->npids = (s_v1->total_height - s_v1->time_ax_height) / 
+        s_v1->strip_height;
+
+    /* Schedule a repaint */
+    view1_display_when_idle();
+    return(TRUE);
+}
+
+/****************************************************************************
+* expose_event
+* Use backing store to fix the screen.
+****************************************************************************/
+static gint expose_event (GtkWidget *widget, GdkEventExpose *event)
+{
+    gdk_draw_pixmap(widget->window,
+                    widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                    pm,
+                    event->area.x, event->area.y,
+                    event->area.x, event->area.y,
+                    event->area.width, event->area.height);
+    
+    return(FALSE);
+}
+
+/****************************************************************************
+* event_search_internal
+* This routine searches forward from s_srchindex, looking for s_srchcode;
+* wraps at the end of the buffer.
+****************************************************************************/
+
+boolean event_search_internal (void)
+{
+    event_t *ep;
+    int i;
+    int index;
+    int pid_index;
+    boolean full_redisplay = FALSE;
+    ulonglong current_width;
+    char tmpbuf [64];
+
+    /* No events yet?  Act like the search worked, to avoid a loop */
+    if (g_nevents == 0)
+        return(TRUE);
+
+    ep = (g_events + s_srchindex);
+    ep->flags &= ~EVENT_FLAG_SEARCHRSLT;
+
+    /* 
+     * Assume the user wants to search [plus or minus]
+     * from where they are.
+     */
+#ifdef notdef
+    if (ep->time < s_v1->minvistime)
+        s_srchindex = find_event_index (s_v1->minvistime);
+#endif
+
+    for (i = 1; i <= g_nevents; i++) {
+        index = (srch_chase_dir == SRCH_CHASE_BACKWARD) ?
+            (s_srchindex - i) % g_nevents :
+            (i + s_srchindex) % g_nevents;
+        
+        ep = (g_events + index);
+        
+        if (ep->code == s_srchcode) {
+            if (s_srchfail_up)
+                message_line("");
+            s_srchindex = index;
+            pid_index = ep->pid->pid_index;
+            
+            /* Need a vertical scroll? */
+            if ((pid_index < s_v1->first_pid_index) ||
+                (pid_index >= s_v1->first_pid_index + s_v1->npids)) {
+                if (pid_index > (g_npids - s_v1->npids))
+                    pid_index = (g_npids - s_v1->npids);
+                s_v1->first_pid_index = pid_index;
+                GTK_ADJUSTMENT(s_view1_vsadj)->value = 
+                    (gdouble)s_v1->first_pid_index;
+                gtk_adjustment_value_changed(GTK_ADJUSTMENT(s_view1_vsadj));
+                full_redisplay = TRUE;
+            }
+            
+            /* Need a horizontal scroll? */
+            if (ep->time < s_v1->minvistime || ep->time > s_v1->maxvistime) {
+                current_width = (s_v1->maxvistime - s_v1->minvistime);
+                if (ep->time < ((current_width+1) / 2)) {
+                    s_v1->minvistime = 0ll;
+                    s_v1->maxvistime = current_width;
+                } else {
+                    s_v1->minvistime = ep->time - ((current_width+1)/2);
+                    s_v1->maxvistime = ep->time + ((current_width+1)/2);
+                }
+                recompute_hscrollbar();
+                full_redisplay = TRUE;
+            }
+            ep->flags |= EVENT_FLAG_SEARCHRSLT;
+            full_redisplay = TRUE;
+
+#ifdef NOTDEF
+            if (!full_redisplay){
+                if (!s_result_up) {
+                    s_result_up = TRUE;
+                    time_per_pixel = dtime_per_pixel(s_v1);
+                    
+                    y = pid_index*s_v1->strip_height + s_v1->event_offset;
+                    x = s_v1->pid_ax_width + 
+                        (int)(((double)(ep->time - s_v1->minvistime)) / 
+                              time_per_pixel);
+                    sprintf(tmpbuf, "SEARCH RESULT");
+                    tbox(tmpbuf, x, y - s_v1->pop_offset, TBOX_DRAW_BOXED);
+                    line(x, y-s_v1->pop_offset, x, y, LINE_DRAW_BLACK);
+                } else {
+                    full_redisplay = TRUE;
+                }
+            }
+#endif
+
+            if (full_redisplay)
+                view1_display_when_idle();
+            return(TRUE);
+        }
+    }
+    sprintf (tmpbuf, "Search for event %ld failed...\n", s_srchcode);
+    message_line(tmpbuf);
+    s_srchfail_up = TRUE;
+    return(TRUE);
+}
+
+/****************************************************************************
+* event_search_callback
+****************************************************************************/
+
+boolean event_search_callback (char *s)
+{
+    /* No events yet?  Act like the search worked, to avoid a loop */
+    if (g_nevents == 0)
+        return(TRUE);
+
+    s_srchcode = atol(s);
+    
+    if (s_srchcode == 0)
+        return(FALSE);
+
+    return(event_search_internal());
+}
+
+/****************************************************************************
+* event_search
+****************************************************************************/
+
+static void event_search (void)
+{
+    modal_dialog ("Event Search: Please Enter Event Code",
+                  "Invalid: Please Reenter Event Code", NULL,
+                  event_search_callback);
+}
+
+/****************************************************************************
+* init_track_colors
+****************************************************************************/
+static void init_track_colors(void)
+{
+    int         i;
+    unsigned    hash;
+    char       *label_char;
+    unsigned    RGB[3];
+    gboolean    dont_care[g_npids];
+
+    /*
+     * If we've already allocated the colors once, then in theory we should
+     * just be able to re-order the GCs already created to match the new track
+     * order; the track -> color mapping doesn't currently change at runtime.
+     * However, it's easier just to allocate everything from fresh. As a nod in
+     * the direction of politeness towards our poor abused X server, we at
+     * least mop up the previously allocated GCs first, although in practice
+     * even omitting this didn't seem to cause a problem. 
+     */
+    if (s_color != NULL ) {
+        gdk_colormap_free_colors(gtk_widget_get_colormap(da), 
+                                 s_color, g_npids);
+        memset(s_color, 0, sizeof(GdkColor) * g_npids);
+    } else {
+        /*
+         * First time through: allocate the array to hold the GCs.
+         */
+        s_color = g_malloc(sizeof(GdkColor) * g_npids);
+    }
+
+    /*
+     * Go through and assign a color for each track.
+     */
+    for (i = 0; i < g_npids; i++) {
+        /*
+         * We compute the color from a hash of the thread name. That way we get
+         * a distribution of different colors, and the same thread has the same
+         * color across multiple data sets. Unfortunately, even though the
+         * process name and thread id are invariant across data sets, the
+         * process id isn't, so we want to exclude that from the hash. Since
+         * the pid appears in parentheses after the process name and tid, we
+         * can just stop at the '(' character.
+         *
+         * We could create a substring and use the CLIB Jenkins hash, but given
+         * we're hashing ascii data, a suitable Bernstein hash is pretty much
+         * just as good, and it's easiest just to compute it inline.
+         */
+        label_char = get_track_label(g_pids[i].pid_value);
+        hash = 0;
+        while (*label_char != '\0' && *label_char != '(') {
+            hash = hash * 33 + *label_char++;
+        }
+        hash += hash >> 5;    /* even out the lower order bits a touch */
+
+        /*
+         * OK, now we have our hash. We get the color by using the first three
+         * bytes of the hash for the RGB values (expanded from 8 to 16 bits),
+         * and then use the fourth byte to choose one of R, G, B and mask this
+         * one down. This ensures the color can't be too close to white and
+         * therefore hard to see.
+         *
+         * We also drop the top bit of the green, since bright green on its own
+         * is hard to see against white. Generally we err on the side of
+         * keeping it dark, rather than using the full spectrum of colors. This
+         * does result in something of a preponderance of muddy colors and a
+         * bit of a lack of cheery bright ones, but at least you can read
+         * everything. It would be nice to do better.
+         */
+        RGB[0] = (hash & 0xff000000) >> 16;
+        RGB[1] = (hash & 0x007f0000) >> 8;
+        RGB[2] = (hash & 0x0000ff00);
+        RGB[hash % 3] &= 0x1fff;
+
+        {
+            GdkColor color = {0, RGB[0], RGB[1], RGB[2]};
+            s_color[i] = color;
+            g_pids[i].color_index = i;
+        }
+    }
+
+    /*
+     * Actually allocate the colors in one bulk operation. We ignore the return
+     * values.
+     */
+    gdk_colormap_alloc_colors(gtk_widget_get_colormap(da), 
+                              s_color, g_npids, FALSE, TRUE, dont_care);
+}
+
+
+/****************************************************************************
+* chase_event_etc
+* Reorder the pid_index fields so the viewer "chases" the last selected
+* event.
+****************************************************************************/
+
+static void chase_event_etc(enum chase_mode mode)
+{
+    pid_sort_t *psp, *new_pidvec;
+    pid_data_t *pp;
+    event_t *ep;
+    int pids_mapped;
+    ulong code_to_chase;
+    ulong datum_to_chase;
+    ulong pid_to_chase;
+    int i;
+    int winner;
+
+    if (!s_last_selected_event) {
+        infobox("No selected event", 
+                "\nPlease select an event and try again...\n");
+        return;
+    }
+
+    /* Clear all index assignments */
+    psp = g_pids;
+    for (i = 0; i < g_npids; i++) {
+        pp = psp->pid;
+        pp->pid_index = 0xFFFFFFFF;
+        psp++;
+    }
+
+    ep = s_last_selected_event;
+    code_to_chase = ep->code;
+    datum_to_chase = ep->datum;
+    pid_to_chase = ep->pid->pid_value;
+    pids_mapped = 0;
+    new_pidvec = g_malloc(sizeof(pid_sort_t)*g_npids);
+
+    while (1) {
+        if (srch_chase_dir == SRCH_CHASE_FORWARD) {
+            if (ep >= g_events + g_nevents)
+                break;
+        } else {
+            if (ep < g_events)
+                break;
+        }
+
+        winner = 0;
+        switch(mode) {
+        case CHASE_EVENT:
+            if (ep->code == code_to_chase) {
+                winner = 1;
+            }
+            break;
+
+        case CHASE_DATUM:
+            if (ep->datum == datum_to_chase) {
+                winner = 1;
+            }
+            break;
+
+        case CHASE_TRACK:
+            if (ep->pid->pid_value == pid_to_chase) {
+                winner = 1;
+            }
+            break;
+
+        default:
+            infobox("BUG", "unknown mode in chase_event_etc\n");
+            break;
+        }
+
+        if (winner) {
+            if (ep->pid->pid_index == 0xFFFFFFFF) {
+                ep->pid->pid_index = pids_mapped;
+                new_pidvec[pids_mapped].pid = ep->pid;
+                new_pidvec[pids_mapped].pid_value = ep->pid->pid_value;
+                new_pidvec[pids_mapped].color_index = 0;
+                pids_mapped++;
+                if (pids_mapped == g_npids)
+                    break;
+            }
+        }
+        if (srch_chase_dir == SRCH_CHASE_FORWARD)
+            ep++;
+        else
+            ep--;
+    }
+
+    /* Pass 2, first-to-last, to collect stragglers */
+    ep = g_events;
+
+    while (ep < g_events + g_nevents) {
+        if (ep->pid->pid_index == 0xFFFFFFFF) {
+            ep->pid->pid_index = pids_mapped;
+            new_pidvec[pids_mapped].pid = ep->pid;
+            new_pidvec[pids_mapped].pid_value = ep->pid->pid_value;
+            new_pidvec[pids_mapped].color_index = 0;
+            pids_mapped++;
+            if (pids_mapped == g_npids)
+                break;
+        }
+        ep++;
+    }
+
+    if (pids_mapped != g_npids) {
+        infobox("BUG", "\nDidn't map all pids in chase_event_etc\n");
+    }
+
+    g_free (g_pids);
+    g_pids = new_pidvec;
+    
+    /*
+     * The new g_pids vector contains the "chase" sort, so we revert
+     * the pid_index mapping to an identity map 
+     */
+    psp = g_pids;
+
+    for (i = 0; i < g_npids; i++) {
+        pp = psp->pid;
+        pp->pid_index = i;
+        psp++;
+    }
+
+    /* AutoScroll the PID axis so we show the first "chased" event */
+    s_v1->first_pid_index = 0;
+    GTK_ADJUSTMENT(s_view1_vsadj)->value = 0.00;
+    gtk_adjustment_value_changed(GTK_ADJUSTMENT(s_view1_vsadj));
+    init_track_colors();
+    view1_display_when_idle();
+}
+
+/****************************************************************************
+* unchase_event_etc
+* Copy g_original_pids to g_pids, revert index mapping
+****************************************************************************/
+static void unchase_event_etc(void)
+{
+    int i;
+    pid_sort_t *psp;
+    pid_data_t *pp;
+
+    memcpy (g_pids, g_original_pids, sizeof(pid_sort_t)*g_npids); 
+
+    /* Fix the pid structure index mappings */
+    psp = g_pids;
+
+    for (i = 0; i < g_npids; i++) {
+        pp = psp->pid;
+        pp->pid_index = i;
+        psp++;
+    }
+
+    /* Scroll PID axis to the top */
+    s_v1->first_pid_index = 0;
+    GTK_ADJUSTMENT(s_view1_vsadj)->value = 0.00;
+    gtk_adjustment_value_changed(GTK_ADJUSTMENT(s_view1_vsadj));
+    init_track_colors();
+    view1_display_when_idle();
+}
+
+/****************************************************************************
+* print_ps_header
+* To fit a reasonable-sized landscape mode plot onto letter-size paper,
+* scale everything by .75.
+****************************************************************************/
+
+static void print_ps_header (v1_geometry_t *vp, char *filename)
+{
+    time_t now;
+
+    now = time(0);
+
+    fprintf(s_printfp, "%%%%!PS-Adobe-3.0 EPSF-3.0\n");
+    fprintf(s_printfp, "%%%%Creator: G2 Event Viewer\n");
+    fprintf(s_printfp, "%%%%Title: %s\n", filename);
+    fprintf(s_printfp, "%%%%CreationDate: %s", ctime(&now));
+    fprintf(s_printfp, "%%%%DocumentData: Clean7Bit\n");
+    fprintf(s_printfp, "%%%%Origin: 0 0\n");
+    fprintf(s_printfp, "%%%%BoundingBox: 0 0 %d %d\n", vp->total_height, 
+           vp->total_width);
+    fprintf(s_printfp, "%%%%LanguageLevel: 2\n");
+    fprintf(s_printfp, "%%%%Pages: 1\n");
+    fprintf(s_printfp, "%%%%Page: 1 1\n");
+    fprintf(s_printfp, "%%%%EOF\n");
+    fprintf(s_printfp, "/Times-Roman findfont\n");
+    fprintf(s_printfp, "12 scalefont\n");
+    fprintf(s_printfp, "setfont\n");
+    fprintf(s_printfp, ".75 .75 scale\n");
+}
+
+/****************************************************************************
+* xrt
+* Xcoordinate rotate and translate.  We need to emit postscript that
+* has a reasonable aspect ratio for printing.  To do that, we rotate the
+* intended picture by 90 degrees, using the standard 2D rotation 
+* formula:
+* 
+*     Xr = x*cos(theta) - y*sin(theta);
+*     Yr = x*sin(theta) + y*cos(theta);
+*
+* If we let theta = 90, this reduces to
+*     Xr = -y
+*     Yr =  x
+*
+* Translate back to the origin in X by adding Ymax, yielding
+*     Xrt = Ymax - y
+****************************************************************************/
+
+static inline int xrt(int x, int y)
+{
+    return (s_v1->total_height - y);
+}
+
+static inline int yrt(int x, int y)
+{
+    return(x);
+}
+
+/****************************************************************************
+* print_screen_callback
+****************************************************************************/
+
+static boolean print_screen_callback(char *filename)
+{
+    s_printfp = fopen (filename, "wt");
+
+    if (s_printfp == NULL)
+        return(FALSE);
+
+    /*
+     * This variable allows us to magically turn the view1 display
+     * code into a print-driver, with a minimum of fuss. The idea is to
+     * magically change TBOX_DRAW_XXX into TBOX_PRINT_XXX by adding
+     * the required value, aka s_print_offset.
+     * Make sure to fix g2.h if you mess here, or vice versa.
+     */
+    s_print_offset = TBOX_PRINT_PLAIN - TBOX_DRAW_PLAIN;
+
+    print_ps_header(s_v1, filename);
+
+    display_pid_axis(s_v1);
+    display_event_data(s_v1);
+    display_time_axis(s_v1);
+
+    fclose (s_printfp);
+    s_printfp = 0;
+    s_print_offset = 0;
+
+    /* For tactile feedback */
+    view1_display_when_idle();
+    return(TRUE);
+}
+
+/****************************************************************************
+* view1_button_click_callback 
+****************************************************************************/
+
+static void view1_button_click_callback(GtkButton *item, gpointer data)
+{
+    enum view1_button_click click = (enum view1_button_click) data;
+    event_t *ep;
+    ulonglong event_incdec;
+    ulonglong current_width;
+    ulonglong zoom_delta;
+
+
+    current_width = s_v1->maxvistime - s_v1->minvistime;
+    event_incdec = (current_width) / 3;
+
+    if (event_incdec == 0LL)
+        event_incdec = 1;
+
+    zoom_delta = (s_v1->maxvistime - s_v1->minvistime) / 6;
+
+    switch(click) {
+    case TOP_BUTTON:
+        /* First PID to top of window */
+        s_v1->first_pid_index = 0;
+        GTK_ADJUSTMENT(s_view1_vsadj)->value = 0.00;
+        gtk_adjustment_value_changed(GTK_ADJUSTMENT(s_view1_vsadj));
+        break;
+
+    case BOTTOM_BUTTON:
+        s_v1->first_pid_index = g_npids - s_v1->npids;
+        if (s_v1->first_pid_index < 0)
+            s_v1->first_pid_index = 0;
+        GTK_ADJUSTMENT(s_view1_vsadj)->value = (gdouble)s_v1->first_pid_index;
+        gtk_adjustment_value_changed(GTK_ADJUSTMENT(s_view1_vsadj));
+        break;
+
+    case SNAP_BUTTON:
+        add_snapshot();
+        break;
+
+    case NEXT_BUTTON:
+        next_snapshot();
+        break;
+
+    case DEL_BUTTON:
+        del_snapshot();
+        break;
+
+    case CHASE_EVENT_BUTTON:
+        chase_event_etc(CHASE_EVENT);
+        break;
+
+    case CHASE_DATUM_BUTTON:
+        chase_event_etc(CHASE_DATUM);
+        break;
+
+    case CHASE_TRACK_BUTTON:
+        chase_event_etc(CHASE_TRACK);
+        break;
+
+    case UNCHASE_BUTTON:
+        unchase_event_etc();
+        break;
+
+    case START_BUTTON:
+    start_button:
+        s_v1->minvistime = 0LL;
+        s_v1->maxvistime = current_width;
+        recompute_hscrollbar();
+        break;
+
+    case ZOOMIN_BUTTON:
+        s_v1->minvistime += zoom_delta;
+        s_v1->maxvistime -= zoom_delta;
+        recompute_hscrollbar();
+        break;
+
+    case SEARCH_AGAIN_BUTTON:
+        if (s_srchcode) {
+            event_search_internal();
+            break;
+        }
+        /* NOTE FALLTHROUGH */
+
+    case SEARCH_BUTTON:
+        event_search();
+        break;
+
+    case ZOOMOUT_BUTTON:
+        if (zoom_delta == 0LL)
+            zoom_delta = 1;
+
+        if (s_v1->minvistime >= zoom_delta) {
+            s_v1->minvistime -= zoom_delta;
+            s_v1->maxvistime += zoom_delta;
+        } else {
+            s_v1->minvistime = 0;
+            s_v1->maxvistime += zoom_delta*2;
+        }
+        
+        if ((s_v1->maxvistime - s_v1->minvistime) * 8 > 
+            g_events[g_nevents-1].time * 9) {
+            s_v1->minvistime = 0;
+            s_v1->maxvistime = g_events[g_nevents-1].time * 9 / 8;
+        }
+        recompute_hscrollbar();
+        break;
+
+    case END_BUTTON:
+        ep = (g_events + g_nevents - 1);
+        s_v1->maxvistime = ep->time + event_incdec/3;
+        s_v1->minvistime = s_v1->maxvistime - current_width;
+        if (s_v1->minvistime > s_v1->maxvistime)
+            goto start_button;
+        recompute_hscrollbar();
+        break;
+
+    case MORE_TRACES_BUTTON:
+	/* Reduce the strip height to fit more traces on screen */
+	s_v1->strip_height -= 1;
+
+	if (s_v1->strip_height < 1) {
+	    s_v1->strip_height = 1;
+	}
+
+	/* Recalculate the number of strips on the screen */
+	s_v1->npids = (s_v1->total_height - s_v1->time_ax_height) / 
+	    s_v1->strip_height;
+	recompute_vscrollbar();
+	break;
+
+    case LESS_TRACES_BUTTON:
+	/* Increase the strip height to fit fewer on the screen */
+	s_v1->strip_height += 1;
+	if (s_v1->strip_height > 80) {
+	    s_v1->strip_height = 80;
+	}
+
+	/* Recalculate the number of strips on the screen */
+	s_v1->npids = (s_v1->total_height - s_v1->time_ax_height) / 
+	    s_v1->strip_height;
+	recompute_vscrollbar();
+	break;
+
+    case FORWARD_BUTTON:
+        srch_chase_dir = SRCH_CHASE_FORWARD;
+        gtk_widget_hide (s_view1_forward_button);
+        gtk_widget_show (s_view1_backward_button);
+        break;
+
+    case BACKWARD_BUTTON:
+        srch_chase_dir = SRCH_CHASE_BACKWARD;
+        gtk_widget_show (s_view1_forward_button);
+        gtk_widget_hide (s_view1_backward_button);
+        break;
+
+    case SUMMARY_BUTTON:
+        summary_mode = TRUE;
+        gtk_widget_hide (s_view1_summary_button);
+        gtk_widget_show (s_view1_nosummary_button);
+        break;
+
+    case NOSUMMARY_BUTTON:
+        summary_mode = FALSE;
+        gtk_widget_show (s_view1_summary_button);
+        gtk_widget_hide (s_view1_nosummary_button);
+        break;
+    }
+
+    view1_display_when_idle();
+}
+
+/****************************************************************************
+* view1_print_callback
+****************************************************************************/
+
+void view1_print_callback (GtkToggleButton *notused, gpointer nu2)
+{
+    modal_dialog("Print Screen (PostScript format) to file:",
+                 "Invalid file: Print Screen to file:",
+                 "g2.ps", print_screen_callback);
+}
+
+/****************************************************************************
+* view1_hscroll
+****************************************************************************/
+
+static void view1_hscroll (GtkAdjustment *adj, GtkWidget *notused)
+{
+    ulonglong current_width;
+
+    current_width = (s_v1->maxvistime - s_v1->minvistime);
+
+    s_v1->minvistime = (ulonglong)(adj->value);
+    s_v1->maxvistime = s_v1->minvistime + current_width;
+    
+    view1_display_when_idle();
+
+#ifdef NOTDEF
+    g_print ("adj->lower = %.2f\n", adj->lower);
+    g_print ("adj->upper = %.2f\n", adj->upper);
+    g_print ("adj->value = %.2f\n", adj->value);
+    g_print ("adj->step_increment = %.2f\n", adj->step_increment);
+    g_print ("adj->page_increment = %.2f\n", adj->page_increment);
+    g_print ("adj->page_size = %.2f\n", adj->page_size);
+#endif
+}
+
+/****************************************************************************
+* view1_vscroll
+****************************************************************************/
+
+static void view1_vscroll (GtkAdjustment *adj, GtkWidget *notused)
+{
+    s_v1->first_pid_index = (int)adj->value;
+    view1_display_when_idle();
+}
+
+void set_pid_ax_width(int width)
+{
+    s_v1->pid_ax_width = width;
+    view1_display_when_idle();
+}
+
+/****************************************************************************
+* view1_init
+****************************************************************************/
+
+void view1_init(void)
+{
+
+    c_view1_draw_width = atol(getprop_default("drawbox_width", "700"));
+    c_view1_draw_height = atol(getprop_default("drawbox_height", "400"));
+
+    s_v1->pid_ax_width = 80;
+    s_v1->time_ax_height = 80;
+    s_v1->time_ax_spacing = 100;
+    s_v1->strip_height = 25;
+    s_v1->pop_offset = 20;
+    s_v1->pid_ax_offset = 34;
+    s_v1->event_offset = 40;
+    s_v1->total_height = c_view1_draw_height;
+    s_v1->total_width = c_view1_draw_width;
+    s_v1->first_pid_index = 0;
+
+    s_v1->npids = (s_v1->total_height - s_v1->time_ax_height) / 
+        s_v1->strip_height;
+
+    s_v1->minvistime = 0;
+    s_v1->maxvistime = 200;
+
+    s_view1_vbox = gtk_vbox_new(FALSE, 5);
+
+    s_view1_hbox = gtk_hbox_new(FALSE, 5);
+
+    da = gtk_drawing_area_new();
+    gtk_drawing_area_size(GTK_DRAWING_AREA(da), c_view1_draw_width, 
+                          c_view1_draw_height);
+    
+#ifdef NOTDEF
+    gtk_signal_connect (GTK_OBJECT (da), "motion_notify_event",
+                        (GtkSignalFunc) motion_notify_event, NULL);
+#endif
+
+    gtk_signal_connect (GTK_OBJECT (da), "expose_event",
+                        (GtkSignalFunc) expose_event, NULL);
+
+    gtk_signal_connect (GTK_OBJECT(da),"configure_event",
+                        (GtkSignalFunc) configure_event, NULL);
+
+    gtk_signal_connect (GTK_OBJECT (da), "button_press_event",
+                        (GtkSignalFunc) button_press_event, NULL);
+    
+    gtk_signal_connect (GTK_OBJECT (da), "button_release_event",
+                        (GtkSignalFunc) button_press_event, NULL);
+    
+    gtk_signal_connect (GTK_OBJECT (da), "motion_notify_event",
+                        (GtkSignalFunc) button_press_event, NULL);
+    
+    gtk_widget_set_events (da, GDK_BUTTON_PRESS_MASK 
+                           | GDK_BUTTON_RELEASE_MASK | GDK_EXPOSURE_MASK 
+                           | GDK_BUTTON_MOTION_MASK);
+
+
+    gtk_box_pack_start(GTK_BOX(s_view1_hbox), da, TRUE, TRUE, 0);
+
+    g_font = gdk_font_load ("8x13");
+    if (g_font == NULL) {
+        g_error("Couldn't load 8x13 font...\n");
+    }
+    gdk_font_ref(g_font);
+
+    /* PID axis menu */
+    s_view1_vmenubox = gtk_vbox_new(FALSE, 5);
+
+    s_view1_vsadj = gtk_adjustment_new(0.0 /* initial value */, 
+                                       0.0 /* minimum value */,
+                                       2000.0 /* maximum value */,
+                                       0.1 /* step increment */, 
+                                       10.0/* page increment */, 
+                                       10.0/* page size */);
+
+    s_view1_vscroll = gtk_vscrollbar_new (GTK_ADJUSTMENT(s_view1_vsadj));
+
+    gtk_signal_connect (GTK_OBJECT (s_view1_vsadj), "value-changed",
+                        GTK_SIGNAL_FUNC (view1_vscroll), 
+                        (gpointer)s_view1_vscroll);
+
+    s_view1_topbutton = gtk_button_new_with_label("Top");
+    s_view1_bottombutton = gtk_button_new_with_label("Bottom");
+
+    gtk_signal_connect (GTK_OBJECT(s_view1_topbutton), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) TOP_BUTTON);
+    
+    gtk_signal_connect (GTK_OBJECT(s_view1_bottombutton), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) BOTTOM_BUTTON);
+
+    /* More Traces button and Less Traces button */
+    s_view1_more_traces_button = gtk_button_new_with_label("More Traces");
+    s_view1_less_traces_button = gtk_button_new_with_label("Less Traces");
+    gtk_signal_connect (GTK_OBJECT(s_view1_more_traces_button), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) MORE_TRACES_BUTTON);
+    gtk_signal_connect (GTK_OBJECT(s_view1_less_traces_button), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) LESS_TRACES_BUTTON);
+    
+#ifdef NOTDEF
+    /* Trick to bottom-justify the menu: */
+    s_view1_pad1 = gtk_vbox_new(FALSE, 0);
+    gtk_box_pack_start (GTK_BOX(s_view1_vmenubox), s_view1_pad1,
+                        TRUE, FALSE, 0);
+
+#endif
+    
+    gtk_box_pack_start (GTK_BOX(s_view1_vmenubox), s_view1_topbutton,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_vmenubox), s_view1_vscroll,
+                        TRUE, TRUE, 0);
+    
+    gtk_box_pack_start (GTK_BOX(s_view1_vmenubox), s_view1_bottombutton,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_vmenubox), s_view1_more_traces_button,
+                        FALSE, FALSE, 0);
+    
+    gtk_box_pack_start (GTK_BOX(s_view1_vmenubox), s_view1_less_traces_button,
+                        FALSE, FALSE, 0);
+    
+    gtk_box_pack_start (GTK_BOX(s_view1_hbox), s_view1_vmenubox,
+                        FALSE, FALSE, 0);
+
+    /* Time axis menu */
+
+    s_view1_hmenubox = gtk_hbox_new(FALSE, 5);
+    
+    s_view1_startbutton = gtk_button_new_with_label("Start");
+
+    s_view1_zoominbutton = gtk_button_new_with_label("ZoomIn");
+
+    s_view1_searchbutton = gtk_button_new_with_label("Search");
+
+    s_view1_srchagainbutton = gtk_button_new_with_label("Search Again");
+
+    s_view1_zoomoutbutton = gtk_button_new_with_label("ZoomOut");
+
+    s_view1_endbutton = gtk_button_new_with_label("End");
+
+    gtk_signal_connect (GTK_OBJECT(s_view1_startbutton), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) START_BUTTON);
+    
+    gtk_signal_connect (GTK_OBJECT(s_view1_zoominbutton), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) ZOOMIN_BUTTON);
+    
+    gtk_signal_connect (GTK_OBJECT(s_view1_searchbutton), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) SEARCH_BUTTON);
+    
+    gtk_signal_connect (GTK_OBJECT(s_view1_srchagainbutton), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) SEARCH_AGAIN_BUTTON);
+    
+    gtk_signal_connect (GTK_OBJECT(s_view1_zoomoutbutton), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) ZOOMOUT_BUTTON);
+    
+    gtk_signal_connect (GTK_OBJECT(s_view1_endbutton), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) END_BUTTON);
+    
+    s_view1_hsadj = gtk_adjustment_new(0.0 /* initial value */, 
+                                       0.0 /* minimum value */,
+                                       2000.0 /* maximum value */,
+                                       0.1 /* step increment */, 
+                                       10.0/* page increment */, 
+                                       10.0/* page size */);
+
+    s_view1_hscroll = gtk_hscrollbar_new (GTK_ADJUSTMENT(s_view1_hsadj));
+
+    gtk_signal_connect (GTK_OBJECT (s_view1_hsadj), "value-changed",
+                        GTK_SIGNAL_FUNC (view1_hscroll), 
+                        (gpointer)s_view1_hscroll);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox), s_view1_startbutton,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox), s_view1_hscroll,
+                        TRUE, TRUE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox), s_view1_endbutton,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox), s_view1_zoominbutton,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox), s_view1_searchbutton,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox), s_view1_srchagainbutton,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox), s_view1_zoomoutbutton,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_vbox), s_view1_hbox, 
+                        TRUE, TRUE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_vbox), s_view1_hmenubox,
+                        FALSE, FALSE, 0);
+
+
+    s_view1_hmenubox2 = gtk_hbox_new(FALSE, 5);
+
+    s_view1_snapbutton = gtk_button_new_with_label("Snap");
+
+    s_view1_nextbutton = gtk_button_new_with_label("Next");
+
+    s_view1_delbutton = gtk_button_new_with_label("Del");
+
+    s_view1_chase_event_button = gtk_button_new_with_label("ChaseEvent");
+
+    s_view1_chase_datum_button = gtk_button_new_with_label("ChaseDatum");
+
+    s_view1_chase_track_button = gtk_button_new_with_label("ChaseTrack");
+
+    s_view1_unchasebutton = gtk_button_new_with_label("NoChase");
+
+    s_view1_forward_button = gtk_button_new_with_label("->SrchChase(is<-)");
+    s_view1_backward_button = gtk_button_new_with_label("<-SrchChase(is->)");
+
+    s_view1_summary_button = gtk_button_new_with_label("Summary");
+    s_view1_nosummary_button = gtk_button_new_with_label("NoSummary");
+
+    gtk_signal_connect (GTK_OBJECT(s_view1_snapbutton), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) SNAP_BUTTON);
+
+    gtk_signal_connect (GTK_OBJECT(s_view1_nextbutton), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) NEXT_BUTTON);
+
+    gtk_signal_connect (GTK_OBJECT(s_view1_delbutton), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) DEL_BUTTON);
+
+    gtk_signal_connect (GTK_OBJECT(s_view1_chase_event_button), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) CHASE_EVENT_BUTTON);
+
+    gtk_signal_connect (GTK_OBJECT(s_view1_chase_datum_button), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) CHASE_DATUM_BUTTON);
+
+    gtk_signal_connect (GTK_OBJECT(s_view1_chase_track_button), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) CHASE_TRACK_BUTTON);
+
+    gtk_signal_connect (GTK_OBJECT(s_view1_unchasebutton), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) UNCHASE_BUTTON);
+
+    gtk_signal_connect (GTK_OBJECT(s_view1_forward_button), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) FORWARD_BUTTON);
+
+    gtk_signal_connect (GTK_OBJECT(s_view1_backward_button), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) BACKWARD_BUTTON);
+
+    gtk_signal_connect (GTK_OBJECT(s_view1_summary_button), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) SUMMARY_BUTTON);
+
+    gtk_signal_connect (GTK_OBJECT(s_view1_nosummary_button), "clicked",
+                        GTK_SIGNAL_FUNC(view1_button_click_callback), 
+                        (gpointer) NOSUMMARY_BUTTON);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_vbox), s_view1_hmenubox2,
+                        FALSE, FALSE, 0);
+    
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_snapbutton,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_nextbutton,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_delbutton,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_chase_event_button,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_chase_datum_button,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_chase_track_button,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_unchasebutton,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_forward_button,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_backward_button,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_summary_button,
+                        FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_hmenubox2), s_view1_nosummary_button,
+                        FALSE, FALSE, 0);
+
+    s_view1_label = gtk_label_new(NULL);
+
+    gtk_box_pack_start (GTK_BOX(s_view1_vbox), s_view1_label,
+			FALSE, FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX(g_mainhbox), s_view1_vbox,
+                        TRUE, TRUE, 0);
+
+    gtk_widget_show_all (s_view1_vbox);
+    GTK_WIDGET_SET_FLAGS(da, GTK_CAN_FOCUS);
+    gtk_widget_grab_focus(da);
+
+    gtk_widget_hide (s_view1_forward_button);
+    gtk_widget_hide (summary_mode ? s_view1_summary_button
+                                  : s_view1_nosummary_button);
+
+    zi_source = gdk_bitmap_create_from_data (NULL, (char *)zi_bits, zi_width, 
+                                             zi_height);
+    zi_mask = gdk_bitmap_create_from_data (NULL, (char *)zi_bkgd, zi_width,
+                                           zi_height);
+
+    zi_cursor = (GdkCursor *) gdk_cursor_new_from_pixmap (zi_source, 
+                                                          zi_mask, &fg_black,
+                                                          &bg_white, zi_x_hot,
+                                                          zi_y_hot);
+    gdk_pixmap_unref (zi_source);
+    gdk_pixmap_unref (zi_mask);
+
+    norm_cursor = (GdkCursor *) gdk_cursor_new (GDK_TOP_LEFT_ARROW);
+}
+
+/****************************************************************************
+* line_print
+****************************************************************************/
+
+void line_print (int x1, int y1, int x2, int y2)
+{
+    fprintf(s_printfp, "newpath\n");
+    fprintf(s_printfp, "%d %d moveto\n", xrt(x1, s_v1->total_height - y1), 
+            yrt(x1, s_v1->total_height - y1));
+
+    fprintf(s_printfp, "%d %d lineto\n", xrt (x2, s_v1->total_height - y2),
+            yrt (x2, s_v1->total_height - y2));
+    fprintf(s_printfp, "1 setlinewidth\n");
+    fprintf(s_printfp, "stroke\n");
+}
+
+/****************************************************************************
+* tbox_print
+****************************************************************************/
+GdkRectangle *tbox_print (char *s, int x, int y, enum view1_tbox_fn function,
+                          GdkRectangle *rp)
+{
+    if (function == TBOX_PRINT_BOXED) {
+        rp->width -= 4;
+    }
+
+    if ((function == TBOX_PRINT_BOXED) ||
+	(function == TBOX_PRINT_EVENT)) {
+
+        fprintf(s_printfp, "newpath\n");
+        fprintf(s_printfp, "0 setlinewidth\n");
+        fprintf(s_printfp, "%d %d moveto\n", 
+                xrt(rp->x, s_v1->total_height - rp->y),
+                yrt(rp->x, s_v1->total_height - rp->y));
+        
+        fprintf(s_printfp, "%d %d lineto\n", 
+                xrt (rp->x+rp->width, s_v1->total_height - rp->y),
+                yrt (rp->x+rp->width, s_v1->total_height - rp->y));
+
+        fprintf(s_printfp, "%d %d lineto\n", 
+                xrt(rp->x+rp->width, s_v1->total_height - (rp->y+rp->height)),
+                yrt(rp->x+rp->width, s_v1->total_height - (rp->y+rp->height)));
+
+        fprintf(s_printfp, "%d %d lineto\n", 
+                xrt(rp->x, s_v1->total_height - (rp->y+rp->height)),
+                yrt(rp->x, s_v1->total_height - (rp->y+rp->height)));
+
+        fprintf(s_printfp, "%d %d lineto\n", 
+                xrt(rp->x, s_v1->total_height - rp->y),
+                yrt(rp->x, s_v1->total_height - rp->y));
+
+        fprintf(s_printfp, "stroke\n");
+    }
+
+    if ((function == TBOX_PRINT_BOXED) ||
+	(function == TBOX_PRINT_PLAIN)) {
+
+        fprintf(s_printfp, "newpath\n");
+        fprintf(s_printfp, "%d %d moveto\n", 
+                xrt(x, s_v1->total_height - (y-2)),
+                yrt(x, s_v1->total_height - (y-2)));
+        fprintf(s_printfp, "gsave\n");
+        fprintf(s_printfp, "90 rotate\n");
+        fprintf(s_printfp, "(%s) show\n", s);
+        fprintf(s_printfp, "grestore\n");
+    }
+
+    return(rp);
+}    
+
+/****************************************************************************
+* tbox - draws an optionally boxed string whose lower lefthand 
+* corner is at (x, y).  As usual, Y is backwards.
+****************************************************************************/
+
+GdkRectangle *tbox (char *s, int x, int y, enum view1_tbox_fn function)
+{
+    static GdkRectangle update_rect;
+    gint lbearing, rbearing, width, ascent, descent;
+
+    gdk_string_extents (g_font, s,
+                        &lbearing, &rbearing,
+                        &width, &ascent, &descent);
+
+    /*
+     * If we have enough room to display full size events, then just
+     * use the BOXED function instead of the EVENT function.
+     */
+    if (s_v1->strip_height > 9) {
+	switch (function) {
+	case TBOX_DRAW_EVENT:    function = TBOX_DRAW_BOXED;    break;
+	case TBOX_GETRECT_EVENT: function = TBOX_GETRECT_BOXED; break;
+	case TBOX_PRINT_EVENT:   function = TBOX_PRINT_BOXED;   break;
+	default:
+            break;
+	    /* Nothing */
+	}
+    }
+    
+    switch (function) {
+    case TBOX_DRAW_BOXED:
+        gdk_draw_rectangle (pm, da->style->white_gc, TRUE,
+                            x, y - (ascent+descent+3), width + 2, 
+                            ascent + descent + 3);
+        
+        gdk_draw_rectangle (pm, da->style->black_gc, FALSE,
+                            x, y - (ascent+descent+3), width + 2, 
+                            ascent + descent + 3);
+        
+        gdk_draw_string (pm, g_font, da->style->black_gc,
+                         x + 1, y - 1, (const gchar *)s);
+        /* NOTE FALLTHROUGH */
+    case TBOX_GETRECT_BOXED:
+        update_rect.x = x;
+        update_rect.y = y -(ascent+descent+3);
+        update_rect.width = width + 3;
+        update_rect.height = ascent + descent + 4;
+        if (function == TBOX_DRAW_BOXED)
+            gtk_widget_draw (da, &update_rect);
+        break;
+
+    case TBOX_DRAW_EVENT:
+	/* We have a small event to draw...no text */
+        gdk_draw_rectangle (pm, da->style->black_gc, FALSE,
+                            x, y - 1, 3, 3);
+        /* NOTE FALLTHROUGH */
+    case TBOX_GETRECT_EVENT:
+        update_rect.x = x;
+        update_rect.y = y - 1;
+        update_rect.width = 4;
+        update_rect.height = 4;
+        if (function == TBOX_DRAW_EVENT)
+            gtk_widget_draw (da, &update_rect);
+	break;
+		
+        
+    case TBOX_DRAW_PLAIN:
+        
+        gdk_draw_string (pm, g_font, da->style->black_gc,
+                         x + 1, y - 1, (const gchar *)s);
+        /* NOTE FALLTHROUGH */
+    case TBOX_GETRECT_PLAIN:
+        update_rect.x = x;
+        update_rect.y = y -(ascent+descent+1);
+        update_rect.width = width;
+        update_rect.height = ascent + descent;
+        if (function == TBOX_DRAW_PLAIN)
+            gtk_widget_draw (da, &update_rect);
+        break;
+
+    case TBOX_PRINT_BOXED:
+        update_rect.x = x;
+        update_rect.y = y -(ascent+descent+3);
+        update_rect.width = width + 3;
+        update_rect.height = ascent + descent + 4;
+        /* note fallthrough */
+    case TBOX_PRINT_PLAIN:
+        return(tbox_print(s, x, y, function, &update_rect));
+
+    case TBOX_PRINT_EVENT:
+	/* We have a small event box to print...no text */
+        update_rect.x = x;
+        update_rect.y = y - 1;
+        update_rect.width = 4;
+        update_rect.height = 4;
+        return(tbox_print(s, x, y, function, &update_rect));
+    }
+    return(&update_rect);
+}
+
+/****************************************************************************
+* line
+*
+* For lines there is a primitive batching facility, that doesn't update
+* the drawing area until the batch is complete. This is handy for drawing
+* the pid axis and for summary mode.
+*
+* line_batch_mode contains the state for this:
+*
+*   BATCH_OFF:      no batching, update for every line
+*   BATCH_NEW:      just entered a batch, so initialize the area to update from
+*                   scratch
+*   BATCH_EXISTING: have drawn at least one line in batch mode, so the update
+*                   area should only be expanded from now on to include the
+*                   union of the "rectangular hull" of all lines
+****************************************************************************/
+
+static enum { BATCH_OFF, BATCH_NEW, BATCH_EXISTING } line_batch_mode;
+static int line_batch_count;
+static int line_minx, line_miny, line_maxx, line_maxy;
+
+void line_batch_start (void)
+{
+    line_batch_mode = BATCH_NEW;
+    line_batch_count = 0;
+}
+
+void line_batch_end (void)
+{
+    GdkRectangle update_rect;
+    if (line_batch_count > 0) {
+        update_rect.x = line_minx;
+        update_rect.y = line_miny;
+        update_rect.width = (line_maxx - line_minx) + 1;
+        update_rect.height = (line_maxy - line_miny) + 1;
+        gtk_widget_draw (da, &update_rect);
+    }
+    line_batch_mode = BATCH_OFF;
+}
+
+void line (int x1, int y1, int x2, int y2, enum view1_line_fn function)
+{
+    GdkRectangle update_rect;
+    GdkGC *gc = NULL;
+
+    switch(function) {
+    case LINE_DRAW_BLACK:
+        gc = da->style->black_gc;
+        break;
+
+    case LINE_DRAW_WHITE:
+        gc = da->style->white_gc;
+        break;
+
+    case LINE_PRINT:
+        line_print (x1, y1, x2, y2);
+        return;
+    }
+
+    gdk_draw_line (pm, gc, x1, y1, x2, y2);
+
+    switch (line_batch_mode) {
+        case BATCH_OFF:
+            update_rect.x = x1;
+            update_rect.y = y1;
+            update_rect.width = (x2-x1) + 1;
+            update_rect.height = (y2-y1) + 1;
+            gtk_widget_draw (da, &update_rect);
+            break;
+
+        case BATCH_NEW:
+            line_minx = x1;
+            line_maxx = x2;
+            line_miny = y1;
+            line_maxy = y2;
+            line_batch_mode = BATCH_EXISTING;
+            line_batch_count = 1;
+            break;
+
+        case BATCH_EXISTING:
+            if (line_minx > x1)
+                line_minx = x1;
+            if (line_miny > y1)
+                line_miny = y1;
+            if (line_maxx < x2)
+                line_maxx = x2;
+            if (line_maxy < y2)
+                line_maxy = y2;
+            line_batch_count++;
+            break;
+    }
+}
+
+
+/****************************************************************************
+* display_pid_axis
+****************************************************************************/
+
+static void display_pid_axis(v1_geometry_t *vp)
+{
+    int y, i, label_tick;
+    int last_printed_y = -vp->strip_height;
+    pid_sort_t *pp;
+    int pid_index;
+    char *label_fmt;
+    char tmpbuf [128];    
+
+    /* No pids yet? Outta here */
+    if (g_pids == NULL)
+        return;
+
+    line_batch_start();
+
+    for (i = 0; i < vp->npids; i++) {
+        pid_index = vp->first_pid_index + i;
+        if (pid_index >= g_npids)
+            break;
+
+        set_color(pid_index);
+        pp = (g_pids + pid_index);
+
+        label_fmt = get_track_label(pp->pid_value);
+        snprintf(tmpbuf, sizeof(tmpbuf)-1, label_fmt, pp->pid_value);
+
+        y = i*vp->strip_height + vp->pid_ax_offset;
+
+	/*
+	 * Have we incremented enough space to have another label not
+	 * overlap the previous label?
+	 */
+	if (y - last_printed_y > 9) {
+	    /* Draw label */
+	    tbox(tmpbuf, 0, y +4, TBOX_DRAW_PLAIN+s_print_offset);
+
+	    last_printed_y = y;
+
+	    /*
+	     * And let the line stick out a bit more to indicate this label
+	     * relates to the following line.
+	     */
+	    label_tick = 4;
+	}
+	else {
+	    label_tick = 0;
+	}
+
+        /* Draw axis line, but only if the lines aren't too close together */
+	if (vp->strip_height > 4) {
+	    line(vp->pid_ax_width - label_tick, y+4*s_print_offset,
+		 vp->total_width, y+4*s_print_offset,
+		 LINE_DRAW_BLACK+s_print_offset);
+	}
+    }
+
+    set_color(COLOR_DEFAULT);
+    line_batch_end();
+}
+
+/****************************************************************************
+* view1_read_events_callback
+* New event data just showed up, reset a few things.
+****************************************************************************/
+
+void view1_read_events_callback(void)
+{
+    int max_vis_index;
+
+    s_v1->first_pid_index = 0;
+
+    max_vis_index = 300;
+    if (max_vis_index > g_nevents)
+        max_vis_index = g_nevents-1;
+    
+    s_v1->minvistime = 0LL;
+    s_v1->maxvistime = (g_events[g_nevents - 1].time * 9)/ 8;
+    s_srchindex = 0;
+    s_srchcode = 0;
+    s_last_selected_event = 0;
+
+    init_track_colors();
+
+    recompute_hscrollbar();
+    recompute_vscrollbar();
+}
+
+/****************************************************************************
+* display_event_data
+****************************************************************************/
+
+static void display_event_data(v1_geometry_t *vp)
+{
+    int start_index;
+    int pid_index;
+    int x, y;
+    event_t *ep;
+    event_def_t *edp;
+    double time_per_pixel;
+    char tmpbuf[1024];
+    GdkRectangle *print_rect;
+    int *last_x_used;
+
+    /* Happens if one loads the event def header first, for example. */
+    if (g_nevents == 0)
+        return;
+
+    time_per_pixel = dtime_per_pixel(vp);
+
+    start_index = find_event_index (vp->minvistime);
+
+    /* Scrolled too far right? */
+    if (start_index >= g_nevents)
+        return;
+
+    ep = (g_events + start_index);
+
+    if (s_print_offset || summary_mode) {
+        last_x_used = (int *)g_malloc0(vp->npids * sizeof(int));
+    } else {
+        last_x_used = NULL;
+    }
+
+    line_batch_start();
+
+    while (ep < (g_events + g_nevents) &&
+           (ep->time < vp->maxvistime)) {
+        pid_index = ep->pid->pid_index;
+        set_color(pid_index);
+    
+        /* First filter: pid out of range */
+        if ((pid_index < vp->first_pid_index) ||
+            (pid_index >= vp->first_pid_index + vp->npids)) {
+            ep++;
+            continue;
+        }
+
+        /* Second filter: event hidden */
+        edp = find_event_definition (ep->code);
+        if (!edp->selected) {
+            ep++;
+            continue;
+        }
+        
+        /* Display it... */
+
+        pid_index -= vp->first_pid_index;
+        
+        y = pid_index*vp->strip_height + vp->event_offset;
+        
+        x = vp->pid_ax_width + 
+            (int)(((double)(ep->time - vp->minvistime)) / time_per_pixel);
+
+        if (last_x_used != NULL && x < last_x_used[pid_index]) {
+            ep++;
+            continue;
+        }
+
+        if (ep->flags & (EVENT_FLAG_SELECT | EVENT_FLAG_SEARCHRSLT)) {
+            if (ep->flags & EVENT_FLAG_SELECT) {
+                format_popbox_string(tmpbuf, sizeof(tmpbuf), ep, edp);
+#ifdef NOTDEF
+                sprintf(tmpbuf, edp->name);
+                sprintf(tmpbuf+strlen(tmpbuf), ": ");
+                sprintf(tmpbuf+strlen(tmpbuf), edp->format, ep->datum);
+#endif
+            } else {
+                sprintf(tmpbuf, "SEARCH RESULT");
+            }
+            print_rect = tbox(tmpbuf, x, y - vp->pop_offset, 
+                              TBOX_DRAW_BOXED+s_print_offset);
+            line(x, y-vp->pop_offset, x, y, LINE_DRAW_BLACK+s_print_offset);
+            if (last_x_used != NULL)
+                last_x_used[pid_index] = x + print_rect->width;
+        } 
+        if (summary_mode) {
+            int delta = vp->strip_height / 3;
+            if (delta < 1)
+                delta = 1;
+            y = pid_index*vp->strip_height + vp->pid_ax_offset;
+            line(x, y - delta, x, y + delta, LINE_DRAW_BLACK);
+            last_x_used[pid_index] = x + 1;
+        } else {
+            sprintf(tmpbuf, "%ld", ep->code);
+            print_rect = tbox(tmpbuf, x, y, TBOX_DRAW_EVENT+s_print_offset);
+            if (last_x_used != NULL)
+                last_x_used[pid_index] = x + print_rect->width;
+        }
+
+        ep++;
+    }
+    if (last_x_used)
+        g_free(last_x_used);
+    line_batch_end();
+    set_color(COLOR_DEFAULT);
+}
+
+/****************************************************************************
+* display_clear
+****************************************************************************/
+
+static void display_clear(void)
+{
+    GdkRectangle update_rect;
+
+    gdk_draw_rectangle (pm, da->style->white_gc, TRUE,
+                        0, 0, da->allocation.width,
+                        da->allocation.height);
+
+    update_rect.x = 0;
+    update_rect.y = 0;
+    update_rect.width = da->allocation.width;
+    update_rect.height = da->allocation.height;
+
+    gtk_widget_draw (da, &update_rect);
+}
+
+/****************************************************************************
+* display_time_axis
+****************************************************************************/
+
+static void display_time_axis(v1_geometry_t *vp)
+{
+    int x, y, i;
+    int xoffset, nticks;
+    char tmpbuf [128];
+    double unit_divisor;
+    double time;
+    char *units;
+    double time_per_pixel;
+
+    y = vp->npids * vp->strip_height + vp->pid_ax_offset;
+
+    x = vp->pid_ax_width;
+
+    nticks = (vp->total_width - vp->pid_ax_width) / vp->time_ax_spacing;
+
+    time_per_pixel = dtime_per_pixel(vp);
+
+    units = "ns";
+    unit_divisor = 1.00;
+        
+    if ((vp->maxvistime / unit_divisor) > 1000) {
+        units = "us";
+        unit_divisor = 1000.00;
+    }
+
+    if ((vp->maxvistime / unit_divisor) > 1000) {
+        units = "ms";
+        unit_divisor = 1000.00*1000.00;
+    }
+    if ((vp->maxvistime / unit_divisor) > 1000) {
+        units = "s";
+        unit_divisor = 1000.00*1000.00*1000.00;
+    }
+
+    /* Draw line */
+    line(x, y, vp->total_width, y, LINE_DRAW_BLACK+s_print_offset);
+
+    xoffset = 0;
+    
+    for (i = 0; i < nticks; i++) {
+        /* Tick mark */
+        line(x+xoffset, y-3, x+xoffset, y+3, LINE_DRAW_BLACK+s_print_offset);
+
+        time = (double)(x + xoffset - vp->pid_ax_width);
+        time *= time_per_pixel;
+        time += (double)(vp->minvistime);
+        time /= unit_divisor;
+
+        sprintf (tmpbuf, "%.2f%s", time, units);
+
+        tbox(tmpbuf, x+xoffset, y+15, TBOX_DRAW_PLAIN+s_print_offset);
+        
+        xoffset += vp->time_ax_spacing;
+    }
+}
+
+/****************************************************************************
+* clear_scoreboard
+* Forget about any temporary displays, they're gone now...
+****************************************************************************/
+
+static void clear_scoreboard(void)
+{
+    s_result_up = FALSE;
+}
+
+/****************************************************************************
+* view1_display
+****************************************************************************/
+
+void view1_display(void)
+{
+    display_clear();
+    display_pid_axis(s_v1);
+    display_event_data(s_v1);
+    display_time_axis(s_v1);
+    clear_scoreboard();
+}
+
+static gint idle_tag;
+
+/****************************************************************************
+* view1_display_eventually
+****************************************************************************/
+
+static void view1_display_eventually(void)
+{
+    gtk_idle_remove(idle_tag);
+    idle_tag = 0;
+    view1_display();
+}
+
+
+/****************************************************************************
+* view1_display_when_idle
+****************************************************************************/
+
+void view1_display_when_idle(void)
+{
+    if (idle_tag == 0) {
+        idle_tag = gtk_idle_add((GtkFunction) view1_display_eventually, 0);
+    }
+}
+
+/****************************************************************************
+* view1_about
+****************************************************************************/
+
+void view1_about (char *tmpbuf)
+{
+    int nsnaps;
+    snapshot_t *snaps;
+
+    sprintf(tmpbuf+strlen(tmpbuf), "Minvistime %lld\nMaxvistime %lld\n",
+            s_v1->minvistime, s_v1->maxvistime);
+    sprintf(tmpbuf+strlen(tmpbuf), "Strip Height %d\n", 
+            s_v1->strip_height);
+
+    for (nsnaps = 0, snaps = s_snapshots; snaps; snaps = snaps->next) {
+        nsnaps++;
+    }
+    sprintf(tmpbuf+strlen(tmpbuf), "%d snapshots in the ring\n", nsnaps);
+}
diff --git a/src/tools/perftool/c2cpel.c b/src/tools/perftool/c2cpel.c
new file mode 100644
index 00000000..38e6fe52
--- /dev/null
+++ b/src/tools/perftool/c2cpel.c
@@ -0,0 +1,248 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2006-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/elog.h>
+#include <pwd.h>
+#include <stdarg.h>
+#include <time.h>
+#include "cpel.h"
+#include "cpel_util.h"
+
+static elog_main_t elog_main;
+
+/*
+ * convert_clib_file
+ */
+void convert_clib_file(char *clib_file)
+{
+    clib_error_t *error = 0;
+    int i;
+    elog_main_t *em = &elog_main;
+    double starttime, delta;
+
+    error = elog_read_file (&elog_main, clib_file);
+
+    if (error) {
+        clib_warning("%U", format_clib_error, error);
+        exit (1);
+    }
+
+    em = &elog_main;
+
+    starttime = em->events[0].time;
+
+    for (i = 0; i < vec_len (em->events); i++) {
+        elog_event_t *e;        /* clib event */
+        evt_t *ep;              /* xxx2cpel event */
+        u8 *s;
+        u64 timestamp;
+        elog_event_type_t *t;
+        u8 *brief_event_name;
+        u8 *track_name;
+        int j;
+
+        e = vec_elt_at_index(em->events, i);
+
+        /* Seconds since start of log */
+        delta = e->time - starttime;
+        
+        /* u64 nanoseconds since start of log */
+        timestamp = delta * 1e9;
+
+        s = format (0, "%U%c", format_elog_event, em, e, 0);
+
+        /* allocate an event instance */
+        vec_add2(the_events, ep, 1);
+        ep->timestamp = timestamp;
+        
+        /* convert string event code to a real number */
+        t = vec_elt_at_index (em->event_types, e->type);
+
+        /* 
+         * Construct a reasonable event name.
+         * Truncate the format string at the first whitespace break
+         * or printf format character.
+         */
+        brief_event_name = format (0, "%s", t->format);
+
+        for (j = 0; j < vec_len (brief_event_name); j++) {
+            if (brief_event_name[j] == ' ' ||
+                brief_event_name[j] == '%' ||
+                brief_event_name[j] == '(') {
+                brief_event_name[j] = 0;
+                break;
+            }
+        }
+        /* Throw away that much of the formatted event */
+        vec_delete (s, j+1, 0);
+
+        ep->event_id = find_or_add_event(brief_event_name, "%s");
+
+        track_name = format (0, "%U%c", format_elog_track, em, e, 0);
+
+        ep->track_id = find_or_add_track (track_name);
+
+        ep->datum = find_or_add_strtab(s);
+
+        vec_free (track_name);
+        vec_free(brief_event_name);
+        vec_free(s);
+    }
+}
+
+u8 *vec_basename (char *s)
+{
+    u8 * rv;
+    char *cp = s;
+
+    while (*cp)
+        cp++;
+
+    cp--;
+
+    while (cp > s && *cp != '/')
+        cp--;
+
+    if (cp > s)
+        cp++;
+
+    rv = format (0, "%s", cp);
+    return rv;
+}
+
+
+int event_compare (const void *a0, const void *a1)
+{
+    evt_t *e0 = (evt_t *)a0;
+    evt_t *e1 = (evt_t *)a1;
+
+    if (e0->timestamp < e1->timestamp)
+        return -1;
+    else if (e0->timestamp > e1->timestamp)
+        return 1;
+    return 0;
+}
+
+int main (int argc, char **argv)
+{
+    int curarg=1;
+    char **inputfiles = 0;
+    char *outputfile = 0;
+    FILE *ofp;
+
+    if (argc < 3)
+        goto usage;
+
+    while (curarg < argc) {
+        if (!strncmp(argv[curarg], "--input-file", 3)) {
+            curarg++;
+            if (curarg < argc) {
+                vec_add1 (inputfiles, argv[curarg]);
+                curarg++;
+                continue;
+            }
+            clib_warning("Missing filename after --input-file\n");
+            exit (1);
+        }
+
+        if (!strncmp(argv[curarg], "--output-file", 3)) {
+            curarg ++;
+            if (curarg < argc) {
+                outputfile = argv[curarg];
+                curarg ++;
+                continue;
+            }
+            clib_warning("Missing filename after --output-file\n");
+            exit(1);
+        }
+        vec_add1 (inputfiles, argv[curarg]);
+        curarg++;
+        continue;
+
+    usage:
+        fformat(stderr, 
+                "c2cpel [--input-file] <filename> --output-file <filename>\n");
+        exit(1);
+    }
+
+    if (vec_len(inputfiles) == 0 || outputfile == 0)
+        goto usage;
+        
+    if (vec_len(inputfiles) > 1)
+        goto usage;
+
+    cpel_util_init();
+
+    convert_clib_file (inputfiles[0]);
+
+    ofp = fopen (outputfile, "w");
+    if (ofp == NULL) {
+        clib_unix_warning ("couldn't create %s", outputfile);
+        exit (1);
+    }
+    
+    alpha_sort_tracks();
+    fixup_event_tracks();
+
+    /*
+     * Four sections: string-table, event definitions, track defs, events. 
+     */
+    if (!write_cpel_header(ofp, 4)) {
+        clib_warning ("Error writing cpel header to %s...\n", outputfile);
+        unlink(outputfile);
+        exit(1);
+    }
+
+    if (!write_string_table(ofp)) {
+        clib_warning ("Error writing string table to %s...\n", outputfile);
+        unlink(outputfile);
+        exit(1);
+    }
+
+    if (!write_event_defs(ofp)) {
+        clib_warning ("Error writing event defs to %s...\n", outputfile);
+        unlink(outputfile);
+        exit(1);
+    }
+
+    if (!write_track_defs(ofp)) {
+        clib_warning ("Error writing track defs to %s...\n", outputfile);
+        unlink(outputfile);
+        exit(1);
+    }
+
+    if (!write_events(ofp, (u64) 1e9)) {
+        clib_warning ("Error writing events to %s...\n", outputfile);
+        unlink(outputfile);
+        exit(1);
+        
+    }
+    fclose(ofp);
+    exit (0);
+}
diff --git a/src/tools/perftool/configure.ac b/src/tools/perftool/configure.ac
new file mode 100644
index 00000000..f4a98697
--- /dev/null
+++ b/src/tools/perftool/configure.ac
@@ -0,0 +1,12 @@
+AC_INIT(perftool, 2.0)
+AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
+
+AC_CHECK_LIB([vppinfra], [clib_mem_get_page_size],,
+        AC_MSG_ERROR([Please install the vpp-lib package]))
+AC_CHECK_HEADER([vppinfra/clib.h],,
+        AC_MSG_ERROR([Please install the vpp-dev package]))
+
+AM_PROG_LIBTOOL
+
+AC_OUTPUT([Makefile])
diff --git a/src/tools/perftool/cpel.h b/src/tools/perftool/cpel.h
new file mode 100644
index 00000000..0bfb1a68
--- /dev/null
+++ b/src/tools/perftool/cpel.h
@@ -0,0 +1,83 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2005-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _CPEL_H_
+#define _CPEL_H_ 1
+
+typedef struct cpel_file_header_ {
+    unsigned char endian_version;
+    unsigned char pad;
+    unsigned short nsections;
+    unsigned int file_date;
+} cpel_file_header_t;
+
+#define CPEL_FILE_LITTLE_ENDIAN	0x80
+#define CPEL_FILE_VERSION       0x01
+#define CPEL_FILE_VERSION_MASK  0x7F
+
+typedef struct cpel_section_header_ {
+    unsigned int section_type;
+    unsigned int data_length;        /* does NOT include type and itself */
+} cpel_section_header_t;
+
+#define CPEL_SECTION_STRTAB	1
+/* string at offset 0 is the name of the table */
+
+#define CPEL_SECTION_SYMTAB     2
+#define CPEL_SECTION_EVTDEF     3
+
+typedef struct event_definition_section_header_ {
+    char string_table_name[64];
+    unsigned int number_of_event_definitions;
+} event_definition_section_header_t;
+
+typedef struct event_definition_ {
+    unsigned int event;
+    unsigned int event_format;
+    unsigned int datum_format;
+} event_definition_t;
+
+#define CPEL_SECTION_TRACKDEF   4
+
+typedef struct track_definition_section_header_ {
+    char string_table_name[64];
+    unsigned int number_of_track_definitions;
+} track_definition_section_header_t;
+
+typedef struct track_definition_ {
+    unsigned int track;
+    unsigned int track_format;
+} track_definition_t;
+
+#define CPEL_SECTION_EVENT      5
+
+typedef struct event_section_header_ {
+    char string_table_name[64];
+    unsigned int number_of_events;
+    unsigned int clock_ticks_per_second;
+} event_section_header_t;
+
+typedef struct event_entry_ {
+    unsigned int time[2];
+    unsigned int track;
+    unsigned int event_code;
+    unsigned int event_datum;
+} event_entry_t;
+
+#define CPEL_NUM_SECTION_TYPES 5
+
+#endif /* _CPEL_H_ */
+
diff --git a/src/tools/perftool/cpel_util.c b/src/tools/perftool/cpel_util.c
new file mode 100644
index 00000000..7ee9b6e2
--- /dev/null
+++ b/src/tools/perftool/cpel_util.c
@@ -0,0 +1,456 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2006-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/byte_order.h>
+#include <pwd.h>
+#include <stdarg.h>
+#include <time.h>
+#include "cpel.h"
+#include "cpel_util.h"
+
+evt_t *the_events;
+
+track_t *the_tracks;
+u32 *track_alpha_map;
+
+event_definition_t *the_event_definitions;
+i64 min_timestamp;
+
+/* Hash tables, used to find previous instances of the same items */
+uword *the_track_hash;
+uword *the_msg_event_hash;
+uword *the_strtab_hash;
+uword *the_pidtid_hash;
+uword *the_pid_to_name_hash;
+u8 *the_strtab;
+
+uword *the_event_id_bitmap;
+
+/*
+ * find_or_add_strtab
+ * Finds or adds a string to the string table
+ */
+u32 find_or_add_strtab(void *s_arg)
+{
+    uword *p;
+    int len;
+    u8 *this_string;
+    u8 *scopy=0;
+    char *s = s_arg;
+
+    p = hash_get_mem(the_strtab_hash, s);
+    if (p) {
+        return (p[0]);
+    }
+
+    /*
+     * Here's a CLIB bear-trap. We can't add the string-table 
+     * strings to the to the hash table (directly), since it 
+     * expands and moves periodically. All of the hash table
+     * entries turn into dangling references, yadda yadda. 
+     */
+
+    len = strlen(s)+1;
+    vec_add2(the_strtab, this_string, len);
+    memcpy(this_string, s, len);
+    
+    /* Make a copy which won't be moving around... */
+    vec_validate(scopy, len);
+    memcpy(scopy, s, len);
+
+    hash_set_mem(the_strtab_hash, scopy, this_string - the_strtab);
+
+    return(this_string - the_strtab);
+}
+
+/*
+ * find_or_add_track
+ * returns index in track table
+ */
+u32 find_or_add_track(void *s_arg)
+{
+    uword *p;
+    track_t *this_track;
+    u8 *copy_s;
+    char *s=s_arg;
+
+    p = hash_get_mem(the_track_hash, s);
+    if (p) {
+        return (p[0]);
+    }
+    vec_add2(the_tracks, this_track, 1);
+
+    this_track->original_index = this_track - the_tracks;
+    this_track->strtab_offset = find_or_add_strtab(s);
+
+    copy_s = (u8 *)vec_dup(s);
+
+    hash_set_mem(the_track_hash, copy_s, this_track - the_tracks);
+    return(this_track - the_tracks);
+}
+
+/* 
+ * find_or_add_event
+ * Adds an event to the event definition vector and add it to
+ * the event hash table
+ */
+
+u32 find_or_add_event(void *s_arg, char *datum_format)
+{
+    uword *p;
+    u8 *copy_s;
+    event_definition_t *this_event_definition;
+    u32 event_id;
+    char *s=s_arg;
+
+    p = hash_get_mem(the_msg_event_hash, s);
+    if (p) {
+        return (p[0]);
+    }
+    vec_add2(the_event_definitions, this_event_definition, 1);
+
+    /* Allocate a new event-id */
+    event_id = clib_bitmap_first_clear (the_event_id_bitmap);
+    the_event_id_bitmap = clib_bitmap_set(the_event_id_bitmap, event_id, 1);
+    this_event_definition->event = event_id;
+    this_event_definition->event_format = find_or_add_strtab(s);
+    this_event_definition->datum_format = find_or_add_strtab(datum_format);
+
+    copy_s = (u8 *)vec_dup(s);
+
+    hash_set_mem(the_msg_event_hash, copy_s, event_id);
+
+    return(event_id);
+}
+
+/*
+ * write_string_table
+ */
+int write_string_table(FILE *ofp)
+{
+    cpel_section_header_t sh;
+
+    /* Round up string table size */
+    while (vec_len(the_strtab) & 0x7)
+        vec_add1(the_strtab, 0);
+
+    sh.section_type = ntohl(CPEL_SECTION_STRTAB);
+    sh.data_length = ntohl(vec_len(the_strtab));
+    
+    if (fwrite(&sh, sizeof(sh), 1, ofp) != 1)
+        return(0);
+    
+    if (fwrite(the_strtab, 1, vec_len(the_strtab), ofp) != 
+        vec_len(the_strtab))
+        return(0);
+
+    return(1);
+}
+
+/*
+ * write_cpel_header
+ */
+int write_cpel_header(FILE *ofp, u32 nsections)
+{
+    cpel_file_header_t h;
+    
+    h.endian_version = CPEL_FILE_VERSION;
+    h.pad = 0; 
+    h.nsections = ntohs(nsections);
+    h.file_date = ntohl(time(0));
+    if (fwrite(&h, sizeof(h), 1, ofp) != 1)
+        return (0);
+
+    return(1);
+}
+
+/* 
+ * write_event_defs
+ */
+int write_event_defs(FILE *ofp)
+{
+    cpel_section_header_t sh;
+    event_definition_section_header_t edsh;
+    event_definition_t *this_event_definition;
+    int i;
+
+    /* Next, the event definitions */
+    sh.section_type = ntohl(CPEL_SECTION_EVTDEF);
+    sh.data_length = ntohl(vec_len(the_event_definitions)
+                           *sizeof(the_event_definitions[0]) 
+                           + sizeof(event_definition_section_header_t));
+
+    if (fwrite(&sh, sizeof(sh), 1, ofp) != 1)
+        return(0);
+
+    memset(&edsh, 0, sizeof(edsh));
+
+    strcpy(edsh.string_table_name, "FileStrtab");
+    edsh.number_of_event_definitions = ntohl(vec_len(the_event_definitions));
+    
+    if (fwrite(&edsh, sizeof(edsh), 1, ofp) != 1)
+        return(0);
+
+    for (i = 0; i < vec_len(the_event_definitions); i++) {
+        this_event_definition = &the_event_definitions[i];
+        /* Endian fixup */
+        this_event_definition->event = ntohl(this_event_definition->event);
+        this_event_definition->event_format = 
+            ntohl(this_event_definition->event_format);
+        this_event_definition->datum_format =
+            ntohl(this_event_definition->datum_format);
+
+        if (fwrite(this_event_definition, sizeof(the_event_definitions[0]), 
+                   1, ofp) != 1)
+            return(0);
+    }
+    return(1);
+}
+
+/*
+ * ntohll
+ */
+u64 ntohll (u64 x) {
+    if (clib_arch_is_little_endian)
+	x = ((((x >> 0) & 0xff) << 56)
+	     | (((x >> 8) & 0xff) << 48)
+	     | (((x >> 16) & 0xff) << 40)
+	     | (((x >> 24) & 0xff) << 32)
+	     | (((x >> 32) & 0xff) << 24)
+	     | (((x >> 40) & 0xff) << 16)
+	     | (((x >> 48) & 0xff) << 8)
+	     | (((x >> 56) & 0xff) << 0));
+    
+    return x;
+}
+
+/* 
+ * write_events
+ */
+int write_events(FILE *ofp, u64 clock_ticks_per_second)
+{
+    cpel_section_header_t sh;
+    event_section_header_t eh;
+    u32 number_of_events;
+    int i;
+    event_entry_t e;
+    u64 net_timestamp;
+    evt_t *this_event;
+    u32 time0, time1;
+
+    number_of_events = vec_len(the_events);
+
+    sh.section_type = ntohl(CPEL_SECTION_EVENT);
+    sh.data_length = ntohl(number_of_events * sizeof(e) +
+                           sizeof(event_section_header_t));
+
+    if (fwrite(&sh, sizeof(sh), 1, ofp) != 1)
+        return(0);
+    
+    memset(&eh, 0, sizeof(eh));
+    strcpy(eh.string_table_name, "FileStrtab");
+    eh.number_of_events = ntohl(number_of_events);
+    eh.clock_ticks_per_second = ntohl(clock_ticks_per_second);
+    
+    if (fwrite(&eh, sizeof(eh), 1, ofp) != 1)
+        return(0);
+
+    for (i = 0; i < number_of_events; i++) {
+        this_event = &the_events[i];
+        net_timestamp = ntohll(this_event->timestamp);
+    
+        time1 = net_timestamp>>32;
+        time0 = net_timestamp & 0xFFFFFFFF;
+        
+        e.time[0] = time0;
+        e.time[1] = time1;
+        e.track = ntohl(this_event->track_id);
+        e.event_code = ntohl(this_event->event_id);
+        e.event_datum = ntohl(this_event->datum);
+        
+        if (fwrite(&e, sizeof(e), 1, ofp) != 1)
+            return(0);
+    }
+    return(1);
+}
+
+/*
+ * write_track_defs
+ */
+int write_track_defs(FILE *ofp)
+{
+    cpel_section_header_t sh;
+    track_definition_section_header_t tdsh;
+    track_definition_t record;
+    track_definition_t *this_track_definition = &record;
+    int i;
+    event_definition_section_header_t edsh;
+
+    /* Next, the event definitions */
+    sh.section_type = ntohl(CPEL_SECTION_TRACKDEF);
+    sh.data_length = ntohl(vec_len(the_tracks)
+                           *sizeof(this_track_definition[0]) 
+                           + sizeof(track_definition_section_header_t));
+
+    if (fwrite(&sh, sizeof(sh), 1, ofp) != 1)
+        return(0);
+
+    memset(&tdsh, 0, sizeof(tdsh));
+
+    strcpy(tdsh.string_table_name, "FileStrtab");
+    tdsh.number_of_track_definitions = ntohl(vec_len(the_tracks));
+    
+    if (fwrite(&tdsh, sizeof(edsh), 1, ofp) != 1)
+        return(0);
+
+    for (i = 0; i < vec_len(the_tracks); i++) {
+        this_track_definition->track = ntohl(i);
+        this_track_definition->track_format = 
+            ntohl(the_tracks[i].strtab_offset);
+
+        if (fwrite(this_track_definition, sizeof(this_track_definition[0]),
+                   1, ofp) != 1)
+            return(0);
+    }
+    return(1);
+}
+
+void cpel_util_init (void)
+{
+    u8 *eventstr;
+
+    the_strtab_hash = hash_create_string (0, sizeof (uword));
+    the_msg_event_hash = hash_create_string (0, sizeof (uword));
+    the_track_hash = hash_create_string (0, sizeof (uword));
+    the_pidtid_hash = hash_create_string (0, sizeof(uword));
+    the_pid_to_name_hash = hash_create(0, sizeof(uword));
+    
+    /* Must be first, or no supper... */
+    find_or_add_strtab("FileStrtab");
+
+    /* Historical canned events, no longer used. */
+    if (0) {
+        /* event 0 (not used) */
+        eventstr = format(0, "PlaceholderNotUsed");
+        vec_add1(eventstr, 0);
+        find_or_add_event(eventstr, "%s");
+        vec_free(eventstr);
+        
+        /* event 1 (thread on CPU) */
+        eventstr = format(0, "THREAD/THRUNNING");
+        vec_add1(eventstr, 0);
+        find_or_add_event(eventstr, "%s");
+        vec_free(eventstr);
+        
+        /* event 2 (thread ready) */
+        eventstr = format(0, "THREAD/THREADY");
+        vec_add1(eventstr, 0);
+        find_or_add_event(eventstr, "%s");
+        vec_free(eventstr);
+        
+        /* event 3 (function enter) */
+        eventstr = format(0, "FUNC/ENTER");
+        vec_add1(eventstr, 0);
+        find_or_add_event(eventstr, "0x%x");
+        vec_free(eventstr);
+        
+        /* event 4 (function enter) */
+        eventstr = format(0, "FUNC/EXIT");
+        vec_add1(eventstr, 0);
+        find_or_add_event(eventstr, "0x%x");
+        vec_free(eventstr);
+    }
+}
+
+/*
+ * alpha_compare_tracks
+ */
+static int alpha_compare_tracks(const void *a1, const void *a2)
+{
+    int i;
+    track_t *t1 = (track_t *)a1;
+    track_t *t2 = (track_t *)a2;
+    u8 *s1 = &the_strtab[t1->strtab_offset];
+    u8 *s2 = &the_strtab[t2->strtab_offset];
+
+    for (i = 0; s1[i] && s2[i]; i++) {
+        if (s1[i] < s2[i])
+            return(-1);
+        if (s1[i] > s2[i])
+            return(1);
+    }
+    return(0);
+}
+
+/*
+ * alpha_sort_tracks
+ * Alphabetically sort tracks, set up a mapping
+ * vector so we can quickly map the original track index to
+ * the new/improved/alpha-sorted index
+ */
+void alpha_sort_tracks(void)
+{
+    track_t *this_track;
+    int i;
+
+    qsort(the_tracks, vec_len(the_tracks), sizeof(track_t),
+          alpha_compare_tracks);
+
+    vec_validate(track_alpha_map, vec_len(the_tracks));
+    _vec_len(track_alpha_map) = vec_len(the_tracks);
+
+    for (i = 0; i < vec_len(the_tracks); i++) {
+        this_track = &the_tracks[i];
+        track_alpha_map[this_track->original_index] = i;
+    }
+}
+
+/*
+ * fixup_event_tracks
+ * Use the track alpha mapping to account for the alphabetic
+ * sort performed by the previous routine
+ */
+void fixup_event_tracks(void)
+{
+    int i;
+    u32 old_track;
+
+    for (i = 0; i < vec_len(the_events); i++) {
+        old_track = the_events[i].track_id;
+        the_events[i].track_id = track_alpha_map[old_track];
+    }
+}
+
+/* Indispensable for debugging in gdb... */
+
+u32 vl(void *x)
+{
+    return vec_len(x);
+}
diff --git a/src/tools/perftool/cpel_util.h b/src/tools/perftool/cpel_util.h
new file mode 100644
index 00000000..b76f7a4b
--- /dev/null
+++ b/src/tools/perftool/cpel_util.h
@@ -0,0 +1,68 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2006-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __cpel_util_h__
+#define __cpel_util_h__
+
+/*
+ * Our idea of an event, as opposed to a CPEL event
+ */
+typedef struct evt_ {
+    u64 timestamp;
+    u32 track_id;               
+    u32 event_id;
+    u32 datum;
+} evt_t;
+
+evt_t *the_events;
+
+/*
+ * Track object, so we can sort the tracks alphabetically and
+ * fix the events later 
+ */
+typedef struct track_ {
+    u32 original_index;
+    u32 strtab_offset;
+} track_t;
+
+track_t *the_tracks;
+u32 *track_alpha_map;
+
+event_definition_t *the_event_definitions;
+i64 min_timestamp;
+
+/* Hash tables, used to find previous instances of the same items */
+uword *the_track_hash;
+uword *the_msg_event_hash;
+uword *the_strtab_hash;
+uword *the_pidtid_hash;
+uword *the_pid_to_name_hash;
+u8 *the_strtab;
+
+u32 find_or_add_strtab(void *s_arg);
+u32 find_or_add_track(void *s_arg);
+u32 find_or_add_event(void *s_arg, char *datum_format);
+int write_string_table(FILE *ofp);
+int write_cpel_header(FILE *ofp, u32 nsections);
+int write_event_defs(FILE *ofp);
+u64 ntohll (u64 x);
+int write_events(FILE *ofp, u64 clock_ticks_per_second);
+int write_track_defs(FILE *ofp);
+void cpel_util_init (void);
+void alpha_sort_tracks(void);
+void fixup_event_tracks(void);
+
+#endif /* __cpel_util_h__ */
diff --git a/src/tools/perftool/cpelatency.c b/src/tools/perftool/cpelatency.c
new file mode 100644
index 00000000..7b87d606
--- /dev/null
+++ b/src/tools/perftool/cpelatency.c
@@ -0,0 +1,927 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2006-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <pwd.h>
+#include <stdarg.h>
+#include <time.h>
+#include "cpel.h"
+#include <math.h>
+
+char *time_format = "%.03d:%.02d:%.02d:%.03d:%.03d ";
+static char version[] = "cpelatency 2.0";
+
+#define USEC_PER_MS 1000LL
+#define USEC_PER_SECOND (1000*USEC_PER_MS)
+#define USEC_PER_MINUTE (60*USEC_PER_SECOND)
+#define USEC_PER_HOUR (60*USEC_PER_MINUTE)
+
+uword *the_strtab_hash; /* (name, base-VA) hash of all string tables */
+uword *the_evtdef_hash; /* (event-id, event-definition) hash */
+uword *the_trackdef_hash;      /* (track-id, track-definition) hash */
+uword *the_pidtid_hash;         /* ("pid:xxx tid:yy", track-definition) hash */
+
+f64 ticks_per_us;
+u32 start_event_code = 2;       /* default: XR thread ready event */
+u32 end_event_code = 1;         /* default: XR thread running event */
+int exclude_kernel_from_summary_stats=1;
+int summary_stats_only;
+int scatterplot;
+u8 *name_filter;
+int have_trackdefs;
+
+typedef enum {
+    SORT_MAX_TIME=1,
+    SORT_MAX_OCCURRENCES,
+    SORT_NAME,
+} sort_t;
+
+sort_t sort_type = SORT_MAX_TIME;
+
+int widest_name_format=5;
+int widest_track_format=20;
+
+typedef struct bound_event_ {
+    u32 event_code;
+    u8  *event_str;
+    u8  *datum_str;
+    u32  is_strtab_ref;
+} bound_event_t;
+
+bound_event_t *bound_events;
+
+typedef struct bound_track_ {
+    u32 track;
+    u8  *track_str;
+    u64 state_start_ticks;
+    u64 *ticks_in_state; /* vector of state occurrences */
+    f64  mean_ticks_in_state;
+    f64  variance_ticks_in_state;
+    f64  total_ticks_in_state;
+} bound_track_t;
+
+bound_track_t *bound_tracks;
+
+void fatal(char *s)
+{
+    fprintf(stderr, "%s", s);
+    exit(1);
+}
+
+typedef enum {
+    PASS1=1,
+    PASS2=2,
+} pass_t;
+
+typedef struct {
+    int (*pass1)(cpel_section_header_t *, int, FILE *);
+    int (*pass2)(cpel_section_header_t *, int, FILE *);
+} section_processor_t;
+
+int bad_section(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    fprintf(ofp, "Bad (type 0) section, skipped...\n");
+    return(0);
+}
+
+int noop_pass(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    return(0);
+}
+
+int strtab_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    uword *p;
+    u8 *strtab_data_area = (u8 *)(sh+1);
+    
+    /* Multiple string tables with the same name are Bad... */
+    p = hash_get_mem(the_strtab_hash, strtab_data_area);
+    if (p) {
+        fprintf(ofp, "Duplicate string table name %s", strtab_data_area);
+    }
+    /*
+     * Looks funny, but we really do want key = first string in the
+     * table, value = address(first string in the table) 
+     */
+    hash_set_mem(the_strtab_hash, strtab_data_area, strtab_data_area);
+    if (verbose) {
+        fprintf(ofp, "String Table %s\n", strtab_data_area);
+    }
+    return(0);
+}
+
+int evtdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    int i, nevents;
+    event_definition_section_header_t *edh;
+    event_definition_t *ep;
+    u8 *this_strtab;
+    u32 event_code;
+    uword *p;
+    bound_event_t *bp;
+    int thislen;
+
+    edh = (event_definition_section_header_t *)(sh+1);
+    nevents = ntohl(edh->number_of_event_definitions);
+    
+    if (verbose) {
+        fprintf(ofp, "Event Definition Section: %d definitions\n",
+                nevents);
+    }
+
+    p = hash_get_mem(the_strtab_hash, edh->string_table_name);
+    if (!p) {
+        fprintf(ofp, "Fatal: couldn't find string table\n");
+        return(1);
+    }
+    this_strtab = (u8 *)p[0];
+
+    ep = (event_definition_t *)(edh+1);
+    
+    for (i = 0; i < nevents; i++) {
+        event_code = ntohl(ep->event);
+        p = hash_get(the_evtdef_hash, event_code);
+        if (p) {
+            fprintf(ofp, "Event %d redefined, retain first definition\n",
+                    event_code);
+            continue;
+        }
+        vec_add2(bound_events, bp, 1);
+        bp->event_code = event_code;
+        bp->event_str = this_strtab + ntohl(ep->event_format);
+        bp->datum_str = this_strtab + ntohl(ep->datum_format);
+        bp->is_strtab_ref = 0;
+        /* Decide if the datum format is a %s format => strtab reference */
+        {
+            int j;
+            int seen_percent=0;
+
+            for (j = 0; j < strlen((char *) bp->datum_str); j++) {
+                if (bp->datum_str[j] == '%'){
+                    seen_percent=1;
+                    continue;
+                }
+                if (seen_percent && bp->datum_str[j] == 's') {
+                    bp->is_strtab_ref = 1;
+                }
+            }
+        }
+        
+        hash_set(the_evtdef_hash, event_code, bp - bound_events);
+
+        thislen = strlen((char *) bp->event_str);
+        if (thislen > widest_name_format)
+            widest_name_format = thislen;
+
+        ep++;
+    }
+    return (0);
+}
+
+int trackdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    int i, nevents;
+    track_definition_section_header_t *tdh;
+    track_definition_t *tp;
+    u8 *this_strtab;
+    u32 track_code;
+    uword *p;
+    bound_track_t *btp;
+    int thislen;
+    u8 *pidstr;
+    u8 *pidtid_str;
+    u8 *cp;
+    int tid, pid;
+
+    tdh = (track_definition_section_header_t *)(sh+1);
+    nevents = ntohl(tdh->number_of_track_definitions);
+    
+    if (verbose) {
+        fprintf(ofp, "Track Definition Section: %d definitions\n",
+                nevents);
+    }
+
+    p = hash_get_mem(the_strtab_hash, tdh->string_table_name);
+    if (!p) {
+        fprintf(ofp, "Fatal: couldn't find string table\n");
+        return(1);
+    }
+    this_strtab = (u8 *)p[0];
+
+    tp = (track_definition_t *)(tdh+1);
+    
+    for (i = 0; i < nevents; i++) {
+        track_code = ntohl(tp->track);
+        p = hash_get(the_trackdef_hash, track_code);
+        if (p) {
+            fprintf(stderr, "track %d redefined, retain first definition\n",
+                    track_code);
+            continue;
+        }
+        vec_add2(bound_tracks, btp, 1);
+        btp->track = track_code;
+        btp->track_str = this_strtab + ntohl(tp->track_format);
+        hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
+
+        if (verbose) {
+            fprintf(stderr, "adding track '%s'\n", btp->track_str);
+        }
+
+        thislen = strlen((char *) btp->track_str);
+        if (thislen > widest_track_format)
+            widest_track_format = thislen;
+
+        /* convert track_str "eth_server t11(20498)" to "pid:20498 tid:11" */
+        cp = btp->track_str;
+        while (*cp && *cp != '(')
+            cp++;
+        if (!*cp) {
+            fprintf(stderr, "error canonicalizing '%s'\n", btp->track_str);
+            goto out;
+        }
+        pidstr = cp+1;          /* remember location of PID */
+
+        while (cp > btp->track_str && *cp != 't')
+            cp--;
+
+        if (cp == btp->track_str) {
+            fprintf(stderr, "error canonicalizing '%s'\n", btp->track_str);
+            goto out;
+        }
+        tid = atol((char *)(cp+1));
+        pid = atol((char *) pidstr);
+        pidtid_str = format(0, "pid:%d tid:%d", pid, tid);
+        vec_add1(pidtid_str, 0);
+
+        /* 
+         * Note: duplicates are possible due to thread create / 
+         * thread destroy operations.
+         */
+        p = hash_get_mem(the_pidtid_hash, pidtid_str);
+        if (p) {
+            vec_free(pidtid_str);
+            goto out;
+        }
+        hash_set_mem(the_pidtid_hash, pidtid_str, btp - bound_tracks);
+
+    out:
+        tp++;
+    }
+    have_trackdefs = 1;
+    return (0);
+}
+
+int unsupported_pass (cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    if (verbose) {
+        fprintf(ofp, "Unsupported type %d section\n",
+                ntohl(sh->section_type));
+    }
+    return(0);
+}
+
+int event_pass2(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    event_section_header_t *eh;
+    int nevents;
+    int i;
+    uword *p;
+    event_entry_t *ep;
+    u64 now;
+    u32 time0, time1;
+    u32 track_code;
+    u8 *this_strtab;
+    u64 ticks_in_state;
+    bound_track_t *btp;
+    bound_track_t *state_track=0;
+    u8 *pidtid_str;
+    u8 *pidtid_dup;
+    u8 *ecp;
+    u32 event_code;
+
+    eh = (event_section_header_t *)(sh+1);
+    nevents = ntohl(eh->number_of_events);
+    ticks_per_us = ((double)ntohl(eh->clock_ticks_per_second)) / 1e6;
+
+    if (verbose) {
+        fprintf(ofp, "%.3f ticks_per_us\n", ticks_per_us);
+    }
+
+    ep = (event_entry_t *)(eh+1);
+
+    p = hash_get_mem(the_strtab_hash, eh->string_table_name);
+    if (!p) {
+        fprintf(ofp, "Fatal: couldn't find string table\n");
+        return(1);
+    }
+    this_strtab = (u8 *)p[0];
+
+    /*
+     * Some logger implementation that doesn't produce
+     * trackdef sections, synthesize the bound_tracks vector
+     */
+    if (!have_trackdefs) {
+        for (i = 0; i < nevents; i++) {
+            track_code = ntohl(ep->track);
+            pidtid_dup = format(0, "%d", track_code);
+            vec_add1(pidtid_dup, 0);
+            p = hash_get_mem(the_pidtid_hash, pidtid_dup);
+            if (!p) {
+                vec_add2(bound_tracks, btp, 1);
+                btp->track = track_code;
+                btp->track_str = pidtid_dup;
+                hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
+                hash_set_mem(the_pidtid_hash, pidtid_dup, btp - bound_tracks);
+            } else {
+                vec_free(pidtid_dup);
+            }
+            ep++;
+        }
+    }
+
+    ep = (event_entry_t *)(eh+1);
+
+    for (i = 0; i < nevents; i++) {
+        time0 = ntohl (ep->time[0]);
+        time1 = ntohl (ep->time[1]);
+
+        now = (((u64) time0)<<32) | time1;
+        
+        event_code = ntohl(ep->event_code);
+
+        /* Find the corresponding track via the pidtid hash table */
+        if (event_code == start_event_code || event_code == end_event_code) {
+            if (have_trackdefs) {
+                pidtid_str = this_strtab + ntohl(ep->event_datum);
+                pidtid_dup = format(0, (char *) pidtid_str);
+                vec_add1(pidtid_dup, 0);
+                ecp = &pidtid_dup[vec_len(pidtid_dup)-1];
+                while (*--ecp == ' ')
+                    *ecp = 0;
+            } else {
+                pidtid_dup = format(0, "%d", ntohl(ep->track));
+                vec_add1(pidtid_dup, 0);
+            }
+
+            p = hash_get_mem(the_pidtid_hash, pidtid_dup);
+            if (!p) {
+                fprintf(stderr, "warning: couldn't find '%s'\n",
+                        pidtid_dup);
+                vec_free(pidtid_dup);
+                ep++;
+                continue;
+            }
+            state_track = &bound_tracks[p[0]];
+        }
+        /* Found the start-event code ? */
+        if (event_code == start_event_code) {
+            state_track->state_start_ticks = now;
+        } else if (event_code == end_event_code) {
+            /*
+             * Add a ticks-in-state record, unless
+             * e.g. the log started with the exit event
+             */
+            if (state_track->state_start_ticks) {
+                ticks_in_state = now - state_track->state_start_ticks;
+                vec_add1(state_track->ticks_in_state, ticks_in_state);
+                state_track->state_start_ticks = 0;
+            }
+            /* Otherwise, nothing */
+        }
+        ep++;
+    }
+    return(0);
+}
+
+/* 
+ * Note: If necessary, add passes / columns to this table to 
+ * handle section order dependencies.
+ */
+
+section_processor_t processors[CPEL_NUM_SECTION_TYPES+1] =
+{
+    {bad_section,	noop_pass}, 		/* type 0 -- f**ked */
+    {strtab_pass1, 	noop_pass}, 		/* type 1 -- STRTAB */
+    {unsupported_pass,  noop_pass}, 		/* type 2 -- SYMTAB */
+    {evtdef_pass1,      noop_pass},             /* type 3 -- EVTDEF */
+    {trackdef_pass1,    noop_pass},		/* type 4 -- TRACKDEF */
+    {noop_pass,         event_pass2},           /* type 5 -- EVENTS */
+};
+
+
+int process_section(cpel_section_header_t *sh, int verbose, FILE *ofp,
+                    pass_t pass)
+{
+    u32 type;
+    type = ntohl(sh->section_type);
+    int rv;
+    int (*fp)(cpel_section_header_t *, int, FILE *);
+
+    if (type > CPEL_NUM_SECTION_TYPES) {
+        fprintf(stderr, "Unknown section type %d\n", type);
+        return(1);
+    }
+    switch(pass) {
+    case PASS1:
+        fp = processors[type].pass1;
+        break;
+
+    case PASS2:
+        fp = processors[type].pass2;
+        break;
+        
+    default:
+        fprintf(stderr, "Unknown pass %d\n", pass);
+        return(1);
+    }
+
+    rv = (*fp)(sh, verbose, ofp);
+
+    return(rv);
+}
+
+int cpel_dump_file_header(cpel_file_header_t *fh, int verbose, FILE *ofp)
+{
+    time_t file_time;
+
+    if (verbose) {
+        fprintf(ofp, "CPEL file: %s-endian, version %d\n",
+                ((fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) ? 
+                 "little" : "big"), 
+                fh->endian_version & CPEL_FILE_VERSION_MASK);
+
+        file_time = ntohl(fh->file_date);
+        
+        fprintf(ofp, "File created %s", ctime(&file_time));
+        fprintf(ofp, "File has %d sections\n", 
+                ntohs(fh->nsections));
+    }
+
+    return(0);
+}
+
+
+int cpel_dump(u8 *cpel, int verbose, FILE *ofp)
+{
+    cpel_file_header_t *fh;
+    cpel_section_header_t *sh;
+    u16 nsections;
+    u32 section_size;
+    int i;
+
+    /* First, the file header */
+    fh = (cpel_file_header_t *)cpel;
+    if (fh->endian_version != CPEL_FILE_VERSION) {
+        if (fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) {
+            fprintf(stderr, "Little endian data format not supported\n");
+            return(1);
+        }
+        fprintf(stderr, "Unsupported file version 0x%x\n", 
+                fh->endian_version);
+        return(1);
+    }
+    cpel_dump_file_header(fh, verbose, ofp);
+    nsections = ntohs(fh->nsections);
+
+    /*
+     * Take two passes through the file. PASS1 builds
+     * data structures, PASS2 actually dumps the file.
+     * Just in case the sections are in an unobvious order.
+     */
+    sh = (cpel_section_header_t *)(fh+1);
+    for (i = 0; i < nsections; i++) {
+        section_size = ntohl(sh->data_length);
+
+        if(verbose) {
+            fprintf(ofp, "Section type %d, size %d\n", ntohl(sh->section_type),
+                    section_size);
+        }
+
+        if(process_section(sh, verbose, ofp, PASS1))
+            return(1);
+
+        sh++;
+        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
+    }
+
+    sh = (cpel_section_header_t *)(fh+1);
+    for (i = 0; i < nsections; i++) {
+        if(process_section(sh, verbose, ofp, PASS2))
+            return(1);
+        section_size = ntohl(sh->data_length);
+        sh++;
+        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
+    }
+    return(0);
+}
+
+void compute_state_statistics(int verbose, FILE *ofp)
+{
+    int i, j;
+    bound_track_t *bp;
+    f64 fticks;
+
+    /* Across the bound tracks */
+    for (i = 0; i < vec_len(bound_tracks); i++) {
+        bp = &bound_tracks[i];
+        bp->mean_ticks_in_state = 0.0;
+        bp->variance_ticks_in_state = 0.0;
+        bp->total_ticks_in_state = 0.0;
+        for (j = 0; j < vec_len(bp->ticks_in_state); j++) {
+            bp->total_ticks_in_state += (f64) bp->ticks_in_state[j];
+        }
+        /* Compute mean */
+        if (vec_len(bp->ticks_in_state)) {
+            bp->mean_ticks_in_state = bp->total_ticks_in_state / 
+                ((f64) vec_len(bp->ticks_in_state));
+        }
+        /* Accumulate sum: (Xi-Xbar)**2 */
+        for (j = 0; j < vec_len(bp->ticks_in_state); j++) {
+            fticks = bp->ticks_in_state[j];
+            bp->variance_ticks_in_state += 
+                (fticks - bp->mean_ticks_in_state)*
+                (fticks - bp->mean_ticks_in_state);
+        }
+        /* Compute s**2, the unbiased estimator of sigma**2 */
+        if (vec_len(bp->ticks_in_state) > 1) {
+            bp->variance_ticks_in_state /= (f64) 
+                (vec_len(bp->ticks_in_state)-1);
+        }
+    }
+}
+
+int track_compare_max (const void *arg1, const void *arg2)
+{
+    bound_track_t *a1 = (bound_track_t *)arg1;
+    bound_track_t *a2 = (bound_track_t *)arg2;
+    f64 v1, v2;
+
+    v1 = a1->total_ticks_in_state;
+    v2 = a2->total_ticks_in_state;
+    
+    if (v1 < v2)
+        return (1);
+    else if (v1 == v2)
+        return (0);
+    else return (-1);
+}
+
+int track_compare_occurrences (const void *arg1, const void *arg2)
+{
+    bound_track_t *a1 = (bound_track_t *)arg1;
+    bound_track_t *a2 = (bound_track_t *)arg2;
+    f64 v1, v2;
+
+    v1 = (f64) vec_len(a1->ticks_in_state);
+    v2 = (f64) vec_len(a2->ticks_in_state);
+    
+    if (v1 < v2)
+        return (1);
+    else if (v1 == v2)
+        return (0);
+    else return (-1);
+}
+
+int track_compare_name (const void *arg1, const void *arg2)
+{
+    bound_track_t *a1 = (bound_track_t *)arg1;
+    bound_track_t *a2 = (bound_track_t *)arg2;
+
+    return (strcmp((char *)(a1->track_str), (char *)(a2->track_str)));
+}
+
+void sort_state_statistics(sort_t type, FILE *ofp)
+{
+    int (*compare)(const void *, const void *) = 0;
+
+    if (summary_stats_only)
+        return;
+
+    switch(type) {
+    case SORT_MAX_TIME:
+        fprintf(ofp, "Results sorted by max time in state.\n\n");
+        compare = track_compare_max;
+        break;
+
+    case SORT_MAX_OCCURRENCES:
+        fprintf(ofp, "Results sorted by max occurrences of state.\n\n");
+        compare = track_compare_occurrences;
+        break;
+
+    case SORT_NAME:
+        compare = track_compare_name;
+        fprintf(ofp, "Results sorted by process name, thread ID, PID\n\n");
+        break;
+
+    default:
+        fatal("sort type not set?");
+    }
+    
+    qsort (bound_tracks, vec_len(bound_tracks), 
+           sizeof (bound_track_t), compare);    
+}
+
+void print_state_statistics(int verbose, FILE *ofp)
+{
+    int i,j;
+    u8 *trackpad;
+    bound_track_t *bp;
+    f64 total_time = 0.0;
+    f64 total_switches = 0.0;
+
+    trackpad = format(0, "%%-%ds ", widest_track_format);
+    vec_add1(trackpad, 0);
+
+    if (!summary_stats_only) {
+        fprintf(ofp, (char *)trackpad, "ProcName Thread(PID)");
+        fprintf(ofp, "  Mean(us)     Stdev(us)   Total(us)      N\n");
+    }
+        
+    for (i = 0; i < vec_len(bound_tracks); i++) {
+        bp = &bound_tracks[i];
+        if (bp->mean_ticks_in_state == 0.0)
+            continue;
+
+        if (name_filter &&
+            strncmp((char *)bp->track_str, (char *)name_filter, 
+                    strlen((char *)name_filter)))
+            continue;
+
+        /*
+         * Exclude kernel threads (e.g. idle thread) from
+         * state statistics 
+         */
+        if (exclude_kernel_from_summary_stats && 
+            !strncmp((char *) bp->track_str, "kernel ", 7))
+            continue;
+
+        total_switches += (f64) vec_len(bp->ticks_in_state);
+        
+        if (!summary_stats_only) {
+            fprintf(ofp, (char *) trackpad, bp->track_str);
+            fprintf(ofp, "%10.3f +- %10.3f", 
+                    bp->mean_ticks_in_state / ticks_per_us,
+                    sqrt(bp->variance_ticks_in_state) 
+                    / ticks_per_us);
+            fprintf(ofp, "%12.3f", 
+                    bp->total_ticks_in_state / ticks_per_us);
+            fprintf(ofp, "%8d\n", vec_len(bp->ticks_in_state));
+        }
+
+        if (scatterplot) {
+            for (j = 0; j < vec_len(bp->ticks_in_state); j++) {
+                fprintf(ofp, "%.3f\n", 
+                        (f64)bp->ticks_in_state[j] / ticks_per_us);
+            }
+        }
+
+        total_time += bp->total_ticks_in_state;
+    }
+    
+    if (!summary_stats_only)
+        fprintf(ofp, "\n");
+    fprintf(ofp, "Note: the following statistics %s kernel-thread activity.\n",
+            exclude_kernel_from_summary_stats ? "exclude" : "include");
+    if (name_filter)
+        fprintf(ofp, 
+                "Note: only pid/proc/threads matching '%s' are included.\n",
+                name_filter);
+
+    fprintf(ofp, 
+      "Total time in state: %10.3f (us), Total state occurrences: %.0f\n", 
+            total_time / ticks_per_us, total_switches);
+    fprintf(ofp, "Average time in state: %10.3f (us)\n",
+            (total_time / total_switches) / ticks_per_us);
+    fprintf(ofp, "State start event: %d, state end event: %d\n",
+            start_event_code, end_event_code);
+}
+
+char *mapfile (char *file)
+{
+    struct stat statb;
+    char *rv;
+    int maphfile;
+    size_t mapfsize;
+    
+    maphfile = open (file, O_RDONLY);
+
+    if (maphfile < 0)
+    {
+        fprintf (stderr, "Couldn't read %s, skipping it...\n", file);
+        return (NULL);
+    }
+
+    if (fstat (maphfile, &statb) < 0)
+    {
+        fprintf (stderr, "Couldn't get size of %s, skipping it...\n", file);
+        return (NULL);
+    }
+
+    /* Don't try to mmap directories, FIFOs, semaphores, etc. */
+    if (! (statb.st_mode & S_IFREG)) {
+        fprintf (stderr, "%s is not a regular file, skipping it...\n", file);
+        return (NULL);
+    }
+
+    mapfsize = statb.st_size;
+
+    if (mapfsize < 3)
+    {
+        fprintf (stderr, "%s zero-length, skipping it...\n", file);
+        close (maphfile);
+        return (NULL);
+    }
+
+    rv = mmap (0, mapfsize, PROT_READ, MAP_SHARED, maphfile, 0);
+
+    if (rv == 0)
+    {
+        fprintf (stderr, "%s problem mapping, I quit...\n", file);
+        exit (-1);
+    }
+    close (maphfile);
+    return (rv);
+}
+
+/*
+ * main 
+ */
+int main (int argc, char **argv)
+{
+    char *cpel_file = 0;
+    char *outputfile = 0;
+    FILE *ofp;
+    char *cpel;
+    int verbose=0;
+    int curarg=1;
+
+    while (curarg < argc) {
+        if (!strncmp(argv[curarg], "--input-file", 3)) {
+            curarg++;
+            if (curarg < argc) {
+                cpel_file = argv[curarg];
+                curarg++;
+                continue;
+            }
+            fatal("Missing filename after --input-file\n");
+        }
+        if (!strncmp(argv[curarg], "--output-file", 3)) {
+            curarg ++;
+            if (curarg < argc) {
+                outputfile = argv[curarg];
+                curarg ++;
+                continue;
+            }
+            fatal("Missing filename after --output-file\n");
+        }
+        if (!strncmp(argv[curarg], "--verbose", 3)) {
+            curarg++;
+            verbose++;
+            continue;
+        }
+        if (!strncmp(argv[curarg], "--scatterplot", 4)) {
+            curarg++;
+            scatterplot=1;
+            continue;
+        }
+
+        if (!strncmp(argv[curarg], "--start-event", 4)) {
+            curarg++;
+            if (curarg < argc) {
+                start_event_code = atol(argv[curarg]);
+                curarg ++;
+                continue;
+            }
+            fatal("Missing integer after --start-event\n");
+        }
+        if (!strncmp(argv[curarg], "--end-event", 4)) {
+            curarg++;
+            if (curarg < argc) {
+                end_event_code = atol(argv[curarg]);
+                curarg ++;
+                continue;
+            }
+            fatal("Missing integer after --end-event\n");
+        }
+        if (!strncmp(argv[curarg], "--max-time-sort", 7)) {
+            sort_type = SORT_MAX_TIME;
+            curarg++;
+            continue;
+        }
+        if (!strncmp(argv[curarg], "--max-occurrence-sort", 7)) {
+            sort_type = SORT_MAX_OCCURRENCES;
+            curarg++;
+            continue;
+        }
+        if (!strncmp(argv[curarg], "--name-sort", 3)) {
+            sort_type = SORT_NAME;
+            curarg++;
+            continue;
+        }
+        if (!strncmp(argv[curarg], "--kernel-included", 3)) {
+            exclude_kernel_from_summary_stats = 0;
+            curarg++;
+            continue;
+        }
+        if (!strncmp(argv[curarg], "--summary", 3)) {
+            summary_stats_only=1;
+            curarg++;
+            continue;
+        }
+        if (!strncmp(argv[curarg], "--filter", 3)) {
+            curarg ++;
+            if (curarg < argc) {
+                name_filter = (u8 *) argv[curarg];
+                curarg ++;
+                continue;
+            }
+            fatal("Missing filter string after --filter\n");
+        }
+        
+
+    usage:
+        fprintf(stderr, 
+          "cpelatency --input-file <filename> [--output-file <filename>]\n");
+        fprintf(stderr, 
+          "          [--start-event <decimal>] [--verbose]\n");
+        fprintf(stderr, 
+          "          [--end-event <decimal>]\n");
+        fprintf(stderr, 
+          "          [--max-time-sort(default) | --max-occurrence-sort |\n");
+
+        fprintf(stderr, 
+          "           --name-sort-sort] [--kernel-included]\n");
+
+        fprintf(stderr, 
+          "          [--summary-stats-only] [--scatterplot]\n");
+
+        fprintf(stderr, "%s\n", version);
+        exit(1);
+    }
+
+    if (cpel_file == 0)
+        goto usage;
+
+    cpel = mapfile(cpel_file);
+    if (cpel == 0) {
+        fprintf(stderr, "Couldn't map %s...\n", cpel_file);
+        exit(1);
+    }
+
+    if (!outputfile) {
+        ofp = fdopen(1, "w");
+        if (ofp == NULL) {
+            fprintf(stderr, "Couldn't fdopen(1)?\n");
+            exit(1);
+        }
+    } else {
+        ofp = fopen(outputfile, "w");
+        if (ofp == NULL) {
+            fprintf(stderr, "Couldn't create %s...\n", outputfile);
+            exit(1);
+        }
+    }
+
+    the_strtab_hash = hash_create_string (0, sizeof (uword));
+    the_evtdef_hash = hash_create (0, sizeof (uword));
+    the_trackdef_hash = hash_create (0, sizeof (uword));
+    the_pidtid_hash = hash_create_string (0, sizeof(uword));
+
+    if (cpel_dump((u8 *)cpel, verbose, ofp)) {
+        if (outputfile)
+            unlink(outputfile);
+    }
+
+    compute_state_statistics(verbose, ofp);
+    sort_state_statistics(sort_type, ofp);
+    print_state_statistics(verbose, ofp);
+
+    fclose(ofp);
+    return(0);
+}
diff --git a/src/tools/perftool/cpeldump.c b/src/tools/perftool/cpeldump.c
new file mode 100644
index 00000000..9011bd03
--- /dev/null
+++ b/src/tools/perftool/cpeldump.c
@@ -0,0 +1,638 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2006-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <pwd.h>
+#include <stdarg.h>
+#include <time.h>
+#include "cpel.h"
+
+char *time_format = "%.03d:%.02d:%.02d:%.03d:%.03d ";
+static char version[] = "cpeldump 2.0";
+
+#define USEC_PER_MS 1000LL
+#define USEC_PER_SECOND (1000*USEC_PER_MS)
+#define USEC_PER_MINUTE (60*USEC_PER_SECOND)
+#define USEC_PER_HOUR (60*USEC_PER_MINUTE)
+
+uword *the_strtab_hash; /* (name, base-VA) hash of all string tables */
+uword *the_evtdef_hash; /* (event-id, event-definition) hash */
+uword *the_trackdef_hash; /* (track-id, track-definition) hash */
+
+int widest_name_format=5;
+int widest_track_format=5;
+
+typedef struct bound_event_ {
+    u32 event_code;
+    u8  *event_str;
+    u8  *datum_str;
+    u32  is_strtab_ref;
+} bound_event_t;
+
+bound_event_t *bound_events;
+
+typedef struct bound_track_ {
+    u32 track;
+    u8  *track_str;
+} bound_track_t;
+
+bound_track_t *bound_tracks;
+
+void fatal(char *s)
+{
+    fprintf(stderr, "%s", s);
+    exit(1);
+}
+
+typedef enum {
+    PASS1=1,
+    PASS2=2,
+} pass_t;
+
+typedef struct {
+    int (*pass1)(cpel_section_header_t *, int, FILE *);
+    int (*pass2)(cpel_section_header_t *, int, FILE *);
+} section_processor_t;
+
+int bad_section(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    fprintf(ofp, "Bad (type 0) section, skipped...\n");
+    return(0);
+}
+
+int noop_pass(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    return(0);
+}
+
+int strtab_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    uword *p;
+    u8 *strtab_data_area = (u8 *)(sh+1);
+    
+    /* Multiple string tables with the same name are Bad... */
+    p = hash_get_mem(the_strtab_hash, strtab_data_area);
+    if (p) {
+        fprintf(ofp, "Duplicate string table name %s", strtab_data_area);
+    }
+    /*
+     * Looks funny, but we really do want key = first string in the
+     * table, value = address(first string in the table) 
+     */
+    hash_set_mem(the_strtab_hash, strtab_data_area, strtab_data_area);
+    if (verbose) {
+        fprintf(stderr, "String Table %s\n", strtab_data_area);
+    }
+    return(0);
+}
+
+int evtdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    int i, nevents;
+    event_definition_section_header_t *edh;
+    event_definition_t *ep;
+    u8 *this_strtab;
+    u32 event_code;
+    uword *p;
+    bound_event_t *bp;
+    int thislen;
+
+    edh = (event_definition_section_header_t *)(sh+1);
+    nevents = ntohl(edh->number_of_event_definitions);
+    
+    if (verbose) {
+        fprintf(stderr, "Event Definition Section: %d definitions\n",
+                nevents);
+    }
+
+    p = hash_get_mem(the_strtab_hash, edh->string_table_name);
+    if (!p) {
+        fprintf(ofp, "Fatal: couldn't find string table\n");
+        return(1);
+    }
+    this_strtab = (u8 *)p[0];
+
+    ep = (event_definition_t *)(edh+1);
+    
+    for (i = 0; i < nevents; i++) {
+        event_code = ntohl(ep->event);
+        p = hash_get(the_evtdef_hash, event_code);
+        if (p) {
+            fprintf(ofp, "Event %d redefined, retain first definition\n",
+                    event_code);
+            continue;
+        }
+        vec_add2(bound_events, bp, 1);
+        bp->event_code = event_code;
+        bp->event_str = this_strtab + ntohl(ep->event_format);
+        bp->datum_str = this_strtab + ntohl(ep->datum_format);
+        bp->is_strtab_ref = 0;
+        /* Decide if the datum format is a %s format => strtab reference */
+        {
+            int j;
+            int seen_percent=0;
+
+            for (j = 0; j < strlen((char *)bp->datum_str); j++) {
+                if (bp->datum_str[j] == '%'){
+                    seen_percent=1;
+                    continue;
+                }
+                if (seen_percent && bp->datum_str[j] == 's') {
+                    bp->is_strtab_ref = 1;
+                }
+            }
+        }
+        
+        hash_set(the_evtdef_hash, event_code, bp - bound_events);
+
+        thislen = strlen((char *)bp->event_str);
+        if (thislen > widest_name_format)
+            widest_name_format = thislen;
+
+        ep++;
+    }
+    return (0);
+}
+
+int trackdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    int i, nevents;
+    track_definition_section_header_t *tdh;
+    track_definition_t *tp;
+    u8 *this_strtab;
+    u32 track_code;
+    uword *p;
+    bound_track_t *btp;
+    int thislen;
+
+    tdh = (track_definition_section_header_t *)(sh+1);
+    nevents = ntohl(tdh->number_of_track_definitions);
+    
+    if (verbose) {
+        fprintf(stderr, "Track Definition Section: %d definitions\n",
+                nevents);
+    }
+
+    p = hash_get_mem(the_strtab_hash, tdh->string_table_name);
+    if (!p) {
+        fprintf(ofp, "Fatal: couldn't find string table\n");
+        return(1);
+    }
+    this_strtab = (u8 *)p[0];
+
+    tp = (track_definition_t *)(tdh+1);
+    
+    for (i = 0; i < nevents; i++) {
+        track_code = ntohl(tp->track);
+        p = hash_get(the_trackdef_hash, track_code);
+        if (p) {
+            fprintf(ofp, "track %d redefined, retain first definition\n",
+                    track_code);
+            continue;
+        }
+        vec_add2(bound_tracks, btp, 1);
+        btp->track = track_code;
+        btp->track_str = this_strtab + ntohl(tp->track_format);
+        hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
+
+        thislen = strlen((char *)btp->track_str);
+        if (thislen > widest_track_format)
+            widest_track_format = thislen;
+        tp++;
+    }
+    return (0);
+}
+
+int unsupported_pass (cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    if (verbose) {
+        fprintf(stderr, "Unsupported type %d section\n",
+                ntohl(sh->section_type));
+    }
+    return(0);
+}
+
+int event_pass2(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    event_section_header_t *eh;
+    f64 ticks_per_us;
+    u32 event_code, track_code;
+    u64 starttime = 0xFFFFFFFFFFFFFFFFULL;
+    int nevents;
+    int i;
+    uword *p;
+    event_entry_t *ep;
+    u64 now;
+    u64 delta;
+    u32 hours, minutes, seconds, msec, usec;
+    u32 time0, time1;
+    double d;
+    bound_event_t *bp;
+    bound_event_t generic_event;
+    bound_track_t *tp=0;
+    bound_track_t generic_track;
+    u32 last_track_code;
+    u8 *s, *evtpad, *trackpad;
+    u8 *this_strtab;
+
+    generic_event.event_str = (u8 *)"%d";
+    generic_event.datum_str = (u8 *)"0x%08x";
+    generic_event.is_strtab_ref = 0;
+
+    generic_track.track_str = (u8 *)"%d";
+    last_track_code = 0xdeadbeef;
+
+    eh = (event_section_header_t *)(sh+1);
+    nevents = ntohl(eh->number_of_events);
+    ticks_per_us = ((double)ntohl(eh->clock_ticks_per_second)) / 1e6;
+
+    if (verbose) {
+        fprintf(stderr, "Event section: %d events, %.3f ticks_per_us\n", 
+                nevents, ticks_per_us);
+    }
+
+    ep = (event_entry_t *)(eh+1);
+
+    p = hash_get_mem(the_strtab_hash, eh->string_table_name);
+    if (!p) {
+        fprintf(ofp, "Fatal: couldn't find string table\n");
+        return(1);
+    }
+    this_strtab = (u8 *)p[0];
+
+    evtpad = format(0, "%%-%ds ", widest_name_format);
+    vec_add1(evtpad, 0);
+    trackpad = format(0, "%%-%ds ", widest_track_format);
+    vec_add1(trackpad, 0);
+
+    for (i = 0; i < nevents; i++) {
+        time0 = ntohl (ep->time[0]);
+        time1 = ntohl (ep->time[1]);
+
+        now = (((u64) time0)<<32) | time1;
+        
+        /* Convert from bus ticks to usec */
+        d = now;
+        d /= ticks_per_us;
+
+        now = d;
+
+        if (starttime == 0xFFFFFFFFFFFFFFFFULL)
+            starttime = now;
+        
+        delta = now - starttime;
+
+        /* Delta = time since first event, in usec */
+
+        hours = delta / USEC_PER_HOUR;
+        if (hours) 
+            delta -= ((u64) hours * USEC_PER_HOUR);
+        minutes = delta / USEC_PER_MINUTE;
+        if (minutes)
+            delta -= ((u64) minutes * USEC_PER_MINUTE);
+        seconds = delta / USEC_PER_SECOND;
+        if (seconds)
+            delta -= ((u64) seconds * USEC_PER_SECOND);
+        msec = delta / USEC_PER_MS;
+        if (msec)
+            delta -= ((u64) msec * USEC_PER_MS);
+
+        usec = delta;
+
+        /* Output the timestamp */
+        fprintf(ofp, time_format, hours, minutes, seconds, msec, usec);
+
+        /* output the track */
+        track_code = ntohl(ep->track);
+
+        if (track_code != last_track_code) {
+            p = hash_get(the_trackdef_hash, track_code);
+            if (p) {
+                tp = &bound_tracks[p[0]];
+            } else {
+                tp = &generic_track;
+            }
+        }
+        s = format(0, (char *)tp->track_str, track_code);
+        vec_add1(s, 0);
+        fprintf(ofp, (char *)trackpad, s);
+        vec_free(s);
+
+        /* output the event and datum */
+        if (0 && verbose) {
+            fprintf(stderr, "raw event code %d, raw event datum 0x%x\n",
+                    ntohl(ep->event_code), ntohl(ep->event_datum));
+        }
+
+        event_code = ntohl(ep->event_code);
+        p = hash_get(the_evtdef_hash, event_code);
+        if (p) {
+            bp = &bound_events[p[0]];
+        } else {
+            bp = &generic_event;
+        }
+        s = format(0, (char *)bp->event_str, ntohl(ep->event_code));
+        vec_add1(s, 0);
+        fprintf(ofp, (char *)evtpad, s);
+        vec_free(s);
+        if (bp->is_strtab_ref) {
+            fprintf(ofp, (char *) bp->datum_str, 
+                    &this_strtab[ntohl(ep->event_datum)]);
+        } else {
+            fprintf(ofp, (char *) bp->datum_str, ntohl(ep->event_datum));
+        }
+        fputs("\n", ofp);
+        ep++;
+    }
+    vec_free(evtpad);
+    vec_free(trackpad);
+    return(0);
+}
+
+/* 
+ * Note: If necessary, add passes / columns to this table to 
+ * handle section order dependencies.
+ */
+
+section_processor_t processors[CPEL_NUM_SECTION_TYPES+1] =
+{
+    {bad_section,	noop_pass}, 		/* type 0 -- f**ked */
+    {strtab_pass1, 	noop_pass}, 		/* type 1 -- STRTAB */
+    {unsupported_pass,  noop_pass}, 		/* type 2 -- SYMTAB */
+    {evtdef_pass1,      noop_pass},             /* type 3 -- EVTDEF */
+    {trackdef_pass1,    noop_pass},		/* type 4 -- TRACKDEF */
+    {noop_pass,         event_pass2},           /* type 5 -- EVENTS */
+};
+
+
+int process_section(cpel_section_header_t *sh, int verbose, FILE *ofp,
+                    pass_t pass)
+{
+    u32 type;
+    type = ntohl(sh->section_type);
+    int rv;
+    int (*fp)(cpel_section_header_t *, int, FILE *);
+
+    if (type > CPEL_NUM_SECTION_TYPES) {
+        fprintf(stderr, "Unknown section type %d\n", type);
+        return(1);
+    }
+    switch(pass) {
+    case PASS1:
+        fp = processors[type].pass1;
+        break;
+
+    case PASS2:
+        fp = processors[type].pass2;
+        break;
+        
+    default:
+        fprintf(stderr, "Unknown pass %d\n", pass);
+        return(1);
+    }
+
+    rv = (*fp)(sh, verbose, ofp);
+
+    return(rv);
+}
+
+int cpel_dump_file_header(cpel_file_header_t *fh, int verbose, FILE *ofp)
+{
+    time_t file_time;
+
+    if (verbose) {
+        fprintf(stderr, "CPEL file: %s-endian, version %d\n",
+                ((fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) ? 
+                 "little" : "big"), 
+                fh->endian_version & CPEL_FILE_VERSION_MASK);
+        
+        file_time = ntohl(fh->file_date);
+        
+        fprintf(stderr, "File created %s", ctime(&file_time));
+        fprintf(stderr, "File has %d sections\n", 
+                ntohs(fh->nsections));
+    }
+
+    return(0);
+}
+
+
+int cpel_dump(u8 *cpel, int verbose, FILE *ofp)
+{
+    cpel_file_header_t *fh;
+    cpel_section_header_t *sh;
+    u16 nsections;
+    u32 section_size;
+    int i;
+
+    /* First, the file header */
+    fh = (cpel_file_header_t *)cpel;
+    if (fh->endian_version != CPEL_FILE_VERSION) {
+        if (fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) {
+            fprintf(stderr, "Little endian data format not supported\n");
+            return(1);
+        }
+        fprintf(stderr, "Unsupported file version 0x%x\n", 
+                fh->endian_version);
+        return(1);
+    }
+    cpel_dump_file_header(fh, verbose, ofp);
+    nsections = ntohs(fh->nsections);
+
+    /*
+     * Take two passes through the file. PASS1 builds
+     * data structures, PASS2 actually dumps the file.
+     * Just in case the sections are in an unobvious order.
+     */
+    sh = (cpel_section_header_t *)(fh+1);
+    for (i = 0; i < nsections; i++) {
+        section_size = ntohl(sh->data_length);
+
+        if(verbose) {
+            fprintf(stderr, 
+                    "Section type %d, size %d\n", ntohl(sh->section_type),
+                    section_size);
+        }
+
+        if(process_section(sh, verbose, ofp, PASS1))
+            return(1);
+
+        sh++;
+        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
+    }
+
+    sh = (cpel_section_header_t *)(fh+1);
+    for (i = 0; i < nsections; i++) {
+        if(process_section(sh, verbose, ofp, PASS2))
+            return(1);
+        section_size = ntohl(sh->data_length);
+        sh++;
+        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
+    }
+    return(0);
+}
+
+
+char *mapfile (char *file)
+{
+    struct stat statb;
+    char *rv;
+    int maphfile;
+    size_t mapfsize;
+    
+    maphfile = open (file, O_RDONLY);
+
+    if (maphfile < 0)
+    {
+        fprintf (stderr, "Couldn't read %s, skipping it...\n", file);
+        return (NULL);
+    }
+
+    if (fstat (maphfile, &statb) < 0)
+    {
+        fprintf (stderr, "Couldn't get size of %s, skipping it...\n", file);
+        return (NULL);
+    }
+
+    /* Don't try to mmap directories, FIFOs, semaphores, etc. */
+    if (! (statb.st_mode & S_IFREG)) {
+        fprintf (stderr, "%s is not a regular file, skipping it...\n", file);
+        return (NULL);
+    }
+
+    mapfsize = statb.st_size;
+
+    if (mapfsize < 3)
+    {
+        fprintf (stderr, "%s zero-length, skipping it...\n", file);
+        close (maphfile);
+        return (NULL);
+    }
+
+    rv = mmap (0, mapfsize, PROT_READ, MAP_SHARED, maphfile, 0);
+
+    if (rv == 0)
+    {
+        fprintf (stderr, "%s problem mapping, I quit...\n", file);
+        exit (-1);
+    }
+    close (maphfile);
+    return (rv);
+}
+
+/*
+ * main 
+ */
+int main (int argc, char **argv)
+{
+    char *cpel_file = 0;
+    char *outputfile = 0;
+    FILE *ofp;
+    char *cpel;
+    int verbose=0;
+    int curarg=1;
+
+    while (curarg < argc) {
+        if (!strncmp(argv[curarg], "--input-file", 3)) {
+            curarg++;
+            if (curarg < argc) {
+                cpel_file = argv[curarg];
+                curarg++;
+                continue;
+            }
+            fatal("Missing filename after --input-file\n");
+        }
+        if (!strncmp(argv[curarg], "--output-file", 3)) {
+            curarg ++;
+            if (curarg < argc) {
+                outputfile = argv[curarg];
+                curarg ++;
+                continue;
+            }
+            fatal("Missing filename after --output-file\n");
+        }
+        if (!strncmp(argv[curarg], "--verbose", 3)) {
+            curarg++;
+            verbose = 1;
+            continue;
+        }
+
+    usage:
+        fprintf(stderr, 
+          "cpeldump --input-file <filename> [--output-file <filename>]\n");
+        fprintf(stderr, "%s\n", version);
+        exit(1);
+    }
+
+    if (cpel_file == 0)
+        goto usage;
+
+    cpel = mapfile(cpel_file);
+    if (cpel == 0) {
+        fprintf(stderr, "Couldn't map %s...\n", cpel_file);
+        exit(1);
+    }
+
+    if (!outputfile) {
+        ofp = fdopen(1, "w");
+        if (ofp == NULL) {
+            fprintf(stderr, "Couldn't fdopen(1)?\n");
+            exit(1);
+        }
+    } else {
+        ofp = fopen(outputfile, "w");
+        if (ofp == NULL) {
+            fprintf(stderr, "Couldn't create %s...\n", outputfile);
+            exit(1);
+        }
+    }
+
+    the_strtab_hash = hash_create_string (0, sizeof (uword));
+    the_evtdef_hash = hash_create (0, sizeof (uword));
+    the_trackdef_hash = hash_create (0, sizeof (uword));
+
+#ifdef TEST_TRACK_INFO
+    {
+        bound_track_t *btp;
+        vec_add2(bound_tracks, btp, 1);
+        btp->track = 0;
+        btp->track_str = "cpu %d";
+        hash_set(the_trackdef_hash, 0, btp - bound_tracks);
+        hash_set(the_trackdef_hash, 1, btp - bound_tracks);
+    }
+#endif
+
+    if (cpel_dump((u8 *)cpel, verbose, ofp)) {
+        if (outputfile)
+            unlink(outputfile);
+    }
+
+    fclose(ofp);
+    return(0);
+}
diff --git a/src/tools/perftool/cpelinreg.c b/src/tools/perftool/cpelinreg.c
new file mode 100644
index 00000000..115afad7
--- /dev/null
+++ b/src/tools/perftool/cpelinreg.c
@@ -0,0 +1,892 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2008-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Search for O(N**2) functions bracketed by before/after
+ * events. The "before" event's datum is used as a tag, e.g. which function
+ * did we call that's strongly O(N).
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <pwd.h>
+#include <stdarg.h>
+#include <time.h>
+#include "cpel.h"
+
+FILE *g_ifp;
+char *g_ifile;
+
+typedef unsigned long long ulonglong;
+
+void process_traces (void);
+void record_instance (ulong tag, ulonglong time);
+void report_actors (void);
+void scatterplot_data(void);
+int entry_event, exit_event;
+int nokey;
+char *version = "cpelinreg 2.0";
+int model_these[10];
+int model_index;
+int summary_stats;
+ulonglong first_start_time;
+ulonglong last_end_time;
+ulonglong total_time;
+ulong scatterkey;
+int inline_mokus;
+
+typedef struct bound_track_ {
+    u32 track_code;
+    u32 *start_datum;
+    u8  *dup_event;
+    int state;
+    u64 *start_time;
+    u64 thread_timestamp;
+    u64 time_thread_on_cpu;
+} bound_track_t;
+
+bound_track_t *bound_tracks;
+uword *the_trackdef_hash;
+
+
+#define MAXSTACK 128
+
+typedef struct instance_ {
+    struct instance_ *next;
+    ulonglong time;
+}instance_t;
+
+typedef struct actor_ {
+    struct actor_ *next;
+    ulong key;
+    struct instance_ *first;
+    struct instance_ *last;
+    double a;
+    double b;
+    double min;
+    double max;
+    double mean;
+    double r;
+    ulong ninst;
+} actor_t;
+
+#define NBUCKETS 1811
+
+actor_t *hash[NBUCKETS];
+
+actor_t *find_or_create_actor (ulong key)
+{
+    ulong bucket;
+    actor_t *ap;
+    u8 *mem;
+
+    bucket = key % NBUCKETS;
+
+    ap = hash[bucket];
+
+    if (ap == NULL) {
+        /* Ensure 8-byte alignment to avoid (double) alignment faults */
+        mem = malloc(sizeof(*ap) + 4);
+        if (((uword)(mem)) & 0x7)
+            mem += 4;
+        ap = (actor_t *)mem;
+
+        if (ap == NULL) {
+            fprintf (stderr, "out of memory...\n");
+            exit (1);
+        }
+        ap->next = 0;
+        ap->key = key;
+        ap->first = 0;
+        ap->last = 0;
+        ap->a = 0.00;
+        ap->b = 0.00;
+        hash [bucket] = ap;
+        return (ap);
+    }
+    
+    while (ap) {
+        if (ap->key == key)
+            return (ap);
+        ap = ap->next;
+    }
+
+    mem = malloc(sizeof(*ap)+4);
+    if (((uword)(mem) & 0x7))
+        mem += 4;
+    ap = (actor_t *)mem;
+
+    if (ap == NULL) {
+        fprintf (stderr, "out of memory...\n");
+        exit (1);
+    }
+    ap->key = key;
+    ap->first = 0;
+    ap->last = 0;
+    ap->a = 0.00;
+    ap->b = 0.00;
+
+    ap->next = hash[bucket];
+    hash[bucket] = ap;
+
+    return (ap);
+}
+
+void record_instance (ulong key, ulonglong time)
+{
+    actor_t *ap;
+    instance_t *ip;
+
+    if (nokey)
+        key = 0;
+
+    ap = find_or_create_actor (key);
+
+    ip = (instance_t *)malloc(sizeof(*ip));
+    if (ip == NULL) {
+        fprintf (stderr, "out of memory...\n");
+        exit (1);
+    }
+    ip->time = time;
+    ip->next = 0;
+
+    if (ap->first == 0) {
+        ap->first = ip;
+        ap->last = ip;
+        ap->ninst = 1;
+    } else {
+        ap->last->next = ip;
+        ap->last = ip;
+        ap->ninst++;
+    }
+}
+
+#define NINSTANCE 200000
+
+double x[NINSTANCE];
+double y[NINSTANCE];
+
+int actor_compare (const void *arg1, const void *arg2)
+{
+    double e10k1, e10k2;
+    actor_t **a1 = (actor_t **)arg1;
+    actor_t **a2 = (actor_t **)arg2;
+    double ninst1, ninst2;
+
+    ninst1 = ((double)((*a1)->ninst));
+    ninst2 = ((double)((*a2)->ninst));
+    
+    e10k1 = ninst1 * ((*a1)->mean);
+    e10k2 = ninst2 * ((*a2)->mean);
+
+    if (e10k1 < e10k2)
+        return (1);
+    else if (e10k1 == e10k2)
+        return (0);
+    else
+        return (-1);
+}
+
+void report_actors (void)
+{
+    int i;
+    actor_t *ap;
+    instance_t *ip;
+    int nactors = 0;
+    int ninstance;
+    actor_t **actor_vector;
+    double e10k;
+    extern void linreg (double *x, double *y, int nitems, double *a, double *b,
+                        double *minp, double *maxp, double *meanp, double *r);
+
+    for (i = 0; i < NBUCKETS; i++) {
+        ap = hash[i];
+        if (ap == NULL)
+            continue;
+        while (ap) {
+            nactors++;
+            ninstance = 0;
+
+            ip = ap->first;
+
+            while (ip) {
+                if (ninstance < NINSTANCE) {
+                    x[ninstance] = ninstance;
+                    y[ninstance] = ((double)ip->time);
+                    ninstance++;
+                }
+                ip = ip->next;
+            }
+            if (ninstance > 1) {
+#if DEBUG > 0
+                int j;
+                
+                for (j = 0; j < ninstance; j++) {
+                    printf("x[%d] = %10.2f, y[%d] = %10.2f\n",
+                           j, x[j], j, y[j]);
+                }
+#endif                    
+                
+                linreg (x, y, ninstance, &ap->a, &ap->b, &ap->min,
+                        &ap->max, &ap->mean, &ap->r);
+            } else {
+                ap->a = 0.00;
+                ap->b = 0.00;
+            }
+            
+            ap = ap->next;
+        }
+    }
+            
+    actor_vector = (actor_t **)malloc (nactors*sizeof(*actor_vector));
+    nactors = 0;
+
+    for (i = 0; i < NBUCKETS; i++) {
+        ap = hash[i];
+        if (ap == NULL)
+            continue;
+        while (ap) {
+            if ((ap->a != 0.00) || (ap->b != 0.00)) {
+                actor_vector[nactors++] = ap;
+            }
+            ap = ap->next;
+        }
+    }
+        
+    qsort (actor_vector, nactors, sizeof (actor_t *), actor_compare);
+
+    if (summary_stats)
+        printf("NInst       Offset       Slope    T(Ninst)         Min         Max         Avg   %%InstTime           R    Key");
+    else
+        printf("NInst       Offset       Slope    T(Ninst)    Key");
+
+    for (i = 0; i < model_index; i++) {
+        printf ("T @ %-8d ", model_these[i]);
+    }
+
+    printf ("\n");
+
+    for (i = 0; i < nactors; i++) {
+        int j;
+        double ninst;
+        double pcttot;
+        ap = actor_vector[i];
+        ninst = ap->ninst;
+
+        e10k = ninst * (ap->a + ap->b*((ninst-1.0)/2.0));
+
+        if (ap->ninst) {
+            if (summary_stats) {
+                pcttot = (e10k / ((double)total_time)) * 100.0;
+                printf ("%6ld %11.2f %11.2f %11.2f %11.2f %11.2f %11.2f %11.2f %11.2f 0x%08lx ",
+                        ap->ninst, ap->a, ap->b, e10k, ap->min,
+                        ap->max, ap->mean, pcttot, ap->r, ap->key);
+            }
+            else
+                printf ("%6ld %11.2f %11.2f %11.2f 0x%08lx ",
+                        ap->ninst, ap->a, ap->b, e10k, ap->key);
+
+            for (j = 0; j < model_index; j++) {
+                ninst = model_these[j];
+                e10k = ninst * (ap->a + ap->b*((ninst-1.0)/2.0));
+                printf ("%10.2f ", e10k);
+            }
+            printf ("\n");
+        }
+    }
+}
+
+void scatterplot_data(void)
+{
+    actor_t *ap;
+    int i;
+    instance_t *ip;
+    double time;
+    int count=0;
+
+    for (i = 0; i < NBUCKETS; i++) {
+        ap = hash[i];
+        if (ap == NULL)
+            continue;
+        while (ap) {
+            if (ap->key == scatterkey){
+                ip = ap->first;
+                while (ip) {
+                    time = ((double)ip->time);
+                    printf ("%d\t%.0f\n", count++, time);
+                    ip = ip->next;
+                }
+                return;
+            }
+            ap = ap->next;
+        }
+    }
+}
+
+
+void fatal(char *s)
+{
+    fprintf(stderr, "%s", s);
+    fprintf(stderr, "\n");
+    exit(1);
+}
+
+typedef enum {
+    PASS1=1,
+} pass_t;
+
+typedef struct {
+    int (*pass1)(cpel_section_header_t *, int, FILE *);
+} section_processor_t;
+
+int bad_section(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    fprintf(ofp, "Bad (type 0) section, skipped...\n");
+    return(0);
+}
+
+int noop_pass(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    return(0);
+}
+
+int unsupported_pass (cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    if (verbose) {
+        fprintf(ofp, "Unsupported type %d section\n",
+                ntohl(sh->section_type));
+    }
+    return(0);
+}
+
+int trackdef_pass(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    int i, nevents;
+    track_definition_section_header_t *tdh;
+    track_definition_t *tp;
+    u32 track_code;
+    uword *p;
+    bound_track_t *btp;
+
+    tdh = (track_definition_section_header_t *)(sh+1);
+    nevents = ntohl(tdh->number_of_track_definitions);
+    
+    if (verbose) {
+        fprintf(stderr, "Track Definition Section: %d definitions\n",
+                nevents);
+    }
+
+    tp = (track_definition_t *)(tdh+1);
+    
+    for (i = 0; i < nevents; i++) {
+        track_code = ntohl(tp->track);
+        p = hash_get(the_trackdef_hash, track_code);
+        if (p) {
+            fprintf(ofp, "track %d redefined, retain first definition\n",
+                    track_code);
+            continue;
+        }
+        vec_add2(bound_tracks, btp, 1);
+        btp->track_code = track_code;
+        hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
+        tp++;
+    }
+    return (0);
+}
+
+
+int event_pass (cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    event_section_header_t *eh;
+    event_entry_t *ep;
+    f64 ticks_per_us;
+    long output_count;
+    long dup_events = 0;
+    ulonglong end_time = 0;
+    double t;
+    int sp, ancestor;
+    int nevents, i;
+    u64 now;
+    u64 time0, time1;
+    double d;
+    u32 last_track_code = 0xdeafb00b;
+    u32 track_code;
+    u32 event_code, event_datum;
+    bound_track_t *tp = 0;
+    uword *p;
+
+    output_count = 0;
+    total_time = 0;
+
+    eh = (event_section_header_t *)(sh+1);
+    nevents = ntohl(eh->number_of_events);
+    ticks_per_us = ((double)ntohl(eh->clock_ticks_per_second))/1e6;
+
+    if (verbose) {
+        fprintf(ofp, "%.3f ticks_per_us\n", ticks_per_us);
+    }
+
+    ep = (event_entry_t *)(eh+1);
+
+    time0 = ntohl (ep->time[0]);
+    time1 = ntohl (ep->time[1]);
+    
+    now = (((u64) time0)<<32) | time1;
+    d = now;
+    d /= ticks_per_us;
+    first_start_time = d;
+
+    for (i = 0; i < nevents; i++) {
+        time0 = ntohl (ep->time[0]);
+        time1 = ntohl (ep->time[1]);
+
+        now = (((u64) time0)<<32) | time1;
+        
+        /* Convert from bus ticks to usec */
+        d = now;
+        d /= ticks_per_us;
+
+        now = d;
+
+        track_code = ntohl(ep->track);
+        event_code = ntohl(ep->event_code);
+        event_datum = ntohl(ep->event_datum);
+
+        if (track_code != last_track_code) {
+            if (tp) {
+                tp->thread_timestamp += now - tp->time_thread_on_cpu;
+                tp->time_thread_on_cpu = 0;
+            }
+            p = hash_get(the_trackdef_hash, track_code);
+            if (!p) {
+                /* synthesize a new track */
+                vec_add2(bound_tracks, tp, 1);
+                tp->track_code = track_code;
+                hash_set(the_trackdef_hash, track_code, tp - bound_tracks);
+            } else {
+                tp = bound_tracks + p[0];
+            }
+            last_track_code = track_code;
+            tp->time_thread_on_cpu = now;
+        }
+
+        if (event_code != entry_event &&
+            event_code != exit_event) {
+            ep++;
+            continue;
+        }
+        
+    again:
+        switch (tp->state) {
+        case 0:                 /* not in state */
+            /* Another exit event? Stack pop */
+            if (event_code == exit_event) {
+                /* Only if we have something on the stack */
+                if (vec_len(tp->start_datum) > 0) {
+                    tp->state = 1;
+                    goto again;
+                } else {
+                    fprintf (stderr, 
+                             "End event before start event, key 0x%x.", 
+                             ntohl(ep->event_datum));
+                    fprintf (stderr, " Interpret results carefully...\n");
+                }
+            }
+
+            tp->state = 1;
+            if (vec_len(tp->start_datum) >= MAXSTACK) {
+                int j;
+
+                fprintf (stderr, "stack overflow..\n");
+                for (j = vec_len(tp->start_datum)-1; j >= 0; j--) {
+                    fprintf(stderr, "stack[%d]: datum 0x%x\n", 
+                            j, tp->start_datum[j]);
+                }
+                fprintf (stderr, 
+                         "Stack overflow... This occurs when "
+                         "(start, datum)...(end, datum) events\n"
+                         "are not properly paired.\n\n"
+                         "A typical scenario looks like this:\n\n"
+                         "    ...\n"
+                         "    ELOG(..., START_EVENT, datum);\n"
+                         "    if (condition)\n"
+                         "       return; /*oops, forgot the end event*/\n"
+                         "    ELOG(..., END_EVENT, datum);\n"
+                         "    ...\n\n"
+                         "The datum stack dump (above) should make it clear\n"
+                         "where to start looking for a sneak path...\n");
+
+                exit (1);
+            }
+            vec_add1(tp->start_datum, event_datum);
+            vec_add1(tp->start_time, (tp->thread_timestamp + (now - tp->time_thread_on_cpu)));
+#ifdef HAVING_TROUBLE
+            printf ("sp %lld key 0x%x start time %llu\n", 
+                    (long long) vec_len(tp->start_time)-1, event_datum, 
+                    (unsigned long long) 
+                    tp->start_time [vec_len(tp->start_time)-1]);
+            printf ("timestamp %llu, now %llu, thread on cpu %llu\n",
+                    (unsigned long long) tp->thread_timestamp, 
+                    (unsigned long long) now, 
+                    (unsigned long long) tp->time_thread_on_cpu);
+#endif
+            
+
+            
+            /* 
+             * Multiple identical enter events? If the user knows that
+             * gcc is producing bogus events due to inline functions,
+             * trash the duplicate.
+             */
+            if (inline_mokus 
+                && vec_len (tp->start_datum) > 1
+                && tp->start_datum [vec_len(tp->start_datum)-1] ==
+                tp->start_datum [vec_len(tp->start_datum)-2]) {
+                vec_add1 (tp->dup_event, 1);
+            } else {
+                vec_add1 (tp->dup_event, 0);
+            }
+
+
+            ep++;
+            continue;
+
+        case 1:                 /* in state */
+            /* Another entry event? Stack push*/
+            if (event_code == entry_event) {
+                tp->state = 0;
+                goto again;
+            }
+            
+            if (vec_len(tp->start_datum) == 0) {
+                fprintf (stderr, "Stack underflow...\n");
+                exit (1);
+            }
+
+            sp = vec_len(tp->start_time)-1;
+
+            end_time = tp->thread_timestamp + (now - tp->time_thread_on_cpu);
+
+            if (!tp->dup_event[sp]) {
+#ifdef HAVING_TROUBLE
+                printf ("sp %d key 0x%x charged %llu\n", sp, 
+                        tp->start_datum[sp], end_time - tp->start_time[sp]);
+                printf ("  start %llu, end %llu\n", (unsigned long long) tp->start_time[sp],
+                        (unsigned long long) end_time);
+#endif
+            
+                record_instance (tp->start_datum[sp], (end_time -
+                                                       tp->start_time[sp]));
+            
+                /* Factor out our time from surrounding services, if any */
+                for (ancestor = sp-1; ancestor >= 0; ancestor--) {
+#ifdef HAVING_TROUBLE
+                    printf ("Factor out %lld from key 0x%08x\n",
+                            (end_time - tp->start_time[sp]), tp->start_datum[ancestor]);
+#endif
+                    tp->start_time[ancestor] += (end_time - tp->start_time[sp]);
+                }
+                output_count++;
+                total_time += (end_time - tp->start_time[sp]);
+                tp->state = 0;
+            } else {
+                dup_events++;
+            }
+            _vec_len(tp->start_datum) = sp;
+            _vec_len(tp->start_time) = sp;
+            _vec_len(tp->dup_event) = sp;
+        }
+
+        ep++;
+    }
+    last_end_time = now;
+
+    if (scatterkey) {
+        scatterplot_data();
+        exit (0);
+    }
+
+    if (output_count) {
+        t = (double)total_time;
+        printf ("%ld instances of state, %.2f microseconds average\n",
+                output_count, t / output_count);
+
+        printf ("Total instrumented runtime: %.2f microseconds\n",
+                ((double)total_time));
+        printf ("Total runtime: %lld microseconds\n",
+                last_end_time - first_start_time);
+
+        t /= (double)(last_end_time - first_start_time);
+        t *= 100.0;
+
+        if (dup_events) {
+            printf ("Suppressed %ld duplicate state entry events\n",
+                    dup_events);
+        }
+        printf ("Instrumented code accounts for %.2f%% of total time.\n\n",
+                t);
+        report_actors();
+    } else {
+        printf ("No instances of state...\n");
+    }
+
+    return(0);
+}
+
+/* 
+ * Note: If necessary, add passes / columns to this table to 
+ * handle section order dependencies.
+ */
+
+section_processor_t processors[CPEL_NUM_SECTION_TYPES+1] =
+{
+    {unsupported_pass},		/* type 0 -- f**ked */
+    {noop_pass}, 		/* type 1 -- STRTAB */
+    {noop_pass}, 		/* type 2 -- SYMTAB */
+    {noop_pass},                /* type 3 -- EVTDEF */
+    {trackdef_pass},		/* type 4 -- TRACKDEF */
+    {event_pass},               /* type 5 -- EVENTS */
+};
+
+int process_section(cpel_section_header_t *sh, int verbose, FILE *ofp,
+                    pass_t pass)
+{
+    u32 type;
+    type = ntohl(sh->section_type);
+    int rv;
+    int (*fp)(cpel_section_header_t *, int, FILE *);
+
+    if (type > CPEL_NUM_SECTION_TYPES) {
+        fprintf(stderr, "Unknown section type %d\n", type);
+        return(1);
+    }
+    switch(pass) {
+    case PASS1:
+        fp = processors[type].pass1;
+        break;
+
+    default:
+        fprintf(stderr, "Unknown pass %d\n", pass);
+        return(1);
+    }
+
+    rv = (*fp)(sh, verbose, ofp);
+
+    return(rv);
+}
+
+char *mapfile (char *file)
+{
+    struct stat statb;
+    char *rv;
+    int maphfile;
+    size_t mapfsize;
+    
+    maphfile = open (file, O_RDONLY);
+
+    if (maphfile < 0)
+    {
+        fprintf (stderr, "Couldn't read %s, skipping it...\n", file);
+        return (NULL);
+    }
+
+    if (fstat (maphfile, &statb) < 0)
+    {
+        fprintf (stderr, "Couldn't get size of %s, skipping it...\n", file);
+        return (NULL);
+    }
+
+    /* Don't try to mmap directories, FIFOs, semaphores, etc. */
+    if (! (statb.st_mode & S_IFREG)) {
+        fprintf (stderr, "%s is not a regular file, skipping it...\n", file);
+        return (NULL);
+    }
+
+    mapfsize = statb.st_size;
+
+    if (mapfsize < 3)
+    {
+        fprintf (stderr, "%s zero-length, skipping it...\n", file);
+        close (maphfile);
+        return (NULL);
+    }
+
+    rv = mmap (0, mapfsize, PROT_READ, MAP_SHARED, maphfile, 0);
+
+    if (rv == 0)
+    {
+        fprintf (stderr, "%s problem mapping, I quit...\n", file);
+        exit (-1);
+    }
+    close (maphfile);
+    return (rv);
+}
+
+int process_file (u8 *cpel, int verbose)
+{
+    cpel_file_header_t *fh;
+    cpel_section_header_t *sh;
+    u16 nsections;
+    u32 section_size;
+    int i;
+    FILE *ofp = stderr;
+
+    /* First, the file header */
+    fh = (cpel_file_header_t *)cpel;
+    if (fh->endian_version != CPEL_FILE_VERSION) {
+        if (fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) {
+            fprintf(stderr, "Little endian data format not supported\n");
+            return(1);
+        }
+        fprintf(stderr, "Unsupported file version 0x%x\n", 
+                fh->endian_version);
+        return(1);
+    }
+    nsections = ntohs(fh->nsections);
+
+    /*
+     * Take a passe through the file. 
+     */
+    sh = (cpel_section_header_t *)(fh+1);
+    for (i = 0; i < nsections; i++) {
+        section_size = ntohl(sh->data_length);
+
+        if(verbose) {
+            fprintf(ofp, "Section type %d, size %d\n", 
+                    ntohl(sh->section_type),
+                    section_size);
+        }
+
+        if(process_section(sh, verbose, ofp, PASS1))
+            return(1);
+
+        sh++;
+        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
+    }
+
+    return(0);
+}
+
+/****************************************************************************
+* main - 
+****************************************************************************/
+
+int main (int argc, char **argv)
+{
+    int curarg = 1;
+    u8 *cpel = 0;
+    int verbose = 0;
+
+    if (argc < 6)
+    {
+        fprintf (stderr, "usage: cpelinreg -i <file>\n");
+        fprintf (stderr, "       -s start-event --e end-event [-nokey]\n");
+        fprintf (stderr, "       [-m <ninst-to-model>][-xtra-stats]\n");
+        fprintf (stderr, "       [-keyscatterplot <hex-key>]\n\n");
+        fprintf (stderr, "%s\n", version);
+        exit (1);
+    }
+
+    while (curarg < argc) {
+        if (!strncmp (argv[curarg], "-ifile", 2)) {
+            curarg++;
+            g_ifile = argv[curarg++];
+            continue;
+        }
+        if (!strncmp (argv[curarg], "-start", 2)) {
+            curarg++;
+            entry_event = atol (argv [curarg++]);
+            continue;
+        }
+        if (!strncmp (argv[curarg], "-end", 2)) {
+            curarg++;
+            exit_event = atol (argv [curarg++]);
+            continue;
+        }
+
+        if (!strncmp(argv[curarg], "-badinlines", 2)) {
+            curarg++;
+            inline_mokus = 1;
+            continue;
+        }
+
+        if (!strncmp (argv[curarg], "-x", 2)) {
+            curarg++;
+            summary_stats=1;
+            continue;
+        }
+        if (!strncmp (argv[curarg], "-nokey", 2)) {
+            curarg++;
+            nokey = 1;
+            continue;
+        }
+        if (!strncmp (argv[curarg], "-keyscatterplot", 2)) {
+            curarg++;
+            sscanf (argv[curarg], "%lx", &scatterkey);
+            curarg++;
+            continue;
+        }
+
+        if (!strncmp (argv[curarg], "-model", 2)) {
+            if (model_index >= sizeof(model_these) / sizeof(int)) {
+                fprintf (stderr, "Too many model requests\n");
+                exit (1);
+            }
+            curarg++;
+            model_these[model_index++] = atol (argv [curarg++]);
+            continue;
+        }
+        if (!strncmp (argv[curarg], "-verbose", 2)) {
+            verbose++;
+            curarg++;
+            continue;
+        }
+
+        fprintf (stderr, "unknown switch '%s'\n", argv[curarg]);
+        exit (1);
+    }
+                
+    cpel = (u8 *)mapfile(g_ifile);
+
+    if (cpel == NULL)
+    {
+        fprintf (stderr, "Couldn't open %s\n", g_ifile);
+        exit (1);
+    }
+
+    printf ("Extracting state info from %s\nentry_event %d, exit_event %d\n",
+            g_ifile, entry_event, exit_event);
+    if (nokey) {
+        printf ("All state instances mapped to a single actor chain\n");
+    }
+
+    the_trackdef_hash = hash_create (0, sizeof (uword));
+
+    process_file(cpel, verbose);
+    exit (0);
+}
diff --git a/src/tools/perftool/cpelstate.c b/src/tools/perftool/cpelstate.c
new file mode 100644
index 00000000..3fd9ccb9
--- /dev/null
+++ b/src/tools/perftool/cpelstate.c
@@ -0,0 +1,822 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2006-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <pwd.h>
+#include <stdarg.h>
+#include <time.h>
+#include "cpel.h"
+#include <math.h>
+
+char *time_format = "%.03d:%.02d:%.02d:%.03d:%.03d ";
+static char version[] = "cpelstate 2.0h";
+
+#define USEC_PER_MS 1000LL
+#define USEC_PER_SECOND (1000*USEC_PER_MS)
+#define USEC_PER_MINUTE (60*USEC_PER_SECOND)
+#define USEC_PER_HOUR (60*USEC_PER_MINUTE)
+
+uword *the_strtab_hash; /* (name, base-VA) hash of all string tables */
+uword *the_evtdef_hash; /* (event-id, event-definition) hash */
+uword *the_trackdef_hash; /* (track-id, track-definition) hash */
+
+f64 ticks_per_us;
+u32 state_event_code = 1;       /* default: XR thread-on-cpu */
+int exclude_kernel_from_summary_stats=1;
+int summary_stats_only;
+int scatterplot;
+u8 *name_filter;
+
+typedef enum {
+    SORT_MAX_TIME=1,
+    SORT_MAX_OCCURRENCES,
+    SORT_NAME,
+} sort_t;
+
+sort_t sort_type = SORT_MAX_TIME;
+
+int widest_name_format=5;
+int widest_track_format=5;
+
+typedef struct bound_event_ {
+    u32 event_code;
+    u8  *event_str;
+    u8  *datum_str;
+    u32  is_strtab_ref;
+} bound_event_t;
+
+bound_event_t *bound_events;
+
+typedef struct bound_track_ {
+    u32 track;
+    u8  *track_str;
+    u64 *ticks_in_state; /* vector of state occurrences */
+    f64  mean_ticks_in_state;
+    f64  variance_ticks_in_state;
+    f64  total_ticks_in_state;
+} bound_track_t;
+
+bound_track_t *bound_tracks;
+
+void fatal(char *s)
+{
+    fprintf(stderr, "%s", s);
+    exit(1);
+}
+
+typedef enum {
+    PASS1=1,
+    PASS2=2,
+} pass_t;
+
+typedef struct {
+    int (*pass1)(cpel_section_header_t *, int, FILE *);
+    int (*pass2)(cpel_section_header_t *, int, FILE *);
+} section_processor_t;
+
+int bad_section(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    fprintf(ofp, "Bad (type 0) section, skipped...\n");
+    return(0);
+}
+
+int noop_pass(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    return(0);
+}
+
+int strtab_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    uword *p;
+    u8 *strtab_data_area = (u8 *)(sh+1);
+    
+    /* Multiple string tables with the same name are Bad... */
+    p = hash_get_mem(the_strtab_hash, strtab_data_area);
+    if (p) {
+        fprintf(ofp, "Duplicate string table name %s", strtab_data_area);
+    }
+    /*
+     * Looks funny, but we really do want key = first string in the
+     * table, value = address(first string in the table) 
+     */
+    hash_set_mem(the_strtab_hash, strtab_data_area, strtab_data_area);
+    if (verbose) {
+        fprintf(ofp, "String Table %s\n", strtab_data_area);
+    }
+    return(0);
+}
+
+int evtdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    int i, nevents;
+    event_definition_section_header_t *edh;
+    event_definition_t *ep;
+    u8 *this_strtab;
+    u32 event_code;
+    uword *p;
+    bound_event_t *bp;
+    int thislen;
+
+    edh = (event_definition_section_header_t *)(sh+1);
+    nevents = ntohl(edh->number_of_event_definitions);
+    
+    if (verbose) {
+        fprintf(ofp, "Event Definition Section: %d definitions\n",
+                nevents);
+    }
+
+    p = hash_get_mem(the_strtab_hash, edh->string_table_name);
+    if (!p) {
+        fprintf(ofp, "Fatal: couldn't find string table\n");
+        return(1);
+    }
+    this_strtab = (u8 *)p[0];
+
+    ep = (event_definition_t *)(edh+1);
+    
+    for (i = 0; i < nevents; i++) {
+        event_code = ntohl(ep->event);
+        p = hash_get(the_evtdef_hash, event_code);
+        if (p) {
+            fprintf(ofp, "Event %d redefined, retain first definition\n",
+                    event_code);
+            continue;
+        }
+        vec_add2(bound_events, bp, 1);
+        bp->event_code = event_code;
+        bp->event_str = this_strtab + ntohl(ep->event_format);
+        bp->datum_str = this_strtab + ntohl(ep->datum_format);
+        bp->is_strtab_ref = 0;
+        /* Decide if the datum format is a %s format => strtab reference */
+        {
+            int j;
+            int seen_percent=0;
+
+            for (j = 0; j < strlen((char *)(bp->datum_str)); j++) {
+                if (bp->datum_str[j] == '%'){
+                    seen_percent=1;
+                    continue;
+                }
+                if (seen_percent && bp->datum_str[j] == 's') {
+                    bp->is_strtab_ref = 1;
+                }
+            }
+        }
+        
+        hash_set(the_evtdef_hash, event_code, bp - bound_events);
+
+        thislen = strlen((char *)bp->event_str);
+        if (thislen > widest_name_format)
+            widest_name_format = thislen;
+
+        ep++;
+    }
+    return (0);
+}
+
+int trackdef_pass1(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    int i, nevents;
+    track_definition_section_header_t *tdh;
+    track_definition_t *tp;
+    u8 *this_strtab;
+    u32 track_code;
+    uword *p;
+    bound_track_t *btp;
+    int thislen;
+
+    tdh = (track_definition_section_header_t *)(sh+1);
+    nevents = ntohl(tdh->number_of_track_definitions);
+    
+    if (verbose) {
+        fprintf(ofp, "Track Definition Section: %d definitions\n",
+                nevents);
+    }
+
+    p = hash_get_mem(the_strtab_hash, tdh->string_table_name);
+    if (!p) {
+        fprintf(ofp, "Fatal: couldn't find string table\n");
+        return(1);
+    }
+    this_strtab = (u8 *)p[0];
+
+    tp = (track_definition_t *)(tdh+1);
+    
+    for (i = 0; i < nevents; i++) {
+        track_code = ntohl(tp->track);
+        p = hash_get(the_trackdef_hash, track_code);
+        if (p) {
+            fprintf(ofp, "track %d redefined, retain first definition\n",
+                    track_code);
+            continue;
+        }
+        vec_add2(bound_tracks, btp, 1);
+        btp->track = track_code;
+        btp->track_str = this_strtab + ntohl(tp->track_format);
+        hash_set(the_trackdef_hash, track_code, btp - bound_tracks);
+
+        thislen = strlen((char *)(btp->track_str));
+        if (thislen > widest_track_format)
+            widest_track_format = thislen;
+        tp++;
+    }
+    return (0);
+}
+
+int unsupported_pass (cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    if (verbose) {
+        fprintf(ofp, "Unsupported type %d section\n",
+                ntohl(sh->section_type));
+    }
+    return(0);
+}
+
+int event_pass2(cpel_section_header_t *sh, int verbose, FILE *ofp)
+{
+    event_section_header_t *eh;
+    u32 track_code;
+    int nevents;
+    int i;
+    uword *p;
+    event_entry_t *ep;
+    u64 now;
+    u32 time0, time1;
+    bound_track_t generic_track;
+    u32 last_track_code;
+    u64 state_start_ticks=0;
+    u64 ticks_in_state;
+    bound_track_t *state_track=0;
+    int in_state=0;
+    generic_track.track_str = (u8 *) "%d";
+    last_track_code = 0xdeafbeef;
+
+    eh = (event_section_header_t *)(sh+1);
+    nevents = ntohl(eh->number_of_events);
+    ticks_per_us = ((double)ntohl(eh->clock_ticks_per_second))/1e6;
+
+    if (verbose) {
+        fprintf(ofp, "%.3f ticks_per_us\n", ticks_per_us);
+    }
+
+    ep = (event_entry_t *)(eh+1);
+
+    p = hash_get_mem(the_strtab_hash, eh->string_table_name);
+    if (!p) {
+        fprintf(ofp, "Fatal: couldn't find string table\n");
+        return(1);
+    }
+
+    for (i = 0; i < nevents; i++) {
+        time0 = ntohl (ep->time[0]);
+        time1 = ntohl (ep->time[1]);
+
+        now = (((u64) time0)<<32) | time1;
+
+        /* Found the state-change event ? */
+        if (ntohl(ep->event_code) == state_event_code) {
+            /*
+             * Add a ticks-in-state record, unless
+             * this is the "prime mover" event instance 
+             */
+            if (in_state) {
+                ticks_in_state = now - state_start_ticks;
+                vec_add1(state_track->ticks_in_state, ticks_in_state);
+            }
+            /* switch to now-current track */
+            state_start_ticks = now;
+            track_code = ntohl(ep->track);
+            if (track_code != last_track_code) {
+                p = hash_get(the_trackdef_hash, track_code);
+                if (p) {
+                    state_track = &bound_tracks[p[0]];
+                } else {
+                    state_track = &generic_track;
+                }
+                last_track_code = track_code;
+            }
+            in_state = 1;
+        }
+        ep++;
+    }
+    return(0);
+}
+
+/* 
+ * Note: If necessary, add passes / columns to this table to 
+ * handle section order dependencies.
+ */
+
+section_processor_t processors[CPEL_NUM_SECTION_TYPES+1] =
+{
+    {bad_section,	noop_pass}, 		/* type 0 -- f**ked */
+    {strtab_pass1, 	noop_pass}, 		/* type 1 -- STRTAB */
+    {unsupported_pass,  noop_pass}, 		/* type 2 -- SYMTAB */
+    {evtdef_pass1,      noop_pass},             /* type 3 -- EVTDEF */
+    {trackdef_pass1,    noop_pass},		/* type 4 -- TRACKDEF */
+    {noop_pass,         event_pass2},           /* type 5 -- EVENTS */
+};
+
+
+int process_section(cpel_section_header_t *sh, int verbose, FILE *ofp,
+                    pass_t pass)
+{
+    u32 type;
+    type = ntohl(sh->section_type);
+    int rv;
+    int (*fp)(cpel_section_header_t *, int, FILE *);
+
+    if (type > CPEL_NUM_SECTION_TYPES) {
+        fprintf(stderr, "Unknown section type %d\n", type);
+        return(1);
+    }
+    switch(pass) {
+    case PASS1:
+        fp = processors[type].pass1;
+        break;
+
+    case PASS2:
+        fp = processors[type].pass2;
+        break;
+        
+    default:
+        fprintf(stderr, "Unknown pass %d\n", pass);
+        return(1);
+    }
+
+    rv = (*fp)(sh, verbose, ofp);
+
+    return(rv);
+}
+
+int cpel_dump_file_header(cpel_file_header_t *fh, int verbose, FILE *ofp)
+{
+    time_t file_time;
+
+    if (verbose) {
+        fprintf(ofp, "CPEL file: %s-endian, version %d\n",
+                ((fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) ? 
+                 "little" : "big"), 
+                fh->endian_version & CPEL_FILE_VERSION_MASK);
+
+        file_time = ntohl(fh->file_date);
+        
+        fprintf(ofp, "File created %s", ctime(&file_time));
+        fprintf(ofp, "File has %d sections\n", 
+                ntohs(fh->nsections));
+    }
+
+    return(0);
+}
+
+
+int cpel_dump(u8 *cpel, int verbose, FILE *ofp)
+{
+    cpel_file_header_t *fh;
+    cpel_section_header_t *sh;
+    u16 nsections;
+    u32 section_size;
+    int i;
+
+    /* First, the file header */
+    fh = (cpel_file_header_t *)cpel;
+    if (fh->endian_version != CPEL_FILE_VERSION) {
+        if (fh->endian_version & CPEL_FILE_LITTLE_ENDIAN) {
+            fprintf(stderr, "Little endian data format not supported\n");
+            return(1);
+        }
+        fprintf(stderr, "Unsupported file version 0x%x\n", 
+                fh->endian_version);
+        return(1);
+    }
+    cpel_dump_file_header(fh, verbose, ofp);
+    nsections = ntohs(fh->nsections);
+
+    /*
+     * Take two passes through the file. PASS1 builds
+     * data structures, PASS2 actually dumps the file.
+     * Just in case the sections are in an unobvious order.
+     */
+    sh = (cpel_section_header_t *)(fh+1);
+    for (i = 0; i < nsections; i++) {
+        section_size = ntohl(sh->data_length);
+
+        if(verbose) {
+            fprintf(ofp, "Section type %d, size %d\n", ntohl(sh->section_type),
+                    section_size);
+        }
+
+        if(process_section(sh, verbose, ofp, PASS1))
+            return(1);
+
+        sh++;
+        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
+    }
+
+    sh = (cpel_section_header_t *)(fh+1);
+    for (i = 0; i < nsections; i++) {
+        if(process_section(sh, verbose, ofp, PASS2))
+            return(1);
+        section_size = ntohl(sh->data_length);
+        sh++;
+        sh = (cpel_section_header_t *)(((u8 *)sh)+section_size);
+    }
+    return(0);
+}
+
+void compute_state_statistics(int verbose, FILE *ofp)
+{
+    int i, j;
+    bound_track_t *bp;
+    f64 fticks;
+
+    /* Across the bound tracks */
+    for (i = 0; i < vec_len(bound_tracks); i++) {
+        bp = &bound_tracks[i];
+        bp->mean_ticks_in_state = 0.0;
+        bp->variance_ticks_in_state = 0.0;
+        bp->total_ticks_in_state = 0.0;
+        for (j = 0; j < vec_len(bp->ticks_in_state); j++) {
+            bp->total_ticks_in_state += (f64) bp->ticks_in_state[j];
+        }
+        /* Compute mean */
+        if (vec_len(bp->ticks_in_state)) {
+            bp->mean_ticks_in_state = bp->total_ticks_in_state / 
+                ((f64) vec_len(bp->ticks_in_state));
+        }
+        /* Accumulate sum: (Xi-Xbar)**2 */
+        for (j = 0; j < vec_len(bp->ticks_in_state); j++) {
+            fticks = bp->ticks_in_state[j];
+            bp->variance_ticks_in_state += 
+                (fticks - bp->mean_ticks_in_state)*
+                (fticks - bp->mean_ticks_in_state);
+        }
+        /* Compute s**2, the unbiased estimator of sigma**2 */
+        if (vec_len(bp->ticks_in_state) > 1) {
+            bp->variance_ticks_in_state /= (f64) 
+                (vec_len(bp->ticks_in_state)-1);
+        }
+    }
+}
+
+int track_compare_max (const void *arg1, const void *arg2)
+{
+    bound_track_t *a1 = (bound_track_t *)arg1;
+    bound_track_t *a2 = (bound_track_t *)arg2;
+    f64 v1, v2;
+
+    v1 = a1->total_ticks_in_state;
+    v2 = a2->total_ticks_in_state;
+    
+    if (v1 < v2)
+        return (1);
+    else if (v1 == v2)
+        return (0);
+    else return (-1);
+}
+
+int track_compare_occurrences (const void *arg1, const void *arg2)
+{
+    bound_track_t *a1 = (bound_track_t *)arg1;
+    bound_track_t *a2 = (bound_track_t *)arg2;
+    f64 v1, v2;
+
+    v1 = (f64) vec_len(a1->ticks_in_state);
+    v2 = (f64) vec_len(a2->ticks_in_state);
+    
+    if (v1 < v2)
+        return (1);
+    else if (v1 == v2)
+        return (0);
+    else return (-1);
+}
+
+int track_compare_name (const void *arg1, const void *arg2)
+{
+    bound_track_t *a1 = (bound_track_t *)arg1;
+    bound_track_t *a2 = (bound_track_t *)arg2;
+
+    return (strcmp((char *)(a1->track_str), (char *)(a2->track_str)));
+}
+
+void sort_state_statistics(sort_t type, FILE *ofp)
+{
+    int (*compare)(const void *, const void *)=0;
+
+    if (summary_stats_only)
+        return;
+
+    switch(type) {
+    case SORT_MAX_TIME:
+        fprintf(ofp, "Results sorted by max time in state.\n");
+        compare = track_compare_max;
+        break;
+
+    case SORT_MAX_OCCURRENCES:
+        fprintf(ofp, "Results sorted by max occurrences of state.\n");
+        compare = track_compare_occurrences;
+        break;
+
+    case SORT_NAME:
+        compare = track_compare_name;
+        fprintf(ofp, "Results sorted by process-id/name/thread ID\n");
+        break;
+
+    default:
+        fatal("sort type not set?");
+    }
+    
+    qsort (bound_tracks, vec_len(bound_tracks), 
+           sizeof (bound_track_t), compare);    
+}
+
+void print_state_statistics(int verbose, FILE *ofp)
+{
+    int i,j;
+    u8 *trackpad;
+    bound_track_t *bp;
+    f64 total_time = 0.0;
+    f64 total_switches = 0.0;
+
+    trackpad = format(0, "%%-%ds ", widest_track_format);
+    vec_add1(trackpad, 0);
+
+    if (!summary_stats_only) {
+        fprintf(ofp, (char *)trackpad, "ProcThread");
+        fprintf(ofp, "  Mean(us)     Stdev(us)   Total(us)      N\n");
+    }
+        
+    for (i = 0; i < vec_len(bound_tracks); i++) {
+        bp = &bound_tracks[i];
+        if (bp->mean_ticks_in_state == 0.0)
+            continue;
+
+        if (name_filter &&
+            strncmp((char *)(bp->track_str), (char *)name_filter, 
+                    strlen((char *)name_filter)))
+            continue;
+
+        /*
+         * Exclude kernel threads (e.g. idle thread) from
+         * state statistics 
+         */
+        if (exclude_kernel_from_summary_stats && 
+            !strncmp((char *)(bp->track_str), "kernel ", 7))
+            continue;
+
+        total_switches += (f64) vec_len(bp->ticks_in_state);
+        
+        if (!summary_stats_only) {
+            fprintf(ofp, (char *) trackpad, bp->track_str);
+            fprintf(ofp, "%10.3f +- %10.3f", 
+                    bp->mean_ticks_in_state / ticks_per_us,
+                    sqrt(bp->variance_ticks_in_state) 
+                    / (f64) ticks_per_us);
+            fprintf(ofp, "%12.3f", 
+                    bp->total_ticks_in_state / ticks_per_us);
+            fprintf(ofp, "%8d\n", (int)vec_len(bp->ticks_in_state));
+        }
+
+        if (scatterplot) {
+            for (j = 0; j < vec_len(bp->ticks_in_state); j++) {
+                fprintf(ofp, "%.3f\n", 
+                        (f64)bp->ticks_in_state[j] / ticks_per_us);
+            }
+        }
+
+        total_time += bp->total_ticks_in_state;
+    }
+    
+    if (!summary_stats_only)
+        fprintf(ofp, "\n");
+    fprintf(ofp, "Note: the following statistics %s kernel-thread activity.\n",
+            exclude_kernel_from_summary_stats ? "exclude" : "include");
+    if (name_filter)
+        fprintf(ofp, 
+                "Note: only pid/proc/threads matching '%s' are included.\n",
+                name_filter);
+
+    fprintf(ofp, 
+      "Total runtime: %10.3f (us), Total state switches: %.0f\n", 
+            total_time / ticks_per_us, total_switches);
+    fprintf(ofp, "Average time in state: %10.3f (us)\n",
+            (total_time / total_switches) / ticks_per_us);
+}
+
+char *mapfile (char *file)
+{
+    struct stat statb;
+    char *rv;
+    int maphfile;
+    size_t mapfsize;
+    
+    maphfile = open (file, O_RDONLY);
+
+    if (maphfile < 0)
+    {
+        fprintf (stderr, "Couldn't read %s, skipping it...\n", file);
+        return (NULL);
+    }
+
+    if (fstat (maphfile, &statb) < 0)
+    {
+        fprintf (stderr, "Couldn't get size of %s, skipping it...\n", file);
+        return (NULL);
+    }
+
+    /* Don't try to mmap directories, FIFOs, semaphores, etc. */
+    if (! (statb.st_mode & S_IFREG)) {
+        fprintf (stderr, "%s is not a regular file, skipping it...\n", file);
+        return (NULL);
+    }
+
+    mapfsize = statb.st_size;
+
+    if (mapfsize < 3)
+    {
+        fprintf (stderr, "%s zero-length, skipping it...\n", file);
+        close (maphfile);
+        return (NULL);
+    }
+
+    rv = mmap (0, mapfsize, PROT_READ, MAP_SHARED, maphfile, 0);
+
+    if (rv == 0)
+    {
+        fprintf (stderr, "%s problem mapping, I quit...\n", file);
+        exit (-1);
+    }
+    close (maphfile);
+    return (rv);
+}
+
+/*
+ * main 
+ */
+int main (int argc, char **argv)
+{
+    char *cpel_file = 0;
+    char *outputfile = 0;
+    FILE *ofp;
+    char *cpel;
+    int verbose=0;
+    int curarg=1;
+
+    while (curarg < argc) {
+        if (!strncmp(argv[curarg], "--input-file", 3)) {
+            curarg++;
+            if (curarg < argc) {
+                cpel_file = argv[curarg];
+                curarg++;
+                continue;
+            }
+            fatal("Missing filename after --input-file\n");
+        }
+        if (!strncmp(argv[curarg], "--output-file", 3)) {
+            curarg ++;
+            if (curarg < argc) {
+                outputfile = argv[curarg];
+                curarg ++;
+                continue;
+            }
+            fatal("Missing filename after --output-file\n");
+        }
+        if (!strncmp(argv[curarg], "--verbose", 3)) {
+            curarg++;
+            verbose++;
+            continue;
+        }
+        if (!strncmp(argv[curarg], "--scatterplot", 4)) {
+            curarg++;
+            scatterplot=1;
+            continue;
+        }
+
+        if (!strncmp(argv[curarg], "--state-event", 4)) {
+            curarg++;
+            if (curarg < argc) {
+                state_event_code = atol(argv[curarg]);
+                curarg ++;
+                continue;
+            }
+            fatal("Missing integer after --state-event\n");
+        }
+        if (!strncmp(argv[curarg], "--max-time-sort", 7)) {
+            sort_type = SORT_MAX_TIME;
+            curarg++;
+            continue;
+        }
+        if (!strncmp(argv[curarg], "--max-occurrence-sort", 7)) {
+            sort_type = SORT_MAX_OCCURRENCES;
+            curarg++;
+            continue;
+        }
+        if (!strncmp(argv[curarg], "--name-sort", 3)) {
+            sort_type = SORT_NAME;
+            curarg++;
+            continue;
+        }
+        if (!strncmp(argv[curarg], "--kernel-included", 3)) {
+            exclude_kernel_from_summary_stats = 0;
+            curarg++;
+            continue;
+        }
+        if (!strncmp(argv[curarg], "--summary", 3)) {
+            summary_stats_only=1;
+            curarg++;
+            continue;
+        }
+        if (!strncmp(argv[curarg], "--filter", 3)) {
+            curarg ++;
+            if (curarg < argc) {
+                name_filter = (u8 *)argv[curarg];
+                curarg ++;
+                continue;
+            }
+            fatal("Missing filter string after --filter\n");
+        }
+        
+
+    usage:
+        fprintf(stderr, 
+          "cpelstate --input-file <filename> [--output-file <filename>]\n");
+        fprintf(stderr, 
+          "          [--state-event <decimal>] [--verbose]\n");
+        fprintf(stderr, 
+          "          [--max-time-sort(default) | --max-occurrence-sort |\n");
+
+        fprintf(stderr, 
+          "           --name-sort-sort] [--kernel-included]\n");
+
+        fprintf(stderr, 
+          "          [--summary-stats-only] [--scatterplot]\n");
+
+        fprintf(stderr, "%s\n", version);
+        exit(1);
+    }
+
+    if (cpel_file == 0)
+        goto usage;
+
+    cpel = mapfile(cpel_file);
+    if (cpel == 0) {
+        fprintf(stderr, "Couldn't map %s...\n", cpel_file);
+        exit(1);
+    }
+
+    if (!outputfile) {
+        ofp = fdopen(1, "w");
+        if (ofp == NULL) {
+            fprintf(stderr, "Couldn't fdopen(1)?\n");
+            exit(1);
+        }
+    } else {
+        ofp = fopen(outputfile, "w");
+        if (ofp == NULL) {
+            fprintf(stderr, "Couldn't create %s...\n", outputfile);
+            exit(1);
+        }
+    }
+
+    the_strtab_hash = hash_create_string (0, sizeof (uword));
+    the_evtdef_hash = hash_create (0, sizeof (uword));
+    the_trackdef_hash = hash_create (0, sizeof (uword));
+
+    if (cpel_dump((u8 *) cpel, verbose, ofp)) {
+        if (outputfile)
+            unlink(outputfile);
+    }
+
+    compute_state_statistics(verbose, ofp);
+    sort_state_statistics(sort_type, ofp);
+    print_state_statistics(verbose, ofp);
+
+    fclose(ofp);
+    return(0);
+}
diff --git a/src/tools/perftool/delsvec.c b/src/tools/perftool/delsvec.c
new file mode 100644
index 00000000..724935d3
--- /dev/null
+++ b/src/tools/perftool/delsvec.c
@@ -0,0 +1,315 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2006-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Break up a delimited string into a vector of substrings */
+
+#include <stdio.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <stdarg.h>
+
+/*
+ * #define UNIT_TESTS 1
+ * #define MATCH_TRACE 1 
+ */
+
+/*
+ * delsvec
+ * break up an input string into a vector of [null-terminated] u8 *'s
+ * 
+ * Each supplied delimiter character results in a string in the output
+ * vector, unless the delimiters occur back-to-back.  When matched,
+ * a whitespace character in the delimiter consumes an arbitrary
+ * run of whitespace. See the unit tests at the end of this file
+ * for a set of examples.
+ *
+ * Returns a u8 **, or NULL if the input fails to match.  It is assumed
+ * that both input and fmt are C strings, not necessarily vectors.
+ *
+ * Output strings are both vectors and proper C strings.
+ */
+
+static u8 **string_cache;
+static u8 **svec_cache;
+
+void delsvec_recycle_this_string (u8 *s)
+{
+    if (s) {
+        _vec_len (s) = 0;
+        vec_add1(string_cache, s);
+    }
+}
+
+void delsvec_recycle_this_svec (u8 **svec)
+{
+    if (svec) {
+        if (svec_cache) {
+            vec_free (svec_cache);
+        }
+        _vec_len (svec) = 0;
+        svec_cache = svec;
+    }
+}
+
+int pvl (char *a)
+{
+    return vec_len(a);
+}
+
+u8 **delsvec(void *input_arg, char *fmt)
+{
+    u8 **rv = 0;
+    int input_index=0;
+    u8 *this;
+    int dirflag=0;
+    int i;
+    u8 *input = input_arg;
+
+    if (svec_cache) {
+        rv = svec_cache;
+        svec_cache = 0;
+    }
+
+    while (fmt) {
+        dirflag=0;
+        if (vec_len (string_cache) > 0) {
+            this = string_cache [vec_len(string_cache)-1];
+            _vec_len (string_cache) = vec_len (string_cache) - 1;
+        } else 
+            this = 0;
+        /*
+         * '*' means one of two things: match the rest of the input, 
+         * or match as many characters as possible 
+         */
+        if (fmt[0] == '*') {
+            fmt++;
+            dirflag=1;
+            /*
+             * no more format: eat rest of string... 
+             */
+            if (!fmt[0]) {
+                for (;input[input_index]; input_index++)
+                    vec_add1(this, input[input_index]);
+                if (vec_len(this)) {
+                    vec_add1(this, 0);
+#ifdef MATCH_TRACE
+                    printf("final star-match adds: '%s'\n", this);
+#endif
+                    vec_add1(rv, this);
+                } else {
+                    vec_add1(string_cache, this);
+                }
+
+                return(rv);
+            }
+        }
+        /*
+         * Left-to-right scan, adding chars until next delimiter char 
+         * appears.
+         */
+        if (!dirflag) {
+            while (input[input_index]) {
+                if (input[input_index] == fmt[0]) {
+                    /* If we just (exact) matched a whitespace delimiter */
+                    if (fmt[0] == ' '){
+                        /* scan forward eating whitespace */
+                        while (input[input_index] == ' ' ||
+                               input[input_index] == '\t' ||
+                               input[input_index] == '\n')
+                            input_index++;
+                        input_index--;
+                    }
+                    goto found;
+                }
+                /* If we're looking for whitespace */
+                if (fmt[0] == ' ') {
+                    /* and we have whitespace */
+                    if (input[input_index] == ' ' ||
+                        input[input_index] == '\t' ||
+                        input[input_index] == '\n') {
+                        /* scan forward eating whitespace */
+                        while (input[input_index] == ' ' ||
+                               input[input_index] == '\t' ||
+                               input[input_index] == '\n') {
+                            input_index++;
+                        }
+                        input_index--;
+                        goto found;
+                    }
+                }
+                /* Not a delimiter, save it */
+                vec_add1(this, input[input_index]);
+                input_index++;
+            }
+            /*
+             * Fell off the wagon, clean up and bail out 
+             */
+        bail:
+
+#ifdef MATCH_TRACE
+            printf("failed, fmt[0] = '%c', input[%d]='%s'\n",
+                   fmt[0], input_index, &input[input_index]);
+#endif
+            delsvec_recycle_this_string(this);
+            for (i = 0; i < vec_len(rv); i++)
+                delsvec_recycle_this_string(rv[i]);
+            delsvec_recycle_this_svec(rv);
+            return(0);
+            
+        found:
+            /*
+             * Delimiter matched
+             */
+            input_index++;
+            fmt++;
+            /*
+             * If we actually accumulated non-delimiter characters,
+             * add them to the result vector
+             */
+            if (vec_len(this)) {
+                vec_add1(this, 0);
+#ifdef MATCH_TRACE
+                printf("match: add '%s'\n", this);
+#endif
+                vec_add1(rv, this);
+            } else {
+                vec_add1(string_cache, this);
+            }
+        } else { 
+            /*
+             * right-to-left scan, '*' not at 
+             * the end of the delimiter string 
+             */
+            i = input_index;
+            while (input[++i])
+                ; /* scan forward */
+            i--;
+            while (i > input_index) {
+                if (input[i] == fmt[0])
+                    goto found2;
+                
+                if (fmt[0] == ' ' || fmt[0] == '\t' ||
+                    fmt[0] == '\n') {
+                    if (input[i] == ' ' ||
+                        input[i] == '\t' ||
+                        input[i] == '\n')
+                        goto found2;
+                }
+                i--;
+            }
+            goto bail;
+
+        found2:
+            for (; input_index < i; input_index++) {
+                vec_add1(this, input[input_index]);
+            }
+            input_index++;
+            fmt++;
+            vec_add1(this, 0);
+#ifdef MATCH_TRACE
+                printf("inner '*' match: add '%s'\n", this);
+#endif
+            vec_add1(rv, this);
+        }
+    }
+    return (rv);
+}
+
+#ifdef UNIT_TESTS
+
+typedef struct utest_ {
+    char *string;
+    char *fmt;
+} utest_t;
+
+utest_t tests[] = {
+#ifdef NOTDEF
+    {"Dec  7 08:56",
+     "  :*"},
+    {"Dec 17 08:56",
+     "  :*"},
+    {"Dec  7 08:56:41.239 install/inst_repl 0/9/CPU0 t1  [40989] File List:Successfully blobbified file list. Took 1 milliseconds",
+     "  ::. / //  [] *"},
+    {"RP/0/9/CPU0:Dec  7 08:55:28.550 : sam_server[291]: SAM backs up digest list to memory file",
+     "///:  ::. : []: *"},
+    /* Expected to fail */
+    {"Dec  7 08:56:41.239 install/inst_repl 0/9/CPU0 t1  [40989] File List:Successfully blobbified file list. Took 1 milliseconds",
+     "///:  ::. : : *"},
+    /* Expected to fail */
+    {"RP/0/9/CPU0:Dec  7 08:55:28.550 : sam_server[291]: SAM backs up digest list to memory file",
+     "  ::. / //  [] *"},
+    {"THIS that and + theother", "*+ *"}, 
+    {"Dec 12 15:33:07.103 ifmgr/errors 0/RP0/CPU0 3# t2  Failed to open IM connection: No such file or directory", "  ::. / //   *"}, 
+    {"Dec 16 21:43:47.328 ifmgr/bulk 0/3/CPU0 t8  Bulk DPC async download complete. Partitions 1, node_count 1, total_out 0, out_offset 0, out_expected 0: No error","  ::. / //  *"},
+    {"t:0x53034bd6 CPU:00 PROCESS :PROCCREATE_NAME",
+     ": :  :*"},
+    {"                       pid:1", " *"},
+    {"t:0x53034cbb CPU:00 THREAD  :THCREATE      pid:1 tid:1",
+     ": :  : pid: tid:*"},
+    {"t:0x5303f950 CPU:00 COMM    :REC_PULSE     scoid:0x40000003 pid:364659",
+     ": :  : *"},
+    {"/hfr-base-3.3.85/lib/libttyconnection.dll 0xfc000000 0x0000306c 0xfc027000 0x000001c8    1", 
+     "     *"},
+    {"Feb 28 02:38:26.123 seqtrace 0/1/CPU0 t8  :msg_receive:ifmgr/t8:IMC_MSG_MTU_UPDATE:ppp_ma/t1", 
+     "  ::.  //  ::::*"},
+
+    {"Feb 28 02:38:26.123 seqtrace 0/1/CPU0 t8  :msg_send_event:call:ifmgr/t8:124/0:cdp/t1", 
+     "  ::.  //  :msg_send_event::::*"},
+
+    {"Feb 28 02:38:26.125 seqtrace 0/1/CPU0 t1  :msg_receive_event:cdp/t1:124/0", 
+     "  ::.  //  :msg_receive_event::*"}
+    {"t:0x645dd86d CPU:00 USREVENT:EVENT:100, d0:0x00000002 d1:0x00000000",
+     ": : USREVENT:EVENT:, d0: *"}
+    {"t:0x5303f950 CPU:00 COMM    :REC_PULSE     scoid:0x40000003 pid:364659",
+     ": :  : *"},
+    {"t:0x2ccf9f5a CPU:00 INT_ENTR:0x80000000 (-2147483648)       IP:0x002d8b18", 
+     ": : INT_ENTR:  IP:*"}
+    {"t:0xd473951c CPU:00 KER_EXIT:SCHED_GET/88 ret_val:2 sched_priority:10",
+     ": : KER_EXIT:SCHED_GET : sched_priority:*"}
+    {"t:0x00000123 CPU:01 SYSTEM  :FUNC_ENTER thisfn:0x40e62048 call_site:0x00000000",
+    ": : SYSTEM :FUNC_ thisfn: *"},
+    {"t:0x5af8de95 CPU:00 INT_HANDLER_ENTR:0x0000004d (77)       PID:8200 IP:0x00000000 AREA:0x0bf9b290", ": : INT_HANDLER_*"},
+#endif
+    {"t:0x6d1ff92f CPU:00 CONTROL: BUFFER sequence = 1053, num_events = 714",
+     ": : CONTROL*"},
+    {"t:0x6d1ff92f CPU:00 CONTROL :TIME msb:0x0000003c lsb(offset):0x6d1ff921",
+     ": : CONTROL*"},
+};
+
+int main (int argc, char **argv)
+{
+    int i, j;
+    u8 **svec;
+
+    for (j = 0; j < ARRAY_LEN(tests); j++) {
+        printf ("input string: '%s'\n", tests[j].string);
+        printf ("delimiter arg: '%s'\n", tests[j].fmt);
+        printf ("parse trace:\n");
+        svec = delsvec(tests[j].string, tests[j].fmt);
+        if (!svec) {
+            printf("index %d failed\n", j);
+            continue;
+        }
+        printf("%d substring vectors\n", vec_len(svec));
+        for (i = 0; i < vec_len(svec); i++) {
+            printf("[%d]: '%s'\n", i, svec[i]);
+        }
+        printf ("-------------------\n");
+    }
+    exit(0);
+}
+#endif
diff --git a/src/tools/perftool/linreg.c b/src/tools/perftool/linreg.c
new file mode 100644
index 00000000..084091bb
--- /dev/null
+++ b/src/tools/perftool/linreg.c
@@ -0,0 +1,78 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2006-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* see "Numerical Recipies in C, 2nd ed." p 665 */
+
+#include <stdio.h>
+#include <math.h>
+
+/*
+ * linreg
+ * Linear regression of (xi, yi), returns parameters for least-squares
+ * fit y = a + bx.  Also, compute Pearson's R.
+ */
+void linreg (double *x, double *y, int nitems, double *a, double *b,
+             double *minp, double *maxp, double *meanp, double *r)
+{
+    double sx = 0.0;
+    double sy = 0.0;
+    double st2 = 0.0;
+    double min = y[0];
+    double max = 0.0;
+    double ss, meanx, meany, t;
+    double errx, erry, prodsum, sqerrx, sqerry;
+    int i;
+
+    *b = 0.0;
+    
+    for (i = 0; i < nitems; i++) {
+        sx += x[i];
+        sy += y[i];
+        if (y[i] < min)
+            min = y[i];
+        if (y[i] > max)
+            max = y[i];
+    }
+    ss = nitems;
+    meanx = sx / ss;
+    meany = *meanp = sy / ss;
+    *minp = min;
+    *maxp = max;
+
+    for (i = 0; i < nitems; i++) {
+        t = x[i] - meanx;
+        st2 += t*t;
+        *b += t*y[i];
+    }
+
+    *b /= st2;
+    *a = (sy-sx*(*b))/ss;
+
+    prodsum = 0.0;
+    sqerrx = 0.0;
+    sqerry = 0.0;
+
+    /* Compute numerator of Pearson's R */
+    for (i = 0; i < nitems; i++) {
+        errx = x[i] - meanx;
+        erry = y[i] - meany;
+        prodsum += errx * erry;
+        sqerrx += errx*errx;
+        sqerry += erry*erry;
+    }
+
+    *r = prodsum / (sqrt(sqerrx)*sqrt(sqerry));
+}
diff --git a/src/tools/perftool/new.cpel b/src/tools/perftool/new.cpel
new file mode 100644
index 00000000..b0f35958
Binary files /dev/null and b/src/tools/perftool/new.cpel differ
diff --git a/src/tools/perftool/new.elog b/src/tools/perftool/new.elog
new file mode 100644
index 00000000..2d99bb16
Binary files /dev/null and b/src/tools/perftool/new.elog differ
diff --git a/src/tools/perftool/props.c b/src/tools/perftool/props.c
new file mode 100644
index 00000000..84af5b1c
--- /dev/null
+++ b/src/tools/perftool/props.c
@@ -0,0 +1,280 @@
+/* 
+ *------------------------------------------------------------------
+ * Copyright (c) 2006-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <ctype.h>
+#include <malloc.h>
+#include <time.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+static char *sxerox (char *s);
+
+#define NBUCKETS 97
+
+typedef struct prop_ {
+    struct prop_ *next;
+    char *name;
+    char *value;
+} prop_t;
+
+static prop_t *buckets [NBUCKETS];
+static int hash_shifts[4] = {24, 16, 8, 0};
+
+/*
+ * getprop 
+ */
+
+char *getprop (char *name)
+{
+    unsigned char *cp;
+    unsigned long hash=0;
+    prop_t *bp;
+    int i=0;
+
+    for (cp = (unsigned char *) name; *cp; cp++)
+        hash ^= (*cp)<<(hash_shifts[(i++)&0x3]);
+
+    bp = buckets [hash%NBUCKETS];
+
+    while (bp && strcmp(bp->name, name)) {
+        bp = bp->next;
+    }
+
+    if (bp == NULL)
+        return (0);
+    else
+        return (bp->value);
+}
+
+/*
+ * getprop_default
+ */
+
+char *getprop_default (char *name, char *def)
+{
+    char *rv;
+    rv = getprop (name);
+    if (rv)
+        return (rv);
+    else
+        return (def);
+}
+
+/*
+ * addprop
+ */
+
+void addprop (char *name, char *value)
+{
+    unsigned char *cp;
+    unsigned long hash=0;
+    prop_t **bpp;
+    prop_t *bp;
+    int i=0;
+
+    bp = (prop_t *)malloc (sizeof (prop_t));
+
+    bp->next = 0;
+    bp->name = sxerox (name);
+    bp->value = sxerox (value);
+
+    for (cp = (unsigned char *)name; *cp; cp++)
+        hash ^= (*cp)<<(hash_shifts[(i++)&0x3]);
+
+    bpp = &buckets [hash%NBUCKETS];
+
+    if (*bpp == NULL)
+        *bpp = bp;
+    else {
+        bp->next = *bpp;
+        *bpp = bp;
+    }
+}
+
+/*
+ * sxerox 
+ */
+
+static char *sxerox (char *s)
+{
+    char *rv = (char *) malloc (strlen (s) + 1);
+    strcpy (rv, s);
+    return rv;
+}
+
+/*
+ * readprops 
+ */
+
+#define START 0
+#define READNAME  1
+#define READVALUE 2
+#define C_COMMENT 3
+#define CPP_COMMENT 4
+
+int readprops (char *filename)
+{
+    FILE *ifp;
+    unsigned char c;
+    int state=START;
+    int linenum=1;
+    char namebuf [128];
+    char valbuf [512];
+    int i;
+
+    ifp = fopen (filename, "r");
+
+    if (ifp == NULL)
+        return (-1);
+
+    while (1) {
+
+    readchar:
+        c = getc (ifp);
+
+    again:
+        switch (state) {
+        case START:
+            if (feof (ifp)) {
+                fclose (ifp);
+                return (0);
+            }
+
+            if (c == ' ' || c == '\t')
+                goto readchar;
+
+            if (c == '\n') {
+                linenum++;
+                goto readchar;
+            }
+            if (isalpha (c) || (c == '_')) {
+                state = READNAME;
+                goto again;
+            }
+            if (c == '/') {
+                c = getc (ifp);
+                if (c == '/') {
+                    state = CPP_COMMENT;
+                    goto readchar;
+                } else if (c == '*') {
+                    state = C_COMMENT;
+                    goto readchar;
+                } else {
+                    fprintf (stderr, "unknown token '/' line %d\n",
+                             linenum);
+                    exit(1);
+                }
+            }
+            fprintf (stderr, "unknown token '%c' line %d\n",
+                     c, linenum);
+            exit (1);
+            break;
+            
+        case CPP_COMMENT:
+            while (1) {
+                c = getc (ifp);
+                if (feof (ifp))
+                    return (0);
+                if (c == '\n') {
+                    linenum++;
+                    state = START;
+                    goto readchar;
+                }
+            }
+            break;
+
+        case C_COMMENT:
+            while (1) {
+                c = getc (ifp);
+                if (feof (ifp)) {
+                    fprintf (stderr, "unterminated comment, line %d\n",
+                             linenum);
+                    exit (1);
+                }
+                if (c == '*') {
+                staragain:
+                    c = getc (ifp);
+                    if (c == '/') {
+                        state = START;
+                        goto readchar;
+                    }
+                    if (c == '*')
+                        goto staragain;
+                }
+            }
+            break;
+                    
+        case READNAME:
+            i = 0;
+            namebuf[i++] = c;
+            while (1) {
+                c = getc (ifp);
+                if (feof (ifp)) {
+                    fprintf (stderr, "EOF while reading a name, line %d\n",
+                             linenum);
+                    exit (1);
+                }
+                if ((!isalnum (c)) && (c != '_')) {
+                    namebuf [i] = 0;
+                    state = READVALUE;
+                    goto again;
+                }
+                namebuf [i++] = c;
+            }
+            break;
+
+        case READVALUE:
+            i = 0;
+            while ((c == ' ') || (c == '\t') || (c == '=')) {
+                c = getc (ifp);
+                if (feof (ifp)) {
+                    fprintf (stderr, "EOF while reading a value, line %d\n",
+                             linenum);
+                    exit (1);
+                }
+            }
+            goto firsttime;
+            while (1) {
+                c = getc (ifp);
+
+            firsttime:
+                if (c == '\\') {
+                    c = getc (ifp);
+                    if (feof (ifp)) {
+                        fprintf (stderr, "EOF after '\\', line %d\n",
+                                 linenum);
+                        exit (1);
+                    }
+                    valbuf[i++] = c;
+                    continue;
+                }
+                if (c == '\n') {
+                    linenum++;
+                    while (valbuf [i-1] == ' ' || valbuf[i-1] == '\t')
+                        i--;
+                    valbuf[i] = 0;
+                    addprop (namebuf, valbuf);
+                    state = START;
+                    goto readchar;
+                }
+                valbuf[i++] = c;
+            }
+
+        }
+    }
+}
diff --git a/src/tools/vppapigen/configure.ac b/src/tools/vppapigen/configure.ac
new file mode 100644
index 00000000..16ad59d2
--- /dev/null
+++ b/src/tools/vppapigen/configure.ac
@@ -0,0 +1,14 @@
+#                                               -*- Autoconf -*-
+# Copyright (c) 2008 by cisco Systems, Inc.
+# All rights reserved.
+# Process this file with autoconf to produce a configure script.
+
+AC_INIT(vppapigen, 1.0)
+AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_YACC
+
+AC_OUTPUT([Makefile])
diff --git a/src/tools/vppapigen/gram.y b/src/tools/vppapigen/gram.y
new file mode 100644
index 00000000..de26af8d
--- /dev/null
+++ b/src/tools/vppapigen/gram.y
@@ -0,0 +1,90 @@
+%{
+/*
+ * gram.y - message definition language
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+extern void yyerror (char *s);
+extern int yylex (void);
+    
+#define YYSTYPE void *
+    
+void generate (YYSTYPE);
+ YYSTYPE add_slist(YYSTYPE, YYSTYPE);
+ YYSTYPE add_define(YYSTYPE, YYSTYPE);
+ YYSTYPE suppress_version(void);
+ YYSTYPE add_defbody(YYSTYPE, YYSTYPE);
+ YYSTYPE add_primtype(YYSTYPE, YYSTYPE, YYSTYPE);
+ YYSTYPE add_complex(YYSTYPE, YYSTYPE);
+ YYSTYPE add_union(YYSTYPE, YYSTYPE);
+ YYSTYPE add_scalar_vbl(YYSTYPE);
+ YYSTYPE add_vector_vbl(YYSTYPE, YYSTYPE);
+ YYSTYPE add_variable_length_vector_vbl(YYSTYPE, YYSTYPE);
+ YYSTYPE set_flags(YYSTYPE, YYSTYPE);
+%}
+
+%token NAME RPAR LPAR SEMI LBRACK RBRACK NUMBER PRIMTYPE BARF
+%token TPACKED DEFINE LCURLY RCURLY STRING UNION
+%token HELPER_STRING COMMA 
+%token NOVERSION MANUAL_PRINT MANUAL_ENDIAN TYPEONLY DONT_TRACE
+
+%%
+
+pgm:	  slist                 {generate ($1);}
+          ;
+
+slist:	  slist stmt            {$$ = add_slist ($1, $2);}
+        | stmt                  {$$ = $1;}
+          ;
+
+stmt:     flist defn            {$$ = set_flags($1, $2);}
+        | defn                  {$$ = $1;}
+          ;
+
+flist:    flist flag            {$$ = (YYSTYPE)(unsigned long long)
+                                     ((unsigned long long) $1 
+                                    | (unsigned long long) $2);}
+        | flag                  {$$ = $1;}
+          ;
+
+flag:   
+          MANUAL_PRINT          {$$ = $1;}
+        | MANUAL_ENDIAN         {$$ = $1;}
+        | DONT_TRACE            {$$ = $1;}
+        | TYPEONLY              {$$ = $1;}
+          ;
+
+defn:     DEFINE NAME LCURLY defbody RCURLY SEMI 
+                                {$$ = add_define($2, $4);}
+
+        | NOVERSION SEMI
+                                {$$ = suppress_version();}
+          ;
+
+defbody:  defbody onedef        {$$ = add_defbody($1, $2);}
+        | onedef                {$$ = $1;}
+          ;
+
+onedef:   PRIMTYPE vbl SEMI      {$$ = add_primtype($1, $2, 0);}
+        | TPACKED PRIMTYPE vbl SEMI {$$ = add_primtype($1, $2, $3);}
+        | NAME vbl SEMI          {$$ = add_complex($1, $2);}
+        | UNION NAME LCURLY defbody RCURLY SEMI 
+                                 {$$ = add_union($2, $4);}
+          ;
+
+vbl:      NAME                      {$$ = add_scalar_vbl($1);}
+        | NAME LBRACK NUMBER RBRACK {$$ = add_vector_vbl($1, $3);}
+        | NAME LBRACK NAME RBRACK {$$ = add_variable_length_vector_vbl($1, $3);}
+          ;
diff --git a/src/tools/vppapigen/lex.c b/src/tools/vppapigen/lex.c
new file mode 100644
index 00000000..733942ad
--- /dev/null
+++ b/src/tools/vppapigen/lex.c
@@ -0,0 +1,1067 @@
+/* 
+ *------------------------------------------------------------------
+ * lex.c - API generator lexical analyzer
+ *
+ * Copyright (c) 1996-2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <ctype.h>
+#include <time.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include "lex.h"
+#include "node.h"
+#include "tools/vppapigen/gram.h"
+
+FILE *ifp, *ofp, *pythonfp, *jsonfp;
+char *vlib_app_name = "vpp";
+int dump_tree;
+time_t starttime;
+char *input_filename;
+char *current_filename;
+int current_filename_allocated;
+unsigned long input_crc;
+unsigned long message_crc;
+int yydebug;
+
+/*
+ * lexer variable definitions 
+ */
+
+static const char *version = "0.1";
+static int the_lexer_linenumber = 1;
+static enum lex_state the_lexer_state = START_STATE;
+
+/*
+ * private prototypes
+ */
+static void usage (char *);
+static int name_check (const char *, YYSTYPE *);
+static int name_compare (const char *, const char *);
+extern int yydebug;
+extern YYSTYPE yylval;
+
+unsigned int crc32c_table[256] = { 
+  0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4,  
+  0xC79A971F, 0x35F1141C, 0x26A1E7E8, 0xD4CA64EB,  
+  0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B,  
+  0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24,  
+  0x105EC76F, 0xE235446C, 0xF165B798, 0x030E349B,  
+  0xD7C45070, 0x25AFD373, 0x36FF2087, 0xC494A384,  
+  0x9A879FA0, 0x68EC1CA3, 0x7BBCEF57, 0x89D76C54,  
+  0x5D1D08BF, 0xAF768BBC, 0xBC267848, 0x4E4DFB4B,  
+  0x20BD8EDE, 0xD2D60DDD, 0xC186FE29, 0x33ED7D2A,  
+  0xE72719C1, 0x154C9AC2, 0x061C6936, 0xF477EA35,  
+  0xAA64D611, 0x580F5512, 0x4B5FA6E6, 0xB93425E5,  
+  0x6DFE410E, 0x9F95C20D, 0x8CC531F9, 0x7EAEB2FA,  
+  0x30E349B1, 0xC288CAB2, 0xD1D83946, 0x23B3BA45,  
+  0xF779DEAE, 0x05125DAD, 0x1642AE59, 0xE4292D5A,  
+  0xBA3A117E, 0x4851927D, 0x5B016189, 0xA96AE28A,  
+  0x7DA08661, 0x8FCB0562, 0x9C9BF696, 0x6EF07595,  
+  0x417B1DBC, 0xB3109EBF, 0xA0406D4B, 0x522BEE48,  
+  0x86E18AA3, 0x748A09A0, 0x67DAFA54, 0x95B17957,  
+  0xCBA24573, 0x39C9C670, 0x2A993584, 0xD8F2B687,  
+  0x0C38D26C, 0xFE53516F, 0xED03A29B, 0x1F682198,  
+  0x5125DAD3, 0xA34E59D0, 0xB01EAA24, 0x42752927,  
+  0x96BF4DCC, 0x64D4CECF, 0x77843D3B, 0x85EFBE38,  
+  0xDBFC821C, 0x2997011F, 0x3AC7F2EB, 0xC8AC71E8,  
+  0x1C661503, 0xEE0D9600, 0xFD5D65F4, 0x0F36E6F7,  
+  0x61C69362, 0x93AD1061, 0x80FDE395, 0x72966096,  
+  0xA65C047D, 0x5437877E, 0x4767748A, 0xB50CF789,  
+  0xEB1FCBAD, 0x197448AE, 0x0A24BB5A, 0xF84F3859,  
+  0x2C855CB2, 0xDEEEDFB1, 0xCDBE2C45, 0x3FD5AF46,  
+  0x7198540D, 0x83F3D70E, 0x90A324FA, 0x62C8A7F9,  
+  0xB602C312, 0x44694011, 0x5739B3E5, 0xA55230E6,  
+  0xFB410CC2, 0x092A8FC1, 0x1A7A7C35, 0xE811FF36,  
+  0x3CDB9BDD, 0xCEB018DE, 0xDDE0EB2A, 0x2F8B6829,  
+  0x82F63B78, 0x709DB87B, 0x63CD4B8F, 0x91A6C88C,  
+  0x456CAC67, 0xB7072F64, 0xA457DC90, 0x563C5F93,  
+  0x082F63B7, 0xFA44E0B4, 0xE9141340, 0x1B7F9043,  
+  0xCFB5F4A8, 0x3DDE77AB, 0x2E8E845F, 0xDCE5075C,  
+  0x92A8FC17, 0x60C37F14, 0x73938CE0, 0x81F80FE3,  
+  0x55326B08, 0xA759E80B, 0xB4091BFF, 0x466298FC,  
+  0x1871A4D8, 0xEA1A27DB, 0xF94AD42F, 0x0B21572C,  
+  0xDFEB33C7, 0x2D80B0C4, 0x3ED04330, 0xCCBBC033,  
+  0xA24BB5A6, 0x502036A5, 0x4370C551, 0xB11B4652,  
+  0x65D122B9, 0x97BAA1BA, 0x84EA524E, 0x7681D14D,  
+  0x2892ED69, 0xDAF96E6A, 0xC9A99D9E, 0x3BC21E9D,  
+  0xEF087A76, 0x1D63F975, 0x0E330A81, 0xFC588982,  
+  0xB21572C9, 0x407EF1CA, 0x532E023E, 0xA145813D,  
+  0x758FE5D6, 0x87E466D5, 0x94B49521, 0x66DF1622,  
+  0x38CC2A06, 0xCAA7A905, 0xD9F75AF1, 0x2B9CD9F2,  
+  0xFF56BD19, 0x0D3D3E1A, 0x1E6DCDEE, 0xEC064EED,  
+  0xC38D26C4, 0x31E6A5C7, 0x22B65633, 0xD0DDD530,  
+  0x0417B1DB, 0xF67C32D8, 0xE52CC12C, 0x1747422F,  
+  0x49547E0B, 0xBB3FFD08, 0xA86F0EFC, 0x5A048DFF,  
+  0x8ECEE914, 0x7CA56A17, 0x6FF599E3, 0x9D9E1AE0,  
+  0xD3D3E1AB, 0x21B862A8, 0x32E8915C, 0xC083125F,  
+  0x144976B4, 0xE622F5B7, 0xF5720643, 0x07198540,  
+  0x590AB964, 0xAB613A67, 0xB831C993, 0x4A5A4A90,  
+  0x9E902E7B, 0x6CFBAD78, 0x7FAB5E8C, 0x8DC0DD8F,  
+  0xE330A81A, 0x115B2B19, 0x020BD8ED, 0xF0605BEE,  
+  0x24AA3F05, 0xD6C1BC06, 0xC5914FF2, 0x37FACCF1,  
+  0x69E9F0D5, 0x9B8273D6, 0x88D28022, 0x7AB90321,  
+  0xAE7367CA, 0x5C18E4C9, 0x4F48173D, 0xBD23943E,  
+  0xF36E6F75, 0x0105EC76, 0x12551F82, 0xE03E9C81,  
+  0x34F4F86A, 0xC69F7B69, 0xD5CF889D, 0x27A40B9E,  
+  0x79B737BA, 0x8BDCB4B9, 0x988C474D, 0x6AE7C44E,  
+  0xBE2DA0A5, 0x4C4623A6, 0x5F16D052, 0xAD7D5351  
+}; 
+
+static inline unsigned long CRC8 (unsigned long crc,
+                                  unsigned char d)
+{
+    return ((crc >> 8) ^ crc32c_table[(crc ^ d) & 0xFF]);
+}
+static inline unsigned long CRC16 (unsigned long crc,
+                                   unsigned short d)
+{
+    crc = CRC8 (crc, d & 0xff);
+    d = d >> 8;
+    crc = CRC8 (crc, d & 0xff);
+    return crc;
+}
+
+
+static unsigned long
+crc_eliding_c_comments (const char *buf, unsigned long crc)
+{
+    const char *p;
+    enum { cOTHER,              /*  */
+           cSTRING,             /* "...    */
+           cSBACKSLASH,         /* "...\   */
+           cCHAR,               /* '...    */
+           cCBACKSLASH,         /* '...\   */
+           cSLASH,              /* /       */
+           cSLASH_SLASH,        /* //...   */
+           cSLASH_STAR,         /* / *...  */
+           cSTAR                /* / *...* */
+    } ss = cOTHER;
+
+    for (p = buf; ;) {
+        unsigned char c = *p++;
+
+        switch (c) {
+        case 0:
+            switch (ss) {
+            case cOTHER:
+                return (crc);
+            case cSTRING: case cSBACKSLASH:
+            case cCHAR: case cCBACKSLASH:
+            case cSLASH: case cSLASH_SLASH: case cSLASH_STAR: case cSTAR:
+                fprintf (stderr, "Inopportune EOF: %s\n", buf);
+                exit (1);
+            }
+            break;
+        case '\"':
+            switch (ss) {
+            case cOTHER: ss = cSTRING; break; /* start string */
+            case cSTRING: ss = cOTHER; break; /* end string */
+            case cSBACKSLASH: ss = cSTRING; break;
+            case cCHAR: break;
+            case cCBACKSLASH: ss = cCHAR; break;
+            case cSLASH: crc = CRC8 (crc, '/'); ss = cOTHER; break;
+            case cSLASH_SLASH: continue; /* in comment */
+            case cSLASH_STAR: continue; /* in comment */
+            case cSTAR: ss = cSLASH_STAR; continue; /* in comment */
+            }
+            break;
+        case '\\':
+            switch (ss) {
+            case cOTHER: break;
+            case cSTRING: ss = cSBACKSLASH; break;
+            case cSBACKSLASH: ss = cSTRING; break;
+            case cCHAR: ss = cCBACKSLASH; break;
+            case cCBACKSLASH: ss = cCHAR; break;
+            case cSLASH: crc = CRC8 (crc, '/'); ; ss = cOTHER; break;
+            case cSLASH_SLASH: continue; /* in comment */
+            case cSLASH_STAR: continue; /* in comment */
+            case cSTAR: ss = cSLASH_STAR; continue; /* in comment */
+            }
+            break;
+        case '/':
+            switch (ss) {
+            case cOTHER: ss = cSLASH; continue; /* potential comment */
+            case cSTRING: break;
+            case cSBACKSLASH: ss = cSTRING; break;
+            case cCHAR: break;
+            case cCBACKSLASH: ss = cCHAR; break;
+            case cSLASH: ss = cSLASH_SLASH; continue; /* start comment */
+            case cSLASH_SLASH: continue; /* in comment */
+            case cSLASH_STAR: continue; /* in comment */
+            case cSTAR: ss = cOTHER; continue; /* end of comment */
+            }
+            break;
+        case '*':
+            switch (ss) {
+            case cOTHER: break;
+            case cSTRING: break;
+            case cSBACKSLASH: ss = cSTRING; break;
+            case cCHAR: break;
+            case cCBACKSLASH: ss = cCHAR; break;
+            case cSLASH: ss = cSLASH_STAR; continue; /* start comment */
+            case cSLASH_SLASH: continue; /* in comment */
+            case cSLASH_STAR: ss = cSTAR; continue; /* potential end */
+            case cSTAR: continue; /* still potential end of comment */
+            }
+            break;
+        case '\n': case '\r': case ' ': case '\t': case '\014':
+            switch (ss) {
+            case cOTHER: continue; /* ignore all whitespace */
+            case cSTRING: break;
+            case cSBACKSLASH: ss = cSTRING; break;
+            case cCHAR: break;
+            case cCBACKSLASH: ss = cCHAR; break;
+            case cSLASH: c = '/'; ss = cOTHER; break;
+            case cSLASH_SLASH:
+                if (c == '\n' || c == '\r') ss = cOTHER; /* end comment */
+                continue;
+            case cSLASH_STAR: continue; /* in comment */
+            case cSTAR: ss = cSLASH_STAR; continue; /* in comment */
+            }
+        default:
+            switch (ss) {
+            case cOTHER: break;
+            case cSTRING: break;
+            case cSBACKSLASH: ss = cSTRING; break;
+            case cCHAR: break;
+            case cCBACKSLASH: ss = cCHAR; break;
+            case cSLASH: crc = CRC8 (crc, '/'); ss = cOTHER; break;
+            case cSLASH_SLASH: continue; /* in comment */
+            case cSLASH_STAR: continue; /* in comment */
+            case cSTAR: ss = cSLASH_STAR; continue; /* in comment */
+            }
+        }
+        crc = CRC8 (crc, c);
+    }
+}
+
+/*
+ * main 
+ */
+int main (int argc, char **argv)
+{
+    int curarg = 1;
+    char *ofile=0;
+    char *pythonfile=0;
+    char *jsonfile=0;
+    char *show_name=0;
+
+    while (curarg < argc) {
+        if (!strncmp (argv [curarg], "--verbose", 3)) {
+            fprintf (stderr, "%s version %s\n", argv [0], version);
+            curarg++;
+            continue;
+        }
+        
+        if (!strncmp (argv [curarg], "--yydebug", 3)) {
+            yydebug = 1;
+            curarg++;
+            continue;
+        }
+        
+        if (!strncmp (argv [curarg], "--dump", 3)) {
+            dump_tree = 1;
+            curarg++;
+            continue;
+        }
+        
+        if (!strncmp (argv[curarg], "--show-name", 3)) {
+            curarg++;
+            if (curarg < argc) {
+                show_name = argv[curarg];
+                curarg++;
+                continue;
+            } else {
+                fprintf(stderr, "Missing filename after --show-name \n");
+                exit(1);
+            }
+        }
+
+        if (!strncmp (argv [curarg], "--input", 3)) {
+            curarg++;
+            if (curarg < argc) {
+                input_filename = argv[curarg];
+                if (!strcmp (argv [curarg], "-"))
+                    ifp = stdin;
+                else
+                    ifp = fopen (argv [curarg], "r");
+                if (ifp == NULL) {
+                    fprintf (stderr, "Couldn't open input file %s\n", 
+                             argv[curarg]);
+                    exit (1);
+                }
+                curarg++;
+            } else {
+                fprintf(stderr, "Missing filename after --input\n");
+                exit(1);
+            }
+            continue;
+        }
+        if (!strncmp (argv [curarg], "--output", 3)) {
+            curarg++;
+            if (curarg < argc) {
+                ofp = fopen (argv[curarg], "w");
+                if (ofp == NULL) {
+                    fprintf (stderr, "Couldn't open output file %s\n", 
+                         argv[curarg]);
+                    exit (1);
+                }
+                ofile = argv[curarg];
+                curarg++;
+            } else {
+                fprintf(stderr, "Missing filename after --output\n");
+                exit(1);
+            }
+            continue;
+        }
+        if (!strncmp (argv [curarg], "--python", 8)) {
+            curarg++;
+            if (curarg < argc) {
+	        if (!strcmp(argv[curarg], "-")) {
+		    pythonfp = stdout;
+		} else {
+		    pythonfp = fopen(argv[curarg], "w");
+		    pythonfile = argv[curarg];
+		}
+                if (pythonfp == NULL) {
+                    fprintf (stderr, "Couldn't open python output file %s\n",
+                         argv[curarg]);
+                    exit (1);
+                }
+                curarg++;
+            } else {
+                fprintf(stderr, "Missing filename after --python\n");
+                exit(1);
+            }
+            continue;
+        }
+        if (!strncmp (argv [curarg], "--json", 6)) {
+            curarg++;
+            if (curarg < argc) {
+	        if (!strcmp(argv[curarg], "-")) {
+		    jsonfp = stdout;
+		} else {
+		    jsonfp = fopen(argv[curarg], "w");
+		    jsonfile = argv[curarg];
+		}
+                if (jsonfp == NULL) {
+                    fprintf (stderr, "Couldn't open JSON output file %s\n",
+                         argv[curarg]);
+                    exit (1);
+                }
+                curarg++;
+            } else {
+                fprintf(stderr, "Missing filename after --json\n");
+                exit(1);
+            }
+            continue;
+        }
+        if (!strncmp (argv [curarg], "--app", 4)) {
+            curarg++;
+            if (curarg < argc) {
+                vlib_app_name = argv[curarg];
+                curarg++;
+            } else {
+                fprintf(stderr, "Missing app name after --app\n");
+                exit(1);
+            }
+            continue;
+        }
+
+        usage(argv[0]);
+        exit (1);
+    }
+    if (ofp == NULL) {
+        ofile = 0;
+    }
+    if (pythonfp == NULL) {
+        pythonfile = 0;
+    }
+    if (jsonfp == NULL) {
+        jsonfile = 0;
+    }
+    if (ifp == NULL) {
+        fprintf(stderr, "No input file specified...\n");
+        exit(1);
+    }
+    if (show_name) {
+        input_filename = show_name;
+    }
+
+    starttime = time (0);
+
+    if (yyparse() == 0) {
+        fclose (ifp);
+        curarg -= 2;
+        if (ofile) {
+            printf ("Output written to %s\n", ofile);
+            fclose (ofp);
+        }
+        if (pythonfile) {
+            printf ("Python bindings written to %s\n", pythonfile);
+            fclose (pythonfp);
+        }
+        if (jsonfile) {
+            printf ("JSON bindings written to %s\n", jsonfile);
+            fclose (jsonfp);
+        }
+    }
+    else {
+        fclose (ifp);
+        if (ofp)
+            fclose (ofp);
+        if (ofile) {
+            printf ("Removing %s\n", ofile);
+            unlink (ofile);
+        }
+        if (pythonfile) {
+            printf ("Removing %s\n", pythonfile);
+            unlink (pythonfile);
+        }
+        if (jsonfile) {
+            printf ("Removing %s\n", jsonfile);
+            unlink (jsonfile);
+        }
+        exit (1);
+    }
+    exit (0);
+}
+
+/*
+ * usage
+ */
+static void usage (char *progname)
+{
+    fprintf (stderr, 
+             "usage: %s --input <filename> [--output <filename>] "
+	     "[--json <filename>] [--python <filename>]\n%s",
+             progname,
+             "          [--yydebug] [--dump-tree]\n");
+    exit (1);
+}
+
+/*
+ * yyerror 
+ */
+void yyerror (char *s)
+{
+    fprintf (stderr, "%s:%d %s\n", current_filename, the_lexer_linenumber, s);
+}
+
+static char namebuf [MAXNAME];
+
+static inline char
+getc_char (FILE *ifp)
+{
+    return ((char)(getc(ifp) & 0x7f));
+}
+
+/*
+ * yylex (well, yylex_1: The real yylex below does crc-hackery)
+ */
+static int yylex_1 (void)
+{
+    int nameidx=0;
+    char c;
+    enum { LP_INITIAL_WHITESPACE, LP_LINE_NUMBER,
+	   LP_PRE_FILENAME_WHITESPACE, LP_FILENAME,
+	   LP_POST_FILENAME,
+	   LP_OTHER
+    } lp_substate = LP_INITIAL_WHITESPACE;
+
+ again:
+    switch (the_lexer_state) {
+        /*
+         * START state -- looking for something interesting 
+         */
+    case START_STATE:
+        c = getc_char (ifp);
+        if (feof (ifp))
+            return (EOF);
+
+        switch (c) {
+        case '\n':
+            the_lexer_linenumber++;
+            goto again;
+
+        case '#':
+            the_lexer_state = LINE_PRAGMA_STATE;
+            lp_substate = LP_INITIAL_WHITESPACE;
+            goto again;
+
+            /* FALLTHROUGH */
+        case '\t':
+        case ' ':
+            goto again;
+            
+        case '(':
+            return (LPAR);
+
+        case ')':
+            return (RPAR);
+
+        case ';':
+            return (SEMI);
+
+        case '[':
+            return (LBRACK);
+            
+        case ']':
+            return (RBRACK);
+
+        case '{':
+            return (LCURLY);
+            
+        case '}':
+            return (RCURLY);
+
+        case ',':
+            return (COMMA);
+
+        case '"':
+            nameidx = 0;
+            the_lexer_state = STRING_STATE;
+            goto again;
+
+        case '@':
+            nameidx = 0;
+            the_lexer_state = HELPER_STATE;
+            goto again;
+
+        case '/':
+            c = getc_char (ifp);
+            if (feof (ifp))
+                return (EOF);
+
+            if (c == '/') {
+                the_lexer_state = CPP_COMMENT_STATE;
+                goto again;
+            } else if (c == '*') {
+                the_lexer_state = C_COMMENT_STATE;
+                goto again;
+            } else {
+                fprintf (stderr, "unknown token /%c at line %d\n",
+                         c, the_lexer_linenumber);
+                return (BARF);
+            }
+
+        case '\\':
+            c = getc_char (ifp);
+            if (feof (ifp))
+                return (EOF);
+            
+            /* Note fallthrough... */
+
+        default:
+            if (isalpha (c) || c == '_') {
+                namebuf [0] = c;
+                nameidx = 1;
+                the_lexer_state = NAME_STATE;
+                goto again;
+            } else if (isdigit(c)) {
+                namebuf [0] = c;
+                nameidx = 1;
+                the_lexer_state = NUMBER_STATE;
+                goto again;
+            }
+
+            fprintf (stderr, "unknown token %c at line %d\n",
+                     c, the_lexer_linenumber);
+            return (BARF);
+        }
+
+        /*
+         * NAME state -- eat the rest of a name 
+         */
+    case NAME_STATE:
+        c = getc_char (ifp);
+        if (feof (ifp))
+            return (EOF);
+        
+        if (!isalnum (c) && c != '_') {
+            ungetc (c, ifp);
+            namebuf [nameidx] = 0;
+            the_lexer_state = START_STATE;
+            return (name_check (namebuf, &yylval));
+        }                
+        if (nameidx >= (MAXNAME-1)) {
+            fprintf(stderr, "lex input buffer overflow...\n");
+            exit(1);
+        }
+        namebuf [nameidx++] = c;
+        goto again;
+        
+        /*
+         * NUMBER state -- eat the rest of a number
+         */
+    case NUMBER_STATE:
+        c = getc_char (ifp);
+        if (feof (ifp))
+            return (EOF);
+        
+        if (!isdigit (c)) {
+            ungetc (c, ifp);
+            namebuf [nameidx] = 0;
+            the_lexer_state = START_STATE;
+            yylval = (void *) atol(namebuf);
+            return (NUMBER);
+        }                
+        if (nameidx >= (MAXNAME-1)) {
+            fprintf(stderr, "lex input buffer overflow...\n");
+            exit(1);
+        }
+        namebuf [nameidx++] = c;
+        goto again;
+
+        /*
+         * C_COMMENT state -- eat a peach
+         */
+    case C_COMMENT_STATE:
+        c = getc_char (ifp);
+        if (feof (ifp))
+            return (EOF);
+        if (c == '*') {
+            c = getc_char (ifp);
+            if (feof (ifp))
+                return (EOF);
+            if (c == '/') {
+                the_lexer_state = START_STATE;
+                goto again;
+            }
+        }
+        if (c == '\n')
+            the_lexer_linenumber++;
+        goto again;
+            
+        /*
+         * CPP_COMMENT state -- eat a plum 
+         */
+
+    case CPP_COMMENT_STATE:
+        c = getc_char (ifp);
+        if (feof (ifp))
+            return (EOF);
+        if (c == '\n') {
+            the_lexer_linenumber++;
+            the_lexer_state = START_STATE;
+            goto again;
+        }
+        goto again;
+
+    case STRING_STATE:
+        c = getc_char (ifp);
+        if (feof (ifp))
+            return (EOF);
+        switch (c) {
+        case '\\':
+            c = getc_char (ifp);
+            if (feof (ifp))
+                return (EOF);
+            namebuf[nameidx++] = c;
+            goto again;
+
+        case '"':
+            namebuf[nameidx] = 0;
+            yylval = (YYSTYPE) sxerox (namebuf);
+            the_lexer_state = START_STATE;
+            return (STRING);
+
+        default:
+            if (c == '\n')
+                the_lexer_linenumber++;
+
+            if (nameidx >= (MAXNAME-1)) {
+                fprintf(stderr, "lex input buffer overflow...\n");
+                exit(1);
+            }
+            namebuf[nameidx++] = c;
+            goto again;
+        }
+        break;
+
+    case HELPER_STATE:
+        c = getc_char (ifp);
+        if (feof (ifp))
+            return (EOF);
+        switch (c) {
+        case '\\':
+            c = getc_char (ifp);
+            if (feof (ifp))
+                return (EOF);
+            namebuf[nameidx] = c;
+            goto again;
+
+        case '@':
+            namebuf[nameidx] = 0;
+            yylval = (YYSTYPE) sxerox (namebuf);
+            the_lexer_state = START_STATE;
+            return (HELPER_STRING);
+
+        default:
+            if (c == '\n')
+                the_lexer_linenumber++;
+
+            /*
+             * CPP makes it approximately impossible to 
+             * type "#define FOO 123", so we provide a 
+             * lexical trick to achieve that result 
+             */
+
+            if (c == '$')
+                c = '#';
+
+            if (nameidx >= (MAXNAME-1)) {
+                fprintf(stderr, "lex input buffer overflow...\n");
+                exit(1);
+            }
+            namebuf[nameidx++] = c;
+            goto again;
+        }
+        break;
+
+    case LINE_PRAGMA_STATE:
+	/* We're only interested in lines of the form # 259 "foo.c" 17 */
+
+        switch (lp_substate) {
+
+        case LP_INITIAL_WHITESPACE: /* no number seen yet */
+            c = getc_char(ifp);
+            if (feof(ifp))
+                return(EOF);
+            if (c >= '0' && c <= '9') {
+                namebuf[nameidx++] = c;
+                lp_substate = LP_LINE_NUMBER;
+            } else if (c == '\n') {
+		goto lp_end_of_line;
+	    } else if (c != ' ' && c != '\t') {
+		/* Nothing */
+	    } else {
+		lp_substate = LP_OTHER;
+	    }
+	    goto again;
+
+        case LP_LINE_NUMBER:	/* eating linenumber */
+            c = getc_char(ifp);
+            if (feof(ifp))
+                return(EOF);
+            if (c >= '0' && c <= '9') {
+                namebuf[nameidx++] = c;
+	    } else if (c == ' ' || c == '\t') {
+                namebuf[nameidx++] = 0;
+                the_lexer_linenumber = atol(namebuf);
+                lp_substate = LP_PRE_FILENAME_WHITESPACE;
+            } else if (c == '\n') {
+		goto lp_end_of_line;
+            } else {
+		lp_substate = LP_OTHER;
+	    }
+            goto again;
+
+        case LP_PRE_FILENAME_WHITESPACE: /* awaiting filename */
+            c = getc_char(ifp);
+            if (feof(ifp))
+                return(EOF);
+            
+            if (c == '"') {
+                lp_substate = LP_FILENAME;
+                nameidx = 0;
+            } else if (c == ' ' || c == '\t') {
+		/* nothing */
+	    } else if (c == '\n') {
+		goto lp_end_of_line;
+	    } else {
+		lp_substate = LP_OTHER;
+	    }
+            goto again;
+
+        case LP_FILENAME:	/* eating filename */
+            c = getc_char(ifp);
+            if (feof(ifp))
+                return(EOF);
+
+            if (c == '"') {
+                lp_substate = LP_POST_FILENAME;
+                namebuf[nameidx] = 0;
+            } else if (c == '\n') {
+		goto lp_end_of_line; /* syntax error... */
+	    } else {
+                namebuf[nameidx++] = c;
+            }
+            goto again;
+
+        case LP_POST_FILENAME:	/* ignoring rest of line */
+        case LP_OTHER:
+            c = getc_char(ifp);
+            if (feof(ifp))
+                return(EOF);
+
+            if (c == '\n') {
+	        if (lp_substate == LP_POST_FILENAME) {
+		    if (current_filename_allocated) {
+			current_filename_allocated = 0;
+			free(current_filename);
+		    }
+
+		    if (!strcmp(namebuf, "<stdin>")) {
+			current_filename = input_filename;
+		    } else {
+			current_filename = sxerox(namebuf);
+			current_filename_allocated = 1;
+		    }
+		}
+	    lp_end_of_line:
+                the_lexer_state = START_STATE;
+                nameidx = 0;
+            }
+            goto again;
+        }
+        break;
+    }
+    fprintf (stderr, "LEXER BUG!\n");
+    exit (1);
+    /* NOTREACHED */
+    return (0);
+}
+
+/*
+ * Parse a token and side-effect input_crc
+ * in a whitespace- and comment-insensitive fashion.
+ */
+int yylex (void)
+{
+    /*
+     * Accumulate a crc32-based signature while processing the
+     * input file.  The goal is to come up with a magic number
+     * which changes precisely when the original input file changes
+     * but which ignores whitespace changes.
+     */
+    unsigned long crc = input_crc;
+    int node_type = yylex_1 ();
+    unsigned long crc2 = message_crc;
+    int use_helper_string = 0;
+    unsigned short code;
+
+    switch (node_type) {
+    case PRIMTYPE:
+    case NAME:
+    case NUMBER:
+    case STRING:
+    case HELPER_STRING: 
+        use_helper_string = 1;
+        break;
+
+     /* Other node types have no "substate" */
+     /* This code is written in this curious fashion because we
+      * want the generated CRC to be independent of the particular
+      * values a particular version of lex/bison assigned to various states.
+      */
+
+    case RPAR:               code = 258; break;
+    case LPAR:               code = 259; break;
+    case SEMI:               code = 260; break;
+    case LBRACK:             code = 261; break;
+    case RBRACK:             code = 262; break;
+    case BARF:               code = 265; break;
+    case TPACKED:            code = 266; break;
+    case DEFINE:             code = 267; break;
+    case LCURLY:             code = 268; break;
+    case RCURLY:             code = 269; break;
+    case UNION:              code = 271; break;
+    case COMMA:              code = 273; break;
+    case NOVERSION:          code = 274; break;
+    case MANUAL_PRINT:       code = 275; break;
+    case MANUAL_ENDIAN:      code = 276; break;
+    case TYPEONLY:           code = 278; break;
+    case DONT_TRACE:         code = 279; break;
+        
+    case EOF: code = ~0; break; /* hysterical compatibility */
+
+    default:
+        fprintf(stderr, "yylex: node_type %d missing state CRC cookie\n",
+                node_type);
+        exit(1);
+    }
+
+    if (use_helper_string)
+    {
+        /* We know these types accumulated token text into namebuf */
+        /* HELPER_STRING may still contain C comments.  Argh. */
+        crc = crc_eliding_c_comments (namebuf, crc);
+        crc2 = crc_eliding_c_comments (namebuf, crc2);
+    } else
+    {
+        crc = CRC16 (crc, code);
+        crc2 = CRC16 (crc2, code);
+    }
+
+    input_crc = crc;
+    message_crc = crc2;
+    return (node_type);
+}
+
+/*
+ * name_check -- see if the name we just ate
+ * matches a known keyword.  If so, set yylval
+ * to a new instance of <subclass of node>, and return PARSER_MACRO
+ *
+ * Otherwise, set yylval to sxerox (s) and return NAME
+ */
+
+static struct keytab {
+    char *name;
+    enum node_subclass subclass_id;
+} keytab [] = 
+/* Keep the table sorted, binary search used below! */
+{
+    {"define",          NODE_DEFINE},  
+    {"dont_trace",      NODE_DONT_TRACE},
+    {"f64",             NODE_F64},
+    {"i16",             NODE_I16},
+    {"i32",             NODE_I32},
+    {"i64",             NODE_I64},
+    {"i8",              NODE_I8},
+    {"manual_endian",   NODE_MANUAL_ENDIAN},
+    {"manual_print",    NODE_MANUAL_PRINT},
+    {"noversion",       NODE_NOVERSION},
+    {"packed",          NODE_PACKED},
+    {"typeonly",        NODE_TYPEONLY},
+    {"u16", 	        NODE_U16},
+    {"u32",		NODE_U32},
+    {"u64",             NODE_U64},
+    {"u8", 		NODE_U8},
+    {"union",           NODE_UNION},
+    {"uword",           NODE_UWORD},
+};
+ 
+static int name_check (const char *s, YYSTYPE *token_value)
+{
+    enum node_subclass subclass_id;
+    int top, bot, mid;
+    int result;
+
+    for (top = 0, bot = (sizeof(keytab) / sizeof(struct keytab))-1; 
+         bot >= top; ) {
+        mid = (top + bot) / 2;
+        result = name_compare (s, keytab[mid].name);
+        if (result < 0)
+            bot = mid - 1;
+        else if (result > 0)
+            top = mid + 1;
+        else {
+            subclass_id = keytab[mid].subclass_id;
+
+            switch (subclass_id) {
+            case NODE_U8:
+            case NODE_U16:
+            case NODE_U32:
+            case NODE_U64:
+            case NODE_I8:
+            case NODE_I16:
+            case NODE_I32:
+            case NODE_I64:
+            case NODE_F64:
+            case NODE_UWORD:
+                *token_value = make_node(subclass_id);
+                return (PRIMTYPE);
+
+            case NODE_PACKED:
+                *token_value = make_node(subclass_id);
+                return (TPACKED);
+
+            case NODE_DEFINE:
+                message_crc = 0;
+                *token_value = make_node(subclass_id);
+                return(DEFINE);
+
+            case NODE_MANUAL_PRINT:
+                *token_value = (YYSTYPE) NODE_FLAG_MANUAL_PRINT;
+                return (MANUAL_PRINT);
+
+            case NODE_MANUAL_ENDIAN:
+                *token_value = (YYSTYPE) NODE_FLAG_MANUAL_ENDIAN;
+                return (MANUAL_ENDIAN);
+
+            case NODE_TYPEONLY:
+                *token_value = (YYSTYPE) NODE_FLAG_TYPEONLY;
+                return(TYPEONLY);
+
+            case NODE_DONT_TRACE:
+                *token_value = (YYSTYPE) NODE_FLAG_DONT_TRACE;
+                return(DONT_TRACE);
+
+            case NODE_NOVERSION:
+                return(NOVERSION);
+
+            case NODE_UNION:
+                return(UNION);
+
+            default:
+                fprintf (stderr, "fatal: keytab botch!\n");
+                exit (1);
+            }
+        }
+    }
+    *token_value = (YYSTYPE) sxerox (s);
+    return (NAME);
+}
+
+/*
+ * sxerox
+ */
+
+char *sxerox (const char *s)
+{
+    int len = strlen (s);
+    char *rv;
+
+    rv = (char *) malloc (len+1);
+    if (rv == 0) {
+        fprintf(stderr, "Out of memory...");
+        exit (1);
+    }
+        
+    strcpy (rv, s);
+    return (rv);
+}
+
+/*
+ * name_compare
+ */
+
+int name_compare (const char *s1, const char *s2)
+{
+    char c1, c2;
+
+    while (*s1 && *s2) {
+        c1 = *s1++;
+        c2 = *s2++;
+
+        c1 = tolower (c1);
+        c2 = tolower (c2);
+        if (c1 < c2)
+            return (-1);
+        else if (c1 > c2)
+            return (1);
+    }
+    if (*s1 < *s2)
+        return (-1);
+    else if (*s1 > *s2)
+        return (1);
+    return (0);
+}
diff --git a/src/tools/vppapigen/lex.h b/src/tools/vppapigen/lex.h
new file mode 100644
index 00000000..a0fdc735
--- /dev/null
+++ b/src/tools/vppapigen/lex.h
@@ -0,0 +1,50 @@
+/*
+ *------------------------------------------------------------------
+ * lex.h - definitions for the api generator's lexical
+ * analyzer.
+ *
+ * Copyright (c) 1996-2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef _LEX_H_
+#define _LEX_H_ 1
+
+extern int yylex (void);
+extern void yyerror (char *);
+extern int yyparse (void);
+
+#ifndef YYSTYPE
+#define YYSTYPE void *
+#endif
+
+#include "tools/vppapigen/gram.h"
+
+enum lex_state {
+    START_STATE = 1,
+    NAME_STATE,
+    NUMBER_STATE,
+    C_COMMENT_STATE,
+    CPP_COMMENT_STATE,
+    STRING_STATE,
+    HELPER_STATE,
+    LINE_PRAGMA_STATE,
+};
+
+#define MAXNAME 64000
+
+extern unsigned long input_crc;
+extern unsigned long message_crc;
+
+#endif /* _LEX_H_ */
diff --git a/src/tools/vppapigen/node.c b/src/tools/vppapigen/node.c
new file mode 100644
index 00000000..260c6f2e
--- /dev/null
+++ b/src/tools/vppapigen/node.c
@@ -0,0 +1,1527 @@
+/* 
+ *------------------------------------------------------------------
+ * node.c - the api generator's semantic back-end
+ *
+ * Copyright (c) 2004-2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdbool.h>
+#include <ctype.h>
+#include <time.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+
+#include "lex.h"
+#include "node.h"
+
+#define YYSTYPE void *
+
+FILE *ofp;
+FILE *pythonfp;
+FILE *jsonfp;
+time_t starttime;
+char *vlib_app_name;
+char *input_filename;
+node_vft_t *the_vft[NODE_N_TYPES];
+static int indent;
+static int dont_output_version;
+int dump_tree;
+static char *fixed_name;
+static char tmpbuf [MAXNAME];
+static char *current_def_name;
+static char *current_union_name;
+static char *current_type_fmt;
+static char *current_type_cast;
+static char current_id;
+static char current_is_complex;
+static char *current_endianfun;
+static char *current_type_name;
+
+void indent_me(FILE *ofp)
+{
+    int i;
+
+    for (i = 0; i < indent; i++)
+        putc(' ', ofp);
+}
+
+char *uppercase (char *s)
+{
+    char *cp;
+
+    cp = tmpbuf;
+
+    while (*s && (cp < tmpbuf + (sizeof(tmpbuf)-1))) {
+        if (*s >= 'a' && *s <= 'z')
+            *cp++ = *s++ - ('a' - 'A');
+        else
+            *cp++ = *s++;
+    }
+    *cp = 0;
+    return(tmpbuf);
+}
+
+char *lowercase (char *s)
+{
+    char *cp;
+
+    cp = tmpbuf;
+
+    while (*s && (cp < tmpbuf + (sizeof(tmpbuf)-1))) {
+        if (*s >= 'A' && *s <= 'Z')
+            *cp++ = *s++ + ('a' - 'A');
+        else
+            *cp++ = *s++;
+    }
+    *cp = 0;
+    return(tmpbuf);
+}
+
+void primtype_recursive_print(node_t *this, i8 *fmt)
+{
+    fputs((char *)fmt, stdout);
+
+    if (this->deeper) {
+        node_vft_t *vftp = the_vft[this->deeper->type];
+        vftp->print(this->deeper);
+    }
+}
+
+void primtype_recursive_generate(node_t *this, enum passid which, FILE *ofp,
+                                 i8 *type_name, i8 *type_fmt, i8 *type_cast)
+{
+    node_vft_t *vftp;
+
+    current_type_name = (char *)type_name;
+    current_type_cast = (char *)type_cast;
+
+    switch(which) {
+    case TYPEDEF_PASS:
+        fputs((char *)type_name, ofp);
+        fputs(" ", ofp);
+        break;
+
+    case PRINTFUN_PASS:
+        current_type_fmt = (char *)type_fmt;
+        break;
+
+    case ENDIANFUN_PASS:
+        vftp = the_vft[this->type];
+        current_endianfun = vftp->endian_converter;
+        break;
+
+    case PYTHON_PASS:
+        fputs("('", pythonfp);
+        fputs((char *)type_name, pythonfp);
+        fputs("', ", pythonfp);
+        break;
+
+    case JSON_PASS:
+        fputs("[\"", jsonfp);
+        fputs((char *)type_name, jsonfp);
+        fputs("\", ", jsonfp);
+        break;
+
+    default:
+        fprintf(stderr, "primtype_recursive_generate: unimp pass %d\n", which);
+        break;
+    }
+
+    if (this->deeper) {
+        vftp = the_vft[this->deeper->type];
+        vftp->generate(this->deeper, which, ofp);
+    }
+}
+
+void node_illegal_print (node_t *this)
+{
+    fprintf(stderr, "node_illegal_print called\n");
+    exit(0);
+}
+
+void node_illegal_generate (node_t *this, enum passid notused, FILE *ofp)
+{
+    fprintf(stderr, "node_illegal_generate called\n");
+    exit(0);
+}
+
+node_vft_t node_illegal_vft = {
+    node_illegal_print,
+    node_illegal_generate,
+    "illegal"
+};
+
+void node_u8_print (node_t *this)
+{
+    primtype_recursive_print(this, "u8 ");
+}
+
+void node_u8_generate (node_t *this, enum passid which, FILE *ofp)
+{
+    primtype_recursive_generate(this, which, ofp, "u8", "%u", "(unsigned)");
+}
+
+node_vft_t node_u8_vft = {
+    node_u8_print,
+    node_u8_generate,
+    NULL
+};
+
+void node_u16_print (node_t *this)
+{
+    primtype_recursive_print(this, "u16 ");
+}
+
+void node_u16_generate (node_t *this, enum passid which, FILE *ofp)
+{
+    primtype_recursive_generate(this, which, ofp, "u16", "%u", "(unsigned)");
+}
+
+node_vft_t node_u16_vft = {
+    node_u16_print,
+    node_u16_generate,
+    "clib_net_to_host_u16"
+};
+
+void node_u32_print (node_t *this)
+{
+    primtype_recursive_print(this, "u32 ");
+}
+
+void node_u32_generate (node_t *this, enum passid which, FILE *ofp)
+{
+    primtype_recursive_generate(this, which, ofp, "u32", "%u", "(unsigned)");
+}
+
+node_vft_t node_u32_vft = {
+    node_u32_print,
+    node_u32_generate,
+    "clib_net_to_host_u32",
+};
+
+void node_u64_print (node_t *this)
+{
+    primtype_recursive_print(this, "u64 ");
+}
+
+void node_u64_generate (node_t *this, enum passid which, FILE *ofp)
+{
+    primtype_recursive_generate(this, which, ofp, "u64", "%llu", 
+                                "(long long)");
+}
+
+node_vft_t node_u64_vft = {
+    node_u64_print,
+    node_u64_generate,
+    "clib_net_to_host_u64"
+};
+
+void node_i8_print (node_t *this)
+{
+    primtype_recursive_print(this, "i8 ");
+}
+
+void node_i8_generate (node_t *this, enum passid which, FILE *ofp)
+{
+    primtype_recursive_generate(this, which, ofp, "i8", "%d", "(int)");
+}
+
+node_vft_t node_i8_vft = {
+    node_i8_print,
+    node_i8_generate,
+    ""
+};
+
+void node_i16_print (node_t *this)
+{
+    primtype_recursive_print(this, "i16 ");
+}
+
+void node_i16_generate (node_t *this, enum passid which, FILE *ofp)
+{
+    primtype_recursive_generate(this, which, ofp, "i16", "%d", "(int)");
+}
+
+node_vft_t node_i16_vft = {
+    node_i16_print,
+    node_i16_generate,
+    "clib_net_to_host_u16"
+};
+
+void node_i32_print (node_t *this)
+{
+    primtype_recursive_print(this, "i32 ");
+}
+
+void node_i32_generate (node_t *this, enum passid which, FILE *ofp)
+{
+    primtype_recursive_generate(this, which, ofp, "i32", "%ld", "(long)");
+}
+
+node_vft_t node_i32_vft = {
+    node_i32_print,
+    node_i32_generate,
+    "clib_net_to_host_u32"
+};
+
+void node_i64_print (node_t *this)
+{
+    primtype_recursive_print(this, "i64 ");
+}
+
+void node_i64_generate (node_t *this, enum passid which, FILE *ofp)
+{
+    primtype_recursive_generate(this, which, ofp, "i64", "%lld", 
+                                "(long long)");
+}
+
+node_vft_t node_i64_vft = {
+    node_i64_print,
+    node_i64_generate,
+    "clib_net_to_host_u64"
+};
+
+void node_f64_print (node_t *this)
+{
+    primtype_recursive_print(this, "f64 ");
+}
+
+void node_f64_generate (node_t *this, enum passid which, FILE *ofp)
+{
+    primtype_recursive_generate(this, which, ofp, "f64", "%.2f", 
+                                "(double)");
+}
+
+node_vft_t node_f64_vft = {
+    node_f64_print,
+    node_f64_generate,
+    " ",                        /* FP numbers are sent in host byte order */
+};
+
+
+void node_packed_print (node_t *this)
+{
+    primtype_recursive_print (this, "packed ");
+}
+
+void node_packed_generate (node_t *this, enum passid which, FILE *ofp)
+{
+    primtype_recursive_generate(this, which, ofp, "PACKED", "", "");
+}
+
+node_vft_t node_packed_vft = {
+    node_packed_print,
+    node_packed_generate,
+    0,
+};
+
+void node_define_print (node_t *this)
+{
+    fprintf(stdout, "define %s {\n", CDATA0);
+    if (this->deeper) {
+        node_vft_t *vftp = the_vft[this->deeper->type];
+        fprintf(stdout, "    ");
+        vftp->print(this->deeper);
+    }
+    fprintf(stdout, "};\n");
+}
+
+void node_define_generate (node_t *this, enum passid which, FILE *fp)
+{
+    node_t *child;
+
+    switch(which) {
+    case TYPEDEF_PASS:
+        fprintf(fp, "typedef VL_API_PACKED(struct _vl_api_%s {\n", CDATA0);
+        child = this->deeper;
+        indent += 4;
+        while (child) {
+            node_vft_t *vftp = the_vft[child->type];
+            indent_me(fp);
+            vftp->generate(child, which, fp);
+            child = child->peer;
+        }
+        indent -= 4;
+        fprintf(fp, "}) vl_api_%s_t;\n\n", CDATA0);
+        break;
+
+    case ENDIANFUN_PASS:
+    case PRINTFUN_PASS:
+        child = this->deeper;
+        while (child) {
+            node_vft_t *vftp = the_vft[child->type];
+            vftp->generate(child, which, fp);
+            child = child->peer;
+        }
+        break;
+
+    case PYTHON_PASS:
+      fprintf(fp, "('%s',\n", CDATA0);
+        child = this->deeper;
+        indent += 4;
+        while (child) {
+            node_vft_t *vftp = the_vft[child->type];
+            indent_me(fp);
+            vftp->generate(child, which, fp);
+            child = child->peer;
+        }
+        indent -= 4;
+        fprintf(fp, "),\n\n");
+        break;
+
+    case JSON_PASS:
+        fprintf(fp, "[\"%s\",\n", CDATA0);
+        child = this->deeper;
+        indent += 4;
+        while (child) {
+            node_vft_t *vftp = the_vft[child->type];
+            indent_me(fp);
+            vftp->generate(child, which, fp);
+            child = child->peer;
+	    fprintf(fp, ",\n");
+        }
+	indent_me(fp);
+	fprintf (fp, "{\"crc\" : \"0x%08x\"}\n", (u32)(u64)CDATA3);
+        indent -= 4;
+	indent_me(fp);
+        fprintf(fp, "]");
+        break;
+
+    default:
+        fprintf(stderr, "node_define_generate: unimp pass %d\n", which);
+        break;
+    }
+}
+
+node_vft_t node_define_vft = {
+    node_define_print,
+    node_define_generate,
+    0,
+};
+
+void node_union_print (node_t *this)
+{
+    primtype_recursive_print (this, "union ");
+}
+
+void node_union_generate (node_t *this, enum passid which, FILE *fp)
+{
+    node_t *child;
+    node_t *uelem;
+    int case_id=1;
+
+    switch(which) {
+    case TYPEDEF_PASS:
+        fprintf(fp, "u8 _%s_which;\n", CDATA0);
+        indent_me(fp);
+        fprintf(fp, "union _%s {\n", CDATA0);
+        child = this->deeper;
+        indent += 4;
+    
+        while (child) {
+            node_vft_t *vftp = the_vft[child->type];
+            indent_me(fp);
+            vftp->generate(child, which, fp);
+            child = child->peer;
+        }
+        indent -= 4;
+        indent_me(fp);
+        fprintf(fp, "} %s;\n", CDATA0);
+        break;
+
+    case PRINTFUN_PASS:
+    case ENDIANFUN_PASS:
+        uelem = this->deeper;
+        
+        indent_me(fp);
+        fprintf(fp, "switch(a->_%s_which) {\n",
+                CDATA0);
+        indent += 4;
+        current_union_name = CDATA0;
+
+        /* Walk the list of objects in this union */
+        while (uelem) {
+            node_vft_t *vftp = the_vft[uelem->type];
+            indent -= 4;
+            indent_me(fp);
+            fprintf(fp, "case %d:\n", case_id);
+            case_id++;
+            indent += 4;
+            /* Drill down on each element */
+            vftp->generate(uelem, which, fp);
+            indent_me(fp);
+            fprintf(fp, "break;\n");
+            uelem = uelem->peer;
+        }
+        current_union_name = 0;
+        indent -= 4;
+        indent_me(fp);
+        fprintf(fp, "default:\n");
+        indent += 4;
+        indent_me(fp);                 
+        if (which == PRINTFUN_PASS) {
+            fprintf(fp, 
+                    "vl_print(handle, \"WARNING: _%s_which not set.\\n\");\n",
+                    CDATA0);
+        }
+        indent_me(fp);
+        fprintf(fp, "break;\n");
+        indent -= 4;
+        indent_me(fp);
+        fprintf(fp, "}\n");
+        break;
+
+    default:
+        fprintf(stderr, "node_union_generate: unimp pass %d\n", which);
+        break;
+    }
+}
+
+
+node_vft_t node_union_vft = {
+    node_union_print,
+    node_union_generate,
+    0,
+};
+
+void node_scalar_print (node_t *this)
+{
+    fprintf(stdout, "%s", CDATA0);
+    primtype_recursive_print (this, "");
+}
+
+void node_scalar_generate (node_t *this, enum passid which, FILE *fp)
+{
+    char *union_prefix = "";
+
+    if (current_union_name) {
+        sprintf(tmpbuf, "%s.", current_union_name);
+        union_prefix = tmpbuf;
+    }
+
+    switch(which) {
+    case TYPEDEF_PASS:
+        fprintf(fp, "%s;\n", CDATA0);
+        break;
+
+    case PRINTFUN_PASS:
+        indent_me(fp);
+        if (current_is_complex) {
+            fprintf(fp, "vl_api_%s_t_print(a->%s%s, handle);\n", 
+                    current_type_name, union_prefix, CDATA0);
+        } else {
+            if (!strcmp(current_type_fmt, "uword")) {
+                fprintf(fp, 
+           "vl_print(handle, \"%s%s: \" _uword_fmt \"\\n\", %s a->%s%s);\n", 
+                        union_prefix, CDATA0, "(_uword_cast)",
+                        union_prefix, CDATA0);
+            } else {
+                fprintf(fp, 
+                        "vl_print(handle, \"%s%s: %s\\n\", %s a->%s%s);\n", 
+                        union_prefix, CDATA0, 
+                        current_type_fmt, current_type_cast,
+                        union_prefix, CDATA0);
+            }
+        }
+        break;
+
+    case ENDIANFUN_PASS:
+        indent_me(fp);
+        if (current_is_complex) {
+            fprintf(fp, "vl_api%s_t_endian(a->%s%s);\n", 
+                    current_type_name, union_prefix, CDATA0);
+        } else {
+            /* Current_endianfun == NULL means e.g. it's a u8... */
+            if (current_endianfun) {
+                fprintf(fp, "a->%s%s = %s(a->%s%s);\n", union_prefix,
+                        CDATA0, current_endianfun, 
+                        union_prefix, CDATA0);
+            } else {
+                fprintf(fp, "/* a->%s%s = a->%s%s (no-op) */\n",
+                        union_prefix, CDATA0, 
+                        union_prefix, CDATA0);
+            }
+        }
+        break;
+    case PYTHON_PASS:
+        fprintf(fp, "'%s'),\n", CDATA0);
+        break;
+
+    case JSON_PASS:
+        fprintf(fp, "\"%s\"]", CDATA0);
+        break;
+
+    default:
+        fprintf(stderr, "node_scalar_generate: unimp pass %d\n", which);
+    }
+    if (this->deeper) {
+        fprintf(stderr, "broken recursion in node_scalar_generate\n");
+    }
+}
+
+
+node_vft_t node_scalar_vft = {
+    node_scalar_print,
+    node_scalar_generate,
+    0,
+};
+
+void node_vector_print (node_t *this)
+{
+    primtype_recursive_print (this, "vector ");
+}
+
+void node_vector_generate (node_t *this, enum passid which, FILE *fp)
+{
+    char *union_prefix = "";
+
+    if (current_union_name) {
+        sprintf(tmpbuf, "%s.", current_union_name);
+        union_prefix = tmpbuf;
+    }
+
+    switch(which) {
+    case TYPEDEF_PASS:
+        fprintf(fp, "%s[%d];\n", CDATA0, IDATA1);
+        break;
+
+    case PRINTFUN_PASS:
+        /* Don't bother about "u8 data [0];" et al. */
+        if (IDATA1 == 0)
+            break;
+
+        indent_me(fp);
+        fprintf(fp, "{\n");
+        indent += 4;
+        indent_me(fp);
+        fprintf(fp, "int _i;\n");
+        indent_me(fp);
+        fprintf(fp, "for (_i = 0; _i < %d; _i++) {\n", 
+                IDATA1);
+        indent += 4;
+        indent_me(fp);
+        if (current_is_complex) {
+            fprintf(fp, "vl_print(handle, \"%s%s[%%d]: ",
+                    union_prefix, CDATA0);
+            fprintf(fp, 
+                    "vl_print_%s (handle, a->%s%s[_i]);\n", 
+                    CDATA0, union_prefix, CDATA0);
+        } else {
+            fprintf(fp, 
+         "vl_print(handle, \"%s%s[%%d]: %s\\n\", _i, a->%s%s[_i]);\n",
+                    union_prefix, CDATA0, 
+                    current_type_fmt, 
+                    union_prefix, CDATA0);
+        }
+        indent -= 4;
+        indent_me(fp);
+        fprintf(fp, "}\n");
+        indent -= 4;
+        indent_me(fp);
+        fprintf(fp, "}\n");
+        break;
+
+    case ENDIANFUN_PASS:
+        /* Don't bother about "u8 data [0];" et al. */
+        if (IDATA1 == 0)
+            break;
+        /* If this is a simple endian swap, but the endian swap method is a no-op,
+         * then indicate this is a no-op in a comment.
+         */
+	if (!current_is_complex && current_endianfun == NULL) {
+            indent_me(fp);
+            fprintf(fp, "/* a->%s%s[0..%d] = a->%s%s[0..%d] (no-op) */\n",
+                    union_prefix, CDATA0, IDATA1 - 1,
+                    union_prefix, CDATA0, IDATA1 - 1);
+            break;
+        }
+
+        indent_me(fp);
+        fprintf(fp, "{\n");
+        indent += 4;
+        indent_me(fp);
+        fprintf(fp, "int _i;\n");
+        indent_me(fp);
+        fprintf(fp, "for (_i = 0; _i < %d; _i++) {\n", 
+                IDATA1);
+        indent += 4;
+        indent_me(fp);
+        if (current_is_complex) {
+            fprintf(fp, 
+                    "vl_api_%s_t_endian (a->%s%s[_i]);\n", 
+                    current_type_name, union_prefix, CDATA0);
+        } else {
+            fprintf(fp, 
+                    "a->%s%s[_i] = %s(a->%s%s[_i]);\n", 
+                    union_prefix, CDATA0, 
+                    current_endianfun, 
+                    union_prefix, CDATA0);
+        }
+        indent -= 4;
+        indent_me(fp);
+        fprintf(fp, "}\n");
+        indent -= 4;
+        indent_me(fp);
+        fprintf(fp, "}\n");
+        break;
+    case PYTHON_PASS:
+        if (CDATA2 != 0) { // variable length vector
+            fprintf(fp, "'%s', '%d', '%s'),\n", CDATA0, IDATA1, CDATA2);
+        } else {
+            fprintf(fp, "'%s', '%d'),\n", CDATA0, IDATA1);
+        }
+        break;
+
+    case JSON_PASS:
+      if (CDATA2 != 0) { /* variable length vector */
+            fprintf(fp, "\"%s\", %d, \"%s\"]", CDATA0, IDATA1, CDATA2);
+        } else {
+            fprintf(fp, "\"%s\", %d]", CDATA0, IDATA1);
+        }
+        break;
+
+    default:
+        fprintf(stderr, "node_vector_generate: unimp pass %d\n", which);
+    }
+    if (this->deeper) {
+        fprintf(stderr, "broken recursion in node_vector_generate\n");
+    }
+}
+
+node_vft_t node_vector_vft = {
+    node_vector_print,
+    node_vector_generate,
+    0,
+};
+
+void node_complex_print (node_t *this)
+{
+    primtype_recursive_print (this, "complex ");
+}
+
+void node_complex_generate (node_t *this, enum passid which, FILE *fp)
+{
+    node_t *deeper;
+    node_vft_t *vftp;
+    char *member_name = "broken!";
+    char *union_prefix = "";
+
+    if (current_union_name) {
+        sprintf(tmpbuf, "%s.", current_union_name);
+        union_prefix = tmpbuf;
+    }
+
+    current_is_complex++;
+    
+    switch(which) {
+    case TYPEDEF_PASS:
+        fprintf(fp, "%s ", CDATA0);
+        deeper = this->deeper;
+        if (deeper) {
+            vftp = the_vft[deeper->type];
+            vftp->generate(deeper, which, fp);
+        }
+        break;
+
+    case PRINTFUN_PASS:
+        deeper = this->deeper;
+        while (deeper) {
+            if (deeper->type == NODE_SCALAR ||
+                deeper->type == NODE_VECTOR) {
+                member_name = deeper->data[0];
+                break;
+            }
+            deeper = deeper->deeper;
+        }
+        indent_me(fp);
+        fprintf(fp, "vl_print(handle, \"%s%s ----- \\n\");\n", 
+                union_prefix, member_name);
+        indent_me(fp);
+        fprintf(fp, "%s_print(&a->%s%s, handle);\n", 
+                CDATA0, union_prefix, member_name);
+        indent_me(fp);
+        fprintf(fp, "vl_print(handle, \"%s%s ----- END \\n\");\n", 
+                union_prefix, member_name);
+        break;
+
+    case ENDIANFUN_PASS:
+        deeper = this->deeper;
+        while (deeper) {
+            if (deeper->type == NODE_SCALAR ||
+                deeper->type == NODE_VECTOR) {
+                member_name = deeper->data[0];
+                break;
+            }
+            deeper = deeper->deeper;
+        }
+
+        indent_me(fp);
+        fprintf(fp, "%s_endian(&a->%s%s);\n", 
+                CDATA0, union_prefix, member_name);
+        break;
+    case PYTHON_PASS:
+        fprintf(fp, "('%s',", CDATA0);
+        deeper = this->deeper;
+        if (deeper) {
+            vftp = the_vft[deeper->type];
+            vftp->generate(deeper, which, fp);
+        }
+        break;
+
+    case JSON_PASS:
+        fprintf(fp, "[\"%s\", ", CDATA0);
+        deeper = this->deeper;
+        if (deeper) {
+            vftp = the_vft[deeper->type];
+            vftp->generate(deeper, which, fp);
+        }
+        break;
+
+    default:
+        fprintf(stderr, "node_complex_generate unimp pass %d...\n", which);
+        break;
+    }
+    current_is_complex--;
+}
+
+node_vft_t node_complex_vft = {
+    node_complex_print,
+    node_complex_generate,
+    0,
+};
+
+void node_noversion_print (node_t *this)
+{
+    primtype_recursive_print (this, "noversion ");
+}
+
+void node_noversion_generate (node_t *this, enum passid which, FILE *ofp)
+{
+    fprintf(stderr, "node_noversion_generate called...\n");
+}
+
+node_vft_t node_noversion_vft = {
+    node_noversion_print,
+    node_noversion_generate,
+    0,
+};
+
+void node_uword_print (node_t *this)
+{
+    primtype_recursive_print(this, "uword ");
+}
+
+void node_uword_generate (node_t *this, enum passid which, FILE *ofp)
+{
+    primtype_recursive_generate(this, which, ofp, "uword", "uword", "");
+}
+
+node_vft_t node_uword_vft = {
+    node_uword_print,
+    node_uword_generate,
+    "clib_net_to_host_uword",
+};
+
+node_vft_t *the_vft[NODE_N_TYPES] = {
+    &node_illegal_vft,
+    &node_u8_vft,
+    &node_u16_vft,
+    &node_u32_vft,
+    &node_u64_vft,
+    &node_i8_vft,
+    &node_i16_vft,
+    &node_i32_vft,
+    &node_i64_vft,
+    &node_f64_vft,
+    &node_packed_vft,
+    &node_define_vft,
+    &node_union_vft,
+    &node_scalar_vft,
+    &node_vector_vft,
+    &node_complex_vft,
+    &node_noversion_vft,
+    &node_uword_vft,
+};
+
+void *make_node (enum node_subclass type)
+{
+    node_t *rv;
+
+    rv = (node_t *) malloc (sizeof (*rv));
+    if (rv == 0) {
+        fprintf (stderr, "fatal: make_node out of memory\n");
+        exit (1);
+    }
+    bzero (rv, sizeof (*rv));
+    rv->type = type;
+    return ((void *) rv);
+}
+
+YYSTYPE deeper (YYSTYPE arg1, YYSTYPE arg2)
+{
+    node_t *np1 = (node_t *) arg1;
+    node_t *np2 = (node_t *) arg2;
+    node_t *hook_point;
+    
+    hook_point = np1;
+
+    while (hook_point->deeper)
+        hook_point = hook_point->deeper;
+
+    hook_point->deeper = np2;
+    return (arg1);
+}
+
+YYSTYPE addpeer (YYSTYPE arg1, YYSTYPE arg2)
+{
+    node_t *np1 = (node_t *) arg1;
+    node_t *np2 = (node_t *) arg2;
+    node_t *hook_point;
+    
+    hook_point = np1;
+
+    while (hook_point->peer)
+        hook_point = hook_point->peer;
+
+    hook_point->peer = np2;
+    return (arg1);
+}
+
+/*
+ * add_slist (stmt_list, stmt)
+ */
+
+YYSTYPE add_slist (YYSTYPE a1, YYSTYPE a2)
+{
+    if (a1 && a2)
+        return (addpeer(a1, a2));
+    else if(a1)
+        return(a1);
+    else 
+        return(a2);
+}
+
+/*
+ * add_define (char *name, defn_list);
+ */
+YYSTYPE add_define (YYSTYPE a1, YYSTYPE a2)
+{
+    node_t *np;
+
+    np = make_node(NODE_DEFINE);
+    np->data[0] = a1;
+    np->data[3] = (void *) message_crc;
+    deeper((YYSTYPE)np, a2);
+    return ((YYSTYPE) np);
+}
+
+/*
+ * add_defbody (defn_list, new_defn)
+ */
+YYSTYPE add_defbody (YYSTYPE a1, YYSTYPE a2)
+{
+    return (addpeer(a1, a2));
+}
+
+/*
+ * add_primtype ([packed], primitive type, instance)
+ */ 
+
+YYSTYPE add_primtype (YYSTYPE a1, YYSTYPE a2, YYSTYPE a3)
+{
+    /* Hook instance to type node */
+    deeper (a1, a2);
+    if (a3) {
+        deeper(a1, a3);
+    }
+    return (a1);
+}
+
+/*
+ * add_complex(char *type_name, instance)
+ */
+
+YYSTYPE add_complex (YYSTYPE a1, YYSTYPE a2)
+{
+    node_t *np;
+
+    np = make_node(NODE_COMPLEX);
+    np->data[0] = (void *) a1;
+
+    deeper((YYSTYPE)np, a2);
+    return ((YYSTYPE) np);
+}
+
+/*
+ * add_union(char *type_name, definition)
+ */
+
+YYSTYPE add_union (YYSTYPE a1, YYSTYPE a2)
+{
+    node_t *np;
+
+    np = make_node(NODE_UNION);
+    np->data[0] = (void *) a1;
+
+    deeper((YYSTYPE)np, a2);
+    return ((YYSTYPE) np);
+}
+
+
+/*
+ * add_vector_vbl (node_t *variable, YYSTYPE size)
+ */
+
+YYSTYPE add_vector_vbl (YYSTYPE a1, YYSTYPE a2)
+{
+    node_t *np;
+
+    np = make_node(NODE_VECTOR);
+    np->data[0] = (void *) a1;
+    np->data[1] = (void *) a2;
+    return ((YYSTYPE) np);
+}
+
+/*
+ * add_vector_vbl (char *vector_name, char *vector_length_var)
+ */
+
+YYSTYPE add_variable_length_vector_vbl (YYSTYPE vector_name, YYSTYPE vector_length_var)
+{
+    node_t *np;
+
+    np = make_node(NODE_VECTOR);
+    np->data[0] = (void *) vector_name;
+    np->data[1] = (void *) 0; // vector size used for vpe.api.h generation (array of length zero)
+    np->data[2] = (void *) vector_length_var; // name of the variable that stores vector length
+    return ((YYSTYPE) np);
+}
+
+/*
+ * add_scalar_vbl (char *name)
+ */
+YYSTYPE add_scalar_vbl (YYSTYPE a1)
+{
+    node_t *np;
+
+    np = make_node(NODE_SCALAR);
+    np->data[0] = (void *) a1;
+    return ((YYSTYPE) np);
+}
+
+/*
+ * set_flags (int flags, msg(=0?))
+ */ 
+YYSTYPE set_flags(YYSTYPE a1, YYSTYPE a2)
+{
+    node_t *np;
+    int flags;
+
+    np = (node_t *)a2;
+    if (!np)
+        return(0);
+
+    flags = (int)(uword) a1;
+
+    np->flags |= flags;
+    return (a2);
+}
+/*
+ * suppress_version
+ */
+YYSTYPE suppress_version (void)
+{
+    dont_output_version = 1;
+    return (0);
+}
+
+void dump(node_t *np)
+{
+    node_vft_t *vftp;
+
+    while (np) {
+        vftp = the_vft[np->type];
+        vftp->print(np);
+        np = np->peer;
+    }
+}
+
+char *fixup_input_filename(void)
+{
+    char *cp;
+
+    cp = (char *)input_filename;
+
+    while (*cp)
+        cp++;
+
+    cp--;
+
+    while (cp > input_filename && *cp != '/')
+        cp--;
+    if (*cp == '/')
+        cp++;
+
+    strncpy (tmpbuf, cp, sizeof(tmpbuf)-1);
+
+    cp = tmpbuf;
+
+    while (*cp)
+        cp++;
+
+    cp--;
+
+    while (cp > tmpbuf && *cp != '.')
+        cp--;
+    
+    if (*cp == '.')
+        *cp = 0;
+
+    return (sxerox(tmpbuf));
+}
+
+void generate_top_boilerplate(FILE *fp)
+
+{
+    char *datestring = ctime(&starttime);
+    fixed_name = fixup_input_filename();
+
+    datestring[24] = 0;
+
+    fprintf (fp, "/*\n");
+    fprintf (fp, " * VLIB API definitions %s\n", datestring);
+    fprintf (fp, " * Input file: %s\n", input_filename);
+    fprintf (fp, " * Automatically generated: please edit the input file ");
+    fprintf (fp, "NOT this file!\n");
+    fprintf (fp, " */\n\n");
+    fprintf (fp, "#if defined(vl_msg_id)||defined(vl_union_id)||");
+    fprintf (fp, "defined(vl_printfun) \\\n ||defined(vl_endianfun)||");
+    fprintf (fp, " defined(vl_api_version)||defined(vl_typedefs) \\\n");
+    fprintf (fp, " ||defined(vl_msg_name)||defined(vl_msg_name_crc_list)\n");
+    fprintf (fp, "/* ok, something was selected */\n");
+    fprintf (fp, "#else\n");
+    fprintf (fp, "#warning no content included from %s\n", input_filename);
+    fprintf (fp, "#endif\n\n");
+    fprintf (fp, "#define VL_API_PACKED(x) x __attribute__ ((packed))\n\n");
+}
+
+void generate_bottom_boilerplate(FILE *fp)
+
+{
+    fprintf (fp, "\n#ifdef vl_api_version\n");
+
+    if (dont_output_version) {
+        fprintf (fp, "/* WARNING: API FILE VERSION CHECK DISABLED */\n");
+        input_crc = 0;
+    }
+
+    fprintf (fp, "vl_api_version(%s, 0x%08x)\n\n", 
+             fixed_name, (unsigned int)input_crc);
+    fprintf (fp, "#endif\n\n");
+}
+
+void generate_msg_ids(YYSTYPE a1, FILE *fp)
+{
+    node_t *np = (node_t *)a1;
+
+    fprintf (fp, "\n/****** Message ID / handler enum ******/\n\n");
+    fprintf (fp, "#ifdef vl_msg_id\n");
+
+    while (np) {
+        if (np->type == NODE_DEFINE) {
+            if (!(np->flags & NODE_FLAG_TYPEONLY)) {
+                fprintf (fp, "vl_msg_id(VL_API_%s, vl_api_%s_t_handler)\n", 
+                         uppercase(np->data[0]), (i8 *)np->data[0]);
+            } else {
+                fprintf (fp, "/* typeonly: %s */\n", (i8 *)np->data[0]);
+            }
+        }
+        np = np->peer;
+    }
+    fprintf (fp, "#endif\n");
+
+}
+
+void generate_msg_names(YYSTYPE a1, FILE *fp)
+{
+    node_t *np = (node_t *)a1;
+
+    fprintf (fp, "\n/****** Message names ******/\n\n");
+
+    fprintf (fp, "#ifdef vl_msg_name\n");
+
+    while (np) {
+        if (np->type == NODE_DEFINE) {
+            if (!(np->flags & NODE_FLAG_TYPEONLY)) {
+                fprintf (fp, "vl_msg_name(vl_api_%s_t, %d)\n",
+                         (i8 *) np->data[0], 
+                         (np->flags & NODE_FLAG_DONT_TRACE ? 0 : 1));
+            } else {
+                fprintf (fp, "/* typeonly: %s */\n", (i8 *)np->data[0]);
+            }
+        }
+        np = np->peer;
+    }
+    fprintf (fp, "#endif\n\n");
+}
+
+void generate_msg_name_crc_list (YYSTYPE a1, FILE *fp)
+{
+    node_t *np = (node_t *)a1;
+    char *unique_suffix, *cp;
+
+    unique_suffix = sxerox(fixed_name);
+
+    cp = unique_suffix;
+    while (*cp && (*cp != '.'))
+        cp++;
+    if (*cp == '.')
+        *cp = 0;
+
+    fprintf (fp, "\n/****** Message name, crc list ******/\n\n");
+
+    fprintf (fp, "#ifdef vl_msg_name_crc_list\n");
+    fprintf (fp, "#define foreach_vl_msg_name_crc_%s ", unique_suffix);
+
+    while (np) {
+        if (np->type == NODE_DEFINE) {
+            if (!(np->flags & NODE_FLAG_TYPEONLY)) {
+                fprintf (fp, "\\\n_(VL_API_%s, %s, %08x) ",
+                         uppercase (np->data[0]), (i8 *) np->data[0],
+                         (u32)(u64)np->data[3]);
+            }
+        }
+        np = np->peer;
+    }
+    fprintf (fp, "\n#endif\n\n");
+    free (unique_suffix);
+}
+
+void generate_typedefs(YYSTYPE a1, FILE *fp)
+{
+    node_t *np = (node_t *)a1;
+    node_vft_t *vftp;
+
+    fprintf(fp, "\n/****** Typedefs *****/\n\n");
+    fprintf(fp, "#ifdef vl_typedefs\n\n");
+
+    /* Walk the top-level node-list */
+    while (np) {
+        if (np->type == NODE_DEFINE) {
+            /* Yeah, this is pedantic */
+            vftp = the_vft[np->type];
+            vftp->generate(np, TYPEDEF_PASS, fp);
+        }
+        np = np->peer;
+    }
+    fprintf(fp, "#endif /* vl_typedefs */\n\n");
+}
+
+void union_walk_one_defn(node_t *np, FILE *fp)
+{
+    node_t *vblp;
+    node_t *uelem;
+
+    /* Walk the list of typed objects in this msg def */
+    while (np) {
+        if (np->type == NODE_UNION) {
+            current_union_name = np->data[0];
+            uelem = np->deeper;
+
+            /* Walk the list of objects in this union */
+            while (uelem) {
+                vblp = uelem->deeper;
+                /* Drill down on each element, find the variable name */
+                while(vblp) {
+                    if (vblp->type == NODE_SCALAR ||
+                        vblp->type == NODE_VECTOR ||
+                        vblp->type == NODE_COMPLEX) {
+                        fprintf(ofp, "#define %s_", 
+                                uppercase(current_def_name));
+                        fprintf(ofp, "%s_", uppercase(current_union_name));
+                        fprintf(ofp, "%s %d\n",uppercase(vblp->data[0]),
+                                current_id);
+                        current_id++;
+                        break;
+                    }
+                    vblp = vblp->deeper;
+                }
+                uelem = uelem->peer;
+            }
+            current_union_name = 0;
+            current_id = 1;
+        }
+        np = np->peer;
+    }
+}
+
+void generate_uniondefs(YYSTYPE a1, FILE *fp)
+{
+    node_t *np = (node_t *)a1;
+
+    fprintf(fp, "/****** Discriminated Union Definitions *****/\n\n");
+    fprintf(fp, "#ifdef vl_union_id\n\n");
+
+    /* Walk the top-level node-list */
+    while (np) {
+        if (np->type == NODE_DEFINE) {
+            current_id = 1;
+            current_def_name = np->data[0];
+            union_walk_one_defn(np->deeper, fp);
+        }
+        np = np->peer;
+    }
+    fprintf(fp, "\n#endif /* vl_union_id */\n\n");
+}
+
+void generate_printfun(YYSTYPE a1, FILE *fp)
+{
+    node_t *np = (node_t *)a1;
+    node_vft_t *vftp;
+
+    fprintf(fp, "/****** Print functions *****/\n\n");
+    fprintf(fp, "#ifdef vl_printfun\n\n");
+
+    fprintf(fp, "#ifdef LP64\n");
+    fputs ("#define _uword_fmt \"%lld\"\n", fp);
+    fputs ("#define _uword_cast (long long)\n", fp);
+    fprintf(fp, "#else\n");
+    fputs("#define _uword_fmt \"%ld\"\n", fp);
+    fputs ("#define _uword_cast long\n", fp);
+    fprintf(fp, "#endif\n\n");
+
+    /* Walk the top-level node-list */
+    while (np) {
+        if (np->type == NODE_DEFINE) {
+            if (!(np->flags & NODE_FLAG_MANUAL_PRINT)) {
+                fprintf(fp, 
+       "static inline void *vl_api_%s_t_print (vl_api_%s_t *a,",
+                        (i8 *)np->data[0], (i8 *) np->data[0]);
+                fprintf(fp, "void *handle)\n{\n");
+                /* output the message name */
+                fprintf(fp, 
+                    "    vl_print(handle, \"vl_api_%s_t:\\n\");\n",
+                        (i8 *)np->data[0]);
+
+                indent += 4;
+                /* Yeah, this is pedantic */
+                vftp = the_vft[np->type];
+                vftp->generate(np, PRINTFUN_PASS, fp);
+                fprintf(fp, "    return handle;\n");
+                fprintf(fp, "}\n\n");
+                indent -= 4;
+            } else {
+                fprintf(fp, "/***** manual: vl_api_%s_t_print  *****/\n\n",
+                        (i8 *) np->data[0]);
+            }
+        }
+        np = np->peer;
+    }
+    fprintf(fp, "#endif /* vl_printfun */\n\n");
+}
+
+void generate_endianfun(YYSTYPE a1, FILE *fp)
+{
+    node_t *np = (node_t *)a1;
+    node_vft_t *vftp;
+
+    fprintf(fp, "\n/****** Endian swap functions *****/\n\n");
+    fprintf(fp, "#ifdef vl_endianfun\n\n");
+    fprintf(fp, "#undef clib_net_to_host_uword\n");
+    fprintf(fp, "#ifdef LP64\n");
+    fprintf(fp, "#define clib_net_to_host_uword clib_net_to_host_u64\n");
+    fprintf(fp, "#else\n");
+    fprintf(fp, "#define clib_net_to_host_uword clib_net_to_host_u32\n");
+    fprintf(fp, "#endif\n\n");
+
+    /* Walk the top-level node-list */
+    while (np) {
+        if (np->type == NODE_DEFINE) {
+            if (!(np->flags & NODE_FLAG_MANUAL_ENDIAN)) {
+                fprintf(fp, 
+               "static inline void vl_api_%s_t_endian (vl_api_%s_t *a)\n{\n",
+                        (i8 *) np->data[0], (i8 *) np->data[0]);
+                indent += 4;
+                /* Yeah, this is pedantic */
+                vftp = the_vft[np->type];
+                vftp->generate(np, ENDIANFUN_PASS, fp);
+                fprintf(fp, "}\n\n");
+                indent -= 4;
+            } else {
+                fprintf(fp, "/***** manual: vl_api_%s_t_endian  *****/\n\n",
+                        (i8 *) np->data[0]);
+            }
+        }
+        np = np->peer;
+    }
+    fprintf(fp, "#endif /* vl_endianfun */\n\n");
+}
+
+void add_msg_ids(YYSTYPE a1)
+{
+    node_t *np = (node_t *)a1;
+    node_t *new_u16;
+    node_t *new_vbl;
+
+    /* Walk the top-level node-list */
+    while (np) {
+        if (np->type == NODE_DEFINE) {
+            if (!(np->flags & NODE_FLAG_TYPEONLY)) {
+	        /* add the parse tree for "u16 _vl_msg_id" */
+                new_u16 = make_node(NODE_U16);
+                new_u16->peer = np->deeper;
+                np->deeper = new_u16;
+                new_vbl = make_node(NODE_SCALAR);
+                new_vbl->data[0] = sxerox("_vl_msg_id");
+                new_u16->deeper = new_vbl;
+	    }
+        }
+        np = np->peer;
+    }
+}
+
+void generate_python_msg_definitions(YYSTYPE a1, FILE *fp)
+{
+    node_t *np = (node_t *)a1;
+    node_vft_t *vftp;
+    fprintf (fp, "messages = [\n");
+    /* Walk the top-level node-list */
+    while (np) {
+      if (np->type == NODE_DEFINE && !(np->flags & NODE_FLAG_TYPEONLY)) {
+        /* Yeah, this is pedantic */
+        vftp = the_vft[np->type];
+        vftp->generate(np, PYTHON_PASS, fp);
+      }
+      np = np->peer;
+    }
+    fprintf (fp, "\n]\n");
+}
+
+static bool
+is_typeonly_check(node_t *np, bool typeonly)
+{
+  bool is_typeonly = (np->flags & NODE_FLAG_TYPEONLY);
+  return (is_typeonly == typeonly);
+}
+
+static void
+generate_json_definitions(YYSTYPE a1, FILE *fp, bool typeonly)
+{
+    node_t *np = (node_t *)a1;
+    node_vft_t *vftp;
+    indent_me(fp);
+    if (typeonly)
+      fprintf (fp, "\"types\" : [\n");
+    else
+      fprintf (fp, "\"messages\" : [\n");
+
+    /* Walk the top-level node-list */
+    bool comma = false;
+    indent += 4;
+    while (np) {
+      if (np->type == NODE_DEFINE && is_typeonly_check(np, typeonly)) {
+        /* Yeah, this is pedantic */
+        vftp = the_vft[np->type];
+	indent_me(fp);
+        vftp->generate(np, JSON_PASS, fp);
+	comma = true;
+      }
+      np = np->peer;
+      if (comma && np &&
+	  np->type == NODE_DEFINE && is_typeonly_check(np, typeonly))
+	fprintf (fp, ",\n");
+
+    }
+    indent -= 4;
+    fprintf (fp, "\n");
+    indent_me(fp);
+    fprintf(fp, "]");
+}
+
+void generate_python_typeonly_definitions(YYSTYPE a1, FILE *fp)
+{
+    node_t *np = (node_t *)a1;
+    node_vft_t *vftp;
+    fprintf (fp, "types = [\n");
+    /* Walk the top-level node-list */
+    while (np) {
+      if (np->type == NODE_DEFINE && (np->flags & NODE_FLAG_TYPEONLY)) {
+        vftp = the_vft[np->type];
+        vftp->generate(np, PYTHON_PASS, fp);
+      }
+      np = np->peer;
+    }
+    fprintf (fp, "\n]\n");
+}
+
+void generate_python(YYSTYPE a1, FILE *fp)
+{
+    generate_python_typeonly_definitions(a1, fp);
+    generate_python_msg_definitions(a1, fp);
+
+    /*
+     * API CRC signature
+     */
+    fprintf (fp, "vl_api_version = 0x%08x\n\n", (unsigned int)input_crc);
+}
+
+void generate_json(YYSTYPE a1, FILE *fp)
+{
+    fprintf (fp, "{\n");
+    indent += 4;
+    generate_json_definitions(a1, fp, true);
+    fprintf (fp, ",\n");
+    generate_json_definitions(a1, fp, false);
+
+    /*
+     * API CRC signature
+     */
+    fprintf (fp, ",\n\"vl_api_version\" :\"0x%08x\"\n",
+	     (unsigned int)input_crc);
+    fprintf (fp, "}\n");
+}
+
+void generate(YYSTYPE a1)
+{
+    if (dump_tree) {
+        dump((node_t *)a1);
+    }
+
+    add_msg_ids(a1);
+
+    if (ofp) {
+        generate_top_boilerplate(ofp);
+
+        generate_msg_ids(a1, ofp);
+        generate_msg_names(a1, ofp);
+        generate_msg_name_crc_list(a1, ofp);
+        generate_typedefs(a1, ofp);
+        generate_uniondefs(a1, ofp);
+        generate_printfun(a1, ofp);
+        generate_endianfun(a1, ofp);
+        
+        generate_bottom_boilerplate(ofp);
+    }
+    if (pythonfp) {
+      generate_python(a1, pythonfp);
+    }
+    if (jsonfp) {
+      generate_json(a1, jsonfp);
+    }
+}
diff --git a/src/tools/vppapigen/node.h b/src/tools/vppapigen/node.h
new file mode 100644
index 00000000..297d6036
--- /dev/null
+++ b/src/tools/vppapigen/node.h
@@ -0,0 +1,94 @@
+/*
+ *------------------------------------------------------------------
+ * node.h - definitions for an API generator
+ *
+ * Copyright (c) 2004-2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef _node_h_
+#define _node_h_
+
+/*
+ * Global prototypes
+ */
+
+char *sxerox (const char *s);
+
+enum node_subclass {  /* WARNING: indices must match the vft... */
+    NODE_ILLEGAL=0,
+    NODE_U8,
+    NODE_U16,
+    NODE_U32,
+    NODE_U64,
+    NODE_I8,
+    NODE_I16,
+    NODE_I32,
+    NODE_I64,
+    NODE_F64,
+    NODE_PACKED,
+    NODE_DEFINE,
+    NODE_UNION,
+    NODE_SCALAR,
+    NODE_VECTOR,
+    NODE_COMPLEX,
+    NODE_NOVERSION,
+    NODE_UWORD,
+    NODE_N_TYPES,  /* number of node types with VFT's */
+
+    /* pseudo-node(s) used in the lexer keyword table, but
+       NOT in need of a VFT... */
+    NODE_TYPEONLY,
+    NODE_MANUAL_PRINT,
+    NODE_MANUAL_ENDIAN,
+    NODE_DONT_TRACE,
+};
+
+enum passid {
+    TYPEDEF_PASS=1,
+    UNION_DEF_PASS,
+    ENDIANFUN_PASS,
+    PRINTFUN_PASS,
+    PYTHON_PASS,
+    JSON_PASS,
+};
+
+extern void *make_node (enum node_subclass type);
+
+typedef struct node_ {
+    enum node_subclass type;
+    struct node_ *peer;
+    struct node_ *deeper;
+    int flags;
+    void *data[4];
+} node_t;
+
+/* To shut up gcc-4.2.x warnings */
+#define CDATA0 ((char *)(this->data[0]))
+#define IDATA1 ((int)(uword)(this->data[1]))
+#define CDATA2 ((char *)(this->data[2]))
+#define CDATA3 ((char *)(this->data[3]))
+
+#define NODE_FLAG_MANUAL_PRINT (1<<0)
+#define NODE_FLAG_MANUAL_ENDIAN (1<<1)
+#define NODE_FLAG_TYPEONLY (1<<3)
+#define NODE_FLAG_DONT_TRACE (1<<4)
+
+typedef struct node_vft_ {
+    void (*print)(struct node_ *);
+    void (*generate)(struct node_ *, enum passid id, FILE *ofp);
+    char *endian_converter;
+} node_vft_t;    
+
+#endif /* _node_h */
diff --git a/src/vat/api_format.c b/src/vat/api_format.c
new file mode 100644
index 00000000..e6c0f244
--- /dev/null
+++ b/src/vat/api_format.c
@@ -0,0 +1,17829 @@
+/*
+ *------------------------------------------------------------------
+ * api_format.c
+ *
+ * Copyright (c) 2014-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vat/vat.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vnet/ip/ip.h>
+#include <vnet/sr/sr_packet.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2tp/l2tp.h>
+#include <vnet/vxlan/vxlan.h>
+#include <vnet/gre/gre.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <vnet/lisp-gpe/lisp_gpe.h>
+
+#include <vpp/api/vpe_msg_enum.h>
+#include <vnet/l2/l2_classify.h>
+#include <vnet/l2/l2_vtr.h>
+#include <vnet/classify/input_acl.h>
+#include <vnet/classify/policer_classify.h>
+#include <vnet/classify/flow_classify.h>
+#include <vnet/mpls/mpls.h>
+#include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/ikev2.h>
+#include <inttypes.h>
+#include <vnet/map/map.h>
+#include <vnet/cop/cop.h>
+#include <vnet/ip/ip6_hop_by_hop.h>
+#include <vnet/ip/ip_source_and_port_range_check.h>
+#include <vnet/policer/xlate.h>
+#include <vnet/span/span.h>
+#include <vnet/policer/policer.h>
+#include <vnet/policer/police.h>
+
+#include "vat/json_format.h"
+
+#include <inttypes.h>
+#include <sys/stat.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_typedefs
+
+/* declare message handlers for each api */
+
+#define vl_endianfun		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_printfun
+
+static uword
+api_unformat_sw_if_index (unformat_input_t * input, va_list * args)
+{
+  vat_main_t *vam = va_arg (*args, vat_main_t *);
+  u32 *result = va_arg (*args, u32 *);
+  u8 *if_name;
+  uword *p;
+
+  if (!unformat (input, "%s", &if_name))
+    return 0;
+
+  p = hash_get_mem (vam->sw_if_index_by_interface_name, if_name);
+  if (p == 0)
+    return 0;
+  *result = p[0];
+  return 1;
+}
+
+void vat_suspend (vlib_main_t * vm, f64 interval);
+
+#if VPP_API_TEST_BUILTIN == 0
+/* Parse an IP4 address %d.%d.%d.%d. */
+uword
+unformat_ip4_address (unformat_input_t * input, va_list * args)
+{
+  u8 *result = va_arg (*args, u8 *);
+  unsigned a[4];
+
+  if (!unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]))
+    return 0;
+
+  if (a[0] >= 256 || a[1] >= 256 || a[2] >= 256 || a[3] >= 256)
+    return 0;
+
+  result[0] = a[0];
+  result[1] = a[1];
+  result[2] = a[2];
+  result[3] = a[3];
+
+  return 1;
+}
+
+uword
+unformat_ethernet_address (unformat_input_t * input, va_list * args)
+{
+  u8 *result = va_arg (*args, u8 *);
+  u32 i, a[6];
+
+  if (!unformat (input, "%_%x:%x:%x:%x:%x:%x%_",
+		 &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
+    return 0;
+
+  /* Check range. */
+  for (i = 0; i < 6; i++)
+    if (a[i] >= (1 << 8))
+      return 0;
+
+  for (i = 0; i < 6; i++)
+    result[i] = a[i];
+
+  return 1;
+}
+
+/* Returns ethernet type as an int in host byte order. */
+uword
+unformat_ethernet_type_host_byte_order (unformat_input_t * input,
+					va_list * args)
+{
+  u16 *result = va_arg (*args, u16 *);
+  int type;
+
+  /* Numeric type. */
+  if (unformat (input, "0x%x", &type) || unformat (input, "%d", &type))
+    {
+      if (type >= (1 << 16))
+	return 0;
+      *result = type;
+      return 1;
+    }
+  return 0;
+}
+
+/* Parse an IP6 address. */
+uword
+unformat_ip6_address (unformat_input_t * input, va_list * args)
+{
+  ip6_address_t *result = va_arg (*args, ip6_address_t *);
+  u16 hex_quads[8];
+  uword hex_quad, n_hex_quads, hex_digit, n_hex_digits;
+  uword c, n_colon, double_colon_index;
+
+  n_hex_quads = hex_quad = n_hex_digits = n_colon = 0;
+  double_colon_index = ARRAY_LEN (hex_quads);
+  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
+    {
+      hex_digit = 16;
+      if (c >= '0' && c <= '9')
+	hex_digit = c - '0';
+      else if (c >= 'a' && c <= 'f')
+	hex_digit = c + 10 - 'a';
+      else if (c >= 'A' && c <= 'F')
+	hex_digit = c + 10 - 'A';
+      else if (c == ':' && n_colon < 2)
+	n_colon++;
+      else
+	{
+	  unformat_put_input (input);
+	  break;
+	}
+
+      /* Too many hex quads. */
+      if (n_hex_quads >= ARRAY_LEN (hex_quads))
+	return 0;
+
+      if (hex_digit < 16)
+	{
+	  hex_quad = (hex_quad << 4) | hex_digit;
+
+	  /* Hex quad must fit in 16 bits. */
+	  if (n_hex_digits >= 4)
+	    return 0;
+
+	  n_colon = 0;
+	  n_hex_digits++;
+	}
+
+      /* Save position of :: */
+      if (n_colon == 2)
+	{
+	  /* More than one :: ? */
+	  if (double_colon_index < ARRAY_LEN (hex_quads))
+	    return 0;
+	  double_colon_index = n_hex_quads;
+	}
+
+      if (n_colon > 0 && n_hex_digits > 0)
+	{
+	  hex_quads[n_hex_quads++] = hex_quad;
+	  hex_quad = 0;
+	  n_hex_digits = 0;
+	}
+    }
+
+  if (n_hex_digits > 0)
+    hex_quads[n_hex_quads++] = hex_quad;
+
+  {
+    word i;
+
+    /* Expand :: to appropriate number of zero hex quads. */
+    if (double_colon_index < ARRAY_LEN (hex_quads))
+      {
+	word n_zero = ARRAY_LEN (hex_quads) - n_hex_quads;
+
+	for (i = n_hex_quads - 1; i >= (signed) double_colon_index; i--)
+	  hex_quads[n_zero + i] = hex_quads[i];
+
+	for (i = 0; i < n_zero; i++)
+	  hex_quads[double_colon_index + i] = 0;
+
+	n_hex_quads = ARRAY_LEN (hex_quads);
+      }
+
+    /* Too few hex quads given. */
+    if (n_hex_quads < ARRAY_LEN (hex_quads))
+      return 0;
+
+    for (i = 0; i < ARRAY_LEN (hex_quads); i++)
+      result->as_u16[i] = clib_host_to_net_u16 (hex_quads[i]);
+
+    return 1;
+  }
+}
+
+uword
+unformat_ipsec_policy_action (unformat_input_t * input, va_list * args)
+{
+  u32 *r = va_arg (*args, u32 *);
+
+  if (0);
+#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_POLICY_ACTION_##f;
+  foreach_ipsec_policy_action
+#undef _
+    else
+    return 0;
+  return 1;
+}
+
+uword
+unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args)
+{
+  u32 *r = va_arg (*args, u32 *);
+
+  if (0);
+#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_CRYPTO_ALG_##f;
+  foreach_ipsec_crypto_alg
+#undef _
+    else
+    return 0;
+  return 1;
+}
+
+u8 *
+format_ipsec_crypto_alg (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+  u8 *t = 0;
+
+  switch (i)
+    {
+#define _(v,f,str) case IPSEC_CRYPTO_ALG_##f: t = (u8 *) str; break;
+      foreach_ipsec_crypto_alg
+#undef _
+    default:
+      return format (s, "unknown");
+    }
+  return format (s, "%s", t);
+}
+
+uword
+unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args)
+{
+  u32 *r = va_arg (*args, u32 *);
+
+  if (0);
+#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_INTEG_ALG_##f;
+  foreach_ipsec_integ_alg
+#undef _
+    else
+    return 0;
+  return 1;
+}
+
+u8 *
+format_ipsec_integ_alg (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+  u8 *t = 0;
+
+  switch (i)
+    {
+#define _(v,f,str) case IPSEC_INTEG_ALG_##f: t = (u8 *) str; break;
+      foreach_ipsec_integ_alg
+#undef _
+    default:
+      return format (s, "unknown");
+    }
+  return format (s, "%s", t);
+}
+
+uword
+unformat_ikev2_auth_method (unformat_input_t * input, va_list * args)
+{
+  u32 *r = va_arg (*args, u32 *);
+
+  if (0);
+#define _(v,f,s) else if (unformat (input, s)) *r = IKEV2_AUTH_METHOD_##f;
+  foreach_ikev2_auth_method
+#undef _
+    else
+    return 0;
+  return 1;
+}
+
+uword
+unformat_ikev2_id_type (unformat_input_t * input, va_list * args)
+{
+  u32 *r = va_arg (*args, u32 *);
+
+  if (0);
+#define _(v,f,s) else if (unformat (input, s)) *r = IKEV2_ID_TYPE_##f;
+  foreach_ikev2_id_type
+#undef _
+    else
+    return 0;
+  return 1;
+}
+#endif /* VPP_API_TEST_BUILTIN */
+
+static uword
+unformat_policer_rate_type (unformat_input_t * input, va_list * args)
+{
+  u8 *r = va_arg (*args, u8 *);
+
+  if (unformat (input, "kbps"))
+    *r = SSE2_QOS_RATE_KBPS;
+  else if (unformat (input, "pps"))
+    *r = SSE2_QOS_RATE_PPS;
+  else
+    return 0;
+  return 1;
+}
+
+static uword
+unformat_policer_round_type (unformat_input_t * input, va_list * args)
+{
+  u8 *r = va_arg (*args, u8 *);
+
+  if (unformat (input, "closest"))
+    *r = SSE2_QOS_ROUND_TO_CLOSEST;
+  else if (unformat (input, "up"))
+    *r = SSE2_QOS_ROUND_TO_UP;
+  else if (unformat (input, "down"))
+    *r = SSE2_QOS_ROUND_TO_DOWN;
+  else
+    return 0;
+  return 1;
+}
+
+static uword
+unformat_policer_type (unformat_input_t * input, va_list * args)
+{
+  u8 *r = va_arg (*args, u8 *);
+
+  if (unformat (input, "1r2c"))
+    *r = SSE2_QOS_POLICER_TYPE_1R2C;
+  else if (unformat (input, "1r3c"))
+    *r = SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697;
+  else if (unformat (input, "2r3c-2698"))
+    *r = SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698;
+  else if (unformat (input, "2r3c-4115"))
+    *r = SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115;
+  else if (unformat (input, "2r3c-mef5cf1"))
+    *r = SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1;
+  else
+    return 0;
+  return 1;
+}
+
+static uword
+unformat_dscp (unformat_input_t * input, va_list * va)
+{
+  u8 *r = va_arg (*va, u8 *);
+
+  if (0);
+#define _(v,f,str) else if (unformat (input, str)) *r = VNET_DSCP_##f;
+  foreach_vnet_dscp
+#undef _
+    else
+    return 0;
+  return 1;
+}
+
+static uword
+unformat_policer_action_type (unformat_input_t * input, va_list * va)
+{
+  sse2_qos_pol_action_params_st *a
+    = va_arg (*va, sse2_qos_pol_action_params_st *);
+
+  if (unformat (input, "drop"))
+    a->action_type = SSE2_QOS_ACTION_DROP;
+  else if (unformat (input, "transmit"))
+    a->action_type = SSE2_QOS_ACTION_TRANSMIT;
+  else if (unformat (input, "mark-and-transmit %U", unformat_dscp, &a->dscp))
+    a->action_type = SSE2_QOS_ACTION_MARK_AND_TRANSMIT;
+  else
+    return 0;
+  return 1;
+}
+
+static uword
+unformat_policer_classify_table_type (unformat_input_t * input, va_list * va)
+{
+  u32 *r = va_arg (*va, u32 *);
+  u32 tid;
+
+  if (unformat (input, "ip4"))
+    tid = POLICER_CLASSIFY_TABLE_IP4;
+  else if (unformat (input, "ip6"))
+    tid = POLICER_CLASSIFY_TABLE_IP6;
+  else if (unformat (input, "l2"))
+    tid = POLICER_CLASSIFY_TABLE_L2;
+  else
+    return 0;
+
+  *r = tid;
+  return 1;
+}
+
+static uword
+unformat_flow_classify_table_type (unformat_input_t * input, va_list * va)
+{
+  u32 *r = va_arg (*va, u32 *);
+  u32 tid;
+
+  if (unformat (input, "ip4"))
+    tid = FLOW_CLASSIFY_TABLE_IP4;
+  else if (unformat (input, "ip6"))
+    tid = FLOW_CLASSIFY_TABLE_IP6;
+  else
+    return 0;
+
+  *r = tid;
+  return 1;
+}
+
+#if (VPP_API_TEST_BUILTIN==0)
+u8 *
+format_ip4_address (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
+}
+
+u8 *
+format_ip6_address (u8 * s, va_list * args)
+{
+  ip6_address_t *a = va_arg (*args, ip6_address_t *);
+  u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
+
+  i_max_n_zero = ARRAY_LEN (a->as_u16);
+  max_n_zeros = 0;
+  i_first_zero = i_max_n_zero;
+  n_zeros = 0;
+  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+    {
+      u32 is_zero = a->as_u16[i] == 0;
+      if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
+	{
+	  i_first_zero = i;
+	  n_zeros = 0;
+	}
+      n_zeros += is_zero;
+      if ((!is_zero && n_zeros > max_n_zeros)
+	  || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
+	{
+	  i_max_n_zero = i_first_zero;
+	  max_n_zeros = n_zeros;
+	  i_first_zero = ARRAY_LEN (a->as_u16);
+	  n_zeros = 0;
+	}
+    }
+
+  last_double_colon = 0;
+  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+    {
+      if (i == i_max_n_zero && max_n_zeros > 1)
+	{
+	  s = format (s, "::");
+	  i += max_n_zeros - 1;
+	  last_double_colon = 1;
+	}
+      else
+	{
+	  s = format (s, "%s%x",
+		      (last_double_colon || i == 0) ? "" : ":",
+		      clib_net_to_host_u16 (a->as_u16[i]));
+	  last_double_colon = 0;
+	}
+    }
+
+  return s;
+}
+
+/* Format an IP46 address. */
+u8 *
+format_ip46_address (u8 * s, va_list * args)
+{
+  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
+  ip46_type_t type = va_arg (*args, ip46_type_t);
+  int is_ip4 = 1;
+
+  switch (type)
+    {
+    case IP46_TYPE_ANY:
+      is_ip4 = ip46_address_is_ip4 (ip46);
+      break;
+    case IP46_TYPE_IP4:
+      is_ip4 = 1;
+      break;
+    case IP46_TYPE_IP6:
+      is_ip4 = 0;
+      break;
+    }
+
+  return is_ip4 ?
+    format (s, "%U", format_ip4_address, &ip46->ip4) :
+    format (s, "%U", format_ip6_address, &ip46->ip6);
+}
+
+u8 *
+format_ethernet_address (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+
+  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+		 a[0], a[1], a[2], a[3], a[4], a[5]);
+}
+#endif
+
+static void
+increment_v4_address (ip4_address_t * a)
+{
+  u32 v;
+
+  v = ntohl (a->as_u32) + 1;
+  a->as_u32 = ntohl (v);
+}
+
+static void
+increment_v6_address (ip6_address_t * a)
+{
+  u64 v0, v1;
+
+  v0 = clib_net_to_host_u64 (a->as_u64[0]);
+  v1 = clib_net_to_host_u64 (a->as_u64[1]);
+
+  v1 += 1;
+  if (v1 == 0)
+    v0 += 1;
+  a->as_u64[0] = clib_net_to_host_u64 (v0);
+  a->as_u64[1] = clib_net_to_host_u64 (v1);
+}
+
+static void
+increment_mac_address (u64 * mac)
+{
+  u64 tmp = *mac;
+
+  tmp = clib_net_to_host_u64 (tmp);
+  tmp += 1 << 16;		/* skip unused (least significant) octets */
+  tmp = clib_host_to_net_u64 (tmp);
+  *mac = tmp;
+}
+
+static void vl_api_create_loopback_reply_t_handler
+  (vl_api_create_loopback_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  vam->retval = retval;
+  vam->regenerate_interface_table = 1;
+  vam->sw_if_index = ntohl (mp->sw_if_index);
+  vam->result_ready = 1;
+}
+
+static void vl_api_create_loopback_reply_t_handler_json
+  (vl_api_create_loopback_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_af_packet_create_reply_t_handler
+  (vl_api_af_packet_create_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  vam->retval = retval;
+  vam->regenerate_interface_table = 1;
+  vam->sw_if_index = ntohl (mp->sw_if_index);
+  vam->result_ready = 1;
+}
+
+static void vl_api_af_packet_create_reply_t_handler_json
+  (vl_api_af_packet_create_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_create_vlan_subif_reply_t_handler
+  (vl_api_create_vlan_subif_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  vam->retval = retval;
+  vam->regenerate_interface_table = 1;
+  vam->sw_if_index = ntohl (mp->sw_if_index);
+  vam->result_ready = 1;
+}
+
+static void vl_api_create_vlan_subif_reply_t_handler_json
+  (vl_api_create_vlan_subif_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_create_subif_reply_t_handler
+  (vl_api_create_subif_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  vam->retval = retval;
+  vam->regenerate_interface_table = 1;
+  vam->sw_if_index = ntohl (mp->sw_if_index);
+  vam->result_ready = 1;
+}
+
+static void vl_api_create_subif_reply_t_handler_json
+  (vl_api_create_subif_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_interface_name_renumber_reply_t_handler
+  (vl_api_interface_name_renumber_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  vam->retval = retval;
+  vam->regenerate_interface_table = 1;
+  vam->result_ready = 1;
+}
+
+static void vl_api_interface_name_renumber_reply_t_handler_json
+  (vl_api_interface_name_renumber_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+/*
+ * Special-case: build the interface table, maintain
+ * the next loopback sw_if_index vbl.
+ */
+static void vl_api_sw_interface_details_t_handler
+  (vl_api_sw_interface_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  u8 *s = format (0, "%s%c", mp->interface_name, 0);
+
+  hash_set_mem (vam->sw_if_index_by_interface_name, s,
+		ntohl (mp->sw_if_index));
+
+  /* In sub interface case, fill the sub interface table entry */
+  if (mp->sw_if_index != mp->sup_sw_if_index)
+    {
+      sw_interface_subif_t *sub = NULL;
+
+      vec_add2 (vam->sw_if_subif_table, sub, 1);
+
+      vec_validate (sub->interface_name, strlen ((char *) s) + 1);
+      strncpy ((char *) sub->interface_name, (char *) s,
+	       vec_len (sub->interface_name));
+      sub->sw_if_index = ntohl (mp->sw_if_index);
+      sub->sub_id = ntohl (mp->sub_id);
+
+      sub->sub_dot1ad = mp->sub_dot1ad;
+      sub->sub_number_of_tags = mp->sub_number_of_tags;
+      sub->sub_outer_vlan_id = ntohs (mp->sub_outer_vlan_id);
+      sub->sub_inner_vlan_id = ntohs (mp->sub_inner_vlan_id);
+      sub->sub_exact_match = mp->sub_exact_match;
+      sub->sub_default = mp->sub_default;
+      sub->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any;
+      sub->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any;
+
+      /* vlan tag rewrite */
+      sub->vtr_op = ntohl (mp->vtr_op);
+      sub->vtr_push_dot1q = ntohl (mp->vtr_push_dot1q);
+      sub->vtr_tag1 = ntohl (mp->vtr_tag1);
+      sub->vtr_tag2 = ntohl (mp->vtr_tag2);
+    }
+}
+
+static void vl_api_sw_interface_details_t_handler_json
+  (vl_api_sw_interface_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+  vat_json_object_add_uint (node, "sup_sw_if_index",
+			    ntohl (mp->sup_sw_if_index));
+  vat_json_object_add_uint (node, "l2_address_length",
+			    ntohl (mp->l2_address_length));
+  vat_json_object_add_bytes (node, "l2_address", mp->l2_address,
+			     sizeof (mp->l2_address));
+  vat_json_object_add_string_copy (node, "interface_name",
+				   mp->interface_name);
+  vat_json_object_add_uint (node, "admin_up_down", mp->admin_up_down);
+  vat_json_object_add_uint (node, "link_up_down", mp->link_up_down);
+  vat_json_object_add_uint (node, "link_duplex", mp->link_duplex);
+  vat_json_object_add_uint (node, "link_speed", mp->link_speed);
+  vat_json_object_add_uint (node, "mtu", ntohs (mp->link_mtu));
+  vat_json_object_add_uint (node, "sub_id", ntohl (mp->sub_id));
+  vat_json_object_add_uint (node, "sub_dot1ad", mp->sub_dot1ad);
+  vat_json_object_add_uint (node, "sub_number_of_tags",
+			    mp->sub_number_of_tags);
+  vat_json_object_add_uint (node, "sub_outer_vlan_id",
+			    ntohs (mp->sub_outer_vlan_id));
+  vat_json_object_add_uint (node, "sub_inner_vlan_id",
+			    ntohs (mp->sub_inner_vlan_id));
+  vat_json_object_add_uint (node, "sub_exact_match", mp->sub_exact_match);
+  vat_json_object_add_uint (node, "sub_default", mp->sub_default);
+  vat_json_object_add_uint (node, "sub_outer_vlan_id_any",
+			    mp->sub_outer_vlan_id_any);
+  vat_json_object_add_uint (node, "sub_inner_vlan_id_any",
+			    mp->sub_inner_vlan_id_any);
+  vat_json_object_add_uint (node, "vtr_op", ntohl (mp->vtr_op));
+  vat_json_object_add_uint (node, "vtr_push_dot1q",
+			    ntohl (mp->vtr_push_dot1q));
+  vat_json_object_add_uint (node, "vtr_tag1", ntohl (mp->vtr_tag1));
+  vat_json_object_add_uint (node, "vtr_tag2", ntohl (mp->vtr_tag2));
+}
+
+static void vl_api_sw_interface_set_flags_t_handler
+  (vl_api_sw_interface_set_flags_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  if (vam->interface_event_display)
+    errmsg ("interface flags: sw_if_index %d %s %s",
+	    ntohl (mp->sw_if_index),
+	    mp->admin_up_down ? "admin-up" : "admin-down",
+	    mp->link_up_down ? "link-up" : "link-down");
+}
+
+static void vl_api_sw_interface_set_flags_t_handler_json
+  (vl_api_sw_interface_set_flags_t * mp)
+{
+  /* JSON output not supported */
+}
+
+static void
+vl_api_cli_reply_t_handler (vl_api_cli_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  vam->retval = retval;
+  vam->shmem_result = (u8 *) mp->reply_in_shmem;
+  vam->result_ready = 1;
+}
+
+static void
+vl_api_cli_reply_t_handler_json (vl_api_cli_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+  api_main_t *am = &api_main;
+  void *oldheap;
+  u8 *reply;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "reply_in_shmem",
+			    ntohl (mp->reply_in_shmem));
+  /* Toss the shared-memory original... */
+  pthread_mutex_lock (&am->vlib_rp->mutex);
+  oldheap = svm_push_data_heap (am->vlib_rp);
+
+  reply = (u8 *) (mp->reply_in_shmem);
+  vec_free (reply);
+
+  svm_pop_heap (oldheap);
+  pthread_mutex_unlock (&am->vlib_rp->mutex);
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void
+vl_api_cli_inband_reply_t_handler (vl_api_cli_inband_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  vam->retval = retval;
+  vam->cmd_reply = mp->reply;
+  vam->result_ready = 1;
+}
+
+static void
+vl_api_cli_inband_reply_t_handler_json (vl_api_cli_inband_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_string_copy (&node, "reply", mp->reply);
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_classify_add_del_table_reply_t_handler
+  (vl_api_classify_add_del_table_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      if (retval == 0 &&
+	  ((mp->new_table_index != 0xFFFFFFFF) ||
+	   (mp->skip_n_vectors != 0xFFFFFFFF) ||
+	   (mp->match_n_vectors != 0xFFFFFFFF)))
+	/*
+	 * Note: this is just barely thread-safe, depends on
+	 * the main thread spinning waiting for an answer...
+	 */
+	errmsg ("new index %d, skip_n_vectors %d, match_n_vectors %d",
+		ntohl (mp->new_table_index),
+		ntohl (mp->skip_n_vectors), ntohl (mp->match_n_vectors));
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_classify_add_del_table_reply_t_handler_json
+  (vl_api_classify_add_del_table_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "new_table_index",
+			    ntohl (mp->new_table_index));
+  vat_json_object_add_uint (&node, "skip_n_vectors",
+			    ntohl (mp->skip_n_vectors));
+  vat_json_object_add_uint (&node, "match_n_vectors",
+			    ntohl (mp->match_n_vectors));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_get_node_index_reply_t_handler
+  (vl_api_get_node_index_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      if (retval == 0)
+	errmsg ("node index %d", ntohl (mp->node_index));
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_get_node_index_reply_t_handler_json
+  (vl_api_get_node_index_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "node_index", ntohl (mp->node_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_get_next_index_reply_t_handler
+  (vl_api_get_next_index_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      if (retval == 0)
+	errmsg ("next node index %d", ntohl (mp->next_index));
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_get_next_index_reply_t_handler_json
+  (vl_api_get_next_index_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "next_index", ntohl (mp->next_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_add_node_next_reply_t_handler
+  (vl_api_add_node_next_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      if (retval == 0)
+	errmsg ("next index %d", ntohl (mp->next_index));
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_add_node_next_reply_t_handler_json
+  (vl_api_add_node_next_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "next_index", ntohl (mp->next_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_show_version_reply_t_handler
+  (vl_api_show_version_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  if (retval >= 0)
+    {
+      errmsg ("        program: %s", mp->program);
+      errmsg ("        version: %s", mp->version);
+      errmsg ("     build date: %s", mp->build_date);
+      errmsg ("build directory: %s", mp->build_directory);
+    }
+  vam->retval = retval;
+  vam->result_ready = 1;
+}
+
+static void vl_api_show_version_reply_t_handler_json
+  (vl_api_show_version_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_string_copy (&node, "program", mp->program);
+  vat_json_object_add_string_copy (&node, "version", mp->version);
+  vat_json_object_add_string_copy (&node, "build_date", mp->build_date);
+  vat_json_object_add_string_copy (&node, "build_directory",
+				   mp->build_directory);
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void
+vl_api_ip4_arp_event_t_handler (vl_api_ip4_arp_event_t * mp)
+{
+  errmsg ("arp %s event: address %U new mac %U sw_if_index %d",
+	  mp->mac_ip ? "mac/ip binding" : "address resolution",
+	  format_ip4_address, &mp->address,
+	  format_ethernet_address, mp->new_mac, mp->sw_if_index);
+}
+
+static void
+vl_api_ip4_arp_event_t_handler_json (vl_api_ip4_arp_event_t * mp)
+{
+  /* JSON output not supported */
+}
+
+static void
+vl_api_ip6_nd_event_t_handler (vl_api_ip6_nd_event_t * mp)
+{
+  errmsg ("ip6 nd %s event: address %U new mac %U sw_if_index %d",
+	  mp->mac_ip ? "mac/ip binding" : "address resolution",
+	  format_ip6_address, mp->address,
+	  format_ethernet_address, mp->new_mac, mp->sw_if_index);
+}
+
+static void
+vl_api_ip6_nd_event_t_handler_json (vl_api_ip6_nd_event_t * mp)
+{
+  /* JSON output not supported */
+}
+
+/*
+ * Special-case: build the bridge domain table, maintain
+ * the next bd id vbl.
+ */
+static void vl_api_bridge_domain_details_t_handler
+  (vl_api_bridge_domain_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  u32 n_sw_ifs = ntohl (mp->n_sw_ifs);
+
+  print (vam->ofp, "\n%-3s %-3s %-3s %-3s %-3s %-3s",
+	 " ID", "LRN", "FWD", "FLD", "BVI", "#IF");
+
+  print (vam->ofp, "%3d %3d %3d %3d %3d %3d",
+	 ntohl (mp->bd_id), mp->learn, mp->forward,
+	 mp->flood, ntohl (mp->bvi_sw_if_index), n_sw_ifs);
+
+  if (n_sw_ifs)
+    print (vam->ofp, "\n\n%s %s  %s", "sw_if_index", "SHG", "Interface Name");
+}
+
+static void vl_api_bridge_domain_details_t_handler_json
+  (vl_api_bridge_domain_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node, *array = NULL;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id));
+  vat_json_object_add_uint (node, "flood", mp->flood);
+  vat_json_object_add_uint (node, "forward", mp->forward);
+  vat_json_object_add_uint (node, "learn", mp->learn);
+  vat_json_object_add_uint (node, "bvi_sw_if_index",
+			    ntohl (mp->bvi_sw_if_index));
+  vat_json_object_add_uint (node, "n_sw_ifs", ntohl (mp->n_sw_ifs));
+  array = vat_json_object_add (node, "sw_if");
+  vat_json_init_array (array);
+}
+
+/*
+ * Special-case: build the bridge domain sw if table.
+ */
+static void vl_api_bridge_domain_sw_if_details_t_handler
+  (vl_api_bridge_domain_sw_if_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  hash_pair_t *p;
+  u8 *sw_if_name = 0;
+  u32 sw_if_index;
+
+  sw_if_index = ntohl (mp->sw_if_index);
+  /* *INDENT-OFF* */
+  hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
+  ({
+    if ((u32) p->value[0] == sw_if_index)
+      {
+        sw_if_name = (u8 *)(p->key);
+        break;
+      }
+  }));
+  /* *INDENT-ON* */
+
+  print (vam->ofp, "%7d     %3d  %s", sw_if_index,
+	 mp->shg, sw_if_name ? (char *) sw_if_name :
+	 "sw_if_index not found!");
+}
+
+static void vl_api_bridge_domain_sw_if_details_t_handler_json
+  (vl_api_bridge_domain_sw_if_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+  uword last_index = 0;
+
+  ASSERT (VAT_JSON_ARRAY == vam->json_tree.type);
+  ASSERT (vec_len (vam->json_tree.array) >= 1);
+  last_index = vec_len (vam->json_tree.array) - 1;
+  node = &vam->json_tree.array[last_index];
+  node = vat_json_object_get_element (node, "sw_if");
+  ASSERT (NULL != node);
+  node = vat_json_array_add (node);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id));
+  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+  vat_json_object_add_uint (node, "shg", mp->shg);
+}
+
+static void vl_api_control_ping_reply_t_handler
+  (vl_api_control_ping_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_control_ping_reply_t_handler_json
+  (vl_api_control_ping_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  if (VAT_JSON_NONE != vam->json_tree.type)
+    {
+      vat_json_print (vam->ofp, &vam->json_tree);
+      vat_json_free (&vam->json_tree);
+      vam->json_tree.type = VAT_JSON_NONE;
+    }
+  else
+    {
+      /* just print [] */
+      vat_json_init_array (&vam->json_tree);
+      vat_json_print (vam->ofp, &vam->json_tree);
+      vam->json_tree.type = VAT_JSON_NONE;
+    }
+
+  vam->retval = retval;
+  vam->result_ready = 1;
+}
+
+static void
+vl_api_l2_flags_reply_t_handler (vl_api_l2_flags_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_l2_flags_reply_t_handler_json
+  (vl_api_l2_flags_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "resulting_feature_bitmap",
+			    ntohl (mp->resulting_feature_bitmap));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_bridge_flags_reply_t_handler
+  (vl_api_bridge_flags_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_bridge_flags_reply_t_handler_json
+  (vl_api_bridge_flags_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "resulting_feature_bitmap",
+			    ntohl (mp->resulting_feature_bitmap));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_tap_connect_reply_t_handler
+  (vl_api_tap_connect_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->sw_if_index = ntohl (mp->sw_if_index);
+      vam->result_ready = 1;
+    }
+
+}
+
+static void vl_api_tap_connect_reply_t_handler_json
+  (vl_api_tap_connect_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+
+}
+
+static void
+vl_api_tap_modify_reply_t_handler (vl_api_tap_modify_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->sw_if_index = ntohl (mp->sw_if_index);
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_tap_modify_reply_t_handler_json
+  (vl_api_tap_modify_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void
+vl_api_tap_delete_reply_t_handler (vl_api_tap_delete_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_tap_delete_reply_t_handler_json
+  (vl_api_tap_delete_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_mpls_tunnel_add_del_reply_t_handler
+  (vl_api_mpls_tunnel_add_del_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_mpls_tunnel_add_del_reply_t_handler_json
+  (vl_api_mpls_tunnel_add_del_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "tunnel_sw_if_index",
+			    ntohl (mp->sw_if_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_l2tpv3_create_tunnel_reply_t_handler
+  (vl_api_l2tpv3_create_tunnel_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->sw_if_index = ntohl (mp->sw_if_index);
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_l2tpv3_create_tunnel_reply_t_handler_json
+  (vl_api_l2tpv3_create_tunnel_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+
+static void vl_api_lisp_add_del_locator_set_reply_t_handler
+  (vl_api_lisp_add_del_locator_set_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_lisp_add_del_locator_set_reply_t_handler_json
+  (vl_api_lisp_add_del_locator_set_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "locator_set_index", ntohl (mp->ls_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_vxlan_add_del_tunnel_reply_t_handler
+  (vl_api_vxlan_add_del_tunnel_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->sw_if_index = ntohl (mp->sw_if_index);
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json
+  (vl_api_vxlan_add_del_tunnel_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_gre_add_del_tunnel_reply_t_handler
+  (vl_api_gre_add_del_tunnel_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->sw_if_index = ntohl (mp->sw_if_index);
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_gre_add_del_tunnel_reply_t_handler_json
+  (vl_api_gre_add_del_tunnel_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_create_vhost_user_if_reply_t_handler
+  (vl_api_create_vhost_user_if_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->sw_if_index = ntohl (mp->sw_if_index);
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_create_vhost_user_if_reply_t_handler_json
+  (vl_api_create_vhost_user_if_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_ip_address_details_t_handler
+  (vl_api_ip_address_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  static ip_address_details_t empty_ip_address_details = { {0} };
+  ip_address_details_t *address = NULL;
+  ip_details_t *current_ip_details = NULL;
+  ip_details_t *details = NULL;
+
+  details = vam->ip_details_by_sw_if_index[vam->is_ipv6];
+
+  if (!details || vam->current_sw_if_index >= vec_len (details)
+      || !details[vam->current_sw_if_index].present)
+    {
+      errmsg ("ip address details arrived but not stored");
+      errmsg ("ip_dump should be called first");
+      return;
+    }
+
+  current_ip_details = vec_elt_at_index (details, vam->current_sw_if_index);
+
+#define addresses (current_ip_details->addr)
+
+  vec_validate_init_empty (addresses, vec_len (addresses),
+			   empty_ip_address_details);
+
+  address = vec_elt_at_index (addresses, vec_len (addresses) - 1);
+
+  clib_memcpy (&address->ip, &mp->ip, sizeof (address->ip));
+  address->prefix_length = mp->prefix_length;
+#undef addresses
+}
+
+static void vl_api_ip_address_details_t_handler_json
+  (vl_api_ip_address_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+  struct in6_addr ip6;
+  struct in_addr ip4;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  if (vam->is_ipv6)
+    {
+      clib_memcpy (&ip6, mp->ip, sizeof (ip6));
+      vat_json_object_add_ip6 (node, "ip", ip6);
+    }
+  else
+    {
+      clib_memcpy (&ip4, mp->ip, sizeof (ip4));
+      vat_json_object_add_ip4 (node, "ip", ip4);
+    }
+  vat_json_object_add_uint (node, "prefix_length", mp->prefix_length);
+}
+
+static void
+vl_api_ip_details_t_handler (vl_api_ip_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  static ip_details_t empty_ip_details = { 0 };
+  ip_details_t *ip = NULL;
+  u32 sw_if_index = ~0;
+
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  vec_validate_init_empty (vam->ip_details_by_sw_if_index[vam->is_ipv6],
+			   sw_if_index, empty_ip_details);
+
+  ip = vec_elt_at_index (vam->ip_details_by_sw_if_index[vam->is_ipv6],
+			 sw_if_index);
+
+  ip->present = 1;
+}
+
+static void
+vl_api_ip_details_t_handler_json (vl_api_ip_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  vat_json_array_add_uint (&vam->json_tree,
+			   clib_net_to_host_u32 (mp->sw_if_index));
+}
+
+static void vl_api_map_domain_details_t_handler_json
+  (vl_api_map_domain_details_t * mp)
+{
+  vat_json_node_t *node = NULL;
+  vat_main_t *vam = &vat_main;
+  struct in6_addr ip6;
+  struct in_addr ip4;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+
+  node = vat_json_array_add (&vam->json_tree);
+  vat_json_init_object (node);
+
+  vat_json_object_add_uint (node, "domain_index",
+			    clib_net_to_host_u32 (mp->domain_index));
+  clib_memcpy (&ip6, mp->ip6_prefix, sizeof (ip6));
+  vat_json_object_add_ip6 (node, "ip6_prefix", ip6);
+  clib_memcpy (&ip4, mp->ip4_prefix, sizeof (ip4));
+  vat_json_object_add_ip4 (node, "ip4_prefix", ip4);
+  clib_memcpy (&ip6, mp->ip6_src, sizeof (ip6));
+  vat_json_object_add_ip6 (node, "ip6_src", ip6);
+  vat_json_object_add_int (node, "ip6_prefix_len", mp->ip6_prefix_len);
+  vat_json_object_add_int (node, "ip4_prefix_len", mp->ip4_prefix_len);
+  vat_json_object_add_int (node, "ip6_src_len", mp->ip6_src_len);
+  vat_json_object_add_int (node, "ea_bits_len", mp->ea_bits_len);
+  vat_json_object_add_int (node, "psid_offset", mp->psid_offset);
+  vat_json_object_add_int (node, "psid_length", mp->psid_length);
+  vat_json_object_add_uint (node, "flags", mp->flags);
+  vat_json_object_add_uint (node, "mtu", clib_net_to_host_u16 (mp->mtu));
+  vat_json_object_add_int (node, "is_translation", mp->is_translation);
+}
+
+static void vl_api_map_domain_details_t_handler
+  (vl_api_map_domain_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  if (mp->is_translation)
+    {
+      print (vam->ofp,
+	     "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U/%d (ip6-src) index: %u",
+	     format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len,
+	     format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len,
+	     format_ip6_address, mp->ip6_src, mp->ip6_src_len,
+	     clib_net_to_host_u32 (mp->domain_index));
+    }
+  else
+    {
+      print (vam->ofp,
+	     "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U (ip6-src) index: %u",
+	     format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len,
+	     format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len,
+	     format_ip6_address, mp->ip6_src,
+	     clib_net_to_host_u32 (mp->domain_index));
+    }
+  print (vam->ofp, "  ea-len %d psid-offset %d psid-len %d mtu %d %s",
+	 mp->ea_bits_len, mp->psid_offset, mp->psid_length, mp->mtu,
+	 mp->is_translation ? "map-t" : "");
+}
+
+static void vl_api_map_rule_details_t_handler_json
+  (vl_api_map_rule_details_t * mp)
+{
+  struct in6_addr ip6;
+  vat_json_node_t *node = NULL;
+  vat_main_t *vam = &vat_main;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+
+  node = vat_json_array_add (&vam->json_tree);
+  vat_json_init_object (node);
+
+  vat_json_object_add_uint (node, "psid", clib_net_to_host_u16 (mp->psid));
+  clib_memcpy (&ip6, mp->ip6_dst, sizeof (ip6));
+  vat_json_object_add_ip6 (node, "ip6_dst", ip6);
+}
+
+static void
+vl_api_map_rule_details_t_handler (vl_api_map_rule_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  print (vam->ofp, " %d (psid) %U (ip6-dst)",
+	 clib_net_to_host_u16 (mp->psid), format_ip6_address, mp->ip6_dst);
+}
+
+static void
+vl_api_dhcp_compl_event_t_handler (vl_api_dhcp_compl_event_t * mp)
+{
+  errmsg ("DHCP compl event: pid %d %s hostname %s host_addr %U "
+	  "router_addr %U host_mac %U",
+	  mp->pid, mp->is_ipv6 ? "ipv6" : "ipv4", mp->hostname,
+	  format_ip4_address, &mp->host_address,
+	  format_ip4_address, &mp->router_address,
+	  format_ethernet_address, mp->host_mac);
+}
+
+static void vl_api_dhcp_compl_event_t_handler_json
+  (vl_api_dhcp_compl_event_t * mp)
+{
+  /* JSON output not supported */
+}
+
+static void
+set_simple_interface_counter (u8 vnet_counter_type, u32 sw_if_index,
+			      u32 counter)
+{
+  vat_main_t *vam = &vat_main;
+  static u64 default_counter = 0;
+
+  vec_validate_init_empty (vam->simple_interface_counters, vnet_counter_type,
+			   NULL);
+  vec_validate_init_empty (vam->simple_interface_counters[vnet_counter_type],
+			   sw_if_index, default_counter);
+  vam->simple_interface_counters[vnet_counter_type][sw_if_index] = counter;
+}
+
+static void
+set_combined_interface_counter (u8 vnet_counter_type, u32 sw_if_index,
+				interface_counter_t counter)
+{
+  vat_main_t *vam = &vat_main;
+  static interface_counter_t default_counter = { 0, };
+
+  vec_validate_init_empty (vam->combined_interface_counters,
+			   vnet_counter_type, NULL);
+  vec_validate_init_empty (vam->combined_interface_counters
+			   [vnet_counter_type], sw_if_index, default_counter);
+  vam->combined_interface_counters[vnet_counter_type][sw_if_index] = counter;
+}
+
+static void vl_api_vnet_interface_counters_t_handler
+  (vl_api_vnet_interface_counters_t * mp)
+{
+  /* not supported */
+}
+
+static void vl_api_vnet_interface_counters_t_handler_json
+  (vl_api_vnet_interface_counters_t * mp)
+{
+  interface_counter_t counter;
+  vlib_counter_t *v;
+  u64 *v_packets;
+  u64 packets;
+  u32 count;
+  u32 first_sw_if_index;
+  int i;
+
+  count = ntohl (mp->count);
+  first_sw_if_index = ntohl (mp->first_sw_if_index);
+
+  if (!mp->is_combined)
+    {
+      v_packets = (u64 *) & mp->data;
+      for (i = 0; i < count; i++)
+	{
+	  packets =
+	    clib_net_to_host_u64 (clib_mem_unaligned (v_packets, u64));
+	  set_simple_interface_counter (mp->vnet_counter_type,
+					first_sw_if_index + i, packets);
+	  v_packets++;
+	}
+    }
+  else
+    {
+      v = (vlib_counter_t *) & mp->data;
+      for (i = 0; i < count; i++)
+	{
+	  counter.packets =
+	    clib_net_to_host_u64 (clib_mem_unaligned (&v->packets, u64));
+	  counter.bytes =
+	    clib_net_to_host_u64 (clib_mem_unaligned (&v->bytes, u64));
+	  set_combined_interface_counter (mp->vnet_counter_type,
+					  first_sw_if_index + i, counter);
+	  v++;
+	}
+    }
+}
+
+static u32
+ip4_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id)
+{
+  vat_main_t *vam = &vat_main;
+  u32 i;
+
+  for (i = 0; i < vec_len (vam->ip4_fib_counters_vrf_id_by_index); i++)
+    {
+      if (vam->ip4_fib_counters_vrf_id_by_index[i] == vrf_id)
+	{
+	  return i;
+	}
+    }
+  return ~0;
+}
+
+static u32
+ip6_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id)
+{
+  vat_main_t *vam = &vat_main;
+  u32 i;
+
+  for (i = 0; i < vec_len (vam->ip6_fib_counters_vrf_id_by_index); i++)
+    {
+      if (vam->ip6_fib_counters_vrf_id_by_index[i] == vrf_id)
+	{
+	  return i;
+	}
+    }
+  return ~0;
+}
+
+static void vl_api_vnet_ip4_fib_counters_t_handler
+  (vl_api_vnet_ip4_fib_counters_t * mp)
+{
+  /* not supported */
+}
+
+static void vl_api_vnet_ip4_fib_counters_t_handler_json
+  (vl_api_vnet_ip4_fib_counters_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vl_api_ip4_fib_counter_t *v;
+  ip4_fib_counter_t *counter;
+  struct in_addr ip4;
+  u32 vrf_id;
+  u32 vrf_index;
+  u32 count;
+  int i;
+
+  vrf_id = ntohl (mp->vrf_id);
+  vrf_index = ip4_fib_counters_get_vrf_index_by_vrf_id (vrf_id);
+  if (~0 == vrf_index)
+    {
+      vrf_index = vec_len (vam->ip4_fib_counters_vrf_id_by_index);
+      vec_validate (vam->ip4_fib_counters_vrf_id_by_index, vrf_index);
+      vam->ip4_fib_counters_vrf_id_by_index[vrf_index] = vrf_id;
+      vec_validate (vam->ip4_fib_counters, vrf_index);
+      vam->ip4_fib_counters[vrf_index] = NULL;
+    }
+
+  vec_free (vam->ip4_fib_counters[vrf_index]);
+  v = (vl_api_ip4_fib_counter_t *) & mp->c;
+  count = ntohl (mp->count);
+  for (i = 0; i < count; i++)
+    {
+      vec_validate (vam->ip4_fib_counters[vrf_index], i);
+      counter = &vam->ip4_fib_counters[vrf_index][i];
+      clib_memcpy (&ip4, &v->address, sizeof (ip4));
+      counter->address = ip4;
+      counter->address_length = v->address_length;
+      counter->packets = clib_net_to_host_u64 (v->packets);
+      counter->bytes = clib_net_to_host_u64 (v->bytes);
+      v++;
+    }
+}
+
+static void vl_api_vnet_ip6_fib_counters_t_handler
+  (vl_api_vnet_ip6_fib_counters_t * mp)
+{
+  /* not supported */
+}
+
+static void vl_api_vnet_ip6_fib_counters_t_handler_json
+  (vl_api_vnet_ip6_fib_counters_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vl_api_ip6_fib_counter_t *v;
+  ip6_fib_counter_t *counter;
+  struct in6_addr ip6;
+  u32 vrf_id;
+  u32 vrf_index;
+  u32 count;
+  int i;
+
+  vrf_id = ntohl (mp->vrf_id);
+  vrf_index = ip6_fib_counters_get_vrf_index_by_vrf_id (vrf_id);
+  if (~0 == vrf_index)
+    {
+      vrf_index = vec_len (vam->ip6_fib_counters_vrf_id_by_index);
+      vec_validate (vam->ip6_fib_counters_vrf_id_by_index, vrf_index);
+      vam->ip6_fib_counters_vrf_id_by_index[vrf_index] = vrf_id;
+      vec_validate (vam->ip6_fib_counters, vrf_index);
+      vam->ip6_fib_counters[vrf_index] = NULL;
+    }
+
+  vec_free (vam->ip6_fib_counters[vrf_index]);
+  v = (vl_api_ip6_fib_counter_t *) & mp->c;
+  count = ntohl (mp->count);
+  for (i = 0; i < count; i++)
+    {
+      vec_validate (vam->ip6_fib_counters[vrf_index], i);
+      counter = &vam->ip6_fib_counters[vrf_index][i];
+      clib_memcpy (&ip6, &v->address, sizeof (ip6));
+      counter->address = ip6;
+      counter->address_length = v->address_length;
+      counter->packets = clib_net_to_host_u64 (v->packets);
+      counter->bytes = clib_net_to_host_u64 (v->bytes);
+      v++;
+    }
+}
+
+static void vl_api_get_first_msg_id_reply_t_handler
+  (vl_api_get_first_msg_id_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->result_ready = 1;
+    }
+  if (retval >= 0)
+    {
+      errmsg ("first message id %d", ntohs (mp->first_msg_id));
+    }
+}
+
+static void vl_api_get_first_msg_id_reply_t_handler_json
+  (vl_api_get_first_msg_id_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "first_msg_id",
+			    (uint) ntohs (mp->first_msg_id));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_get_node_graph_reply_t_handler
+  (vl_api_get_node_graph_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  api_main_t *am = &api_main;
+  i32 retval = ntohl (mp->retval);
+  u8 *pvt_copy, *reply;
+  void *oldheap;
+  vlib_node_t *node;
+  int i;
+
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->result_ready = 1;
+    }
+
+  /* "Should never happen..." */
+  if (retval != 0)
+    return;
+
+  reply = (u8 *) (mp->reply_in_shmem);
+  pvt_copy = vec_dup (reply);
+
+  /* Toss the shared-memory original... */
+  pthread_mutex_lock (&am->vlib_rp->mutex);
+  oldheap = svm_push_data_heap (am->vlib_rp);
+
+  vec_free (reply);
+
+  svm_pop_heap (oldheap);
+  pthread_mutex_unlock (&am->vlib_rp->mutex);
+
+  if (vam->graph_nodes)
+    {
+      hash_free (vam->graph_node_index_by_name);
+
+      for (i = 0; i < vec_len (vam->graph_nodes); i++)
+	{
+	  node = vam->graph_nodes[i];
+	  vec_free (node->name);
+	  vec_free (node->next_nodes);
+	  vec_free (node);
+	}
+      vec_free (vam->graph_nodes);
+    }
+
+  vam->graph_node_index_by_name = hash_create_string (0, sizeof (uword));
+  vam->graph_nodes = vlib_node_unserialize (pvt_copy);
+  vec_free (pvt_copy);
+
+  for (i = 0; i < vec_len (vam->graph_nodes); i++)
+    {
+      node = vam->graph_nodes[i];
+      hash_set_mem (vam->graph_node_index_by_name, node->name, i);
+    }
+}
+
+static void vl_api_get_node_graph_reply_t_handler_json
+  (vl_api_get_node_graph_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  api_main_t *am = &api_main;
+  void *oldheap;
+  vat_json_node_t node;
+  u8 *reply;
+
+  /* $$$$ make this real? */
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "reply_in_shmem", mp->reply_in_shmem);
+
+  reply = (u8 *) (mp->reply_in_shmem);
+
+  /* Toss the shared-memory original... */
+  pthread_mutex_lock (&am->vlib_rp->mutex);
+  oldheap = svm_push_data_heap (am->vlib_rp);
+
+  vec_free (reply);
+
+  svm_pop_heap (oldheap);
+  pthread_mutex_unlock (&am->vlib_rp->mutex);
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void
+vl_api_lisp_locator_details_t_handler (vl_api_lisp_locator_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  u8 *s = 0;
+
+  if (mp->local)
+    {
+      s = format (s, "%=16d%=16d%=16d",
+		  ntohl (mp->sw_if_index), mp->priority, mp->weight);
+    }
+  else
+    {
+      s = format (s, "%=16U%=16d%=16d",
+		  mp->is_ipv6 ? format_ip6_address :
+		  format_ip4_address,
+		  mp->ip_address, mp->priority, mp->weight);
+    }
+
+  print (vam->ofp, "%v", s);
+  vec_free (s);
+}
+
+static void
+vl_api_lisp_locator_details_t_handler_json (vl_api_lisp_locator_details_t *
+					    mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+  struct in6_addr ip6;
+  struct in_addr ip4;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+  vat_json_init_object (node);
+
+  vat_json_object_add_uint (node, "local", mp->local ? 1 : 0);
+  vat_json_object_add_uint (node, "priority", mp->priority);
+  vat_json_object_add_uint (node, "weight", mp->weight);
+
+  if (mp->local)
+    vat_json_object_add_uint (node, "sw_if_index",
+			      clib_net_to_host_u32 (mp->sw_if_index));
+  else
+    {
+      if (mp->is_ipv6)
+	{
+	  clib_memcpy (&ip6, mp->ip_address, sizeof (ip6));
+	  vat_json_object_add_ip6 (node, "address", ip6);
+	}
+      else
+	{
+	  clib_memcpy (&ip4, mp->ip_address, sizeof (ip4));
+	  vat_json_object_add_ip4 (node, "address", ip4);
+	}
+    }
+}
+
+static void
+vl_api_lisp_locator_set_details_t_handler (vl_api_lisp_locator_set_details_t *
+					   mp)
+{
+  vat_main_t *vam = &vat_main;
+  u8 *ls_name = 0;
+
+  ls_name = format (0, "%s", mp->ls_name);
+
+  print (vam->ofp, "%=10d%=15v", clib_net_to_host_u32 (mp->ls_index),
+	 ls_name);
+  vec_free (ls_name);
+}
+
+static void
+  vl_api_lisp_locator_set_details_t_handler_json
+  (vl_api_lisp_locator_set_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = 0;
+  u8 *ls_name = 0;
+
+  ls_name = format (0, "%s", mp->ls_name);
+  vec_add1 (ls_name, 0);
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_string_copy (node, "ls_name", ls_name);
+  vat_json_object_add_uint (node, "ls_index",
+			    clib_net_to_host_u32 (mp->ls_index));
+  vec_free (ls_name);
+}
+
+static u8 *
+format_lisp_flat_eid (u8 * s, va_list * args)
+{
+  u32 type = va_arg (*args, u32);
+  u8 *eid = va_arg (*args, u8 *);
+  u32 eid_len = va_arg (*args, u32);
+
+  switch (type)
+    {
+    case 0:
+      return format (s, "%U/%d", format_ip4_address, eid, eid_len);
+    case 1:
+      return format (s, "%U/%d", format_ip6_address, eid, eid_len);
+    case 2:
+      return format (s, "%U", format_ethernet_address, eid);
+    }
+  return 0;
+}
+
+static u8 *
+format_lisp_eid_vat (u8 * s, va_list * args)
+{
+  u32 type = va_arg (*args, u32);
+  u8 *eid = va_arg (*args, u8 *);
+  u32 eid_len = va_arg (*args, u32);
+  u8 *seid = va_arg (*args, u8 *);
+  u32 seid_len = va_arg (*args, u32);
+  u32 is_src_dst = va_arg (*args, u32);
+
+  if (is_src_dst)
+    s = format (s, "%U|", format_lisp_flat_eid, type, seid, seid_len);
+
+  s = format (s, "%U", format_lisp_flat_eid, type, eid, eid_len);
+
+  return s;
+}
+
+static void
+vl_api_lisp_eid_table_details_t_handler (vl_api_lisp_eid_table_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  u8 *s = 0, *eid = 0;
+
+  if (~0 == mp->locator_set_index)
+    s = format (0, "action: %d", mp->action);
+  else
+    s = format (0, "%d", clib_net_to_host_u32 (mp->locator_set_index));
+
+  eid = format (0, "%U", format_lisp_eid_vat,
+		mp->eid_type,
+		mp->eid,
+		mp->eid_prefix_len,
+		mp->seid, mp->seid_prefix_len, mp->is_src_dst);
+  vec_add1 (eid, 0);
+
+  print (vam->ofp, "[%d] %-35s%-20s%-30s%-20d%-20d%-10d%-20s",
+	 clib_net_to_host_u32 (mp->vni),
+	 eid,
+	 mp->is_local ? "local" : "remote",
+	 s, clib_net_to_host_u32 (mp->ttl), mp->authoritative,
+	 clib_net_to_host_u16 (mp->key_id), mp->key);
+
+  vec_free (s);
+  vec_free (eid);
+}
+
+static void
+vl_api_lisp_eid_table_details_t_handler_json (vl_api_lisp_eid_table_details_t
+					      * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = 0;
+  u8 *eid = 0;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  if (~0 == mp->locator_set_index)
+    vat_json_object_add_uint (node, "action", mp->action);
+  else
+    vat_json_object_add_uint (node, "locator_set_index",
+			      clib_net_to_host_u32 (mp->locator_set_index));
+
+  vat_json_object_add_uint (node, "is_local", mp->is_local ? 1 : 0);
+  eid = format (0, "%U", format_lisp_eid_vat,
+		mp->eid_type,
+		mp->eid,
+		mp->eid_prefix_len,
+		mp->seid, mp->seid_prefix_len, mp->is_src_dst);
+  vec_add1 (eid, 0);
+  vat_json_object_add_string_copy (node, "eid", eid);
+  vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni));
+  vat_json_object_add_uint (node, "ttl", clib_net_to_host_u32 (mp->ttl));
+  vat_json_object_add_uint (node, "authoritative", (mp->authoritative));
+
+  if (mp->key_id)
+    {
+      vat_json_object_add_uint (node, "key_id",
+				clib_net_to_host_u16 (mp->key_id));
+      vat_json_object_add_string_copy (node, "key", mp->key);
+    }
+  vec_free (eid);
+}
+
+static void
+  vl_api_lisp_eid_table_map_details_t_handler
+  (vl_api_lisp_eid_table_map_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  u8 *line = format (0, "%=10d%=10d",
+		     clib_net_to_host_u32 (mp->vni),
+		     clib_net_to_host_u32 (mp->dp_table));
+  print (vam->ofp, "%v", line);
+  vec_free (line);
+}
+
+static void
+  vl_api_lisp_eid_table_map_details_t_handler_json
+  (vl_api_lisp_eid_table_map_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "dp_table",
+			    clib_net_to_host_u32 (mp->dp_table));
+  vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni));
+}
+
+static void
+  vl_api_lisp_eid_table_vni_details_t_handler
+  (vl_api_lisp_eid_table_vni_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  u8 *line = format (0, "%d", clib_net_to_host_u32 (mp->vni));
+  print (vam->ofp, "%v", line);
+  vec_free (line);
+}
+
+static void
+  vl_api_lisp_eid_table_vni_details_t_handler_json
+  (vl_api_lisp_eid_table_vni_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni));
+}
+
+static u8 *
+format_decap_next (u8 * s, va_list * args)
+{
+  u32 next_index = va_arg (*args, u32);
+
+  switch (next_index)
+    {
+    case LISP_GPE_INPUT_NEXT_DROP:
+      return format (s, "drop");
+    case LISP_GPE_INPUT_NEXT_IP4_INPUT:
+      return format (s, "ip4");
+    case LISP_GPE_INPUT_NEXT_IP6_INPUT:
+      return format (s, "ip6");
+    default:
+      return format (s, "unknown %d", next_index);
+    }
+  return s;
+}
+
+static void
+vl_api_lisp_gpe_tunnel_details_t_handler (vl_api_lisp_gpe_tunnel_details_t *
+					  mp)
+{
+  vat_main_t *vam = &vat_main;
+  u8 *iid_str;
+  u8 *flag_str = NULL;
+
+  iid_str = format (0, "%d (0x%x)", ntohl (mp->iid), ntohl (mp->iid));
+
+#define _(n,v) if (mp->flags & v) flag_str = format (flag_str, "%s-bit ", #n);
+  foreach_lisp_gpe_flag_bit;
+#undef _
+
+  print (vam->ofp, "%=20d%=30U%=16U%=16d%=16d%=16U"
+	 "%=16d%=16d%=16sd=16d%=16s%=16s",
+	 mp->tunnels,
+	 mp->is_ipv6 ? format_ip6_address : format_ip4_address,
+	 mp->source_ip,
+	 mp->is_ipv6 ? format_ip6_address : format_ip4_address,
+	 mp->destination_ip,
+	 ntohl (mp->encap_fib_id),
+	 ntohl (mp->decap_fib_id),
+	 format_decap_next, ntohl (mp->dcap_next),
+	 mp->ver_res >> 6,
+	 flag_str, mp->next_protocol, mp->ver_res, mp->res, iid_str);
+
+  vec_free (iid_str);
+}
+
+static void
+  vl_api_lisp_gpe_tunnel_details_t_handler_json
+  (vl_api_lisp_gpe_tunnel_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+  struct in6_addr ip6;
+  struct in_addr ip4;
+  u8 *next_decap_str;
+
+  next_decap_str = format (0, "%U", format_decap_next, htonl (mp->dcap_next));
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "tunel", mp->tunnels);
+  if (mp->is_ipv6)
+    {
+      clib_memcpy (&ip6, mp->source_ip, sizeof (ip6));
+      vat_json_object_add_ip6 (node, "source address", ip6);
+      clib_memcpy (&ip6, mp->destination_ip, sizeof (ip6));
+      vat_json_object_add_ip6 (node, "destination address", ip6);
+    }
+  else
+    {
+      clib_memcpy (&ip4, mp->source_ip, sizeof (ip4));
+      vat_json_object_add_ip4 (node, "source address", ip4);
+      clib_memcpy (&ip4, mp->destination_ip, sizeof (ip4));
+      vat_json_object_add_ip4 (node, "destination address", ip4);
+    }
+  vat_json_object_add_uint (node, "fib encap", ntohl (mp->encap_fib_id));
+  vat_json_object_add_uint (node, "fib decap", ntohl (mp->decap_fib_id));
+  vat_json_object_add_string_copy (node, "decap next", next_decap_str);
+  vat_json_object_add_uint (node, "lisp version", mp->ver_res >> 6);
+  vat_json_object_add_uint (node, "flags", mp->flags);
+  vat_json_object_add_uint (node, "next protocol", mp->next_protocol);
+  vat_json_object_add_uint (node, "ver_res", mp->ver_res);
+  vat_json_object_add_uint (node, "res", mp->res);
+  vat_json_object_add_uint (node, "iid", ntohl (mp->iid));
+
+  vec_free (next_decap_str);
+}
+
+static void
+  vl_api_show_lisp_map_register_state_reply_t_handler
+  (vl_api_show_lisp_map_register_state_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  int retval = clib_net_to_host_u32 (mp->retval);
+
+  print (vam->ofp, "%s", mp->is_enabled ? "enabled" : "disabled");
+
+  vam->retval = retval;
+  vam->result_ready = 1;
+}
+
+static void
+  vl_api_show_lisp_map_register_state_reply_t_handler_json
+  (vl_api_show_lisp_map_register_state_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t _node, *node = &_node;
+  int retval = clib_net_to_host_u32 (mp->retval);
+
+  u8 *s = format (0, "%s", mp->is_enabled ? "enabled" : "disabled");
+
+  vat_json_init_object (node);
+  vat_json_object_add_string_copy (node, "state", s);
+
+  vat_json_print (vam->ofp, node);
+  vat_json_free (node);
+
+  vam->retval = retval;
+  vam->result_ready = 1;
+  vec_free (s);
+}
+
+static void
+  vl_api_show_lisp_rloc_probe_state_reply_t_handler
+  (vl_api_show_lisp_rloc_probe_state_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  int retval = clib_net_to_host_u32 (mp->retval);
+
+  if (retval)
+    goto end;
+
+  print (vam->ofp, "%s", mp->is_enabled ? "enabled" : "disabled");
+end:
+  vam->retval = retval;
+  vam->result_ready = 1;
+}
+
+static void
+  vl_api_show_lisp_rloc_probe_state_reply_t_handler_json
+  (vl_api_show_lisp_rloc_probe_state_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t _node, *node = &_node;
+  int retval = clib_net_to_host_u32 (mp->retval);
+
+  u8 *s = format (0, "%s", mp->is_enabled ? "enabled" : "disabled");
+  vat_json_init_object (node);
+  vat_json_object_add_string_copy (node, "state", s);
+
+  vat_json_print (vam->ofp, node);
+  vat_json_free (node);
+
+  vam->retval = retval;
+  vam->result_ready = 1;
+  vec_free (s);
+}
+
+static void
+  vl_api_lisp_adjacencies_get_reply_t_handler
+  (vl_api_lisp_adjacencies_get_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  u32 i, n;
+  int retval = clib_net_to_host_u32 (mp->retval);
+  vl_api_lisp_adjacency_t *a;
+
+  if (retval)
+    goto end;
+
+  n = clib_net_to_host_u32 (mp->count);
+
+  for (i = 0; i < n; i++)
+    {
+      a = &mp->adjacencies[i];
+      print (vam->ofp, "%U %40U",
+	     format_lisp_flat_eid, a->eid_type, a->leid, a->leid_prefix_len,
+	     format_lisp_flat_eid, a->eid_type, a->reid, a->reid_prefix_len);
+    }
+
+end:
+  vam->retval = retval;
+  vam->result_ready = 1;
+}
+
+static void
+  vl_api_lisp_adjacencies_get_reply_t_handler_json
+  (vl_api_lisp_adjacencies_get_reply_t * mp)
+{
+  u8 *s = 0;
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *e = 0, root;
+  u32 i, n;
+  int retval = clib_net_to_host_u32 (mp->retval);
+  vl_api_lisp_adjacency_t *a;
+
+  if (retval)
+    goto end;
+
+  n = clib_net_to_host_u32 (mp->count);
+  vat_json_init_array (&root);
+
+  for (i = 0; i < n; i++)
+    {
+      e = vat_json_array_add (&root);
+      a = &mp->adjacencies[i];
+
+      vat_json_init_object (e);
+      s = format (0, "%U", format_lisp_flat_eid, a->eid_type, a->leid,
+		  a->leid_prefix_len);
+      vec_add1 (s, 0);
+      vat_json_object_add_string_copy (e, "leid", s);
+      vec_free (s);
+
+      s = format (0, "%U", format_lisp_flat_eid, a->eid_type, a->reid,
+		  a->reid_prefix_len);
+      vec_add1 (s, 0);
+      vat_json_object_add_string_copy (e, "reid", s);
+      vec_free (s);
+    }
+
+  vat_json_print (vam->ofp, &root);
+  vat_json_free (&root);
+
+end:
+  vam->retval = retval;
+  vam->result_ready = 1;
+}
+
+static void
+vl_api_lisp_map_server_details_t_handler (vl_api_lisp_map_server_details_t
+					  * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "%=20U",
+	 mp->is_ipv6 ? format_ip6_address : format_ip4_address,
+	 mp->ip_address);
+}
+
+static void
+  vl_api_lisp_map_server_details_t_handler_json
+  (vl_api_lisp_map_server_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+  struct in6_addr ip6;
+  struct in_addr ip4;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  if (mp->is_ipv6)
+    {
+      clib_memcpy (&ip6, mp->ip_address, sizeof (ip6));
+      vat_json_object_add_ip6 (node, "map-server", ip6);
+    }
+  else
+    {
+      clib_memcpy (&ip4, mp->ip_address, sizeof (ip4));
+      vat_json_object_add_ip4 (node, "map-server", ip4);
+    }
+}
+
+static void
+vl_api_lisp_map_resolver_details_t_handler (vl_api_lisp_map_resolver_details_t
+					    * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "%=20U",
+	 mp->is_ipv6 ? format_ip6_address : format_ip4_address,
+	 mp->ip_address);
+}
+
+static void
+  vl_api_lisp_map_resolver_details_t_handler_json
+  (vl_api_lisp_map_resolver_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+  struct in6_addr ip6;
+  struct in_addr ip4;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  if (mp->is_ipv6)
+    {
+      clib_memcpy (&ip6, mp->ip_address, sizeof (ip6));
+      vat_json_object_add_ip6 (node, "map resolver", ip6);
+    }
+  else
+    {
+      clib_memcpy (&ip4, mp->ip_address, sizeof (ip4));
+      vat_json_object_add_ip4 (node, "map resolver", ip4);
+    }
+}
+
+static void
+  vl_api_show_lisp_status_reply_t_handler
+  (vl_api_show_lisp_status_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  if (0 <= retval)
+    {
+      print (vam->ofp, "feature: %s\ngpe: %s",
+	     mp->feature_status ? "enabled" : "disabled",
+	     mp->gpe_status ? "enabled" : "disabled");
+    }
+
+  vam->retval = retval;
+  vam->result_ready = 1;
+}
+
+static void
+  vl_api_show_lisp_status_reply_t_handler_json
+  (vl_api_show_lisp_status_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+  u8 *gpe_status = NULL;
+  u8 *feature_status = NULL;
+
+  gpe_status = format (0, "%s", mp->gpe_status ? "enabled" : "disabled");
+  feature_status = format (0, "%s",
+			   mp->feature_status ? "enabled" : "disabled");
+  vec_add1 (gpe_status, 0);
+  vec_add1 (feature_status, 0);
+
+  vat_json_init_object (&node);
+  vat_json_object_add_string_copy (&node, "gpe_status", gpe_status);
+  vat_json_object_add_string_copy (&node, "feature_status", feature_status);
+
+  vec_free (gpe_status);
+  vec_free (feature_status);
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void
+  vl_api_lisp_get_map_request_itr_rlocs_reply_t_handler
+  (vl_api_lisp_get_map_request_itr_rlocs_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  if (retval >= 0)
+    {
+      print (vam->ofp, "%=20s", mp->locator_set_name);
+    }
+
+  vam->retval = retval;
+  vam->result_ready = 1;
+}
+
+static void
+  vl_api_lisp_get_map_request_itr_rlocs_reply_t_handler_json
+  (vl_api_lisp_get_map_request_itr_rlocs_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_string_copy (node, "itr-rlocs", mp->locator_set_name);
+
+  vat_json_print (vam->ofp, node);
+  vat_json_free (node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static u8 *
+format_lisp_map_request_mode (u8 * s, va_list * args)
+{
+  u32 mode = va_arg (*args, u32);
+
+  switch (mode)
+    {
+    case 0:
+      return format (0, "dst-only");
+    case 1:
+      return format (0, "src-dst");
+    }
+  return 0;
+}
+
+static void
+  vl_api_show_lisp_map_request_mode_reply_t_handler
+  (vl_api_show_lisp_map_request_mode_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  if (0 <= retval)
+    {
+      u32 mode = mp->mode;
+      print (vam->ofp, "map_request_mode: %U",
+	     format_lisp_map_request_mode, mode);
+    }
+
+  vam->retval = retval;
+  vam->result_ready = 1;
+}
+
+static void
+  vl_api_show_lisp_map_request_mode_reply_t_handler_json
+  (vl_api_show_lisp_map_request_mode_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+  u8 *s = 0;
+  u32 mode;
+
+  mode = mp->mode;
+  s = format (0, "%U", format_lisp_map_request_mode, mode);
+  vec_add1 (s, 0);
+
+  vat_json_init_object (&node);
+  vat_json_object_add_string_copy (&node, "map_request_mode", s);
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vec_free (s);
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void
+vl_api_show_lisp_pitr_reply_t_handler (vl_api_show_lisp_pitr_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  if (0 <= retval)
+    {
+      print (vam->ofp, "%-20s%-16s",
+	     mp->status ? "enabled" : "disabled",
+	     mp->status ? (char *) mp->locator_set_name : "");
+    }
+
+  vam->retval = retval;
+  vam->result_ready = 1;
+}
+
+static void
+vl_api_show_lisp_pitr_reply_t_handler_json (vl_api_show_lisp_pitr_reply_t *
+					    mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+  u8 *status = 0;
+
+  status = format (0, "%s", mp->status ? "enabled" : "disabled");
+  vec_add1 (status, 0);
+
+  vat_json_init_object (&node);
+  vat_json_object_add_string_copy (&node, "status", status);
+  if (mp->status)
+    {
+      vat_json_object_add_string_copy (&node, "locator_set",
+				       mp->locator_set_name);
+    }
+
+  vec_free (status);
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static u8 *
+format_policer_type (u8 * s, va_list * va)
+{
+  u32 i = va_arg (*va, u32);
+
+  if (i == SSE2_QOS_POLICER_TYPE_1R2C)
+    s = format (s, "1r2c");
+  else if (i == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
+    s = format (s, "1r3c");
+  else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698)
+    s = format (s, "2r3c-2698");
+  else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115)
+    s = format (s, "2r3c-4115");
+  else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1)
+    s = format (s, "2r3c-mef5cf1");
+  else
+    s = format (s, "ILLEGAL");
+  return s;
+}
+
+static u8 *
+format_policer_rate_type (u8 * s, va_list * va)
+{
+  u32 i = va_arg (*va, u32);
+
+  if (i == SSE2_QOS_RATE_KBPS)
+    s = format (s, "kbps");
+  else if (i == SSE2_QOS_RATE_PPS)
+    s = format (s, "pps");
+  else
+    s = format (s, "ILLEGAL");
+  return s;
+}
+
+static u8 *
+format_policer_round_type (u8 * s, va_list * va)
+{
+  u32 i = va_arg (*va, u32);
+
+  if (i == SSE2_QOS_ROUND_TO_CLOSEST)
+    s = format (s, "closest");
+  else if (i == SSE2_QOS_ROUND_TO_UP)
+    s = format (s, "up");
+  else if (i == SSE2_QOS_ROUND_TO_DOWN)
+    s = format (s, "down");
+  else
+    s = format (s, "ILLEGAL");
+  return s;
+}
+
+static u8 *
+format_policer_action_type (u8 * s, va_list * va)
+{
+  u32 i = va_arg (*va, u32);
+
+  if (i == SSE2_QOS_ACTION_DROP)
+    s = format (s, "drop");
+  else if (i == SSE2_QOS_ACTION_TRANSMIT)
+    s = format (s, "transmit");
+  else if (i == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+    s = format (s, "mark-and-transmit");
+  else
+    s = format (s, "ILLEGAL");
+  return s;
+}
+
+static u8 *
+format_dscp (u8 * s, va_list * va)
+{
+  u32 i = va_arg (*va, u32);
+  char *t = 0;
+
+  switch (i)
+    {
+#define _(v,f,str) case VNET_DSCP_##f: t = str; break;
+      foreach_vnet_dscp
+#undef _
+    default:
+      return format (s, "ILLEGAL");
+    }
+  s = format (s, "%s", t);
+  return s;
+}
+
+static void
+vl_api_policer_details_t_handler (vl_api_policer_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  u8 *conform_dscp_str, *exceed_dscp_str, *violate_dscp_str;
+
+  if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+    conform_dscp_str = format (0, "%U", format_dscp, mp->conform_dscp);
+  else
+    conform_dscp_str = format (0, "");
+
+  if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+    exceed_dscp_str = format (0, "%U", format_dscp, mp->exceed_dscp);
+  else
+    exceed_dscp_str = format (0, "");
+
+  if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+    violate_dscp_str = format (0, "%U", format_dscp, mp->violate_dscp);
+  else
+    violate_dscp_str = format (0, "");
+
+  print (vam->ofp, "Name \"%s\", type %U, cir %u, eir %u, cb %u, eb %u, "
+	 "rate type %U, round type %U, %s rate, %s color-aware, "
+	 "cir %u tok/period, pir %u tok/period, scale %u, cur lim %u, "
+	 "cur bkt %u, ext lim %u, ext bkt %u, last update %llu"
+	 "conform action %U%s, exceed action %U%s, violate action %U%s",
+	 mp->name,
+	 format_policer_type, mp->type,
+	 ntohl (mp->cir),
+	 ntohl (mp->eir),
+	 clib_net_to_host_u64 (mp->cb),
+	 clib_net_to_host_u64 (mp->eb),
+	 format_policer_rate_type, mp->rate_type,
+	 format_policer_round_type, mp->round_type,
+	 mp->single_rate ? "single" : "dual",
+	 mp->color_aware ? "is" : "not",
+	 ntohl (mp->cir_tokens_per_period),
+	 ntohl (mp->pir_tokens_per_period),
+	 ntohl (mp->scale),
+	 ntohl (mp->current_limit),
+	 ntohl (mp->current_bucket),
+	 ntohl (mp->extended_limit),
+	 ntohl (mp->extended_bucket),
+	 clib_net_to_host_u64 (mp->last_update_time),
+	 format_policer_action_type, mp->conform_action_type,
+	 conform_dscp_str,
+	 format_policer_action_type, mp->exceed_action_type,
+	 exceed_dscp_str,
+	 format_policer_action_type, mp->violate_action_type,
+	 violate_dscp_str);
+
+  vec_free (conform_dscp_str);
+  vec_free (exceed_dscp_str);
+  vec_free (violate_dscp_str);
+}
+
+static void vl_api_policer_details_t_handler_json
+  (vl_api_policer_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node;
+  u8 *rate_type_str, *round_type_str, *type_str;
+  u8 *conform_action_str, *exceed_action_str, *violate_action_str;
+
+  rate_type_str = format (0, "%U", format_policer_rate_type, mp->rate_type);
+  round_type_str =
+    format (0, "%U", format_policer_round_type, mp->round_type);
+  type_str = format (0, "%U", format_policer_type, mp->type);
+  conform_action_str = format (0, "%U", format_policer_action_type,
+			       mp->conform_action_type);
+  exceed_action_str = format (0, "%U", format_policer_action_type,
+			      mp->exceed_action_type);
+  violate_action_str = format (0, "%U", format_policer_action_type,
+			       mp->violate_action_type);
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_string_copy (node, "name", mp->name);
+  vat_json_object_add_uint (node, "cir", ntohl (mp->cir));
+  vat_json_object_add_uint (node, "eir", ntohl (mp->eir));
+  vat_json_object_add_uint (node, "cb", ntohl (mp->cb));
+  vat_json_object_add_uint (node, "eb", ntohl (mp->eb));
+  vat_json_object_add_string_copy (node, "rate_type", rate_type_str);
+  vat_json_object_add_string_copy (node, "round_type", round_type_str);
+  vat_json_object_add_string_copy (node, "type", type_str);
+  vat_json_object_add_uint (node, "single_rate", mp->single_rate);
+  vat_json_object_add_uint (node, "color_aware", mp->color_aware);
+  vat_json_object_add_uint (node, "scale", ntohl (mp->scale));
+  vat_json_object_add_uint (node, "cir_tokens_per_period",
+			    ntohl (mp->cir_tokens_per_period));
+  vat_json_object_add_uint (node, "eir_tokens_per_period",
+			    ntohl (mp->pir_tokens_per_period));
+  vat_json_object_add_uint (node, "current_limit", ntohl (mp->current_limit));
+  vat_json_object_add_uint (node, "current_bucket",
+			    ntohl (mp->current_bucket));
+  vat_json_object_add_uint (node, "extended_limit",
+			    ntohl (mp->extended_limit));
+  vat_json_object_add_uint (node, "extended_bucket",
+			    ntohl (mp->extended_bucket));
+  vat_json_object_add_uint (node, "last_update_time",
+			    ntohl (mp->last_update_time));
+  vat_json_object_add_string_copy (node, "conform_action",
+				   conform_action_str);
+  if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+    {
+      u8 *dscp_str = format (0, "%U", format_dscp, mp->conform_dscp);
+      vat_json_object_add_string_copy (node, "conform_dscp", dscp_str);
+      vec_free (dscp_str);
+    }
+  vat_json_object_add_string_copy (node, "exceed_action", exceed_action_str);
+  if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+    {
+      u8 *dscp_str = format (0, "%U", format_dscp, mp->exceed_dscp);
+      vat_json_object_add_string_copy (node, "exceed_dscp", dscp_str);
+      vec_free (dscp_str);
+    }
+  vat_json_object_add_string_copy (node, "violate_action",
+				   violate_action_str);
+  if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+    {
+      u8 *dscp_str = format (0, "%U", format_dscp, mp->violate_dscp);
+      vat_json_object_add_string_copy (node, "violate_dscp", dscp_str);
+      vec_free (dscp_str);
+    }
+
+  vec_free (rate_type_str);
+  vec_free (round_type_str);
+  vec_free (type_str);
+  vec_free (conform_action_str);
+  vec_free (exceed_action_str);
+  vec_free (violate_action_str);
+}
+
+static void
+vl_api_classify_table_ids_reply_t_handler (vl_api_classify_table_ids_reply_t *
+					   mp)
+{
+  vat_main_t *vam = &vat_main;
+  int i, count = ntohl (mp->count);
+
+  if (count > 0)
+    print (vam->ofp, "classify table ids (%d) : ", count);
+  for (i = 0; i < count; i++)
+    {
+      print (vam->ofp, "%d", ntohl (mp->ids[i]));
+      print (vam->ofp, (i < count - 1) ? "," : "");
+    }
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void
+  vl_api_classify_table_ids_reply_t_handler_json
+  (vl_api_classify_table_ids_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  int i, count = ntohl (mp->count);
+
+  if (count > 0)
+    {
+      vat_json_node_t node;
+
+      vat_json_init_object (&node);
+      for (i = 0; i < count; i++)
+	{
+	  vat_json_object_add_uint (&node, "table_id", ntohl (mp->ids[i]));
+	}
+      vat_json_print (vam->ofp, &node);
+      vat_json_free (&node);
+    }
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void
+  vl_api_classify_table_by_interface_reply_t_handler
+  (vl_api_classify_table_by_interface_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  u32 table_id;
+
+  table_id = ntohl (mp->l2_table_id);
+  if (table_id != ~0)
+    print (vam->ofp, "l2 table id : %d", table_id);
+  else
+    print (vam->ofp, "l2 table id : No input ACL tables configured");
+  table_id = ntohl (mp->ip4_table_id);
+  if (table_id != ~0)
+    print (vam->ofp, "ip4 table id : %d", table_id);
+  else
+    print (vam->ofp, "ip4 table id : No input ACL tables configured");
+  table_id = ntohl (mp->ip6_table_id);
+  if (table_id != ~0)
+    print (vam->ofp, "ip6 table id : %d", table_id);
+  else
+    print (vam->ofp, "ip6 table id : No input ACL tables configured");
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void
+  vl_api_classify_table_by_interface_reply_t_handler_json
+  (vl_api_classify_table_by_interface_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+
+  vat_json_object_add_int (&node, "l2_table_id", ntohl (mp->l2_table_id));
+  vat_json_object_add_int (&node, "ip4_table_id", ntohl (mp->ip4_table_id));
+  vat_json_object_add_int (&node, "ip6_table_id", ntohl (mp->ip6_table_id));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_policer_add_del_reply_t_handler
+  (vl_api_policer_add_del_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->result_ready = 1;
+      if (retval == 0 && mp->policer_index != 0xFFFFFFFF)
+	/*
+	 * Note: this is just barely thread-safe, depends on
+	 * the main thread spinning waiting for an answer...
+	 */
+	errmsg ("policer index %d", ntohl (mp->policer_index));
+    }
+}
+
+static void vl_api_policer_add_del_reply_t_handler_json
+  (vl_api_policer_add_del_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "policer_index",
+			    ntohl (mp->policer_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+/* Format hex dump. */
+u8 *
+format_hex_bytes (u8 * s, va_list * va)
+{
+  u8 *bytes = va_arg (*va, u8 *);
+  int n_bytes = va_arg (*va, int);
+  uword i;
+
+  /* Print short or long form depending on byte count. */
+  uword short_form = n_bytes <= 32;
+  uword indent = format_get_indent (s);
+
+  if (n_bytes == 0)
+    return s;
+
+  for (i = 0; i < n_bytes; i++)
+    {
+      if (!short_form && (i % 32) == 0)
+	s = format (s, "%08x: ", i);
+      s = format (s, "%02x", bytes[i]);
+      if (!short_form && ((i + 1) % 32) == 0 && (i + 1) < n_bytes)
+	s = format (s, "\n%U", format_white_space, indent);
+    }
+
+  return s;
+}
+
+static void
+vl_api_classify_table_info_reply_t_handler (vl_api_classify_table_info_reply_t
+					    * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (retval == 0)
+    {
+      print (vam->ofp, "classify table info :");
+      print (vam->ofp, "sessions: %d nexttbl: %d nextnode: %d",
+	     ntohl (mp->active_sessions), ntohl (mp->next_table_index),
+	     ntohl (mp->miss_next_index));
+      print (vam->ofp, "nbuckets: %d skip: %d match: %d",
+	     ntohl (mp->nbuckets), ntohl (mp->skip_n_vectors),
+	     ntohl (mp->match_n_vectors));
+      print (vam->ofp, "mask: %U", format_hex_bytes, mp->mask,
+	     ntohl (mp->mask_length));
+    }
+  vam->retval = retval;
+  vam->result_ready = 1;
+}
+
+static void
+  vl_api_classify_table_info_reply_t_handler_json
+  (vl_api_classify_table_info_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  i32 retval = ntohl (mp->retval);
+  if (retval == 0)
+    {
+      vat_json_init_object (&node);
+
+      vat_json_object_add_int (&node, "sessions",
+			       ntohl (mp->active_sessions));
+      vat_json_object_add_int (&node, "nexttbl",
+			       ntohl (mp->next_table_index));
+      vat_json_object_add_int (&node, "nextnode",
+			       ntohl (mp->miss_next_index));
+      vat_json_object_add_int (&node, "nbuckets", ntohl (mp->nbuckets));
+      vat_json_object_add_int (&node, "skip", ntohl (mp->skip_n_vectors));
+      vat_json_object_add_int (&node, "match", ntohl (mp->match_n_vectors));
+      u8 *s = format (0, "%U%c", format_hex_bytes, mp->mask,
+		      ntohl (mp->mask_length), 0);
+      vat_json_object_add_string_copy (&node, "mask", s);
+
+      vat_json_print (vam->ofp, &node);
+      vat_json_free (&node);
+    }
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void
+vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t *
+					   mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "next_index: %d advance: %d opaque: %d ",
+	 ntohl (mp->hit_next_index), ntohl (mp->advance),
+	 ntohl (mp->opaque_index));
+  print (vam->ofp, "mask: %U", format_hex_bytes, mp->match,
+	 ntohl (mp->match_length));
+}
+
+static void
+  vl_api_classify_session_details_t_handler_json
+  (vl_api_classify_session_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_int (node, "next_index", ntohl (mp->hit_next_index));
+  vat_json_object_add_int (node, "advance", ntohl (mp->advance));
+  vat_json_object_add_int (node, "opaque", ntohl (mp->opaque_index));
+  u8 *s =
+    format (0, "%U%c", format_hex_bytes, mp->match, ntohl (mp->match_length),
+	    0);
+  vat_json_object_add_string_copy (node, "match", s);
+}
+
+static void vl_api_pg_create_interface_reply_t_handler
+  (vl_api_pg_create_interface_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_pg_create_interface_reply_t_handler_json
+  (vl_api_pg_create_interface_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  i32 retval = ntohl (mp->retval);
+  if (retval == 0)
+    {
+      vat_json_init_object (&node);
+
+      vat_json_object_add_int (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+      vat_json_print (vam->ofp, &node);
+      vat_json_free (&node);
+    }
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_policer_classify_details_t_handler
+  (vl_api_policer_classify_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index),
+	 ntohl (mp->table_index));
+}
+
+static void vl_api_policer_classify_details_t_handler_json
+  (vl_api_policer_classify_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+  vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index));
+}
+
+static void vl_api_ipsec_gre_add_del_tunnel_reply_t_handler
+  (vl_api_ipsec_gre_add_del_tunnel_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->sw_if_index = ntohl (mp->sw_if_index);
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_ipsec_gre_add_del_tunnel_reply_t_handler_json
+  (vl_api_ipsec_gre_add_del_tunnel_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static void vl_api_flow_classify_details_t_handler
+  (vl_api_flow_classify_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index),
+	 ntohl (mp->table_index));
+}
+
+static void vl_api_flow_classify_details_t_handler_json
+  (vl_api_flow_classify_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+  vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index));
+}
+
+
+
+#define vl_api_vnet_ip4_fib_counters_t_endian vl_noop_handler
+#define vl_api_vnet_ip4_fib_counters_t_print vl_noop_handler
+#define vl_api_vnet_ip6_fib_counters_t_endian vl_noop_handler
+#define vl_api_vnet_ip6_fib_counters_t_print vl_noop_handler
+#define vl_api_lisp_adjacencies_get_reply_t_endian vl_noop_handler
+#define vl_api_lisp_adjacencies_get_reply_t_print vl_noop_handler
+
+/*
+ * Generate boilerplate reply handlers, which
+ * dig the return value out of the xxx_reply_t API message,
+ * stick it into vam->retval, and set vam->result_ready
+ *
+ * Could also do this by pointing N message decode slots at
+ * a single function, but that could break in subtle ways.
+ */
+
+#define foreach_standard_reply_retval_handler           \
+_(sw_interface_set_flags_reply)                         \
+_(sw_interface_add_del_address_reply)                   \
+_(sw_interface_set_table_reply)                         \
+_(sw_interface_set_mpls_enable_reply)                   \
+_(sw_interface_set_vpath_reply)                         \
+_(sw_interface_set_vxlan_bypass_reply)                  \
+_(sw_interface_set_l2_bridge_reply)                     \
+_(sw_interface_set_dpdk_hqos_pipe_reply)                \
+_(sw_interface_set_dpdk_hqos_subport_reply)             \
+_(sw_interface_set_dpdk_hqos_tctbl_reply)               \
+_(bridge_domain_add_del_reply)                          \
+_(sw_interface_set_l2_xconnect_reply)                   \
+_(l2fib_add_del_reply)                                  \
+_(ip_add_del_route_reply)                               \
+_(mpls_route_add_del_reply)                             \
+_(mpls_ip_bind_unbind_reply)                            \
+_(proxy_arp_add_del_reply)                              \
+_(proxy_arp_intfc_enable_disable_reply)                 \
+_(sw_interface_set_unnumbered_reply)                    \
+_(ip_neighbor_add_del_reply)                            \
+_(reset_vrf_reply)                                      \
+_(oam_add_del_reply)                                    \
+_(reset_fib_reply)                                      \
+_(dhcp_proxy_config_reply)                              \
+_(dhcp_proxy_config_2_reply)                            \
+_(dhcp_proxy_set_vss_reply)                             \
+_(dhcp_client_config_reply)                             \
+_(set_ip_flow_hash_reply)                               \
+_(sw_interface_ip6_enable_disable_reply)                \
+_(sw_interface_ip6_set_link_local_address_reply)        \
+_(sw_interface_ip6nd_ra_prefix_reply)                   \
+_(sw_interface_ip6nd_ra_config_reply)                   \
+_(set_arp_neighbor_limit_reply)                         \
+_(l2_patch_add_del_reply)                               \
+_(sr_tunnel_add_del_reply)                              \
+_(sr_policy_add_del_reply)                              \
+_(sr_multicast_map_add_del_reply)                       \
+_(classify_add_del_session_reply)                       \
+_(classify_set_interface_ip_table_reply)                \
+_(classify_set_interface_l2_tables_reply)               \
+_(l2tpv3_set_tunnel_cookies_reply)                      \
+_(l2tpv3_interface_enable_disable_reply)                \
+_(l2tpv3_set_lookup_key_reply)                          \
+_(l2_fib_clear_table_reply)                             \
+_(l2_interface_efp_filter_reply)                        \
+_(l2_interface_vlan_tag_rewrite_reply)                  \
+_(modify_vhost_user_if_reply)                           \
+_(delete_vhost_user_if_reply)                           \
+_(want_ip4_arp_events_reply)                            \
+_(want_ip6_nd_events_reply)                             \
+_(input_acl_set_interface_reply)                        \
+_(ipsec_spd_add_del_reply)                              \
+_(ipsec_interface_add_del_spd_reply)                    \
+_(ipsec_spd_add_del_entry_reply)                        \
+_(ipsec_sad_add_del_entry_reply)                        \
+_(ipsec_sa_set_key_reply)                               \
+_(ikev2_profile_add_del_reply)                          \
+_(ikev2_profile_set_auth_reply)                         \
+_(ikev2_profile_set_id_reply)                           \
+_(ikev2_profile_set_ts_reply)                           \
+_(ikev2_set_local_key_reply)                            \
+_(delete_loopback_reply)                                \
+_(bd_ip_mac_add_del_reply)                              \
+_(map_del_domain_reply)                                 \
+_(map_add_del_rule_reply)                               \
+_(want_interface_events_reply)                          \
+_(want_stats_reply)					\
+_(cop_interface_enable_disable_reply)			\
+_(cop_whitelist_enable_disable_reply)                   \
+_(sw_interface_clear_stats_reply)                       \
+_(ioam_enable_reply)                              \
+_(ioam_disable_reply)                              \
+_(lisp_add_del_locator_reply)                           \
+_(lisp_add_del_local_eid_reply)                         \
+_(lisp_add_del_remote_mapping_reply)                    \
+_(lisp_add_del_adjacency_reply)                         \
+_(lisp_gpe_add_del_fwd_entry_reply)                     \
+_(lisp_add_del_map_resolver_reply)                      \
+_(lisp_add_del_map_server_reply)                        \
+_(lisp_gpe_enable_disable_reply)                        \
+_(lisp_gpe_add_del_iface_reply)                         \
+_(lisp_enable_disable_reply)                            \
+_(lisp_rloc_probe_enable_disable_reply)                 \
+_(lisp_map_register_enable_disable_reply)               \
+_(lisp_pitr_set_locator_set_reply)                      \
+_(lisp_map_request_mode_reply)                          \
+_(lisp_add_del_map_request_itr_rlocs_reply)             \
+_(lisp_eid_table_add_del_map_reply)                     \
+_(vxlan_gpe_add_del_tunnel_reply)                       \
+_(af_packet_delete_reply)                               \
+_(policer_classify_set_interface_reply)                 \
+_(netmap_create_reply)                                  \
+_(netmap_delete_reply)                                  \
+_(set_ipfix_exporter_reply)                             \
+_(set_ipfix_classify_stream_reply)                      \
+_(ipfix_classify_table_add_del_reply)                   \
+_(flow_classify_set_interface_reply)                    \
+_(sw_interface_span_enable_disable_reply)               \
+_(pg_capture_reply)                                     \
+_(pg_enable_disable_reply)                              \
+_(ip_source_and_port_range_check_add_del_reply)         \
+_(ip_source_and_port_range_check_interface_add_del_reply)\
+_(delete_subif_reply)                                   \
+_(l2_interface_pbb_tag_rewrite_reply)                   \
+_(punt_reply)                                           \
+_(feature_enable_disable_reply)				\
+_(sw_interface_tag_add_del_reply)			\
+_(sw_interface_set_mtu_reply)
+
+#define _(n)                                    \
+    static void vl_api_##n##_t_handler          \
+    (vl_api_##n##_t * mp)                       \
+    {                                           \
+        vat_main_t * vam = &vat_main;           \
+        i32 retval = ntohl(mp->retval);         \
+        if (vam->async_mode) {                  \
+            vam->async_errors += (retval < 0);  \
+        } else {                                \
+            vam->retval = retval;               \
+            vam->result_ready = 1;              \
+        }                                       \
+    }
+foreach_standard_reply_retval_handler;
+#undef _
+
+#define _(n)                                    \
+    static void vl_api_##n##_t_handler_json     \
+    (vl_api_##n##_t * mp)                       \
+    {                                           \
+        vat_main_t * vam = &vat_main;           \
+        vat_json_node_t node;                   \
+        vat_json_init_object(&node);            \
+        vat_json_object_add_int(&node, "retval", ntohl(mp->retval));    \
+        vat_json_print(vam->ofp, &node);        \
+        vam->retval = ntohl(mp->retval);        \
+        vam->result_ready = 1;                  \
+    }
+foreach_standard_reply_retval_handler;
+#undef _
+
+/*
+ * Table of message reply handlers, must include boilerplate handlers
+ * we just generated
+ */
+
+#define foreach_vpe_api_reply_msg                                       \
+_(CREATE_LOOPBACK_REPLY, create_loopback_reply)                         \
+_(SW_INTERFACE_DETAILS, sw_interface_details)                           \
+_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags)                       \
+_(SW_INTERFACE_SET_FLAGS_REPLY, sw_interface_set_flags_reply)           \
+_(CONTROL_PING_REPLY, control_ping_reply)                               \
+_(CLI_REPLY, cli_reply)                                                 \
+_(CLI_INBAND_REPLY, cli_inband_reply)                                   \
+_(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY,                                   \
+  sw_interface_add_del_address_reply)                                   \
+_(SW_INTERFACE_SET_TABLE_REPLY, sw_interface_set_table_reply) 		\
+_(SW_INTERFACE_SET_MPLS_ENABLE_REPLY, sw_interface_set_mpls_enable_reply) \
+_(SW_INTERFACE_SET_VPATH_REPLY, sw_interface_set_vpath_reply) 		\
+_(SW_INTERFACE_SET_VXLAN_BYPASS_REPLY, sw_interface_set_vxlan_bypass_reply) \
+_(SW_INTERFACE_SET_L2_XCONNECT_REPLY,                                   \
+  sw_interface_set_l2_xconnect_reply)                                   \
+_(SW_INTERFACE_SET_L2_BRIDGE_REPLY,                                     \
+  sw_interface_set_l2_bridge_reply)                                     \
+_(SW_INTERFACE_SET_DPDK_HQOS_PIPE_REPLY,                                \
+  sw_interface_set_dpdk_hqos_pipe_reply)                                \
+_(SW_INTERFACE_SET_DPDK_HQOS_SUBPORT_REPLY,                             \
+  sw_interface_set_dpdk_hqos_subport_reply)                             \
+_(SW_INTERFACE_SET_DPDK_HQOS_TCTBL_REPLY,                               \
+  sw_interface_set_dpdk_hqos_tctbl_reply)                               \
+_(BRIDGE_DOMAIN_ADD_DEL_REPLY, bridge_domain_add_del_reply)             \
+_(BRIDGE_DOMAIN_DETAILS, bridge_domain_details)                         \
+_(BRIDGE_DOMAIN_SW_IF_DETAILS, bridge_domain_sw_if_details)             \
+_(L2FIB_ADD_DEL_REPLY, l2fib_add_del_reply)                             \
+_(L2_FLAGS_REPLY, l2_flags_reply)                                       \
+_(BRIDGE_FLAGS_REPLY, bridge_flags_reply)                               \
+_(TAP_CONNECT_REPLY, tap_connect_reply)					\
+_(TAP_MODIFY_REPLY, tap_modify_reply)					\
+_(TAP_DELETE_REPLY, tap_delete_reply)					\
+_(SW_INTERFACE_TAP_DETAILS, sw_interface_tap_details)                   \
+_(IP_ADD_DEL_ROUTE_REPLY, ip_add_del_route_reply)			\
+_(MPLS_ROUTE_ADD_DEL_REPLY, mpls_route_add_del_reply)			\
+_(MPLS_IP_BIND_UNBIND_REPLY, mpls_ip_bind_unbind_reply)			\
+_(PROXY_ARP_ADD_DEL_REPLY, proxy_arp_add_del_reply)                     \
+_(PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY,                                 \
+  proxy_arp_intfc_enable_disable_reply)                                 \
+_(MPLS_TUNNEL_ADD_DEL_REPLY, mpls_tunnel_add_del_reply)                 \
+_(SW_INTERFACE_SET_UNNUMBERED_REPLY,                                    \
+  sw_interface_set_unnumbered_reply)                                    \
+_(IP_NEIGHBOR_ADD_DEL_REPLY, ip_neighbor_add_del_reply)                 \
+_(RESET_VRF_REPLY, reset_vrf_reply)                                     \
+_(CREATE_VLAN_SUBIF_REPLY, create_vlan_subif_reply)                     \
+_(CREATE_SUBIF_REPLY, create_subif_reply)                     		\
+_(OAM_ADD_DEL_REPLY, oam_add_del_reply)                                 \
+_(RESET_FIB_REPLY, reset_fib_reply)                                     \
+_(DHCP_PROXY_CONFIG_REPLY, dhcp_proxy_config_reply)                     \
+_(DHCP_PROXY_CONFIG_2_REPLY, dhcp_proxy_config_2_reply)                 \
+_(DHCP_PROXY_SET_VSS_REPLY, dhcp_proxy_set_vss_reply)                   \
+_(DHCP_CLIENT_CONFIG_REPLY, dhcp_client_config_reply)                   \
+_(SET_IP_FLOW_HASH_REPLY, set_ip_flow_hash_reply)                       \
+_(SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY,                                \
+  sw_interface_ip6_enable_disable_reply)                                \
+_(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_REPLY,                        \
+  sw_interface_ip6_set_link_local_address_reply)                        \
+_(SW_INTERFACE_IP6ND_RA_PREFIX_REPLY,                                   \
+  sw_interface_ip6nd_ra_prefix_reply)                                   \
+_(SW_INTERFACE_IP6ND_RA_CONFIG_REPLY,                                   \
+  sw_interface_ip6nd_ra_config_reply)                                   \
+_(SET_ARP_NEIGHBOR_LIMIT_REPLY, set_arp_neighbor_limit_reply)           \
+_(L2_PATCH_ADD_DEL_REPLY, l2_patch_add_del_reply)                       \
+_(SR_TUNNEL_ADD_DEL_REPLY, sr_tunnel_add_del_reply)                     \
+_(SR_POLICY_ADD_DEL_REPLY, sr_policy_add_del_reply)                     \
+_(SR_MULTICAST_MAP_ADD_DEL_REPLY, sr_multicast_map_add_del_reply)                     \
+_(CLASSIFY_ADD_DEL_TABLE_REPLY, classify_add_del_table_reply)           \
+_(CLASSIFY_ADD_DEL_SESSION_REPLY, classify_add_del_session_reply)       \
+_(CLASSIFY_SET_INTERFACE_IP_TABLE_REPLY,                                \
+classify_set_interface_ip_table_reply)                                  \
+_(CLASSIFY_SET_INTERFACE_L2_TABLES_REPLY,                               \
+  classify_set_interface_l2_tables_reply)                               \
+_(GET_NODE_INDEX_REPLY, get_node_index_reply)                           \
+_(ADD_NODE_NEXT_REPLY, add_node_next_reply)                             \
+_(L2TPV3_CREATE_TUNNEL_REPLY, l2tpv3_create_tunnel_reply)               \
+_(L2TPV3_SET_TUNNEL_COOKIES_REPLY, l2tpv3_set_tunnel_cookies_reply)     \
+_(L2TPV3_INTERFACE_ENABLE_DISABLE_REPLY,                                \
+  l2tpv3_interface_enable_disable_reply)                                \
+_(L2TPV3_SET_LOOKUP_KEY_REPLY, l2tpv3_set_lookup_key_reply)             \
+_(SW_IF_L2TPV3_TUNNEL_DETAILS, sw_if_l2tpv3_tunnel_details)             \
+_(VXLAN_ADD_DEL_TUNNEL_REPLY, vxlan_add_del_tunnel_reply)               \
+_(VXLAN_TUNNEL_DETAILS, vxlan_tunnel_details)                           \
+_(GRE_ADD_DEL_TUNNEL_REPLY, gre_add_del_tunnel_reply)                   \
+_(GRE_TUNNEL_DETAILS, gre_tunnel_details)                               \
+_(L2_FIB_CLEAR_TABLE_REPLY, l2_fib_clear_table_reply)                   \
+_(L2_INTERFACE_EFP_FILTER_REPLY, l2_interface_efp_filter_reply)         \
+_(L2_INTERFACE_VLAN_TAG_REWRITE_REPLY, l2_interface_vlan_tag_rewrite_reply) \
+_(SW_INTERFACE_VHOST_USER_DETAILS, sw_interface_vhost_user_details)     \
+_(CREATE_VHOST_USER_IF_REPLY, create_vhost_user_if_reply)               \
+_(MODIFY_VHOST_USER_IF_REPLY, modify_vhost_user_if_reply)               \
+_(DELETE_VHOST_USER_IF_REPLY, delete_vhost_user_if_reply)               \
+_(SHOW_VERSION_REPLY, show_version_reply)                               \
+_(L2_FIB_TABLE_ENTRY, l2_fib_table_entry)				\
+_(VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, vxlan_gpe_add_del_tunnel_reply)	    \
+_(VXLAN_GPE_TUNNEL_DETAILS, vxlan_gpe_tunnel_details)                   \
+_(INTERFACE_NAME_RENUMBER_REPLY, interface_name_renumber_reply)		\
+_(WANT_IP4_ARP_EVENTS_REPLY, want_ip4_arp_events_reply)			\
+_(IP4_ARP_EVENT, ip4_arp_event)                                         \
+_(WANT_IP6_ND_EVENTS_REPLY, want_ip6_nd_events_reply)			\
+_(IP6_ND_EVENT, ip6_nd_event)						\
+_(INPUT_ACL_SET_INTERFACE_REPLY, input_acl_set_interface_reply)         \
+_(IP_ADDRESS_DETAILS, ip_address_details)                               \
+_(IP_DETAILS, ip_details)                                               \
+_(IPSEC_SPD_ADD_DEL_REPLY, ipsec_spd_add_del_reply)                     \
+_(IPSEC_INTERFACE_ADD_DEL_SPD_REPLY, ipsec_interface_add_del_spd_reply) \
+_(IPSEC_SPD_ADD_DEL_ENTRY_REPLY, ipsec_spd_add_del_entry_reply)         \
+_(IPSEC_SAD_ADD_DEL_ENTRY_REPLY, ipsec_sad_add_del_entry_reply)         \
+_(IPSEC_SA_SET_KEY_REPLY, ipsec_sa_set_key_reply)                       \
+_(IKEV2_PROFILE_ADD_DEL_REPLY, ikev2_profile_add_del_reply)             \
+_(IKEV2_PROFILE_SET_AUTH_REPLY, ikev2_profile_set_auth_reply)           \
+_(IKEV2_PROFILE_SET_ID_REPLY, ikev2_profile_set_id_reply)               \
+_(IKEV2_PROFILE_SET_TS_REPLY, ikev2_profile_set_ts_reply)               \
+_(IKEV2_SET_LOCAL_KEY_REPLY, ikev2_set_local_key_reply)                 \
+_(DELETE_LOOPBACK_REPLY, delete_loopback_reply)                         \
+_(BD_IP_MAC_ADD_DEL_REPLY, bd_ip_mac_add_del_reply)                     \
+_(DHCP_COMPL_EVENT, dhcp_compl_event)                                   \
+_(VNET_INTERFACE_COUNTERS, vnet_interface_counters)                     \
+_(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters)                         \
+_(VNET_IP6_FIB_COUNTERS, vnet_ip6_fib_counters)                         \
+_(MAP_ADD_DOMAIN_REPLY, map_add_domain_reply)                           \
+_(MAP_DEL_DOMAIN_REPLY, map_del_domain_reply)                           \
+_(MAP_ADD_DEL_RULE_REPLY, map_add_del_rule_reply)	                \
+_(MAP_DOMAIN_DETAILS, map_domain_details)                               \
+_(MAP_RULE_DETAILS, map_rule_details)                                   \
+_(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply)             \
+_(WANT_STATS_REPLY, want_stats_reply)					\
+_(GET_FIRST_MSG_ID_REPLY, get_first_msg_id_reply)    			\
+_(COP_INTERFACE_ENABLE_DISABLE_REPLY, cop_interface_enable_disable_reply) \
+_(COP_WHITELIST_ENABLE_DISABLE_REPLY, cop_whitelist_enable_disable_reply) \
+_(GET_NODE_GRAPH_REPLY, get_node_graph_reply)                           \
+_(SW_INTERFACE_CLEAR_STATS_REPLY, sw_interface_clear_stats_reply)      \
+_(IOAM_ENABLE_REPLY, ioam_enable_reply)                   \
+_(IOAM_DISABLE_REPLY, ioam_disable_reply)                     \
+_(LISP_ADD_DEL_LOCATOR_SET_REPLY, lisp_add_del_locator_set_reply)       \
+_(LISP_ADD_DEL_LOCATOR_REPLY, lisp_add_del_locator_reply)               \
+_(LISP_ADD_DEL_LOCAL_EID_REPLY, lisp_add_del_local_eid_reply)           \
+_(LISP_ADD_DEL_REMOTE_MAPPING_REPLY, lisp_add_del_remote_mapping_reply) \
+_(LISP_ADD_DEL_ADJACENCY_REPLY, lisp_add_del_adjacency_reply)           \
+_(LISP_GPE_ADD_DEL_FWD_ENTRY_REPLY, lisp_gpe_add_del_fwd_entry_reply)   \
+_(LISP_ADD_DEL_MAP_RESOLVER_REPLY, lisp_add_del_map_resolver_reply)     \
+_(LISP_ADD_DEL_MAP_SERVER_REPLY, lisp_add_del_map_server_reply)         \
+_(LISP_GPE_ENABLE_DISABLE_REPLY, lisp_gpe_enable_disable_reply)         \
+_(LISP_ENABLE_DISABLE_REPLY, lisp_enable_disable_reply)                 \
+_(LISP_MAP_REGISTER_ENABLE_DISABLE_REPLY,                               \
+  lisp_map_register_enable_disable_reply)                               \
+_(LISP_RLOC_PROBE_ENABLE_DISABLE_REPLY,                                 \
+  lisp_rloc_probe_enable_disable_reply)                                 \
+_(LISP_PITR_SET_LOCATOR_SET_REPLY, lisp_pitr_set_locator_set_reply)     \
+_(LISP_MAP_REQUEST_MODE_REPLY, lisp_map_request_mode_reply)             \
+_(LISP_EID_TABLE_ADD_DEL_MAP_REPLY, lisp_eid_table_add_del_map_reply)   \
+_(LISP_GPE_ADD_DEL_IFACE_REPLY, lisp_gpe_add_del_iface_reply)           \
+_(LISP_LOCATOR_SET_DETAILS, lisp_locator_set_details)                   \
+_(LISP_LOCATOR_DETAILS, lisp_locator_details)                           \
+_(LISP_EID_TABLE_DETAILS, lisp_eid_table_details)                       \
+_(LISP_EID_TABLE_MAP_DETAILS, lisp_eid_table_map_details)               \
+_(LISP_EID_TABLE_VNI_DETAILS, lisp_eid_table_vni_details)               \
+_(LISP_GPE_TUNNEL_DETAILS, lisp_gpe_tunnel_details)                     \
+_(LISP_MAP_RESOLVER_DETAILS, lisp_map_resolver_details)                 \
+_(LISP_MAP_SERVER_DETAILS, lisp_map_server_details)                     \
+_(LISP_ADJACENCIES_GET_REPLY, lisp_adjacencies_get_reply)               \
+_(SHOW_LISP_STATUS_REPLY, show_lisp_status_reply)                       \
+_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS_REPLY,                             \
+  lisp_add_del_map_request_itr_rlocs_reply)                             \
+_(LISP_GET_MAP_REQUEST_ITR_RLOCS_REPLY,                                 \
+  lisp_get_map_request_itr_rlocs_reply)                                 \
+_(SHOW_LISP_PITR_REPLY, show_lisp_pitr_reply)                           \
+_(SHOW_LISP_MAP_REQUEST_MODE_REPLY, show_lisp_map_request_mode_reply)   \
+_(SHOW_LISP_RLOC_PROBE_STATE_REPLY, show_lisp_rloc_probe_state_reply)   \
+_(SHOW_LISP_MAP_REGISTER_STATE_REPLY,                                   \
+  show_lisp_map_register_state_reply)                                   \
+_(AF_PACKET_CREATE_REPLY, af_packet_create_reply)                       \
+_(AF_PACKET_DELETE_REPLY, af_packet_delete_reply)                       \
+_(POLICER_ADD_DEL_REPLY, policer_add_del_reply)                         \
+_(POLICER_DETAILS, policer_details)                                     \
+_(POLICER_CLASSIFY_SET_INTERFACE_REPLY, policer_classify_set_interface_reply) \
+_(POLICER_CLASSIFY_DETAILS, policer_classify_details)                   \
+_(NETMAP_CREATE_REPLY, netmap_create_reply)                             \
+_(NETMAP_DELETE_REPLY, netmap_delete_reply)                             \
+_(MPLS_TUNNEL_DETAILS, mpls_tunnel_details)                             \
+_(MPLS_FIB_DETAILS, mpls_fib_details)                                   \
+_(CLASSIFY_TABLE_IDS_REPLY, classify_table_ids_reply)                   \
+_(CLASSIFY_TABLE_BY_INTERFACE_REPLY, classify_table_by_interface_reply) \
+_(CLASSIFY_TABLE_INFO_REPLY, classify_table_info_reply)                 \
+_(CLASSIFY_SESSION_DETAILS, classify_session_details)                   \
+_(SET_IPFIX_EXPORTER_REPLY, set_ipfix_exporter_reply)                   \
+_(IPFIX_EXPORTER_DETAILS, ipfix_exporter_details)                       \
+_(SET_IPFIX_CLASSIFY_STREAM_REPLY, set_ipfix_classify_stream_reply)     \
+_(IPFIX_CLASSIFY_STREAM_DETAILS, ipfix_classify_stream_details)         \
+_(IPFIX_CLASSIFY_TABLE_ADD_DEL_REPLY, ipfix_classify_table_add_del_reply) \
+_(IPFIX_CLASSIFY_TABLE_DETAILS, ipfix_classify_table_details)           \
+_(FLOW_CLASSIFY_SET_INTERFACE_REPLY, flow_classify_set_interface_reply) \
+_(FLOW_CLASSIFY_DETAILS, flow_classify_details)                         \
+_(SW_INTERFACE_SPAN_ENABLE_DISABLE_REPLY, sw_interface_span_enable_disable_reply) \
+_(SW_INTERFACE_SPAN_DETAILS, sw_interface_span_details)                 \
+_(GET_NEXT_INDEX_REPLY, get_next_index_reply)                           \
+_(PG_CREATE_INTERFACE_REPLY, pg_create_interface_reply)                 \
+_(PG_CAPTURE_REPLY, pg_capture_reply)                                   \
+_(PG_ENABLE_DISABLE_REPLY, pg_enable_disable_reply)                     \
+_(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL_REPLY,                         \
+ ip_source_and_port_range_check_add_del_reply)                          \
+_(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL_REPLY,               \
+ ip_source_and_port_range_check_interface_add_del_reply)                \
+_(IPSEC_GRE_ADD_DEL_TUNNEL_REPLY, ipsec_gre_add_del_tunnel_reply)       \
+_(IPSEC_GRE_TUNNEL_DETAILS, ipsec_gre_tunnel_details)                   \
+_(DELETE_SUBIF_REPLY, delete_subif_reply)                               \
+_(L2_INTERFACE_PBB_TAG_REWRITE_REPLY, l2_interface_pbb_tag_rewrite_reply) \
+_(PUNT_REPLY, punt_reply)                                               \
+_(IP_FIB_DETAILS, ip_fib_details)                                       \
+_(IP6_FIB_DETAILS, ip6_fib_details)                                     \
+_(FEATURE_ENABLE_DISABLE_REPLY, feature_enable_disable_reply)           \
+_(SW_INTERFACE_TAG_ADD_DEL_REPLY, sw_interface_tag_add_del_reply)     	\
+_(L2_XCONNECT_DETAILS, l2_xconnect_details)                             \
+_(SW_INTERFACE_SET_MTU_REPLY, sw_interface_set_mtu_reply)               \
+_(IP_NEIGHBOR_DETAILS, ip_neighbor_details)                             \
+_(SW_INTERFACE_GET_TABLE_REPLY, sw_interface_get_table_reply)
+
+/* M: construct, but don't yet send a message */
+
+#define M(T,t)                                          \
+do {                                                    \
+    vam->result_ready = 0;                              \
+    mp = vl_msg_api_alloc_as_if_client(sizeof(*mp));    \
+    memset (mp, 0, sizeof (*mp));                       \
+    mp->_vl_msg_id = ntohs (VL_API_##T);                \
+    mp->client_index = vam->my_client_index;            \
+} while(0);
+
+#define M2(T,t,n)                                               \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc_as_if_client(sizeof(*mp)+(n));        \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T);                        \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+
+/* S: send a message */
+#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
+
+/* W: wait for results, with timeout */
+#define W                                       \
+do {                                            \
+    timeout = vat_time_now (vam) + 1.0;         \
+                                                \
+    while (vat_time_now (vam) < timeout) {      \
+        if (vam->result_ready == 1) {           \
+            return (vam->retval);               \
+        }                                       \
+        vat_suspend (vam->vlib_main, 1e-3);     \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
+/* W2: wait for results, with timeout */
+#define W2(body)                                \
+do {                                            \
+    timeout = vat_time_now (vam) + 1.0;         \
+                                                \
+    while (vat_time_now (vam) < timeout) {      \
+        if (vam->result_ready == 1) {           \
+	  (body);                               \
+	  return (vam->retval);                 \
+        }                                       \
+        vat_suspend (vam->vlib_main, 1e-3);     \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
+typedef struct
+{
+  u8 *name;
+  u32 value;
+} name_sort_t;
+
+
+#define STR_VTR_OP_CASE(op)     \
+    case L2_VTR_ ## op:         \
+        return "" # op;
+
+static const char *
+str_vtr_op (u32 vtr_op)
+{
+  switch (vtr_op)
+    {
+      STR_VTR_OP_CASE (DISABLED);
+      STR_VTR_OP_CASE (PUSH_1);
+      STR_VTR_OP_CASE (PUSH_2);
+      STR_VTR_OP_CASE (POP_1);
+      STR_VTR_OP_CASE (POP_2);
+      STR_VTR_OP_CASE (TRANSLATE_1_1);
+      STR_VTR_OP_CASE (TRANSLATE_1_2);
+      STR_VTR_OP_CASE (TRANSLATE_2_1);
+      STR_VTR_OP_CASE (TRANSLATE_2_2);
+    }
+
+  return "UNKNOWN";
+}
+
+static int
+dump_sub_interface_table (vat_main_t * vam)
+{
+  const sw_interface_subif_t *sub = NULL;
+
+  if (vam->json_output)
+    {
+      clib_warning
+	("JSON output supported only for VPE API calls and dump_stats_table");
+      return -99;
+    }
+
+  print (vam->ofp,
+	 "%-30s%-12s%-11s%-7s%-5s%-9s%-9s%-6s%-8s%-10s%-10s",
+	 "Interface", "sw_if_index",
+	 "sub id", "dot1ad", "tags", "outer id",
+	 "inner id", "exact", "default", "outer any", "inner any");
+
+  vec_foreach (sub, vam->sw_if_subif_table)
+  {
+    print (vam->ofp,
+	   "%-30s%-12d%-11d%-7s%-5d%-9d%-9d%-6d%-8d%-10d%-10d",
+	   sub->interface_name,
+	   sub->sw_if_index,
+	   sub->sub_id, sub->sub_dot1ad ? "dot1ad" : "dot1q",
+	   sub->sub_number_of_tags, sub->sub_outer_vlan_id,
+	   sub->sub_inner_vlan_id, sub->sub_exact_match, sub->sub_default,
+	   sub->sub_outer_vlan_id_any, sub->sub_inner_vlan_id_any);
+    if (sub->vtr_op != L2_VTR_DISABLED)
+      {
+	print (vam->ofp,
+	       "  vlan-tag-rewrite - op: %-14s [ dot1q: %d "
+	       "tag1: %d tag2: %d ]",
+	       str_vtr_op (sub->vtr_op), sub->vtr_push_dot1q,
+	       sub->vtr_tag1, sub->vtr_tag2);
+      }
+  }
+
+  return 0;
+}
+
+static int
+name_sort_cmp (void *a1, void *a2)
+{
+  name_sort_t *n1 = a1;
+  name_sort_t *n2 = a2;
+
+  return strcmp ((char *) n1->name, (char *) n2->name);
+}
+
+static int
+dump_interface_table (vat_main_t * vam)
+{
+  hash_pair_t *p;
+  name_sort_t *nses = 0, *ns;
+
+  if (vam->json_output)
+    {
+      clib_warning
+	("JSON output supported only for VPE API calls and dump_stats_table");
+      return -99;
+    }
+
+  /* *INDENT-OFF* */
+  hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
+  ({
+    vec_add2 (nses, ns, 1);
+    ns->name = (u8 *)(p->key);
+    ns->value = (u32) p->value[0];
+  }));
+  /* *INDENT-ON* */
+
+  vec_sort_with_function (nses, name_sort_cmp);
+
+  print (vam->ofp, "%-25s%-15s", "Interface", "sw_if_index");
+  vec_foreach (ns, nses)
+  {
+    print (vam->ofp, "%-25s%-15d", ns->name, ns->value);
+  }
+  vec_free (nses);
+  return 0;
+}
+
+static int
+dump_ip_table (vat_main_t * vam, int is_ipv6)
+{
+  const ip_details_t *det = NULL;
+  const ip_address_details_t *address = NULL;
+  u32 i = ~0;
+
+  print (vam->ofp, "%-12s", "sw_if_index");
+
+  vec_foreach (det, vam->ip_details_by_sw_if_index[is_ipv6])
+  {
+    i++;
+    if (!det->present)
+      {
+	continue;
+      }
+    print (vam->ofp, "%-12d", i);
+    print (vam->ofp, "            %-30s%-13s", "Address", "Prefix length");
+    if (!det->addr)
+      {
+	continue;
+      }
+    vec_foreach (address, det->addr)
+    {
+      print (vam->ofp,
+	     "            %-30U%-13d",
+	     is_ipv6 ? format_ip6_address : format_ip4_address,
+	     address->ip, address->prefix_length);
+    }
+  }
+
+  return 0;
+}
+
+static int
+dump_ipv4_table (vat_main_t * vam)
+{
+  if (vam->json_output)
+    {
+      clib_warning
+	("JSON output supported only for VPE API calls and dump_stats_table");
+      return -99;
+    }
+
+  return dump_ip_table (vam, 0);
+}
+
+static int
+dump_ipv6_table (vat_main_t * vam)
+{
+  if (vam->json_output)
+    {
+      clib_warning
+	("JSON output supported only for VPE API calls and dump_stats_table");
+      return -99;
+    }
+
+  return dump_ip_table (vam, 1);
+}
+
+static char *
+counter_type_to_str (u8 counter_type, u8 is_combined)
+{
+  if (!is_combined)
+    {
+      switch (counter_type)
+	{
+	case VNET_INTERFACE_COUNTER_DROP:
+	  return "drop";
+	case VNET_INTERFACE_COUNTER_PUNT:
+	  return "punt";
+	case VNET_INTERFACE_COUNTER_IP4:
+	  return "ip4";
+	case VNET_INTERFACE_COUNTER_IP6:
+	  return "ip6";
+	case VNET_INTERFACE_COUNTER_RX_NO_BUF:
+	  return "rx-no-buf";
+	case VNET_INTERFACE_COUNTER_RX_MISS:
+	  return "rx-miss";
+	case VNET_INTERFACE_COUNTER_RX_ERROR:
+	  return "rx-error";
+	case VNET_INTERFACE_COUNTER_TX_ERROR:
+	  return "tx-error";
+	default:
+	  return "INVALID-COUNTER-TYPE";
+	}
+    }
+  else
+    {
+      switch (counter_type)
+	{
+	case VNET_INTERFACE_COUNTER_RX:
+	  return "rx";
+	case VNET_INTERFACE_COUNTER_TX:
+	  return "tx";
+	default:
+	  return "INVALID-COUNTER-TYPE";
+	}
+    }
+}
+
+static int
+dump_stats_table (vat_main_t * vam)
+{
+  vat_json_node_t node;
+  vat_json_node_t *msg_array;
+  vat_json_node_t *msg;
+  vat_json_node_t *counter_array;
+  vat_json_node_t *counter;
+  interface_counter_t c;
+  u64 packets;
+  ip4_fib_counter_t *c4;
+  ip6_fib_counter_t *c6;
+  int i, j;
+
+  if (!vam->json_output)
+    {
+      clib_warning ("dump_stats_table supported only in JSON format");
+      return -99;
+    }
+
+  vat_json_init_object (&node);
+
+  /* interface counters */
+  msg_array = vat_json_object_add (&node, "interface_counters");
+  vat_json_init_array (msg_array);
+  for (i = 0; i < vec_len (vam->simple_interface_counters); i++)
+    {
+      msg = vat_json_array_add (msg_array);
+      vat_json_init_object (msg);
+      vat_json_object_add_string_copy (msg, "vnet_counter_type",
+				       (u8 *) counter_type_to_str (i, 0));
+      vat_json_object_add_int (msg, "is_combined", 0);
+      counter_array = vat_json_object_add (msg, "data");
+      vat_json_init_array (counter_array);
+      for (j = 0; j < vec_len (vam->simple_interface_counters[i]); j++)
+	{
+	  packets = vam->simple_interface_counters[i][j];
+	  vat_json_array_add_uint (counter_array, packets);
+	}
+    }
+  for (i = 0; i < vec_len (vam->combined_interface_counters); i++)
+    {
+      msg = vat_json_array_add (msg_array);
+      vat_json_init_object (msg);
+      vat_json_object_add_string_copy (msg, "vnet_counter_type",
+				       (u8 *) counter_type_to_str (i, 1));
+      vat_json_object_add_int (msg, "is_combined", 1);
+      counter_array = vat_json_object_add (msg, "data");
+      vat_json_init_array (counter_array);
+      for (j = 0; j < vec_len (vam->combined_interface_counters[i]); j++)
+	{
+	  c = vam->combined_interface_counters[i][j];
+	  counter = vat_json_array_add (counter_array);
+	  vat_json_init_object (counter);
+	  vat_json_object_add_uint (counter, "packets", c.packets);
+	  vat_json_object_add_uint (counter, "bytes", c.bytes);
+	}
+    }
+
+  /* ip4 fib counters */
+  msg_array = vat_json_object_add (&node, "ip4_fib_counters");
+  vat_json_init_array (msg_array);
+  for (i = 0; i < vec_len (vam->ip4_fib_counters); i++)
+    {
+      msg = vat_json_array_add (msg_array);
+      vat_json_init_object (msg);
+      vat_json_object_add_uint (msg, "vrf_id",
+				vam->ip4_fib_counters_vrf_id_by_index[i]);
+      counter_array = vat_json_object_add (msg, "c");
+      vat_json_init_array (counter_array);
+      for (j = 0; j < vec_len (vam->ip4_fib_counters[i]); j++)
+	{
+	  counter = vat_json_array_add (counter_array);
+	  vat_json_init_object (counter);
+	  c4 = &vam->ip4_fib_counters[i][j];
+	  vat_json_object_add_ip4 (counter, "address", c4->address);
+	  vat_json_object_add_uint (counter, "address_length",
+				    c4->address_length);
+	  vat_json_object_add_uint (counter, "packets", c4->packets);
+	  vat_json_object_add_uint (counter, "bytes", c4->bytes);
+	}
+    }
+
+  /* ip6 fib counters */
+  msg_array = vat_json_object_add (&node, "ip6_fib_counters");
+  vat_json_init_array (msg_array);
+  for (i = 0; i < vec_len (vam->ip6_fib_counters); i++)
+    {
+      msg = vat_json_array_add (msg_array);
+      vat_json_init_object (msg);
+      vat_json_object_add_uint (msg, "vrf_id",
+				vam->ip6_fib_counters_vrf_id_by_index[i]);
+      counter_array = vat_json_object_add (msg, "c");
+      vat_json_init_array (counter_array);
+      for (j = 0; j < vec_len (vam->ip6_fib_counters[i]); j++)
+	{
+	  counter = vat_json_array_add (counter_array);
+	  vat_json_init_object (counter);
+	  c6 = &vam->ip6_fib_counters[i][j];
+	  vat_json_object_add_ip6 (counter, "address", c6->address);
+	  vat_json_object_add_uint (counter, "address_length",
+				    c6->address_length);
+	  vat_json_object_add_uint (counter, "packets", c6->packets);
+	  vat_json_object_add_uint (counter, "bytes", c6->bytes);
+	}
+    }
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  return 0;
+}
+
+int
+exec (vat_main_t * vam)
+{
+  api_main_t *am = &api_main;
+  vl_api_cli_request_t *mp;
+  f64 timeout;
+  void *oldheap;
+  u8 *cmd = 0;
+  unformat_input_t *i = vam->input;
+
+  if (vec_len (i->buffer) == 0)
+    return -1;
+
+  if (vam->exec_mode == 0 && unformat (i, "mode"))
+    {
+      vam->exec_mode = 1;
+      return 0;
+    }
+  if (vam->exec_mode == 1 && (unformat (i, "exit") || unformat (i, "quit")))
+    {
+      vam->exec_mode = 0;
+      return 0;
+    }
+
+
+  M (CLI_REQUEST, cli_request);
+
+  /*
+   * Copy cmd into shared memory.
+   * In order for the CLI command to work, it
+   * must be a vector ending in \n, not a C-string ending
+   * in \n\0.
+   */
+  pthread_mutex_lock (&am->vlib_rp->mutex);
+  oldheap = svm_push_data_heap (am->vlib_rp);
+
+  vec_validate (cmd, vec_len (vam->input->buffer) - 1);
+  clib_memcpy (cmd, vam->input->buffer, vec_len (vam->input->buffer));
+
+  svm_pop_heap (oldheap);
+  pthread_mutex_unlock (&am->vlib_rp->mutex);
+
+  mp->cmd_in_shmem = (u64) cmd;
+  S;
+  timeout = vat_time_now (vam) + 10.0;
+
+  while (vat_time_now (vam) < timeout)
+    {
+      if (vam->result_ready == 1)
+	{
+	  u8 *free_me;
+	  if (vam->shmem_result != NULL)
+	    print (vam->ofp, "%s", vam->shmem_result);
+	  pthread_mutex_lock (&am->vlib_rp->mutex);
+	  oldheap = svm_push_data_heap (am->vlib_rp);
+
+	  free_me = (u8 *) vam->shmem_result;
+	  vec_free (free_me);
+
+	  svm_pop_heap (oldheap);
+	  pthread_mutex_unlock (&am->vlib_rp->mutex);
+	  return 0;
+	}
+    }
+  return -99;
+}
+
+/*
+ * Future replacement of exec() that passes CLI buffers directly in
+ * the API messages instead of an additional shared memory area.
+ */
+static int
+exec_inband (vat_main_t * vam)
+{
+  vl_api_cli_inband_t *mp;
+  f64 timeout;
+  unformat_input_t *i = vam->input;
+
+  if (vec_len (i->buffer) == 0)
+    return -1;
+
+  if (vam->exec_mode == 0 && unformat (i, "mode"))
+    {
+      vam->exec_mode = 1;
+      return 0;
+    }
+  if (vam->exec_mode == 1 && (unformat (i, "exit") || unformat (i, "quit")))
+    {
+      vam->exec_mode = 0;
+      return 0;
+    }
+
+  /*
+   * In order for the CLI command to work, it
+   * must be a vector ending in \n, not a C-string ending
+   * in \n\0.
+   */
+  u32 len = vec_len (vam->input->buffer);
+  M2 (CLI_INBAND, cli_inband, len);
+  clib_memcpy (mp->cmd, vam->input->buffer, len);
+  mp->length = htonl (len);
+
+  S;
+  W2 (print (vam->ofp, "%s", vam->cmd_reply));
+}
+
+static int
+api_create_loopback (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_create_loopback_t *mp;
+  f64 timeout;
+  u8 mac_address[6];
+  u8 mac_set = 0;
+
+  memset (mac_address, 0, sizeof (mac_address));
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
+	mac_set = 1;
+      else
+	break;
+    }
+
+  /* Construct the API message */
+  M (CREATE_LOOPBACK, create_loopback);
+  if (mac_set)
+    clib_memcpy (mp->mac_address, mac_address, sizeof (mac_address));
+
+  S;
+  W;
+}
+
+static int
+api_delete_loopback (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_delete_loopback_t *mp;
+  f64 timeout;
+  u32 sw_if_index = ~0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "sw_if_index %d", &sw_if_index))
+	;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    {
+      errmsg ("missing sw_if_index");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (DELETE_LOOPBACK, delete_loopback);
+  mp->sw_if_index = ntohl (sw_if_index);
+
+  S;
+  W;
+}
+
+static int
+api_want_stats (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_want_stats_t *mp;
+  f64 timeout;
+  int enable = -1;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "enable"))
+	enable = 1;
+      else if (unformat (i, "disable"))
+	enable = 0;
+      else
+	break;
+    }
+
+  if (enable == -1)
+    {
+      errmsg ("missing enable|disable");
+      return -99;
+    }
+
+  M (WANT_STATS, want_stats);
+  mp->enable_disable = enable;
+
+  S;
+  W;
+}
+
+static int
+api_want_interface_events (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_want_interface_events_t *mp;
+  f64 timeout;
+  int enable = -1;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "enable"))
+	enable = 1;
+      else if (unformat (i, "disable"))
+	enable = 0;
+      else
+	break;
+    }
+
+  if (enable == -1)
+    {
+      errmsg ("missing enable|disable");
+      return -99;
+    }
+
+  M (WANT_INTERFACE_EVENTS, want_interface_events);
+  mp->enable_disable = enable;
+
+  vam->interface_event_display = enable;
+
+  S;
+  W;
+}
+
+
+/* Note: non-static, called once to set up the initial intfc table */
+int
+api_sw_interface_dump (vat_main_t * vam)
+{
+  vl_api_sw_interface_dump_t *mp;
+  f64 timeout;
+  hash_pair_t *p;
+  name_sort_t *nses = 0, *ns;
+  sw_interface_subif_t *sub = NULL;
+
+  /* Toss the old name table */
+  /* *INDENT-OFF* */
+  hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
+  ({
+    vec_add2 (nses, ns, 1);
+    ns->name = (u8 *)(p->key);
+    ns->value = (u32) p->value[0];
+  }));
+  /* *INDENT-ON* */
+
+  hash_free (vam->sw_if_index_by_interface_name);
+
+  vec_foreach (ns, nses) vec_free (ns->name);
+
+  vec_free (nses);
+
+  vec_foreach (sub, vam->sw_if_subif_table)
+  {
+    vec_free (sub->interface_name);
+  }
+  vec_free (vam->sw_if_subif_table);
+
+  /* recreate the interface name hash table */
+  vam->sw_if_index_by_interface_name = hash_create_string (0, sizeof (uword));
+
+  /* Get list of ethernets */
+  M (SW_INTERFACE_DUMP, sw_interface_dump);
+  mp->name_filter_valid = 1;
+  strncpy ((char *) mp->name_filter, "Ether", sizeof (mp->name_filter) - 1);
+  S;
+
+  /* and local / loopback interfaces */
+  M (SW_INTERFACE_DUMP, sw_interface_dump);
+  mp->name_filter_valid = 1;
+  strncpy ((char *) mp->name_filter, "lo", sizeof (mp->name_filter) - 1);
+  S;
+
+  /* and packet-generator interfaces */
+  M (SW_INTERFACE_DUMP, sw_interface_dump);
+  mp->name_filter_valid = 1;
+  strncpy ((char *) mp->name_filter, "pg", sizeof (mp->name_filter) - 1);
+  S;
+
+  /* and vxlan-gpe tunnel interfaces */
+  M (SW_INTERFACE_DUMP, sw_interface_dump);
+  mp->name_filter_valid = 1;
+  strncpy ((char *) mp->name_filter, "vxlan_gpe",
+	   sizeof (mp->name_filter) - 1);
+  S;
+
+  /* and vxlan tunnel interfaces */
+  M (SW_INTERFACE_DUMP, sw_interface_dump);
+  mp->name_filter_valid = 1;
+  strncpy ((char *) mp->name_filter, "vxlan", sizeof (mp->name_filter) - 1);
+  S;
+
+  /* and host (af_packet) interfaces */
+  M (SW_INTERFACE_DUMP, sw_interface_dump);
+  mp->name_filter_valid = 1;
+  strncpy ((char *) mp->name_filter, "host", sizeof (mp->name_filter) - 1);
+  S;
+
+  /* and l2tpv3 tunnel interfaces */
+  M (SW_INTERFACE_DUMP, sw_interface_dump);
+  mp->name_filter_valid = 1;
+  strncpy ((char *) mp->name_filter, "l2tpv3_tunnel",
+	   sizeof (mp->name_filter) - 1);
+  S;
+
+  /* and GRE tunnel interfaces */
+  M (SW_INTERFACE_DUMP, sw_interface_dump);
+  mp->name_filter_valid = 1;
+  strncpy ((char *) mp->name_filter, "gre", sizeof (mp->name_filter) - 1);
+  S;
+
+  /* and LISP-GPE interfaces */
+  M (SW_INTERFACE_DUMP, sw_interface_dump);
+  mp->name_filter_valid = 1;
+  strncpy ((char *) mp->name_filter, "lisp_gpe",
+	   sizeof (mp->name_filter) - 1);
+  S;
+
+  /* and IPSEC tunnel interfaces */
+  M (SW_INTERFACE_DUMP, sw_interface_dump);
+  mp->name_filter_valid = 1;
+  strncpy ((char *) mp->name_filter, "ipsec", sizeof (mp->name_filter) - 1);
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+static int
+api_sw_interface_set_flags (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_set_flags_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u8 admin_up = 0, link_up = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "admin-up"))
+	admin_up = 1;
+      else if (unformat (i, "admin-down"))
+	admin_up = 0;
+      else if (unformat (i, "link-up"))
+	link_up = 1;
+      else if (unformat (i, "link-down"))
+	link_up = 0;
+      else
+	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (SW_INTERFACE_SET_FLAGS, sw_interface_set_flags);
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->admin_up_down = admin_up;
+  mp->link_up_down = link_up;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return the good/bad news... */
+  W;
+}
+
+static int
+api_sw_interface_clear_stats (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_clear_stats_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else
+	break;
+    }
+
+  /* Construct the API message */
+  M (SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats);
+
+  if (sw_if_index_set == 1)
+    mp->sw_if_index = ntohl (sw_if_index);
+  else
+    mp->sw_if_index = ~0;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return the good/bad news... */
+  W;
+}
+
+static int
+api_sw_interface_set_dpdk_hqos_pipe (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_set_dpdk_hqos_pipe_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u32 subport;
+  u8 subport_set = 0;
+  u32 pipe;
+  u8 pipe_set = 0;
+  u32 profile;
+  u8 profile_set = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "rx %U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %u", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "subport %u", &subport))
+	subport_set = 1;
+      else
+	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "pipe %u", &pipe))
+	pipe_set = 1;
+      else if (unformat (i, "profile %u", &profile))
+	profile_set = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  if (subport_set == 0)
+    {
+      errmsg ("missing subport ");
+      return -99;
+    }
+
+  if (pipe_set == 0)
+    {
+      errmsg ("missing pipe");
+      return -99;
+    }
+
+  if (profile_set == 0)
+    {
+      errmsg ("missing profile");
+      return -99;
+    }
+
+  M (SW_INTERFACE_SET_DPDK_HQOS_PIPE, sw_interface_set_dpdk_hqos_pipe);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->subport = ntohl (subport);
+  mp->pipe = ntohl (pipe);
+  mp->profile = ntohl (profile);
+
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_sw_interface_set_dpdk_hqos_subport (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_set_dpdk_hqos_subport_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u32 subport;
+  u8 subport_set = 0;
+  u32 tb_rate = 1250000000;	/* 10GbE */
+  u32 tb_size = 1000000;
+  u32 tc_rate[] = { 1250000000, 1250000000, 1250000000, 1250000000 };
+  u32 tc_period = 10;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "rx %U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %u", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "subport %u", &subport))
+	subport_set = 1;
+      else
+	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "rate %u", &tb_rate))
+	{
+	  u32 tc_id;
+
+	  for (tc_id = 0; tc_id < (sizeof (tc_rate) / sizeof (tc_rate[0]));
+	       tc_id++)
+	    tc_rate[tc_id] = tb_rate;
+	}
+      else if (unformat (i, "bktsize %u", &tb_size))
+	;
+      else if (unformat (i, "tc0 %u", &tc_rate[0]))
+	;
+      else if (unformat (i, "tc1 %u", &tc_rate[1]))
+	;
+      else if (unformat (i, "tc2 %u", &tc_rate[2]))
+	;
+      else if (unformat (i, "tc3 %u", &tc_rate[3]))
+	;
+      else if (unformat (i, "period %u", &tc_period))
+	;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  if (subport_set == 0)
+    {
+      errmsg ("missing subport ");
+      return -99;
+    }
+
+  M (SW_INTERFACE_SET_DPDK_HQOS_SUBPORT, sw_interface_set_dpdk_hqos_subport);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->subport = ntohl (subport);
+  mp->tb_rate = ntohl (tb_rate);
+  mp->tb_size = ntohl (tb_size);
+  mp->tc_rate[0] = ntohl (tc_rate[0]);
+  mp->tc_rate[1] = ntohl (tc_rate[1]);
+  mp->tc_rate[2] = ntohl (tc_rate[2]);
+  mp->tc_rate[3] = ntohl (tc_rate[3]);
+  mp->tc_period = ntohl (tc_period);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_sw_interface_set_dpdk_hqos_tctbl (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_set_dpdk_hqos_tctbl_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u8 entry_set = 0;
+  u8 tc_set = 0;
+  u8 queue_set = 0;
+  u32 entry, tc, queue;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "rx %U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %u", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "entry %d", &entry))
+	entry_set = 1;
+      else if (unformat (i, "tc %d", &tc))
+	tc_set = 1;
+      else if (unformat (i, "queue %d", &queue))
+	queue_set = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  if (entry_set == 0)
+    {
+      errmsg ("missing entry ");
+      return -99;
+    }
+
+  if (tc_set == 0)
+    {
+      errmsg ("missing traffic class ");
+      return -99;
+    }
+
+  if (queue_set == 0)
+    {
+      errmsg ("missing queue ");
+      return -99;
+    }
+
+  M (SW_INTERFACE_SET_DPDK_HQOS_TCTBL, sw_interface_set_dpdk_hqos_tctbl);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->entry = ntohl (entry);
+  mp->tc = ntohl (tc);
+  mp->queue = ntohl (queue);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_sw_interface_add_del_address (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_add_del_address_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u8 is_add = 1, del_all = 0;
+  u32 address_length = 0;
+  u8 v4_address_set = 0;
+  u8 v6_address_set = 0;
+  ip4_address_t v4address;
+  ip6_address_t v6address;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "del-all"))
+	del_all = 1;
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else
+	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "%U/%d",
+			 unformat_ip4_address, &v4address, &address_length))
+	v4_address_set = 1;
+      else if (unformat (i, "%U/%d",
+			 unformat_ip6_address, &v6address, &address_length))
+	v6_address_set = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+  if (v4_address_set && v6_address_set)
+    {
+      errmsg ("both v4 and v6 addresses set");
+      return -99;
+    }
+  if (!v4_address_set && !v6_address_set && !del_all)
+    {
+      errmsg ("no addresses set");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (SW_INTERFACE_ADD_DEL_ADDRESS, sw_interface_add_del_address);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->is_add = is_add;
+  mp->del_all = del_all;
+  if (v6_address_set)
+    {
+      mp->is_ipv6 = 1;
+      clib_memcpy (mp->address, &v6address, sizeof (v6address));
+    }
+  else
+    {
+      clib_memcpy (mp->address, &v4address, sizeof (v4address));
+    }
+  mp->address_length = address_length;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return good/bad news  */
+  W;
+}
+
+static int
+api_sw_interface_set_mpls_enable (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_set_mpls_enable_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u8 enable = 1;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "disable"))
+	enable = 0;
+      else if (unformat (i, "dis"))
+	enable = 0;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (SW_INTERFACE_SET_MPLS_ENABLE, sw_interface_set_mpls_enable);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->enable = enable;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+}
+
+static int
+api_sw_interface_set_table (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_set_table_t *mp;
+  f64 timeout;
+  u32 sw_if_index, vrf_id = 0;
+  u8 sw_if_index_set = 0;
+  u8 is_ipv6 = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "vrf %d", &vrf_id))
+	;
+      else if (unformat (i, "ipv6"))
+	is_ipv6 = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (SW_INTERFACE_SET_TABLE, sw_interface_set_table);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->is_ipv6 = is_ipv6;
+  mp->vrf_id = ntohl (vrf_id);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+}
+
+static void vl_api_sw_interface_get_table_reply_t_handler
+  (vl_api_sw_interface_get_table_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "%d", ntohl (mp->vrf_id));
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+
+}
+
+static void vl_api_sw_interface_get_table_reply_t_handler_json
+  (vl_api_sw_interface_get_table_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_int (&node, "vrf_id", ntohl (mp->vrf_id));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static int
+api_sw_interface_get_table (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_get_table_t *mp;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u8 is_ipv6 = 0;
+  f64 timeout;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "ipv6"))
+	is_ipv6 = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  M (SW_INTERFACE_GET_TABLE, sw_interface_get_table);
+  mp->sw_if_index = htonl (sw_if_index);
+  mp->is_ipv6 = is_ipv6;
+
+  S;
+  W;
+}
+
+static int
+api_sw_interface_set_vpath (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_set_vpath_t *mp;
+  f64 timeout;
+  u32 sw_if_index = 0;
+  u8 sw_if_index_set = 0;
+  u8 is_enable = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "enable"))
+	is_enable = 1;
+      else if (unformat (i, "disable"))
+	is_enable = 0;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (SW_INTERFACE_SET_VPATH, sw_interface_set_vpath);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->enable = is_enable;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+}
+
+static int
+api_sw_interface_set_vxlan_bypass (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_set_vxlan_bypass_t *mp;
+  f64 timeout;
+  u32 sw_if_index = 0;
+  u8 sw_if_index_set = 0;
+  u8 is_enable = 0;
+  u8 is_ipv6 = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "enable"))
+	is_enable = 1;
+      else if (unformat (i, "disable"))
+	is_enable = 0;
+      else if (unformat (i, "ip4"))
+	is_ipv6 = 0;
+      else if (unformat (i, "ip6"))
+	is_ipv6 = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (SW_INTERFACE_SET_VXLAN_BYPASS, sw_interface_set_vxlan_bypass);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->enable = is_enable;
+  mp->is_ipv6 = is_ipv6;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+}
+
+static int
+api_sw_interface_set_l2_xconnect (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_set_l2_xconnect_t *mp;
+  f64 timeout;
+  u32 rx_sw_if_index;
+  u8 rx_sw_if_index_set = 0;
+  u32 tx_sw_if_index;
+  u8 tx_sw_if_index_set = 0;
+  u8 enable = 1;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
+	rx_sw_if_index_set = 1;
+      else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
+	tx_sw_if_index_set = 1;
+      else if (unformat (i, "rx"))
+	{
+	  if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+	    {
+	      if (unformat (i, "%U", api_unformat_sw_if_index, vam,
+			    &rx_sw_if_index))
+		rx_sw_if_index_set = 1;
+	    }
+	  else
+	    break;
+	}
+      else if (unformat (i, "tx"))
+	{
+	  if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+	    {
+	      if (unformat (i, "%U", api_unformat_sw_if_index, vam,
+			    &tx_sw_if_index))
+		tx_sw_if_index_set = 1;
+	    }
+	  else
+	    break;
+	}
+      else if (unformat (i, "enable"))
+	enable = 1;
+      else if (unformat (i, "disable"))
+	enable = 0;
+      else
+	break;
+    }
+
+  if (rx_sw_if_index_set == 0)
+    {
+      errmsg ("missing rx interface name or rx_sw_if_index");
+      return -99;
+    }
+
+  if (enable && (tx_sw_if_index_set == 0))
+    {
+      errmsg ("missing tx interface name or tx_sw_if_index");
+      return -99;
+    }
+
+  M (SW_INTERFACE_SET_L2_XCONNECT, sw_interface_set_l2_xconnect);
+
+  mp->rx_sw_if_index = ntohl (rx_sw_if_index);
+  mp->tx_sw_if_index = ntohl (tx_sw_if_index);
+  mp->enable = enable;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_sw_interface_set_l2_bridge (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_set_l2_bridge_t *mp;
+  f64 timeout;
+  u32 rx_sw_if_index;
+  u8 rx_sw_if_index_set = 0;
+  u32 bd_id;
+  u8 bd_id_set = 0;
+  u8 bvi = 0;
+  u32 shg = 0;
+  u8 enable = 1;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "sw_if_index %d", &rx_sw_if_index))
+	rx_sw_if_index_set = 1;
+      else if (unformat (i, "bd_id %d", &bd_id))
+	bd_id_set = 1;
+      else
+	if (unformat
+	    (i, "%U", api_unformat_sw_if_index, vam, &rx_sw_if_index))
+	rx_sw_if_index_set = 1;
+      else if (unformat (i, "shg %d", &shg))
+	;
+      else if (unformat (i, "bvi"))
+	bvi = 1;
+      else if (unformat (i, "enable"))
+	enable = 1;
+      else if (unformat (i, "disable"))
+	enable = 0;
+      else
+	break;
+    }
+
+  if (rx_sw_if_index_set == 0)
+    {
+      errmsg ("missing rx interface name or sw_if_index");
+      return -99;
+    }
+
+  if (enable && (bd_id_set == 0))
+    {
+      errmsg ("missing bridge domain");
+      return -99;
+    }
+
+  M (SW_INTERFACE_SET_L2_BRIDGE, sw_interface_set_l2_bridge);
+
+  mp->rx_sw_if_index = ntohl (rx_sw_if_index);
+  mp->bd_id = ntohl (bd_id);
+  mp->shg = (u8) shg;
+  mp->bvi = bvi;
+  mp->enable = enable;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_bridge_domain_dump (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_bridge_domain_dump_t *mp;
+  f64 timeout;
+  u32 bd_id = ~0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "bd_id %d", &bd_id))
+	;
+      else
+	break;
+    }
+
+  M (BRIDGE_DOMAIN_DUMP, bridge_domain_dump);
+  mp->bd_id = ntohl (bd_id);
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_bridge_domain_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_bridge_domain_add_del_t *mp;
+  f64 timeout;
+  u32 bd_id = ~0;
+  u8 is_add = 1;
+  u32 flood = 1, forward = 1, learn = 1, uu_flood = 1, arp_term = 0;
+  u32 mac_age = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "bd_id %d", &bd_id))
+	;
+      else if (unformat (i, "flood %d", &flood))
+	;
+      else if (unformat (i, "uu-flood %d", &uu_flood))
+	;
+      else if (unformat (i, "forward %d", &forward))
+	;
+      else if (unformat (i, "learn %d", &learn))
+	;
+      else if (unformat (i, "arp-term %d", &arp_term))
+	;
+      else if (unformat (i, "mac-age %d", &mac_age))
+	;
+      else if (unformat (i, "del"))
+	{
+	  is_add = 0;
+	  flood = uu_flood = forward = learn = 0;
+	}
+      else
+	break;
+    }
+
+  if (bd_id == ~0)
+    {
+      errmsg ("missing bridge domain");
+      return -99;
+    }
+
+  if (mac_age > 255)
+    {
+      errmsg ("mac age must be less than 256 ");
+      return -99;
+    }
+
+  M (BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del);
+
+  mp->bd_id = ntohl (bd_id);
+  mp->flood = flood;
+  mp->uu_flood = uu_flood;
+  mp->forward = forward;
+  mp->learn = learn;
+  mp->arp_term = arp_term;
+  mp->is_add = is_add;
+  mp->mac_age = (u8) mac_age;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_l2fib_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_l2fib_add_del_t *mp;
+  f64 timeout;
+  u64 mac = 0;
+  u8 mac_set = 0;
+  u32 bd_id;
+  u8 bd_id_set = 0;
+  u32 sw_if_index = ~0;
+  u8 sw_if_index_set = 0;
+  u8 is_add = 1;
+  u8 static_mac = 0;
+  u8 filter_mac = 0;
+  u8 bvi_mac = 0;
+  int count = 1;
+  f64 before = 0;
+  int j;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "mac %U", unformat_ethernet_address, &mac))
+	mac_set = 1;
+      else if (unformat (i, "bd_id %d", &bd_id))
+	bd_id_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if"))
+	{
+	  if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+	    {
+	      if (unformat
+		  (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+		sw_if_index_set = 1;
+	    }
+	  else
+	    break;
+	}
+      else if (unformat (i, "static"))
+	static_mac = 1;
+      else if (unformat (i, "filter"))
+	{
+	  filter_mac = 1;
+	  static_mac = 1;
+	}
+      else if (unformat (i, "bvi"))
+	{
+	  bvi_mac = 1;
+	  static_mac = 1;
+	}
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "count %d", &count))
+	;
+      else
+	break;
+    }
+
+  if (mac_set == 0)
+    {
+      errmsg ("missing mac address");
+      return -99;
+    }
+
+  if (bd_id_set == 0)
+    {
+      errmsg ("missing bridge domain");
+      return -99;
+    }
+
+  if (is_add && sw_if_index_set == 0 && filter_mac == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  if (count > 1)
+    {
+      /* Turn on async mode */
+      vam->async_mode = 1;
+      vam->async_errors = 0;
+      before = vat_time_now (vam);
+    }
+
+  for (j = 0; j < count; j++)
+    {
+      M (L2FIB_ADD_DEL, l2fib_add_del);
+
+      mp->mac = mac;
+      mp->bd_id = ntohl (bd_id);
+      mp->is_add = is_add;
+
+      if (is_add)
+	{
+	  mp->sw_if_index = ntohl (sw_if_index);
+	  mp->static_mac = static_mac;
+	  mp->filter_mac = filter_mac;
+	  mp->bvi_mac = bvi_mac;
+	}
+      increment_mac_address (&mac);
+      /* send it... */
+      S;
+    }
+
+  if (count > 1)
+    {
+      vl_api_control_ping_t *mp;
+      f64 after;
+
+      /* Shut off async mode */
+      vam->async_mode = 0;
+
+      M (CONTROL_PING, control_ping);
+      S;
+
+      timeout = vat_time_now (vam) + 1.0;
+      while (vat_time_now (vam) < timeout)
+	if (vam->result_ready == 1)
+	  goto out;
+      vam->retval = -99;
+
+    out:
+      if (vam->retval == -99)
+	errmsg ("timeout");
+
+      if (vam->async_errors > 0)
+	{
+	  errmsg ("%d asynchronous errors", vam->async_errors);
+	  vam->retval = -98;
+	}
+      vam->async_errors = 0;
+      after = vat_time_now (vam);
+
+      print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec",
+	     count, after - before, count / (after - before));
+    }
+  else
+    {
+      /* Wait for a reply... */
+      W;
+    }
+  /* Return the good/bad news */
+  return (vam->retval);
+}
+
+static int
+api_l2_flags (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_l2_flags_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u32 feature_bitmap = 0;
+  u8 sw_if_index_set = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if"))
+	{
+	  if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+	    {
+	      if (unformat
+		  (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+		sw_if_index_set = 1;
+	    }
+	  else
+	    break;
+	}
+      else if (unformat (i, "learn"))
+	feature_bitmap |= L2INPUT_FEAT_LEARN;
+      else if (unformat (i, "forward"))
+	feature_bitmap |= L2INPUT_FEAT_FWD;
+      else if (unformat (i, "flood"))
+	feature_bitmap |= L2INPUT_FEAT_FLOOD;
+      else if (unformat (i, "uu-flood"))
+	feature_bitmap |= L2INPUT_FEAT_UU_FLOOD;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  M (L2_FLAGS, l2_flags);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->feature_bitmap = ntohl (feature_bitmap);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_bridge_flags (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_bridge_flags_t *mp;
+  f64 timeout;
+  u32 bd_id;
+  u8 bd_id_set = 0;
+  u8 is_set = 1;
+  u32 flags = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "bd_id %d", &bd_id))
+	bd_id_set = 1;
+      else if (unformat (i, "learn"))
+	flags |= L2_LEARN;
+      else if (unformat (i, "forward"))
+	flags |= L2_FWD;
+      else if (unformat (i, "flood"))
+	flags |= L2_FLOOD;
+      else if (unformat (i, "uu-flood"))
+	flags |= L2_UU_FLOOD;
+      else if (unformat (i, "arp-term"))
+	flags |= L2_ARP_TERM;
+      else if (unformat (i, "off"))
+	is_set = 0;
+      else if (unformat (i, "disable"))
+	is_set = 0;
+      else
+	break;
+    }
+
+  if (bd_id_set == 0)
+    {
+      errmsg ("missing bridge domain");
+      return -99;
+    }
+
+  M (BRIDGE_FLAGS, bridge_flags);
+
+  mp->bd_id = ntohl (bd_id);
+  mp->feature_bitmap = ntohl (flags);
+  mp->is_set = is_set;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_bd_ip_mac_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_bd_ip_mac_add_del_t *mp;
+  f64 timeout;
+  u32 bd_id;
+  u8 is_ipv6 = 0;
+  u8 is_add = 1;
+  u8 bd_id_set = 0;
+  u8 ip_set = 0;
+  u8 mac_set = 0;
+  ip4_address_t v4addr;
+  ip6_address_t v6addr;
+  u8 macaddr[6];
+
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "bd_id %d", &bd_id))
+	{
+	  bd_id_set++;
+	}
+      else if (unformat (i, "%U", unformat_ip4_address, &v4addr))
+	{
+	  ip_set++;
+	}
+      else if (unformat (i, "%U", unformat_ip6_address, &v6addr))
+	{
+	  ip_set++;
+	  is_ipv6++;
+	}
+      else if (unformat (i, "%U", unformat_ethernet_address, macaddr))
+	{
+	  mac_set++;
+	}
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else
+	break;
+    }
+
+  if (bd_id_set == 0)
+    {
+      errmsg ("missing bridge domain");
+      return -99;
+    }
+  else if (ip_set == 0)
+    {
+      errmsg ("missing IP address");
+      return -99;
+    }
+  else if (mac_set == 0)
+    {
+      errmsg ("missing MAC address");
+      return -99;
+    }
+
+  M (BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del);
+
+  mp->bd_id = ntohl (bd_id);
+  mp->is_ipv6 = is_ipv6;
+  mp->is_add = is_add;
+  if (is_ipv6)
+    clib_memcpy (mp->ip_address, &v6addr, sizeof (v6addr));
+  else
+    clib_memcpy (mp->ip_address, &v4addr, sizeof (v4addr));
+  clib_memcpy (mp->mac_address, macaddr, 6);
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_tap_connect (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_tap_connect_t *mp;
+  f64 timeout;
+  u8 mac_address[6];
+  u8 random_mac = 1;
+  u8 name_set = 0;
+  u8 *tap_name;
+  u8 *tag = 0;
+
+  memset (mac_address, 0, sizeof (mac_address));
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
+	{
+	  random_mac = 0;
+	}
+      else if (unformat (i, "random-mac"))
+	random_mac = 1;
+      else if (unformat (i, "tapname %s", &tap_name))
+	name_set = 1;
+      else if (unformat (i, "tag %s", &tag))
+	;
+      else
+	break;
+    }
+
+  if (name_set == 0)
+    {
+      errmsg ("missing tap name");
+      return -99;
+    }
+  if (vec_len (tap_name) > 63)
+    {
+      errmsg ("tap name too long");
+      return -99;
+    }
+  vec_add1 (tap_name, 0);
+
+  if (vec_len (tag) > 63)
+    {
+      errmsg ("tag too long");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (TAP_CONNECT, tap_connect);
+
+  mp->use_random_mac = random_mac;
+  clib_memcpy (mp->mac_address, mac_address, 6);
+  clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name));
+  if (tag)
+    clib_memcpy (mp->tag, tag, vec_len (tag));
+
+  vec_free (tap_name);
+  vec_free (tag);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+}
+
+static int
+api_tap_modify (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_tap_modify_t *mp;
+  f64 timeout;
+  u8 mac_address[6];
+  u8 random_mac = 1;
+  u8 name_set = 0;
+  u8 *tap_name;
+  u32 sw_if_index = ~0;
+  u8 sw_if_index_set = 0;
+
+  memset (mac_address, 0, sizeof (mac_address));
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
+	{
+	  random_mac = 0;
+	}
+      else if (unformat (i, "random-mac"))
+	random_mac = 1;
+      else if (unformat (i, "tapname %s", &tap_name))
+	name_set = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing vpp interface name");
+      return -99;
+    }
+  if (name_set == 0)
+    {
+      errmsg ("missing tap name");
+      return -99;
+    }
+  if (vec_len (tap_name) > 63)
+    {
+      errmsg ("tap name too long");
+    }
+  vec_add1 (tap_name, 0);
+
+  /* Construct the API message */
+  M (TAP_MODIFY, tap_modify);
+
+  mp->use_random_mac = random_mac;
+  mp->sw_if_index = ntohl (sw_if_index);
+  clib_memcpy (mp->mac_address, mac_address, 6);
+  clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name));
+  vec_free (tap_name);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+}
+
+static int
+api_tap_delete (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_tap_delete_t *mp;
+  f64 timeout;
+  u32 sw_if_index = ~0;
+  u8 sw_if_index_set = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing vpp interface name");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (TAP_DELETE, tap_delete);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+}
+
+static int
+api_ip_add_del_route (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ip_add_del_route_t *mp;
+  f64 timeout;
+  u32 sw_if_index = ~0, vrf_id = 0;
+  u8 is_ipv6 = 0;
+  u8 is_local = 0, is_drop = 0;
+  u8 is_unreach = 0, is_prohibit = 0;
+  u8 create_vrf_if_needed = 0;
+  u8 is_add = 1;
+  u32 next_hop_weight = 1;
+  u8 not_last = 0;
+  u8 is_multipath = 0;
+  u8 address_set = 0;
+  u8 address_length_set = 0;
+  u32 next_hop_table_id = 0;
+  u32 resolve_attempts = 0;
+  u32 dst_address_length = 0;
+  u8 next_hop_set = 0;
+  ip4_address_t v4_dst_address, v4_next_hop_address;
+  ip6_address_t v6_dst_address, v6_next_hop_address;
+  int count = 1;
+  int j;
+  f64 before = 0;
+  u32 random_add_del = 0;
+  u32 *random_vector = 0;
+  uword *random_hash;
+  u32 random_seed = 0xdeaddabe;
+  u32 classify_table_index = ~0;
+  u8 is_classify = 0;
+  u8 resolve_host = 0, resolve_attached = 0;
+  mpls_label_t *next_hop_out_label_stack = NULL;
+  mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
+  mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	;
+      else if (unformat (i, "%U", unformat_ip4_address, &v4_dst_address))
+	{
+	  address_set = 1;
+	  is_ipv6 = 0;
+	}
+      else if (unformat (i, "%U", unformat_ip6_address, &v6_dst_address))
+	{
+	  address_set = 1;
+	  is_ipv6 = 1;
+	}
+      else if (unformat (i, "/%d", &dst_address_length))
+	{
+	  address_length_set = 1;
+	}
+
+      else if (is_ipv6 == 0 && unformat (i, "via %U", unformat_ip4_address,
+					 &v4_next_hop_address))
+	{
+	  next_hop_set = 1;
+	}
+      else if (is_ipv6 == 1 && unformat (i, "via %U", unformat_ip6_address,
+					 &v6_next_hop_address))
+	{
+	  next_hop_set = 1;
+	}
+      else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
+	;
+      else if (unformat (i, "weight %d", &next_hop_weight))
+	;
+      else if (unformat (i, "drop"))
+	{
+	  is_drop = 1;
+	}
+      else if (unformat (i, "null-send-unreach"))
+	{
+	  is_unreach = 1;
+	}
+      else if (unformat (i, "null-send-prohibit"))
+	{
+	  is_prohibit = 1;
+	}
+      else if (unformat (i, "local"))
+	{
+	  is_local = 1;
+	}
+      else if (unformat (i, "classify %d", &classify_table_index))
+	{
+	  is_classify = 1;
+	}
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "add"))
+	is_add = 1;
+      else if (unformat (i, "not-last"))
+	not_last = 1;
+      else if (unformat (i, "resolve-via-host"))
+	resolve_host = 1;
+      else if (unformat (i, "resolve-via-attached"))
+	resolve_attached = 1;
+      else if (unformat (i, "multipath"))
+	is_multipath = 1;
+      else if (unformat (i, "vrf %d", &vrf_id))
+	;
+      else if (unformat (i, "create-vrf"))
+	create_vrf_if_needed = 1;
+      else if (unformat (i, "count %d", &count))
+	;
+      else if (unformat (i, "lookup-in-vrf %d", &next_hop_table_id))
+	;
+      else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
+	;
+      else if (unformat (i, "out-label %d", &next_hop_out_label))
+	vec_add1 (next_hop_out_label_stack, ntohl (next_hop_out_label));
+      else if (unformat (i, "via-label %d", &next_hop_via_label))
+	;
+      else if (unformat (i, "random"))
+	random_add_del = 1;
+      else if (unformat (i, "seed %d", &random_seed))
+	;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (!next_hop_set && !is_drop && !is_local &&
+      !is_classify && !is_unreach && !is_prohibit &&
+      MPLS_LABEL_INVALID == next_hop_via_label)
+    {
+      errmsg
+	("next hop / local / drop / unreach / prohibit / classify not set");
+      return -99;
+    }
+
+  if (next_hop_set && MPLS_LABEL_INVALID != next_hop_via_label)
+    {
+      errmsg ("next hop and next-hop via label set");
+      return -99;
+    }
+  if (address_set == 0)
+    {
+      errmsg ("missing addresses");
+      return -99;
+    }
+
+  if (address_length_set == 0)
+    {
+      errmsg ("missing address length");
+      return -99;
+    }
+
+  /* Generate a pile of unique, random routes */
+  if (random_add_del)
+    {
+      u32 this_random_address;
+      random_hash = hash_create (count, sizeof (uword));
+
+      hash_set (random_hash, v4_next_hop_address.as_u32, 1);
+      for (j = 0; j <= count; j++)
+	{
+	  do
+	    {
+	      this_random_address = random_u32 (&random_seed);
+	      this_random_address =
+		clib_host_to_net_u32 (this_random_address);
+	    }
+	  while (hash_get (random_hash, this_random_address));
+	  vec_add1 (random_vector, this_random_address);
+	  hash_set (random_hash, this_random_address, 1);
+	}
+      hash_free (random_hash);
+      v4_dst_address.as_u32 = random_vector[0];
+    }
+
+  if (count > 1)
+    {
+      /* Turn on async mode */
+      vam->async_mode = 1;
+      vam->async_errors = 0;
+      before = vat_time_now (vam);
+    }
+
+  for (j = 0; j < count; j++)
+    {
+      /* Construct the API message */
+      M2 (IP_ADD_DEL_ROUTE, ip_add_del_route,
+	  sizeof (mpls_label_t) * vec_len (next_hop_out_label_stack));
+
+      mp->next_hop_sw_if_index = ntohl (sw_if_index);
+      mp->table_id = ntohl (vrf_id);
+      mp->create_vrf_if_needed = create_vrf_if_needed;
+
+      mp->is_add = is_add;
+      mp->is_drop = is_drop;
+      mp->is_unreach = is_unreach;
+      mp->is_prohibit = is_prohibit;
+      mp->is_ipv6 = is_ipv6;
+      mp->is_local = is_local;
+      mp->is_classify = is_classify;
+      mp->is_multipath = is_multipath;
+      mp->is_resolve_host = resolve_host;
+      mp->is_resolve_attached = resolve_attached;
+      mp->not_last = not_last;
+      mp->next_hop_weight = next_hop_weight;
+      mp->dst_address_length = dst_address_length;
+      mp->next_hop_table_id = ntohl (next_hop_table_id);
+      mp->classify_table_index = ntohl (classify_table_index);
+      mp->next_hop_via_label = ntohl (next_hop_via_label);
+      mp->next_hop_n_out_labels = vec_len (next_hop_out_label_stack);
+      if (0 != mp->next_hop_n_out_labels)
+	{
+	  memcpy (mp->next_hop_out_label_stack,
+		  next_hop_out_label_stack,
+		  vec_len (next_hop_out_label_stack) * sizeof (mpls_label_t));
+	  vec_free (next_hop_out_label_stack);
+	}
+
+      if (is_ipv6)
+	{
+	  clib_memcpy (mp->dst_address, &v6_dst_address,
+		       sizeof (v6_dst_address));
+	  if (next_hop_set)
+	    clib_memcpy (mp->next_hop_address, &v6_next_hop_address,
+			 sizeof (v6_next_hop_address));
+	  increment_v6_address (&v6_dst_address);
+	}
+      else
+	{
+	  clib_memcpy (mp->dst_address, &v4_dst_address,
+		       sizeof (v4_dst_address));
+	  if (next_hop_set)
+	    clib_memcpy (mp->next_hop_address, &v4_next_hop_address,
+			 sizeof (v4_next_hop_address));
+	  if (random_add_del)
+	    v4_dst_address.as_u32 = random_vector[j + 1];
+	  else
+	    increment_v4_address (&v4_dst_address);
+	}
+      /* send it... */
+      S;
+      /* If we receive SIGTERM, stop now... */
+      if (vam->do_exit)
+	break;
+    }
+
+  /* When testing multiple add/del ops, use a control-ping to sync */
+  if (count > 1)
+    {
+      vl_api_control_ping_t *mp;
+      f64 after;
+
+      /* Shut off async mode */
+      vam->async_mode = 0;
+
+      M (CONTROL_PING, control_ping);
+      S;
+
+      timeout = vat_time_now (vam) + 1.0;
+      while (vat_time_now (vam) < timeout)
+	if (vam->result_ready == 1)
+	  goto out;
+      vam->retval = -99;
+
+    out:
+      if (vam->retval == -99)
+	errmsg ("timeout");
+
+      if (vam->async_errors > 0)
+	{
+	  errmsg ("%d asynchronous errors", vam->async_errors);
+	  vam->retval = -98;
+	}
+      vam->async_errors = 0;
+      after = vat_time_now (vam);
+
+      /* slim chance, but we might have eaten SIGTERM on the first iteration */
+      if (j > 0)
+	count = j;
+
+      print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec",
+	     count, after - before, count / (after - before));
+    }
+  else
+    {
+      /* Wait for a reply... */
+      W;
+    }
+
+  /* Return the good/bad news */
+  return (vam->retval);
+}
+
+static int
+api_mpls_route_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_mpls_route_add_del_t *mp;
+  f64 timeout;
+  u32 sw_if_index = ~0, table_id = 0;
+  u8 create_table_if_needed = 0;
+  u8 is_add = 1;
+  u32 next_hop_weight = 1;
+  u8 is_multipath = 0;
+  u32 next_hop_table_id = 0;
+  u8 next_hop_set = 0;
+  ip4_address_t v4_next_hop_address = {
+    .as_u32 = 0,
+  };
+  ip6_address_t v6_next_hop_address = { {0} };
+  int count = 1;
+  int j;
+  f64 before = 0;
+  u32 classify_table_index = ~0;
+  u8 is_classify = 0;
+  u8 resolve_host = 0, resolve_attached = 0;
+  mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
+  mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
+  mpls_label_t *next_hop_out_label_stack = NULL;
+  mpls_label_t local_label = MPLS_LABEL_INVALID;
+  u8 is_eos = 0;
+  u8 next_hop_proto_is_ip4 = 1;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	;
+      else if (unformat (i, "%d", &local_label))
+	;
+      else if (unformat (i, "eos"))
+	is_eos = 1;
+      else if (unformat (i, "non-eos"))
+	is_eos = 0;
+      else if (unformat (i, "via %U", unformat_ip4_address,
+			 &v4_next_hop_address))
+	{
+	  next_hop_set = 1;
+	  next_hop_proto_is_ip4 = 1;
+	}
+      else if (unformat (i, "via %U", unformat_ip6_address,
+			 &v6_next_hop_address))
+	{
+	  next_hop_set = 1;
+	  next_hop_proto_is_ip4 = 0;
+	}
+      else if (unformat (i, "weight %d", &next_hop_weight))
+	;
+      else if (unformat (i, "create-table"))
+	create_table_if_needed = 1;
+      else if (unformat (i, "classify %d", &classify_table_index))
+	{
+	  is_classify = 1;
+	}
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "add"))
+	is_add = 1;
+      else if (unformat (i, "resolve-via-host"))
+	resolve_host = 1;
+      else if (unformat (i, "resolve-via-attached"))
+	resolve_attached = 1;
+      else if (unformat (i, "multipath"))
+	is_multipath = 1;
+      else if (unformat (i, "count %d", &count))
+	;
+      else if (unformat (i, "lookup-in-ip4-table %d", &next_hop_table_id))
+	{
+	  next_hop_set = 1;
+	  next_hop_proto_is_ip4 = 1;
+	}
+      else if (unformat (i, "lookup-in-ip6-table %d", &next_hop_table_id))
+	{
+	  next_hop_set = 1;
+	  next_hop_proto_is_ip4 = 0;
+	}
+      else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
+	;
+      else if (unformat (i, "via-label %d", &next_hop_via_label))
+	;
+      else if (unformat (i, "out-label %d", &next_hop_out_label))
+	vec_add1 (next_hop_out_label_stack, ntohl (next_hop_out_label));
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (!next_hop_set && !is_classify)
+    {
+      errmsg ("next hop / classify not set");
+      return -99;
+    }
+
+  if (MPLS_LABEL_INVALID == local_label)
+    {
+      errmsg ("missing label");
+      return -99;
+    }
+
+  if (count > 1)
+    {
+      /* Turn on async mode */
+      vam->async_mode = 1;
+      vam->async_errors = 0;
+      before = vat_time_now (vam);
+    }
+
+  for (j = 0; j < count; j++)
+    {
+      /* Construct the API message */
+      M2 (MPLS_ROUTE_ADD_DEL, mpls_route_add_del,
+	  sizeof (mpls_label_t) * vec_len (next_hop_out_label_stack));
+
+      mp->mr_next_hop_sw_if_index = ntohl (sw_if_index);
+      mp->mr_table_id = ntohl (table_id);
+      mp->mr_create_table_if_needed = create_table_if_needed;
+
+      mp->mr_is_add = is_add;
+      mp->mr_next_hop_proto_is_ip4 = next_hop_proto_is_ip4;
+      mp->mr_is_classify = is_classify;
+      mp->mr_is_multipath = is_multipath;
+      mp->mr_is_resolve_host = resolve_host;
+      mp->mr_is_resolve_attached = resolve_attached;
+      mp->mr_next_hop_weight = next_hop_weight;
+      mp->mr_next_hop_table_id = ntohl (next_hop_table_id);
+      mp->mr_classify_table_index = ntohl (classify_table_index);
+      mp->mr_next_hop_via_label = ntohl (next_hop_via_label);
+      mp->mr_label = ntohl (local_label);
+      mp->mr_eos = is_eos;
+
+      mp->mr_next_hop_n_out_labels = vec_len (next_hop_out_label_stack);
+      if (0 != mp->mr_next_hop_n_out_labels)
+	{
+	  memcpy (mp->mr_next_hop_out_label_stack,
+		  next_hop_out_label_stack,
+		  vec_len (next_hop_out_label_stack) * sizeof (mpls_label_t));
+	  vec_free (next_hop_out_label_stack);
+	}
+
+      if (next_hop_set)
+	{
+	  if (next_hop_proto_is_ip4)
+	    {
+	      clib_memcpy (mp->mr_next_hop,
+			   &v4_next_hop_address,
+			   sizeof (v4_next_hop_address));
+	    }
+	  else
+	    {
+	      clib_memcpy (mp->mr_next_hop,
+			   &v6_next_hop_address,
+			   sizeof (v6_next_hop_address));
+	    }
+	}
+      local_label++;
+
+      /* send it... */
+      S;
+      /* If we receive SIGTERM, stop now... */
+      if (vam->do_exit)
+	break;
+    }
+
+  /* When testing multiple add/del ops, use a control-ping to sync */
+  if (count > 1)
+    {
+      vl_api_control_ping_t *mp;
+      f64 after;
+
+      /* Shut off async mode */
+      vam->async_mode = 0;
+
+      M (CONTROL_PING, control_ping);
+      S;
+
+      timeout = vat_time_now (vam) + 1.0;
+      while (vat_time_now (vam) < timeout)
+	if (vam->result_ready == 1)
+	  goto out;
+      vam->retval = -99;
+
+    out:
+      if (vam->retval == -99)
+	errmsg ("timeout");
+
+      if (vam->async_errors > 0)
+	{
+	  errmsg ("%d asynchronous errors", vam->async_errors);
+	  vam->retval = -98;
+	}
+      vam->async_errors = 0;
+      after = vat_time_now (vam);
+
+      /* slim chance, but we might have eaten SIGTERM on the first iteration */
+      if (j > 0)
+	count = j;
+
+      print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec",
+	     count, after - before, count / (after - before));
+    }
+  else
+    {
+      /* Wait for a reply... */
+      W;
+    }
+
+  /* Return the good/bad news */
+  return (vam->retval);
+}
+
+static int
+api_mpls_ip_bind_unbind (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_mpls_ip_bind_unbind_t *mp;
+  f64 timeout;
+  u32 ip_table_id = 0;
+  u8 create_table_if_needed = 0;
+  u8 is_bind = 1;
+  u8 is_ip4 = 1;
+  ip4_address_t v4_address;
+  ip6_address_t v6_address;
+  u32 address_length;
+  u8 address_set = 0;
+  mpls_label_t local_label = MPLS_LABEL_INVALID;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U/%d", unformat_ip4_address,
+		    &v4_address, &address_length))
+	{
+	  is_ip4 = 1;
+	  address_set = 1;
+	}
+      else if (unformat (i, "%U/%d", unformat_ip6_address,
+			 &v6_address, &address_length))
+	{
+	  is_ip4 = 0;
+	  address_set = 1;
+	}
+      else if (unformat (i, "%d", &local_label))
+	;
+      else if (unformat (i, "create-table"))
+	create_table_if_needed = 1;
+      else if (unformat (i, "table-id %d", &ip_table_id))
+	;
+      else if (unformat (i, "unbind"))
+	is_bind = 0;
+      else if (unformat (i, "bind"))
+	is_bind = 1;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (!address_set)
+    {
+      errmsg ("IP addres not set");
+      return -99;
+    }
+
+  if (MPLS_LABEL_INVALID == local_label)
+    {
+      errmsg ("missing label");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (MPLS_IP_BIND_UNBIND, mpls_ip_bind_unbind);
+
+  mp->mb_create_table_if_needed = create_table_if_needed;
+  mp->mb_is_bind = is_bind;
+  mp->mb_is_ip4 = is_ip4;
+  mp->mb_ip_table_id = ntohl (ip_table_id);
+  mp->mb_mpls_table_id = 0;
+  mp->mb_label = ntohl (local_label);
+  mp->mb_address_length = address_length;
+
+  if (is_ip4)
+    clib_memcpy (mp->mb_address, &v4_address, sizeof (v4_address));
+  else
+    clib_memcpy (mp->mb_address, &v6_address, sizeof (v6_address));
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+}
+
+static int
+api_proxy_arp_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_proxy_arp_add_del_t *mp;
+  f64 timeout;
+  u32 vrf_id = 0;
+  u8 is_add = 1;
+  ip4_address_t lo, hi;
+  u8 range_set = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "vrf %d", &vrf_id))
+	;
+      else if (unformat (i, "%U - %U", unformat_ip4_address, &lo,
+			 unformat_ip4_address, &hi))
+	range_set = 1;
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (range_set == 0)
+    {
+      errmsg ("address range not set");
+      return -99;
+    }
+
+  M (PROXY_ARP_ADD_DEL, proxy_arp_add_del);
+
+  mp->vrf_id = ntohl (vrf_id);
+  mp->is_add = is_add;
+  clib_memcpy (mp->low_address, &lo, sizeof (mp->low_address));
+  clib_memcpy (mp->hi_address, &hi, sizeof (mp->hi_address));
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_proxy_arp_intfc_enable_disable (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_proxy_arp_intfc_enable_disable_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 enable = 1;
+  u8 sw_if_index_set = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "enable"))
+	enable = 1;
+      else if (unformat (i, "disable"))
+	enable = 0;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  M (PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->enable_disable = enable;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_mpls_tunnel_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_mpls_tunnel_add_del_t *mp;
+  f64 timeout;
+
+  u8 is_add = 1;
+  u8 l2_only = 0;
+  u32 sw_if_index = ~0;
+  u32 next_hop_sw_if_index = ~0;
+  u32 next_hop_proto_is_ip4 = 1;
+
+  u32 next_hop_table_id = 0;
+  ip4_address_t v4_next_hop_address = {
+    .as_u32 = 0,
+  };
+  ip6_address_t v6_next_hop_address = { {0} };
+  mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID, *labels = NULL;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "add"))
+	is_add = 1;
+      else if (unformat (i, "del sw_if_index %d", &sw_if_index))
+	is_add = 0;
+      else if (unformat (i, "sw_if_index %d", &next_hop_sw_if_index))
+	;
+      else if (unformat (i, "via %U",
+			 unformat_ip4_address, &v4_next_hop_address))
+	{
+	  next_hop_proto_is_ip4 = 1;
+	}
+      else if (unformat (i, "via %U",
+			 unformat_ip6_address, &v6_next_hop_address))
+	{
+	  next_hop_proto_is_ip4 = 0;
+	}
+      else if (unformat (i, "l2-only"))
+	l2_only = 1;
+      else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
+	;
+      else if (unformat (i, "out-label %d", &next_hop_out_label))
+	vec_add1 (labels, ntohl (next_hop_out_label));
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  M2 (MPLS_TUNNEL_ADD_DEL, mpls_tunnel_add_del,
+      sizeof (mpls_label_t) * vec_len (labels));
+
+  mp->mt_next_hop_sw_if_index = ntohl (next_hop_sw_if_index);
+  mp->mt_sw_if_index = ntohl (sw_if_index);
+  mp->mt_is_add = is_add;
+  mp->mt_l2_only = l2_only;
+  mp->mt_next_hop_table_id = ntohl (next_hop_table_id);
+  mp->mt_next_hop_proto_is_ip4 = next_hop_proto_is_ip4;
+
+  mp->mt_next_hop_n_out_labels = vec_len (labels);
+
+  if (0 != mp->mt_next_hop_n_out_labels)
+    {
+      clib_memcpy (mp->mt_next_hop_out_label_stack, labels,
+		   sizeof (mpls_label_t) * mp->mt_next_hop_n_out_labels);
+      vec_free (labels);
+    }
+
+  if (next_hop_proto_is_ip4)
+    {
+      clib_memcpy (mp->mt_next_hop,
+		   &v4_next_hop_address, sizeof (v4_next_hop_address));
+    }
+  else
+    {
+      clib_memcpy (mp->mt_next_hop,
+		   &v6_next_hop_address, sizeof (v6_next_hop_address));
+    }
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_sw_interface_set_unnumbered (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_set_unnumbered_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u32 unnum_sw_index = ~0;
+  u8 is_add = 1;
+  u8 sw_if_index_set = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "unnum_if_index %d", &unnum_sw_index))
+	;
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  M (SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->unnumbered_sw_if_index = ntohl (unnum_sw_index);
+  mp->is_add = is_add;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_ip_neighbor_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ip_neighbor_add_del_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u32 vrf_id = 0;
+  u8 is_add = 1;
+  u8 is_static = 0;
+  u8 mac_address[6];
+  u8 mac_set = 0;
+  u8 v4_address_set = 0;
+  u8 v6_address_set = 0;
+  ip4_address_t v4address;
+  ip6_address_t v6address;
+
+  memset (mac_address, 0, sizeof (mac_address));
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
+	{
+	  mac_set = 1;
+	}
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else
+	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "is_static"))
+	is_static = 1;
+      else if (unformat (i, "vrf %d", &vrf_id))
+	;
+      else if (unformat (i, "dst %U", unformat_ip4_address, &v4address))
+	v4_address_set = 1;
+      else if (unformat (i, "dst %U", unformat_ip6_address, &v6address))
+	v6_address_set = 1;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+  if (v4_address_set && v6_address_set)
+    {
+      errmsg ("both v4 and v6 addresses set");
+      return -99;
+    }
+  if (!v4_address_set && !v6_address_set)
+    {
+      errmsg ("no address set");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->is_add = is_add;
+  mp->vrf_id = ntohl (vrf_id);
+  mp->is_static = is_static;
+  if (mac_set)
+    clib_memcpy (mp->mac_address, mac_address, 6);
+  if (v6_address_set)
+    {
+      mp->is_ipv6 = 1;
+      clib_memcpy (mp->dst_address, &v6address, sizeof (v6address));
+    }
+  else
+    {
+      /* mp->is_ipv6 = 0; via memset in M macro above */
+      clib_memcpy (mp->dst_address, &v4address, sizeof (v4address));
+    }
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return good/bad news  */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_reset_vrf (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_reset_vrf_t *mp;
+  f64 timeout;
+  u32 vrf_id = 0;
+  u8 is_ipv6 = 0;
+  u8 vrf_id_set = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "vrf %d", &vrf_id))
+	vrf_id_set = 1;
+      else if (unformat (i, "ipv6"))
+	is_ipv6 = 1;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (vrf_id_set == 0)
+    {
+      errmsg ("missing vrf id");
+      return -99;
+    }
+
+  M (RESET_VRF, reset_vrf);
+
+  mp->vrf_id = ntohl (vrf_id);
+  mp->is_ipv6 = is_ipv6;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_create_vlan_subif (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_create_vlan_subif_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u32 vlan_id;
+  u8 vlan_id_set = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else
+	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "vlan %d", &vlan_id))
+	vlan_id_set = 1;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  if (vlan_id_set == 0)
+    {
+      errmsg ("missing vlan_id");
+      return -99;
+    }
+  M (CREATE_VLAN_SUBIF, create_vlan_subif);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->vlan_id = ntohl (vlan_id);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+#define foreach_create_subif_bit                \
+_(no_tags)                                      \
+_(one_tag)                                      \
+_(two_tags)                                     \
+_(dot1ad)                                       \
+_(exact_match)                                  \
+_(default_sub)                                  \
+_(outer_vlan_id_any)                            \
+_(inner_vlan_id_any)
+
+static int
+api_create_subif (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_create_subif_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u32 sub_id;
+  u8 sub_id_set = 0;
+  u32 no_tags = 0;
+  u32 one_tag = 0;
+  u32 two_tags = 0;
+  u32 dot1ad = 0;
+  u32 exact_match = 0;
+  u32 default_sub = 0;
+  u32 outer_vlan_id_any = 0;
+  u32 inner_vlan_id_any = 0;
+  u32 tmp;
+  u16 outer_vlan_id = 0;
+  u16 inner_vlan_id = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else
+	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sub_id %d", &sub_id))
+	sub_id_set = 1;
+      else if (unformat (i, "outer_vlan_id %d", &tmp))
+	outer_vlan_id = tmp;
+      else if (unformat (i, "inner_vlan_id %d", &tmp))
+	inner_vlan_id = tmp;
+
+#define _(a) else if (unformat (i, #a)) a = 1 ;
+      foreach_create_subif_bit
+#undef _
+	else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  if (sub_id_set == 0)
+    {
+      errmsg ("missing sub_id");
+      return -99;
+    }
+  M (CREATE_SUBIF, create_subif);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->sub_id = ntohl (sub_id);
+
+#define _(a) mp->a = a;
+  foreach_create_subif_bit;
+#undef _
+
+  mp->outer_vlan_id = ntohs (outer_vlan_id);
+  mp->inner_vlan_id = ntohs (inner_vlan_id);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_oam_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_oam_add_del_t *mp;
+  f64 timeout;
+  u32 vrf_id = 0;
+  u8 is_add = 1;
+  ip4_address_t src, dst;
+  u8 src_set = 0;
+  u8 dst_set = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "vrf %d", &vrf_id))
+	;
+      else if (unformat (i, "src %U", unformat_ip4_address, &src))
+	src_set = 1;
+      else if (unformat (i, "dst %U", unformat_ip4_address, &dst))
+	dst_set = 1;
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (src_set == 0)
+    {
+      errmsg ("missing src addr");
+      return -99;
+    }
+
+  if (dst_set == 0)
+    {
+      errmsg ("missing dst addr");
+      return -99;
+    }
+
+  M (OAM_ADD_DEL, oam_add_del);
+
+  mp->vrf_id = ntohl (vrf_id);
+  mp->is_add = is_add;
+  clib_memcpy (mp->src_address, &src, sizeof (mp->src_address));
+  clib_memcpy (mp->dst_address, &dst, sizeof (mp->dst_address));
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_reset_fib (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_reset_fib_t *mp;
+  f64 timeout;
+  u32 vrf_id = 0;
+  u8 is_ipv6 = 0;
+  u8 vrf_id_set = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "vrf %d", &vrf_id))
+	vrf_id_set = 1;
+      else if (unformat (i, "ipv6"))
+	is_ipv6 = 1;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (vrf_id_set == 0)
+    {
+      errmsg ("missing vrf id");
+      return -99;
+    }
+
+  M (RESET_FIB, reset_fib);
+
+  mp->vrf_id = ntohl (vrf_id);
+  mp->is_ipv6 = is_ipv6;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_dhcp_proxy_config (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_dhcp_proxy_config_t *mp;
+  f64 timeout;
+  u32 vrf_id = 0;
+  u8 is_add = 1;
+  u8 insert_cid = 1;
+  u8 v4_address_set = 0;
+  u8 v6_address_set = 0;
+  ip4_address_t v4address;
+  ip6_address_t v6address;
+  u8 v4_src_address_set = 0;
+  u8 v6_src_address_set = 0;
+  ip4_address_t v4srcaddress;
+  ip6_address_t v6srcaddress;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "vrf %d", &vrf_id))
+	;
+      else if (unformat (i, "insert-cid %d", &insert_cid))
+	;
+      else if (unformat (i, "svr %U", unformat_ip4_address, &v4address))
+	v4_address_set = 1;
+      else if (unformat (i, "svr %U", unformat_ip6_address, &v6address))
+	v6_address_set = 1;
+      else if (unformat (i, "src %U", unformat_ip4_address, &v4srcaddress))
+	v4_src_address_set = 1;
+      else if (unformat (i, "src %U", unformat_ip6_address, &v6srcaddress))
+	v6_src_address_set = 1;
+      else
+	break;
+    }
+
+  if (v4_address_set && v6_address_set)
+    {
+      errmsg ("both v4 and v6 server addresses set");
+      return -99;
+    }
+  if (!v4_address_set && !v6_address_set)
+    {
+      errmsg ("no server addresses set");
+      return -99;
+    }
+
+  if (v4_src_address_set && v6_src_address_set)
+    {
+      errmsg ("both v4 and v6  src addresses set");
+      return -99;
+    }
+  if (!v4_src_address_set && !v6_src_address_set)
+    {
+      errmsg ("no src addresses set");
+      return -99;
+    }
+
+  if (!(v4_src_address_set && v4_address_set) &&
+      !(v6_src_address_set && v6_address_set))
+    {
+      errmsg ("no matching server and src addresses set");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (DHCP_PROXY_CONFIG, dhcp_proxy_config);
+
+  mp->insert_circuit_id = insert_cid;
+  mp->is_add = is_add;
+  mp->vrf_id = ntohl (vrf_id);
+  if (v6_address_set)
+    {
+      mp->is_ipv6 = 1;
+      clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
+      clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
+    }
+  else
+    {
+      clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
+      clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
+    }
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return good/bad news  */
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_dhcp_proxy_config_2 (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_dhcp_proxy_config_2_t *mp;
+  f64 timeout;
+  u32 rx_vrf_id = 0;
+  u32 server_vrf_id = 0;
+  u8 is_add = 1;
+  u8 insert_cid = 1;
+  u8 v4_address_set = 0;
+  u8 v6_address_set = 0;
+  ip4_address_t v4address;
+  ip6_address_t v6address;
+  u8 v4_src_address_set = 0;
+  u8 v6_src_address_set = 0;
+  ip4_address_t v4srcaddress;
+  ip6_address_t v6srcaddress;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "rx_vrf_id %d", &rx_vrf_id))
+	;
+      else if (unformat (i, "server_vrf_id %d", &server_vrf_id))
+	;
+      else if (unformat (i, "insert-cid %d", &insert_cid))
+	;
+      else if (unformat (i, "svr %U", unformat_ip4_address, &v4address))
+	v4_address_set = 1;
+      else if (unformat (i, "svr %U", unformat_ip6_address, &v6address))
+	v6_address_set = 1;
+      else if (unformat (i, "src %U", unformat_ip4_address, &v4srcaddress))
+	v4_src_address_set = 1;
+      else if (unformat (i, "src %U", unformat_ip6_address, &v6srcaddress))
+	v6_src_address_set = 1;
+      else
+	break;
+    }
+
+  if (v4_address_set && v6_address_set)
+    {
+      errmsg ("both v4 and v6 server addresses set");
+      return -99;
+    }
+  if (!v4_address_set && !v6_address_set)
+    {
+      errmsg ("no server addresses set");
+      return -99;
+    }
+
+  if (v4_src_address_set && v6_src_address_set)
+    {
+      errmsg ("both v4 and v6  src addresses set");
+      return -99;
+    }
+  if (!v4_src_address_set && !v6_src_address_set)
+    {
+      errmsg ("no src addresses set");
+      return -99;
+    }
+
+  if (!(v4_src_address_set && v4_address_set) &&
+      !(v6_src_address_set && v6_address_set))
+    {
+      errmsg ("no matching server and src addresses set");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (DHCP_PROXY_CONFIG_2, dhcp_proxy_config_2);
+
+  mp->insert_circuit_id = insert_cid;
+  mp->is_add = is_add;
+  mp->rx_vrf_id = ntohl (rx_vrf_id);
+  mp->server_vrf_id = ntohl (server_vrf_id);
+  if (v6_address_set)
+    {
+      mp->is_ipv6 = 1;
+      clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
+      clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
+    }
+  else
+    {
+      clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
+      clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
+    }
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return good/bad news  */
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_dhcp_proxy_set_vss (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_dhcp_proxy_set_vss_t *mp;
+  f64 timeout;
+  u8 is_ipv6 = 0;
+  u8 is_add = 1;
+  u32 tbl_id;
+  u8 tbl_id_set = 0;
+  u32 oui;
+  u8 oui_set = 0;
+  u32 fib_id;
+  u8 fib_id_set = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "tbl_id %d", &tbl_id))
+	tbl_id_set = 1;
+      if (unformat (i, "fib_id %d", &fib_id))
+	fib_id_set = 1;
+      if (unformat (i, "oui %d", &oui))
+	oui_set = 1;
+      else if (unformat (i, "ipv6"))
+	is_ipv6 = 1;
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (tbl_id_set == 0)
+    {
+      errmsg ("missing tbl id");
+      return -99;
+    }
+
+  if (fib_id_set == 0)
+    {
+      errmsg ("missing fib id");
+      return -99;
+    }
+  if (oui_set == 0)
+    {
+      errmsg ("missing oui");
+      return -99;
+    }
+
+  M (DHCP_PROXY_SET_VSS, dhcp_proxy_set_vss);
+  mp->tbl_id = ntohl (tbl_id);
+  mp->fib_id = ntohl (fib_id);
+  mp->oui = ntohl (oui);
+  mp->is_ipv6 = is_ipv6;
+  mp->is_add = is_add;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_dhcp_client_config (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_dhcp_client_config_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u8 is_add = 1;
+  u8 *hostname = 0;
+  u8 disable_event = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "del"))
+	is_add = 0;
+      else
+	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "hostname %s", &hostname))
+	;
+      else if (unformat (i, "disable_event"))
+	disable_event = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  if (vec_len (hostname) > 63)
+    {
+      errmsg ("hostname too long");
+    }
+  vec_add1 (hostname, 0);
+
+  /* Construct the API message */
+  M (DHCP_CLIENT_CONFIG, dhcp_client_config);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  clib_memcpy (mp->hostname, hostname, vec_len (hostname));
+  vec_free (hostname);
+  mp->is_add = is_add;
+  mp->want_dhcp_event = disable_event ? 0 : 1;
+  mp->pid = getpid ();
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return good/bad news  */
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_set_ip_flow_hash (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_set_ip_flow_hash_t *mp;
+  f64 timeout;
+  u32 vrf_id = 0;
+  u8 is_ipv6 = 0;
+  u8 vrf_id_set = 0;
+  u8 src = 0;
+  u8 dst = 0;
+  u8 sport = 0;
+  u8 dport = 0;
+  u8 proto = 0;
+  u8 reverse = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "vrf %d", &vrf_id))
+	vrf_id_set = 1;
+      else if (unformat (i, "ipv6"))
+	is_ipv6 = 1;
+      else if (unformat (i, "src"))
+	src = 1;
+      else if (unformat (i, "dst"))
+	dst = 1;
+      else if (unformat (i, "sport"))
+	sport = 1;
+      else if (unformat (i, "dport"))
+	dport = 1;
+      else if (unformat (i, "proto"))
+	proto = 1;
+      else if (unformat (i, "reverse"))
+	reverse = 1;
+
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (vrf_id_set == 0)
+    {
+      errmsg ("missing vrf id");
+      return -99;
+    }
+
+  M (SET_IP_FLOW_HASH, set_ip_flow_hash);
+  mp->src = src;
+  mp->dst = dst;
+  mp->sport = sport;
+  mp->dport = dport;
+  mp->proto = proto;
+  mp->reverse = reverse;
+  mp->vrf_id = ntohl (vrf_id);
+  mp->is_ipv6 = is_ipv6;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_sw_interface_ip6_enable_disable (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_ip6_enable_disable_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u8 enable = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "enable"))
+	enable = 1;
+      else if (unformat (i, "disable"))
+	enable = 0;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  M (SW_INTERFACE_IP6_ENABLE_DISABLE, sw_interface_ip6_enable_disable);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->enable = enable;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_sw_interface_ip6_set_link_local_address (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_ip6_set_link_local_address_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u32 address_length = 0;
+  u8 v6_address_set = 0;
+  ip6_address_t v6address;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "%U/%d",
+			 unformat_ip6_address, &v6address, &address_length))
+	v6_address_set = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+  if (!v6_address_set)
+    {
+      errmsg ("no address set");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS,
+     sw_interface_ip6_set_link_local_address);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  clib_memcpy (mp->address, &v6address, sizeof (v6address));
+  mp->address_length = address_length;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return good/bad news  */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+
+static int
+api_sw_interface_ip6nd_ra_prefix (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_ip6nd_ra_prefix_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u32 address_length = 0;
+  u8 v6_address_set = 0;
+  ip6_address_t v6address;
+  u8 use_default = 0;
+  u8 no_advertise = 0;
+  u8 off_link = 0;
+  u8 no_autoconfig = 0;
+  u8 no_onlink = 0;
+  u8 is_no = 0;
+  u32 val_lifetime = 0;
+  u32 pref_lifetime = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "%U/%d",
+			 unformat_ip6_address, &v6address, &address_length))
+	v6_address_set = 1;
+      else if (unformat (i, "val_life %d", &val_lifetime))
+	;
+      else if (unformat (i, "pref_life %d", &pref_lifetime))
+	;
+      else if (unformat (i, "def"))
+	use_default = 1;
+      else if (unformat (i, "noadv"))
+	no_advertise = 1;
+      else if (unformat (i, "offl"))
+	off_link = 1;
+      else if (unformat (i, "noauto"))
+	no_autoconfig = 1;
+      else if (unformat (i, "nolink"))
+	no_onlink = 1;
+      else if (unformat (i, "isno"))
+	is_no = 1;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+  if (!v6_address_set)
+    {
+      errmsg ("no address set");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  clib_memcpy (mp->address, &v6address, sizeof (v6address));
+  mp->address_length = address_length;
+  mp->use_default = use_default;
+  mp->no_advertise = no_advertise;
+  mp->off_link = off_link;
+  mp->no_autoconfig = no_autoconfig;
+  mp->no_onlink = no_onlink;
+  mp->is_no = is_no;
+  mp->val_lifetime = ntohl (val_lifetime);
+  mp->pref_lifetime = ntohl (pref_lifetime);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return good/bad news  */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_sw_interface_ip6nd_ra_config (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_ip6nd_ra_config_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u8 suppress = 0;
+  u8 managed = 0;
+  u8 other = 0;
+  u8 ll_option = 0;
+  u8 send_unicast = 0;
+  u8 cease = 0;
+  u8 is_no = 0;
+  u8 default_router = 0;
+  u32 max_interval = 0;
+  u32 min_interval = 0;
+  u32 lifetime = 0;
+  u32 initial_count = 0;
+  u32 initial_interval = 0;
+
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "maxint %d", &max_interval))
+	;
+      else if (unformat (i, "minint %d", &min_interval))
+	;
+      else if (unformat (i, "life %d", &lifetime))
+	;
+      else if (unformat (i, "count %d", &initial_count))
+	;
+      else if (unformat (i, "interval %d", &initial_interval))
+	;
+      else if (unformat (i, "suppress") || unformat (i, "surpress"))
+	suppress = 1;
+      else if (unformat (i, "managed"))
+	managed = 1;
+      else if (unformat (i, "other"))
+	other = 1;
+      else if (unformat (i, "ll"))
+	ll_option = 1;
+      else if (unformat (i, "send"))
+	send_unicast = 1;
+      else if (unformat (i, "cease"))
+	cease = 1;
+      else if (unformat (i, "isno"))
+	is_no = 1;
+      else if (unformat (i, "def"))
+	default_router = 1;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->max_interval = ntohl (max_interval);
+  mp->min_interval = ntohl (min_interval);
+  mp->lifetime = ntohl (lifetime);
+  mp->initial_count = ntohl (initial_count);
+  mp->initial_interval = ntohl (initial_interval);
+  mp->suppress = suppress;
+  mp->managed = managed;
+  mp->other = other;
+  mp->ll_option = ll_option;
+  mp->send_unicast = send_unicast;
+  mp->cease = cease;
+  mp->is_no = is_no;
+  mp->default_router = default_router;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return good/bad news  */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_set_arp_neighbor_limit (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_set_arp_neighbor_limit_t *mp;
+  f64 timeout;
+  u32 arp_nbr_limit;
+  u8 limit_set = 0;
+  u8 is_ipv6 = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "arp_nbr_limit %d", &arp_nbr_limit))
+	limit_set = 1;
+      else if (unformat (i, "ipv6"))
+	is_ipv6 = 1;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (limit_set == 0)
+    {
+      errmsg ("missing limit value");
+      return -99;
+    }
+
+  M (SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit);
+
+  mp->arp_neighbor_limit = ntohl (arp_nbr_limit);
+  mp->is_ipv6 = is_ipv6;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_l2_patch_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_l2_patch_add_del_t *mp;
+  f64 timeout;
+  u32 rx_sw_if_index;
+  u8 rx_sw_if_index_set = 0;
+  u32 tx_sw_if_index;
+  u8 tx_sw_if_index_set = 0;
+  u8 is_add = 1;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
+	rx_sw_if_index_set = 1;
+      else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
+	tx_sw_if_index_set = 1;
+      else if (unformat (i, "rx"))
+	{
+	  if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+	    {
+	      if (unformat (i, "%U", api_unformat_sw_if_index, vam,
+			    &rx_sw_if_index))
+		rx_sw_if_index_set = 1;
+	    }
+	  else
+	    break;
+	}
+      else if (unformat (i, "tx"))
+	{
+	  if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+	    {
+	      if (unformat (i, "%U", api_unformat_sw_if_index, vam,
+			    &tx_sw_if_index))
+		tx_sw_if_index_set = 1;
+	    }
+	  else
+	    break;
+	}
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else
+	break;
+    }
+
+  if (rx_sw_if_index_set == 0)
+    {
+      errmsg ("missing rx interface name or rx_sw_if_index");
+      return -99;
+    }
+
+  if (tx_sw_if_index_set == 0)
+    {
+      errmsg ("missing tx interface name or tx_sw_if_index");
+      return -99;
+    }
+
+  M (L2_PATCH_ADD_DEL, l2_patch_add_del);
+
+  mp->rx_sw_if_index = ntohl (rx_sw_if_index);
+  mp->tx_sw_if_index = ntohl (tx_sw_if_index);
+  mp->is_add = is_add;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_ioam_enable (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_ioam_enable_t *mp;
+  f64 timeout;
+  u32 id = 0;
+  int has_trace_option = 0;
+  int has_pot_option = 0;
+  int has_seqno_option = 0;
+  int has_analyse_option = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "trace"))
+	has_trace_option = 1;
+      else if (unformat (input, "pot"))
+	has_pot_option = 1;
+      else if (unformat (input, "seqno"))
+	has_seqno_option = 1;
+      else if (unformat (input, "analyse"))
+	has_analyse_option = 1;
+      else
+	break;
+    }
+  M (IOAM_ENABLE, ioam_enable);
+  mp->id = htons (id);
+  mp->seqno = has_seqno_option;
+  mp->analyse = has_analyse_option;
+  mp->pot_enable = has_pot_option;
+  mp->trace_enable = has_trace_option;
+
+  S;
+  W;
+
+  return (0);
+
+}
+
+
+static int
+api_ioam_disable (vat_main_t * vam)
+{
+  vl_api_ioam_disable_t *mp;
+  f64 timeout;
+
+  M (IOAM_DISABLE, ioam_disable);
+  S;
+  W;
+  return 0;
+}
+
+static int
+api_sr_tunnel_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sr_tunnel_add_del_t *mp;
+  f64 timeout;
+  int is_del = 0;
+  int pl_index;
+  ip6_address_t src_address;
+  int src_address_set = 0;
+  ip6_address_t dst_address;
+  u32 dst_mask_width;
+  int dst_address_set = 0;
+  u16 flags = 0;
+  u32 rx_table_id = 0;
+  u32 tx_table_id = 0;
+  ip6_address_t *segments = 0;
+  ip6_address_t *this_seg;
+  ip6_address_t *tags = 0;
+  ip6_address_t *this_tag;
+  ip6_address_t next_address, tag;
+  u8 *name = 0;
+  u8 *policy_name = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "del"))
+	is_del = 1;
+      else if (unformat (i, "name %s", &name))
+	;
+      else if (unformat (i, "policy %s", &policy_name))
+	;
+      else if (unformat (i, "rx_fib_id %d", &rx_table_id))
+	;
+      else if (unformat (i, "tx_fib_id %d", &tx_table_id))
+	;
+      else if (unformat (i, "src %U", unformat_ip6_address, &src_address))
+	src_address_set = 1;
+      else if (unformat (i, "dst %U/%d",
+			 unformat_ip6_address, &dst_address, &dst_mask_width))
+	dst_address_set = 1;
+      else if (unformat (i, "next %U", unformat_ip6_address, &next_address))
+	{
+	  vec_add2 (segments, this_seg, 1);
+	  clib_memcpy (this_seg->as_u8, next_address.as_u8,
+		       sizeof (*this_seg));
+	}
+      else if (unformat (i, "tag %U", unformat_ip6_address, &tag))
+	{
+	  vec_add2 (tags, this_tag, 1);
+	  clib_memcpy (this_tag->as_u8, tag.as_u8, sizeof (*this_tag));
+	}
+      else if (unformat (i, "clean"))
+	flags |= IP6_SR_HEADER_FLAG_CLEANUP;
+      else if (unformat (i, "protected"))
+	flags |= IP6_SR_HEADER_FLAG_PROTECTED;
+      else if (unformat (i, "InPE %d", &pl_index))
+	{
+	  if (pl_index <= 0 || pl_index > 4)
+	    {
+	    pl_index_range_error:
+	      errmsg ("pl index %d out of range", pl_index);
+	      return -99;
+	    }
+	  flags |=
+	    IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE << (3 * (pl_index - 1));
+	}
+      else if (unformat (i, "EgPE %d", &pl_index))
+	{
+	  if (pl_index <= 0 || pl_index > 4)
+	    goto pl_index_range_error;
+	  flags |=
+	    IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE << (3 * (pl_index - 1));
+	}
+      else if (unformat (i, "OrgSrc %d", &pl_index))
+	{
+	  if (pl_index <= 0 || pl_index > 4)
+	    goto pl_index_range_error;
+	  flags |=
+	    IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR << (3 * (pl_index - 1));
+	}
+      else
+	break;
+    }
+
+  if (!src_address_set)
+    {
+      errmsg ("src address required");
+      return -99;
+    }
+
+  if (!dst_address_set)
+    {
+      errmsg ("dst address required");
+      return -99;
+    }
+
+  if (!segments)
+    {
+      errmsg ("at least one sr segment required");
+      return -99;
+    }
+
+  M2 (SR_TUNNEL_ADD_DEL, sr_tunnel_add_del,
+      vec_len (segments) * sizeof (ip6_address_t)
+      + vec_len (tags) * sizeof (ip6_address_t));
+
+  clib_memcpy (mp->src_address, &src_address, sizeof (mp->src_address));
+  clib_memcpy (mp->dst_address, &dst_address, sizeof (mp->dst_address));
+  mp->dst_mask_width = dst_mask_width;
+  mp->flags_net_byte_order = clib_host_to_net_u16 (flags);
+  mp->n_segments = vec_len (segments);
+  mp->n_tags = vec_len (tags);
+  mp->is_add = is_del == 0;
+  clib_memcpy (mp->segs_and_tags, segments,
+	       vec_len (segments) * sizeof (ip6_address_t));
+  clib_memcpy (mp->segs_and_tags +
+	       vec_len (segments) * sizeof (ip6_address_t), tags,
+	       vec_len (tags) * sizeof (ip6_address_t));
+
+  mp->outer_vrf_id = ntohl (rx_table_id);
+  mp->inner_vrf_id = ntohl (tx_table_id);
+  memcpy (mp->name, name, vec_len (name));
+  memcpy (mp->policy_name, policy_name, vec_len (policy_name));
+
+  vec_free (segments);
+  vec_free (tags);
+
+  S;
+  W;
+  /* NOTREACHED */
+}
+
+static int
+api_sr_policy_add_del (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_sr_policy_add_del_t *mp;
+  f64 timeout;
+  int is_del = 0;
+  u8 *name = 0;
+  u8 *tunnel_name = 0;
+  u8 **tunnel_names = 0;
+
+  int name_set = 0;
+  int tunnel_set = 0;
+  int j = 0;
+  int tunnel_names_length = 1;	// Init to 1 to offset the #tunnel_names counter byte
+  int tun_name_len = 0;		// Different naming convention used as confusing these would be "bad" (TM)
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	is_del = 1;
+      else if (unformat (input, "name %s", &name))
+	name_set = 1;
+      else if (unformat (input, "tunnel %s", &tunnel_name))
+	{
+	  if (tunnel_name)
+	    {
+	      vec_add1 (tunnel_names, tunnel_name);
+	      /* For serializer:
+	         - length = #bytes to store in serial vector
+	         - +1 = byte to store that length
+	       */
+	      tunnel_names_length += (vec_len (tunnel_name) + 1);
+	      tunnel_set = 1;
+	      tunnel_name = 0;
+	    }
+	}
+      else
+	break;
+    }
+
+  if (!name_set)
+    {
+      errmsg ("policy name required");
+      return -99;
+    }
+
+  if ((!tunnel_set) && (!is_del))
+    {
+      errmsg ("tunnel name required");
+      return -99;
+    }
+
+  M2 (SR_POLICY_ADD_DEL, sr_policy_add_del, tunnel_names_length);
+
+
+
+  mp->is_add = !is_del;
+
+  memcpy (mp->name, name, vec_len (name));
+  // Since mp->tunnel_names is of type u8[0] and not a u8 *, u8 ** needs to be serialized
+  u8 *serial_orig = 0;
+  vec_validate (serial_orig, tunnel_names_length);
+  *serial_orig = vec_len (tunnel_names);	// Store the number of tunnels as length in first byte of serialized vector
+  serial_orig += 1;		// Move along one byte to store the length of first tunnel_name
+
+  for (j = 0; j < vec_len (tunnel_names); j++)
+    {
+      tun_name_len = vec_len (tunnel_names[j]);
+      *serial_orig = tun_name_len;	// Store length of tunnel name in first byte of Length/Value pair
+      serial_orig += 1;		// Move along one byte to store the actual tunnel name
+      memcpy (serial_orig, tunnel_names[j], tun_name_len);
+      serial_orig += tun_name_len;	// Advance past the copy
+    }
+  memcpy (mp->tunnel_names, serial_orig - tunnel_names_length, tunnel_names_length);	// Regress serial_orig to head then copy fwd
+
+  vec_free (tunnel_names);
+  vec_free (tunnel_name);
+
+  S;
+  W;
+  /* NOTREACHED */
+}
+
+static int
+api_sr_multicast_map_add_del (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_sr_multicast_map_add_del_t *mp;
+  f64 timeout;
+  int is_del = 0;
+  ip6_address_t multicast_address;
+  u8 *policy_name = 0;
+  int multicast_address_set = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	is_del = 1;
+      else
+	if (unformat
+	    (input, "address %U", unformat_ip6_address, &multicast_address))
+	multicast_address_set = 1;
+      else if (unformat (input, "sr-policy %s", &policy_name))
+	;
+      else
+	break;
+    }
+
+  if (!is_del && !policy_name)
+    {
+      errmsg ("sr-policy name required");
+      return -99;
+    }
+
+
+  if (!multicast_address_set)
+    {
+      errmsg ("address required");
+      return -99;
+    }
+
+  M (SR_MULTICAST_MAP_ADD_DEL, sr_multicast_map_add_del);
+
+  mp->is_add = !is_del;
+  memcpy (mp->policy_name, policy_name, vec_len (policy_name));
+  clib_memcpy (mp->multicast_address, &multicast_address,
+	       sizeof (mp->multicast_address));
+
+
+  vec_free (policy_name);
+
+  S;
+  W;
+  /* NOTREACHED */
+}
+
+
+#define foreach_tcp_proto_field                 \
+_(src_port)                                     \
+_(dst_port)
+
+#define foreach_udp_proto_field                 \
+_(src_port)                                     \
+_(dst_port)
+
+#define foreach_ip4_proto_field                 \
+_(src_address)                                  \
+_(dst_address)                                  \
+_(tos)                                          \
+_(length)                                       \
+_(fragment_id)                                  \
+_(ttl)                                          \
+_(protocol)                                     \
+_(checksum)
+
+uword
+unformat_tcp_mask (unformat_input_t * input, va_list * args)
+{
+  u8 **maskp = va_arg (*args, u8 **);
+  u8 *mask = 0;
+  u8 found_something = 0;
+  tcp_header_t *tcp;
+
+#define _(a) u8 a=0;
+  foreach_tcp_proto_field;
+#undef _
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (0);
+#define _(a) else if (unformat (input, #a)) a=1;
+      foreach_tcp_proto_field
+#undef _
+	else
+	break;
+    }
+
+#define _(a) found_something += a;
+  foreach_tcp_proto_field;
+#undef _
+
+  if (found_something == 0)
+    return 0;
+
+  vec_validate (mask, sizeof (*tcp) - 1);
+
+  tcp = (tcp_header_t *) mask;
+
+#define _(a) if (a) memset (&tcp->a, 0xff, sizeof (tcp->a));
+  foreach_tcp_proto_field;
+#undef _
+
+  *maskp = mask;
+  return 1;
+}
+
+uword
+unformat_udp_mask (unformat_input_t * input, va_list * args)
+{
+  u8 **maskp = va_arg (*args, u8 **);
+  u8 *mask = 0;
+  u8 found_something = 0;
+  udp_header_t *udp;
+
+#define _(a) u8 a=0;
+  foreach_udp_proto_field;
+#undef _
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (0);
+#define _(a) else if (unformat (input, #a)) a=1;
+      foreach_udp_proto_field
+#undef _
+	else
+	break;
+    }
+
+#define _(a) found_something += a;
+  foreach_udp_proto_field;
+#undef _
+
+  if (found_something == 0)
+    return 0;
+
+  vec_validate (mask, sizeof (*udp) - 1);
+
+  udp = (udp_header_t *) mask;
+
+#define _(a) if (a) memset (&udp->a, 0xff, sizeof (udp->a));
+  foreach_udp_proto_field;
+#undef _
+
+  *maskp = mask;
+  return 1;
+}
+
+typedef struct
+{
+  u16 src_port, dst_port;
+} tcpudp_header_t;
+
+uword
+unformat_l4_mask (unformat_input_t * input, va_list * args)
+{
+  u8 **maskp = va_arg (*args, u8 **);
+  u16 src_port = 0, dst_port = 0;
+  tcpudp_header_t *tcpudp;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "tcp %U", unformat_tcp_mask, maskp))
+	return 1;
+      else if (unformat (input, "udp %U", unformat_udp_mask, maskp))
+	return 1;
+      else if (unformat (input, "src_port"))
+	src_port = 0xFFFF;
+      else if (unformat (input, "dst_port"))
+	dst_port = 0xFFFF;
+      else
+	return 0;
+    }
+
+  if (!src_port && !dst_port)
+    return 0;
+
+  u8 *mask = 0;
+  vec_validate (mask, sizeof (tcpudp_header_t) - 1);
+
+  tcpudp = (tcpudp_header_t *) mask;
+  tcpudp->src_port = src_port;
+  tcpudp->dst_port = dst_port;
+
+  *maskp = mask;
+
+  return 1;
+}
+
+uword
+unformat_ip4_mask (unformat_input_t * input, va_list * args)
+{
+  u8 **maskp = va_arg (*args, u8 **);
+  u8 *mask = 0;
+  u8 found_something = 0;
+  ip4_header_t *ip;
+
+#define _(a) u8 a=0;
+  foreach_ip4_proto_field;
+#undef _
+  u8 version = 0;
+  u8 hdr_length = 0;
+
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "version"))
+	version = 1;
+      else if (unformat (input, "hdr_length"))
+	hdr_length = 1;
+      else if (unformat (input, "src"))
+	src_address = 1;
+      else if (unformat (input, "dst"))
+	dst_address = 1;
+      else if (unformat (input, "proto"))
+	protocol = 1;
+
+#define _(a) else if (unformat (input, #a)) a=1;
+      foreach_ip4_proto_field
+#undef _
+	else
+	break;
+    }
+
+#define _(a) found_something += a;
+  foreach_ip4_proto_field;
+#undef _
+
+  if (found_something == 0)
+    return 0;
+
+  vec_validate (mask, sizeof (*ip) - 1);
+
+  ip = (ip4_header_t *) mask;
+
+#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
+  foreach_ip4_proto_field;
+#undef _
+
+  ip->ip_version_and_header_length = 0;
+
+  if (version)
+    ip->ip_version_and_header_length |= 0xF0;
+
+  if (hdr_length)
+    ip->ip_version_and_header_length |= 0x0F;
+
+  *maskp = mask;
+  return 1;
+}
+
+#define foreach_ip6_proto_field                 \
+_(src_address)                                  \
+_(dst_address)                                  \
+_(payload_length)				\
+_(hop_limit)                                    \
+_(protocol)
+
+uword
+unformat_ip6_mask (unformat_input_t * input, va_list * args)
+{
+  u8 **maskp = va_arg (*args, u8 **);
+  u8 *mask = 0;
+  u8 found_something = 0;
+  ip6_header_t *ip;
+  u32 ip_version_traffic_class_and_flow_label;
+
+#define _(a) u8 a=0;
+  foreach_ip6_proto_field;
+#undef _
+  u8 version = 0;
+  u8 traffic_class = 0;
+  u8 flow_label = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "version"))
+	version = 1;
+      else if (unformat (input, "traffic-class"))
+	traffic_class = 1;
+      else if (unformat (input, "flow-label"))
+	flow_label = 1;
+      else if (unformat (input, "src"))
+	src_address = 1;
+      else if (unformat (input, "dst"))
+	dst_address = 1;
+      else if (unformat (input, "proto"))
+	protocol = 1;
+
+#define _(a) else if (unformat (input, #a)) a=1;
+      foreach_ip6_proto_field
+#undef _
+	else
+	break;
+    }
+
+#define _(a) found_something += a;
+  foreach_ip6_proto_field;
+#undef _
+
+  if (found_something == 0)
+    return 0;
+
+  vec_validate (mask, sizeof (*ip) - 1);
+
+  ip = (ip6_header_t *) mask;
+
+#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
+  foreach_ip6_proto_field;
+#undef _
+
+  ip_version_traffic_class_and_flow_label = 0;
+
+  if (version)
+    ip_version_traffic_class_and_flow_label |= 0xF0000000;
+
+  if (traffic_class)
+    ip_version_traffic_class_and_flow_label |= 0x0FF00000;
+
+  if (flow_label)
+    ip_version_traffic_class_and_flow_label |= 0x000FFFFF;
+
+  ip->ip_version_traffic_class_and_flow_label =
+    clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label);
+
+  *maskp = mask;
+  return 1;
+}
+
+uword
+unformat_l3_mask (unformat_input_t * input, va_list * args)
+{
+  u8 **maskp = va_arg (*args, u8 **);
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp))
+	return 1;
+      else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp))
+	return 1;
+      else
+	break;
+    }
+  return 0;
+}
+
+uword
+unformat_l2_mask (unformat_input_t * input, va_list * args)
+{
+  u8 **maskp = va_arg (*args, u8 **);
+  u8 *mask = 0;
+  u8 src = 0;
+  u8 dst = 0;
+  u8 proto = 0;
+  u8 tag1 = 0;
+  u8 tag2 = 0;
+  u8 ignore_tag1 = 0;
+  u8 ignore_tag2 = 0;
+  u8 cos1 = 0;
+  u8 cos2 = 0;
+  u8 dot1q = 0;
+  u8 dot1ad = 0;
+  int len = 14;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "src"))
+	src = 1;
+      else if (unformat (input, "dst"))
+	dst = 1;
+      else if (unformat (input, "proto"))
+	proto = 1;
+      else if (unformat (input, "tag1"))
+	tag1 = 1;
+      else if (unformat (input, "tag2"))
+	tag2 = 1;
+      else if (unformat (input, "ignore-tag1"))
+	ignore_tag1 = 1;
+      else if (unformat (input, "ignore-tag2"))
+	ignore_tag2 = 1;
+      else if (unformat (input, "cos1"))
+	cos1 = 1;
+      else if (unformat (input, "cos2"))
+	cos2 = 1;
+      else if (unformat (input, "dot1q"))
+	dot1q = 1;
+      else if (unformat (input, "dot1ad"))
+	dot1ad = 1;
+      else
+	break;
+    }
+  if ((src + dst + proto + tag1 + tag2 + dot1q + dot1ad +
+       ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
+    return 0;
+
+  if (tag1 || ignore_tag1 || cos1 || dot1q)
+    len = 18;
+  if (tag2 || ignore_tag2 || cos2 || dot1ad)
+    len = 22;
+
+  vec_validate (mask, len - 1);
+
+  if (dst)
+    memset (mask, 0xff, 6);
+
+  if (src)
+    memset (mask + 6, 0xff, 6);
+
+  if (tag2 || dot1ad)
+    {
+      /* inner vlan tag */
+      if (tag2)
+	{
+	  mask[19] = 0xff;
+	  mask[18] = 0x0f;
+	}
+      if (cos2)
+	mask[18] |= 0xe0;
+      if (proto)
+	mask[21] = mask[20] = 0xff;
+      if (tag1)
+	{
+	  mask[15] = 0xff;
+	  mask[14] = 0x0f;
+	}
+      if (cos1)
+	mask[14] |= 0xe0;
+      *maskp = mask;
+      return 1;
+    }
+  if (tag1 | dot1q)
+    {
+      if (tag1)
+	{
+	  mask[15] = 0xff;
+	  mask[14] = 0x0f;
+	}
+      if (cos1)
+	mask[14] |= 0xe0;
+      if (proto)
+	mask[16] = mask[17] = 0xff;
+
+      *maskp = mask;
+      return 1;
+    }
+  if (cos2)
+    mask[18] |= 0xe0;
+  if (cos1)
+    mask[14] |= 0xe0;
+  if (proto)
+    mask[12] = mask[13] = 0xff;
+
+  *maskp = mask;
+  return 1;
+}
+
+uword
+unformat_classify_mask (unformat_input_t * input, va_list * args)
+{
+  u8 **maskp = va_arg (*args, u8 **);
+  u32 *skipp = va_arg (*args, u32 *);
+  u32 *matchp = va_arg (*args, u32 *);
+  u32 match;
+  u8 *mask = 0;
+  u8 *l2 = 0;
+  u8 *l3 = 0;
+  u8 *l4 = 0;
+  int i;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "hex %U", unformat_hex_string, &mask))
+	;
+      else if (unformat (input, "l2 %U", unformat_l2_mask, &l2))
+	;
+      else if (unformat (input, "l3 %U", unformat_l3_mask, &l3))
+	;
+      else if (unformat (input, "l4 %U", unformat_l4_mask, &l4))
+	;
+      else
+	break;
+    }
+
+  if (l4 && !l3)
+    {
+      vec_free (mask);
+      vec_free (l2);
+      vec_free (l4);
+      return 0;
+    }
+
+  if (mask || l2 || l3 || l4)
+    {
+      if (l2 || l3 || l4)
+	{
+	  /* "With a free Ethernet header in every package" */
+	  if (l2 == 0)
+	    vec_validate (l2, 13);
+	  mask = l2;
+	  if (vec_len (l3))
+	    {
+	      vec_append (mask, l3);
+	      vec_free (l3);
+	    }
+	  if (vec_len (l4))
+	    {
+	      vec_append (mask, l4);
+	      vec_free (l4);
+	    }
+	}
+
+      /* Scan forward looking for the first significant mask octet */
+      for (i = 0; i < vec_len (mask); i++)
+	if (mask[i])
+	  break;
+
+      /* compute (skip, match) params */
+      *skipp = i / sizeof (u32x4);
+      vec_delete (mask, *skipp * sizeof (u32x4), 0);
+
+      /* Pad mask to an even multiple of the vector size */
+      while (vec_len (mask) % sizeof (u32x4))
+	vec_add1 (mask, 0);
+
+      match = vec_len (mask) / sizeof (u32x4);
+
+      for (i = match * sizeof (u32x4); i > 0; i -= sizeof (u32x4))
+	{
+	  u64 *tmp = (u64 *) (mask + (i - sizeof (u32x4)));
+	  if (*tmp || *(tmp + 1))
+	    break;
+	  match--;
+	}
+      if (match == 0)
+	clib_warning ("BUG: match 0");
+
+      _vec_len (mask) = match * sizeof (u32x4);
+
+      *matchp = match;
+      *maskp = mask;
+
+      return 1;
+    }
+
+  return 0;
+}
+
+#define foreach_l2_next                         \
+_(drop, DROP)                                   \
+_(ethernet, ETHERNET_INPUT)                     \
+_(ip4, IP4_INPUT)                               \
+_(ip6, IP6_INPUT)
+
+uword
+unformat_l2_next_index (unformat_input_t * input, va_list * args)
+{
+  u32 *miss_next_indexp = va_arg (*args, u32 *);
+  u32 next_index = 0;
+  u32 tmp;
+
+#define _(n,N) \
+  if (unformat (input, #n)) { next_index = L2_INPUT_CLASSIFY_NEXT_##N; goto out;}
+  foreach_l2_next;
+#undef _
+
+  if (unformat (input, "%d", &tmp))
+    {
+      next_index = tmp;
+      goto out;
+    }
+
+  return 0;
+
+out:
+  *miss_next_indexp = next_index;
+  return 1;
+}
+
+#define foreach_ip_next                         \
+_(drop, DROP)                                   \
+_(local, LOCAL)                                 \
+_(rewrite, REWRITE)
+
+uword
+unformat_ip_next_index (unformat_input_t * input, va_list * args)
+{
+  u32 *miss_next_indexp = va_arg (*args, u32 *);
+  u32 next_index = 0;
+  u32 tmp;
+
+#define _(n,N) \
+  if (unformat (input, #n)) { next_index = IP_LOOKUP_NEXT_##N; goto out;}
+  foreach_ip_next;
+#undef _
+
+  if (unformat (input, "%d", &tmp))
+    {
+      next_index = tmp;
+      goto out;
+    }
+
+  return 0;
+
+out:
+  *miss_next_indexp = next_index;
+  return 1;
+}
+
+#define foreach_acl_next                        \
+_(deny, DENY)
+
+uword
+unformat_acl_next_index (unformat_input_t * input, va_list * args)
+{
+  u32 *miss_next_indexp = va_arg (*args, u32 *);
+  u32 next_index = 0;
+  u32 tmp;
+
+#define _(n,N) \
+  if (unformat (input, #n)) { next_index = ACL_NEXT_INDEX_##N; goto out;}
+  foreach_acl_next;
+#undef _
+
+  if (unformat (input, "permit"))
+    {
+      next_index = ~0;
+      goto out;
+    }
+  else if (unformat (input, "%d", &tmp))
+    {
+      next_index = tmp;
+      goto out;
+    }
+
+  return 0;
+
+out:
+  *miss_next_indexp = next_index;
+  return 1;
+}
+
+uword
+unformat_policer_precolor (unformat_input_t * input, va_list * args)
+{
+  u32 *r = va_arg (*args, u32 *);
+
+  if (unformat (input, "conform-color"))
+    *r = POLICE_CONFORM;
+  else if (unformat (input, "exceed-color"))
+    *r = POLICE_EXCEED;
+  else
+    return 0;
+
+  return 1;
+}
+
+static int
+api_classify_add_del_table (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_classify_add_del_table_t *mp;
+
+  u32 nbuckets = 2;
+  u32 skip = ~0;
+  u32 match = ~0;
+  int is_add = 1;
+  int del_chain = 0;
+  u32 table_index = ~0;
+  u32 next_table_index = ~0;
+  u32 miss_next_index = ~0;
+  u32 memory_size = 32 << 20;
+  u8 *mask = 0;
+  f64 timeout;
+  u32 current_data_flag = 0;
+  int current_data_offset = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "del-chain"))
+	{
+	  is_add = 0;
+	  del_chain = 1;
+	}
+      else if (unformat (i, "buckets %d", &nbuckets))
+	;
+      else if (unformat (i, "memory_size %d", &memory_size))
+	;
+      else if (unformat (i, "skip %d", &skip))
+	;
+      else if (unformat (i, "match %d", &match))
+	;
+      else if (unformat (i, "table %d", &table_index))
+	;
+      else if (unformat (i, "mask %U", unformat_classify_mask,
+			 &mask, &skip, &match))
+	;
+      else if (unformat (i, "next-table %d", &next_table_index))
+	;
+      else if (unformat (i, "miss-next %U", unformat_ip_next_index,
+			 &miss_next_index))
+	;
+      else if (unformat (i, "l2-miss-next %U", unformat_l2_next_index,
+			 &miss_next_index))
+	;
+      else if (unformat (i, "acl-miss-next %U", unformat_acl_next_index,
+			 &miss_next_index))
+	;
+      else if (unformat (i, "current-data-flag %d", &current_data_flag))
+	;
+      else if (unformat (i, "current-data-offset %d", &current_data_offset))
+	;
+      else
+	break;
+    }
+
+  if (is_add && mask == 0)
+    {
+      errmsg ("Mask required");
+      return -99;
+    }
+
+  if (is_add && skip == ~0)
+    {
+      errmsg ("skip count required");
+      return -99;
+    }
+
+  if (is_add && match == ~0)
+    {
+      errmsg ("match count required");
+      return -99;
+    }
+
+  if (!is_add && table_index == ~0)
+    {
+      errmsg ("table index required for delete");
+      return -99;
+    }
+
+  M2 (CLASSIFY_ADD_DEL_TABLE, classify_add_del_table, vec_len (mask));
+
+  mp->is_add = is_add;
+  mp->del_chain = del_chain;
+  mp->table_index = ntohl (table_index);
+  mp->nbuckets = ntohl (nbuckets);
+  mp->memory_size = ntohl (memory_size);
+  mp->skip_n_vectors = ntohl (skip);
+  mp->match_n_vectors = ntohl (match);
+  mp->next_table_index = ntohl (next_table_index);
+  mp->miss_next_index = ntohl (miss_next_index);
+  mp->current_data_flag = ntohl (current_data_flag);
+  mp->current_data_offset = ntohl (current_data_offset);
+  clib_memcpy (mp->mask, mask, vec_len (mask));
+
+  vec_free (mask);
+
+  S;
+  W;
+  /* NOTREACHED */
+}
+
+uword
+unformat_l4_match (unformat_input_t * input, va_list * args)
+{
+  u8 **matchp = va_arg (*args, u8 **);
+
+  u8 *proto_header = 0;
+  int src_port = 0;
+  int dst_port = 0;
+
+  tcpudp_header_t h;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "src_port %d", &src_port))
+	;
+      else if (unformat (input, "dst_port %d", &dst_port))
+	;
+      else
+	return 0;
+    }
+
+  h.src_port = clib_host_to_net_u16 (src_port);
+  h.dst_port = clib_host_to_net_u16 (dst_port);
+  vec_validate (proto_header, sizeof (h) - 1);
+  memcpy (proto_header, &h, sizeof (h));
+
+  *matchp = proto_header;
+
+  return 1;
+}
+
+uword
+unformat_ip4_match (unformat_input_t * input, va_list * args)
+{
+  u8 **matchp = va_arg (*args, u8 **);
+  u8 *match = 0;
+  ip4_header_t *ip;
+  int version = 0;
+  u32 version_val;
+  int hdr_length = 0;
+  u32 hdr_length_val;
+  int src = 0, dst = 0;
+  ip4_address_t src_val, dst_val;
+  int proto = 0;
+  u32 proto_val;
+  int tos = 0;
+  u32 tos_val;
+  int length = 0;
+  u32 length_val;
+  int fragment_id = 0;
+  u32 fragment_id_val;
+  int ttl = 0;
+  int ttl_val;
+  int checksum = 0;
+  u32 checksum_val;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "version %d", &version_val))
+	version = 1;
+      else if (unformat (input, "hdr_length %d", &hdr_length_val))
+	hdr_length = 1;
+      else if (unformat (input, "src %U", unformat_ip4_address, &src_val))
+	src = 1;
+      else if (unformat (input, "dst %U", unformat_ip4_address, &dst_val))
+	dst = 1;
+      else if (unformat (input, "proto %d", &proto_val))
+	proto = 1;
+      else if (unformat (input, "tos %d", &tos_val))
+	tos = 1;
+      else if (unformat (input, "length %d", &length_val))
+	length = 1;
+      else if (unformat (input, "fragment_id %d", &fragment_id_val))
+	fragment_id = 1;
+      else if (unformat (input, "ttl %d", &ttl_val))
+	ttl = 1;
+      else if (unformat (input, "checksum %d", &checksum_val))
+	checksum = 1;
+      else
+	break;
+    }
+
+  if (version + hdr_length + src + dst + proto + tos + length + fragment_id
+      + ttl + checksum == 0)
+    return 0;
+
+  /*
+   * Aligned because we use the real comparison functions
+   */
+  vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4));
+
+  ip = (ip4_header_t *) match;
+
+  /* These are realistically matched in practice */
+  if (src)
+    ip->src_address.as_u32 = src_val.as_u32;
+
+  if (dst)
+    ip->dst_address.as_u32 = dst_val.as_u32;
+
+  if (proto)
+    ip->protocol = proto_val;
+
+
+  /* These are not, but they're included for completeness */
+  if (version)
+    ip->ip_version_and_header_length |= (version_val & 0xF) << 4;
+
+  if (hdr_length)
+    ip->ip_version_and_header_length |= (hdr_length_val & 0xF);
+
+  if (tos)
+    ip->tos = tos_val;
+
+  if (length)
+    ip->length = clib_host_to_net_u16 (length_val);
+
+  if (ttl)
+    ip->ttl = ttl_val;
+
+  if (checksum)
+    ip->checksum = clib_host_to_net_u16 (checksum_val);
+
+  *matchp = match;
+  return 1;
+}
+
+uword
+unformat_ip6_match (unformat_input_t * input, va_list * args)
+{
+  u8 **matchp = va_arg (*args, u8 **);
+  u8 *match = 0;
+  ip6_header_t *ip;
+  int version = 0;
+  u32 version_val;
+  u8 traffic_class = 0;
+  u32 traffic_class_val = 0;
+  u8 flow_label = 0;
+  u8 flow_label_val;
+  int src = 0, dst = 0;
+  ip6_address_t src_val, dst_val;
+  int proto = 0;
+  u32 proto_val;
+  int payload_length = 0;
+  u32 payload_length_val;
+  int hop_limit = 0;
+  int hop_limit_val;
+  u32 ip_version_traffic_class_and_flow_label;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "version %d", &version_val))
+	version = 1;
+      else if (unformat (input, "traffic_class %d", &traffic_class_val))
+	traffic_class = 1;
+      else if (unformat (input, "flow_label %d", &flow_label_val))
+	flow_label = 1;
+      else if (unformat (input, "src %U", unformat_ip6_address, &src_val))
+	src = 1;
+      else if (unformat (input, "dst %U", unformat_ip6_address, &dst_val))
+	dst = 1;
+      else if (unformat (input, "proto %d", &proto_val))
+	proto = 1;
+      else if (unformat (input, "payload_length %d", &payload_length_val))
+	payload_length = 1;
+      else if (unformat (input, "hop_limit %d", &hop_limit_val))
+	hop_limit = 1;
+      else
+	break;
+    }
+
+  if (version + traffic_class + flow_label + src + dst + proto +
+      payload_length + hop_limit == 0)
+    return 0;
+
+  /*
+   * Aligned because we use the real comparison functions
+   */
+  vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4));
+
+  ip = (ip6_header_t *) match;
+
+  if (src)
+    clib_memcpy (&ip->src_address, &src_val, sizeof (ip->src_address));
+
+  if (dst)
+    clib_memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address));
+
+  if (proto)
+    ip->protocol = proto_val;
+
+  ip_version_traffic_class_and_flow_label = 0;
+
+  if (version)
+    ip_version_traffic_class_and_flow_label |= (version_val & 0xF) << 28;
+
+  if (traffic_class)
+    ip_version_traffic_class_and_flow_label |=
+      (traffic_class_val & 0xFF) << 20;
+
+  if (flow_label)
+    ip_version_traffic_class_and_flow_label |= (flow_label_val & 0xFFFFF);
+
+  ip->ip_version_traffic_class_and_flow_label =
+    clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label);
+
+  if (payload_length)
+    ip->payload_length = clib_host_to_net_u16 (payload_length_val);
+
+  if (hop_limit)
+    ip->hop_limit = hop_limit_val;
+
+  *matchp = match;
+  return 1;
+}
+
+uword
+unformat_l3_match (unformat_input_t * input, va_list * args)
+{
+  u8 **matchp = va_arg (*args, u8 **);
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "ip4 %U", unformat_ip4_match, matchp))
+	return 1;
+      else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp))
+	return 1;
+      else
+	break;
+    }
+  return 0;
+}
+
+uword
+unformat_vlan_tag (unformat_input_t * input, va_list * args)
+{
+  u8 *tagp = va_arg (*args, u8 *);
+  u32 tag;
+
+  if (unformat (input, "%d", &tag))
+    {
+      tagp[0] = (tag >> 8) & 0x0F;
+      tagp[1] = tag & 0xFF;
+      return 1;
+    }
+
+  return 0;
+}
+
+uword
+unformat_l2_match (unformat_input_t * input, va_list * args)
+{
+  u8 **matchp = va_arg (*args, u8 **);
+  u8 *match = 0;
+  u8 src = 0;
+  u8 src_val[6];
+  u8 dst = 0;
+  u8 dst_val[6];
+  u8 proto = 0;
+  u16 proto_val;
+  u8 tag1 = 0;
+  u8 tag1_val[2];
+  u8 tag2 = 0;
+  u8 tag2_val[2];
+  int len = 14;
+  u8 ignore_tag1 = 0;
+  u8 ignore_tag2 = 0;
+  u8 cos1 = 0;
+  u8 cos2 = 0;
+  u32 cos1_val = 0;
+  u32 cos2_val = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "src %U", unformat_ethernet_address, &src_val))
+	src = 1;
+      else
+	if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val))
+	dst = 1;
+      else if (unformat (input, "proto %U",
+			 unformat_ethernet_type_host_byte_order, &proto_val))
+	proto = 1;
+      else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val))
+	tag1 = 1;
+      else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val))
+	tag2 = 1;
+      else if (unformat (input, "ignore-tag1"))
+	ignore_tag1 = 1;
+      else if (unformat (input, "ignore-tag2"))
+	ignore_tag2 = 1;
+      else if (unformat (input, "cos1 %d", &cos1_val))
+	cos1 = 1;
+      else if (unformat (input, "cos2 %d", &cos2_val))
+	cos2 = 1;
+      else
+	break;
+    }
+  if ((src + dst + proto + tag1 + tag2 +
+       ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
+    return 0;
+
+  if (tag1 || ignore_tag1 || cos1)
+    len = 18;
+  if (tag2 || ignore_tag2 || cos2)
+    len = 22;
+
+  vec_validate_aligned (match, len - 1, sizeof (u32x4));
+
+  if (dst)
+    clib_memcpy (match, dst_val, 6);
+
+  if (src)
+    clib_memcpy (match + 6, src_val, 6);
+
+  if (tag2)
+    {
+      /* inner vlan tag */
+      match[19] = tag2_val[1];
+      match[18] = tag2_val[0];
+      if (cos2)
+	match[18] |= (cos2_val & 0x7) << 5;
+      if (proto)
+	{
+	  match[21] = proto_val & 0xff;
+	  match[20] = proto_val >> 8;
+	}
+      if (tag1)
+	{
+	  match[15] = tag1_val[1];
+	  match[14] = tag1_val[0];
+	}
+      if (cos1)
+	match[14] |= (cos1_val & 0x7) << 5;
+      *matchp = match;
+      return 1;
+    }
+  if (tag1)
+    {
+      match[15] = tag1_val[1];
+      match[14] = tag1_val[0];
+      if (proto)
+	{
+	  match[17] = proto_val & 0xff;
+	  match[16] = proto_val >> 8;
+	}
+      if (cos1)
+	match[14] |= (cos1_val & 0x7) << 5;
+
+      *matchp = match;
+      return 1;
+    }
+  if (cos2)
+    match[18] |= (cos2_val & 0x7) << 5;
+  if (cos1)
+    match[14] |= (cos1_val & 0x7) << 5;
+  if (proto)
+    {
+      match[13] = proto_val & 0xff;
+      match[12] = proto_val >> 8;
+    }
+
+  *matchp = match;
+  return 1;
+}
+
+
+uword
+unformat_classify_match (unformat_input_t * input, va_list * args)
+{
+  u8 **matchp = va_arg (*args, u8 **);
+  u32 skip_n_vectors = va_arg (*args, u32);
+  u32 match_n_vectors = va_arg (*args, u32);
+
+  u8 *match = 0;
+  u8 *l2 = 0;
+  u8 *l3 = 0;
+  u8 *l4 = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "hex %U", unformat_hex_string, &match))
+	;
+      else if (unformat (input, "l2 %U", unformat_l2_match, &l2))
+	;
+      else if (unformat (input, "l3 %U", unformat_l3_match, &l3))
+	;
+      else if (unformat (input, "l4 %U", unformat_l4_match, &l4))
+	;
+      else
+	break;
+    }
+
+  if (l4 && !l3)
+    {
+      vec_free (match);
+      vec_free (l2);
+      vec_free (l4);
+      return 0;
+    }
+
+  if (match || l2 || l3 || l4)
+    {
+      if (l2 || l3 || l4)
+	{
+	  /* "Win a free Ethernet header in every packet" */
+	  if (l2 == 0)
+	    vec_validate_aligned (l2, 13, sizeof (u32x4));
+	  match = l2;
+	  if (vec_len (l3))
+	    {
+	      vec_append_aligned (match, l3, sizeof (u32x4));
+	      vec_free (l3);
+	    }
+	  if (vec_len (l4))
+	    {
+	      vec_append_aligned (match, l4, sizeof (u32x4));
+	      vec_free (l4);
+	    }
+	}
+
+      /* Make sure the vector is big enough even if key is all 0's */
+      vec_validate_aligned
+	(match, ((match_n_vectors + skip_n_vectors) * sizeof (u32x4)) - 1,
+	 sizeof (u32x4));
+
+      /* Set size, include skipped vectors */
+      _vec_len (match) = (match_n_vectors + skip_n_vectors) * sizeof (u32x4);
+
+      *matchp = match;
+
+      return 1;
+    }
+
+  return 0;
+}
+
+static int
+api_classify_add_del_session (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_classify_add_del_session_t *mp;
+  int is_add = 1;
+  u32 table_index = ~0;
+  u32 hit_next_index = ~0;
+  u32 opaque_index = ~0;
+  u8 *match = 0;
+  i32 advance = 0;
+  f64 timeout;
+  u32 skip_n_vectors = 0;
+  u32 match_n_vectors = 0;
+  u32 action = 0;
+  u32 metadata = 0;
+
+  /*
+   * Warning: you have to supply skip_n and match_n
+   * because the API client cant simply look at the classify
+   * table object.
+   */
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "hit-next %U", unformat_ip_next_index,
+			 &hit_next_index))
+	;
+      else if (unformat (i, "l2-hit-next %U", unformat_l2_next_index,
+			 &hit_next_index))
+	;
+      else if (unformat (i, "acl-hit-next %U", unformat_acl_next_index,
+			 &hit_next_index))
+	;
+      else if (unformat (i, "policer-hit-next %d", &hit_next_index))
+	;
+      else if (unformat (i, "%U", unformat_policer_precolor, &opaque_index))
+	;
+      else if (unformat (i, "opaque-index %d", &opaque_index))
+	;
+      else if (unformat (i, "skip_n %d", &skip_n_vectors))
+	;
+      else if (unformat (i, "match_n %d", &match_n_vectors))
+	;
+      else if (unformat (i, "match %U", unformat_classify_match,
+			 &match, skip_n_vectors, match_n_vectors))
+	;
+      else if (unformat (i, "advance %d", &advance))
+	;
+      else if (unformat (i, "table-index %d", &table_index))
+	;
+      else if (unformat (i, "action set-ip4-fib-id %d", &metadata))
+	action = 1;
+      else if (unformat (i, "action set-ip6-fib-id %d", &metadata))
+	action = 2;
+      else if (unformat (i, "action %d", &action))
+	;
+      else if (unformat (i, "metadata %d", &metadata))
+	;
+      else
+	break;
+    }
+
+  if (table_index == ~0)
+    {
+      errmsg ("Table index required");
+      return -99;
+    }
+
+  if (is_add && match == 0)
+    {
+      errmsg ("Match value required");
+      return -99;
+    }
+
+  M2 (CLASSIFY_ADD_DEL_SESSION, classify_add_del_session, vec_len (match));
+
+  mp->is_add = is_add;
+  mp->table_index = ntohl (table_index);
+  mp->hit_next_index = ntohl (hit_next_index);
+  mp->opaque_index = ntohl (opaque_index);
+  mp->advance = ntohl (advance);
+  mp->action = action;
+  mp->metadata = ntohl (metadata);
+  clib_memcpy (mp->match, match, vec_len (match));
+  vec_free (match);
+
+  S;
+  W;
+  /* NOTREACHED */
+}
+
+static int
+api_classify_set_interface_ip_table (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_classify_set_interface_ip_table_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  int sw_if_index_set;
+  u32 table_index = ~0;
+  u8 is_ipv6 = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "table %d", &table_index))
+	;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+
+  M (CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->table_index = ntohl (table_index);
+  mp->is_ipv6 = is_ipv6;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_classify_set_interface_l2_tables (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_classify_set_interface_l2_tables_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  int sw_if_index_set;
+  u32 ip4_table_index = ~0;
+  u32 ip6_table_index = ~0;
+  u32 other_table_index = ~0;
+  u32 is_input = 1;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "ip4-table %d", &ip4_table_index))
+	;
+      else if (unformat (i, "ip6-table %d", &ip6_table_index))
+	;
+      else if (unformat (i, "other-table %d", &other_table_index))
+	;
+      else if (unformat (i, "is-input %d", &is_input))
+	;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+
+  M (CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->ip4_table_index = ntohl (ip4_table_index);
+  mp->ip6_table_index = ntohl (ip6_table_index);
+  mp->other_table_index = ntohl (other_table_index);
+  mp->is_input = (u8) is_input;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_set_ipfix_exporter (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_set_ipfix_exporter_t *mp;
+  ip4_address_t collector_address;
+  u8 collector_address_set = 0;
+  u32 collector_port = ~0;
+  ip4_address_t src_address;
+  u8 src_address_set = 0;
+  u32 vrf_id = ~0;
+  u32 path_mtu = ~0;
+  u32 template_interval = ~0;
+  u8 udp_checksum = 0;
+  f64 timeout;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "collector_address %U", unformat_ip4_address,
+		    &collector_address))
+	collector_address_set = 1;
+      else if (unformat (i, "collector_port %d", &collector_port))
+	;
+      else if (unformat (i, "src_address %U", unformat_ip4_address,
+			 &src_address))
+	src_address_set = 1;
+      else if (unformat (i, "vrf_id %d", &vrf_id))
+	;
+      else if (unformat (i, "path_mtu %d", &path_mtu))
+	;
+      else if (unformat (i, "template_interval %d", &template_interval))
+	;
+      else if (unformat (i, "udp_checksum"))
+	udp_checksum = 1;
+      else
+	break;
+    }
+
+  if (collector_address_set == 0)
+    {
+      errmsg ("collector_address required");
+      return -99;
+    }
+
+  if (src_address_set == 0)
+    {
+      errmsg ("src_address required");
+      return -99;
+    }
+
+  M (SET_IPFIX_EXPORTER, set_ipfix_exporter);
+
+  memcpy (mp->collector_address, collector_address.data,
+	  sizeof (collector_address.data));
+  mp->collector_port = htons ((u16) collector_port);
+  memcpy (mp->src_address, src_address.data, sizeof (src_address.data));
+  mp->vrf_id = htonl (vrf_id);
+  mp->path_mtu = htonl (path_mtu);
+  mp->template_interval = htonl (template_interval);
+  mp->udp_checksum = udp_checksum;
+
+  S;
+  W;
+  /* NOTREACHED */
+}
+
+static int
+api_set_ipfix_classify_stream (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_set_ipfix_classify_stream_t *mp;
+  u32 domain_id = 0;
+  u32 src_port = UDP_DST_PORT_ipfix;
+  f64 timeout;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "domain %d", &domain_id))
+	;
+      else if (unformat (i, "src_port %d", &src_port))
+	;
+      else
+	{
+	  errmsg ("unknown input `%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  M (SET_IPFIX_CLASSIFY_STREAM, set_ipfix_classify_stream);
+
+  mp->domain_id = htonl (domain_id);
+  mp->src_port = htons ((u16) src_port);
+
+  S;
+  W;
+  /* NOTREACHED */
+}
+
+static int
+api_ipfix_classify_table_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ipfix_classify_table_add_del_t *mp;
+  int is_add = -1;
+  u32 classify_table_index = ~0;
+  u8 ip_version = 0;
+  u8 transport_protocol = 255;
+  f64 timeout;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "add"))
+	is_add = 1;
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "table %d", &classify_table_index))
+	;
+      else if (unformat (i, "ip4"))
+	ip_version = 4;
+      else if (unformat (i, "ip6"))
+	ip_version = 6;
+      else if (unformat (i, "tcp"))
+	transport_protocol = 6;
+      else if (unformat (i, "udp"))
+	transport_protocol = 17;
+      else
+	{
+	  errmsg ("unknown input `%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (is_add == -1)
+    {
+      errmsg ("expecting: add|del");
+      return -99;
+    }
+  if (classify_table_index == ~0)
+    {
+      errmsg ("classifier table not specified");
+      return -99;
+    }
+  if (ip_version == 0)
+    {
+      errmsg ("IP version not specified");
+      return -99;
+    }
+
+  M (IPFIX_CLASSIFY_TABLE_ADD_DEL, ipfix_classify_table_add_del);
+
+  mp->is_add = is_add;
+  mp->table_id = htonl (classify_table_index);
+  mp->ip_version = ip_version;
+  mp->transport_protocol = transport_protocol;
+
+  S;
+  W;
+  /* NOTREACHED */
+}
+
+static int
+api_get_node_index (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_get_node_index_t *mp;
+  f64 timeout;
+  u8 *name = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "node %s", &name))
+	;
+      else
+	break;
+    }
+  if (name == 0)
+    {
+      errmsg ("node name required");
+      return -99;
+    }
+  if (vec_len (name) >= ARRAY_LEN (mp->node_name))
+    {
+      errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name));
+      return -99;
+    }
+
+  M (GET_NODE_INDEX, get_node_index);
+  clib_memcpy (mp->node_name, name, vec_len (name));
+  vec_free (name);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_get_next_index (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_get_next_index_t *mp;
+  f64 timeout;
+  u8 *node_name = 0, *next_node_name = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "node-name %s", &node_name))
+	;
+      else if (unformat (i, "next-node-name %s", &next_node_name))
+	break;
+    }
+
+  if (node_name == 0)
+    {
+      errmsg ("node name required");
+      return -99;
+    }
+  if (vec_len (node_name) >= ARRAY_LEN (mp->node_name))
+    {
+      errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name));
+      return -99;
+    }
+
+  if (next_node_name == 0)
+    {
+      errmsg ("next node name required");
+      return -99;
+    }
+  if (vec_len (next_node_name) >= ARRAY_LEN (mp->next_name))
+    {
+      errmsg ("next node name too long, max %d", ARRAY_LEN (mp->next_name));
+      return -99;
+    }
+
+  M (GET_NEXT_INDEX, get_next_index);
+  clib_memcpy (mp->node_name, node_name, vec_len (node_name));
+  clib_memcpy (mp->next_name, next_node_name, vec_len (next_node_name));
+  vec_free (node_name);
+  vec_free (next_node_name);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_add_node_next (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_add_node_next_t *mp;
+  f64 timeout;
+  u8 *name = 0;
+  u8 *next = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "node %s", &name))
+	;
+      else if (unformat (i, "next %s", &next))
+	;
+      else
+	break;
+    }
+  if (name == 0)
+    {
+      errmsg ("node name required");
+      return -99;
+    }
+  if (vec_len (name) >= ARRAY_LEN (mp->node_name))
+    {
+      errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name));
+      return -99;
+    }
+  if (next == 0)
+    {
+      errmsg ("next node required");
+      return -99;
+    }
+  if (vec_len (next) >= ARRAY_LEN (mp->next_name))
+    {
+      errmsg ("next name too long, max %d", ARRAY_LEN (mp->next_name));
+      return -99;
+    }
+
+  M (ADD_NODE_NEXT, add_node_next);
+  clib_memcpy (mp->node_name, name, vec_len (name));
+  clib_memcpy (mp->next_name, next, vec_len (next));
+  vec_free (name);
+  vec_free (next);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_l2tpv3_create_tunnel (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  ip6_address_t client_address, our_address;
+  int client_address_set = 0;
+  int our_address_set = 0;
+  u32 local_session_id = 0;
+  u32 remote_session_id = 0;
+  u64 local_cookie = 0;
+  u64 remote_cookie = 0;
+  u8 l2_sublayer_present = 0;
+  vl_api_l2tpv3_create_tunnel_t *mp;
+  f64 timeout;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "client_address %U", unformat_ip6_address,
+		    &client_address))
+	client_address_set = 1;
+      else if (unformat (i, "our_address %U", unformat_ip6_address,
+			 &our_address))
+	our_address_set = 1;
+      else if (unformat (i, "local_session_id %d", &local_session_id))
+	;
+      else if (unformat (i, "remote_session_id %d", &remote_session_id))
+	;
+      else if (unformat (i, "local_cookie %lld", &local_cookie))
+	;
+      else if (unformat (i, "remote_cookie %lld", &remote_cookie))
+	;
+      else if (unformat (i, "l2-sublayer-present"))
+	l2_sublayer_present = 1;
+      else
+	break;
+    }
+
+  if (client_address_set == 0)
+    {
+      errmsg ("client_address required");
+      return -99;
+    }
+
+  if (our_address_set == 0)
+    {
+      errmsg ("our_address required");
+      return -99;
+    }
+
+  M (L2TPV3_CREATE_TUNNEL, l2tpv3_create_tunnel);
+
+  clib_memcpy (mp->client_address, client_address.as_u8,
+	       sizeof (mp->client_address));
+
+  clib_memcpy (mp->our_address, our_address.as_u8, sizeof (mp->our_address));
+
+  mp->local_session_id = ntohl (local_session_id);
+  mp->remote_session_id = ntohl (remote_session_id);
+  mp->local_cookie = clib_host_to_net_u64 (local_cookie);
+  mp->remote_cookie = clib_host_to_net_u64 (remote_cookie);
+  mp->l2_sublayer_present = l2_sublayer_present;
+  mp->is_ipv6 = 1;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_l2tpv3_set_tunnel_cookies (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u64 new_local_cookie = 0;
+  u64 new_remote_cookie = 0;
+  vl_api_l2tpv3_set_tunnel_cookies_t *mp;
+  f64 timeout;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "new_local_cookie %lld", &new_local_cookie))
+	;
+      else if (unformat (i, "new_remote_cookie %lld", &new_remote_cookie))
+	;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  M (L2TPV3_SET_TUNNEL_COOKIES, l2tpv3_set_tunnel_cookies);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->new_local_cookie = clib_host_to_net_u64 (new_local_cookie);
+  mp->new_remote_cookie = clib_host_to_net_u64 (new_remote_cookie);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_l2tpv3_interface_enable_disable (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_l2tpv3_interface_enable_disable_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u8 enable_disable = 1;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "enable"))
+	enable_disable = 1;
+      else if (unformat (i, "disable"))
+	enable_disable = 0;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  M (L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->enable_disable = enable_disable;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_l2tpv3_set_lookup_key (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_l2tpv3_set_lookup_key_t *mp;
+  f64 timeout;
+  u8 key = ~0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "lookup_v6_src"))
+	key = L2T_LOOKUP_SRC_ADDRESS;
+      else if (unformat (i, "lookup_v6_dst"))
+	key = L2T_LOOKUP_DST_ADDRESS;
+      else if (unformat (i, "lookup_session_id"))
+	key = L2T_LOOKUP_SESSION_ID;
+      else
+	break;
+    }
+
+  if (key == (u8) ~ 0)
+    {
+      errmsg ("l2tp session lookup key unset");
+      return -99;
+    }
+
+  M (L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key);
+
+  mp->key = key;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler
+  (vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "* %U (our) %U (client) (sw_if_index %d)",
+	 format_ip6_address, mp->our_address,
+	 format_ip6_address, mp->client_address,
+	 clib_net_to_host_u32 (mp->sw_if_index));
+
+  print (vam->ofp,
+	 "   local cookies %016llx %016llx remote cookie %016llx",
+	 clib_net_to_host_u64 (mp->local_cookie[0]),
+	 clib_net_to_host_u64 (mp->local_cookie[1]),
+	 clib_net_to_host_u64 (mp->remote_cookie));
+
+  print (vam->ofp, "   local session-id %d remote session-id %d",
+	 clib_net_to_host_u32 (mp->local_session_id),
+	 clib_net_to_host_u32 (mp->remote_session_id));
+
+  print (vam->ofp, "   l2 specific sublayer %s\n",
+	 mp->l2_sublayer_present ? "preset" : "absent");
+
+}
+
+static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler_json
+  (vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+  struct in6_addr addr;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+
+  clib_memcpy (&addr, mp->our_address, sizeof (addr));
+  vat_json_object_add_ip6 (node, "our_address", addr);
+  clib_memcpy (&addr, mp->client_address, sizeof (addr));
+  vat_json_object_add_ip6 (node, "client_address", addr);
+
+  vat_json_node_t *lc = vat_json_object_add (node, "local_cookie");
+  vat_json_init_array (lc);
+  vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[0]));
+  vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[1]));
+  vat_json_object_add_uint (node, "remote_cookie",
+			    clib_net_to_host_u64 (mp->remote_cookie));
+
+  printf ("local id: %u", clib_net_to_host_u32 (mp->local_session_id));
+  vat_json_object_add_uint (node, "local_session_id",
+			    clib_net_to_host_u32 (mp->local_session_id));
+  vat_json_object_add_uint (node, "remote_session_id",
+			    clib_net_to_host_u32 (mp->remote_session_id));
+  vat_json_object_add_string_copy (node, "l2_sublayer",
+				   mp->l2_sublayer_present ? (u8 *) "present"
+				   : (u8 *) "absent");
+}
+
+static int
+api_sw_if_l2tpv3_tunnel_dump (vat_main_t * vam)
+{
+  vl_api_sw_if_l2tpv3_tunnel_dump_t *mp;
+  f64 timeout;
+
+  /* Get list of l2tpv3-tunnel interfaces */
+  M (SW_IF_L2TPV3_TUNNEL_DUMP, sw_if_l2tpv3_tunnel_dump);
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+
+static void vl_api_sw_interface_tap_details_t_handler
+  (vl_api_sw_interface_tap_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "%-16s %d",
+	 mp->dev_name, clib_net_to_host_u32 (mp->sw_if_index));
+}
+
+static void vl_api_sw_interface_tap_details_t_handler_json
+  (vl_api_sw_interface_tap_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+  vat_json_object_add_string_copy (node, "dev_name", mp->dev_name);
+}
+
+static int
+api_sw_interface_tap_dump (vat_main_t * vam)
+{
+  vl_api_sw_interface_tap_dump_t *mp;
+  f64 timeout;
+
+  print (vam->ofp, "\n%-16s %s", "dev_name", "sw_if_index");
+  /* Get list of tap interfaces */
+  M (SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump);
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+static uword unformat_vxlan_decap_next
+  (unformat_input_t * input, va_list * args)
+{
+  u32 *result = va_arg (*args, u32 *);
+  u32 tmp;
+
+  if (unformat (input, "l2"))
+    *result = VXLAN_INPUT_NEXT_L2_INPUT;
+  else if (unformat (input, "%d", &tmp))
+    *result = tmp;
+  else
+    return 0;
+  return 1;
+}
+
+static int
+api_vxlan_add_del_tunnel (vat_main_t * vam)
+{
+  unformat_input_t *line_input = vam->input;
+  vl_api_vxlan_add_del_tunnel_t *mp;
+  f64 timeout;
+  ip46_address_t src, dst;
+  u8 is_add = 1;
+  u8 ipv4_set = 0, ipv6_set = 0;
+  u8 src_set = 0;
+  u8 dst_set = 0;
+  u8 grp_set = 0;
+  u32 mcast_sw_if_index = ~0;
+  u32 encap_vrf_id = 0;
+  u32 decap_next_index = ~0;
+  u32 vni = 0;
+
+  /* Can't "universally zero init" (={0}) due to GCC bug 53119 */
+  memset (&src, 0, sizeof src);
+  memset (&dst, 0, sizeof dst);
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "del"))
+	is_add = 0;
+      else
+	if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4))
+	{
+	  ipv4_set = 1;
+	  src_set = 1;
+	}
+      else
+	if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4))
+	{
+	  ipv4_set = 1;
+	  dst_set = 1;
+	}
+      else
+	if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6))
+	{
+	  ipv6_set = 1;
+	  src_set = 1;
+	}
+      else
+	if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6))
+	{
+	  ipv6_set = 1;
+	  dst_set = 1;
+	}
+      else if (unformat (line_input, "group %U %U",
+			 unformat_ip4_address, &dst.ip4,
+			 api_unformat_sw_if_index, vam, &mcast_sw_if_index))
+	{
+	  grp_set = dst_set = 1;
+	  ipv4_set = 1;
+	}
+      else if (unformat (line_input, "group %U",
+			 unformat_ip4_address, &dst.ip4))
+	{
+	  grp_set = dst_set = 1;
+	  ipv4_set = 1;
+	}
+      else if (unformat (line_input, "group %U %U",
+			 unformat_ip6_address, &dst.ip6,
+			 api_unformat_sw_if_index, vam, &mcast_sw_if_index))
+	{
+	  grp_set = dst_set = 1;
+	  ipv6_set = 1;
+	}
+      else if (unformat (line_input, "group %U",
+			 unformat_ip6_address, &dst.ip6))
+	{
+	  grp_set = dst_set = 1;
+	  ipv6_set = 1;
+	}
+      else
+	if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index))
+	;
+      else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
+	;
+      else if (unformat (line_input, "decap-next %U",
+			 unformat_vxlan_decap_next, &decap_next_index))
+	;
+      else if (unformat (line_input, "vni %d", &vni))
+	;
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, line_input);
+	  return -99;
+	}
+    }
+
+  if (src_set == 0)
+    {
+      errmsg ("tunnel src address not specified");
+      return -99;
+    }
+  if (dst_set == 0)
+    {
+      errmsg ("tunnel dst address not specified");
+      return -99;
+    }
+
+  if (grp_set && !ip46_address_is_multicast (&dst))
+    {
+      errmsg ("tunnel group address not multicast");
+      return -99;
+    }
+  if (grp_set && mcast_sw_if_index == ~0)
+    {
+      errmsg ("tunnel nonexistent multicast device");
+      return -99;
+    }
+  if (grp_set == 0 && ip46_address_is_multicast (&dst))
+    {
+      errmsg ("tunnel dst address must be unicast");
+      return -99;
+    }
+
+
+  if (ipv4_set && ipv6_set)
+    {
+      errmsg ("both IPv4 and IPv6 addresses specified");
+      return -99;
+    }
+
+  if ((vni == 0) || (vni >> 24))
+    {
+      errmsg ("vni not specified or out of range");
+      return -99;
+    }
+
+  M (VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel);
+
+  if (ipv6_set)
+    {
+      clib_memcpy (mp->src_address, &src.ip6, sizeof (src.ip6));
+      clib_memcpy (mp->dst_address, &dst.ip6, sizeof (dst.ip6));
+    }
+  else
+    {
+      clib_memcpy (mp->src_address, &src.ip4, sizeof (src.ip4));
+      clib_memcpy (mp->dst_address, &dst.ip4, sizeof (dst.ip4));
+    }
+  mp->encap_vrf_id = ntohl (encap_vrf_id);
+  mp->decap_next_index = ntohl (decap_next_index);
+  mp->mcast_sw_if_index = ntohl (mcast_sw_if_index);
+  mp->vni = ntohl (vni);
+  mp->is_add = is_add;
+  mp->is_ipv6 = ipv6_set;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static void vl_api_vxlan_tunnel_details_t_handler
+  (vl_api_vxlan_tunnel_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  ip46_address_t src, dst;
+
+  ip46_from_addr_buf (mp->is_ipv6, mp->src_address, &src);
+  ip46_from_addr_buf (mp->is_ipv6, mp->dst_address, &dst);
+
+  print (vam->ofp, "%11d%24U%24U%14d%18d%13d%19d",
+	 ntohl (mp->sw_if_index),
+	 format_ip46_address, &src, IP46_TYPE_ANY,
+	 format_ip46_address, &dst, IP46_TYPE_ANY,
+	 ntohl (mp->encap_vrf_id),
+	 ntohl (mp->decap_next_index), ntohl (mp->vni),
+	 ntohl (mp->mcast_sw_if_index));
+}
+
+static void vl_api_vxlan_tunnel_details_t_handler_json
+  (vl_api_vxlan_tunnel_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+  if (mp->is_ipv6)
+    {
+      struct in6_addr ip6;
+
+      clib_memcpy (&ip6, mp->src_address, sizeof (ip6));
+      vat_json_object_add_ip6 (node, "src_address", ip6);
+      clib_memcpy (&ip6, mp->dst_address, sizeof (ip6));
+      vat_json_object_add_ip6 (node, "dst_address", ip6);
+    }
+  else
+    {
+      struct in_addr ip4;
+
+      clib_memcpy (&ip4, mp->src_address, sizeof (ip4));
+      vat_json_object_add_ip4 (node, "src_address", ip4);
+      clib_memcpy (&ip4, mp->dst_address, sizeof (ip4));
+      vat_json_object_add_ip4 (node, "dst_address", ip4);
+    }
+  vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id));
+  vat_json_object_add_uint (node, "decap_next_index",
+			    ntohl (mp->decap_next_index));
+  vat_json_object_add_uint (node, "vni", ntohl (mp->vni));
+  vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0);
+  vat_json_object_add_uint (node, "mcast_sw_if_index",
+			    ntohl (mp->mcast_sw_if_index));
+}
+
+static int
+api_vxlan_tunnel_dump (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_vxlan_tunnel_dump_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      sw_if_index = ~0;
+    }
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%11s%24s%24s%14s%18s%13s%19s",
+	     "sw_if_index", "src_address", "dst_address",
+	     "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index");
+    }
+
+  /* Get list of vxlan-tunnel interfaces */
+  M (VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump);
+
+  mp->sw_if_index = htonl (sw_if_index);
+
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+static int
+api_gre_add_del_tunnel (vat_main_t * vam)
+{
+  unformat_input_t *line_input = vam->input;
+  vl_api_gre_add_del_tunnel_t *mp;
+  f64 timeout;
+  ip4_address_t src4, dst4;
+  u8 is_add = 1;
+  u8 teb = 0;
+  u8 src_set = 0;
+  u8 dst_set = 0;
+  u32 outer_fib_id = 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "src %U", unformat_ip4_address, &src4))
+	src_set = 1;
+      else if (unformat (line_input, "dst %U", unformat_ip4_address, &dst4))
+	dst_set = 1;
+      else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id))
+	;
+      else if (unformat (line_input, "teb"))
+	teb = 1;
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, line_input);
+	  return -99;
+	}
+    }
+
+  if (src_set == 0)
+    {
+      errmsg ("tunnel src address not specified");
+      return -99;
+    }
+  if (dst_set == 0)
+    {
+      errmsg ("tunnel dst address not specified");
+      return -99;
+    }
+
+
+  M (GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel);
+
+  clib_memcpy (&mp->src_address, &src4, sizeof (src4));
+  clib_memcpy (&mp->dst_address, &dst4, sizeof (dst4));
+  mp->outer_fib_id = ntohl (outer_fib_id);
+  mp->is_add = is_add;
+  mp->teb = teb;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static void vl_api_gre_tunnel_details_t_handler
+  (vl_api_gre_tunnel_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "%11d%15U%15U%6d%14d",
+	 ntohl (mp->sw_if_index),
+	 format_ip4_address, &mp->src_address,
+	 format_ip4_address, &mp->dst_address,
+	 mp->teb, ntohl (mp->outer_fib_id));
+}
+
+static void vl_api_gre_tunnel_details_t_handler_json
+  (vl_api_gre_tunnel_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+  struct in_addr ip4;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+  clib_memcpy (&ip4, &mp->src_address, sizeof (ip4));
+  vat_json_object_add_ip4 (node, "src_address", ip4);
+  clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4));
+  vat_json_object_add_ip4 (node, "dst_address", ip4);
+  vat_json_object_add_uint (node, "teb", mp->teb);
+  vat_json_object_add_uint (node, "outer_fib_id", ntohl (mp->outer_fib_id));
+}
+
+static int
+api_gre_tunnel_dump (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_gre_tunnel_dump_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      sw_if_index = ~0;
+    }
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%11s%15s%15s%6s%14s",
+	     "sw_if_index", "src_address", "dst_address", "teb",
+	     "outer_fib_id");
+    }
+
+  /* Get list of gre-tunnel interfaces */
+  M (GRE_TUNNEL_DUMP, gre_tunnel_dump);
+
+  mp->sw_if_index = htonl (sw_if_index);
+
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+static int
+api_l2_fib_clear_table (vat_main_t * vam)
+{
+//  unformat_input_t * i = vam->input;
+  vl_api_l2_fib_clear_table_t *mp;
+  f64 timeout;
+
+  M (L2_FIB_CLEAR_TABLE, l2_fib_clear_table);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_l2_interface_efp_filter (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_l2_interface_efp_filter_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 enable = 1;
+  u8 sw_if_index_set = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "enable"))
+	enable = 1;
+      else if (unformat (i, "disable"))
+	enable = 0;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing sw_if_index");
+      return -99;
+    }
+
+  M (L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->enable_disable = enable;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+#define foreach_vtr_op                          \
+_("disable",  L2_VTR_DISABLED)                  \
+_("push-1",  L2_VTR_PUSH_1)                     \
+_("push-2",  L2_VTR_PUSH_2)                     \
+_("pop-1",  L2_VTR_POP_1)                       \
+_("pop-2",  L2_VTR_POP_2)                       \
+_("translate-1-1",  L2_VTR_TRANSLATE_1_1)       \
+_("translate-1-2",  L2_VTR_TRANSLATE_1_2)       \
+_("translate-2-1",  L2_VTR_TRANSLATE_2_1)       \
+_("translate-2-2",  L2_VTR_TRANSLATE_2_2)
+
+static int
+api_l2_interface_vlan_tag_rewrite (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_l2_interface_vlan_tag_rewrite_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u8 vtr_op_set = 0;
+  u32 vtr_op = 0;
+  u32 push_dot1q = 1;
+  u32 tag1 = ~0;
+  u32 tag2 = ~0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "vtr_op %d", &vtr_op))
+	vtr_op_set = 1;
+#define _(n,v) else if (unformat(i, n)) {vtr_op = v; vtr_op_set = 1;}
+      foreach_vtr_op
+#undef _
+	else if (unformat (i, "push_dot1q %d", &push_dot1q))
+	;
+      else if (unformat (i, "tag1 %d", &tag1))
+	;
+      else if (unformat (i, "tag2 %d", &tag2))
+	;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if ((sw_if_index_set == 0) || (vtr_op_set == 0))
+    {
+      errmsg ("missing vtr operation or sw_if_index");
+      return -99;
+    }
+
+  M (L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)
+    mp->sw_if_index = ntohl (sw_if_index);
+  mp->vtr_op = ntohl (vtr_op);
+  mp->push_dot1q = ntohl (push_dot1q);
+  mp->tag1 = ntohl (tag1);
+  mp->tag2 = ntohl (tag2);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_create_vhost_user_if (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_create_vhost_user_if_t *mp;
+  f64 timeout;
+  u8 *file_name;
+  u8 is_server = 0;
+  u8 file_name_set = 0;
+  u32 custom_dev_instance = ~0;
+  u8 hwaddr[6];
+  u8 use_custom_mac = 0;
+  u8 *tag = 0;
+
+  /* Shut up coverity */
+  memset (hwaddr, 0, sizeof (hwaddr));
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "socket %s", &file_name))
+	{
+	  file_name_set = 1;
+	}
+      else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance))
+	;
+      else if (unformat (i, "mac %U", unformat_ethernet_address, hwaddr))
+	use_custom_mac = 1;
+      else if (unformat (i, "server"))
+	is_server = 1;
+      else if (unformat (i, "tag %s", &tag))
+	;
+      else
+	break;
+    }
+
+  if (file_name_set == 0)
+    {
+      errmsg ("missing socket file name");
+      return -99;
+    }
+
+  if (vec_len (file_name) > 255)
+    {
+      errmsg ("socket file name too long");
+      return -99;
+    }
+  vec_add1 (file_name, 0);
+
+  M (CREATE_VHOST_USER_IF, create_vhost_user_if);
+
+  mp->is_server = is_server;
+  clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
+  vec_free (file_name);
+  if (custom_dev_instance != ~0)
+    {
+      mp->renumber = 1;
+      mp->custom_dev_instance = ntohl (custom_dev_instance);
+    }
+  mp->use_custom_mac = use_custom_mac;
+  clib_memcpy (mp->mac_address, hwaddr, 6);
+  if (tag)
+    strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1);
+  vec_free (tag);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_modify_vhost_user_if (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_modify_vhost_user_if_t *mp;
+  f64 timeout;
+  u8 *file_name;
+  u8 is_server = 0;
+  u8 file_name_set = 0;
+  u32 custom_dev_instance = ~0;
+  u8 sw_if_index_set = 0;
+  u32 sw_if_index = (u32) ~ 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "socket %s", &file_name))
+	{
+	  file_name_set = 1;
+	}
+      else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance))
+	;
+      else if (unformat (i, "server"))
+	is_server = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing sw_if_index or interface name");
+      return -99;
+    }
+
+  if (file_name_set == 0)
+    {
+      errmsg ("missing socket file name");
+      return -99;
+    }
+
+  if (vec_len (file_name) > 255)
+    {
+      errmsg ("socket file name too long");
+      return -99;
+    }
+  vec_add1 (file_name, 0);
+
+  M (MODIFY_VHOST_USER_IF, modify_vhost_user_if);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->is_server = is_server;
+  clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
+  vec_free (file_name);
+  if (custom_dev_instance != ~0)
+    {
+      mp->renumber = 1;
+      mp->custom_dev_instance = ntohl (custom_dev_instance);
+    }
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_delete_vhost_user_if (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_delete_vhost_user_if_t *mp;
+  f64 timeout;
+  u32 sw_if_index = ~0;
+  u8 sw_if_index_set = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing sw_if_index or interface name");
+      return -99;
+    }
+
+
+  M (DELETE_VHOST_USER_IF, delete_vhost_user_if);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static void vl_api_sw_interface_vhost_user_details_t_handler
+  (vl_api_sw_interface_vhost_user_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "%-25s %3" PRIu32 " %6" PRIu32 " %8x %6d %7d %s",
+	 (char *) mp->interface_name,
+	 ntohl (mp->sw_if_index), ntohl (mp->virtio_net_hdr_sz),
+	 clib_net_to_host_u64 (mp->features), mp->is_server,
+	 ntohl (mp->num_regions), (char *) mp->sock_filename);
+  print (vam->ofp, "    Status: '%s'", strerror (ntohl (mp->sock_errno)));
+}
+
+static void vl_api_sw_interface_vhost_user_details_t_handler_json
+  (vl_api_sw_interface_vhost_user_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+  vat_json_object_add_string_copy (node, "interface_name",
+				   mp->interface_name);
+  vat_json_object_add_uint (node, "virtio_net_hdr_sz",
+			    ntohl (mp->virtio_net_hdr_sz));
+  vat_json_object_add_uint (node, "features",
+			    clib_net_to_host_u64 (mp->features));
+  vat_json_object_add_uint (node, "is_server", mp->is_server);
+  vat_json_object_add_string_copy (node, "sock_filename", mp->sock_filename);
+  vat_json_object_add_uint (node, "num_regions", ntohl (mp->num_regions));
+  vat_json_object_add_uint (node, "sock_errno", ntohl (mp->sock_errno));
+}
+
+static int
+api_sw_interface_vhost_user_dump (vat_main_t * vam)
+{
+  vl_api_sw_interface_vhost_user_dump_t *mp;
+  f64 timeout;
+  print (vam->ofp,
+	 "Interface name           idx hdr_sz features server regions filename");
+
+  /* Get list of vhost-user interfaces */
+  M (SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump);
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+static int
+api_show_version (vat_main_t * vam)
+{
+  vl_api_show_version_t *mp;
+  f64 timeout;
+
+  M (SHOW_VERSION, show_version);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+
+static int
+api_vxlan_gpe_add_del_tunnel (vat_main_t * vam)
+{
+  unformat_input_t *line_input = vam->input;
+  vl_api_vxlan_gpe_add_del_tunnel_t *mp;
+  f64 timeout;
+  ip4_address_t local4, remote4;
+  ip6_address_t local6, remote6;
+  u8 is_add = 1;
+  u8 ipv4_set = 0, ipv6_set = 0;
+  u8 local_set = 0;
+  u8 remote_set = 0;
+  u32 encap_vrf_id = 0;
+  u32 decap_vrf_id = 0;
+  u8 protocol = ~0;
+  u32 vni;
+  u8 vni_set = 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "local %U",
+			 unformat_ip4_address, &local4))
+	{
+	  local_set = 1;
+	  ipv4_set = 1;
+	}
+      else if (unformat (line_input, "remote %U",
+			 unformat_ip4_address, &remote4))
+	{
+	  remote_set = 1;
+	  ipv4_set = 1;
+	}
+      else if (unformat (line_input, "local %U",
+			 unformat_ip6_address, &local6))
+	{
+	  local_set = 1;
+	  ipv6_set = 1;
+	}
+      else if (unformat (line_input, "remote %U",
+			 unformat_ip6_address, &remote6))
+	{
+	  remote_set = 1;
+	  ipv6_set = 1;
+	}
+      else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
+	;
+      else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id))
+	;
+      else if (unformat (line_input, "vni %d", &vni))
+	vni_set = 1;
+      else if (unformat (line_input, "next-ip4"))
+	protocol = 1;
+      else if (unformat (line_input, "next-ip6"))
+	protocol = 2;
+      else if (unformat (line_input, "next-ethernet"))
+	protocol = 3;
+      else if (unformat (line_input, "next-nsh"))
+	protocol = 4;
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, line_input);
+	  return -99;
+	}
+    }
+
+  if (local_set == 0)
+    {
+      errmsg ("tunnel local address not specified");
+      return -99;
+    }
+  if (remote_set == 0)
+    {
+      errmsg ("tunnel remote address not specified");
+      return -99;
+    }
+  if (ipv4_set && ipv6_set)
+    {
+      errmsg ("both IPv4 and IPv6 addresses specified");
+      return -99;
+    }
+
+  if (vni_set == 0)
+    {
+      errmsg ("vni not specified");
+      return -99;
+    }
+
+  M (VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel);
+
+
+  if (ipv6_set)
+    {
+      clib_memcpy (&mp->local, &local6, sizeof (local6));
+      clib_memcpy (&mp->remote, &remote6, sizeof (remote6));
+    }
+  else
+    {
+      clib_memcpy (&mp->local, &local4, sizeof (local4));
+      clib_memcpy (&mp->remote, &remote4, sizeof (remote4));
+    }
+
+  mp->encap_vrf_id = ntohl (encap_vrf_id);
+  mp->decap_vrf_id = ntohl (decap_vrf_id);
+  mp->protocol = protocol;
+  mp->vni = ntohl (vni);
+  mp->is_add = is_add;
+  mp->is_ipv6 = ipv6_set;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static void vl_api_vxlan_gpe_tunnel_details_t_handler
+  (vl_api_vxlan_gpe_tunnel_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "%11d%24U%24U%13d%12d%14d%14d",
+	 ntohl (mp->sw_if_index),
+	 format_ip46_address, &(mp->local[0]),
+	 format_ip46_address, &(mp->remote[0]),
+	 ntohl (mp->vni),
+	 ntohl (mp->protocol),
+	 ntohl (mp->encap_vrf_id), ntohl (mp->decap_vrf_id));
+}
+
+static void vl_api_vxlan_gpe_tunnel_details_t_handler_json
+  (vl_api_vxlan_gpe_tunnel_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+  struct in_addr ip4;
+  struct in6_addr ip6;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+  if (mp->is_ipv6)
+    {
+      clib_memcpy (&ip6, &(mp->local[0]), sizeof (ip6));
+      vat_json_object_add_ip6 (node, "local", ip6);
+      clib_memcpy (&ip6, &(mp->remote[0]), sizeof (ip6));
+      vat_json_object_add_ip6 (node, "remote", ip6);
+    }
+  else
+    {
+      clib_memcpy (&ip4, &(mp->local[0]), sizeof (ip4));
+      vat_json_object_add_ip4 (node, "local", ip4);
+      clib_memcpy (&ip4, &(mp->remote[0]), sizeof (ip4));
+      vat_json_object_add_ip4 (node, "remote", ip4);
+    }
+  vat_json_object_add_uint (node, "vni", ntohl (mp->vni));
+  vat_json_object_add_uint (node, "protocol", ntohl (mp->protocol));
+  vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id));
+  vat_json_object_add_uint (node, "decap_vrf_id", ntohl (mp->decap_vrf_id));
+  vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0);
+}
+
+static int
+api_vxlan_gpe_tunnel_dump (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_vxlan_gpe_tunnel_dump_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      sw_if_index = ~0;
+    }
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%11s%24s%24s%13s%15s%14s%14s",
+	     "sw_if_index", "local", "remote", "vni",
+	     "protocol", "encap_vrf_id", "decap_vrf_id");
+    }
+
+  /* Get list of vxlan-tunnel interfaces */
+  M (VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump);
+
+  mp->sw_if_index = htonl (sw_if_index);
+
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+u8 *
+format_l2_fib_mac_address (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+
+  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+		 a[2], a[3], a[4], a[5], a[6], a[7]);
+}
+
+static void vl_api_l2_fib_table_entry_t_handler
+  (vl_api_l2_fib_table_entry_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "%3" PRIu32 "    %U    %3" PRIu32
+	 "       %d       %d     %d",
+	 ntohl (mp->bd_id), format_l2_fib_mac_address, &mp->mac,
+	 ntohl (mp->sw_if_index), mp->static_mac, mp->filter_mac,
+	 mp->bvi_mac);
+}
+
+static void vl_api_l2_fib_table_entry_t_handler_json
+  (vl_api_l2_fib_table_entry_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id));
+  vat_json_object_add_uint (node, "mac", clib_net_to_host_u64 (mp->mac));
+  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+  vat_json_object_add_uint (node, "static_mac", mp->static_mac);
+  vat_json_object_add_uint (node, "filter_mac", mp->filter_mac);
+  vat_json_object_add_uint (node, "bvi_mac", mp->bvi_mac);
+}
+
+static int
+api_l2_fib_table_dump (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_l2_fib_table_dump_t *mp;
+  f64 timeout;
+  u32 bd_id;
+  u8 bd_id_set = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "bd_id %d", &bd_id))
+	bd_id_set = 1;
+      else
+	break;
+    }
+
+  if (bd_id_set == 0)
+    {
+      errmsg ("missing bridge domain");
+      return -99;
+    }
+
+  print (vam->ofp, "BD-ID     Mac Address      sw-ndx  Static  Filter  BVI");
+
+  /* Get list of l2 fib entries */
+  M (L2_FIB_TABLE_DUMP, l2_fib_table_dump);
+
+  mp->bd_id = ntohl (bd_id);
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+
+static int
+api_interface_name_renumber (vat_main_t * vam)
+{
+  unformat_input_t *line_input = vam->input;
+  vl_api_interface_name_renumber_t *mp;
+  u32 sw_if_index = ~0;
+  f64 timeout;
+  u32 new_show_dev_instance = ~0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "%U", api_unformat_sw_if_index, vam,
+		    &sw_if_index))
+	;
+      else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+	;
+      else if (unformat (line_input, "new_show_dev_instance %d",
+			 &new_show_dev_instance))
+	;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  if (new_show_dev_instance == ~0)
+    {
+      errmsg ("missing new_show_dev_instance");
+      return -99;
+    }
+
+  M (INTERFACE_NAME_RENUMBER, interface_name_renumber);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->new_show_dev_instance = ntohl (new_show_dev_instance);
+
+  S;
+  W;
+}
+
+static int
+api_want_ip4_arp_events (vat_main_t * vam)
+{
+  unformat_input_t *line_input = vam->input;
+  vl_api_want_ip4_arp_events_t *mp;
+  f64 timeout;
+  ip4_address_t address;
+  int address_set = 0;
+  u32 enable_disable = 1;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "address %U", unformat_ip4_address, &address))
+	address_set = 1;
+      else if (unformat (line_input, "del"))
+	enable_disable = 0;
+      else
+	break;
+    }
+
+  if (address_set == 0)
+    {
+      errmsg ("missing addresses");
+      return -99;
+    }
+
+  M (WANT_IP4_ARP_EVENTS, want_ip4_arp_events);
+  mp->enable_disable = enable_disable;
+  mp->pid = getpid ();
+  mp->address = address.as_u32;
+
+  S;
+  W;
+}
+
+static int
+api_want_ip6_nd_events (vat_main_t * vam)
+{
+  unformat_input_t *line_input = vam->input;
+  vl_api_want_ip6_nd_events_t *mp;
+  f64 timeout;
+  ip6_address_t address;
+  int address_set = 0;
+  u32 enable_disable = 1;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "address %U", unformat_ip6_address, &address))
+	address_set = 1;
+      else if (unformat (line_input, "del"))
+	enable_disable = 0;
+      else
+	break;
+    }
+
+  if (address_set == 0)
+    {
+      errmsg ("missing addresses");
+      return -99;
+    }
+
+  M (WANT_IP6_ND_EVENTS, want_ip6_nd_events);
+  mp->enable_disable = enable_disable;
+  mp->pid = getpid ();
+  clib_memcpy (mp->address, &address, sizeof (ip6_address_t));
+
+  S;
+  W;
+}
+
+static int
+api_input_acl_set_interface (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_input_acl_set_interface_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  int sw_if_index_set;
+  u32 ip4_table_index = ~0;
+  u32 ip6_table_index = ~0;
+  u32 l2_table_index = ~0;
+  u8 is_add = 1;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "ip4-table %d", &ip4_table_index))
+	;
+      else if (unformat (i, "ip6-table %d", &ip6_table_index))
+	;
+      else if (unformat (i, "l2-table %d", &l2_table_index))
+	;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  M (INPUT_ACL_SET_INTERFACE, input_acl_set_interface);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->ip4_table_index = ntohl (ip4_table_index);
+  mp->ip6_table_index = ntohl (ip6_table_index);
+  mp->l2_table_index = ntohl (l2_table_index);
+  mp->is_add = is_add;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_ip_address_dump (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ip_address_dump_t *mp;
+  u32 sw_if_index = ~0;
+  u8 sw_if_index_set = 0;
+  u8 ipv4_set = 0;
+  u8 ipv6_set = 0;
+  f64 timeout;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else
+	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "ipv4"))
+	ipv4_set = 1;
+      else if (unformat (i, "ipv6"))
+	ipv6_set = 1;
+      else
+	break;
+    }
+
+  if (ipv4_set && ipv6_set)
+    {
+      errmsg ("ipv4 and ipv6 flags cannot be both set");
+      return -99;
+    }
+
+  if ((!ipv4_set) && (!ipv6_set))
+    {
+      errmsg ("no ipv4 nor ipv6 flag set");
+      return -99;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  vam->current_sw_if_index = sw_if_index;
+  vam->is_ipv6 = ipv6_set;
+
+  M (IP_ADDRESS_DUMP, ip_address_dump);
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->is_ipv6 = ipv6_set;
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+static int
+api_ip_dump (vat_main_t * vam)
+{
+  vl_api_ip_dump_t *mp;
+  unformat_input_t *in = vam->input;
+  int ipv4_set = 0;
+  int ipv6_set = 0;
+  int is_ipv6;
+  f64 timeout;
+  int i;
+
+  while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (in, "ipv4"))
+	ipv4_set = 1;
+      else if (unformat (in, "ipv6"))
+	ipv6_set = 1;
+      else
+	break;
+    }
+
+  if (ipv4_set && ipv6_set)
+    {
+      errmsg ("ipv4 and ipv6 flags cannot be both set");
+      return -99;
+    }
+
+  if ((!ipv4_set) && (!ipv6_set))
+    {
+      errmsg ("no ipv4 nor ipv6 flag set");
+      return -99;
+    }
+
+  is_ipv6 = ipv6_set;
+  vam->is_ipv6 = is_ipv6;
+
+  /* free old data */
+  for (i = 0; i < vec_len (vam->ip_details_by_sw_if_index[is_ipv6]); i++)
+    {
+      vec_free (vam->ip_details_by_sw_if_index[is_ipv6][i].addr);
+    }
+  vec_free (vam->ip_details_by_sw_if_index[is_ipv6]);
+
+  M (IP_DUMP, ip_dump);
+  mp->is_ipv6 = ipv6_set;
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+static int
+api_ipsec_spd_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ipsec_spd_add_del_t *mp;
+  f64 timeout;
+  u32 spd_id = ~0;
+  u8 is_add = 1;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "spd_id %d", &spd_id))
+	;
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+  if (spd_id == ~0)
+    {
+      errmsg ("spd_id must be set");
+      return -99;
+    }
+
+  M (IPSEC_SPD_ADD_DEL, ipsec_spd_add_del);
+
+  mp->spd_id = ntohl (spd_id);
+  mp->is_add = is_add;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_ipsec_interface_add_del_spd (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ipsec_interface_add_del_spd_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u32 spd_id = (u32) ~ 0;
+  u8 is_add = 1;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "spd_id %d", &spd_id))
+	;
+      else
+	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+
+    }
+
+  if (spd_id == (u32) ~ 0)
+    {
+      errmsg ("spd_id must be set");
+      return -99;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  M (IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd);
+
+  mp->spd_id = ntohl (spd_id);
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->is_add = is_add;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_ipsec_spd_add_del_entry (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ipsec_spd_add_del_entry_t *mp;
+  f64 timeout;
+  u8 is_add = 1, is_outbound = 0, is_ipv6 = 0, is_ip_any = 1;
+  u32 spd_id = 0, sa_id = 0, protocol = 0, policy = 0;
+  i32 priority = 0;
+  u32 rport_start = 0, rport_stop = (u32) ~ 0;
+  u32 lport_start = 0, lport_stop = (u32) ~ 0;
+  ip4_address_t laddr4_start, laddr4_stop, raddr4_start, raddr4_stop;
+  ip6_address_t laddr6_start, laddr6_stop, raddr6_start, raddr6_stop;
+
+  laddr4_start.as_u32 = raddr4_start.as_u32 = 0;
+  laddr4_stop.as_u32 = raddr4_stop.as_u32 = (u32) ~ 0;
+  laddr6_start.as_u64[0] = raddr6_start.as_u64[0] = 0;
+  laddr6_start.as_u64[1] = raddr6_start.as_u64[1] = 0;
+  laddr6_stop.as_u64[0] = raddr6_stop.as_u64[0] = (u64) ~ 0;
+  laddr6_stop.as_u64[1] = raddr6_stop.as_u64[1] = (u64) ~ 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "del"))
+	is_add = 0;
+      if (unformat (i, "outbound"))
+	is_outbound = 1;
+      if (unformat (i, "inbound"))
+	is_outbound = 0;
+      else if (unformat (i, "spd_id %d", &spd_id))
+	;
+      else if (unformat (i, "sa_id %d", &sa_id))
+	;
+      else if (unformat (i, "priority %d", &priority))
+	;
+      else if (unformat (i, "protocol %d", &protocol))
+	;
+      else if (unformat (i, "lport_start %d", &lport_start))
+	;
+      else if (unformat (i, "lport_stop %d", &lport_stop))
+	;
+      else if (unformat (i, "rport_start %d", &rport_start))
+	;
+      else if (unformat (i, "rport_stop %d", &rport_stop))
+	;
+      else
+	if (unformat
+	    (i, "laddr_start %U", unformat_ip4_address, &laddr4_start))
+	{
+	  is_ipv6 = 0;
+	  is_ip_any = 0;
+	}
+      else
+	if (unformat (i, "laddr_stop %U", unformat_ip4_address, &laddr4_stop))
+	{
+	  is_ipv6 = 0;
+	  is_ip_any = 0;
+	}
+      else
+	if (unformat
+	    (i, "raddr_start %U", unformat_ip4_address, &raddr4_start))
+	{
+	  is_ipv6 = 0;
+	  is_ip_any = 0;
+	}
+      else
+	if (unformat (i, "raddr_stop %U", unformat_ip4_address, &raddr4_stop))
+	{
+	  is_ipv6 = 0;
+	  is_ip_any = 0;
+	}
+      else
+	if (unformat
+	    (i, "laddr_start %U", unformat_ip6_address, &laddr6_start))
+	{
+	  is_ipv6 = 1;
+	  is_ip_any = 0;
+	}
+      else
+	if (unformat (i, "laddr_stop %U", unformat_ip6_address, &laddr6_stop))
+	{
+	  is_ipv6 = 1;
+	  is_ip_any = 0;
+	}
+      else
+	if (unformat
+	    (i, "raddr_start %U", unformat_ip6_address, &raddr6_start))
+	{
+	  is_ipv6 = 1;
+	  is_ip_any = 0;
+	}
+      else
+	if (unformat (i, "raddr_stop %U", unformat_ip6_address, &raddr6_stop))
+	{
+	  is_ipv6 = 1;
+	  is_ip_any = 0;
+	}
+      else
+	if (unformat (i, "action %U", unformat_ipsec_policy_action, &policy))
+	{
+	  if (policy == IPSEC_POLICY_ACTION_RESOLVE)
+	    {
+	      clib_warning ("unsupported action: 'resolve'");
+	      return -99;
+	    }
+	}
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+
+    }
+
+  M (IPSEC_SPD_ADD_DEL_ENTRY, ipsec_spd_add_del_entry);
+
+  mp->spd_id = ntohl (spd_id);
+  mp->priority = ntohl (priority);
+  mp->is_outbound = is_outbound;
+
+  mp->is_ipv6 = is_ipv6;
+  if (is_ipv6 || is_ip_any)
+    {
+      clib_memcpy (mp->remote_address_start, &raddr6_start,
+		   sizeof (ip6_address_t));
+      clib_memcpy (mp->remote_address_stop, &raddr6_stop,
+		   sizeof (ip6_address_t));
+      clib_memcpy (mp->local_address_start, &laddr6_start,
+		   sizeof (ip6_address_t));
+      clib_memcpy (mp->local_address_stop, &laddr6_stop,
+		   sizeof (ip6_address_t));
+    }
+  else
+    {
+      clib_memcpy (mp->remote_address_start, &raddr4_start,
+		   sizeof (ip4_address_t));
+      clib_memcpy (mp->remote_address_stop, &raddr4_stop,
+		   sizeof (ip4_address_t));
+      clib_memcpy (mp->local_address_start, &laddr4_start,
+		   sizeof (ip4_address_t));
+      clib_memcpy (mp->local_address_stop, &laddr4_stop,
+		   sizeof (ip4_address_t));
+    }
+  mp->protocol = (u8) protocol;
+  mp->local_port_start = ntohs ((u16) lport_start);
+  mp->local_port_stop = ntohs ((u16) lport_stop);
+  mp->remote_port_start = ntohs ((u16) rport_start);
+  mp->remote_port_stop = ntohs ((u16) rport_stop);
+  mp->policy = (u8) policy;
+  mp->sa_id = ntohl (sa_id);
+  mp->is_add = is_add;
+  mp->is_ip_any = is_ip_any;
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_ipsec_sad_add_del_entry (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ipsec_sad_add_del_entry_t *mp;
+  f64 timeout;
+  u32 sad_id = 0, spi = 0;
+  u8 *ck = 0, *ik = 0;
+  u8 is_add = 1;
+
+  u8 protocol = IPSEC_PROTOCOL_AH;
+  u8 is_tunnel = 0, is_tunnel_ipv6 = 0;
+  u32 crypto_alg = 0, integ_alg = 0;
+  ip4_address_t tun_src4;
+  ip4_address_t tun_dst4;
+  ip6_address_t tun_src6;
+  ip6_address_t tun_dst6;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "sad_id %d", &sad_id))
+	;
+      else if (unformat (i, "spi %d", &spi))
+	;
+      else if (unformat (i, "esp"))
+	protocol = IPSEC_PROTOCOL_ESP;
+      else if (unformat (i, "tunnel_src %U", unformat_ip4_address, &tun_src4))
+	{
+	  is_tunnel = 1;
+	  is_tunnel_ipv6 = 0;
+	}
+      else if (unformat (i, "tunnel_dst %U", unformat_ip4_address, &tun_dst4))
+	{
+	  is_tunnel = 1;
+	  is_tunnel_ipv6 = 0;
+	}
+      else if (unformat (i, "tunnel_src %U", unformat_ip6_address, &tun_src6))
+	{
+	  is_tunnel = 1;
+	  is_tunnel_ipv6 = 1;
+	}
+      else if (unformat (i, "tunnel_dst %U", unformat_ip6_address, &tun_dst6))
+	{
+	  is_tunnel = 1;
+	  is_tunnel_ipv6 = 1;
+	}
+      else
+	if (unformat
+	    (i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg))
+	{
+	  if (crypto_alg < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
+	      crypto_alg >= IPSEC_CRYPTO_N_ALG)
+	    {
+	      clib_warning ("unsupported crypto-alg: '%U'",
+			    format_ipsec_crypto_alg, crypto_alg);
+	      return -99;
+	    }
+	}
+      else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
+	;
+      else
+	if (unformat
+	    (i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg))
+	{
+#if DPDK_CRYPTO==1
+	  if (integ_alg < IPSEC_INTEG_ALG_NONE ||
+#else
+	  if (integ_alg < IPSEC_INTEG_ALG_SHA1_96 ||
+#endif
+	      integ_alg >= IPSEC_INTEG_N_ALG)
+	    {
+	      clib_warning ("unsupported integ-alg: '%U'",
+			    format_ipsec_integ_alg, integ_alg);
+	      return -99;
+	    }
+	}
+      else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
+	;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+
+    }
+
+#if DPDK_CRYPTO==1
+  /*Special cases, aes-gcm-128 encryption */
+  if (crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
+    {
+      if (integ_alg != IPSEC_INTEG_ALG_NONE
+	  && integ_alg != IPSEC_INTEG_ALG_AES_GCM_128)
+	{
+	  clib_warning
+	    ("unsupported: aes-gcm-128 crypto-alg needs none as integ-alg");
+	  return -99;
+	}
+      else			/*set integ-alg internally to aes-gcm-128 */
+	integ_alg = IPSEC_INTEG_ALG_AES_GCM_128;
+    }
+  else if (integ_alg == IPSEC_INTEG_ALG_AES_GCM_128)
+    {
+      clib_warning ("unsupported integ-alg: aes-gcm-128");
+      return -99;
+    }
+  else if (integ_alg == IPSEC_INTEG_ALG_NONE)
+    {
+      clib_warning ("unsupported integ-alg: none");
+      return -99;
+    }
+#endif
+
+
+  M (IPSEC_SAD_ADD_DEL_ENTRY, ipsec_sad_add_del_entry);
+
+  mp->sad_id = ntohl (sad_id);
+  mp->is_add = is_add;
+  mp->protocol = protocol;
+  mp->spi = ntohl (spi);
+  mp->is_tunnel = is_tunnel;
+  mp->is_tunnel_ipv6 = is_tunnel_ipv6;
+  mp->crypto_algorithm = crypto_alg;
+  mp->integrity_algorithm = integ_alg;
+  mp->crypto_key_length = vec_len (ck);
+  mp->integrity_key_length = vec_len (ik);
+
+  if (mp->crypto_key_length > sizeof (mp->crypto_key))
+    mp->crypto_key_length = sizeof (mp->crypto_key);
+
+  if (mp->integrity_key_length > sizeof (mp->integrity_key))
+    mp->integrity_key_length = sizeof (mp->integrity_key);
+
+  if (ck)
+    clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
+  if (ik)
+    clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
+
+  if (is_tunnel)
+    {
+      if (is_tunnel_ipv6)
+	{
+	  clib_memcpy (mp->tunnel_src_address, &tun_src6,
+		       sizeof (ip6_address_t));
+	  clib_memcpy (mp->tunnel_dst_address, &tun_dst6,
+		       sizeof (ip6_address_t));
+	}
+      else
+	{
+	  clib_memcpy (mp->tunnel_src_address, &tun_src4,
+		       sizeof (ip4_address_t));
+	  clib_memcpy (mp->tunnel_dst_address, &tun_dst4,
+		       sizeof (ip4_address_t));
+	}
+    }
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_ipsec_sa_set_key (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ipsec_sa_set_key_t *mp;
+  f64 timeout;
+  u32 sa_id;
+  u8 *ck = 0, *ik = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "sa_id %d", &sa_id))
+	;
+      else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
+	;
+      else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
+	;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  M (IPSEC_SA_SET_KEY, ipsec_set_sa_key);
+
+  mp->sa_id = ntohl (sa_id);
+  mp->crypto_key_length = vec_len (ck);
+  mp->integrity_key_length = vec_len (ik);
+
+  if (mp->crypto_key_length > sizeof (mp->crypto_key))
+    mp->crypto_key_length = sizeof (mp->crypto_key);
+
+  if (mp->integrity_key_length > sizeof (mp->integrity_key))
+    mp->integrity_key_length = sizeof (mp->integrity_key);
+
+  if (ck)
+    clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
+  if (ik)
+    clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_ikev2_profile_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ikev2_profile_add_del_t *mp;
+  f64 timeout;
+  u8 is_add = 1;
+  u8 *name = 0;
+
+  const char *valid_chars = "a-zA-Z0-9_";
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "name %U", unformat_token, valid_chars, &name))
+	vec_add1 (name, 0);
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (!vec_len (name))
+    {
+      errmsg ("profile name must be specified");
+      return -99;
+    }
+
+  if (vec_len (name) > 64)
+    {
+      errmsg ("profile name too long");
+      return -99;
+    }
+
+  M (IKEV2_PROFILE_ADD_DEL, ikev2_profile_add_del);
+
+  clib_memcpy (mp->name, name, vec_len (name));
+  mp->is_add = is_add;
+  vec_free (name);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_ikev2_profile_set_auth (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ikev2_profile_set_auth_t *mp;
+  f64 timeout;
+  u8 *name = 0;
+  u8 *data = 0;
+  u32 auth_method = 0;
+  u8 is_hex = 0;
+
+  const char *valid_chars = "a-zA-Z0-9_";
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "name %U", unformat_token, valid_chars, &name))
+	vec_add1 (name, 0);
+      else if (unformat (i, "auth_method %U",
+			 unformat_ikev2_auth_method, &auth_method))
+	;
+      else if (unformat (i, "auth_data 0x%U", unformat_hex_string, &data))
+	is_hex = 1;
+      else if (unformat (i, "auth_data %v", &data))
+	;
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (!vec_len (name))
+    {
+      errmsg ("profile name must be specified");
+      return -99;
+    }
+
+  if (vec_len (name) > 64)
+    {
+      errmsg ("profile name too long");
+      return -99;
+    }
+
+  if (!vec_len (data))
+    {
+      errmsg ("auth_data must be specified");
+      return -99;
+    }
+
+  if (!auth_method)
+    {
+      errmsg ("auth_method must be specified");
+      return -99;
+    }
+
+  M (IKEV2_PROFILE_SET_AUTH, ikev2_profile_set_auth);
+
+  mp->is_hex = is_hex;
+  mp->auth_method = (u8) auth_method;
+  mp->data_len = vec_len (data);
+  clib_memcpy (mp->name, name, vec_len (name));
+  clib_memcpy (mp->data, data, vec_len (data));
+  vec_free (name);
+  vec_free (data);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_ikev2_profile_set_id (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ikev2_profile_set_id_t *mp;
+  f64 timeout;
+  u8 *name = 0;
+  u8 *data = 0;
+  u8 is_local = 0;
+  u32 id_type = 0;
+  ip4_address_t ip4;
+
+  const char *valid_chars = "a-zA-Z0-9_";
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "name %U", unformat_token, valid_chars, &name))
+	vec_add1 (name, 0);
+      else if (unformat (i, "id_type %U", unformat_ikev2_id_type, &id_type))
+	;
+      else if (unformat (i, "id_data %U", unformat_ip4_address, &ip4))
+	{
+	  data = vec_new (u8, 4);
+	  clib_memcpy (data, ip4.as_u8, 4);
+	}
+      else if (unformat (i, "id_data 0x%U", unformat_hex_string, &data))
+	;
+      else if (unformat (i, "id_data %v", &data))
+	;
+      else if (unformat (i, "local"))
+	is_local = 1;
+      else if (unformat (i, "remote"))
+	is_local = 0;
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (!vec_len (name))
+    {
+      errmsg ("profile name must be specified");
+      return -99;
+    }
+
+  if (vec_len (name) > 64)
+    {
+      errmsg ("profile name too long");
+      return -99;
+    }
+
+  if (!vec_len (data))
+    {
+      errmsg ("id_data must be specified");
+      return -99;
+    }
+
+  if (!id_type)
+    {
+      errmsg ("id_type must be specified");
+      return -99;
+    }
+
+  M (IKEV2_PROFILE_SET_ID, ikev2_profile_set_id);
+
+  mp->is_local = is_local;
+  mp->id_type = (u8) id_type;
+  mp->data_len = vec_len (data);
+  clib_memcpy (mp->name, name, vec_len (name));
+  clib_memcpy (mp->data, data, vec_len (data));
+  vec_free (name);
+  vec_free (data);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_ikev2_profile_set_ts (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ikev2_profile_set_ts_t *mp;
+  f64 timeout;
+  u8 *name = 0;
+  u8 is_local = 0;
+  u32 proto = 0, start_port = 0, end_port = (u32) ~ 0;
+  ip4_address_t start_addr, end_addr;
+
+  const char *valid_chars = "a-zA-Z0-9_";
+
+  start_addr.as_u32 = 0;
+  end_addr.as_u32 = (u32) ~ 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "name %U", unformat_token, valid_chars, &name))
+	vec_add1 (name, 0);
+      else if (unformat (i, "protocol %d", &proto))
+	;
+      else if (unformat (i, "start_port %d", &start_port))
+	;
+      else if (unformat (i, "end_port %d", &end_port))
+	;
+      else
+	if (unformat (i, "start_addr %U", unformat_ip4_address, &start_addr))
+	;
+      else if (unformat (i, "end_addr %U", unformat_ip4_address, &end_addr))
+	;
+      else if (unformat (i, "local"))
+	is_local = 1;
+      else if (unformat (i, "remote"))
+	is_local = 0;
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (!vec_len (name))
+    {
+      errmsg ("profile name must be specified");
+      return -99;
+    }
+
+  if (vec_len (name) > 64)
+    {
+      errmsg ("profile name too long");
+      return -99;
+    }
+
+  M (IKEV2_PROFILE_SET_TS, ikev2_profile_set_ts);
+
+  mp->is_local = is_local;
+  mp->proto = (u8) proto;
+  mp->start_port = (u16) start_port;
+  mp->end_port = (u16) end_port;
+  mp->start_addr = start_addr.as_u32;
+  mp->end_addr = end_addr.as_u32;
+  clib_memcpy (mp->name, name, vec_len (name));
+  vec_free (name);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_ikev2_set_local_key (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ikev2_set_local_key_t *mp;
+  f64 timeout;
+  u8 *file = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "file %v", &file))
+	vec_add1 (file, 0);
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (!vec_len (file))
+    {
+      errmsg ("RSA key file must be specified");
+      return -99;
+    }
+
+  if (vec_len (file) > 256)
+    {
+      errmsg ("file name too long");
+      return -99;
+    }
+
+  M (IKEV2_SET_LOCAL_KEY, ikev2_set_local_key);
+
+  clib_memcpy (mp->key_file, file, vec_len (file));
+  vec_free (file);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+/*
+ * MAP
+ */
+static int
+api_map_add_domain (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_map_add_domain_t *mp;
+  f64 timeout;
+
+  ip4_address_t ip4_prefix;
+  ip6_address_t ip6_prefix;
+  ip6_address_t ip6_src;
+  u32 num_m_args = 0;
+  u32 ip6_prefix_len = 0, ip4_prefix_len = 0, ea_bits_len = 0, psid_offset =
+    0, psid_length = 0;
+  u8 is_translation = 0;
+  u32 mtu = 0;
+  u32 ip6_src_len = 128;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "ip4-pfx %U/%d", unformat_ip4_address,
+		    &ip4_prefix, &ip4_prefix_len))
+	num_m_args++;
+      else if (unformat (i, "ip6-pfx %U/%d", unformat_ip6_address,
+			 &ip6_prefix, &ip6_prefix_len))
+	num_m_args++;
+      else
+	if (unformat
+	    (i, "ip6-src %U/%d", unformat_ip6_address, &ip6_src,
+	     &ip6_src_len))
+	num_m_args++;
+      else if (unformat (i, "ip6-src %U", unformat_ip6_address, &ip6_src))
+	num_m_args++;
+      else if (unformat (i, "ea-bits-len %d", &ea_bits_len))
+	num_m_args++;
+      else if (unformat (i, "psid-offset %d", &psid_offset))
+	num_m_args++;
+      else if (unformat (i, "psid-len %d", &psid_length))
+	num_m_args++;
+      else if (unformat (i, "mtu %d", &mtu))
+	num_m_args++;
+      else if (unformat (i, "map-t"))
+	is_translation = 1;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (num_m_args < 3)
+    {
+      errmsg ("mandatory argument(s) missing");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (MAP_ADD_DOMAIN, map_add_domain);
+
+  clib_memcpy (mp->ip4_prefix, &ip4_prefix, sizeof (ip4_prefix));
+  mp->ip4_prefix_len = ip4_prefix_len;
+
+  clib_memcpy (mp->ip6_prefix, &ip6_prefix, sizeof (ip6_prefix));
+  mp->ip6_prefix_len = ip6_prefix_len;
+
+  clib_memcpy (mp->ip6_src, &ip6_src, sizeof (ip6_src));
+  mp->ip6_src_prefix_len = ip6_src_len;
+
+  mp->ea_bits_len = ea_bits_len;
+  mp->psid_offset = psid_offset;
+  mp->psid_length = psid_length;
+  mp->is_translation = is_translation;
+  mp->mtu = htons (mtu);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return good/bad news  */
+  W;
+}
+
+static int
+api_map_del_domain (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_map_del_domain_t *mp;
+  f64 timeout;
+
+  u32 num_m_args = 0;
+  u32 index;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "index %d", &index))
+	num_m_args++;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (num_m_args != 1)
+    {
+      errmsg ("mandatory argument(s) missing");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (MAP_DEL_DOMAIN, map_del_domain);
+
+  mp->index = ntohl (index);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return good/bad news  */
+  W;
+}
+
+static int
+api_map_add_del_rule (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_map_add_del_rule_t *mp;
+  f64 timeout;
+  u8 is_add = 1;
+  ip6_address_t ip6_dst;
+  u32 num_m_args = 0, index, psid = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "index %d", &index))
+	num_m_args++;
+      else if (unformat (i, "psid %d", &psid))
+	num_m_args++;
+      else if (unformat (i, "dst %U", unformat_ip6_address, &ip6_dst))
+	num_m_args++;
+      else if (unformat (i, "del"))
+	{
+	  is_add = 0;
+	}
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  /* Construct the API message */
+  M (MAP_ADD_DEL_RULE, map_add_del_rule);
+
+  mp->index = ntohl (index);
+  mp->is_add = is_add;
+  clib_memcpy (mp->ip6_dst, &ip6_dst, sizeof (ip6_dst));
+  mp->psid = ntohs (psid);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply, return good/bad news  */
+  W;
+}
+
+static int
+api_map_domain_dump (vat_main_t * vam)
+{
+  vl_api_map_domain_dump_t *mp;
+  f64 timeout;
+
+  /* Construct the API message */
+  M (MAP_DOMAIN_DUMP, map_domain_dump);
+
+  /* send it... */
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+static int
+api_map_rule_dump (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_map_rule_dump_t *mp;
+  f64 timeout;
+  u32 domain_index = ~0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "index %u", &domain_index))
+	;
+      else
+	break;
+    }
+
+  if (domain_index == ~0)
+    {
+      clib_warning ("parse error: domain index expected");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (MAP_RULE_DUMP, map_rule_dump);
+
+  mp->domain_index = htonl (domain_index);
+
+  /* send it... */
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+static void vl_api_map_add_domain_reply_t_handler
+  (vl_api_map_add_domain_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_map_add_domain_reply_t_handler_json
+  (vl_api_map_add_domain_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+  vat_json_object_add_uint (&node, "index", ntohl (mp->index));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+
+  vam->retval = ntohl (mp->retval);
+  vam->result_ready = 1;
+}
+
+static int
+api_get_first_msg_id (vat_main_t * vam)
+{
+  vl_api_get_first_msg_id_t *mp;
+  f64 timeout;
+  unformat_input_t *i = vam->input;
+  u8 *name;
+  u8 name_set = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "client %s", &name))
+	name_set = 1;
+      else
+	break;
+    }
+
+  if (name_set == 0)
+    {
+      errmsg ("missing client name");
+      return -99;
+    }
+  vec_add1 (name, 0);
+
+  if (vec_len (name) > 63)
+    {
+      errmsg ("client name too long");
+      return -99;
+    }
+
+  M (GET_FIRST_MSG_ID, get_first_msg_id);
+  clib_memcpy (mp->name, name, vec_len (name));
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_cop_interface_enable_disable (vat_main_t * vam)
+{
+  unformat_input_t *line_input = vam->input;
+  vl_api_cop_interface_enable_disable_t *mp;
+  f64 timeout;
+  u32 sw_if_index = ~0;
+  u8 enable_disable = 1;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "disable"))
+	enable_disable = 0;
+      if (unformat (line_input, "enable"))
+	enable_disable = 1;
+      else if (unformat (line_input, "%U", api_unformat_sw_if_index,
+			 vam, &sw_if_index))
+	;
+      else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+	;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable);
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->enable_disable = enable_disable;
+
+  /* send it... */
+  S;
+  /* Wait for the reply */
+  W;
+}
+
+static int
+api_cop_whitelist_enable_disable (vat_main_t * vam)
+{
+  unformat_input_t *line_input = vam->input;
+  vl_api_cop_whitelist_enable_disable_t *mp;
+  f64 timeout;
+  u32 sw_if_index = ~0;
+  u8 ip4 = 0, ip6 = 0, default_cop = 0;
+  u32 fib_id = 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "ip4"))
+	ip4 = 1;
+      else if (unformat (line_input, "ip6"))
+	ip6 = 1;
+      else if (unformat (line_input, "default"))
+	default_cop = 1;
+      else if (unformat (line_input, "%U", api_unformat_sw_if_index,
+			 vam, &sw_if_index))
+	;
+      else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+	;
+      else if (unformat (line_input, "fib-id %d", &fib_id))
+	;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable);
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->fib_id = ntohl (fib_id);
+  mp->ip4 = ip4;
+  mp->ip6 = ip6;
+  mp->default_cop = default_cop;
+
+  /* send it... */
+  S;
+  /* Wait for the reply */
+  W;
+}
+
+static int
+api_get_node_graph (vat_main_t * vam)
+{
+  vl_api_get_node_graph_t *mp;
+  f64 timeout;
+
+  M (GET_NODE_GRAPH, get_node_graph);
+
+  /* send it... */
+  S;
+  /* Wait for the reply */
+  W;
+}
+
+/* *INDENT-OFF* */
+/** Used for parsing LISP eids */
+typedef CLIB_PACKED(struct{
+  u8 addr[16];   /**< eid address */
+  u32 len;       /**< prefix length if IP */
+  u8 type;      /**< type of eid */
+}) lisp_eid_vat_t;
+/* *INDENT-ON* */
+
+static uword
+unformat_lisp_eid_vat (unformat_input_t * input, va_list * args)
+{
+  lisp_eid_vat_t *a = va_arg (*args, lisp_eid_vat_t *);
+
+  memset (a, 0, sizeof (a[0]));
+
+  if (unformat (input, "%U/%d", unformat_ip4_address, a->addr, &a->len))
+    {
+      a->type = 0;		/* ipv4 type */
+    }
+  else if (unformat (input, "%U/%d", unformat_ip6_address, a->addr, &a->len))
+    {
+      a->type = 1;		/* ipv6 type */
+    }
+  else if (unformat (input, "%U", unformat_ethernet_address, a->addr))
+    {
+      a->type = 2;		/* mac type */
+    }
+  else
+    {
+      return 0;
+    }
+
+  if ((a->type == 0 && a->len > 32) || (a->type == 1 && a->len > 128))
+    {
+      return 0;
+    }
+
+  return 1;
+}
+
+static int
+lisp_eid_size_vat (u8 type)
+{
+  switch (type)
+    {
+    case 0:
+      return 4;
+    case 1:
+      return 16;
+    case 2:
+      return 6;
+    }
+  return 0;
+}
+
+static void
+lisp_eid_put_vat (u8 * dst, u8 eid[16], u8 type)
+{
+  clib_memcpy (dst, eid, lisp_eid_size_vat (type));
+}
+
+/* *INDENT-OFF* */
+/** Used for transferring locators via VPP API */
+typedef CLIB_PACKED(struct
+{
+  u32 sw_if_index; /**< locator sw_if_index */
+  u8 priority; /**< locator priority */
+  u8 weight;   /**< locator weight */
+}) ls_locator_t;
+/* *INDENT-ON* */
+
+static int
+api_lisp_add_del_locator_set (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_add_del_locator_set_t *mp;
+  f64 timeout = ~0;
+  u8 is_add = 1;
+  u8 *locator_set_name = NULL;
+  u8 locator_set_name_set = 0;
+  ls_locator_t locator, *locators = 0;
+  u32 sw_if_index, priority, weight;
+  u32 data_len = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	{
+	  is_add = 0;
+	}
+      else if (unformat (input, "locator-set %s", &locator_set_name))
+	{
+	  locator_set_name_set = 1;
+	}
+      else if (unformat (input, "sw_if_index %u p %u w %u",
+			 &sw_if_index, &priority, &weight))
+	{
+	  locator.sw_if_index = htonl (sw_if_index);
+	  locator.priority = priority;
+	  locator.weight = weight;
+	  vec_add1 (locators, locator);
+	}
+      else
+	if (unformat
+	    (input, "iface %U p %u w %u", api_unformat_sw_if_index, vam,
+	     &sw_if_index, &priority, &weight))
+	{
+	  locator.sw_if_index = htonl (sw_if_index);
+	  locator.priority = priority;
+	  locator.weight = weight;
+	  vec_add1 (locators, locator);
+	}
+      else
+	break;
+    }
+
+  if (locator_set_name_set == 0)
+    {
+      errmsg ("missing locator-set name");
+      vec_free (locators);
+      return -99;
+    }
+
+  if (vec_len (locator_set_name) > 64)
+    {
+      errmsg ("locator-set name too long");
+      vec_free (locator_set_name);
+      vec_free (locators);
+      return -99;
+    }
+  vec_add1 (locator_set_name, 0);
+
+  data_len = sizeof (ls_locator_t) * vec_len (locators);
+
+  /* Construct the API message */
+  M2 (LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set, data_len);
+
+  mp->is_add = is_add;
+  clib_memcpy (mp->locator_set_name, locator_set_name,
+	       vec_len (locator_set_name));
+  vec_free (locator_set_name);
+
+  mp->locator_num = clib_host_to_net_u32 (vec_len (locators));
+  if (locators)
+    clib_memcpy (mp->locators, locators, data_len);
+  vec_free (locators);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_add_del_locator (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_add_del_locator_t *mp;
+  f64 timeout = ~0;
+  u32 tmp_if_index = ~0;
+  u32 sw_if_index = ~0;
+  u8 sw_if_index_set = 0;
+  u8 sw_if_index_if_name_set = 0;
+  u32 priority = ~0;
+  u8 priority_set = 0;
+  u32 weight = ~0;
+  u8 weight_set = 0;
+  u8 is_add = 1;
+  u8 *locator_set_name = NULL;
+  u8 locator_set_name_set = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	{
+	  is_add = 0;
+	}
+      else if (unformat (input, "locator-set %s", &locator_set_name))
+	{
+	  locator_set_name_set = 1;
+	}
+      else if (unformat (input, "iface %U", api_unformat_sw_if_index, vam,
+			 &tmp_if_index))
+	{
+	  sw_if_index_if_name_set = 1;
+	  sw_if_index = tmp_if_index;
+	}
+      else if (unformat (input, "sw_if_index %d", &tmp_if_index))
+	{
+	  sw_if_index_set = 1;
+	  sw_if_index = tmp_if_index;
+	}
+      else if (unformat (input, "p %d", &priority))
+	{
+	  priority_set = 1;
+	}
+      else if (unformat (input, "w %d", &weight))
+	{
+	  weight_set = 1;
+	}
+      else
+	break;
+    }
+
+  if (locator_set_name_set == 0)
+    {
+      errmsg ("missing locator-set name");
+      return -99;
+    }
+
+  if (sw_if_index_set == 0 && sw_if_index_if_name_set == 0)
+    {
+      errmsg ("missing sw_if_index");
+      vec_free (locator_set_name);
+      return -99;
+    }
+
+  if (sw_if_index_set != 0 && sw_if_index_if_name_set != 0)
+    {
+      errmsg ("cannot use both params interface name and sw_if_index");
+      vec_free (locator_set_name);
+      return -99;
+    }
+
+  if (priority_set == 0)
+    {
+      errmsg ("missing locator-set priority");
+      vec_free (locator_set_name);
+      return -99;
+    }
+
+  if (weight_set == 0)
+    {
+      errmsg ("missing locator-set weight");
+      vec_free (locator_set_name);
+      return -99;
+    }
+
+  if (vec_len (locator_set_name) > 64)
+    {
+      errmsg ("locator-set name too long");
+      vec_free (locator_set_name);
+      return -99;
+    }
+  vec_add1 (locator_set_name, 0);
+
+  /* Construct the API message */
+  M (LISP_ADD_DEL_LOCATOR, lisp_add_del_locator);
+
+  mp->is_add = is_add;
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->priority = priority;
+  mp->weight = weight;
+  clib_memcpy (mp->locator_set_name, locator_set_name,
+	       vec_len (locator_set_name));
+  vec_free (locator_set_name);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+uword
+unformat_hmac_key_id (unformat_input_t * input, va_list * args)
+{
+  u32 *key_id = va_arg (*args, u32 *);
+  u8 *s = 0;
+
+  if (unformat (input, "%s", &s))
+    {
+      if (!strcmp ((char *) s, "sha1"))
+	key_id[0] = HMAC_SHA_1_96;
+      else if (!strcmp ((char *) s, "sha256"))
+	key_id[0] = HMAC_SHA_256_128;
+      else
+	{
+	  clib_warning ("invalid key_id: '%s'", s);
+	  key_id[0] = HMAC_NO_KEY;
+	}
+    }
+  else
+    return 0;
+
+  vec_free (s);
+  return 1;
+}
+
+static int
+api_lisp_add_del_local_eid (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_add_del_local_eid_t *mp;
+  f64 timeout = ~0;
+  u8 is_add = 1;
+  u8 eid_set = 0;
+  lisp_eid_vat_t _eid, *eid = &_eid;
+  u8 *locator_set_name = 0;
+  u8 locator_set_name_set = 0;
+  u32 vni = 0;
+  u16 key_id = 0;
+  u8 *key = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	{
+	  is_add = 0;
+	}
+      else if (unformat (input, "vni %d", &vni))
+	{
+	  ;
+	}
+      else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid))
+	{
+	  eid_set = 1;
+	}
+      else if (unformat (input, "locator-set %s", &locator_set_name))
+	{
+	  locator_set_name_set = 1;
+	}
+      else if (unformat (input, "key-id %U", unformat_hmac_key_id, &key_id))
+	;
+      else if (unformat (input, "secret-key %_%v%_", &key))
+	;
+      else
+	break;
+    }
+
+  if (locator_set_name_set == 0)
+    {
+      errmsg ("missing locator-set name");
+      return -99;
+    }
+
+  if (0 == eid_set)
+    {
+      errmsg ("EID address not set!");
+      vec_free (locator_set_name);
+      return -99;
+    }
+
+  if (key && (0 == key_id))
+    {
+      errmsg ("invalid key_id!");
+      return -99;
+    }
+
+  if (vec_len (key) > 64)
+    {
+      errmsg ("key too long");
+      vec_free (key);
+      return -99;
+    }
+
+  if (vec_len (locator_set_name) > 64)
+    {
+      errmsg ("locator-set name too long");
+      vec_free (locator_set_name);
+      return -99;
+    }
+  vec_add1 (locator_set_name, 0);
+
+  /* Construct the API message */
+  M (LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid);
+
+  mp->is_add = is_add;
+  lisp_eid_put_vat (mp->eid, eid->addr, eid->type);
+  mp->eid_type = eid->type;
+  mp->prefix_len = eid->len;
+  mp->vni = clib_host_to_net_u32 (vni);
+  mp->key_id = clib_host_to_net_u16 (key_id);
+  clib_memcpy (mp->locator_set_name, locator_set_name,
+	       vec_len (locator_set_name));
+  clib_memcpy (mp->key, key, vec_len (key));
+
+  vec_free (locator_set_name);
+  vec_free (key);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+/* *INDENT-OFF* */
+/** Used for transferring locators via VPP API */
+typedef CLIB_PACKED(struct
+{
+  u8 is_ip4; /**< is locator an IPv4 address? */
+  u8 priority; /**< locator priority */
+  u8 weight;   /**< locator weight */
+  u8 addr[16]; /**< IPv4/IPv6 address */
+}) rloc_t;
+/* *INDENT-ON* */
+
+static int
+api_lisp_gpe_add_del_fwd_entry (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_gpe_add_del_fwd_entry_t *mp;
+  f64 timeout = ~0;
+  u8 is_add = 1;
+  lisp_eid_vat_t _rmt_eid, *rmt_eid = &_rmt_eid;
+  lisp_eid_vat_t _lcl_eid, *lcl_eid = &_lcl_eid;
+  u8 rmt_eid_set = 0, lcl_eid_set = 0;
+  u32 action = ~0, p, w;
+  ip4_address_t rmt_rloc4, lcl_rloc4;
+  ip6_address_t rmt_rloc6, lcl_rloc6;
+  rloc_t *rmt_locs = 0, *lcl_locs = 0, rloc, *curr_rloc = 0;
+
+  memset (&rloc, 0, sizeof (rloc));
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	{
+	  is_add = 0;
+	}
+      else if (unformat (input, "rmt_eid %U", unformat_lisp_eid_vat, rmt_eid))
+	{
+	  rmt_eid_set = 1;
+	}
+      else if (unformat (input, "lcl_eid %U", unformat_lisp_eid_vat, lcl_eid))
+	{
+	  lcl_eid_set = 1;
+	}
+      else if (unformat (input, "p %d w %d", &p, &w))
+	{
+	  if (!curr_rloc)
+	    {
+	      errmsg ("No RLOC configured for setting priority/weight!");
+	      return -99;
+	    }
+	  curr_rloc->priority = p;
+	  curr_rloc->weight = w;
+	}
+      else if (unformat (input, "loc-pair %U %U", unformat_ip4_address,
+			 &lcl_rloc4, unformat_ip4_address, &rmt_rloc4))
+	{
+	  rloc.is_ip4 = 1;
+
+	  clib_memcpy (&rloc.addr, &lcl_rloc4, sizeof (lcl_rloc4));
+	  rloc.priority = rloc.weight = 0;
+	  vec_add1 (lcl_locs, rloc);
+
+	  clib_memcpy (&rloc.addr, &rmt_rloc4, sizeof (rmt_rloc4));
+	  vec_add1 (rmt_locs, rloc);
+	  /* priority and weight saved in rmt loc */
+	  curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1];
+	}
+      else if (unformat (input, "loc-pair %U %U", unformat_ip6_address,
+			 &lcl_rloc6, unformat_ip6_address, &rmt_rloc6))
+	{
+	  rloc.is_ip4 = 0;
+	  clib_memcpy (&rloc.addr, &lcl_rloc6, sizeof (lcl_rloc6));
+	  rloc.priority = rloc.weight = 0;
+	  vec_add1 (lcl_locs, rloc);
+
+	  clib_memcpy (&rloc.addr, &rmt_rloc6, sizeof (rmt_rloc6));
+	  vec_add1 (rmt_locs, rloc);
+	  /* priority and weight saved in rmt loc */
+	  curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1];
+	}
+      else if (unformat (input, "action %d", &action))
+	{
+	  ;
+	}
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, input);
+	  return -99;
+	}
+    }
+
+  if (!rmt_eid_set)
+    {
+      errmsg ("remote eid addresses not set");
+      return -99;
+    }
+
+  if (lcl_eid_set && rmt_eid->type != lcl_eid->type)
+    {
+      errmsg ("eid types don't match");
+      return -99;
+    }
+
+  if (0 == rmt_locs && (u32) ~ 0 == action)
+    {
+      errmsg ("action not set for negative mapping");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry);
+
+  mp->is_add = is_add;
+  lisp_eid_put_vat (mp->rmt_eid, rmt_eid->addr, rmt_eid->type);
+  lisp_eid_put_vat (mp->lcl_eid, lcl_eid->addr, lcl_eid->type);
+  mp->eid_type = rmt_eid->type;
+  mp->rmt_len = rmt_eid->len;
+  mp->lcl_len = lcl_eid->len;
+  mp->action = action;
+
+  if (0 != rmt_locs && 0 != lcl_locs)
+    {
+      mp->loc_num = vec_len (rmt_locs);
+      clib_memcpy (mp->lcl_locs, lcl_locs,
+		   (sizeof (rloc_t) * vec_len (lcl_locs)));
+      clib_memcpy (mp->rmt_locs, rmt_locs,
+		   (sizeof (rloc_t) * vec_len (rmt_locs)));
+    }
+  vec_free (lcl_locs);
+  vec_free (rmt_locs);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_add_del_map_server (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_add_del_map_server_t *mp;
+  f64 timeout = ~0;
+  u8 is_add = 1;
+  u8 ipv4_set = 0;
+  u8 ipv6_set = 0;
+  ip4_address_t ipv4;
+  ip6_address_t ipv6;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	{
+	  is_add = 0;
+	}
+      else if (unformat (input, "%U", unformat_ip4_address, &ipv4))
+	{
+	  ipv4_set = 1;
+	}
+      else if (unformat (input, "%U", unformat_ip6_address, &ipv6))
+	{
+	  ipv6_set = 1;
+	}
+      else
+	break;
+    }
+
+  if (ipv4_set && ipv6_set)
+    {
+      errmsg ("both eid v4 and v6 addresses set");
+      return -99;
+    }
+
+  if (!ipv4_set && !ipv6_set)
+    {
+      errmsg ("eid addresses not set");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (LISP_ADD_DEL_MAP_SERVER, lisp_add_del_map_server);
+
+  mp->is_add = is_add;
+  if (ipv6_set)
+    {
+      mp->is_ipv6 = 1;
+      clib_memcpy (mp->ip_address, &ipv6, sizeof (ipv6));
+    }
+  else
+    {
+      mp->is_ipv6 = 0;
+      clib_memcpy (mp->ip_address, &ipv4, sizeof (ipv4));
+    }
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_add_del_map_resolver (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_add_del_map_resolver_t *mp;
+  f64 timeout = ~0;
+  u8 is_add = 1;
+  u8 ipv4_set = 0;
+  u8 ipv6_set = 0;
+  ip4_address_t ipv4;
+  ip6_address_t ipv6;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	{
+	  is_add = 0;
+	}
+      else if (unformat (input, "%U", unformat_ip4_address, &ipv4))
+	{
+	  ipv4_set = 1;
+	}
+      else if (unformat (input, "%U", unformat_ip6_address, &ipv6))
+	{
+	  ipv6_set = 1;
+	}
+      else
+	break;
+    }
+
+  if (ipv4_set && ipv6_set)
+    {
+      errmsg ("both eid v4 and v6 addresses set");
+      return -99;
+    }
+
+  if (!ipv4_set && !ipv6_set)
+    {
+      errmsg ("eid addresses not set");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver);
+
+  mp->is_add = is_add;
+  if (ipv6_set)
+    {
+      mp->is_ipv6 = 1;
+      clib_memcpy (mp->ip_address, &ipv6, sizeof (ipv6));
+    }
+  else
+    {
+      mp->is_ipv6 = 0;
+      clib_memcpy (mp->ip_address, &ipv4, sizeof (ipv4));
+    }
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_gpe_enable_disable (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_gpe_enable_disable_t *mp;
+  f64 timeout = ~0;
+  u8 is_set = 0;
+  u8 is_en = 1;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "enable"))
+	{
+	  is_set = 1;
+	  is_en = 1;
+	}
+      else if (unformat (input, "disable"))
+	{
+	  is_set = 1;
+	  is_en = 0;
+	}
+      else
+	break;
+    }
+
+  if (is_set == 0)
+    {
+      errmsg ("Value not set");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable);
+
+  mp->is_en = is_en;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_rloc_probe_enable_disable (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_rloc_probe_enable_disable_t *mp;
+  f64 timeout = ~0;
+  u8 is_set = 0;
+  u8 is_en = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "enable"))
+	{
+	  is_set = 1;
+	  is_en = 1;
+	}
+      else if (unformat (input, "disable"))
+	is_set = 1;
+      else
+	break;
+    }
+
+  if (!is_set)
+    {
+      errmsg ("Value not set");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (LISP_RLOC_PROBE_ENABLE_DISABLE, lisp_rloc_probe_enable_disable);
+
+  mp->is_enabled = is_en;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_map_register_enable_disable (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_map_register_enable_disable_t *mp;
+  f64 timeout = ~0;
+  u8 is_set = 0;
+  u8 is_en = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "enable"))
+	{
+	  is_set = 1;
+	  is_en = 1;
+	}
+      else if (unformat (input, "disable"))
+	is_set = 1;
+      else
+	break;
+    }
+
+  if (!is_set)
+    {
+      errmsg ("Value not set");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (LISP_MAP_REGISTER_ENABLE_DISABLE, lisp_map_register_enable_disable);
+
+  mp->is_enabled = is_en;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_enable_disable (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_enable_disable_t *mp;
+  f64 timeout = ~0;
+  u8 is_set = 0;
+  u8 is_en = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "enable"))
+	{
+	  is_set = 1;
+	  is_en = 1;
+	}
+      else if (unformat (input, "disable"))
+	{
+	  is_set = 1;
+	}
+      else
+	break;
+    }
+
+  if (!is_set)
+    {
+      errmsg ("Value not set");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (LISP_ENABLE_DISABLE, lisp_enable_disable);
+
+  mp->is_en = is_en;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_show_lisp_map_register_state (vat_main_t * vam)
+{
+  f64 timeout = ~0;
+  vl_api_show_lisp_map_register_state_t *mp;
+
+  M (SHOW_LISP_MAP_REGISTER_STATE, show_lisp_map_register_state);
+
+  /* send */
+  S;
+
+  /* wait for reply */
+  W;
+
+  return 0;
+}
+
+static int
+api_show_lisp_rloc_probe_state (vat_main_t * vam)
+{
+  f64 timeout = ~0;
+  vl_api_show_lisp_rloc_probe_state_t *mp;
+
+  M (SHOW_LISP_RLOC_PROBE_STATE, show_lisp_rloc_probe_state);
+
+  /* send */
+  S;
+
+  /* wait for reply */
+  W;
+
+  return 0;
+}
+
+static int
+api_show_lisp_map_request_mode (vat_main_t * vam)
+{
+  f64 timeout = ~0;
+  vl_api_show_lisp_map_request_mode_t *mp;
+
+  M (SHOW_LISP_MAP_REQUEST_MODE, show_lisp_map_request_mode);
+
+  /* send */
+  S;
+
+  /* wait for reply */
+  W;
+
+  return 0;
+}
+
+static int
+api_lisp_map_request_mode (vat_main_t * vam)
+{
+  f64 timeout = ~0;
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_map_request_mode_t *mp;
+  u8 mode = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "dst-only"))
+	mode = 0;
+      else if (unformat (input, "src-dst"))
+	mode = 1;
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, input);
+	  return -99;
+	}
+    }
+
+  M (LISP_MAP_REQUEST_MODE, lisp_map_request_mode);
+
+  mp->mode = mode;
+
+  /* send */
+  S;
+
+  /* wait for reply */
+  W;
+
+  /* notreached */
+  return 0;
+}
+
+/**
+ * Enable/disable LISP proxy ITR.
+ *
+ * @param vam vpp API test context
+ * @return return code
+ */
+static int
+api_lisp_pitr_set_locator_set (vat_main_t * vam)
+{
+  f64 timeout = ~0;
+  u8 ls_name_set = 0;
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_pitr_set_locator_set_t *mp;
+  u8 is_add = 1;
+  u8 *ls_name = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	is_add = 0;
+      else if (unformat (input, "locator-set %s", &ls_name))
+	ls_name_set = 1;
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, input);
+	  return -99;
+	}
+    }
+
+  if (!ls_name_set)
+    {
+      errmsg ("locator-set name not set!");
+      return -99;
+    }
+
+  M (LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set);
+
+  mp->is_add = is_add;
+  clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name));
+  vec_free (ls_name);
+
+  /* send */
+  S;
+
+  /* wait for reply */
+  W;
+
+  /* notreached */
+  return 0;
+}
+
+static int
+api_show_lisp_pitr (vat_main_t * vam)
+{
+  vl_api_show_lisp_pitr_t *mp;
+  f64 timeout = ~0;
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%=20s", "lisp status:");
+    }
+
+  M (SHOW_LISP_PITR, show_lisp_pitr);
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+/**
+ * Add/delete mapping between vni and vrf
+ */
+static int
+api_lisp_eid_table_add_del_map (vat_main_t * vam)
+{
+  f64 timeout = ~0;
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_eid_table_add_del_map_t *mp;
+  u8 is_add = 1, vni_set = 0, vrf_set = 0, bd_index_set = 0;
+  u32 vni, vrf, bd_index;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	is_add = 0;
+      else if (unformat (input, "vrf %d", &vrf))
+	vrf_set = 1;
+      else if (unformat (input, "bd_index %d", &bd_index))
+	bd_index_set = 1;
+      else if (unformat (input, "vni %d", &vni))
+	vni_set = 1;
+      else
+	break;
+    }
+
+  if (!vni_set || (!vrf_set && !bd_index_set))
+    {
+      errmsg ("missing arguments!");
+      return -99;
+    }
+
+  if (vrf_set && bd_index_set)
+    {
+      errmsg ("error: both vrf and bd entered!");
+      return -99;
+    }
+
+  M (LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map);
+
+  mp->is_add = is_add;
+  mp->vni = htonl (vni);
+  mp->dp_table = vrf_set ? htonl (vrf) : htonl (bd_index);
+  mp->is_l2 = bd_index_set;
+
+  /* send */
+  S;
+
+  /* wait for reply */
+  W;
+
+  /* notreached */
+  return 0;
+}
+
+uword
+unformat_negative_mapping_action (unformat_input_t * input, va_list * args)
+{
+  u32 *action = va_arg (*args, u32 *);
+  u8 *s = 0;
+
+  if (unformat (input, "%s", &s))
+    {
+      if (!strcmp ((char *) s, "no-action"))
+	action[0] = 0;
+      else if (!strcmp ((char *) s, "natively-forward"))
+	action[0] = 1;
+      else if (!strcmp ((char *) s, "send-map-request"))
+	action[0] = 2;
+      else if (!strcmp ((char *) s, "drop"))
+	action[0] = 3;
+      else
+	{
+	  clib_warning ("invalid action: '%s'", s);
+	  action[0] = 3;
+	}
+    }
+  else
+    return 0;
+
+  vec_free (s);
+  return 1;
+}
+
+/**
+ * Add/del remote mapping to/from LISP control plane
+ *
+ * @param vam vpp API test context
+ * @return return code
+ */
+static int
+api_lisp_add_del_remote_mapping (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_add_del_remote_mapping_t *mp;
+  f64 timeout = ~0;
+  u32 vni = 0;
+  lisp_eid_vat_t _eid, *eid = &_eid;
+  lisp_eid_vat_t _seid, *seid = &_seid;
+  u8 is_add = 1, del_all = 0, eid_set = 0, seid_set = 0;
+  u32 action = ~0, p, w, data_len;
+  ip4_address_t rloc4;
+  ip6_address_t rloc6;
+  rloc_t *rlocs = 0, rloc, *curr_rloc = 0;
+
+  memset (&rloc, 0, sizeof (rloc));
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del-all"))
+	{
+	  del_all = 1;
+	}
+      else if (unformat (input, "del"))
+	{
+	  is_add = 0;
+	}
+      else if (unformat (input, "add"))
+	{
+	  is_add = 1;
+	}
+      else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid))
+	{
+	  eid_set = 1;
+	}
+      else if (unformat (input, "seid %U", unformat_lisp_eid_vat, seid))
+	{
+	  seid_set = 1;
+	}
+      else if (unformat (input, "vni %d", &vni))
+	{
+	  ;
+	}
+      else if (unformat (input, "p %d w %d", &p, &w))
+	{
+	  if (!curr_rloc)
+	    {
+	      errmsg ("No RLOC configured for setting priority/weight!");
+	      return -99;
+	    }
+	  curr_rloc->priority = p;
+	  curr_rloc->weight = w;
+	}
+      else if (unformat (input, "rloc %U", unformat_ip4_address, &rloc4))
+	{
+	  rloc.is_ip4 = 1;
+	  clib_memcpy (&rloc.addr, &rloc4, sizeof (rloc4));
+	  vec_add1 (rlocs, rloc);
+	  curr_rloc = &rlocs[vec_len (rlocs) - 1];
+	}
+      else if (unformat (input, "rloc %U", unformat_ip6_address, &rloc6))
+	{
+	  rloc.is_ip4 = 0;
+	  clib_memcpy (&rloc.addr, &rloc6, sizeof (rloc6));
+	  vec_add1 (rlocs, rloc);
+	  curr_rloc = &rlocs[vec_len (rlocs) - 1];
+	}
+      else if (unformat (input, "action %U",
+			 unformat_negative_mapping_action, &action))
+	{
+	  ;
+	}
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, input);
+	  return -99;
+	}
+    }
+
+  if (0 == eid_set)
+    {
+      errmsg ("missing params!");
+      return -99;
+    }
+
+  if (is_add && (~0 == action) && 0 == vec_len (rlocs))
+    {
+      errmsg ("no action set for negative map-reply!");
+      return -99;
+    }
+
+  data_len = vec_len (rlocs) * sizeof (rloc_t);
+
+  M2 (LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping, data_len);
+  mp->is_add = is_add;
+  mp->vni = htonl (vni);
+  mp->action = (u8) action;
+  mp->is_src_dst = seid_set;
+  mp->eid_len = eid->len;
+  mp->seid_len = seid->len;
+  mp->del_all = del_all;
+  mp->eid_type = eid->type;
+  lisp_eid_put_vat (mp->eid, eid->addr, eid->type);
+  lisp_eid_put_vat (mp->seid, seid->addr, seid->type);
+
+  mp->rloc_num = clib_host_to_net_u32 (vec_len (rlocs));
+  clib_memcpy (mp->rlocs, rlocs, data_len);
+  vec_free (rlocs);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+/**
+ * Add/del LISP adjacency. Saves mapping in LISP control plane and updates
+ * forwarding entries in data-plane accordingly.
+ *
+ * @param vam vpp API test context
+ * @return return code
+ */
+static int
+api_lisp_add_del_adjacency (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_add_del_adjacency_t *mp;
+  f64 timeout = ~0;
+  u32 vni = 0;
+  ip4_address_t leid4, reid4;
+  ip6_address_t leid6, reid6;
+  u8 reid_mac[6] = { 0 };
+  u8 leid_mac[6] = { 0 };
+  u8 reid_type, leid_type;
+  u32 leid_len = 0, reid_len = 0, len;
+  u8 is_add = 1;
+
+  leid_type = reid_type = (u8) ~ 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	{
+	  is_add = 0;
+	}
+      else if (unformat (input, "add"))
+	{
+	  is_add = 1;
+	}
+      else if (unformat (input, "reid %U/%d", unformat_ip4_address,
+			 &reid4, &len))
+	{
+	  reid_type = 0;	/* ipv4 */
+	  reid_len = len;
+	}
+      else if (unformat (input, "reid %U/%d", unformat_ip6_address,
+			 &reid6, &len))
+	{
+	  reid_type = 1;	/* ipv6 */
+	  reid_len = len;
+	}
+      else if (unformat (input, "reid %U", unformat_ethernet_address,
+			 reid_mac))
+	{
+	  reid_type = 2;	/* mac */
+	}
+      else if (unformat (input, "leid %U/%d", unformat_ip4_address,
+			 &leid4, &len))
+	{
+	  leid_type = 0;	/* ipv4 */
+	  leid_len = len;
+	}
+      else if (unformat (input, "leid %U/%d", unformat_ip6_address,
+			 &leid6, &len))
+	{
+	  leid_type = 1;	/* ipv6 */
+	  leid_len = len;
+	}
+      else if (unformat (input, "leid %U", unformat_ethernet_address,
+			 leid_mac))
+	{
+	  leid_type = 2;	/* mac */
+	}
+      else if (unformat (input, "vni %d", &vni))
+	{
+	  ;
+	}
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, input);
+	  return -99;
+	}
+    }
+
+  if ((u8) ~ 0 == reid_type)
+    {
+      errmsg ("missing params!");
+      return -99;
+    }
+
+  if (leid_type != reid_type)
+    {
+      errmsg ("remote and local EIDs are of different types!");
+      return -99;
+    }
+
+  M (LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency);
+  mp->is_add = is_add;
+  mp->vni = htonl (vni);
+  mp->leid_len = leid_len;
+  mp->reid_len = reid_len;
+  mp->eid_type = reid_type;
+
+  switch (mp->eid_type)
+    {
+    case 0:
+      clib_memcpy (mp->leid, &leid4, sizeof (leid4));
+      clib_memcpy (mp->reid, &reid4, sizeof (reid4));
+      break;
+    case 1:
+      clib_memcpy (mp->leid, &leid6, sizeof (leid6));
+      clib_memcpy (mp->reid, &reid6, sizeof (reid6));
+      break;
+    case 2:
+      clib_memcpy (mp->leid, leid_mac, 6);
+      clib_memcpy (mp->reid, reid_mac, 6);
+      break;
+    default:
+      errmsg ("unknown EID type %d!", mp->eid_type);
+      return 0;
+    }
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_gpe_add_del_iface (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_gpe_add_del_iface_t *mp;
+  f64 timeout = ~0;
+  u8 action_set = 0, is_add = 1, is_l2 = 0, dp_table_set = 0, vni_set = 0;
+  u32 dp_table = 0, vni = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "up"))
+	{
+	  action_set = 1;
+	  is_add = 1;
+	}
+      else if (unformat (input, "down"))
+	{
+	  action_set = 1;
+	  is_add = 0;
+	}
+      else if (unformat (input, "table_id %d", &dp_table))
+	{
+	  dp_table_set = 1;
+	}
+      else if (unformat (input, "bd_id %d", &dp_table))
+	{
+	  dp_table_set = 1;
+	  is_l2 = 1;
+	}
+      else if (unformat (input, "vni %d", &vni))
+	{
+	  vni_set = 1;
+	}
+      else
+	break;
+    }
+
+  if (action_set == 0)
+    {
+      errmsg ("Action not set");
+      return -99;
+    }
+  if (dp_table_set == 0 || vni_set == 0)
+    {
+      errmsg ("vni and dp_table must be set");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface);
+
+  mp->is_add = is_add;
+  mp->dp_table = dp_table;
+  mp->is_l2 = is_l2;
+  mp->vni = vni;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+/**
+ * Add/del map request itr rlocs from LISP control plane and updates
+ *
+ * @param vam vpp API test context
+ * @return return code
+ */
+static int
+api_lisp_add_del_map_request_itr_rlocs (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_add_del_map_request_itr_rlocs_t *mp;
+  f64 timeout = ~0;
+  u8 *locator_set_name = 0;
+  u8 locator_set_name_set = 0;
+  u8 is_add = 1;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	{
+	  is_add = 0;
+	}
+      else if (unformat (input, "%_%v%_", &locator_set_name))
+	{
+	  locator_set_name_set = 1;
+	}
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, input);
+	  return -99;
+	}
+    }
+
+  if (is_add && !locator_set_name_set)
+    {
+      errmsg ("itr-rloc is not set!");
+      return -99;
+    }
+
+  if (is_add && vec_len (locator_set_name) > 64)
+    {
+      errmsg ("itr-rloc locator-set name too long");
+      vec_free (locator_set_name);
+      return -99;
+    }
+
+  M (LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS, lisp_add_del_map_request_itr_rlocs);
+  mp->is_add = is_add;
+  if (is_add)
+    {
+      clib_memcpy (mp->locator_set_name, locator_set_name,
+		   vec_len (locator_set_name));
+    }
+  else
+    {
+      memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name));
+    }
+  vec_free (locator_set_name);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_locator_dump (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_locator_dump_t *mp;
+  f64 timeout = ~0;
+  u8 is_index_set = 0, is_name_set = 0;
+  u8 *ls_name = 0;
+  u32 ls_index = ~0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "ls_name %_%v%_", &ls_name))
+	{
+	  is_name_set = 1;
+	}
+      else if (unformat (input, "ls_index %d", &ls_index))
+	{
+	  is_index_set = 1;
+	}
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, input);
+	  return -99;
+	}
+    }
+
+  if (!is_index_set && !is_name_set)
+    {
+      errmsg ("error: expected one of index or name!");
+      return -99;
+    }
+
+  if (is_index_set && is_name_set)
+    {
+      errmsg ("error: only one param expected!");
+      return -99;
+    }
+
+  if (vec_len (ls_name) > 62)
+    {
+      errmsg ("error: locator set name too long!");
+      return -99;
+    }
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%=16s%=16s%=16s", "locator", "priority", "weight");
+    }
+
+  M (LISP_LOCATOR_DUMP, lisp_locator_dump);
+  mp->is_index_set = is_index_set;
+
+  if (is_index_set)
+    mp->ls_index = clib_host_to_net_u32 (ls_index);
+  else
+    {
+      vec_add1 (ls_name, 0);
+      strncpy ((char *) mp->ls_name, (char *) ls_name,
+	       sizeof (mp->ls_name) - 1);
+    }
+
+  /* send it... */
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_locator_set_dump (vat_main_t * vam)
+{
+  vl_api_lisp_locator_set_dump_t *mp;
+  unformat_input_t *input = vam->input;
+  f64 timeout = ~0;
+  u8 filter = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "local"))
+	{
+	  filter = 1;
+	}
+      else if (unformat (input, "remote"))
+	{
+	  filter = 2;
+	}
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, input);
+	  return -99;
+	}
+    }
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%=10s%=15s", "ls_index", "ls_name");
+    }
+
+  M (LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
+
+  mp->filter = filter;
+
+  /* send it... */
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_eid_table_map_dump (vat_main_t * vam)
+{
+  u8 is_l2 = 0;
+  u8 mode_set = 0;
+  unformat_input_t *input = vam->input;
+  vl_api_lisp_eid_table_map_dump_t *mp;
+  f64 timeout = ~0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "l2"))
+	{
+	  is_l2 = 1;
+	  mode_set = 1;
+	}
+      else if (unformat (input, "l3"))
+	{
+	  is_l2 = 0;
+	  mode_set = 1;
+	}
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, input);
+	  return -99;
+	}
+    }
+
+  if (!mode_set)
+    {
+      errmsg ("expected one of 'l2' or 'l3' parameter!");
+      return -99;
+    }
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF");
+    }
+
+  M (LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump);
+  mp->is_l2 = is_l2;
+
+  /* send it... */
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_eid_table_vni_dump (vat_main_t * vam)
+{
+  vl_api_lisp_eid_table_vni_dump_t *mp;
+  f64 timeout = ~0;
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "VNI");
+    }
+
+  M (LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_dump);
+
+  /* send it... */
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_eid_table_dump (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_lisp_eid_table_dump_t *mp;
+  f64 timeout = ~0;
+  struct in_addr ip4;
+  struct in6_addr ip6;
+  u8 mac[6];
+  u8 eid_type = ~0, eid_set = 0;
+  u32 prefix_length = ~0, t, vni = 0;
+  u8 filter = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "eid %U/%d", unformat_ip4_address, &ip4, &t))
+	{
+	  eid_set = 1;
+	  eid_type = 0;
+	  prefix_length = t;
+	}
+      else if (unformat (i, "eid %U/%d", unformat_ip6_address, &ip6, &t))
+	{
+	  eid_set = 1;
+	  eid_type = 1;
+	  prefix_length = t;
+	}
+      else if (unformat (i, "eid %U", unformat_ethernet_address, mac))
+	{
+	  eid_set = 1;
+	  eid_type = 2;
+	}
+      else if (unformat (i, "vni %d", &t))
+	{
+	  vni = t;
+	}
+      else if (unformat (i, "local"))
+	{
+	  filter = 1;
+	}
+      else if (unformat (i, "remote"))
+	{
+	  filter = 2;
+	}
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%-35s%-20s%-30s%-20s%-20s%-10s%-20s", "EID",
+	     "type", "ls_index", "ttl", "authoritative", "key_id", "key");
+    }
+
+  M (LISP_EID_TABLE_DUMP, lisp_eid_table_dump);
+
+  mp->filter = filter;
+  if (eid_set)
+    {
+      mp->eid_set = 1;
+      mp->vni = htonl (vni);
+      mp->eid_type = eid_type;
+      switch (eid_type)
+	{
+	case 0:
+	  mp->prefix_length = prefix_length;
+	  clib_memcpy (mp->eid, &ip4, sizeof (ip4));
+	  break;
+	case 1:
+	  mp->prefix_length = prefix_length;
+	  clib_memcpy (mp->eid, &ip6, sizeof (ip6));
+	  break;
+	case 2:
+	  clib_memcpy (mp->eid, mac, sizeof (mac));
+	  break;
+	default:
+	  errmsg ("unknown EID type %d!", eid_type);
+	  return -99;
+	}
+    }
+
+  /* send it... */
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_gpe_tunnel_dump (vat_main_t * vam)
+{
+  vl_api_lisp_gpe_tunnel_dump_t *mp;
+  f64 timeout = ~0;
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%=20s%=30s%=16s%=16s%=16s%=16s"
+	     "%=16s%=16s%=16s%=16s%=16s",
+	     "Tunel", "Source", "Destination", "Fib encap", "Fib decap",
+	     "Decap next", "Lisp version", "Flags", "Next protocol",
+	     "ver_res", "res", "iid");
+    }
+
+  M (LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump);
+  /* send it... */
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_adjacencies_get (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_lisp_adjacencies_get_t *mp;
+  f64 timeout = ~0;
+  u8 vni_set = 0;
+  u32 vni = ~0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "vni %d", &vni))
+	{
+	  vni_set = 1;
+	}
+      else
+	{
+	  errmsg ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (!vni_set)
+    {
+      errmsg ("vni not set!");
+      return -99;
+    }
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%s %40s", "leid", "reid");
+    }
+
+  M (LISP_ADJACENCIES_GET, lisp_adjacencies_get);
+  mp->vni = clib_host_to_net_u32 (vni);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_map_server_dump (vat_main_t * vam)
+{
+  vl_api_lisp_map_server_dump_t *mp;
+  f64 timeout = ~0;
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%=20s", "Map server");
+    }
+
+  M (LISP_MAP_SERVER_DUMP, lisp_map_server_dump);
+  /* send it... */
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_map_resolver_dump (vat_main_t * vam)
+{
+  vl_api_lisp_map_resolver_dump_t *mp;
+  f64 timeout = ~0;
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%=20s", "Map resolver");
+    }
+
+  M (LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump);
+  /* send it... */
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_show_lisp_status (vat_main_t * vam)
+{
+  vl_api_show_lisp_status_t *mp;
+  f64 timeout = ~0;
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%-20s%-16s", "lisp status", "locator-set");
+    }
+
+  M (SHOW_LISP_STATUS, show_lisp_status);
+  /* send it... */
+  S;
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_lisp_get_map_request_itr_rlocs (vat_main_t * vam)
+{
+  vl_api_lisp_get_map_request_itr_rlocs_t *mp;
+  f64 timeout = ~0;
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%=20s", "itr-rlocs:");
+    }
+
+  M (LISP_GET_MAP_REQUEST_ITR_RLOCS, lisp_get_map_request_itr_rlocs);
+  /* send it... */
+  S;
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_af_packet_create (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_af_packet_create_t *mp;
+  f64 timeout;
+  u8 *host_if_name = 0;
+  u8 hw_addr[6];
+  u8 random_hw_addr = 1;
+
+  memset (hw_addr, 0, sizeof (hw_addr));
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "name %s", &host_if_name))
+	vec_add1 (host_if_name, 0);
+      else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
+	random_hw_addr = 0;
+      else
+	break;
+    }
+
+  if (!vec_len (host_if_name))
+    {
+      errmsg ("host-interface name must be specified");
+      return -99;
+    }
+
+  if (vec_len (host_if_name) > 64)
+    {
+      errmsg ("host-interface name too long");
+      return -99;
+    }
+
+  M (AF_PACKET_CREATE, af_packet_create);
+
+  clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
+  clib_memcpy (mp->hw_addr, hw_addr, 6);
+  mp->use_random_hw_addr = random_hw_addr;
+  vec_free (host_if_name);
+
+  S;
+  W2 (fprintf (vam->ofp, " new sw_if_index = %d ", vam->sw_if_index));
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_af_packet_delete (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_af_packet_delete_t *mp;
+  f64 timeout;
+  u8 *host_if_name = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "name %s", &host_if_name))
+	vec_add1 (host_if_name, 0);
+      else
+	break;
+    }
+
+  if (!vec_len (host_if_name))
+    {
+      errmsg ("host-interface name must be specified");
+      return -99;
+    }
+
+  if (vec_len (host_if_name) > 64)
+    {
+      errmsg ("host-interface name too long");
+      return -99;
+    }
+
+  M (AF_PACKET_DELETE, af_packet_delete);
+
+  clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
+  vec_free (host_if_name);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_policer_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_policer_add_del_t *mp;
+  f64 timeout;
+  u8 is_add = 1;
+  u8 *name = 0;
+  u32 cir = 0;
+  u32 eir = 0;
+  u64 cb = 0;
+  u64 eb = 0;
+  u8 rate_type = 0;
+  u8 round_type = 0;
+  u8 type = 0;
+  u8 color_aware = 0;
+  sse2_qos_pol_action_params_st conform_action, exceed_action, violate_action;
+
+  conform_action.action_type = SSE2_QOS_ACTION_TRANSMIT;
+  conform_action.dscp = 0;
+  exceed_action.action_type = SSE2_QOS_ACTION_MARK_AND_TRANSMIT;
+  exceed_action.dscp = 0;
+  violate_action.action_type = SSE2_QOS_ACTION_DROP;
+  violate_action.dscp = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "name %s", &name))
+	vec_add1 (name, 0);
+      else if (unformat (i, "cir %u", &cir))
+	;
+      else if (unformat (i, "eir %u", &eir))
+	;
+      else if (unformat (i, "cb %u", &cb))
+	;
+      else if (unformat (i, "eb %u", &eb))
+	;
+      else if (unformat (i, "rate_type %U", unformat_policer_rate_type,
+			 &rate_type))
+	;
+      else if (unformat (i, "round_type %U", unformat_policer_round_type,
+			 &round_type))
+	;
+      else if (unformat (i, "type %U", unformat_policer_type, &type))
+	;
+      else if (unformat (i, "conform_action %U", unformat_policer_action_type,
+			 &conform_action))
+	;
+      else if (unformat (i, "exceed_action %U", unformat_policer_action_type,
+			 &exceed_action))
+	;
+      else if (unformat (i, "violate_action %U", unformat_policer_action_type,
+			 &violate_action))
+	;
+      else if (unformat (i, "color-aware"))
+	color_aware = 1;
+      else
+	break;
+    }
+
+  if (!vec_len (name))
+    {
+      errmsg ("policer name must be specified");
+      return -99;
+    }
+
+  if (vec_len (name) > 64)
+    {
+      errmsg ("policer name too long");
+      return -99;
+    }
+
+  M (POLICER_ADD_DEL, policer_add_del);
+
+  clib_memcpy (mp->name, name, vec_len (name));
+  vec_free (name);
+  mp->is_add = is_add;
+  mp->cir = cir;
+  mp->eir = eir;
+  mp->cb = cb;
+  mp->eb = eb;
+  mp->rate_type = rate_type;
+  mp->round_type = round_type;
+  mp->type = type;
+  mp->conform_action_type = conform_action.action_type;
+  mp->conform_dscp = conform_action.dscp;
+  mp->exceed_action_type = exceed_action.action_type;
+  mp->exceed_dscp = exceed_action.dscp;
+  mp->violate_action_type = violate_action.action_type;
+  mp->violate_dscp = violate_action.dscp;
+  mp->color_aware = color_aware;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_policer_dump (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_policer_dump_t *mp;
+  f64 timeout = ~0;
+  u8 *match_name = 0;
+  u8 match_name_valid = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "name %s", &match_name))
+	{
+	  vec_add1 (match_name, 0);
+	  match_name_valid = 1;
+	}
+      else
+	break;
+    }
+
+  M (POLICER_DUMP, policer_dump);
+  mp->match_name_valid = match_name_valid;
+  clib_memcpy (mp->match_name, match_name, vec_len (match_name));
+  vec_free (match_name);
+  /* send it... */
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_policer_classify_set_interface (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_policer_classify_set_interface_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  int sw_if_index_set;
+  u32 ip4_table_index = ~0;
+  u32 ip6_table_index = ~0;
+  u32 l2_table_index = ~0;
+  u8 is_add = 1;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "ip4-table %d", &ip4_table_index))
+	;
+      else if (unformat (i, "ip6-table %d", &ip6_table_index))
+	;
+      else if (unformat (i, "l2-table %d", &l2_table_index))
+	;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  M (POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->ip4_table_index = ntohl (ip4_table_index);
+  mp->ip6_table_index = ntohl (ip6_table_index);
+  mp->l2_table_index = ntohl (l2_table_index);
+  mp->is_add = is_add;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_policer_classify_dump (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_policer_classify_dump_t *mp;
+  f64 timeout = ~0;
+  u8 type = POLICER_CLASSIFY_N_TABLES;
+
+  if (unformat (i, "type %U", unformat_policer_classify_table_type, &type))
+    ;
+  else
+    {
+      errmsg ("classify table type must be specified");
+      return -99;
+    }
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%10s%20s", "Intfc idx", "Classify table");
+    }
+
+  M (POLICER_CLASSIFY_DUMP, policer_classify_dump);
+  mp->type = type;
+  /* send it... */
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_netmap_create (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_netmap_create_t *mp;
+  f64 timeout;
+  u8 *if_name = 0;
+  u8 hw_addr[6];
+  u8 random_hw_addr = 1;
+  u8 is_pipe = 0;
+  u8 is_master = 0;
+
+  memset (hw_addr, 0, sizeof (hw_addr));
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "name %s", &if_name))
+	vec_add1 (if_name, 0);
+      else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
+	random_hw_addr = 0;
+      else if (unformat (i, "pipe"))
+	is_pipe = 1;
+      else if (unformat (i, "master"))
+	is_master = 1;
+      else if (unformat (i, "slave"))
+	is_master = 0;
+      else
+	break;
+    }
+
+  if (!vec_len (if_name))
+    {
+      errmsg ("interface name must be specified");
+      return -99;
+    }
+
+  if (vec_len (if_name) > 64)
+    {
+      errmsg ("interface name too long");
+      return -99;
+    }
+
+  M (NETMAP_CREATE, netmap_create);
+
+  clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
+  clib_memcpy (mp->hw_addr, hw_addr, 6);
+  mp->use_random_hw_addr = random_hw_addr;
+  mp->is_pipe = is_pipe;
+  mp->is_master = is_master;
+  vec_free (if_name);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_netmap_delete (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_netmap_delete_t *mp;
+  f64 timeout;
+  u8 *if_name = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "name %s", &if_name))
+	vec_add1 (if_name, 0);
+      else
+	break;
+    }
+
+  if (!vec_len (if_name))
+    {
+      errmsg ("interface name must be specified");
+      return -99;
+    }
+
+  if (vec_len (if_name) > 64)
+    {
+      errmsg ("interface name too long");
+      return -99;
+    }
+
+  M (NETMAP_DELETE, netmap_delete);
+
+  clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
+  vec_free (if_name);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static void vl_api_mpls_tunnel_details_t_handler
+  (vl_api_mpls_tunnel_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 len = mp->mt_next_hop_n_labels;
+  i32 i;
+
+  print (vam->ofp, "[%d]: via %U %d labels ",
+	 mp->tunnel_index,
+	 format_ip4_address, mp->mt_next_hop,
+	 ntohl (mp->mt_next_hop_sw_if_index));
+  for (i = 0; i < len; i++)
+    {
+      print (vam->ofp, "%u ", ntohl (mp->mt_next_hop_out_labels[i]));
+    }
+  print (vam->ofp, "");
+}
+
+static void vl_api_mpls_tunnel_details_t_handler_json
+  (vl_api_mpls_tunnel_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+  struct in_addr ip4;
+  i32 i;
+  i32 len = mp->mt_next_hop_n_labels;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "tunnel_index", ntohl (mp->tunnel_index));
+  clib_memcpy (&ip4, &(mp->mt_next_hop), sizeof (ip4));
+  vat_json_object_add_ip4 (node, "next_hop", ip4);
+  vat_json_object_add_uint (node, "next_hop_sw_if_index",
+			    ntohl (mp->mt_next_hop_sw_if_index));
+  vat_json_object_add_uint (node, "l2_only", ntohl (mp->mt_l2_only));
+  vat_json_object_add_uint (node, "label_count", len);
+  for (i = 0; i < len; i++)
+    {
+      vat_json_object_add_uint (node, "label",
+				ntohl (mp->mt_next_hop_out_labels[i]));
+    }
+}
+
+static int
+api_mpls_tunnel_dump (vat_main_t * vam)
+{
+  vl_api_mpls_tunnel_dump_t *mp;
+  f64 timeout;
+  i32 index = -1;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (vam->input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (!unformat (vam->input, "tunnel_index %d", &index))
+	{
+	  index = -1;
+	  break;
+	}
+    }
+
+  print (vam->ofp, "  tunnel_index %d", index);
+
+  M (MPLS_TUNNEL_DUMP, mpls_tunnel_dump);
+  mp->tunnel_index = htonl (index);
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+#define vl_api_mpls_fib_details_t_endian vl_noop_handler
+#define vl_api_mpls_fib_details_t_print vl_noop_handler
+
+static void
+vl_api_mpls_fib_details_t_handler (vl_api_mpls_fib_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  int count = ntohl (mp->count);
+  vl_api_fib_path2_t *fp;
+  int i;
+
+  print (vam->ofp,
+	 "table-id %d, label %u, ess_bit %u",
+	 ntohl (mp->table_id), ntohl (mp->label), mp->eos_bit);
+  fp = mp->path;
+  for (i = 0; i < count; i++)
+    {
+      if (fp->afi == IP46_TYPE_IP6)
+	print (vam->ofp,
+	       "  weight %d, sw_if_index %d, is_local %d, is_drop %d, "
+	       "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
+	       ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
+	       fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
+	       format_ip6_address, fp->next_hop);
+      else if (fp->afi == IP46_TYPE_IP4)
+	print (vam->ofp,
+	       "  weight %d, sw_if_index %d, is_local %d, is_drop %d, "
+	       "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
+	       ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
+	       fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
+	       format_ip4_address, fp->next_hop);
+      fp++;
+    }
+}
+
+static void vl_api_mpls_fib_details_t_handler_json
+  (vl_api_mpls_fib_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  int count = ntohl (mp->count);
+  vat_json_node_t *node = NULL;
+  struct in_addr ip4;
+  struct in6_addr ip6;
+  vl_api_fib_path2_t *fp;
+  int i;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "table", ntohl (mp->table_id));
+  vat_json_object_add_uint (node, "s_bit", mp->eos_bit);
+  vat_json_object_add_uint (node, "label", ntohl (mp->label));
+  vat_json_object_add_uint (node, "path_count", count);
+  fp = mp->path;
+  for (i = 0; i < count; i++)
+    {
+      vat_json_object_add_uint (node, "weight", ntohl (fp->weight));
+      vat_json_object_add_uint (node, "sw_if_index", ntohl (fp->sw_if_index));
+      vat_json_object_add_uint (node, "is_local", fp->is_local);
+      vat_json_object_add_uint (node, "is_drop", fp->is_drop);
+      vat_json_object_add_uint (node, "is_unreach", fp->is_unreach);
+      vat_json_object_add_uint (node, "is_prohibit", fp->is_prohibit);
+      vat_json_object_add_uint (node, "next_hop_afi", fp->afi);
+      if (fp->afi == IP46_TYPE_IP4)
+	{
+	  clib_memcpy (&ip4, &fp->next_hop, sizeof (ip4));
+	  vat_json_object_add_ip4 (node, "next_hop", ip4);
+	}
+      else if (fp->afi == IP46_TYPE_IP6)
+	{
+	  clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6));
+	  vat_json_object_add_ip6 (node, "next_hop", ip6);
+	}
+    }
+}
+
+static int
+api_mpls_fib_dump (vat_main_t * vam)
+{
+  vl_api_mpls_fib_dump_t *mp;
+  f64 timeout;
+
+  M (MPLS_FIB_DUMP, mpls_fib_dump);
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+#define vl_api_ip_fib_details_t_endian vl_noop_handler
+#define vl_api_ip_fib_details_t_print vl_noop_handler
+
+static void
+vl_api_ip_fib_details_t_handler (vl_api_ip_fib_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  int count = ntohl (mp->count);
+  vl_api_fib_path_t *fp;
+  int i;
+
+  print (vam->ofp,
+	 "table-id %d, prefix %U/%d",
+	 ntohl (mp->table_id), format_ip4_address, mp->address,
+	 mp->address_length);
+  fp = mp->path;
+  for (i = 0; i < count; i++)
+    {
+      if (fp->afi == IP46_TYPE_IP6)
+	print (vam->ofp,
+	       "  weight %d, sw_if_index %d, is_local %d, is_drop %d, "
+	       "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
+	       ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
+	       fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
+	       format_ip6_address, fp->next_hop);
+      else if (fp->afi == IP46_TYPE_IP4)
+	print (vam->ofp,
+	       "  weight %d, sw_if_index %d, is_local %d, is_drop %d, "
+	       "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
+	       ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
+	       fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
+	       format_ip4_address, fp->next_hop);
+      fp++;
+    }
+}
+
+static void vl_api_ip_fib_details_t_handler_json
+  (vl_api_ip_fib_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  int count = ntohl (mp->count);
+  vat_json_node_t *node = NULL;
+  struct in_addr ip4;
+  struct in6_addr ip6;
+  vl_api_fib_path_t *fp;
+  int i;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "table", ntohl (mp->table_id));
+  clib_memcpy (&ip4, &mp->address, sizeof (ip4));
+  vat_json_object_add_ip4 (node, "prefix", ip4);
+  vat_json_object_add_uint (node, "mask_length", mp->address_length);
+  vat_json_object_add_uint (node, "path_count", count);
+  fp = mp->path;
+  for (i = 0; i < count; i++)
+    {
+      vat_json_object_add_uint (node, "weight", ntohl (fp->weight));
+      vat_json_object_add_uint (node, "sw_if_index", ntohl (fp->sw_if_index));
+      vat_json_object_add_uint (node, "is_local", fp->is_local);
+      vat_json_object_add_uint (node, "is_drop", fp->is_drop);
+      vat_json_object_add_uint (node, "is_unreach", fp->is_unreach);
+      vat_json_object_add_uint (node, "is_prohibit", fp->is_prohibit);
+      vat_json_object_add_uint (node, "next_hop_afi", fp->afi);
+      if (fp->afi == IP46_TYPE_IP4)
+	{
+	  clib_memcpy (&ip4, &fp->next_hop, sizeof (ip4));
+	  vat_json_object_add_ip4 (node, "next_hop", ip4);
+	}
+      else if (fp->afi == IP46_TYPE_IP6)
+	{
+	  clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6));
+	  vat_json_object_add_ip6 (node, "next_hop", ip6);
+	}
+    }
+}
+
+static int
+api_ip_fib_dump (vat_main_t * vam)
+{
+  vl_api_ip_fib_dump_t *mp;
+  f64 timeout;
+
+  M (IP_FIB_DUMP, ip_fib_dump);
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+static void vl_api_ip_neighbor_details_t_handler
+  (vl_api_ip_neighbor_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "%c %U %U",
+	 (mp->is_static) ? 'S' : 'D',
+	 format_ethernet_address, &mp->mac_address,
+	 (mp->is_ipv6) ? format_ip6_address : format_ip4_address,
+	 &mp->ip_address);
+}
+
+static void vl_api_ip_neighbor_details_t_handler_json
+  (vl_api_ip_neighbor_details_t * mp)
+{
+
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node;
+  struct in_addr ip4;
+  struct in6_addr ip6;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_string_copy (node, "flag",
+				   (mp->is_static) ? (u8 *) "static" : (u8 *)
+				   "dynamic");
+
+  vat_json_object_add_string_copy (node, "link_layer",
+				   format (0, "%U", format_ethernet_address,
+					   &mp->mac_address));
+
+  if (mp->is_ipv6)
+    {
+      clib_memcpy (&ip6, &mp->ip_address, sizeof (ip6));
+      vat_json_object_add_ip6 (node, "ip_address", ip6);
+    }
+  else
+    {
+      clib_memcpy (&ip4, &mp->ip_address, sizeof (ip4));
+      vat_json_object_add_ip4 (node, "ip_address", ip4);
+    }
+}
+
+static int
+api_ip_neighbor_dump (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ip_neighbor_dump_t *mp;
+  f64 timeout;
+  u8 is_ipv6 = 0;
+  u32 sw_if_index = ~0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	;
+      else if (unformat (i, "ip6"))
+	is_ipv6 = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  M (IP_NEIGHBOR_DUMP, ip_neighbor_dump);
+  mp->is_ipv6 = (u8) is_ipv6;
+  mp->sw_if_index = ntohl (sw_if_index);
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+#define vl_api_ip6_fib_details_t_endian vl_noop_handler
+#define vl_api_ip6_fib_details_t_print vl_noop_handler
+
+static void
+vl_api_ip6_fib_details_t_handler (vl_api_ip6_fib_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  int count = ntohl (mp->count);
+  vl_api_fib_path_t *fp;
+  int i;
+
+  print (vam->ofp,
+	 "table-id %d, prefix %U/%d",
+	 ntohl (mp->table_id), format_ip6_address, mp->address,
+	 mp->address_length);
+  fp = mp->path;
+  for (i = 0; i < count; i++)
+    {
+      if (fp->afi == IP46_TYPE_IP6)
+	print (vam->ofp,
+	       "  weight %d, sw_if_index %d, is_local %d, is_drop %d, "
+	       "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
+	       ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
+	       fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
+	       format_ip6_address, fp->next_hop);
+      else if (fp->afi == IP46_TYPE_IP4)
+	print (vam->ofp,
+	       "  weight %d, sw_if_index %d, is_local %d, is_drop %d, "
+	       "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
+	       ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
+	       fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
+	       format_ip4_address, fp->next_hop);
+      fp++;
+    }
+}
+
+static void vl_api_ip6_fib_details_t_handler_json
+  (vl_api_ip6_fib_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  int count = ntohl (mp->count);
+  vat_json_node_t *node = NULL;
+  struct in_addr ip4;
+  struct in6_addr ip6;
+  vl_api_fib_path_t *fp;
+  int i;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "table", ntohl (mp->table_id));
+  clib_memcpy (&ip6, &mp->address, sizeof (ip6));
+  vat_json_object_add_ip6 (node, "prefix", ip6);
+  vat_json_object_add_uint (node, "mask_length", mp->address_length);
+  vat_json_object_add_uint (node, "path_count", count);
+  fp = mp->path;
+  for (i = 0; i < count; i++)
+    {
+      vat_json_object_add_uint (node, "weight", ntohl (fp->weight));
+      vat_json_object_add_uint (node, "sw_if_index", ntohl (fp->sw_if_index));
+      vat_json_object_add_uint (node, "is_local", fp->is_local);
+      vat_json_object_add_uint (node, "is_drop", fp->is_drop);
+      vat_json_object_add_uint (node, "is_unreach", fp->is_unreach);
+      vat_json_object_add_uint (node, "is_prohibit", fp->is_prohibit);
+      vat_json_object_add_uint (node, "next_hop_afi", fp->afi);
+      if (fp->afi == IP46_TYPE_IP4)
+	{
+	  clib_memcpy (&ip4, &fp->next_hop, sizeof (ip4));
+	  vat_json_object_add_ip4 (node, "next_hop", ip4);
+	}
+      else if (fp->afi == IP46_TYPE_IP6)
+	{
+	  clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6));
+	  vat_json_object_add_ip6 (node, "next_hop", ip6);
+	}
+    }
+}
+
+static int
+api_ip6_fib_dump (vat_main_t * vam)
+{
+  vl_api_ip6_fib_dump_t *mp;
+  f64 timeout;
+
+  M (IP6_FIB_DUMP, ip6_fib_dump);
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+int
+api_classify_table_ids (vat_main_t * vam)
+{
+  vl_api_classify_table_ids_t *mp;
+  f64 timeout;
+
+  /* Construct the API message */
+  M (CLASSIFY_TABLE_IDS, classify_table_ids);
+  mp->context = 0;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+int
+api_classify_table_by_interface (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_classify_table_by_interface_t *mp;
+  f64 timeout;
+
+  u32 sw_if_index = ~0;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	;
+      else if (unformat (input, "sw_if_index %d", &sw_if_index))
+	;
+      else
+	break;
+    }
+  if (sw_if_index == ~0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface);
+  mp->context = 0;
+  mp->sw_if_index = ntohl (sw_if_index);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+int
+api_classify_table_info (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_classify_table_info_t *mp;
+  f64 timeout;
+
+  u32 table_id = ~0;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "table_id %d", &table_id))
+	;
+      else
+	break;
+    }
+  if (table_id == ~0)
+    {
+      errmsg ("missing table id");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (CLASSIFY_TABLE_INFO, classify_table_info);
+  mp->context = 0;
+  mp->table_id = ntohl (table_id);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+int
+api_classify_session_dump (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_classify_session_dump_t *mp;
+  f64 timeout;
+
+  u32 table_id = ~0;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "table_id %d", &table_id))
+	;
+      else
+	break;
+    }
+  if (table_id == ~0)
+    {
+      errmsg ("missing table id");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (CLASSIFY_SESSION_DUMP, classify_session_dump);
+  mp->context = 0;
+  mp->table_id = ntohl (table_id);
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static void
+vl_api_ipfix_exporter_details_t_handler (vl_api_ipfix_exporter_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "collector_address %U, collector_port %d, "
+	 "src_address %U, vrf_id %d, path_mtu %u, "
+	 "template_interval %u, udp_checksum %d",
+	 format_ip4_address, mp->collector_address,
+	 ntohs (mp->collector_port),
+	 format_ip4_address, mp->src_address,
+	 ntohl (mp->vrf_id), ntohl (mp->path_mtu),
+	 ntohl (mp->template_interval), mp->udp_checksum);
+
+  vam->retval = 0;
+  vam->result_ready = 1;
+}
+
+static void
+  vl_api_ipfix_exporter_details_t_handler_json
+  (vl_api_ipfix_exporter_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+  struct in_addr collector_address;
+  struct in_addr src_address;
+
+  vat_json_init_object (&node);
+  clib_memcpy (&collector_address, &mp->collector_address,
+	       sizeof (collector_address));
+  vat_json_object_add_ip4 (&node, "collector_address", collector_address);
+  vat_json_object_add_uint (&node, "collector_port",
+			    ntohs (mp->collector_port));
+  clib_memcpy (&src_address, &mp->src_address, sizeof (src_address));
+  vat_json_object_add_ip4 (&node, "src_address", src_address);
+  vat_json_object_add_int (&node, "vrf_id", ntohl (mp->vrf_id));
+  vat_json_object_add_uint (&node, "path_mtu", ntohl (mp->path_mtu));
+  vat_json_object_add_uint (&node, "template_interval",
+			    ntohl (mp->template_interval));
+  vat_json_object_add_int (&node, "udp_checksum", mp->udp_checksum);
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+  vam->retval = 0;
+  vam->result_ready = 1;
+}
+
+int
+api_ipfix_exporter_dump (vat_main_t * vam)
+{
+  vl_api_ipfix_exporter_dump_t *mp;
+  f64 timeout;
+
+  /* Construct the API message */
+  M (IPFIX_EXPORTER_DUMP, ipfix_exporter_dump);
+  mp->context = 0;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_ipfix_classify_stream_dump (vat_main_t * vam)
+{
+  vl_api_ipfix_classify_stream_dump_t *mp;
+  f64 timeout;
+
+  /* Construct the API message */
+  M (IPFIX_CLASSIFY_STREAM_DUMP, ipfix_classify_stream_dump);
+  mp->context = 0;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static void
+  vl_api_ipfix_classify_stream_details_t_handler
+  (vl_api_ipfix_classify_stream_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  print (vam->ofp, "domain_id %d, src_port %d",
+	 ntohl (mp->domain_id), ntohs (mp->src_port));
+  vam->retval = 0;
+  vam->result_ready = 1;
+}
+
+static void
+  vl_api_ipfix_classify_stream_details_t_handler_json
+  (vl_api_ipfix_classify_stream_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_uint (&node, "domain_id", ntohl (mp->domain_id));
+  vat_json_object_add_uint (&node, "src_port", ntohs (mp->src_port));
+
+  vat_json_print (vam->ofp, &node);
+  vat_json_free (&node);
+  vam->retval = 0;
+  vam->result_ready = 1;
+}
+
+static int
+api_ipfix_classify_table_dump (vat_main_t * vam)
+{
+  vl_api_ipfix_classify_table_dump_t *mp;
+  f64 timeout;
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%15s%15s%20s", "table_id", "ip_version",
+	     "transport_protocol");
+    }
+
+  /* Construct the API message */
+  M (IPFIX_CLASSIFY_TABLE_DUMP, ipfix_classify_table_dump);
+
+  /* send it... */
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+static void
+  vl_api_ipfix_classify_table_details_t_handler
+  (vl_api_ipfix_classify_table_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  print (vam->ofp, "%15d%15d%20d", ntohl (mp->table_id), mp->ip_version,
+	 mp->transport_protocol);
+}
+
+static void
+  vl_api_ipfix_classify_table_details_t_handler_json
+  (vl_api_ipfix_classify_table_details_t * mp)
+{
+  vat_json_node_t *node = NULL;
+  vat_main_t *vam = &vat_main;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+
+  node = vat_json_array_add (&vam->json_tree);
+  vat_json_init_object (node);
+
+  vat_json_object_add_uint (node, "table_id", ntohl (mp->table_id));
+  vat_json_object_add_uint (node, "ip_version", mp->ip_version);
+  vat_json_object_add_uint (node, "transport_protocol",
+			    mp->transport_protocol);
+}
+
+static int
+api_sw_interface_span_enable_disable (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_span_enable_disable_t *mp;
+  f64 timeout;
+  u32 src_sw_if_index = ~0;
+  u32 dst_sw_if_index = ~0;
+  u8 state = 3;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (i, "src %U", api_unformat_sw_if_index, vam, &src_sw_if_index))
+	;
+      else if (unformat (i, "src_sw_if_index %d", &src_sw_if_index))
+	;
+      else
+	if (unformat
+	    (i, "dst %U", api_unformat_sw_if_index, vam, &dst_sw_if_index))
+	;
+      else if (unformat (i, "dst_sw_if_index %d", &dst_sw_if_index))
+	;
+      else if (unformat (i, "disable"))
+	state = 0;
+      else if (unformat (i, "rx"))
+	state = 1;
+      else if (unformat (i, "tx"))
+	state = 2;
+      else if (unformat (i, "both"))
+	state = 3;
+      else
+	break;
+    }
+
+  M (SW_INTERFACE_SPAN_ENABLE_DISABLE, sw_interface_span_enable_disable);
+
+  mp->sw_if_index_from = htonl (src_sw_if_index);
+  mp->sw_if_index_to = htonl (dst_sw_if_index);
+  mp->state = state;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static void
+vl_api_sw_interface_span_details_t_handler (vl_api_sw_interface_span_details_t
+					    * mp)
+{
+  vat_main_t *vam = &vat_main;
+  u8 *sw_if_from_name = 0;
+  u8 *sw_if_to_name = 0;
+  u32 sw_if_index_from = ntohl (mp->sw_if_index_from);
+  u32 sw_if_index_to = ntohl (mp->sw_if_index_to);
+  char *states[] = { "none", "rx", "tx", "both" };
+  hash_pair_t *p;
+
+  /* *INDENT-OFF* */
+  hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
+  ({
+    if ((u32) p->value[0] == sw_if_index_from)
+      {
+        sw_if_from_name = (u8 *)(p->key);
+        if (sw_if_to_name)
+          break;
+      }
+    if ((u32) p->value[0] == sw_if_index_to)
+      {
+        sw_if_to_name = (u8 *)(p->key);
+        if (sw_if_from_name)
+          break;
+      }
+  }));
+  /* *INDENT-ON* */
+  print (vam->ofp, "%20s => %20s (%s)",
+	 sw_if_from_name, sw_if_to_name, states[mp->state]);
+}
+
+static void
+  vl_api_sw_interface_span_details_t_handler_json
+  (vl_api_sw_interface_span_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+  u8 *sw_if_from_name = 0;
+  u8 *sw_if_to_name = 0;
+  u32 sw_if_index_from = ntohl (mp->sw_if_index_from);
+  u32 sw_if_index_to = ntohl (mp->sw_if_index_to);
+  hash_pair_t *p;
+
+  /* *INDENT-OFF* */
+  hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
+  ({
+    if ((u32) p->value[0] == sw_if_index_from)
+      {
+        sw_if_from_name = (u8 *)(p->key);
+        if (sw_if_to_name)
+          break;
+      }
+    if ((u32) p->value[0] == sw_if_index_to)
+      {
+        sw_if_to_name = (u8 *)(p->key);
+        if (sw_if_from_name)
+          break;
+      }
+  }));
+  /* *INDENT-ON* */
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "src-if-index", sw_if_index_from);
+  vat_json_object_add_string_copy (node, "src-if-name", sw_if_from_name);
+  vat_json_object_add_uint (node, "dst-if-index", sw_if_index_to);
+  vat_json_object_add_string_copy (node, "dst-if-name", sw_if_to_name);
+  vat_json_object_add_uint (node, "state", mp->state);
+}
+
+static int
+api_sw_interface_span_dump (vat_main_t * vam)
+{
+  vl_api_sw_interface_span_dump_t *mp;
+  f64 timeout;
+
+  M (SW_INTERFACE_SPAN_DUMP, sw_interface_span_dump);
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+int
+api_pg_create_interface (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_pg_create_interface_t *mp;
+  f64 timeout;
+
+  u32 if_id = ~0;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "if_id %d", &if_id))
+	;
+      else
+	break;
+    }
+  if (if_id == ~0)
+    {
+      errmsg ("missing pg interface index");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (PG_CREATE_INTERFACE, pg_create_interface);
+  mp->context = 0;
+  mp->interface_id = ntohl (if_id);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+int
+api_pg_capture (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_pg_capture_t *mp;
+  f64 timeout;
+
+  u32 if_id = ~0;
+  u8 enable = 1;
+  u32 count = 1;
+  u8 pcap_file_set = 0;
+  u8 *pcap_file = 0;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "if_id %d", &if_id))
+	;
+      else if (unformat (input, "pcap %s", &pcap_file))
+	pcap_file_set = 1;
+      else if (unformat (input, "count %d", &count))
+	;
+      else if (unformat (input, "disable"))
+	enable = 0;
+      else
+	break;
+    }
+  if (if_id == ~0)
+    {
+      errmsg ("missing pg interface index");
+      return -99;
+    }
+  if (pcap_file_set > 0)
+    {
+      if (vec_len (pcap_file) > 255)
+	{
+	  errmsg ("pcap file name is too long");
+	  return -99;
+	}
+    }
+
+  u32 name_len = vec_len (pcap_file);
+  /* Construct the API message */
+  M (PG_CAPTURE, pg_capture);
+  mp->context = 0;
+  mp->interface_id = ntohl (if_id);
+  mp->is_enabled = enable;
+  mp->count = ntohl (count);
+  mp->pcap_name_length = ntohl (name_len);
+  if (pcap_file_set != 0)
+    {
+      clib_memcpy (mp->pcap_file_name, pcap_file, name_len);
+    }
+  vec_free (pcap_file);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+int
+api_pg_enable_disable (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_pg_enable_disable_t *mp;
+  f64 timeout;
+
+  u8 enable = 1;
+  u8 stream_name_set = 0;
+  u8 *stream_name = 0;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "stream %s", &stream_name))
+	stream_name_set = 1;
+      else if (unformat (input, "disable"))
+	enable = 0;
+      else
+	break;
+    }
+
+  if (stream_name_set > 0)
+    {
+      if (vec_len (stream_name) > 255)
+	{
+	  errmsg ("stream name too long");
+	  return -99;
+	}
+    }
+
+  u32 name_len = vec_len (stream_name);
+  /* Construct the API message */
+  M (PG_ENABLE_DISABLE, pg_enable_disable);
+  mp->context = 0;
+  mp->is_enabled = enable;
+  if (stream_name_set != 0)
+    {
+      mp->stream_name_length = ntohl (name_len);
+      clib_memcpy (mp->stream_name, stream_name, name_len);
+    }
+  vec_free (stream_name);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+int
+api_ip_source_and_port_range_check_add_del (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_ip_source_and_port_range_check_add_del_t *mp;
+  f64 timeout;
+
+  u16 *low_ports = 0;
+  u16 *high_ports = 0;
+  u16 this_low;
+  u16 this_hi;
+  ip4_address_t ip4_addr;
+  ip6_address_t ip6_addr;
+  u32 length;
+  u32 tmp, tmp2;
+  u8 prefix_set = 0;
+  u32 vrf_id = ~0;
+  u8 is_add = 1;
+  u8 is_ipv6 = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%U/%d", unformat_ip4_address, &ip4_addr, &length))
+	{
+	  prefix_set = 1;
+	}
+      else
+	if (unformat
+	    (input, "%U/%d", unformat_ip6_address, &ip6_addr, &length))
+	{
+	  prefix_set = 1;
+	  is_ipv6 = 1;
+	}
+      else if (unformat (input, "vrf %d", &vrf_id))
+	;
+      else if (unformat (input, "del"))
+	is_add = 0;
+      else if (unformat (input, "port %d", &tmp))
+	{
+	  if (tmp == 0 || tmp > 65535)
+	    {
+	      errmsg ("port %d out of range", tmp);
+	      return -99;
+	    }
+	  this_low = tmp;
+	  this_hi = this_low + 1;
+	  vec_add1 (low_ports, this_low);
+	  vec_add1 (high_ports, this_hi);
+	}
+      else if (unformat (input, "range %d - %d", &tmp, &tmp2))
+	{
+	  if ((tmp > tmp2) || (tmp == 0) || (tmp2 > 65535))
+	    {
+	      errmsg ("incorrect range parameters");
+	      return -99;
+	    }
+	  this_low = tmp;
+	  /* Note: in debug CLI +1 is added to high before
+	     passing to real fn that does "the work"
+	     (ip_source_and_port_range_check_add_del).
+	     This fn is a wrapper around the binary API fn a
+	     control plane will call, which expects this increment
+	     to have occurred. Hence letting the binary API control
+	     plane fn do the increment for consistency between VAT
+	     and other control planes.
+	   */
+	  this_hi = tmp2;
+	  vec_add1 (low_ports, this_low);
+	  vec_add1 (high_ports, this_hi);
+	}
+      else
+	break;
+    }
+
+  if (prefix_set == 0)
+    {
+      errmsg ("<address>/<mask> not specified");
+      return -99;
+    }
+
+  if (vrf_id == ~0)
+    {
+      errmsg ("VRF ID required, not specified");
+      return -99;
+    }
+
+  if (vrf_id == 0)
+    {
+      errmsg
+	("VRF ID should not be default. Should be distinct VRF for this purpose.");
+      return -99;
+    }
+
+  if (vec_len (low_ports) == 0)
+    {
+      errmsg ("At least one port or port range required");
+      return -99;
+    }
+
+  M (IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL,
+     ip_source_and_port_range_check_add_del);
+
+  mp->is_add = is_add;
+
+  if (is_ipv6)
+    {
+      mp->is_ipv6 = 1;
+      clib_memcpy (mp->address, &ip6_addr, sizeof (ip6_addr));
+    }
+  else
+    {
+      mp->is_ipv6 = 0;
+      clib_memcpy (mp->address, &ip4_addr, sizeof (ip4_addr));
+    }
+
+  mp->mask_length = length;
+  mp->number_of_ranges = vec_len (low_ports);
+
+  clib_memcpy (mp->low_ports, low_ports, vec_len (low_ports));
+  vec_free (low_ports);
+
+  clib_memcpy (mp->high_ports, high_ports, vec_len (high_ports));
+  vec_free (high_ports);
+
+  mp->vrf_id = ntohl (vrf_id);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+int
+api_ip_source_and_port_range_check_interface_add_del (vat_main_t * vam)
+{
+  unformat_input_t *input = vam->input;
+  vl_api_ip_source_and_port_range_check_interface_add_del_t *mp;
+  f64 timeout;
+  u32 sw_if_index = ~0;
+  int vrf_set = 0;
+  u32 tcp_out_vrf_id = ~0, udp_out_vrf_id = ~0;
+  u32 tcp_in_vrf_id = ~0, udp_in_vrf_id = ~0;
+  u8 is_add = 1;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	;
+      else if (unformat (input, "sw_if_index %d", &sw_if_index))
+	;
+      else if (unformat (input, "tcp-out-vrf %d", &tcp_out_vrf_id))
+	vrf_set = 1;
+      else if (unformat (input, "udp-out-vrf %d", &udp_out_vrf_id))
+	vrf_set = 1;
+      else if (unformat (input, "tcp-in-vrf %d", &tcp_in_vrf_id))
+	vrf_set = 1;
+      else if (unformat (input, "udp-in-vrf %d", &udp_in_vrf_id))
+	vrf_set = 1;
+      else if (unformat (input, "del"))
+	is_add = 0;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    {
+      errmsg ("Interface required but not specified");
+      return -99;
+    }
+
+  if (vrf_set == 0)
+    {
+      errmsg ("VRF ID required but not specified");
+      return -99;
+    }
+
+  if (tcp_out_vrf_id == 0
+      || udp_out_vrf_id == 0 || tcp_in_vrf_id == 0 || udp_in_vrf_id == 0)
+    {
+      errmsg
+	("VRF ID should not be default. Should be distinct VRF for this purpose.");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL,
+     ip_source_and_port_range_check_interface_add_del);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->is_add = is_add;
+  mp->tcp_out_vrf_id = ntohl (tcp_out_vrf_id);
+  mp->udp_out_vrf_id = ntohl (udp_out_vrf_id);
+  mp->tcp_in_vrf_id = ntohl (tcp_in_vrf_id);
+  mp->udp_in_vrf_id = ntohl (udp_in_vrf_id);
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+}
+
+static int
+api_ipsec_gre_add_del_tunnel (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ipsec_gre_add_del_tunnel_t *mp;
+  f64 timeout;
+  u32 local_sa_id = 0;
+  u32 remote_sa_id = 0;
+  ip4_address_t src_address;
+  ip4_address_t dst_address;
+  u8 is_add = 1;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "local_sa %d", &local_sa_id))
+	;
+      else if (unformat (i, "remote_sa %d", &remote_sa_id))
+	;
+      else if (unformat (i, "src %U", unformat_ip4_address, &src_address))
+	;
+      else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address))
+	;
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  M (IPSEC_GRE_ADD_DEL_TUNNEL, ipsec_gre_add_del_tunnel);
+
+  mp->local_sa_id = ntohl (local_sa_id);
+  mp->remote_sa_id = ntohl (remote_sa_id);
+  clib_memcpy (mp->src_address, &src_address, sizeof (src_address));
+  clib_memcpy (mp->dst_address, &dst_address, sizeof (dst_address));
+  mp->is_add = is_add;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_punt (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_punt_t *mp;
+  f64 timeout;
+  u32 ipv = ~0;
+  u32 protocol = ~0;
+  u32 port = ~0;
+  int is_add = 1;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "ip %d", &ipv))
+	;
+      else if (unformat (i, "protocol %d", &protocol))
+	;
+      else if (unformat (i, "port %d", &port))
+	;
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  M (PUNT, punt);
+
+  mp->is_add = (u8) is_add;
+  mp->ipv = (u8) ipv;
+  mp->l4_protocol = (u8) protocol;
+  mp->l4_port = htons ((u16) port);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static void vl_api_ipsec_gre_tunnel_details_t_handler
+  (vl_api_ipsec_gre_tunnel_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "%11d%15U%15U%14d%14d",
+	 ntohl (mp->sw_if_index),
+	 format_ip4_address, &mp->src_address,
+	 format_ip4_address, &mp->dst_address,
+	 ntohl (mp->local_sa_id), ntohl (mp->remote_sa_id));
+}
+
+static void vl_api_ipsec_gre_tunnel_details_t_handler_json
+  (vl_api_ipsec_gre_tunnel_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+  struct in_addr ip4;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+  clib_memcpy (&ip4, &mp->src_address, sizeof (ip4));
+  vat_json_object_add_ip4 (node, "src_address", ip4);
+  clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4));
+  vat_json_object_add_ip4 (node, "dst_address", ip4);
+  vat_json_object_add_uint (node, "local_sa_id", ntohl (mp->local_sa_id));
+  vat_json_object_add_uint (node, "remote_sa_id", ntohl (mp->remote_sa_id));
+}
+
+static int
+api_ipsec_gre_tunnel_dump (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_ipsec_gre_tunnel_dump_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else
+	break;
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      sw_if_index = ~0;
+    }
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%11s%15s%15s%14s%14s",
+	     "sw_if_index", "src_address", "dst_address",
+	     "local_sa_id", "remote_sa_id");
+    }
+
+  /* Get list of gre-tunnel interfaces */
+  M (IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump);
+
+  mp->sw_if_index = htonl (sw_if_index);
+
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+static int
+api_delete_subif (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_delete_subif_t *mp;
+  f64 timeout;
+  u32 sw_if_index = ~0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	;
+      if (unformat (i, "sw_if_index %d", &sw_if_index))
+	;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    {
+      errmsg ("missing sw_if_index");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (DELETE_SUBIF, delete_subif);
+  mp->sw_if_index = ntohl (sw_if_index);
+
+  S;
+  W;
+}
+
+#define foreach_pbb_vtr_op      \
+_("disable",  L2_VTR_DISABLED)  \
+_("pop",  L2_VTR_POP_2)         \
+_("push",  L2_VTR_PUSH_2)
+
+static int
+api_l2_interface_pbb_tag_rewrite (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_l2_interface_pbb_tag_rewrite_t *mp;
+  f64 timeout;
+  u32 sw_if_index = ~0, vtr_op = ~0;
+  u16 outer_tag = ~0;
+  u8 dmac[6], smac[6];
+  u8 dmac_set = 0, smac_set = 0;
+  u16 vlanid = 0;
+  u32 sid = ~0;
+  u32 tmp;
+
+  /* Shut up coverity */
+  memset (dmac, 0, sizeof (dmac));
+  memset (smac, 0, sizeof (smac));
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	;
+      else if (unformat (i, "vtr_op %d", &vtr_op))
+	;
+#define _(n,v) else if (unformat(i, n)) {vtr_op = v;}
+      foreach_pbb_vtr_op
+#undef _
+	else if (unformat (i, "translate_pbb_stag"))
+	{
+	  if (unformat (i, "%d", &tmp))
+	    {
+	      vtr_op = L2_VTR_TRANSLATE_2_1;
+	      outer_tag = tmp;
+	    }
+	  else
+	    {
+	      errmsg
+		("translate_pbb_stag operation requires outer tag definition");
+	      return -99;
+	    }
+	}
+      else if (unformat (i, "dmac %U", unformat_ethernet_address, dmac))
+	dmac_set++;
+      else if (unformat (i, "smac %U", unformat_ethernet_address, smac))
+	smac_set++;
+      else if (unformat (i, "sid %d", &sid))
+	;
+      else if (unformat (i, "vlanid %d", &tmp))
+	vlanid = tmp;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if ((sw_if_index == ~0) || (vtr_op == ~0))
+    {
+      errmsg ("missing sw_if_index or vtr operation");
+      return -99;
+    }
+  if (((vtr_op == L2_VTR_PUSH_2) || (vtr_op == L2_VTR_TRANSLATE_2_2))
+      && ((dmac_set == 0) || (smac_set == 0) || (sid == ~0)))
+    {
+      errmsg
+	("push and translate_qinq operations require dmac, smac, sid and optionally vlanid");
+      return -99;
+    }
+
+  M (L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite);
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->vtr_op = ntohl (vtr_op);
+  mp->outer_tag = ntohs (outer_tag);
+  clib_memcpy (mp->b_dmac, dmac, sizeof (dmac));
+  clib_memcpy (mp->b_smac, smac, sizeof (smac));
+  mp->b_vlanid = ntohs (vlanid);
+  mp->i_sid = ntohl (sid);
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_flow_classify_set_interface (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_flow_classify_set_interface_t *mp;
+  f64 timeout;
+  u32 sw_if_index;
+  int sw_if_index_set;
+  u32 ip4_table_index = ~0;
+  u32 ip6_table_index = ~0;
+  u8 is_add = 1;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	sw_if_index_set = 1;
+      else if (unformat (i, "del"))
+	is_add = 0;
+      else if (unformat (i, "ip4-table %d", &ip4_table_index))
+	;
+      else if (unformat (i, "ip6-table %d", &ip6_table_index))
+	;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  return -99;
+	}
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  M (FLOW_CLASSIFY_SET_INTERFACE, flow_classify_set_interface);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->ip4_table_index = ntohl (ip4_table_index);
+  mp->ip6_table_index = ntohl (ip6_table_index);
+  mp->is_add = is_add;
+
+  S;
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_flow_classify_dump (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_flow_classify_dump_t *mp;
+  f64 timeout = ~0;
+  u8 type = FLOW_CLASSIFY_N_TABLES;
+
+  if (unformat (i, "type %U", unformat_flow_classify_table_type, &type))
+    ;
+  else
+    {
+      errmsg ("classify table type must be specified");
+      return -99;
+    }
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%10s%20s", "Intfc idx", "Classify table");
+    }
+
+  M (FLOW_CLASSIFY_DUMP, flow_classify_dump);
+  mp->type = type;
+  /* send it... */
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  /* Wait for a reply... */
+  W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int
+api_feature_enable_disable (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_feature_enable_disable_t *mp;
+  f64 timeout;
+  u8 *arc_name = 0;
+  u8 *feature_name = 0;
+  u32 sw_if_index = ~0;
+  u8 enable = 1;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "arc_name %s", &arc_name))
+	;
+      else if (unformat (i, "feature_name %s", &feature_name))
+	;
+      else
+	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	;
+      else if (unformat (i, "disable"))
+	enable = 0;
+      else
+	break;
+    }
+
+  if (arc_name == 0)
+    {
+      errmsg ("missing arc name");
+      return -99;
+    }
+  if (vec_len (arc_name) > 63)
+    {
+      errmsg ("arc name too long");
+    }
+
+  if (feature_name == 0)
+    {
+      errmsg ("missing feature name");
+      return -99;
+    }
+  if (vec_len (feature_name) > 63)
+    {
+      errmsg ("feature name too long");
+    }
+
+  if (sw_if_index == ~0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (FEATURE_ENABLE_DISABLE, feature_enable_disable);
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->enable = enable;
+  clib_memcpy (mp->arc_name, arc_name, vec_len (arc_name));
+  clib_memcpy (mp->feature_name, feature_name, vec_len (feature_name));
+  vec_free (arc_name);
+  vec_free (feature_name);
+
+  S;
+  W;
+}
+
+static int
+api_sw_interface_tag_add_del (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_tag_add_del_t *mp;
+  f64 timeout;
+  u32 sw_if_index = ~0;
+  u8 *tag = 0;
+  u8 enable = 1;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "tag %s", &tag))
+	;
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	;
+      else if (unformat (i, "del"))
+	enable = 0;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  if (enable && (tag == 0))
+    {
+      errmsg ("no tag specified");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del);
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->is_add = enable;
+  if (enable)
+    strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1);
+  vec_free (tag);
+
+  S;
+  W;
+}
+
+static void vl_api_l2_xconnect_details_t_handler
+  (vl_api_l2_xconnect_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+
+  print (vam->ofp, "%15d%15d",
+	 ntohl (mp->rx_sw_if_index), ntohl (mp->tx_sw_if_index));
+}
+
+static void vl_api_l2_xconnect_details_t_handler_json
+  (vl_api_l2_xconnect_details_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  vat_json_node_t *node = NULL;
+
+  if (VAT_JSON_ARRAY != vam->json_tree.type)
+    {
+      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+      vat_json_init_array (&vam->json_tree);
+    }
+  node = vat_json_array_add (&vam->json_tree);
+
+  vat_json_init_object (node);
+  vat_json_object_add_uint (node, "rx_sw_if_index",
+			    ntohl (mp->rx_sw_if_index));
+  vat_json_object_add_uint (node, "tx_sw_if_index",
+			    ntohl (mp->tx_sw_if_index));
+}
+
+static int
+api_l2_xconnect_dump (vat_main_t * vam)
+{
+  vl_api_l2_xconnect_dump_t *mp;
+  f64 timeout;
+
+  if (!vam->json_output)
+    {
+      print (vam->ofp, "%15s%15s", "rx_sw_if_index", "tx_sw_if_index");
+    }
+
+  M (L2_XCONNECT_DUMP, l2_xconnect_dump);
+
+  S;
+
+  /* Use a control ping for synchronization */
+  {
+    vl_api_control_ping_t *mp;
+    M (CONTROL_PING, control_ping);
+    S;
+  }
+  W;
+}
+
+static int
+api_sw_interface_set_mtu (vat_main_t * vam)
+{
+  unformat_input_t *i = vam->input;
+  vl_api_sw_interface_set_mtu_t *mp;
+  f64 timeout;
+  u32 sw_if_index = ~0;
+  u32 mtu = 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "mtu %d", &mtu))
+	;
+      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+	;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    {
+      errmsg ("missing interface name or sw_if_index");
+      return -99;
+    }
+
+  if (mtu == 0)
+    {
+      errmsg ("no mtu specified");
+      return -99;
+    }
+
+  /* Construct the API message */
+  M (SW_INTERFACE_SET_MTU, sw_interface_set_mtu);
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->mtu = ntohs ((u16) mtu);
+
+  S;
+  W;
+}
+
+
+static int
+q_or_quit (vat_main_t * vam)
+{
+  longjmp (vam->jump_buf, 1);
+  return 0;			/* not so much */
+}
+
+static int
+q (vat_main_t * vam)
+{
+  return q_or_quit (vam);
+}
+
+static int
+quit (vat_main_t * vam)
+{
+  return q_or_quit (vam);
+}
+
+static int
+comment (vat_main_t * vam)
+{
+  return 0;
+}
+
+static int
+cmd_cmp (void *a1, void *a2)
+{
+  u8 **c1 = a1;
+  u8 **c2 = a2;
+
+  return strcmp ((char *) (c1[0]), (char *) (c2[0]));
+}
+
+static int
+help (vat_main_t * vam)
+{
+  u8 **cmds = 0;
+  u8 *name = 0;
+  hash_pair_t *p;
+  unformat_input_t *i = vam->input;
+  int j;
+
+  if (unformat (i, "%s", &name))
+    {
+      uword *hs;
+
+      vec_add1 (name, 0);
+
+      hs = hash_get_mem (vam->help_by_name, name);
+      if (hs)
+	print (vam->ofp, "usage: %s %s", name, hs[0]);
+      else
+	print (vam->ofp, "No such msg / command '%s'", name);
+      vec_free (name);
+      return 0;
+    }
+
+  print (vam->ofp, "Help is available for the following:");
+
+    /* *INDENT-OFF* */
+    hash_foreach_pair (p, vam->function_by_name,
+    ({
+      vec_add1 (cmds, (u8 *)(p->key));
+    }));
+    /* *INDENT-ON* */
+
+  vec_sort_with_function (cmds, cmd_cmp);
+
+  for (j = 0; j < vec_len (cmds); j++)
+    print (vam->ofp, "%s", cmds[j]);
+
+  vec_free (cmds);
+  return 0;
+}
+
+static int
+set (vat_main_t * vam)
+{
+  u8 *name = 0, *value = 0;
+  unformat_input_t *i = vam->input;
+
+  if (unformat (i, "%s", &name))
+    {
+      /* The input buffer is a vector, not a string. */
+      value = vec_dup (i->buffer);
+      vec_delete (value, i->index, 0);
+      /* Almost certainly has a trailing newline */
+      if (value[vec_len (value) - 1] == '\n')
+	value[vec_len (value) - 1] = 0;
+      /* Make sure it's a proper string, one way or the other */
+      vec_add1 (value, 0);
+      (void) clib_macro_set_value (&vam->macro_main,
+				   (char *) name, (char *) value);
+    }
+  else
+    errmsg ("usage: set <name> <value>");
+
+  vec_free (name);
+  vec_free (value);
+  return 0;
+}
+
+static int
+unset (vat_main_t * vam)
+{
+  u8 *name = 0;
+
+  if (unformat (vam->input, "%s", &name))
+    if (clib_macro_unset (&vam->macro_main, (char *) name) == 1)
+      errmsg ("unset: %s wasn't set", name);
+  vec_free (name);
+  return 0;
+}
+
+typedef struct
+{
+  u8 *name;
+  u8 *value;
+} macro_sort_t;
+
+
+static int
+macro_sort_cmp (void *a1, void *a2)
+{
+  macro_sort_t *s1 = a1;
+  macro_sort_t *s2 = a2;
+
+  return strcmp ((char *) (s1->name), (char *) (s2->name));
+}
+
+static int
+dump_macro_table (vat_main_t * vam)
+{
+  macro_sort_t *sort_me = 0, *sm;
+  int i;
+  hash_pair_t *p;
+
+    /* *INDENT-OFF* */
+    hash_foreach_pair (p, vam->macro_main.the_value_table_hash,
+    ({
+      vec_add2 (sort_me, sm, 1);
+      sm->name = (u8 *)(p->key);
+      sm->value = (u8 *) (p->value[0]);
+    }));
+    /* *INDENT-ON* */
+
+  vec_sort_with_function (sort_me, macro_sort_cmp);
+
+  if (vec_len (sort_me))
+    print (vam->ofp, "%-15s%s", "Name", "Value");
+  else
+    print (vam->ofp, "The macro table is empty...");
+
+  for (i = 0; i < vec_len (sort_me); i++)
+    print (vam->ofp, "%-15s%s", sort_me[i].name, sort_me[i].value);
+  return 0;
+}
+
+static int
+dump_node_table (vat_main_t * vam)
+{
+  int i, j;
+  vlib_node_t *node, *next_node;
+
+  if (vec_len (vam->graph_nodes) == 0)
+    {
+      print (vam->ofp, "Node table empty, issue get_node_graph...");
+      return 0;
+    }
+
+  for (i = 0; i < vec_len (vam->graph_nodes); i++)
+    {
+      node = vam->graph_nodes[i];
+      print (vam->ofp, "[%d] %s", i, node->name);
+      for (j = 0; j < vec_len (node->next_nodes); j++)
+	{
+	  if (node->next_nodes[j] != ~0)
+	    {
+	      next_node = vam->graph_nodes[node->next_nodes[j]];
+	      print (vam->ofp, "  [%d] %s", j, next_node->name);
+	    }
+	}
+    }
+  return 0;
+}
+
+static int
+value_sort_cmp (void *a1, void *a2)
+{
+  name_sort_t *n1 = a1;
+  name_sort_t *n2 = a2;
+
+  if (n1->value < n2->value)
+    return -1;
+  if (n1->value > n2->value)
+    return 1;
+  return 0;
+}
+
+
+static int
+dump_msg_api_table (vat_main_t * vam)
+{
+  api_main_t *am = &api_main;
+  name_sort_t *nses = 0, *ns;
+  hash_pair_t *hp;
+  int i;
+
+  /* *INDENT-OFF* */
+  hash_foreach_pair (hp, am->msg_index_by_name_and_crc,
+  ({
+    vec_add2 (nses, ns, 1);
+    ns->name = (u8 *)(hp->key);
+    ns->value = (u32) hp->value[0];
+  }));
+  /* *INDENT-ON* */
+
+  vec_sort_with_function (nses, value_sort_cmp);
+
+  for (i = 0; i < vec_len (nses); i++)
+    print (vam->ofp, " [%d]: %s", nses[i].value, nses[i].name);
+  vec_free (nses);
+  return 0;
+}
+
+static int
+get_msg_id (vat_main_t * vam)
+{
+  u8 *name_and_crc;
+  u32 message_index;
+
+  if (unformat (vam->input, "%s", &name_and_crc))
+    {
+      message_index = vl_api_get_msg_index (name_and_crc);
+      if (message_index == ~0)
+	{
+	  print (vam->ofp, " '%s' not found", name_and_crc);
+	  return 0;
+	}
+      print (vam->ofp, " '%s' has message index %d",
+	     name_and_crc, message_index);
+      return 0;
+    }
+  errmsg ("name_and_crc required...");
+  return 0;
+}
+
+static int
+search_node_table (vat_main_t * vam)
+{
+  unformat_input_t *line_input = vam->input;
+  u8 *node_to_find;
+  int j;
+  vlib_node_t *node, *next_node;
+  uword *p;
+
+  if (vam->graph_node_index_by_name == 0)
+    {
+      print (vam->ofp, "Node table empty, issue get_node_graph...");
+      return 0;
+    }
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "%s", &node_to_find))
+	{
+	  vec_add1 (node_to_find, 0);
+	  p = hash_get_mem (vam->graph_node_index_by_name, node_to_find);
+	  if (p == 0)
+	    {
+	      print (vam->ofp, "%s not found...", node_to_find);
+	      goto out;
+	    }
+	  node = vam->graph_nodes[p[0]];
+	  print (vam->ofp, "[%d] %s", p[0], node->name);
+	  for (j = 0; j < vec_len (node->next_nodes); j++)
+	    {
+	      if (node->next_nodes[j] != ~0)
+		{
+		  next_node = vam->graph_nodes[node->next_nodes[j]];
+		  print (vam->ofp, "  [%d] %s", j, next_node->name);
+		}
+	    }
+	}
+
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error,
+			line_input);
+	  return -99;
+	}
+
+    out:
+      vec_free (node_to_find);
+
+    }
+
+  return 0;
+}
+
+
+static int
+script (vat_main_t * vam)
+{
+#if (VPP_API_TEST_BUILTIN==0)
+  u8 *s = 0;
+  char *save_current_file;
+  unformat_input_t save_input;
+  jmp_buf save_jump_buf;
+  u32 save_line_number;
+
+  FILE *new_fp, *save_ifp;
+
+  if (unformat (vam->input, "%s", &s))
+    {
+      new_fp = fopen ((char *) s, "r");
+      if (new_fp == 0)
+	{
+	  errmsg ("Couldn't open script file %s", s);
+	  vec_free (s);
+	  return -99;
+	}
+    }
+  else
+    {
+      errmsg ("Missing script name");
+      return -99;
+    }
+
+  clib_memcpy (&save_input, &vam->input, sizeof (save_input));
+  clib_memcpy (&save_jump_buf, &vam->jump_buf, sizeof (save_jump_buf));
+  save_ifp = vam->ifp;
+  save_line_number = vam->input_line_number;
+  save_current_file = (char *) vam->current_file;
+
+  vam->input_line_number = 0;
+  vam->ifp = new_fp;
+  vam->current_file = s;
+  do_one_file (vam);
+
+  clib_memcpy (&vam->input, &save_input, sizeof (vam->input));
+  clib_memcpy (&vam->jump_buf, &save_jump_buf, sizeof (save_jump_buf));
+  vam->ifp = save_ifp;
+  vam->input_line_number = save_line_number;
+  vam->current_file = (u8 *) save_current_file;
+  vec_free (s);
+
+  return 0;
+#else
+  clib_warning ("use the exec command...");
+  return -99;
+#endif
+}
+
+static int
+echo (vat_main_t * vam)
+{
+  print (vam->ofp, "%v", vam->input->buffer);
+  return 0;
+}
+
+/* List of API message constructors, CLI names map to api_xxx */
+#define foreach_vpe_api_msg                                             \
+_(create_loopback,"[mac <mac-addr>]")                                   \
+_(sw_interface_dump,"")                                                 \
+_(sw_interface_set_flags,                                               \
+  "<intfc> | sw_if_index <id> admin-up | admin-down link-up | link down") \
+_(sw_interface_add_del_address,                                         \
+  "<intfc> | sw_if_index <id> <ip4-address> | <ip6-address> [del] [del-all] ") \
+_(sw_interface_set_table,                                               \
+  "<intfc> | sw_if_index <id> vrf <table-id> [ipv6]")                   \
+_(sw_interface_set_mpls_enable,                                         \
+  "<intfc> | sw_if_index [disable | dis]")                              \
+_(sw_interface_set_vpath,                                               \
+  "<intfc> | sw_if_index <id> enable | disable")                        \
+_(sw_interface_set_vxlan_bypass,                                        \
+  "<intfc> | sw_if_index <id> [ip4 | ip6] enable | disable")            \
+_(sw_interface_set_l2_xconnect,                                         \
+  "rx <intfc> | rx_sw_if_index <id> tx <intfc> | tx_sw_if_index <id>\n" \
+  "enable | disable")                                                   \
+_(sw_interface_set_l2_bridge,                                           \
+  "<intfc> | sw_if_index <id> bd_id <bridge-domain-id>\n"               \
+  "[shg <split-horizon-group>] [bvi]\n"                                 \
+  "enable | disable")                                                   \
+_(sw_interface_set_dpdk_hqos_pipe,                                      \
+  "rx <intfc> | sw_if_index <id> subport <subport-id> pipe <pipe-id>\n" \
+  "profile <profile-id>\n")                                             \
+_(sw_interface_set_dpdk_hqos_subport,                                   \
+  "rx <intfc> | sw_if_index <id> subport <subport-id> [rate <n>]\n"     \
+  "[bktsize <n>] [tc0 <n>] [tc1 <n>] [tc2 <n>] [tc3 <n>] [period <n>]\n") \
+_(sw_interface_set_dpdk_hqos_tctbl,                                     \
+  "rx <intfc> | sw_if_index <id> entry <n> tc <n> queue <n>\n")         \
+_(bridge_domain_add_del,                                                \
+  "bd_id <bridge-domain-id> [flood 1|0] [uu-flood 1|0] [forward 1|0] [learn 1|0] [arp-term 1|0] [del]\n") \
+_(bridge_domain_dump, "[bd_id <bridge-domain-id>]\n")                   \
+_(l2fib_add_del,                                                        \
+  "mac <mac-addr> bd_id <bridge-domain-id> [del] | sw_if <intfc> | sw_if_index <id> [static] [filter] [bvi] [count <nn>]\n") \
+_(l2_flags,                                                             \
+  "sw_if <intfc> | sw_if_index <id> [learn] [forward] [uu-flood] [flood]\n") \
+_(bridge_flags,                                                         \
+  "bd_id <bridge-domain-id> [learn] [forward] [uu-flood] [flood] [arp-term] [disable]\n") \
+_(tap_connect,                                                          \
+  "tapname <name> mac <mac-addr> | random-mac [tag <string>]")          \
+_(tap_modify,                                                           \
+  "<vpp-if-name> | sw_if_index <id> tapname <name> mac <mac-addr> | random-mac") \
+_(tap_delete,                                                           \
+  "<vpp-if-name> | sw_if_index <id>")                                   \
+_(sw_interface_tap_dump, "")                                            \
+_(ip_add_del_route,                                                     \
+  "<addr>/<mask> via <addr> [table-id <n>]\n"                           \
+  "[<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n"               \
+  "[weight <n>] [drop] [local] [classify <n>] [del]\n"                  \
+  "[multipath] [count <n>]")                                            \
+_(mpls_route_add_del,                                                   \
+  "<label> <eos> via <addr> [table-id <n>]\n"                           \
+  "[<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n"               \
+  "[weight <n>] [drop] [local] [classify <n>] [del]\n"                  \
+  "[multipath] [count <n>]")                                            \
+_(mpls_ip_bind_unbind,                                                  \
+  "<label> <addr/len>")                                                 \
+_(mpls_tunnel_add_del,                                                  \
+  " via <addr> [table-id <n>]\n"                                        \
+  "sw_if_index <id>] [l2]  [del]")                                      \
+_(proxy_arp_add_del,                                                    \
+  "<lo-ip4-addr> - <hi-ip4-addr> [vrf <n>] [del]")                      \
+_(proxy_arp_intfc_enable_disable,                                       \
+  "<intfc> | sw_if_index <id> enable | disable")                        \
+_(sw_interface_set_unnumbered,                                          \
+  "<intfc> | sw_if_index <id> unnum_if_index <id> [del]")               \
+_(ip_neighbor_add_del,                                                  \
+  "(<intfc> | sw_if_index <id>) dst <ip46-address> "                    \
+  "[mac <mac-addr>] [vrf <vrf-id>] [is_static] [del]")                  \
+_(reset_vrf, "vrf <id> [ipv6]")                                         \
+_(create_vlan_subif, "<intfc> | sw_if_index <id> vlan <n>")             \
+_(create_subif, "<intfc> | sw_if_index <id> sub_id <n>\n"               \
+  "[outer_vlan_id <n>][inner_vlan_id <n>]\n"                            \
+  "[no_tags][one_tag][two_tags][dot1ad][exact_match][default_sub]\n"    \
+  "[outer_vlan_id_any][inner_vlan_id_any]")                             \
+_(oam_add_del, "src <ip4-address> dst <ip4-address> [vrf <n>] [del]")   \
+_(reset_fib, "vrf <n> [ipv6]")                                          \
+_(dhcp_proxy_config,                                                    \
+  "svr <v46-address> src <v46-address>\n"                               \
+   "insert-cid <n> [del]")                                              \
+_(dhcp_proxy_config_2,                                                  \
+  "svr <v46-address> src <v46-address>\n"                               \
+   "rx_vrf_id <nn> server_vrf_id <nn> insert-cid <n> [del]")            \
+_(dhcp_proxy_set_vss,                                                   \
+  "tbl_id <n> fib_id <n> oui <n> [ipv6] [del]")                         \
+_(dhcp_client_config,                                                   \
+  "<intfc> | sw_if_index <id> [hostname <name>] [disable_event] [del]") \
+_(set_ip_flow_hash,                                                     \
+  "vrf <n> [src] [dst] [sport] [dport] [proto] [reverse] [ipv6]")       \
+_(sw_interface_ip6_enable_disable,                                      \
+  "<intfc> | sw_if_index <id> enable | disable")                        \
+_(sw_interface_ip6_set_link_local_address,                              \
+  "<intfc> | sw_if_index <id> <ip6-address>/<mask-width>")              \
+_(sw_interface_ip6nd_ra_prefix,                                         \
+  "<intfc> | sw_if_index <id> <ip6-address>/<mask-width>\n"             \
+  "val_life <n> pref_life <n> [def] [noadv] [offl] [noauto]\n"          \
+  "[nolink] [isno]")                                                    \
+_(sw_interface_ip6nd_ra_config,                                         \
+  "<intfc> | sw_if_index <id> [maxint <n>] [minint <n>]\n"              \
+  "[life <n>] [count <n>] [interval <n>] [suppress]\n"                  \
+  "[managed] [other] [ll] [send] [cease] [isno] [def]")                 \
+_(set_arp_neighbor_limit, "arp_nbr_limit <n> [ipv6]")                   \
+_(l2_patch_add_del,                                                     \
+  "rx <intfc> | rx_sw_if_index <id> tx <intfc> | tx_sw_if_index <id>\n" \
+  "enable | disable")                                                   \
+_(sr_tunnel_add_del,                                                    \
+  "[name <name>] src <ip6-addr> dst <ip6-addr>/<mw> \n"                 \
+  "(next <ip6-addr>)+ [tag <ip6-addr>]* [clean] [reroute] \n"           \
+  "[policy <policy_name>]")						\
+_(sr_policy_add_del,                                                    \
+  "name <name> tunnel <tunnel-name> [tunnel <tunnel-name>]* [del]")	\
+_(sr_multicast_map_add_del,                                             \
+  "address [ip6 multicast address] sr-policy [policy name] [del]")	\
+_(classify_add_del_table,                                               \
+  "buckets <nn> [skip <n>] [match <n>] [memory_size <nn-bytes>]\n"	\
+  " [del] [del-chain] mask <mask-value>\n"                              \
+  " [l2-miss-next | miss-next | acl-miss-next] <name|nn>\n" 		\
+  " [current-data-flag <n>] [current-data-offset <nn>] [table <nn>]")   \
+_(classify_add_del_session,                                             \
+  "[hit-next|l2-hit-next|acl-hit-next|policer-hit-next] <name|nn>\n"    \
+  "  table-index <nn> skip_n <nn> match_n <nn> match [hex] [l2]\n"      \
+  "  [l3 [ip4|ip6]] [action set-ip4-fib-id <nn>]\n"                     \
+  "  [action set-ip6-fib-id <nn> | action <n> metadata <nn>] [del]")    \
+_(classify_set_interface_ip_table,                                      \
+  "<intfc> | sw_if_index <nn> table <nn>")				\
+_(classify_set_interface_l2_tables,                                     \
+  "<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>]\n"      \
+  "  [other-table <nn>]")                                               \
+_(get_node_index, "node <node-name")                                    \
+_(add_node_next, "node <node-name> next <next-node-name>")              \
+_(l2tpv3_create_tunnel,                                                 \
+  "client_address <ip6-addr> our_address <ip6-addr>\n"                  \
+  "[local_session_id <nn>][remote_session_id <nn>][local_cookie <nn>]\n" \
+  "[remote_cookie <nn>]\n[l2-sublayer-preset]\n")                       \
+_(l2tpv3_set_tunnel_cookies,                                            \
+  "<intfc> | sw_if_index <nn> [new_local_cookie <nn>]\n"                \
+  "[new_remote_cookie <nn>]\n")                                         \
+_(l2tpv3_interface_enable_disable,                                      \
+  "<intfc> | sw_if_index <nn> enable | disable")                        \
+_(l2tpv3_set_lookup_key,                                                \
+  "lookup_v6_src | lookup_v6_dst | lookup_session_id")                  \
+_(sw_if_l2tpv3_tunnel_dump, "")                                         \
+_(vxlan_add_del_tunnel,                                                 \
+  "src <ip-addr> { dst <ip-addr> | group <mcast-ip-addr>\n"             \
+  "{ <intfc> | mcast_sw_if_index <nn> } }\n"                            \
+  "vni <vni> [encap-vrf-id <nn>] [decap-next <l2|nn>] [del]")           \
+_(vxlan_tunnel_dump, "[<intfc> | sw_if_index <nn>]")                    \
+_(gre_add_del_tunnel,                                                   \
+  "src <ip4-addr> dst <ip4-addr> [outer-fib-id <nn>] [teb] [del]\n")    \
+_(gre_tunnel_dump, "[<intfc> | sw_if_index <nn>]")                      \
+_(l2_fib_clear_table, "")                                               \
+_(l2_interface_efp_filter, "sw_if_index <nn> enable | disable")         \
+_(l2_interface_vlan_tag_rewrite,                                        \
+  "<intfc> | sw_if_index <nn> \n"                                       \
+  "[disable][push-[1|2]][pop-[1|2]][translate-1-[1|2]] \n"              \
+  "[translate-2-[1|2]] [push_dot1q 0] tag1 <nn> tag2 <nn>")             \
+_(create_vhost_user_if,                                                 \
+        "socket <filename> [server] [renumber <dev_instance>] "         \
+        "[mac <mac_address>]")                                          \
+_(modify_vhost_user_if,                                                 \
+        "<intfc> | sw_if_index <nn> socket <filename>\n"                \
+        "[server] [renumber <dev_instance>]")                           \
+_(delete_vhost_user_if, "<intfc> | sw_if_index <nn>")                   \
+_(sw_interface_vhost_user_dump, "")                                     \
+_(show_version, "")                                                     \
+_(vxlan_gpe_add_del_tunnel,                                             \
+  "local <addr> remote <addr> vni <nn>\n"                               \
+    "[encap-vrf-id <nn>] [decap-vrf-id <nn>] [next-ip4][next-ip6]"      \
+  "[next-ethernet] [next-nsh]\n")                                       \
+_(vxlan_gpe_tunnel_dump, "[<intfc> | sw_if_index <nn>]")                \
+_(l2_fib_table_dump, "bd_id <bridge-domain-id>")			\
+_(interface_name_renumber,                                              \
+  "<intfc> | sw_if_index <nn> new_show_dev_instance <nn>")		\
+_(input_acl_set_interface,                                              \
+  "<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>]\n"      \
+  "  [l2-table <nn>] [del]")                                            \
+_(want_ip4_arp_events, "address <ip4-address> [del]")                   \
+_(want_ip6_nd_events, "address <ip6-address> [del]")                    \
+_(ip_address_dump, "(ipv4 | ipv6) (<intfc> | sw_if_index <id>)")        \
+_(ip_dump, "ipv4 | ipv6")                                               \
+_(ipsec_spd_add_del, "spd_id <n> [del]")                                \
+_(ipsec_interface_add_del_spd, "(<intfc> | sw_if_index <id>)\n"         \
+  "  spid_id <n> ")                                                     \
+_(ipsec_sad_add_del_entry, "sad_id <n> spi <n> crypto_alg <alg>\n"      \
+  "  crypto_key <hex> tunnel_src <ip4|ip6> tunnel_dst <ip4|ip6>\n"      \
+  "  integ_alg <alg> integ_key <hex>")                                  \
+_(ipsec_spd_add_del_entry, "spd_id <n> priority <n> action <action>\n"  \
+  "  (inbound|outbound) [sa_id <n>] laddr_start <ip4|ip6>\n"            \
+  "  laddr_stop <ip4|ip6> raddr_start <ip4|ip6> raddr_stop <ip4|ip6>\n" \
+  "  [lport_start <n> lport_stop <n>] [rport_start <n> rport_stop <n>]" ) \
+_(ipsec_sa_set_key, "sa_id <n> crypto_key <hex> integ_key <hex>")       \
+_(ikev2_profile_add_del, "name <profile_name> [del]")                   \
+_(ikev2_profile_set_auth, "name <profile_name> auth_method <method>\n"  \
+  "(auth_data 0x<data> | auth_data <data>)")                            \
+_(ikev2_profile_set_id, "name <profile_name> id_type <type>\n"          \
+  "(id_data 0x<data> | id_data <data>) (local|remote)")                 \
+_(ikev2_profile_set_ts, "name <profile_name> protocol <proto>\n"        \
+  "start_port <port> end_port <port> start_addr <ip4> end_addr <ip4>\n" \
+  "(local|remote)")                                                     \
+_(ikev2_set_local_key, "file <absolute_file_path>")                     \
+_(delete_loopback,"sw_if_index <nn>")                                   \
+_(bd_ip_mac_add_del, "bd_id <bridge-domain-id> <ip4/6-addr> <mac-addr> [del]") \
+_(map_add_domain,                                                       \
+  "ip4-pfx <ip4pfx> ip6-pfx <ip6pfx> "					\
+  "ip6-src <ip6addr> "							\
+  "ea-bits-len <n> psid-offset <n> psid-len <n>")			\
+_(map_del_domain, "index <n>")                                          \
+_(map_add_del_rule,                                                     \
+  "index <n> psid <n> dst <ip6addr> [del]")                             \
+_(map_domain_dump, "")                                                  \
+_(map_rule_dump, "index <map-domain>")                                  \
+_(want_interface_events,  "enable|disable")                             \
+_(want_stats,"enable|disable")                                          \
+_(get_first_msg_id, "client <name>")					\
+_(cop_interface_enable_disable, "<intfc> | sw_if_index <nn> [disable]") \
+_(cop_whitelist_enable_disable, "<intfc> | sw_if_index <nn>\n"		\
+  "fib-id <nn> [ip4][ip6][default]")					\
+_(get_node_graph, " ")                                                  \
+_(sw_interface_clear_stats,"<intfc> | sw_if_index <nn>")                \
+_(ioam_enable, "[trace] [pow] [ppc <encap|decap>]")                     \
+_(ioam_disable, "")                                                     \
+_(lisp_add_del_locator_set, "locator-set <locator_name> [iface <intf> |" \
+                            " sw_if_index <sw_if_index> p <priority> "  \
+                            "w <weight>] [del]")                        \
+_(lisp_add_del_locator, "locator-set <locator_name> "                   \
+                        "iface <intf> | sw_if_index <sw_if_index> "     \
+                        "p <priority> w <weight> [del]")                \
+_(lisp_add_del_local_eid,"vni <vni> eid "                               \
+                         "<ipv4|ipv6>/<prefix> | <L2 address> "         \
+                         "locator-set <locator_name> [del]"             \
+                         "[key-id sha1|sha256 secret-key <secret-key>]") \
+_(lisp_gpe_add_del_fwd_entry, "rmt_eid <eid> [lcl_eid <eid>] vni <vni>" \
+  "dp_table <table> loc-pair <lcl_loc> <rmt_loc> ... [del]")            \
+_(lisp_add_del_map_resolver, "<ip4|6-addr> [del]")                      \
+_(lisp_add_del_map_server, "<ip4|6-addr> [del]")                        \
+_(lisp_gpe_enable_disable, "enable|disable")                            \
+_(lisp_enable_disable, "enable|disable")                                \
+_(lisp_map_register_enable_disable, "enable|disable")                   \
+_(lisp_rloc_probe_enable_disable, "enable|disable")                     \
+_(lisp_gpe_add_del_iface, "up|down")                                    \
+_(lisp_add_del_remote_mapping, "add|del vni <vni> eid <dest-eid> "      \
+                               "[seid <seid>] "                         \
+                               "rloc <locator> p <prio> "               \
+                               "w <weight> [rloc <loc> ... ] "          \
+                               "action <action> [del-all]")             \
+_(lisp_add_del_adjacency, "add|del vni <vni> reid <remote-eid> leid "   \
+                          "<local-eid>")                                \
+_(lisp_pitr_set_locator_set, "locator-set <loc-set-name> | del")        \
+_(lisp_map_request_mode, "src-dst|dst-only")                            \
+_(lisp_add_del_map_request_itr_rlocs, "<loc-set-name> [del]")           \
+_(lisp_eid_table_add_del_map, "[del] vni <vni> vrf <vrf>")              \
+_(lisp_locator_set_dump, "[local | remote]")                            \
+_(lisp_locator_dump, "ls_index <index> | ls_name <name>")               \
+_(lisp_eid_table_dump, "[eid <ipv4|ipv6>/<prefix> | <mac>] [vni] "      \
+                       "[local] | [remote]")                            \
+_(lisp_eid_table_vni_dump, "")                                          \
+_(lisp_eid_table_map_dump, "l2|l3")                                     \
+_(lisp_gpe_tunnel_dump, "")                                             \
+_(lisp_map_resolver_dump, "")                                           \
+_(lisp_map_server_dump, "")                                             \
+_(lisp_adjacencies_get, "vni <vni>")                                    \
+_(show_lisp_rloc_probe_state, "")                                       \
+_(show_lisp_map_register_state, "")                                     \
+_(show_lisp_status, "")                                                 \
+_(lisp_get_map_request_itr_rlocs, "")                                   \
+_(show_lisp_pitr, "")                                                   \
+_(show_lisp_map_request_mode, "")                                       \
+_(af_packet_create, "name <host interface name> [hw_addr <mac>]")       \
+_(af_packet_delete, "name <host interface name>")                       \
+_(policer_add_del, "name <policer name> <params> [del]")                \
+_(policer_dump, "[name <policer name>]")                                \
+_(policer_classify_set_interface,                                       \
+  "<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>]\n"      \
+  "  [l2-table <nn>] [del]")                                            \
+_(policer_classify_dump, "type [ip4|ip6|l2]")                           \
+_(netmap_create, "name <interface name> [hw-addr <mac>] [pipe] "        \
+    "[master|slave]")                                                   \
+_(netmap_delete, "name <interface name>")                               \
+_(mpls_tunnel_dump, "tunnel_index <tunnel-id>")                         \
+_(mpls_fib_dump, "")                                                    \
+_(classify_table_ids, "")                                               \
+_(classify_table_by_interface, "sw_if_index <sw_if_index>")             \
+_(classify_table_info, "table_id <nn>")                                 \
+_(classify_session_dump, "table_id <nn>")                               \
+_(set_ipfix_exporter, "collector_address <ip4> [collector_port <nn>] "  \
+    "src_address <ip4> [vrf_id <nn>] [path_mtu <nn>] "                  \
+    "[template_interval <nn>] [udp_checksum]")                          \
+_(ipfix_exporter_dump, "")                                              \
+_(set_ipfix_classify_stream, "[domain <domain-id>] [src_port <src-port>]") \
+_(ipfix_classify_stream_dump, "")                                       \
+_(ipfix_classify_table_add_del, "table <table-index> ip4|ip6 [tcp|udp]") \
+_(ipfix_classify_table_dump, "")                                        \
+_(sw_interface_span_enable_disable, "[src <intfc> | src_sw_if_index <id>] [disable | [[dst <intfc> | dst_sw_if_index <id>] [both|rx|tx]]]") \
+_(sw_interface_span_dump, "")                                           \
+_(get_next_index, "node-name <node-name> next-node-name <node-name>")   \
+_(pg_create_interface, "if_id <nn>")                                    \
+_(pg_capture, "if_id <nnn> pcap <file_name> count <nnn> [disable]")     \
+_(pg_enable_disable, "[stream <id>] disable")                           \
+_(ip_source_and_port_range_check_add_del,                               \
+  "<ip-addr>/<mask> range <nn>-<nn> vrf <id>")                          \
+_(ip_source_and_port_range_check_interface_add_del,                     \
+  "<intf> | sw_if_index <nn> [tcp-out-vrf <id>] [tcp-in-vrf <id>]"      \
+  "[udp-in-vrf <id>] [udp-out-vrf <id>]")                               \
+_(ipsec_gre_add_del_tunnel,                                             \
+  "src <addr> dst <addr> local_sa <sa-id> remote_sa <sa-id> [del]")     \
+_(ipsec_gre_tunnel_dump, "[sw_if_index <nn>]")                          \
+_(delete_subif,"<intfc> | sw_if_index <nn>")                            \
+_(l2_interface_pbb_tag_rewrite,                                         \
+  "<intfc> | sw_if_index <nn> \n"                                       \
+  "[disable | push | pop | translate_pbb_stag <outer_tag>] \n"          \
+  "dmac <mac> smac <mac> sid <nn> [vlanid <nn>]")                       \
+_(punt, "protocol <l4-protocol> [ip <ver>] [port <l4-port>] [del]")     \
+_(flow_classify_set_interface,                                          \
+  "<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>] [del]") \
+_(flow_classify_dump, "type [ip4|ip6]")                                 \
+_(ip_fib_dump, "")                                                      \
+_(ip6_fib_dump, "")                                                     \
+_(feature_enable_disable, "arc_name <arc_name> "                        \
+  "feature_name <feature_name> <intfc> | sw_if_index <nn> [disable]")	\
+_(sw_interface_tag_add_del, "<intfc> | sw_if_index <nn> tag <text>"	\
+"[disable]")                                                        	\
+_(l2_xconnect_dump, "")                                             	\
+_(sw_interface_set_mtu, "<intfc> | sw_if_index <nn> mtu <nn>")        \
+_(ip_neighbor_dump, "[ip6] <intfc> | sw_if_index <nn>")                 \
+_(sw_interface_get_table, "<intfc> | sw_if_index <id> [ipv6]")
+
+/* List of command functions, CLI names map directly to functions */
+#define foreach_cli_function                                    \
+_(comment, "usage: comment <ignore-rest-of-line>")		\
+_(dump_interface_table, "usage: dump_interface_table")          \
+_(dump_sub_interface_table, "usage: dump_sub_interface_table")  \
+_(dump_ipv4_table, "usage: dump_ipv4_table")                    \
+_(dump_ipv6_table, "usage: dump_ipv6_table")                    \
+_(dump_stats_table, "usage: dump_stats_table")                  \
+_(dump_macro_table, "usage: dump_macro_table ")                 \
+_(dump_node_table, "usage: dump_node_table")			\
+_(dump_msg_api_table, "usage: dump_msg_api_table")		\
+_(get_msg_id, "usage: get_msg_id name_and_crc")			\
+_(echo, "usage: echo <message>")				\
+_(exec, "usage: exec <vpe-debug-CLI-command>")                  \
+_(exec_inband, "usage: exec_inband <vpe-debug-CLI-command>")    \
+_(help, "usage: help")                                          \
+_(q, "usage: quit")                                             \
+_(quit, "usage: quit")                                          \
+_(search_node_table, "usage: search_node_table <name>...")	\
+_(set, "usage: set <variable-name> <value>")                    \
+_(script, "usage: script <file-name>")                          \
+_(unset, "usage: unset <variable-name>")
+
+#define _(N,n)                                  \
+    static void vl_api_##n##_t_handler_uni      \
+    (vl_api_##n##_t * mp)                       \
+    {                                           \
+        vat_main_t * vam = &vat_main;           \
+        if (vam->json_output) {                 \
+            vl_api_##n##_t_handler_json(mp);    \
+        } else {                                \
+            vl_api_##n##_t_handler(mp);         \
+        }                                       \
+    }
+foreach_vpe_api_reply_msg;
+#undef _
+
+void
+vat_api_hookup (vat_main_t * vam)
+{
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler_uni,          \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_reply_msg;
+#undef _
+
+#if (VPP_API_TEST_BUILTIN==0)
+  vl_msg_api_set_first_available_msg_id (VL_MSG_FIRST_AVAILABLE);
+#endif
+
+  vam->sw_if_index_by_interface_name = hash_create_string (0, sizeof (uword));
+
+  vam->function_by_name = hash_create_string (0, sizeof (uword));
+
+  vam->help_by_name = hash_create_string (0, sizeof (uword));
+
+  /* API messages we can send */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+  foreach_vpe_api_msg;
+#undef _
+
+  /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+  foreach_vpe_api_msg;
+#undef _
+
+  /* CLI functions */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, n);
+  foreach_cli_function;
+#undef _
+
+  /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+  foreach_cli_function;
+#undef _
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vat/json_format.c b/src/vat/json_format.c
new file mode 100644
index 00000000..6f316d97
--- /dev/null
+++ b/src/vat/json_format.c
@@ -0,0 +1,304 @@
+/*
+ *------------------------------------------------------------------
+ * json_format.c
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+
+*/
+#include <inttypes.h>
+#include <vat/json_format.h>
+#include <vnet/ip/ip.h>
+#include <vppinfra/vec.h>
+
+#define VAT_TAB_WIDTH               2
+
+typedef struct vat_print_ctx_s
+{
+  FILE *ofp;
+  u32 indent;
+} vat_print_ctx_t;
+
+/* Format an IP4 address. */
+static u8 *
+vat_json_format_ip4_address (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
+}
+
+/* Format an IP6 address. */
+static u8 *
+vat_json_format_ip6_address (u8 * s, va_list * args)
+{
+  ip6_address_t *a = va_arg (*args, ip6_address_t *);
+  u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
+
+  i_max_n_zero = ARRAY_LEN (a->as_u16);
+  max_n_zeros = 0;
+  i_first_zero = i_max_n_zero;
+  n_zeros = 0;
+  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+    {
+      u32 is_zero = a->as_u16[i] == 0;
+      if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
+	{
+	  i_first_zero = i;
+	  n_zeros = 0;
+	}
+      n_zeros += is_zero;
+      if ((!is_zero && n_zeros > max_n_zeros)
+	  || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
+	{
+	  i_max_n_zero = i_first_zero;
+	  max_n_zeros = n_zeros;
+	  i_first_zero = ARRAY_LEN (a->as_u16);
+	  n_zeros = 0;
+	}
+    }
+
+  last_double_colon = 0;
+  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+    {
+      if (i == i_max_n_zero && max_n_zeros > 1)
+	{
+	  s = format (s, "::");
+	  i += max_n_zeros - 1;
+	  last_double_colon = 1;
+	}
+      else
+	{
+	  s = format (s, "%s%x",
+		      (last_double_colon || i == 0) ? "" : ":",
+		      clib_net_to_host_u16 (a->as_u16[i]));
+	  last_double_colon = 0;
+	}
+    }
+
+  return s;
+}
+
+static void
+vat_json_indent_print (vat_print_ctx_t * ctx)
+{
+  int i;
+  for (i = 0; i < ctx->indent * VAT_TAB_WIDTH; i++)
+    {
+      fformat (ctx->ofp, " ");
+    }
+}
+
+static void
+vat_json_indent_line (vat_print_ctx_t * ctx, char *fmt, ...)
+{
+  va_list va;
+
+  vat_json_indent_print (ctx);
+  va_start (va, fmt);
+  va_fformat (ctx->ofp, fmt, &va);
+  va_end (va);
+}
+
+static u8
+is_num_only (vat_json_node_t * p)
+{
+  vat_json_node_t *elem;
+  vec_foreach (elem, p)
+  {
+    if (VAT_JSON_INT != elem->type && VAT_JSON_UINT != elem->type)
+      {
+	return 0;
+      }
+  }
+  return 1;
+}
+
+static void
+vat_json_print_internal (vat_print_ctx_t * ctx, vat_json_node_t * node)
+{
+#define P(fmt,...) fformat(ctx->ofp, fmt, ##__VA_ARGS__)
+#define PL(fmt,...) fformat(ctx->ofp, fmt"\n", ##__VA_ARGS__)
+#define PPL(fmt,...) vat_json_indent_line(ctx, fmt"\n", ##__VA_ARGS__)
+#define PP(fmt,...) vat_json_indent_line(ctx, fmt, ##__VA_ARGS__)
+#define INCR (ctx->indent++)
+#define DECR (ctx->indent--)
+
+  vat_json_pair_t *pair;
+  u32 i, count;
+  vat_json_node_t *elem;
+  u8 num_only = 0;
+
+  if (!node)
+    {
+      return;
+    }
+
+  switch (node->type)
+    {
+    case VAT_JSON_OBJECT:
+      count = vec_len (node->pairs);
+      if (count >= 1)
+	{
+	  PL ("{");
+	  INCR;
+	  for (i = 0; i < count; i++)
+	    {
+	      pair = &node->pairs[i];
+	      PP ("\"%s\": ", pair->name);
+	      vat_json_print_internal (ctx, &pair->value);
+	      if (i < count - 1)
+		{
+		  P (",");
+		}
+	      PL ();
+	    }
+	  DECR;
+	  PP ("}");
+	}
+      else
+	{
+	  P ("{}");
+	}
+      break;
+    case VAT_JSON_ARRAY:
+      num_only = is_num_only (node->array);
+      count = vec_len (node->array);
+      if (count >= 1)
+	{
+	  if (num_only)
+	    P ("[");
+	  else
+	    PL ("[ ");
+	  INCR;
+	  for (i = 0; i < count; i++)
+	    {
+	      elem = &node->array[i];
+	      if (!num_only)
+		{
+		  vat_json_indent_print (ctx);
+		}
+	      vat_json_print_internal (ctx, elem);
+	      if (i < count - 1)
+		{
+		  if (num_only)
+		    {
+		      P (", ");
+		    }
+		  else
+		    {
+		      P (",");
+		    }
+		}
+	      if (!num_only)
+		PL ();
+	    }
+	  DECR;
+	  if (!num_only)
+	    PP ("]");
+	  else
+	    P ("]");
+	}
+      else
+	{
+	  P ("[]");
+	}
+      break;
+    case VAT_JSON_INT:
+      P ("%d", node->sint);
+      break;
+    case VAT_JSON_UINT:
+      P ("%" PRIu64, node->uint);
+      break;
+    case VAT_JSON_REAL:
+      P ("%f", node->real);
+      break;
+    case VAT_JSON_STRING:
+      P ("\"%s\"", node->string);
+      break;
+    case VAT_JSON_IPV4:
+      P ("\"%U\"", vat_json_format_ip4_address, &node->ip4);
+      break;
+    case VAT_JSON_IPV6:
+      P ("\"%U\"", vat_json_format_ip6_address, &node->ip6);
+      break;
+    default:
+      break;
+    }
+#undef PPL
+#undef PP
+#undef PL
+#undef P
+}
+
+void
+vat_json_print (FILE * ofp, vat_json_node_t * node)
+{
+  vat_print_ctx_t ctx;
+  memset (&ctx, 0, sizeof ctx);
+  ctx.indent = 0;
+  ctx.ofp = ofp;
+  fformat (ofp, "\n");
+  vat_json_print_internal (&ctx, node);
+  fformat (ofp, "\n");
+}
+
+void
+vat_json_free (vat_json_node_t * node)
+{
+  int i = 0;
+
+  if (NULL == node)
+    {
+      return;
+    }
+  switch (node->type)
+    {
+    case VAT_JSON_OBJECT:
+      for (i = 0; i < vec_len (node->pairs); i++)
+	{
+	  vat_json_free (&node->pairs[i].value);
+	}
+      if (NULL != node->pairs)
+	{
+	  vec_free (node->pairs);
+	}
+      break;
+    case VAT_JSON_ARRAY:
+      for (i = 0; i < vec_len (node->array); i++)
+	{
+	  vat_json_free (&node->array[i]);
+	}
+      if (NULL != node->array)
+	{
+	  vec_free (node->array);
+	}
+      break;
+    case VAT_JSON_STRING:
+      if (NULL != node->string)
+	{
+	  vec_free (node->string);
+	}
+      break;
+    default:
+      break;
+    }
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vat/json_format.h b/src/vat/json_format.h
new file mode 100644
index 00000000..154fb3df
--- /dev/null
+++ b/src/vat/json_format.h
@@ -0,0 +1,254 @@
+/*
+ *------------------------------------------------------------------
+ * json_format.h
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef __JSON_FORMAT_H__
+#define __JSON_FORMAT_H__
+
+#include <vppinfra/clib.h>
+#include <vppinfra/format.h>
+#include <netinet/ip.h>
+
+/* JSON value type */
+typedef enum
+{
+  VAT_JSON_NONE,
+  VAT_JSON_OBJECT,
+  VAT_JSON_ARRAY,
+  VAT_JSON_STRING,
+  VAT_JSON_REAL,
+  VAT_JSON_UINT,
+  VAT_JSON_INT,
+  VAT_JSON_IPV4,
+  VAT_JSON_IPV6,
+  VAT_JSON_MAX
+} vat_json_val_type_t;
+
+typedef struct vat_json_node_s vat_json_node_t;
+typedef struct vat_json_pair_s vat_json_pair_t;
+
+/* JSON object structure */
+struct vat_json_node_s
+{
+  vat_json_val_type_t type;
+  union
+  {
+    vat_json_pair_t *pairs;
+    vat_json_node_t *array;
+    u8 *string;
+    struct in_addr ip4;
+    struct in6_addr ip6;
+    u64 uint;
+    i64 sint;
+    f64 real;
+  };
+};
+
+struct vat_json_pair_s
+{
+  const char *name;
+  vat_json_node_t value;
+};
+
+void vat_json_print (FILE * ofp, vat_json_node_t * node);
+void vat_json_free (vat_json_node_t * node);
+
+static_always_inline void
+vat_json_init_object (vat_json_node_t * json)
+{
+  json->type = VAT_JSON_OBJECT;
+  json->pairs = NULL;
+}
+
+static_always_inline void
+vat_json_init_array (vat_json_node_t * json)
+{
+  json->type = VAT_JSON_ARRAY;
+  json->array = NULL;
+}
+
+static_always_inline void
+vat_json_set_string (vat_json_node_t * json, u8 * str)
+{
+  json->type = VAT_JSON_STRING;
+  json->string = str;
+}
+
+static_always_inline void
+vat_json_set_string_copy (vat_json_node_t * json, const u8 * str)
+{
+  u8 *ns = NULL;
+  vec_validate (ns, strlen ((const char *) str));
+  strcpy ((char *) ns, (const char *) str);
+  vec_add1 (ns, '\0');
+  vat_json_set_string (json, ns);
+}
+
+static_always_inline void
+vat_json_set_int (vat_json_node_t * json, i64 num)
+{
+  json->type = VAT_JSON_INT;
+  json->sint = num;
+}
+
+static_always_inline void
+vat_json_set_uint (vat_json_node_t * json, u64 num)
+{
+  json->type = VAT_JSON_UINT;
+  json->uint = num;
+}
+
+static_always_inline void
+vat_json_set_real (vat_json_node_t * json, f64 real)
+{
+  json->type = VAT_JSON_REAL;
+  json->real = real;
+}
+
+static_always_inline void
+vat_json_set_ip4 (vat_json_node_t * json, struct in_addr ip4)
+{
+  json->type = VAT_JSON_IPV4;
+  json->ip4 = ip4;
+}
+
+static_always_inline void
+vat_json_set_ip6 (vat_json_node_t * json, struct in6_addr ip6)
+{
+  json->type = VAT_JSON_IPV6;
+  json->ip6 = ip6;
+}
+
+static_always_inline vat_json_node_t *
+vat_json_object_add (vat_json_node_t * json, const char *name)
+{
+  ASSERT (VAT_JSON_OBJECT == json->type);
+  uword pos = vec_len (json->pairs);
+  vec_validate (json->pairs, pos);
+  json->pairs[pos].name = name;
+  return &json->pairs[pos].value;
+}
+
+static_always_inline vat_json_node_t *
+vat_json_array_add (vat_json_node_t * json)
+{
+  ASSERT (VAT_JSON_ARRAY == json->type);
+  uword pos = vec_len (json->array);
+  vec_validate (json->array, pos);
+  return &json->array[pos];
+}
+
+static_always_inline vat_json_node_t *
+vat_json_object_add_list (vat_json_node_t * json, const char *name)
+{
+  vat_json_node_t *array_node = vat_json_object_add (json, name);
+  vat_json_init_array (array_node);
+  return array_node;
+}
+
+static_always_inline void
+vat_json_object_add_string_copy (vat_json_node_t * json,
+				 const char *name, u8 * str)
+{
+  vat_json_set_string_copy (vat_json_object_add (json, name), str);
+}
+
+static_always_inline void
+vat_json_object_add_uint (vat_json_node_t * json,
+			  const char *name, u64 number)
+{
+  vat_json_set_uint (vat_json_object_add (json, name), number);
+}
+
+static_always_inline void
+vat_json_object_add_int (vat_json_node_t * json, const char *name, i64 number)
+{
+  vat_json_set_int (vat_json_object_add (json, name), number);
+}
+
+static_always_inline void
+vat_json_object_add_real (vat_json_node_t * json, const char *name, f64 real)
+{
+  vat_json_set_real (vat_json_object_add (json, name), real);
+}
+
+static_always_inline void
+vat_json_object_add_ip4 (vat_json_node_t * json,
+			 const char *name, struct in_addr ip4)
+{
+  vat_json_set_ip4 (vat_json_object_add (json, name), ip4);
+}
+
+static_always_inline void
+vat_json_object_add_ip6 (vat_json_node_t * json,
+			 const char *name, struct in6_addr ip6)
+{
+  vat_json_set_ip6 (vat_json_object_add (json, name), ip6);
+}
+
+static_always_inline void
+vat_json_array_add_int (vat_json_node_t * json, i64 number)
+{
+  vat_json_set_int (vat_json_array_add (json), number);
+}
+
+static_always_inline void
+vat_json_array_add_uint (vat_json_node_t * json, u64 number)
+{
+  vat_json_set_uint (vat_json_array_add (json), number);
+}
+
+static_always_inline void
+vat_json_object_add_bytes (vat_json_node_t * json,
+			   const char *name, u8 * array, uword size)
+{
+  ASSERT (VAT_JSON_OBJECT == json->type);
+  vat_json_node_t *json_array = vat_json_object_add (json, name);
+  vat_json_init_array (json_array);
+  int i;
+  for (i = 0; i < size; i++)
+    {
+      vat_json_array_add_uint (json_array, array[i]);
+    }
+}
+
+static_always_inline vat_json_node_t *
+vat_json_object_get_element (vat_json_node_t * json, const char *name)
+{
+  int i = 0;
+
+  ASSERT (VAT_JSON_OBJECT == json->type);
+  for (i = 0; i < vec_len (json->pairs); i++)
+    {
+      if (0 == strcmp (json->pairs[i].name, name))
+	{
+	  return &json->pairs[i].value;
+	}
+    }
+  return NULL;
+}
+
+#endif /* __JSON_FORMAT_H__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vat/json_test.c b/src/vat/json_test.c
new file mode 100644
index 00000000..46261694
--- /dev/null
+++ b/src/vat/json_test.c
@@ -0,0 +1,75 @@
+/*
+ *------------------------------------------------------------------
+ * json_test.c
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vat/vat.h>
+#include <vat/json_format.h>
+
+static void
+print_json_test (void)
+{
+  vat_json_node_t node;
+
+  vat_json_init_object (&node);
+  vat_json_object_add_string_copy (&node, "str", (u8 *) "string-value");
+  vat_json_object_add_uint (&node, "ab", 127);
+  vat_json_object_add_real (&node, "pi", 3.14159f);
+  vat_json_print (stdout, &node);
+  vat_json_free (&node);
+
+  vat_json_init_object (&node);
+  vat_json_node_t *a1 = vat_json_object_add (&node, "a1");
+  vat_json_init_object (a1);
+  vat_json_object_add_uint (a1, "b1", 512);
+  vat_json_object_add_string_copy (a1, "b2", (u8 *) "string");
+
+  vat_json_object_add_int (&node, "a2", 2);
+
+  vat_json_node_t *a3 = vat_json_object_add_list (&node, "a3");
+  vat_json_init_array (a3);
+  vat_json_array_add_uint (a3, 1);
+  vat_json_array_add_int (a3, -2);
+  vat_json_array_add_uint (a3, 3);
+
+  vat_json_init_object (vat_json_object_add (&node, "a4"));
+
+  struct in_addr ipv4 = { 0 };
+  struct in6_addr ipv6 = { {{0}} };
+
+  vat_json_object_add_ip4 (&node, "ipv4", ipv4);
+  vat_json_object_add_ip6 (&node, "ipv6", ipv6);
+
+  vat_json_print (stdout, &node);
+  vat_json_free (&node);
+}
+
+int
+main (void)
+{
+  print_json_test ();
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vat/main.c b/src/vat/main.c
new file mode 100644
index 00000000..e01d15ec
--- /dev/null
+++ b/src/vat/main.c
@@ -0,0 +1,421 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "vat.h"
+#include "plugin.h"
+#include <signal.h>
+
+vat_main_t vat_main;
+
+#include <vlibapi/api_helper_macros.h>
+vpe_api_main_t vpe_api_main;
+
+void
+vat_suspend (vlib_main_t * vm, f64 interval)
+{
+  /* do nothing in the standalone version, just return */
+}
+
+void
+fformat_append_cr (FILE * ofp, const char *fmt, ...)
+{
+  va_list va;
+
+  va_start (va, fmt);
+  (void) va_fformat (ofp, (char *) fmt, &va);
+  va_end (va);
+  fformat (ofp, "\n");
+}
+
+int
+connect_to_vpe (char *name)
+{
+  vat_main_t *vam = &vat_main;
+  api_main_t *am = &api_main;
+
+  if (vl_client_connect_to_vlib ("/vpe-api", name, 32) < 0)
+    return -1;
+
+  vam->vl_input_queue = am->shmem_hdr->vl_input_queue;
+  vam->my_client_index = am->my_client_index;
+
+  return 0;
+}
+
+vlib_main_t vlib_global_main;
+vlib_main_t **vlib_mains;
+void
+vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...)
+{
+  clib_warning ("BUG");
+}
+
+
+static u8 *
+format_api_error (u8 * s, va_list * args)
+{
+  vat_main_t *vam = va_arg (*args, vat_main_t *);
+  i32 error = va_arg (*args, u32);
+  uword *p;
+
+  p = hash_get (vam->error_string_by_error_number, -error);
+
+  if (p)
+    s = format (s, "%s", p[0]);
+  else
+    s = format (s, "%d", error);
+  return s;
+}
+
+void
+do_one_file (vat_main_t * vam)
+{
+  int rv;
+  int (*fp) (vat_main_t * vam);
+  int arg_len;
+  unformat_input_t _input;
+  u8 *cmdp, *argsp;
+  uword *p;
+  u8 *this_cmd = 0;
+
+  vam->input = &_input;
+
+  /* Used by the "quit" command handler */
+  if (setjmp (vam->jump_buf) != 0)
+    return;
+
+  vam->jump_buf_set = 1;
+
+  while (1)
+    {
+      if (vam->ifp == stdin)
+	{
+	  if (vam->exec_mode == 0)
+	    rv = write (1, "vat# ", 5);
+	  else
+	    rv = write (1, "exec# ", 6);
+	}
+
+      _vec_len (vam->inbuf) = 4096;
+
+      if (vam->do_exit ||
+	  fgets ((char *) vam->inbuf, vec_len (vam->inbuf), vam->ifp) == 0)
+	break;
+
+      vam->input_line_number++;
+
+      vec_free (this_cmd);
+
+      this_cmd =
+	(u8 *) clib_macro_eval (&vam->macro_main, (char *) vam->inbuf,
+				1 /* complain */ );
+
+      if (vam->exec_mode == 0)
+	{
+	  /* Split input into cmd + args */
+	  cmdp = this_cmd;
+
+	  while (cmdp < (this_cmd + vec_len (this_cmd)))
+	    {
+	      if (*cmdp == ' ' || *cmdp == '\t' || *cmdp == '\n')
+		{
+		  cmdp++;
+		}
+	      else
+		break;
+	    }
+	  argsp = cmdp;
+	  while (argsp < (this_cmd + vec_len (this_cmd)))
+	    {
+	      if (*argsp != ' ' && *argsp != '\t' && *argsp != '\n')
+		{
+		  argsp++;
+		}
+	      else
+		break;
+	    }
+	  *argsp++ = 0;
+	  while (argsp < (this_cmd + vec_len (this_cmd)))
+	    {
+	      if (*argsp == ' ' || *argsp == '\t' || *argsp == '\n')
+		{
+		  argsp++;
+		}
+	      else
+		break;
+	    }
+
+
+	  /* Blank input line? */
+	  if (*cmdp == 0)
+	    continue;
+
+	  p = hash_get_mem (vam->function_by_name, cmdp);
+	  if (p == 0)
+	    {
+	      errmsg ("'%s': function not found\n", cmdp);
+	      continue;
+	    }
+
+	  arg_len = strlen ((char *) argsp);
+
+	  unformat_init_string (vam->input, (char *) argsp, arg_len);
+	  fp = (void *) p[0];
+	}
+      else
+	{
+	  unformat_init_string (vam->input, (char *) this_cmd,
+				strlen ((char *) this_cmd));
+	  cmdp = this_cmd;
+	  fp = exec;
+	}
+
+      rv = (*fp) (vam);
+      if (rv < 0)
+	errmsg ("%s error: %U\n", cmdp, format_api_error, vam, rv);
+      unformat_free (vam->input);
+
+      if (vam->regenerate_interface_table)
+	{
+	  vam->regenerate_interface_table = 0;
+	  api_sw_interface_dump (vam);
+	}
+    }
+}
+
+static void
+init_error_string_table (vat_main_t * vam)
+{
+
+  vam->error_string_by_error_number = hash_create (0, sizeof (uword));
+
+#define _(n,v,s) hash_set (vam->error_string_by_error_number, -v, s);
+  foreach_vnet_api_error;
+#undef _
+
+  hash_set (vam->error_string_by_error_number, 99, "Misc");
+}
+
+static i8 *
+eval_current_file (macro_main_t * mm, i32 complain)
+{
+  vat_main_t *vam = &vat_main;
+  return ((i8 *) format (0, "%s%c", vam->current_file, 0));
+}
+
+static i8 *
+eval_current_line (macro_main_t * mm, i32 complain)
+{
+  vat_main_t *vam = &vat_main;
+  return ((i8 *) format (0, "%d%c", vam->input_line_number, 0));
+}
+
+static void
+signal_handler (int signum, siginfo_t * si, ucontext_t * uc)
+{
+  vat_main_t *vam = &vat_main;
+
+  switch (signum)
+    {
+      /* these (caught) signals cause the application to exit */
+    case SIGINT:
+    case SIGTERM:
+      if (vam->jump_buf_set)
+	{
+	  vam->do_exit = 1;
+	  return;
+	}
+
+      /* FALLTHROUGH on purpose */
+
+    default:
+      break;
+    }
+
+  _exit (1);
+}
+
+static void
+setup_signal_handlers (void)
+{
+  uword i;
+  struct sigaction sa;
+
+  for (i = 1; i < 32; i++)
+    {
+      memset (&sa, 0, sizeof (sa));
+      sa.sa_sigaction = (void *) signal_handler;
+      sa.sa_flags = SA_SIGINFO;
+
+      switch (i)
+	{
+	  /* these signals take the default action */
+	case SIGABRT:
+	case SIGKILL:
+	case SIGSTOP:
+	case SIGUSR1:
+	case SIGUSR2:
+	  continue;
+
+	  /* ignore SIGPIPE, SIGCHLD */
+	case SIGPIPE:
+	case SIGCHLD:
+	  sa.sa_sigaction = (void *) SIG_IGN;
+	  break;
+
+	  /* catch and handle all other signals */
+	default:
+	  break;
+	}
+
+      if (sigaction (i, &sa, 0) < 0)
+	clib_unix_warning ("sigaction %U", format_signal, i);
+    }
+}
+
+int
+main (int argc, char **argv)
+{
+  vat_main_t *vam = &vat_main;
+  unformat_input_t _argv, *a = &_argv;
+  u8 **input_files = 0;
+  u8 *output_file = 0;
+  u8 *chroot_prefix;
+  u8 *this_input_file;
+  u8 interactive = 1;
+  u8 json_output = 0;
+  u8 *heap;
+  mheap_t *h;
+  int i;
+
+  clib_mem_init (0, 128 << 20);
+
+  heap = clib_mem_get_per_cpu_heap ();
+  h = mheap_header (heap);
+
+  /* make the main heap thread-safe */
+  h->flags |= MHEAP_FLAG_THREAD_SAFE;
+
+  clib_macro_init (&vam->macro_main);
+  clib_macro_add_builtin (&vam->macro_main, "current_file",
+			  eval_current_file);
+  clib_macro_add_builtin (&vam->macro_main, "current_line",
+			  eval_current_line);
+
+  init_error_string_table (vam);
+
+  unformat_init_command_line (a, argv);
+
+  while (unformat_check_input (a) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (a, "in %s", &this_input_file))
+	vec_add1 (input_files, this_input_file);
+      else if (unformat (a, "out %s", &output_file))
+	;
+      else if (unformat (a, "script"))
+	interactive = 0;
+      else if (unformat (a, "json"))
+	json_output = 1;
+      else if (unformat (a, "plugin_path %s", (u8 *) & vat_plugin_path))
+	vec_add1 (vat_plugin_path, 0);
+      else if (unformat (a, "plugin_name_filter %s",
+			 (u8 *) & vat_plugin_name_filter))
+	vec_add1 (vat_plugin_name_filter, 0);
+      else if (unformat (a, "chroot prefix %s", &chroot_prefix))
+	{
+	  vl_set_memory_root_path ((char *) chroot_prefix);
+	}
+      else
+	{
+	  fformat (stderr,
+		   "%s: usage [in <f1> ... in <fn>] [out <fn>] [script] [json]\n");
+	  exit (1);
+	}
+    }
+
+  if (output_file)
+    vam->ofp = fopen ((char *) output_file, "w");
+  else
+    vam->ofp = stdout;
+
+  if (vam->ofp == NULL)
+    {
+      fformat (stderr, "Couldn't open output file %s\n",
+	       output_file ? (char *) output_file : "stdout");
+      exit (1);
+    }
+
+  clib_time_init (&vam->clib_time);
+
+  vat_api_hookup (vam);
+  vat_plugin_api_reference ();
+
+  setup_signal_handlers ();
+
+  if (connect_to_vpe ("vpp_api_test") < 0)
+    {
+      svm_region_exit ();
+      fformat (stderr, "Couldn't connect to vpe, exiting...\n");
+      exit (1);
+    }
+
+  vam->json_output = json_output;
+
+  if (!json_output)
+    {
+      api_sw_interface_dump (vam);
+    }
+
+  vec_validate (vam->inbuf, 4096);
+
+  vam->current_file = (u8 *) "plugin-init";
+  vat_plugin_init (vam);
+
+  for (i = 0; i < vec_len (input_files); i++)
+    {
+      vam->ifp = fopen ((char *) input_files[i], "r");
+      if (vam->ifp == NULL)
+	{
+	  fformat (stderr, "Couldn't open input file %s\n", input_files[i]);
+	  continue;
+	}
+      vam->current_file = input_files[i];
+      vam->input_line_number = 0;
+      do_one_file (vam);
+      fclose (vam->ifp);
+    }
+
+  if (output_file)
+    fclose (vam->ofp);
+
+  if (interactive)
+    {
+      vam->ifp = stdin;
+      vam->ofp = stdout;
+      vam->current_file = (u8 *) "interactive";
+      do_one_file (vam);
+      fclose (vam->ifp);
+    }
+
+  vl_client_disconnect_from_vlib ();
+  exit (0);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vat/plugin.c b/src/vat/plugin.c
new file mode 100644
index 00000000..c1cc928c
--- /dev/null
+++ b/src/vat/plugin.c
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * plugin.c: plugin handling
+ */
+
+#include <vat/vat.h>
+#include <vat/plugin.h>
+#include <dlfcn.h>
+#include <dirent.h>
+
+plugin_main_t vat_plugin_main;
+
+static int
+load_one_plugin (plugin_main_t * pm, plugin_info_t * pi)
+{
+  void *handle, *register_handle;
+  clib_error_t *(*fp) (vat_main_t *);
+  clib_error_t *error;
+
+  handle = dlopen ((char *) pi->name, RTLD_LAZY);
+
+  /*
+   * Note: this can happen if the plugin has an undefined symbol reference,
+   * so print a warning. Otherwise, the poor slob won't know what happened.
+   * Ask me how I know that...
+   */
+  if (handle == 0)
+    {
+      clib_warning ("%s", dlerror ());
+      return -1;
+    }
+
+  pi->handle = handle;
+
+  register_handle = dlsym (pi->handle, "vat_plugin_register");
+  if (register_handle == 0)
+    return 0;
+
+  fp = register_handle;
+
+  error = (*fp) (pm->vat_main);
+
+  if (error)
+    {
+      clib_error_report (error);
+      dlclose (handle);
+      return 1;
+    }
+
+  clib_warning ("Loaded plugin: %s", pi->name);
+
+  return 0;
+}
+
+static u8 **
+split_plugin_path (plugin_main_t * pm)
+{
+  int i;
+  u8 **rv = 0;
+  u8 *path = pm->plugin_path;
+  u8 *this = 0;
+
+  for (i = 0; i < vec_len (pm->plugin_path); i++)
+    {
+      if (path[i] != ':')
+	{
+	  vec_add1 (this, path[i]);
+	  continue;
+	}
+      vec_add1 (this, 0);
+      vec_add1 (rv, this);
+      this = 0;
+    }
+  if (this)
+    {
+      vec_add1 (this, 0);
+      vec_add1 (rv, this);
+    }
+  return rv;
+}
+
+int
+vat_load_new_plugins (plugin_main_t * pm)
+{
+  DIR *dp;
+  struct dirent *entry;
+  struct stat statb;
+  uword *p;
+  plugin_info_t *pi;
+  u8 **plugin_path;
+  int i;
+
+  plugin_path = split_plugin_path (pm);
+
+  for (i = 0; i < vec_len (plugin_path); i++)
+    {
+      dp = opendir ((char *) plugin_path[i]);
+
+      if (dp == 0)
+	continue;
+
+      while ((entry = readdir (dp)))
+	{
+	  u8 *plugin_name;
+
+	  if (pm->plugin_name_filter)
+	    {
+	      int j;
+	      for (j = 0; j < vec_len (pm->plugin_name_filter); j++)
+		if (entry->d_name[j] != pm->plugin_name_filter[j])
+		  goto next;
+	    }
+
+	  plugin_name = format (0, "%s/%s%c", plugin_path[i],
+				entry->d_name, 0);
+
+	  /* unreadable */
+	  if (stat ((char *) plugin_name, &statb) < 0)
+	    {
+	    ignore:
+	      vec_free (plugin_name);
+	      continue;
+	    }
+
+	  /* a dir or other things which aren't plugins */
+	  if (!S_ISREG (statb.st_mode))
+	    goto ignore;
+
+	  p = hash_get_mem (pm->plugin_by_name_hash, plugin_name);
+	  if (p == 0)
+	    {
+	      vec_add2 (pm->plugin_info, pi, 1);
+	      pi->name = plugin_name;
+	      pi->file_info = statb;
+
+	      if (load_one_plugin (pm, pi))
+		{
+		  vec_free (plugin_name);
+		  _vec_len (pm->plugin_info) = vec_len (pm->plugin_info) - 1;
+		  continue;
+		}
+	      memset (pi, 0, sizeof (*pi));
+	      hash_set_mem (pm->plugin_by_name_hash, plugin_name,
+			    pi - pm->plugin_info);
+	    }
+	next:
+	  ;
+	}
+      closedir (dp);
+      vec_free (plugin_path[i]);
+    }
+  vec_free (plugin_path);
+  return 0;
+}
+
+#define QUOTE_(x) #x
+#define QUOTE(x) QUOTE_(x)
+
+/*
+ * Load plugins from /usr/lib/vpp_api_test_plugins by default
+ */
+char *vat_plugin_path = "/usr/lib/vpp_api_test_plugins";
+
+char *vat_plugin_name_filter = 0;
+
+int
+vat_plugin_init (vat_main_t * vam)
+{
+  plugin_main_t *pm = &vat_plugin_main;
+
+
+  pm->plugin_path = format (0, "%s%c", vat_plugin_path, 0);
+  if (vat_plugin_name_filter)
+    pm->plugin_name_filter = format (0, "%s%c", vat_plugin_name_filter, 0);
+
+  pm->plugin_by_name_hash = hash_create_string (0, sizeof (uword));
+  pm->vat_main = vam;
+
+  return vat_load_new_plugins (pm);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vat/plugin.h b/src/vat/plugin.h
new file mode 100644
index 00000000..559ec52f
--- /dev/null
+++ b/src/vat/plugin.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * plugin.h: plugin handling
+ */
+
+#ifndef __included_plugin_h__
+#define __included_plugin_h__
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+typedef struct
+{
+  u8 *name;
+  struct stat file_info;
+  void *handle;
+} plugin_info_t;
+
+typedef struct
+{
+  /* loaded plugin info */
+  plugin_info_t *plugin_info;
+  uword *plugin_by_name_hash;
+
+  /* path and name filter */
+  u8 *plugin_path;
+  u8 *plugin_name_filter;
+
+  /* convenience */
+  vat_main_t *vat_main;
+
+} plugin_main_t;
+
+plugin_main_t vat_plugin_main;
+
+int vat_plugin_init (vat_main_t * vam);
+int vat_load_new_plugins (plugin_main_t * pm);
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vat/plugin_api.c b/src/vat/plugin_api.c
new file mode 100644
index 00000000..4e1eb897
--- /dev/null
+++ b/src/vat/plugin_api.c
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vat/vat.h>
+#include <vnet/ip/ip.h>
+
+uword
+unformat_sw_if_index (unformat_input_t * input, va_list * args)
+{
+  vat_main_t *vam = va_arg (*args, vat_main_t *);
+  u32 *result = va_arg (*args, u32 *);
+  u8 *if_name;
+  uword *p;
+
+  if (!unformat (input, "%s", &if_name))
+    return 0;
+
+  p = hash_get_mem (vam->sw_if_index_by_interface_name, if_name);
+  if (p == 0)
+    return 0;
+  *result = p[0];
+  return 1;
+}
+
+/* Parse an IP4 address %d.%d.%d.%d. */
+uword
+unformat_ip4_address (unformat_input_t * input, va_list * args)
+{
+  u8 *result = va_arg (*args, u8 *);
+  unsigned a[4];
+
+  if (!unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]))
+    return 0;
+
+  if (a[0] >= 256 || a[1] >= 256 || a[2] >= 256 || a[3] >= 256)
+    return 0;
+
+  result[0] = a[0];
+  result[1] = a[1];
+  result[2] = a[2];
+  result[3] = a[3];
+
+  return 1;
+}
+
+uword
+unformat_ethernet_address (unformat_input_t * input, va_list * args)
+{
+  u8 *result = va_arg (*args, u8 *);
+  u32 i, a[6];
+
+  if (!unformat (input, "%_%x:%x:%x:%x:%x:%x%_",
+		 &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
+    return 0;
+
+  /* Check range. */
+  for (i = 0; i < 6; i++)
+    if (a[i] >= (1 << 8))
+      return 0;
+
+  for (i = 0; i < 6; i++)
+    result[i] = a[i];
+
+  return 1;
+}
+
+/* Returns ethernet type as an int in host byte order. */
+uword
+unformat_ethernet_type_host_byte_order (unformat_input_t * input,
+					va_list * args)
+{
+  u16 *result = va_arg (*args, u16 *);
+  int type;
+
+  /* Numeric type. */
+  if (unformat (input, "0x%x", &type) || unformat (input, "%d", &type))
+    {
+      if (type >= (1 << 16))
+	return 0;
+      *result = type;
+      return 1;
+    }
+  return 0;
+}
+
+/* Parse an IP6 address. */
+uword
+unformat_ip6_address (unformat_input_t * input, va_list * args)
+{
+  ip6_address_t *result = va_arg (*args, ip6_address_t *);
+  u16 hex_quads[8];
+  uword hex_quad, n_hex_quads, hex_digit, n_hex_digits;
+  uword c, n_colon, double_colon_index;
+
+  n_hex_quads = hex_quad = n_hex_digits = n_colon = 0;
+  double_colon_index = ARRAY_LEN (hex_quads);
+  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
+    {
+      hex_digit = 16;
+      if (c >= '0' && c <= '9')
+	hex_digit = c - '0';
+      else if (c >= 'a' && c <= 'f')
+	hex_digit = c + 10 - 'a';
+      else if (c >= 'A' && c <= 'F')
+	hex_digit = c + 10 - 'A';
+      else if (c == ':' && n_colon < 2)
+	n_colon++;
+      else
+	{
+	  unformat_put_input (input);
+	  break;
+	}
+
+      /* Too many hex quads. */
+      if (n_hex_quads >= ARRAY_LEN (hex_quads))
+	return 0;
+
+      if (hex_digit < 16)
+	{
+	  hex_quad = (hex_quad << 4) | hex_digit;
+
+	  /* Hex quad must fit in 16 bits. */
+	  if (n_hex_digits >= 4)
+	    return 0;
+
+	  n_colon = 0;
+	  n_hex_digits++;
+	}
+
+      /* Save position of :: */
+      if (n_colon == 2)
+	{
+	  /* More than one :: ? */
+	  if (double_colon_index < ARRAY_LEN (hex_quads))
+	    return 0;
+	  double_colon_index = n_hex_quads;
+	}
+
+      if (n_colon > 0 && n_hex_digits > 0)
+	{
+	  hex_quads[n_hex_quads++] = hex_quad;
+	  hex_quad = 0;
+	  n_hex_digits = 0;
+	}
+    }
+
+  if (n_hex_digits > 0)
+    hex_quads[n_hex_quads++] = hex_quad;
+
+  {
+    word i;
+
+    /* Expand :: to appropriate number of zero hex quads. */
+    if (double_colon_index < ARRAY_LEN (hex_quads))
+      {
+	word n_zero = ARRAY_LEN (hex_quads) - n_hex_quads;
+
+	for (i = n_hex_quads - 1; i >= (signed) double_colon_index; i--)
+	  hex_quads[n_zero + i] = hex_quads[i];
+
+	for (i = 0; i < n_zero; i++)
+	  hex_quads[double_colon_index + i] = 0;
+
+	n_hex_quads = ARRAY_LEN (hex_quads);
+      }
+
+    /* Too few hex quads given. */
+    if (n_hex_quads < ARRAY_LEN (hex_quads))
+      return 0;
+
+    for (i = 0; i < ARRAY_LEN (hex_quads); i++)
+      result->as_u16[i] = clib_host_to_net_u16 (hex_quads[i]);
+
+    return 1;
+  }
+}
+
+u8 *
+format_ip4_address (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
+}
+
+u8 *
+format_ethernet_address (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+
+  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+		 a[0], a[1], a[2], a[3], a[4], a[5]);
+}
+
+void
+vat_plugin_api_reference (void)
+{
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vat/restart.c b/src/vat/restart.c
new file mode 100644
index 00000000..adeee000
--- /dev/null
+++ b/src/vat/restart.c
@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <time.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <svm/svmdb.h>
+#include <vppinfra/format.h>
+#include <vppinfra/error.h>
+#include <vppinfra/time.h>
+#include <vppinfra/macros.h>
+
+int
+restart_main_fn (unformat_input_t * i)
+{
+  int verbose = 0;
+  int old_pid;
+  int wait;
+  u8 *chroot_path = 0;
+  svmdb_client_t *svmdb_client;
+  volatile pid_t *pidp;
+  struct stat statb;
+  ino_t old_inode;
+  int sleeps;
+  svmdb_map_args_t _ma, *ma = &_ma;
+
+  struct timespec _req, *req = &_req;
+  struct timespec _rem, *rem = &_rem;
+
+  if (geteuid ())
+    clib_error ("vpp_restart: must be root...");
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "verbose") || unformat (i, "v"))
+	verbose = 1;
+      else if (unformat (i, "chroot %s", &chroot_path))
+	;
+      else
+	{
+	  clib_error ("unknown input `%U'", format_unformat_error, i);
+	  return 1;
+	}
+    }
+
+  /*
+   * Step 1: look up the current VPP pid in the shared-memory database
+   */
+  memset (ma, 0, sizeof (*ma));
+  ma->root_path = (char *) chroot_path;
+
+  svmdb_client = svmdb_map (ma);
+
+  pidp = svmdb_local_get_variable_reference (svmdb_client,
+					     SVMDB_NAMESPACE_VEC, "vpp_pid");
+  if (pidp == 0)
+    {
+      clib_error ("'vpp_pid' svm variable not found, vpp has never run?");
+      return 2;
+    }
+
+  /* Spin for up to 10 seconds for vpp to start */
+  for (wait = 0; wait < 1000; wait++)
+    {
+      req->tv_sec = 0;
+      req->tv_nsec = 10000 * 1000;	/* 10 ms */
+      while (nanosleep (req, rem) < 0)
+	*req = *rem;
+
+      if (*pidp)
+	goto found2;
+    }
+
+  clib_error ("VPP not runnning...");
+  return 3;
+
+found2:
+
+  old_pid = *pidp;
+
+  /*
+   * Step 2: sanity check the pid we discovered
+   */
+  if (verbose)
+    fformat (stdout, "Sanity check current vpp pid %d\n", old_pid);
+
+  if (kill (old_pid, 0) < 0)
+    {
+      svmdb_unmap (svmdb_client);
+      clib_error ("vpp current pid %d not running...", old_pid);
+      return 2;
+    }
+
+  if (verbose)
+    fformat (stdout, "Sanity check vpp pid %d OK\n", old_pid);
+
+  /*
+   * Step 3: figure out the current vpp <--> client shared-VM file
+   * inode number
+   */
+  if (stat ("/dev/shm/vpe-api", &statb) < 0)
+    {
+      clib_unix_error ("stat fail");
+      return 4;
+    }
+
+  old_inode = statb.st_ino;
+
+  if (verbose)
+    fformat (stdout, "Old inode %u\n", old_inode);
+
+  /* Note: restart wipes out the shared VM database */
+  svmdb_unmap (svmdb_client);
+
+  /*
+   * Step 4: send SIGTERM to vpp.
+   * systemd et al. will restart vpp after wiping out the shared-VM
+   * database and (crucially) the shared API messaging segment
+   */
+
+  if (kill (old_pid, SIGTERM) < 0)
+    {
+      clib_unix_error ("SIGTERM fail");
+      return 3;
+    }
+
+  sleeps = 0;
+
+  /*
+   * Step 5: wait up to 15 seconds for a new incarnation of
+   * the shared-VM API segment to appear.
+   */
+  for (wait = 0; wait < 150; wait++)
+    {
+      if ((stat ("/dev/shm/vpe-api", &statb) < 0)
+	  || statb.st_ino == old_inode)
+	{
+	  req->tv_sec = 0;
+	  req->tv_nsec = 100000 * 1000;	/* 100 ms */
+	  while (nanosleep (req, rem) < 0)
+	    *req = *rem;
+	  sleeps++;
+	}
+      else
+	goto new_inode;
+    }
+
+  clib_error ("Timeout waiting for new inode to appear...");
+  return 5;
+
+new_inode:
+  if (verbose && sleeps > 0)
+    fformat (stdout, "Inode sleeps %d\n", sleeps);
+
+  if (verbose)
+    fformat (stdout, "New inode %u\n", statb.st_ino);
+
+  /*
+   * Step 6: remap the SVM database
+   */
+  svmdb_client = svmdb_map (ma);
+
+  pidp = svmdb_local_get_variable_reference (svmdb_client,
+					     SVMDB_NAMESPACE_VEC, "vpp_pid");
+  if (pidp == 0)
+    {
+      clib_error ("post_restart: 'vpp_pid' svm variable not found,"
+		  "vpp did not restart?");
+      return 2;
+    }
+
+  sleeps = 0;
+
+  /*
+   * Step 7: wait for vpp to publish its new PID
+   */
+
+  /* Spin for up to 15 seconds */
+  for (wait = 0; wait < 150; wait++)
+    {
+      if (*pidp && (*pidp != old_pid))
+	goto restarted;
+      req->tv_sec = 0;
+      req->tv_nsec = 100000 * 1000;	/* 100 ms */
+      while (nanosleep (req, rem) < 0)
+	*req = *rem;
+      sleeps++;
+    }
+
+  clib_error ("Timeout waiting for vpp to publish pid after restart...");
+  return 4;
+
+restarted:
+
+  /* Done... */
+
+  if (verbose && sleeps)
+    fformat (stdout, "pid sleeps %d\n", sleeps);
+
+  if (verbose)
+    fformat (stdout, "New PID %d... Restarted...\n", *pidp);
+
+  svmdb_unmap (svmdb_client);
+  return 0;
+}
+
+int
+main (int argc, char **argv)
+{
+  unformat_input_t i;
+  int ret;
+
+  clib_mem_init (0, 64ULL << 20);
+
+  unformat_init_command_line (&i, argv);
+  ret = restart_main_fn (&i);
+  unformat_free (&i);
+  return ret;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vat/vat.h b/src/vat/vat.h
new file mode 100644
index 00000000..64be2f7f
--- /dev/null
+++ b/src/vat/vat.h
@@ -0,0 +1,257 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_vat_h__
+#define __included_vat_h__
+
+#include <stdio.h>
+#include <setjmp.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/format.h>
+#include <vppinfra/error.h>
+#include <vppinfra/time.h>
+#include <vppinfra/macros.h>
+#include <vnet/vnet.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#include "vat/json_format.h"
+
+#include <vlib/vlib.h>
+
+typedef struct
+{
+  u8 *interface_name;
+  u32 sw_if_index;
+  /*
+   * Subinterface ID. A number 0-N to uniquely identify this
+   * subinterface under the super interface
+   */
+  u32 sub_id;
+
+  /* 0 = dot1q, 1=dot1ad */
+  u8 sub_dot1ad;
+
+  /* Number of tags 0-2 */
+  u8 sub_number_of_tags;
+  u16 sub_outer_vlan_id;
+  u16 sub_inner_vlan_id;
+  u8 sub_exact_match;
+  u8 sub_default;
+  u8 sub_outer_vlan_id_any;
+  u8 sub_inner_vlan_id_any;
+
+  /* vlan tag rewrite */
+  u32 vtr_op;
+  u32 vtr_push_dot1q;
+  u32 vtr_tag1;
+  u32 vtr_tag2;
+} sw_interface_subif_t;
+
+typedef struct
+{
+  u8 ip[16];
+  u8 prefix_length;
+} ip_address_details_t;
+
+typedef struct
+{
+  u8 present;
+  ip_address_details_t *addr;
+} ip_details_t;
+
+typedef struct
+{
+  u64 packets;
+  u64 bytes;
+} interface_counter_t;
+
+typedef struct
+{
+  struct in_addr address;
+  u8 address_length;
+  u64 packets;
+  u64 bytes;
+} ip4_fib_counter_t;
+
+typedef struct
+{
+  struct in6_addr address;
+  u8 address_length;
+  u64 packets;
+  u64 bytes;
+} ip6_fib_counter_t;
+
+typedef struct
+{
+  /* vpe input queue */
+  unix_shared_memory_queue_t *vl_input_queue;
+
+  /* interface name table */
+  uword *sw_if_index_by_interface_name;
+
+  /* subinterface table */
+  sw_interface_subif_t *sw_if_subif_table;
+
+  /* Graph node table */
+  uword *graph_node_index_by_name;
+  vlib_node_t **graph_nodes;
+
+  /* ip tables */
+  ip_details_t *ip_details_by_sw_if_index[2];
+
+  /* sw_if_index of currently processed interface */
+  u32 current_sw_if_index;
+
+  /* remember that we are dumping ipv6 */
+  u8 is_ipv6;
+
+  /* function table */
+  uword *function_by_name;
+
+  /* help strings */
+  uword *help_by_name;
+
+  /* macro table */
+  macro_main_t macro_main;
+
+  /* Errors by number */
+  uword *error_string_by_error_number;
+
+
+  /* Main thread can spin (w/ timeout) here if needed */
+  u32 async_mode;
+  u32 async_errors;
+  volatile u32 result_ready;
+  volatile i32 retval;
+  volatile u32 sw_if_index;
+  volatile u8 *shmem_result;
+  volatile u8 *cmd_reply;
+
+  /* our client index */
+  u32 my_client_index;
+
+  /* Time is of the essence... */
+  clib_time_t clib_time;
+
+  /* Unwind (so we can quit) */
+  jmp_buf jump_buf;
+  int jump_buf_set;
+  volatile int do_exit;
+
+  /* temporary parse buffer */
+  unformat_input_t *input;
+
+  /* input buffer */
+  u8 *inbuf;
+
+  /* stdio input / output FILEs */
+  FILE *ifp, *ofp;
+  u8 *current_file;
+  u32 input_line_number;
+
+  /* exec mode toggle */
+  int exec_mode;
+
+  /* Regenerate the interface table */
+  volatile int regenerate_interface_table;
+
+  /* flag for JSON output format */
+  u8 json_output;
+
+  /* flag for interface event display */
+  u8 interface_event_display;
+
+  /* JSON tree used in composing dump api call results */
+  vat_json_node_t json_tree;
+
+  /* counters */
+  u64 **simple_interface_counters;
+  interface_counter_t **combined_interface_counters;
+  ip4_fib_counter_t **ip4_fib_counters;
+  u32 *ip4_fib_counters_vrf_id_by_index;
+  ip6_fib_counter_t **ip6_fib_counters;
+  u32 *ip6_fib_counters_vrf_id_by_index;
+
+  /* Convenience */
+  vlib_main_t *vlib_main;
+} vat_main_t;
+
+vat_main_t vat_main;
+
+static inline f64
+vat_time_now (vat_main_t * vam)
+{
+#if VPP_API_TEST_BUILTIN
+  return vlib_time_now (vam->vlib_main);
+#else
+  return clib_time_now (&vam->clib_time);
+#endif
+}
+
+#if VPP_API_TEST_BUILTIN
+#define errmsg(fmt,args...)                             \
+do {                                                    \
+  vat_main_t *__vam = &vat_main;                        \
+  vlib_cli_output (__vam->vlib_main, fmt, ##args);      \
+ } while(0);
+#else
+#define errmsg(fmt,args...)                                     \
+do {                                                            \
+  vat_main_t *__vam = &vat_main;                                \
+    if(__vam->ifp != stdin)                                     \
+        fformat(__vam->ofp,"%s(%d): \n", __vam->current_file,   \
+                __vam->input_line_number);                      \
+    fformat(__vam->ofp, fmt "\n", ##args);                      \
+    fflush(__vam->ofp);                                         \
+} while(0);
+#endif
+
+void vat_api_hookup (vat_main_t * vam);
+int api_sw_interface_dump (vat_main_t * vam);
+void do_one_file (vat_main_t * vam);
+int exec (vat_main_t * vam);
+
+/* Plugin API library functions */
+char *vat_plugin_path;
+char *vat_plugin_name_filter;
+void vat_plugin_api_reference (void);
+uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
+uword unformat_ip4_address (unformat_input_t * input, va_list * args);
+uword unformat_ethernet_address (unformat_input_t * input, va_list * args);
+uword unformat_ethernet_type_host_byte_order (unformat_input_t * input,
+					      va_list * args);
+uword unformat_ip6_address (unformat_input_t * input, va_list * args);
+u8 *format_ip4_address (u8 * s, va_list * args);
+u8 *format_ethernet_address (u8 * s, va_list * args);
+
+#if VPP_API_TEST_BUILTIN
+#define print api_cli_output
+void api_cli_output (void *, const char *fmt, ...);
+#else
+#define print fformat_append_cr
+void fformat_append_cr (FILE *, const char *fmt, ...);
+#endif
+
+#endif /* __included_vat_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib-api.am b/src/vlib-api.am
new file mode 100644
index 00000000..80eb760d
--- /dev/null
+++ b/src/vlib-api.am
@@ -0,0 +1,73 @@
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+lib_LTLIBRARIES += libvlibapi.la libvlibmemory.la libvlibmemoryclient.la \
+	           libvlibsocket.la
+
+libvlibapi_la_SOURCES = 			\
+	vlibapi/api.h				\
+        vlibapi/api_helper_macros.h		\
+	vlibapi/api_shared.c			\
+	vlibapi/node_serialize.c
+
+nobase_include_HEADERS += vlibapi/api.h vlibapi/api_helper_macros.h
+
+libvlibmemory_la_SOURCES =			\
+	vlibmemory/api.h			\
+	vlibmemory/memclnt.api			\
+	vlibmemory/memory_shared.c		\
+	vlibmemory/memory_vlib.c		\
+	vlibmemory/vl_memory_api_h.h		\
+	vlibmemory/vl_memory_msg_enum.h		\
+	vlibmemory/unix_shared_memory_queue.c	\
+	vlibmemory/unix_shared_memory_queue.h
+
+libvlibmemoryclient_la_SOURCES = 		\
+	vlibmemory/api.h			\
+	vlibmemory/memclnt.api			\
+	vlibmemory/memory_shared.c		\
+	vlibmemory/memory_client.c		\
+	vlibmemory/vl_memory_api_h.h		\
+	vlibmemory/vl_memory_msg_enum.h		\
+	vlibmemory/unix_shared_memory_queue.c	\
+	vlibmemory/unix_shared_memory_queue.h
+
+nobase_include_HEADERS +=			\
+	vlibmemory/api.h			\
+	vlibmemory/vl_memory_api_h.h		\
+	vlibmemory/vl_memory_msg_enum.h		\
+	vlibmemory/unix_shared_memory_queue.h 	\
+	vlibmemory/memclnt.api.h
+
+libvlibsocket_la_SOURCES =			\
+	vlibsocket/api.h			\
+	vlibsocket/sockclnt.api			\
+	vlibsocket/sockclnt_vlib.c		\
+	vlibsocket/socksvr_vlib.c		\
+	vlibsocket/vl_socket_api_h.h		\
+	vlibsocket/vl_socket_msg_enum.h
+
+nobase_include_HEADERS +=			\
+	vlibsocket/api.h			\
+	vlibsocket/vl_socket_api_h.h		\
+	vlibsocket/vl_socket_msg_enum.h		\
+	vlibsocket/sockclnt.api.h
+
+BUILT_SOURCES +=					\
+	vlibsocket/sockclnt.api.h		\
+	vlibmemory/memclnt.api.h		\
+	vlibmemory/memclnt.api.json
+
+API_FILES += vlibmemory/memclnt.api
+
+# vi:syntax=automake
diff --git a/src/vlib.am b/src/vlib.am
new file mode 100644
index 00000000..2464076f
--- /dev/null
+++ b/src/vlib.am
@@ -0,0 +1,103 @@
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+libvlibdir = ${libdir}
+libvlib_LTLIBRARIES = libvlib.la
+libvlib_la_LIBAD = libvppinfra.la
+
+BUILT_SOURCES += vlib/config.h
+
+vlib/config.h:
+	echo "#define __PRE_DATA_SIZE" @PRE_DATA_SIZE@ > $@
+
+libvlib_la_SOURCES =				\
+  vlib/buffer.c					\
+  vlib/cli.c					\
+  vlib/cli.h					\
+  vlib/config.h					\
+  vlib/counter.c				\
+  vlib/error.c					\
+  vlib/format.c					\
+  vlib/i2c.c					\
+  vlib/init.c					\
+  vlib/main.c					\
+  vlib/mc.c					\
+  vlib/node.c					\
+  vlib/node_cli.c				\
+  vlib/node_format.c				\
+  vlib/pci/pci.c				\
+  vlib/pci/linux_pci.c				\
+  vlib/threads.c				\
+  vlib/threads_cli.c				\
+  vlib/trace.c
+
+nobase_include_HEADERS +=			\
+  vlib/buffer_funcs.h				\
+  vlib/buffer_node.h				\
+  vlib/buffer.h					\
+  vlib/cli.h					\
+  vlib/cli_funcs.h				\
+  vlib/config.h					\
+  vlib/counter.h				\
+  vlib/defs.h					\
+  vlib/error_funcs.h				\
+  vlib/error.h					\
+  vlib/format_funcs.h				\
+  vlib/global_funcs.h				\
+  vlib/i2c.h					\
+  vlib/init.h					\
+  vlib/main.h					\
+  vlib/mc.h					\
+  vlib/node_funcs.h				\
+  vlib/node.h					\
+  vlib/physmem.h				\
+  vlib/pci/pci.h				\
+  vlib/pci/pci_config.h				\
+  vlib/threads.h				\
+  vlib/trace_funcs.h				\
+  vlib/trace.h					\
+  vlib/vlib.h
+
+libvlib_LTLIBRARIES += libvlib_unix.la
+
+libvlib_unix_la_SOURCES =			\
+  vlib/unix/cj.c				\
+  vlib/unix/cli.c				\
+  vlib/unix/input.c				\
+  vlib/unix/main.c				\
+  vlib/unix/mc_socket.c				\
+  vlib/unix/plugin.c				\
+  vlib/unix/plugin.h				\
+  vlib/unix/physmem.c				\
+  vlib/unix/util.c
+
+nobase_include_HEADERS +=			\
+  vlib/unix/cj.h				\
+  vlib/unix/mc_socket.h				\
+  vlib/unix/physmem.h				\
+  vlib/unix/plugin.h				\
+  vlib/unix/unix.h
+    
+if !WITH_DPDK
+noinst_PROGRAMS += vlib_unix
+
+vlib_unix_SOURCES =				\
+  examples/vlib/main_stub.c			\
+  examples/vlib/mc_test.c
+
+vlib_unix_LDADD = libvlib_unix.la libvlib.la \
+	          libvppinfra.la -lpthread -lm -ldl -lrt
+endif
+
+# vi:syntax=automake
diff --git a/src/vlib/buffer.c b/src/vlib/buffer.c
new file mode 100644
index 00000000..4bf6d125
--- /dev/null
+++ b/src/vlib/buffer.c
@@ -0,0 +1,1987 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * buffer.c: allocate/free network buffers.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * @cond (!DPDK)
+ * @file
+ *
+ * Allocate/free network buffers.
+ */
+
+#if DPDK > 0
+#include <rte_config.h>
+
+#include <rte_common.h>
+#include <rte_log.h>
+#include <rte_memory.h>
+#include <rte_memzone.h>
+#include <rte_tailq.h>
+#include <rte_eal.h>
+#include <rte_per_lcore.h>
+#include <rte_launch.h>
+#include <rte_atomic.h>
+#include <rte_cycles.h>
+#include <rte_prefetch.h>
+#include <rte_lcore.h>
+#include <rte_per_lcore.h>
+#include <rte_branch_prediction.h>
+#include <rte_interrupts.h>
+#include <rte_pci.h>
+#include <rte_random.h>
+#include <rte_debug.h>
+#include <rte_ether.h>
+#include <rte_ethdev.h>
+#include <rte_ring.h>
+#include <rte_mempool.h>
+#include <rte_mbuf.h>
+#include <rte_version.h>
+#endif
+
+#include <vlib/vlib.h>
+
+#if DPDK > 0
+#pragma weak rte_mem_virt2phy
+#pragma weak rte_eal_has_hugepages
+#pragma weak rte_socket_id
+#pragma weak rte_pktmbuf_pool_create
+#endif
+
+uword
+vlib_buffer_length_in_chain_slow_path (vlib_main_t * vm,
+				       vlib_buffer_t * b_first)
+{
+  vlib_buffer_t *b = b_first;
+  uword l_first = b_first->current_length;
+  uword l = 0;
+  while (b->flags & VLIB_BUFFER_NEXT_PRESENT)
+    {
+      b = vlib_get_buffer (vm, b->next_buffer);
+      l += b->current_length;
+    }
+  b_first->total_length_not_including_first_buffer = l;
+  b_first->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
+  return l + l_first;
+}
+
+u8 *
+format_vlib_buffer (u8 * s, va_list * args)
+{
+  vlib_buffer_t *b = va_arg (*args, vlib_buffer_t *);
+#if DPDK > 0
+  uword indent = format_get_indent (s);
+
+  s = format (s, "current data %d, length %d, free-list %d",
+	      b->current_data, b->current_length, b->free_list_index);
+
+  if (b->flags & VLIB_BUFFER_TOTAL_LENGTH_VALID)
+    s = format (s, ", totlen-nifb %d",
+		b->total_length_not_including_first_buffer);
+
+  if (b->flags & VLIB_BUFFER_IS_TRACED)
+    s = format (s, ", trace 0x%x", b->trace_index);
+
+  while (b->flags & VLIB_BUFFER_NEXT_PRESENT)
+    {
+      vlib_main_t *vm = vlib_get_main ();
+      u32 next_buffer = b->next_buffer;
+      b = vlib_get_buffer (vm, next_buffer);
+
+      s = format (s, "\n%Unext-buffer 0x%x, segment length %d",
+		  format_white_space, indent, next_buffer, b->current_length);
+    }
+
+#else
+
+  s = format (s, "current data %d, length %d, free-list %d",
+	      b->current_data, b->current_length, b->free_list_index);
+
+  if (b->flags & VLIB_BUFFER_IS_TRACED)
+    s = format (s, ", trace 0x%x", b->trace_index);
+
+  if (b->flags & VLIB_BUFFER_NEXT_PRESENT)
+    s = format (s, ", next-buffer 0x%x", b->next_buffer);
+#endif
+
+  return s;
+}
+
+u8 *
+format_vlib_buffer_and_data (u8 * s, va_list * args)
+{
+  vlib_buffer_t *b = va_arg (*args, vlib_buffer_t *);
+
+  s = format (s, "%U, %U",
+	      format_vlib_buffer, b,
+	      format_hex_bytes, vlib_buffer_get_current (b), 64);
+
+  return s;
+}
+
+#if DPDK == 0
+static u8 *
+format_vlib_buffer_known_state (u8 * s, va_list * args)
+{
+  vlib_buffer_known_state_t state = va_arg (*args, vlib_buffer_known_state_t);
+  char *t;
+
+  switch (state)
+    {
+    case VLIB_BUFFER_UNKNOWN:
+      t = "unknown";
+      break;
+
+    case VLIB_BUFFER_KNOWN_ALLOCATED:
+      t = "known-allocated";
+      break;
+
+    case VLIB_BUFFER_KNOWN_FREE:
+      t = "known-free";
+      break;
+
+    default:
+      t = "invalid";
+      break;
+    }
+
+  return format (s, "%s", t);
+}
+#endif
+
+u8 *
+format_vlib_buffer_contents (u8 * s, va_list * va)
+{
+  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
+  vlib_buffer_t *b = va_arg (*va, vlib_buffer_t *);
+
+  while (1)
+    {
+      vec_add (s, vlib_buffer_get_current (b), b->current_length);
+      if (!(b->flags & VLIB_BUFFER_NEXT_PRESENT))
+	break;
+      b = vlib_get_buffer (vm, b->next_buffer);
+    }
+
+  return s;
+}
+
+#if DPDK == 0
+static u8 *
+vlib_validate_buffer_helper (vlib_main_t * vm,
+			     u32 bi,
+			     uword follow_buffer_next, uword ** unique_hash)
+{
+  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  vlib_buffer_free_list_t *fl;
+
+  if (pool_is_free_index (bm->buffer_free_list_pool, b->free_list_index))
+    return format (0, "unknown free list 0x%x", b->free_list_index);
+
+  fl = pool_elt_at_index (bm->buffer_free_list_pool, b->free_list_index);
+
+  if ((signed) b->current_data < (signed) -VLIB_BUFFER_PRE_DATA_SIZE)
+    return format (0, "current data %d before pre-data", b->current_data);
+#if DPDK == 0
+  if (b->current_data + b->current_length > fl->n_data_bytes)
+    return format (0, "%d-%d beyond end of buffer %d",
+		   b->current_data, b->current_length, fl->n_data_bytes);
+#endif
+
+  if (follow_buffer_next && (b->flags & VLIB_BUFFER_NEXT_PRESENT))
+    {
+      vlib_buffer_known_state_t k;
+      u8 *msg, *result;
+
+      k = vlib_buffer_is_known (vm, b->next_buffer);
+      if (k != VLIB_BUFFER_KNOWN_ALLOCATED)
+	return format (0, "next 0x%x: %U",
+		       b->next_buffer, format_vlib_buffer_known_state, k);
+
+      if (unique_hash)
+	{
+	  if (hash_get (*unique_hash, b->next_buffer))
+	    return format (0, "duplicate buffer 0x%x", b->next_buffer);
+
+	  hash_set1 (*unique_hash, b->next_buffer);
+	}
+
+      msg = vlib_validate_buffer (vm, b->next_buffer, follow_buffer_next);
+      if (msg)
+	{
+	  result = format (0, "next 0x%x: %v", b->next_buffer, msg);
+	  vec_free (msg);
+	  return result;
+	}
+    }
+
+  return 0;
+}
+
+u8 *
+vlib_validate_buffer (vlib_main_t * vm, u32 bi, uword follow_buffer_next)
+{
+  return vlib_validate_buffer_helper (vm, bi, follow_buffer_next,
+				      /* unique_hash */ 0);
+}
+
+u8 *
+vlib_validate_buffers (vlib_main_t * vm,
+		       u32 * buffers,
+		       uword next_buffer_stride,
+		       uword n_buffers,
+		       vlib_buffer_known_state_t known_state,
+		       uword follow_buffer_next)
+{
+  uword i, *hash;
+  u32 bi, *b = buffers;
+  vlib_buffer_known_state_t k;
+  u8 *msg = 0, *result = 0;
+
+  hash = hash_create (0, 0);
+  for (i = 0; i < n_buffers; i++)
+    {
+      bi = b[0];
+      b += next_buffer_stride;
+
+      /* Buffer is not unique. */
+      if (hash_get (hash, bi))
+	{
+	  msg = format (0, "not unique");
+	  goto done;
+	}
+
+      k = vlib_buffer_is_known (vm, bi);
+      if (k != known_state)
+	{
+	  msg = format (0, "is %U; expected %U",
+			format_vlib_buffer_known_state, k,
+			format_vlib_buffer_known_state, known_state);
+	  goto done;
+	}
+
+      msg = vlib_validate_buffer_helper (vm, bi, follow_buffer_next, &hash);
+      if (msg)
+	goto done;
+
+      hash_set1 (hash, bi);
+    }
+
+done:
+  if (msg)
+    {
+      result = format (0, "0x%x: %v", bi, msg);
+      vec_free (msg);
+    }
+  hash_free (hash);
+  return result;
+}
+#endif
+
+vlib_main_t **vlib_mains;
+
+#if DPDK == 0
+/* When dubugging validate that given buffers are either known allocated
+   or known free. */
+static void
+vlib_buffer_validate_alloc_free (vlib_main_t * vm,
+				 u32 * buffers,
+				 uword n_buffers,
+				 vlib_buffer_known_state_t expected_state)
+{
+  u32 *b;
+  uword i, bi, is_free;
+
+  if (CLIB_DEBUG == 0)
+    return;
+
+  ASSERT (os_get_cpu_number () == 0);
+
+  /* smp disaster check */
+  if (vlib_mains)
+    ASSERT (vm == vlib_mains[0]);
+
+  is_free = expected_state == VLIB_BUFFER_KNOWN_ALLOCATED;
+  b = buffers;
+  for (i = 0; i < n_buffers; i++)
+    {
+      vlib_buffer_known_state_t known;
+
+      bi = b[0];
+      b += 1;
+      known = vlib_buffer_is_known (vm, bi);
+      if (known != expected_state)
+	{
+	  ASSERT (0);
+	  vlib_panic_with_msg
+	    (vm, "%s %U buffer 0x%x",
+	     is_free ? "freeing" : "allocating",
+	     format_vlib_buffer_known_state, known, bi);
+	}
+
+      vlib_buffer_set_known_state
+	(vm, bi,
+	 is_free ? VLIB_BUFFER_KNOWN_FREE : VLIB_BUFFER_KNOWN_ALLOCATED);
+    }
+}
+#endif
+
+#define BUFFERS_PER_COPY (sizeof (vlib_copy_unit_t) / sizeof (u32))
+
+/* Make sure we have at least given number of unaligned buffers. */
+static void
+fill_unaligned (vlib_main_t * vm,
+		vlib_buffer_free_list_t * free_list,
+		uword n_unaligned_buffers)
+{
+  word la = vec_len (free_list->aligned_buffers);
+  word lu = vec_len (free_list->unaligned_buffers);
+
+  /* Aligned come in aligned copy-sized chunks. */
+  ASSERT (la % BUFFERS_PER_COPY == 0);
+
+  ASSERT (la >= n_unaligned_buffers);
+
+  while (lu < n_unaligned_buffers)
+    {
+      /* Copy 4 buffers from end of aligned vector to unaligned vector. */
+      vec_add (free_list->unaligned_buffers,
+	       free_list->aligned_buffers + la - BUFFERS_PER_COPY,
+	       BUFFERS_PER_COPY);
+      la -= BUFFERS_PER_COPY;
+      lu += BUFFERS_PER_COPY;
+    }
+  _vec_len (free_list->aligned_buffers) = la;
+}
+
+/* After free aligned buffers may not contain even sized chunks. */
+static void
+trim_aligned (vlib_buffer_free_list_t * f)
+{
+  uword l, n_trim;
+
+  /* Add unaligned to aligned before trim. */
+  l = vec_len (f->unaligned_buffers);
+  if (l > 0)
+    {
+      vec_add_aligned (f->aligned_buffers, f->unaligned_buffers, l,
+		       /* align */ sizeof (vlib_copy_unit_t));
+
+      _vec_len (f->unaligned_buffers) = 0;
+    }
+
+  /* Remove unaligned buffers from end of aligned vector and save for next trim. */
+  l = vec_len (f->aligned_buffers);
+  n_trim = l % BUFFERS_PER_COPY;
+  if (n_trim)
+    {
+      /* Trim aligned -> unaligned. */
+      vec_add (f->unaligned_buffers, f->aligned_buffers + l - n_trim, n_trim);
+
+      /* Remove from aligned. */
+      _vec_len (f->aligned_buffers) = l - n_trim;
+    }
+}
+
+static void
+merge_free_lists (vlib_buffer_free_list_t * dst,
+		  vlib_buffer_free_list_t * src)
+{
+  uword l;
+  u32 *d;
+
+  trim_aligned (src);
+  trim_aligned (dst);
+
+  l = vec_len (src->aligned_buffers);
+  if (l > 0)
+    {
+      vec_add2_aligned (dst->aligned_buffers, d, l,
+			/* align */ sizeof (vlib_copy_unit_t));
+      clib_memcpy (d, src->aligned_buffers, l * sizeof (d[0]));
+      vec_free (src->aligned_buffers);
+    }
+
+  l = vec_len (src->unaligned_buffers);
+  if (l > 0)
+    {
+      vec_add (dst->unaligned_buffers, src->unaligned_buffers, l);
+      vec_free (src->unaligned_buffers);
+    }
+}
+
+always_inline u32
+vlib_buffer_get_free_list_with_size (vlib_main_t * vm, u32 size)
+{
+  vlib_buffer_main_t *bm = vm->buffer_main;
+
+  size = vlib_buffer_round_size (size);
+  uword *p = hash_get (bm->free_list_by_size, size);
+  return p ? p[0] : ~0;
+}
+
+/* Add buffer free list. */
+static u32
+vlib_buffer_create_free_list_helper (vlib_main_t * vm,
+				     u32 n_data_bytes,
+				     u32 is_public, u32 is_default, u8 * name)
+{
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  vlib_buffer_free_list_t *f;
+#if DPDK > 0
+  int i;
+
+  ASSERT (os_get_cpu_number () == 0);
+
+  if (!is_default && pool_elts (bm->buffer_free_list_pool) == 0)
+    {
+      u32 default_free_free_list_index;
+
+      /* *INDENT-OFF* */
+      default_free_free_list_index =
+        vlib_buffer_create_free_list_helper
+        (vm,
+         /* default buffer size */ VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES,
+         /* is_public */ 1,
+         /* is_default */ 1,
+         (u8 *) "default");
+      /* *INDENT-ON* */
+      ASSERT (default_free_free_list_index ==
+	      VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+
+      if (n_data_bytes == VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES && is_public)
+	return default_free_free_list_index;
+    }
+
+  pool_get_aligned (bm->buffer_free_list_pool, f, CLIB_CACHE_LINE_BYTES);
+
+  memset (f, 0, sizeof (f[0]));
+  f->index = f - bm->buffer_free_list_pool;
+  f->n_data_bytes = vlib_buffer_round_size (n_data_bytes);
+  f->min_n_buffers_each_physmem_alloc = 16;
+  f->name = clib_mem_is_heap_object (name) ? name : format (0, "%s", name);
+
+  /* Setup free buffer template. */
+  f->buffer_init_template.free_list_index = f->index;
+
+  if (is_public)
+    {
+      uword *p = hash_get (bm->free_list_by_size, f->n_data_bytes);
+      if (!p)
+	hash_set (bm->free_list_by_size, f->n_data_bytes, f->index);
+    }
+
+  for (i = 1; i < vec_len (vlib_mains); i++)
+    {
+      vlib_buffer_main_t *wbm = vlib_mains[i]->buffer_main;
+      vlib_buffer_free_list_t *wf;
+      pool_get_aligned (wbm->buffer_free_list_pool,
+			wf, CLIB_CACHE_LINE_BYTES);
+      ASSERT (f - bm->buffer_free_list_pool ==
+	      wf - wbm->buffer_free_list_pool);
+      wf[0] = f[0];
+      wf->aligned_buffers = 0;
+      wf->unaligned_buffers = 0;
+      wf->n_alloc = 0;
+    }
+#else
+
+  if (!is_default && pool_elts (bm->buffer_free_list_pool) == 0)
+    {
+      u32 default_free_free_list_index;
+
+      default_free_free_list_index = vlib_buffer_create_free_list_helper (vm,
+									  /* default buffer size */
+									  VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES,
+									  /* is_public */
+									  1,
+									  /* is_default */
+									  1,
+									  (u8
+									   *)
+									  "default");
+      ASSERT (default_free_free_list_index ==
+	      VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+
+      if (n_data_bytes == VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES && is_public)
+	return default_free_free_list_index;
+    }
+
+  pool_get_aligned (bm->buffer_free_list_pool, f, CLIB_CACHE_LINE_BYTES);
+
+  memset (f, 0, sizeof (f[0]));
+  f->index = f - bm->buffer_free_list_pool;
+  f->n_data_bytes = vlib_buffer_round_size (n_data_bytes);
+  f->min_n_buffers_each_physmem_alloc = 256;
+  f->name = clib_mem_is_heap_object (name) ? name : format (0, "%s", name);
+
+  /* Setup free buffer template. */
+  f->buffer_init_template.free_list_index = f->index;
+
+  if (is_public)
+    {
+      uword *p = hash_get (bm->free_list_by_size, f->n_data_bytes);
+      if (!p)
+	hash_set (bm->free_list_by_size, f->n_data_bytes, f->index);
+    }
+#endif
+
+  return f->index;
+}
+
+u32
+vlib_buffer_create_free_list (vlib_main_t * vm, u32 n_data_bytes,
+			      char *fmt, ...)
+{
+  va_list va;
+  u8 *name;
+
+  va_start (va, fmt);
+  name = va_format (0, fmt, &va);
+  va_end (va);
+
+  return vlib_buffer_create_free_list_helper (vm, n_data_bytes,
+					      /* is_public */ 0,
+					      /* is_default */ 0,
+					      name);
+}
+
+u32
+vlib_buffer_get_or_create_free_list (vlib_main_t * vm, u32 n_data_bytes,
+				     char *fmt, ...)
+{
+  u32 i = vlib_buffer_get_free_list_with_size (vm, n_data_bytes);
+
+  if (i == ~0)
+    {
+      va_list va;
+      u8 *name;
+
+      va_start (va, fmt);
+      name = va_format (0, fmt, &va);
+      va_end (va);
+
+      i = vlib_buffer_create_free_list_helper (vm, n_data_bytes,
+					       /* is_public */ 1,
+					       /* is_default */ 0,
+					       name);
+    }
+
+  return i;
+}
+
+static void
+del_free_list (vlib_main_t * vm, vlib_buffer_free_list_t * f)
+{
+  u32 i;
+#if DPDK > 0
+  struct rte_mbuf *mb;
+  vlib_buffer_t *b;
+
+  for (i = 0; i < vec_len (f->unaligned_buffers); i++)
+    {
+      b = vlib_get_buffer (vm, f->unaligned_buffers[i]);
+      mb = rte_mbuf_from_vlib_buffer (b);
+      ASSERT (rte_mbuf_refcnt_read (mb) == 1);
+      rte_pktmbuf_free (mb);
+    }
+  for (i = 0; i < vec_len (f->aligned_buffers); i++)
+    {
+      b = vlib_get_buffer (vm, f->aligned_buffers[i]);
+      mb = rte_mbuf_from_vlib_buffer (b);
+      ASSERT (rte_mbuf_refcnt_read (mb) == 1);
+      rte_pktmbuf_free (mb);
+    }
+  vec_free (f->name);
+#else
+
+  for (i = 0; i < vec_len (f->buffer_memory_allocated); i++)
+    vm->os_physmem_free (f->buffer_memory_allocated[i]);
+  vec_free (f->name);
+  vec_free (f->buffer_memory_allocated);
+#endif
+  vec_free (f->unaligned_buffers);
+  vec_free (f->aligned_buffers);
+}
+
+/* Add buffer free list. */
+void
+vlib_buffer_delete_free_list (vlib_main_t * vm, u32 free_list_index)
+{
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  vlib_buffer_free_list_t *f;
+  u32 merge_index;
+#if DPDK > 0
+  int i;
+
+  ASSERT (os_get_cpu_number () == 0);
+
+  f = vlib_buffer_get_free_list (vm, free_list_index);
+
+  merge_index = vlib_buffer_get_free_list_with_size (vm, f->n_data_bytes);
+  if (merge_index != ~0 && merge_index != free_list_index)
+    {
+      merge_free_lists (pool_elt_at_index (bm->buffer_free_list_pool,
+					   merge_index), f);
+    }
+
+  del_free_list (vm, f);
+
+  /* Poison it. */
+  memset (f, 0xab, sizeof (f[0]));
+
+  pool_put (bm->buffer_free_list_pool, f);
+
+  for (i = 1; i < vec_len (vlib_mains); i++)
+    {
+      bm = vlib_mains[i]->buffer_main;
+      f = vlib_buffer_get_free_list (vlib_mains[i], free_list_index);;
+      memset (f, 0xab, sizeof (f[0]));
+      pool_put (bm->buffer_free_list_pool, f);
+    }
+#else
+
+  f = vlib_buffer_get_free_list (vm, free_list_index);
+
+  ASSERT (vec_len (f->unaligned_buffers) + vec_len (f->aligned_buffers) ==
+	  f->n_alloc);
+  merge_index = vlib_buffer_get_free_list_with_size (vm, f->n_data_bytes);
+  if (merge_index != ~0 && merge_index != free_list_index)
+    {
+      merge_free_lists (pool_elt_at_index (bm->buffer_free_list_pool,
+					   merge_index), f);
+    }
+
+  del_free_list (vm, f);
+
+  /* Poison it. */
+  memset (f, 0xab, sizeof (f[0]));
+
+  pool_put (bm->buffer_free_list_pool, f);
+#endif
+}
+
+/* Make sure free list has at least given number of free buffers. */
+static uword
+fill_free_list (vlib_main_t * vm,
+		vlib_buffer_free_list_t * fl, uword min_free_buffers)
+{
+#if DPDK > 0
+  vlib_buffer_t *b;
+  int n, i;
+  u32 bi;
+  u32 n_remaining = 0, n_alloc = 0;
+  unsigned socket_id = rte_socket_id ? rte_socket_id () : 0;
+  struct rte_mempool *rmp = vm->buffer_main->pktmbuf_pools[socket_id];
+  struct rte_mbuf *mb;
+
+  /* Too early? */
+  if (PREDICT_FALSE (rmp == 0))
+    return 0;
+
+  trim_aligned (fl);
+
+  /* Already have enough free buffers on free list? */
+  n = min_free_buffers - vec_len (fl->aligned_buffers);
+  if (n <= 0)
+    return min_free_buffers;
+
+  /* Always allocate round number of buffers. */
+  n = round_pow2 (n, BUFFERS_PER_COPY);
+
+  /* Always allocate new buffers in reasonably large sized chunks. */
+  n = clib_max (n, fl->min_n_buffers_each_physmem_alloc);
+
+  vec_validate (vm->mbuf_alloc_list, n - 1);
+
+  if (rte_mempool_get_bulk (rmp, vm->mbuf_alloc_list, n) < 0)
+    return 0;
+
+  _vec_len (vm->mbuf_alloc_list) = n;
+
+  for (i = 0; i < n; i++)
+    {
+      mb = vm->mbuf_alloc_list[i];
+
+      ASSERT (rte_mbuf_refcnt_read (mb) == 0);
+      rte_mbuf_refcnt_set (mb, 1);
+
+      b = vlib_buffer_from_rte_mbuf (mb);
+      bi = vlib_get_buffer_index (vm, b);
+
+      vec_add1_aligned (fl->aligned_buffers, bi, sizeof (vlib_copy_unit_t));
+      n_alloc++;
+      n_remaining--;
+
+      vlib_buffer_init_for_free_list (b, fl);
+
+      if (fl->buffer_init_function)
+	fl->buffer_init_function (vm, fl, &bi, 1);
+    }
+
+  fl->n_alloc += n;
+
+  return n;
+#else
+  vlib_buffer_t *buffers, *b;
+  int n, n_bytes, i;
+  u32 *bi;
+  u32 n_remaining, n_alloc, n_this_chunk;
+
+  trim_aligned (fl);
+
+  /* Already have enough free buffers on free list? */
+  n = min_free_buffers - vec_len (fl->aligned_buffers);
+  if (n <= 0)
+    return min_free_buffers;
+
+  /* Always allocate round number of buffers. */
+  n = round_pow2 (n, BUFFERS_PER_COPY);
+
+  /* Always allocate new buffers in reasonably large sized chunks. */
+  n = clib_max (n, fl->min_n_buffers_each_physmem_alloc);
+
+  n_remaining = n;
+  n_alloc = 0;
+  while (n_remaining > 0)
+    {
+      n_this_chunk = clib_min (n_remaining, 16);
+
+      n_bytes = n_this_chunk * (sizeof (b[0]) + fl->n_data_bytes);
+
+      /* drb: removed power-of-2 ASSERT */
+      buffers = vm->os_physmem_alloc_aligned (&vm->physmem_main,
+					      n_bytes,
+					      sizeof (vlib_buffer_t));
+      if (!buffers)
+	return n_alloc;
+
+      /* Record chunk as being allocated so we can free it later. */
+      vec_add1 (fl->buffer_memory_allocated, buffers);
+
+      fl->n_alloc += n_this_chunk;
+      n_alloc += n_this_chunk;
+      n_remaining -= n_this_chunk;
+
+      b = buffers;
+      vec_add2_aligned (fl->aligned_buffers, bi, n_this_chunk,
+			sizeof (vlib_copy_unit_t));
+      for (i = 0; i < n_this_chunk; i++)
+	{
+	  bi[i] = vlib_get_buffer_index (vm, b);
+
+	  if (CLIB_DEBUG > 0)
+	    vlib_buffer_set_known_state (vm, bi[i], VLIB_BUFFER_KNOWN_FREE);
+	  b = vlib_buffer_next_contiguous (b, fl->n_data_bytes);
+	}
+
+      memset (buffers, 0, n_bytes);
+
+      /* Initialize all new buffers. */
+      b = buffers;
+      for (i = 0; i < n_this_chunk; i++)
+	{
+	  vlib_buffer_init_for_free_list (b, fl);
+	  b = vlib_buffer_next_contiguous (b, fl->n_data_bytes);
+	}
+
+      if (fl->buffer_init_function)
+	fl->buffer_init_function (vm, fl, bi, n_this_chunk);
+    }
+  return n_alloc;
+#endif
+}
+
+always_inline uword
+copy_alignment (u32 * x)
+{
+  return (pointer_to_uword (x) / sizeof (x[0])) % BUFFERS_PER_COPY;
+}
+
+static u32
+alloc_from_free_list (vlib_main_t * vm,
+		      vlib_buffer_free_list_t * free_list,
+		      u32 * alloc_buffers, u32 n_alloc_buffers)
+{
+  u32 *dst, *u_src;
+  uword u_len, n_left;
+  uword n_unaligned_start, n_unaligned_end, n_filled;
+
+#if DPDK == 0
+  ASSERT (os_get_cpu_number () == 0);
+
+#endif
+  n_left = n_alloc_buffers;
+  dst = alloc_buffers;
+  n_unaligned_start = ((BUFFERS_PER_COPY - copy_alignment (dst))
+		       & (BUFFERS_PER_COPY - 1));
+
+  n_filled = fill_free_list (vm, free_list, n_alloc_buffers);
+  if (n_filled == 0)
+    return 0;
+
+  n_left = n_filled < n_left ? n_filled : n_left;
+  n_alloc_buffers = n_left;
+
+  if (n_unaligned_start >= n_left)
+    {
+      n_unaligned_start = n_left;
+      n_unaligned_end = 0;
+    }
+  else
+    n_unaligned_end = copy_alignment (dst + n_alloc_buffers);
+
+  fill_unaligned (vm, free_list, n_unaligned_start + n_unaligned_end);
+
+  u_len = vec_len (free_list->unaligned_buffers);
+  u_src = free_list->unaligned_buffers + u_len - 1;
+
+  if (n_unaligned_start)
+    {
+      uword n_copy = n_unaligned_start;
+      if (n_copy > n_left)
+	n_copy = n_left;
+      n_left -= n_copy;
+
+      while (n_copy > 0)
+	{
+	  *dst++ = *u_src--;
+	  n_copy--;
+	  u_len--;
+	}
+
+      /* Now dst should be aligned. */
+      if (n_left > 0)
+	ASSERT (pointer_to_uword (dst) % sizeof (vlib_copy_unit_t) == 0);
+    }
+
+  /* Aligned copy. */
+  {
+    vlib_copy_unit_t *d, *s;
+    uword n_copy;
+
+    if (vec_len (free_list->aligned_buffers) <
+	((n_left / BUFFERS_PER_COPY) * BUFFERS_PER_COPY))
+      abort ();
+
+    n_copy = n_left / BUFFERS_PER_COPY;
+    n_left = n_left % BUFFERS_PER_COPY;
+
+    /* Remove buffers from aligned free list. */
+    _vec_len (free_list->aligned_buffers) -= n_copy * BUFFERS_PER_COPY;
+
+    s = (vlib_copy_unit_t *) vec_end (free_list->aligned_buffers);
+    d = (vlib_copy_unit_t *) dst;
+
+    /* Fast path loop. */
+    while (n_copy >= 4)
+      {
+	d[0] = s[0];
+	d[1] = s[1];
+	d[2] = s[2];
+	d[3] = s[3];
+	n_copy -= 4;
+	s += 4;
+	d += 4;
+      }
+
+    while (n_copy >= 1)
+      {
+	d[0] = s[0];
+	n_copy -= 1;
+	s += 1;
+	d += 1;
+      }
+
+    dst = (void *) d;
+  }
+
+  /* Unaligned copy. */
+  ASSERT (n_unaligned_end == n_left);
+  while (n_left > 0)
+    {
+      *dst++ = *u_src--;
+      n_left--;
+      u_len--;
+    }
+
+  if (!free_list->unaligned_buffers)
+    ASSERT (u_len == 0);
+  else
+    _vec_len (free_list->unaligned_buffers) = u_len;
+
+#if DPDK == 0
+  /* Verify that buffers are known free. */
+  vlib_buffer_validate_alloc_free (vm, alloc_buffers,
+				   n_alloc_buffers, VLIB_BUFFER_KNOWN_FREE);
+#endif
+
+  return n_alloc_buffers;
+}
+
+/* Allocate a given number of buffers into given array.
+   Returns number actually allocated which will be either zero or
+   number requested. */
+u32
+vlib_buffer_alloc (vlib_main_t * vm, u32 * buffers, u32 n_buffers)
+{
+  vlib_buffer_main_t *bm = vm->buffer_main;
+#if DPDK == 0
+  ASSERT (os_get_cpu_number () == 0);
+#endif
+
+  return alloc_from_free_list
+    (vm,
+     pool_elt_at_index (bm->buffer_free_list_pool,
+			VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX),
+     buffers, n_buffers);
+}
+
+u32
+vlib_buffer_alloc_from_free_list (vlib_main_t * vm,
+				  u32 * buffers,
+				  u32 n_buffers, u32 free_list_index)
+{
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  vlib_buffer_free_list_t *f;
+  f = pool_elt_at_index (bm->buffer_free_list_pool, free_list_index);
+  return alloc_from_free_list (vm, f, buffers, n_buffers);
+}
+
+always_inline void
+add_buffer_to_free_list (vlib_main_t * vm,
+			 vlib_buffer_free_list_t * f,
+			 u32 buffer_index, u8 do_init)
+{
+  vlib_buffer_t *b;
+  b = vlib_get_buffer (vm, buffer_index);
+  if (PREDICT_TRUE (do_init))
+    vlib_buffer_init_for_free_list (b, f);
+  vec_add1_aligned (f->aligned_buffers, buffer_index,
+		    sizeof (vlib_copy_unit_t));
+}
+
+always_inline vlib_buffer_free_list_t *
+buffer_get_free_list (vlib_main_t * vm, vlib_buffer_t * b, u32 * index)
+{
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  u32 i;
+
+  *index = i = b->free_list_index;
+  return pool_elt_at_index (bm->buffer_free_list_pool, i);
+}
+
+void *
+vlib_set_buffer_free_callback (vlib_main_t * vm, void *fp)
+{
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  void *rv = bm->buffer_free_callback;
+
+  bm->buffer_free_callback = fp;
+  return rv;
+}
+
+#if DPDK == 0
+void vnet_buffer_free_dpdk_mb (vlib_buffer_t * b) __attribute__ ((weak));
+void
+vnet_buffer_free_dpdk_mb (vlib_buffer_t * b)
+{
+}
+
+#endif
+static_always_inline void
+vlib_buffer_free_inline (vlib_main_t * vm,
+			 u32 * buffers, u32 n_buffers, u32 follow_buffer_next)
+{
+#if DPDK > 0
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  vlib_buffer_free_list_t *fl;
+  u32 fi;
+  int i;
+  u32 (*cb) (vlib_main_t * vm, u32 * buffers, u32 n_buffers,
+	     u32 follow_buffer_next);
+
+  cb = bm->buffer_free_callback;
+
+  if (PREDICT_FALSE (cb != 0))
+    n_buffers = (*cb) (vm, buffers, n_buffers, follow_buffer_next);
+
+  if (!n_buffers)
+    return;
+
+  for (i = 0; i < n_buffers; i++)
+    {
+      vlib_buffer_t *b;
+      struct rte_mbuf *mb;
+
+      b = vlib_get_buffer (vm, buffers[i]);
+
+      fl = buffer_get_free_list (vm, b, &fi);
+
+      /* The only current use of this callback: multicast recycle */
+      if (PREDICT_FALSE (fl->buffers_added_to_freelist_function != 0))
+	{
+	  int j;
+
+	  add_buffer_to_free_list
+	    (vm, fl, buffers[i], (b->flags & VLIB_BUFFER_RECYCLE) == 0);
+
+	  for (j = 0; j < vec_len (bm->announce_list); j++)
+	    {
+	      if (fl == bm->announce_list[j])
+		goto already_announced;
+	    }
+	  vec_add1 (bm->announce_list, fl);
+	already_announced:
+	  ;
+	}
+      else
+	{
+	  if (PREDICT_TRUE ((b->flags & VLIB_BUFFER_RECYCLE) == 0))
+	    {
+	      mb = rte_mbuf_from_vlib_buffer (b);
+	      ASSERT (rte_mbuf_refcnt_read (mb) == 1);
+	      rte_pktmbuf_free (mb);
+	    }
+	}
+    }
+  if (vec_len (bm->announce_list))
+    {
+      vlib_buffer_free_list_t *fl;
+      for (i = 0; i < vec_len (bm->announce_list); i++)
+	{
+	  fl = bm->announce_list[i];
+	  fl->buffers_added_to_freelist_function (vm, fl);
+	}
+      _vec_len (bm->announce_list) = 0;
+    }
+#else
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  vlib_buffer_free_list_t *fl;
+  static u32 *next_to_free[2];	/* smp bad */
+  u32 i_next_to_free, *b, *n, *f, fi;
+  uword n_left;
+  int i;
+  static vlib_buffer_free_list_t **announce_list;
+  vlib_buffer_free_list_t *fl0 = 0, *fl1 = 0;
+  u32 bi0 = (u32) ~ 0, bi1 = (u32) ~ 0, fi0, fi1 = (u32) ~ 0;
+  u8 free0, free1 = 0, free_next0, free_next1;
+  u32 (*cb) (vlib_main_t * vm, u32 * buffers, u32 n_buffers,
+	     u32 follow_buffer_next);
+
+  ASSERT (os_get_cpu_number () == 0);
+
+  cb = bm->buffer_free_callback;
+
+  if (PREDICT_FALSE (cb != 0))
+    n_buffers = (*cb) (vm, buffers, n_buffers, follow_buffer_next);
+
+  if (!n_buffers)
+    return;
+
+  /* Use first buffer to get default free list. */
+  {
+    u32 bi0 = buffers[0];
+    vlib_buffer_t *b0;
+
+    b0 = vlib_get_buffer (vm, bi0);
+    fl = buffer_get_free_list (vm, b0, &fi);
+    if (fl->buffers_added_to_freelist_function)
+      vec_add1 (announce_list, fl);
+  }
+
+  vec_validate (next_to_free[0], n_buffers - 1);
+  vec_validate (next_to_free[1], n_buffers - 1);
+
+  i_next_to_free = 0;
+  n_left = n_buffers;
+  b = buffers;
+
+again:
+  /* Verify that buffers are known allocated. */
+  vlib_buffer_validate_alloc_free (vm, b,
+				   n_left, VLIB_BUFFER_KNOWN_ALLOCATED);
+
+  vec_add2_aligned (fl->aligned_buffers, f, n_left,
+		    /* align */ sizeof (vlib_copy_unit_t));
+
+  n = next_to_free[i_next_to_free];
+  while (n_left >= 4)
+    {
+      vlib_buffer_t *b0, *b1, *binit0, *binit1, dummy_buffers[2];
+
+      bi0 = b[0];
+      bi1 = b[1];
+
+      f[0] = bi0;
+      f[1] = bi1;
+      f += 2;
+      b += 2;
+      n_left -= 2;
+
+      /* Prefetch buffers for next iteration. */
+      vlib_prefetch_buffer_with_index (vm, b[0], WRITE);
+      vlib_prefetch_buffer_with_index (vm, b[1], WRITE);
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      free0 = (b0->flags & VLIB_BUFFER_RECYCLE) == 0;
+      free1 = (b1->flags & VLIB_BUFFER_RECYCLE) == 0;
+
+      /* Must be before init which will over-write buffer flags. */
+      if (follow_buffer_next)
+	{
+	  n[0] = b0->next_buffer;
+	  free_next0 = free0 && (b0->flags & VLIB_BUFFER_NEXT_PRESENT) != 0;
+	  n += free_next0;
+
+	  n[0] = b1->next_buffer;
+	  free_next1 = free1 && (b1->flags & VLIB_BUFFER_NEXT_PRESENT) != 0;
+	  n += free_next1;
+	}
+      else
+	free_next0 = free_next1 = 0;
+
+      /* Must be before init which will over-write buffer free list. */
+      fi0 = b0->free_list_index;
+      fi1 = b1->free_list_index;
+
+      if (PREDICT_FALSE (fi0 != fi || fi1 != fi))
+	goto slow_path_x2;
+
+      binit0 = free0 ? b0 : &dummy_buffers[0];
+      binit1 = free1 ? b1 : &dummy_buffers[1];
+
+      vlib_buffer_init_two_for_free_list (binit0, binit1, fl);
+      continue;
+
+    slow_path_x2:
+      /* Backup speculation. */
+      f -= 2;
+      n -= free_next0 + free_next1;
+
+      _vec_len (fl->aligned_buffers) = f - fl->aligned_buffers;
+
+      fl0 = pool_elt_at_index (bm->buffer_free_list_pool, fi0);
+      fl1 = pool_elt_at_index (bm->buffer_free_list_pool, fi1);
+
+      add_buffer_to_free_list (vm, fl0, bi0, free0);
+      if (PREDICT_FALSE (fl0->buffers_added_to_freelist_function != 0))
+	{
+	  int i;
+	  for (i = 0; i < vec_len (announce_list); i++)
+	    if (fl0 == announce_list[i])
+	      goto no_fl0;
+	  vec_add1 (announce_list, fl0);
+	}
+    no_fl0:
+      if (PREDICT_FALSE (fl1->buffers_added_to_freelist_function != 0))
+	{
+	  int i;
+	  for (i = 0; i < vec_len (announce_list); i++)
+	    if (fl1 == announce_list[i])
+	      goto no_fl1;
+	  vec_add1 (announce_list, fl1);
+	}
+
+    no_fl1:
+      add_buffer_to_free_list (vm, fl1, bi1, free1);
+
+      /* Possibly change current free list. */
+      if (fi0 != fi && fi1 != fi)
+	{
+	  fi = fi1;
+	  fl = pool_elt_at_index (bm->buffer_free_list_pool, fi);
+	}
+
+      vec_add2_aligned (fl->aligned_buffers, f, n_left,
+			/* align */ sizeof (vlib_copy_unit_t));
+    }
+
+  while (n_left >= 1)
+    {
+      vlib_buffer_t *b0, *binit0, dummy_buffers[1];
+
+      bi0 = b[0];
+      f[0] = bi0;
+      f += 1;
+      b += 1;
+      n_left -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      free0 = (b0->flags & VLIB_BUFFER_RECYCLE) == 0;
+
+      /* Must be before init which will over-write buffer flags. */
+      if (follow_buffer_next)
+	{
+	  n[0] = b0->next_buffer;
+	  free_next0 = free0 && (b0->flags & VLIB_BUFFER_NEXT_PRESENT) != 0;
+	  n += free_next0;
+	}
+      else
+	free_next0 = 0;
+
+      /* Must be before init which will over-write buffer free list. */
+      fi0 = b0->free_list_index;
+
+      if (PREDICT_FALSE (fi0 != fi))
+	goto slow_path_x1;
+
+      binit0 = free0 ? b0 : &dummy_buffers[0];
+
+      vlib_buffer_init_for_free_list (binit0, fl);
+      continue;
+
+    slow_path_x1:
+      /* Backup speculation. */
+      f -= 1;
+      n -= free_next0;
+
+      _vec_len (fl->aligned_buffers) = f - fl->aligned_buffers;
+
+      fl0 = pool_elt_at_index (bm->buffer_free_list_pool, fi0);
+
+      add_buffer_to_free_list (vm, fl0, bi0, free0);
+      if (PREDICT_FALSE (fl0->buffers_added_to_freelist_function != 0))
+	{
+	  int i;
+	  for (i = 0; i < vec_len (announce_list); i++)
+	    if (fl0 == announce_list[i])
+	      goto no_fl00;
+	  vec_add1 (announce_list, fl0);
+	}
+
+    no_fl00:
+      fi = fi0;
+      fl = pool_elt_at_index (bm->buffer_free_list_pool, fi);
+
+      vec_add2_aligned (fl->aligned_buffers, f, n_left,
+			/* align */ sizeof (vlib_copy_unit_t));
+    }
+
+  if (follow_buffer_next && ((n_left = n - next_to_free[i_next_to_free]) > 0))
+    {
+      b = next_to_free[i_next_to_free];
+      i_next_to_free ^= 1;
+      goto again;
+    }
+
+  _vec_len (fl->aligned_buffers) = f - fl->aligned_buffers;
+
+  if (vec_len (announce_list))
+    {
+      vlib_buffer_free_list_t *fl;
+      for (i = 0; i < vec_len (announce_list); i++)
+	{
+	  fl = announce_list[i];
+	  fl->buffers_added_to_freelist_function (vm, fl);
+	}
+      _vec_len (announce_list) = 0;
+    }
+#endif
+}
+
+void
+vlib_buffer_free (vlib_main_t * vm, u32 * buffers, u32 n_buffers)
+{
+  vlib_buffer_free_inline (vm, buffers, n_buffers,	/* follow_buffer_next */
+			   1);
+}
+
+void
+vlib_buffer_free_no_next (vlib_main_t * vm, u32 * buffers, u32 n_buffers)
+{
+  vlib_buffer_free_inline (vm, buffers, n_buffers,	/* follow_buffer_next */
+			   0);
+}
+
+#if DPDK == 0
+/* Copy template packet data into buffers as they are allocated. */
+static void
+vlib_packet_template_buffer_init (vlib_main_t * vm,
+				  vlib_buffer_free_list_t * fl,
+				  u32 * buffers, u32 n_buffers)
+{
+  vlib_packet_template_t *t =
+    uword_to_pointer (fl->buffer_init_function_opaque,
+		      vlib_packet_template_t *);
+  uword i;
+
+  for (i = 0; i < n_buffers; i++)
+    {
+      vlib_buffer_t *b = vlib_get_buffer (vm, buffers[i]);
+      ASSERT (b->current_length == vec_len (t->packet_data));
+      clib_memcpy (vlib_buffer_get_current (b), t->packet_data,
+		   b->current_length);
+    }
+}
+#endif
+
+void
+vlib_packet_template_init (vlib_main_t * vm,
+			   vlib_packet_template_t * t,
+			   void *packet_data,
+			   uword n_packet_data_bytes,
+			   uword min_n_buffers_each_physmem_alloc,
+			   char *fmt, ...)
+{
+#if DPDK > 0
+  va_list va;
+  __attribute__ ((unused)) u8 *name;
+
+  va_start (va, fmt);
+  name = va_format (0, fmt, &va);
+  va_end (va);
+
+  vlib_worker_thread_barrier_sync (vm);
+  memset (t, 0, sizeof (t[0]));
+
+  vec_add (t->packet_data, packet_data, n_packet_data_bytes);
+
+  vlib_worker_thread_barrier_release (vm);
+#else
+  vlib_buffer_free_list_t *fl;
+  va_list va;
+  u8 *name;
+
+  va_start (va, fmt);
+  name = va_format (0, fmt, &va);
+  va_end (va);
+
+  memset (t, 0, sizeof (t[0]));
+
+  vec_add (t->packet_data, packet_data, n_packet_data_bytes);
+  t->min_n_buffers_each_physmem_alloc = min_n_buffers_each_physmem_alloc;
+
+  t->free_list_index = vlib_buffer_create_free_list_helper
+    (vm, n_packet_data_bytes,
+     /* is_public */ 1,
+     /* is_default */ 0,
+     name);
+
+  ASSERT (t->free_list_index != 0);
+  fl = vlib_buffer_get_free_list (vm, t->free_list_index);
+  fl->min_n_buffers_each_physmem_alloc = t->min_n_buffers_each_physmem_alloc;
+
+  fl->buffer_init_function = vlib_packet_template_buffer_init;
+  fl->buffer_init_function_opaque = pointer_to_uword (t);
+
+  fl->buffer_init_template.current_data = 0;
+  fl->buffer_init_template.current_length = n_packet_data_bytes;
+  fl->buffer_init_template.flags = 0;
+#endif
+}
+
+void *
+vlib_packet_template_get_packet (vlib_main_t * vm,
+				 vlib_packet_template_t * t, u32 * bi_result)
+{
+  u32 bi;
+  vlib_buffer_t *b;
+
+  if (vlib_buffer_alloc (vm, &bi, 1) != 1)
+    return 0;
+
+  *bi_result = bi;
+
+  b = vlib_get_buffer (vm, bi);
+  clib_memcpy (vlib_buffer_get_current (b),
+	       t->packet_data, vec_len (t->packet_data));
+  b->current_length = vec_len (t->packet_data);
+
+  return b->data;
+}
+
+#if DPDK == 0
+void
+vlib_packet_template_get_packet_helper (vlib_main_t * vm,
+					vlib_packet_template_t * t)
+{
+  word n = t->min_n_buffers_each_physmem_alloc;
+  word l = vec_len (t->packet_data);
+  word n_alloc;
+
+  ASSERT (l > 0);
+  ASSERT (vec_len (t->free_buffers) == 0);
+
+  vec_validate (t->free_buffers, n - 1);
+  n_alloc = vlib_buffer_alloc_from_free_list (vm, t->free_buffers,
+					      n, t->free_list_index);
+  _vec_len (t->free_buffers) = n_alloc;
+}
+
+#endif
+/* Append given data to end of buffer, possibly allocating new buffers. */
+u32
+vlib_buffer_add_data (vlib_main_t * vm,
+		      u32 free_list_index,
+		      u32 buffer_index, void *data, u32 n_data_bytes)
+{
+  u32 n_buffer_bytes, n_left, n_left_this_buffer, bi;
+  vlib_buffer_t *b;
+  void *d;
+
+  bi = buffer_index;
+  if (bi == 0
+      && 1 != vlib_buffer_alloc_from_free_list (vm, &bi, 1, free_list_index))
+    goto out_of_buffers;
+
+  d = data;
+  n_left = n_data_bytes;
+  n_buffer_bytes = vlib_buffer_free_list_buffer_size (vm, free_list_index);
+
+  b = vlib_get_buffer (vm, bi);
+  b->flags &= ~VLIB_BUFFER_TOTAL_LENGTH_VALID;
+
+  /* Get to the end of the chain before we try to append data... */
+  while (b->flags & VLIB_BUFFER_NEXT_PRESENT)
+    b = vlib_get_buffer (vm, b->next_buffer);
+
+  while (1)
+    {
+      u32 n;
+
+      ASSERT (n_buffer_bytes >= b->current_length);
+      n_left_this_buffer =
+	n_buffer_bytes - (b->current_data + b->current_length);
+      n = clib_min (n_left_this_buffer, n_left);
+      clib_memcpy (vlib_buffer_get_current (b) + b->current_length, d, n);
+      b->current_length += n;
+      n_left -= n;
+      if (n_left == 0)
+	break;
+
+      d += n;
+      if (1 !=
+	  vlib_buffer_alloc_from_free_list (vm, &b->next_buffer, 1,
+					    free_list_index))
+	goto out_of_buffers;
+
+      b->flags |= VLIB_BUFFER_NEXT_PRESENT;
+
+      b = vlib_get_buffer (vm, b->next_buffer);
+    }
+
+  return bi;
+
+out_of_buffers:
+  clib_error ("out of buffers");
+  return bi;
+}
+
+u16
+vlib_buffer_chain_append_data_with_alloc (vlib_main_t * vm,
+					  u32 free_list_index,
+					  vlib_buffer_t * first,
+					  vlib_buffer_t ** last,
+					  void *data, u16 data_len)
+{
+  vlib_buffer_t *l = *last;
+  u32 n_buffer_bytes =
+    vlib_buffer_free_list_buffer_size (vm, free_list_index);
+  u16 copied = 0;
+  ASSERT (n_buffer_bytes >= l->current_length + l->current_data);
+  while (data_len)
+    {
+      u16 max = n_buffer_bytes - l->current_length - l->current_data;
+      if (max == 0)
+	{
+	  if (1 !=
+	      vlib_buffer_alloc_from_free_list (vm, &l->next_buffer, 1,
+						free_list_index))
+	    return copied;
+	  *last = l = vlib_buffer_chain_buffer (vm, first, l, l->next_buffer);
+	  max = n_buffer_bytes - l->current_length - l->current_data;
+	}
+
+      u16 len = (data_len > max) ? max : data_len;
+      clib_memcpy (vlib_buffer_get_current (l) + l->current_length,
+		   data + copied, len);
+      vlib_buffer_chain_increase_length (first, l, len);
+      data_len -= len;
+      copied += len;
+    }
+  return copied;
+}
+
+#if DPDK > 0
+clib_error_t *
+vlib_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs,
+			 unsigned socket_id)
+{
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  vlib_physmem_main_t *vpm = &vm->physmem_main;
+  struct rte_mempool *rmp;
+  int i;
+
+  if (!rte_pktmbuf_pool_create)
+    return clib_error_return (0, "not linked with DPDK");
+
+  vec_validate_aligned (bm->pktmbuf_pools, socket_id, CLIB_CACHE_LINE_BYTES);
+
+  /* pool already exists, nothing to do */
+  if (bm->pktmbuf_pools[socket_id])
+    return 0;
+
+  u8 *pool_name = format (0, "mbuf_pool_socket%u%c", socket_id, 0);
+
+  rmp = rte_pktmbuf_pool_create ((char *) pool_name,	/* pool name */
+				 num_mbufs,	/* number of mbufs */
+				 512,	/* cache size */
+				 VLIB_BUFFER_HDR_SIZE,	/* priv size */
+				 VLIB_BUFFER_PRE_DATA_SIZE + VLIB_BUFFER_DATA_SIZE,	/* dataroom size */
+				 socket_id);	/* cpu socket */
+
+  if (rmp)
+    {
+      {
+	uword this_pool_end;
+	uword this_pool_start;
+	uword this_pool_size;
+	uword save_vpm_start, save_vpm_end, save_vpm_size;
+	struct rte_mempool_memhdr *memhdr;
+
+	this_pool_start = ~0ULL;
+	this_pool_end = 0LL;
+
+	STAILQ_FOREACH (memhdr, &rmp->mem_list, next)
+	{
+	  if (((uword) (memhdr->addr + memhdr->len)) > this_pool_end)
+	    this_pool_end = (uword) (memhdr->addr + memhdr->len);
+	  if (((uword) memhdr->addr) < this_pool_start)
+	    this_pool_start = (uword) (memhdr->addr);
+	}
+	ASSERT (this_pool_start < ~0ULL && this_pool_end > 0);
+	this_pool_size = this_pool_end - this_pool_start;
+
+	if (CLIB_DEBUG > 1)
+	  {
+	    clib_warning ("%s: pool start %llx pool end %llx pool size %lld",
+			  pool_name, this_pool_start, this_pool_end,
+			  this_pool_size);
+	    clib_warning
+	      ("before: virtual.start %llx virtual.end %llx virtual.size %lld",
+	       vpm->virtual.start, vpm->virtual.end, vpm->virtual.size);
+	  }
+
+	save_vpm_start = vpm->virtual.start;
+	save_vpm_end = vpm->virtual.end;
+	save_vpm_size = vpm->virtual.size;
+
+	if ((this_pool_start < vpm->virtual.start) || vpm->virtual.start == 0)
+	  vpm->virtual.start = this_pool_start;
+	if (this_pool_end > vpm->virtual.end)
+	  vpm->virtual.end = this_pool_end;
+
+	vpm->virtual.size = vpm->virtual.end - vpm->virtual.start;
+
+	if (CLIB_DEBUG > 1)
+	  {
+	    clib_warning
+	      ("after: virtual.start %llx virtual.end %llx virtual.size %lld",
+	       vpm->virtual.start, vpm->virtual.end, vpm->virtual.size);
+	  }
+
+	/* check if fits into buffer index range */
+	if ((u64) vpm->virtual.size >
+	    ((u64) 1 << (32 + CLIB_LOG2_CACHE_LINE_BYTES)))
+	  {
+	    clib_warning ("physmem: virtual size out of range!");
+	    vpm->virtual.start = save_vpm_start;
+	    vpm->virtual.end = save_vpm_end;
+	    vpm->virtual.size = save_vpm_size;
+	    rmp = 0;
+	  }
+      }
+      if (rmp)
+	{
+	  bm->pktmbuf_pools[socket_id] = rmp;
+	  vec_free (pool_name);
+	  return 0;
+	}
+    }
+
+  vec_free (pool_name);
+
+  /* no usable pool for this socket, try to use pool from another one */
+  for (i = 0; i < vec_len (bm->pktmbuf_pools); i++)
+    {
+      if (bm->pktmbuf_pools[i])
+	{
+	  clib_warning
+	    ("WARNING: Failed to allocate mempool for CPU socket %u. "
+	     "Threads running on socket %u will use socket %u mempool.",
+	     socket_id, socket_id, i);
+	  bm->pktmbuf_pools[socket_id] = bm->pktmbuf_pools[i];
+	  return 0;
+	}
+    }
+
+  return clib_error_return (0, "failed to allocate mempool on socket %u",
+			    socket_id);
+}
+#endif
+
+static void
+vlib_serialize_tx (serialize_main_header_t * m, serialize_stream_t * s)
+{
+  vlib_main_t *vm;
+  vlib_serialize_buffer_main_t *sm;
+  uword n, n_bytes_to_write;
+  vlib_buffer_t *last;
+
+  n_bytes_to_write = s->current_buffer_index;
+  sm =
+    uword_to_pointer (s->data_function_opaque,
+		      vlib_serialize_buffer_main_t *);
+  vm = sm->vlib_main;
+
+  ASSERT (sm->tx.max_n_data_bytes_per_chain > 0);
+  if (serialize_stream_is_end_of_stream (s)
+      || sm->tx.n_total_data_bytes + n_bytes_to_write >
+      sm->tx.max_n_data_bytes_per_chain)
+    {
+      vlib_process_t *p = vlib_get_current_process (vm);
+
+      last = vlib_get_buffer (vm, sm->last_buffer);
+      last->current_length = n_bytes_to_write;
+
+      vlib_set_next_frame_buffer (vm, &p->node_runtime, sm->tx.next_index,
+				  sm->first_buffer);
+
+      sm->first_buffer = sm->last_buffer = ~0;
+      sm->tx.n_total_data_bytes = 0;
+    }
+
+  else if (n_bytes_to_write == 0 && s->n_buffer_bytes == 0)
+    {
+      ASSERT (sm->first_buffer == ~0);
+      ASSERT (sm->last_buffer == ~0);
+      n =
+	vlib_buffer_alloc_from_free_list (vm, &sm->first_buffer, 1,
+					  sm->tx.free_list_index);
+      if (n != 1)
+	serialize_error (m,
+			 clib_error_create
+			 ("vlib_buffer_alloc_from_free_list fails"));
+      sm->last_buffer = sm->first_buffer;
+      s->n_buffer_bytes =
+	vlib_buffer_free_list_buffer_size (vm, sm->tx.free_list_index);
+    }
+
+  if (n_bytes_to_write > 0)
+    {
+      vlib_buffer_t *prev = vlib_get_buffer (vm, sm->last_buffer);
+      n =
+	vlib_buffer_alloc_from_free_list (vm, &sm->last_buffer, 1,
+					  sm->tx.free_list_index);
+      if (n != 1)
+	serialize_error (m,
+			 clib_error_create
+			 ("vlib_buffer_alloc_from_free_list fails"));
+      sm->tx.n_total_data_bytes += n_bytes_to_write;
+      prev->current_length = n_bytes_to_write;
+      prev->next_buffer = sm->last_buffer;
+      prev->flags |= VLIB_BUFFER_NEXT_PRESENT;
+    }
+
+  if (sm->last_buffer != ~0)
+    {
+      last = vlib_get_buffer (vm, sm->last_buffer);
+      s->buffer = vlib_buffer_get_current (last);
+      s->current_buffer_index = 0;
+      ASSERT (last->current_data == s->current_buffer_index);
+    }
+}
+
+static void
+vlib_serialize_rx (serialize_main_header_t * m, serialize_stream_t * s)
+{
+  vlib_main_t *vm;
+  vlib_serialize_buffer_main_t *sm;
+  vlib_buffer_t *last;
+
+  sm =
+    uword_to_pointer (s->data_function_opaque,
+		      vlib_serialize_buffer_main_t *);
+  vm = sm->vlib_main;
+
+  if (serialize_stream_is_end_of_stream (s))
+    return;
+
+  if (sm->last_buffer != ~0)
+    {
+      last = vlib_get_buffer (vm, sm->last_buffer);
+
+      if (last->flags & VLIB_BUFFER_NEXT_PRESENT)
+	sm->last_buffer = last->next_buffer;
+      else
+	{
+	  vlib_buffer_free (vm, &sm->first_buffer, /* count */ 1);
+	  sm->first_buffer = sm->last_buffer = ~0;
+	}
+    }
+
+  if (sm->last_buffer == ~0)
+    {
+      while (clib_fifo_elts (sm->rx.buffer_fifo) == 0)
+	{
+	  sm->rx.ready_one_time_event =
+	    vlib_process_create_one_time_event (vm, vlib_current_process (vm),
+						~0);
+	  vlib_process_wait_for_one_time_event (vm, /* no event data */ 0,
+						sm->rx.ready_one_time_event);
+	}
+
+      clib_fifo_sub1 (sm->rx.buffer_fifo, sm->first_buffer);
+      sm->last_buffer = sm->first_buffer;
+    }
+
+  ASSERT (sm->last_buffer != ~0);
+
+  last = vlib_get_buffer (vm, sm->last_buffer);
+  s->current_buffer_index = 0;
+  s->buffer = vlib_buffer_get_current (last);
+  s->n_buffer_bytes = last->current_length;
+}
+
+static void
+serialize_open_vlib_helper (serialize_main_t * m,
+			    vlib_main_t * vm,
+			    vlib_serialize_buffer_main_t * sm, uword is_read)
+{
+  /* Initialize serialize main but save overflow buffer for re-use between calls. */
+  {
+    u8 *save = m->stream.overflow_buffer;
+    memset (m, 0, sizeof (m[0]));
+    m->stream.overflow_buffer = save;
+    if (save)
+      _vec_len (save) = 0;
+  }
+
+  sm->first_buffer = sm->last_buffer = ~0;
+  if (is_read)
+    clib_fifo_reset (sm->rx.buffer_fifo);
+  else
+    sm->tx.n_total_data_bytes = 0;
+  sm->vlib_main = vm;
+  m->header.data_function = is_read ? vlib_serialize_rx : vlib_serialize_tx;
+  m->stream.data_function_opaque = pointer_to_uword (sm);
+}
+
+void
+serialize_open_vlib_buffer (serialize_main_t * m, vlib_main_t * vm,
+			    vlib_serialize_buffer_main_t * sm)
+{
+  serialize_open_vlib_helper (m, vm, sm, /* is_read */ 0);
+}
+
+void
+unserialize_open_vlib_buffer (serialize_main_t * m, vlib_main_t * vm,
+			      vlib_serialize_buffer_main_t * sm)
+{
+  serialize_open_vlib_helper (m, vm, sm, /* is_read */ 1);
+}
+
+u32
+serialize_close_vlib_buffer (serialize_main_t * m)
+{
+  vlib_serialize_buffer_main_t *sm
+    = uword_to_pointer (m->stream.data_function_opaque,
+			vlib_serialize_buffer_main_t *);
+  vlib_buffer_t *last;
+  serialize_stream_t *s = &m->stream;
+
+  last = vlib_get_buffer (sm->vlib_main, sm->last_buffer);
+  last->current_length = s->current_buffer_index;
+
+  if (vec_len (s->overflow_buffer) > 0)
+    {
+      sm->last_buffer
+	= vlib_buffer_add_data (sm->vlib_main, sm->tx.free_list_index,
+				sm->last_buffer == ~0 ? 0 : sm->last_buffer,
+				s->overflow_buffer,
+				vec_len (s->overflow_buffer));
+      _vec_len (s->overflow_buffer) = 0;
+    }
+
+  return sm->first_buffer;
+}
+
+void
+unserialize_close_vlib_buffer (serialize_main_t * m)
+{
+  vlib_serialize_buffer_main_t *sm
+    = uword_to_pointer (m->stream.data_function_opaque,
+			vlib_serialize_buffer_main_t *);
+  if (sm->first_buffer != ~0)
+    vlib_buffer_free_one (sm->vlib_main, sm->first_buffer);
+  clib_fifo_reset (sm->rx.buffer_fifo);
+  if (m->stream.overflow_buffer)
+    _vec_len (m->stream.overflow_buffer) = 0;
+}
+
+static u8 *
+format_vlib_buffer_free_list (u8 * s, va_list * va)
+{
+  vlib_buffer_free_list_t *f = va_arg (*va, vlib_buffer_free_list_t *);
+#if DPDK > 0
+  u32 threadnum = va_arg (*va, u32);
+  uword bytes_alloc, bytes_free, n_free, size;
+
+  if (!f)
+    return format (s, "%=7s%=30s%=12s%=12s%=12s%=12s%=12s%=12s",
+		   "Thread", "Name", "Index", "Size", "Alloc", "Free",
+		   "#Alloc", "#Free");
+
+  size = sizeof (vlib_buffer_t) + f->n_data_bytes;
+  n_free = vec_len (f->aligned_buffers) + vec_len (f->unaligned_buffers);
+  bytes_alloc = size * f->n_alloc;
+  bytes_free = size * n_free;
+
+  s = format (s, "%7d%30s%12d%12d%=12U%=12U%=12d%=12d", threadnum,
+#else
+  uword bytes_alloc, bytes_free, n_free, size;
+
+  if (!f)
+    return format (s, "%=30s%=12s%=12s%=12s%=12s%=12s%=12s",
+		   "Name", "Index", "Size", "Alloc", "Free", "#Alloc",
+		   "#Free");
+
+  size = sizeof (vlib_buffer_t) + f->n_data_bytes;
+  n_free = vec_len (f->aligned_buffers) + vec_len (f->unaligned_buffers);
+  bytes_alloc = size * f->n_alloc;
+  bytes_free = size * n_free;
+
+  s = format (s, "%30s%12d%12d%=12U%=12U%=12d%=12d",
+#endif
+	      f->name, f->index, f->n_data_bytes,
+	      format_memory_size, bytes_alloc,
+	      format_memory_size, bytes_free, f->n_alloc, n_free);
+
+  return s;
+}
+
+static clib_error_t *
+show_buffers (vlib_main_t * vm,
+	      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+#if DPDK > 0
+  vlib_buffer_main_t *bm;
+  vlib_buffer_free_list_t *f;
+  vlib_main_t *curr_vm;
+  u32 vm_index = 0;
+
+  vlib_cli_output (vm, "%U", format_vlib_buffer_free_list, 0, 0);
+
+  do
+    {
+      curr_vm = vec_len (vlib_mains) ? vlib_mains[vm_index] : vm;
+      bm = curr_vm->buffer_main;
+
+    /* *INDENT-OFF* */
+    pool_foreach (f, bm->buffer_free_list_pool, ({
+      vlib_cli_output (vm, "%U", format_vlib_buffer_free_list, f, vm_index);
+    }));
+    /* *INDENT-ON* */
+
+      vm_index++;
+    }
+  while (vm_index < vec_len (vlib_mains));
+
+#else
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  vlib_buffer_free_list_t *f;
+
+  vlib_cli_output (vm, "%U", format_vlib_buffer_free_list, 0);
+  /* *INDENT-OFF* */
+  pool_foreach (f, bm->buffer_free_list_pool, ({
+    vlib_cli_output (vm, "%U", format_vlib_buffer_free_list, f);
+  }));
+/* *INDENT-ON* */
+
+#endif
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_buffers_command, static) = {
+  .path = "show buffers",
+  .short_help = "Show packet buffer allocation",
+  .function = show_buffers,
+};
+/* *INDENT-ON* */
+
+#if DPDK > 0
+#if CLIB_DEBUG > 0
+
+u32 *vlib_buffer_state_validation_lock;
+uword *vlib_buffer_state_validation_hash;
+void *vlib_buffer_state_heap;
+
+static clib_error_t *
+buffer_state_validation_init (vlib_main_t * vm)
+{
+  void *oldheap;
+
+  vlib_buffer_state_heap = mheap_alloc (0, 10 << 20);
+
+  oldheap = clib_mem_set_heap (vlib_buffer_state_heap);
+
+  vlib_buffer_state_validation_hash = hash_create (0, sizeof (uword));
+  vec_validate_aligned (vlib_buffer_state_validation_lock, 0,
+			CLIB_CACHE_LINE_BYTES);
+  clib_mem_set_heap (oldheap);
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (buffer_state_validation_init);
+#endif
+#endif
+
+
+/** @endcond */
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/buffer.h b/src/vlib/buffer.h
new file mode 100644
index 00000000..5f1e62f0
--- /dev/null
+++ b/src/vlib/buffer.h
@@ -0,0 +1,417 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * buffer.h: VLIB buffers
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_buffer_h
+#define included_vlib_buffer_h
+
+#include <vppinfra/types.h>
+#include <vppinfra/cache.h>
+#include <vppinfra/serialize.h>
+#include <vppinfra/vector.h>
+#include <vlib/error.h>		/* for vlib_error_t */
+
+#if DPDK > 0
+#include <rte_config.h>
+#define VLIB_BUFFER_DATA_SIZE		(2048)
+#define VLIB_BUFFER_PRE_DATA_SIZE	RTE_PKTMBUF_HEADROOM
+#else
+#include <vlib/config.h>	/* for __PRE_DATA_SIZE */
+#define VLIB_BUFFER_DATA_SIZE		(512)
+#define VLIB_BUFFER_PRE_DATA_SIZE	__PRE_DATA_SIZE
+#endif
+
+#if defined (CLIB_HAVE_VEC128) || defined (__aarch64__)
+typedef u8x16 vlib_copy_unit_t;
+#else
+typedef u64 vlib_copy_unit_t;
+#endif
+
+/** \file
+    vlib buffer structure definition and a few select
+    access methods. This structure and the buffer allocation
+    mechanism should perhaps live in vnet, but it would take a lot
+    of typing to make it so.
+*/
+
+/* VLIB buffer representation. */
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  /* Offset within data[] that we are currently processing.
+     If negative current header points into predata area. */
+  i16 current_data;  /**< signed offset in data[], pre_data[]
+                        that we are currently processing.
+                        If negative current header points into predata area.
+                     */
+  u16 current_length;  /**< Nbytes between current data and
+                          the end of this buffer.
+                       */
+  u32 flags; /**< buffer flags:
+                <br> VLIB_BUFFER_IS_TRACED: trace this buffer.
+                <br> VLIB_BUFFER_NEXT_PRESENT: this is a multi-chunk buffer.
+                <br> VLIB_BUFFER_TOTAL_LENGTH_VALID: as it says
+                <br> VLIB_BUFFER_REPL_FAIL: packet replication failure
+                <br> VLIB_BUFFER_RECYCLE: as it says
+                <br> VLIB_BUFFER_FLOW_REPORT: buffer is a flow report,
+                set to avoid adding it to a flow report
+                <br> VLIB_BUFFER_FLAG_USER(n): user-defined bit N
+             */
+#define VLIB_BUFFER_IS_TRACED (1 << 0)
+#define VLIB_BUFFER_LOG2_NEXT_PRESENT (1)
+#define VLIB_BUFFER_NEXT_PRESENT (1 << VLIB_BUFFER_LOG2_NEXT_PRESENT)
+#define VLIB_BUFFER_IS_RECYCLED (1 << 2)
+#define VLIB_BUFFER_TOTAL_LENGTH_VALID (1 << 3)
+#define VLIB_BUFFER_REPL_FAIL (1 << 4)
+#define VLIB_BUFFER_RECYCLE (1 << 5)
+#define VLIB_BUFFER_FLOW_REPORT (1 << 6)
+
+  /* User defined buffer flags. */
+#define LOG2_VLIB_BUFFER_FLAG_USER(n) (32 - (n))
+#define VLIB_BUFFER_FLAG_USER(n) (1 << LOG2_VLIB_BUFFER_FLAG_USER(n))
+
+  u32 free_list_index; /**< Buffer free list that this buffer was
+                          allocated from and will be freed to.
+                       */
+
+  u32 total_length_not_including_first_buffer;
+  /**< Only valid for first buffer in chain. Current length plus
+     total length given here give total number of bytes in buffer chain.
+  */
+
+  u32 next_buffer;   /**< Next buffer for this linked-list of buffers.
+                        Only valid if VLIB_BUFFER_NEXT_PRESENT flag is set.
+                     */
+
+  vlib_error_t error;	/**< Error code for buffers to be enqueued
+                           to error handler.
+                        */
+  u32 current_config_index; /**< Used by feature subgraph arcs to
+                               visit enabled feature nodes
+                            */
+
+  u8 feature_arc_index;	/**< Used to identify feature arcs by intermediate
+                           feature node
+                        */
+
+  u8 dont_waste_me[3]; /**< Available space in the (precious)
+                          first 32 octets of buffer metadata
+                          Before allocating any of it, discussion required!
+                       */
+
+  u32 opaque[8]; /**< Opaque data used by sub-graphs for their own purposes.
+                    See .../vnet/vnet/buffer.h
+                 */
+    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
+
+  u32 trace_index; /**< Specifies index into trace buffer
+                      if VLIB_PACKET_IS_TRACED flag is set.
+                   */
+  u32 recycle_count; /**< Used by L2 path recycle code */
+  u32 opaque2[14];  /**< More opaque data, currently unused */
+
+  /***** end of second cache line */
+    CLIB_CACHE_LINE_ALIGN_MARK (cacheline2);
+  u8 pre_data[VLIB_BUFFER_PRE_DATA_SIZE];  /**< Space for inserting data
+                                               before buffer start.
+                                               Packet rewrite string will be
+                                               rewritten backwards and may extend
+                                               back before buffer->data[0].
+                                               Must come directly before packet data.
+                                            */
+
+  u8 data[0]; /**< Packet data. Hardware DMA here */
+} vlib_buffer_t;		/* Must be a multiple of 64B. */
+
+#define VLIB_BUFFER_HDR_SIZE  (sizeof(vlib_buffer_t) - VLIB_BUFFER_PRE_DATA_SIZE)
+
+/** \brief Prefetch buffer metadata.
+    The first 64 bytes of buffer contains most header information
+
+    @param b - (vlib_buffer_t *) pointer to the buffer
+    @param type - LOAD, STORE. In most cases, STORE is the right answer
+*/
+
+#define vlib_prefetch_buffer_header(b,type) CLIB_PREFETCH (b, 64, type)
+
+always_inline vlib_buffer_t *
+vlib_buffer_next_contiguous (vlib_buffer_t * b, u32 buffer_bytes)
+{
+  return (void *) (b + 1) + buffer_bytes;
+}
+
+always_inline void
+vlib_buffer_struct_is_sane (vlib_buffer_t * b)
+{
+  ASSERT (sizeof (b[0]) % 64 == 0);
+
+  /* Rewrite data must be before and contiguous with packet data. */
+  ASSERT (b->pre_data + VLIB_BUFFER_PRE_DATA_SIZE == b->data);
+}
+
+/** \brief Get pointer to current data to process
+
+    @param b - (vlib_buffer_t *) pointer to the buffer
+    @return - (void *) (b->data + b->current_data)
+*/
+
+always_inline void *
+vlib_buffer_get_current (vlib_buffer_t * b)
+{
+  /* Check bounds. */
+  ASSERT ((signed) b->current_data >= (signed) -VLIB_BUFFER_PRE_DATA_SIZE);
+  return b->data + b->current_data;
+}
+
+/** \brief Advance current data pointer by the supplied (signed!) amount
+
+    @param b - (vlib_buffer_t *) pointer to the buffer
+    @param l - (word) signed increment
+*/
+always_inline void
+vlib_buffer_advance (vlib_buffer_t * b, word l)
+{
+  ASSERT (b->current_length >= l);
+  b->current_data += l;
+  b->current_length -= l;
+}
+
+/** \brief Reset current header & length to state they were in when
+    packet was received.
+
+    @param b - (vlib_buffer_t *) pointer to the buffer
+*/
+
+always_inline void
+vlib_buffer_reset (vlib_buffer_t * b)
+{
+  b->current_length += clib_max (b->current_data, 0);
+  b->current_data = 0;
+}
+
+/** \brief Get pointer to buffer's opaque data array
+
+    @param b - (vlib_buffer_t *) pointer to the buffer
+    @return - (void *) b->opaque
+*/
+always_inline void *
+vlib_get_buffer_opaque (vlib_buffer_t * b)
+{
+  return (void *) b->opaque;
+}
+
+/** \brief Get pointer to buffer's opaque2 data array
+
+    @param b - (vlib_buffer_t *) pointer to the buffer
+    @return - (void *) b->opaque2
+*/
+always_inline void *
+vlib_get_buffer_opaque2 (vlib_buffer_t * b)
+{
+  return (void *) b->opaque2;
+}
+
+/* Forward declaration. */
+struct vlib_main_t;
+
+typedef struct vlib_buffer_free_list_t
+{
+  /* Template buffer used to initialize first 16 bytes of buffers
+     allocated on this free list. */
+  vlib_buffer_t buffer_init_template;
+
+  /* Our index into vlib_main_t's buffer_free_list_pool. */
+  u32 index;
+
+  /* Number of data bytes for buffers in this free list. */
+  u32 n_data_bytes;
+
+  /* Number of buffers to allocate when we need to allocate new buffers
+     from physmem heap. */
+  u32 min_n_buffers_each_physmem_alloc;
+
+  /* Total number of buffers allocated from this free list. */
+  u32 n_alloc;
+
+  /* Vector of free buffers.  Each element is a byte offset into I/O heap.
+     Aligned vectors always has naturally aligned vlib_copy_unit_t sized chunks
+     of buffer indices.  Unaligned vector has any left over.  This is meant to
+     speed up copy routines. */
+  u32 *aligned_buffers, *unaligned_buffers;
+
+  /* Memory chunks allocated for this free list
+     recorded here so they can be freed when free list
+     is deleted. */
+  void **buffer_memory_allocated;
+
+  /* Free list name. */
+  u8 *name;
+
+  /* Callback functions to initialize newly allocated buffers.
+     If null buffers are zeroed. */
+  void (*buffer_init_function) (struct vlib_main_t * vm,
+				struct vlib_buffer_free_list_t * fl,
+				u32 * buffers, u32 n_buffers);
+
+  /* Callback function to announce that buffers have been
+     added to the freelist */
+  void (*buffers_added_to_freelist_function)
+    (struct vlib_main_t * vm, struct vlib_buffer_free_list_t * fl);
+
+  uword buffer_init_function_opaque;
+} __attribute__ ((aligned (16))) vlib_buffer_free_list_t;
+
+typedef struct
+{
+  /* Buffer free callback, for subversive activities */
+  u32 (*buffer_free_callback) (struct vlib_main_t * vm,
+			       u32 * buffers,
+			       u32 n_buffers, u32 follow_buffer_next);
+  /* Pool of buffer free lists.
+     Multiple free lists exist for packet generator which uses
+     separate free lists for each packet stream --- so as to avoid
+     initializing static data for each packet generated. */
+  vlib_buffer_free_list_t *buffer_free_list_pool;
+#define VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX (0)
+#define VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES VLIB_BUFFER_DATA_SIZE
+
+  /* Hash table mapping buffer size (rounded to next unit of
+     sizeof (vlib_buffer_t)) to free list index. */
+  uword *free_list_by_size;
+
+  /* Hash table mapping buffer index into number
+     0 => allocated but free, 1 => allocated and not-free.
+     If buffer index is not in hash table then this buffer
+     has never been allocated. */
+  uword *buffer_known_hash;
+
+  /* List of free-lists needing Blue Light Special announcements */
+  vlib_buffer_free_list_t **announce_list;
+
+  /*  Vector of rte_mempools per socket */
+#if DPDK == 1
+  struct rte_mempool **pktmbuf_pools;
+#endif
+} vlib_buffer_main_t;
+
+typedef struct
+{
+  struct vlib_main_t *vlib_main;
+
+  u32 first_buffer, last_buffer;
+
+  union
+  {
+    struct
+    {
+      /* Total accumulated bytes in chain starting with first_buffer. */
+      u32 n_total_data_bytes;
+
+      /* Max number of bytes to accumulate in chain starting with first_buffer.
+         As this limit is reached buffers are enqueued to next node. */
+      u32 max_n_data_bytes_per_chain;
+
+      /* Next node to enqueue buffers to relative to current process node. */
+      u32 next_index;
+
+      /* Free list to use to allocate new buffers. */
+      u32 free_list_index;
+    } tx;
+
+    struct
+    {
+      /* CLIB fifo of buffer indices waiting to be unserialized. */
+      u32 *buffer_fifo;
+
+      /* Event type used to signal that RX buffers have been added to fifo. */
+      uword ready_one_time_event;
+    } rx;
+  };
+} vlib_serialize_buffer_main_t;
+
+void serialize_open_vlib_buffer (serialize_main_t * m, struct vlib_main_t *vm,
+				 vlib_serialize_buffer_main_t * sm);
+void unserialize_open_vlib_buffer (serialize_main_t * m,
+				   struct vlib_main_t *vm,
+				   vlib_serialize_buffer_main_t * sm);
+
+u32 serialize_close_vlib_buffer (serialize_main_t * m);
+void unserialize_close_vlib_buffer (serialize_main_t * m);
+void *vlib_set_buffer_free_callback (struct vlib_main_t *vm, void *fp);
+
+always_inline u32
+serialize_vlib_buffer_n_bytes (serialize_main_t * m)
+{
+  serialize_stream_t *s = &m->stream;
+  vlib_serialize_buffer_main_t *sm
+    = uword_to_pointer (m->stream.data_function_opaque,
+			vlib_serialize_buffer_main_t *);
+  return sm->tx.n_total_data_bytes + s->current_buffer_index +
+    vec_len (s->overflow_buffer);
+}
+
+#if DPDK > 0
+#define rte_mbuf_from_vlib_buffer(x) (((struct rte_mbuf *)x) - 1)
+#define vlib_buffer_from_rte_mbuf(x) ((vlib_buffer_t *)(x+1))
+#endif
+
+/*
+ */
+
+/** \brief Compile time buffer trajectory tracing option
+    Turn this on if you run into "bad monkey" contexts,
+    and you want to know exactly which nodes they've visited...
+    See vlib/main.c...
+*/
+#define VLIB_BUFFER_TRACE_TRAJECTORY 0
+
+#if VLIB_BUFFER_TRACE_TRAJECTORY > 0
+#define VLIB_BUFFER_TRACE_TRAJECTORY_INIT(b) (b)->pre_data[0]=0
+#else
+#define VLIB_BUFFER_TRACE_TRAJECTORY_INIT(b)
+#endif /* VLIB_BUFFER_TRACE_TRAJECTORY */
+
+#endif /* included_vlib_buffer_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/buffer_funcs.h b/src/vlib/buffer_funcs.h
new file mode 100644
index 00000000..75716eca
--- /dev/null
+++ b/src/vlib/buffer_funcs.h
@@ -0,0 +1,755 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * buffer_funcs.h: VLIB buffer related functions/inlines
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_buffer_funcs_h
+#define included_vlib_buffer_funcs_h
+
+#include <vppinfra/hash.h>
+
+/** \file
+    vlib buffer access methods.
+*/
+
+
+/** \brief Translate buffer index into buffer pointer
+
+    @param vm - (vlib_main_t *) vlib main data structure pointer
+    @param buffer_index - (u32) buffer index
+    @return - (vlib_buffer_t *) buffer pointer
+*/
+always_inline vlib_buffer_t *
+vlib_get_buffer (vlib_main_t * vm, u32 buffer_index)
+{
+  return vlib_physmem_at_offset (&vm->physmem_main, ((uword) buffer_index)
+				 << CLIB_LOG2_CACHE_LINE_BYTES);
+}
+
+/** \brief Translate buffer pointer into buffer index
+
+    @param vm - (vlib_main_t *) vlib main data structure pointer
+    @param p - (void *) buffer pointer
+    @return - (u32) buffer index
+*/
+always_inline u32
+vlib_get_buffer_index (vlib_main_t * vm, void *p)
+{
+  uword offset = vlib_physmem_offset_of (&vm->physmem_main, p);
+  ASSERT ((offset % (1 << CLIB_LOG2_CACHE_LINE_BYTES)) == 0);
+  return offset >> CLIB_LOG2_CACHE_LINE_BYTES;
+}
+
+/** \brief Get next buffer in buffer linklist, or zero for end of list.
+
+    @param vm - (vlib_main_t *) vlib main data structure pointer
+    @param b - (void *) buffer pointer
+    @return - (vlib_buffer_t *) next buffer, or NULL
+*/
+always_inline vlib_buffer_t *
+vlib_get_next_buffer (vlib_main_t * vm, vlib_buffer_t * b)
+{
+  return (b->flags & VLIB_BUFFER_NEXT_PRESENT
+	  ? vlib_get_buffer (vm, b->next_buffer) : 0);
+}
+
+uword vlib_buffer_length_in_chain_slow_path (vlib_main_t * vm,
+					     vlib_buffer_t * b_first);
+
+/** \brief Get length in bytes of the buffer chain
+
+    @param vm - (vlib_main_t *) vlib main data structure pointer
+    @param b - (void *) buffer pointer
+    @return - (uword) length of buffer chain
+*/
+always_inline uword
+vlib_buffer_length_in_chain (vlib_main_t * vm, vlib_buffer_t * b)
+{
+  uword l = b->current_length + b->total_length_not_including_first_buffer;
+  if (PREDICT_FALSE ((b->flags & (VLIB_BUFFER_NEXT_PRESENT
+				  | VLIB_BUFFER_TOTAL_LENGTH_VALID))
+		     == VLIB_BUFFER_NEXT_PRESENT))
+    return vlib_buffer_length_in_chain_slow_path (vm, b);
+  return l;
+}
+
+/** \brief Get length in bytes of the buffer index buffer chain
+
+    @param vm - (vlib_main_t *) vlib main data structure pointer
+    @param bi - (u32) buffer index
+    @return - (uword) length of buffer chain
+*/
+always_inline uword
+vlib_buffer_index_length_in_chain (vlib_main_t * vm, u32 bi)
+{
+  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+  return vlib_buffer_length_in_chain (vm, b);
+}
+
+/** \brief Copy buffer contents to memory
+
+    @param vm - (vlib_main_t *) vlib main data structure pointer
+    @param buffer_index - (u32) buffer index
+    @param contents - (u8 *) memory, <strong>must be large enough</strong>
+    @return - (uword) length of buffer chain
+*/
+always_inline uword
+vlib_buffer_contents (vlib_main_t * vm, u32 buffer_index, u8 * contents)
+{
+  uword content_len = 0;
+  uword l;
+  vlib_buffer_t *b;
+
+  while (1)
+    {
+      b = vlib_get_buffer (vm, buffer_index);
+      l = b->current_length;
+      clib_memcpy (contents + content_len, b->data + b->current_data, l);
+      content_len += l;
+      if (!(b->flags & VLIB_BUFFER_NEXT_PRESENT))
+	break;
+      buffer_index = b->next_buffer;
+    }
+
+  return content_len;
+}
+
+/* Return physical address of buffer->data start. */
+always_inline u64
+vlib_get_buffer_data_physical_address (vlib_main_t * vm, u32 buffer_index)
+{
+  return vlib_physmem_offset_to_physical (&vm->physmem_main,
+					  (((uword) buffer_index) <<
+					   CLIB_LOG2_CACHE_LINE_BYTES) +
+					  STRUCT_OFFSET_OF (vlib_buffer_t,
+							    data));
+}
+
+/** \brief Prefetch buffer metadata by buffer index
+    The first 64 bytes of buffer contains most header information
+
+    @param vm - (vlib_main_t *) vlib main data structure pointer
+    @param bi - (u32) buffer index
+    @param type - LOAD, STORE. In most cases, STORE is the right answer
+*/
+/* Prefetch buffer header given index. */
+#define vlib_prefetch_buffer_with_index(vm,bi,type)	\
+  do {							\
+    vlib_buffer_t * _b = vlib_get_buffer (vm, bi);	\
+    vlib_prefetch_buffer_header (_b, type);		\
+  } while (0)
+
+#if 0
+/* Iterate over known allocated vlib bufs. You probably do not want
+ * to do this!
+ @param vm      the vlib_main_t
+ @param bi      found allocated buffer index
+ @param body    operation to perform on buffer index
+ function executes body for each allocated buffer index
+ */
+#define vlib_buffer_foreach_allocated(vm,bi,body)                \
+do {                                                             \
+  vlib_main_t * _vmain = (vm);                                   \
+  vlib_buffer_main_t * _bmain = &_vmain->buffer_main;            \
+  hash_pair_t * _vbpair;                                         \
+  hash_foreach_pair(_vbpair, _bmain->buffer_known_hash, ({       \
+    if (VLIB_BUFFER_KNOWN_ALLOCATED == _vbpair->value[0]) {      \
+      (bi) = _vbpair->key;                                       \
+      body;                                                      \
+    }                                                            \
+  }));                                                           \
+} while (0)
+#endif
+
+#if DPDK == 0
+
+typedef enum
+{
+  /* Index is unknown. */
+  VLIB_BUFFER_UNKNOWN,
+
+  /* Index is known and free/allocated. */
+  VLIB_BUFFER_KNOWN_FREE,
+  VLIB_BUFFER_KNOWN_ALLOCATED,
+} vlib_buffer_known_state_t;
+
+always_inline vlib_buffer_known_state_t
+vlib_buffer_is_known (vlib_main_t * vm, u32 buffer_index)
+{
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  ASSERT (os_get_cpu_number () == 0);
+
+  uword *p = hash_get (bm->buffer_known_hash, buffer_index);
+  return p ? p[0] : VLIB_BUFFER_UNKNOWN;
+}
+
+always_inline void
+vlib_buffer_set_known_state (vlib_main_t * vm,
+			     u32 buffer_index,
+			     vlib_buffer_known_state_t state)
+{
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  ASSERT (os_get_cpu_number () == 0);
+  hash_set (bm->buffer_known_hash, buffer_index, state);
+}
+
+/* Validates sanity of a single buffer.
+   Returns format'ed vector with error message if any. */
+u8 *vlib_validate_buffer (vlib_main_t * vm, u32 buffer_index,
+			  uword follow_chain);
+
+#endif /* DPDK == 0 */
+
+clib_error_t *vlib_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs,
+				       unsigned socket_id);
+
+/** \brief Allocate buffers into supplied array
+
+    @param vm - (vlib_main_t *) vlib main data structure pointer
+    @param buffers - (u32 * ) buffer index array
+    @param n_buffers - (u32) number of buffers requested
+    @return - (u32) number of buffers actually allocated, may be
+    less than the number requested or zero
+*/
+u32 vlib_buffer_alloc (vlib_main_t * vm, u32 * buffers, u32 n_buffers);
+
+always_inline u32
+vlib_buffer_round_size (u32 size)
+{
+  return round_pow2 (size, sizeof (vlib_buffer_t));
+}
+
+/** \brief Allocate buffers from specific freelist into supplied array
+
+    @param vm - (vlib_main_t *) vlib main data structure pointer
+    @param buffers - (u32 * ) buffer index array
+    @param n_buffers - (u32) number of buffers requested
+    @return - (u32) number of buffers actually allocated, may be
+    less than the number requested or zero
+*/
+u32 vlib_buffer_alloc_from_free_list (vlib_main_t * vm,
+				      u32 * buffers,
+				      u32 n_buffers, u32 free_list_index);
+
+/** \brief Free buffers
+    Frees the entire buffer chain for each buffer
+
+    @param vm - (vlib_main_t *) vlib main data structure pointer
+    @param buffers - (u32 * ) buffer index array
+    @param n_buffers - (u32) number of buffers to free
+
+*/
+void vlib_buffer_free (vlib_main_t * vm,
+		       /* pointer to first buffer */
+		       u32 * buffers,
+		       /* number of buffers to free */
+		       u32 n_buffers);
+
+/** \brief Free buffers, does not free the buffer chain for each buffer
+
+    @param vm - (vlib_main_t *) vlib main data structure pointer
+    @param buffers - (u32 * ) buffer index array
+    @param n_buffers - (u32) number of buffers to free
+
+*/
+void vlib_buffer_free_no_next (vlib_main_t * vm,
+			       /* pointer to first buffer */
+			       u32 * buffers,
+			       /* number of buffers to free */
+			       u32 n_buffers);
+
+/** \brief Free one buffer
+    Shorthand to free a single buffer chain.
+
+    @param vm - (vlib_main_t *) vlib main data structure pointer
+    @param buffer_index - (u32) buffer index to free
+*/
+always_inline void
+vlib_buffer_free_one (vlib_main_t * vm, u32 buffer_index)
+{
+  vlib_buffer_free (vm, &buffer_index, /* n_buffers */ 1);
+}
+
+/* Add/delete buffer free lists. */
+u32 vlib_buffer_create_free_list (vlib_main_t * vm, u32 n_data_bytes,
+				  char *fmt, ...);
+void vlib_buffer_delete_free_list (vlib_main_t * vm, u32 free_list_index);
+
+/* Find already existing public free list with given size or create one. */
+u32 vlib_buffer_get_or_create_free_list (vlib_main_t * vm, u32 n_data_bytes,
+					 char *fmt, ...);
+
+always_inline vlib_buffer_free_list_t *
+vlib_buffer_get_free_list (vlib_main_t * vm, u32 free_list_index)
+{
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  vlib_buffer_free_list_t *f;
+
+  f = pool_elt_at_index (bm->buffer_free_list_pool, free_list_index);
+
+  /* Sanity: indices must match. */
+  ASSERT (f->index == free_list_index);
+
+  return f;
+}
+
+always_inline u32
+vlib_buffer_free_list_buffer_size (vlib_main_t * vm, u32 free_list_index)
+{
+  vlib_buffer_free_list_t *f =
+    vlib_buffer_get_free_list (vm, free_list_index);
+  return f->n_data_bytes;
+}
+
+void vlib_aligned_memcpy (void *_dst, void *_src, int n_bytes);
+
+/* Reasonably fast buffer copy routine. */
+always_inline void
+vlib_copy_buffers (u32 * dst, u32 * src, u32 n)
+{
+  while (n >= 4)
+    {
+      dst[0] = src[0];
+      dst[1] = src[1];
+      dst[2] = src[2];
+      dst[3] = src[3];
+      dst += 4;
+      src += 4;
+      n -= 4;
+    }
+  while (n > 0)
+    {
+      dst[0] = src[0];
+      dst += 1;
+      src += 1;
+      n -= 1;
+    }
+}
+
+always_inline void *
+vlib_physmem_alloc_aligned (vlib_main_t * vm, clib_error_t ** error,
+			    uword n_bytes, uword alignment)
+{
+  void *r =
+    vm->os_physmem_alloc_aligned (&vm->physmem_main, n_bytes, alignment);
+  if (!r)
+    *error =
+      clib_error_return (0, "failed to allocate %wd bytes of I/O memory",
+			 n_bytes);
+  else
+    *error = 0;
+  return r;
+}
+
+/* By default allocate I/O memory with cache line alignment. */
+always_inline void *
+vlib_physmem_alloc (vlib_main_t * vm, clib_error_t ** error, uword n_bytes)
+{
+  return vlib_physmem_alloc_aligned (vm, error, n_bytes,
+				     CLIB_CACHE_LINE_BYTES);
+}
+
+always_inline void
+vlib_physmem_free (vlib_main_t * vm, void *mem)
+{
+  return vm->os_physmem_free (mem);
+}
+
+always_inline u64
+vlib_physmem_virtual_to_physical (vlib_main_t * vm, void *mem)
+{
+  vlib_physmem_main_t *pm = &vm->physmem_main;
+  uword o = pointer_to_uword (mem) - pm->virtual.start;
+  return vlib_physmem_offset_to_physical (pm, o);
+}
+
+/* Append given data to end of buffer, possibly allocating new buffers. */
+u32 vlib_buffer_add_data (vlib_main_t * vm,
+			  u32 free_list_index,
+			  u32 buffer_index, void *data, u32 n_data_bytes);
+
+/* duplicate all buffers in chain */
+always_inline vlib_buffer_t *
+vlib_buffer_copy (vlib_main_t * vm, vlib_buffer_t * b)
+{
+  vlib_buffer_t *s, *d, *fd;
+  uword n_alloc, n_buffers = 1;
+  u32 *new_buffers = 0;
+  u32 flag_mask = VLIB_BUFFER_NEXT_PRESENT | VLIB_BUFFER_TOTAL_LENGTH_VALID;
+  int i;
+
+  s = b;
+  while (s->flags & VLIB_BUFFER_NEXT_PRESENT)
+    {
+      n_buffers++;
+      s = vlib_get_buffer (vm, s->next_buffer);
+    }
+
+  vec_validate (new_buffers, n_buffers - 1);
+  n_alloc = vlib_buffer_alloc (vm, new_buffers, n_buffers);
+  ASSERT (n_alloc == n_buffers);
+
+  /* 1st segment */
+  s = b;
+  fd = d = vlib_get_buffer (vm, new_buffers[0]);
+  d->current_data = s->current_data;
+  d->current_length = s->current_length;
+  d->flags = s->flags & flag_mask;
+  d->total_length_not_including_first_buffer =
+    s->total_length_not_including_first_buffer;
+  clib_memcpy (d->opaque, s->opaque, sizeof (s->opaque));
+  clib_memcpy (vlib_buffer_get_current (d),
+	       vlib_buffer_get_current (s), s->current_length);
+
+  /* next segments */
+  for (i = 1; i < n_buffers; i++)
+    {
+      /* previous */
+      d->next_buffer = new_buffers[i];
+      /* current */
+      s = vlib_get_buffer (vm, s->next_buffer);
+      d = vlib_get_buffer (vm, new_buffers[i]);
+      d->current_data = s->current_data;
+      d->current_length = s->current_length;
+      clib_memcpy (vlib_buffer_get_current (d),
+		   vlib_buffer_get_current (s), s->current_length);
+      d->flags = s->flags & flag_mask;
+    }
+
+  return fd;
+}
+
+/*
+ * vlib_buffer_chain_* functions provide a way to create long buffers.
+ * When DPDK is enabled, the 'hidden' DPDK header is taken care of transparently.
+ */
+
+/* Initializes the buffer as an empty packet with no chained buffers. */
+always_inline void
+vlib_buffer_chain_init (vlib_buffer_t * first)
+{
+  first->total_length_not_including_first_buffer = 0;
+  first->current_length = 0;
+  first->flags &= ~VLIB_BUFFER_NEXT_PRESENT;
+  first->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
+}
+
+/* The provided next_bi buffer index is appended to the end of the packet. */
+always_inline vlib_buffer_t *
+vlib_buffer_chain_buffer (vlib_main_t * vm,
+			  vlib_buffer_t * first,
+			  vlib_buffer_t * last, u32 next_bi)
+{
+  vlib_buffer_t *next_buffer = vlib_get_buffer (vm, next_bi);
+  last->next_buffer = next_bi;
+  last->flags |= VLIB_BUFFER_NEXT_PRESENT;
+  next_buffer->current_length = 0;
+  next_buffer->flags &= ~VLIB_BUFFER_NEXT_PRESENT;
+  return next_buffer;
+}
+
+/* Increases or decreases the packet length.
+ * It does not allocate or deallocate new buffers.
+ * Therefore, the added length must be compatible
+ * with the last buffer. */
+always_inline void
+vlib_buffer_chain_increase_length (vlib_buffer_t * first,
+				   vlib_buffer_t * last, i32 len)
+{
+  last->current_length += len;
+  if (first != last)
+    first->total_length_not_including_first_buffer += len;
+}
+
+/* Copy data to the end of the packet and increases its length.
+ * It does not allocate new buffers.
+ * Returns the number of copied bytes. */
+always_inline u16
+vlib_buffer_chain_append_data (vlib_main_t * vm,
+			       u32 free_list_index,
+			       vlib_buffer_t * first,
+			       vlib_buffer_t * last, void *data, u16 data_len)
+{
+  u32 n_buffer_bytes =
+    vlib_buffer_free_list_buffer_size (vm, free_list_index);
+  ASSERT (n_buffer_bytes >= last->current_length + last->current_data);
+  u16 len = clib_min (data_len,
+		      n_buffer_bytes - last->current_length -
+		      last->current_data);
+  clib_memcpy (vlib_buffer_get_current (last) + last->current_length, data,
+	       len);
+  vlib_buffer_chain_increase_length (first, last, len);
+  return len;
+}
+
+/* Copy data to the end of the packet and increases its length.
+ * Allocates additional buffers from the free list if necessary.
+ * Returns the number of copied bytes.
+ * 'last' value is modified whenever new buffers are allocated and
+ * chained and points to the last buffer in the chain. */
+u16
+vlib_buffer_chain_append_data_with_alloc (vlib_main_t * vm,
+					  u32 free_list_index,
+					  vlib_buffer_t * first,
+					  vlib_buffer_t ** last,
+					  void *data, u16 data_len);
+void vlib_buffer_chain_validate (vlib_main_t * vm, vlib_buffer_t * first);
+
+format_function_t format_vlib_buffer, format_vlib_buffer_and_data,
+  format_vlib_buffer_contents;
+
+typedef struct
+{
+  /* Vector of packet data. */
+  u8 *packet_data;
+
+  /* Note: the next three fields are unused if DPDK == 1 */
+
+  /* Number of buffers to allocate in each call to physmem
+     allocator. */
+  u32 min_n_buffers_each_physmem_alloc;
+
+  /* Buffer free list for this template. */
+  u32 free_list_index;
+
+  u32 *free_buffers;
+} vlib_packet_template_t;
+
+void vlib_packet_template_get_packet_helper (vlib_main_t * vm,
+					     vlib_packet_template_t * t);
+
+void vlib_packet_template_init (vlib_main_t * vm,
+				vlib_packet_template_t * t,
+				void *packet_data,
+				uword n_packet_data_bytes,
+				uword min_n_buffers_each_physmem_alloc,
+				char *fmt, ...);
+
+void *vlib_packet_template_get_packet (vlib_main_t * vm,
+				       vlib_packet_template_t * t,
+				       u32 * bi_result);
+
+always_inline void
+vlib_packet_template_free (vlib_main_t * vm, vlib_packet_template_t * t)
+{
+  vec_free (t->packet_data);
+}
+
+always_inline u32
+unserialize_vlib_buffer_n_bytes (serialize_main_t * m)
+{
+  serialize_stream_t *s = &m->stream;
+  vlib_serialize_buffer_main_t *sm
+    = uword_to_pointer (m->stream.data_function_opaque,
+			vlib_serialize_buffer_main_t *);
+  vlib_main_t *vm = sm->vlib_main;
+  u32 n, *f;
+
+  n = s->n_buffer_bytes - s->current_buffer_index;
+  if (sm->last_buffer != ~0)
+    {
+      vlib_buffer_t *b = vlib_get_buffer (vm, sm->last_buffer);
+      while (b->flags & VLIB_BUFFER_NEXT_PRESENT)
+	{
+	  b = vlib_get_buffer (vm, b->next_buffer);
+	  n += b->current_length;
+	}
+    }
+
+  /* *INDENT-OFF* */
+  clib_fifo_foreach (f, sm->rx.buffer_fifo, ({
+    n += vlib_buffer_index_length_in_chain (vm, f[0]);
+  }));
+/* *INDENT-ON* */
+
+  return n;
+}
+
+typedef union
+{
+  vlib_buffer_t b;
+  vlib_copy_unit_t i[sizeof (vlib_buffer_t) / sizeof (vlib_copy_unit_t)];
+}
+vlib_buffer_union_t;
+
+/* Set a buffer quickly into "uninitialized" state.  We want this to
+   be extremely cheap and arrange for all fields that need to be
+   initialized to be in the first 128 bits of the buffer. */
+always_inline void
+vlib_buffer_init_for_free_list (vlib_buffer_t * _dst,
+				vlib_buffer_free_list_t * fl)
+{
+  vlib_buffer_union_t *dst = (vlib_buffer_union_t *) _dst;
+  vlib_buffer_union_t *src =
+    (vlib_buffer_union_t *) & fl->buffer_init_template;
+
+  /* Make sure vlib_buffer_t is cacheline aligned and sized */
+  ASSERT (STRUCT_OFFSET_OF (vlib_buffer_t, cacheline0) == 0);
+  ASSERT (STRUCT_OFFSET_OF (vlib_buffer_t, cacheline1) ==
+	  CLIB_CACHE_LINE_BYTES);
+  ASSERT (STRUCT_OFFSET_OF (vlib_buffer_t, cacheline2) ==
+	  CLIB_CACHE_LINE_BYTES * 2);
+
+  /* Make sure buffer template is sane. */
+  ASSERT (fl->index == fl->buffer_init_template.free_list_index);
+
+  /* Copy template from src->current_data thru src->free_list_index */
+  dst->i[0] = src->i[0];
+  if (1 * sizeof (dst->i[0]) < 16)
+    dst->i[1] = src->i[1];
+  if (2 * sizeof (dst->i[0]) < 16)
+    dst->i[2] = src->i[2];
+
+  /* Make sure it really worked. */
+#define _(f) ASSERT (dst->b.f == src->b.f)
+  _(current_data);
+  _(current_length);
+  _(flags);
+  _(free_list_index);
+#undef _
+  ASSERT (dst->b.total_length_not_including_first_buffer == 0);
+}
+
+always_inline void
+vlib_buffer_init_two_for_free_list (vlib_buffer_t * _dst0,
+				    vlib_buffer_t * _dst1,
+				    vlib_buffer_free_list_t * fl)
+{
+  vlib_buffer_union_t *dst0 = (vlib_buffer_union_t *) _dst0;
+  vlib_buffer_union_t *dst1 = (vlib_buffer_union_t *) _dst1;
+  vlib_buffer_union_t *src =
+    (vlib_buffer_union_t *) & fl->buffer_init_template;
+
+  /* Make sure buffer template is sane. */
+  ASSERT (fl->index == fl->buffer_init_template.free_list_index);
+
+  /* Copy template from src->current_data thru src->free_list_index */
+  dst0->i[0] = dst1->i[0] = src->i[0];
+  if (1 * sizeof (dst0->i[0]) < 16)
+    dst0->i[1] = dst1->i[1] = src->i[1];
+  if (2 * sizeof (dst0->i[0]) < 16)
+    dst0->i[2] = dst1->i[2] = src->i[2];
+
+  /* Make sure it really worked. */
+#define _(f) ASSERT (dst0->b.f == src->b.f && dst1->b.f == src->b.f)
+  _(current_data);
+  _(current_length);
+  _(flags);
+  _(free_list_index);
+#undef _
+  ASSERT (dst0->b.total_length_not_including_first_buffer == 0);
+  ASSERT (dst1->b.total_length_not_including_first_buffer == 0);
+}
+
+#if CLIB_DEBUG > 0
+extern u32 *vlib_buffer_state_validation_lock;
+extern uword *vlib_buffer_state_validation_hash;
+extern void *vlib_buffer_state_heap;
+#endif
+
+static inline void
+vlib_validate_buffer_in_use (vlib_buffer_t * b, u32 expected)
+{
+#if CLIB_DEBUG > 0
+  uword *p;
+  void *oldheap;
+
+  oldheap = clib_mem_set_heap (vlib_buffer_state_heap);
+
+  while (__sync_lock_test_and_set (vlib_buffer_state_validation_lock, 1))
+    ;
+
+  p = hash_get (vlib_buffer_state_validation_hash, b);
+
+  /* If we don't know about b, declare it to be in the expected state */
+  if (!p)
+    {
+      hash_set (vlib_buffer_state_validation_hash, b, expected);
+      goto out;
+    }
+
+  if (p[0] != expected)
+    {
+      void cj_stop (void);
+      u32 bi;
+      vlib_main_t *vm = &vlib_global_main;
+
+      cj_stop ();
+
+      bi = vlib_get_buffer_index (vm, b);
+
+      clib_mem_set_heap (oldheap);
+      clib_warning ("%.6f buffer %llx (%d): %s, not %s",
+		    vlib_time_now (vm), bi,
+		    p[0] ? "busy" : "free", expected ? "busy" : "free");
+      os_panic ();
+    }
+out:
+  CLIB_MEMORY_BARRIER ();
+  *vlib_buffer_state_validation_lock = 0;
+  clib_mem_set_heap (oldheap);
+#endif
+}
+
+static inline void
+vlib_validate_buffer_set_in_use (vlib_buffer_t * b, u32 expected)
+{
+#if CLIB_DEBUG > 0
+  void *oldheap;
+
+  oldheap = clib_mem_set_heap (vlib_buffer_state_heap);
+
+  while (__sync_lock_test_and_set (vlib_buffer_state_validation_lock, 1))
+    ;
+
+  hash_set (vlib_buffer_state_validation_hash, b, expected);
+
+  CLIB_MEMORY_BARRIER ();
+  *vlib_buffer_state_validation_lock = 0;
+  clib_mem_set_heap (oldheap);
+#endif
+}
+
+#endif /* included_vlib_buffer_funcs_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/buffer_node.h b/src/vlib/buffer_node.h
new file mode 100644
index 00000000..8a779049
--- /dev/null
+++ b/src/vlib/buffer_node.h
@@ -0,0 +1,337 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * buffer_node.h: VLIB buffer handling node helper macros/inlines
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_buffer_node_h
+#define included_vlib_buffer_node_h
+
+/** \file
+    vlib buffer/node functions
+*/
+
+/** \brief Finish enqueueing two buffers forward in the graph.
+ Standard dual loop boilerplate element. This is a MACRO,
+ with MULTIPLE SIDE EFFECTS. In the ideal case,
+ <code>next_index == next0 == next1</code>,
+ which means that the speculative enqueue at the top of the dual loop
+ has correctly dealt with both packets. In that case, the macro does
+ nothing at all.
+
+ @param vm vlib_main_t pointer, varies by thread
+ @param node current node vlib_node_runtime_t pointer
+ @param next_index speculated next index used for both packets
+ @param to_next speculated vector pointer used for both packets
+ @param n_left_to_next number of slots left in speculated vector
+ @param bi0 first buffer index
+ @param bi1 second buffer index
+ @param next0 actual next index to be used for the first packet
+ @param next1 actual next index to be used for the second packet
+
+ @return @c next_index -- speculative next index to be used for future packets
+ @return @c to_next -- speculative frame to be used for future packets
+ @return @c n_left_to_next -- number of slots left in speculative frame
+*/
+
+#define vlib_validate_buffer_enqueue_x2(vm,node,next_index,to_next,n_left_to_next,bi0,bi1,next0,next1) \
+do {									\
+  int enqueue_code = (next0 != next_index) + 2*(next1 != next_index);	\
+									\
+  if (PREDICT_FALSE (enqueue_code != 0))				\
+    {									\
+      switch (enqueue_code)						\
+	{								\
+	case 1:								\
+	  /* A B A */							\
+	  to_next[-2] = bi1;						\
+	  to_next -= 1;							\
+	  n_left_to_next += 1;						\
+	  vlib_set_next_frame_buffer (vm, node, next0, bi0);		\
+	  break;							\
+									\
+	case 2:								\
+	  /* A A B */							\
+	  to_next -= 1;							\
+	  n_left_to_next += 1;						\
+	  vlib_set_next_frame_buffer (vm, node, next1, bi1);		\
+	  break;							\
+									\
+	case 3:								\
+	  /* A B B or A B C */						\
+	  to_next -= 2;							\
+	  n_left_to_next += 2;						\
+	  vlib_set_next_frame_buffer (vm, node, next0, bi0);		\
+	  vlib_set_next_frame_buffer (vm, node, next1, bi1);		\
+	  if (next0 == next1)						\
+	    {								\
+	      vlib_put_next_frame (vm, node, next_index,		\
+				   n_left_to_next);			\
+	      next_index = next1;					\
+	      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); \
+	    }								\
+	}								\
+    }									\
+} while (0)
+
+
+/** \brief Finish enqueueing four buffers forward in the graph.
+ Standard quad loop boilerplate element. This is a MACRO,
+ with MULTIPLE SIDE EFFECTS. In the ideal case,
+ <code>next_index == next0 == next1 == next2 == next3</code>,
+ which means that the speculative enqueue at the top of the quad loop
+ has correctly dealt with all four packets. In that case, the macro does
+ nothing at all.
+
+ @param vm vlib_main_t pointer, varies by thread
+ @param node current node vlib_node_runtime_t pointer
+ @param next_index speculated next index used for both packets
+ @param to_next speculated vector pointer used for both packets
+ @param n_left_to_next number of slots left in speculated vector
+ @param bi0 first buffer index
+ @param bi1 second buffer index
+ @param bi2 third buffer index
+ @param bi3 fourth buffer index
+ @param next0 actual next index to be used for the first packet
+ @param next1 actual next index to be used for the second packet
+ @param next2 actual next index to be used for the third packet
+ @param next3 actual next index to be used for the fourth packet
+
+ @return @c next_index -- speculative next index to be used for future packets
+ @return @c to_next -- speculative frame to be used for future packets
+ @return @c n_left_to_next -- number of slots left in speculative frame
+*/
+
+#define vlib_validate_buffer_enqueue_x4(vm,node,next_index,to_next,n_left_to_next,bi0,bi1,bi2,bi3,next0,next1,next2,next3) \
+do {                                                                    \
+  /* After the fact: check the [speculative] enqueue to "next" */       \
+  u32 fix_speculation = next_index != next0 || next_index != next1      \
+    || next_index != next2 || next_index != next3;                      \
+  if (PREDICT_FALSE(fix_speculation))                                   \
+    {                                                                   \
+      /* rewind... */                                                   \
+      to_next -= 4;                                                     \
+      n_left_to_next += 4;                                              \
+                                                                        \
+      /* If bi0 belongs to "next", send it there */                     \
+      if (next_index == next0)                                          \
+        {                                                               \
+          to_next[0] = bi0;                                             \
+          to_next++;                                                    \
+          n_left_to_next --;                                            \
+        }                                                               \
+      else              /* send it where it needs to go */              \
+        vlib_set_next_frame_buffer (vm, node, next0, bi0);              \
+                                                                        \
+      if (next_index == next1)                                          \
+        {                                                               \
+          to_next[0] = bi1;                                             \
+          to_next++;                                                    \
+          n_left_to_next --;                                            \
+        }                                                               \
+      else                                                              \
+        vlib_set_next_frame_buffer (vm, node, next1, bi1);              \
+                                                                        \
+      if (next_index == next2)                                          \
+        {                                                               \
+          to_next[0] = bi2;                                             \
+          to_next++;                                                    \
+          n_left_to_next --;                                            \
+        }                                                               \
+      else                                                              \
+        vlib_set_next_frame_buffer (vm, node, next2, bi2);              \
+                                                                        \
+      if (next_index == next3)                                          \
+        {                                                               \
+          to_next[0] = bi3;                                             \
+          to_next++;                                                    \
+          n_left_to_next --;                                            \
+        }                                                               \
+      else                                                              \
+        vlib_set_next_frame_buffer (vm, node, next3, bi3);              \
+                                                                        \
+      /* Change speculation: last 2 packets went to the same node */    \
+      if (next2 == next3)                                               \
+        {                                                               \
+          vlib_put_next_frame (vm, node, next_index, n_left_to_next);   \
+          next_index = next3;                                           \
+          vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); \
+        }                                                               \
+    }                                                                   \
+ } while(0);
+
+/** \brief Finish enqueueing one buffer forward in the graph.
+ Standard single loop boilerplate element. This is a MACRO,
+ with MULTIPLE SIDE EFFECTS. In the ideal case,
+ <code>next_index == next0</code>,
+ which means that the speculative enqueue at the top of the single loop
+ has correctly dealt with the packet in hand. In that case, the macro does
+ nothing at all.
+
+ @param vm vlib_main_t pointer, varies by thread
+ @param node current node vlib_node_runtime_t pointer
+ @param next_index speculated next index used for both packets
+ @param to_next speculated vector pointer used for both packets
+ @param n_left_to_next number of slots left in speculated vector
+ @param bi0 first buffer index
+ @param next0 actual next index to be used for the first packet
+
+ @return @c next_index -- speculative next index to be used for future packets
+ @return @c to_next -- speculative frame to be used for future packets
+ @return @c n_left_to_next -- number of slots left in speculative frame
+*/
+#define vlib_validate_buffer_enqueue_x1(vm,node,next_index,to_next,n_left_to_next,bi0,next0) \
+do {									\
+  if (PREDICT_FALSE (next0 != next_index))				\
+    {									\
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next + 1);	\
+      next_index = next0;						\
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); \
+									\
+      to_next[0] = bi0;							\
+      to_next += 1;							\
+      n_left_to_next -= 1;						\
+    }									\
+} while (0)
+
+always_inline uword
+generic_buffer_node_inline (vlib_main_t * vm,
+			    vlib_node_runtime_t * node,
+			    vlib_frame_t * frame,
+			    uword sizeof_trace,
+			    void *opaque1,
+			    uword opaque2,
+			    void (*two_buffers) (vlib_main_t * vm,
+						 void *opaque1,
+						 uword opaque2,
+						 vlib_buffer_t * b0,
+						 vlib_buffer_t * b1,
+						 u32 * next0, u32 * next1),
+			    void (*one_buffer) (vlib_main_t * vm,
+						void *opaque1, uword opaque2,
+						vlib_buffer_t * b0,
+						u32 * next0))
+{
+  u32 n_left_from, *from, *to_next;
+  u32 next_index;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+				   /* stride */ 1, sizeof_trace);
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  vlib_buffer_t *p0, *p1;
+	  u32 pi0, next0;
+	  u32 pi1, next1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, 64, LOAD);
+	    CLIB_PREFETCH (p3->data, 64, LOAD);
+	  }
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+
+	  two_buffers (vm, opaque1, opaque2, p0, p1, &next0, &next1);
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, pi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  u32 pi0, next0;
+
+	  pi0 = from[0];
+	  to_next[0] = pi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  one_buffer (vm, opaque1, opaque2, p0, &next0);
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+#endif /* included_vlib_buffer_node_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/cli.c b/src/vlib/cli.c
new file mode 100644
index 00000000..2d141115
--- /dev/null
+++ b/src/vlib/cli.c
@@ -0,0 +1,1173 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * cli.c: command line interface
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vppinfra/cpu.h>
+
+/* Root of all show commands. */
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vlib_cli_show_command, static) = {
+  .path = "show",
+  .short_help = "Show commands",
+};
+/* *INDENT-ON* */
+
+/* Root of all clear commands. */
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vlib_cli_clear_command, static) = {
+  .path = "clear",
+  .short_help = "Clear commands",
+};
+/* *INDENT-ON* */
+
+/* Root of all set commands. */
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vlib_cli_set_command, static) = {
+  .path = "set",
+  .short_help = "Set commands",
+};
+/* *INDENT-ON* */
+
+/* Root of all test commands. */
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vlib_cli_test_command, static) = {
+  .path = "test",
+  .short_help = "Test commands",
+};
+/* *INDENT-ON* */
+
+/* Returns bitmap of commands which match key. */
+static uword *
+vlib_cli_sub_command_match (vlib_cli_command_t * c, unformat_input_t * input)
+{
+  int i, n;
+  uword *match = 0;
+  vlib_cli_parse_position_t *p;
+
+  unformat_skip_white_space (input);
+
+  for (i = 0;; i++)
+    {
+      uword k;
+
+      k = unformat_get_input (input);
+      switch (k)
+	{
+	case 'a' ... 'z':
+	case 'A' ... 'Z':
+	case '0' ... '9':
+	case '-':
+	case '_':
+	  break;
+
+	case ' ':
+	case '\t':
+	case '\r':
+	case '\n':
+	case UNFORMAT_END_OF_INPUT:
+	  /* White space or end of input removes any non-white
+	     matches that were before possible. */
+	  if (i < vec_len (c->sub_command_positions)
+	      && clib_bitmap_count_set_bits (match) > 1)
+	    {
+	      p = vec_elt_at_index (c->sub_command_positions, i);
+	      for (n = 0; n < vec_len (p->bitmaps); n++)
+		match = clib_bitmap_andnot (match, p->bitmaps[n]);
+	    }
+	  goto done;
+
+	default:
+	  unformat_put_input (input);
+	  goto done;
+	}
+
+      if (i >= vec_len (c->sub_command_positions))
+	{
+	no_match:
+	  clib_bitmap_free (match);
+	  return 0;
+	}
+
+      p = vec_elt_at_index (c->sub_command_positions, i);
+      if (vec_len (p->bitmaps) == 0)
+	goto no_match;
+
+      n = k - p->min_char;
+      if (n < 0 || n >= vec_len (p->bitmaps))
+	goto no_match;
+
+      if (i == 0)
+	match = clib_bitmap_dup (p->bitmaps[n]);
+      else
+	match = clib_bitmap_and (match, p->bitmaps[n]);
+
+      if (clib_bitmap_is_zero (match))
+	goto no_match;
+    }
+
+done:
+  return match;
+}
+
+/* Looks for string based sub-input formatted { SUB-INPUT }. */
+uword
+unformat_vlib_cli_sub_input (unformat_input_t * i, va_list * args)
+{
+  unformat_input_t *sub_input = va_arg (*args, unformat_input_t *);
+  u8 *s;
+  uword c;
+
+  while (1)
+    {
+      c = unformat_get_input (i);
+      switch (c)
+	{
+	case ' ':
+	case '\t':
+	case '\n':
+	case '\r':
+	case '\f':
+	  break;
+
+	case '{':
+	default:
+	  /* Put back paren. */
+	  if (c != UNFORMAT_END_OF_INPUT)
+	    unformat_put_input (i);
+
+	  if (c == '{' && unformat (i, "%v", &s))
+	    {
+	      unformat_init_vector (sub_input, s);
+	      return 1;
+	    }
+	  return 0;
+	}
+    }
+  return 0;
+}
+
+static vlib_cli_command_t *
+get_sub_command (vlib_cli_main_t * cm, vlib_cli_command_t * parent, u32 si)
+{
+  vlib_cli_sub_command_t *s = vec_elt_at_index (parent->sub_commands, si);
+  return vec_elt_at_index (cm->commands, s->index);
+}
+
+static uword
+unformat_vlib_cli_sub_command (unformat_input_t * i, va_list * args)
+{
+  vlib_main_t *vm = va_arg (*args, vlib_main_t *);
+  vlib_cli_command_t *c = va_arg (*args, vlib_cli_command_t *);
+  vlib_cli_command_t **result = va_arg (*args, vlib_cli_command_t **);
+  vlib_cli_main_t *cm = &vm->cli_main;
+  uword *match_bitmap, is_unique, index;
+
+  {
+    vlib_cli_sub_rule_t *sr;
+    vlib_cli_parse_rule_t *r;
+    vec_foreach (sr, c->sub_rules)
+    {
+      void **d;
+      r = vec_elt_at_index (cm->parse_rules, sr->rule_index);
+      vec_add2 (cm->parse_rule_data, d, 1);
+      vec_reset_length (d[0]);
+      if (r->data_size)
+	d[0] = _vec_resize (d[0],
+			    /* length increment */ 1,
+			    r->data_size,
+			    /* header_bytes */ 0,
+			    /* data align */ sizeof (uword));
+      if (unformat_user (i, r->unformat_function, vm, d[0]))
+	{
+	  *result = vec_elt_at_index (cm->commands, sr->command_index);
+	  return 1;
+	}
+    }
+  }
+
+  match_bitmap = vlib_cli_sub_command_match (c, i);
+  is_unique = clib_bitmap_count_set_bits (match_bitmap) == 1;
+  index = ~0;
+  if (is_unique)
+    {
+      index = clib_bitmap_first_set (match_bitmap);
+      *result = get_sub_command (cm, c, index);
+    }
+  clib_bitmap_free (match_bitmap);
+
+  return is_unique;
+}
+
+static u8 *
+format_vlib_cli_command_help (u8 * s, va_list * args)
+{
+  vlib_cli_command_t *c = va_arg (*args, vlib_cli_command_t *);
+  int is_long = va_arg (*args, int);
+  if (is_long && c->long_help)
+    s = format (s, "%s", c->long_help);
+  else if (c->short_help)
+    s = format (s, "%s", c->short_help);
+  else
+    s = format (s, "%v commands", c->path);
+  return s;
+}
+
+static u8 *
+format_vlib_cli_parse_rule_name (u8 * s, va_list * args)
+{
+  vlib_cli_parse_rule_t *r = va_arg (*args, vlib_cli_parse_rule_t *);
+  return format (s, "<%U>", format_c_identifier, r->name);
+}
+
+static u8 *
+format_vlib_cli_path (u8 * s, va_list * args)
+{
+  u8 *path = va_arg (*args, u8 *);
+  int i, in_rule;
+  in_rule = 0;
+  for (i = 0; i < vec_len (path); i++)
+    {
+      switch (path[i])
+	{
+	case '%':
+	  in_rule = 1;
+	  vec_add1 (s, '<');	/* start of <RULE> */
+	  break;
+
+	case '_':
+	  /* _ -> space in rules. */
+	  vec_add1 (s, in_rule ? ' ' : '_');
+	  break;
+
+	case ' ':
+	  if (in_rule)
+	    {
+	      vec_add1 (s, '>');	/* end of <RULE> */
+	      in_rule = 0;
+	    }
+	  vec_add1 (s, ' ');
+	  break;
+
+	default:
+	  vec_add1 (s, path[i]);
+	  break;
+	}
+    }
+
+  if (in_rule)
+    vec_add1 (s, '>');		/* terminate <RULE> */
+
+  return s;
+}
+
+static vlib_cli_command_t *
+all_subs (vlib_cli_main_t * cm, vlib_cli_command_t * subs, u32 command_index)
+{
+  vlib_cli_command_t *c = vec_elt_at_index (cm->commands, command_index);
+  vlib_cli_sub_command_t *sc;
+  vlib_cli_sub_rule_t *sr;
+
+  if (c->function)
+    vec_add1 (subs, c[0]);
+
+  vec_foreach (sr, c->sub_rules)
+    subs = all_subs (cm, subs, sr->command_index);
+  vec_foreach (sc, c->sub_commands) subs = all_subs (cm, subs, sc->index);
+
+  return subs;
+}
+
+static int
+vlib_cli_cmp_rule (void *a1, void *a2)
+{
+  vlib_cli_sub_rule_t *r1 = a1;
+  vlib_cli_sub_rule_t *r2 = a2;
+
+  return vec_cmp (r1->name, r2->name);
+}
+
+static int
+vlib_cli_cmp_command (void *a1, void *a2)
+{
+  vlib_cli_command_t *c1 = a1;
+  vlib_cli_command_t *c2 = a2;
+
+  return vec_cmp (c1->path, c2->path);
+}
+
+static clib_error_t *
+vlib_cli_dispatch_sub_commands (vlib_main_t * vm,
+				vlib_cli_main_t * cm,
+				unformat_input_t * input,
+				uword parent_command_index)
+{
+  vlib_cli_command_t *parent, *c;
+  clib_error_t *error = 0;
+  unformat_input_t sub_input;
+  u8 *string;
+  uword is_main_dispatch = cm == &vm->cli_main;
+
+  parent = vec_elt_at_index (cm->commands, parent_command_index);
+  if (is_main_dispatch && unformat (input, "help"))
+    {
+      uword help_at_end_of_line, i;
+
+      help_at_end_of_line =
+	unformat_check_input (input) == UNFORMAT_END_OF_INPUT;
+      while (1)
+	{
+	  c = parent;
+	  if (unformat_user
+	      (input, unformat_vlib_cli_sub_command, vm, c, &parent))
+	    ;
+
+	  else if (!(unformat_check_input (input) == UNFORMAT_END_OF_INPUT))
+	    goto unknown;
+
+	  else
+	    break;
+	}
+
+      /* help SUB-COMMAND => long format help.
+         "help" at end of line: show all commands. */
+      if (!help_at_end_of_line)
+	vlib_cli_output (vm, "%U", format_vlib_cli_command_help, c,
+			 /* is_long */ 1);
+
+      else if (vec_len (c->sub_commands) + vec_len (c->sub_rules) == 0)
+	vlib_cli_output (vm, "%v: no sub-commands", c->path);
+
+      else
+	{
+	  vlib_cli_sub_command_t *sc;
+	  vlib_cli_sub_rule_t *sr, *subs;
+
+	  subs = vec_dup (c->sub_rules);
+
+	  /* Add in rules if any. */
+	  vec_foreach (sc, c->sub_commands)
+	  {
+	    vec_add2 (subs, sr, 1);
+	    sr->name = sc->name;
+	    sr->command_index = sc->index;
+	    sr->rule_index = ~0;
+	  }
+
+	  vec_sort_with_function (subs, vlib_cli_cmp_rule);
+
+	  for (i = 0; i < vec_len (subs); i++)
+	    {
+	      vlib_cli_command_t *d;
+	      vlib_cli_parse_rule_t *r;
+
+	      d = vec_elt_at_index (cm->commands, subs[i].command_index);
+	      r =
+		subs[i].rule_index != ~0 ? vec_elt_at_index (cm->parse_rules,
+							     subs
+							     [i].rule_index) :
+		0;
+
+	      if (r)
+		vlib_cli_output
+		  (vm, "  %-30U %U",
+		   format_vlib_cli_parse_rule_name, r,
+		   format_vlib_cli_command_help, d, /* is_long */ 0);
+	      else
+		vlib_cli_output
+		  (vm, "  %-30v %U",
+		   subs[i].name,
+		   format_vlib_cli_command_help, d, /* is_long */ 0);
+	    }
+
+	  vec_free (subs);
+	}
+    }
+
+  else if (is_main_dispatch
+	   && (unformat (input, "choices") || unformat (input, "?")))
+    {
+      vlib_cli_command_t *sub, *subs;
+
+      subs = all_subs (cm, 0, parent_command_index);
+      vec_sort_with_function (subs, vlib_cli_cmp_command);
+      vec_foreach (sub, subs)
+	vlib_cli_output (vm, "  %-40U %U",
+			 format_vlib_cli_path, sub->path,
+			 format_vlib_cli_command_help, sub, /* is_long */ 0);
+      vec_free (subs);
+    }
+
+  else if (unformat (input, "comment %v", &string))
+    {
+      vec_free (string);
+    }
+
+  else if (unformat (input, "uncomment %U",
+		     unformat_vlib_cli_sub_input, &sub_input))
+    {
+      error =
+	vlib_cli_dispatch_sub_commands (vm, cm, &sub_input,
+					parent_command_index);
+      unformat_free (&sub_input);
+    }
+
+  else
+    if (unformat_user (input, unformat_vlib_cli_sub_command, vm, parent, &c))
+    {
+      unformat_input_t *si;
+      uword has_sub_commands =
+	vec_len (c->sub_commands) + vec_len (c->sub_rules) > 0;
+
+      si = input;
+      if (unformat_user (input, unformat_vlib_cli_sub_input, &sub_input))
+	si = &sub_input;
+
+      if (has_sub_commands)
+	error = vlib_cli_dispatch_sub_commands (vm, cm, si, c - cm->commands);
+
+      if (has_sub_commands && !error)
+	/* Found valid sub-command. */ ;
+
+      else if (c->function)
+	{
+	  clib_error_t *c_error;
+
+	  /* Skip white space for benefit of called function. */
+	  unformat_skip_white_space (si);
+
+	  if (unformat (si, "?"))
+	    {
+	      vlib_cli_output (vm, "  %-40U %U", format_vlib_cli_path, c->path, format_vlib_cli_command_help, c,	/* is_long */
+			       0);
+	    }
+	  else
+	    {
+	      if (!c->is_mp_safe)
+		vlib_worker_thread_barrier_sync (vm);
+
+	      c_error = c->function (vm, si, c);
+
+	      if (!c->is_mp_safe)
+		vlib_worker_thread_barrier_release (vm);
+
+	      if (c_error)
+		{
+		  error =
+		    clib_error_return (0, "%v: %v", c->path, c_error->what);
+		  clib_error_free (c_error);
+		  /* Free sub input. */
+		  if (si != input)
+		    unformat_free (si);
+
+		  return error;
+		}
+	    }
+
+	  /* Free any previous error. */
+	  clib_error_free (error);
+	}
+
+      else if (!error)
+	error = clib_error_return (0, "%v: no sub-commands", c->path);
+
+      /* Free sub input. */
+      if (si != input)
+	unformat_free (si);
+    }
+
+  else
+    goto unknown;
+
+  return error;
+
+unknown:
+  if (parent->path)
+    return clib_error_return (0, "%v: unknown input `%U'", parent->path,
+			      format_unformat_error, input);
+  else
+    return clib_error_return (0, "unknown input `%U'", format_unformat_error,
+			      input);
+}
+
+
+void vlib_unix_error_report (vlib_main_t *, clib_error_t *)
+  __attribute__ ((weak));
+
+void
+vlib_unix_error_report (vlib_main_t * vm, clib_error_t * error)
+{
+}
+
+/* Process CLI input. */
+void
+vlib_cli_input (vlib_main_t * vm,
+		unformat_input_t * input,
+		vlib_cli_output_function_t * function, uword function_arg)
+{
+  vlib_process_t *cp = vlib_get_current_process (vm);
+  vlib_cli_main_t *cm = &vm->cli_main;
+  clib_error_t *error;
+  vlib_cli_output_function_t *save_function;
+  uword save_function_arg;
+
+  save_function = cp->output_function;
+  save_function_arg = cp->output_function_arg;
+
+  cp->output_function = function;
+  cp->output_function_arg = function_arg;
+
+  do
+    {
+      vec_reset_length (cm->parse_rule_data);
+      error = vlib_cli_dispatch_sub_commands (vm, &vm->cli_main, input,	/* parent */
+					      0);
+    }
+  while (!error && !unformat (input, "%U", unformat_eof));
+
+  if (error)
+    {
+      vlib_cli_output (vm, "%v", error->what);
+      vlib_unix_error_report (vm, error);
+      clib_error_free (error);
+    }
+
+  cp->output_function = save_function;
+  cp->output_function_arg = save_function_arg;
+}
+
+/* Output to current CLI connection. */
+void
+vlib_cli_output (vlib_main_t * vm, char *fmt, ...)
+{
+  vlib_process_t *cp = vlib_get_current_process (vm);
+  va_list va;
+  u8 *s;
+
+  va_start (va, fmt);
+  s = va_format (0, fmt, &va);
+  va_end (va);
+
+  /* Terminate with \n if not present. */
+  if (vec_len (s) > 0 && s[vec_len (s) - 1] != '\n')
+    vec_add1 (s, '\n');
+
+  if ((!cp) || (!cp->output_function))
+    fformat (stdout, "%v", s);
+  else
+    cp->output_function (cp->output_function_arg, s, vec_len (s));
+
+  vec_free (s);
+}
+
+static clib_error_t *
+show_memory_usage (vlib_main_t * vm,
+		   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  int verbose = 0;
+  clib_error_t *error;
+  u32 index = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "verbose"))
+	verbose = 1;
+      else
+	{
+	  error = clib_error_return (0, "unknown input `%U'",
+				     format_unformat_error, input);
+	  return error;
+	}
+    }
+
+  /* *INDENT-OFF* */
+  foreach_vlib_main (
+  ({
+      vlib_cli_output (vm, "Thread %d %v\n", index, vlib_worker_threads[index].name);
+      vlib_cli_output (vm, "%U\n", format_mheap, clib_per_cpu_mheaps[index], verbose);
+      index++;
+  }));
+  /* *INDENT-ON* */
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_memory_usage_command, static) = {
+  .path = "show memory",
+  .short_help = "Show current memory usage",
+  .function = show_memory_usage,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+show_cpu (vlib_main_t * vm, unformat_input_t * input,
+	  vlib_cli_command_t * cmd)
+{
+#define _(a,b,c) vlib_cli_output (vm, "%-25s " b, a ":", c);
+  _("Model name", "%U", format_cpu_model_name);
+  _("Microarchitecture", "%U", format_cpu_uarch);
+  _("Flags", "%U", format_cpu_flags);
+  _("Base frequency", "%.2f GHz",
+    ((f64) vm->clib_time.clocks_per_second) * 1e-9);
+#undef _
+  return 0;
+}
+
+/*?
+ * Displays various information about the CPU.
+ *
+ * @cliexpar
+ * @cliexstart{show cpu}
+ * Model name:               Intel(R) Xeon(R) CPU E5-2667 v4 @ 3.20GHz
+ * Microarchitecture:        Broadwell (Broadwell-EP/EX)
+ * Flags:                    sse3 ssse3 sse41 sse42 avx avx2 aes
+ * Base Frequency:           3.20 GHz
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_cpu_command, static) = {
+  .path = "show cpu",
+  .short_help = "Show cpu information",
+  .function = show_cpu,
+};
+
+/* *INDENT-ON* */
+static clib_error_t *
+enable_disable_memory_trace (vlib_main_t * vm,
+			     unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  clib_error_t *error = 0;
+  int enable;
+
+  if (!unformat_user (input, unformat_vlib_enable_disable, &enable))
+    {
+      error = clib_error_return (0, "expecting enable/on or disable/off");
+      goto done;
+    }
+
+  clib_mem_trace (enable);
+
+done:
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (enable_disable_memory_trace_command, static) = {
+  .path = "memory-trace",
+  .short_help = "Enable/disable memory allocation trace",
+  .function = enable_disable_memory_trace,
+};
+/* *INDENT-ON* */
+
+
+static clib_error_t *
+test_heap_validate (vlib_main_t * vm, unformat_input_t * input,
+		    vlib_cli_command_t * cmd)
+{
+  clib_error_t *error = 0;
+  void *heap;
+  mheap_t *mheap;
+
+  if (unformat (input, "on"))
+    {
+        /* *INDENT-OFF* */
+        foreach_vlib_main({
+          heap = clib_per_cpu_mheaps[this_vlib_main->cpu_index];
+          mheap = mheap_header(heap);
+          mheap->flags |= MHEAP_FLAG_VALIDATE;
+          // Turn off small object cache because it delays detection of errors
+          mheap->flags &= ~MHEAP_FLAG_SMALL_OBJECT_CACHE;
+        });
+        /* *INDENT-ON* */
+
+    }
+  else if (unformat (input, "off"))
+    {
+        /* *INDENT-OFF* */
+        foreach_vlib_main({
+          heap = clib_per_cpu_mheaps[this_vlib_main->cpu_index];
+          mheap = mheap_header(heap);
+          mheap->flags &= ~MHEAP_FLAG_VALIDATE;
+          mheap->flags |= MHEAP_FLAG_SMALL_OBJECT_CACHE;
+        });
+        /* *INDENT-ON* */
+    }
+  else if (unformat (input, "now"))
+    {
+        /* *INDENT-OFF* */
+        foreach_vlib_main({
+          heap = clib_per_cpu_mheaps[this_vlib_main->cpu_index];
+          mheap = mheap_header(heap);
+          mheap_validate(heap);
+        });
+        /* *INDENT-ON* */
+      vlib_cli_output (vm, "heap validation complete");
+
+    }
+  else
+    {
+      return clib_error_return (0, "unknown input `%U'",
+				format_unformat_error, input);
+    }
+
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_test_heap_validate,static) = {
+    .path = "test heap-validate",
+    .short_help = "<on/off/now> validate heap on future allocs/frees or right now",
+    .function = test_heap_validate,
+};
+/* *INDENT-ON* */
+
+#ifdef TEST_CODE
+/*
+ * A trivial test harness to verify the per-process output_function
+ * is working correcty.
+ */
+
+static clib_error_t *
+sleep_ten_seconds (vlib_main_t * vm,
+		   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  u16 i;
+  u16 my_id = rand ();
+
+  vlib_cli_output (vm, "Starting 10 seconds sleep with id %u\n", my_id);
+
+  for (i = 0; i < 10; i++)
+    {
+      vlib_process_wait_for_event_or_clock (vm, 1.0);
+      vlib_cli_output (vm, "Iteration number %u, my id: %u\n", i, my_id);
+    }
+  vlib_cli_output (vm, "Done with sleep with id %u\n", my_id);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ping_command, static) = {
+  .path = "test sleep",
+  .function = sleep_ten_seconds,
+  .short_help = "Sleep for 10 seconds",
+};
+/* *INDENT-ON* */
+#endif /* ifdef TEST_CODE */
+
+static uword
+vlib_cli_normalize_path (char *input, char **result)
+{
+  char *i = input;
+  char *s = 0;
+  uword l = 0;
+  uword index_of_last_space = ~0;
+
+  while (*i != 0)
+    {
+      u8 c = *i++;
+      /* Multiple white space -> single space. */
+      switch (c)
+	{
+	case ' ':
+	case '\t':
+	case '\n':
+	case '\r':
+	  if (l > 0 && s[l - 1] != ' ')
+	    {
+	      vec_add1 (s, ' ');
+	      l++;
+	    }
+	  break;
+
+	default:
+	  if (l > 0 && s[l - 1] == ' ')
+	    index_of_last_space = vec_len (s);
+	  vec_add1 (s, c);
+	  l++;
+	  break;
+	}
+    }
+
+  /* Remove any extra space at end. */
+  if (l > 0 && s[l - 1] == ' ')
+    _vec_len (s) -= 1;
+
+  *result = s;
+  return index_of_last_space;
+}
+
+always_inline uword
+parent_path_len (char *path)
+{
+  word i;
+  for (i = vec_len (path) - 1; i >= 0; i--)
+    {
+      if (path[i] == ' ')
+	return i;
+    }
+  return ~0;
+}
+
+static void
+add_sub_command (vlib_cli_main_t * cm, uword parent_index, uword child_index)
+{
+  vlib_cli_command_t *p, *c;
+  vlib_cli_sub_command_t *sub_c;
+  u8 *sub_name;
+  word i, l;
+
+  p = vec_elt_at_index (cm->commands, parent_index);
+  c = vec_elt_at_index (cm->commands, child_index);
+
+  l = parent_path_len (c->path);
+  if (l == ~0)
+    sub_name = vec_dup ((u8 *) c->path);
+  else
+    {
+      ASSERT (l + 1 < vec_len (c->path));
+      sub_name = 0;
+      vec_add (sub_name, c->path + l + 1, vec_len (c->path) - (l + 1));
+    }
+
+  if (sub_name[0] == '%')
+    {
+      uword *q;
+      vlib_cli_sub_rule_t *sr;
+
+      /* Remove %. */
+      vec_delete (sub_name, 1, 0);
+
+      if (!p->sub_rule_index_by_name)
+	p->sub_rule_index_by_name = hash_create_vec ( /* initial length */ 32,
+						     sizeof (sub_name[0]),
+						     sizeof (uword));
+      q = hash_get_mem (p->sub_rule_index_by_name, sub_name);
+      if (q)
+	{
+	  sr = vec_elt_at_index (p->sub_rules, q[0]);
+	  ASSERT (sr->command_index == child_index);
+	  return;
+	}
+
+      q = hash_get_mem (cm->parse_rule_index_by_name, sub_name);
+      if (!q)
+	{
+	  clib_error ("reference to unknown rule `%%%v' in path `%v'",
+		      sub_name, c->path);
+	  return;
+	}
+
+      hash_set_mem (p->sub_rule_index_by_name, sub_name,
+		    vec_len (p->sub_rules));
+      vec_add2 (p->sub_rules, sr, 1);
+      sr->name = sub_name;
+      sr->rule_index = q[0];
+      sr->command_index = child_index;
+      return;
+    }
+
+  if (!p->sub_command_index_by_name)
+    p->sub_command_index_by_name = hash_create_vec ( /* initial length */ 32,
+						    sizeof (c->path[0]),
+						    sizeof (uword));
+
+  /* Check if sub-command has already been created. */
+  if (hash_get_mem (p->sub_command_index_by_name, sub_name))
+    {
+      vec_free (sub_name);
+      return;
+    }
+
+  vec_add2 (p->sub_commands, sub_c, 1);
+  sub_c->index = child_index;
+  sub_c->name = sub_name;
+  hash_set_mem (p->sub_command_index_by_name, sub_c->name,
+		sub_c - p->sub_commands);
+
+  vec_validate (p->sub_command_positions, vec_len (sub_c->name) - 1);
+  for (i = 0; i < vec_len (sub_c->name); i++)
+    {
+      int n;
+      vlib_cli_parse_position_t *pos;
+
+      pos = vec_elt_at_index (p->sub_command_positions, i);
+
+      if (!pos->bitmaps)
+	pos->min_char = sub_c->name[i];
+
+      n = sub_c->name[i] - pos->min_char;
+      if (n < 0)
+	{
+	  pos->min_char = sub_c->name[i];
+	  vec_insert (pos->bitmaps, -n, 0);
+	  n = 0;
+	}
+
+      vec_validate (pos->bitmaps, n);
+      pos->bitmaps[n] =
+	clib_bitmap_ori (pos->bitmaps[n], sub_c - p->sub_commands);
+    }
+}
+
+static void
+vlib_cli_make_parent (vlib_cli_main_t * cm, uword ci)
+{
+  uword p_len, pi, *p;
+  char *p_path;
+  vlib_cli_command_t *c, *parent;
+
+  /* Root command (index 0) should have already been added. */
+  ASSERT (vec_len (cm->commands) > 0);
+
+  c = vec_elt_at_index (cm->commands, ci);
+  p_len = parent_path_len (c->path);
+
+  /* No space?  Parent is root command. */
+  if (p_len == ~0)
+    {
+      add_sub_command (cm, 0, ci);
+      return;
+    }
+
+  p_path = 0;
+  vec_add (p_path, c->path, p_len);
+
+  p = hash_get_mem (cm->command_index_by_path, p_path);
+
+  /* Parent exists? */
+  if (!p)
+    {
+      /* Parent does not exist; create it. */
+      vec_add2 (cm->commands, parent, 1);
+      parent->path = p_path;
+      hash_set_mem (cm->command_index_by_path, parent->path,
+		    parent - cm->commands);
+      pi = parent - cm->commands;
+    }
+  else
+    {
+      pi = p[0];
+      vec_free (p_path);
+    }
+
+  add_sub_command (cm, pi, ci);
+
+  /* Create parent's parent. */
+  if (!p)
+    vlib_cli_make_parent (cm, pi);
+}
+
+always_inline uword
+vlib_cli_command_is_empty (vlib_cli_command_t * c)
+{
+  return (c->long_help == 0 && c->short_help == 0 && c->function == 0);
+}
+
+clib_error_t *
+vlib_cli_register (vlib_main_t * vm, vlib_cli_command_t * c)
+{
+  vlib_cli_main_t *cm = &vm->cli_main;
+  clib_error_t *error = 0;
+  uword ci, *p;
+  char *normalized_path;
+
+  if ((error = vlib_call_init_function (vm, vlib_cli_init)))
+    return error;
+
+  (void) vlib_cli_normalize_path (c->path, &normalized_path);
+
+  if (!cm->command_index_by_path)
+    cm->command_index_by_path = hash_create_vec ( /* initial length */ 32,
+						 sizeof (c->path[0]),
+						 sizeof (uword));
+
+  /* See if command already exists with given path. */
+  p = hash_get_mem (cm->command_index_by_path, normalized_path);
+  if (p)
+    {
+      vlib_cli_command_t *d;
+
+      ci = p[0];
+      d = vec_elt_at_index (cm->commands, ci);
+
+      /* If existing command was created via vlib_cli_make_parent
+         replaced it with callers data. */
+      if (vlib_cli_command_is_empty (d))
+	{
+	  vlib_cli_command_t save = d[0];
+
+	  ASSERT (!vlib_cli_command_is_empty (c));
+
+	  /* Copy callers fields. */
+	  d[0] = c[0];
+
+	  /* Save internal fields. */
+	  d->path = save.path;
+	  d->sub_commands = save.sub_commands;
+	  d->sub_command_index_by_name = save.sub_command_index_by_name;
+	  d->sub_command_positions = save.sub_command_positions;
+	  d->sub_rules = save.sub_rules;
+	}
+      else
+	error =
+	  clib_error_return (0, "duplicate command name with path %v",
+			     normalized_path);
+
+      vec_free (normalized_path);
+      if (error)
+	return error;
+    }
+  else
+    {
+      /* Command does not exist: create it. */
+
+      /* Add root command (index 0). */
+      if (vec_len (cm->commands) == 0)
+	{
+	  /* Create command with index 0; path is empty string. */
+	  vec_resize (cm->commands, 1);
+	}
+
+      ci = vec_len (cm->commands);
+      hash_set_mem (cm->command_index_by_path, normalized_path, ci);
+      vec_add1 (cm->commands, c[0]);
+
+      c = vec_elt_at_index (cm->commands, ci);
+      c->path = normalized_path;
+
+      /* Don't inherit from registration. */
+      c->sub_commands = 0;
+      c->sub_command_index_by_name = 0;
+      c->sub_command_positions = 0;
+    }
+
+  vlib_cli_make_parent (cm, ci);
+  return 0;
+}
+
+clib_error_t *
+vlib_cli_register_parse_rule (vlib_main_t * vm, vlib_cli_parse_rule_t * r_reg)
+{
+  vlib_cli_main_t *cm = &vm->cli_main;
+  vlib_cli_parse_rule_t *r;
+  clib_error_t *error = 0;
+  u8 *r_name;
+  uword *p;
+
+  if (!cm->parse_rule_index_by_name)
+    cm->parse_rule_index_by_name = hash_create_vec ( /* initial length */ 32,
+						    sizeof (r->name[0]),
+						    sizeof (uword));
+
+  /* Make vector copy of name. */
+  r_name = format (0, "%s", r_reg->name);
+
+  if ((p = hash_get_mem (cm->parse_rule_index_by_name, r_name)))
+    {
+      vec_free (r_name);
+      return clib_error_return (0, "duplicate parse rule name `%s'",
+				r_reg->name);
+    }
+
+  vec_add2 (cm->parse_rules, r, 1);
+  r[0] = r_reg[0];
+  r->name = (char *) r_name;
+  hash_set_mem (cm->parse_rule_index_by_name, r->name, r - cm->parse_rules);
+
+  return error;
+}
+
+#if 0
+/* $$$ turn back on again someday, maybe */
+static clib_error_t *vlib_cli_register_parse_rules (vlib_main_t * vm,
+						    vlib_cli_parse_rule_t *
+						    lo,
+						    vlib_cli_parse_rule_t *
+						    hi)
+  __attribute__ ((unused))
+{
+  clib_error_t *error = 0;
+  vlib_cli_parse_rule_t *r;
+
+  for (r = lo; r < hi; r = clib_elf_section_data_next (r, 0))
+    {
+      if (!r->name || strlen (r->name) == 0)
+	{
+	  error = clib_error_return (0, "parse rule with no name");
+	  goto done;
+	}
+
+      error = vlib_cli_register_parse_rule (vm, r);
+      if (error)
+	goto done;
+    }
+
+done:
+  return error;
+}
+#endif
+
+static clib_error_t *
+vlib_cli_init (vlib_main_t * vm)
+{
+  vlib_cli_main_t *cm = &vm->cli_main;
+  clib_error_t *error = 0;
+  vlib_cli_command_t *cmd;
+
+  cmd = cm->cli_command_registrations;
+
+  while (cmd)
+    {
+      error = vlib_cli_register (vm, cmd);
+      if (error)
+	return error;
+      cmd = cmd->next_cli_command;
+    }
+  return error;
+}
+
+VLIB_INIT_FUNCTION (vlib_cli_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/cli.h b/src/vlib/cli.h
new file mode 100644
index 00000000..009c7e82
--- /dev/null
+++ b/src/vlib/cli.h
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * cli.h: command line interface
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_cli_h
+#define included_vlib_cli_h
+
+#include <vppinfra/format.h>
+
+struct vlib_cli_command_t;
+
+typedef struct
+{
+  u32 min_char;
+
+  /* Indexed by name[position] - min_char. */
+  uword **bitmaps;
+} vlib_cli_parse_position_t;
+
+typedef struct
+{
+  u8 *name;
+
+  u32 index;
+} vlib_cli_sub_command_t;
+
+typedef struct
+{
+  u8 *name;
+
+  u32 rule_index;
+
+  u32 command_index;
+} vlib_cli_sub_rule_t;
+
+typedef struct
+{
+  char *name;
+  char *short_help;
+  char *long_help;
+
+  /* Number of bytes in parsed data.  Zero for vector. */
+  uword data_size;
+
+  unformat_function_t *unformat_function;
+
+  /* Opaque for unformat function. */
+  uword unformat_function_arg[2];
+} vlib_cli_parse_rule_t;
+
+/* CLI command callback function. */
+typedef clib_error_t *(vlib_cli_command_function_t)
+  (struct vlib_main_t * vm,
+   unformat_input_t * input, struct vlib_cli_command_t * cmd);
+
+typedef struct vlib_cli_command_t
+{
+  /* Command path (e.g. "show something").
+     Spaces delimit elements of path. */
+  char *path;
+
+  /* Short/long help strings. */
+  char *short_help;
+  char *long_help;
+
+  /* Callback function. */
+  vlib_cli_command_function_t *function;
+
+  /* Opaque. */
+  uword function_arg;
+
+  /* Known MP-safe? */
+  uword is_mp_safe;
+
+  /* Sub commands for this command. */
+  vlib_cli_sub_command_t *sub_commands;
+
+  /* Hash table mapping name (e.g. last path element) to sub command index. */
+  uword *sub_command_index_by_name;
+
+  /* bitmap[p][c][i] says whether sub-command i has character
+     c in position p. */
+  vlib_cli_parse_position_t *sub_command_positions;
+
+  /* Hash table mapping name (e.g. last path element) to sub rule index. */
+  uword *sub_rule_index_by_name;
+
+  /* Vector of possible parse rules for this path. */
+  vlib_cli_sub_rule_t *sub_rules;
+
+  /* List of CLI commands, built by constructors */
+  struct vlib_cli_command_t *next_cli_command;
+
+} vlib_cli_command_t;
+
+typedef void (vlib_cli_output_function_t) (uword arg,
+					   u8 * buffer, uword buffer_bytes);
+typedef struct
+{
+  /* Vector of all known commands. */
+  vlib_cli_command_t *commands;
+
+  /* Hash table mapping normalized path to index into all_commands. */
+  uword *command_index_by_path;
+
+  /* Vector of all known parse rules. */
+  vlib_cli_parse_rule_t *parse_rules;
+
+  /* Hash table mapping parse rule name to index into parse_rule vector. */
+  uword *parse_rule_index_by_name;
+
+  /* Data parsed for rules. */
+  void **parse_rule_data;
+
+  /* registration list added by constructors */
+  vlib_cli_command_t *cli_command_registrations;
+} vlib_cli_main_t;
+
+#define VLIB_CLI_COMMAND(x,...)                                         \
+    __VA_ARGS__ vlib_cli_command_t x;                                   \
+static void __vlib_cli_command_registration_##x (void)                  \
+    __attribute__((__constructor__)) ;                                  \
+static void __vlib_cli_command_registration_##x (void)                  \
+{                                                                       \
+    vlib_main_t * vm = vlib_get_main();                                 \
+    vlib_cli_main_t *cm = &vm->cli_main;                                \
+    x.next_cli_command = cm->cli_command_registrations;                 \
+    cm->cli_command_registrations = &x;                                 \
+}                                                                       \
+__VA_ARGS__ vlib_cli_command_t x
+#define VLIB_CLI_PARSE_RULE(x) \
+  vlib_cli_parse_rule_t x
+/* Output to current CLI connection. */
+void vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...);
+
+/* Process CLI input. */
+void vlib_cli_input (struct vlib_main_t *vm,
+		     unformat_input_t * input,
+		     vlib_cli_output_function_t * function,
+		     uword function_arg);
+
+clib_error_t *vlib_cli_register (struct vlib_main_t *vm,
+				 vlib_cli_command_t * c);
+clib_error_t *vlib_cli_register_parse_rule (struct vlib_main_t *vm,
+					    vlib_cli_parse_rule_t * c);
+
+uword unformat_vlib_cli_sub_input (unformat_input_t * i, va_list * args);
+
+#endif /* included_vlib_cli_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/cli_funcs.h b/src/vlib/cli_funcs.h
new file mode 100644
index 00000000..78aef73b
--- /dev/null
+++ b/src/vlib/cli_funcs.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * cli_funcs.h: VLIB CLI related functions/inlines
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_cli_funcs_h
+#define included_vlib_cli_funcs_h
+
+always_inline void *
+vlib_cli_get_parse_rule_result (vlib_main_t * vm, uword index)
+{
+  vlib_cli_main_t *cm = &vm->cli_main;
+  return vec_elt (cm->parse_rule_data, index);
+}
+
+#endif /* included_vlib_cli_funcs_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/counter.c b/src/vlib/counter.c
new file mode 100644
index 00000000..9f66e04d
--- /dev/null
+++ b/src/vlib/counter.c
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * counter.c: simple and packet/byte counters
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+
+void
+vlib_clear_simple_counters (vlib_simple_counter_main_t * cm)
+{
+  uword i, j;
+  u16 *my_minis;
+
+  for (i = 0; i < vec_len (cm->minis); i++)
+    {
+      my_minis = cm->minis[i];
+
+      for (j = 0; j < vec_len (my_minis); j++)
+	{
+	  cm->maxi[j] += my_minis[j];
+	  my_minis[j] = 0;
+	}
+    }
+
+  j = vec_len (cm->maxi);
+  if (j > 0)
+    vec_validate (cm->value_at_last_clear, j - 1);
+  for (i = 0; i < j; i++)
+    cm->value_at_last_clear[i] = cm->maxi[i];
+}
+
+void
+vlib_clear_combined_counters (vlib_combined_counter_main_t * cm)
+{
+  uword i, j;
+  vlib_mini_counter_t *my_minis;
+
+  for (i = 0; i < vec_len (cm->minis); i++)
+    {
+      my_minis = cm->minis[i];
+
+      for (j = 0; j < vec_len (my_minis); j++)
+	{
+	  cm->maxi[j].packets += my_minis[j].packets;
+	  cm->maxi[j].bytes += my_minis[j].bytes;
+	  my_minis[j].packets = 0;
+	  my_minis[j].bytes = 0;
+	}
+    }
+
+  j = vec_len (cm->maxi);
+  if (j > 0)
+    vec_validate (cm->value_at_last_clear, j - 1);
+
+  for (i = 0; i < j; i++)
+    {
+      vlib_counter_t *c = vec_elt_at_index (cm->value_at_last_clear, i);
+
+      c[0] = cm->maxi[i];
+    }
+}
+
+void
+vlib_validate_simple_counter (vlib_simple_counter_main_t * cm, u32 index)
+{
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  int i;
+
+  vec_validate (cm->minis, tm->n_vlib_mains - 1);
+  for (i = 0; i < tm->n_vlib_mains; i++)
+    vec_validate_aligned (cm->minis[i], index, CLIB_CACHE_LINE_BYTES);
+  vec_validate_aligned (cm->maxi, index, CLIB_CACHE_LINE_BYTES);
+}
+
+void
+vlib_validate_combined_counter (vlib_combined_counter_main_t * cm, u32 index)
+{
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  int i;
+
+  vec_validate (cm->minis, tm->n_vlib_mains - 1);
+  for (i = 0; i < tm->n_vlib_mains; i++)
+    vec_validate_aligned (cm->minis[i], index, CLIB_CACHE_LINE_BYTES);
+  vec_validate_aligned (cm->maxi, index, CLIB_CACHE_LINE_BYTES);
+}
+
+void
+serialize_vlib_simple_counter_main (serialize_main_t * m, va_list * va)
+{
+  clib_warning ("unimplemented");
+}
+
+void
+unserialize_vlib_simple_counter_main (serialize_main_t * m, va_list * va)
+{
+  clib_warning ("unimplemented");
+}
+
+void
+serialize_vlib_combined_counter_main (serialize_main_t * m, va_list * va)
+{
+  clib_warning ("unimplemented");
+}
+
+void
+unserialize_vlib_combined_counter_main (serialize_main_t * m, va_list * va)
+{
+  clib_warning ("unimplemented");
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/counter.h b/src/vlib/counter.h
new file mode 100644
index 00000000..a7903206
--- /dev/null
+++ b/src/vlib/counter.h
@@ -0,0 +1,379 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * counter.h: simple and packet/byte counters
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_counter_h
+#define included_vlib_counter_h
+
+/** \file
+
+    Optimized thread-safe counters.
+
+    Each vlib_[simple|combined]_counter_main_t consists of a single
+    vector of thread-safe / atomically-updated u64 counters [the
+    "maxi" vector], and a (u16 **) per-thread vector [the "minis"
+    vector] of narrow, per-thread counters.
+
+    The idea is to drastically reduce the number of atomic operations.
+    In the case of packet counts, we divide the number of atomic ops
+    by 2**16, etc.
+*/
+
+/** A collection of simple counters */
+
+typedef struct
+{
+  u16 **minis;	 /**< Per-thread u16 non-atomic counters */
+  u64 *maxi;	 /**< Shared wide counters */
+  u64 *value_at_last_clear; /**< Counter values as of last clear. */
+  u64 *value_at_last_serialize;	/**< Values as of last serialize. */
+  u32 last_incremental_serialize_index;	/**< Last counter index
+                                           serialized incrementally. */
+
+  char *name;			/**< The counter collection's name. */
+} vlib_simple_counter_main_t;
+
+/** Increment a simple counter
+    @param cm - (vlib_simple_counter_main_t *) simple counter main pointer
+    @param cpu_index - (u32) the current cpu index
+    @param index - (u32) index of the counter to increment
+    @param increment - (u32) quantitiy to add to the counter
+*/
+always_inline void
+vlib_increment_simple_counter (vlib_simple_counter_main_t * cm,
+			       u32 cpu_index, u32 index, u32 increment)
+{
+  u16 *my_minis;
+  u16 *mini;
+  u32 old, new;
+
+  my_minis = cm->minis[cpu_index];
+  mini = vec_elt_at_index (my_minis, index);
+  old = mini[0];
+  new = old + increment;
+  mini[0] = new;
+
+  if (PREDICT_FALSE (mini[0] != new))
+    {
+      __sync_fetch_and_add (&cm->maxi[index], new);
+      my_minis[index] = 0;
+    }
+}
+
+/** Get the value of a simple counter
+    Scrapes the entire set of mini counters. Innacurate unless
+    worker threads which might increment the counter are
+    barrier-synchronized
+
+    @param cm - (vlib_simple_counter_main_t *) simple counter main pointer
+    @param index - (u32) index of the counter to fetch
+    @returns - (u64) current counter value
+*/
+always_inline u64
+vlib_get_simple_counter (vlib_simple_counter_main_t * cm, u32 index)
+{
+  u16 *my_minis, *mini;
+  u64 v;
+  int i;
+
+  ASSERT (index < vec_len (cm->maxi));
+
+  v = 0;
+
+  for (i = 0; i < vec_len (cm->minis); i++)
+    {
+      my_minis = cm->minis[i];
+      mini = vec_elt_at_index (my_minis, index);
+      v += mini[0];
+    }
+
+  v += cm->maxi[index];
+
+  if (index < vec_len (cm->value_at_last_clear))
+    {
+      ASSERT (v >= cm->value_at_last_clear[index]);
+      v -= cm->value_at_last_clear[index];
+    }
+
+  return v;
+}
+
+/** Clear a simple counter
+    Clears the set of per-thread u16 counters, and the u64 counter
+
+    @param cm - (vlib_simple_counter_main_t *) simple counter main pointer
+    @param index - (u32) index of the counter to clear
+*/
+always_inline void
+vlib_zero_simple_counter (vlib_simple_counter_main_t * cm, u32 index)
+{
+  u16 *my_minis;
+  int i;
+
+  ASSERT (index < vec_len (cm->maxi));
+
+  for (i = 0; i < vec_len (cm->minis); i++)
+    {
+      my_minis = cm->minis[i];
+      my_minis[index] = 0;
+    }
+
+  cm->maxi[index] = 0;
+
+  if (index < vec_len (cm->value_at_last_clear))
+    cm->value_at_last_clear[index] = 0;
+}
+
+/** Combined counter to hold both packets and byte differences.
+ */
+typedef struct
+{
+  u64 packets;			/**< packet counter */
+  u64 bytes;			/**< byte counter  */
+} vlib_counter_t;
+
+/** Add two combined counters, results in the first counter
+    @param [in,out] a - (vlib_counter_t *) dst counter
+    @param b - (vlib_counter_t *) src counter
+*/
+
+always_inline void
+vlib_counter_add (vlib_counter_t * a, vlib_counter_t * b)
+{
+  a->packets += b->packets;
+  a->bytes += b->bytes;
+}
+
+/** Subtract combined counters, results in the first counter
+    @param [in,out] a - (vlib_counter_t *) dst counter
+    @param b - (vlib_counter_t *) src counter
+*/
+always_inline void
+vlib_counter_sub (vlib_counter_t * a, vlib_counter_t * b)
+{
+  ASSERT (a->packets >= b->packets);
+  ASSERT (a->bytes >= b->bytes);
+  a->packets -= b->packets;
+  a->bytes -= b->bytes;
+}
+
+/** Clear a combined counter
+    @param a - (vlib_counter_t *) counter to clear
+*/
+always_inline void
+vlib_counter_zero (vlib_counter_t * a)
+{
+  a->packets = a->bytes = 0;
+}
+
+/** Mini combined counter */
+typedef struct
+{
+  u16 packets;			/**< Packet count */
+  i16 bytes;			/**< Byte count */
+} vlib_mini_counter_t;
+
+/** A collection of combined counters */
+typedef struct
+{
+  vlib_mini_counter_t **minis;	/**< Per-thread u16 non-atomic counter pairs */
+  vlib_counter_t *maxi;		/**< Shared wide counter pairs */
+  vlib_counter_t *value_at_last_clear;	/**< Counter values as of last clear. */
+  vlib_counter_t *value_at_last_serialize; /**< Counter values as of last serialize. */
+  u32 last_incremental_serialize_index;	/**< Last counter index serialized incrementally. */
+  char *name; /**< The counter collection's name. */
+} vlib_combined_counter_main_t;
+
+/** Clear a collection of simple counters
+    @param cm - (vlib_simple_counter_main_t *) collection to clear
+*/
+void vlib_clear_simple_counters (vlib_simple_counter_main_t * cm);
+
+/** Clear a collection of combined counters
+    @param cm - (vlib_combined_counter_main_t *) collection to clear
+*/
+void vlib_clear_combined_counters (vlib_combined_counter_main_t * cm);
+
+/** Increment a combined counter
+    @param cm - (vlib_combined_counter_main_t *) comined counter main pointer
+    @param cpu_index - (u32) the current cpu index
+    @param index - (u32) index of the counter to increment
+    @param packet_increment - (u32) number of packets to add to the counter
+    @param byte_increment - (u32) number of bytes to add to the counter
+*/
+
+always_inline void
+vlib_increment_combined_counter (vlib_combined_counter_main_t * cm,
+				 u32 cpu_index,
+				 u32 index,
+				 u32 packet_increment, u32 byte_increment)
+{
+  vlib_mini_counter_t *my_minis, *mini;
+  u32 old_packets, new_packets;
+  i32 old_bytes, new_bytes;
+
+  /* Use this CPU's mini counter array */
+  my_minis = cm->minis[cpu_index];
+
+  mini = vec_elt_at_index (my_minis, index);
+  old_packets = mini->packets;
+  old_bytes = mini->bytes;
+
+  new_packets = old_packets + packet_increment;
+  new_bytes = old_bytes + byte_increment;
+
+  mini->packets = new_packets;
+  mini->bytes = new_bytes;
+
+  /* Bytes always overflow before packets.. */
+  if (PREDICT_FALSE (mini->bytes != new_bytes))
+    {
+      vlib_counter_t *maxi = vec_elt_at_index (cm->maxi, index);
+
+      __sync_fetch_and_add (&maxi->packets, new_packets);
+      __sync_fetch_and_add (&maxi->bytes, new_bytes);
+
+      mini->packets = 0;
+      mini->bytes = 0;
+    }
+}
+
+/** Get the value of a combined counter, never called in the speed path
+    Scrapes the entire set of mini counters. Innacurate unless
+    worker threads which might increment the counter are
+    barrier-synchronized
+
+    @param cm - (vlib_combined_counter_main_t *) combined counter main pointer
+    @param index - (u32) index of the combined counter to fetch
+    @param result [out] - (vlib_counter_t *) result stored here
+*/
+
+static inline void
+vlib_get_combined_counter (vlib_combined_counter_main_t * cm,
+			   u32 index, vlib_counter_t * result)
+{
+  vlib_mini_counter_t *my_minis, *mini;
+  vlib_counter_t *maxi;
+  int i;
+
+  result->packets = 0;
+  result->bytes = 0;
+
+  for (i = 0; i < vec_len (cm->minis); i++)
+    {
+      my_minis = cm->minis[i];
+
+      mini = vec_elt_at_index (my_minis, index);
+      result->packets += mini->packets;
+      result->bytes += mini->bytes;
+    }
+
+  maxi = vec_elt_at_index (cm->maxi, index);
+  result->packets += maxi->packets;
+  result->bytes += maxi->bytes;
+
+  if (index < vec_len (cm->value_at_last_clear))
+    vlib_counter_sub (result, &cm->value_at_last_clear[index]);
+}
+
+/** Clear a combined counter
+    Clears the set of per-thread u16 counters, and the shared vlib_counter_t
+
+    @param cm - (vlib_combined_counter_main_t *) combined counter main pointer
+    @param index - (u32) index of the counter to clear
+*/
+always_inline void
+vlib_zero_combined_counter (vlib_combined_counter_main_t * cm, u32 index)
+{
+  vlib_mini_counter_t *mini, *my_minis;
+  int i;
+
+  for (i = 0; i < vec_len (cm->minis); i++)
+    {
+      my_minis = cm->minis[i];
+
+      mini = vec_elt_at_index (my_minis, index);
+      mini->packets = 0;
+      mini->bytes = 0;
+    }
+
+  vlib_counter_zero (&cm->maxi[index]);
+  if (index < vec_len (cm->value_at_last_clear))
+    vlib_counter_zero (&cm->value_at_last_clear[index]);
+}
+
+/** validate a simple counter
+    @param cm - (vlib_simple_counter_main_t *) pointer to the counter collection
+    @param index - (u32) index of the counter to validate
+*/
+
+void vlib_validate_simple_counter (vlib_simple_counter_main_t * cm,
+				   u32 index);
+/** validate a combined counter
+    @param cm - (vlib_combined_counter_main_t *) pointer to the counter
+    collection
+    @param index - (u32) index of the counter to validate
+*/
+
+void vlib_validate_combined_counter (vlib_combined_counter_main_t * cm,
+				     u32 index);
+
+/** Obtain the number of simple or combined counters allocated.
+    A macro which reduces to to vec_len(cm->maxi), the answer in either
+    case.
+
+    @param cm - (vlib_simple_counter_main_t) or
+    (vlib_combined_counter_main_t) the counter collection to interrogate
+    @returns vec_len(cm->maxi)
+*/
+#define vlib_counter_len(cm) vec_len((cm)->maxi)
+
+serialize_function_t serialize_vlib_simple_counter_main,
+  unserialize_vlib_simple_counter_main;
+serialize_function_t serialize_vlib_combined_counter_main,
+  unserialize_vlib_combined_counter_main;
+
+#endif /* included_vlib_counter_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/defs.h b/src/vlib/defs.h
new file mode 100644
index 00000000..ad58bc04
--- /dev/null
+++ b/src/vlib/defs.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * defs.h: VLIB generic C definitions
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_defs_h
+#define included_vlib_defs_h
+
+/* Receive or transmit. */
+typedef enum
+{
+  VLIB_RX,
+  VLIB_TX,
+  VLIB_N_RX_TX = 2,		/* Used to size arrays. */
+} vlib_rx_or_tx_t;
+
+#define vlib_foreach_rx_tx(v) for (v = 0; v < VLIB_N_RX_TX; v++)
+
+/* Read/write. */
+typedef enum
+{
+  VLIB_READ,
+  VLIB_WRITE,
+} vlib_read_or_write_t;
+
+/* Up/down. */
+typedef enum
+{
+  VLIB_DOWN = 0,
+  VLIB_UP = 1,
+} vlib_up_or_down_t;
+
+/* Enable/disable. */
+typedef enum
+{
+  VLIB_DISABLE = 0,
+  VLIB_ENABLE = 1,
+} vlib_enable_or_disable_t;
+
+#endif /* included_vlib_defs_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/dir.dox b/src/vlib/dir.dox
new file mode 100644
index 00000000..4806e7a9
--- /dev/null
+++ b/src/vlib/dir.dox
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Doxygen directory documentation */
+/**
+@dir
+@brief VLIB application library source.
+*/
+/*? %%clicmd:group_label VLIB application library%% ?*/
+
diff --git a/src/vlib/elog_samples.c b/src/vlib/elog_samples.c
new file mode 100644
index 00000000..a8c800df
--- /dev/null
+++ b/src/vlib/elog_samples.c
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vppinfra/elog.h>
+
+static inline void
+elog_four_int_sample (u32 * data)
+{
+  ELOG_TYPE_DECLARE (e) =
+  {
+  .format = "four int: first %d second %d third %d fourth %d",.format_args =
+      "i4i4i4i4",};
+  struct
+  {
+    u32 data[4];
+  } *ed;
+  ed = ELOG_DATA (&vlib_global_main.elog_main, e);
+  ed->data[0] = data[0];
+  ed->data[1] = data[1];
+  ed->data[2] = data[2];
+  ed->data[3] = data[3];
+}
+
+static inline void
+elog_four_int_track_sample (u32 * data)
+{
+  ELOG_TYPE_DECLARE (e) =
+  {
+  .format =
+      "four_int_track: first %d second %d third %d fourth %d",.format_args =
+      "i4i4i4i4",};
+  struct
+  {
+    u32 data[4];
+  } *ed;
+  ELOG_TRACK (sample_track);
+  ed = ELOG_TRACK_DATA (&vlib_global_main.elog_main, e, sample_track);
+  ed->data[0] = data[0];
+  ed->data[1] = data[1];
+  ed->data[2] = data[2];
+  ed->data[3] = data[3];
+}
+
+static inline void
+elog_enum_sample (u8 which)
+{
+  ELOG_TYPE_DECLARE (e) =
+  {
+    .format = "my enum: %s",.format_args = "t1",.n_enum_strings =
+      2,.enum_strings =
+    {
+  "string 1", "string 2",},};
+  struct
+  {
+    u8 which;
+  } *ed;
+  ed = ELOG_DATA (&vlib_global_main.elog_main, e);
+  ed->which = which;
+}
+
+static inline void
+elog_one_datum_sample (u32 data)
+{
+  ELOG_TYPE_DECLARE (e) =
+  {
+  .format = "one datum: %d",.format_args = "i4",};
+
+  elog (&vlib_global_main.elog_main, &e, data);
+}
+
+static clib_error_t *
+test_elog_command_fn (vlib_main_t * vm,
+		      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  int i;
+  u32 samples[4];
+
+  for (i = 0; i < 10; i++)
+    {
+      samples[0] = i;
+      samples[1] = i + 1;
+      samples[2] = i + 2;
+      samples[3] = i + 3;
+
+      elog_four_int_sample (samples);
+      elog_four_int_track_sample (samples);
+      elog_enum_sample (0);
+      elog_enum_sample (1);
+      elog_one_datum_sample (i);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (test_elog_command, static) = {
+  .path = "test elog sample",
+  .short_help = "test elog sample",
+  .function = test_elog_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/error.c b/src/vlib/error.c
new file mode 100644
index 00000000..a2c23176
--- /dev/null
+++ b/src/vlib/error.c
@@ -0,0 +1,338 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * error.c: VLIB error handler
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vppinfra/heap.h>
+
+uword
+vlib_error_drop_buffers (vlib_main_t * vm,
+			 vlib_node_runtime_t * node,
+			 u32 * buffers,
+			 u32 next_buffer_stride,
+			 u32 n_buffers,
+			 u32 next_index,
+			 u32 drop_error_node, u32 drop_error_code)
+{
+  u32 n_left_this_frame, n_buffers_left, *args, n_args_left;
+  vlib_error_t drop_error;
+
+  drop_error = vlib_error_set (drop_error_node, drop_error_code);
+
+  n_buffers_left = n_buffers;
+  while (n_buffers_left > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, args, n_args_left);
+
+      n_left_this_frame = clib_min (n_buffers_left, n_args_left);
+      n_buffers_left -= n_left_this_frame;
+      n_args_left -= n_left_this_frame;
+
+      while (n_left_this_frame >= 4)
+	{
+	  u32 bi0, bi1, bi2, bi3;
+	  vlib_buffer_t *b0, *b1, *b2, *b3;
+
+	  args[0] = bi0 = buffers[0];
+	  args[1] = bi1 = buffers[1];
+	  args[2] = bi2 = buffers[2];
+	  args[3] = bi3 = buffers[3];
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+	  b2 = vlib_get_buffer (vm, bi2);
+	  b3 = vlib_get_buffer (vm, bi3);
+
+	  b0->error = drop_error;
+	  b1->error = drop_error;
+	  b2->error = drop_error;
+	  b3->error = drop_error;
+
+	  buffers += 4;
+	  args += 4;
+	  n_left_this_frame -= 4;
+	}
+
+      while (n_left_this_frame >= 1)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+
+	  args[0] = bi0 = buffers[0];
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b0->error = drop_error;
+
+	  buffers += 1;
+	  args += 1;
+	  n_left_this_frame -= 1;
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_args_left);
+    }
+
+  return n_buffers;
+}
+
+/* Convenience node to drop a vector of buffers with a "misc error". */
+static uword
+misc_drop_buffers (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return vlib_error_drop_buffers (vm, node, vlib_frame_args (frame),
+				  /* buffer stride */ 1,
+				  frame->n_vectors,
+				  /* next */ 0,
+				  node->node_index,
+				  /* error */ 0);
+}
+
+static char *misc_drop_buffers_error_strings[] = {
+  [0] = "misc. errors",
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (misc_drop_buffers_node,static) = {
+  .function = misc_drop_buffers,
+  .name = "misc-drop-buffers",
+  .vector_size = sizeof (u32),
+  .n_errors = 1,
+  .n_next_nodes = 1,
+  .next_nodes = {
+      "error-drop",
+  },
+  .error_strings = misc_drop_buffers_error_strings,
+};
+/* *INDENT-ON* */
+
+/* Reserves given number of error codes for given node. */
+void
+vlib_register_errors (vlib_main_t * vm,
+		      u32 node_index, u32 n_errors, char *error_strings[])
+{
+  vlib_error_main_t *em = &vm->error_main;
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  uword l;
+
+  ASSERT (os_get_cpu_number () == 0);
+
+  /* Free up any previous error strings. */
+  if (n->n_errors > 0)
+    heap_dealloc (em->error_strings_heap, n->error_heap_handle);
+
+  n->n_errors = n_errors;
+  n->error_strings = error_strings;
+
+  if (n_errors == 0)
+    return;
+
+  n->error_heap_index =
+    heap_alloc (em->error_strings_heap, n_errors, n->error_heap_handle);
+
+  l = vec_len (em->error_strings_heap);
+
+  clib_memcpy (vec_elt_at_index (em->error_strings_heap, n->error_heap_index),
+	       error_strings, n_errors * sizeof (error_strings[0]));
+
+  /* Allocate a counter/elog type for each error. */
+  vec_validate (em->counters, l - 1);
+  vec_validate (vm->error_elog_event_types, l - 1);
+
+  /* Zero counters for re-registrations of errors. */
+  if (n->error_heap_index + n_errors <= vec_len (em->counters_last_clear))
+    clib_memcpy (em->counters + n->error_heap_index,
+		 em->counters_last_clear + n->error_heap_index,
+		 n_errors * sizeof (em->counters[0]));
+  else
+    memset (em->counters + n->error_heap_index,
+	    0, n_errors * sizeof (em->counters[0]));
+
+  {
+    elog_event_type_t t;
+    uword i;
+
+    memset (&t, 0, sizeof (t));
+    for (i = 0; i < n_errors; i++)
+      {
+	t.format = (char *) format (0, "%v %s: %%d",
+				    n->name, error_strings[i]);
+	vm->error_elog_event_types[n->error_heap_index + i] = t;
+      }
+  }
+}
+
+static clib_error_t *
+show_errors (vlib_main_t * vm,
+	     unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vlib_error_main_t *em = &vm->error_main;
+  vlib_node_t *n;
+  u32 code, i, ni;
+  u64 c;
+  int index = 0;
+  int verbose = 0;
+  u64 *sums = 0;
+
+  if (unformat (input, "verbose %d", &verbose))
+    ;
+  else if (unformat (input, "verbose"))
+    verbose = 1;
+
+  vec_validate (sums, vec_len (em->counters));
+
+  if (verbose)
+    vlib_cli_output (vm, "%=10s%=40s%=20s%=6s", "Count", "Node", "Reason",
+		     "Index");
+  else
+    vlib_cli_output (vm, "%=10s%=40s%=6s", "Count", "Node", "Reason");
+
+
+  /* *INDENT-OFF* */
+  foreach_vlib_main(({
+    em = &this_vlib_main->error_main;
+
+    if (verbose)
+      vlib_cli_output(vm, "Thread %u (%v):", index,
+                      vlib_worker_threads[index].name);
+
+    for (ni = 0; ni < vec_len (this_vlib_main->node_main.nodes); ni++)
+      {
+	n = vlib_get_node (this_vlib_main, ni);
+	for (code = 0; code < n->n_errors; code++)
+	  {
+	    i = n->error_heap_index + code;
+	    c = em->counters[i];
+	    if (i < vec_len (em->counters_last_clear))
+	      c -= em->counters_last_clear[i];
+	    sums[i] += c;
+
+	    if (c == 0 && verbose < 2)
+	      continue;
+
+            if (verbose)
+              vlib_cli_output (vm, "%10Ld%=40v%=20s%=6d", c, n->name,
+                               em->error_strings_heap[i], i);
+            else
+              vlib_cli_output (vm, "%10d%=40v%s", c, n->name,
+                               em->error_strings_heap[i]);
+	  }
+      }
+    index++;
+  }));
+  /* *INDENT-ON* */
+
+  if (verbose)
+    vlib_cli_output (vm, "Total:");
+
+  for (ni = 0; ni < vec_len (vm->node_main.nodes); ni++)
+    {
+      n = vlib_get_node (vm, ni);
+      for (code = 0; code < n->n_errors; code++)
+	{
+	  i = n->error_heap_index + code;
+	  if (sums[i])
+	    {
+	      if (verbose)
+		vlib_cli_output (vm, "%10Ld%=40v%=20s%=10d", sums[i], n->name,
+				 em->error_strings_heap[i], i);
+	    }
+	}
+    }
+
+  vec_free (sums);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_show_errors, static) = {
+  .path = "show errors",
+  .short_help = "Show error counts",
+  .function = show_errors,
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_show_node_counters, static) = {
+  .path = "show node counters",
+  .short_help = "Show node counters",
+  .function = show_errors,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+clear_error_counters (vlib_main_t * vm,
+		      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vlib_error_main_t *em;
+  u32 i;
+
+  /* *INDENT-OFF* */
+  foreach_vlib_main(({
+    em = &this_vlib_main->error_main;
+    vec_validate (em->counters_last_clear, vec_len (em->counters) - 1);
+    for (i = 0; i < vec_len (em->counters); i++)
+      em->counters_last_clear[i] = em->counters[i];
+  }));
+  /* *INDENT-ON* */
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_clear_error_counters, static) = {
+  .path = "clear errors",
+  .short_help = "Clear error counters",
+  .function = clear_error_counters,
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_clear_node_counters, static) = {
+  .path = "clear node counters",
+  .short_help = "Clear node counters",
+  .function = clear_error_counters,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/error.h b/src/vlib/error.h
new file mode 100644
index 00000000..df2075c3
--- /dev/null
+++ b/src/vlib/error.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * error.h: drop/punt error packets
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_error_h
+#define included_vlib_error_h
+
+/* Combined 16 bit node & 16 bit code as 32 bit number. */
+typedef u32 vlib_error_t;
+
+always_inline u32
+vlib_error_get_node (vlib_error_t e)
+{
+  return e >> 12;
+}
+
+always_inline u32
+vlib_error_get_code (vlib_error_t e)
+{
+  return e & 0xfff;
+}
+
+always_inline vlib_error_t
+vlib_error_set (u32 node_index, u32 code)
+{
+  ASSERT (node_index < (1 << 20));
+  ASSERT (code < (1 << 12));
+  return (node_index << 12) | code;
+}
+
+always_inline vlib_error_t
+vlib_error_set_code (vlib_error_t e, u32 code)
+{
+  ASSERT (vlib_error_get_code (e) == 0);
+  ASSERT (code < (1 << 12));
+  e |= code;
+  return e;
+}
+
+typedef struct
+{
+  /* Error counters. */
+  u64 *counters;
+
+  /* Counter values as of last counter clear. */
+  u64 *counters_last_clear;
+
+  /* Error name strings in heap.  Heap index
+     indexes counter vector. */
+  char **error_strings_heap;
+} vlib_error_main_t;
+
+/* Per node error registration. */
+void vlib_register_errors (struct vlib_main_t *vm,
+			   u32 node_index,
+			   u32 n_errors, char *error_strings[]);
+
+#endif /* included_vlib_error_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/error_funcs.h b/src/vlib/error_funcs.h
new file mode 100644
index 00000000..1a3602e9
--- /dev/null
+++ b/src/vlib/error_funcs.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * error_funcs.h: VLIB error handling
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_error_funcs_h
+#define included_vlib_error_funcs_h
+
+#include <vlib/node_funcs.h>
+
+always_inline void
+vlib_error_elog_count (vlib_main_t * vm, uword counter, uword increment)
+{
+  elog_main_t *em = &vm->elog_main;
+  if (VLIB_ELOG_MAIN_LOOP > 0 && increment > 0)
+    elog (em, vec_elt_at_index (vm->error_elog_event_types, counter),
+	  increment);
+}
+
+always_inline void
+vlib_error_count (vlib_main_t * vm, uword node_index,
+		  uword counter, uword increment)
+{
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  vlib_error_main_t *em = &vm->error_main;
+
+  ASSERT (counter < n->n_errors);
+  counter += n->error_heap_index;
+
+  ASSERT (counter < vec_len (em->counters));
+  em->counters[counter] += increment;
+
+  vlib_error_elog_count (vm, counter, increment);
+}
+
+/* Drop all buffers in frame with given error code. */
+uword
+vlib_error_drop_buffers (vlib_main_t * vm,
+			 vlib_node_runtime_t * node,
+			 u32 * buffers,
+			 u32 next_buffer_stride,
+			 u32 n_buffers,
+			 u32 error_next_index,
+			 u32 error_node, u32 error_code);
+
+#endif /* included_vlib_error_funcs_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/format.c b/src/vlib/format.c
new file mode 100644
index 00000000..79a4d686
--- /dev/null
+++ b/src/vlib/format.c
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * format.c: generic network formatting/unformating
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+
+u8 *
+format_vlib_rx_tx (u8 * s, va_list * args)
+{
+  vlib_rx_or_tx_t r = va_arg (*args, vlib_rx_or_tx_t);
+  char *t;
+
+  switch (r)
+    {
+    case VLIB_RX:
+      t = "rx";
+      break;
+    case VLIB_TX:
+      t = "tx";
+      break;
+    default:
+      t = "INVALID";
+      break;
+    }
+
+  vec_add (s, t, strlen (t));
+  return s;
+}
+
+u8 *
+format_vlib_read_write (u8 * s, va_list * args)
+{
+  vlib_rx_or_tx_t r = va_arg (*args, vlib_rx_or_tx_t);
+  char *t;
+
+  switch (r)
+    {
+    case VLIB_READ:
+      t = "read";
+      break;
+    case VLIB_WRITE:
+      t = "write";
+      break;
+    default:
+      t = "INVALID";
+      break;
+    }
+
+  vec_add (s, t, strlen (t));
+  return s;
+}
+
+/* Formats buffer data as printable ascii or as hex. */
+u8 *
+format_vlib_buffer_data (u8 * s, va_list * args)
+{
+  u8 *data = va_arg (*args, u8 *);
+  u32 n_data_bytes = va_arg (*args, u32);
+  u32 i, is_printable;
+
+  is_printable = 1;
+  for (i = 0; i < n_data_bytes && is_printable; i++)
+    {
+      u8 c = data[i];
+      if (c < 0x20)
+	is_printable = 0;
+      else if (c >= 0x7f)
+	is_printable = 0;
+    }
+
+  if (is_printable)
+    vec_add (s, data, n_data_bytes);
+  else
+    s = format (s, "%U", format_hex_bytes, data, n_data_bytes);
+
+  return s;
+}
+
+/* Enable/on => 1; disable/off => 0. */
+uword
+unformat_vlib_enable_disable (unformat_input_t * input, va_list * args)
+{
+  int *result = va_arg (*args, int *);
+  int enable;
+
+  if (unformat (input, "enable") || unformat (input, "on"))
+    enable = 1;
+  else if (unformat (input, "disable") || unformat (input, "off"))
+    enable = 0;
+  else
+    return 0;
+
+  *result = enable;
+  return 1;
+}
+
+/* rx/tx => VLIB_RX/VLIB_TX. */
+uword
+unformat_vlib_rx_tx (unformat_input_t * input, va_list * args)
+{
+  int *result = va_arg (*args, int *);
+  if (unformat (input, "rx"))
+    *result = VLIB_RX;
+  else if (unformat (input, "tx"))
+    *result = VLIB_TX;
+  else
+    return 0;
+  return 1;
+}
+
+/* Parse an int either %d or 0x%x. */
+uword
+unformat_vlib_number (unformat_input_t * input, va_list * args)
+{
+  int *result = va_arg (*args, int *);
+
+  return (unformat (input, "0x%x", result) || unformat (input, "%d", result));
+}
+
+/* Parse a-zA-Z0-9_ token and hash to value. */
+uword
+unformat_vlib_number_by_name (unformat_input_t * input, va_list * args)
+{
+  uword *hash = va_arg (*args, uword *);
+  int *result = va_arg (*args, int *);
+  uword *p;
+  u8 *token;
+  int i;
+
+  if (!unformat_user (input, unformat_token, "a-zA-Z0-9_", &token))
+    return 0;
+
+  /* Null terminate. */
+  if (vec_len (token) > 0 && token[vec_len (token) - 1] != 0)
+    vec_add1 (token, 0);
+
+  /* Check for exact match. */
+  p = hash_get_mem (hash, token);
+  if (p)
+    goto done;
+
+  /* Convert to upper case & try match. */
+  for (i = 0; i < vec_len (token); i++)
+    if (token[i] >= 'a' && token[i] <= 'z')
+      token[i] = 'A' + token[i] - 'a';
+  p = hash_get_mem (hash, token);
+
+done:
+  vec_free (token);
+  if (p)
+    *result = p[0];
+  return p != 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/format_funcs.h b/src/vlib/format_funcs.h
new file mode 100644
index 00000000..f60b8940
--- /dev/null
+++ b/src/vlib/format_funcs.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * format_funcs.h: VLIB formatting/unformating
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_format_h
+#define included_vlib_format_h
+
+/* Format vlib_rx_or_tx_t/vlib_read_or_write_t enum as string. */
+u8 *format_vlib_rx_tx (u8 * s, va_list * args);
+u8 *format_vlib_read_write (u8 * s, va_list * args);
+
+/* Formats buffer data as printable ascii or as hex. */
+u8 *format_vlib_buffer_data (u8 * s, va_list * args);
+
+/* Enable/on => 1; disable/off => 0. */
+uword unformat_vlib_enable_disable (unformat_input_t * input, va_list * args);
+
+/* rx/tx => VLIB_RX/VLIB_TX. */
+uword unformat_vlib_rx_tx (unformat_input_t * input, va_list * args);
+
+/* Parse a-zA-Z0-9_ token and hash to value. */
+uword unformat_vlib_number_by_name (unformat_input_t * input, va_list * args);
+
+/* Parse an int either %d or 0x%x. */
+uword unformat_vlib_number (unformat_input_t * input, va_list * args);
+
+/* Flag to format_vlib_*_header functions to tell them not to recurse
+   into the next layer's header.  For example, tells format_vlib_ethernet_header
+   not to format ip header. */
+#define FORMAT_VLIB_HEADER_NO_RECURSION (~0)
+
+#endif /* included_vlib_format_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/global_funcs.h b/src/vlib/global_funcs.h
new file mode 100644
index 00000000..bbdbdef5
--- /dev/null
+++ b/src/vlib/global_funcs.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * global_funcs.h: global data structure access functions
+ */
+
+#ifndef included_vlib_global_funcs_h_
+#define included_vlib_global_funcs_h_
+
+always_inline vlib_main_t *
+vlib_get_main (void)
+{
+  vlib_main_t *vm;
+  vm = vlib_mains ? vlib_mains[os_get_cpu_number ()] : &vlib_global_main;
+  ASSERT (vm);
+  return vm;
+}
+
+always_inline vlib_thread_main_t *
+vlib_get_thread_main ()
+{
+  return &vlib_thread_main;
+}
+
+#endif /* included_vlib_global_funcs_h_ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/i2c.c b/src/vlib/i2c.c
new file mode 100644
index 00000000..97f5bb21
--- /dev/null
+++ b/src/vlib/i2c.c
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vlib/i2c.h>
+
+static inline void
+i2c_delay (i2c_bus_t * b, f64 timeout)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vlib_time_wait (vm, timeout);
+}
+
+static void
+i2c_wait_for_scl (i2c_bus_t * b)
+{
+  f64 t = 0;
+
+  while (t < b->hold_time)
+    {
+      int sda, scl;
+      i2c_delay (b, b->rise_fall_time);
+      b->get_bits (b, &scl, &sda);
+
+      if (scl)
+	return;
+
+      t += b->rise_fall_time;
+    }
+  b->timeout = 1;
+}
+
+static void
+i2c_start (i2c_bus_t * b)
+{
+  b->timeout = 0;
+
+  b->put_bits (b, 1, 1);
+  i2c_wait_for_scl (b);
+
+  if (vlib_i2c_bus_timed_out (b))
+    return;
+
+  b->put_bits (b, 1, 0);
+  i2c_delay (b, b->hold_time);
+  b->put_bits (b, 0, 0);
+  i2c_delay (b, b->hold_time);
+}
+
+static void
+i2c_stop (i2c_bus_t * b)
+{
+  b->put_bits (b, 0, 0);
+  i2c_delay (b, b->rise_fall_time);
+
+  b->put_bits (b, 1, 0);
+  i2c_delay (b, b->hold_time);
+
+  b->put_bits (b, 1, 1);
+  i2c_delay (b, b->hold_time);
+}
+
+static void
+i2c_write_bit (i2c_bus_t * b, int sda)
+{
+  b->put_bits (b, 0, sda);
+  i2c_delay (b, b->rise_fall_time);
+
+  b->put_bits (b, 1, sda);
+  i2c_wait_for_scl (b);
+  i2c_delay (b, b->hold_time);
+
+  b->put_bits (b, 0, sda);
+  i2c_delay (b, b->rise_fall_time);
+}
+
+static void
+i2c_read_bit (i2c_bus_t * b, int *sda)
+{
+  int scl;
+
+  b->put_bits (b, 1, 1);
+  i2c_wait_for_scl (b);
+  i2c_delay (b, b->hold_time);
+
+  b->get_bits (b, &scl, sda);
+
+  b->put_bits (b, 0, 1);
+  i2c_delay (b, b->rise_fall_time);
+}
+
+static void
+i2c_write_byte (i2c_bus_t * b, u8 data)
+{
+  int i, sda;
+
+  for (i = 7; i >= 0; i--)
+    {
+      i2c_write_bit (b, (data >> i) & 1);
+      if (b->timeout)
+	return;
+    }
+
+  b->put_bits (b, 0, 1);
+  i2c_delay (b, b->rise_fall_time);
+
+  i2c_read_bit (b, &sda);
+
+  if (sda)
+    b->timeout = 1;
+}
+
+
+static void
+i2c_read_byte (i2c_bus_t * b, u8 * data, int ack)
+{
+  int i, sda;
+
+  *data = 0;
+
+  b->put_bits (b, 0, 1);
+  i2c_delay (b, b->rise_fall_time);
+
+  for (i = 7; i >= 0; i--)
+    {
+      i2c_read_bit (b, &sda);
+      if (b->timeout)
+	return;
+
+      *data |= (sda != 0) << i;
+    }
+
+  i2c_write_bit (b, ack == 0);
+}
+
+
+void
+vlib_i2c_init (i2c_bus_t * b)
+{
+  f64 tick;
+  if (!b->clock)
+    b->clock = 400000;
+
+  tick = 1.0 / b->clock;
+
+  /* Spend 40% of time in low and high states */
+  if (!b->hold_time)
+    b->hold_time = 0.4 * tick;
+
+  /* Spend 10% of time waiting for rise and fall */
+  if (!b->rise_fall_time)
+    b->rise_fall_time = 0.1 * tick;
+}
+
+void
+vlib_i2c_xfer (i2c_bus_t * bus, i2c_msg_t * msgs)
+{
+  i2c_msg_t *msg;
+  int i;
+
+  vec_foreach (msg, msgs)
+  {
+    i2c_start (bus);
+    i2c_write_byte (bus,
+		    (msg->addr << 1) + (msg->flags == I2C_MSG_FLAG_READ));
+
+    if (msg->flags & I2C_MSG_FLAG_READ)
+      for (i = 0; i < msg->len; i++)
+	{
+	  i2c_read_byte (bus, &msg->buffer[i], /* ack */ i + 1 != msg->len);
+	  if (bus->timeout)
+	    goto done;
+	}
+
+    else
+      for (i = 0; i < msg->len; i++)
+	{
+	  i2c_write_byte (bus, msg->buffer[i]);
+	  if (bus->timeout)
+	    goto done;
+	}
+  }
+
+done:
+  i2c_stop (bus);
+}
+
+void
+vlib_i2c_read_eeprom (i2c_bus_t * bus, u8 i2c_addr, u16 start_addr,
+		      u16 length, u8 * data)
+{
+  i2c_msg_t *msg = 0;
+  u8 start_address[1];
+
+  vec_validate (msg, 1);
+
+  start_address[0] = start_addr;
+  msg[0].addr = i2c_addr;
+  msg[0].flags = I2C_MSG_FLAG_WRITE;
+  msg[0].buffer = (u8 *) & start_address;
+  msg[0].len = 1;
+
+  msg[1].addr = i2c_addr;
+  msg[1].flags = I2C_MSG_FLAG_READ;
+  msg[1].buffer = data;
+  msg[1].len = length;
+
+  vlib_i2c_xfer (bus, msg);
+
+  vec_free (msg);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/i2c.h b/src/vlib/i2c.h
new file mode 100644
index 00000000..b79bdc75
--- /dev/null
+++ b/src/vlib/i2c.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_vlib_i2c_h
+#define included_vlib_i2c_h
+
+#include <vppinfra/types.h>
+
+
+#define I2C_MSG_FLAG_WRITE  0
+#define I2C_MSG_FLAG_READ   1
+
+typedef struct
+{
+  u8 addr;
+  u8 flags;
+  u16 len;
+  u8 *buffer;
+} i2c_msg_t;
+
+typedef struct i2c_bus_t
+{
+  void (*put_bits) (struct i2c_bus_t * b, int scl, int sda);
+  void (*get_bits) (struct i2c_bus_t * b, int *scl, int *sda);
+
+  int timeout;
+  u32 clock;
+  f64 hold_time;
+  f64 rise_fall_time;
+
+  /* Private data */
+  uword private_data;
+
+} i2c_bus_t;
+
+void vlib_i2c_init (i2c_bus_t * bus);
+void vlib_i2c_xfer (i2c_bus_t * bus, i2c_msg_t * msgs);
+void vlib_i2c_read_eeprom (i2c_bus_t * bus, u8 i2c_addr, u16 start_addr,
+			   u16 length, u8 * data);
+
+static inline int
+vlib_i2c_bus_timed_out (i2c_bus_t * bus)
+{
+  return bus->timeout;
+}
+
+#endif /* included_vlib_i2c_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/init.c b/src/vlib/init.c
new file mode 100644
index 00000000..8d478451
--- /dev/null
+++ b/src/vlib/init.c
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * init.c: mechanism for functions to be called at init/exit.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+
+clib_error_t *
+vlib_call_init_exit_functions (vlib_main_t * vm,
+			       _vlib_init_function_list_elt_t * head,
+			       int call_once)
+{
+  clib_error_t *error = 0;
+  _vlib_init_function_list_elt_t *i;
+
+  i = head;
+  while (i)
+    {
+      if (call_once && !hash_get (vm->init_functions_called, i->f))
+	{
+	  if (call_once)
+	    hash_set1 (vm->init_functions_called, i->f);
+	  error = i->f (vm);
+	  if (error)
+	    return error;
+	}
+      i = i->next_init_function;
+    }
+  return error;
+}
+
+clib_error_t *
+vlib_call_all_init_functions (vlib_main_t * vm)
+{
+  /* Call dummy functions to make sure purely static modules are
+     linked in. */
+#define _(f) vlib_##f##_reference ();
+  foreach_vlib_module_reference;
+#undef _
+
+  return vlib_call_init_exit_functions
+    (vm, vm->init_function_registrations, 1 /* call_once */ );
+}
+
+clib_error_t *
+vlib_call_all_main_loop_enter_functions (vlib_main_t * vm)
+{
+  return vlib_call_init_exit_functions
+    (vm, vm->main_loop_enter_function_registrations, 1 /* call_once */ );
+}
+
+clib_error_t *
+vlib_call_all_main_loop_exit_functions (vlib_main_t * vm)
+{
+  return vlib_call_init_exit_functions
+    (vm, vm->main_loop_exit_function_registrations, 1 /* call_once */ );
+}
+
+clib_error_t *
+vlib_call_all_config_functions (vlib_main_t * vm,
+				unformat_input_t * input, int is_early)
+{
+  clib_error_t *error = 0;
+  vlib_config_function_runtime_t *c, **all;
+  uword *hash = 0, *p;
+  uword i;
+
+  hash = hash_create_string (0, sizeof (uword));
+  all = 0;
+
+  c = vm->config_function_registrations;
+
+  while (c)
+    {
+      hash_set_mem (hash, c->name, vec_len (all));
+      vec_add1 (all, c);
+      unformat_init (&c->input, 0, 0);
+      c = c->next_registration;
+    }
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      u8 *s, *v;
+
+      if (!unformat (input, "%s %v", &s, &v) || !(p = hash_get_mem (hash, s)))
+	{
+	  error = clib_error_create ("unknown input `%s %v'", s, v);
+	  goto done;
+	}
+
+      c = all[p[0]];
+      if (vec_len (c->input.buffer) > 0)
+	vec_add1 (c->input.buffer, ' ');
+      vec_add (c->input.buffer, v, vec_len (v));
+      vec_free (v);
+      vec_free (s);
+    }
+
+  for (i = 0; i < vec_len (all); i++)
+    {
+      c = all[i];
+
+      /* Is this an early config? Are we doing early configs? */
+      if (is_early ^ c->is_early)
+	continue;
+
+      /* Already called? */
+      if (hash_get (vm->init_functions_called, c->function))
+	continue;
+      hash_set1 (vm->init_functions_called, c->function);
+
+      error = c->function (vm, &c->input);
+      if (error)
+	goto done;
+    }
+
+done:
+  for (i = 0; i < vec_len (all); i++)
+    {
+      c = all[i];
+      unformat_free (&c->input);
+    }
+  vec_free (all);
+  hash_free (hash);
+  return error;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/init.h b/src/vlib/init.h
new file mode 100644
index 00000000..4fa5b304
--- /dev/null
+++ b/src/vlib/init.h
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * init.h: mechanism for functions to be called at init/exit.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_init_h
+#define included_vlib_init_h
+
+#include <vppinfra/error.h>
+#include <vppinfra/format.h>
+#include <vppinfra/hash.h>
+
+/* Init/exit functions: called at start/end of main routine.  Init
+   functions are typically used to register and setup packet
+   processing nodes.  */
+
+typedef clib_error_t *(vlib_init_function_t) (struct vlib_main_t * vm);
+
+typedef struct _vlib_init_function_list_elt
+{
+  struct _vlib_init_function_list_elt *next_init_function;
+  vlib_init_function_t *f;
+} _vlib_init_function_list_elt_t;
+
+/* Configuration functions: called with configuration input just before
+   main polling loop starts. */
+typedef clib_error_t *(vlib_config_function_t) (struct vlib_main_t * vm,
+						unformat_input_t * input);
+
+typedef struct vlib_config_function_runtime_t
+{
+  /* Function to call.  Set to null once function has already been called. */
+  vlib_config_function_t *function;
+
+  /* Input for function. */
+  unformat_input_t input;
+
+  /* next config function registration */
+  struct vlib_config_function_runtime_t *next_registration;
+
+  /* To be invoked as soon as the clib heap is available */
+  u8 is_early;
+
+  /* Name used to distinguish input on command line. */
+  char name[32];
+} vlib_config_function_runtime_t;
+
+#define _VLIB_INIT_FUNCTION_SYMBOL(x, type)	\
+  _vlib_##type##_function_##x
+
+#define VLIB_INIT_FUNCTION_SYMBOL(x)		\
+  _VLIB_INIT_FUNCTION_SYMBOL(x, init)
+#define VLIB_MAIN_LOOP_ENTER_FUNCTION_SYMBOL(x)		\
+  _VLIB_INIT_FUNCTION_SYMBOL(x, main_loop_enter)
+#define VLIB_MAIN_LOOP_EXIT_FUNCTION_SYMBOL(x)	\
+  _VLIB_INIT_FUNCTION_SYMBOL(x, main_loop_exit)
+#define VLIB_CONFIG_FUNCTION_SYMBOL(x)		\
+  _VLIB_INIT_FUNCTION_SYMBOL(x, config)
+
+/* Declaration is global (e.g. not static) so that init functions can
+   be called from other modules to resolve init function depend. */
+
+#define VLIB_DECLARE_INIT_FUNCTION(x, tag)                      \
+vlib_init_function_t * _VLIB_INIT_FUNCTION_SYMBOL (x, tag) = x; \
+static void __vlib_add_##tag##_function_##x (void)              \
+    __attribute__((__constructor__)) ;                          \
+static void __vlib_add_##tag##_function_##x (void)              \
+{                                                               \
+ vlib_main_t * vm = vlib_get_main();                            \
+ static _vlib_init_function_list_elt_t _vlib_init_function;     \
+ _vlib_init_function.next_init_function                         \
+    = vm->tag##_function_registrations;                         \
+  vm->tag##_function_registrations = &_vlib_init_function;      \
+ _vlib_init_function.f = &x;                                    \
+}
+
+#define VLIB_INIT_FUNCTION(x) VLIB_DECLARE_INIT_FUNCTION(x,init)
+
+#define VLIB_MAIN_LOOP_ENTER_FUNCTION(x) \
+  VLIB_DECLARE_INIT_FUNCTION(x,main_loop_enter)
+#define VLIB_MAIN_LOOP_EXIT_FUNCTION(x) \
+VLIB_DECLARE_INIT_FUNCTION(x,main_loop_exit)
+
+#define VLIB_CONFIG_FUNCTION(x,n,...)                           \
+    __VA_ARGS__ vlib_config_function_runtime_t                  \
+    VLIB_CONFIG_FUNCTION_SYMBOL(x);                             \
+static void __vlib_add_config_function_##x (void)               \
+    __attribute__((__constructor__)) ;                          \
+static void __vlib_add_config_function_##x (void)               \
+{                                                               \
+    vlib_main_t * vm = vlib_get_main();                         \
+    VLIB_CONFIG_FUNCTION_SYMBOL(x).next_registration            \
+       = vm->config_function_registrations;                     \
+    vm->config_function_registrations                           \
+       = &VLIB_CONFIG_FUNCTION_SYMBOL(x);                       \
+}                                                               \
+  vlib_config_function_runtime_t                                \
+    VLIB_CONFIG_FUNCTION_SYMBOL (x)                             \
+  = {                                                           \
+    .name = n,                                                  \
+    .function = x,                                              \
+    .is_early = 0,						\
+  }
+
+#define VLIB_EARLY_CONFIG_FUNCTION(x,n,...)                     \
+    __VA_ARGS__ vlib_config_function_runtime_t                  \
+    VLIB_CONFIG_FUNCTION_SYMBOL(x);                             \
+static void __vlib_add_config_function_##x (void)               \
+    __attribute__((__constructor__)) ;                          \
+static void __vlib_add_config_function_##x (void)               \
+{                                                               \
+    vlib_main_t * vm = vlib_get_main();                         \
+    VLIB_CONFIG_FUNCTION_SYMBOL(x).next_registration            \
+       = vm->config_function_registrations;                     \
+    vm->config_function_registrations                           \
+       = &VLIB_CONFIG_FUNCTION_SYMBOL(x);                       \
+}                                                               \
+  vlib_config_function_runtime_t                                \
+    VLIB_CONFIG_FUNCTION_SYMBOL (x)                             \
+  = {                                                           \
+    .name = n,                                                  \
+    .function = x,                                              \
+    .is_early = 1,						\
+  }
+
+/* Call given init function: used for init function dependencies. */
+#define vlib_call_init_function(vm, x)					\
+  ({									\
+    extern vlib_init_function_t * VLIB_INIT_FUNCTION_SYMBOL (x);	\
+    vlib_init_function_t * _f = VLIB_INIT_FUNCTION_SYMBOL (x);		\
+    clib_error_t * _error = 0;						\
+    if (! hash_get (vm->init_functions_called, _f))			\
+      {									\
+	hash_set1 (vm->init_functions_called, _f);			\
+	_error = _f (vm);						\
+      }									\
+    _error;								\
+  })
+
+/* Don't call given init function: used to suppress parts of the netstack */
+#define vlib_mark_init_function_complete(vm, x)				\
+  ({									\
+    extern vlib_init_function_t * VLIB_INIT_FUNCTION_SYMBOL (x);	\
+    vlib_init_function_t * _f = VLIB_INIT_FUNCTION_SYMBOL (x);		\
+    hash_set1 (vm->init_functions_called, _f);				\
+  })
+
+#define vlib_call_post_graph_init_function(vm, x)			\
+  ({									\
+    extern vlib_init_function_t * VLIB_POST_GRAPH_INIT_FUNCTION_SYMBOL (x); \
+    vlib_init_function_t * _f = VLIB_POST_GRAPH_INIT_FUNCTION_SYMBOL (x); \
+    clib_error_t * _error = 0;						\
+    if (! hash_get (vm->init_functions_called, _f))			\
+      {									\
+	hash_set1 (vm->init_functions_called, _f);			\
+	_error = _f (vm);						\
+      }									\
+    _error;								\
+  })
+
+#define vlib_call_config_function(vm, x)			\
+  ({								\
+    vlib_config_function_runtime_t * _r;			\
+    clib_error_t * _error = 0;					\
+    extern vlib_config_function_runtime_t			\
+      VLIB_CONFIG_FUNCTION_SYMBOL (x);				\
+								\
+    _r = &VLIB_CONFIG_FUNCTION_SYMBOL (x);			\
+    if (! hash_get (vm->init_functions_called, _r->function))	\
+      {								\
+        hash_set1 (vm->init_functions_called, _r->function);	\
+	_error = _r->function (vm, &_r->input);			\
+      }								\
+    _error;							\
+  })
+
+/* External functions. */
+clib_error_t *vlib_call_all_init_functions (struct vlib_main_t *vm);
+clib_error_t *vlib_call_all_config_functions (struct vlib_main_t *vm,
+					      unformat_input_t * input,
+					      int is_early);
+clib_error_t *vlib_call_all_main_loop_enter_functions (struct vlib_main_t
+						       *vm);
+clib_error_t *vlib_call_all_main_loop_exit_functions (struct vlib_main_t *vm);
+clib_error_t *vlib_call_init_exit_functions (struct vlib_main_t *vm,
+					     _vlib_init_function_list_elt_t *
+					     head, int call_once);
+
+#define foreach_vlib_module_reference		\
+  _ (node_cli)					\
+  _ (trace_cli)
+
+/* Dummy function to get node_cli.c linked in. */
+#define _(x) void vlib_##x##_reference (void);
+foreach_vlib_module_reference
+#undef _
+#endif /* included_vlib_init_h */
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/lex.c b/src/vlib/lex.c
new file mode 100644
index 00000000..1cc8f167
--- /dev/null
+++ b/src/vlib/lex.c
@@ -0,0 +1,271 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vlib/lex.h>
+
+vlib_lex_main_t vlib_lex_main;
+
+#define LEX_DEBUG 0
+
+u8 *
+format_vlib_lex_token (u8 * s, va_list * args)
+{
+  vlib_lex_main_t *lm = va_arg (*args, vlib_lex_main_t *);
+  vlib_lex_token_t *t = va_arg (*args, vlib_lex_token_t *);
+
+  if (t->token == VLIB_LEX_word)
+    s = format (s, "%s", t->value.as_pointer);
+  else
+    s = format (s, "%s", lm->lex_token_names[t->token]);
+  return s;
+}
+
+void
+vlib_lex_get_token (vlib_lex_main_t * lm, vlib_lex_token_t * rv)
+{
+  u8 c;
+  vlib_lex_table_t *t;
+  vlib_lex_table_entry_t *e;
+  uword tv;
+
+  if (PREDICT_FALSE (lm->pushback_sp >= 0))
+    {
+      rv[0] = lm->pushback_vector[lm->pushback_sp--];
+      return;
+    }
+
+  rv->value.as_uword = ~0;
+
+  while (1)
+    {
+      if (PREDICT_FALSE (lm->current_index >= vec_len (lm->input_vector)))
+	{
+	  rv->token = VLIB_LEX_eof;
+	  return;
+	}
+
+      t = vec_elt_at_index (lm->lex_tables, lm->current_table_index);
+      c = (lm->input_vector[lm->current_index++]) & 0x7f;
+      e = &t->entries[c];
+      lm->current_table_index = e->next_table_index;
+
+      switch (e->action)
+	{
+	case VLIB_LEX_IGNORE:
+	  continue;
+
+	case VLIB_LEX_START_NUMBER:
+	  lm->current_token_value = 0;
+	  /* fallthru */
+
+	case VLIB_LEX_ADD_TO_NUMBER:
+	  lm->current_number_base = e->token;
+	  lm->current_token_value *= lm->current_number_base;
+	  tv = c - '0';
+	  if (tv >= lm->current_number_base)
+	    {
+	      tv = 10 + c - 'A';
+	      if (tv >= lm->current_number_base)
+		tv = 10 + c - 'a';
+	    }
+	  lm->current_token_value += tv;
+	  continue;
+
+	case VLIB_LEX_ADD_TO_TOKEN:
+	  vec_add1 (lm->token_buffer, c);
+	  continue;
+
+	case VLIB_LEX_KEYWORD_CHECK:
+	  {
+	    uword *p;
+
+	    vec_add1 (lm->token_buffer, 0);
+
+	    /* It's either a keyword or just a word. */
+	    p = hash_get_mem (lm->lex_keywords, lm->token_buffer);
+	    if (p)
+	      {
+		rv->token = p[0];
+		if (LEX_DEBUG > 0)
+		  clib_warning ("keyword '%s' token %s",
+				lm->token_buffer,
+				lm->lex_token_names[rv->token]);
+	      }
+	    else
+	      {
+		/* it's a WORD */
+		rv->token = VLIB_LEX_word;
+		rv->value.as_pointer = vec_dup (lm->token_buffer);
+		if (LEX_DEBUG > 0)
+		  clib_warning ("%s, value '%s'",
+				lm->lex_token_names[VLIB_LEX_word],
+				rv->value.as_pointer);
+	      }
+	    _vec_len (lm->token_buffer) = 0;
+
+	    /* Rescan the character which terminated the keyword/word. */
+	    lm->current_index--;
+	    return;
+	  }
+
+	case VLIB_LEX_RETURN_AND_RESCAN:
+	  ASSERT (lm->current_index);
+	  lm->current_index--;
+	  /* note flow-through */
+
+	case VLIB_LEX_RETURN:
+	  rv->token = e->token;
+	  rv->value.as_uword = lm->current_token_value;
+	  lm->current_token_value = ~0;
+	  if (LEX_DEBUG > 0)
+	    {
+	      clib_warning
+		("table %s char '%c'(0x%02x) next table %s return %s",
+		 t->name, c, c, lm->lex_tables[e->next_table_index].name,
+		 lm->lex_token_names[e->token]);
+	      if (rv->token == VLIB_LEX_number)
+		clib_warning ("  numeric value 0x%x (%d)", rv->value,
+			      rv->value);
+	    }
+	  return;
+	}
+    }
+}
+
+u16
+vlib_lex_add_token (vlib_lex_main_t * lm, char *token_name)
+{
+  uword *p;
+  u16 rv;
+
+  p = hash_get_mem (lm->lex_tokens_by_name, token_name);
+
+  if (p)
+    return p[0];
+
+  rv = vec_len (lm->lex_token_names);
+  hash_set_mem (lm->lex_tokens_by_name, token_name, rv);
+  vec_add1 (lm->lex_token_names, token_name);
+
+  return rv;
+}
+
+static u16
+add_keyword (vlib_lex_main_t * lm, char *keyword, char *token_name)
+{
+  uword *p;
+  u16 token;
+
+  p = hash_get_mem (lm->lex_keywords, keyword);
+
+  ASSERT (p == 0);
+
+  token = vlib_lex_add_token (lm, token_name);
+
+  hash_set_mem (lm->lex_keywords, keyword, token);
+  return token;
+}
+
+u16
+vlib_lex_find_or_add_keyword (vlib_lex_main_t * lm, char *keyword,
+			      char *token_name)
+{
+  uword *p = hash_get_mem (lm->lex_keywords, keyword);
+  return p ? p[0] : add_keyword (lm, keyword, token_name);
+}
+
+void
+vlib_lex_set_action_range (u32 table_index, u8 lo, u8 hi, u16 action,
+			   u16 token, u32 next_table_index)
+{
+  int i;
+  vlib_lex_main_t *lm = &vlib_lex_main;
+  vlib_lex_table_t *t = pool_elt_at_index (lm->lex_tables, table_index);
+
+  for (i = lo; i <= hi; i++)
+    {
+      ASSERT (i < ARRAY_LEN (t->entries));
+      t->entries[i].action = action;
+      t->entries[i].token = token;
+      t->entries[i].next_table_index = next_table_index;
+    }
+}
+
+u16
+vlib_lex_add_table (char *name)
+{
+  vlib_lex_main_t *lm = &vlib_lex_main;
+  vlib_lex_table_t *t;
+  uword *p;
+
+  p = hash_get_mem (lm->lex_tables_by_name, name);
+
+  ASSERT (p == 0);
+
+  pool_get_aligned (lm->lex_tables, t, CLIB_CACHE_LINE_BYTES);
+
+  t->name = name;
+
+  hash_set_mem (lm->lex_tables_by_name, name, t - lm->lex_tables);
+
+  vlib_lex_set_action_range (t - lm->lex_tables, 1, 0x7F, VLIB_LEX_IGNORE, ~0,
+			     t - lm->lex_tables);
+
+  vlib_lex_set_action_range (t - lm->lex_tables, 0, 0, VLIB_LEX_RETURN,
+			     VLIB_LEX_eof, t - lm->lex_tables);
+
+  return t - lm->lex_tables;
+}
+
+void
+vlib_lex_reset (vlib_lex_main_t * lm, u8 * input_vector)
+{
+  if (lm->pushback_vector)
+    _vec_len (lm->pushback_vector) = 0;
+  lm->pushback_sp = -1;
+
+  lm->input_vector = input_vector;
+  lm->current_index = 0;
+}
+
+static clib_error_t *
+lex_onetime_init (vlib_main_t * vm)
+{
+  vlib_lex_main_t *lm = &vlib_lex_main;
+
+  lm->lex_tables_by_name = hash_create_string (0, sizeof (uword));
+  lm->lex_tokens_by_name = hash_create_string (0, sizeof (uword));
+  lm->lex_keywords = hash_create_string (0, sizeof (uword));
+  lm->pushback_sp = -1;
+
+#define _(f) { u16 tmp = vlib_lex_add_token (lm, #f); ASSERT (tmp == VLIB_LEX_##f); }
+  foreach_vlib_lex_global_token;
+#undef _
+
+  vec_validate (lm->token_buffer, 127);
+  _vec_len (lm->token_buffer) = 0;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (lex_onetime_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/lex.h b/src/vlib/lex.h
new file mode 100644
index 00000000..4ae58f46
--- /dev/null
+++ b/src/vlib/lex.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vlib_lex_h
+#define included_vlib_lex_h
+
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/error.h>
+#include <vppinfra/pool.h>
+
+#define foreach_vlib_lex_global_token           \
+  _ (invalid)                                   \
+  _ (eof)                                       \
+  _ (word)                                      \
+  _ (number)                                    \
+  _ (lt)                                        \
+  _ (gt)                                        \
+  _ (dot)                                       \
+  _ (slash)                                     \
+  _ (qmark)                                     \
+  _ (equals)                                    \
+  _ (plus)                                      \
+  _ (minus)                                     \
+  _ (star)                                      \
+  _ (lpar)                                      \
+  _ (rpar)
+
+typedef enum
+{
+#define _(f) VLIB_LEX_##f,
+  foreach_vlib_lex_global_token
+#undef _
+} vlib_lex_global_token_t;
+
+typedef enum
+{
+  VLIB_LEX_IGNORE,
+  VLIB_LEX_ADD_TO_TOKEN,
+  VLIB_LEX_RETURN,
+  VLIB_LEX_RETURN_AND_RESCAN,
+  VLIB_LEX_KEYWORD_CHECK,
+  VLIB_LEX_START_NUMBER,
+  VLIB_LEX_ADD_TO_NUMBER,
+} vlib_lex_action_t;
+
+typedef struct
+{
+  u16 action;
+  u16 next_table_index;
+  u16 token;
+} vlib_lex_table_entry_t;
+
+typedef struct
+{
+  char *name;
+  vlib_lex_table_entry_t entries[128];
+} vlib_lex_table_t;
+
+typedef struct
+{
+  u32 token;
+
+  union
+  {
+    uword as_uword;
+    void *as_pointer;
+    char *as_string;
+  } value;
+} vlib_lex_token_t;
+
+typedef struct
+{
+  vlib_lex_table_t *lex_tables;
+  uword *lex_tables_by_name;
+
+  /* Vector of token strings. */
+  char **lex_token_names;
+
+  /* Hash mapping c string name to token index. */
+  uword *lex_tokens_by_name;
+
+  /* Hash mapping c string keyword name to token index. */
+  uword *lex_keywords;
+
+  vlib_lex_token_t *pushback_vector;
+
+  i32 pushback_sp;
+
+  u32 current_table_index;
+
+  uword current_token_value;
+
+  uword current_number_base;
+
+  /* Input string we are lex-ing. */
+  u8 *input_vector;
+
+  /* Current index into input vector. */
+  u32 current_index;
+
+  /* Re-used vector for forming token strings and hashing them. */
+  u8 *token_buffer;
+} vlib_lex_main_t;
+
+vlib_lex_main_t vlib_lex_main;
+
+always_inline void
+vlib_lex_cleanup_token (vlib_lex_token_t * t)
+{
+  if (t->token == VLIB_LEX_word)
+    {
+      u8 *tv = t->value.as_pointer;
+      vec_free (tv);
+    }
+}
+
+u16 vlib_lex_add_table (char *name);
+void vlib_lex_get_token (vlib_lex_main_t * lm, vlib_lex_token_t * result);
+u16 vlib_lex_add_token (vlib_lex_main_t * lm, char *token_name);
+void vlib_lex_set_action_range (u32 table_index, u8 lo, u8 hi, u16 action,
+				u16 token, u32 next_table_index);
+void vlib_lex_reset (vlib_lex_main_t * lm, u8 * input_vector);
+format_function_t format_vlib_lex_token;
+
+#endif /* included_vlib_lex_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/main.c b/src/vlib/main.c
new file mode 100644
index 00000000..6c6cad98
--- /dev/null
+++ b/src/vlib/main.c
@@ -0,0 +1,1703 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * main.c: main vector processing loop
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <math.h>
+#include <vppinfra/format.h>
+#include <vlib/vlib.h>
+#include <vlib/threads.h>
+
+#include <vlib/unix/cj.h>
+
+CJ_GLOBAL_LOG_PROTOTYPE;
+
+/* Actually allocate a few extra slots of vector data to support
+   speculative vector enqueues which overflow vector data in next frame. */
+#define VLIB_FRAME_SIZE_ALLOC (VLIB_FRAME_SIZE + 4)
+
+u32 wraps;
+
+always_inline u32
+vlib_frame_bytes (u32 n_scalar_bytes, u32 n_vector_bytes)
+{
+  u32 n_bytes;
+
+  /* Make room for vlib_frame_t plus scalar arguments. */
+  n_bytes = vlib_frame_vector_byte_offset (n_scalar_bytes);
+
+  /* Make room for vector arguments.
+     Allocate a few extra slots of vector data to support
+     speculative vector enqueues which overflow vector data in next frame. */
+#define VLIB_FRAME_SIZE_EXTRA 4
+  n_bytes += (VLIB_FRAME_SIZE + VLIB_FRAME_SIZE_EXTRA) * n_vector_bytes;
+
+  /* Magic number is first 32bit number after vector data.
+     Used to make sure that vector data is never overrun. */
+#define VLIB_FRAME_MAGIC (0xabadc0ed)
+  n_bytes += sizeof (u32);
+
+  /* Pad to cache line. */
+  n_bytes = round_pow2 (n_bytes, CLIB_CACHE_LINE_BYTES);
+
+  return n_bytes;
+}
+
+always_inline u32 *
+vlib_frame_find_magic (vlib_frame_t * f, vlib_node_t * node)
+{
+  void *p = f;
+
+  p += vlib_frame_vector_byte_offset (node->scalar_size);
+
+  p += (VLIB_FRAME_SIZE + VLIB_FRAME_SIZE_EXTRA) * node->vector_size;
+
+  return p;
+}
+
+static vlib_frame_size_t *
+get_frame_size_info (vlib_node_main_t * nm,
+		     u32 n_scalar_bytes, u32 n_vector_bytes)
+{
+  uword key = (n_scalar_bytes << 16) | n_vector_bytes;
+  uword *p, i;
+
+  p = hash_get (nm->frame_size_hash, key);
+  if (p)
+    i = p[0];
+  else
+    {
+      i = vec_len (nm->frame_sizes);
+      vec_validate (nm->frame_sizes, i);
+      hash_set (nm->frame_size_hash, key, i);
+    }
+
+  return vec_elt_at_index (nm->frame_sizes, i);
+}
+
+static u32
+vlib_frame_alloc_to_node (vlib_main_t * vm, u32 to_node_index,
+			  u32 frame_flags)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_frame_size_t *fs;
+  vlib_node_t *to_node;
+  vlib_frame_t *f;
+  u32 fi, l, n, scalar_size, vector_size;
+
+  to_node = vlib_get_node (vm, to_node_index);
+
+  scalar_size = to_node->scalar_size;
+  vector_size = to_node->vector_size;
+
+  fs = get_frame_size_info (nm, scalar_size, vector_size);
+  n = vlib_frame_bytes (scalar_size, vector_size);
+  if ((l = vec_len (fs->free_frame_indices)) > 0)
+    {
+      /* Allocate from end of free list. */
+      fi = fs->free_frame_indices[l - 1];
+      f = vlib_get_frame_no_check (vm, fi);
+      _vec_len (fs->free_frame_indices) = l - 1;
+    }
+  else
+    {
+      f = clib_mem_alloc_aligned_no_fail (n, VLIB_FRAME_ALIGN);
+      f->cpu_index = vm->cpu_index;
+      fi = vlib_frame_index_no_check (vm, f);
+    }
+
+  /* Poison frame when debugging. */
+  if (CLIB_DEBUG > 0)
+    {
+      u32 save_cpu_index = f->cpu_index;
+
+      memset (f, 0xfe, n);
+
+      f->cpu_index = save_cpu_index;
+    }
+
+  /* Insert magic number. */
+  {
+    u32 *magic;
+
+    magic = vlib_frame_find_magic (f, to_node);
+    *magic = VLIB_FRAME_MAGIC;
+  }
+
+  f->flags = VLIB_FRAME_IS_ALLOCATED | frame_flags;
+  f->n_vectors = 0;
+  f->scalar_size = scalar_size;
+  f->vector_size = vector_size;
+
+  fs->n_alloc_frames += 1;
+
+  return fi;
+}
+
+/* Allocate a frame for from FROM_NODE to TO_NODE via TO_NEXT_INDEX.
+   Returns frame index. */
+static u32
+vlib_frame_alloc (vlib_main_t * vm, vlib_node_runtime_t * from_node_runtime,
+		  u32 to_next_index)
+{
+  vlib_node_t *from_node;
+
+  from_node = vlib_get_node (vm, from_node_runtime->node_index);
+  ASSERT (to_next_index < vec_len (from_node->next_nodes));
+
+  return vlib_frame_alloc_to_node (vm, from_node->next_nodes[to_next_index],
+				   /* frame_flags */ 0);
+}
+
+vlib_frame_t *
+vlib_get_frame_to_node (vlib_main_t * vm, u32 to_node_index)
+{
+  u32 fi = vlib_frame_alloc_to_node (vm, to_node_index,
+				     /* frame_flags */
+				     VLIB_FRAME_FREE_AFTER_DISPATCH);
+  return vlib_get_frame (vm, fi);
+}
+
+void
+vlib_put_frame_to_node (vlib_main_t * vm, u32 to_node_index, vlib_frame_t * f)
+{
+  vlib_pending_frame_t *p;
+  vlib_node_t *to_node;
+
+  if (f->n_vectors == 0)
+    return;
+
+  to_node = vlib_get_node (vm, to_node_index);
+
+  vec_add2 (vm->node_main.pending_frames, p, 1);
+
+  f->flags |= VLIB_FRAME_PENDING;
+  p->frame_index = vlib_frame_index (vm, f);
+  p->node_runtime_index = to_node->runtime_index;
+  p->next_frame_index = VLIB_PENDING_FRAME_NO_NEXT_FRAME;
+}
+
+/* Free given frame. */
+void
+vlib_frame_free (vlib_main_t * vm, vlib_node_runtime_t * r, vlib_frame_t * f)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *node;
+  vlib_frame_size_t *fs;
+  u32 frame_index;
+
+  ASSERT (f->flags & VLIB_FRAME_IS_ALLOCATED);
+
+  node = vlib_get_node (vm, r->node_index);
+  fs = get_frame_size_info (nm, node->scalar_size, node->vector_size);
+
+  frame_index = vlib_frame_index (vm, f);
+
+  ASSERT (f->flags & VLIB_FRAME_IS_ALLOCATED);
+
+  /* No next frames may point to freed frame. */
+  if (CLIB_DEBUG > 0)
+    {
+      vlib_next_frame_t *nf;
+      vec_foreach (nf, vm->node_main.next_frames)
+	ASSERT (nf->frame_index != frame_index);
+    }
+
+  f->flags &= ~VLIB_FRAME_IS_ALLOCATED;
+
+  vec_add1 (fs->free_frame_indices, frame_index);
+  ASSERT (fs->n_alloc_frames > 0);
+  fs->n_alloc_frames -= 1;
+}
+
+static clib_error_t *
+show_frame_stats (vlib_main_t * vm,
+		  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_frame_size_t *fs;
+
+  vlib_cli_output (vm, "%=6s%=12s%=12s", "Size", "# Alloc", "# Free");
+  vec_foreach (fs, nm->frame_sizes)
+  {
+    u32 n_alloc = fs->n_alloc_frames;
+    u32 n_free = vec_len (fs->free_frame_indices);
+
+    if (n_alloc + n_free > 0)
+      vlib_cli_output (vm, "%=6d%=12d%=12d",
+		       fs - nm->frame_sizes, n_alloc, n_free);
+  }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_frame_stats_cli, static) = {
+  .path = "show vlib frame-allocation",
+  .short_help = "Show node dispatch frame statistics",
+  .function = show_frame_stats,
+};
+/* *INDENT-ON* */
+
+/* Change ownership of enqueue rights to given next node. */
+static void
+vlib_next_frame_change_ownership (vlib_main_t * vm,
+				  vlib_node_runtime_t * node_runtime,
+				  u32 next_index)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_next_frame_t *next_frame;
+  vlib_node_t *node, *next_node;
+
+  node = vec_elt (nm->nodes, node_runtime->node_index);
+
+  /* Only internal & input nodes are allowed to call other nodes. */
+  ASSERT (node->type == VLIB_NODE_TYPE_INTERNAL
+	  || node->type == VLIB_NODE_TYPE_INPUT
+	  || node->type == VLIB_NODE_TYPE_PROCESS);
+
+  ASSERT (vec_len (node->next_nodes) == node_runtime->n_next_nodes);
+
+  next_frame =
+    vlib_node_runtime_get_next_frame (vm, node_runtime, next_index);
+  next_node = vec_elt (nm->nodes, node->next_nodes[next_index]);
+
+  if (next_node->owner_node_index != VLIB_INVALID_NODE_INDEX)
+    {
+      /* Get frame from previous owner. */
+      vlib_next_frame_t *owner_next_frame;
+      vlib_next_frame_t tmp;
+
+      owner_next_frame =
+	vlib_node_get_next_frame (vm,
+				  next_node->owner_node_index,
+				  next_node->owner_next_index);
+
+      /* Swap target next frame with owner's. */
+      tmp = owner_next_frame[0];
+      owner_next_frame[0] = next_frame[0];
+      next_frame[0] = tmp;
+
+      /*
+       * If next_frame is already pending, we have to track down
+       * all pending frames and fix their next_frame_index fields.
+       */
+      if (next_frame->flags & VLIB_FRAME_PENDING)
+	{
+	  vlib_pending_frame_t *p;
+	  if (next_frame->frame_index != ~0)
+	    {
+	      vec_foreach (p, nm->pending_frames)
+	      {
+		if (p->frame_index == next_frame->frame_index)
+		  {
+		    p->next_frame_index =
+		      next_frame - vm->node_main.next_frames;
+		  }
+	      }
+	    }
+	}
+    }
+  else
+    {
+      /* No previous owner. Take ownership. */
+      next_frame->flags |= VLIB_FRAME_OWNER;
+    }
+
+  /* Record new owner. */
+  next_node->owner_node_index = node->index;
+  next_node->owner_next_index = next_index;
+
+  /* Now we should be owner. */
+  ASSERT (next_frame->flags & VLIB_FRAME_OWNER);
+}
+
+/* Make sure that magic number is still there.
+   Otherwise, it is likely that caller has overrun frame arguments. */
+always_inline void
+validate_frame_magic (vlib_main_t * vm,
+		      vlib_frame_t * f, vlib_node_t * n, uword next_index)
+{
+  vlib_node_t *next_node = vlib_get_node (vm, n->next_nodes[next_index]);
+  u32 *magic = vlib_frame_find_magic (f, next_node);
+  ASSERT (VLIB_FRAME_MAGIC == magic[0]);
+}
+
+vlib_frame_t *
+vlib_get_next_frame_internal (vlib_main_t * vm,
+			      vlib_node_runtime_t * node,
+			      u32 next_index, u32 allocate_new_next_frame)
+{
+  vlib_frame_t *f;
+  vlib_next_frame_t *nf;
+  u32 n_used;
+
+  nf = vlib_node_runtime_get_next_frame (vm, node, next_index);
+
+  /* Make sure this next frame owns right to enqueue to destination frame. */
+  if (PREDICT_FALSE (!(nf->flags & VLIB_FRAME_OWNER)))
+    vlib_next_frame_change_ownership (vm, node, next_index);
+
+  /* ??? Don't need valid flag: can use frame_index == ~0 */
+  if (PREDICT_FALSE (!(nf->flags & VLIB_FRAME_IS_ALLOCATED)))
+    {
+      nf->frame_index = vlib_frame_alloc (vm, node, next_index);
+      nf->flags |= VLIB_FRAME_IS_ALLOCATED;
+    }
+
+  f = vlib_get_frame (vm, nf->frame_index);
+
+  /* Has frame been removed from pending vector (e.g. finished dispatching)?
+     If so we can reuse frame. */
+  if ((nf->flags & VLIB_FRAME_PENDING) && !(f->flags & VLIB_FRAME_PENDING))
+    {
+      nf->flags &= ~VLIB_FRAME_PENDING;
+      f->n_vectors = 0;
+    }
+
+  /* Allocate new frame if current one is already full. */
+  n_used = f->n_vectors;
+  if (n_used >= VLIB_FRAME_SIZE || (allocate_new_next_frame && n_used > 0))
+    {
+      /* Old frame may need to be freed after dispatch, since we'll have
+         two redundant frames from node -> next node. */
+      if (!(nf->flags & VLIB_FRAME_NO_FREE_AFTER_DISPATCH))
+	{
+	  vlib_frame_t *f_old = vlib_get_frame (vm, nf->frame_index);
+	  f_old->flags |= VLIB_FRAME_FREE_AFTER_DISPATCH;
+	}
+
+      /* Allocate new frame to replace full one. */
+      nf->frame_index = vlib_frame_alloc (vm, node, next_index);
+      f = vlib_get_frame (vm, nf->frame_index);
+      n_used = f->n_vectors;
+    }
+
+  /* Should have free vectors in frame now. */
+  ASSERT (n_used < VLIB_FRAME_SIZE);
+
+  if (CLIB_DEBUG > 0)
+    {
+      validate_frame_magic (vm, f,
+			    vlib_get_node (vm, node->node_index), next_index);
+    }
+
+  return f;
+}
+
+static void
+vlib_put_next_frame_validate (vlib_main_t * vm,
+			      vlib_node_runtime_t * rt,
+			      u32 next_index, u32 n_vectors_left)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_next_frame_t *nf;
+  vlib_frame_t *f;
+  vlib_node_runtime_t *next_rt;
+  vlib_node_t *next_node;
+  u32 n_before, n_after;
+
+  nf = vlib_node_runtime_get_next_frame (vm, rt, next_index);
+  f = vlib_get_frame (vm, nf->frame_index);
+
+  ASSERT (n_vectors_left <= VLIB_FRAME_SIZE);
+  n_after = VLIB_FRAME_SIZE - n_vectors_left;
+  n_before = f->n_vectors;
+
+  ASSERT (n_after >= n_before);
+
+  next_rt = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL],
+			      nf->node_runtime_index);
+  next_node = vlib_get_node (vm, next_rt->node_index);
+  if (n_after > 0 && next_node->validate_frame)
+    {
+      u8 *msg = next_node->validate_frame (vm, rt, f);
+      if (msg)
+	{
+	  clib_warning ("%v", msg);
+	  ASSERT (0);
+	}
+      vec_free (msg);
+    }
+}
+
+void
+vlib_put_next_frame (vlib_main_t * vm,
+		     vlib_node_runtime_t * r,
+		     u32 next_index, u32 n_vectors_left)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_next_frame_t *nf;
+  vlib_frame_t *f;
+  u32 n_vectors_in_frame;
+
+  if (DPDK == 0 && CLIB_DEBUG > 0)
+    vlib_put_next_frame_validate (vm, r, next_index, n_vectors_left);
+
+  nf = vlib_node_runtime_get_next_frame (vm, r, next_index);
+  f = vlib_get_frame (vm, nf->frame_index);
+
+  /* Make sure that magic number is still there.  Otherwise, caller
+     has overrun frame meta data. */
+  if (CLIB_DEBUG > 0)
+    {
+      vlib_node_t *node = vlib_get_node (vm, r->node_index);
+      validate_frame_magic (vm, f, node, next_index);
+    }
+
+  /* Convert # of vectors left -> number of vectors there. */
+  ASSERT (n_vectors_left <= VLIB_FRAME_SIZE);
+  n_vectors_in_frame = VLIB_FRAME_SIZE - n_vectors_left;
+
+  f->n_vectors = n_vectors_in_frame;
+
+  /* If vectors were added to frame, add to pending vector. */
+  if (PREDICT_TRUE (n_vectors_in_frame > 0))
+    {
+      vlib_pending_frame_t *p;
+      u32 v0, v1;
+
+      r->cached_next_index = next_index;
+
+      if (!(f->flags & VLIB_FRAME_PENDING))
+	{
+	  __attribute__ ((unused)) vlib_node_t *node;
+	  vlib_node_t *next_node;
+	  vlib_node_runtime_t *next_runtime;
+
+	  node = vlib_get_node (vm, r->node_index);
+	  next_node = vlib_get_next_node (vm, r->node_index, next_index);
+	  next_runtime = vlib_node_get_runtime (vm, next_node->index);
+
+	  vec_add2 (nm->pending_frames, p, 1);
+
+	  p->frame_index = nf->frame_index;
+	  p->node_runtime_index = nf->node_runtime_index;
+	  p->next_frame_index = nf - nm->next_frames;
+	  nf->flags |= VLIB_FRAME_PENDING;
+	  f->flags |= VLIB_FRAME_PENDING;
+
+	  /*
+	   * If we're going to dispatch this frame on another thread,
+	   * force allocation of a new frame. Otherwise, we create
+	   * a dangling frame reference. Each thread has its own copy of
+	   * the next_frames vector.
+	   */
+	  if (0 && r->cpu_index != next_runtime->cpu_index)
+	    {
+	      nf->frame_index = ~0;
+	      nf->flags &= ~(VLIB_FRAME_PENDING | VLIB_FRAME_IS_ALLOCATED);
+	    }
+	}
+
+      /* Copy trace flag from next_frame and from runtime. */
+      nf->flags |=
+	(nf->flags & VLIB_NODE_FLAG_TRACE) | (r->
+					      flags & VLIB_NODE_FLAG_TRACE);
+
+      v0 = nf->vectors_since_last_overflow;
+      v1 = v0 + n_vectors_in_frame;
+      nf->vectors_since_last_overflow = v1;
+      if (PREDICT_FALSE (v1 < v0))
+	{
+	  vlib_node_t *node = vlib_get_node (vm, r->node_index);
+	  vec_elt (node->n_vectors_by_next_node, next_index) += v0;
+	}
+    }
+}
+
+/* Sync up runtime (32 bit counters) and main node stats (64 bit counters). */
+never_inline void
+vlib_node_runtime_sync_stats (vlib_main_t * vm,
+			      vlib_node_runtime_t * r,
+			      uword n_calls, uword n_vectors, uword n_clocks)
+{
+  vlib_node_t *n = vlib_get_node (vm, r->node_index);
+
+  n->stats_total.calls += n_calls + r->calls_since_last_overflow;
+  n->stats_total.vectors += n_vectors + r->vectors_since_last_overflow;
+  n->stats_total.clocks += n_clocks + r->clocks_since_last_overflow;
+  n->stats_total.max_clock = r->max_clock;
+  n->stats_total.max_clock_n = r->max_clock_n;
+
+  r->calls_since_last_overflow = 0;
+  r->vectors_since_last_overflow = 0;
+  r->clocks_since_last_overflow = 0;
+}
+
+always_inline void __attribute__ ((unused))
+vlib_process_sync_stats (vlib_main_t * vm,
+			 vlib_process_t * p,
+			 uword n_calls, uword n_vectors, uword n_clocks)
+{
+  vlib_node_runtime_t *rt = &p->node_runtime;
+  vlib_node_t *n = vlib_get_node (vm, rt->node_index);
+  vlib_node_runtime_sync_stats (vm, rt, n_calls, n_vectors, n_clocks);
+  n->stats_total.suspends += p->n_suspends;
+  p->n_suspends = 0;
+}
+
+void
+vlib_node_sync_stats (vlib_main_t * vm, vlib_node_t * n)
+{
+  vlib_node_runtime_t *rt;
+
+  if (n->type == VLIB_NODE_TYPE_PROCESS)
+    {
+      /* Nothing to do for PROCESS nodes except in main thread */
+      if (vm != &vlib_global_main)
+	return;
+
+      vlib_process_t *p = vlib_get_process_from_node (vm, n);
+      n->stats_total.suspends += p->n_suspends;
+      p->n_suspends = 0;
+      rt = &p->node_runtime;
+    }
+  else
+    rt =
+      vec_elt_at_index (vm->node_main.nodes_by_type[n->type],
+			n->runtime_index);
+
+  vlib_node_runtime_sync_stats (vm, rt, 0, 0, 0);
+
+  /* Sync up runtime next frame vector counters with main node structure. */
+  {
+    vlib_next_frame_t *nf;
+    uword i;
+    for (i = 0; i < rt->n_next_nodes; i++)
+      {
+	nf = vlib_node_runtime_get_next_frame (vm, rt, i);
+	vec_elt (n->n_vectors_by_next_node, i) +=
+	  nf->vectors_since_last_overflow;
+	nf->vectors_since_last_overflow = 0;
+      }
+  }
+}
+
+always_inline u32
+vlib_node_runtime_update_stats (vlib_main_t * vm,
+				vlib_node_runtime_t * node,
+				uword n_calls,
+				uword n_vectors, uword n_clocks)
+{
+  u32 ca0, ca1, v0, v1, cl0, cl1, r;
+
+  cl0 = cl1 = node->clocks_since_last_overflow;
+  ca0 = ca1 = node->calls_since_last_overflow;
+  v0 = v1 = node->vectors_since_last_overflow;
+
+  ca1 = ca0 + n_calls;
+  v1 = v0 + n_vectors;
+  cl1 = cl0 + n_clocks;
+
+  node->calls_since_last_overflow = ca1;
+  node->clocks_since_last_overflow = cl1;
+  node->vectors_since_last_overflow = v1;
+  node->max_clock_n = node->max_clock > n_clocks ?
+    node->max_clock_n : n_vectors;
+  node->max_clock = node->max_clock > n_clocks ? node->max_clock : n_clocks;
+
+  r = vlib_node_runtime_update_main_loop_vector_stats (vm, node, n_vectors);
+
+  if (PREDICT_FALSE (ca1 < ca0 || v1 < v0 || cl1 < cl0))
+    {
+      node->calls_since_last_overflow = ca0;
+      node->clocks_since_last_overflow = cl0;
+      node->vectors_since_last_overflow = v0;
+      vlib_node_runtime_sync_stats (vm, node, n_calls, n_vectors, n_clocks);
+    }
+
+  return r;
+}
+
+always_inline void
+vlib_process_update_stats (vlib_main_t * vm,
+			   vlib_process_t * p,
+			   uword n_calls, uword n_vectors, uword n_clocks)
+{
+  vlib_node_runtime_update_stats (vm, &p->node_runtime,
+				  n_calls, n_vectors, n_clocks);
+}
+
+static clib_error_t *
+vlib_cli_elog_clear (vlib_main_t * vm,
+		     unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  elog_reset_buffer (&vm->elog_main);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (elog_clear_cli, static) = {
+  .path = "event-logger clear",
+  .short_help = "Clear the event log",
+  .function = vlib_cli_elog_clear,
+};
+/* *INDENT-ON* */
+
+#ifdef CLIB_UNIX
+static clib_error_t *
+elog_save_buffer (vlib_main_t * vm,
+		  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  elog_main_t *em = &vm->elog_main;
+  char *file, *chroot_file;
+  clib_error_t *error = 0;
+
+  if (!unformat (input, "%s", &file))
+    {
+      vlib_cli_output (vm, "expected file name, got `%U'",
+		       format_unformat_error, input);
+      return 0;
+    }
+
+  /* It's fairly hard to get "../oopsie" through unformat; just in case */
+  if (strstr (file, "..") || index (file, '/'))
+    {
+      vlib_cli_output (vm, "illegal characters in filename '%s'", file);
+      return 0;
+    }
+
+  chroot_file = (char *) format (0, "/tmp/%s%c", file, 0);
+
+  vec_free (file);
+
+  vlib_cli_output (vm, "Saving %wd of %wd events to %s",
+		   elog_n_events_in_buffer (em),
+		   elog_buffer_capacity (em), chroot_file);
+
+  vlib_worker_thread_barrier_sync (vm);
+  error = elog_write_file (em, chroot_file);
+  vlib_worker_thread_barrier_release (vm);
+  vec_free (chroot_file);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (elog_save_cli, static) = {
+  .path = "event-logger save",
+  .short_help = "event-logger save <filename> (saves log in /tmp/<filename>)",
+  .function = elog_save_buffer,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+elog_stop (vlib_main_t * vm,
+	   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  elog_main_t *em = &vm->elog_main;
+
+  em->n_total_events_disable_limit = em->n_total_events;
+
+  vlib_cli_output (vm, "Stopped the event logger...");
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (elog_stop_cli, static) = {
+  .path = "event-logger stop",
+  .short_help = "Stop the event-logger",
+  .function = elog_stop,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+elog_restart (vlib_main_t * vm,
+	      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  elog_main_t *em = &vm->elog_main;
+
+  em->n_total_events_disable_limit = ~0;
+
+  vlib_cli_output (vm, "Restarted the event logger...");
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (elog_restart_cli, static) = {
+  .path = "event-logger restart",
+  .short_help = "Restart the event-logger",
+  .function = elog_restart,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+elog_resize (vlib_main_t * vm,
+	     unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  elog_main_t *em = &vm->elog_main;
+  u32 tmp;
+
+  /* Stop the parade */
+  elog_reset_buffer (&vm->elog_main);
+
+  if (unformat (input, "%d", &tmp))
+    {
+      elog_alloc (em, tmp);
+      em->n_total_events_disable_limit = ~0;
+    }
+  else
+    return clib_error_return (0, "Must specify how many events in the ring");
+
+  vlib_cli_output (vm, "Resized ring and restarted the event logger...");
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (elog_resize_cli, static) = {
+  .path = "event-logger resize",
+  .short_help = "event-logger resize <nnn>",
+  .function = elog_resize,
+};
+/* *INDENT-ON* */
+
+#endif /* CLIB_UNIX */
+
+static void
+elog_show_buffer_internal (vlib_main_t * vm, u32 n_events_to_show)
+{
+  elog_main_t *em = &vm->elog_main;
+  elog_event_t *e, *es;
+  f64 dt;
+
+  /* Show events in VLIB time since log clock starts after VLIB clock. */
+  dt = (em->init_time.cpu - vm->clib_time.init_cpu_time)
+    * vm->clib_time.seconds_per_clock;
+
+  es = elog_peek_events (em);
+  vlib_cli_output (vm, "%d of %d events in buffer, logger %s", vec_len (es),
+		   em->event_ring_size,
+		   em->n_total_events < em->n_total_events_disable_limit ?
+		   "running" : "stopped");
+  vec_foreach (e, es)
+  {
+    vlib_cli_output (vm, "%18.9f: %U",
+		     e->time + dt, format_elog_event, em, e);
+    n_events_to_show--;
+    if (n_events_to_show == 0)
+      break;
+  }
+  vec_free (es);
+
+}
+
+static clib_error_t *
+elog_show_buffer (vlib_main_t * vm,
+		  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  u32 n_events_to_show;
+  clib_error_t *error = 0;
+
+  n_events_to_show = 250;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%d", &n_events_to_show))
+	;
+      else if (unformat (input, "all"))
+	n_events_to_show = ~0;
+      else
+	return unformat_parse_error (input);
+    }
+  elog_show_buffer_internal (vm, n_events_to_show);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (elog_show_cli, static) = {
+  .path = "show event-logger",
+  .short_help = "Show event logger info",
+  .function = elog_show_buffer,
+};
+/* *INDENT-ON* */
+
+void
+vlib_gdb_show_event_log (void)
+{
+  elog_show_buffer_internal (vlib_get_main (), (u32) ~ 0);
+}
+
+static inline void
+vlib_elog_main_loop_event (vlib_main_t * vm,
+			   u32 node_index,
+			   u64 time, u32 n_vectors, u32 is_return)
+{
+  vlib_main_t *evm = &vlib_global_main;
+  elog_main_t *em = &evm->elog_main;
+
+  if (VLIB_ELOG_MAIN_LOOP && n_vectors)
+    elog_track (em,
+		/* event type */
+		vec_elt_at_index (is_return
+				  ? evm->node_return_elog_event_types
+				  : evm->node_call_elog_event_types,
+				  node_index),
+		/* track */
+		(vm->cpu_index ? &vlib_worker_threads[vm->cpu_index].
+		 elog_track : &em->default_track),
+		/* data to log */ n_vectors);
+}
+
+void
+vlib_dump_context_trace (vlib_main_t * vm, u32 bi)
+{
+  vlib_node_main_t *vnm = &vm->node_main;
+  vlib_buffer_t *b;
+  u8 i, n;
+
+  if (VLIB_BUFFER_TRACE_TRAJECTORY)
+    {
+      b = vlib_get_buffer (vm, bi);
+      n = b->pre_data[0];
+
+      fformat (stderr, "Context trace for bi %d b 0x%llx, visited %d\n",
+	       bi, b, n);
+
+      if (n == 0 || n > 20)
+	{
+	  fformat (stderr, "n is unreasonable\n");
+	  return;
+	}
+
+
+      for (i = 0; i < n; i++)
+	{
+	  u32 node_index;
+
+	  node_index = b->pre_data[i + 1];
+
+	  if (node_index > vec_len (vnm->nodes))
+	    {
+	      fformat (stderr, "Skip bogus node index %d\n", node_index);
+	      continue;
+	    }
+
+	  fformat (stderr, "%v (%d)\n", vnm->nodes[node_index]->name,
+		   node_index);
+	}
+    }
+  else
+    {
+      fformat (stderr,
+	       "in vlib/buffers.h, #define VLIB_BUFFER_TRACE_TRAJECTORY 1\n");
+    }
+}
+
+
+/* static_always_inline */ u64
+dispatch_node (vlib_main_t * vm,
+	       vlib_node_runtime_t * node,
+	       vlib_node_type_t type,
+	       vlib_node_state_t dispatch_state,
+	       vlib_frame_t * frame, u64 last_time_stamp)
+{
+  uword n, v;
+  u64 t;
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_next_frame_t *nf;
+
+  if (CLIB_DEBUG > 0)
+    {
+      vlib_node_t *n = vlib_get_node (vm, node->node_index);
+      ASSERT (n->type == type);
+    }
+
+  /* Only non-internal nodes may be disabled. */
+  if (type != VLIB_NODE_TYPE_INTERNAL && node->state != dispatch_state)
+    {
+      ASSERT (type != VLIB_NODE_TYPE_INTERNAL);
+      return last_time_stamp;
+    }
+
+  if ((type == VLIB_NODE_TYPE_PRE_INPUT || type == VLIB_NODE_TYPE_INPUT)
+      && dispatch_state != VLIB_NODE_STATE_INTERRUPT)
+    {
+      u32 c = node->input_main_loops_per_call;
+      /* Only call node when count reaches zero. */
+      if (c)
+	{
+	  node->input_main_loops_per_call = c - 1;
+	  return last_time_stamp;
+	}
+    }
+
+  /* Speculatively prefetch next frames. */
+  if (node->n_next_nodes > 0)
+    {
+      nf = vec_elt_at_index (nm->next_frames, node->next_frame_index);
+      CLIB_PREFETCH (nf, 4 * sizeof (nf[0]), WRITE);
+    }
+
+  vm->cpu_time_last_node_dispatch = last_time_stamp;
+
+  if (1 /* || vm->cpu_index == node->cpu_index */ )
+    {
+      vlib_main_t *stat_vm;
+
+      stat_vm = /* vlib_mains ? vlib_mains[0] : */ vm;
+
+      vlib_elog_main_loop_event (vm, node->node_index,
+				 last_time_stamp,
+				 frame ? frame->n_vectors : 0,
+				 /* is_after */ 0);
+
+      /*
+       * Turn this on if you run into
+       * "bad monkey" contexts, and you want to know exactly
+       * which nodes they've visited... See ixge.c...
+       */
+      if (VLIB_BUFFER_TRACE_TRAJECTORY && frame)
+	{
+	  int i;
+	  int log_index;
+	  u32 *from;
+	  from = vlib_frame_vector_args (frame);
+	  for (i = 0; i < frame->n_vectors; i++)
+	    {
+	      vlib_buffer_t *b = vlib_get_buffer (vm, from[i]);
+	      ASSERT (b->pre_data[0] < 32);
+	      log_index = b->pre_data[0]++ + 1;
+	      b->pre_data[log_index] = node->node_index;
+	    }
+	  n = node->function (vm, node, frame);
+	}
+      else
+	n = node->function (vm, node, frame);
+
+      t = clib_cpu_time_now ();
+
+      vlib_elog_main_loop_event (vm, node->node_index, t, n,	/* is_after */
+				 1);
+
+      vm->main_loop_vectors_processed += n;
+      vm->main_loop_nodes_processed += n > 0;
+
+      v = vlib_node_runtime_update_stats (stat_vm, node,
+					  /* n_calls */ 1,
+					  /* n_vectors */ n,
+					  /* n_clocks */ t - last_time_stamp);
+
+      /* When in interrupt mode and vector rate crosses threshold switch to
+         polling mode. */
+      if ((DPDK == 0 && dispatch_state == VLIB_NODE_STATE_INTERRUPT)
+	  || (DPDK == 0 && dispatch_state == VLIB_NODE_STATE_POLLING
+	      && (node->flags
+		  & VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE)))
+	{
+	  ELOG_TYPE_DECLARE (e) =
+	  {
+	    .function = (char *) __FUNCTION__,.format =
+	      "%s vector length %d, switching to %s",.format_args =
+	      "T4i4t4",.n_enum_strings = 2,.enum_strings =
+	    {
+	  "interrupt", "polling",},};
+	  struct
+	  {
+	    u32 node_name, vector_length, is_polling;
+	  } *ed;
+
+	  if (dispatch_state == VLIB_NODE_STATE_INTERRUPT
+	      && v >= nm->polling_threshold_vector_length)
+	    {
+	      vlib_node_t *n = vlib_get_node (vm, node->node_index);
+	      n->state = VLIB_NODE_STATE_POLLING;
+	      node->state = VLIB_NODE_STATE_POLLING;
+	      ASSERT (!
+		      (node->flags &
+		       VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE));
+	      node->flags &=
+		~VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE;
+	      node->flags |=
+		VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE;
+	      nm->input_node_counts_by_state[VLIB_NODE_STATE_INTERRUPT] -= 1;
+	      nm->input_node_counts_by_state[VLIB_NODE_STATE_POLLING] += 1;
+
+	      ed = ELOG_DATA (&vm->elog_main, e);
+	      ed->node_name = n->name_elog_string;
+	      ed->vector_length = v;
+	      ed->is_polling = 1;
+	    }
+	  else if (dispatch_state == VLIB_NODE_STATE_POLLING
+		   && v <= nm->interrupt_threshold_vector_length)
+	    {
+	      vlib_node_t *n = vlib_get_node (vm, node->node_index);
+	      if (node->flags &
+		  VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE)
+		{
+		  /* Switch to interrupt mode after dispatch in polling one more time.
+		     This allows driver to re-enable interrupts. */
+		  n->state = VLIB_NODE_STATE_INTERRUPT;
+		  node->state = VLIB_NODE_STATE_INTERRUPT;
+		  node->flags &=
+		    ~VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE;
+		  nm->input_node_counts_by_state[VLIB_NODE_STATE_POLLING] -=
+		    1;
+		  nm->input_node_counts_by_state[VLIB_NODE_STATE_INTERRUPT] +=
+		    1;
+
+		}
+	      else
+		{
+		  node->flags |=
+		    VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE;
+		  ed = ELOG_DATA (&vm->elog_main, e);
+		  ed->node_name = n->name_elog_string;
+		  ed->vector_length = v;
+		  ed->is_polling = 0;
+		}
+	    }
+	}
+    }
+
+  return t;
+}
+
+/* static */ u64
+dispatch_pending_node (vlib_main_t * vm,
+		       vlib_pending_frame_t * p, u64 last_time_stamp)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_frame_t *f;
+  vlib_next_frame_t *nf, nf_dummy;
+  vlib_node_runtime_t *n;
+  u32 restore_frame_index;
+
+  n = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL],
+			p->node_runtime_index);
+
+  f = vlib_get_frame (vm, p->frame_index);
+  if (p->next_frame_index == VLIB_PENDING_FRAME_NO_NEXT_FRAME)
+    {
+      /* No next frame: so use dummy on stack. */
+      nf = &nf_dummy;
+      nf->flags = f->flags & VLIB_NODE_FLAG_TRACE;
+      nf->frame_index = ~p->frame_index;
+    }
+  else
+    nf = vec_elt_at_index (nm->next_frames, p->next_frame_index);
+
+  ASSERT (f->flags & VLIB_FRAME_IS_ALLOCATED);
+
+  /* Force allocation of new frame while current frame is being
+     dispatched. */
+  restore_frame_index = ~0;
+  if (nf->frame_index == p->frame_index)
+    {
+      nf->frame_index = ~0;
+      nf->flags &= ~VLIB_FRAME_IS_ALLOCATED;
+      if (!(n->flags & VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH))
+	restore_frame_index = p->frame_index;
+    }
+
+  /* Frame must be pending. */
+  ASSERT (f->flags & VLIB_FRAME_PENDING);
+  ASSERT (f->n_vectors > 0);
+
+  /* Copy trace flag from next frame to node.
+     Trace flag indicates that at least one vector in the dispatched
+     frame is traced. */
+  n->flags &= ~VLIB_NODE_FLAG_TRACE;
+  n->flags |= (nf->flags & VLIB_FRAME_TRACE) ? VLIB_NODE_FLAG_TRACE : 0;
+  nf->flags &= ~VLIB_FRAME_TRACE;
+
+  last_time_stamp = dispatch_node (vm, n,
+				   VLIB_NODE_TYPE_INTERNAL,
+				   VLIB_NODE_STATE_POLLING,
+				   f, last_time_stamp);
+
+  f->flags &= ~VLIB_FRAME_PENDING;
+
+  /* Frame is ready to be used again, so restore it. */
+  if (restore_frame_index != ~0)
+    {
+      /* we musn't restore a frame that is flagged to be freed. This shouldn't
+         happen since frames to be freed post dispatch are those used
+         when the to-node frame becomes full i.e. they form a sort of queue of
+         frames to a single node. If we get here then the to-node frame and the
+         pending frame *were* the same, and so we removed the to-node frame.
+         Therefore this frame is no longer part of the queue for that node
+         and hence it cannot be it's overspill.
+       */
+      ASSERT (!(f->flags & VLIB_FRAME_FREE_AFTER_DISPATCH));
+
+      /* p->next_frame_index can change during node dispatch if node
+         function decides to change graph hook up. */
+      nf = vec_elt_at_index (nm->next_frames, p->next_frame_index);
+      nf->flags |= VLIB_FRAME_IS_ALLOCATED;
+
+      if (~0 == nf->frame_index)
+	{
+	  /* no new frame has been assigned to this node, use the saved one */
+	  nf->frame_index = restore_frame_index;
+	  f->n_vectors = 0;
+	}
+      else
+	{
+	  /* The node has gained a frame, implying packets from the current frame
+	     were re-queued to this same node. we don't need the saved one
+	     anymore */
+	  vlib_frame_free (vm, n, f);
+	}
+    }
+  else
+    {
+      if (f->flags & VLIB_FRAME_FREE_AFTER_DISPATCH)
+	{
+	  ASSERT (!(n->flags & VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH));
+	  vlib_frame_free (vm, n, f);
+	}
+    }
+
+  return last_time_stamp;
+}
+
+always_inline uword
+vlib_process_stack_is_valid (vlib_process_t * p)
+{
+  return p->stack[0] == VLIB_PROCESS_STACK_MAGIC;
+}
+
+typedef struct
+{
+  vlib_main_t *vm;
+  vlib_process_t *process;
+  vlib_frame_t *frame;
+} vlib_process_bootstrap_args_t;
+
+/* Called in process stack. */
+static uword
+vlib_process_bootstrap (uword _a)
+{
+  vlib_process_bootstrap_args_t *a;
+  vlib_main_t *vm;
+  vlib_node_runtime_t *node;
+  vlib_frame_t *f;
+  vlib_process_t *p;
+  uword n;
+
+  a = uword_to_pointer (_a, vlib_process_bootstrap_args_t *);
+
+  vm = a->vm;
+  p = a->process;
+  f = a->frame;
+  node = &p->node_runtime;
+
+  n = node->function (vm, node, f);
+
+  ASSERT (vlib_process_stack_is_valid (p));
+
+  clib_longjmp (&p->return_longjmp, n);
+
+  return n;
+}
+
+/* Called in main stack. */
+static_always_inline uword
+vlib_process_startup (vlib_main_t * vm, vlib_process_t * p, vlib_frame_t * f)
+{
+  vlib_process_bootstrap_args_t a;
+  uword r;
+
+  a.vm = vm;
+  a.process = p;
+  a.frame = f;
+
+  r = clib_setjmp (&p->return_longjmp, VLIB_PROCESS_RETURN_LONGJMP_RETURN);
+  if (r == VLIB_PROCESS_RETURN_LONGJMP_RETURN)
+    r = clib_calljmp (vlib_process_bootstrap, pointer_to_uword (&a),
+		      (void *) p->stack + (1 << p->log2_n_stack_bytes));
+
+  return r;
+}
+
+static_always_inline uword
+vlib_process_resume (vlib_process_t * p)
+{
+  uword r;
+  p->flags &= ~(VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK
+		| VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT
+		| VLIB_PROCESS_RESUME_PENDING);
+  r = clib_setjmp (&p->return_longjmp, VLIB_PROCESS_RETURN_LONGJMP_RETURN);
+  if (r == VLIB_PROCESS_RETURN_LONGJMP_RETURN)
+    clib_longjmp (&p->resume_longjmp, VLIB_PROCESS_RESUME_LONGJMP_RESUME);
+  return r;
+}
+
+static u64
+dispatch_process (vlib_main_t * vm,
+		  vlib_process_t * p, vlib_frame_t * f, u64 last_time_stamp)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_runtime_t *node_runtime = &p->node_runtime;
+  vlib_node_t *node = vlib_get_node (vm, node_runtime->node_index);
+  u64 t;
+  uword n_vectors, is_suspend;
+
+  if (node->state != VLIB_NODE_STATE_POLLING
+      || (p->flags & (VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK
+		      | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT)))
+    return last_time_stamp;
+
+  p->flags |= VLIB_PROCESS_IS_RUNNING;
+
+  t = last_time_stamp;
+  vlib_elog_main_loop_event (vm, node_runtime->node_index, t,
+			     f ? f->n_vectors : 0, /* is_after */ 0);
+
+  /* Save away current process for suspend. */
+  nm->current_process_index = node->runtime_index;
+
+  n_vectors = vlib_process_startup (vm, p, f);
+
+  nm->current_process_index = ~0;
+
+  ASSERT (n_vectors != VLIB_PROCESS_RETURN_LONGJMP_RETURN);
+  is_suspend = n_vectors == VLIB_PROCESS_RETURN_LONGJMP_SUSPEND;
+  if (is_suspend)
+    {
+      vlib_pending_frame_t *pf;
+
+      n_vectors = 0;
+      pool_get (nm->suspended_process_frames, pf);
+      pf->node_runtime_index = node->runtime_index;
+      pf->frame_index = f ? vlib_frame_index (vm, f) : ~0;
+      pf->next_frame_index = ~0;
+
+      p->n_suspends += 1;
+      p->suspended_process_frame_index = pf - nm->suspended_process_frames;
+
+      if (p->flags & VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK)
+	timing_wheel_insert (&nm->timing_wheel, p->resume_cpu_time,
+			     vlib_timing_wheel_data_set_suspended_process
+			     (node->runtime_index));
+    }
+  else
+    p->flags &= ~VLIB_PROCESS_IS_RUNNING;
+
+  t = clib_cpu_time_now ();
+
+  vlib_elog_main_loop_event (vm, node_runtime->node_index, t, is_suspend,
+			     /* is_after */ 1);
+
+  vlib_process_update_stats (vm, p,
+			     /* n_calls */ !is_suspend,
+			     /* n_vectors */ n_vectors,
+			     /* n_clocks */ t - last_time_stamp);
+
+  return t;
+}
+
+void
+vlib_start_process (vlib_main_t * vm, uword process_index)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_process_t *p = vec_elt (nm->processes, process_index);
+  dispatch_process (vm, p, /* frame */ 0, /* cpu_time_now */ 0);
+}
+
+static u64
+dispatch_suspended_process (vlib_main_t * vm,
+			    uword process_index, u64 last_time_stamp)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_runtime_t *node_runtime;
+  vlib_node_t *node;
+  vlib_frame_t *f;
+  vlib_process_t *p;
+  vlib_pending_frame_t *pf;
+  u64 t, n_vectors, is_suspend;
+
+  t = last_time_stamp;
+
+  p = vec_elt (nm->processes, process_index);
+  if (PREDICT_FALSE (!(p->flags & VLIB_PROCESS_IS_RUNNING)))
+    return last_time_stamp;
+
+  ASSERT (p->flags & (VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK
+		      | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT));
+
+  pf =
+    pool_elt_at_index (nm->suspended_process_frames,
+		       p->suspended_process_frame_index);
+
+  node_runtime = &p->node_runtime;
+  node = vlib_get_node (vm, node_runtime->node_index);
+  f = pf->frame_index != ~0 ? vlib_get_frame (vm, pf->frame_index) : 0;
+
+  vlib_elog_main_loop_event (vm, node_runtime->node_index, t,
+			     f ? f->n_vectors : 0, /* is_after */ 0);
+
+  /* Save away current process for suspend. */
+  nm->current_process_index = node->runtime_index;
+
+  n_vectors = vlib_process_resume (p);
+  t = clib_cpu_time_now ();
+
+  nm->current_process_index = ~0;
+
+  is_suspend = n_vectors == VLIB_PROCESS_RETURN_LONGJMP_SUSPEND;
+  if (is_suspend)
+    {
+      /* Suspend it again. */
+      n_vectors = 0;
+      p->n_suspends += 1;
+      if (p->flags & VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK)
+	timing_wheel_insert (&nm->timing_wheel, p->resume_cpu_time,
+			     vlib_timing_wheel_data_set_suspended_process
+			     (node->runtime_index));
+    }
+  else
+    {
+      p->flags &= ~VLIB_PROCESS_IS_RUNNING;
+      p->suspended_process_frame_index = ~0;
+      pool_put (nm->suspended_process_frames, pf);
+    }
+
+  t = clib_cpu_time_now ();
+  vlib_elog_main_loop_event (vm, node_runtime->node_index, t, !is_suspend,
+			     /* is_after */ 1);
+
+  vlib_process_update_stats (vm, p,
+			     /* n_calls */ !is_suspend,
+			     /* n_vectors */ n_vectors,
+			     /* n_clocks */ t - last_time_stamp);
+
+  return t;
+}
+
+static void
+vlib_main_loop (vlib_main_t * vm)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  uword i;
+  u64 cpu_time_now;
+
+  /* Initialize pending node vector. */
+  vec_resize (nm->pending_frames, 32);
+  _vec_len (nm->pending_frames) = 0;
+
+  /* Mark time of main loop start. */
+  cpu_time_now = vm->clib_time.last_cpu_time;
+  vm->cpu_time_main_loop_start = cpu_time_now;
+
+  /* Arrange for first level of timing wheel to cover times we care
+     most about. */
+  nm->timing_wheel.min_sched_time = 10e-6;
+  nm->timing_wheel.max_sched_time = 10e-3;
+  timing_wheel_init (&nm->timing_wheel,
+		     cpu_time_now, vm->clib_time.clocks_per_second);
+
+  /* Pre-allocate expired nodes. */
+  vec_alloc (nm->data_from_advancing_timing_wheel, 32);
+  vec_alloc (nm->pending_interrupt_node_runtime_indices, 32);
+
+  if (!nm->polling_threshold_vector_length)
+    nm->polling_threshold_vector_length = 10;
+  if (!nm->interrupt_threshold_vector_length)
+    nm->interrupt_threshold_vector_length = 5;
+
+  nm->current_process_index = ~0;
+
+  /* Start all processes. */
+  {
+    uword i;
+    for (i = 0; i < vec_len (nm->processes); i++)
+      cpu_time_now =
+	dispatch_process (vm, nm->processes[i], /* frame */ 0, cpu_time_now);
+  }
+
+  while (1)
+    {
+      vlib_node_runtime_t *n;
+
+      /* Process pre-input nodes. */
+      vec_foreach (n, nm->nodes_by_type[VLIB_NODE_TYPE_PRE_INPUT])
+	cpu_time_now = dispatch_node (vm, n,
+				      VLIB_NODE_TYPE_PRE_INPUT,
+				      VLIB_NODE_STATE_POLLING,
+				      /* frame */ 0,
+				      cpu_time_now);
+
+      /* Next process input nodes. */
+      vec_foreach (n, nm->nodes_by_type[VLIB_NODE_TYPE_INPUT])
+	cpu_time_now = dispatch_node (vm, n,
+				      VLIB_NODE_TYPE_INPUT,
+				      VLIB_NODE_STATE_POLLING,
+				      /* frame */ 0,
+				      cpu_time_now);
+
+      if (PREDICT_TRUE (vm->queue_signal_pending == 0))
+	vm->queue_signal_callback (vm);
+
+      /* Next handle interrupts. */
+      {
+	uword l = _vec_len (nm->pending_interrupt_node_runtime_indices);
+	uword i;
+	if (l > 0)
+	  {
+	    _vec_len (nm->pending_interrupt_node_runtime_indices) = 0;
+	    for (i = 0; i < l; i++)
+	      {
+		n = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT],
+				      nm->
+				      pending_interrupt_node_runtime_indices
+				      [i]);
+		cpu_time_now =
+		  dispatch_node (vm, n, VLIB_NODE_TYPE_INPUT,
+				 VLIB_NODE_STATE_INTERRUPT,
+				 /* frame */ 0,
+				 cpu_time_now);
+	      }
+	  }
+      }
+
+      /* Check if process nodes have expired from timing wheel. */
+      nm->data_from_advancing_timing_wheel
+	= timing_wheel_advance (&nm->timing_wheel, cpu_time_now,
+				nm->data_from_advancing_timing_wheel,
+				&nm->cpu_time_next_process_ready);
+
+      ASSERT (nm->data_from_advancing_timing_wheel != 0);
+      if (PREDICT_FALSE (_vec_len (nm->data_from_advancing_timing_wheel) > 0))
+	{
+	  uword i;
+
+	processes_timing_wheel_data:
+	  for (i = 0; i < _vec_len (nm->data_from_advancing_timing_wheel);
+	       i++)
+	    {
+	      u32 d = nm->data_from_advancing_timing_wheel[i];
+	      u32 di = vlib_timing_wheel_data_get_index (d);
+
+	      if (vlib_timing_wheel_data_is_timed_event (d))
+		{
+		  vlib_signal_timed_event_data_t *te =
+		    pool_elt_at_index (nm->signal_timed_event_data_pool, di);
+		  vlib_node_t *n = vlib_get_node (vm, te->process_node_index);
+		  vlib_process_t *p =
+		    vec_elt (nm->processes, n->runtime_index);
+		  void *data;
+		  data =
+		    vlib_process_signal_event_helper (nm, n, p,
+						      te->event_type_index,
+						      te->n_data_elts,
+						      te->n_data_elt_bytes);
+		  if (te->n_data_bytes < sizeof (te->inline_event_data))
+		    clib_memcpy (data, te->inline_event_data,
+				 te->n_data_bytes);
+		  else
+		    {
+		      clib_memcpy (data, te->event_data_as_vector,
+				   te->n_data_bytes);
+		      vec_free (te->event_data_as_vector);
+		    }
+		  pool_put (nm->signal_timed_event_data_pool, te);
+		}
+	      else
+		{
+		  cpu_time_now = clib_cpu_time_now ();
+		  cpu_time_now =
+		    dispatch_suspended_process (vm, di, cpu_time_now);
+		}
+	    }
+
+	  /* Reset vector. */
+	  _vec_len (nm->data_from_advancing_timing_wheel) = 0;
+	}
+
+      /* Input nodes may have added work to the pending vector.
+         Process pending vector until there is nothing left.
+         All pending vectors will be processed from input -> output. */
+      for (i = 0; i < _vec_len (nm->pending_frames); i++)
+	cpu_time_now = dispatch_pending_node (vm, nm->pending_frames + i,
+					      cpu_time_now);
+      /* Reset pending vector for next iteration. */
+      _vec_len (nm->pending_frames) = 0;
+
+      /* Pending internal nodes may resume processes. */
+      if (_vec_len (nm->data_from_advancing_timing_wheel) > 0)
+	goto processes_timing_wheel_data;
+
+      vlib_increment_main_loop_counter (vm);
+
+      /* Record time stamp in case there are no enabled nodes and above
+         calls do not update time stamp. */
+      cpu_time_now = clib_cpu_time_now ();
+    }
+}
+
+vlib_main_t vlib_global_main;
+
+static clib_error_t *
+vlib_main_configure (vlib_main_t * vm, unformat_input_t * input)
+{
+  int turn_on_mem_trace = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "memory-trace"))
+	turn_on_mem_trace = 1;
+
+      else if (unformat (input, "elog-events %d",
+			 &vm->elog_main.event_ring_size))
+	;
+      else
+	return unformat_parse_error (input);
+    }
+
+  unformat_free (input);
+
+  /* Enable memory trace as early as possible. */
+  if (turn_on_mem_trace)
+    clib_mem_trace (1);
+
+  return 0;
+}
+
+VLIB_EARLY_CONFIG_FUNCTION (vlib_main_configure, "vlib");
+
+static void
+dummy_queue_signal_callback (vlib_main_t * vm)
+{
+}
+
+/* Main function. */
+int
+vlib_main (vlib_main_t * volatile vm, unformat_input_t * input)
+{
+  clib_error_t *volatile error;
+
+  vm->queue_signal_callback = dummy_queue_signal_callback;
+
+  clib_time_init (&vm->clib_time);
+
+  /* Turn on event log. */
+  if (!vm->elog_main.event_ring_size)
+    vm->elog_main.event_ring_size = 128 << 10;
+  elog_init (&vm->elog_main, vm->elog_main.event_ring_size);
+  elog_enable_disable (&vm->elog_main, 1);
+
+  /* Default name. */
+  if (!vm->name)
+    vm->name = "VLIB";
+
+  vec_validate (vm->buffer_main, 0);
+
+  if ((error = vlib_thread_init (vm)))
+    {
+      clib_error_report (error);
+      goto done;
+    }
+
+  /* Register static nodes so that init functions may use them. */
+  vlib_register_all_static_nodes (vm);
+
+  /* Set seed for random number generator.
+     Allow user to specify seed to make random sequence deterministic. */
+  if (!unformat (input, "seed %wd", &vm->random_seed))
+    vm->random_seed = clib_cpu_time_now ();
+  clib_random_buffer_init (&vm->random_buffer, vm->random_seed);
+
+  /* Initialize node graph. */
+  if ((error = vlib_node_main_init (vm)))
+    {
+      /* Arrange for graph hook up error to not be fatal when debugging. */
+      if (CLIB_DEBUG > 0)
+	clib_error_report (error);
+      else
+	goto done;
+    }
+
+  /* See unix/main.c; most likely already set up */
+  if (vm->init_functions_called == 0)
+    vm->init_functions_called = hash_create (0, /* value bytes */ 0);
+  if ((error = vlib_call_all_init_functions (vm)))
+    goto done;
+
+  /* Create default buffer free list. */
+  vlib_buffer_get_or_create_free_list (vm,
+				       VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES,
+				       "default");
+
+  switch (clib_setjmp (&vm->main_loop_exit, VLIB_MAIN_LOOP_EXIT_NONE))
+    {
+    case VLIB_MAIN_LOOP_EXIT_NONE:
+      vm->main_loop_exit_set = 1;
+      break;
+
+    case VLIB_MAIN_LOOP_EXIT_CLI:
+      goto done;
+
+    default:
+      error = vm->main_loop_error;
+      goto done;
+    }
+
+  if ((error = vlib_call_all_config_functions (vm, input, 0 /* is_early */ )))
+    goto done;
+
+  /* Call all main loop enter functions. */
+  {
+    clib_error_t *sub_error;
+    sub_error = vlib_call_all_main_loop_enter_functions (vm);
+    if (sub_error)
+      clib_error_report (sub_error);
+  }
+
+  vlib_main_loop (vm);
+
+done:
+  /* Call all exit functions. */
+  {
+    clib_error_t *sub_error;
+    sub_error = vlib_call_all_main_loop_exit_functions (vm);
+    if (sub_error)
+      clib_error_report (sub_error);
+  }
+
+  if (error)
+    clib_error_report (error);
+
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/main.h b/src/vlib/main.h
new file mode 100644
index 00000000..d9ac1445
--- /dev/null
+++ b/src/vlib/main.h
@@ -0,0 +1,333 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * main.h: VLIB main data structure
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_main_h
+#define included_vlib_main_h
+
+#include <vppinfra/elog.h>
+#include <vppinfra/format.h>
+#include <vppinfra/longjmp.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/random_buffer.h>
+#include <vppinfra/time.h>
+
+#include <pthread.h>
+
+
+/* By default turn off node/error event logging.
+   Override with -DVLIB_ELOG_MAIN_LOOP */
+#ifndef VLIB_ELOG_MAIN_LOOP
+#define VLIB_ELOG_MAIN_LOOP 0
+#endif
+
+typedef struct vlib_main_t
+{
+  /* Instruction level timing state. */
+  clib_time_t clib_time;
+
+  /* Time stamp of last node dispatch. */
+  u64 cpu_time_last_node_dispatch;
+
+  /* Time stamp when main loop was entered (time 0). */
+  u64 cpu_time_main_loop_start;
+
+  /* Incremented once for each main loop. */
+  u32 main_loop_count;
+
+  /* Count of vectors processed this main loop. */
+  u32 main_loop_vectors_processed;
+  u32 main_loop_nodes_processed;
+
+  /* Circular buffer of input node vector counts.
+     Indexed by low bits of
+     (main_loop_count >> VLIB_LOG2_INPUT_VECTORS_PER_MAIN_LOOP). */
+  u32 vector_counts_per_main_loop[2];
+  u32 node_counts_per_main_loop[2];
+
+  /* Every so often we switch to the next counter. */
+#define VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE 7
+
+  /* Jump target to exit main loop with given code. */
+  u32 main_loop_exit_set;
+  clib_longjmp_t main_loop_exit;
+#define VLIB_MAIN_LOOP_EXIT_NONE 0
+#define VLIB_MAIN_LOOP_EXIT_PANIC 1
+  /* Exit via CLI. */
+#define VLIB_MAIN_LOOP_EXIT_CLI 2
+
+  /* Error marker to use when exiting main loop. */
+  clib_error_t *main_loop_error;
+
+  /* Name for e.g. syslog. */
+  char *name;
+
+  /* Start and size of CLIB heap. */
+  void *heap_base;
+  uword heap_size;
+
+  vlib_buffer_main_t *buffer_main;
+
+  vlib_physmem_main_t physmem_main;
+
+  /* Allocate/free buffer memory for DMA transfers, descriptor rings, etc.
+     buffer memory is guaranteed to be cache-aligned. */
+  void *(*os_physmem_alloc_aligned) (vlib_physmem_main_t * pm,
+				     uword n_bytes, uword alignment);
+  void (*os_physmem_free) (void *x);
+
+  /* Node graph main structure. */
+  vlib_node_main_t node_main;
+
+  /* Command line interface. */
+  vlib_cli_main_t cli_main;
+
+  /* Packet trace buffer. */
+  vlib_trace_main_t trace_main;
+
+  /* Error handling. */
+  vlib_error_main_t error_main;
+
+  /* Punt packets to underlying operating system for when fast switching
+     code does not know what to do. */
+  void (*os_punt_frame) (struct vlib_main_t * vm,
+			 struct vlib_node_runtime_t * node,
+			 vlib_frame_t * frame);
+
+  /* Multicast distribution.  Set to zero for MC disabled. */
+  mc_main_t *mc_main;
+
+  /* Stream index to use for distribution when MC is enabled. */
+  u32 mc_stream_index;
+
+  vlib_one_time_waiting_process_t *procs_waiting_for_mc_stream_join;
+
+  /* Event logger. */
+  elog_main_t elog_main;
+
+  /* Node call and return event types. */
+  elog_event_type_t *node_call_elog_event_types;
+  elog_event_type_t *node_return_elog_event_types;
+
+  elog_event_type_t *error_elog_event_types;
+
+  /* Seed for random number generator. */
+  uword random_seed;
+
+  /* Buffer of random data for various uses. */
+  clib_random_buffer_t random_buffer;
+
+  /* Hash table to record which init functions have been called. */
+  uword *init_functions_called;
+
+  /* to compare with node runtime */
+  u32 cpu_index;
+
+  void **mbuf_alloc_list;
+
+  /* List of init functions to call, setup by constructors */
+  _vlib_init_function_list_elt_t *init_function_registrations;
+  _vlib_init_function_list_elt_t *main_loop_enter_function_registrations;
+  _vlib_init_function_list_elt_t *main_loop_exit_function_registrations;
+  _vlib_init_function_list_elt_t *api_init_function_registrations;
+  vlib_config_function_runtime_t *config_function_registrations;
+  mc_serialize_msg_t *mc_msg_registrations;	/* mc_main is a pointer... */
+
+  /* control-plane API queue signal pending, length indication */
+  volatile u32 queue_signal_pending;
+  volatile u32 api_queue_nonempty;
+  void (*queue_signal_callback) (struct vlib_main_t *);
+  u8 **argv;
+} vlib_main_t;
+
+/* Global main structure. */
+extern vlib_main_t vlib_global_main;
+
+always_inline f64
+vlib_time_now (vlib_main_t * vm)
+{
+  return clib_time_now (&vm->clib_time);
+}
+
+always_inline f64
+vlib_time_now_ticks (vlib_main_t * vm, u64 n)
+{
+  return clib_time_now_internal (&vm->clib_time, n);
+}
+
+/* Busy wait for specified time. */
+always_inline void
+vlib_time_wait (vlib_main_t * vm, f64 wait)
+{
+  f64 t = vlib_time_now (vm);
+  f64 limit = t + wait;
+  while (t < limit)
+    t = vlib_time_now (vm);
+}
+
+/* Time a piece of code. */
+#define vlib_time_code(vm,body)			\
+do {						\
+    f64 _t[2];					\
+    _t[0] = vlib_time_now (vm);			\
+    do { body; } while (0);			\
+    _t[1] = vlib_time_now (vm);			\
+    clib_warning ("%.7e", _t[1] - _t[0]);	\
+} while (0)
+
+#define vlib_wait_with_timeout(vm,suspend_time,timeout_time,test)	\
+({									\
+    uword __vlib_wait_with_timeout = 0;					\
+    f64 __vlib_wait_time = 0;						\
+    while (! (__vlib_wait_with_timeout = (test))			\
+	   && __vlib_wait_time < (timeout_time))			\
+      {									\
+	vlib_process_suspend (vm, suspend_time);			\
+	__vlib_wait_time += suspend_time;				\
+      }									\
+    __vlib_wait_with_timeout;						\
+})
+
+always_inline void
+vlib_panic_with_error (vlib_main_t * vm, clib_error_t * error)
+{
+  vm->main_loop_error = error;
+  clib_longjmp (&vm->main_loop_exit, VLIB_MAIN_LOOP_EXIT_PANIC);
+}
+
+#define vlib_panic_with_msg(vm,args...) \
+  vlib_panic_with_error (vm, clib_error_return (0, args))
+
+always_inline void
+vlib_panic (vlib_main_t * vm)
+{
+  vlib_panic_with_error (vm, 0);
+}
+
+always_inline u32
+vlib_vector_input_stats_index (vlib_main_t * vm, word delta)
+{
+  u32 i;
+  i = vm->main_loop_count >> VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE;
+  ASSERT (is_pow2 (ARRAY_LEN (vm->vector_counts_per_main_loop)));
+  return (i + delta) & (ARRAY_LEN (vm->vector_counts_per_main_loop) - 1);
+}
+
+/* Estimate input rate based on previous
+   2^VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE
+   samples. */
+always_inline u32
+vlib_last_vectors_per_main_loop (vlib_main_t * vm)
+{
+  u32 i = vlib_vector_input_stats_index (vm, -1);
+  u32 n = vm->vector_counts_per_main_loop[i];
+  return n >> VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE;
+}
+
+/* Total ave vector count per iteration of main loop. */
+always_inline f64
+vlib_last_vectors_per_main_loop_as_f64 (vlib_main_t * vm)
+{
+  u32 i = vlib_vector_input_stats_index (vm, -1);
+  u32 v = vm->vector_counts_per_main_loop[i];
+  return (f64) v / (f64) (1 << VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE);
+}
+
+/* Total ave vectors/node count per iteration of main loop. */
+always_inline f64
+vlib_last_vector_length_per_node (vlib_main_t * vm)
+{
+  u32 i = vlib_vector_input_stats_index (vm, -1);
+  u32 v = vm->vector_counts_per_main_loop[i];
+  u32 n = vm->node_counts_per_main_loop[i];
+  return n == 0 ? 0 : (f64) v / (f64) n;
+}
+
+extern u32 wraps;
+
+always_inline void
+vlib_increment_main_loop_counter (vlib_main_t * vm)
+{
+  u32 i, c, n, v, is_wrap;
+
+  c = vm->main_loop_count++;
+
+  is_wrap = (c & pow2_mask (VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE)) == 0;
+
+  if (is_wrap)
+    wraps++;
+
+  i = vlib_vector_input_stats_index (vm, /* delta */ is_wrap);
+
+  v = is_wrap ? 0 : vm->vector_counts_per_main_loop[i];
+  n = is_wrap ? 0 : vm->node_counts_per_main_loop[i];
+
+  v += vm->main_loop_vectors_processed;
+  n += vm->main_loop_nodes_processed;
+  vm->main_loop_vectors_processed = 0;
+  vm->main_loop_nodes_processed = 0;
+  vm->vector_counts_per_main_loop[i] = v;
+  vm->node_counts_per_main_loop[i] = n;
+}
+
+always_inline void vlib_set_queue_signal_callback
+  (vlib_main_t * vm, void (*fp) (vlib_main_t *))
+{
+  vm->queue_signal_callback = fp;
+}
+
+/* Main routine. */
+int vlib_main (vlib_main_t * vm, unformat_input_t * input);
+
+/* Thread stacks, for os_get_cpu_number */
+extern u8 **vlib_thread_stacks;
+
+/* Number of thread stacks that the application needs */
+u32 vlib_app_num_thread_stacks_needed (void) __attribute__ ((weak));
+
+extern void vlib_node_sync_stats (vlib_main_t * vm, vlib_node_t * n);
+
+#endif /* included_vlib_main_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/mc.c b/src/vlib/mc.c
new file mode 100644
index 00000000..8fde0913
--- /dev/null
+++ b/src/vlib/mc.c
@@ -0,0 +1,2609 @@
+/*
+ * mc.c: vlib reliable sequenced multicast distributed applications
+ *
+ * Copyright (c) 2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+
+/*
+ * 1 to enable msg id training wheels, which are useful for tracking
+ * down catchup and/or partitioned network problems
+ */
+#define MSG_ID_DEBUG 0
+
+static format_function_t format_mc_stream_state;
+
+static u32
+elog_id_for_peer_id (mc_main_t * m, u64 peer_id)
+{
+  uword *p, r;
+  mhash_t *h = &m->elog_id_by_peer_id;
+
+  if (!m->elog_id_by_peer_id.hash)
+    mhash_init (h, sizeof (uword), sizeof (mc_peer_id_t));
+
+  p = mhash_get (h, &peer_id);
+  if (p)
+    return p[0];
+  r = elog_string (m->elog_main, "%U", m->transport.format_peer_id, peer_id);
+  mhash_set (h, &peer_id, r, /* old_value */ 0);
+  return r;
+}
+
+static u32
+elog_id_for_msg_name (mc_main_t * m, char *msg_name)
+{
+  uword *p, r;
+  uword *h = m->elog_id_by_msg_name;
+  u8 *name_copy;
+
+  if (!h)
+    h = m->elog_id_by_msg_name = hash_create_string (0, sizeof (uword));
+
+  p = hash_get_mem (h, msg_name);
+  if (p)
+    return p[0];
+  r = elog_string (m->elog_main, "%s", msg_name);
+
+  name_copy = format (0, "%s%c", msg_name, 0);
+
+  hash_set_mem (h, name_copy, r);
+  m->elog_id_by_msg_name = h;
+
+  return r;
+}
+
+static void
+elog_tx_msg (mc_main_t * m, u32 stream_id, u32 local_sequence,
+	     u32 retry_count)
+{
+  if (MC_EVENT_LOGGING > 0)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (e) =
+        {
+          .format = "tx-msg: stream %d local seq %d attempt %d",
+          .format_args = "i4i4i4",
+        };
+      /* *INDENT-ON* */
+      struct
+      {
+	u32 stream_id, local_sequence, retry_count;
+      } *ed;
+      ed = ELOG_DATA (m->elog_main, e);
+      ed->stream_id = stream_id;
+      ed->local_sequence = local_sequence;
+      ed->retry_count = retry_count;
+    }
+}
+
+/*
+ * seq_cmp
+ * correctly compare two unsigned sequence numbers.
+ * This function works so long as x and y are within 2**(n-1) of each
+ * other, where n = bits(x, y).
+ *
+ * Magic decoder ring:
+ * seq_cmp == 0 => x and y are equal
+ * seq_cmp < 0 => x is "in the past" with respect to y
+ * seq_cmp > 0 => x is "in the future" with respect to y
+ */
+always_inline i32
+mc_seq_cmp (u32 x, u32 y)
+{
+  return (i32) x - (i32) y;
+}
+
+void *
+mc_get_vlib_buffer (vlib_main_t * vm, u32 n_bytes, u32 * bi_return)
+{
+  u32 n_alloc, bi;
+  vlib_buffer_t *b;
+
+  n_alloc = vlib_buffer_alloc (vm, &bi, 1);
+  ASSERT (n_alloc == 1);
+
+  b = vlib_get_buffer (vm, bi);
+  b->current_length = n_bytes;
+  *bi_return = bi;
+  return (void *) b->data;
+}
+
+static void
+delete_peer_with_index (mc_main_t * mcm, mc_stream_t * s,
+			uword index, int notify_application)
+{
+  mc_stream_peer_t *p = pool_elt_at_index (s->peers, index);
+  ASSERT (p != 0);
+  if (s->config.peer_died && notify_application)
+    s->config.peer_died (mcm, s, p->id);
+
+  s->all_peer_bitmap = clib_bitmap_andnoti (s->all_peer_bitmap, p - s->peers);
+
+  if (MC_EVENT_LOGGING > 0)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (e) =
+        {
+          .format = "delete peer %s from all_peer_bitmap",
+          .format_args = "T4",
+        };
+      /* *INDENT-ON* */
+      struct
+      {
+	u32 peer;
+      } *ed = 0;
+
+      ed = ELOG_DATA (mcm->elog_main, e);
+      ed->peer = elog_id_for_peer_id (mcm, p->id.as_u64);
+    }
+  /* Do not delete the pool / hash table entries, or we lose sequence number state */
+}
+
+static mc_stream_peer_t *
+get_or_create_peer_with_id (mc_main_t * mcm,
+			    mc_stream_t * s, mc_peer_id_t id, int *created)
+{
+  uword *q = mhash_get (&s->peer_index_by_id, &id);
+  mc_stream_peer_t *p;
+
+  if (q)
+    {
+      p = pool_elt_at_index (s->peers, q[0]);
+      goto done;
+    }
+
+  pool_get (s->peers, p);
+  memset (p, 0, sizeof (p[0]));
+  p->id = id;
+  p->last_sequence_received = ~0;
+  mhash_set (&s->peer_index_by_id, &id, p - s->peers, /* old_value */ 0);
+  if (created)
+    *created = 1;
+
+done:
+  if (MC_EVENT_LOGGING > 0)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (e) =
+        {
+          .format = "get_or_create %s peer %s stream %d seq %d",
+          .format_args = "t4T4i4i4",
+          .n_enum_strings = 2,
+          .enum_strings = {
+            "old", "new",
+          },
+        };
+      /* *INDENT-ON* */
+      struct
+      {
+	u32 is_new, peer, stream_index, rx_sequence;
+      } *ed = 0;
+
+      ed = ELOG_DATA (mcm->elog_main, e);
+      ed->is_new = q ? 0 : 1;
+      ed->peer = elog_id_for_peer_id (mcm, p->id.as_u64);
+      ed->stream_index = s->index;
+      ed->rx_sequence = p->last_sequence_received;
+    }
+  /* $$$$ Enable or reenable this peer */
+  s->all_peer_bitmap = clib_bitmap_ori (s->all_peer_bitmap, p - s->peers);
+  return p;
+}
+
+static void
+maybe_send_window_open_event (vlib_main_t * vm, mc_stream_t * stream)
+{
+  vlib_one_time_waiting_process_t *p;
+
+  if (pool_elts (stream->retry_pool) >= stream->config.window_size)
+    return;
+
+  vec_foreach (p, stream->procs_waiting_for_open_window)
+    vlib_signal_one_time_waiting_process (vm, p);
+
+  if (stream->procs_waiting_for_open_window)
+    _vec_len (stream->procs_waiting_for_open_window) = 0;
+}
+
+static void
+mc_retry_free (mc_main_t * mcm, mc_stream_t * s, mc_retry_t * r)
+{
+  mc_retry_t record, *retp;
+
+  if (r->unacked_by_peer_bitmap)
+    _vec_len (r->unacked_by_peer_bitmap) = 0;
+
+  if (clib_fifo_elts (s->retired_fifo) >= 2 * s->config.window_size)
+    {
+      clib_fifo_sub1 (s->retired_fifo, record);
+      vlib_buffer_free_one (mcm->vlib_main, record.buffer_index);
+    }
+
+  clib_fifo_add2 (s->retired_fifo, retp);
+
+  retp->buffer_index = r->buffer_index;
+  retp->local_sequence = r->local_sequence;
+
+  r->buffer_index = ~0;		/* poison buffer index in this retry */
+}
+
+static void
+mc_resend_retired (mc_main_t * mcm, mc_stream_t * s, u32 local_sequence)
+{
+  mc_retry_t *retry;
+
+  if (MC_EVENT_LOGGING > 0)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (e) =
+        {
+          .format = "resend-retired: search for local seq %d",
+          .format_args = "i4",
+        };
+      /* *INDENT-ON* */
+      struct
+      {
+	u32 local_sequence;
+      } *ed;
+      ed = ELOG_DATA (mcm->elog_main, e);
+      ed->local_sequence = local_sequence;
+    }
+
+  /* *INDENT-OFF* */
+  clib_fifo_foreach (retry, s->retired_fifo,
+  ({
+    if (retry->local_sequence == local_sequence)
+      {
+        elog_tx_msg (mcm, s->index, retry-> local_sequence, -13);
+        mcm->transport.tx_buffer (mcm->transport.opaque,
+                                  MC_TRANSPORT_USER_REQUEST_TO_RELAY,
+                                  retry->buffer_index);
+        return;
+      }
+  }));
+  /* *INDENT-ON* */
+
+  if (MC_EVENT_LOGGING > 0)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (e) =
+        {
+          .format = "resend-retired: FAILED search for local seq %d",
+          .format_args = "i4",
+        };
+      /* *INDENT-ON* */
+      struct
+      {
+	u32 local_sequence;
+      } *ed;
+      ed = ELOG_DATA (mcm->elog_main, e);
+      ed->local_sequence = local_sequence;
+    }
+}
+
+static uword *
+delete_retry_fifo_elt (mc_main_t * mcm,
+		       mc_stream_t * stream,
+		       mc_retry_t * r, uword * dead_peer_bitmap)
+{
+  mc_stream_peer_t *p;
+
+  /* *INDENT-OFF* */
+  pool_foreach (p, stream->peers, ({
+    uword pi = p - stream->peers;
+    uword is_alive = 0 == clib_bitmap_get (r->unacked_by_peer_bitmap, pi);
+
+    if (! is_alive)
+      dead_peer_bitmap = clib_bitmap_ori (dead_peer_bitmap, pi);
+
+    if (MC_EVENT_LOGGING > 0)
+      {
+        ELOG_TYPE_DECLARE (e) = {
+          .format = "delete_retry_fifo_elt: peer %s is %s",
+          .format_args = "T4t4",
+          .n_enum_strings = 2,
+          .enum_strings = { "alive", "dead", },
+        };
+        struct { u32 peer, is_alive; } * ed;
+        ed = ELOG_DATA (mcm->elog_main, e);
+        ed->peer = elog_id_for_peer_id (mcm, p->id.as_u64);
+        ed->is_alive = is_alive;
+      }
+  }));
+  /* *INDENT-ON* */
+
+  hash_unset (stream->retry_index_by_local_sequence, r->local_sequence);
+  mc_retry_free (mcm, stream, r);
+
+  return dead_peer_bitmap;
+}
+
+always_inline mc_retry_t *
+prev_retry (mc_stream_t * s, mc_retry_t * r)
+{
+  return (r->prev_index != ~0
+	  ? pool_elt_at_index (s->retry_pool, r->prev_index) : 0);
+}
+
+always_inline mc_retry_t *
+next_retry (mc_stream_t * s, mc_retry_t * r)
+{
+  return (r->next_index != ~0
+	  ? pool_elt_at_index (s->retry_pool, r->next_index) : 0);
+}
+
+always_inline void
+remove_retry_from_pool (mc_stream_t * s, mc_retry_t * r)
+{
+  mc_retry_t *p = prev_retry (s, r);
+  mc_retry_t *n = next_retry (s, r);
+
+  if (p)
+    p->next_index = r->next_index;
+  else
+    s->retry_head_index = r->next_index;
+  if (n)
+    n->prev_index = r->prev_index;
+  else
+    s->retry_tail_index = r->prev_index;
+
+  pool_put_index (s->retry_pool, r - s->retry_pool);
+}
+
+static void
+check_retry (mc_main_t * mcm, mc_stream_t * s)
+{
+  mc_retry_t *r;
+  vlib_main_t *vm = mcm->vlib_main;
+  f64 now = vlib_time_now (vm);
+  uword *dead_peer_bitmap = 0;
+  u32 ri, ri_next;
+
+  for (ri = s->retry_head_index; ri != ~0; ri = ri_next)
+    {
+      r = pool_elt_at_index (s->retry_pool, ri);
+      ri_next = r->next_index;
+
+      if (now < r->sent_at + s->config.retry_interval)
+	continue;
+
+      r->n_retries += 1;
+      if (r->n_retries > s->config.retry_limit)
+	{
+	  dead_peer_bitmap =
+	    delete_retry_fifo_elt (mcm, s, r, dead_peer_bitmap);
+	  remove_retry_from_pool (s, r);
+	}
+      else
+	{
+	  if (MC_EVENT_LOGGING > 0)
+	    {
+	      mc_stream_peer_t *p;
+
+              /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (t) =
+                {
+                  .format = "resend local seq %d attempt %d",
+                  .format_args = "i4i4",
+                };
+              /* *INDENT-ON* */
+
+              /* *INDENT-OFF* */
+	      pool_foreach (p, s->peers, ({
+		if (clib_bitmap_get (r->unacked_by_peer_bitmap, p - s->peers))
+		  {
+		    ELOG_TYPE_DECLARE (ev) = {
+		      .format = "resend: needed by peer %s local seq %d",
+		      .format_args = "T4i4",
+		    };
+		    struct { u32 peer, rx_sequence; } * ed;
+		    ed = ELOG_DATA (mcm->elog_main, ev);
+		    ed->peer = elog_id_for_peer_id (mcm, p->id.as_u64);
+		    ed->rx_sequence = r->local_sequence;
+		  }
+	      }));
+              /* *INDENT-ON* */
+
+	      struct
+	      {
+		u32 sequence;
+		u32 trail;
+	      } *ed;
+	      ed = ELOG_DATA (mcm->elog_main, t);
+	      ed->sequence = r->local_sequence;
+	      ed->trail = r->n_retries;
+	    }
+
+	  r->sent_at = vlib_time_now (vm);
+	  s->stats.n_retries += 1;
+
+	  elog_tx_msg (mcm, s->index, r->local_sequence, r->n_retries);
+
+	  mcm->transport.tx_buffer
+	    (mcm->transport.opaque,
+	     MC_TRANSPORT_USER_REQUEST_TO_RELAY, r->buffer_index);
+	}
+    }
+
+  maybe_send_window_open_event (mcm->vlib_main, s);
+
+  /* Delete any dead peers we've found. */
+  if (!clib_bitmap_is_zero (dead_peer_bitmap))
+    {
+      uword i;
+
+      /* *INDENT-OFF* */
+      clib_bitmap_foreach (i, dead_peer_bitmap, ({
+	delete_peer_with_index (mcm, s, i, /* notify_application */ 1);
+
+	/* Delete any references to just deleted peer in retry pool. */
+	pool_foreach (r, s->retry_pool, ({
+	  r->unacked_by_peer_bitmap =
+	    clib_bitmap_andnoti (r->unacked_by_peer_bitmap, i);
+	}));
+      }));
+/* *INDENT-ON* */
+      clib_bitmap_free (dead_peer_bitmap);
+    }
+}
+
+always_inline mc_main_t *
+mc_node_get_main (vlib_node_runtime_t * node)
+{
+  mc_main_t **p = (void *) node->runtime_data;
+  return p[0];
+}
+
+static uword
+mc_retry_process (vlib_main_t * vm,
+		  vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  mc_main_t *mcm = mc_node_get_main (node);
+  mc_stream_t *s;
+
+  while (1)
+    {
+      vlib_process_suspend (vm, 1.0);
+      vec_foreach (s, mcm->stream_vector)
+      {
+	if (s->state != MC_STREAM_STATE_invalid)
+	  check_retry (mcm, s);
+      }
+    }
+  return 0;			/* not likely */
+}
+
+static void
+send_join_or_leave_request (mc_main_t * mcm, u32 stream_index, u32 is_join)
+{
+  vlib_main_t *vm = mcm->vlib_main;
+  mc_msg_join_or_leave_request_t *mp;
+  u32 bi;
+
+  mp = mc_get_vlib_buffer (vm, sizeof (mp[0]), &bi);
+  memset (mp, 0, sizeof (*mp));
+  mp->type = MC_MSG_TYPE_join_or_leave_request;
+  mp->peer_id = mcm->transport.our_ack_peer_id;
+  mp->stream_index = stream_index;
+  mp->is_join = is_join;
+
+  mc_byte_swap_msg_join_or_leave_request (mp);
+
+  /*
+   * These msgs are unnumbered, unordered so send on the from-relay
+   * channel.
+   */
+  mcm->transport.tx_buffer (mcm->transport.opaque, MC_TRANSPORT_JOIN, bi);
+}
+
+static uword
+mc_join_ager_process (vlib_main_t * vm,
+		      vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  mc_main_t *mcm = mc_node_get_main (node);
+
+  while (1)
+    {
+      if (mcm->joins_in_progress)
+	{
+	  mc_stream_t *s;
+	  vlib_one_time_waiting_process_t *p;
+	  f64 now = vlib_time_now (vm);
+
+	  vec_foreach (s, mcm->stream_vector)
+	  {
+	    if (s->state != MC_STREAM_STATE_join_in_progress)
+	      continue;
+
+	    if (now > s->join_timeout)
+	      {
+		s->state = MC_STREAM_STATE_ready;
+
+		if (MC_EVENT_LOGGING > 0)
+		  {
+                    /* *INDENT-OFF* */
+		    ELOG_TYPE_DECLARE (e) =
+                      {
+                        .format = "stream %d join timeout",
+                      };
+                    /* *INDENT-ON* */
+		    ELOG (mcm->elog_main, e, s->index);
+		  }
+		/* Make sure that this app instance exists as a stream peer,
+		   or we may answer a catchup request with a NULL
+		   all_peer_bitmap... */
+		(void) get_or_create_peer_with_id
+		  (mcm, s, mcm->transport.our_ack_peer_id, /* created */ 0);
+
+		vec_foreach (p, s->procs_waiting_for_join_done)
+		  vlib_signal_one_time_waiting_process (vm, p);
+		if (s->procs_waiting_for_join_done)
+		  _vec_len (s->procs_waiting_for_join_done) = 0;
+
+		mcm->joins_in_progress--;
+		ASSERT (mcm->joins_in_progress >= 0);
+	      }
+	    else
+	      {
+		/* Resent join request which may have been lost. */
+		send_join_or_leave_request (mcm, s->index, 1 /* is_join */ );
+
+		/* We're *not* alone, retry for as long as it takes */
+		if (mcm->relay_state == MC_RELAY_STATE_SLAVE)
+		  s->join_timeout = vlib_time_now (vm) + 2.0;
+
+
+		if (MC_EVENT_LOGGING > 0)
+		  {
+                    /* *INDENT-OFF* */
+		    ELOG_TYPE_DECLARE (e) =
+                      {
+                        .format = "stream %d resend join request",
+                      };
+                    /* *INDENT-ON* */
+		    ELOG (mcm->elog_main, e, s->index);
+		  }
+	      }
+	  }
+	}
+
+      vlib_process_suspend (vm, .5);
+    }
+
+  return 0;			/* not likely */
+}
+
+static void
+serialize_mc_register_stream_name (serialize_main_t * m, va_list * va)
+{
+  char *name = va_arg (*va, char *);
+  serialize_cstring (m, name);
+}
+
+static void
+elog_stream_name (char *buf, int n_buf_bytes, char *v)
+{
+  clib_memcpy (buf, v, clib_min (n_buf_bytes - 1, vec_len (v)));
+  buf[n_buf_bytes - 1] = 0;
+}
+
+static void
+unserialize_mc_register_stream_name (serialize_main_t * m, va_list * va)
+{
+  mc_main_t *mcm = va_arg (*va, mc_main_t *);
+  char *name;
+  mc_stream_t *s;
+  uword *p;
+
+  unserialize_cstring (m, &name);
+
+  if ((p = hash_get_mem (mcm->stream_index_by_name, name)))
+    {
+      if (MC_EVENT_LOGGING > 0)
+	{
+          /* *INDENT-OFF* */
+	  ELOG_TYPE_DECLARE (e) =
+            {
+              .format = "stream index %d already named %s",
+              .format_args = "i4s16",
+            };
+          /* *INDENT-ON* */
+	  struct
+	  {
+	    u32 stream_index;
+	    char name[16];
+	  } *ed;
+	  ed = ELOG_DATA (mcm->elog_main, e);
+	  ed->stream_index = p[0];
+	  elog_stream_name (ed->name, sizeof (ed->name), name);
+	}
+
+      vec_free (name);
+      return;
+    }
+
+  vec_add2 (mcm->stream_vector, s, 1);
+  mc_stream_init (s);
+  s->state = MC_STREAM_STATE_name_known;
+  s->index = s - mcm->stream_vector;
+  s->config.name = name;
+
+  if (MC_EVENT_LOGGING > 0)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (e) =
+        {
+          .format = "stream index %d named %s",
+          .format_args = "i4s16",
+        };
+      /* *INDENT-ON* */
+      struct
+      {
+	u32 stream_index;
+	char name[16];
+      } *ed;
+      ed = ELOG_DATA (mcm->elog_main, e);
+      ed->stream_index = s->index;
+      elog_stream_name (ed->name, sizeof (ed->name), name);
+    }
+
+  hash_set_mem (mcm->stream_index_by_name, name, s->index);
+
+  p = hash_get (mcm->procs_waiting_for_stream_name_by_name, name);
+  if (p)
+    {
+      vlib_one_time_waiting_process_t *wp, **w;
+      w = pool_elt_at_index (mcm->procs_waiting_for_stream_name_pool, p[0]);
+      vec_foreach (wp, w[0])
+	vlib_signal_one_time_waiting_process (mcm->vlib_main, wp);
+      pool_put (mcm->procs_waiting_for_stream_name_pool, w);
+      hash_unset_mem (mcm->procs_waiting_for_stream_name_by_name, name);
+    }
+}
+
+/* *INDENT-OFF* */
+MC_SERIALIZE_MSG (mc_register_stream_name_msg, static) =
+{
+  .name = "mc_register_stream_name",
+  .serialize = serialize_mc_register_stream_name,
+  .unserialize = unserialize_mc_register_stream_name,
+};
+/* *INDENT-ON* */
+
+void
+mc_rx_buffer_unserialize (mc_main_t * mcm,
+			  mc_stream_t * stream,
+			  mc_peer_id_t peer_id, u32 buffer_index)
+{
+  return mc_unserialize (mcm, stream, buffer_index);
+}
+
+static u8 *
+mc_internal_catchup_snapshot (mc_main_t * mcm,
+			      u8 * data_vector,
+			      u32 last_global_sequence_processed)
+{
+  serialize_main_t m;
+
+  /* Append serialized data to data vector. */
+  serialize_open_vector (&m, data_vector);
+  m.stream.current_buffer_index = vec_len (data_vector);
+
+  serialize (&m, serialize_mc_main, mcm);
+  return serialize_close_vector (&m);
+}
+
+static void
+mc_internal_catchup (mc_main_t * mcm, u8 * data, u32 n_data_bytes)
+{
+  serialize_main_t s;
+
+  unserialize_open_data (&s, data, n_data_bytes);
+
+  unserialize (&s, unserialize_mc_main, mcm);
+}
+
+/* Overridden from the application layer, not actually used here */
+void mc_stream_join_process_hold (void) __attribute__ ((weak));
+void
+mc_stream_join_process_hold (void)
+{
+}
+
+static u32
+mc_stream_join_helper (mc_main_t * mcm,
+		       mc_stream_config_t * config, u32 is_internal)
+{
+  mc_stream_t *s;
+  vlib_main_t *vm = mcm->vlib_main;
+
+  s = 0;
+  if (!is_internal)
+    {
+      uword *p;
+
+      /* Already have a stream with given name? */
+      if ((s = mc_stream_by_name (mcm, config->name)))
+	{
+	  /* Already joined and ready? */
+	  if (s->state == MC_STREAM_STATE_ready)
+	    return s->index;
+	}
+
+      /* First join MC internal stream. */
+      if (!mcm->stream_vector
+	  || (mcm->stream_vector[MC_STREAM_INDEX_INTERNAL].state
+	      == MC_STREAM_STATE_invalid))
+	{
+	  static mc_stream_config_t c = {
+	    .name = "mc-internal",
+	    .rx_buffer = mc_rx_buffer_unserialize,
+	    .catchup = mc_internal_catchup,
+	    .catchup_snapshot = mc_internal_catchup_snapshot,
+	  };
+
+	  c.save_snapshot = config->save_snapshot;
+
+	  mc_stream_join_helper (mcm, &c, /* is_internal */ 1);
+	}
+
+      /* If stream is still unknown register this name and wait for
+         sequenced message to name stream.  This way all peers agree
+         on stream name to index mappings. */
+      s = mc_stream_by_name (mcm, config->name);
+      if (!s)
+	{
+	  vlib_one_time_waiting_process_t *wp, **w;
+	  u8 *name_copy = format (0, "%s", config->name);
+
+	  mc_serialize_stream (mcm,
+			       MC_STREAM_INDEX_INTERNAL,
+			       &mc_register_stream_name_msg, config->name);
+
+	  /* Wait for this stream to be named. */
+	  p =
+	    hash_get_mem (mcm->procs_waiting_for_stream_name_by_name,
+			  name_copy);
+	  if (p)
+	    w =
+	      pool_elt_at_index (mcm->procs_waiting_for_stream_name_pool,
+				 p[0]);
+	  else
+	    {
+	      pool_get (mcm->procs_waiting_for_stream_name_pool, w);
+	      if (!mcm->procs_waiting_for_stream_name_by_name)
+		mcm->procs_waiting_for_stream_name_by_name = hash_create_string ( /* elts */ 0,	/* value size */
+										 sizeof
+										 (uword));
+	      hash_set_mem (mcm->procs_waiting_for_stream_name_by_name,
+			    name_copy,
+			    w - mcm->procs_waiting_for_stream_name_pool);
+	      w[0] = 0;
+	    }
+
+	  vec_add2 (w[0], wp, 1);
+	  vlib_current_process_wait_for_one_time_event (vm, wp);
+	  vec_free (name_copy);
+	}
+
+      /* Name should be known now. */
+      s = mc_stream_by_name (mcm, config->name);
+      ASSERT (s != 0);
+      ASSERT (s->state == MC_STREAM_STATE_name_known);
+    }
+
+  if (!s)
+    {
+      vec_add2 (mcm->stream_vector, s, 1);
+      mc_stream_init (s);
+      s->index = s - mcm->stream_vector;
+    }
+
+  {
+    /* Save name since we could have already used it as hash key. */
+    char *name_save = s->config.name;
+
+    s->config = config[0];
+
+    if (name_save)
+      s->config.name = name_save;
+  }
+
+  if (s->config.window_size == 0)
+    s->config.window_size = 8;
+
+  if (s->config.retry_interval == 0.0)
+    s->config.retry_interval = 1.0;
+
+  /* Sanity. */
+  ASSERT (s->config.retry_interval < 30);
+
+  if (s->config.retry_limit == 0)
+    s->config.retry_limit = 7;
+
+  s->state = MC_STREAM_STATE_join_in_progress;
+  if (!s->peer_index_by_id.hash)
+    mhash_init (&s->peer_index_by_id, sizeof (uword), sizeof (mc_peer_id_t));
+
+  /* If we don't hear from someone in 5 seconds, we're alone */
+  s->join_timeout = vlib_time_now (vm) + 5.0;
+  mcm->joins_in_progress++;
+
+  if (MC_EVENT_LOGGING > 0)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (e) =
+      {
+        .format = "stream index %d join request %s",
+        .format_args = "i4s16",
+      };
+      /* *INDENT-ON* */
+      struct
+      {
+	u32 stream_index;
+	char name[16];
+      } *ed;
+      ed = ELOG_DATA (mcm->elog_main, e);
+      ed->stream_index = s->index;
+      elog_stream_name (ed->name, sizeof (ed->name), s->config.name);
+    }
+
+  send_join_or_leave_request (mcm, s->index, 1 /* join */ );
+
+  vlib_current_process_wait_for_one_time_event_vector
+    (vm, &s->procs_waiting_for_join_done);
+
+  if (MC_EVENT_LOGGING)
+    {
+      ELOG_TYPE (e, "join complete stream %d");
+      ELOG (mcm->elog_main, e, s->index);
+    }
+
+  return s->index;
+}
+
+u32
+mc_stream_join (mc_main_t * mcm, mc_stream_config_t * config)
+{
+  return mc_stream_join_helper (mcm, config, /* is_internal */ 0);
+}
+
+void
+mc_stream_leave (mc_main_t * mcm, u32 stream_index)
+{
+  mc_stream_t *s = mc_stream_by_index (mcm, stream_index);
+
+  if (!s)
+    return;
+
+  if (MC_EVENT_LOGGING)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (t) =
+        {
+          .format = "leave-stream: %d",.format_args = "i4",
+        };
+      /* *INDENT-ON* */
+      struct
+      {
+	u32 index;
+      } *ed;
+      ed = ELOG_DATA (mcm->elog_main, t);
+      ed->index = stream_index;
+    }
+
+  send_join_or_leave_request (mcm, stream_index, 0 /* is_join */ );
+  mc_stream_free (s);
+  s->state = MC_STREAM_STATE_name_known;
+}
+
+void
+mc_msg_join_or_leave_request_handler (mc_main_t * mcm,
+				      mc_msg_join_or_leave_request_t * req,
+				      u32 buffer_index)
+{
+  mc_stream_t *s;
+  mc_msg_join_reply_t *rep;
+  u32 bi;
+
+  mc_byte_swap_msg_join_or_leave_request (req);
+
+  s = mc_stream_by_index (mcm, req->stream_index);
+  if (!s || s->state != MC_STREAM_STATE_ready)
+    return;
+
+  /* If the peer is joining, create it */
+  if (req->is_join)
+    {
+      mc_stream_t *this_s;
+
+      /* We're not in a position to catch up a peer until all
+         stream joins are complete. */
+      if (0)
+	{
+	  /* XXX This is hard to test so we've. */
+	  vec_foreach (this_s, mcm->stream_vector)
+	  {
+	    if (this_s->state != MC_STREAM_STATE_ready
+		&& this_s->state != MC_STREAM_STATE_name_known)
+	      return;
+	  }
+	}
+      else if (mcm->joins_in_progress > 0)
+	return;
+
+      (void) get_or_create_peer_with_id (mcm, s, req->peer_id,
+					 /* created */ 0);
+
+      rep = mc_get_vlib_buffer (mcm->vlib_main, sizeof (rep[0]), &bi);
+      memset (rep, 0, sizeof (rep[0]));
+      rep->type = MC_MSG_TYPE_join_reply;
+      rep->stream_index = req->stream_index;
+
+      mc_byte_swap_msg_join_reply (rep);
+      /* These two are already in network byte order... */
+      rep->peer_id = mcm->transport.our_ack_peer_id;
+      rep->catchup_peer_id = mcm->transport.our_catchup_peer_id;
+
+      mcm->transport.tx_buffer (mcm->transport.opaque, MC_TRANSPORT_JOIN, bi);
+    }
+  else
+    {
+      if (s->config.peer_died)
+	s->config.peer_died (mcm, s, req->peer_id);
+    }
+}
+
+void
+mc_msg_join_reply_handler (mc_main_t * mcm,
+			   mc_msg_join_reply_t * mp, u32 buffer_index)
+{
+  mc_stream_t *s;
+
+  mc_byte_swap_msg_join_reply (mp);
+
+  s = mc_stream_by_index (mcm, mp->stream_index);
+
+  if (!s || s->state != MC_STREAM_STATE_join_in_progress)
+    return;
+
+  /* Switch to catchup state; next join reply
+     for this stream will be ignored. */
+  s->state = MC_STREAM_STATE_catchup;
+
+  mcm->joins_in_progress--;
+  mcm->transport.catchup_request_fun (mcm->transport.opaque,
+				      mp->stream_index, mp->catchup_peer_id);
+}
+
+void
+mc_wait_for_stream_ready (mc_main_t * m, char *stream_name)
+{
+  mc_stream_t *s;
+
+  while (1)
+    {
+      s = mc_stream_by_name (m, stream_name);
+      if (s)
+	break;
+      vlib_process_suspend (m->vlib_main, .1);
+    }
+
+  /* It's OK to send a message in catchup and ready states. */
+  if (s->state == MC_STREAM_STATE_catchup
+      || s->state == MC_STREAM_STATE_ready)
+    return;
+
+  /* Otherwise we are waiting for a join to finish. */
+  vlib_current_process_wait_for_one_time_event_vector
+    (m->vlib_main, &s->procs_waiting_for_join_done);
+}
+
+u32
+mc_stream_send (mc_main_t * mcm, u32 stream_index, u32 buffer_index)
+{
+  mc_stream_t *s = mc_stream_by_index (mcm, stream_index);
+  vlib_main_t *vm = mcm->vlib_main;
+  mc_retry_t *r;
+  mc_msg_user_request_t *mp;
+  vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
+  u32 ri;
+
+  if (!s)
+    return 0;
+
+  if (s->state != MC_STREAM_STATE_ready)
+    vlib_current_process_wait_for_one_time_event_vector
+      (vm, &s->procs_waiting_for_join_done);
+
+  while (pool_elts (s->retry_pool) >= s->config.window_size)
+    {
+      vlib_current_process_wait_for_one_time_event_vector
+	(vm, &s->procs_waiting_for_open_window);
+    }
+
+  pool_get (s->retry_pool, r);
+  ri = r - s->retry_pool;
+
+  r->prev_index = s->retry_tail_index;
+  r->next_index = ~0;
+  s->retry_tail_index = ri;
+
+  if (r->prev_index == ~0)
+    s->retry_head_index = ri;
+  else
+    {
+      mc_retry_t *p = pool_elt_at_index (s->retry_pool, r->prev_index);
+      p->next_index = ri;
+    }
+
+  vlib_buffer_advance (b, -sizeof (mp[0]));
+  mp = vlib_buffer_get_current (b);
+
+  mp->peer_id = mcm->transport.our_ack_peer_id;
+  /* mp->transport.global_sequence set by relay agent. */
+  mp->global_sequence = 0xdeadbeef;
+  mp->stream_index = s->index;
+  mp->local_sequence = s->our_local_sequence++;
+  mp->n_data_bytes =
+    vlib_buffer_index_length_in_chain (vm, buffer_index) - sizeof (mp[0]);
+
+  r->buffer_index = buffer_index;
+  r->local_sequence = mp->local_sequence;
+  r->sent_at = vlib_time_now (vm);
+  r->n_retries = 0;
+
+  /* Retry will be freed when all currently known peers have acked. */
+  vec_validate (r->unacked_by_peer_bitmap, vec_len (s->all_peer_bitmap) - 1);
+  vec_copy (r->unacked_by_peer_bitmap, s->all_peer_bitmap);
+
+  hash_set (s->retry_index_by_local_sequence, r->local_sequence,
+	    r - s->retry_pool);
+
+  elog_tx_msg (mcm, s->index, mp->local_sequence, r->n_retries);
+
+  mc_byte_swap_msg_user_request (mp);
+
+  mcm->transport.tx_buffer (mcm->transport.opaque,
+			    MC_TRANSPORT_USER_REQUEST_TO_RELAY, buffer_index);
+
+  s->user_requests_sent++;
+
+  /* return amount of window remaining */
+  return s->config.window_size - pool_elts (s->retry_pool);
+}
+
+void
+mc_msg_user_request_handler (mc_main_t * mcm, mc_msg_user_request_t * mp,
+			     u32 buffer_index)
+{
+  vlib_main_t *vm = mcm->vlib_main;
+  mc_stream_t *s;
+  mc_stream_peer_t *peer;
+  i32 seq_cmp_result;
+  static int once = 0;
+
+  mc_byte_swap_msg_user_request (mp);
+
+  s = mc_stream_by_index (mcm, mp->stream_index);
+
+  /* Not signed up for this stream? Turf-o-matic */
+  if (!s || s->state != MC_STREAM_STATE_ready)
+    {
+      vlib_buffer_free_one (vm, buffer_index);
+      return;
+    }
+
+  /* Find peer, including ourselves. */
+  peer = get_or_create_peer_with_id (mcm, s, mp->peer_id,
+				     /* created */ 0);
+
+  seq_cmp_result = mc_seq_cmp (mp->local_sequence,
+			       peer->last_sequence_received + 1);
+
+  if (MC_EVENT_LOGGING > 0)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (e) =
+        {
+          .format = "rx-msg: peer %s stream %d rx seq %d seq_cmp %d",
+          .format_args = "T4i4i4i4",
+        };
+      /* *INDENT-ON* */
+      struct
+      {
+	u32 peer, stream_index, rx_sequence;
+	i32 seq_cmp_result;
+      } *ed;
+      ed = ELOG_DATA (mcm->elog_main, e);
+      ed->peer = elog_id_for_peer_id (mcm, peer->id.as_u64);
+      ed->stream_index = mp->stream_index;
+      ed->rx_sequence = mp->local_sequence;
+      ed->seq_cmp_result = seq_cmp_result;
+    }
+
+  if (0 && mp->stream_index == 1 && once == 0)
+    {
+      once = 1;
+      ELOG_TYPE (e, "FAKE lost msg on stream 1");
+      ELOG (mcm->elog_main, e, 0);
+      return;
+    }
+
+  peer->last_sequence_received += seq_cmp_result == 0;
+  s->user_requests_received++;
+
+  if (seq_cmp_result > 0)
+    peer->stats.n_msgs_from_future += 1;
+
+  /* Send ack even if msg from future */
+  if (1)
+    {
+      mc_msg_user_ack_t *rp;
+      u32 bi;
+
+      rp = mc_get_vlib_buffer (vm, sizeof (rp[0]), &bi);
+      rp->peer_id = mcm->transport.our_ack_peer_id;
+      rp->stream_index = s->index;
+      rp->local_sequence = mp->local_sequence;
+      rp->seq_cmp_result = seq_cmp_result;
+
+      if (MC_EVENT_LOGGING > 0)
+	{
+          /* *INDENT-OFF* */
+	  ELOG_TYPE_DECLARE (e) =
+            {
+              .format = "tx-ack: stream %d local seq %d",
+              .format_args = "i4i4",
+            };
+          /* *INDENT-ON* */
+	  struct
+	  {
+	    u32 stream_index;
+	    u32 local_sequence;
+	  } *ed;
+	  ed = ELOG_DATA (mcm->elog_main, e);
+	  ed->stream_index = rp->stream_index;
+	  ed->local_sequence = rp->local_sequence;
+	}
+
+      mc_byte_swap_msg_user_ack (rp);
+
+      mcm->transport.tx_ack (mcm->transport.opaque, mp->peer_id, bi);
+      /* Msg from past? If so, free the buffer... */
+      if (seq_cmp_result < 0)
+	{
+	  vlib_buffer_free_one (vm, buffer_index);
+	  peer->stats.n_msgs_from_past += 1;
+	}
+    }
+
+  if (seq_cmp_result == 0)
+    {
+      vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
+      switch (s->state)
+	{
+	case MC_STREAM_STATE_ready:
+	  vlib_buffer_advance (b, sizeof (mp[0]));
+	  s->config.rx_buffer (mcm, s, mp->peer_id, buffer_index);
+
+	  /* Stream vector can change address via rx callback for mc-internal
+	     stream. */
+	  s = mc_stream_by_index (mcm, mp->stream_index);
+	  ASSERT (s != 0);
+	  s->last_global_sequence_processed = mp->global_sequence;
+	  break;
+
+	case MC_STREAM_STATE_catchup:
+	  clib_fifo_add1 (s->catchup_fifo, buffer_index);
+	  break;
+
+	default:
+	  clib_warning ("stream in unknown state %U",
+			format_mc_stream_state, s->state);
+	  break;
+	}
+    }
+}
+
+void
+mc_msg_user_ack_handler (mc_main_t * mcm, mc_msg_user_ack_t * mp,
+			 u32 buffer_index)
+{
+  vlib_main_t *vm = mcm->vlib_main;
+  uword *p;
+  mc_stream_t *s;
+  mc_stream_peer_t *peer;
+  mc_retry_t *r;
+  int peer_created = 0;
+
+  mc_byte_swap_msg_user_ack (mp);
+
+  s = mc_stream_by_index (mcm, mp->stream_index);
+
+  if (MC_EVENT_LOGGING > 0)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (t) =
+        {
+          .format = "rx-ack: local seq %d peer %s seq_cmp_result %d",
+          .format_args = "i4T4i4",
+        };
+      /* *INDENT-ON* */
+
+      struct
+      {
+	u32 local_sequence;
+	u32 peer;
+	i32 seq_cmp_result;
+      } *ed;
+      ed = ELOG_DATA (mcm->elog_main, t);
+      ed->local_sequence = mp->local_sequence;
+      ed->peer = elog_id_for_peer_id (mcm, mp->peer_id.as_u64);
+      ed->seq_cmp_result = mp->seq_cmp_result;
+    }
+
+  /* Unknown stream? */
+  if (!s)
+    return;
+
+  /* Find the peer which just ack'ed. */
+  peer = get_or_create_peer_with_id (mcm, s, mp->peer_id,
+				     /* created */ &peer_created);
+
+  /*
+   * Peer reports message from the future. If it's not in the retry
+   * fifo, look for a retired message.
+   */
+  if (mp->seq_cmp_result > 0)
+    {
+      p = hash_get (s->retry_index_by_local_sequence, mp->local_sequence -
+		    mp->seq_cmp_result);
+      if (p == 0)
+	mc_resend_retired (mcm, s, mp->local_sequence - mp->seq_cmp_result);
+
+      /* Normal retry should fix it... */
+      return;
+    }
+
+  /*
+   * Pointer to the indicated retry fifo entry.
+   * Worth hashing because we could use a window size of 100 or 1000.
+   */
+  p = hash_get (s->retry_index_by_local_sequence, mp->local_sequence);
+
+  /*
+   * Is this a duplicate ACK, received after we've retired the
+   * fifo entry. This can happen when learning about new
+   * peers.
+   */
+  if (p == 0)
+    {
+      if (MC_EVENT_LOGGING > 0)
+	{
+          /* *INDENT-OFF* */
+	  ELOG_TYPE_DECLARE (t) =
+            {
+              .format = "ack: for seq %d from peer %s no fifo elt",
+              .format_args = "i4T4",
+            };
+          /* *INDENT-ON* */
+
+	  struct
+	  {
+	    u32 seq;
+	    u32 peer;
+	  } *ed;
+	  ed = ELOG_DATA (mcm->elog_main, t);
+	  ed->seq = mp->local_sequence;
+	  ed->peer = elog_id_for_peer_id (mcm, mp->peer_id.as_u64);
+	}
+
+      return;
+    }
+
+  r = pool_elt_at_index (s->retry_pool, p[0]);
+
+  /* Make sure that this new peer ACKs our msgs from now on */
+  if (peer_created)
+    {
+      mc_retry_t *later_retry = next_retry (s, r);
+
+      while (later_retry)
+	{
+	  later_retry->unacked_by_peer_bitmap =
+	    clib_bitmap_ori (later_retry->unacked_by_peer_bitmap,
+			     peer - s->peers);
+	  later_retry = next_retry (s, later_retry);
+	}
+    }
+
+  ASSERT (mp->local_sequence == r->local_sequence);
+
+  /* If we weren't expecting to hear from this peer */
+  if (!peer_created &&
+      !clib_bitmap_get (r->unacked_by_peer_bitmap, peer - s->peers))
+    {
+      if (MC_EVENT_LOGGING > 0)
+	{
+          /* *INDENT-OFF* */
+	  ELOG_TYPE_DECLARE (t) =
+            {
+              .format = "dup-ack: for seq %d from peer %s",
+              .format_args = "i4T4",
+            };
+          /* *INDENT-ON* */
+	  struct
+	  {
+	    u32 seq;
+	    u32 peer;
+	  } *ed;
+	  ed = ELOG_DATA (mcm->elog_main, t);
+	  ed->seq = r->local_sequence;
+	  ed->peer = elog_id_for_peer_id (mcm, peer->id.as_u64);
+	}
+      if (!clib_bitmap_is_zero (r->unacked_by_peer_bitmap))
+	return;
+    }
+
+  if (MC_EVENT_LOGGING > 0)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (t) =
+        {
+          .format = "ack: for seq %d from peer %s",
+          .format_args = "i4T4",
+        };
+      /* *INDENT-ON* */
+      struct
+      {
+	u32 seq;
+	u32 peer;
+      } *ed;
+      ed = ELOG_DATA (mcm->elog_main, t);
+      ed->seq = mp->local_sequence;
+      ed->peer = elog_id_for_peer_id (mcm, peer->id.as_u64);
+    }
+
+  r->unacked_by_peer_bitmap =
+    clib_bitmap_andnoti (r->unacked_by_peer_bitmap, peer - s->peers);
+
+  /* Not all clients have ack'ed */
+  if (!clib_bitmap_is_zero (r->unacked_by_peer_bitmap))
+    {
+      return;
+    }
+  if (MC_EVENT_LOGGING > 0)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (t) =
+        {
+          .format = "ack: retire fifo elt loc seq %d after %d acks",
+          .format_args = "i4i4",
+        };
+      /* *INDENT-ON* */
+      struct
+      {
+	u32 seq;
+	u32 npeers;
+      } *ed;
+      ed = ELOG_DATA (mcm->elog_main, t);
+      ed->seq = r->local_sequence;
+      ed->npeers = pool_elts (s->peers);
+    }
+
+  hash_unset (s->retry_index_by_local_sequence, mp->local_sequence);
+  mc_retry_free (mcm, s, r);
+  remove_retry_from_pool (s, r);
+  maybe_send_window_open_event (vm, s);
+}
+
+#define EVENT_MC_SEND_CATCHUP_DATA 0
+
+static uword
+mc_catchup_process (vlib_main_t * vm,
+		    vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  mc_main_t *mcm = mc_node_get_main (node);
+  uword *event_data = 0;
+  mc_catchup_process_arg_t *args;
+  int i;
+
+  while (1)
+    {
+      if (event_data)
+	_vec_len (event_data) = 0;
+      vlib_process_wait_for_event_with_type (vm, &event_data,
+					     EVENT_MC_SEND_CATCHUP_DATA);
+
+      for (i = 0; i < vec_len (event_data); i++)
+	{
+	  args = pool_elt_at_index (mcm->catchup_process_args, event_data[i]);
+
+	  mcm->transport.catchup_send_fun (mcm->transport.opaque,
+					   args->catchup_opaque,
+					   args->catchup_snapshot);
+
+	  /* Send function will free snapshot data vector. */
+	  pool_put (mcm->catchup_process_args, args);
+	}
+    }
+
+  return 0;			/* not likely */
+}
+
+static void
+serialize_mc_stream (serialize_main_t * m, va_list * va)
+{
+  mc_stream_t *s = va_arg (*va, mc_stream_t *);
+  mc_stream_peer_t *p;
+
+  serialize_integer (m, pool_elts (s->peers), sizeof (u32));
+  /* *INDENT-OFF* */
+  pool_foreach (p, s->peers, ({
+    u8 * x = serialize_get (m, sizeof (p->id));
+    clib_memcpy (x, p->id.as_u8, sizeof (p->id));
+    serialize_integer (m, p->last_sequence_received,
+                       sizeof (p->last_sequence_received));
+  }));
+/* *INDENT-ON* */
+  serialize_bitmap (m, s->all_peer_bitmap);
+}
+
+void
+unserialize_mc_stream (serialize_main_t * m, va_list * va)
+{
+  mc_stream_t *s = va_arg (*va, mc_stream_t *);
+  u32 i, n_peers;
+  mc_stream_peer_t *p;
+
+  unserialize_integer (m, &n_peers, sizeof (u32));
+  mhash_init (&s->peer_index_by_id, sizeof (uword), sizeof (mc_peer_id_t));
+  for (i = 0; i < n_peers; i++)
+    {
+      u8 *x;
+      pool_get (s->peers, p);
+      x = unserialize_get (m, sizeof (p->id));
+      clib_memcpy (p->id.as_u8, x, sizeof (p->id));
+      unserialize_integer (m, &p->last_sequence_received,
+			   sizeof (p->last_sequence_received));
+      mhash_set (&s->peer_index_by_id, &p->id, p - s->peers,	/* old_value */
+		 0);
+    }
+  s->all_peer_bitmap = unserialize_bitmap (m);
+
+  /* This is really bad. */
+  if (!s->all_peer_bitmap)
+    clib_warning ("BUG: stream %s all_peer_bitmap NULL", s->config.name);
+}
+
+void
+mc_msg_catchup_request_handler (mc_main_t * mcm,
+				mc_msg_catchup_request_t * req,
+				u32 catchup_opaque)
+{
+  vlib_main_t *vm = mcm->vlib_main;
+  mc_stream_t *s;
+  mc_catchup_process_arg_t *args;
+
+  mc_byte_swap_msg_catchup_request (req);
+
+  s = mc_stream_by_index (mcm, req->stream_index);
+  if (!s || s->state != MC_STREAM_STATE_ready)
+    return;
+
+  if (MC_EVENT_LOGGING > 0)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (t) =
+        {
+          .format = "catchup-request: from %s stream %d",
+          .format_args = "T4i4",
+        };
+      /* *INDENT-ON* */
+      struct
+      {
+	u32 peer, stream;
+      } *ed;
+      ed = ELOG_DATA (mcm->elog_main, t);
+      ed->peer = elog_id_for_peer_id (mcm, req->peer_id.as_u64);
+      ed->stream = req->stream_index;
+    }
+
+  /*
+   * The application has to snapshoot its data structures right
+   * here, right now. If we process any messages after
+   * noting the last global sequence we've processed, the client
+   * won't be able to accurately reconstruct our data structures.
+   *
+   * Once the data structures are e.g. vec_dup()'ed, we
+   * send the resulting messages from a separate process, to
+   * make sure that we don't cause a bunch of message retransmissions
+   */
+  pool_get (mcm->catchup_process_args, args);
+
+  args->stream_index = s - mcm->stream_vector;
+  args->catchup_opaque = catchup_opaque;
+  args->catchup_snapshot = 0;
+
+  /* Construct catchup reply and snapshot state for stream to send as
+     catchup reply payload. */
+  {
+    mc_msg_catchup_reply_t *rep;
+    serialize_main_t m;
+
+    vec_resize (args->catchup_snapshot, sizeof (rep[0]));
+
+    rep = (void *) args->catchup_snapshot;
+
+    rep->peer_id = req->peer_id;
+    rep->stream_index = req->stream_index;
+    rep->last_global_sequence_included = s->last_global_sequence_processed;
+
+    /* Setup for serialize to append to catchup snapshot. */
+    serialize_open_vector (&m, args->catchup_snapshot);
+    m.stream.current_buffer_index = vec_len (m.stream.buffer);
+
+    serialize (&m, serialize_mc_stream, s);
+
+    args->catchup_snapshot = serialize_close_vector (&m);
+
+    /* Actually copy internal state */
+    args->catchup_snapshot = s->config.catchup_snapshot
+      (mcm, args->catchup_snapshot, rep->last_global_sequence_included);
+
+    rep = (void *) args->catchup_snapshot;
+    rep->n_data_bytes = vec_len (args->catchup_snapshot) - sizeof (rep[0]);
+
+    mc_byte_swap_msg_catchup_reply (rep);
+  }
+
+  /* now go send it... */
+  vlib_process_signal_event (vm, mcm->catchup_process,
+			     EVENT_MC_SEND_CATCHUP_DATA,
+			     args - mcm->catchup_process_args);
+}
+
+#define EVENT_MC_UNSERIALIZE_BUFFER 0
+#define EVENT_MC_UNSERIALIZE_CATCHUP 1
+
+void
+mc_msg_catchup_reply_handler (mc_main_t * mcm, mc_msg_catchup_reply_t * mp,
+			      u32 catchup_opaque)
+{
+  vlib_process_signal_event (mcm->vlib_main,
+			     mcm->unserialize_process,
+			     EVENT_MC_UNSERIALIZE_CATCHUP,
+			     pointer_to_uword (mp));
+}
+
+static void
+perform_catchup (mc_main_t * mcm, mc_msg_catchup_reply_t * mp)
+{
+  mc_stream_t *s;
+  i32 seq_cmp_result;
+
+  mc_byte_swap_msg_catchup_reply (mp);
+
+  s = mc_stream_by_index (mcm, mp->stream_index);
+
+  /* Never heard of this stream or already caught up. */
+  if (!s || s->state == MC_STREAM_STATE_ready)
+    return;
+
+  {
+    serialize_main_t m;
+    mc_stream_peer_t *p;
+    u32 n_stream_bytes;
+
+    /* For offline sim replay: save the entire catchup snapshot... */
+    if (s->config.save_snapshot)
+      s->config.save_snapshot (mcm, /* is_catchup */ 1, mp->data,
+			       mp->n_data_bytes);
+
+    unserialize_open_data (&m, mp->data, mp->n_data_bytes);
+    unserialize (&m, unserialize_mc_stream, s);
+
+    /* Make sure we start numbering our messages as expected */
+    /* *INDENT-OFF* */
+    pool_foreach (p, s->peers, ({
+      if (p->id.as_u64 == mcm->transport.our_ack_peer_id.as_u64)
+        s->our_local_sequence = p->last_sequence_received + 1;
+    }));
+/* *INDENT-ON* */
+
+    n_stream_bytes = m.stream.current_buffer_index;
+
+    /* No need to unserialize close; nothing to free. */
+
+    /* After serialized stream is user's catchup data. */
+    s->config.catchup (mcm, mp->data + n_stream_bytes,
+		       mp->n_data_bytes - n_stream_bytes);
+  }
+
+  /* Vector could have been moved by catchup.
+     This can only happen for mc-internal stream. */
+  s = mc_stream_by_index (mcm, mp->stream_index);
+
+  s->last_global_sequence_processed = mp->last_global_sequence_included;
+
+  while (clib_fifo_elts (s->catchup_fifo))
+    {
+      mc_msg_user_request_t *gp;
+      u32 bi;
+      vlib_buffer_t *b;
+
+      clib_fifo_sub1 (s->catchup_fifo, bi);
+
+      b = vlib_get_buffer (mcm->vlib_main, bi);
+      gp = vlib_buffer_get_current (b);
+
+      /* Make sure we're replaying "new" news */
+      seq_cmp_result = mc_seq_cmp (gp->global_sequence,
+				   mp->last_global_sequence_included);
+
+      if (seq_cmp_result > 0)
+	{
+	  vlib_buffer_advance (b, sizeof (gp[0]));
+	  s->config.rx_buffer (mcm, s, gp->peer_id, bi);
+	  s->last_global_sequence_processed = gp->global_sequence;
+
+	  if (MC_EVENT_LOGGING)
+	    {
+              /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (t) =
+                {
+                  .format = "catchup replay local sequence 0x%x",
+                  .format_args = "i4",
+                };
+              /* *INDENT-ON* */
+	      struct
+	      {
+		u32 local_sequence;
+	      } *ed;
+	      ed = ELOG_DATA (mcm->elog_main, t);
+	      ed->local_sequence = gp->local_sequence;
+	    }
+	}
+      else
+	{
+	  if (MC_EVENT_LOGGING)
+	    {
+              /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (t) =
+                {
+                  .format = "catchup discard local sequence 0x%x",
+                  .format_args = "i4",
+                };
+              /* *INDENT-ON* */
+	      struct
+	      {
+		u32 local_sequence;
+	      } *ed;
+	      ed = ELOG_DATA (mcm->elog_main, t);
+	      ed->local_sequence = gp->local_sequence;
+	    }
+
+	  vlib_buffer_free_one (mcm->vlib_main, bi);
+	}
+    }
+
+  s->state = MC_STREAM_STATE_ready;
+
+  /* Now that we are caught up wake up joining process. */
+  {
+    vlib_one_time_waiting_process_t *wp;
+    vec_foreach (wp, s->procs_waiting_for_join_done)
+      vlib_signal_one_time_waiting_process (mcm->vlib_main, wp);
+    if (s->procs_waiting_for_join_done)
+      _vec_len (s->procs_waiting_for_join_done) = 0;
+  }
+}
+
+static void
+this_node_maybe_master (mc_main_t * mcm)
+{
+  vlib_main_t *vm = mcm->vlib_main;
+  mc_msg_master_assert_t *mp;
+  uword event_type;
+  int timeouts = 0;
+  int is_master = mcm->relay_state == MC_RELAY_STATE_MASTER;
+  clib_error_t *error;
+  f64 now, time_last_master_assert = -1;
+  u32 bi;
+
+  while (1)
+    {
+      if (!mcm->we_can_be_relay_master)
+	{
+	  mcm->relay_state = MC_RELAY_STATE_SLAVE;
+	  if (MC_EVENT_LOGGING)
+	    {
+	      ELOG_TYPE (e, "become slave (config)");
+	      ELOG (mcm->elog_main, e, 0);
+	    }
+	  return;
+	}
+
+      now = vlib_time_now (vm);
+      if (now >= time_last_master_assert + 1)
+	{
+	  time_last_master_assert = now;
+	  mp = mc_get_vlib_buffer (mcm->vlib_main, sizeof (mp[0]), &bi);
+
+	  mp->peer_id = mcm->transport.our_ack_peer_id;
+	  mp->global_sequence = mcm->relay_global_sequence;
+
+	  /*
+	   * these messages clog the event log, set MC_EVENT_LOGGING higher
+	   * if you want them
+	   */
+	  if (MC_EVENT_LOGGING > 1)
+	    {
+              /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+                {
+                  .format = "tx-massert: peer %s global seq %u",
+                  .format_args = "T4i4",
+                };
+              /* *INDENT-ON* */
+	      struct
+	      {
+		u32 peer, global_sequence;
+	      } *ed;
+	      ed = ELOG_DATA (mcm->elog_main, e);
+	      ed->peer = elog_id_for_peer_id (mcm, mp->peer_id.as_u64);
+	      ed->global_sequence = mp->global_sequence;
+	    }
+
+	  mc_byte_swap_msg_master_assert (mp);
+
+	  error =
+	    mcm->transport.tx_buffer (mcm->transport.opaque,
+				      MC_TRANSPORT_MASTERSHIP, bi);
+	  if (error)
+	    clib_error_report (error);
+	}
+
+      vlib_process_wait_for_event_or_clock (vm, 1.0);
+      event_type = vlib_process_get_events (vm, /* no event data */ 0);
+
+      switch (event_type)
+	{
+	case ~0:
+	  if (!is_master && timeouts++ > 2)
+	    {
+	      mcm->relay_state = MC_RELAY_STATE_MASTER;
+	      mcm->relay_master_peer_id =
+		mcm->transport.our_ack_peer_id.as_u64;
+	      if (MC_EVENT_LOGGING)
+		{
+		  ELOG_TYPE (e, "become master (was maybe_master)");
+		  ELOG (mcm->elog_main, e, 0);
+		}
+	      return;
+	    }
+	  break;
+
+	case MC_RELAY_STATE_SLAVE:
+	  mcm->relay_state = MC_RELAY_STATE_SLAVE;
+	  if (MC_EVENT_LOGGING && mcm->relay_state != MC_RELAY_STATE_SLAVE)
+	    {
+	      ELOG_TYPE (e, "become slave (was maybe_master)");
+	      ELOG (mcm->elog_main, e, 0);
+	    }
+	  return;
+	}
+    }
+}
+
+static void
+this_node_slave (mc_main_t * mcm)
+{
+  vlib_main_t *vm = mcm->vlib_main;
+  uword event_type;
+  int timeouts = 0;
+
+  if (MC_EVENT_LOGGING)
+    {
+      ELOG_TYPE (e, "become slave");
+      ELOG (mcm->elog_main, e, 0);
+    }
+
+  while (1)
+    {
+      vlib_process_wait_for_event_or_clock (vm, 1.0);
+      event_type = vlib_process_get_events (vm, /* no event data */ 0);
+
+      switch (event_type)
+	{
+	case ~0:
+	  if (timeouts++ > 2)
+	    {
+	      mcm->relay_state = MC_RELAY_STATE_NEGOTIATE;
+	      mcm->relay_master_peer_id = ~0ULL;
+	      if (MC_EVENT_LOGGING)
+		{
+		  ELOG_TYPE (e, "timeouts; negoitate mastership");
+		  ELOG (mcm->elog_main, e, 0);
+		}
+	      return;
+	    }
+	  break;
+
+	case MC_RELAY_STATE_SLAVE:
+	  mcm->relay_state = MC_RELAY_STATE_SLAVE;
+	  timeouts = 0;
+	  break;
+	}
+    }
+}
+
+static uword
+mc_mastership_process (vlib_main_t * vm,
+		       vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  mc_main_t *mcm = mc_node_get_main (node);
+
+  while (1)
+    {
+      switch (mcm->relay_state)
+	{
+	case MC_RELAY_STATE_NEGOTIATE:
+	case MC_RELAY_STATE_MASTER:
+	  this_node_maybe_master (mcm);
+	  break;
+
+	case MC_RELAY_STATE_SLAVE:
+	  this_node_slave (mcm);
+	  break;
+	}
+    }
+  return 0;			/* not likely */
+}
+
+void
+mc_enable_disable_mastership (mc_main_t * mcm, int we_can_be_master)
+{
+  if (we_can_be_master != mcm->we_can_be_relay_master)
+    {
+      mcm->we_can_be_relay_master = we_can_be_master;
+      vlib_process_signal_event (mcm->vlib_main,
+				 mcm->mastership_process,
+				 MC_RELAY_STATE_NEGOTIATE, 0);
+    }
+}
+
+void
+mc_msg_master_assert_handler (mc_main_t * mcm, mc_msg_master_assert_t * mp,
+			      u32 buffer_index)
+{
+  mc_peer_id_t his_peer_id, our_peer_id;
+  i32 seq_cmp_result;
+  u8 signal_slave = 0;
+  u8 update_global_sequence = 0;
+
+  mc_byte_swap_msg_master_assert (mp);
+
+  his_peer_id = mp->peer_id;
+  our_peer_id = mcm->transport.our_ack_peer_id;
+
+  /* compare the incoming global sequence with ours */
+  seq_cmp_result = mc_seq_cmp (mp->global_sequence,
+			       mcm->relay_global_sequence);
+
+  /* If the sender has a lower peer id and the sender's sequence >=
+     our global sequence, we become a slave.  Otherwise we are master. */
+  if (mc_peer_id_compare (his_peer_id, our_peer_id) < 0
+      && seq_cmp_result >= 0)
+    {
+      vlib_process_signal_event (mcm->vlib_main,
+				 mcm->mastership_process,
+				 MC_RELAY_STATE_SLAVE, 0);
+      signal_slave = 1;
+    }
+
+  /* Update our global sequence. */
+  if (seq_cmp_result > 0)
+    {
+      mcm->relay_global_sequence = mp->global_sequence;
+      update_global_sequence = 1;
+    }
+
+  {
+    uword *q = mhash_get (&mcm->mastership_peer_index_by_id, &his_peer_id);
+    mc_mastership_peer_t *p;
+
+    if (q)
+      p = vec_elt_at_index (mcm->mastership_peers, q[0]);
+    else
+      {
+	vec_add2 (mcm->mastership_peers, p, 1);
+	p->peer_id = his_peer_id;
+	mhash_set (&mcm->mastership_peer_index_by_id, &p->peer_id,
+		   p - mcm->mastership_peers,
+		   /* old_value */ 0);
+      }
+    p->time_last_master_assert_received = vlib_time_now (mcm->vlib_main);
+  }
+
+  /*
+   * these messages clog the event log, set MC_EVENT_LOGGING higher
+   * if you want them.
+   */
+  if (MC_EVENT_LOGGING > 1)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (e) =
+        {
+          .format = "rx-massert: peer %s global seq %u upd %d slave %d",
+          .format_args = "T4i4i1i1",
+        };
+      /* *INDENT-ON* */
+
+      struct
+      {
+	u32 peer;
+	u32 global_sequence;
+	u8 update_sequence;
+	u8 slave;
+      } *ed;
+      ed = ELOG_DATA (mcm->elog_main, e);
+      ed->peer = elog_id_for_peer_id (mcm, his_peer_id.as_u64);
+      ed->global_sequence = mp->global_sequence;
+      ed->update_sequence = update_global_sequence;
+      ed->slave = signal_slave;
+    }
+}
+
+static void
+mc_serialize_init (mc_main_t * mcm)
+{
+  mc_serialize_msg_t *m;
+  vlib_main_t *vm = vlib_get_main ();
+
+  mcm->global_msg_index_by_name
+    = hash_create_string ( /* elts */ 0, sizeof (uword));
+
+  m = vm->mc_msg_registrations;
+
+  while (m)
+    {
+      m->global_index = vec_len (mcm->global_msgs);
+      hash_set_mem (mcm->global_msg_index_by_name, m->name, m->global_index);
+      vec_add1 (mcm->global_msgs, m);
+      m = m->next_registration;
+    }
+}
+
+clib_error_t *
+mc_serialize_va (mc_main_t * mc,
+		 u32 stream_index,
+		 u32 multiple_messages_per_vlib_buffer,
+		 mc_serialize_msg_t * msg, va_list * va)
+{
+  mc_stream_t *s;
+  clib_error_t *error;
+  serialize_main_t *m = &mc->serialize_mains[VLIB_TX];
+  vlib_serialize_buffer_main_t *sbm = &mc->serialize_buffer_mains[VLIB_TX];
+  u32 bi, n_before, n_after, n_total, n_this_msg;
+  u32 si, gi;
+
+  if (!sbm->vlib_main)
+    {
+      sbm->tx.max_n_data_bytes_per_chain = 4096;
+      sbm->tx.free_list_index = VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX;
+    }
+
+  if (sbm->first_buffer == 0)
+    serialize_open_vlib_buffer (m, mc->vlib_main, sbm);
+
+  n_before = serialize_vlib_buffer_n_bytes (m);
+
+  s = mc_stream_by_index (mc, stream_index);
+  gi = msg->global_index;
+  ASSERT (msg == vec_elt (mc->global_msgs, gi));
+
+  si = ~0;
+  if (gi < vec_len (s->stream_msg_index_by_global_index))
+    si = s->stream_msg_index_by_global_index[gi];
+
+  serialize_likely_small_unsigned_integer (m, si);
+
+  /* For first time message is sent, use name to identify message. */
+  if (si == ~0 || MSG_ID_DEBUG)
+    serialize_cstring (m, msg->name);
+
+  if (MSG_ID_DEBUG && MC_EVENT_LOGGING > 0)
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (e) =
+        {
+          .format = "serialize-msg: %s index %d",
+          .format_args = "T4i4",
+        };
+      /* *INDENT-ON* */
+      struct
+      {
+	u32 c[2];
+      } *ed;
+      ed = ELOG_DATA (mc->elog_main, e);
+      ed->c[0] = elog_id_for_msg_name (mc, msg->name);
+      ed->c[1] = si;
+    }
+
+  error = va_serialize (m, va);
+
+  n_after = serialize_vlib_buffer_n_bytes (m);
+  n_this_msg = n_after - n_before;
+  n_total = n_after + sizeof (mc_msg_user_request_t);
+
+  /* For max message size ignore first message where string name is sent. */
+  if (si != ~0)
+    msg->max_n_bytes_serialized =
+      clib_max (msg->max_n_bytes_serialized, n_this_msg);
+
+  if (!multiple_messages_per_vlib_buffer
+      || si == ~0
+      || n_total + msg->max_n_bytes_serialized >
+      mc->transport.max_packet_size)
+    {
+      bi = serialize_close_vlib_buffer (m);
+      sbm->first_buffer = 0;
+      if (!error)
+	mc_stream_send (mc, stream_index, bi);
+      else if (bi != ~0)
+	vlib_buffer_free_one (mc->vlib_main, bi);
+    }
+
+  return error;
+}
+
+clib_error_t *
+mc_serialize_internal (mc_main_t * mc,
+		       u32 stream_index,
+		       u32 multiple_messages_per_vlib_buffer,
+		       mc_serialize_msg_t * msg, ...)
+{
+  vlib_main_t *vm = mc->vlib_main;
+  va_list va;
+  clib_error_t *error;
+
+  if (stream_index == ~0)
+    {
+      if (vm->mc_main && vm->mc_stream_index == ~0)
+	vlib_current_process_wait_for_one_time_event_vector
+	  (vm, &vm->procs_waiting_for_mc_stream_join);
+      stream_index = vm->mc_stream_index;
+    }
+
+  va_start (va, msg);
+  error = mc_serialize_va (mc, stream_index,
+			   multiple_messages_per_vlib_buffer, msg, &va);
+  va_end (va);
+  return error;
+}
+
+uword
+mc_unserialize_message (mc_main_t * mcm,
+			mc_stream_t * s, serialize_main_t * m)
+{
+  mc_serialize_stream_msg_t *sm;
+  u32 gi, si;
+
+  si = unserialize_likely_small_unsigned_integer (m);
+
+  if (!(si == ~0 || MSG_ID_DEBUG))
+    {
+      sm = vec_elt_at_index (s->stream_msgs, si);
+      gi = sm->global_index;
+    }
+  else
+    {
+      char *name;
+
+      unserialize_cstring (m, &name);
+
+      if (MSG_ID_DEBUG && MC_EVENT_LOGGING > 0)
+	{
+          /* *INDENT-OFF* */
+	  ELOG_TYPE_DECLARE (e) =
+            {
+              .format = "unserialize-msg: %s rx index %d",
+              .format_args = "T4i4",
+            };
+          /* *INDENT-ON* */
+	  struct
+	  {
+	    u32 c[2];
+	  } *ed;
+	  ed = ELOG_DATA (mcm->elog_main, e);
+	  ed->c[0] = elog_id_for_msg_name (mcm, name);
+	  ed->c[1] = si;
+	}
+
+      {
+	uword *p = hash_get_mem (mcm->global_msg_index_by_name, name);
+	gi = p ? p[0] : ~0;
+      }
+
+      /* Unknown message? */
+      if (gi == ~0)
+	{
+	  vec_free (name);
+	  goto done;
+	}
+
+      vec_validate_init_empty (s->stream_msg_index_by_global_index, gi, ~0);
+      si = s->stream_msg_index_by_global_index[gi];
+
+      /* Stream local index unknown?  Create it. */
+      if (si == ~0)
+	{
+	  vec_add2 (s->stream_msgs, sm, 1);
+
+	  si = sm - s->stream_msgs;
+	  sm->global_index = gi;
+	  s->stream_msg_index_by_global_index[gi] = si;
+
+	  if (MC_EVENT_LOGGING > 0)
+	    {
+              /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+                {
+                  .format = "msg-bind: stream %d %s to index %d",
+                  .format_args = "i4T4i4",
+                };
+              /* *INDENT-ON* */
+	      struct
+	      {
+		u32 c[3];
+	      } *ed;
+	      ed = ELOG_DATA (mcm->elog_main, e);
+	      ed->c[0] = s->index;
+	      ed->c[1] = elog_id_for_msg_name (mcm, name);
+	      ed->c[2] = si;
+	    }
+	}
+      else
+	{
+	  sm = vec_elt_at_index (s->stream_msgs, si);
+	  if (gi != sm->global_index && MC_EVENT_LOGGING > 0)
+	    {
+              /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+                {
+                  .format = "msg-id-ERROR: %s index %d expected %d",
+                  .format_args = "T4i4i4",
+                };
+              /* *INDENT-ON* */
+	      struct
+	      {
+		u32 c[3];
+	      } *ed;
+	      ed = ELOG_DATA (mcm->elog_main, e);
+	      ed->c[0] = elog_id_for_msg_name (mcm, name);
+	      ed->c[1] = si;
+	      ed->c[2] = ~0;
+	      if (sm->global_index <
+		  vec_len (s->stream_msg_index_by_global_index))
+		ed->c[2] =
+		  s->stream_msg_index_by_global_index[sm->global_index];
+	    }
+	}
+
+      vec_free (name);
+    }
+
+  if (gi != ~0)
+    {
+      mc_serialize_msg_t *msg;
+      msg = vec_elt (mcm->global_msgs, gi);
+      unserialize (m, msg->unserialize, mcm);
+    }
+
+done:
+  return gi != ~0;
+}
+
+void
+mc_unserialize_internal (mc_main_t * mcm, u32 stream_and_buffer_index)
+{
+  vlib_main_t *vm = mcm->vlib_main;
+  serialize_main_t *m = &mcm->serialize_mains[VLIB_RX];
+  vlib_serialize_buffer_main_t *sbm = &mcm->serialize_buffer_mains[VLIB_RX];
+  mc_stream_and_buffer_t *sb;
+  mc_stream_t *stream;
+  u32 buffer_index;
+
+  sb =
+    pool_elt_at_index (mcm->mc_unserialize_stream_and_buffers,
+		       stream_and_buffer_index);
+  buffer_index = sb->buffer_index;
+  stream = vec_elt_at_index (mcm->stream_vector, sb->stream_index);
+  pool_put (mcm->mc_unserialize_stream_and_buffers, sb);
+
+  if (stream->config.save_snapshot)
+    {
+      u32 n_bytes = vlib_buffer_index_length_in_chain (vm, buffer_index);
+      static u8 *contents;
+      vec_reset_length (contents);
+      vec_validate (contents, n_bytes - 1);
+      vlib_buffer_contents (vm, buffer_index, contents);
+      stream->config.save_snapshot (mcm, /* is_catchup */ 0, contents,
+				    n_bytes);
+    }
+
+  ASSERT (vlib_in_process_context (vm));
+
+  unserialize_open_vlib_buffer (m, vm, sbm);
+
+  clib_fifo_add1 (sbm->rx.buffer_fifo, buffer_index);
+
+  while (unserialize_vlib_buffer_n_bytes (m) > 0)
+    mc_unserialize_message (mcm, stream, m);
+
+  /* Frees buffer. */
+  unserialize_close_vlib_buffer (m);
+}
+
+void
+mc_unserialize (mc_main_t * mcm, mc_stream_t * s, u32 buffer_index)
+{
+  vlib_main_t *vm = mcm->vlib_main;
+  mc_stream_and_buffer_t *sb;
+  pool_get (mcm->mc_unserialize_stream_and_buffers, sb);
+  sb->stream_index = s->index;
+  sb->buffer_index = buffer_index;
+  vlib_process_signal_event (vm, mcm->unserialize_process,
+			     EVENT_MC_UNSERIALIZE_BUFFER,
+			     sb - mcm->mc_unserialize_stream_and_buffers);
+}
+
+static uword
+mc_unserialize_process (vlib_main_t * vm,
+			vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  mc_main_t *mcm = mc_node_get_main (node);
+  uword event_type, *event_data = 0;
+  int i;
+
+  while (1)
+    {
+      if (event_data)
+	_vec_len (event_data) = 0;
+
+      vlib_process_wait_for_event (vm);
+      event_type = vlib_process_get_events (vm, &event_data);
+      switch (event_type)
+	{
+	case EVENT_MC_UNSERIALIZE_BUFFER:
+	  for (i = 0; i < vec_len (event_data); i++)
+	    mc_unserialize_internal (mcm, event_data[i]);
+	  break;
+
+	case EVENT_MC_UNSERIALIZE_CATCHUP:
+	  for (i = 0; i < vec_len (event_data); i++)
+	    {
+	      u8 *mp = uword_to_pointer (event_data[i], u8 *);
+	      perform_catchup (mcm, (void *) mp);
+	      vec_free (mp);
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return 0;			/* not likely */
+}
+
+void
+serialize_mc_main (serialize_main_t * m, va_list * va)
+{
+  mc_main_t *mcm = va_arg (*va, mc_main_t *);
+  mc_stream_t *s;
+  mc_serialize_stream_msg_t *sm;
+  mc_serialize_msg_t *msg;
+
+  serialize_integer (m, vec_len (mcm->stream_vector), sizeof (u32));
+  vec_foreach (s, mcm->stream_vector)
+  {
+    /* Stream name. */
+    serialize_cstring (m, s->config.name);
+
+    /* Serialize global names for all sent messages. */
+    serialize_integer (m, vec_len (s->stream_msgs), sizeof (u32));
+    vec_foreach (sm, s->stream_msgs)
+    {
+      msg = vec_elt (mcm->global_msgs, sm->global_index);
+      serialize_cstring (m, msg->name);
+    }
+  }
+}
+
+void
+unserialize_mc_main (serialize_main_t * m, va_list * va)
+{
+  mc_main_t *mcm = va_arg (*va, mc_main_t *);
+  u32 i, n_streams, n_stream_msgs;
+  char *name;
+  mc_stream_t *s;
+  mc_serialize_stream_msg_t *sm;
+
+  unserialize_integer (m, &n_streams, sizeof (u32));
+  for (i = 0; i < n_streams; i++)
+    {
+      unserialize_cstring (m, &name);
+      if (i != MC_STREAM_INDEX_INTERNAL && !mc_stream_by_name (mcm, name))
+	{
+	  vec_validate (mcm->stream_vector, i);
+	  s = vec_elt_at_index (mcm->stream_vector, i);
+	  mc_stream_init (s);
+	  s->index = s - mcm->stream_vector;
+	  s->config.name = name;
+	  s->state = MC_STREAM_STATE_name_known;
+	  hash_set_mem (mcm->stream_index_by_name, s->config.name, s->index);
+	}
+      else
+	vec_free (name);
+
+      s = vec_elt_at_index (mcm->stream_vector, i);
+
+      vec_free (s->stream_msgs);
+      vec_free (s->stream_msg_index_by_global_index);
+
+      unserialize_integer (m, &n_stream_msgs, sizeof (u32));
+      vec_resize (s->stream_msgs, n_stream_msgs);
+      vec_foreach (sm, s->stream_msgs)
+      {
+	uword *p;
+	u32 si, gi;
+
+	unserialize_cstring (m, &name);
+	p = hash_get (mcm->global_msg_index_by_name, name);
+	gi = p ? p[0] : ~0;
+	si = sm - s->stream_msgs;
+
+	if (MC_EVENT_LOGGING > 0)
+	  {
+            /* *INDENT-OFF* */
+	    ELOG_TYPE_DECLARE (e) =
+              {
+                .format = "catchup-bind: %s to %d global index %d stream %d",
+                .format_args = "T4i4i4i4",
+              };
+            /* *INDENT-ON* */
+
+	    struct
+	    {
+	      u32 c[4];
+	    } *ed;
+	    ed = ELOG_DATA (mcm->elog_main, e);
+	    ed->c[0] = elog_id_for_msg_name (mcm, name);
+	    ed->c[1] = si;
+	    ed->c[2] = gi;
+	    ed->c[3] = s->index;
+	  }
+
+	vec_free (name);
+
+	sm->global_index = gi;
+	if (gi != ~0)
+	  {
+	    vec_validate_init_empty (s->stream_msg_index_by_global_index,
+				     gi, ~0);
+	    s->stream_msg_index_by_global_index[gi] = si;
+	  }
+      }
+    }
+}
+
+void
+mc_main_init (mc_main_t * mcm, char *tag)
+{
+  vlib_main_t *vm = vlib_get_main ();
+
+  mcm->vlib_main = vm;
+  mcm->elog_main = &vm->elog_main;
+
+  mcm->relay_master_peer_id = ~0ULL;
+  mcm->relay_state = MC_RELAY_STATE_NEGOTIATE;
+
+  mcm->stream_index_by_name
+    = hash_create_string ( /* elts */ 0, /* value size */ sizeof (uword));
+
+  {
+    vlib_node_registration_t r;
+
+    memset (&r, 0, sizeof (r));
+
+    r.type = VLIB_NODE_TYPE_PROCESS;
+
+    /* Point runtime data to main instance. */
+    r.runtime_data = &mcm;
+    r.runtime_data_bytes = sizeof (&mcm);
+
+    r.name = (char *) format (0, "mc-mastership-%s", tag);
+    r.function = mc_mastership_process;
+    mcm->mastership_process = vlib_register_node (vm, &r);
+
+    r.name = (char *) format (0, "mc-join-ager-%s", tag);
+    r.function = mc_join_ager_process;
+    mcm->join_ager_process = vlib_register_node (vm, &r);
+
+    r.name = (char *) format (0, "mc-retry-%s", tag);
+    r.function = mc_retry_process;
+    mcm->retry_process = vlib_register_node (vm, &r);
+
+    r.name = (char *) format (0, "mc-catchup-%s", tag);
+    r.function = mc_catchup_process;
+    mcm->catchup_process = vlib_register_node (vm, &r);
+
+    r.name = (char *) format (0, "mc-unserialize-%s", tag);
+    r.function = mc_unserialize_process;
+    mcm->unserialize_process = vlib_register_node (vm, &r);
+  }
+
+  if (MC_EVENT_LOGGING > 0)
+    mhash_init (&mcm->elog_id_by_peer_id, sizeof (uword),
+		sizeof (mc_peer_id_t));
+
+  mhash_init (&mcm->mastership_peer_index_by_id, sizeof (uword),
+	      sizeof (mc_peer_id_t));
+  mc_serialize_init (mcm);
+}
+
+static u8 *
+format_mc_relay_state (u8 * s, va_list * args)
+{
+  mc_relay_state_t state = va_arg (*args, mc_relay_state_t);
+  char *t = 0;
+  switch (state)
+    {
+    case MC_RELAY_STATE_NEGOTIATE:
+      t = "negotiate";
+      break;
+    case MC_RELAY_STATE_MASTER:
+      t = "master";
+      break;
+    case MC_RELAY_STATE_SLAVE:
+      t = "slave";
+      break;
+    default:
+      return format (s, "unknown 0x%x", state);
+    }
+
+  return format (s, "%s", t);
+}
+
+static u8 *
+format_mc_stream_state (u8 * s, va_list * args)
+{
+  mc_stream_state_t state = va_arg (*args, mc_stream_state_t);
+  char *t = 0;
+  switch (state)
+    {
+#define _(f) case MC_STREAM_STATE_##f: t = #f; break;
+      foreach_mc_stream_state
+#undef _
+    default:
+      return format (s, "unknown 0x%x", state);
+    }
+
+  return format (s, "%s", t);
+}
+
+static int
+mc_peer_comp (void *a1, void *a2)
+{
+  mc_stream_peer_t *p1 = a1;
+  mc_stream_peer_t *p2 = a2;
+
+  return mc_peer_id_compare (p1->id, p2->id);
+}
+
+u8 *
+format_mc_main (u8 * s, va_list * args)
+{
+  mc_main_t *mcm = va_arg (*args, mc_main_t *);
+  mc_stream_t *t;
+  mc_stream_peer_t *p, *ps;
+  uword indent = format_get_indent (s);
+
+  s = format (s, "MC state %U, %d streams joined, global sequence 0x%x",
+	      format_mc_relay_state, mcm->relay_state,
+	      vec_len (mcm->stream_vector), mcm->relay_global_sequence);
+
+  {
+    mc_mastership_peer_t *mp;
+    f64 now = vlib_time_now (mcm->vlib_main);
+    s = format (s, "\n%UMost recent mastership peers:",
+		format_white_space, indent + 2);
+    vec_foreach (mp, mcm->mastership_peers)
+    {
+      s = format (s, "\n%U%-30U%.4e",
+		  format_white_space, indent + 4,
+		  mcm->transport.format_peer_id, mp->peer_id,
+		  now - mp->time_last_master_assert_received);
+    }
+  }
+
+  vec_foreach (t, mcm->stream_vector)
+  {
+    s = format (s, "\n%Ustream `%s' index %d",
+		format_white_space, indent + 2, t->config.name, t->index);
+
+    s = format (s, "\n%Ustate %U",
+		format_white_space, indent + 4,
+		format_mc_stream_state, t->state);
+
+    s =
+      format (s,
+	      "\n%Uretries: interval %.0f sec, limit %d, pool elts %d, %Ld sent",
+	      format_white_space, indent + 4, t->config.retry_interval,
+	      t->config.retry_limit, pool_elts (t->retry_pool),
+	      t->stats.n_retries - t->stats_last_clear.n_retries);
+
+    s = format (s, "\n%U%Ld/%Ld user requests sent/received",
+		format_white_space, indent + 4,
+		t->user_requests_sent, t->user_requests_received);
+
+    s = format (s, "\n%U%d peers, local/global sequence 0x%x/0x%x",
+		format_white_space, indent + 4,
+		pool_elts (t->peers),
+		t->our_local_sequence, t->last_global_sequence_processed);
+
+    ps = 0;
+    /* *INDENT-OFF* */
+    pool_foreach (p, t->peers,
+    ({
+      if (clib_bitmap_get (t->all_peer_bitmap, p - t->peers))
+        vec_add1 (ps, p[0]);
+    }));
+    /* *INDENT-ON* */
+    vec_sort_with_function (ps, mc_peer_comp);
+    s = format (s, "\n%U%=30s%10s%16s%16s",
+		format_white_space, indent + 6,
+		"Peer", "Last seq", "Retries", "Future");
+
+    vec_foreach (p, ps)
+    {
+      s = format (s, "\n%U%-30U0x%08x%16Ld%16Ld%s",
+		  format_white_space, indent + 6,
+		  mcm->transport.format_peer_id, p->id.as_u64,
+		  p->last_sequence_received,
+		  p->stats.n_msgs_from_past -
+		  p->stats_last_clear.n_msgs_from_past,
+		  p->stats.n_msgs_from_future -
+		  p->stats_last_clear.n_msgs_from_future,
+		  (mcm->transport.our_ack_peer_id.as_u64 ==
+		   p->id.as_u64 ? " (self)" : ""));
+    }
+    vec_free (ps);
+  }
+
+  return s;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/mc.h b/src/vlib/mc.h
new file mode 100644
index 00000000..dc95b0e9
--- /dev/null
+++ b/src/vlib/mc.h
@@ -0,0 +1,687 @@
+/*
+ * mc.h: vlib reliable sequenced multicast distributed applications
+ *
+ * Copyright (c) 2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_vlib_mc_h
+#define included_vlib_mc_h
+
+#include <vppinfra/elog.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/mhash.h>
+#include <vlib/node.h>
+
+#ifndef MC_EVENT_LOGGING
+#define MC_EVENT_LOGGING 1
+#endif
+
+always_inline uword
+mc_need_byte_swap (void)
+{
+  return CLIB_ARCH_IS_LITTLE_ENDIAN;
+}
+
+/*
+ * Used to uniquely identify hosts.
+ * For IP4 this would be ip4_address plus tcp/udp port.
+ */
+typedef union
+{
+  u8 as_u8[8];
+  u64 as_u64;
+} mc_peer_id_t;
+
+always_inline mc_peer_id_t
+mc_byte_swap_peer_id (mc_peer_id_t i)
+{
+  /* Peer id is already in network byte order. */
+  return i;
+}
+
+always_inline int
+mc_peer_id_compare (mc_peer_id_t a, mc_peer_id_t b)
+{
+  return memcmp (a.as_u8, b.as_u8, sizeof (a.as_u8));
+}
+
+/* Assert mastership.  Lowest peer_id amount all peers wins mastership.
+   Only sent/received over mastership channel (MC_TRANSPORT_MASTERSHIP).
+   So, we don't need a message opcode. */
+typedef CLIB_PACKED (struct
+		     {
+		     /* Peer id asserting mastership. */
+		     mc_peer_id_t peer_id;
+		     /* Global sequence number asserted. */
+		     u32 global_sequence;}) mc_msg_master_assert_t;
+
+always_inline void
+mc_byte_swap_msg_master_assert (mc_msg_master_assert_t * r)
+{
+  if (mc_need_byte_swap ())
+    {
+      r->peer_id = mc_byte_swap_peer_id (r->peer_id);
+      r->global_sequence = clib_byte_swap_u32 (r->global_sequence);
+    }
+}
+
+#define foreach_mc_msg_type			\
+  _ (master_assert)				\
+  _ (join_or_leave_request)			\
+  _ (join_reply)				\
+  _ (user_request)				\
+  _ (user_ack)					\
+  _ (catchup_request)				\
+  _ (catchup_reply)
+
+typedef enum
+{
+#define _(f) MC_MSG_TYPE_##f,
+  foreach_mc_msg_type
+#undef _
+} mc_relay_msg_type_t;
+
+/* Request to join a given stream.  Multicast over MC_TRANSPORT_JOIN. */
+typedef CLIB_PACKED (struct
+		     {
+mc_peer_id_t peer_id; mc_relay_msg_type_t type:32;
+		     /* MC_MSG_TYPE_join_or_leave_request */
+		     /* Stream to join or leave. */
+		     u32 stream_index;
+		     /* join = 1, leave = 0 */
+		     u8 is_join;}) mc_msg_join_or_leave_request_t;
+
+always_inline void
+mc_byte_swap_msg_join_or_leave_request (mc_msg_join_or_leave_request_t * r)
+{
+  if (mc_need_byte_swap ())
+    {
+      r->peer_id = mc_byte_swap_peer_id (r->peer_id);
+      r->type = clib_byte_swap_u32 (r->type);
+      r->stream_index = clib_byte_swap_u32 (r->stream_index);
+    }
+}
+
+/* Join reply.  Multicast over MC_TRANSPORT_JOIN. */
+typedef CLIB_PACKED (struct
+		     {
+mc_peer_id_t peer_id; mc_relay_msg_type_t type:32;
+		     /* MC_MSG_TYPE_join_reply */
+		     u32 stream_index;
+		     /* Peer ID to contact to catchup with this stream. */
+		     mc_peer_id_t catchup_peer_id;}) mc_msg_join_reply_t;
+
+always_inline void
+mc_byte_swap_msg_join_reply (mc_msg_join_reply_t * r)
+{
+  if (mc_need_byte_swap ())
+    {
+      r->peer_id = mc_byte_swap_peer_id (r->peer_id);
+      r->type = clib_byte_swap_u32 (r->type);
+      r->stream_index = clib_byte_swap_u32 (r->stream_index);
+      r->catchup_peer_id = mc_byte_swap_peer_id (r->catchup_peer_id);
+    }
+}
+
+/* Generic (application) request.  Multicast over MC_TRANSPORT_USER_REQUEST_TO_RELAY and then
+   relayed by relay master after filling in global sequence number. */
+typedef CLIB_PACKED (struct
+		     {
+		     mc_peer_id_t peer_id; u32 stream_index;
+		     /* Global sequence number as filled in by relay master. */
+		     u32 global_sequence;
+		     /* Local sequence number as filled in by peer sending message. */
+		     u32 local_sequence;
+		     /* Size of request data. */
+		     u32 n_data_bytes;
+		     /* Opaque request data. */
+		     u8 data[0];}) mc_msg_user_request_t;
+
+always_inline void
+mc_byte_swap_msg_user_request (mc_msg_user_request_t * r)
+{
+  if (mc_need_byte_swap ())
+    {
+      r->peer_id = mc_byte_swap_peer_id (r->peer_id);
+      r->stream_index = clib_byte_swap_u32 (r->stream_index);
+      r->global_sequence = clib_byte_swap_u32 (r->global_sequence);
+      r->local_sequence = clib_byte_swap_u32 (r->local_sequence);
+      r->n_data_bytes = clib_byte_swap_u32 (r->n_data_bytes);
+    }
+}
+
+/* Sent unicast over ACK channel. */
+typedef CLIB_PACKED (struct
+		     {
+		     mc_peer_id_t peer_id;
+		     u32 global_sequence; u32 stream_index;
+		     u32 local_sequence;
+		     i32 seq_cmp_result;}) mc_msg_user_ack_t;
+
+always_inline void
+mc_byte_swap_msg_user_ack (mc_msg_user_ack_t * r)
+{
+  if (mc_need_byte_swap ())
+    {
+      r->peer_id = mc_byte_swap_peer_id (r->peer_id);
+      r->stream_index = clib_byte_swap_u32 (r->stream_index);
+      r->global_sequence = clib_byte_swap_u32 (r->global_sequence);
+      r->local_sequence = clib_byte_swap_u32 (r->local_sequence);
+      r->seq_cmp_result = clib_byte_swap_i32 (r->seq_cmp_result);
+    }
+}
+
+/* Sent/received unicast over catchup channel (e.g. using TCP). */
+typedef CLIB_PACKED (struct
+		     {
+		     mc_peer_id_t peer_id;
+		     u32 stream_index;}) mc_msg_catchup_request_t;
+
+always_inline void
+mc_byte_swap_msg_catchup_request (mc_msg_catchup_request_t * r)
+{
+  if (mc_need_byte_swap ())
+    {
+      r->peer_id = mc_byte_swap_peer_id (r->peer_id);
+      r->stream_index = clib_byte_swap_u32 (r->stream_index);
+    }
+}
+
+/* Sent/received unicast over catchup channel. */
+typedef CLIB_PACKED (struct
+		     {
+		     mc_peer_id_t peer_id; u32 stream_index;
+		     /* Last global sequence number included in catchup data. */
+		     u32 last_global_sequence_included;
+		     /* Size of catchup data. */
+		     u32 n_data_bytes;
+		     /* Catchup data. */
+		     u8 data[0];}) mc_msg_catchup_reply_t;
+
+always_inline void
+mc_byte_swap_msg_catchup_reply (mc_msg_catchup_reply_t * r)
+{
+  if (mc_need_byte_swap ())
+    {
+      r->peer_id = mc_byte_swap_peer_id (r->peer_id);
+      r->stream_index = clib_byte_swap_u32 (r->stream_index);
+      r->last_global_sequence_included =
+	clib_byte_swap_u32 (r->last_global_sequence_included);
+      r->n_data_bytes = clib_byte_swap_u32 (r->n_data_bytes);
+    }
+}
+
+typedef struct _mc_serialize_msg
+{
+  /* Name for this type. */
+  char *name;
+
+  /* Functions to serialize/unserialize data. */
+  serialize_function_t *serialize;
+  serialize_function_t *unserialize;
+
+  /* Maximum message size in bytes when serialized.
+     If zero then this will be set to the largest sent message. */
+  u32 max_n_bytes_serialized;
+
+  /* Opaque to use for first argument to serialize/unserialize function. */
+  u32 opaque;
+
+  /* Index in global message vector. */
+  u32 global_index;
+
+  /* Registration list */
+  struct _mc_serialize_msg *next_registration;
+} mc_serialize_msg_t;
+
+typedef struct
+{
+  /* Index into global message vector. */
+  u32 global_index;
+} mc_serialize_stream_msg_t;
+
+#define MC_SERIALIZE_MSG(x,...)                                 \
+    __VA_ARGS__ mc_serialize_msg_t x;                           \
+static void __mc_serialize_msg_registration_##x (void)          \
+    __attribute__((__constructor__)) ;                          \
+static void __mc_serialize_msg_registration_##x (void)          \
+{                                                               \
+    vlib_main_t * vm = vlib_get_main();                         \
+    x.next_registration = vm->mc_msg_registrations;             \
+    vm->mc_msg_registrations = &x;                              \
+}                                                               \
+__VA_ARGS__ mc_serialize_msg_t x
+
+typedef enum
+{
+  MC_TRANSPORT_MASTERSHIP,
+  MC_TRANSPORT_JOIN,
+  MC_TRANSPORT_USER_REQUEST_TO_RELAY,
+  MC_TRANSPORT_USER_REQUEST_FROM_RELAY,
+  MC_N_TRANSPORT_TYPE,
+} mc_transport_type_t;
+
+typedef struct
+{
+  clib_error_t *(*tx_buffer) (void *opaque, mc_transport_type_t type,
+			      u32 buffer_index);
+
+  clib_error_t *(*tx_ack) (void *opaque, mc_peer_id_t peer_id,
+			   u32 buffer_index);
+
+  /* Returns catchup opaque. */
+    uword (*catchup_request_fun) (void *opaque, u32 stream_index,
+				  mc_peer_id_t catchup_peer_id);
+
+  void (*catchup_send_fun) (void *opaque, uword catchup_opaque,
+			    u8 * data_vector);
+
+  /* Opaque passed to callbacks. */
+  void *opaque;
+
+  mc_peer_id_t our_ack_peer_id;
+  mc_peer_id_t our_catchup_peer_id;
+
+  /* Max packet size (MTU) for this transport.
+     For IP this is interface MTU less IP + UDP header size. */
+  u32 max_packet_size;
+
+  format_function_t *format_peer_id;
+} mc_transport_t;
+
+typedef struct
+{
+  /* Count of messages received from this peer from the past/future
+     (with seq_cmp != 0). */
+  u64 n_msgs_from_past;
+  u64 n_msgs_from_future;
+} mc_stream_peer_stats_t;
+
+typedef struct
+{
+  /* ID of this peer. */
+  mc_peer_id_t id;
+
+  /* The last sequence we received from this peer. */
+  u32 last_sequence_received;
+
+  mc_stream_peer_stats_t stats, stats_last_clear;
+} mc_stream_peer_t;
+
+typedef struct
+{
+  u32 buffer_index;
+
+  /* Cached copy of local sequence number from buffer. */
+  u32 local_sequence;
+
+  /* Number of times this buffer has been sent (retried). */
+  u32 n_retries;
+
+  /* Previous/next retries in doubly-linked list. */
+  u32 prev_index, next_index;
+
+  /* Bitmap of all peers which have acked this msg */
+  uword *unacked_by_peer_bitmap;
+
+  /* Message send or resend time */
+  f64 sent_at;
+} mc_retry_t;
+
+typedef struct
+{
+  /* Number of retries sent for this stream. */
+  u64 n_retries;
+} mc_stream_stats_t;
+
+struct mc_main_t;
+struct mc_stream_t;
+
+typedef struct
+{
+  /* Stream name. */
+  char *name;
+
+  /* Number of outstanding messages. */
+  u32 window_size;
+
+  /* Retry interval, in seconds */
+  f64 retry_interval;
+
+  /* Retry limit */
+  u32 retry_limit;
+
+  /* User rx buffer callback */
+  void (*rx_buffer) (struct mc_main_t * mc_main,
+		     struct mc_stream_t * stream,
+		     mc_peer_id_t peer_id, u32 buffer_index);
+
+  /* User callback to create a snapshot */
+  u8 *(*catchup_snapshot) (struct mc_main_t * mc_main,
+			   u8 * snapshot_vector,
+			   u32 last_global_sequence_included);
+
+  /* User callback to replay a snapshot */
+  void (*catchup) (struct mc_main_t * mc_main,
+		   u8 * snapshot_data, u32 n_snapshot_data_bytes);
+
+  /* Callback to save a snapshot for offline replay */
+  void (*save_snapshot) (struct mc_main_t * mc_main,
+			 u32 is_catchup,
+			 u8 * snapshot_data, u32 n_snapshot_data_bytes);
+
+  /* Called when a peer dies */
+  void (*peer_died) (struct mc_main_t * mc_main,
+		     struct mc_stream_t * stream, mc_peer_id_t peer_id);
+} mc_stream_config_t;
+
+#define foreach_mc_stream_state			\
+  _ (invalid)					\
+  _ (name_known)				\
+  _ (join_in_progress)				\
+  _ (catchup)					\
+  _ (ready)
+
+typedef enum
+{
+#define _(f) MC_STREAM_STATE_##f,
+  foreach_mc_stream_state
+#undef _
+} mc_stream_state_t;
+
+typedef struct mc_stream_t
+{
+  mc_stream_config_t config;
+
+  mc_stream_state_t state;
+
+  /* Index in stream pool. */
+  u32 index;
+
+  /* Stream index 0 is always for MC internal use. */
+#define MC_STREAM_INDEX_INTERNAL 0
+
+  mc_retry_t *retry_pool;
+
+  /* Head and tail index of retry pool. */
+  u32 retry_head_index, retry_tail_index;
+
+  /*
+   * Country club for recently retired messages
+   * If the set of peers is expanding and a new peer
+   * misses a message, we can easily retire the FIFO
+   * element before we even know about the new peer
+   */
+  mc_retry_t *retired_fifo;
+
+  /* Hash mapping local sequence to retry pool index. */
+  uword *retry_index_by_local_sequence;
+
+  /* catch-up fifo of VLIB buffer indices.
+     start recording when catching up. */
+  u32 *catchup_fifo;
+
+  mc_stream_stats_t stats, stats_last_clear;
+
+  /* Peer pool. */
+  mc_stream_peer_t *peers;
+
+  /* Bitmap with ones for all peers in peer pool. */
+  uword *all_peer_bitmap;
+
+  /* Map of 64 bit id to index in stream pool. */
+  mhash_t peer_index_by_id;
+
+  /* Timeout, in case we're alone in the world */
+  f64 join_timeout;
+
+  vlib_one_time_waiting_process_t *procs_waiting_for_join_done;
+
+  vlib_one_time_waiting_process_t *procs_waiting_for_open_window;
+
+  /* Next sequence number to use */
+  u32 our_local_sequence;
+
+  /*
+   * Last global sequence we processed.
+   * When supplying catchup data, we need to tell
+   * the client precisely where to start replaying
+   */
+  u32 last_global_sequence_processed;
+
+  /* Vector of unique messages we've sent on this stream. */
+  mc_serialize_stream_msg_t *stream_msgs;
+
+  /* Vector global message index into per stream message index. */
+  u32 *stream_msg_index_by_global_index;
+
+  /* Hashed by message name. */
+  uword *stream_msg_index_by_name;
+
+  u64 user_requests_sent;
+  u64 user_requests_received;
+} mc_stream_t;
+
+always_inline void
+mc_stream_free (mc_stream_t * s)
+{
+  pool_free (s->retry_pool);
+  hash_free (s->retry_index_by_local_sequence);
+  clib_fifo_free (s->catchup_fifo);
+  pool_free (s->peers);
+  mhash_free (&s->peer_index_by_id);
+  vec_free (s->procs_waiting_for_join_done);
+  vec_free (s->procs_waiting_for_open_window);
+}
+
+always_inline void
+mc_stream_init (mc_stream_t * s)
+{
+  memset (s, 0, sizeof (s[0]));
+  s->retry_head_index = s->retry_tail_index = ~0;
+}
+
+typedef struct
+{
+  u32 stream_index;
+  u32 catchup_opaque;
+  u8 *catchup_snapshot;
+} mc_catchup_process_arg_t;
+
+typedef enum
+{
+  MC_RELAY_STATE_NEGOTIATE,
+  MC_RELAY_STATE_MASTER,
+  MC_RELAY_STATE_SLAVE,
+} mc_relay_state_t;
+
+typedef struct
+{
+  mc_peer_id_t peer_id;
+
+  f64 time_last_master_assert_received;
+} mc_mastership_peer_t;
+
+typedef struct
+{
+  u32 stream_index;
+  u32 buffer_index;
+} mc_stream_and_buffer_t;
+
+typedef struct mc_main_t
+{
+  mc_relay_state_t relay_state;
+
+  /* Mastership */
+  u32 we_can_be_relay_master;
+
+  u64 relay_master_peer_id;
+
+  mc_mastership_peer_t *mastership_peers;
+
+  /* Map of 64 bit id to index in stream pool. */
+  mhash_t mastership_peer_index_by_id;
+
+  /* The transport we're using. */
+  mc_transport_t transport;
+
+  /* Last-used global sequence number. */
+  u32 relay_global_sequence;
+
+  /* Vector of streams. */
+  mc_stream_t *stream_vector;
+
+  /* Hash table mapping stream name to pool index. */
+  uword *stream_index_by_name;
+
+  uword *procs_waiting_for_stream_name_by_name;
+
+  vlib_one_time_waiting_process_t **procs_waiting_for_stream_name_pool;
+
+  int joins_in_progress;
+
+  mc_catchup_process_arg_t *catchup_process_args;
+
+  /* Node indices for mastership, join ager,
+     retry and catchup processes. */
+  u32 mastership_process;
+  u32 join_ager_process;
+  u32 retry_process;
+  u32 catchup_process;
+  u32 unserialize_process;
+
+  /* Global vector of messages. */
+  mc_serialize_msg_t **global_msgs;
+
+  /* Hash table mapping message name to index. */
+  uword *global_msg_index_by_name;
+
+  /* Shared serialize/unserialize main. */
+  serialize_main_t serialize_mains[VLIB_N_RX_TX];
+
+  vlib_serialize_buffer_main_t serialize_buffer_mains[VLIB_N_RX_TX];
+
+  /* Convenience variables */
+  struct vlib_main_t *vlib_main;
+  elog_main_t *elog_main;
+
+  /* Maps 64 bit peer id to elog string table offset for this formatted peer id. */
+  mhash_t elog_id_by_peer_id;
+
+  uword *elog_id_by_msg_name;
+
+  /* For mc_unserialize. */
+  mc_stream_and_buffer_t *mc_unserialize_stream_and_buffers;
+} mc_main_t;
+
+always_inline mc_stream_t *
+mc_stream_by_name (mc_main_t * m, char *name)
+{
+  uword *p = hash_get (m->stream_index_by_name, name);
+  return p ? vec_elt_at_index (m->stream_vector, p[0]) : 0;
+}
+
+always_inline mc_stream_t *
+mc_stream_by_index (mc_main_t * m, u32 i)
+{
+  return i < vec_len (m->stream_vector) ? m->stream_vector + i : 0;
+}
+
+always_inline void
+mc_clear_stream_stats (mc_main_t * m)
+{
+  mc_stream_t *s;
+  mc_stream_peer_t *p;
+  vec_foreach (s, m->stream_vector)
+  {
+    s->stats_last_clear = s->stats;
+      /* *INDENT-OFF* */
+      pool_foreach (p, s->peers, ({
+	p->stats_last_clear = p->stats;
+      }));
+      /* *INDENT-ON* */
+  }
+}
+
+/* Declare all message handlers. */
+#define _(f) void mc_msg_##f##_handler (mc_main_t * mcm, mc_msg_##f##_t * msg, u32 buffer_index);
+foreach_mc_msg_type
+#undef _
+  u32 mc_stream_join (mc_main_t * mcm, mc_stream_config_t *);
+
+void mc_stream_leave (mc_main_t * mcm, u32 stream_index);
+
+void mc_wait_for_stream_ready (mc_main_t * m, char *stream_name);
+
+u32 mc_stream_send (mc_main_t * mcm, u32 stream_index, u32 buffer_index);
+
+void mc_main_init (mc_main_t * mcm, char *tag);
+
+void mc_enable_disable_mastership (mc_main_t * mcm, int we_can_be_master);
+
+void *mc_get_vlib_buffer (struct vlib_main_t *vm, u32 n_bytes,
+			  u32 * bi_return);
+
+format_function_t format_mc_main;
+
+clib_error_t *mc_serialize_internal (mc_main_t * mc,
+				     u32 stream_index,
+				     u32 multiple_messages_per_vlib_buffer,
+				     mc_serialize_msg_t * msg, ...);
+
+clib_error_t *mc_serialize_va (mc_main_t * mc,
+			       u32 stream_index,
+			       u32 multiple_messages_per_vlib_buffer,
+			       mc_serialize_msg_t * msg, va_list * va);
+
+#define mc_serialize_stream(mc,si,msg,args...)			\
+  mc_serialize_internal((mc),(si),(0),(msg),(msg)->serialize,args)
+
+#define mc_serialize(mc,msg,args...)				\
+  mc_serialize_internal((mc),(~0),(0),(msg),(msg)->serialize,args)
+
+#define mc_serialize2(mc,add,msg,args...)				\
+  mc_serialize_internal((mc),(~0),(add),(msg),(msg)->serialize,args)
+
+void mc_unserialize (mc_main_t * mcm, mc_stream_t * s, u32 buffer_index);
+uword mc_unserialize_message (mc_main_t * mcm, mc_stream_t * s,
+			      serialize_main_t * m);
+
+serialize_function_t serialize_mc_main, unserialize_mc_main;
+
+always_inline uword
+mc_max_message_size_in_bytes (mc_main_t * mcm)
+{
+  return mcm->transport.max_packet_size - sizeof (mc_msg_user_request_t);
+}
+
+always_inline word
+mc_serialize_n_bytes_left (mc_main_t * mcm, serialize_main_t * m)
+{
+  return mc_max_message_size_in_bytes (mcm) -
+    serialize_vlib_buffer_n_bytes (m);
+}
+
+void unserialize_mc_stream (serialize_main_t * m, va_list * va);
+void mc_stream_join_process_hold (void);
+
+#endif /* included_vlib_mc_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/node.c b/src/vlib/node.c
new file mode 100644
index 00000000..c419a13a
--- /dev/null
+++ b/src/vlib/node.c
@@ -0,0 +1,631 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * node.c: VLIB processing nodes
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vlib/threads.h>
+
+/* Query node given name. */
+vlib_node_t *
+vlib_get_node_by_name (vlib_main_t * vm, u8 * name)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  uword *p;
+  u8 *key = name;
+  if (!clib_mem_is_heap_object (key))
+    key = format (0, "%s", key);
+  p = hash_get (nm->node_by_name, key);
+  if (key != name)
+    vec_free (key);
+  return p ? vec_elt (nm->nodes, p[0]) : 0;
+}
+
+static void
+node_set_elog_name (vlib_main_t * vm, uword node_index)
+{
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  elog_event_type_t *t;
+
+  t = vec_elt_at_index (vm->node_call_elog_event_types, node_index);
+  vec_free (t->format);
+  t->format = (char *) format (0, "%v-call: %%d%c", n->name, 0);
+
+  t = vec_elt_at_index (vm->node_return_elog_event_types, node_index);
+  vec_free (t->format);
+  t->format = (char *) format (0, "%v-return: %%d%c", n->name, 0);
+
+  n->name_elog_string = elog_string (&vm->elog_main, "%v%c", n->name, 0);
+}
+
+void
+vlib_node_rename (vlib_main_t * vm, u32 node_index, char *fmt, ...)
+{
+  va_list va;
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+
+  va_start (va, fmt);
+  hash_unset (nm->node_by_name, n->name);
+  vec_free (n->name);
+  n->name = va_format (0, fmt, &va);
+  va_end (va);
+  hash_set (nm->node_by_name, n->name, n->index);
+
+  node_set_elog_name (vm, node_index);
+}
+
+static void
+vlib_node_runtime_update (vlib_main_t * vm, u32 node_index, u32 next_index)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_runtime_t *r, *s;
+  vlib_node_t *node, *next_node;
+  vlib_next_frame_t *nf;
+  vlib_pending_frame_t *pf;
+  i32 i, j, n_insert;
+
+  ASSERT (os_get_cpu_number () == 0);
+
+  vlib_worker_thread_barrier_sync (vm);
+
+  node = vec_elt (nm->nodes, node_index);
+  r = vlib_node_get_runtime (vm, node_index);
+
+  n_insert = vec_len (node->next_nodes) - r->n_next_nodes;
+  if (n_insert > 0)
+    {
+      i = r->next_frame_index + r->n_next_nodes;
+      vec_insert (nm->next_frames, n_insert, i);
+
+      /* Initialize newly inserted next frames. */
+      for (j = 0; j < n_insert; j++)
+	vlib_next_frame_init (nm->next_frames + i + j);
+
+      /* Relocate other next frames at higher indices. */
+      for (j = 0; j < vec_len (nm->nodes); j++)
+	{
+	  s = vlib_node_get_runtime (vm, j);
+	  if (j != node_index && s->next_frame_index >= i)
+	    s->next_frame_index += n_insert;
+	}
+
+      /* Pending frames may need to be relocated also. */
+      vec_foreach (pf, nm->pending_frames)
+      {
+	if (pf->next_frame_index != VLIB_PENDING_FRAME_NO_NEXT_FRAME
+	    && pf->next_frame_index >= i)
+	  pf->next_frame_index += n_insert;
+      }
+      /* *INDENT-OFF* */
+      pool_foreach (pf, nm->suspended_process_frames, ({
+	  if (pf->next_frame_index != ~0 && pf->next_frame_index >= i)
+	    pf->next_frame_index += n_insert;
+      }));
+      /* *INDENT-ON* */
+
+      r->n_next_nodes = vec_len (node->next_nodes);
+    }
+
+  /* Set frame's node runtime index. */
+  next_node = vlib_get_node (vm, node->next_nodes[next_index]);
+  nf = nm->next_frames + r->next_frame_index + next_index;
+  nf->node_runtime_index = next_node->runtime_index;
+
+  vlib_worker_thread_node_runtime_update ();
+
+  vlib_worker_thread_barrier_release (vm);
+}
+
+/* Add next node to given node in given slot. */
+uword
+vlib_node_add_next_with_slot (vlib_main_t * vm,
+			      uword node_index,
+			      uword next_node_index, uword slot)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *node, *next;
+  uword *p;
+
+  node = vec_elt (nm->nodes, node_index);
+  next = vec_elt (nm->nodes, next_node_index);
+
+  /* Runtime has to be initialized. */
+  ASSERT (nm->flags & VLIB_NODE_MAIN_RUNTIME_STARTED);
+
+  if ((p = hash_get (node->next_slot_by_node, next_node_index)))
+    {
+      /* Next already exists: slot must match. */
+      if (slot != ~0)
+	ASSERT (slot == p[0]);
+      return p[0];
+    }
+
+  if (slot == ~0)
+    slot = vec_len (node->next_nodes);
+
+  vec_validate_init_empty (node->next_nodes, slot, ~0);
+  vec_validate (node->n_vectors_by_next_node, slot);
+
+  node->next_nodes[slot] = next_node_index;
+  hash_set (node->next_slot_by_node, next_node_index, slot);
+
+  vlib_node_runtime_update (vm, node_index, slot);
+
+  next->prev_node_bitmap = clib_bitmap_ori (next->prev_node_bitmap,
+					    node_index);
+
+  /* Siblings all get same node structure. */
+  {
+    uword sib_node_index, sib_slot;
+    vlib_node_t *sib_node;
+    /* *INDENT-OFF* */
+    clib_bitmap_foreach (sib_node_index, node->sibling_bitmap, ({
+      sib_node = vec_elt (nm->nodes, sib_node_index);
+      if (sib_node != node)
+	{
+	  sib_slot = vlib_node_add_next_with_slot (vm, sib_node_index, next_node_index, slot);
+	  ASSERT (sib_slot == slot);
+	}
+    }));
+    /* *INDENT-ON* */
+  }
+
+  return slot;
+}
+
+/* Add named next node to given node in given slot. */
+uword
+vlib_node_add_named_next_with_slot (vlib_main_t * vm,
+				    uword node, char *name, uword slot)
+{
+  vlib_node_main_t *nm;
+  vlib_node_t *n, *n_next;
+
+  nm = &vm->node_main;
+  n = vlib_get_node (vm, node);
+
+  n_next = vlib_get_node_by_name (vm, (u8 *) name);
+  if (!n_next)
+    {
+      if (nm->flags & VLIB_NODE_MAIN_RUNTIME_STARTED)
+	return ~0;
+
+      if (slot == ~0)
+	slot = clib_max (vec_len (n->next_node_names),
+			 vec_len (n->next_nodes));
+      vec_validate (n->next_node_names, slot);
+      n->next_node_names[slot] = name;
+      return slot;
+    }
+
+  return vlib_node_add_next_with_slot (vm, node, n_next->index, slot);
+}
+
+static void
+node_elog_init (vlib_main_t * vm, uword ni)
+{
+  elog_event_type_t t;
+
+  memset (&t, 0, sizeof (t));
+
+  /* 2 event types for this node: one when node function is called.
+     One when it returns. */
+  vec_validate (vm->node_call_elog_event_types, ni);
+  vm->node_call_elog_event_types[ni] = t;
+
+  vec_validate (vm->node_return_elog_event_types, ni);
+  vm->node_return_elog_event_types[ni] = t;
+
+  node_set_elog_name (vm, ni);
+}
+
+#ifdef CLIB_UNIX
+#define STACK_ALIGN (clib_mem_get_page_size())
+#else
+#define STACK_ALIGN CLIB_CACHE_LINE_BYTES
+#endif
+
+static void
+register_node (vlib_main_t * vm, vlib_node_registration_t * r)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *n;
+  u32 page_size = clib_mem_get_page_size ();
+  int i;
+
+  if (CLIB_DEBUG > 0)
+    {
+      /* Default (0) type should match INTERNAL. */
+      vlib_node_t zero = { 0 };
+      ASSERT (VLIB_NODE_TYPE_INTERNAL == zero.type);
+    }
+
+  ASSERT (r->function != 0);
+
+  n = clib_mem_alloc_no_fail (sizeof (n[0]));
+  memset (n, 0, sizeof (n[0]));
+  n->index = vec_len (nm->nodes);
+
+  vec_add1 (nm->nodes, n);
+
+  /* Name is always a vector so it can be formatted with %v. */
+  if (clib_mem_is_heap_object (vec_header (r->name, 0)))
+    n->name = vec_dup ((u8 *) r->name);
+  else
+    n->name = format (0, "%s", r->name);
+
+  if (!nm->node_by_name)
+    nm->node_by_name = hash_create_vec ( /* size */ 32,
+					sizeof (n->name[0]), sizeof (uword));
+
+  /* Node names must be unique. */
+  {
+    vlib_node_t *o = vlib_get_node_by_name (vm, n->name);
+    if (o)
+      clib_error ("more than one node named `%v'", n->name);
+  }
+
+  hash_set (nm->node_by_name, n->name, n->index);
+
+  r->index = n->index;		/* save index in registration */
+  n->function = r->function;
+
+  /* Node index of next sibling will be filled in by vlib_node_main_init. */
+  n->sibling_of = r->sibling_of;
+  if (r->sibling_of && r->n_next_nodes > 0)
+    clib_error ("sibling node should not have any next nodes `%v'", n->name);
+
+  if (r->type == VLIB_NODE_TYPE_INTERNAL)
+    ASSERT (r->vector_size > 0);
+
+#define _(f) n->f = r->f
+
+  _(type);
+  _(flags);
+  _(state);
+  _(scalar_size);
+  _(vector_size);
+  _(format_buffer);
+  _(unformat_buffer);
+  _(format_trace);
+  _(validate_frame);
+
+  /* Register error counters. */
+  vlib_register_errors (vm, n->index, r->n_errors, r->error_strings);
+  node_elog_init (vm, n->index);
+
+  _(runtime_data_bytes);
+  if (r->runtime_data_bytes > 0)
+    {
+      vec_resize (n->runtime_data, r->runtime_data_bytes);
+      if (r->runtime_data)
+	clib_memcpy (n->runtime_data, r->runtime_data, r->runtime_data_bytes);
+    }
+
+  vec_resize (n->next_node_names, r->n_next_nodes);
+  for (i = 0; i < r->n_next_nodes; i++)
+    n->next_node_names[i] = r->next_nodes[i];
+
+  vec_validate_init_empty (n->next_nodes, r->n_next_nodes - 1, ~0);
+  vec_validate (n->n_vectors_by_next_node, r->n_next_nodes - 1);
+
+  n->owner_node_index = n->owner_next_index = ~0;
+
+  /* Initialize node runtime. */
+  {
+    vlib_node_runtime_t *rt;
+    u32 i;
+
+    if (n->type == VLIB_NODE_TYPE_PROCESS)
+      {
+	vlib_process_t *p;
+	uword log2_n_stack_bytes;
+
+	log2_n_stack_bytes = clib_max (r->process_log2_n_stack_bytes, 15);
+
+#ifdef CLIB_UNIX
+	/*
+	 * Bump the stack size if running over a kernel with a large page size,
+	 * and the stack isn't any too big to begin with. Otherwise, we'll
+	 * trip over the stack guard page for sure.
+	 */
+	if ((page_size > (4 << 10)) && log2_n_stack_bytes < 19)
+	  {
+	    if ((1 << log2_n_stack_bytes) <= page_size)
+	      log2_n_stack_bytes = min_log2 (page_size) + 1;
+	    else
+	      log2_n_stack_bytes++;
+	  }
+#endif
+
+	p = clib_mem_alloc_aligned_at_offset
+	  (sizeof (p[0]) + (1 << log2_n_stack_bytes),
+	   STACK_ALIGN, STRUCT_OFFSET_OF (vlib_process_t, stack),
+	   0 /* no, don't call os_out_of_memory */ );
+	if (p == 0)
+	  clib_panic ("failed to allocate process stack (%d bytes)",
+		      1 << log2_n_stack_bytes);
+
+	memset (p, 0, sizeof (p[0]));
+	p->log2_n_stack_bytes = log2_n_stack_bytes;
+
+	/* Process node's runtime index is really index into process
+	   pointer vector. */
+	n->runtime_index = vec_len (nm->processes);
+
+	vec_add1 (nm->processes, p);
+
+	/* Paint first stack word with magic number so we can at least
+	   detect process stack overruns. */
+	p->stack[0] = VLIB_PROCESS_STACK_MAGIC;
+
+	/* Node runtime is stored inside of process. */
+	rt = &p->node_runtime;
+
+#ifdef CLIB_UNIX
+	/*
+	 * Disallow writes to the bottom page of the stack, to
+	 * catch stack overflows.
+	 */
+	if (mprotect (p->stack, page_size, PROT_READ) < 0)
+	  clib_unix_warning ("process stack");
+#endif
+
+      }
+    else
+      {
+	vec_add2_aligned (nm->nodes_by_type[n->type], rt, 1,
+			  /* align */ CLIB_CACHE_LINE_BYTES);
+	n->runtime_index = rt - nm->nodes_by_type[n->type];
+      }
+
+    if (n->type == VLIB_NODE_TYPE_INPUT)
+      nm->input_node_counts_by_state[n->state] += 1;
+
+    rt->function = n->function;
+    rt->flags = n->flags;
+    rt->state = n->state;
+    rt->node_index = n->index;
+
+    rt->n_next_nodes = r->n_next_nodes;
+    rt->next_frame_index = vec_len (nm->next_frames);
+
+    vec_resize (nm->next_frames, rt->n_next_nodes);
+    for (i = 0; i < rt->n_next_nodes; i++)
+      vlib_next_frame_init (nm->next_frames + rt->next_frame_index + i);
+
+    vec_resize (rt->errors, r->n_errors);
+    for (i = 0; i < vec_len (rt->errors); i++)
+      rt->errors[i] = vlib_error_set (n->index, i);
+
+    STATIC_ASSERT_SIZEOF (vlib_node_runtime_t, 128);
+    ASSERT (vec_len (n->runtime_data) <=
+	    sizeof (vlib_node_runtime_t) -
+	    STRUCT_OFFSET_OF (vlib_node_runtime_t, runtime_data));
+
+    if (vec_len (n->runtime_data) > 0)
+      clib_memcpy (rt->runtime_data, n->runtime_data,
+		   vec_len (n->runtime_data));
+
+    vec_free (n->runtime_data);
+  }
+}
+
+/* Register new packet processing node. */
+u32
+vlib_register_node (vlib_main_t * vm, vlib_node_registration_t * r)
+{
+  register_node (vm, r);
+  return r->index;
+}
+
+static uword
+null_node_fn (vlib_main_t * vm,
+	      vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u16 n_vectors = frame->n_vectors;
+
+  vlib_node_increment_counter (vm, node->node_index, 0, n_vectors);
+  vlib_buffer_free (vm, vlib_frame_args (frame), n_vectors);
+  vlib_frame_free (vm, node, frame);
+
+  return n_vectors;
+}
+
+void
+vlib_register_all_static_nodes (vlib_main_t * vm)
+{
+  vlib_node_registration_t *r;
+
+  static char *null_node_error_strings[] = {
+    "blackholed packets",
+  };
+
+  static vlib_node_registration_t null_node_reg = {
+    .function = null_node_fn,
+    .vector_size = sizeof (u32),
+    .name = "null-node",
+    .n_errors = 1,
+    .error_strings = null_node_error_strings,
+  };
+
+  /* make sure that node index 0 is not used by
+     real node */
+  register_node (vm, &null_node_reg);
+
+  r = vm->node_main.node_registrations;
+  while (r)
+    {
+      register_node (vm, r);
+      r = r->next_registration;
+    }
+}
+
+clib_error_t *
+vlib_node_main_init (vlib_main_t * vm)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  clib_error_t *error = 0;
+  vlib_node_t *n;
+  uword ni;
+
+  nm->flags |= VLIB_NODE_MAIN_RUNTIME_STARTED;
+
+  /* Generate sibling relationships */
+  {
+    vlib_node_t *n, *sib;
+    uword si;
+
+    for (ni = 0; ni < vec_len (nm->nodes); ni++)
+      {
+	n = vec_elt (nm->nodes, ni);
+
+	if (!n->sibling_of)
+	  continue;
+
+	sib = vlib_get_node_by_name (vm, (u8 *) n->sibling_of);
+	if (!sib)
+	  {
+	    error = clib_error_create ("sibling `%s' not found for node `%v'",
+				       n->sibling_of, n->name);
+	    goto done;
+	  }
+
+        /* *INDENT-OFF* */
+	clib_bitmap_foreach (si, sib->sibling_bitmap, ({
+	      vlib_node_t * m = vec_elt (nm->nodes, si);
+
+	      /* Connect all of sibling's siblings to us. */
+	      m->sibling_bitmap = clib_bitmap_ori (m->sibling_bitmap, n->index);
+
+	      /* Connect us to all of sibling's siblings. */
+	      n->sibling_bitmap = clib_bitmap_ori (n->sibling_bitmap, si);
+	    }));
+        /* *INDENT-ON* */
+
+	/* Connect sibling to us. */
+	sib->sibling_bitmap = clib_bitmap_ori (sib->sibling_bitmap, n->index);
+
+	/* Connect us to sibling. */
+	n->sibling_bitmap = clib_bitmap_ori (n->sibling_bitmap, sib->index);
+      }
+  }
+
+  /* Resolve next names into next indices. */
+  for (ni = 0; ni < vec_len (nm->nodes); ni++)
+    {
+      uword i;
+
+      n = vec_elt (nm->nodes, ni);
+
+      for (i = 0; i < vec_len (n->next_node_names); i++)
+	{
+	  char *a = n->next_node_names[i];
+
+	  if (!a)
+	    continue;
+
+	  if (~0 == vlib_node_add_named_next_with_slot (vm, n->index, a, i))
+	    {
+	      error = clib_error_create
+		("node `%v' refers to unknown node `%s'", n->name, a);
+	      goto done;
+	    }
+	}
+
+      vec_free (n->next_node_names);
+    }
+
+  /* Set previous node pointers. */
+  for (ni = 0; ni < vec_len (nm->nodes); ni++)
+    {
+      vlib_node_t *n_next;
+      uword i;
+
+      n = vec_elt (nm->nodes, ni);
+
+      for (i = 0; i < vec_len (n->next_nodes); i++)
+	{
+	  if (n->next_nodes[i] >= vec_len (nm->nodes))
+	    continue;
+
+	  n_next = vec_elt (nm->nodes, n->next_nodes[i]);
+	  n_next->prev_node_bitmap =
+	    clib_bitmap_ori (n_next->prev_node_bitmap, n->index);
+	}
+    }
+
+  {
+    vlib_next_frame_t *nf;
+    vlib_node_runtime_t *r;
+    vlib_node_t *next;
+    uword i;
+
+    vec_foreach (r, nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL])
+    {
+      if (r->n_next_nodes == 0)
+	continue;
+
+      n = vlib_get_node (vm, r->node_index);
+      nf = vec_elt_at_index (nm->next_frames, r->next_frame_index);
+
+      for (i = 0; i < vec_len (n->next_nodes); i++)
+	{
+	  next = vlib_get_node (vm, n->next_nodes[i]);
+
+	  /* Validate node runtime indices are correctly initialized. */
+	  ASSERT (nf[i].node_runtime_index == next->runtime_index);
+
+	  nf[i].flags = 0;
+	  if (next->flags & VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH)
+	    nf[i].flags |= VLIB_FRAME_NO_FREE_AFTER_DISPATCH;
+	}
+    }
+  }
+
+done:
+  return error;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/node.h b/src/vlib/node.h
new file mode 100644
index 00000000..b624e9d6
--- /dev/null
+++ b/src/vlib/node.h
@@ -0,0 +1,725 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * node.h: VLIB processing nodes
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_node_h
+#define included_vlib_node_h
+
+#include <vppinfra/cpu.h>
+#include <vppinfra/longjmp.h>
+#include <vppinfra/timing_wheel.h>
+#include <vlib/trace.h>		/* for vlib_trace_filter_t */
+
+/* Forward declaration. */
+struct vlib_node_runtime_t;
+struct vlib_frame_t;
+
+/* Internal nodes (including output nodes) move data from node to
+   node (or out of the graph for output nodes). */
+typedef uword (vlib_node_function_t) (struct vlib_main_t * vm,
+				      struct vlib_node_runtime_t * node,
+				      struct vlib_frame_t * frame);
+
+typedef enum
+{
+  /* An internal node on the call graph (could be output). */
+  VLIB_NODE_TYPE_INTERNAL,
+
+  /* Nodes which input data into the processing graph.
+     Input nodes are called for each iteration of main loop. */
+  VLIB_NODE_TYPE_INPUT,
+
+  /* Nodes to be called before all input nodes.
+     Used, for example, to clean out driver TX rings before
+     processing input. */
+  VLIB_NODE_TYPE_PRE_INPUT,
+
+  /* "Process" nodes which can be suspended and later resumed. */
+  VLIB_NODE_TYPE_PROCESS,
+
+  VLIB_N_NODE_TYPE,
+} vlib_node_type_t;
+
+typedef struct _vlib_node_registration
+{
+  /* Vector processing function for this node. */
+  vlib_node_function_t *function;
+
+  /* Node name. */
+  char *name;
+
+  /* Name of sibling (if applicable). */
+  char *sibling_of;
+
+  /* Node index filled in by registration. */
+  u32 index;
+
+  /* Type of this node. */
+  vlib_node_type_t type;
+
+  /* Error strings indexed by error code for this node. */
+  char **error_strings;
+
+  /* Buffer format/unformat for this node. */
+  format_function_t *format_buffer;
+  unformat_function_t *unformat_buffer;
+
+  /* Trace format/unformat for this node. */
+  format_function_t *format_trace;
+  unformat_function_t *unformat_trace;
+
+  /* Function to validate incoming frames. */
+  u8 *(*validate_frame) (struct vlib_main_t * vm,
+			 struct vlib_node_runtime_t *,
+			 struct vlib_frame_t * f);
+
+  /* Per-node runtime data. */
+  void *runtime_data;
+
+  /* Process stack size. */
+  u16 process_log2_n_stack_bytes;
+
+  /* Number of bytes of per-node run time data. */
+  u8 runtime_data_bytes;
+
+  /* State for input nodes. */
+  u8 state;
+
+  /* Node flags. */
+  u16 flags;
+
+  /* Size of scalar and vector arguments in bytes. */
+  u16 scalar_size, vector_size;
+
+  /* Number of error codes used by this node. */
+  u16 n_errors;
+
+  /* Number of next node names that follow. */
+  u16 n_next_nodes;
+
+  /* Constructor link-list, don't ask... */
+  struct _vlib_node_registration *next_registration;
+
+  /* Names of next nodes which this node feeds into. */
+  char *next_nodes[];
+
+} vlib_node_registration_t;
+
+#define VLIB_REGISTER_NODE(x,...)                                       \
+    __VA_ARGS__ vlib_node_registration_t x;                             \
+static void __vlib_add_node_registration_##x (void)                     \
+    __attribute__((__constructor__)) ;                                  \
+static void __vlib_add_node_registration_##x (void)                     \
+{                                                                       \
+    vlib_main_t * vm = vlib_get_main();                                 \
+    x.next_registration = vm->node_main.node_registrations;             \
+    vm->node_main.node_registrations = &x;                              \
+}                                                                       \
+__VA_ARGS__ vlib_node_registration_t x
+
+#if CLIB_DEBUG > 0
+#define VLIB_NODE_FUNCTION_CLONE_TEMPLATE(arch, fn)
+#define VLIB_NODE_FUNCTION_MULTIARCH_CLONE(fn)
+#define VLIB_NODE_FUNCTION_MULTIARCH(node, fn)
+#else
+#define VLIB_NODE_FUNCTION_CLONE_TEMPLATE(arch, fn, tgt)		\
+  uword									\
+  __attribute__ ((flatten))						\
+  __attribute__ ((target (tgt)))					\
+  CLIB_CPU_OPTIMIZED							\
+  fn ## _ ## arch ( struct vlib_main_t * vm,				\
+                   struct vlib_node_runtime_t * node,			\
+                   struct vlib_frame_t * frame)				\
+  { return fn (vm, node, frame); }
+
+#define VLIB_NODE_FUNCTION_MULTIARCH_CLONE(fn)				\
+  foreach_march_variant(VLIB_NODE_FUNCTION_CLONE_TEMPLATE, fn)
+
+#define VLIB_NODE_FUNCTION_MULTIARCH(node, fn)				\
+  VLIB_NODE_FUNCTION_MULTIARCH_CLONE(fn)				\
+  CLIB_MULTIARCH_SELECT_FN(fn, static inline)				\
+  static void __attribute__((__constructor__))				\
+  __vlib_node_function_multiarch_select_##node (void)			\
+  { node.function = fn ## _multiarch_select(); }
+#endif
+
+always_inline vlib_node_registration_t *
+vlib_node_next_registered (vlib_node_registration_t * c)
+{
+  c =
+    clib_elf_section_data_next (c,
+				c->n_next_nodes * sizeof (c->next_nodes[0]));
+  return c;
+}
+
+typedef struct
+{
+  /* Total calls, clock ticks and vector elements processed for this node. */
+  u64 calls, vectors, clocks, suspends;
+  u64 max_clock;
+  u64 max_clock_n;
+} vlib_node_stats_t;
+
+#define foreach_vlib_node_state					\
+  /* Input node is called each iteration of main loop.		\
+     This is the default (zero). */				\
+  _ (POLLING)							\
+  /* Input node is called when device signals an interrupt. */	\
+  _ (INTERRUPT)							\
+  /* Input node is never called. */				\
+  _ (DISABLED)
+
+typedef enum
+{
+#define _(f) VLIB_NODE_STATE_##f,
+  foreach_vlib_node_state
+#undef _
+    VLIB_N_NODE_STATE,
+} vlib_node_state_t;
+
+typedef struct vlib_node_t
+{
+  /* Vector processing function for this node. */
+  vlib_node_function_t *function;
+
+  /* Node name. */
+  u8 *name;
+
+  /* Node name index in elog string table. */
+  u32 name_elog_string;
+
+  /* Total statistics for this node. */
+  vlib_node_stats_t stats_total;
+
+  /* Saved values as of last clear (or zero if never cleared).
+     Current values are always stats_total - stats_last_clear. */
+  vlib_node_stats_t stats_last_clear;
+
+  /* Type of this node. */
+  vlib_node_type_t type;
+
+  /* Node index. */
+  u32 index;
+
+  /* Index of corresponding node runtime. */
+  u32 runtime_index;
+
+  /* Runtime data for this node. */
+  void *runtime_data;
+
+  /* Node flags. */
+  u16 flags;
+
+  /* Processing function keeps frame.  Tells node dispatching code not
+     to free frame after dispatch is done.  */
+#define VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH (1 << 0)
+
+  /* Node counts as output/drop/punt node for stats purposes. */
+#define VLIB_NODE_FLAG_IS_OUTPUT (1 << 1)
+#define VLIB_NODE_FLAG_IS_DROP (1 << 2)
+#define VLIB_NODE_FLAG_IS_PUNT (1 << 3)
+#define VLIB_NODE_FLAG_IS_HANDOFF (1 << 4)
+
+  /* Set if current node runtime has traced vectors. */
+#define VLIB_NODE_FLAG_TRACE (1 << 5)
+
+#define VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE (1 << 6)
+#define VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE (1 << 7)
+
+  /* State for input nodes. */
+  u8 state;
+
+  /* Number of bytes of run time data. */
+  u8 runtime_data_bytes;
+
+  /* Number of error codes used by this node. */
+  u16 n_errors;
+
+  /* Size of scalar and vector arguments in bytes. */
+  u16 scalar_size, vector_size;
+
+  /* Handle/index in error heap for this node. */
+  u32 error_heap_handle;
+  u32 error_heap_index;
+
+  /* Error strings indexed by error code for this node. */
+  char **error_strings;
+
+  /* Vector of next node names.
+     Only used before next_nodes array is initialized. */
+  char **next_node_names;
+
+  /* Next node indices for this node. */
+  u32 *next_nodes;
+
+  /* Name of node that we are sibling of. */
+  char *sibling_of;
+
+  /* Bitmap of all of this node's siblings. */
+  uword *sibling_bitmap;
+
+  /* Total number of vectors sent to each next node. */
+  u64 *n_vectors_by_next_node;
+
+  /* Hash table mapping next node index into slot in
+     next_nodes vector.  Quickly determines whether this node
+     is connected to given next node and, if so, with which slot. */
+  uword *next_slot_by_node;
+
+  /* Bitmap of node indices which feed this node. */
+  uword *prev_node_bitmap;
+
+  /* Node/next-index which own enqueue rights with to this node. */
+  u32 owner_node_index, owner_next_index;
+
+  /* Buffer format/unformat for this node. */
+  format_function_t *format_buffer;
+  unformat_function_t *unformat_buffer;
+
+  /* Trace buffer format/unformat for this node. */
+  format_function_t *format_trace;
+
+  /* Function to validate incoming frames. */
+  u8 *(*validate_frame) (struct vlib_main_t * vm,
+			 struct vlib_node_runtime_t *,
+			 struct vlib_frame_t * f);
+  /* for pretty-printing, not typically valid */
+  u8 *state_string;
+} vlib_node_t;
+
+#define VLIB_INVALID_NODE_INDEX ((u32) ~0)
+
+/* Max number of vector elements to process at once per node. */
+#define VLIB_FRAME_SIZE 256
+#define VLIB_FRAME_ALIGN VLIB_MAX_CPUS
+
+/* Calling frame (think stack frame) for a node. */
+typedef struct vlib_frame_t
+{
+  /* Frame flags. */
+  u16 flags;
+
+  /* Number of scalar bytes in arguments. */
+  u8 scalar_size;
+
+  /* Number of bytes per vector argument. */
+  u8 vector_size;
+
+  /* Number of vector elements currently in frame. */
+  u16 n_vectors;
+
+  /* Owner cpuid / heap id */
+  u16 cpu_index;
+
+  /* Scalar and vector arguments to next node. */
+  u8 arguments[0];
+} vlib_frame_t;
+
+typedef struct
+{
+  /* Frame index. */
+  u32 frame_index;
+
+  /* Node runtime for this next. */
+  u32 node_runtime_index;
+
+  /* Next frame flags. */
+  u32 flags;
+
+  /* Reflects node frame-used flag for this next. */
+#define VLIB_FRAME_NO_FREE_AFTER_DISPATCH \
+  VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH
+
+  /* This next frame owns enqueue to node
+     corresponding to node_runtime_index. */
+#define VLIB_FRAME_OWNER (1 << 15)
+
+  /* Set when frame has been allocated for this next. */
+#define VLIB_FRAME_IS_ALLOCATED	VLIB_NODE_FLAG_IS_OUTPUT
+
+  /* Set when frame has been added to pending vector. */
+#define VLIB_FRAME_PENDING VLIB_NODE_FLAG_IS_DROP
+
+  /* Set when frame is to be freed after dispatch. */
+#define VLIB_FRAME_FREE_AFTER_DISPATCH VLIB_NODE_FLAG_IS_PUNT
+
+  /* Set when frame has traced packets. */
+#define VLIB_FRAME_TRACE VLIB_NODE_FLAG_TRACE
+
+  /* Number of vectors enqueue to this next since last overflow. */
+  u32 vectors_since_last_overflow;
+} vlib_next_frame_t;
+
+always_inline void
+vlib_next_frame_init (vlib_next_frame_t * nf)
+{
+  memset (nf, 0, sizeof (nf[0]));
+  nf->frame_index = ~0;
+  nf->node_runtime_index = ~0;
+}
+
+/* A frame pending dispatch by main loop. */
+typedef struct
+{
+  /* Node and runtime for this frame. */
+  u32 node_runtime_index;
+
+  /* Frame index (in the heap). */
+  u32 frame_index;
+
+  /* Start of next frames for this node. */
+  u32 next_frame_index;
+
+  /* Special value for next_frame_index when there is no next frame. */
+#define VLIB_PENDING_FRAME_NO_NEXT_FRAME ((u32) ~0)
+} vlib_pending_frame_t;
+
+typedef struct vlib_node_runtime_t
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  /* Node function to call. */
+  vlib_node_function_t *function;
+
+  /* Vector of errors for this node. */
+  vlib_error_t *errors;
+
+  /* Number of clock cycles. */
+  u32 clocks_since_last_overflow;
+
+  /* Maximum clock cycle for an invocation. */
+  u32 max_clock;
+
+  /* Number of vectors in the recorded max_clock. */
+  u32 max_clock_n;
+
+  /* Number of calls. */
+  u32 calls_since_last_overflow;
+
+  /* Number of vector elements processed by this node. */
+  u32 vectors_since_last_overflow;
+
+  /* Start of next frames for this node. */
+  u32 next_frame_index;
+
+  /* Node index. */
+  u32 node_index;
+
+  /* For input nodes: decremented on each main loop interation until it reaches zero
+     and function is called.  Allows some input nodes to be called
+     more than others. */
+  u32 input_main_loops_per_call;
+
+  /* Saved main loop counter of last dispatch of this node. */
+  u32 main_loop_count_last_dispatch;
+
+  u32 main_loop_vector_stats[2];
+
+  /* Copy of main node flags. */
+  u16 flags;
+
+  /* Input node state. */
+  u16 state;
+
+  u16 n_next_nodes;
+
+  /* Next frame index that vector arguments were last enqueued to
+     last time this node ran.  Set to zero before first run
+     of this node. */
+  u16 cached_next_index;
+
+  /* CPU this node runs on */
+  u16 cpu_index;
+
+  /* Function dependent node-runtime. */
+  u8 runtime_data[0];
+}
+vlib_node_runtime_t;
+
+typedef struct
+{
+  /* Number of allocated frames for this scalar/vector size. */
+  u32 n_alloc_frames;
+
+  /* Vector of free frame indices for this scalar/vector size. */
+  u32 *free_frame_indices;
+} vlib_frame_size_t;
+
+typedef struct
+{
+  /* Users opaque value for event type. */
+  uword opaque;
+} vlib_process_event_type_t;
+
+typedef struct
+{
+  /* Node runtime for this process. */
+  vlib_node_runtime_t node_runtime;
+
+  /* Where to longjmp when process is done. */
+  clib_longjmp_t return_longjmp;
+
+#define VLIB_PROCESS_RETURN_LONGJMP_RETURN ((uword) ~0 - 0)
+#define VLIB_PROCESS_RETURN_LONGJMP_SUSPEND ((uword) ~0 - 1)
+
+  /* Where to longjmp to resume node after suspend. */
+  clib_longjmp_t resume_longjmp;
+#define VLIB_PROCESS_RESUME_LONGJMP_SUSPEND 0
+#define VLIB_PROCESS_RESUME_LONGJMP_RESUME  1
+
+  u16 flags;
+#define VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK (1 << 0)
+#define VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT (1 << 1)
+  /* Set to indicate that this process has been added to resume vector. */
+#define VLIB_PROCESS_RESUME_PENDING (1 << 2)
+
+  /* Process function is currently running. */
+#define VLIB_PROCESS_IS_RUNNING (1 << 3)
+
+  /* Size of process stack. */
+  u16 log2_n_stack_bytes;
+
+  u32 suspended_process_frame_index;
+
+  /* Number of times this process was suspended. */
+  u32 n_suspends;
+
+  /* Vectors of pending event data indexed by event type index. */
+  void **pending_event_data_by_type_index;
+
+  /* Bitmap of event type-indices with non-empty vectors. */
+  uword *non_empty_event_type_bitmap;
+
+  /* Bitmap of event type-indices which are one time events. */
+  uword *one_time_event_type_bitmap;
+
+  /* Type is opaque pointer -- typically a pointer to an event handler
+     function.  Hash table to map opaque to a type index. */
+  uword *event_type_index_by_type_opaque;
+
+  /* Pool of currently valid event types. */
+  vlib_process_event_type_t *event_type_pool;
+
+  /* When suspending saves cpu cycle counter when process is to be resumed. */
+  u64 resume_cpu_time;
+
+  /* Default output function and its argument for any CLI outputs
+     within the process. */
+  vlib_cli_output_function_t *output_function;
+  uword output_function_arg;
+
+#ifdef CLIB_UNIX
+  /* Pad to a multiple of the page size so we can mprotect process stacks */
+#define PAGE_SIZE_MULTIPLE 0x1000
+#define ALIGN_ON_MULTIPLE_PAGE_BOUNDARY_FOR_MPROTECT  __attribute__ ((aligned (PAGE_SIZE_MULTIPLE)))
+#else
+#define ALIGN_ON_MULTIPLE_PAGE_BOUNDARY_FOR_MPROTECT
+#endif
+
+  /* Process stack.  Starts here and extends 2^log2_n_stack_bytes
+     bytes. */
+
+#define VLIB_PROCESS_STACK_MAGIC (0xdead7ead)
+  u32 stack[0] ALIGN_ON_MULTIPLE_PAGE_BOUNDARY_FOR_MPROTECT;
+} vlib_process_t __attribute__ ((aligned (CLIB_CACHE_LINE_BYTES)));
+
+#ifdef CLIB_UNIX
+  /* Ensure that the stack is aligned on the multiple of the page size */
+typedef char
+  assert_process_stack_must_be_aligned_exactly_to_page_size_multiple[(sizeof
+								      (vlib_process_t)
+								      -
+								      PAGE_SIZE_MULTIPLE)
+								     ==
+								     0 ? 0 :
+								     -1];
+#endif
+
+typedef struct
+{
+  u32 node_index;
+
+  u32 one_time_event;
+} vlib_one_time_waiting_process_t;
+
+typedef struct
+{
+  u16 n_data_elts;
+
+  u16 n_data_elt_bytes;
+
+  /* n_data_elts * n_data_elt_bytes */
+  u32 n_data_bytes;
+
+  /* Process node & event type to be used to signal event. */
+  u32 process_node_index;
+
+  u32 event_type_index;
+
+  union
+  {
+    u8 inline_event_data[64 - 3 * sizeof (u32) - 2 * sizeof (u16)];
+
+    /* Vector of event data used only when data does not fit inline. */
+    u8 *event_data_as_vector;
+  };
+}
+vlib_signal_timed_event_data_t;
+
+always_inline uword
+vlib_timing_wheel_data_is_timed_event (u32 d)
+{
+  return d & 1;
+}
+
+always_inline u32
+vlib_timing_wheel_data_set_suspended_process (u32 i)
+{
+  return 0 + 2 * i;
+}
+
+always_inline u32
+vlib_timing_wheel_data_set_timed_event (u32 i)
+{
+  return 1 + 2 * i;
+}
+
+always_inline uword
+vlib_timing_wheel_data_get_index (u32 d)
+{
+  return d / 2;
+}
+
+typedef struct
+{
+  /* Public nodes. */
+  vlib_node_t **nodes;
+
+  /* Node index hashed by node name. */
+  uword *node_by_name;
+
+  u32 flags;
+#define VLIB_NODE_MAIN_RUNTIME_STARTED (1 << 0)
+
+  /* Nodes segregated by type for cache locality.
+     Does not apply to nodes of type VLIB_NODE_TYPE_INTERNAL. */
+  vlib_node_runtime_t *nodes_by_type[VLIB_N_NODE_TYPE];
+
+  /* Node runtime indices for input nodes with pending interrupts. */
+  u32 *pending_interrupt_node_runtime_indices;
+
+  /* Input nodes are switched from/to interrupt to/from polling mode
+     when average vector length goes above/below polling/interrupt
+     thresholds. */
+  u32 polling_threshold_vector_length;
+  u32 interrupt_threshold_vector_length;
+
+  /* Vector of next frames. */
+  vlib_next_frame_t *next_frames;
+
+  /* Vector of internal node's frames waiting to be called. */
+  vlib_pending_frame_t *pending_frames;
+
+  /* Timing wheel for scheduling time-based node dispatch. */
+  timing_wheel_t timing_wheel;
+
+  vlib_signal_timed_event_data_t *signal_timed_event_data_pool;
+
+  /* Opaque data vector added via timing_wheel_advance. */
+  u32 *data_from_advancing_timing_wheel;
+
+  /* CPU time of next process to be ready on timing wheel. */
+  u64 cpu_time_next_process_ready;
+
+  /* Vector of process nodes.
+     One for each node of type VLIB_NODE_TYPE_PROCESS. */
+  vlib_process_t **processes;
+
+  /* Current running process or ~0 if no process running. */
+  u32 current_process_index;
+
+  /* Pool of pending process frames. */
+  vlib_pending_frame_t *suspended_process_frames;
+
+  /* Vector of event data vectors pending recycle. */
+  void **recycled_event_data_vectors;
+
+  /* Current counts of nodes in each state. */
+  u32 input_node_counts_by_state[VLIB_N_NODE_STATE];
+
+  /* Hash of (scalar_size,vector_size) to frame_sizes index. */
+  uword *frame_size_hash;
+
+  /* Per-size frame allocation information. */
+  vlib_frame_size_t *frame_sizes;
+
+  /* Time of last node runtime stats clear. */
+  f64 time_last_runtime_stats_clear;
+
+  /* Node registrations added by constructors */
+  vlib_node_registration_t *node_registrations;
+} vlib_node_main_t;
+
+
+#define FRAME_QUEUE_MAX_NELTS 32
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  u64 head;
+  u64 head_hint;
+  u64 tail;
+  u32 n_in_use;
+  u32 nelts;
+  u32 written;
+  u32 threshold;
+  i32 n_vectors[FRAME_QUEUE_MAX_NELTS];
+} frame_queue_trace_t;
+
+typedef struct
+{
+  u64 count[FRAME_QUEUE_MAX_NELTS];
+} frame_queue_nelt_counter_t;
+
+#endif /* included_vlib_node_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/node_cli.c b/src/vlib/node_cli.c
new file mode 100644
index 00000000..05d0f0b5
--- /dev/null
+++ b/src/vlib/node_cli.c
@@ -0,0 +1,466 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * node_cli.c: node CLI
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vlib/threads.h>
+
+static int
+node_cmp (void *a1, void *a2)
+{
+  vlib_node_t **n1 = a1;
+  vlib_node_t **n2 = a2;
+
+  return vec_cmp (n1[0]->name, n2[0]->name);
+}
+
+static clib_error_t *
+show_node_graph (vlib_main_t * vm,
+		 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *n;
+  u32 node_index;
+
+  vlib_cli_output (vm, "%U\n", format_vlib_node_graph, nm, 0);
+
+  if (unformat (input, "%U", unformat_vlib_node, vm, &node_index))
+    {
+      n = vlib_get_node (vm, node_index);
+      vlib_cli_output (vm, "%U\n", format_vlib_node_graph, nm, n);
+    }
+  else
+    {
+      vlib_node_t **nodes = vec_dup (nm->nodes);
+      uword i;
+
+      vec_sort_with_function (nodes, node_cmp);
+
+      for (i = 0; i < vec_len (nodes); i++)
+	vlib_cli_output (vm, "%U\n\n", format_vlib_node_graph, nm, nodes[i]);
+
+      vec_free (nodes);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_node_graph_command, static) = {
+  .path = "show vlib graph",
+  .short_help = "Show packet processing node graph",
+  .function = show_node_graph,
+};
+/* *INDENT-ON* */
+
+static u8 *
+format_vlib_node_stats (u8 * s, va_list * va)
+{
+  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
+  vlib_node_t *n = va_arg (*va, vlib_node_t *);
+  int max = va_arg (*va, int);
+  f64 v;
+  char *state;
+  u8 *ns;
+  u8 *misc_info = 0;
+  u64 c, p, l, d;
+  f64 x;
+  f64 maxc, maxcn;
+  u32 maxn;
+  uword indent;
+
+  if (!n)
+    {
+      if (max)
+	return format (s,
+		       "%=30s%=17s%=16s%=16s%=16s%=16s",
+		       "Name", "Max Node Clocks", "Vectors at Max",
+		       "Max Clocks", "Avg Clocks", "Avg Vectors/Call");
+      else
+	return format (s,
+		       "%=30s%=12s%=16s%=16s%=16s%=16s%=16s",
+		       "Name", "State", "Calls", "Vectors", "Suspends",
+		       "Clocks", "Vectors/Call");
+    }
+
+  indent = format_get_indent (s);
+
+  l = n->stats_total.clocks - n->stats_last_clear.clocks;
+  c = n->stats_total.calls - n->stats_last_clear.calls;
+  p = n->stats_total.vectors - n->stats_last_clear.vectors;
+  d = n->stats_total.suspends - n->stats_last_clear.suspends;
+  maxc = (f64) n->stats_total.max_clock;
+  maxn = n->stats_total.max_clock_n;
+  if (n->stats_total.max_clock_n)
+    maxcn = (f64) n->stats_total.max_clock / (f64) maxn;
+  else
+    maxcn = 0.0;
+
+  /* Clocks per packet, per call or per suspend. */
+  x = 0;
+  if (p > 0)
+    x = (f64) l / (f64) p;
+  else if (c > 0)
+    x = (f64) l / (f64) c;
+  else if (d > 0)
+    x = (f64) l / (f64) d;
+
+  if (c > 0)
+    v = (double) p / (double) c;
+  else
+    v = 0;
+
+  state = "active";
+  if (n->type == VLIB_NODE_TYPE_PROCESS)
+    {
+      vlib_process_t *p = vlib_get_process_from_node (vm, n);
+
+      /* Show processes with events pending.  This helps spot bugs where events are not
+         being handled. */
+      if (!clib_bitmap_is_zero (p->non_empty_event_type_bitmap))
+	misc_info = format (misc_info, "events pending, ");
+
+      switch (p->flags & (VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK
+			  | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT))
+	{
+	default:
+	  if (!(p->flags & VLIB_PROCESS_IS_RUNNING))
+	    state = "done";
+	  break;
+
+	case VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK:
+	  state = "time wait";
+	  break;
+
+	case VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT:
+	  state = "event wait";
+	  break;
+
+	case (VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK):
+	  state =
+	    "any wait";
+	  break;
+	}
+    }
+  else if (n->type != VLIB_NODE_TYPE_INTERNAL)
+    {
+      state = "polling";
+      if (n->state == VLIB_NODE_STATE_DISABLED)
+	state = "disabled";
+      else if (n->state == VLIB_NODE_STATE_INTERRUPT)
+	state = "interrupt wait";
+    }
+
+  ns = n->name;
+
+  if (max)
+    s = format (s, "%-30v%=17.2e%=16d%=16.2e%=16.2e%=16.2e",
+		ns, maxc, maxn, maxcn, x, v);
+  else
+    s = format (s, "%-30v%=12s%16Ld%16Ld%16Ld%16.2e%16.2f", ns, state,
+		c, p, d, x, v);
+
+  if (ns != n->name)
+    vec_free (ns);
+
+  if (misc_info)
+    {
+      s = format (s, "\n%U%v", format_white_space, indent + 4, misc_info);
+      vec_free (misc_info);
+    }
+
+  return s;
+}
+
+static clib_error_t *
+show_node_runtime (vlib_main_t * vm,
+		   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *n;
+  f64 time_now;
+  u32 node_index;
+  vlib_node_t ***node_dups = 0;
+  f64 *vectors_per_main_loop = 0;
+  f64 *last_vector_length_per_node = 0;
+
+  time_now = vlib_time_now (vm);
+
+  if (unformat (input, "%U", unformat_vlib_node, vm, &node_index))
+    {
+      n = vlib_get_node (vm, node_index);
+      vlib_node_sync_stats (vm, n);
+      vlib_cli_output (vm, "%U\n", format_vlib_node_stats, vm, 0, 0);
+      vlib_cli_output (vm, "%U\n", format_vlib_node_stats, vm, n, 0);
+    }
+  else
+    {
+      vlib_node_t **nodes;
+      uword i, j;
+      f64 dt;
+      u64 n_input, n_output, n_drop, n_punt;
+      u64 n_internal_vectors, n_internal_calls;
+      u64 n_clocks, l, v, c, d;
+      int brief = 1;
+      int max = 0;
+      vlib_main_t **stat_vms = 0, *stat_vm;
+
+      /* Suppress nodes with zero calls since last clear */
+      if (unformat (input, "brief") || unformat (input, "b"))
+	brief = 1;
+      if (unformat (input, "verbose") || unformat (input, "v"))
+	brief = 0;
+      if (unformat (input, "max") || unformat (input, "m"))
+	max = 1;
+
+      if (vec_len (vlib_mains) == 0)
+	vec_add1 (stat_vms, vm);
+      else
+	{
+	  for (i = 0; i < vec_len (vlib_mains); i++)
+	    {
+	      stat_vm = vlib_mains[i];
+	      if (stat_vm)
+		vec_add1 (stat_vms, stat_vm);
+	    }
+	}
+
+      /*
+       * Barrier sync across stats scraping.
+       * Otherwise, the counts will be grossly inaccurate.
+       */
+      vlib_worker_thread_barrier_sync (vm);
+
+      for (j = 0; j < vec_len (stat_vms); j++)
+	{
+	  stat_vm = stat_vms[j];
+	  nm = &stat_vm->node_main;
+
+	  for (i = 0; i < vec_len (nm->nodes); i++)
+	    {
+	      n = nm->nodes[i];
+	      vlib_node_sync_stats (stat_vm, n);
+	    }
+
+	  nodes = vec_dup (nm->nodes);
+
+	  vec_add1 (node_dups, nodes);
+	  vec_add1 (vectors_per_main_loop,
+		    vlib_last_vectors_per_main_loop_as_f64 (stat_vm));
+	  vec_add1 (last_vector_length_per_node,
+		    vlib_last_vector_length_per_node (stat_vm));
+	}
+      vlib_worker_thread_barrier_release (vm);
+
+
+      for (j = 0; j < vec_len (stat_vms); j++)
+	{
+	  stat_vm = stat_vms[j];
+	  nodes = node_dups[j];
+
+	  vec_sort_with_function (nodes, node_cmp);
+
+	  n_input = n_output = n_drop = n_punt = n_clocks = 0;
+	  n_internal_vectors = n_internal_calls = 0;
+	  for (i = 0; i < vec_len (nodes); i++)
+	    {
+	      n = nodes[i];
+
+	      l = n->stats_total.clocks - n->stats_last_clear.clocks;
+	      n_clocks += l;
+
+	      v = n->stats_total.vectors - n->stats_last_clear.vectors;
+	      c = n->stats_total.calls - n->stats_last_clear.calls;
+
+	      switch (n->type)
+		{
+		default:
+		  continue;
+
+		case VLIB_NODE_TYPE_INTERNAL:
+		  n_output += (n->flags & VLIB_NODE_FLAG_IS_OUTPUT) ? v : 0;
+		  n_drop += (n->flags & VLIB_NODE_FLAG_IS_DROP) ? v : 0;
+		  n_punt += (n->flags & VLIB_NODE_FLAG_IS_PUNT) ? v : 0;
+		  if (!(n->flags & VLIB_NODE_FLAG_IS_OUTPUT))
+		    {
+		      n_internal_vectors += v;
+		      n_internal_calls += c;
+		    }
+		  if (n->flags & VLIB_NODE_FLAG_IS_HANDOFF)
+		    n_input += v;
+		  break;
+
+		case VLIB_NODE_TYPE_INPUT:
+		  n_input += v;
+		  break;
+		}
+	    }
+
+	  if (vec_len (vlib_mains))
+	    {
+	      vlib_worker_thread_t *w = vlib_worker_threads + j;
+	      if (j > 0)
+		vlib_cli_output (vm, "---------------");
+
+	      if (w->lcore_id > -1)
+		vlib_cli_output (vm, "Thread %d %s (lcore %u)", j, w->name,
+				 w->lcore_id);
+	      else
+		vlib_cli_output (vm, "Thread %d %s", j, w->name);
+	    }
+
+	  dt = time_now - nm->time_last_runtime_stats_clear;
+	  vlib_cli_output
+	    (vm,
+	     "Time %.1f, average vectors/node %.2f, last %d main loops %.2f per node %.2f"
+	     "\n  vector rates in %.4e, out %.4e, drop %.4e, punt %.4e",
+	     dt,
+	     (n_internal_calls > 0
+	      ? (f64) n_internal_vectors / (f64) n_internal_calls
+	      : 0),
+	     1 << VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE,
+	     vectors_per_main_loop[j],
+	     last_vector_length_per_node[j],
+	     (f64) n_input / dt,
+	     (f64) n_output / dt, (f64) n_drop / dt, (f64) n_punt / dt);
+
+	  vlib_cli_output (vm, "%U", format_vlib_node_stats, stat_vm, 0, max);
+	  for (i = 0; i < vec_len (nodes); i++)
+	    {
+	      c =
+		nodes[i]->stats_total.calls -
+		nodes[i]->stats_last_clear.calls;
+	      d =
+		nodes[i]->stats_total.suspends -
+		nodes[i]->stats_last_clear.suspends;
+	      if (c || d || !brief)
+		{
+		  vlib_cli_output (vm, "%U", format_vlib_node_stats, stat_vm,
+				   nodes[i], max);
+		}
+	    }
+	  vec_free (nodes);
+	}
+      vec_free (stat_vms);
+      vec_free (node_dups);
+      vec_free (vectors_per_main_loop);
+      vec_free (last_vector_length_per_node);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_node_runtime_command, static) = {
+  .path = "show runtime",
+  .short_help = "Show packet processing runtime",
+  .function = show_node_runtime,
+  .is_mp_safe = 1,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+clear_node_runtime (vlib_main_t * vm,
+		    unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vlib_node_main_t *nm;
+  vlib_node_t *n;
+  int i, j;
+  vlib_main_t **stat_vms = 0, *stat_vm;
+  vlib_node_runtime_t *r;
+
+  if (vec_len (vlib_mains) == 0)
+    vec_add1 (stat_vms, vm);
+  else
+    {
+      for (i = 0; i < vec_len (vlib_mains); i++)
+	{
+	  stat_vm = vlib_mains[i];
+	  if (stat_vm)
+	    vec_add1 (stat_vms, stat_vm);
+	}
+    }
+
+  vlib_worker_thread_barrier_sync (vm);
+
+  for (j = 0; j < vec_len (stat_vms); j++)
+    {
+      stat_vm = stat_vms[j];
+      nm = &stat_vm->node_main;
+
+      for (i = 0; i < vec_len (nm->nodes); i++)
+	{
+	  n = nm->nodes[i];
+	  vlib_node_sync_stats (stat_vm, n);
+	  n->stats_last_clear = n->stats_total;
+
+	  r = vlib_node_get_runtime (stat_vm, n->index);
+	  r->max_clock = 0;
+	}
+      /* Note: input/output rates computed using vlib_global_main */
+      nm->time_last_runtime_stats_clear = vlib_time_now (vm);
+    }
+
+  vlib_worker_thread_barrier_release (vm);
+
+  vec_free (stat_vms);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (clear_node_runtime_command, static) = {
+  .path = "clear runtime",
+  .short_help = "Clear packet processing runtime statistics",
+  .function = clear_node_runtime,
+};
+/* *INDENT-ON* */
+
+/* Dummy function to get us linked in. */
+void
+vlib_node_cli_reference (void)
+{
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/node_format.c b/src/vlib/node_format.c
new file mode 100644
index 00000000..e9dde40f
--- /dev/null
+++ b/src/vlib/node_format.c
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * node_format.c: node formatting
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+
+u8 *
+format_vlib_node_graph (u8 * s, va_list * va)
+{
+  vlib_node_main_t *nm = va_arg (*va, vlib_node_main_t *);
+  vlib_node_t *n = va_arg (*va, vlib_node_t *);
+  int i, j;
+  uword indent;
+  typedef struct
+  {
+    u32 next_node;
+    u32 next_slot;
+    u32 prev_node;
+  } tmp_t;
+  tmp_t *tmps = 0;
+  tmp_t empty = {.next_node = ~0,.prev_node = ~0 };
+
+  if (!n)
+    return format (s, "%=26s%=26s%=26s", "Name", "Next", "Previous");
+
+  s = format (s, "%-26v", n->name);
+
+  indent = format_get_indent (s);
+
+  for (i = j = 0; i < vec_len (n->next_nodes); i++)
+    {
+      if (n->next_nodes[i] == VLIB_INVALID_NODE_INDEX)
+	continue;
+      vec_validate_init_empty (tmps, j, empty);
+      tmps[j].next_node = n->next_nodes[i];
+      tmps[j].next_slot = i;
+      j++;
+    }
+
+  j = 0;
+  /* *INDENT-OFF* */
+  clib_bitmap_foreach (i, n->prev_node_bitmap, ({
+	vec_validate_init_empty (tmps, j, empty);
+	tmps[j].prev_node = i;
+	j++;
+      }));
+  /* *INDENT-ON* */
+
+  for (i = 0; i < vec_len (tmps); i++)
+    {
+      if (i > 0)
+	s = format (s, "\n%U", format_white_space, indent);
+
+      if (tmps[i].next_node != ~0)
+	{
+	  vlib_node_t *x;
+	  u8 *t = 0;
+
+	  x = vec_elt (nm->nodes, tmps[i].next_node);
+	  t = format (t, "%v [%d]", x->name, tmps[i].next_slot);
+	  s = format (s, "%=26v", t);
+	  vec_free (t);
+	}
+      else
+	s = format (s, "%26s", "");
+
+      if (tmps[i].prev_node != ~0)
+	{
+	  vlib_node_t *x;
+	  x = vec_elt (nm->nodes, tmps[i].prev_node);
+	  s = format (s, "%=26v", x->name);
+	}
+    }
+
+  vec_free (tmps);
+
+  return s;
+}
+
+u8 *
+format_vlib_node_and_next (u8 * s, va_list * va)
+{
+  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
+  vlib_node_t *n = va_arg (*va, vlib_node_t *);
+  u32 next_index = va_arg (*va, u32);
+  vlib_node_t *n_next;
+  u32 *ni;
+
+  ni = vec_elt_at_index (n->next_nodes, next_index);
+  n_next = vlib_get_node (vm, ni[0]);
+  return format (s, "%v -> %v", n->name, n_next->name);
+}
+
+u8 *
+format_vlib_node_name (u8 * s, va_list * va)
+{
+  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
+  u32 node_index = va_arg (*va, u32);
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+
+  return format (s, "%v", n->name);
+}
+
+u8 *
+format_vlib_next_node_name (u8 * s, va_list * va)
+{
+  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
+  u32 node_index = va_arg (*va, u32);
+  u32 next_index = va_arg (*va, u32);
+  vlib_node_t *next = vlib_get_next_node (vm, node_index, next_index);
+  return format (s, "%v", next->name);
+}
+
+/* Parse node name -> node index. */
+uword
+unformat_vlib_node (unformat_input_t * input, va_list * args)
+{
+  vlib_main_t *vm = va_arg (*args, vlib_main_t *);
+  u32 *result = va_arg (*args, u32 *);
+
+  return unformat_user (input, unformat_hash_vec_string,
+			vm->node_main.node_by_name, result);
+}
+
+u8 *
+format_vlib_time (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  f64 time = va_arg (*va, f64);
+  return format (s, "%12.4f", time);
+}
+
+u8 *
+format_vlib_cpu_time (u8 * s, va_list * va)
+{
+  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
+  u64 cpu_time = va_arg (*va, u64);
+  f64 dt;
+
+  dt =
+    (cpu_time -
+     vm->clib_time.init_cpu_time) * vm->clib_time.seconds_per_clock;
+  return format (s, "%U", format_vlib_time, vm, dt);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/node_funcs.h b/src/vlib/node_funcs.h
new file mode 100644
index 00000000..21167396
--- /dev/null
+++ b/src/vlib/node_funcs.h
@@ -0,0 +1,1130 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * node_funcs.h: processing nodes global functions/inlines
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/** \file
+    vlib node functions
+*/
+
+
+#ifndef included_vlib_node_funcs_h
+#define included_vlib_node_funcs_h
+
+#include <vppinfra/fifo.h>
+
+/** \brief Get vlib node by index.
+ @warning This function will ASSERT if @c i is out of range.
+ @param vm vlib_main_t pointer, varies by thread
+ @param i node index.
+ @return pointer to the requested vlib_node_t.
+*/
+
+always_inline vlib_node_t *
+vlib_get_node (vlib_main_t * vm, u32 i)
+{
+  return vec_elt (vm->node_main.nodes, i);
+}
+
+/** \brief Get vlib node by graph arc (next) index.
+ @param vm vlib_main_t pointer, varies by thread
+ @param node_index index of original node
+ @param next_index graph arc index
+ @return pointer to the vlib_node_t at the end of the indicated arc
+*/
+
+always_inline vlib_node_t *
+vlib_get_next_node (vlib_main_t * vm, u32 node_index, u32 next_index)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *n;
+
+  n = vec_elt (nm->nodes, node_index);
+  ASSERT (next_index < vec_len (n->next_nodes));
+  return vlib_get_node (vm, n->next_nodes[next_index]);
+}
+
+/** \brief Get node runtime by node index.
+ @param vm vlib_main_t pointer, varies by thread
+ @param node_index index of node
+ @return pointer to the indicated vlib_node_runtime_t
+*/
+
+always_inline vlib_node_runtime_t *
+vlib_node_get_runtime (vlib_main_t * vm, u32 node_index)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *n = vec_elt (nm->nodes, node_index);
+  vlib_process_t *p;
+  if (n->type != VLIB_NODE_TYPE_PROCESS)
+    return vec_elt_at_index (nm->nodes_by_type[n->type], n->runtime_index);
+  else
+    {
+      p = vec_elt (nm->processes, n->runtime_index);
+      return &p->node_runtime;
+    }
+}
+
+/** \brief Get node runtime private data by node index.
+ @param vm vlib_main_t pointer, varies by thread
+ @param node_index index of the node
+ @return pointer to the indicated vlib_node_runtime_t private data
+*/
+
+always_inline void *
+vlib_node_get_runtime_data (vlib_main_t * vm, u32 node_index)
+{
+  vlib_node_runtime_t *r = vlib_node_get_runtime (vm, node_index);
+  return r->runtime_data;
+}
+
+/** \brief Set node runtime private data.
+ @param vm vlib_main_t pointer, varies by thread
+ @param node_index index of the node
+ @param runtime_data arbitrary runtime private data
+ @param n_runtime_data_bytes size of runtime private data
+*/
+
+always_inline void
+vlib_node_set_runtime_data (vlib_main_t * vm, u32 node_index,
+			    void *runtime_data, u32 n_runtime_data_bytes)
+{
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  vlib_node_runtime_t *r = vlib_node_get_runtime (vm, node_index);
+
+  n->runtime_data_bytes = n_runtime_data_bytes;
+  vec_free (n->runtime_data);
+  vec_add (n->runtime_data, runtime_data, n_runtime_data_bytes);
+
+  ASSERT (vec_len (n->runtime_data) <= sizeof (vlib_node_runtime_t) -
+	  STRUCT_OFFSET_OF (vlib_node_runtime_t, runtime_data));
+
+  if (vec_len (n->runtime_data) > 0)
+    clib_memcpy (r->runtime_data, n->runtime_data, vec_len (n->runtime_data));
+}
+
+/** \brief Set node dispatch state.
+ @param vm vlib_main_t pointer, varies by thread
+ @param node_index index of the node
+ @param new_state new state for node, see vlib_node_state_t
+*/
+always_inline void
+vlib_node_set_state (vlib_main_t * vm, u32 node_index,
+		     vlib_node_state_t new_state)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *n;
+  vlib_node_runtime_t *r;
+
+  n = vec_elt (nm->nodes, node_index);
+  if (n->type == VLIB_NODE_TYPE_PROCESS)
+    {
+      vlib_process_t *p = vec_elt (nm->processes, n->runtime_index);
+      r = &p->node_runtime;
+
+      /* When disabling make sure flags are cleared. */
+      p->flags &= ~(VLIB_PROCESS_RESUME_PENDING
+		    | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK
+		    | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT);
+    }
+  else
+    r = vec_elt_at_index (nm->nodes_by_type[n->type], n->runtime_index);
+
+  ASSERT (new_state < VLIB_N_NODE_STATE);
+
+  if (n->type == VLIB_NODE_TYPE_INPUT)
+    {
+      ASSERT (nm->input_node_counts_by_state[n->state] > 0);
+      nm->input_node_counts_by_state[n->state] -= 1;
+      nm->input_node_counts_by_state[new_state] += 1;
+    }
+
+  n->state = new_state;
+  r->state = new_state;
+}
+
+always_inline void
+vlib_node_set_interrupt_pending (vlib_main_t * vm, u32 node_index)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *n = vec_elt (nm->nodes, node_index);
+  ASSERT (n->type == VLIB_NODE_TYPE_INPUT);
+  vec_add1 (nm->pending_interrupt_node_runtime_indices, n->runtime_index);
+}
+
+always_inline vlib_process_t *
+vlib_get_process_from_node (vlib_main_t * vm, vlib_node_t * node)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  ASSERT (node->type == VLIB_NODE_TYPE_PROCESS);
+  return vec_elt (nm->processes, node->runtime_index);
+}
+
+/* Fetches frame with given handle. */
+always_inline vlib_frame_t *
+vlib_get_frame_no_check (vlib_main_t * vm, uword frame_index)
+{
+  vlib_frame_t *f;
+  u32 cpu_index = frame_index & VLIB_CPU_MASK;
+  u32 offset = frame_index & VLIB_OFFSET_MASK;
+  vm = vlib_mains ? vlib_mains[cpu_index] : vm;
+  f = vm->heap_base + offset;
+  return f;
+}
+
+always_inline u32
+vlib_frame_index_no_check (vlib_main_t * vm, vlib_frame_t * f)
+{
+  u32 i;
+
+  ASSERT (((uword) f & VLIB_CPU_MASK) == 0);
+
+  vm = vlib_mains ? vlib_mains[f->cpu_index] : vm;
+
+  i = ((u8 *) f - (u8 *) vm->heap_base);
+  return i | f->cpu_index;
+}
+
+always_inline vlib_frame_t *
+vlib_get_frame (vlib_main_t * vm, uword frame_index)
+{
+  vlib_frame_t *f = vlib_get_frame_no_check (vm, frame_index);
+  ASSERT (f->flags & VLIB_FRAME_IS_ALLOCATED);
+  return f;
+}
+
+always_inline u32
+vlib_frame_index (vlib_main_t * vm, vlib_frame_t * f)
+{
+  uword i = vlib_frame_index_no_check (vm, f);
+  ASSERT (vlib_get_frame (vm, i) == f);
+  return i;
+}
+
+/* Byte alignment for vector arguments. */
+#define VLIB_FRAME_VECTOR_ALIGN (1 << 4)
+
+always_inline u32
+vlib_frame_vector_byte_offset (u32 scalar_size)
+{
+  return round_pow2 (sizeof (vlib_frame_t) + scalar_size,
+		     VLIB_FRAME_VECTOR_ALIGN);
+}
+
+/** \brief Get pointer to frame vector data.
+ @param f vlib_frame_t pointer
+ @return pointer to first vector element in frame
+*/
+always_inline void *
+vlib_frame_vector_args (vlib_frame_t * f)
+{
+  return (void *) f + vlib_frame_vector_byte_offset (f->scalar_size);
+}
+
+/** \brief Get pointer to frame scalar data.
+
+ @warning This is almost certainly not the function you wish to call.
+ See @ref vlib_frame_vector_args instead.
+
+ @param f vlib_frame_t pointer
+
+ @return arbitrary node scalar data
+
+ @sa vlib_frame_vector_args
+*/
+always_inline void *
+vlib_frame_args (vlib_frame_t * f)
+{
+  return vlib_frame_vector_args (f) - f->scalar_size;
+}
+
+always_inline vlib_next_frame_t *
+vlib_node_runtime_get_next_frame (vlib_main_t * vm,
+				  vlib_node_runtime_t * n, u32 next_index)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_next_frame_t *nf;
+
+  ASSERT (next_index < n->n_next_nodes);
+  nf = vec_elt_at_index (nm->next_frames, n->next_frame_index + next_index);
+
+  if (CLIB_DEBUG > 0)
+    {
+      vlib_node_t *node, *next;
+      node = vec_elt (nm->nodes, n->node_index);
+      next = vec_elt (nm->nodes, node->next_nodes[next_index]);
+      ASSERT (nf->node_runtime_index == next->runtime_index);
+    }
+
+  return nf;
+}
+
+/** \brief Get pointer to frame by (@c node_index, @c next_index).
+
+ @warning This is not a function that you should call directly.
+ See @ref vlib_get_next_frame instead.
+
+ @param vm vlib_main_t pointer, varies by thread
+ @param node_index index of the node
+ @param next_index graph arc index
+
+ @return pointer to the requested vlib_next_frame_t
+
+ @sa vlib_get_next_frame
+*/
+
+always_inline vlib_next_frame_t *
+vlib_node_get_next_frame (vlib_main_t * vm, u32 node_index, u32 next_index)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *n;
+  vlib_node_runtime_t *r;
+
+  n = vec_elt (nm->nodes, node_index);
+  r = vec_elt_at_index (nm->nodes_by_type[n->type], n->runtime_index);
+  return vlib_node_runtime_get_next_frame (vm, r, next_index);
+}
+
+vlib_frame_t *vlib_get_next_frame_internal (vlib_main_t * vm,
+					    vlib_node_runtime_t * node,
+					    u32 next_index,
+					    u32 alloc_new_frame);
+
+#define vlib_get_next_frame_macro(vm,node,next_index,vectors,n_vectors_left,alloc_new_frame) \
+do {									\
+  vlib_frame_t * _f							\
+    = vlib_get_next_frame_internal ((vm), (node), (next_index),		\
+				    (alloc_new_frame));			\
+  u32 _n = _f->n_vectors;						\
+  (vectors) = vlib_frame_vector_args (_f) + _n * sizeof ((vectors)[0]); \
+  (n_vectors_left) = VLIB_FRAME_SIZE - _n;				\
+} while (0)
+
+
+/** \brief Get pointer to next frame vector data by
+    (@c vlib_node_runtime_t, @c next_index).
+ Standard single/dual loop boilerplate element.
+ @attention This is a MACRO, with SIDE EFFECTS.
+
+ @param vm vlib_main_t pointer, varies by thread
+ @param node current node vlib_node_runtime_t pointer
+ @param next_index requested graph arc index
+
+ @return @c vectors -- pointer to next available vector slot
+ @return @c n_vectors_left -- number of vector slots available
+*/
+#define vlib_get_next_frame(vm,node,next_index,vectors,n_vectors_left)	\
+  vlib_get_next_frame_macro (vm, node, next_index,			\
+			     vectors, n_vectors_left,			\
+			     /* alloc new frame */ 0)
+
+#define vlib_get_new_next_frame(vm,node,next_index,vectors,n_vectors_left) \
+  vlib_get_next_frame_macro (vm, node, next_index,			\
+			     vectors, n_vectors_left,			\
+			     /* alloc new frame */ 1)
+
+/** \brief Release pointer to next frame vector data.
+ Standard single/dual loop boilerplate element.
+ @param vm vlib_main_t pointer, varies by thread
+ @param r current node vlib_node_runtime_t pointer
+ @param next_index graph arc index
+ @param n_packets_left number of slots still available in vector
+*/
+void
+vlib_put_next_frame (vlib_main_t * vm,
+		     vlib_node_runtime_t * r,
+		     u32 next_index, u32 n_packets_left);
+
+/* Combination get plus put.  Returns vector argument just added. */
+#define vlib_set_next_frame(vm,node,next_index,v)			\
+({									\
+  uword _n_left;							\
+  vlib_get_next_frame ((vm), (node), (next_index), (v), _n_left);	\
+  ASSERT (_n_left > 0);							\
+  vlib_put_next_frame ((vm), (node), (next_index), _n_left - 1);	\
+  (v);									\
+})
+
+always_inline void
+vlib_set_next_frame_buffer (vlib_main_t * vm,
+			    vlib_node_runtime_t * node,
+			    u32 next_index, u32 buffer_index)
+{
+  u32 *p;
+  p = vlib_set_next_frame (vm, node, next_index, p);
+  p[0] = buffer_index;
+}
+
+vlib_frame_t *vlib_get_frame_to_node (vlib_main_t * vm, u32 to_node_index);
+void vlib_put_frame_to_node (vlib_main_t * vm, u32 to_node_index,
+			     vlib_frame_t * f);
+
+always_inline vlib_process_t *
+vlib_get_current_process (vlib_main_t * vm)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  return vec_elt (nm->processes, nm->current_process_index);
+}
+
+always_inline uword
+vlib_in_process_context (vlib_main_t * vm)
+{
+  return vm->node_main.current_process_index != ~0;
+}
+
+always_inline uword
+vlib_current_process (vlib_main_t * vm)
+{
+  return vlib_get_current_process (vm)->node_runtime.node_index;
+}
+
+/** Returns TRUE if a process suspend time is less than 1us
+    @param dt - remaining poll time in seconds
+    @returns 1 if dt < 1e-6, 0 otherwise
+*/
+always_inline uword
+vlib_process_suspend_time_is_zero (f64 dt)
+{
+  return dt < 1e-6;
+}
+
+/** Suspend a vlib cooperative multi-tasking thread for a period of time
+    @param vm - vlib_main_t *
+    @param dt - suspend interval in seconds
+    @returns VLIB_PROCESS_RESUME_LONGJMP_RESUME, routinely ignored
+*/
+
+always_inline uword
+vlib_process_suspend (vlib_main_t * vm, f64 dt)
+{
+  uword r;
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_process_t *p = vec_elt (nm->processes, nm->current_process_index);
+  u64 dt_cpu = dt * vm->clib_time.clocks_per_second;
+
+  if (vlib_process_suspend_time_is_zero (dt))
+    return VLIB_PROCESS_RESUME_LONGJMP_RESUME;
+
+  p->flags |= VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK;
+  r = clib_setjmp (&p->resume_longjmp, VLIB_PROCESS_RESUME_LONGJMP_SUSPEND);
+  if (r == VLIB_PROCESS_RESUME_LONGJMP_SUSPEND)
+    {
+      p->resume_cpu_time = clib_cpu_time_now () + dt_cpu;
+      clib_longjmp (&p->return_longjmp, VLIB_PROCESS_RETURN_LONGJMP_SUSPEND);
+    }
+
+  return r;
+}
+
+always_inline void
+vlib_process_free_event_type (vlib_process_t * p, uword t,
+			      uword is_one_time_event)
+{
+  ASSERT (!pool_is_free_index (p->event_type_pool, t));
+  pool_put_index (p->event_type_pool, t);
+  if (is_one_time_event)
+    p->one_time_event_type_bitmap =
+      clib_bitmap_andnoti (p->one_time_event_type_bitmap, t);
+}
+
+always_inline void
+vlib_process_maybe_free_event_type (vlib_process_t * p, uword t)
+{
+  ASSERT (!pool_is_free_index (p->event_type_pool, t));
+  if (clib_bitmap_get (p->one_time_event_type_bitmap, t))
+    vlib_process_free_event_type (p, t, /* is_one_time_event */ 1);
+}
+
+always_inline void *
+vlib_process_get_event_data (vlib_main_t * vm,
+			     uword * return_event_type_opaque)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_process_t *p;
+  vlib_process_event_type_t *et;
+  uword t, l;
+  void *event_data_vector;
+
+  p = vec_elt (nm->processes, nm->current_process_index);
+
+  /* Find first type with events ready.
+     Return invalid type when there's nothing there. */
+  t = clib_bitmap_first_set (p->non_empty_event_type_bitmap);
+  if (t == ~0)
+    return 0;
+
+  p->non_empty_event_type_bitmap =
+    clib_bitmap_andnoti (p->non_empty_event_type_bitmap, t);
+
+  l = _vec_len (p->pending_event_data_by_type_index[t]);
+  ASSERT (l > 0);
+  event_data_vector = p->pending_event_data_by_type_index[t];
+  p->pending_event_data_by_type_index[t] = 0;
+
+  et = pool_elt_at_index (p->event_type_pool, t);
+
+  /* Return user's opaque value and possibly index. */
+  *return_event_type_opaque = et->opaque;
+
+  vlib_process_maybe_free_event_type (p, t);
+
+  return event_data_vector;
+}
+
+/* Return event data vector for later reuse.  We reuse event data to avoid
+   repeatedly allocating event vectors in cases where we care about speed. */
+always_inline void
+vlib_process_put_event_data (vlib_main_t * vm, void *event_data)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vec_add1 (nm->recycled_event_data_vectors, event_data);
+}
+
+/** Return the first event type which has occurred and a vector of per-event
+    data of that type, or a timeout indication
+
+    @param vm - vlib_main_t pointer
+    @param data_vector - pointer to a (uword *) vector to receive event data
+    @returns either an event type and a vector of per-event instance data,
+    or ~0 to indicate a timeout.
+*/
+
+always_inline uword
+vlib_process_get_events (vlib_main_t * vm, uword ** data_vector)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_process_t *p;
+  vlib_process_event_type_t *et;
+  uword r, t, l;
+
+  p = vec_elt (nm->processes, nm->current_process_index);
+
+  /* Find first type with events ready.
+     Return invalid type when there's nothing there. */
+  t = clib_bitmap_first_set (p->non_empty_event_type_bitmap);
+  if (t == ~0)
+    return t;
+
+  p->non_empty_event_type_bitmap =
+    clib_bitmap_andnoti (p->non_empty_event_type_bitmap, t);
+
+  l = _vec_len (p->pending_event_data_by_type_index[t]);
+  if (data_vector)
+    vec_add (*data_vector, p->pending_event_data_by_type_index[t], l);
+  _vec_len (p->pending_event_data_by_type_index[t]) = 0;
+
+  et = pool_elt_at_index (p->event_type_pool, t);
+
+  /* Return user's opaque value. */
+  r = et->opaque;
+
+  vlib_process_maybe_free_event_type (p, t);
+
+  return r;
+}
+
+always_inline uword
+vlib_process_get_events_helper (vlib_process_t * p, uword t,
+				uword ** data_vector)
+{
+  uword l;
+
+  p->non_empty_event_type_bitmap =
+    clib_bitmap_andnoti (p->non_empty_event_type_bitmap, t);
+
+  l = _vec_len (p->pending_event_data_by_type_index[t]);
+  if (data_vector)
+    vec_add (*data_vector, p->pending_event_data_by_type_index[t], l);
+  _vec_len (p->pending_event_data_by_type_index[t]) = 0;
+
+  vlib_process_maybe_free_event_type (p, t);
+
+  return l;
+}
+
+/* As above but query as specified type of event.  Returns number of
+   events found. */
+always_inline uword
+vlib_process_get_events_with_type (vlib_main_t * vm, uword ** data_vector,
+				   uword with_type_opaque)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_process_t *p;
+  uword t, *h;
+
+  p = vec_elt (nm->processes, nm->current_process_index);
+  h = hash_get (p->event_type_index_by_type_opaque, with_type_opaque);
+  if (!h)
+    /* This can happen when an event has not yet been
+       signaled with given opaque type. */
+    return 0;
+
+  t = h[0];
+  if (!clib_bitmap_get (p->non_empty_event_type_bitmap, t))
+    return 0;
+
+  return vlib_process_get_events_helper (p, t, data_vector);
+}
+
+always_inline uword *
+vlib_process_wait_for_event (vlib_main_t * vm)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_process_t *p;
+  uword r;
+
+  p = vec_elt (nm->processes, nm->current_process_index);
+  if (clib_bitmap_is_zero (p->non_empty_event_type_bitmap))
+    {
+      p->flags |= VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT;
+      r =
+	clib_setjmp (&p->resume_longjmp, VLIB_PROCESS_RESUME_LONGJMP_SUSPEND);
+      if (r == VLIB_PROCESS_RESUME_LONGJMP_SUSPEND)
+	clib_longjmp (&p->return_longjmp,
+		      VLIB_PROCESS_RETURN_LONGJMP_SUSPEND);
+    }
+
+  return p->non_empty_event_type_bitmap;
+}
+
+always_inline uword
+vlib_process_wait_for_one_time_event (vlib_main_t * vm,
+				      uword ** data_vector,
+				      uword with_type_index)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_process_t *p;
+  uword r;
+
+  p = vec_elt (nm->processes, nm->current_process_index);
+  ASSERT (!pool_is_free_index (p->event_type_pool, with_type_index));
+  while (!clib_bitmap_get (p->non_empty_event_type_bitmap, with_type_index))
+    {
+      p->flags |= VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT;
+      r =
+	clib_setjmp (&p->resume_longjmp, VLIB_PROCESS_RESUME_LONGJMP_SUSPEND);
+      if (r == VLIB_PROCESS_RESUME_LONGJMP_SUSPEND)
+	clib_longjmp (&p->return_longjmp,
+		      VLIB_PROCESS_RETURN_LONGJMP_SUSPEND);
+    }
+
+  return vlib_process_get_events_helper (p, with_type_index, data_vector);
+}
+
+always_inline uword
+vlib_process_wait_for_event_with_type (vlib_main_t * vm,
+				       uword ** data_vector,
+				       uword with_type_opaque)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_process_t *p;
+  uword r, *h;
+
+  p = vec_elt (nm->processes, nm->current_process_index);
+  h = hash_get (p->event_type_index_by_type_opaque, with_type_opaque);
+  while (!h || !clib_bitmap_get (p->non_empty_event_type_bitmap, h[0]))
+    {
+      p->flags |= VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT;
+      r =
+	clib_setjmp (&p->resume_longjmp, VLIB_PROCESS_RESUME_LONGJMP_SUSPEND);
+      if (r == VLIB_PROCESS_RESUME_LONGJMP_SUSPEND)
+	clib_longjmp (&p->return_longjmp,
+		      VLIB_PROCESS_RETURN_LONGJMP_SUSPEND);
+
+      /* See if unknown event type has been signaled now. */
+      if (!h)
+	h = hash_get (p->event_type_index_by_type_opaque, with_type_opaque);
+    }
+
+  return vlib_process_get_events_helper (p, h[0], data_vector);
+}
+
+/** Suspend a cooperative multi-tasking thread
+    Waits for an event, or for the indicated number of seconds to elapse
+    @param vm - vlib_main_t pointer
+    @param dt - timeout, in seconds.
+    @returns the remaining time interval
+*/
+
+always_inline f64
+vlib_process_wait_for_event_or_clock (vlib_main_t * vm, f64 dt)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_process_t *p;
+  f64 wakeup_time;
+  uword r;
+
+  p = vec_elt (nm->processes, nm->current_process_index);
+
+  if (vlib_process_suspend_time_is_zero (dt)
+      || !clib_bitmap_is_zero (p->non_empty_event_type_bitmap))
+    return dt;
+
+  wakeup_time = vlib_time_now (vm) + dt;
+
+  /* Suspend waiting for both clock and event to occur. */
+  p->flags |= (VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT
+	       | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK);
+
+  r = clib_setjmp (&p->resume_longjmp, VLIB_PROCESS_RESUME_LONGJMP_SUSPEND);
+  if (r == VLIB_PROCESS_RESUME_LONGJMP_SUSPEND)
+    {
+      p->resume_cpu_time = (clib_cpu_time_now ()
+			    + (dt * vm->clib_time.clocks_per_second));
+      clib_longjmp (&p->return_longjmp, VLIB_PROCESS_RETURN_LONGJMP_SUSPEND);
+    }
+
+  /* Return amount of time still left to sleep.
+     If <= 0 then we've been waken up by the clock (and not an event). */
+  return wakeup_time - vlib_time_now (vm);
+}
+
+always_inline vlib_process_event_type_t *
+vlib_process_new_event_type (vlib_process_t * p, uword with_type_opaque)
+{
+  vlib_process_event_type_t *et;
+  pool_get (p->event_type_pool, et);
+  et->opaque = with_type_opaque;
+  return et;
+}
+
+always_inline uword
+vlib_process_create_one_time_event (vlib_main_t * vm, uword node_index,
+				    uword with_type_opaque)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  vlib_process_t *p = vec_elt (nm->processes, n->runtime_index);
+  vlib_process_event_type_t *et;
+  uword t;
+
+  et = vlib_process_new_event_type (p, with_type_opaque);
+  t = et - p->event_type_pool;
+  p->one_time_event_type_bitmap =
+    clib_bitmap_ori (p->one_time_event_type_bitmap, t);
+  return t;
+}
+
+always_inline void
+vlib_process_delete_one_time_event (vlib_main_t * vm, uword node_index,
+				    uword t)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  vlib_process_t *p = vec_elt (nm->processes, n->runtime_index);
+
+  ASSERT (clib_bitmap_get (p->one_time_event_type_bitmap, t));
+  vlib_process_free_event_type (p, t, /* is_one_time_event */ 1);
+}
+
+always_inline void *
+vlib_process_signal_event_helper (vlib_node_main_t * nm,
+				  vlib_node_t * n,
+				  vlib_process_t * p,
+				  uword t,
+				  uword n_data_elts, uword n_data_elt_bytes)
+{
+  uword p_flags, add_to_pending, delete_from_wheel;
+  void *data_to_be_written_by_caller;
+
+  ASSERT (!pool_is_free_index (p->event_type_pool, t));
+
+  vec_validate (p->pending_event_data_by_type_index, t);
+
+  /* Resize data vector and return caller's data to be written. */
+  {
+    void *data_vec = p->pending_event_data_by_type_index[t];
+    uword l;
+
+    if (!data_vec && vec_len (nm->recycled_event_data_vectors))
+      {
+	data_vec = vec_pop (nm->recycled_event_data_vectors);
+	_vec_len (data_vec) = 0;
+      }
+
+    l = vec_len (data_vec);
+
+    data_vec = _vec_resize (data_vec,
+			    /* length_increment */ n_data_elts,
+			    /* total size after increment */
+			    (l + n_data_elts) * n_data_elt_bytes,
+			    /* header_bytes */ 0, /* data_align */ 0);
+
+    p->pending_event_data_by_type_index[t] = data_vec;
+    data_to_be_written_by_caller = data_vec + l * n_data_elt_bytes;
+  }
+
+  p->non_empty_event_type_bitmap =
+    clib_bitmap_ori (p->non_empty_event_type_bitmap, t);
+
+  p_flags = p->flags;
+
+  /* Event was already signalled? */
+  add_to_pending = (p_flags & VLIB_PROCESS_RESUME_PENDING) == 0;
+
+  /* Process will resume when suspend time elapses? */
+  delete_from_wheel = 0;
+  if (p_flags & VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK)
+    {
+      /* Waiting for both event and clock? */
+      if (p_flags & VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT)
+	delete_from_wheel = 1;
+      else
+	/* Waiting only for clock.  Event will be queue and may be
+	   handled when timer expires. */
+	add_to_pending = 0;
+    }
+
+  /* Never add current process to pending vector since current process is
+     already running. */
+  add_to_pending &= nm->current_process_index != n->runtime_index;
+
+  if (add_to_pending)
+    {
+      u32 x = vlib_timing_wheel_data_set_suspended_process (n->runtime_index);
+      p->flags = p_flags | VLIB_PROCESS_RESUME_PENDING;
+      vec_add1 (nm->data_from_advancing_timing_wheel, x);
+      if (delete_from_wheel)
+	timing_wheel_delete (&nm->timing_wheel, x);
+    }
+
+  return data_to_be_written_by_caller;
+}
+
+always_inline void *
+vlib_process_signal_event_data (vlib_main_t * vm,
+				uword node_index,
+				uword type_opaque,
+				uword n_data_elts, uword n_data_elt_bytes)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  vlib_process_t *p = vec_elt (nm->processes, n->runtime_index);
+  uword *h, t;
+
+  h = hash_get (p->event_type_index_by_type_opaque, type_opaque);
+  if (!h)
+    {
+      vlib_process_event_type_t *et =
+	vlib_process_new_event_type (p, type_opaque);
+      t = et - p->event_type_pool;
+      hash_set (p->event_type_index_by_type_opaque, type_opaque, t);
+    }
+  else
+    t = h[0];
+
+  return vlib_process_signal_event_helper (nm, n, p, t, n_data_elts,
+					   n_data_elt_bytes);
+}
+
+always_inline void *
+vlib_process_signal_event_at_time (vlib_main_t * vm,
+				   f64 dt,
+				   uword node_index,
+				   uword type_opaque,
+				   uword n_data_elts, uword n_data_elt_bytes)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  vlib_process_t *p = vec_elt (nm->processes, n->runtime_index);
+  uword *h, t;
+
+  h = hash_get (p->event_type_index_by_type_opaque, type_opaque);
+  if (!h)
+    {
+      vlib_process_event_type_t *et =
+	vlib_process_new_event_type (p, type_opaque);
+      t = et - p->event_type_pool;
+      hash_set (p->event_type_index_by_type_opaque, type_opaque, t);
+    }
+  else
+    t = h[0];
+
+  if (vlib_process_suspend_time_is_zero (dt))
+    return vlib_process_signal_event_helper (nm, n, p, t, n_data_elts,
+					     n_data_elt_bytes);
+  else
+    {
+      vlib_signal_timed_event_data_t *te;
+      u64 dt_cpu = dt * vm->clib_time.clocks_per_second;
+
+      pool_get_aligned (nm->signal_timed_event_data_pool, te, sizeof (te[0]));
+
+      te->n_data_elts = n_data_elts;
+      te->n_data_elt_bytes = n_data_elt_bytes;
+      te->n_data_bytes = n_data_elts * n_data_elt_bytes;
+
+      /* Assert that structure fields are big enough. */
+      ASSERT (te->n_data_elts == n_data_elts);
+      ASSERT (te->n_data_elt_bytes == n_data_elt_bytes);
+      ASSERT (te->n_data_bytes == n_data_elts * n_data_elt_bytes);
+
+      te->process_node_index = n->runtime_index;
+      te->event_type_index = t;
+
+      timing_wheel_insert (&nm->timing_wheel, clib_cpu_time_now () + dt_cpu,
+			   vlib_timing_wheel_data_set_timed_event (te -
+								   nm->
+								   signal_timed_event_data_pool));
+
+      /* Inline data big enough to hold event? */
+      if (te->n_data_bytes < sizeof (te->inline_event_data))
+	return te->inline_event_data;
+      else
+	{
+	  te->event_data_as_vector = 0;
+	  vec_resize (te->event_data_as_vector, te->n_data_bytes);
+	  return te->event_data_as_vector;
+	}
+    }
+}
+
+always_inline void *
+vlib_process_signal_one_time_event_data (vlib_main_t * vm,
+					 uword node_index,
+					 uword type_index,
+					 uword n_data_elts,
+					 uword n_data_elt_bytes)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  vlib_process_t *p = vec_elt (nm->processes, n->runtime_index);
+  return vlib_process_signal_event_helper (nm, n, p, type_index, n_data_elts,
+					   n_data_elt_bytes);
+}
+
+always_inline void
+vlib_process_signal_event (vlib_main_t * vm,
+			   uword node_index, uword type_opaque, uword data)
+{
+  uword *d = vlib_process_signal_event_data (vm, node_index, type_opaque,
+					     1 /* elts */ , sizeof (uword));
+  d[0] = data;
+}
+
+always_inline void
+vlib_process_signal_event_pointer (vlib_main_t * vm,
+				   uword node_index,
+				   uword type_opaque, void *data)
+{
+  void **d = vlib_process_signal_event_data (vm, node_index, type_opaque,
+					     1 /* elts */ , sizeof (data));
+  d[0] = data;
+}
+
+always_inline void
+vlib_process_signal_one_time_event (vlib_main_t * vm,
+				    uword node_index,
+				    uword type_index, uword data)
+{
+  uword *d =
+    vlib_process_signal_one_time_event_data (vm, node_index, type_index,
+					     1 /* elts */ , sizeof (uword));
+  d[0] = data;
+}
+
+always_inline void
+vlib_signal_one_time_waiting_process (vlib_main_t * vm,
+				      vlib_one_time_waiting_process_t * p)
+{
+  vlib_process_signal_one_time_event (vm, p->node_index, p->one_time_event,
+				      /* data */ ~0);
+  memset (p, ~0, sizeof (p[0]));
+}
+
+always_inline void
+vlib_signal_one_time_waiting_process_vector (vlib_main_t * vm,
+					     vlib_one_time_waiting_process_t
+					     ** wps)
+{
+  vlib_one_time_waiting_process_t *wp;
+  vec_foreach (wp, *wps) vlib_signal_one_time_waiting_process (vm, wp);
+  vec_free (*wps);
+}
+
+always_inline void
+vlib_current_process_wait_for_one_time_event (vlib_main_t * vm,
+					      vlib_one_time_waiting_process_t
+					      * p)
+{
+  p->node_index = vlib_current_process (vm);
+  p->one_time_event = vlib_process_create_one_time_event (vm, p->node_index,	/* type opaque */
+							  ~0);
+  vlib_process_wait_for_one_time_event (vm,
+					/* don't care about data */ 0,
+					p->one_time_event);
+}
+
+always_inline void
+vlib_current_process_wait_for_one_time_event_vector (vlib_main_t * vm,
+						     vlib_one_time_waiting_process_t
+						     ** wps)
+{
+  vlib_one_time_waiting_process_t *wp;
+  vec_add2 (*wps, wp, 1);
+  vlib_current_process_wait_for_one_time_event (vm, wp);
+}
+
+always_inline u32
+vlib_node_runtime_update_main_loop_vector_stats (vlib_main_t * vm,
+						 vlib_node_runtime_t * node,
+						 uword n_vectors)
+{
+  u32 i, d, vi0, vi1;
+  u32 i0, i1;
+
+  ASSERT (is_pow2 (ARRAY_LEN (node->main_loop_vector_stats)));
+  i = ((vm->main_loop_count >> VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE)
+       & (ARRAY_LEN (node->main_loop_vector_stats) - 1));
+  i0 = i ^ 0;
+  i1 = i ^ 1;
+  d = ((vm->main_loop_count >> VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE)
+       -
+       (node->main_loop_count_last_dispatch >>
+	VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE));
+  vi0 = node->main_loop_vector_stats[i0];
+  vi1 = node->main_loop_vector_stats[i1];
+  vi0 = d == 0 ? vi0 : 0;
+  vi1 = d <= 1 ? vi1 : 0;
+  vi0 += n_vectors;
+  node->main_loop_vector_stats[i0] = vi0;
+  node->main_loop_vector_stats[i1] = vi1;
+  node->main_loop_count_last_dispatch = vm->main_loop_count;
+  /* Return previous counter. */
+  return node->main_loop_vector_stats[i1];
+}
+
+always_inline f64
+vlib_node_vectors_per_main_loop_as_float (vlib_main_t * vm, u32 node_index)
+{
+  vlib_node_runtime_t *rt = vlib_node_get_runtime (vm, node_index);
+  u32 v;
+
+  v = vlib_node_runtime_update_main_loop_vector_stats (vm, rt,	/* n_vectors */
+						       0);
+  return (f64) v / (1 << VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE);
+}
+
+always_inline u32
+vlib_node_vectors_per_main_loop_as_integer (vlib_main_t * vm, u32 node_index)
+{
+  vlib_node_runtime_t *rt = vlib_node_get_runtime (vm, node_index);
+  u32 v;
+
+  v = vlib_node_runtime_update_main_loop_vector_stats (vm, rt,	/* n_vectors */
+						       0);
+  return v >> VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE;
+}
+
+void
+vlib_frame_free (vlib_main_t * vm, vlib_node_runtime_t * r, vlib_frame_t * f);
+
+/* Add next node to given node in given slot. */
+uword
+vlib_node_add_next_with_slot (vlib_main_t * vm,
+			      uword node, uword next_node, uword slot);
+
+/* As above but adds to end of node's next vector. */
+always_inline uword
+vlib_node_add_next (vlib_main_t * vm, uword node, uword next_node)
+{
+  return vlib_node_add_next_with_slot (vm, node, next_node, ~0);
+}
+
+/* Add next node to given node in given slot. */
+uword
+vlib_node_add_named_next_with_slot (vlib_main_t * vm,
+				    uword node, char *next_name, uword slot);
+
+/* As above but adds to end of node's next vector. */
+always_inline uword
+vlib_node_add_named_next (vlib_main_t * vm, uword node, char *name)
+{
+  return vlib_node_add_named_next_with_slot (vm, node, name, ~0);
+}
+
+/* Query node given name. */
+vlib_node_t *vlib_get_node_by_name (vlib_main_t * vm, u8 * name);
+
+/* Rename a node. */
+void vlib_node_rename (vlib_main_t * vm, u32 node_index, char *fmt, ...);
+
+/* Register new packet processing node.  Nodes can be registered
+   dynamically via this call or statically via the VLIB_REGISTER_NODE
+   macro. */
+u32 vlib_register_node (vlib_main_t * vm, vlib_node_registration_t * r);
+
+/* Register all static nodes registered via VLIB_REGISTER_NODE. */
+void vlib_register_all_static_nodes (vlib_main_t * vm);
+
+/* Start a process. */
+void vlib_start_process (vlib_main_t * vm, uword process_index);
+
+/* Sync up runtime and main node stats. */
+void vlib_node_sync_stats (vlib_main_t * vm, vlib_node_t * n);
+
+/* Node graph initialization function. */
+clib_error_t *vlib_node_main_init (vlib_main_t * vm);
+
+format_function_t format_vlib_node_graph;
+format_function_t format_vlib_node_name;
+format_function_t format_vlib_next_node_name;
+format_function_t format_vlib_node_and_next;
+format_function_t format_vlib_cpu_time;
+format_function_t format_vlib_time;
+/* Parse node name -> node index. */
+unformat_function_t unformat_vlib_node;
+
+always_inline void
+vlib_node_increment_counter (vlib_main_t * vm, u32 node_index,
+			     u32 counter_index, u64 increment)
+{
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  vlib_error_main_t *em = &vm->error_main;
+  u32 node_counter_base_index = n->error_heap_index;
+  em->counters[node_counter_base_index + counter_index] += increment;
+}
+
+#endif /* included_vlib_node_funcs_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/parse.c b/src/vlib/parse.c
new file mode 100644
index 00000000..1c4500ce
--- /dev/null
+++ b/src/vlib/parse.c
@@ -0,0 +1,1007 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/parse.h>
+
+#define PARSE_DEBUG 0
+
+u16 word_type_index, number_type_index, eof_type_index, rule_eof_type_index,
+  plus_type_index, minus_type_index, star_type_index, slash_type_index,
+  lpar_type_index, rpar_type_index;
+
+u8 *
+format_vlib_parse_value (u8 * s, va_list * args)
+{
+  vlib_parse_main_t *pm = va_arg (*args, vlib_parse_main_t *);
+  vlib_parse_type_t *type;
+  vlib_parse_value_t *v;
+  u16 type_index;
+
+  s = format (s, "%d items:\n", vec_len (pm->parse_value));
+  vec_foreach (v, pm->parse_value)
+  {
+    type_index = v->type;
+    type = pool_elt_at_index (pm->parse_types, type_index);
+    if (type->format_value)
+      s = format (s, "[%d]: %U\n", v - pm->parse_value,
+		  type->format_value, v);
+    else
+      s = format (s, "[%d]: (nofun)\n", v - pm->parse_value);
+  }
+  return s;
+}
+
+static u8 *
+format_vlib_parse_match (u8 * s, va_list * args)
+{
+  vlib_parse_match_t m = va_arg (*args, vlib_parse_match_t);
+  char *t = 0;
+  switch (m)
+    {
+#define _(a) case VLIB_PARSE_##a: t = #a; break;
+      foreach_parse_match_type
+#undef _
+    default:
+      t = 0;
+      break;
+    }
+
+  if (t)
+    return format (s, "%s", t);
+  else
+    return format (s, "unknown 0x%x", m);
+}
+
+static u8 *
+format_vlib_parse_item (u8 * s, va_list * args)
+{
+  vlib_parse_main_t *pm = va_arg (*args, vlib_parse_main_t *);
+  vlib_parse_item_t *item = va_arg (*args, vlib_parse_item_t *);
+  vlib_parse_type_t *type = pool_elt_at_index (pm->parse_types, item->type);
+
+  if (item->type == word_type_index)
+    s = format (s, "%s", item->value.as_pointer);
+  else
+    s = format (s, "<%s>", type->name);
+  return s;
+}
+
+static u8 *
+format_vlib_parse_graph (u8 * s, va_list * args)
+{
+  vlib_parse_main_t *pm = va_arg (*args, vlib_parse_main_t *);
+  vlib_parse_graph_t *node = va_arg (*args, vlib_parse_graph_t *);
+  vlib_parse_item_t *item;
+  vlib_parse_type_t *type;
+
+  /* $$$ hash table */
+  /* *INDENT-OFF* */
+  pool_foreach (type, pm->parse_types,
+                ({
+                  if (type->rule_index == node - pm->parse_graph)
+                    s = format (s, "\n<%s>\n", type->name);
+                }));
+/* *INDENT-ON* */
+
+  if (pm->root_index == (node - pm->parse_graph))
+    s = format (s, "\n<root>\n");
+
+  item = pool_elt_at_index (pm->parse_items, node->item);
+
+  s = format (s, "[%d] %U ", node - pm->parse_graph,
+	      format_vlib_parse_item, pm, item);
+
+  if (node->peer == (u32) ~ 0)
+    s = format (s, "peer nil  ");
+  else
+    s = format (s, "peer %4u ", node->peer);
+
+  if (node->deeper == (u32) ~ 0)
+    s = format (s, "deeper nil  ");
+  else
+    s = format (s, "deeper %4u ", node->deeper);
+
+  return s;
+}
+
+void
+dump_parse_graph (void)
+{
+  vlib_parse_main_t *pm = &vlib_parse_main;
+  vlib_parse_graph_t *node;
+
+  /* *INDENT-OFF* */
+  pool_foreach (node, pm->parse_graph, ({
+    fformat(stdout, "%U\n", format_vlib_parse_graph, pm, node);
+  }));
+/* *INDENT-ON* */
+}
+
+always_inline void
+parse_cleanup_value (vlib_parse_main_t * pm, vlib_parse_value_t * pv)
+{
+  vlib_parse_type_t *type = pool_elt_at_index (pm->parse_types, pv->type);
+  if (type->value_cleanup_function)
+    type->value_cleanup_function (pv);
+}
+
+static void
+parse_reset (vlib_parse_main_t * pm, u8 * input)
+{
+  vlib_lex_token_t *t;
+  vlib_parse_value_t *pv;
+
+  vlib_lex_reset (pm->lex_main, input);
+
+  vec_foreach (t, pm->tokens) vlib_lex_cleanup_token (t);
+
+  vec_foreach (pv, pm->parse_value) parse_cleanup_value (pm, pv);
+
+  _vec_len (pm->parse_value) = 0;
+  _vec_len (pm->tokens) = 0;
+  pm->current_token_index = 0;
+}
+
+static void
+parse_help (vlib_parse_main_t * pm, u32 index)
+{
+  vlib_parse_graph_t *node;
+  vlib_parse_item_t *item;
+  vlib_parse_type_t *type;
+  vlib_main_t *vm = pm->vlib_main;
+  u8 *help_input;
+  int i;
+
+  help_input = vec_dup (pm->lex_main->input_vector);
+
+  for (i = vec_len (help_input) - 1; i >= 0; i--)
+    if (help_input[i] == '?')
+      {
+	help_input[i] = 0;
+	_vec_len (help_input) = i;
+	break;
+      }
+
+  for (i = vec_len (help_input) - 1; i >= 0; i--)
+    {
+      if (help_input[i] != ' ' && help_input[i] != '\t')
+	break;
+      help_input[i] = 0;
+      break;
+    }
+  _vec_len (help_input) = i + 1;
+
+  while (index != (u32) ~ 0)
+    {
+      node = pool_elt_at_index (pm->parse_graph, index);
+      item = pool_elt_at_index (pm->parse_items, node->item);
+      type = pool_elt_at_index (pm->parse_types, item->type);
+
+      if (item->type == eof_type_index && vec_len (pm->match_items) == 0)
+	/* do nothing */ ;
+      else if (item->type == word_type_index)
+	vlib_cli_output (vm, "%s %s\n", help_input, item->value.as_pointer);
+      else
+	vlib_cli_output (vm, "%s <%s>\n", help_input, type->name);
+      index = node->peer;
+    }
+  vec_free (help_input);
+}
+
+static vlib_parse_match_t
+parse_eval_internal (vlib_parse_main_t * pm, u32 index)
+{
+  vlib_parse_graph_t *node;
+  vlib_parse_item_t *item;
+  vlib_parse_type_t *type;
+  vlib_parse_value_t value, *pv;
+  vlib_parse_match_t rv;
+  u32 *partial_matches = 0;
+  vlib_lex_token_t *t;
+  u32 save_token_index = (u32) ~ 0, save_match_items = 0;
+  int had_value = 0;
+
+  if (pm->current_token_index >= vec_len (pm->tokens))
+    return VLIB_PARSE_MATCH_FAIL;
+
+  /* current token */
+  t = vec_elt_at_index (pm->tokens, pm->current_token_index);
+
+  /* Help ? */
+  if (PREDICT_FALSE (t->token == VLIB_LEX_qmark))
+    {
+      parse_help (pm, index);
+      _vec_len (pm->match_items) = 0;
+      return VLIB_PARSE_MATCH_DONE;
+    }
+
+  /* Across all peers at this level of the parse graph */
+  while (index != (u32) ~ 0)
+    {
+      node = pool_elt_at_index (pm->parse_graph, index);
+      item = pool_elt_at_index (pm->parse_items, node->item);
+      type = pool_elt_at_index (pm->parse_types, item->type);
+
+      /*
+       * Save the token index. We may have to back up several
+       * trie plies. Type-specific match functions can consume
+       * multiple tokens, and they may not be optimally careful
+       */
+      save_token_index = pm->current_token_index;
+      save_match_items = vec_len (pm->match_items);
+      vec_add1 (pm->match_items, node->item);
+
+      if (PARSE_DEBUG > 1)
+	clib_warning ("Try to match token %U against node %d",
+		      format_vlib_lex_token, pm->lex_main, t, index);
+
+      /* Call the type-specific match function */
+      rv = type->match_function (pm, type, t, &value);
+
+      if (PARSE_DEBUG > 1)
+	clib_warning ("returned %U", format_vlib_parse_match, rv);
+
+      switch (rv)
+	{
+	case VLIB_PARSE_MATCH_VALUE:
+	  /*
+	   * Matched, and returned a value to append to the
+	   * set of args passed to the action function
+	   */
+	  value.type = item->type;
+	  vec_add1 (pm->parse_value, value);
+	  had_value = 1;
+	  /* fallthrough */
+
+	case VLIB_PARSE_MATCH_FULL:
+	unambiguous_partial_match:
+	  /* Consume the matched token */
+	  pm->current_token_index++;
+
+	  /* continue matching along this path */
+	  rv = parse_eval_internal (pm, node->deeper);
+
+	  /* this is not the right path */
+	  if (rv == VLIB_PARSE_MATCH_FAIL)
+	    {
+	      if (had_value)
+		{
+		  /* Delete the value */
+		  value = pm->parse_value[vec_len (pm->parse_value) - 1];
+		  parse_cleanup_value (pm, &value);
+		  _vec_len (pm->parse_value) -= 1;
+		}
+	      /* Continue with the next sibling */
+	      pm->current_token_index = save_token_index;
+	      _vec_len (pm->match_items) = save_match_items;
+	      index = node->peer;
+	      break;
+	    }
+	  return rv;
+
+	case VLIB_PARSE_MATCH_PARTIAL:
+	  /* Partial (substring) match, remember it but keep going */
+	  vec_add1 (partial_matches, node - pm->parse_graph);
+	  index = node->peer;
+	  break;
+
+	case VLIB_PARSE_MATCH_FAIL:
+	  /* Continue with the next sibling */
+	  index = node->peer;
+	  _vec_len (pm->match_items) = save_match_items;
+	  break;
+
+	case VLIB_PARSE_MATCH_DONE:
+	  /* Parse complete, invoke the action function */
+	  if (PARSE_DEBUG > 0)
+	    clib_warning ("parse_value: %U", format_vlib_parse_value, pm);
+
+	  {
+	    vlib_parse_eval_function_t *f = item->value.as_pointer;
+	    if (f)
+	      rv = f (pm, item, pm->parse_value);
+	  }
+
+	  vec_foreach (pv, pm->parse_value) parse_cleanup_value (pm, pv);
+	  _vec_len (pm->parse_value) = 0;
+	  _vec_len (pm->match_items) = 0;
+	  return rv;
+
+	case VLIB_PARSE_MATCH_AMBIGUOUS:
+	case VLIB_PARSE_MATCH_EVAL_FAIL:
+	case VLIB_PARSE_MATCH_RULE:
+	  _vec_len (pm->match_items) = save_match_items;
+	  return rv;
+	}
+    }
+
+  /*
+   * Out of siblings. If we have exactly one partial match
+   * we win
+   */
+  if (vec_len (partial_matches) == 1)
+    {
+      index = partial_matches[0];
+      node = pool_elt_at_index (pm->parse_graph, index);
+      vec_free (partial_matches);
+      goto unambiguous_partial_match;
+    }
+
+  /* Ordinary loser */
+  rv = VLIB_PARSE_MATCH_FAIL;
+
+  /* Ambiguous loser */
+  if (vec_len (partial_matches) > 1)
+    {
+      vec_free (partial_matches);
+      rv = VLIB_PARSE_MATCH_AMBIGUOUS;
+    }
+
+  _vec_len (pm->match_items) = save_match_items;
+  return rv;
+}
+
+vlib_parse_match_t
+rule_match (vlib_parse_main_t * pm, vlib_parse_type_t * type,
+	    vlib_lex_token_t * t, vlib_parse_value_t * valuep)
+{
+  vlib_parse_match_t rv;
+  static int recursion_level;
+
+  if (PARSE_DEBUG > 1)
+    clib_warning ("[%d]: try to match type %s graph index %d",
+		  recursion_level, type->name, type->rule_index);
+  recursion_level++;
+  rv = parse_eval_internal (pm, type->rule_index);
+  recursion_level--;
+
+  /* Break the recusive unwind here... */
+  if (rv == VLIB_PARSE_MATCH_RULE)
+    {
+      if (PARSE_DEBUG > 1)
+	clib_warning ("[%d]: type %s matched", recursion_level, type->name);
+
+      return VLIB_PARSE_MATCH_FULL;
+    }
+  else
+    {
+      if (PARSE_DEBUG > 1)
+	clib_warning ("[%d]: type %s returns %U", recursion_level, type->name,
+		      format_vlib_parse_match, rv);
+    }
+  return rv;
+}
+
+static int
+parse_eval (vlib_parse_main_t * pm, u8 * input)
+{
+  vlib_lex_token_t *t;
+
+  parse_reset (pm, input);
+
+  /* Tokenize the entire input vector */
+  do
+    {
+      vec_add2 (pm->tokens, t, 1);
+      vlib_lex_get_token (pm->lex_main, t);
+    }
+  while (t->token != VLIB_LEX_eof);
+
+  /* Feed it to the parser */
+  return parse_eval_internal (pm, pm->root_index);
+}
+
+/* Temporary vlib stub */
+vlib_parse_match_t
+vlib_parse_eval (u8 * input)
+{
+  return parse_eval (&vlib_parse_main, input);
+}
+
+u16
+parse_type_find_or_create (vlib_parse_main_t * pm, vlib_parse_type_t * t)
+{
+  uword *p;
+  vlib_parse_type_t *n;
+  u8 *name_copy;
+
+  p = hash_get_mem (pm->parse_type_by_name_hash, t->name);
+  if (p)
+    return p[0];
+
+  pool_get (pm->parse_types, n);
+  *n = *t;
+  n->rule_index = (u32) ~ 0;
+
+  name_copy = format (0, "%s%c", n->name, 0);
+
+  hash_set_mem (pm->parse_type_by_name_hash, name_copy, n - pm->parse_types);
+  return n - pm->parse_types;
+}
+
+u16
+parse_type_find_by_name (vlib_parse_main_t * pm, char *name)
+{
+  uword *p;
+
+  p = hash_get_mem (pm->parse_type_by_name_hash, name);
+  if (p)
+    return p[0];
+
+  return (u16) ~ 0;
+}
+
+u32
+parse_item_find_or_create (vlib_parse_main_t * pm, vlib_parse_item_t * item)
+{
+  uword *p;
+  vlib_parse_item_t *i;
+
+  /* Exact match the entire item */
+  p = mhash_get (&pm->parse_item_hash, item);
+  if (p)
+    return p[0];
+
+  pool_get (pm->parse_items, i);
+  *i = *item;
+
+  mhash_set (&pm->parse_item_hash, i, i - pm->parse_items, 0);
+  return i - pm->parse_items;
+}
+
+static void
+parse_type_and_graph_init (vlib_parse_main_t * pm)
+{
+  u32 eof_index;
+  vlib_parse_type_t type;
+  vlib_parse_item_t item;
+
+  memset (&type, 0, sizeof (type));
+
+#define foreach_token_type                      \
+  _ (eof)                                       \
+  _ (rule_eof)                                  \
+  _ (word)                                      \
+  _ (number)                                    \
+  _ (plus)                                      \
+  _ (minus)                                     \
+  _ (star)                                      \
+  _ (slash)                                     \
+  _ (lpar)                                      \
+  _ (rpar)
+
+#define _(a) a##_type_index = parse_type_find_by_name (pm, #a);
+  foreach_token_type
+#undef _
+    memset (&item, 0, sizeof (item));
+  item.type = eof_type_index;
+
+  eof_index = parse_item_find_or_create (pm, &item);
+  pm->root_index = (u32) ~ 0;
+
+#if 0
+  pool_get (pm->parse_graph, g);
+  memset (g, 0xff, sizeof (*g));
+  g->item = eof_index;
+  pm->root_index = 0;
+#endif
+}
+
+
+
+static void
+tokenize (vlib_parse_main_t * pm, parse_registration_t * pr)
+{
+  vlib_lex_token_t *t;
+  pm->register_input = format (pm->register_input,
+			       "%s%c", pr->initializer, 0);
+
+  parse_reset (pm, pm->register_input);
+
+  do
+    {
+      vec_add2 (pm->tokens, t, 1);
+      vlib_lex_get_token (pm->lex_main, t);
+    }
+  while (t->token != VLIB_LEX_eof);
+  _vec_len (pm->register_input) = 0;
+}
+
+static int
+is_typed_rule (vlib_parse_main_t * pm)
+{
+  vlib_lex_token_t *t = vec_elt_at_index (pm->tokens, 0);
+
+  /* <mytype> = blah blah blah */
+  if (vec_len (pm->tokens) >= 4
+      && t[0].token == VLIB_LEX_lt
+      && t[1].token == VLIB_LEX_word
+      && t[2].token == VLIB_LEX_gt && t[3].token == VLIB_LEX_equals)
+    return 1;
+  return 0;
+}
+
+static int
+token_matches_graph_node (vlib_parse_main_t * pm,
+			  vlib_lex_token_t * t,
+			  vlib_parse_graph_t * node,
+			  vlib_parse_item_t * item,
+			  vlib_parse_type_t * type, u32 * token_increment)
+{
+  /* EOFs don't match */
+  if (t->token == VLIB_LEX_eof)
+    return 0;
+
+  /* New chain element is a word */
+  if (t->token == VLIB_LEX_word)
+    {
+      /* but the item in hand is not a word */
+      if (item->type != word_type_index)
+	return 0;
+
+      /* Or it's not this particular word */
+      if (strcmp (t->value.as_pointer, item->value.as_pointer))
+	return 0;
+      *token_increment = 1;
+      return 1;
+    }
+  /* New chain element is a type-name: < TYPE-NAME > */
+  if (t->token == VLIB_LEX_lt)
+    {
+      u16 token_type_index;
+
+      /* < TYPE > */
+      if (t[1].token != VLIB_LEX_word || t[2].token != VLIB_LEX_gt)
+	{
+	  clib_warning (0, "broken type name in '%s'", pm->register_input);
+	  return 0;
+	}
+
+      token_type_index = parse_type_find_by_name (pm, t[1].value.as_pointer);
+      if (token_type_index == (u16) ~ 0)
+	{
+	  clib_warning (0, "unknown type '%s'", t[1].value.as_pointer);
+	  return 0;
+	}
+
+      /* Its a known type but does not match. */
+      if (item->type != token_type_index)
+	return 0;
+
+      *token_increment = 3;
+      return 1;
+    }
+  clib_warning ("BUG: t->token = %d", t->token);
+  return 0;
+}
+
+u32
+generate_subgraph_from_tokens (vlib_parse_main_t * pm,
+			       vlib_lex_token_t * t,
+			       u32 * new_subgraph_depth,
+			       parse_registration_t * pr, int not_a_rule)
+{
+  vlib_parse_graph_t *g, *last_g;
+  vlib_parse_item_t new_item;
+  u32 rv = (u32) ~ 0, new_item_index, last_index = (u32) ~ 0;
+  u16 token_type_index;
+  u32 depth = 0;
+
+  while (t < pm->tokens + vec_len (pm->tokens))
+    {
+      memset (&new_item, 0, sizeof (new_item));
+
+      if (t->token == VLIB_LEX_word)
+	{
+	  new_item.type = word_type_index;
+	  new_item.value.as_pointer = vec_dup ((u8 *) t->value.as_pointer);
+	  new_item_index = parse_item_find_or_create (pm, &new_item);
+	  t++;
+	}
+      else if (t->token == VLIB_LEX_lt)
+	{
+	  if (t[1].token != VLIB_LEX_word || t[2].token != VLIB_LEX_gt)
+	    {
+	      clib_warning ("broken type name in '%s'", pm->register_input);
+	      goto screwed;
+	    }
+	  token_type_index = parse_type_find_by_name (pm,
+						      t[1].value.as_pointer);
+	  if (token_type_index == (u16) ~ 0)
+	    {
+	      clib_warning ("unknown type 2 '%s'", t[1].value.as_pointer);
+	      goto screwed;
+	    }
+
+	  new_item.type = token_type_index;
+	  new_item.value.as_pointer = 0;
+	  new_item_index = parse_item_find_or_create (pm, &new_item);
+	  t += 3;		/* skip < <type-name> and > */
+	}
+      else if (t->token == VLIB_LEX_eof)
+	{
+	screwed:
+	  new_item.type = not_a_rule ? eof_type_index : rule_eof_type_index;
+	  new_item.value.as_pointer = pr->eof_match;
+	  new_item_index = parse_item_find_or_create (pm, &new_item);
+	  t++;
+	}
+      else
+	{
+	  clib_warning ("unexpected token %U index %d in '%s'",
+			format_vlib_lex_token, pm->lex_main, t,
+			t - pm->tokens, pm->register_input);
+	  goto screwed;
+	}
+
+      pool_get (pm->parse_graph, g);
+      memset (g, 0xff, sizeof (*g));
+      g->item = new_item_index;
+      depth++;
+
+      if (rv == (u32) ~ 0)
+	{
+	  rv = g - pm->parse_graph;
+	  last_index = rv;
+	}
+      else
+	{
+	  last_g = pool_elt_at_index (pm->parse_graph, last_index);
+	  last_index = last_g->deeper = g - pm->parse_graph;
+	}
+    }
+  *new_subgraph_depth = depth;
+  return rv;
+}
+
+static u32
+measure_depth (vlib_parse_main_t * pm, u32 index)
+{
+  vlib_parse_graph_t *node;
+  vlib_parse_item_t *item;
+  u32 max = 0;
+  u32 depth;
+
+  if (index == (u32) ~ 0)
+    return 0;
+
+  node = pool_elt_at_index (pm->parse_graph, index);
+  item = pool_elt_at_index (pm->parse_items, node->item);
+
+  if (item->type == eof_type_index)
+    return 1;
+
+  while (index != (u32) ~ 0)
+    {
+      node = pool_elt_at_index (pm->parse_graph, index);
+      depth = measure_depth (pm, node->deeper);
+      if (max < depth)
+	max = depth;
+      index = node->peer;
+    }
+
+  return max + 1;
+}
+
+static void
+add_subgraph_to_graph (vlib_parse_main_t * pm,
+		       u32 last_matching_index,
+		       u32 graph_root_index,
+		       u32 new_subgraph_index, u32 new_subgraph_depth)
+{
+  vlib_parse_graph_t *parent_node;
+  int new_subgraph_longest = 1;
+  u32 current_peer_index;
+  u32 current_depth;
+  vlib_parse_graph_t *current_peer = 0;
+  vlib_parse_graph_t *new_subgraph_node =
+    pool_elt_at_index (pm->parse_graph, new_subgraph_index);
+
+  /*
+   * Case 1: top-level peer. Splice into the top-level
+   * peer chain according to rule depth
+   */
+  if (last_matching_index == (u32) ~ 0)
+    {
+      u32 index = graph_root_index;
+      while (1)
+	{
+	  current_peer = pool_elt_at_index (pm->parse_graph, index);
+	  current_depth = measure_depth (pm, index);
+	  if (current_depth < new_subgraph_depth
+	      || current_peer->peer == (u32) ~ 0)
+	    break;
+	  index = current_peer->peer;
+	}
+      new_subgraph_node->peer = current_peer->peer;
+      current_peer->peer = new_subgraph_index;
+      return;
+    }
+
+  parent_node = pool_elt_at_index (pm->parse_graph, last_matching_index);
+  current_peer_index = parent_node->deeper;
+
+  while (current_peer_index != (u32) ~ 0)
+    {
+      current_peer = pool_elt_at_index (pm->parse_graph, current_peer_index);
+      current_depth = measure_depth (pm, current_peer_index);
+      if (current_depth < new_subgraph_depth)
+	break;
+      new_subgraph_longest = 0;
+      current_peer_index = current_peer->peer;
+    }
+
+  ASSERT (current_peer);
+
+  if (new_subgraph_longest)
+    {
+      new_subgraph_node->peer = parent_node->deeper;
+      parent_node->deeper = new_subgraph_index;
+    }
+  else
+    {
+      new_subgraph_node->peer = current_peer->peer;
+      current_peer->peer = new_subgraph_index;
+    }
+}
+
+static clib_error_t *
+parse_register_one (vlib_parse_main_t * pm, parse_registration_t * pr)
+{
+  u32 graph_root_index;
+  u16 subgraph_type_index = (u16) ~ 0;
+  vlib_parse_type_t *subgraph_type = 0;
+  vlib_lex_token_t *t;
+  vlib_parse_graph_t *node;
+  u32 node_index, last_index, token_increment, new_subgraph_index;
+  u32 new_subgraph_depth, last_matching_index;
+  vlib_parse_item_t *item;
+  vlib_parse_type_t *type;
+
+  int use_main_graph = 1;
+
+  tokenize (pm, pr);
+
+  /* A typed rule? */
+  if (is_typed_rule (pm))
+    {
+      /* Get the type and its current subgraph root, if any */
+      t = vec_elt_at_index (pm->tokens, 1);
+      subgraph_type_index = parse_type_find_by_name (pm, t->value.as_pointer);
+      if (subgraph_type_index == (u16) ~ 0)
+	return clib_error_return (0, "undeclared type '%s'",
+				  t->value.as_pointer);
+      subgraph_type =
+	pool_elt_at_index (pm->parse_types, subgraph_type_index);
+      graph_root_index = subgraph_type->rule_index;
+      /* Skip "mytype> = */
+      t += 3;
+      use_main_graph = 0;
+    }
+  else
+    {
+      /* top-level graph */
+      graph_root_index = pm->root_index;
+      t = vec_elt_at_index (pm->tokens, 0);
+    }
+
+  last_matching_index = (u32) ~ 0;
+  last_index = node_index = graph_root_index;
+
+  /* Find the first token which isn't already being parsed */
+  while (t < pm->tokens + vec_len (pm->tokens) && node_index != (u32) ~ 0)
+    {
+      node = pool_elt_at_index (pm->parse_graph, node_index);
+      item = pool_elt_at_index (pm->parse_items, node->item);
+      type = pool_elt_at_index (pm->parse_types, item->type);
+      last_index = node_index;
+
+      if (token_matches_graph_node
+	  (pm, t, node, item, type, &token_increment))
+	{
+	  t += token_increment;
+	  last_matching_index = node_index;
+	  node_index = node->deeper;
+	}
+      else
+	node_index = node->peer;
+    }
+
+  new_subgraph_index =
+    generate_subgraph_from_tokens (pm, t, &new_subgraph_depth, pr,
+				   use_main_graph);
+
+  /* trivial cases: first graph node or first type rule */
+  if (graph_root_index == (u32) ~ 0)
+    {
+      if (use_main_graph)
+	pm->root_index = new_subgraph_index;
+      else
+	subgraph_type->rule_index = new_subgraph_index;
+      return 0;
+    }
+
+  add_subgraph_to_graph (pm, last_matching_index, graph_root_index,
+			 new_subgraph_index, new_subgraph_depth);
+  return 0;
+}
+
+static clib_error_t *
+parse_register (vlib_main_t * vm,
+		parse_registration_t * lo,
+		parse_registration_t * hi, vlib_parse_main_t * pm)
+{
+  parse_registration_t *pr;
+
+  for (pr = lo; pr < hi; pr = vlib_elf_section_data_next (pr, 0))
+    vec_add1 (pm->parse_registrations, pr);
+
+  return 0;
+}
+
+static clib_error_t *
+parse_register_one_type (vlib_parse_main_t * pm, vlib_parse_type_t * rp)
+{
+  (void) parse_type_find_or_create (pm, (vlib_parse_type_t *) rp);
+  return 0;
+}
+
+static clib_error_t *
+parse_type_register (vlib_main_t * vm,
+		     vlib_parse_type_t * lo,
+		     vlib_parse_type_t * hi, vlib_parse_main_t * pm)
+{
+  clib_error_t *error = 0;
+  vlib_parse_type_t *ptr;
+
+  for (ptr = lo; ptr < hi; ptr = vlib_elf_section_data_next (ptr, 0))
+    {
+      error = parse_register_one_type (pm, ptr);
+      if (error)
+	goto done;
+    }
+
+done:
+  return error;
+}
+
+clib_error_t *vlib_stdlex_init (vlib_main_t * vm) __attribute__ ((weak));
+clib_error_t *
+vlib_stdlex_init (vlib_main_t * vm)
+{
+  (void) vlib_lex_add_table ("ignore_everything");
+  return 0;
+}
+
+static int
+compute_rule_length (parse_registration_t * r)
+{
+  int length, i;
+  vlib_parse_main_t *pm = &vlib_parse_main;
+
+  if (r->rule_length)
+    return r->rule_length;
+
+  length = 0;
+
+  tokenize (pm, r);
+  length = vec_len (pm->tokens);
+
+  /* Account for "<foo> = " in "<foo> = bar" etc. */
+  if (is_typed_rule (pm))
+    length -= 2;
+
+  for (i = 0; i < vec_len (pm->tokens); i++)
+    {
+      switch (pm->tokens[i].token)
+	{
+	case VLIB_LEX_lt:
+	case VLIB_LEX_gt:
+	  length -= 1;
+
+	default:
+	  break;
+	}
+    }
+
+  ASSERT (length > 0);
+  r->rule_length = length;
+  return length;
+}
+
+static int
+rule_length_compare (parse_registration_t * r1, parse_registration_t * r2)
+{
+  compute_rule_length (r1);
+  compute_rule_length (r2);
+  /* Descending sort */
+  return r2->rule_length - r1->rule_length;
+}
+
+
+static clib_error_t *
+parse_init (vlib_main_t * vm)
+{
+  vlib_parse_main_t *pm = &vlib_parse_main;
+  vlib_lex_main_t *lm = &vlib_lex_main;
+  vlib_elf_section_bounds_t *b, *bounds;
+  clib_error_t *error = 0;
+  parse_registration_t *rule;
+  int i;
+
+  if ((error = vlib_call_init_function (vm, lex_onetime_init)))
+    return error;
+
+  if ((error = vlib_stdlex_init (vm)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, parse_builtin_init)))
+    return error;
+
+  pm->vlib_main = vm;
+  pm->lex_main = lm;
+
+  mhash_init (&pm->parse_item_hash, sizeof (u32), sizeof (vlib_parse_item_t));
+  pm->parse_type_by_name_hash = hash_create_string (0, sizeof (u32));
+
+  vec_validate (pm->parse_value, 16);
+  vec_validate (pm->tokens, 16);
+  vec_validate (pm->register_input, 32);
+  vec_validate (pm->match_items, 16);
+
+  _vec_len (pm->parse_value) = 0;
+  _vec_len (pm->tokens) = 0;
+  _vec_len (pm->register_input) = 0;
+  _vec_len (pm->match_items) = 0;
+
+  bounds = vlib_get_elf_section_bounds (vm, "parse_type_registrations");
+  vec_foreach (b, bounds)
+  {
+    error = parse_type_register (vm, b->lo, b->hi, pm);
+    if (error)
+      break;
+  }
+  vec_free (bounds);
+
+  parse_type_and_graph_init (pm);
+
+  bounds = vlib_get_elf_section_bounds (vm, "parse_registrations");
+  vec_foreach (b, bounds)
+  {
+    error = parse_register (vm, b->lo, b->hi, pm);
+    if (error)
+      break;
+  }
+  vec_free (bounds);
+
+  vec_sort_with_function (pm->parse_registrations, rule_length_compare);
+
+  for (i = 0; i < vec_len (pm->parse_registrations); i++)
+    {
+      rule = pm->parse_registrations[i];
+      parse_register_one (pm, rule);
+    }
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (parse_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/parse.h b/src/vlib/parse.h
new file mode 100644
index 00000000..036e7447
--- /dev/null
+++ b/src/vlib/parse.h
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vlib_parse_h
+#define included_vlib_parse_h
+
+#include <vlib/vlib.h>
+#include <vlib/lex.h>
+#include <vppinfra/mhash.h>
+
+typedef struct
+{
+  /* Word aligned value. */
+  union
+  {
+    u8 as_u8[32 - 1 * sizeof (u16)];
+    void *as_pointer;
+    uword as_uword;
+    word as_word;
+    u64 as_u64;
+  } value;
+
+  /* 16 bit type at end so that 30 bytes of value are aligned. */
+  u16 type;
+} __attribute ((packed))
+  vlib_parse_value_t;
+
+/* Instance of a type. */
+     typedef struct
+     {
+       u32
+	 type;
+
+       u32
+	 origin;
+
+       u32
+	 help_index;
+
+       union
+       {
+	 void *
+	   as_pointer;
+	 uword
+	   as_uword;
+       } value;
+     } vlib_parse_item_t;
+
+     typedef struct
+     {
+       /* Index of item for this node. */
+       u32
+	 item;
+
+       /* Graph index of peer (sibling) node (linked list of peers). */
+       u32
+	 peer;
+
+       /* Graph index of deeper (child) node (linked list of children). */
+       u32
+	 deeper;
+     } vlib_parse_graph_t;
+
+#define foreach_parse_match_type                \
+  _(MATCH_DONE)					\
+  _(MATCH_RULE)					\
+  _(MATCH_FAIL)					\
+  _(MATCH_FULL)					\
+  _(MATCH_VALUE)				\
+  _(MATCH_PARTIAL)				\
+  _(MATCH_AMBIGUOUS)				\
+  _(MATCH_EVAL_FAIL)
+
+     typedef enum
+     {
+#define _(a) VLIB_PARSE_##a,
+       foreach_parse_match_type
+#undef _
+     } vlib_parse_match_t;
+
+     struct vlib_parse_type;
+     struct vlib_parse_main;
+
+     typedef
+     vlib_parse_match_t (vlib_parse_match_function_t)
+  (struct vlib_parse_main *,
+   struct vlib_parse_type *, vlib_lex_token_t *, vlib_parse_value_t *);
+     typedef void (vlib_parse_value_cleanup_function_t) (vlib_parse_value_t
+							 *);
+
+     typedef struct vlib_parse_type
+     {
+       /* Type name. */
+       char *
+	 name;
+
+       vlib_parse_match_function_t *
+	 match_function;
+
+       vlib_parse_value_cleanup_function_t *
+	 value_cleanup_function;
+
+       format_function_t *
+	 format_value;
+
+       u32
+	 rule_index;
+     } vlib_parse_type_t;
+
+     typedef struct
+     {
+       char *
+	 initializer;
+       void *
+	 eof_match;
+       int
+	 rule_length;
+     } parse_registration_t;
+
+     typedef struct vlib_parse_main
+     {
+       /* (type, origin, help, value) tuples */
+       vlib_parse_item_t *
+	 parse_items;
+       mhash_t
+	 parse_item_hash;
+
+       /* (item, peer, deeper) tuples */
+       vlib_parse_graph_t *
+	 parse_graph;
+       u32
+	 root_index;
+
+       u8 *
+	 register_input;
+
+       /* parser types */
+       vlib_parse_type_t *
+	 parse_types;
+       uword *
+	 parse_type_by_name_hash;
+
+       /* Vector of MATCH_VALUEs */
+       vlib_parse_value_t *
+	 parse_value;
+       u32 *
+	 match_items;
+
+       /* Parse registrations */
+       parse_registration_t **
+	 parse_registrations;
+
+       /* Token vector */
+       vlib_lex_token_t *
+	 tokens;
+       u32
+	 current_token_index;
+
+       vlib_lex_main_t *
+	 lex_main;
+       vlib_main_t *
+	 vlib_main;
+     } vlib_parse_main_t;
+
+     vlib_parse_main_t
+       vlib_parse_main;
+
+     typedef
+     vlib_parse_match_t (vlib_parse_eval_function_t)
+  (vlib_parse_main_t *, vlib_parse_item_t *, vlib_parse_value_t *);
+
+vlib_parse_match_t
+vlib_parse_eval (u8 * input);
+
+     format_function_t format_vlib_parse_value;
+
+/* FIXME need these to be global? */
+     vlib_parse_match_function_t rule_match, eof_match, word_match,
+       number_match;
+
+#define _PARSE_REGISTRATION_DATA(x) \
+VLIB_ELF_SECTION_DATA(x##_registration,parse_registration_t,parse_registrations)
+
+#define PARSE_INIT(x, s, e)                     \
+static _PARSE_REGISTRATION_DATA(x) = {          \
+    .initializer = s,                           \
+    .eof_match = e,                             \
+};
+
+#define _PARSE_TYPE_REGISTRATION_DATA(x) \
+VLIB_ELF_SECTION_DATA(x##_type_registration,vlib_parse_type_t, \
+parse_type_registrations)
+
+#define PARSE_TYPE_INIT(n, m, c, f)             \
+static _PARSE_TYPE_REGISTRATION_DATA(n) = {     \
+    .name = #n,                                 \
+    .match_function = m,			\
+    .value_cleanup_function = c,		\
+    .format_value = f,				\
+};
+
+#endif /* included_vlib_parse_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/parse_builtin.c b/src/vlib/parse_builtin.c
new file mode 100644
index 00000000..0ce716b5
--- /dev/null
+++ b/src/vlib/parse_builtin.c
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/parse.h>
+
+always_inline void *
+parse_last_match_value (vlib_parse_main_t * pm)
+{
+  vlib_parse_item_t *i;
+  i = pool_elt_at_index (pm->parse_items,
+			 vec_elt (pm->match_items,
+				  vec_len (pm->match_items) - 1));
+  return i->value.as_pointer;
+}
+
+vlib_parse_match_t
+eof_match (vlib_parse_main_t * pm, vlib_parse_type_t * type,
+	   vlib_lex_token_t * t, vlib_parse_value_t * valuep)
+{
+  return t->token ==
+    VLIB_LEX_eof ? VLIB_PARSE_MATCH_DONE : VLIB_PARSE_MATCH_FAIL;
+}
+
+PARSE_TYPE_INIT (eof, eof_match, 0 /* cleanup value */ ,
+		 0 /* format value */ );
+
+vlib_parse_match_t
+rule_eof_match (vlib_parse_main_t * pm, vlib_parse_type_t * type,
+		vlib_lex_token_t * t, vlib_parse_value_t * valuep)
+{
+  vlib_parse_match_function_t *fp = parse_last_match_value (pm);
+  pm->current_token_index--;
+  return fp ? fp (pm, type, t, valuep) : VLIB_PARSE_MATCH_RULE;
+}
+
+PARSE_TYPE_INIT (rule_eof, rule_eof_match, 0, 0);
+
+vlib_parse_match_t
+word_match (vlib_parse_main_t * pm, vlib_parse_type_t * type,
+	    vlib_lex_token_t * t, vlib_parse_value_t * valuep)
+{
+  u8 *tv, *iv;
+  int i;
+
+  if (t->token != VLIB_LEX_word)
+    return VLIB_PARSE_MATCH_FAIL;
+
+  tv = t->value.as_pointer;
+  iv = parse_last_match_value (pm);
+
+  for (i = 0; tv[i]; i++)
+    {
+      if (tv[i] != iv[i])
+	return VLIB_PARSE_MATCH_FAIL;
+    }
+
+  return iv[i] == 0 ? VLIB_PARSE_MATCH_FULL : VLIB_PARSE_MATCH_PARTIAL;
+}
+
+PARSE_TYPE_INIT (word, word_match, 0 /* clnup value */ ,
+		 0 /* format value */ );
+
+vlib_parse_match_t
+number_match (vlib_parse_main_t * pm, vlib_parse_type_t * type,
+	      vlib_lex_token_t * t, vlib_parse_value_t * valuep)
+{
+  if (t->token == VLIB_LEX_number)
+    {
+      valuep->value.as_uword = t->value.as_uword;
+      return VLIB_PARSE_MATCH_VALUE;
+    }
+  return VLIB_PARSE_MATCH_FAIL;
+}
+
+static u8 *
+format_value_number (u8 * s, va_list * args)
+{
+  vlib_parse_value_t *v = va_arg (*args, vlib_parse_value_t *);
+  uword a = v->value.as_uword;
+
+  if (BITS (uword) == 64)
+    s = format (s, "%lld(0x%llx)", a, a);
+  else
+    s = format (s, "%ld(0x%lx)", a, a);
+  return s;
+}
+
+PARSE_TYPE_INIT (number, number_match, 0 /* cln value */ ,
+		 format_value_number /* fmt value */ );
+
+
+#define foreach_vanilla_lex_match_function      \
+    _(plus)                                     \
+    _(minus)                                    \
+    _(star)                                     \
+    _(slash)                                    \
+    _(lpar)                                     \
+    _(rpar)
+
+#define LEX_MATCH_DEBUG 0
+
+#define _(name)                                                 \
+vlib_parse_match_t name##_match (vlib_parse_main_t *pm,         \
+                                 vlib_parse_type_t *type,       \
+                                 vlib_lex_token_t *t,           \
+                                 vlib_parse_value_t *valuep)    \
+{                                                               \
+  if (LEX_MATCH_DEBUG > 0)                                      \
+    clib_warning ("against %U returns %s",                      \
+                  format_vlib_lex_token, pm->lex_main, t,       \
+                  (t->token == VLIB_LEX_##name)                 \
+                  ? "VLIB_PARSE_MATCH_FULL" :                   \
+                  "VLIB_PARSE_MATCH_FAIL");                     \
+  if (t->token == VLIB_LEX_##name)                              \
+    return VLIB_PARSE_MATCH_FULL;                               \
+  return VLIB_PARSE_MATCH_FAIL;                                 \
+}                                                               \
+                                                                \
+PARSE_TYPE_INIT (name, name##_match, 0 /* cln value */,         \
+                 0 /* fmt val */);
+
+foreach_vanilla_lex_match_function
+#undef _
+/* So we're linked in. */
+static clib_error_t *
+parse_builtin_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (parse_builtin_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/pci/linux_pci.c b/src/vlib/pci/linux_pci.c
new file mode 100644
index 00000000..f9ee47ac
--- /dev/null
+++ b/src/vlib/pci/linux_pci.c
@@ -0,0 +1,642 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pci.c: Linux user space PCI bus management.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vlib/pci/pci.h>
+#include <vlib/unix/unix.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <sys/ioctl.h>
+#include <net/if.h>
+#include <linux/ethtool.h>
+#include <linux/sockios.h>
+
+typedef struct
+{
+  /* /sys/bus/pci/devices/... directory name for this device. */
+  u8 *dev_dir_name;
+
+  /* Resource file descriptors. */
+  int *resource_fds;
+
+  /* File descriptor for config space read/write. */
+  int config_fd;
+
+  /* File descriptor for /dev/uio%d */
+  int uio_fd;
+
+  /* Minor device for uio device. */
+  u32 uio_minor;
+
+  /* Index given by unix_file_add. */
+  u32 unix_file_index;
+
+} linux_pci_device_t;
+
+/* Pool of PCI devices. */
+typedef struct
+{
+  vlib_main_t *vlib_main;
+  linux_pci_device_t *linux_pci_devices;
+} linux_pci_main_t;
+
+extern linux_pci_main_t linux_pci_main;
+
+/* Call to allocate/initialize the pci subsystem.
+   This is not an init function so that users can explicitly enable
+   pci only when it's needed. */
+clib_error_t *pci_bus_init (vlib_main_t * vm);
+
+clib_error_t *vlib_pci_bind_to_uio (vlib_pci_device_t * d,
+				    char *uio_driver_name);
+
+linux_pci_main_t linux_pci_main;
+
+clib_error_t *
+vlib_pci_bind_to_uio (vlib_pci_device_t * d, char *uio_driver_name)
+{
+  clib_error_t *error = 0;
+  u8 *s = 0;
+  DIR *dir = 0;
+  struct dirent *e;
+  int fd;
+  u8 *dev_dir_name = format (0, "/sys/bus/pci/devices/%U",
+			     format_vlib_pci_addr, &d->bus_address);
+
+  /* if uio sub-directory exists, we are fine, device is
+     already bound to UIO driver */
+  s = format (s, "%v/uio%c", dev_dir_name, 0);
+  if (access ((char *) s, F_OK) == 0)
+    goto done;
+  vec_reset_length (s);
+
+  /* walk trough all linux interfaces and if interface belonging to
+     this device is founf check if interface is admin up  */
+  dir = opendir ("/sys/class/net");
+  s = format (s, "%U%c", format_vlib_pci_addr, &d->bus_address, 0);
+
+  if (!dir)
+    {
+      error = clib_error_return (0, "Skipping PCI device %U: failed to "
+				 "read /sys/class/net",
+				 format_vlib_pci_addr, &d->bus_address);
+      goto done;
+    }
+
+  fd = socket (PF_INET, SOCK_DGRAM, 0);
+  if (fd < 0)
+    {
+      error = clib_error_return_unix (0, "socket");
+      goto done;
+    }
+
+  while ((e = readdir (dir)))
+    {
+      struct ifreq ifr;
+      struct ethtool_drvinfo drvinfo;
+
+      if (e->d_name[0] == '.')	/* skip . and .. */
+	continue;
+
+      memset (&ifr, 0, sizeof ifr);
+      memset (&drvinfo, 0, sizeof drvinfo);
+      ifr.ifr_data = (char *) &drvinfo;
+      strncpy (ifr.ifr_name, e->d_name, IFNAMSIZ - 1);
+      drvinfo.cmd = ETHTOOL_GDRVINFO;
+      if (ioctl (fd, SIOCETHTOOL, &ifr) < 0)
+	{
+	  /* Some interfaces (eg "lo") don't support this ioctl */
+	  if ((errno != ENOTSUP) && (errno != ENODEV))
+	    clib_unix_warning ("ioctl fetch intf %s bus info error",
+			       e->d_name);
+	  continue;
+	}
+
+      if (strcmp ((char *) s, drvinfo.bus_info))
+	continue;
+
+      memset (&ifr, 0, sizeof (ifr));
+      strncpy (ifr.ifr_name, e->d_name, IFNAMSIZ - 1);
+      if (ioctl (fd, SIOCGIFFLAGS, &ifr) < 0)
+	{
+	  error = clib_error_return_unix (0, "ioctl fetch intf %s flags",
+					  e->d_name);
+	  close (fd);
+	  goto done;
+	}
+
+      if (ifr.ifr_flags & IFF_UP)
+	{
+	  error = clib_error_return (0, "Skipping PCI device %U as host "
+				     "interface %s is up",
+				     format_vlib_pci_addr, &d->bus_address,
+				     e->d_name);
+	  close (fd);
+	  goto done;
+	}
+    }
+
+  close (fd);
+  vec_reset_length (s);
+
+  s = format (s, "%v/driver/unbind%c", dev_dir_name, 0);
+  vlib_sysfs_write ((char *) s, "%U", format_vlib_pci_addr, &d->bus_address);
+  vec_reset_length (s);
+
+  s = format (s, "/sys/bus/pci/drivers/%s/new_id%c", uio_driver_name, 0);
+  vlib_sysfs_write ((char *) s, "0x%04x 0x%04x", d->vendor_id, d->device_id);
+  vec_reset_length (s);
+
+  s = format (s, "/sys/bus/pci/drivers/%s/bind%c", uio_driver_name, 0);
+  vlib_sysfs_write ((char *) s, "%U", format_vlib_pci_addr, &d->bus_address);
+
+done:
+  closedir (dir);
+  vec_free (s);
+  vec_free (dev_dir_name);
+  return error;
+}
+
+
+static clib_error_t *
+scan_uio_dir (void *arg, u8 * path_name, u8 * file_name)
+{
+  linux_pci_device_t *l = arg;
+  unformat_input_t input;
+
+  unformat_init_string (&input, (char *) file_name, vec_len (file_name));
+
+  if (!unformat (&input, "uio%d", &l->uio_minor))
+    abort ();
+
+  unformat_free (&input);
+  return 0;
+}
+
+static clib_error_t *
+linux_pci_uio_read_ready (unix_file_t * uf)
+{
+  vlib_pci_main_t *pm = &pci_main;
+  vlib_pci_device_t *d;
+  int __attribute__ ((unused)) rv;
+
+  u32 icount;
+  rv = read (uf->file_descriptor, &icount, 4);
+
+  d = pool_elt_at_index (pm->pci_devs, uf->private_data);
+
+  if (d->interrupt_handler)
+    d->interrupt_handler (d);
+
+  vlib_pci_intr_enable (d);
+
+  return /* no error */ 0;
+}
+
+static clib_error_t *
+linux_pci_uio_error_ready (unix_file_t * uf)
+{
+  u32 error_index = (u32) uf->private_data;
+
+  return clib_error_return (0, "pci device %d: error", error_index);
+}
+
+static void
+add_device (vlib_pci_device_t * dev, linux_pci_device_t * pdev)
+{
+  vlib_pci_main_t *pm = &pci_main;
+  linux_pci_main_t *lpm = &linux_pci_main;
+  linux_pci_device_t *l;
+
+  pool_get (lpm->linux_pci_devices, l);
+  l[0] = pdev[0];
+
+  l->dev_dir_name = vec_dup (l->dev_dir_name);
+
+  dev->os_handle = l - lpm->linux_pci_devices;
+
+  {
+    u8 *uio_dir = format (0, "%s/uio", l->dev_dir_name);
+    foreach_directory_file ((char *) uio_dir, scan_uio_dir, l,	/* scan_dirs */
+			    1);
+    vec_free (uio_dir);
+  }
+
+  {
+    char *uio_name = (char *) format (0, "/dev/uio%d%c", l->uio_minor, 0);
+    l->uio_fd = open (uio_name, O_RDWR);
+    if (l->uio_fd < 0)
+      clib_unix_error ("open `%s'", uio_name);
+    vec_free (uio_name);
+  }
+
+  {
+    unix_file_t template = { 0 };
+    unix_main_t *um = &unix_main;
+
+    template.read_function = linux_pci_uio_read_ready;
+    template.file_descriptor = l->uio_fd;
+    template.error_function = linux_pci_uio_error_ready;
+    template.private_data = dev - pm->pci_devs;
+
+    l->unix_file_index = unix_file_add (um, &template);
+  }
+}
+
+static void
+linux_pci_device_free (linux_pci_device_t * l)
+{
+  int i;
+  for (i = 0; i < vec_len (l->resource_fds); i++)
+    if (l->resource_fds[i] > 0)
+      close (l->resource_fds[i]);
+  if (l->config_fd > 0)
+    close (l->config_fd);
+  if (l->uio_fd > 0)
+    close (l->uio_fd);
+  vec_free (l->resource_fds);
+  vec_free (l->dev_dir_name);
+}
+
+/* Configuration space read/write. */
+clib_error_t *
+vlib_pci_read_write_config (vlib_pci_device_t * dev,
+			    vlib_read_or_write_t read_or_write,
+			    uword address, void *data, u32 n_bytes)
+{
+  linux_pci_main_t *lpm = &linux_pci_main;
+  linux_pci_device_t *p;
+  int n;
+
+  p = pool_elt_at_index (lpm->linux_pci_devices, dev->os_handle);
+
+  if (read_or_write == VLIB_READ)
+    n = pread (p->config_fd, data, n_bytes, address);
+  else
+    n = pwrite (p->config_fd, data, n_bytes, address);
+
+  if (n != n_bytes)
+    return clib_error_return_unix (0, "%s",
+				   read_or_write == VLIB_READ
+				   ? "read" : "write");
+
+  return 0;
+}
+
+static clib_error_t *
+os_map_pci_resource_internal (uword os_handle,
+			      u32 resource, u8 * addr, void **result)
+{
+  linux_pci_main_t *pm = &linux_pci_main;
+  linux_pci_device_t *p;
+  struct stat stat_buf;
+  u8 *file_name;
+  int fd;
+  clib_error_t *error;
+  int flags = MAP_SHARED;
+
+  error = 0;
+  p = pool_elt_at_index (pm->linux_pci_devices, os_handle);
+
+  file_name = format (0, "%v/resource%d%c", p->dev_dir_name, resource, 0);
+  fd = open ((char *) file_name, O_RDWR);
+  if (fd < 0)
+    {
+      error = clib_error_return_unix (0, "open `%s'", file_name);
+      goto done;
+    }
+
+  if (fstat (fd, &stat_buf) < 0)
+    {
+      error = clib_error_return_unix (0, "fstat `%s'", file_name);
+      goto done;
+    }
+
+  vec_validate (p->resource_fds, resource);
+  p->resource_fds[resource] = fd;
+  if (addr != 0)
+    flags |= MAP_FIXED;
+
+  *result = mmap (addr,
+		  /* size */ stat_buf.st_size,
+		  PROT_READ | PROT_WRITE, flags,
+		  /* file */ fd,
+		  /* offset */ 0);
+  if (*result == (void *) -1)
+    {
+      error = clib_error_return_unix (0, "mmap `%s'", file_name);
+      goto done;
+    }
+
+done:
+  if (error)
+    {
+      if (fd >= 0)
+	close (fd);
+    }
+  vec_free (file_name);
+  return error;
+}
+
+clib_error_t *
+vlib_pci_map_resource (vlib_pci_device_t * dev, u32 resource, void **result)
+{
+  return (os_map_pci_resource_internal
+	  (dev->os_handle, resource, 0 /* addr */ ,
+	   result));
+}
+
+clib_error_t *
+vlib_pci_map_resource_fixed (vlib_pci_device_t * dev,
+			     u32 resource, u8 * addr, void **result)
+{
+  return (os_map_pci_resource_internal
+	  (dev->os_handle, resource, addr, result));
+}
+
+void
+vlib_pci_free_device (vlib_pci_device_t * dev)
+{
+  linux_pci_main_t *pm = &linux_pci_main;
+  linux_pci_device_t *l;
+
+  l = pool_elt_at_index (pm->linux_pci_devices, dev->os_handle);
+  linux_pci_device_free (l);
+  pool_put (pm->linux_pci_devices, l);
+}
+
+pci_device_registration_t * __attribute__ ((unused))
+pci_device_next_registered (pci_device_registration_t * r)
+{
+  uword i;
+
+  /* Null vendor id marks end of initialized list. */
+  for (i = 0; r->supported_devices[i].vendor_id != 0; i++)
+    ;
+
+  return clib_elf_section_data_next (r, i * sizeof (r->supported_devices[0]));
+}
+
+static clib_error_t *
+init_device_from_registered (vlib_main_t * vm,
+			     vlib_pci_device_t * dev,
+			     linux_pci_device_t * pdev)
+{
+  vlib_pci_main_t *pm = &pci_main;
+  pci_device_registration_t *r;
+  pci_device_id_t *i;
+  clib_error_t *error;
+
+  r = pm->pci_device_registrations;
+
+  while (r)
+    {
+      for (i = r->supported_devices; i->vendor_id != 0; i++)
+	if (i->vendor_id == dev->vendor_id && i->device_id == dev->device_id)
+	  {
+	    error = vlib_pci_bind_to_uio (dev, "uio_pci_generic");
+	    if (error)
+	      {
+		clib_error_report (error);
+		continue;
+	      }
+
+	    add_device (dev, pdev);
+	    dev->interrupt_handler = r->interrupt_handler;
+	    return r->init_function (vm, dev);
+	  }
+      r = r->next_registration;
+    }
+  /* No driver, close the PCI config-space FD */
+  close (pdev->config_fd);
+  return 0;
+}
+
+static clib_error_t *
+init_device (vlib_main_t * vm,
+	     vlib_pci_device_t * dev, linux_pci_device_t * pdev)
+{
+  return init_device_from_registered (vm, dev, pdev);
+}
+
+static clib_error_t *
+scan_device (void *arg, u8 * dev_dir_name, u8 * ignored)
+{
+  vlib_main_t *vm = arg;
+  vlib_pci_main_t *pm = &pci_main;
+  int fd;
+  u8 *f;
+  clib_error_t *error = 0;
+  vlib_pci_device_t *dev;
+  linux_pci_device_t pdev = { 0 };
+  u32 tmp;
+
+  f = format (0, "%v/config%c", dev_dir_name, 0);
+  fd = open ((char *) f, O_RDWR);
+
+  /* Try read-only access if write fails. */
+  if (fd < 0)
+    fd = open ((char *) f, O_RDONLY);
+
+  if (fd < 0)
+    {
+      error = clib_error_return_unix (0, "open `%s'", f);
+      goto done;
+    }
+
+  pool_get (pm->pci_devs, dev);
+
+  /* You can only read more that 64 bytes of config space as root; so we try to
+     read the full space but fall back to just the first 64 bytes. */
+  if (read (fd, &dev->config_data, sizeof (dev->config_data)) !=
+      sizeof (dev->config_data)
+      && read (fd, &dev->config0,
+	       sizeof (dev->config0)) != sizeof (dev->config0))
+    {
+      pool_put (pm->pci_devs, dev);
+      error = clib_error_return_unix (0, "read `%s'", f);
+      close (fd);
+      goto done;
+    }
+
+  {
+    static pci_config_header_t all_ones;
+    if (all_ones.vendor_id == 0)
+      memset (&all_ones, ~0, sizeof (all_ones));
+
+    if (!memcmp (&dev->config0.header, &all_ones, sizeof (all_ones)))
+      {
+	pool_put (pm->pci_devs, dev);
+	error = clib_error_return (0, "invalid PCI config for `%s'", f);
+	close (fd);
+	goto done;
+      }
+  }
+
+  if (dev->config0.header.header_type == 0)
+    pci_config_type0_little_to_host (&dev->config0);
+  else
+    pci_config_type1_little_to_host (&dev->config1);
+
+  /* Parse bus, dev, function from directory name. */
+  {
+    unformat_input_t input;
+
+    unformat_init_string (&input, (char *) dev_dir_name,
+			  vec_len (dev_dir_name));
+
+    if (!unformat (&input, "/sys/bus/pci/devices/%U",
+		   unformat_vlib_pci_addr, &dev->bus_address))
+      abort ();
+
+    unformat_free (&input);
+
+  }
+
+
+  pdev.config_fd = fd;
+  pdev.dev_dir_name = dev_dir_name;
+
+  hash_set (pm->pci_dev_index_by_pci_addr, dev->bus_address.as_u32,
+	    dev - pm->pci_devs);
+
+  error = init_device (vm, dev, &pdev);
+
+  vec_reset_length (f);
+  f = format (f, "%v/vpd%c", dev_dir_name, 0);
+  fd = open ((char *) f, O_RDONLY);
+  if (fd >= 0)
+    {
+      while (1)
+	{
+	  u8 tag[3];
+	  u8 *data = 0;
+	  int len;
+
+	  if (read (fd, &tag, 3) != 3)
+	    break;
+
+	  if (tag[0] != 0x82 && tag[0] != 0x90 && tag[0] != 0x91)
+	    break;
+
+	  len = (tag[2] << 8) | tag[1];
+	  vec_validate (data, len);
+
+	  if (read (fd, data, len) != len)
+	    {
+	      vec_free (data);
+	      break;
+	    }
+	  if (tag[0] == 0x82)
+	    dev->product_name = data;
+	  else if (tag[0] == 0x90)
+	    dev->vpd_r = data;
+	  else if (tag[0] == 0x91)
+	    dev->vpd_w = data;
+
+	  data = 0;
+	}
+      close (fd);
+    }
+
+  vec_reset_length (f);
+  f = format (f, "%v/driver%c", dev_dir_name, 0);
+  dev->driver_name = vlib_sysfs_link_to_name ((char *) f);
+
+  dev->numa_node = -1;
+  vec_reset_length (f);
+  f = format (f, "%v/numa_node%c", dev_dir_name, 0);
+  vlib_sysfs_read ((char *) f, "%u", &dev->numa_node);
+
+  vec_reset_length (f);
+  f = format (f, "%v/class%c", dev_dir_name, 0);
+  vlib_sysfs_read ((char *) f, "0x%x", &tmp);
+  dev->device_class = tmp >> 8;
+
+  vec_reset_length (f);
+  f = format (f, "%v/vendor%c", dev_dir_name, 0);
+  vlib_sysfs_read ((char *) f, "0x%x", &tmp);
+  dev->vendor_id = tmp;
+
+  vec_reset_length (f);
+  f = format (f, "%v/device%c", dev_dir_name, 0);
+  vlib_sysfs_read ((char *) f, "0x%x", &tmp);
+  dev->device_id = tmp;
+
+done:
+  vec_free (f);
+  return error;
+}
+
+clib_error_t *
+linux_pci_init (vlib_main_t * vm)
+{
+  vlib_pci_main_t *pm = &pci_main;
+  clib_error_t *error;
+
+  pm->vlib_main = vm;
+
+  if ((error = vlib_call_init_function (vm, unix_input_init)))
+    return error;
+
+  ASSERT (sizeof (vlib_pci_addr_t) == sizeof (u32));
+  pm->pci_dev_index_by_pci_addr = hash_create (0, sizeof (uword));
+
+  error = foreach_directory_file ("/sys/bus/pci/devices", scan_device, vm,
+				  /* scan_dirs */ 0);
+
+  /* Complain and continue. might not be root, etc. */
+  if (error)
+    clib_error_report (error);
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (linux_pci_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/pci/pci.c b/src/vlib/pci/pci.c
new file mode 100644
index 00000000..7100064d
--- /dev/null
+++ b/src/vlib/pci/pci.c
@@ -0,0 +1,264 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pci.c: Linux user space PCI bus management.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vlib/pci/pci.h>
+#include <vlib/unix/unix.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <sys/ioctl.h>
+#include <net/if.h>
+#include <linux/ethtool.h>
+#include <linux/sockios.h>
+
+vlib_pci_main_t pci_main;
+
+vlib_pci_device_t *
+vlib_get_pci_device (vlib_pci_addr_t * addr)
+{
+  vlib_pci_main_t *pm = &pci_main;
+  uword *p;
+  p = hash_get (pm->pci_dev_index_by_pci_addr, addr->as_u32);
+
+  if (p == 0)
+    return 0;
+
+  return vec_elt_at_index (pm->pci_devs, p[0]);
+}
+
+static clib_error_t *
+show_pci_fn (vlib_main_t * vm,
+	     unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vlib_pci_main_t *pm = &pci_main;
+  vlib_pci_device_t *d;
+  int show_all = 0;
+  u8 *s = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "all"))
+	show_all = 1;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+
+  vlib_cli_output (vm, "%-13s%-5s%-12s%-13s%-16s%-32s%s",
+		   "Address", "Sock", "VID:PID", "Link Speed", "Driver",
+		   "Product Name", "Vital Product Data");
+
+  /* *INDENT-OFF* */
+  pool_foreach (d, pm->pci_devs, ({
+
+    if (d->device_class != PCI_CLASS_NETWORK_ETHERNET && !show_all)
+      continue;
+
+    vec_reset_length (s);
+
+    if (d->numa_node >= 0)
+      s = format (s, "  %d", d->numa_node);
+
+    vlib_cli_output (vm, "%-13U%-5v%04x:%04x   %-13U%-16s%-32v%U",
+		     format_vlib_pci_addr, &d->bus_address, s,
+		     d->vendor_id, d->device_id,
+		     format_vlib_pci_link_speed, d,
+		     d->driver_name ? (char *) d->driver_name : "",
+		     d->product_name,
+		     format_vlib_pci_vpd, d->vpd_r, 0);
+  }));
+/* *INDENT-ON* */
+
+  vec_free (s);
+  return 0;
+}
+
+uword
+unformat_vlib_pci_addr (unformat_input_t * input, va_list * args)
+{
+  vlib_pci_addr_t *addr = va_arg (*args, vlib_pci_addr_t *);
+  u32 x[4];
+
+  if (!unformat (input, "%x:%x:%x.%x", &x[0], &x[1], &x[2], &x[3]))
+    return 0;
+
+  addr->domain = x[0];
+  addr->bus = x[1];
+  addr->slot = x[2];
+  addr->function = x[3];
+
+  return 1;
+}
+
+u8 *
+format_vlib_pci_addr (u8 * s, va_list * va)
+{
+  vlib_pci_addr_t *addr = va_arg (*va, vlib_pci_addr_t *);
+  return format (s, "%04x:%02x:%02x.%x", addr->domain, addr->bus,
+		 addr->slot, addr->function);
+}
+
+u8 *
+format_vlib_pci_handle (u8 * s, va_list * va)
+{
+  vlib_pci_addr_t *addr = va_arg (*va, vlib_pci_addr_t *);
+  return format (s, "%x/%x/%x", addr->bus, addr->slot, addr->function);
+}
+
+u8 *
+format_vlib_pci_link_speed (u8 * s, va_list * va)
+{
+  vlib_pci_device_t *d = va_arg (*va, vlib_pci_device_t *);
+  pcie_config_regs_t *r =
+    pci_config_find_capability (&d->config0, PCI_CAP_ID_PCIE);
+  int width;
+
+  if (!r)
+    return format (s, "unknown");
+
+  width = (r->link_status >> 4) & 0x3f;
+
+  if ((r->link_status & 0xf) == 1)
+    return format (s, "2.5 GT/s x%u", width);
+  if ((r->link_status & 0xf) == 2)
+    return format (s, "5.0 GT/s x%u", width);
+  if ((r->link_status & 0xf) == 3)
+    return format (s, "8.0 GT/s x%u", width);
+  return format (s, "unknown");
+}
+
+u8 *
+format_vlib_pci_vpd (u8 * s, va_list * args)
+{
+  u8 *data = va_arg (*args, u8 *);
+  u8 *id = va_arg (*args, u8 *);
+  uword indent = format_get_indent (s);
+  char *string_types[] = { "PN", "EC", "SN", "MN", 0 };
+  uword p = 0;
+  int first_line = 1;
+
+  if (vec_len (data) < 3)
+    return s;
+
+  while (p + 3 < vec_len (data))
+    {
+
+      if (data[p] == 0 && data[p + 1] == 0)
+	return s;
+
+      if (p + data[p + 2] > vec_len (data))
+	return s;
+
+      if (id == 0)
+	{
+	  int is_string = 0;
+	  char **c = string_types;
+
+	  while (c[0])
+	    {
+	      if (*(u16 *) & data[p] == *(u16 *) c[0])
+		is_string = 1;
+	      c++;
+	    }
+
+	  if (data[p + 2])
+	    {
+	      if (!first_line)
+		s = format (s, "\n%U", format_white_space, indent);
+	      else
+		{
+		  first_line = 0;
+		  s = format (s, " ");
+		}
+
+	      s = format (s, "%c%c: ", data[p], data[p + 1]);
+	      if (is_string)
+		vec_add (s, data + p + 3, data[p + 2]);
+	      else
+		{
+		  int i;
+		  const int max_bytes = 8;
+		  s = format (s, "0x");
+		  for (i = 0; i < clib_min (data[p + 2], max_bytes); i++)
+		    s = format (s, " %02x", data[p + 3 + i]);
+
+		  if (data[p + 2] > max_bytes)
+		    s = format (s, " ...");
+		}
+	    }
+	}
+      else if (*(u16 *) & data[p] == *(u16 *) id)
+	{
+	  vec_add (s, data + p + 3, data[p + 2]);
+	  return s;
+	}
+
+      p += 3 + data[p + 2];
+    }
+
+  return s;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_pci_command, static) = {
+  .path = "show pci",
+  .short_help = "show pci [all]",
+  .function = show_pci_fn,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+pci_bus_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (pci_bus_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/pci/pci.h b/src/vlib/pci/pci.h
new file mode 100644
index 00000000..811a6ff2
--- /dev/null
+++ b/src/vlib/pci/pci.h
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pci.h: PCI definitions.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_pci_h
+#define included_vlib_pci_h
+
+#include <vlib/vlib.h>
+#include <vlib/pci/pci_config.h>
+
+typedef CLIB_PACKED (union
+		     {
+		     struct
+		     {
+u16 domain; u8 bus; u8 slot: 5; u8 function:3;};
+		     u32 as_u32;}) vlib_pci_addr_t;
+
+typedef struct vlib_pci_device
+{
+  /* Operating system handle for this device. */
+  uword os_handle;
+
+  vlib_pci_addr_t bus_address;
+
+  /* First 64 bytes of configuration space. */
+  union
+  {
+    pci_config_type0_regs_t config0;
+    pci_config_type1_regs_t config1;
+    u8 config_data[256];
+  };
+
+  /* Interrupt handler */
+  void (*interrupt_handler) (struct vlib_pci_device * dev);
+
+  /* Driver name */
+  u8 *driver_name;
+
+  /* Numa Node */
+  int numa_node;
+
+  /* Device data */
+  u16 device_class;
+  u16 vendor_id;
+  u16 device_id;
+
+  /* Vital Product Data */
+  u8 *product_name;
+  u8 *vpd_r;
+  u8 *vpd_w;
+
+  /* Private data */
+  uword private_data;
+
+} vlib_pci_device_t;
+
+typedef struct
+{
+  u16 vendor_id, device_id;
+} pci_device_id_t;
+
+typedef struct _pci_device_registration
+{
+  /* Driver init function. */
+  clib_error_t *(*init_function) (vlib_main_t * vm, vlib_pci_device_t * dev);
+
+  /* Interrupt handler */
+  void (*interrupt_handler) (vlib_pci_device_t * dev);
+
+  /* List of registrations */
+  struct _pci_device_registration *next_registration;
+
+  /* Vendor/device ids supported by this driver. */
+  pci_device_id_t supported_devices[];
+} pci_device_registration_t;
+
+/* Pool of PCI devices. */
+typedef struct
+{
+  vlib_main_t *vlib_main;
+  vlib_pci_device_t *pci_devs;
+  pci_device_registration_t *pci_device_registrations;
+  uword *pci_dev_index_by_pci_addr;
+} vlib_pci_main_t;
+
+extern vlib_pci_main_t pci_main;
+
+#define PCI_REGISTER_DEVICE(x,...)                              \
+    __VA_ARGS__ pci_device_registration_t x;                    \
+static void __vlib_add_pci_device_registration_##x (void)       \
+    __attribute__((__constructor__)) ;                          \
+static void __vlib_add_pci_device_registration_##x (void)       \
+{                                                               \
+    vlib_pci_main_t * pm = &pci_main;                           \
+    x.next_registration = pm->pci_device_registrations;         \
+    pm->pci_device_registrations = &x;                          \
+}                                                               \
+__VA_ARGS__ pci_device_registration_t x
+
+clib_error_t *vlib_pci_bind_to_uio (vlib_pci_device_t * d,
+				    char *uio_driver_name);
+
+/* Configuration space read/write. */
+clib_error_t *vlib_pci_read_write_config (vlib_pci_device_t * dev,
+					  vlib_read_or_write_t read_or_write,
+					  uword address,
+					  void *data, u32 n_bytes);
+
+#define _(t)								\
+static inline clib_error_t *						\
+vlib_pci_read_config_##t (vlib_pci_device_t * dev,			\
+			  uword address, t * data)			\
+{									\
+  return vlib_pci_read_write_config (dev, VLIB_READ,address, data,	\
+				     sizeof (data[0]));			\
+}
+
+_(u32);
+_(u16);
+_(u8);
+
+#undef _
+
+#define _(t)								\
+static inline clib_error_t *						\
+vlib_pci_write_config_##t (vlib_pci_device_t * dev, uword address,	\
+			   t * data)					\
+{									\
+  return vlib_pci_read_write_config (dev, VLIB_WRITE,			\
+				   address, data, sizeof (data[0]));	\
+}
+
+_(u32);
+_(u16);
+_(u8);
+
+#undef _
+
+static inline clib_error_t *
+vlib_pci_intr_enable (vlib_pci_device_t * dev)
+{
+  u16 command;
+  clib_error_t *err;
+
+  err = vlib_pci_read_config_u16 (dev, 4, &command);
+
+  if (err)
+    return err;
+
+  command &= ~PCI_COMMAND_INTX_DISABLE;
+
+  return vlib_pci_write_config_u16 (dev, 4, &command);
+}
+
+static inline clib_error_t *
+vlib_pci_intr_disable (vlib_pci_device_t * dev)
+{
+  u16 command;
+  clib_error_t *err;
+
+  err = vlib_pci_read_config_u16 (dev, 4, &command);
+
+  if (err)
+    return err;
+
+  command |= PCI_COMMAND_INTX_DISABLE;
+
+  return vlib_pci_write_config_u16 (dev, 4, &command);
+}
+
+static inline clib_error_t *
+vlib_pci_bus_master_enable (vlib_pci_device_t * dev)
+{
+  clib_error_t *err;
+  u16 command;
+
+  /* Set bus master enable (BME) */
+  err = vlib_pci_read_config_u16 (dev, 4, &command);
+
+  if (err)
+    return err;
+
+  if (!(command & PCI_COMMAND_BUS_MASTER))
+    return 0;
+
+  command |= PCI_COMMAND_BUS_MASTER;
+
+  return vlib_pci_write_config_u16 (dev, 4, &command);
+}
+
+clib_error_t *vlib_pci_map_resource (vlib_pci_device_t * dev, u32 resource,
+				     void **result);
+
+clib_error_t *vlib_pci_map_resource_fixed (vlib_pci_device_t * dev,
+					   u32 resource, u8 * addr,
+					   void **result);
+
+vlib_pci_device_t *vlib_get_pci_device (vlib_pci_addr_t * addr);
+/* Free's device. */
+void vlib_pci_free_device (vlib_pci_device_t * dev);
+
+unformat_function_t unformat_vlib_pci_addr;
+format_function_t format_vlib_pci_addr;
+format_function_t format_vlib_pci_handle;
+format_function_t format_vlib_pci_link_speed;
+format_function_t format_vlib_pci_vpd;
+
+#endif /* included_vlib_pci_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/pci/pci_config.h b/src/vlib/pci/pci_config.h
new file mode 100644
index 00000000..92e56af6
--- /dev/null
+++ b/src/vlib/pci/pci_config.h
@@ -0,0 +1,731 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pci.h: PCI definitions.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_pci_config_h
+#define included_vlib_pci_config_h
+
+#include <vppinfra/byte_order.h>
+#include <vppinfra/error.h>
+
+typedef enum
+{
+  PCI_CLASS_NOT_DEFINED = 0x0000,
+  PCI_CLASS_NOT_DEFINED_VGA = 0x0001,
+
+  PCI_CLASS_STORAGE_SCSI = 0x0100,
+  PCI_CLASS_STORAGE_IDE = 0x0101,
+  PCI_CLASS_STORAGE_FLOPPY = 0x0102,
+  PCI_CLASS_STORAGE_IPI = 0x0103,
+  PCI_CLASS_STORAGE_RAID = 0x0104,
+  PCI_CLASS_STORAGE_OTHER = 0x0180,
+  PCI_CLASS_STORAGE = 0x0100,
+
+  PCI_CLASS_NETWORK_ETHERNET = 0x0200,
+  PCI_CLASS_NETWORK_TOKEN_RING = 0x0201,
+  PCI_CLASS_NETWORK_FDDI = 0x0202,
+  PCI_CLASS_NETWORK_ATM = 0x0203,
+  PCI_CLASS_NETWORK_OTHER = 0x0280,
+  PCI_CLASS_NETWORK = 0x0200,
+
+  PCI_CLASS_DISPLAY_VGA = 0x0300,
+  PCI_CLASS_DISPLAY_XGA = 0x0301,
+  PCI_CLASS_DISPLAY_3D = 0x0302,
+  PCI_CLASS_DISPLAY_OTHER = 0x0380,
+  PCI_CLASS_DISPLAY = 0x0300,
+
+  PCI_CLASS_MULTIMEDIA_VIDEO = 0x0400,
+  PCI_CLASS_MULTIMEDIA_AUDIO = 0x0401,
+  PCI_CLASS_MULTIMEDIA_PHONE = 0x0402,
+  PCI_CLASS_MULTIMEDIA_OTHER = 0x0480,
+  PCI_CLASS_MULTIMEDIA = 0x0400,
+
+  PCI_CLASS_MEMORY_RAM = 0x0500,
+  PCI_CLASS_MEMORY_FLASH = 0x0501,
+  PCI_CLASS_MEMORY_OTHER = 0x0580,
+  PCI_CLASS_MEMORY = 0x0500,
+
+  PCI_CLASS_BRIDGE_HOST = 0x0600,
+  PCI_CLASS_BRIDGE_ISA = 0x0601,
+  PCI_CLASS_BRIDGE_EISA = 0x0602,
+  PCI_CLASS_BRIDGE_MC = 0x0603,
+  PCI_CLASS_BRIDGE_PCI = 0x0604,
+  PCI_CLASS_BRIDGE_PCMCIA = 0x0605,
+  PCI_CLASS_BRIDGE_NUBUS = 0x0606,
+  PCI_CLASS_BRIDGE_CARDBUS = 0x0607,
+  PCI_CLASS_BRIDGE_RACEWAY = 0x0608,
+  PCI_CLASS_BRIDGE_OTHER = 0x0680,
+  PCI_CLASS_BRIDGE = 0x0600,
+
+  PCI_CLASS_COMMUNICATION_SERIAL = 0x0700,
+  PCI_CLASS_COMMUNICATION_PARALLEL = 0x0701,
+  PCI_CLASS_COMMUNICATION_MULTISERIAL = 0x0702,
+  PCI_CLASS_COMMUNICATION_MODEM = 0x0703,
+  PCI_CLASS_COMMUNICATION_OTHER = 0x0780,
+  PCI_CLASS_COMMUNICATION = 0x0700,
+
+  PCI_CLASS_SYSTEM_PIC = 0x0800,
+  PCI_CLASS_SYSTEM_DMA = 0x0801,
+  PCI_CLASS_SYSTEM_TIMER = 0x0802,
+  PCI_CLASS_SYSTEM_RTC = 0x0803,
+  PCI_CLASS_SYSTEM_PCI_HOTPLUG = 0x0804,
+  PCI_CLASS_SYSTEM_OTHER = 0x0880,
+  PCI_CLASS_SYSTEM = 0x0800,
+
+  PCI_CLASS_INPUT_KEYBOARD = 0x0900,
+  PCI_CLASS_INPUT_PEN = 0x0901,
+  PCI_CLASS_INPUT_MOUSE = 0x0902,
+  PCI_CLASS_INPUT_SCANNER = 0x0903,
+  PCI_CLASS_INPUT_GAMEPORT = 0x0904,
+  PCI_CLASS_INPUT_OTHER = 0x0980,
+  PCI_CLASS_INPUT = 0x0900,
+
+  PCI_CLASS_DOCKING_GENERIC = 0x0a00,
+  PCI_CLASS_DOCKING_OTHER = 0x0a80,
+  PCI_CLASS_DOCKING = 0x0a00,
+
+  PCI_CLASS_PROCESSOR_386 = 0x0b00,
+  PCI_CLASS_PROCESSOR_486 = 0x0b01,
+  PCI_CLASS_PROCESSOR_PENTIUM = 0x0b02,
+  PCI_CLASS_PROCESSOR_ALPHA = 0x0b10,
+  PCI_CLASS_PROCESSOR_POWERPC = 0x0b20,
+  PCI_CLASS_PROCESSOR_MIPS = 0x0b30,
+  PCI_CLASS_PROCESSOR_CO = 0x0b40,
+  PCI_CLASS_PROCESSOR = 0x0b00,
+
+  PCI_CLASS_SERIAL_FIREWIRE = 0x0c00,
+  PCI_CLASS_SERIAL_ACCESS = 0x0c01,
+  PCI_CLASS_SERIAL_SSA = 0x0c02,
+  PCI_CLASS_SERIAL_USB = 0x0c03,
+  PCI_CLASS_SERIAL_FIBER = 0x0c04,
+  PCI_CLASS_SERIAL_SMBUS = 0x0c05,
+  PCI_CLASS_SERIAL = 0x0c00,
+
+  PCI_CLASS_INTELLIGENT_I2O = 0x0e00,
+  PCI_CLASS_INTELLIGENT = 0x0e00,
+
+  PCI_CLASS_SATELLITE_TV = 0x0f00,
+  PCI_CLASS_SATELLITE_AUDIO = 0x0f01,
+  PCI_CLASS_SATELLITE_VOICE = 0x0f03,
+  PCI_CLASS_SATELLITE_DATA = 0x0f04,
+  PCI_CLASS_SATELLITE = 0x0f00,
+
+  PCI_CLASS_CRYPT_NETWORK = 0x1000,
+  PCI_CLASS_CRYPT_ENTERTAINMENT = 0x1001,
+  PCI_CLASS_CRYPT_OTHER = 0x1080,
+  PCI_CLASS_CRYPT = 0x1000,
+
+  PCI_CLASS_SP_DPIO = 0x1100,
+  PCI_CLASS_SP_OTHER = 0x1180,
+  PCI_CLASS_SP = 0x1100,
+} pci_device_class_t;
+
+static inline pci_device_class_t
+pci_device_class_base (pci_device_class_t c)
+{
+  return c & ~0xff;
+}
+
+/*
+ * Under PCI, each device has 256 bytes of configuration address space,
+ * of which the first 64 bytes are standardized as follows:
+ */
+typedef struct
+{
+  u16 vendor_id;
+  u16 device_id;
+
+  u16 command;
+#define PCI_COMMAND_IO		(1 << 0)	/* Enable response in I/O space */
+#define PCI_COMMAND_MEMORY	(1 << 1)	/* Enable response in Memory space */
+#define PCI_COMMAND_BUS_MASTER	(1 << 2)	/* Enable bus mastering */
+#define PCI_COMMAND_SPECIAL	(1 << 3)	/* Enable response to special cycles */
+#define PCI_COMMAND_WRITE_INVALIDATE (1 << 4)	/* Use memory write and invalidate */
+#define PCI_COMMAND_VGA_PALETTE_SNOOP (1 << 5)
+#define PCI_COMMAND_PARITY	(1 << 6)
+#define PCI_COMMAND_WAIT 	(1 << 7)	/* Enable address/data stepping */
+#define PCI_COMMAND_SERR	(1 << 8)	/* Enable SERR */
+#define PCI_COMMAND_BACK_TO_BACK_WRITE (1 << 9)
+#define PCI_COMMAND_INTX_DISABLE (1 << 10)	/* INTx Emulation Disable */
+
+  u16 status;
+#define PCI_STATUS_INTX_PENDING (1 << 3)
+#define PCI_STATUS_CAPABILITY_LIST (1 << 4)
+#define PCI_STATUS_66MHZ	(1 << 5)	/* Support 66 Mhz PCI 2.1 bus */
+#define PCI_STATUS_UDF		(1 << 6)	/* Support User Definable Features (obsolete) */
+#define PCI_STATUS_BACK_TO_BACK_WRITE (1 << 7)	/* Accept fast-back to back */
+#define PCI_STATUS_PARITY_ERROR	(1 << 8)	/* Detected parity error */
+#define PCI_STATUS_DEVSEL_GET(x) ((x >> 9) & 3)	/* DEVSEL timing */
+#define PCI_STATUS_DEVSEL_FAST (0 << 9)
+#define PCI_STATUS_DEVSEL_MEDIUM (1 << 9)
+#define PCI_STATUS_DEVSEL_SLOW (2 << 9)
+#define PCI_STATUS_SIG_TARGET_ABORT (1 << 11)	/* Set on target abort */
+#define PCI_STATUS_REC_TARGET_ABORT (1 << 12)	/* Master ack of " */
+#define PCI_STATUS_REC_MASTER_ABORT (1 << 13)	/* Set on master abort */
+#define PCI_STATUS_SIG_SYSTEM_ERROR (1 << 14)	/* Set when we drive SERR */
+#define PCI_STATUS_DETECTED_PARITY_ERROR (1 << 15)
+
+  u8 revision_id;
+  u8 programming_interface_class;	/* Reg. Level Programming Interface */
+
+  pci_device_class_t device_class:16;
+
+  u8 cache_size;
+  u8 latency_timer;
+
+  u8 header_type;
+#define PCI_HEADER_TYPE_NORMAL	0
+#define PCI_HEADER_TYPE_BRIDGE 1
+#define PCI_HEADER_TYPE_CARDBUS 2
+
+  u8 bist;
+#define PCI_BIST_CODE_MASK	0x0f	/* Return result */
+#define PCI_BIST_START		0x40	/* 1 to start BIST, 2 secs or less */
+#define PCI_BIST_CAPABLE	0x80	/* 1 if BIST capable */
+} pci_config_header_t;
+
+/* Byte swap config header. */
+always_inline void
+pci_config_header_little_to_host (pci_config_header_t * r)
+{
+  if (!CLIB_ARCH_IS_BIG_ENDIAN)
+    return;
+#define _(f,t) r->f = clib_byte_swap_##t (r->f)
+  _(vendor_id, u16);
+  _(device_id, u16);
+  _(command, u16);
+  _(status, u16);
+  _(device_class, u16);
+#undef _
+}
+
+/* Header type 0 (normal devices) */
+typedef struct
+{
+  pci_config_header_t header;
+
+  /*
+   * Base addresses specify locations in memory or I/O space.
+   * Decoded size can be determined by writing a value of
+   * 0xffffffff to the register, and reading it back. Only
+   * 1 bits are decoded.
+   */
+  u32 base_address[6];
+
+  u16 cardbus_cis;
+
+  u16 subsystem_vendor_id;
+  u16 subsystem_id;
+
+  u32 rom_address;
+#define PCI_ROM_ADDRESS		0x30	/* Bits 31..11 are address, 10..1 reserved */
+#define PCI_ROM_ADDRESS_ENABLE	0x01
+#define PCI_ROM_ADDRESS_MASK	(~0x7ffUL)
+
+  u8 first_capability_offset;
+    CLIB_PAD_FROM_TO (0x35, 0x3c);
+
+  u8 interrupt_line;
+  u8 interrupt_pin;
+  u8 min_grant;
+  u8 max_latency;
+
+  u8 capability_data[0];
+} pci_config_type0_regs_t;
+
+always_inline void
+pci_config_type0_little_to_host (pci_config_type0_regs_t * r)
+{
+  int i;
+  if (!CLIB_ARCH_IS_BIG_ENDIAN)
+    return;
+  pci_config_header_little_to_host (&r->header);
+#define _(f,t) r->f = clib_byte_swap_##t (r->f)
+  for (i = 0; i < ARRAY_LEN (r->base_address); i++)
+    _(base_address[i], u32);
+  _(cardbus_cis, u16);
+  _(subsystem_vendor_id, u16);
+  _(subsystem_id, u16);
+  _(rom_address, u32);
+#undef _
+}
+
+/* Header type 1 (PCI-to-PCI bridges) */
+typedef struct
+{
+  pci_config_header_t header;
+
+  u32 base_address[2];
+
+  /* Primary/secondary bus number. */
+  u8 primary_bus;
+  u8 secondary_bus;
+
+  /* Highest bus number behind the bridge */
+  u8 subordinate_bus;
+
+  u8 secondary_bus_latency_timer;
+
+  /* I/O range behind bridge. */
+  u8 io_base, io_limit;
+
+  /* Secondary status register, only bit 14 used */
+  u16 secondary_status;
+
+  /* Memory range behind bridge in units of 64k bytes. */
+  u16 memory_base, memory_limit;
+#define PCI_MEMORY_RANGE_TYPE_MASK 0x0fUL
+#define PCI_MEMORY_RANGE_MASK	(~0x0fUL)
+
+  u16 prefetchable_memory_base, prefetchable_memory_limit;
+#define PCI_PREF_RANGE_TYPE_MASK 0x0fUL
+#define PCI_PREF_RANGE_TYPE_32	0x00
+#define PCI_PREF_RANGE_TYPE_64	0x01
+#define PCI_PREF_RANGE_MASK	(~0x0fUL)
+
+  u32 prefetchable_memory_base_upper_32bits;
+  u32 prefetchable_memory_limit_upper_32bits;
+  u16 io_base_upper_16bits;
+  u16 io_limit_upper_16bits;
+
+  /* Same as for type 0. */
+  u8 capability_list_offset;
+    CLIB_PAD_FROM_TO (0x35, 0x37);
+
+  u32 rom_address;
+    CLIB_PAD_FROM_TO (0x3c, 0x3e);
+
+  u16 bridge_control;
+#define PCI_BRIDGE_CTL_PARITY	0x01	/* Enable parity detection on secondary interface */
+#define PCI_BRIDGE_CTL_SERR	0x02	/* The same for SERR forwarding */
+#define PCI_BRIDGE_CTL_NO_ISA	0x04	/* Disable bridging of ISA ports */
+#define PCI_BRIDGE_CTL_VGA	0x08	/* Forward VGA addresses */
+#define PCI_BRIDGE_CTL_MASTER_ABORT 0x20	/* Report master aborts */
+#define PCI_BRIDGE_CTL_BUS_RESET 0x40	/* Secondary bus reset */
+#define PCI_BRIDGE_CTL_FAST_BACK 0x80	/* Fast Back2Back enabled on secondary interface */
+
+  u8 capability_data[0];
+} pci_config_type1_regs_t;
+
+always_inline void
+pci_config_type1_little_to_host (pci_config_type1_regs_t * r)
+{
+  int i;
+  if (!CLIB_ARCH_IS_BIG_ENDIAN)
+    return;
+  pci_config_header_little_to_host (&r->header);
+#define _(f,t) r->f = clib_byte_swap_##t (r->f)
+  for (i = 0; i < ARRAY_LEN (r->base_address); i++)
+    _(base_address[i], u32);
+  _(secondary_status, u16);
+  _(memory_base, u16);
+  _(memory_limit, u16);
+  _(prefetchable_memory_base, u16);
+  _(prefetchable_memory_limit, u16);
+  _(prefetchable_memory_base_upper_32bits, u32);
+  _(prefetchable_memory_limit_upper_32bits, u32);
+  _(io_base_upper_16bits, u16);
+  _(io_limit_upper_16bits, u16);
+  _(rom_address, u32);
+  _(bridge_control, u16);
+#undef _
+}
+
+/* Capabilities. */
+typedef enum pci_capability_type
+{
+  /* Power Management */
+  PCI_CAP_ID_PM = 1,
+
+  /* Accelerated Graphics Port */
+  PCI_CAP_ID_AGP = 2,
+
+  /* Vital Product Data */
+  PCI_CAP_ID_VPD = 3,
+
+  /* Slot Identification */
+  PCI_CAP_ID_SLOTID = 4,
+
+  /* Message Signalled Interrupts */
+  PCI_CAP_ID_MSI = 5,
+
+  /* CompactPCI HotSwap */
+  PCI_CAP_ID_CHSWP = 6,
+
+  /* PCI-X */
+  PCI_CAP_ID_PCIX = 7,
+
+  /* Hypertransport. */
+  PCI_CAP_ID_HYPERTRANSPORT = 8,
+
+  /* PCI Standard Hot-Plug Controller */
+  PCI_CAP_ID_SHPC = 0xc,
+
+  /* PCI Express */
+  PCI_CAP_ID_PCIE = 0x10,
+
+  /* MSI-X */
+  PCI_CAP_ID_MSIX = 0x11,
+} pci_capability_type_t;
+
+/* Common header for capabilities. */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     enum pci_capability_type type:8;
+		     u8 next_offset;}) pci_capability_regs_t;
+/* *INDENT-ON* */
+
+always_inline void *
+pci_config_find_capability (pci_config_type0_regs_t * t, int cap_type)
+{
+  pci_capability_regs_t *c;
+  u32 next_offset;
+  u32 ttl = 48;
+
+  if (!(t->header.status & PCI_STATUS_CAPABILITY_LIST))
+    return 0;
+
+  next_offset = t->first_capability_offset;
+  while (ttl-- && next_offset >= 0x40)
+    {
+      c = (void *) t + (next_offset & ~3);
+      if ((u8) c->type == 0xff)
+	break;
+      if (c->type == cap_type)
+	return c;
+      next_offset = c->next_offset;
+    }
+  return 0;
+}
+
+/* Power Management Registers */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     pci_capability_regs_t header; u16 capabilities;
+#define PCI_PM_CAP_VER_MASK	0x0007	/* Version */
+#define PCI_PM_CAP_PME_CLOCK	0x0008	/* PME clock required */
+#define PCI_PM_CAP_RESERVED  0x0010	/* Reserved field */
+#define PCI_PM_CAP_DSI		0x0020	/* Device specific initialization */
+#define PCI_PM_CAP_AUX_POWER	0x01C0	/* Auxilliary power support mask */
+#define PCI_PM_CAP_D1		0x0200	/* D1 power state support */
+#define PCI_PM_CAP_D2		0x0400	/* D2 power state support */
+#define PCI_PM_CAP_PME		0x0800	/* PME pin supported */
+#define PCI_PM_CAP_PME_MASK  0xF800	/* PME Mask of all supported states */
+#define PCI_PM_CAP_PME_D0   0x0800	/* PME# from D0 */
+#define PCI_PM_CAP_PME_D1   0x1000	/* PME# from D1 */
+#define PCI_PM_CAP_PME_D2   0x2000	/* PME# from D2 */
+#define PCI_PM_CAP_PME_D3   0x4000	/* PME# from D3 (hot) */
+#define PCI_PM_CAP_PME_D3cold 0x8000	/* PME# from D3 (cold) */
+		     u16 control;
+#define PCI_PM_CTRL_STATE_MASK	0x0003	/* Current power state (D0 to D3) */
+#define PCI_PM_CTRL_PME_ENABLE	0x0100	/* PME pin enable */
+#define PCI_PM_CTRL_DATA_SEL_MASK	0x1e00	/* Data select (??) */
+#define PCI_PM_CTRL_DATA_SCALE_MASK	0x6000	/* Data scale (??) */
+#define PCI_PM_CTRL_PME_STATUS	0x8000	/* PME pin status */
+		     u8 extensions;
+#define PCI_PM_PPB_B2_B3	0x40	/* Stop clock when in D3hot (??) */
+#define PCI_PM_BPCC_ENABLE	0x80	/* Bus power/clock control enable (??) */
+		     u8 data;}) pci_power_management_regs_t;
+/* *INDENT-ON* */
+
+/* AGP registers */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     pci_capability_regs_t header; u8 version;
+		     u8 rest_of_capability_flags; u32 status; u32 command;
+		     /* Command & status common bits. */
+#define PCI_AGP_RQ_MASK	0xff000000	/* Maximum number of requests - 1 */
+#define PCI_AGP_SBA	0x0200	/* Sideband addressing supported */
+#define PCI_AGP_64BIT	0x0020	/* 64-bit addressing supported */
+#define PCI_AGP_ALLOW_TRANSACTIONS 0x0100	/* Allow processing of AGP transactions */
+#define PCI_AGP_FW	0x0010	/* FW transfers supported/forced */
+#define PCI_AGP_RATE4	0x0004	/* 4x transfer rate supported */
+#define PCI_AGP_RATE2	0x0002	/* 2x transfer rate supported */
+#define PCI_AGP_RATE1	0x0001	/* 1x transfer rate supported */
+		     }) pci_agp_regs_t;
+/* *INDENT-ON* */
+
+/* Vital Product Data */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     pci_capability_regs_t header; u16 address;
+#define PCI_VPD_ADDR_MASK	0x7fff	/* Address mask */
+#define PCI_VPD_ADDR_F		0x8000	/* Write 0, 1 indicates completion */
+		     u32 data;}) pci_vpd_regs_t;
+/* *INDENT-ON* */
+
+/* Slot Identification */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     pci_capability_regs_t header; u8 esr;
+#define PCI_SID_ESR_NSLOTS	0x1f	/* Number of expansion slots available */
+#define PCI_SID_ESR_FIC	0x20	/* First In Chassis Flag */
+		     u8 chassis;}) pci_sid_regs_t;
+/* *INDENT-ON* */
+
+/* Message Signalled Interrupts registers */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     pci_capability_regs_t header; u16 flags;
+#define PCI_MSI_FLAGS_ENABLE	(1 << 0)	/* MSI feature enabled */
+#define PCI_MSI_FLAGS_GET_MAX_QUEUE_SIZE(x) ((x >> 1) & 0x7)
+#define PCI_MSI_FLAGS_MAX_QUEUE_SIZE(x)     (((x) & 0x7) << 1)
+#define PCI_MSI_FLAGS_GET_QUEUE_SIZE(x) ((x >> 4) & 0x7)
+#define PCI_MSI_FLAGS_QUEUE_SIZE(x)     (((x) & 0x7) << 4)
+#define PCI_MSI_FLAGS_64BIT	(1 << 7)	/* 64-bit addresses allowed */
+#define PCI_MSI_FLAGS_MASKBIT	(1 << 8)	/* 64-bit mask bits allowed */
+		     u32 address; u32 data; u32 mask_bits;}) pci_msi32_regs_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     pci_capability_regs_t header; u16 flags;
+		     u32 address[2];
+		     u32 data; u32 mask_bits;}) pci_msi64_regs_t;
+/* *INDENT-ON* */
+
+/* CompactPCI Hotswap Register */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     pci_capability_regs_t header; u16 control_status;
+#define PCI_CHSWP_DHA		0x01	/* Device Hiding Arm */
+#define PCI_CHSWP_EIM		0x02	/* ENUM# Signal Mask */
+#define PCI_CHSWP_PIE		0x04	/* Pending Insert or Extract */
+#define PCI_CHSWP_LOO		0x08	/* LED On / Off */
+#define PCI_CHSWP_PI		0x30	/* Programming Interface */
+#define PCI_CHSWP_EXT		0x40	/* ENUM# status - extraction */
+#define PCI_CHSWP_INS		0x80	/* ENUM# status - insertion */
+		     }) pci_chswp_regs_t;
+/* *INDENT-ON* */
+
+/* PCIX registers */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     pci_capability_regs_t header; u16 command;
+#define PCIX_CMD_DPERR_E	0x0001	/* Data Parity Error Recovery Enable */
+#define PCIX_CMD_ERO		0x0002	/* Enable Relaxed Ordering */
+#define PCIX_CMD_MAX_READ	0x000c	/* Max Memory Read Byte Count */
+#define PCIX_CMD_MAX_SPLIT	0x0070	/* Max Outstanding Split Transactions */
+#define PCIX_CMD_VERSION(x) 	(((x) >> 12) & 3)	/* Version */
+		     u32 status;
+#define PCIX_STATUS_DEVFN	0x000000ff	/* A copy of devfn */
+#define PCIX_STATUS_BUS	0x0000ff00	/* A copy of bus nr */
+#define PCIX_STATUS_64BIT	0x00010000	/* 64-bit device */
+#define PCIX_STATUS_133MHZ	0x00020000	/* 133 MHz capable */
+#define PCIX_STATUS_SPL_DISC	0x00040000	/* Split Completion Discarded */
+#define PCIX_STATUS_UNX_SPL	0x00080000	/* Unexpected Split Completion */
+#define PCIX_STATUS_COMPLEX	0x00100000	/* Device Complexity */
+#define PCIX_STATUS_MAX_READ	0x00600000	/* Designed Max Memory Read Count */
+#define PCIX_STATUS_MAX_SPLIT	0x03800000	/* Designed Max Outstanding Split Transactions */
+#define PCIX_STATUS_MAX_CUM	0x1c000000	/* Designed Max Cumulative Read Size */
+#define PCIX_STATUS_SPL_ERR	0x20000000	/* Rcvd Split Completion Error Msg */
+#define PCIX_STATUS_266MHZ	0x40000000	/* 266 MHz capable */
+#define PCIX_STATUS_533MHZ	0x80000000	/* 533 MHz capable */
+		     }) pcix_config_regs_t;
+/* *INDENT-ON* */
+
+static inline int
+pcie_size_to_code (int bytes)
+{
+  ASSERT (is_pow2 (bytes));
+  ASSERT (bytes <= 4096);
+  return min_log2 (bytes) - 7;
+}
+
+static inline int
+pcie_code_to_size (int code)
+{
+  int size = 1 << (code + 7);
+  ASSERT (size <= 4096);
+  return size;
+}
+
+/* PCI Express capability registers */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     pci_capability_regs_t header; u16 pcie_capabilities;
+#define PCIE_CAP_VERSION(x)	(((x) >> 0) & 0xf)
+#define PCIE_CAP_DEVICE_TYPE(x)	(((x) >> 4) & 0xf)
+#define PCIE_DEVICE_TYPE_ENDPOINT 0
+#define PCIE_DEVICE_TYPE_LEGACY_ENDPOINT 1
+#define PCIE_DEVICE_TYPE_ROOT_PORT 4
+		     /* Upstream/downstream port of PCI Express switch. */
+#define PCIE_DEVICE_TYPE_SWITCH_UPSTREAM 5
+#define PCIE_DEVICE_TYPE_SWITCH_DOWNSTREAM 6
+#define PCIE_DEVICE_TYPE_PCIE_TO_PCI_BRIDGE 7
+#define PCIE_DEVICE_TYPE_PCI_TO_PCIE_BRIDGE 8
+		     /* Root complex integrated endpoint. */
+#define PCIE_DEVICE_TYPE_ROOT_COMPLEX_ENDPOINT 9
+#define PCIE_DEVICE_TYPE_ROOT_COMPLEX_EVENT_COLLECTOR 10
+#define PCIE_CAP_SLOW_IMPLEMENTED (1 << 8)
+#define PCIE_CAP_MSI_IRQ(x) (((x) >> 9) & 0x1f)
+		     u32 dev_capabilities;
+#define PCIE_DEVCAP_MAX_PAYLOAD(x) (128 << (((x) >> 0) & 0x7))
+#define PCIE_DEVCAP_PHANTOM_BITS(x) (((x) >> 3) & 0x3)
+#define PCIE_DEVCAP_EXTENTED_TAG (1 << 5)
+#define PCIE_DEVCAP_L0S	0x1c0	/* L0s Acceptable Latency */
+#define PCIE_DEVCAP_L1	0xe00	/* L1 Acceptable Latency */
+#define PCIE_DEVCAP_ATN_BUT	0x1000	/* Attention Button Present */
+#define PCIE_DEVCAP_ATN_IND	0x2000	/* Attention Indicator Present */
+#define PCIE_DEVCAP_PWR_IND	0x4000	/* Power Indicator Present */
+#define PCIE_DEVCAP_PWR_VAL	0x3fc0000	/* Slot Power Limit Value */
+#define PCIE_DEVCAP_PWR_SCL	0xc000000	/* Slot Power Limit Scale */
+		     u16 dev_control;
+#define PCIE_CTRL_CERE	0x0001	/* Correctable Error Reporting En. */
+#define PCIE_CTRL_NFERE	0x0002	/* Non-Fatal Error Reporting Enable */
+#define PCIE_CTRL_FERE	0x0004	/* Fatal Error Reporting Enable */
+#define PCIE_CTRL_URRE	0x0008	/* Unsupported Request Reporting En. */
+#define PCIE_CTRL_RELAX_EN 0x0010	/* Enable relaxed ordering */
+#define PCIE_CTRL_MAX_PAYLOAD(n) (((n) & 7) << 5)
+#define PCIE_CTRL_EXT_TAG	0x0100	/* Extended Tag Field Enable */
+#define PCIE_CTRL_PHANTOM	0x0200	/* Phantom Functions Enable */
+#define PCIE_CTRL_AUX_PME	0x0400	/* Auxiliary Power PM Enable */
+#define PCIE_CTRL_NOSNOOP_EN	0x0800	/* Enable No Snoop */
+#define PCIE_CTRL_MAX_READ_REQUEST(n) (((n) & 7) << 12)
+		     u16 dev_status;
+#define PCIE_DEVSTA_AUXPD	0x10	/* AUX Power Detected */
+#define PCIE_DEVSTA_TRPND	0x20	/* Transactions Pending */
+		     u32 link_capabilities; u16 link_control; u16 link_status;
+		     u32 slot_capabilities;
+		     u16 slot_control; u16 slot_status; u16 root_control;
+#define PCIE_RTCTL_SECEE	0x01	/* System Error on Correctable Error */
+#define PCIE_RTCTL_SENFEE	0x02	/* System Error on Non-Fatal Error */
+#define PCIE_RTCTL_SEFEE	0x04	/* System Error on Fatal Error */
+#define PCIE_RTCTL_PMEIE	0x08	/* PME Interrupt Enable */
+#define PCIE_RTCTL_CRSSVE	0x10	/* CRS Software Visibility Enable */
+		     u16 root_capabilities;
+		     u32 root_status;
+		     u32 dev_capabilities2;
+		     u16 dev_control2;
+		     u16 dev_status2;
+		     u32 link_capabilities2;
+		     u16 link_control2;
+		     u16 link_status2;
+		     u32 slot_capabilities2; u16 slot_control2;
+		     u16 slot_status2;}) pcie_config_regs_t;
+/* *INDENT-ON* */
+
+/* PCI express extended capabilities. */
+typedef enum pcie_capability_type
+{
+  PCIE_CAP_ADVANCED_ERROR = 1,
+  PCIE_CAP_VC = 2,
+  PCIE_CAP_DSN = 3,
+  PCIE_CAP_PWR = 4,
+} pcie_capability_type_t;
+
+/* Common header for capabilities. */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+enum pcie_capability_type type:16; u16 version: 4; u16 next_capability:12;})
+  /* *INDENT-ON* */
+pcie_capability_regs_t;
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     pcie_capability_regs_t header; u32 uncorrectable_status;
+#define PCIE_ERROR_UNC_LINK_TRAINING 		(1 << 0)
+#define PCIE_ERROR_UNC_DATA_LINK_PROTOCOL 	(1 << 4)
+#define PCIE_ERROR_UNC_SURPRISE_DOWN		(1 << 5)
+#define PCIE_ERROR_UNC_POISONED_TLP		(1 << 12)
+#define PCIE_ERROR_UNC_FLOW_CONTROL		(1 << 13)
+#define PCIE_ERROR_UNC_COMPLETION_TIMEOUT	(1 << 14)
+#define PCIE_ERROR_UNC_COMPLETER_ABORT		(1 << 15)
+#define PCIE_ERROR_UNC_UNEXPECTED_COMPLETION	(1 << 16)
+#define PCIE_ERROR_UNC_RX_OVERFLOW		(1 << 17)
+#define PCIE_ERROR_UNC_MALFORMED_TLP		(1 << 18)
+#define PCIE_ERROR_UNC_CRC_ERROR		(1 << 19)
+#define PCIE_ERROR_UNC_UNSUPPORTED_REQUEST	(1 << 20)
+		     u32 uncorrectable_mask;
+		     u32 uncorrectable_severity; u32 correctable_status;
+#define PCIE_ERROR_COR_RX_ERROR		(1 << 0)
+#define PCIE_ERROR_COR_BAD_TLP		(1 << 6)
+#define PCIE_ERROR_COR_BAD_DLLP		(1 << 7)
+#define PCIE_ERROR_COR_REPLAY_ROLLOVER	(1 << 8)
+#define PCIE_ERROR_COR_REPLAY_TIMER	(1 << 12)
+#define PCIE_ERROR_COR_ADVISORY		(1 << 13)
+		     u32 correctable_mask;
+		     u32 control;
+		     u32 log[4];
+		     u32 root_command;
+		     u32 root_status; u16 correctable_error_source;
+		     u16 error_source;}) pcie_advanced_error_regs_t;
+/* *INDENT-ON* */
+
+/* Virtual Channel */
+#define PCI_VC_PORT_REG1	4
+#define PCI_VC_PORT_REG2	8
+#define PCI_VC_PORT_CTRL	12
+#define PCI_VC_PORT_STATUS	14
+#define PCI_VC_RES_CAP		16
+#define PCI_VC_RES_CTRL		20
+#define PCI_VC_RES_STATUS	26
+
+/* Power Budgeting */
+#define PCI_PWR_DSR		4	/* Data Select Register */
+#define PCI_PWR_DATA		8	/* Data Register */
+#define PCI_PWR_DATA_BASE(x)	((x) & 0xff)	/* Base Power */
+#define PCI_PWR_DATA_SCALE(x)	(((x) >> 8) & 3)	/* Data Scale */
+#define PCI_PWR_DATA_PM_SUB(x)	(((x) >> 10) & 7)	/* PM Sub State */
+#define PCI_PWR_DATA_PM_STATE(x) (((x) >> 13) & 3)	/* PM State */
+#define PCI_PWR_DATA_TYPE(x)	(((x) >> 15) & 7)	/* Type */
+#define PCI_PWR_DATA_RAIL(x)	(((x) >> 18) & 7)	/* Power Rail */
+#define PCI_PWR_CAP		12	/* Capability */
+#define PCI_PWR_CAP_BUDGET(x)	((x) & 1)	/* Included in system budget */
+
+#endif /* included_vlib_pci_config_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/physmem.h b/src/vlib/physmem.h
new file mode 100644
index 00000000..9e7d52a6
--- /dev/null
+++ b/src/vlib/physmem.h
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * physmem.h: virtual <-> physical memory mapping for VLIB buffers
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_physmem_h
+#define included_vlib_physmem_h
+
+typedef struct
+{
+  uword start, end, size;
+} vlib_physmem_region_t;
+
+typedef struct
+{
+  vlib_physmem_region_t virtual;
+
+  uword log2_n_bytes_per_page;
+
+  /* 1 << log2_n_bytes_per_page - 1. */
+  uword page_mask;
+
+  u64 *page_table;
+
+  /* is fake physmem */
+  u8 is_fake;
+} vlib_physmem_main_t;
+
+always_inline u64
+vlib_physmem_offset_to_physical (vlib_physmem_main_t * pm, uword o)
+{
+  uword page_index = o >> pm->log2_n_bytes_per_page;
+  ASSERT (o < pm->virtual.size);
+  ASSERT (pm->page_table[page_index] != 0);
+  return (vec_elt (pm->page_table, page_index) + (o & pm->page_mask));
+}
+
+always_inline int
+vlib_physmem_is_virtual (vlib_physmem_main_t * pm, uword p)
+{
+  return p >= pm->virtual.start && p < pm->virtual.end;
+}
+
+always_inline uword
+vlib_physmem_offset_of (vlib_physmem_main_t * pm, void *p)
+{
+  uword a = pointer_to_uword (p);
+  uword o;
+
+  ASSERT (vlib_physmem_is_virtual (pm, a));
+  o = a - pm->virtual.start;
+
+  /* Offset must fit in 32 bits. */
+  ASSERT ((uword) o == a - pm->virtual.start);
+
+  return o;
+}
+
+always_inline void *
+vlib_physmem_at_offset (vlib_physmem_main_t * pm, uword offset)
+{
+  ASSERT (offset < pm->virtual.size);
+  return uword_to_pointer (pm->virtual.start + offset, void *);
+}
+
+#endif /* included_vlib_physmem_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/threads.c b/src/vlib/threads.c
new file mode 100644
index 00000000..c5e58bc0
--- /dev/null
+++ b/src/vlib/threads.c
@@ -0,0 +1,1492 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define _GNU_SOURCE
+
+#include <signal.h>
+#include <math.h>
+#include <vppinfra/format.h>
+#include <vlib/vlib.h>
+
+#include <vlib/threads.h>
+#include <vlib/unix/cj.h>
+
+
+#if DPDK==1
+#include <rte_config.h>
+#include <rte_common.h>
+#include <rte_eal.h>
+#include <rte_launch.h>
+#include <rte_lcore.h>
+#endif
+DECLARE_CJ_GLOBAL_LOG;
+
+#define FRAME_QUEUE_NELTS 32
+
+
+#if DPDK==1
+/*
+ *  Weak definitions of DPDK symbols used in this file.
+ *  Needed for linking test programs without DPDK libs.
+ */
+unsigned __thread __attribute__ ((weak)) RTE_PER_LCORE (_lcore_id);
+struct lcore_config __attribute__ ((weak)) lcore_config[];
+unsigned __attribute__ ((weak)) rte_socket_id ();
+int __attribute__ ((weak)) rte_eal_remote_launch ();
+#endif
+u32
+vl (void *p)
+{
+  return vec_len (p);
+}
+
+vlib_worker_thread_t *vlib_worker_threads;
+vlib_thread_main_t vlib_thread_main;
+
+uword
+os_get_cpu_number (void)
+{
+  void *sp;
+  uword n;
+  u32 len;
+
+  len = vec_len (vlib_thread_stacks);
+  if (len == 0)
+    return 0;
+
+  /* Get any old stack address. */
+  sp = &sp;
+
+  n = ((uword) sp - (uword) vlib_thread_stacks[0])
+    >> VLIB_LOG2_THREAD_STACK_SIZE;
+
+  /* "processes" have their own stacks, and they always run in thread 0 */
+  n = n >= len ? 0 : n;
+
+  return n;
+}
+
+uword
+os_get_ncpus (void)
+{
+  u32 len;
+
+  len = vec_len (vlib_thread_stacks);
+  if (len == 0)
+    return 1;
+  else
+    return len;
+}
+
+void
+vlib_set_thread_name (char *name)
+{
+  int pthread_setname_np (pthread_t __target_thread, const char *__name);
+  int rv;
+  pthread_t thread = pthread_self ();
+
+  if (thread)
+    {
+      rv = pthread_setname_np (thread, name);
+      if (rv)
+	clib_warning ("pthread_setname_np returned %d", rv);
+    }
+}
+
+static int
+sort_registrations_by_no_clone (void *a0, void *a1)
+{
+  vlib_thread_registration_t **tr0 = a0;
+  vlib_thread_registration_t **tr1 = a1;
+
+  return ((i32) ((*tr0)->no_data_structure_clone)
+	  - ((i32) ((*tr1)->no_data_structure_clone)));
+}
+
+static uword *
+vlib_sysfs_list_to_bitmap (char *filename)
+{
+  FILE *fp;
+  uword *r = 0;
+
+  fp = fopen (filename, "r");
+
+  if (fp != NULL)
+    {
+      u8 *buffer = 0;
+      vec_validate (buffer, 256 - 1);
+      if (fgets ((char *) buffer, 256, fp))
+	{
+	  unformat_input_t in;
+	  unformat_init_string (&in, (char *) buffer,
+				strlen ((char *) buffer));
+	  if (unformat (&in, "%U", unformat_bitmap_list, &r) != 1)
+	    clib_warning ("unformat_bitmap_list failed");
+	  unformat_free (&in);
+	}
+      vec_free (buffer);
+      fclose (fp);
+    }
+  return r;
+}
+
+
+/* Called early in the init sequence */
+
+clib_error_t *
+vlib_thread_init (vlib_main_t * vm)
+{
+  vlib_thread_main_t *tm = &vlib_thread_main;
+  vlib_worker_thread_t *w;
+  vlib_thread_registration_t *tr;
+  u32 n_vlib_mains = 1;
+  u32 first_index = 1;
+  u32 i;
+  uword *avail_cpu;
+
+  /* get bitmaps of active cpu cores and sockets */
+  tm->cpu_core_bitmap =
+    vlib_sysfs_list_to_bitmap ("/sys/devices/system/cpu/online");
+  tm->cpu_socket_bitmap =
+    vlib_sysfs_list_to_bitmap ("/sys/devices/system/node/online");
+
+  avail_cpu = clib_bitmap_dup (tm->cpu_core_bitmap);
+
+  /* skip cores */
+  for (i = 0; i < tm->skip_cores; i++)
+    {
+      uword c = clib_bitmap_first_set (avail_cpu);
+      if (c == ~0)
+	return clib_error_return (0, "no available cpus to skip");
+
+      avail_cpu = clib_bitmap_set (avail_cpu, c, 0);
+    }
+
+  /* grab cpu for main thread */
+  if (!tm->main_lcore)
+    {
+      tm->main_lcore = clib_bitmap_first_set (avail_cpu);
+      if (tm->main_lcore == (u8) ~ 0)
+	return clib_error_return (0, "no available cpus to be used for the"
+				  " main thread");
+    }
+  else
+    {
+      if (clib_bitmap_get (avail_cpu, tm->main_lcore) == 0)
+	return clib_error_return (0, "cpu %u is not available to be used"
+				  " for the main thread", tm->main_lcore);
+    }
+  avail_cpu = clib_bitmap_set (avail_cpu, tm->main_lcore, 0);
+
+  /* assume that there is socket 0 only if there is no data from sysfs */
+  if (!tm->cpu_socket_bitmap)
+    tm->cpu_socket_bitmap = clib_bitmap_set (0, 0, 1);
+
+  /* pin main thread to main_lcore  */
+#if DPDK==0
+  {
+    cpu_set_t cpuset;
+    CPU_ZERO (&cpuset);
+    CPU_SET (tm->main_lcore, &cpuset);
+    pthread_setaffinity_np (pthread_self (), sizeof (cpu_set_t), &cpuset);
+  }
+#endif
+
+  /* as many threads as stacks... */
+  vec_validate_aligned (vlib_worker_threads, vec_len (vlib_thread_stacks) - 1,
+			CLIB_CACHE_LINE_BYTES);
+
+  /* Preallocate thread 0 */
+  _vec_len (vlib_worker_threads) = 1;
+  w = vlib_worker_threads;
+  w->thread_mheap = clib_mem_get_heap ();
+  w->thread_stack = vlib_thread_stacks[0];
+  w->lcore_id = tm->main_lcore;
+  w->lwp = syscall (SYS_gettid);
+  w->thread_id = pthread_self ();
+  tm->n_vlib_mains = 1;
+
+  if (tm->sched_policy != ~0)
+    {
+      struct sched_param sched_param;
+      if (!sched_getparam (w->lwp, &sched_param))
+	{
+	  if (tm->sched_priority != ~0)
+	    sched_param.sched_priority = tm->sched_priority;
+	  sched_setscheduler (w->lwp, tm->sched_policy, &sched_param);
+	}
+    }
+
+  /* assign threads to cores and set n_vlib_mains */
+  tr = tm->next;
+
+  while (tr)
+    {
+      vec_add1 (tm->registrations, tr);
+      tr = tr->next;
+    }
+
+  vec_sort_with_function (tm->registrations, sort_registrations_by_no_clone);
+
+  for (i = 0; i < vec_len (tm->registrations); i++)
+    {
+      int j;
+      tr = tm->registrations[i];
+      tr->first_index = first_index;
+      first_index += tr->count;
+      n_vlib_mains += (tr->no_data_structure_clone == 0) ? tr->count : 0;
+
+      /* construct coremask */
+      if (tr->use_pthreads || !tr->count)
+	continue;
+
+      if (tr->coremask)
+	{
+	  uword c;
+          /* *INDENT-OFF* */
+          clib_bitmap_foreach (c, tr->coremask, ({
+            if (clib_bitmap_get(avail_cpu, c) == 0)
+              return clib_error_return (0, "cpu %u is not available to be used"
+                                        " for the '%s' thread",c, tr->name);
+
+            avail_cpu = clib_bitmap_set(avail_cpu, c, 0);
+          }));
+/* *INDENT-ON* */
+
+	}
+      else
+	{
+	  for (j = 0; j < tr->count; j++)
+	    {
+	      uword c = clib_bitmap_first_set (avail_cpu);
+	      if (c == ~0)
+		return clib_error_return (0,
+					  "no available cpus to be used for"
+					  " the '%s' thread", tr->name);
+
+	      avail_cpu = clib_bitmap_set (avail_cpu, c, 0);
+	      tr->coremask = clib_bitmap_set (tr->coremask, c, 1);
+	    }
+	}
+    }
+
+  clib_bitmap_free (avail_cpu);
+
+  tm->n_vlib_mains = n_vlib_mains;
+
+  vec_validate_aligned (vlib_worker_threads, first_index - 1,
+			CLIB_CACHE_LINE_BYTES);
+
+  return 0;
+}
+
+vlib_worker_thread_t *
+vlib_alloc_thread (vlib_main_t * vm)
+{
+  vlib_worker_thread_t *w;
+
+  if (vec_len (vlib_worker_threads) >= vec_len (vlib_thread_stacks))
+    {
+      clib_warning ("out of worker threads... Quitting...");
+      exit (1);
+    }
+  vec_add2 (vlib_worker_threads, w, 1);
+  w->thread_stack = vlib_thread_stacks[w - vlib_worker_threads];
+  return w;
+}
+
+vlib_frame_queue_t *
+vlib_frame_queue_alloc (int nelts)
+{
+  vlib_frame_queue_t *fq;
+
+  fq = clib_mem_alloc_aligned (sizeof (*fq), CLIB_CACHE_LINE_BYTES);
+  memset (fq, 0, sizeof (*fq));
+  fq->nelts = nelts;
+  fq->vector_threshold = 128;	// packets
+  vec_validate_aligned (fq->elts, nelts - 1, CLIB_CACHE_LINE_BYTES);
+
+  if (1)
+    {
+      if (((uword) & fq->tail) & (CLIB_CACHE_LINE_BYTES - 1))
+	fformat (stderr, "WARNING: fq->tail unaligned\n");
+      if (((uword) & fq->head) & (CLIB_CACHE_LINE_BYTES - 1))
+	fformat (stderr, "WARNING: fq->head unaligned\n");
+      if (((uword) fq->elts) & (CLIB_CACHE_LINE_BYTES - 1))
+	fformat (stderr, "WARNING: fq->elts unaligned\n");
+
+      if (sizeof (fq->elts[0]) % CLIB_CACHE_LINE_BYTES)
+	fformat (stderr, "WARNING: fq->elts[0] size %d\n",
+		 sizeof (fq->elts[0]));
+      if (nelts & (nelts - 1))
+	{
+	  fformat (stderr, "FATAL: nelts MUST be a power of 2\n");
+	  abort ();
+	}
+    }
+
+  return (fq);
+}
+
+void vl_msg_api_handler_no_free (void *) __attribute__ ((weak));
+void
+vl_msg_api_handler_no_free (void *v)
+{
+}
+
+/* Turned off, save as reference material... */
+#if 0
+static inline int
+vlib_frame_queue_dequeue_internal (int thread_id,
+				   vlib_main_t * vm, vlib_node_main_t * nm)
+{
+  vlib_frame_queue_t *fq = vlib_frame_queues[thread_id];
+  vlib_frame_queue_elt_t *elt;
+  vlib_frame_t *f;
+  vlib_pending_frame_t *p;
+  vlib_node_runtime_t *r;
+  u32 node_runtime_index;
+  int msg_type;
+  u64 before;
+  int processed = 0;
+
+  ASSERT (vm == vlib_mains[thread_id]);
+
+  while (1)
+    {
+      if (fq->head == fq->tail)
+	return processed;
+
+      elt = fq->elts + ((fq->head + 1) & (fq->nelts - 1));
+
+      if (!elt->valid)
+	return processed;
+
+      before = clib_cpu_time_now ();
+
+      f = elt->frame;
+      node_runtime_index = elt->node_runtime_index;
+      msg_type = elt->msg_type;
+
+      switch (msg_type)
+	{
+	case VLIB_FRAME_QUEUE_ELT_FREE_BUFFERS:
+	  vlib_buffer_free (vm, vlib_frame_vector_args (f), f->n_vectors);
+	  /* note fallthrough... */
+	case VLIB_FRAME_QUEUE_ELT_FREE_FRAME:
+	  r = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL],
+				node_runtime_index);
+	  vlib_frame_free (vm, r, f);
+	  break;
+	case VLIB_FRAME_QUEUE_ELT_DISPATCH_FRAME:
+	  vec_add2 (vm->node_main.pending_frames, p, 1);
+	  f->flags |= (VLIB_FRAME_PENDING | VLIB_FRAME_FREE_AFTER_DISPATCH);
+	  p->node_runtime_index = elt->node_runtime_index;
+	  p->frame_index = vlib_frame_index (vm, f);
+	  p->next_frame_index = VLIB_PENDING_FRAME_NO_NEXT_FRAME;
+	  fq->dequeue_vectors += (u64) f->n_vectors;
+	  break;
+	case VLIB_FRAME_QUEUE_ELT_API_MSG:
+	  vl_msg_api_handler_no_free (f);
+	  break;
+	default:
+	  clib_warning ("bogus frame queue message, type %d", msg_type);
+	  break;
+	}
+      elt->valid = 0;
+      fq->dequeues++;
+      fq->dequeue_ticks += clib_cpu_time_now () - before;
+      CLIB_MEMORY_BARRIER ();
+      fq->head++;
+      processed++;
+    }
+  ASSERT (0);
+  return processed;
+}
+
+int
+vlib_frame_queue_dequeue (int thread_id,
+			  vlib_main_t * vm, vlib_node_main_t * nm)
+{
+  return vlib_frame_queue_dequeue_internal (thread_id, vm, nm);
+}
+
+int
+vlib_frame_queue_enqueue (vlib_main_t * vm, u32 node_runtime_index,
+			  u32 frame_queue_index, vlib_frame_t * frame,
+			  vlib_frame_queue_msg_type_t type)
+{
+  vlib_frame_queue_t *fq = vlib_frame_queues[frame_queue_index];
+  vlib_frame_queue_elt_t *elt;
+  u32 save_count;
+  u64 new_tail;
+  u64 before = clib_cpu_time_now ();
+
+  ASSERT (fq);
+
+  new_tail = __sync_add_and_fetch (&fq->tail, 1);
+
+  /* Wait until a ring slot is available */
+  while (new_tail >= fq->head + fq->nelts)
+    {
+      f64 b4 = vlib_time_now_ticks (vm, before);
+      vlib_worker_thread_barrier_check (vm, b4);
+      /* Bad idea. Dequeue -> enqueue -> dequeue -> trouble */
+      // vlib_frame_queue_dequeue (vm->cpu_index, vm, nm);
+    }
+
+  elt = fq->elts + (new_tail & (fq->nelts - 1));
+
+  /* this would be very bad... */
+  while (elt->valid)
+    {
+    }
+
+  /* Once we enqueue the frame, frame->n_vectors is owned elsewhere... */
+  save_count = frame->n_vectors;
+
+  elt->frame = frame;
+  elt->node_runtime_index = node_runtime_index;
+  elt->msg_type = type;
+  CLIB_MEMORY_BARRIER ();
+  elt->valid = 1;
+
+  return save_count;
+}
+#endif /* 0 */
+
+/* To be called by vlib worker threads upon startup */
+void
+vlib_worker_thread_init (vlib_worker_thread_t * w)
+{
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+
+  /*
+   * Note: disabling signals in worker threads as follows
+   * prevents the api post-mortem dump scheme from working
+   * {
+   *    sigset_t s;
+   *    sigfillset (&s);
+   *    pthread_sigmask (SIG_SETMASK, &s, 0);
+   *  }
+   */
+
+  clib_mem_set_heap (w->thread_mheap);
+
+  if (vec_len (tm->thread_prefix) && w->registration->short_name)
+    {
+      w->name = format (0, "%v_%s_%d%c", tm->thread_prefix,
+			w->registration->short_name, w->instance_id, '\0');
+      vlib_set_thread_name ((char *) w->name);
+    }
+
+  if (!w->registration->use_pthreads)
+    {
+
+      /* Initial barrier sync, for both worker and i/o threads */
+      clib_smp_atomic_add (vlib_worker_threads->workers_at_barrier, 1);
+
+      while (*vlib_worker_threads->wait_at_barrier)
+	;
+
+      clib_smp_atomic_add (vlib_worker_threads->workers_at_barrier, -1);
+    }
+}
+
+void *
+vlib_worker_thread_bootstrap_fn (void *arg)
+{
+  void *rv;
+  vlib_worker_thread_t *w = arg;
+
+  w->lwp = syscall (SYS_gettid);
+  w->thread_id = pthread_self ();
+
+  rv = (void *) clib_calljmp
+    ((uword (*)(uword)) w->thread_function,
+     (uword) arg, w->thread_stack + VLIB_THREAD_STACK_SIZE);
+  /* NOTREACHED, we hope */
+  return rv;
+}
+
+static int
+vlib_launch_thread (void *fp, vlib_worker_thread_t * w, unsigned lcore_id)
+{
+  void *(*fp_arg) (void *) = fp;
+
+  w->lcore_id = lcore_id;
+#if DPDK==1
+  if (!w->registration->use_pthreads)
+    if (rte_eal_remote_launch)	/* do we have dpdk linked */
+      return rte_eal_remote_launch (fp, (void *) w, lcore_id);
+    else
+      return -1;
+  else
+#endif
+    {
+      int ret;
+      pthread_t worker;
+      cpu_set_t cpuset;
+      CPU_ZERO (&cpuset);
+      CPU_SET (lcore_id, &cpuset);
+
+      ret = pthread_create (&worker, NULL /* attr */ , fp_arg, (void *) w);
+      if (ret == 0)
+	return pthread_setaffinity_np (worker, sizeof (cpu_set_t), &cpuset);
+      else
+	return ret;
+    }
+}
+
+static clib_error_t *
+start_workers (vlib_main_t * vm)
+{
+  int i, j;
+  vlib_worker_thread_t *w;
+  vlib_main_t *vm_clone;
+  void *oldheap;
+  vlib_thread_main_t *tm = &vlib_thread_main;
+  vlib_thread_registration_t *tr;
+  vlib_node_runtime_t *rt;
+  u32 n_vlib_mains = tm->n_vlib_mains;
+  u32 worker_thread_index;
+  u8 *main_heap = clib_mem_get_per_cpu_heap ();
+  mheap_t *main_heap_header = mheap_header (main_heap);
+
+  vec_reset_length (vlib_worker_threads);
+
+  /* Set up the main thread */
+  vec_add2_aligned (vlib_worker_threads, w, 1, CLIB_CACHE_LINE_BYTES);
+  w->elog_track.name = "main thread";
+  elog_track_register (&vm->elog_main, &w->elog_track);
+
+  if (vec_len (tm->thread_prefix))
+    {
+      w->name = format (0, "%v_main%c", tm->thread_prefix, '\0');
+      vlib_set_thread_name ((char *) w->name);
+    }
+
+  /*
+   * Truth of the matter: we always use at least two
+   * threads. So, make the main heap thread-safe
+   * and make the event log thread-safe.
+   */
+  main_heap_header->flags |= MHEAP_FLAG_THREAD_SAFE;
+  vm->elog_main.lock =
+    clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
+  vm->elog_main.lock[0] = 0;
+
+  if (n_vlib_mains > 1)
+    {
+      vec_validate (vlib_mains, tm->n_vlib_mains - 1);
+      _vec_len (vlib_mains) = 0;
+      vec_add1 (vlib_mains, vm);
+
+      vlib_worker_threads->wait_at_barrier =
+	clib_mem_alloc_aligned (sizeof (u32), CLIB_CACHE_LINE_BYTES);
+      vlib_worker_threads->workers_at_barrier =
+	clib_mem_alloc_aligned (sizeof (u32), CLIB_CACHE_LINE_BYTES);
+
+      /* Ask for an initial barrier sync */
+      *vlib_worker_threads->workers_at_barrier = 0;
+      *vlib_worker_threads->wait_at_barrier = 1;
+
+      worker_thread_index = 1;
+
+      for (i = 0; i < vec_len (tm->registrations); i++)
+	{
+	  vlib_node_main_t *nm, *nm_clone;
+	  vlib_buffer_main_t *bm_clone;
+	  vlib_buffer_free_list_t *fl_clone, *fl_orig;
+	  vlib_buffer_free_list_t *orig_freelist_pool;
+	  int k;
+
+	  tr = tm->registrations[i];
+
+	  if (tr->count == 0)
+	    continue;
+
+	  for (k = 0; k < tr->count; k++)
+	    {
+	      vec_add2 (vlib_worker_threads, w, 1);
+	      if (tr->mheap_size)
+		w->thread_mheap =
+		  mheap_alloc (0 /* use VM */ , tr->mheap_size);
+	      else
+		w->thread_mheap = main_heap;
+	      w->thread_stack = vlib_thread_stacks[w - vlib_worker_threads];
+	      w->thread_function = tr->function;
+	      w->thread_function_arg = w;
+	      w->instance_id = k;
+	      w->registration = tr;
+
+	      w->elog_track.name =
+		(char *) format (0, "%s %d", tr->name, k + 1);
+	      vec_add1 (w->elog_track.name, 0);
+	      elog_track_register (&vm->elog_main, &w->elog_track);
+
+	      if (tr->no_data_structure_clone)
+		continue;
+
+	      /* Fork vlib_global_main et al. Look for bugs here */
+	      oldheap = clib_mem_set_heap (w->thread_mheap);
+
+	      vm_clone = clib_mem_alloc (sizeof (*vm_clone));
+	      clib_memcpy (vm_clone, vlib_mains[0], sizeof (*vm_clone));
+
+	      vm_clone->cpu_index = worker_thread_index;
+	      vm_clone->heap_base = w->thread_mheap;
+	      vm_clone->mbuf_alloc_list = 0;
+	      memset (&vm_clone->random_buffer, 0,
+		      sizeof (vm_clone->random_buffer));
+
+	      nm = &vlib_mains[0]->node_main;
+	      nm_clone = &vm_clone->node_main;
+	      /* fork next frames array, preserving node runtime indices */
+	      nm_clone->next_frames = vec_dup (nm->next_frames);
+	      for (j = 0; j < vec_len (nm_clone->next_frames); j++)
+		{
+		  vlib_next_frame_t *nf = &nm_clone->next_frames[j];
+		  u32 save_node_runtime_index;
+		  u32 save_flags;
+
+		  save_node_runtime_index = nf->node_runtime_index;
+		  save_flags = nf->flags & VLIB_FRAME_NO_FREE_AFTER_DISPATCH;
+		  vlib_next_frame_init (nf);
+		  nf->node_runtime_index = save_node_runtime_index;
+		  nf->flags = save_flags;
+		}
+
+	      /* fork the frame dispatch queue */
+	      nm_clone->pending_frames = 0;
+	      vec_validate (nm_clone->pending_frames, 10);	/* $$$$$?????? */
+	      _vec_len (nm_clone->pending_frames) = 0;
+
+	      /* fork nodes */
+	      nm_clone->nodes = 0;
+	      for (j = 0; j < vec_len (nm->nodes); j++)
+		{
+		  vlib_node_t *n;
+		  n = clib_mem_alloc_no_fail (sizeof (*n));
+		  clib_memcpy (n, nm->nodes[j], sizeof (*n));
+		  /* none of the copied nodes have enqueue rights given out */
+		  n->owner_node_index = VLIB_INVALID_NODE_INDEX;
+		  memset (&n->stats_total, 0, sizeof (n->stats_total));
+		  memset (&n->stats_last_clear, 0,
+			  sizeof (n->stats_last_clear));
+		  vec_add1 (nm_clone->nodes, n);
+		}
+	      nm_clone->nodes_by_type[VLIB_NODE_TYPE_INTERNAL] =
+		vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL]);
+
+	      nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT] =
+		vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT]);
+	      vec_foreach (rt, nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT])
+		rt->cpu_index = vm_clone->cpu_index;
+
+	      nm_clone->processes = vec_dup (nm->processes);
+
+	      /* zap the (per worker) frame freelists, etc */
+	      nm_clone->frame_sizes = 0;
+	      nm_clone->frame_size_hash = 0;
+
+	      /* Packet trace buffers are guaranteed to be empty, nothing to do here */
+
+	      clib_mem_set_heap (oldheap);
+	      vec_add1 (vlib_mains, vm_clone);
+
+	      vm_clone->error_main.counters =
+		vec_dup (vlib_mains[0]->error_main.counters);
+	      vm_clone->error_main.counters_last_clear =
+		vec_dup (vlib_mains[0]->error_main.counters_last_clear);
+
+	      /* Fork the vlib_buffer_main_t free lists, etc. */
+	      bm_clone = vec_dup (vm_clone->buffer_main);
+	      vm_clone->buffer_main = bm_clone;
+
+	      orig_freelist_pool = bm_clone->buffer_free_list_pool;
+	      bm_clone->buffer_free_list_pool = 0;
+
+            /* *INDENT-OFF* */
+            pool_foreach (fl_orig, orig_freelist_pool,
+                          ({
+                            pool_get_aligned (bm_clone->buffer_free_list_pool,
+                                              fl_clone, CLIB_CACHE_LINE_BYTES);
+                            ASSERT (fl_orig - orig_freelist_pool
+                                    == fl_clone - bm_clone->buffer_free_list_pool);
+
+                            fl_clone[0] = fl_orig[0];
+                            fl_clone->aligned_buffers = 0;
+                            fl_clone->unaligned_buffers = 0;
+                            fl_clone->n_alloc = 0;
+                          }));
+/* *INDENT-ON* */
+
+	      worker_thread_index++;
+	    }
+	}
+    }
+  else
+    {
+      /* only have non-data-structure copy threads to create... */
+      for (i = 0; i < vec_len (tm->registrations); i++)
+	{
+	  tr = tm->registrations[i];
+
+	  for (j = 0; j < tr->count; j++)
+	    {
+	      vec_add2 (vlib_worker_threads, w, 1);
+	      if (tr->mheap_size)
+		w->thread_mheap =
+		  mheap_alloc (0 /* use VM */ , tr->mheap_size);
+	      else
+		w->thread_mheap = main_heap;
+	      w->thread_stack = vlib_thread_stacks[w - vlib_worker_threads];
+	      w->thread_function = tr->function;
+	      w->thread_function_arg = w;
+	      w->instance_id = j;
+	      w->elog_track.name =
+		(char *) format (0, "%s %d", tr->name, j + 1);
+	      w->registration = tr;
+	      vec_add1 (w->elog_track.name, 0);
+	      elog_track_register (&vm->elog_main, &w->elog_track);
+	    }
+	}
+    }
+
+  worker_thread_index = 1;
+
+  for (i = 0; i < vec_len (tm->registrations); i++)
+    {
+      int j;
+
+      tr = tm->registrations[i];
+
+      if (tr->use_pthreads || tm->use_pthreads)
+	{
+	  for (j = 0; j < tr->count; j++)
+	    {
+	      w = vlib_worker_threads + worker_thread_index++;
+	      if (vlib_launch_thread (vlib_worker_thread_bootstrap_fn, w, 0) <
+		  0)
+		clib_warning ("Couldn't start '%s' pthread ", tr->name);
+	    }
+	}
+      else
+	{
+	  uword c;
+            /* *INDENT-OFF* */
+            clib_bitmap_foreach (c, tr->coremask, ({
+              w = vlib_worker_threads + worker_thread_index++;
+              if (vlib_launch_thread (vlib_worker_thread_bootstrap_fn, w, c) < 0)
+                clib_warning ("Couldn't start DPDK lcore %d", c);
+
+            }));
+/* *INDENT-ON* */
+	}
+    }
+  vlib_worker_thread_barrier_sync (vm);
+  vlib_worker_thread_barrier_release (vm);
+  return 0;
+}
+
+VLIB_MAIN_LOOP_ENTER_FUNCTION (start_workers);
+
+void
+vlib_worker_thread_node_runtime_update (void)
+{
+  int i, j;
+  vlib_worker_thread_t *w;
+  vlib_main_t *vm;
+  vlib_node_main_t *nm, *nm_clone;
+  vlib_node_t **old_nodes_clone;
+  vlib_main_t *vm_clone;
+  vlib_node_runtime_t *rt, *old_rt;
+  void *oldheap;
+  never_inline void
+    vlib_node_runtime_sync_stats (vlib_main_t * vm,
+				  vlib_node_runtime_t * r,
+				  uword n_calls,
+				  uword n_vectors, uword n_clocks);
+
+  ASSERT (os_get_cpu_number () == 0);
+
+  if (vec_len (vlib_mains) == 0)
+    return;
+
+  vm = vlib_mains[0];
+  nm = &vm->node_main;
+
+  ASSERT (os_get_cpu_number () == 0);
+  ASSERT (*vlib_worker_threads->wait_at_barrier == 1);
+
+  /*
+   * Scrape all runtime stats, so we don't lose node runtime(s) with
+   * pending counts, or throw away worker / io thread counts.
+   */
+  for (j = 0; j < vec_len (nm->nodes); j++)
+    {
+      vlib_node_t *n;
+      n = nm->nodes[j];
+      vlib_node_sync_stats (vm, n);
+    }
+
+  for (i = 1; i < vec_len (vlib_mains); i++)
+    {
+      vlib_node_t *n;
+
+      vm_clone = vlib_mains[i];
+      nm_clone = &vm_clone->node_main;
+
+      for (j = 0; j < vec_len (nm_clone->nodes); j++)
+	{
+	  n = nm_clone->nodes[j];
+
+	  rt = vlib_node_get_runtime (vm_clone, n->index);
+	  vlib_node_runtime_sync_stats (vm_clone, rt, 0, 0, 0);
+	}
+    }
+
+  for (i = 1; i < vec_len (vlib_mains); i++)
+    {
+      vlib_node_runtime_t *rt;
+      w = vlib_worker_threads + i;
+      oldheap = clib_mem_set_heap (w->thread_mheap);
+
+      vm_clone = vlib_mains[i];
+
+      /* Re-clone error heap */
+      u64 *old_counters = vm_clone->error_main.counters;
+      u64 *old_counters_all_clear = vm_clone->error_main.counters_last_clear;
+      clib_memcpy (&vm_clone->error_main, &vm->error_main,
+		   sizeof (vm->error_main));
+      j = vec_len (vm->error_main.counters) - 1;
+      vec_validate_aligned (old_counters, j, CLIB_CACHE_LINE_BYTES);
+      vec_validate_aligned (old_counters_all_clear, j, CLIB_CACHE_LINE_BYTES);
+      vm_clone->error_main.counters = old_counters;
+      vm_clone->error_main.counters_last_clear = old_counters_all_clear;
+
+      nm_clone = &vm_clone->node_main;
+      vec_free (nm_clone->next_frames);
+      nm_clone->next_frames = vec_dup (nm->next_frames);
+
+      for (j = 0; j < vec_len (nm_clone->next_frames); j++)
+	{
+	  vlib_next_frame_t *nf = &nm_clone->next_frames[j];
+	  u32 save_node_runtime_index;
+	  u32 save_flags;
+
+	  save_node_runtime_index = nf->node_runtime_index;
+	  save_flags = nf->flags & VLIB_FRAME_NO_FREE_AFTER_DISPATCH;
+	  vlib_next_frame_init (nf);
+	  nf->node_runtime_index = save_node_runtime_index;
+	  nf->flags = save_flags;
+	}
+
+      old_nodes_clone = nm_clone->nodes;
+      nm_clone->nodes = 0;
+
+      /* re-fork nodes */
+      for (j = 0; j < vec_len (nm->nodes); j++)
+	{
+	  vlib_node_t *old_n_clone;
+	  vlib_node_t *new_n, *new_n_clone;
+
+	  new_n = nm->nodes[j];
+	  old_n_clone = old_nodes_clone[j];
+
+	  new_n_clone = clib_mem_alloc_no_fail (sizeof (*new_n_clone));
+	  clib_memcpy (new_n_clone, new_n, sizeof (*new_n));
+	  /* none of the copied nodes have enqueue rights given out */
+	  new_n_clone->owner_node_index = VLIB_INVALID_NODE_INDEX;
+
+	  if (j >= vec_len (old_nodes_clone))
+	    {
+	      /* new node, set to zero */
+	      memset (&new_n_clone->stats_total, 0,
+		      sizeof (new_n_clone->stats_total));
+	      memset (&new_n_clone->stats_last_clear, 0,
+		      sizeof (new_n_clone->stats_last_clear));
+	    }
+	  else
+	    {
+	      /* Copy stats if the old data is valid */
+	      clib_memcpy (&new_n_clone->stats_total,
+			   &old_n_clone->stats_total,
+			   sizeof (new_n_clone->stats_total));
+	      clib_memcpy (&new_n_clone->stats_last_clear,
+			   &old_n_clone->stats_last_clear,
+			   sizeof (new_n_clone->stats_last_clear));
+
+	      /* keep previous node state */
+	      new_n_clone->state = old_n_clone->state;
+	    }
+	  vec_add1 (nm_clone->nodes, new_n_clone);
+	}
+      /* Free the old node clone */
+      for (j = 0; j < vec_len (old_nodes_clone); j++)
+	clib_mem_free (old_nodes_clone[j]);
+      vec_free (old_nodes_clone);
+
+      vec_free (nm_clone->nodes_by_type[VLIB_NODE_TYPE_INTERNAL]);
+
+      nm_clone->nodes_by_type[VLIB_NODE_TYPE_INTERNAL] =
+	vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL]);
+
+      /* clone input node runtime */
+      old_rt = nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT];
+
+      nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT] =
+	vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT]);
+
+      vec_foreach (rt, nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT])
+      {
+	rt->cpu_index = vm_clone->cpu_index;
+      }
+
+      for (j = 0; j < vec_len (old_rt); j++)
+	{
+	  rt = vlib_node_get_runtime (vm_clone, old_rt[j].node_index);
+	  rt->state = old_rt[j].state;
+	}
+
+      vec_free (old_rt);
+
+      nm_clone->processes = vec_dup (nm->processes);
+
+      clib_mem_set_heap (oldheap);
+
+      // vnet_main_fork_fixup (i);
+    }
+}
+
+u32
+unformat_sched_policy (unformat_input_t * input, va_list * args)
+{
+  u32 *r = va_arg (*args, u32 *);
+
+  if (0);
+#define _(v,f,s) else if (unformat (input, s)) *r = SCHED_POLICY_##f;
+  foreach_sched_policy
+#undef _
+    else
+    return 0;
+  return 1;
+}
+
+static clib_error_t *
+cpu_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  vlib_thread_registration_t *tr;
+  uword *p;
+  vlib_thread_main_t *tm = &vlib_thread_main;
+  u8 *name;
+  u64 coremask;
+  uword *bitmap;
+  u32 count;
+
+  tm->thread_registrations_by_name = hash_create_string (0, sizeof (uword));
+
+  tm->n_thread_stacks = 1;	/* account for main thread */
+  tm->sched_policy = ~0;
+  tm->sched_priority = ~0;
+
+  tr = tm->next;
+
+  while (tr)
+    {
+      hash_set_mem (tm->thread_registrations_by_name, tr->name, (uword) tr);
+      tr = tr->next;
+    }
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "use-pthreads"))
+	tm->use_pthreads = 1;
+      else if (unformat (input, "thread-prefix %v", &tm->thread_prefix))
+	;
+      else if (unformat (input, "main-core %u", &tm->main_lcore))
+	;
+      else if (unformat (input, "skip-cores %u", &tm->skip_cores))
+	;
+      else if (unformat (input, "coremask-%s %llx", &name, &coremask))
+	{
+	  p = hash_get_mem (tm->thread_registrations_by_name, name);
+	  if (p == 0)
+	    return clib_error_return (0, "no such thread type '%s'", name);
+
+	  tr = (vlib_thread_registration_t *) p[0];
+
+	  if (tr->use_pthreads)
+	    return clib_error_return (0,
+				      "coremask cannot be set for '%s' threads",
+				      name);
+
+	  tr->coremask = clib_bitmap_set_multiple
+	    (tr->coremask, 0, coremask, BITS (coremask));
+	  tr->count = clib_bitmap_count_set_bits (tr->coremask);
+	}
+      else if (unformat (input, "corelist-%s %U", &name, unformat_bitmap_list,
+			 &bitmap))
+	{
+	  p = hash_get_mem (tm->thread_registrations_by_name, name);
+	  if (p == 0)
+	    return clib_error_return (0, "no such thread type '%s'", name);
+
+	  tr = (vlib_thread_registration_t *) p[0];
+
+	  if (tr->use_pthreads)
+	    return clib_error_return (0,
+				      "corelist cannot be set for '%s' threads",
+				      name);
+
+	  tr->coremask = bitmap;
+	  tr->count = clib_bitmap_count_set_bits (tr->coremask);
+	}
+      else
+	if (unformat
+	    (input, "scheduler-policy %U", unformat_sched_policy,
+	     &tm->sched_policy))
+	;
+      else if (unformat (input, "scheduler-priority %u", &tm->sched_priority))
+	;
+      else if (unformat (input, "%s %u", &name, &count))
+	{
+	  p = hash_get_mem (tm->thread_registrations_by_name, name);
+	  if (p == 0)
+	    return clib_error_return (0, "no such thread type 3 '%s'", name);
+
+	  tr = (vlib_thread_registration_t *) p[0];
+	  if (tr->fixed_count)
+	    return clib_error_return
+	      (0, "number of %s threads not configurable", tr->name);
+	  tr->count = count;
+	}
+      else
+	break;
+    }
+
+  if (tm->sched_priority != ~0)
+    {
+      if (tm->sched_policy == SCHED_FIFO || tm->sched_policy == SCHED_RR)
+	{
+	  u32 prio_max = sched_get_priority_max (tm->sched_policy);
+	  u32 prio_min = sched_get_priority_min (tm->sched_policy);
+	  if (tm->sched_priority > prio_max)
+	    tm->sched_priority = prio_max;
+	  if (tm->sched_priority < prio_min)
+	    tm->sched_priority = prio_min;
+	}
+      else
+	{
+	  return clib_error_return
+	    (0,
+	     "scheduling priority (%d) is not allowed for `normal` scheduling policy",
+	     tm->sched_priority);
+	}
+    }
+  tr = tm->next;
+
+  if (!tm->thread_prefix)
+    tm->thread_prefix = format (0, "vpp");
+
+  while (tr)
+    {
+      tm->n_thread_stacks += tr->count;
+      tm->n_pthreads += tr->count * tr->use_pthreads;
+      tm->n_eal_threads += tr->count * (tr->use_pthreads == 0);
+      tr = tr->next;
+    }
+
+  return 0;
+}
+
+VLIB_EARLY_CONFIG_FUNCTION (cpu_config, "cpu");
+
+#if !defined (__x86_64__) && !defined (__aarch64__) && !defined (__powerpc64__) && !defined(__arm__)
+void
+__sync_fetch_and_add_8 (void)
+{
+  fformat (stderr, "%s called\n", __FUNCTION__);
+  abort ();
+}
+
+void
+__sync_add_and_fetch_8 (void)
+{
+  fformat (stderr, "%s called\n", __FUNCTION__);
+  abort ();
+}
+#endif
+
+void vnet_main_fixup (vlib_fork_fixup_t which) __attribute__ ((weak));
+void
+vnet_main_fixup (vlib_fork_fixup_t which)
+{
+}
+
+void
+vlib_worker_thread_fork_fixup (vlib_fork_fixup_t which)
+{
+  vlib_main_t *vm = vlib_get_main ();
+
+  if (vlib_mains == 0)
+    return;
+
+  ASSERT (os_get_cpu_number () == 0);
+  vlib_worker_thread_barrier_sync (vm);
+
+  switch (which)
+    {
+    case VLIB_WORKER_THREAD_FORK_FIXUP_NEW_SW_IF_INDEX:
+      vnet_main_fixup (VLIB_WORKER_THREAD_FORK_FIXUP_NEW_SW_IF_INDEX);
+      break;
+
+    default:
+      ASSERT (0);
+    }
+  vlib_worker_thread_barrier_release (vm);
+}
+
+void
+vlib_worker_thread_barrier_sync (vlib_main_t * vm)
+{
+  f64 deadline;
+  u32 count;
+
+  if (!vlib_mains)
+    return;
+
+  count = vec_len (vlib_mains) - 1;
+
+  /* Tolerate recursive calls */
+  if (++vlib_worker_threads[0].recursion_level > 1)
+    return;
+
+  vlib_worker_threads[0].barrier_sync_count++;
+
+  ASSERT (os_get_cpu_number () == 0);
+
+  deadline = vlib_time_now (vm) + BARRIER_SYNC_TIMEOUT;
+
+  *vlib_worker_threads->wait_at_barrier = 1;
+  while (*vlib_worker_threads->workers_at_barrier != count)
+    {
+      if (vlib_time_now (vm) > deadline)
+	{
+	  fformat (stderr, "%s: worker thread deadlock\n", __FUNCTION__);
+	  os_panic ();
+	}
+    }
+}
+
+void
+vlib_worker_thread_barrier_release (vlib_main_t * vm)
+{
+  f64 deadline;
+
+  if (!vlib_mains)
+    return;
+
+  if (--vlib_worker_threads[0].recursion_level > 0)
+    return;
+
+  deadline = vlib_time_now (vm) + BARRIER_SYNC_TIMEOUT;
+
+  *vlib_worker_threads->wait_at_barrier = 0;
+
+  while (*vlib_worker_threads->workers_at_barrier > 0)
+    {
+      if (vlib_time_now (vm) > deadline)
+	{
+	  fformat (stderr, "%s: worker thread deadlock\n", __FUNCTION__);
+	  os_panic ();
+	}
+    }
+}
+
+/*
+ * Check the frame queue to see if any frames are available.
+ * If so, pull the packets off the frames and put them to
+ * the handoff node.
+ */
+static inline int
+vlib_frame_queue_dequeue_internal (vlib_main_t * vm,
+				   vlib_frame_queue_main_t * fqm)
+{
+  u32 thread_id = vm->cpu_index;
+  vlib_frame_queue_t *fq = fqm->vlib_frame_queues[thread_id];
+  vlib_frame_queue_elt_t *elt;
+  u32 *from, *to;
+  vlib_frame_t *f;
+  int msg_type;
+  int processed = 0;
+  u32 n_left_to_node;
+  u32 vectors = 0;
+
+  ASSERT (fq);
+  ASSERT (vm == vlib_mains[thread_id]);
+
+  if (PREDICT_FALSE (fqm->node_index == ~0))
+    return 0;
+  /*
+   * Gather trace data for frame queues
+   */
+  if (PREDICT_FALSE (fq->trace))
+    {
+      frame_queue_trace_t *fqt;
+      frame_queue_nelt_counter_t *fqh;
+      u32 elix;
+
+      fqt = &fqm->frame_queue_traces[thread_id];
+
+      fqt->nelts = fq->nelts;
+      fqt->head = fq->head;
+      fqt->head_hint = fq->head_hint;
+      fqt->tail = fq->tail;
+      fqt->threshold = fq->vector_threshold;
+      fqt->n_in_use = fqt->tail - fqt->head;
+      if (fqt->n_in_use >= fqt->nelts)
+	{
+	  // if beyond max then use max
+	  fqt->n_in_use = fqt->nelts - 1;
+	}
+
+      /* Record the number of elements in use in the histogram */
+      fqh = &fqm->frame_queue_histogram[thread_id];
+      fqh->count[fqt->n_in_use]++;
+
+      /* Record a snapshot of the elements in use */
+      for (elix = 0; elix < fqt->nelts; elix++)
+	{
+	  elt = fq->elts + ((fq->head + 1 + elix) & (fq->nelts - 1));
+	  if (1 || elt->valid)
+	    {
+	      fqt->n_vectors[elix] = elt->n_vectors;
+	    }
+	}
+      fqt->written = 1;
+    }
+
+  while (1)
+    {
+      if (fq->head == fq->tail)
+	{
+	  fq->head_hint = fq->head;
+	  return processed;
+	}
+
+      elt = fq->elts + ((fq->head + 1) & (fq->nelts - 1));
+
+      if (!elt->valid)
+	{
+	  fq->head_hint = fq->head;
+	  return processed;
+	}
+
+      from = elt->buffer_index;
+      msg_type = elt->msg_type;
+
+      ASSERT (msg_type == VLIB_FRAME_QUEUE_ELT_DISPATCH_FRAME);
+      ASSERT (elt->n_vectors <= VLIB_FRAME_SIZE);
+
+      f = vlib_get_frame_to_node (vm, fqm->node_index);
+
+      to = vlib_frame_vector_args (f);
+
+      n_left_to_node = elt->n_vectors;
+
+      while (n_left_to_node >= 4)
+	{
+	  to[0] = from[0];
+	  to[1] = from[1];
+	  to[2] = from[2];
+	  to[3] = from[3];
+	  to += 4;
+	  from += 4;
+	  n_left_to_node -= 4;
+	}
+
+      while (n_left_to_node > 0)
+	{
+	  to[0] = from[0];
+	  to++;
+	  from++;
+	  n_left_to_node--;
+	}
+
+      vectors += elt->n_vectors;
+      f->n_vectors = elt->n_vectors;
+      vlib_put_frame_to_node (vm, fqm->node_index, f);
+
+      elt->valid = 0;
+      elt->n_vectors = 0;
+      elt->msg_type = 0xfefefefe;
+      CLIB_MEMORY_BARRIER ();
+      fq->head++;
+      processed++;
+
+      /*
+       * Limit the number of packets pushed into the graph
+       */
+      if (vectors >= fq->vector_threshold)
+	{
+	  fq->head_hint = fq->head;
+	  return processed;
+	}
+    }
+  ASSERT (0);
+  return processed;
+}
+
+static_always_inline void
+vlib_worker_thread_internal (vlib_main_t * vm)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  u64 cpu_time_now = clib_cpu_time_now ();
+  vlib_frame_queue_main_t *fqm;
+
+  vec_alloc (nm->pending_interrupt_node_runtime_indices, 32);
+
+  while (1)
+    {
+      vlib_worker_thread_barrier_check ();
+
+      vec_foreach (fqm, tm->frame_queue_mains)
+	vlib_frame_queue_dequeue_internal (vm, fqm);
+
+      vlib_node_runtime_t *n;
+      vec_foreach (n, nm->nodes_by_type[VLIB_NODE_TYPE_INPUT])
+      {
+	cpu_time_now = dispatch_node (vm, n, VLIB_NODE_TYPE_INPUT,
+				      VLIB_NODE_STATE_POLLING, /* frame */ 0,
+				      cpu_time_now);
+      }
+
+      /* Next handle interrupts. */
+      {
+	uword l = _vec_len (nm->pending_interrupt_node_runtime_indices);
+	uword i;
+	if (l > 0)
+	  {
+	    _vec_len (nm->pending_interrupt_node_runtime_indices) = 0;
+	    for (i = 0; i < l; i++)
+	      {
+		n = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT],
+				      nm->
+				      pending_interrupt_node_runtime_indices
+				      [i]);
+		cpu_time_now =
+		  dispatch_node (vm, n, VLIB_NODE_TYPE_INPUT,
+				 VLIB_NODE_STATE_INTERRUPT,
+				 /* frame */ 0,
+				 cpu_time_now);
+	      }
+	  }
+      }
+
+      if (_vec_len (nm->pending_frames))
+	{
+	  int i;
+	  cpu_time_now = clib_cpu_time_now ();
+	  for (i = 0; i < _vec_len (nm->pending_frames); i++)
+	    {
+	      vlib_pending_frame_t *p;
+
+	      p = nm->pending_frames + i;
+
+	      cpu_time_now = dispatch_pending_node (vm, p, cpu_time_now);
+	    }
+	  _vec_len (nm->pending_frames) = 0;
+	}
+      vlib_increment_main_loop_counter (vm);
+
+      /* Record time stamp in case there are no enabled nodes and above
+         calls do not update time stamp. */
+      cpu_time_now = clib_cpu_time_now ();
+    }
+}
+
+void
+vlib_worker_thread_fn (void *arg)
+{
+  vlib_worker_thread_t *w = (vlib_worker_thread_t *) arg;
+  vlib_main_t *vm = vlib_get_main ();
+
+  ASSERT (vm->cpu_index == os_get_cpu_number ());
+
+  vlib_worker_thread_init (w);
+  clib_time_init (&vm->clib_time);
+  clib_mem_set_heap (w->thread_mheap);
+
+#if DPDK > 0
+  /* Wait until the dpdk init sequence is complete */
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  while (tm->worker_thread_release == 0)
+    vlib_worker_thread_barrier_check ();
+#endif
+
+  vlib_worker_thread_internal (vm);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_THREAD (worker_thread_reg, static) = {
+  .name = "workers",
+  .short_name = "wk",
+  .function = vlib_worker_thread_fn,
+};
+/* *INDENT-ON* */
+
+u32
+vlib_frame_queue_main_init (u32 node_index, u32 frame_queue_nelts)
+{
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  vlib_frame_queue_main_t *fqm;
+  vlib_frame_queue_t *fq;
+  int i;
+
+  if (frame_queue_nelts == 0)
+    frame_queue_nelts = FRAME_QUEUE_NELTS;
+
+  vec_add2 (tm->frame_queue_mains, fqm, 1);
+
+  fqm->node_index = node_index;
+
+  vec_validate (fqm->vlib_frame_queues, tm->n_vlib_mains - 1);
+  _vec_len (fqm->vlib_frame_queues) = 0;
+  for (i = 0; i < tm->n_vlib_mains; i++)
+    {
+      fq = vlib_frame_queue_alloc (frame_queue_nelts);
+      vec_add1 (fqm->vlib_frame_queues, fq);
+    }
+
+  return (fqm - tm->frame_queue_mains);
+}
+
+clib_error_t *
+threads_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (threads_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/threads.h b/src/vlib/threads.h
new file mode 100644
index 00000000..34ab5be8
--- /dev/null
+++ b/src/vlib/threads.h
@@ -0,0 +1,470 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vlib_threads_h
+#define included_vlib_threads_h
+
+#include <vlib/main.h>
+#include <linux/sched.h>
+
+extern vlib_main_t **vlib_mains;
+
+void vlib_set_thread_name (char *name);
+
+/* arg is actually a vlib__thread_t * */
+typedef void (vlib_thread_function_t) (void *arg);
+
+typedef struct vlib_thread_registration_
+{
+  /* constructor generated list of thread registrations */
+  struct vlib_thread_registration_ *next;
+
+  /* config parameters */
+  char *name;
+  char *short_name;
+  vlib_thread_function_t *function;
+  uword mheap_size;
+  int fixed_count;
+  u32 count;
+  int no_data_structure_clone;
+  u32 frame_queue_nelts;
+
+  /* All threads of this type run on pthreads */
+  int use_pthreads;
+  u32 first_index;
+  uword *coremask;
+} vlib_thread_registration_t;
+
+/*
+ * Frames have their cpu / vlib_main_t index in the low-order N bits
+ * Make VLIB_MAX_CPUS a power-of-two, please...
+ */
+
+#ifndef VLIB_MAX_CPUS
+#define VLIB_MAX_CPUS 256
+#endif
+
+#if VLIB_MAX_CPUS > CLIB_MAX_MHEAPS
+#error Please increase number of per-cpu mheaps
+#endif
+
+#define VLIB_CPU_MASK (VLIB_MAX_CPUS - 1)	/* 0x3f, max */
+#define VLIB_OFFSET_MASK (~VLIB_CPU_MASK)
+
+#define VLIB_LOG2_THREAD_STACK_SIZE (20)
+#define VLIB_THREAD_STACK_SIZE (1<<VLIB_LOG2_THREAD_STACK_SIZE)
+
+typedef enum
+{
+  VLIB_FRAME_QUEUE_ELT_DISPATCH_FRAME,
+} vlib_frame_queue_msg_type_t;
+
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  volatile u32 valid;
+  u32 msg_type;
+  u32 n_vectors;
+  u32 last_n_vectors;
+
+  /* 256 * 4 = 1024 bytes, even mult of cache line size */
+  u32 buffer_index[VLIB_FRAME_SIZE];
+}
+vlib_frame_queue_elt_t;
+
+typedef struct
+{
+  /* First cache line */
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  volatile u32 *wait_at_barrier;
+  volatile u32 *workers_at_barrier;
+
+  /* Second Cache Line */
+    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
+  void *thread_mheap;
+  u8 *thread_stack;
+  void (*thread_function) (void *);
+  void *thread_function_arg;
+  i64 recursion_level;
+  elog_track_t elog_track;
+  u32 instance_id;
+  vlib_thread_registration_t *registration;
+  u8 *name;
+  u64 barrier_sync_count;
+
+  long lwp;
+  int lcore_id;
+  pthread_t thread_id;
+} vlib_worker_thread_t;
+
+extern vlib_worker_thread_t *vlib_worker_threads;
+
+typedef struct
+{
+  /* enqueue side */
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  volatile u64 tail;
+  u64 enqueues;
+  u64 enqueue_ticks;
+  u64 enqueue_vectors;
+  u32 enqueue_full_events;
+
+  /* dequeue side */
+    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
+  volatile u64 head;
+  u64 dequeues;
+  u64 dequeue_ticks;
+  u64 dequeue_vectors;
+  u64 trace;
+  u64 vector_threshold;
+
+  /* dequeue hint to enqueue side */
+    CLIB_CACHE_LINE_ALIGN_MARK (cacheline2);
+  volatile u64 head_hint;
+
+  /* read-only, constant, shared */
+    CLIB_CACHE_LINE_ALIGN_MARK (cacheline3);
+  vlib_frame_queue_elt_t *elts;
+  u32 nelts;
+}
+vlib_frame_queue_t;
+
+typedef struct
+{
+  u32 node_index;
+  vlib_frame_queue_t **vlib_frame_queues;
+
+  /* for frame queue tracing */
+  frame_queue_trace_t *frame_queue_traces;
+  frame_queue_nelt_counter_t *frame_queue_histogram;
+} vlib_frame_queue_main_t;
+
+/* Called early, in thread 0's context */
+clib_error_t *vlib_thread_init (vlib_main_t * vm);
+
+vlib_worker_thread_t *vlib_alloc_thread (vlib_main_t * vm);
+
+int vlib_frame_queue_enqueue (vlib_main_t * vm, u32 node_runtime_index,
+			      u32 frame_queue_index, vlib_frame_t * frame,
+			      vlib_frame_queue_msg_type_t type);
+
+int vlib_frame_queue_dequeue (int thread_id,
+			      vlib_main_t * vm, vlib_node_main_t * nm);
+
+u64 dispatch_node (vlib_main_t * vm,
+		   vlib_node_runtime_t * node,
+		   vlib_node_type_t type,
+		   vlib_node_state_t dispatch_state,
+		   vlib_frame_t * frame, u64 last_time_stamp);
+
+u64 dispatch_pending_node (vlib_main_t * vm,
+			   vlib_pending_frame_t * p, u64 last_time_stamp);
+
+void vlib_worker_thread_node_runtime_update (void);
+
+void vlib_create_worker_threads (vlib_main_t * vm, int n,
+				 void (*thread_function) (void *));
+
+void vlib_worker_thread_init (vlib_worker_thread_t * w);
+u32 vlib_frame_queue_main_init (u32 node_index, u32 frame_queue_nelts);
+
+/* Check for a barrier sync request every 30ms */
+#define BARRIER_SYNC_DELAY (0.030000)
+
+#if CLIB_DEBUG > 0
+/* long barrier timeout, for gdb... */
+#define BARRIER_SYNC_TIMEOUT (600.1)
+#else
+#define BARRIER_SYNC_TIMEOUT (1.0)
+#endif
+
+void vlib_worker_thread_barrier_sync (vlib_main_t * vm);
+void vlib_worker_thread_barrier_release (vlib_main_t * vm);
+
+always_inline void
+vlib_smp_unsafe_warning (void)
+{
+  if (CLIB_DEBUG > 0)
+    {
+      if (os_get_cpu_number ())
+	fformat (stderr, "%s: SMP unsafe warning...\n", __FUNCTION__);
+    }
+}
+
+typedef enum
+{
+  VLIB_WORKER_THREAD_FORK_FIXUP_ILLEGAL = 0,
+  VLIB_WORKER_THREAD_FORK_FIXUP_NEW_SW_IF_INDEX,
+} vlib_fork_fixup_t;
+
+void vlib_worker_thread_fork_fixup (vlib_fork_fixup_t which);
+
+static inline void
+vlib_worker_thread_barrier_check (void)
+{
+  if (PREDICT_FALSE (*vlib_worker_threads->wait_at_barrier))
+    {
+      clib_smp_atomic_add (vlib_worker_threads->workers_at_barrier, 1);
+      while (*vlib_worker_threads->wait_at_barrier)
+	;
+      clib_smp_atomic_add (vlib_worker_threads->workers_at_barrier, -1);
+    }
+}
+
+#define foreach_vlib_main(body)			                        \
+do {                                                                    \
+    vlib_main_t ** __vlib_mains = 0, *this_vlib_main;                   \
+    int ii;                                                             \
+                                                                        \
+    if (vec_len (vlib_mains) == 0)                                      \
+        vec_add1 (__vlib_mains, &vlib_global_main);                     \
+    else                                                                \
+    {                                                                   \
+        for (ii = 0; ii < vec_len (vlib_mains); ii++)                   \
+        {                                                               \
+            this_vlib_main = vlib_mains[ii];                            \
+            if (this_vlib_main)                                         \
+                vec_add1 (__vlib_mains, this_vlib_main);                \
+        }                                                               \
+    }                                                                   \
+                                                                        \
+    for (ii = 0; ii < vec_len (__vlib_mains); ii++)                     \
+    {                                                                   \
+        this_vlib_main = __vlib_mains[ii];                              \
+        /* body uses this_vlib_main... */                               \
+        (body);                                                         \
+    }                                                                   \
+    vec_free (__vlib_mains);                                            \
+} while (0);
+
+#define foreach_sched_policy \
+  _(SCHED_OTHER, OTHER, "other") \
+  _(SCHED_BATCH, BATCH, "batch") \
+  _(SCHED_IDLE, IDLE, "idle")   \
+  _(SCHED_FIFO, FIFO, "fifo")   \
+  _(SCHED_RR, RR, "rr")
+
+typedef enum
+{
+#define _(v,f,s) SCHED_POLICY_##f = v,
+  foreach_sched_policy
+#undef _
+    SCHED_POLICY_N,
+} sched_policy_t;
+
+typedef struct
+{
+  /* Link list of registrations, built by constructors */
+  vlib_thread_registration_t *next;
+
+  /* Vector of registrations, w/ non-data-structure clones at the top */
+  vlib_thread_registration_t **registrations;
+
+  uword *thread_registrations_by_name;
+
+  vlib_worker_thread_t *worker_threads;
+
+  /*
+   * Launch all threads as pthreads,
+   * not eal_rte_launch (strict affinity) threads
+   */
+  int use_pthreads;
+
+  /* Number of vlib_main / vnet_main clones */
+  u32 n_vlib_mains;
+
+  /* Number of thread stacks to create */
+  u32 n_thread_stacks;
+
+  /* Number of pthreads */
+  u32 n_pthreads;
+
+  /* Number of DPDK eal threads */
+  u32 n_eal_threads;
+
+  /* Number of cores to skip, must match the core mask */
+  u32 skip_cores;
+
+  /* Thread prefix name */
+  u8 *thread_prefix;
+
+  /* main thread lcore */
+  u8 main_lcore;
+
+  /* Bitmap of available CPU cores */
+  uword *cpu_core_bitmap;
+
+  /* Bitmap of available CPU sockets (NUMA nodes) */
+  uword *cpu_socket_bitmap;
+
+  /* Worker handoff queues */
+  vlib_frame_queue_main_t *frame_queue_mains;
+
+  /* worker thread initialization barrier */
+  volatile u32 worker_thread_release;
+
+  /* scheduling policy */
+  u32 sched_policy;
+
+  /* scheduling policy priority */
+  u32 sched_priority;
+
+} vlib_thread_main_t;
+
+extern vlib_thread_main_t vlib_thread_main;
+
+#define VLIB_REGISTER_THREAD(x,...)                     \
+  __VA_ARGS__ vlib_thread_registration_t x;             \
+static void __vlib_add_thread_registration_##x (void)   \
+  __attribute__((__constructor__)) ;                    \
+static void __vlib_add_thread_registration_##x (void)   \
+{                                                       \
+  vlib_thread_main_t * tm = &vlib_thread_main;          \
+  x.next = tm->next;                                    \
+  tm->next = &x;                                        \
+}                                                       \
+__VA_ARGS__ vlib_thread_registration_t x
+
+always_inline u32
+vlib_num_workers ()
+{
+  return vlib_thread_main.n_vlib_mains - 1;
+}
+
+always_inline u32
+vlib_get_worker_cpu_index (u32 worker_index)
+{
+  return worker_index + 1;
+}
+
+always_inline u32
+vlib_get_worker_index (u32 cpu_index)
+{
+  return cpu_index - 1;
+}
+
+always_inline u32
+vlib_get_current_worker_index ()
+{
+  return os_get_cpu_number () - 1;
+}
+
+always_inline vlib_main_t *
+vlib_get_worker_vlib_main (u32 worker_index)
+{
+  vlib_main_t *vm;
+  vlib_thread_main_t *tm = &vlib_thread_main;
+  ASSERT (worker_index < tm->n_vlib_mains - 1);
+  vm = vlib_mains[worker_index + 1];
+  ASSERT (vm);
+  return vm;
+}
+
+static inline void
+vlib_put_frame_queue_elt (vlib_frame_queue_elt_t * hf)
+{
+  CLIB_MEMORY_BARRIER ();
+  hf->valid = 1;
+}
+
+static inline vlib_frame_queue_elt_t *
+vlib_get_frame_queue_elt (u32 frame_queue_index, u32 index)
+{
+  vlib_frame_queue_t *fq;
+  vlib_frame_queue_elt_t *elt;
+  vlib_thread_main_t *tm = &vlib_thread_main;
+  vlib_frame_queue_main_t *fqm =
+    vec_elt_at_index (tm->frame_queue_mains, frame_queue_index);
+  u64 new_tail;
+
+  fq = fqm->vlib_frame_queues[index];
+  ASSERT (fq);
+
+  new_tail = __sync_add_and_fetch (&fq->tail, 1);
+
+  /* Wait until a ring slot is available */
+  while (new_tail >= fq->head_hint + fq->nelts)
+    vlib_worker_thread_barrier_check ();
+
+  elt = fq->elts + (new_tail & (fq->nelts - 1));
+
+  /* this would be very bad... */
+  while (elt->valid)
+    ;
+
+  elt->msg_type = VLIB_FRAME_QUEUE_ELT_DISPATCH_FRAME;
+  elt->last_n_vectors = elt->n_vectors = 0;
+
+  return elt;
+}
+
+static inline vlib_frame_queue_t *
+is_vlib_frame_queue_congested (u32 frame_queue_index,
+			       u32 index,
+			       u32 queue_hi_thresh,
+			       vlib_frame_queue_t **
+			       handoff_queue_by_worker_index)
+{
+  vlib_frame_queue_t *fq;
+  vlib_thread_main_t *tm = &vlib_thread_main;
+  vlib_frame_queue_main_t *fqm =
+    vec_elt_at_index (tm->frame_queue_mains, frame_queue_index);
+
+  fq = handoff_queue_by_worker_index[index];
+  if (fq != (vlib_frame_queue_t *) (~0))
+    return fq;
+
+  fq = fqm->vlib_frame_queues[index];
+  ASSERT (fq);
+
+  if (PREDICT_FALSE (fq->tail >= (fq->head_hint + queue_hi_thresh)))
+    {
+      /* a valid entry in the array will indicate the queue has reached
+       * the specified threshold and is congested
+       */
+      handoff_queue_by_worker_index[index] = fq;
+      fq->enqueue_full_events++;
+      return fq;
+    }
+
+  return NULL;
+}
+
+static inline vlib_frame_queue_elt_t *
+vlib_get_worker_handoff_queue_elt (u32 frame_queue_index,
+				   u32 vlib_worker_index,
+				   vlib_frame_queue_elt_t **
+				   handoff_queue_elt_by_worker_index)
+{
+  vlib_frame_queue_elt_t *elt;
+
+  if (handoff_queue_elt_by_worker_index[vlib_worker_index])
+    return handoff_queue_elt_by_worker_index[vlib_worker_index];
+
+  elt = vlib_get_frame_queue_elt (frame_queue_index, vlib_worker_index);
+
+  handoff_queue_elt_by_worker_index[vlib_worker_index] = elt;
+
+  return elt;
+}
+
+#endif /* included_vlib_threads_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/threads_cli.c b/src/vlib/threads_cli.c
new file mode 100644
index 00000000..ee632279
--- /dev/null
+++ b/src/vlib/threads_cli.c
@@ -0,0 +1,579 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define _GNU_SOURCE
+
+#include <vppinfra/format.h>
+#include <vlib/vlib.h>
+
+#include <vlib/threads.h>
+#include <vlib/unix/unix.h>
+
+#if DPDK==1
+#include <rte_config.h>
+#include <rte_common.h>
+#include <rte_eal.h>
+#include <rte_launch.h>
+#include <rte_lcore.h>
+#endif
+
+static u8 *
+format_sched_policy_and_priority (u8 * s, va_list * args)
+{
+  long i = va_arg (*args, long);
+  struct sched_param sched_param;
+  u8 *t = 0;
+
+  switch (sched_getscheduler (i))
+    {
+#define _(v,f,str) case SCHED_POLICY_##f: t = (u8 *) str; break;
+      foreach_sched_policy
+#undef _
+    }
+  if (sched_getparam (i, &sched_param) == 0)
+    return format (s, "%s (%d)", t, sched_param.sched_priority);
+  else
+    return format (s, "%s (n/a)", t);
+}
+
+static clib_error_t *
+show_threads_fn (vlib_main_t * vm,
+		 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vlib_worker_thread_t *w;
+  int i;
+
+  vlib_cli_output (vm, "%-7s%-20s%-12s%-8s%-25s%-7s%-7s%-7s%-10s",
+		   "ID", "Name", "Type", "LWP", "Sched Policy (Priority)",
+		   "lcore", "Core", "Socket", "State");
+
+#if !defined(__powerpc64__)
+  for (i = 0; i < vec_len (vlib_worker_threads); i++)
+    {
+      w = vlib_worker_threads + i;
+      u8 *line = NULL;
+
+      line = format (line, "%-7d%-20s%-12s%-8d",
+		     i,
+		     w->name ? w->name : (u8 *) "",
+		     w->registration ? w->registration->name : "", w->lwp);
+
+      line = format (line, "%-25U", format_sched_policy_and_priority, w->lwp);
+
+      int lcore = -1;
+      cpu_set_t cpuset;
+      CPU_ZERO (&cpuset);
+      int ret = -1;
+
+      ret =
+	pthread_getaffinity_np (w->thread_id, sizeof (cpu_set_t), &cpuset);
+      if (!ret)
+	{
+	  int c;
+	  for (c = 0; c < CPU_SETSIZE; c++)
+	    if (CPU_ISSET (c, &cpuset))
+	      {
+		if (lcore > -1)
+		  {
+		    lcore = -2;
+		    break;
+		  }
+		lcore = c;
+	      }
+	}
+      else
+	{
+	  lcore = w->lcore_id;
+	}
+
+      if (lcore > -1)
+	{
+	  const char *sys_cpu_path = "/sys/devices/system/cpu/cpu";
+	  int socket_id = -1;
+	  int core_id = -1;
+	  u8 *p = 0;
+
+	  p = format (p, "%s%u/topology/core_id%c", sys_cpu_path, lcore, 0);
+	  vlib_sysfs_read ((char *) p, "%d", &core_id);
+
+	  vec_reset_length (p);
+	  p =
+	    format (p,
+		    "%s%u/topology/physical_package_id%c",
+		    sys_cpu_path, lcore, 0);
+	  vlib_sysfs_read ((char *) p, "%d", &socket_id);
+	  vec_free (p);
+
+	  line = format (line, "%-7u%-7u%-7u%", lcore, core_id, socket_id);
+#if DPDK==1
+	  ASSERT (lcore <= RTE_MAX_LCORE);
+	  switch (lcore_config[lcore].state)
+	    {
+	    case WAIT:
+	      line = format (line, "wait");
+	      break;
+	    case RUNNING:
+	      line = format (line, "running");
+	      break;
+	    case FINISHED:
+	      line = format (line, "finished");
+	      break;
+	    default:
+	      line = format (line, "unknown");
+	    }
+#endif
+	}
+      else
+	{
+	  line =
+	    format (line, "%-7s%-7s%-7s%", (lcore == -2) ? "M" : "n/a", "n/a",
+		    "n/a");
+	}
+
+      vlib_cli_output (vm, "%v", line);
+      vec_free (line);
+    }
+#endif
+
+  return 0;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_threads_command, static) = {
+  .path = "show threads",
+  .short_help = "Show threads",
+  .function = show_threads_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * Trigger threads to grab frame queue trace data
+ */
+static clib_error_t *
+trace_frame_queue (vlib_main_t * vm, unformat_input_t * input,
+		   vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  clib_error_t *error = NULL;
+  frame_queue_trace_t *fqt;
+  frame_queue_nelt_counter_t *fqh;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  vlib_frame_queue_main_t *fqm;
+  u32 num_fq;
+  u32 fqix;
+  u32 enable = 2;
+  u32 index = ~(u32) 0;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "on"))
+	enable = 1;
+      else if (unformat (line_input, "off"))
+	enable = 0;
+      else if (unformat (line_input, "index %u"), &index)
+	;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (enable > 1)
+    return clib_error_return (0, "expecting on or off");
+
+  if (vec_len (tm->frame_queue_mains) == 0)
+    return clib_error_return (0, "no worker handoffs exist");
+
+  if (index > vec_len (tm->frame_queue_mains) - 1)
+    return clib_error_return (0,
+			      "expecting valid worker handoff queue index");
+
+  fqm = vec_elt_at_index (tm->frame_queue_mains, index);
+
+  num_fq = vec_len (fqm->vlib_frame_queues);
+  if (num_fq == 0)
+    {
+      vlib_cli_output (vm, "No frame queues exist\n");
+      return error;
+    }
+
+  // Allocate storage for trace if necessary
+  vec_validate_aligned (fqm->frame_queue_traces, num_fq - 1,
+			CLIB_CACHE_LINE_BYTES);
+  vec_validate_aligned (fqm->frame_queue_histogram, num_fq - 1,
+			CLIB_CACHE_LINE_BYTES);
+
+  for (fqix = 0; fqix < num_fq; fqix++)
+    {
+      fqt = &fqm->frame_queue_traces[fqix];
+      fqh = &fqm->frame_queue_histogram[fqix];
+
+      memset (fqt->n_vectors, 0xff, sizeof (fqt->n_vectors));
+      fqt->written = 0;
+      memset (fqh, 0, sizeof (*fqh));
+      fqm->vlib_frame_queues[fqix]->trace = enable;
+    }
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_trace_frame_queue,static) = {
+    .path = "trace frame-queue",
+    .short_help = "trace frame-queue (on|off)",
+    .function = trace_frame_queue,
+    .is_mp_safe = 1,
+};
+/* *INDENT-ON* */
+
+
+/*
+ * Adding two counters and compute percent of total
+ * Round up, e.g. 0.000001 => 1%
+ */
+static u32
+compute_percent (u64 * two_counters, u64 total)
+{
+  if (total == 0)
+    {
+      return 0;
+    }
+  else
+    {
+      return (((two_counters[0] + two_counters[1]) * 100) +
+	      (total - 1)) / total;
+    }
+}
+
+/*
+ * Display frame queue trace data gathered by threads.
+ */
+static clib_error_t *
+show_frame_queue_internal (vlib_main_t * vm,
+			   vlib_frame_queue_main_t * fqm, u32 histogram)
+{
+  clib_error_t *error = NULL;
+  frame_queue_trace_t *fqt;
+  frame_queue_nelt_counter_t *fqh;
+  u32 num_fq;
+  u32 fqix;
+
+  num_fq = vec_len (fqm->frame_queue_traces);
+  if (num_fq == 0)
+    {
+      vlib_cli_output (vm, "No trace data for frame queues\n");
+      return error;
+    }
+
+  if (histogram)
+    {
+      vlib_cli_output (vm, "0-1   2-3   4-5   6-7   8-9   10-11 12-13 14-15 "
+		       "16-17 18-19 20-21 22-23 24-25 26-27 28-29 30-31\n");
+    }
+
+  for (fqix = 0; fqix < num_fq; fqix++)
+    {
+      fqt = &(fqm->frame_queue_traces[fqix]);
+
+      vlib_cli_output (vm, "Thread %d %v\n", fqix,
+		       vlib_worker_threads[fqix].name);
+
+      if (fqt->written == 0)
+	{
+	  vlib_cli_output (vm, "  no trace data\n");
+	  continue;
+	}
+
+      if (histogram)
+	{
+	  fqh = &(fqm->frame_queue_histogram[fqix]);
+	  u32 nelt;
+	  u64 total = 0;
+
+	  for (nelt = 0; nelt < FRAME_QUEUE_MAX_NELTS; nelt++)
+	    {
+	      total += fqh->count[nelt];
+	    }
+
+	  /*
+	   * Print in pairs to condense the output.
+	   * Allow entries with 0 counts to be clearly identified, by rounding up.
+	   * Any non-zero value will be displayed as at least one percent. This
+	   * also means the sum of percentages can be > 100, but that is fine. The
+	   * histogram is counted from the last time "trace frame on" was issued.
+	   */
+	  vlib_cli_output (vm,
+			   "%3d%%  %3d%%  %3d%%  %3d%%  %3d%%  %3d%%  %3d%%  %3d%%  "
+			   "%3d%%  %3d%%  %3d%%  %3d%%  %3d%%  %3d%%  %3d%%  %3d%%\n",
+			   compute_percent (&fqh->count[0], total),
+			   compute_percent (&fqh->count[2], total),
+			   compute_percent (&fqh->count[4], total),
+			   compute_percent (&fqh->count[6], total),
+			   compute_percent (&fqh->count[8], total),
+			   compute_percent (&fqh->count[10], total),
+			   compute_percent (&fqh->count[12], total),
+			   compute_percent (&fqh->count[14], total),
+			   compute_percent (&fqh->count[16], total),
+			   compute_percent (&fqh->count[18], total),
+			   compute_percent (&fqh->count[20], total),
+			   compute_percent (&fqh->count[22], total),
+			   compute_percent (&fqh->count[24], total),
+			   compute_percent (&fqh->count[26], total),
+			   compute_percent (&fqh->count[28], total),
+			   compute_percent (&fqh->count[30], total));
+	}
+      else
+	{
+	  vlib_cli_output (vm,
+			   "  vector-threshold %d  ring size %d  in use %d\n",
+			   fqt->threshold, fqt->nelts, fqt->n_in_use);
+	  vlib_cli_output (vm, "  head %12d  head_hint %12d  tail %12d\n",
+			   fqt->head, fqt->head_hint, fqt->tail);
+	  vlib_cli_output (vm,
+			   "  %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d\n",
+			   fqt->n_vectors[0], fqt->n_vectors[1],
+			   fqt->n_vectors[2], fqt->n_vectors[3],
+			   fqt->n_vectors[4], fqt->n_vectors[5],
+			   fqt->n_vectors[6], fqt->n_vectors[7],
+			   fqt->n_vectors[8], fqt->n_vectors[9],
+			   fqt->n_vectors[10], fqt->n_vectors[11],
+			   fqt->n_vectors[12], fqt->n_vectors[13],
+			   fqt->n_vectors[14], fqt->n_vectors[15]);
+
+	  if (fqt->nelts > 16)
+	    {
+	      vlib_cli_output (vm,
+			       "  %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d\n",
+			       fqt->n_vectors[16], fqt->n_vectors[17],
+			       fqt->n_vectors[18], fqt->n_vectors[19],
+			       fqt->n_vectors[20], fqt->n_vectors[21],
+			       fqt->n_vectors[22], fqt->n_vectors[23],
+			       fqt->n_vectors[24], fqt->n_vectors[25],
+			       fqt->n_vectors[26], fqt->n_vectors[27],
+			       fqt->n_vectors[28], fqt->n_vectors[29],
+			       fqt->n_vectors[30], fqt->n_vectors[31]);
+	    }
+	}
+
+    }
+  return error;
+}
+
+static clib_error_t *
+show_frame_queue_trace (vlib_main_t * vm, unformat_input_t * input,
+			vlib_cli_command_t * cmd)
+{
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  vlib_frame_queue_main_t *fqm;
+  clib_error_t *error;
+
+  vec_foreach (fqm, tm->frame_queue_mains)
+  {
+    vlib_cli_output (vm, "Worker handoff queue index %u (next node '%U'):",
+		     fqm - tm->frame_queue_mains,
+		     format_vlib_node_name, vm, fqm->node_index);
+    error = show_frame_queue_internal (vm, fqm, 0);
+    if (error)
+      return error;
+  }
+  return 0;
+}
+
+static clib_error_t *
+show_frame_queue_histogram (vlib_main_t * vm, unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  vlib_frame_queue_main_t *fqm;
+  clib_error_t *error;
+
+  vec_foreach (fqm, tm->frame_queue_mains)
+  {
+    vlib_cli_output (vm, "Worker handoff queue index %u (next node '%U'):",
+		     fqm - tm->frame_queue_mains,
+		     format_vlib_node_name, vm, fqm->node_index);
+    error = show_frame_queue_internal (vm, fqm, 1);
+    if (error)
+      return error;
+  }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_show_frame_queue_trace,static) = {
+    .path = "show frame-queue",
+    .short_help = "show frame-queue trace",
+    .function = show_frame_queue_trace,
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_show_frame_queue_histogram,static) = {
+    .path = "show frame-queue histogram",
+    .short_help = "show frame-queue histogram",
+    .function = show_frame_queue_histogram,
+};
+/* *INDENT-ON* */
+
+
+/*
+ * Modify the number of elements on the frame_queues
+ */
+static clib_error_t *
+test_frame_queue_nelts (vlib_main_t * vm, unformat_input_t * input,
+			vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  vlib_frame_queue_main_t *fqm;
+  clib_error_t *error = NULL;
+  u32 num_fq;
+  u32 fqix;
+  u32 nelts = 0;
+  u32 index = ~(u32) 0;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "nelts %u", &nelts))
+	;
+      else if (unformat (line_input, "index %u", &index))
+	;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (index > vec_len (tm->frame_queue_mains) - 1)
+    return clib_error_return (0,
+			      "expecting valid worker handoff queue index");
+
+  fqm = vec_elt_at_index (tm->frame_queue_mains, index);
+
+  if ((nelts != 4) && (nelts != 8) && (nelts != 16) && (nelts != 32))
+    {
+      return clib_error_return (0, "expecting 4,8,16,32");
+    }
+
+  num_fq = vec_len (fqm->vlib_frame_queues);
+  if (num_fq == 0)
+    {
+      vlib_cli_output (vm, "No frame queues exist\n");
+      return error;
+    }
+
+  for (fqix = 0; fqix < num_fq; fqix++)
+    {
+      fqm->vlib_frame_queues[fqix]->nelts = nelts;
+    }
+
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_test_frame_queue_nelts,static) = {
+    .path = "test frame-queue nelts",
+    .short_help = "test frame-queue nelts (4,8,16,32)",
+    .function = test_frame_queue_nelts,
+};
+/* *INDENT-ON* */
+
+
+/*
+ * Modify the max number of packets pulled off the frame queues
+ */
+static clib_error_t *
+test_frame_queue_threshold (vlib_main_t * vm, unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  vlib_frame_queue_main_t *fqm;
+  clib_error_t *error = NULL;
+  u32 num_fq;
+  u32 fqix;
+  u32 threshold = ~(u32) 0;
+  u32 index = ~(u32) 0;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "threshold %u", &threshold))
+	;
+      else if (unformat (line_input, "index %u", &index))
+	;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (index > vec_len (tm->frame_queue_mains) - 1)
+    return clib_error_return (0,
+			      "expecting valid worker handoff queue index");
+
+  fqm = vec_elt_at_index (tm->frame_queue_mains, index);
+
+
+  if (threshold == ~(u32) 0)
+    {
+      vlib_cli_output (vm, "expecting threshold value\n");
+      return error;
+    }
+
+  if (threshold == 0)
+    threshold = ~0;
+
+  num_fq = vec_len (fqm->vlib_frame_queues);
+  if (num_fq == 0)
+    {
+      vlib_cli_output (vm, "No frame queues exist\n");
+      return error;
+    }
+
+  for (fqix = 0; fqix < num_fq; fqix++)
+    {
+      fqm->vlib_frame_queues[fqix]->vector_threshold = threshold;
+    }
+
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_test_frame_queue_threshold,static) = {
+    .path = "test frame-queue threshold",
+    .short_help = "test frame-queue threshold N (0=no limit)",
+    .function = test_frame_queue_threshold,
+};
+/* *INDENT-ON* */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/trace.c b/src/vlib/trace.c
new file mode 100644
index 00000000..dcdb837f
--- /dev/null
+++ b/src/vlib/trace.c
@@ -0,0 +1,545 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * trace.c: VLIB trace buffer.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vlib/threads.h>
+
+/* Helper function for nodes which only trace buffer data. */
+void
+vlib_trace_frame_buffers_only (vlib_main_t * vm,
+			       vlib_node_runtime_t * node,
+			       u32 * buffers,
+			       uword n_buffers,
+			       uword next_buffer_stride,
+			       uword n_buffer_data_bytes_in_trace)
+{
+  u32 n_left, *from;
+
+  n_left = n_buffers;
+  from = buffers;
+
+  while (n_left >= 4)
+    {
+      u32 bi0, bi1;
+      vlib_buffer_t *b0, *b1;
+      u8 *t0, *t1;
+
+      /* Prefetch next iteration. */
+      vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
+      vlib_prefetch_buffer_with_index (vm, from[3], LOAD);
+
+      bi0 = from[0];
+      bi1 = from[1];
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t0 = vlib_add_trace (vm, node, b0, n_buffer_data_bytes_in_trace);
+	  clib_memcpy (t0, b0->data + b0->current_data,
+		       n_buffer_data_bytes_in_trace);
+	}
+      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t1 = vlib_add_trace (vm, node, b1, n_buffer_data_bytes_in_trace);
+	  clib_memcpy (t1, b1->data + b1->current_data,
+		       n_buffer_data_bytes_in_trace);
+	}
+      from += 2;
+      n_left -= 2;
+    }
+
+  while (n_left >= 1)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      u8 *t0;
+
+      bi0 = from[0];
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t0 = vlib_add_trace (vm, node, b0, n_buffer_data_bytes_in_trace);
+	  clib_memcpy (t0, b0->data + b0->current_data,
+		       n_buffer_data_bytes_in_trace);
+	}
+      from += 1;
+      n_left -= 1;
+    }
+}
+
+/* Free up all trace buffer memory. */
+always_inline void
+clear_trace_buffer (void)
+{
+  int i;
+  vlib_trace_main_t *tm;
+
+  /* *INDENT-OFF* */
+  foreach_vlib_main (
+  ({
+    void *mainheap;
+
+    tm = &this_vlib_main->trace_main;
+    mainheap = clib_mem_set_heap (this_vlib_main->heap_base);
+
+    tm->trace_active_hint = 0;
+
+    for (i = 0; i < vec_len (tm->trace_buffer_pool); i++)
+      if (! pool_is_free_index (tm->trace_buffer_pool, i))
+        vec_free (tm->trace_buffer_pool[i]);
+    pool_free (tm->trace_buffer_pool);
+    clib_mem_set_heap (mainheap);
+  }));
+  /* *INDENT-ON* */
+}
+
+static u8 *
+format_vlib_trace (u8 * s, va_list * va)
+{
+  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
+  vlib_trace_header_t *h = va_arg (*va, vlib_trace_header_t *);
+  vlib_trace_header_t *e = vec_end (h);
+  vlib_node_t *node, *prev_node;
+  clib_time_t *ct = &vm->clib_time;
+  f64 t;
+
+  prev_node = 0;
+  while (h < e)
+    {
+      node = vlib_get_node (vm, h->node_index);
+
+      if (node != prev_node)
+	{
+	  t =
+	    (h->time - vm->cpu_time_main_loop_start) * ct->seconds_per_clock;
+	  s =
+	    format (s, "\n%U: %v", format_time_interval, "h:m:s:u", t,
+		    node->name);
+	}
+      prev_node = node;
+
+      if (node->format_trace)
+	s = format (s, "\n  %U", node->format_trace, vm, node, h->data);
+      else
+	s = format (s, "\n  %U", node->format_buffer, h->data);
+
+      h = vlib_trace_header_next (h);
+    }
+
+  return s;
+}
+
+/* Root of all trace cli commands. */
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (trace_cli_command,static) = {
+  .path = "trace",
+  .short_help = "Packet tracer commands",
+};
+/* *INDENT-ON* */
+
+static int
+trace_cmp (void *a1, void *a2)
+{
+  vlib_trace_header_t **t1 = a1;
+  vlib_trace_header_t **t2 = a2;
+  i64 dt = t1[0]->time - t2[0]->time;
+  return dt < 0 ? -1 : (dt > 0 ? +1 : 0);
+}
+
+/*
+ * Return 1 if this packet passes the trace filter, or 0 otherwise
+ */
+u32
+filter_accept (vlib_trace_main_t * tm, vlib_trace_header_t * h)
+{
+  vlib_trace_header_t *e = vec_end (h);
+
+  if (tm->filter_flag == 0)
+    return 1;
+
+  if (tm->filter_flag == FILTER_FLAG_INCLUDE)
+    {
+      while (h < e)
+	{
+	  if (h->node_index == tm->filter_node_index)
+	    return 1;
+	  h = vlib_trace_header_next (h);
+	}
+      return 0;
+    }
+  else				/* FILTER_FLAG_EXCLUDE */
+    {
+      while (h < e)
+	{
+	  if (h->node_index == tm->filter_node_index)
+	    return 0;
+	  h = vlib_trace_header_next (h);
+	}
+      return 1;
+    }
+
+  return 0;
+}
+
+/*
+ * Remove traces from the trace buffer pool that don't pass the filter
+ */
+void
+trace_apply_filter (vlib_main_t * vm)
+{
+  vlib_trace_main_t *tm = &vm->trace_main;
+  vlib_trace_header_t **h;
+  vlib_trace_header_t ***traces_to_remove = 0;
+  u32 index;
+  u32 trace_index;
+  u32 n_accepted;
+
+  u32 accept;
+
+  if (tm->filter_flag == FILTER_FLAG_NONE)
+    return;
+
+  /*
+   * Ideally we would retain the first N traces that pass the filter instead
+   * of any N traces.
+   */
+  n_accepted = 0;
+  /* *INDENT-OFF* */
+  pool_foreach (h, tm->trace_buffer_pool,
+   ({
+      accept = filter_accept(tm, h[0]);
+
+      if ((n_accepted == tm->filter_count) || !accept)
+          vec_add1 (traces_to_remove, h);
+      else
+          n_accepted++;
+  }));
+  /* *INDENT-ON* */
+
+  /* remove all traces that we don't want to keep */
+  for (index = 0; index < vec_len (traces_to_remove); index++)
+    {
+      trace_index = traces_to_remove[index] - tm->trace_buffer_pool;
+      _vec_len (tm->trace_buffer_pool[trace_index]) = 0;
+      pool_put_index (tm->trace_buffer_pool, trace_index);
+    }
+
+  vec_free (traces_to_remove);
+}
+
+static clib_error_t *
+cli_show_trace_buffer (vlib_main_t * vm,
+		       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vlib_trace_main_t *tm;
+  vlib_trace_header_t **h, **traces;
+  u32 i, index = 0;
+  char *fmt;
+  u8 *s = 0;
+  u32 max;
+
+  /*
+   * By default display only this many traces. To display more, explicitly
+   * specify a max. This prevents unexpectedly huge outputs.
+   */
+  max = 50;
+  while (unformat_check_input (input) != (uword) UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "max %d", &max))
+	;
+      else
+	return clib_error_create ("expected 'max COUNT', got `%U'",
+				  format_unformat_error, input);
+    }
+
+
+  /* Get active traces from pool. */
+
+  /* *INDENT-OFF* */
+  foreach_vlib_main (
+  ({
+    void *mainheap;
+
+    fmt = "------------------- Start of thread %d %s -------------------\n";
+    s = format (s, fmt, index, vlib_worker_threads[index].name);
+
+    tm = &this_vlib_main->trace_main;
+
+    mainheap = clib_mem_set_heap (this_vlib_main->heap_base);
+
+    trace_apply_filter(this_vlib_main);
+
+    traces = 0;
+    pool_foreach (h, tm->trace_buffer_pool,
+    ({
+      vec_add1 (traces, h[0]);
+    }));
+
+    if (vec_len (traces) == 0)
+      {
+        clib_mem_set_heap (mainheap);
+        s = format (s, "No packets in trace buffer\n");
+        goto done;
+      }
+
+    /* Sort them by increasing time. */
+    vec_sort_with_function (traces, trace_cmp);
+
+    for (i = 0; i < vec_len (traces); i++)
+      {
+        if (i == max)
+          {
+            vlib_cli_output (vm, "Limiting display to %d packets."
+                                 " To display more specify max.", max);
+            goto done;
+          }
+
+        clib_mem_set_heap (mainheap);
+
+        s = format (s, "Packet %d\n%U\n\n", i + 1,
+                         format_vlib_trace, vm, traces[i]);
+
+        mainheap = clib_mem_set_heap (this_vlib_main->heap_base);
+      }
+
+  done:
+    vec_free (traces);
+    clib_mem_set_heap (mainheap);
+
+    index++;
+  }));
+  /* *INDENT-ON* */
+
+  vlib_cli_output (vm, "%v", s);
+  vec_free (s);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_trace_cli,static) = {
+  .path = "show trace",
+  .short_help = "Show trace buffer [max COUNT]",
+  .function = cli_show_trace_buffer,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+cli_add_trace_buffer (vlib_main_t * vm,
+		      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  vlib_trace_main_t *tm;
+  vlib_trace_node_t *tn;
+  u32 node_index, add;
+  u8 verbose = 0;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != (uword) UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "%U %d",
+		    unformat_vlib_node, vm, &node_index, &add))
+	;
+      else if (unformat (line_input, "verbose"))
+	verbose = 1;
+      else
+	return clib_error_create ("expected NODE COUNT, got `%U'",
+				  format_unformat_error, line_input);
+    }
+
+  /* *INDENT-OFF* */
+  foreach_vlib_main ((
+    {
+      void *oldheap;
+      tm = &this_vlib_main->trace_main;
+      tm->trace_active_hint = 1;
+      tm->verbose = verbose;
+      oldheap =
+	clib_mem_set_heap (this_vlib_main->heap_base);
+      vec_validate (tm->nodes, node_index);
+      tn = tm->nodes + node_index;
+      tn->limit += add; clib_mem_set_heap (oldheap);
+    }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (add_trace_cli,static) = {
+  .path = "trace add",
+  .short_help = "Trace given number of packets",
+  .function = cli_add_trace_buffer,
+};
+/* *INDENT-ON* */
+
+
+/*
+ * Configure a filter for packet traces.
+ *
+ * This supplements the packet trace feature so that only packets matching
+ * the filter are included in the trace. Currently the only filter is to
+ * keep packets that include a certain node in the trace or exclude a certain
+ * node in the trace.
+ *
+ * The count of traced packets in the "trace add" command is still used to
+ * create a certain number of traces. The "trace filter" command specifies
+ * how many of those packets should be retained in the trace.
+ *
+ * For example, 1Mpps of traffic is arriving and one of those packets is being
+ * dropped. To capture the trace for only that dropped packet, you can do:
+ *     trace filter include error-drop 1
+ *     trace add dpdk-input 1000000
+ *     <wait one second>
+ *     show trace
+ *
+ * Note that the filter could be implemented by capturing all traces and just
+ * reducing traces displayed by the "show trace" function. But that would
+ * require a lot of memory for storing the traces, making that infeasible.
+ *
+ * To remove traces from the trace pool that do not include a certain node
+ * requires that the trace be "complete" before applying the filter. To
+ * accomplish this, the trace pool is filtered upon each iteraction of the
+ * main vlib loop. Doing so keeps the number of allocated traces down to a
+ * reasonably low number. This requires that tracing for a buffer is not
+ * performed after the vlib main loop interation completes. i.e. you can't
+ * save away a buffer temporarily then inject it back into the graph and
+ * expect that the trace_index is still valid (such as a traffic manager might
+ * do). A new trace buffer should be allocated for those types of packets.
+ *
+ * The filter can be extended to support multiple nodes and other match
+ * criteria (e.g. input sw_if_index, mac address) but for now just checks if
+ * a specified node is in the trace or not in the trace.
+ */
+static clib_error_t *
+cli_filter_trace (vlib_main_t * vm,
+		  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vlib_trace_main_t *tm = &vm->trace_main;
+  u32 filter_node_index;
+  u32 filter_flag;
+  u32 filter_count;
+  void *mainheap;
+
+  if (unformat (input, "include %U %d",
+		unformat_vlib_node, vm, &filter_node_index, &filter_count))
+    {
+      filter_flag = FILTER_FLAG_INCLUDE;
+    }
+  else if (unformat (input, "exclude %U %d",
+		     unformat_vlib_node, vm, &filter_node_index,
+		     &filter_count))
+    {
+      filter_flag = FILTER_FLAG_EXCLUDE;
+    }
+  else if (unformat (input, "none"))
+    {
+      filter_flag = FILTER_FLAG_NONE;
+      filter_node_index = 0;
+      filter_count = 0;
+    }
+  else
+    return
+      clib_error_create
+      ("expected 'include NODE COUNT' or 'exclude NODE COUNT' or 'none', got `%U'",
+       format_unformat_error, input);
+
+  /* *INDENT-OFF* */
+  foreach_vlib_main (
+    ({
+    tm = &this_vlib_main->trace_main;
+    tm->filter_node_index = filter_node_index;
+    tm->filter_flag = filter_flag;
+    tm->filter_count = filter_count;
+
+    /*
+     * Clear the trace limits to stop any in-progress tracing
+     * Prevents runaway trace allocations when the filter changes (or is removed)
+     */
+    mainheap = clib_mem_set_heap (this_vlib_main->heap_base);
+    vec_free (tm->nodes);
+    clib_mem_set_heap (mainheap);
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (filter_trace_cli,static) = {
+  .path = "trace filter",
+  .short_help = "filter trace output - include NODE COUNT | exclude NODE COUNT | none",
+  .function = cli_filter_trace,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+cli_clear_trace_buffer (vlib_main_t * vm,
+			unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  clear_trace_buffer ();
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (clear_trace_cli,static) = {
+  .path = "clear trace",
+  .short_help = "Clear trace buffer and free memory",
+  .function = cli_clear_trace_buffer,
+};
+/* *INDENT-ON* */
+
+/* Dummy function to get us linked in. */
+void
+vlib_trace_cli_reference (void)
+{
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/trace.h b/src/vlib/trace.h
new file mode 100644
index 00000000..fc0fc5c8
--- /dev/null
+++ b/src/vlib/trace.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * trace.h: VLIB trace buffer.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_trace_h
+#define included_vlib_trace_h
+
+#include <vppinfra/pool.h>
+
+typedef struct
+{
+  /* CPU time stamp trace was made. */
+  u64 time;
+
+  /* Node which generated this trace. */
+  u32 node_index;
+
+  /* Number of data words in this trace. */
+  u32 n_data;
+
+  /* Trace data follows. */
+  u8 data[0];
+} vlib_trace_header_t;
+
+typedef struct
+{
+  /* Current number of traces in buffer. */
+  u32 count;
+
+  /* Max. number of traces to be added to buffer. */
+  u32 limit;
+} vlib_trace_node_t;
+
+typedef struct
+{
+  /* Pool of trace buffers. */
+  vlib_trace_header_t **trace_buffer_pool;
+
+  u32 last_main_loop_count;
+  u32 filter_node_index;
+  u32 filter_flag;
+#define FILTER_FLAG_NONE    0
+#define FILTER_FLAG_INCLUDE 1
+#define FILTER_FLAG_EXCLUDE 2
+  u32 filter_count;
+
+  /* set on trace add, cleared on clear trace */
+  u32 trace_active_hint;
+
+  /* Per node trace counts. */
+  vlib_trace_node_t *nodes;
+
+  /* verbosity */
+  int verbose;
+} vlib_trace_main_t;
+
+#endif /* included_vlib_trace_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/trace_funcs.h b/src/vlib/trace_funcs.h
new file mode 100644
index 00000000..5280eae9
--- /dev/null
+++ b/src/vlib/trace_funcs.h
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * trace_funcs.h: VLIB trace buffer.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_trace_funcs_h
+#define included_vlib_trace_funcs_h
+
+always_inline void
+vlib_validate_trace (vlib_trace_main_t * tm, vlib_buffer_t * b)
+{
+  /*
+   * this assert seems right, but goes off constantly.
+   * disabling it appears to make the pain go away
+   */
+  ASSERT (1 || b->flags & VLIB_BUFFER_IS_TRACED);
+  ASSERT (!pool_is_free_index (tm->trace_buffer_pool, b->trace_index));
+}
+
+always_inline void *
+vlib_add_trace (vlib_main_t * vm,
+		vlib_node_runtime_t * r, vlib_buffer_t * b, u32 n_data_bytes)
+{
+  vlib_trace_main_t *tm = &vm->trace_main;
+  vlib_trace_header_t *h;
+  u32 n_data_words;
+
+  vlib_validate_trace (tm, b);
+
+  n_data_bytes = round_pow2 (n_data_bytes, sizeof (h[0]));
+  n_data_words = n_data_bytes / sizeof (h[0]);
+  vec_add2_aligned (tm->trace_buffer_pool[b->trace_index], h,
+		    1 + n_data_words, sizeof (h[0]));
+
+  h->time = vm->cpu_time_last_node_dispatch;
+  h->n_data = n_data_words;
+  h->node_index = r->node_index;
+
+  return h->data;
+}
+
+always_inline vlib_trace_header_t *
+vlib_trace_header_next (vlib_trace_header_t * h)
+{
+  return h + 1 + h->n_data;
+}
+
+always_inline void
+vlib_free_trace (vlib_main_t * vm, vlib_buffer_t * b)
+{
+  vlib_trace_main_t *tm = &vm->trace_main;
+  vlib_validate_trace (tm, b);
+  _vec_len (tm->trace_buffer_pool[b->trace_index]) = 0;
+  pool_put_index (tm->trace_buffer_pool, b->trace_index);
+}
+
+always_inline void
+vlib_trace_next_frame (vlib_main_t * vm,
+		       vlib_node_runtime_t * r, u32 next_index)
+{
+  vlib_next_frame_t *nf;
+  nf = vlib_node_runtime_get_next_frame (vm, r, next_index);
+  nf->flags |= VLIB_FRAME_TRACE;
+}
+
+void trace_apply_filter (vlib_main_t * vm);
+
+/* Mark buffer as traced and allocate trace buffer. */
+always_inline void
+vlib_trace_buffer (vlib_main_t * vm,
+		   vlib_node_runtime_t * r,
+		   u32 next_index, vlib_buffer_t * b, int follow_chain)
+{
+  vlib_trace_main_t *tm = &vm->trace_main;
+  vlib_trace_header_t **h;
+
+  /*
+   * Apply filter to existing traces to keep number of allocated traces low.
+   * Performed each time around the main loop.
+   */
+  if (tm->last_main_loop_count != vm->main_loop_count)
+    {
+      tm->last_main_loop_count = vm->main_loop_count;
+      trace_apply_filter (vm);
+    }
+
+  vlib_trace_next_frame (vm, r, next_index);
+
+  pool_get (tm->trace_buffer_pool, h);
+
+  do
+    {
+      b->flags |= VLIB_BUFFER_IS_TRACED;
+      b->trace_index = h - tm->trace_buffer_pool;
+    }
+  while (follow_chain && (b = vlib_get_next_buffer (vm, b)));
+}
+
+always_inline void
+vlib_buffer_copy_trace_flag (vlib_main_t * vm, vlib_buffer_t * b,
+			     u32 bi_target)
+{
+  vlib_buffer_t *b_target = vlib_get_buffer (vm, bi_target);
+  b_target->flags |= b->flags & VLIB_BUFFER_IS_TRACED;
+  b_target->trace_index = b->trace_index;
+}
+
+always_inline u32
+vlib_get_trace_count (vlib_main_t * vm, vlib_node_runtime_t * rt)
+{
+  vlib_trace_main_t *tm = &vm->trace_main;
+  vlib_trace_node_t *tn;
+  int n;
+
+  if (rt->node_index >= vec_len (tm->nodes))
+    return 0;
+  tn = tm->nodes + rt->node_index;
+  n = tn->limit - tn->count;
+  ASSERT (n >= 0);
+
+  return n;
+}
+
+always_inline void
+vlib_set_trace_count (vlib_main_t * vm, vlib_node_runtime_t * rt, u32 count)
+{
+  vlib_trace_main_t *tm = &vm->trace_main;
+  vlib_trace_node_t *tn = vec_elt_at_index (tm->nodes, rt->node_index);
+
+  ASSERT (count <= tn->limit);
+  tn->count = tn->limit - count;
+}
+
+/* Helper function for nodes which only trace buffer data. */
+void
+vlib_trace_frame_buffers_only (vlib_main_t * vm,
+			       vlib_node_runtime_t * node,
+			       u32 * buffers,
+			       uword n_buffers,
+			       uword next_buffer_stride,
+			       uword n_buffer_data_bytes_in_trace);
+
+#endif /* included_vlib_trace_funcs_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/unix/cj.c b/src/vlib/unix/cj.c
new file mode 100644
index 00000000..33ba163a
--- /dev/null
+++ b/src/vlib/unix/cj.c
@@ -0,0 +1,271 @@
+/*
+ *------------------------------------------------------------------
+ * cj.c
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+/**
+ * @file
+ * Circular joournal diagnostic mechanism.
+ *
+ * The @c cj thread-safe circular log buffer scheme is occasionally useful
+ * when chasing bugs. Calls to it should not be checked in.
+ */
+/*? %%clicmd:group_label Circular Journal %% ?*/
+/*? %%syscfg:group_label Circular Journal %% ?*/
+
+#include <stdio.h>
+#include <vlib/vlib.h>
+
+#include <vlib/unix/cj.h>
+
+cj_main_t cj_main;
+
+void
+cj_log (u32 type, void *data0, void *data1)
+{
+  u64 new_tail;
+  cj_main_t *cjm = &cj_main;
+  cj_record_t *r;
+
+  if (cjm->enable == 0)
+    return;
+
+  new_tail = __sync_add_and_fetch (&cjm->tail, 1);
+
+  r = (cj_record_t *) & (cjm->records[new_tail & (cjm->num_records - 1)]);
+  r->time = vlib_time_now (cjm->vlib_main);
+  r->cpu = os_get_cpu_number ();
+  r->type = type;
+  r->data[0] = pointer_to_uword (data0);
+  r->data[1] = pointer_to_uword (data1);
+}
+
+void
+cj_stop (void)
+{
+  cj_main_t *cjm = &cj_main;
+
+  cjm->enable = 0;
+}
+
+
+clib_error_t *
+cj_init (vlib_main_t * vm)
+{
+  cj_main_t *cjm = &cj_main;
+
+  cjm->vlib_main = vm;
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (cj_init);
+
+static clib_error_t *
+cj_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  cj_main_t *cjm = &cj_main;
+  int matched = 0;
+  int enable = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "records %d", &cjm->num_records))
+	matched = 1;
+      else if (unformat (input, "on"))
+	enable = 1;
+      else
+	return clib_error_return (0, "cj_config: unknown input '%U'",
+				  format_unformat_error, input);
+    }
+
+  if (matched == 0)
+    return 0;
+
+  cjm->num_records = max_pow2 (cjm->num_records);
+  vec_validate (cjm->records, cjm->num_records - 1);
+  memset (cjm->records, 0xff, cjm->num_records * sizeof (cj_record_t));
+  cjm->tail = ~0;
+  cjm->enable = enable;
+
+  return 0;
+}
+
+/*?
+ * Configure the circular journal diagnostic mechanism. This is only useful
+ * if you, the deveoper, have written code to make use of the circular
+ * journal.
+ *
+ * @cfgcmd{records, &lt;number&gt;}
+ * Configure the number of records to allocate for the circular journal.
+ *
+ * @cfgcmd{on}
+ * Enable the collection of records in the circular journal at the
+ * earliest opportunity.
+?*/
+VLIB_CONFIG_FUNCTION (cj_config, "cj");
+
+void
+cj_enable_disable (int is_enable)
+{
+  cj_main_t *cjm = &cj_main;
+
+  if (cjm->num_records)
+    cjm->enable = is_enable;
+  else
+    vlib_cli_output (cjm->vlib_main, "CJ not configured...");
+}
+
+static inline void
+cj_dump_one_record (cj_record_t * r)
+{
+  fprintf (stderr, "[%d]: %10.6f T%02d %llx %llx\n",
+	   r->cpu, r->time, r->type, (long long unsigned int) r->data[0],
+	   (long long unsigned int) r->data[1]);
+}
+
+static void
+cj_dump_internal (u8 filter0_enable, u64 filter0,
+		  u8 filter1_enable, u64 filter1)
+{
+  cj_main_t *cjm = &cj_main;
+  cj_record_t *r;
+  u32 i, index;
+
+  if (cjm->num_records == 0)
+    {
+      fprintf (stderr, "CJ not configured...\n");
+      return;
+    }
+
+  if (cjm->tail == (u64) ~ 0)
+    {
+      fprintf (stderr, "No data collected...\n");
+      return;
+    }
+
+  /* Has the trace wrapped? */
+  index = (cjm->tail + 1) & (cjm->num_records - 1);
+  r = &(cjm->records[index]);
+
+  if (r->cpu != (u32) ~ 0)
+    {
+      /* Yes, dump from tail + 1 to the end */
+      for (i = index; i < cjm->num_records; i++)
+	{
+	  if (filter0_enable && (r->data[0] != filter0))
+	    goto skip;
+	  if (filter1_enable && (r->data[1] != filter1))
+	    goto skip;
+	  cj_dump_one_record (r);
+	skip:
+	  r++;
+	}
+    }
+  /* dump from the beginning through the final tail */
+  r = cjm->records;
+  for (i = 0; i <= cjm->tail; i++)
+    {
+      if (filter0_enable && (r->data[0] != filter0))
+	goto skip2;
+      if (filter1_enable && (r->data[1] != filter1))
+	goto skip2;
+      cj_dump_one_record (r);
+    skip2:
+      r++;
+    }
+}
+
+void
+cj_dump (void)
+{
+  cj_dump_internal (0, 0, 0, 0);
+}
+
+void
+cj_dump_filter_data0 (u64 filter0)
+{
+  cj_dump_internal (1 /* enable f0 */ , filter0, 0, 0);
+}
+
+void
+cj_dump_filter_data1 (u64 filter1)
+{
+  cj_dump_internal (0, 0, 1 /* enable f1 */ , filter1);
+}
+
+void
+cj_dump_filter_data12 (u64 filter0, u64 filter1)
+{
+  cj_dump_internal (1, filter0, 1, filter1);
+}
+
+static clib_error_t *
+cj_command_fn (vlib_main_t * vm,
+	       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  int is_enable = -1;
+  int is_dump = -1;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "enable") || unformat (input, "on"))
+	is_enable = 1;
+      else if (unformat (input, "disable") || unformat (input, "off"))
+	is_enable = 0;
+      else if (unformat (input, "dump"))
+	is_dump = 1;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+
+  if (is_enable >= 0)
+    cj_enable_disable (is_enable);
+
+  if (is_dump > 0)
+    cj_dump ();
+
+  return 0;
+}
+
+/*?
+ * Enable, disable the collection of diagnostic data into a
+ * circular journal or dump the circular journal diagnostic data.
+ * This is only useful if you, the deveoper, have written code to make
+ * use of the circular journal.
+ *
+ * When dumping the data it is formatted and sent to @c stderr of the
+ * VPP process; when running VPP in <code>unix interactive</code> mode
+ * this is typically the same place as the Debug CLI.
+?*/
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cj_command,static) = {
+  .path = "cj",
+  .short_help = "cj <enable | disable | dump>",
+  .function = cj_command_fn,
+};
+/* *INDENT-ON* */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/unix/cj.h b/src/vlib/unix/cj.h
new file mode 100644
index 00000000..67626afe
--- /dev/null
+++ b/src/vlib/unix/cj.h
@@ -0,0 +1,79 @@
+/*
+ *------------------------------------------------------------------
+ * cj.h
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef __included_cj_h__
+#define __included_cj_h__
+
+typedef struct
+{
+  f64 time;
+  u32 cpu;
+  u32 type;
+  u64 data[2];
+} cj_record_t;
+
+typedef struct
+{
+  volatile u64 tail;
+  cj_record_t *records;
+  u32 num_records;
+  volatile u32 enable;
+
+  vlib_main_t *vlib_main;
+} cj_main_t;
+
+void cj_log (u32 type, void *data0, void *data1);
+
+/*
+ * Supply in application main, so we can log from any library...
+ * Declare a weak reference in the library, off you go.
+ */
+
+#define DECLARE_CJ_GLOBAL_LOG                                   \
+void cj_global_log (unsigned type, void * data0, void * data1)  \
+  __attribute__ ((weak));                                       \
+                                                                \
+unsigned __cj_type;                                             \
+void * __cj_data0;                                              \
+void * __cj_data1;                                              \
+                                                                \
+void                                                            \
+cj_global_log (unsigned type, void * data0, void * data1)       \
+{                                                               \
+  __cj_type = type;                                             \
+  __cj_data0 = data0;                                           \
+  __cj_data1 = data1;                                           \
+}
+
+#define CJ_GLOBAL_LOG_PROTOTYPE
+void
+cj_global_log (unsigned type, void *data0, void *data1)
+__attribute__ ((weak));
+
+void cj_stop (void);
+
+#endif /* __included_cj_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/unix/cli.c b/src/vlib/unix/cli.c
new file mode 100644
index 00000000..69fca6ec
--- /dev/null
+++ b/src/vlib/unix/cli.c
@@ -0,0 +1,2989 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * cli.c: Unix stdin/socket CLI.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/**
+ * @file
+ * @brief Unix stdin/socket command line interface.
+ * Provides a command line interface so humans can interact with VPP.
+ * This is predominantly a debugging and testing mechanism.
+ */
+/*? %%clicmd:group_label Command line session %% ?*/
+/*? %%syscfg:group_label Command line session %% ?*/
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vppinfra/timer.h>
+
+#include <ctype.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <termios.h>
+#include <signal.h>
+#include <unistd.h>
+#include <arpa/telnet.h>
+#include <sys/ioctl.h>
+
+/** ANSI escape code. */
+#define ESC "\x1b"
+
+/** ANSI Control Sequence Introducer. */
+#define CSI ESC "["
+
+/** ANSI clear screen. */
+#define ANSI_CLEAR      CSI "2J" CSI "1;1H"
+/** ANSI reset color settings. */
+#define ANSI_RESET      CSI "0m"
+/** ANSI Start bold text. */
+#define ANSI_BOLD       CSI "1m"
+/** ANSI Stop bold text. */
+#define ANSI_DIM        CSI "2m"
+/** ANSI Start dark red text. */
+#define ANSI_DRED       ANSI_DIM CSI "31m"
+/** ANSI Start bright red text. */
+#define ANSI_BRED       ANSI_BOLD CSI "31m"
+/** ANSI clear line cursor is on. */
+#define ANSI_CLEARLINE  CSI "2K"
+/** ANSI scroll screen down one line. */
+#define ANSI_SCROLLDN   CSI "1T"
+/** ANSI save cursor position. */
+#define ANSI_SAVECURSOR CSI "s"
+/** ANSI restore cursor position if previously saved. */
+#define ANSI_RESTCURSOR CSI "u"
+
+/** Maximum depth into a byte stream from which to compile a Telnet
+ * protocol message. This is a saftey measure. */
+#define UNIX_CLI_MAX_DEPTH_TELNET 24
+
+/** Unix standard in */
+#define UNIX_CLI_STDIN_FD 0
+
+
+/** A CLI banner line. */
+typedef struct
+{
+  u8 *line;	/**< The line to print. */
+  u32 length;	/**< The length of the line without terminating NUL. */
+} unix_cli_banner_t;
+
+#define _(a) { .line = (u8 *)(a), .length = sizeof(a) - 1 }
+/** Plain welcome banner. */
+static unix_cli_banner_t unix_cli_banner[] = {
+  _("    _______    _        _   _____  ___ \n"),
+  _(" __/ __/ _ \\  (_)__    | | / / _ \\/ _ \\\n"),
+  _(" _/ _// // / / / _ \\   | |/ / ___/ ___/\n"),
+  _(" /_/ /____(_)_/\\___/   |___/_/  /_/    \n"),
+  _("\n")
+};
+
+/** ANSI color welcome banner. */
+static unix_cli_banner_t unix_cli_banner_color[] = {
+  _(ANSI_BRED "    _______    _     " ANSI_RESET "   _   _____  ___ \n"),
+  _(ANSI_BRED " __/ __/ _ \\  (_)__ " ANSI_RESET "   | | / / _ \\/ _ \\\n"),
+  _(ANSI_BRED " _/ _// // / / / _ \\" ANSI_RESET "   | |/ / ___/ ___/\n"),
+  _(ANSI_BRED " /_/ /____(_)_/\\___/" ANSI_RESET "   |___/_/  /_/    \n"),
+  _("\n")
+};
+
+#undef _
+
+/** Pager line index */
+typedef struct
+{
+  /** Index into pager_vector */
+  u32 line;
+
+  /** Offset of the string in the line */
+  u32 offset;
+
+  /** Length of the string in the line */
+  u32 length;
+} unix_cli_pager_index_t;
+
+
+/** Unix CLI session. */
+typedef struct
+{
+  /** The file index held by unix.c */
+  u32 unix_file_index;
+
+  /** Vector of output pending write to file descriptor. */
+  u8 *output_vector;
+
+  /** Vector of input saved by Unix input node to be processed by
+     CLI process. */
+  u8 *input_vector;
+
+  /** This session has command history. */
+  u8 has_history;
+  /** Array of vectors of commands in the history. */
+  u8 **command_history;
+  /** The command currently pointed at by the history cursor. */
+  u8 *current_command;
+  /** How far from the end of the history array the user has browsed. */
+  i32 excursion;
+
+  /** Maximum number of history entries this session will store. */
+  u32 history_limit;
+
+  /** Current command line counter */
+  u32 command_number;
+
+  /** The string being searched for in the history. */
+  u8 *search_key;
+  /** If non-zero then the CLI is searching in the history array.
+   * - @c -1 means search backwards.
+   * - @c 1 means search forwards.
+   */
+  int search_mode;
+
+  /** Position of the insert cursor on the current input line */
+  u32 cursor;
+
+  /** Line mode or char mode */
+  u8 line_mode;
+
+  /** Set if the CRLF mode wants CR + LF */
+  u8 crlf_mode;
+
+  /** Can we do ANSI output? */
+  u8 ansi_capable;
+
+  /** Has the session started? */
+  u8 started;
+
+  /** Disable the pager? */
+  u8 no_pager;
+
+  /** Pager buffer */
+  u8 **pager_vector;
+
+  /** Index of line fragments in the pager buffer */
+  unix_cli_pager_index_t *pager_index;
+
+  /** Line number of top of page */
+  u32 pager_start;
+
+  /** Terminal width */
+  u32 width;
+
+  /** Terminal height */
+  u32 height;
+
+  /** Process node identifier */
+  u32 process_node_index;
+} unix_cli_file_t;
+
+/** Resets the pager buffer and other data.
+ * @param f The CLI session whose pager needs to be reset.
+ */
+always_inline void
+unix_cli_pager_reset (unix_cli_file_t * f)
+{
+  u8 **p;
+
+  f->pager_start = 0;
+
+  vec_free (f->pager_index);
+  f->pager_index = 0;
+
+  vec_foreach (p, f->pager_vector)
+  {
+    vec_free (*p);
+  }
+  vec_free (f->pager_vector);
+  f->pager_vector = 0;
+}
+
+/** Release storage used by a CLI session.
+ * @param f The CLI session whose storage needs to be released.
+ */
+always_inline void
+unix_cli_file_free (unix_cli_file_t * f)
+{
+  vec_free (f->output_vector);
+  vec_free (f->input_vector);
+  unix_cli_pager_reset (f);
+}
+
+/** CLI actions */
+typedef enum
+{
+  UNIX_CLI_PARSE_ACTION_NOACTION = 0,	/**< No action */
+  UNIX_CLI_PARSE_ACTION_CRLF,		/**< Carriage return, newline or enter */
+  UNIX_CLI_PARSE_ACTION_TAB,		/**< Tab key */
+  UNIX_CLI_PARSE_ACTION_ERASE,		/**< Erase cursor left */
+  UNIX_CLI_PARSE_ACTION_ERASERIGHT,	/**< Erase cursor right */
+  UNIX_CLI_PARSE_ACTION_UP,		/**< Up arrow */
+  UNIX_CLI_PARSE_ACTION_DOWN,		/**< Down arrow */
+  UNIX_CLI_PARSE_ACTION_LEFT,		/**< Left arrow */
+  UNIX_CLI_PARSE_ACTION_RIGHT,		/**< Right arrow */
+  UNIX_CLI_PARSE_ACTION_HOME,		/**< Home key (jump to start of line) */
+  UNIX_CLI_PARSE_ACTION_END,		/**< End key (jump to end of line) */
+  UNIX_CLI_PARSE_ACTION_WORDLEFT,	/**< Jump cursor to start of left word */
+  UNIX_CLI_PARSE_ACTION_WORDRIGHT,	/**< Jump cursor to start of right word */
+  UNIX_CLI_PARSE_ACTION_ERASELINELEFT,	/**< Erase line to left of cursor */
+  UNIX_CLI_PARSE_ACTION_ERASELINERIGHT,	/**< Erase line to right & including cursor */
+  UNIX_CLI_PARSE_ACTION_CLEAR,		/**< Clear the terminal */
+  UNIX_CLI_PARSE_ACTION_REVSEARCH,	/**< Search backwards in command history */
+  UNIX_CLI_PARSE_ACTION_FWDSEARCH,	/**< Search forwards in command history */
+  UNIX_CLI_PARSE_ACTION_YANK,		/**< Undo last erase action */
+  UNIX_CLI_PARSE_ACTION_TELNETIAC,	/**< Telnet control code */
+
+  UNIX_CLI_PARSE_ACTION_PAGER_CRLF,	/**< Enter pressed (CR, CRLF, LF, etc) */
+  UNIX_CLI_PARSE_ACTION_PAGER_QUIT,	/**< Exit the pager session */
+  UNIX_CLI_PARSE_ACTION_PAGER_NEXT,	/**< Scroll to next page */
+  UNIX_CLI_PARSE_ACTION_PAGER_DN,	/**< Scroll to next line */
+  UNIX_CLI_PARSE_ACTION_PAGER_UP,	/**< Scroll to previous line */
+  UNIX_CLI_PARSE_ACTION_PAGER_TOP,	/**< Scroll to first line */
+  UNIX_CLI_PARSE_ACTION_PAGER_BOTTOM,	/**< Scroll to last line */
+  UNIX_CLI_PARSE_ACTION_PAGER_PGDN,	/**< Scroll to next page */
+  UNIX_CLI_PARSE_ACTION_PAGER_PGUP,	/**< Scroll to previous page */
+  UNIX_CLI_PARSE_ACTION_PAGER_REDRAW,	/**< Clear and redraw the page on the terminal */
+  UNIX_CLI_PARSE_ACTION_PAGER_SEARCH,	/**< Search the pager buffer */
+
+  UNIX_CLI_PARSE_ACTION_PARTIALMATCH,	/**< Action parser found a partial match */
+  UNIX_CLI_PARSE_ACTION_NOMATCH		/**< Action parser did not find any match */
+} unix_cli_parse_action_t;
+
+/** @brief Mapping of input buffer strings to action values.
+ * @note This won't work as a hash since we need to be able to do
+ *       partial matches on the string.
+ */
+typedef struct
+{
+  u8 *input;			    /**< Input string to match. */
+  u32 len;			    /**< Length of input without final NUL. */
+  unix_cli_parse_action_t action;   /**< Action to take when matched. */
+} unix_cli_parse_actions_t;
+
+/** @brief Given a capital ASCII letter character return a @c NUL terminated
+ * string with the control code for that letter.
+ *
+ * @param c An ASCII character.
+ * @return A @c NUL terminated string of type @c u8[].
+ *
+ * @par Example
+ *     @c CTL('A') returns <code>{ 0x01, 0x00 }</code> as a @c u8[].
+ */
+#define CTL(c) (u8[]){ (c) - '@', 0 }
+
+#define _(a,b) { .input = (u8 *)(a), .len = sizeof(a) - 1, .action = (b) }
+/**
+ * Patterns to match on a CLI input stream.
+ * @showinitializer
+ */
+static unix_cli_parse_actions_t unix_cli_parse_strings[] = {
+  /* Line handling */
+  _("\r\n", UNIX_CLI_PARSE_ACTION_CRLF),	/* Must be before '\r' */
+  _("\n", UNIX_CLI_PARSE_ACTION_CRLF),
+  _("\r\0", UNIX_CLI_PARSE_ACTION_CRLF),	/* Telnet does this */
+  _("\r", UNIX_CLI_PARSE_ACTION_CRLF),
+
+  /* Unix shell control codes */
+  _(CTL ('B'), UNIX_CLI_PARSE_ACTION_LEFT),
+  _(CTL ('F'), UNIX_CLI_PARSE_ACTION_RIGHT),
+  _(CTL ('P'), UNIX_CLI_PARSE_ACTION_UP),
+  _(CTL ('N'), UNIX_CLI_PARSE_ACTION_DOWN),
+  _(CTL ('A'), UNIX_CLI_PARSE_ACTION_HOME),
+  _(CTL ('E'), UNIX_CLI_PARSE_ACTION_END),
+  _(CTL ('D'), UNIX_CLI_PARSE_ACTION_ERASERIGHT),
+  _(CTL ('U'), UNIX_CLI_PARSE_ACTION_ERASELINELEFT),
+  _(CTL ('K'), UNIX_CLI_PARSE_ACTION_ERASELINERIGHT),
+  _(CTL ('Y'), UNIX_CLI_PARSE_ACTION_YANK),
+  _(CTL ('L'), UNIX_CLI_PARSE_ACTION_CLEAR),
+  _(ESC "b", UNIX_CLI_PARSE_ACTION_WORDLEFT),	/* Alt-B */
+  _(ESC "f", UNIX_CLI_PARSE_ACTION_WORDRIGHT),	/* Alt-F */
+  _("\b", UNIX_CLI_PARSE_ACTION_ERASE),	/* ^H */
+  _("\x7f", UNIX_CLI_PARSE_ACTION_ERASE),	/* Backspace */
+  _("\t", UNIX_CLI_PARSE_ACTION_TAB),	/* ^I */
+
+  /* VT100 Normal mode - Broadest support */
+  _(CSI "A", UNIX_CLI_PARSE_ACTION_UP),
+  _(CSI "B", UNIX_CLI_PARSE_ACTION_DOWN),
+  _(CSI "C", UNIX_CLI_PARSE_ACTION_RIGHT),
+  _(CSI "D", UNIX_CLI_PARSE_ACTION_LEFT),
+  _(CSI "H", UNIX_CLI_PARSE_ACTION_HOME),
+  _(CSI "F", UNIX_CLI_PARSE_ACTION_END),
+  _(CSI "3~", UNIX_CLI_PARSE_ACTION_ERASERIGHT),	/* Delete */
+  _(CSI "1;5D", UNIX_CLI_PARSE_ACTION_WORDLEFT),	/* C-Left */
+  _(CSI "1;5C", UNIX_CLI_PARSE_ACTION_WORDRIGHT),	/* C-Right */
+
+  /* VT100 Application mode - Some Gnome Terminal functions use these */
+  _(ESC "OA", UNIX_CLI_PARSE_ACTION_UP),
+  _(ESC "OB", UNIX_CLI_PARSE_ACTION_DOWN),
+  _(ESC "OC", UNIX_CLI_PARSE_ACTION_RIGHT),
+  _(ESC "OD", UNIX_CLI_PARSE_ACTION_LEFT),
+  _(ESC "OH", UNIX_CLI_PARSE_ACTION_HOME),
+  _(ESC "OF", UNIX_CLI_PARSE_ACTION_END),
+
+  /* ANSI X3.41-1974 - sent by Microsoft Telnet and PuTTY */
+  _(CSI "1~", UNIX_CLI_PARSE_ACTION_HOME),
+  _(CSI "4~", UNIX_CLI_PARSE_ACTION_END),
+
+  /* Emacs-ish history search */
+  _(CTL ('S'), UNIX_CLI_PARSE_ACTION_FWDSEARCH),
+  _(CTL ('R'), UNIX_CLI_PARSE_ACTION_REVSEARCH),
+
+  /* Other protocol things */
+  _("\xff", UNIX_CLI_PARSE_ACTION_TELNETIAC),	/* IAC */
+  _("\0", UNIX_CLI_PARSE_ACTION_NOACTION),	/* NUL */
+  _(NULL, UNIX_CLI_PARSE_ACTION_NOMATCH)
+};
+
+/**
+ * Patterns to match when a CLI session is in the pager.
+ * @showinitializer
+ */
+static unix_cli_parse_actions_t unix_cli_parse_pager[] = {
+  /* Line handling */
+  _("\r\n", UNIX_CLI_PARSE_ACTION_PAGER_CRLF),	/* Must be before '\r' */
+  _("\n", UNIX_CLI_PARSE_ACTION_PAGER_CRLF),
+  _("\r\0", UNIX_CLI_PARSE_ACTION_PAGER_CRLF),	/* Telnet does this */
+  _("\r", UNIX_CLI_PARSE_ACTION_PAGER_CRLF),
+
+  /* Pager commands */
+  _(" ", UNIX_CLI_PARSE_ACTION_PAGER_NEXT),
+  _("q", UNIX_CLI_PARSE_ACTION_PAGER_QUIT),
+  _(CTL ('L'), UNIX_CLI_PARSE_ACTION_PAGER_REDRAW),
+  _(CTL ('R'), UNIX_CLI_PARSE_ACTION_PAGER_REDRAW),
+  _("/", UNIX_CLI_PARSE_ACTION_PAGER_SEARCH),
+
+  /* VT100 */
+  _(CSI "A", UNIX_CLI_PARSE_ACTION_PAGER_UP),
+  _(CSI "B", UNIX_CLI_PARSE_ACTION_PAGER_DN),
+  _(CSI "H", UNIX_CLI_PARSE_ACTION_PAGER_TOP),
+  _(CSI "F", UNIX_CLI_PARSE_ACTION_PAGER_BOTTOM),
+
+  /* VT100 Application mode */
+  _(ESC "OA", UNIX_CLI_PARSE_ACTION_PAGER_UP),
+  _(ESC "OB", UNIX_CLI_PARSE_ACTION_PAGER_DN),
+  _(ESC "OH", UNIX_CLI_PARSE_ACTION_PAGER_TOP),
+  _(ESC "OF", UNIX_CLI_PARSE_ACTION_PAGER_BOTTOM),
+
+  /* ANSI X3.41-1974 */
+  _(CSI "1~", UNIX_CLI_PARSE_ACTION_PAGER_TOP),
+  _(CSI "4~", UNIX_CLI_PARSE_ACTION_PAGER_BOTTOM),
+  _(CSI "5~", UNIX_CLI_PARSE_ACTION_PAGER_PGUP),
+  _(CSI "6~", UNIX_CLI_PARSE_ACTION_PAGER_PGDN),
+
+  /* Other protocol things */
+  _("\xff", UNIX_CLI_PARSE_ACTION_TELNETIAC),	/* IAC */
+  _("\0", UNIX_CLI_PARSE_ACTION_NOACTION),	/* NUL */
+  _(NULL, UNIX_CLI_PARSE_ACTION_NOMATCH)
+};
+
+#undef _
+
+/** CLI session events. */
+typedef enum
+{
+  UNIX_CLI_PROCESS_EVENT_READ_READY,  /**< A file descriptor has data to be read. */
+  UNIX_CLI_PROCESS_EVENT_QUIT,	      /**< A CLI session wants to close. */
+} unix_cli_process_event_type_t;
+
+/** CLI global state. */
+typedef struct
+{
+  /** Prompt string for CLI. */
+  u8 *cli_prompt;
+
+  /** Vec pool of CLI sessions. */
+  unix_cli_file_t *cli_file_pool;
+
+  /** Vec pool of unused session indices. */
+  u32 *unused_cli_process_node_indices;
+
+  /** The session index of the stdin cli */
+  u32 stdin_cli_file_index;
+
+  /** File pool index of current input. */
+  u32 current_input_file_index;
+} unix_cli_main_t;
+
+/** CLI global state */
+static unix_cli_main_t unix_cli_main;
+
+/**
+ * @brief Search for a byte sequence in the action list.
+ *
+ * Searches the @ref unix_cli_parse_actions_t list in @a a for a match with
+ * the bytes in @a input of maximum length @a ilen bytes.
+ * When a match is made @a *matched indicates how many bytes were matched.
+ * Returns a value from the enum @ref unix_cli_parse_action_t to indicate
+ * whether no match was found, a partial match was found or a complete
+ * match was found and what action, if any, should be taken.
+ *
+ * @param[in]  a        Actions list to search within.
+ * @param[in]  input    String fragment to search for.
+ * @param[in]  ilen     Length of the string in 'input'.
+ * @param[out] matched  Pointer to an integer that will contain the number
+ *                      of bytes matched when a complete match is found.
+ *
+ * @return Action from @ref unix_cli_parse_action_t that the string fragment
+ *         matches.
+ *         @ref UNIX_CLI_PARSE_ACTION_PARTIALMATCH is returned when the
+ *         whole input string matches the start of at least one action.
+ *         @ref UNIX_CLI_PARSE_ACTION_NOMATCH is returned when there is no
+ *         match at all.
+ */
+static unix_cli_parse_action_t
+unix_cli_match_action (unix_cli_parse_actions_t * a,
+		       u8 * input, u32 ilen, i32 * matched)
+{
+  u8 partial = 0;
+
+  while (a->input)
+    {
+      if (ilen >= a->len)
+	{
+	  /* see if the start of the input buffer exactly matches the current
+	   * action string. */
+	  if (memcmp (input, a->input, a->len) == 0)
+	    {
+	      *matched = a->len;
+	      return a->action;
+	    }
+	}
+      else
+	{
+	  /* if the first ilen characters match, flag this as a partial -
+	   * meaning keep collecting bytes in case of a future match */
+	  if (memcmp (input, a->input, ilen) == 0)
+	    partial = 1;
+	}
+
+      /* check next action */
+      a++;
+    }
+
+  return partial ?
+    UNIX_CLI_PARSE_ACTION_PARTIALMATCH : UNIX_CLI_PARSE_ACTION_NOMATCH;
+}
+
+
+/** Add bytes to the output vector and then flagg the I/O system that bytes
+ * are available to be sent.
+ */
+static void
+unix_cli_add_pending_output (unix_file_t * uf,
+			     unix_cli_file_t * cf,
+			     u8 * buffer, uword buffer_bytes)
+{
+  unix_main_t *um = &unix_main;
+
+  vec_add (cf->output_vector, buffer, buffer_bytes);
+  if (vec_len (cf->output_vector) > 0)
+    {
+      int skip_update = 0 != (uf->flags & UNIX_FILE_DATA_AVAILABLE_TO_WRITE);
+      uf->flags |= UNIX_FILE_DATA_AVAILABLE_TO_WRITE;
+      if (!skip_update)
+	um->file_update (uf, UNIX_FILE_UPDATE_MODIFY);
+    }
+}
+
+/** Delete all bytes from the output vector and flag the I/O system
+ * that no more bytes are available to be sent.
+ */
+static void
+unix_cli_del_pending_output (unix_file_t * uf,
+			     unix_cli_file_t * cf, uword n_bytes)
+{
+  unix_main_t *um = &unix_main;
+
+  vec_delete (cf->output_vector, n_bytes, 0);
+  if (vec_len (cf->output_vector) <= 0)
+    {
+      int skip_update = 0 == (uf->flags & UNIX_FILE_DATA_AVAILABLE_TO_WRITE);
+      uf->flags &= ~UNIX_FILE_DATA_AVAILABLE_TO_WRITE;
+      if (!skip_update)
+	um->file_update (uf, UNIX_FILE_UPDATE_MODIFY);
+    }
+}
+
+/** @brief A bit like strchr with a buffer length limit.
+ * Search a buffer for the first instance of a character up to the limit of
+ * the buffer length. If found then return the position of that character.
+ *
+ * The key departure from strchr is that if the character is not found then
+ * return the buffer length.
+ *
+ * @param chr The byte value to search for.
+ * @param str The buffer in which to search for the value.
+ * @param len The depth into the buffer to search.
+ *
+ * @return The index of the first occurence of \c chr. If \c chr is not
+ *          found then \c len instead.
+ */
+always_inline word
+unix_vlib_findchr (u8 chr, u8 * str, word len)
+{
+  word i = 0;
+  for (i = 0; i < len; i++, str++)
+    {
+      if (*str == chr)
+	return i;
+    }
+  return len;
+}
+
+/** @brief Send a buffer to the CLI stream if possible, enqueue it otherwise.
+ * Attempts to write given buffer to the file descriptor of the given
+ * Unix CLI session. If that session already has data in the output buffer
+ * or if the write attempt tells us to try again later then the given buffer
+ * is appended to the pending output buffer instead.
+ *
+ * This is typically called only from \c unix_vlib_cli_output_cooked since
+ * that is where CRLF handling occurs or from places where we explicitly do
+ * not want cooked handling.
+ *
+ * @param cf Unix CLI session of the desired stream to write to.
+ * @param uf The Unix file structure of the desired stream to write to.
+ * @param buffer Pointer to the buffer that needs to be written.
+ * @param buffer_bytes The number of bytes from \c buffer to write.
+ */
+static void
+unix_vlib_cli_output_raw (unix_cli_file_t * cf,
+			  unix_file_t * uf, u8 * buffer, uword buffer_bytes)
+{
+  int n = 0;
+
+  if (vec_len (cf->output_vector) == 0)
+    n = write (uf->file_descriptor, buffer, buffer_bytes);
+
+  if (n < 0 && errno != EAGAIN)
+    {
+      clib_unix_warning ("write");
+    }
+  else if ((word) n < (word) buffer_bytes)
+    {
+      /* We got EAGAIN or we already have stuff in the buffer;
+       * queue up whatever didn't get sent for later. */
+      if (n < 0)
+	n = 0;
+      unix_cli_add_pending_output (uf, cf, buffer + n, buffer_bytes - n);
+    }
+}
+
+/** @brief Process a buffer for CRLF handling before outputting it to the CLI.
+ *
+ * @param cf Unix CLI session of the desired stream to write to.
+ * @param uf The Unix file structure of the desired stream to write to.
+ * @param buffer Pointer to the buffer that needs to be written.
+ * @param buffer_bytes The number of bytes from \c buffer to write.
+ */
+static void
+unix_vlib_cli_output_cooked (unix_cli_file_t * cf,
+			     unix_file_t * uf,
+			     u8 * buffer, uword buffer_bytes)
+{
+  word end = 0, start = 0;
+
+  while (end < buffer_bytes)
+    {
+      if (cf->crlf_mode)
+	{
+	  /* iterate the line on \n's so we can insert a \r before it */
+	  end = unix_vlib_findchr ('\n',
+				   buffer + start,
+				   buffer_bytes - start) + start;
+	}
+      else
+	{
+	  /* otherwise just send the whole buffer */
+	  end = buffer_bytes;
+	}
+
+      unix_vlib_cli_output_raw (cf, uf, buffer + start, end - start);
+
+      if (cf->crlf_mode)
+	{
+	  if (end < buffer_bytes)
+	    {
+	      unix_vlib_cli_output_raw (cf, uf, (u8 *) "\r\n", 2);
+	      end++;		/* skip the \n that we already sent */
+	    }
+	  start = end;
+	}
+    }
+}
+
+/** @brief Output the CLI prompt */
+static void
+unix_cli_cli_prompt (unix_cli_file_t * cf, unix_file_t * uf)
+{
+  unix_cli_main_t *cm = &unix_cli_main;
+
+  unix_vlib_cli_output_raw (cf, uf, cm->cli_prompt, vec_len (cm->cli_prompt));
+}
+
+/** @brief Output a pager prompt and show number of buffered lines */
+static void
+unix_cli_pager_prompt (unix_cli_file_t * cf, unix_file_t * uf)
+{
+  u8 *prompt;
+  u32 h;
+
+  h = cf->pager_start + (cf->height - 1);
+  if (h > vec_len (cf->pager_index))
+    h = vec_len (cf->pager_index);
+
+  prompt = format (0, "\r%s-- more -- (%d-%d/%d)%s",
+		   cf->ansi_capable ? ANSI_BOLD : "",
+		   cf->pager_start + 1,
+		   h,
+		   vec_len (cf->pager_index),
+		   cf->ansi_capable ? ANSI_RESET : "");
+
+  unix_vlib_cli_output_cooked (cf, uf, prompt, vec_len (prompt));
+
+  vec_free (prompt);
+}
+
+/** @brief Output a pager "skipping" message */
+static void
+unix_cli_pager_message (unix_cli_file_t * cf, unix_file_t * uf,
+			char *message, char *postfix)
+{
+  u8 *prompt;
+
+  prompt = format (0, "\r%s-- %s --%s%s",
+		   cf->ansi_capable ? ANSI_BOLD : "",
+		   message, cf->ansi_capable ? ANSI_RESET : "", postfix);
+
+  unix_vlib_cli_output_cooked (cf, uf, prompt, vec_len (prompt));
+
+  vec_free (prompt);
+}
+
+/** @brief Erase the printed pager prompt */
+static void
+unix_cli_pager_prompt_erase (unix_cli_file_t * cf, unix_file_t * uf)
+{
+  if (cf->ansi_capable)
+    {
+      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\r", 1);
+      unix_vlib_cli_output_cooked (cf, uf,
+				   (u8 *) ANSI_CLEARLINE,
+				   sizeof (ANSI_CLEARLINE) - 1);
+    }
+  else
+    {
+      int i;
+
+      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\r", 1);
+      for (i = 0; i < cf->width - 1; i++)
+	unix_vlib_cli_output_cooked (cf, uf, (u8 *) " ", 1);
+      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\r", 1);
+    }
+}
+
+/** @brief Uses an ANSI escape sequence to move the cursor */
+static void
+unix_cli_ansi_cursor (unix_cli_file_t * cf, unix_file_t * uf, u16 x, u16 y)
+{
+  u8 *str;
+
+  str = format (0, "%s%d;%dH", CSI, y, x);
+
+  unix_vlib_cli_output_cooked (cf, uf, str, vec_len (str));
+
+  vec_free (str);
+}
+
+/** Redraw the currently displayed page of text.
+ * @param cf CLI session to redraw the pager buffer of.
+ * @param uf Unix file of the CLI session.
+ */
+static void
+unix_cli_pager_redraw (unix_cli_file_t * cf, unix_file_t * uf)
+{
+  unix_cli_pager_index_t *pi = NULL;
+  u8 *line = NULL;
+  word i;
+
+  /* No active pager? Do nothing. */
+  if (!vec_len (cf->pager_index))
+    return;
+
+  if (cf->ansi_capable)
+    {
+      /* If we have ANSI, send the clear screen sequence */
+      unix_vlib_cli_output_cooked (cf, uf,
+				   (u8 *) ANSI_CLEAR,
+				   sizeof (ANSI_CLEAR) - 1);
+    }
+  else
+    {
+      /* Otherwise make sure we're on a blank line */
+      unix_cli_pager_prompt_erase (cf, uf);
+    }
+
+  /* (Re-)send the current page of content */
+  for (i = 0; i < cf->height - 1 &&
+       i + cf->pager_start < vec_len (cf->pager_index); i++)
+    {
+      pi = &cf->pager_index[cf->pager_start + i];
+      line = cf->pager_vector[pi->line] + pi->offset;
+
+      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
+    }
+  /* if the last line didn't end in newline, add a newline */
+  if (pi && line[pi->length - 1] != '\n')
+    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
+
+  unix_cli_pager_prompt (cf, uf);
+}
+
+/** @brief Process and add a line to the pager index.
+ * In normal operation this function will take the given character string
+ * found in @c line and with length @c len_or_index and iterates the over the
+ * contents, adding each line of text discovered within it to the
+ * pager index. Lines are identified by newlines ("<code>\\n</code>") and by
+ * strings longer than the width of the terminal.
+ *
+ * If instead @c line is @c NULL then @c len_or_index is taken to mean the
+ * index of an existing line in the pager buffer; this simply means that the
+ * input line does not need to be cloned since we alreayd have it. This is
+ * typical if we are reindexing the pager buffer.
+ *
+ * @param cf           The CLI session whose pager we are adding to.
+ * @param line         The string of text to be indexed into the pager buffer.
+ *                     If @c line is @c NULL then the mode of operation
+ *                     changes slightly; see the description above.
+ * @param len_or_index If @c line is a pointer to a string then this parameter
+ *                     indicates the length of that string; Otherwise this
+ *                     value provides the index in the pager buffer of an
+ *                     existing string to be indexed.
+ */
+static void
+unix_cli_pager_add_line (unix_cli_file_t * cf, u8 * line, word len_or_index)
+{
+  u8 *p;
+  word i, j, k;
+  word line_index, len;
+  u32 width = cf->width;
+  unix_cli_pager_index_t *pi;
+
+  if (line == NULL)
+    {
+      /* Use a line already in the pager buffer */
+      line_index = len_or_index;
+      p = cf->pager_vector[line_index];
+      len = vec_len (p);
+    }
+  else
+    {
+      len = len_or_index;
+      /* Add a copy of the raw string to the pager buffer */
+      p = vec_new (u8, len);
+      clib_memcpy (p, line, len);
+
+      /* store in pager buffer */
+      line_index = vec_len (cf->pager_vector);
+      vec_add1 (cf->pager_vector, p);
+    }
+
+  i = 0;
+  while (i < len)
+    {
+      /* Find the next line, or run to terminal width, or run to EOL */
+      int l = len - i;
+      j = unix_vlib_findchr ((u8) '\n', p, l < width ? l : width);
+
+      if (j < l && p[j] == '\n')	/* incl \n */
+	j++;
+
+      /* Add the line to the index */
+      k = vec_len (cf->pager_index);
+      vec_validate (cf->pager_index, k);
+      pi = &cf->pager_index[k];
+
+      pi->line = line_index;
+      pi->offset = i;
+      pi->length = j;
+
+      i += j;
+      p += j;
+    }
+}
+
+/** @brief Reindex entire pager buffer.
+ * Resets the current pager index and then re-adds the lines in the pager
+ * buffer to the index.
+ *
+ * Additionally this function attempts to retain the current page start
+ * line offset by searching for the same top-of-screen line in the new index.
+ *
+ * @param cf The CLI session whose pager buffer should be reindexed.
+ */
+static void
+unix_cli_pager_reindex (unix_cli_file_t * cf)
+{
+  word i, old_line, old_offset;
+  unix_cli_pager_index_t *pi;
+
+  /* If there is nothing in the pager buffer then make sure the index
+   * is empty and move on.
+   */
+  if (cf->pager_vector == 0)
+    {
+      vec_reset_length (cf->pager_index);
+      return;
+    }
+
+  /* Retain a pointer to the current page start line so we can
+   * find it later
+   */
+  pi = &cf->pager_index[cf->pager_start];
+  old_line = pi->line;
+  old_offset = pi->offset;
+
+  /* Re-add the buffered lines to the index */
+  vec_reset_length (cf->pager_index);
+  vec_foreach_index (i, cf->pager_vector)
+  {
+    unix_cli_pager_add_line (cf, NULL, i);
+  }
+
+  /* Attempt to re-locate the previously stored page start line */
+  vec_foreach_index (i, cf->pager_index)
+  {
+    pi = &cf->pager_index[i];
+
+    if (pi->line == old_line &&
+	(pi->offset <= old_offset || pi->offset + pi->length > old_offset))
+      {
+	/* Found it! */
+	cf->pager_start = i;
+	break;
+      }
+  }
+
+  /* In case the start line was not found (rare), ensure the pager start
+   * index is within bounds
+   */
+  if (cf->pager_start >= vec_len (cf->pager_index))
+    {
+      if (!cf->height || vec_len (cf->pager_index) < (cf->height - 1))
+	cf->pager_start = 0;
+      else
+	cf->pager_start = vec_len (cf->pager_index) - (cf->height - 1);
+    }
+}
+
+/** VLIB CLI output function.
+ *
+ * If the terminal has a pager configured then this function takes care
+ * of collating output into the pager buffer; ensuring only the first page
+ * is displayed and any lines in excess of the first page are buffered.
+ *
+ * If the maximum number of index lines in the buffer is exceeded then the
+ * pager is cancelled and the contents of the current buffer are sent to the
+ * terminal.
+ *
+ * If there is no pager configured then the output is sent directly to the
+ * terminal.
+ *
+ * @param cli_file_index Index of the CLI session where this output is
+ *                       directed.
+ * @param buffer         String of printabe bytes to be output.
+ * @param buffer_bytes   The number of bytes in @c buffer to be output.
+ */
+static void
+unix_vlib_cli_output (uword cli_file_index, u8 * buffer, uword buffer_bytes)
+{
+  unix_main_t *um = &unix_main;
+  unix_cli_main_t *cm = &unix_cli_main;
+  unix_cli_file_t *cf;
+  unix_file_t *uf;
+
+  cf = pool_elt_at_index (cm->cli_file_pool, cli_file_index);
+  uf = pool_elt_at_index (um->file_pool, cf->unix_file_index);
+
+  if (cf->no_pager || um->cli_pager_buffer_limit == 0 || cf->height == 0)
+    {
+      unix_vlib_cli_output_cooked (cf, uf, buffer, buffer_bytes);
+    }
+  else
+    {
+      word row = vec_len (cf->pager_index);
+      u8 *line;
+      unix_cli_pager_index_t *pi;
+
+      /* Index and add the output lines to the pager buffer. */
+      unix_cli_pager_add_line (cf, buffer, buffer_bytes);
+
+      /* Now iterate what was added to display the lines.
+       * If we reach the bottom of the page, display a prompt.
+       */
+      while (row < vec_len (cf->pager_index))
+	{
+	  if (row < cf->height - 1)
+	    {
+	      /* output this line */
+	      pi = &cf->pager_index[row];
+	      line = cf->pager_vector[pi->line] + pi->offset;
+	      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
+
+	      /* if the last line didn't end in newline, and we're at the
+	       * bottom of the page, add a newline */
+	      if (line[pi->length - 1] != '\n' && row == cf->height - 2)
+		unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
+	    }
+	  else
+	    {
+	      /* Display the pager prompt every 10 lines */
+	      if (!(row % 10))
+		unix_cli_pager_prompt (cf, uf);
+	    }
+	  row++;
+	}
+
+      /* Check if we went over the pager buffer limit */
+      if (vec_len (cf->pager_index) > um->cli_pager_buffer_limit)
+	{
+	  /* Stop using the pager for the remainder of this CLI command */
+	  cf->no_pager = 2;
+
+	  /* If we likely printed the prompt, erase it */
+	  if (vec_len (cf->pager_index) > cf->height - 1)
+	    unix_cli_pager_prompt_erase (cf, uf);
+
+	  /* Dump out the contents of the buffer */
+	  for (row = cf->pager_start + (cf->height - 1);
+	       row < vec_len (cf->pager_index); row++)
+	    {
+	      pi = &cf->pager_index[row];
+	      line = cf->pager_vector[pi->line] + pi->offset;
+	      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
+	    }
+
+	  unix_cli_pager_reset (cf);
+	}
+    }
+}
+
+/** Identify whether a terminal type is ANSI capable.
+ *
+ * Compares the string given in @c term with a list of terminal types known
+ * to support ANSI escape sequences.
+ *
+ * This list contains, for example, @c xterm, @c screen and @c ansi.
+ *
+ * @param term A string with a terminal type in it.
+ * @param len The length of the string in @c term.
+ *
+ * @return @c 1 if the terminal type is recognized as supporting ANSI
+ *         terminal sequences; @c 0 otherwise.
+ */
+static u8
+unix_cli_terminal_type (u8 * term, uword len)
+{
+  /* This may later be better done as a hash of some sort. */
+#define _(a) do { \
+    if (strncasecmp(a, (char *)term, (size_t)len) == 0) return 1; \
+  } while(0)
+
+  _("xterm");
+  _("xterm-color");
+  _("xterm-256color");		/* iTerm on Mac */
+  _("screen");
+  _("ansi");			/* Microsoft Telnet */
+#undef _
+
+  return 0;
+}
+
+/** @brief Emit initial welcome banner and prompt on a connection. */
+static void
+unix_cli_file_welcome (unix_cli_main_t * cm, unix_cli_file_t * cf)
+{
+  unix_main_t *um = &unix_main;
+  unix_file_t *uf = pool_elt_at_index (um->file_pool, cf->unix_file_index);
+  unix_cli_banner_t *banner;
+  int i, len;
+
+  /*
+   * Put the first bytes directly into the buffer so that further output is
+   * queued until everything is ready. (oterwise initial prompt can appear
+   * mid way through VPP initialization)
+   */
+  unix_cli_add_pending_output (uf, cf, (u8 *) "\r", 1);
+
+  if (!um->cli_no_banner)
+    {
+      if (cf->ansi_capable)
+	{
+	  banner = unix_cli_banner_color;
+	  len = ARRAY_LEN (unix_cli_banner_color);
+	}
+      else
+	{
+	  banner = unix_cli_banner;
+	  len = ARRAY_LEN (unix_cli_banner);
+	}
+
+      for (i = 0; i < len; i++)
+	{
+	  unix_vlib_cli_output_cooked (cf, uf,
+				       banner[i].line, banner[i].length);
+	}
+    }
+
+  /* Prompt. */
+  unix_cli_cli_prompt (cf, uf);
+
+  cf->started = 1;
+}
+
+/** @brief A failsafe triggered on a timer to ensure we send the prompt
+ * to telnet sessions that fail to negotiate the terminal type. */
+static void
+unix_cli_file_welcome_timer (any arg, f64 delay)
+{
+  unix_cli_main_t *cm = &unix_cli_main;
+  unix_cli_file_t *cf;
+  (void) delay;
+
+  /* Check the connection didn't close already */
+  if (pool_is_free_index (cm->cli_file_pool, (uword) arg))
+    return;
+
+  cf = pool_elt_at_index (cm->cli_file_pool, (uword) arg);
+
+  if (!cf->started)
+    unix_cli_file_welcome (cm, cf);
+}
+
+/** @brief A mostly no-op Telnet state machine.
+ * Process Telnet command bytes in a way that ensures we're mostly
+ * transparent to the Telnet protocol. That is, it's mostly a no-op.
+ *
+ * @return -1 if we need more bytes, otherwise a positive integer number of
+ *          bytes to consume from the input_vector, not including the initial
+ *          IAC byte.
+ */
+static i32
+unix_cli_process_telnet (unix_main_t * um,
+			 unix_cli_file_t * cf,
+			 unix_file_t * uf, u8 * input_vector, uword len)
+{
+  /* Input_vector starts at IAC byte.
+   * See if we have a complete message; if not, return -1 so we wait for more.
+   * if we have a complete message, consume those bytes from the vector.
+   */
+  i32 consume = 0;
+
+  if (len == 1)
+    return -1;			/* want more bytes */
+
+  switch (input_vector[1])
+    {
+    case IAC:
+      /* two IAC's in a row means to pass through 0xff.
+       * since that makes no sense here, just consume it.
+       */
+      consume = 1;
+      break;
+
+    case WILL:
+    case WONT:
+    case DO:
+    case DONT:
+      /* Expect 3 bytes */
+      if (vec_len (input_vector) < 3)
+	return -1;		/* want more bytes */
+
+      consume = 2;
+      break;
+
+    case SB:
+      {
+	/* Sub option - search ahead for IAC SE to end it */
+	i32 i;
+	for (i = 3; i < len && i < UNIX_CLI_MAX_DEPTH_TELNET; i++)
+	  {
+	    if (input_vector[i - 1] == IAC && input_vector[i] == SE)
+	      {
+		/* We have a complete message; see if we care about it */
+		switch (input_vector[2])
+		  {
+		  case TELOPT_TTYPE:
+		    if (input_vector[3] != 0)
+		      break;
+		    /* See if the terminal type is ANSI capable */
+		    cf->ansi_capable =
+		      unix_cli_terminal_type (input_vector + 4, i - 5);
+		    /* If session not started, we can release the pause */
+		    if (!cf->started)
+		      /* Send the welcome banner and initial prompt */
+		      unix_cli_file_welcome (&unix_cli_main, cf);
+		    break;
+
+		  case TELOPT_NAWS:
+		    /* Window size */
+		    if (i != 8)	/* check message is correct size */
+		      break;
+		    cf->width =
+		      clib_net_to_host_u16 (*((u16 *) (input_vector + 3)));
+		    cf->height =
+		      clib_net_to_host_u16 (*((u16 *) (input_vector + 5)));
+		    /* reindex pager buffer */
+		    unix_cli_pager_reindex (cf);
+		    /* redraw page */
+		    unix_cli_pager_redraw (cf, uf);
+		    break;
+
+		  default:
+		    break;
+		  }
+		/* Consume it all */
+		consume = i;
+		break;
+	      }
+	  }
+
+	if (i == UNIX_CLI_MAX_DEPTH_TELNET)
+	  consume = 1;		/* hit max search depth, advance one byte */
+
+	if (consume == 0)
+	  return -1;		/* want more bytes */
+
+	break;
+      }
+
+    case GA:
+    case EL:
+    case EC:
+    case AO:
+    case IP:
+    case BREAK:
+    case DM:
+    case NOP:
+    case SE:
+    case EOR:
+    case ABORT:
+    case SUSP:
+    case xEOF:
+      /* Simple one-byte messages */
+      consume = 1;
+      break;
+
+    case AYT:
+      /* Are You There - trigger a visible response */
+      consume = 1;
+      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "fd.io VPP\n", 10);
+      break;
+
+    default:
+      /* Unknown command! Eat the IAC byte */
+      break;
+    }
+
+  return consume;
+}
+
+/** @brief Process actionable input.
+ * Based on the \c action process the input; this typically involves
+ * searching the command history or editing the current command line.
+ */
+static int
+unix_cli_line_process_one (unix_cli_main_t * cm,
+			   unix_main_t * um,
+			   unix_cli_file_t * cf,
+			   unix_file_t * uf,
+			   u8 input, unix_cli_parse_action_t action)
+{
+  u8 *prev;
+  int j, delta;
+
+  switch (action)
+    {
+    case UNIX_CLI_PARSE_ACTION_NOACTION:
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_REVSEARCH:
+    case UNIX_CLI_PARSE_ACTION_FWDSEARCH:
+      if (!cf->has_history || !cf->history_limit)
+	break;
+      if (cf->search_mode == 0)
+	{
+	  /* Erase the current command (if any) */
+	  for (j = 0; j < (vec_len (cf->current_command)); j++)
+	    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b \b", 3);
+
+	  vec_reset_length (cf->search_key);
+	  vec_reset_length (cf->current_command);
+	  if (action == UNIX_CLI_PARSE_ACTION_REVSEARCH)
+	    cf->search_mode = -1;
+	  else
+	    cf->search_mode = 1;
+	  cf->cursor = 0;
+	}
+      else
+	{
+	  if (action == UNIX_CLI_PARSE_ACTION_REVSEARCH)
+	    cf->search_mode = -1;
+	  else
+	    cf->search_mode = 1;
+
+	  cf->excursion += cf->search_mode;
+	  goto search_again;
+	}
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_ERASELINELEFT:
+      /* Erase the command from the cursor to the start */
+
+      /* Shimmy forwards to the new end of line position */
+      delta = vec_len (cf->current_command) - cf->cursor;
+      for (j = cf->cursor; j > delta; j--)
+	unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
+      /* Zap from here to the end of what is currently displayed */
+      for (; j < (vec_len (cf->current_command)); j++)
+	unix_vlib_cli_output_cooked (cf, uf, (u8 *) " ", 1);
+      /* Get back to the start of the line */
+      for (j = 0; j < (vec_len (cf->current_command)); j++)
+	unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
+
+      j = vec_len (cf->current_command) - cf->cursor;
+      memmove (cf->current_command, cf->current_command + cf->cursor, j);
+      _vec_len (cf->current_command) = j;
+
+      /* Print the new contents */
+      unix_vlib_cli_output_cooked (cf, uf, cf->current_command, j);
+      /* Shimmy back to the start */
+      for (j = 0; j < (vec_len (cf->current_command)); j++)
+	unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
+      cf->cursor = 0;
+
+      cf->search_mode = 0;
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_ERASELINERIGHT:
+      /* Erase the command from the cursor to the end */
+
+      /* Zap from cursor to end of what is currently displayed */
+      for (j = cf->cursor; j < (vec_len (cf->current_command)); j++)
+	unix_vlib_cli_output_cooked (cf, uf, (u8 *) " ", 1);
+      /* Get back to where we were */
+      for (j = cf->cursor; j < (vec_len (cf->current_command)); j++)
+	unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
+
+      /* Truncate the line at the cursor */
+      _vec_len (cf->current_command) = cf->cursor;
+
+      cf->search_mode = 0;
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_LEFT:
+      if (cf->cursor > 0)
+	{
+	  unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
+	  cf->cursor--;
+	}
+
+      cf->search_mode = 0;
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_RIGHT:
+      if (cf->cursor < vec_len (cf->current_command))
+	{
+	  /* have to emit the character under the cursor */
+	  unix_vlib_cli_output_cooked (cf, uf,
+				       cf->current_command + cf->cursor, 1);
+	  cf->cursor++;
+	}
+
+      cf->search_mode = 0;
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_UP:
+    case UNIX_CLI_PARSE_ACTION_DOWN:
+      if (!cf->has_history || !cf->history_limit)
+	break;
+      cf->search_mode = 0;
+      /* Erase the command */
+      for (j = cf->cursor; j < (vec_len (cf->current_command)); j++)
+	unix_vlib_cli_output_cooked (cf, uf, (u8 *) " ", 1);
+      for (j = 0; j < (vec_len (cf->current_command)); j++)
+	unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b \b", 3);
+      vec_reset_length (cf->current_command);
+      if (vec_len (cf->command_history))
+	{
+	  if (action == UNIX_CLI_PARSE_ACTION_UP)
+	    delta = -1;
+	  else
+	    delta = 1;
+
+	  cf->excursion += delta;
+
+	  if (cf->excursion == vec_len (cf->command_history))
+	    {
+	      /* down-arrowed to last entry - want a blank line */
+	      _vec_len (cf->current_command) = 0;
+	    }
+	  else if (cf->excursion < 0)
+	    {
+	      /* up-arrowed over the start to the end, want a blank line */
+	      cf->excursion = vec_len (cf->command_history);
+	      _vec_len (cf->current_command) = 0;
+	    }
+	  else
+	    {
+	      if (cf->excursion > (i32) vec_len (cf->command_history) - 1)
+		/* down-arrowed past end - wrap to start */
+		cf->excursion = 0;
+
+	      /* Print the command at the current position */
+	      prev = cf->command_history[cf->excursion];
+	      vec_validate (cf->current_command, vec_len (prev) - 1);
+
+	      clib_memcpy (cf->current_command, prev, vec_len (prev));
+	      _vec_len (cf->current_command) = vec_len (prev);
+	      unix_vlib_cli_output_cooked (cf, uf, cf->current_command,
+					   vec_len (cf->current_command));
+	    }
+	  cf->cursor = vec_len (cf->current_command);
+
+	  break;
+	}
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_HOME:
+      if (vec_len (cf->current_command) && cf->cursor > 0)
+	{
+	  while (cf->cursor)
+	    {
+	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
+	      cf->cursor--;
+	    }
+	}
+
+      cf->search_mode = 0;
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_END:
+      if (vec_len (cf->current_command) &&
+	  cf->cursor < vec_len (cf->current_command))
+	{
+	  unix_vlib_cli_output_cooked (cf, uf,
+				       cf->current_command + cf->cursor,
+				       vec_len (cf->current_command) -
+				       cf->cursor);
+	  cf->cursor = vec_len (cf->current_command);
+	}
+
+      cf->search_mode = 0;
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_WORDLEFT:
+      if (vec_len (cf->current_command) && cf->cursor > 0)
+	{
+	  j = cf->cursor;
+
+	  unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
+	  j--;
+
+	  while (j && isspace (cf->current_command[j]))
+	    {
+	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
+	      j--;
+	    }
+	  while (j && !isspace (cf->current_command[j]))
+	    {
+	      if (isspace (cf->current_command[j - 1]))
+		break;
+	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
+	      j--;
+	    }
+
+	  cf->cursor = j;
+	}
+
+      cf->search_mode = 0;
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_WORDRIGHT:
+      if (vec_len (cf->current_command) &&
+	  cf->cursor < vec_len (cf->current_command))
+	{
+	  int e = vec_len (cf->current_command);
+	  j = cf->cursor;
+	  while (j < e && !isspace (cf->current_command[j]))
+	    j++;
+	  while (j < e && isspace (cf->current_command[j]))
+	    j++;
+	  unix_vlib_cli_output_cooked (cf, uf,
+				       cf->current_command + cf->cursor,
+				       j - cf->cursor);
+	  cf->cursor = j;
+	}
+
+      cf->search_mode = 0;
+      break;
+
+
+    case UNIX_CLI_PARSE_ACTION_ERASE:
+      if (vec_len (cf->current_command))
+	{
+	  if (cf->cursor == vec_len (cf->current_command))
+	    {
+	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b \b", 3);
+	      _vec_len (cf->current_command)--;
+	      cf->cursor--;
+	    }
+	  else if (cf->cursor > 0)
+	    {
+	      /* shift everything at & to the right of the cursor left by 1 */
+	      j = vec_len (cf->current_command) - cf->cursor;
+	      memmove (cf->current_command + cf->cursor - 1,
+		       cf->current_command + cf->cursor, j);
+	      _vec_len (cf->current_command)--;
+	      cf->cursor--;
+	      /* redraw the rest of the line */
+	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
+	      unix_vlib_cli_output_cooked (cf, uf,
+					   cf->current_command + cf->cursor,
+					   j);
+	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) " \b\b", 3);
+	      /* and shift the terminal cursor back where it should be */
+	      while (--j)
+		unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
+	    }
+	}
+      cf->search_mode = 0;
+      cf->excursion = 0;
+      vec_reset_length (cf->search_key);
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_ERASERIGHT:
+      if (vec_len (cf->current_command))
+	{
+	  if (cf->cursor < vec_len (cf->current_command))
+	    {
+	      /* shift everything to the right of the cursor left by 1 */
+	      j = vec_len (cf->current_command) - cf->cursor - 1;
+	      memmove (cf->current_command + cf->cursor,
+		       cf->current_command + cf->cursor + 1, j);
+	      _vec_len (cf->current_command)--;
+	      /* redraw the rest of the line */
+	      unix_vlib_cli_output_cooked (cf, uf,
+					   cf->current_command + cf->cursor,
+					   j);
+	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) " \b", 2);
+	      /* and shift the terminal cursor back where it should be */
+	      if (j)
+		{
+		  unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
+		  while (--j)
+		    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
+		}
+	    }
+	}
+      else if (input == 'D' - '@')
+	{
+	  /* ^D with no command entered = quit */
+	  unix_vlib_cli_output_cooked (cf, uf, (u8 *) "quit\n", 5);
+	  vlib_process_signal_event (um->vlib_main,
+				     vlib_current_process (um->vlib_main),
+				     UNIX_CLI_PROCESS_EVENT_QUIT,
+				     cf - cm->cli_file_pool);
+	}
+      cf->search_mode = 0;
+      cf->excursion = 0;
+      vec_reset_length (cf->search_key);
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_CLEAR:
+      /* If we're in ANSI mode, clear the screen.
+       * Then redraw the prompt and any existing command input, then put
+       * the cursor back where it was in that line.
+       */
+      if (cf->ansi_capable)
+	unix_vlib_cli_output_cooked (cf, uf,
+				     (u8 *) ANSI_CLEAR,
+				     sizeof (ANSI_CLEAR) - 1);
+      else
+	unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
+
+      unix_vlib_cli_output_raw (cf, uf,
+				cm->cli_prompt, vec_len (cm->cli_prompt));
+      unix_vlib_cli_output_raw (cf, uf,
+				cf->current_command,
+				vec_len (cf->current_command));
+      for (j = cf->cursor; j < vec_len (cf->current_command); j++)
+	unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
+
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_TAB:
+    case UNIX_CLI_PARSE_ACTION_YANK:
+      /* TODO */
+      break;
+
+
+    case UNIX_CLI_PARSE_ACTION_PAGER_QUIT:
+    pager_quit:
+      unix_cli_pager_prompt_erase (cf, uf);
+      unix_cli_pager_reset (cf);
+      unix_cli_cli_prompt (cf, uf);
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_PAGER_NEXT:
+    case UNIX_CLI_PARSE_ACTION_PAGER_PGDN:
+      /* show next page of the buffer */
+      if (cf->height + cf->pager_start < vec_len (cf->pager_index))
+	{
+	  u8 *line = NULL;
+	  unix_cli_pager_index_t *pi = NULL;
+
+	  int m = cf->pager_start + (cf->height - 1);
+	  unix_cli_pager_prompt_erase (cf, uf);
+	  for (j = m;
+	       j < vec_len (cf->pager_index) && cf->pager_start < m;
+	       j++, cf->pager_start++)
+	    {
+	      pi = &cf->pager_index[j];
+	      line = cf->pager_vector[pi->line] + pi->offset;
+	      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
+	    }
+	  /* if the last line didn't end in newline, add a newline */
+	  if (pi && line[pi->length - 1] != '\n')
+	    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
+	  unix_cli_pager_prompt (cf, uf);
+	}
+      else
+	{
+	  if (action == UNIX_CLI_PARSE_ACTION_PAGER_NEXT)
+	    /* no more in buffer, exit, but only if it was <space> */
+	    goto pager_quit;
+	}
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_PAGER_DN:
+    case UNIX_CLI_PARSE_ACTION_PAGER_CRLF:
+      /* display the next line of the buffer */
+      if (cf->pager_start < vec_len (cf->pager_index) - (cf->height - 1))
+	{
+	  u8 *line;
+	  unix_cli_pager_index_t *pi;
+
+	  unix_cli_pager_prompt_erase (cf, uf);
+	  pi = &cf->pager_index[cf->pager_start + (cf->height - 1)];
+	  line = cf->pager_vector[pi->line] + pi->offset;
+	  unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
+	  cf->pager_start++;
+	  /* if the last line didn't end in newline, add a newline */
+	  if (line[pi->length - 1] != '\n')
+	    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
+	  unix_cli_pager_prompt (cf, uf);
+	}
+      else
+	{
+	  if (action == UNIX_CLI_PARSE_ACTION_PAGER_CRLF)
+	    /* no more in buffer, exit, but only if it was <enter> */
+	    goto pager_quit;
+	}
+
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_PAGER_UP:
+      /* scroll the page back one line */
+      if (cf->pager_start > 0)
+	{
+	  u8 *line = NULL;
+	  unix_cli_pager_index_t *pi = NULL;
+
+	  cf->pager_start--;
+	  if (cf->ansi_capable)
+	    {
+	      pi = &cf->pager_index[cf->pager_start];
+	      line = cf->pager_vector[pi->line] + pi->offset;
+	      unix_cli_pager_prompt_erase (cf, uf);
+	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) ANSI_SCROLLDN,
+					   sizeof (ANSI_SCROLLDN) - 1);
+	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) ANSI_SAVECURSOR,
+					   sizeof (ANSI_SAVECURSOR) - 1);
+	      unix_cli_ansi_cursor (cf, uf, 1, 1);
+	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) ANSI_CLEARLINE,
+					   sizeof (ANSI_CLEARLINE) - 1);
+	      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
+	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) ANSI_RESTCURSOR,
+					   sizeof (ANSI_RESTCURSOR) - 1);
+	      unix_cli_pager_prompt_erase (cf, uf);
+	      unix_cli_pager_prompt (cf, uf);
+	    }
+	  else
+	    {
+	      int m = cf->pager_start + (cf->height - 1);
+	      unix_cli_pager_prompt_erase (cf, uf);
+	      for (j = cf->pager_start;
+		   j < vec_len (cf->pager_index) && j < m; j++)
+		{
+		  pi = &cf->pager_index[j];
+		  line = cf->pager_vector[pi->line] + pi->offset;
+		  unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
+		}
+	      /* if the last line didn't end in newline, add a newline */
+	      if (pi && line[pi->length - 1] != '\n')
+		unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
+	      unix_cli_pager_prompt (cf, uf);
+	    }
+	}
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_PAGER_TOP:
+      /* back to the first page of the buffer */
+      if (cf->pager_start > 0)
+	{
+	  u8 *line = NULL;
+	  unix_cli_pager_index_t *pi = NULL;
+
+	  cf->pager_start = 0;
+	  int m = cf->pager_start + (cf->height - 1);
+	  unix_cli_pager_prompt_erase (cf, uf);
+	  for (j = cf->pager_start; j < vec_len (cf->pager_index) && j < m;
+	       j++)
+	    {
+	      pi = &cf->pager_index[j];
+	      line = cf->pager_vector[pi->line] + pi->offset;
+	      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
+	    }
+	  /* if the last line didn't end in newline, add a newline */
+	  if (pi && line[pi->length - 1] != '\n')
+	    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
+	  unix_cli_pager_prompt (cf, uf);
+	}
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_PAGER_BOTTOM:
+      /* skip to the last page of the buffer */
+      if (cf->pager_start < vec_len (cf->pager_index) - (cf->height - 1))
+	{
+	  u8 *line = NULL;
+	  unix_cli_pager_index_t *pi = NULL;
+
+	  cf->pager_start = vec_len (cf->pager_index) - (cf->height - 1);
+	  unix_cli_pager_prompt_erase (cf, uf);
+	  unix_cli_pager_message (cf, uf, "skipping", "\n");
+	  for (j = cf->pager_start; j < vec_len (cf->pager_index); j++)
+	    {
+	      pi = &cf->pager_index[j];
+	      line = cf->pager_vector[pi->line] + pi->offset;
+	      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
+	    }
+	  /* if the last line didn't end in newline, add a newline */
+	  if (pi && line[pi->length - 1] != '\n')
+	    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
+	  unix_cli_pager_prompt (cf, uf);
+	}
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_PAGER_PGUP:
+      /* wander back one page in the buffer */
+      if (cf->pager_start > 0)
+	{
+	  u8 *line = NULL;
+	  unix_cli_pager_index_t *pi = NULL;
+	  int m;
+
+	  if (cf->pager_start >= cf->height)
+	    cf->pager_start -= cf->height - 1;
+	  else
+	    cf->pager_start = 0;
+	  m = cf->pager_start + cf->height - 1;
+	  unix_cli_pager_prompt_erase (cf, uf);
+	  for (j = cf->pager_start; j < vec_len (cf->pager_index) && j < m;
+	       j++)
+	    {
+	      pi = &cf->pager_index[j];
+	      line = cf->pager_vector[pi->line] + pi->offset;
+	      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
+	    }
+	  /* if the last line didn't end in newline, add a newline */
+	  if (pi && line[pi->length - 1] != '\n')
+	    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
+	  unix_cli_pager_prompt (cf, uf);
+	}
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_PAGER_REDRAW:
+      /* Redraw the current pager screen */
+      unix_cli_pager_redraw (cf, uf);
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_PAGER_SEARCH:
+      /* search forwards in the buffer */
+      break;
+
+
+    case UNIX_CLI_PARSE_ACTION_CRLF:
+    crlf:
+      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
+
+      if (cf->has_history && cf->history_limit)
+	{
+	  if (cf->command_history
+	      && vec_len (cf->command_history) >= cf->history_limit)
+	    {
+	      vec_free (cf->command_history[0]);
+	      vec_delete (cf->command_history, 1, 0);
+	    }
+	  /* Don't add blank lines to the cmd history */
+	  if (vec_len (cf->current_command))
+	    {
+	      /* Don't duplicate the previous command */
+	      j = vec_len (cf->command_history);
+	      if (j == 0 ||
+		  (vec_len (cf->current_command) !=
+		   vec_len (cf->command_history[j - 1])
+		   || memcmp (cf->current_command, cf->command_history[j - 1],
+			      vec_len (cf->current_command)) != 0))
+		{
+		  /* copy the command to the history */
+		  u8 *c = 0;
+		  vec_append (c, cf->current_command);
+		  vec_add1 (cf->command_history, c);
+		  cf->command_number++;
+		}
+	    }
+	  cf->excursion = vec_len (cf->command_history);
+	}
+
+      cf->search_mode = 0;
+      vec_reset_length (cf->search_key);
+      cf->cursor = 0;
+
+      return 0;
+
+    case UNIX_CLI_PARSE_ACTION_PARTIALMATCH:
+    case UNIX_CLI_PARSE_ACTION_NOMATCH:
+      if (vec_len (cf->pager_index))
+	{
+	  /* no-op for now */
+	}
+      else if (cf->has_history && cf->search_mode && isprint (input))
+	{
+	  int k, limit, offset;
+	  u8 *item;
+
+	  vec_add1 (cf->search_key, input);
+
+	search_again:
+	  for (j = 0; j < vec_len (cf->command_history); j++)
+	    {
+	      if (cf->excursion > (i32) vec_len (cf->command_history) - 1)
+		cf->excursion = 0;
+	      else if (cf->excursion < 0)
+		cf->excursion = vec_len (cf->command_history) - 1;
+
+	      item = cf->command_history[cf->excursion];
+
+	      limit = (vec_len (cf->search_key) > vec_len (item)) ?
+		vec_len (item) : vec_len (cf->search_key);
+
+	      for (offset = 0; offset <= vec_len (item) - limit; offset++)
+		{
+		  for (k = 0; k < limit; k++)
+		    {
+		      if (item[k + offset] != cf->search_key[k])
+			goto next_offset;
+		    }
+		  goto found_at_offset;
+
+		next_offset:
+		  ;
+		}
+	      goto next;
+
+	    found_at_offset:
+	      for (j = 0; j < vec_len (cf->current_command); j++)
+		unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b \b", 3);
+
+	      vec_validate (cf->current_command, vec_len (item) - 1);
+	      clib_memcpy (cf->current_command, item, vec_len (item));
+	      _vec_len (cf->current_command) = vec_len (item);
+
+	      unix_vlib_cli_output_cooked (cf, uf, cf->current_command,
+					   vec_len (cf->current_command));
+	      cf->cursor = vec_len (cf->current_command);
+	      goto found;
+
+	    next:
+	      cf->excursion += cf->search_mode;
+	    }
+
+	  unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\nNo match...", 12);
+	  vec_reset_length (cf->search_key);
+	  vec_reset_length (cf->current_command);
+	  cf->search_mode = 0;
+	  cf->cursor = 0;
+	  goto crlf;
+	}
+      else if (isprint (input))	/* skip any errant control codes */
+	{
+	  if (cf->cursor == vec_len (cf->current_command))
+	    {
+	      /* Append to end */
+	      vec_add1 (cf->current_command, input);
+	      cf->cursor++;
+
+	      /* Echo the character back to the client */
+	      unix_vlib_cli_output_raw (cf, uf, &input, 1);
+	    }
+	  else
+	    {
+	      /* Insert at cursor: resize +1 byte, move everything over */
+	      j = vec_len (cf->current_command) - cf->cursor;
+	      vec_add1 (cf->current_command, (u8) 'A');
+	      memmove (cf->current_command + cf->cursor + 1,
+		       cf->current_command + cf->cursor, j);
+	      cf->current_command[cf->cursor] = input;
+	      /* Redraw the line */
+	      j++;
+	      unix_vlib_cli_output_raw (cf, uf,
+					cf->current_command + cf->cursor, j);
+	      /* Put terminal cursor back */
+	      while (--j)
+		unix_vlib_cli_output_raw (cf, uf, (u8 *) "\b", 1);
+	      cf->cursor++;
+	    }
+	}
+      else
+	{
+	  /* no-op - not printable or otherwise not actionable */
+	}
+
+    found:
+
+      break;
+
+    case UNIX_CLI_PARSE_ACTION_TELNETIAC:
+      break;
+    }
+  return 1;
+}
+
+/** @brief Process input bytes on a stream to provide line editing and
+ * command history in the CLI. */
+static int
+unix_cli_line_edit (unix_cli_main_t * cm,
+		    unix_main_t * um, unix_cli_file_t * cf)
+{
+  unix_file_t *uf = pool_elt_at_index (um->file_pool, cf->unix_file_index);
+  int i;
+
+  for (i = 0; i < vec_len (cf->input_vector); i++)
+    {
+      unix_cli_parse_action_t action;
+      i32 matched = 0;
+      unix_cli_parse_actions_t *a;
+
+      /* If we're in the pager mode, search the pager actions */
+      a =
+	vec_len (cf->pager_index) ? unix_cli_parse_pager :
+	unix_cli_parse_strings;
+
+      /* See if the input buffer is some sort of control code */
+      action = unix_cli_match_action (a, &cf->input_vector[i],
+				      vec_len (cf->input_vector) - i,
+				      &matched);
+
+      switch (action)
+	{
+	case UNIX_CLI_PARSE_ACTION_PARTIALMATCH:
+	  if (i)
+	    {
+	      /* There was a partial match which means we need more bytes
+	       * than the input buffer currently has.
+	       * Since the bytes before here have been processed, shift
+	       * the remaining contents to the start of the input buffer.
+	       */
+	      vec_delete (cf->input_vector, i, 0);
+	    }
+	  return 1;		/* wait for more */
+
+	case UNIX_CLI_PARSE_ACTION_TELNETIAC:
+	  /* process telnet options */
+	  matched = unix_cli_process_telnet (um, cf, uf,
+					     cf->input_vector + i,
+					     vec_len (cf->input_vector) - i);
+	  if (matched < 0)
+	    {
+	      if (i)
+		{
+		  /* There was a partial match which means we need more bytes
+		   * than the input buffer currently has.
+		   * Since the bytes before here have been processed, shift
+		   * the remaining contents to the start of the input buffer.
+		   */
+		  vec_delete (cf->input_vector, i, 0);
+		}
+	      return 1;		/* wait for more */
+	    }
+	  break;
+
+	default:
+	  /* process the action */
+	  if (!unix_cli_line_process_one (cm, um, cf, uf,
+					  cf->input_vector[i], action))
+	    {
+	      /* CRLF found. Consume the bytes from the input_vector */
+	      vec_delete (cf->input_vector, i + matched, 0);
+	      /* And tell our caller to execute cf->input_command */
+	      return 0;
+	    }
+	}
+
+      i += matched;
+    }
+
+  vec_reset_length (cf->input_vector);
+  return 1;
+}
+
+/** @brief Process input to a CLI session. */
+static void
+unix_cli_process_input (unix_cli_main_t * cm, uword cli_file_index)
+{
+  unix_main_t *um = &unix_main;
+  unix_file_t *uf;
+  unix_cli_file_t *cf = pool_elt_at_index (cm->cli_file_pool, cli_file_index);
+  unformat_input_t input;
+  int vlib_parse_eval (u8 *);
+
+more:
+  /* Try vlibplex first.  Someday... */
+  if (0 && vlib_parse_eval (cf->input_vector) == 0)
+    goto done;
+
+  if (cf->line_mode)
+    {
+      /* just treat whatever we got as a complete line of input */
+      cf->current_command = cf->input_vector;
+    }
+  else
+    {
+      /* Line edit, echo, etc. */
+      if (unix_cli_line_edit (cm, um, cf))
+	/* want more input */
+	return;
+    }
+
+  if (um->log_fd)
+    {
+      static u8 *lv;
+      vec_reset_length (lv);
+      lv = format (lv, "%U[%d]: %v",
+		   format_timeval, 0 /* current bat-time */ ,
+		   0 /* current bat-format */ ,
+		   cli_file_index, cf->input_vector);
+      {
+	int rv __attribute__ ((unused)) =
+	  write (um->log_fd, lv, vec_len (lv));
+      }
+    }
+
+  /* Copy our input command to a new string */
+  unformat_init_vector (&input, cf->current_command);
+
+  /* Remove leading white space from input. */
+  (void) unformat (&input, "");
+
+  cm->current_input_file_index = cli_file_index;
+  cf->pager_start = 0;		/* start a new pager session */
+
+  if (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
+    vlib_cli_input (um->vlib_main, &input, unix_vlib_cli_output,
+		    cli_file_index);
+
+  /* Zero buffer since otherwise unformat_free will call vec_free on it. */
+  input.buffer = 0;
+
+  unformat_free (&input);
+
+  /* Re-fetch pointer since pool may have moved. */
+  cf = pool_elt_at_index (cm->cli_file_pool, cli_file_index);
+  uf = pool_elt_at_index (um->file_pool, cf->unix_file_index);
+
+done:
+  /* reset vector; we'll re-use it later  */
+  if (cf->line_mode)
+    vec_reset_length (cf->input_vector);
+  else
+    vec_reset_length (cf->current_command);
+
+  if (cf->no_pager == 2)
+    {
+      /* Pager was programmatically disabled */
+      unix_cli_pager_message (cf, uf, "pager buffer overflowed", "\n");
+      cf->no_pager = um->cli_no_pager;
+    }
+
+  if (vec_len (cf->pager_index) == 0
+      || vec_len (cf->pager_index) < cf->height)
+    {
+      /* There was no need for the pager */
+      unix_cli_pager_reset (cf);
+
+      /* Prompt. */
+      unix_cli_cli_prompt (cf, uf);
+    }
+  else
+    {
+      /* Display the pager prompt */
+      unix_cli_pager_prompt (cf, uf);
+    }
+
+  /* Any residual data in the input vector? */
+  if (vec_len (cf->input_vector))
+    goto more;
+}
+
+/** Destroy a CLI session.
+ * @note If we destroy the @c stdin session this additionally signals
+ *       the shutdown of VPP.
+ */
+static void
+unix_cli_kill (unix_cli_main_t * cm, uword cli_file_index)
+{
+  unix_main_t *um = &unix_main;
+  unix_cli_file_t *cf;
+  unix_file_t *uf;
+  int i;
+
+  cf = pool_elt_at_index (cm->cli_file_pool, cli_file_index);
+  uf = pool_elt_at_index (um->file_pool, cf->unix_file_index);
+
+  /* Quit/EOF on stdin means quit program. */
+  if (uf->file_descriptor == UNIX_CLI_STDIN_FD)
+    clib_longjmp (&um->vlib_main->main_loop_exit, VLIB_MAIN_LOOP_EXIT_CLI);
+
+  vec_free (cf->current_command);
+  vec_free (cf->search_key);
+
+  for (i = 0; i < vec_len (cf->command_history); i++)
+    vec_free (cf->command_history[i]);
+
+  vec_free (cf->command_history);
+
+  unix_file_del (um, uf);
+
+  unix_cli_file_free (cf);
+  pool_put (cm->cli_file_pool, cf);
+}
+
+/** Handle system events. */
+static uword
+unix_cli_process (vlib_main_t * vm,
+		  vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  unix_cli_main_t *cm = &unix_cli_main;
+  uword i, *data = 0;
+
+  while (1)
+    {
+      unix_cli_process_event_type_t event_type;
+      vlib_process_wait_for_event (vm);
+      event_type = vlib_process_get_events (vm, &data);
+
+      switch (event_type)
+	{
+	case UNIX_CLI_PROCESS_EVENT_READ_READY:
+	  for (i = 0; i < vec_len (data); i++)
+	    unix_cli_process_input (cm, data[i]);
+	  break;
+
+	case UNIX_CLI_PROCESS_EVENT_QUIT:
+	  /* Kill this process. */
+	  for (i = 0; i < vec_len (data); i++)
+	    unix_cli_kill (cm, data[i]);
+	  goto done;
+	}
+
+      if (data)
+	_vec_len (data) = 0;
+    }
+
+done:
+  vec_free (data);
+
+  vlib_node_set_state (vm, rt->node_index, VLIB_NODE_STATE_DISABLED);
+
+  /* Add node index so we can re-use this process later. */
+  vec_add1 (cm->unused_cli_process_node_indices, rt->node_index);
+
+  return 0;
+}
+
+/** Called when a CLI session file descriptor can be written to without
+ * blocking. */
+static clib_error_t *
+unix_cli_write_ready (unix_file_t * uf)
+{
+  unix_cli_main_t *cm = &unix_cli_main;
+  unix_cli_file_t *cf;
+  int n;
+
+  cf = pool_elt_at_index (cm->cli_file_pool, uf->private_data);
+
+  /* Flush output vector. */
+  n = write (uf->file_descriptor,
+	     cf->output_vector, vec_len (cf->output_vector));
+
+  if (n < 0 && errno != EAGAIN)
+    return clib_error_return_unix (0, "write");
+
+  else if (n > 0)
+    unix_cli_del_pending_output (uf, cf, n);
+
+  return /* no error */ 0;
+}
+
+/** Called when a CLI session file descriptor has data to be read. */
+static clib_error_t *
+unix_cli_read_ready (unix_file_t * uf)
+{
+  unix_main_t *um = &unix_main;
+  unix_cli_main_t *cm = &unix_cli_main;
+  unix_cli_file_t *cf;
+  uword l;
+  int n, n_read, n_try;
+
+  cf = pool_elt_at_index (cm->cli_file_pool, uf->private_data);
+
+  n = n_try = 4096;
+  while (n == n_try)
+    {
+      l = vec_len (cf->input_vector);
+      vec_resize (cf->input_vector, l + n_try);
+
+      n = read (uf->file_descriptor, cf->input_vector + l, n_try);
+
+      /* Error? */
+      if (n < 0 && errno != EAGAIN)
+	return clib_error_return_unix (0, "read");
+
+      n_read = n < 0 ? 0 : n;
+      _vec_len (cf->input_vector) = l + n_read;
+    }
+
+  if (!(n < 0))
+    vlib_process_signal_event (um->vlib_main,
+			       cf->process_node_index,
+			       (n_read == 0
+				? UNIX_CLI_PROCESS_EVENT_QUIT
+				: UNIX_CLI_PROCESS_EVENT_READ_READY),
+			       /* event data */ uf->private_data);
+
+  return /* no error */ 0;
+}
+
+/** Store a new CLI session.
+ * @param name The name of the session.
+ * @param fd   The file descriptor for the session I/O.
+ * @return The session ID.
+ */
+static u32
+unix_cli_file_add (unix_cli_main_t * cm, char *name, int fd)
+{
+  unix_main_t *um = &unix_main;
+  unix_cli_file_t *cf;
+  unix_file_t template = { 0 };
+  vlib_main_t *vm = um->vlib_main;
+  vlib_node_t *n;
+
+  name = (char *) format (0, "unix-cli-%s", name);
+
+  if (vec_len (cm->unused_cli_process_node_indices) > 0)
+    {
+      uword l = vec_len (cm->unused_cli_process_node_indices);
+
+      /* Find node and give it new name. */
+      n = vlib_get_node (vm, cm->unused_cli_process_node_indices[l - 1]);
+      vec_free (n->name);
+      n->name = (u8 *) name;
+
+      vlib_node_set_state (vm, n->index, VLIB_NODE_STATE_POLLING);
+
+      _vec_len (cm->unused_cli_process_node_indices) = l - 1;
+    }
+  else
+    {
+      static vlib_node_registration_t r = {
+	.function = unix_cli_process,
+	.type = VLIB_NODE_TYPE_PROCESS,
+	.process_log2_n_stack_bytes = 16,
+      };
+
+      r.name = name;
+      vlib_register_node (vm, &r);
+      vec_free (name);
+
+      n = vlib_get_node (vm, r.index);
+    }
+
+  pool_get (cm->cli_file_pool, cf);
+  memset (cf, 0, sizeof (*cf));
+
+  template.read_function = unix_cli_read_ready;
+  template.write_function = unix_cli_write_ready;
+  template.file_descriptor = fd;
+  template.private_data = cf - cm->cli_file_pool;
+
+  cf->process_node_index = n->index;
+  cf->unix_file_index = unix_file_add (um, &template);
+  cf->output_vector = 0;
+  cf->input_vector = 0;
+
+  vlib_start_process (vm, n->runtime_index);
+
+  vlib_process_t *p = vlib_get_process_from_node (vm, n);
+  p->output_function = unix_vlib_cli_output;
+  p->output_function_arg = cf - cm->cli_file_pool;
+
+  return cf - cm->cli_file_pool;
+}
+
+/** Telnet listening socket has a new connection. */
+static clib_error_t *
+unix_cli_listen_read_ready (unix_file_t * uf)
+{
+  unix_main_t *um = &unix_main;
+  unix_cli_main_t *cm = &unix_cli_main;
+  clib_socket_t *s = &um->cli_listen_socket;
+  clib_socket_t client;
+  char *client_name;
+  clib_error_t *error;
+  unix_cli_file_t *cf;
+  u32 cf_index;
+
+  error = clib_socket_accept (s, &client);
+  if (error)
+    return error;
+
+  client_name = (char *) format (0, "%U%c", format_sockaddr, &client.peer, 0);
+
+  cf_index = unix_cli_file_add (cm, client_name, client.fd);
+  cf = pool_elt_at_index (cm->cli_file_pool, cf_index);
+
+  /* No longer need CLIB version of socket. */
+  clib_socket_free (&client);
+
+  vec_free (client_name);
+
+  /* if we're supposed to run telnet session in character mode (default) */
+  if (um->cli_line_mode == 0)
+    {
+      /*
+       * Set telnet client character mode, echo on, suppress "go-ahead".
+       * Technically these should be negotiated, but this works.
+       */
+      u8 charmode_option[] = {
+	IAC, WONT, TELOPT_LINEMODE,	/* server will do char-by-char */
+	IAC, DONT, TELOPT_LINEMODE,	/* client should do char-by-char */
+	IAC, WILL, TELOPT_SGA,	/* server willl supress GA */
+	IAC, DO, TELOPT_SGA,	/* client should supress Go Ahead */
+	IAC, WILL, TELOPT_ECHO,	/* server will do echo */
+	IAC, DONT, TELOPT_ECHO,	/* client should not echo */
+	IAC, DO, TELOPT_TTYPE,	/* client should tell us its term type */
+	IAC, SB, TELOPT_TTYPE, 1, IAC, SE,	/* now tell me ttype */
+	IAC, DO, TELOPT_NAWS,	/* client should tell us its window sz */
+	IAC, SB, TELOPT_NAWS, 1, IAC, SE,	/* now tell me window size */
+      };
+
+      /* Enable history on this CLI */
+      cf->history_limit = um->cli_history_limit;
+      cf->has_history = cf->history_limit != 0;
+
+      /* Make sure this session is in line mode */
+      cf->line_mode = 0;
+
+      /* We need CRLF */
+      cf->crlf_mode = 1;
+
+      /* Setup the pager */
+      cf->no_pager = um->cli_no_pager;
+
+      uf = pool_elt_at_index (um->file_pool, cf->unix_file_index);
+
+      /* Send the telnet options */
+      unix_vlib_cli_output_raw (cf, uf, charmode_option,
+				ARRAY_LEN (charmode_option));
+
+      /* In case the client doesn't negotiate terminal type, use
+       * a timer to kick off the initial prompt. */
+      timer_call (unix_cli_file_welcome_timer, cf_index, 1);
+    }
+
+  return error;
+}
+
+/** The system terminal has informed us that the window size
+ * has changed.
+ */
+static void
+unix_cli_resize_interrupt (int signum)
+{
+  unix_main_t *um = &unix_main;
+  unix_cli_main_t *cm = &unix_cli_main;
+  unix_cli_file_t *cf = pool_elt_at_index (cm->cli_file_pool,
+					   cm->stdin_cli_file_index);
+  unix_file_t *uf = pool_elt_at_index (um->file_pool, cf->unix_file_index);
+  struct winsize ws;
+  (void) signum;
+
+  /* Terminal resized, fetch the new size */
+  if (ioctl (UNIX_CLI_STDIN_FD, TIOCGWINSZ, &ws) < 0)
+    {
+      /* "Should never happen..." */
+      clib_unix_warning ("TIOCGWINSZ");
+      /* We can't trust ws.XXX... */
+      return;
+    }
+  cf->width = ws.ws_col;
+  cf->height = ws.ws_row;
+
+  /* Reindex the pager buffer */
+  unix_cli_pager_reindex (cf);
+
+  /* Redraw the page */
+  unix_cli_pager_redraw (cf, uf);
+}
+
+/** Handle configuration directives in the @em unix section. */
+static clib_error_t *
+unix_cli_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  unix_main_t *um = &unix_main;
+  unix_cli_main_t *cm = &unix_cli_main;
+  int flags;
+  clib_error_t *error = 0;
+  unix_cli_file_t *cf;
+  u32 cf_index;
+  struct termios tio;
+  struct sigaction sa;
+  struct winsize ws;
+  u8 *term;
+
+  /* We depend on unix flags being set. */
+  if ((error = vlib_call_config_function (vm, unix_config)))
+    return error;
+
+  if (um->flags & UNIX_FLAG_INTERACTIVE)
+    {
+      /* Set stdin to be non-blocking. */
+      if ((flags = fcntl (UNIX_CLI_STDIN_FD, F_GETFL, 0)) < 0)
+	flags = 0;
+      (void) fcntl (UNIX_CLI_STDIN_FD, F_SETFL, flags | O_NONBLOCK);
+
+      cf_index = unix_cli_file_add (cm, "stdin", UNIX_CLI_STDIN_FD);
+      cf = pool_elt_at_index (cm->cli_file_pool, cf_index);
+      cm->stdin_cli_file_index = cf_index;
+
+      /* If stdin is a tty and we are using chacracter mode, enable
+       * history on the CLI and set the tty line discipline accordingly. */
+      if (isatty (UNIX_CLI_STDIN_FD) && um->cli_line_mode == 0)
+	{
+	  /* Capture terminal resize events */
+	  memset (&sa, 0, sizeof (sa));
+	  sa.sa_handler = unix_cli_resize_interrupt;
+	  if (sigaction (SIGWINCH, &sa, 0) < 0)
+	    clib_panic ("sigaction");
+
+	  /* Retrieve the current terminal size */
+	  ioctl (UNIX_CLI_STDIN_FD, TIOCGWINSZ, &ws);
+	  cf->width = ws.ws_col;
+	  cf->height = ws.ws_row;
+
+	  if (cf->width == 0 || cf->height == 0)
+	    /* We have a tty, but no size. Stick to line mode. */
+	    goto notty;
+
+	  /* Setup the history */
+	  cf->history_limit = um->cli_history_limit;
+	  cf->has_history = cf->history_limit != 0;
+
+	  /* Setup the pager */
+	  cf->no_pager = um->cli_no_pager;
+
+	  /* We're going to be in char by char mode */
+	  cf->line_mode = 0;
+
+	  /* Save the original tty state so we can restore it later */
+	  tcgetattr (UNIX_CLI_STDIN_FD, &um->tio_stdin);
+	  um->tio_isset = 1;
+
+	  /* Tweak the tty settings */
+	  tio = um->tio_stdin;
+	  /* echo off, canonical mode off, ext'd input processing off */
+	  tio.c_lflag &= ~(ECHO | ICANON | IEXTEN);
+	  tio.c_cc[VMIN] = 1;	/* 1 byte at a time */
+	  tio.c_cc[VTIME] = 0;	/* no timer */
+	  tcsetattr (UNIX_CLI_STDIN_FD, TCSAFLUSH, &tio);
+
+	  /* See if we can do ANSI/VT100 output */
+	  term = (u8 *) getenv ("TERM");
+	  if (term != NULL)
+	    cf->ansi_capable = unix_cli_terminal_type (term,
+						       strlen ((char *)
+							       term));
+	}
+      else
+	{
+	notty:
+	  /* No tty, so make sure these things are off */
+	  cf->no_pager = 1;
+	  cf->history_limit = 0;
+	  cf->has_history = 0;
+	  cf->line_mode = 1;
+	}
+
+      /* Send banner and initial prompt */
+      unix_cli_file_welcome (cm, cf);
+    }
+
+  /* If we have socket config, LISTEN, otherwise, don't */
+  clib_socket_t *s = &um->cli_listen_socket;
+  if (s->config && s->config[0] != 0)
+    {
+      /* CLI listen. */
+      unix_file_t template = { 0 };
+
+      s->flags = SOCKET_IS_SERVER;	/* listen, don't connect */
+      error = clib_socket_init (s);
+
+      if (error)
+	return error;
+
+      template.read_function = unix_cli_listen_read_ready;
+      template.file_descriptor = s->fd;
+
+      unix_file_add (um, &template);
+    }
+
+  /* Set CLI prompt. */
+  if (!cm->cli_prompt)
+    cm->cli_prompt = format (0, "VLIB: ");
+
+  return 0;
+}
+
+/*?
+ * This module has no configurable parameters.
+?*/
+VLIB_CONFIG_FUNCTION (unix_cli_config, "unix-cli");
+
+/** Called when VPP is shutting down, this restores the system
+ * terminal state if previously saved.
+ */
+static clib_error_t *
+unix_cli_exit (vlib_main_t * vm)
+{
+  unix_main_t *um = &unix_main;
+
+  /* If stdin is a tty and we saved the tty state, reset the tty state */
+  if (isatty (UNIX_CLI_STDIN_FD) && um->tio_isset)
+    tcsetattr (UNIX_CLI_STDIN_FD, TCSAFLUSH, &um->tio_stdin);
+
+  return 0;
+}
+
+VLIB_MAIN_LOOP_EXIT_FUNCTION (unix_cli_exit);
+
+/** Set the CLI prompt.
+ * @param prompt The C string to set the prompt to.
+ * @note This setting is global; it impacts all current
+ *       and future CLI sessions.
+ */
+void
+vlib_unix_cli_set_prompt (char *prompt)
+{
+  char *fmt = (prompt[strlen (prompt) - 1] == ' ') ? "%s" : "%s ";
+  unix_cli_main_t *cm = &unix_cli_main;
+  if (cm->cli_prompt)
+    vec_free (cm->cli_prompt);
+  cm->cli_prompt = format (0, fmt, prompt);
+}
+
+/** CLI command to quit the terminal session.
+ * @note If this is a stdin session then this will
+ *       shutdown VPP also.
+ */
+static clib_error_t *
+unix_cli_quit (vlib_main_t * vm,
+	       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unix_cli_main_t *cm = &unix_cli_main;
+
+  vlib_process_signal_event (vm,
+			     vlib_current_process (vm),
+			     UNIX_CLI_PROCESS_EVENT_QUIT,
+			     cm->current_input_file_index);
+  return 0;
+}
+
+/*?
+ * Terminates the current CLI session.
+ *
+ * If VPP is running in @em interactive mode and this is the console session
+ * (that is, the session on @c stdin) then this will also terminate VPP.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (unix_cli_quit_command, static) = {
+  .path = "quit",
+  .short_help = "Exit CLI",
+  .function = unix_cli_quit,
+};
+/* *INDENT-ON* */
+
+/** CLI command to execute a VPP command script. */
+static clib_error_t *
+unix_cli_exec (vlib_main_t * vm,
+	       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  char *file_name;
+  int fd;
+  unformat_input_t sub_input;
+  clib_error_t *error;
+
+  file_name = 0;
+  fd = -1;
+  error = 0;
+
+  if (!unformat (input, "%s", &file_name))
+    {
+      error = clib_error_return (0, "expecting file name, got `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  fd = open (file_name, O_RDONLY);
+  if (fd < 0)
+    {
+      error = clib_error_return_unix (0, "failed to open `%s'", file_name);
+      goto done;
+    }
+
+  /* Make sure its a regular file. */
+  {
+    struct stat s;
+
+    if (fstat (fd, &s) < 0)
+      {
+	error = clib_error_return_unix (0, "failed to stat `%s'", file_name);
+	goto done;
+      }
+
+    if (!(S_ISREG (s.st_mode) || S_ISLNK (s.st_mode)))
+      {
+	error = clib_error_return (0, "not a regular file `%s'", file_name);
+	goto done;
+      }
+  }
+
+  unformat_init_unix_file (&sub_input, fd);
+
+  vlib_cli_input (vm, &sub_input, 0, 0);
+  unformat_free (&sub_input);
+
+done:
+  if (fd > 0)
+    close (fd);
+  vec_free (file_name);
+
+  return error;
+}
+
+/*?
+ * Executes a sequence of CLI commands which are read from a file.
+ *
+ * If a command is unrecognised or otherwise invalid then the usual CLI
+ * feedback will be generated, however execution of subsequent commands
+ * from the file will continue.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_exec, static) = {
+  .path = "exec",
+  .short_help = "Execute commands from file",
+  .function = unix_cli_exec,
+  .is_mp_safe = 1,
+};
+/* *INDENT-ON* */
+
+/** CLI command to show various unix error statistics. */
+static clib_error_t *
+unix_show_errors (vlib_main_t * vm,
+		  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unix_main_t *um = &unix_main;
+  clib_error_t *error = 0;
+  int i, n_errors_to_show;
+  unix_error_history_t *unix_errors = 0;
+
+  n_errors_to_show = 1 << 30;
+
+  if (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (!unformat (input, "%d", &n_errors_to_show))
+	{
+	  error =
+	    clib_error_return (0,
+			       "expecting integer number of errors to show, got `%U'",
+			       format_unformat_error, input);
+	  goto done;
+	}
+    }
+
+  n_errors_to_show =
+    clib_min (ARRAY_LEN (um->error_history), n_errors_to_show);
+
+  i =
+    um->error_history_index >
+    0 ? um->error_history_index - 1 : ARRAY_LEN (um->error_history) - 1;
+
+  while (n_errors_to_show > 0)
+    {
+      unix_error_history_t *eh = um->error_history + i;
+
+      if (!eh->error)
+	break;
+
+      vec_add1 (unix_errors, eh[0]);
+      n_errors_to_show -= 1;
+      if (i == 0)
+	i = ARRAY_LEN (um->error_history) - 1;
+      else
+	i--;
+    }
+
+  if (vec_len (unix_errors) == 0)
+    vlib_cli_output (vm, "no Unix errors so far");
+  else
+    {
+      vlib_cli_output (vm, "%Ld total errors seen", um->n_total_errors);
+      for (i = vec_len (unix_errors) - 1; i >= 0; i--)
+	{
+	  unix_error_history_t *eh = vec_elt_at_index (unix_errors, i);
+	  vlib_cli_output (vm, "%U: %U",
+			   format_time_interval, "h:m:s:u", eh->time,
+			   format_clib_error, eh->error);
+	}
+      vlib_cli_output (vm, "%U: time now",
+		       format_time_interval, "h:m:s:u", vlib_time_now (vm));
+    }
+
+done:
+  vec_free (unix_errors);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_unix_show_errors, static) = {
+  .path = "show unix-errors",
+  .short_help = "Show Unix system call error history",
+  .function = unix_show_errors,
+};
+/* *INDENT-ON* */
+
+/** CLI command to show session command history. */
+static clib_error_t *
+unix_cli_show_history (vlib_main_t * vm,
+		       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unix_cli_main_t *cm = &unix_cli_main;
+  unix_cli_file_t *cf;
+  int i, j;
+
+  cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
+
+  if (cf->has_history && cf->history_limit)
+    {
+      i = 1 + cf->command_number - vec_len (cf->command_history);
+      for (j = 0; j < vec_len (cf->command_history); j++)
+	vlib_cli_output (vm, "%d  %v\n", i + j, cf->command_history[j]);
+    }
+  else
+    {
+      vlib_cli_output (vm, "History not enabled.\n");
+    }
+
+  return 0;
+}
+
+/*?
+ * Displays the command history for the current session, if any.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_unix_cli_show_history, static) = {
+  .path = "history",
+  .short_help = "Show current session command history",
+  .function = unix_cli_show_history,
+};
+/* *INDENT-ON* */
+
+/** CLI command to show terminal status. */
+static clib_error_t *
+unix_cli_show_terminal (vlib_main_t * vm,
+			unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unix_main_t *um = &unix_main;
+  unix_cli_main_t *cm = &unix_cli_main;
+  unix_cli_file_t *cf;
+  vlib_node_t *n;
+
+  cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
+  n = vlib_get_node (vm, cf->process_node_index);
+
+  vlib_cli_output (vm, "Terminal name:   %v\n", n->name);
+  vlib_cli_output (vm, "Terminal mode:   %s\n", cf->line_mode ?
+		   "line-by-line" : "char-by-char");
+  vlib_cli_output (vm, "Terminal width:  %d\n", cf->width);
+  vlib_cli_output (vm, "Terminal height: %d\n", cf->height);
+  vlib_cli_output (vm, "ANSI capable:    %s\n",
+		   cf->ansi_capable ? "yes" : "no");
+  vlib_cli_output (vm, "History enabled: %s%s\n",
+		   cf->has_history ? "yes" : "no", !cf->has_history
+		   || cf->history_limit ? "" :
+		   " (disabled by history limit)");
+  if (cf->has_history)
+    vlib_cli_output (vm, "History limit:   %d\n", cf->history_limit);
+  vlib_cli_output (vm, "Pager enabled:   %s%s%s\n",
+		   cf->no_pager ? "no" : "yes",
+		   cf->no_pager
+		   || cf->height ? "" : " (disabled by terminal height)",
+		   cf->no_pager
+		   || um->cli_pager_buffer_limit ? "" :
+		   " (disabled by buffer limit)");
+  if (!cf->no_pager)
+    vlib_cli_output (vm, "Pager limit:     %d\n", um->cli_pager_buffer_limit);
+  vlib_cli_output (vm, "CRLF mode:       %s\n",
+		   cf->crlf_mode ? "CR+LF" : "LF");
+
+  return 0;
+}
+
+/*?
+ * Displays various information about the state of the current terminal
+ * session.
+ *
+ * @cliexpar
+ * @cliexstart{show terminal}
+ * Terminal name:   unix-cli-stdin
+ * Terminal mode:   char-by-char
+ * Terminal width:  123
+ * Terminal height: 48
+ * ANSI capable:    yes
+ * History enabled: yes
+ * History limit:   50
+ * Pager enabled:   yes
+ * Pager limit:     100000
+ * CRLF mode:       LF
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_unix_cli_show_terminal, static) = {
+  .path = "show terminal",
+  .short_help = "Show current session terminal settings",
+  .function = unix_cli_show_terminal,
+};
+/* *INDENT-ON* */
+
+/** CLI command to set terminal pager settings. */
+static clib_error_t *
+unix_cli_set_terminal_pager (vlib_main_t * vm,
+			     unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  unix_main_t *um = &unix_main;
+  unix_cli_main_t *cm = &unix_cli_main;
+  unix_cli_file_t *cf;
+  unformat_input_t _line_input, *line_input = &_line_input;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "on"))
+	cf->no_pager = 0;
+      else if (unformat (line_input, "off"))
+	cf->no_pager = 1;
+      else if (unformat (line_input, "limit %u", &um->cli_pager_buffer_limit))
+	vlib_cli_output (vm,
+			 "Pager limit set to %u lines; note, this is global.\n",
+			 um->cli_pager_buffer_limit);
+      else
+	return clib_error_return (0, "unknown parameter: `%U`",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  return 0;
+}
+
+/*?
+ * Enables or disables the terminal pager for this session. Generally
+ * this defaults to enabled.
+ *
+ * Additionally allows the pager buffer size to be set; though note that
+ * this value is set globally and not per session.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_unix_cli_set_terminal_pager, static) = {
+  .path = "set terminal pager",
+  .short_help = "set terminal pager [on|off] [limit <lines>]",
+  .function = unix_cli_set_terminal_pager,
+};
+/* *INDENT-ON* */
+
+/** CLI command to set terminal history settings. */
+static clib_error_t *
+unix_cli_set_terminal_history (vlib_main_t * vm,
+			       unformat_input_t * input,
+			       vlib_cli_command_t * cmd)
+{
+  unix_cli_main_t *cm = &unix_cli_main;
+  unix_cli_file_t *cf;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 limit;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "on"))
+	cf->has_history = 1;
+      else if (unformat (line_input, "off"))
+	cf->has_history = 0;
+      else if (unformat (line_input, "limit %u", &cf->history_limit))
+	;
+      else
+	return clib_error_return (0, "unknown parameter: `%U`",
+				  format_unformat_error, line_input);
+
+      /* If we reduced history size, or turned it off, purge the history */
+      limit = cf->has_history ? cf->history_limit : 0;
+
+      while (cf->command_history && vec_len (cf->command_history) >= limit)
+	{
+	  vec_free (cf->command_history[0]);
+	  vec_delete (cf->command_history, 1, 0);
+	}
+    }
+
+  unformat_free (line_input);
+
+  return 0;
+}
+
+/*?
+ * Enables or disables the command history function of the current
+ * terminal. Generally this defaults to enabled.
+ *
+ * This command also allows the maximum size of the history buffer for
+ * this session to be altered.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_unix_cli_set_terminal_history, static) = {
+  .path = "set terminal history",
+  .short_help = "set terminal history [on|off] [limit <lines>]",
+  .function = unix_cli_set_terminal_history,
+};
+/* *INDENT-ON* */
+
+/** CLI command to set terminal ANSI settings. */
+static clib_error_t *
+unix_cli_set_terminal_ansi (vlib_main_t * vm,
+			    unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+  unix_cli_main_t *cm = &unix_cli_main;
+  unix_cli_file_t *cf;
+
+  cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
+
+  if (unformat (input, "on"))
+    cf->ansi_capable = 1;
+  else if (unformat (input, "off"))
+    cf->ansi_capable = 0;
+  else
+    return clib_error_return (0, "unknown parameter: `%U`",
+			      format_unformat_error, input);
+
+  return 0;
+}
+
+/*?
+ * Enables or disables the use of ANSI control sequences by this terminal.
+ * The default will vary based on terminal detection at the start of the
+ * session.
+ *
+ * ANSI control sequences are used in a small number of places to provide,
+ * for example, color text output and to control the cursor in the pager.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_unix_cli_set_terminal_ansi, static) = {
+  .path = "set terminal ansi",
+  .short_help = "set terminal ansi [on|off]",
+  .function = unix_cli_set_terminal_ansi,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+unix_cli_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (unix_cli_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/unix/dir.dox b/src/vlib/unix/dir.dox
new file mode 100644
index 00000000..1380fa56
--- /dev/null
+++ b/src/vlib/unix/dir.dox
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Doxygen directory documentation */
+
+/**
+@dir
+@brief VLIB Unix interface
+
+VLIB application library Unix interface layer.
+
+*/
+/*? %%clicmd:group_label Unix Interface %% ?*/
+/*? %%syscfg:group_label Unix Interface %% ?*/
+
diff --git a/src/vlib/unix/input.c b/src/vlib/unix/input.c
new file mode 100644
index 00000000..07096ed2
--- /dev/null
+++ b/src/vlib/unix/input.c
@@ -0,0 +1,265 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * input.c: Unix file input
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <signal.h>
+
+/* FIXME autoconf */
+#define HAVE_LINUX_EPOLL
+
+#ifdef HAVE_LINUX_EPOLL
+
+#include <sys/epoll.h>
+
+typedef struct
+{
+  int epoll_fd;
+  struct epoll_event *epoll_events;
+
+  /* Statistics. */
+  u64 epoll_files_ready;
+  u64 epoll_waits;
+} linux_epoll_main_t;
+
+static linux_epoll_main_t linux_epoll_main;
+
+static void
+linux_epoll_file_update (unix_file_t * f, unix_file_update_type_t update_type)
+{
+  unix_main_t *um = &unix_main;
+  linux_epoll_main_t *em = &linux_epoll_main;
+  struct epoll_event e;
+
+  memset (&e, 0, sizeof (e));
+
+  e.events = EPOLLIN;
+  if (f->flags & UNIX_FILE_DATA_AVAILABLE_TO_WRITE)
+    e.events |= EPOLLOUT;
+  if (f->flags & UNIX_FILE_EVENT_EDGE_TRIGGERED)
+    e.events |= EPOLLET;
+  e.data.u32 = f - um->file_pool;
+
+  if (epoll_ctl (em->epoll_fd,
+		 (update_type == UNIX_FILE_UPDATE_ADD
+		  ? EPOLL_CTL_ADD
+		  : (update_type == UNIX_FILE_UPDATE_MODIFY
+		     ? EPOLL_CTL_MOD
+		     : EPOLL_CTL_DEL)), f->file_descriptor, &e) < 0)
+    clib_warning ("epoll_ctl");
+}
+
+static uword
+linux_epoll_input (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  unix_main_t *um = &unix_main;
+  linux_epoll_main_t *em = &linux_epoll_main;
+  struct epoll_event *e;
+  int n_fds_ready;
+
+  {
+    vlib_node_main_t *nm = &vm->node_main;
+    u64 t = nm->cpu_time_next_process_ready;
+    f64 timeout;
+    int timeout_ms, max_timeout_ms = 10;
+    f64 vector_rate = vlib_last_vectors_per_main_loop (vm);
+
+    if (t == ~0ULL)
+      {
+	timeout = 10e-3;
+	timeout_ms = max_timeout_ms;
+      }
+    else
+      {
+	timeout =
+	  (((i64) t - (i64) clib_cpu_time_now ())
+	   * vm->clib_time.seconds_per_clock)
+	  /* subtract off some slop time */  - 50e-6;
+
+	if (timeout < 1e3)
+	  {
+	    /* We have event happenning in less than 1 ms so
+	       don't allow epoll to wait */
+	    timeout_ms = 0;
+	  }
+	else
+	  {
+	    timeout_ms = timeout * 1e3;
+
+	    /* Must be between 1 and 10 ms. */
+	    timeout_ms = clib_max (1, timeout_ms);
+	    timeout_ms = clib_min (max_timeout_ms, timeout_ms);
+	  }
+      }
+
+    /* If we still have input nodes polling (e.g. vnet packet generator)
+       don't sleep. */
+    if (nm->input_node_counts_by_state[VLIB_NODE_STATE_POLLING] > 0)
+      timeout_ms = 0;
+
+    /*
+     * When busy: don't wait & only epoll for input
+     * every 1024 times through main loop.
+     */
+    if (vector_rate > 1 || vm->api_queue_nonempty)
+      {
+	timeout_ms = 0;
+	node->input_main_loops_per_call = 1024;
+      }
+    else
+      /* We're not busy; go to sleep for a while. */
+      node->input_main_loops_per_call = 0;
+
+    /* Allow any signal to wakeup our sleep. */
+    {
+      static sigset_t unblock_all_signals;
+      n_fds_ready = epoll_pwait (em->epoll_fd,
+				 em->epoll_events,
+				 vec_len (em->epoll_events),
+				 timeout_ms, &unblock_all_signals);
+
+      /* This kludge is necessary to run over absurdly old kernels */
+      if (n_fds_ready < 0 && errno == ENOSYS)
+	{
+	  n_fds_ready = epoll_wait (em->epoll_fd,
+				    em->epoll_events,
+				    vec_len (em->epoll_events), timeout_ms);
+	}
+    }
+  }
+
+  if (n_fds_ready < 0)
+    {
+      if (unix_error_is_fatal (errno))
+	vlib_panic_with_error (vm, clib_error_return_unix (0, "epoll_wait"));
+
+      /* non fatal error (e.g. EINTR). */
+      return 0;
+    }
+
+  em->epoll_waits += 1;
+  em->epoll_files_ready += n_fds_ready;
+
+  for (e = em->epoll_events; e < em->epoll_events + n_fds_ready; e++)
+    {
+      u32 i = e->data.u32;
+      unix_file_t *f = pool_elt_at_index (um->file_pool, i);
+      clib_error_t *errors[4];
+      int n_errors = 0;
+
+      if (PREDICT_TRUE (!(e->events & EPOLLERR)))
+	{
+	  if (e->events & EPOLLIN)
+	    {
+	      errors[n_errors] = f->read_function (f);
+	      n_errors += errors[n_errors] != 0;
+	    }
+	  if (e->events & EPOLLOUT)
+	    {
+	      errors[n_errors] = f->write_function (f);
+	      n_errors += errors[n_errors] != 0;
+	    }
+	}
+      else
+	{
+	  if (f->error_function)
+	    {
+	      errors[n_errors] = f->error_function (f);
+	      n_errors += errors[n_errors] != 0;
+	    }
+	  else
+	    close (f->file_descriptor);
+	}
+
+      ASSERT (n_errors < ARRAY_LEN (errors));
+      for (i = 0; i < n_errors; i++)
+	{
+	  unix_save_error (um, errors[i]);
+	}
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (linux_epoll_input_node,static) = {
+  .function = linux_epoll_input,
+  .type = VLIB_NODE_TYPE_PRE_INPUT,
+  .name = "unix-epoll-input",
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+linux_epoll_input_init (vlib_main_t * vm)
+{
+  linux_epoll_main_t *em = &linux_epoll_main;
+  unix_main_t *um = &unix_main;
+
+  /* Allocate some events. */
+  vec_resize (em->epoll_events, VLIB_FRAME_SIZE);
+
+  em->epoll_fd = epoll_create (vec_len (em->epoll_events));
+  if (em->epoll_fd < 0)
+    return clib_error_return_unix (0, "epoll_create");
+
+  um->file_update = linux_epoll_file_update;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (linux_epoll_input_init);
+
+#endif /* HAVE_LINUX_EPOLL */
+
+static clib_error_t *
+unix_input_init (vlib_main_t * vm)
+{
+  return vlib_call_init_function (vm, linux_epoll_input_init);
+}
+
+VLIB_INIT_FUNCTION (unix_input_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/unix/main.c b/src/vlib/unix/main.c
new file mode 100644
index 00000000..562778e0
--- /dev/null
+++ b/src/vlib/unix/main.c
@@ -0,0 +1,557 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * main.c: Unix main routine
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlib/unix/plugin.h>
+
+#include <signal.h>
+#include <sys/ucontext.h>
+#include <syslog.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+/** Default CLI pager limit is not configured in startup.conf */
+#define UNIX_CLI_DEFAULT_PAGER_LIMIT 100000
+
+/** Default CLI history depth if not configured in startup.conf */
+#define UNIX_CLI_DEFAULT_HISTORY 50
+
+
+unix_main_t unix_main;
+
+static clib_error_t *
+unix_main_init (vlib_main_t * vm)
+{
+  unix_main_t *um = &unix_main;
+  um->vlib_main = vm;
+  return vlib_call_init_function (vm, unix_input_init);
+}
+
+VLIB_INIT_FUNCTION (unix_main_init);
+
+static void
+unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc)
+{
+  uword fatal;
+  u8 *msg = 0;
+
+  msg = format (msg, "received signal %U, PC %U",
+		format_signal, signum, format_ucontext_pc, uc);
+
+  if (signum == SIGSEGV)
+    msg = format (msg, ", faulting address %p", si->si_addr);
+
+  switch (signum)
+    {
+      /* these (caught) signals cause the application to exit */
+    case SIGTERM:
+      if (unix_main.vlib_main->main_loop_exit_set)
+	{
+	  syslog (LOG_ERR | LOG_DAEMON, "received SIGTERM, exiting...");
+
+	  clib_longjmp (&unix_main.vlib_main->main_loop_exit,
+			VLIB_MAIN_LOOP_EXIT_CLI);
+	}
+      /* fall through */
+    case SIGQUIT:
+    case SIGINT:
+    case SIGILL:
+    case SIGBUS:
+    case SIGSEGV:
+    case SIGHUP:
+    case SIGFPE:
+      fatal = 1;
+      break;
+
+      /* by default, print a message and continue */
+    default:
+      fatal = 0;
+      break;
+    }
+
+  /* Null terminate. */
+  vec_add1 (msg, 0);
+
+  if (fatal)
+    {
+      syslog (LOG_ERR | LOG_DAEMON, "%s", msg);
+      os_exit (1);
+    }
+  else
+    clib_warning ("%s", msg);
+
+  vec_free (msg);
+}
+
+static clib_error_t *
+setup_signal_handlers (unix_main_t * um)
+{
+  uword i;
+  struct sigaction sa;
+
+  for (i = 1; i < 32; i++)
+    {
+      memset (&sa, 0, sizeof (sa));
+      sa.sa_sigaction = (void *) unix_signal_handler;
+      sa.sa_flags = SA_SIGINFO;
+
+      switch (i)
+	{
+	  /* these signals take the default action */
+	case SIGABRT:
+	case SIGKILL:
+	case SIGSTOP:
+	case SIGUSR1:
+	case SIGUSR2:
+	  continue;
+
+	  /* ignore SIGPIPE, SIGCHLD */
+	case SIGPIPE:
+	case SIGCHLD:
+	  sa.sa_sigaction = (void *) SIG_IGN;
+	  break;
+
+	  /* catch and handle all other signals */
+	default:
+	  break;
+	}
+
+      if (sigaction (i, &sa, 0) < 0)
+	return clib_error_return_unix (0, "sigaction %U", format_signal, i);
+    }
+
+  return 0;
+}
+
+static void
+unix_error_handler (void *arg, u8 * msg, int msg_len)
+{
+  unix_main_t *um = arg;
+
+  /* Echo to stderr when interactive. */
+  if (um->flags & UNIX_FLAG_INTERACTIVE)
+    {
+      CLIB_UNUSED (int r) = write (2, msg, msg_len);
+    }
+  else
+    {
+      char save = msg[msg_len - 1];
+
+      /* Null Terminate. */
+      msg[msg_len - 1] = 0;
+
+      syslog (LOG_ERR | LOG_DAEMON, "%s", msg);
+
+      msg[msg_len - 1] = save;
+    }
+}
+
+void
+vlib_unix_error_report (vlib_main_t * vm, clib_error_t * error)
+{
+  unix_main_t *um = &unix_main;
+
+  if (um->flags & UNIX_FLAG_INTERACTIVE || error == 0)
+    return;
+
+  {
+    char save;
+    u8 *msg;
+    u32 msg_len;
+
+    msg = error->what;
+    msg_len = vec_len (msg);
+
+    /* Null Terminate. */
+    save = msg[msg_len - 1];
+    msg[msg_len - 1] = 0;
+
+    syslog (LOG_ERR | LOG_DAEMON, "%s", msg);
+
+    msg[msg_len - 1] = save;
+  }
+}
+
+static uword
+startup_config_process (vlib_main_t * vm,
+			vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  unix_main_t *um = &unix_main;
+  u8 *buf = 0;
+  uword l, n = 1;
+
+  vlib_process_suspend (vm, 2.0);
+
+  while (um->unix_config_complete == 0)
+    vlib_process_suspend (vm, 0.1);
+
+  if (um->startup_config_filename)
+    {
+      unformat_input_t sub_input;
+      int fd;
+      struct stat s;
+      char *fn = (char *) um->startup_config_filename;
+
+      fd = open (fn, O_RDONLY);
+      if (fd < 0)
+	{
+	  clib_warning ("failed to open `%s'", fn);
+	  return 0;
+	}
+
+      if (fstat (fd, &s) < 0)
+	{
+	  clib_warning ("failed to stat `%s'", fn);
+	bail:
+	  close (fd);
+	  return 0;
+	}
+
+      if (!(S_ISREG (s.st_mode) || S_ISLNK (s.st_mode)))
+	{
+	  clib_warning ("not a regular file: `%s'", fn);
+	  goto bail;
+	}
+
+      while (n > 0)
+	{
+	  l = vec_len (buf);
+	  vec_resize (buf, 4096);
+	  n = read (fd, buf + l, 4096);
+	  if (n > 0)
+	    {
+	      _vec_len (buf) = l + n;
+	      if (n < 4096)
+		break;
+	    }
+	  else
+	    break;
+	}
+      if (um->log_fd && vec_len (buf))
+	{
+	  u8 *lv = 0;
+	  lv = format (lv, "%U: ***** Startup Config *****\n%v",
+		       format_timeval, 0 /* current bat-time */ ,
+		       0 /* current bat-format */ ,
+		       buf);
+	  {
+	    int rv __attribute__ ((unused)) =
+	      write (um->log_fd, lv, vec_len (lv));
+	  }
+	  vec_reset_length (lv);
+	  lv = format (lv, "%U: ***** End Startup Config *****\n",
+		       format_timeval, 0 /* current bat-time */ ,
+		       0 /* current bat-format */ );
+	  {
+	    int rv __attribute__ ((unused)) =
+	      write (um->log_fd, lv, vec_len (lv));
+	  }
+	  vec_free (lv);
+	}
+
+      if (vec_len (buf))
+	{
+	  unformat_init_vector (&sub_input, buf);
+	  vlib_cli_input (vm, &sub_input, 0, 0);
+	  /* frees buf for us */
+	  unformat_free (&sub_input);
+	}
+      close (fd);
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (startup_config_node,static) = {
+    .function = startup_config_process,
+    .type = VLIB_NODE_TYPE_PROCESS,
+    .name = "startup-config-process",
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+unix_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  unix_main_t *um = &unix_main;
+  clib_error_t *error = 0;
+
+  /* Defaults */
+  um->cli_pager_buffer_limit = UNIX_CLI_DEFAULT_PAGER_LIMIT;
+  um->cli_history_limit = UNIX_CLI_DEFAULT_HISTORY;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      char *cli_prompt;
+      if (unformat (input, "interactive"))
+	um->flags |= UNIX_FLAG_INTERACTIVE;
+      else if (unformat (input, "nodaemon"))
+	um->flags |= UNIX_FLAG_NODAEMON;
+      else if (unformat (input, "cli-prompt %s", &cli_prompt))
+	vlib_unix_cli_set_prompt (cli_prompt);
+      else
+	if (unformat (input, "cli-listen %s", &um->cli_listen_socket.config))
+	;
+      else if (unformat (input, "cli-line-mode"))
+	um->cli_line_mode = 1;
+      else if (unformat (input, "cli-no-banner"))
+	um->cli_no_banner = 1;
+      else if (unformat (input, "cli-no-pager"))
+	um->cli_no_pager = 1;
+      else if (unformat (input, "cli-pager-buffer-limit %d",
+			 &um->cli_pager_buffer_limit))
+	;
+      else
+	if (unformat (input, "cli-history-limit %d", &um->cli_history_limit))
+	;
+      else if (unformat (input, "full-coredump"))
+	{
+	  int fd;
+
+	  fd = open ("/proc/self/coredump_filter", O_WRONLY);
+	  if (fd >= 0)
+	    {
+	      if (write (fd, "0x6f\n", 5) != 5)
+		clib_unix_warning ("coredump filter write failed!");
+	      close (fd);
+	    }
+	  else
+	    clib_unix_warning ("couldn't open /proc/self/coredump_filter");
+	}
+      else if (unformat (input, "startup-config %s",
+			 &um->startup_config_filename))
+	;
+      else if (unformat (input, "exec %s", &um->startup_config_filename))
+	;
+      else if (unformat (input, "log %s", &um->log_filename))
+	{
+	  um->log_fd = open ((char *) um->log_filename,
+			     O_CREAT | O_WRONLY | O_APPEND, 0644);
+	  if (um->log_fd < 0)
+	    {
+	      clib_warning ("couldn't open log '%s'\n", um->log_filename);
+	      um->log_fd = 0;
+	    }
+	  else
+	    {
+	      u8 *lv = 0;
+	      lv = format (0, "%U: ***** Start: PID %d *****\n",
+			   format_timeval, 0 /* current bat-time */ ,
+			   0 /* current bat-format */ ,
+			   getpid ());
+	      {
+		int rv __attribute__ ((unused)) =
+		  write (um->log_fd, lv, vec_len (lv));
+	      }
+	      vec_free (lv);
+	    }
+	}
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+
+  if (!(um->flags & UNIX_FLAG_INTERACTIVE))
+    {
+      error = setup_signal_handlers (um);
+      if (error)
+	return error;
+
+      openlog (vm->name, LOG_CONS | LOG_PERROR | LOG_PID, LOG_DAEMON);
+      clib_error_register_handler (unix_error_handler, um);
+
+      if (!(um->flags & UNIX_FLAG_NODAEMON) && daemon ( /* chdir to / */ 0,
+						       /* stdin/stdout/stderr -> /dev/null */
+						       0) < 0)
+	clib_error_return (0, "daemon () fails");
+    }
+  um->unix_config_complete = 1;
+
+  return 0;
+}
+
+/* unix { ... } configuration. */
+/*?
+ *
+ * @cfgcmd{interactive}
+ * Attach CLI to stdin/out and provide a debugging command line interface.
+ * Implies @c nodaemon.
+ *
+ * @cfgcmd{nodaemon}
+ * Do not fork or background the VPP process. Typically used when invoking
+ * VPP applications from a process monitor.
+ *
+ * @cfgcmd{exec, &lt;filename&gt;}
+ * @par <code>startup-config &lt;filename&gt;</code>
+ * Read startup operational configuration from @c filename.
+ * The contents of the file will be performed as though entered at the CLI.
+ * The two keywords are aliases for the same function; if both are specified,
+ * only the last will have an effect.
+ *
+ * @cfgcmd{log, &lt;filename&gt;}
+ * Logs the startup configuration and all subsequent CLI commands in
+ * @c filename.
+ * Very useful in situations where folks don't remember or can't be bothered
+ * to include CLI commands in bug reports.
+ *
+ * @cfgcmd{full-coredump}
+ * Ask the Linux kernel to dump all memory-mapped address regions, instead
+ * of just text+data+bss.
+ *
+ * @cfgcmd{cli-listen, &lt;address:port&gt;}
+ * Bind the CLI to listen at the address and port given. @clocalhost
+ * on TCP port @c 5002, given as <tt>cli-listen localhost:5002</tt>,
+ * is typical.
+ *
+ * @cfgcmd{cli-line-mode}
+ * Disable character-by-character I/O on stdin. Useful when combined with,
+ * for example, <tt>emacs M-x gud-gdb</tt>.
+ *
+ * @cfgcmd{cli-prompt, &lt;string&gt;}
+ * Configure the CLI prompt to be @c string.
+ *
+ * @cfgcmd{cli-history-limit, &lt;nn&gt;}
+ * Limit commmand history to @c nn  lines. A value of @c 0
+ * disables command history. Default value: @c 50
+ *
+ * @cfgcmd{cli-no-banner}
+ * Disable the login banner on stdin and Telnet connections.
+ *
+ * @cfgcmd{cli-no-pager}
+ * Disable the output pager.
+ *
+ * @cfgcmd{cli-pager-buffer-limit, &lt;nn&gt;}
+ * Limit pager buffer to @c nn lines of output.
+ * A value of @c 0 disables the pager. Default value: @c 100000
+?*/
+VLIB_CONFIG_FUNCTION (unix_config, "unix");
+
+static clib_error_t *
+unix_exit (vlib_main_t * vm)
+{
+  /* Close syslog connection. */
+  closelog ();
+  return 0;
+}
+
+VLIB_MAIN_LOOP_EXIT_FUNCTION (unix_exit);
+
+u8 **vlib_thread_stacks;
+
+static uword
+thread0 (uword arg)
+{
+  vlib_main_t *vm = (vlib_main_t *) arg;
+  unformat_input_t input;
+  int i;
+
+  unformat_init_command_line (&input, (char **) vm->argv);
+  i = vlib_main (vm, &input);
+  unformat_free (&input);
+
+  return i;
+}
+
+int
+vlib_unix_main (int argc, char *argv[])
+{
+  vlib_main_t *vm = &vlib_global_main;	/* one and only time for this! */
+  vlib_thread_main_t *tm = &vlib_thread_main;
+  unformat_input_t input;
+  u8 *thread_stacks;
+  clib_error_t *e;
+  int i;
+
+  vm->argv = (u8 **) argv;
+  vm->name = argv[0];
+  vm->heap_base = clib_mem_get_heap ();
+  ASSERT (vm->heap_base);
+
+  i = vlib_plugin_early_init (vm);
+  if (i)
+    return i;
+
+  unformat_init_command_line (&input, (char **) vm->argv);
+  if (vm->init_functions_called == 0)
+    vm->init_functions_called = hash_create (0, /* value bytes */ 0);
+  e = vlib_call_all_config_functions (vm, &input, 1 /* early */ );
+  if (e != 0)
+    {
+      clib_error_report (e);
+      return 1;
+    }
+  unformat_free (&input);
+
+  /*
+   * allocate n x VLIB_THREAD_STACK_SIZE stacks, aligned to a
+   * VLIB_THREAD_STACK_SIZE boundary
+   * See also: os_get_cpu_number() in vlib/vlib/threads.c
+   */
+  thread_stacks = clib_mem_alloc_aligned
+    ((uword) tm->n_thread_stacks * VLIB_THREAD_STACK_SIZE,
+     VLIB_THREAD_STACK_SIZE);
+
+  vec_validate (vlib_thread_stacks, tm->n_thread_stacks - 1);
+  for (i = 0; i < vec_len (vlib_thread_stacks); i++)
+    {
+      vlib_thread_stacks[i] = thread_stacks;
+
+      /*
+       * Disallow writes to the bottom page of the stack, to
+       * catch stack overflows.
+       */
+      if (mprotect (thread_stacks, clib_mem_get_page_size (), PROT_READ) < 0)
+	clib_unix_warning ("thread stack");
+
+      thread_stacks += VLIB_THREAD_STACK_SIZE;
+    }
+
+  i = clib_calljmp (thread0, (uword) vm,
+		    (void *) (vlib_thread_stacks[0] +
+			      VLIB_THREAD_STACK_SIZE));
+  return i;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/unix/mc_socket.c b/src/vlib/unix/mc_socket.c
new file mode 100644
index 00000000..9c12ad3b
--- /dev/null
+++ b/src/vlib/unix/mc_socket.c
@@ -0,0 +1,1049 @@
+/*
+ * mc_socket.c: socket based multicast for vlib mc
+ *
+ * Copyright (c) 2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vlib/unix/mc_socket.h>
+
+#include <sys/ioctl.h>		/* for FIONBIO */
+#include <netinet/tcp.h>	/* for TCP_NODELAY */
+#include <net/if.h>		/* for struct ifreq */
+
+static u8 *
+format_socket_peer_id (u8 * s, va_list * args)
+{
+  u64 peer_id_as_u64 = va_arg (*args, u64);
+  mc_peer_id_t peer_id;
+  peer_id.as_u64 = peer_id_as_u64;
+  u32 a = mc_socket_peer_id_get_address (peer_id);
+  u32 p = mc_socket_peer_id_get_port (peer_id);
+
+  s = format (s, "%U:%04x", format_network_address, AF_INET, &a, ntohs (p));
+
+  return s;
+}
+
+typedef void (mc_msg_handler_t) (mc_main_t * mcm, void *msg,
+				 u32 buffer_index);
+
+always_inline void
+msg_handler (mc_main_t * mcm,
+	     u32 buffer_index, u32 handler_frees_buffer, void *_h)
+{
+  vlib_main_t *vm = mcm->vlib_main;
+  mc_msg_handler_t *h = _h;
+  vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
+  void *the_msg = vlib_buffer_get_current (b);
+
+  h (mcm, the_msg, buffer_index);
+  if (!handler_frees_buffer)
+    vlib_buffer_free_one (vm, buffer_index);
+}
+
+static uword
+append_buffer_index_to_iovec (vlib_main_t * vm,
+			      u32 buffer_index, struct iovec **iovs_return)
+{
+  struct iovec *i;
+  vlib_buffer_t *b;
+  u32 bi = buffer_index;
+  u32 l = 0;
+
+  while (1)
+    {
+      b = vlib_get_buffer (vm, bi);
+      vec_add2 (*iovs_return, i, 1);
+      i->iov_base = vlib_buffer_get_current (b);
+      i->iov_len = b->current_length;
+      l += i->iov_len;
+      if (!(b->flags & VLIB_BUFFER_NEXT_PRESENT))
+	break;
+      bi = b->next_buffer;
+    }
+
+  return l;
+}
+
+static clib_error_t *
+sendmsg_helper (mc_socket_main_t * msm,
+		int socket, struct sockaddr_in *tx_addr, u32 buffer_index)
+{
+  vlib_main_t *vm = msm->mc_main.vlib_main;
+  struct msghdr h;
+  word n_bytes, n_bytes_tx, n_retries;
+
+  memset (&h, 0, sizeof (h));
+  h.msg_name = tx_addr;
+  h.msg_namelen = sizeof (tx_addr[0]);
+
+  if (msm->iovecs)
+    _vec_len (msm->iovecs) = 0;
+
+  n_bytes = append_buffer_index_to_iovec (vm, buffer_index, &msm->iovecs);
+  ASSERT (n_bytes <= msm->mc_main.transport.max_packet_size);
+  if (n_bytes > msm->mc_main.transport.max_packet_size)
+    clib_error ("sending packet larger than interace MTU %d bytes", n_bytes);
+
+  h.msg_iov = msm->iovecs;
+  h.msg_iovlen = vec_len (msm->iovecs);
+
+  n_retries = 0;
+  while ((n_bytes_tx = sendmsg (socket, &h, /* flags */ 0)) != n_bytes
+	 && errno == EAGAIN)
+    n_retries++;
+  if (n_bytes_tx != n_bytes)
+    {
+      clib_unix_warning ("sendmsg");
+      return 0;
+    }
+  if (n_retries)
+    {
+      ELOG_TYPE_DECLARE (e) =
+      {
+      .format = "sendmsg-helper: %d retries",.format_args = "i4",};
+      struct
+      {
+	u32 retries;
+      } *ed = 0;
+
+      ed = ELOG_DATA (&vm->elog_main, e);
+      ed->retries = n_retries;
+    }
+  return 0;
+}
+
+static clib_error_t *
+tx_buffer (void *transport, mc_transport_type_t type, u32 buffer_index)
+{
+  mc_socket_main_t *msm = (mc_socket_main_t *) transport;
+  vlib_main_t *vm = msm->mc_main.vlib_main;
+  mc_multicast_socket_t *ms = &msm->multicast_sockets[type];
+  clib_error_t *error;
+  error = sendmsg_helper (msm, ms->socket, &ms->tx_addr, buffer_index);
+  if (type != MC_TRANSPORT_USER_REQUEST_TO_RELAY)
+    vlib_buffer_free_one (vm, buffer_index);
+  return error;
+}
+
+static clib_error_t *
+tx_ack (void *transport, mc_peer_id_t dest_peer_id, u32 buffer_index)
+{
+  struct sockaddr_in tx_addr;
+  mc_socket_main_t *msm = (mc_socket_main_t *) transport;
+  vlib_main_t *vm = msm->mc_main.vlib_main;
+  clib_error_t *error;
+
+  memset (&tx_addr, 0, sizeof (tx_addr));
+  tx_addr.sin_family = AF_INET;
+  tx_addr.sin_addr.s_addr = mc_socket_peer_id_get_address (dest_peer_id);
+  tx_addr.sin_port = mc_socket_peer_id_get_port (dest_peer_id);
+
+  error = sendmsg_helper (msm, msm->ack_socket, &tx_addr, buffer_index);
+  vlib_buffer_free_one (vm, buffer_index);
+  return error;
+}
+
+static clib_error_t *
+recvmsg_helper (mc_socket_main_t * msm,
+		int socket,
+		struct sockaddr_in *rx_addr,
+		u32 * buffer_index, u32 drop_message)
+{
+  vlib_main_t *vm = msm->mc_main.vlib_main;
+  vlib_buffer_t *b;
+  uword n_left, n_alloc, n_mtu, i, i_rx;
+  const uword buffer_size = VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES;
+  word n_bytes_left;
+
+  /* Make sure we have at least a MTU worth of buffers. */
+  n_mtu = msm->rx_mtu_n_buffers;
+  n_left = vec_len (msm->rx_buffers);
+  if (n_left < n_mtu)
+    {
+      uword max_alloc = 8 * n_mtu;
+      vec_validate (msm->rx_buffers, max_alloc - 1);
+      n_alloc =
+	vlib_buffer_alloc (vm, msm->rx_buffers + n_left, max_alloc - n_left);
+      _vec_len (msm->rx_buffers) = n_left + n_alloc;
+    }
+
+  ASSERT (vec_len (msm->rx_buffers) >= n_mtu);
+  vec_validate (msm->iovecs, n_mtu - 1);
+
+  /* Allocate RX buffers from end of rx_buffers.
+     Turn them into iovecs to pass to readv. */
+  i_rx = vec_len (msm->rx_buffers) - 1;
+  for (i = 0; i < n_mtu; i++)
+    {
+      b = vlib_get_buffer (vm, msm->rx_buffers[i_rx - i]);
+      msm->iovecs[i].iov_base = b->data;
+      msm->iovecs[i].iov_len = buffer_size;
+    }
+  _vec_len (msm->iovecs) = n_mtu;
+
+  {
+    struct msghdr h;
+
+    memset (&h, 0, sizeof (h));
+    if (rx_addr)
+      {
+	h.msg_name = rx_addr;
+	h.msg_namelen = sizeof (rx_addr[0]);
+      }
+    h.msg_iov = msm->iovecs;
+    h.msg_iovlen = vec_len (msm->iovecs);
+
+    n_bytes_left = recvmsg (socket, &h, 0);
+    if (n_bytes_left < 0)
+      return clib_error_return_unix (0, "recvmsg");
+  }
+
+  if (drop_message)
+    {
+      *buffer_index = ~0;
+      return 0;
+    }
+
+  *buffer_index = msm->rx_buffers[i_rx];
+  while (1)
+    {
+      b = vlib_get_buffer (vm, msm->rx_buffers[i_rx]);
+
+      b->flags = 0;
+      b->current_data = 0;
+      b->current_length =
+	n_bytes_left < buffer_size ? n_bytes_left : buffer_size;
+
+      n_bytes_left -= buffer_size;
+
+      if (n_bytes_left <= 0)
+	break;
+
+      i_rx--;
+      b->flags |= VLIB_BUFFER_NEXT_PRESENT;
+      b->next_buffer = msm->rx_buffers[i_rx];
+    }
+
+  _vec_len (msm->rx_buffers) = i_rx;
+
+  return 0 /* no error */ ;
+}
+
+static clib_error_t *
+mastership_socket_read_ready (unix_file_t * uf)
+{
+  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
+  mc_main_t *mcm = &msm->mc_main;
+  mc_multicast_socket_t *ms =
+    &msm->multicast_sockets[MC_TRANSPORT_MASTERSHIP];
+  clib_error_t *error;
+  u32 bi;
+
+  error = recvmsg_helper (msm, ms->socket, /* rx_addr */ 0, &bi,	/* drop_message */
+			  0);
+  if (!error)
+    msg_handler (mcm, bi,
+		 /* handler_frees_buffer */ 0,
+		 mc_msg_master_assert_handler);
+
+  return error;
+}
+
+static clib_error_t *
+to_relay_socket_read_ready (unix_file_t * uf)
+{
+  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
+  mc_main_t *mcm = &msm->mc_main;
+  vlib_main_t *vm = msm->mc_main.vlib_main;
+  mc_multicast_socket_t *ms_to_relay =
+    &msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_TO_RELAY];
+  mc_multicast_socket_t *ms_from_relay =
+    &msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_FROM_RELAY];
+  clib_error_t *error;
+  u32 bi;
+  u32 is_master = mcm->relay_state == MC_RELAY_STATE_MASTER;
+
+  /* Not the ordering master? Turf the msg */
+  error = recvmsg_helper (msm, ms_to_relay->socket, /* rx_addr */ 0, &bi,
+			  /* drop_message */ !is_master);
+
+  /* If we are the master, number and rebroadcast the msg. */
+  if (!error && is_master)
+    {
+      vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+      mc_msg_user_request_t *mp = vlib_buffer_get_current (b);
+      mp->global_sequence = clib_host_to_net_u32 (mcm->relay_global_sequence);
+      mcm->relay_global_sequence++;
+      error =
+	sendmsg_helper (msm, ms_from_relay->socket, &ms_from_relay->tx_addr,
+			bi);
+      vlib_buffer_free_one (vm, bi);
+    }
+
+  return error;
+}
+
+static clib_error_t *
+from_relay_socket_read_ready (unix_file_t * uf)
+{
+  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
+  mc_main_t *mcm = &msm->mc_main;
+  mc_multicast_socket_t *ms =
+    &msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_FROM_RELAY];
+  clib_error_t *error;
+  u32 bi;
+
+  error = recvmsg_helper (msm, ms->socket, /* rx_addr */ 0, &bi,	/* drop_message */
+			  0);
+  if (!error)
+    {
+      msg_handler (mcm, bi, /* handler_frees_buffer */ 1,
+		   mc_msg_user_request_handler);
+    }
+  return error;
+}
+
+static clib_error_t *
+join_socket_read_ready (unix_file_t * uf)
+{
+  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
+  mc_main_t *mcm = &msm->mc_main;
+  vlib_main_t *vm = mcm->vlib_main;
+  mc_multicast_socket_t *ms = &msm->multicast_sockets[MC_TRANSPORT_JOIN];
+  clib_error_t *error;
+  u32 bi;
+
+  error = recvmsg_helper (msm, ms->socket, /* rx_addr */ 0, &bi,	/* drop_message */
+			  0);
+  if (!error)
+    {
+      vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+      mc_msg_join_or_leave_request_t *mp = vlib_buffer_get_current (b);
+
+      switch (clib_host_to_net_u32 (mp->type))
+	{
+	case MC_MSG_TYPE_join_or_leave_request:
+	  msg_handler (mcm, bi, /* handler_frees_buffer */ 0,
+		       mc_msg_join_or_leave_request_handler);
+	  break;
+
+	case MC_MSG_TYPE_join_reply:
+	  msg_handler (mcm, bi, /* handler_frees_buffer */ 0,
+		       mc_msg_join_reply_handler);
+	  break;
+
+	default:
+	  ASSERT (0);
+	  break;
+	}
+    }
+  return error;
+}
+
+static clib_error_t *
+ack_socket_read_ready (unix_file_t * uf)
+{
+  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
+  mc_main_t *mcm = &msm->mc_main;
+  clib_error_t *error;
+  u32 bi;
+
+  error = recvmsg_helper (msm, msm->ack_socket, /* rx_addr */ 0, &bi,
+			  /* drop_message */ 0);
+  if (!error)
+    msg_handler (mcm, bi, /* handler_frees_buffer */ 0,
+		 mc_msg_user_ack_handler);
+  return error;
+}
+
+static void
+catchup_cleanup (mc_socket_main_t * msm,
+		 mc_socket_catchup_t * c, unix_main_t * um, unix_file_t * uf)
+{
+  hash_unset (msm->catchup_index_by_file_descriptor, uf->file_descriptor);
+  unix_file_del (um, uf);
+  vec_free (c->input_vector);
+  vec_free (c->output_vector);
+  pool_put (msm->catchups, c);
+}
+
+static mc_socket_catchup_t *
+find_catchup_from_file_descriptor (mc_socket_main_t * msm,
+				   int file_descriptor)
+{
+  uword *p =
+    hash_get (msm->catchup_index_by_file_descriptor, file_descriptor);
+  return p ? pool_elt_at_index (msm->catchups, p[0]) : 0;
+}
+
+static clib_error_t *
+catchup_socket_read_ready (unix_file_t * uf, int is_server)
+{
+  unix_main_t *um = &unix_main;
+  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
+  mc_main_t *mcm = &msm->mc_main;
+  mc_socket_catchup_t *c =
+    find_catchup_from_file_descriptor (msm, uf->file_descriptor);
+  word l, n, is_eof;
+
+  l = vec_len (c->input_vector);
+  vec_resize (c->input_vector, 4096);
+  n =
+    read (uf->file_descriptor, c->input_vector + l,
+	  vec_len (c->input_vector) - l);
+  is_eof = n == 0;
+
+  if (n < 0)
+    {
+      if (errno == EAGAIN)
+	n = 0;
+      else
+	{
+	  catchup_cleanup (msm, c, um, uf);
+	  return clib_error_return_unix (0, "read");
+	}
+    }
+
+  _vec_len (c->input_vector) = l + n;
+
+  if (is_eof && vec_len (c->input_vector) > 0)
+    {
+      if (is_server)
+	{
+	  mc_msg_catchup_request_handler (mcm, (void *) c->input_vector,
+					  c - msm->catchups);
+	  _vec_len (c->input_vector) = 0;
+	}
+      else
+	{
+	  mc_msg_catchup_reply_handler (mcm, (void *) c->input_vector,
+					c - msm->catchups);
+	  c->input_vector = 0;	/* reply handler is responsible for freeing vector */
+	  catchup_cleanup (msm, c, um, uf);
+	}
+    }
+
+  return 0 /* no error */ ;
+}
+
+static clib_error_t *
+catchup_server_read_ready (unix_file_t * uf)
+{
+  return catchup_socket_read_ready (uf, /* is_server */ 1);
+}
+
+static clib_error_t *
+catchup_client_read_ready (unix_file_t * uf)
+{
+  if (MC_EVENT_LOGGING)
+    {
+      mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
+      vlib_main_t *vm = msm->mc_main.vlib_main;
+
+      ELOG_TYPE (e, "catchup_client_read_ready");
+      ELOG (&vm->elog_main, e, 0);
+    }
+  return catchup_socket_read_ready (uf, /* is_server */ 0);
+}
+
+static clib_error_t *
+catchup_socket_write_ready (unix_file_t * uf, int is_server)
+{
+  unix_main_t *um = &unix_main;
+  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
+  mc_socket_catchup_t *c =
+    find_catchup_from_file_descriptor (msm, uf->file_descriptor);
+  clib_error_t *error = 0;
+  int n;
+
+  if (c->connect_in_progress)
+    {
+      u32 len, value;
+
+      c->connect_in_progress = 0;
+      len = sizeof (value);
+      if (getsockopt (c->socket, SOL_SOCKET, SO_ERROR, &value, &len) < 0)
+	{
+	  error = clib_error_return_unix (0, "getsockopt SO_ERROR");
+	  goto error_quit;
+	}
+      if (value != 0)
+	{
+	  error =
+	    clib_error_return_code (0, value, CLIB_ERROR_ERRNO_VALID,
+				    "connect fails");
+	  goto error_quit;
+	}
+    }
+
+  while (1)
+    {
+      u32 n_this_write;
+
+      n_this_write =
+	clib_min (vec_len (c->output_vector) - c->output_vector_n_written,
+		  msm->rx_mtu_n_bytes -
+		  64 /* ip + tcp + option allowance */ );
+
+      if (n_this_write <= 0)
+	break;
+
+      do
+	{
+	  n = write (uf->file_descriptor,
+		     c->output_vector + c->output_vector_n_written,
+		     n_this_write);
+	}
+      while (n < 0 && errno == EAGAIN);
+
+      if (n < 0)
+	{
+	  error = clib_error_return_unix (0, "write");
+	  goto error_quit;
+	}
+      c->output_vector_n_written += n;
+    }
+
+  if (c->output_vector_n_written >= vec_len (c->output_vector))
+    {
+      if (!is_server)
+	{
+	  uf->flags &= ~UNIX_FILE_DATA_AVAILABLE_TO_WRITE;
+	  unix_main.file_update (uf, UNIX_FILE_UPDATE_MODIFY);
+	  /* Send EOF to other side. */
+	  shutdown (uf->file_descriptor, SHUT_WR);
+	  return error;
+	}
+      else
+	{
+	error_quit:
+	  catchup_cleanup (msm, c, um, uf);
+	}
+    }
+  return error;
+}
+
+static clib_error_t *
+catchup_server_write_ready (unix_file_t * uf)
+{
+  return catchup_socket_write_ready (uf, /* is_server */ 1);
+}
+
+static clib_error_t *
+catchup_client_write_ready (unix_file_t * uf)
+{
+  return catchup_socket_write_ready (uf, /* is_server */ 0);
+}
+
+static clib_error_t *
+catchup_socket_error_ready (unix_file_t * uf)
+{
+  unix_main_t *um = &unix_main;
+  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
+  mc_socket_catchup_t *c =
+    find_catchup_from_file_descriptor (msm, uf->file_descriptor);
+  catchup_cleanup (msm, c, um, uf);
+  return clib_error_return (0, "error");
+}
+
+static clib_error_t *
+catchup_listen_read_ready (unix_file_t * uf)
+{
+  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
+  struct sockaddr_in client_addr;
+  int client_len;
+  mc_socket_catchup_t *c;
+  unix_file_t template = { 0 };
+
+  pool_get (msm->catchups, c);
+  memset (c, 0, sizeof (c[0]));
+
+  client_len = sizeof (client_addr);
+
+  /* Acquires the non-blocking attrib from the server socket. */
+  c->socket = accept (uf->file_descriptor,
+		      (struct sockaddr *) &client_addr,
+		      (socklen_t *) & client_len);
+
+  if (c->socket < 0)
+    {
+      pool_put (msm->catchups, c);
+      return clib_error_return_unix (0, "accept");
+    }
+
+  if (MC_EVENT_LOGGING)
+    {
+      mc_main_t *mcm = &msm->mc_main;
+      vlib_main_t *vm = mcm->vlib_main;
+
+      ELOG_TYPE_DECLARE (e) =
+      {
+      .format = "catchup accepted from 0x%lx",.format_args = "i4",};
+      struct
+      {
+	u32 addr;
+      } *ed = 0;
+
+      ed = ELOG_DATA (&vm->elog_main, e);
+      ed->addr = ntohl (client_addr.sin_addr.s_addr);
+    }
+
+  /* Disable the Nagle algorithm, ship catchup pkts immediately */
+  {
+    int one = 1;
+    if ((setsockopt (c->socket, IPPROTO_TCP,
+		     TCP_NODELAY, (void *) &one, sizeof (one))) < 0)
+      {
+	clib_unix_warning ("catchup socket: set TCP_NODELAY");
+      }
+  }
+
+  template.read_function = catchup_server_read_ready;
+  template.write_function = catchup_server_write_ready;
+  template.error_function = catchup_socket_error_ready;
+  template.file_descriptor = c->socket;
+  template.private_data = pointer_to_uword (msm);
+  c->unix_file_index = unix_file_add (&unix_main, &template);
+  hash_set (msm->catchup_index_by_file_descriptor, c->socket,
+	    c - msm->catchups);
+
+  return 0;
+}
+
+/* Return and bind to an unused port. */
+static word
+find_and_bind_to_free_port (word sock, word port)
+{
+  for (; port < 1 << 16; port++)
+    {
+      struct sockaddr_in a;
+
+      memset (&a, 0, sizeof (a));	/* Warnings be gone */
+
+      a.sin_family = PF_INET;
+      a.sin_addr.s_addr = INADDR_ANY;
+      a.sin_port = htons (port);
+
+      if (bind (sock, (struct sockaddr *) &a, sizeof (a)) >= 0)
+	break;
+    }
+
+  return port < 1 << 16 ? port : -1;
+}
+
+static clib_error_t *
+setup_mutlicast_socket (mc_socket_main_t * msm,
+			mc_multicast_socket_t * ms,
+			char *type, uword udp_port)
+{
+  int one = 1;
+  struct ip_mreq mcast_req;
+
+  if (!msm->multicast_ttl)
+    msm->multicast_ttl = 1;
+
+  /* mastership (multicast) TX socket */
+  if ((ms->socket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
+    return clib_error_return_unix (0, "%s socket", type);
+
+  {
+    u8 ttl = msm->multicast_ttl;
+
+    if ((setsockopt (ms->socket, IPPROTO_IP,
+		     IP_MULTICAST_TTL, (void *) &ttl, sizeof (ttl))) < 0)
+      return clib_error_return_unix (0, "%s set multicast ttl", type);
+  }
+
+  if (setsockopt (ms->socket, SOL_SOCKET, SO_REUSEADDR, &one, sizeof (one)) <
+      0)
+    return clib_error_return_unix (0, "%s setsockopt SO_REUSEADDR", type);
+
+  memset (&ms->tx_addr, 0, sizeof (ms->tx_addr));
+  ms->tx_addr.sin_family = AF_INET;
+  ms->tx_addr.sin_addr.s_addr =
+    htonl (msm->multicast_tx_ip4_address_host_byte_order);
+  ms->tx_addr.sin_port = htons (udp_port);
+
+  if (bind (ms->socket, (struct sockaddr *) &ms->tx_addr,
+	    sizeof (ms->tx_addr)) < 0)
+    return clib_error_return_unix (0, "%s bind", type);
+
+  memset (&mcast_req, 0, sizeof (mcast_req));
+  mcast_req.imr_multiaddr.s_addr =
+    htonl (msm->multicast_tx_ip4_address_host_byte_order);
+  mcast_req.imr_interface.s_addr = msm->if_ip4_address_net_byte_order;
+
+  if ((setsockopt (ms->socket, IPPROTO_IP,
+		   IP_ADD_MEMBERSHIP, (void *) &mcast_req,
+		   sizeof (mcast_req))) < 0)
+    return clib_error_return_unix (0, "%s IP_ADD_MEMBERSHIP setsockopt",
+				   type);
+
+  if (ioctl (ms->socket, FIONBIO, &one) < 0)
+    return clib_error_return_unix (0, "%s set FIONBIO", type);
+
+  /* FIXME remove this when we support tx_ready. */
+  {
+    u32 len = 1 << 20;
+    socklen_t sl = sizeof (len);
+    if (setsockopt (ms->socket, SOL_SOCKET, SO_SNDBUF, &len, sl) < 0)
+      clib_unix_error ("setsockopt");
+  }
+
+  return 0;
+}
+
+static clib_error_t *
+socket_setup (mc_socket_main_t * msm)
+{
+  int one = 1;
+  clib_error_t *error;
+  u32 port;
+
+  if (!msm->base_multicast_udp_port_host_byte_order)
+    msm->base_multicast_udp_port_host_byte_order =
+      0xffff - ((MC_N_TRANSPORT_TYPE + 2 /* ack socket, catchup socket */ )
+		- 1);
+
+  port = msm->base_multicast_udp_port_host_byte_order;
+
+  error = setup_mutlicast_socket (msm,
+				  &msm->multicast_sockets
+				  [MC_TRANSPORT_MASTERSHIP], "mastership",
+				  port++);
+  if (error)
+    return error;
+
+  error = setup_mutlicast_socket (msm,
+				  &msm->multicast_sockets[MC_TRANSPORT_JOIN],
+				  "join", port++);
+  if (error)
+    return error;
+
+  error = setup_mutlicast_socket (msm,
+				  &msm->multicast_sockets
+				  [MC_TRANSPORT_USER_REQUEST_TO_RELAY],
+				  "to relay", port++);
+  if (error)
+    return error;
+
+  error = setup_mutlicast_socket (msm,
+				  &msm->multicast_sockets
+				  [MC_TRANSPORT_USER_REQUEST_FROM_RELAY],
+				  "from relay", port++);
+  if (error)
+    return error;
+
+  /* ACK rx socket */
+  msm->ack_socket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+  if (msm->ack_socket < 0)
+    return clib_error_return_unix (0, "ack socket");
+
+  msm->ack_udp_port = find_and_bind_to_free_port (msm->ack_socket, port++);
+
+  if (ioctl (msm->ack_socket, FIONBIO, &one) < 0)
+    return clib_error_return_unix (0, "ack socket FIONBIO");
+
+  msm->catchup_server_socket = socket (AF_INET, SOCK_STREAM, 0);
+  if (msm->catchup_server_socket < 0)
+    return clib_error_return_unix (0, "catchup server socket");
+
+  msm->catchup_tcp_port =
+    find_and_bind_to_free_port (msm->catchup_server_socket, port++);
+
+  if (ioctl (msm->catchup_server_socket, FIONBIO, &one) < 0)
+    return clib_error_return_unix (0, "catchup server socket FIONBIO");
+
+  if (listen (msm->catchup_server_socket, 5) < 0)
+    return clib_error_return_unix (0, "catchup server socket listen");
+
+  /* epoll setup for multicast mastership socket */
+  {
+    unix_file_t template = { 0 };
+
+    template.read_function = mastership_socket_read_ready;
+    template.file_descriptor =
+      msm->multicast_sockets[MC_TRANSPORT_MASTERSHIP].socket;
+    template.private_data = (uword) msm;
+    unix_file_add (&unix_main, &template);
+
+    /* epoll setup for multicast to_relay socket */
+    template.read_function = to_relay_socket_read_ready;
+    template.file_descriptor =
+      msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_TO_RELAY].socket;
+    template.private_data = (uword) msm;
+    unix_file_add (&unix_main, &template);
+
+    /* epoll setup for multicast from_relay socket */
+    template.read_function = from_relay_socket_read_ready;
+    template.file_descriptor =
+      msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_FROM_RELAY].socket;
+    template.private_data = (uword) msm;
+    unix_file_add (&unix_main, &template);
+
+    template.read_function = join_socket_read_ready;
+    template.file_descriptor =
+      msm->multicast_sockets[MC_TRANSPORT_JOIN].socket;
+    template.private_data = (uword) msm;
+    unix_file_add (&unix_main, &template);
+
+    /* epoll setup for ack rx socket */
+    template.read_function = ack_socket_read_ready;
+    template.file_descriptor = msm->ack_socket;
+    template.private_data = (uword) msm;
+    unix_file_add (&unix_main, &template);
+
+    /* epoll setup for TCP catchup server */
+    template.read_function = catchup_listen_read_ready;
+    template.file_descriptor = msm->catchup_server_socket;
+    template.private_data = (uword) msm;
+    unix_file_add (&unix_main, &template);
+  }
+
+  return 0;
+}
+
+static void *
+catchup_add_pending_output (mc_socket_catchup_t * c, uword n_bytes,
+			    u8 * set_output_vector)
+{
+  unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
+				       c->unix_file_index);
+  u8 *result = 0;
+
+  if (set_output_vector)
+    c->output_vector = set_output_vector;
+  else
+    vec_add2 (c->output_vector, result, n_bytes);
+  if (vec_len (c->output_vector) > 0)
+    {
+      int skip_update = 0 != (uf->flags & UNIX_FILE_DATA_AVAILABLE_TO_WRITE);
+      uf->flags |= UNIX_FILE_DATA_AVAILABLE_TO_WRITE;
+      if (!skip_update)
+	unix_main.file_update (uf, UNIX_FILE_UPDATE_MODIFY);
+    }
+  return result;
+}
+
+static uword
+catchup_request_fun (void *transport_main,
+		     u32 stream_index, mc_peer_id_t catchup_peer_id)
+{
+  mc_socket_main_t *msm = (mc_socket_main_t *) transport_main;
+  mc_main_t *mcm = &msm->mc_main;
+  vlib_main_t *vm = mcm->vlib_main;
+  mc_socket_catchup_t *c;
+  struct sockaddr_in addr;
+  unix_main_t *um = &unix_main;
+  int one = 1;
+
+  pool_get (msm->catchups, c);
+  memset (c, 0, sizeof (*c));
+
+  c->socket = socket (AF_INET, SOCK_STREAM, 0);
+  if (c->socket < 0)
+    {
+      clib_unix_warning ("socket");
+      return 0;
+    }
+
+  if (ioctl (c->socket, FIONBIO, &one) < 0)
+    {
+      clib_unix_warning ("FIONBIO");
+      return 0;
+    }
+
+  memset (&addr, 0, sizeof (addr));
+  addr.sin_family = AF_INET;
+  addr.sin_addr.s_addr = mc_socket_peer_id_get_address (catchup_peer_id);
+  addr.sin_port = mc_socket_peer_id_get_port (catchup_peer_id);
+
+  c->connect_in_progress = 1;
+
+  if (MC_EVENT_LOGGING)
+    {
+      ELOG_TYPE_DECLARE (e) =
+      {
+      .format = "connecting to peer 0x%Lx",.format_args = "i8",};
+      struct
+      {
+	u64 peer;
+      } *ed;
+      ed = ELOG_DATA (&vm->elog_main, e);
+      ed->peer = catchup_peer_id.as_u64;
+    }
+
+  if (connect (c->socket, (const void *) &addr, sizeof (addr))
+      < 0 && errno != EINPROGRESS)
+    {
+      clib_unix_warning ("connect to %U fails",
+			 format_socket_peer_id, catchup_peer_id);
+      return 0;
+    }
+
+  {
+    unix_file_t template = { 0 };
+
+    template.read_function = catchup_client_read_ready;
+    template.write_function = catchup_client_write_ready;
+    template.error_function = catchup_socket_error_ready;
+    template.file_descriptor = c->socket;
+    template.private_data = (uword) msm;
+    c->unix_file_index = unix_file_add (um, &template);
+
+    hash_set (msm->catchup_index_by_file_descriptor, c->socket,
+	      c - msm->catchups);
+  }
+
+  {
+    mc_msg_catchup_request_t *mp;
+    mp = catchup_add_pending_output (c, sizeof (mp[0]),	/* set_output_vector */
+				     0);
+    mp->peer_id = msm->mc_main.transport.our_catchup_peer_id;
+    mp->stream_index = stream_index;
+    mc_byte_swap_msg_catchup_request (mp);
+  }
+
+  return c - msm->catchups;
+}
+
+static void
+catchup_send_fun (void *transport_main, uword opaque, u8 * data)
+{
+  mc_socket_main_t *msm = (mc_socket_main_t *) transport_main;
+  mc_socket_catchup_t *c = pool_elt_at_index (msm->catchups, opaque);
+  catchup_add_pending_output (c, 0, data);
+}
+
+static int
+find_interface_ip4_address (char *if_name, u32 * ip4_address, u32 * mtu)
+{
+  int fd;
+  struct ifreq ifr;
+  struct sockaddr_in *sa;
+
+  /* Dig up our IP address */
+  fd = socket (PF_INET, AF_INET, 0);
+  if (fd < 0)
+    {
+      clib_unix_error ("socket");
+      return -1;
+    }
+
+  ifr.ifr_addr.sa_family = AF_INET;
+  strncpy (ifr.ifr_name, if_name, sizeof (ifr.ifr_name) - 1);
+  if (ioctl (fd, SIOCGIFADDR, &ifr) < 0)
+    {
+      clib_unix_error ("ioctl(SIOCFIGADDR)");
+      close (fd);
+      return -1;
+    }
+
+  sa = (void *) &ifr.ifr_addr;
+  clib_memcpy (ip4_address, &sa->sin_addr.s_addr, sizeof (ip4_address[0]));
+
+  if (ioctl (fd, SIOCGIFMTU, &ifr) < 0)
+    {
+      close (fd);
+      return -1;
+    }
+  if (mtu)
+    *mtu = ifr.ifr_mtu - ( /* IP4 header */ 20 + /* UDP header */ 8);
+
+  close (fd);
+
+  return 0;
+}
+
+clib_error_t *
+mc_socket_main_init (mc_socket_main_t * msm, char **intfc_probe_list,
+		     int n_intfcs_to_probe)
+{
+  clib_error_t *error;
+  mc_main_t *mcm;
+  u32 mtu;
+
+  mcm = &msm->mc_main;
+
+  /* 239.255.0.7 */
+  if (!msm->multicast_tx_ip4_address_host_byte_order)
+    msm->multicast_tx_ip4_address_host_byte_order = 0xefff0007;
+
+  {
+    u32 i, a, win;
+
+    win = 0;
+    if (msm->multicast_interface_name)
+      {
+	win =
+	  !find_interface_ip4_address (msm->multicast_interface_name, &a,
+				       &mtu);
+      }
+    else
+      {
+	for (i = 0; i < n_intfcs_to_probe; i++)
+	  if (!find_interface_ip4_address (intfc_probe_list[i], &a, &mtu))
+	    {
+	      win = 1;
+	      msm->multicast_interface_name = intfc_probe_list[i];
+	      break;
+	    }
+      }
+
+    if (!win)
+      return clib_error_return (0, "can't find interface ip4 address");
+
+    msm->if_ip4_address_net_byte_order = a;
+  }
+
+  msm->rx_mtu_n_bytes = mtu;
+  msm->rx_mtu_n_buffers =
+    msm->rx_mtu_n_bytes / VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES;
+  msm->rx_mtu_n_buffers +=
+    (msm->rx_mtu_n_bytes % VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES) != 0;
+
+  error = socket_setup (msm);
+  if (error)
+    return error;
+
+  mcm->transport.our_ack_peer_id =
+    mc_socket_set_peer_id (msm->if_ip4_address_net_byte_order,
+			   msm->ack_udp_port);
+
+  mcm->transport.our_catchup_peer_id =
+    mc_socket_set_peer_id (msm->if_ip4_address_net_byte_order,
+			   msm->catchup_tcp_port);
+
+  mcm->transport.tx_buffer = tx_buffer;
+  mcm->transport.tx_ack = tx_ack;
+  mcm->transport.catchup_request_fun = catchup_request_fun;
+  mcm->transport.catchup_send_fun = catchup_send_fun;
+  mcm->transport.format_peer_id = format_socket_peer_id;
+  mcm->transport.opaque = msm;
+  mcm->transport.max_packet_size = mtu;
+
+  mc_main_init (mcm, "socket");
+
+  return error;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/unix/mc_socket.h b/src/vlib/unix/mc_socket.h
new file mode 100644
index 00000000..273c9ad4
--- /dev/null
+++ b/src/vlib/unix/mc_socket.h
@@ -0,0 +1,137 @@
+/*
+ * mc_socket.h: socket based multicast for vlib mc
+ *
+ * Copyright (c) 2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __included_mc_socket_h__
+#define __included_mc_socket_h__
+
+#include <vlib/unix/unix.h>
+#include <netinet/in.h>
+
+typedef struct
+{
+  int socket;
+  struct sockaddr_in tx_addr;
+} mc_multicast_socket_t;
+
+/* TCP catchup socket */
+typedef struct
+{
+  int socket;
+  u32 unix_file_index;
+
+  u8 *input_vector;
+  u8 *output_vector;
+  u32 output_vector_n_written;
+
+  u32 connect_in_progress;
+} mc_socket_catchup_t;
+
+typedef struct mc_socket_main_t
+{
+  mc_main_t mc_main;
+
+  /* Multicast mastership/to-relay/from-relay sockets. */
+  mc_multicast_socket_t multicast_sockets[MC_N_TRANSPORT_TYPE];
+
+  /* Unicast UDP ack sockets */
+  int ack_socket;
+
+  /* TCP catchup server socket */
+  int catchup_server_socket;
+
+  /* Pool of stream-private catchup sockets */
+  mc_socket_catchup_t *catchups;
+
+  uword *catchup_index_by_file_descriptor;
+
+  u32 rx_mtu_n_bytes;
+
+  /* Receive MTU in bytes and VLIB buffers. */
+  u32 rx_mtu_n_buffers;
+
+  /* Vector of RX VLIB buffers. */
+  u32 *rx_buffers;
+  /* Vector of scatter/gather descriptors for sending/receiving VLIB buffers
+     via kernel. */
+  struct iovec *iovecs;
+
+  /* IP address of interface to use for multicast. */
+  u32 if_ip4_address_net_byte_order;
+
+  u32 ack_udp_port;
+  u32 catchup_tcp_port;
+
+  /* Interface on which to listen for multicasts. */
+  char *multicast_interface_name;
+
+  /* Multicast address to use (e.g. 0xefff0000).
+     Host byte order. */
+  u32 multicast_tx_ip4_address_host_byte_order;
+
+  /* TTL to use for multicasts. */
+  u32 multicast_ttl;
+
+  /* Multicast ports for mastership, joins, etc. will be chosen
+     starting at the given port in host byte order.
+     A total of MC_N_TRANSPORT_TYPE ports will be used. */
+  u32 base_multicast_udp_port_host_byte_order;
+} mc_socket_main_t;
+
+always_inline u32
+mc_socket_peer_id_get_address (mc_peer_id_t i)
+{
+  u32 a = ((i.as_u8[0] << 24)
+	   | (i.as_u8[1] << 16) | (i.as_u8[2] << 8) | (i.as_u8[3] << 0));
+  return clib_host_to_net_u32 (a);
+}
+
+always_inline u32
+mc_socket_peer_id_get_port (mc_peer_id_t i)
+{
+  return clib_host_to_net_u16 ((i.as_u8[4] << 8) | i.as_u8[5]);
+}
+
+static_always_inline mc_peer_id_t
+mc_socket_set_peer_id (u32 address_net_byte_order, u32 port_host_byte_order)
+{
+  mc_peer_id_t i;
+  u32 a = ntohl (address_net_byte_order);
+  u32 p = port_host_byte_order;
+  i.as_u8[0] = (a >> 24) & 0xff;
+  i.as_u8[1] = (a >> 16) & 0xff;
+  i.as_u8[2] = (a >> 8) & 0xff;
+  i.as_u8[3] = (a >> 0) & 0xff;
+  i.as_u8[4] = (p >> 8) & 0xff;
+  i.as_u8[5] = (p >> 0) & 0xff;
+  i.as_u8[6] = 0;
+  i.as_u8[7] = 0;
+  return i;
+}
+
+clib_error_t *mc_socket_main_init (mc_socket_main_t * msm,
+				   char **intfc_probe_list,
+				   int n_intfcs_to_probe);
+#endif /* __included_mc_socket_h__ */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/unix/physmem.c b/src/vlib/unix/physmem.c
new file mode 100644
index 00000000..80ab7b9d
--- /dev/null
+++ b/src/vlib/unix/physmem.c
@@ -0,0 +1,470 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * physmem.c: Unix physical memory
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/unix/physmem.h>
+
+static physmem_main_t physmem_main;
+
+static void *
+unix_physmem_alloc_aligned (vlib_physmem_main_t * vpm, uword n_bytes,
+			    uword alignment)
+{
+  physmem_main_t *pm = &physmem_main;
+  uword lo_offset, hi_offset;
+  uword *to_free = 0;
+
+#if DPDK > 0
+  clib_warning ("unsafe alloc!");
+#endif
+
+  /* IO memory is always at least cache aligned. */
+  alignment = clib_max (alignment, CLIB_CACHE_LINE_BYTES);
+
+  while (1)
+    {
+      mheap_get_aligned (pm->heap, n_bytes,
+			 /* align */ alignment,
+			 /* align offset */ 0,
+			 &lo_offset);
+
+      /* Allocation failed? */
+      if (lo_offset == ~0)
+	break;
+
+      /* Make sure allocation does not span DMA physical chunk boundary. */
+      hi_offset = lo_offset + n_bytes - 1;
+
+      if ((lo_offset >> vpm->log2_n_bytes_per_page) ==
+	  (hi_offset >> vpm->log2_n_bytes_per_page))
+	break;
+
+      /* Allocation would span chunk boundary, queue it to be freed as soon as
+         we find suitable chunk. */
+      vec_add1 (to_free, lo_offset);
+    }
+
+  if (to_free != 0)
+    {
+      uword i;
+      for (i = 0; i < vec_len (to_free); i++)
+	mheap_put (pm->heap, to_free[i]);
+      vec_free (to_free);
+    }
+
+  return lo_offset != ~0 ? pm->heap + lo_offset : 0;
+}
+
+static void
+unix_physmem_free (void *x)
+{
+  physmem_main_t *pm = &physmem_main;
+
+  /* Return object to region's heap. */
+  mheap_put (pm->heap, x - pm->heap);
+}
+
+static void
+htlb_shutdown (void)
+{
+  physmem_main_t *pm = &physmem_main;
+
+  if (!pm->shmid)
+    return;
+  shmctl (pm->shmid, IPC_RMID, 0);
+  pm->shmid = 0;
+}
+
+/* try to use huge TLB pgs if possible */
+static int
+htlb_init (vlib_main_t * vm)
+{
+  vlib_physmem_main_t *vpm = &vm->physmem_main;
+  physmem_main_t *pm = &physmem_main;
+  u64 hugepagesize, pagesize;
+  u64 pfn, seek_loc;
+  u64 cur, physaddr, ptbits;
+  int fd, i;
+
+  pm->shmid = shmget (11 /* key, my amp goes to 11 */ , pm->mem_size,
+		      IPC_CREAT | SHM_HUGETLB | SHM_R | SHM_W);
+  if (pm->shmid < 0)
+    {
+      clib_unix_warning ("shmget");
+      return 0;
+    }
+
+  pm->mem = shmat (pm->shmid, NULL, 0 /* flags */ );
+  if (pm->mem == 0)
+    {
+      shmctl (pm->shmid, IPC_RMID, 0);
+      return 0;
+    }
+
+  memset (pm->mem, 0, pm->mem_size);
+
+  /* $$$ get page size info from /proc/meminfo */
+  hugepagesize = 2 << 20;
+  pagesize = 4 << 10;
+  vpm->log2_n_bytes_per_page = min_log2 (hugepagesize);
+  vec_resize (vpm->page_table, pm->mem_size / hugepagesize);
+
+  vpm->page_mask = pow2_mask (vpm->log2_n_bytes_per_page);
+  vpm->virtual.start = pointer_to_uword (pm->mem);
+  vpm->virtual.size = pm->mem_size;
+  vpm->virtual.end = vpm->virtual.start + vpm->virtual.size;
+
+  fd = open ("/proc/self/pagemap", O_RDONLY);
+
+  if (fd < 0)
+    {
+      (void) shmdt (pm->mem);
+      return 0;
+    }
+
+  pm->heap = mheap_alloc_with_flags (pm->mem, pm->mem_size,
+				     /* Don't want mheap mmap/munmap with IO memory. */
+				     MHEAP_FLAG_DISABLE_VM);
+
+  cur = pointer_to_uword (pm->mem);
+  i = 0;
+
+  while (cur < pointer_to_uword (pm->mem) + pm->mem_size)
+    {
+      pfn = (u64) cur / pagesize;
+      seek_loc = pfn * sizeof (u64);
+      if (lseek (fd, seek_loc, SEEK_SET) != seek_loc)
+	{
+	  clib_unix_warning ("lseek to 0x%llx", seek_loc);
+	  shmctl (pm->shmid, IPC_RMID, 0);
+	  close (fd);
+	  return 0;
+	}
+      if (read (fd, &ptbits, sizeof (ptbits)) != (sizeof (ptbits)))
+	{
+	  clib_unix_warning ("read ptbits");
+	  shmctl (pm->shmid, IPC_RMID, 0);
+	  close (fd);
+	  return 0;
+	}
+
+      /* bits 0-54 are the physical page number */
+      physaddr = (ptbits & 0x7fffffffffffffULL) * pagesize;
+      if (CLIB_DEBUG > 1)
+	fformat (stderr, "pm: virtual 0x%llx physical 0x%llx\n",
+		 cur, physaddr);
+      vpm->page_table[i++] = physaddr;
+
+      cur += hugepagesize;
+    }
+  close (fd);
+  atexit (htlb_shutdown);
+  return 1;
+}
+
+int vlib_app_physmem_init (vlib_main_t * vm,
+			   physmem_main_t * pm, int) __attribute__ ((weak));
+int
+vlib_app_physmem_init (vlib_main_t * vm, physmem_main_t * pm, int x)
+{
+  return 0;
+}
+
+clib_error_t *
+unix_physmem_init (vlib_main_t * vm, int physical_memory_required)
+{
+  vlib_physmem_main_t *vpm = &vm->physmem_main;
+  physmem_main_t *pm = &physmem_main;
+  clib_error_t *error = 0;
+
+  /* Avoid multiple calls. */
+  if (vm->os_physmem_alloc_aligned)
+    return error;
+
+  vm->os_physmem_alloc_aligned = unix_physmem_alloc_aligned;
+  vm->os_physmem_free = unix_physmem_free;
+  pm->mem = MAP_FAILED;
+
+  if (pm->mem_size == 0)
+    pm->mem_size = 16 << 20;
+
+  /* OK, Mr. App, you tell us */
+  if (vlib_app_physmem_init (vm, pm, physical_memory_required))
+    return 0;
+
+  if (!pm->no_hugepages && htlb_init (vm))
+    {
+      fformat (stderr, "%s: use huge pages\n", __FUNCTION__);
+      return 0;
+    }
+
+  pm->mem =
+    mmap (0, pm->mem_size, PROT_READ | PROT_WRITE,
+	  MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+  if (pm->mem == MAP_FAILED)
+    {
+      error = clib_error_return_unix (0, "mmap");
+      goto done;
+    }
+
+  pm->heap = mheap_alloc (pm->mem, pm->mem_size);
+
+  /* Identity map with a single page. */
+  vpm->log2_n_bytes_per_page = min_log2 (pm->mem_size);
+  vec_add1 (vpm->page_table, pointer_to_uword (pm->mem));
+
+  vpm->page_mask = pow2_mask (vpm->log2_n_bytes_per_page);
+  vpm->virtual.start = pointer_to_uword (pm->mem);
+  vpm->virtual.size = pm->mem_size;
+  vpm->virtual.end = vpm->virtual.start + vpm->virtual.size;
+  vpm->is_fake = 1;
+
+  fformat (stderr, "%s: use fake dma pages\n", __FUNCTION__);
+
+done:
+  if (error)
+    {
+      if (pm->mem != MAP_FAILED)
+	munmap (pm->mem, pm->mem_size);
+    }
+  return error;
+}
+
+static clib_error_t *
+show_physmem (vlib_main_t * vm,
+	      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+#if DPDK > 0
+  vlib_cli_output (vm, "Not supported with DPDK drivers.");
+#else
+  physmem_main_t *pm = &physmem_main;
+
+  if (pm->heap)
+    vlib_cli_output (vm, "%U", format_mheap, pm->heap, /* verbose */ 1);
+  else
+    vlib_cli_output (vm, "No physmem allocated.");
+#endif
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_physmem_command, static) = {
+  .path = "show physmem",
+  .short_help = "Show physical memory allocation",
+  .function = show_physmem,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+show_affinity (vlib_main_t * vm,
+	       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  cpu_set_t set;
+  cpu_set_t *setp = &set;
+  int i, rv;
+  u8 *s = 0;
+  int first_set_bit_in_run = -1;
+  int last_set_bit_in_run = -1;
+  int output_done = 0;
+
+  rv = sched_getaffinity (0 /* pid, 0 = this proc */ ,
+			  sizeof (*setp), setp);
+  if (rv < 0)
+    {
+      vlib_cli_output (vm, "Couldn't get affinity mask: %s\n",
+		       strerror (errno));
+      return 0;
+    }
+
+  for (i = 0; i < 64; i++)
+    {
+      if (CPU_ISSET (i, setp))
+	{
+	  if (first_set_bit_in_run == -1)
+	    {
+	      first_set_bit_in_run = i;
+	      last_set_bit_in_run = i;
+	      if (output_done)
+		s = format (s, ",");
+	      s = format (s, "%d-", i);
+	      output_done = 1;
+	    }
+	  else
+	    {
+	      if (i == (last_set_bit_in_run + 1))
+		last_set_bit_in_run = i;
+	    }
+	}
+      else
+	{
+	  if (first_set_bit_in_run != -1)
+	    {
+	      if (first_set_bit_in_run == (i - 1))
+		{
+		  _vec_len (s) -= 2 + ((first_set_bit_in_run / 10));
+		}
+	      s = format (s, "%d", last_set_bit_in_run);
+	      first_set_bit_in_run = -1;
+	      last_set_bit_in_run = -1;
+	    }
+	}
+    }
+
+  if (first_set_bit_in_run != -1)
+    s = format (s, "%d", first_set_bit_in_run);
+
+  vlib_cli_output (vm, "Process runs on: %v", s);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_affinity_command, static) = {
+  .path = "show affinity",
+  .short_help = "Show process cpu affinity",
+  .function = show_affinity,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_affinity (vlib_main_t * vm,
+	      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  cpu_set_t set;
+  cpu_set_t *setp = &set;
+  int i, rv;
+  int another_round;
+  u32 first, last;
+
+  memset (setp, 0, sizeof (*setp));
+
+  do
+    {
+      another_round = 0;
+      if (unformat (input, "%d-%d,", &first, &last))
+	{
+	  if (first > 64 || last > 64)
+	    {
+	    barf1:
+	      vlib_cli_output (vm, "range %d-%d invalid", first, last);
+	      return 0;
+	    }
+
+	  for (i = first; i <= last; i++)
+	    CPU_SET (i, setp);
+	  another_round = 1;
+	}
+      else if (unformat (input, "%d-%d", &first, &last))
+	{
+	  if (first > 64 || last > 64)
+	    goto barf1;
+
+	  for (i = first; i <= last; i++)
+	    CPU_SET (i, setp);
+	}
+      else if (unformat (input, "%d,", &first))
+	{
+	  if (first > 64)
+	    {
+	    barf2:
+	      vlib_cli_output (vm, "cpu %d invalid", first);
+	      return 0;
+	    }
+	  CPU_SET (first, setp);
+	  another_round = 1;
+	}
+      else if (unformat (input, "%d", &first))
+	{
+	  if (first > 64)
+	    goto barf2;
+
+	  CPU_SET (first, setp);
+	}
+    }
+  while (another_round);
+
+  rv = sched_setaffinity (0 /* pid, 0 = this proc */ ,
+			  sizeof (*setp), setp);
+
+  if (rv < 0)
+    {
+      vlib_cli_output (vm, "Couldn't get affinity mask: %s\n",
+		       strerror (errno));
+      return 0;
+    }
+  return show_affinity (vm, input, cmd);
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_affinity_command, static) = {
+  .path = "set affinity",
+  .short_help = "Set process cpu affinity",
+  .function = set_affinity,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+vlib_physmem_configure (vlib_main_t * vm, unformat_input_t * input)
+{
+  physmem_main_t *pm = &physmem_main;
+  u32 size_in_mb;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "no-huge") || unformat (input, "no-huge-pages"))
+	pm->no_hugepages = 1;
+
+      else if (unformat (input, "size-in-mb %d", &size_in_mb) ||
+	       unformat (input, "size %d", &size_in_mb))
+	pm->mem_size = size_in_mb << 20;
+      else
+	return unformat_parse_error (input);
+    }
+
+  unformat_free (input);
+  return 0;
+}
+
+VLIB_EARLY_CONFIG_FUNCTION (vlib_physmem_configure, "physmem");
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/unix/physmem.h b/src/vlib/unix/physmem.h
new file mode 100644
index 00000000..5519a7d6
--- /dev/null
+++ b/src/vlib/unix/physmem.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_physmem_h__
+#define __included_physmem_h__
+
+/* Manage I/O physical memory. */
+#define _GNU_SOURCE
+#include <sched.h>
+#include <vppinfra/cache.h>
+#include <vppinfra/error.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/os.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+
+#include <sys/fcntl.h>		/* for open */
+#include <sys/file.h>		/* for flock */
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+
+typedef struct
+{
+  /* Virtual memory via mmaped. */
+  void *mem;
+
+  /* Size in bytes. */
+  uword mem_size;
+
+  /* Heap allocated out of virtual memory. */
+  void *heap;
+
+  /* huge TLB segment id */
+  int shmid;
+
+  /* should we try to use htlb ? */
+  int no_hugepages;
+
+} physmem_main_t;
+
+#endif /* __included_physmem_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/unix/plugin.c b/src/vlib/unix/plugin.c
new file mode 100644
index 00000000..b3d5be02
--- /dev/null
+++ b/src/vlib/unix/plugin.c
@@ -0,0 +1,260 @@
+/*
+ * plugin.c: plugin handling
+ *
+ * Copyright (c) 2011 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/unix/plugin.h>
+#include <dlfcn.h>
+#include <dirent.h>
+
+plugin_main_t vlib_plugin_main;
+
+void
+vlib_set_get_handoff_structure_cb (void *cb)
+{
+  plugin_main_t *pm = &vlib_plugin_main;
+  pm->handoff_structure_get_cb = cb;
+}
+
+static void *
+vnet_get_handoff_structure (void)
+{
+  void *(*fp) (void);
+
+  fp = vlib_plugin_main.handoff_structure_get_cb;
+  if (fp == 0)
+    return 0;
+  else
+    return (*fp) ();
+}
+
+static int
+load_one_plugin (plugin_main_t * pm, plugin_info_t * pi, int from_early_init)
+{
+  void *handle, *register_handle;
+  clib_error_t *(*fp) (vlib_main_t *, void *, int);
+  clib_error_t *error;
+  void *handoff_structure;
+
+  handle = dlopen ((char *) pi->name, RTLD_LAZY);
+
+  /*
+   * Note: this can happen if the plugin has an undefined symbol reference,
+   * so print a warning. Otherwise, the poor slob won't know what happened.
+   * Ask me how I know that...
+   */
+  if (handle == 0)
+    {
+      clib_warning ("%s", dlerror ());
+      return -1;
+    }
+
+  pi->handle = handle;
+
+
+  register_handle = dlsym (pi->handle, "vlib_plugin_register");
+  if (register_handle == 0)
+    {
+      dlclose (handle);
+      clib_warning ("Plugin missing vlib_plugin_register: %s\n",
+		    (char *) pi->name);
+      return 1;
+    }
+
+  fp = register_handle;
+
+  handoff_structure = vnet_get_handoff_structure ();
+
+  if (handoff_structure == 0)
+    error = clib_error_return (0, "handoff structure callback returned 0");
+  else
+    error = (*fp) (pm->vlib_main, handoff_structure, from_early_init);
+
+  if (error)
+    {
+      clib_error_report (error);
+      dlclose (handle);
+      return 1;
+    }
+
+  clib_warning ("Loaded plugin: %s", pi->name);
+
+  return 0;
+}
+
+static u8 **
+split_plugin_path (plugin_main_t * pm)
+{
+  int i;
+  u8 **rv = 0;
+  u8 *path = pm->plugin_path;
+  u8 *this = 0;
+
+  for (i = 0; i < vec_len (pm->plugin_path); i++)
+    {
+      if (path[i] != ':')
+	{
+	  vec_add1 (this, path[i]);
+	  continue;
+	}
+      vec_add1 (this, 0);
+      vec_add1 (rv, this);
+      this = 0;
+    }
+  if (this)
+    {
+      vec_add1 (this, 0);
+      vec_add1 (rv, this);
+    }
+  return rv;
+}
+
+int
+vlib_load_new_plugins (plugin_main_t * pm, int from_early_init)
+{
+  DIR *dp;
+  struct dirent *entry;
+  struct stat statb;
+  uword *p;
+  plugin_info_t *pi;
+  u8 **plugin_path;
+  int i;
+
+  plugin_path = split_plugin_path (pm);
+
+  for (i = 0; i < vec_len (plugin_path); i++)
+    {
+      dp = opendir ((char *) plugin_path[i]);
+
+      if (dp == 0)
+	continue;
+
+      while ((entry = readdir (dp)))
+	{
+	  u8 *plugin_name;
+
+	  if (pm->plugin_name_filter)
+	    {
+	      int j;
+	      for (j = 0; j < vec_len (pm->plugin_name_filter); j++)
+		if (entry->d_name[j] != pm->plugin_name_filter[j])
+		  goto next;
+	    }
+
+	  plugin_name = format (0, "%s/%s%c", plugin_path[i],
+				entry->d_name, 0);
+
+	  /* Only accept .so */
+	  char *ext = strrchr ((const char *) plugin_name, '.');
+	  /* unreadable */
+	  if (!ext || (strcmp (ext, ".so") != 0) ||
+	      stat ((char *) plugin_name, &statb) < 0)
+	    {
+	    ignore:
+	      vec_free (plugin_name);
+	      continue;
+	    }
+
+	  /* a dir or other things which aren't plugins */
+	  if (!S_ISREG (statb.st_mode))
+	    goto ignore;
+
+	  p = hash_get_mem (pm->plugin_by_name_hash, plugin_name);
+	  if (p == 0)
+	    {
+	      vec_add2 (pm->plugin_info, pi, 1);
+	      pi->name = plugin_name;
+	      pi->file_info = statb;
+
+	      if (load_one_plugin (pm, pi, from_early_init))
+		{
+		  vec_free (plugin_name);
+		  _vec_len (pm->plugin_info) = vec_len (pm->plugin_info) - 1;
+		  continue;
+		}
+	      memset (pi, 0, sizeof (*pi));
+	      hash_set_mem (pm->plugin_by_name_hash, plugin_name,
+			    pi - pm->plugin_info);
+	    }
+	next:
+	  ;
+	}
+      closedir (dp);
+      vec_free (plugin_path[i]);
+    }
+  vec_free (plugin_path);
+  return 0;
+}
+
+char *vlib_plugin_path __attribute__ ((weak));
+char *vlib_plugin_path = "";
+char *vlib_plugin_name_filter __attribute__ ((weak));
+char *vlib_plugin_name_filter = 0;
+
+int
+vlib_plugin_early_init (vlib_main_t * vm)
+{
+  plugin_main_t *pm = &vlib_plugin_main;
+
+  pm->plugin_path = format (0, "%s%c", vlib_plugin_path, 0);
+
+  clib_warning ("plugin path %s", pm->plugin_path);
+
+  if (vlib_plugin_name_filter)
+    pm->plugin_name_filter = format (0, "%s%c", vlib_plugin_name_filter, 0);
+
+  pm->plugin_by_name_hash = hash_create_string (0, sizeof (uword));
+  pm->vlib_main = vm;
+
+  return vlib_load_new_plugins (pm, 1 /* from_early_init */ );
+}
+
+static clib_error_t *
+vlib_plugins_show_cmd_fn (vlib_main_t * vm,
+			  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  plugin_main_t *pm = &vlib_plugin_main;
+  u8 *s = 0;
+  u8 *key = 0;
+  uword *value = 0;
+  int index = 1;
+
+  s = format (s, " Plugin path is: %s\n", pm->plugin_path);
+  if (vlib_plugin_name_filter)
+    s = format (s, " Plugin filter: %s\n", vlib_plugin_name_filter);
+
+  s = format (s, " Plugins loaded: \n");
+  hash_foreach_mem (key, value, pm->plugin_by_name_hash,
+		    {
+		    if (key != 0)
+		    s = format (s, "  %d.%s\n", index, key); index++;}
+  );
+
+  vlib_cli_output (vm, "%v", s);
+  vec_free (s);
+  return 0;
+}
+
+VLIB_CLI_COMMAND (plugins_show_cmd, static) =
+{
+.path = "show plugins",.short_help = "show loaded plugins",.function =
+    vlib_plugins_show_cmd_fn,};
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/unix/plugin.h b/src/vlib/unix/plugin.h
new file mode 100644
index 00000000..c17053bd
--- /dev/null
+++ b/src/vlib/unix/plugin.h
@@ -0,0 +1,98 @@
+/*
+ * plugin.h: plugin handling
+ *
+ * Copyright (c) 2011 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __included_plugin_h__
+#define __included_plugin_h__
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+/*
+ * vlib plugin scheme
+ *
+ * Almost anything which can be made to work in a vlib unix
+ * application will also work in a vlib plugin.
+ *
+ * The elf-section magic which registers static objects
+ * works so long as plugins are preset when the vlib unix process
+ * starts. But wait: there's more...
+ *
+ * If an application calls vlib_load_new_plugins() -- possibly after
+ * changing vlib_plugin_main.plugin_path / vlib_plugin_main.plugin_name_filter,
+ * -- new plugins will be loaded. That, in turn, allows considerable
+ * flexibility in terms of adding feature code or fixing bugs without
+ * requiring the data-plane process to restart.
+ *
+ * When the plugin mechanism loads a plugin, it uses dlsym to locate
+ * and call the plugin's function vlib_plugin_register() if it exists.
+ * A plugin which expects to be loaded after the vlib application
+ * starts uses this callback to modify the application. If vlib_plugin_register
+ * returns non-zero, the plugin mechanism dlclose()'s the plugin.
+ *
+ * Applications control the plugin search path and name filter by
+ * declaring the variables vlib_plugin_path and vlib_plugin_name_filter.
+ * libvlib_unix.la supplies weak references for these symbols which
+ * effectively disable the scheme. In order for the elf-section magic to
+ * work, static plugins must be loaded at the earliest possible moment.
+ *
+ * An application can change these parameters at any time and call
+ * vlib_load_new_plugins().
+ */
+
+
+
+typedef struct
+{
+  u8 *name;
+  struct stat file_info;
+  void *handle;
+} plugin_info_t;
+
+typedef struct
+{
+  /* loaded plugin info */
+  plugin_info_t *plugin_info;
+  uword *plugin_by_name_hash;
+
+  /* path and name filter */
+  u8 *plugin_path;
+  u8 *plugin_name_filter;
+
+  /* handoff structure get callback */
+  void *handoff_structure_get_cb;
+
+  /* usual */
+  vlib_main_t *vlib_main;
+} plugin_main_t;
+
+extern plugin_main_t vlib_plugin_main;
+
+int vlib_plugin_early_init (vlib_main_t * vm);
+int vlib_load_new_plugins (plugin_main_t * pm, int from_early_init);
+
+#endif /* __included_plugin_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/unix/unix.h b/src/vlib/unix/unix.h
new file mode 100644
index 00000000..ea0d417b
--- /dev/null
+++ b/src/vlib/unix/unix.h
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * unix.h: Unix specific main state
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_unix_unix_h
+#define included_unix_unix_h
+
+#include <vppinfra/socket.h>
+#include <termios.h>
+
+struct unix_file;
+typedef clib_error_t *(unix_file_function_t) (struct unix_file * f);
+
+typedef struct unix_file
+{
+  /* Unix file descriptor from open/socket. */
+  u32 file_descriptor;
+
+  u32 flags;
+#define UNIX_FILE_DATA_AVAILABLE_TO_WRITE (1 << 0)
+#define UNIX_FILE_EVENT_EDGE_TRIGGERED   (1 << 1)
+
+  /* Data available for function's use. */
+  uword private_data;
+
+  /* Functions to be called when read/write data becomes ready. */
+  unix_file_function_t *read_function, *write_function, *error_function;
+} unix_file_t;
+
+typedef struct
+{
+  f64 time;
+  clib_error_t *error;
+} unix_error_history_t;
+
+typedef enum
+{
+  UNIX_FILE_UPDATE_ADD,
+  UNIX_FILE_UPDATE_MODIFY,
+  UNIX_FILE_UPDATE_DELETE,
+} unix_file_update_type_t;
+
+typedef struct
+{
+  /* Back pointer to main structure. */
+  vlib_main_t *vlib_main;
+
+  u32 flags;
+  /* Run interactively or as daemon (background process). */
+#define UNIX_FLAG_INTERACTIVE (1 << 0)
+#define UNIX_FLAG_NODAEMON (1 << 1)
+
+  /* Pool of files to poll for input/output. */
+  unix_file_t *file_pool;
+
+  /* CLI listen socket. */
+  clib_socket_t cli_listen_socket;
+
+  void (*file_update) (unix_file_t * file,
+		       unix_file_update_type_t update_type);
+
+  /* Circular buffer of last unix errors. */
+  unix_error_history_t error_history[128];
+  u32 error_history_index;
+  u64 n_total_errors;
+
+  /* startup-config filename */
+  u8 *startup_config_filename;
+
+  /* unix config complete */
+  volatile int unix_config_complete;
+
+  /* CLI log file. GIGO. */
+  u8 *log_filename;
+  int log_fd;
+
+  /* Don't put CLI connections into character mode */
+  int cli_line_mode;
+
+  /* Maximum amount of command line history to keep per session */
+  u32 cli_history_limit;
+
+  /* Suppress the welcome banner at CLI session start */
+  int cli_no_banner;
+
+  /* Maximum pager buffer size */
+  u32 cli_pager_buffer_limit;
+
+  /* Suppress the pager */
+  int cli_no_pager;
+
+  /* Store the original state of stdin when it's a tty */
+  struct termios tio_stdin;
+  int tio_isset;
+} unix_main_t;
+
+/* Global main structure. */
+extern unix_main_t unix_main;
+
+always_inline uword
+unix_file_add (unix_main_t * um, unix_file_t * template)
+{
+  unix_file_t *f;
+  pool_get (um->file_pool, f);
+  f[0] = template[0];
+  um->file_update (f, UNIX_FILE_UPDATE_ADD);
+  return f - um->file_pool;
+}
+
+always_inline void
+unix_file_del (unix_main_t * um, unix_file_t * f)
+{
+  um->file_update (f, UNIX_FILE_UPDATE_DELETE);
+  close (f->file_descriptor);
+  f->file_descriptor = ~0;
+  pool_put (um->file_pool, f);
+}
+
+always_inline uword
+unix_file_set_data_available_to_write (u32 unix_file_index,
+				       uword is_available)
+{
+  unix_file_t *uf = pool_elt_at_index (unix_main.file_pool, unix_file_index);
+  uword was_available = (uf->flags & UNIX_FILE_DATA_AVAILABLE_TO_WRITE);
+  if ((was_available != 0) != (is_available != 0))
+    {
+      uf->flags ^= UNIX_FILE_DATA_AVAILABLE_TO_WRITE;
+      unix_main.file_update (uf, UNIX_FILE_UPDATE_MODIFY);
+    }
+  return was_available != 0;
+}
+
+always_inline void
+unix_save_error (unix_main_t * um, clib_error_t * error)
+{
+  unix_error_history_t *eh = um->error_history + um->error_history_index;
+  clib_error_free_vector (eh->error);
+  eh->error = error;
+  eh->time = vlib_time_now (um->vlib_main);
+  um->n_total_errors += 1;
+  if (++um->error_history_index >= ARRAY_LEN (um->error_history))
+    um->error_history_index = 0;
+}
+
+/* Main function for Unix VLIB. */
+int vlib_unix_main (int argc, char *argv[]);
+
+/* Call to allocate/initialize physical DMA memory subsystem.
+   This is not an init function so that users can explicitly enable/disable
+   physmem when its not needed. */
+clib_error_t *unix_physmem_init (vlib_main_t * vm,
+				 int fail_if_physical_memory_not_present);
+
+static inline int
+unix_physmem_is_fake (vlib_main_t * vm)
+{
+  vlib_physmem_main_t *vpm = &vm->physmem_main;
+  return vpm->is_fake;
+}
+
+/* Set prompt for CLI. */
+void vlib_unix_cli_set_prompt (char *prompt);
+
+static inline unix_main_t *
+vlib_unix_get_main (void)
+{
+  return &unix_main;
+}
+
+/* thread stack array; vec_len = max number of threads */
+extern u8 **vlib_thread_stacks;
+
+/* utils */
+
+clib_error_t *vlib_sysfs_write (char *file_name, char *fmt, ...);
+
+clib_error_t *vlib_sysfs_read (char *file_name, char *fmt, ...);
+
+u8 *vlib_sysfs_link_to_name (char *link);
+
+int vlib_sysfs_get_free_hugepages (unsigned int numa_node, int page_size);
+
+clib_error_t *foreach_directory_file (char *dir_name,
+				      clib_error_t * (*f) (void *arg,
+							   u8 * path_name,
+							   u8 * file_name),
+				      void *arg, int scan_dirs);
+
+#endif /* included_unix_unix_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/unix/util.c b/src/vlib/unix/util.c
new file mode 100644
index 00000000..edc3e591
--- /dev/null
+++ b/src/vlib/unix/util.c
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pci.c: Linux user space PCI bus management.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <dirent.h>
+
+clib_error_t *
+foreach_directory_file (char *dir_name,
+			clib_error_t * (*f) (void *arg, u8 * path_name,
+					     u8 * file_name), void *arg,
+			int scan_dirs)
+{
+  DIR *d;
+  struct dirent *e;
+  clib_error_t *error = 0;
+  u8 *s, *t;
+
+  d = opendir (dir_name);
+  if (!d)
+    {
+      if (errno == ENOENT)
+	return 0;
+      return clib_error_return_unix (0, "open `%s'", dir_name);
+    }
+
+  s = t = 0;
+  while (1)
+    {
+      e = readdir (d);
+      if (!e)
+	break;
+      if (scan_dirs)
+	{
+	  if (e->d_type == DT_DIR
+	      && (!strcmp (e->d_name, ".") || !strcmp (e->d_name, "..")))
+	    continue;
+	}
+      else
+	{
+	  if (e->d_type == DT_DIR)
+	    continue;
+	}
+
+      s = format (s, "%s/%s", dir_name, e->d_name);
+      t = format (t, "%s", e->d_name);
+      error = f (arg, s, t);
+      _vec_len (s) = 0;
+      _vec_len (t) = 0;
+
+      if (error)
+	break;
+    }
+
+  vec_free (s);
+  closedir (d);
+
+  return error;
+}
+
+clib_error_t *
+vlib_sysfs_write (char *file_name, char *fmt, ...)
+{
+  u8 *s;
+  int fd;
+  clib_error_t *error = 0;
+
+  fd = open (file_name, O_WRONLY);
+  if (fd < 0)
+    return clib_error_return_unix (0, "open `%s'", file_name);
+
+  va_list va;
+  va_start (va, fmt);
+  s = va_format (0, fmt, &va);
+  va_end (va);
+
+  if (write (fd, s, vec_len (s)) < 0)
+    error = clib_error_return_unix (0, "write `%s'", file_name);
+
+  vec_free (s);
+  close (fd);
+  return error;
+}
+
+clib_error_t *
+vlib_sysfs_read (char *file_name, char *fmt, ...)
+{
+  unformat_input_t input;
+  u8 *s = 0;
+  int fd;
+  ssize_t sz;
+  uword result;
+
+  fd = open (file_name, O_RDONLY);
+  if (fd < 0)
+    return clib_error_return_unix (0, "open `%s'", file_name);
+
+  vec_validate (s, 4095);
+
+  sz = read (fd, s, vec_len (s));
+  if (sz < 0)
+    {
+      close (fd);
+      vec_free (s);
+      return clib_error_return_unix (0, "read `%s'", file_name);
+    }
+
+  _vec_len (s) = sz;
+  unformat_init_vector (&input, s);
+
+  va_list va;
+  va_start (va, fmt);
+  result = va_unformat (&input, fmt, &va);
+  va_end (va);
+
+  vec_free (s);
+  close (fd);
+
+  if (result == 0)
+    return clib_error_return (0, "unformat error");
+
+  return 0;
+}
+
+u8 *
+vlib_sysfs_link_to_name (char *link)
+{
+  char *p, buffer[64];
+  unformat_input_t in;
+  u8 *s = 0;
+  int r;
+
+  r = readlink (link, buffer, sizeof (buffer) - 1);
+
+  if (r < 0)
+    return 0;
+
+  buffer[r] = 0;
+  p = strrchr (buffer, '/');
+
+  if (!p)
+    return 0;
+
+  unformat_init_string (&in, p + 1, strlen (p + 1));
+  if (unformat (&in, "%s", &s) != 1)
+    clib_unix_warning ("no string?");
+  unformat_free (&in);
+
+  return s;
+}
+
+int
+vlib_sysfs_get_free_hugepages (unsigned int numa_node, int page_size)
+{
+  struct stat sb;
+  u8 *p = 0;
+  int r = -1;
+
+  p = format (p, "/sys/devices/system/node/node%u%c", numa_node, 0);
+
+  if (stat ((char *) p, &sb) == 0)
+    {
+      if (S_ISDIR (sb.st_mode) == 0)
+	goto done;
+    }
+  else if (numa_node == 0)
+    {
+      vec_reset_length (p);
+      p = format (p, "/sys/kernel/mm%c", 0);
+      if (stat ((char *) p, &sb) < 0 || S_ISDIR (sb.st_mode) == 0)
+	goto done;
+    }
+  else
+    goto done;
+
+  _vec_len (p) -= 1;
+  p = format (p, "/hugepages/hugepages-%ukB/free_hugepages%c", page_size, 0);
+  vlib_sysfs_read ((char *) p, "%d", &r);
+
+done:
+  vec_free (p);
+  return r;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/vlib.h b/src/vlib/vlib.h
new file mode 100644
index 00000000..b146a49b
--- /dev/null
+++ b/src/vlib/vlib.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * vlib.h: top-level include file
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_h
+#define included_vlib_h
+
+#include <vppinfra/clib.h>
+#include <vppinfra/elf_clib.h>
+
+/* Generic definitions. */
+#include <vlib/defs.h>
+
+/* Forward declarations of structs to avoid circular dependencies. */
+struct vlib_main_t;
+
+/* All includes in alphabetical order. */
+#include <vlib/buffer.h>
+#include <vlib/cli.h>
+#include <vlib/counter.h>
+#include <vlib/error.h>
+#include <vlib/init.h>
+#include <vlib/mc.h>
+#include <vlib/node.h>
+#include <vlib/physmem.h>
+#include <vlib/trace.h>
+
+/* Main include depends on other vlib/ includes so we put it last. */
+#include <vlib/main.h>
+
+/* Inline/extern function declarations. */
+#include <vlib/threads.h>
+#include <vlib/buffer_funcs.h>
+#include <vlib/cli_funcs.h>
+#include <vlib/error_funcs.h>
+#include <vlib/format_funcs.h>
+#include <vlib/node_funcs.h>
+#include <vlib/trace_funcs.h>
+#include <vlib/global_funcs.h>
+
+#include <vlib/buffer_node.h>
+
+#endif /* included_vlib_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/vlib_process_doc.h b/src/vlib/vlib_process_doc.h
new file mode 100644
index 00000000..a47c5e4b
--- /dev/null
+++ b/src/vlib/vlib_process_doc.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#error do not #include this file!
+
+/** \file
+
+    Cooperative multi-tasking thread support.
+
+    Vlib provides a lightweight cooperative multi-tasking thread
+    model. Context switching costs a setjmp/longjump pair.  It's not
+    unreasonable to put vlib threads to sleep for 10us.
+
+    The graph node scheduler invokes these processes in much the same
+    way as traditional vector-processing run-to-completion graph
+    nodes; plus-or-minus a setjmp/longjmp pair required to switch
+    stacks. Simply set the vlib_node_registration_t type field to
+    VLIB_NODE_TYPE_PROCESS. Process is a misnomer; these are threads.
+
+    As of this writing, the default stack size is 2<<15;
+    32kb. Initialize the node registration's
+    process_log2_n_stack_bytes member as needed. The graph node
+    dispatcher makes some effort to detect stack overrun. We map a
+    no-access page below each thread stack.
+
+    Process node dispatch functions are expected to be while(1) { }
+    loops which suspend when not otherwise occupied, and which must
+    not run for unreasonably long periods of time.  Unreasonably long
+    is an application-dependent concept. Over the years, we have
+    constructed frame-size sensitive control-plane nodes which will
+    use a much higher fraction of the available CPU bandwidth when the
+    frame size is low. Classic example: modifying forwarding
+    tables. So long as the table-builder leaves the forwarding tables
+    in a valid state, one can suspend the table builder to avoid
+    dropping packets as a result of control-plane activity.
+
+    Process nodes can suspend for fixed amounts of time, or until another
+    entity signals an event, or both. See the example below.
+
+    When running in VLIB process context, one must pay strict attention to
+    loop invariant issues. If one walks a data structure and calls a
+    function which may suspend, one had best know by construction that it
+    cannot change. Often, it s best to simply make a snapshot copy of a
+    data structure, walk the copy at leisure, then free the copy.
+
+    Here's an example:
+
+    <code><pre>
+    \#define EXAMPLE_POLL_PERIOD 10.0
+
+    static uword
+    example_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
+                     vlib_frame_t * f)
+    {
+      f64 poll_time_remaining;
+      uword event_type, *event_data = 0;
+
+      poll_time_remaining = EXAMPLE_POLL_PERIOD;
+      while (1)
+        {
+          int i;
+
+           // Sleep until next periodic call due,
+           // or until we receive event(s)
+           //
+          poll_time_remaining =
+    	    vlib_process_wait_for_event_or_clock (vm, poll_time_remaining);
+
+          event_type = vlib_process_get_events (vm, &event_data);
+          switch (event_type)
+     	    {
+       	    case ~0:		// no events => timeout
+      	      break;
+
+            case EVENT1:
+    	      for (i = 0; i < vec_len (event_data); i++)
+    	        handle_event1 (mm, event_data[i]);
+    	      break;
+
+    	    case EVENT2:
+    	      for (i = 0; i < vec_len (event_data); i++)
+    	        handle_event2 (vm, event_data[i]);
+    	      break;
+
+              // ... and so forth for each event type
+
+            default:
+              // This should never happen...
+    	      clib_warning ("BUG: unhandled event type %d",
+                            event_type);
+    	      break;
+      	    }
+          vec_reset_length (event_data);
+
+          // Timer expired, call periodic function
+          if (vlib_process_suspend_time_is_zero (poll_time_remaining))
+    	    {
+    	      example_periodic (vm);
+    	      poll_time_remaining = EXAMPLE_POLL_PERIOD;
+    	    }
+        }
+      // NOTREACHED
+      return 0;
+    }
+
+    static VLIB_REGISTER_NODE (example_node) = {
+      .function = example_process,
+      .type = VLIB_NODE_TYPE_PROCESS,
+      .name = "example-process",
+    };
+    </pre></code>
+
+    In this example, the VLIB process node waits for an event to
+    occur, or for 10 seconds to elapse. The code demuxes on the event
+    type, calling the appropriate handler function.
+
+    Each call to vlib_process_get_events returns a vector of
+    per-event-type data passed to successive vlib_process_signal_event
+    calls; vec_len (event_data) >= 1.  It is an error to process only
+    event_data[0].
+
+    Resetting the event_data vector-length to 0 by calling
+    vec_reset_length (event_data) - instead of calling vec_free (...)
+    - means that the event scheme doesn t burn cycles continuously
+    allocating and freeing the event data vector. This is a common
+    coding pattern, well worth using when appropriate.
+*/
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibapi/api.h b/src/vlibapi/api.h
new file mode 100644
index 00000000..970a0ee0
--- /dev/null
+++ b/src/vlibapi/api.h
@@ -0,0 +1,281 @@
+/*
+ *------------------------------------------------------------------
+ * api.h
+ *
+ * Copyright (c) 2009-2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef included_api_h
+#define included_api_h
+
+#include <vppinfra/error.h>
+#include <svm/svm.h>
+#include <vlib/vlib.h>
+#include <vlibmemory/unix_shared_memory_queue.h>
+#include <vlib/unix/unix.h>
+
+typedef enum
+{
+  REGISTRATION_TYPE_FREE = 0,
+  REGISTRATION_TYPE_SHMEM,
+  REGISTRATION_TYPE_SOCKET_LISTEN,
+  REGISTRATION_TYPE_SOCKET_SERVER,
+  REGISTRATION_TYPE_SOCKET_CLIENT,
+} vl_registration_type_t;
+
+typedef struct vl_api_registration_
+{
+  vl_registration_type_t registration_type;
+
+  /* Index in VLIB's brain (not shared memory). */
+  u32 vl_api_registration_pool_index;
+
+  u8 *name;
+
+  /*
+   * The following groups of data could be unioned, but my fingers are
+   * going to be sore enough.
+   */
+
+  /* shared memory only */
+  unix_shared_memory_queue_t *vl_input_queue;
+
+  /* socket server and client */
+  u32 unix_file_index;
+  i8 *unprocessed_input;
+  u32 unprocessed_msg_length;
+  u8 *output_vector;
+
+  /* socket client only */
+  u32 server_handle;
+  u32 server_index;
+
+} vl_api_registration_t;
+
+
+/* Trace configuration for a single message */
+typedef struct
+{
+  int size;
+  int trace_enable;
+  int replay_enable;
+} trace_cfg_t;
+
+/*
+ * API recording
+ */
+typedef struct
+{
+  u8 endian;
+  u8 enabled;
+  u8 wrapped;
+  u8 pad;
+  u32 nitems;
+  u32 curindex;
+  u8 **traces;
+} vl_api_trace_t;
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED
+(struct
+ {
+   u8 endian; u8 wrapped;
+   u32 nitems;
+}) vl_api_trace_file_header_t;
+/* *INDENT-ON* */
+
+typedef enum
+{
+  VL_API_TRACE_TX,
+  VL_API_TRACE_RX,
+} vl_api_trace_which_t;
+
+#define VL_API_LITTLE_ENDIAN 0x00
+#define VL_API_BIG_ENDIAN 0x01
+
+typedef struct
+{
+  u8 *name;
+  u16 first_msg_id;
+  u16 last_msg_id;
+} vl_api_msg_range_t;
+
+typedef struct
+{
+  void (**msg_handlers) (void *);
+  int (**pd_msg_handlers) (void *, int);
+  void (**msg_cleanup_handlers) (void *);
+  void (**msg_endian_handlers) (void *);
+  void (**msg_print_handlers) (void *, void *);
+  char **msg_names;
+  u8 *message_bounce;
+  u8 *is_mp_safe;
+  struct ring_alloc_ *arings;
+  u32 ring_misses;
+  u32 missing_clients;
+  vl_api_trace_t *rx_trace;
+  vl_api_trace_t *tx_trace;
+  int msg_print_flag;
+  trace_cfg_t *api_trace_cfg;
+  int our_pid;
+  svm_region_t *vlib_rp;
+  svm_region_t **mapped_shmem_regions;
+  struct vl_shmem_hdr_ *shmem_hdr;
+  vl_api_registration_t **vl_clients;
+
+  u8 *serialized_message_table_in_shmem;
+
+  /* For plugin msg allocator */
+  u16 first_available_msg_id;
+
+  /* message range by name hash */
+  uword *msg_range_by_name;
+
+  /* vector of message ranges */
+  vl_api_msg_range_t *msg_ranges;
+
+  /* uid for the api shared memory region */
+  int api_uid;
+  /* gid for the api shared memory region */
+  int api_gid;
+
+  /* base virtual address for global VM region */
+  u64 global_baseva;
+
+  /* size of the global VM region */
+  u64 global_size;
+
+  /* size of the API region */
+  u64 api_size;
+
+  /* size of the global VM private mheap */
+  u64 global_pvt_heap_size;
+
+  /* size of the api private mheap */
+  u64 api_pvt_heap_size;
+
+  /* Client-only data structures */
+  unix_shared_memory_queue_t *vl_input_queue;
+
+  /*
+   * All VLIB-side message handlers use my_client_index to identify
+   * the queue / client. This works in sim replay.
+   */
+  int my_client_index;
+  /*
+   * This is the (shared VM) address of the registration,
+   * don't use it to id the connection since it can't possibly
+   * work in simulator replay.
+   */
+  vl_api_registration_t *my_registration;
+
+  i32 vlib_signal;
+
+  /* client side message index hash table */
+  uword *msg_index_by_name_and_crc;
+
+  char *region_name;
+  char *root_path;
+} api_main_t;
+
+extern api_main_t api_main;
+
+typedef struct
+{
+  int id;
+  char *name;
+  u32 crc;
+  void *handler;
+  void *cleanup;
+  void *endian;
+  void *print;
+  int size;
+  int traced;
+  int replay;
+  int message_bounce;
+  int is_mp_safe;
+} vl_msg_api_msg_config_t;
+
+typedef struct msgbuf_
+{
+  unix_shared_memory_queue_t *q;
+  u32 data_len;
+  u32 pad;
+  u8 data[0];
+} msgbuf_t;
+
+/* api_shared.c prototypes */
+int vl_msg_api_rx_trace_enabled (api_main_t * am);
+int vl_msg_api_tx_trace_enabled (api_main_t * am);
+void vl_msg_api_trace (api_main_t * am, vl_api_trace_t * tp, void *msg);
+int vl_msg_api_trace_onoff (api_main_t * am, vl_api_trace_which_t which,
+			    int onoff);
+int vl_msg_api_trace_free (api_main_t * am, vl_api_trace_which_t which);
+int vl_msg_api_trace_save (api_main_t * am,
+			   vl_api_trace_which_t which, FILE * fp);
+int vl_msg_api_trace_configure (api_main_t * am, vl_api_trace_which_t which,
+				u32 nitems);
+void vl_msg_api_handler_with_vm_node (api_main_t * am,
+				      void *the_msg, vlib_main_t * vm,
+				      vlib_node_runtime_t * node);
+void vl_msg_api_handler (void *the_msg);
+void vl_msg_api_handler_no_free (void *the_msg);
+void vl_msg_api_handler_no_trace_no_free (void *the_msg);
+void vl_msg_api_trace_only (void *the_msg);
+void vl_msg_api_cleanup_handler (void *the_msg);
+void vl_msg_api_replay_handler (void *the_msg);
+void vl_msg_api_socket_handler (void *the_msg);
+void vl_msg_api_set_handlers (int msg_id, char *msg_name,
+			      void *handler,
+			      void *cleanup,
+			      void *endian,
+			      void *print, int msg_size, int traced);
+void vl_msg_api_config (vl_msg_api_msg_config_t *);
+void vl_msg_api_set_cleanup_handler (int msg_id, void *fp);
+void vl_msg_api_queue_handler (unix_shared_memory_queue_t * q);
+vl_api_trace_t *vl_msg_api_trace_get (api_main_t * am,
+				      vl_api_trace_which_t which);
+
+void vl_msg_api_free (void *);
+void vl_noop_handler (void *mp);
+clib_error_t *vl_api_init (vlib_main_t * vm);
+void vl_msg_api_increment_missing_client_counter (void);
+void vl_msg_api_post_mortem_dump (void);
+void vl_msg_api_register_pd_handler (void *handler,
+				     u16 msg_id_host_byte_order);
+int vl_msg_api_pd_handler (void *mp, int rv);
+
+void vl_msg_api_set_first_available_msg_id (u16 first_avail);
+u16 vl_msg_api_get_msg_ids (char *name, int n);
+void vl_msg_api_add_msg_name_crc (api_main_t * am, char *string, u32 id);
+u32 vl_api_get_msg_index (u8 * name_and_crc);
+
+/* node_serialize.c prototypes */
+u8 *vlib_node_serialize (vlib_node_main_t * nm, u8 * vector,
+			 u32 max_threads, int include_nexts,
+			 int include_stats);
+vlib_node_t **vlib_node_unserialize (u8 * vector);
+
+#define VLIB_API_INIT_FUNCTION(x) VLIB_DECLARE_INIT_FUNCTION(x,api_init)
+
+#endif /* included_api_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibapi/api_helper_macros.h b/src/vlibapi/api_helper_macros.h
new file mode 100644
index 00000000..16f34cfc
--- /dev/null
+++ b/src/vlibapi/api_helper_macros.h
@@ -0,0 +1,243 @@
+/*
+ *------------------------------------------------------------------
+ * api_helper_macros.h - message handler helper macros
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+
+#ifndef __api_helper_macros_h__
+#define __api_helper_macros_h__
+
+#define f64_endian(a)
+#define f64_print(a,b)
+
+#define REPLY_MACRO(t)                                          \
+do {                                                            \
+    unix_shared_memory_queue_t * q;                             \
+    rv = vl_msg_api_pd_handler (mp, rv);                        \
+    q = vl_api_client_index_to_input_queue (mp->client_index);  \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t));                               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+                                                                \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+#define REPLY_MACRO2(t, body)                                   \
+do {                                                            \
+    unix_shared_memory_queue_t * q;                             \
+    rv = vl_msg_api_pd_handler (mp, rv);                        \
+    q = vl_api_client_index_to_input_queue (mp->client_index);  \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t));                               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+    do {body;} while (0);                                       \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+#define REPLY_MACRO3(t, n, body)				\
+do {                                                            \
+    unix_shared_memory_queue_t * q;                             \
+    rv = vl_msg_api_pd_handler (mp, rv);                        \
+    q = vl_api_client_index_to_input_queue (mp->client_index);  \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp) + n);                 \
+    rmp->_vl_msg_id = ntohs((t));                               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+    do {body;} while (0);                                       \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+#define REPLY_MACRO4(t, n, body)                                \
+do {                                                            \
+    unix_shared_memory_queue_t * q;                             \
+    u8 is_error = 0;                                            \
+    rv = vl_msg_api_pd_handler (mp, rv);                        \
+    q = vl_api_client_index_to_input_queue (mp->client_index);  \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc_or_null (sizeof (*rmp) + n);         \
+    if (!rmp)                                                   \
+      {                                                         \
+        /* if there isn't enough memory, try to allocate */     \
+        /* some at least for returning an error */              \
+        rmp = vl_msg_api_alloc (sizeof (*rmp));                 \
+        if (!rmp)                                               \
+          return;                                               \
+                                                                \
+        memset (rmp, 0, sizeof (*rmp));                         \
+        rv = VNET_API_ERROR_TABLE_TOO_BIG;                      \
+        is_error = 1;                                           \
+      }                                                         \
+    rmp->_vl_msg_id = ntohs((t));                               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+    if (!is_error)                                              \
+      do {body;} while (0);                                     \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+/* "trust, but verify" */
+
+#define VALIDATE_SW_IF_INDEX(mp)				\
+ do { u32 __sw_if_index = ntohl(mp->sw_if_index);		\
+    vnet_main_t *__vnm = vnet_get_main();                       \
+    if (pool_is_free_index(__vnm->interface_main.sw_interfaces, \
+                           __sw_if_index)) {                    \
+        rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
+        goto bad_sw_if_index;                                   \
+    }                                                           \
+} while(0);
+
+#define BAD_SW_IF_INDEX_LABEL                   \
+do {                                            \
+bad_sw_if_index:                                \
+    ;                                           \
+} while (0);
+
+#define VALIDATE_RX_SW_IF_INDEX(mp)				\
+ do { u32 __rx_sw_if_index = ntohl(mp->rx_sw_if_index);		\
+    vnet_main_t *__vnm = vnet_get_main();                       \
+    if (pool_is_free_index(__vnm->interface_main.sw_interfaces, \
+                           __rx_sw_if_index)) {			\
+        rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
+        goto bad_rx_sw_if_index;				\
+    }                                                           \
+} while(0);
+
+#define BAD_RX_SW_IF_INDEX_LABEL		\
+do {                                            \
+bad_rx_sw_if_index:				\
+    ;                                           \
+} while (0);
+
+#define VALIDATE_TX_SW_IF_INDEX(mp)				\
+ do { u32 __tx_sw_if_index = ntohl(mp->tx_sw_if_index);		\
+    vnet_main_t *__vnm = vnet_get_main();                       \
+    if (pool_is_free_index(__vnm->interface_main.sw_interfaces, \
+                           __tx_sw_if_index)) {			\
+        rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
+        goto bad_tx_sw_if_index;				\
+    }                                                           \
+} while(0);
+
+#define BAD_TX_SW_IF_INDEX_LABEL		\
+do {                                            \
+bad_tx_sw_if_index:				\
+    ;                                           \
+} while (0);
+
+#define pub_sub_handler(lca,UCA)                                        \
+static void vl_api_want_##lca##_t_handler (                             \
+    vl_api_want_##lca##_t *mp)                                          \
+{                                                                       \
+    vpe_api_main_t *vam = &vpe_api_main;                                \
+    vpe_client_registration_t *rp;                                      \
+    vl_api_want_##lca##_reply_t *rmp;                                   \
+    uword *p;                                                           \
+    i32 rv = 0;                                                         \
+                                                                        \
+    p = hash_get (vam->lca##_registration_hash, mp->client_index);      \
+    if (p) {                                                            \
+        if (mp->enable_disable) {                                       \
+            clib_warning ("pid %d: already enabled...", mp->pid);       \
+            rv = VNET_API_ERROR_INVALID_REGISTRATION;                   \
+            goto reply;                                                 \
+        } else {                                                        \
+            rp = pool_elt_at_index (vam->lca##_registrations, p[0]);    \
+            pool_put (vam->lca##_registrations, rp);                    \
+            hash_unset (vam->lca##_registration_hash,                   \
+                mp->client_index);                                      \
+            goto reply;                                                 \
+        }                                                               \
+    }                                                                   \
+    if (mp->enable_disable == 0) {                                      \
+        clib_warning ("pid %d: already disabled...", mp->pid);          \
+        rv = VNET_API_ERROR_INVALID_REGISTRATION;                       \
+        goto reply;                                                     \
+    }                                                                   \
+    pool_get (vam->lca##_registrations, rp);                            \
+    rp->client_index = mp->client_index;                                \
+    rp->client_pid = mp->pid;                                           \
+    hash_set (vam->lca##_registration_hash, rp->client_index,           \
+              rp - vam->lca##_registrations);                           \
+                                                                        \
+reply:                                                                  \
+    REPLY_MACRO (VL_API_WANT_##UCA##_REPLY);                            \
+}
+
+#define foreach_registration_hash               \
+_(interface_events)                             \
+_(to_netconf_server)                            \
+_(from_netconf_server)                          \
+_(to_netconf_client)                            \
+_(from_netconf_client)                          \
+_(oam_events)                                   \
+_(bfd_events)
+
+/* WARNING: replicated in vpp/stats.h */
+typedef struct
+{
+  u32 client_index;		/* in memclnt registration pool */
+  u32 client_pid;
+} vpe_client_registration_t;
+
+struct _vl_api_ip4_arp_event;
+struct _vl_api_ip6_nd_event;
+
+typedef struct
+{
+#define _(a) uword *a##_registration_hash;              \
+    vpe_client_registration_t * a##_registrations;
+  foreach_registration_hash
+#undef _
+    /* notifications happen really early in the game */
+  u8 link_state_process_up;
+
+  /* ip4 arp event registration pool */
+  struct _vl_api_ip4_arp_event *arp_events;
+
+  /* ip6 nd event registration pool */
+  struct _vl_api_ip6_nd_event *nd_events;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} vpe_api_main_t;
+
+extern vpe_api_main_t vpe_api_main;
+
+#endif /* __api_helper_macros_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibapi/api_shared.c b/src/vlibapi/api_shared.c
new file mode 100644
index 00000000..6a04fac9
--- /dev/null
+++ b/src/vlibapi/api_shared.c
@@ -0,0 +1,1375 @@
+/*
+ *------------------------------------------------------------------
+ * api_shared.c - API message handling, common code for both clients
+ * and the vlib process itself.
+ *
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <vppinfra/format.h>
+#include <vppinfra/byte_order.h>
+#include <vppinfra/error.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+#include <vppinfra/elog.h>
+
+api_main_t api_main;
+
+void vl_msg_api_barrier_sync (void) __attribute__ ((weak));
+void
+vl_msg_api_barrier_sync (void)
+{
+}
+
+void vl_msg_api_barrier_release (void) __attribute__ ((weak));
+void
+vl_msg_api_barrier_release (void)
+{
+}
+
+void
+vl_msg_api_increment_missing_client_counter (void)
+{
+  api_main_t *am = &api_main;
+  am->missing_clients++;
+}
+
+typedef enum
+{
+  DUMP,
+  CUSTOM_DUMP,
+  REPLAY,
+  INITIALIZERS,
+} vl_api_replay_t;
+
+int
+vl_msg_api_rx_trace_enabled (api_main_t * am)
+{
+  return (am->rx_trace && am->rx_trace->enabled);
+}
+
+int
+vl_msg_api_tx_trace_enabled (api_main_t * am)
+{
+  return (am->tx_trace && am->tx_trace->enabled);
+}
+
+/*
+ * vl_msg_api_trace
+ */
+void
+vl_msg_api_trace (api_main_t * am, vl_api_trace_t * tp, void *msg)
+{
+  u8 **this_trace;
+  u8 **old_trace;
+  u8 *msg_copy;
+  u32 length;
+  trace_cfg_t *cfgp;
+  u16 msg_id = ntohs (*((u16 *) msg));
+  msgbuf_t *header = (msgbuf_t *) (((u8 *) msg) - offsetof (msgbuf_t, data));
+
+  cfgp = am->api_trace_cfg + msg_id;
+
+  if (!cfgp || !cfgp->trace_enable)
+    return;
+
+  msg_copy = 0;
+
+  if (tp->nitems == 0)
+    {
+      clib_warning ("tp->nitems is 0");
+      return;
+    }
+
+  if (vec_len (tp->traces) < tp->nitems)
+    {
+      vec_add1 (tp->traces, 0);
+      this_trace = tp->traces + vec_len (tp->traces) - 1;
+    }
+  else
+    {
+      tp->wrapped = 1;
+      old_trace = tp->traces + tp->curindex++;
+      if (tp->curindex == tp->nitems)
+	tp->curindex = 0;
+      vec_free (*old_trace);
+      this_trace = old_trace;
+    }
+
+  length = clib_net_to_host_u32 (header->data_len);
+
+  vec_validate (msg_copy, length - 1);
+  clib_memcpy (msg_copy, msg, length);
+  *this_trace = msg_copy;
+}
+
+int
+vl_msg_api_trace_onoff (api_main_t * am, vl_api_trace_which_t which,
+			int onoff)
+{
+  vl_api_trace_t *tp;
+  int rv;
+
+  switch (which)
+    {
+    case VL_API_TRACE_TX:
+      tp = am->tx_trace;
+      if (tp == 0)
+	{
+	  vl_msg_api_trace_configure (am, which, 1024);
+	  tp = am->tx_trace;
+	}
+      break;
+
+    case VL_API_TRACE_RX:
+      tp = am->rx_trace;
+      if (tp == 0)
+	{
+	  vl_msg_api_trace_configure (am, which, 1024);
+	  tp = am->rx_trace;
+	}
+      break;
+
+    default:
+      /* duh? */
+      return -1;
+    }
+
+  /* Configured? */
+  if (tp == 0 || tp->nitems == 0)
+    return -1;
+
+  rv = tp->enabled;
+  tp->enabled = onoff;
+
+  return rv;
+}
+
+int
+vl_msg_api_trace_free (api_main_t * am, vl_api_trace_which_t which)
+{
+  vl_api_trace_t *tp;
+  int i;
+
+  switch (which)
+    {
+    case VL_API_TRACE_TX:
+      tp = am->tx_trace;
+      break;
+
+    case VL_API_TRACE_RX:
+      tp = am->rx_trace;
+      break;
+
+    default:
+      /* duh? */
+      return -1;
+    }
+
+  /* Configured? */
+  if (!tp || tp->nitems == 0)
+    return -1;
+
+  tp->curindex = 0;
+  tp->wrapped = 0;
+
+  for (i = 0; i < vec_len (tp->traces); i++)
+    {
+      vec_free (tp->traces[i]);
+    }
+  vec_free (tp->traces);
+
+  return 0;
+}
+
+int
+vl_msg_api_trace_save (api_main_t * am, vl_api_trace_which_t which, FILE * fp)
+{
+  vl_api_trace_t *tp;
+  vl_api_trace_file_header_t fh;
+  int i;
+  u8 *msg;
+
+  switch (which)
+    {
+    case VL_API_TRACE_TX:
+      tp = am->tx_trace;
+      break;
+
+    case VL_API_TRACE_RX:
+      tp = am->rx_trace;
+      break;
+
+    default:
+      /* duh? */
+      return -1;
+    }
+
+  /* Configured, data present? */
+  if (tp == 0 || tp->nitems == 0 || vec_len (tp->traces) == 0)
+    return -1;
+
+  /* "Dare to be stupid" check */
+  if (fp == 0)
+    {
+      return -2;
+    }
+
+  /* Write the file header */
+  fh.nitems = vec_len (tp->traces);
+  fh.endian = tp->endian;
+  fh.wrapped = tp->wrapped;
+
+  if (fwrite (&fh, sizeof (fh), 1, fp) != 1)
+    {
+      return (-10);
+    }
+
+  /* No-wrap case */
+  if (tp->wrapped == 0)
+    {
+      /*
+       * Note: vec_len return 0 when fed a NULL pointer.
+       * Unfortunately, the static analysis tool doesn't
+       * figure it out, hence the suppressed warnings.
+       * What a great use of my time.
+       */
+      for (i = 0; i < vec_len (tp->traces); i++)
+	{
+	  u32 msg_length;
+	  /*sa_ignore NO_NULL_CHK */
+	  msg = tp->traces[i];
+	  /*
+	   * This retarded check required to pass
+	   * [sic] SA-checking.
+	   */
+	  if (!msg)
+	    continue;
+
+	  msg_length = clib_host_to_net_u32 (vec_len (msg));
+	  if (fwrite (&msg_length, 1, sizeof (msg_length), fp)
+	      != sizeof (msg_length))
+	    {
+	      return (-14);
+	    }
+	  if (fwrite (msg, 1, vec_len (msg), fp) != vec_len (msg))
+	    {
+	      return (-11);
+	    }
+	}
+    }
+  else
+    {
+      /* Wrap case: write oldest -> end of buffer */
+      for (i = tp->curindex; i < vec_len (tp->traces); i++)
+	{
+	  u32 msg_length;
+	  msg = tp->traces[i];
+	  /*
+	   * This retarded check required to pass
+	   * [sic] SA-checking
+	   */
+	  if (!msg)
+	    continue;
+
+	  msg_length = clib_host_to_net_u32 (vec_len (msg));
+	  if (fwrite (&msg_length, 1, sizeof (msg_length), fp)
+	      != sizeof (msg_length))
+	    {
+	      return (-14);
+	    }
+
+	  if (fwrite (msg, 1, vec_len (msg), fp) != vec_len (msg))
+	    {
+	      return (-12);
+	    }
+	}
+      /* write beginning of buffer -> oldest-1 */
+      for (i = 0; i < tp->curindex; i++)
+	{
+	  u32 msg_length;
+	  /*sa_ignore NO_NULL_CHK */
+	  msg = tp->traces[i];
+	  /*
+	   * This retarded check required to pass
+	   * [sic] SA-checking
+	   */
+	  if (!msg)
+	    continue;
+
+	  msg_length = clib_host_to_net_u32 (vec_len (msg));
+	  if (fwrite (&msg_length, 1, sizeof (msg_length), fp)
+	      != sizeof (msg_length))
+	    {
+	      return (-14);
+	    }
+
+	  if (fwrite (msg, 1, vec_len (msg), fp) != vec_len (msg))
+	    {
+	      return (-13);
+	    }
+	}
+    }
+  return 0;
+}
+
+int
+vl_msg_api_trace_configure (api_main_t * am, vl_api_trace_which_t which,
+			    u32 nitems)
+{
+  vl_api_trace_t *tp;
+  int was_on = 0;
+
+  switch (which)
+    {
+    case VL_API_TRACE_TX:
+      tp = am->tx_trace;
+      if (tp == 0)
+	{
+	  vec_validate (am->tx_trace, 0);
+	  tp = am->tx_trace;
+	}
+      break;
+
+    case VL_API_TRACE_RX:
+      tp = am->rx_trace;
+      if (tp == 0)
+	{
+	  vec_validate (am->rx_trace, 0);
+	  tp = am->rx_trace;
+	}
+
+      break;
+
+    default:
+      return -1;
+
+    }
+
+  if (tp->enabled)
+    {
+      was_on = vl_msg_api_trace_onoff (am, which, 0);
+    }
+  if (tp->traces)
+    {
+      vl_msg_api_trace_free (am, which);
+    }
+
+  memset (tp, 0, sizeof (*tp));
+
+  if (clib_arch_is_big_endian)
+    {
+      tp->endian = VL_API_BIG_ENDIAN;
+    }
+  else
+    {
+      tp->endian = VL_API_LITTLE_ENDIAN;
+    }
+
+  tp->nitems = nitems;
+  if (was_on)
+    {
+      (void) vl_msg_api_trace_onoff (am, which, was_on);
+    }
+  return 0;
+}
+
+always_inline void
+msg_handler_internal (api_main_t * am,
+		      void *the_msg, int trace_it, int do_it, int free_it)
+{
+  u16 id = ntohs (*((u16 *) the_msg));
+  u8 *(*print_fp) (void *, void *);
+
+  if (id < vec_len (am->msg_handlers) && am->msg_handlers[id])
+    {
+      if (trace_it)
+	vl_msg_api_trace (am, am->rx_trace, the_msg);
+
+      if (am->msg_print_flag)
+	{
+	  fformat (stdout, "[%d]: %s\n", id, am->msg_names[id]);
+	  print_fp = (void *) am->msg_print_handlers[id];
+	  if (print_fp == 0)
+	    {
+	      fformat (stdout, "  [no registered print fn]\n");
+	    }
+	  else
+	    {
+	      (*print_fp) (the_msg, stdout);
+	    }
+	}
+
+      if (do_it)
+	{
+	  if (!am->is_mp_safe[id])
+	    vl_msg_api_barrier_sync ();
+	  (*am->msg_handlers[id]) (the_msg);
+	  if (!am->is_mp_safe[id])
+	    vl_msg_api_barrier_release ();
+	}
+    }
+  else
+    {
+      clib_warning ("no handler for msg id %d", id);
+    }
+
+  if (free_it)
+    vl_msg_api_free (the_msg);
+}
+
+/* set to 1 if you want before/after message handler event logging */
+#define ELOG_API_MESSAGE_HANDLERS 0
+
+#if ELOG_API_MESSAGE_HANDLERS > 0
+static u32
+elog_id_for_msg_name (vlib_main_t * vm, char *msg_name)
+{
+  uword *p, r;
+  static uword *h;
+  u8 *name_copy;
+
+  if (!h)
+    h = hash_create_string (0, sizeof (uword));
+
+  p = hash_get_mem (h, msg_name);
+  if (p)
+    return p[0];
+  r = elog_string (&vm->elog_main, "%s", msg_name);
+
+  name_copy = format (0, "%s%c", msg_name, 0);
+
+  hash_set_mem (h, name_copy, r);
+
+  return r;
+}
+#endif
+
+/* This is only to be called from a vlib/vnet app */
+void
+vl_msg_api_handler_with_vm_node (api_main_t * am,
+				 void *the_msg, vlib_main_t * vm,
+				 vlib_node_runtime_t * node)
+{
+  u16 id = ntohs (*((u16 *) the_msg));
+  u8 *(*handler) (void *, void *, void *);
+
+#if ELOG_API_MESSAGE_HANDLERS > 0
+  {
+    /* *INDENT-OFF* */
+    ELOG_TYPE_DECLARE (e) =
+      {
+        .format = "api-msg: %s",
+        .format_args = "T4",
+      };
+    /* *INDENT-ON* */
+    struct
+    {
+      u32 c;
+    } *ed;
+    ed = ELOG_DATA (&vm->elog_main, e);
+    if (id < vec_len (am->msg_names))
+      ed->c = elog_id_for_msg_name (vm, am->msg_names[id]);
+    else
+      ed->c = elog_id_for_msg_name (vm, "BOGUS");
+  }
+#endif
+
+  if (id < vec_len (am->msg_handlers) && am->msg_handlers[id])
+    {
+      handler = (void *) am->msg_handlers[id];
+
+      if (am->rx_trace && am->rx_trace->enabled)
+	vl_msg_api_trace (am, am->rx_trace, the_msg);
+
+      if (!am->is_mp_safe[id])
+	vl_msg_api_barrier_sync ();
+      (*handler) (the_msg, vm, node);
+      if (!am->is_mp_safe[id])
+	vl_msg_api_barrier_release ();
+    }
+  else
+    {
+      clib_warning ("no hander for msg id %d", id);
+    }
+
+  /*
+   * Special-case, so we can e.g. bounce messages off the vnet
+   * main thread without copying them...
+   */
+  if (!(am->message_bounce[id]))
+    vl_msg_api_free (the_msg);
+
+#if ELOG_API_MESSAGE_HANDLERS > 0
+  {
+  /* *INDENT-OFF* */
+  ELOG_TYPE_DECLARE (e) = {
+    .format = "api-msg-done: %s",
+    .format_args = "T4",
+  };
+  /* *INDENT-ON* */
+
+    struct
+    {
+      u32 c;
+    } *ed;
+    ed = ELOG_DATA (&vm->elog_main, e);
+    if (id < vec_len (am->msg_names))
+      ed->c = elog_id_for_msg_name (vm, am->msg_names[id]);
+    else
+      ed->c = elog_id_for_msg_name (vm, "BOGUS");
+  }
+#endif
+}
+
+void
+vl_msg_api_handler (void *the_msg)
+{
+  api_main_t *am = &api_main;
+
+  msg_handler_internal (am, the_msg,
+			(am->rx_trace
+			 && am->rx_trace->enabled) /* trace_it */ ,
+			1 /* do_it */ , 1 /* free_it */ );
+}
+
+void
+vl_msg_api_handler_no_free (void *the_msg)
+{
+  api_main_t *am = &api_main;
+  msg_handler_internal (am, the_msg,
+			(am->rx_trace
+			 && am->rx_trace->enabled) /* trace_it */ ,
+			1 /* do_it */ , 0 /* free_it */ );
+}
+
+void
+vl_msg_api_handler_no_trace_no_free (void *the_msg)
+{
+  api_main_t *am = &api_main;
+  msg_handler_internal (am, the_msg, 0 /* trace_it */ , 1 /* do_it */ ,
+			0 /* free_it */ );
+}
+
+/*
+ * Add a trace record to the API message trace buffer, if
+ * API message tracing is enabled. Handy for adding sufficient
+ * data to the trace to reproduce autonomous state, as opposed to
+ * state downloaded via control-plane API messages. Example: the NAT
+ * application creates database entries based on packet traffic, not
+ * control-plane messages.
+ *
+ */
+void
+vl_msg_api_trace_only (void *the_msg)
+{
+  api_main_t *am = &api_main;
+
+  msg_handler_internal (am, the_msg,
+			(am->rx_trace
+			 && am->rx_trace->enabled) /* trace_it */ ,
+			0 /* do_it */ , 0 /* free_it */ );
+}
+
+void
+vl_msg_api_cleanup_handler (void *the_msg)
+{
+  api_main_t *am = &api_main;
+  u16 id = ntohs (*((u16 *) the_msg));
+
+  if (PREDICT_FALSE (id >= vec_len (am->msg_cleanup_handlers)))
+    {
+      clib_warning ("_vl_msg_id too large: %d\n", id);
+      return;
+    }
+  if (am->msg_cleanup_handlers[id])
+    (*am->msg_cleanup_handlers[id]) (the_msg);
+
+  vl_msg_api_free (the_msg);
+}
+
+/*
+ * vl_msg_api_replay_handler
+ */
+void
+vl_msg_api_replay_handler (void *the_msg)
+{
+  api_main_t *am = &api_main;
+
+  u16 id = ntohs (*((u16 *) the_msg));
+
+  if (PREDICT_FALSE (id >= vec_len (am->msg_handlers)))
+    {
+      clib_warning ("_vl_msg_id too large: %d\n", id);
+      return;
+    }
+  /* do NOT trace the message... */
+  if (am->msg_handlers[id])
+    (*am->msg_handlers[id]) (the_msg);
+  /* do NOT free the message buffer... */
+}
+
+/*
+ * vl_msg_api_socket_handler
+ */
+void
+vl_msg_api_socket_handler (void *the_msg)
+{
+  api_main_t *am = &api_main;
+
+  msg_handler_internal (am, the_msg,
+			(am->rx_trace
+			 && am->rx_trace->enabled) /* trace_it */ ,
+			1 /* do_it */ , 0 /* free_it */ );
+}
+
+#define foreach_msg_api_vector                  \
+_(msg_names)                                    \
+_(msg_handlers)                                 \
+_(msg_cleanup_handlers)                         \
+_(msg_endian_handlers)                          \
+_(msg_print_handlers)                           \
+_(api_trace_cfg)				\
+_(message_bounce)				\
+_(is_mp_safe)
+
+void
+vl_msg_api_config (vl_msg_api_msg_config_t * c)
+{
+  api_main_t *am = &api_main;
+
+  ASSERT (c->id > 0);
+
+#define _(a) vec_validate (am->a, c->id);
+  foreach_msg_api_vector;
+#undef _
+
+  am->msg_names[c->id] = c->name;
+  am->msg_handlers[c->id] = c->handler;
+  am->msg_cleanup_handlers[c->id] = c->cleanup;
+  am->msg_endian_handlers[c->id] = c->endian;
+  am->msg_print_handlers[c->id] = c->print;
+  am->message_bounce[c->id] = c->message_bounce;
+  am->is_mp_safe[c->id] = c->is_mp_safe;
+
+  am->api_trace_cfg[c->id].size = c->size;
+  am->api_trace_cfg[c->id].trace_enable = c->traced;
+  am->api_trace_cfg[c->id].replay_enable = c->replay;
+}
+
+/*
+ * vl_msg_api_set_handlers
+ * preserve the old API for a while
+ */
+void
+vl_msg_api_set_handlers (int id, char *name, void *handler, void *cleanup,
+			 void *endian, void *print, int size, int traced)
+{
+  vl_msg_api_msg_config_t cfg;
+  vl_msg_api_msg_config_t *c = &cfg;
+
+  c->id = id;
+  c->name = name;
+  c->handler = handler;
+  c->cleanup = cleanup;
+  c->endian = endian;
+  c->print = print;
+  c->traced = traced;
+  c->replay = 1;
+  c->message_bounce = 0;
+  c->is_mp_safe = 0;
+  vl_msg_api_config (c);
+}
+
+void
+vl_msg_api_set_cleanup_handler (int msg_id, void *fp)
+{
+  api_main_t *am = &api_main;
+  ASSERT (msg_id > 0);
+
+  vec_validate (am->msg_cleanup_handlers, msg_id);
+  am->msg_cleanup_handlers[msg_id] = fp;
+}
+
+void
+vl_msg_api_queue_handler (unix_shared_memory_queue_t * q)
+{
+  uword msg;
+
+  while (!unix_shared_memory_queue_sub (q, (u8 *) & msg, 0))
+    vl_msg_api_handler ((void *) msg);
+}
+
+vl_api_trace_t *
+vl_msg_api_trace_get (api_main_t * am, vl_api_trace_which_t which)
+{
+  switch (which)
+    {
+    case VL_API_TRACE_RX:
+      return am->rx_trace;
+    case VL_API_TRACE_TX:
+      return am->tx_trace;
+    default:
+      return 0;
+    }
+}
+
+void
+vl_noop_handler (void *mp)
+{
+}
+
+clib_error_t *
+vl_api_init (vlib_main_t * vm)
+{
+  static u8 once;
+  api_main_t *am = &api_main;
+
+  if (once)
+    return 0;
+
+  once = 1;
+
+  am->region_name = "/unset";
+  /*
+   * Eventually passed to fchown, -1 => "current user"
+   * instead of 0 => "root". A very fine disctinction at best.
+   */
+  if (am->api_uid == 0)
+    am->api_uid = -1;
+  if (am->api_gid == 0)
+    am->api_gid = -1;
+
+  return (0);
+}
+
+void vl_msg_api_custom_dump_configure (api_main_t * am)
+  __attribute__ ((weak));
+void
+vl_msg_api_custom_dump_configure (api_main_t * am)
+{
+}
+
+VLIB_INIT_FUNCTION (vl_api_init);
+
+static void
+vl_msg_api_process_file (vlib_main_t * vm, u8 * filename,
+			 u32 first_index, u32 last_index,
+			 vl_api_replay_t which)
+{
+  vl_api_trace_file_header_t *hp;
+  int i, fd;
+  struct stat statb;
+  size_t file_size;
+  u8 *msg;
+  u8 endian_swap_needed = 0;
+  api_main_t *am = &api_main;
+  u8 *tmpbuf = 0;
+  u32 nitems;
+  void **saved_print_handlers = 0;
+
+  fd = open ((char *) filename, O_RDONLY);
+
+  if (fd < 0)
+    {
+      vlib_cli_output (vm, "Couldn't open %s\n", filename);
+      return;
+    }
+
+  if (fstat (fd, &statb) < 0)
+    {
+      vlib_cli_output (vm, "Couldn't stat %s\n", filename);
+      close (fd);
+      return;
+    }
+
+  if (!(statb.st_mode & S_IFREG) || (statb.st_size < sizeof (*hp)))
+    {
+      vlib_cli_output (vm, "File not plausible: %s\n", filename);
+      close (fd);
+      return;
+    }
+
+  file_size = statb.st_size;
+  file_size = (file_size + 4095) & ~(4096);
+
+  hp = mmap (0, file_size, PROT_READ, MAP_PRIVATE, fd, 0);
+
+  if (hp == (vl_api_trace_file_header_t *) MAP_FAILED)
+    {
+      vlib_cli_output (vm, "mmap failed: %s\n", filename);
+      close (fd);
+      return;
+    }
+  close (fd);
+
+  if ((clib_arch_is_little_endian && hp->endian == VL_API_BIG_ENDIAN)
+      || (clib_arch_is_big_endian && hp->endian == VL_API_LITTLE_ENDIAN))
+    endian_swap_needed = 1;
+
+  if (endian_swap_needed)
+    nitems = ntohl (hp->nitems);
+  else
+    nitems = hp->nitems;
+
+  if (last_index == (u32) ~ 0)
+    {
+      last_index = nitems - 1;
+    }
+
+  if (first_index >= nitems || last_index >= nitems)
+    {
+      vlib_cli_output (vm, "Range (%d, %d) outside file range (0, %d)\n",
+		       first_index, last_index, nitems - 1);
+      munmap (hp, file_size);
+      return;
+    }
+  if (hp->wrapped)
+    vlib_cli_output (vm,
+		     "Note: wrapped/incomplete trace, results may vary\n");
+
+  if (which == CUSTOM_DUMP)
+    {
+      saved_print_handlers = (void **) vec_dup (am->msg_print_handlers);
+      vl_msg_api_custom_dump_configure (am);
+    }
+
+
+  msg = (u8 *) (hp + 1);
+
+  for (i = 0; i < first_index; i++)
+    {
+      trace_cfg_t *cfgp;
+      int size;
+      u16 msg_id;
+
+      size = clib_host_to_net_u32 (*(u32 *) msg);
+      msg += sizeof (u32);
+
+      if (clib_arch_is_little_endian)
+	msg_id = ntohs (*((u16 *) msg));
+      else
+	msg_id = *((u16 *) msg);
+
+      cfgp = am->api_trace_cfg + msg_id;
+      if (!cfgp)
+	{
+	  vlib_cli_output (vm, "Ugh: msg id %d no trace config\n", msg_id);
+	  munmap (hp, file_size);
+	  return;
+	}
+      msg += size;
+    }
+
+  for (; i <= last_index; i++)
+    {
+      trace_cfg_t *cfgp;
+      u16 *msg_idp;
+      u16 msg_id;
+      int size;
+
+      if (which == DUMP)
+	vlib_cli_output (vm, "---------- trace %d -----------\n", i);
+
+      size = clib_host_to_net_u32 (*(u32 *) msg);
+      msg += sizeof (u32);
+
+      if (clib_arch_is_little_endian)
+	msg_id = ntohs (*((u16 *) msg));
+      else
+	msg_id = *((u16 *) msg);
+
+      cfgp = am->api_trace_cfg + msg_id;
+      if (!cfgp)
+	{
+	  vlib_cli_output (vm, "Ugh: msg id %d no trace config\n", msg_id);
+	  munmap (hp, file_size);
+	  vec_free (tmpbuf);
+	  return;
+	}
+
+      /* Copy the buffer (from the read-only mmap'ed file) */
+      vec_validate (tmpbuf, size - 1 + sizeof (uword));
+      clib_memcpy (tmpbuf + sizeof (uword), msg, size);
+      memset (tmpbuf, 0xf, sizeof (uword));
+
+      /*
+       * Endian swap if needed. All msg data is supposed to be
+       * in network byte order. All msg handlers are supposed to
+       * know that. The generic message dumpers don't know that.
+       * One could fix apigen, I suppose.
+       */
+      if ((which == DUMP && clib_arch_is_little_endian) || endian_swap_needed)
+	{
+	  void (*endian_fp) (void *);
+	  if (msg_id >= vec_len (am->msg_endian_handlers)
+	      || (am->msg_endian_handlers[msg_id] == 0))
+	    {
+	      vlib_cli_output (vm, "Ugh: msg id %d no endian swap\n", msg_id);
+	      munmap (hp, file_size);
+	      vec_free (tmpbuf);
+	      return;
+	    }
+	  endian_fp = am->msg_endian_handlers[msg_id];
+	  (*endian_fp) (tmpbuf + sizeof (uword));
+	}
+
+      /* msg_id always in network byte order */
+      if (clib_arch_is_little_endian)
+	{
+	  msg_idp = (u16 *) (tmpbuf + sizeof (uword));
+	  *msg_idp = msg_id;
+	}
+
+      switch (which)
+	{
+	case CUSTOM_DUMP:
+	case DUMP:
+	  if (msg_id < vec_len (am->msg_print_handlers) &&
+	      am->msg_print_handlers[msg_id])
+	    {
+	      u8 *(*print_fp) (void *, void *);
+
+	      print_fp = (void *) am->msg_print_handlers[msg_id];
+	      (*print_fp) (tmpbuf + sizeof (uword), vm);
+	    }
+	  else
+	    {
+	      vlib_cli_output (vm, "Skipping msg id %d: no print fcn\n",
+			       msg_id);
+	      break;
+	    }
+	  break;
+
+	case INITIALIZERS:
+	  if (msg_id < vec_len (am->msg_print_handlers) &&
+	      am->msg_print_handlers[msg_id])
+	    {
+	      u8 *s;
+	      int j;
+	      u8 *(*print_fp) (void *, void *);
+
+	      print_fp = (void *) am->msg_print_handlers[msg_id];
+
+	      vlib_cli_output (vm, "/*");
+
+	      (*print_fp) (tmpbuf + sizeof (uword), vm);
+	      vlib_cli_output (vm, "*/\n");
+
+	      s = format (0, "static u8 * vl_api_%s_%d[%d] = {",
+			  am->msg_names[msg_id], i,
+			  am->api_trace_cfg[msg_id].size);
+
+	      for (j = 0; j < am->api_trace_cfg[msg_id].size; j++)
+		{
+		  if ((j & 7) == 0)
+		    s = format (s, "\n    ");
+		  s = format (s, "0x%02x,", tmpbuf[sizeof (uword) + j]);
+		}
+	      s = format (s, "\n};\n%c", 0);
+	      vlib_cli_output (vm, (char *) s);
+	      vec_free (s);
+	    }
+	  break;
+
+	case REPLAY:
+	  if (msg_id < vec_len (am->msg_print_handlers) &&
+	      am->msg_print_handlers[msg_id] && cfgp->replay_enable)
+	    {
+	      void (*handler) (void *);
+
+	      handler = (void *) am->msg_handlers[msg_id];
+
+	      if (!am->is_mp_safe[msg_id])
+		vl_msg_api_barrier_sync ();
+	      (*handler) (tmpbuf + sizeof (uword));
+	      if (!am->is_mp_safe[msg_id])
+		vl_msg_api_barrier_release ();
+	    }
+	  else
+	    {
+	      if (cfgp->replay_enable)
+		vlib_cli_output (vm, "Skipping msg id %d: no handler\n",
+				 msg_id);
+	      break;
+	    }
+	  break;
+	}
+
+      _vec_len (tmpbuf) = 0;
+      msg += size;
+    }
+
+  if (saved_print_handlers)
+    {
+      clib_memcpy (am->msg_print_handlers, saved_print_handlers,
+		   vec_len (am->msg_print_handlers) * sizeof (void *));
+      vec_free (saved_print_handlers);
+    }
+
+  munmap (hp, file_size);
+  vec_free (tmpbuf);
+}
+
+u8 *
+format_vl_msg_api_trace_status (u8 * s, va_list * args)
+{
+  api_main_t *am = va_arg (*args, api_main_t *);
+  vl_api_trace_which_t which = va_arg (*args, vl_api_trace_which_t);
+  vl_api_trace_t *tp;
+  char *trace_name;
+
+  switch (which)
+    {
+    case VL_API_TRACE_TX:
+      tp = am->tx_trace;
+      trace_name = "TX trace";
+      break;
+
+    case VL_API_TRACE_RX:
+      tp = am->rx_trace;
+      trace_name = "RX trace";
+      break;
+
+    default:
+      abort ();
+    }
+
+  if (tp == 0)
+    {
+      s = format (s, "%s: not yet configured.\n", trace_name);
+      return s;
+    }
+
+  s = format (s, "%s: used %d of %d items, %s enabled, %s wrapped\n",
+	      trace_name, vec_len (tp->traces), tp->nitems,
+	      tp->enabled ? "is" : "is not", tp->wrapped ? "has" : "has not");
+  return s;
+}
+
+static u8 post_mortem_dump_enabled;
+
+static clib_error_t *
+api_trace_command_fn (vlib_main_t * vm,
+		      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  u32 nitems = 256 << 10;
+  api_main_t *am = &api_main;
+  vl_api_trace_which_t which = VL_API_TRACE_RX;
+  u8 *filename;
+  u32 first = 0;
+  u32 last = (u32) ~ 0;
+  FILE *fp;
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "on") || unformat (input, "enable"))
+	{
+	  if (unformat (input, "nitems %d", &nitems))
+	    ;
+	  vl_msg_api_trace_configure (am, which, nitems);
+	  vl_msg_api_trace_onoff (am, which, 1 /* on */ );
+	}
+      else if (unformat (input, "off"))
+	{
+	  vl_msg_api_trace_onoff (am, which, 0);
+	}
+      else if (unformat (input, "save %s", &filename))
+	{
+	  u8 *chroot_filename;
+	  if (strstr ((char *) filename, "..")
+	      || index ((char *) filename, '/'))
+	    {
+	      vlib_cli_output (vm, "illegal characters in filename '%s'",
+			       filename);
+	      return 0;
+	    }
+
+	  chroot_filename = format (0, "/tmp/%s%c", filename, 0);
+
+	  vec_free (filename);
+
+	  fp = fopen ((char *) chroot_filename, "w");
+	  if (fp == NULL)
+	    {
+	      vlib_cli_output (vm, "Couldn't create %s\n", chroot_filename);
+	      return 0;
+	    }
+	  rv = vl_msg_api_trace_save (am, which, fp);
+	  fclose (fp);
+	  if (rv == -1)
+	    vlib_cli_output (vm, "API Trace data not present\n");
+	  else if (rv == -2)
+	    vlib_cli_output (vm, "File for writing is closed\n");
+	  else if (rv == -10)
+	    vlib_cli_output (vm, "Error while writing header to file\n");
+	  else if (rv == -11)
+	    vlib_cli_output (vm, "Error while writing trace to file\n");
+	  else if (rv == -12)
+	    vlib_cli_output (vm,
+			     "Error while writing end of buffer trace to file\n");
+	  else if (rv == -13)
+	    vlib_cli_output (vm,
+			     "Error while writing start of buffer trace to file\n");
+	  else if (rv < 0)
+	    vlib_cli_output (vm, "Unkown error while saving: %d", rv);
+	  else
+	    vlib_cli_output (vm, "API trace saved to %s\n", chroot_filename);
+	  vec_free (chroot_filename);
+	}
+      else if (unformat (input, "dump %s", &filename))
+	{
+	  vl_msg_api_process_file (vm, filename, first, last, DUMP);
+	}
+      else if (unformat (input, "custom-dump %s", &filename))
+	{
+	  vl_msg_api_process_file (vm, filename, first, last, CUSTOM_DUMP);
+	}
+      else if (unformat (input, "replay %s", &filename))
+	{
+	  vl_msg_api_process_file (vm, filename, first, last, REPLAY);
+	}
+      else if (unformat (input, "initializers %s", &filename))
+	{
+	  vl_msg_api_process_file (vm, filename, first, last, INITIALIZERS);
+	}
+      else if (unformat (input, "tx"))
+	{
+	  which = VL_API_TRACE_TX;
+	}
+      else if (unformat (input, "first %d", &first))
+	{
+	  ;
+	}
+      else if (unformat (input, "last %d", &last))
+	{
+	  ;
+	}
+      else if (unformat (input, "status"))
+	{
+	  vlib_cli_output (vm, "%U", format_vl_msg_api_trace_status,
+			   am, which);
+	}
+      else if (unformat (input, "free"))
+	{
+	  vl_msg_api_trace_onoff (am, which, 0);
+	  vl_msg_api_trace_free (am, which);
+	}
+      else if (unformat (input, "post-mortem-on"))
+	post_mortem_dump_enabled = 1;
+      else if (unformat (input, "post-mortem-off"))
+	post_mortem_dump_enabled = 0;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (api_trace_command, static) = {
+    .path = "api trace",
+    .short_help =
+    "api trace [on|off][dump|save|replay <file>][status][free][post-mortem-on]",
+    .function = api_trace_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+api_config_fn (vlib_main_t * vm, unformat_input_t * input)
+{
+  u32 nitems = 256 << 10;
+  vl_api_trace_which_t which = VL_API_TRACE_RX;
+  api_main_t *am = &api_main;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "on") || unformat (input, "enable"))
+	{
+	  if (unformat (input, "nitems %d", &nitems))
+	    ;
+	  vl_msg_api_trace_configure (am, which, nitems);
+	  vl_msg_api_trace_onoff (am, which, 1 /* on */ );
+	  post_mortem_dump_enabled = 1;
+	}
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  return 0;
+}
+
+VLIB_CONFIG_FUNCTION (api_config_fn, "api-trace");
+
+void
+vl_msg_api_post_mortem_dump (void)
+{
+  api_main_t *am = &api_main;
+  FILE *fp;
+  char filename[64];
+  int rv;
+
+  if (post_mortem_dump_enabled == 0)
+    return;
+
+  snprintf (filename, sizeof (filename), "/tmp/api_post_mortem.%d",
+	    getpid ());
+
+  fp = fopen (filename, "w");
+  if (fp == NULL)
+    {
+      rv = write (2, "Couldn't create ", 16);
+      rv = write (2, filename, strlen (filename));
+      rv = write (2, "\n", 1);
+      return;
+    }
+  rv = vl_msg_api_trace_save (am, VL_API_TRACE_RX, fp);
+  fclose (fp);
+  if (rv < 0)
+    {
+      rv = write (2, "Failed to save post-mortem API trace to ", 40);
+      rv = write (2, filename, strlen (filename));
+      rv = write (2, "\n", 1);
+    }
+
+}
+
+/* Layered message handling support */
+
+void
+vl_msg_api_register_pd_handler (void *fp, u16 msg_id_host_byte_order)
+{
+  api_main_t *am = &api_main;
+
+  /* Mild idiot proofing */
+  if (msg_id_host_byte_order > 10000)
+    clib_warning ("msg_id_host_byte_order endian issue? %d arg vs %d",
+		  msg_id_host_byte_order,
+		  clib_net_to_host_u16 (msg_id_host_byte_order));
+  vec_validate (am->pd_msg_handlers, msg_id_host_byte_order);
+  am->pd_msg_handlers[msg_id_host_byte_order] = fp;
+}
+
+int
+vl_msg_api_pd_handler (void *mp, int rv)
+{
+  api_main_t *am = &api_main;
+  int (*fp) (void *, int);
+  u16 msg_id;
+
+  if (clib_arch_is_little_endian)
+    msg_id = clib_net_to_host_u16 (*((u16 *) mp));
+  else
+    msg_id = *((u16 *) mp);
+
+  if (msg_id >= vec_len (am->pd_msg_handlers)
+      || am->pd_msg_handlers[msg_id] == 0)
+    return rv;
+
+  fp = am->pd_msg_handlers[msg_id];
+  rv = (*fp) (mp, rv);
+  return rv;
+}
+
+void
+vl_msg_api_set_first_available_msg_id (u16 first_avail)
+{
+  api_main_t *am = &api_main;
+
+  am->first_available_msg_id = first_avail;
+}
+
+u16
+vl_msg_api_get_msg_ids (char *name, int n)
+{
+  api_main_t *am = &api_main;
+  u8 *name_copy;
+  vl_api_msg_range_t *rp;
+  uword *p;
+  u16 rv;
+
+  if (am->msg_range_by_name == 0)
+    am->msg_range_by_name = hash_create_string (0, sizeof (uword));
+
+  name_copy = format (0, "%s%c", name, 0);
+
+  p = hash_get_mem (am->msg_range_by_name, name_copy);
+  if (p)
+    {
+      clib_warning ("WARNING: duplicate message range registration for '%s'",
+		    name_copy);
+      vec_free (name_copy);
+      return ((u16) ~ 0);
+    }
+
+  if (n < 0 || n > 1024)
+    {
+      clib_warning
+	("WARNING: bad number of message-IDs (%d) requested by '%s'",
+	 n, name_copy);
+      vec_free (name_copy);
+      return ((u16) ~ 0);
+    }
+
+  vec_add2 (am->msg_ranges, rp, 1);
+
+  rv = rp->first_msg_id = am->first_available_msg_id;
+  am->first_available_msg_id += n;
+  rp->last_msg_id = am->first_available_msg_id - 1;
+  rp->name = name_copy;
+
+  hash_set_mem (am->msg_range_by_name, name_copy, rp - am->msg_ranges);
+
+  return rv;
+}
+
+void
+vl_msg_api_add_msg_name_crc (api_main_t * am, char *string, u32 id)
+{
+  uword *p;
+
+  if (am->msg_index_by_name_and_crc == 0)
+    am->msg_index_by_name_and_crc = hash_create_string (0, sizeof (uword));
+
+  p = hash_get_mem (am->msg_index_by_name_and_crc, string);
+  if (p)
+    {
+      clib_warning ("attempt to redefine '%s' ignored...", string);
+      return;
+    }
+
+  hash_set_mem (am->msg_index_by_name_and_crc, string, id);
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibapi/node_serialize.c b/src/vlibapi/node_serialize.c
new file mode 100644
index 00000000..4dc1a7d2
--- /dev/null
+++ b/src/vlibapi/node_serialize.c
@@ -0,0 +1,399 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+
+#include <vppinfra/serialize.h>
+
+extern void vl_msg_api_barrier_sync (void);
+extern void vl_msg_api_barrier_release (void);
+
+/* serialized representation of state strings */
+
+#define foreach_state_string_code               \
+_(STATE_DONE, "done")                           \
+_(STATE_DISABLED, "disabled")                   \
+_(STATE_TIME_WAIT, "time wait")                 \
+_(STATE_EVENT_WAIT, "event wait")               \
+_(STATE_ANY_WAIT, "any wait")                   \
+_(STATE_POLLING, "polling")                     \
+_(STATE_INTERRUPT_WAIT, "interrupt wait")       \
+_(STATE_INTERNAL, "internal")
+
+typedef enum
+{
+#define _(a,b) a,
+  foreach_state_string_code
+#undef _
+} state_string_enum_t;
+
+static char *state_strings[] = {
+#define _(a,b) b,
+  foreach_state_string_code
+#undef _
+};
+
+/*
+ * Serialize a vlib_node_main_t. Appends the result to vector.
+ * Pass 0 to create a new vector, use vec_reset_length(vector)
+ * to recycle a vector / avoid memory allocation, etc.
+ * Switch heaps before/after to serialize into API client shared memory.
+ */
+
+u8 *
+vlib_node_serialize (vlib_node_main_t * nm, u8 * vector,
+		     u32 max_threads, int include_nexts, int include_stats)
+{
+  serialize_main_t _sm, *sm = &_sm;
+  vlib_main_t *vm = vlib_get_main ();
+  vlib_node_t *n;
+  static vlib_node_t ***node_dups;
+  vlib_node_t **nodes;
+  static vlib_main_t **stat_vms;
+  vlib_main_t *stat_vm;
+  u8 *namep;
+  u32 name_bytes;
+  uword i, j, k;
+  u64 l, v, c, d;
+  state_string_enum_t state_code;
+  u32 threads_to_serialize;
+
+  vec_reset_length (node_dups);
+
+  if (vec_len (stat_vms) == 0)
+    {
+      if (vec_len (vlib_mains) == 0)
+	vec_add1 (stat_vms, vm);
+      else
+	{
+	  for (i = 0; i < vec_len (vlib_mains); i++)
+	    {
+	      stat_vm = vlib_mains[i];
+	      if (stat_vm)
+		vec_add1 (stat_vms, stat_vm);
+	    }
+	}
+    }
+
+  threads_to_serialize = clib_min (max_threads, vec_len (stat_vms));
+
+  /*
+   * Barrier sync across stats scraping.
+   * Otherwise, the counts will be grossly inaccurate.
+   */
+  vl_msg_api_barrier_sync ();
+
+  for (j = 0; j < threads_to_serialize; j++)
+    {
+      stat_vm = stat_vms[j];
+      nm = &stat_vm->node_main;
+
+      if (include_stats)
+	{
+	  for (i = 0; i < vec_len (nm->nodes); i++)
+	    {
+	      n = nm->nodes[i];
+	      vlib_node_sync_stats (stat_vm, n);
+	    }
+	}
+
+      nodes = vec_dup (nm->nodes);
+
+      vec_add1 (node_dups, nodes);
+    }
+  vl_msg_api_barrier_release ();
+
+  serialize_open_vector (sm, vector);
+
+  serialize_likely_small_unsigned_integer (sm, vec_len (stat_vms));
+
+  for (j = 0; j < vec_len (stat_vms); j++)
+    {
+      stat_vm = stat_vms[j];
+      nodes = node_dups[j];
+
+      serialize_likely_small_unsigned_integer (sm, vec_len (nodes));
+
+      for (i = 0; i < vec_len (nodes); i++)
+	{
+	  n = nodes[i];
+
+	  l = n->stats_total.clocks - n->stats_last_clear.clocks;
+	  v = n->stats_total.vectors - n->stats_last_clear.vectors;
+	  c = n->stats_total.calls - n->stats_last_clear.calls;
+	  d = n->stats_total.suspends - n->stats_last_clear.suspends;
+
+	  state_code = STATE_INTERNAL;
+
+	  if (n->type == VLIB_NODE_TYPE_PROCESS)
+	    {
+	      vlib_process_t *p = vlib_get_process_from_node (vm, n);
+
+	      switch (p->flags
+		      & (VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK
+			 | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT))
+		{
+		default:
+		  if (!(p->flags & VLIB_PROCESS_IS_RUNNING))
+		    state_code = STATE_DONE;
+		  break;
+
+		case VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK:
+		  state_code = STATE_TIME_WAIT;
+		  break;
+
+		case VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT:
+		  state_code = STATE_EVENT_WAIT;
+		  break;
+
+		case (VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK):
+		  state_code =
+		    STATE_ANY_WAIT;
+		  break;
+		}
+	    }
+	  else if (n->type != VLIB_NODE_TYPE_INTERNAL)
+	    {
+	      state_code = STATE_POLLING;
+	      if (n->state == VLIB_NODE_STATE_DISABLED)
+		state_code = STATE_DISABLED;
+	      else if (n->state == VLIB_NODE_STATE_INTERRUPT)
+		state_code = STATE_INTERRUPT_WAIT;
+	    }
+
+	  /* See unserialize_cstring */
+	  name_bytes = vec_len (n->name);
+	  serialize_likely_small_unsigned_integer (sm, name_bytes);
+	  namep = serialize_get (sm, name_bytes);
+	  memcpy (namep, n->name, name_bytes);
+
+	  serialize_likely_small_unsigned_integer (sm, (u64) state_code);
+	  serialize_likely_small_unsigned_integer (sm, n->type);
+
+	  if (include_nexts)
+	    {
+	      serialize_likely_small_unsigned_integer
+		(sm, vec_len (n->next_nodes));
+	      for (k = 0; k < vec_len (n->next_nodes); k++)
+		serialize_likely_small_unsigned_integer (sm,
+							 n->next_nodes[k]);
+	    }
+	  else
+	    serialize_likely_small_unsigned_integer (sm, 0);
+
+	  if (include_stats)
+	    {
+	      /* stats present */
+	      serialize_likely_small_unsigned_integer (sm, 1);
+	      /* total clocks */
+	      serialize_integer (sm, l, 8);
+	      /* Total calls */
+	      serialize_integer (sm, c, 8);
+	      /* Total vectors */
+	      serialize_integer (sm, v, 8);
+	      /* Total suspends */
+	      serialize_integer (sm, d, 8);
+	    }
+	  else			/* no stats */
+	    serialize_likely_small_unsigned_integer (sm, 0);
+	}
+      vec_free (nodes);
+    }
+  return (serialize_close_vector (sm));
+}
+
+vlib_node_t ***
+vlib_node_unserialize (u8 * vector)
+{
+  serialize_main_t _sm, *sm = &_sm;
+  u32 nnodes, nnexts;
+  u32 nstat_vms;
+  vlib_node_t *node;
+  vlib_node_t **nodes;
+  vlib_node_t ***nodes_by_thread = 0;
+  int i, j, k;
+  u64 l, v, c, d;
+  state_string_enum_t state_code;
+  int stats_present;
+
+  serialize_open_vector (sm, vector);
+
+  nstat_vms = unserialize_likely_small_unsigned_integer (sm);
+
+  vec_validate (nodes_by_thread, nstat_vms - 1);
+  _vec_len (nodes_by_thread) = 0;
+
+  for (i = 0; i < nstat_vms; i++)
+    {
+      nnodes = unserialize_likely_small_unsigned_integer (sm);
+
+      nodes = 0;
+      vec_validate (nodes, nnodes - 1);
+      vec_add1 (nodes_by_thread, nodes);
+
+      for (j = 0; j < nnodes; j++)
+	{
+	  node = 0;
+	  vec_validate (node, 0);
+	  nodes[j] = node;
+
+	  unserialize_cstring (sm, (char **) &(node->name));
+	  state_code = unserialize_likely_small_unsigned_integer (sm);
+	  node->state_string = (u8 *) state_strings[state_code];
+
+	  node->type = unserialize_likely_small_unsigned_integer (sm);
+	  nnexts = unserialize_likely_small_unsigned_integer (sm);
+	  if (nnexts > 0)
+	    vec_validate (node->next_nodes, nnexts - 1);
+	  for (k = 0; k < nnexts; k++)
+	    node->next_nodes[k] =
+	      unserialize_likely_small_unsigned_integer (sm);
+
+	  stats_present = unserialize_likely_small_unsigned_integer (sm);
+
+	  if (stats_present)
+	    {
+	      /* total clocks */
+	      unserialize_integer (sm, &l, 8);
+	      node->stats_total.clocks = l;
+	      node->stats_last_clear.clocks = 0;
+
+	      /* Total calls */
+	      unserialize_integer (sm, &c, 8);
+	      node->stats_total.calls = c;
+
+	      /* Total vectors */
+	      unserialize_integer (sm, &v, 8);
+	      node->stats_total.vectors = v;
+
+	      /* Total suspends */
+	      unserialize_integer (sm, &d, 8);
+	      node->stats_total.suspends = d;
+	    }
+	}
+    }
+  return nodes_by_thread;
+}
+
+#if CLIB_DEBUG > 0
+
+static clib_error_t *
+test_node_serialize_command_fn (vlib_main_t * vm,
+				unformat_input_t * input,
+				vlib_cli_command_t * cmd)
+{
+  vlib_node_main_t *nm = &vm->node_main;
+  u8 *vector = 0;
+  vlib_node_t ***nodes_by_thread;
+  vlib_node_t **nodes;
+  vlib_node_t *node;
+  vlib_node_t *next_node;
+  int i, j, k;
+  u32 max_threads = (u32) ~ 0;
+  int include_nexts = 0;
+  int include_stats = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "max-threads %d", &max_threads))
+	;
+      else if (unformat (input, "stats"))
+	include_stats = 1;
+      else if (unformat (input, "nexts"))
+	include_nexts = 1;
+      else
+	break;
+    }
+
+  /*
+   * Keep the number of memcpy ops to a minimum (e.g. 1).
+   * The current size of the serialized vector is
+   * slightly under 4K.
+   */
+  vec_validate (vector, 16383);
+  vec_reset_length (vector);
+
+  vector = vlib_node_serialize (nm, vector, max_threads,
+				include_nexts, include_stats);
+
+  vlib_cli_output (vm, "result vector %d bytes", vec_len (vector));
+
+  nodes_by_thread = vlib_node_unserialize (vector);
+
+  vec_free (vector);
+
+  for (i = 0; i < vec_len (nodes_by_thread); i++)
+    {
+      nodes = nodes_by_thread[i];
+
+      vlib_cli_output (vm, "thread %d", i);
+
+      for (j = 0; j < vec_len (nodes); j++)
+	{
+	  node = nodes[j];
+
+	  vlib_cli_output (vm, "[%d] %s state %s", j, node->name,
+			   node->state_string);
+
+	  vlib_cli_output
+	    (vm, "    clocks %lld calls %lld suspends"
+	     " %lld vectors %lld",
+	     node->stats_total.clocks,
+	     node->stats_total.calls,
+	     node->stats_total.suspends, node->stats_total.vectors);
+
+	  for (k = 0; k < vec_len (node->next_nodes); k++)
+	    {
+	      if (node->next_nodes[k] != ~0)
+		{
+		  next_node = nodes[node->next_nodes[k]];
+		  vlib_cli_output (vm, "  [%d] %s", k, next_node->name);
+		}
+	    }
+	}
+    }
+
+  for (j = 0; j < vec_len (nodes_by_thread); j++)
+    {
+      nodes = nodes_by_thread[j];
+
+      for (i = 0; i < vec_len (nodes); i++)
+	{
+	  vec_free (nodes[i]->name);
+	  vec_free (nodes[i]->next_nodes);
+	  vec_free (nodes[i]);
+	}
+      vec_free (nodes);
+    }
+  vec_free (nodes_by_thread);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (test_node_serialize_node, static) = {
+    .path = "test node serialize",
+    .short_help = "test node serialize [max-threads NN] nexts stats",
+    .function = test_node_serialize_command_fn,
+};
+/* *INDENT-ON* */
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibmemory/api.h b/src/vlibmemory/api.h
new file mode 100644
index 00000000..54a0a001
--- /dev/null
+++ b/src/vlibmemory/api.h
@@ -0,0 +1,163 @@
+/*
+ *------------------------------------------------------------------
+ * api.h
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef included_vlibmemory_api_h
+#define included_vlibmemory_api_h
+
+#include <vppinfra/error.h>
+#include <svm/svm.h>
+#include <vlib/vlib.h>
+#include <vlibmemory/unix_shared_memory_queue.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+
+/* Allocated in shared memory */
+
+/*
+ * Ring-allocation scheme for client API messages
+ *
+ * Only one proc/thread has control of a given message buffer.
+ * To free a buffer allocated from one of these rings, we clear
+ * a field in the buffer (header), and leave.
+ *
+ * No locks, no hits, no errors...
+ */
+typedef struct ring_alloc_
+{
+  unix_shared_memory_queue_t *rp;
+  u16 size;
+  u16 nitems;
+  u32 hits;
+  u32 misses;
+} ring_alloc_t;
+
+/*
+ * Initializers for the (shared-memory) rings
+ * _(size, n). Note: each msg has an 8 byte header.
+ * Might want to change that to an index sometime.
+ */
+#define foreach_vl_aring_size                   \
+_(64+8, 1024)                                   \
+_(256+8, 128)                                   \
+_(1024+8, 64)
+
+#define foreach_clnt_aring_size                 \
+_(1024+8, 1024)                                 \
+_(2048+8, 128)                                  \
+_(4096+8, 8)
+
+typedef struct vl_shmem_hdr_
+{
+  int version;
+
+  /* getpid () for the VLIB client process */
+  volatile int vl_pid;
+
+  /* Client sends VLIB msgs here. */
+  unix_shared_memory_queue_t *vl_input_queue;
+
+  /* Vector of rings; one for each size. */
+
+  /* VLIB allocates buffers to send msgs to clients here. */
+  ring_alloc_t *vl_rings;
+
+  /* Clients allocate buffer to send msgs to VLIB here. */
+  ring_alloc_t *client_rings;
+
+  /* Number of detected application restarts */
+  u32 application_restarts;
+
+  /* Number of messages reclaimed during application restart */
+  u32 restart_reclaims;
+
+} vl_shmem_hdr_t;
+
+#define VL_SHM_VERSION 2
+
+#define VL_API_EPOCH_MASK 0xFF
+#define VL_API_EPOCH_SHIFT 8
+
+static inline u32
+vl_msg_api_handle_get_epoch (u32 index)
+{
+  return (index & VL_API_EPOCH_MASK);
+}
+
+static inline u32
+vl_msg_api_handle_get_index (u32 index)
+{
+  return (index >> VL_API_EPOCH_SHIFT);
+}
+
+static inline u32
+vl_msg_api_handle_from_index_and_epoch (u32 index, u32 epoch)
+{
+  u32 handle;
+  ASSERT (index < 0x00FFFFFF);
+
+  handle = (index << VL_API_EPOCH_SHIFT) | (epoch & VL_API_EPOCH_MASK);
+  return handle;
+}
+
+void *vl_msg_api_alloc (int nbytes);
+void *vl_msg_api_alloc_or_null (int nbytes);
+void *vl_msg_api_alloc_as_if_client (int nbytes);
+void *vl_msg_api_alloc_as_if_client_or_null (int nbytes);
+void vl_msg_api_free (void *a);
+int vl_map_shmem (char *region_name, int is_vlib);
+void vl_register_mapped_shmem_region (svm_region_t * rp);
+void vl_unmap_shmem (void);
+void vl_msg_api_send_shmem (unix_shared_memory_queue_t * q, u8 * elem);
+void vl_msg_api_send_shmem_nolock (unix_shared_memory_queue_t * q, u8 * elem);
+void vl_msg_api_send (vl_api_registration_t * rp, u8 * elem);
+int vl_client_connect (char *name, int ctx_quota, int input_queue_size);
+void vl_client_disconnect (void);
+unix_shared_memory_queue_t *vl_api_client_index_to_input_queue (u32 index);
+vl_api_registration_t *vl_api_client_index_to_registration (u32 index);
+int vl_client_api_map (char *region_name);
+void vl_client_api_unmap (void);
+void vl_set_memory_region_name (char *name);
+void vl_set_memory_root_path (char *root_path);
+void vl_set_memory_uid (int uid);
+void vl_set_memory_gid (int gid);
+void vl_set_global_memory_baseva (u64 baseva);
+void vl_set_global_memory_size (u64 size);
+void vl_set_api_memory_size (u64 size);
+void vl_set_global_pvt_heap_size (u64 size);
+void vl_set_api_pvt_heap_size (u64 size);
+void vl_enable_disable_memory_api (vlib_main_t * vm, int yesno);
+void vl_client_disconnect_from_vlib (void);
+int vl_client_connect_to_vlib (char *svm_name, char *client_name,
+			       int rx_queue_size);
+int vl_client_connect_to_vlib_no_rx_pthread (char *svm_name,
+					     char *client_name,
+					     int rx_queue_size);
+u16 vl_client_get_first_plugin_msg_id (char *plugin_name);
+
+void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
+
+#endif /* included_vlibmemory_api_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibmemory/memclnt.api b/src/vlibmemory/memclnt.api
new file mode 100644
index 00000000..2f654caf
--- /dev/null
+++ b/src/vlibmemory/memclnt.api
@@ -0,0 +1,91 @@
+/* Hey Emacs use -*- mode: C -*- */
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Create a client registration 
+ */
+manual_print 
+define memclnt_create {
+    i32 ctx_quota;              /* requested punt context quota */
+    u32 context;                /* opaque value to be returned in the reply */
+    u64 input_queue;            /* client's queue */
+    u8 name[64];                /* for show, find by name, whatever */
+    u32 api_versions[8];        /* client-server pairs use as desired */
+};
+
+define memclnt_create_reply {
+    i32 response;               /* Non-negative = success */
+    u64 handle;                 /* handle by which vlib knows this client */
+    u32 index;                  /* index, used e.g. by API trace replay */
+    u32 context;                /* opaque value from the create request */
+    u64 message_table;          /* serialized message table in shmem */
+};
+
+/*
+ * Delete a client registration 
+ */
+manual_print
+define memclnt_delete {
+    u32 index;                  /* index, used e.g. by API trace replay */
+    u64 handle;               /* handle by which vlib knows this client */
+};
+
+define memclnt_delete_reply {
+    i32 response;               /* Non-negative = success */
+    u64 handle;               /* in case the client wonders */
+};
+
+/* 
+ * Client RX thread exit
+ */
+
+define rx_thread_exit {
+    u8 dummy;
+};
+
+/*
+ * RPC
+ */
+define rpc_call {
+    u32 client_index;
+    u32 context;
+    u64 function;
+    u8 multicast;
+    u8 need_barrier_sync;
+    u8 send_reply;
+    u8 data[0];
+};
+
+define rpc_reply {
+    i32 retval;
+    u32 context;
+};
+
+/*
+ * Lookup message-ID base by name
+ */
+define get_first_msg_id {
+    u32 client_index;
+    u32 context;
+    u8 name[64];
+};
+
+define get_first_msg_id_reply {
+    u32 client_index;
+    u32 context;
+    i32 retval;
+    u16 first_msg_id;
+};
diff --git a/src/vlibmemory/memory_client.c b/src/vlibmemory/memory_client.c
new file mode 100644
index 00000000..234a0a5a
--- /dev/null
+++ b/src/vlibmemory/memory_client.c
@@ -0,0 +1,283 @@
+/*
+ *------------------------------------------------------------------
+ * memory_client.c - API message handling, client code.
+ *
+ * Copyright (c) 2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <setjmp.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <time.h>
+#include <fcntl.h>
+#include <string.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/time.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/format.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibmemory/api.h>
+
+#include <vlibmemory/vl_memory_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vlibmemory/vl_memory_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vlibmemory/vl_memory_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) clib_warning (__VA_ARGS__)
+#define vl_printfun
+#include <vlibmemory/vl_memory_api_h.h>
+#undef vl_printfun
+
+typedef struct
+{
+  u8 rx_thread_jmpbuf_valid;
+  u8 connected_to_vlib;
+  jmp_buf rx_thread_jmpbuf;
+  pthread_t rx_thread_handle;
+  /* Plugin message base lookup scheme */
+  volatile u8 first_msg_id_reply_ready;
+  u16 first_msg_id_reply;
+} memory_client_main_t;
+
+memory_client_main_t memory_client_main;
+
+static void *
+rx_thread_fn (void *arg)
+{
+  unix_shared_memory_queue_t *q;
+  memory_client_main_t *mm = &memory_client_main;
+  api_main_t *am = &api_main;
+
+  q = am->vl_input_queue;
+
+  /* So we can make the rx thread terminate cleanly */
+  if (setjmp (mm->rx_thread_jmpbuf) == 0)
+    {
+      mm->rx_thread_jmpbuf_valid = 1;
+      while (1)
+	{
+	  vl_msg_api_queue_handler (q);
+	}
+    }
+  pthread_exit (0);
+}
+
+static void
+vl_api_rx_thread_exit_t_handler (vl_api_rx_thread_exit_t * mp)
+{
+  memory_client_main_t *mm = &memory_client_main;
+  vl_msg_api_free (mp);
+  longjmp (mm->rx_thread_jmpbuf, 1);
+}
+
+static void
+noop_handler (void *notused)
+{
+}
+
+#define foreach_api_msg						\
+_(RX_THREAD_EXIT, rx_thread_exit)
+
+static int
+connect_to_vlib_internal (char *svm_name, char *client_name,
+			  int rx_queue_size, int want_pthread)
+{
+  int rv = 0;
+  memory_client_main_t *mm = &memory_client_main;
+
+  if ((rv = vl_client_api_map (svm_name)))
+    {
+      clib_warning ("vl_client_api map rv %d", rv);
+      return rv;
+    }
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                            vl_api_##n##_t_handler,             \
+                            noop_handler,                       \
+                            vl_api_##n##_t_endian,              \
+                            vl_api_##n##_t_print,               \
+                            sizeof(vl_api_##n##_t), 1);
+  foreach_api_msg;
+#undef _
+
+  if (vl_client_connect (client_name, 0 /* punt quota */ ,
+			 rx_queue_size /* input queue */ ) < 0)
+    {
+      vl_client_api_unmap ();
+      return -1;
+    }
+
+  /* Start the rx queue thread */
+
+  if (want_pthread)
+    {
+      rv = pthread_create (&mm->rx_thread_handle,
+			   NULL /*attr */ , rx_thread_fn, 0);
+      if (rv)
+	clib_warning ("pthread_create returned %d", rv);
+    }
+
+  mm->connected_to_vlib = 1;
+  return 0;
+}
+
+int
+vl_client_connect_to_vlib (char *svm_name, char *client_name,
+			   int rx_queue_size)
+{
+  return connect_to_vlib_internal (svm_name, client_name, rx_queue_size,
+				   1 /* want pthread */ );
+}
+
+int
+vl_client_connect_to_vlib_no_rx_pthread (char *svm_name, char *client_name,
+					 int rx_queue_size)
+{
+  return connect_to_vlib_internal (svm_name, client_name, rx_queue_size,
+				   0 /* want pthread */ );
+}
+
+void
+vl_client_disconnect_from_vlib (void)
+{
+  memory_client_main_t *mm = &memory_client_main;
+  api_main_t *am = &api_main;
+  uword junk;
+
+  if (mm->rx_thread_jmpbuf_valid)
+    {
+      vl_api_rx_thread_exit_t *ep;
+      ep = vl_msg_api_alloc (sizeof (*ep));
+      ep->_vl_msg_id = ntohs (VL_API_RX_THREAD_EXIT);
+      vl_msg_api_send_shmem (am->vl_input_queue, (u8 *) & ep);
+      pthread_join (mm->rx_thread_handle, (void **) &junk);
+    }
+  if (mm->connected_to_vlib)
+    {
+      vl_client_disconnect ();
+      vl_client_api_unmap ();
+    }
+  memset (mm, 0, sizeof (*mm));
+}
+
+static void vl_api_get_first_msg_id_reply_t_handler
+  (vl_api_get_first_msg_id_reply_t * mp)
+{
+  memory_client_main_t *mm = &memory_client_main;
+  i32 retval = ntohl (mp->retval);
+
+  mm->first_msg_id_reply = (retval >= 0) ? ntohs (mp->first_msg_id) : ~0;
+  mm->first_msg_id_reply_ready = 1;
+}
+
+u16
+vl_client_get_first_plugin_msg_id (char *plugin_name)
+{
+  vl_api_get_first_msg_id_t *mp;
+  api_main_t *am = &api_main;
+  memory_client_main_t *mm = &memory_client_main;
+  f64 timeout;
+  void *old_handler;
+  clib_time_t clib_time;
+  u16 rv = ~0;
+
+  if (strlen (plugin_name) + 1 > sizeof (mp->name))
+    return (rv);
+
+  memset (&clib_time, 0, sizeof (clib_time));
+  clib_time_init (&clib_time);
+
+  /* Push this plugin's first_msg_id_reply handler */
+  old_handler = am->msg_handlers[VL_API_GET_FIRST_MSG_ID_REPLY];
+  am->msg_handlers[VL_API_GET_FIRST_MSG_ID_REPLY] = (void *)
+    vl_api_get_first_msg_id_reply_t_handler;
+
+  /* Ask the data-plane for the message-ID base of the indicated plugin */
+  mm->first_msg_id_reply_ready = 0;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_GET_FIRST_MSG_ID);
+  mp->client_index = am->my_client_index;
+  strncpy ((char *) mp->name, plugin_name, sizeof (mp->name) - 1);
+
+  vl_msg_api_send_shmem (am->shmem_hdr->vl_input_queue, (u8 *) & mp);
+
+  /* Synchronously wait for the answer */
+  do
+    {
+      timeout = clib_time_now (&clib_time) + 1.0;
+
+      while (clib_time_now (&clib_time) < timeout)
+	{
+	  if (mm->first_msg_id_reply_ready == 1)
+	    {
+	      rv = mm->first_msg_id_reply;
+	      goto result;
+	    }
+	}
+      /* Restore old handler */
+      am->msg_handlers[VL_API_GET_FIRST_MSG_ID_REPLY] = old_handler;
+
+      return rv;
+    }
+  while (0);
+
+result:
+
+  /* Restore the old handler */
+  am->msg_handlers[VL_API_GET_FIRST_MSG_ID_REPLY] = old_handler;
+
+  if (rv == (u16) ~ 0)
+    clib_warning ("plugin '%s' not registered", plugin_name);
+
+  return rv;
+}
+
+void
+vlib_node_sync_stats (vlib_main_t * vm, vlib_node_t * n)
+{
+  clib_warning ("STUB called...");
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibmemory/memory_shared.c b/src/vlibmemory/memory_shared.c
new file mode 100644
index 00000000..d8d32004
--- /dev/null
+++ b/src/vlibmemory/memory_shared.c
@@ -0,0 +1,852 @@
+/*
+ *------------------------------------------------------------------
+ * memclnt_shared.c - API message handling, common code for both clients
+ * and the vlib process itself.
+ *
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <unistd.h>
+#include <signal.h>
+#include <vppinfra/format.h>
+#include <vppinfra/byte_order.h>
+#include <vppinfra/error.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibmemory/api.h>
+#include <vlibmemory/unix_shared_memory_queue.h>
+
+#include <vlibmemory/vl_memory_msg_enum.h>
+
+#define vl_typedefs
+#include <vlibmemory/vl_memory_api_h.h>
+#undef vl_typedefs
+
+static inline void *
+vl_msg_api_alloc_internal (int nbytes, int pool, int may_return_null)
+{
+  int i;
+  msgbuf_t *rv;
+  ring_alloc_t *ap;
+  unix_shared_memory_queue_t *q;
+  void *oldheap;
+  vl_shmem_hdr_t *shmem_hdr;
+  api_main_t *am = &api_main;
+
+  shmem_hdr = am->shmem_hdr;
+
+  if (shmem_hdr == 0)
+    {
+      clib_warning ("shared memory header NULL");
+      return 0;
+    }
+
+  /* account for the msgbuf_t header */
+  nbytes += sizeof (msgbuf_t);
+
+  if (shmem_hdr->vl_rings == 0)
+    {
+      clib_warning ("vl_rings NULL");
+      ASSERT (0);
+      abort ();
+    }
+
+  if (shmem_hdr->client_rings == 0)
+    {
+      clib_warning ("client_rings NULL");
+      ASSERT (0);
+      abort ();
+    }
+
+  ap = pool ? shmem_hdr->vl_rings : shmem_hdr->client_rings;
+  for (i = 0; i < vec_len (ap); i++)
+    {
+      /* Too big? */
+      if (nbytes > ap[i].size)
+	{
+	  continue;
+	}
+
+      q = ap[i].rp;
+      if (pool == 0)
+	{
+	  pthread_mutex_lock (&q->mutex);
+	}
+      rv = (msgbuf_t *) (&q->data[0] + q->head * q->elsize);
+      /*
+       * Is this item still in use?
+       */
+      if (rv->q)
+	{
+	  /* yes, loser; try next larger pool */
+	  ap[i].misses++;
+	  if (pool == 0)
+	    pthread_mutex_unlock (&q->mutex);
+	  continue;
+	}
+      /* OK, we have a winner */
+      ap[i].hits++;
+      /*
+       * Remember the source queue, although we
+       * don't need to know the queue to free the item.
+       */
+      rv->q = q;
+      q->head++;
+      if (q->head == q->maxsize)
+	q->head = 0;
+
+      if (pool == 0)
+	pthread_mutex_unlock (&q->mutex);
+      goto out;
+    }
+
+  /*
+   * Request too big, or head element of all size-compatible rings
+   * still in use. Fall back to shared-memory malloc.
+   */
+  am->ring_misses++;
+
+  pthread_mutex_lock (&am->vlib_rp->mutex);
+  oldheap = svm_push_data_heap (am->vlib_rp);
+  if (may_return_null)
+    {
+      rv = clib_mem_alloc_or_null (nbytes);
+      if (PREDICT_FALSE (rv == 0))
+	{
+	  svm_pop_heap (oldheap);
+	  pthread_mutex_unlock (&am->vlib_rp->mutex);
+	  return 0;
+	}
+    }
+  else
+    rv = clib_mem_alloc (nbytes);
+
+  rv->q = 0;
+  svm_pop_heap (oldheap);
+  pthread_mutex_unlock (&am->vlib_rp->mutex);
+
+out:
+  rv->data_len = htonl (nbytes - sizeof (msgbuf_t));
+  return (rv->data);
+}
+
+void *
+vl_msg_api_alloc (int nbytes)
+{
+  int pool;
+  api_main_t *am = &api_main;
+  vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
+
+  /*
+   * Clients use pool-0, vlib proc uses pool 1
+   */
+  pool = (am->our_pid == shmem_hdr->vl_pid);
+  return vl_msg_api_alloc_internal (nbytes, pool, 0 /* may_return_null */ );
+}
+
+void *
+vl_msg_api_alloc_or_null (int nbytes)
+{
+  int pool;
+  api_main_t *am = &api_main;
+  vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
+
+  pool = (am->our_pid == shmem_hdr->vl_pid);
+  return vl_msg_api_alloc_internal (nbytes, pool, 1 /* may_return_null */ );
+}
+
+void *
+vl_msg_api_alloc_as_if_client (int nbytes)
+{
+  return vl_msg_api_alloc_internal (nbytes, 0, 0 /* may_return_null */ );
+}
+
+void *
+vl_msg_api_alloc_as_if_client_or_null (int nbytes)
+{
+  return vl_msg_api_alloc_internal (nbytes, 0, 1 /* may_return_null */ );
+}
+
+void
+vl_msg_api_free (void *a)
+{
+  msgbuf_t *rv;
+  void *oldheap;
+  api_main_t *am = &api_main;
+
+  rv = (msgbuf_t *) (((u8 *) a) - offsetof (msgbuf_t, data));
+
+  /*
+   * Here's the beauty of the scheme.  Only one proc/thread has
+   * control of a given message buffer. To free a buffer, we just clear the
+   * queue field, and leave. No locks, no hits, no errors...
+   */
+  if (rv->q)
+    {
+      rv->q = 0;
+      return;
+    }
+
+  pthread_mutex_lock (&am->vlib_rp->mutex);
+  oldheap = svm_push_data_heap (am->vlib_rp);
+  clib_mem_free (rv);
+  svm_pop_heap (oldheap);
+  pthread_mutex_unlock (&am->vlib_rp->mutex);
+}
+
+static void
+vl_msg_api_free_nolock (void *a)
+{
+  msgbuf_t *rv;
+  void *oldheap;
+  api_main_t *am = &api_main;
+
+  rv = (msgbuf_t *) (((u8 *) a) - offsetof (msgbuf_t, data));
+  /*
+   * Here's the beauty of the scheme.  Only one proc/thread has
+   * control of a given message buffer. To free a buffer, we just clear the
+   * queue field, and leave. No locks, no hits, no errors...
+   */
+  if (rv->q)
+    {
+      rv->q = 0;
+      return;
+    }
+
+  oldheap = svm_push_data_heap (am->vlib_rp);
+  clib_mem_free (rv);
+  svm_pop_heap (oldheap);
+}
+
+void
+vl_set_memory_root_path (char *name)
+{
+  api_main_t *am = &api_main;
+
+  am->root_path = name;
+}
+
+void
+vl_set_memory_uid (int uid)
+{
+  api_main_t *am = &api_main;
+
+  am->api_uid = uid;
+}
+
+void
+vl_set_memory_gid (int gid)
+{
+  api_main_t *am = &api_main;
+
+  am->api_gid = gid;
+}
+
+void
+vl_set_global_memory_baseva (u64 baseva)
+{
+  api_main_t *am = &api_main;
+
+  am->global_baseva = baseva;
+}
+
+void
+vl_set_global_memory_size (u64 size)
+{
+  api_main_t *am = &api_main;
+
+  am->global_size = size;
+}
+
+void
+vl_set_api_memory_size (u64 size)
+{
+  api_main_t *am = &api_main;
+
+  am->api_size = size;
+}
+
+void
+vl_set_global_pvt_heap_size (u64 size)
+{
+  api_main_t *am = &api_main;
+
+  am->global_pvt_heap_size = size;
+}
+
+void
+vl_set_api_pvt_heap_size (u64 size)
+{
+  api_main_t *am = &api_main;
+
+  am->api_pvt_heap_size = size;
+}
+
+int
+vl_map_shmem (char *region_name, int is_vlib)
+{
+  svm_map_region_args_t _a, *a = &_a;
+  svm_region_t *vlib_rp, *root_rp;
+  void *oldheap;
+  vl_shmem_hdr_t *shmem_hdr = 0;
+  api_main_t *am = &api_main;
+  int i;
+  struct timespec ts, tsrem;
+
+  if (is_vlib == 0)
+    svm_region_init_chroot (am->root_path);
+
+  memset (a, 0, sizeof (*a));
+
+  a->name = region_name;
+  a->size = am->api_size ? am->api_size : (16 << 20);
+  a->flags = SVM_FLAGS_MHEAP;
+  a->uid = am->api_uid;
+  a->gid = am->api_gid;
+  a->pvt_heap_size = am->api_pvt_heap_size;
+
+  vlib_rp = svm_region_find_or_create (a);
+
+  if (vlib_rp == 0)
+    return (-2);
+
+  pthread_mutex_lock (&vlib_rp->mutex);
+  /* Has someone else set up the shared-memory variable table? */
+  if (vlib_rp->user_ctx)
+    {
+      am->shmem_hdr = (void *) vlib_rp->user_ctx;
+      am->our_pid = getpid ();
+      if (is_vlib)
+	{
+	  unix_shared_memory_queue_t *q;
+	  uword old_msg;
+	  /*
+	   * application restart. Reset cached pids, API message
+	   * rings, list of clients; otherwise, various things
+	   * fail. (e.g. queue non-empty notification)
+	   */
+
+	  /* ghosts keep the region from disappearing properly */
+	  svm_client_scan_this_region_nolock (vlib_rp);
+	  am->shmem_hdr->application_restarts++;
+	  q = am->shmem_hdr->vl_input_queue;
+	  am->shmem_hdr->vl_pid = getpid ();
+	  q->consumer_pid = am->shmem_hdr->vl_pid;
+	  /* Drain the input queue, freeing msgs */
+	  for (i = 0; i < 10; i++)
+	    {
+	      if (pthread_mutex_trylock (&q->mutex) == 0)
+		{
+		  pthread_mutex_unlock (&q->mutex);
+		  goto mutex_ok;
+		}
+	      ts.tv_sec = 0;
+	      ts.tv_nsec = 10000 * 1000;	/* 10 ms */
+	      while (nanosleep (&ts, &tsrem) < 0)
+		ts = tsrem;
+	    }
+	  /* Mutex buggered, "fix" it */
+	  memset (&q->mutex, 0, sizeof (q->mutex));
+	  clib_warning ("forcibly release main input queue mutex");
+
+	mutex_ok:
+	  am->vlib_rp = vlib_rp;
+	  while (unix_shared_memory_queue_sub (q,
+					       (u8 *) & old_msg,
+					       1 /* nowait */ )
+		 != -2 /* queue underflow */ )
+	    {
+	      vl_msg_api_free_nolock ((void *) old_msg);
+	      am->shmem_hdr->restart_reclaims++;
+	    }
+	  pthread_mutex_unlock (&vlib_rp->mutex);
+	  root_rp = svm_get_root_rp ();
+	  ASSERT (root_rp);
+	  /* Clean up the root region client list */
+	  pthread_mutex_lock (&root_rp->mutex);
+	  svm_client_scan_this_region_nolock (root_rp);
+	  pthread_mutex_unlock (&root_rp->mutex);
+	}
+      else
+	{
+	  pthread_mutex_unlock (&vlib_rp->mutex);
+	}
+      am->vlib_rp = vlib_rp;
+      vec_add1 (am->mapped_shmem_regions, vlib_rp);
+      return 0;
+    }
+  /* Clients simply have to wait... */
+  if (!is_vlib)
+    {
+      pthread_mutex_unlock (&vlib_rp->mutex);
+
+      /* Wait up to 100 seconds... */
+      for (i = 0; i < 10000; i++)
+	{
+	  ts.tv_sec = 0;
+	  ts.tv_nsec = 10000 * 1000;	/* 10 ms */
+	  while (nanosleep (&ts, &tsrem) < 0)
+	    ts = tsrem;
+	  if (vlib_rp->user_ctx)
+	    goto ready;
+	}
+      /* Clean up and leave... */
+      svm_region_unmap (vlib_rp);
+      clib_warning ("region init fail");
+      return (-2);
+
+    ready:
+      am->shmem_hdr = (void *) vlib_rp->user_ctx;
+      am->our_pid = getpid ();
+      am->vlib_rp = vlib_rp;
+      vec_add1 (am->mapped_shmem_regions, vlib_rp);
+      return 0;
+    }
+
+  /* Nope, it's our problem... */
+
+  oldheap = svm_push_data_heap (vlib_rp);
+
+  vec_validate (shmem_hdr, 0);
+  shmem_hdr->version = VL_SHM_VERSION;
+
+  /* vlib main input queue */
+  shmem_hdr->vl_input_queue =
+    unix_shared_memory_queue_init (1024, sizeof (uword), getpid (),
+				   am->vlib_signal);
+
+  /* Set up the msg ring allocator */
+#define _(sz,n)                                                 \
+    do {                                                        \
+        ring_alloc_t _rp;                                       \
+        _rp.rp = unix_shared_memory_queue_init ((n), (sz), 0, 0); \
+        _rp.size = (sz);                                        \
+        _rp.nitems = n;                                         \
+        _rp.hits = 0;                                           \
+        _rp.misses = 0;                                         \
+        vec_add1(shmem_hdr->vl_rings, _rp);                     \
+    } while (0);
+
+  foreach_vl_aring_size;
+#undef _
+
+#define _(sz,n)                                                 \
+    do {                                                        \
+        ring_alloc_t _rp;                                       \
+        _rp.rp = unix_shared_memory_queue_init ((n), (sz), 0, 0); \
+        _rp.size = (sz);                                        \
+        _rp.nitems = n;                                         \
+        _rp.hits = 0;                                           \
+        _rp.misses = 0;                                         \
+        vec_add1(shmem_hdr->client_rings, _rp);                 \
+    } while (0);
+
+  foreach_clnt_aring_size;
+#undef _
+
+  am->shmem_hdr = shmem_hdr;
+  am->vlib_rp = vlib_rp;
+  am->our_pid = getpid ();
+  if (is_vlib)
+    am->shmem_hdr->vl_pid = am->our_pid;
+
+  svm_pop_heap (oldheap);
+
+  /*
+   * After absolutely everything that a client might see is set up,
+   * declare the shmem region valid
+   */
+  vlib_rp->user_ctx = shmem_hdr;
+
+  pthread_mutex_unlock (&vlib_rp->mutex);
+  vec_add1 (am->mapped_shmem_regions, vlib_rp);
+  return 0;
+}
+
+void
+vl_register_mapped_shmem_region (svm_region_t * rp)
+{
+  api_main_t *am = &api_main;
+
+  vec_add1 (am->mapped_shmem_regions, rp);
+}
+
+void
+vl_unmap_shmem (void)
+{
+  svm_region_t *rp;
+  int i;
+  api_main_t *am = &api_main;
+
+  if (!svm_get_root_rp ())
+    return;
+
+  for (i = 0; i < vec_len (am->mapped_shmem_regions); i++)
+    {
+      rp = am->mapped_shmem_regions[i];
+      svm_region_unmap (rp);
+    }
+
+  vec_free (am->mapped_shmem_regions);
+  am->shmem_hdr = 0;
+
+  svm_region_exit ();
+  /* $$$ more careful cleanup, valgrind run... */
+  vec_free (am->msg_handlers);
+  vec_free (am->msg_endian_handlers);
+  vec_free (am->msg_print_handlers);
+}
+
+void
+vl_msg_api_send_shmem (unix_shared_memory_queue_t * q, u8 * elem)
+{
+  api_main_t *am = &api_main;
+  uword *trace = (uword *) elem;
+
+  if (am->tx_trace && am->tx_trace->enabled)
+    vl_msg_api_trace (am, am->tx_trace, (void *) trace[0]);
+
+  (void) unix_shared_memory_queue_add (q, elem, 0 /* nowait */ );
+}
+
+void
+vl_msg_api_send_shmem_nolock (unix_shared_memory_queue_t * q, u8 * elem)
+{
+  api_main_t *am = &api_main;
+  uword *trace = (uword *) elem;
+
+  if (am->tx_trace && am->tx_trace->enabled)
+    vl_msg_api_trace (am, am->tx_trace, (void *) trace[0]);
+
+  (void) unix_shared_memory_queue_add_nolock (q, elem);
+}
+
+static void
+vl_api_memclnt_create_reply_t_handler (vl_api_memclnt_create_reply_t * mp)
+{
+  serialize_main_t _sm, *sm = &_sm;
+  api_main_t *am = &api_main;
+  u8 *tblv;
+  u32 nmsgs;
+  int i;
+  u8 *name_and_crc;
+  u32 msg_index;
+
+  am->my_client_index = mp->index;
+  am->my_registration = (vl_api_registration_t *) (uword) mp->handle;
+
+  /* Clean out any previous hash table (unlikely) */
+  if (am->msg_index_by_name_and_crc)
+    {
+      int i;
+      u8 **keys = 0;
+      hash_pair_t *hp;
+      /* *INDENT-OFF* */
+      hash_foreach_pair (hp, am->msg_index_by_name_and_crc,
+      ({
+        vec_add1 (keys, (u8 *) hp->key);
+      }));
+      /* *INDENT-ON* */
+      for (i = 0; i < vec_len (keys); i++)
+	vec_free (keys[i]);
+      vec_free (keys);
+    }
+
+  am->msg_index_by_name_and_crc = hash_create_string (0, sizeof (uword));
+
+  /* Recreate the vnet-side API message handler table */
+  tblv = (u8 *) mp->message_table;
+  serialize_open_vector (sm, tblv);
+  unserialize_integer (sm, &nmsgs, sizeof (u32));
+
+  for (i = 0; i < nmsgs; i++)
+    {
+      msg_index = unserialize_likely_small_unsigned_integer (sm);
+      unserialize_cstring (sm, (char **) &name_and_crc);
+      hash_set_mem (am->msg_index_by_name_and_crc, name_and_crc, msg_index);
+    }
+}
+
+u32
+vl_api_get_msg_index (u8 * name_and_crc)
+{
+  api_main_t *am = &api_main;
+  uword *p;
+
+  if (am->msg_index_by_name_and_crc)
+    {
+      p = hash_get_mem (am->msg_index_by_name_and_crc, name_and_crc);
+      if (p)
+	return p[0];
+    }
+  return ~0;
+}
+
+int
+vl_client_connect (char *name, int ctx_quota, int input_queue_size)
+{
+  svm_region_t *svm;
+  vl_api_memclnt_create_t *mp;
+  vl_api_memclnt_create_reply_t *rp;
+  unix_shared_memory_queue_t *vl_input_queue;
+  vl_shmem_hdr_t *shmem_hdr;
+  int rv = 0;
+  void *oldheap;
+  api_main_t *am = &api_main;
+
+  if (am->my_registration)
+    {
+      clib_warning ("client %s already connected...", name);
+      return -1;
+    }
+
+  if (am->vlib_rp == 0)
+    {
+      clib_warning ("am->vlib_rp NULL");
+      return -1;
+    }
+
+  svm = am->vlib_rp;
+  shmem_hdr = am->shmem_hdr;
+
+  if (shmem_hdr == 0 || shmem_hdr->vl_input_queue == 0)
+    {
+      clib_warning ("shmem_hdr / input queue NULL");
+      return -1;
+    }
+
+  pthread_mutex_lock (&svm->mutex);
+  oldheap = svm_push_data_heap (svm);
+  vl_input_queue =
+    unix_shared_memory_queue_init (input_queue_size, sizeof (uword),
+				   getpid (), 0);
+  pthread_mutex_unlock (&svm->mutex);
+  svm_pop_heap (oldheap);
+
+  am->my_client_index = ~0;
+  am->my_registration = 0;
+  am->vl_input_queue = vl_input_queue;
+
+  mp = vl_msg_api_alloc (sizeof (vl_api_memclnt_create_t));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_MEMCLNT_CREATE);
+  mp->ctx_quota = ctx_quota;
+  mp->input_queue = (uword) vl_input_queue;
+  strncpy ((char *) mp->name, name, sizeof (mp->name) - 1);
+
+  vl_msg_api_send_shmem (shmem_hdr->vl_input_queue, (u8 *) & mp);
+
+  while (1)
+    {
+      int qstatus;
+      struct timespec ts, tsrem;
+      int i;
+
+      /* Wait up to 10 seconds */
+      for (i = 0; i < 1000; i++)
+	{
+	  qstatus = unix_shared_memory_queue_sub (vl_input_queue, (u8 *) & rp,
+						  1 /* nowait */ );
+	  if (qstatus == 0)
+	    goto read_one_msg;
+	  ts.tv_sec = 0;
+	  ts.tv_nsec = 10000 * 1000;	/* 10 ms */
+	  while (nanosleep (&ts, &tsrem) < 0)
+	    ts = tsrem;
+	}
+      /* Timeout... */
+      clib_warning ("memclnt_create_reply timeout");
+      return -1;
+
+    read_one_msg:
+      if (ntohs (rp->_vl_msg_id) != VL_API_MEMCLNT_CREATE_REPLY)
+	{
+	  clib_warning ("unexpected reply: id %d", ntohs (rp->_vl_msg_id));
+	  continue;
+	}
+      rv = clib_net_to_host_u32 (rp->response);
+
+      vl_msg_api_handler ((void *) rp);
+      break;
+    }
+  return (rv);
+}
+
+static void
+vl_api_memclnt_delete_reply_t_handler (vl_api_memclnt_delete_reply_t * mp)
+{
+  void *oldheap;
+  api_main_t *am = &api_main;
+
+  pthread_mutex_lock (&am->vlib_rp->mutex);
+  oldheap = svm_push_data_heap (am->vlib_rp);
+  unix_shared_memory_queue_free (am->vl_input_queue);
+  pthread_mutex_unlock (&am->vlib_rp->mutex);
+  svm_pop_heap (oldheap);
+
+  am->my_client_index = ~0;
+  am->my_registration = 0;
+  am->vl_input_queue = 0;
+}
+
+void
+vl_client_disconnect (void)
+{
+  vl_api_memclnt_delete_t *mp;
+  vl_api_memclnt_delete_reply_t *rp;
+  unix_shared_memory_queue_t *vl_input_queue;
+  vl_shmem_hdr_t *shmem_hdr;
+  time_t begin;
+  api_main_t *am = &api_main;
+
+  ASSERT (am->vlib_rp);
+  shmem_hdr = am->shmem_hdr;
+  ASSERT (shmem_hdr && shmem_hdr->vl_input_queue);
+
+  vl_input_queue = am->vl_input_queue;
+
+  mp = vl_msg_api_alloc (sizeof (vl_api_memclnt_delete_t));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_MEMCLNT_DELETE);
+  mp->index = am->my_client_index;
+  mp->handle = (uword) am->my_registration;
+
+  vl_msg_api_send_shmem (shmem_hdr->vl_input_queue, (u8 *) & mp);
+
+  /*
+   * Have to be careful here, in case the client is disconnecting
+   * because e.g. the vlib process died, or is unresponsive.
+   */
+
+  begin = time (0);
+  while (1)
+    {
+      time_t now;
+
+      now = time (0);
+
+      if (now >= (begin + 2))
+	{
+	  clib_warning ("peer unresponsive, give up");
+	  am->my_client_index = ~0;
+	  am->my_registration = 0;
+	  am->shmem_hdr = 0;
+	  break;
+	}
+      if (unix_shared_memory_queue_sub (vl_input_queue, (u8 *) & rp, 1) < 0)
+	continue;
+
+      /* drain the queue */
+      if (ntohs (rp->_vl_msg_id) != VL_API_MEMCLNT_DELETE_REPLY)
+	{
+	  vl_msg_api_handler ((void *) rp);
+	  continue;
+	}
+      vl_msg_api_handler ((void *) rp);
+      break;
+    }
+}
+
+static inline vl_api_registration_t *
+vl_api_client_index_to_registration_internal (u32 handle)
+{
+  vl_api_registration_t **regpp;
+  vl_api_registration_t *regp;
+  api_main_t *am = &api_main;
+  u32 index;
+
+  index = vl_msg_api_handle_get_index (handle);
+  if ((am->shmem_hdr->application_restarts & VL_API_EPOCH_MASK)
+      != vl_msg_api_handle_get_epoch (handle))
+    {
+      vl_msg_api_increment_missing_client_counter ();
+      return 0;
+    }
+
+  regpp = am->vl_clients + index;
+
+  if (pool_is_free (am->vl_clients, regpp))
+    {
+      vl_msg_api_increment_missing_client_counter ();
+      return 0;
+    }
+  regp = *regpp;
+  return (regp);
+}
+
+vl_api_registration_t *
+vl_api_client_index_to_registration (u32 index)
+{
+  return (vl_api_client_index_to_registration_internal (index));
+}
+
+unix_shared_memory_queue_t *
+vl_api_client_index_to_input_queue (u32 index)
+{
+  vl_api_registration_t *regp;
+  api_main_t *am = &api_main;
+
+  /* Special case: vlib trying to send itself a message */
+  if (index == (u32) ~ 0)
+    return (am->shmem_hdr->vl_input_queue);
+
+  regp = vl_api_client_index_to_registration_internal (index);
+  if (!regp)
+    return 0;
+  return (regp->vl_input_queue);
+}
+
+#define foreach_api_client_msg                  \
+_(MEMCLNT_CREATE_REPLY, memclnt_create_reply)   \
+_(MEMCLNT_DELETE_REPLY, memclnt_delete_reply)
+
+int
+vl_client_api_map (char *region_name)
+{
+  int rv;
+
+  if ((rv = vl_map_shmem (region_name, 0 /* is_vlib */ )) < 0)
+    {
+      return rv;
+    }
+
+#define _(N,n)                                                          \
+    vl_msg_api_set_handlers(VL_API_##N, 0 /* name */,                   \
+                           vl_api_##n##_t_handler,                      \
+                           0/* cleanup */, 0/* endian */, 0/* print */, \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_api_client_msg;
+#undef _
+  return 0;
+}
+
+void
+vl_client_api_unmap (void)
+{
+  vl_unmap_shmem ();
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibmemory/memory_vlib.c b/src/vlibmemory/memory_vlib.c
new file mode 100644
index 00000000..1d40bcb7
--- /dev/null
+++ b/src/vlibmemory/memory_vlib.c
@@ -0,0 +1,1346 @@
+/*
+ *------------------------------------------------------------------
+ * memory_vlib.c
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <pthread.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/format.h>
+#include <vppinfra/byte_order.h>
+#include <vppinfra/elog.h>
+#include <stdarg.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#define TRACE_VLIB_MEMORY_QUEUE 0
+
+#include <vlibmemory/vl_memory_msg_enum.h>	/* enumerate all vlib messages */
+
+#define vl_typedefs		/* define message structures */
+#include <vlibmemory/vl_memory_api_h.h>
+#undef vl_typedefs
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vlibmemory/vl_memory_api_h.h>
+#undef vl_printfun
+
+static inline void *
+vl_api_memclnt_create_t_print (vl_api_memclnt_create_t * a, void *handle)
+{
+  vl_print (handle, "vl_api_memclnt_create_t:\n");
+  vl_print (handle, "name: %s\n", a->name);
+  vl_print (handle, "input_queue: 0x%wx\n", a->input_queue);
+  vl_print (handle, "context: %u\n", (unsigned) a->context);
+  vl_print (handle, "ctx_quota: %ld\n", (long) a->ctx_quota);
+  return handle;
+}
+
+static inline void *
+vl_api_memclnt_delete_t_print (vl_api_memclnt_delete_t * a, void *handle)
+{
+  vl_print (handle, "vl_api_memclnt_delete_t:\n");
+  vl_print (handle, "index: %u\n", (unsigned) a->index);
+  vl_print (handle, "handle: 0x%wx\n", a->handle);
+  return handle;
+}
+
+/* instantiate all the endian swap functions we know about */
+#define vl_endianfun
+#include <vlibmemory/vl_memory_api_h.h>
+#undef vl_endianfun
+
+void vl_socket_api_send (vl_api_registration_t * rp, u8 * elem)
+  __attribute__ ((weak));
+
+void
+vl_socket_api_send (vl_api_registration_t * rp, u8 * elem)
+{
+  static int count;
+
+  if (count++ < 5)
+    clib_warning ("need to link against -lvlibsocket, msg not sent!");
+}
+
+void
+vl_msg_api_send (vl_api_registration_t * rp, u8 * elem)
+{
+  if (PREDICT_FALSE (rp->registration_type > REGISTRATION_TYPE_SHMEM))
+    {
+      vl_socket_api_send (rp, elem);
+    }
+  else
+    {
+      vl_msg_api_send_shmem (rp->vl_input_queue, elem);
+    }
+}
+
+u8 *
+vl_api_serialize_message_table (api_main_t * am, u8 * vector)
+{
+  serialize_main_t _sm, *sm = &_sm;
+  hash_pair_t *hp;
+  u32 nmsg = hash_elts (am->msg_index_by_name_and_crc);
+
+  serialize_open_vector (sm, vector);
+
+  /* serialize the count */
+  serialize_integer (sm, nmsg, sizeof (u32));
+
+  hash_foreach_pair (hp, am->msg_index_by_name_and_crc, (
+							  {
+							  serialize_likely_small_unsigned_integer
+							  (sm, hp->value[0]);
+							  serialize_cstring
+							  (sm,
+							   (char *) hp->key);
+							  }));
+
+  return serialize_close_vector (sm);
+}
+
+/*
+ * vl_api_memclnt_create_t_handler
+ */
+void
+vl_api_memclnt_create_t_handler (vl_api_memclnt_create_t * mp)
+{
+  vl_api_registration_t **regpp;
+  vl_api_registration_t *regp;
+  vl_api_memclnt_create_reply_t *rp;
+  svm_region_t *svm;
+  unix_shared_memory_queue_t *q;
+  int rv = 0;
+  void *oldheap;
+  api_main_t *am = &api_main;
+  u8 *serialized_message_table = 0;
+
+  /*
+   * This is tortured. Maintain a vlib-address-space private
+   * pool of client registrations. We use the shared-memory virtual
+   * address of client structure as a handle, to allow direct
+   * manipulation of context quota vbls from the client library.
+   *
+   * This scheme causes trouble w/ API message trace replay, since
+   * some random VA from clib_mem_alloc() certainly won't
+   * occur in the Linux sim. The (very) few places
+   * that care need to use the pool index.
+   *
+   * Putting the registration object(s) into a pool in shared memory and
+   * using the pool index as a handle seems like a great idea.
+   * Unfortunately, each and every reference to that pool would need
+   * to be protected by a mutex:
+   *
+   *     Client                      VLIB
+   *     ------                      ----
+   *     convert pool index to
+   *     pointer.
+   *     <deschedule>
+   *                                 expand pool
+   *                                 <deschedule>
+   *     kaboom!
+   */
+
+  pool_get (am->vl_clients, regpp);
+
+  svm = am->vlib_rp;
+
+  if (am->serialized_message_table_in_shmem == 0)
+    serialized_message_table = vl_api_serialize_message_table (am, 0);
+
+  pthread_mutex_lock (&svm->mutex);
+  oldheap = svm_push_data_heap (svm);
+  *regpp = clib_mem_alloc (sizeof (vl_api_registration_t));
+
+  regp = *regpp;
+  memset (regp, 0, sizeof (*regp));
+  regp->registration_type = REGISTRATION_TYPE_SHMEM;
+  regp->vl_api_registration_pool_index = regpp - am->vl_clients;
+
+  q = regp->vl_input_queue = (unix_shared_memory_queue_t *) (uword)
+    mp->input_queue;
+
+  regp->name = format (0, "%s", mp->name);
+  vec_add1 (regp->name, 0);
+  if (serialized_message_table)
+    am->serialized_message_table_in_shmem =
+      vec_dup (serialized_message_table);
+
+  pthread_mutex_unlock (&svm->mutex);
+  svm_pop_heap (oldheap);
+
+  vec_free (serialized_message_table);
+
+  rp = vl_msg_api_alloc (sizeof (*rp));
+  rp->_vl_msg_id = ntohs (VL_API_MEMCLNT_CREATE_REPLY);
+  rp->handle = (uword) regp;
+  rp->index = vl_msg_api_handle_from_index_and_epoch
+    (regp->vl_api_registration_pool_index,
+     am->shmem_hdr->application_restarts);
+  rp->context = mp->context;
+  rp->response = ntohl (rv);
+  rp->message_table = (u64) am->serialized_message_table_in_shmem;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rp);
+}
+
+/* Application callback to clean up leftover registrations from this client */
+int vl_api_memclnt_delete_callback (u32 client_index) __attribute__ ((weak));
+
+int
+vl_api_memclnt_delete_callback (u32 client_index)
+{
+  return 0;
+}
+
+/*
+ * vl_api_memclnt_delete_t_handler
+ */
+void
+vl_api_memclnt_delete_t_handler (vl_api_memclnt_delete_t * mp)
+{
+  vl_api_registration_t **regpp;
+  vl_api_registration_t *regp;
+  vl_api_memclnt_delete_reply_t *rp;
+  svm_region_t *svm;
+  void *oldheap;
+  api_main_t *am = &api_main;
+  u32 handle, client_index, epoch;
+
+  handle = mp->index;
+
+  if (vl_api_memclnt_delete_callback (handle))
+    return;
+
+  epoch = vl_msg_api_handle_get_epoch (handle);
+  client_index = vl_msg_api_handle_get_index (handle);
+
+  if (epoch != (am->shmem_hdr->application_restarts & VL_API_EPOCH_MASK))
+    {
+      clib_warning
+	("Stale clnt delete index %d old epoch %d cur epoch %d",
+	 client_index, epoch,
+	 (am->shmem_hdr->application_restarts & VL_API_EPOCH_MASK));
+      return;
+    }
+
+  regpp = am->vl_clients + client_index;
+
+  if (!pool_is_free (am->vl_clients, regpp))
+    {
+      regp = *regpp;
+      svm = am->vlib_rp;
+
+      /* $$$ check the input queue for e.g. punted sf's */
+
+      rp = vl_msg_api_alloc (sizeof (*rp));
+      rp->_vl_msg_id = ntohs (VL_API_MEMCLNT_DELETE_REPLY);
+      rp->handle = mp->handle;
+      rp->response = 1;
+
+      vl_msg_api_send_shmem (regp->vl_input_queue, (u8 *) & rp);
+
+      if (client_index != regp->vl_api_registration_pool_index)
+	{
+	  clib_warning ("mismatch client_index %d pool_index %d",
+			client_index, regp->vl_api_registration_pool_index);
+	  vl_msg_api_free (rp);
+	  return;
+	}
+
+      /* No dangling references, please */
+      *regpp = 0;
+
+      pool_put_index (am->vl_clients, regp->vl_api_registration_pool_index);
+
+      pthread_mutex_lock (&svm->mutex);
+      oldheap = svm_push_data_heap (svm);
+      /* Poison the old registration */
+      memset (regp, 0xF1, sizeof (*regp));
+      clib_mem_free (regp);
+      pthread_mutex_unlock (&svm->mutex);
+      svm_pop_heap (oldheap);
+    }
+  else
+    {
+      clib_warning ("unknown client ID %d", mp->index);
+    }
+}
+
+void
+vl_api_get_first_msg_id_t_handler (vl_api_get_first_msg_id_t * mp)
+{
+  vl_api_get_first_msg_id_reply_t *rmp;
+  unix_shared_memory_queue_t *q;
+  uword *p;
+  api_main_t *am = &api_main;
+  vl_api_msg_range_t *rp;
+  u8 name[64];
+  u16 first_msg_id = ~0;
+  int rv = -7;			/* VNET_API_ERROR_INVALID_VALUE */
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (!q)
+    return;
+
+  if (am->msg_range_by_name == 0)
+    goto out;
+
+  strncpy ((char *) name, (char *) mp->name, ARRAY_LEN (name) - 1);
+
+  p = hash_get_mem (am->msg_range_by_name, name);
+  if (p == 0)
+    goto out;
+
+  rp = vec_elt_at_index (am->msg_ranges, p[0]);
+
+  first_msg_id = rp->first_msg_id;
+  rv = 0;
+
+out:
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_GET_FIRST_MSG_ID_REPLY);
+  rmp->context = mp->context;
+  rmp->retval = ntohl (rv);
+  rmp->first_msg_id = ntohs (first_msg_id);
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+#define foreach_vlib_api_msg                    \
+_(MEMCLNT_CREATE, memclnt_create)               \
+_(MEMCLNT_DELETE, memclnt_delete)               \
+_(GET_FIRST_MSG_ID, get_first_msg_id)
+
+/*
+ * vl_api_init
+ */
+static int
+memory_api_init (char *region_name)
+{
+  int rv;
+  vl_msg_api_msg_config_t cfg;
+  vl_msg_api_msg_config_t *c = &cfg;
+
+  if ((rv = vl_map_shmem (region_name, 1 /* is_vlib */ )) < 0)
+    return rv;
+
+#define _(N,n) do {                                             \
+    c->id = VL_API_##N;                                         \
+    c->name = #n;                                               \
+    c->handler = vl_api_##n##_t_handler;                        \
+    c->cleanup = vl_noop_handler;                               \
+    c->endian = vl_api_##n##_t_endian;                          \
+    c->print = vl_api_##n##_t_print;                            \
+    c->size = sizeof(vl_api_##n##_t);                           \
+    c->traced = 1; /* trace, so these msgs print */             \
+    c->replay = 0; /* don't replay client create/delete msgs */ \
+    vl_msg_api_config(c);} while (0);
+
+  foreach_vlib_api_msg;
+#undef _
+
+  return 0;
+}
+
+#define foreach_histogram_bucket                \
+_(400)                                          \
+_(200)                                          \
+_(100)                                          \
+_(10)
+
+typedef enum
+{
+#define _(n) SLEEP_##n##_US,
+  foreach_histogram_bucket
+#undef _
+    SLEEP_N_BUCKETS,
+} histogram_index_t;
+
+static u64 vector_rate_histogram[SLEEP_N_BUCKETS];
+
+static void memclnt_queue_callback (vlib_main_t * vm);
+
+static uword
+memclnt_process (vlib_main_t * vm,
+		 vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  uword mp;
+  vl_shmem_hdr_t *shm;
+  unix_shared_memory_queue_t *q;
+  clib_error_t *e;
+  int rv;
+  api_main_t *am = &api_main;
+  f64 dead_client_scan_time;
+  f64 sleep_time, start_time;
+  f64 vector_rate;
+
+  vlib_set_queue_signal_callback (vm, memclnt_queue_callback);
+
+  if ((rv = memory_api_init (am->region_name)) < 0)
+    {
+      clib_warning ("memory_api_init returned %d, wait for godot...", rv);
+      vlib_process_suspend (vm, 1e70);
+    }
+
+  shm = am->shmem_hdr;
+  ASSERT (shm);
+  q = shm->vl_input_queue;
+  ASSERT (q);
+
+  e = vlib_call_init_exit_functions
+    (vm, vm->api_init_function_registrations, 1 /* call_once */ );
+  if (e)
+    clib_error_report (e);
+
+  sleep_time = 20.0;
+  dead_client_scan_time = vlib_time_now (vm) + 20.0;
+
+  /* $$$ pay attention to frame size, control CPU usage */
+  while (1)
+    {
+      uword event_type __attribute__ ((unused));
+      i8 *headp;
+      int need_broadcast;
+
+      /*
+       * There's a reason for checking the queue before
+       * sleeping. If the vlib application crashes, it's entirely
+       * possible for a client to enqueue a connect request
+       * during the process restart interval.
+       *
+       * Unless some force of physics causes the new incarnation
+       * of the application to process the request, the client will
+       * sit and wait for Godot...
+       */
+      vector_rate = vlib_last_vector_length_per_node (vm);
+      start_time = vlib_time_now (vm);
+      while (1)
+	{
+	  pthread_mutex_lock (&q->mutex);
+	  if (q->cursize == 0)
+	    {
+	      vm->api_queue_nonempty = 0;
+	      pthread_mutex_unlock (&q->mutex);
+
+	      if (TRACE_VLIB_MEMORY_QUEUE)
+		{
+                  /* *INDENT-OFF* */
+                  ELOG_TYPE_DECLARE (e) =
+                    {
+                      .format = "q-underflow: len %d",
+                      .format_args = "i4",
+                    };
+                  /* *INDENT-ON* */
+		  struct
+		  {
+		    u32 len;
+		  } *ed;
+		  ed = ELOG_DATA (&vm->elog_main, e);
+		  ed->len = 0;
+		}
+	      sleep_time = 20.0;
+	      break;
+	    }
+
+	  headp = (i8 *) (q->data + sizeof (uword) * q->head);
+	  clib_memcpy (&mp, headp, sizeof (uword));
+
+	  q->head++;
+	  need_broadcast = (q->cursize == q->maxsize / 2);
+	  q->cursize--;
+
+	  if (PREDICT_FALSE (q->head == q->maxsize))
+	    q->head = 0;
+	  pthread_mutex_unlock (&q->mutex);
+	  if (need_broadcast)
+	    (void) pthread_cond_broadcast (&q->condvar);
+
+	  vl_msg_api_handler_with_vm_node (am, (void *) mp, vm, node);
+
+	  /* Allow no more than 10us without a pause */
+	  if (vlib_time_now (vm) > start_time + 10e-6)
+	    {
+	      int index = SLEEP_400_US;
+	      if (vector_rate > 40.0)
+		sleep_time = 400e-6;
+	      else if (vector_rate > 20.0)
+		{
+		  index = SLEEP_200_US;
+		  sleep_time = 200e-6;
+		}
+	      else if (vector_rate >= 1.0)
+		{
+		  index = SLEEP_100_US;
+		  sleep_time = 100e-6;
+		}
+	      else
+		{
+		  index = SLEEP_10_US;
+		  sleep_time = 10e-6;
+		}
+	      vector_rate_histogram[index] += 1;
+	      break;
+	    }
+	}
+
+      event_type = vlib_process_wait_for_event_or_clock (vm, sleep_time);
+      vm->queue_signal_pending = 0;
+      vlib_process_get_events (vm, 0 /* event_data */ );
+
+      if (vlib_time_now (vm) > dead_client_scan_time)
+	{
+	  vl_api_registration_t **regpp;
+	  vl_api_registration_t *regp;
+	  unix_shared_memory_queue_t *q;
+	  static u32 *dead_indices;
+	  static u32 *confused_indices;
+
+	  vec_reset_length (dead_indices);
+	  vec_reset_length (confused_indices);
+
+          /* *INDENT-OFF* */
+          pool_foreach (regpp, am->vl_clients,
+          ({
+            regp = *regpp;
+            if (regp)
+              {
+                q = regp->vl_input_queue;
+                if (kill (q->consumer_pid, 0) < 0)
+                  {
+                    vec_add1(dead_indices, regpp - am->vl_clients);
+                  }
+              }
+            else
+              {
+                clib_warning ("NULL client registration index %d",
+                              regpp - am->vl_clients);
+                vec_add1 (confused_indices, regpp - am->vl_clients);
+              }
+          }));
+          /* *INDENT-ON* */
+	  /* This should "never happen," but if it does, fix it... */
+	  if (PREDICT_FALSE (vec_len (confused_indices) > 0))
+	    {
+	      int i;
+	      for (i = 0; i < vec_len (confused_indices); i++)
+		{
+		  pool_put_index (am->vl_clients, confused_indices[i]);
+		}
+	    }
+
+	  if (PREDICT_FALSE (vec_len (dead_indices) > 0))
+	    {
+	      int i;
+	      svm_region_t *svm;
+	      void *oldheap;
+
+	      /* Allow the application to clean up its registrations */
+	      for (i = 0; i < vec_len (dead_indices); i++)
+		{
+		  regpp = pool_elt_at_index (am->vl_clients, dead_indices[i]);
+		  if (regpp)
+		    {
+		      u32 handle;
+
+		      handle = vl_msg_api_handle_from_index_and_epoch
+			(dead_indices[i], shm->application_restarts);
+		      (void) vl_api_memclnt_delete_callback (handle);
+		    }
+		}
+
+	      svm = am->vlib_rp;
+	      pthread_mutex_lock (&svm->mutex);
+	      oldheap = svm_push_data_heap (svm);
+
+	      for (i = 0; i < vec_len (dead_indices); i++)
+		{
+		  regpp = pool_elt_at_index (am->vl_clients, dead_indices[i]);
+		  if (regpp)
+		    {
+		      /* Poison the old registration */
+		      memset (*regpp, 0xF3, sizeof (**regpp));
+		      clib_mem_free (*regpp);
+		      /* no dangling references, please */
+		      *regpp = 0;
+		    }
+		  else
+		    {
+		      svm_pop_heap (oldheap);
+		      clib_warning ("Duplicate free, client index %d",
+				    regpp - am->vl_clients);
+		      oldheap = svm_push_data_heap (svm);
+		    }
+		}
+
+	      svm_client_scan_this_region_nolock (am->vlib_rp);
+
+	      pthread_mutex_unlock (&svm->mutex);
+	      svm_pop_heap (oldheap);
+	      for (i = 0; i < vec_len (dead_indices); i++)
+		pool_put_index (am->vl_clients, dead_indices[i]);
+	    }
+
+	  dead_client_scan_time = vlib_time_now (vm) + 20.0;
+	}
+
+      if (TRACE_VLIB_MEMORY_QUEUE)
+	{
+          /* *INDENT-OFF* */
+          ELOG_TYPE_DECLARE (e) = {
+            .format = "q-awake: len %d",
+            .format_args = "i4",
+          };
+          /* *INDENT-ON* */
+	  struct
+	  {
+	    u32 len;
+	  } *ed;
+	  ed = ELOG_DATA (&vm->elog_main, e);
+	  ed->len = q->cursize;
+	}
+    }
+
+  return 0;
+}
+
+static clib_error_t *
+vl_api_show_histogram_command (vlib_main_t * vm,
+			       unformat_input_t * input,
+			       vlib_cli_command_t * cli_cmd)
+{
+  u64 total_counts = 0;
+  int i;
+
+  for (i = 0; i < SLEEP_N_BUCKETS; i++)
+    {
+      total_counts += vector_rate_histogram[i];
+    }
+
+  if (total_counts == 0)
+    {
+      vlib_cli_output (vm, "No control-plane activity.");
+      return 0;
+    }
+
+#define _(n)                                                    \
+    do {                                                        \
+        f64 percent;                                            \
+        percent = ((f64) vector_rate_histogram[SLEEP_##n##_US]) \
+            / (f64) total_counts;                               \
+        percent *= 100.0;                                       \
+        vlib_cli_output (vm, "Sleep %3d us: %llu, %.2f%%",n,    \
+                         vector_rate_histogram[SLEEP_##n##_US], \
+                         percent);                              \
+    } while (0);
+  foreach_histogram_bucket;
+#undef _
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_show_api_histogram_command, static) = {
+    .path = "show api histogram",
+    .short_help = "show api histogram",
+    .function = vl_api_show_histogram_command,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+vl_api_clear_histogram_command (vlib_main_t * vm,
+				unformat_input_t * input,
+				vlib_cli_command_t * cli_cmd)
+{
+  int i;
+
+  for (i = 0; i < SLEEP_N_BUCKETS; i++)
+    vector_rate_histogram[i] = 0;
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_clear_api_histogram_command, static) = {
+    .path = "clear api histogram",
+    .short_help = "clear api histogram",
+    .function = vl_api_clear_histogram_command,
+};
+/* *INDENT-ON* */
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (memclnt_node,static) = {
+    .function = memclnt_process,
+    .type = VLIB_NODE_TYPE_PROCESS,
+    .name = "api-rx-from-ring",
+    .state = VLIB_NODE_STATE_DISABLED,
+};
+/* *INDENT-ON* */
+
+static void
+memclnt_queue_callback (vlib_main_t * vm)
+{
+  static volatile int *cursizep;
+
+  if (PREDICT_FALSE (cursizep == 0))
+    {
+      api_main_t *am = &api_main;
+      vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
+      unix_shared_memory_queue_t *q;
+
+      if (shmem_hdr == 0)
+	return;
+
+      q = shmem_hdr->vl_input_queue;
+      if (q == 0)
+	return;
+      cursizep = &q->cursize;
+    }
+
+  if (*cursizep >= 1)
+    {
+      vm->queue_signal_pending = 1;
+      vm->api_queue_nonempty = 1;
+      vlib_process_signal_event (vm, memclnt_node.index,
+				 /* event_type */ 0, /* event_data */ 0);
+    }
+}
+
+void
+vl_enable_disable_memory_api (vlib_main_t * vm, int enable)
+{
+  vlib_node_set_state (vm, memclnt_node.index,
+		       (enable
+			? VLIB_NODE_STATE_POLLING
+			: VLIB_NODE_STATE_DISABLED));
+}
+
+static uword
+api_rx_from_node (vlib_main_t * vm,
+		  vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  uword n_packets = frame->n_vectors;
+  uword n_left_from;
+  u32 *from;
+  static u8 *long_msg;
+
+  vec_validate (long_msg, 4095);
+  n_left_from = frame->n_vectors;
+  from = vlib_frame_args (frame);
+
+  while (n_left_from > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      void *msg;
+      uword msg_len;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      from += 1;
+      n_left_from -= 1;
+
+      msg = b0->data + b0->current_data;
+      msg_len = b0->current_length;
+      if (b0->flags & VLIB_BUFFER_NEXT_PRESENT)
+	{
+	  ASSERT (long_msg != 0);
+	  _vec_len (long_msg) = 0;
+	  vec_add (long_msg, msg, msg_len);
+	  while (b0->flags & VLIB_BUFFER_NEXT_PRESENT)
+	    {
+	      b0 = vlib_get_buffer (vm, b0->next_buffer);
+	      msg = b0->data + b0->current_data;
+	      msg_len = b0->current_length;
+	      vec_add (long_msg, msg, msg_len);
+	    }
+	  msg = long_msg;
+	}
+      vl_msg_api_handler_no_trace_no_free (msg);
+    }
+
+  /* Free what we've been given. */
+  vlib_buffer_free (vm, vlib_frame_args (frame), n_packets);
+
+  return n_packets;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (api_rx_from_node_node,static) = {
+    .function = api_rx_from_node,
+    .type = VLIB_NODE_TYPE_INTERNAL,
+    .vector_size = 4,
+    .name = "api-rx-from-node",
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+setup_memclnt_exit (vlib_main_t * vm)
+{
+  atexit (vl_unmap_shmem);
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (setup_memclnt_exit);
+
+
+static clib_error_t *
+vl_api_ring_command (vlib_main_t * vm,
+		     unformat_input_t * input, vlib_cli_command_t * cli_cmd)
+{
+  int i;
+  ring_alloc_t *ap;
+  vl_shmem_hdr_t *shmem_hdr;
+  api_main_t *am = &api_main;
+
+  shmem_hdr = am->shmem_hdr;
+
+  if (shmem_hdr == 0)
+    {
+      vlib_cli_output (vm, "Shared memory segment not initialized...\n");
+      return 0;
+    }
+
+  vlib_cli_output (vm, "%8s %8s %8s %8s %8s\n",
+		   "Owner", "Size", "Nitems", "Hits", "Misses");
+
+  ap = shmem_hdr->vl_rings;
+
+  for (i = 0; i < vec_len (shmem_hdr->vl_rings); i++)
+    {
+      vlib_cli_output (vm, "%8s %8d %8d %8d %8d\n",
+		       "vlib", ap->size, ap->nitems, ap->hits, ap->misses);
+      ap++;
+    }
+
+  ap = shmem_hdr->client_rings;
+
+  for (i = 0; i < vec_len (shmem_hdr->client_rings); i++)
+    {
+      vlib_cli_output (vm, "%8s %8d %8d %8d %8d\n",
+		       "clnt", ap->size, ap->nitems, ap->hits, ap->misses);
+      ap++;
+    }
+
+  vlib_cli_output (vm, "%d ring miss fallback allocations\n",
+		   am->ring_misses);
+
+  vlib_cli_output (vm, "%d application restarts, %d reclaimed msgs\n",
+		   shmem_hdr->application_restarts,
+		   shmem_hdr->restart_reclaims);
+  return 0;
+}
+
+void dump_socket_clients (vlib_main_t * vm, api_main_t * am)
+  __attribute__ ((weak));
+
+void
+dump_socket_clients (vlib_main_t * vm, api_main_t * am)
+{
+}
+
+static clib_error_t *
+vl_api_client_command (vlib_main_t * vm,
+		       unformat_input_t * input, vlib_cli_command_t * cli_cmd)
+{
+  vl_api_registration_t **regpp, *regp;
+  unix_shared_memory_queue_t *q;
+  char *health;
+  api_main_t *am = &api_main;
+  u32 *confused_indices = 0;
+
+  if (!pool_elts (am->vl_clients))
+    goto socket_clients;
+  vlib_cli_output (vm, "Shared memory clients");
+  vlib_cli_output (vm, "%16s %8s %14s %18s %s",
+		   "Name", "PID", "Queue Length", "Queue VA", "Health");
+
+  /* *INDENT-OFF* */
+  pool_foreach (regpp, am->vl_clients,
+  ({
+    regp = *regpp;
+
+    if (regp)
+      {
+        q = regp->vl_input_queue;
+        if (kill (q->consumer_pid, 0) < 0)
+          {
+            health = "DEAD";
+          }
+        else
+          {
+            health = "alive";
+          }
+        vlib_cli_output (vm, "%16s %8d %14d 0x%016llx %s\n",
+                         regp->name, q->consumer_pid, q->cursize,
+                         q, health);
+      }
+    else
+      {
+        clib_warning ("NULL client registration index %d",
+                      regpp - am->vl_clients);
+        vec_add1 (confused_indices, regpp - am->vl_clients);
+      }
+  }));
+  /* *INDENT-ON* */
+
+  /* This should "never happen," but if it does, fix it... */
+  if (PREDICT_FALSE (vec_len (confused_indices) > 0))
+    {
+      int i;
+      for (i = 0; i < vec_len (confused_indices); i++)
+	{
+	  pool_put_index (am->vl_clients, confused_indices[i]);
+	}
+    }
+  vec_free (confused_indices);
+
+  if (am->missing_clients)
+    vlib_cli_output (vm, "%u messages with missing clients",
+		     am->missing_clients);
+socket_clients:
+  dump_socket_clients (vm, am);
+
+  return 0;
+}
+
+static clib_error_t *
+vl_api_status_command (vlib_main_t * vm,
+		       unformat_input_t * input, vlib_cli_command_t * cli_cmd)
+{
+  api_main_t *am = &api_main;
+
+  // check if rx_trace and tx_trace are not null pointers
+
+  if (am->rx_trace == 0)
+    {
+      vlib_cli_output (vm, "RX Trace disabled\n");
+    }
+  else
+    {
+      if (am->rx_trace->enabled == 0)
+	vlib_cli_output (vm, "RX Trace disabled\n");
+      else
+	vlib_cli_output (vm, "RX Trace enabled\n");
+    }
+
+  if (am->tx_trace == 0)
+    {
+      vlib_cli_output (vm, "TX Trace disabled\n");
+    }
+  else
+    {
+      if (am->tx_trace->enabled == 0)
+	vlib_cli_output (vm, "TX Trace disabled\n");
+      else
+	vlib_cli_output (vm, "TX Trace enabled\n");
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_show_api_command, static) = {
+    .path = "show api",
+    .short_help = "Show API information",
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_show_api_ring_command, static) = {
+    .path = "show api ring-stats",
+    .short_help = "Message ring statistics",
+    .function = vl_api_ring_command,
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_show_api_clients_command, static) = {
+    .path = "show api clients",
+    .short_help = "Client information",
+    .function = vl_api_client_command,
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_show_api_status_command, static) = {
+    .path = "show api status",
+    .short_help = "Show API trace status",
+    .function = vl_api_status_command,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+vl_api_message_table_command (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cli_cmd)
+{
+  api_main_t *am = &api_main;
+  int i;
+  int verbose = 0;
+
+  if (unformat (input, "verbose"))
+    verbose = 1;
+
+
+  if (verbose == 0)
+    vlib_cli_output (vm, "%-4s %s", "ID", "Name");
+  else
+    vlib_cli_output (vm, "%-4s %-40s %6s %7s", "ID", "Name", "Bounce",
+		     "MP-safe");
+
+  for (i = 1; i < vec_len (am->msg_names); i++)
+    {
+      if (verbose == 0)
+	{
+	  vlib_cli_output (vm, "%-4d %s", i,
+			   am->msg_names[i] ? am->msg_names[i] :
+			   "  [no handler]");
+	}
+      else
+	{
+	  vlib_cli_output (vm, "%-4d %-40s %6d %7d", i,
+			   am->msg_names[i] ? am->msg_names[i] :
+			   "  [no handler]", am->message_bounce[i],
+			   am->is_mp_safe[i]);
+	}
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_show_api_message_table_command, static) = {
+    .path = "show api message-table",
+    .short_help = "Message Table",
+    .function = vl_api_message_table_command,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+vl_api_trace_command (vlib_main_t * vm,
+		      unformat_input_t * input, vlib_cli_command_t * cli_cmd)
+{
+  u32 nitems = 1024;
+  vl_api_trace_which_t which = VL_API_TRACE_RX;
+  api_main_t *am = &api_main;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "rx nitems %u", &nitems) || unformat (input, "rx"))
+	goto configure;
+      else if (unformat (input, "tx nitems %u", &nitems)
+	       || unformat (input, "tx"))
+	{
+	  which = VL_API_TRACE_RX;
+	  goto configure;
+	}
+      else if (unformat (input, "on rx"))
+	{
+	  vl_msg_api_trace_onoff (am, VL_API_TRACE_RX, 1);
+	}
+      else if (unformat (input, "on tx"))
+	{
+	  vl_msg_api_trace_onoff (am, VL_API_TRACE_TX, 1);
+	}
+      else if (unformat (input, "on"))
+	{
+	  vl_msg_api_trace_onoff (am, VL_API_TRACE_RX, 1);
+	}
+      else if (unformat (input, "off"))
+	{
+	  vl_msg_api_trace_onoff (am, VL_API_TRACE_RX, 0);
+	  vl_msg_api_trace_onoff (am, VL_API_TRACE_TX, 0);
+	}
+      else if (unformat (input, "free"))
+	{
+	  vl_msg_api_trace_onoff (am, VL_API_TRACE_RX, 0);
+	  vl_msg_api_trace_onoff (am, VL_API_TRACE_TX, 0);
+	  vl_msg_api_trace_free (am, VL_API_TRACE_RX);
+	  vl_msg_api_trace_free (am, VL_API_TRACE_TX);
+	}
+      else if (unformat (input, "debug on"))
+	{
+	  am->msg_print_flag = 1;
+	}
+      else if (unformat (input, "debug off"))
+	{
+	  am->msg_print_flag = 0;
+	}
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  return 0;
+
+configure:
+  if (vl_msg_api_trace_configure (am, which, nitems))
+    {
+      vlib_cli_output (vm, "warning: trace configure error (%d, %d)",
+		       which, nitems);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (trace, static) = {
+    .path = "set api-trace",
+    .short_help = "API trace",
+    .function = vl_api_trace_command,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+vlibmemory_init (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+  svm_map_region_args_t _a, *a = &_a;
+
+  memset (a, 0, sizeof (*a));
+  a->root_path = am->root_path;
+  a->name = SVM_GLOBAL_REGION_NAME;
+  a->baseva = (am->global_baseva != 0) ?
+    am->global_baseva : SVM_GLOBAL_REGION_BASEVA;
+  a->size = (am->global_size != 0) ? am->global_size : SVM_GLOBAL_REGION_SIZE;
+  a->flags = SVM_FLAGS_NODATA;
+  a->uid = am->api_uid;
+  a->gid = am->api_gid;
+  a->pvt_heap_size =
+    (am->global_pvt_heap_size !=
+     0) ? am->global_pvt_heap_size : SVM_PVT_MHEAP_SIZE;
+
+  svm_region_init_args (a);
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (vlibmemory_init);
+
+void
+vl_set_memory_region_name (char *name)
+{
+  api_main_t *am = &api_main;
+
+  am->region_name = name;
+}
+
+static int
+range_compare (vl_api_msg_range_t * a0, vl_api_msg_range_t * a1)
+{
+  int len0, len1, clen;
+
+  len0 = vec_len (a0->name);
+  len1 = vec_len (a1->name);
+  clen = len0 < len1 ? len0 : len1;
+  return (strncmp ((char *) a0->name, (char *) a1->name, clen));
+}
+
+static u8 *
+format_api_msg_range (u8 * s, va_list * args)
+{
+  vl_api_msg_range_t *rp = va_arg (*args, vl_api_msg_range_t *);
+
+  if (rp == 0)
+    s = format (s, "%-20s%9s%9s", "Name", "First-ID", "Last-ID");
+  else
+    s = format (s, "%-20s%9d%9d", rp->name, rp->first_msg_id,
+		rp->last_msg_id);
+
+  return s;
+}
+
+static clib_error_t *
+vl_api_show_plugin_command (vlib_main_t * vm,
+			    unformat_input_t * input,
+			    vlib_cli_command_t * cli_cmd)
+{
+  api_main_t *am = &api_main;
+  vl_api_msg_range_t *rp = 0;
+  int i;
+
+  if (vec_len (am->msg_ranges) == 0)
+    {
+      vlib_cli_output (vm, "No plugin API message ranges configured...");
+      return 0;
+    }
+
+  rp = vec_dup (am->msg_ranges);
+
+  vec_sort_with_function (rp, range_compare);
+
+  vlib_cli_output (vm, "Plugin API message ID ranges...\n");
+  vlib_cli_output (vm, "%U", format_api_msg_range, 0 /* header */ );
+
+  for (i = 0; i < vec_len (rp); i++)
+    vlib_cli_output (vm, "%U", format_api_msg_range, rp + i);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cli_show_api_plugin_command, static) = {
+    .path = "show api plugin",
+    .short_help = "show api plugin",
+    .function = vl_api_show_plugin_command,
+};
+/* *INDENT-ON* */
+
+static void
+vl_api_rpc_call_t_handler (vl_api_rpc_call_t * mp)
+{
+  vl_api_rpc_reply_t *rmp;
+  int (*fp) (void *);
+  i32 rv = 0;
+  vlib_main_t *vm = vlib_get_main ();
+
+  if (mp->function == 0)
+    {
+      rv = -1;
+      clib_warning ("rpc NULL function pointer");
+    }
+
+  else
+    {
+      if (mp->need_barrier_sync)
+	vlib_worker_thread_barrier_sync (vm);
+
+      fp = uword_to_pointer (mp->function, int (*)(void *));
+      rv = fp (mp->data);
+
+      if (mp->need_barrier_sync)
+	vlib_worker_thread_barrier_release (vm);
+    }
+
+  if (mp->send_reply)
+    {
+      unix_shared_memory_queue_t *q =
+	vl_api_client_index_to_input_queue (mp->client_index);
+      if (q)
+	{
+	  rmp = vl_msg_api_alloc_as_if_client (sizeof (*rmp));
+	  rmp->_vl_msg_id = ntohs (VL_API_RPC_REPLY);
+	  rmp->context = mp->context;
+	  rmp->retval = rv;
+	  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+	}
+    }
+  if (mp->multicast)
+    {
+      clib_warning ("multicast not yet implemented...");
+    }
+}
+
+static void
+vl_api_rpc_reply_t_handler (vl_api_rpc_reply_t * mp)
+{
+  clib_warning ("unimplemented");
+}
+
+void
+vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length)
+{
+  vl_api_rpc_call_t *mp;
+  api_main_t *am = &api_main;
+  vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
+  unix_shared_memory_queue_t *q;
+
+  /* Main thread: call the function directly */
+  if (os_get_cpu_number () == 0)
+    {
+      vlib_main_t *vm = vlib_get_main ();
+      void (*call_fp) (void *);
+
+      vlib_worker_thread_barrier_sync (vm);
+
+      call_fp = fp;
+      call_fp (data);
+
+      vlib_worker_thread_barrier_release (vm);
+      return;
+    }
+
+  /* Any other thread, actually do an RPC call... */
+  mp = vl_msg_api_alloc_as_if_client (sizeof (*mp) + data_length);
+
+  memset (mp, 0, sizeof (*mp));
+  clib_memcpy (mp->data, data, data_length);
+  mp->_vl_msg_id = ntohs (VL_API_RPC_CALL);
+  mp->function = pointer_to_uword (fp);
+  mp->need_barrier_sync = 1;
+
+  /*
+   * Use the "normal" control-plane mechanism for the main thread.
+   * Well, almost. if the main input queue is full, we cannot
+   * block. Otherwise, we can expect a barrier sync timeout.
+   */
+  q = shmem_hdr->vl_input_queue;
+
+  while (pthread_mutex_trylock (&q->mutex))
+    vlib_worker_thread_barrier_check ();
+
+  while (PREDICT_FALSE (unix_shared_memory_queue_is_full (q)))
+    {
+      pthread_mutex_unlock (&q->mutex);
+      vlib_worker_thread_barrier_check ();
+      while (pthread_mutex_trylock (&q->mutex))
+	vlib_worker_thread_barrier_check ();
+    }
+
+  vl_msg_api_send_shmem_nolock (q, (u8 *) & mp);
+
+  pthread_mutex_unlock (&q->mutex);
+}
+
+#define foreach_rpc_api_msg                     \
+_(RPC_CALL,rpc_call)                            \
+_(RPC_REPLY,rpc_reply)
+
+static clib_error_t *
+rpc_api_hookup (vlib_main_t * vm)
+{
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_noop_handler,			\
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 0 /* do not trace */);
+  foreach_rpc_api_msg;
+#undef _
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (rpc_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibmemory/unix_shared_memory_queue.c b/src/vlibmemory/unix_shared_memory_queue.c
new file mode 100644
index 00000000..25d28910
--- /dev/null
+++ b/src/vlibmemory/unix_shared_memory_queue.c
@@ -0,0 +1,324 @@
+/*
+ *------------------------------------------------------------------
+ * unix_shared_memory_queue.c - unidirectional shared-memory queues
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <pthread.h>
+#include <vppinfra/mem.h>
+#include <vppinfra/format.h>
+#include <vppinfra/cache.h>
+#include <vlibmemory/unix_shared_memory_queue.h>
+#include <signal.h>
+
+/*
+ * unix_shared_memory_queue_init
+ *
+ * nels = number of elements on the queue
+ * elsize = element size, presumably 4 and cacheline-size will
+ *          be popular choices.
+ * coid  = consumer coid, from ChannelCreate
+ * pid   = consumer pid
+ * pulse_code  = pulse code consumer expects
+ * pulse_value = pulse value consumer expects
+ * consumer_prio = consumer's priority, so pulses won't change
+ *                 the consumer's priority.
+ *
+ * The idea is to call this function in the queue consumer,
+ * and e-mail the queue pointer to the producer(s).
+ *
+ * The spp process / main thread allocates one of these
+ * at startup; its main input queue. The spp main input queue
+ * has a pointer to it in the shared memory segment header.
+ *
+ * You probably want to be on an svm data heap before calling this
+ * function.
+ */
+unix_shared_memory_queue_t *
+unix_shared_memory_queue_init (int nels,
+			       int elsize,
+			       int consumer_pid,
+			       int signal_when_queue_non_empty)
+{
+  unix_shared_memory_queue_t *q;
+  pthread_mutexattr_t attr;
+  pthread_condattr_t cattr;
+
+  q = clib_mem_alloc_aligned (sizeof (unix_shared_memory_queue_t)
+			      + nels * elsize, CLIB_CACHE_LINE_BYTES);
+  memset (q, 0, sizeof (*q));
+
+  q->elsize = elsize;
+  q->maxsize = nels;
+  q->consumer_pid = consumer_pid;
+  q->signal_when_queue_non_empty = signal_when_queue_non_empty;
+
+  memset (&attr, 0, sizeof (attr));
+  memset (&cattr, 0, sizeof (attr));
+
+  if (pthread_mutexattr_init (&attr))
+    clib_unix_warning ("mutexattr_init");
+  if (pthread_mutexattr_setpshared (&attr, PTHREAD_PROCESS_SHARED))
+    clib_unix_warning ("pthread_mutexattr_setpshared");
+  if (pthread_mutex_init (&q->mutex, &attr))
+    clib_unix_warning ("mutex_init");
+  if (pthread_mutexattr_destroy (&attr))
+    clib_unix_warning ("mutexattr_destroy");
+  if (pthread_condattr_init (&cattr))
+    clib_unix_warning ("condattr_init");
+  /* prints funny-looking messages in the Linux target */
+  if (pthread_condattr_setpshared (&cattr, PTHREAD_PROCESS_SHARED))
+    clib_unix_warning ("condattr_setpshared");
+  if (pthread_cond_init (&q->condvar, &cattr))
+    clib_unix_warning ("cond_init1");
+  if (pthread_condattr_destroy (&cattr))
+    clib_unix_warning ("cond_init2");
+
+  return (q);
+}
+
+/*
+ * unix_shared_memory_queue_free
+ */
+void
+unix_shared_memory_queue_free (unix_shared_memory_queue_t * q)
+{
+  (void) pthread_mutex_destroy (&q->mutex);
+  (void) pthread_cond_destroy (&q->condvar);
+  clib_mem_free (q);
+}
+
+void
+unix_shared_memory_queue_lock (unix_shared_memory_queue_t * q)
+{
+  pthread_mutex_lock (&q->mutex);
+}
+
+void
+unix_shared_memory_queue_unlock (unix_shared_memory_queue_t * q)
+{
+  pthread_mutex_unlock (&q->mutex);
+}
+
+int
+unix_shared_memory_queue_is_full (unix_shared_memory_queue_t * q)
+{
+  return q->cursize == q->maxsize;
+}
+
+/*
+ * unix_shared_memory_queue_add_nolock
+ */
+int
+unix_shared_memory_queue_add_nolock (unix_shared_memory_queue_t * q,
+				     u8 * elem)
+{
+  i8 *tailp;
+  int need_broadcast = 0;
+
+  if (PREDICT_FALSE (q->cursize == q->maxsize))
+    {
+      while (q->cursize == q->maxsize)
+	{
+	  (void) pthread_cond_wait (&q->condvar, &q->mutex);
+	}
+    }
+
+  tailp = (i8 *) (&q->data[0] + q->elsize * q->tail);
+  clib_memcpy (tailp, elem, q->elsize);
+
+  q->tail++;
+  q->cursize++;
+
+  need_broadcast = (q->cursize == 1);
+
+  if (q->tail == q->maxsize)
+    q->tail = 0;
+
+  if (need_broadcast)
+    {
+      (void) pthread_cond_broadcast (&q->condvar);
+      if (q->signal_when_queue_non_empty)
+	kill (q->consumer_pid, q->signal_when_queue_non_empty);
+    }
+  return 0;
+}
+
+int
+unix_shared_memory_queue_add_raw (unix_shared_memory_queue_t * q, u8 * elem)
+{
+  i8 *tailp;
+
+  if (PREDICT_FALSE (q->cursize == q->maxsize))
+    {
+      while (q->cursize == q->maxsize)
+	;
+    }
+
+  tailp = (i8 *) (&q->data[0] + q->elsize * q->tail);
+  clib_memcpy (tailp, elem, q->elsize);
+
+  q->tail++;
+  q->cursize++;
+
+  if (q->tail == q->maxsize)
+    q->tail = 0;
+  return 0;
+}
+
+
+/*
+ * unix_shared_memory_queue_add
+ */
+int
+unix_shared_memory_queue_add (unix_shared_memory_queue_t * q,
+			      u8 * elem, int nowait)
+{
+  i8 *tailp;
+  int need_broadcast = 0;
+
+  if (nowait)
+    {
+      /* zero on success */
+      if (pthread_mutex_trylock (&q->mutex))
+	{
+	  return (-1);
+	}
+    }
+  else
+    pthread_mutex_lock (&q->mutex);
+
+  if (PREDICT_FALSE (q->cursize == q->maxsize))
+    {
+      if (nowait)
+	{
+	  pthread_mutex_unlock (&q->mutex);
+	  return (-2);
+	}
+      while (q->cursize == q->maxsize)
+	{
+	  (void) pthread_cond_wait (&q->condvar, &q->mutex);
+	}
+    }
+
+  tailp = (i8 *) (&q->data[0] + q->elsize * q->tail);
+  clib_memcpy (tailp, elem, q->elsize);
+
+  q->tail++;
+  q->cursize++;
+
+  need_broadcast = (q->cursize == 1);
+
+  if (q->tail == q->maxsize)
+    q->tail = 0;
+
+  if (need_broadcast)
+    {
+      (void) pthread_cond_broadcast (&q->condvar);
+      if (q->signal_when_queue_non_empty)
+	kill (q->consumer_pid, q->signal_when_queue_non_empty);
+    }
+  pthread_mutex_unlock (&q->mutex);
+
+  return 0;
+}
+
+/*
+ * unix_shared_memory_queue_sub
+ */
+int
+unix_shared_memory_queue_sub (unix_shared_memory_queue_t * q,
+			      u8 * elem, int nowait)
+{
+  i8 *headp;
+  int need_broadcast = 0;
+
+  if (nowait)
+    {
+      /* zero on success */
+      if (pthread_mutex_trylock (&q->mutex))
+	{
+	  return (-1);
+	}
+    }
+  else
+    pthread_mutex_lock (&q->mutex);
+
+  if (PREDICT_FALSE (q->cursize == 0))
+    {
+      if (nowait)
+	{
+	  pthread_mutex_unlock (&q->mutex);
+	  return (-2);
+	}
+      while (q->cursize == 0)
+	{
+	  (void) pthread_cond_wait (&q->condvar, &q->mutex);
+	}
+    }
+
+  headp = (i8 *) (&q->data[0] + q->elsize * q->head);
+  clib_memcpy (elem, headp, q->elsize);
+
+  q->head++;
+  if (q->cursize == q->maxsize)
+    need_broadcast = 1;
+
+  q->cursize--;
+
+  if (q->head == q->maxsize)
+    q->head = 0;
+
+  if (need_broadcast)
+    (void) pthread_cond_broadcast (&q->condvar);
+
+  pthread_mutex_unlock (&q->mutex);
+
+  return 0;
+}
+
+int
+unix_shared_memory_queue_sub_raw (unix_shared_memory_queue_t * q, u8 * elem)
+{
+  i8 *headp;
+
+  if (PREDICT_FALSE (q->cursize == 0))
+    {
+      while (q->cursize == 0)
+	;
+    }
+
+  headp = (i8 *) (&q->data[0] + q->elsize * q->head);
+  clib_memcpy (elem, headp, q->elsize);
+
+  q->head++;
+  q->cursize--;
+
+  if (q->head == q->maxsize)
+    q->head = 0;
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibmemory/unix_shared_memory_queue.h b/src/vlibmemory/unix_shared_memory_queue.h
new file mode 100644
index 00000000..f758f17c
--- /dev/null
+++ b/src/vlibmemory/unix_shared_memory_queue.h
@@ -0,0 +1,69 @@
+/*
+ *------------------------------------------------------------------
+ * unix_shared_memory_queue.h - shared-memory queues
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef included_unix_shared_memory_queue_h
+#define included_unix_shared_memory_queue_h
+
+#include <pthread.h>
+#include <vppinfra/mem.h>
+
+typedef struct _unix_shared_memory_queue
+{
+  pthread_mutex_t mutex;	/* 8 bytes */
+  pthread_cond_t condvar;	/* 8 bytes */
+  int head;
+  int tail;
+  int cursize;
+  int maxsize;
+  int elsize;
+  int consumer_pid;
+  int signal_when_queue_non_empty;
+  char data[0];
+} unix_shared_memory_queue_t;
+
+unix_shared_memory_queue_t *unix_shared_memory_queue_init (int nels,
+							   int elsize,
+							   int consumer_pid,
+							   int
+							   signal_when_queue_non_empty);
+void unix_shared_memory_queue_free (unix_shared_memory_queue_t * q);
+int unix_shared_memory_queue_add (unix_shared_memory_queue_t * q,
+				  u8 * elem, int nowait);
+int unix_shared_memory_queue_sub (unix_shared_memory_queue_t * q,
+				  u8 * elem, int nowait);
+void unix_shared_memory_queue_lock (unix_shared_memory_queue_t * q);
+void unix_shared_memory_queue_unlock (unix_shared_memory_queue_t * q);
+int unix_shared_memory_queue_is_full (unix_shared_memory_queue_t * q);
+int unix_shared_memory_queue_add_nolock (unix_shared_memory_queue_t * q,
+					 u8 * elem);
+
+int unix_shared_memory_queue_sub_raw (unix_shared_memory_queue_t * q,
+				      u8 * elem);
+int unix_shared_memory_queue_add_raw (unix_shared_memory_queue_t * q,
+				      u8 * elem);
+
+#endif /* included_unix_shared_memory_queue_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibmemory/vl_memory_api_h.h b/src/vlibmemory/vl_memory_api_h.h
new file mode 100644
index 00000000..c1ae79b1
--- /dev/null
+++ b/src/vlibmemory/vl_memory_api_h.h
@@ -0,0 +1,32 @@
+/*
+ *------------------------------------------------------------------
+ * vl_memory_api_h.h - memory API headers, in a specific order.
+ *
+ * Copyright (c) 2009-2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+/*
+ * Add to the bottom of the #include list, or elves will steal your
+ * keyboard in the middle of the night!
+ */
+#include <vlibmemory/memclnt.api.h>
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibmemory/vl_memory_msg_enum.h b/src/vlibmemory/vl_memory_msg_enum.h
new file mode 100644
index 00000000..974c0c21
--- /dev/null
+++ b/src/vlibmemory/vl_memory_msg_enum.h
@@ -0,0 +1,42 @@
+/*
+ *------------------------------------------------------------------
+ * vl_memory_msg_enum.h - Our view of how to number API messages
+ * Clients have their own view, which has to agree with ours.
+ *
+ * Copyright (c) 2009-2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef __VL_MSG_ENUM_H__
+#define __VL_MSG_ENUM_H__
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum
+{
+  VL_ILLEGAL_MESSAGE_ID = 0,
+#include <vlibmemory/vl_memory_api_h.h>
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif /* __VL_MSG_ENUM_H__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibsocket/api.h b/src/vlibsocket/api.h
new file mode 100644
index 00000000..79c0d08a
--- /dev/null
+++ b/src/vlibsocket/api.h
@@ -0,0 +1,87 @@
+/*
+ *------------------------------------------------------------------
+ * api.h
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef included_vlibsocket_api_h
+#define included_vlibsocket_api_h
+
+#include <vlibapi/api.h>
+
+typedef struct
+{
+  /* Server port number */
+  int portno;
+
+  /* By default, localhost... */
+  u32 bind_address;
+
+  /*
+   * (listen, server, client) registrations. Shared memory
+   * registrations are in shared memory
+   */
+  vl_api_registration_t *registration_pool;
+  /*
+   * Chain-drag variables, so message API handlers
+   * (generally) don't know whether they're talking to a socket
+   * or to a shared-memory connection.
+   */
+  vl_api_registration_t *current_rp;
+  unix_file_t *current_uf;
+  /* One input buffer, shared across all sockets */
+  i8 *input_buffer;
+} socket_main_t;
+
+extern socket_main_t socket_main;
+
+void socksvr_add_pending_output (struct unix_file *uf,
+				 struct vl_api_registration_ *cf,
+				 u8 * buffer, uword buffer_bytes);
+
+#define SOCKSVR_DEFAULT_PORT 32741	/* whatever */
+
+void vl_free_socket_registration_index (u32 pool_index);
+void vl_socket_process_msg (struct unix_file *uf,
+			    struct vl_api_registration_ *rp, i8 * input_v);
+clib_error_t *vl_socket_read_ready (struct unix_file *uf);
+void vl_socket_add_pending_output (struct unix_file *uf,
+				   struct vl_api_registration_ *rp,
+				   u8 * buffer, uword buffer_bytes);
+clib_error_t *vl_socket_write_ready (struct unix_file *uf);
+void vl_socket_api_send (vl_api_registration_t * rp, u8 * elem);
+void vl_socket_api_send_with_data (vl_api_registration_t * rp,
+				   u8 * elem, u8 * data_vector);
+void vl_socket_api_send_with_length (vl_api_registration_t * rp,
+				     u8 * elem, u32 msg_length);
+void vl_socket_api_send_with_length_no_free (vl_api_registration_t * rp,
+					     u8 * elem, u32 msg_length);
+u32 sockclnt_open_index (char *client_name, char *hostname, int port);
+void sockclnt_close_index (u32 index);
+void vl_client_msg_api_send (vl_api_registration_t * cm, u8 * elem);
+vl_api_registration_t *sockclnt_get_registration (u32 index);
+void socksvr_set_port (u16 port);
+void socksvr_set_bind_address (u32 bind_address);
+
+#endif /* included_vlibsocket_api_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibsocket/sock_test.c b/src/vlibsocket/sock_test.c
new file mode 100644
index 00000000..3bded08f
--- /dev/null
+++ b/src/vlibsocket/sock_test.c
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+
+#define SOCKCLNT_SERVER_PORT 32741	/* whatever */
+
+typedef signed char i8;
+typedef signed short i16;
+typedef signed int i32;
+typedef signed long long i64;
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned int u32;
+typedef unsigned long long u64;
+typedef unsigned long uword;
+
+#define VL_API_PACKED(x) x __attribute__ ((packed))
+
+typedef VL_API_PACKED (struct _vl_api_sockclnt_create
+		       {
+		       u16 _vl_msg_id; u8 name[64];
+		       u32 context;
+		       }) vl_api_sockclnt_create_t;
+
+typedef VL_API_PACKED (struct _vl_api_sockclnt_create_reply
+		       {
+		       u16 _vl_msg_id;
+		       i32 response; u64 handle; u32 index; u32 context;
+		       }) vl_api_sockclnt_create_reply_t;
+
+typedef VL_API_PACKED (struct _vl_api_sockclnt_delete
+		       {
+		       u16 _vl_msg_id; u32 index;
+		       u64 handle;
+		       }) vl_api_sockclnt_delete_t;
+
+typedef VL_API_PACKED (struct _vl_api_sockclnt_delete_reply
+		       {
+		       u16 _vl_msg_id; i32 response; u64 handle;
+		       }) vl_api_sockclnt_delete_reply_t;
+
+void
+error (char *msg)
+{
+  perror (msg);
+  exit (0);
+}
+
+int
+main (int argc, char *argv[])
+{
+  int sockfd, portno, n;
+  struct sockaddr_in serv_addr;
+  struct hostent *server;
+  char buffer[256];
+  int i;
+  u32 nbytes;
+  vl_api_sockclnt_create_t *mp;
+  vl_api_sockclnt_create_reply_t *rp;
+  char *rdptr;
+  int total_bytes;
+
+  for (i = 0; i < 1; i++)
+    {
+      portno = SOCKCLNT_SERVER_PORT;
+      sockfd = socket (AF_INET, SOCK_STREAM, 0);
+      if (sockfd < 0)
+	error ("ERROR opening socket");
+      server = gethostbyname ("localhost");
+      if (server == NULL)
+	{
+	  fprintf (stderr, "ERROR, no such host\n");
+	  exit (0);
+	}
+      bzero ((char *) &serv_addr, sizeof (serv_addr));
+      serv_addr.sin_family = AF_INET;
+      bcopy ((char *) server->h_addr,
+	     (char *) &serv_addr.sin_addr.s_addr, server->h_length);
+      serv_addr.sin_port = htons (portno);
+      if (connect (sockfd, (const void *) &serv_addr, sizeof (serv_addr)) < 0)
+	error ("ERROR connecting");
+
+      memset (buffer, 0, sizeof (buffer));
+
+      mp = (vl_api_sockclnt_create_t *) buffer;
+      mp->_vl_msg_id = ntohs (8);	/* VL_API_SOCKCLNT_CREATE */
+      strncpy ((char *) mp->name, "socket-test", sizeof (mp->name) - 1);
+      mp->name[sizeof (mp->name) - 1] = 0;
+      mp->context = 0xfeedface;
+      /* length of the message, including the length itself */
+      nbytes = sizeof (*mp) + sizeof (nbytes);
+      nbytes = ntohl (nbytes);
+      n = write (sockfd, &nbytes, sizeof (nbytes));
+      if (n < 0)
+	error ("ERROR writing len to socket");
+      n = write (sockfd, mp, sizeof (*mp));
+      if (n < 0)
+	error ("ERROR writing msg to socket");
+
+      memset (buffer, 0, sizeof (buffer));
+
+      total_bytes = 0;
+      rdptr = buffer;
+      do
+	{
+	  n = read (sockfd, rdptr, sizeof (buffer) - (rdptr - buffer));
+	  if (n < 0)
+	    error ("ERROR reading from socket");
+	  printf ("read %d bytes\n", n);
+	  total_bytes += n;
+	  rdptr += n;
+	}
+      while (total_bytes < sizeof (vl_api_sockclnt_create_reply_t) + 4);
+
+      rp = (vl_api_sockclnt_create_reply_t *) (buffer + 4);
+      /* VL_API_SOCKCLNT_CREATE_REPLY */
+      if (ntohs (rp->_vl_msg_id) != 9)
+	{
+	  printf ("WARNING: msg id %d\n", ntohs (rp->_vl_msg_id));
+	}
+
+      printf ("response %d, handle 0x%llx, index %d, context 0x%x\n",
+	      ntohl (rp->response), rp->handle, rp->index, rp->context);
+      close (sockfd);
+    }
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibsocket/sockclnt.api b/src/vlibsocket/sockclnt.api
new file mode 100644
index 00000000..e0a7505f
--- /dev/null
+++ b/src/vlibsocket/sockclnt.api
@@ -0,0 +1,50 @@
+/* Hey Emacs use -*- mode: C -*- */
+
+/* 
+ *------------------------------------------------------------------
+ * sockclnt.api - API message(s) to hook up clients, pass traffic
+ * to client processes via TCP sockets
+ * 
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+/*
+ * Create a socket client registration 
+ */
+define sockclnt_create {
+    u8 name[64];                /* for show, find by name, whatever */
+    u32 context;                /* opaque value to be returned in the reply */
+};
+
+define sockclnt_create_reply {
+    i32 response;               /* Non-negative = success */
+    u64 handle;           	/* handle by which vlib knows this client */
+    u32 index;                  /* index, used e.g. by API trace replay */
+    u32 context;                /* opaque value from the create request */
+};
+
+/*
+ * Delete a client registration 
+ */
+define sockclnt_delete {
+    u32 index;                  /* index, used e.g. by API trace replay */
+    u64 handle;               	/* handle by which vlib knows this client */
+};
+
+define sockclnt_delete_reply {
+    i32 response;               /* Non-negative = success */
+    u64 handle;               	/* in case the client wonders */
+};
+
diff --git a/src/vlibsocket/sockclnt_vlib.c b/src/vlibsocket/sockclnt_vlib.c
new file mode 100644
index 00000000..e16adfeb
--- /dev/null
+++ b/src/vlibsocket/sockclnt_vlib.c
@@ -0,0 +1,209 @@
+/*
+ *------------------------------------------------------------------
+ * sockclnt_vlib.c
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <unistd.h>
+#include <netinet/in.h>
+#include <sys/ioctl.h>
+#include <vppinfra/byte_order.h>
+#include <netdb.h>
+
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+
+#include <vlibsocket/vl_socket_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vlibsocket/vl_socket_api_h.h>
+#undef vl_typedefs
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vlibsocket/vl_socket_api_h.h>
+#undef vl_printfun
+
+/* instantiate all the endian swap functions we know about */
+#define vl_endianfun
+#include <vlibsocket/vl_socket_api_h.h>
+#undef vl_endianfun
+
+static void
+vl_api_sockclnt_create_reply_t_handler (vl_api_sockclnt_create_reply_t * mp)
+{
+  vl_api_registration_t *rp = socket_main.current_rp;
+
+  rp->server_handle = mp->handle;
+  rp->server_index = mp->index;
+}
+
+static void
+vl_api_sockclnt_delete_reply_t_handler (vl_api_sockclnt_delete_reply_t * mp)
+{
+  unix_main_t *um = &unix_main;
+  unix_file_t *uf = socket_main.current_uf;
+  vl_api_registration_t *rp = socket_main.current_rp;
+
+  unix_file_del (um, uf);
+  vl_free_socket_registration_index (rp->vl_api_registration_pool_index);
+}
+
+u32
+sockclnt_open_index (char *client_name, char *hostname, int port)
+{
+  vl_api_registration_t *rp;
+  unix_main_t *um = &unix_main;
+  unix_file_t template = { 0 };
+  int sockfd;
+  int one = 1;
+  int rv;
+  struct sockaddr_in serv_addr;
+  struct hostent *server;
+  vl_api_sockclnt_create_t *mp;
+  char my_hostname[64];
+
+  server = gethostbyname (hostname);
+  if (server == NULL)
+    {
+      clib_warning ("Couldn't translate server name %s", hostname);
+      return ~0;
+    }
+
+  /* Set up non-blocking server socket on CLIENT_API_SERVER_PORT */
+  sockfd = socket (AF_INET, SOCK_STREAM, 0);
+
+  if (sockfd < 0)
+    {
+      clib_unix_warning ("socket");
+      return ~0;
+    }
+
+  bzero ((char *) &serv_addr, sizeof (serv_addr));
+  serv_addr.sin_family = AF_INET;
+  bcopy ((char *) server->h_addr,
+	 (char *) &serv_addr.sin_addr.s_addr, server->h_length);
+  serv_addr.sin_port = htons (port);
+
+  if (connect (sockfd, (const void *) &serv_addr, sizeof (serv_addr)) < 0)
+    {
+      clib_unix_warning ("Connect failure to (%s, %d)", hostname, port);
+      close (sockfd);
+      return ~0;
+    }
+
+  rv = ioctl (sockfd, FIONBIO, &one);
+  if (rv < 0)
+    {
+      clib_unix_warning ("FIONBIO");
+      close (sockfd);
+      return ~0;
+    }
+
+  pool_get (socket_main.registration_pool, rp);
+  memset (rp, 0, sizeof (*rp));
+  rp->registration_type = REGISTRATION_TYPE_SOCKET_CLIENT;
+  rp->vl_api_registration_pool_index = rp - socket_main.registration_pool;
+
+  template.read_function = vl_socket_read_ready;
+  template.write_function = vl_socket_write_ready;
+  template.file_descriptor = sockfd;
+  template.private_data = rp - socket_main.registration_pool;
+
+  rp->unix_file_index = unix_file_add (um, &template);
+  rp->name = format (0, "%s:%d", hostname, port);
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SOCKCLNT_CREATE);
+  mp->context = rp - socket_main.registration_pool;
+
+  if (gethostname (my_hostname, sizeof (my_hostname)) < 0)
+    {
+      clib_unix_warning ("gethostname");
+      strncpy (my_hostname, "unknown!", sizeof (my_hostname) - 1);
+    }
+  strncpy ((char *) mp->name, my_hostname, sizeof (mp->name) - 1);
+
+  vl_msg_api_send (rp, (u8 *) mp);
+  return rp - socket_main.registration_pool;
+}
+
+void
+sockclnt_close_index (u32 index)
+{
+  vl_api_sockclnt_delete_t *mp;
+  vl_api_registration_t *rp;
+
+  /* Don't crash / assert if fed garbage */
+  if (pool_is_free_index (socket_main.registration_pool, index))
+    {
+      clib_warning ("registration_pool index %d already free", index);
+      return;
+    }
+  rp = pool_elt_at_index (socket_main.registration_pool, index);
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SOCKCLNT_DELETE);
+  mp->handle = rp->server_handle;
+  mp->index = rp->server_index;
+  vl_msg_api_send (rp, (u8 *) mp);
+}
+
+vl_api_registration_t *
+sockclnt_get_registration (u32 index)
+{
+  return pool_elt_at_index (socket_main.registration_pool, index);
+}
+
+/*
+ * Both rx and tx msgs MUST be initialized, or we'll have
+ * precisely no idea how many bytes to write into the API trace...
+ */
+#define foreach_sockclnt_api_msg                        \
+_(SOCKCLNT_CREATE_REPLY, sockclnt_create_reply)         \
+_(SOCKCLNT_DELETE_REPLY, sockclnt_delete_reply)
+
+
+static clib_error_t *
+sockclnt_vlib_api_init (vlib_main_t * vm)
+{
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_sockclnt_api_msg;
+#undef _
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (sockclnt_vlib_api_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibsocket/socksvr_vlib.c b/src/vlibsocket/socksvr_vlib.c
new file mode 100644
index 00000000..dc8c63eb
--- /dev/null
+++ b/src/vlibsocket/socksvr_vlib.c
@@ -0,0 +1,706 @@
+/*
+ *------------------------------------------------------------------
+ * socksvr_vlib.c
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <sys/ioctl.h>
+#include <vppinfra/byte_order.h>
+
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include <vlibsocket/api.h>
+#include <vlibmemory/api.h>
+
+#include <vlibsocket/vl_socket_msg_enum.h>	/* enumerate all vlib messages */
+
+#define vl_typedefs		/* define message structures */
+#include <vlibsocket/vl_socket_api_h.h>
+#undef vl_typedefs
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vlibsocket/vl_socket_api_h.h>
+#undef vl_printfun
+
+/* instantiate all the endian swap functions we know about */
+#define vl_endianfun
+#include <vlibsocket/vl_socket_api_h.h>
+#undef vl_endianfun
+
+socket_main_t socket_main;
+
+void
+dump_socket_clients (vlib_main_t * vm, api_main_t * am)
+{
+  vl_api_registration_t *reg;
+  socket_main_t *sm = &socket_main;
+  unix_main_t *um = &unix_main;
+  unix_file_t *f;
+
+  /*
+   * Must have at least one active client, not counting the
+   * REGISTRATION_TYPE_SOCKET_LISTEN bind/accept socket
+   */
+  if (pool_elts (sm->registration_pool) < 2)
+    return;
+
+  vlib_cli_output (vm, "TCP socket clients");
+  vlib_cli_output (vm, "%16s %8s", "Name", "Fildesc");
+    /* *INDENT-OFF* */
+    pool_foreach (reg, sm->registration_pool,
+    ({
+        if (reg->registration_type == REGISTRATION_TYPE_SOCKET_SERVER) {
+            f = pool_elt_at_index (um->file_pool, reg->unix_file_index);
+            vlib_cli_output (vm, "%16s %8d",
+                             reg->name, f->file_descriptor);
+        }
+    }));
+/* *INDENT-ON* */
+}
+
+void
+vl_socket_api_send (vl_api_registration_t * rp, u8 * elem)
+{
+  u32 nbytes = 4;		/* for the length... */
+  u16 msg_id = ntohs (*(u16 *) elem);
+  u32 msg_length;
+  u32 tmp;
+  api_main_t *am = &api_main;
+
+  ASSERT (rp->registration_type > REGISTRATION_TYPE_SHMEM);
+
+  if (msg_id >= vec_len (am->api_trace_cfg))
+    {
+      clib_warning ("id out of range: %d", msg_id);
+      vl_msg_api_free ((void *) elem);
+      return;
+    }
+
+  msg_length = am->api_trace_cfg[msg_id].size;
+  nbytes += msg_length;
+  tmp = clib_host_to_net_u32 (nbytes);
+
+  vl_socket_add_pending_output (rp->unix_file_index
+				+ unix_main.file_pool,
+				rp->vl_api_registration_pool_index
+				+ socket_main.registration_pool,
+				(u8 *) & tmp, sizeof (tmp));
+  vl_socket_add_pending_output (rp->unix_file_index
+				+ unix_main.file_pool,
+				rp->vl_api_registration_pool_index
+				+ socket_main.registration_pool,
+				elem, msg_length);
+  vl_msg_api_free ((void *) elem);
+}
+
+void
+vl_socket_api_send_with_data (vl_api_registration_t * rp,
+			      u8 * elem, u8 * data_vector)
+{
+  u32 nbytes = 4;		/* for the length... */
+  u16 msg_id = ntohs (*(u16 *) elem);
+  u32 msg_length;
+  u32 tmp;
+  api_main_t *am = &api_main;
+
+  ASSERT (rp->registration_type > REGISTRATION_TYPE_SHMEM);
+
+  if (msg_id >= vec_len (am->api_trace_cfg))
+    {
+      clib_warning ("id out of range: %d", msg_id);
+      vec_free (data_vector);
+      vl_msg_api_free ((void *) elem);
+      return;
+    }
+
+  msg_length = am->api_trace_cfg[msg_id].size;
+  nbytes += msg_length;
+  nbytes += vec_len (data_vector);
+
+  /* Length in network byte order */
+  tmp = clib_host_to_net_u32 (nbytes);
+
+  vl_socket_add_pending_output (rp->unix_file_index
+				+ unix_main.file_pool,
+				rp->vl_api_registration_pool_index
+				+ socket_main.registration_pool,
+				(u8 *) & tmp, sizeof (tmp));
+  vl_socket_add_pending_output (rp->unix_file_index
+				+ unix_main.file_pool,
+				rp->vl_api_registration_pool_index
+				+ socket_main.registration_pool,
+				elem, msg_length);
+  vl_socket_add_pending_output (rp->unix_file_index
+				+ unix_main.file_pool,
+				rp->vl_api_registration_pool_index
+				+ socket_main.registration_pool,
+				data_vector, vec_len (data_vector));
+  vl_msg_api_free ((void *) elem);
+}
+
+static inline void
+vl_socket_api_send_with_length_internal (vl_api_registration_t * rp,
+					 u8 * elem, u32 msg_length, int free)
+{
+  u32 nbytes = 4;		/* for the length... */
+  u16 msg_id = ntohs (*(u16 *) elem);
+  u32 tmp;
+  api_main_t *am = &api_main;
+
+  ASSERT (rp->registration_type > REGISTRATION_TYPE_SHMEM);
+
+  if (msg_id >= vec_len (am->api_trace_cfg))
+    {
+      clib_warning ("id out of range: %d", msg_id);
+      if (free)
+	vl_msg_api_free ((void *) elem);
+      return;
+    }
+
+  nbytes += msg_length;
+
+  /* Length in network byte order */
+  tmp = clib_host_to_net_u32 (nbytes);
+
+  vl_socket_add_pending_output (rp->unix_file_index
+				+ unix_main.file_pool,
+				rp->vl_api_registration_pool_index
+				+ socket_main.registration_pool,
+				(u8 *) & tmp, sizeof (tmp));
+  vl_socket_add_pending_output (rp->unix_file_index
+				+ unix_main.file_pool,
+				rp->vl_api_registration_pool_index
+				+ socket_main.registration_pool,
+				elem, msg_length);
+  if (free)
+    vl_msg_api_free ((void *) elem);
+}
+
+void
+vl_socket_api_send_with_length (vl_api_registration_t * rp,
+				u8 * elem, u32 msg_length)
+{
+  vl_socket_api_send_with_length_internal (rp, elem, msg_length,
+					   1 /* free */ );
+}
+
+void
+vl_socket_api_send_with_length_no_free (vl_api_registration_t * rp,
+					u8 * elem, u32 msg_length)
+{
+  vl_socket_api_send_with_length_internal (rp, elem, msg_length,
+					   0 /* free */ );
+}
+
+void
+vl_free_socket_registration_index (u32 pool_index)
+{
+  vl_api_registration_t *rp;
+  if (pool_is_free_index (socket_main.registration_pool, pool_index))
+    {
+      clib_warning ("main pool index %d already free", pool_index);
+      return;
+    }
+  rp = pool_elt_at_index (socket_main.registration_pool, pool_index);
+
+  ASSERT (rp->registration_type != REGISTRATION_TYPE_FREE);
+  vec_free (rp->name);
+  vec_free (rp->unprocessed_input);
+  vec_free (rp->output_vector);
+  rp->registration_type = REGISTRATION_TYPE_FREE;
+  pool_put (socket_main.registration_pool, rp);
+}
+
+static inline void
+socket_process_msg (unix_file_t * uf, vl_api_registration_t * rp,
+		    i8 * input_v)
+{
+  u8 *the_msg = (u8 *) (input_v + sizeof (u32));
+  socket_main.current_uf = uf;
+  socket_main.current_rp = rp;
+  vl_msg_api_socket_handler (the_msg);
+  socket_main.current_uf = 0;
+  socket_main.current_rp = 0;
+}
+
+clib_error_t *
+vl_socket_read_ready (unix_file_t * uf)
+{
+  unix_main_t *um = &unix_main;
+  vl_api_registration_t *rp;
+  int n;
+  i8 *msg_buffer = 0;
+  u32 msg_len;
+  u32 save_input_buffer_length = vec_len (socket_main.input_buffer);
+
+  rp = pool_elt_at_index (socket_main.registration_pool, uf->private_data);
+
+  n = read (uf->file_descriptor, socket_main.input_buffer,
+	    vec_len (socket_main.input_buffer));
+
+  if (n <= 0 && errno != EAGAIN)
+    {
+      unix_file_del (um, uf);
+
+      if (!pool_is_free (socket_main.registration_pool, rp))
+	{
+	  u32 index = rp - socket_main.registration_pool;
+	  vl_free_socket_registration_index (index);
+	}
+      else
+	{
+	  clib_warning ("client index %d already free?",
+			rp->vl_api_registration_pool_index);
+	}
+      return 0;
+    }
+
+  _vec_len (socket_main.input_buffer) = n;
+
+  /*
+   * Look for bugs here. This code is tricky because
+   * data read from a stream socket does honor message
+   * boundaries. In the case of a long message (>4K bytes)
+   * we have to do (at least) 2 reads, etc.
+   */
+  do
+    {
+      if (vec_len (rp->unprocessed_input))
+	{
+	  vec_append (rp->unprocessed_input, socket_main.input_buffer);
+	  msg_buffer = rp->unprocessed_input;
+	  msg_len = rp->unprocessed_msg_length;
+	}
+      else
+	{
+	  msg_buffer = socket_main.input_buffer;
+	  msg_len = 0;
+	}
+
+      if (msg_len == 0)
+	{
+	  /* Length may be split across two reads */
+	  if (vec_len (msg_buffer) < sizeof (u32))
+	    goto save_and_split;
+
+	  /* total length, including msg_len itself, in network byte order */
+	  msg_len = clib_net_to_host_u32 (*((u32 *) msg_buffer));
+	}
+
+      /* Happens if the client sent msg_len == 0 */
+      if (msg_len == 0)
+	{
+	  clib_warning ("msg_len == 0");
+	  goto turf_it;
+	}
+
+      /* We don't have the entire message yet. */
+      if (msg_len > vec_len (msg_buffer))
+	{
+	save_and_split:
+	  /*
+	   * if we were using the shared input buffer,
+	   * save the fragment.
+	   */
+	  if (msg_buffer == socket_main.input_buffer)
+	    {
+	      ASSERT (vec_len (rp->unprocessed_input) == 0);
+	      vec_validate (rp->unprocessed_input, vec_len (msg_buffer) - 1);
+	      clib_memcpy (rp->unprocessed_input, msg_buffer,
+			   vec_len (msg_buffer));
+	      _vec_len (rp->unprocessed_input) = vec_len (msg_buffer);
+	    }
+	  _vec_len (socket_main.input_buffer) = save_input_buffer_length;
+	  rp->unprocessed_msg_length = msg_len;
+	  return 0;
+	}
+
+      socket_process_msg (uf, rp, msg_buffer);
+      if (n > msg_len)
+	vec_delete (msg_buffer, msg_len, 0);
+      else
+	_vec_len (msg_buffer) = 0;
+      n -= msg_len;
+      msg_len = 0;
+      rp->unprocessed_msg_length = 0;
+    }
+  while (n > 0);
+
+turf_it:
+  _vec_len (socket_main.input_buffer) = save_input_buffer_length;
+
+  return 0;
+}
+
+void
+vl_socket_add_pending_output (unix_file_t * uf,
+			      vl_api_registration_t * rp,
+			      u8 * buffer, uword buffer_bytes)
+{
+  unix_main_t *um = &unix_main;
+
+  vec_add (rp->output_vector, buffer, buffer_bytes);
+  if (vec_len (rp->output_vector) > 0)
+    {
+      int skip_update = 0 != (uf->flags & UNIX_FILE_DATA_AVAILABLE_TO_WRITE);
+      uf->flags |= UNIX_FILE_DATA_AVAILABLE_TO_WRITE;
+      if (!skip_update)
+	um->file_update (uf, UNIX_FILE_UPDATE_MODIFY);
+    }
+}
+
+static void
+socket_del_pending_output (unix_file_t * uf,
+			   vl_api_registration_t * rp, uword n_bytes)
+{
+  unix_main_t *um = &unix_main;
+
+  vec_delete (rp->output_vector, n_bytes, 0);
+  if (vec_len (rp->output_vector) <= 0)
+    {
+      int skip_update = 0 == (uf->flags & UNIX_FILE_DATA_AVAILABLE_TO_WRITE);
+      uf->flags &= ~UNIX_FILE_DATA_AVAILABLE_TO_WRITE;
+      if (!skip_update)
+	um->file_update (uf, UNIX_FILE_UPDATE_MODIFY);
+    }
+}
+
+clib_error_t *
+vl_socket_write_ready (unix_file_t * uf)
+{
+  unix_main_t *um = &unix_main;
+  vl_api_registration_t *rp;
+  int n;
+
+  rp = pool_elt_at_index (socket_main.registration_pool, uf->private_data);
+
+  /* Flush output vector. */
+  n = write (uf->file_descriptor,
+	     rp->output_vector, vec_len (rp->output_vector));
+
+  if (n < 0)
+    {
+#if DEBUG > 2
+      clib_warning ("write error, close the file...\n");
+#endif
+      unix_file_del (um, uf);
+
+      vl_free_socket_registration_index (rp - socket_main.registration_pool);
+      return 0;
+    }
+
+  else if (n > 0)
+    socket_del_pending_output (uf, rp, n);
+
+  return 0;
+}
+
+clib_error_t *
+vl_socket_error_ready (unix_file_t * uf)
+{
+  vl_api_registration_t *rp;
+  unix_main_t *um = &unix_main;
+
+  rp = pool_elt_at_index (socket_main.registration_pool, uf->private_data);
+  unix_file_del (um, uf);
+  vl_free_socket_registration_index (rp - socket_main.registration_pool);
+
+  return 0;
+}
+
+void
+socksvr_file_add (unix_main_t * um, int fd)
+{
+  vl_api_registration_t *rp;
+  unix_file_t template = { 0 };
+
+  pool_get (socket_main.registration_pool, rp);
+  memset (rp, 0, sizeof (*rp));
+
+  template.read_function = vl_socket_read_ready;
+  template.write_function = vl_socket_write_ready;
+  template.error_function = vl_socket_error_ready;
+  template.file_descriptor = fd;
+  template.private_data = rp - socket_main.registration_pool;
+
+  rp->registration_type = REGISTRATION_TYPE_SOCKET_SERVER;
+  rp->vl_api_registration_pool_index = rp - socket_main.registration_pool;
+  rp->unix_file_index = unix_file_add (um, &template);
+}
+
+static clib_error_t *
+socksvr_accept_ready (unix_file_t * uf)
+{
+  unix_main_t *um = &unix_main;
+  struct sockaddr_in client_addr;
+  int client_fd;
+  int client_len;
+
+  client_len = sizeof (client_addr);
+
+  /*
+   * Supposedly acquires the non-blocking attrib from the
+   * server socket.
+   */
+  client_fd = accept (uf->file_descriptor,
+		      (struct sockaddr *) &client_addr,
+		      (socklen_t *) & client_len);
+
+  if (client_fd < 0)
+    return clib_error_return_unix (0, "socksvr_accept_ready: accept");
+
+  socksvr_file_add (um, client_fd);
+  return 0;
+}
+
+static clib_error_t *
+socksvr_bogus_write (unix_file_t * uf)
+{
+  clib_warning ("why am I here?");
+  return 0;
+}
+
+/*
+ * vl_api_sockclnt_create_t_handler
+ */
+void
+vl_api_sockclnt_create_t_handler (vl_api_sockclnt_create_t * mp)
+{
+  vl_api_registration_t *regp;
+  vl_api_sockclnt_create_reply_t *rp;
+  int rv = 1;
+
+  regp = socket_main.current_rp;
+
+  ASSERT (regp->registration_type == REGISTRATION_TYPE_SOCKET_SERVER);
+
+  regp->name = format (0, "%s%c", mp->name, 0);
+
+  rp = vl_msg_api_alloc (sizeof (*rp));
+  rp->_vl_msg_id = htons (VL_API_SOCKCLNT_CREATE_REPLY);
+  rp->handle = (uword) regp;
+  rp->index = (uword) regp->vl_api_registration_pool_index;
+  rp->context = mp->context;
+  rp->response = htonl (rv);
+
+  vl_msg_api_send (regp, (u8 *) rp);
+}
+
+/*
+ * vl_api_sockclnt_delete_t_handler
+ */
+void
+vl_api_sockclnt_delete_t_handler (vl_api_sockclnt_delete_t * mp)
+{
+  vl_api_registration_t *regp;
+  vl_api_sockclnt_delete_reply_t *rp;
+
+  if (!pool_is_free_index (socket_main.registration_pool, mp->index))
+    {
+      regp = pool_elt_at_index (socket_main.registration_pool, mp->index);
+
+      rp = vl_msg_api_alloc (sizeof (*rp));
+      rp->_vl_msg_id = htons (VL_API_SOCKCLNT_DELETE_REPLY);
+      rp->handle = mp->handle;
+      rp->response = htonl (1);
+
+      vl_msg_api_send (regp, (u8 *) rp);
+
+      unix_file_del (&unix_main, unix_main.file_pool + regp->unix_file_index);
+
+      vl_free_socket_registration_index (mp->index);
+    }
+  else
+    {
+      clib_warning ("unknown client ID %d", mp->index);
+    }
+}
+
+#define foreach_vlib_api_msg                    \
+_(SOCKCLNT_CREATE, sockclnt_create)             \
+_(SOCKCLNT_DELETE, sockclnt_delete)
+
+static clib_error_t *
+socksvr_api_init (vlib_main_t * vm)
+{
+  unix_main_t *um = &unix_main;
+  unix_file_t template = { 0 };
+  int sockfd;
+  int one = 1;
+  int rv;
+  struct sockaddr_in serv_addr;
+  vl_api_registration_t *rp;
+  u16 portno;
+  u32 bind_address;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vlib_api_msg;
+#undef _
+
+  vec_resize (socket_main.input_buffer, 4096);
+
+  /* Set up non-blocking server socket on CLIENT_API_SERVER_PORT */
+  sockfd = socket (AF_INET, SOCK_STREAM, 0);
+
+  if (sockfd < 0)
+    {
+      return clib_error_return_unix (0, "socket");
+    }
+
+  rv = ioctl (sockfd, FIONBIO, &one);
+  if (rv < 0)
+    {
+      close (sockfd);
+      return clib_error_return_unix (0, "FIONBIO");
+    }
+
+  rv = setsockopt (sockfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof (one));
+  if (rv < 0)
+    {
+      close (sockfd);
+      return clib_error_return_unix (0, "SO_REUSEADDR");
+    }
+
+  bzero ((char *) &serv_addr, sizeof (serv_addr));
+  serv_addr.sin_family = AF_INET;
+
+  if (socket_main.bind_address)
+    bind_address = socket_main.bind_address;
+  else
+    bind_address = INADDR_LOOPBACK;
+
+  if (socket_main.portno)
+    portno = socket_main.portno;
+  else
+    portno = SOCKSVR_DEFAULT_PORT;
+
+  serv_addr.sin_port = clib_host_to_net_u16 (portno);
+  serv_addr.sin_addr.s_addr = clib_host_to_net_u32 (bind_address);
+
+  if (bind (sockfd, (struct sockaddr *) &serv_addr, sizeof (serv_addr)) < 0)
+    {
+      close (sockfd);
+      return clib_error_return_unix (0, "bind");
+    }
+
+  rv = listen (sockfd, 5);
+  if (rv < 0)
+    {
+      close (sockfd);
+      return clib_error_return_unix (0, "listen");
+    }
+
+  pool_get (socket_main.registration_pool, rp);
+  memset (rp, 0, sizeof (*rp));
+
+  rp->registration_type = REGISTRATION_TYPE_SOCKET_LISTEN;
+
+  template.read_function = socksvr_accept_ready;
+  template.write_function = socksvr_bogus_write;
+  template.file_descriptor = sockfd;
+  template.private_data = rp - socket_main.registration_pool;
+
+  rp->unix_file_index = unix_file_add (um, &template);
+  return 0;
+}
+
+static clib_error_t *
+socket_exit (vlib_main_t * vm)
+{
+  unix_main_t *um = &unix_main;
+  vl_api_registration_t *rp;
+
+  /* Defensive driving in case something wipes out early */
+  if (socket_main.registration_pool)
+    {
+      u32 index;
+        /* *INDENT-OFF* */
+        pool_foreach (rp, socket_main.registration_pool, ({
+            unix_file_del (um, um->file_pool + rp->unix_file_index);
+            index = rp->vl_api_registration_pool_index;
+            vl_free_socket_registration_index (index);
+        }));
+/* *INDENT-ON* */
+    }
+
+  return 0;
+}
+
+VLIB_MAIN_LOOP_EXIT_FUNCTION (socket_exit);
+
+static clib_error_t *
+socksvr_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  int portno;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "port %d", &portno))
+	{
+	  socket_main.portno = portno;
+	}
+      else
+	{
+	  return clib_error_return (0, "unknown input '%U'",
+				    format_unformat_error, input);
+	}
+    }
+  return socksvr_api_init (vm);
+}
+
+VLIB_CONFIG_FUNCTION (socksvr_config, "socksvr");
+
+/* argument in host byte order */
+void
+socksvr_set_port (u16 port)
+{
+  socket_main.portno = port;
+}
+
+/* argument in host byte order */
+void
+socksvr_set_bind_address (u32 bind_address)
+{
+  socket_main.bind_address = bind_address;
+}
+
+clib_error_t *
+vlibsocket_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (vlibsocket_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibsocket/vl_socket_api_h.h b/src/vlibsocket/vl_socket_api_h.h
new file mode 100644
index 00000000..7fc53cef
--- /dev/null
+++ b/src/vlibsocket/vl_socket_api_h.h
@@ -0,0 +1,33 @@
+/*
+ *------------------------------------------------------------------
+ * vl_socket_api_h.h - all API headers, in a specific order.
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+/*
+ * Add to the bottom of the #include list, or elves will steal your
+ * keyboard in the middle of the night!
+ */
+#include <vlibmemory/vl_memory_api_h.h>
+#include <vlibsocket/sockclnt.api.h>
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlibsocket/vl_socket_msg_enum.h b/src/vlibsocket/vl_socket_msg_enum.h
new file mode 100644
index 00000000..cdc61a5b
--- /dev/null
+++ b/src/vlibsocket/vl_socket_msg_enum.h
@@ -0,0 +1,42 @@
+/*
+ *------------------------------------------------------------------
+ * vl_msg_enum.h - Our view of how to number API messages
+ * Clients have their own view, which has to agree with ours.
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef __VL_MSG_ENUM_H__
+#define __VL_MSG_ENUM_H__
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum
+{
+  VL_ILLEGAL_MESSAGE_ID = 0,
+#include <vlibsocket/vl_socket_api_h.h>
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif /* __VL_MSG_ENUM_H__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet.am b/src/vnet.am
new file mode 100644
index 00000000..03233487
--- /dev/null
+++ b/src/vnet.am
@@ -0,0 +1,972 @@
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+libvnet_la_SOURCES =
+libvnetplugin_la_SOURCES =
+
+libvnet_la_LIBAD = libvppinfra.la libvlib.la libsvm.la
+
+########################################
+# Generic stuff
+########################################
+libvnet_la_SOURCES +=				\
+  vnet/config.c					\
+  vnet/devices/devices.c			\
+  vnet/handoff.c				\
+  vnet/interface.c				\
+  vnet/interface_api.c				\
+  vnet/interface_cli.c				\
+  vnet/interface_format.c			\
+  vnet/interface_output.c			\
+  vnet/misc.c					\
+  vnet/replication.c				\
+  vnet/rewrite.c
+
+nobase_include_HEADERS +=			\
+  vnet/api_errno.h				\
+  vnet/buffer.h					\
+  vnet/config.h					\
+  vnet/devices/devices.h			\
+  vnet/global_funcs.h				\
+  vnet/handoff.h				\
+  vnet/interface.h				\
+  vnet/interface.api.h				\
+  vnet/interface_funcs.h			\
+  vnet/l3_types.h				\
+  vnet/pipeline.h				\
+  vnet/replication.h				\
+  vnet/rewrite.h				\
+  vnet/vnet.h					\
+  vnet/vnet_all_api_h.h				\
+  vnet/vnet_msg_enum.h
+
+API_FILES += vnet/interface.api
+
+########################################
+# Policer infra
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/policer/node_funcs.c			\
+  vnet/policer/policer.c			\
+  vnet/policer/xlate.c
+
+nobase_include_HEADERS +=			\
+  vnet/policer/police.h				\
+  vnet/policer/policer.h			\
+  vnet/policer/xlate.h
+
+########################################
+# Cop - junk filter
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/cop/cop.c				\
+  vnet/cop/node1.c				\
+  vnet/cop/ip4_whitelist.c			\
+  vnet/cop/ip6_whitelist.c
+
+nobase_include_HEADERS +=			\
+  vnet/cop/cop.h
+
+########################################
+# Layer 2 protocols go here
+########################################
+
+########################################
+# Layer 2 protocol: Ethernet
+########################################
+libvnet_la_SOURCES +=				\
+ vnet/ethernet/arp.c				\
+ vnet/ethernet/format.c				\
+ vnet/ethernet/init.c				\
+ vnet/ethernet/interface.c			\
+ vnet/ethernet/node.c				\
+ vnet/ethernet/pg.c
+
+nobase_include_HEADERS +=			\
+ vnet/ethernet/arp_packet.h			\
+ vnet/ethernet/error.def			\
+ vnet/ethernet/ethernet.h			\
+ vnet/ethernet/packet.h				\
+ vnet/ethernet/types.def
+
+########################################
+# Layer 2 protocol: Ethernet bridging
+########################################
+libvnet_la_SOURCES +=				\
+ vnet/l2/feat_bitmap.c				\
+ vnet/l2/l2_api.c				\
+ vnet/l2/l2_bd.c				\
+ vnet/l2/l2_bvi.c				\
+ vnet/l2/l2_input_classify.c			\
+ vnet/l2/l2_output_classify.c			\
+ vnet/l2/l2_efp_filter.c			\
+ vnet/l2/l2_fib.c				\
+ vnet/l2/l2_flood.c				\
+ vnet/l2/l2_fwd.c				\
+ vnet/l2/l2_input_acl.c				\
+ vnet/l2/l2_input.c				\
+ vnet/l2/l2_input_vtr.c				\
+ vnet/l2/l2_learn.c				\
+ vnet/l2/l2_output_acl.c			\
+ vnet/l2/l2_output.c				\
+ vnet/l2/l2_patch.c				\
+ vnet/l2/l2_rw.c				\
+ vnet/l2/l2_vtr.c				\
+ vnet/l2/l2_xcrw.c
+
+nobase_include_HEADERS +=			\
+ vnet/l2/feat_bitmap.h				\
+ vnet/l2/l2_input.h				\
+ vnet/l2/l2_output.h				\
+ vnet/l2/l2_vtr.h				\
+ vnet/l2/l2_input_vtr.h				\
+ vnet/l2/l2_efp_filter.h			\
+ vnet/l2/l2_fwd.h				\
+ vnet/l2/l2_bd.h				\
+ vnet/l2/l2_bvi.h				\
+ vnet/l2/l2_flood.h				\
+ vnet/l2/l2_fib.h				\
+ vnet/l2/l2_rw.h				\
+ vnet/l2/l2_xcrw.h				\
+ vnet/l2/l2_classify.h				\
+ vnet/l2/l2.api.h
+
+API_FILES += vnet/l2/l2.api
+
+########################################
+# Layer 2 protocol: SRP
+########################################
+libvnet_la_SOURCES +=				\
+ vnet/srp/format.c				\
+ vnet/srp/interface.c				\
+ vnet/srp/node.c				\
+ vnet/srp/pg.c
+
+nobase_include_HEADERS +=			\
+ vnet/srp/packet.h				\
+ vnet/srp/srp.h
+
+########################################
+# Layer 2 protocol: PPP
+########################################
+libvnet_la_SOURCES +=				\
+  vnet/ppp/node.c				\
+  vnet/ppp/pg.c					\
+  vnet/ppp/ppp.c
+
+nobase_include_HEADERS +=			\
+ vnet/ppp/error.def				\
+ vnet/ppp/ppp.h					\
+ vnet/ppp/packet.h
+
+########################################
+# Layer 2 protocol: HDLC
+########################################
+libvnet_la_SOURCES +=				\
+  vnet/hdlc/node.c				\
+  vnet/hdlc/pg.c				\
+  vnet/hdlc/hdlc.c
+
+nobase_include_HEADERS +=			\
+ vnet/hdlc/error.def				\
+ vnet/hdlc/hdlc.h				\
+ vnet/hdlc/packet.h
+
+########################################
+# Layer 2 protocol: LLC
+########################################
+libvnet_la_SOURCES +=				\
+  vnet/llc/llc.c				\
+  vnet/llc/node.c				\
+  vnet/llc/pg.c
+
+nobase_include_HEADERS +=			\
+ vnet/llc/llc.h
+
+########################################
+# Layer 2 protocol: SNAP
+########################################
+libvnet_la_SOURCES +=				\
+  vnet/snap/snap.c				\
+  vnet/snap/node.c				\
+  vnet/snap/pg.c
+
+nobase_include_HEADERS +=			\
+ vnet/snap/snap.h
+
+########################################
+# Layer 2 / vxlan
+########################################
+libvnet_la_SOURCES +=				\
+  vnet/vxlan/vxlan.c				\
+  vnet/vxlan/encap.c				\
+  vnet/vxlan/decap.c				\
+  vnet/vxlan/vxlan_api.c
+
+nobase_include_HEADERS +=			\
+  vnet/vxlan/vxlan.h				\
+  vnet/vxlan/vxlan_packet.h			\
+  vnet/vxlan/vxlan_error.def			\
+  vnet/vxlan/vxlan.api.h
+
+API_FILES += vnet/vxlan/vxlan.api
+
+########################################
+# Layer 2 / CDP
+########################################
+libvnet_la_SOURCES +=				\
+  vnet/cdp/cdp_input.c				\
+  vnet/cdp/cdp_node.c				\
+  vnet/cdp/cdp_periodic.c
+
+nobase_include_HEADERS +=			\
+  vnet/cdp/cdp_protocol.h
+
+########################################
+# Layer 2 / LLDP
+########################################
+libvnet_la_SOURCES +=				\
+  vnet/lldp/lldp_input.c			\
+  vnet/lldp/lldp_node.c				\
+  vnet/lldp/lldp_output.c			\
+  vnet/lldp/lldp_cli.c
+
+nobase_include_HEADERS +=			\
+  vnet/lldp/lldp_protocol.h
+
+########################################
+# Layer 2/3 "classify"
+########################################
+libvnet_la_SOURCES +=				\
+  vnet/classify/vnet_classify.c			\
+  vnet/classify/ip_classify.c			\
+  vnet/classify/input_acl.c			\
+  vnet/classify/policer_classify.c		\
+  vnet/classify/flow_classify.c                 \
+  vnet/classify/flow_classify_node.c            \
+  vnet/classify/vnet_classify.h
+
+nobase_include_HEADERS +=			\
+  vnet/classify/vnet_classify.h	                \
+  vnet/classify/input_acl.h                     \
+  vnet/classify/policer_classify.h              \
+  vnet/classify/flow_classify.h
+
+########################################
+# Layer 3 protocols go here
+########################################
+
+########################################
+# Layer 3 protocol: IP v4/v6
+########################################
+libvnet_la_SOURCES +=				\
+ vnet/ip/format.c				\
+ vnet/ip/icmp4.c				\
+ vnet/ip/icmp6.c				\
+ vnet/ip/ip46_cli.c				\
+ vnet/ip/ip4_format.c				\
+ vnet/ip/ip4_forward.c				\
+ vnet/ip/ip4_input.c				\
+ vnet/ip/ip4_mtrie.c				\
+ vnet/ip/ip4_pg.c				\
+ vnet/ip/ip4_source_and_port_range_check.c	\
+ vnet/ip/ip4_source_check.c			\
+ vnet/ip/ip6_format.c				\
+ vnet/ip/ip6_forward.c				\
+ vnet/ip/ip6_hop_by_hop.c			\
+ vnet/ip/ip6_input.c				\
+ vnet/ip/ip6_neighbor.c				\
+ vnet/ip/ip6_pg.c				\
+ vnet/ip/ip_api.c				\
+ vnet/ip/ip_checksum.c				\
+ vnet/ip/ip_frag.c				\
+ vnet/ip/ip.h					\
+ vnet/ip/ip_init.c				\
+ vnet/ip/ip_input_acl.c				\
+ vnet/ip/lookup.c				\
+ vnet/ip/ping.c					\
+ vnet/ip/punt.c					\
+ vnet/ip/udp_format.c				\
+ vnet/ip/udp_init.c				\
+ vnet/ip/udp_local.c				\
+ vnet/ip/udp_pg.c
+
+nobase_include_HEADERS +=			\
+ vnet/ip/format.h				\
+ vnet/ip/icmp46_packet.h			\
+ vnet/ip/icmp4.h				\
+ vnet/ip/icmp6.h				\
+ vnet/ip/igmp_packet.h				\
+ vnet/ip/ip.api.h				\
+ vnet/ip/ip4_error.h				\
+ vnet/ip/ip4.h					\
+ vnet/ip/ip4_mtrie.h				\
+ vnet/ip/ip4_packet.h				\
+ vnet/ip/ip6_error.h				\
+ vnet/ip/ip6.h					\
+ vnet/ip/ip6_hop_by_hop.h			\
+ vnet/ip/ip6_hop_by_hop_packet.h		\
+ vnet/ip/ip6_packet.h				\
+ vnet/ip/ip6_neighbor.h				\
+ vnet/ip/ip.h					\
+ vnet/ip/ip_packet.h				\
+ vnet/ip/ip_source_and_port_range_check.h	\
+ vnet/ip/lookup.h				\
+ vnet/ip/ports.def				\
+ vnet/ip/protocols.def				\
+ vnet/ip/punt_error.def				\
+ vnet/ip/punt.h					\
+ vnet/ip/tcp_packet.h				\
+ vnet/ip/udp_error.def				\
+ vnet/ip/udp.h					\
+ vnet/ip/udp_packet.h
+
+API_FILES += vnet/ip/ip.api
+
+########################################
+# Bidirectional Forwarding Detection
+########################################
+
+nobase_include_HEADERS +=			\
+ vnet/bfd/bfd_protocol.h			\
+ vnet/bfd/bfd_main.h				\
+ vnet/bfd/bfd_api.h				\
+ vnet/bfd/bfd_udp.h				\
+ vnet/bfd/bfd.api.h
+
+libvnet_la_SOURCES +=				\
+ vnet/bfd/bfd_api.h				\
+ vnet/bfd/bfd_udp.c				\
+ vnet/bfd/bfd_main.c				\
+ vnet/bfd/bfd_protocol.c			\
+ vnet/bfd/bfd_api.c
+
+API_FILES += vnet/bfd/bfd.api
+
+########################################
+# Layer 3 protocol: IPSec
+########################################
+if WITH_IPSEC
+libvnet_la_SOURCES +=				\
+ vnet/ipsec/ipsec.c				\
+ vnet/ipsec/ipsec_cli.c				\
+ vnet/ipsec/ipsec_format.c			\
+ vnet/ipsec/ipsec_input.c			\
+ vnet/ipsec/ipsec_if.c				\
+ vnet/ipsec/ipsec_if_in.c			\
+ vnet/ipsec/ipsec_if_out.c			\
+ vnet/ipsec/esp_encrypt.c			\
+ vnet/ipsec/esp_decrypt.c			\
+ vnet/ipsec/ikev2.c				\
+ vnet/ipsec/ikev2_crypto.c			\
+ vnet/ipsec/ikev2_cli.c				\
+ vnet/ipsec/ikev2_payload.c			\
+ vnet/ipsec/ikev2_format.c			\
+ vnet/ipsec/ipsec_api.c
+
+API_FILES += vnet/ipsec/ipsec.api
+
+if WITH_DPDK_CRYPTO
+libvnet_la_SOURCES +=				\
+ vnet/devices/dpdk/ipsec/esp_encrypt.c		\
+ vnet/devices/dpdk/ipsec/esp_decrypt.c		\
+ vnet/devices/dpdk/ipsec/crypto_node.c		\
+ vnet/devices/dpdk/ipsec/cli.c			\
+ vnet/devices/dpdk/ipsec/ipsec.c
+endif
+endif
+
+libvnet_la_SOURCES +=				\
+ vnet/ipsec/ipsec_output.c
+
+nobase_include_HEADERS +=			\
+ vnet/ipsec/ipsec.h				\
+ vnet/ipsec/esp.h				\
+ vnet/ipsec/ikev2.h				\
+ vnet/ipsec/ikev2_priv.h			\
+ vnet/ipsec/ipsec.api.h
+if WITH_DPDK_CRYPTO
+nobase_include_HEADERS +=			\
+ vnet/devices/dpdk/ipsec/ipsec.h		\
+ vnet/devices/dpdk/ipsec/esp.h
+endif
+
+########################################
+# Layer 3 protocol: osi
+########################################
+libvnet_la_SOURCES +=				\
+ vnet/osi/node.c				\
+ vnet/osi/osi.c					\
+ vnet/osi/pg.c
+
+nobase_include_HEADERS +=			\
+ vnet/osi/osi.h
+
+########################################
+# Layer 3 protocol: MAP
+########################################
+libvnet_la_SOURCES +=				\
+ vnet/map/map.c					\
+ vnet/map/map_dpo.c				\
+ vnet/map/ip4_map.c				\
+ vnet/map/ip6_map.c				\
+ vnet/map/ip4_map_t.c				\
+ vnet/map/ip6_map_t.c				\
+ vnet/map/map_api.c
+
+nobase_include_HEADERS +=			\
+ vnet/map/map.h					\
+ vnet/map/map_dpo.h				\
+ vnet/map/map.api.h
+
+API_FILES += vnet/map/map.api
+
+if ENABLE_TESTS
+TESTS += test_map
+test_map_SOURCES =                             \
+ vnet/map/test.c
+test_map_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+
+test_map_LDADD = libvnet.la libvppinfra.la libvlib.la	\
+  -lpthread -lvlibmemory -lvlibapi -lvlib_unix	\
+  -ldl -lsvm -lrt
+
+test_map_LDFLAGS = -static
+endif
+
+
+########################################
+# Tunnel protocol: gre
+########################################
+libvnet_la_SOURCES +=				\
+ vnet/gre/gre.c					\
+ vnet/gre/node.c				\
+ vnet/gre/interface.c				\
+ vnet/gre/pg.c					\
+ vnet/gre/gre_api.c
+
+nobase_include_HEADERS +=			\
+ vnet/gre/gre.h					\
+ vnet/gre/packet.h				\
+ vnet/gre/error.def				\
+ vnet/gre/gre.api.h
+
+API_FILES += vnet/gre/gre.api
+
+########################################
+# Tunnel protocol: l2tpv3
+########################################
+libvnet_la_SOURCES +=				\
+ vnet/l2tp/l2tp.c				\
+ vnet/l2tp/encap.c 				\
+ vnet/l2tp/decap.c  				\
+ vnet/l2tp/pg.c					\
+ vnet/l2tp/l2tp_api.c
+
+nobase_include_HEADERS +=			\
+ vnet/l2tp/l2tp.h				\
+ vnet/l2tp/packet.h				\
+ vnet/l2tp/l2tp.api.h
+
+API_FILES += vnet/l2tp/l2tp.api
+
+########################################
+# Tunnel protocol: gre+mpls
+########################################
+libvnet_la_SOURCES +=				\
+ vnet/mpls/mpls.c				\
+ vnet/mpls/mpls_lookup.c			\
+ vnet/mpls/mpls_output.c			\
+ vnet/mpls/mpls_features.c			\
+ vnet/mpls/node.c				\
+ vnet/mpls/interface.c			        \
+ vnet/mpls/mpls_tunnel.c		        \
+ vnet/mpls/pg.c
+
+nobase_include_HEADERS +=			\
+ vnet/mpls/mpls.h				\
+ vnet/mpls/mpls_types.h				\
+ vnet/mpls/mpls_tunnel.h			\
+ vnet/mpls/packet.h				\
+ vnet/mpls/error.def
+
+
+########################################
+# Tunnel protocol: vxlan-gpe
+########################################
+
+libvnet_la_SOURCES +=				\
+ vnet/vxlan-gpe/vxlan_gpe.c			\
+ vnet/vxlan-gpe/encap.c				\
+ vnet/vxlan-gpe/decap.c				\
+ vnet/vxlan-gpe/vxlan_gpe_api.c
+
+nobase_include_HEADERS +=			\
+ vnet/vxlan-gpe/vxlan_gpe.h			\
+ vnet/vxlan-gpe/vxlan_gpe_packet.h		\
+ vnet/vxlan-gpe/vxlan_gpe_error.def		\
+ vnet/vxlan-gpe/vxlan_gpe.api.h
+
+API_FILES += vnet/vxlan-gpe/vxlan_gpe.api
+
+########################################
+# Tunnel protocol: ipsec+gre
+########################################
+libvnet_la_SOURCES +=				\
+ vnet/ipsec-gre/ipsec_gre.c			\
+ vnet/ipsec-gre/node.c				\
+ vnet/ipsec-gre/interface.c			\
+ vnet/ipsec-gre/ipsec_gre_api.c
+
+nobase_include_HEADERS +=			\
+ vnet/ipsec-gre/ipsec_gre.h			\
+ vnet/ipsec-gre/error.def			\
+ vnet/ipsec-gre/ipsec_gre.api.h
+
+API_FILES += vnet/ipsec-gre/ipsec_gre.api
+
+########################################
+# LISP control plane: lisp-cp
+########################################
+
+libvnet_la_SOURCES +=				\
+ vnet/lisp-cp/lisp_types.c			\
+ vnet/lisp-cp/lisp_cp_dpo.c			\
+ vnet/lisp-cp/control.c				\
+ vnet/lisp-cp/gid_dictionary.c			\
+ vnet/lisp-cp/lisp_msg_serdes.c			\
+ vnet/lisp-cp/packets.c				\
+ vnet/lisp-cp/lisp_api.c
+
+nobase_include_HEADERS +=			\
+ vnet/lisp-cp/lisp_types.h			\
+ vnet/lisp-cp/packets.h				\
+ vnet/lisp-cp/gid_dictionary.h			\
+ vnet/lisp-cp/lisp_cp_messages.h		\
+ vnet/lisp-cp/lisp_msg_serdes.h			\
+ vnet/lisp-cp/control.h				\
+ vnet/lisp-cp/lisp.api.h
+
+API_FILES += vnet/lisp-cp/lisp.api
+
+if ENABLE_TESTS
+LDS = \
+  libvppinfra.la \
+  libvnet.la \
+  libvlib.la  \
+  libvlib_unix.la \
+  libsvm.la \
+  libsvmdb.la \
+  libvlibapi.la \
+  libvlibmemory.la \
+  -lpthread -ldl -lrt -lm -lcrypto
+
+TESTS += test_cp_serdes test_lisp_types
+
+test_cp_serdes_SOURCES =			\
+ tests/vnet/lisp-cp/test_cp_serdes.c		\
+ vnet/lisp-cp/lisp_msg_serdes.c			\
+ vnet/lisp-cp/lisp_types.c			\
+ vnet/lisp-cp/packets.c				\
+ vnet/ip/ip_checksum.c
+
+test_lisp_types_SOURCES =			\
+ tests/vnet/lisp-cp/test_lisp_types.c		\
+ vnet/lisp-cp/lisp_types.c
+
+test_cp_serdes_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+test_lisp_types_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+
+test_cp_serdes_LDFLAGS = $(DPDK_LD_FLAGS)
+test_cp_serdes_LDADD = $(LDS) $(DPDK_LD_ADD)
+test_lisp_types_LDFLAGS = $(DPDK_LD_FLAGS)
+test_lisp_types_LDADD = $(LDS) $(DPDK_LD_ADD)
+endif
+
+########################################
+# Tunnel protocol: lisp-gpe
+########################################
+
+libvnet_la_SOURCES +=				\
+ vnet/lisp-gpe/lisp_gpe.c			\
+ vnet/lisp-gpe/lisp_gpe_sub_interface.c		\
+ vnet/lisp-gpe/lisp_gpe_adjacency.c		\
+ vnet/lisp-gpe/lisp_gpe_tunnel.c		\
+ vnet/lisp-gpe/lisp_gpe_fwd_entry.c		\
+ vnet/lisp-gpe/lisp_gpe_tenant.c		\
+ vnet/lisp-gpe/interface.c			\
+ vnet/lisp-gpe/decap.c				\
+ vnet/lisp-gpe/lisp_gpe_api.c
+
+nobase_include_HEADERS +=			\
+ vnet/lisp-gpe/lisp_gpe.h			\
+ vnet/lisp-gpe/lisp_gpe_fwd_entry.h		\
+ vnet/lisp-gpe/lisp_gpe_tenant.h		\
+ vnet/lisp-gpe/lisp_gpe_packet.h		\
+ vnet/lisp-gpe/lisp_gpe_error.def		\
+ vnet/lisp-gpe/lisp_gpe.api.h
+
+API_FILES += vnet/lisp-gpe/lisp_gpe.api
+
+if ENABLE_TESTS
+TESTS += test_test
+
+test_test_SOURCES = tests/vnet/lisp-gpe/test.c
+
+test_test_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+
+test_test_LDADD = $(LIBOBJS)
+
+noinst_PROGRAMS += $(TESTS)
+check_PROGRAMS += $(TESTS)
+endif
+
+########################################
+# DHCP client
+########################################
+libvnet_la_SOURCES +=				\
+ vnet/dhcp/client.c				\
+ vnet/dhcp/client.h
+
+nobase_include_HEADERS +=			\
+ vnet/dhcp/client.h
+
+########################################
+# DHCP proxy
+########################################
+libvnet_la_SOURCES +=				\
+ vnet/dhcp/proxy_node.c				\
+ vnet/dhcp/proxy.h
+
+nobase_include_HEADERS +=			\
+ vnet/dhcp/packet.h				\
+ vnet/dhcp/proxy.h				\
+ vnet/dhcp/proxy_error.def
+
+########################################
+# ipv6 segment routing
+########################################
+
+if WITH_IPV6SR
+libvnet_la_SOURCES +=				\
+ vnet/sr/sr.c					\
+ vnet/sr/sr_replicate.c
+endif
+
+nobase_include_HEADERS +=			\
+ vnet/sr/sr_packet.h				\
+ vnet/sr/sr_error.def				\
+ vnet/sr/sr.h
+
+########################################
+# DHCPv6 proxy
+########################################
+libvnet_la_SOURCES +=				\
+ vnet/dhcpv6/proxy_node.c
+
+nobase_include_HEADERS +=			\
+ vnet/dhcpv6/packet.h				\
+ vnet/dhcpv6/proxy.h				\
+ vnet/dhcpv6/proxy_error.def
+
+########################################
+# IPFIX / netflow v10
+########################################
+libvnet_la_SOURCES +=				\
+ vnet/flow/flow_report.c
+
+nobase_include_HEADERS +=			\
+ vnet/flow/flow_report.h			\
+ vnet/flow/ipfix_info_elements.h		\
+ vnet/flow/ipfix_packet.h
+
+########################################
+# IPFIX classify code
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/flow/flow_report_classify.c
+
+nobase_include_HEADERS +=			\
+  vnet/flow/flow_report_classify.h
+
+########################################
+# lawful intercept
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/lawful-intercept/lawful_intercept.c	\
+  vnet/lawful-intercept/node.c
+
+nobase_include_HEADERS += 			\
+  vnet/lawful-intercept/lawful_intercept.h
+
+########################################
+# SPAN (port mirroring)
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/span/span_api.c  \
+  vnet/span/span.c	    \
+  vnet/span/node.c
+
+nobase_include_HEADERS += 			\
+  vnet/span/span.api.h  \
+  vnet/span/span.h
+
+API_FILES += vnet/span/span.api
+
+########################################
+# Packet generator
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/pg/cli.c					\
+  vnet/pg/edit.c				\
+  vnet/pg/init.c				\
+  vnet/pg/input.c				\
+  vnet/pg/output.c				\
+  vnet/pg/stream.c
+
+nobase_include_HEADERS +=			\
+  vnet/pg/pg.h					\
+  vnet/pg/edit.h
+
+########################################
+# DPDK
+########################################
+if WITH_DPDK
+libvnet_la_SOURCES +=				\
+  vnet/devices/dpdk/dpdk_priv.h		\
+  vnet/devices/dpdk/device.c		\
+  vnet/devices/dpdk/format.c		\
+  vnet/devices/dpdk/init.c			\
+  vnet/devices/dpdk/node.c			\
+  vnet/devices/dpdk/hqos.c			\
+  vnet/devices/dpdk/cli.c
+
+nobase_include_HEADERS +=			\
+  vnet/devices/dpdk/dpdk.h
+else
+libvnet_la_SOURCES +=				\
+  vnet/devices/nic/ixge.c                       \
+  vnet/devices/nic/ixge.h                       \
+  vnet/devices/nic/sfp.c                        \
+  vnet/devices/nic/sfp.h
+endif
+
+########################################
+# virtio
+########################################
+
+libvnet_la_SOURCES +=       \
+  vnet/devices/virtio/vhost-user.c	\
+  vnet/devices/virtio/vhost_user_api.c
+
+nobase_include_HEADERS +=     \
+  vnet/devices/virtio/vhost-user.h	\
+  vnet/devices/virtio/vhost_user.api.h
+
+API_FILES += vnet/devices/virtio/vhost_user.api
+
+########################################
+# ssvm ethernet
+########################################
+libvnet_la_SOURCES +=				\
+  vnet/devices/ssvm/ssvm_eth.c			\
+  vnet/devices/ssvm/node.c
+
+nobase_include_HEADERS +=			\
+  vnet/devices/ssvm/ssvm_eth.h
+
+########################################
+# Linux packet interface
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/devices/af_packet/af_packet.c		\
+  vnet/devices/af_packet/device.c		\
+  vnet/devices/af_packet/node.c			\
+  vnet/devices/af_packet/cli.c			\
+  vnet/devices/af_packet/af_packet_api.c
+
+nobase_include_HEADERS +=			\
+  vnet/devices/af_packet/af_packet.h	\
+  vnet/devices/af_packet/af_packet.api.h
+
+API_FILES += vnet/devices/af_packet/af_packet.api
+
+########################################
+# NETMAP interface
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/devices/netmap/netmap.c			\
+  vnet/devices/netmap/device.c			\
+  vnet/devices/netmap/node.c			\
+  vnet/devices/netmap/cli.c			\
+  vnet/devices/netmap/netmap_api.c
+
+nobase_include_HEADERS +=			\
+  vnet/devices/netmap/netmap.h		\
+  vnet/devices/netmap/netmap.api.h
+
+API_FILES += vnet/devices/netmap/netmap.api
+
+########################################
+# Driver feature graph arc support
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/feature/feature.c			\
+  vnet/feature/registration.c
+
+nobase_include_HEADERS +=			\
+  vnet/feature/feature.h
+
+########################################
+# Unix kernel related
+########################################
+
+# FIXME: vnet/unix/hgshm.c
+
+libvnet_la_SOURCES +=				\
+  vnet/unix/gdb_funcs.c				\
+  vnet/unix/pcap.c				\
+  vnet/unix/tap_api.c				\
+  vnet/unix/tapcli.c				\
+  vnet/unix/tuntap.c
+
+nobase_include_HEADERS +=			\
+  vnet/unix/pcap.h				\
+  vnet/unix/tuntap.h				\
+  vnet/unix/tap.api.h				\
+  vnet/unix/tapcli.h
+
+API_FILES += vnet/unix/tap.api
+
+########################################
+# FIB
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/fib/fib.c                                \
+  vnet/fib/fib_test.c                           \
+  vnet/fib/ip4_fib.c                            \
+  vnet/fib/ip6_fib.c                            \
+  vnet/fib/mpls_fib.c                           \
+  vnet/fib/fib_table.c                          \
+  vnet/fib/fib_walk.c                           \
+  vnet/fib/fib_types.c                          \
+  vnet/fib/fib_node.c                           \
+  vnet/fib/fib_node_list.c                      \
+  vnet/fib/fib_entry.c                          \
+  vnet/fib/fib_entry_src.c                      \
+  vnet/fib/fib_entry_src_rr.c                   \
+  vnet/fib/fib_entry_src_interface.c            \
+  vnet/fib/fib_entry_src_default_route.c        \
+  vnet/fib/fib_entry_src_special.c              \
+  vnet/fib/fib_entry_src_api.c                  \
+  vnet/fib/fib_entry_src_adj.c                  \
+  vnet/fib/fib_entry_src_mpls.c                 \
+  vnet/fib/fib_entry_src_lisp.c                 \
+  vnet/fib/fib_entry_cover.c                    \
+  vnet/fib/fib_entry_delegate.c                 \
+  vnet/fib/fib_path_list.c                      \
+  vnet/fib/fib_path.c				\
+  vnet/fib/fib_path_ext.c			\
+  vnet/fib/fib_urpf_list.c			\
+  vnet/fib/fib_attached_export.c
+
+nobase_include_HEADERS +=			\
+  vnet/fib/fib.h				\
+  vnet/fib/fib_api.h				\
+  vnet/fib/ip4_fib.h				\
+  vnet/fib/ip6_fib.h				\
+  vnet/fib/fib_types.h				\
+  vnet/fib/fib_table.h				\
+  vnet/fib/fib_node.h				\
+  vnet/fib/fib_node_list.h			\
+  vnet/fib/fib_entry.h				\
+  vnet/fib/fib_entry_delegate.h
+
+########################################
+# ADJ
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/adj/adj_nbr.c				\
+  vnet/adj/adj_rewrite.c			\
+  vnet/adj/adj_glean.c   			\
+  vnet/adj/adj_midchain.c   			\
+  vnet/adj/adj_l2.c      			\
+  vnet/adj/adj.c
+
+nobase_include_HEADERS +=			\
+  vnet/adj/adj.h				\
+  vnet/adj/adj_types.h				\
+  vnet/adj/adj_rewrite.h			\
+  vnet/adj/adj_glean.h  			\
+  vnet/adj/adj_nbr.h
+
+########################################
+# Data-Plane Objects
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/dpo/dpo.c				\
+  vnet/dpo/drop_dpo.c				\
+  vnet/dpo/ip_null_dpo.c			\
+  vnet/dpo/punt_dpo.c				\
+  vnet/dpo/receive_dpo.c			\
+  vnet/dpo/load_balance.c			\
+  vnet/dpo/load_balance_map.c			\
+  vnet/dpo/lookup_dpo.c				\
+  vnet/dpo/classify_dpo.c			\
+  vnet/dpo/mpls_label_dpo.c
+
+nobase_include_HEADERS +=			\
+  vnet/dpo/load_balance.h			\
+  vnet/dpo/drop_dpo.h				\
+  vnet/dpo/lookup_dpo.h				\
+  vnet/dpo/punt_dpo.h				\
+  vnet/dpo/classify_dpo.h			\
+  vnet/dpo/receive_dpo.h			\
+  vnet/dpo/ip_null_dpo.h			\
+  vnet/dpo/dpo.h
+
+########################################
+# Plugin client library
+########################################
+
+libvnetplugin_la_SOURCES +=                    \
+  vnet/plugin/p1.c
+
+nobase_include_HEADERS +=                      \
+  vnet/plugin/plugin.h
+
+libvnetdir = ${libdir}
+libvnet_LTLIBRARIES = libvnet.la libvnetplugin.la
+
+pcap2pg_SOURCES = 				\
+  vnet/unix/pcap2pg.c				\
+  vnet/unix/pcap.h
+
+pcap2pg_LDFLAGS = -static
+pcap2pg_LDADD = libvnet.la libvppinfra.la -lpthread libvlibmemory.la -lm -ldl
+
+noinst_PROGRAMS += pcap2pg
+
+# vi:syntax=automake
diff --git a/src/vnet/adj/adj.c b/src/vnet/adj/adj.c
new file mode 100644
index 00000000..e740c4cb
--- /dev/null
+++ b/src/vnet/adj/adj.c
@@ -0,0 +1,454 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/adj/adj.h>
+#include <vnet/adj/adj_internal.h>
+#include <vnet/adj/adj_glean.h>
+#include <vnet/adj/adj_midchain.h>
+#include <vnet/fib/fib_node_list.h>
+
+/*
+ * Special Adj with index zero. we need to define this since the v4 mtrie
+ * assumes an index of 0 implies the ply is empty. therefore all 'real'
+ * adjs need a non-zero index.
+ */
+static ip_adjacency_t *special_v4_miss_adj_with_index_zero;
+
+/* Adjacency packet/byte counters indexed by adjacency index. */
+vlib_combined_counter_main_t adjacency_counters;
+
+/*
+ * the single adj pool
+ */
+ip_adjacency_t *adj_pool;
+
+always_inline void
+adj_poison (ip_adjacency_t * adj)
+{
+    if (CLIB_DEBUG > 0)
+    {
+	memset (adj, 0xfe, sizeof (adj[0]));
+    }
+}
+
+ip_adjacency_t *
+adj_alloc (fib_protocol_t proto)
+{
+    ip_adjacency_t *adj;
+
+    pool_get(adj_pool, adj);
+
+    adj_poison(adj);
+
+    /* Make sure certain fields are always initialized. */
+    /* Validate adjacency counters. */
+    vlib_validate_combined_counter(&adjacency_counters,
+                                   adj_get_index(adj));
+
+    adj->rewrite_header.sw_if_index = ~0;
+    adj->mcast_group_index = ~0;
+    adj->saved_lookup_next_index = 0;
+    adj->n_adj = 1;
+    adj->lookup_next_index = 0;
+
+    fib_node_init(&adj->ia_node,
+                  FIB_NODE_TYPE_ADJ);
+    adj->ia_nh_proto = proto;
+    adj->ia_flags = 0;
+
+    ip4_main.lookup_main.adjacency_heap = adj_pool;
+    ip6_main.lookup_main.adjacency_heap = adj_pool;
+
+    return (adj);
+}
+
+static int
+adj_index_is_special (adj_index_t adj_index)
+{
+    if (ADJ_INDEX_INVALID == adj_index)
+	return (!0);
+
+    return (0);
+}
+
+/**
+ * @brief Pretty print helper function for formatting specific adjacencies.
+ * @param s - input string to format
+ * @param args - other args passed to format function such as:
+ *                 - vnet_main_t
+ *                 - ip_lookup_main_t
+ *                 - adj_index
+ */
+u8 *
+format_ip_adjacency (u8 * s, va_list * args)
+{
+    format_ip_adjacency_flags_t fiaf;
+    ip_adjacency_t * adj;
+    u32 adj_index;
+
+    adj_index = va_arg (*args, u32);
+    fiaf = va_arg (*args, format_ip_adjacency_flags_t);
+    adj = adj_get(adj_index);
+  
+    switch (adj->lookup_next_index)
+    {
+    case IP_LOOKUP_NEXT_REWRITE:
+	s = format (s, "%U", format_adj_nbr, adj_index, 0);
+	break;
+    case IP_LOOKUP_NEXT_ARP:
+	s = format (s, "%U", format_adj_nbr_incomplete, adj_index, 0);
+	break;
+    case IP_LOOKUP_NEXT_GLEAN:
+	s = format (s, "%U", format_adj_glean, adj_index, 0);
+	break;
+    case IP_LOOKUP_NEXT_MIDCHAIN:
+	s = format (s, "%U", format_adj_midchain, adj_index, 2);
+	break;
+    default:
+	break;
+    }
+
+    if (fiaf & FORMAT_IP_ADJACENCY_DETAIL)
+    {
+	s = format (s, "\n locks:%d", adj->ia_node.fn_locks);
+	s = format (s, " node:[%d]:%U",
+		    adj->rewrite_header.node_index,
+		    format_vlib_node_name, vlib_get_main(),
+		    adj->rewrite_header.node_index);
+	s = format (s, " next:[%d]:%U",
+		    adj->rewrite_header.next_index,
+		    format_vlib_next_node_name,
+		    vlib_get_main(),
+		    adj->rewrite_header.node_index,
+		    adj->rewrite_header.next_index);
+	s = format(s, "\n children:\n  ");
+	s = fib_node_children_format(adj->ia_node.fn_children, s);
+    }
+
+    return s;
+}
+
+/*
+ * adj_last_lock_gone
+ *
+ * last lock/reference to the adj has gone, we no longer need it.
+ */
+static void
+adj_last_lock_gone (ip_adjacency_t *adj)
+{
+    vlib_main_t * vm = vlib_get_main();
+
+    ASSERT(0 == fib_node_list_get_size(adj->ia_node.fn_children));
+    ADJ_DBG(adj, "last-lock-gone");
+
+    vlib_worker_thread_barrier_sync (vm);
+
+    switch (adj->lookup_next_index)
+    {
+    case IP_LOOKUP_NEXT_MIDCHAIN:
+        dpo_reset(&adj->sub_type.midchain.next_dpo);
+        /* FALL THROUGH */
+    case IP_LOOKUP_NEXT_ARP:
+    case IP_LOOKUP_NEXT_REWRITE:
+	/*
+	 * complete and incomplete nbr adjs
+	 */
+	adj_nbr_remove(adj_get_index(adj),
+                       adj->ia_nh_proto,
+		       adj->ia_link,
+		       &adj->sub_type.nbr.next_hop,
+		       adj->rewrite_header.sw_if_index);
+	break;
+    case IP_LOOKUP_NEXT_GLEAN:
+	adj_glean_remove(adj->ia_nh_proto,
+			 adj->rewrite_header.sw_if_index);
+	break;
+    default:
+	/*
+	 * type not stored in any DB from which we need to remove it
+	 */
+	break;
+    }
+
+    vlib_worker_thread_barrier_release(vm);
+
+    fib_node_deinit(&adj->ia_node);
+    pool_put(adj_pool, adj);
+}
+
+void
+adj_lock (adj_index_t adj_index)
+{
+    ip_adjacency_t *adj;
+
+    if (adj_index_is_special(adj_index))
+    {
+	return;
+    }
+
+    adj = adj_get(adj_index);
+    ASSERT(adj);
+
+    ADJ_DBG(adj, "lock");
+    fib_node_lock(&adj->ia_node);
+}
+
+void
+adj_unlock (adj_index_t adj_index)
+{
+    ip_adjacency_t *adj;
+
+    if (adj_index_is_special(adj_index))
+    {
+	return;
+    }
+
+    adj = adj_get(adj_index);
+    ASSERT(adj);
+
+    ADJ_DBG(adj, "unlock");
+    ASSERT(adj);
+
+    fib_node_unlock(&adj->ia_node);
+}
+
+u32
+adj_child_add (adj_index_t adj_index,
+	       fib_node_type_t child_type,
+	       fib_node_index_t child_index)
+{
+    ASSERT(ADJ_INDEX_INVALID != adj_index);
+    if (adj_index_is_special(adj_index))
+    {
+	return (~0);
+    }
+
+    return (fib_node_child_add(FIB_NODE_TYPE_ADJ,
+                               adj_index,
+                               child_type,
+                               child_index));
+}
+
+void
+adj_child_remove (adj_index_t adj_index,
+		  u32 sibling_index)
+{
+    if (adj_index_is_special(adj_index))
+    {
+	return;
+    }
+
+    fib_node_child_remove(FIB_NODE_TYPE_ADJ,
+                          adj_index,
+                          sibling_index);
+}
+
+/**
+ * @brief Return the link type of the adjacency
+ */
+vnet_link_t
+adj_get_link_type (adj_index_t ai)
+{
+    const ip_adjacency_t *adj;
+
+    adj = adj_get(ai);
+
+    return (adj->ia_link); 
+}
+
+/**
+ * @brief Return the sw interface index of the adjacency.
+ */
+u32
+adj_get_sw_if_index (adj_index_t ai)
+{
+    const ip_adjacency_t *adj;
+
+    adj = adj_get(ai);
+
+    return (adj->rewrite_header.sw_if_index);
+}
+
+/**
+ * @brief Return the link type of the adjacency
+ */
+const u8*
+adj_get_rewrite (adj_index_t ai)
+{
+    vnet_rewrite_header_t *rw;
+    ip_adjacency_t *adj;
+
+    adj = adj_get(ai);
+    rw = &adj->rewrite_header;
+
+    ASSERT (rw->data_bytes != 0xfefe);
+
+    return (rw->data - rw->data_bytes);
+}
+
+static fib_node_t *
+adj_get_node (fib_node_index_t index)
+{
+    ip_adjacency_t *adj;
+
+    adj = adj_get(index);
+
+    return (&adj->ia_node);
+}
+
+#define ADJ_FROM_NODE(_node)						\
+    ((ip_adjacency_t*)((char*)_node - STRUCT_OFFSET_OF(ip_adjacency_t, ia_node)))
+
+static void
+adj_node_last_lock_gone (fib_node_t *node)
+{
+    adj_last_lock_gone(ADJ_FROM_NODE(node));
+}
+
+static fib_node_back_walk_rc_t
+adj_back_walk_notify (fib_node_t *node,
+		      fib_node_back_walk_ctx_t *ctx)
+{
+    /*
+     * Que pasa. yo soj en el final!
+     */
+    ASSERT(0);
+
+    return (FIB_NODE_BACK_WALK_CONTINUE);
+}
+
+/*
+ * Adjacency's graph node virtual function table
+ */
+static const fib_node_vft_t adj_vft = {
+    .fnv_get = adj_get_node,
+    .fnv_last_lock = adj_node_last_lock_gone,
+    .fnv_back_walk = adj_back_walk_notify,
+};
+
+static clib_error_t *
+adj_module_init (vlib_main_t * vm)
+{
+    fib_node_register_type(FIB_NODE_TYPE_ADJ, &adj_vft);
+
+    adj_nbr_module_init();
+    adj_glean_module_init();
+    adj_midchain_module_init();
+
+    /*
+     * one special adj to reserve index 0
+     */
+    special_v4_miss_adj_with_index_zero = adj_alloc(FIB_PROTOCOL_IP4);
+
+    return (NULL);
+}
+
+VLIB_INIT_FUNCTION (adj_module_init);
+
+static clib_error_t *
+adj_show (vlib_main_t * vm,
+	  unformat_input_t * input,
+	  vlib_cli_command_t * cmd)
+{
+    adj_index_t ai = ADJ_INDEX_INVALID;
+    u32 sw_if_index = ~0;
+
+    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+	if (unformat (input, "%d", &ai))
+	    ;
+	else if (unformat (input, "%U",
+			   unformat_vnet_sw_interface, vnet_get_main(),
+			   &sw_if_index))
+	    ;
+	else
+	    break;
+    }
+
+    if (ADJ_INDEX_INVALID != ai)
+    {
+        if (pool_is_free_index(adj_pool, ai))
+        {
+	    vlib_cli_output (vm, "adjacency %d invalid", ai);
+            return 0;
+        }
+
+	vlib_cli_output (vm, "[@%d] %U",
+                         ai,
+                         format_ip_adjacency,  ai,
+			 FORMAT_IP_ADJACENCY_DETAIL);
+    }
+    else
+    {
+	/* *INDENT-OFF* */
+	pool_foreach_index(ai, adj_pool,
+	({
+	    if (~0 != sw_if_index &&
+		sw_if_index != adj_get_sw_if_index(ai))
+	    {
+            }
+            else
+            {
+		vlib_cli_output (vm, "[@%d] %U",
+				 ai,
+				 format_ip_adjacency, ai,
+				 FORMAT_IP_ADJACENCY_NONE);
+	    }
+	}));
+	/* *INDENT-ON* */
+    }
+
+    return 0;
+}
+
+/*?
+ * Show all adjacencies.
+ * @cliexpar
+ * @cliexstart{sh adj}
+ * [@0]
+ * [@1]  glean: loop0
+ * [@2] ipv4 via 1.0.0.2 loop0: IP4: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
+ * [@3] mpls via 1.0.0.2 loop0: MPLS_UNICAST: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
+ * [@4] ipv4 via 1.0.0.3 loop0: IP4: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
+ * [@5] mpls via 1.0.0.3 loop0: MPLS_UNICAST: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND (adj_show_command, static) = {
+    .path = "show adj",
+    .short_help = "show adj [<adj_index>] [interface]",
+    .function = adj_show,
+};
+
+/* 
+ * DEPRECATED: DO NOT USE
+ */
+ip_adjacency_t *
+ip_add_adjacency (ip_lookup_main_t * lm,
+		  ip_adjacency_t * copy_adj,
+		  u32 n_adj,
+		  u32 * adj_index_return)
+{
+  ip_adjacency_t * adj;
+
+  ASSERT(1==n_adj);
+
+  adj = adj_alloc(FIB_PROTOCOL_IP4);
+
+  if (copy_adj)
+      *adj = *copy_adj;
+
+  *adj_index_return = adj_get_index(adj);
+  return adj;
+}
diff --git a/src/vnet/adj/adj.h b/src/vnet/adj/adj.h
new file mode 100644
index 00000000..e85625db
--- /dev/null
+++ b/src/vnet/adj/adj.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * An adjacency is a representation of an attached L3 peer.
+ *
+ * Adjacency Sub-types:
+ *   - neighbour: a representation of an attached L3 peer.
+ *                Key:{addr,interface,link/ether-type}
+ *           SHARED
+ *   - glean: used to drive ARP/ND for packets destined to a local sub-net.
+ *            'glean' mean use the packet's destination address as the target
+ *            address in the ARP packet.
+ *          UNSHARED. Only one per-interface.
+ *   - midchain: a nighbour adj on a virtual/tunnel interface.
+ *   - rewrite: an adj with no key, but with a rewrite string.
+ *
+ * The API to create and update the adjacency is very sub-type specific. This
+ * is intentional as it encourages the user to carefully consider which adjacency
+ * sub-type they are really using, and hence assign it data in the appropriate
+ * sub-type space in the union of sub-types. This prevents the adj becoming a
+ * disorganised dumping group for 'my features needs a u16 somewhere' data. It
+ * is important to enforce this approach as space in the adjacency is a premium,
+ * as we need it to fit in 1 cache line.
+ *
+ * the API is also based around an index to an ajdacency not a raw pointer. This
+ * is so the user doesn't suffer the same limp inducing firearm injuries that
+ * the author suffered as the adjacenices can realloc.
+ */
+
+#ifndef __ADJ_H__
+#define __ADJ_H__
+
+#include <vnet/ip/lookup.h>
+#include <vnet/adj/adj_types.h>
+#include <vnet/adj/adj_nbr.h>
+#include <vnet/adj/adj_rewrite.h>
+#include <vnet/adj/adj_glean.h>
+
+/**
+ * @brief
+ *   Take a reference counting lock on the adjacency
+ */
+extern void adj_lock(adj_index_t adj_index);
+/**
+ * @brief
+ *   Release a reference counting lock on the adjacency
+ */
+extern void adj_unlock(adj_index_t adj_index);
+
+/**
+ * @brief
+ *  Add a child dependent to an adjacency. The child will
+ *  thus be informed via its registerd back-walk function
+ *  when the adjacency state changes.
+ */
+extern u32 adj_child_add(adj_index_t adj_index,
+			 fib_node_type_t type,
+			 fib_node_index_t child_index);
+/**
+ * @brief
+ *  Remove a child dependent
+ */
+extern void adj_child_remove(adj_index_t adj_index,
+			     u32 sibling_index);
+
+/**
+ * @brief Walk the Adjacencies on a given interface
+ */
+extern void adj_walk (u32 sw_if_index,
+		      adj_walk_cb_t cb,
+		      void *ctx);
+
+/**
+ * @brief Return the link type of the adjacency
+ */
+extern vnet_link_t adj_get_link_type (adj_index_t ai);
+
+/**
+ * @brief Return the sw interface index of the adjacency.
+ */
+extern u32 adj_get_sw_if_index (adj_index_t ai);
+
+/**
+ * @brief Return the link type of the adjacency
+ */
+extern const u8* adj_get_rewrite (adj_index_t ai);
+
+/**
+ * @brief
+ * The global adjacnecy pool. Exposed for fast/inline data-plane access
+ */
+extern ip_adjacency_t *adj_pool;
+
+/**
+ * @brief 
+ * Adjacency packet counters
+ */
+extern vlib_combined_counter_main_t adjacency_counters;
+
+/**
+ * @brief
+ * Get a pointer to an adjacency object from its index
+ */
+static inline ip_adjacency_t *
+adj_get (adj_index_t adj_index)
+{
+    return (vec_elt_at_index(adj_pool, adj_index));
+}
+
+#endif
diff --git a/src/vnet/adj/adj_glean.c b/src/vnet/adj/adj_glean.c
new file mode 100644
index 00000000..8d86e2a9
--- /dev/null
+++ b/src/vnet/adj/adj_glean.c
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/adj/adj.h>
+#include <vnet/adj/adj_internal.h>
+#include <vnet/fib/fib_walk.h>
+
+/*
+ * The 'DB' of all glean adjs.
+ * There is only one glean per-interface per-protocol, so this is a per-interface
+ * vector
+ */
+static adj_index_t *adj_gleans[FIB_PROTOCOL_MAX];
+
+static inline vlib_node_registration_t*
+adj_get_glean_node (fib_protocol_t proto)
+{
+    switch (proto) {
+    case FIB_PROTOCOL_IP4:
+	return (&ip4_glean_node);
+    case FIB_PROTOCOL_IP6:
+	return (&ip6_glean_node);
+    case FIB_PROTOCOL_MPLS:
+	break;
+    }
+    ASSERT(0);
+    return (NULL);
+}
+
+/*
+ * adj_glean_add_or_lock
+ *
+ * The next_hop address here is used for source address selection in the DP.
+ * The glean adj is added to an interface's connected prefix, the next-hop
+ * passed here is the local prefix on the same interface.
+ */
+adj_index_t
+adj_glean_add_or_lock (fib_protocol_t proto,
+		       u32 sw_if_index,
+		       const ip46_address_t *nh_addr)
+{
+    ip_adjacency_t * adj;
+
+    vec_validate_init_empty(adj_gleans[proto], sw_if_index, ADJ_INDEX_INVALID);
+
+    if (ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index])
+    {
+	adj = adj_alloc(proto);
+
+	adj->lookup_next_index = IP_LOOKUP_NEXT_GLEAN;
+	adj->ia_nh_proto = proto;
+	adj_gleans[proto][sw_if_index] = adj_get_index(adj);
+
+	if (NULL != nh_addr)
+	{
+	    adj->sub_type.glean.receive_addr = *nh_addr;
+	}
+
+	adj->rewrite_header.data_bytes = 0;
+
+	vnet_rewrite_for_sw_interface(vnet_get_main(),
+				      adj_fib_proto_2_nd(proto),
+				      sw_if_index,
+				      adj_get_glean_node(proto)->index,
+				      VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST,
+				      &adj->rewrite_header,
+				      sizeof (adj->rewrite_data));
+    }
+    else
+    {
+	adj = adj_get(adj_gleans[proto][sw_if_index]);
+    }
+
+    adj_lock(adj_get_index(adj));
+
+    return (adj_get_index(adj));
+}
+
+void
+adj_glean_remove (fib_protocol_t proto,
+		  u32 sw_if_index)
+{
+    ASSERT(sw_if_index < vec_len(adj_gleans[proto]));
+
+    adj_gleans[proto][sw_if_index] = ADJ_INDEX_INVALID;
+}
+
+static clib_error_t *
+adj_glean_interface_state_change (vnet_main_t * vnm,
+				  u32 sw_if_index,
+				  u32 flags)
+{
+    /*
+     * for each glean on the interface trigger a walk back to the children
+     */
+    fib_protocol_t proto;
+    ip_adjacency_t *adj;
+
+
+    for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
+    {
+	if (sw_if_index >= vec_len(adj_gleans[proto]) ||
+	    ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index])
+	    continue;
+
+	adj = adj_get(adj_gleans[proto][sw_if_index]);
+
+	fib_node_back_walk_ctx_t bw_ctx = {
+	    .fnbw_reason = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP ?
+			    FIB_NODE_BW_REASON_FLAG_INTERFACE_UP :
+			    FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN),
+	};
+
+	fib_walk_sync(FIB_NODE_TYPE_ADJ, adj_get_index(adj), &bw_ctx);
+    }
+
+    return (NULL);
+}
+
+VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION(adj_glean_interface_state_change);
+
+/**
+ * @brief Invoked on each SW interface of a HW interface when the
+ * HW interface state changes
+ */
+static void
+adj_nbr_hw_sw_interface_state_change (vnet_main_t * vnm,
+                                      u32 sw_if_index,
+                                      void *arg)
+{
+    adj_glean_interface_state_change(vnm, sw_if_index, (uword) arg);
+}
+
+/**
+ * @brief Registered callback for HW interface state changes
+ */
+static clib_error_t *
+adj_glean_hw_interface_state_change (vnet_main_t * vnm,
+                                     u32 hw_if_index,
+                                     u32 flags)
+{
+    /*
+     * walk SW interfaces on the HW
+     */
+    uword sw_flags;
+
+    sw_flags = ((flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ?
+                VNET_SW_INTERFACE_FLAG_ADMIN_UP :
+                0);
+
+    vnet_hw_interface_walk_sw(vnm, hw_if_index,
+                              adj_nbr_hw_sw_interface_state_change,
+                              (void*) sw_flags);
+
+    return (NULL);
+}
+
+VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION(
+    adj_glean_hw_interface_state_change);
+
+static clib_error_t *
+adj_glean_interface_delete (vnet_main_t * vnm,
+			    u32 sw_if_index,
+			    u32 is_add)
+{
+    /*
+     * for each glean on the interface trigger a walk back to the children
+     */
+    fib_protocol_t proto;
+    ip_adjacency_t *adj;
+
+    if (is_add)
+    {
+	/*
+	 * not interested in interface additions. we will not back walk
+	 * to resolve paths through newly added interfaces. Why? The control
+	 * plane should have the brains to add interfaces first, then routes.
+	 * So the case where there are paths with a interface that matches
+	 * one just created is the case where the path resolved through an
+	 * interface that was deleted, and still has not been removed. The
+	 * new interface added, is NO GUARANTEE that the interface being
+	 * added now, even though it may have the same sw_if_index, is the
+	 * same interface that the path needs. So tough!
+	 * If the control plane wants these routes to resolve it needs to
+	 * remove and add them again.
+	 */
+	return (NULL);
+    }
+
+    for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
+    {
+	if (sw_if_index >= vec_len(adj_gleans[proto]) ||
+	    ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index])
+	    continue;
+
+	adj = adj_get(adj_gleans[proto][sw_if_index]);
+
+	fib_node_back_walk_ctx_t bw_ctx = {
+	    .fnbw_reason =  FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE,
+	};
+
+	fib_walk_sync(FIB_NODE_TYPE_ADJ, adj_get_index(adj), &bw_ctx);
+    }
+
+    return (NULL);
+}
+
+VNET_SW_INTERFACE_ADD_DEL_FUNCTION(adj_glean_interface_delete);
+
+u8*
+format_adj_glean (u8* s, va_list *ap)
+{
+    index_t index = va_arg(*ap, index_t);
+    CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
+    vnet_main_t * vnm = vnet_get_main();
+    ip_adjacency_t * adj = adj_get(index);
+
+    return (format(s, "%U-glean: %U",
+		   format_fib_protocol, adj->ia_nh_proto,
+                   format_vnet_sw_interface_name,
+                   vnm,
+                   vnet_get_sw_interface(vnm,
+                                         adj->rewrite_header.sw_if_index)));
+}
+
+
+static void
+adj_dpo_lock (dpo_id_t *dpo)
+{
+    adj_lock(dpo->dpoi_index);
+}
+static void
+adj_dpo_unlock (dpo_id_t *dpo)
+{
+    adj_unlock(dpo->dpoi_index);
+}
+
+const static dpo_vft_t adj_glean_dpo_vft = {
+    .dv_lock = adj_dpo_lock,
+    .dv_unlock = adj_dpo_unlock,
+    .dv_format = format_adj_glean,
+};
+
+/**
+ * @brief The per-protocol VLIB graph nodes that are assigned to a glean
+ *        object.
+ *
+ * this means that these graph nodes are ones from which a glean is the
+ * parent object in the DPO-graph.
+ */
+const static char* const glean_ip4_nodes[] =
+{
+    "ip4-glean",
+    NULL,
+};
+const static char* const glean_ip6_nodes[] =
+{
+    "ip6-glean",
+    NULL,
+};
+
+const static char* const * const glean_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = glean_ip4_nodes,
+    [DPO_PROTO_IP6]  = glean_ip6_nodes,
+    [DPO_PROTO_MPLS] = NULL,
+};
+
+void
+adj_glean_module_init (void)
+{
+    dpo_register(DPO_ADJACENCY_GLEAN, &adj_glean_dpo_vft, glean_nodes);
+}
diff --git a/src/vnet/adj/adj_glean.h b/src/vnet/adj/adj_glean.h
new file mode 100644
index 00000000..640bd2f9
--- /dev/null
+++ b/src/vnet/adj/adj_glean.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @brief Glean Adjacency
+ *
+ * A gleean adjacency represent the need to discover new peers on an
+ * attached link. Packets that hit a glean adjacency will generate an
+ * ARP/ND packet addessesed to the packet's destination address.
+ * Note this is different to an incomplete neighbour adjacency, which
+ * does not send ARP/ND requests to the packet's destination address,
+ * but instead to the next-hop address of the adjacency itself.
+ */
+
+#ifndef __ADJ_GLEAN_H__
+#define __ADJ_GLEAN_H__
+
+#include <vnet/adj/adj_types.h>
+
+/**
+ * @brief
+ *  Add (and lock) a new or lock an existing glean adjacency
+ *
+ * @param proto
+ *  The protocol for the neighbours that we wish to glean
+ *
+ * @param sw_if_index
+ *  The interface on which to glean
+ *
+ * @param nh_addr
+ *  the address applied to the interface on which to glean. This
+ *  as the source address in packets when the ARP/ND packet is sent
+ */
+extern adj_index_t adj_glean_add_or_lock(fib_protocol_t proto,
+					 u32 sw_if_index,
+					 const ip46_address_t *nh_addr);
+
+/**
+ * @brief Format/display a glean adjacency.
+ */
+extern u8* format_adj_glean(u8* s, va_list *ap);
+
+/**
+ * @brief
+ *  Module initialisation
+ */
+extern void adj_glean_module_init(void);
+
+#endif
diff --git a/src/vnet/adj/adj_internal.h b/src/vnet/adj/adj_internal.h
new file mode 100644
index 00000000..833bc7c9
--- /dev/null
+++ b/src/vnet/adj/adj_internal.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __ADJ_INTERNAL_H__
+#define __ADJ_INTERNAL_H__
+
+#include <vnet/adj/adj.h>
+#include <vnet/ip/ip.h>
+#include <vnet/mpls/mpls.h>
+#include <vnet/adj/adj_l2.h>
+
+
+/**
+ * big switch to turn on Adjacency debugging
+ */
+#undef ADJ_DEBUG
+
+/*
+ * Debug macro
+ */
+#ifdef ADJ_DEBUG
+#define ADJ_DBG(_adj, _fmt, _args...)		\
+{						\
+    clib_warning("adj:[%d:%p]:" _fmt,		\
+		 _adj - adj_pool, _adj,		\
+		 ##_args);			\
+}
+#else
+#define ADJ_DBG(_e, _fmt, _args...)
+#endif
+
+static inline u32
+adj_get_rewrite_node (vnet_link_t linkt)
+{
+    switch (linkt) {
+    case VNET_LINK_IP4:
+	return (ip4_rewrite_node.index);
+    case VNET_LINK_IP6:
+	return (ip6_rewrite_node.index);
+    case VNET_LINK_MPLS:
+	return (mpls_output_node.index);
+    case VNET_LINK_ETHERNET:
+	return (adj_l2_rewrite_node.index);
+    case VNET_LINK_ARP:
+	break;
+    }
+    ASSERT(0);
+    return (0);
+}
+
+static inline vnet_link_t
+adj_fib_proto_2_nd (fib_protocol_t fp)
+{
+    switch (fp)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (VNET_LINK_ARP);
+    case FIB_PROTOCOL_IP6:
+	return (VNET_LINK_IP6);
+    case FIB_PROTOCOL_MPLS:
+	return (VNET_LINK_MPLS);
+    }
+    return (0);
+}
+
+/**
+ * @brief
+ * Get a pointer to an adjacency object from its index
+ */
+static inline adj_index_t
+adj_get_index (ip_adjacency_t *adj)
+{
+    return (adj - adj_pool);
+}
+
+extern void adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
+					     ip_lookup_next_t adj_next_index,
+					     u32 complete_next_index,
+					     u32 next_index,
+					     u8 *rewrite);
+
+extern ip_adjacency_t * adj_alloc(fib_protocol_t proto);
+
+extern void adj_nbr_remove(adj_index_t ai,
+                           fib_protocol_t nh_proto,
+			   vnet_link_t link_type,
+			   const ip46_address_t *nh_addr,
+			   u32 sw_if_index);
+extern void adj_glean_remove(fib_protocol_t proto,
+			     u32 sw_if_index);
+
+#endif
diff --git a/src/vnet/adj/adj_l2.c b/src/vnet/adj/adj_l2.c
new file mode 100644
index 00000000..4d2dd708
--- /dev/null
+++ b/src/vnet/adj/adj_l2.c
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/adj/adj_l2.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/ip.h>
+
+/**
+ * @brief Trace data for a L2 Midchain
+ */
+typedef struct adj_l2_trace_t_ {
+    /** Adjacency index taken. */
+    u32 adj_index;
+} adj_l2_trace_t;
+
+static u8 *
+format_adj_l2_trace (u8 * s, va_list * args)
+{
+    CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+    CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+    adj_l2_trace_t * t = va_arg (*args, adj_l2_trace_t *);
+
+    s = format (s, "adj-idx %d : %U",
+		t->adj_index,
+		format_ip_adjacency, t->adj_index, FORMAT_IP_ADJACENCY_NONE);
+    return s;
+}
+
+typedef enum adj_l2_rewrite_next_t_
+{
+    ADJ_L2_REWRITE_NEXT_DROP,
+} adj_l2_rewrite_next_t;
+
+always_inline uword
+adj_l2_rewrite_inline (vlib_main_t * vm,
+		       vlib_node_runtime_t * node,
+		       vlib_frame_t * frame,
+		       int is_midchain)
+{
+    u32 * from = vlib_frame_vector_args (frame);
+    u32 n_left_from, n_left_to_next, * to_next, next_index;
+    u32 cpu_index = os_get_cpu_number();
+    ethernet_main_t * em = &ethernet_main;
+
+    n_left_from = frame->n_vectors;
+    next_index = node->cached_next_index;
+
+    while (n_left_from > 0)
+    {
+	vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+	while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	    ip_adjacency_t * adj0;
+	    vlib_buffer_t * p0;
+	    char *h0;
+	    u32 pi0, rw_len0, adj_index0, next0 = 0;
+	    u32 tx_sw_if_index0;
+
+	    pi0 = to_next[0] = from[0];
+	    from += 1;
+	    n_left_from -= 1;
+	    to_next += 1;
+	    n_left_to_next -= 1;
+
+	    p0 = vlib_get_buffer (vm, pi0);
+	    h0 = vlib_buffer_get_current (p0);
+
+	    adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+
+	    /* We should never rewrite a pkt using the MISS adjacency */
+	    ASSERT(adj_index0);
+
+	    adj0 = adj_get (adj_index0);
+
+	    /* Guess we are only writing on simple Ethernet header. */
+	    vnet_rewrite_one_header (adj0[0], h0,
+				     sizeof (ethernet_header_t));
+
+	    /* Update packet buffer attributes/set output interface. */
+	    rw_len0 = adj0[0].rewrite_header.data_bytes;
+	    vnet_buffer(p0)->ip.save_rewrite_length = rw_len0;
+
+	    vlib_increment_combined_counter
+		(&adjacency_counters,
+		 cpu_index, adj_index0,
+		 /* packet increment */ 0,
+		 /* byte increment */ rw_len0-sizeof(ethernet_header_t));
+
+	    /* Check MTU of outgoing interface. */
+	    if (PREDICT_TRUE((vlib_buffer_length_in_chain (vm, p0)  <=
+			      adj0[0].rewrite_header.max_l3_packet_bytes)))
+	    {
+		/* Don't adjust the buffer for ttl issue; icmp-error node wants
+		 * to see the IP headerr */
+		p0->current_data -= rw_len0;
+		p0->current_length += rw_len0;
+		tx_sw_if_index0 = adj0[0].rewrite_header.sw_if_index;
+
+		if (is_midchain)
+		{
+		    adj0->sub_type.midchain.fixup_func(vm, adj0, p0);
+		}
+
+		vnet_buffer (p0)->sw_if_index[VLIB_TX] = tx_sw_if_index0;
+
+		/*
+		 * Follow the feature ARC. this will result eventually in
+		 * the midchain-tx node
+		 */
+		vnet_feature_arc_start(em->output_feature_arc_index, tx_sw_if_index0, &next0, p0);
+	    }
+	    else
+	    {
+		/* can't fragment L2 */
+		next0 = ADJ_L2_REWRITE_NEXT_DROP;
+	    }
+
+	    if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+		adj_l2_trace_t *tr = vlib_add_trace (vm, node,
+						     p0, sizeof (*tr));
+		tr->adj_index = vnet_buffer(p0)->ip.adj_index[VLIB_TX];
+	    }
+
+	    vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					     to_next, n_left_to_next,
+					     pi0, next0);
+	}
+
+	vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+    return frame->n_vectors;
+}
+
+static uword
+adj_l2_rewrite (vlib_main_t * vm,
+		vlib_node_runtime_t * node,
+		vlib_frame_t * frame)
+{
+    return adj_l2_rewrite_inline (vm, node, frame, 0);
+}
+
+static uword
+adj_l2_midchain (vlib_main_t * vm,
+		 vlib_node_runtime_t * node,
+		 vlib_frame_t * frame)
+{
+    return adj_l2_rewrite_inline (vm, node, frame, 1);
+}
+
+VLIB_REGISTER_NODE (adj_l2_rewrite_node) = {
+    .function = adj_l2_rewrite,
+    .name = "adj-l2-rewrite",
+    .vector_size = sizeof (u32),
+
+    .format_trace = format_adj_l2_trace,
+
+    .n_next_nodes = 1,
+    .next_nodes = {
+	[ADJ_L2_REWRITE_NEXT_DROP] = "error-drop",
+    },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (adj_l2_rewrite_node, adj_l2_rewrite)
+
+VLIB_REGISTER_NODE (adj_l2_midchain_node) = {
+    .function = adj_l2_midchain,
+    .name = "adj-l2-midchain",
+    .vector_size = sizeof (u32),
+
+    .format_trace = format_adj_l2_trace,
+
+    .n_next_nodes = 1,
+    .next_nodes = {
+	[ADJ_L2_REWRITE_NEXT_DROP] = "error-drop",
+    },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (adj_l2_midchain_node, adj_l2_midchain)
diff --git a/src/vnet/adj/adj_l2.h b/src/vnet/adj/adj_l2.h
new file mode 100644
index 00000000..3aa1c74b
--- /dev/null
+++ b/src/vnet/adj/adj_l2.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __ADJ_L2_H__
+#define __ADJ_L2_H__
+
+#include <vnet/adj/adj.h>
+
+extern vlib_node_registration_t adj_l2_midchain_node;
+extern vlib_node_registration_t adj_l2_rewrite_node;
+
+#endif
diff --git a/src/vnet/adj/adj_midchain.c b/src/vnet/adj/adj_midchain.c
new file mode 100644
index 00000000..8c6ab5aa
--- /dev/null
+++ b/src/vnet/adj/adj_midchain.c
@@ -0,0 +1,559 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/adj/adj_nbr.h>
+#include <vnet/adj/adj_internal.h>
+#include <vnet/adj/adj_l2.h>
+#include <vnet/adj/adj_midchain.h>
+#include <vnet/ethernet/arp_packet.h>
+#include <vnet/dpo/drop_dpo.h>
+#include <vnet/fib/fib_walk.h>
+
+/**
+ * The two midchain tx feature node indices
+ */
+static u32 adj_midchain_tx_feature_node[VNET_LINK_NUM];
+static u32 adj_midchain_tx_no_count_feature_node[VNET_LINK_NUM];
+
+/**
+ * @brief Trace data for packets traversing the midchain tx node
+ */
+typedef struct adj_midchain_tx_trace_t_
+{
+    /**
+     * @brief the midchain adj we are traversing
+     */
+    adj_index_t ai;
+} adj_midchain_tx_trace_t;
+
+always_inline uword
+adj_midchain_tx_inline (vlib_main_t * vm,
+			vlib_node_runtime_t * node,
+			vlib_frame_t * frame,
+			int interface_count)
+{
+    u32 * from, * to_next, n_left_from, n_left_to_next;
+    u32 next_index;
+    vnet_main_t *vnm = vnet_get_main ();
+    vnet_interface_main_t *im = &vnm->interface_main;
+    u32 cpu_index = vm->cpu_index;
+
+    /* Vector of buffer / pkt indices we're supposed to process */
+    from = vlib_frame_vector_args (frame);
+
+    /* Number of buffers / pkts */
+    n_left_from = frame->n_vectors;
+
+    /* Speculatively send the first buffer to the last disposition we used */
+    next_index = node->cached_next_index;
+
+    while (n_left_from > 0)
+    {
+	/* set up to enqueue to our disposition with index = next_index */
+	vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+
+	while (n_left_from >= 4 && n_left_to_next > 2)
+	{
+	    u32 bi0, adj_index0, next0;
+	    const ip_adjacency_t * adj0;
+	    const dpo_id_t *dpo0;
+	    vlib_buffer_t * b0;
+	    u32 bi1, adj_index1, next1;
+	    const ip_adjacency_t * adj1;
+	    const dpo_id_t *dpo1;
+	    vlib_buffer_t * b1;
+
+	    /* Prefetch next iteration. */
+	    {
+		vlib_buffer_t * p2, * p3;
+
+		p2 = vlib_get_buffer (vm, from[2]);
+		p3 = vlib_get_buffer (vm, from[3]);
+
+		vlib_prefetch_buffer_header (p2, LOAD);
+		vlib_prefetch_buffer_header (p3, LOAD);
+
+		CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+		CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    }
+
+	    bi0 = from[0];
+	    to_next[0] = bi0;
+	    bi1 = from[1];
+	    to_next[1] = bi1;
+
+	    from += 2;
+	    to_next += 2;
+	    n_left_from -= 2;
+	    n_left_to_next -= 2;
+
+	    b0 = vlib_get_buffer(vm, bi0);
+	    b1 = vlib_get_buffer(vm, bi1);
+
+	    /* Follow the DPO on which the midchain is stacked */
+	    adj_index0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
+	    adj_index1 = vnet_buffer(b1)->ip.adj_index[VLIB_TX];
+
+	    adj0 = adj_get(adj_index0);
+	    adj1 = adj_get(adj_index1);
+
+	    dpo0 = &adj0->sub_type.midchain.next_dpo;
+	    dpo1 = &adj1->sub_type.midchain.next_dpo;
+
+	    next0 = dpo0->dpoi_next_node;
+	    next1 = dpo1->dpoi_next_node;
+
+	    vnet_buffer(b1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
+	    vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+
+	    if (interface_count)
+	    {
+		vlib_increment_combined_counter (im->combined_sw_if_counters
+						 + VNET_INTERFACE_COUNTER_TX,
+						 cpu_index,
+						 adj0->rewrite_header.sw_if_index,
+						 1,
+						 vlib_buffer_length_in_chain (vm, b0));
+		vlib_increment_combined_counter (im->combined_sw_if_counters
+						 + VNET_INTERFACE_COUNTER_TX,
+						 cpu_index,
+						 adj1->rewrite_header.sw_if_index,
+						 1,
+						 vlib_buffer_length_in_chain (vm, b1));
+	    }
+
+	    if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+		adj_midchain_tx_trace_t *tr = vlib_add_trace (vm, node,
+							      b0, sizeof (*tr));
+		tr->ai = adj_index0;
+	    }
+	    if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+		adj_midchain_tx_trace_t *tr = vlib_add_trace (vm, node,
+							      b1, sizeof (*tr));
+		tr->ai = adj_index1;
+	    }
+
+	    vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					     to_next, n_left_to_next,
+					     bi0, bi1,
+					     next0, next1);
+	}
+	while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	    u32 bi0, adj_index0, next0;
+	    const ip_adjacency_t * adj0;
+	    const dpo_id_t *dpo0;
+	    vlib_buffer_t * b0;
+
+	    bi0 = from[0];
+	    to_next[0] = bi0;
+	    from += 1;
+	    to_next += 1;
+	    n_left_from -= 1;
+	    n_left_to_next -= 1;
+
+	    b0 = vlib_get_buffer(vm, bi0);
+
+	    /* Follow the DPO on which the midchain is stacked */
+	    adj_index0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
+	    adj0 = adj_get(adj_index0);
+	    dpo0 = &adj0->sub_type.midchain.next_dpo;
+	    next0 = dpo0->dpoi_next_node;
+	    vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+
+	    if (interface_count)
+	    {
+		vlib_increment_combined_counter (im->combined_sw_if_counters
+						 + VNET_INTERFACE_COUNTER_TX,
+						 cpu_index,
+						 adj0->rewrite_header.sw_if_index,
+						 1,
+						 vlib_buffer_length_in_chain (vm, b0));
+	    }
+
+	    if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+		adj_midchain_tx_trace_t *tr = vlib_add_trace (vm, node,
+							      b0, sizeof (*tr));
+		tr->ai = adj_index0;
+	    }
+
+	    vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					     to_next, n_left_to_next,
+					     bi0, next0);
+	}
+
+	vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+    return frame->n_vectors;
+}
+
+static u8 *
+format_adj_midchain_tx_trace (u8 * s, va_list * args)
+{
+    CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+    CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+    adj_midchain_tx_trace_t *tr = va_arg (*args, adj_midchain_tx_trace_t*);
+
+    s = format(s, "adj-midchain:[%d]:%U", tr->ai,
+	       format_ip_adjacency, tr->ai,
+	       FORMAT_IP_ADJACENCY_NONE);
+
+    return (s);
+}
+
+static uword
+adj_midchain_tx (vlib_main_t * vm,
+		 vlib_node_runtime_t * node,
+		 vlib_frame_t * frame)
+{
+    return (adj_midchain_tx_inline(vm, node, frame, 1));
+}
+
+VLIB_REGISTER_NODE (adj_midchain_tx_node, static) = {
+    .function = adj_midchain_tx,
+    .name = "adj-midchain-tx",
+    .vector_size = sizeof (u32),
+
+    .format_trace = format_adj_midchain_tx_trace,
+
+    .n_next_nodes = 1,
+    .next_nodes = {
+	[0] = "error-drop",
+    },
+};
+
+static uword
+adj_midchain_tx_no_count (vlib_main_t * vm,
+			  vlib_node_runtime_t * node,
+			  vlib_frame_t * frame)
+{
+    return (adj_midchain_tx_inline(vm, node, frame, 0));
+}
+
+VLIB_REGISTER_NODE (adj_midchain_tx_no_count_node, static) = {
+    .function = adj_midchain_tx_no_count,
+    .name = "adj-midchain-tx-no-count",
+    .vector_size = sizeof (u32),
+
+    .format_trace = format_adj_midchain_tx_trace,
+
+    .n_next_nodes = 1,
+    .next_nodes = {
+	[0] = "error-drop",
+    },
+};
+
+VNET_FEATURE_INIT (adj_midchain_tx_ip4, static) = {
+    .arc_name = "ip4-output",
+    .node_name = "adj-midchain-tx",
+    .runs_before = VNET_FEATURES ("interface-output"),
+    .feature_index_ptr = &adj_midchain_tx_feature_node[VNET_LINK_IP4],
+};
+VNET_FEATURE_INIT (adj_midchain_tx_no_count_ip4, static) = {
+    .arc_name = "ip4-output",
+    .node_name = "adj-midchain-tx-no-count",
+    .runs_before = VNET_FEATURES ("interface-output"),
+    .feature_index_ptr = &adj_midchain_tx_no_count_feature_node[VNET_LINK_IP4],
+};
+VNET_FEATURE_INIT (adj_midchain_tx_ip6, static) = {
+    .arc_name = "ip6-output",
+    .node_name = "adj-midchain-tx",
+    .runs_before = VNET_FEATURES ("interface-output"),
+    .feature_index_ptr = &adj_midchain_tx_feature_node[VNET_LINK_IP6],
+};
+VNET_FEATURE_INIT (adj_midchain_tx_no_count_ip6, static) = {
+    .arc_name = "ip6-output",
+    .node_name = "adj-midchain-tx-no-count",
+    .runs_before = VNET_FEATURES ("interface-output"),
+    .feature_index_ptr = &adj_midchain_tx_no_count_feature_node[VNET_LINK_IP6],
+};
+VNET_FEATURE_INIT (adj_midchain_tx_mpls, static) = {
+    .arc_name = "mpls-output",
+    .node_name = "adj-midchain-tx",
+    .runs_before = VNET_FEATURES ("interface-output"),
+    .feature_index_ptr = &adj_midchain_tx_feature_node[VNET_LINK_MPLS],
+};
+VNET_FEATURE_INIT (adj_midchain_tx_no_count_mpls, static) = {
+    .arc_name = "mpls-output",
+    .node_name = "adj-midchain-tx-no-count",
+    .runs_before = VNET_FEATURES ("interface-output"),
+    .feature_index_ptr = &adj_midchain_tx_no_count_feature_node[VNET_LINK_MPLS],
+};
+VNET_FEATURE_INIT (adj_midchain_tx_ethernet, static) = {
+    .arc_name = "ethernet-output",
+    .node_name = "adj-midchain-tx",
+    .runs_before = VNET_FEATURES ("error-drop"),
+    .feature_index_ptr = &adj_midchain_tx_feature_node[VNET_LINK_ETHERNET],
+};
+VNET_FEATURE_INIT (adj_midchain_tx_no_count_ethernet, static) = {
+    .arc_name = "ethernet-output",
+    .node_name = "adj-midchain-tx-no-count",
+    .runs_before = VNET_FEATURES ("error-drop"),
+    .feature_index_ptr = &adj_midchain_tx_no_count_feature_node[VNET_LINK_ETHERNET],
+};
+
+static inline u32
+adj_get_midchain_node (vnet_link_t link)
+{
+    switch (link) {
+    case VNET_LINK_IP4:
+	return (ip4_midchain_node.index);
+    case VNET_LINK_IP6:
+	return (ip6_midchain_node.index);
+    case VNET_LINK_MPLS:
+	return (mpls_midchain_node.index);
+    case VNET_LINK_ETHERNET:
+	return (adj_l2_midchain_node.index);
+    case VNET_LINK_ARP:
+	break;
+    }
+    ASSERT(0);
+    return (0);
+}
+
+static u8
+adj_midchain_get_feature_arc_index_for_link_type (const ip_adjacency_t *adj)
+{
+  u8 arc = (u8) ~0;
+    switch (adj->ia_link)
+    {
+    case VNET_LINK_IP4:
+	{
+	    arc = ip4_main.lookup_main.output_feature_arc_index;
+	    break;
+	}
+    case VNET_LINK_IP6:
+	{
+	    arc = ip6_main.lookup_main.output_feature_arc_index;
+	    break;
+	}
+    case VNET_LINK_MPLS:
+	{
+	    arc = mpls_main.output_feature_arc_index;
+	    break;
+	}
+    case VNET_LINK_ETHERNET:
+	{
+	    arc = ethernet_main.output_feature_arc_index;
+	    break;
+	}
+    case VNET_LINK_ARP:
+	ASSERT(0);
+	break;
+    }
+
+    ASSERT (arc != (u8) ~0);
+
+    return (arc);
+}
+
+/**
+ * adj_nbr_midchain_update_rewrite
+ *
+ * Update the adjacency's rewrite string. A NULL string implies the
+ * rewrite is reset (i.e. when ARP/ND etnry is gone).
+ * NB: the adj being updated may be handling traffic in the DP.
+ */
+void
+adj_nbr_midchain_update_rewrite (adj_index_t adj_index,
+				 adj_midchain_fixup_t fixup,
+				 adj_midchain_flag_t flags,
+				 u8 *rewrite)
+{
+    ip_adjacency_t *adj;
+    u8 arc_index;
+    u32 feature_index;
+
+    ASSERT(ADJ_INDEX_INVALID != adj_index);
+
+    adj = adj_get(adj_index);
+
+    /*
+     * one time only update. since we don't support chainging the tunnel
+     * src,dst, this is all we need.
+     */
+    ASSERT(adj->lookup_next_index == IP_LOOKUP_NEXT_ARP);
+    /*
+     * tunnels can always provide a rewrite.
+     */
+    ASSERT(NULL != rewrite);
+
+    adj->sub_type.midchain.fixup_func = fixup;
+
+    arc_index = adj_midchain_get_feature_arc_index_for_link_type (adj);
+    feature_index = (flags & ADJ_MIDCHAIN_FLAG_NO_COUNT) ?
+                    adj_midchain_tx_no_count_feature_node[adj->ia_link] :
+                    adj_midchain_tx_feature_node[adj->ia_link];
+
+    adj->sub_type.midchain.tx_function_node = (flags & ADJ_MIDCHAIN_FLAG_NO_COUNT) ?
+                                               adj_midchain_tx_no_count_node.index :
+                                               adj_midchain_tx_node.index;
+
+    vnet_feature_enable_disable_with_index (arc_index, feature_index,
+					    adj->rewrite_header.sw_if_index,
+					    1 /* enable */, 0, 0);
+
+    /*
+     * stack the midchain on the drop so it's ready to forward in the adj-midchain-tx.
+     * The graph arc used/created here is from the midchain-tx node to the
+     * child's registered node. This is because post adj processing the next
+     * node are any output features, then the midchain-tx.  from there we
+     * need to get to the stacked child's node.
+     */
+    dpo_stack_from_node(adj->sub_type.midchain.tx_function_node,
+			&adj->sub_type.midchain.next_dpo,
+			drop_dpo_get(vnet_link_to_dpo_proto(adj->ia_link)));
+
+    /*
+     * update the rewirte with the workers paused.
+     */
+    adj_nbr_update_rewrite_internal(adj,
+				    IP_LOOKUP_NEXT_MIDCHAIN,
+				    adj_get_midchain_node(adj->ia_link),
+				    adj->sub_type.midchain.tx_function_node,
+				    rewrite);
+}
+
+/**
+ * adj_nbr_midchain_unstack
+ *
+ * Unstack the adj. stack it on drop
+ */
+void
+adj_nbr_midchain_unstack (adj_index_t adj_index)
+{
+    ip_adjacency_t *adj;
+
+    ASSERT(ADJ_INDEX_INVALID != adj_index);
+
+    adj = adj_get(adj_index);
+
+    /*
+     * stack on the drop
+     */
+    dpo_stack(DPO_ADJACENCY_MIDCHAIN,
+	      vnet_link_to_dpo_proto(adj->ia_link),
+	      &adj->sub_type.midchain.next_dpo,
+	      drop_dpo_get(vnet_link_to_dpo_proto(adj->ia_link)));
+
+    CLIB_MEMORY_BARRIER();
+}
+
+/**
+ * adj_nbr_midchain_stack
+ */
+void
+adj_nbr_midchain_stack (adj_index_t adj_index,
+			const dpo_id_t *next)
+{
+    ip_adjacency_t *adj;
+
+    ASSERT(ADJ_INDEX_INVALID != adj_index);
+
+    adj = adj_get(adj_index);
+
+    ASSERT(IP_LOOKUP_NEXT_MIDCHAIN == adj->lookup_next_index);
+
+    dpo_stack_from_node(adj->sub_type.midchain.tx_function_node,
+			&adj->sub_type.midchain.next_dpo,
+			next);
+}
+
+u8*
+format_adj_midchain (u8* s, va_list *ap)
+{
+    index_t index = va_arg(*ap, index_t);
+    u32 indent = va_arg(*ap, u32);
+    vnet_main_t * vnm = vnet_get_main();
+    ip_adjacency_t * adj = adj_get(index);
+
+    s = format (s, "%U", format_vnet_link, adj->ia_link);
+    s = format (s, " via %U ",
+		format_ip46_address, &adj->sub_type.nbr.next_hop);
+    s = format (s, " %U",
+		format_vnet_rewrite,
+		vnm->vlib_main, &adj->rewrite_header,
+		sizeof (adj->rewrite_data), indent);
+    s = format (s, "\n%Ustacked-on:\n%U%U",
+		format_white_space, indent,
+		format_white_space, indent+2,
+		format_dpo_id, &adj->sub_type.midchain.next_dpo, indent+2);
+
+    return (s);
+}
+
+static void
+adj_dpo_lock (dpo_id_t *dpo)
+{
+    adj_lock(dpo->dpoi_index);
+}
+static void
+adj_dpo_unlock (dpo_id_t *dpo)
+{
+    adj_unlock(dpo->dpoi_index);
+}
+
+const static dpo_vft_t adj_midchain_dpo_vft = {
+    .dv_lock = adj_dpo_lock,
+    .dv_unlock = adj_dpo_unlock,
+    .dv_format = format_adj_midchain,
+};
+
+/**
+ * @brief The per-protocol VLIB graph nodes that are assigned to a midchain
+ *        object.
+ *
+ * this means that these graph nodes are ones from which a midchain is the
+ * parent object in the DPO-graph.
+ */
+const static char* const midchain_ip4_nodes[] =
+{
+    "ip4-midchain",
+    NULL,
+};
+const static char* const midchain_ip6_nodes[] =
+{
+    "ip6-midchain",
+    NULL,
+};
+const static char* const midchain_mpls_nodes[] =
+{
+    "mpls-midchain",
+    NULL,
+};
+const static char* const midchain_ethernet_nodes[] =
+{
+    "adj-l2-midchain",
+    NULL,
+};
+
+const static char* const * const midchain_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = midchain_ip4_nodes,
+    [DPO_PROTO_IP6]  = midchain_ip6_nodes,
+    [DPO_PROTO_MPLS] = midchain_mpls_nodes,
+    [DPO_PROTO_ETHERNET] = midchain_ethernet_nodes,
+};
+
+void
+adj_midchain_module_init (void)
+{
+    dpo_register(DPO_ADJACENCY_MIDCHAIN, &adj_midchain_dpo_vft, midchain_nodes);
+}
diff --git a/src/vnet/adj/adj_midchain.h b/src/vnet/adj/adj_midchain.h
new file mode 100644
index 00000000..ae414aea
--- /dev/null
+++ b/src/vnet/adj/adj_midchain.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Midchain Adjacency sub-type. These adjs represent an L3 peer on a
+ * tunnel interface. The tunnel's adjacency is thus not the end of the chain,
+ * and needs to stack on/link to another chain (or portion of the graph) to
+ * reach the tunnel's destination.
+ */
+
+#ifndef __ADJ_MIDCHAIN_H__
+#define __ADJ_MIDCHAIN_H__
+
+#include <vnet/adj/adj.h>
+
+/**
+ * @brief Flags controlling the midchain adjacency
+ */
+typedef enum adj_midchain_flag_t_
+{
+    /**
+     * No flags
+     */
+    ADJ_MIDCHAIN_FLAG_NONE = 0,
+
+    /**
+     * Packets TX through the midchain do not increment the interface
+     * counters. This should be used when the adj is associated with an L2
+     * interface and that L2 interface is in a bridege domain. In that case
+     * the packet will have traversed the interface's TX node, and hence have
+     * been counted, before it traverses ths midchain
+     */
+    ADJ_MIDCHAIN_FLAG_NO_COUNT = (1 << 0),
+} adj_midchain_flag_t;
+
+/**
+ * @brief
+ *  Convert an existing neighbour adjacency into a midchain
+ *
+ * @param adj_index
+ *  The index of the neighbour adjacency.
+ *
+ * @param post_rewrite_node
+ *  The VLIB graph node that provides the post-encap fixup.
+ *  where 'fixup' is e.g., correcting chksum, length, etc.
+ *
+ * @param rewrite
+ *  The rewrite.
+ */
+extern void adj_nbr_midchain_update_rewrite(adj_index_t adj_index,
+					    adj_midchain_fixup_t fixup,
+					    adj_midchain_flag_t flags,
+					    u8 *rewrite);
+
+/**
+ * @brief
+ *  [re]stack a midchain. 'Stacking' is the act of forming parent-child
+ *  relationships in the data-plane graph.
+ *
+ * @param adj_index
+ *  The index of the midchain to stack
+ *
+ * @param dpo
+ *  The parent DPO to stack onto (i.e. become a child of).
+ */
+extern void adj_nbr_midchain_stack(adj_index_t adj_index,
+				   const dpo_id_t *dpo);
+
+/**
+ * @brief
+ *  unstack a midchain. This will break the chain between the midchain and
+ *  the next graph section. This is a implemented as stack-on-drop
+ *
+ * @param adj_index
+ *  The index of the midchain to stack
+ */
+extern void adj_nbr_midchain_unstack(adj_index_t adj_index);
+
+/**
+ * @brief
+ *  Module initialisation
+ */
+extern void adj_midchain_module_init(void);
+
+/**
+ * @brief
+ * Format a midchain adjacency
+ */
+extern u8* format_adj_midchain(u8* s, va_list *ap);
+
+#endif
diff --git a/src/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c
new file mode 100644
index 00000000..1344bb67
--- /dev/null
+++ b/src/vnet/adj/adj_nbr.c
@@ -0,0 +1,1087 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/adj/adj_nbr.h>
+#include <vnet/adj/adj_internal.h>
+#include <vnet/ethernet/arp_packet.h>
+#include <vnet/fib/fib_walk.h>
+
+/*
+ * Vector Hash tables of neighbour (traditional) adjacencies
+ *  Key: interface(for the vector index), address (and its proto),
+ *       link-type/ether-type.
+ */
+static BVT(clib_bihash) **adj_nbr_tables[FIB_PROTOCOL_MAX];
+
+// FIXME SIZE APPROPRIATELY. ASK DAVEB.
+#define ADJ_NBR_DEFAULT_HASH_NUM_BUCKETS (64 * 64)
+#define ADJ_NBR_DEFAULT_HASH_MEMORY_SIZE (32<<20)
+
+
+#define ADJ_NBR_SET_KEY(_key, _lt, _nh)         \
+{						\
+    _key.key[0] = (_nh)->as_u64[0];		\
+    _key.key[1] = (_nh)->as_u64[1];		\
+    _key.key[2] = (_lt);			\
+}
+
+#define ADJ_NBR_ITF_OK(_proto, _itf)			\
+    (((_itf) < vec_len(adj_nbr_tables[_proto])) &&	\
+     (NULL != adj_nbr_tables[_proto][sw_if_index]))
+
+static void
+adj_nbr_insert (fib_protocol_t nh_proto,
+		vnet_link_t link_type,
+		const ip46_address_t *nh_addr,
+		u32 sw_if_index,
+		adj_index_t adj_index)
+{
+    BVT(clib_bihash_kv) kv;
+
+    if (sw_if_index >= vec_len(adj_nbr_tables[nh_proto]))
+    {
+	vec_validate(adj_nbr_tables[nh_proto], sw_if_index);
+    }
+    if (NULL == adj_nbr_tables[nh_proto][sw_if_index])
+    {
+	adj_nbr_tables[nh_proto][sw_if_index] =
+	    clib_mem_alloc_aligned(sizeof(BVT(clib_bihash)),
+				   CLIB_CACHE_LINE_BYTES);
+	memset(adj_nbr_tables[nh_proto][sw_if_index],
+	       0,
+	       sizeof(BVT(clib_bihash)));
+
+	BV(clib_bihash_init) (adj_nbr_tables[nh_proto][sw_if_index],
+			      "Adjacency Neighbour table",
+			      ADJ_NBR_DEFAULT_HASH_NUM_BUCKETS,
+			      ADJ_NBR_DEFAULT_HASH_MEMORY_SIZE);
+    }
+
+    ADJ_NBR_SET_KEY(kv, link_type, nh_addr);
+    kv.value = adj_index;
+
+    BV(clib_bihash_add_del) (adj_nbr_tables[nh_proto][sw_if_index], &kv, 1);
+}
+
+void
+adj_nbr_remove (adj_index_t ai,
+                fib_protocol_t nh_proto,
+		vnet_link_t link_type,
+		const ip46_address_t *nh_addr,
+		u32 sw_if_index)
+{
+    BVT(clib_bihash_kv) kv;
+
+    if (!ADJ_NBR_ITF_OK(nh_proto, sw_if_index))
+	return;
+
+    ADJ_NBR_SET_KEY(kv, link_type, nh_addr);
+    kv.value = ai;
+
+    BV(clib_bihash_add_del) (adj_nbr_tables[nh_proto][sw_if_index], &kv, 0);
+}
+
+static adj_index_t
+adj_nbr_find (fib_protocol_t nh_proto,
+	      vnet_link_t link_type,
+	      const ip46_address_t *nh_addr,
+	      u32 sw_if_index)
+{
+    BVT(clib_bihash_kv) kv;
+
+    ADJ_NBR_SET_KEY(kv, link_type, nh_addr);
+
+    if (!ADJ_NBR_ITF_OK(nh_proto, sw_if_index))
+	return (ADJ_INDEX_INVALID);
+
+    if (BV(clib_bihash_search)(adj_nbr_tables[nh_proto][sw_if_index],
+			       &kv, &kv) < 0)
+    {
+	return (ADJ_INDEX_INVALID);
+    }
+    else
+    {
+	return (kv.value);
+    }
+}
+
+static inline u32
+adj_get_nd_node (fib_protocol_t proto)
+{
+    switch (proto) {
+    case FIB_PROTOCOL_IP4:
+	return (ip4_arp_node.index);
+    case FIB_PROTOCOL_IP6:
+	return (ip6_discover_neighbor_node.index);
+    case FIB_PROTOCOL_MPLS:
+	break;
+    }
+    ASSERT(0);
+    return (ip4_arp_node.index);
+}
+
+static ip_adjacency_t*
+adj_nbr_alloc (fib_protocol_t nh_proto,
+	       vnet_link_t link_type,
+	       const ip46_address_t *nh_addr,
+	       u32 sw_if_index)
+{
+    ip_adjacency_t *adj;
+
+    adj = adj_alloc(nh_proto);
+
+    adj_nbr_insert(nh_proto, link_type, nh_addr,
+		   sw_if_index,
+		   adj_get_index(adj));
+
+    /*
+     * since we just added the ADJ we have no rewrite string for it,
+     * so its for ARP
+     */
+    adj->lookup_next_index = IP_LOOKUP_NEXT_ARP;
+    adj->sub_type.nbr.next_hop = *nh_addr;
+    adj->ia_link = link_type;
+    adj->ia_nh_proto = nh_proto;
+    adj->rewrite_header.sw_if_index = sw_if_index;
+    memset(&adj->sub_type.midchain.next_dpo, 0,
+           sizeof(adj->sub_type.midchain.next_dpo));
+
+    return (adj);
+}
+
+/*
+ * adj_add_for_nbr
+ *
+ * Add an adjacency for the neighbour requested.
+ *
+ * The key for an adj is:
+ *   - the Next-hops protocol (i.e. v4 or v6)
+ *   - the address of the next-hop
+ *   - the interface the next-hop is reachable through
+ */
+adj_index_t
+adj_nbr_add_or_lock (fib_protocol_t nh_proto,
+		     vnet_link_t link_type,
+		     const ip46_address_t *nh_addr,
+		     u32 sw_if_index)
+{
+    adj_index_t adj_index;
+    ip_adjacency_t *adj;
+
+    adj_index = adj_nbr_find(nh_proto, link_type, nh_addr, sw_if_index);
+
+    if (ADJ_INDEX_INVALID == adj_index)
+    {
+	vnet_main_t *vnm;
+
+	vnm = vnet_get_main();
+	adj = adj_nbr_alloc(nh_proto, link_type, nh_addr, sw_if_index);
+	adj_index = adj_get_index(adj);
+	adj_lock(adj_index);
+
+	vnet_rewrite_init(vnm, sw_if_index,
+			  adj_get_nd_node(nh_proto),
+			  vnet_tx_node_index_for_sw_interface(vnm, sw_if_index),
+			  &adj->rewrite_header);
+
+	/*
+	 * we need a rewrite where the destination IP address is converted
+	 * to the appropriate link-layer address. This is interface specific.
+	 * So ask the interface to do it.
+	 */
+	vnet_update_adjacency_for_sw_interface(vnm, sw_if_index, adj_index);
+    }
+    else
+    {
+	adj_lock(adj_index);
+    }
+
+    return (adj_index);
+}
+
+adj_index_t
+adj_nbr_add_or_lock_w_rewrite (fib_protocol_t nh_proto,
+			       vnet_link_t link_type,
+			       const ip46_address_t *nh_addr,
+			       u32 sw_if_index,
+			       u8 *rewrite)
+{
+    adj_index_t adj_index;
+    ip_adjacency_t *adj;
+
+    adj_index = adj_nbr_find(nh_proto, link_type, nh_addr, sw_if_index);
+
+    if (ADJ_INDEX_INVALID == adj_index)
+    {
+	adj = adj_nbr_alloc(nh_proto, link_type, nh_addr, sw_if_index);
+	adj->rewrite_header.sw_if_index = sw_if_index;
+    }
+    else
+    {
+        adj = adj_get(adj_index);
+    }
+
+    adj_lock(adj_get_index(adj));
+    adj_nbr_update_rewrite(adj_get_index(adj),
+			   ADJ_NBR_REWRITE_FLAG_COMPLETE,
+			   rewrite);
+
+    return (adj_get_index(adj));
+}
+
+/**
+ * adj_nbr_update_rewrite
+ *
+ * Update the adjacency's rewrite string. A NULL string implies the
+ * rewirte is reset (i.e. when ARP/ND etnry is gone).
+ * NB: the adj being updated may be handling traffic in the DP.
+ */
+void
+adj_nbr_update_rewrite (adj_index_t adj_index,
+			adj_nbr_rewrite_flag_t flags,
+			u8 *rewrite)
+{
+    ip_adjacency_t *adj;
+
+    ASSERT(ADJ_INDEX_INVALID != adj_index);
+
+    adj = adj_get(adj_index);
+
+    if (flags & ADJ_NBR_REWRITE_FLAG_COMPLETE)
+    {
+	/*
+	 * update the adj's rewrite string and build the arc
+	 * from the rewrite node to the interface's TX node
+	 */
+	adj_nbr_update_rewrite_internal(adj, IP_LOOKUP_NEXT_REWRITE,
+					adj_get_rewrite_node(adj->ia_link),
+					vnet_tx_node_index_for_sw_interface(
+					    vnet_get_main(),
+					    adj->rewrite_header.sw_if_index),
+					rewrite);
+    }
+    else
+    {
+	adj_nbr_update_rewrite_internal(adj, IP_LOOKUP_NEXT_ARP,
+					adj_get_nd_node(adj->ia_nh_proto),
+					vnet_tx_node_index_for_sw_interface(
+					    vnet_get_main(),
+					    adj->rewrite_header.sw_if_index),
+					rewrite);
+    }
+}
+
+/**
+ * adj_nbr_update_rewrite_internal
+ *
+ * Update the adjacency's rewrite string. A NULL string implies the
+ * rewirte is reset (i.e. when ARP/ND etnry is gone).
+ * NB: the adj being updated may be handling traffic in the DP.
+ */
+void
+adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
+				 u32 adj_next_index,
+				 u32 this_node,
+				 u32 next_node,
+				 u8 *rewrite)
+{
+    ip_adjacency_t *walk_adj;
+    adj_index_t walk_ai;
+    vlib_main_t * vm;
+    u32 old_next;
+    int do_walk;
+
+    vm = vlib_get_main();
+    old_next = adj->lookup_next_index;
+
+    walk_ai = adj_get_index(adj);
+    if (VNET_LINK_MPLS == adj->ia_link)
+    {
+        /*
+         * The link type MPLS has no children in the control plane graph, it only
+         * has children in the data-palne graph. The backwalk is up the former.
+         * So we need to walk from its IP cousin.
+         */
+        walk_ai = adj_nbr_find(adj->ia_nh_proto,
+                               fib_proto_to_link(adj->ia_nh_proto),
+                               &adj->sub_type.nbr.next_hop,
+                               adj->rewrite_header.sw_if_index);
+    }
+
+    /*
+     * Don't call the walk re-entrantly
+     */
+    if (ADJ_INDEX_INVALID != walk_ai)
+    {
+        walk_adj = adj_get(walk_ai);
+        if (IP_ADJ_SYNC_WALK_ACTIVE & walk_adj->ia_flags)
+        {
+            do_walk = 0;
+        }
+        else
+        {
+            /*
+             * Prevent re-entrant walk of the same adj
+             */
+            walk_adj->ia_flags |= IP_ADJ_SYNC_WALK_ACTIVE;
+            do_walk = 1;
+        }
+    }
+    else
+    {
+        do_walk = 0;
+    }
+
+    /*
+     * lock the adjacencies that are affected by updates this walk will provoke.
+     * Since the aim of the walk is to update children to link to a different
+     * DPO, this adj will no longer be in use and its lock count will drop to 0.
+     * We don't want it to be deleted as part of this endevour.
+     */
+    adj_lock(adj_get_index(adj));
+    adj_lock(walk_ai);
+
+    /*
+     * Updating a rewrite string is not atomic;
+     *  - the rewrite string is too long to write in one instruction
+     *  - when swapping from incomplete to complete, we also need to update
+     *    the VLIB graph next-index of the adj.
+     * ideally we would only want to suspend forwarding via this adj whilst we
+     * do this, but we do not have that level of granularity - it's suspend all
+     * worker threads or nothing.
+     * The other chioces are:
+     *  - to mark the adj down and back walk so child load-balances drop this adj
+     *    from the set.
+     *  - update the next_node index of this adj to point to error-drop
+     * both of which will mean for MAC change we will drop for this adj
+     * which is not acceptable. However, when the adj changes type (from
+     * complete to incomplete and vice-versa) the child DPOs, which have the
+     * VLIB graph next node index, will be sending packets to the wrong graph
+     * node. So from the options above, updating the next_node of the adj to
+     * be drop will work, but it relies on each graph node v4/v6/mpls, rewrite/
+     * arp/midchain always be valid w.r.t. a mis-match of adj type and node type
+     * (i.e. a rewrite adj in the arp node). This is not enforcable. Getting it
+     * wrong will lead to hard to find bugs since its a race condition. So we
+     * choose the more reliable method of updating the children to use the drop,
+     * then switching adj's type, then updating the children again. Did I mention
+     * that this doesn't happen often...
+     * So we need to distinguish between the two cases:
+     *  1 - mac change
+     *  2 - adj type change
+     */
+    if (do_walk &&
+        old_next != adj_next_index &&
+        ADJ_INDEX_INVALID != walk_ai)
+    {
+        /*
+         * the adj is changing type. we need to fix all children so that they
+         * stack momentarily on a drop, while the adj changes. If we don't do
+         * this  the children will send packets to a VLIB graph node that does
+         * not correspond to the adj's type - and it goes downhill from there.
+         */
+	fib_node_back_walk_ctx_t bw_ctx = {
+	    .fnbw_reason = FIB_NODE_BW_REASON_FLAG_ADJ_DOWN,
+            /*
+             * force this walk to be synchrous. if we don't and a node in the graph
+             * (a heavily shared path-list) chooses to back-ground the walk (make it
+             * async) then it will pause and we will do the adj update below, before
+             * all the children are updated. not good.
+             */
+            .fnbw_flags = FIB_NODE_BW_FLAG_FORCE_SYNC,
+	};
+
+	fib_walk_sync(FIB_NODE_TYPE_ADJ, walk_ai, &bw_ctx);
+    }
+
+    /*
+     * If we are just updating the MAC string of the adj (which we also can't
+     * do atomically), then we need to stop packets switching through the adj.
+     * We can't do that on a per-adj basis, so it's all the packets.
+     * If we are updating the type, and we walked back to the children above,
+     * then this barrier serves to flush the queues/frames.
+     */
+    vlib_worker_thread_barrier_sync(vm);
+
+    adj->lookup_next_index = adj_next_index;
+
+    if (NULL != rewrite)
+    {
+	/*
+	 * new rewrite provided.
+	 * fill in the adj's rewrite string, and build the VLIB graph arc.
+	 */
+	vnet_rewrite_set_data_internal(&adj->rewrite_header,
+				       sizeof(adj->rewrite_data),
+				       rewrite,
+				       vec_len(rewrite));
+	vec_free(rewrite);
+    }
+    else
+    {
+	vnet_rewrite_clear_data_internal(&adj->rewrite_header,
+					 sizeof(adj->rewrite_data));
+    }
+    adj->rewrite_header.node_index = this_node;
+    adj->rewrite_header.next_index = vlib_node_add_next(vlib_get_main(),
+                                                        this_node,
+                                                        next_node);
+
+    /*
+     * done with the rewirte update - let the workers loose.
+     */
+    vlib_worker_thread_barrier_release(vm);
+
+    if (do_walk &&
+        (old_next != adj->lookup_next_index) &&
+        (ADJ_INDEX_INVALID != walk_ai))
+    {
+        /*
+         * backwalk to the children so they can stack on the now updated
+         * adjacency
+         */
+        fib_node_back_walk_ctx_t bw_ctx = {
+	    .fnbw_reason = FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE,
+	};
+
+	fib_walk_sync(FIB_NODE_TYPE_ADJ, walk_ai, &bw_ctx);
+    }
+    /*
+     * Prevent re-entrant walk of the same adj
+     */
+    if (do_walk)
+    {
+        walk_adj->ia_flags &= ~IP_ADJ_SYNC_WALK_ACTIVE;
+    }
+
+    adj_unlock(adj_get_index(adj));
+    adj_unlock(walk_ai);
+}
+
+typedef struct adj_db_count_ctx_t_ {
+    u64 count;
+} adj_db_count_ctx_t;
+
+static void
+adj_db_count (BVT(clib_bihash_kv) * kvp,
+	      void *arg)
+{
+    adj_db_count_ctx_t * ctx = arg;
+    ctx->count++;
+}
+
+u32
+adj_nbr_db_size (void)
+{
+    adj_db_count_ctx_t ctx = {
+	.count = 0,
+    };
+    fib_protocol_t proto;
+    u32 sw_if_index = 0;
+
+    for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
+    {
+	vec_foreach_index(sw_if_index, adj_nbr_tables[proto])
+	{
+	    if (NULL != adj_nbr_tables[proto][sw_if_index])
+	    {
+		BV(clib_bihash_foreach_key_value_pair) (
+		    adj_nbr_tables[proto][sw_if_index],
+		    adj_db_count,
+		    &ctx);
+	    }
+	}
+    }
+    return (ctx.count);
+}
+
+/**
+ * @brief Context for a walk of the adjacency neighbour DB
+ */
+typedef struct adj_walk_ctx_t_
+{
+    adj_walk_cb_t awc_cb;
+    void *awc_ctx;
+} adj_walk_ctx_t;
+
+static void
+adj_nbr_walk_cb (BVT(clib_bihash_kv) * kvp,
+		 void *arg)
+{
+    adj_walk_ctx_t *ctx = arg;
+
+    // FIXME: can't stop early...
+    ctx->awc_cb(kvp->value, ctx->awc_ctx);
+}
+
+void
+adj_nbr_walk (u32 sw_if_index,
+	      fib_protocol_t adj_nh_proto,
+	      adj_walk_cb_t cb,
+	      void *ctx)
+{
+    if (!ADJ_NBR_ITF_OK(adj_nh_proto, sw_if_index))
+	return;
+
+    adj_walk_ctx_t awc = {
+	.awc_ctx = ctx,
+	.awc_cb = cb,
+    };
+
+    BV(clib_bihash_foreach_key_value_pair) (
+	adj_nbr_tables[adj_nh_proto][sw_if_index],
+	adj_nbr_walk_cb,
+	&awc);
+}
+
+/**
+ * @brief Context for a walk of the adjacency neighbour DB
+ */
+typedef struct adj_walk_nh_ctx_t_
+{
+    adj_walk_cb_t awc_cb;
+    void *awc_ctx;
+    const ip46_address_t *awc_nh;
+} adj_walk_nh_ctx_t;
+
+static void
+adj_nbr_walk_nh_cb (BVT(clib_bihash_kv) * kvp,
+		    void *arg)
+{
+    ip_adjacency_t *adj;
+    adj_walk_nh_ctx_t *ctx = arg;
+
+    adj = adj_get(kvp->value);
+
+    if (!ip46_address_cmp(&adj->sub_type.nbr.next_hop, ctx->awc_nh)) 
+	ctx->awc_cb(kvp->value, ctx->awc_ctx);
+}
+
+/**
+ * @brief Walk adjacencies on a link with a given v4 next-hop.
+ * that is visit the adjacencies with different link types.
+ */
+void
+adj_nbr_walk_nh4 (u32 sw_if_index,
+		 const ip4_address_t *addr,
+		 adj_walk_cb_t cb,
+		 void *ctx)
+{
+    if (!ADJ_NBR_ITF_OK(FIB_PROTOCOL_IP4, sw_if_index))
+	return;
+
+    ip46_address_t nh = {
+	.ip4 = *addr,
+    };
+
+    adj_walk_nh_ctx_t awc = {
+	.awc_ctx = ctx,
+	.awc_cb = cb,
+	.awc_nh = &nh,
+    };
+
+    BV(clib_bihash_foreach_key_value_pair) (
+	adj_nbr_tables[FIB_PROTOCOL_IP4][sw_if_index],
+	adj_nbr_walk_nh_cb,
+	&awc);
+}
+
+/**
+ * @brief Walk adjacencies on a link with a given v6 next-hop.
+ * that is visit the adjacencies with different link types.
+ */
+void
+adj_nbr_walk_nh6 (u32 sw_if_index,
+		 const ip6_address_t *addr,
+		 adj_walk_cb_t cb,
+		 void *ctx)
+{
+    if (!ADJ_NBR_ITF_OK(FIB_PROTOCOL_IP6, sw_if_index))
+	return;
+
+    ip46_address_t nh = {
+	.ip6 = *addr,
+    };
+
+    adj_walk_nh_ctx_t awc = {
+	.awc_ctx = ctx,
+	.awc_cb = cb,
+	.awc_nh = &nh,
+    };
+
+    BV(clib_bihash_foreach_key_value_pair) (
+	adj_nbr_tables[FIB_PROTOCOL_IP6][sw_if_index],
+	adj_nbr_walk_nh_cb,
+	&awc);
+}
+
+/**
+ * @brief Walk adjacencies on a link with a given next-hop.
+ * that is visit the adjacencies with different link types.
+ */
+void
+adj_nbr_walk_nh (u32 sw_if_index,
+		 fib_protocol_t adj_nh_proto,
+		 const ip46_address_t *nh,
+		 adj_walk_cb_t cb,
+		 void *ctx)
+{
+    if (!ADJ_NBR_ITF_OK(adj_nh_proto, sw_if_index))
+	return;
+
+    adj_walk_nh_ctx_t awc = {
+	.awc_ctx = ctx,
+	.awc_cb = cb,
+	.awc_nh = nh,
+    };
+
+    BV(clib_bihash_foreach_key_value_pair) (
+	adj_nbr_tables[adj_nh_proto][sw_if_index],
+	adj_nbr_walk_nh_cb,
+	&awc);
+}
+
+/**
+ * Flags associated with the interface state walks
+ */
+typedef enum adj_nbr_interface_flags_t_
+{
+    ADJ_NBR_INTERFACE_UP = (1 << 0),
+} adj_nbr_interface_flags_t;
+
+/**
+ * Context for the state change walk of the DB
+ */
+typedef struct adj_nbr_interface_state_change_ctx_t_
+{
+    /**
+     * Flags on the interface
+     */
+    adj_nbr_interface_flags_t flags;
+} adj_nbr_interface_state_change_ctx_t;
+
+static adj_walk_rc_t
+adj_nbr_interface_state_change_one (adj_index_t ai,
+                                    void *arg)
+{
+    /*
+     * Back walk the graph to inform the forwarding entries
+     * that this interface state has changed. Do this synchronously
+     * since this is the walk that provides convergence
+     */
+    adj_nbr_interface_state_change_ctx_t *ctx = arg;
+
+    fib_node_back_walk_ctx_t bw_ctx = {
+	.fnbw_reason = ((ctx->flags & ADJ_NBR_INTERFACE_UP) ?
+                        FIB_NODE_BW_REASON_FLAG_INTERFACE_UP :
+                        FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN),
+        /*
+         * the force sync applies only as far as the first fib_entry.
+         * And it's the fib_entry's we need to converge away from
+         * the adjacencies on the now down link
+         */
+        .fnbw_flags = (!(ctx->flags & ADJ_NBR_INTERFACE_UP) ?
+                       FIB_NODE_BW_FLAG_FORCE_SYNC :
+                       0),
+    };
+
+    fib_walk_sync(FIB_NODE_TYPE_ADJ, ai, &bw_ctx);
+
+    return (ADJ_WALK_RC_CONTINUE);
+}
+
+/**
+ * @brief Registered function for SW interface state changes
+ */
+static clib_error_t *
+adj_nbr_sw_interface_state_change (vnet_main_t * vnm,
+                                   u32 sw_if_index,
+                                   u32 flags)
+{
+    fib_protocol_t proto;
+
+    /*
+     * walk each adj on the interface and trigger a walk from that adj
+     */
+    for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
+    {
+	adj_nbr_interface_state_change_ctx_t ctx = {
+	    .flags = ((flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ?
+                      ADJ_NBR_INTERFACE_UP :
+                      0),
+	};
+
+	adj_nbr_walk(sw_if_index, proto,
+		     adj_nbr_interface_state_change_one,
+		     &ctx);
+    }
+
+    return (NULL);
+}
+
+VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION_PRIO(
+    adj_nbr_sw_interface_state_change,
+    VNET_ITF_FUNC_PRIORITY_HIGH);
+
+/**
+ * @brief Invoked on each SW interface of a HW interface when the
+ * HW interface state changes
+ */
+static void
+adj_nbr_hw_sw_interface_state_change (vnet_main_t * vnm,
+                                      u32 sw_if_index,
+                                      void *arg)
+{
+    adj_nbr_interface_state_change_ctx_t *ctx = arg;
+    fib_protocol_t proto;
+
+    /*
+     * walk each adj on the interface and trigger a walk from that adj
+     */
+    for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
+    {
+	adj_nbr_walk(sw_if_index, proto,
+		     adj_nbr_interface_state_change_one,
+		     ctx);
+    }
+}
+
+/**
+ * @brief Registered callback for HW interface state changes
+ */
+static clib_error_t *
+adj_nbr_hw_interface_state_change (vnet_main_t * vnm,
+                                   u32 hw_if_index,
+                                   u32 flags)
+{
+    /*
+     * walk SW interface on the HW
+     */
+    adj_nbr_interface_state_change_ctx_t ctx = {
+        .flags = ((flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ?
+                  ADJ_NBR_INTERFACE_UP :
+                  0),
+    };
+
+    vnet_hw_interface_walk_sw(vnm, hw_if_index,
+                              adj_nbr_hw_sw_interface_state_change,
+                              &ctx);
+
+    return (NULL);
+}
+
+VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION_PRIO(
+    adj_nbr_hw_interface_state_change,
+    VNET_ITF_FUNC_PRIORITY_HIGH);
+
+static adj_walk_rc_t
+adj_nbr_interface_delete_one (adj_index_t ai,
+			      void *arg)
+{
+    /*
+     * Back walk the graph to inform the forwarding entries
+     * that this interface has been deleted.
+     */
+    fib_node_back_walk_ctx_t bw_ctx = {
+	.fnbw_reason = FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE,
+    };
+
+    fib_walk_sync(FIB_NODE_TYPE_ADJ, ai, &bw_ctx);
+
+    return (ADJ_WALK_RC_CONTINUE);
+}
+
+/**
+ * adj_nbr_interface_add_del
+ *
+ * Registered to receive interface Add and delete notifications
+ */
+static clib_error_t *
+adj_nbr_interface_add_del (vnet_main_t * vnm,
+			   u32 sw_if_index,
+			   u32 is_add)
+{
+    fib_protocol_t proto;
+
+    if (is_add)
+    {
+	/*
+	 * not interested in interface additions. we will not back walk
+	 * to resolve paths through newly added interfaces. Why? The control
+	 * plane should have the brains to add interfaces first, then routes.
+	 * So the case where there are paths with a interface that matches
+	 * one just created is the case where the path resolved through an
+	 * interface that was deleted, and still has not been removed. The
+	 * new interface added, is NO GUARANTEE that the interface being
+	 * added now, even though it may have the same sw_if_index, is the
+	 * same interface that the path needs. So tough!
+	 * If the control plane wants these routes to resolve it needs to
+	 * remove and add them again.
+	 */
+	return (NULL);
+    }
+
+    for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
+    {
+	adj_nbr_walk(sw_if_index, proto,
+		     adj_nbr_interface_delete_one,
+		     NULL);
+    }
+
+    return (NULL);
+   
+}
+
+VNET_SW_INTERFACE_ADD_DEL_FUNCTION(adj_nbr_interface_add_del);
+
+
+static adj_walk_rc_t
+adj_nbr_show_one (adj_index_t ai,
+		  void *arg)
+{
+    vlib_cli_output (arg, "[@%d]  %U",
+                     ai,
+                     format_ip_adjacency, ai,
+		     FORMAT_IP_ADJACENCY_NONE);
+
+    return (ADJ_WALK_RC_CONTINUE);
+}
+
+static clib_error_t *
+adj_nbr_show (vlib_main_t * vm,
+	      unformat_input_t * input,
+	      vlib_cli_command_t * cmd)
+{
+    adj_index_t ai = ADJ_INDEX_INVALID;
+    u32 sw_if_index = ~0;
+
+    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+	if (unformat (input, "%d", &ai))
+	    ;
+	else if (unformat (input, "%U",
+			   unformat_vnet_sw_interface, vnet_get_main(),
+			   &sw_if_index))
+	    ;
+	else
+	    break;
+    }
+
+    if (ADJ_INDEX_INVALID != ai)
+    {
+	vlib_cli_output (vm, "[@%d] %U",
+                         ai,
+                         format_ip_adjacency, ai,
+			 FORMAT_IP_ADJACENCY_DETAIL);
+    }
+    else if (~0 != sw_if_index)
+    {
+	fib_protocol_t proto;
+
+	for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
+	{
+	    adj_nbr_walk(sw_if_index, proto,
+			 adj_nbr_show_one,
+			 vm);
+	}
+    }
+    else
+    {
+	fib_protocol_t proto;
+
+	for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
+	{
+	    vec_foreach_index(sw_if_index, adj_nbr_tables[proto])
+	    {
+		adj_nbr_walk(sw_if_index, proto,
+			     adj_nbr_show_one,
+			     vm);
+	    }
+	}
+    }
+
+    return 0;
+}
+
+/*?
+ * Show all neighbour adjacencies.
+ * @cliexpar
+ * @cliexstart{sh adj nbr}
+ * [@2] ipv4 via 1.0.0.2 loop0: IP4: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
+ * [@3] mpls via 1.0.0.2 loop0: MPLS_UNICAST: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
+ * [@4] ipv4 via 1.0.0.3 loop0: IP4: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
+ * [@5] mpls via 1.0.0.3 loop0: MPLS_UNICAST: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND (ip4_show_fib_command, static) = {
+    .path = "show adj nbr",
+    .short_help = "show adj nbr [<adj_index>] [interface]",
+    .function = adj_nbr_show,
+};
+
+static ip46_type_t
+adj_proto_to_46 (fib_protocol_t proto)
+{
+    switch (proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (IP46_TYPE_IP4);
+    case FIB_PROTOCOL_IP6:
+	return (IP46_TYPE_IP6);
+    default:
+	return (IP46_TYPE_IP4);
+    }
+    return (IP46_TYPE_IP4);
+}
+
+u8*
+format_adj_nbr_incomplete (u8* s, va_list *ap)
+{
+    index_t index = va_arg(*ap, index_t);
+    CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
+    vnet_main_t * vnm = vnet_get_main();
+    ip_adjacency_t * adj = adj_get(index);
+
+    s = format (s, "arp-%U", format_vnet_link, adj->ia_link);
+    s = format (s, ": via %U",
+                format_ip46_address, &adj->sub_type.nbr.next_hop,
+		adj_proto_to_46(adj->ia_nh_proto));
+    s = format (s, " %U",
+                format_vnet_sw_interface_name,
+                vnm,
+                vnet_get_sw_interface(vnm,
+                                      adj->rewrite_header.sw_if_index));
+
+    return (s);
+}
+
+u8*
+format_adj_nbr (u8* s, va_list *ap)
+{
+    index_t index = va_arg(*ap, index_t);
+    CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
+    vnet_main_t * vnm = vnet_get_main();
+    ip_adjacency_t * adj = adj_get(index);
+
+    s = format (s, "%U", format_vnet_link, adj->ia_link);
+    s = format (s, " via %U ",
+		format_ip46_address, &adj->sub_type.nbr.next_hop,
+		adj_proto_to_46(adj->ia_nh_proto));
+    s = format (s, "%U",
+		format_vnet_rewrite,
+		vnm->vlib_main, &adj->rewrite_header, sizeof (adj->rewrite_data), 0);
+
+    return (s);
+}
+
+static void
+adj_dpo_lock (dpo_id_t *dpo)
+{
+    adj_lock(dpo->dpoi_index);
+}
+static void
+adj_dpo_unlock (dpo_id_t *dpo)
+{
+    adj_unlock(dpo->dpoi_index);
+}
+
+static void
+adj_mem_show (void)
+{
+    fib_show_memory_usage("Adjacency",
+			  pool_elts(adj_pool),
+			  pool_len(adj_pool),
+			  sizeof(ip_adjacency_t));
+}
+
+const static dpo_vft_t adj_nbr_dpo_vft = {
+    .dv_lock = adj_dpo_lock,
+    .dv_unlock = adj_dpo_unlock,
+    .dv_format = format_adj_nbr,
+    .dv_mem_show = adj_mem_show,
+};
+const static dpo_vft_t adj_nbr_incompl_dpo_vft = {
+    .dv_lock = adj_dpo_lock,
+    .dv_unlock = adj_dpo_unlock,
+    .dv_format = format_adj_nbr_incomplete,
+};
+
+/**
+ * @brief The per-protocol VLIB graph nodes that are assigned to an adjacency
+ *        object.
+ *
+ * this means that these graph nodes are ones from which a nbr is the
+ * parent object in the DPO-graph.
+ */
+const static char* const nbr_ip4_nodes[] =
+{
+    "ip4-rewrite",
+    NULL,
+};
+const static char* const nbr_ip6_nodes[] =
+{
+    "ip6-rewrite",
+    NULL,
+};
+const static char* const nbr_mpls_nodes[] =
+{
+    "mpls-output",
+    NULL,
+};
+const static char* const nbr_ethernet_nodes[] =
+{
+    "adj-l2-rewrite",
+    NULL,
+};
+const static char* const * const nbr_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = nbr_ip4_nodes,
+    [DPO_PROTO_IP6]  = nbr_ip6_nodes,
+    [DPO_PROTO_MPLS] = nbr_mpls_nodes,
+    [DPO_PROTO_ETHERNET] = nbr_ethernet_nodes,
+};
+
+const static char* const nbr_incomplete_ip4_nodes[] =
+{
+    "ip4-arp",
+    NULL,
+};
+const static char* const nbr_incomplete_ip6_nodes[] =
+{
+    "ip6-discover-neighbor",
+    NULL,
+};
+const static char* const nbr_incomplete_mpls_nodes[] =
+{
+    "mpls-adj-incomplete",
+    NULL,
+};
+
+const static char* const * const nbr_incomplete_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = nbr_incomplete_ip4_nodes,
+    [DPO_PROTO_IP6]  = nbr_incomplete_ip6_nodes,
+    [DPO_PROTO_MPLS] = nbr_incomplete_mpls_nodes,
+};
+
+void
+adj_nbr_module_init (void)
+{
+    dpo_register(DPO_ADJACENCY,
+                 &adj_nbr_dpo_vft,
+                 nbr_nodes);
+    dpo_register(DPO_ADJACENCY_INCOMPLETE,
+                 &adj_nbr_incompl_dpo_vft,
+                 nbr_incomplete_nodes);
+}
diff --git a/src/vnet/adj/adj_nbr.h b/src/vnet/adj/adj_nbr.h
new file mode 100644
index 00000000..293766b8
--- /dev/null
+++ b/src/vnet/adj/adj_nbr.h
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief
+ * Neighbour Adjacency sub-type. These adjs represent an L3 peer on a
+ * connected link. 
+ */
+
+#ifndef __ADJ_NBR_H__
+#define __ADJ_NBR_H__
+
+#include <vnet/vnet.h>
+#include <vnet/adj/adj_types.h>
+#include <vnet/fib/fib_node.h>
+#include <vnet/dpo/dpo.h>
+
+/**
+ * @brief
+ *  Add (and lock) a new or lock an existing neighbour adjacency
+ *
+ * @param nh_proto
+ *  The protocol for the next-hop address (v4 or v6)
+ *
+ * @param link_type
+ *  A description of the protocol of the packets that will forward
+ *  through this adj. On an ethernet interface this is the MAC header's
+ *  ether-type
+ *
+ * @param nh_addr
+ *  The address of the next-hop/peer to send the packet to
+ *
+ * @param sw_if_index
+ *  The interface on which the peer resides
+ */
+extern adj_index_t adj_nbr_add_or_lock(fib_protocol_t nh_proto,
+				       vnet_link_t link_type,
+				       const ip46_address_t *nh_addr,
+				       u32 sw_if_index);
+
+/**
+ * @brief
+ *  Add (and lock) a new or lock an existing neighbour adjacency
+ *
+ * @param nh_proto
+ *  The protocol for the next-hop address (v4 or v6)
+ *
+ * @param link_type
+ *  A description of the protocol of the packets that will forward
+ *  through this adj. On an ethernet interface this is the MAC header's
+ *  ether-type
+ *
+ * @param nh_addr
+ *  The address of the next-hop/peer to send the packet to
+ *
+ * @param sw_if_index
+ *  The interface on which the peer resides
+ *
+ * @param rewrite
+ *  The rewrite to prepend to packets
+ */
+extern adj_index_t adj_nbr_add_or_lock_w_rewrite(fib_protocol_t nh_proto,
+						 vnet_link_t link_type,
+						 const ip46_address_t *nh_addr,
+						 u32 sw_if_index,
+						 u8 *rewrite);
+/**
+ * @brief When adding a rewrite to an adjacency these are flags that
+ * apply to that rewrite
+ */
+typedef enum adj_nbr_rewrite_flag_t_
+{
+    ADJ_NBR_REWRITE_FLAG_NONE,
+
+    /**
+     * An indication that the rewrite is incomplete, i.e. that it describes the
+     * ARP/ND rewrite when probing.
+     */
+    ADJ_NBR_REWRITE_FLAG_INCOMPLETE = ADJ_NBR_REWRITE_FLAG_NONE,
+
+    /**
+     * An indication that the rewrite is complete, i.e. that it fully describes
+     * the link-layer addressing for the desintation.
+     * The opposite of this is an incomplete rewrite that describes the ARP/ND
+     * rewrite when probing.
+     */
+    ADJ_NBR_REWRITE_FLAG_COMPLETE = (1 << 0),
+} adj_nbr_rewrite_flag_t;
+
+/**
+ * @brief
+ *  Update the rewrite string for an existing adjacecny.
+ *
+ * @param
+ *  The index of the adj to update
+ *
+ * @param
+ *  The new rewrite
+ */
+extern void adj_nbr_update_rewrite(adj_index_t adj_index,
+				   adj_nbr_rewrite_flag_t flags,
+				   u8 *rewrite);
+
+/**
+ * @brief
+ * Format aa incomplete neigbour (ARP) adjacency
+ */
+extern u8* format_adj_nbr_incomplete(u8* s, va_list *ap);
+
+/**
+ * @brief
+ * Format a neigbour (REWRITE) adjacency
+ */
+extern u8* format_adj_nbr(u8* s, va_list *ap);
+
+/**
+ * @brief Walk the neighbour Adjacencies on a given interface
+ */
+extern void adj_nbr_walk (u32 sw_if_index,
+			  fib_protocol_t adj_nh_proto,
+			  adj_walk_cb_t cb,
+			  void *ctx);
+/**
+ * @brief Walk the neighbour Adjacencies on a given interface with a given next-hop
+ */
+void
+adj_nbr_walk_nh (u32 sw_if_index,
+		 fib_protocol_t adj_nh_proto,
+		 const ip46_address_t *nh,
+		 adj_walk_cb_t cb,
+		 void *ctx);
+
+/**
+ * @brief Walk adjacencies on a link with a given v4 next-hop.
+ * that is visit the adjacencies with different link types.
+ */
+void
+adj_nbr_walk_nh4 (u32 sw_if_index,
+		  const ip4_address_t *addr,
+		  adj_walk_cb_t cb,
+		  void *ctx);
+
+/**
+ * @brief Walk adjacencies on a link with a given v6 next-hop.
+ * that is visit the adjacencies with different link types.
+ */
+void
+adj_nbr_walk_nh6 (u32 sw_if_index,
+		  const ip6_address_t *addr,
+		  adj_walk_cb_t cb,
+		  void *ctx);
+
+/**
+ * @brief
+ *  Module initialisation
+ */
+extern void adj_nbr_module_init(void);
+
+/**
+ * @brief
+ *  Return the size of the adjacency database. for testing purposes
+ */
+extern u32 adj_nbr_db_size(void);
+
+#endif
diff --git a/src/vnet/adj/adj_rewrite.c b/src/vnet/adj/adj_rewrite.c
new file mode 100644
index 00000000..7d792557
--- /dev/null
+++ b/src/vnet/adj/adj_rewrite.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/adj/adj.h>
+#include <vnet/adj/adj_internal.h>
+
+/**
+ * adj_rewrite_add_and_lock
+ *
+ * A rewrite sub-type has the rewrite string provided, but no key
+ */
+adj_index_t
+adj_rewrite_add_and_lock (fib_protocol_t nh_proto,
+			  vnet_link_t link_type,
+			  u32 sw_if_index,
+			  u8 *rewrite)
+{
+    ip_adjacency_t *adj;
+
+    adj = adj_alloc(nh_proto);
+
+    adj->lookup_next_index = IP_LOOKUP_NEXT_REWRITE;
+    memset(&adj->sub_type.nbr.next_hop, 0, sizeof(adj->sub_type.nbr.next_hop));
+    adj->ia_link = link_type;
+    adj->ia_nh_proto = nh_proto;
+    adj->rewrite_header.sw_if_index = sw_if_index;
+
+    ASSERT(NULL != rewrite);
+
+    vnet_rewrite_for_sw_interface(vnet_get_main(),
+				  link_type,
+				  adj->rewrite_header.sw_if_index,
+				  adj_get_rewrite_node(link_type),
+				  rewrite,
+				  &adj->rewrite_header,
+				  sizeof (adj->rewrite_data));
+
+    adj_lock(adj_get_index(adj));
+
+    return (adj_get_index(adj));
+}
diff --git a/src/vnet/adj/adj_rewrite.h b/src/vnet/adj/adj_rewrite.h
new file mode 100644
index 00000000..25e6bba8
--- /dev/null
+++ b/src/vnet/adj/adj_rewrite.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief
+ * A rewrite adjacency has no key, and thus cannot be 'found' from the
+ * FIB resolution code. the client therefore needs to maange these adjacencies
+ */
+
+#ifndef __ADJ_REWRITE_H__
+#define __ADJ_REWRITE_H__
+
+#include <vnet/adj/adj_types.h>
+
+/**
+ * @brief
+ *  Add (and lock) a new or lock an existing neighbour adjacency
+ *
+ * @param nh_proto
+ *  The protocol for the next-hop address (v4 or v6)
+ *
+ * @param link_type
+ *  A description of the protocol of the packets that will forward
+ *  through this adj. On an ethernet interface this is the MAC header's
+ *  ether-type
+ *
+ * @param sw_if_index
+ *  The interface on which the peer resides
+ *
+ * @param rewrite
+ *  The rewrite to prepend to packets
+ */
+extern adj_index_t adj_rewrite_add_and_lock(fib_protocol_t nh_proto,
+					    vnet_link_t link_type,
+					    u32 sw_if_index,
+					    u8 *rewrite);
+
+#endif
diff --git a/src/vnet/adj/adj_types.h b/src/vnet/adj/adj_types.h
new file mode 100644
index 00000000..cf90c084
--- /dev/null
+++ b/src/vnet/adj/adj_types.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __ADJ_TYPES_H__
+#define __ADJ_TYPES_H__
+
+#include <vnet/vnet.h>
+
+/**
+ * @brief An index for adjacencies.
+ * Alas 'C' is not typesafe enough to b0rk when a u32 is used instead of
+ * an adi_index_t. However, for us humans, we can glean much more intent
+ * from the declaration
+ *  foo bar(adj_index_t t);
+ * than we can from
+ *  foo bar(u32 t);
+ */
+typedef u32 adj_index_t; 
+
+/**
+ * @brief Invalid ADJ index - used when no adj is known
+ * likewise blazoned capitals INVALID speak volumes where ~0 does not.
+ */
+#define ADJ_INDEX_INVALID ((u32)~0)
+
+/**
+ * @brief return codes from a adjacency walker callback function
+ */
+typedef enum adj_walk_rc_t_
+{
+    ADJ_WALK_RC_STOP,
+    ADJ_WALK_RC_CONTINUE,
+} adj_walk_rc_t;
+
+/**
+ * @brief Call back function when walking adjacencies
+ */
+typedef adj_walk_rc_t (*adj_walk_cb_t)(adj_index_t ai,
+				       void *ctx);
+
+#endif
diff --git a/src/vnet/api_errno.h b/src/vnet/api_errno.h
new file mode 100644
index 00000000..65e3e591
--- /dev/null
+++ b/src/vnet/api_errno.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vnet_api_errno_h
+#define included_vnet_api_errno_h
+
+#define foreach_vnet_api_error						\
+_(UNSPECIFIED, -1, "Unspecified Error")                                 \
+_(INVALID_SW_IF_INDEX, -2, "Invalid sw_if_index")                       \
+_(NO_SUCH_FIB, -3, "No such FIB / VRF")                                 \
+_(NO_SUCH_INNER_FIB, -4, "No such inner FIB / VRF")                     \
+_(NO_SUCH_LABEL, -5, "No such label")                                   \
+_(NO_SUCH_ENTRY, -6, "No such entry")                                   \
+_(INVALID_VALUE, -7, "Invalid value")                                   \
+_(INVALID_VALUE_2, -8, "Invalid value #2")                              \
+_(UNIMPLEMENTED, -9, "Unimplemented")                                   \
+_(INVALID_SW_IF_INDEX_2, -10, "Invalid sw_if_index #2")                 \
+_(SYSCALL_ERROR_1, -11, "System call error #1")                         \
+_(SYSCALL_ERROR_2, -12, "System call error #2")                         \
+_(SYSCALL_ERROR_3, -13, "System call error #3")                         \
+_(SYSCALL_ERROR_4, -14, "System call error #4")                         \
+_(SYSCALL_ERROR_5, -15, "System call error #5")                         \
+_(SYSCALL_ERROR_6, -16, "System call error #6")                         \
+_(SYSCALL_ERROR_7, -17, "System call error #7")                         \
+_(SYSCALL_ERROR_8, -18, "System call error #8")                         \
+_(SYSCALL_ERROR_9, -19, "System call error #9")                         \
+_(SYSCALL_ERROR_10, -20, "System call error #9")                        \
+_(FEATURE_DISABLED, -30, "Feature disabled by configuration")           \
+_(INVALID_REGISTRATION, -31, "Invalid registration")                    \
+_(NEXT_HOP_NOT_IN_FIB, -50, "Next hop not in FIB")                      \
+_(UNKNOWN_DESTINATION, -51, "Unknown destination")                      \
+_(PREFIX_MATCHES_NEXT_HOP, -52, "Prefix matches next hop")              \
+_(NEXT_HOP_NOT_FOUND_MP, -53, "Next hop not found (multipath)")         \
+_(NO_MATCHING_INTERFACE, -54, "No matching interface for probe")        \
+_(INVALID_VLAN, -55, "Invalid VLAN")                                    \
+_(VLAN_ALREADY_EXISTS, -56, "VLAN subif already exists")                \
+_(INVALID_SRC_ADDRESS, -57, "Invalid src address")                      \
+_(INVALID_DST_ADDRESS, -58, "Invalid dst address")                      \
+_(ADDRESS_LENGTH_MISMATCH, -59, "Address length mismatch")              \
+_(ADDRESS_NOT_FOUND_FOR_INTERFACE, -60, "Address not found for interface") \
+_(ADDRESS_NOT_LINK_LOCAL, -61, "Address not link-local")                \
+_(IP6_NOT_ENABLED, -62, "ip6 not enabled")				\
+_(ADDRESS_MATCHES_INTERFACE_ADDRESS, -63, "Address matches interface address") \
+_(IN_PROGRESS, 10, "Operation in progress")				\
+_(NO_SUCH_NODE, -63, "No such graph node")				\
+_(NO_SUCH_NODE2, -64, "No such graph node #2")				\
+_(NO_SUCH_TABLE, -65, "No such table")                                  \
+_(NO_SUCH_TABLE2, -66, "No such table #2")                              \
+_(NO_SUCH_TABLE3, -67, "No such table #3")                              \
+_(SUBIF_ALREADY_EXISTS, -68, "Subinterface already exists")             \
+_(SUBIF_CREATE_FAILED, -69, "Subinterface creation failed")		\
+_(INVALID_MEMORY_SIZE, -70, "Invalid memory size requested")            \
+_(INVALID_INTERFACE, -71, "Invalid interface")                          \
+_(INVALID_VLAN_TAG_COUNT, -72, "Invalid number of tags for requested operation") \
+_(INVALID_ARGUMENT, -73, "Invalid argument")                            \
+_(UNEXPECTED_INTF_STATE, -74, "Unexpected interface state")             \
+_(TUNNEL_EXIST, -75, "Tunnel already exists")                           \
+_(INVALID_DECAP_NEXT, -76, "Invalid decap-next")			\
+_(RESPONSE_NOT_READY, -77, "Response not ready")			\
+_(NOT_CONNECTED, -78, "Not connected to the data plane")                \
+_(IF_ALREADY_EXISTS, -79, "Interface already exists")                   \
+_(BOND_SLAVE_NOT_ALLOWED, -80, "Operation not allowed on slave of BondEthernet") \
+_(VALUE_EXIST, -81, "Value already exists")                             \
+_(SAME_SRC_DST, -82, "Source and destination are the same")             \
+_(IP6_MULTICAST_ADDRESS_NOT_PRESENT, -83, "IP6 multicast address required") \
+_(SR_POLICY_NAME_NOT_PRESENT, -84, "Segement routing policy name required") \
+_(NOT_RUNNING_AS_ROOT, -85, "Not running as root") \
+_(ALREADY_CONNECTED, -86, "Connection to the data plane already exists") \
+_(UNSUPPORTED_JNI_VERSION, -87, "Unsupported JNI version") \
+_(FAILED_TO_ATTACH_TO_JAVA_THREAD, -88, "Failed to attach to Java thread") \
+_(INVALID_WORKER, -89, "Invalid worker thread")                         \
+_(LISP_DISABLED, -90, "LISP is disabled")                               \
+_(CLASSIFY_TABLE_NOT_FOUND, -91, "Classify table not found")            \
+_(INVALID_EID_TYPE, -92, "Unsupported LSIP EID type")                   \
+_(CANNOT_CREATE_PCAP_FILE, -93, "Cannot create pcap file")              \
+_(INCORRECT_ADJACENCY_TYPE, -94, "Invalid adjacency type for this operation") \
+_(EXCEEDED_NUMBER_OF_RANGES_CAPACITY, -95, "Operation would exceed configured capacity of ranges") \
+_(EXCEEDED_NUMBER_OF_PORTS_CAPACITY, -96, "Operation would exceed capacity of number of ports") \
+_(INVALID_ADDRESS_FAMILY, -97, "Invalid address family")                \
+_(INVALID_SUB_SW_IF_INDEX, -98, "Invalid sub-interface sw_if_index")    \
+_(TABLE_TOO_BIG, -99, "Table too big")                                  \
+_(CANNOT_ENABLE_DISABLE_FEATURE, -100, "Cannot enable/disable feature") \
+_(BFD_EEXIST, -101, "Duplicate BFD session") \
+_(BFD_NOENT, -102, "No such BFD session")
+
+typedef enum
+{
+#define _(a,b,c) VNET_API_ERROR_##a = (b),
+  foreach_vnet_api_error
+#undef _
+    VNET_API_N_ERROR,
+} vnet_api_error_t;
+
+#endif /* included_vnet_api_errno_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/bfd/bfd.api b/src/vnet/bfd/bfd.api
new file mode 100644
index 00000000..5798ee69
--- /dev/null
+++ b/src/vnet/bfd/bfd.api
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \brief Configure BFD feature
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param slow_timer - slow timer (seconds)
+    @param min_tx - desired min tx interval
+    @param min_rx - desired min rx interval
+    @param detect_mult - desired detection multiplier
+*/
+define bfd_set_config {
+  u32 client_index;
+  u32 context;
+  u32 slow_timer;
+  u32 min_tx;
+  u32 min_rx;
+  u8 detect_mult;
+};
+
+/** \brief Configure BFD feature response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define bfd_set_config_reply {
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Get BFD configuration
+*/
+define bfd_get_config {
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Get BFD configuration response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+    @param slow_timer - slow timer (seconds)
+    @param min_tx - desired min tx interval
+    @param min_rx - desired min rx interval
+    @param detect_mult - desired detection multiplier
+*/
+define bfd_get_config_reply {
+  u32 client_index;
+  u32 context;
+  u32 slow_timer;
+  u32 min_tx;
+  u32 min_rx;
+  u8 detect_mult;
+};
+
+/** \brief Add UDP BFD session on interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - sw index of the interface
+    @param desired_min_tx - desired min transmit interval (microseconds)
+    @param required_min_rx - required min receive interval (microseconds)
+    @param detect_mult - detect multiplier (# of packets missed between connection goes down)
+    @param local_addr - local address
+    @param peer_addr - peer address
+    @param is_ipv6 - local_addr, peer_addr are IPv6 if non-zero, otherwise IPv4
+*/
+define bfd_udp_add {
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u32 desired_min_tx;
+  u32 required_min_rx;
+  u8 local_addr[16];
+  u8 peer_addr[16];
+  u8 is_ipv6;
+  u8 detect_mult;
+};
+
+/** \brief Add UDP BFD session response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+    @param bs_index - index of the session created
+*/
+define bfd_udp_add_reply {
+  u32 context;
+  i32 retval;
+  u32 bs_index;
+};
+
+/** \brief Delete UDP BFD session on interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - sw index of the interface
+    @param local_addr - local address
+    @param peer_addr - peer address
+    @param is_ipv6 - local_addr, peer_addr are IPv6 if non-zero, otherwise IPv4
+*/
+define bfd_udp_del {
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 local_addr[16];
+  u8 peer_addr[16];
+  u8 is_ipv6;
+};
+
+/** \brief Delete UDP BFD session response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define bfd_udp_del_reply {
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Get all BFD sessions
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define bfd_udp_session_dump {
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief BFD session details structure
+    @param context - sender context, to match reply w/ request
+    @param bs_index - index of the session
+    @param sw_if_index - sw index of the interface
+    @param local_addr - local address
+    @param peer_addr - peer address
+    @param is_ipv6 - local_addr, peer_addr are IPv6 if non-zero, otherwise IPv4
+    @param state - session state
+*/
+define bfd_udp_session_details {
+  u32 context;
+  u32 bs_index; 
+  u32 sw_if_index;
+  u8 local_addr[16];
+  u8 peer_addr[16];
+  u8 is_ipv6;
+  u8 state;
+};
+
+/** \brief Set flags of BFD session
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param bs_index - index of the bfd session to set flags on
+    @param admin_up_down - set the admin state, 1 = up, 0 = down
+*/
+define bfd_session_set_flags {
+  u32 client_index;
+  u32 context;
+  u32 bs_index;
+  u8 admin_up_down;
+};
+
+/** \brief Reply to bfd_session_set_flags 
+    @param context - sender context which was passed in the request
+    @param retval - return code of the set flags request
+*/
+define bfd_session_set_flags_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Register for BFD events
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param enable_disable - 1 => register for events, 0 => cancel registration
+    @param pid - sender's pid
+*/
+define want_bfd_events
+{
+  u32 client_index;
+  u32 context;
+  u32 enable_disable;
+  u32 pid;
+};
+
+/** \brief Reply for BFD events registration
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define want_bfd_events_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/bfd/bfd_api.c b/src/vnet/bfd/bfd_api.c
new file mode 100644
index 00000000..126cf29a
--- /dev/null
+++ b/src/vnet/bfd/bfd_api.c
@@ -0,0 +1,262 @@
+/*
+ *------------------------------------------------------------------
+ * bfd_api.c - bfd api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/bfd/bfd_main.h>
+#include <vnet/bfd/bfd_api.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                             \
+_(BFD_UDP_ADD, bfd_udp_add)                             \
+_(BFD_UDP_DEL, bfd_udp_del)                             \
+_(BFD_UDP_SESSION_DUMP, bfd_udp_session_dump)           \
+_(BFD_SESSION_SET_FLAGS, bfd_session_set_flags)         \
+_(WANT_BFD_EVENTS, want_bfd_events)
+
+pub_sub_handler (bfd_events, BFD_EVENTS);
+
+static void
+vl_api_bfd_udp_add_t_handler (vl_api_bfd_udp_add_t * mp)
+{
+  vl_api_bfd_udp_add_reply_t *rmp;
+  int rv;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  ip46_address_t local_addr;
+  memset (&local_addr, 0, sizeof (local_addr));
+  ip46_address_t peer_addr;
+  memset (&peer_addr, 0, sizeof (peer_addr));
+  if (mp->is_ipv6)
+    {
+      clib_memcpy (&local_addr.ip6, mp->local_addr, sizeof (local_addr.ip6));
+      clib_memcpy (&peer_addr.ip6, mp->peer_addr, sizeof (peer_addr.ip6));
+    }
+  else
+    {
+      clib_memcpy (&local_addr.ip4, mp->local_addr, sizeof (local_addr.ip4));
+      clib_memcpy (&peer_addr.ip4, mp->peer_addr, sizeof (peer_addr.ip4));
+    }
+
+  rv = bfd_udp_add_session (clib_net_to_host_u32 (mp->sw_if_index),
+			    clib_net_to_host_u32 (mp->desired_min_tx),
+			    clib_net_to_host_u32 (mp->required_min_rx),
+			    mp->detect_mult, &local_addr, &peer_addr);
+
+  BAD_SW_IF_INDEX_LABEL;
+  REPLY_MACRO (VL_API_BFD_UDP_ADD_REPLY);
+}
+
+static void
+vl_api_bfd_udp_del_t_handler (vl_api_bfd_udp_del_t * mp)
+{
+  vl_api_bfd_udp_del_reply_t *rmp;
+  int rv;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  ip46_address_t local_addr;
+  memset (&local_addr, 0, sizeof (local_addr));
+  ip46_address_t peer_addr;
+  memset (&peer_addr, 0, sizeof (peer_addr));
+  if (mp->is_ipv6)
+    {
+      clib_memcpy (&local_addr.ip6, mp->local_addr, sizeof (local_addr.ip6));
+      clib_memcpy (&peer_addr.ip6, mp->peer_addr, sizeof (peer_addr.ip6));
+    }
+  else
+    {
+      clib_memcpy (&local_addr.ip4, mp->local_addr, sizeof (local_addr.ip4));
+      clib_memcpy (&peer_addr.ip4, mp->peer_addr, sizeof (peer_addr.ip4));
+    }
+
+  rv =
+    bfd_udp_del_session (clib_net_to_host_u32 (mp->sw_if_index), &local_addr,
+			 &peer_addr);
+
+  BAD_SW_IF_INDEX_LABEL;
+  REPLY_MACRO (VL_API_BFD_UDP_DEL_REPLY);
+}
+
+void
+send_bfd_udp_session_details (unix_shared_memory_queue_t * q, u32 context,
+			      bfd_session_t * bs)
+{
+  if (bs->transport != BFD_TRANSPORT_UDP4 &&
+      bs->transport != BFD_TRANSPORT_UDP6)
+    {
+      return;
+    }
+
+  vl_api_bfd_udp_session_details_t *mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_BFD_UDP_SESSION_DETAILS);
+  mp->context = context;
+  mp->bs_index = clib_host_to_net_u32 (bs->bs_idx);
+  mp->state = bs->local_state;
+  bfd_udp_session_t *bus = &bs->udp;
+  bfd_udp_key_t *key = &bus->key;
+  mp->sw_if_index = clib_host_to_net_u32 (key->sw_if_index);
+  mp->is_ipv6 = !(ip46_address_is_ip4 (&key->local_addr));
+  if (mp->is_ipv6)
+    {
+      clib_memcpy (mp->local_addr, &key->local_addr,
+		   sizeof (key->local_addr));
+      clib_memcpy (mp->peer_addr, &key->peer_addr, sizeof (key->peer_addr));
+    }
+  else
+    {
+      clib_memcpy (mp->local_addr, key->local_addr.ip4.data,
+		   sizeof (key->local_addr.ip4.data));
+      clib_memcpy (mp->peer_addr, key->peer_addr.ip4.data,
+		   sizeof (key->peer_addr.ip4.data));
+    }
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+void
+bfd_event (bfd_main_t * bm, bfd_session_t * bs)
+{
+  vpe_api_main_t *vam = &vpe_api_main;
+  vpe_client_registration_t *reg;
+  unix_shared_memory_queue_t *q;
+  /* *INDENT-OFF* */
+  pool_foreach (reg, vam->bfd_events_registrations, ({
+                  q = vl_api_client_index_to_input_queue (reg->client_index);
+                  if (q)
+                    {
+                      switch (bs->transport)
+                        {
+                        case BFD_TRANSPORT_UDP4:
+                        /* fallthrough */
+                        case BFD_TRANSPORT_UDP6:
+                          send_bfd_udp_session_details (q, 0, bs);
+                        }
+                    }
+                }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_bfd_udp_session_dump_t_handler (vl_api_bfd_udp_session_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+
+  if (q == 0)
+    return;
+
+  bfd_session_t *bs = NULL;
+  /* *INDENT-OFF* */
+  pool_foreach (bs, bfd_main.sessions, ({
+                  if (bs->transport == BFD_TRANSPORT_UDP4 ||
+                      bs->transport == BFD_TRANSPORT_UDP6)
+                    send_bfd_udp_session_details (q, mp->context, bs);
+                }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_bfd_session_set_flags_t_handler (vl_api_bfd_session_set_flags_t * mp)
+{
+  vl_api_bfd_session_set_flags_reply_t *rmp;
+  int rv;
+
+  rv =
+    bfd_session_set_flags (clib_net_to_host_u32 (mp->bs_index),
+			   mp->admin_up_down);
+
+  REPLY_MACRO (VL_API_BFD_SESSION_SET_FLAGS_REPLY);
+}
+
+
+/*
+ * bfd_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_bfd;
+#undef _
+}
+
+static clib_error_t *
+bfd_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (bfd_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/bfd/bfd_api.h b/src/vnet/bfd/bfd_api.h
new file mode 100644
index 00000000..cfcd04f3
--- /dev/null
+++ b/src/vnet/bfd/bfd_api.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief BFD global declarations
+ */
+#ifndef __included_bfd_api_h__
+#define __included_bfd_api_h__
+
+#include <vnet/api_errno.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/bfd/bfd_udp.h>
+
+vnet_api_error_t bfd_udp_add_session (u32 sw_if_index, u32 desired_min_tx_us,
+				      u32 required_min_rx_us, u8 detect_mult,
+				      const ip46_address_t * local_addr,
+				      const ip46_address_t * peer_addr);
+
+vnet_api_error_t bfd_udp_del_session (u32 sw_if_index,
+				      const ip46_address_t * local_addr,
+				      const ip46_address_t * peer_addr);
+
+vnet_api_error_t bfd_session_set_flags (u32 bs_index, u8 admin_up_down);
+
+#endif /* __included_bfd_api_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/bfd/bfd_debug.h b/src/vnet/bfd/bfd_debug.h
new file mode 100644
index 00000000..707ebab2
--- /dev/null
+++ b/src/vnet/bfd/bfd_debug.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief BFD global declarations
+ */
+#ifndef __included_bfd_debug_h__
+#define __included_bfd_debug_h__
+
+/* controls debug prints */
+#define BFD_DEBUG (0)
+
+#if BFD_DEBUG
+#define BFD_DEBUG_FILE_DEF            \
+  static const char *__file = NULL;   \
+  {                                   \
+    __file = strrchr (__FILE__, '/'); \
+    if (__file)                       \
+      {                               \
+        ++__file;                     \
+      }                               \
+    else                              \
+      {                               \
+        __file = __FILE__;            \
+      }                               \
+  }
+
+#define BFD_DBG(fmt, ...)                                                \
+  do                                                                     \
+    {                                                                    \
+      BFD_DEBUG_FILE_DEF                                                 \
+      static u8 *_s = NULL;                                              \
+      vlib_main_t *vm = vlib_get_main ();                                \
+      _s = format (_s, "%6.02f:DBG:%s:%d:%s():" fmt, vlib_time_now (vm), \
+                   __file, __LINE__, __func__, ##__VA_ARGS__);           \
+      printf ("%.*s\n", vec_len (_s), _s);                               \
+      vec_reset_length (_s);                                             \
+    }                                                                    \
+  while (0);
+
+#define BFD_ERR(fmt, ...)                                                \
+  do                                                                     \
+    {                                                                    \
+      BFD_DEBUG_FILE_DEF                                                 \
+      static u8 *_s = NULL;                                              \
+      vlib_main_t *vm = vlib_get_main ();                                \
+      _s = format (_s, "%6.02f:ERR:%s:%d:%s():" fmt, vlib_time_now (vm), \
+                   __file, __LINE__, __func__, ##__VA_ARGS__);           \
+      printf ("%.*s\n", vec_len (_s), _s);                               \
+      vec_reset_length (_s);                                             \
+    }                                                                    \
+  while (0);
+
+#else
+#define BFD_DBG(...)
+#define BFD_ERR(...)
+#endif
+
+#endif /* __included_bfd_debug_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/bfd/bfd_doc.md b/src/vnet/bfd/bfd_doc.md
new file mode 100644
index 00000000..1333ed77
--- /dev/null
+++ b/src/vnet/bfd/bfd_doc.md
@@ -0,0 +1 @@
+TODO
diff --git a/src/vnet/bfd/bfd_main.c b/src/vnet/bfd/bfd_main.c
new file mode 100644
index 00000000..e25eadfc
--- /dev/null
+++ b/src/vnet/bfd/bfd_main.c
@@ -0,0 +1,969 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief BFD nodes implementation
+ */
+
+#include <vppinfra/random.h>
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/bfd/bfd_debug.h>
+#include <vnet/bfd/bfd_protocol.h>
+#include <vnet/bfd/bfd_main.h>
+
+static u64
+bfd_us_to_clocks (bfd_main_t * bm, u64 us)
+{
+  return bm->cpu_cps * ((f64) us / USEC_PER_SECOND);
+}
+
+static vlib_node_registration_t bfd_process_node;
+
+typedef enum
+{
+#define F(t, n) BFD_OUTPUT_##t,
+  foreach_bfd_transport (F)
+#undef F
+    BFD_OUTPUT_N_NEXT,
+} bfd_output_next_t;
+
+static u32 bfd_next_index_by_transport[] = {
+#define F(t, n) [BFD_TRANSPORT_##t] = BFD_OUTPUT_##t,
+  foreach_bfd_transport (F)
+#undef F
+};
+
+/*
+ * We actually send all bfd pkts to the "error" node after scanning
+ * them, so the graph node has only one next-index. The "error-drop"
+ * node automatically bumps our per-node packet counters for us.
+ */
+typedef enum
+{
+  BFD_INPUT_NEXT_NORMAL,
+  BFD_INPUT_N_NEXT,
+} bfd_input_next_t;
+
+static void bfd_on_state_change (bfd_main_t * bm, bfd_session_t * bs, u64 now,
+				 int handling_wakeup);
+
+static void
+bfd_set_defaults (bfd_main_t * bm, bfd_session_t * bs)
+{
+  bs->local_state = BFD_STATE_down;
+  bs->local_diag = BFD_DIAG_CODE_no_diag;
+  bs->remote_state = BFD_STATE_down;
+  bs->local_demand = 0;
+  bs->remote_discr = 0;
+  bs->desired_min_tx_us = BFD_DEFAULT_DESIRED_MIN_TX_US;
+  bs->desired_min_tx_clocks = bfd_us_to_clocks (bm, bs->desired_min_tx_us);
+  bs->remote_min_rx_us = 1;
+  bs->remote_demand = 0;
+}
+
+static void
+bfd_set_diag (bfd_session_t * bs, bfd_diag_code_e code)
+{
+  if (bs->local_diag != code)
+    {
+      BFD_DBG ("set local_diag, bs_idx=%d: '%d:%s'", bs->bs_idx, code,
+	       bfd_diag_code_string (code));
+      bs->local_diag = code;
+    }
+}
+
+static void
+bfd_set_state (bfd_main_t * bm, bfd_session_t * bs,
+	       bfd_state_e new_state, int handling_wakeup)
+{
+  if (bs->local_state != new_state)
+    {
+      BFD_DBG ("Change state, bs_idx=%d: %s->%s", bs->bs_idx,
+	       bfd_state_string (bs->local_state),
+	       bfd_state_string (new_state));
+      bs->local_state = new_state;
+      bfd_on_state_change (bm, bs, clib_cpu_time_now (), handling_wakeup);
+    }
+}
+
+static void
+bfd_recalc_tx_interval (bfd_main_t * bm, bfd_session_t * bs)
+{
+  if (!bs->local_demand)
+    {
+      bs->transmit_interval_clocks =
+	clib_max (bs->desired_min_tx_clocks, bs->remote_min_rx_clocks);
+    }
+  else
+    {
+      /* TODO */
+    }
+  BFD_DBG ("Recalculated transmit interval %lu clocks/%.2fs",
+	   bs->transmit_interval_clocks,
+	   bs->transmit_interval_clocks / bm->cpu_cps);
+}
+
+static void
+bfd_calc_next_tx (bfd_main_t * bm, bfd_session_t * bs, u64 now)
+{
+  if (!bs->local_demand)
+    {
+      if (bs->local_detect_mult > 1)
+	{
+	  /* common case - 75-100% of transmit interval */
+	  bs->tx_timeout_clocks = now +
+	    (1 - .25 * (random_f64 (&bm->random_seed))) *
+	    bs->transmit_interval_clocks;
+	  if (bs->tx_timeout_clocks < now)
+	    {
+	      /* huh, we've missed it already, skip the missed events */
+	      const u64 missed =
+		(now - bs->tx_timeout_clocks) / bs->transmit_interval_clocks;
+	      BFD_ERR ("Missed %lu transmit events (now is %lu, calc "
+		       "tx_timeout is %lu)!",
+		       missed, now, bs->tx_timeout_clocks);
+	      bs->tx_timeout_clocks +=
+		(missed + 1) * bs->transmit_interval_clocks;
+	    }
+	}
+      else
+	{
+	  /* special case - 75-90% of transmit interval */
+	  bs->tx_timeout_clocks =
+	    now +
+	    (.9 - .15 * (random_f64 (&bm->random_seed))) *
+	    bs->transmit_interval_clocks;
+	  if (bs->tx_timeout_clocks < now)
+	    {
+	      /* huh, we've missed it already, skip the missed events */
+	      const u64 missed =
+		(now - bs->tx_timeout_clocks) / bs->transmit_interval_clocks;
+	      BFD_ERR ("Missed %lu transmit events (now is %lu, calc "
+		       "tx_timeout is %lu)!",
+		       missed, now, bs->tx_timeout_clocks);
+	      bs->tx_timeout_clocks +=
+		(missed + 1) * bs->transmit_interval_clocks;
+	    }
+	}
+    }
+  else
+    {
+      /* TODO */
+    }
+  if (bs->tx_timeout_clocks)
+    {
+      BFD_DBG ("Next transmit in %lu clocks/%.02fs@%lu",
+	       bs->tx_timeout_clocks - now,
+	       (bs->tx_timeout_clocks - now) / bm->cpu_cps,
+	       bs->tx_timeout_clocks);
+    }
+}
+
+static void
+bfd_recalc_detection_time (bfd_main_t * bm, bfd_session_t * bs)
+{
+  if (!bs->local_demand)
+    {
+      bs->detection_time_clocks =
+	bs->remote_detect_mult *
+	bfd_us_to_clocks (bm, clib_max (bs->required_min_rx_us,
+					bs->remote_desired_min_tx_us));
+    }
+  else
+    {
+      bs->detection_time_clocks =
+	bs->local_detect_mult *
+	bfd_us_to_clocks (bm,
+			  clib_max (bs->desired_min_tx_us,
+				    bs->remote_min_rx_us));
+    }
+  BFD_DBG ("Recalculated detection time %lu clocks/%.2fs",
+	   bs->detection_time_clocks,
+	   bs->detection_time_clocks / bm->cpu_cps);
+}
+
+static void
+bfd_set_timer (bfd_main_t * bm, bfd_session_t * bs, u64 now,
+	       int handling_wakeup)
+{
+  u64 next = 0;
+  u64 rx_timeout = 0;
+  if (BFD_STATE_up == bs->local_state)
+    {
+      rx_timeout = bs->last_rx_clocks + bs->detection_time_clocks;
+    }
+  if (bs->tx_timeout_clocks && rx_timeout)
+    {
+      next = clib_min (bs->tx_timeout_clocks, rx_timeout);
+    }
+  else if (bs->tx_timeout_clocks)
+    {
+      next = bs->tx_timeout_clocks;
+    }
+  else if (rx_timeout)
+    {
+      next = rx_timeout;
+    }
+  BFD_DBG ("bs_idx=%u, tx_timeout=%lu, rx_timeout=%lu, next=%s", bs->bs_idx,
+	   bs->tx_timeout_clocks, rx_timeout,
+	   next == bs->tx_timeout_clocks ? "tx" : "rx");
+  /* sometimes the wheel expires an event a bit sooner than requested, account
+     for that here */
+  if (next && (now + bm->wheel_inaccuracy > bs->wheel_time_clocks ||
+	       next < bs->wheel_time_clocks || !bs->wheel_time_clocks))
+    {
+      bs->wheel_time_clocks = next;
+      BFD_DBG ("timing_wheel_insert(%p, %lu (%ld clocks/%.2fs in the "
+	       "future), %u);",
+	       &bm->wheel, bs->wheel_time_clocks,
+	       (i64) bs->wheel_time_clocks - clib_cpu_time_now (),
+	       (i64) (bs->wheel_time_clocks - clib_cpu_time_now ()) /
+	       bm->cpu_cps, bs->bs_idx);
+      timing_wheel_insert (&bm->wheel, bs->wheel_time_clocks, bs->bs_idx);
+      if (!handling_wakeup)
+	{
+	  vlib_process_signal_event (bm->vlib_main,
+				     bm->bfd_process_node_index,
+				     BFD_EVENT_RESCHEDULE, bs->bs_idx);
+	}
+    }
+}
+
+static void
+bfd_set_desired_min_tx (bfd_main_t * bm, bfd_session_t * bs, u64 now,
+			u32 desired_min_tx_us, int handling_wakeup)
+{
+  bs->desired_min_tx_us = desired_min_tx_us;
+  bs->desired_min_tx_clocks = bfd_us_to_clocks (bm, bs->desired_min_tx_us);
+  BFD_DBG ("Set desired min tx to %uus/%lu clocks/%.2fs",
+	   bs->desired_min_tx_us, bs->desired_min_tx_clocks,
+	   bs->desired_min_tx_clocks / bm->cpu_cps);
+  bfd_recalc_detection_time (bm, bs);
+  bfd_recalc_tx_interval (bm, bs);
+  bfd_calc_next_tx (bm, bs, now);
+  bfd_set_timer (bm, bs, now, handling_wakeup);
+}
+
+static void
+bfd_set_remote_required_min_rx (bfd_main_t * bm, bfd_session_t * bs,
+				u64 now,
+				u32 remote_required_min_rx_us,
+				int handling_wakeup)
+{
+  bs->remote_min_rx_us = remote_required_min_rx_us;
+  bs->remote_min_rx_clocks = bfd_us_to_clocks (bm, bs->remote_min_rx_us);
+  BFD_DBG ("Set remote min rx to %uus/%lu clocks/%.2fs", bs->remote_min_rx_us,
+	   bs->remote_min_rx_clocks, bs->remote_min_rx_clocks / bm->cpu_cps);
+  bfd_recalc_detection_time (bm, bs);
+  bfd_recalc_tx_interval (bm, bs);
+  bfd_calc_next_tx (bm, bs, now);
+  bfd_set_timer (bm, bs, now, handling_wakeup);
+}
+
+void
+bfd_session_start (bfd_main_t * bm, bfd_session_t * bs)
+{
+  BFD_DBG ("%U", format_bfd_session, bs);
+  bfd_recalc_tx_interval (bm, bs);
+  vlib_process_signal_event (bm->vlib_main, bm->bfd_process_node_index,
+			     BFD_EVENT_NEW_SESSION, bs->bs_idx);
+}
+
+vnet_api_error_t
+bfd_del_session (uword bs_idx)
+{
+  const bfd_main_t *bm = &bfd_main;
+  if (!pool_is_free_index (bm->sessions, bs_idx))
+    {
+      bfd_session_t *bs = pool_elt_at_index (bm->sessions, bs_idx);
+      pool_put (bm->sessions, bs);
+      return 0;
+    }
+  else
+    {
+      BFD_ERR ("no such session");
+      return VNET_API_ERROR_BFD_NOENT;
+    }
+  return 0;
+}
+
+const char *
+bfd_diag_code_string (bfd_diag_code_e diag)
+{
+#define F(n, t, s)             \
+  case BFD_DIAG_CODE_NAME (t): \
+    return s;
+  switch (diag)
+    {
+    foreach_bfd_diag_code (F)}
+  return "UNKNOWN";
+#undef F
+}
+
+const char *
+bfd_state_string (bfd_state_e state)
+{
+#define F(n, t, s)         \
+  case BFD_STATE_NAME (t): \
+    return s;
+  switch (state)
+    {
+    foreach_bfd_state (F)}
+  return "UNKNOWN";
+#undef F
+}
+
+vnet_api_error_t
+bfd_session_set_flags (u32 bs_idx, u8 admin_up_down)
+{
+  bfd_main_t *bm = &bfd_main;
+  if (pool_is_free_index (bm->sessions, bs_idx))
+    {
+      BFD_ERR ("invalid bs_idx=%u", bs_idx);
+      return VNET_API_ERROR_BFD_NOENT;
+    }
+  bfd_session_t *bs = pool_elt_at_index (bm->sessions, bs_idx);
+  if (admin_up_down)
+    {
+      bfd_set_state (bm, bs, BFD_STATE_down, 0);
+    }
+  else
+    {
+      bfd_set_diag (bs, BFD_DIAG_CODE_neighbor_sig_down);
+      bfd_set_state (bm, bs, BFD_STATE_admin_down, 0);
+    }
+  return 0;
+}
+
+u8 *
+bfd_input_format_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  const bfd_input_trace_t *t = va_arg (*args, bfd_input_trace_t *);
+  const bfd_pkt_t *pkt = (bfd_pkt_t *) t->data;
+  if (t->len > STRUCT_SIZE_OF (bfd_pkt_t, head))
+    {
+      s = format (s, "BFD v%u, diag=%u(%s), state=%u(%s),\n"
+		  "    flags=(P:%u, F:%u, C:%u, A:%u, D:%u, M:%u), detect_mult=%u, "
+		  "length=%u\n",
+		  bfd_pkt_get_version (pkt), bfd_pkt_get_diag_code (pkt),
+		  bfd_diag_code_string (bfd_pkt_get_diag_code (pkt)),
+		  bfd_pkt_get_state (pkt),
+		  bfd_state_string (bfd_pkt_get_state (pkt)),
+		  bfd_pkt_get_poll (pkt), bfd_pkt_get_final (pkt),
+		  bfd_pkt_get_control_plane_independent (pkt),
+		  bfd_pkt_get_auth_present (pkt), bfd_pkt_get_demand (pkt),
+		  bfd_pkt_get_multipoint (pkt), pkt->head.detect_mult,
+		  pkt->head.length);
+      if (t->len >= sizeof (bfd_pkt_t)
+	  && pkt->head.length >= sizeof (bfd_pkt_t))
+	{
+	  s = format (s, "    my discriminator: %u\n", pkt->my_disc);
+	  s = format (s, "    your discriminator: %u\n", pkt->your_disc);
+	  s = format (s, "    desired min tx interval: %u\n",
+		      clib_net_to_host_u32 (pkt->des_min_tx));
+	  s = format (s, "    required min rx interval: %u\n",
+		      clib_net_to_host_u32 (pkt->req_min_rx));
+	  s = format (s, "    required min echo rx interval: %u\n",
+		      clib_net_to_host_u32 (pkt->req_min_echo_rx));
+	}
+    }
+
+  return s;
+}
+
+static void
+bfd_on_state_change (bfd_main_t * bm, bfd_session_t * bs, u64 now,
+		     int handling_wakeup)
+{
+  BFD_DBG ("State changed: %U", format_bfd_session, bs);
+  bfd_event (bm, bs);
+  switch (bs->local_state)
+    {
+    case BFD_STATE_admin_down:
+      bfd_set_desired_min_tx (bm, bs, now,
+			      clib_max (bs->config_desired_min_tx_us,
+					BFD_DEFAULT_DESIRED_MIN_TX_US),
+			      handling_wakeup);
+      break;
+    case BFD_STATE_down:
+      bfd_set_desired_min_tx (bm, bs, now,
+			      clib_max (bs->config_desired_min_tx_us,
+					BFD_DEFAULT_DESIRED_MIN_TX_US),
+			      handling_wakeup);
+      break;
+    case BFD_STATE_init:
+      bfd_set_desired_min_tx (bm, bs, now,
+			      clib_max (bs->config_desired_min_tx_us,
+					BFD_DEFAULT_DESIRED_MIN_TX_US),
+			      handling_wakeup);
+      break;
+    case BFD_STATE_up:
+      bfd_set_desired_min_tx (bm, bs, now, bs->config_desired_min_tx_us,
+			      handling_wakeup);
+      break;
+    }
+}
+
+static void
+bfd_add_transport_layer (vlib_main_t * vm, vlib_buffer_t * b,
+			 bfd_session_t * bs)
+{
+  switch (bs->transport)
+    {
+    case BFD_TRANSPORT_UDP4:
+      /* fallthrough */
+    case BFD_TRANSPORT_UDP6:
+      BFD_DBG ("Transport bfd via udp, bs_idx=%u", bs->bs_idx);
+      bfd_add_udp_transport (vm, b, &bs->udp);
+      break;
+    }
+}
+
+static vlib_buffer_t *
+bfd_create_frame (vlib_main_t * vm, vlib_node_runtime_t * rt,
+		  bfd_session_t * bs)
+{
+  u32 bi;
+  if (vlib_buffer_alloc (vm, &bi, 1) != 1)
+    {
+      clib_warning ("buffer allocation failure");
+      return NULL;
+    }
+
+  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+  ASSERT (b->current_data == 0);
+
+  u32 *to_next;
+  u32 n_left_to_next;
+
+  vlib_get_next_frame (vm, rt, bfd_next_index_by_transport[bs->transport],
+		       to_next, n_left_to_next);
+
+  to_next[0] = bi;
+  n_left_to_next -= 1;
+
+  vlib_put_next_frame (vm, rt, bfd_next_index_by_transport[bs->transport],
+		       n_left_to_next);
+  return b;
+}
+
+static void
+bfd_init_control_frame (vlib_buffer_t * b, bfd_session_t * bs)
+{
+  bfd_pkt_t *pkt = vlib_buffer_get_current (b);
+  const u32 bfd_length = 24;
+  memset (pkt, 0, sizeof (*pkt));
+
+  bfd_pkt_set_version (pkt, 1);
+  bfd_pkt_set_diag_code (pkt, bs->local_diag);
+  bfd_pkt_set_state (pkt, bs->local_state);
+  if (bs->local_demand && BFD_STATE_up == bs->local_state &&
+      BFD_STATE_up == bs->remote_state)
+    {
+      bfd_pkt_set_demand (pkt);
+    }
+  pkt->head.detect_mult = bs->local_detect_mult;
+  pkt->head.length = clib_host_to_net_u32 (bfd_length);
+  pkt->my_disc = bs->local_discr;
+  pkt->your_disc = bs->remote_discr;
+  pkt->des_min_tx = clib_host_to_net_u32 (bs->desired_min_tx_us);
+  pkt->req_min_rx = clib_host_to_net_u32 (bs->required_min_rx_us);
+  pkt->req_min_echo_rx = clib_host_to_net_u32 (0);	/* FIXME */
+  b->current_length = bfd_length;
+}
+
+static void
+bfd_send_periodic (vlib_main_t * vm, vlib_node_runtime_t * rt,
+		   bfd_main_t * bm, bfd_session_t * bs, u64 now,
+		   int handling_wakeup)
+{
+  if (!bs->remote_min_rx_us)
+    {
+      BFD_DBG
+	("bfd.RemoteMinRxInterval is zero, not sending periodic control "
+	 "frame");
+      return;
+    }
+  /* FIXME
+     A system MUST NOT periodically transmit BFD Control packets if Demand
+     mode is active on the remote system (bfd.RemoteDemandMode is 1,
+     bfd.SessionState is Up, and bfd.RemoteSessionState is Up) and a Poll
+     Sequence is not being transmitted.
+   */
+  /* sometimes the wheel expires an event a bit sooner than requested, account
+     for that here */
+  if (now + bm->wheel_inaccuracy >= bs->tx_timeout_clocks)
+    {
+      BFD_DBG ("Send periodic control frame for bs_idx=%lu", bs->bs_idx);
+      vlib_buffer_t *b = bfd_create_frame (vm, rt, bs);
+      if (!b)
+	{
+	  return;
+	}
+      bfd_init_control_frame (b, bs);
+      bfd_add_transport_layer (vm, b, bs);
+      bfd_calc_next_tx (bm, bs, now);
+    }
+  else
+    {
+      BFD_DBG
+	("No need to send control frame now, now is %lu, tx_timeout is %lu",
+	 now, bs->tx_timeout_clocks);
+    }
+  bfd_set_timer (bm, bs, now, handling_wakeup);
+}
+
+void
+bfd_send_final (vlib_main_t * vm, vlib_buffer_t * b, bfd_session_t * bs)
+{
+  BFD_DBG ("Send final control frame for bs_idx=%lu", bs->bs_idx);
+  bfd_init_control_frame (b, bs);
+  bfd_pkt_set_final (vlib_buffer_get_current (b));
+  bfd_add_transport_layer (vm, b, bs);
+}
+
+static void
+bfd_check_rx_timeout (bfd_main_t * bm, bfd_session_t * bs, u64 now,
+		      int handling_wakeup)
+{
+  /* sometimes the wheel expires an event a bit sooner than requested, account
+     for that here */
+  if (bs->last_rx_clocks + bs->detection_time_clocks <=
+      now + bm->wheel_inaccuracy)
+    {
+      BFD_DBG ("Rx timeout, session goes down");
+      bfd_set_diag (bs, BFD_DIAG_CODE_det_time_exp);
+      bfd_set_state (bm, bs, BFD_STATE_down, handling_wakeup);
+    }
+}
+
+void
+bfd_on_timeout (vlib_main_t * vm, vlib_node_runtime_t * rt, bfd_main_t * bm,
+		bfd_session_t * bs, u64 now)
+{
+  BFD_DBG ("Timeout for bs_idx=%lu", bs->bs_idx);
+  switch (bs->local_state)
+    {
+    case BFD_STATE_admin_down:
+      BFD_ERR ("Unexpected timeout when in %s state",
+	       bfd_state_string (bs->local_state));
+      abort ();
+      break;
+    case BFD_STATE_down:
+      bfd_send_periodic (vm, rt, bm, bs, now, 1);
+      break;
+    case BFD_STATE_init:
+      BFD_ERR ("Unexpected timeout when in %s state",
+	       bfd_state_string (bs->local_state));
+      abort ();
+      break;
+    case BFD_STATE_up:
+      bfd_check_rx_timeout (bm, bs, now, 1);
+      bfd_send_periodic (vm, rt, bm, bs, now, 1);
+      break;
+    }
+}
+
+/*
+ * bfd process node function
+ */
+static uword
+bfd_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  bfd_main_t *bm = &bfd_main;
+  u32 *expired = 0;
+  uword event_type, *event_data = 0;
+
+  /* So we can send events to the bfd process */
+  bm->bfd_process_node_index = bfd_process_node.index;
+
+  while (1)
+    {
+      u64 now = clib_cpu_time_now ();
+      u64 next_expire = timing_wheel_next_expiring_elt_time (&bm->wheel);
+      BFD_DBG ("timing_wheel_next_expiring_elt_time(%p) returns %lu",
+	       &bm->wheel, next_expire);
+      if ((i64) next_expire < 0)
+	{
+	  BFD_DBG ("wait for event without timeout");
+	  (void) vlib_process_wait_for_event (vm);
+	  event_type = vlib_process_get_events (vm, &event_data);
+	}
+      else
+	{
+	  f64 timeout = ((i64) next_expire - (i64) now) / bm->cpu_cps;
+	  BFD_DBG ("wait for event with timeout %.02f", timeout);
+	  if (timeout < 0)
+	    {
+	      BFD_DBG ("negative timeout, already expired, skipping wait");
+	      event_type = ~0;
+	    }
+	  else
+	    {
+	      (void) vlib_process_wait_for_event_or_clock (vm, timeout);
+	      event_type = vlib_process_get_events (vm, &event_data);
+	    }
+	}
+      now = clib_cpu_time_now ();
+      switch (event_type)
+	{
+	case ~0:		/* no events => timeout */
+	  /* nothing to do here */
+	  break;
+	case BFD_EVENT_RESCHEDULE:
+	  /* nothing to do here - reschedule is done automatically after
+	   * each event or timeout */
+	  break;
+	case BFD_EVENT_NEW_SESSION:
+	  do
+	    {
+	      bfd_session_t *bs =
+		pool_elt_at_index (bm->sessions, *event_data);
+	      bfd_send_periodic (vm, rt, bm, bs, now, 1);
+	    }
+	  while (0);
+	  break;
+	default:
+	  clib_warning ("BUG: event type 0x%wx", event_type);
+	  break;
+	}
+      BFD_DBG ("advancing wheel, now is %lu", now);
+      BFD_DBG ("timing_wheel_advance (%p, %lu, %p, 0);", &bm->wheel, now,
+	       expired);
+      expired = timing_wheel_advance (&bm->wheel, now, expired, 0);
+      BFD_DBG ("Expired %d elements", vec_len (expired));
+      u32 *p = NULL;
+      vec_foreach (p, expired)
+      {
+	const u32 bs_idx = *p;
+	if (!pool_is_free_index (bm->sessions, bs_idx))
+	  {
+	    bfd_session_t *bs = pool_elt_at_index (bm->sessions, bs_idx);
+	    bfd_on_timeout (vm, rt, bm, bs, now);
+	  }
+      }
+      if (expired)
+	{
+	  _vec_len (expired) = 0;
+	}
+      if (event_data)
+	{
+	  _vec_len (event_data) = 0;
+	}
+    }
+
+  return 0;
+}
+
+/*
+ * bfd process node declaration
+ */
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (bfd_process_node, static) = {
+  .function = bfd_process,
+  .type = VLIB_NODE_TYPE_PROCESS,
+  .name = "bfd-process",
+  .n_next_nodes = BFD_OUTPUT_N_NEXT,
+  .next_nodes =
+      {
+#define F(t, n) [BFD_OUTPUT_##t] = n,
+          foreach_bfd_transport (F)
+#undef F
+      },
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+bfd_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
+{
+  // bfd_main_t *bm = &bfd_main;
+  // vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
+    {
+      /* TODO */
+    }
+  return 0;
+}
+
+VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (bfd_sw_interface_up_down);
+
+static clib_error_t *
+bfd_hw_interface_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+  // bfd_main_t *bm = &bfd_main;
+  if (flags & VNET_HW_INTERFACE_FLAG_LINK_UP)
+    {
+      /* TODO */
+    }
+  return 0;
+}
+
+VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (bfd_hw_interface_up_down);
+
+/*
+ * setup function
+ */
+static clib_error_t *
+bfd_main_init (vlib_main_t * vm)
+{
+  bfd_main_t *bm = &bfd_main;
+  bm->random_seed = random_default_seed ();
+  bm->vlib_main = vm;
+  bm->vnet_main = vnet_get_main ();
+  memset (&bm->wheel, 0, sizeof (bm->wheel));
+  bm->cpu_cps = 2590000000;	// vm->clib_time.clocks_per_second;
+  BFD_DBG ("cps is %.2f", bm->cpu_cps);
+  const u64 now = clib_cpu_time_now ();
+  timing_wheel_init (&bm->wheel, now, bm->cpu_cps);
+  bm->wheel_inaccuracy = 2 << bm->wheel.log2_clocks_per_bin;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (bfd_main_init);
+
+bfd_session_t *
+bfd_get_session (bfd_main_t * bm, bfd_transport_t t)
+{
+  bfd_session_t *result;
+  pool_get (bm->sessions, result);
+  memset (result, 0, sizeof (*result));
+  result->bs_idx = result - bm->sessions;
+  result->transport = t;
+  result->local_discr = random_u32 (&bm->random_seed);
+  bfd_set_defaults (bm, result);
+  hash_set (bm->session_by_disc, result->local_discr, result->bs_idx);
+  return result;
+}
+
+void
+bfd_put_session (bfd_main_t * bm, bfd_session_t * bs)
+{
+  hash_unset (bm->session_by_disc, bs->local_discr);
+  pool_put (bm->sessions, bs);
+}
+
+bfd_session_t *
+bfd_find_session_by_idx (bfd_main_t * bm, uword bs_idx)
+{
+  if (!pool_is_free_index (bm->sessions, bs_idx))
+    {
+      return pool_elt_at_index (bm->sessions, bs_idx);
+    }
+  return NULL;
+}
+
+bfd_session_t *
+bfd_find_session_by_disc (bfd_main_t * bm, u32 disc)
+{
+  uword *p = hash_get (bfd_main.session_by_disc, disc);
+  if (p)
+    {
+      return pool_elt_at_index (bfd_main.sessions, *p);
+    }
+  return NULL;
+}
+
+/**
+ * @brief verify bfd packet - common checks
+ *
+ * @param pkt
+ *
+ * @return 1 if bfd packet is valid
+ */
+int
+bfd_verify_pkt_common (const bfd_pkt_t * pkt)
+{
+  if (1 != bfd_pkt_get_version (pkt))
+    {
+      BFD_ERR ("BFD verification failed - unexpected version: '%d'",
+	       bfd_pkt_get_version (pkt));
+      return 0;
+    }
+  if (pkt->head.length < sizeof (bfd_pkt_t) ||
+      (bfd_pkt_get_auth_present (pkt) &&
+       pkt->head.length < sizeof (bfd_pkt_with_auth_t)))
+    {
+      BFD_ERR ("BFD verification failed - unexpected length: '%d' (auth "
+	       "present: %d)",
+	       pkt->head.length, bfd_pkt_get_auth_present (pkt));
+      return 0;
+    }
+  if (!pkt->head.detect_mult)
+    {
+      BFD_ERR ("BFD verification failed - unexpected detect-mult: '%d'",
+	       pkt->head.detect_mult);
+      return 0;
+    }
+  if (bfd_pkt_get_multipoint (pkt))
+    {
+      BFD_ERR ("BFD verification failed - unexpected multipoint: '%d'",
+	       bfd_pkt_get_multipoint (pkt));
+      return 0;
+    }
+  if (!pkt->my_disc)
+    {
+      BFD_ERR ("BFD verification failed - unexpected my-disc: '%d'",
+	       pkt->my_disc);
+      return 0;
+    }
+  if (!pkt->your_disc)
+    {
+      const u8 pkt_state = bfd_pkt_get_state (pkt);
+      if (pkt_state != BFD_STATE_down && pkt_state != BFD_STATE_admin_down)
+	{
+	  BFD_ERR ("BFD verification failed - unexpected state: '%s' "
+		   "(your-disc is zero)", bfd_state_string (pkt_state));
+	  return 0;
+	}
+    }
+  return 1;
+}
+
+/**
+ * @brief verify bfd packet - authentication
+ *
+ * @param pkt
+ *
+ * @return 1 if bfd packet is valid
+ */
+int
+bfd_verify_pkt_session (const bfd_pkt_t * pkt, u16 pkt_size,
+			const bfd_session_t * bs)
+{
+  const bfd_pkt_with_auth_t *with_auth = (bfd_pkt_with_auth_t *) pkt;
+  if (!bfd_pkt_get_auth_present (pkt))
+    {
+      if (pkt_size > sizeof (*pkt))
+	{
+	  BFD_ERR ("BFD verification failed - unexpected packet size '%d' "
+		   "(auth not present)", pkt_size);
+	  return 0;
+	}
+    }
+  else
+    {
+      if (!with_auth->auth.type)
+	{
+	  BFD_ERR ("BFD verification failed - unexpected auth type: '%d'",
+		   with_auth->auth.type);
+	  return 0;
+	}
+      /* TODO FIXME - implement the actual verification */
+    }
+  return 1;
+}
+
+void
+bfd_consume_pkt (bfd_main_t * bm, const bfd_pkt_t * pkt, u32 bs_idx)
+{
+  bfd_session_t *bs = bfd_find_session_by_idx (bm, bs_idx);
+  if (!bs)
+    {
+      return;
+    }
+  BFD_DBG ("Scanning bfd packet, bs_idx=%d", bs->bs_idx);
+  bs->remote_discr = pkt->my_disc;
+  bs->remote_state = bfd_pkt_get_state (pkt);
+  bs->remote_demand = bfd_pkt_get_demand (pkt);
+  u64 now = clib_cpu_time_now ();
+  bs->last_rx_clocks = now;
+  bs->remote_desired_min_tx_us = clib_net_to_host_u32 (pkt->des_min_tx);
+  bs->remote_detect_mult = pkt->head.detect_mult;
+  bfd_set_remote_required_min_rx (bm, bs, now,
+				  clib_net_to_host_u32 (pkt->req_min_rx), 0);
+  /* FIXME
+     If the Required Min Echo RX Interval field is zero, the
+     transmission of Echo packets, if any, MUST cease.
+
+     If a Poll Sequence is being transmitted by the local system and
+     the Final (F) bit in the received packet is set, the Poll Sequence
+     MUST be terminated.
+   */
+  /* FIXME 6.8.2 */
+  /* FIXME 6.8.4 */
+  if (BFD_STATE_admin_down == bs->local_state)
+    return;
+  if (BFD_STATE_admin_down == bs->remote_state)
+    {
+      bfd_set_diag (bs, BFD_DIAG_CODE_neighbor_sig_down);
+      bfd_set_state (bm, bs, BFD_STATE_down, 0);
+    }
+  else if (BFD_STATE_down == bs->local_state)
+    {
+      if (BFD_STATE_down == bs->remote_state)
+	{
+	  bfd_set_state (bm, bs, BFD_STATE_init, 0);
+	}
+      else if (BFD_STATE_init == bs->remote_state)
+	{
+	  bfd_set_state (bm, bs, BFD_STATE_up, 0);
+	}
+    }
+  else if (BFD_STATE_init == bs->local_state)
+    {
+      if (BFD_STATE_up == bs->remote_state ||
+	  BFD_STATE_init == bs->remote_state)
+	{
+	  bfd_set_state (bm, bs, BFD_STATE_up, 0);
+	}
+    }
+  else				/* BFD_STATE_up == bs->local_state */
+    {
+      if (BFD_STATE_down == bs->remote_state)
+	{
+	  bfd_set_diag (bs, BFD_DIAG_CODE_neighbor_sig_down);
+	  bfd_set_state (bm, bs, BFD_STATE_down, 0);
+	}
+    }
+}
+
+u8 *
+format_bfd_session (u8 * s, va_list * args)
+{
+  const bfd_session_t *bs = va_arg (*args, bfd_session_t *);
+  return format (s, "BFD(%u): bfd.SessionState=%s, "
+		 "bfd.RemoteSessionState=%s, "
+		 "bfd.LocalDiscr=%u, "
+		 "bfd.RemoteDiscr=%u, "
+		 "bfd.LocalDiag=%s, "
+		 "bfd.DesiredMinTxInterval=%u, "
+		 "bfd.RequiredMinRxInterval=%u, "
+		 "bfd.RemoteMinRxInterval=%u, "
+		 "bfd.DemandMode=%s, "
+		 "bfd.RemoteDemandMode=%s, "
+		 "bfd.DetectMult=%u, ",
+		 bs->bs_idx, bfd_state_string (bs->local_state),
+		 bfd_state_string (bs->remote_state), bs->local_discr,
+		 bs->remote_discr, bfd_diag_code_string (bs->local_diag),
+		 bs->desired_min_tx_us, bs->required_min_rx_us,
+		 bs->remote_min_rx_us, (bs->local_demand ? "yes" : "no"),
+		 (bs->remote_demand ? "yes" : "no"), bs->local_detect_mult);
+}
+
+bfd_main_t bfd_main;
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/bfd/bfd_main.h b/src/vnet/bfd/bfd_main.h
new file mode 100644
index 00000000..c72ea92a
--- /dev/null
+++ b/src/vnet/bfd/bfd_main.h
@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief BFD global declarations
+ */
+#ifndef __included_bfd_main_h__
+#define __included_bfd_main_h__
+
+#include <vppinfra/timing_wheel.h>
+#include <vnet/vnet.h>
+#include <vnet/bfd/bfd_protocol.h>
+#include <vnet/bfd/bfd_udp.h>
+
+#define foreach_bfd_transport(F) \
+  F (UDP4, "ip4-rewrite")  \
+  F (UDP6, "ip6-rewrite")
+
+typedef enum
+{
+#define F(t, n) BFD_TRANSPORT_##t,
+  foreach_bfd_transport (F)
+#undef F
+} bfd_transport_t;
+
+#define foreach_bfd_mode(F) \
+  F (asynchronous)          \
+  F (demand)
+
+typedef enum
+{
+#define F(x) BFD_MODE_##x,
+  foreach_bfd_mode (F)
+#undef F
+} bfd_mode_e;
+
+typedef struct
+{
+  /* index in bfd_main.sessions pool */
+  u32 bs_idx;
+
+  /* session state */
+  bfd_state_e local_state;
+
+  /* local diagnostics */
+  bfd_diag_code_e local_diag;
+
+  /* remote session state */
+  bfd_state_e remote_state;
+
+  /* local discriminator */
+  u32 local_discr;
+
+  /* remote discriminator */
+  u32 remote_discr;
+
+  /* configured desired min tx interval (microseconds) */
+  u32 config_desired_min_tx_us;
+
+  /* desired min tx interval (microseconds) */
+  u32 desired_min_tx_us;
+
+  /* desired min tx interval (clocks) */
+  u64 desired_min_tx_clocks;
+
+  /* required min rx interval */
+  u32 required_min_rx_us;
+
+  /* remote min rx interval (microseconds) */
+  u32 remote_min_rx_us;
+
+  /* remote min rx interval (clocks) */
+  u64 remote_min_rx_clocks;
+
+  /* remote desired min tx interval */
+  u32 remote_desired_min_tx_us;
+
+  /* 1 if in demand mode, 0 otherwise */
+  u8 local_demand;
+
+  /* 1 if remote system sets demand mode, 0 otherwise */
+  u8 remote_demand;
+
+  /* local detect multiplier */
+  u8 local_detect_mult;
+
+  /* remote detect multiplier */
+  u8 remote_detect_mult;
+
+  /* set to value of timer in timing wheel, 0 if never set */
+  u64 wheel_time_clocks;
+
+  /* transmit interval */
+  u64 transmit_interval_clocks;
+
+  /* next time at which to transmit a packet */
+  u64 tx_timeout_clocks;
+
+  /* timestamp of last packet received */
+  u64 last_rx_clocks;
+
+  /* detection time */
+  u64 detection_time_clocks;
+
+  /* transport type for this session */
+  bfd_transport_t transport;
+
+  union
+  {
+    bfd_udp_session_t udp;
+  };
+} bfd_session_t;
+
+typedef struct
+{
+  u32 client_index;
+  u32 client_pid;
+} event_subscriber_t;
+
+typedef struct
+{
+  /* pool of bfd sessions context data */
+  bfd_session_t *sessions;
+
+  /* timing wheel for scheduling timeouts */
+  timing_wheel_t wheel;
+
+  /* timing wheel inaccuracy, in clocks */
+  u64 wheel_inaccuracy;
+
+  /* hashmap - bfd session by discriminator */
+  u32 *session_by_disc;
+
+  /* background process node index */
+  u32 bfd_process_node_index;
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+
+  /* cpu clocks per second */
+  f64 cpu_cps;
+
+  /* for generating random numbers */
+  u32 random_seed;
+
+} bfd_main_t;
+
+extern bfd_main_t bfd_main;
+
+/* Packet counters */
+#define foreach_bfd_error(F)               \
+  F (NONE, "good bfd packets (processed)") \
+  F (BAD, "invalid bfd packets")           \
+  F (DISABLED, "bfd packets received on disabled interfaces")
+
+typedef enum
+{
+#define F(sym, str) BFD_ERROR_##sym,
+  foreach_bfd_error (F)
+#undef F
+    BFD_N_ERROR,
+} bfd_error_t;
+
+/* bfd packet trace capture */
+typedef struct
+{
+  u32 len;
+  u8 data[400];
+} bfd_input_trace_t;
+
+enum
+{
+  BFD_EVENT_RESCHEDULE = 1,
+  BFD_EVENT_NEW_SESSION,
+} bfd_process_event_e;
+
+u8 *bfd_input_format_trace (u8 * s, va_list * args);
+
+bfd_session_t *bfd_get_session (bfd_main_t * bm, bfd_transport_t t);
+void bfd_put_session (bfd_main_t * bm, bfd_session_t * bs);
+bfd_session_t *bfd_find_session_by_idx (bfd_main_t * bm, uword bs_idx);
+bfd_session_t *bfd_find_session_by_disc (bfd_main_t * bm, u32 disc);
+void bfd_session_start (bfd_main_t * bm, bfd_session_t * bs);
+void bfd_consume_pkt (bfd_main_t * bm, const bfd_pkt_t * bfd, u32 bs_idx);
+int bfd_verify_pkt_common (const bfd_pkt_t * pkt);
+int bfd_verify_pkt_session (const bfd_pkt_t * pkt, u16 pkt_size,
+			    const bfd_session_t * bs);
+void bfd_event (bfd_main_t * bm, bfd_session_t * bs);
+void bfd_send_final (vlib_main_t * vm, vlib_buffer_t * b, bfd_session_t * bs);
+u8 *format_bfd_session (u8 * s, va_list * args);
+
+
+#define USEC_PER_MS 1000LL
+#define USEC_PER_SECOND (1000 * USEC_PER_MS)
+
+/* default, slow transmission interval for BFD packets, per spec at least 1s */
+#define BFD_DEFAULT_DESIRED_MIN_TX_US USEC_PER_SECOND
+
+#endif /* __included_bfd_main_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/bfd/bfd_protocol.c b/src/vnet/bfd/bfd_protocol.c
new file mode 100644
index 00000000..ede9536f
--- /dev/null
+++ b/src/vnet/bfd/bfd_protocol.c
@@ -0,0 +1,74 @@
+#include <vnet/bfd/bfd_protocol.h>
+
+u8 bfd_pkt_get_version (const bfd_pkt_t *pkt)
+{
+  return pkt->head.vers_diag >> 5;
+}
+
+void bfd_pkt_set_version (bfd_pkt_t *pkt, int version)
+{
+  pkt->head.vers_diag =
+      (version << 5) | (pkt->head.vers_diag & ((1 << 5) - 1));
+}
+
+u8 bfd_pkt_get_diag_code (const bfd_pkt_t *pkt)
+{
+  return pkt->head.vers_diag & ((1 << 5) - 1);
+}
+
+void bfd_pkt_set_diag_code (bfd_pkt_t *pkt, int value)
+{
+  pkt->head.vers_diag =
+      (pkt->head.vers_diag & ~((1 << 5) - 1)) | (value & ((1 << 5) - 1));
+}
+
+u8 bfd_pkt_get_state (const bfd_pkt_t *pkt)
+{
+  return pkt->head.sta_flags >> 6;
+}
+
+void bfd_pkt_set_state (bfd_pkt_t *pkt, int value)
+{
+  pkt->head.sta_flags = (value << 6) | (pkt->head.sta_flags & ((1 << 6) - 1));
+}
+
+u8 bfd_pkt_get_poll (const bfd_pkt_t *pkt)
+{
+  return (pkt->head.sta_flags >> 5) & 1;
+}
+
+void bfd_pkt_set_final (bfd_pkt_t *pkt) { pkt->head.sta_flags |= 1 << 5; }
+
+u8 bfd_pkt_get_final (const bfd_pkt_t *pkt)
+{
+  return (pkt->head.sta_flags >> 4) & 1;
+}
+
+void bfd_pkt_set_poll (bfd_pkt_t *pkt);
+u8 bfd_pkt_get_control_plane_independent (const bfd_pkt_t *pkt)
+{
+  return (pkt->head.sta_flags >> 3) & 1;
+}
+
+void bfd_pkt_set_control_plane_independent (bfd_pkt_t *pkt);
+
+u8 bfd_pkt_get_auth_present (const bfd_pkt_t *pkt)
+{
+  return (pkt->head.sta_flags >> 2) & 1;
+}
+
+void bfd_pkt_set_auth_present (bfd_pkt_t *pkt);
+
+u8 bfd_pkt_get_demand (const bfd_pkt_t *pkt)
+{
+  return (pkt->head.sta_flags >> 1) & 1;
+}
+
+void bfd_pkt_set_demand (bfd_pkt_t *pkt) { pkt->head.sta_flags |= 1 << 1; }
+
+u8 bfd_pkt_get_multipoint (const bfd_pkt_t *pkt)
+{
+  return pkt->head.sta_flags & 1;
+}
+
+void bfd_pkt_set_multipoint (bfd_pkt_t *pkt);
diff --git a/src/vnet/bfd/bfd_protocol.h b/src/vnet/bfd/bfd_protocol.h
new file mode 100644
index 00000000..cf751b3b
--- /dev/null
+++ b/src/vnet/bfd/bfd_protocol.h
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_bfd_protocol_h__
+#define __included_bfd_protocol_h__
+/**
+ * @file
+ * @brief BFD protocol declarations
+ */
+
+#include <vppinfra/types.h>
+#include <vppinfra/clib.h>
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  /*
+   An optional Authentication Section MAY be present:
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |   Auth Type   |   Auth Len    |    Authentication Data...     |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  */
+  u8 type;
+  u8 len;
+  u8 data[0];
+}) bfd_auth_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  /*
+     The Mandatory Section of a BFD Control packet has the following
+     format:
+
+      0                   1                   2                   3
+      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     |Vers |  Diag   |Sta|P|F|C|A|D|M|  Detect Mult  |    Length     |
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     |                       My Discriminator                        |
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     |                      Your Discriminator                       |
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     |                    Desired Min TX Interval                    |
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     |                   Required Min RX Interval                    |
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+     |                 Required Min Echo RX Interval                 |
+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  */
+  struct
+  {
+    u8 vers_diag;
+    u8 sta_flags;
+    u8 detect_mult;
+    u8 length;
+  } head;
+  u32 my_disc;
+  u32 your_disc;
+  u32 des_min_tx;
+  u32 req_min_rx;
+  u32 req_min_echo_rx;
+}) bfd_pkt_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  bfd_pkt_t pkt;
+  bfd_auth_t auth;
+}) bfd_pkt_with_auth_t;
+/* *INDENT-ON* */
+
+u8 bfd_pkt_get_version (const bfd_pkt_t * pkt);
+void bfd_pkt_set_version (bfd_pkt_t * pkt, int version);
+u8 bfd_pkt_get_diag_code (const bfd_pkt_t * pkt);
+void bfd_pkt_set_diag_code (bfd_pkt_t * pkt, int value);
+u8 bfd_pkt_get_state (const bfd_pkt_t * pkt);
+void bfd_pkt_set_state (bfd_pkt_t * pkt, int value);
+u8 bfd_pkt_get_poll (const bfd_pkt_t * pkt);
+void bfd_pkt_set_final (bfd_pkt_t * pkt);
+u8 bfd_pkt_get_final (const bfd_pkt_t * pkt);
+void bfd_pkt_set_poll (bfd_pkt_t * pkt);
+u8 bfd_pkt_get_control_plane_independent (const bfd_pkt_t * pkt);
+void bfd_pkt_set_control_plane_independent (bfd_pkt_t * pkt);
+u8 bfd_pkt_get_auth_present (const bfd_pkt_t * pkt);
+void bfd_pkt_set_auth_present (bfd_pkt_t * pkt);
+u8 bfd_pkt_get_demand (const bfd_pkt_t * pkt);
+void bfd_pkt_set_demand (bfd_pkt_t * pkt);
+u8 bfd_pkt_get_multipoint (const bfd_pkt_t * pkt);
+void bfd_pkt_set_multipoint (bfd_pkt_t * pkt);
+
+/* BFD diagnostic codes */
+#define foreach_bfd_diag_code(F)                             \
+  F (0, no_diag, "No Diagnostic")                            \
+  F (1, det_time_exp, "Control Detection Time Expired")      \
+  F (2, echo_failed, "Echo Function Failed")                 \
+  F (3, neighbor_sig_down, "Neighbor Signaled Session Down") \
+  F (4, fwd_plain_reset, "Forwarding Plane Reset")           \
+  F (5, path_down, "Path Down")                              \
+  F (6, concat_path_down, "Concatenated Path Down")          \
+  F (7, admin_down, "Administratively Down")                 \
+  F (8, reverse_concat_path_down, "Reverse Concatenated Path Down")
+
+#define BFD_DIAG_CODE_NAME(t) BFD_DIAG_CODE_##t
+
+typedef enum
+{
+#define F(n, t, s) BFD_DIAG_CODE_NAME (t) = n,
+  foreach_bfd_diag_code (F)
+#undef F
+} bfd_diag_code_e;
+
+const char *bfd_diag_code_string (bfd_diag_code_e diag);
+
+/* BFD state values */
+#define foreach_bfd_state(F)     \
+  F (0, admin_down, "AdminDown") \
+  F (1, down, "Down")            \
+  F (2, init, "Init")            \
+  F (3, up, "Up")
+
+#define BFD_STATE_NAME(t) BFD_STATE_##t
+
+typedef enum
+{
+#define F(n, t, s) BFD_STATE_NAME (t) = n,
+  foreach_bfd_state (F)
+#undef F
+} bfd_state_e;
+
+const char *bfd_state_string (bfd_state_e state);
+
+#endif /* __included_bfd_protocol_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/bfd/bfd_udp.c b/src/vnet/bfd/bfd_udp.c
new file mode 100644
index 00000000..3c747d86
--- /dev/null
+++ b/src/vnet/bfd/bfd_udp.c
@@ -0,0 +1,639 @@
+#include <vppinfra/types.h>
+#include <vlibmemory/api.h>
+#include <vlib/vlib.h>
+#include <vlib/buffer.h>
+#include <vnet/ip/format.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/ip/udp_packet.h>
+#include <vnet/ip/lookup.h>
+#include <vnet/ip/icmp46_packet.h>
+#include <vnet/ip/ip4.h>
+#include <vnet/ip/ip6.h>
+#include <vnet/ip/udp.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/adj/adj.h>
+#include <vnet/adj/adj_nbr.h>
+#include <vnet/bfd/bfd_debug.h>
+#include <vnet/bfd/bfd_udp.h>
+#include <vnet/bfd/bfd_main.h>
+#include <vnet/bfd/bfd_api.h>
+
+typedef struct
+{
+  bfd_main_t *bfd_main;
+  /* hashmap - bfd session index by bfd key - used for CLI/API lookup, where
+   * discriminator is unknown */
+  mhash_t bfd_session_idx_by_bfd_key;
+} bfd_udp_main_t;
+
+static vlib_node_registration_t bfd_udp4_input_node;
+static vlib_node_registration_t bfd_udp6_input_node;
+
+bfd_udp_main_t bfd_udp_main;
+
+void bfd_udp_transport_to_buffer (vlib_main_t *vm, vlib_buffer_t *b,
+                                  bfd_udp_session_t *bus)
+{
+  udp_header_t *udp;
+  u16 udp_length, ip_length;
+  bfd_udp_key_t *key = &bus->key;
+
+  b->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
+  if (ip46_address_is_ip4 (&key->local_addr))
+    {
+      ip4_header_t *ip4;
+      const size_t data_size = sizeof (*ip4) + sizeof (*udp);
+      vlib_buffer_advance (b, -data_size);
+      ip4 = vlib_buffer_get_current (b);
+      udp = (udp_header_t *)(ip4 + 1);
+      memset (ip4, 0, data_size);
+      ip4->ip_version_and_header_length = 0x45;
+      ip4->ttl = 255;
+      ip4->protocol = IP_PROTOCOL_UDP;
+      ip4->src_address.as_u32 = key->local_addr.ip4.as_u32;
+      ip4->dst_address.as_u32 = key->peer_addr.ip4.as_u32;
+
+      udp->src_port = clib_host_to_net_u16 (50000); /* FIXME */
+      udp->dst_port = clib_host_to_net_u16 (UDP_DST_PORT_bfd4);
+
+      /* fix ip length, checksum and udp length */
+      ip_length = vlib_buffer_length_in_chain (vm, b);
+
+      ip4->length = clib_host_to_net_u16 (ip_length);
+      ip4->checksum = ip4_header_checksum (ip4);
+
+      udp_length = ip_length - (sizeof (*ip4));
+      udp->length = clib_host_to_net_u16 (udp_length);
+    }
+  else
+    {
+      BFD_ERR ("not implemented");
+      abort ();
+    }
+}
+
+void bfd_add_udp_transport (vlib_main_t *vm, vlib_buffer_t *b,
+                            bfd_udp_session_t *bus)
+{
+  vnet_buffer (b)->ip.adj_index[VLIB_RX] = bus->adj_index;
+  vnet_buffer (b)->ip.adj_index[VLIB_TX] = bus->adj_index;
+  bfd_udp_transport_to_buffer (vm, b, bus);
+}
+
+static bfd_session_t *bfd_lookup_session (bfd_udp_main_t *bum,
+                                          const bfd_udp_key_t *key)
+{
+  uword *p = mhash_get (&bum->bfd_session_idx_by_bfd_key, key);
+  if (p)
+    {
+      return bfd_find_session_by_idx (bum->bfd_main, *p);
+    }
+  return 0;
+}
+
+static vnet_api_error_t
+bfd_udp_add_session_internal (bfd_udp_main_t *bum, u32 sw_if_index,
+                              u32 desired_min_tx_us, u32 required_min_rx_us,
+                              u8 detect_mult, const ip46_address_t *local_addr,
+                              const ip46_address_t *peer_addr)
+{
+  vnet_sw_interface_t *sw_if =
+      vnet_get_sw_interface (vnet_get_main (), sw_if_index);
+  /* get a pool entry and if we end up not needing it, give it back */
+  bfd_transport_t t = BFD_TRANSPORT_UDP4;
+  if (!ip46_address_is_ip4 (local_addr))
+    {
+      t = BFD_TRANSPORT_UDP6;
+    }
+  bfd_session_t *bs = bfd_get_session (bum->bfd_main, t);
+  bfd_udp_session_t *bus = &bs->udp;
+  memset (bus, 0, sizeof (*bus));
+  bfd_udp_key_t *key = &bus->key;
+  key->sw_if_index = sw_if->sw_if_index;
+  key->local_addr.as_u64[0] = local_addr->as_u64[0];
+  key->local_addr.as_u64[1] = local_addr->as_u64[1];
+  key->peer_addr.as_u64[0] = peer_addr->as_u64[0];
+  key->peer_addr.as_u64[1] = peer_addr->as_u64[1];
+  const bfd_session_t *tmp = bfd_lookup_session (bum, key);
+  if (tmp)
+    {
+      BFD_ERR ("duplicate bfd-udp session, existing bs_idx=%d", tmp->bs_idx);
+      bfd_put_session (bum->bfd_main, bs);
+      return VNET_API_ERROR_BFD_EEXIST;
+    }
+  key->sw_if_index = sw_if->sw_if_index;
+  mhash_set (&bum->bfd_session_idx_by_bfd_key, key, bs->bs_idx, NULL);
+  BFD_DBG ("session created, bs_idx=%u, sw_if_index=%d, local=%U, peer=%U",
+           bs->bs_idx, key->sw_if_index, format_ip46_address, &key->local_addr,
+           IP46_TYPE_ANY, format_ip46_address, &key->peer_addr, IP46_TYPE_ANY);
+  if (BFD_TRANSPORT_UDP4 == t)
+    {
+      bus->adj_index = adj_nbr_add_or_lock (FIB_PROTOCOL_IP4, VNET_LINK_IP4,
+                                            &key->peer_addr, key->sw_if_index);
+      BFD_DBG ("adj_nbr_add_or_lock(FIB_PROTOCOL_IP4, VNET_LINK_IP4, %U, %d) "
+               "returns %d",
+               format_ip46_address, &key->peer_addr, IP46_TYPE_ANY,
+               key->sw_if_index, bus->adj_index);
+    }
+  else
+    {
+      bus->adj_index = adj_nbr_add_or_lock (FIB_PROTOCOL_IP6, VNET_LINK_IP6,
+                                            &key->peer_addr, key->sw_if_index);
+      BFD_DBG ("adj_nbr_add_or_lock(FIB_PROTOCOL_IP6, VNET_LINK_IP6, %U, %d) "
+               "returns %d",
+               format_ip46_address, &key->peer_addr, IP46_TYPE_ANY,
+               key->sw_if_index, bus->adj_index);
+    }
+  bs->config_desired_min_tx_us = desired_min_tx_us;
+  bs->required_min_rx_us = required_min_rx_us;
+  bs->local_detect_mult = detect_mult;
+  bfd_session_start (bum->bfd_main, bs);
+  return 0;
+}
+
+static vnet_api_error_t
+bfd_udp_validate_api_input (u32 sw_if_index, const ip46_address_t *local_addr,
+                            const ip46_address_t *peer_addr)
+{
+  vnet_sw_interface_t *sw_if =
+      vnet_get_sw_interface (vnet_get_main (), sw_if_index);
+  u8 local_ip_valid = 0;
+  ip_interface_address_t *ia = NULL;
+  if (!sw_if)
+    {
+      BFD_ERR ("got NULL sw_if");
+      return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+    }
+  if (ip46_address_is_ip4 (local_addr))
+    {
+      if (!ip46_address_is_ip4 (peer_addr))
+        {
+          BFD_ERR ("IP family mismatch");
+          return VNET_API_ERROR_INVALID_ARGUMENT;
+        }
+      ip4_main_t *im = &ip4_main;
+
+      /* *INDENT-OFF* */
+      foreach_ip_interface_address (
+          &im->lookup_main, ia, sw_if_index, 0 /* honor unnumbered */, ({
+            ip4_address_t *x =
+                ip_interface_address_get_address (&im->lookup_main, ia);
+            if (x->as_u32 == local_addr->ip4.as_u32)
+              {
+                /* valid address for this interface */
+                local_ip_valid = 1;
+                break;
+              }
+          }));
+      /* *INDENT-ON* */
+    }
+  else
+    {
+      if (ip46_address_is_ip4 (peer_addr))
+        {
+          BFD_ERR ("IP family mismatch");
+          return VNET_API_ERROR_INVALID_ARGUMENT;
+        }
+      ip6_main_t *im = &ip6_main;
+      /* *INDENT-OFF* */
+      foreach_ip_interface_address (
+          &im->lookup_main, ia, sw_if_index, 0 /* honor unnumbered */, ({
+            ip6_address_t *x =
+                ip_interface_address_get_address (&im->lookup_main, ia);
+            if (local_addr->ip6.as_u64[0] == x->as_u64[0] &&
+                local_addr->ip6.as_u64[1] == x->as_u64[1])
+              {
+                /* valid address for this interface */
+                local_ip_valid = 1;
+                break;
+              }
+          }));
+      /* *INDENT-ON* */
+    }
+
+  if (!local_ip_valid)
+    {
+      BFD_ERR ("address not found on interface");
+      return VNET_API_ERROR_ADDRESS_NOT_FOUND_FOR_INTERFACE;
+    }
+
+  return 0;
+}
+
+vnet_api_error_t bfd_udp_add_session (u32 sw_if_index, u32 desired_min_tx_us,
+                                      u32 required_min_rx_us, u8 detect_mult,
+                                      const ip46_address_t *local_addr,
+                                      const ip46_address_t *peer_addr)
+{
+  vnet_api_error_t rv =
+      bfd_udp_validate_api_input (sw_if_index, local_addr, peer_addr);
+  if (rv)
+    {
+      return rv;
+    }
+  if (detect_mult < 1)
+    {
+      BFD_ERR ("detect_mult < 1");
+      return VNET_API_ERROR_INVALID_ARGUMENT;
+    }
+  if (desired_min_tx_us < 1)
+    {
+      BFD_ERR ("desired_min_tx_us < 1");
+      return VNET_API_ERROR_INVALID_ARGUMENT;
+    }
+  return bfd_udp_add_session_internal (&bfd_udp_main, sw_if_index,
+                                       desired_min_tx_us, required_min_rx_us,
+                                       detect_mult, local_addr, peer_addr);
+}
+
+vnet_api_error_t bfd_udp_del_session (u32 sw_if_index,
+                                      const ip46_address_t *local_addr,
+                                      const ip46_address_t *peer_addr)
+{
+  vnet_api_error_t rv =
+      bfd_udp_validate_api_input (sw_if_index, local_addr, peer_addr);
+  if (rv)
+    {
+      return rv;
+    }
+  bfd_udp_main_t *bum = &bfd_udp_main;
+  vnet_sw_interface_t *sw_if =
+      vnet_get_sw_interface (vnet_get_main (), sw_if_index);
+  bfd_udp_key_t key;
+  memset (&key, 0, sizeof (key));
+  key.sw_if_index = sw_if->sw_if_index;
+  key.local_addr.as_u64[0] = local_addr->as_u64[0];
+  key.local_addr.as_u64[1] = local_addr->as_u64[1];
+  key.peer_addr.as_u64[0] = peer_addr->as_u64[0];
+  key.peer_addr.as_u64[1] = peer_addr->as_u64[1];
+  bfd_session_t *tmp = bfd_lookup_session (bum, &key);
+  if (tmp)
+    {
+      BFD_DBG ("free bfd-udp session, bs_idx=%d", tmp->bs_idx);
+      mhash_unset (&bum->bfd_session_idx_by_bfd_key, &key, NULL);
+      adj_unlock (tmp->udp.adj_index);
+      bfd_put_session (bum->bfd_main, tmp);
+    }
+  else
+    {
+      BFD_ERR ("no such session");
+      return VNET_API_ERROR_BFD_NOENT;
+    }
+  return 0;
+}
+
+typedef enum {
+  BFD_UDP_INPUT_NEXT_NORMAL,
+  BFD_UDP_INPUT_NEXT_REPLY,
+  BFD_UDP_INPUT_N_NEXT,
+} bfd_udp_input_next_t;
+
+/* Packet counters */
+#define foreach_bfd_udp_error(F)           \
+  F (NONE, "good bfd packets (processed)") \
+  F (BAD, "invalid bfd packets")           \
+  F (DISABLED, "bfd packets received on disabled interfaces")
+
+#define F(sym, string) static char BFD_UDP_ERR_##sym##_STR[] = string;
+foreach_bfd_udp_error (F);
+#undef F
+
+static char *bfd_udp_error_strings[] = {
+#define F(sym, string) BFD_UDP_ERR_##sym##_STR,
+  foreach_bfd_udp_error (F)
+#undef F
+};
+
+typedef enum {
+#define F(sym, str) BFD_UDP_ERROR_##sym,
+  foreach_bfd_udp_error (F)
+#undef F
+      BFD_UDP_N_ERROR,
+} bfd_udp_error_t;
+
+static void bfd_udp4_find_headers (vlib_buffer_t *b, const ip4_header_t **ip4,
+                                   const udp_header_t **udp)
+{
+  /* sanity check first */
+  const i32 start = vnet_buffer (b)->ip.start_of_ip_header;
+  if (start < 0 && start < sizeof (b->pre_data))
+    {
+      BFD_ERR ("Start of ip header is before pre_data, ignoring");
+      *ip4 = NULL;
+      *udp = NULL;
+      return;
+    }
+  *ip4 = (ip4_header_t *)(b->data + start);
+  if ((u8 *)*ip4 > (u8 *)vlib_buffer_get_current (b))
+    {
+      BFD_ERR ("Start of ip header is beyond current data, ignoring");
+      *ip4 = NULL;
+      *udp = NULL;
+      return;
+    }
+  *udp = (udp_header_t *)((*ip4) + 1);
+}
+
+static bfd_udp_error_t bfd_udp4_verify_transport (const ip4_header_t *ip4,
+                                                  const udp_header_t *udp,
+                                                  const bfd_session_t *bs)
+{
+  const bfd_udp_session_t *bus = &bs->udp;
+  const bfd_udp_key_t *key = &bus->key;
+  if (ip4->src_address.as_u32 != key->peer_addr.ip4.as_u32)
+    {
+      BFD_ERR ("IP src addr mismatch, got %U, expected %U", format_ip4_address,
+               ip4->src_address.as_u32, format_ip4_address,
+               key->peer_addr.ip4.as_u32);
+      return BFD_UDP_ERROR_BAD;
+    }
+  if (ip4->dst_address.as_u32 != key->local_addr.ip4.as_u32)
+    {
+      BFD_ERR ("IP dst addr mismatch, got %U, expected %U", format_ip4_address,
+               ip4->dst_address.as_u32, format_ip4_address,
+               key->local_addr.ip4.as_u32);
+      return BFD_UDP_ERROR_BAD;
+    }
+  const u8 expected_ttl = 255;
+  if (ip4->ttl != expected_ttl)
+    {
+      BFD_ERR ("IP unexpected TTL value %d, expected %d", ip4->ttl,
+               expected_ttl);
+      return BFD_UDP_ERROR_BAD;
+    }
+  if (clib_net_to_host_u16 (udp->src_port) < 49152 ||
+      clib_net_to_host_u16 (udp->src_port) > 65535)
+    {
+      BFD_ERR ("Invalid UDP src port %d, out of range <49152,65535>",
+               udp->src_port);
+    }
+  return BFD_UDP_ERROR_NONE;
+}
+
+typedef struct
+{
+  u32 bs_idx;
+  bfd_pkt_t pkt;
+} bfd_rpc_update_t;
+
+static void bfd_rpc_update_session_cb (const bfd_rpc_update_t *a)
+{
+  bfd_consume_pkt (bfd_udp_main.bfd_main, &a->pkt, a->bs_idx);
+}
+
+static void bfd_rpc_update_session (u32 bs_idx, const bfd_pkt_t *pkt)
+{
+  /* packet length was already verified to be correct by the caller */
+  const u32 data_size = sizeof (bfd_rpc_update_t) -
+                        STRUCT_SIZE_OF (bfd_rpc_update_t, pkt) +
+                        pkt->head.length;
+  u8 data[data_size];
+  bfd_rpc_update_t *update = (bfd_rpc_update_t *)data;
+  update->bs_idx = bs_idx;
+  clib_memcpy (&update->pkt, pkt, pkt->head.length);
+  vl_api_rpc_call_main_thread (bfd_rpc_update_session_cb, data, data_size);
+}
+
+static bfd_udp_error_t bfd_udp4_scan (vlib_main_t *vm, vlib_node_runtime_t *rt,
+                                      vlib_buffer_t *b, bfd_session_t **bs_out)
+{
+  const bfd_pkt_t *pkt = vlib_buffer_get_current (b);
+  if (sizeof (*pkt) > b->current_length)
+    {
+      BFD_ERR (
+          "Payload size %d too small to hold bfd packet of minimum size %d",
+          b->current_length, sizeof (*pkt));
+      return BFD_UDP_ERROR_BAD;
+    }
+  const ip4_header_t *ip4;
+  const udp_header_t *udp;
+  bfd_udp4_find_headers (b, &ip4, &udp);
+  if (!ip4 || !udp)
+    {
+      BFD_ERR ("Couldn't find ip4 or udp header");
+      return BFD_UDP_ERROR_BAD;
+    }
+  if (!bfd_verify_pkt_common (pkt))
+    {
+      return BFD_UDP_ERROR_BAD;
+    }
+  bfd_session_t *bs = NULL;
+  if (pkt->your_disc)
+    {
+      BFD_DBG ("Looking up BFD session using discriminator %u",
+               pkt->your_disc);
+      bs = bfd_find_session_by_disc (bfd_udp_main.bfd_main, pkt->your_disc);
+    }
+  else
+    {
+      bfd_udp_key_t key;
+      memset (&key, 0, sizeof (key));
+      key.sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_RX];
+      key.local_addr.ip4.as_u32 = ip4->dst_address.as_u32;
+      key.peer_addr.ip4.as_u32 = ip4->src_address.as_u32;
+      BFD_DBG ("Looking up BFD session using key (sw_if_index=%u, local=%U, "
+               "peer=%U)",
+               key.sw_if_index, format_ip4_address, key.local_addr.ip4.as_u8,
+               format_ip4_address, key.peer_addr.ip4.as_u8);
+      bs = bfd_lookup_session (&bfd_udp_main, &key);
+    }
+  if (!bs)
+    {
+      BFD_ERR ("BFD session lookup failed - no session matches BFD pkt");
+      return BFD_UDP_ERROR_BAD;
+    }
+  BFD_DBG ("BFD session found, bs_idx=%u", bs->bs_idx);
+  if (!bfd_verify_pkt_session (pkt, b->current_length, bs))
+    {
+      return BFD_UDP_ERROR_BAD;
+    }
+  bfd_udp_error_t err;
+  if (BFD_UDP_ERROR_NONE != (err = bfd_udp4_verify_transport (ip4, udp, bs)))
+    {
+      return err;
+    }
+  bfd_rpc_update_session (bs->bs_idx, pkt);
+  *bs_out = bs;
+  return BFD_UDP_ERROR_NONE;
+}
+
+static bfd_udp_error_t bfd_udp6_scan (vlib_main_t *vm, vlib_buffer_t *b)
+{
+  /* TODO */
+  return BFD_UDP_ERROR_BAD;
+}
+
+/*
+ * Process a frame of bfd packets
+ * Expect 1 packet / frame
+ */
+static uword bfd_udp_input (vlib_main_t *vm, vlib_node_runtime_t *rt,
+                            vlib_frame_t *f, int is_ipv6)
+{
+  u32 n_left_from, *from;
+  bfd_input_trace_t *t0;
+
+  from = vlib_frame_vector_args (f); /* array of buffer indices */
+  n_left_from = f->n_vectors;        /* number of buffer indices */
+
+  while (n_left_from > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      u32 next0, error0;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+
+      bfd_session_t *bs = NULL;
+
+      /* If this pkt is traced, snapshot the data */
+      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+        {
+          int len;
+          t0 = vlib_add_trace (vm, rt, b0, sizeof (*t0));
+          len = (b0->current_length < sizeof (t0->data)) ? b0->current_length
+                                                         : sizeof (t0->data);
+          t0->len = len;
+          clib_memcpy (t0->data, vlib_buffer_get_current (b0), len);
+        }
+
+      /* scan this bfd pkt. error0 is the counter index to bmp */
+      if (is_ipv6)
+        {
+          error0 = bfd_udp6_scan (vm, b0);
+        }
+      else
+        {
+          error0 = bfd_udp4_scan (vm, rt, b0, &bs);
+        }
+      b0->error = rt->errors[error0];
+
+      next0 = BFD_UDP_INPUT_NEXT_NORMAL;
+      if (BFD_UDP_ERROR_NONE == error0)
+        {
+          /* if everything went fine, check for poll bit, if present, re-use
+             the buffer and based on (now updated) session parameters, send the
+             final packet back */
+          const bfd_pkt_t *pkt = vlib_buffer_get_current (b0);
+          if (bfd_pkt_get_poll (pkt))
+            {
+              bfd_send_final (vm, b0, bs);
+              if (is_ipv6)
+                {
+                  vlib_node_increment_counter (vm, bfd_udp6_input_node.index,
+                                               b0->error, 1);
+                }
+              else
+                {
+                  vlib_node_increment_counter (vm, bfd_udp4_input_node.index,
+                                               b0->error, 1);
+                }
+              next0 = BFD_UDP_INPUT_NEXT_REPLY;
+            }
+        }
+      vlib_set_next_frame_buffer (vm, rt, next0, bi0);
+
+      from += 1;
+      n_left_from -= 1;
+    }
+
+  return f->n_vectors;
+}
+
+static uword bfd_udp4_input (vlib_main_t *vm, vlib_node_runtime_t *rt,
+                             vlib_frame_t *f)
+{
+  return bfd_udp_input (vm, rt, f, 0);
+}
+
+/*
+ * bfd input graph node declaration
+ */
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (bfd_udp4_input_node, static) = {
+  .function = bfd_udp4_input,
+  .name = "bfd-udp4-input",
+  .vector_size = sizeof (u32),
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = BFD_UDP_N_ERROR,
+  .error_strings = bfd_udp_error_strings,
+
+  .format_trace = bfd_input_format_trace,
+
+  .n_next_nodes = BFD_UDP_INPUT_N_NEXT,
+  .next_nodes =
+      {
+              [BFD_UDP_INPUT_NEXT_NORMAL] = "error-drop",
+              [BFD_UDP_INPUT_NEXT_REPLY] = "ip4-lookup",
+      },
+};
+/* *INDENT-ON* */
+
+static uword bfd_udp6_input (vlib_main_t *vm, vlib_node_runtime_t *rt,
+                             vlib_frame_t *f)
+{
+  return bfd_udp_input (vm, rt, f, 1);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (bfd_udp6_input_node, static) = {
+  .function = bfd_udp6_input,
+  .name = "bfd-udp6-input",
+  .vector_size = sizeof (u32),
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = BFD_UDP_N_ERROR,
+  .error_strings = bfd_udp_error_strings,
+
+  .format_trace = bfd_input_format_trace,
+
+  .n_next_nodes = BFD_UDP_INPUT_N_NEXT,
+  .next_nodes =
+      {
+              [BFD_UDP_INPUT_NEXT_NORMAL] = "error-drop",
+              [BFD_UDP_INPUT_NEXT_REPLY] = "ip6-lookup",
+      },
+};
+/* *INDENT-ON* */
+
+static clib_error_t *bfd_sw_interface_up_down (vnet_main_t *vnm,
+                                               u32 sw_if_index, u32 flags)
+{
+  // vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
+    {
+      /* TODO */
+    }
+  return 0;
+}
+
+VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (bfd_sw_interface_up_down);
+
+static clib_error_t *bfd_hw_interface_up_down (vnet_main_t *vnm,
+                                               u32 hw_if_index, u32 flags)
+{
+  if (flags & VNET_HW_INTERFACE_FLAG_LINK_UP)
+    {
+      /* TODO */
+    }
+  return 0;
+}
+
+VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (bfd_hw_interface_up_down);
+
+/*
+ * setup function
+ */
+static clib_error_t *bfd_udp_init (vlib_main_t *vm)
+{
+  mhash_init (&bfd_udp_main.bfd_session_idx_by_bfd_key, sizeof (uword),
+              sizeof (bfd_udp_key_t));
+  bfd_udp_main.bfd_main = &bfd_main;
+  udp_register_dst_port (vm, UDP_DST_PORT_bfd4, bfd_udp4_input_node.index, 1);
+  udp_register_dst_port (vm, UDP_DST_PORT_bfd6, bfd_udp6_input_node.index, 0);
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (bfd_udp_init);
diff --git a/src/vnet/bfd/bfd_udp.h b/src/vnet/bfd/bfd_udp.h
new file mode 100644
index 00000000..51f5327b
--- /dev/null
+++ b/src/vnet/bfd/bfd_udp.h
@@ -0,0 +1,56 @@
+/* * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief BFD global declarations
+ */
+
+#ifndef __included_bfd_udp_h__
+#define __included_bfd_udp_h__
+
+#include <vppinfra/clib.h>
+#include <vnet/adj/adj_types.h>
+#include <vnet/ip/ip6_packet.h>
+
+#define BFD_UDP_KEY_BODY
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+
+  u32 sw_if_index;
+  ip46_address_t local_addr;
+  ip46_address_t peer_addr;
+
+}) bfd_udp_key_t;
+/* *INDENT-ON* */
+
+typedef struct
+{
+  bfd_udp_key_t key;
+
+  adj_index_t adj_index;
+} bfd_udp_session_t;
+
+void bfd_add_udp_transport (vlib_main_t * vm, vlib_buffer_t * b,
+			    bfd_udp_session_t * bs);
+
+#endif /* __included_bfd_udp_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/bfd/dir.dox b/src/vnet/bfd/dir.dox
new file mode 100644
index 00000000..ed656b52
--- /dev/null
+++ b/src/vnet/bfd/dir.dox
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ @dir vnet/vnet/bfd
+ @brief Bidirectional Forwarding Detection (BFD) implementation
+*/
diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
new file mode 100644
index 00000000..7935027f
--- /dev/null
+++ b/src/vnet/buffer.h
@@ -0,0 +1,381 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * vnet/buffer.h: vnet buffer flags
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vnet_buffer_h
+#define included_vnet_buffer_h
+
+#include <vlib/vlib.h>
+
+/* VLIB buffer flags for ip4/ip6 packets.  Set by input interfaces for ip4/ip6
+   tcp/udp packets with hardware computed checksums. */
+#define LOG2_IP_BUFFER_L4_CHECKSUM_COMPUTED LOG2_VLIB_BUFFER_FLAG_USER(1)
+#define LOG2_IP_BUFFER_L4_CHECKSUM_CORRECT  LOG2_VLIB_BUFFER_FLAG_USER(2)
+#define IP_BUFFER_L4_CHECKSUM_COMPUTED (1 << LOG2_IP_BUFFER_L4_CHECKSUM_COMPUTED)
+#define IP_BUFFER_L4_CHECKSUM_CORRECT  (1 << LOG2_IP_BUFFER_L4_CHECKSUM_CORRECT)
+
+/* VLAN header flags.
+ * These bits are zeroed in vlib_buffer_init_for_free_list()
+ * meaning wherever the buffer comes from they have a reasonable
+ * value (eg, if ip4/ip6 generates the packet.)
+ */
+#define LOG2_ETH_BUFFER_VLAN_2_DEEP LOG2_VLIB_BUFFER_FLAG_USER(3)
+#define LOG2_ETH_BUFFER_VLAN_1_DEEP LOG2_VLIB_BUFFER_FLAG_USER(4)
+#define ETH_BUFFER_VLAN_2_DEEP (1 << LOG2_ETH_BUFFER_VLAN_2_DEEP)
+#define ETH_BUFFER_VLAN_1_DEEP (1 << LOG2_ETH_BUFFER_VLAN_1_DEEP)
+#define ETH_BUFFER_VLAN_BITS (ETH_BUFFER_VLAN_1_DEEP | \
+                              ETH_BUFFER_VLAN_2_DEEP)
+
+#define LOG2_VNET_BUFFER_RTE_MBUF_VALID LOG2_VLIB_BUFFER_FLAG_USER(5)
+#define VNET_BUFFER_RTE_MBUF_VALID (1 << LOG2_VNET_BUFFER_RTE_MBUF_VALID)
+
+#define LOG2_BUFFER_HANDOFF_NEXT_VALID LOG2_VLIB_BUFFER_FLAG_USER(6)
+#define BUFFER_HANDOFF_NEXT_VALID (1 << LOG2_BUFFER_HANDOFF_NEXT_VALID)
+
+#define LOG2_VNET_BUFFER_LOCALLY_ORIGINATED LOG2_VLIB_BUFFER_FLAG_USER(7)
+#define VNET_BUFFER_LOCALLY_ORIGINATED (1 << LOG2_VNET_BUFFER_LOCALLY_ORIGINATED)
+
+#define LOG2_VNET_BUFFER_SPAN_CLONE LOG2_VLIB_BUFFER_FLAG_USER(8)
+#define VNET_BUFFER_SPAN_CLONE (1 << LOG2_VNET_BUFFER_SPAN_CLONE)
+
+#define foreach_buffer_opaque_union_subtype     \
+_(ethernet)                                     \
+_(ip)                                           \
+_(mcast)                                        \
+_(swt)                                          \
+_(l2)                                           \
+_(l2t)                                          \
+_(gre)                                          \
+_(l2_classify)                                  \
+_(handoff)                                      \
+_(policer)                                      \
+_(ipsec)					\
+_(map)						\
+_(map_t)					\
+_(ip_frag)
+
+/*
+ * vnet stack buffer opaque array overlay structure.
+ * The vnet_buffer_opaque_t *must* be the same size as the
+ * vlib_buffer_t "opaque" structure member, 32 bytes.
+ *
+ * When adding a union type, please add a stanza to
+ * foreach_buffer_opaque_union_subtype (directly above).
+ * Code in vnet_interface_init(...) verifies the size
+ * of the union, and will announce any deviations in an
+ * impossible-to-miss manner.
+ */
+typedef struct
+{
+  u32 sw_if_index[VLIB_N_RX_TX];
+
+  union
+  {
+    /* Ethernet. */
+    struct
+    {
+      /* Saved value of current header by ethernet-input. */
+      i32 start_of_ethernet_header;
+    } ethernet;
+
+    /* IP4/6 buffer opaque. */
+    struct
+    {
+      /* Adjacency from destination IP address lookup [VLIB_TX].
+         Adjacency from source IP address lookup [VLIB_RX].
+         This gets set to ~0 until source lookup is performed. */
+      u32 adj_index[VLIB_N_RX_TX];
+
+      union
+      {
+	struct
+	{
+	  /* Flow hash value for this packet computed from IP src/dst address
+	     protocol and ports. */
+	  u32 flow_hash;
+
+	  /* next protocol */
+	  u32 save_protocol;
+
+	  /* Rewrite length */
+	  u32 save_rewrite_length;
+	};
+
+	/* ICMP */
+	struct
+	{
+	  u8 type;
+	  u8 code;
+	  u32 data;
+	} icmp;
+
+	/* IP header offset from vlib_buffer.data - saved by ip*_local nodes */
+	i32 start_of_ip_header;
+      };
+
+    } ip;
+
+    /*
+     * MPLS:
+     * data copied from the MPLS header that was popped from the packet
+     * during the look-up.
+     */
+    struct
+    {
+      u8 ttl;
+      u8 exp;
+      u8 first;
+    } mpls;
+
+    /* Multicast replication */
+    struct
+    {
+      u32 pad[3];
+      u32 mcast_group_index;
+      u32 mcast_current_index;
+      u32 original_free_list_index;
+    } mcast;
+
+    /* ip4-in-ip6 softwire termination, only valid there */
+    struct
+    {
+      u8 swt_disable;
+      u32 mapping_index;
+    } swt;
+
+    /* l2 bridging path, only valid there */
+    struct
+    {
+      u32 feature_bitmap;
+      u16 bd_index;		// bridge-domain index
+      u8 l2_len;		// ethernet header length
+      u8 shg;			// split-horizon group
+    } l2;
+
+    /* l2tpv3 softwire encap, only valid there */
+    struct
+    {
+      u32 pad[4];		/* do not overlay w/ ip.adj_index[0,1] */
+      u8 next_index;
+      u32 session_index;
+    } l2t;
+
+    struct
+    {
+      u32 src, dst;
+    } gre;
+
+    /* L2 classify */
+    struct
+    {
+      u64 pad;
+      u32 table_index;
+      u32 opaque_index;
+      u64 hash;
+    } l2_classify;
+
+    /* IO - worker thread handoff */
+    struct
+    {
+      u32 next_index;
+    } handoff;
+
+    /* vnet policer */
+    struct
+    {
+      u32 pad[8 - VLIB_N_RX_TX - 1];	/* to end of opaque */
+      u32 index;
+    } policer;
+
+    /* interface output features */
+    struct
+    {
+      u32 flags;
+      u32 sad_index;
+    } ipsec;
+
+    /* vcgn udp inside input, only valid there */
+    struct
+    {
+      /* This part forms context of the packet. The structure should be
+       * exactly same as spp_ctx_t. Also this should be the first
+       * element of this vcgn_uii structure.
+       */
+      /****** BEGIN spp_ctx_t section ***********************/
+      union
+      {				/* Roddick specific */
+	u32 roddick_info;
+	struct _tx_pkt_info
+	{			/* Used by PI to PI communication for TX */
+	  u32 uidb_index:16;	/* uidb_index to transmit */
+	  u32 packet_type:2;	/* 1-IPv4, 2-Ipv6, - 0,3 - Unused */
+	  u32 ipv4_defrag:1;	/* 0 - Normal, 1 - update first
+				 * segment size
+				 * (set by 6rd defrag node)
+				 */
+
+	  u32 dst_ip_port_idx:4;	/* Index to dst_ip_port_table */
+	  u32 from_node:4;
+	  u32 calc_chksum:1;
+	  u32 reserved:4;
+	} tx;
+	struct _rx_pkt_info
+	{			/* Used by PD / PI communication */
+	  u32 uidb_index:16;	/* uidb_index received in packet */
+	  u32 packet_type:2;	/* 1-IPv4, 2-Ipv6, - 0,3 - Unused */
+	  u32 icmp_type:1;	/* 0-ICMP query type, 1-ICMP error type */
+	  u32 protocol_type:2;	/* 1-TCP, 2-UDP, 3-ICMP, 0 - Unused */
+	  u32 ipv4_defrag:1;	/* 0 - Normal, 1 - update first
+				 * segment size
+				 * (set by 6rd defrag node)
+				 */
+
+	  u32 direction:1;	/* 0-Outside, 1-Inside */
+	  u32 frag:1;		/*IP fragment-1, Otherwise-0 */
+	  u32 option:1;		/* 0-No IP option (v4) present, non-fragHdr
+				 * option hdr present (v6)
+				 */
+	  u32 df_bit:1;		/* IPv4 DF bit copied here */
+	  u32 reserved1:6;
+	} rx;
+      } ru;
+      /****** END  spp_ctx_t section ***********************/
+
+      union
+      {
+	struct
+	{
+	  u32 ipv4;
+	  u16 port;
+	  u16 vrf;		//bit0-13:i/f, bit14-15:protocol
+	} k;
+
+	u64 key64;
+      } key;
+
+      u32 bucket;
+
+      u16 ovrf;			/* Exit interface */
+      u8 frag_pkt;
+      u8 vcgn_unused1;
+    } vcgn_uii;
+
+    /* MAP */
+    struct
+    {
+      u16 mtu;
+    } map;
+
+    /* MAP-T */
+    struct
+    {
+      u32 map_domain_index;
+      struct
+      {
+	u32 saddr, daddr;
+	u16 frag_offset;	//Fragmentation header offset
+	u16 l4_offset;		//L4 header overall offset
+	u8 l4_protocol;		//The final protocol number
+      } v6;			//Used by ip6_map_t only
+      u16 checksum_offset;	//L4 checksum overall offset
+      u16 mtu;			//Exit MTU
+    } map_t;
+
+    /* IP Fragmentation */
+    struct
+    {
+      u16 header_offset;
+      u16 mtu;
+      u8 next_index;
+      u8 flags;			//See ip_frag.h
+    } ip_frag;
+
+    /* COP - configurable junk filter(s) */
+    struct
+    {
+      /* Current configuration index. */
+      u32 current_config_index;
+    } cop;
+
+    /* LISP */
+    struct
+    {
+      /* overlay address family */
+      u16 overlay_afi;
+    } lisp;
+
+    /* Driver rx feature */
+    struct
+    {
+      u32 saved_next_index;		/**< saved by drivers for short-cut */
+      u16 buffer_advance;
+    } device_input_feat;
+
+    u32 unused[6];
+  };
+} vnet_buffer_opaque_t;
+
+/*
+ * The opaque field of the vlib_buffer_t is intepreted as a
+ * vnet_buffer_opaque_t. Hence it should be big enough to accommodate one.
+ */
+STATIC_ASSERT (sizeof (vnet_buffer_opaque_t) <= STRUCT_SIZE_OF (vlib_buffer_t,
+								opaque),
+	       "VNET buffer meta-data too large for vlib_buffer");
+
+#define vnet_buffer(b) ((vnet_buffer_opaque_t *) (b)->opaque)
+
+/* Full cache line (64 bytes) of additional space */
+typedef struct
+{
+  union
+  {
+  };
+} vnet_buffer_opaque2_t;
+
+
+
+#endif /* included_vnet_buffer_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/cdp/cdp.pg b/src/vnet/cdp/cdp.pg
new file mode 100644
index 00000000..b6ba1865
--- /dev/null
+++ b/src/vnet/cdp/cdp.pg
@@ -0,0 +1,7 @@
+packet-generator new {
+  name cdp
+  limit 1
+  node cdp-input
+  size 374-374
+  data { hex 0x02b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2043333735304520536f66747761726520284333373530452d554e4956455253414c2d4d292c2056657273696f6e2031322e32283335295345352c2052454c4541534520534f4654574152452028666331290a436f707972696768742028632920313938362d3230303720627920436973636f2053797374656d732c20496e632e0a436f6d70696c6564205468752031392d4a756c2d30372031363a3137206279206e616368656e00060018636973636f2057532d4333373530452d3234544400020011000000010101cc0004000000000003001b54656e4769676162697445746865726e6574312f302f3100040008000000280008002400000c011200000000ffffffff010221ff000000000000001e7a50f000ff000000090004000a00060001000b0005010012000500001300050000160011000000010101cc000400000000001a00100000000100000000ffffffff }
+}
diff --git a/src/vnet/cdp/cdp_input.c b/src/vnet/cdp/cdp_input.c
new file mode 100644
index 00000000..3574de68
--- /dev/null
+++ b/src/vnet/cdp/cdp_input.c
@@ -0,0 +1,506 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/cdp/cdp_node.h>
+
+cdp_main_t cdp_main;
+
+#define DEBUG_TLV_DUMP 0	/* 1=> dump TLV's to stdout while processing them */
+
+/* Reliable multicast messages we use to keep peers updated */
+mc_serialize_msg_t serialize_cdp_neighbor_msg;
+mc_serialize_msg_t serialize_cdp_keepalive_msg;
+
+/*
+ * ported from an unspecified Cisco cdp implementation.
+ * Compute / return in HOST byte order. 0 => good checksum.
+ */
+u16
+cdp_checksum (void *p, int count)
+{
+  u32 sum;
+  u16 i, *data;
+
+  data = p;
+  sum = 0;
+  while (count > 1)
+    {
+      sum += ntohs (*data);
+      data++;
+      count -= 2;
+    }
+
+  if (count > 0)
+    sum += *(char *) data;
+
+  while (sum >> 16)
+    {
+      sum = (sum & 0xFFFF) + (sum >> 16);
+    }
+
+  i = (i16) sum;
+  return (~i);
+}
+
+/* TLV handler table */
+typedef struct
+{
+  char *name;
+  u32 tlv_id;
+  void *format;
+  void *process;
+} tlv_handler_t;
+
+static tlv_handler_t tlv_handlers[];
+
+/* Display a generic TLV as a set of hex bytes */
+static u8 *
+format_generic_tlv (u8 * s, va_list * va)
+{
+  cdp_tlv_t *t = va_arg (*va, cdp_tlv_t *);
+  tlv_handler_t *h = &tlv_handlers[t->t];
+
+  s = format (s, "%s(%d): %U\n", h->name,
+	      t->t, format_hex_bytes, t->v, t->l - sizeof (*t));
+  return s;
+}
+
+/* Ignore / skip a TLV we don't support */
+static cdp_error_t
+process_generic_tlv (cdp_main_t * cm, cdp_neighbor_t * n, cdp_tlv_t * t)
+{
+#if DEBUG_TLV_DUMP > 0
+  fformat (stdout, "%U", format_generic_tlv, t);
+#endif
+
+  return CDP_ERROR_NONE;
+}
+
+/* print a text tlv */
+static u8 *
+format_text_tlv (u8 * s, va_list * va)
+{
+  cdp_tlv_t *t = va_arg (*va, cdp_tlv_t *);
+  tlv_handler_t *h = &tlv_handlers[t->t];
+  int i;
+
+  s = format (s, "%s(%d): ", h->name, t->t);
+
+  for (i = 0; i < (t->l - sizeof (*t)); i++)
+    vec_add1 (s, t->v[i]);
+
+  vec_add1 (s, '\n');
+  return s;
+}
+
+#if DEBUG_TLV_DUMP == 0
+/* gcc warning be gone */
+CLIB_UNUSED (static cdp_error_t
+	     process_text_tlv (cdp_main_t * cm, cdp_neighbor_t * n,
+			       cdp_tlv_t * t));
+#endif
+
+/* process / skip a generic text TLV that we don't support */
+static cdp_error_t
+process_text_tlv (cdp_main_t * cm, cdp_neighbor_t * n, cdp_tlv_t * t)
+{
+#if DEBUG_TLV_DUMP > 0
+  fformat (stdout, "%U\n", format_text_tlv, t);
+#endif
+
+  return CDP_ERROR_NONE;
+}
+
+/* per-TLV format function definitions */
+#define format_unused_tlv format_generic_tlv
+#define format_device_name_tlv format_text_tlv
+#define format_address_tlv format_generic_tlv
+#define format_port_id_tlv format_text_tlv
+#define format_capabilities_tlv format_generic_tlv
+#define format_version_tlv format_text_tlv
+#define format_platform_tlv format_text_tlv
+#define format_ipprefix_tlv format_generic_tlv
+#define format_hello_tlv format_generic_tlv
+#define format_vtp_domain_tlv format_generic_tlv
+#define format_native_vlan_tlv format_generic_tlv
+#define format_duplex_tlv format_generic_tlv
+#define format_appl_vlan_tlv format_generic_tlv
+#define format_trigger_tlv format_generic_tlv
+#define format_power_tlv format_generic_tlv
+#define format_mtu_tlv format_generic_tlv
+#define format_trust_tlv format_generic_tlv
+#define format_cos_tlv format_generic_tlv
+#define format_sysname_tlv format_generic_tlv
+#define format_sysobject_tlv format_generic_tlv
+#define format_mgmt_addr_tlv format_generic_tlv
+#define format_physical_loc_tlv format_generic_tlv
+#define format_mgmt_addr2_tlv format_generic_tlv
+#define format_power_requested_tlv format_generic_tlv
+#define format_power_available_tlv format_generic_tlv
+#define format_port_unidirectional_tlv format_generic_tlv
+#define format_unknown_28_tlv format_generic_tlv
+#define format_energywise_tlv format_generic_tlv
+#define format_unknown_30_tlv format_generic_tlv
+#define format_spare_poe_tlv format_generic_tlv
+
+/* tlv ID=0 is a mistake */
+static cdp_error_t
+process_unused_tlv (cdp_main_t * cm, cdp_neighbor_t * n, cdp_tlv_t * t)
+{
+  return CDP_ERROR_BAD_TLV;
+}
+
+/* list of text TLV's that we snapshoot */
+#define foreach_text_to_struct_tlv              \
+_(device_name,DEBUG_TLV_DUMP)                   \
+_(version,DEBUG_TLV_DUMP)                       \
+_(platform,DEBUG_TLV_DUMP)                      \
+_(port_id,DEBUG_TLV_DUMP)
+
+#define _(z,dbg)                                                        \
+static                                                                  \
+cdp_error_t process_##z##_tlv (cdp_main_t *cm, cdp_neighbor_t *n,       \
+                                  cdp_tlv_t *t)                         \
+{                                                                       \
+    int i;                                                              \
+    if (dbg)                                                            \
+       fformat(stdout, "%U\n", format_text_tlv, t);                     \
+                                                                        \
+    if (n->z)                                                           \
+        _vec_len(n->z) = 0;                                             \
+                                                                        \
+    for (i = 0; i < (t->l - sizeof (*t)); i++)                          \
+        vec_add1(n->z, t->v[i]);                                        \
+                                                                        \
+    vec_add1(n->z, 0);                                                  \
+                                                                        \
+    return CDP_ERROR_NONE;                                              \
+}
+
+foreach_text_to_struct_tlv
+#undef _
+#define process_address_tlv process_generic_tlv
+#define process_capabilities_tlv process_generic_tlv
+#define process_ipprefix_tlv process_generic_tlv
+#define process_hello_tlv process_generic_tlv
+#define process_vtp_domain_tlv process_generic_tlv
+#define process_native_vlan_tlv process_generic_tlv
+#define process_duplex_tlv process_generic_tlv
+#define process_appl_vlan_tlv process_generic_tlv
+#define process_trigger_tlv process_generic_tlv
+#define process_power_tlv process_generic_tlv
+#define process_mtu_tlv process_generic_tlv
+#define process_trust_tlv process_generic_tlv
+#define process_cos_tlv process_generic_tlv
+#define process_sysname_tlv process_generic_tlv
+#define process_sysobject_tlv process_generic_tlv
+#define process_mgmt_addr_tlv process_generic_tlv
+#define process_physical_loc_tlv process_generic_tlv
+#define process_mgmt_addr2_tlv process_generic_tlv
+#define process_power_requested_tlv process_generic_tlv
+#define process_power_available_tlv process_generic_tlv
+#define process_port_unidirectional_tlv process_generic_tlv
+#define process_unknown_28_tlv process_generic_tlv
+#define process_energywise_tlv process_generic_tlv
+#define process_unknown_30_tlv process_generic_tlv
+#define process_spare_poe_tlv process_generic_tlv
+static tlv_handler_t tlv_handlers[] = {
+#define _(a) {#a, CDP_TLV_##a, format_##a##_tlv, process_##a##_tlv},
+  foreach_cdp_tlv_type
+#undef _
+};
+
+#if DEBUG_TLV_DUMP == 0
+CLIB_UNUSED (static u8 * format_cdp_hdr (u8 * s, va_list * va));
+#endif
+
+static u8 *
+format_cdp_hdr (u8 * s, va_list * va)
+{
+  cdp_hdr_t *h = va_arg (*va, cdp_hdr_t *);
+
+  s = format (s, "version %d, ttl %d(secs), cksum 0x%04x\n",
+	      h->version, h->ttl, h->checksum);
+  return s;
+}
+
+static cdp_error_t
+process_cdp_hdr (cdp_main_t * cm, cdp_neighbor_t * n, cdp_hdr_t * h)
+{
+#if DEBUG_TLV_DUMP > 0
+  fformat (stdout, "%U", format_cdp_hdr, h);
+#endif
+
+  if (h->version != 1 && h->version != 2)
+    return CDP_ERROR_PROTOCOL_VERSION;
+
+  n->ttl_in_seconds = h->ttl;
+
+  return CDP_ERROR_NONE;
+}
+
+/* scan a cdp packet; header, then tlv's */
+static int
+cdp_packet_scan (cdp_main_t * cm, cdp_neighbor_t * n)
+{
+  u8 *cur = n->last_rx_pkt;
+  cdp_hdr_t *h;
+  cdp_tlv_t *tlv;
+  cdp_error_t e = CDP_ERROR_NONE;
+  tlv_handler_t *handler;
+  cdp_error_t (*fp) (cdp_main_t *, cdp_neighbor_t *, cdp_tlv_t *);
+  u16 computed_checksum;
+
+  computed_checksum = cdp_checksum (cur, vec_len (cur));
+
+  if (computed_checksum)
+    return CDP_ERROR_CHECKSUM;
+
+  h = (cdp_hdr_t *) cur;
+
+  e = process_cdp_hdr (cm, n, h);
+  if (e)
+    return e;
+
+  cur = (u8 *) (h + 1);
+
+  while (cur < n->last_rx_pkt + vec_len (n->last_rx_pkt) - 1)
+    {
+      tlv = (cdp_tlv_t *) cur;
+      tlv->t = ntohs (tlv->t);
+      tlv->l = ntohs (tlv->l);
+      if (tlv->t >= ARRAY_LEN (tlv_handlers))
+	return CDP_ERROR_BAD_TLV;
+      handler = &tlv_handlers[tlv->t];
+      fp = handler->process;
+      e = (*fp) (cm, n, tlv);
+      if (e)
+	return e;
+      /* tlv length includes (t, l) */
+      cur += tlv->l;
+    }
+
+  return CDP_ERROR_NONE;
+}
+
+/*
+ * cdp input routine
+ */
+cdp_error_t
+cdp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0)
+{
+  cdp_main_t *cm = &cdp_main;
+  cdp_neighbor_t *n;
+  uword *p, nbytes;
+  cdp_error_t e;
+  uword last_packet_signature;
+
+  /* find or create a neighbor pool entry for the (sw) interface
+     upon which we received this pkt */
+  p = hash_get (cm->neighbor_by_sw_if_index,
+		vnet_buffer (b0)->sw_if_index[VLIB_RX]);
+
+  if (p == 0)
+    {
+      pool_get (cm->neighbors, n);
+      memset (n, 0, sizeof (*n));
+      n->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      n->packet_template_index = (u8) ~ 0;
+      hash_set (cm->neighbor_by_sw_if_index, n->sw_if_index,
+		n - cm->neighbors);
+    }
+  else
+    {
+      n = pool_elt_at_index (cm->neighbors, p[0]);
+    }
+
+  /*
+   * typical clib idiom. Don't repeatedly allocate and free
+   * the per-neighbor rx buffer. Reset its apparent length to zero
+   * and reuse it.
+   */
+
+  if (n->last_rx_pkt)
+    _vec_len (n->last_rx_pkt) = 0;
+
+  /* cdp disabled on this interface, we're done */
+  if (n->disabled)
+    return CDP_ERROR_DISABLED;
+
+  /*
+   * Make sure the per-neighbor rx buffer is big enough to hold
+   * the data we're about to copy
+   */
+  vec_validate (n->last_rx_pkt, vlib_buffer_length_in_chain (vm, b0) - 1);
+
+  /*
+   * Coalesce / copy e the buffer chain into the per-neighbor
+   * rx buffer
+   */
+  nbytes = vlib_buffer_contents (vm, bi0, n->last_rx_pkt);
+  ASSERT (nbytes <= vec_len (n->last_rx_pkt));
+
+  /*
+   * Compute Jenkins hash of the new packet, decide if we need to
+   * actually parse through the TLV's. CDP packets are all identical,
+   * so unless we time out the peer, we don't need to process the packet.
+   */
+  last_packet_signature =
+    hash_memory (n->last_rx_pkt, vec_len (n->last_rx_pkt), 0xd00b);
+
+  if (n->last_packet_signature_valid &&
+      n->last_packet_signature == last_packet_signature)
+    {
+      e = CDP_ERROR_CACHE_HIT;
+    }
+  else
+    {
+      /* Actually scan the packet */
+      e = cdp_packet_scan (cm, n);
+      n->last_packet_signature_valid = 1;
+      n->last_packet_signature = last_packet_signature;
+    }
+
+  if (e == CDP_ERROR_NONE)
+    {
+      n->last_heard = vlib_time_now (vm);
+    }
+
+  return e;
+}
+
+/*
+ * setup neighbor hash table
+ */
+static clib_error_t *
+cdp_init (vlib_main_t * vm)
+{
+  clib_error_t *error;
+  cdp_main_t *cm = &cdp_main;
+  void vnet_cdp_node_reference (void);
+
+  vnet_cdp_node_reference ();
+
+  if ((error = vlib_call_init_function (vm, cdp_periodic_init)))
+    return error;
+
+  cm->vlib_main = vm;
+  cm->vnet_main = vnet_get_main ();
+  cm->neighbor_by_sw_if_index = hash_create (0, sizeof (uword));
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (cdp_init);
+
+
+static u8 *
+format_cdp_neighbors (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  cdp_main_t *cm = va_arg (*va, cdp_main_t *);
+  vnet_main_t *vnm = &vnet_main;
+  cdp_neighbor_t *n;
+  vnet_hw_interface_t *hw;
+
+  s = format (s,
+	      "%=25s %=15s %=25s %=10s\n",
+	      "Our Port", "Peer System", "Peer Port", "Last Heard");
+
+  /* *INDENT-OFF* */
+  pool_foreach (n, cm->neighbors,
+  ({
+    hw = vnet_get_sup_hw_interface (vnm, n->sw_if_index);
+
+    if (n->disabled == 0)
+      s = format (s, "%=25s %=15s %=25s %=10.1f\n",
+                  hw->name, n->device_name, n->port_id,
+                  n->last_heard);
+  }));
+  /* *INDENT-ON* */
+  return s;
+}
+
+
+static clib_error_t *
+show_cdp (vlib_main_t * vm,
+	  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  cdp_main_t *cm = &cdp_main;
+
+  vlib_cli_output (vm, "%U\n", format_cdp_neighbors, vm, cm);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_cdp_command, static) = {
+  .path = "show cdp",
+  .short_help = "Show cdp command",
+  .function = show_cdp,
+};
+/* *INDENT-ON* */
+
+
+/*
+ * packet trace format function, very similar to
+ * cdp_packet_scan except that we call the per TLV format
+ * functions instead of the per TLV processing functions
+ */
+u8 *
+cdp_input_format_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  cdp_input_trace_t *t = va_arg (*args, cdp_input_trace_t *);
+  u8 *cur;
+  cdp_hdr_t *h;
+  cdp_tlv_t *tlv;
+  tlv_handler_t *handler;
+  u8 *(*fp) (cdp_tlv_t *);
+
+  cur = t->data;
+
+  h = (cdp_hdr_t *) cur;
+  s = format (s, "%U", format_cdp_hdr, h);
+
+  cur = (u8 *) (h + 1);
+
+  while (cur < t->data + t->len)
+    {
+      tlv = (cdp_tlv_t *) cur;
+      tlv->t = ntohs (tlv->t);
+      tlv->l = ntohs (tlv->l);
+      if (tlv->t >= ARRAY_LEN (tlv_handlers))
+	{
+	  s = format (s, "BAD_TLV\n");
+	  break;
+	}
+      handler = &tlv_handlers[tlv->t];
+      fp = handler->format;
+      s = format (s, "  %U", fp, tlv);
+      /* tlv length includes (t, l) */
+      cur += tlv->l;
+    }
+
+  return s;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/cdp/cdp_node.c b/src/vnet/cdp/cdp_node.c
new file mode 100644
index 00000000..39ac4a90
--- /dev/null
+++ b/src/vnet/cdp/cdp_node.c
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/cdp/cdp_node.h>
+#include <vnet/ethernet/packet.h>
+
+static vlib_node_registration_t cdp_process_node;
+
+/** \file
+
+    2 x CDP graph nodes: an "interior" node to process
+    incoming announcements, and a "process" node to periodically
+    send announcements.
+
+    The interior node is neither pipelined nor dual-looped, because
+    it would be very unusual to see more than one CDP packet in
+    a given input frame. So, it's a very simple / straighforward
+    example.
+*/
+
+/*
+ * packet counter strings
+ * Dump these counters via the "show error" CLI command
+ */
+static char *cdp_error_strings[] = {
+#define _(sym,string) string,
+  foreach_cdp_error
+#undef _
+};
+
+/*
+ * We actually send all cdp pkts to the "error" node after scanning
+ * them, so the graph node has only one next-index. The "error-drop"
+ * node automatically bumps our per-node packet counters for us.
+ */
+typedef enum
+{
+  CDP_INPUT_NEXT_NORMAL,
+  CDP_INPUT_N_NEXT,
+} cdp_next_t;
+
+/*
+ * Process a frame of cdp packets
+ * Expect 1 packet / frame
+ */
+static uword
+cdp_node_fn (vlib_main_t * vm,
+	     vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from;
+  cdp_input_trace_t *t0;
+
+  from = vlib_frame_vector_args (frame);	/* array of buffer indices */
+  n_left_from = frame->n_vectors;	/* number of buffer indices */
+
+  while (n_left_from > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      u32 next0, error0;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+
+      next0 = CDP_INPUT_NEXT_NORMAL;
+
+      /* scan this cdp pkt. error0 is the counter index to bump */
+      error0 = cdp_input (vm, b0, bi0);
+      b0->error = node->errors[error0];
+
+      /* If this pkt is traced, snapshoot the data */
+      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  int len;
+	  t0 = vlib_add_trace (vm, node, b0, sizeof (*t0));
+	  len = (b0->current_length < sizeof (t0->data))
+	    ? b0->current_length : sizeof (t0->data);
+	  t0->len = len;
+	  clib_memcpy (t0->data, vlib_buffer_get_current (b0), len);
+	}
+      /* push this pkt to the next graph node, always error-drop */
+      vlib_set_next_frame_buffer (vm, node, next0, bi0);
+
+      from += 1;
+      n_left_from -= 1;
+    }
+
+  return frame->n_vectors;
+}
+
+/*
+ * cdp input graph node declaration
+ */
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (cdp_input_node, static) = {
+  .function = cdp_node_fn,
+  .name = "cdp-input",
+  .vector_size = sizeof (u32),
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = CDP_N_ERROR,
+  .error_strings = cdp_error_strings,
+
+  .format_trace = cdp_input_format_trace,
+
+  .n_next_nodes = CDP_INPUT_N_NEXT,
+  .next_nodes = {
+    [CDP_INPUT_NEXT_NORMAL] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/*
+ * cdp periodic function
+ */
+static uword
+cdp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  cdp_main_t *cm = &cdp_main;
+  f64 poll_time_remaining;
+  uword event_type, *event_data = 0;
+
+  /* So we can send events to the cdp process */
+  cm->cdp_process_node_index = cdp_process_node.index;
+
+  /* Dynamically register the cdp input node with the snap classifier */
+  snap_register_input_protocol (vm, "cdp-input", 0xC /* ieee_oui, Cisco */ ,
+				0x2000 /* protocol CDP */ ,
+				cdp_input_node.index);
+
+  snap_register_input_protocol (vm, "cdp-input", 0xC /* ieee_oui, Cisco */ ,
+				0x2004 /* protocol CDP */ ,
+				cdp_input_node.index);
+
+#if 0				/* retain for reference */
+  /* with the hdlc classifier */
+  hdlc_register_input_protocol (vm, HDLC_PROTOCOL_cdp, cdp_input_node.index);
+#endif
+
+  /* with ethernet input (for SRP) */
+  ethernet_register_input_type (vm, ETHERNET_TYPE_CDP /* CDP */ ,
+				cdp_input_node.index);
+
+  poll_time_remaining = 10.0 /* seconds */ ;
+  while (1)
+    {
+      /* sleep until next poll time, or msg serialize event occurs */
+      poll_time_remaining =
+	vlib_process_wait_for_event_or_clock (vm, poll_time_remaining);
+
+      event_type = vlib_process_get_events (vm, &event_data);
+      switch (event_type)
+	{
+	case ~0:		/* no events => timeout */
+	  break;
+
+	default:
+	  clib_warning ("BUG: event type 0x%wx", event_type);
+	  break;
+	}
+      if (event_data)
+	_vec_len (event_data) = 0;
+
+      /* peer timeout scan, send announcements */
+      if (vlib_process_suspend_time_is_zero (poll_time_remaining))
+	{
+	  cdp_periodic (vm);
+	  poll_time_remaining = 10.0;
+	}
+    }
+
+  return 0;
+}
+
+/*
+ * cdp periodic node declaration
+ */
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (cdp_process_node, static) = {
+  .function = cdp_process,
+  .type = VLIB_NODE_TYPE_PROCESS,
+  .name = "cdp-process",
+};
+/* *INDENT-ON* */
+
+void
+vnet_cdp_node_reference (void)
+{
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/cdp/cdp_node.h b/src/vnet/cdp/cdp_node.h
new file mode 100644
index 00000000..7028ddca
--- /dev/null
+++ b/src/vnet/cdp/cdp_node.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_cdp_node_h__
+#define __included_cdp_node_h__
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+
+#include <vnet/snap/snap.h>
+#include <vnet/hdlc/hdlc.h>
+#include <vnet/hdlc/packet.h>
+
+#include <vppinfra/format.h>
+#include <vppinfra/hash.h>
+
+#include <vnet/cdp/cdp_protocol.h>
+
+typedef enum
+{
+  CDP_PACKET_TEMPLATE_ETHERNET,
+  CDP_PACKET_TEMPLATE_HDLC,
+  CDP_PACKET_TEMPLATE_SRP,
+  CDP_N_PACKET_TEMPLATES,
+} cdp_packet_template_id_t;
+
+typedef struct
+{
+  /* neighbor's vlib software interface index */
+  u32 sw_if_index;
+
+  /* Timers */
+  f64 last_heard;
+  f64 last_sent;
+
+  /* Neighbor time-to-live (usually 180s) */
+  u8 ttl_in_seconds;
+
+  /* "no cdp run" or similar */
+  u8 disabled;
+
+  /* tx packet template id for this neighbor */
+  u8 packet_template_index;
+
+  /* Jenkins hash optimization: avoid tlv scan, send short keepalive msg */
+  u8 last_packet_signature_valid;
+  uword last_packet_signature;
+
+  /* Info we actually keep about each neighbor */
+  u8 *device_name;
+  u8 *version;
+  u8 *port_id;
+  u8 *platform;
+
+  /* last received packet, for the J-hash optimization */
+  u8 *last_rx_pkt;
+} cdp_neighbor_t;
+
+#define foreach_neighbor_string_field           \
+_(device_name)                                  \
+_(version)                                      \
+_(port_id)                                      \
+_(platform)
+
+typedef struct
+{
+  /* pool of cdp neighbors */
+  cdp_neighbor_t *neighbors;
+
+  /* tx pcap debug enable */
+  u8 tx_pcap_debug;
+
+  /* rapidly find a neighbor by vlib software interface index */
+  uword *neighbor_by_sw_if_index;
+
+  /* Background process node index */
+  u32 cdp_process_node_index;
+
+  /* Packet templates for different encap types */
+  vlib_packet_template_t packet_templates[CDP_N_PACKET_TEMPLATES];
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} cdp_main_t;
+
+cdp_main_t cdp_main;
+
+/* Packet counters */
+#define foreach_cdp_error                                       \
+_ (NONE, "good cdp packets (processed)")	                \
+_ (CACHE_HIT, "good cdp packets (cache hit)")			\
+_ (BAD_TLV, "cdp packets with bad TLVs")                        \
+_ (PROTOCOL_VERSION, "cdp packets with bad protocol versions")  \
+_ (CHECKSUM, "cdp packets with bad checksums")                  \
+_ (DISABLED, "cdp packets received on disabled interfaces")
+
+typedef enum
+{
+#define _(sym,str) CDP_ERROR_##sym,
+  foreach_cdp_error
+#undef _
+    CDP_N_ERROR,
+} cdp_error_t;
+
+/* cdp packet trace capture */
+typedef struct
+{
+  u32 len;
+  u8 data[400];
+} cdp_input_trace_t;
+
+typedef enum
+{
+  CDP_EVENT_SEND_NEIGHBOR,
+  CDP_EVENT_SEND_KEEPALIVE,
+} cdp_process_event_t;
+
+
+cdp_error_t cdp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0);
+void cdp_periodic (vlib_main_t * vm);
+void cdp_keepalive (cdp_main_t * cm, cdp_neighbor_t * n);
+u16 cdp_checksum (void *p, int count);
+u8 *cdp_input_format_trace (u8 * s, va_list * args);
+
+serialize_function_t serialize_cdp_main, unserialize_cdp_main;
+
+#endif /* __included_cdp_node_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/cdp/cdp_periodic.c b/src/vnet/cdp/cdp_periodic.c
new file mode 100644
index 00000000..de111079
--- /dev/null
+++ b/src/vnet/cdp/cdp_periodic.c
@@ -0,0 +1,512 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/cdp/cdp_node.h>
+#include <vppinfra/hash.h>
+#include <vnet/unix/pcap.h>
+#include <vnet/srp/srp.h>
+#include <vnet/ppp/ppp.h>
+#include <vnet/hdlc/hdlc.h>
+#include <vnet/srp/packet.h>
+
+/*
+ * Generate a set of specific CDP TLVs.
+ *
+ * $$$ eventually these need to fish better data from
+ * other data structures; e.g. the hostname, software version info
+ * etc.
+ */
+
+static void
+add_device_name_tlv (vnet_hw_interface_t * hw, u8 ** t0p)
+{
+  cdp_tlv_t *t = (cdp_tlv_t *) * t0p;
+
+  t->t = htons (CDP_TLV_device_name);
+  t->l = htons (3 + sizeof (*t));
+  clib_memcpy (&t->v, "VPP", 3);
+
+  *t0p += ntohs (t->l);
+}
+
+static void
+add_port_id_tlv (vnet_hw_interface_t * hw, u8 ** t0p)
+{
+  cdp_tlv_t *t = (cdp_tlv_t *) * t0p;
+
+  t->t = htons (CDP_TLV_port_id);
+  t->l = htons (vec_len (hw->name) + sizeof (*t));
+  clib_memcpy (&t->v, hw->name, vec_len (hw->name));
+  *t0p += ntohs (t->l);
+}
+
+static void
+add_version_tlv (vnet_hw_interface_t * hw, u8 ** t0p)
+{
+  cdp_tlv_t *t = (cdp_tlv_t *) * t0p;
+
+  t->t = htons (CDP_TLV_version);
+  t->l = htons (12 + sizeof (*t));
+  clib_memcpy (&t->v, "VPP Software", 12);
+  *t0p += ntohs (t->l);
+}
+
+static void
+add_platform_tlv (vnet_hw_interface_t * hw, u8 ** t0p)
+{
+  cdp_tlv_t *t = (cdp_tlv_t *) * t0p;
+
+  t->t = htons (CDP_TLV_platform);
+  t->l = htons (2 + sizeof (*t));
+  clib_memcpy (&t->v, "SW", 2);
+  *t0p += ntohs (t->l);
+}
+
+static void
+add_capability_tlv (vnet_hw_interface_t * hw, u8 ** t0p)
+{
+  cdp_tlv_t *t = (cdp_tlv_t *) * t0p;
+  u32 capabilities;
+
+  t->t = htons (CDP_TLV_capabilities);
+  t->l = htons (4 + sizeof (*t));
+  capabilities = CDP_ROUTER_DEVICE;
+  capabilities = htonl (capabilities);
+  clib_memcpy (&t->v, &capabilities, sizeof (capabilities));
+  *t0p += ntohs (t->l);
+}
+
+static void
+add_tlvs (cdp_main_t * cm, vnet_hw_interface_t * hw, u8 ** t0p)
+{
+  add_device_name_tlv (hw, t0p);
+  add_port_id_tlv (hw, t0p);
+  add_version_tlv (hw, t0p);
+  add_platform_tlv (hw, t0p);
+  add_capability_tlv (hw, t0p);
+}
+
+/*
+ * send a cdp pkt on an ethernet interface
+ */
+static void
+send_ethernet_hello (cdp_main_t * cm, cdp_neighbor_t * n, int count)
+{
+  u32 *to_next;
+  ethernet_llc_snap_and_cdp_header_t *h0;
+  vnet_hw_interface_t *hw;
+  u32 bi0;
+  vlib_buffer_t *b0;
+  u8 *t0;
+  u16 checksum;
+  int nbytes_to_checksum;
+  int i;
+  vlib_frame_t *f;
+  vlib_main_t *vm = cm->vlib_main;
+  vnet_main_t *vnm = cm->vnet_main;
+
+  for (i = 0; i < count; i++)
+    {
+      /*
+       * see cdp_periodic_init() to understand what's already painted
+       * into the buffer by the packet template mechanism
+       */
+      h0 = vlib_packet_template_get_packet
+	(vm, &cm->packet_templates[n->packet_template_index], &bi0);
+
+      /* Add the interface's ethernet source address */
+      hw = vnet_get_sup_hw_interface (vnm, n->sw_if_index);
+
+      clib_memcpy (h0->ethernet.src_address, hw->hw_address,
+		   vec_len (hw->hw_address));
+
+      t0 = (u8 *) & h0->cdp.data;
+
+      /* add TLVs */
+      add_tlvs (cm, hw, &t0);
+
+      /* add the cdp packet checksum */
+      nbytes_to_checksum = t0 - (u8 *) & h0->cdp;
+      checksum = cdp_checksum (&h0->cdp, nbytes_to_checksum);
+      h0->cdp.checksum = htons (checksum);
+
+      /* Set the outbound packet length */
+      b0 = vlib_get_buffer (vm, bi0);
+      b0->current_length = nbytes_to_checksum + sizeof (*h0)
+	- sizeof (cdp_hdr_t);
+
+      /* And the outbound interface */
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = hw->sw_if_index;
+
+      /* Set the 802.3 ethernet length */
+      h0->ethernet.len = htons (b0->current_length
+				- sizeof (ethernet_802_3_header_t));
+
+      /* And output the packet on the correct interface */
+      f = vlib_get_frame_to_node (vm, hw->output_node_index);
+      to_next = vlib_frame_vector_args (f);
+      to_next[0] = bi0;
+      f->n_vectors = 1;
+
+      vlib_put_frame_to_node (vm, hw->output_node_index, f);
+      n->last_sent = vlib_time_now (vm);
+    }
+}
+
+/*
+ * send a cdp pkt on an hdlc interface
+ */
+static void
+send_hdlc_hello (cdp_main_t * cm, cdp_neighbor_t * n, int count)
+{
+  u32 *to_next;
+  hdlc_and_cdp_header_t *h0;
+  vnet_hw_interface_t *hw;
+  u32 bi0;
+  vlib_buffer_t *b0;
+  u8 *t0;
+  u16 checksum;
+  int nbytes_to_checksum;
+  int i;
+  vlib_frame_t *f;
+  vlib_main_t *vm = cm->vlib_main;
+  vnet_main_t *vnm = cm->vnet_main;
+
+  for (i = 0; i < count; i++)
+    {
+      /*
+       * see cdp_periodic_init() to understand what's already painted
+       * into the buffer by the packet template mechanism
+       */
+      h0 = vlib_packet_template_get_packet
+	(vm, &cm->packet_templates[n->packet_template_index], &bi0);
+
+      hw = vnet_get_sup_hw_interface (vnm, n->sw_if_index);
+
+      t0 = (u8 *) & h0->cdp.data;
+
+      /* add TLVs */
+      add_tlvs (cm, hw, &t0);
+
+      /* add the cdp packet checksum */
+      nbytes_to_checksum = t0 - (u8 *) & h0->cdp;
+      checksum = cdp_checksum (&h0->cdp, nbytes_to_checksum);
+      h0->cdp.checksum = htons (checksum);
+
+      /* Set the outbound packet length */
+      b0 = vlib_get_buffer (vm, bi0);
+      b0->current_length = nbytes_to_checksum + sizeof (*h0)
+	- sizeof (cdp_hdr_t);
+
+      /* And output the packet on the correct interface */
+      f = vlib_get_frame_to_node (vm, hw->output_node_index);
+      to_next = vlib_frame_vector_args (f);
+      to_next[0] = bi0;
+      f->n_vectors = 1;
+
+      vlib_put_frame_to_node (vm, hw->output_node_index, f);
+      n->last_sent = vlib_time_now (vm);
+    }
+}
+
+/*
+ * send a cdp pkt on an srp interface
+ */
+static void
+send_srp_hello (cdp_main_t * cm, cdp_neighbor_t * n, int count)
+{
+  u32 *to_next;
+  srp_and_cdp_header_t *h0;
+  vnet_hw_interface_t *hw;
+  u32 bi0;
+  vlib_buffer_t *b0;
+  u8 *t0;
+  u16 checksum;
+  int nbytes_to_checksum;
+  int i;
+  vlib_frame_t *f;
+  vlib_main_t *vm = cm->vlib_main;
+  vnet_main_t *vnm = cm->vnet_main;
+
+  for (i = 0; i < count; i++)
+    {
+      /*
+       * see cdp_periodic_init() to understand what's already painted
+       * into the buffer by the packet template mechanism
+       */
+      h0 = vlib_packet_template_get_packet
+	(vm, &cm->packet_templates[n->packet_template_index], &bi0);
+
+      hw = vnet_get_sup_hw_interface (vnm, n->sw_if_index);
+
+      t0 = (u8 *) & h0->cdp.data;
+
+      /* add TLVs */
+      add_tlvs (cm, hw, &t0);
+
+      /* Add the interface's ethernet source address */
+      clib_memcpy (h0->ethernet.src_address, hw->hw_address,
+		   vec_len (hw->hw_address));
+
+      /* add the cdp packet checksum */
+      nbytes_to_checksum = t0 - (u8 *) & h0->cdp;
+      checksum = cdp_checksum (&h0->cdp, nbytes_to_checksum);
+      h0->cdp.checksum = htons (checksum);
+
+      /* Set the outbound packet length */
+      b0 = vlib_get_buffer (vm, bi0);
+      b0->current_length = nbytes_to_checksum + sizeof (*h0)
+	- sizeof (cdp_hdr_t);
+
+      /* And output the packet on the correct interface */
+      f = vlib_get_frame_to_node (vm, hw->output_node_index);
+      to_next = vlib_frame_vector_args (f);
+      to_next[0] = bi0;
+      f->n_vectors = 1;
+
+      vlib_put_frame_to_node (vm, hw->output_node_index, f);
+      n->last_sent = vlib_time_now (vm);
+    }
+}
+
+/*
+ * Decide which cdp packet template to use
+ */
+static int
+pick_packet_template (cdp_main_t * cm, cdp_neighbor_t * n)
+{
+  n->packet_template_index = CDP_PACKET_TEMPLATE_ETHERNET;
+
+  return 0;
+}
+
+/* Send a cdp neighbor announcement */
+static void
+send_hello (cdp_main_t * cm, cdp_neighbor_t * n, int count)
+{
+  if (n->packet_template_index == (u8) ~ 0)
+    {
+      /* If we don't know how to talk to this peer, don't try again */
+      if (pick_packet_template (cm, n))
+	{
+	  n->last_sent = 1e70;
+	  return;
+	}
+    }
+
+  switch (n->packet_template_index)
+    {
+    case CDP_PACKET_TEMPLATE_ETHERNET:
+      send_ethernet_hello (cm, n, count);
+      break;
+
+    case CDP_PACKET_TEMPLATE_HDLC:
+      send_hdlc_hello (cm, n, count);
+      break;
+
+    case CDP_PACKET_TEMPLATE_SRP:
+      send_srp_hello (cm, n, count);
+      break;
+
+    default:
+      ASSERT (0);
+    }
+  n->last_sent = vlib_time_now (cm->vlib_main);
+}
+
+static void
+delete_neighbor (cdp_main_t * cm, cdp_neighbor_t * n, int want_broadcast)
+{
+  hash_unset (cm->neighbor_by_sw_if_index, n->sw_if_index);
+  vec_free (n->device_name);
+  vec_free (n->version);
+  vec_free (n->port_id);
+  vec_free (n->platform);
+  vec_free (n->last_rx_pkt);
+  pool_put (cm->neighbors, n);
+}
+
+void
+cdp_periodic (vlib_main_t * vm)
+{
+  cdp_main_t *cm = &cdp_main;
+  cdp_neighbor_t *n;
+  f64 now = vlib_time_now (vm);
+  vnet_sw_interface_t *sw;
+  static u32 *delete_list = 0;
+  int i;
+  static cdp_neighbor_t **n_list = 0;
+
+  /* *INDENT-OFF* */
+  pool_foreach (n, cm->neighbors,
+  ({
+    vec_add1 (n_list, n);
+  }));
+  /* *INDENT-ON* */
+
+  /* Across all cdp neighbors known to the system */
+  for (i = 0; i < vec_len (n_list); i++)
+    {
+      n = n_list[i];
+
+      /* "no cdp run" provisioned on the interface? */
+      if (n->disabled == 1)
+	continue;
+
+      sw = vnet_get_sw_interface (cm->vnet_main, n->sw_if_index);
+
+      /* Interface shutdown or rx timeout? */
+      if (!(sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+	  || (now > (n->last_heard + (f64) n->ttl_in_seconds)))
+	/* add to list of neighbors to delete */
+	vec_add1 (delete_list, n - cm->neighbors);
+      else if (n->last_sent == 0.0)
+	/* First time, send 3 hellos */
+	send_hello (cm, n, 3 /* three to begin with */ );
+      else if (now > (n->last_sent + (((f64) n->ttl_in_seconds) / 6.0)))
+	/* Normal keepalive, send one */
+	send_hello (cm, n, 1 /* one as a keepalive */ );
+    }
+
+  for (i = 0; i < vec_len (delete_list); i++)
+    {
+      n = vec_elt_at_index (cm->neighbors, delete_list[i]);
+      delete_neighbor (cm, n, 1);
+    }
+  if (delete_list)
+    _vec_len (delete_list) = 0;
+  if (n_list)
+    _vec_len (n_list) = 0;
+}
+
+static clib_error_t *
+cdp_periodic_init (vlib_main_t * vm)
+{
+  cdp_main_t *cm = &cdp_main;
+
+  /* Create the ethernet cdp hello packet template */
+  {
+    ethernet_llc_snap_and_cdp_header_t h;
+
+    memset (&h, 0, sizeof (h));
+
+    /* Send to 01:00:0c:cc:cc */
+    h.ethernet.dst_address[0] = 0x01;
+    /* h.ethernet.dst_address[1] = 0x00; (memset) */
+    h.ethernet.dst_address[2] = 0x0C;
+    h.ethernet.dst_address[3] = 0xCC;
+    h.ethernet.dst_address[4] = 0xCC;
+    h.ethernet.dst_address[5] = 0xCC;
+
+    /* leave src address blank (fill in at send time) */
+
+    /* leave length blank (fill in at send time) */
+
+    /* LLC */
+    h.llc.dst_sap = h.llc.src_sap = 0xAA;	/* SNAP */
+    h.llc.control = 0x03;	/* UI (no extended control bytes) */
+
+    /* SNAP */
+    /* h.snap.oui[0] = 0x00; (memset) */
+    /* h.snap.oui[1] = 0x00; (memset) */
+    h.snap.oui[2] = 0x0C;	/* Cisco = 0x00000C */
+    h.snap.protocol = htons (0x2000);	/* CDP = 0x2000 */
+
+    /* CDP */
+    h.cdp.version = 2;
+    h.cdp.ttl = 180;
+
+    vlib_packet_template_init
+      (vm, &cm->packet_templates[CDP_PACKET_TEMPLATE_ETHERNET],
+       /* data */ &h,
+       sizeof (h),
+       /* alloc chunk size */ 8,
+       "cdp-ethernet");
+  }
+
+#if 0				/* retain for reference */
+
+  /* Create the hdlc cdp hello packet template */
+  {
+    hdlc_and_cdp_header_t h;
+
+    memset (&h, 0, sizeof (h));
+
+    h.hdlc.address = 0x0f;
+    /* h.hdlc.control = 0; (memset) */
+    h.hdlc.protocol = htons (0x2000);	/* CDP = 0x2000 */
+
+    /* CDP */
+    h.cdp.version = 2;
+    h.cdp.ttl = 180;
+
+    vlib_packet_template_init
+      (vm, &cm->packet_templates[CDP_PACKET_TEMPLATE_HDLC],
+       /* data */ &h,
+       sizeof (h),
+       /* alloc chunk size */ 8,
+       "cdp-hdlc");
+  }
+
+  /* Create the srp cdp hello packet template */
+  {
+    srp_and_cdp_header_t h;
+
+    memset (&h, 0, sizeof (h));
+
+    /* Send to 01:00:0c:cc:cc */
+    h.ethernet.dst_address[0] = 0x01;
+    /* h.ethernet.dst_address[1] = 0x00; (memset) */
+    h.ethernet.dst_address[2] = 0x0C;
+    h.ethernet.dst_address[3] = 0xCC;
+    h.ethernet.dst_address[4] = 0xCC;
+    h.ethernet.dst_address[5] = 0xCC;
+
+    /* leave src address blank (fill in at send time) */
+
+    /* The srp header is filled in at xmt */
+    h.srp.ttl = 1;
+    h.srp.priority = 7;
+    h.srp.mode = SRP_MODE_data;
+    srp_header_compute_parity (&h.srp);
+
+    /* Inner ring and parity will be set at send time */
+
+    h.ethernet.type = htons (0x2000);	/* CDP = 0x2000 */
+
+    /* CDP */
+    h.cdp.version = 2;
+    h.cdp.ttl = 180;
+
+    vlib_packet_template_init
+      (vm, &cm->packet_templates[CDP_PACKET_TEMPLATE_SRP],
+       /* data */ &h,
+       sizeof (h),
+       /* alloc chunk size */ 8,
+       "cdp-srp");
+  }
+#endif
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (cdp_periodic_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/cdp/cdp_protocol.h b/src/vnet/cdp/cdp_protocol.h
new file mode 100644
index 00000000..dc6c66d5
--- /dev/null
+++ b/src/vnet/cdp/cdp_protocol.h
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_cdp_protocol_h__
+#define __included_cdp_protocol_h__
+
+#include <vnet/ethernet/ethernet.h>	/* for ethernet_header_t */
+#include <vnet/llc/llc.h>
+#include <vnet/snap/snap.h>
+#include <vnet/srp/packet.h>
+
+typedef CLIB_PACKED (struct
+		     {
+		     u8 version;
+		     u8 ttl;
+		     u16 checksum;	/* 1's complement of the 1's complement sum */
+		     u8 data[0];
+		     }) cdp_hdr_t;
+
+typedef struct
+{
+  u8 dst_address[6];
+  u8 src_address[6];
+  u16 len;
+} ethernet_802_3_header_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     ethernet_802_3_header_t ethernet;
+		     llc_header_t llc; snap_header_t snap; cdp_hdr_t cdp;
+		     }) ethernet_llc_snap_and_cdp_header_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     hdlc_header_t hdlc; cdp_hdr_t cdp;
+		     }) hdlc_and_cdp_header_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     srp_header_t srp;
+		     ethernet_header_t ethernet; cdp_hdr_t cdp;
+		     }) srp_and_cdp_header_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     u16 t;
+		     u16 l;
+		     u8 v[0];
+		     }) cdp_tlv_t;
+
+/*
+ * TLV codes.
+ */
+#define foreach_cdp_tlv_type                                    \
+_(unused)                                                       \
+_(device_name)		/* uniquely identifies the device    */ \
+_(address)              /* list of addresses this device has */ \
+_(port_id)              /* port CDP packet was sent out on   */ \
+_(capabilities)         /* funct. capabilities of the device */ \
+_(version)              /* version                           */ \
+_(platform)             /* hardware platform of this device  */ \
+_(ipprefix)             /* An IP network prefix              */ \
+_(hello)                /* Pprotocol piggyback hello msg     */ \
+_(vtp_domain)           /* VTP management domain             */ \
+_(native_vlan)          /* Native VLAN number                */ \
+_(duplex)               /* The interface duplex mode         */ \
+_(appl_vlan)            /* Appliance VLAN-ID TLV             */ \
+_(trigger)              /* For sending trigger TLV msgs.     */ \
+_(power)                /* Power consumption of that device  */ \
+_(mtu)                  /* MTU defined for sending intf.     */ \
+_(trust)                /* Extended trust TLV                */ \
+_(cos)                  /* COS for Untrusted Port TLV        */ \
+_(sysname)              /* System name (FQDN of device)      */ \
+_(sysobject)            /* OID of sysObjectID MIB object     */ \
+_(mgmt_addr)            /* SNMP manageable addrs. of device  */ \
+_(physical_loc)         /* Physical Location of the device   */ \
+_(mgmt_addr2)           /* External Port-ID                  */ \
+_(power_requested)                                              \
+_(power_available)                                              \
+_(port_unidirectional)                                          \
+_(unknown_28)                                                   \
+_(energywise)                                                   \
+_(unknown_30)                                                   \
+_(spare_poe)
+
+typedef enum
+{
+#define _(t) CDP_TLV_##t,
+  foreach_cdp_tlv_type
+#undef _
+} cdp_tlv_code_t;
+
+/*
+  The address TLV looks as follows:
+
+          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+          |                    Number of addresses                        |
+          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+          |                   IDRP encoded address                        |
+          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+	  An address is encoded in IDRP format:
+
+	   0                   1                   2                   3
+           0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+          |       PT      |    PT Length  |    Protocol (variable) ...
+          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+          |        Address length         |    Address (variable) ...
+          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+	  PT: Protocol type
+	      1 = NLPID format
+              2 = 802.2 format
+
+	  PT Length:
+	      Length of protocol field, 1 for PT = 1, and either 3 or 8 for
+	      802.2 format depending if SNAP is used for PT = 2.
+
+	      The encodings for the other protocols have the following format:
+
+          field:    <SSAP><DSAP><CTRL><-------OUI------><protocl_TYPE>
+                    |     |     |     |     |     |     |     |      |
+          bytes:    0     1     2     3     4     5     6     7      8
+
+          where the first 3 bytes are 0xAAAA03 for SNAP encoded addresses.
+          The OUI is 000000 for ethernet and <protocl_TYPE>
+          is the assigned Ethernet type code for the particular protocol.
+          e.g. for DECnet the encoding is AAAA03 000000 6003.
+               for IPv6   the encoding is AAAA03 000000 86DD
+*/
+
+/*
+ * Capabilities.
+ */
+
+#define CDP_ROUTER_DEVICE	0x0001
+#define CDP_TB_DEVICE		0x0002
+#define CDP_SRB_DEVICE		0x0004
+#define CDP_SWITCH_DEVICE	0x0008
+#define CDP_HOST_DEVICE		0x0010
+#define CDP_IGMP_DEVICE		0x0020
+#define CDP_REPEATER_DEVICE	0x0040
+
+/*
+  The protocol-hello TLV looks as follows:
+
+           0         1         2         3
+           012345678901234567890123456789012345678
+          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+          |      Type     |      Length   |
+          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+          |           OUI                         |
+          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+          |           Protocol ID         |
+          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	  |   up to 27 bytes of message           |
+          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+*/
+
+/*
+ * These macros define the valid values for the Duplex TLV.
+ */
+#define CDP_DUPLEX_TLV_HALF 0x0
+#define CDP_DUPLEX_TLV_FULL 0x1
+
+#endif /* __included_cdp_protocol_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/classify/README b/src/vnet/classify/README
new file mode 100644
index 00000000..1ef5ab5a
--- /dev/null
+++ b/src/vnet/classify/README
@@ -0,0 +1,180 @@
+=== vnet classifier theory of operation ===
+
+The vnet classifier trades off simplicity and perf / scale
+characteristics. At a certain level, it's a dumb robot. Given an
+incoming packet, search an ordered list of (mask, match) tables. If
+the classifier finds a matching entry, take the indicated action. If
+not, take a last-resort action.
+
+We use the MMX-unit to match or hash 16 octets at a time. For hardware
+backward compatibility, the code does not [currently] use 256-bit
+(32-octet) vector instructions.
+
+Effective use of the classifier centers around building table lists
+which "hit" as soon as practicable. In many cases, established
+sessions hit in the first table. In this mode of operation, the
+classifier easily processes multiple MPPS / core - even with millions
+of sessions in the data base. Searching 357 tables on a regular basis
+will neatly solve the halting problem.
+
+==== Basic operation ====
+
+The classifier mask-and-match operation proceeds as follows. Given a
+starting classifier table index, lay hands on the indicated mask
+vector.  When building tables, we arrange for the mask to obey
+mmx-unit (16-octet) alignment.
+
+We know that the first octet of packet data starts on a cache-line
+boundary. Further, it's reasonably likely that folks won't want to use
+the generalized classifier on the L2 header; preferring to decode the
+Ethertype manually. That scheme makes it easy to select among ip4 /
+ip6 / MPLS, etc. classifier table sets.
+
+A no-vlan-tag L2 header is 14 octets long. A typical ipv4 header
+begins with the octets 0x4500: version=4, header_length=5, DSCP=0,
+ECN=0. If one doesn't intend to classify on (DSCP, ECN) - the typical
+case - we program the classifier to skip the first 16-octet vector.
+
+To classify untagged ipv4 packets on source address, we program the
+classifier to skip one vector, and mask-and-match one vector.
+
+The basic match-and-match operation looks like this:
+
+ switch (t->match_n_vectors)
+   {
+   case 1:
+     result = (data[0 + t->skip_n_vectors] & mask[0]) ^ key[0];
+     break;
+     
+   case 2:
+     result =  (data[0 + t->skip_n_vectors] & mask[0]) ^ key[0];
+     result |= (data[1 + t->skip_n_vectors] & mask[1]) ^ key[1];
+     break;
+     
+     <etc>
+    }
+
+ result_mask = u32x4_zero_byte_mask (result);
+ if (result_mask == 0xffff)
+     return (v);
+
+Net of setup, it costs a couple of clock cycles to mask-and-match 16
+octets.
+
+At the risk of belaboring an obvious point, the control-plane
+'''must''' pay attention to detail. When skipping one (or more)
+vectors, masks and matches must reflect that decision. See
+.../vnet/vnet/classify/vnet_classify.c:unformat_classify_[mask|match]. Note
+that vec_validate (xxx, 13) creates a 14-element vector.
+
+==== Creating a classifier table ====
+
+To create a new classifier table via the control-plane API, send a
+"classify_add_del_table" message. The underlying action routine,
+vnet_classify_add_del_table(...), is located in
+.../vnet/vnet/classify/vnet_classify.c, and has the following
+prototype:
+
+ int vnet_classify_add_del_table (vnet_classify_main_t * cm,
+                                  u8 * mask, 
+                                  u32 nbuckets,
+                                  u32 memory_size,
+                                  u32 skip,
+                                  u32 match,
+                                  u32 next_table_index,
+                                  u32 miss_next_index,
+                                  u32 * table_index,
+                                  int is_add)
+
+Pass cm = &vnet_classify_main if calling this routine directly. Mask,
+skip(_n_vectors) and match(_n_vectors) are as described above. Mask
+need not be aligned, but it must be match*16 octets in length. To
+avoid having your head explode, be absolutely certain that '''only'''
+the bits you intend to match on are set.
+
+The classifier uses thread-safe, no-reader-locking-required
+bounded-index extensible hashing. Nbuckets is the [fixed] size of the
+hash bucket vector. The algorithm works in constant time regardless of
+hash collisions, but wastes space when the bucket array is too
+small. A good rule of thumb: let nbuckets = approximate number of
+entries expected.
+
+At a signficant cost in complexity, it would be possible to resize the
+bucket array dynamically. We have no plans to implement that function.
+
+Each classifier table has its own clib mheap memory allocation
+arena. To pick the memory_size parameter, note that each classifier
+table entry needs 16*(1 + match_n_vectors) bytes. Within reason, aim a
+bit high. Clib mheap memory uses o/s level virtual memory - not wired
+or hugetlb memory - so it's best not to scrimp on size.
+
+The "next_table_index" parameter is as described: the pool index in
+vnet_classify_main.tables of the next table to search. Code ~0 to
+indicate the end of the table list. 0 is a valid table index!
+
+We often create classification tables in reverse order -
+last-table-searched to first-table-searched - so we can easily set
+this parameter. Of course, one can manually adjust the data structure
+after-the-fact.
+
+Specific classifier client nodes - for example,
+.../vnet/vnet/classify/ip_classify.c - interpret the "miss_next_index"
+parameter as a vpp graph-node next index. When packet classification
+fails to produce a match, ip_classify_inline sends packets to the
+indicated disposition. A classifier application might program this
+parameter to send packets which don't match an existing session to a
+"first-sign-of-life, create-new-session" node.
+
+Finally, the is_add parameter indicates whether to add or delete the
+indicated table. The delete case implicitly terminates all sessions
+with extreme prejudice, by freeing the specified clib mheap.
+
+==== Creating a classifier session ====
+
+To create a new classifier session via the control-plane API, send a
+"classify_add_del_session" message. The underlying action routine,
+vnet_classify_add_del_session(...), is located in
+.../vnet/vnet/classify/vnet_classify.c, and has the following
+prototype:
+
+int vnet_classify_add_del_session (vnet_classify_main_t * cm, 
+                                   u32 table_index, 
+                                   u8 * match, 
+                                   u32 hit_next_index,
+                                   u32 opaque_index, 
+                                   i32 advance,
+                                   int is_add)
+
+Pass cm = &vnet_classify_main if calling this routine directly. Table
+index specifies the table which receives the new session / contains
+the session to delete depending on is_add.
+
+Match is the key for the indicated session. It need not be aligned,
+but it must be table->match_n_vectors*16 octets in length. As a
+courtesy, vnet_classify_add_del_session applies the table's mask to
+the stored key-value. In this way, one can create a session by passing
+unmasked (packet_data + offset) as the "match" parameter, and end up
+with unconfusing session keys. 
+
+Specific classifier client nodes - for example,
+.../vnet/vnet/classify/ip_classify.c - interpret the per-session
+hit_next_index parameter as a vpp graph-node next index. When packet
+classification produces a match, ip_classify_inline sends packets to
+the indicated disposition.
+
+ip4/6_classify place the per-session opaque_index parameter into
+vnet_buffer(b)->l2_classify.opaque_index; a slight misnomer, but
+anyhow classifier applications can send session-hit packets to
+specific graph nodes, with useful values in buffer metadata. Depending
+on the required semantics, we send known-session traffic to a certain
+node, with e.g. a session pool index in buffer metadata. It's totally
+up to the control-plane and the specific use-case.
+
+Finally, nodes such as ip4/6-classify apply the advance parameter as a
+[signed!] argument to vlib_buffer_advance(...); to "consume" a
+networking layer. Example: if we classify incoming tunneled IP packets
+by (inner) source/dest address and source/dest port, we might choose
+to decapsulate and reencapsulate the inner packet. In such a case,
+program the advance parameter to perform the tunnel decapsulation, and
+program next_index to send traffic to a node which uses
+e.g. opaque_index to output traffic on a specific tunnel interface.
diff --git a/src/vnet/classify/flow_classify.c b/src/vnet/classify/flow_classify.c
new file mode 100644
index 00000000..0a624204
--- /dev/null
+++ b/src/vnet/classify/flow_classify.c
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/classify/flow_classify.h>
+
+static void
+vnet_flow_classify_feature_enable (vlib_main_t * vnm,
+                                   flow_classify_main_t * fcm,
+                                   u32 sw_if_index,
+                                   flow_classify_table_id_t tid,
+                                   int feature_enable)
+{
+  vnet_feature_config_main_t *vfcm;
+  u8 arc;
+
+  if (tid == FLOW_CLASSIFY_TABLE_IP4)
+    {
+      vnet_feature_enable_disable ("ip4-unicast", "ip4-flow-classify",
+				   sw_if_index, feature_enable, 0, 0);
+      arc = vnet_get_feature_arc_index ("ip4-unicast");
+    }
+  else
+    {
+      vnet_feature_enable_disable ("ip6-unicast", "ip6-flow-classify",
+				   sw_if_index, feature_enable, 0, 0);
+      arc = vnet_get_feature_arc_index ("ip6-unicast");
+    }
+
+  vfcm = vnet_get_feature_arc_config_main (arc);
+  fcm->vnet_config_main[tid] = &vfcm->config_main;
+}
+
+int vnet_set_flow_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
+                                  u32 ip4_table_index, u32 ip6_table_index,
+                                  u32 is_add)
+{
+  flow_classify_main_t * fcm = &flow_classify_main;
+  vnet_classify_main_t * vcm = fcm->vnet_classify_main;
+  u32 pct[FLOW_CLASSIFY_N_TABLES] = {ip4_table_index, ip6_table_index};
+  u32 ti;
+
+  /* Assume that we've validated sw_if_index in the API layer */
+
+  for (ti = 0; ti < FLOW_CLASSIFY_N_TABLES; ti++)
+    {
+      if (pct[ti] == ~0)
+        continue;
+
+      if (pool_is_free_index (vcm->tables, pct[ti]))
+        return VNET_API_ERROR_NO_SUCH_TABLE;
+
+      vec_validate_init_empty
+        (fcm->classify_table_index_by_sw_if_index[ti], sw_if_index, ~0);
+
+      /* Reject any DEL operation with wrong sw_if_index */
+      if (!is_add &&
+          (pct[ti] != fcm->classify_table_index_by_sw_if_index[ti][sw_if_index]))
+        {
+          clib_warning ("Non-existent intf_idx=%d with table_index=%d for delete",
+                        sw_if_index, pct[ti]);
+          return VNET_API_ERROR_NO_SUCH_TABLE;
+        }
+
+      /* Return ok on ADD operaton if feature is already enabled */
+      if (is_add &&
+          fcm->classify_table_index_by_sw_if_index[ti][sw_if_index] != ~0)
+          return 0;
+
+      vnet_flow_classify_feature_enable (vm, fcm, sw_if_index, ti, is_add);
+
+      if (is_add)
+        fcm->classify_table_index_by_sw_if_index[ti][sw_if_index] = pct[ti];
+      else
+        fcm->classify_table_index_by_sw_if_index[ti][sw_if_index] = ~0;
+    }
+
+
+  return 0;
+}
+
+static clib_error_t *
+set_flow_classify_command_fn (vlib_main_t * vm,
+                              unformat_input_t * input,
+                              vlib_cli_command_t * cmd)
+{
+  vnet_main_t * vnm = vnet_get_main();
+  u32 sw_if_index = ~0;
+  u32 ip4_table_index = ~0;
+  u32 ip6_table_index = ~0;
+  u32 is_add = 1;
+  u32 idx_cnt = 0;
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "interface %U", unformat_vnet_sw_interface,
+                    vnm, &sw_if_index))
+        ;
+      else if (unformat (input, "ip4-table %d", &ip4_table_index))
+        idx_cnt++;
+      else if (unformat (input, "ip6-table %d", &ip6_table_index))
+        idx_cnt++;
+      else if (unformat (input, "del"))
+        is_add = 0;
+      else
+        break;
+    }
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "Interface must be specified.");
+
+  if (!idx_cnt)
+    return clib_error_return (0, "Table index should be specified.");
+
+  if (idx_cnt > 1)
+    return clib_error_return (0, "Only one table index per API is allowed.");
+
+  rv = vnet_set_flow_classify_intfc(vm, sw_if_index, ip4_table_index,
+                                       ip6_table_index, is_add);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case VNET_API_ERROR_NO_MATCHING_INTERFACE:
+      return clib_error_return (0, "No such interface");
+
+    case VNET_API_ERROR_NO_SUCH_ENTRY:
+      return clib_error_return (0, "No such classifier table");
+    }
+  return 0;
+}
+
+VLIB_CLI_COMMAND (set_input_acl_command, static) = {
+    .path = "set flow classify",
+    .short_help =
+    "set flow classify interface <int> [ip4-table <index>]\n"
+    "  [ip6-table <index>] [del]",
+    .function = set_flow_classify_command_fn,
+};
+
+static uword
+unformat_table_type (unformat_input_t * input, va_list * va)
+{
+  u32 * r = va_arg (*va, u32 *);
+  u32 tid;
+
+  if (unformat (input, "ip4"))
+    tid = FLOW_CLASSIFY_TABLE_IP4;
+  else if (unformat (input, "ip6"))
+    tid = FLOW_CLASSIFY_TABLE_IP6;
+  else
+    return 0;
+
+  *r = tid;
+  return 1;
+}
+static clib_error_t *
+show_flow_classify_command_fn (vlib_main_t * vm,
+                               unformat_input_t * input,
+                               vlib_cli_command_t * cmd)
+{
+  flow_classify_main_t * fcm = &flow_classify_main;
+  u32 type = FLOW_CLASSIFY_N_TABLES;
+  u32 * vec_tbl;
+  int i;
+
+  if (unformat (input, "type %U", unformat_table_type, &type))
+    ;
+  else
+    return clib_error_return (0, "Type must be specified.");;
+
+  if (type == FLOW_CLASSIFY_N_TABLES)
+    return clib_error_return (0, "Invalid table type.");
+
+  vec_tbl = fcm->classify_table_index_by_sw_if_index[type];
+
+  if (vec_len(vec_tbl))
+      vlib_cli_output (vm, "%10s%20s\t\t%s", "Intfc idx", "Classify table",
+                       "Interface name");
+  else
+    vlib_cli_output (vm, "No tables configured.");
+
+  for (i = 0; i < vec_len (vec_tbl); i++)
+    {
+      if (vec_elt(vec_tbl, i) == ~0)
+        continue;
+
+      vlib_cli_output (vm, "%10d%20d\t\t%U", i, vec_elt(vec_tbl, i),
+                       format_vnet_sw_if_index_name, fcm->vnet_main, i);
+    }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (show_flow_classify_command, static) = {
+    .path = "show classify flow",
+    .short_help = "show classify flow type [ip4|ip6]",
+    .function = show_flow_classify_command_fn,
+};
diff --git a/src/vnet/classify/flow_classify.h b/src/vnet/classify/flow_classify.h
new file mode 100644
index 00000000..3ae04cd7
--- /dev/null
+++ b/src/vnet/classify/flow_classify.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __included_vnet_flow_classify_h__
+#define __included_vnet_flow_classify_h__
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/classify/vnet_classify.h>
+
+typedef enum {
+  FLOW_CLASSIFY_TABLE_IP4,
+  FLOW_CLASSIFY_TABLE_IP6,
+  FLOW_CLASSIFY_N_TABLES,
+} flow_classify_table_id_t;
+
+typedef enum {
+  FLOW_CLASSIFY_NEXT_INDEX_DROP,
+  FLOW_CLASSIFY_NEXT_INDEX_N_NEXT,
+} flow_classify_next_index_t;
+
+typedef struct {
+  /* Classifier table vectors */
+  u32 * classify_table_index_by_sw_if_index [FLOW_CLASSIFY_N_TABLES];
+
+  /* Convenience variables */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+  vnet_classify_main_t * vnet_classify_main;
+  vnet_config_main_t * vnet_config_main [FLOW_CLASSIFY_N_TABLES];
+} flow_classify_main_t;
+
+flow_classify_main_t flow_classify_main;
+
+int vnet_set_flow_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
+                                  u32 ip4_table_index, u32 ip6_table_index,
+                                  u32 is_add);
+
+#endif /* __included_vnet_flow_classify_h__ */
diff --git a/src/vnet/classify/flow_classify_node.c b/src/vnet/classify/flow_classify_node.c
new file mode 100644
index 00000000..d3261d33
--- /dev/null
+++ b/src/vnet/classify/flow_classify_node.c
@@ -0,0 +1,338 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdint.h>
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/classify/flow_classify.h>
+#include <vnet/classify/vnet_classify.h>
+
+typedef struct {
+  u32 sw_if_index;
+  u32 next_index;
+  u32 table_index;
+  u32 offset;
+} flow_classify_trace_t;
+
+static u8 *
+format_flow_classify_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  flow_classify_trace_t * t = va_arg (*args, flow_classify_trace_t *);
+
+  s = format (s, "FLOW_CLASSIFY: sw_if_index %d next %d table %d offset %d",
+              t->sw_if_index, t->next_index, t->table_index, t->offset);
+  return s;
+}
+
+#define foreach_flow_classify_error                 \
+_(MISS, "Flow classify misses")                     \
+_(HIT, "Flow classify hits")                        \
+_(CHAIN_HIT, "Flow classify hits after chain walk") \
+_(DROP, "Flow classify action drop")
+
+typedef enum {
+#define _(sym,str) FLOW_CLASSIFY_ERROR_##sym,
+  foreach_flow_classify_error
+#undef _
+  FLOW_CLASSIFY_N_ERROR,
+} flow_classify_error_t;
+
+static char * flow_classify_error_strings[] = {
+#define _(sym,string) string,
+  foreach_flow_classify_error
+#undef _
+};
+
+static inline uword
+flow_classify_inline (vlib_main_t * vm,
+                      vlib_node_runtime_t * node,
+                      vlib_frame_t * frame,
+                      flow_classify_table_id_t tid)
+{
+  u32 n_left_from, * from, * to_next;
+  flow_classify_next_index_t next_index;
+  flow_classify_main_t * fcm = &flow_classify_main;
+  vnet_classify_main_t * vcm = fcm->vnet_classify_main;
+  f64 now = vlib_time_now (vm);
+  u32 hits = 0;
+  u32 misses = 0;
+  u32 chain_hits = 0;
+  u32 drop = 0;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  /* First pass: compute hashes */
+  while (n_left_from > 2)
+    {
+      vlib_buffer_t * b0, * b1;
+      u32 bi0, bi1;
+      u8 * h0, * h1;
+      u32 sw_if_index0, sw_if_index1;
+      u32 table_index0, table_index1;
+      vnet_classify_table_t * t0, * t1;
+
+      /* Prefetch next iteration */
+      {
+        vlib_buffer_t * p1, * p2;
+
+        p1 = vlib_get_buffer (vm, from[1]);
+        p2 = vlib_get_buffer (vm, from[2]);
+
+        vlib_prefetch_buffer_header (p1, STORE);
+        CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE);
+        vlib_prefetch_buffer_header (p2, STORE);
+        CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+      }
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      h0 = b0->data;
+
+      bi1 = from[1];
+      b1 = vlib_get_buffer (vm, bi1);
+      h1 = b1->data;
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      table_index0 = fcm->classify_table_index_by_sw_if_index[tid][sw_if_index0];
+
+      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+      table_index1 = fcm->classify_table_index_by_sw_if_index[tid][sw_if_index1];
+
+      t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+      t1 = pool_elt_at_index (vcm->tables, table_index1);
+
+      vnet_buffer(b0)->l2_classify.hash =
+        vnet_classify_hash_packet (t0, (u8 *) h0);
+
+      vnet_classify_prefetch_bucket (t0, vnet_buffer(b0)->l2_classify.hash);
+
+      vnet_buffer(b1)->l2_classify.hash =
+        vnet_classify_hash_packet (t1, (u8 *) h1);
+
+      vnet_classify_prefetch_bucket (t1, vnet_buffer(b1)->l2_classify.hash);
+
+      vnet_buffer(b0)->l2_classify.table_index = table_index0;
+
+      vnet_buffer(b1)->l2_classify.table_index = table_index1;
+
+      from += 2;
+      n_left_from -= 2;
+    }
+
+  while (n_left_from > 0)
+    {
+      vlib_buffer_t * b0;
+      u32 bi0;
+      u8 * h0;
+      u32 sw_if_index0;
+      u32 table_index0;
+      vnet_classify_table_t * t0;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      h0 = b0->data;
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      table_index0 = fcm->classify_table_index_by_sw_if_index[tid][sw_if_index0];
+
+      t0 = pool_elt_at_index (vcm->tables, table_index0);
+      vnet_buffer(b0)->l2_classify.hash =
+        vnet_classify_hash_packet (t0, (u8 *) h0);
+
+      vnet_buffer(b0)->l2_classify.table_index = table_index0;
+      vnet_classify_prefetch_bucket (t0, vnet_buffer(b0)->l2_classify.hash);
+
+      from++;
+      n_left_from--;
+    }
+
+  next_index = node->cached_next_index;
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /* Not enough load/store slots to dual loop... */
+      while (n_left_from > 0 && n_left_to_next > 0)
+        {
+          u32 bi0;
+          vlib_buffer_t * b0;
+          u32 next0 = FLOW_CLASSIFY_NEXT_INDEX_DROP;
+          u32 table_index0;
+          vnet_classify_table_t * t0;
+          vnet_classify_entry_t * e0;
+          u64 hash0;
+          u8 * h0;
+
+          /* Stride 3 seems to work best */
+          if (PREDICT_TRUE (n_left_from > 3))
+            {
+              vlib_buffer_t * p1 = vlib_get_buffer(vm, from[3]);
+              vnet_classify_table_t * tp1;
+              u32 table_index1;
+              u64 phash1;
+
+              table_index1 = vnet_buffer(p1)->l2_classify.table_index;
+
+              if (PREDICT_TRUE (table_index1 != ~0))
+                {
+                  tp1 = pool_elt_at_index (vcm->tables, table_index1);
+                  phash1 = vnet_buffer(p1)->l2_classify.hash;
+                  vnet_classify_prefetch_entry (tp1, phash1);
+                }
+            }
+
+          /* Speculatively enqueue b0 to the current next frame */
+          bi0 = from[0];
+          to_next[0] = bi0;
+          from += 1;
+          to_next += 1;
+          n_left_from -= 1;
+          n_left_to_next -= 1;
+
+          b0 = vlib_get_buffer (vm, bi0);
+          h0 = b0->data;
+          table_index0 = vnet_buffer(b0)->l2_classify.table_index;
+          e0 = 0;
+          t0 = 0;
+
+          vnet_get_config_data (fcm->vnet_config_main[tid],
+                                &b0->current_config_index,
+                                &next0,
+                                /* # bytes of config data */ 0);
+
+          if (PREDICT_TRUE(table_index0 != ~0))
+            {
+              hash0 = vnet_buffer(b0)->l2_classify.hash;
+              t0 = pool_elt_at_index (vcm->tables, table_index0);
+              e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
+              if (e0)
+                {
+                  hits++;
+                }
+              else
+                {
+                  misses++;
+                  vnet_classify_add_del_session (vcm, table_index0,
+                                                 h0, ~0, 0, 0, 0, 0, 1);
+                  /* increment counter */
+                  vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
+                }
+            }
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+            {
+              flow_classify_trace_t * t =
+                vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->sw_if_index = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+              t->next_index = next0;
+              t->table_index = t0 ? t0 - vcm->tables : ~0;
+              t->offset = (t0 && e0) ? vnet_classify_get_offset (t0, e0): ~0;
+            }
+
+          /* Verify speculative enqueue, maybe switch current next frame */
+          vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+                                           n_left_to_next, bi0, next0);
+        }
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, node->node_index,
+                               FLOW_CLASSIFY_ERROR_MISS,
+                               misses);
+  vlib_node_increment_counter (vm, node->node_index,
+                               FLOW_CLASSIFY_ERROR_HIT,
+                               hits);
+  vlib_node_increment_counter (vm, node->node_index,
+                               FLOW_CLASSIFY_ERROR_CHAIN_HIT,
+                               chain_hits);
+  vlib_node_increment_counter (vm, node->node_index,
+                               FLOW_CLASSIFY_ERROR_DROP,
+                               drop);
+
+  return frame->n_vectors;
+}
+
+static uword
+ip4_flow_classify (vlib_main_t * vm,
+                   vlib_node_runtime_t * node,
+                   vlib_frame_t * frame)
+{
+  return flow_classify_inline(vm, node, frame, FLOW_CLASSIFY_TABLE_IP4);
+}
+
+VLIB_REGISTER_NODE (ip4_flow_classify_node) = {
+  .function = ip4_flow_classify,
+  .name = "ip4-flow-classify",
+  .vector_size = sizeof (u32),
+  .format_trace = format_flow_classify_trace,
+  .n_errors = ARRAY_LEN(flow_classify_error_strings),
+  .error_strings = flow_classify_error_strings,
+  .n_next_nodes = FLOW_CLASSIFY_NEXT_INDEX_N_NEXT,
+  .next_nodes = {
+    [FLOW_CLASSIFY_NEXT_INDEX_DROP] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_flow_classify_node, ip4_flow_classify);
+
+static uword
+ip6_flow_classify (vlib_main_t * vm,
+                   vlib_node_runtime_t * node,
+                   vlib_frame_t * frame)
+{
+  return flow_classify_inline(vm, node, frame, FLOW_CLASSIFY_TABLE_IP6);
+}
+
+VLIB_REGISTER_NODE (ip6_flow_classify_node) = {
+  .function = ip6_flow_classify,
+  .name = "ip6-flow-classify",
+  .vector_size = sizeof (u32),
+  .format_trace = format_flow_classify_trace,
+  .n_errors = ARRAY_LEN(flow_classify_error_strings),
+  .error_strings = flow_classify_error_strings,
+  .n_next_nodes = FLOW_CLASSIFY_NEXT_INDEX_N_NEXT,
+  .next_nodes = {
+    [FLOW_CLASSIFY_NEXT_INDEX_DROP] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_flow_classify_node, ip6_flow_classify);
+
+
+static clib_error_t *
+flow_classify_init (vlib_main_t *vm)
+{
+  flow_classify_main_t * fcm = &flow_classify_main;
+
+  fcm->vlib_main = vm;
+  fcm->vnet_main = vnet_get_main();
+  fcm->vnet_classify_main = &vnet_classify_main;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (flow_classify_init);
diff --git a/src/vnet/classify/input_acl.c b/src/vnet/classify/input_acl.c
new file mode 100644
index 00000000..c446f2d6
--- /dev/null
+++ b/src/vnet/classify/input_acl.c
@@ -0,0 +1,283 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/ip/ip.h>
+#include <vnet/classify/vnet_classify.h>
+#include <vnet/classify/input_acl.h>
+
+input_acl_main_t input_acl_main;
+
+static int
+vnet_inacl_ip_feature_enable (vlib_main_t * vnm,
+                              input_acl_main_t *am,
+                              u32 sw_if_index,
+                              input_acl_table_id_t tid,
+                              int feature_enable)
+{
+
+  if (tid == INPUT_ACL_TABLE_L2)
+    {
+      l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_ACL,
+                                  feature_enable);
+    }
+  else
+    { /* IP[46] */
+      vnet_feature_config_main_t *fcm;
+      u8 arc;
+
+      if (tid == INPUT_ACL_TABLE_IP4)
+	{
+	  vnet_feature_enable_disable ("ip4-unicast", "ip4-inacl",
+				       sw_if_index, feature_enable, 0, 0);
+	  arc = vnet_get_feature_arc_index ("ip4-unicast");
+	}
+      else
+	{
+	  vnet_feature_enable_disable ("ip6-unicast", "ip6-inacl",
+				       sw_if_index, feature_enable, 0, 0);
+	  arc = vnet_get_feature_arc_index ("ip6-unicast");
+	}
+
+      fcm = vnet_get_feature_arc_config_main (arc);
+      am->vnet_config_main[tid] = &fcm->config_main;
+    }
+
+  return 0;
+}
+
+int vnet_set_input_acl_intfc (vlib_main_t * vm, u32 sw_if_index,
+                              u32 ip4_table_index,
+                              u32 ip6_table_index,
+                              u32 l2_table_index, u32 is_add)
+{
+  input_acl_main_t * am = &input_acl_main;
+  vnet_classify_main_t * vcm = am->vnet_classify_main;
+  u32 acl[INPUT_ACL_N_TABLES] = {ip4_table_index, ip6_table_index,
+                                 l2_table_index};
+  u32 ti;
+
+  /* Assume that we've validated sw_if_index in the API layer */
+
+  for (ti = 0; ti < INPUT_ACL_N_TABLES; ti++)
+    {
+      if (acl[ti] == ~0)
+        continue;
+
+      if (pool_is_free_index (vcm->tables, acl[ti]))
+        return VNET_API_ERROR_NO_SUCH_TABLE;
+
+      vec_validate_init_empty
+        (am->classify_table_index_by_sw_if_index[ti], sw_if_index, ~0);
+
+      /* Reject any DEL operation with wrong sw_if_index */
+      if (!is_add &&
+          (acl[ti] != am->classify_table_index_by_sw_if_index[ti][sw_if_index]))
+        {
+          clib_warning ("Non-existent intf_idx=%d with table_index=%d for delete",
+                        sw_if_index, acl[ti]);
+          return VNET_API_ERROR_NO_SUCH_TABLE;
+        }
+
+      /* Return ok on ADD operaton if feature is already enabled */
+      if (is_add &&
+          am->classify_table_index_by_sw_if_index[ti][sw_if_index] != ~0)
+          return 0;
+
+      vnet_inacl_ip_feature_enable (vm, am, sw_if_index, ti, is_add);
+
+      if (is_add)
+        am->classify_table_index_by_sw_if_index[ti][sw_if_index] = acl[ti];
+      else
+        am->classify_table_index_by_sw_if_index[ti][sw_if_index] = ~0;
+    }
+
+  return 0;
+}
+
+static clib_error_t *
+set_input_acl_command_fn (vlib_main_t * vm,
+                          unformat_input_t * input,
+                          vlib_cli_command_t * cmd)
+{
+  vnet_main_t * vnm = vnet_get_main();
+  u32 sw_if_index = ~0;
+  u32 ip4_table_index = ~0;
+  u32 ip6_table_index = ~0;
+  u32 l2_table_index = ~0;
+  u32 is_add = 1;
+  u32 idx_cnt = 0;
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "intfc %U", unformat_vnet_sw_interface,
+                    vnm, &sw_if_index))
+        ;
+      else if (unformat (input, "ip4-table %d", &ip4_table_index))
+        idx_cnt++;
+      else if (unformat (input, "ip6-table %d", &ip6_table_index))
+        idx_cnt++;
+      else if (unformat (input, "l2-table %d", &l2_table_index))
+        idx_cnt++;
+      else if (unformat (input, "del"))
+        is_add = 0;
+      else
+        break;
+    }
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "Interface must be specified.");
+
+  if (!idx_cnt)
+    return clib_error_return (0, "Table index should be specified.");
+
+  if (idx_cnt > 1)
+    return clib_error_return (0, "Only one table index per API is allowed.");
+
+  rv = vnet_set_input_acl_intfc (vm, sw_if_index, ip4_table_index,
+                                 ip6_table_index, l2_table_index, is_add);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case VNET_API_ERROR_NO_MATCHING_INTERFACE:
+      return clib_error_return (0, "No such interface");
+
+    case VNET_API_ERROR_NO_SUCH_ENTRY:
+      return clib_error_return (0, "No such classifier table");
+    }
+  return 0;
+}
+
+/*
+ * Configure interface to enable/disble input ACL feature:
+ * intfc - interface name to be configured as input ACL
+ * Ip4-table <index> [del] - enable/disable IP4 input ACL
+ * Ip6-table <index> [del] - enable/disable IP6 input ACL
+ * l2-table <index> [del] - enable/disable Layer2 input ACL
+ *
+ * Note: Only one table index per API call is allowed.
+ *
+ */
+VLIB_CLI_COMMAND (set_input_acl_command, static) = {
+    .path = "set interface input acl",
+    .short_help =
+    "set interface input acl intfc <int> [ip4-table <index>]\n"
+    "  [ip6-table <index>] [l2-table <index>] [del]",
+    .function = set_input_acl_command_fn,
+};
+
+clib_error_t *input_acl_init (vlib_main_t *vm)
+{
+  input_acl_main_t * am = &input_acl_main;
+  clib_error_t * error = 0;
+
+  if ((error = vlib_call_init_function (vm, ip_inacl_init)))
+    return error;
+
+  am->vlib_main = vm;
+  am->vnet_main = vnet_get_main();
+  am->vnet_classify_main = &vnet_classify_main;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (input_acl_init);
+
+uword unformat_acl_type (unformat_input_t * input, va_list * args)
+{
+  u32 * acl_type = va_arg (*args, u32 *);
+  u32 tid = INPUT_ACL_N_TABLES;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "ip4"))
+      tid = INPUT_ACL_TABLE_IP4;
+    else if (unformat (input, "ip6"))
+      tid = INPUT_ACL_TABLE_IP6;
+    else if (unformat (input, "l2"))
+      tid = INPUT_ACL_TABLE_L2;
+    else
+      break;
+  }
+
+  *acl_type = tid;
+  return 1;
+}
+
+u8 * format_vnet_inacl_info (u8 * s, va_list * va)
+{
+  input_acl_main_t * am = va_arg (*va, input_acl_main_t *);
+  int sw_if_idx = va_arg (*va, int);
+  u32 tid = va_arg (*va, u32);
+
+  if (tid == ~0)
+    {
+      s = format (s, "%10s%20s\t\t%s", "Intfc idx", "Classify table",
+                  "Interface name");
+      return s;
+    }
+
+  s = format (s, "%10d%20d\t\t%U", sw_if_idx, tid,
+              format_vnet_sw_if_index_name, am->vnet_main, sw_if_idx);
+
+  return s;
+}
+
+static clib_error_t *
+show_inacl_command_fn (vlib_main_t * vm,
+                       unformat_input_t * input,
+                       vlib_cli_command_t * cmd)
+{
+  input_acl_main_t * am = &input_acl_main;
+  u32 type = INPUT_ACL_N_TABLES;
+  int i;
+  u32 * vec_tbl;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "type %U", unformat_acl_type, &type))
+        ;
+      else
+        break;
+    }
+
+  if (type == INPUT_ACL_N_TABLES)
+    return clib_error_return (0, "Invalid input ACL table type.");
+
+  vec_tbl = am->classify_table_index_by_sw_if_index[type];
+
+  if (vec_len(vec_tbl))
+    vlib_cli_output (vm, "%U", format_vnet_inacl_info, am, ~0 /* hdr */, ~0);
+  else
+    vlib_cli_output (vm, "No input ACL tables configured");
+
+  for (i = 0; i < vec_len (vec_tbl); i++)
+    {
+      if (vec_elt(vec_tbl, i) == ~0)
+        continue;
+
+      vlib_cli_output (vm, "%U", format_vnet_inacl_info,
+                       am, i, vec_elt(vec_tbl, i));
+    }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (show_inacl_command, static) = {
+    .path = "show inacl",
+    .short_help = "show inacl type [ip4|ip6|l2]",
+    .function = show_inacl_command_fn,
+};
diff --git a/src/vnet/classify/input_acl.h b/src/vnet/classify/input_acl.h
new file mode 100644
index 00000000..7ffc189f
--- /dev/null
+++ b/src/vnet/classify/input_acl.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __included_vnet_input_acl_h__
+#define __included_vnet_input_acl_h__
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/classify/vnet_classify.h>
+
+typedef enum {
+  INPUT_ACL_TABLE_IP4,
+  INPUT_ACL_TABLE_IP6,
+  INPUT_ACL_TABLE_L2,
+  INPUT_ACL_N_TABLES,
+} input_acl_table_id_t;
+
+typedef enum {
+  ACL_NEXT_INDEX_DENY,
+  ACL_NEXT_INDEX_N_NEXT,
+} acl_next_index_t;
+
+typedef struct {
+
+  /* classifier table vectors */
+  u32 * classify_table_index_by_sw_if_index [INPUT_ACL_N_TABLES];
+
+  /* convenience variables */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+  vnet_classify_main_t * vnet_classify_main;
+  vnet_config_main_t * vnet_config_main [INPUT_ACL_N_TABLES];
+} input_acl_main_t;
+
+extern input_acl_main_t input_acl_main;
+
+int vnet_set_input_acl_intfc (vlib_main_t * vm, u32 sw_if_index,
+                              u32 ip4_table_index,
+                              u32 ip6_table_index,
+                              u32 l2_table_index, u32 is_add);
+
+#endif /* __included_vnet_input_acl_h__ */
diff --git a/src/vnet/classify/ip_classify.c b/src/vnet/classify/ip_classify.c
new file mode 100644
index 00000000..44973ae5
--- /dev/null
+++ b/src/vnet/classify/ip_classify.c
@@ -0,0 +1,365 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>	/* for ethernet_header_t */
+#include <vnet/classify/vnet_classify.h>
+#include <vnet/dpo/classify_dpo.h>
+
+typedef struct {
+  u32 next_index;
+  u32 table_index;
+  u32 entry_index;
+} ip_classify_trace_t;
+
+/* packet trace format function */
+static u8 * format_ip_classify_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip_classify_trace_t * t = va_arg (*args, ip_classify_trace_t *);
+  
+  s = format (s, "IP_CLASSIFY: next_index %d, table %d, entry %d",
+              t->next_index, t->table_index, t->entry_index);
+  return s;
+}
+
+vlib_node_registration_t ip4_classify_node;
+vlib_node_registration_t ip6_classify_node;
+
+#define foreach_ip_classify_error               \
+_(MISS, "Classify misses")                      \
+_(HIT, "Classify hits")                         \
+_(CHAIN_HIT, "Classify hits after chain walk")
+
+typedef enum {
+#define _(sym,str) IP_CLASSIFY_ERROR_##sym,
+  foreach_ip_classify_error
+#undef _
+  IP_CLASSIFY_N_ERROR,
+} ip_classify_error_t;
+
+static char * ip_classify_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ip_classify_error
+#undef _
+};
+
+static inline uword
+ip_classify_inline (vlib_main_t * vm,
+                    vlib_node_runtime_t * node,
+                    vlib_frame_t * frame, int is_ip4)
+{
+  u32 n_left_from, * from, * to_next;
+  ip_lookup_next_t next_index;
+  vnet_classify_main_t * vcm = &vnet_classify_main;
+  f64 now = vlib_time_now (vm);
+  u32 hits = 0;
+  u32 misses = 0;
+  u32 chain_hits = 0;
+  u32 n_next;
+
+  if (is_ip4) {
+    n_next = IP4_LOOKUP_N_NEXT;
+  } else {
+    n_next = IP6_LOOKUP_N_NEXT;
+  }
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  /* First pass: compute hashes */
+
+  while (n_left_from > 2)
+    {
+      vlib_buffer_t * b0, * b1;
+      u32 bi0, bi1;
+      u8 * h0, * h1;
+      u32 cd_index0, cd_index1;
+      classify_dpo_t *cd0, * cd1;
+      u32 table_index0, table_index1;
+      vnet_classify_table_t * t0, * t1;
+
+      /* prefetch next iteration */
+        {
+          vlib_buffer_t * p1, * p2;
+          
+          p1 = vlib_get_buffer (vm, from[1]);
+          p2 = vlib_get_buffer (vm, from[2]);
+          
+          vlib_prefetch_buffer_header (p1, STORE);
+          CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE);
+          vlib_prefetch_buffer_header (p2, STORE);
+          CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+        }
+        
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      h0 = (void *)vlib_buffer_get_current(b0) -
+                ethernet_buffer_header_size(b0);
+
+      bi1 = from[1];
+      b1 = vlib_get_buffer (vm, bi1);
+      h1 = (void *)vlib_buffer_get_current(b1) -
+                ethernet_buffer_header_size(b1);
+        
+      cd_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
+      cd0 = classify_dpo_get(cd_index0);
+      table_index0 = cd0->cd_table_index;
+
+      cd_index1 = vnet_buffer (b1)->ip.adj_index[VLIB_TX];
+      cd1 = classify_dpo_get(cd_index1);
+      table_index1 = cd1->cd_table_index;
+
+      t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+      t1 = pool_elt_at_index (vcm->tables, table_index1);
+            
+      vnet_buffer(b0)->l2_classify.hash = 
+        vnet_classify_hash_packet (t0, (u8 *) h0);
+
+      vnet_classify_prefetch_bucket (t0, vnet_buffer(b0)->l2_classify.hash);
+
+      vnet_buffer(b1)->l2_classify.hash = 
+        vnet_classify_hash_packet (t1, (u8 *) h1);
+
+      vnet_classify_prefetch_bucket (t1, vnet_buffer(b1)->l2_classify.hash);
+
+      vnet_buffer(b0)->l2_classify.table_index = table_index0;
+
+      vnet_buffer(b1)->l2_classify.table_index = table_index1;
+
+      from += 2;
+      n_left_from -= 2;
+    }
+
+  while (n_left_from > 0)
+    {
+      vlib_buffer_t * b0;
+      u32 bi0;
+      u8 * h0;
+      u32 cd_index0;
+      classify_dpo_t *cd0;
+      u32 table_index0;
+      vnet_classify_table_t * t0;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      h0 = (void *)vlib_buffer_get_current(b0) -
+                ethernet_buffer_header_size(b0);
+        
+      cd_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
+      cd0 = classify_dpo_get(cd_index0);
+      table_index0 = cd0->cd_table_index;
+
+      t0 = pool_elt_at_index (vcm->tables, table_index0);
+      vnet_buffer(b0)->l2_classify.hash = 
+        vnet_classify_hash_packet (t0, (u8 *) h0);
+
+      vnet_buffer(b0)->l2_classify.table_index = table_index0;
+      vnet_classify_prefetch_bucket (t0, vnet_buffer(b0)->l2_classify.hash);
+
+      from++;
+      n_left_from--;
+    }
+        
+  next_index = node->cached_next_index;
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      /* Not enough load/store slots to dual loop... */
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+          u32 bi0;
+	  vlib_buffer_t * b0;
+          u32 next0 = IP_LOOKUP_NEXT_DROP;
+          u32 table_index0;
+          vnet_classify_table_t * t0;
+          vnet_classify_entry_t * e0;
+          u64 hash0;
+          u8 * h0;
+
+          /* Stride 3 seems to work best */
+          if (PREDICT_TRUE (n_left_from > 3))
+            {
+              vlib_buffer_t * p1 = vlib_get_buffer(vm, from[3]);
+              vnet_classify_table_t * tp1;
+              u32 table_index1;
+              u64 phash1;
+
+              table_index1 = vnet_buffer(p1)->l2_classify.table_index;
+              
+              if (PREDICT_TRUE (table_index1 != ~0))
+                {
+                  tp1 = pool_elt_at_index (vcm->tables, table_index1);
+                  phash1 = vnet_buffer(p1)->l2_classify.hash;
+                  vnet_classify_prefetch_entry (tp1, phash1); 
+                }
+            }
+
+          /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+          h0 = b0->data;
+          table_index0 = vnet_buffer(b0)->l2_classify.table_index;
+          e0 = 0;
+          t0 = 0;
+          vnet_buffer(b0)->l2_classify.opaque_index = ~0;
+
+          if (PREDICT_TRUE(table_index0 != ~0))
+            {
+              hash0 = vnet_buffer(b0)->l2_classify.hash;
+              t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+              e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0,
+                                             now);
+              if (e0)
+                {
+                  vnet_buffer(b0)->l2_classify.opaque_index
+                    = e0->opaque_index;
+                  vlib_buffer_advance (b0, e0->advance);
+                  next0 = (e0->next_index < node->n_next_nodes)?
+                           e0->next_index:next0;
+                  hits++;
+                }
+              else
+                {
+                  while (1)
+                    {
+                      if (t0->next_table_index != ~0)
+                        t0 = pool_elt_at_index (vcm->tables,
+                                                t0->next_table_index);
+                      else
+                        {
+                          next0 = (t0->miss_next_index < n_next) ?
+                                   t0->miss_next_index : next0;
+                          misses++;
+                          break;
+                        }
+
+                      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
+                      e0 = vnet_classify_find_entry
+                        (t0, (u8 *) h0, hash0, now);
+                      if (e0)
+                        {
+                          vnet_buffer(b0)->l2_classify.opaque_index
+                            = e0->opaque_index;
+                          vlib_buffer_advance (b0, e0->advance);
+                          next0 = (e0->next_index < node->n_next_nodes)?
+                                   e0->next_index:next0;
+                          hits++;
+                          chain_hits++;
+                          break;
+                        }
+                    }
+                }
+            }
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              ip_classify_trace_t *t = 
+                vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->next_index = next0;
+              t->table_index = t0 ? t0 - vcm->tables : ~0;
+              t->entry_index = e0 ? e0 - t0->entries : ~0;
+            }
+
+          /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, node->node_index, 
+                               IP_CLASSIFY_ERROR_MISS, 
+                               misses);
+  vlib_node_increment_counter (vm, node->node_index, 
+                               IP_CLASSIFY_ERROR_HIT, 
+                               hits);
+  vlib_node_increment_counter (vm, node->node_index, 
+                               IP_CLASSIFY_ERROR_CHAIN_HIT, 
+                               chain_hits);
+  return frame->n_vectors;
+}
+
+static uword
+ip4_classify (vlib_main_t * vm,
+              vlib_node_runtime_t * node,
+              vlib_frame_t * frame)
+{
+  return ip_classify_inline (vm, node, frame, 1 /* is_ip4 */);
+}
+
+
+VLIB_REGISTER_NODE (ip4_classify_node) = {
+  .function = ip4_classify,
+  .name = "ip4-classify",
+  .vector_size = sizeof (u32),
+  .sibling_of = "ip4-lookup",
+  .format_trace = format_ip_classify_trace,
+  .n_errors = ARRAY_LEN(ip_classify_error_strings),
+  .error_strings = ip_classify_error_strings,
+
+  .n_next_nodes = 0,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_classify_node, ip4_classify)
+
+static uword
+ip6_classify (vlib_main_t * vm,
+              vlib_node_runtime_t * node,
+              vlib_frame_t * frame)
+{
+  return ip_classify_inline (vm, node, frame, 0 /* is_ip4 */);
+}
+
+
+VLIB_REGISTER_NODE (ip6_classify_node) = {
+  .function = ip6_classify,
+  .name = "ip6-classify",
+  .vector_size = sizeof (u32),
+  .sibling_of = "ip6-lookup",
+  .format_trace = format_ip_classify_trace,
+  .n_errors = ARRAY_LEN(ip_classify_error_strings),
+  .error_strings = ip_classify_error_strings,
+
+  .n_next_nodes = 0,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_classify_node, ip6_classify)
+
+static clib_error_t *
+ip_classify_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ip_classify_init);
diff --git a/src/vnet/classify/policer_classify.c b/src/vnet/classify/policer_classify.c
new file mode 100644
index 00000000..569234fb
--- /dev/null
+++ b/src/vnet/classify/policer_classify.c
@@ -0,0 +1,227 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/classify/policer_classify.h>
+
+static void
+vnet_policer_classify_feature_enable (vlib_main_t * vnm,
+                                      policer_classify_main_t * pcm,
+                                      u32 sw_if_index,
+                                      policer_classify_table_id_t tid,
+                                      int feature_enable)
+{
+  if (tid == POLICER_CLASSIFY_TABLE_L2)
+    {
+      l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_POLICER_CLAS,
+                                  feature_enable);
+    }
+  else
+    {
+      vnet_feature_config_main_t * fcm;
+      u8 arc;
+
+      if (tid == POLICER_CLASSIFY_TABLE_IP4)
+	{
+	  vnet_feature_enable_disable ("ip4-unicast", "ip4-policer-classify",
+				       sw_if_index, feature_enable, 0, 0);
+	  arc = vnet_get_feature_arc_index ("ip4-unicast");
+	}
+      
+      else
+	{
+	  vnet_feature_enable_disable ("ip6-unicast", "ip6-policer-classify",
+				       sw_if_index, feature_enable, 0, 0);
+	  arc = vnet_get_feature_arc_index ("ip6-unicast");
+	}
+
+      fcm = vnet_get_feature_arc_config_main (arc);
+      pcm->vnet_config_main[tid] = &fcm->config_main;
+    }
+}
+
+int vnet_set_policer_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
+                                     u32 ip4_table_index, u32 ip6_table_index,
+                                     u32 l2_table_index, u32 is_add)
+{
+  policer_classify_main_t * pcm = &policer_classify_main;
+  vnet_classify_main_t * vcm = pcm->vnet_classify_main;
+  u32 pct[POLICER_CLASSIFY_N_TABLES] = {ip4_table_index, ip6_table_index,
+                                        l2_table_index};
+  u32 ti;
+
+  /* Assume that we've validated sw_if_index in the API layer */
+
+  for (ti = 0; ti < POLICER_CLASSIFY_N_TABLES; ti++)
+    {
+      if (pct[ti] == ~0)
+        continue;
+
+      if (pool_is_free_index (vcm->tables, pct[ti]))
+        return VNET_API_ERROR_NO_SUCH_TABLE;
+
+      vec_validate_init_empty
+        (pcm->classify_table_index_by_sw_if_index[ti], sw_if_index, ~0);
+
+      /* Reject any DEL operation with wrong sw_if_index */
+      if (!is_add &&
+          (pct[ti] != pcm->classify_table_index_by_sw_if_index[ti][sw_if_index]))
+        {
+          clib_warning ("Non-existent intf_idx=%d with table_index=%d for delete",
+                        sw_if_index, pct[ti]);
+          return VNET_API_ERROR_NO_SUCH_TABLE;
+        }
+
+      /* Return ok on ADD operaton if feature is already enabled */
+      if (is_add &&
+          pcm->classify_table_index_by_sw_if_index[ti][sw_if_index] != ~0)
+          return 0;
+
+      vnet_policer_classify_feature_enable (vm, pcm, sw_if_index, ti, is_add);
+
+      if (is_add)
+        pcm->classify_table_index_by_sw_if_index[ti][sw_if_index] = pct[ti];
+      else
+        pcm->classify_table_index_by_sw_if_index[ti][sw_if_index] = ~0;
+    }
+
+
+  return 0;
+}
+
+static clib_error_t *
+set_policer_classify_command_fn (vlib_main_t * vm,
+                                 unformat_input_t * input,
+                                 vlib_cli_command_t * cmd)
+{
+  vnet_main_t * vnm = vnet_get_main();
+  u32 sw_if_index = ~0;
+  u32 ip4_table_index = ~0;
+  u32 ip6_table_index = ~0;
+  u32 l2_table_index = ~0;
+  u32 is_add = 1;
+  u32 idx_cnt = 0;
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "interface %U", unformat_vnet_sw_interface,
+                    vnm, &sw_if_index))
+        ;
+      else if (unformat (input, "ip4-table %d", &ip4_table_index))
+        idx_cnt++;
+      else if (unformat (input, "ip6-table %d", &ip6_table_index))
+        idx_cnt++;
+      else if (unformat (input, "l2-table %d", &l2_table_index))
+        idx_cnt++;
+      else if (unformat (input, "del"))
+        is_add = 0;
+      else
+        break;
+    }
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "Interface must be specified.");
+
+  if (!idx_cnt)
+    return clib_error_return (0, "Table index should be specified.");
+
+  if (idx_cnt > 1)
+    return clib_error_return (0, "Only one table index per API is allowed.");
+
+  rv = vnet_set_policer_classify_intfc(vm, sw_if_index, ip4_table_index,
+                                       ip6_table_index, l2_table_index, is_add);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case VNET_API_ERROR_NO_MATCHING_INTERFACE:
+      return clib_error_return (0, "No such interface");
+
+    case VNET_API_ERROR_NO_SUCH_ENTRY:
+      return clib_error_return (0, "No such classifier table");
+    }
+  return 0;
+}
+
+VLIB_CLI_COMMAND (set_policer_classify_command, static) = {
+    .path = "set policer classify",
+    .short_help =
+    "set policer classify interface <int> [ip4-table <index>]\n"
+    "  [ip6-table <index>] [l2-table <index>] [del]",
+    .function = set_policer_classify_command_fn,
+};
+
+static uword
+unformat_table_type (unformat_input_t * input, va_list * va)
+{
+  u32 * r = va_arg (*va, u32 *);
+  u32 tid;
+
+  if (unformat (input, "ip4"))
+    tid = POLICER_CLASSIFY_TABLE_IP4;
+  else if (unformat (input, "ip6"))
+    tid = POLICER_CLASSIFY_TABLE_IP6;
+  else if (unformat (input, "l2"))
+    tid = POLICER_CLASSIFY_TABLE_L2;
+  else
+    return 0;
+
+  *r = tid;
+  return 1;
+}
+static clib_error_t *
+show_policer_classify_command_fn (vlib_main_t * vm,
+                                  unformat_input_t * input,
+                                  vlib_cli_command_t * cmd)
+{
+  policer_classify_main_t * pcm = &policer_classify_main;
+  u32 type = POLICER_CLASSIFY_N_TABLES;
+  u32 * vec_tbl;
+  int i;
+
+  if (unformat (input, "type %U", unformat_table_type, &type))
+    ;
+  else
+    return clib_error_return (0, "Type must be specified.");;
+
+  if (type == POLICER_CLASSIFY_N_TABLES)
+    return clib_error_return (0, "Invalid table type.");
+
+  vec_tbl = pcm->classify_table_index_by_sw_if_index[type];
+
+  if (vec_len(vec_tbl))
+      vlib_cli_output (vm, "%10s%20s\t\t%s", "Intfc idx", "Classify table",
+                       "Interface name");
+  else
+    vlib_cli_output (vm, "No tables configured.");
+
+  for (i = 0; i < vec_len (vec_tbl); i++)
+    {
+      if (vec_elt(vec_tbl, i) == ~0)
+        continue;
+
+      vlib_cli_output (vm, "%10d%20d\t\t%U", i, vec_elt(vec_tbl, i),
+                       format_vnet_sw_if_index_name, pcm->vnet_main, i);
+    }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (show_policer_classify_command, static) = {
+    .path = "show classify policer",
+    .short_help = "show classify policer type [ip4|ip6|l2]",
+    .function = show_policer_classify_command_fn,
+};
diff --git a/src/vnet/classify/policer_classify.h b/src/vnet/classify/policer_classify.h
new file mode 100644
index 00000000..30656444
--- /dev/null
+++ b/src/vnet/classify/policer_classify.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __included_vnet_policer_classify_h__
+#define __included_vnet_policer_classify_h__
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/classify/vnet_classify.h>
+
+typedef enum {
+  POLICER_CLASSIFY_TABLE_IP4,
+  POLICER_CLASSIFY_TABLE_IP6,
+  POLICER_CLASSIFY_TABLE_L2,
+  POLICER_CLASSIFY_N_TABLES,
+} policer_classify_table_id_t;
+
+typedef enum {
+  POLICER_CLASSIFY_NEXT_INDEX_DROP,
+  POLICER_CLASSIFY_NEXT_INDEX_N_NEXT,
+} policer_classify_next_index_t;
+
+typedef struct {
+  /* Classifier table vectors */
+  u32 * classify_table_index_by_sw_if_index [POLICER_CLASSIFY_N_TABLES];
+
+  /* L2 next nodes for each feature */
+  u32 feat_next_node_index[32];
+
+  /* Convenience variables */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+  vnet_classify_main_t * vnet_classify_main;
+  vnet_config_main_t * vnet_config_main [POLICER_CLASSIFY_N_TABLES];
+} policer_classify_main_t;
+
+policer_classify_main_t policer_classify_main;
+
+int vnet_set_policer_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
+                                     u32 ip4_table_index, u32 ip6_table_index,
+                                     u32 l2_table_index, u32 is_add);
+
+#endif /* __included_vnet_policer_classify_h__ */
diff --git a/src/vnet/classify/vnet_classify.c b/src/vnet/classify/vnet_classify.c
new file mode 100644
index 00000000..ce38f9f1
--- /dev/null
+++ b/src/vnet/classify/vnet_classify.c
@@ -0,0 +1,2436 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/classify/vnet_classify.h>
+#include <vnet/classify/input_acl.h>
+#include <vnet/ip/ip.h>
+#include <vnet/api_errno.h>     /* for API error numbers */
+#include <vnet/l2/l2_classify.h> /* for L2_INPUT_CLASSIFY_NEXT_xxx */
+#include <vnet/fib/fib_table.h>
+
+vnet_classify_main_t vnet_classify_main;
+
+#if VALIDATION_SCAFFOLDING
+/* Validation scaffolding */
+void mv (vnet_classify_table_t * t)
+{
+  void * oldheap;
+
+  oldheap = clib_mem_set_heap (t->mheap);
+  clib_mem_validate();
+  clib_mem_set_heap (oldheap);
+}
+
+void rogue (vnet_classify_table_t * t)
+{
+  int i, j, k;
+  vnet_classify_entry_t * v, * save_v;
+  u32 active_elements = 0;
+  vnet_classify_bucket_t * b;
+  
+  for (i = 0; i < t->nbuckets; i++)
+    {
+      b = &t->buckets [i];
+      if (b->offset == 0)
+        continue;
+      save_v = vnet_classify_get_entry (t, b->offset);
+      for (j = 0; j < (1<<b->log2_pages); j++)
+        {
+          for (k = 0; k < t->entries_per_page; k++)
+            {
+              v = vnet_classify_entry_at_index 
+                (t, save_v, j*t->entries_per_page + k);
+
+              if (vnet_classify_entry_is_busy (v))
+                active_elements++;
+            }
+        }
+    }
+
+  if (active_elements != t->active_elements)
+    clib_warning ("found %u expected %u elts", active_elements, 
+                  t->active_elements);
+}
+#else
+void mv (vnet_classify_table_t * t) { }
+void rogue (vnet_classify_table_t * t) { }
+#endif
+
+void vnet_classify_register_unformat_l2_next_index_fn (unformat_function_t * fn)
+{
+  vnet_classify_main_t * cm = &vnet_classify_main;
+
+  vec_add1 (cm->unformat_l2_next_index_fns, fn);
+}
+
+void vnet_classify_register_unformat_ip_next_index_fn (unformat_function_t * fn)
+{
+  vnet_classify_main_t * cm = &vnet_classify_main;
+
+  vec_add1 (cm->unformat_ip_next_index_fns, fn);
+}
+
+void 
+vnet_classify_register_unformat_acl_next_index_fn (unformat_function_t * fn)
+{
+  vnet_classify_main_t * cm = &vnet_classify_main;
+
+  vec_add1 (cm->unformat_acl_next_index_fns, fn);
+}
+
+void
+vnet_classify_register_unformat_policer_next_index_fn (unformat_function_t * fn)
+{
+  vnet_classify_main_t * cm = &vnet_classify_main;
+
+  vec_add1 (cm->unformat_policer_next_index_fns, fn);
+}
+
+void vnet_classify_register_unformat_opaque_index_fn (unformat_function_t * fn)
+{
+  vnet_classify_main_t * cm = &vnet_classify_main;
+
+  vec_add1 (cm->unformat_opaque_index_fns, fn);
+}
+
+vnet_classify_table_t * 
+vnet_classify_new_table (vnet_classify_main_t *cm,
+                         u8 * mask, u32 nbuckets, u32 memory_size,
+                         u32 skip_n_vectors,
+                         u32 match_n_vectors)
+{
+  vnet_classify_table_t * t;
+  void * oldheap;
+    
+  nbuckets = 1 << (max_log2 (nbuckets));
+
+  pool_get_aligned (cm->tables, t, CLIB_CACHE_LINE_BYTES);
+  memset(t, 0, sizeof (*t));
+  
+  vec_validate_aligned (t->mask, match_n_vectors - 1, sizeof(u32x4));
+  clib_memcpy (t->mask, mask, match_n_vectors * sizeof (u32x4));
+
+  t->next_table_index = ~0;
+  t->nbuckets = nbuckets;
+  t->log2_nbuckets = max_log2 (nbuckets);
+  t->match_n_vectors = match_n_vectors;
+  t->skip_n_vectors = skip_n_vectors;
+  t->entries_per_page = 2;
+
+  t->mheap = mheap_alloc (0 /* use VM */, memory_size);
+
+  vec_validate_aligned (t->buckets, nbuckets - 1, CLIB_CACHE_LINE_BYTES);
+  oldheap = clib_mem_set_heap (t->mheap);
+
+  t->writer_lock = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, 
+                                           CLIB_CACHE_LINE_BYTES);
+  t->writer_lock[0] = 0;
+
+  clib_mem_set_heap (oldheap);
+  return (t);
+}
+
+void vnet_classify_delete_table_index (vnet_classify_main_t *cm, 
+                                       u32 table_index, int del_chain)
+{
+  vnet_classify_table_t * t;
+
+  /* Tolerate multiple frees, up to a point */
+  if (pool_is_free_index (cm->tables, table_index))
+    return;
+
+  t = pool_elt_at_index (cm->tables, table_index);
+  if (del_chain && t->next_table_index != ~0)
+    /* Recursively delete the entire chain */
+    vnet_classify_delete_table_index (cm, t->next_table_index, del_chain);
+
+  vec_free (t->mask);
+  vec_free (t->buckets);
+  mheap_free (t->mheap);
+  
+  pool_put (cm->tables, t);
+}
+
+static vnet_classify_entry_t *
+vnet_classify_entry_alloc (vnet_classify_table_t * t, u32 log2_pages)
+{
+  vnet_classify_entry_t * rv = 0;
+#define _(size)                                 \
+  vnet_classify_entry_##size##_t * rv##size = 0;
+  foreach_size_in_u32x4;
+#undef _
+  
+  void * oldheap;
+
+  ASSERT (t->writer_lock[0]);
+  if (log2_pages >= vec_len (t->freelists) || t->freelists [log2_pages] == 0)
+    {
+      oldheap = clib_mem_set_heap (t->mheap);
+      
+      vec_validate (t->freelists, log2_pages);
+
+      switch(t->match_n_vectors)
+        {
+          /* Euchre the vector allocator into allocating the right sizes */
+#define _(size)                                                         \
+        case size:                                                      \
+          vec_validate_aligned                                          \
+            (rv##size, ((1<<log2_pages)*t->entries_per_page) - 1,       \
+          CLIB_CACHE_LINE_BYTES);                                       \
+          rv = (vnet_classify_entry_t *) rv##size;                      \
+          break;
+          foreach_size_in_u32x4;
+#undef _
+
+        default:
+          abort();
+        }
+      
+      clib_mem_set_heap (oldheap);
+      goto initialize;
+    }
+  rv = t->freelists[log2_pages];
+  t->freelists[log2_pages] = rv->next_free;
+  
+initialize:
+  ASSERT(rv);
+  ASSERT (vec_len(rv) == (1<<log2_pages)*t->entries_per_page);
+
+  switch (t->match_n_vectors)
+    {
+#define _(size)                                                         \
+    case size:                                                          \
+      if(vec_len(rv)) 							\
+        memset (rv, 0xff, sizeof (*rv##size) * vec_len(rv));            \
+      break;
+      foreach_size_in_u32x4;
+#undef _
+      
+    default:
+      abort();
+    }
+  
+  return rv;
+}
+
+static void
+vnet_classify_entry_free (vnet_classify_table_t * t,
+                          vnet_classify_entry_t * v)
+{
+    u32 free_list_index;
+
+    ASSERT (t->writer_lock[0]);
+
+    free_list_index = min_log2(vec_len(v)/t->entries_per_page);
+
+    ASSERT(vec_len (t->freelists) > free_list_index);
+
+    v->next_free = t->freelists[free_list_index];
+    t->freelists[free_list_index] = v;
+}
+
+static inline void make_working_copy
+(vnet_classify_table_t * t, vnet_classify_bucket_t * b)
+{
+  vnet_classify_entry_t * v;
+  vnet_classify_bucket_t working_bucket __attribute__((aligned (8)));
+  void * oldheap;
+  vnet_classify_entry_t * working_copy;
+#define _(size)                                 \
+  vnet_classify_entry_##size##_t * working_copy##size = 0;
+  foreach_size_in_u32x4;
+#undef _
+  u32 cpu_number = os_get_cpu_number();
+
+  if (cpu_number >= vec_len (t->working_copies))
+    {
+      oldheap = clib_mem_set_heap (t->mheap);
+      vec_validate (t->working_copies, cpu_number);
+      clib_mem_set_heap (oldheap);
+    }
+
+  /* 
+   * working_copies are per-cpu so that near-simultaneous
+   * updates from multiple threads will not result in sporadic, spurious
+   * lookup failures. 
+   */
+  working_copy = t->working_copies[cpu_number];
+
+  t->saved_bucket.as_u64 = b->as_u64;
+  oldheap = clib_mem_set_heap (t->mheap);
+
+  if ((1<<b->log2_pages)*t->entries_per_page > vec_len (working_copy))
+    {
+      switch(t->match_n_vectors)
+        {
+          /* Euchre the vector allocator into allocating the right sizes */
+#define _(size)                                                         \
+        case size:                                                      \
+          working_copy##size = (void *) working_copy;                   \
+          vec_validate_aligned                                          \
+            (working_copy##size, 					\
+             ((1<<b->log2_pages)*t->entries_per_page) - 1,              \
+             CLIB_CACHE_LINE_BYTES);                                    \
+          working_copy = (void *) working_copy##size;                   \
+            break;
+        foreach_size_in_u32x4;
+#undef _
+
+        default:
+          abort();
+        }
+      t->working_copies[cpu_number] = working_copy;
+    }
+
+  _vec_len(working_copy) = (1<<b->log2_pages)*t->entries_per_page;
+  clib_mem_set_heap (oldheap);
+
+  v = vnet_classify_get_entry (t, b->offset);
+  
+  switch(t->match_n_vectors)
+    {
+#define _(size)                                         \
+    case size:                                          \
+      clib_memcpy (working_copy, v,                          \
+              sizeof (vnet_classify_entry_##size##_t)   \
+              * (1<<b->log2_pages)                      \
+              * (t->entries_per_page));                 \
+      break;
+      foreach_size_in_u32x4 ;
+#undef _
+
+    default: 
+      abort();
+    }
+  
+  working_bucket.as_u64 = b->as_u64;
+  working_bucket.offset = vnet_classify_get_offset (t, working_copy);
+  CLIB_MEMORY_BARRIER();
+  b->as_u64 = working_bucket.as_u64;
+  t->working_copies[cpu_number] = working_copy;
+}
+
+static vnet_classify_entry_t *
+split_and_rehash (vnet_classify_table_t * t,
+                  vnet_classify_entry_t * old_values,
+                  u32 new_log2_pages)
+{
+  vnet_classify_entry_t * new_values, * v, * new_v;
+  int i, j, k;
+  
+  new_values = vnet_classify_entry_alloc (t, new_log2_pages);
+  
+  for (i = 0; i < (vec_len (old_values)/t->entries_per_page); i++)
+    {
+      u64 new_hash;
+      
+      for (j = 0; j < t->entries_per_page; j++)
+        {
+          v = vnet_classify_entry_at_index 
+            (t, old_values, i * t->entries_per_page + j);
+          
+          if (vnet_classify_entry_is_busy (v))
+            {
+              /* Hack so we can use the packet hash routine */
+              u8 * key_minus_skip;
+              key_minus_skip = (u8 *) v->key;
+              key_minus_skip -= t->skip_n_vectors * sizeof (u32x4);
+
+              new_hash = vnet_classify_hash_packet (t, key_minus_skip);
+              new_hash >>= t->log2_nbuckets;
+              new_hash &= (1<<new_log2_pages) - 1;
+              
+              for (k = 0; k < t->entries_per_page; k++)
+                {
+                  new_v = vnet_classify_entry_at_index (t, new_values, 
+                                                        new_hash + k);
+                  
+                  if (vnet_classify_entry_is_free (new_v))
+                    {
+                      clib_memcpy (new_v, v, sizeof (vnet_classify_entry_t) 
+                              + (t->match_n_vectors * sizeof (u32x4)));
+                      new_v->flags &= ~(VNET_CLASSIFY_ENTRY_FREE);
+                      goto doublebreak;
+                    }
+                }
+              /* Crap. Tell caller to try again */
+              vnet_classify_entry_free (t, new_values);
+              return 0;
+            }
+        doublebreak:
+          ;
+        }
+    }
+  return new_values;
+}
+
+int vnet_classify_add_del (vnet_classify_table_t * t, 
+                           vnet_classify_entry_t * add_v,
+                           int is_add)
+{
+  u32 bucket_index;
+  vnet_classify_bucket_t * b, tmp_b;
+  vnet_classify_entry_t * v, * new_v, * save_new_v, * working_copy, * save_v;
+  u32 value_index;
+  int rv = 0;
+  int i;
+  u64 hash, new_hash;
+  u32 new_log2_pages;
+  u32 cpu_number = os_get_cpu_number();
+  u8 * key_minus_skip;
+
+  ASSERT ((add_v->flags & VNET_CLASSIFY_ENTRY_FREE) == 0);
+
+  key_minus_skip = (u8 *) add_v->key;
+  key_minus_skip -= t->skip_n_vectors * sizeof (u32x4);
+
+  hash = vnet_classify_hash_packet (t, key_minus_skip);
+
+  bucket_index = hash & (t->nbuckets-1);
+  b = &t->buckets[bucket_index];
+
+  hash >>= t->log2_nbuckets;
+
+  while (__sync_lock_test_and_set (t->writer_lock, 1))
+    ; 
+
+  /* First elt in the bucket? */
+  if (b->offset == 0)
+    {
+      if (is_add == 0)
+        {
+          rv = -1;
+          goto unlock;
+        }
+
+      v = vnet_classify_entry_alloc (t, 0 /* new_log2_pages */);
+      clib_memcpy (v, add_v, sizeof (vnet_classify_entry_t) +
+              t->match_n_vectors * sizeof (u32x4));
+      v->flags &= ~(VNET_CLASSIFY_ENTRY_FREE);
+
+      tmp_b.as_u64 = 0;
+      tmp_b.offset = vnet_classify_get_offset (t, v);
+
+      b->as_u64 = tmp_b.as_u64;
+      t->active_elements ++;
+
+      goto unlock;
+    }
+  
+  make_working_copy (t, b);
+  
+  save_v = vnet_classify_get_entry (t, t->saved_bucket.offset);
+  value_index = hash & ((1<<t->saved_bucket.log2_pages)-1);
+  
+  if (is_add)
+    {
+      /* 
+       * For obvious (in hindsight) reasons, see if we're supposed to
+       * replace an existing key, then look for an empty slot.
+       */
+
+      for (i = 0; i < t->entries_per_page; i++)
+        {
+          v = vnet_classify_entry_at_index (t, save_v, value_index + i);
+
+          if (!memcmp (v->key, add_v->key, t->match_n_vectors * sizeof (u32x4)))
+            {
+              clib_memcpy (v, add_v, sizeof (vnet_classify_entry_t) +
+                      t->match_n_vectors * sizeof(u32x4));
+              v->flags &= ~(VNET_CLASSIFY_ENTRY_FREE);
+
+              CLIB_MEMORY_BARRIER();
+              /* Restore the previous (k,v) pairs */
+              b->as_u64 = t->saved_bucket.as_u64;
+              goto unlock;
+            }
+        }
+      for (i = 0; i < t->entries_per_page; i++)
+        {
+          v = vnet_classify_entry_at_index (t, save_v, value_index + i);
+
+          if (vnet_classify_entry_is_free (v))
+            {
+              clib_memcpy (v, add_v, sizeof (vnet_classify_entry_t) +
+                      t->match_n_vectors * sizeof(u32x4));
+              v->flags &= ~(VNET_CLASSIFY_ENTRY_FREE);
+              CLIB_MEMORY_BARRIER();
+              b->as_u64 = t->saved_bucket.as_u64;
+              t->active_elements ++;
+              goto unlock;
+            }
+        }
+      /* no room at the inn... split case... */
+    }
+  else
+    {
+      for (i = 0; i < t->entries_per_page; i++)
+        {
+          v = vnet_classify_entry_at_index (t, save_v, value_index + i);
+
+          if (!memcmp (v->key, add_v->key, t->match_n_vectors * sizeof (u32x4)))
+            {
+              memset (v, 0xff, sizeof (vnet_classify_entry_t) +
+                      t->match_n_vectors * sizeof(u32x4));
+              v->flags |= VNET_CLASSIFY_ENTRY_FREE;
+              CLIB_MEMORY_BARRIER();
+              b->as_u64 = t->saved_bucket.as_u64;
+              t->active_elements --;
+              goto unlock;
+            }
+        }
+      rv = -3;
+      b->as_u64 = t->saved_bucket.as_u64;
+      goto unlock;
+    }
+
+  new_log2_pages = t->saved_bucket.log2_pages + 1;
+
+ expand_again:
+  working_copy = t->working_copies[cpu_number];
+  new_v = split_and_rehash (t, working_copy, new_log2_pages);
+
+  if (new_v == 0)
+    {
+      new_log2_pages++;
+      goto expand_again;
+    }
+
+  /* Try to add the new entry */
+  save_new_v = new_v;
+
+  key_minus_skip = (u8 *) add_v->key;
+  key_minus_skip -= t->skip_n_vectors * sizeof (u32x4);
+
+  new_hash = vnet_classify_hash_packet_inline (t, key_minus_skip);
+  new_hash >>= t->log2_nbuckets;
+  new_hash &= (1<<min_log2((vec_len(new_v)/t->entries_per_page))) - 1;
+  
+  for (i = 0; i < t->entries_per_page; i++)
+    {
+      new_v = vnet_classify_entry_at_index (t, save_new_v, new_hash + i);
+
+      if (vnet_classify_entry_is_free (new_v))
+        {
+          clib_memcpy (new_v, add_v, sizeof (vnet_classify_entry_t) +
+                  t->match_n_vectors * sizeof(u32x4));
+          new_v->flags &= ~(VNET_CLASSIFY_ENTRY_FREE);
+          goto expand_ok;
+        }
+    }
+  /* Crap. Try again */
+  new_log2_pages++;
+  vnet_classify_entry_free (t, save_new_v);
+  goto expand_again;
+
+ expand_ok:
+  tmp_b.log2_pages = min_log2 (vec_len (save_new_v)/t->entries_per_page);
+  tmp_b.offset = vnet_classify_get_offset (t, save_new_v);
+  CLIB_MEMORY_BARRIER();
+  b->as_u64 = tmp_b.as_u64;
+  t->active_elements ++;
+  v = vnet_classify_get_entry (t, t->saved_bucket.offset);
+  vnet_classify_entry_free (t, v);
+
+ unlock:
+  CLIB_MEMORY_BARRIER();
+  t->writer_lock[0] = 0;
+
+  return rv;
+}
+
+typedef CLIB_PACKED(struct {
+  ethernet_header_t eh;
+  ip4_header_t ip;
+}) classify_data_or_mask_t;
+
+u64 vnet_classify_hash_packet (vnet_classify_table_t * t, u8 * h)
+{
+  return vnet_classify_hash_packet_inline (t, h);      
+}
+
+vnet_classify_entry_t * 
+vnet_classify_find_entry (vnet_classify_table_t * t,
+                          u8 * h, u64 hash, f64 now)
+{
+  return vnet_classify_find_entry_inline (t, h, hash, now);
+}
+
+static u8 * format_classify_entry (u8 * s, va_list * args)
+  {
+  vnet_classify_table_t * t = va_arg (*args, vnet_classify_table_t *);
+  vnet_classify_entry_t * e = va_arg (*args, vnet_classify_entry_t *);
+
+  s = format
+    (s, "[%u]: next_index %d advance %d opaque %d action %d metadata %d\n",
+     vnet_classify_get_offset (t, e), e->next_index, e->advance, 
+     e->opaque_index, e->action, e->metadata);
+
+
+  s = format (s, "        k: %U\n", format_hex_bytes, e->key,
+              t->match_n_vectors * sizeof(u32x4));
+  
+  if (vnet_classify_entry_is_busy (e))
+    s = format (s, "        hits %lld, last_heard %.2f\n",
+                e->hits, e->last_heard);
+  else
+    s = format (s, "  entry is free\n");
+  return s;
+  }
+ 
+u8 * format_classify_table (u8 * s, va_list * args)
+{
+  vnet_classify_table_t * t = va_arg (*args, vnet_classify_table_t *);
+  int verbose = va_arg (*args, int);
+  vnet_classify_bucket_t * b;
+  vnet_classify_entry_t * v, * save_v;
+  int i, j, k;
+  u64 active_elements = 0;
+  
+  for (i = 0; i < t->nbuckets; i++)
+    {
+      b = &t->buckets [i];
+      if (b->offset == 0)
+        {
+          if (verbose > 1)
+            s = format (s, "[%d]: empty\n", i);
+          continue;
+        }
+
+      if (verbose)
+        {
+          s = format (s, "[%d]: heap offset %d, len %d\n", i, 
+                      b->offset, (1<<b->log2_pages));
+        }
+
+      save_v = vnet_classify_get_entry (t, b->offset);
+      for (j = 0; j < (1<<b->log2_pages); j++)
+        {
+          for (k = 0; k < t->entries_per_page; k++)
+            {
+  
+              v = vnet_classify_entry_at_index (t, save_v, 
+                                                j*t->entries_per_page + k);
+
+              if (vnet_classify_entry_is_free (v))
+                {
+                  if (verbose > 1)
+                    s = format (s, "    %d: empty\n", 
+                                j * t->entries_per_page + k);
+                  continue;
+                }
+              if (verbose)
+                {
+                  s = format (s, "    %d: %U\n", 
+                              j * t->entries_per_page + k,
+                              format_classify_entry, t, v);
+                }
+              active_elements++;
+            }
+        }
+    }
+
+  s = format (s, "    %lld active elements\n", active_elements);
+  s = format (s, "    %d free lists\n", vec_len (t->freelists));
+  return s;
+}
+
+int vnet_classify_add_del_table (vnet_classify_main_t * cm,
+                                 u8 * mask, 
+                                 u32 nbuckets,
+                                 u32 memory_size,
+                                 u32 skip,
+                                 u32 match,
+                                 u32 next_table_index,
+                                 u32 miss_next_index,
+                                 u32 * table_index,
+                                 u8 current_data_flag,
+                                 i16 current_data_offset,
+                                 int is_add,
+                                 int del_chain)
+{
+  vnet_classify_table_t * t;
+
+  if (is_add)
+    {
+      if (*table_index == ~0) /* add */
+        {
+          if (memory_size == 0)
+            return VNET_API_ERROR_INVALID_MEMORY_SIZE;
+
+          if (nbuckets == 0)
+            return VNET_API_ERROR_INVALID_VALUE;
+
+          t = vnet_classify_new_table (cm, mask, nbuckets, memory_size,
+            skip, match);
+          t->next_table_index = next_table_index;
+          t->miss_next_index = miss_next_index;
+          t->current_data_flag = current_data_flag;
+          t->current_data_offset = current_data_offset;
+          *table_index = t - cm->tables;
+        }
+      else /* update */
+        {
+          vnet_classify_main_t *cm = &vnet_classify_main;
+          t = pool_elt_at_index (cm->tables, *table_index);
+
+          t->next_table_index = next_table_index;
+        }
+      return 0;
+    }
+  
+  vnet_classify_delete_table_index (cm, *table_index, del_chain);
+  return 0;
+}
+
+#define foreach_tcp_proto_field                 \
+_(src_port)                                     \
+_(dst_port)
+
+#define foreach_udp_proto_field                 \
+_(src_port)                                     \
+_(dst_port)
+
+#define foreach_ip4_proto_field                 \
+_(src_address)                                  \
+_(dst_address)                                  \
+_(tos)                                          \
+_(length)					\
+_(fragment_id)                                  \
+_(ttl)                                          \
+_(protocol)                                     \
+_(checksum)
+
+uword unformat_tcp_mask (unformat_input_t * input, va_list * args)
+{
+  u8 ** maskp = va_arg (*args, u8 **);
+  u8 * mask = 0;
+  u8 found_something = 0;
+  tcp_header_t * tcp;
+
+#define _(a) u8 a=0;
+  foreach_tcp_proto_field;
+#undef _
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (0) ;
+#define _(a) else if (unformat (input, #a)) a=1;
+      foreach_tcp_proto_field
+#undef _
+      else
+        break;
+    }
+
+#define _(a) found_something += a;
+  foreach_tcp_proto_field;
+#undef _
+
+  if (found_something == 0)
+    return 0;
+
+  vec_validate (mask, sizeof (*tcp) - 1);
+
+  tcp = (tcp_header_t *) mask;
+
+#define _(a) if (a) memset (&tcp->a, 0xff, sizeof (tcp->a));
+  foreach_tcp_proto_field;
+#undef _
+
+  *maskp = mask;
+  return 1;
+}
+
+uword unformat_udp_mask (unformat_input_t * input, va_list * args)
+{
+  u8 ** maskp = va_arg (*args, u8 **);
+  u8 * mask = 0;
+  u8 found_something = 0;
+  udp_header_t * udp;
+
+#define _(a) u8 a=0;
+  foreach_udp_proto_field;
+#undef _
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (0) ;
+#define _(a) else if (unformat (input, #a)) a=1;
+      foreach_udp_proto_field
+#undef _
+      else
+        break;
+    }
+
+#define _(a) found_something += a;
+  foreach_udp_proto_field;
+#undef _
+
+  if (found_something == 0)
+    return 0;
+
+  vec_validate (mask, sizeof (*udp) - 1);
+
+  udp = (udp_header_t *) mask;
+
+#define _(a) if (a) memset (&udp->a, 0xff, sizeof (udp->a));
+  foreach_udp_proto_field;
+#undef _
+
+  *maskp = mask;
+  return 1;
+}
+
+typedef struct {
+  u16 src_port, dst_port;
+} tcpudp_header_t;
+
+uword unformat_l4_mask (unformat_input_t * input, va_list * args)
+{
+  u8 ** maskp = va_arg (*args, u8 **);
+  u16 src_port = 0, dst_port = 0;
+  tcpudp_header_t * tcpudp;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "tcp %U", unformat_tcp_mask, maskp))
+        return 1;
+      else if (unformat (input, "udp %U", unformat_udp_mask, maskp))
+        return 1;
+      else if (unformat (input, "src_port"))
+        src_port = 0xFFFF;
+      else if (unformat (input, "dst_port"))
+        dst_port = 0xFFFF;
+      else
+        return 0;
+    }
+
+  if (!src_port && !dst_port)
+    return 0;
+
+  u8 * mask = 0;
+  vec_validate (mask, sizeof (tcpudp_header_t) - 1);
+
+  tcpudp = (tcpudp_header_t *) mask;
+  tcpudp->src_port = src_port;
+  tcpudp->dst_port = dst_port;
+
+  *maskp = mask;
+
+  return 1;
+}
+
+uword unformat_ip4_mask (unformat_input_t * input, va_list * args)
+{
+  u8 ** maskp = va_arg (*args, u8 **);
+  u8 * mask = 0;
+  u8 found_something = 0;
+  ip4_header_t * ip;
+  
+#define _(a) u8 a=0;
+  foreach_ip4_proto_field;
+#undef _
+  u8 version = 0;
+  u8 hdr_length = 0;
+  
+  
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
+    {
+      if (unformat (input, "version")) 
+        version = 1;
+      else if (unformat (input, "hdr_length"))
+        hdr_length = 1;
+      else if (unformat (input, "src"))
+        src_address = 1;
+      else if (unformat (input, "dst"))
+        dst_address = 1;
+      else if (unformat (input, "proto"))
+        protocol = 1;
+      
+#define _(a) else if (unformat (input, #a)) a=1;
+      foreach_ip4_proto_field
+#undef _
+      else
+        break;
+    }
+  
+#define _(a) found_something += a;
+  foreach_ip4_proto_field;
+#undef _
+  
+  if (found_something == 0)
+    return 0;
+  
+  vec_validate (mask, sizeof (*ip) - 1);
+  
+  ip = (ip4_header_t *) mask;
+  
+#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
+  foreach_ip4_proto_field;
+#undef _
+  
+  ip->ip_version_and_header_length = 0;
+  
+  if (version)
+    ip->ip_version_and_header_length |= 0xF0;
+  
+  if (hdr_length)
+    ip->ip_version_and_header_length |= 0x0F;
+  
+  *maskp = mask;
+  return 1;
+}
+
+#define foreach_ip6_proto_field                 \
+_(src_address)                                  \
+_(dst_address)                                  \
+_(payload_length)				\
+_(hop_limit)                                    \
+_(protocol)
+
+uword unformat_ip6_mask (unformat_input_t * input, va_list * args)
+{
+  u8 ** maskp = va_arg (*args, u8 **);
+  u8 * mask = 0;
+  u8 found_something = 0;
+  ip6_header_t * ip;
+  u32 ip_version_traffic_class_and_flow_label;
+  
+#define _(a) u8 a=0;
+  foreach_ip6_proto_field;
+#undef _
+  u8 version = 0;
+  u8 traffic_class = 0;
+  u8 flow_label = 0;
+  
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
+    {
+      if (unformat (input, "version")) 
+        version = 1;
+      else if (unformat (input, "traffic-class"))
+        traffic_class = 1;
+      else if (unformat (input, "flow-label"))
+        flow_label = 1;
+      else if (unformat (input, "src"))
+        src_address = 1;
+      else if (unformat (input, "dst"))
+        dst_address = 1;
+      else if (unformat (input, "proto"))
+        protocol = 1;
+      
+#define _(a) else if (unformat (input, #a)) a=1;
+      foreach_ip6_proto_field
+#undef _
+      else
+        break;
+    }
+  
+#define _(a) found_something += a;
+  foreach_ip6_proto_field;
+#undef _
+  
+  if (found_something == 0)
+    return 0;
+  
+  vec_validate (mask, sizeof (*ip) - 1);
+  
+  ip = (ip6_header_t *) mask;
+  
+#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
+  foreach_ip6_proto_field;
+#undef _
+  
+  ip_version_traffic_class_and_flow_label = 0;
+  
+  if (version)
+    ip_version_traffic_class_and_flow_label |= 0xF0000000;
+
+  if (traffic_class)
+    ip_version_traffic_class_and_flow_label |= 0x0FF00000;
+
+  if (flow_label)
+    ip_version_traffic_class_and_flow_label |= 0x000FFFFF;
+
+  ip->ip_version_traffic_class_and_flow_label = 
+    clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label);
+  
+  *maskp = mask;
+  return 1;
+}
+
+uword unformat_l3_mask (unformat_input_t * input, va_list * args)
+{
+  u8 ** maskp = va_arg (*args, u8 **);
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp))
+      return 1;
+    else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp))
+      return 1;
+    else
+      break;
+  }
+  return 0;
+}
+
+uword unformat_l2_mask (unformat_input_t * input, va_list * args)
+{
+  u8 ** maskp = va_arg (*args, u8 **);
+  u8 * mask = 0;
+  u8 src = 0;
+  u8 dst = 0;
+  u8 proto = 0;
+  u8 tag1 = 0;
+  u8 tag2 = 0;
+  u8 ignore_tag1 = 0;
+  u8 ignore_tag2 = 0;
+  u8 cos1 = 0;
+  u8 cos2 = 0;
+  u8 dot1q = 0;
+  u8 dot1ad = 0;
+  int len = 14;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "src"))
+      src = 1;
+    else if (unformat (input, "dst"))
+      dst = 1;
+    else if (unformat (input, "proto"))
+      proto = 1;
+    else if (unformat (input, "tag1"))
+      tag1 = 1;
+    else if (unformat (input, "tag2"))
+      tag2 = 1;
+    else if (unformat (input, "ignore-tag1"))
+      ignore_tag1 = 1;
+    else if (unformat (input, "ignore-tag2"))
+      ignore_tag2 = 1;
+    else if (unformat (input, "cos1"))
+      cos1 = 1;
+    else if (unformat (input, "cos2"))
+      cos2 = 1;
+    else if (unformat (input, "dot1q"))
+      dot1q = 1;
+    else if (unformat (input, "dot1ad"))
+      dot1ad = 1;
+    else
+      break;
+  }
+  if ((src + dst + proto + tag1 + tag2 + dot1q + dot1ad +
+      ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
+    return 0;
+
+  if (tag1 || ignore_tag1 || cos1 || dot1q)
+    len = 18;
+  if (tag2 || ignore_tag2 || cos2 || dot1ad)
+    len = 22;
+
+  vec_validate (mask, len-1);
+
+  if (dst)
+    memset (mask, 0xff, 6);
+
+  if (src)
+    memset (mask + 6, 0xff, 6);
+  
+  if (tag2 || dot1ad)
+    {
+      /* inner vlan tag */
+      if (tag2)
+        {
+          mask[19] = 0xff;
+          mask[18] = 0x0f;
+        }
+      if (cos2)
+        mask[18] |= 0xe0;
+      if (proto)
+        mask[21] = mask [20] = 0xff;
+      if (tag1)
+        {
+          mask [15] = 0xff;
+          mask [14] = 0x0f;
+        }
+      if (cos1)
+        mask[14] |= 0xe0;
+      *maskp = mask;
+      return 1;
+    }
+  if (tag1 | dot1q)
+    {
+      if (tag1)
+        {
+          mask [15] = 0xff;
+          mask [14] = 0x0f;
+        }
+      if (cos1)
+        mask[14] |= 0xe0;
+      if (proto)
+        mask[16] = mask [17] = 0xff;
+      *maskp = mask;
+      return 1;
+    }
+  if (cos2)
+    mask[18] |= 0xe0;
+  if (cos1)
+    mask[14] |= 0xe0;
+  if (proto)
+    mask[12] = mask [13] = 0xff;
+    
+  *maskp = mask;
+  return 1;
+}
+
+uword unformat_classify_mask (unformat_input_t * input, va_list * args)
+{
+  vnet_classify_main_t * CLIB_UNUSED(cm) 
+    = va_arg (*args, vnet_classify_main_t *);
+  u8 ** maskp = va_arg (*args, u8 **);
+  u32 * skipp = va_arg (*args, u32 *);
+  u32 * matchp = va_arg (*args, u32 *);
+  u32 match;
+  u8 * mask = 0;
+  u8 * l2 = 0;
+  u8 * l3 = 0;
+  u8 * l4 = 0;
+  int i;
+  
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "hex %U", unformat_hex_string, &mask))
+      ;
+    else if (unformat (input, "l2 %U", unformat_l2_mask, &l2))
+      ;
+    else if (unformat (input, "l3 %U", unformat_l3_mask, &l3))
+      ;
+    else if (unformat (input, "l4 %U", unformat_l4_mask, &l4))
+      ;
+    else
+      break;
+  }
+
+  if (l4 && !l3) {
+    vec_free (mask);
+    vec_free (l2);
+    vec_free (l4);
+    return 0;
+  }
+
+  if (mask || l2 || l3 || l4)
+    {
+      if (l2 || l3 || l4)
+        {
+          /* "With a free Ethernet header in every package" */
+          if (l2 == 0)
+            vec_validate (l2, 13);
+          mask = l2;
+          if (l3)
+            {
+              vec_append (mask, l3);
+              vec_free (l3);
+            }
+          if (l4)
+            {
+              vec_append (mask, l4);
+              vec_free (l4);
+            }
+        }
+
+      /* Scan forward looking for the first significant mask octet */
+      for (i = 0; i < vec_len (mask); i++)
+        if (mask[i])
+          break;
+
+      /* compute (skip, match) params */
+      *skipp = i / sizeof(u32x4);
+      vec_delete (mask, *skipp * sizeof(u32x4), 0);
+
+      /* Pad mask to an even multiple of the vector size */
+      while (vec_len (mask) % sizeof (u32x4))
+        vec_add1 (mask, 0);
+
+      match = vec_len (mask) / sizeof (u32x4);
+
+      for (i = match*sizeof(u32x4); i > 0; i-= sizeof(u32x4))
+        {
+          u64 *tmp = (u64 *)(mask + (i-sizeof(u32x4)));
+          if (*tmp || *(tmp+1))
+            break;
+          match--;
+        }
+      if (match == 0)
+        clib_warning ("BUG: match 0");
+
+      _vec_len (mask) = match * sizeof(u32x4);
+
+      *matchp = match;
+      *maskp = mask;
+
+      return 1;
+    }
+
+  return 0;
+}
+
+#define foreach_l2_input_next                   \
+_(drop, DROP)                                   \
+_(ethernet, ETHERNET_INPUT)                     \
+_(ip4, IP4_INPUT)                               \
+_(ip6, IP6_INPUT)				\
+_(li, LI)
+
+uword unformat_l2_input_next_index (unformat_input_t * input, va_list * args)
+{
+  vnet_classify_main_t * cm = &vnet_classify_main;
+  u32 * miss_next_indexp = va_arg (*args, u32 *);
+  u32 next_index = 0;
+  u32 tmp;
+  int i;
+  
+  /* First try registered unformat fns, allowing override... */
+  for (i = 0; i < vec_len (cm->unformat_l2_next_index_fns); i++)
+    {
+      if (unformat (input, "%U", cm->unformat_l2_next_index_fns[i], &tmp))
+        {
+          next_index = tmp;
+          goto out;
+        }
+    }
+
+#define _(n,N) \
+  if (unformat (input, #n)) { next_index = L2_INPUT_CLASSIFY_NEXT_##N; goto out;}
+  foreach_l2_input_next;
+#undef _
+  
+  if (unformat (input, "%d", &tmp))
+    { 
+      next_index = tmp; 
+      goto out; 
+    }
+  
+  return 0;
+
+ out:
+  *miss_next_indexp = next_index;
+  return 1;
+}
+
+#define foreach_l2_output_next                   \
+_(drop, DROP)
+
+uword unformat_l2_output_next_index (unformat_input_t * input, va_list * args)
+{
+  vnet_classify_main_t * cm = &vnet_classify_main;
+  u32 * miss_next_indexp = va_arg (*args, u32 *);
+  u32 next_index = 0;
+  u32 tmp;
+  int i;
+  
+  /* First try registered unformat fns, allowing override... */
+  for (i = 0; i < vec_len (cm->unformat_l2_next_index_fns); i++)
+    {
+      if (unformat (input, "%U", cm->unformat_l2_next_index_fns[i], &tmp))
+        {
+          next_index = tmp;
+          goto out;
+        }
+    }
+
+#define _(n,N) \
+  if (unformat (input, #n)) { next_index = L2_OUTPUT_CLASSIFY_NEXT_##N; goto out;}
+  foreach_l2_output_next;
+#undef _
+  
+  if (unformat (input, "%d", &tmp))
+    { 
+      next_index = tmp; 
+      goto out; 
+    }
+  
+  return 0;
+
+ out:
+  *miss_next_indexp = next_index;
+  return 1;
+}
+
+#define foreach_ip_next                         \
+_(drop, DROP)                                   \
+_(rewrite, REWRITE)
+
+uword unformat_ip_next_index (unformat_input_t * input, va_list * args)
+{
+  u32 * miss_next_indexp = va_arg (*args, u32 *);
+  vnet_classify_main_t * cm = &vnet_classify_main;
+  u32 next_index = 0;
+  u32 tmp;
+  int i;
+  
+  /* First try registered unformat fns, allowing override... */
+  for (i = 0; i < vec_len (cm->unformat_ip_next_index_fns); i++)
+    {
+      if (unformat (input, "%U", cm->unformat_ip_next_index_fns[i], &tmp))
+        {
+          next_index = tmp;
+          goto out;
+        }
+    }
+
+#define _(n,N) \
+  if (unformat (input, #n)) { next_index = IP_LOOKUP_NEXT_##N; goto out;}
+  foreach_ip_next;
+#undef _
+  
+  if (unformat (input, "%d", &tmp))
+    { 
+      next_index = tmp; 
+      goto out; 
+    }
+  
+  return 0;
+
+ out:
+  *miss_next_indexp = next_index;
+  return 1;
+}
+
+#define foreach_acl_next                        \
+_(deny, DENY)
+
+uword unformat_acl_next_index (unformat_input_t * input, va_list * args)
+{
+  u32 * next_indexp = va_arg (*args, u32 *);
+  vnet_classify_main_t * cm = &vnet_classify_main;
+  u32 next_index = 0;
+  u32 tmp;
+  int i;
+
+  /* First try registered unformat fns, allowing override... */
+  for (i = 0; i < vec_len (cm->unformat_acl_next_index_fns); i++)
+    {
+      if (unformat (input, "%U", cm->unformat_acl_next_index_fns[i], &tmp))
+        {
+          next_index = tmp;
+          goto out;
+        }
+    }
+
+#define _(n,N) \
+  if (unformat (input, #n)) { next_index = ACL_NEXT_INDEX_##N; goto out;}
+  foreach_acl_next;
+#undef _
+
+  if (unformat (input, "permit"))
+    {
+      next_index = ~0;
+      goto out;
+    }
+  else if (unformat (input, "%d", &tmp))
+    {
+      next_index = tmp;
+      goto out;
+    }
+
+  return 0;
+
+ out:
+  *next_indexp = next_index;
+  return 1;
+}
+
+uword unformat_policer_next_index (unformat_input_t * input, va_list * args)
+{
+  u32 * next_indexp = va_arg (*args, u32 *);
+  vnet_classify_main_t * cm = &vnet_classify_main;
+  u32 next_index = 0;
+  u32 tmp;
+  int i;
+
+  /* First try registered unformat fns, allowing override... */
+  for (i = 0; i < vec_len (cm->unformat_policer_next_index_fns); i++)
+    {
+      if (unformat (input, "%U", cm->unformat_policer_next_index_fns[i], &tmp))
+        {
+          next_index = tmp;
+          goto out;
+        }
+    }
+
+  if (unformat (input, "%d", &tmp))
+    {
+      next_index = tmp;
+      goto out;
+    }
+
+  return 0;
+
+ out:
+  *next_indexp = next_index;
+  return 1;
+}
+
+static clib_error_t *
+classify_table_command_fn (vlib_main_t * vm,
+                           unformat_input_t * input,
+                           vlib_cli_command_t * cmd)
+{
+  u32 nbuckets = 2;
+  u32 skip = ~0;
+  u32 match = ~0;
+  int is_add = 1;
+  int del_chain = 0;
+  u32 table_index = ~0;
+  u32 next_table_index = ~0;
+  u32 miss_next_index = ~0;
+  u32 memory_size = 2<<20;
+  u32 tmp;
+  u32 current_data_flag = 0;
+  int current_data_offset = 0;
+
+  u8 * mask = 0;
+  vnet_classify_main_t * cm = &vnet_classify_main;
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "del"))
+      is_add = 0;
+    else if (unformat (input, "del-chain"))
+      {
+	is_add = 0;
+        del_chain = 1;
+      }
+    else if (unformat (input, "buckets %d", &nbuckets))
+      ;
+    else if (unformat (input, "skip %d", &skip))
+      ;
+    else if (unformat (input, "match %d", &match))
+      ;
+    else if (unformat (input, "table %d", &table_index))
+      ;
+    else if (unformat (input, "mask %U", unformat_classify_mask, 
+                       cm, &mask, &skip, &match))
+      ;
+    else if (unformat (input, "memory-size %uM", &tmp))
+      memory_size = tmp<<20;
+    else if (unformat (input, "memory-size %uG", &tmp))
+      memory_size = tmp<<30;
+    else if (unformat (input, "next-table %d", &next_table_index))
+      ;
+    else if (unformat (input, "miss-next %U", unformat_ip_next_index,
+                       &miss_next_index))
+      ;
+    else if (unformat (input, "l2-input-miss-next %U", unformat_l2_input_next_index,
+                       &miss_next_index))
+        ;
+    else if (unformat (input, "l2-output-miss-next %U", unformat_l2_output_next_index,
+                       &miss_next_index))
+      ;
+    else if (unformat (input, "acl-miss-next %U", unformat_acl_next_index,
+                       &miss_next_index))
+      ;
+    else if (unformat (input, "current-data-flag %d", &current_data_flag))
+      ;
+    else if (unformat (input, "current-data-offset %d", &current_data_offset))
+      ;
+
+    else
+      break;
+  }
+  
+  if (is_add && mask == 0 && table_index == ~0)
+    return clib_error_return (0, "Mask required");
+
+  if (is_add && skip == ~0 && table_index == ~0)
+    return clib_error_return (0, "skip count required");
+
+  if (is_add && match == ~0 && table_index == ~0)
+    return clib_error_return (0, "match count required");
+      
+  if (!is_add && table_index == ~0)
+    return clib_error_return (0, "table index required for delete");
+
+  rv = vnet_classify_add_del_table (cm, mask, nbuckets, memory_size,
+        skip, match, next_table_index, miss_next_index, &table_index,
+	current_data_flag, current_data_offset, is_add, del_chain);
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    default:
+      return clib_error_return (0, "vnet_classify_add_del_table returned %d",
+                                rv);
+    }
+  return 0;
+}
+
+VLIB_CLI_COMMAND (classify_table, static) = {
+  .path = "classify table",
+  .short_help = 
+  "classify table [miss-next|l2-miss_next|acl-miss-next <next_index>]"
+  "\n mask <mask-value> buckets <nn> [skip <n>] [match <n>]"
+  "\n [current-data-flag <n>] [current-data-offset <n>] [table <n>]"
+  "\n [del] [del-chain]",
+  .function = classify_table_command_fn,
+};
+
+static u8 * format_vnet_classify_table (u8 * s, va_list * args)
+{
+  vnet_classify_main_t * cm = va_arg (*args, vnet_classify_main_t *);
+  int verbose = va_arg (*args, int);
+  u32 index = va_arg (*args, u32);
+  vnet_classify_table_t * t;
+
+  if (index == ~0)
+    {
+      s = format (s, "%10s%10s%10s%10s", "TableIdx", "Sessions", "NextTbl",
+                  "NextNode", verbose ? "Details" : "");
+      return s;
+    }
+
+  t = pool_elt_at_index (cm->tables, index);
+  s = format (s, "%10u%10d%10d%10d", index, t->active_elements,
+              t->next_table_index, t->miss_next_index);
+
+  s = format (s, "\n  Heap: %U", format_mheap, t->mheap, 0 /*verbose*/); 
+
+  s = format (s, "\n  nbuckets %d, skip %d match %d flag %d offset %d",
+              t->nbuckets, t->skip_n_vectors, t->match_n_vectors,
+              t->current_data_flag, t->current_data_offset);
+  s = format (s, "\n  mask %U", format_hex_bytes, t->mask, 
+              t->match_n_vectors * sizeof (u32x4));
+
+  if (verbose == 0)
+    return s;
+
+  s = format (s, "\n%U", format_classify_table, t, verbose);
+  
+  return s;
+}
+
+static clib_error_t *
+show_classify_tables_command_fn (vlib_main_t * vm,
+                                 unformat_input_t * input,
+                                 vlib_cli_command_t * cmd)
+{
+  vnet_classify_main_t * cm = &vnet_classify_main;
+  vnet_classify_table_t * t;
+  u32 match_index = ~0;
+  u32 * indices = 0;
+  int verbose = 0;
+  int i;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
+    {
+      if (unformat (input, "index %d", &match_index))
+        ;
+      else if (unformat (input, "verbose %d", &verbose))
+        ;
+      else if (unformat (input, "verbose"))
+        verbose = 1;
+      else 
+        break;
+    }
+  
+  pool_foreach (t, cm->tables, 
+  ({
+    if (match_index == ~0 || (match_index == t - cm->tables))
+      vec_add1 (indices, t - cm->tables);
+  }));
+
+  if (vec_len(indices))
+    {
+      vlib_cli_output (vm, "%U", format_vnet_classify_table, cm, verbose,
+                       ~0 /* hdr */);
+      for (i = 0; i < vec_len (indices); i++)
+        vlib_cli_output (vm, "%U", format_vnet_classify_table, cm, 
+                         verbose, indices[i]);
+    }
+  else
+    vlib_cli_output (vm, "No classifier tables configured");
+
+  vec_free (indices);
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (show_classify_table_command, static) = {
+  .path = "show classify tables",
+  .short_help = "show classify tables [index <nn>]",
+  .function = show_classify_tables_command_fn,
+};
+
+uword unformat_l4_match (unformat_input_t * input, va_list * args)
+{
+  u8 ** matchp = va_arg (*args, u8 **);
+
+  u8 * proto_header = 0;
+  int src_port = 0;
+  int dst_port = 0;
+
+  tcpudp_header_t h;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "src_port %d", &src_port))
+        ;
+      else if (unformat (input, "dst_port %d", &dst_port))
+        ;
+      else
+        return 0;
+    }
+
+  h.src_port = clib_host_to_net_u16(src_port);
+  h.dst_port = clib_host_to_net_u16(dst_port);
+  vec_validate(proto_header, sizeof(h)-1);
+  memcpy(proto_header, &h, sizeof(h));
+
+  *matchp = proto_header;
+
+  return 1;
+}
+
+uword unformat_ip4_match (unformat_input_t * input, va_list * args)
+{
+  u8 ** matchp = va_arg (*args, u8 **);
+  u8 * match = 0;
+  ip4_header_t * ip;
+  int version = 0;
+  u32 version_val;
+  int hdr_length = 0;
+  u32 hdr_length_val;
+  int src = 0, dst = 0;
+  ip4_address_t src_val, dst_val;
+  int proto = 0;
+  u32 proto_val;
+  int tos = 0;
+  u32 tos_val;
+  int length = 0;
+  u32 length_val;
+  int fragment_id = 0;
+  u32 fragment_id_val;
+  int ttl = 0;
+  int ttl_val;
+  int checksum = 0;
+  u32 checksum_val;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
+    {
+      if (unformat (input, "version %d", &version_val)) 
+        version = 1;
+      else if (unformat (input, "hdr_length %d", &hdr_length_val))
+        hdr_length = 1;
+      else if (unformat (input, "src %U", unformat_ip4_address, &src_val))
+        src = 1;
+      else if (unformat (input, "dst %U", unformat_ip4_address, &dst_val))
+        dst = 1;
+      else if (unformat (input, "proto %d", &proto_val))
+        proto = 1;
+      else if (unformat (input, "tos %d", &tos_val))
+        tos = 1;
+      else if (unformat (input, "length %d", &length_val))
+        length = 1;
+      else if (unformat (input, "fragment_id %d", &fragment_id_val))
+        fragment_id = 1;
+      else if (unformat (input, "ttl %d", &ttl_val))
+        ttl = 1;
+      else if (unformat (input, "checksum %d", &checksum_val))
+        checksum = 1;
+      else
+        break;
+    }
+  
+  if (version + hdr_length + src + dst + proto + tos + length + fragment_id
+      + ttl + checksum == 0)
+    return 0;
+
+  /* 
+   * Aligned because we use the real comparison functions
+   */
+  vec_validate_aligned (match, sizeof (*ip) - 1, sizeof(u32x4));
+  
+  ip = (ip4_header_t *) match;
+  
+  /* These are realistically matched in practice */
+  if (src)
+    ip->src_address.as_u32 = src_val.as_u32;
+
+  if (dst)
+    ip->dst_address.as_u32 = dst_val.as_u32;
+  
+  if (proto)
+    ip->protocol = proto_val;
+    
+
+  /* These are not, but they're included for completeness */
+  if (version)
+    ip->ip_version_and_header_length |= (version_val & 0xF)<<4;
+
+  if (hdr_length)
+    ip->ip_version_and_header_length |= (hdr_length_val & 0xF);
+    
+  if (tos)
+    ip->tos = tos_val;
+  
+  if (length)
+    ip->length = clib_host_to_net_u16 (length_val);
+  
+  if (ttl)
+    ip->ttl = ttl_val;
+
+  if (checksum)
+    ip->checksum = clib_host_to_net_u16 (checksum_val);
+
+  *matchp = match;
+  return 1;
+}
+
+uword unformat_ip6_match (unformat_input_t * input, va_list * args)
+{
+  u8 ** matchp = va_arg (*args, u8 **);
+  u8 * match = 0;
+  ip6_header_t * ip;
+  int version = 0;
+  u32 version_val;
+  u8  traffic_class = 0;
+  u32 traffic_class_val;
+  u8  flow_label = 0;
+  u8  flow_label_val;
+  int src = 0, dst = 0;
+  ip6_address_t src_val, dst_val;
+  int proto = 0;
+  u32 proto_val;
+  int payload_length = 0;
+  u32 payload_length_val;
+  int hop_limit = 0;
+  int hop_limit_val;
+  u32 ip_version_traffic_class_and_flow_label;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
+    {
+      if (unformat (input, "version %d", &version_val)) 
+        version = 1;
+      else if (unformat (input, "traffic_class %d", &traffic_class_val))
+        traffic_class = 1;
+      else if (unformat (input, "flow_label %d", &flow_label_val))
+        flow_label = 1;
+      else if (unformat (input, "src %U", unformat_ip6_address, &src_val))
+        src = 1;
+      else if (unformat (input, "dst %U", unformat_ip6_address, &dst_val))
+        dst = 1;
+      else if (unformat (input, "proto %d", &proto_val))
+        proto = 1;
+      else if (unformat (input, "payload_length %d", &payload_length_val))
+        payload_length = 1;
+      else if (unformat (input, "hop_limit %d", &hop_limit_val))
+        hop_limit = 1;
+      else
+        break;
+    }
+  
+  if (version + traffic_class + flow_label + src + dst + proto +
+      payload_length + hop_limit == 0)
+    return 0;
+
+  /* 
+   * Aligned because we use the real comparison functions
+   */
+  vec_validate_aligned (match, sizeof (*ip) - 1, sizeof(u32x4));
+  
+  ip = (ip6_header_t *) match;
+  
+  if (src)
+    clib_memcpy (&ip->src_address, &src_val, sizeof (ip->src_address));
+
+  if (dst)
+    clib_memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address));
+  
+  if (proto)
+    ip->protocol = proto_val;
+    
+  ip_version_traffic_class_and_flow_label = 0;
+
+  if (version)
+    ip_version_traffic_class_and_flow_label |= (version_val & 0xF) << 28;
+
+  if (traffic_class)
+    ip_version_traffic_class_and_flow_label |= (traffic_class_val & 0xFF) << 20;
+
+  if (flow_label)
+    ip_version_traffic_class_and_flow_label |= (flow_label_val & 0xFFFFF);
+    
+  ip->ip_version_traffic_class_and_flow_label = 
+    clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label);
+
+  if (payload_length)
+    ip->payload_length = clib_host_to_net_u16 (payload_length_val);
+  
+  if (hop_limit)
+    ip->hop_limit = hop_limit_val;
+
+  *matchp = match;
+  return 1;
+}
+
+uword unformat_l3_match (unformat_input_t * input, va_list * args)
+{
+  u8 ** matchp = va_arg (*args, u8 **);
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "ip4 %U", unformat_ip4_match, matchp))
+      return 1;
+    else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp))
+      return 1;
+    /* $$$$ add mpls */
+    else
+      break;
+  }
+  return 0;
+}
+
+uword unformat_vlan_tag (unformat_input_t * input, va_list * args)
+{
+  u8 * tagp = va_arg (*args, u8 *);
+  u32 tag;
+
+  if (unformat(input, "%d", &tag))
+    {
+      tagp[0] = (tag>>8) & 0x0F;
+      tagp[1] = tag & 0xFF;
+      return 1;
+    }
+
+  return 0;
+}
+
+uword unformat_l2_match (unformat_input_t * input, va_list * args)
+{
+  u8 ** matchp = va_arg (*args, u8 **);
+  u8 * match = 0;
+  u8 src = 0;
+  u8 src_val[6];
+  u8 dst = 0;
+  u8 dst_val[6];
+  u8 proto = 0;
+  u16 proto_val;
+  u8 tag1 = 0;
+  u8 tag1_val [2];
+  u8 tag2 = 0;
+  u8 tag2_val [2];
+  int len = 14;
+  u8 ignore_tag1 = 0;
+  u8 ignore_tag2 = 0;
+  u8 cos1 = 0;
+  u8 cos2 = 0;
+  u32 cos1_val = 0;
+  u32 cos2_val = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "src %U", unformat_ethernet_address, &src_val))
+      src = 1;
+    else if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val))
+      dst = 1;
+    else if (unformat (input, "proto %U", 
+                       unformat_ethernet_type_host_byte_order, &proto_val))
+      proto = 1;
+    else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val))
+      tag1 = 1;
+    else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val))
+      tag2 = 1;
+    else if (unformat (input, "ignore-tag1"))
+      ignore_tag1 = 1;
+    else if (unformat (input, "ignore-tag2"))
+      ignore_tag2 = 1;
+    else if (unformat (input, "cos1 %d", &cos1_val))
+      cos1 = 1;
+    else if (unformat (input, "cos2 %d", &cos2_val))
+      cos2 = 1;
+    else
+      break;
+  }
+  if ((src + dst + proto + tag1 + tag2 +
+      ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
+    return 0;
+
+  if (tag1 || ignore_tag1 || cos1)
+    len = 18;
+  if (tag2 || ignore_tag2 || cos2)
+    len = 22;
+
+  vec_validate_aligned (match, len-1, sizeof(u32x4));
+
+  if (dst)
+    clib_memcpy (match, dst_val, 6);
+
+  if (src)
+    clib_memcpy (match + 6, src_val, 6);
+  
+  if (tag2)
+    {
+      /* inner vlan tag */
+      match[19] = tag2_val[1];
+      match[18] = tag2_val[0];
+      if (cos2)
+        match [18] |= (cos2_val & 0x7) << 5;
+      if (proto)
+        {
+          match[21] = proto_val & 0xff;
+          match[20] = proto_val >> 8;
+        }
+      if (tag1)
+        {
+          match [15] = tag1_val[1];
+          match [14] = tag1_val[0];
+        }
+      if (cos1)
+        match [14] |= (cos1_val & 0x7) << 5;
+      *matchp = match;
+      return 1;
+    }
+  if (tag1)
+    {
+      match [15] = tag1_val[1];
+      match [14] = tag1_val[0];
+      if (proto)
+        {
+          match[17] = proto_val & 0xff;
+          match[16] = proto_val >> 8;
+        }
+      if (cos1)
+        match [14] |= (cos1_val & 0x7) << 5;
+
+      *matchp = match;
+      return 1;
+    }
+  if (cos2)
+    match [18] |= (cos2_val & 0x7) << 5;
+  if (cos1)
+    match [14] |= (cos1_val & 0x7) << 5;
+  if (proto)
+    {
+      match[13] = proto_val & 0xff;
+      match[12] = proto_val >> 8;
+    }
+  
+  *matchp = match;
+  return 1;
+}
+
+
+uword unformat_classify_match (unformat_input_t * input, va_list * args)
+{
+  vnet_classify_main_t * cm = va_arg (*args, vnet_classify_main_t *);
+  u8 ** matchp = va_arg (*args, u8 **);
+  u32 table_index = va_arg (*args, u32);
+  vnet_classify_table_t * t;
+  
+  u8 * match = 0;
+  u8 * l2 = 0;
+  u8 * l3 = 0;
+  u8 * l4 = 0;
+
+  if (pool_is_free_index (cm->tables, table_index))
+    return 0;
+
+  t = pool_elt_at_index (cm->tables, table_index);
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "hex %U", unformat_hex_string, &match))
+      ;
+    else if (unformat (input, "l2 %U", unformat_l2_match, &l2))
+      ;
+    else if (unformat (input, "l3 %U", unformat_l3_match, &l3))
+      ;
+    else if (unformat (input, "l4 %U", unformat_l4_match, &l4))
+      ;
+    else
+      break;
+  }
+
+  if (l4 && !l3) {
+    vec_free (match);
+    vec_free (l2);
+    vec_free (l4);
+    return 0;
+  }
+
+  if (match || l2 || l3 || l4)
+    {
+      if (l2 || l3 || l4)
+        {
+          /* "Win a free Ethernet header in every packet" */
+          if (l2 == 0)
+            vec_validate_aligned (l2, 13, sizeof(u32x4));
+          match = l2;
+          if (l3)
+            {
+              vec_append_aligned (match, l3, sizeof(u32x4));
+              vec_free (l3);
+            }
+          if (l4)
+            {
+              vec_append_aligned (match, l4, sizeof(u32x4));
+              vec_free (l4);
+            }
+        }
+
+      /* Make sure the vector is big enough even if key is all 0's */
+      vec_validate_aligned 
+        (match, ((t->match_n_vectors + t->skip_n_vectors) * sizeof(u32x4)) - 1,
+         sizeof(u32x4));
+      
+      /* Set size, include skipped vectors*/
+      _vec_len (match) = (t->match_n_vectors+t->skip_n_vectors) * sizeof(u32x4);
+
+      *matchp = match;
+
+      return 1;
+    }
+
+  return 0;
+}
+
+int vnet_classify_add_del_session (vnet_classify_main_t * cm, 
+                                   u32 table_index, 
+                                   u8 * match, 
+                                   u32 hit_next_index,
+                                   u32 opaque_index, 
+                                   i32 advance,
+                                   u8 action,
+                                   u32 metadata,
+                                   int is_add)
+{
+  vnet_classify_table_t * t;
+  vnet_classify_entry_5_t _max_e __attribute__((aligned (16)));
+  vnet_classify_entry_t * e;
+  int i, rv;
+
+  if (pool_is_free_index (cm->tables, table_index))
+    return VNET_API_ERROR_NO_SUCH_TABLE;
+  
+  t = pool_elt_at_index (cm->tables, table_index);
+  
+  e = (vnet_classify_entry_t *)&_max_e;
+  e->next_index = hit_next_index;
+  e->opaque_index = opaque_index;
+  e->advance = advance;
+  e->hits = 0;
+  e->last_heard = 0;
+  e->flags = 0;
+  e->action = action;
+  if (e->action == CLASSIFY_ACTION_SET_IP4_FIB_INDEX)
+    e->metadata = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, metadata);
+  else if (e->action == CLASSIFY_ACTION_SET_IP6_FIB_INDEX)
+    e->metadata = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, metadata);
+
+  /* Copy key data, honoring skip_n_vectors */
+  clib_memcpy (&e->key, match + t->skip_n_vectors * sizeof (u32x4),
+          t->match_n_vectors * sizeof (u32x4));
+
+  /* Clear don't-care bits; likely when dynamically creating sessions */
+  for (i = 0; i < t->match_n_vectors; i++)
+    e->key[i] &= t->mask[i];
+
+  rv = vnet_classify_add_del (t, e, is_add);
+  if (rv)
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+  return 0;
+}
+
+static clib_error_t *
+classify_session_command_fn (vlib_main_t * vm,
+                             unformat_input_t * input,
+                             vlib_cli_command_t * cmd)
+{
+  vnet_classify_main_t * cm = &vnet_classify_main;
+  int is_add = 1;
+  u32 table_index = ~0;
+  u32 hit_next_index = ~0;
+  u64 opaque_index = ~0;
+  u8 * match = 0;
+  i32 advance = 0;
+  u32 action = 0;
+  u32 metadata = 0;
+  int i, rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
+    {
+      if (unformat (input, "del"))
+        is_add = 0;
+      else if (unformat (input, "hit-next %U", unformat_ip_next_index,
+                         &hit_next_index))
+        ;
+      else if (unformat (input, "l2-input-hit-next %U", unformat_l2_input_next_index,
+                         &hit_next_index))
+        ;
+      else if (unformat (input, "l2-output-hit-next %U", unformat_l2_output_next_index,
+                         &hit_next_index))
+        ;
+      else if (unformat (input, "acl-hit-next %U", unformat_acl_next_index,
+                         &hit_next_index))
+        ;
+      else if (unformat (input, "policer-hit-next %U",
+                         unformat_policer_next_index, &hit_next_index))
+        ;
+      else if (unformat (input, "opaque-index %lld", &opaque_index))
+        ;
+      else if (unformat (input, "match %U", unformat_classify_match,
+                         cm, &match, table_index))
+        ;
+      else if (unformat (input, "advance %d", &advance))
+        ;
+      else if (unformat (input, "table-index %d", &table_index))
+        ;
+      else if (unformat (input, "action set-ip4-fib-id %d", &metadata))
+        action = 1;
+      else if (unformat (input, "action set-ip6-fib-id %d", &metadata))
+        action = 2;
+      else
+        {
+          /* Try registered opaque-index unformat fns */
+          for (i = 0; i < vec_len (cm->unformat_opaque_index_fns); i++)
+            {
+              if (unformat (input, "%U", cm->unformat_opaque_index_fns[i], 
+                            &opaque_index))
+                goto found_opaque;
+            }
+          break;
+        }
+    found_opaque:
+      ;
+    }
+
+  if (table_index == ~0)
+    return clib_error_return (0, "Table index required");
+
+  if (is_add && match == 0)
+    return clib_error_return (0, "Match value required");
+
+  rv = vnet_classify_add_del_session (cm, table_index, match, 
+                                      hit_next_index,
+                                      opaque_index, advance,
+                                      action, metadata, is_add);
+
+  switch(rv)
+    {
+    case 0:
+      break;
+
+    default:
+      return clib_error_return (0, "vnet_classify_add_del_session returned %d",
+                                rv);
+    }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (classify_session_command, static) = {
+    .path = "classify session",
+    .short_help =
+    "classify session [hit-next|l2-hit-next|"
+    "acl-hit-next <next_index>|policer-hit-next <policer_name>]"
+    "\n table-index <nn> match [hex] [l2] [l3 ip4] [opaque-index <index>]"
+    "\n [action set-ip4-fib-id <n>] [action set-ip6-fib-id <n>] [del]",
+    .function = classify_session_command_fn,
+};
+
+static uword 
+unformat_opaque_sw_if_index (unformat_input_t * input, va_list * args)
+{
+  u64 * opaquep = va_arg (*args, u64 *);
+  u32 sw_if_index;
+
+  if (unformat (input, "opaque-sw_if_index %U", unformat_vnet_sw_interface,
+                vnet_get_main(), &sw_if_index))
+    {
+      *opaquep = sw_if_index;
+      return 1;
+    }
+  return 0;
+}
+
+static uword
+unformat_ip_next_node (unformat_input_t * input, va_list * args)
+{
+  vnet_classify_main_t * cm = &vnet_classify_main;
+  u32 * next_indexp = va_arg (*args, u32 *);
+  u32 node_index;
+  u32 next_index = ~0;
+
+  if (unformat (input, "ip6-node %U", unformat_vlib_node,
+                cm->vlib_main, &node_index))
+    {
+      next_index = vlib_node_add_next (cm->vlib_main,
+				       ip6_classify_node.index, node_index);
+    }
+  else if (unformat (input, "ip4-node %U", unformat_vlib_node,
+		     cm->vlib_main, &node_index))
+    {
+      next_index = vlib_node_add_next (cm->vlib_main,
+				       ip4_classify_node.index, node_index);
+    }
+  else
+    return 0;
+
+  *next_indexp = next_index;
+  return 1;
+}
+
+static uword 
+unformat_acl_next_node (unformat_input_t * input, va_list * args)
+{
+  vnet_classify_main_t * cm = &vnet_classify_main;
+  u32 * next_indexp = va_arg (*args, u32 *);
+  u32 node_index;
+  u32 next_index;
+
+  if (unformat (input, "ip6-node %U", unformat_vlib_node,
+                cm->vlib_main, &node_index))
+    {
+      next_index = vlib_node_add_next (cm->vlib_main,
+				       ip6_inacl_node.index, node_index);
+    }
+  else if (unformat (input, "ip4-node %U", unformat_vlib_node,
+		     cm->vlib_main, &node_index))
+    {
+      next_index = vlib_node_add_next (cm->vlib_main,
+				       ip4_inacl_node.index, node_index);
+    }
+  else
+    return 0;
+
+  *next_indexp = next_index;
+  return 1;
+}
+
+static uword 
+unformat_l2_input_next_node (unformat_input_t * input, va_list * args)
+{
+  vnet_classify_main_t * cm = &vnet_classify_main;
+  u32 * next_indexp = va_arg (*args, u32 *);
+  u32 node_index;
+  u32 next_index;
+
+  if (unformat (input, "input-node %U", unformat_vlib_node,
+                cm->vlib_main, &node_index))
+    {
+      next_index = vlib_node_add_next 
+        (cm->vlib_main, l2_input_classify_node.index, node_index);
+
+      *next_indexp = next_index;
+      return 1;
+    }
+  return 0;
+}
+
+static uword 
+unformat_l2_output_next_node (unformat_input_t * input, va_list * args)
+{
+  vnet_classify_main_t * cm = &vnet_classify_main;
+  u32 * next_indexp = va_arg (*args, u32 *);
+  u32 node_index;
+  u32 next_index;
+
+  if (unformat (input, "output-node %U", unformat_vlib_node,
+                cm->vlib_main, &node_index))
+    {
+      next_index = vlib_node_add_next 
+        (cm->vlib_main, l2_output_classify_node.index, node_index);
+
+      *next_indexp = next_index;
+      return 1;
+    }
+  return 0;
+}
+
+static clib_error_t * 
+vnet_classify_init (vlib_main_t * vm)
+{
+  vnet_classify_main_t * cm = &vnet_classify_main;
+
+  cm->vlib_main = vm;
+  cm->vnet_main = vnet_get_main();
+
+  vnet_classify_register_unformat_opaque_index_fn 
+    (unformat_opaque_sw_if_index);
+
+  vnet_classify_register_unformat_ip_next_index_fn
+    (unformat_ip_next_node);
+
+  vnet_classify_register_unformat_l2_next_index_fn
+    (unformat_l2_input_next_node);
+
+  vnet_classify_register_unformat_l2_next_index_fn
+    (unformat_l2_output_next_node);
+
+  vnet_classify_register_unformat_acl_next_index_fn
+    (unformat_acl_next_node);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (vnet_classify_init);
+
+#define TEST_CODE 1
+
+#if TEST_CODE > 0
+static clib_error_t *
+test_classify_command_fn (vlib_main_t * vm,
+		 unformat_input_t * input,
+		 vlib_cli_command_t * cmd)
+{
+  u32 buckets = 2;
+  u32 sessions = 10;
+  int i, rv;
+  vnet_classify_table_t * t = 0;
+  classify_data_or_mask_t * mask;
+  classify_data_or_mask_t * data;
+  u8 *mp = 0, *dp = 0;
+  vnet_classify_main_t * cm = &vnet_classify_main;
+  vnet_classify_entry_t * e;
+  int is_add = 1;
+  u32 tmp;
+  u32 table_index = ~0;
+  ip4_address_t src;
+  u32 deleted = 0;
+  u32 memory_size = 64<<20;
+
+  /* Default starting address 1.0.0.10 */
+  src.as_u32 = clib_net_to_host_u32 (0x0100000A);
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "sessions %d", &sessions))
+      ;
+    else if (unformat (input, "src %U", unformat_ip4_address, &src))
+      ;
+    else if (unformat (input, "buckets %d", &buckets))
+      ;
+    else if (unformat (input, "memory-size %uM", &tmp))
+      memory_size = tmp<<20;
+    else if (unformat (input, "memory-size %uG", &tmp))
+      memory_size = tmp<<30;
+    else if (unformat (input, "del"))
+      is_add = 0;
+    else if (unformat (input, "table %d", &table_index))
+      ;
+    else
+      break;
+    }
+
+  vec_validate_aligned (mp, 3 * sizeof(u32x4), sizeof(u32x4));
+  vec_validate_aligned (dp, 3 * sizeof(u32x4), sizeof(u32x4));
+
+  mask = (classify_data_or_mask_t *) mp;
+  data = (classify_data_or_mask_t *) dp;
+
+  data->ip.src_address.as_u32 = src.as_u32;
+
+  /* Mask on src address */
+  memset (&mask->ip.src_address, 0xff, 4);
+
+  buckets = 1<<max_log2(buckets);
+
+  if (table_index != ~0)
+    {
+      if (pool_is_free_index (cm->tables, table_index))
+        {
+          vlib_cli_output (vm, "No such table %d", table_index);
+          goto out;
+        }
+      t = pool_elt_at_index (cm->tables, table_index);
+    }
+
+  if (is_add)
+    {
+      if (t == 0)
+        {
+          t = vnet_classify_new_table (cm, (u8 *)mask, buckets, 
+                                       memory_size,
+                                       0 /* skip */,
+                                       3 /* vectors to match */);
+          t->miss_next_index = IP_LOOKUP_NEXT_DROP;
+          vlib_cli_output (vm, "Create table %d", t - cm->tables);
+        }
+      
+      vlib_cli_output (vm, "Add %d sessions to %d buckets...", 
+                       sessions, buckets);
+      
+      for (i = 0; i < sessions; i++)
+        {
+          rv = vnet_classify_add_del_session (cm, t - cm->tables, (u8 *) data,
+                                              IP_LOOKUP_NEXT_DROP,
+                                              i+100 /* opaque_index */, 
+                                              0 /* advance */, 0, 0,
+                                              1 /* is_add */);
+
+          if (rv != 0)
+            clib_warning ("add: returned %d", rv);
+          
+          tmp = clib_net_to_host_u32 (data->ip.src_address.as_u32) + 1;
+          data->ip.src_address.as_u32 = clib_net_to_host_u32 (tmp);
+        }
+      goto out;
+    }
+
+  if (t == 0)
+    {
+      vlib_cli_output (vm, "Must specify table index to delete sessions");
+      goto out;
+    }
+
+  vlib_cli_output (vm, "Try to delete %d sessions...", sessions);
+
+  for (i = 0; i < sessions; i++)
+    {
+      u8 * key_minus_skip;
+      u64 hash;
+
+      hash = vnet_classify_hash_packet (t, (u8 *) data);
+
+      e = vnet_classify_find_entry (t, (u8 *) data, hash, 0 /* time_now */);
+      /* Previous delete, perhaps... */
+      if (e == 0)
+        continue;
+      ASSERT (e->opaque_index == (i+100));
+
+      key_minus_skip = (u8 *)e->key;
+      key_minus_skip -= t->skip_n_vectors * sizeof (u32x4);
+
+      rv = vnet_classify_add_del_session (cm, t - cm->tables, key_minus_skip,
+                                          IP_LOOKUP_NEXT_DROP,
+                                          i+100 /* opaque_index */, 
+                                          0 /* advance */, 0, 0,
+                                          0 /* is_add */);
+      if (rv != 0)
+        clib_warning ("del: returned %d", rv);
+      
+      tmp = clib_net_to_host_u32 (data->ip.src_address.as_u32) + 1;
+      data->ip.src_address.as_u32 = clib_net_to_host_u32 (tmp);
+      deleted++;
+    }
+
+  vlib_cli_output (vm, "Deleted %d sessions...", deleted);
+
+ out:
+  vec_free (mp);
+  vec_free (dp);
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (test_classify_command, static) = {
+    .path = "test classify",
+    .short_help = 
+    "test classify [src <ip>] [sessions <nn>] [buckets <nn>] [table <nn>] [del]",
+    .function = test_classify_command_fn,
+};
+#endif /* TEST_CODE */
diff --git a/src/vnet/classify/vnet_classify.h b/src/vnet/classify/vnet_classify.h
new file mode 100644
index 00000000..d0b896ed
--- /dev/null
+++ b/src/vnet/classify/vnet_classify.h
@@ -0,0 +1,523 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_vnet_classify_h__
+#define __included_vnet_classify_h__
+
+#include <stdarg.h>
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/ip/ip_packet.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vlib/cli.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/feat_bitmap.h>
+#include <vnet/api_errno.h>     /* for API error numbers */
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/cache.h>
+#include <vppinfra/xxhash.h>
+
+extern vlib_node_registration_t ip4_classify_node;
+extern vlib_node_registration_t ip6_classify_node;
+
+#define CLASSIFY_TRACE 0
+
+#if !defined( __aarch64__) && !defined(__arm__)
+#define CLASSIFY_USE_SSE //Allow usage of SSE operations
+#endif
+
+#define U32X4_ALIGNED(p) PREDICT_TRUE((((intptr_t)p) & 0xf) == 0)
+
+/*
+ * Classify table option to process packets
+ *  CLASSIFY_FLAG_USE_CURR_DATA:
+ *   - classify packets starting from VPP node’s current data pointer
+ */
+#define CLASSIFY_FLAG_USE_CURR_DATA              1
+
+/*
+ * Classify session action
+ *  CLASSIFY_ACTION_SET_IP4_FIB_INDEX:
+ *   - Classified IP packets will be looked up
+ *     from the specified ipv4 fib table
+ *  CLASSIFY_ACTION_SET_IP6_FIB_INDEX:
+ *   - Classified IP packets will be looked up
+ *     from the specified ipv6 fib table
+ */
+#define CLASSIFY_ACTION_SET_IP4_FIB_INDEX       1
+#define CLASSIFY_ACTION_SET_IP6_FIB_INDEX       2
+
+struct _vnet_classify_main;
+typedef struct _vnet_classify_main vnet_classify_main_t;
+
+#define foreach_size_in_u32x4                   \
+_(1)                                            \
+_(2)                                            \
+_(3)                                            \
+_(4)                                            \
+_(5)
+
+typedef CLIB_PACKED(struct _vnet_classify_entry {
+  /* Graph node next index */
+  u32 next_index;
+
+  /* put into vnet_buffer(b)->l2_classfy.opaque_index */
+  union {
+    struct {
+      u32 opaque_index;
+      /* advance on hit, note it's a signed quantity... */
+      i32 advance;
+    };
+    u64 opaque_count;
+  };
+
+  /* Really only need 1 bit */
+  u8 flags;
+#define VNET_CLASSIFY_ENTRY_FREE	(1<<0)
+
+  u8 action;
+  u16 metadata;
+
+  /* Hit counter, last heard time */
+  union {
+    u64 hits;
+    struct _vnet_classify_entry * next_free;
+  };
+    
+  f64 last_heard;
+
+  /* Must be aligned to a 16-octet boundary */
+  u32x4 key[0];
+}) vnet_classify_entry_t;
+
+static inline int vnet_classify_entry_is_free (vnet_classify_entry_t * e)
+{
+  return e->flags & VNET_CLASSIFY_ENTRY_FREE;
+}
+
+static inline int vnet_classify_entry_is_busy (vnet_classify_entry_t * e)
+{
+  return ((e->flags & VNET_CLASSIFY_ENTRY_FREE) == 0);
+}
+
+/* Need these to con the vector allocator */
+#define _(size)                                 \
+typedef CLIB_PACKED(struct {                    \
+  u32 pad0[4];                                  \
+  u64 pad1[2];                                  \
+  u32x4 key[size];                              \
+}) vnet_classify_entry_##size##_t;
+foreach_size_in_u32x4;
+#undef _
+
+typedef struct {
+  union {
+    struct {
+      u32 offset;
+      u8 pad[3];
+      u8 log2_pages;
+    };
+    u64 as_u64;
+  };
+} vnet_classify_bucket_t;
+
+typedef struct {
+  /* Mask to apply after skipping N vectors */
+  u32x4 *mask;
+  /* Buckets and entries */
+  vnet_classify_bucket_t * buckets;
+  vnet_classify_entry_t * entries;
+  
+  /* Config parameters */
+  u32 match_n_vectors;
+  u32 skip_n_vectors;
+  u32 nbuckets;
+  u32 log2_nbuckets;
+  int entries_per_page;
+  u32 active_elements;
+  u32 current_data_flag;
+  int current_data_offset;
+  u32 data_offset;
+  /* Index of next table to try */
+  u32 next_table_index;
+  
+  /* Miss next index, return if next_table_index = 0 */
+  u32 miss_next_index;
+  
+  /* Per-bucket working copies, one per thread */
+  vnet_classify_entry_t ** working_copies;
+  vnet_classify_bucket_t saved_bucket;
+  
+  /* Free entry freelists */
+  vnet_classify_entry_t **freelists;
+
+  u8 * name;
+  
+  /* Private allocation arena, protected by the writer lock */
+  void * mheap;
+  
+  /* Writer (only) lock for this table */
+  volatile u32 * writer_lock;
+  
+} vnet_classify_table_t;
+
+struct _vnet_classify_main {
+  /* Table pool */
+  vnet_classify_table_t * tables;
+  
+  /* Registered next-index, opaque unformat fcns */
+  unformat_function_t ** unformat_l2_next_index_fns;
+  unformat_function_t ** unformat_ip_next_index_fns;
+  unformat_function_t ** unformat_acl_next_index_fns;
+  unformat_function_t ** unformat_policer_next_index_fns;
+  unformat_function_t ** unformat_opaque_index_fns;
+
+  /* convenience variables */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+};
+
+extern vnet_classify_main_t vnet_classify_main;
+
+u8 * format_classify_table (u8 * s, va_list * args);
+
+u64 vnet_classify_hash_packet (vnet_classify_table_t * t, u8 * h);
+
+static inline u64 
+vnet_classify_hash_packet_inline (vnet_classify_table_t * t, 
+                                  u8 * h)
+{
+  u32x4 *mask;
+
+  union {
+    u32x4 as_u32x4;
+    u64 as_u64[2];
+  } xor_sum __attribute__((aligned(sizeof(u32x4))));
+
+  ASSERT(t);
+  mask = t->mask;
+#ifdef CLASSIFY_USE_SSE
+  if (U32X4_ALIGNED(h)) {  //SSE can't handle unaligned data
+    u32x4 *data = (u32x4 *)h;
+    xor_sum.as_u32x4  = data[0 + t->skip_n_vectors] & mask[0];
+    switch (t->match_n_vectors)
+    {
+      case 5:
+        xor_sum.as_u32x4 ^= data[4 + t->skip_n_vectors] & mask[4];
+        /* FALLTHROUGH */
+      case 4:
+        xor_sum.as_u32x4 ^= data[3 + t->skip_n_vectors] & mask[3];
+        /* FALLTHROUGH */
+      case 3:
+        xor_sum.as_u32x4 ^= data[2 + t->skip_n_vectors] & mask[2];
+        /* FALLTHROUGH */
+      case 2:
+        xor_sum.as_u32x4 ^= data[1 + t->skip_n_vectors] & mask[1];
+        /* FALLTHROUGH */
+      case 1:
+        break;
+      default:
+        abort();
+    }
+  } else
+#endif /* CLASSIFY_USE_SSE */
+  {
+    u32 skip_u64 = t->skip_n_vectors * 2;
+    u64 *data64 = (u64 *)h;
+    xor_sum.as_u64[0] = data64[0 + skip_u64] & ((u64 *)mask)[0];
+    xor_sum.as_u64[1] = data64[1 + skip_u64] & ((u64 *)mask)[1];
+    switch (t->match_n_vectors)
+    {
+      case 5:
+        xor_sum.as_u64[0]  ^= data64[8 + skip_u64] & ((u64 *)mask)[8];
+        xor_sum.as_u64[1]  ^= data64[9 + skip_u64] & ((u64 *)mask)[9];
+        /* FALLTHROUGH */
+      case 4:
+        xor_sum.as_u64[0]  ^= data64[6 + skip_u64] & ((u64 *)mask)[6];
+        xor_sum.as_u64[1]  ^= data64[7 + skip_u64] & ((u64 *)mask)[7];
+        /* FALLTHROUGH */
+      case 3:
+        xor_sum.as_u64[0]  ^= data64[4 + skip_u64] & ((u64 *)mask)[4];
+        xor_sum.as_u64[1]  ^= data64[5 + skip_u64] & ((u64 *)mask)[5];
+        /* FALLTHROUGH */
+      case 2:
+        xor_sum.as_u64[0]  ^= data64[2 + skip_u64] & ((u64 *)mask)[2];
+        xor_sum.as_u64[1]  ^= data64[3 + skip_u64] & ((u64 *)mask)[3];
+        /* FALLTHROUGH */
+      case 1:
+        break;
+
+      default:
+        abort();
+    }
+  }
+  
+  return clib_xxhash (xor_sum.as_u64[0] ^ xor_sum.as_u64[1]);
+}
+
+static inline void 
+vnet_classify_prefetch_bucket (vnet_classify_table_t * t, u64 hash)
+{
+  u32 bucket_index;
+  
+  ASSERT (is_pow2(t->nbuckets));
+  
+  bucket_index = hash & (t->nbuckets - 1);
+  
+  CLIB_PREFETCH(&t->buckets[bucket_index], CLIB_CACHE_LINE_BYTES, LOAD);
+}
+
+static inline vnet_classify_entry_t * 
+vnet_classify_get_entry (vnet_classify_table_t * t, uword offset)
+{
+  u8 * hp = t->mheap;
+  u8 * vp = hp + offset;
+  
+  return (void *) vp;
+}
+
+static inline uword vnet_classify_get_offset (vnet_classify_table_t * t, 
+                                              vnet_classify_entry_t * v)
+{
+  u8 * hp, * vp;
+
+  hp = (u8 *) t->mheap;
+  vp = (u8 *) v;
+
+  ASSERT((vp - hp) < 0x100000000ULL);
+  return vp - hp;
+}
+
+static inline vnet_classify_entry_t *
+vnet_classify_entry_at_index (vnet_classify_table_t * t, 
+                              vnet_classify_entry_t * e,
+                              u32 index)
+{
+  u8 * eu8;
+
+  eu8 = (u8 *)e;
+
+  eu8 += index * (sizeof (vnet_classify_entry_t) +
+                  (t->match_n_vectors * sizeof (u32x4)));
+
+  return (vnet_classify_entry_t *) eu8;
+}
+
+static inline void
+vnet_classify_prefetch_entry (vnet_classify_table_t * t, 
+                              u64 hash)
+{
+  u32 bucket_index;
+  u32 value_index;
+  vnet_classify_bucket_t * b;
+  vnet_classify_entry_t * e;
+
+  bucket_index = hash & (t->nbuckets - 1);
+
+  b = &t->buckets[bucket_index];
+  
+  if (b->offset == 0)
+    return;
+
+  hash >>= t->log2_nbuckets;
+
+  e = vnet_classify_get_entry (t, b->offset);
+  value_index = hash & ((1<<b->log2_pages)-1);
+
+  e = vnet_classify_entry_at_index (t, e, value_index);
+
+  CLIB_PREFETCH(e, CLIB_CACHE_LINE_BYTES, LOAD);
+}
+
+vnet_classify_entry_t *
+vnet_classify_find_entry (vnet_classify_table_t * t,
+                          u8 * h, u64 hash, f64 now);
+
+static inline vnet_classify_entry_t *
+vnet_classify_find_entry_inline (vnet_classify_table_t * t,
+                                 u8 * h, u64 hash, f64 now)
+  {
+  vnet_classify_entry_t * v;
+  u32x4 *mask, *key;
+  union {
+    u32x4 as_u32x4;
+    u64 as_u64[2];
+  } result __attribute__((aligned(sizeof(u32x4))));
+  vnet_classify_bucket_t * b;
+  u32 value_index;
+  u32 bucket_index;
+  int i;
+
+  bucket_index = hash & (t->nbuckets-1);
+  b = &t->buckets[bucket_index];
+  mask = t->mask;
+
+  if (b->offset == 0)
+    return 0;
+
+  hash >>= t->log2_nbuckets;
+
+  v = vnet_classify_get_entry (t, b->offset);
+  value_index = hash & ((1<<b->log2_pages)-1);
+  v = vnet_classify_entry_at_index (t, v, value_index);
+
+#ifdef CLASSIFY_USE_SSE
+  if (U32X4_ALIGNED(h)) {
+    u32x4 *data = (u32x4 *) h;
+    for (i = 0; i < t->entries_per_page; i++) {
+      key = v->key;
+      result.as_u32x4 = (data[0 + t->skip_n_vectors] & mask[0]) ^ key[0];
+      switch (t->match_n_vectors)
+      {
+        case 5:
+          result.as_u32x4 |= (data[4 + t->skip_n_vectors] & mask[4]) ^ key[4];
+          /* FALLTHROUGH */
+        case 4:
+          result.as_u32x4 |= (data[3 + t->skip_n_vectors] & mask[3]) ^ key[3];
+          /* FALLTHROUGH */
+        case 3:
+          result.as_u32x4 |= (data[2 + t->skip_n_vectors] & mask[2]) ^ key[2];
+          /* FALLTHROUGH */
+        case 2:
+          result.as_u32x4 |= (data[1 + t->skip_n_vectors] & mask[1]) ^ key[1];
+          /* FALLTHROUGH */
+        case 1:
+          break;
+        default:
+          abort();
+      }
+
+      if (u32x4_zero_byte_mask (result.as_u32x4) == 0xffff) {
+        if (PREDICT_TRUE(now)) {
+          v->hits++;
+          v->last_heard = now;
+        }
+        return (v);
+      }
+      v = vnet_classify_entry_at_index (t, v, 1);
+    }
+  } else
+#endif /* CLASSIFY_USE_SSE */
+  {
+    u32 skip_u64 = t->skip_n_vectors * 2;
+    u64 *data64 = (u64 *)h;
+    for (i = 0; i < t->entries_per_page; i++) {
+      key = v->key;
+
+      result.as_u64[0] = (data64[0 + skip_u64] & ((u64 *)mask)[0]) ^ ((u64 *)key)[0];
+      result.as_u64[1] = (data64[1 + skip_u64] & ((u64 *)mask)[1]) ^ ((u64 *)key)[1];
+      switch (t->match_n_vectors)
+      {
+        case 5:
+          result.as_u64[0] |= (data64[8 + skip_u64] & ((u64 *)mask)[8]) ^ ((u64 *)key)[8];
+          result.as_u64[1] |= (data64[9 + skip_u64] & ((u64 *)mask)[9]) ^ ((u64 *)key)[9];
+          /* FALLTHROUGH */
+        case 4:
+          result.as_u64[0] |= (data64[6 + skip_u64] & ((u64 *)mask)[6]) ^ ((u64 *)key)[6];
+          result.as_u64[1] |= (data64[7 + skip_u64] & ((u64 *)mask)[7]) ^ ((u64 *)key)[7];
+          /* FALLTHROUGH */
+        case 3:
+          result.as_u64[0] |= (data64[4 + skip_u64] & ((u64 *)mask)[4]) ^ ((u64 *)key)[4];
+          result.as_u64[1] |= (data64[5 + skip_u64] & ((u64 *)mask)[5]) ^ ((u64 *)key)[5];
+          /* FALLTHROUGH */
+        case 2:
+          result.as_u64[0] |= (data64[2 + skip_u64] & ((u64 *)mask)[2]) ^ ((u64 *)key)[2];
+          result.as_u64[1] |= (data64[3 + skip_u64] & ((u64 *)mask)[3]) ^ ((u64 *)key)[3];
+          /* FALLTHROUGH */
+        case 1:
+          break;
+        default:
+          abort();
+      }
+
+      if (result.as_u64[0] == 0 && result.as_u64[1] == 0) {
+        if (PREDICT_TRUE(now)) {
+          v->hits++;
+          v->last_heard = now;
+        }
+        return (v);
+      }
+
+      v = vnet_classify_entry_at_index (t, v, 1);
+    }
+  }
+  return 0;
+  }
+
+vnet_classify_table_t * 
+vnet_classify_new_table (vnet_classify_main_t *cm,
+                         u8 * mask, u32 nbuckets, u32 memory_size,
+                         u32 skip_n_vectors,
+                         u32 match_n_vectors);
+
+int vnet_classify_add_del_session (vnet_classify_main_t * cm, 
+                                   u32 table_index, 
+                                   u8 * match, 
+                                   u32 hit_next_index,
+                                   u32 opaque_index, 
+                                   i32 advance,
+                                   u8 action,
+                                   u32 metadata,
+                                   int is_add);
+
+int vnet_classify_add_del_table (vnet_classify_main_t * cm,
+                                 u8 * mask, 
+                                 u32 nbuckets,
+                                 u32 memory_size,
+                                 u32 skip,
+                                 u32 match,
+                                 u32 next_table_index,
+                                 u32 miss_next_index,
+                                 u32 * table_index,
+                                 u8 current_data_flag,
+                                 i16 current_data_offset,
+                                 int is_add,
+				 int del_chain);
+
+unformat_function_t unformat_ip4_mask;
+unformat_function_t unformat_ip6_mask;
+unformat_function_t unformat_l3_mask;
+unformat_function_t unformat_l2_mask;
+unformat_function_t unformat_classify_mask;
+unformat_function_t unformat_l2_next_index;
+unformat_function_t unformat_ip_next_index;
+unformat_function_t unformat_ip4_match;
+unformat_function_t unformat_ip6_match;
+unformat_function_t unformat_l3_match;
+unformat_function_t unformat_vlan_tag;
+unformat_function_t unformat_l2_match;
+unformat_function_t unformat_classify_match;
+
+void vnet_classify_register_unformat_ip_next_index_fn 
+(unformat_function_t * fn);
+
+void vnet_classify_register_unformat_l2_next_index_fn 
+(unformat_function_t * fn);
+
+void vnet_classify_register_unformat_acl_next_index_fn 
+(unformat_function_t * fn);
+
+void  vnet_classify_register_unformat_policer_next_index_fn
+(unformat_function_t * fn);
+
+void vnet_classify_register_unformat_opaque_index_fn (unformat_function_t * fn);
+
+#endif /* __included_vnet_classify_h__ */
diff --git a/src/vnet/config.c b/src/vnet/config.c
new file mode 100644
index 00000000..03189d77
--- /dev/null
+++ b/src/vnet/config.c
@@ -0,0 +1,361 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * config.c: feature configuration
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+
+static vnet_config_feature_t *
+duplicate_feature_vector (vnet_config_feature_t * feature_vector)
+{
+  vnet_config_feature_t *result, *f;
+
+  result = vec_dup (feature_vector);
+  vec_foreach (f, result) f->feature_config = vec_dup (f->feature_config);
+
+  return result;
+}
+
+static void
+free_feature_vector (vnet_config_feature_t * feature_vector)
+{
+  vnet_config_feature_t *f;
+
+  vec_foreach (f, feature_vector) vnet_config_feature_free (f);
+  vec_free (feature_vector);
+}
+
+static u32
+add_next (vlib_main_t * vm,
+	  vnet_config_main_t * cm, u32 last_node_index, u32 this_node_index)
+{
+  u32 i, ni = ~0;
+
+  if (last_node_index != ~0)
+    return vlib_node_add_next (vm, last_node_index, this_node_index);
+
+  for (i = 0; i < vec_len (cm->start_node_indices); i++)
+    {
+      u32 tmp;
+      tmp =
+	vlib_node_add_next (vm, cm->start_node_indices[i], this_node_index);
+      if (ni == ~0)
+	ni = tmp;
+      /* Start nodes to first must agree on next indices. */
+      ASSERT (ni == tmp);
+    }
+
+  return ni;
+}
+
+static vnet_config_t *
+find_config_with_features (vlib_main_t * vm,
+			   vnet_config_main_t * cm,
+			   vnet_config_feature_t * feature_vector)
+{
+  u32 last_node_index = ~0;
+  vnet_config_feature_t *f;
+  u32 *config_string;
+  uword *p;
+  vnet_config_t *c;
+
+  config_string = cm->config_string_temp;
+  cm->config_string_temp = 0;
+  if (config_string)
+    _vec_len (config_string) = 0;
+
+  vec_foreach (f, feature_vector)
+  {
+    /* Connect node graph. */
+    f->next_index = add_next (vm, cm, last_node_index, f->node_index);
+    last_node_index = f->node_index;
+
+    /* Store next index in config string. */
+    vec_add1 (config_string, f->next_index);
+
+    /* Store feature config. */
+    vec_add (config_string, f->feature_config, vec_len (f->feature_config));
+  }
+
+  /* Terminate config string with next for end node. */
+  if (last_node_index == ~0 || last_node_index != cm->end_node_index)
+    {
+      u32 next_index = add_next (vm, cm, last_node_index, cm->end_node_index);
+      vec_add1 (config_string, next_index);
+    }
+
+  /* See if config string is unique. */
+  p = hash_get_mem (cm->config_string_hash, config_string);
+  if (p)
+    {
+      /* Not unique.  Share existing config. */
+      cm->config_string_temp = config_string;	/* we'll use it again later. */
+      free_feature_vector (feature_vector);
+      c = pool_elt_at_index (cm->config_pool, p[0]);
+    }
+  else
+    {
+      u32 *d;
+
+      pool_get (cm->config_pool, c);
+      c->index = c - cm->config_pool;
+      c->features = feature_vector;
+      c->config_string_vector = config_string;
+
+      /* Allocate copy of config string in heap.
+         VLIB buffers will maintain pointers to heap as they read out
+         configuration data. */
+      c->config_string_heap_index
+	= heap_alloc (cm->config_string_heap, vec_len (config_string) + 1,
+		      c->config_string_heap_handle);
+
+      /* First element in heap points back to pool index. */
+      d =
+	vec_elt_at_index (cm->config_string_heap,
+			  c->config_string_heap_index);
+      d[0] = c->index;
+      clib_memcpy (d + 1, config_string, vec_bytes (config_string));
+      hash_set_mem (cm->config_string_hash, config_string, c->index);
+
+      c->reference_count = 0;	/* will be incremented by caller. */
+    }
+
+  return c;
+}
+
+void
+vnet_config_init (vlib_main_t * vm,
+		  vnet_config_main_t * cm,
+		  char *start_node_names[],
+		  int n_start_node_names,
+		  char *feature_node_names[], int n_feature_node_names)
+{
+  vlib_node_t *n;
+  u32 i;
+
+  memset (cm, 0, sizeof (cm[0]));
+
+  cm->config_string_hash =
+    hash_create_vec (0,
+		     STRUCT_SIZE_OF (vnet_config_t, config_string_vector[0]),
+		     sizeof (uword));
+
+  ASSERT (n_feature_node_names >= 1);
+
+  vec_resize (cm->start_node_indices, n_start_node_names);
+  for (i = 0; i < n_start_node_names; i++)
+    {
+      n = vlib_get_node_by_name (vm, (u8 *) start_node_names[i]);
+      /* Given node name must exist. */
+      ASSERT (n != 0);
+      cm->start_node_indices[i] = n->index;
+    }
+
+  vec_resize (cm->node_index_by_feature_index, n_feature_node_names);
+  for (i = 0; i < n_feature_node_names; i++)
+    {
+      if (!feature_node_names[i])
+	cm->node_index_by_feature_index[i] = ~0;
+      else
+	{
+	  n = vlib_get_node_by_name (vm, (u8 *) feature_node_names[i]);
+	  /* Given node may exist in plug-in library which is not present */
+	  if (n)
+	    {
+	      if (i + 1 == n_feature_node_names)
+		cm->end_node_index = n->index;
+	      cm->node_index_by_feature_index[i] = n->index;
+	    }
+	  else
+	    cm->node_index_by_feature_index[i] = ~0;
+	}
+    }
+}
+
+static void
+remove_reference (vnet_config_main_t * cm, vnet_config_t * c)
+{
+  ASSERT (c->reference_count > 0);
+  c->reference_count -= 1;
+  if (c->reference_count == 0)
+    {
+      hash_unset (cm->config_string_hash, c->config_string_vector);
+      vnet_config_free (cm, c);
+      pool_put (cm->config_pool, c);
+    }
+}
+
+static int
+feature_cmp (void *a1, void *a2)
+{
+  vnet_config_feature_t *f1 = a1;
+  vnet_config_feature_t *f2 = a2;
+
+  return (int) f1->feature_index - f2->feature_index;
+}
+
+always_inline u32 *
+vnet_get_config_heap (vnet_config_main_t * cm, u32 ci)
+{
+  return heap_elt_at_index (cm->config_string_heap, ci);
+}
+
+u32
+vnet_config_add_feature (vlib_main_t * vm,
+			 vnet_config_main_t * cm,
+			 u32 config_string_heap_index,
+			 u32 feature_index,
+			 void *feature_config, u32 n_feature_config_bytes)
+{
+  vnet_config_t *old, *new;
+  vnet_config_feature_t *new_features, *f;
+  u32 n_feature_config_u32s;
+  u32 node_index = vec_elt (cm->node_index_by_feature_index, feature_index);
+
+  if (node_index == ~0)		// feature node does not exist
+    return config_string_heap_index;	// return original config index
+
+  if (config_string_heap_index == ~0)
+    {
+      old = 0;
+      new_features = 0;
+    }
+  else
+    {
+      u32 *p = vnet_get_config_heap (cm, config_string_heap_index);
+      old = pool_elt_at_index (cm->config_pool, p[-1]);
+      new_features = old->features;
+      if (new_features)
+	new_features = duplicate_feature_vector (new_features);
+    }
+
+  vec_add2 (new_features, f, 1);
+  f->feature_index = feature_index;
+  f->node_index = node_index;
+
+  n_feature_config_u32s =
+    round_pow2 (n_feature_config_bytes,
+		sizeof (f->feature_config[0])) /
+    sizeof (f->feature_config[0]);
+  vec_add (f->feature_config, feature_config, n_feature_config_u32s);
+
+  /* Sort (prioritize) features. */
+  if (vec_len (new_features) > 1)
+    vec_sort_with_function (new_features, feature_cmp);
+
+  if (old)
+    remove_reference (cm, old);
+
+  new = find_config_with_features (vm, cm, new_features);
+  new->reference_count += 1;
+
+  /*
+   * User gets pointer to config string first element
+   * (which defines the pool index
+   * this config string comes from).
+   */
+  vec_validate (cm->config_pool_index_by_user_index,
+		new->config_string_heap_index + 1);
+  cm->config_pool_index_by_user_index[new->config_string_heap_index + 1]
+    = new - cm->config_pool;
+  return new->config_string_heap_index + 1;
+}
+
+u32
+vnet_config_del_feature (vlib_main_t * vm,
+			 vnet_config_main_t * cm,
+			 u32 config_string_heap_index,
+			 u32 feature_index,
+			 void *feature_config, u32 n_feature_config_bytes)
+{
+  vnet_config_t *old, *new;
+  vnet_config_feature_t *new_features, *f;
+  u32 n_feature_config_u32s;
+
+  {
+    u32 *p = vnet_get_config_heap (cm, config_string_heap_index);
+
+    old = pool_elt_at_index (cm->config_pool, p[-1]);
+  }
+
+  n_feature_config_u32s =
+    round_pow2 (n_feature_config_bytes,
+		sizeof (f->feature_config[0])) /
+    sizeof (f->feature_config[0]);
+
+  /* Find feature with same index and opaque data. */
+  vec_foreach (f, old->features)
+  {
+    if (f->feature_index == feature_index
+	&& vec_len (f->feature_config) == n_feature_config_u32s
+	&& (n_feature_config_u32s == 0
+	    || !memcmp (f->feature_config, feature_config,
+			n_feature_config_bytes)))
+      break;
+  }
+
+  /* Feature not found. */
+  if (f >= vec_end (old->features))
+    return config_string_heap_index;	// return original config index
+
+  new_features = duplicate_feature_vector (old->features);
+  f = new_features + (f - old->features);
+  vnet_config_feature_free (f);
+  vec_delete (new_features, 1, f - new_features);
+
+  /* must remove old from config_pool now as it may be expanded and change
+     memory location if the following function find_config_with_features()
+     adds a new config because none of existing config's has matching features
+     and so can be reused */
+  remove_reference (cm, old);
+  new = find_config_with_features (vm, cm, new_features);
+  new->reference_count += 1;
+
+  vec_validate (cm->config_pool_index_by_user_index,
+		new->config_string_heap_index + 1);
+  cm->config_pool_index_by_user_index[new->config_string_heap_index + 1]
+    = new - cm->config_pool;
+  return new->config_string_heap_index + 1;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/config.h b/src/vnet/config.h
new file mode 100644
index 00000000..b77a7794
--- /dev/null
+++ b/src/vnet/config.h
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * config.h: feature configuration
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vnet_config_h
+#define included_vnet_config_h
+
+#include <vlib/vlib.h>
+#include <vppinfra/heap.h>
+
+typedef struct
+{
+  /* Features are prioritized by index.  Smaller indices get
+     performed first. */
+  u32 feature_index;
+
+  /* VLIB node which performs feature. */
+  u32 node_index;
+
+  /* Next index relative to previous node or main node. */
+  u32 next_index;
+
+  /* Opaque per feature configuration data. */
+  u32 *feature_config;
+} vnet_config_feature_t;
+
+always_inline void
+vnet_config_feature_free (vnet_config_feature_t * f)
+{
+  vec_free (f->feature_config);
+}
+
+typedef struct
+{
+  /* Sorted vector of features for this configuration. */
+  vnet_config_feature_t *features;
+
+  /* Config string as vector for hashing. */
+  u32 *config_string_vector;
+
+  /* Config string including all next indices and feature data as a vector. */
+  u32 config_string_heap_index, config_string_heap_handle;
+
+  /* Index in main pool. */
+  u32 index;
+
+  /* Number of interfaces/traffic classes that reference this config. */
+  u32 reference_count;
+} vnet_config_t;
+
+typedef struct
+{
+  /* Pool of configs.  Index 0 is always null config and is never deleted. */
+  vnet_config_t *config_pool;
+
+  /* Hash table mapping vector config string to config pool index. */
+  uword *config_string_hash;
+
+  /* Global heap of configuration data. */
+  u32 *config_string_heap;
+
+  /* Node index which starts/ends feature processing. */
+  u32 *start_node_indices, end_node_index;
+
+  /* Interior feature processing nodes (not including start and end nodes). */
+  u32 *node_index_by_feature_index;
+
+  /* vnet_config pool index by user index */
+  u32 *config_pool_index_by_user_index;
+
+  /* Temporary vector for holding config strings.  Used to avoid continually
+     allocating vectors. */
+  u32 *config_string_temp;
+} vnet_config_main_t;
+
+always_inline void
+vnet_config_free (vnet_config_main_t * cm, vnet_config_t * c)
+{
+  vnet_config_feature_t *f;
+  vec_foreach (f, c->features) vnet_config_feature_free (f);
+  vec_free (c->features);
+  heap_dealloc (cm->config_string_heap, c->config_string_heap_handle);
+  vec_free (c->config_string_vector);
+}
+
+always_inline void *
+vnet_get_config_data (vnet_config_main_t * cm,
+		      u32 * config_index, u32 * next_index, u32 n_data_bytes)
+{
+  u32 i, n, *d;
+
+  i = *config_index;
+
+  d = heap_elt_at_index (cm->config_string_heap, i);
+
+  n = round_pow2 (n_data_bytes, sizeof (d[0])) / sizeof (d[0]);
+
+  /* Last 32 bits are next index. */
+  *next_index = d[n];
+
+  /* Advance config index to next config. */
+  *config_index = (i + n + 1);
+
+  /* Return config data to user for this feature. */
+  return (void *) d;
+}
+
+void vnet_config_init (vlib_main_t * vm,
+		       vnet_config_main_t * cm,
+		       char *start_node_names[],
+		       int n_start_node_names,
+		       char *feature_node_names[], int n_feature_node_names);
+
+/* Calls to add/delete features from configurations. */
+u32 vnet_config_add_feature (vlib_main_t * vm,
+			     vnet_config_main_t * cm,
+			     u32 config_id,
+			     u32 feature_index,
+			     void *feature_config,
+			     u32 n_feature_config_bytes);
+
+u32 vnet_config_del_feature (vlib_main_t * vm,
+			     vnet_config_main_t * cm,
+			     u32 config_id,
+			     u32 feature_index,
+			     void *feature_config,
+			     u32 n_feature_config_bytes);
+
+u8 *vnet_config_format_features (vlib_main_t * vm,
+				 vnet_config_main_t * cm,
+				 u32 config_index, u8 * s);
+
+#endif /* included_vnet_config_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/cop/cop.c b/src/vnet/cop/cop.c
new file mode 100644
index 00000000..465d6c97
--- /dev/null
+++ b/src/vnet/cop/cop.c
@@ -0,0 +1,387 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/cop/cop.h>
+
+cop_main_t cop_main;
+
+static clib_error_t *
+cop_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
+{
+  cop_main_t * cm = &cop_main;
+  cop_config_data_t _data, *data = &_data;
+  vlib_main_t * vm = cm->vlib_main;
+  vnet_hw_interface_t * hi = vnet_get_sup_hw_interface (vnm, sw_if_index);;
+  cop_config_main_t * ccm;
+  int address_family;
+  u32 ci, default_next;
+
+  memset (data, 0, sizeof(*data));
+
+  /* 
+   * Ignore local interface, pg interfaces. $$$ need a #define for the
+   * first "real" interface. The answer is 5 at the moment.
+   */
+  if (hi->dev_class_index == vnet_local_interface_device_class.index)
+    return 0;
+
+   for (address_family = VNET_COP_IP4; address_family < VNET_N_COPS;
+       address_family++)
+    {
+      ccm = &cm->cop_config_mains[address_family];
+
+      /* 
+       * Once-only code to initialize the per-address-family
+       * cop feature subgraphs.
+       * Since the (single) start-node, cop-input, must be able
+       * to push pkts into three separate subgraphs, we
+       * use a unified cop_feature_type_t enumeration.
+       */
+
+      if (!(ccm->config_main.node_index_by_feature_index))
+        {
+          switch (address_family)
+            {
+            case VNET_COP_IP4:
+              {
+                static char * start_nodes[] = { "cop-input" };
+                static char * feature_nodes[] = {
+                  [IP4_RX_COP_WHITELIST] = "ip4-cop-whitelist",
+                  [IP4_RX_COP_INPUT] = "ip4-input",
+                };
+                
+                vnet_config_init (vm, &ccm->config_main, 
+                                  start_nodes, ARRAY_LEN(start_nodes),
+                                  feature_nodes, ARRAY_LEN(feature_nodes));
+              }
+              break;
+            case VNET_COP_IP6:
+              {
+                static char * start_nodes[] = { "cop-input" };
+                static char * feature_nodes[] = {
+                  [IP6_RX_COP_WHITELIST] = "ip6-cop-whitelist",
+                  [IP6_RX_COP_INPUT] = "ip6-input",
+                };
+                vnet_config_init (vm, &ccm->config_main, 
+                                  start_nodes, ARRAY_LEN(start_nodes),
+                                  feature_nodes, ARRAY_LEN(feature_nodes));
+              }
+              break;
+
+            case VNET_COP_DEFAULT:
+              {
+                static char * start_nodes[] = { "cop-input" };
+                static char * feature_nodes[] = {
+                  [DEFAULT_RX_COP_WHITELIST] = "default-cop-whitelist",
+                  [DEFAULT_RX_COP_INPUT] = "ethernet-input",
+                };
+                vnet_config_init (vm, &ccm->config_main, 
+                                  start_nodes, ARRAY_LEN(start_nodes),
+                                  feature_nodes, ARRAY_LEN(feature_nodes));
+              }
+              break;
+
+            default:
+              clib_warning ("bug");
+              break;
+            }
+        }
+      vec_validate_init_empty (ccm->config_index_by_sw_if_index, sw_if_index,
+                               ~0);
+
+      ci = ccm->config_index_by_sw_if_index[sw_if_index];
+
+      /* Create a sensible initial config: send pkts to xxx-input */
+      if (address_family == VNET_COP_IP4)
+        default_next = IP4_RX_COP_INPUT;
+      else if (address_family == VNET_COP_IP6)
+        default_next = IP6_RX_COP_INPUT;
+      else
+        default_next = DEFAULT_RX_COP_INPUT;
+        
+      if (is_add)
+        ci = vnet_config_add_feature (vm, &ccm->config_main,
+                                      ci, 
+                                      default_next,
+                                      data, sizeof(*data));
+      else
+        ci = vnet_config_del_feature (vm, &ccm->config_main,
+                                      ci, 
+                                      default_next,
+                                      data, sizeof(*data));
+
+      ccm->config_index_by_sw_if_index[sw_if_index] = ci;
+    }
+  return 0;
+}
+
+VNET_SW_INTERFACE_ADD_DEL_FUNCTION (cop_sw_interface_add_del);
+
+static clib_error_t *
+cop_init (vlib_main_t *vm)
+{
+  cop_main_t * cm = &cop_main;
+  clib_error_t * error;
+
+  if ((error = vlib_call_init_function (vm, ip4_whitelist_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ip6_whitelist_init)))
+    return error;
+
+  cm->vlib_main = vm;
+  cm->vnet_main = vnet_get_main();
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (cop_init);
+
+int cop_interface_enable_disable (u32 sw_if_index, int enable_disable)
+{
+  cop_main_t * cm = &cop_main;
+  vnet_sw_interface_t * sw;
+  int rv;
+  u32 node_index = enable_disable ? cop_input_node.index : ~0;
+
+  /* Not a physical port? */
+  sw = vnet_get_sw_interface (cm->vnet_main, sw_if_index);
+  if (sw->type != VNET_SW_INTERFACE_TYPE_HARDWARE)
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+  
+  /* 
+   * Redirect pkts from the driver to the cop node.
+   * Returns VNET_API_ERROR_UNIMPLEMENTED if the h/w driver
+   * doesn't implement the API. 
+   *
+   * Node_index = ~0 => shut off redirection
+   */
+  rv = vnet_hw_interface_rx_redirect_to_node (cm->vnet_main, sw_if_index,
+                                              node_index);
+  return rv;
+}
+
+static clib_error_t *
+cop_enable_disable_command_fn (vlib_main_t * vm,
+                                unformat_input_t * input,
+                                vlib_cli_command_t * cmd)
+{
+  cop_main_t * cm = &cop_main;
+  u32 sw_if_index = ~0;
+  int enable_disable = 1;
+    
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "disable"))
+      enable_disable = 0;
+    else if (unformat (input, "%U", unformat_vnet_sw_interface,
+                       cm->vnet_main, &sw_if_index))
+      ;
+    else
+      break;
+  }
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "Please specify an interface...");
+    
+  rv = cop_interface_enable_disable (sw_if_index, enable_disable);
+
+  switch(rv) {
+  case 0:
+    break;
+
+  case VNET_API_ERROR_INVALID_SW_IF_INDEX:
+    return clib_error_return 
+      (0, "Invalid interface, only works on physical ports");
+    break;
+
+  case VNET_API_ERROR_UNIMPLEMENTED:
+    return clib_error_return (0, "Device driver doesn't support redirection");
+    break;
+
+  default:
+    return clib_error_return (0, "cop_interface_enable_disable returned %d",
+                              rv);
+  }
+  return 0;
+}
+
+VLIB_CLI_COMMAND (cop_interface_command, static) = {
+    .path = "cop interface",
+    .short_help = 
+    "cop interface <interface-name> [disable]",
+    .function = cop_enable_disable_command_fn,
+};
+
+
+int cop_whitelist_enable_disable (cop_whitelist_enable_disable_args_t *a)
+{
+  cop_main_t * cm = &cop_main;
+  vlib_main_t * vm = cm->vlib_main;
+  ip4_main_t * im4 = &ip4_main;
+  ip6_main_t * im6 = &ip6_main;
+  int address_family;
+  int is_add;
+  cop_config_main_t * ccm;
+  u32 next_to_add_del = 0;
+  uword * p;
+  u32 fib_index = 0;
+  u32 ci;
+  cop_config_data_t _data, *data=&_data;
+
+  /*
+   * Enable / disable whitelist processing on the specified interface
+   */
+
+  for (address_family = VNET_COP_IP4; address_family < VNET_N_COPS;
+       address_family++) 
+    {
+      ccm = &cm->cop_config_mains[address_family];
+    
+      switch(address_family)
+        {
+        case VNET_COP_IP4:
+          is_add = (a->ip4 != 0);
+          next_to_add_del = IP4_RX_COP_WHITELIST;
+          /* configured opaque data must match, or no supper */
+          p = hash_get (im4->fib_index_by_table_id, a->fib_id);
+          if (p)
+            fib_index = p[0];
+          else
+            {
+              if (is_add)
+                return VNET_API_ERROR_NO_SUCH_FIB;
+              else
+                continue;
+            }
+          break;
+              
+        case VNET_COP_IP6:
+          is_add = (a->ip6 != 0);
+          next_to_add_del = IP6_RX_COP_WHITELIST;
+          p = hash_get (im6->fib_index_by_table_id, a->fib_id);
+          if (p)
+            fib_index = p[0];
+          else
+            {
+              if (is_add)
+                return VNET_API_ERROR_NO_SUCH_FIB;
+              else
+                continue;
+            }
+          break;
+
+        case VNET_COP_DEFAULT:
+          is_add = (a->default_cop != 0);
+          next_to_add_del = DEFAULT_RX_COP_WHITELIST;
+          break;
+        
+        default:
+          clib_warning ("BUG");
+        }
+
+      ci = ccm->config_index_by_sw_if_index[a->sw_if_index];
+      data->fib_index = fib_index;
+
+      if (is_add)
+	ci = vnet_config_add_feature (vm, &ccm->config_main,
+				      ci,
+                                      next_to_add_del,
+                                      data, sizeof (*data));
+      else
+	ci = vnet_config_del_feature (vm, &ccm->config_main,
+				      ci,
+                                      next_to_add_del,
+                                      data, sizeof (*data));
+
+      ccm->config_index_by_sw_if_index[a->sw_if_index] = ci;
+    }
+  return 0;
+}
+
+static clib_error_t *
+cop_whitelist_enable_disable_command_fn (vlib_main_t * vm,
+                                         unformat_input_t * input,
+                                         vlib_cli_command_t * cmd)
+{
+  cop_main_t * cm = &cop_main;
+  u32 sw_if_index = ~0;
+  u8 ip4 = 0;
+  u8 ip6 = 0;
+  u8 default_cop = 0;
+  u32 fib_id = 0;
+  int rv;
+  cop_whitelist_enable_disable_args_t _a, * a = &_a;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "ip4"))
+      ip4 = 1;
+    else if (unformat (input, "ip6"))
+      ip6 = 1;
+    else if (unformat (input, "default"))
+      default_cop = 1;
+    else if (unformat (input, "%U", unformat_vnet_sw_interface,
+                       cm->vnet_main, &sw_if_index))
+      ;
+    else if (unformat (input, "fib-id %d", &fib_id))
+      ;
+    else
+      break;
+  }
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "Please specify an interface...");
+    
+  a->sw_if_index = sw_if_index;
+  a->ip4 = ip4;
+  a->ip6 = ip6;
+  a->default_cop = default_cop;
+  a->fib_id = fib_id;
+
+  rv = cop_whitelist_enable_disable (a);
+
+  switch(rv) {
+  case 0:
+    break;
+
+  case VNET_API_ERROR_INVALID_SW_IF_INDEX:
+    return clib_error_return 
+      (0, "Invalid interface, only works on physical ports");
+    break;
+
+  case VNET_API_ERROR_NO_SUCH_FIB:
+    return clib_error_return 
+      (0, "Invalid fib");
+    break;
+
+  case VNET_API_ERROR_UNIMPLEMENTED:
+    return clib_error_return (0, "Device driver doesn't support redirection");
+    break;
+
+  default:
+    return clib_error_return (0, "cop_whitelist_enable_disable returned %d",
+                              rv);
+  }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (cop_whitelist_command, static) = {
+    .path = "cop whitelist",
+    .short_help = 
+    "cop whitelist <interface-name> [ip4][ip6][default][fib-id <NN>][disable]",
+    .function = cop_whitelist_enable_disable_command_fn,
+};
+
diff --git a/src/vnet/cop/cop.h b/src/vnet/cop/cop.h
new file mode 100644
index 00000000..eb5f1dfd
--- /dev/null
+++ b/src/vnet/cop/cop.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __vnet_cop_h__
+#define __vnet_cop_h__
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+
+typedef enum {
+  VNET_COP_IP4,
+  VNET_COP_IP6,
+  VNET_COP_DEFAULT,
+  VNET_N_COPS,
+} vnet_cop_t;
+
+typedef enum {
+  /* First check src address against whitelist */
+  IP4_RX_COP_WHITELIST,
+  IP6_RX_COP_WHITELIST,
+  DEFAULT_RX_COP_WHITELIST,
+
+  /* Pkts not otherwise dropped go to xxx-input */
+  IP4_RX_COP_INPUT,
+  IP6_RX_COP_INPUT,
+  DEFAULT_RX_COP_INPUT,
+
+  /* Going, going, gone... */
+  RX_COP_DROP,
+
+  COP_RX_N_FEATURES,
+} cop_feature_type_t;
+
+typedef struct {
+  vnet_config_main_t config_main;
+  u32 * config_index_by_sw_if_index;
+} cop_config_main_t;
+
+typedef struct {
+  u32 fib_index;
+} cop_config_data_t;
+
+typedef struct {
+  cop_config_main_t cop_config_mains[VNET_N_COPS];
+
+  /* convenience */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+} cop_main_t;
+
+cop_main_t cop_main;
+
+extern vlib_node_registration_t cop_input_node;
+
+int cop_interface_enable_disable (u32 sw_if_index, int enable_disable);
+
+typedef struct {
+  u32 sw_if_index;
+  u8 ip4;
+  u8 ip6;
+  u8 default_cop;
+  u32 fib_id;
+} cop_whitelist_enable_disable_args_t;
+
+int cop_whitelist_enable_disable (cop_whitelist_enable_disable_args_t *a);
+
+#endif /* __vnet_cop_h__ */
diff --git a/src/vnet/cop/ip4_whitelist.c b/src/vnet/cop/ip4_whitelist.c
new file mode 100644
index 00000000..d5121e72
--- /dev/null
+++ b/src/vnet/cop/ip4_whitelist.c
@@ -0,0 +1,356 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/cop/cop.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/dpo/load_balance.h>
+
+typedef struct {
+  u32 next_index;
+  u32 sw_if_index;
+} ip4_cop_whitelist_trace_t;
+
+/* packet trace format function */
+static u8 * format_ip4_cop_whitelist_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip4_cop_whitelist_trace_t * t = va_arg (*args, ip4_cop_whitelist_trace_t *);
+  
+  s = format (s, "IP4_COP_WHITELIST: sw_if_index %d, next index %d",
+              t->sw_if_index, t->next_index);
+  return s;
+}
+
+vlib_node_registration_t ip4_cop_whitelist_node;
+
+#define foreach_ip4_cop_whitelist_error                         \
+_(DROPPED, "ip4 cop whitelist packets dropped")
+
+typedef enum {
+#define _(sym,str) IP4_COP_WHITELIST_ERROR_##sym,
+  foreach_ip4_cop_whitelist_error
+#undef _
+  IP4_COP_WHITELIST_N_ERROR,
+} ip4_cop_whitelist_error_t;
+
+static char * ip4_cop_whitelist_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ip4_cop_whitelist_error
+#undef _
+};
+
+static uword
+ip4_cop_whitelist_node_fn (vlib_main_t * vm,
+		  vlib_node_runtime_t * node,
+		  vlib_frame_t * frame)
+{
+  u32 n_left_from, * from, * to_next;
+  cop_feature_type_t next_index;
+  cop_main_t *cm = &cop_main;
+  vlib_combined_counter_main_t * vcm = &load_balance_main.lbm_via_counters;
+  u32 cpu_index = vm->cpu_index;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+      	{
+          u32 bi0, bi1;
+          vlib_buffer_t * b0, * b1;
+          u32 next0, next1;
+          u32 sw_if_index0, sw_if_index1;
+          ip4_header_t * ip0, * ip1;
+          cop_config_main_t * ccm0, * ccm1;
+          cop_config_data_t * c0, * c1;
+      	  ip4_fib_mtrie_t * mtrie0, * mtrie1;
+      	  ip4_fib_mtrie_leaf_t leaf0, leaf1;
+          u32 lb_index0, lb_index1;
+          const load_balance_t * lb0, *lb1;
+          const dpo_id_t *dpo0, *dpo1;
+
+      	  /* Prefetch next iteration. */
+      	  {
+      	    vlib_buffer_t * p2, * p3;
+            
+      	    p2 = vlib_get_buffer (vm, from[2]);
+      	    p3 = vlib_get_buffer (vm, from[3]);
+            
+      	    vlib_prefetch_buffer_header (p2, LOAD);
+      	    vlib_prefetch_buffer_header (p3, LOAD);
+
+      	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+      	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+      	  }
+
+          /* speculatively enqueue b0 and b1 to the current next frame */
+      	  to_next[0] = bi0 = from[0];
+      	  to_next[1] = bi1 = from[1];
+      	  from += 2;
+      	  to_next += 2;
+      	  n_left_from -= 2;
+      	  n_left_to_next -= 2;
+
+      	  b0 = vlib_get_buffer (vm, bi0);
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+
+      	  ip0 = vlib_buffer_get_current (b0);
+
+      	  ccm0 = cm->cop_config_mains + VNET_COP_IP4;
+
+      	  c0 = vnet_get_config_data
+              (&ccm0->config_main,
+               &vnet_buffer (b0)->cop.current_config_index,
+               &next0,
+               sizeof (c0[0]));
+
+	  mtrie0 = &ip4_fib_get (c0->fib_index)->mtrie;
+
+      	  leaf0 = IP4_FIB_MTRIE_LEAF_ROOT;
+
+      	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0,
+                                             &ip0->src_address, 0);
+
+      	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0,
+                                             &ip0->src_address, 1);
+
+      	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0,
+                                             &ip0->src_address, 2);
+
+      	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0,
+                                             &ip0->src_address, 3);
+
+      	  lb_index0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
+
+	  ASSERT (lb_index0
+                  == ip4_fib_table_lookup_lb (ip4_fib_get(c0->fib_index),
+	  				       &ip0->src_address));
+	  lb0 = load_balance_get (lb_index0);
+          dpo0 = load_balance_get_bucket_i(lb0, 0);
+
+          if (PREDICT_FALSE(dpo0->dpoi_type != DPO_RECEIVE))
+            {
+              b0->error = node->errors[IP4_COP_WHITELIST_ERROR_DROPPED];
+              next0 = RX_COP_DROP;
+            }
+
+      	  b1 = vlib_get_buffer (vm, bi1);
+          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
+
+      	  ip1 = vlib_buffer_get_current (b1);
+
+      	  ccm1 = cm->cop_config_mains + VNET_COP_IP4;
+
+      	  c1 = vnet_get_config_data
+              (&ccm1->config_main,
+               &vnet_buffer (b1)->cop.current_config_index,
+               &next1,
+               sizeof (c1[0]));
+	  mtrie1 = &ip4_fib_get (c1->fib_index)->mtrie;
+
+      	  leaf1 = IP4_FIB_MTRIE_LEAF_ROOT;
+
+      	  leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1,
+                                             &ip1->src_address, 0);
+
+      	  leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1,
+                                             &ip1->src_address, 1);
+
+      	  leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1,
+                                             &ip1->src_address, 2);
+
+      	  leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1,
+                                             &ip1->src_address, 3);
+
+      	  lb_index1 = ip4_fib_mtrie_leaf_get_adj_index (leaf1);
+	  ASSERT (lb_index1
+                  == ip4_fib_table_lookup_lb (ip4_fib_get(c1->fib_index),
+	  				       &ip1->src_address));
+	  lb1 = load_balance_get (lb_index1);
+          dpo1 = load_balance_get_bucket_i(lb1, 0);
+
+          vlib_increment_combined_counter
+              (vcm, cpu_index, lb_index0, 1,
+               vlib_buffer_length_in_chain (vm, b0)
+               + sizeof(ethernet_header_t));
+
+          vlib_increment_combined_counter
+              (vcm, cpu_index, lb_index1, 1,
+               vlib_buffer_length_in_chain (vm, b1)
+               + sizeof(ethernet_header_t));
+
+
+          if (PREDICT_FALSE(dpo1->dpoi_type != DPO_RECEIVE))
+            {
+              b1->error = node->errors[IP4_COP_WHITELIST_ERROR_DROPPED];
+              next1 = RX_COP_DROP;
+            }
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+            {
+              ip4_cop_whitelist_trace_t *t =
+                 vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->sw_if_index = sw_if_index0;
+              t->next_index = next0;
+            }
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)
+                            && (b1->flags & VLIB_BUFFER_IS_TRACED)))
+            {
+              ip4_cop_whitelist_trace_t *t =
+                 vlib_add_trace (vm, node, b1, sizeof (*t));
+              t->sw_if_index = sw_if_index1;
+              t->next_index = next1;
+            }
+
+          /* verify speculative enqueues, maybe switch current next frame */
+          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+                                           to_next, n_left_to_next,
+                                           bi0, bi1, next0, next1);
+        }
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+          u32 bi0;
+	  vlib_buffer_t * b0;
+          u32 next0;
+          u32 sw_if_index0;
+          ip4_header_t * ip0;
+          cop_config_main_t *ccm0;
+          cop_config_data_t *c0;
+	  ip4_fib_mtrie_t * mtrie0;
+	  ip4_fib_mtrie_leaf_t leaf0;
+          u32 lb_index0;
+          const load_balance_t * lb0;
+          const dpo_id_t *dpo0;
+
+          /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+
+	  ip0 = vlib_buffer_get_current (b0);
+
+	  ccm0 = cm->cop_config_mains + VNET_COP_IP4;
+
+	  c0 = vnet_get_config_data 
+              (&ccm0->config_main,
+               &vnet_buffer (b0)->cop.current_config_index,
+               &next0,
+               sizeof (c0[0]));
+
+	  mtrie0 = &ip4_fib_get (c0->fib_index)->mtrie;
+
+	  leaf0 = IP4_FIB_MTRIE_LEAF_ROOT;
+
+	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, 
+                                             &ip0->src_address, 0);
+
+	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, 
+                                             &ip0->src_address, 1);
+
+	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, 
+                                             &ip0->src_address, 2);
+
+	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, 
+                                             &ip0->src_address, 3);
+
+	  lb_index0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
+
+	  ASSERT (lb_index0 
+                  == ip4_fib_table_lookup_lb (ip4_fib_get(c0->fib_index),
+					      &ip0->src_address));
+
+	  lb0 = load_balance_get (lb_index0);
+          dpo0 = load_balance_get_bucket_i(lb0, 0);
+
+          vlib_increment_combined_counter 
+              (vcm, cpu_index, lb_index0, 1,
+               vlib_buffer_length_in_chain (vm, b0) 
+               + sizeof(ethernet_header_t));
+
+          if (PREDICT_FALSE(dpo0->dpoi_type != DPO_RECEIVE))
+            {
+              b0->error = node->errors[IP4_COP_WHITELIST_ERROR_DROPPED];
+              next0 = RX_COP_DROP;
+            }
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              ip4_cop_whitelist_trace_t *t = 
+                 vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->sw_if_index = sw_if_index0;
+              t->next_index = next0;
+            }
+            
+          /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (ip4_cop_whitelist_node) = {
+  .function = ip4_cop_whitelist_node_fn,
+  .name = "ip4-cop-whitelist",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip4_cop_whitelist_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  
+  .n_errors = ARRAY_LEN(ip4_cop_whitelist_error_strings),
+  .error_strings = ip4_cop_whitelist_error_strings,
+
+  .n_next_nodes = COP_RX_N_FEATURES,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [IP4_RX_COP_WHITELIST] = "ip4-cop-whitelist",
+    [IP6_RX_COP_WHITELIST] = "ip6-cop-whitelist",
+    [DEFAULT_RX_COP_WHITELIST] = "default-cop-whitelist",
+    [IP4_RX_COP_INPUT] = "ip4-input",
+    [IP6_RX_COP_INPUT] = "ip6-input",
+    [DEFAULT_RX_COP_INPUT] = "ethernet-input",
+    [RX_COP_DROP] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_cop_whitelist_node, ip4_cop_whitelist_node_fn)
+
+static clib_error_t *
+ip4_whitelist_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ip4_whitelist_init);
diff --git a/src/vnet/cop/ip6_whitelist.c b/src/vnet/cop/ip6_whitelist.c
new file mode 100644
index 00000000..c2e16ccf
--- /dev/null
+++ b/src/vnet/cop/ip6_whitelist.c
@@ -0,0 +1,298 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/cop/cop.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/dpo/load_balance.h>
+
+typedef struct {
+  u32 next_index;
+  u32 sw_if_index;
+} ip6_cop_whitelist_trace_t;
+
+/* packet trace format function */
+static u8 * format_ip6_cop_whitelist_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip6_cop_whitelist_trace_t * t = va_arg (*args, ip6_cop_whitelist_trace_t *);
+  
+  s = format (s, "IP6_COP_WHITELIST: sw_if_index %d, next index %d",
+              t->sw_if_index, t->next_index);
+  return s;
+}
+
+vlib_node_registration_t ip6_cop_whitelist_node;
+
+#define foreach_ip6_cop_whitelist_error                         \
+_(DROPPED, "ip6 cop whitelist packets dropped")
+
+typedef enum {
+#define _(sym,str) IP6_COP_WHITELIST_ERROR_##sym,
+  foreach_ip6_cop_whitelist_error
+#undef _
+  IP6_COP_WHITELIST_N_ERROR,
+} ip6_cop_whitelist_error_t;
+
+static char * ip6_cop_whitelist_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ip6_cop_whitelist_error
+#undef _
+};
+
+static uword
+ip6_cop_whitelist_node_fn (vlib_main_t * vm,
+		  vlib_node_runtime_t * node,
+		  vlib_frame_t * frame)
+{
+  u32 n_left_from, * from, * to_next;
+  cop_feature_type_t next_index;
+  cop_main_t *cm = &cop_main;
+  ip6_main_t * im6 = &ip6_main;
+  vlib_combined_counter_main_t * vcm = &load_balance_main.lbm_via_counters;
+  u32 cpu_index = vm->cpu_index;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+          u32 bi0, bi1;
+          vlib_buffer_t * b0, * b1;
+          u32 next0, next1;
+          u32 sw_if_index0, sw_if_index1;
+          ip6_header_t * ip0, * ip1;
+          cop_config_main_t * ccm0, * ccm1;
+          cop_config_data_t * c0, * c1;
+          u32 lb_index0, lb_index1;
+          const load_balance_t * lb0, *lb1;
+          const dpo_id_t *dpo0, *dpo1;
+         
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * p2, * p3;
+            
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+            
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+          /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+
+	  ip0 = vlib_buffer_get_current (b0);
+
+	  ccm0 = cm->cop_config_mains + VNET_COP_IP6;
+
+	  c0 = vnet_get_config_data 
+              (&ccm0->config_main,
+               &vnet_buffer (b0)->cop.current_config_index,
+               &next0,
+               sizeof (c0[0]));
+
+          lb_index0 = ip6_fib_table_fwding_lookup (im6, c0->fib_index, 
+						    &ip0->src_address);
+	  lb0 = load_balance_get (lb_index0);
+          dpo0 = load_balance_get_bucket_i(lb0, 0);
+
+          if (PREDICT_FALSE(dpo0->dpoi_type != DPO_RECEIVE))
+            {
+              b0->error = node->errors[IP6_COP_WHITELIST_ERROR_DROPPED];
+              next0 = RX_COP_DROP;
+            }
+
+	  b1 = vlib_get_buffer (vm, bi1);
+          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
+
+	  ip1 = vlib_buffer_get_current (b1);
+
+	  ccm1 = cm->cop_config_mains + VNET_COP_IP6;
+
+	  c1 = vnet_get_config_data 
+              (&ccm1->config_main,
+               &vnet_buffer (b1)->cop.current_config_index,
+               &next1,
+               sizeof (c1[0]));
+
+          lb_index1 = ip6_fib_table_fwding_lookup (im6, c1->fib_index, 
+						    &ip1->src_address);
+
+	  lb1 = load_balance_get (lb_index1);
+          dpo1 = load_balance_get_bucket_i(lb1, 0);
+
+          vlib_increment_combined_counter 
+              (vcm, cpu_index, lb_index0, 1,
+               vlib_buffer_length_in_chain (vm, b0) 
+               + sizeof(ethernet_header_t));
+
+          vlib_increment_combined_counter 
+              (vcm, cpu_index, lb_index1, 1,
+               vlib_buffer_length_in_chain (vm, b1)
+               + sizeof(ethernet_header_t));
+
+          if (PREDICT_FALSE(dpo1->dpoi_type != DPO_RECEIVE))
+            {
+              b1->error = node->errors[IP6_COP_WHITELIST_ERROR_DROPPED];
+              next1 = RX_COP_DROP;
+            }
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              ip6_cop_whitelist_trace_t *t = 
+                 vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->sw_if_index = sw_if_index0;
+              t->next_index = next0;
+            }
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b1->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              ip6_cop_whitelist_trace_t *t = 
+                 vlib_add_trace (vm, node, b1, sizeof (*t));
+              t->sw_if_index = sw_if_index1;
+              t->next_index = next1;
+            }
+
+          /* verify speculative enqueues, maybe switch current next frame */
+          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+                                           to_next, n_left_to_next,
+                                           bi0, bi1, next0, next1);
+        }
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+          u32 bi0;
+	  vlib_buffer_t * b0;
+          u32 next0;
+          u32 sw_if_index0;
+          ip6_header_t * ip0;
+          cop_config_main_t *ccm0;
+          cop_config_data_t *c0;
+          u32 lb_index0;
+          const load_balance_t * lb0;
+          const dpo_id_t *dpo0;
+
+          /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+
+	  ip0 = vlib_buffer_get_current (b0);
+
+	  ccm0 = cm->cop_config_mains + VNET_COP_IP6;
+
+	  c0 = vnet_get_config_data 
+              (&ccm0->config_main,
+               &vnet_buffer (b0)->cop.current_config_index,
+               &next0,
+               sizeof (c0[0]));
+
+          lb_index0 = ip6_fib_table_fwding_lookup (im6, c0->fib_index, 
+						    &ip0->src_address);
+
+	  lb0 = load_balance_get (lb_index0);
+          dpo0 = load_balance_get_bucket_i(lb0, 0);
+
+          vlib_increment_combined_counter 
+              (vcm, cpu_index, lb_index0, 1,
+               vlib_buffer_length_in_chain (vm, b0) 
+               + sizeof(ethernet_header_t));
+
+          if (PREDICT_FALSE(dpo0->dpoi_type != DPO_RECEIVE))
+            {
+              b0->error = node->errors[IP6_COP_WHITELIST_ERROR_DROPPED];
+              next0 = RX_COP_DROP;
+            }
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              ip6_cop_whitelist_trace_t *t = 
+                 vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->sw_if_index = sw_if_index0;
+              t->next_index = next0;
+            }
+            
+          /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (ip6_cop_whitelist_node) = {
+  .function = ip6_cop_whitelist_node_fn,
+  .name = "ip6-cop-whitelist",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip6_cop_whitelist_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  
+  .n_errors = ARRAY_LEN(ip6_cop_whitelist_error_strings),
+  .error_strings = ip6_cop_whitelist_error_strings,
+
+  .n_next_nodes = COP_RX_N_FEATURES,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [IP4_RX_COP_WHITELIST] = "ip4-cop-whitelist",
+    [IP6_RX_COP_WHITELIST] = "ip6-cop-whitelist",
+    [DEFAULT_RX_COP_WHITELIST] = "default-cop-whitelist",
+    [IP4_RX_COP_INPUT] = "ip4-input",
+    [IP6_RX_COP_INPUT] = "ip6-input",
+    [DEFAULT_RX_COP_INPUT] = "ethernet-input",
+    [RX_COP_DROP] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_cop_whitelist_node, ip6_cop_whitelist_node_fn)
+
+static clib_error_t *
+ip6_whitelist_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ip6_whitelist_init);
diff --git a/src/vnet/cop/node1.c b/src/vnet/cop/node1.c
new file mode 100644
index 00000000..b448b531
--- /dev/null
+++ b/src/vnet/cop/node1.c
@@ -0,0 +1,319 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/cop/cop.h>
+
+typedef struct {
+  u32 next_index;
+  u32 sw_if_index;
+} cop_input_trace_t;
+
+/* packet trace format function */
+static u8 * format_cop_input_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  cop_input_trace_t * t = va_arg (*args, cop_input_trace_t *);
+  
+  s = format (s, "COP_INPUT: sw_if_index %d, next index %d",
+              t->sw_if_index, t->next_index);
+  return s;
+}
+
+vlib_node_registration_t cop_input_node;
+
+#define foreach_cop_input_error \
+_(PROCESSED, "COP input packets processed")
+
+typedef enum {
+#define _(sym,str) COP_INPUT_ERROR_##sym,
+  foreach_cop_input_error
+#undef _
+  COP_INPUT_N_ERROR,
+} cop_input_error_t;
+
+static char * cop_input_error_strings[] = {
+#define _(sym,string) string,
+  foreach_cop_input_error
+#undef _
+};
+
+static uword
+cop_input_node_fn (vlib_main_t * vm,
+		  vlib_node_runtime_t * node,
+		  vlib_frame_t * frame)
+{
+  u32 n_left_from, * from, * to_next;
+  cop_feature_type_t next_index;
+  cop_main_t *cm = &cop_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+          u32 bi0, bi1;
+	  vlib_buffer_t * b0, * b1;
+          u32 next0, next1;
+          u32 sw_if_index0, sw_if_index1;
+          ethernet_header_t * en0, * en1;
+          cop_config_main_t * ccm0, * ccm1;
+          u32 advance0, advance1;
+          int proto0, proto1;
+          
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * p2, * p3;
+            
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+            
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+          /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+          en0 = vlib_buffer_get_current (b0);
+          en1 = vlib_buffer_get_current (b1);
+
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
+
+          proto0 = VNET_COP_DEFAULT;
+          proto1 = VNET_COP_DEFAULT;
+          advance0 = 0;
+          advance1 = 0;
+
+          if (en0->type == clib_host_to_net_u16(ETHERNET_TYPE_IP4))
+            {
+              proto0 = VNET_COP_IP4;
+              advance0 = sizeof(ethernet_header_t);
+            }
+          else if (en0->type == clib_host_to_net_u16(ETHERNET_TYPE_IP6))
+            {
+              proto0 = VNET_COP_IP6;
+              advance0 = sizeof(ethernet_header_t);
+            }
+
+          if (en1->type == clib_host_to_net_u16(ETHERNET_TYPE_IP4))
+            {
+              proto1 = VNET_COP_IP4;
+              advance1 = sizeof(ethernet_header_t);
+            }
+          else if (en1->type == clib_host_to_net_u16(ETHERNET_TYPE_IP6))
+            {
+              proto1 = VNET_COP_IP6;
+              advance1 = sizeof(ethernet_header_t);
+            }
+
+	  ccm0 = cm->cop_config_mains + proto0;
+	  ccm1 = cm->cop_config_mains + proto1;
+          vnet_buffer(b0)->cop.current_config_index = 
+            ccm0->config_index_by_sw_if_index [sw_if_index0];
+
+          vnet_buffer(b1)->cop.current_config_index = 
+            ccm1->config_index_by_sw_if_index [sw_if_index1];
+
+          vlib_buffer_advance (b0, advance0);
+          vlib_buffer_advance (b1, advance1);
+
+          vnet_get_config_data (&ccm0->config_main,
+                                &vnet_buffer(b0)->cop.current_config_index,
+                                &next0, 0 /* bytes of config data */);
+
+          vnet_get_config_data (&ccm1->config_main,
+                                &vnet_buffer(b1)->cop.current_config_index,
+                                &next1, 0 /* bytes of config data */);
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              cop_input_trace_t *t = 
+                 vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->sw_if_index = sw_if_index0;
+              t->next_index = next0;
+            }
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b1->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              cop_input_trace_t *t = 
+                 vlib_add_trace (vm, node, b1, sizeof (*t));
+              t->sw_if_index = sw_if_index1;
+              t->next_index = next1;
+            }
+          /* verify speculative enqueues, maybe switch current next frame */
+          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+                                           to_next, n_left_to_next,
+                                           bi0, bi1, next0, next1);
+        }
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+          u32 bi0;
+	  vlib_buffer_t * b0;
+          u32 next0;
+          u32 sw_if_index0;
+          ethernet_header_t *en0;
+          cop_config_main_t *ccm0;
+          u32 advance0;
+          int proto0;
+
+          /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+          /* 
+           * Direct from the driver, we should be at offset 0
+           * aka at &b0->data[0]
+           */
+          ASSERT (b0->current_data == 0);
+
+          en0 = vlib_buffer_get_current (b0);
+
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+
+          proto0 = VNET_COP_DEFAULT;
+          advance0 = 0;
+
+          if (en0->type == clib_host_to_net_u16(ETHERNET_TYPE_IP4))
+            {
+              proto0 = VNET_COP_IP4;
+              advance0 = sizeof(ethernet_header_t);
+            }
+          else if (en0->type == clib_host_to_net_u16(ETHERNET_TYPE_IP6))
+            {
+              proto0 = VNET_COP_IP6;
+              advance0 = sizeof(ethernet_header_t);
+            }
+
+	  ccm0 = cm->cop_config_mains + proto0;
+          vnet_buffer(b0)->cop.current_config_index = 
+            ccm0->config_index_by_sw_if_index [sw_if_index0];
+
+          vlib_buffer_advance (b0, advance0);
+
+          vnet_get_config_data (&ccm0->config_main,
+                                &vnet_buffer(b0)->cop.current_config_index,
+                                &next0, 0 /* bytes of config data */);
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              cop_input_trace_t *t = 
+                 vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->sw_if_index = sw_if_index0;
+              t->next_index = next0;
+            }
+            
+          /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, cop_input_node.index, 
+                               COP_INPUT_ERROR_PROCESSED, frame->n_vectors);
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (cop_input_node) = {
+  .function = cop_input_node_fn,
+  .name = "cop-input",
+  .vector_size = sizeof (u32),
+  .format_trace = format_cop_input_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  
+  .n_errors = ARRAY_LEN(cop_input_error_strings),
+  .error_strings = cop_input_error_strings,
+
+  .n_next_nodes = COP_RX_N_FEATURES,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [IP4_RX_COP_WHITELIST] = "ip4-cop-whitelist",
+    [IP6_RX_COP_WHITELIST] = "ip6-cop-whitelist",
+    [DEFAULT_RX_COP_WHITELIST] = "default-cop-whitelist",
+    [IP4_RX_COP_INPUT] = "ip4-input",
+    [IP6_RX_COP_INPUT] = "ip6-input",
+    [DEFAULT_RX_COP_INPUT] = "ethernet-input",
+    [RX_COP_DROP] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (cop_input_node, cop_input_node_fn)
+
+#define foreach_cop_stub                        \
+_(default-cop-whitelist, default_cop_whitelist)
+
+#define _(n,f)                                  \
+                                                \
+static uword                                    \
+f##_node_fn (vlib_main_t * vm,                  \
+             vlib_node_runtime_t * node,        \
+             vlib_frame_t * frame)              \
+{                                               \
+  clib_warning ("BUG: stub function called");   \
+  return 0;                                     \
+}                                               \
+                                                \
+VLIB_REGISTER_NODE (f##_input_node) = {         \
+  .function = f##_node_fn,                      \
+  .name = #n,                                   \
+  .vector_size = sizeof (u32),                  \
+  .type = VLIB_NODE_TYPE_INTERNAL,              \
+                                                \
+  .n_errors = 0,                                \
+  .error_strings = 0,                           \
+                                                \
+  .n_next_nodes = 0,                            \
+};
+
+foreach_cop_stub;
+
+
+
+
+
+
diff --git a/src/vnet/devices/af_packet/af_packet.api b/src/vnet/devices/af_packet/af_packet.api
new file mode 100644
index 00000000..9fb2a207
--- /dev/null
+++ b/src/vnet/devices/af_packet/af_packet.api
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \brief Create host-interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param host_if_name - interface name
+    @param hw_addr - interface MAC
+    @param use_random_hw_addr - use random generated MAC
+*/
+define af_packet_create
+{
+  u32 client_index;
+  u32 context;
+
+  u8 host_if_name[64];
+  u8 hw_addr[6];
+  u8 use_random_hw_addr;
+};
+
+/** \brief Create host-interface response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define af_packet_create_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+};
+
+/** \brief Delete host-interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param host_if_name - interface name
+*/
+define af_packet_delete
+{
+  u32 client_index;
+  u32 context;
+
+  u8 host_if_name[64];
+};
+
+/** \brief Delete host-interface response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define af_packet_delete_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/af_packet/af_packet.c b/src/vnet/devices/af_packet/af_packet.c
new file mode 100644
index 00000000..91c3988b
--- /dev/null
+++ b/src/vnet/devices/af_packet/af_packet.c
@@ -0,0 +1,366 @@
+/*
+ *------------------------------------------------------------------
+ * af_packet.c - linux kernel packet interface
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <linux/if_ether.h>
+#include <linux/if_packet.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+
+#include <vnet/devices/af_packet/af_packet.h>
+
+#define AF_PACKET_DEBUG_SOCKET		0
+
+#define AF_PACKET_TX_FRAMES_PER_BLOCK	1024
+#define AF_PACKET_TX_FRAME_SIZE	 	(2048 * 5)
+#define AF_PACKET_TX_BLOCK_NR		1
+#define AF_PACKET_TX_FRAME_NR		(AF_PACKET_TX_BLOCK_NR * \
+					 AF_PACKET_TX_FRAMES_PER_BLOCK)
+#define AF_PACKET_TX_BLOCK_SIZE	 	(AF_PACKET_TX_FRAME_SIZE * \
+					 AF_PACKET_TX_FRAMES_PER_BLOCK)
+
+#define AF_PACKET_RX_FRAMES_PER_BLOCK	1024
+#define AF_PACKET_RX_FRAME_SIZE	 	(2048 * 5)
+#define AF_PACKET_RX_BLOCK_NR		1
+#define AF_PACKET_RX_FRAME_NR		(AF_PACKET_RX_BLOCK_NR * \
+					 AF_PACKET_RX_FRAMES_PER_BLOCK)
+#define AF_PACKET_RX_BLOCK_SIZE		(AF_PACKET_RX_FRAME_SIZE * \
+					 AF_PACKET_RX_FRAMES_PER_BLOCK)
+
+#if AF_PACKET_DEBUG_SOCKET == 1
+#define DBG_SOCK(args...) clib_warning(args);
+#else
+#define DBG_SOCK(args...)
+#endif
+
+/*defined in net/if.h but clashes with dpdk headers */
+unsigned int if_nametoindex (const char *ifname);
+
+typedef struct tpacket_req tpacket_req_t;
+
+static u32
+af_packet_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi,
+			   u32 flags)
+{
+  /* nothing for now */
+  return 0;
+}
+
+static clib_error_t *
+af_packet_fd_read_ready (unix_file_t * uf)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  af_packet_main_t *apm = &af_packet_main;
+  u32 idx = uf->private_data;
+
+  apm->pending_input_bitmap =
+    clib_bitmap_set (apm->pending_input_bitmap, idx, 1);
+
+  /* Schedule the rx node */
+  vlib_node_set_interrupt_pending (vm, af_packet_input_node.index);
+
+  return 0;
+}
+
+static int
+create_packet_v2_sock (u8 * name, tpacket_req_t * rx_req,
+		       tpacket_req_t * tx_req, int *fd, u8 ** ring)
+{
+  int ret, err;
+  struct sockaddr_ll sll;
+  uint host_if_index;
+  int ver = TPACKET_V2;
+  socklen_t req_sz = sizeof (struct tpacket_req);
+  u32 ring_sz = rx_req->tp_block_size * rx_req->tp_block_nr +
+    tx_req->tp_block_size * tx_req->tp_block_nr;
+
+  host_if_index = if_nametoindex ((const char *) name);
+
+  if (!host_if_index)
+    {
+      DBG_SOCK ("Wrong host interface name");
+      ret = VNET_API_ERROR_INVALID_INTERFACE;
+      goto error;
+    }
+
+  if ((*fd = socket (AF_PACKET, SOCK_RAW, htons (ETH_P_ALL))) < 0)
+    {
+      DBG_SOCK ("Failed to create socket");
+      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
+      goto error;
+    }
+
+  if ((err =
+       setsockopt (*fd, SOL_PACKET, PACKET_VERSION, &ver, sizeof (ver))) < 0)
+    {
+      DBG_SOCK ("Failed to set rx packet interface version");
+      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
+      goto error;
+    }
+
+  int opt = 1;
+  if ((err =
+       setsockopt (*fd, SOL_PACKET, PACKET_LOSS, &opt, sizeof (opt))) < 0)
+    {
+      DBG_SOCK ("Failed to set packet tx ring error handling option");
+      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
+      goto error;
+    }
+
+  if ((err =
+       setsockopt (*fd, SOL_PACKET, PACKET_RX_RING, rx_req, req_sz)) < 0)
+    {
+      DBG_SOCK ("Failed to set packet rx ring options");
+      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
+      goto error;
+    }
+
+  if ((err =
+       setsockopt (*fd, SOL_PACKET, PACKET_TX_RING, tx_req, req_sz)) < 0)
+    {
+      DBG_SOCK ("Failed to set packet rx ring options");
+      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
+      goto error;
+    }
+
+  *ring =
+    mmap (NULL, ring_sz, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_LOCKED, *fd,
+	  0);
+  if (*ring == MAP_FAILED)
+    {
+      DBG_SOCK ("mmap failure");
+      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
+      goto error;
+    }
+
+  memset (&sll, 0, sizeof (sll));
+  sll.sll_family = PF_PACKET;
+  sll.sll_protocol = htons (ETH_P_ALL);
+  sll.sll_ifindex = host_if_index;
+
+  if ((err = bind (*fd, (struct sockaddr *) &sll, sizeof (sll))) < 0)
+    {
+      DBG_SOCK ("Failed to bind rx packet socket (error %d)", err);
+      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
+      goto error;
+    }
+
+  return 0;
+error:
+  if (*fd >= 0)
+    close (*fd);
+  *fd = -1;
+  return ret;
+}
+
+int
+af_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set,
+		     u32 * sw_if_index)
+{
+  af_packet_main_t *apm = &af_packet_main;
+  int ret, fd = -1;
+  struct tpacket_req *rx_req = 0;
+  struct tpacket_req *tx_req = 0;
+  u8 *ring = 0;
+  af_packet_if_t *apif = 0;
+  u8 hw_addr[6];
+  clib_error_t *error;
+  vnet_sw_interface_t *sw;
+  vnet_main_t *vnm = vnet_get_main ();
+  uword *p;
+  uword if_index;
+  u8 *host_if_name_dup = vec_dup (host_if_name);
+
+  p = mhash_get (&apm->if_index_by_host_if_name, host_if_name);
+  if (p)
+    {
+      return VNET_API_ERROR_SUBIF_ALREADY_EXISTS;
+    }
+
+  vec_validate (rx_req, 0);
+  rx_req->tp_block_size = AF_PACKET_RX_BLOCK_SIZE;
+  rx_req->tp_frame_size = AF_PACKET_RX_FRAME_SIZE;
+  rx_req->tp_block_nr = AF_PACKET_RX_BLOCK_NR;
+  rx_req->tp_frame_nr = AF_PACKET_RX_FRAME_NR;
+
+  vec_validate (tx_req, 0);
+  tx_req->tp_block_size = AF_PACKET_TX_BLOCK_SIZE;
+  tx_req->tp_frame_size = AF_PACKET_TX_FRAME_SIZE;
+  tx_req->tp_block_nr = AF_PACKET_TX_BLOCK_NR;
+  tx_req->tp_frame_nr = AF_PACKET_TX_FRAME_NR;
+
+  ret = create_packet_v2_sock (host_if_name, rx_req, tx_req, &fd, &ring);
+
+  if (ret != 0)
+    goto error;
+
+  /* So far everything looks good, let's create interface */
+  pool_get (apm->interfaces, apif);
+  if_index = apif - apm->interfaces;
+
+  apif->fd = fd;
+  apif->rx_ring = ring;
+  apif->tx_ring = ring + rx_req->tp_block_size * rx_req->tp_block_nr;
+  apif->rx_req = rx_req;
+  apif->tx_req = tx_req;
+  apif->host_if_name = host_if_name_dup;
+  apif->per_interface_next_index = ~0;
+  apif->next_tx_frame = 0;
+  apif->next_rx_frame = 0;
+
+  {
+    unix_file_t template = { 0 };
+    template.read_function = af_packet_fd_read_ready;
+    template.file_descriptor = fd;
+    template.private_data = if_index;
+    template.flags = UNIX_FILE_EVENT_EDGE_TRIGGERED;
+    apif->unix_file_index = unix_file_add (&unix_main, &template);
+  }
+
+  /*use configured or generate random MAC address */
+  if (hw_addr_set)
+    clib_memcpy (hw_addr, hw_addr_set, 6);
+  else
+    {
+      f64 now = vlib_time_now (vm);
+      u32 rnd;
+      rnd = (u32) (now * 1e6);
+      rnd = random_u32 (&rnd);
+
+      clib_memcpy (hw_addr + 2, &rnd, sizeof (rnd));
+      hw_addr[0] = 2;
+      hw_addr[1] = 0xfe;
+    }
+
+  error = ethernet_register_interface (vnm, af_packet_device_class.index,
+				       if_index, hw_addr, &apif->hw_if_index,
+				       af_packet_eth_flag_change);
+
+  if (error)
+    {
+      memset (apif, 0, sizeof (*apif));
+      pool_put (apm->interfaces, apif);
+      clib_error_report (error);
+      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
+      goto error;
+    }
+
+  sw = vnet_get_hw_sw_interface (vnm, apif->hw_if_index);
+  apif->sw_if_index = sw->sw_if_index;
+
+  vnet_hw_interface_set_flags (vnm, apif->hw_if_index,
+			       VNET_HW_INTERFACE_FLAG_LINK_UP);
+
+  mhash_set_mem (&apm->if_index_by_host_if_name, host_if_name_dup, &if_index,
+		 0);
+  if (sw_if_index)
+    *sw_if_index = apif->sw_if_index;
+  return 0;
+
+error:
+  vec_free (host_if_name_dup);
+  vec_free (rx_req);
+  vec_free (tx_req);
+  return ret;
+}
+
+int
+af_packet_delete_if (vlib_main_t * vm, u8 * host_if_name)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  af_packet_main_t *apm = &af_packet_main;
+  af_packet_if_t *apif;
+  uword *p;
+  uword if_index;
+  u32 ring_sz;
+
+  p = mhash_get (&apm->if_index_by_host_if_name, host_if_name);
+  if (p == NULL)
+    {
+      clib_warning ("Host interface %s does not exist", host_if_name);
+      return VNET_API_ERROR_SYSCALL_ERROR_1;
+    }
+  apif = pool_elt_at_index (apm->interfaces, p[0]);
+  if_index = apif - apm->interfaces;
+
+  /* bring down the interface */
+  vnet_hw_interface_set_flags (vnm, apif->hw_if_index, 0);
+
+  /* clean up */
+  if (apif->unix_file_index != ~0)
+    {
+      unix_file_del (&unix_main, unix_main.file_pool + apif->unix_file_index);
+      apif->unix_file_index = ~0;
+    }
+  else
+    close (apif->fd);
+
+  ring_sz = apif->rx_req->tp_block_size * apif->rx_req->tp_block_nr +
+    apif->tx_req->tp_block_size * apif->tx_req->tp_block_nr;
+  if (munmap (apif->rx_ring, ring_sz))
+    clib_warning ("Host interface %s could not free rx/tx ring",
+		  host_if_name);
+  apif->rx_ring = NULL;
+  apif->tx_ring = NULL;
+  apif->fd = -1;
+
+  vec_free (apif->rx_req);
+  apif->rx_req = NULL;
+  vec_free (apif->tx_req);
+  apif->tx_req = NULL;
+
+  vec_free (apif->host_if_name);
+  apif->host_if_name = NULL;
+
+  mhash_unset (&apm->if_index_by_host_if_name, host_if_name, &if_index);
+
+  ethernet_delete_interface (vnm, apif->hw_if_index);
+
+  pool_put (apm->interfaces, apif);
+
+  return 0;
+}
+
+static clib_error_t *
+af_packet_init (vlib_main_t * vm)
+{
+  af_packet_main_t *apm = &af_packet_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+
+  memset (apm, 0, sizeof (af_packet_main_t));
+
+  mhash_init_vec_string (&apm->if_index_by_host_if_name, sizeof (uword));
+
+  vec_validate_aligned (apm->rx_buffers, tm->n_vlib_mains - 1,
+			CLIB_CACHE_LINE_BYTES);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (af_packet_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/af_packet/af_packet.h b/src/vnet/devices/af_packet/af_packet.h
new file mode 100644
index 00000000..19e2523d
--- /dev/null
+++ b/src/vnet/devices/af_packet/af_packet.h
@@ -0,0 +1,69 @@
+/*
+ *------------------------------------------------------------------
+ * af_packet.h - linux kernel packet interface header file
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  u8 *host_if_name;
+  int fd;
+  struct tpacket_req *rx_req;
+  struct tpacket_req *tx_req;
+  u8 *rx_ring;
+  u8 *tx_ring;
+  u32 hw_if_index;
+  u32 sw_if_index;
+  u32 unix_file_index;
+
+  u32 next_rx_frame;
+  u32 next_tx_frame;
+
+  u32 per_interface_next_index;
+  u8 is_admin_up;
+} af_packet_if_t;
+
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  af_packet_if_t *interfaces;
+
+  /* bitmap of pending rx interfaces */
+  uword *pending_input_bitmap;
+
+  /* rx buffer cache */
+  u32 **rx_buffers;
+
+  /* hash of host interface names */
+  mhash_t if_index_by_host_if_name;
+} af_packet_main_t;
+
+af_packet_main_t af_packet_main;
+extern vnet_device_class_t af_packet_device_class;
+extern vlib_node_registration_t af_packet_input_node;
+
+int af_packet_create_if (vlib_main_t * vm, u8 * host_if_name,
+			 u8 * hw_addr_set, u32 * sw_if_index);
+int af_packet_delete_if (vlib_main_t * vm, u8 * host_if_name);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/af_packet/af_packet_api.c b/src/vnet/devices/af_packet/af_packet_api.c
new file mode 100644
index 00000000..414c838c
--- /dev/null
+++ b/src/vnet/devices/af_packet/af_packet_api.c
@@ -0,0 +1,143 @@
+/*
+ *------------------------------------------------------------------
+ * af_packet_api.c - af-packet api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/devices/af_packet/af_packet.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                             \
+_(AF_PACKET_CREATE, af_packet_create)                   \
+_(AF_PACKET_DELETE, af_packet_delete)
+
+static void
+vl_api_af_packet_create_t_handler (vl_api_af_packet_create_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_af_packet_create_reply_t *rmp;
+  int rv = 0;
+  u8 *host_if_name = NULL;
+  u32 sw_if_index;
+
+  host_if_name = format (0, "%s", mp->host_if_name);
+  vec_add1 (host_if_name, 0);
+
+  rv = af_packet_create_if (vm, host_if_name,
+			    mp->use_random_hw_addr ? 0 : mp->hw_addr,
+			    &sw_if_index);
+
+  vec_free (host_if_name);
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_AF_PACKET_CREATE_REPLY,
+  ({
+    rmp->sw_if_index = clib_host_to_net_u32(sw_if_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_af_packet_delete_t_handler (vl_api_af_packet_delete_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_af_packet_delete_reply_t *rmp;
+  int rv = 0;
+  u8 *host_if_name = NULL;
+
+  host_if_name = format (0, "%s", mp->host_if_name);
+  vec_add1 (host_if_name, 0);
+
+  rv = af_packet_delete_if (vm, host_if_name);
+
+  vec_free (host_if_name);
+
+  REPLY_MACRO (VL_API_AF_PACKET_DELETE_REPLY);
+}
+
+/*
+ * af_packet_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_af_packet;
+#undef _
+}
+
+static clib_error_t *
+af_packet_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (af_packet_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/af_packet/cli.c b/src/vnet/devices/af_packet/cli.c
new file mode 100644
index 00000000..2cbd4152
--- /dev/null
+++ b/src/vnet/devices/af_packet/cli.c
@@ -0,0 +1,144 @@
+/*
+ *------------------------------------------------------------------
+ * af_packet.c - linux kernel packet interface
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <fcntl.h>		/* for open */
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/uio.h>		/* for iovec */
+#include <netinet/in.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+
+#include <vnet/devices/af_packet/af_packet.h>
+
+static clib_error_t *
+af_packet_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 *host_if_name = NULL;
+  u8 hwaddr[6];
+  u8 *hw_addr_ptr = 0;
+  u32 sw_if_index;
+  int r;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "name %s", &host_if_name))
+	;
+      else
+	if (unformat
+	    (line_input, "hw-addr %U", unformat_ethernet_address, hwaddr))
+	hw_addr_ptr = hwaddr;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  if (host_if_name == NULL)
+    return clib_error_return (0, "missing host interface name");
+
+  r = af_packet_create_if (vm, host_if_name, hw_addr_ptr, &sw_if_index);
+  vec_free (host_if_name);
+
+  if (r == VNET_API_ERROR_SYSCALL_ERROR_1)
+    return clib_error_return (0, "%s (errno %d)", strerror (errno), errno);
+
+  if (r == VNET_API_ERROR_INVALID_INTERFACE)
+    return clib_error_return (0, "Invalid interface name");
+
+  if (r == VNET_API_ERROR_SUBIF_ALREADY_EXISTS)
+    return clib_error_return (0, "Interface elready exists");
+
+  vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main (),
+		   sw_if_index);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (af_packet_create_command, static) = {
+  .path = "create host-interface",
+  .short_help = "create host-interface name <interface name> [hw-addr <mac>]",
+  .function = af_packet_create_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+af_packet_delete_command_fn (vlib_main_t * vm, unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 *host_if_name = NULL;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "name %s", &host_if_name))
+	;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  if (host_if_name == NULL)
+    return clib_error_return (0, "missing host interface name");
+
+  af_packet_delete_if (vm, host_if_name);
+  vec_free (host_if_name);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (af_packet_delete_command, static) = {
+  .path = "delete host-interface",
+  .short_help = "delete host-interface name <interface name>",
+  .function = af_packet_delete_command_fn,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+af_packet_cli_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (af_packet_cli_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/af_packet/device.c b/src/vnet/devices/af_packet/device.c
new file mode 100644
index 00000000..1fb4000f
--- /dev/null
+++ b/src/vnet/devices/af_packet/device.c
@@ -0,0 +1,250 @@
+/*
+ *------------------------------------------------------------------
+ * af_packet.c - linux kernel packet interface
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <linux/if_packet.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+
+#include <vnet/devices/af_packet/af_packet.h>
+
+#define foreach_af_packet_tx_func_error               \
+_(FRAME_NOT_READY, "tx frame not ready")              \
+_(TXRING_EAGAIN,   "tx sendto temporary failure")     \
+_(TXRING_FATAL,    "tx sendto fatal failure")         \
+_(TXRING_OVERRUN,  "tx ring overrun")
+
+typedef enum
+{
+#define _(f,s) AF_PACKET_TX_ERROR_##f,
+  foreach_af_packet_tx_func_error
+#undef _
+    AF_PACKET_TX_N_ERROR,
+} af_packet_tx_func_error_t;
+
+static char *af_packet_tx_func_error_strings[] = {
+#define _(n,s) s,
+  foreach_af_packet_tx_func_error
+#undef _
+};
+
+
+static u8 *
+format_af_packet_device_name (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+  af_packet_main_t *apm = &af_packet_main;
+  af_packet_if_t *apif = pool_elt_at_index (apm->interfaces, i);
+
+  s = format (s, "host-%s", apif->host_if_name);
+  return s;
+}
+
+static u8 *
+format_af_packet_device (u8 * s, va_list * args)
+{
+  s = format (s, "Linux PACKET socket interface");
+  return s;
+}
+
+static u8 *
+format_af_packet_tx_trace (u8 * s, va_list * args)
+{
+  s = format (s, "Unimplemented...");
+  return s;
+}
+
+static uword
+af_packet_interface_tx (vlib_main_t * vm,
+			vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  af_packet_main_t *apm = &af_packet_main;
+  u32 *buffers = vlib_frame_args (frame);
+  u32 n_left = frame->n_vectors;
+  u32 n_sent = 0;
+  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
+  af_packet_if_t *apif =
+    pool_elt_at_index (apm->interfaces, rd->dev_instance);
+  int block = 0;
+  u32 block_size = apif->tx_req->tp_block_size;
+  u32 frame_size = apif->tx_req->tp_frame_size;
+  u32 frame_num = apif->tx_req->tp_frame_nr;
+  u8 *block_start = apif->tx_ring + block * block_size;
+  u32 tx_frame = apif->next_tx_frame;
+  struct tpacket2_hdr *tph;
+  u32 frame_not_ready = 0;
+
+  while (n_left > 0)
+    {
+      u32 len;
+      u32 offset = 0;
+      vlib_buffer_t *b0;
+      n_left--;
+      u32 bi = buffers[0];
+      buffers++;
+
+      tph = (struct tpacket2_hdr *) (block_start + tx_frame * frame_size);
+
+      if (PREDICT_FALSE
+	  (tph->tp_status & (TP_STATUS_SEND_REQUEST | TP_STATUS_SENDING)))
+	{
+	  frame_not_ready++;
+	  goto next;
+	}
+
+      do
+	{
+	  b0 = vlib_get_buffer (vm, bi);
+	  len = b0->current_length;
+	  clib_memcpy ((u8 *) tph +
+		       TPACKET_ALIGN (sizeof (struct tpacket2_hdr)) + offset,
+		       vlib_buffer_get_current (b0), len);
+	  offset += len;
+	}
+      while ((bi = b0->next_buffer));
+
+      tph->tp_len = tph->tp_snaplen = offset;
+      tph->tp_status = TP_STATUS_SEND_REQUEST;
+      n_sent++;
+    next:
+      /* check if we've exhausted the ring */
+      if (PREDICT_FALSE (frame_not_ready + n_sent == frame_num))
+	break;
+
+      tx_frame = (tx_frame + 1) % frame_num;
+    }
+
+  CLIB_MEMORY_BARRIER ();
+
+  if (PREDICT_TRUE (n_sent))
+    {
+      apif->next_tx_frame = tx_frame;
+
+      if (PREDICT_FALSE (sendto (apif->fd, NULL, 0,
+				 MSG_DONTWAIT, NULL, 0) == -1))
+	{
+	  /* Uh-oh, drop & move on, but count whether it was fatal or not.
+	   * Note that we have no reliable way to properly determine the
+	   * disposition of the packets we just enqueued for delivery.
+	   */
+	  vlib_error_count (vm, node->node_index,
+			    unix_error_is_fatal (errno) ?
+			    AF_PACKET_TX_ERROR_TXRING_FATAL :
+			    AF_PACKET_TX_ERROR_TXRING_EAGAIN, n_sent);
+	}
+    }
+
+  if (PREDICT_FALSE (frame_not_ready))
+    vlib_error_count (vm, node->node_index,
+		      AF_PACKET_TX_ERROR_FRAME_NOT_READY, frame_not_ready);
+
+  if (PREDICT_FALSE (frame_not_ready + n_sent == frame_num))
+    vlib_error_count (vm, node->node_index, AF_PACKET_TX_ERROR_TXRING_OVERRUN,
+		      n_left);
+
+  vlib_buffer_free (vm, vlib_frame_args (frame), frame->n_vectors);
+  return frame->n_vectors;
+}
+
+static void
+af_packet_set_interface_next_node (vnet_main_t * vnm, u32 hw_if_index,
+				   u32 node_index)
+{
+  af_packet_main_t *apm = &af_packet_main;
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+  af_packet_if_t *apif =
+    pool_elt_at_index (apm->interfaces, hw->dev_instance);
+
+  /* Shut off redirection */
+  if (node_index == ~0)
+    {
+      apif->per_interface_next_index = node_index;
+      return;
+    }
+
+  apif->per_interface_next_index =
+    vlib_node_add_next (vlib_get_main (), af_packet_input_node.index,
+			node_index);
+}
+
+static void
+af_packet_clear_hw_interface_counters (u32 instance)
+{
+  /* Nothing for now */
+}
+
+static clib_error_t *
+af_packet_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index,
+				   u32 flags)
+{
+  af_packet_main_t *apm = &af_packet_main;
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+  af_packet_if_t *apif =
+    pool_elt_at_index (apm->interfaces, hw->dev_instance);
+  u32 hw_flags;
+
+  apif->is_admin_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
+
+  if (apif->is_admin_up)
+    hw_flags = VNET_HW_INTERFACE_FLAG_LINK_UP;
+  else
+    hw_flags = 0;
+
+  vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
+
+  return 0;
+}
+
+static clib_error_t *
+af_packet_subif_add_del_function (vnet_main_t * vnm,
+				  u32 hw_if_index,
+				  struct vnet_sw_interface_t *st, int is_add)
+{
+  /* Nothing for now */
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (af_packet_device_class) = {
+  .name = "af-packet",
+  .tx_function = af_packet_interface_tx,
+  .format_device_name = format_af_packet_device_name,
+  .format_device = format_af_packet_device,
+  .format_tx_trace = format_af_packet_tx_trace,
+  .tx_function_n_errors = AF_PACKET_TX_N_ERROR,
+  .tx_function_error_strings = af_packet_tx_func_error_strings,
+  .rx_redirect_to_node = af_packet_set_interface_next_node,
+  .clear_counters = af_packet_clear_hw_interface_counters,
+  .admin_up_down_function = af_packet_interface_admin_up_down,
+  .subif_add_del_function = af_packet_subif_add_del_function,
+};
+
+VLIB_DEVICE_TX_FUNCTION_MULTIARCH (af_packet_device_class,
+				   af_packet_interface_tx)
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/af_packet/node.c b/src/vnet/devices/af_packet/node.c
new file mode 100644
index 00000000..72004320
--- /dev/null
+++ b/src/vnet/devices/af_packet/node.c
@@ -0,0 +1,288 @@
+/*
+ *------------------------------------------------------------------
+ * af_packet.c - linux kernel packet interface
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <linux/if_packet.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/devices/devices.h>
+#include <vnet/feature/feature.h>
+
+#include <vnet/devices/af_packet/af_packet.h>
+
+#define foreach_af_packet_input_error
+
+typedef enum
+{
+#define _(f,s) AF_PACKET_INPUT_ERROR_##f,
+  foreach_af_packet_input_error
+#undef _
+    AF_PACKET_INPUT_N_ERROR,
+} af_packet_input_error_t;
+
+static char *af_packet_input_error_strings[] = {
+#define _(n,s) s,
+  foreach_af_packet_input_error
+#undef _
+};
+
+typedef struct
+{
+  u32 next_index;
+  u32 hw_if_index;
+  int block;
+  struct tpacket2_hdr tph;
+} af_packet_input_trace_t;
+
+static u8 *
+format_af_packet_input_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  af_packet_input_trace_t *t = va_arg (*args, af_packet_input_trace_t *);
+  uword indent = format_get_indent (s);
+
+  s = format (s, "af_packet: hw_if_index %d next-index %d",
+	      t->hw_if_index, t->next_index);
+
+  s =
+    format (s,
+	    "\n%Utpacket2_hdr:\n%Ustatus 0x%x len %u snaplen %u mac %u net %u"
+	    "\n%Usec 0x%x nsec 0x%x vlan %U"
+#ifdef TP_STATUS_VLAN_TPID_VALID
+	    " vlan_tpid %u"
+#endif
+	    ,
+	    format_white_space, indent + 2,
+	    format_white_space, indent + 4,
+	    t->tph.tp_status,
+	    t->tph.tp_len,
+	    t->tph.tp_snaplen,
+	    t->tph.tp_mac,
+	    t->tph.tp_net,
+	    format_white_space, indent + 4,
+	    t->tph.tp_sec,
+	    t->tph.tp_nsec, format_ethernet_vlan_tci, t->tph.tp_vlan_tci
+#ifdef TP_STATUS_VLAN_TPID_VALID
+	    , t->tph.tp_vlan_tpid
+#endif
+    );
+  return s;
+}
+
+always_inline void
+buffer_add_to_chain (vlib_main_t * vm, u32 bi, u32 first_bi, u32 prev_bi)
+{
+  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+  vlib_buffer_t *first_b = vlib_get_buffer (vm, first_bi);
+  vlib_buffer_t *prev_b = vlib_get_buffer (vm, prev_bi);
+
+  /* update first buffer */
+  first_b->total_length_not_including_first_buffer += b->current_length;
+
+  /* update previous buffer */
+  prev_b->next_buffer = bi;
+  prev_b->flags |= VLIB_BUFFER_NEXT_PRESENT;
+
+  /* update current buffer */
+  b->next_buffer = 0;
+}
+
+always_inline uword
+af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+			   vlib_frame_t * frame, u32 device_idx)
+{
+  af_packet_main_t *apm = &af_packet_main;
+  af_packet_if_t *apif = pool_elt_at_index (apm->interfaces, device_idx);
+  struct tpacket2_hdr *tph;
+  u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
+  u32 block = 0;
+  u32 rx_frame;
+  u32 n_free_bufs;
+  u32 n_rx_packets = 0;
+  u32 n_rx_bytes = 0;
+  u32 *to_next = 0;
+  u32 block_size = apif->rx_req->tp_block_size;
+  u32 frame_size = apif->rx_req->tp_frame_size;
+  u32 frame_num = apif->rx_req->tp_frame_nr;
+  u8 *block_start = apif->rx_ring + block * block_size;
+  uword n_trace = vlib_get_trace_count (vm, node);
+  u32 n_buffer_bytes = vlib_buffer_free_list_buffer_size (vm,
+							  VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+  u32 min_bufs = apif->rx_req->tp_frame_size / n_buffer_bytes;
+  int cpu_index = node->cpu_index;
+
+  if (apif->per_interface_next_index != ~0)
+    next_index = apif->per_interface_next_index;
+
+  n_free_bufs = vec_len (apm->rx_buffers[cpu_index]);
+  if (PREDICT_FALSE (n_free_bufs < VLIB_FRAME_SIZE))
+    {
+      vec_validate (apm->rx_buffers[cpu_index],
+		    VLIB_FRAME_SIZE + n_free_bufs - 1);
+      n_free_bufs +=
+	vlib_buffer_alloc (vm, &apm->rx_buffers[cpu_index][n_free_bufs],
+			   VLIB_FRAME_SIZE);
+      _vec_len (apm->rx_buffers[cpu_index]) = n_free_bufs;
+    }
+
+  rx_frame = apif->next_rx_frame;
+  tph = (struct tpacket2_hdr *) (block_start + rx_frame * frame_size);
+  while ((tph->tp_status & TP_STATUS_USER) && (n_free_bufs > min_bufs))
+    {
+      vlib_buffer_t *b0 = 0, *first_b0 = 0;
+      u32 next0 = next_index;
+
+      u32 n_left_to_next;
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+      while ((tph->tp_status & TP_STATUS_USER) && (n_free_bufs > min_bufs) &&
+	     n_left_to_next)
+	{
+	  u32 data_len = tph->tp_snaplen;
+	  u32 offset = 0;
+	  u32 bi0 = 0, first_bi0 = 0, prev_bi0;
+
+	  while (data_len)
+	    {
+	      /* grab free buffer */
+	      u32 last_empty_buffer =
+		vec_len (apm->rx_buffers[cpu_index]) - 1;
+	      prev_bi0 = bi0;
+	      bi0 = apm->rx_buffers[cpu_index][last_empty_buffer];
+	      b0 = vlib_get_buffer (vm, bi0);
+	      _vec_len (apm->rx_buffers[cpu_index]) = last_empty_buffer;
+	      n_free_bufs--;
+
+	      /* copy data */
+	      u32 bytes_to_copy =
+		data_len > n_buffer_bytes ? n_buffer_bytes : data_len;
+	      b0->current_data = 0;
+	      clib_memcpy (vlib_buffer_get_current (b0),
+			   (u8 *) tph + tph->tp_mac + offset, bytes_to_copy);
+
+	      /* fill buffer header */
+	      b0->current_length = bytes_to_copy;
+
+	      if (offset == 0)
+		{
+		  b0->total_length_not_including_first_buffer = 0;
+		  b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
+		  vnet_buffer (b0)->sw_if_index[VLIB_RX] = apif->sw_if_index;
+		  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+		  first_bi0 = bi0;
+		  first_b0 = vlib_get_buffer (vm, first_bi0);
+		}
+	      else
+		buffer_add_to_chain (vm, bi0, first_bi0, prev_bi0);
+
+	      offset += bytes_to_copy;
+	      data_len -= bytes_to_copy;
+	    }
+	  n_rx_packets++;
+	  n_rx_bytes += tph->tp_snaplen;
+	  to_next[0] = first_bi0;
+	  to_next += 1;
+	  n_left_to_next--;
+
+	  /* trace */
+	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (first_b0);
+	  if (PREDICT_FALSE (n_trace > 0))
+	    {
+	      af_packet_input_trace_t *tr;
+	      vlib_trace_buffer (vm, node, next0, first_b0,	/* follow_chain */
+				 0);
+	      vlib_set_trace_count (vm, node, --n_trace);
+	      tr = vlib_add_trace (vm, node, first_b0, sizeof (*tr));
+	      tr->next_index = next0;
+	      tr->hw_if_index = apif->hw_if_index;
+	      clib_memcpy (&tr->tph, tph, sizeof (struct tpacket2_hdr));
+	    }
+
+	  /* redirect if feature path enabled */
+	  vnet_feature_start_device_input_x1 (apif->sw_if_index, &next0, b0,
+					      0);
+
+	  /* enque and take next packet */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, first_bi0, next0);
+
+	  /* next packet */
+	  tph->tp_status = TP_STATUS_KERNEL;
+	  rx_frame = (rx_frame + 1) % frame_num;
+	  tph = (struct tpacket2_hdr *) (block_start + rx_frame * frame_size);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  apif->next_rx_frame = rx_frame;
+
+  vlib_increment_combined_counter
+    (vnet_get_main ()->interface_main.combined_sw_if_counters
+     + VNET_INTERFACE_COUNTER_RX,
+     os_get_cpu_number (), apif->hw_if_index, n_rx_packets, n_rx_bytes);
+
+  return n_rx_packets;
+}
+
+static uword
+af_packet_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+		    vlib_frame_t * frame)
+{
+  int i;
+  u32 n_rx_packets = 0;
+
+  af_packet_main_t *apm = &af_packet_main;
+
+  /* *INDENT-OFF* */
+  clib_bitmap_foreach (i, apm->pending_input_bitmap,
+    ({
+      clib_bitmap_set (apm->pending_input_bitmap, i, 0);
+      n_rx_packets += af_packet_device_input_fn(vm, node, frame, i);
+    }));
+  /* *INDENT-ON* */
+
+  return n_rx_packets;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (af_packet_input_node) = {
+  .function = af_packet_input_fn,
+  .name = "af-packet-input",
+  .sibling_of = "device-input",
+  .format_trace = format_af_packet_input_trace,
+  .type = VLIB_NODE_TYPE_INPUT,
+  .state = VLIB_NODE_STATE_INTERRUPT,
+  .n_errors = AF_PACKET_INPUT_N_ERROR,
+  .error_strings = af_packet_input_error_strings,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (af_packet_input_node, af_packet_input_fn)
+/* *INDENT-ON* */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/devices.c b/src/vnet/devices/devices.c
new file mode 100644
index 00000000..cd4386eb
--- /dev/null
+++ b/src/vnet/devices/devices.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/devices/devices.h>
+#include <vnet/feature/feature.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+
+static uword
+device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+		 vlib_frame_t * frame)
+{
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (device_input_node) = {
+  .function = device_input_fn,
+  .name = "device-input",
+  .type = VLIB_NODE_TYPE_INPUT,
+  .state = VLIB_NODE_STATE_DISABLED,
+  .n_next_nodes = VNET_DEVICE_INPUT_N_NEXT_NODES,
+  .next_nodes = VNET_DEVICE_INPUT_NEXT_NODES,
+};
+
+/* Table defines how much we need to advance current data pointer
+   in the buffer if we shortcut to l3 nodes */
+
+const u32 __attribute__((aligned (CLIB_CACHE_LINE_BYTES)))
+device_input_next_node_advance[((VNET_DEVICE_INPUT_N_NEXT_NODES /
+				CLIB_CACHE_LINE_BYTES) +1) * CLIB_CACHE_LINE_BYTES] =
+{
+      [VNET_DEVICE_INPUT_NEXT_IP4_INPUT] = sizeof (ethernet_header_t),
+      [VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT] = sizeof (ethernet_header_t),
+      [VNET_DEVICE_INPUT_NEXT_IP6_INPUT] = sizeof (ethernet_header_t),
+      [VNET_DEVICE_INPUT_NEXT_MPLS_INPUT] = sizeof (ethernet_header_t),
+};
+
+VNET_FEATURE_ARC_INIT (device_input, static) =
+{
+  .arc_name  = "device-input",
+  .start_nodes = VNET_FEATURES ("device-input"),
+  .end_node = "ethernet-input",
+  .arc_index_ptr = &feature_main.device_input_feature_arc_index,
+};
+
+VNET_FEATURE_INIT (l2_patch, static) = {
+  .arc_name = "device-input",
+  .node_name = "l2-patch",
+  .runs_before = VNET_FEATURES ("ethernet-input"),
+};
+
+VNET_FEATURE_INIT (worker_handoff, static) = {
+  .arc_name = "device-input",
+  .node_name = "worker-handoff",
+  .runs_before = VNET_FEATURES ("ethernet-input"),
+};
+
+VNET_FEATURE_INIT (span_input, static) = {
+  .arc_name = "device-input",
+  .node_name = "span-input",
+  .runs_before = VNET_FEATURES ("ethernet-input"),
+};
+
+VNET_FEATURE_INIT (ethernet_input, static) = {
+  .arc_name = "device-input",
+  .node_name = "ethernet-input",
+  .runs_before = 0, /* not before any other features */
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/devices.h b/src/vnet/devices/devices.h
new file mode 100644
index 00000000..c46dab90
--- /dev/null
+++ b/src/vnet/devices/devices.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_vnet_vnet_device_h
+#define included_vnet_vnet_device_h
+
+#include <vnet/unix/pcap.h>
+#include <vnet/l3_types.h>
+
+typedef enum
+{
+  VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT,
+  VNET_DEVICE_INPUT_NEXT_IP4_INPUT,
+  VNET_DEVICE_INPUT_NEXT_IP6_INPUT,
+  VNET_DEVICE_INPUT_NEXT_MPLS_INPUT,
+  VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT,
+  VNET_DEVICE_INPUT_NEXT_DROP,
+  VNET_DEVICE_INPUT_N_NEXT_NODES,
+} vnet_device_input_next_t;
+
+#define VNET_DEVICE_INPUT_NEXT_NODES {					\
+    [VNET_DEVICE_INPUT_NEXT_DROP] = "error-drop",			\
+    [VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT] = "ethernet-input",		\
+    [VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT] = "ip4-input-no-checksum",	\
+    [VNET_DEVICE_INPUT_NEXT_IP4_INPUT] = "ip4-input",			\
+    [VNET_DEVICE_INPUT_NEXT_IP6_INPUT] = "ip6-input",			\
+    [VNET_DEVICE_INPUT_NEXT_MPLS_INPUT] = "mpls-input",			\
+}
+
+extern vlib_node_registration_t device_input_node;
+extern const u32 device_input_next_node_advance[];
+
+#endif /* included_vnet_vnet_device_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/cli.c b/src/vnet/devices/dpdk/cli.c
new file mode 100644
index 00000000..538a00fd
--- /dev/null
+++ b/src/vnet/devices/dpdk/cli.c
@@ -0,0 +1,1296 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/vnet.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/error.h>
+#include <vppinfra/format.h>
+#include <vppinfra/xxhash.h>
+
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/devices/dpdk/dpdk.h>
+#include <vnet/classify/vnet_classify.h>
+#include <vnet/mpls/packet.h>
+
+#include "dpdk_priv.h"
+
+static clib_error_t *
+pcap_trace_command_fn (vlib_main_t * vm,
+		       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  dpdk_main_t *dm = &dpdk_main;
+  u8 *filename;
+  u32 max;
+  int matched = 0;
+  clib_error_t *error = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "on"))
+	{
+	  if (dm->tx_pcap_enable == 0)
+	    {
+	      if (dm->pcap_filename == 0)
+		dm->pcap_filename = format (0, "/tmp/vpe.pcap%c", 0);
+
+	      memset (&dm->pcap_main, 0, sizeof (dm->pcap_main));
+	      dm->pcap_main.file_name = (char *) dm->pcap_filename;
+	      dm->pcap_main.n_packets_to_capture = 100;
+	      if (dm->pcap_pkts_to_capture)
+		dm->pcap_main.n_packets_to_capture = dm->pcap_pkts_to_capture;
+
+	      dm->pcap_main.packet_type = PCAP_PACKET_TYPE_ethernet;
+	      dm->tx_pcap_enable = 1;
+	      matched = 1;
+	      vlib_cli_output (vm, "pcap tx capture on...");
+	    }
+	  else
+	    {
+	      vlib_cli_output (vm, "pcap tx capture already on...");
+	    }
+	  matched = 1;
+	}
+      else if (unformat (input, "off"))
+	{
+	  if (dm->tx_pcap_enable)
+	    {
+	      vlib_cli_output (vm, "captured %d pkts...",
+			       dm->pcap_main.n_packets_captured + 1);
+	      if (dm->pcap_main.n_packets_captured)
+		{
+		  dm->pcap_main.n_packets_to_capture =
+		    dm->pcap_main.n_packets_captured;
+		  error = pcap_write (&dm->pcap_main);
+		  if (error)
+		    clib_error_report (error);
+		  else
+		    vlib_cli_output (vm, "saved to %s...", dm->pcap_filename);
+		}
+	    }
+	  else
+	    {
+	      vlib_cli_output (vm, "pcap tx capture already off...");
+	    }
+
+	  dm->tx_pcap_enable = 0;
+	  matched = 1;
+	}
+      else if (unformat (input, "max %d", &max))
+	{
+	  dm->pcap_pkts_to_capture = max;
+	  matched = 1;
+	}
+
+      else if (unformat (input, "intfc %U",
+			 unformat_vnet_sw_interface, dm->vnet_main,
+			 &dm->pcap_sw_if_index))
+	matched = 1;
+      else if (unformat (input, "intfc any"))
+	{
+	  dm->pcap_sw_if_index = 0;
+	  matched = 1;
+	}
+      else if (unformat (input, "file %s", &filename))
+	{
+	  u8 *chroot_filename;
+	  /* Brain-police user path input */
+	  if (strstr ((char *) filename, "..")
+	      || index ((char *) filename, '/'))
+	    {
+	      vlib_cli_output (vm, "illegal characters in filename '%s'",
+			       filename);
+	      continue;
+	    }
+
+	  chroot_filename = format (0, "/tmp/%s%c", filename, 0);
+	  vec_free (filename);
+
+	  if (dm->pcap_filename)
+	    vec_free (dm->pcap_filename);
+	  vec_add1 (filename, 0);
+	  dm->pcap_filename = chroot_filename;
+	  matched = 1;
+	}
+      else if (unformat (input, "status"))
+	{
+	  if (dm->tx_pcap_enable == 0)
+	    {
+	      vlib_cli_output (vm, "pcap tx capture is off...");
+	      continue;
+	    }
+
+	  vlib_cli_output (vm, "pcap tx capture: %d of %d pkts...",
+			   dm->pcap_main.n_packets_captured,
+			   dm->pcap_main.n_packets_to_capture);
+	  matched = 1;
+	}
+
+      else
+	break;
+    }
+
+  if (matched == 0)
+    return clib_error_return (0, "unknown input `%U'",
+			      format_unformat_error, input);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (pcap_trace_command, static) = {
+    .path = "pcap tx trace",
+    .short_help =
+    "pcap tx trace on off max <nn> intfc <intfc> file <name> status",
+    .function = pcap_trace_command_fn,
+};
+/* *INDENT-ON* */
+
+
+static clib_error_t *
+show_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input,
+		  vlib_cli_command_t * cmd)
+{
+  struct rte_mempool *rmp;
+  int i;
+
+  for (i = 0; i < vec_len (vm->buffer_main->pktmbuf_pools); i++)
+    {
+      rmp = vm->buffer_main->pktmbuf_pools[i];
+      if (rmp)
+	{
+	  unsigned count = rte_mempool_avail_count (rmp);
+	  unsigned free_count = rte_mempool_in_use_count (rmp);
+
+	  vlib_cli_output (vm,
+			   "name=\"%s\"  available = %7d allocated = %7d total = %7d\n",
+			   rmp->name, (u32) count, (u32) free_count,
+			   (u32) (count + free_count));
+	}
+      else
+	{
+	  vlib_cli_output (vm, "rte_mempool is NULL (!)\n");
+	}
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_show_dpdk_bufferr,static) = {
+    .path = "show dpdk buffer",
+    .short_help = "show dpdk buffer state",
+    .function = show_dpdk_buffer,
+    .is_mp_safe = 1,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+test_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input,
+		  vlib_cli_command_t * cmd)
+{
+  static u32 *allocated_buffers;
+  u32 n_alloc = 0;
+  u32 n_free = 0;
+  u32 first, actual_alloc;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "allocate %d", &n_alloc))
+	;
+      else if (unformat (input, "free %d", &n_free))
+	;
+      else
+	break;
+    }
+
+  if (n_free)
+    {
+      if (vec_len (allocated_buffers) < n_free)
+	return clib_error_return (0, "Can't free %d, only %d allocated",
+				  n_free, vec_len (allocated_buffers));
+
+      first = vec_len (allocated_buffers) - n_free;
+      vlib_buffer_free (vm, allocated_buffers + first, n_free);
+      _vec_len (allocated_buffers) = first;
+    }
+  if (n_alloc)
+    {
+      first = vec_len (allocated_buffers);
+      vec_validate (allocated_buffers,
+		    vec_len (allocated_buffers) + n_alloc - 1);
+
+      actual_alloc = vlib_buffer_alloc (vm, allocated_buffers + first,
+					n_alloc);
+      _vec_len (allocated_buffers) = first + actual_alloc;
+
+      if (actual_alloc < n_alloc)
+	vlib_cli_output (vm, "WARNING: only allocated %d buffers",
+			 actual_alloc);
+    }
+
+  vlib_cli_output (vm, "Currently %d buffers allocated",
+		   vec_len (allocated_buffers));
+
+  if (allocated_buffers && vec_len (allocated_buffers) == 0)
+    vec_free (allocated_buffers);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_test_dpdk_buffer,static) = {
+    .path = "test dpdk buffer",
+    .short_help = "test dpdk buffer [allocate <nn>][free <nn>]",
+    .function = test_dpdk_buffer,
+    .is_mp_safe = 1,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_dpdk_if_desc (vlib_main_t * vm, unformat_input_t * input,
+		  vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  dpdk_main_t *dm = &dpdk_main;
+  vnet_hw_interface_t *hw;
+  dpdk_device_t *xd;
+  u32 hw_if_index = (u32) ~ 0;
+  u32 nb_rx_desc = (u32) ~ 0;
+  u32 nb_tx_desc = (u32) ~ 0;
+  clib_error_t *rv;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
+	   &hw_if_index))
+	;
+      else if (unformat (line_input, "tx %d", &nb_tx_desc))
+	;
+      else if (unformat (line_input, "rx %d", &nb_rx_desc))
+	;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (hw_if_index == (u32) ~ 0)
+    return clib_error_return (0, "please specify valid interface name");
+
+  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
+  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
+
+  if ((xd->flags & DPDK_DEVICE_FLAG_PMD) == 0)
+    return clib_error_return (0, "number of descriptors can be set only for "
+			      "physical devices");
+
+  if ((nb_rx_desc == (u32) ~ 0 || nb_rx_desc == xd->nb_rx_desc) &&
+      (nb_tx_desc == (u32) ~ 0 || nb_tx_desc == xd->nb_tx_desc))
+    return clib_error_return (0, "nothing changed");
+
+  if (nb_rx_desc != (u32) ~ 0)
+    xd->nb_rx_desc = nb_rx_desc;
+
+  if (nb_tx_desc != (u32) ~ 0)
+    xd->nb_tx_desc = nb_tx_desc;
+
+  rv = dpdk_port_setup (dm, xd);
+
+  return rv;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_set_dpdk_if_desc,static) = {
+    .path = "set dpdk interface descriptors",
+    .short_help = "set dpdk interface descriptors <if-name> [rx <n>] [tx <n>]",
+    .function = set_dpdk_if_desc,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+show_dpdk_if_placement (vlib_main_t * vm, unformat_input_t * input,
+			vlib_cli_command_t * cmd)
+{
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_and_queue_t *dq;
+  int cpu;
+
+  if (tm->n_vlib_mains == 1)
+    vlib_cli_output (vm, "All interfaces are handled by main thread");
+
+  for (cpu = 0; cpu < vec_len (dm->devices_by_cpu); cpu++)
+    {
+      if (vec_len (dm->devices_by_cpu[cpu]))
+	vlib_cli_output (vm, "Thread %u (%s at lcore %u):", cpu,
+			 vlib_worker_threads[cpu].name,
+			 vlib_worker_threads[cpu].lcore_id);
+
+      /* *INDENT-OFF* */
+      vec_foreach(dq, dm->devices_by_cpu[cpu])
+        {
+          u32 hw_if_index = dm->devices[dq->device].vlib_hw_if_index;
+          vnet_hw_interface_t * hi =  vnet_get_hw_interface(dm->vnet_main, hw_if_index);
+          vlib_cli_output(vm, "  %v queue %u", hi->name, dq->queue_id);
+        }
+      /* *INDENT-ON* */
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_show_dpdk_if_placement,static) = {
+    .path = "show dpdk interface placement",
+    .short_help = "show dpdk interface placement",
+    .function = show_dpdk_if_placement,
+};
+/* *INDENT-ON* */
+
+static int
+dpdk_device_queue_sort (void *a1, void *a2)
+{
+  dpdk_device_and_queue_t *dq1 = a1;
+  dpdk_device_and_queue_t *dq2 = a2;
+
+  if (dq1->device > dq2->device)
+    return 1;
+  else if (dq1->device < dq2->device)
+    return -1;
+  else if (dq1->queue_id > dq2->queue_id)
+    return 1;
+  else if (dq1->queue_id < dq2->queue_id)
+    return -1;
+  else
+    return 0;
+}
+
+static clib_error_t *
+set_dpdk_if_placement (vlib_main_t * vm, unformat_input_t * input,
+		       vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_and_queue_t *dq;
+  vnet_hw_interface_t *hw;
+  dpdk_device_t *xd;
+  u32 hw_if_index = (u32) ~ 0;
+  u32 queue = (u32) 0;
+  u32 cpu = (u32) ~ 0;
+  int i;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
+	   &hw_if_index))
+	;
+      else if (unformat (line_input, "queue %d", &queue))
+	;
+      else if (unformat (line_input, "thread %d", &cpu))
+	;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (hw_if_index == (u32) ~ 0)
+    return clib_error_return (0, "please specify valid interface name");
+
+  if (cpu < dm->input_cpu_first_index ||
+      cpu >= (dm->input_cpu_first_index + dm->input_cpu_count))
+    return clib_error_return (0, "please specify valid thread id");
+
+  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
+  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
+
+  for (i = 0; i < vec_len (dm->devices_by_cpu); i++)
+    {
+      /* *INDENT-OFF* */
+      vec_foreach(dq, dm->devices_by_cpu[i])
+        {
+          if (hw_if_index == dm->devices[dq->device].vlib_hw_if_index &&
+              queue == dq->queue_id)
+            {
+              if (cpu == i) /* nothing to do */
+                return 0;
+
+              vec_del1(dm->devices_by_cpu[i], dq - dm->devices_by_cpu[i]);
+              vec_add2(dm->devices_by_cpu[cpu], dq, 1);
+              dq->queue_id = queue;
+              dq->device = xd->device_index;
+              xd->cpu_socket_id_by_queue[queue] =
+                rte_lcore_to_socket_id(vlib_worker_threads[cpu].lcore_id);
+
+              vec_sort_with_function(dm->devices_by_cpu[i],
+                                     dpdk_device_queue_sort);
+
+              vec_sort_with_function(dm->devices_by_cpu[cpu],
+                                     dpdk_device_queue_sort);
+
+              if (vec_len(dm->devices_by_cpu[i]) == 0)
+                vlib_node_set_state (vlib_mains[i], dpdk_input_node.index,
+                                     VLIB_NODE_STATE_DISABLED);
+
+              if (vec_len(dm->devices_by_cpu[cpu]) == 1)
+                vlib_node_set_state (vlib_mains[cpu], dpdk_input_node.index,
+                                     VLIB_NODE_STATE_POLLING);
+
+              return 0;
+            }
+        }
+      /* *INDENT-ON* */
+    }
+
+  return clib_error_return (0, "not found");
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_set_dpdk_if_placement,static) = {
+    .path = "set dpdk interface placement",
+    .short_help = "set dpdk interface placement <if-name> [queue <n>]  thread <n>",
+    .function = set_dpdk_if_placement,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+show_dpdk_if_hqos_placement (vlib_main_t * vm, unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_and_queue_t *dq;
+  int cpu;
+
+  if (tm->n_vlib_mains == 1)
+    vlib_cli_output (vm, "All interfaces are handled by main thread");
+
+  for (cpu = 0; cpu < vec_len (dm->devices_by_hqos_cpu); cpu++)
+    {
+      if (vec_len (dm->devices_by_hqos_cpu[cpu]))
+	vlib_cli_output (vm, "Thread %u (%s at lcore %u):", cpu,
+			 vlib_worker_threads[cpu].name,
+			 vlib_worker_threads[cpu].lcore_id);
+
+      vec_foreach (dq, dm->devices_by_hqos_cpu[cpu])
+      {
+	u32 hw_if_index = dm->devices[dq->device].vlib_hw_if_index;
+	vnet_hw_interface_t *hi =
+	  vnet_get_hw_interface (dm->vnet_main, hw_if_index);
+	vlib_cli_output (vm, "  %v queue %u", hi->name, dq->queue_id);
+      }
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_show_dpdk_if_hqos_placement, static) = {
+  .path = "show dpdk interface hqos placement",
+  .short_help = "show dpdk interface hqos placement",
+  .function = show_dpdk_if_hqos_placement,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_dpdk_if_hqos_placement (vlib_main_t * vm, unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_and_queue_t *dq;
+  vnet_hw_interface_t *hw;
+  dpdk_device_t *xd;
+  u32 hw_if_index = (u32) ~ 0;
+  u32 cpu = (u32) ~ 0;
+  int i;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
+	   &hw_if_index))
+	;
+      else if (unformat (line_input, "thread %d", &cpu))
+	;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (hw_if_index == (u32) ~ 0)
+    return clib_error_return (0, "please specify valid interface name");
+
+  if (cpu < dm->hqos_cpu_first_index ||
+      cpu >= (dm->hqos_cpu_first_index + dm->hqos_cpu_count))
+    return clib_error_return (0, "please specify valid thread id");
+
+  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
+  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
+
+  for (i = 0; i < vec_len (dm->devices_by_hqos_cpu); i++)
+    {
+      vec_foreach (dq, dm->devices_by_hqos_cpu[i])
+      {
+	if (hw_if_index == dm->devices[dq->device].vlib_hw_if_index)
+	  {
+	    if (cpu == i)	/* nothing to do */
+	      return 0;
+
+	    vec_del1 (dm->devices_by_hqos_cpu[i],
+		      dq - dm->devices_by_hqos_cpu[i]);
+	    vec_add2 (dm->devices_by_hqos_cpu[cpu], dq, 1);
+	    dq->queue_id = 0;
+	    dq->device = xd->device_index;
+
+	    vec_sort_with_function (dm->devices_by_hqos_cpu[i],
+				    dpdk_device_queue_sort);
+
+	    vec_sort_with_function (dm->devices_by_hqos_cpu[cpu],
+				    dpdk_device_queue_sort);
+
+	    return 0;
+	  }
+      }
+    }
+
+  return clib_error_return (0, "not found");
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_set_dpdk_if_hqos_placement, static) = {
+  .path = "set dpdk interface hqos placement",
+  .short_help = "set dpdk interface hqos placement <if-name> thread <n>",
+  .function = set_dpdk_if_hqos_placement,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_dpdk_if_hqos_pipe (vlib_main_t * vm, unformat_input_t * input,
+		       vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  dpdk_main_t *dm = &dpdk_main;
+  vnet_hw_interface_t *hw;
+  dpdk_device_t *xd;
+  u32 hw_if_index = (u32) ~ 0;
+  u32 subport_id = (u32) ~ 0;
+  u32 pipe_id = (u32) ~ 0;
+  u32 profile_id = (u32) ~ 0;
+  int rv;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
+	   &hw_if_index))
+	;
+      else if (unformat (line_input, "subport %d", &subport_id))
+	;
+      else if (unformat (line_input, "pipe %d", &pipe_id))
+	;
+      else if (unformat (line_input, "profile %d", &profile_id))
+	;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (hw_if_index == (u32) ~ 0)
+    return clib_error_return (0, "please specify valid interface name");
+
+  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
+  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
+
+  rv =
+    rte_sched_pipe_config (xd->hqos_ht->hqos, subport_id, pipe_id,
+			   profile_id);
+  if (rv)
+    return clib_error_return (0, "pipe configuration failed");
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_set_dpdk_if_hqos_pipe, static) =
+{
+  .path = "set dpdk interface hqos pipe",
+  .short_help = "set dpdk interface hqos pipe <if-name> subport <n> pipe <n> "
+                  "profile <n>",
+  .function = set_dpdk_if_hqos_pipe,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_dpdk_if_hqos_subport (vlib_main_t * vm, unformat_input_t * input,
+			  vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  dpdk_main_t *dm = &dpdk_main;
+  vnet_hw_interface_t *hw;
+  dpdk_device_t *xd;
+  u32 hw_if_index = (u32) ~ 0;
+  u32 subport_id = (u32) ~ 0;
+  struct rte_sched_subport_params p = {
+    .tb_rate = 1250000000,	/* 10GbE */
+    .tb_size = 1000000,
+    .tc_rate = {1250000000, 1250000000, 1250000000, 1250000000},
+    .tc_period = 10,
+  };
+  int rv;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
+	   &hw_if_index))
+	;
+      else if (unformat (line_input, "subport %d", &subport_id))
+	;
+      else if (unformat (line_input, "rate %d", &p.tb_rate))
+	{
+	  p.tc_rate[0] = p.tb_rate;
+	  p.tc_rate[1] = p.tb_rate;
+	  p.tc_rate[2] = p.tb_rate;
+	  p.tc_rate[3] = p.tb_rate;
+	}
+      else if (unformat (line_input, "bktsize %d", &p.tb_size))
+	;
+      else if (unformat (line_input, "tc0 %d", &p.tc_rate[0]))
+	;
+      else if (unformat (line_input, "tc1 %d", &p.tc_rate[1]))
+	;
+      else if (unformat (line_input, "tc2 %d", &p.tc_rate[2]))
+	;
+      else if (unformat (line_input, "tc3 %d", &p.tc_rate[3]))
+	;
+      else if (unformat (line_input, "period %d", &p.tc_period))
+	;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (hw_if_index == (u32) ~ 0)
+    return clib_error_return (0, "please specify valid interface name");
+
+  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
+  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
+
+  rv = rte_sched_subport_config (xd->hqos_ht->hqos, subport_id, &p);
+  if (rv)
+    return clib_error_return (0, "subport configuration failed");
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_set_dpdk_if_hqos_subport, static) = {
+  .path = "set dpdk interface hqos subport",
+  .short_help = "set dpdk interface hqos subport <if-name> subport <n> "
+                 "[rate <n>] [bktsize <n>] [tc0 <n>] [tc1 <n>] [tc2 <n>] [tc3 <n>] "
+                 "[period <n>]",
+  .function = set_dpdk_if_hqos_subport,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_dpdk_if_hqos_tctbl (vlib_main_t * vm, unformat_input_t * input,
+			vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  dpdk_main_t *dm = &dpdk_main;
+  vnet_hw_interface_t *hw;
+  dpdk_device_t *xd;
+  u32 hw_if_index = (u32) ~ 0;
+  u32 tc = (u32) ~ 0;
+  u32 queue = (u32) ~ 0;
+  u32 entry = (u32) ~ 0;
+  u32 val, i;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
+	   &hw_if_index))
+	;
+      else if (unformat (line_input, "entry %d", &entry))
+	;
+      else if (unformat (line_input, "tc %d", &tc))
+	;
+      else if (unformat (line_input, "queue %d", &queue))
+	;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (hw_if_index == (u32) ~ 0)
+    return clib_error_return (0, "please specify valid interface name");
+  if (entry >= 64)
+    return clib_error_return (0, "invalid entry");
+  if (tc >= RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE)
+    return clib_error_return (0, "invalid traffic class");
+  if (queue >= RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS)
+    return clib_error_return (0, "invalid traffic class");
+
+  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
+  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
+
+  /* Detect the set of worker threads */
+  uword *p = hash_get_mem (tm->thread_registrations_by_name, "workers");
+  /* Should never happen, shut up Coverity warning */
+  if (p == 0)
+    return clib_error_return (0, "no worker registrations?");
+
+  vlib_thread_registration_t *tr = (vlib_thread_registration_t *) p[0];
+  int worker_thread_first = tr->first_index;
+  int worker_thread_count = tr->count;
+
+  val = tc * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + queue;
+  for (i = 0; i < worker_thread_count; i++)
+    xd->hqos_wt[worker_thread_first + i].hqos_tc_table[entry] = val;
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_set_dpdk_if_hqos_tctbl, static) = {
+  .path = "set dpdk interface hqos tctbl",
+  .short_help = "set dpdk interface hqos tctbl <if-name> entry <n> tc <n> queue <n>",
+  .function = set_dpdk_if_hqos_tctbl,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_dpdk_if_hqos_pktfield (vlib_main_t * vm, unformat_input_t * input,
+			   vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  dpdk_main_t *dm = &dpdk_main;
+
+  /* Device specific data */
+  struct rte_eth_dev_info dev_info;
+  dpdk_device_config_t *devconf = 0;
+  vnet_hw_interface_t *hw;
+  dpdk_device_t *xd;
+  u32 hw_if_index = (u32) ~ 0;
+
+  /* Detect the set of worker threads */
+  uword *p = hash_get_mem (tm->thread_registrations_by_name, "workers");
+  /* Should never happen, shut up Coverity warning */
+  if (p == 0)
+    return clib_error_return (0, "no worker registrations?");
+
+  vlib_thread_registration_t *tr = (vlib_thread_registration_t *) p[0];
+  int worker_thread_first = tr->first_index;
+  int worker_thread_count = tr->count;
+
+  /* Packet field configuration */
+  u64 mask = (u64) ~ 0;
+  u32 id = (u32) ~ 0;
+  u32 offset = (u32) ~ 0;
+
+  /* HQoS params */
+  u32 n_subports_per_port, n_pipes_per_subport, tctbl_size;
+
+  u32 i;
+
+  /* Parse input arguments */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
+	   &hw_if_index))
+	;
+      else if (unformat (line_input, "id %d", &id))
+	;
+      else if (unformat (line_input, "offset %d", &offset))
+	;
+      else if (unformat (line_input, "mask %llx", &mask))
+	;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  /* Get interface */
+  if (hw_if_index == (u32) ~ 0)
+    return clib_error_return (0, "please specify valid interface name");
+
+  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
+  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
+
+  rte_eth_dev_info_get (xd->device_index, &dev_info);
+  if (dev_info.pci_dev)
+    {				/* bonded interface has no pci info */
+      vlib_pci_addr_t pci_addr;
+
+      pci_addr.domain = dev_info.pci_dev->addr.domain;
+      pci_addr.bus = dev_info.pci_dev->addr.bus;
+      pci_addr.slot = dev_info.pci_dev->addr.devid;
+      pci_addr.function = dev_info.pci_dev->addr.function;
+
+      p =
+	hash_get (dm->conf->device_config_index_by_pci_addr, pci_addr.as_u32);
+    }
+
+  if (p)
+    devconf = pool_elt_at_index (dm->conf->dev_confs, p[0]);
+  else
+    devconf = &dm->conf->default_devconf;
+
+  if (devconf->hqos_enabled == 0)
+    {
+      vlib_cli_output (vm, "HQoS disabled for this interface");
+      return 0;
+    }
+
+  n_subports_per_port = devconf->hqos.port.n_subports_per_port;
+  n_pipes_per_subport = devconf->hqos.port.n_pipes_per_subport;
+  tctbl_size = RTE_DIM (devconf->hqos.tc_table);
+
+  /* Validate packet field configuration: id, offset and mask */
+  if (id >= 3)
+    return clib_error_return (0, "invalid packet field id");
+
+  switch (id)
+    {
+    case 0:
+      if (dpdk_hqos_validate_mask (mask, n_subports_per_port) != 0)
+	return clib_error_return (0, "invalid subport ID mask "
+				  "(n_subports_per_port = %u)",
+				  n_subports_per_port);
+      break;
+    case 1:
+      if (dpdk_hqos_validate_mask (mask, n_pipes_per_subport) != 0)
+	return clib_error_return (0, "invalid pipe ID mask "
+				  "(n_pipes_per_subport = %u)",
+				  n_pipes_per_subport);
+      break;
+    case 2:
+    default:
+      if (dpdk_hqos_validate_mask (mask, tctbl_size) != 0)
+	return clib_error_return (0, "invalid TC table index mask "
+				  "(TC table size = %u)", tctbl_size);
+    }
+
+  /* Propagate packet field configuration to all workers */
+  for (i = 0; i < worker_thread_count; i++)
+    switch (id)
+      {
+      case 0:
+	xd->hqos_wt[worker_thread_first + i].hqos_field0_slabpos = offset;
+	xd->hqos_wt[worker_thread_first + i].hqos_field0_slabmask = mask;
+	xd->hqos_wt[worker_thread_first + i].hqos_field0_slabshr =
+	  __builtin_ctzll (mask);
+	break;
+      case 1:
+	xd->hqos_wt[worker_thread_first + i].hqos_field1_slabpos = offset;
+	xd->hqos_wt[worker_thread_first + i].hqos_field1_slabmask = mask;
+	xd->hqos_wt[worker_thread_first + i].hqos_field1_slabshr =
+	  __builtin_ctzll (mask);
+	break;
+      case 2:
+      default:
+	xd->hqos_wt[worker_thread_first + i].hqos_field2_slabpos = offset;
+	xd->hqos_wt[worker_thread_first + i].hqos_field2_slabmask = mask;
+	xd->hqos_wt[worker_thread_first + i].hqos_field2_slabshr =
+	  __builtin_ctzll (mask);
+      }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_set_dpdk_if_hqos_pktfield, static) = {
+  .path = "set dpdk interface hqos pktfield",
+  .short_help = "set dpdk interface hqos pktfield <if-name> id <n> offset <n> "
+                 "mask <n>",
+  .function = set_dpdk_if_hqos_pktfield,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+show_dpdk_if_hqos (vlib_main_t * vm, unformat_input_t * input,
+		   vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  dpdk_main_t *dm = &dpdk_main;
+  vnet_hw_interface_t *hw;
+  dpdk_device_t *xd;
+  dpdk_device_config_hqos_t *cfg;
+  dpdk_device_hqos_per_hqos_thread_t *ht;
+  dpdk_device_hqos_per_worker_thread_t *wk;
+  u32 *tctbl;
+  u32 hw_if_index = (u32) ~ 0;
+  u32 profile_id, i;
+  struct rte_eth_dev_info dev_info;
+  dpdk_device_config_t *devconf = 0;
+  vlib_thread_registration_t *tr;
+  uword *p = 0;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
+	   &hw_if_index))
+	;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (hw_if_index == (u32) ~ 0)
+    return clib_error_return (0, "please specify interface name!!");
+
+  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
+  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
+
+  rte_eth_dev_info_get (xd->device_index, &dev_info);
+  if (dev_info.pci_dev)
+    {				/* bonded interface has no pci info */
+      vlib_pci_addr_t pci_addr;
+
+      pci_addr.domain = dev_info.pci_dev->addr.domain;
+      pci_addr.bus = dev_info.pci_dev->addr.bus;
+      pci_addr.slot = dev_info.pci_dev->addr.devid;
+      pci_addr.function = dev_info.pci_dev->addr.function;
+
+      p =
+	hash_get (dm->conf->device_config_index_by_pci_addr, pci_addr.as_u32);
+    }
+
+  if (p)
+    devconf = pool_elt_at_index (dm->conf->dev_confs, p[0]);
+  else
+    devconf = &dm->conf->default_devconf;
+
+  if (devconf->hqos_enabled == 0)
+    {
+      vlib_cli_output (vm, "HQoS disabled for this interface");
+      return 0;
+    }
+
+  /* Detect the set of worker threads */
+  p = hash_get_mem (tm->thread_registrations_by_name, "workers");
+
+  /* Should never happen, shut up Coverity warning */
+  if (p == 0)
+    return clib_error_return (0, "no worker registrations?");
+
+  tr = (vlib_thread_registration_t *) p[0];
+
+  cfg = &devconf->hqos;
+  ht = xd->hqos_ht;
+  wk = &xd->hqos_wt[tr->first_index];
+  tctbl = wk->hqos_tc_table;
+
+  vlib_cli_output (vm, " Thread:");
+  vlib_cli_output (vm, "   Input SWQ size = %u packets", cfg->swq_size);
+  vlib_cli_output (vm, "   Enqueue burst size = %u packets",
+		   ht->hqos_burst_enq);
+  vlib_cli_output (vm, "   Dequeue burst size = %u packets",
+		   ht->hqos_burst_deq);
+
+  vlib_cli_output (vm,
+		   "   Packet field 0: slab position = %4u, slab bitmask = 0x%016llx",
+		   wk->hqos_field0_slabpos, wk->hqos_field0_slabmask);
+  vlib_cli_output (vm,
+		   "   Packet field 1: slab position = %4u, slab bitmask = 0x%016llx",
+		   wk->hqos_field1_slabpos, wk->hqos_field1_slabmask);
+  vlib_cli_output (vm,
+		   "   Packet field 2: slab position = %4u, slab bitmask = 0x%016llx",
+		   wk->hqos_field2_slabpos, wk->hqos_field2_slabmask);
+  vlib_cli_output (vm, "   Packet field 2 translation table:");
+  vlib_cli_output (vm, "     [ 0 .. 15]: "
+		   "%2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u",
+		   tctbl[0], tctbl[1], tctbl[2], tctbl[3],
+		   tctbl[4], tctbl[5], tctbl[6], tctbl[7],
+		   tctbl[8], tctbl[9], tctbl[10], tctbl[11],
+		   tctbl[12], tctbl[13], tctbl[14], tctbl[15]);
+  vlib_cli_output (vm, "     [16 .. 31]: "
+		   "%2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u",
+		   tctbl[16], tctbl[17], tctbl[18], tctbl[19],
+		   tctbl[20], tctbl[21], tctbl[22], tctbl[23],
+		   tctbl[24], tctbl[25], tctbl[26], tctbl[27],
+		   tctbl[28], tctbl[29], tctbl[30], tctbl[31]);
+  vlib_cli_output (vm, "     [32 .. 47]: "
+		   "%2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u",
+		   tctbl[32], tctbl[33], tctbl[34], tctbl[35],
+		   tctbl[36], tctbl[37], tctbl[38], tctbl[39],
+		   tctbl[40], tctbl[41], tctbl[42], tctbl[43],
+		   tctbl[44], tctbl[45], tctbl[46], tctbl[47]);
+  vlib_cli_output (vm, "     [48 .. 63]: "
+		   "%2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u",
+		   tctbl[48], tctbl[49], tctbl[50], tctbl[51],
+		   tctbl[52], tctbl[53], tctbl[54], tctbl[55],
+		   tctbl[56], tctbl[57], tctbl[58], tctbl[59],
+		   tctbl[60], tctbl[61], tctbl[62], tctbl[63]);
+
+  vlib_cli_output (vm, " Port:");
+  vlib_cli_output (vm, "   Rate = %u bytes/second", cfg->port.rate);
+  vlib_cli_output (vm, "   MTU = %u bytes", cfg->port.mtu);
+  vlib_cli_output (vm, "   Frame overhead = %u bytes",
+		   cfg->port.frame_overhead);
+  vlib_cli_output (vm, "   Number of subports = %u",
+		   cfg->port.n_subports_per_port);
+  vlib_cli_output (vm, "   Number of pipes per subport = %u",
+		   cfg->port.n_pipes_per_subport);
+  vlib_cli_output (vm,
+		   "   Packet queue size: TC0 = %u, TC1 = %u, TC2 = %u, TC3 = %u packets",
+		   cfg->port.qsize[0], cfg->port.qsize[1], cfg->port.qsize[2],
+		   cfg->port.qsize[3]);
+  vlib_cli_output (vm, "   Number of pipe profiles = %u",
+		   cfg->port.n_pipe_profiles);
+
+  for (profile_id = 0; profile_id < vec_len (cfg->pipe); profile_id++)
+    {
+      vlib_cli_output (vm, " Pipe profile %u:", profile_id);
+      vlib_cli_output (vm, "   Rate = %u bytes/second",
+		       cfg->pipe[profile_id].tb_rate);
+      vlib_cli_output (vm, "   Token bucket size = %u bytes",
+		       cfg->pipe[profile_id].tb_size);
+      vlib_cli_output (vm,
+		       "   Traffic class rate: TC0 = %u, TC1 = %u, TC2 = %u, TC3 = %u bytes/second",
+		       cfg->pipe[profile_id].tc_rate[0],
+		       cfg->pipe[profile_id].tc_rate[1],
+		       cfg->pipe[profile_id].tc_rate[2],
+		       cfg->pipe[profile_id].tc_rate[3]);
+      vlib_cli_output (vm, "   TC period = %u milliseconds",
+		       cfg->pipe[profile_id].tc_period);
+#ifdef RTE_SCHED_SUBPORT_TC_OV
+      vlib_cli_output (vm, "   TC3 oversubscription_weight = %u",
+		       cfg->pipe[profile_id].tc_ov_weight);
+#endif
+
+      for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++)
+	{
+	  vlib_cli_output (vm,
+			   "   TC%u WRR weights: Q0 = %u, Q1 = %u, Q2 = %u, Q3 = %u",
+			   i, cfg->pipe[profile_id].wrr_weights[i * 4],
+			   cfg->pipe[profile_id].wrr_weights[i * 4 + 1],
+			   cfg->pipe[profile_id].wrr_weights[i * 4 + 2],
+			   cfg->pipe[profile_id].wrr_weights[i * 4 + 3]);
+	}
+    }
+
+#ifdef RTE_SCHED_RED
+  vlib_cli_output (vm, " Weighted Random Early Detection (WRED):");
+  for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++)
+    {
+      vlib_cli_output (vm, "   TC%u min: G = %u, Y = %u, R = %u", i,
+		       cfg->port.red_params[i][e_RTE_METER_GREEN].min_th,
+		       cfg->port.red_params[i][e_RTE_METER_YELLOW].min_th,
+		       cfg->port.red_params[i][e_RTE_METER_RED].min_th);
+
+      vlib_cli_output (vm, "   TC%u max: G = %u, Y = %u, R = %u", i,
+		       cfg->port.red_params[i][e_RTE_METER_GREEN].max_th,
+		       cfg->port.red_params[i][e_RTE_METER_YELLOW].max_th,
+		       cfg->port.red_params[i][e_RTE_METER_RED].max_th);
+
+      vlib_cli_output (vm,
+		       "   TC%u inverted probability: G = %u, Y = %u, R = %u",
+		       i, cfg->port.red_params[i][e_RTE_METER_GREEN].maxp_inv,
+		       cfg->port.red_params[i][e_RTE_METER_YELLOW].maxp_inv,
+		       cfg->port.red_params[i][e_RTE_METER_RED].maxp_inv);
+
+      vlib_cli_output (vm, "   TC%u weight: R = %u, Y = %u, R = %u", i,
+		       cfg->port.red_params[i][e_RTE_METER_GREEN].wq_log2,
+		       cfg->port.red_params[i][e_RTE_METER_YELLOW].wq_log2,
+		       cfg->port.red_params[i][e_RTE_METER_RED].wq_log2);
+    }
+#endif
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_show_dpdk_if_hqos, static) = {
+  .path = "show dpdk interface hqos",
+  .short_help = "show dpdk interface hqos <if-name>",
+  .function = show_dpdk_if_hqos,
+};
+
+/* *INDENT-ON* */
+
+static clib_error_t *
+show_dpdk_hqos_queue_stats (vlib_main_t * vm, unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  dpdk_main_t *dm = &dpdk_main;
+  u32 hw_if_index = (u32) ~ 0;
+  u32 subport = (u32) ~ 0;
+  u32 pipe = (u32) ~ 0;
+  u32 tc = (u32) ~ 0;
+  u32 tc_q = (u32) ~ 0;
+  vnet_hw_interface_t *hw;
+  dpdk_device_t *xd;
+  uword *p = 0;
+  struct rte_eth_dev_info dev_info;
+  dpdk_device_config_t *devconf = 0;
+  u32 qindex;
+  struct rte_sched_queue_stats stats;
+  u16 qlen;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
+	   &hw_if_index))
+	;
+
+      else if (unformat (line_input, "subport %d", &subport))
+	;
+
+      else if (unformat (line_input, "pipe %d", &pipe))
+	;
+
+      else if (unformat (line_input, "tc %d", &tc))
+	;
+
+      else if (unformat (line_input, "tc_q %d", &tc_q))
+	;
+
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (hw_if_index == (u32) ~ 0)
+    return clib_error_return (0, "please specify interface name!!");
+
+  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
+  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
+
+  rte_eth_dev_info_get (xd->device_index, &dev_info);
+  if (dev_info.pci_dev)
+    {				/* bonded interface has no pci info */
+      vlib_pci_addr_t pci_addr;
+
+      pci_addr.domain = dev_info.pci_dev->addr.domain;
+      pci_addr.bus = dev_info.pci_dev->addr.bus;
+      pci_addr.slot = dev_info.pci_dev->addr.devid;
+      pci_addr.function = dev_info.pci_dev->addr.function;
+
+      p =
+	hash_get (dm->conf->device_config_index_by_pci_addr, pci_addr.as_u32);
+    }
+
+  if (p)
+    devconf = pool_elt_at_index (dm->conf->dev_confs, p[0]);
+  else
+    devconf = &dm->conf->default_devconf;
+
+  if (devconf->hqos_enabled == 0)
+    {
+      vlib_cli_output (vm, "HQoS disabled for this interface");
+      return 0;
+    }
+
+  /*
+   * Figure out which queue to query.  cf rte_sched_port_qindex.  (Not sure why
+   * that method isn't made public by DPDK - how _should_ we get the queue ID?)
+   */
+  qindex = subport * devconf->hqos.port.n_pipes_per_subport + pipe;
+  qindex = qindex * RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE + tc;
+  qindex = qindex * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + tc_q;
+
+  if (rte_sched_queue_read_stats (xd->hqos_ht->hqos, qindex, &stats, &qlen) !=
+      0)
+    return clib_error_return (0, "failed to read stats");
+
+  vlib_cli_output (vm, "%=24s%=16s", "Stats Parameter", "Value");
+  vlib_cli_output (vm, "%=24s%=16d", "Packets", stats.n_pkts);
+  vlib_cli_output (vm, "%=24s%=16d", "Packets dropped", stats.n_pkts_dropped);
+#ifdef RTE_SCHED_RED
+  vlib_cli_output (vm, "%=24s%=16d", "Packets dropped (RED)",
+		   stats.n_pkts_red_dropped);
+#endif
+  vlib_cli_output (vm, "%=24s%=16d", "Bytes", stats.n_bytes);
+  vlib_cli_output (vm, "%=24s%=16d", "Bytes dropped", stats.n_bytes_dropped);
+
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (cmd_show_dpdk_hqos_queue_stats, static) = {
+  .path = "show dpdk hqos queue",
+  .short_help = "show dpdk hqos queue <if-name> subport <subport> pipe <pipe> tc <tc> tc_q <tc_q>",
+  .function = show_dpdk_hqos_queue_stats,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+dpdk_cli_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (dpdk_cli_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/device.c b/src/vnet/devices/dpdk/device.c
new file mode 100644
index 00000000..b22fbf2e
--- /dev/null
+++ b/src/vnet/devices/dpdk/device.c
@@ -0,0 +1,840 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/vnet.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/format.h>
+#include <vlib/unix/cj.h>
+#include <assert.h>
+
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/devices/dpdk/dpdk.h>
+
+#include "dpdk_priv.h"
+#include <vppinfra/error.h>
+
+#define foreach_dpdk_tx_func_error			\
+  _(BAD_RETVAL, "DPDK tx function returned an error")	\
+  _(RING_FULL, "Tx packet drops (ring full)")	        \
+  _(PKT_DROP, "Tx packet drops (dpdk tx failure)")	\
+  _(REPL_FAIL, "Tx packet drops (replication failure)")
+
+typedef enum
+{
+#define _(f,s) DPDK_TX_FUNC_ERROR_##f,
+  foreach_dpdk_tx_func_error
+#undef _
+    DPDK_TX_FUNC_N_ERROR,
+} dpdk_tx_func_error_t;
+
+static char *dpdk_tx_func_error_strings[] = {
+#define _(n,s) s,
+  foreach_dpdk_tx_func_error
+#undef _
+};
+
+clib_error_t *
+dpdk_set_mac_address (vnet_hw_interface_t * hi, char *address)
+{
+  int error;
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_t *xd = vec_elt_at_index (dm->devices, hi->dev_instance);
+
+  error = rte_eth_dev_default_mac_addr_set (xd->device_index,
+					    (struct ether_addr *) address);
+
+  if (error)
+    {
+      return clib_error_return (0, "mac address set failed: %d", error);
+    }
+  else
+    {
+      return NULL;
+    }
+}
+
+clib_error_t *
+dpdk_set_mc_filter (vnet_hw_interface_t * hi,
+		    struct ether_addr mc_addr_vec[], int naddr)
+{
+  int error;
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_t *xd = vec_elt_at_index (dm->devices, hi->dev_instance);
+
+  error = rte_eth_dev_set_mc_addr_list (xd->device_index, mc_addr_vec, naddr);
+
+  if (error)
+    {
+      return clib_error_return (0, "mc addr list failed: %d", error);
+    }
+  else
+    {
+      return NULL;
+    }
+}
+
+struct rte_mbuf *
+dpdk_replicate_packet_mb (vlib_buffer_t * b)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  struct rte_mbuf **mbufs = 0, *s, *d;
+  u8 nb_segs;
+  unsigned socket_id = rte_socket_id ();
+  int i;
+
+  ASSERT (bm->pktmbuf_pools[socket_id]);
+  s = rte_mbuf_from_vlib_buffer (b);
+  nb_segs = s->nb_segs;
+  vec_validate (mbufs, nb_segs - 1);
+
+  if (rte_pktmbuf_alloc_bulk (bm->pktmbuf_pools[socket_id], mbufs, nb_segs))
+    {
+      vec_free (mbufs);
+      return 0;
+    }
+
+  d = mbufs[0];
+  d->nb_segs = s->nb_segs;
+  d->data_len = s->data_len;
+  d->pkt_len = s->pkt_len;
+  d->data_off = s->data_off;
+  clib_memcpy (d->buf_addr, s->buf_addr, RTE_PKTMBUF_HEADROOM + s->data_len);
+
+  for (i = 1; i < nb_segs; i++)
+    {
+      d->next = mbufs[i];
+      d = mbufs[i];
+      s = s->next;
+      d->data_len = s->data_len;
+      clib_memcpy (d->buf_addr, s->buf_addr,
+		   RTE_PKTMBUF_HEADROOM + s->data_len);
+    }
+
+  d = mbufs[0];
+  vec_free (mbufs);
+  return d;
+}
+
+static void
+dpdk_tx_trace_buffer (dpdk_main_t * dm,
+		      vlib_node_runtime_t * node,
+		      dpdk_device_t * xd,
+		      u16 queue_id, u32 buffer_index, vlib_buffer_t * buffer)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  dpdk_tx_dma_trace_t *t0;
+  struct rte_mbuf *mb;
+
+  mb = rte_mbuf_from_vlib_buffer (buffer);
+
+  t0 = vlib_add_trace (vm, node, buffer, sizeof (t0[0]));
+  t0->queue_index = queue_id;
+  t0->device_index = xd->device_index;
+  t0->buffer_index = buffer_index;
+  clib_memcpy (&t0->mb, mb, sizeof (t0->mb));
+  clib_memcpy (&t0->buffer, buffer,
+	       sizeof (buffer[0]) - sizeof (buffer->pre_data));
+  clib_memcpy (t0->buffer.pre_data, buffer->data + buffer->current_data,
+	       sizeof (t0->buffer.pre_data));
+}
+
+static_always_inline void
+dpdk_validate_rte_mbuf (vlib_main_t * vm, vlib_buffer_t * b,
+			int maybe_multiseg)
+{
+  struct rte_mbuf *mb, *first_mb, *last_mb;
+
+  /* buffer is coming from non-dpdk source so we need to init
+     rte_mbuf header */
+  if (PREDICT_FALSE ((b->flags & VNET_BUFFER_RTE_MBUF_VALID) == 0))
+    {
+      vlib_buffer_t *b2 = b;
+      last_mb = mb = rte_mbuf_from_vlib_buffer (b2);
+      rte_pktmbuf_reset (mb);
+      while (maybe_multiseg && (b2->flags & VLIB_BUFFER_NEXT_PRESENT))
+	{
+	  b2 = vlib_get_buffer (vm, b2->next_buffer);
+	  mb = rte_mbuf_from_vlib_buffer (b2);
+	  last_mb->next = mb;
+	  last_mb = mb;
+	  rte_pktmbuf_reset (mb);
+	}
+    }
+
+  first_mb = mb = rte_mbuf_from_vlib_buffer (b);
+  first_mb->nb_segs = 1;
+  mb->data_len = b->current_length;
+  mb->pkt_len = maybe_multiseg ? vlib_buffer_length_in_chain (vm, b) :
+    b->current_length;
+  mb->data_off = VLIB_BUFFER_PRE_DATA_SIZE + b->current_data;
+
+  while (maybe_multiseg && (b->flags & VLIB_BUFFER_NEXT_PRESENT))
+    {
+      b = vlib_get_buffer (vm, b->next_buffer);
+      mb = rte_mbuf_from_vlib_buffer (b);
+      mb->data_len = b->current_length;
+      mb->pkt_len = b->current_length;
+      mb->data_off = VLIB_BUFFER_PRE_DATA_SIZE + b->current_data;
+      first_mb->nb_segs++;
+    }
+}
+
+/*
+ * This function calls the dpdk's tx_burst function to transmit the packets
+ * on the tx_vector. It manages a lock per-device if the device does not
+ * support multiple queues. It returns the number of packets untransmitted
+ * on the tx_vector. If all packets are transmitted (the normal case), the
+ * function returns 0.
+ *
+ * The function assumes there is at least one packet on the tx_vector.
+ */
+static_always_inline
+  u32 tx_burst_vector_internal (vlib_main_t * vm,
+				dpdk_device_t * xd,
+				struct rte_mbuf **tx_vector)
+{
+  dpdk_main_t *dm = &dpdk_main;
+  u32 n_packets;
+  u32 tx_head;
+  u32 tx_tail;
+  u32 n_retry;
+  int rv;
+  int queue_id;
+  tx_ring_hdr_t *ring;
+
+  ring = vec_header (tx_vector, sizeof (*ring));
+
+  n_packets = ring->tx_head - ring->tx_tail;
+
+  tx_head = ring->tx_head % xd->nb_tx_desc;
+
+  /*
+   * Ensure rte_eth_tx_burst is not called with 0 packets, which can lead to
+   * unpredictable results.
+   */
+  ASSERT (n_packets > 0);
+
+  /*
+   * Check for tx_vector overflow. If this fails it is a system configuration
+   * error. The ring should be sized big enough to handle the largest un-flowed
+   * off burst from a traffic manager. A larger size also helps performance
+   * a bit because it decreases the probability of having to issue two tx_burst
+   * calls due to a ring wrap.
+   */
+  ASSERT (n_packets < xd->nb_tx_desc);
+  ASSERT (ring->tx_tail == 0);
+
+  n_retry = 16;
+  queue_id = vm->cpu_index;
+
+  do
+    {
+      /* start the burst at the tail */
+      tx_tail = ring->tx_tail % xd->nb_tx_desc;
+
+      /*
+       * This device only supports one TX queue,
+       * and we're running multi-threaded...
+       */
+      if (PREDICT_FALSE (xd->lockp != 0))
+	{
+	  queue_id = queue_id % xd->tx_q_used;
+	  while (__sync_lock_test_and_set (xd->lockp[queue_id], 1))
+	    /* zzzz */
+	    queue_id = (queue_id + 1) % xd->tx_q_used;
+	}
+
+      if (PREDICT_FALSE (xd->flags & DPDK_DEVICE_FLAG_HQOS))	/* HQoS ON */
+	{
+	  /* no wrap, transmit in one burst */
+	  dpdk_device_hqos_per_worker_thread_t *hqos =
+	    &xd->hqos_wt[vm->cpu_index];
+
+	  ASSERT (hqos->swq != NULL);
+
+	  dpdk_hqos_metadata_set (hqos,
+				  &tx_vector[tx_tail], tx_head - tx_tail);
+	  rv = rte_ring_sp_enqueue_burst (hqos->swq,
+					  (void **) &tx_vector[tx_tail],
+					  (uint16_t) (tx_head - tx_tail));
+	}
+      else if (PREDICT_TRUE (xd->flags & DPDK_DEVICE_FLAG_PMD))
+	{
+	  /* no wrap, transmit in one burst */
+	  rv = rte_eth_tx_burst (xd->device_index,
+				 (uint16_t) queue_id,
+				 &tx_vector[tx_tail],
+				 (uint16_t) (tx_head - tx_tail));
+	}
+      else
+	{
+	  ASSERT (0);
+	  rv = 0;
+	}
+
+      if (PREDICT_FALSE (xd->lockp != 0))
+	*xd->lockp[queue_id] = 0;
+
+      if (PREDICT_FALSE (rv < 0))
+	{
+	  // emit non-fatal message, bump counter
+	  vnet_main_t *vnm = dm->vnet_main;
+	  vnet_interface_main_t *im = &vnm->interface_main;
+	  u32 node_index;
+
+	  node_index = vec_elt_at_index (im->hw_interfaces,
+					 xd->vlib_hw_if_index)->tx_node_index;
+
+	  vlib_error_count (vm, node_index, DPDK_TX_FUNC_ERROR_BAD_RETVAL, 1);
+	  clib_warning ("rte_eth_tx_burst[%d]: error %d", xd->device_index,
+			rv);
+	  return n_packets;	// untransmitted packets
+	}
+      ring->tx_tail += (u16) rv;
+      n_packets -= (uint16_t) rv;
+    }
+  while (rv && n_packets && (n_retry > 0));
+
+  return n_packets;
+}
+
+static_always_inline void
+dpdk_prefetch_buffer_by_index (vlib_main_t * vm, u32 bi)
+{
+  vlib_buffer_t *b;
+  struct rte_mbuf *mb;
+  b = vlib_get_buffer (vm, bi);
+  mb = rte_mbuf_from_vlib_buffer (b);
+  CLIB_PREFETCH (mb, CLIB_CACHE_LINE_BYTES, LOAD);
+  CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD);
+}
+
+static_always_inline void
+dpdk_buffer_recycle (vlib_main_t * vm, vlib_node_runtime_t * node,
+		     vlib_buffer_t * b, u32 bi, struct rte_mbuf **mbp)
+{
+  dpdk_main_t *dm = &dpdk_main;
+  u32 my_cpu = vm->cpu_index;
+  struct rte_mbuf *mb_new;
+
+  if (PREDICT_FALSE (b->flags & VLIB_BUFFER_RECYCLE) == 0)
+    return;
+
+  mb_new = dpdk_replicate_packet_mb (b);
+  if (PREDICT_FALSE (mb_new == 0))
+    {
+      vlib_error_count (vm, node->node_index,
+			DPDK_TX_FUNC_ERROR_REPL_FAIL, 1);
+      b->flags |= VLIB_BUFFER_REPL_FAIL;
+    }
+  else
+    *mbp = mb_new;
+
+  vec_add1 (dm->recycle[my_cpu], bi);
+}
+
+/*
+ * Transmits the packets on the frame to the interface associated with the
+ * node. It first copies packets on the frame to a tx_vector containing the
+ * rte_mbuf pointers. It then passes this vector to tx_burst_vector_internal
+ * which calls the dpdk tx_burst function.
+ */
+static uword
+dpdk_interface_tx (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  dpdk_main_t *dm = &dpdk_main;
+  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
+  dpdk_device_t *xd = vec_elt_at_index (dm->devices, rd->dev_instance);
+  u32 n_packets = f->n_vectors;
+  u32 n_left;
+  u32 *from;
+  struct rte_mbuf **tx_vector;
+  u16 i;
+  u16 nb_tx_desc = xd->nb_tx_desc;
+  int queue_id;
+  u32 my_cpu;
+  u32 tx_pkts = 0;
+  tx_ring_hdr_t *ring;
+  u32 n_on_ring;
+
+  my_cpu = vm->cpu_index;
+
+  queue_id = my_cpu;
+
+  tx_vector = xd->tx_vectors[queue_id];
+  ring = vec_header (tx_vector, sizeof (*ring));
+
+  n_on_ring = ring->tx_head - ring->tx_tail;
+  from = vlib_frame_vector_args (f);
+
+  ASSERT (n_packets <= VLIB_FRAME_SIZE);
+
+  if (PREDICT_FALSE (n_on_ring + n_packets > nb_tx_desc))
+    {
+      /*
+       * Overflowing the ring should never happen.
+       * If it does then drop the whole frame.
+       */
+      vlib_error_count (vm, node->node_index, DPDK_TX_FUNC_ERROR_RING_FULL,
+			n_packets);
+
+      while (n_packets--)
+	{
+	  u32 bi0 = from[n_packets];
+	  vlib_buffer_t *b0 = vlib_get_buffer (vm, bi0);
+	  struct rte_mbuf *mb0 = rte_mbuf_from_vlib_buffer (b0);
+	  rte_pktmbuf_free (mb0);
+	}
+      return n_on_ring;
+    }
+
+  if (PREDICT_FALSE (dm->tx_pcap_enable))
+    {
+      n_left = n_packets;
+      while (n_left > 0)
+	{
+	  u32 bi0 = from[0];
+	  vlib_buffer_t *b0 = vlib_get_buffer (vm, bi0);
+	  if (dm->pcap_sw_if_index == 0 ||
+	      dm->pcap_sw_if_index == vnet_buffer (b0)->sw_if_index[VLIB_TX])
+	    pcap_add_buffer (&dm->pcap_main, vm, bi0, 512);
+	  from++;
+	  n_left--;
+	}
+    }
+
+  from = vlib_frame_vector_args (f);
+  n_left = n_packets;
+  i = ring->tx_head % nb_tx_desc;
+
+  while (n_left >= 8)
+    {
+      u32 bi0, bi1, bi2, bi3;
+      struct rte_mbuf *mb0, *mb1, *mb2, *mb3;
+      vlib_buffer_t *b0, *b1, *b2, *b3;
+      u32 or_flags;
+
+      dpdk_prefetch_buffer_by_index (vm, from[4]);
+      dpdk_prefetch_buffer_by_index (vm, from[5]);
+      dpdk_prefetch_buffer_by_index (vm, from[6]);
+      dpdk_prefetch_buffer_by_index (vm, from[7]);
+
+      bi0 = from[0];
+      bi1 = from[1];
+      bi2 = from[2];
+      bi3 = from[3];
+      from += 4;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+      b2 = vlib_get_buffer (vm, bi2);
+      b3 = vlib_get_buffer (vm, bi3);
+
+      or_flags = b0->flags | b1->flags | b2->flags | b3->flags;
+
+      if (or_flags & VLIB_BUFFER_NEXT_PRESENT)
+	{
+	  dpdk_validate_rte_mbuf (vm, b0, 1);
+	  dpdk_validate_rte_mbuf (vm, b1, 1);
+	  dpdk_validate_rte_mbuf (vm, b2, 1);
+	  dpdk_validate_rte_mbuf (vm, b3, 1);
+	}
+      else
+	{
+	  dpdk_validate_rte_mbuf (vm, b0, 0);
+	  dpdk_validate_rte_mbuf (vm, b1, 0);
+	  dpdk_validate_rte_mbuf (vm, b2, 0);
+	  dpdk_validate_rte_mbuf (vm, b3, 0);
+	}
+
+      mb0 = rte_mbuf_from_vlib_buffer (b0);
+      mb1 = rte_mbuf_from_vlib_buffer (b1);
+      mb2 = rte_mbuf_from_vlib_buffer (b2);
+      mb3 = rte_mbuf_from_vlib_buffer (b3);
+
+      if (PREDICT_FALSE (or_flags & VLIB_BUFFER_RECYCLE))
+	{
+	  dpdk_buffer_recycle (vm, node, b0, bi0, &mb0);
+	  dpdk_buffer_recycle (vm, node, b1, bi1, &mb1);
+	  dpdk_buffer_recycle (vm, node, b2, bi2, &mb2);
+	  dpdk_buffer_recycle (vm, node, b3, bi3, &mb3);
+
+	  /* dont enqueue packets if replication failed as they must
+	     be sent back to recycle */
+	  if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_REPL_FAIL) == 0))
+	    tx_vector[i++ % nb_tx_desc] = mb0;
+	  if (PREDICT_TRUE ((b1->flags & VLIB_BUFFER_REPL_FAIL) == 0))
+	    tx_vector[i++ % nb_tx_desc] = mb1;
+	  if (PREDICT_TRUE ((b2->flags & VLIB_BUFFER_REPL_FAIL) == 0))
+	    tx_vector[i++ % nb_tx_desc] = mb2;
+	  if (PREDICT_TRUE ((b3->flags & VLIB_BUFFER_REPL_FAIL) == 0))
+	    tx_vector[i++ % nb_tx_desc] = mb3;
+	}
+      else
+	{
+	  if (PREDICT_FALSE (i + 3 >= nb_tx_desc))
+	    {
+	      tx_vector[i++ % nb_tx_desc] = mb0;
+	      tx_vector[i++ % nb_tx_desc] = mb1;
+	      tx_vector[i++ % nb_tx_desc] = mb2;
+	      tx_vector[i++ % nb_tx_desc] = mb3;
+	      i %= nb_tx_desc;
+	    }
+	  else
+	    {
+	      tx_vector[i++] = mb0;
+	      tx_vector[i++] = mb1;
+	      tx_vector[i++] = mb2;
+	      tx_vector[i++] = mb3;
+	    }
+	}
+
+
+      if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE))
+	{
+	  if (b0->flags & VLIB_BUFFER_IS_TRACED)
+	    dpdk_tx_trace_buffer (dm, node, xd, queue_id, bi0, b0);
+	  if (b1->flags & VLIB_BUFFER_IS_TRACED)
+	    dpdk_tx_trace_buffer (dm, node, xd, queue_id, bi1, b1);
+	  if (b2->flags & VLIB_BUFFER_IS_TRACED)
+	    dpdk_tx_trace_buffer (dm, node, xd, queue_id, bi2, b2);
+	  if (b3->flags & VLIB_BUFFER_IS_TRACED)
+	    dpdk_tx_trace_buffer (dm, node, xd, queue_id, bi3, b3);
+	}
+
+      n_left -= 4;
+    }
+  while (n_left > 0)
+    {
+      u32 bi0;
+      struct rte_mbuf *mb0;
+      vlib_buffer_t *b0;
+
+      bi0 = from[0];
+      from++;
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      dpdk_validate_rte_mbuf (vm, b0, 1);
+
+      mb0 = rte_mbuf_from_vlib_buffer (b0);
+      dpdk_buffer_recycle (vm, node, b0, bi0, &mb0);
+
+      if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE))
+	if (b0->flags & VLIB_BUFFER_IS_TRACED)
+	  dpdk_tx_trace_buffer (dm, node, xd, queue_id, bi0, b0);
+
+      if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_REPL_FAIL) == 0))
+	{
+	  tx_vector[i % nb_tx_desc] = mb0;
+	  i++;
+	}
+      n_left--;
+    }
+
+  /* account for additional packets in the ring */
+  ring->tx_head += n_packets;
+  n_on_ring = ring->tx_head - ring->tx_tail;
+
+  /* transmit as many packets as possible */
+  n_packets = tx_burst_vector_internal (vm, xd, tx_vector);
+
+  /*
+   * tx_pkts is the number of packets successfully transmitted
+   * This is the number originally on ring minus the number remaining on ring
+   */
+  tx_pkts = n_on_ring - n_packets;
+
+  {
+    /* If there is no callback then drop any non-transmitted packets */
+    if (PREDICT_FALSE (n_packets))
+      {
+	vlib_simple_counter_main_t *cm;
+	vnet_main_t *vnm = vnet_get_main ();
+
+	cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
+			       VNET_INTERFACE_COUNTER_TX_ERROR);
+
+	vlib_increment_simple_counter (cm, my_cpu, xd->vlib_sw_if_index,
+				       n_packets);
+
+	vlib_error_count (vm, node->node_index, DPDK_TX_FUNC_ERROR_PKT_DROP,
+			  n_packets);
+
+	while (n_packets--)
+	  rte_pktmbuf_free (tx_vector[ring->tx_tail + n_packets]);
+      }
+
+    /* Reset head/tail to avoid unnecessary wrap */
+    ring->tx_head = 0;
+    ring->tx_tail = 0;
+  }
+
+  /* Recycle replicated buffers */
+  if (PREDICT_FALSE (vec_len (dm->recycle[my_cpu])))
+    {
+      vlib_buffer_free (vm, dm->recycle[my_cpu],
+			vec_len (dm->recycle[my_cpu]));
+      _vec_len (dm->recycle[my_cpu]) = 0;
+    }
+
+  ASSERT (ring->tx_head >= ring->tx_tail);
+
+  return tx_pkts;
+}
+
+static void
+dpdk_clear_hw_interface_counters (u32 instance)
+{
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_t *xd = vec_elt_at_index (dm->devices, instance);
+
+  /*
+   * Set the "last_cleared_stats" to the current stats, so that
+   * things appear to clear from a display perspective.
+   */
+  dpdk_update_counters (xd, vlib_time_now (dm->vlib_main));
+
+  clib_memcpy (&xd->last_cleared_stats, &xd->stats, sizeof (xd->stats));
+  clib_memcpy (xd->last_cleared_xstats, xd->xstats,
+	       vec_len (xd->last_cleared_xstats) *
+	       sizeof (xd->last_cleared_xstats[0]));
+
+}
+
+static clib_error_t *
+dpdk_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+  vnet_hw_interface_t *hif = vnet_get_hw_interface (vnm, hw_if_index);
+  uword is_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_t *xd = vec_elt_at_index (dm->devices, hif->dev_instance);
+  int rv = 0;
+
+  if (is_up)
+    {
+      f64 now = vlib_time_now (dm->vlib_main);
+
+      if ((xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP) == 0)
+	rv = rte_eth_dev_start (xd->device_index);
+
+      if (xd->flags & DPDK_DEVICE_FLAG_PROMISC)
+	rte_eth_promiscuous_enable (xd->device_index);
+      else
+	rte_eth_promiscuous_disable (xd->device_index);
+
+      rte_eth_allmulticast_enable (xd->device_index);
+      xd->flags |= DPDK_DEVICE_FLAG_ADMIN_UP;
+      dpdk_update_counters (xd, now);
+      dpdk_update_link_state (xd, now);
+    }
+  else
+    {
+      xd->flags &= ~DPDK_DEVICE_FLAG_ADMIN_UP;
+
+      rte_eth_allmulticast_disable (xd->device_index);
+      vnet_hw_interface_set_flags (vnm, xd->vlib_hw_if_index, 0);
+      rte_eth_dev_stop (xd->device_index);
+
+      /* For bonded interface, stop slave links */
+      if (xd->pmd == VNET_DPDK_PMD_BOND)
+	{
+	  u8 slink[16];
+	  int nlink = rte_eth_bond_slaves_get (xd->device_index, slink, 16);
+	  while (nlink >= 1)
+	    {
+	      u8 dpdk_port = slink[--nlink];
+	      rte_eth_dev_stop (dpdk_port);
+	    }
+	}
+    }
+
+  if (rv < 0)
+    clib_warning ("rte_eth_dev_%s error: %d", is_up ? "start" : "stop", rv);
+
+  return /* no error */ 0;
+}
+
+/*
+ * Dynamically redirect all pkts from a specific interface
+ * to the specified node
+ */
+static void
+dpdk_set_interface_next_node (vnet_main_t * vnm, u32 hw_if_index,
+			      u32 node_index)
+{
+  dpdk_main_t *xm = &dpdk_main;
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+  dpdk_device_t *xd = vec_elt_at_index (xm->devices, hw->dev_instance);
+
+  /* Shut off redirection */
+  if (node_index == ~0)
+    {
+      xd->per_interface_next_index = node_index;
+      return;
+    }
+
+  xd->per_interface_next_index =
+    vlib_node_add_next (xm->vlib_main, dpdk_input_node.index, node_index);
+}
+
+
+static clib_error_t *
+dpdk_subif_add_del_function (vnet_main_t * vnm,
+			     u32 hw_if_index,
+			     struct vnet_sw_interface_t *st, int is_add)
+{
+  dpdk_main_t *xm = &dpdk_main;
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+  dpdk_device_t *xd = vec_elt_at_index (xm->devices, hw->dev_instance);
+  vnet_sw_interface_t *t = (vnet_sw_interface_t *) st;
+  int r, vlan_offload;
+  u32 prev_subifs = xd->num_subifs;
+  clib_error_t *err = 0;
+
+  if (is_add)
+    xd->num_subifs++;
+  else if (xd->num_subifs)
+    xd->num_subifs--;
+
+  if ((xd->flags & DPDK_DEVICE_FLAG_PMD) == 0)
+    goto done;
+
+  /* currently we program VLANS only for IXGBE VF and I40E VF */
+  if ((xd->pmd != VNET_DPDK_PMD_IXGBEVF) && (xd->pmd != VNET_DPDK_PMD_I40EVF))
+    goto done;
+
+  if (t->sub.eth.flags.no_tags == 1)
+    goto done;
+
+  if ((t->sub.eth.flags.one_tag != 1) || (t->sub.eth.flags.exact_match != 1))
+    {
+      xd->num_subifs = prev_subifs;
+      err = clib_error_return (0, "unsupported VLAN setup");
+      goto done;
+    }
+
+  vlan_offload = rte_eth_dev_get_vlan_offload (xd->device_index);
+  vlan_offload |= ETH_VLAN_FILTER_OFFLOAD;
+
+  if ((r = rte_eth_dev_set_vlan_offload (xd->device_index, vlan_offload)))
+    {
+      xd->num_subifs = prev_subifs;
+      err = clib_error_return (0, "rte_eth_dev_set_vlan_offload[%d]: err %d",
+			       xd->device_index, r);
+      goto done;
+    }
+
+
+  if ((r =
+       rte_eth_dev_vlan_filter (xd->device_index, t->sub.eth.outer_vlan_id,
+				is_add)))
+    {
+      xd->num_subifs = prev_subifs;
+      err = clib_error_return (0, "rte_eth_dev_vlan_filter[%d]: err %d",
+			       xd->device_index, r);
+      goto done;
+    }
+
+done:
+  if (xd->num_subifs)
+    xd->flags |= DPDK_DEVICE_FLAG_HAVE_SUBIF;
+  else
+    xd->flags &= ~DPDK_DEVICE_FLAG_HAVE_SUBIF;
+
+  return err;
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (dpdk_device_class) = {
+  .name = "dpdk",
+  .tx_function = dpdk_interface_tx,
+  .tx_function_n_errors = DPDK_TX_FUNC_N_ERROR,
+  .tx_function_error_strings = dpdk_tx_func_error_strings,
+  .format_device_name = format_dpdk_device_name,
+  .format_device = format_dpdk_device,
+  .format_tx_trace = format_dpdk_tx_dma_trace,
+  .clear_counters = dpdk_clear_hw_interface_counters,
+  .admin_up_down_function = dpdk_interface_admin_up_down,
+  .subif_add_del_function = dpdk_subif_add_del_function,
+  .rx_redirect_to_node = dpdk_set_interface_next_node,
+  .mac_addr_change_function = dpdk_set_mac_address,
+};
+
+VLIB_DEVICE_TX_FUNCTION_MULTIARCH (dpdk_device_class, dpdk_interface_tx)
+/* *INDENT-ON* */
+
+#define UP_DOWN_FLAG_EVENT 1
+
+uword
+admin_up_down_process (vlib_main_t * vm,
+		       vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  clib_error_t *error = 0;
+  uword event_type;
+  uword *event_data = 0;
+  u32 sw_if_index;
+  u32 flags;
+
+  while (1)
+    {
+      vlib_process_wait_for_event (vm);
+
+      event_type = vlib_process_get_events (vm, &event_data);
+
+      dpdk_main.admin_up_down_in_progress = 1;
+
+      switch (event_type)
+	{
+	case UP_DOWN_FLAG_EVENT:
+	  {
+	    if (vec_len (event_data) == 2)
+	      {
+		sw_if_index = event_data[0];
+		flags = event_data[1];
+		error =
+		  vnet_sw_interface_set_flags (vnet_get_main (), sw_if_index,
+					       flags);
+		clib_error_report (error);
+	      }
+	  }
+	  break;
+	}
+
+      vec_reset_length (event_data);
+
+      dpdk_main.admin_up_down_in_progress = 0;
+
+    }
+  return 0;			/* or not */
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (admin_up_down_process_node,static) = {
+    .function = admin_up_down_process,
+    .type = VLIB_NODE_TYPE_PROCESS,
+    .name = "admin-up-down-process",
+    .process_log2_n_stack_bytes = 17,  // 256KB
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/dpdk.h b/src/vnet/devices/dpdk/dpdk.h
new file mode 100644
index 00000000..d8f378d2
--- /dev/null
+++ b/src/vnet/devices/dpdk/dpdk.h
@@ -0,0 +1,534 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_dpdk_h__
+#define __included_dpdk_h__
+
+/* $$$$ We should rename always_inline -> clib_always_inline */
+#undef always_inline
+
+#include <rte_config.h>
+
+#include <rte_common.h>
+#include <rte_dev.h>
+#include <rte_log.h>
+#include <rte_memory.h>
+#include <rte_memzone.h>
+#include <rte_tailq.h>
+#include <rte_eal.h>
+#include <rte_per_lcore.h>
+#include <rte_launch.h>
+#include <rte_atomic.h>
+#include <rte_cycles.h>
+#include <rte_prefetch.h>
+#include <rte_lcore.h>
+#include <rte_per_lcore.h>
+#include <rte_branch_prediction.h>
+#include <rte_interrupts.h>
+#include <rte_pci.h>
+#include <rte_random.h>
+#include <rte_debug.h>
+#include <rte_ether.h>
+#include <rte_ethdev.h>
+#include <rte_ring.h>
+#include <rte_mempool.h>
+#include <rte_mbuf.h>
+#include <rte_virtio_net.h>
+#include <rte_version.h>
+#include <rte_eth_bond.h>
+#include <rte_sched.h>
+
+#include <vnet/unix/pcap.h>
+#include <vnet/devices/devices.h>
+
+#if CLIB_DEBUG > 0
+#define always_inline static inline
+#else
+#define always_inline static inline __attribute__ ((__always_inline__))
+#endif
+
+#include <vlib/pci/pci.h>
+
+#define NB_MBUF   (16<<10)
+
+extern vnet_device_class_t dpdk_device_class;
+extern vlib_node_registration_t dpdk_input_node;
+extern vlib_node_registration_t handoff_dispatch_node;
+
+#if RTE_VERSION >= RTE_VERSION_NUM(16, 11, 0, 0)
+#define foreach_dpdk_pmd          \
+  _ ("net_thunderx", THUNDERX)    \
+  _ ("net_e1000_em", E1000EM)     \
+  _ ("net_e1000_igb", IGB)        \
+  _ ("net_e1000_igb_vf", IGBVF)   \
+  _ ("net_ixgbe", IXGBE)          \
+  _ ("net_ixgbe_vf", IXGBEVF)     \
+  _ ("net_i40e", I40E)            \
+  _ ("net_i40e_vf", I40EVF)       \
+  _ ("net_virtio", VIRTIO)        \
+  _ ("net_enic", ENIC)            \
+  _ ("net_vmxnet3", VMXNET3)      \
+  _ ("net_af_packet", AF_PACKET)  \
+  _ ("rte_bond_pmd", BOND)        \
+  _ ("net_fm10k", FM10K)          \
+  _ ("net_cxgbe", CXGBE)          \
+  _ ("net_mlx5", MLX5)            \
+  _ ("net_dpaa2", DPAA2)
+#else
+#define foreach_dpdk_pmd          \
+  _ ("rte_nicvf_pmd", THUNDERX)	  \
+  _ ("rte_em_pmd", E1000EM)       \
+  _ ("rte_igb_pmd", IGB)          \
+  _ ("rte_igbvf_pmd", IGBVF)      \
+  _ ("rte_ixgbe_pmd", IXGBE)      \
+  _ ("rte_ixgbevf_pmd", IXGBEVF)  \
+  _ ("rte_i40e_pmd", I40E)        \
+  _ ("rte_i40evf_pmd", I40EVF)    \
+  _ ("rte_virtio_pmd", VIRTIO)    \
+  _ ("rte_enic_pmd", ENIC)        \
+  _ ("rte_vmxnet3_pmd", VMXNET3)  \
+  _ ("AF_PACKET PMD", AF_PACKET)  \
+  _ ("rte_bond_pmd", BOND)        \
+  _ ("rte_pmd_fm10k", FM10K)      \
+  _ ("rte_cxgbe_pmd", CXGBE)      \
+  _ ("rte_dpaa2_dpni", DPAA2)
+#endif
+
+typedef enum
+{
+  VNET_DPDK_PMD_NONE,
+#define _(s,f) VNET_DPDK_PMD_##f,
+  foreach_dpdk_pmd
+#undef _
+    VNET_DPDK_PMD_UNKNOWN,	/* must be last */
+} dpdk_pmd_t;
+
+typedef enum
+{
+  VNET_DPDK_PORT_TYPE_ETH_1G,
+  VNET_DPDK_PORT_TYPE_ETH_10G,
+  VNET_DPDK_PORT_TYPE_ETH_40G,
+  VNET_DPDK_PORT_TYPE_ETH_100G,
+  VNET_DPDK_PORT_TYPE_ETH_BOND,
+  VNET_DPDK_PORT_TYPE_ETH_SWITCH,
+  VNET_DPDK_PORT_TYPE_AF_PACKET,
+  VNET_DPDK_PORT_TYPE_UNKNOWN,
+} dpdk_port_type_t;
+
+/*
+ * The header for the tx_vector in dpdk_device_t.
+ * Head and tail are indexes into the tx_vector and are of type
+ * u64 so they never overflow.
+ */
+typedef struct
+{
+  u64 tx_head;
+  u64 tx_tail;
+} tx_ring_hdr_t;
+
+typedef struct
+{
+  struct rte_ring *swq;
+
+  u64 hqos_field0_slabmask;
+  u32 hqos_field0_slabpos;
+  u32 hqos_field0_slabshr;
+  u64 hqos_field1_slabmask;
+  u32 hqos_field1_slabpos;
+  u32 hqos_field1_slabshr;
+  u64 hqos_field2_slabmask;
+  u32 hqos_field2_slabpos;
+  u32 hqos_field2_slabshr;
+  u32 hqos_tc_table[64];
+} dpdk_device_hqos_per_worker_thread_t;
+
+typedef struct
+{
+  struct rte_ring **swq;
+  struct rte_mbuf **pkts_enq;
+  struct rte_mbuf **pkts_deq;
+  struct rte_sched_port *hqos;
+  u32 hqos_burst_enq;
+  u32 hqos_burst_deq;
+  u32 pkts_enq_len;
+  u32 swq_pos;
+  u32 flush_count;
+} dpdk_device_hqos_per_hqos_thread_t;
+
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  volatile u32 **lockp;
+
+  /* Instance ID */
+  u32 device_index;
+
+  u32 vlib_hw_if_index;
+  u32 vlib_sw_if_index;
+
+  /* next node index if we decide to steal the rx graph arc */
+  u32 per_interface_next_index;
+
+  /* dpdk rte_mbuf rx and tx vectors, VLIB_FRAME_SIZE */
+  struct rte_mbuf ***tx_vectors;	/* one per worker thread */
+  struct rte_mbuf ***rx_vectors;
+
+  /* vector of traced contexts, per device */
+  u32 **d_trace_buffers;
+
+  dpdk_pmd_t pmd:8;
+  i8 cpu_socket;
+
+  u16 flags;
+#define DPDK_DEVICE_FLAG_ADMIN_UP           (1 << 0)
+#define DPDK_DEVICE_FLAG_PROMISC            (1 << 1)
+#define DPDK_DEVICE_FLAG_PMD                (1 << 2)
+#define DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE (1 << 3)
+#define DPDK_DEVICE_FLAG_MAYBE_MULTISEG     (1 << 4)
+#define DPDK_DEVICE_FLAG_HAVE_SUBIF         (1 << 5)
+#define DPDK_DEVICE_FLAG_HQOS               (1 << 6)
+
+  u16 nb_tx_desc;
+    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
+
+  u8 *interface_name_suffix;
+
+  /* number of sub-interfaces */
+  u16 num_subifs;
+
+  /* PMD related */
+  u16 tx_q_used;
+  u16 rx_q_used;
+  u16 nb_rx_desc;
+  u16 *cpu_socket_id_by_queue;
+  struct rte_eth_conf port_conf;
+  struct rte_eth_txconf tx_conf;
+
+  /* HQoS related */
+  dpdk_device_hqos_per_worker_thread_t *hqos_wt;
+  dpdk_device_hqos_per_hqos_thread_t *hqos_ht;
+
+  /* af_packet */
+  u8 af_packet_port_id;
+
+  struct rte_eth_link link;
+  f64 time_last_link_update;
+
+  struct rte_eth_stats stats;
+  struct rte_eth_stats last_stats;
+  struct rte_eth_stats last_cleared_stats;
+  struct rte_eth_xstat *xstats;
+  struct rte_eth_xstat *last_cleared_xstats;
+  f64 time_last_stats_update;
+  dpdk_port_type_t port_type;
+} dpdk_device_t;
+
+#define DPDK_STATS_POLL_INTERVAL      (10.0)
+#define DPDK_MIN_STATS_POLL_INTERVAL  (0.001)	/* 1msec */
+
+#define DPDK_LINK_POLL_INTERVAL       (3.0)
+#define DPDK_MIN_LINK_POLL_INTERVAL   (0.001)	/* 1msec */
+
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+
+  /* total input packet counter */
+  u64 aggregate_rx_packets;
+} dpdk_worker_t;
+
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+
+  /* total input packet counter */
+  u64 aggregate_rx_packets;
+} dpdk_hqos_thread_t;
+
+typedef struct
+{
+  u32 device;
+  u16 queue_id;
+} dpdk_device_and_queue_t;
+
+#ifndef DPDK_HQOS_DBG_BYPASS
+#define DPDK_HQOS_DBG_BYPASS 0
+#endif
+
+#ifndef HQOS_FLUSH_COUNT_THRESHOLD
+#define HQOS_FLUSH_COUNT_THRESHOLD              100000
+#endif
+
+typedef struct dpdk_device_config_hqos_t
+{
+  u32 hqos_thread;
+  u32 hqos_thread_valid;
+
+  u32 swq_size;
+  u32 burst_enq;
+  u32 burst_deq;
+
+  u32 pktfield0_slabpos;
+  u32 pktfield1_slabpos;
+  u32 pktfield2_slabpos;
+  u64 pktfield0_slabmask;
+  u64 pktfield1_slabmask;
+  u64 pktfield2_slabmask;
+  u32 tc_table[64];
+
+  struct rte_sched_port_params port;
+  struct rte_sched_subport_params *subport;
+  struct rte_sched_pipe_params *pipe;
+  uint32_t *pipe_map;
+} dpdk_device_config_hqos_t;
+
+int dpdk_hqos_validate_mask (u64 mask, u32 n);
+void dpdk_device_config_hqos_pipe_profile_default (dpdk_device_config_hqos_t *
+						   hqos, u32 pipe_profile_id);
+void dpdk_device_config_hqos_default (dpdk_device_config_hqos_t * hqos);
+clib_error_t *dpdk_port_setup_hqos (dpdk_device_t * xd,
+				    dpdk_device_config_hqos_t * hqos);
+void dpdk_hqos_metadata_set (dpdk_device_hqos_per_worker_thread_t * hqos,
+			     struct rte_mbuf **pkts, u32 n_pkts);
+
+#define foreach_dpdk_device_config_item \
+  _ (num_rx_queues) \
+  _ (num_tx_queues) \
+  _ (num_rx_desc) \
+  _ (num_tx_desc) \
+  _ (rss_fn)
+
+typedef struct
+{
+  vlib_pci_addr_t pci_addr;
+  u8 is_blacklisted;
+  u8 vlan_strip_offload;
+#define DPDK_DEVICE_VLAN_STRIP_DEFAULT 0
+#define DPDK_DEVICE_VLAN_STRIP_OFF 1
+#define DPDK_DEVICE_VLAN_STRIP_ON  2
+
+#define _(x) uword x;
+    foreach_dpdk_device_config_item
+#undef _
+    clib_bitmap_t * workers;
+  u32 hqos_enabled;
+  dpdk_device_config_hqos_t hqos;
+} dpdk_device_config_t;
+
+typedef struct
+{
+
+  /* Config stuff */
+  u8 **eal_init_args;
+  u8 *eal_init_args_str;
+  u8 *uio_driver_name;
+  u8 no_multi_seg;
+  u8 enable_tcp_udp_checksum;
+
+  /* Required config parameters */
+  u8 coremask_set_manually;
+  u8 nchannels_set_manually;
+  u32 coremask;
+  u32 nchannels;
+  u32 num_mbufs;
+  u8 num_kni;			/* while kni_init allows u32, port_id in callback fn is only u8 */
+
+  /*
+   * format interface names ala xxxEthernet%d/%d/%d instead of
+   * xxxEthernet%x/%x/%x.
+   */
+  u8 interface_name_format_decimal;
+
+  /* per-device config */
+  dpdk_device_config_t default_devconf;
+  dpdk_device_config_t *dev_confs;
+  uword *device_config_index_by_pci_addr;
+
+} dpdk_config_main_t;
+
+dpdk_config_main_t dpdk_config_main;
+
+typedef struct
+{
+
+  /* Devices */
+  dpdk_device_t *devices;
+  dpdk_device_and_queue_t **devices_by_cpu;
+  dpdk_device_and_queue_t **devices_by_hqos_cpu;
+
+  /* per-thread recycle lists */
+  u32 **recycle;
+
+  /* buffer flags template, configurable to enable/disable tcp / udp cksum */
+  u32 buffer_flags_template;
+
+  /* vlib buffer free list, must be same size as an rte_mbuf */
+  u32 vlib_buffer_free_list_index;
+
+  /* dpdk worker "threads" */
+  dpdk_worker_t *workers;
+
+  /* dpdk HQoS "threads" */
+  dpdk_hqos_thread_t *hqos_threads;
+
+  /* Ethernet input node index */
+  u32 ethernet_input_node_index;
+
+  /* pcap tracing [only works if (CLIB_DEBUG > 0)] */
+  int tx_pcap_enable;
+  pcap_main_t pcap_main;
+  u8 *pcap_filename;
+  u32 pcap_sw_if_index;
+  u32 pcap_pkts_to_capture;
+
+  /* hashes */
+  uword *dpdk_device_by_kni_port_id;
+  uword *vu_sw_if_index_by_listener_fd;
+  uword *vu_sw_if_index_by_sock_fd;
+  u32 *vu_inactive_interfaces_device_index;
+
+  /*
+   * flag indicating that a posted admin up/down
+   * (via post_sw_interface_set_flags) is in progress
+   */
+  u8 admin_up_down_in_progress;
+
+  u8 use_rss;
+
+  /* which cpus are running dpdk-input */
+  int input_cpu_first_index;
+  int input_cpu_count;
+
+  /* which cpus are running I/O TX */
+  int hqos_cpu_first_index;
+  int hqos_cpu_count;
+
+  /* control interval of dpdk link state and stat polling */
+  f64 link_state_poll_interval;
+  f64 stat_poll_interval;
+
+  /* Sleep for this many MS after each device poll */
+  u32 poll_sleep;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+  dpdk_config_main_t *conf;
+} dpdk_main_t;
+
+dpdk_main_t dpdk_main;
+
+typedef struct
+{
+  u32 buffer_index;
+  u16 device_index;
+  u8 queue_index;
+  struct rte_mbuf mb;
+  /* Copy of VLIB buffer; packet data stored in pre_data. */
+  vlib_buffer_t buffer;
+} dpdk_tx_dma_trace_t;
+
+typedef struct
+{
+  u32 buffer_index;
+  u16 device_index;
+  u16 queue_index;
+  struct rte_mbuf mb;
+  vlib_buffer_t buffer;		/* Copy of VLIB buffer; pkt data stored in pre_data. */
+  u8 data[256];			/* First 256 data bytes, used for hexdump */
+} dpdk_rx_dma_trace_t;
+
+void vnet_buffer_needs_dpdk_mb (vlib_buffer_t * b);
+
+clib_error_t *dpdk_set_mac_address (vnet_hw_interface_t * hi, char *address);
+
+clib_error_t *dpdk_set_mc_filter (vnet_hw_interface_t * hi,
+				  struct ether_addr mc_addr_vec[], int naddr);
+
+void dpdk_thread_input (dpdk_main_t * dm, dpdk_device_t * xd);
+
+clib_error_t *dpdk_port_setup (dpdk_main_t * dm, dpdk_device_t * xd);
+
+u32 dpdk_interface_tx_vector (vlib_main_t * vm, u32 dev_instance);
+
+struct rte_mbuf *dpdk_replicate_packet_mb (vlib_buffer_t * b);
+struct rte_mbuf *dpdk_zerocopy_replicate_packet_mb (vlib_buffer_t * b);
+
+#define foreach_dpdk_error						\
+  _(NONE, "no error")							\
+  _(RX_PACKET_ERROR, "Rx packet errors")				\
+  _(RX_BAD_FCS, "Rx bad fcs")						\
+  _(IP_CHECKSUM_ERROR, "Rx ip checksum errors")				\
+  _(RX_ALLOC_FAIL, "rx buf alloc from free list failed")		\
+  _(RX_ALLOC_NO_PHYSMEM, "rx buf alloc failed no physmem")		\
+  _(RX_ALLOC_DROP_PKTS, "rx packets dropped due to alloc error")
+
+typedef enum
+{
+#define _(f,s) DPDK_ERROR_##f,
+  foreach_dpdk_error
+#undef _
+    DPDK_N_ERROR,
+} dpdk_error_t;
+
+int dpdk_set_stat_poll_interval (f64 interval);
+int dpdk_set_link_state_poll_interval (f64 interval);
+void dpdk_update_link_state (dpdk_device_t * xd, f64 now);
+void dpdk_device_lock_init (dpdk_device_t * xd);
+void dpdk_device_lock_free (dpdk_device_t * xd);
+
+static inline u64
+vnet_get_aggregate_rx_packets (void)
+{
+  dpdk_main_t *dm = &dpdk_main;
+  u64 sum = 0;
+  dpdk_worker_t *dw;
+
+  vec_foreach (dw, dm->workers) sum += dw->aggregate_rx_packets;
+
+  return sum;
+}
+
+void dpdk_rx_trace (dpdk_main_t * dm,
+		    vlib_node_runtime_t * node,
+		    dpdk_device_t * xd,
+		    u16 queue_id, u32 * buffers, uword n_buffers);
+
+#define EFD_OPERATION_LESS_THAN          0
+#define EFD_OPERATION_GREATER_OR_EQUAL   1
+
+format_function_t format_dpdk_device_name;
+format_function_t format_dpdk_device;
+format_function_t format_dpdk_tx_dma_trace;
+format_function_t format_dpdk_rx_dma_trace;
+format_function_t format_dpdk_rte_mbuf;
+format_function_t format_dpdk_rx_rte_mbuf;
+unformat_function_t unformat_socket_mem;
+clib_error_t *unformat_rss_fn (unformat_input_t * input, uword * rss_fn);
+clib_error_t *unformat_hqos (unformat_input_t * input,
+			     dpdk_device_config_hqos_t * hqos);
+
+uword
+admin_up_down_process (vlib_main_t * vm,
+		       vlib_node_runtime_t * rt, vlib_frame_t * f);
+
+#endif /* __included_dpdk_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/dpdk_priv.h b/src/vnet/devices/dpdk/dpdk_priv.h
new file mode 100644
index 00000000..0c81dbc3
--- /dev/null
+++ b/src/vnet/devices/dpdk/dpdk_priv.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define DPDK_NB_RX_DESC_DEFAULT   1024
+#define DPDK_NB_TX_DESC_DEFAULT   1024
+#define DPDK_NB_RX_DESC_VIRTIO    256
+#define DPDK_NB_TX_DESC_VIRTIO    256
+
+#define I40E_DEV_ID_SFP_XL710           0x1572
+#define I40E_DEV_ID_QSFP_A              0x1583
+#define I40E_DEV_ID_QSFP_B              0x1584
+#define I40E_DEV_ID_QSFP_C              0x1585
+#define I40E_DEV_ID_10G_BASE_T          0x1586
+#define I40E_DEV_ID_VF                  0x154C
+
+/* These args appear by themselves */
+#define foreach_eal_double_hyphen_predicate_arg \
+_(no-shconf)                                    \
+_(no-hpet)                                      \
+_(no-huge)                                      \
+_(vmware-tsc-map)
+
+#define foreach_eal_single_hyphen_mandatory_arg \
+_(coremask, c)                                  \
+_(nchannels, n)                                 \
+
+#define foreach_eal_single_hyphen_arg           \
+_(blacklist, b)                                 \
+_(mem-alloc-request, m)                         \
+_(force-ranks, r)
+
+/* These args are preceeded by "--" and followed by a single string */
+#define foreach_eal_double_hyphen_arg           \
+_(huge-dir)                                     \
+_(proc-type)                                    \
+_(file-prefix)                                  \
+_(vdev)
+
+static inline void
+dpdk_get_xstats (dpdk_device_t * xd)
+{
+  int len;
+  if ((len = rte_eth_xstats_get (xd->device_index, NULL, 0)) > 0)
+    {
+      vec_validate (xd->xstats, len - 1);
+      vec_validate (xd->last_cleared_xstats, len - 1);
+
+      len =
+	rte_eth_xstats_get (xd->device_index, xd->xstats,
+			    vec_len (xd->xstats));
+
+      ASSERT (vec_len (xd->xstats) == len);
+      ASSERT (vec_len (xd->last_cleared_xstats) == len);
+
+      _vec_len (xd->xstats) = len;
+      _vec_len (xd->last_cleared_xstats) = len;
+
+    }
+}
+
+
+static inline void
+dpdk_update_counters (dpdk_device_t * xd, f64 now)
+{
+  vlib_simple_counter_main_t *cm;
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 my_cpu = os_get_cpu_number ();
+  u64 rxerrors, last_rxerrors;
+
+  /* only update counters for PMD interfaces */
+  if ((xd->flags & DPDK_DEVICE_FLAG_PMD) == 0)
+    return;
+
+  xd->time_last_stats_update = now ? now : xd->time_last_stats_update;
+  clib_memcpy (&xd->last_stats, &xd->stats, sizeof (xd->last_stats));
+  rte_eth_stats_get (xd->device_index, &xd->stats);
+
+  /* maybe bump interface rx no buffer counter */
+  if (PREDICT_FALSE (xd->stats.rx_nombuf != xd->last_stats.rx_nombuf))
+    {
+      cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
+			     VNET_INTERFACE_COUNTER_RX_NO_BUF);
+
+      vlib_increment_simple_counter (cm, my_cpu, xd->vlib_sw_if_index,
+				     xd->stats.rx_nombuf -
+				     xd->last_stats.rx_nombuf);
+    }
+
+  /* missed pkt counter */
+  if (PREDICT_FALSE (xd->stats.imissed != xd->last_stats.imissed))
+    {
+      cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
+			     VNET_INTERFACE_COUNTER_RX_MISS);
+
+      vlib_increment_simple_counter (cm, my_cpu, xd->vlib_sw_if_index,
+				     xd->stats.imissed -
+				     xd->last_stats.imissed);
+    }
+  rxerrors = xd->stats.ierrors;
+  last_rxerrors = xd->last_stats.ierrors;
+
+  if (PREDICT_FALSE (rxerrors != last_rxerrors))
+    {
+      cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
+			     VNET_INTERFACE_COUNTER_RX_ERROR);
+
+      vlib_increment_simple_counter (cm, my_cpu, xd->vlib_sw_if_index,
+				     rxerrors - last_rxerrors);
+    }
+
+  dpdk_get_xstats (xd);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/format.c b/src/vnet/devices/dpdk/format.c
new file mode 100644
index 00000000..ff7c7a5a
--- /dev/null
+++ b/src/vnet/devices/dpdk/format.c
@@ -0,0 +1,763 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/vnet.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/format.h>
+#include <vlib/unix/cj.h>
+#include <assert.h>
+
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/devices/dpdk/dpdk.h>
+
+#include "dpdk_priv.h"
+#include <vppinfra/error.h>
+
+#define foreach_dpdk_counter                    \
+  _ (tx_frames_ok, opackets)                    \
+  _ (tx_bytes_ok, obytes)                       \
+  _ (tx_errors, oerrors)                        \
+  _ (rx_frames_ok, ipackets)                    \
+  _ (rx_bytes_ok, ibytes)                       \
+  _ (rx_errors, ierrors)                        \
+  _ (rx_missed, imissed)                        \
+  _ (rx_no_bufs, rx_nombuf)
+
+#define foreach_dpdk_q_counter                  \
+  _ (rx_frames_ok, q_ipackets)                  \
+  _ (tx_frames_ok, q_opackets)                  \
+  _ (rx_bytes_ok, q_ibytes)                     \
+  _ (tx_bytes_ok, q_obytes)                     \
+  _ (rx_errors, q_errors)
+
+#define foreach_dpdk_rss_hf                    \
+  _(ETH_RSS_FRAG_IPV4,          "ipv4-frag")   \
+  _(ETH_RSS_NONFRAG_IPV4_TCP,   "ipv4-tcp")    \
+  _(ETH_RSS_NONFRAG_IPV4_UDP,   "ipv4-udp")    \
+  _(ETH_RSS_NONFRAG_IPV4_SCTP,  "ipv4-sctp")   \
+  _(ETH_RSS_NONFRAG_IPV4_OTHER, "ipv4-other")  \
+  _(ETH_RSS_IPV4,               "ipv4")        \
+  _(ETH_RSS_IPV6_TCP_EX,        "ipv6-tcp-ex") \
+  _(ETH_RSS_IPV6_UDP_EX,        "ipv6-udp-ex") \
+  _(ETH_RSS_FRAG_IPV6,          "ipv6-frag")   \
+  _(ETH_RSS_NONFRAG_IPV6_TCP,   "ipv6-tcp")    \
+  _(ETH_RSS_NONFRAG_IPV6_UDP,   "ipv6-udp")    \
+  _(ETH_RSS_NONFRAG_IPV6_SCTP,  "ipv6-sctp")   \
+  _(ETH_RSS_NONFRAG_IPV6_OTHER, "ipv6-other")  \
+  _(ETH_RSS_L2_PAYLOAD,         "l2-payload")  \
+  _(ETH_RSS_IPV6_EX,            "ipv6-ex")     \
+  _(ETH_RSS_IPV6,               "ipv6")
+
+
+#define foreach_dpdk_rx_offload_caps            \
+  _(DEV_RX_OFFLOAD_VLAN_STRIP, "vlan-strip")    \
+  _(DEV_RX_OFFLOAD_IPV4_CKSUM, "ipv4-cksum")    \
+  _(DEV_RX_OFFLOAD_UDP_CKSUM , "udp-cksum")     \
+  _(DEV_RX_OFFLOAD_TCP_CKSUM , "tcp-cksum")     \
+  _(DEV_RX_OFFLOAD_TCP_LRO   , "rcp-lro")       \
+  _(DEV_RX_OFFLOAD_QINQ_STRIP, "qinq-strip")
+
+#define foreach_dpdk_tx_offload_caps           \
+  _(DEV_TX_OFFLOAD_VLAN_INSERT, "vlan-insert") \
+  _(DEV_TX_OFFLOAD_IPV4_CKSUM,  "ipv4-cksum")  \
+  _(DEV_TX_OFFLOAD_UDP_CKSUM  , "udp-cksum")   \
+  _(DEV_TX_OFFLOAD_TCP_CKSUM  , "tcp-cksum")   \
+  _(DEV_TX_OFFLOAD_SCTP_CKSUM , "sctp-cksum")  \
+  _(DEV_TX_OFFLOAD_TCP_TSO    , "tcp-tso")     \
+  _(DEV_TX_OFFLOAD_UDP_TSO    , "udp-tso")     \
+  _(DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM, "outer-ipv4-cksum") \
+  _(DEV_TX_OFFLOAD_QINQ_INSERT, "qinq-insert")
+
+#if RTE_VERSION < RTE_VERSION_NUM(16, 11, 0, 0)
+/* New ol_flags bits added in DPDK-16.11 */
+#define PKT_RX_IP_CKSUM_GOOD    (1ULL << 7)
+#define PKT_RX_L4_CKSUM_GOOD    (1ULL << 8)
+#endif
+
+#define foreach_dpdk_pkt_rx_offload_flag                                \
+  _ (PKT_RX_VLAN_PKT, "RX packet is a 802.1q VLAN packet")              \
+  _ (PKT_RX_RSS_HASH, "RX packet with RSS hash result")                 \
+  _ (PKT_RX_FDIR, "RX packet with FDIR infos")                          \
+  _ (PKT_RX_L4_CKSUM_BAD, "L4 cksum of RX pkt. is not OK")              \
+  _ (PKT_RX_IP_CKSUM_BAD, "IP cksum of RX pkt. is not OK")              \
+  _ (PKT_RX_VLAN_STRIPPED, "RX packet VLAN tag stripped")               \
+  _ (PKT_RX_IP_CKSUM_GOOD, "IP cksum of RX pkt. is valid")              \
+  _ (PKT_RX_L4_CKSUM_GOOD, "L4 cksum of RX pkt. is valid")              \
+  _ (PKT_RX_IEEE1588_PTP, "RX IEEE1588 L2 Ethernet PT Packet")          \
+  _ (PKT_RX_IEEE1588_TMST, "RX IEEE1588 L2/L4 timestamped packet")      \
+  _ (PKT_RX_QINQ_STRIPPED, "RX packet QinQ tags stripped")
+
+#if RTE_VERSION < RTE_VERSION_NUM(16, 11, 0, 0)
+/* PTYPE added in DPDK-16.11 */
+#define RTE_PTYPE_L2_ETHER_VLAN             0x00000006
+#define RTE_PTYPE_L2_ETHER_QINQ             0x00000007
+#endif
+
+#define foreach_dpdk_pkt_type                                           \
+  _ (L2, ETHER, "Ethernet packet")                                      \
+  _ (L2, ETHER_TIMESYNC, "Ethernet packet for time sync")               \
+  _ (L2, ETHER_ARP, "ARP packet")                                       \
+  _ (L2, ETHER_LLDP, "LLDP (Link Layer Discovery Protocol) packet")     \
+  _ (L2, ETHER_NSH, "NSH (Network Service Header) packet")              \
+  _ (L2, ETHER_VLAN, "VLAN packet")                                     \
+  _ (L2, ETHER_QINQ, "QinQ packet")                                     \
+  _ (L3, IPV4, "IPv4 packet without extension headers")                 \
+  _ (L3, IPV4_EXT, "IPv4 packet with extension headers")                \
+  _ (L3, IPV4_EXT_UNKNOWN, "IPv4 packet with or without extension headers") \
+  _ (L3, IPV6, "IPv6 packet without extension headers")                 \
+  _ (L3, IPV6_EXT, "IPv6 packet with extension headers")                \
+  _ (L3, IPV6_EXT_UNKNOWN, "IPv6 packet with or without extension headers") \
+  _ (L4, TCP, "TCP packet")                                             \
+  _ (L4, UDP, "UDP packet")                                             \
+  _ (L4, FRAG, "Fragmented IP packet")                                  \
+  _ (L4, SCTP, "SCTP (Stream Control Transmission Protocol) packet")    \
+  _ (L4, ICMP, "ICMP packet")                                           \
+  _ (L4, NONFRAG, "Non-fragmented IP packet")                           \
+  _ (TUNNEL, GRE, "GRE tunneling packet")                               \
+  _ (TUNNEL, VXLAN, "VXLAN tunneling packet")                           \
+  _ (TUNNEL, NVGRE, "NVGRE Tunneling packet")                           \
+  _ (TUNNEL, GENEVE, "GENEVE Tunneling packet")                         \
+  _ (TUNNEL, GRENAT, "Teredo, VXLAN or GRE Tunneling packet")           \
+  _ (INNER_L2, ETHER, "Inner Ethernet packet")                          \
+  _ (INNER_L2, ETHER_VLAN, "Inner Ethernet packet with VLAN")           \
+  _ (INNER_L3, IPV4, "Inner IPv4 packet without extension headers")     \
+  _ (INNER_L3, IPV4_EXT, "Inner IPv4 packet with extension headers")    \
+  _ (INNER_L3, IPV4_EXT_UNKNOWN, "Inner IPv4 packet with or without extension headers") \
+  _ (INNER_L3, IPV6, "Inner IPv6 packet without extension headers")     \
+  _ (INNER_L3, IPV6_EXT, "Inner IPv6 packet with extension headers")    \
+  _ (INNER_L3, IPV6_EXT_UNKNOWN, "Inner IPv6 packet with or without extension headers") \
+  _ (INNER_L4, TCP, "Inner TCP packet")                                 \
+  _ (INNER_L4, UDP, "Inner UDP packet")                                 \
+  _ (INNER_L4, FRAG, "Inner fagmented IP packet")                       \
+  _ (INNER_L4, SCTP, "Inner SCTP (Stream Control Transmission Protocol) packet") \
+  _ (INNER_L4, ICMP, "Inner ICMP packet")                               \
+  _ (INNER_L4, NONFRAG, "Inner non-fragmented IP packet")
+
+#define foreach_dpdk_pkt_tx_offload_flag                                \
+  _ (PKT_TX_VLAN_PKT, "TX packet is a 802.1q VLAN packet")              \
+  _ (PKT_TX_IP_CKSUM, "IP cksum of TX pkt. computed by NIC")            \
+  _ (PKT_TX_TCP_CKSUM, "TCP cksum of TX pkt. computed by NIC")          \
+  _ (PKT_TX_SCTP_CKSUM, "SCTP cksum of TX pkt. computed by NIC")        \
+  _ (PKT_TX_IEEE1588_TMST, "TX IEEE1588 packet to timestamp")
+
+#define foreach_dpdk_pkt_offload_flag           \
+  foreach_dpdk_pkt_rx_offload_flag              \
+  foreach_dpdk_pkt_tx_offload_flag
+
+u8 *
+format_dpdk_device_name (u8 * s, va_list * args)
+{
+  dpdk_main_t *dm = &dpdk_main;
+  char *devname_format;
+  char *device_name;
+  u32 i = va_arg (*args, u32);
+  struct rte_eth_dev_info dev_info;
+  u8 *ret;
+
+  if (dm->conf->interface_name_format_decimal)
+    devname_format = "%s%d/%d/%d";
+  else
+    devname_format = "%s%x/%x/%x";
+
+  switch (dm->devices[i].port_type)
+    {
+    case VNET_DPDK_PORT_TYPE_ETH_1G:
+      device_name = "GigabitEthernet";
+      break;
+
+    case VNET_DPDK_PORT_TYPE_ETH_10G:
+      device_name = "TenGigabitEthernet";
+      break;
+
+    case VNET_DPDK_PORT_TYPE_ETH_40G:
+      device_name = "FortyGigabitEthernet";
+      break;
+
+    case VNET_DPDK_PORT_TYPE_ETH_100G:
+      device_name = "HundredGigabitEthernet";
+      break;
+
+    case VNET_DPDK_PORT_TYPE_ETH_BOND:
+      return format (s, "BondEthernet%d", dm->devices[i].device_index);
+
+    case VNET_DPDK_PORT_TYPE_ETH_SWITCH:
+      device_name = "EthernetSwitch";
+      break;
+
+    case VNET_DPDK_PORT_TYPE_AF_PACKET:
+      rte_eth_dev_info_get (i, &dev_info);
+      return format (s, "af_packet%d", dm->devices[i].af_packet_port_id);
+
+    default:
+    case VNET_DPDK_PORT_TYPE_UNKNOWN:
+      device_name = "UnknownEthernet";
+      break;
+    }
+
+  rte_eth_dev_info_get (i, &dev_info);
+
+  if (dev_info.pci_dev)
+    ret = format (s, devname_format, device_name, dev_info.pci_dev->addr.bus,
+		  dev_info.pci_dev->addr.devid,
+		  dev_info.pci_dev->addr.function);
+  else
+    ret = format (s, "%s%d", device_name, dm->devices[i].device_index);
+
+  if (dm->devices[i].interface_name_suffix)
+    return format (ret, "/%s", dm->devices[i].interface_name_suffix);
+  return ret;
+}
+
+static u8 *
+format_dpdk_device_type (u8 * s, va_list * args)
+{
+  dpdk_main_t *dm = &dpdk_main;
+  char *dev_type;
+  u32 i = va_arg (*args, u32);
+
+  switch (dm->devices[i].pmd)
+    {
+    case VNET_DPDK_PMD_E1000EM:
+      dev_type = "Intel 82540EM (e1000)";
+      break;
+
+    case VNET_DPDK_PMD_IGB:
+      dev_type = "Intel e1000";
+      break;
+
+    case VNET_DPDK_PMD_I40E:
+      dev_type = "Intel X710/XL710 Family";
+      break;
+
+    case VNET_DPDK_PMD_I40EVF:
+      dev_type = "Intel X710/XL710 Family VF";
+      break;
+
+    case VNET_DPDK_PMD_FM10K:
+      dev_type = "Intel FM10000 Family Ethernet Switch";
+      break;
+
+    case VNET_DPDK_PMD_IGBVF:
+      dev_type = "Intel e1000 VF";
+      break;
+
+    case VNET_DPDK_PMD_VIRTIO:
+      dev_type = "Red Hat Virtio";
+      break;
+
+    case VNET_DPDK_PMD_IXGBEVF:
+      dev_type = "Intel 82599 VF";
+      break;
+
+    case VNET_DPDK_PMD_IXGBE:
+      dev_type = "Intel 82599";
+      break;
+
+    case VNET_DPDK_PMD_ENIC:
+      dev_type = "Cisco VIC";
+      break;
+
+    case VNET_DPDK_PMD_CXGBE:
+      dev_type = "Chelsio T4/T5";
+      break;
+
+    case VNET_DPDK_PMD_MLX5:
+      dev_type = "Mellanox ConnectX-4 Family";
+      break;
+
+    case VNET_DPDK_PMD_VMXNET3:
+      dev_type = "VMware VMXNET3";
+      break;
+
+    case VNET_DPDK_PMD_AF_PACKET:
+      dev_type = "af_packet";
+      break;
+
+    case VNET_DPDK_PMD_BOND:
+      dev_type = "Ethernet Bonding";
+      break;
+
+    case VNET_DPDK_PMD_DPAA2:
+      dev_type = "NXP DPAA2 Mac";
+      break;
+
+    default:
+    case VNET_DPDK_PMD_UNKNOWN:
+      dev_type = "### UNKNOWN ###";
+      break;
+    }
+
+  return format (s, dev_type);
+}
+
+static u8 *
+format_dpdk_link_status (u8 * s, va_list * args)
+{
+  dpdk_device_t *xd = va_arg (*args, dpdk_device_t *);
+  struct rte_eth_link *l = &xd->link;
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, xd->vlib_hw_if_index);
+
+  s = format (s, "%s ", l->link_status ? "up" : "down");
+  if (l->link_status)
+    {
+      u32 promisc = rte_eth_promiscuous_get (xd->device_index);
+
+      s = format (s, "%s duplex ", (l->link_duplex == ETH_LINK_FULL_DUPLEX) ?
+		  "full" : "half");
+      s = format (s, "speed %u mtu %d %s\n", l->link_speed,
+		  hi->max_packet_bytes, promisc ? " promisc" : "");
+    }
+  else
+    s = format (s, "\n");
+
+  return s;
+}
+
+#define _line_len 72
+#define _(v, str)                                            \
+if (bitmap & v) {                                            \
+  if (format_get_indent (s) > next_split ) {                 \
+    next_split += _line_len;                                 \
+    s = format(s,"\n%U", format_white_space, indent);        \
+  }                                                          \
+  s = format(s, "%s ", str);                                 \
+}
+
+static u8 *
+format_dpdk_rss_hf_name (u8 * s, va_list * args)
+{
+  u64 bitmap = va_arg (*args, u64);
+  int next_split = _line_len;
+  int indent = format_get_indent (s);
+
+  if (!bitmap)
+    return format (s, "none");
+
+  foreach_dpdk_rss_hf return s;
+}
+
+static u8 *
+format_dpdk_rx_offload_caps (u8 * s, va_list * args)
+{
+  u32 bitmap = va_arg (*args, u32);
+  int next_split = _line_len;
+  int indent = format_get_indent (s);
+
+  if (!bitmap)
+    return format (s, "none");
+
+  foreach_dpdk_rx_offload_caps return s;
+}
+
+static u8 *
+format_dpdk_tx_offload_caps (u8 * s, va_list * args)
+{
+  u32 bitmap = va_arg (*args, u32);
+  int next_split = _line_len;
+  int indent = format_get_indent (s);
+  if (!bitmap)
+    return format (s, "none");
+
+  foreach_dpdk_tx_offload_caps return s;
+}
+
+#undef _line_len
+#undef _
+
+u8 *
+format_dpdk_device (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  int verbose = va_arg (*args, int);
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_t *xd = vec_elt_at_index (dm->devices, dev_instance);
+  uword indent = format_get_indent (s);
+  f64 now = vlib_time_now (dm->vlib_main);
+  struct rte_eth_dev_info di;
+
+  dpdk_update_counters (xd, now);
+  dpdk_update_link_state (xd, now);
+
+  s = format (s, "%U\n%Ucarrier %U",
+	      format_dpdk_device_type, xd->device_index,
+	      format_white_space, indent + 2, format_dpdk_link_status, xd);
+
+  rte_eth_dev_info_get (xd->device_index, &di);
+
+  if (verbose > 1 && xd->flags & DPDK_DEVICE_FLAG_PMD)
+    {
+      struct rte_pci_device *pci;
+      struct rte_eth_rss_conf rss_conf;
+      int vlan_off;
+      int retval;
+
+      rss_conf.rss_key = 0;
+      retval = rte_eth_dev_rss_hash_conf_get (xd->device_index, &rss_conf);
+      if (retval < 0)
+	clib_warning ("rte_eth_dev_rss_hash_conf_get returned %d", retval);
+      pci = di.pci_dev;
+
+      if (pci)
+	s =
+	  format (s,
+		  "%Upci id:            device %04x:%04x subsystem %04x:%04x\n"
+		  "%Upci address:       %04x:%02x:%02x.%02x\n",
+		  format_white_space, indent + 2, pci->id.vendor_id,
+		  pci->id.device_id, pci->id.subsystem_vendor_id,
+		  pci->id.subsystem_device_id, format_white_space, indent + 2,
+		  pci->addr.domain, pci->addr.bus, pci->addr.devid,
+		  pci->addr.function);
+      s =
+	format (s, "%Umax rx packet len: %d\n", format_white_space,
+		indent + 2, di.max_rx_pktlen);
+      s =
+	format (s, "%Umax num of queues: rx %d tx %d\n", format_white_space,
+		indent + 2, di.max_rx_queues, di.max_tx_queues);
+      s =
+	format (s, "%Upromiscuous:       unicast %s all-multicast %s\n",
+		format_white_space, indent + 2,
+		rte_eth_promiscuous_get (xd->device_index) ? "on" : "off",
+		rte_eth_promiscuous_get (xd->device_index) ? "on" : "off");
+      vlan_off = rte_eth_dev_get_vlan_offload (xd->device_index);
+      s = format (s, "%Uvlan offload:      strip %s filter %s qinq %s\n",
+		  format_white_space, indent + 2,
+		  vlan_off & ETH_VLAN_STRIP_OFFLOAD ? "on" : "off",
+		  vlan_off & ETH_VLAN_FILTER_OFFLOAD ? "on" : "off",
+		  vlan_off & ETH_VLAN_EXTEND_OFFLOAD ? "on" : "off");
+      s = format (s, "%Urx offload caps:   %U\n",
+		  format_white_space, indent + 2,
+		  format_dpdk_rx_offload_caps, di.rx_offload_capa);
+      s = format (s, "%Utx offload caps:   %U\n",
+		  format_white_space, indent + 2,
+		  format_dpdk_tx_offload_caps, di.tx_offload_capa);
+      s = format (s, "%Urss active:        %U\n"
+		  "%Urss supported:     %U\n",
+		  format_white_space, indent + 2,
+		  format_dpdk_rss_hf_name, rss_conf.rss_hf,
+		  format_white_space, indent + 2,
+		  format_dpdk_rss_hf_name, di.flow_type_rss_offloads);
+    }
+
+  s = format (s, "%Urx queues %d, rx desc %d, tx queues %d, tx desc %d\n",
+	      format_white_space, indent + 2,
+	      xd->rx_q_used, xd->nb_rx_desc, xd->tx_q_used, xd->nb_tx_desc);
+
+  if (xd->cpu_socket > -1)
+    s = format (s, "%Ucpu socket %d\n",
+		format_white_space, indent + 2, xd->cpu_socket);
+
+  /* $$$ MIB counters  */
+  {
+#define _(N, V)							\
+    if ((xd->stats.V - xd->last_cleared_stats.V) != 0) {       \
+      s = format (s, "\n%U%-40U%16Ld",                         \
+                  format_white_space, indent + 2,              \
+                  format_c_identifier, #N,                     \
+                  xd->stats.V - xd->last_cleared_stats.V);     \
+    }                                                          \
+
+    foreach_dpdk_counter
+#undef _
+  }
+
+  u8 *xs = 0;
+  u32 i = 0;
+  struct rte_eth_xstat *xstat, *last_xstat;
+  struct rte_eth_xstat_name *xstat_names = 0;
+  int len = rte_eth_xstats_get_names (xd->device_index, NULL, 0);
+  vec_validate (xstat_names, len - 1);
+  rte_eth_xstats_get_names (xd->device_index, xstat_names, len);
+
+  ASSERT (vec_len (xd->xstats) == vec_len (xd->last_cleared_xstats));
+
+  /* *INDENT-OFF* */
+  vec_foreach_index(i, xd->xstats)
+    {
+      u64 delta = 0;
+      xstat = vec_elt_at_index(xd->xstats, i);
+      last_xstat = vec_elt_at_index(xd->last_cleared_xstats, i);
+
+      delta = xstat->value - last_xstat->value;
+      if (verbose == 2 || (verbose && delta))
+        {
+          /* format_c_identifier doesn't like c strings inside vector */
+          u8 * name = format(0,"%s", xstat_names[i].name);
+          xs = format(xs, "\n%U%-38U%16Ld",
+                      format_white_space, indent + 4,
+                      format_c_identifier, name, delta);
+          vec_free(name);
+        }
+    }
+  /* *INDENT-ON* */
+
+  vec_free (xstat_names);
+
+  if (xs)
+    {
+      s = format (s, "\n%Uextended stats:%v",
+		  format_white_space, indent + 2, xs);
+      vec_free (xs);
+    }
+
+  return s;
+}
+
+u8 *
+format_dpdk_tx_dma_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  CLIB_UNUSED (vnet_main_t * vnm) = vnet_get_main ();
+  dpdk_tx_dma_trace_t *t = va_arg (*va, dpdk_tx_dma_trace_t *);
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_t *xd = vec_elt_at_index (dm->devices, t->device_index);
+  uword indent = format_get_indent (s);
+  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
+
+  s = format (s, "%U tx queue %d",
+	      format_vnet_sw_interface_name, vnm, sw, t->queue_index);
+
+  s = format (s, "\n%Ubuffer 0x%x: %U",
+	      format_white_space, indent,
+	      t->buffer_index, format_vlib_buffer, &t->buffer);
+
+  s = format (s, "\n%U%U", format_white_space, indent,
+	      format_ethernet_header_with_length, t->buffer.pre_data,
+	      sizeof (t->buffer.pre_data));
+
+  return s;
+}
+
+u8 *
+format_dpdk_rx_dma_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  CLIB_UNUSED (vnet_main_t * vnm) = vnet_get_main ();
+  dpdk_rx_dma_trace_t *t = va_arg (*va, dpdk_rx_dma_trace_t *);
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_t *xd = vec_elt_at_index (dm->devices, t->device_index);
+  format_function_t *f;
+  uword indent = format_get_indent (s);
+  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
+
+  s = format (s, "%U rx queue %d",
+	      format_vnet_sw_interface_name, vnm, sw, t->queue_index);
+
+  s = format (s, "\n%Ubuffer 0x%x: %U",
+	      format_white_space, indent,
+	      t->buffer_index, format_vlib_buffer, &t->buffer);
+
+  s = format (s, "\n%U%U",
+	      format_white_space, indent,
+	      format_dpdk_rte_mbuf, &t->mb, &t->data);
+
+  if (vm->trace_main.verbose)
+    {
+      s = format (s, "\n%UPacket Dump%s", format_white_space, indent + 2,
+		  t->mb.data_len > sizeof (t->data) ? " (truncated)" : "");
+      s = format (s, "\n%U%U", format_white_space, indent + 4,
+		  format_hexdump, &t->data,
+		  t->mb.data_len >
+		  sizeof (t->data) ? sizeof (t->data) : t->mb.data_len);
+    }
+  f = node->format_buffer;
+  if (!f)
+    f = format_hex_bytes;
+  s = format (s, "\n%U%U", format_white_space, indent,
+	      f, t->buffer.pre_data, sizeof (t->buffer.pre_data));
+
+  return s;
+}
+
+
+static inline u8 *
+format_dpdk_pkt_types (u8 * s, va_list * va)
+{
+  u32 *pkt_types = va_arg (*va, u32 *);
+  uword indent __attribute__ ((unused)) = format_get_indent (s) + 2;
+
+  if (!*pkt_types)
+    return s;
+
+  s = format (s, "Packet Types");
+
+#define _(L, F, S)             \
+  if ((*pkt_types & RTE_PTYPE_##L##_MASK) == RTE_PTYPE_##L##_##F)           \
+    {                                                                       \
+      s = format (s, "\n%U%s (0x%04x) %s", format_white_space, indent,      \
+                     "RTE_PTYPE_" #L "_" #F, RTE_PTYPE_##L##_##F, S);       \
+    }
+
+  foreach_dpdk_pkt_type
+#undef _
+    return s;
+}
+
+static inline u8 *
+format_dpdk_pkt_offload_flags (u8 * s, va_list * va)
+{
+  u64 *ol_flags = va_arg (*va, u64 *);
+  uword indent = format_get_indent (s) + 2;
+
+  if (!*ol_flags)
+    return s;
+
+  s = format (s, "Packet Offload Flags");
+
+#define _(F, S)             \
+  if (*ol_flags & F)            \
+    {               \
+      s = format (s, "\n%U%s (0x%04x) %s",      \
+      format_white_space, indent, #F, F, S);  \
+    }
+
+  foreach_dpdk_pkt_offload_flag
+#undef _
+    return s;
+}
+
+u8 *
+format_dpdk_rte_mbuf_vlan (u8 * s, va_list * va)
+{
+  ethernet_vlan_header_tv_t *vlan_hdr =
+    va_arg (*va, ethernet_vlan_header_tv_t *);
+
+  if (clib_net_to_host_u16 (vlan_hdr->type) == ETHERNET_TYPE_DOT1AD)
+    {
+      s = format (s, "%U 802.1q vlan ",
+		  format_ethernet_vlan_tci,
+		  clib_net_to_host_u16 (vlan_hdr->priority_cfi_and_id));
+      vlan_hdr++;
+    }
+
+  s = format (s, "%U",
+	      format_ethernet_vlan_tci,
+	      clib_net_to_host_u16 (vlan_hdr->priority_cfi_and_id));
+
+  return s;
+}
+
+u8 *
+format_dpdk_rte_mbuf (u8 * s, va_list * va)
+{
+  struct rte_mbuf *mb = va_arg (*va, struct rte_mbuf *);
+  ethernet_header_t *eth_hdr = va_arg (*va, ethernet_header_t *);
+  uword indent = format_get_indent (s) + 2;
+
+  s = format (s, "PKT MBUF: port %d, nb_segs %d, pkt_len %d"
+	      "\n%Ubuf_len %d, data_len %d, ol_flags 0x%x, data_off %d, phys_addr 0x%x"
+	      "\n%Upacket_type 0x%x",
+	      mb->port, mb->nb_segs, mb->pkt_len,
+	      format_white_space, indent,
+	      mb->buf_len, mb->data_len, mb->ol_flags, mb->data_off,
+	      mb->buf_physaddr, format_white_space, indent, mb->packet_type);
+
+  if (mb->ol_flags)
+    s = format (s, "\n%U%U", format_white_space, indent,
+		format_dpdk_pkt_offload_flags, &mb->ol_flags);
+
+  if ((mb->ol_flags & PKT_RX_VLAN_PKT) &&
+      ((mb->ol_flags & (PKT_RX_VLAN_STRIPPED | PKT_RX_QINQ_STRIPPED)) == 0))
+    {
+      ethernet_vlan_header_tv_t *vlan_hdr =
+	((ethernet_vlan_header_tv_t *) & (eth_hdr->type));
+      s = format (s, " %U", format_dpdk_rte_mbuf_vlan, vlan_hdr);
+    }
+
+  if (mb->packet_type)
+    s = format (s, "\n%U%U", format_white_space, indent,
+		format_dpdk_pkt_types, &mb->packet_type);
+
+  return s;
+}
+
+uword
+unformat_socket_mem (unformat_input_t * input, va_list * va)
+{
+  uword **r = va_arg (*va, uword **);
+  int i = 0;
+  u32 mem;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, ","))
+	hash_set (*r, i, 1024);
+      else if (unformat (input, "%u,", &mem))
+	hash_set (*r, i, mem);
+      else if (unformat (input, "%u", &mem))
+	hash_set (*r, i, mem);
+      else
+	{
+	  unformat_put_input (input);
+	  goto done;
+	}
+      i++;
+    }
+
+done:
+  return 1;
+}
+
+clib_error_t *
+unformat_rss_fn (unformat_input_t * input, uword * rss_fn)
+{
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (0)
+	;
+#undef _
+#define _(f, s)                                 \
+      else if (unformat (input, s))             \
+        *rss_fn |= f;
+
+      foreach_dpdk_rss_hf
+#undef _
+	else
+	{
+	  return clib_error_return (0, "unknown input `%U'",
+				    format_unformat_error, input);
+	}
+    }
+  return 0;
+}
+
+clib_error_t *
+unformat_hqos (unformat_input_t * input, dpdk_device_config_hqos_t * hqos)
+{
+  clib_error_t *error = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "hqos-thread %u", &hqos->hqos_thread))
+	hqos->hqos_thread_valid = 1;
+      else
+	{
+	  error = clib_error_return (0, "unknown input `%U'",
+				     format_unformat_error, input);
+	  break;
+	}
+    }
+
+  return error;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/hqos.c b/src/vnet/devices/dpdk/hqos.c
new file mode 100644
index 00000000..d68bc48f
--- /dev/null
+++ b/src/vnet/devices/dpdk/hqos.c
@@ -0,0 +1,775 @@
+/*
+ * Copyright(c) 2016 Intel Corporation. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/mount.h>
+#include <string.h>
+#include <fcntl.h>
+
+#include <vppinfra/vec.h>
+#include <vppinfra/error.h>
+#include <vppinfra/format.h>
+#include <vppinfra/bitmap.h>
+
+#include <vnet/vnet.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/devices/dpdk/dpdk.h>
+
+#include <vlib/unix/physmem.h>
+#include <vlib/pci/pci.h>
+#include <vlibmemory/api.h>
+#include <vlibmemory/vl_memory_msg_enum.h>	/* enumerate all vlib messages */
+
+#define vl_typedefs		/* define message structures */
+#include <vlibmemory/vl_memory_api_h.h>
+#undef vl_typedefs
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vlibmemory/vl_memory_api_h.h>
+#undef vl_printfun
+
+#include "dpdk_priv.h"
+
+dpdk_main_t dpdk_main;
+
+/***
+ *
+ * HQoS default configuration values
+ *
+ ***/
+
+static dpdk_device_config_hqos_t hqos_params_default = {
+  .hqos_thread_valid = 0,
+
+  .swq_size = 4096,
+  .burst_enq = 256,
+  .burst_deq = 220,
+
+  /*
+   * Packet field to identify the subport.
+   *
+   * Default value: Since only one subport is defined by default (see below:
+   *     n_subports_per_port = 1), the subport ID is hardcoded to 0.
+   */
+  .pktfield0_slabpos = 0,
+  .pktfield0_slabmask = 0,
+
+  /*
+   * Packet field to identify the pipe.
+   *
+   * Default value: Assuming Ethernet/IPv4/UDP packets, UDP payload bits 12 .. 23
+   */
+  .pktfield1_slabpos = 40,
+  .pktfield1_slabmask = 0x0000000FFF000000LLU,
+
+  /* Packet field used as index into TC translation table to identify the traffic
+   *     class and queue.
+   *
+   * Default value: Assuming Ethernet/IPv4 packets, IPv4 DSCP field
+   */
+  .pktfield2_slabpos = 8,
+  .pktfield2_slabmask = 0x00000000000000FCLLU,
+  .tc_table = {
+	       0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+	       0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+	       0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+	       0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+	       },
+
+  /* port */
+  .port = {
+	   .name = NULL,	/* Set at init */
+	   .socket = 0,		/* Set at init */
+	   .rate = 1250000000,	/* Assuming 10GbE port */
+	   .mtu = 14 + 1500,	/* Assuming Ethernet/IPv4 pkt (Ethernet FCS not included) */
+	   .frame_overhead = RTE_SCHED_FRAME_OVERHEAD_DEFAULT,
+	   .n_subports_per_port = 1,
+	   .n_pipes_per_subport = 4096,
+	   .qsize = {64, 64, 64, 64},
+	   .pipe_profiles = NULL,	/* Set at config */
+	   .n_pipe_profiles = 1,
+
+#ifdef RTE_SCHED_RED
+	   .red_params = {
+			  /* Traffic Class 0 Colors Green / Yellow / Red */
+			  [0][0] = {.min_th = 48,.max_th = 64,.maxp_inv =
+				    10,.wq_log2 = 9},
+			  [0][1] = {.min_th = 40,.max_th = 64,.maxp_inv =
+				    10,.wq_log2 = 9},
+			  [0][2] = {.min_th = 32,.max_th = 64,.maxp_inv =
+				    10,.wq_log2 = 9},
+
+			  /* Traffic Class 1 - Colors Green / Yellow / Red */
+			  [1][0] = {.min_th = 48,.max_th = 64,.maxp_inv =
+				    10,.wq_log2 = 9},
+			  [1][1] = {.min_th = 40,.max_th = 64,.maxp_inv =
+				    10,.wq_log2 = 9},
+			  [1][2] = {.min_th = 32,.max_th = 64,.maxp_inv =
+				    10,.wq_log2 = 9},
+
+			  /* Traffic Class 2 - Colors Green / Yellow / Red */
+			  [2][0] = {.min_th = 48,.max_th = 64,.maxp_inv =
+				    10,.wq_log2 = 9},
+			  [2][1] = {.min_th = 40,.max_th = 64,.maxp_inv =
+				    10,.wq_log2 = 9},
+			  [2][2] = {.min_th = 32,.max_th = 64,.maxp_inv =
+				    10,.wq_log2 = 9},
+
+			  /* Traffic Class 3 - Colors Green / Yellow / Red */
+			  [3][0] = {.min_th = 48,.max_th = 64,.maxp_inv =
+				    10,.wq_log2 = 9},
+			  [3][1] = {.min_th = 40,.max_th = 64,.maxp_inv =
+				    10,.wq_log2 = 9},
+			  [3][2] = {.min_th = 32,.max_th = 64,.maxp_inv =
+				    10,.wq_log2 = 9}
+			  },
+#endif /* RTE_SCHED_RED */
+	   },
+};
+
+static struct rte_sched_subport_params hqos_subport_params_default = {
+  .tb_rate = 1250000000,	/* 10GbE line rate (measured in bytes/second) */
+  .tb_size = 1000000,
+  .tc_rate = {1250000000, 1250000000, 1250000000, 1250000000},
+  .tc_period = 10,
+};
+
+static struct rte_sched_pipe_params hqos_pipe_params_default = {
+  .tb_rate = 305175,		/* 10GbE line rate divided by 4K pipes */
+  .tb_size = 1000000,
+  .tc_rate = {305175, 305175, 305175, 305175},
+  .tc_period = 40,
+#ifdef RTE_SCHED_SUBPORT_TC_OV
+  .tc_ov_weight = 1,
+#endif
+  .wrr_weights = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
+};
+
+/***
+ *
+ * HQoS configuration
+ *
+ ***/
+
+int
+dpdk_hqos_validate_mask (u64 mask, u32 n)
+{
+  int count = __builtin_popcountll (mask);
+  int pos_lead = sizeof (u64) * 8 - __builtin_clzll (mask);
+  int pos_trail = __builtin_ctzll (mask);
+  int count_expected = __builtin_popcount (n - 1);
+
+  /* Handle the exceptions */
+  if (n == 0)
+    return -1;			/* Error */
+
+  if ((mask == 0) && (n == 1))
+    return 0;			/* OK */
+
+  if (((mask == 0) && (n != 1)) || ((mask != 0) && (n == 1)))
+    return -2;			/* Error */
+
+  /* Check that mask is contiguous */
+  if ((pos_lead - pos_trail) != count)
+    return -3;			/* Error */
+
+  /* Check that mask contains the expected number of bits set */
+  if (count != count_expected)
+    return -4;			/* Error */
+
+  return 0;			/* OK */
+}
+
+void
+dpdk_device_config_hqos_pipe_profile_default (dpdk_device_config_hqos_t *
+					      hqos, u32 pipe_profile_id)
+{
+  memcpy (&hqos->pipe[pipe_profile_id], &hqos_pipe_params_default,
+	  sizeof (hqos_pipe_params_default));
+}
+
+void
+dpdk_device_config_hqos_default (dpdk_device_config_hqos_t * hqos)
+{
+  struct rte_sched_subport_params *subport_params;
+  struct rte_sched_pipe_params *pipe_params;
+  u32 *pipe_map;
+  u32 i;
+
+  memcpy (hqos, &hqos_params_default, sizeof (hqos_params_default));
+
+  /* pipe */
+  vec_add2 (hqos->pipe, pipe_params, hqos->port.n_pipe_profiles);
+
+  for (i = 0; i < vec_len (hqos->pipe); i++)
+    memcpy (&pipe_params[i],
+	    &hqos_pipe_params_default, sizeof (hqos_pipe_params_default));
+
+  hqos->port.pipe_profiles = hqos->pipe;
+
+  /* subport */
+  vec_add2 (hqos->subport, subport_params, hqos->port.n_subports_per_port);
+
+  for (i = 0; i < vec_len (hqos->subport); i++)
+    memcpy (&subport_params[i],
+	    &hqos_subport_params_default,
+	    sizeof (hqos_subport_params_default));
+
+  /* pipe profile */
+  vec_add2 (hqos->pipe_map,
+	    pipe_map,
+	    hqos->port.n_subports_per_port * hqos->port.n_pipes_per_subport);
+
+  for (i = 0; i < vec_len (hqos->pipe_map); i++)
+    pipe_map[i] = 0;
+}
+
+/***
+ *
+ * HQoS init
+ *
+ ***/
+
+clib_error_t *
+dpdk_port_setup_hqos (dpdk_device_t * xd, dpdk_device_config_hqos_t * hqos)
+{
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  char name[32];
+  u32 subport_id, i;
+  int rv;
+
+  /* Detect the set of worker threads */
+  int worker_thread_first = 0;
+  int worker_thread_count = 0;
+
+  uword *p = hash_get_mem (tm->thread_registrations_by_name, "workers");
+  vlib_thread_registration_t *tr =
+    p ? (vlib_thread_registration_t *) p[0] : 0;
+
+  if (tr && tr->count > 0)
+    {
+      worker_thread_first = tr->first_index;
+      worker_thread_count = tr->count;
+    }
+
+  /* Allocate the per-thread device data array */
+  vec_validate_aligned (xd->hqos_wt, tm->n_vlib_mains - 1,
+			CLIB_CACHE_LINE_BYTES);
+  memset (xd->hqos_wt, 0, tm->n_vlib_mains * sizeof (xd->hqos_wt[0]));
+
+  vec_validate_aligned (xd->hqos_ht, 0, CLIB_CACHE_LINE_BYTES);
+  memset (xd->hqos_ht, 0, sizeof (xd->hqos_ht[0]));
+
+  /* Allocate space for one SWQ per worker thread in the I/O TX thread data structure */
+  vec_validate (xd->hqos_ht->swq, worker_thread_count);
+
+  /* SWQ */
+  for (i = 0; i < worker_thread_count + 1; i++)
+    {
+      u32 swq_flags = RING_F_SP_ENQ | RING_F_SC_DEQ;
+
+      snprintf (name, sizeof (name), "SWQ-worker%u-to-device%u", i,
+		xd->device_index);
+      xd->hqos_ht->swq[i] =
+	rte_ring_create (name, hqos->swq_size, xd->cpu_socket, swq_flags);
+      if (xd->hqos_ht->swq[i] == NULL)
+	return clib_error_return (0,
+				  "SWQ-worker%u-to-device%u: rte_ring_create err",
+				  i, xd->device_index);
+    }
+
+  /*
+   * HQoS
+   */
+
+  /* HQoS port */
+  snprintf (name, sizeof (name), "HQoS%u", xd->device_index);
+  hqos->port.name = strdup (name);
+  if (hqos->port.name == NULL)
+    return clib_error_return (0, "HQoS%u: strdup err", xd->device_index);
+
+  hqos->port.socket = rte_eth_dev_socket_id (xd->device_index);
+  if (hqos->port.socket == SOCKET_ID_ANY)
+    hqos->port.socket = 0;
+
+  xd->hqos_ht->hqos = rte_sched_port_config (&hqos->port);
+  if (xd->hqos_ht->hqos == NULL)
+    return clib_error_return (0, "HQoS%u: rte_sched_port_config err",
+			      xd->device_index);
+
+  /* HQoS subport */
+  for (subport_id = 0; subport_id < hqos->port.n_subports_per_port;
+       subport_id++)
+    {
+      u32 pipe_id;
+
+      rv =
+	rte_sched_subport_config (xd->hqos_ht->hqos, subport_id,
+				  &hqos->subport[subport_id]);
+      if (rv)
+	return clib_error_return (0,
+				  "HQoS%u subport %u: rte_sched_subport_config err (%d)",
+				  xd->device_index, subport_id, rv);
+
+      /* HQoS pipe */
+      for (pipe_id = 0; pipe_id < hqos->port.n_pipes_per_subport; pipe_id++)
+	{
+	  u32 pos = subport_id * hqos->port.n_pipes_per_subport + pipe_id;
+	  u32 profile_id = hqos->pipe_map[pos];
+
+	  rv =
+	    rte_sched_pipe_config (xd->hqos_ht->hqos, subport_id, pipe_id,
+				   profile_id);
+	  if (rv)
+	    return clib_error_return (0,
+				      "HQoS%u subport %u pipe %u: rte_sched_pipe_config err (%d)",
+				      xd->device_index, subport_id, pipe_id,
+				      rv);
+	}
+    }
+
+  /* Set up per-thread device data for the I/O TX thread */
+  xd->hqos_ht->hqos_burst_enq = hqos->burst_enq;
+  xd->hqos_ht->hqos_burst_deq = hqos->burst_deq;
+  vec_validate (xd->hqos_ht->pkts_enq, 2 * hqos->burst_enq - 1);
+  vec_validate (xd->hqos_ht->pkts_deq, hqos->burst_deq - 1);
+  xd->hqos_ht->pkts_enq_len = 0;
+  xd->hqos_ht->swq_pos = 0;
+  xd->hqos_ht->flush_count = 0;
+
+  /* Set up per-thread device data for each worker thread */
+  for (i = 0; i < worker_thread_count + 1; i++)
+    {
+      u32 tid;
+      if (i)
+	tid = worker_thread_first + (i - 1);
+      else
+	tid = i;
+
+      xd->hqos_wt[tid].swq = xd->hqos_ht->swq[i];
+      xd->hqos_wt[tid].hqos_field0_slabpos = hqos->pktfield0_slabpos;
+      xd->hqos_wt[tid].hqos_field0_slabmask = hqos->pktfield0_slabmask;
+      xd->hqos_wt[tid].hqos_field0_slabshr =
+	__builtin_ctzll (hqos->pktfield0_slabmask);
+      xd->hqos_wt[tid].hqos_field1_slabpos = hqos->pktfield1_slabpos;
+      xd->hqos_wt[tid].hqos_field1_slabmask = hqos->pktfield1_slabmask;
+      xd->hqos_wt[tid].hqos_field1_slabshr =
+	__builtin_ctzll (hqos->pktfield1_slabmask);
+      xd->hqos_wt[tid].hqos_field2_slabpos = hqos->pktfield2_slabpos;
+      xd->hqos_wt[tid].hqos_field2_slabmask = hqos->pktfield2_slabmask;
+      xd->hqos_wt[tid].hqos_field2_slabshr =
+	__builtin_ctzll (hqos->pktfield2_slabmask);
+      memcpy (xd->hqos_wt[tid].hqos_tc_table, hqos->tc_table,
+	      sizeof (hqos->tc_table));
+    }
+
+  return 0;
+}
+
+/***
+ *
+ * HQoS run-time
+ *
+ ***/
+/*
+ * dpdk_hqos_thread - Contains the main loop of an HQoS thread.
+ *
+ * w
+ *     Information for the current thread
+ */
+static_always_inline void
+dpdk_hqos_thread_internal_hqos_dbg_bypass (vlib_main_t * vm)
+{
+  dpdk_main_t *dm = &dpdk_main;
+  u32 cpu_index = vm->cpu_index;
+  u32 dev_pos;
+
+  dev_pos = 0;
+  while (1)
+    {
+      vlib_worker_thread_barrier_check ();
+
+      u32 n_devs = vec_len (dm->devices_by_hqos_cpu[cpu_index]);
+      if (dev_pos >= n_devs)
+	dev_pos = 0;
+
+      dpdk_device_and_queue_t *dq =
+	vec_elt_at_index (dm->devices_by_hqos_cpu[cpu_index], dev_pos);
+      dpdk_device_t *xd = vec_elt_at_index (dm->devices, dq->device);
+
+      dpdk_device_hqos_per_hqos_thread_t *hqos = xd->hqos_ht;
+      u32 device_index = xd->device_index;
+      u16 queue_id = dq->queue_id;
+
+      struct rte_mbuf **pkts_enq = hqos->pkts_enq;
+      u32 pkts_enq_len = hqos->pkts_enq_len;
+      u32 swq_pos = hqos->swq_pos;
+      u32 n_swq = vec_len (hqos->swq), i;
+      u32 flush_count = hqos->flush_count;
+
+      for (i = 0; i < n_swq; i++)
+	{
+	  /* Get current SWQ for this device */
+	  struct rte_ring *swq = hqos->swq[swq_pos];
+
+	  /* Read SWQ burst to packet buffer of this device */
+	  pkts_enq_len += rte_ring_sc_dequeue_burst (swq,
+						     (void **)
+						     &pkts_enq[pkts_enq_len],
+						     hqos->hqos_burst_enq);
+
+	  /* Get next SWQ for this device */
+	  swq_pos++;
+	  if (swq_pos >= n_swq)
+	    swq_pos = 0;
+	  hqos->swq_pos = swq_pos;
+
+	  /* HWQ TX enqueue when burst available */
+	  if (pkts_enq_len >= hqos->hqos_burst_enq)
+	    {
+	      u32 n_pkts = rte_eth_tx_burst (device_index,
+					     (uint16_t) queue_id,
+					     pkts_enq,
+					     (uint16_t) pkts_enq_len);
+
+	      for (; n_pkts < pkts_enq_len; n_pkts++)
+		rte_pktmbuf_free (pkts_enq[n_pkts]);
+
+	      pkts_enq_len = 0;
+	      flush_count = 0;
+	      break;
+	    }
+	}
+      if (pkts_enq_len)
+	{
+	  flush_count++;
+	  if (PREDICT_FALSE (flush_count == HQOS_FLUSH_COUNT_THRESHOLD))
+	    {
+	      rte_sched_port_enqueue (hqos->hqos, pkts_enq, pkts_enq_len);
+
+	      pkts_enq_len = 0;
+	      flush_count = 0;
+	    }
+	}
+      hqos->pkts_enq_len = pkts_enq_len;
+      hqos->flush_count = flush_count;
+
+      /* Advance to next device */
+      dev_pos++;
+    }
+}
+
+static_always_inline void
+dpdk_hqos_thread_internal (vlib_main_t * vm)
+{
+  dpdk_main_t *dm = &dpdk_main;
+  u32 cpu_index = vm->cpu_index;
+  u32 dev_pos;
+
+  dev_pos = 0;
+  while (1)
+    {
+      vlib_worker_thread_barrier_check ();
+
+      u32 n_devs = vec_len (dm->devices_by_hqos_cpu[cpu_index]);
+      if (PREDICT_FALSE (n_devs == 0))
+	{
+	  dev_pos = 0;
+	  continue;
+	}
+      if (dev_pos >= n_devs)
+	dev_pos = 0;
+
+      dpdk_device_and_queue_t *dq =
+	vec_elt_at_index (dm->devices_by_hqos_cpu[cpu_index], dev_pos);
+      dpdk_device_t *xd = vec_elt_at_index (dm->devices, dq->device);
+
+      dpdk_device_hqos_per_hqos_thread_t *hqos = xd->hqos_ht;
+      u32 device_index = xd->device_index;
+      u16 queue_id = dq->queue_id;
+
+      struct rte_mbuf **pkts_enq = hqos->pkts_enq;
+      struct rte_mbuf **pkts_deq = hqos->pkts_deq;
+      u32 pkts_enq_len = hqos->pkts_enq_len;
+      u32 swq_pos = hqos->swq_pos;
+      u32 n_swq = vec_len (hqos->swq), i;
+      u32 flush_count = hqos->flush_count;
+
+      /*
+       * SWQ dequeue and HQoS enqueue for current device
+       */
+      for (i = 0; i < n_swq; i++)
+	{
+	  /* Get current SWQ for this device */
+	  struct rte_ring *swq = hqos->swq[swq_pos];
+
+	  /* Read SWQ burst to packet buffer of this device */
+	  pkts_enq_len += rte_ring_sc_dequeue_burst (swq,
+						     (void **)
+						     &pkts_enq[pkts_enq_len],
+						     hqos->hqos_burst_enq);
+
+	  /* Get next SWQ for this device */
+	  swq_pos++;
+	  if (swq_pos >= n_swq)
+	    swq_pos = 0;
+	  hqos->swq_pos = swq_pos;
+
+	  /* HQoS enqueue when burst available */
+	  if (pkts_enq_len >= hqos->hqos_burst_enq)
+	    {
+	      rte_sched_port_enqueue (hqos->hqos, pkts_enq, pkts_enq_len);
+
+	      pkts_enq_len = 0;
+	      flush_count = 0;
+	      break;
+	    }
+	}
+      if (pkts_enq_len)
+	{
+	  flush_count++;
+	  if (PREDICT_FALSE (flush_count == HQOS_FLUSH_COUNT_THRESHOLD))
+	    {
+	      rte_sched_port_enqueue (hqos->hqos, pkts_enq, pkts_enq_len);
+
+	      pkts_enq_len = 0;
+	      flush_count = 0;
+	    }
+	}
+      hqos->pkts_enq_len = pkts_enq_len;
+      hqos->flush_count = flush_count;
+
+      /*
+       * HQoS dequeue and HWQ TX enqueue for current device
+       */
+      {
+	u32 pkts_deq_len, n_pkts;
+
+	pkts_deq_len = rte_sched_port_dequeue (hqos->hqos,
+					       pkts_deq,
+					       hqos->hqos_burst_deq);
+
+	for (n_pkts = 0; n_pkts < pkts_deq_len;)
+	  n_pkts += rte_eth_tx_burst (device_index,
+				      (uint16_t) queue_id,
+				      &pkts_deq[n_pkts],
+				      (uint16_t) (pkts_deq_len - n_pkts));
+      }
+
+      /* Advance to next device */
+      dev_pos++;
+    }
+}
+
+void
+dpdk_hqos_thread (vlib_worker_thread_t * w)
+{
+  vlib_main_t *vm;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  dpdk_main_t *dm = &dpdk_main;
+
+  vm = vlib_get_main ();
+
+  ASSERT (vm->cpu_index == os_get_cpu_number ());
+
+  clib_time_init (&vm->clib_time);
+  clib_mem_set_heap (w->thread_mheap);
+
+  /* Wait until the dpdk init sequence is complete */
+  while (tm->worker_thread_release == 0)
+    vlib_worker_thread_barrier_check ();
+
+  if (vec_len (dm->devices_by_hqos_cpu[vm->cpu_index]) == 0)
+    return
+      clib_error
+      ("current I/O TX thread does not have any devices assigned to it");
+
+  if (DPDK_HQOS_DBG_BYPASS)
+    dpdk_hqos_thread_internal_hqos_dbg_bypass (vm);
+  else
+    dpdk_hqos_thread_internal (vm);
+}
+
+void
+dpdk_hqos_thread_fn (void *arg)
+{
+  vlib_worker_thread_t *w = (vlib_worker_thread_t *) arg;
+  vlib_worker_thread_init (w);
+  dpdk_hqos_thread (w);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_THREAD (hqos_thread_reg, static) =
+{
+  .name = "hqos-threads",
+  .short_name = "hqos-threads",
+  .function = dpdk_hqos_thread_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * HQoS run-time code to be called by the worker threads
+ */
+#define BITFIELD(byte_array, slab_pos, slab_mask, slab_shr)     \
+({                                                              \
+  u64 slab = *((u64 *) &byte_array[slab_pos]);                  \
+  u64 val = (rte_be_to_cpu_64(slab) & slab_mask) >> slab_shr;   \
+  val;                                                          \
+})
+
+#define RTE_SCHED_PORT_HIERARCHY(subport, pipe, traffic_class, queue, color) \
+  ((((u64) (queue)) & 0x3) |                               \
+  ((((u64) (traffic_class)) & 0x3) << 2) |                 \
+  ((((u64) (color)) & 0x3) << 4) |                         \
+  ((((u64) (subport)) & 0xFFFF) << 16) |                   \
+  ((((u64) (pipe)) & 0xFFFFFFFF) << 32))
+
+void
+dpdk_hqos_metadata_set (dpdk_device_hqos_per_worker_thread_t * hqos,
+			struct rte_mbuf **pkts, u32 n_pkts)
+{
+  u32 i;
+
+  for (i = 0; i < (n_pkts & (~0x3)); i += 4)
+    {
+      struct rte_mbuf *pkt0 = pkts[i];
+      struct rte_mbuf *pkt1 = pkts[i + 1];
+      struct rte_mbuf *pkt2 = pkts[i + 2];
+      struct rte_mbuf *pkt3 = pkts[i + 3];
+
+      u8 *pkt0_data = rte_pktmbuf_mtod (pkt0, u8 *);
+      u8 *pkt1_data = rte_pktmbuf_mtod (pkt1, u8 *);
+      u8 *pkt2_data = rte_pktmbuf_mtod (pkt2, u8 *);
+      u8 *pkt3_data = rte_pktmbuf_mtod (pkt3, u8 *);
+
+      u64 pkt0_subport = BITFIELD (pkt0_data, hqos->hqos_field0_slabpos,
+				   hqos->hqos_field0_slabmask,
+				   hqos->hqos_field0_slabshr);
+      u64 pkt0_pipe = BITFIELD (pkt0_data, hqos->hqos_field1_slabpos,
+				hqos->hqos_field1_slabmask,
+				hqos->hqos_field1_slabshr);
+      u64 pkt0_dscp = BITFIELD (pkt0_data, hqos->hqos_field2_slabpos,
+				hqos->hqos_field2_slabmask,
+				hqos->hqos_field2_slabshr);
+      u32 pkt0_tc = hqos->hqos_tc_table[pkt0_dscp & 0x3F] >> 2;
+      u32 pkt0_tc_q = hqos->hqos_tc_table[pkt0_dscp & 0x3F] & 0x3;
+
+      u64 pkt1_subport = BITFIELD (pkt1_data, hqos->hqos_field0_slabpos,
+				   hqos->hqos_field0_slabmask,
+				   hqos->hqos_field0_slabshr);
+      u64 pkt1_pipe = BITFIELD (pkt1_data, hqos->hqos_field1_slabpos,
+				hqos->hqos_field1_slabmask,
+				hqos->hqos_field1_slabshr);
+      u64 pkt1_dscp = BITFIELD (pkt1_data, hqos->hqos_field2_slabpos,
+				hqos->hqos_field2_slabmask,
+				hqos->hqos_field2_slabshr);
+      u32 pkt1_tc = hqos->hqos_tc_table[pkt1_dscp & 0x3F] >> 2;
+      u32 pkt1_tc_q = hqos->hqos_tc_table[pkt1_dscp & 0x3F] & 0x3;
+
+      u64 pkt2_subport = BITFIELD (pkt2_data, hqos->hqos_field0_slabpos,
+				   hqos->hqos_field0_slabmask,
+				   hqos->hqos_field0_slabshr);
+      u64 pkt2_pipe = BITFIELD (pkt2_data, hqos->hqos_field1_slabpos,
+				hqos->hqos_field1_slabmask,
+				hqos->hqos_field1_slabshr);
+      u64 pkt2_dscp = BITFIELD (pkt2_data, hqos->hqos_field2_slabpos,
+				hqos->hqos_field2_slabmask,
+				hqos->hqos_field2_slabshr);
+      u32 pkt2_tc = hqos->hqos_tc_table[pkt2_dscp & 0x3F] >> 2;
+      u32 pkt2_tc_q = hqos->hqos_tc_table[pkt2_dscp & 0x3F] & 0x3;
+
+      u64 pkt3_subport = BITFIELD (pkt3_data, hqos->hqos_field0_slabpos,
+				   hqos->hqos_field0_slabmask,
+				   hqos->hqos_field0_slabshr);
+      u64 pkt3_pipe = BITFIELD (pkt3_data, hqos->hqos_field1_slabpos,
+				hqos->hqos_field1_slabmask,
+				hqos->hqos_field1_slabshr);
+      u64 pkt3_dscp = BITFIELD (pkt3_data, hqos->hqos_field2_slabpos,
+				hqos->hqos_field2_slabmask,
+				hqos->hqos_field2_slabshr);
+      u32 pkt3_tc = hqos->hqos_tc_table[pkt3_dscp & 0x3F] >> 2;
+      u32 pkt3_tc_q = hqos->hqos_tc_table[pkt3_dscp & 0x3F] & 0x3;
+
+      u64 pkt0_sched = RTE_SCHED_PORT_HIERARCHY (pkt0_subport,
+						 pkt0_pipe,
+						 pkt0_tc,
+						 pkt0_tc_q,
+						 0);
+      u64 pkt1_sched = RTE_SCHED_PORT_HIERARCHY (pkt1_subport,
+						 pkt1_pipe,
+						 pkt1_tc,
+						 pkt1_tc_q,
+						 0);
+      u64 pkt2_sched = RTE_SCHED_PORT_HIERARCHY (pkt2_subport,
+						 pkt2_pipe,
+						 pkt2_tc,
+						 pkt2_tc_q,
+						 0);
+      u64 pkt3_sched = RTE_SCHED_PORT_HIERARCHY (pkt3_subport,
+						 pkt3_pipe,
+						 pkt3_tc,
+						 pkt3_tc_q,
+						 0);
+
+      pkt0->hash.sched.lo = pkt0_sched & 0xFFFFFFFF;
+      pkt0->hash.sched.hi = pkt0_sched >> 32;
+      pkt1->hash.sched.lo = pkt1_sched & 0xFFFFFFFF;
+      pkt1->hash.sched.hi = pkt1_sched >> 32;
+      pkt2->hash.sched.lo = pkt2_sched & 0xFFFFFFFF;
+      pkt2->hash.sched.hi = pkt2_sched >> 32;
+      pkt3->hash.sched.lo = pkt3_sched & 0xFFFFFFFF;
+      pkt3->hash.sched.hi = pkt3_sched >> 32;
+    }
+
+  for (; i < n_pkts; i++)
+    {
+      struct rte_mbuf *pkt = pkts[i];
+
+      u8 *pkt_data = rte_pktmbuf_mtod (pkt, u8 *);
+
+      u64 pkt_subport = BITFIELD (pkt_data, hqos->hqos_field0_slabpos,
+				  hqos->hqos_field0_slabmask,
+				  hqos->hqos_field0_slabshr);
+      u64 pkt_pipe = BITFIELD (pkt_data, hqos->hqos_field1_slabpos,
+			       hqos->hqos_field1_slabmask,
+			       hqos->hqos_field1_slabshr);
+      u64 pkt_dscp = BITFIELD (pkt_data, hqos->hqos_field2_slabpos,
+			       hqos->hqos_field2_slabmask,
+			       hqos->hqos_field2_slabshr);
+      u32 pkt_tc = hqos->hqos_tc_table[pkt_dscp & 0x3F] >> 2;
+      u32 pkt_tc_q = hqos->hqos_tc_table[pkt_dscp & 0x3F] & 0x3;
+
+      u64 pkt_sched = RTE_SCHED_PORT_HIERARCHY (pkt_subport,
+						pkt_pipe,
+						pkt_tc,
+						pkt_tc_q,
+						0);
+
+      pkt->hash.sched.lo = pkt_sched & 0xFFFFFFFF;
+      pkt->hash.sched.hi = pkt_sched >> 32;
+    }
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/init.c b/src/vnet/devices/dpdk/init.c
new file mode 100755
index 00000000..693ca985
--- /dev/null
+++ b/src/vnet/devices/dpdk/init.c
@@ -0,0 +1,1803 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/vnet.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/error.h>
+#include <vppinfra/format.h>
+#include <vppinfra/bitmap.h>
+
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/devices/dpdk/dpdk.h>
+#include <vlib/unix/physmem.h>
+#include <vlib/pci/pci.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/mount.h>
+#include <string.h>
+#include <fcntl.h>
+
+#include "dpdk_priv.h"
+
+dpdk_main_t dpdk_main;
+
+/* force linker to link functions used by vlib and declared weak */
+void *vlib_weakly_linked_functions[] = {
+  &rte_pktmbuf_init,
+  &rte_pktmbuf_pool_init,
+};
+
+#define LINK_STATE_ELOGS	0
+
+#define DEFAULT_HUGE_DIR "/run/vpp/hugepages"
+#define VPP_RUN_DIR "/run/vpp"
+
+/* Port configuration, mildly modified Intel app values */
+
+static struct rte_eth_conf port_conf_template = {
+  .rxmode = {
+	     .split_hdr_size = 0,
+	     .header_split = 0,		/**< Header Split disabled */
+	     .hw_ip_checksum = 0,	/**< IP checksum offload disabled */
+	     .hw_vlan_filter = 0,	/**< VLAN filtering disabled */
+	     .hw_strip_crc = 0,		/**< CRC stripped by hardware */
+	     },
+  .txmode = {
+	     .mq_mode = ETH_MQ_TX_NONE,
+	     },
+};
+
+clib_error_t *
+dpdk_port_setup (dpdk_main_t * dm, dpdk_device_t * xd)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  int rv;
+  int j;
+
+  ASSERT (os_get_cpu_number () == 0);
+
+  if (xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP)
+    {
+      vnet_hw_interface_set_flags (dm->vnet_main, xd->vlib_hw_if_index, 0);
+      rte_eth_dev_stop (xd->device_index);
+    }
+
+  rv = rte_eth_dev_configure (xd->device_index, xd->rx_q_used,
+			      xd->tx_q_used, &xd->port_conf);
+
+  if (rv < 0)
+    return clib_error_return (0, "rte_eth_dev_configure[%d]: err %d",
+			      xd->device_index, rv);
+
+  /* Set up one TX-queue per worker thread */
+  for (j = 0; j < xd->tx_q_used; j++)
+    {
+      rv = rte_eth_tx_queue_setup (xd->device_index, j, xd->nb_tx_desc,
+				   xd->cpu_socket, &xd->tx_conf);
+
+      /* retry with any other CPU socket */
+      if (rv < 0)
+	rv = rte_eth_tx_queue_setup (xd->device_index, j, xd->nb_tx_desc,
+				     SOCKET_ID_ANY, &xd->tx_conf);
+      if (rv < 0)
+	break;
+    }
+
+  if (rv < 0)
+    return clib_error_return (0, "rte_eth_tx_queue_setup[%d]: err %d",
+			      xd->device_index, rv);
+
+  for (j = 0; j < xd->rx_q_used; j++)
+    {
+
+      rv = rte_eth_rx_queue_setup (xd->device_index, j, xd->nb_rx_desc,
+				   xd->cpu_socket, 0,
+				   bm->
+				   pktmbuf_pools[xd->cpu_socket_id_by_queue
+						 [j]]);
+
+      /* retry with any other CPU socket */
+      if (rv < 0)
+	rv = rte_eth_rx_queue_setup (xd->device_index, j, xd->nb_rx_desc,
+				     SOCKET_ID_ANY, 0,
+				     bm->
+				     pktmbuf_pools[xd->cpu_socket_id_by_queue
+						   [j]]);
+      if (rv < 0)
+	return clib_error_return (0, "rte_eth_rx_queue_setup[%d]: err %d",
+				  xd->device_index, rv);
+    }
+
+  if (xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP)
+    {
+      int rv;
+      rv = rte_eth_dev_start (xd->device_index);
+      if (rv < 0)
+	clib_warning ("rte_eth_dev_start %d returned %d",
+		      xd->device_index, rv);
+    }
+  return 0;
+}
+
+static u32
+dpdk_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, u32 flags)
+{
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_t *xd = vec_elt_at_index (dm->devices, hi->dev_instance);
+  u32 old = 0;
+
+  if (ETHERNET_INTERFACE_FLAG_CONFIG_PROMISC (flags))
+    {
+      old = (xd->flags & DPDK_DEVICE_FLAG_PROMISC) != 0;
+
+      if (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL)
+	xd->flags |= DPDK_DEVICE_FLAG_PROMISC;
+      else
+	xd->flags &= ~DPDK_DEVICE_FLAG_PROMISC;
+
+      if (xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP)
+	{
+	  if (xd->flags & DPDK_DEVICE_FLAG_PROMISC)
+	    rte_eth_promiscuous_enable (xd->device_index);
+	  else
+	    rte_eth_promiscuous_disable (xd->device_index);
+	}
+    }
+  else if (ETHERNET_INTERFACE_FLAG_CONFIG_MTU (flags))
+    {
+      /*
+       * DAW-FIXME: The Cisco VIC firmware does not provide an api for a
+       *            driver to dynamically change the mtu.  If/when the
+       *            VIC firmware gets fixed, then this should be removed.
+       */
+      if (xd->pmd == VNET_DPDK_PMD_ENIC)
+	{
+	  struct rte_eth_dev_info dev_info;
+
+	  /*
+	   * Restore mtu to what has been set by CIMC in the firmware cfg.
+	   */
+	  rte_eth_dev_info_get (xd->device_index, &dev_info);
+	  hi->max_packet_bytes = dev_info.max_rx_pktlen;
+
+	  vlib_cli_output (vlib_get_main (),
+			   "Cisco VIC mtu can only be changed "
+			   "using CIMC then rebooting the server!");
+	}
+      else
+	{
+	  int rv;
+
+	  xd->port_conf.rxmode.max_rx_pkt_len = hi->max_packet_bytes;
+
+	  if (xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP)
+	    rte_eth_dev_stop (xd->device_index);
+
+	  rv = rte_eth_dev_configure
+	    (xd->device_index, xd->rx_q_used, xd->tx_q_used, &xd->port_conf);
+
+	  if (rv < 0)
+	    vlib_cli_output (vlib_get_main (),
+			     "rte_eth_dev_configure[%d]: err %d",
+			     xd->device_index, rv);
+
+	  rte_eth_dev_set_mtu (xd->device_index, hi->max_packet_bytes);
+
+	  if (xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP)
+	    {
+	      int rv = rte_eth_dev_start (xd->device_index);
+	      if (rv < 0)
+		clib_warning ("rte_eth_dev_start %d returned %d",
+			      xd->device_index, rv);
+	    }
+	}
+    }
+  return old;
+}
+
+void
+dpdk_device_lock_init (dpdk_device_t * xd)
+{
+  int q;
+  vec_validate (xd->lockp, xd->tx_q_used - 1);
+  for (q = 0; q < xd->tx_q_used; q++)
+    {
+      xd->lockp[q] = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
+					     CLIB_CACHE_LINE_BYTES);
+      memset ((void *) xd->lockp[q], 0, CLIB_CACHE_LINE_BYTES);
+    }
+}
+
+void
+dpdk_device_lock_free (dpdk_device_t * xd)
+{
+  int q;
+
+  for (q = 0; q < vec_len (xd->lockp); q++)
+    clib_mem_free ((void *) xd->lockp[q]);
+  vec_free (xd->lockp);
+  xd->lockp = 0;
+}
+
+static clib_error_t *
+dpdk_lib_init (dpdk_main_t * dm)
+{
+  u32 nports;
+  u32 nb_desc = 0;
+  int i;
+  clib_error_t *error;
+  vlib_main_t *vm = vlib_get_main ();
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  vnet_sw_interface_t *sw;
+  vnet_hw_interface_t *hi;
+  dpdk_device_t *xd;
+  vlib_pci_addr_t last_pci_addr;
+  u32 last_pci_addr_port = 0;
+  vlib_thread_registration_t *tr, *tr_hqos;
+  uword *p, *p_hqos;
+
+  u32 next_cpu = 0, next_hqos_cpu = 0;
+  u8 af_packet_port_id = 0;
+  last_pci_addr.as_u32 = ~0;
+
+  dm->input_cpu_first_index = 0;
+  dm->input_cpu_count = 1;
+
+  /* find out which cpus will be used for input */
+  p = hash_get_mem (tm->thread_registrations_by_name, "workers");
+  tr = p ? (vlib_thread_registration_t *) p[0] : 0;
+
+  if (tr && tr->count > 0)
+    {
+      dm->input_cpu_first_index = tr->first_index;
+      dm->input_cpu_count = tr->count;
+    }
+
+  vec_validate_aligned (dm->devices_by_cpu, tm->n_vlib_mains - 1,
+			CLIB_CACHE_LINE_BYTES);
+
+  vec_validate_aligned (dm->workers, tm->n_vlib_mains - 1,
+			CLIB_CACHE_LINE_BYTES);
+
+  dm->hqos_cpu_first_index = 0;
+  dm->hqos_cpu_count = 0;
+
+  /* find out which cpus will be used for I/O TX */
+  p_hqos = hash_get_mem (tm->thread_registrations_by_name, "hqos-threads");
+  tr_hqos = p_hqos ? (vlib_thread_registration_t *) p_hqos[0] : 0;
+
+  if (tr_hqos && tr_hqos->count > 0)
+    {
+      dm->hqos_cpu_first_index = tr_hqos->first_index;
+      dm->hqos_cpu_count = tr_hqos->count;
+    }
+
+  vec_validate_aligned (dm->devices_by_hqos_cpu, tm->n_vlib_mains - 1,
+			CLIB_CACHE_LINE_BYTES);
+
+  vec_validate_aligned (dm->hqos_threads, tm->n_vlib_mains - 1,
+			CLIB_CACHE_LINE_BYTES);
+
+  nports = rte_eth_dev_count ();
+  if (nports < 1)
+    {
+      clib_warning ("DPDK drivers found no ports...");
+    }
+
+  if (CLIB_DEBUG > 0)
+    clib_warning ("DPDK drivers found %d ports...", nports);
+
+  /*
+   * All buffers are all allocated from the same rte_mempool.
+   * Thus they all have the same number of data bytes.
+   */
+  dm->vlib_buffer_free_list_index =
+    vlib_buffer_get_or_create_free_list (vm,
+					 VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES,
+					 "dpdk rx");
+
+  if (dm->conf->enable_tcp_udp_checksum)
+    dm->buffer_flags_template &= ~(IP_BUFFER_L4_CHECKSUM_CORRECT
+				   | IP_BUFFER_L4_CHECKSUM_COMPUTED);
+
+  for (i = 0; i < nports; i++)
+    {
+      u8 addr[6];
+      u8 vlan_strip = 0;
+      int j;
+      struct rte_eth_dev_info dev_info;
+      clib_error_t *rv;
+      struct rte_eth_link l;
+      dpdk_device_config_t *devconf = 0;
+      vlib_pci_addr_t pci_addr;
+      uword *p = 0;
+
+      rte_eth_dev_info_get (i, &dev_info);
+      if (dev_info.pci_dev)	/* bonded interface has no pci info */
+	{
+	  pci_addr.domain = dev_info.pci_dev->addr.domain;
+	  pci_addr.bus = dev_info.pci_dev->addr.bus;
+	  pci_addr.slot = dev_info.pci_dev->addr.devid;
+	  pci_addr.function = dev_info.pci_dev->addr.function;
+	  p =
+	    hash_get (dm->conf->device_config_index_by_pci_addr,
+		      pci_addr.as_u32);
+	}
+
+      if (p)
+	devconf = pool_elt_at_index (dm->conf->dev_confs, p[0]);
+      else
+	devconf = &dm->conf->default_devconf;
+
+      /* Create vnet interface */
+      vec_add2_aligned (dm->devices, xd, 1, CLIB_CACHE_LINE_BYTES);
+      xd->nb_rx_desc = DPDK_NB_RX_DESC_DEFAULT;
+      xd->nb_tx_desc = DPDK_NB_TX_DESC_DEFAULT;
+      xd->cpu_socket = (i8) rte_eth_dev_socket_id (i);
+
+      /* Handle interface naming for devices with multiple ports sharing same PCI ID */
+      if (dev_info.pci_dev)
+	{
+	  struct rte_eth_dev_info di = { 0 };
+	  rte_eth_dev_info_get (i + 1, &di);
+	  if (di.pci_dev && pci_addr.as_u32 != last_pci_addr.as_u32 &&
+	      memcmp (&dev_info.pci_dev->addr, &di.pci_dev->addr,
+		      sizeof (struct rte_pci_addr)) == 0)
+	    {
+	      xd->interface_name_suffix = format (0, "0");
+	      last_pci_addr.as_u32 = pci_addr.as_u32;
+	      last_pci_addr_port = i;
+	    }
+	  else if (pci_addr.as_u32 == last_pci_addr.as_u32)
+	    {
+	      xd->interface_name_suffix =
+		format (0, "%u", i - last_pci_addr_port);
+	    }
+	  else
+	    {
+	      last_pci_addr.as_u32 = ~0;
+	    }
+	}
+      else
+	last_pci_addr.as_u32 = ~0;
+
+      clib_memcpy (&xd->tx_conf, &dev_info.default_txconf,
+		   sizeof (struct rte_eth_txconf));
+      if (dm->conf->no_multi_seg)
+	{
+	  xd->tx_conf.txq_flags |= ETH_TXQ_FLAGS_NOMULTSEGS;
+	  port_conf_template.rxmode.jumbo_frame = 0;
+	}
+      else
+	{
+	  xd->tx_conf.txq_flags &= ~ETH_TXQ_FLAGS_NOMULTSEGS;
+	  port_conf_template.rxmode.jumbo_frame = 1;
+	  xd->flags |= DPDK_DEVICE_FLAG_MAYBE_MULTISEG;
+	}
+
+      clib_memcpy (&xd->port_conf, &port_conf_template,
+		   sizeof (struct rte_eth_conf));
+
+      xd->tx_q_used = clib_min (dev_info.max_tx_queues, tm->n_vlib_mains);
+
+      if (devconf->num_tx_queues > 0
+	  && devconf->num_tx_queues < xd->tx_q_used)
+	xd->tx_q_used = clib_min (xd->tx_q_used, devconf->num_tx_queues);
+
+      if (devconf->num_rx_queues > 1 && dm->use_rss == 0)
+	{
+	  dm->use_rss = 1;
+	}
+
+      if (devconf->num_rx_queues > 1
+	  && dev_info.max_rx_queues >= devconf->num_rx_queues)
+	{
+	  xd->rx_q_used = devconf->num_rx_queues;
+	  xd->port_conf.rxmode.mq_mode = ETH_MQ_RX_RSS;
+	  if (devconf->rss_fn == 0)
+	    xd->port_conf.rx_adv_conf.rss_conf.rss_hf =
+	      ETH_RSS_IP | ETH_RSS_UDP | ETH_RSS_TCP;
+	  else
+	    xd->port_conf.rx_adv_conf.rss_conf.rss_hf = devconf->rss_fn;
+	}
+      else
+	xd->rx_q_used = 1;
+
+      xd->flags |= DPDK_DEVICE_FLAG_PMD;
+
+      /* workaround for drivers not setting driver_name */
+      if ((!dev_info.driver_name) && (dev_info.pci_dev))
+#if RTE_VERSION < RTE_VERSION_NUM(16, 11, 0, 0)
+	dev_info.driver_name = dev_info.pci_dev->driver->name;
+#else
+	dev_info.driver_name = dev_info.pci_dev->driver->driver.name;
+#endif
+      ASSERT (dev_info.driver_name);
+
+      if (!xd->pmd)
+	{
+
+
+#define _(s,f) else if (dev_info.driver_name &&                 \
+                        !strcmp(dev_info.driver_name, s))       \
+                 xd->pmd = VNET_DPDK_PMD_##f;
+	  if (0)
+	    ;
+	  foreach_dpdk_pmd
+#undef _
+	    else
+	    xd->pmd = VNET_DPDK_PMD_UNKNOWN;
+
+	  xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN;
+	  xd->nb_rx_desc = DPDK_NB_RX_DESC_DEFAULT;
+	  xd->nb_tx_desc = DPDK_NB_TX_DESC_DEFAULT;
+
+	  switch (xd->pmd)
+	    {
+	      /* 1G adapters */
+	    case VNET_DPDK_PMD_E1000EM:
+	    case VNET_DPDK_PMD_IGB:
+	    case VNET_DPDK_PMD_IGBVF:
+	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_1G;
+	      break;
+
+	      /* 10G adapters */
+	    case VNET_DPDK_PMD_IXGBE:
+	    case VNET_DPDK_PMD_IXGBEVF:
+	    case VNET_DPDK_PMD_THUNDERX:
+	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G;
+	      break;
+	    case VNET_DPDK_PMD_DPAA2:
+	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G;
+	      break;
+
+	      /* Cisco VIC */
+	    case VNET_DPDK_PMD_ENIC:
+	      rte_eth_link_get_nowait (i, &l);
+	      xd->flags |= DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE;
+	      if (l.link_speed == 40000)
+		xd->port_type = VNET_DPDK_PORT_TYPE_ETH_40G;
+	      else
+		xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G;
+	      break;
+
+	      /* Intel Fortville */
+	    case VNET_DPDK_PMD_I40E:
+	    case VNET_DPDK_PMD_I40EVF:
+	      xd->flags |= DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE;
+	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_40G;
+
+	      switch (dev_info.pci_dev->id.device_id)
+		{
+		case I40E_DEV_ID_10G_BASE_T:
+		case I40E_DEV_ID_SFP_XL710:
+		  xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G;
+		  break;
+		case I40E_DEV_ID_QSFP_A:
+		case I40E_DEV_ID_QSFP_B:
+		case I40E_DEV_ID_QSFP_C:
+		  xd->port_type = VNET_DPDK_PORT_TYPE_ETH_40G;
+		  break;
+		case I40E_DEV_ID_VF:
+		  rte_eth_link_get_nowait (i, &l);
+		  xd->port_type = l.link_speed == 10000 ?
+		    VNET_DPDK_PORT_TYPE_ETH_10G : VNET_DPDK_PORT_TYPE_ETH_40G;
+		  break;
+		default:
+		  xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN;
+		}
+	      break;
+
+	    case VNET_DPDK_PMD_CXGBE:
+	      switch (dev_info.pci_dev->id.device_id)
+		{
+		case 0x540d:	/* T580-CR */
+		case 0x5410:	/* T580-LP-cr */
+		  xd->port_type = VNET_DPDK_PORT_TYPE_ETH_40G;
+		  break;
+		case 0x5403:	/* T540-CR */
+		  xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G;
+		  break;
+		default:
+		  xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN;
+		}
+	      break;
+
+	    case VNET_DPDK_PMD_MLX5:
+	      {
+		char *pn_100g[] = { "MCX415A-CCAT", "MCX416A-CCAT", 0 };
+		char *pn_40g[] = { "MCX413A-BCAT", "MCX414A-BCAT",
+		  "MCX415A-BCAT", "MCX416A-BCAT", "MCX4131A-BCAT", 0
+		};
+		char *pn_10g[] = { "MCX4111A-XCAT", "MCX4121A-XCAT", 0 };
+
+		vlib_pci_device_t *pd = vlib_get_pci_device (&pci_addr);
+		u8 *pn = 0;
+		char **c;
+		int found = 0;
+		pn = format (0, "%U%c",
+			     format_vlib_pci_vpd, pd->vpd_r, "PN", 0);
+
+		if (!pn)
+		  break;
+
+		c = pn_100g;
+		while (!found && c[0])
+		  {
+		    if (strncmp ((char *) pn, c[0], strlen (c[0])) == 0)
+		      {
+			xd->port_type = VNET_DPDK_PORT_TYPE_ETH_100G;
+			break;
+		      }
+		    c++;
+		  }
+
+		c = pn_40g;
+		while (!found && c[0])
+		  {
+		    if (strncmp ((char *) pn, c[0], strlen (c[0])) == 0)
+		      {
+			xd->port_type = VNET_DPDK_PORT_TYPE_ETH_40G;
+			break;
+		      }
+		    c++;
+		  }
+
+		c = pn_10g;
+		while (!found && c[0])
+		  {
+		    if (strncmp ((char *) pn, c[0], strlen (c[0])) == 0)
+		      {
+			xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G;
+			break;
+		      }
+		    c++;
+		  }
+
+		vec_free (pn);
+	      }
+
+	      break;
+	      /* Intel Red Rock Canyon */
+	    case VNET_DPDK_PMD_FM10K:
+	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_SWITCH;
+	      break;
+
+	      /* virtio */
+	    case VNET_DPDK_PMD_VIRTIO:
+	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_1G;
+	      xd->nb_rx_desc = DPDK_NB_RX_DESC_VIRTIO;
+	      xd->nb_tx_desc = DPDK_NB_TX_DESC_VIRTIO;
+	      break;
+
+	      /* vmxnet3 */
+	    case VNET_DPDK_PMD_VMXNET3:
+	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_1G;
+	      xd->tx_conf.txq_flags |= ETH_TXQ_FLAGS_NOMULTSEGS;
+	      break;
+
+	    case VNET_DPDK_PMD_AF_PACKET:
+	      xd->port_type = VNET_DPDK_PORT_TYPE_AF_PACKET;
+	      xd->af_packet_port_id = af_packet_port_id++;
+	      break;
+
+	    case VNET_DPDK_PMD_BOND:
+	      xd->flags |= DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE;
+	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_BOND;
+	      break;
+
+	    default:
+	      xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN;
+	    }
+
+	  if (devconf->num_rx_desc)
+	    xd->nb_rx_desc = devconf->num_rx_desc;
+
+	  if (devconf->num_tx_desc)
+	    xd->nb_tx_desc = devconf->num_tx_desc;
+	}
+
+      /*
+       * Ensure default mtu is not > the mtu read from the hardware.
+       * Otherwise rte_eth_dev_configure() will fail and the port will
+       * not be available.
+       */
+      if (ETHERNET_MAX_PACKET_BYTES > dev_info.max_rx_pktlen)
+	{
+	  /*
+	   * This device does not support the platforms's max frame
+	   * size. Use it's advertised mru instead.
+	   */
+	  xd->port_conf.rxmode.max_rx_pkt_len = dev_info.max_rx_pktlen;
+	}
+      else
+	{
+	  xd->port_conf.rxmode.max_rx_pkt_len = ETHERNET_MAX_PACKET_BYTES;
+
+	  /*
+	   * Some platforms do not account for Ethernet FCS (4 bytes) in
+	   * MTU calculations. To interop with them increase mru but only
+	   * if the device's settings can support it.
+	   */
+	  if ((dev_info.max_rx_pktlen >= (ETHERNET_MAX_PACKET_BYTES + 4)) &&
+	      xd->port_conf.rxmode.hw_strip_crc)
+	    {
+	      /*
+	       * Allow additional 4 bytes (for Ethernet FCS). These bytes are
+	       * stripped by h/w and so will not consume any buffer memory.
+	       */
+	      xd->port_conf.rxmode.max_rx_pkt_len += 4;
+	    }
+	}
+
+      if (xd->pmd == VNET_DPDK_PMD_AF_PACKET)
+	{
+	  f64 now = vlib_time_now (vm);
+	  u32 rnd;
+	  rnd = (u32) (now * 1e6);
+	  rnd = random_u32 (&rnd);
+	  clib_memcpy (addr + 2, &rnd, sizeof (rnd));
+	  addr[0] = 2;
+	  addr[1] = 0xfe;
+	}
+      else
+	rte_eth_macaddr_get (i, (struct ether_addr *) addr);
+
+      if (xd->tx_q_used < tm->n_vlib_mains)
+	dpdk_device_lock_init (xd);
+
+      xd->device_index = xd - dm->devices;
+      ASSERT (i == xd->device_index);
+      xd->per_interface_next_index = ~0;
+
+      /* assign interface to input thread */
+      dpdk_device_and_queue_t *dq;
+      int q;
+
+      if (devconf->workers)
+	{
+	  int i;
+	  q = 0;
+	  /* *INDENT-OFF* */
+	  clib_bitmap_foreach (i, devconf->workers, ({
+	    int cpu = dm->input_cpu_first_index + i;
+	    unsigned lcore = vlib_worker_threads[cpu].lcore_id;
+	    vec_validate(xd->cpu_socket_id_by_queue, q);
+	    xd->cpu_socket_id_by_queue[q] = rte_lcore_to_socket_id(lcore);
+	    vec_add2(dm->devices_by_cpu[cpu], dq, 1);
+	    dq->device = xd->device_index;
+	    dq->queue_id = q++;
+	  }));
+	  /* *INDENT-ON* */
+	}
+      else
+	for (q = 0; q < xd->rx_q_used; q++)
+	  {
+	    int cpu = dm->input_cpu_first_index + next_cpu;
+	    unsigned lcore = vlib_worker_threads[cpu].lcore_id;
+
+	    /*
+	     * numa node for worker thread handling this queue
+	     * needed for taking buffers from the right mempool
+	     */
+	    vec_validate (xd->cpu_socket_id_by_queue, q);
+	    xd->cpu_socket_id_by_queue[q] = rte_lcore_to_socket_id (lcore);
+
+	    /*
+	     * construct vector of (device,queue) pairs for each worker thread
+	     */
+	    vec_add2 (dm->devices_by_cpu[cpu], dq, 1);
+	    dq->device = xd->device_index;
+	    dq->queue_id = q;
+
+	    next_cpu++;
+	    if (next_cpu == dm->input_cpu_count)
+	      next_cpu = 0;
+	  }
+
+
+      if (devconf->hqos_enabled)
+	{
+	  xd->flags |= DPDK_DEVICE_FLAG_HQOS;
+
+	  if (devconf->hqos.hqos_thread_valid)
+	    {
+	      int cpu = dm->hqos_cpu_first_index + devconf->hqos.hqos_thread;
+
+	      if (devconf->hqos.hqos_thread >= dm->hqos_cpu_count)
+		return clib_error_return (0, "invalid HQoS thread index");
+
+	      vec_add2 (dm->devices_by_hqos_cpu[cpu], dq, 1);
+	      dq->device = xd->device_index;
+	      dq->queue_id = 0;
+	    }
+	  else
+	    {
+	      int cpu = dm->hqos_cpu_first_index + next_hqos_cpu;
+
+	      if (dm->hqos_cpu_count == 0)
+		return clib_error_return (0, "no HQoS threads available");
+
+	      vec_add2 (dm->devices_by_hqos_cpu[cpu], dq, 1);
+	      dq->device = xd->device_index;
+	      dq->queue_id = 0;
+
+	      next_hqos_cpu++;
+	      if (next_hqos_cpu == dm->hqos_cpu_count)
+		next_hqos_cpu = 0;
+
+	      devconf->hqos.hqos_thread_valid = 1;
+	      devconf->hqos.hqos_thread = cpu;
+	    }
+	}
+
+      vec_validate_aligned (xd->tx_vectors, tm->n_vlib_mains,
+			    CLIB_CACHE_LINE_BYTES);
+      for (j = 0; j < tm->n_vlib_mains; j++)
+	{
+	  vec_validate_ha (xd->tx_vectors[j], xd->nb_tx_desc,
+			   sizeof (tx_ring_hdr_t), CLIB_CACHE_LINE_BYTES);
+	  vec_reset_length (xd->tx_vectors[j]);
+	}
+
+      vec_validate_aligned (xd->rx_vectors, xd->rx_q_used,
+			    CLIB_CACHE_LINE_BYTES);
+      for (j = 0; j < xd->rx_q_used; j++)
+	{
+	  vec_validate_aligned (xd->rx_vectors[j], VLIB_FRAME_SIZE - 1,
+				CLIB_CACHE_LINE_BYTES);
+	  vec_reset_length (xd->rx_vectors[j]);
+	}
+
+      vec_validate_aligned (xd->d_trace_buffers, tm->n_vlib_mains,
+			    CLIB_CACHE_LINE_BYTES);
+
+      rv = dpdk_port_setup (dm, xd);
+
+      if (rv)
+	return rv;
+
+      if (devconf->hqos_enabled)
+	{
+	  rv = dpdk_port_setup_hqos (xd, &devconf->hqos);
+	  if (rv)
+	    return rv;
+	}
+
+      /* count the number of descriptors used for this device */
+      nb_desc += xd->nb_rx_desc + xd->nb_tx_desc * xd->tx_q_used;
+
+      error = ethernet_register_interface
+	(dm->vnet_main, dpdk_device_class.index, xd->device_index,
+	 /* ethernet address */ addr,
+	 &xd->vlib_hw_if_index, dpdk_flag_change);
+      if (error)
+	return error;
+
+      sw = vnet_get_hw_sw_interface (dm->vnet_main, xd->vlib_hw_if_index);
+      xd->vlib_sw_if_index = sw->sw_if_index;
+      hi = vnet_get_hw_interface (dm->vnet_main, xd->vlib_hw_if_index);
+
+      /*
+       * DAW-FIXME: The Cisco VIC firmware does not provide an api for a
+       *            driver to dynamically change the mtu.  If/when the
+       *            VIC firmware gets fixed, then this should be removed.
+       */
+      if (xd->pmd == VNET_DPDK_PMD_ENIC)
+	{
+	  /*
+	   * Initialize mtu to what has been set by CIMC in the firmware cfg.
+	   */
+	  hi->max_packet_bytes = dev_info.max_rx_pktlen;
+	  if (devconf->vlan_strip_offload != DPDK_DEVICE_VLAN_STRIP_OFF)
+	    vlan_strip = 1;	/* remove vlan tag from VIC port by default */
+	  else
+	    clib_warning ("VLAN strip disabled for interface\n");
+	}
+      else if (devconf->vlan_strip_offload == DPDK_DEVICE_VLAN_STRIP_ON)
+	vlan_strip = 1;
+
+      if (vlan_strip)
+	{
+	  int vlan_off;
+	  vlan_off = rte_eth_dev_get_vlan_offload (xd->device_index);
+	  vlan_off |= ETH_VLAN_STRIP_OFFLOAD;
+	  xd->port_conf.rxmode.hw_vlan_strip = vlan_off;
+	  if (rte_eth_dev_set_vlan_offload (xd->device_index, vlan_off) == 0)
+	    clib_warning ("VLAN strip enabled for interface\n");
+	  else
+	    clib_warning ("VLAN strip cannot be supported by interface\n");
+	}
+
+      hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] =
+	xd->port_conf.rxmode.max_rx_pkt_len - sizeof (ethernet_header_t);
+
+      rte_eth_dev_set_mtu (xd->device_index, hi->max_packet_bytes);
+    }
+
+  if (nb_desc > dm->conf->num_mbufs)
+    clib_warning ("%d mbufs allocated but total rx/tx ring size is %d\n",
+		  dm->conf->num_mbufs, nb_desc);
+
+  return 0;
+}
+
+static void
+dpdk_bind_devices_to_uio (dpdk_config_main_t * conf)
+{
+  vlib_pci_main_t *pm = &pci_main;
+  clib_error_t *error;
+  vlib_pci_device_t *d;
+  u8 *pci_addr = 0;
+  int num_whitelisted = vec_len (conf->dev_confs);
+
+  /* *INDENT-OFF* */
+  pool_foreach (d, pm->pci_devs, ({
+    dpdk_device_config_t * devconf = 0;
+    vec_reset_length (pci_addr);
+    pci_addr = format (pci_addr, "%U%c", format_vlib_pci_addr, &d->bus_address, 0);
+
+    if (d->device_class != PCI_CLASS_NETWORK_ETHERNET)
+      continue;
+
+    if (num_whitelisted)
+      {
+	uword * p = hash_get (conf->device_config_index_by_pci_addr, d->bus_address.as_u32);
+
+	if (!p)
+	  continue;
+
+	devconf = pool_elt_at_index (conf->dev_confs, p[0]);
+      }
+
+    /* virtio */
+    if (d->vendor_id == 0x1af4 && d->device_id == 0x1000)
+      ;
+    /* vmxnet3 */
+    else if (d->vendor_id == 0x15ad && d->device_id == 0x07b0)
+      ;
+    /* all Intel devices */
+    else if (d->vendor_id == 0x8086)
+      ;
+    /* Cisco VIC */
+    else if (d->vendor_id == 0x1137 && d->device_id == 0x0043)
+      ;
+    /* Chelsio T4/T5 */
+    else if (d->vendor_id == 0x1425 && (d->device_id & 0xe000) == 0x4000)
+      ;
+    else
+      {
+        clib_warning ("Unsupported Ethernet PCI device 0x%04x:0x%04x found "
+		      "at PCI address %s\n", (u16) d->vendor_id, (u16) d->device_id,
+		      pci_addr);
+        continue;
+      }
+
+    error = vlib_pci_bind_to_uio (d, (char *) conf->uio_driver_name);
+
+    if (error)
+      {
+	if (devconf == 0)
+	  {
+	    pool_get (conf->dev_confs, devconf);
+	    hash_set (conf->device_config_index_by_pci_addr, d->bus_address.as_u32,
+		      devconf - conf->dev_confs);
+	    devconf->pci_addr.as_u32 = d->bus_address.as_u32;
+	  }
+	devconf->is_blacklisted = 1;
+	clib_error_report (error);
+      }
+  }));
+  /* *INDENT-ON* */
+  vec_free (pci_addr);
+}
+
+static clib_error_t *
+dpdk_device_config (dpdk_config_main_t * conf, vlib_pci_addr_t pci_addr,
+		    unformat_input_t * input, u8 is_default)
+{
+  clib_error_t *error = 0;
+  uword *p;
+  dpdk_device_config_t *devconf;
+  unformat_input_t sub_input;
+
+  if (is_default)
+    {
+      devconf = &conf->default_devconf;
+    }
+  else
+    {
+      p = hash_get (conf->device_config_index_by_pci_addr, pci_addr.as_u32);
+
+      if (!p)
+	{
+	  pool_get (conf->dev_confs, devconf);
+	  hash_set (conf->device_config_index_by_pci_addr, pci_addr.as_u32,
+		    devconf - conf->dev_confs);
+	}
+      else
+	return clib_error_return (0,
+				  "duplicate configuration for PCI address %U",
+				  format_vlib_pci_addr, &pci_addr);
+    }
+
+  devconf->pci_addr.as_u32 = pci_addr.as_u32;
+  devconf->hqos_enabled = 0;
+  dpdk_device_config_hqos_default (&devconf->hqos);
+
+  if (!input)
+    return 0;
+
+  unformat_skip_white_space (input);
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "num-rx-queues %u", &devconf->num_rx_queues))
+	;
+      else if (unformat (input, "num-tx-queues %u", &devconf->num_tx_queues))
+	;
+      else if (unformat (input, "num-rx-desc %u", &devconf->num_rx_desc))
+	;
+      else if (unformat (input, "num-tx-desc %u", &devconf->num_tx_desc))
+	;
+      else if (unformat (input, "workers %U", unformat_bitmap_list,
+			 &devconf->workers))
+	;
+      else
+	if (unformat
+	    (input, "rss %U", unformat_vlib_cli_sub_input, &sub_input))
+	{
+	  error = unformat_rss_fn (&sub_input, &devconf->rss_fn);
+	  if (error)
+	    break;
+	}
+      else if (unformat (input, "vlan-strip-offload off"))
+	devconf->vlan_strip_offload = DPDK_DEVICE_VLAN_STRIP_OFF;
+      else if (unformat (input, "vlan-strip-offload on"))
+	devconf->vlan_strip_offload = DPDK_DEVICE_VLAN_STRIP_ON;
+      else
+	if (unformat
+	    (input, "hqos %U", unformat_vlib_cli_sub_input, &sub_input))
+	{
+	  devconf->hqos_enabled = 1;
+	  error = unformat_hqos (&sub_input, &devconf->hqos);
+	  if (error)
+	    break;
+	}
+      else if (unformat (input, "hqos"))
+	{
+	  devconf->hqos_enabled = 1;
+	}
+      else
+	{
+	  error = clib_error_return (0, "unknown input `%U'",
+				     format_unformat_error, input);
+	  break;
+	}
+    }
+
+  if (error)
+    return error;
+
+  if (devconf->workers && devconf->num_rx_queues == 0)
+    devconf->num_rx_queues = clib_bitmap_count_set_bits (devconf->workers);
+  else if (devconf->workers &&
+	   clib_bitmap_count_set_bits (devconf->workers) !=
+	   devconf->num_rx_queues)
+    error =
+      clib_error_return (0,
+			 "%U: number of worker threadds must be "
+			 "equal to number of rx queues", format_vlib_pci_addr,
+			 &pci_addr);
+
+  return error;
+}
+
+static clib_error_t *
+dpdk_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  clib_error_t *error = 0;
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_config_main_t *conf = &dpdk_config_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  dpdk_device_config_t *devconf;
+  vlib_pci_addr_t pci_addr;
+  unformat_input_t sub_input;
+  u8 *s, *tmp = 0;
+  u8 *rte_cmd = 0, *ethname = 0;
+  u32 log_level;
+  int ret, i;
+  int num_whitelisted = 0;
+  u8 no_pci = 0;
+  u8 no_huge = 0;
+  u8 huge_dir = 0;
+  u8 file_prefix = 0;
+  u8 *socket_mem = 0;
+
+  conf->device_config_index_by_pci_addr = hash_create (0, sizeof (uword));
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      /* Prime the pump */
+      if (unformat (input, "no-hugetlb"))
+	{
+	  vec_add1 (conf->eal_init_args, (u8 *) "no-huge");
+	  no_huge = 1;
+	}
+
+      else if (unformat (input, "enable-tcp-udp-checksum"))
+	conf->enable_tcp_udp_checksum = 1;
+
+      else if (unformat (input, "decimal-interface-names"))
+	conf->interface_name_format_decimal = 1;
+
+      else if (unformat (input, "no-multi-seg"))
+	conf->no_multi_seg = 1;
+
+      else if (unformat (input, "dev default %U", unformat_vlib_cli_sub_input,
+			 &sub_input))
+	{
+	  error =
+	    dpdk_device_config (conf, (vlib_pci_addr_t) (u32) ~ 1, &sub_input,
+				1);
+
+	  if (error)
+	    return error;
+	}
+      else
+	if (unformat
+	    (input, "dev %U %U", unformat_vlib_pci_addr, &pci_addr,
+	     unformat_vlib_cli_sub_input, &sub_input))
+	{
+	  error = dpdk_device_config (conf, pci_addr, &sub_input, 0);
+
+	  if (error)
+	    return error;
+
+	  num_whitelisted++;
+	}
+      else if (unformat (input, "dev %U", unformat_vlib_pci_addr, &pci_addr))
+	{
+	  error = dpdk_device_config (conf, pci_addr, 0, 0);
+
+	  if (error)
+	    return error;
+
+	  num_whitelisted++;
+	}
+      else if (unformat (input, "num-mbufs %d", &conf->num_mbufs))
+	;
+      else if (unformat (input, "kni %d", &conf->num_kni))
+	;
+      else if (unformat (input, "uio-driver %s", &conf->uio_driver_name))
+	;
+      else if (unformat (input, "socket-mem %s", &socket_mem))
+	;
+      else if (unformat (input, "no-pci"))
+	{
+	  no_pci = 1;
+	  tmp = format (0, "--no-pci%c", 0);
+	  vec_add1 (conf->eal_init_args, tmp);
+	}
+      else if (unformat (input, "poll-sleep %d", &dm->poll_sleep))
+	;
+
+#define _(a)                                    \
+      else if (unformat(input, #a))             \
+        {                                       \
+          tmp = format (0, "--%s%c", #a, 0);    \
+          vec_add1 (conf->eal_init_args, tmp);    \
+        }
+      foreach_eal_double_hyphen_predicate_arg
+#undef _
+#define _(a)                                          \
+	else if (unformat(input, #a " %s", &s))	      \
+	  {					      \
+            if (!strncmp(#a, "huge-dir", 8))          \
+              huge_dir = 1;                           \
+            else if (!strncmp(#a, "file-prefix", 11)) \
+              file_prefix = 1;                        \
+	    tmp = format (0, "--%s%c", #a, 0);	      \
+	    vec_add1 (conf->eal_init_args, tmp);      \
+	    vec_add1 (s, 0);			      \
+	    vec_add1 (conf->eal_init_args, s);	      \
+	  }
+	foreach_eal_double_hyphen_arg
+#undef _
+#define _(a,b)						\
+	  else if (unformat(input, #a " %s", &s))	\
+	    {						\
+	      tmp = format (0, "-%s%c", #b, 0);		\
+	      vec_add1 (conf->eal_init_args, tmp);	\
+	      vec_add1 (s, 0);				\
+	      vec_add1 (conf->eal_init_args, s);	\
+	    }
+	foreach_eal_single_hyphen_arg
+#undef _
+#define _(a,b)						\
+	    else if (unformat(input, #a " %s", &s))	\
+	      {						\
+		tmp = format (0, "-%s%c", #b, 0);	\
+		vec_add1 (conf->eal_init_args, tmp);	\
+		vec_add1 (s, 0);			\
+		vec_add1 (conf->eal_init_args, s);	\
+		conf->a##_set_manually = 1;		\
+	      }
+	foreach_eal_single_hyphen_mandatory_arg
+#undef _
+	else if (unformat (input, "default"))
+	;
+
+      else if (unformat_skip_white_space (input))
+	;
+      else
+	{
+	  error = clib_error_return (0, "unknown input `%U'",
+				     format_unformat_error, input);
+	  goto done;
+	}
+    }
+
+  if (!conf->uio_driver_name)
+    conf->uio_driver_name = format (0, "igb_uio%c", 0);
+
+  /*
+   * Use 1G huge pages if available.
+   */
+  if (!no_huge && !huge_dir)
+    {
+      u32 x, *mem_by_socket = 0;
+      uword c = 0;
+      u8 use_1g = 1;
+      u8 use_2m = 1;
+      u8 less_than_1g = 1;
+      int rv;
+
+      umount (DEFAULT_HUGE_DIR);
+
+      /* Process "socket-mem" parameter value */
+      if (vec_len (socket_mem))
+	{
+	  unformat_input_t in;
+	  unformat_init_vector (&in, socket_mem);
+	  while (unformat_check_input (&in) != UNFORMAT_END_OF_INPUT)
+	    {
+	      if (unformat (&in, "%u,", &x))
+		;
+	      else if (unformat (&in, "%u", &x))
+		;
+	      else if (unformat (&in, ","))
+		x = 0;
+	      else
+		break;
+
+	      vec_add1 (mem_by_socket, x);
+
+	      if (x > 1023)
+		less_than_1g = 0;
+	    }
+	  /* Note: unformat_free vec_frees(in.buffer), aka socket_mem... */
+	  unformat_free (&in);
+	  socket_mem = 0;
+	}
+      else
+	{
+	  /* *INDENT-OFF* */
+	  clib_bitmap_foreach (c, tm->cpu_socket_bitmap, (
+	    {
+	      vec_validate(mem_by_socket, c);
+	      mem_by_socket[c] = 256; /* default per-socket mem */
+	    }
+	  ));
+	  /* *INDENT-ON* */
+	}
+
+      /* check if available enough 1GB pages for each socket */
+      /* *INDENT-OFF* */
+      clib_bitmap_foreach (c, tm->cpu_socket_bitmap, (
+        {
+	  int pages_avail, page_size, mem;
+
+	  vec_validate(mem_by_socket, c);
+	  mem = mem_by_socket[c];
+
+	  page_size = 1024;
+	  pages_avail = vlib_sysfs_get_free_hugepages(c, page_size * 1024);
+
+	  if (pages_avail < 0 || page_size * pages_avail < mem)
+	    use_1g = 0;
+
+	  page_size = 2;
+	  pages_avail = vlib_sysfs_get_free_hugepages(c, page_size * 1024);
+
+	  if (pages_avail < 0 || page_size * pages_avail < mem)
+	    use_2m = 0;
+      }));
+      /* *INDENT-ON* */
+
+      if (mem_by_socket == 0)
+	{
+	  error = clib_error_return (0, "mem_by_socket NULL");
+	  goto done;
+	}
+      _vec_len (mem_by_socket) = c + 1;
+
+      /* regenerate socket_mem string */
+      vec_foreach_index (x, mem_by_socket)
+	socket_mem = format (socket_mem, "%s%u",
+			     socket_mem ? "," : "", mem_by_socket[x]);
+      socket_mem = format (socket_mem, "%c", 0);
+
+      vec_free (mem_by_socket);
+
+      rv = mkdir (VPP_RUN_DIR, 0755);
+      if (rv && errno != EEXIST)
+	{
+	  error = clib_error_return (0, "mkdir '%s' failed errno %d",
+				     VPP_RUN_DIR, errno);
+	  goto done;
+	}
+
+      rv = mkdir (DEFAULT_HUGE_DIR, 0755);
+      if (rv && errno != EEXIST)
+	{
+	  error = clib_error_return (0, "mkdir '%s' failed errno %d",
+				     DEFAULT_HUGE_DIR, errno);
+	  goto done;
+	}
+
+      if (use_1g && !(less_than_1g && use_2m))
+	{
+	  rv =
+	    mount ("none", DEFAULT_HUGE_DIR, "hugetlbfs", 0, "pagesize=1G");
+	}
+      else if (use_2m)
+	{
+	  rv = mount ("none", DEFAULT_HUGE_DIR, "hugetlbfs", 0, NULL);
+	}
+      else
+	{
+	  return clib_error_return (0, "not enough free huge pages");
+	}
+
+      if (rv)
+	{
+	  error = clib_error_return (0, "mount failed %d", errno);
+	  goto done;
+	}
+
+      tmp = format (0, "--huge-dir%c", 0);
+      vec_add1 (conf->eal_init_args, tmp);
+      tmp = format (0, "%s%c", DEFAULT_HUGE_DIR, 0);
+      vec_add1 (conf->eal_init_args, tmp);
+      if (!file_prefix)
+	{
+	  tmp = format (0, "--file-prefix%c", 0);
+	  vec_add1 (conf->eal_init_args, tmp);
+	  tmp = format (0, "vpp%c", 0);
+	  vec_add1 (conf->eal_init_args, tmp);
+	}
+    }
+
+  vec_free (rte_cmd);
+  vec_free (ethname);
+
+  if (error)
+    return error;
+
+  /* I'll bet that -c and -n must be the first and second args... */
+  if (!conf->coremask_set_manually)
+    {
+      vlib_thread_registration_t *tr;
+      uword *coremask = 0;
+      int i;
+
+      /* main thread core */
+      coremask = clib_bitmap_set (coremask, tm->main_lcore, 1);
+
+      for (i = 0; i < vec_len (tm->registrations); i++)
+	{
+	  tr = tm->registrations[i];
+	  coremask = clib_bitmap_or (coremask, tr->coremask);
+	}
+
+      vec_insert (conf->eal_init_args, 2, 1);
+      conf->eal_init_args[1] = (u8 *) "-c";
+      tmp = format (0, "%U%c", format_bitmap_hex, coremask, 0);
+      conf->eal_init_args[2] = tmp;
+      clib_bitmap_free (coremask);
+    }
+
+  if (!conf->nchannels_set_manually)
+    {
+      vec_insert (conf->eal_init_args, 2, 3);
+      conf->eal_init_args[3] = (u8 *) "-n";
+      tmp = format (0, "%d", conf->nchannels);
+      conf->eal_init_args[4] = tmp;
+    }
+
+  if (no_pci == 0 && geteuid () == 0)
+    dpdk_bind_devices_to_uio (conf);
+
+#define _(x) \
+    if (devconf->x == 0 && conf->default_devconf.x > 0) \
+      devconf->x = conf->default_devconf.x ;
+
+  /* *INDENT-OFF* */
+  pool_foreach (devconf, conf->dev_confs, ({
+
+    /* default per-device config items */
+    foreach_dpdk_device_config_item
+
+    /* add DPDK EAL whitelist/blacklist entry */
+    if (num_whitelisted > 0 && devconf->is_blacklisted == 0)
+      {
+	tmp = format (0, "-w%c", 0);
+	vec_add1 (conf->eal_init_args, tmp);
+	tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr, 0);
+	vec_add1 (conf->eal_init_args, tmp);
+      }
+    else if (num_whitelisted == 0 && devconf->is_blacklisted != 0)
+      {
+	tmp = format (0, "-b%c", 0);
+	vec_add1 (conf->eal_init_args, tmp);
+	tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr, 0);
+	vec_add1 (conf->eal_init_args, tmp);
+      }
+  }));
+  /* *INDENT-ON* */
+
+#undef _
+
+  /* set master-lcore */
+  tmp = format (0, "--master-lcore%c", 0);
+  vec_add1 (conf->eal_init_args, tmp);
+  tmp = format (0, "%u%c", tm->main_lcore, 0);
+  vec_add1 (conf->eal_init_args, tmp);
+
+  /* set socket-mem */
+  tmp = format (0, "--socket-mem%c", 0);
+  vec_add1 (conf->eal_init_args, tmp);
+  tmp = format (0, "%s%c", socket_mem, 0);
+  vec_add1 (conf->eal_init_args, tmp);
+
+  /* NULL terminate the "argv" vector, in case of stupidity */
+  vec_add1 (conf->eal_init_args, 0);
+  _vec_len (conf->eal_init_args) -= 1;
+
+  /* Set up DPDK eal and packet mbuf pool early. */
+
+  log_level = (CLIB_DEBUG > 0) ? RTE_LOG_DEBUG : RTE_LOG_NOTICE;
+
+  rte_set_log_level (log_level);
+
+  vm = vlib_get_main ();
+
+  /* make copy of args as rte_eal_init tends to mess up with arg array */
+  for (i = 1; i < vec_len (conf->eal_init_args); i++)
+    conf->eal_init_args_str = format (conf->eal_init_args_str, "%s ",
+				      conf->eal_init_args[i]);
+
+  ret =
+    rte_eal_init (vec_len (conf->eal_init_args),
+		  (char **) conf->eal_init_args);
+
+  /* lazy umount hugepages */
+  umount2 (DEFAULT_HUGE_DIR, MNT_DETACH);
+
+  if (ret < 0)
+    return clib_error_return (0, "rte_eal_init returned %d", ret);
+
+  /* Dump the physical memory layout prior to creating the mbuf_pool */
+  fprintf (stdout, "DPDK physical memory layout:\n");
+  rte_dump_physmem_layout (stdout);
+
+  /* main thread 1st */
+  error = vlib_buffer_pool_create (vm, conf->num_mbufs, rte_socket_id ());
+  if (error)
+    return error;
+
+  for (i = 0; i < RTE_MAX_LCORE; i++)
+    {
+      error = vlib_buffer_pool_create (vm, conf->num_mbufs,
+				       rte_lcore_to_socket_id (i));
+      if (error)
+	return error;
+    }
+
+done:
+  return error;
+}
+
+VLIB_CONFIG_FUNCTION (dpdk_config, "dpdk");
+
+void
+dpdk_update_link_state (dpdk_device_t * xd, f64 now)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  struct rte_eth_link prev_link = xd->link;
+  u32 hw_flags = 0;
+  u8 hw_flags_chg = 0;
+
+  /* only update link state for PMD interfaces */
+  if ((xd->flags & DPDK_DEVICE_FLAG_PMD) == 0)
+    return;
+
+  xd->time_last_link_update = now ? now : xd->time_last_link_update;
+  memset (&xd->link, 0, sizeof (xd->link));
+  rte_eth_link_get_nowait (xd->device_index, &xd->link);
+
+  if (LINK_STATE_ELOGS)
+    {
+      vlib_main_t *vm = vlib_get_main ();
+      ELOG_TYPE_DECLARE (e) =
+      {
+      .format =
+	  "update-link-state: sw_if_index %d, admin_up %d,"
+	  "old link_state %d new link_state %d",.format_args = "i4i1i1i1",};
+
+      struct
+      {
+	u32 sw_if_index;
+	u8 admin_up;
+	u8 old_link_state;
+	u8 new_link_state;
+      } *ed;
+      ed = ELOG_DATA (&vm->elog_main, e);
+      ed->sw_if_index = xd->vlib_sw_if_index;
+      ed->admin_up = (xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP) != 0;
+      ed->old_link_state = (u8)
+	vnet_hw_interface_is_link_up (vnm, xd->vlib_hw_if_index);
+      ed->new_link_state = (u8) xd->link.link_status;
+    }
+
+  if ((xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP) &&
+      ((xd->link.link_status != 0) ^
+       vnet_hw_interface_is_link_up (vnm, xd->vlib_hw_if_index)))
+    {
+      hw_flags_chg = 1;
+      hw_flags |= (xd->link.link_status ? VNET_HW_INTERFACE_FLAG_LINK_UP : 0);
+    }
+
+  if (hw_flags_chg || (xd->link.link_duplex != prev_link.link_duplex))
+    {
+      hw_flags_chg = 1;
+      switch (xd->link.link_duplex)
+	{
+	case ETH_LINK_HALF_DUPLEX:
+	  hw_flags |= VNET_HW_INTERFACE_FLAG_HALF_DUPLEX;
+	  break;
+	case ETH_LINK_FULL_DUPLEX:
+	  hw_flags |= VNET_HW_INTERFACE_FLAG_FULL_DUPLEX;
+	  break;
+	default:
+	  break;
+	}
+    }
+  if (hw_flags_chg || (xd->link.link_speed != prev_link.link_speed))
+    {
+      hw_flags_chg = 1;
+      switch (xd->link.link_speed)
+	{
+	case ETH_SPEED_NUM_10M:
+	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_10M;
+	  break;
+	case ETH_SPEED_NUM_100M:
+	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_100M;
+	  break;
+	case ETH_SPEED_NUM_1G:
+	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_1G;
+	  break;
+	case ETH_SPEED_NUM_10G:
+	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_10G;
+	  break;
+	case ETH_SPEED_NUM_40G:
+	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_40G;
+	  break;
+	case 0:
+	  break;
+	default:
+	  clib_warning ("unknown link speed %d", xd->link.link_speed);
+	  break;
+	}
+    }
+  if (hw_flags_chg)
+    {
+      if (LINK_STATE_ELOGS)
+	{
+	  vlib_main_t *vm = vlib_get_main ();
+
+	  ELOG_TYPE_DECLARE (e) =
+	  {
+	  .format =
+	      "update-link-state: sw_if_index %d, new flags %d",.format_args
+	      = "i4i4",};
+
+	  struct
+	  {
+	    u32 sw_if_index;
+	    u32 flags;
+	  } *ed;
+	  ed = ELOG_DATA (&vm->elog_main, e);
+	  ed->sw_if_index = xd->vlib_sw_if_index;
+	  ed->flags = hw_flags;
+	}
+      vnet_hw_interface_set_flags (vnm, xd->vlib_hw_if_index, hw_flags);
+    }
+}
+
+static uword
+dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  clib_error_t *error;
+  vnet_main_t *vnm = vnet_get_main ();
+  dpdk_main_t *dm = &dpdk_main;
+  ethernet_main_t *em = &ethernet_main;
+  dpdk_device_t *xd;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  int i;
+
+  error = dpdk_lib_init (dm);
+
+  /*
+   * Turn on the input node if we found some devices to drive
+   * and we're not running worker threads or i/o threads
+   */
+
+  if (error == 0 && vec_len (dm->devices) > 0)
+    {
+      if (tm->n_vlib_mains == 1)
+	vlib_node_set_state (vm, dpdk_input_node.index,
+			     VLIB_NODE_STATE_POLLING);
+      else
+	for (i = 0; i < tm->n_vlib_mains; i++)
+	  if (vec_len (dm->devices_by_cpu[i]) > 0)
+	    vlib_node_set_state (vlib_mains[i], dpdk_input_node.index,
+				 VLIB_NODE_STATE_POLLING);
+    }
+
+  if (error)
+    clib_error_report (error);
+
+  tm->worker_thread_release = 1;
+
+  f64 now = vlib_time_now (vm);
+  vec_foreach (xd, dm->devices)
+  {
+    dpdk_update_link_state (xd, now);
+  }
+
+  {
+    /*
+     * Extra set up for bond interfaces:
+     *  1. Setup MACs for bond interfaces and their slave links which was set
+     *     in dpdk_port_setup() but needs to be done again here to take effect.
+     *  2. Set up info for bond interface related CLI support.
+     */
+    int nports = rte_eth_dev_count ();
+    if (nports > 0)
+      {
+	for (i = 0; i < nports; i++)
+	  {
+	    struct rte_eth_dev_info dev_info;
+	    rte_eth_dev_info_get (i, &dev_info);
+	    if (!dev_info.driver_name)
+#if RTE_VERSION < RTE_VERSION_NUM(16, 11, 0, 0)
+	      dev_info.driver_name = dev_info.pci_dev->driver->name;
+#else
+	      dev_info.driver_name = dev_info.pci_dev->driver->driver.name;
+#endif
+	    ASSERT (dev_info.driver_name);
+	    if (strncmp (dev_info.driver_name, "rte_bond_pmd", 12) == 0)
+	      {
+		u8 addr[6];
+		u8 slink[16];
+		int nlink = rte_eth_bond_slaves_get (i, slink, 16);
+		if (nlink > 0)
+		  {
+		    vnet_hw_interface_t *bhi;
+		    ethernet_interface_t *bei;
+		    int rv;
+
+		    /* Get MAC of 1st slave link */
+		    rte_eth_macaddr_get (slink[0],
+					 (struct ether_addr *) addr);
+		    /* Set MAC of bounded interface to that of 1st slave link */
+		    rv =
+		      rte_eth_bond_mac_address_set (i,
+						    (struct ether_addr *)
+						    addr);
+		    if (rv < 0)
+		      clib_warning ("Failed to set MAC address");
+
+		    /* Populate MAC of bonded interface in VPP hw tables */
+		    bhi =
+		      vnet_get_hw_interface (vnm,
+					     dm->devices[i].vlib_hw_if_index);
+		    bei =
+		      pool_elt_at_index (em->interfaces, bhi->hw_instance);
+		    clib_memcpy (bhi->hw_address, addr, 6);
+		    clib_memcpy (bei->address, addr, 6);
+		    /* Init l3 packet size allowed on bonded interface */
+		    bhi->max_packet_bytes = ETHERNET_MAX_PACKET_BYTES;
+		    bhi->max_l3_packet_bytes[VLIB_RX] =
+		      bhi->max_l3_packet_bytes[VLIB_TX] =
+		      ETHERNET_MAX_PACKET_BYTES - sizeof (ethernet_header_t);
+		    while (nlink >= 1)
+		      {		/* for all slave links */
+			int slave = slink[--nlink];
+			dpdk_device_t *sdev = &dm->devices[slave];
+			vnet_hw_interface_t *shi;
+			vnet_sw_interface_t *ssi;
+			/* Add MAC to all slave links except the first one */
+			if (nlink)
+			  rte_eth_dev_mac_addr_add (slave,
+						    (struct ether_addr *)
+						    addr, 0);
+			/* Set slaves bitmap for bonded interface */
+			bhi->bond_info =
+			  clib_bitmap_set (bhi->bond_info,
+					   sdev->vlib_hw_if_index, 1);
+			/* Set slave link flags on slave interface */
+			shi =
+			  vnet_get_hw_interface (vnm, sdev->vlib_hw_if_index);
+			ssi =
+			  vnet_get_sw_interface (vnm, sdev->vlib_sw_if_index);
+			shi->bond_info = VNET_HW_INTERFACE_BOND_INFO_SLAVE;
+			ssi->flags |= VNET_SW_INTERFACE_FLAG_BOND_SLAVE;
+
+			/* Set l3 packet size allowed as the lowest of slave */
+			if (bhi->max_l3_packet_bytes[VLIB_RX] >
+			    shi->max_l3_packet_bytes[VLIB_RX])
+			  bhi->max_l3_packet_bytes[VLIB_RX] =
+			    bhi->max_l3_packet_bytes[VLIB_TX] =
+			    shi->max_l3_packet_bytes[VLIB_RX];
+
+			/* Set max packet size allowed as the lowest of slave */
+			if (bhi->max_packet_bytes > shi->max_packet_bytes)
+			  bhi->max_packet_bytes = shi->max_packet_bytes;
+		      }
+		  }
+	      }
+	  }
+      }
+  }
+
+  while (1)
+    {
+      /*
+       * check each time through the loop in case intervals are changed
+       */
+      f64 min_wait = dm->link_state_poll_interval < dm->stat_poll_interval ?
+	dm->link_state_poll_interval : dm->stat_poll_interval;
+
+      vlib_process_wait_for_event_or_clock (vm, min_wait);
+
+      if (dm->admin_up_down_in_progress)
+	/* skip the poll if an admin up down is in progress (on any interface) */
+	continue;
+
+      vec_foreach (xd, dm->devices)
+      {
+	f64 now = vlib_time_now (vm);
+	if ((now - xd->time_last_stats_update) >= dm->stat_poll_interval)
+	  dpdk_update_counters (xd, now);
+	if ((now - xd->time_last_link_update) >= dm->link_state_poll_interval)
+	  dpdk_update_link_state (xd, now);
+
+      }
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (dpdk_process_node,static) = {
+    .function = dpdk_process,
+    .type = VLIB_NODE_TYPE_PROCESS,
+    .name = "dpdk-process",
+    .process_log2_n_stack_bytes = 17,
+};
+/* *INDENT-ON* */
+
+int
+dpdk_set_stat_poll_interval (f64 interval)
+{
+  if (interval < DPDK_MIN_STATS_POLL_INTERVAL)
+    return (VNET_API_ERROR_INVALID_VALUE);
+
+  dpdk_main.stat_poll_interval = interval;
+
+  return 0;
+}
+
+int
+dpdk_set_link_state_poll_interval (f64 interval)
+{
+  if (interval < DPDK_MIN_LINK_POLL_INTERVAL)
+    return (VNET_API_ERROR_INVALID_VALUE);
+
+  dpdk_main.link_state_poll_interval = interval;
+
+  return 0;
+}
+
+clib_error_t *
+dpdk_init (vlib_main_t * vm)
+{
+  dpdk_main_t *dm = &dpdk_main;
+  vlib_node_t *ei;
+  clib_error_t *error = 0;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+
+  /* verify that structs are cacheline aligned */
+  STATIC_ASSERT (offsetof (dpdk_device_t, cacheline0) == 0,
+		 "Cache line marker must be 1st element in dpdk_device_t");
+  STATIC_ASSERT (offsetof (dpdk_device_t, cacheline1) ==
+		 CLIB_CACHE_LINE_BYTES,
+		 "Data in cache line 0 is bigger than cache line size");
+  STATIC_ASSERT (offsetof (dpdk_worker_t, cacheline0) == 0,
+		 "Cache line marker must be 1st element in dpdk_worker_t");
+  STATIC_ASSERT (offsetof (frame_queue_trace_t, cacheline0) == 0,
+		 "Cache line marker must be 1st element in frame_queue_trace_t");
+
+  dm->vlib_main = vm;
+  dm->vnet_main = vnet_get_main ();
+  dm->conf = &dpdk_config_main;
+
+  ei = vlib_get_node_by_name (vm, (u8 *) "ethernet-input");
+  if (ei == 0)
+    return clib_error_return (0, "ethernet-input node AWOL");
+
+  dm->ethernet_input_node_index = ei->index;
+
+  dm->conf->nchannels = 4;
+  dm->conf->num_mbufs = dm->conf->num_mbufs ? dm->conf->num_mbufs : NB_MBUF;
+  vec_add1 (dm->conf->eal_init_args, (u8 *) "vnet");
+
+  dm->dpdk_device_by_kni_port_id = hash_create (0, sizeof (uword));
+  dm->vu_sw_if_index_by_listener_fd = hash_create (0, sizeof (uword));
+  dm->vu_sw_if_index_by_sock_fd = hash_create (0, sizeof (uword));
+
+  /* $$$ use n_thread_stacks since it's known-good at this point */
+  vec_validate (dm->recycle, tm->n_thread_stacks - 1);
+
+  /* Default vlib_buffer_t flags, DISABLES tcp/udp checksumming... */
+  dm->buffer_flags_template =
+    (VLIB_BUFFER_TOTAL_LENGTH_VALID | VNET_BUFFER_RTE_MBUF_VALID
+     | IP_BUFFER_L4_CHECKSUM_COMPUTED | IP_BUFFER_L4_CHECKSUM_CORRECT);
+
+  dm->stat_poll_interval = DPDK_STATS_POLL_INTERVAL;
+  dm->link_state_poll_interval = DPDK_LINK_POLL_INTERVAL;
+
+  /* init CLI */
+  if ((error = vlib_call_init_function (vm, dpdk_cli_init)))
+    return error;
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (dpdk_init);
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/ipsec/cli.c b/src/vnet/devices/dpdk/ipsec/cli.c
new file mode 100644
index 00000000..3b634e03
--- /dev/null
+++ b/src/vnet/devices/dpdk/ipsec/cli.c
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2016 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/devices/dpdk/ipsec/ipsec.h>
+
+static void
+dpdk_ipsec_show_mapping (vlib_main_t * vm, u16 detail_display)
+{
+  dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  u32 i, skip_master;
+
+  if (detail_display)
+    vlib_cli_output (vm, "worker\t%10s\t%15s\tdir\tdev\tqp\n",
+		     "cipher", "auth");
+  else
+    vlib_cli_output (vm, "worker\tcrypto device id(type)\n");
+
+  skip_master = vlib_num_workers () > 0;
+
+  for (i = 0; i < tm->n_vlib_mains; i++)
+    {
+      uword key, data;
+      u32 cpu_index = vlib_mains[i]->cpu_index;
+      crypto_worker_main_t *cwm = &dcm->workers_main[cpu_index];
+      u8 *s = 0;
+
+      if (skip_master)
+	{
+	  skip_master = 0;
+	  continue;
+	}
+
+      if (!detail_display)
+	{
+	  i32 last_cdev = -1;
+	  crypto_qp_data_t *qpd;
+
+	  s = format (s, "%u\t", cpu_index);
+
+	  /* *INDENT-OFF* */
+	  vec_foreach (qpd, cwm->qp_data)
+	    {
+	      u32 dev_id = qpd->dev_id;
+
+	      if ((u16) last_cdev != dev_id)
+		{
+		  struct rte_cryptodev_info cdev_info;
+
+		  rte_cryptodev_info_get (dev_id, &cdev_info);
+
+		  s = format(s, "%u(%s)\t", dev_id, cdev_info.feature_flags &
+			     RTE_CRYPTODEV_FF_HW_ACCELERATED ? "HW" : "SW");
+		}
+	      last_cdev = dev_id;
+	    }
+	  /* *INDENT-ON* */
+	  vlib_cli_output (vm, "%s", s);
+	}
+      else
+	{
+	  char cipher_str[15], auth_str[15];
+	  struct rte_cryptodev_capabilities cap;
+	  crypto_worker_qp_key_t *p_key = (crypto_worker_qp_key_t *) & key;
+	  /* *INDENT-OFF* */
+	  hash_foreach (key, data, cwm->algo_qp_map,
+	  ({
+	    cap.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC;
+	    cap.sym.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+	    cap.sym.cipher.algo = p_key->cipher_algo;
+	    check_algo_is_supported (&cap, cipher_str);
+	    cap.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC;
+	    cap.sym.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH;
+	    cap.sym.auth.algo = p_key->auth_algo;
+	    check_algo_is_supported (&cap, auth_str);
+	    vlib_cli_output (vm, "%u\t%10s\t%15s\t%3s\t%u\t%u\n",
+			     vlib_mains[i]->cpu_index, cipher_str, auth_str,
+			     p_key->is_outbound ? "out" : "in",
+			     cwm->qp_data[data].dev_id,
+			     cwm->qp_data[data].qp_id);
+	  }));
+	  /* *INDENT-ON* */
+	}
+    }
+}
+
+static clib_error_t *
+lcore_cryptodev_map_fn (vlib_main_t * vm, unformat_input_t * input,
+			vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u16 detail = 0;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "verbose"))
+	detail = 1;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  dpdk_ipsec_show_mapping (vm, detail);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lcore_cryptodev_map, static) = {
+    .path = "show crypto device mapping",
+    .short_help =
+    "show cryptodev device mapping <verbose>",
+    .function = lcore_cryptodev_map_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/ipsec/crypto_node.c b/src/vnet/devices/dpdk/ipsec/crypto_node.c
new file mode 100644
index 00000000..7b32704e
--- /dev/null
+++ b/src/vnet/devices/dpdk/ipsec/crypto_node.c
@@ -0,0 +1,210 @@
+/*
+ *------------------------------------------------------------------
+ * crypto_node.c - DPDK Cryptodev input node
+ *
+ * Copyright (c) 2016 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ipsec/ipsec.h>
+
+#include <vnet/devices/dpdk/ipsec/ipsec.h>
+
+#define foreach_dpdk_crypto_input_next		\
+  _(DROP, "error-drop")				\
+  _(ENCRYPT_POST, "dpdk-esp-encrypt-post")	\
+  _(DECRYPT_POST, "dpdk-esp-decrypt-post")
+
+typedef enum
+{
+#define _(f,s) DPDK_CRYPTO_INPUT_NEXT_##f,
+  foreach_dpdk_crypto_input_next
+#undef _
+    DPDK_CRYPTO_INPUT_N_NEXT,
+} dpdk_crypto_input_next_t;
+
+#define foreach_dpdk_crypto_input_error		\
+  _(DQ_COPS, "Crypto ops dequeued")		\
+  _(COP_FAILED, "Crypto op failed")
+
+typedef enum
+{
+#define _(f,s) DPDK_CRYPTO_INPUT_ERROR_##f,
+  foreach_dpdk_crypto_input_error
+#undef _
+    DPDK_CRYPTO_INPUT_N_ERROR,
+} dpdk_crypto_input_error_t;
+
+static char *dpdk_crypto_input_error_strings[] = {
+#define _(n, s) s,
+  foreach_dpdk_crypto_input_error
+#undef _
+};
+
+vlib_node_registration_t dpdk_crypto_input_node;
+
+typedef struct
+{
+  u32 cdev;
+  u32 qp;
+  u32 status;
+  u32 sa_idx;
+  u32 next_index;
+} dpdk_crypto_input_trace_t;
+
+static u8 *
+format_dpdk_crypto_input_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  dpdk_crypto_input_trace_t *t = va_arg (*args, dpdk_crypto_input_trace_t *);
+
+  s = format (s, "dpdk_crypto: cryptodev-id %u queue-pair %u next-index %d",
+	      t->cdev, t->qp, t->next_index);
+
+  s = format (s, " status %u sa-idx %u\n", t->status, t->sa_idx);
+
+  return s;
+}
+
+static_always_inline u32
+dpdk_crypto_dequeue (vlib_main_t * vm, vlib_node_runtime_t * node,
+		     crypto_qp_data_t * qpd)
+{
+  u32 n_deq, *to_next = 0, next_index, n_cops, def_next_index;
+  struct rte_crypto_op **cops = qpd->cops;
+
+  if (qpd->inflights == 0)
+    return 0;
+
+  if (qpd->is_outbound)
+    def_next_index = DPDK_CRYPTO_INPUT_NEXT_ENCRYPT_POST;
+  else
+    def_next_index = DPDK_CRYPTO_INPUT_NEXT_DECRYPT_POST;
+
+  n_cops = rte_cryptodev_dequeue_burst (qpd->dev_id, qpd->qp_id,
+					cops, VLIB_FRAME_SIZE);
+  n_deq = n_cops;
+  next_index = def_next_index;
+
+  qpd->inflights -= n_cops;
+  ASSERT (qpd->inflights >= 0);
+
+  while (n_cops > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_cops > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, next0;
+	  vlib_buffer_t *b0 = 0;
+	  struct rte_crypto_op *cop;
+	  struct rte_crypto_sym_op *sym_cop;
+
+	  cop = cops[0];
+	  cops += 1;
+	  n_cops -= 1;
+	  n_left_to_next -= 1;
+
+	  next0 = def_next_index;
+
+	  if (PREDICT_FALSE (cop->status != RTE_CRYPTO_OP_STATUS_SUCCESS))
+	    {
+	      next0 = DPDK_CRYPTO_INPUT_NEXT_DROP;
+	      vlib_node_increment_counter (vm, dpdk_crypto_input_node.index,
+					   DPDK_CRYPTO_INPUT_ERROR_COP_FAILED,
+					   1);
+	    }
+	  cop->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
+
+	  sym_cop = (struct rte_crypto_sym_op *) (cop + 1);
+	  b0 = vlib_buffer_from_rte_mbuf (sym_cop->m_src);
+	  bi0 = vlib_get_buffer_index (vm, b0);
+
+	  to_next[0] = bi0;
+	  to_next += 1;
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      vlib_trace_next_frame (vm, node, next0);
+	      dpdk_crypto_input_trace_t *tr =
+		vlib_add_trace (vm, node, b0, sizeof (*tr));
+	      tr->cdev = qpd->dev_id;
+	      tr->qp = qpd->qp_id;
+	      tr->status = cop->status;
+	      tr->next_index = next0;
+	      tr->sa_idx = vnet_buffer (b0)->ipsec.sad_index;
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  crypto_free_cop (qpd, qpd->cops, n_deq);
+
+  vlib_node_increment_counter (vm, dpdk_crypto_input_node.index,
+			       DPDK_CRYPTO_INPUT_ERROR_DQ_COPS, n_deq);
+  return n_deq;
+}
+
+static uword
+dpdk_crypto_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+		      vlib_frame_t * frame)
+{
+  u32 cpu_index = os_get_cpu_number ();
+  dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
+  crypto_worker_main_t *cwm = &dcm->workers_main[cpu_index];
+  crypto_qp_data_t *qpd;
+  u32 n_deq = 0;
+
+  /* *INDENT-OFF* */
+  vec_foreach (qpd, cwm->qp_data)
+      n_deq += dpdk_crypto_dequeue(vm, node, qpd);
+  /* *INDENT-ON* */
+
+  return n_deq;
+}
+
+VLIB_REGISTER_NODE (dpdk_crypto_input_node) =
+{
+  .function = dpdk_crypto_input_fn,.name = "dpdk-crypto-input",.format_trace =
+    format_dpdk_crypto_input_trace,.type = VLIB_NODE_TYPE_INPUT,.state =
+    VLIB_NODE_STATE_DISABLED,.n_errors =
+    DPDK_CRYPTO_INPUT_N_ERROR,.error_strings =
+    dpdk_crypto_input_error_strings,.n_next_nodes =
+    DPDK_CRYPTO_INPUT_N_NEXT,.next_nodes =
+  {
+#define _(s,n) [DPDK_CRYPTO_INPUT_NEXT_##s] = n,
+    foreach_dpdk_crypto_input_next
+#undef _
+  }
+,};
+
+#if DPDK_CRYPTO==1
+VLIB_NODE_FUNCTION_MULTIARCH (dpdk_crypto_input_node, dpdk_crypto_input_fn)
+#endif
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/ipsec/dir.dox b/src/vnet/devices/dpdk/ipsec/dir.dox
new file mode 100644
index 00000000..ffebfc4d
--- /dev/null
+++ b/src/vnet/devices/dpdk/ipsec/dir.dox
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ @dir vnet/vnet/devices/dpdk/ipsec
+ @brief IPSec ESP encrypt/decrypt using DPDK Cryptodev API
+*/
diff --git a/src/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md b/src/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md
new file mode 100644
index 00000000..8089696f
--- /dev/null
+++ b/src/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md
@@ -0,0 +1,73 @@
+# VPP IPSec implementation using DPDK Cryptodev API    {#dpdk_crypto_ipsec_doc}
+
+This document is meant to contain all related information about implementation and usability.
+
+
+## VPP IPsec with DPDK Cryptodev
+
+DPDK Cryptodev is an asynchronous crypto API that supports both Hardware and Software implementations (for more details refer to [DPDK Cryptography Device Library documentation](http://dpdk.org/doc/guides/prog_guide/cryptodev_lib.html)).
+
+When DPDK Cryptodev support is enabled, the node graph is modified by adding and replacing some of the nodes.
+
+The following nodes are replaced:
+* esp-encrypt -> dpdk-esp-encrypt
+* esp-decrypt -> dpdk-esp-decrypt
+
+The following nodes are added:
+* dpdk-crypto-input : polling input node, basically dequeuing from crypto devices.
+* dpdk-esp-encrypt-post : internal node.
+* dpdk-esp-decrypt-post : internal node.
+
+
+### How to enable VPP IPSec with DPDK Cryptodev support
+
+To enable DPDK Cryptodev support (disabled by default), we need the following env option:
+
+    vpp_uses_dpdk_cryptodev=yes
+
+A couple of ways to achive this:
+* uncomment/add it in the platforms config (ie. build-data/platforms/vpp.mk)
+* set the option when building vpp (ie. make vpp_uses_dpdk_cryptodev=yes build-release)
+
+
+### Crypto Resources allocation
+
+VPP allocates crypto resources based on a best effort approach:
+* first allocate Hardware crypto resources, then Software.
+* if there are not enough crypto resources for all workers, all packets will be dropped if they reach ESP encrypt/decrypt nodes, displaying the warning:
+
+      0: dpdk_ipsec_init: not enough cryptodevs for ipsec
+
+
+### Configuration example
+
+No especial IPsec configuration is required.
+
+Once DPDK Cryptodev is enabled, the user just needs to provide cryptodevs in the startup.conf.
+
+Example startup.conf:
+
+```
+dpdk {
+    socket-mem 1024,1024
+    num-mbufs 131072
+    dev 0000:81:00.0
+    dev 0000:81:00.1
+    dev 0000:85:01.0
+    dev 0000:85:01.1
+    vdev cryptodev_aesni_mb_pmd,socket_id=1
+    vdev cryptodev_aesni_mb_pmd,socket_id=1
+}
+```
+
+In the above configuration:
+* 0000:85:01.0 and 0000:85:01.1 are crypto BDFs and they require the same driver binding as DPDK Ethernet devices but they do not support any extra configuration options.
+* Two AESNI-MB Software Cryptodev PMDs are created in NUMA node 1.
+
+For further details refer to [DPDK Crypto Device Driver documentation](http://dpdk.org/doc/guides/cryptodevs/index.html)
+
+### Operational data
+
+The following CLI command displays the Cryptodev/Worker mapping:
+
+    show crypto device mapping [verbose]
diff --git a/src/vnet/devices/dpdk/ipsec/esp.h b/src/vnet/devices/dpdk/ipsec/esp.h
new file mode 100644
index 00000000..7ef90c49
--- /dev/null
+++ b/src/vnet/devices/dpdk/ipsec/esp.h
@@ -0,0 +1,295 @@
+/*
+ * Copyright (c) 2016 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __DPDK_ESP_H__
+#define __DPDK_ESP_H__
+
+#include <vnet/devices/dpdk/ipsec/ipsec.h>
+#include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/esp.h>
+
+typedef struct
+{
+  enum rte_crypto_cipher_algorithm algo;
+  u8 key_len;
+  u8 iv_len;
+} dpdk_esp_crypto_alg_t;
+
+typedef struct
+{
+  enum rte_crypto_auth_algorithm algo;
+  u8 trunc_size;
+} dpdk_esp_integ_alg_t;
+
+typedef struct
+{
+  dpdk_esp_crypto_alg_t *esp_crypto_algs;
+  dpdk_esp_integ_alg_t *esp_integ_algs;
+} dpdk_esp_main_t;
+
+dpdk_esp_main_t dpdk_esp_main;
+
+static_always_inline void
+dpdk_esp_init ()
+{
+  dpdk_esp_main_t *em = &dpdk_esp_main;
+  dpdk_esp_integ_alg_t *i;
+  dpdk_esp_crypto_alg_t *c;
+
+  vec_validate (em->esp_crypto_algs, IPSEC_CRYPTO_N_ALG - 1);
+
+  c = &em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_CBC_128];
+  c->algo = RTE_CRYPTO_CIPHER_AES_CBC;
+  c->key_len = 16;
+  c->iv_len = 16;
+
+  c = &em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_CBC_192];
+  c->algo = RTE_CRYPTO_CIPHER_AES_CBC;
+  c->key_len = 24;
+  c->iv_len = 16;
+
+  c = &em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_CBC_256];
+  c->algo = RTE_CRYPTO_CIPHER_AES_CBC;
+  c->key_len = 32;
+  c->iv_len = 16;
+
+  c = &em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_GCM_128];
+  c->algo = RTE_CRYPTO_CIPHER_AES_GCM;
+  c->key_len = 16;
+  c->iv_len = 8;
+
+  vec_validate (em->esp_integ_algs, IPSEC_INTEG_N_ALG - 1);
+
+  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA1_96];
+  i->algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
+  i->trunc_size = 12;
+
+  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_256_96];
+  i->algo = RTE_CRYPTO_AUTH_SHA256_HMAC;
+  i->trunc_size = 12;
+
+  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_256_128];
+  i->algo = RTE_CRYPTO_AUTH_SHA256_HMAC;
+  i->trunc_size = 16;
+
+  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_384_192];
+  i->algo = RTE_CRYPTO_AUTH_SHA384_HMAC;
+  i->trunc_size = 24;
+
+  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_512_256];
+  i->algo = RTE_CRYPTO_AUTH_SHA512_HMAC;
+  i->trunc_size = 32;
+
+  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_AES_GCM_128];
+  i->algo = RTE_CRYPTO_AUTH_AES_GCM;
+  i->trunc_size = 16;
+}
+
+static_always_inline int
+add_del_sa_sess (u32 sa_index, u8 is_add)
+{
+  dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
+  crypto_worker_main_t *cwm;
+  u8 skip_master = vlib_num_workers () > 0;
+
+  /* *INDENT-OFF* */
+  vec_foreach (cwm, dcm->workers_main)
+    {
+      crypto_sa_session_t *sa_sess;
+      u8 is_outbound;
+
+      if (skip_master)
+	{
+	  skip_master = 0;
+	  continue;
+	}
+
+      for (is_outbound = 0; is_outbound < 2; is_outbound++)
+	{
+	  if (is_add)
+	    {
+	      pool_get (cwm->sa_sess_d[is_outbound], sa_sess);
+	    }
+	  else
+	    {
+	      u8 dev_id;
+
+	      sa_sess = pool_elt_at_index (cwm->sa_sess_d[is_outbound], sa_index);
+	      dev_id = cwm->qp_data[sa_sess->qp_index].dev_id;
+
+	      if (!sa_sess->sess)
+		continue;
+
+	      if (rte_cryptodev_sym_session_free(dev_id, sa_sess->sess))
+		{
+		  clib_warning("failed to free session");
+		  return -1;
+		}
+	      memset(sa_sess, 0, sizeof(sa_sess[0]));
+	    }
+	}
+    }
+  /* *INDENT-OFF* */
+
+  return 0;
+}
+
+static_always_inline int
+translate_crypto_algo(ipsec_crypto_alg_t crypto_algo,
+		      struct rte_crypto_sym_xform *cipher_xform)
+{
+  switch (crypto_algo)
+  {
+    case IPSEC_CRYPTO_ALG_NONE:
+      cipher_xform->cipher.algo = RTE_CRYPTO_CIPHER_NULL;
+      break;
+    case IPSEC_CRYPTO_ALG_AES_CBC_128:
+    case IPSEC_CRYPTO_ALG_AES_CBC_192:
+    case IPSEC_CRYPTO_ALG_AES_CBC_256:
+      cipher_xform->cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
+      break;
+    case IPSEC_CRYPTO_ALG_AES_GCM_128:
+      cipher_xform->cipher.algo = RTE_CRYPTO_CIPHER_AES_GCM;
+      break;
+    default:
+      return -1;
+  }
+
+  cipher_xform->type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+
+  return 0;
+}
+
+static_always_inline int
+translate_integ_algo(ipsec_integ_alg_t integ_alg,
+		     struct rte_crypto_sym_xform *auth_xform, int use_esn)
+{
+  switch (integ_alg) {
+    case IPSEC_INTEG_ALG_NONE:
+      auth_xform->auth.algo = RTE_CRYPTO_AUTH_NULL;
+      auth_xform->auth.digest_length = 0;
+      break;
+    case IPSEC_INTEG_ALG_SHA1_96:
+      auth_xform->auth.algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
+      auth_xform->auth.digest_length = 12;
+      break;
+    case IPSEC_INTEG_ALG_SHA_256_96:
+      auth_xform->auth.algo = RTE_CRYPTO_AUTH_SHA256_HMAC;
+      auth_xform->auth.digest_length = 12;
+      break;
+    case IPSEC_INTEG_ALG_SHA_256_128:
+      auth_xform->auth.algo = RTE_CRYPTO_AUTH_SHA256_HMAC;
+      auth_xform->auth.digest_length = 16;
+      break;
+    case IPSEC_INTEG_ALG_SHA_384_192:
+      auth_xform->auth.algo = RTE_CRYPTO_AUTH_SHA384_HMAC;
+      auth_xform->auth.digest_length = 24;
+      break;
+    case IPSEC_INTEG_ALG_SHA_512_256:
+      auth_xform->auth.algo = RTE_CRYPTO_AUTH_SHA512_HMAC;
+      auth_xform->auth.digest_length = 32;
+      break;
+    case IPSEC_INTEG_ALG_AES_GCM_128:
+      auth_xform->auth.algo = RTE_CRYPTO_AUTH_AES_GCM;
+      auth_xform->auth.digest_length = 16;
+      auth_xform->auth.add_auth_data_length = use_esn? 12 : 8;
+      break;
+    default:
+      return -1;
+  }
+
+  auth_xform->type = RTE_CRYPTO_SYM_XFORM_AUTH;
+
+  return 0;
+}
+
+static_always_inline int
+create_sym_sess(ipsec_sa_t *sa, crypto_sa_session_t *sa_sess, u8 is_outbound)
+{
+  u32 cpu_index = os_get_cpu_number();
+  dpdk_crypto_main_t * dcm = &dpdk_crypto_main;
+  crypto_worker_main_t *cwm = &dcm->workers_main[cpu_index];
+  struct rte_crypto_sym_xform cipher_xform = {0};
+  struct rte_crypto_sym_xform auth_xform = {0};
+  struct rte_crypto_sym_xform *xfs;
+  uword key = 0, *data;
+  crypto_worker_qp_key_t *p_key = (crypto_worker_qp_key_t *)&key;
+
+  if (sa->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
+    {
+      sa->crypto_key_len -= 4;
+      clib_memcpy(&sa->salt, &sa->crypto_key[sa->crypto_key_len], 4);
+    }
+  else
+    {
+      sa->salt = (u32) rand();
+    }
+
+  cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+  cipher_xform.cipher.key.data = sa->crypto_key;
+  cipher_xform.cipher.key.length = sa->crypto_key_len;
+
+  auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+  auth_xform.auth.key.data = sa->integ_key;
+  auth_xform.auth.key.length = sa->integ_key_len;
+
+  if (translate_crypto_algo(sa->crypto_alg, &cipher_xform) < 0)
+    return -1;
+  p_key->cipher_algo = cipher_xform.cipher.algo;
+
+  if (translate_integ_algo(sa->integ_alg, &auth_xform, sa->use_esn) < 0)
+    return -1;
+  p_key->auth_algo = auth_xform.auth.algo;
+
+  if (is_outbound)
+    {
+      cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+      auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+      cipher_xform.next = &auth_xform;
+      xfs = &cipher_xform;
+    }
+  else
+    {
+      cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_DECRYPT;
+      auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_VERIFY;
+      auth_xform.next = &cipher_xform;
+      xfs = &auth_xform;
+    }
+
+  p_key->is_outbound = is_outbound;
+
+  data = hash_get(cwm->algo_qp_map, key);
+  if (!data)
+    return -1;
+
+  sa_sess->sess =
+    rte_cryptodev_sym_session_create(cwm->qp_data[*data].dev_id, xfs);
+
+  if (!sa_sess->sess)
+    return -1;
+
+  sa_sess->qp_index = (u8)*data;
+
+  return 0;
+}
+
+#endif /* __DPDK_ESP_H__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/ipsec/esp_decrypt.c b/src/vnet/devices/dpdk/ipsec/esp_decrypt.c
new file mode 100644
index 00000000..89ab9f9b
--- /dev/null
+++ b/src/vnet/devices/dpdk/ipsec/esp_decrypt.c
@@ -0,0 +1,583 @@
+/*
+ * esp_decrypt.c : IPSec ESP Decrypt node using DPDK Cryptodev
+ *
+ * Copyright (c) 2016 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+
+#include <vnet/ipsec/ipsec.h>
+#include <vnet/devices/dpdk/ipsec/ipsec.h>
+#include <vnet/devices/dpdk/ipsec/esp.h>
+
+#define foreach_esp_decrypt_next	       \
+_(DROP, "error-drop")			       \
+_(IP4_INPUT, "ip4-input")		       \
+_(IP6_INPUT, "ip6-input")
+
+#define _(v, s) ESP_DECRYPT_NEXT_##v,
+typedef enum {
+  foreach_esp_decrypt_next
+#undef _
+  ESP_DECRYPT_N_NEXT,
+} esp_decrypt_next_t;
+
+#define foreach_esp_decrypt_error		 \
+ _(RX_PKTS, "ESP pkts received")		 \
+ _(DECRYPTION_FAILED, "ESP decryption failed")   \
+ _(REPLAY, "SA replayed packet")	         \
+ _(NOT_IP, "Not IP packet (dropped)")	         \
+ _(ENQ_FAIL, "Enqueue failed (buffer full)")     \
+ _(NO_CRYPTODEV, "Cryptodev not configured")     \
+ _(BAD_LEN, "Invalid ciphertext length")         \
+ _(UNSUPPORTED, "Cipher/Auth not supported")
+
+
+typedef enum {
+#define _(sym,str) ESP_DECRYPT_ERROR_##sym,
+  foreach_esp_decrypt_error
+#undef _
+  ESP_DECRYPT_N_ERROR,
+} esp_decrypt_error_t;
+
+static char * esp_decrypt_error_strings[] = {
+#define _(sym,string) string,
+  foreach_esp_decrypt_error
+#undef _
+};
+
+vlib_node_registration_t dpdk_esp_decrypt_node;
+
+typedef struct {
+  ipsec_crypto_alg_t crypto_alg;
+  ipsec_integ_alg_t integ_alg;
+} esp_decrypt_trace_t;
+
+/* packet trace format function */
+static u8 * format_esp_decrypt_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  esp_decrypt_trace_t * t = va_arg (*args, esp_decrypt_trace_t *);
+
+  s = format (s, "esp: crypto %U integrity %U",
+	      format_ipsec_crypto_alg, t->crypto_alg,
+	      format_ipsec_integ_alg, t->integ_alg);
+  return s;
+}
+
+static uword
+dpdk_esp_decrypt_node_fn (vlib_main_t * vm,
+	     vlib_node_runtime_t * node,
+	     vlib_frame_t * from_frame)
+{
+  u32 n_left_from, *from, *to_next, next_index;
+  ipsec_main_t *im = &ipsec_main;
+  u32 cpu_index = os_get_cpu_number();
+  dpdk_crypto_main_t * dcm = &dpdk_crypto_main;
+  dpdk_esp_main_t * em = &dpdk_esp_main;
+  u32 i;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  if (PREDICT_FALSE(!dcm->workers_main))
+    {
+      vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
+	      ESP_DECRYPT_ERROR_NO_CRYPTODEV, n_left_from);
+      vlib_buffer_free(vm, from, n_left_from);
+      return n_left_from;
+    }
+
+  crypto_worker_main_t *cwm = vec_elt_at_index(dcm->workers_main, cpu_index);
+  u32 n_qps = vec_len(cwm->qp_data);
+  struct rte_crypto_op ** cops_to_enq[n_qps];
+  u32 n_cop_qp[n_qps], * bi_to_enq[n_qps];
+
+  for (i = 0; i < n_qps; i++)
+    {
+      bi_to_enq[i] = cwm->qp_data[i].bi;
+      cops_to_enq[i] = cwm->qp_data[i].cops;
+    }
+
+  memset(n_cop_qp, 0, n_qps * sizeof(u32));
+
+  crypto_alloc_cops();
+
+  next_index = ESP_DECRYPT_NEXT_DROP;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, sa_index0 = ~0, seq, icv_size, iv_size;
+	  vlib_buffer_t * b0;
+	  esp_header_t * esp0;
+	  ipsec_sa_t * sa0;
+	  struct rte_mbuf * mb0 = 0;
+	  const int BLOCK_SIZE = 16;
+	  crypto_sa_session_t * sa_sess;
+	  void * sess;
+	  u16 qp_index;
+	  struct rte_crypto_op * cop = 0;
+
+	  bi0 = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  esp0 = vlib_buffer_get_current (b0);
+
+	  sa_index0 = vnet_buffer(b0)->ipsec.sad_index;
+	  sa0 = pool_elt_at_index (im->sad, sa_index0);
+
+	  seq = clib_host_to_net_u32(esp0->seq);
+
+	  /* anti-replay check */
+	  if (sa0->use_anti_replay)
+	    {
+	      int rv = 0;
+
+	      if (PREDICT_TRUE(sa0->use_esn))
+		rv = esp_replay_check_esn(sa0, seq);
+	      else
+		rv = esp_replay_check(sa0, seq);
+
+	      if (PREDICT_FALSE(rv))
+		{
+		  clib_warning ("anti-replay SPI %u seq %u", sa0->spi, seq);
+		  vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
+					       ESP_DECRYPT_ERROR_REPLAY, 1);
+		  to_next[0] = bi0;
+		  to_next += 1;
+		  n_left_to_next -= 1;
+		  goto trace;
+		}
+	    }
+
+	  if (PREDICT_FALSE(sa0->integ_alg == IPSEC_INTEG_ALG_NONE) ||
+		  PREDICT_FALSE(sa0->crypto_alg == IPSEC_CRYPTO_ALG_NONE))
+	    {
+	      clib_warning ("SPI %u : only cipher + auth supported", sa0->spi);
+	      vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
+					   ESP_DECRYPT_ERROR_UNSUPPORTED, 1);
+	      to_next[0] = bi0;
+	      to_next += 1;
+	      n_left_to_next -= 1;
+	      goto trace;
+	    }
+
+	  sa_sess = pool_elt_at_index(cwm->sa_sess_d[0], sa_index0);
+
+	  if (PREDICT_FALSE(!sa_sess->sess))
+	    {
+	      int ret = create_sym_sess(sa0, sa_sess, 0);
+	      ASSERT(ret == 0);
+	    }
+
+	  sess = sa_sess->sess;
+	  qp_index = sa_sess->qp_index;
+
+	  ASSERT (vec_len (vec_elt (cwm->qp_data, qp_index).free_cops) > 0);
+	  cop = vec_pop (vec_elt (cwm->qp_data, qp_index).free_cops);
+	  ASSERT (cop->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED);
+
+	  cops_to_enq[qp_index][0] = cop;
+	  cops_to_enq[qp_index] += 1;
+	  n_cop_qp[qp_index] += 1;
+	  bi_to_enq[qp_index][0] = bi0;
+	  bi_to_enq[qp_index] += 1;
+
+	  rte_crypto_op_attach_sym_session(cop, sess);
+
+	  icv_size = em->esp_integ_algs[sa0->integ_alg].trunc_size;
+	  iv_size = em->esp_crypto_algs[sa0->crypto_alg].iv_len;
+
+	  /* Convert vlib buffer to mbuf */
+	  mb0 = rte_mbuf_from_vlib_buffer(b0);
+	  mb0->data_len = b0->current_length;
+	  mb0->pkt_len = b0->current_length;
+	  mb0->data_off = RTE_PKTMBUF_HEADROOM + b0->current_data;
+
+	  /* Outer IP header has already been stripped */
+	  u16 payload_len = rte_pktmbuf_pkt_len(mb0) - sizeof (esp_header_t) -
+	      iv_size - icv_size;
+
+	  if ((payload_len & (BLOCK_SIZE - 1)) || (payload_len <= 0))
+	    {
+	      clib_warning ("payload %u not multiple of %d\n",
+			    payload_len, BLOCK_SIZE);
+	      vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
+					   ESP_DECRYPT_ERROR_BAD_LEN, 1);
+	      vec_add (vec_elt (cwm->qp_data, qp_index).free_cops, &cop, 1);
+	      bi_to_enq[qp_index] -= 1;
+	      cops_to_enq[qp_index] -= 1;
+	      n_cop_qp[qp_index] -= 1;
+	      to_next[0] = bi0;
+	      to_next += 1;
+	      n_left_to_next -= 1;
+	      goto trace;
+	    }
+
+	  struct rte_crypto_sym_op *sym_cop = (struct rte_crypto_sym_op *)(cop + 1);
+
+	  sym_cop->m_src = mb0;
+	  sym_cop->cipher.data.offset = sizeof (esp_header_t) + iv_size;
+	  sym_cop->cipher.data.length = payload_len;
+
+          u8 *iv = rte_pktmbuf_mtod_offset(mb0, void*, sizeof (esp_header_t));
+          dpdk_cop_priv_t * priv = (dpdk_cop_priv_t *)(sym_cop + 1);
+
+          if (sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
+            {
+              dpdk_gcm_cnt_blk *icb = &priv->cb;
+              icb->salt = sa0->salt;
+              clib_memcpy(icb->iv, iv, 8);
+              icb->cnt = clib_host_to_net_u32(1);
+              sym_cop->cipher.iv.data = (u8 *)icb;
+              sym_cop->cipher.iv.phys_addr = cop->phys_addr +
+		(uintptr_t)icb - (uintptr_t)cop;
+              sym_cop->cipher.iv.length = 16;
+
+              u8 *aad = priv->aad;
+              clib_memcpy(aad, iv - sizeof(esp_header_t), 8);
+              sym_cop->auth.aad.data = aad;
+              sym_cop->auth.aad.phys_addr = cop->phys_addr +
+                  (uintptr_t)aad - (uintptr_t)cop;
+              if (sa0->use_esn)
+                {
+                  *((u32*)&aad[8]) = sa0->seq_hi;
+                  sym_cop->auth.aad.length = 12;
+                }
+              else
+                {
+                  sym_cop->auth.aad.length = 8;
+                }
+
+              sym_cop->auth.digest.data = rte_pktmbuf_mtod_offset(mb0, void*,
+                       rte_pktmbuf_pkt_len(mb0) - icv_size);
+              sym_cop->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(mb0,
+                       rte_pktmbuf_pkt_len(mb0) - icv_size);
+              sym_cop->auth.digest.length = icv_size;
+
+            }
+          else
+            {
+              sym_cop->cipher.iv.data = rte_pktmbuf_mtod_offset(mb0, void*,
+                       sizeof (esp_header_t));
+              sym_cop->cipher.iv.phys_addr = rte_pktmbuf_mtophys_offset(mb0,
+                       sizeof (esp_header_t));
+              sym_cop->cipher.iv.length = iv_size;
+
+              if (sa0->use_esn)
+                {
+                  dpdk_cop_priv_t* priv = (dpdk_cop_priv_t*) (sym_cop + 1);
+                  u8* payload_end = rte_pktmbuf_mtod_offset(
+                      mb0, u8*, sizeof(esp_header_t) + iv_size + payload_len);
+
+                  clib_memcpy (priv->icv, payload_end, icv_size);
+                  *((u32*) payload_end) = sa0->seq_hi;
+                  sym_cop->auth.data.offset = 0;
+                  sym_cop->auth.data.length = sizeof(esp_header_t) + iv_size
+                      + payload_len + sizeof(sa0->seq_hi);
+                  sym_cop->auth.digest.data = priv->icv;
+                  sym_cop->auth.digest.phys_addr = cop->phys_addr
+                      + (uintptr_t) priv->icv - (uintptr_t) cop;
+                  sym_cop->auth.digest.length = icv_size;
+                }
+              else
+                {
+                  sym_cop->auth.data.offset = 0;
+                  sym_cop->auth.data.length = sizeof(esp_header_t) +
+                           iv_size + payload_len;
+
+                  sym_cop->auth.digest.data = rte_pktmbuf_mtod_offset(mb0, void*,
+                           rte_pktmbuf_pkt_len(mb0) - icv_size);
+                  sym_cop->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(mb0,
+                           rte_pktmbuf_pkt_len(mb0) - icv_size);
+                  sym_cop->auth.digest.length = icv_size;
+                }
+            }
+
+trace:
+	  if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      esp_decrypt_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
+	      tr->crypto_alg = sa0->crypto_alg;
+	      tr->integ_alg = sa0->integ_alg;
+	    }
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
+			       ESP_DECRYPT_ERROR_RX_PKTS,
+			       from_frame->n_vectors);
+  crypto_qp_data_t *qpd;
+  /* *INDENT-OFF* */
+  vec_foreach_index (i, cwm->qp_data)
+    {
+      u32 enq;
+
+      qpd = vec_elt_at_index(cwm->qp_data, i);
+      enq = rte_cryptodev_enqueue_burst(qpd->dev_id, qpd->qp_id,
+					qpd->cops, n_cop_qp[i]);
+      qpd->inflights += enq;
+
+      if (PREDICT_FALSE(enq < n_cop_qp[i]))
+	{
+	  crypto_free_cop (qpd, &qpd->cops[enq], n_cop_qp[i] - enq);
+	  vlib_buffer_free (vm, &qpd->bi[enq], n_cop_qp[i] - enq);
+
+	  vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
+				       ESP_DECRYPT_ERROR_ENQ_FAIL,
+				       n_cop_qp[i] - enq);
+	}
+    }
+  /* *INDENT-ON* */
+
+  return from_frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (dpdk_esp_decrypt_node) = {
+  .function = dpdk_esp_decrypt_node_fn,
+  .name = "dpdk-esp-decrypt",
+  .vector_size = sizeof (u32),
+  .format_trace = format_esp_decrypt_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(esp_decrypt_error_strings),
+  .error_strings = esp_decrypt_error_strings,
+
+  .n_next_nodes = ESP_DECRYPT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [ESP_DECRYPT_NEXT_##s] = n,
+    foreach_esp_decrypt_next
+#undef _
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp_decrypt_node, dpdk_esp_decrypt_node_fn)
+
+/*
+ * Decrypt Post Node
+ */
+
+#define foreach_esp_decrypt_post_error	      \
+ _(PKTS, "ESP post pkts")
+
+typedef enum {
+#define _(sym,str) ESP_DECRYPT_POST_ERROR_##sym,
+  foreach_esp_decrypt_post_error
+#undef _
+  ESP_DECRYPT_POST_N_ERROR,
+} esp_decrypt_post_error_t;
+
+static char * esp_decrypt_post_error_strings[] = {
+#define _(sym,string) string,
+  foreach_esp_decrypt_post_error
+#undef _
+};
+
+vlib_node_registration_t dpdk_esp_decrypt_post_node;
+
+static u8 * format_esp_decrypt_post_trace (u8 * s, va_list * args)
+{
+  return s;
+}
+
+static uword
+dpdk_esp_decrypt_post_node_fn (vlib_main_t * vm,
+	     vlib_node_runtime_t * node,
+	     vlib_frame_t * from_frame)
+{
+  u32 n_left_from, *from, *to_next = 0, next_index;
+  ipsec_sa_t * sa0;
+  u32 sa_index0 = ~0;
+  ipsec_main_t *im = &ipsec_main;
+  dpdk_esp_main_t *em = &dpdk_esp_main;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  esp_footer_t * f0;
+	  u32 bi0, next0, icv_size, iv_size;
+	  vlib_buffer_t * b0 = 0;
+	  ip4_header_t *ih4 = 0, *oh4 = 0;
+	  ip6_header_t *ih6 = 0, *oh6 = 0;
+	  u8 tunnel_mode = 1;
+	  u8 transport_ip6 = 0;
+
+	  next0 = ESP_DECRYPT_NEXT_DROP;
+
+	  bi0 = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  sa_index0 = vnet_buffer(b0)->ipsec.sad_index;
+	  sa0 = pool_elt_at_index (im->sad, sa_index0);
+
+	  to_next[0] = bi0;
+	  to_next += 1;
+
+	  icv_size = em->esp_integ_algs[sa0->integ_alg].trunc_size;
+	  iv_size = em->esp_crypto_algs[sa0->crypto_alg].iv_len;
+
+	  if (sa0->use_anti_replay)
+	    {
+	      esp_header_t * esp0 = vlib_buffer_get_current (b0);
+	      u32 seq;
+	      seq = clib_host_to_net_u32(esp0->seq);
+	      if (PREDICT_TRUE(sa0->use_esn))
+		esp_replay_advance_esn(sa0, seq);
+	      else
+		esp_replay_advance(sa0, seq);
+	    }
+
+	  ih4 = (ip4_header_t *) (b0->data + sizeof(ethernet_header_t));
+	  vlib_buffer_advance (b0, sizeof (esp_header_t) + iv_size);
+
+	  b0->current_length -= (icv_size + 2);
+	  b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
+	  f0 = (esp_footer_t *) ((u8 *) vlib_buffer_get_current (b0) +
+				 b0->current_length);
+	  b0->current_length -= f0->pad_length;
+
+	  /* transport mode */
+	  if (PREDICT_FALSE(!sa0->is_tunnel && !sa0->is_tunnel_ip6))
+	    {
+	      tunnel_mode = 0;
+
+	      if (PREDICT_TRUE((ih4->ip_version_and_header_length & 0xF0) != 0x40))
+		{
+		  if (PREDICT_TRUE((ih4->ip_version_and_header_length & 0xF0) == 0x60))
+		    transport_ip6 = 1;
+		  else
+		    {
+		      clib_warning("next header: 0x%x", f0->next_header);
+		      vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
+						   ESP_DECRYPT_ERROR_NOT_IP, 1);
+		      goto trace;
+		    }
+		}
+	    }
+
+	  if (PREDICT_TRUE (tunnel_mode))
+	    {
+	      if (PREDICT_TRUE(f0->next_header == IP_PROTOCOL_IP_IN_IP))
+		next0 = ESP_DECRYPT_NEXT_IP4_INPUT;
+	      else if (f0->next_header == IP_PROTOCOL_IPV6)
+		next0 = ESP_DECRYPT_NEXT_IP6_INPUT;
+	      else
+		{
+		  clib_warning("next header: 0x%x", f0->next_header);
+		  vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
+					       ESP_DECRYPT_ERROR_DECRYPTION_FAILED,
+					       1);
+		  goto trace;
+		}
+	    }
+	  /* transport mode */
+	  else
+	    {
+	      if (PREDICT_FALSE(transport_ip6))
+		{
+		  ih6 = (ip6_header_t *) (b0->data + sizeof(ethernet_header_t));
+		  vlib_buffer_advance (b0, -sizeof(ip6_header_t));
+		  oh6 = vlib_buffer_get_current (b0);
+		  memmove(oh6, ih6, sizeof(ip6_header_t));
+
+		  next0 = ESP_DECRYPT_NEXT_IP6_INPUT;
+		  oh6->protocol = f0->next_header;
+		  oh6->payload_length =
+		      clib_host_to_net_u16 (
+			  vlib_buffer_length_in_chain(vm, b0) -
+			  sizeof (ip6_header_t));
+		}
+	      else
+		{
+		  vlib_buffer_advance (b0, -sizeof(ip4_header_t));
+		  oh4 = vlib_buffer_get_current (b0);
+		  memmove(oh4, ih4, sizeof(ip4_header_t));
+
+		  next0 = ESP_DECRYPT_NEXT_IP4_INPUT;
+		  oh4->ip_version_and_header_length = 0x45;
+		  oh4->fragment_id = 0;
+		  oh4->flags_and_fragment_offset = 0;
+		  oh4->protocol = f0->next_header;
+		  oh4->length = clib_host_to_net_u16 (
+		      vlib_buffer_length_in_chain (vm, b0));
+		  oh4->checksum = ip4_header_checksum (oh4);
+		}
+	    }
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32)~0;
+
+trace:
+	  if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      esp_decrypt_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
+	      tr->crypto_alg = sa0->crypto_alg;
+	      tr->integ_alg = sa0->integ_alg;
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next, bi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, dpdk_esp_decrypt_post_node.index,
+			       ESP_DECRYPT_POST_ERROR_PKTS,
+			       from_frame->n_vectors);
+
+  return from_frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (dpdk_esp_decrypt_post_node) = {
+  .function = dpdk_esp_decrypt_post_node_fn,
+  .name = "dpdk-esp-decrypt-post",
+  .vector_size = sizeof (u32),
+  .format_trace = format_esp_decrypt_post_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(esp_decrypt_post_error_strings),
+  .error_strings = esp_decrypt_post_error_strings,
+
+  .n_next_nodes = ESP_DECRYPT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [ESP_DECRYPT_NEXT_##s] = n,
+    foreach_esp_decrypt_next
+#undef _
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp_decrypt_post_node, dpdk_esp_decrypt_post_node_fn)
diff --git a/src/vnet/devices/dpdk/ipsec/esp_encrypt.c b/src/vnet/devices/dpdk/ipsec/esp_encrypt.c
new file mode 100644
index 00000000..10bb4616
--- /dev/null
+++ b/src/vnet/devices/dpdk/ipsec/esp_encrypt.c
@@ -0,0 +1,598 @@
+/*
+ * esp_encrypt.c : IPSec ESP encrypt node using DPDK Cryptodev
+ *
+ * Copyright (c) 2016 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+
+#include <vnet/ipsec/ipsec.h>
+#include <vnet/devices/dpdk/ipsec/ipsec.h>
+#include <vnet/devices/dpdk/ipsec/esp.h>
+
+#define foreach_esp_encrypt_next                   \
+_(DROP, "error-drop")                              \
+_(IP4_LOOKUP, "ip4-lookup")                        \
+_(IP6_LOOKUP, "ip6-lookup")                        \
+_(INTERFACE_OUTPUT, "interface-output")
+
+#define _(v, s) ESP_ENCRYPT_NEXT_##v,
+typedef enum
+{
+  foreach_esp_encrypt_next
+#undef _
+    ESP_ENCRYPT_N_NEXT,
+} esp_encrypt_next_t;
+
+#define foreach_esp_encrypt_error                   \
+ _(RX_PKTS, "ESP pkts received")                    \
+ _(SEQ_CYCLED, "sequence number cycled")            \
+ _(ENQ_FAIL, "Enqueue failed (buffer full)")        \
+ _(NO_CRYPTODEV, "Cryptodev not configured")        \
+ _(UNSUPPORTED, "Cipher/Auth not supported")
+
+
+typedef enum
+{
+#define _(sym,str) ESP_ENCRYPT_ERROR_##sym,
+  foreach_esp_encrypt_error
+#undef _
+    ESP_ENCRYPT_N_ERROR,
+} esp_encrypt_error_t;
+
+static char *esp_encrypt_error_strings[] = {
+#define _(sym,string) string,
+  foreach_esp_encrypt_error
+#undef _
+};
+
+vlib_node_registration_t dpdk_esp_encrypt_node;
+
+typedef struct
+{
+  u32 spi;
+  u32 seq;
+  ipsec_crypto_alg_t crypto_alg;
+  ipsec_integ_alg_t integ_alg;
+} esp_encrypt_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_esp_encrypt_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  esp_encrypt_trace_t *t = va_arg (*args, esp_encrypt_trace_t *);
+
+  s = format (s, "esp: spi %u seq %u crypto %U integrity %U",
+	      t->spi, t->seq,
+	      format_ipsec_crypto_alg, t->crypto_alg,
+	      format_ipsec_integ_alg, t->integ_alg);
+  return s;
+}
+
+static uword
+dpdk_esp_encrypt_node_fn (vlib_main_t * vm,
+			  vlib_node_runtime_t * node,
+			  vlib_frame_t * from_frame)
+{
+  u32 n_left_from, *from, *to_next, next_index;
+  ipsec_main_t *im = &ipsec_main;
+  u32 cpu_index = os_get_cpu_number ();
+  dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
+  dpdk_esp_main_t *em = &dpdk_esp_main;
+  u32 i;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  if (PREDICT_FALSE (!dcm->workers_main))
+    {
+      /* Likely there are not enough cryptodevs, so drop frame */
+      vlib_node_increment_counter (vm, dpdk_esp_encrypt_node.index,
+				   ESP_ENCRYPT_ERROR_NO_CRYPTODEV,
+				   n_left_from);
+      vlib_buffer_free (vm, from, n_left_from);
+      return n_left_from;
+    }
+
+  crypto_worker_main_t *cwm = vec_elt_at_index (dcm->workers_main, cpu_index);
+  u32 n_qps = vec_len (cwm->qp_data);
+  struct rte_crypto_op **cops_to_enq[n_qps];
+  u32 n_cop_qp[n_qps], *bi_to_enq[n_qps];
+
+  for (i = 0; i < n_qps; i++)
+    {
+      bi_to_enq[i] = cwm->qp_data[i].bi;
+      cops_to_enq[i] = cwm->qp_data[i].cops;
+    }
+
+  memset (n_cop_qp, 0, n_qps * sizeof (u32));
+
+  crypto_alloc_cops ();
+
+  next_index = ESP_ENCRYPT_NEXT_DROP;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, next0;
+	  vlib_buffer_t *b0 = 0;
+	  u32 sa_index0;
+	  ipsec_sa_t *sa0;
+	  ip4_and_esp_header_t *ih0, *oh0 = 0;
+	  ip6_and_esp_header_t *ih6_0, *oh6_0 = 0;
+	  struct rte_mbuf *mb0 = 0;
+	  esp_footer_t *f0;
+	  u8 is_ipv6;
+	  u8 ip_hdr_size;
+	  u8 next_hdr_type;
+	  u8 transport_mode = 0;
+	  const int BLOCK_SIZE = 16;
+	  u32 iv_size;
+	  u16 orig_sz;
+	  crypto_sa_session_t *sa_sess;
+	  void *sess;
+	  struct rte_crypto_op *cop = 0;
+	  u16 qp_index;
+
+	  bi0 = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  sa_index0 = vnet_buffer (b0)->ipsec.sad_index;
+	  sa0 = pool_elt_at_index (im->sad, sa_index0);
+
+	  if (PREDICT_FALSE (esp_seq_advance (sa0)))
+	    {
+	      clib_warning ("sequence number counter has cycled SPI %u",
+			    sa0->spi);
+	      vlib_node_increment_counter (vm, dpdk_esp_encrypt_node.index,
+					   ESP_ENCRYPT_ERROR_SEQ_CYCLED, 1);
+	      //TODO: rekey SA
+	      to_next[0] = bi0;
+	      to_next += 1;
+	      n_left_to_next -= 1;
+	      goto trace;
+	    }
+
+	  sa_sess = pool_elt_at_index (cwm->sa_sess_d[1], sa_index0);
+	  if (PREDICT_FALSE (!sa_sess->sess))
+	    {
+	      int ret = create_sym_sess (sa0, sa_sess, 1);
+	      ASSERT (ret == 0);
+	    }
+
+	  qp_index = sa_sess->qp_index;
+	  sess = sa_sess->sess;
+
+	  ASSERT (vec_len (vec_elt (cwm->qp_data, qp_index).free_cops) > 0);
+	  cop = vec_pop (vec_elt (cwm->qp_data, qp_index).free_cops);
+	  ASSERT (cop->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED);
+
+	  cops_to_enq[qp_index][0] = cop;
+	  cops_to_enq[qp_index] += 1;
+	  n_cop_qp[qp_index] += 1;
+	  bi_to_enq[qp_index][0] = bi0;
+	  bi_to_enq[qp_index] += 1;
+
+	  ssize_t adv;
+	  iv_size = em->esp_crypto_algs[sa0->crypto_alg].iv_len;
+	  ih0 = vlib_buffer_get_current (b0);
+	  orig_sz = b0->current_length;
+	  is_ipv6 = (ih0->ip4.ip_version_and_header_length & 0xF0) == 0x60;
+	  /* is ipv6 */
+	  if (PREDICT_TRUE (sa0->is_tunnel))
+	    {
+	      if (PREDICT_TRUE (!is_ipv6))
+		adv = -sizeof (ip4_and_esp_header_t);
+	      else
+		adv = -sizeof (ip6_and_esp_header_t);
+	    }
+	  else
+	    {
+	      adv = -sizeof (esp_header_t);
+	      if (PREDICT_TRUE (!is_ipv6))
+		orig_sz -= sizeof (ip4_header_t);
+	      else
+		orig_sz -= sizeof (ip6_header_t);
+	    }
+
+	  /*transport mode save the eth header before it is overwritten */
+	  if (PREDICT_FALSE (!sa0->is_tunnel))
+	    {
+	      ethernet_header_t *ieh0 = (ethernet_header_t *)
+		((u8 *) vlib_buffer_get_current (b0) -
+		 sizeof (ethernet_header_t));
+	      ethernet_header_t *oeh0 =
+		(ethernet_header_t *) ((u8 *) ieh0 + (adv - iv_size));
+	      clib_memcpy (oeh0, ieh0, sizeof (ethernet_header_t));
+	    }
+
+	  vlib_buffer_advance (b0, adv - iv_size);
+
+	  /* XXX IP6/ip4 and IP4/IP6 not supported, only IP4/IP4 and IP6/IP6 */
+
+	  /* is ipv6 */
+	  if (PREDICT_FALSE (is_ipv6))
+	    {
+	      ih6_0 = (ip6_and_esp_header_t *) ih0;
+	      ip_hdr_size = sizeof (ip6_header_t);
+	      oh6_0 = vlib_buffer_get_current (b0);
+
+	      if (PREDICT_TRUE (sa0->is_tunnel))
+		{
+		  next_hdr_type = IP_PROTOCOL_IPV6;
+		  oh6_0->ip6.ip_version_traffic_class_and_flow_label =
+		    ih6_0->ip6.ip_version_traffic_class_and_flow_label;
+		}
+	      else
+		{
+		  next_hdr_type = ih6_0->ip6.protocol;
+		  memmove (oh6_0, ih6_0, sizeof (ip6_header_t));
+		}
+
+	      oh6_0->ip6.protocol = IP_PROTOCOL_IPSEC_ESP;
+	      oh6_0->ip6.hop_limit = 254;
+	      oh6_0->esp.spi = clib_net_to_host_u32 (sa0->spi);
+	      oh6_0->esp.seq = clib_net_to_host_u32 (sa0->seq);
+	    }
+	  else
+	    {
+	      ip_hdr_size = sizeof (ip4_header_t);
+	      oh0 = vlib_buffer_get_current (b0);
+
+	      if (PREDICT_TRUE (sa0->is_tunnel))
+		{
+		  next_hdr_type = IP_PROTOCOL_IP_IN_IP;
+		  oh0->ip4.tos = ih0->ip4.tos;
+		}
+	      else
+		{
+		  next_hdr_type = ih0->ip4.protocol;
+		  memmove (oh0, ih0, sizeof (ip4_header_t));
+		}
+
+	      oh0->ip4.ip_version_and_header_length = 0x45;
+	      oh0->ip4.fragment_id = 0;
+	      oh0->ip4.flags_and_fragment_offset = 0;
+	      oh0->ip4.ttl = 254;
+	      oh0->ip4.protocol = IP_PROTOCOL_IPSEC_ESP;
+	      oh0->esp.spi = clib_net_to_host_u32 (sa0->spi);
+	      oh0->esp.seq = clib_net_to_host_u32 (sa0->seq);
+	    }
+
+	  if (PREDICT_TRUE (sa0->is_tunnel && !sa0->is_tunnel_ip6))
+	    {
+	      oh0->ip4.src_address.as_u32 = sa0->tunnel_src_addr.ip4.as_u32;
+	      oh0->ip4.dst_address.as_u32 = sa0->tunnel_dst_addr.ip4.as_u32;
+
+	      /* in tunnel mode send it back to FIB */
+	      next0 = ESP_ENCRYPT_NEXT_IP4_LOOKUP;
+	      vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+	    }
+	  else if (sa0->is_tunnel && sa0->is_tunnel_ip6)
+	    {
+	      oh6_0->ip6.src_address.as_u64[0] =
+		sa0->tunnel_src_addr.ip6.as_u64[0];
+	      oh6_0->ip6.src_address.as_u64[1] =
+		sa0->tunnel_src_addr.ip6.as_u64[1];
+	      oh6_0->ip6.dst_address.as_u64[0] =
+		sa0->tunnel_dst_addr.ip6.as_u64[0];
+	      oh6_0->ip6.dst_address.as_u64[1] =
+		sa0->tunnel_dst_addr.ip6.as_u64[1];
+
+	      /* in tunnel mode send it back to FIB */
+	      next0 = ESP_ENCRYPT_NEXT_IP6_LOOKUP;
+	      vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+	    }
+	  else
+	    {
+	      next0 = ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT;
+	      transport_mode = 1;
+	    }
+
+	  ASSERT (sa0->crypto_alg < IPSEC_CRYPTO_N_ALG);
+	  ASSERT (sa0->crypto_alg != IPSEC_CRYPTO_ALG_NONE);
+
+	  int blocks = 1 + (orig_sz + 1) / BLOCK_SIZE;
+
+	  /* pad packet in input buffer */
+	  u8 pad_bytes = BLOCK_SIZE * blocks - 2 - orig_sz;
+	  u8 i;
+	  u8 *padding = vlib_buffer_get_current (b0) + b0->current_length;
+
+	  for (i = 0; i < pad_bytes; ++i)
+	    padding[i] = i + 1;
+
+	  f0 = vlib_buffer_get_current (b0) + b0->current_length + pad_bytes;
+	  f0->pad_length = pad_bytes;
+	  f0->next_header = next_hdr_type;
+	  b0->current_length += pad_bytes + 2 +
+	    em->esp_integ_algs[sa0->integ_alg].trunc_size;
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
+	    vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  b0->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
+
+	  struct rte_crypto_sym_op *sym_cop;
+	  sym_cop = (struct rte_crypto_sym_op *) (cop + 1);
+
+	  dpdk_cop_priv_t *priv = (dpdk_cop_priv_t *) (sym_cop + 1);
+
+	  vnet_buffer (b0)->unused[0] = next0;
+
+	  mb0 = rte_mbuf_from_vlib_buffer (b0);
+	  mb0->data_len = b0->current_length;
+	  mb0->pkt_len = b0->current_length;
+	  mb0->data_off = RTE_PKTMBUF_HEADROOM + b0->current_data;
+
+	  rte_crypto_op_attach_sym_session (cop, sess);
+
+	  sym_cop->m_src = mb0;
+
+	  dpdk_gcm_cnt_blk *icb = &priv->cb;
+	  icb->salt = sa0->salt;
+	  icb->iv[0] = sa0->seq;
+	  icb->iv[1] = sa0->seq_hi;
+
+	  if (sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
+	    {
+	      icb->cnt = clib_host_to_net_u32 (1);
+	      clib_memcpy (vlib_buffer_get_current (b0) + ip_hdr_size +
+			   sizeof (esp_header_t), icb->iv, 8);
+	      sym_cop->cipher.data.offset =
+		ip_hdr_size + sizeof (esp_header_t) + iv_size;
+	      sym_cop->cipher.data.length = BLOCK_SIZE * blocks;
+	      sym_cop->cipher.iv.length = 16;
+	    }
+	  else
+	    {
+	      sym_cop->cipher.data.offset =
+		ip_hdr_size + sizeof (esp_header_t);
+	      sym_cop->cipher.data.length = BLOCK_SIZE * blocks + iv_size;
+	      sym_cop->cipher.iv.length = iv_size;
+	    }
+
+	  sym_cop->cipher.iv.data = (u8 *) icb;
+	  sym_cop->cipher.iv.phys_addr = cop->phys_addr + (uintptr_t) icb
+	    - (uintptr_t) cop;
+
+
+	  ASSERT (sa0->integ_alg < IPSEC_INTEG_N_ALG);
+	  ASSERT (sa0->integ_alg != IPSEC_INTEG_ALG_NONE);
+
+	  if (PREDICT_FALSE (sa0->integ_alg == IPSEC_INTEG_ALG_AES_GCM_128))
+	    {
+	      u8 *aad = priv->aad;
+	      clib_memcpy (aad, vlib_buffer_get_current (b0) + ip_hdr_size,
+			   8);
+	      sym_cop->auth.aad.data = aad;
+	      sym_cop->auth.aad.phys_addr = cop->phys_addr +
+		(uintptr_t) aad - (uintptr_t) cop;
+
+	      if (PREDICT_FALSE (sa0->use_esn))
+		{
+		  *((u32 *) & aad[8]) = sa0->seq_hi;
+		  sym_cop->auth.aad.length = 12;
+		}
+	      else
+		{
+		  sym_cop->auth.aad.length = 8;
+		}
+	    }
+	  else
+	    {
+	      sym_cop->auth.data.offset = ip_hdr_size;
+	      sym_cop->auth.data.length = b0->current_length - ip_hdr_size
+		- em->esp_integ_algs[sa0->integ_alg].trunc_size;
+
+	      if (PREDICT_FALSE (sa0->use_esn))
+		{
+		  u8 *payload_end =
+		    vlib_buffer_get_current (b0) + b0->current_length;
+		  *((u32 *) payload_end) = sa0->seq_hi;
+		  sym_cop->auth.data.length += sizeof (sa0->seq_hi);
+		}
+	    }
+	  sym_cop->auth.digest.data = vlib_buffer_get_current (b0) +
+	    b0->current_length -
+	    em->esp_integ_algs[sa0->integ_alg].trunc_size;
+	  sym_cop->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset (mb0,
+								       b0->current_length
+								       -
+								       em->esp_integ_algs
+								       [sa0->integ_alg].trunc_size);
+	  sym_cop->auth.digest.length =
+	    em->esp_integ_algs[sa0->integ_alg].trunc_size;
+
+
+	  if (PREDICT_FALSE (is_ipv6))
+	    {
+	      oh6_0->ip6.payload_length =
+		clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0) -
+				      sizeof (ip6_header_t));
+	    }
+	  else
+	    {
+	      oh0->ip4.length =
+		clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
+	      oh0->ip4.checksum = ip4_header_checksum (&oh0->ip4);
+	    }
+
+	  if (transport_mode)
+	    vlib_buffer_advance (b0, -sizeof (ethernet_header_t));
+
+	trace:
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      esp_encrypt_trace_t *tr =
+		vlib_add_trace (vm, node, b0, sizeof (*tr));
+	      tr->spi = sa0->spi;
+	      tr->seq = sa0->seq - 1;
+	      tr->crypto_alg = sa0->crypto_alg;
+	      tr->integ_alg = sa0->integ_alg;
+	    }
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, dpdk_esp_encrypt_node.index,
+			       ESP_ENCRYPT_ERROR_RX_PKTS,
+			       from_frame->n_vectors);
+  crypto_qp_data_t *qpd;
+  /* *INDENT-OFF* */
+  vec_foreach_index (i, cwm->qp_data)
+    {
+      u32 enq;
+
+      qpd = vec_elt_at_index(cwm->qp_data, i);
+      enq = rte_cryptodev_enqueue_burst(qpd->dev_id, qpd->qp_id,
+					qpd->cops, n_cop_qp[i]);
+      qpd->inflights += enq;
+
+      if (PREDICT_FALSE(enq < n_cop_qp[i]))
+	{
+	  crypto_free_cop (qpd, &qpd->cops[enq], n_cop_qp[i] - enq);
+	  vlib_buffer_free (vm, &qpd->bi[enq], n_cop_qp[i] - enq);
+
+          vlib_node_increment_counter (vm, dpdk_esp_encrypt_node.index,
+				       ESP_ENCRYPT_ERROR_ENQ_FAIL,
+				       n_cop_qp[i] - enq);
+        }
+    }
+  /* *INDENT-ON* */
+
+  return from_frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (dpdk_esp_encrypt_node) =
+{
+  .function = dpdk_esp_encrypt_node_fn,.name = "dpdk-esp-encrypt",.flags =
+    VLIB_NODE_FLAG_IS_OUTPUT,.vector_size = sizeof (u32),.format_trace =
+    format_esp_encrypt_trace,.n_errors =
+    ARRAY_LEN (esp_encrypt_error_strings),.error_strings =
+    esp_encrypt_error_strings,.n_next_nodes = 1,.next_nodes =
+  {
+  [ESP_ENCRYPT_NEXT_DROP] = "error-drop",}
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp_encrypt_node, dpdk_esp_encrypt_node_fn)
+/*
+ * ESP Encrypt Post Node
+ */
+#define foreach_esp_encrypt_post_error              \
+ _(PKTS, "ESP post pkts")
+     typedef enum
+     {
+#define _(sym,str) ESP_ENCRYPT_POST_ERROR_##sym,
+       foreach_esp_encrypt_post_error
+#undef _
+	 ESP_ENCRYPT_POST_N_ERROR,
+     } esp_encrypt_post_error_t;
+
+     static char *esp_encrypt_post_error_strings[] = {
+#define _(sym,string) string,
+       foreach_esp_encrypt_post_error
+#undef _
+     };
+
+vlib_node_registration_t dpdk_esp_encrypt_post_node;
+
+static u8 *
+format_esp_encrypt_post_trace (u8 * s, va_list * args)
+{
+  return s;
+}
+
+static uword
+dpdk_esp_encrypt_post_node_fn (vlib_main_t * vm,
+			       vlib_node_runtime_t * node,
+			       vlib_frame_t * from_frame)
+{
+  u32 n_left_from, *from, *to_next = 0, next_index;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, next0;
+	  vlib_buffer_t *b0 = 0;
+
+	  bi0 = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  to_next[0] = bi0;
+	  to_next += 1;
+
+	  next0 = vnet_buffer (b0)->unused[0];
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next, bi0,
+					   next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, dpdk_esp_encrypt_post_node.index,
+			       ESP_ENCRYPT_POST_ERROR_PKTS,
+			       from_frame->n_vectors);
+
+  return from_frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (dpdk_esp_encrypt_post_node) =
+{
+  .function = dpdk_esp_encrypt_post_node_fn,.name =
+    "dpdk-esp-encrypt-post",.vector_size = sizeof (u32),.format_trace =
+    format_esp_encrypt_post_trace,.type = VLIB_NODE_TYPE_INTERNAL,.n_errors =
+    ARRAY_LEN (esp_encrypt_post_error_strings),.error_strings =
+    esp_encrypt_post_error_strings,.n_next_nodes =
+    ESP_ENCRYPT_N_NEXT,.next_nodes =
+  {
+#define _(s,n) [ESP_ENCRYPT_NEXT_##s] = n,
+    foreach_esp_encrypt_next
+#undef _
+  }
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp_encrypt_post_node,
+			      dpdk_esp_encrypt_post_node_fn)
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/ipsec/ipsec.c b/src/vnet/devices/dpdk/ipsec/ipsec.c
new file mode 100644
index 00000000..de253f02
--- /dev/null
+++ b/src/vnet/devices/dpdk/ipsec/ipsec.c
@@ -0,0 +1,313 @@
+/*
+ * Copyright (c) 2016 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/api_errno.h>
+#include <vnet/devices/dpdk/dpdk.h>
+#include <vnet/devices/dpdk/ipsec/ipsec.h>
+#include <vnet/devices/dpdk/ipsec/esp.h>
+#include <vnet/ipsec/ipsec.h>
+
+#define DPDK_CRYPTO_NB_OBJS	  2048
+#define DPDK_CRYPTO_CACHE_SIZE	  512
+#define DPDK_CRYPTO_PRIV_SIZE	  128
+#define DPDK_CRYPTO_N_QUEUE_DESC  512
+#define DPDK_CRYPTO_NB_COPS	  (1024 * 4)
+
+/*
+ * return:
+ * -1: 	update failed
+ * 0:	already exist
+ * 1:	mapped
+ */
+static int
+update_qp_data (crypto_worker_main_t * cwm,
+		u8 cdev_id, u16 qp_id, u8 is_outbound, u16 * idx)
+{
+  crypto_qp_data_t *qpd;
+
+  /* *INDENT-OFF* */
+  vec_foreach_index (*idx, cwm->qp_data)
+    {
+      qpd = vec_elt_at_index(cwm->qp_data, *idx);
+
+      if (qpd->dev_id == cdev_id && qpd->qp_id == qp_id &&
+	  qpd->is_outbound == is_outbound)
+	  return 0;
+    }
+  /* *INDENT-ON* */
+
+  vec_add2 (cwm->qp_data, qpd, 1);
+
+  qpd->dev_id = cdev_id;
+  qpd->qp_id = qp_id;
+  qpd->is_outbound = is_outbound;
+
+  return 1;
+}
+
+/*
+ * return:
+ * 	-1: error
+ * 	0: already exist
+ * 	1: mapped
+ */
+static int
+add_mapping (crypto_worker_main_t * cwm,
+	     u8 cdev_id, u16 qp, u8 is_outbound,
+	     const struct rte_cryptodev_capabilities *cipher_cap,
+	     const struct rte_cryptodev_capabilities *auth_cap)
+{
+  int mapped;
+  u16 qp_index;
+  uword key = 0, data, *ret;
+  crypto_worker_qp_key_t *p_key = (crypto_worker_qp_key_t *) & key;
+
+  p_key->cipher_algo = (u8) cipher_cap->sym.cipher.algo;
+  p_key->auth_algo = (u8) auth_cap->sym.auth.algo;
+  p_key->is_outbound = is_outbound;
+
+  ret = hash_get (cwm->algo_qp_map, key);
+  if (ret)
+    return 0;
+
+  mapped = update_qp_data (cwm, cdev_id, qp, is_outbound, &qp_index);
+  if (mapped < 0)
+    return -1;
+
+  data = (uword) qp_index;
+
+  ret = hash_set (cwm->algo_qp_map, key, data);
+  if (!ret)
+    rte_panic ("Failed to insert hash table\n");
+
+  return mapped;
+}
+
+/*
+ * return:
+ * 	0: already exist
+ * 	1: mapped
+ */
+static int
+add_cdev_mapping (crypto_worker_main_t * cwm,
+		  struct rte_cryptodev_info *dev_info, u8 cdev_id,
+		  u16 qp, u8 is_outbound)
+{
+  const struct rte_cryptodev_capabilities *i, *j;
+  u32 mapped = 0;
+
+  for (i = dev_info->capabilities; i->op != RTE_CRYPTO_OP_TYPE_UNDEFINED; i++)
+    {
+      if (i->sym.xform_type != RTE_CRYPTO_SYM_XFORM_CIPHER)
+	continue;
+
+      if (check_algo_is_supported (i, NULL) != 0)
+	continue;
+
+      for (j = dev_info->capabilities; j->op != RTE_CRYPTO_OP_TYPE_UNDEFINED;
+	   j++)
+	{
+	  int status = 0;
+
+	  if (j->sym.xform_type != RTE_CRYPTO_SYM_XFORM_AUTH)
+	    continue;
+
+	  if (check_algo_is_supported (j, NULL) != 0)
+	    continue;
+
+	  status = add_mapping (cwm, cdev_id, qp, is_outbound, i, j);
+	  if (status == 1)
+	    mapped += 1;
+	  if (status < 0)
+	    return status;
+	}
+    }
+
+  return mapped;
+}
+
+static int
+check_cryptodev_queues ()
+{
+  u32 n_qs = 0;
+  u8 cdev_id;
+  u32 n_req_qs = 2;
+
+  if (vlib_num_workers () > 0)
+    n_req_qs = vlib_num_workers () * 2;
+
+  for (cdev_id = 0; cdev_id < rte_cryptodev_count (); cdev_id++)
+    {
+      struct rte_cryptodev_info cdev_info;
+
+      rte_cryptodev_info_get (cdev_id, &cdev_info);
+
+      if (!
+	  (cdev_info.feature_flags & RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING))
+	continue;
+
+      n_qs += cdev_info.max_nb_queue_pairs;
+    }
+
+  if (n_qs >= n_req_qs)
+    return 0;
+  else
+    return -1;
+}
+
+static clib_error_t *
+dpdk_ipsec_init (vlib_main_t * vm)
+{
+  dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  struct rte_cryptodev_config dev_conf;
+  struct rte_cryptodev_qp_conf qp_conf;
+  struct rte_cryptodev_info cdev_info;
+  struct rte_mempool *rmp;
+  i32 dev_id, ret;
+  u32 i, skip_master;
+
+  if (check_cryptodev_queues () < 0)
+    return clib_error_return (0, "not enough cryptodevs for ipsec");
+
+  vec_alloc (dcm->workers_main, tm->n_vlib_mains);
+  _vec_len (dcm->workers_main) = tm->n_vlib_mains;
+
+  fprintf (stdout, "DPDK Cryptodevs info:\n");
+  fprintf (stdout, "dev_id\tn_qp\tnb_obj\tcache_size\n");
+  /* HW cryptodevs have higher dev_id, use HW first */
+  for (dev_id = rte_cryptodev_count () - 1; dev_id >= 0; dev_id--)
+    {
+      u16 max_nb_qp, qp = 0;
+      skip_master = vlib_num_workers () > 0;
+
+      rte_cryptodev_info_get (dev_id, &cdev_info);
+
+      if (!
+	  (cdev_info.feature_flags & RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING))
+	continue;
+
+      max_nb_qp = cdev_info.max_nb_queue_pairs;
+
+      for (i = 0; i < tm->n_vlib_mains; i++)
+	{
+	  u8 is_outbound;
+	  crypto_worker_main_t *cwm;
+	  uword *map;
+
+	  if (skip_master)
+	    {
+	      skip_master = 0;
+	      continue;
+	    }
+
+	  cwm = vec_elt_at_index (dcm->workers_main, i);
+	  map = cwm->algo_qp_map;
+
+	  if (!map)
+	    {
+	      map = hash_create (0, sizeof (crypto_worker_qp_key_t));
+	      if (!map)
+		return clib_error_return (0, "unable to create hash table "
+					  "for worker %u",
+					  vlib_mains[i]->cpu_index);
+	      cwm->algo_qp_map = map;
+	    }
+
+	  for (is_outbound = 0; is_outbound < 2 && qp < max_nb_qp;
+	       is_outbound++)
+	    {
+	      int mapped = add_cdev_mapping (cwm, &cdev_info,
+					     dev_id, qp, is_outbound);
+	      if (mapped > 0)
+		qp++;
+
+	      if (mapped < 0)
+		return clib_error_return (0,
+					  "too many queues for one worker");
+	    }
+	}
+
+      if (qp == 0)
+	continue;
+
+      dev_conf.socket_id = rte_cryptodev_socket_id (dev_id);
+      dev_conf.nb_queue_pairs = cdev_info.max_nb_queue_pairs;
+      dev_conf.session_mp.nb_objs = DPDK_CRYPTO_NB_OBJS;
+      dev_conf.session_mp.cache_size = DPDK_CRYPTO_CACHE_SIZE;
+
+      ret = rte_cryptodev_configure (dev_id, &dev_conf);
+      if (ret < 0)
+	return clib_error_return (0, "cryptodev %u config error", dev_id);
+
+      qp_conf.nb_descriptors = DPDK_CRYPTO_N_QUEUE_DESC;
+      for (qp = 0; qp < dev_conf.nb_queue_pairs; qp++)
+	{
+	  ret = rte_cryptodev_queue_pair_setup (dev_id, qp, &qp_conf,
+						dev_conf.socket_id);
+	  if (ret < 0)
+	    return clib_error_return (0, "cryptodev %u qp %u setup error",
+				      dev_id, qp);
+	}
+      fprintf (stdout, "%u\t%u\t%u\t%u\n", dev_id, dev_conf.nb_queue_pairs,
+	       DPDK_CRYPTO_NB_OBJS, DPDK_CRYPTO_CACHE_SIZE);
+    }
+
+  u32 socket_id = rte_socket_id ();
+
+  vec_validate_aligned (dcm->cop_pools, socket_id, CLIB_CACHE_LINE_BYTES);
+
+  /* pool already exists, nothing to do */
+  if (dcm->cop_pools[socket_id])
+    return 0;
+
+  u8 *pool_name = format (0, "crypto_op_pool_socket%u%c", socket_id, 0);
+
+  rmp = rte_crypto_op_pool_create ((char *) pool_name,
+				   RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+				   DPDK_CRYPTO_NB_COPS *
+				   (1 + vlib_num_workers ()),
+				   DPDK_CRYPTO_CACHE_SIZE,
+				   DPDK_CRYPTO_PRIV_SIZE, socket_id);
+  vec_free (pool_name);
+
+  if (!rmp)
+    return clib_error_return (0, "failed to allocate mempool on socket %u",
+			      socket_id);
+  dcm->cop_pools[socket_id] = rmp;
+
+  dpdk_esp_init ();
+
+  if (vec_len (vlib_mains) == 0)
+    vlib_node_set_state (&vlib_global_main, dpdk_crypto_input_node.index,
+			 VLIB_NODE_STATE_POLLING);
+  else
+    for (i = 1; i < tm->n_vlib_mains; i++)
+      vlib_node_set_state (vlib_mains[i], dpdk_crypto_input_node.index,
+			   VLIB_NODE_STATE_POLLING);
+
+  return 0;
+}
+
+VLIB_MAIN_LOOP_ENTER_FUNCTION (dpdk_ipsec_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/ipsec/ipsec.h b/src/vnet/devices/dpdk/ipsec/ipsec.h
new file mode 100644
index 00000000..e6c7498c
--- /dev/null
+++ b/src/vnet/devices/dpdk/ipsec/ipsec.h
@@ -0,0 +1,227 @@
+/*
+ * Copyright (c) 2016 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __DPDK_IPSEC_H__
+#define __DPDK_IPSEC_H__
+
+#include <vnet/vnet.h>
+
+#undef always_inline
+#include <rte_crypto.h>
+#include <rte_cryptodev.h>
+
+#if CLIB_DEBUG > 0
+#define always_inline static inline
+#else
+#define always_inline static inline __attribute__ ((__always_inline__))
+#endif
+
+
+#define MAX_QP_PER_LCORE 16
+
+typedef struct
+{
+  u32 salt;
+  u32 iv[2];
+  u32 cnt;
+} dpdk_gcm_cnt_blk;
+
+typedef struct
+{
+  dpdk_gcm_cnt_blk cb;
+  union
+  {
+    u8 aad[12];
+    u8 icv[64];
+  };
+} dpdk_cop_priv_t;
+
+typedef struct
+{
+  u8 cipher_algo;
+  u8 auth_algo;
+  u8 is_outbound;
+} crypto_worker_qp_key_t;
+
+typedef struct
+{
+  u16 dev_id;
+  u16 qp_id;
+  u16 is_outbound;
+  i16 inflights;
+  u32 bi[VLIB_FRAME_SIZE];
+  struct rte_crypto_op *cops[VLIB_FRAME_SIZE];
+  struct rte_crypto_op **free_cops;
+} crypto_qp_data_t;
+
+typedef struct
+{
+  u8 qp_index;
+  void *sess;
+} crypto_sa_session_t;
+
+typedef struct
+{
+  crypto_sa_session_t *sa_sess_d[2];
+  crypto_qp_data_t *qp_data;
+  uword *algo_qp_map;
+} crypto_worker_main_t;
+
+typedef struct
+{
+  struct rte_mempool **cop_pools;
+  crypto_worker_main_t *workers_main;
+} dpdk_crypto_main_t;
+
+dpdk_crypto_main_t dpdk_crypto_main;
+
+extern vlib_node_registration_t dpdk_crypto_input_node;
+
+#define CRYPTO_N_FREE_COPS (VLIB_FRAME_SIZE * 3)
+
+static_always_inline void
+crypto_alloc_cops ()
+{
+  dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
+  u32 cpu_index = os_get_cpu_number ();
+  crypto_worker_main_t *cwm = &dcm->workers_main[cpu_index];
+  unsigned socket_id = rte_socket_id ();
+  crypto_qp_data_t *qpd;
+
+  /* *INDENT-OFF* */
+  vec_foreach (qpd, cwm->qp_data)
+    {
+      u32 l = vec_len (qpd->free_cops);
+
+      if (PREDICT_FALSE (l < VLIB_FRAME_SIZE))
+	{
+	  u32 n_alloc;
+
+	  if (PREDICT_FALSE (!qpd->free_cops))
+	    vec_alloc (qpd->free_cops, CRYPTO_N_FREE_COPS);
+
+	  n_alloc = rte_crypto_op_bulk_alloc (dcm->cop_pools[socket_id],
+					      RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+					      &qpd->free_cops[l],
+					      CRYPTO_N_FREE_COPS - l - 1);
+
+	  _vec_len (qpd->free_cops) = l + n_alloc;
+	}
+    }
+  /* *INDENT-ON* */
+}
+
+static_always_inline void
+crypto_free_cop (crypto_qp_data_t * qpd, struct rte_crypto_op **cops, u32 n)
+{
+  u32 l = vec_len (qpd->free_cops);
+
+  if (l + n >= CRYPTO_N_FREE_COPS)
+    {
+      l -= VLIB_FRAME_SIZE;
+      rte_mempool_put_bulk (cops[0]->mempool,
+			    (void **) &qpd->free_cops[l], VLIB_FRAME_SIZE);
+    }
+  clib_memcpy (&qpd->free_cops[l], cops, sizeof (*cops) * n);
+
+  _vec_len (qpd->free_cops) = l + n;
+}
+
+static_always_inline int
+check_algo_is_supported (const struct rte_cryptodev_capabilities *cap,
+			 char *name)
+{
+  struct
+  {
+    uint8_t cipher_algo;
+    enum rte_crypto_sym_xform_type type;
+    union
+    {
+      enum rte_crypto_auth_algorithm auth;
+      enum rte_crypto_cipher_algorithm cipher;
+    };
+    char *name;
+  } supported_algo[] =
+  {
+    {
+    .type = RTE_CRYPTO_SYM_XFORM_CIPHER,.cipher =
+	RTE_CRYPTO_CIPHER_NULL,.name = "NULL"},
+    {
+    .type = RTE_CRYPTO_SYM_XFORM_CIPHER,.cipher =
+	RTE_CRYPTO_CIPHER_AES_CBC,.name = "AES_CBC"},
+    {
+    .type = RTE_CRYPTO_SYM_XFORM_CIPHER,.cipher =
+	RTE_CRYPTO_CIPHER_AES_CTR,.name = "AES_CTR"},
+    {
+    .type = RTE_CRYPTO_SYM_XFORM_CIPHER,.cipher =
+	RTE_CRYPTO_CIPHER_3DES_CBC,.name = "3DES-CBC"},
+    {
+    .type = RTE_CRYPTO_SYM_XFORM_CIPHER,.auth =
+	RTE_CRYPTO_CIPHER_AES_GCM,.name = "AES-GCM"},
+    {
+    .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
+	RTE_CRYPTO_AUTH_SHA1_HMAC,.name = "HMAC-SHA1"},
+    {
+    .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
+	RTE_CRYPTO_AUTH_SHA256_HMAC,.name = "HMAC-SHA256"},
+    {
+    .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
+	RTE_CRYPTO_AUTH_SHA384_HMAC,.name = "HMAC-SHA384"},
+    {
+    .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
+	RTE_CRYPTO_AUTH_SHA512_HMAC,.name = "HMAC-SHA512"},
+    {
+    .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
+	RTE_CRYPTO_AUTH_AES_XCBC_MAC,.name = "AES-XCBC-MAC"},
+    {
+    .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
+	RTE_CRYPTO_AUTH_AES_GCM,.name = "AES-GCM"},
+    {
+      /* tail */
+  .type = RTE_CRYPTO_SYM_XFORM_NOT_SPECIFIED},};
+  uint32_t i = 0;
+
+  if (cap->op != RTE_CRYPTO_OP_TYPE_SYMMETRIC)
+    return -1;
+
+  while (supported_algo[i].type != RTE_CRYPTO_SYM_XFORM_NOT_SPECIFIED)
+    {
+      if (cap->sym.xform_type == supported_algo[i].type)
+	{
+	  if ((cap->sym.xform_type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
+	       cap->sym.cipher.algo == supported_algo[i].cipher) ||
+	      (cap->sym.xform_type == RTE_CRYPTO_SYM_XFORM_AUTH &&
+	       cap->sym.auth.algo == supported_algo[i].auth))
+	    {
+	      if (name)
+		strcpy (name, supported_algo[i].name);
+	      return 0;
+	    }
+	}
+
+      i++;
+    }
+
+  return -1;
+}
+
+#endif /* __DPDK_IPSEC_H__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/node.c b/src/vnet/devices/dpdk/node.c
new file mode 100644
index 00000000..e541cdbc
--- /dev/null
+++ b/src/vnet/devices/dpdk/node.c
@@ -0,0 +1,687 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/vnet.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/error.h>
+#include <vppinfra/format.h>
+#include <vppinfra/xxhash.h>
+
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/devices/dpdk/dpdk.h>
+#include <vnet/classify/vnet_classify.h>
+#include <vnet/mpls/packet.h>
+#include <vnet/handoff.h>
+#include <vnet/devices/devices.h>
+#include <vnet/feature/feature.h>
+
+#include "dpdk_priv.h"
+
+static char *dpdk_error_strings[] = {
+#define _(n,s) s,
+  foreach_dpdk_error
+#undef _
+};
+
+always_inline int
+vlib_buffer_is_ip4 (vlib_buffer_t * b)
+{
+  ethernet_header_t *h = (ethernet_header_t *) b->data;
+  return (h->type == clib_host_to_net_u16 (ETHERNET_TYPE_IP4));
+}
+
+always_inline int
+vlib_buffer_is_ip6 (vlib_buffer_t * b)
+{
+  ethernet_header_t *h = (ethernet_header_t *) b->data;
+  return (h->type == clib_host_to_net_u16 (ETHERNET_TYPE_IP6));
+}
+
+always_inline int
+vlib_buffer_is_mpls (vlib_buffer_t * b)
+{
+  ethernet_header_t *h = (ethernet_header_t *) b->data;
+  return (h->type == clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST));
+}
+
+#if RTE_VERSION < RTE_VERSION_NUM(16, 11, 0, 0)
+/* New ol_flags bits added in DPDK-16.11 */
+#define PKT_RX_IP_CKSUM_GOOD    (1ULL << 7)
+#endif
+
+always_inline u32
+dpdk_rx_next_from_etype (struct rte_mbuf * mb, vlib_buffer_t * b0)
+{
+  if (PREDICT_TRUE (vlib_buffer_is_ip4 (b0)))
+    if (PREDICT_TRUE ((mb->ol_flags & PKT_RX_IP_CKSUM_GOOD) != 0))
+      return VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT;
+    else
+      return VNET_DEVICE_INPUT_NEXT_IP4_INPUT;
+  else if (PREDICT_TRUE (vlib_buffer_is_ip6 (b0)))
+    return VNET_DEVICE_INPUT_NEXT_IP6_INPUT;
+  else if (PREDICT_TRUE (vlib_buffer_is_mpls (b0)))
+    return VNET_DEVICE_INPUT_NEXT_MPLS_INPUT;
+  else
+    return VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
+}
+
+always_inline int
+dpdk_mbuf_is_vlan (struct rte_mbuf *mb)
+{
+#if RTE_VERSION >= RTE_VERSION_NUM(16, 11, 0, 0)
+  return (mb->packet_type & RTE_PTYPE_L2_ETHER_VLAN) ==
+    RTE_PTYPE_L2_ETHER_VLAN;
+#else
+  return
+    (mb->ol_flags &
+     (PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED | PKT_RX_QINQ_STRIPPED)) ==
+    PKT_RX_VLAN_PKT;
+#endif
+}
+
+always_inline int
+dpdk_mbuf_is_ip4 (struct rte_mbuf *mb)
+{
+  return RTE_ETH_IS_IPV4_HDR (mb->packet_type) != 0;
+}
+
+always_inline int
+dpdk_mbuf_is_ip6 (struct rte_mbuf *mb)
+{
+  return RTE_ETH_IS_IPV6_HDR (mb->packet_type) != 0;
+}
+
+always_inline u32
+dpdk_rx_next_from_mb (struct rte_mbuf * mb, vlib_buffer_t * b0)
+{
+  if (PREDICT_FALSE (dpdk_mbuf_is_vlan (mb)))
+    return VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
+  else if (PREDICT_TRUE (dpdk_mbuf_is_ip4 (mb)))
+    return VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT;
+  else if (PREDICT_TRUE (dpdk_mbuf_is_ip6 (mb)))
+    return VNET_DEVICE_INPUT_NEXT_IP6_INPUT;
+  else if (PREDICT_TRUE (vlib_buffer_is_mpls (b0)))
+    return VNET_DEVICE_INPUT_NEXT_MPLS_INPUT;
+  else
+    return dpdk_rx_next_from_etype (mb, b0);
+}
+
+always_inline void
+dpdk_rx_error_from_mb (struct rte_mbuf *mb, u32 * next, u8 * error)
+{
+  if (mb->ol_flags & PKT_RX_IP_CKSUM_BAD)
+    {
+      *error = DPDK_ERROR_IP_CHECKSUM_ERROR;
+      *next = VNET_DEVICE_INPUT_NEXT_DROP;
+    }
+  else
+    *error = DPDK_ERROR_NONE;
+}
+
+void
+dpdk_rx_trace (dpdk_main_t * dm,
+	       vlib_node_runtime_t * node,
+	       dpdk_device_t * xd,
+	       u16 queue_id, u32 * buffers, uword n_buffers)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  u32 *b, n_left;
+  u32 next0;
+
+  n_left = n_buffers;
+  b = buffers;
+
+  while (n_left >= 1)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      dpdk_rx_dma_trace_t *t0;
+      struct rte_mbuf *mb;
+      u8 error0;
+
+      bi0 = b[0];
+      n_left -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      mb = rte_mbuf_from_vlib_buffer (b0);
+
+      if (PREDICT_FALSE (xd->per_interface_next_index != ~0))
+	next0 = xd->per_interface_next_index;
+      else if (PREDICT_TRUE
+	       ((xd->flags & DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE) != 0))
+	next0 = dpdk_rx_next_from_mb (mb, b0);
+      else
+	next0 = dpdk_rx_next_from_etype (mb, b0);
+
+      dpdk_rx_error_from_mb (mb, &next0, &error0);
+
+      vlib_trace_buffer (vm, node, next0, b0, /* follow_chain */ 0);
+      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+      t0->queue_index = queue_id;
+      t0->device_index = xd->device_index;
+      t0->buffer_index = bi0;
+
+      clib_memcpy (&t0->mb, mb, sizeof (t0->mb));
+      clib_memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
+      clib_memcpy (t0->buffer.pre_data, b0->data,
+		   sizeof (t0->buffer.pre_data));
+      clib_memcpy (&t0->data, mb->buf_addr + mb->data_off, sizeof (t0->data));
+
+      b += 1;
+    }
+}
+
+static inline u32
+dpdk_rx_burst (dpdk_main_t * dm, dpdk_device_t * xd, u16 queue_id)
+{
+  u32 n_buffers;
+  u32 n_left;
+  u32 n_this_chunk;
+
+  n_left = VLIB_FRAME_SIZE;
+  n_buffers = 0;
+
+  if (PREDICT_TRUE (xd->flags & DPDK_DEVICE_FLAG_PMD))
+    {
+      while (n_left)
+	{
+	  n_this_chunk = rte_eth_rx_burst (xd->device_index, queue_id,
+					   xd->rx_vectors[queue_id] +
+					   n_buffers, n_left);
+	  n_buffers += n_this_chunk;
+	  n_left -= n_this_chunk;
+
+	  /* Empirically, DPDK r1.8 produces vectors w/ 32 or fewer elts */
+	  if (n_this_chunk < 32)
+	    break;
+	}
+    }
+  else
+    {
+      ASSERT (0);
+    }
+
+  return n_buffers;
+}
+
+
+static_always_inline void
+dpdk_process_subseq_segs (vlib_main_t * vm, vlib_buffer_t * b,
+			  struct rte_mbuf *mb, vlib_buffer_free_list_t * fl)
+{
+  u8 nb_seg = 1;
+  struct rte_mbuf *mb_seg = 0;
+  vlib_buffer_t *b_seg, *b_chain = 0;
+  mb_seg = mb->next;
+  b_chain = b;
+
+  while ((mb->nb_segs > 1) && (nb_seg < mb->nb_segs))
+    {
+      ASSERT (mb_seg != 0);
+
+      b_seg = vlib_buffer_from_rte_mbuf (mb_seg);
+      vlib_buffer_init_for_free_list (b_seg, fl);
+
+      ASSERT ((b_seg->flags & VLIB_BUFFER_NEXT_PRESENT) == 0);
+      ASSERT (b_seg->current_data == 0);
+
+      /*
+       * The driver (e.g. virtio) may not put the packet data at the start
+       * of the segment, so don't assume b_seg->current_data == 0 is correct.
+       */
+      b_seg->current_data =
+	(mb_seg->buf_addr + mb_seg->data_off) - (void *) b_seg->data;
+
+      b_seg->current_length = mb_seg->data_len;
+      b->total_length_not_including_first_buffer += mb_seg->data_len;
+
+      b_chain->flags |= VLIB_BUFFER_NEXT_PRESENT;
+      b_chain->next_buffer = vlib_get_buffer_index (vm, b_seg);
+
+      b_chain = b_seg;
+      mb_seg = mb_seg->next;
+      nb_seg++;
+    }
+}
+
+static_always_inline void
+dpdk_prefetch_buffer (struct rte_mbuf *mb)
+{
+  vlib_buffer_t *b = vlib_buffer_from_rte_mbuf (mb);
+  CLIB_PREFETCH (mb, CLIB_CACHE_LINE_BYTES, LOAD);
+  CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, STORE);
+}
+
+/*
+ * This function is used when there are no worker threads.
+ * The main thread performs IO and forwards the packets.
+ */
+static_always_inline u32
+dpdk_device_input (dpdk_main_t * dm, dpdk_device_t * xd,
+		   vlib_node_runtime_t * node, u32 cpu_index, u16 queue_id)
+{
+  u32 n_buffers;
+  u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
+  u32 n_left_to_next, *to_next;
+  u32 mb_index;
+  vlib_main_t *vm = vlib_get_main ();
+  uword n_rx_bytes = 0;
+  u32 n_trace, trace_cnt __attribute__ ((unused));
+  vlib_buffer_free_list_t *fl;
+  u32 buffer_flags_template;
+
+  if ((xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP) == 0)
+    return 0;
+
+  n_buffers = dpdk_rx_burst (dm, xd, queue_id);
+
+  if (n_buffers == 0)
+    {
+      return 0;
+    }
+
+  buffer_flags_template = dm->buffer_flags_template;
+
+  vec_reset_length (xd->d_trace_buffers[cpu_index]);
+  trace_cnt = n_trace = vlib_get_trace_count (vm, node);
+
+  if (n_trace > 0)
+    {
+      u32 n = clib_min (n_trace, n_buffers);
+      mb_index = 0;
+
+      while (n--)
+	{
+	  struct rte_mbuf *mb = xd->rx_vectors[queue_id][mb_index++];
+	  vlib_buffer_t *b = vlib_buffer_from_rte_mbuf (mb);
+	  vec_add1 (xd->d_trace_buffers[cpu_index],
+		    vlib_get_buffer_index (vm, b));
+	}
+    }
+
+  fl = vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+
+  mb_index = 0;
+
+  while (n_buffers > 0)
+    {
+      vlib_buffer_t *b0, *b1, *b2, *b3;
+      u32 bi0, next0, l3_offset0;
+      u32 bi1, next1, l3_offset1;
+      u32 bi2, next2, l3_offset2;
+      u32 bi3, next3, l3_offset3;
+      u8 error0, error1, error2, error3;
+      u64 or_ol_flags;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_buffers > 8 && n_left_to_next > 4)
+	{
+	  struct rte_mbuf *mb0 = xd->rx_vectors[queue_id][mb_index];
+	  struct rte_mbuf *mb1 = xd->rx_vectors[queue_id][mb_index + 1];
+	  struct rte_mbuf *mb2 = xd->rx_vectors[queue_id][mb_index + 2];
+	  struct rte_mbuf *mb3 = xd->rx_vectors[queue_id][mb_index + 3];
+
+	  dpdk_prefetch_buffer (xd->rx_vectors[queue_id][mb_index + 4]);
+	  dpdk_prefetch_buffer (xd->rx_vectors[queue_id][mb_index + 5]);
+	  dpdk_prefetch_buffer (xd->rx_vectors[queue_id][mb_index + 6]);
+	  dpdk_prefetch_buffer (xd->rx_vectors[queue_id][mb_index + 7]);
+
+	  if (xd->flags & DPDK_DEVICE_FLAG_MAYBE_MULTISEG)
+	    {
+	      if (PREDICT_FALSE (mb0->nb_segs > 1))
+		dpdk_prefetch_buffer (mb0->next);
+	      if (PREDICT_FALSE (mb1->nb_segs > 1))
+		dpdk_prefetch_buffer (mb1->next);
+	      if (PREDICT_FALSE (mb2->nb_segs > 1))
+		dpdk_prefetch_buffer (mb2->next);
+	      if (PREDICT_FALSE (mb3->nb_segs > 1))
+		dpdk_prefetch_buffer (mb3->next);
+	    }
+
+	  ASSERT (mb0);
+	  ASSERT (mb1);
+	  ASSERT (mb2);
+	  ASSERT (mb3);
+
+	  or_ol_flags = (mb0->ol_flags | mb1->ol_flags |
+			 mb2->ol_flags | mb3->ol_flags);
+	  b0 = vlib_buffer_from_rte_mbuf (mb0);
+	  b1 = vlib_buffer_from_rte_mbuf (mb1);
+	  b2 = vlib_buffer_from_rte_mbuf (mb2);
+	  b3 = vlib_buffer_from_rte_mbuf (mb3);
+
+	  vlib_buffer_init_for_free_list (b0, fl);
+	  vlib_buffer_init_for_free_list (b1, fl);
+	  vlib_buffer_init_for_free_list (b2, fl);
+	  vlib_buffer_init_for_free_list (b3, fl);
+
+	  bi0 = vlib_get_buffer_index (vm, b0);
+	  bi1 = vlib_get_buffer_index (vm, b1);
+	  bi2 = vlib_get_buffer_index (vm, b2);
+	  bi3 = vlib_get_buffer_index (vm, b3);
+
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  to_next[2] = bi2;
+	  to_next[3] = bi3;
+	  to_next += 4;
+	  n_left_to_next -= 4;
+
+	  if (PREDICT_FALSE (xd->per_interface_next_index != ~0))
+	    {
+	      next0 = next1 = next2 = next3 = xd->per_interface_next_index;
+	    }
+	  else if (PREDICT_TRUE
+		   ((xd->flags & DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE) != 0))
+	    {
+	      next0 = dpdk_rx_next_from_mb (mb0, b0);
+	      next1 = dpdk_rx_next_from_mb (mb1, b1);
+	      next2 = dpdk_rx_next_from_mb (mb2, b2);
+	      next3 = dpdk_rx_next_from_mb (mb3, b3);
+	    }
+	  else
+	    {
+	      next0 = dpdk_rx_next_from_etype (mb0, b0);
+	      next1 = dpdk_rx_next_from_etype (mb1, b1);
+	      next2 = dpdk_rx_next_from_etype (mb2, b2);
+	      next3 = dpdk_rx_next_from_etype (mb3, b3);
+	    }
+
+	  if (PREDICT_FALSE (or_ol_flags & PKT_RX_IP_CKSUM_BAD))
+	    {
+	      dpdk_rx_error_from_mb (mb0, &next0, &error0);
+	      dpdk_rx_error_from_mb (mb1, &next1, &error1);
+	      dpdk_rx_error_from_mb (mb2, &next2, &error2);
+	      dpdk_rx_error_from_mb (mb3, &next3, &error3);
+	      b0->error = node->errors[error0];
+	      b1->error = node->errors[error1];
+	      b2->error = node->errors[error2];
+	      b3->error = node->errors[error3];
+	    }
+	  else
+	    {
+	      b0->error = b1->error = node->errors[DPDK_ERROR_NONE];
+	      b2->error = b3->error = node->errors[DPDK_ERROR_NONE];
+	    }
+
+	  l3_offset0 = device_input_next_node_advance[next0];
+	  l3_offset1 = device_input_next_node_advance[next1];
+	  l3_offset2 = device_input_next_node_advance[next2];
+	  l3_offset3 = device_input_next_node_advance[next3];
+
+	  b0->current_data = l3_offset0 + mb0->data_off;
+	  b1->current_data = l3_offset1 + mb1->data_off;
+	  b2->current_data = l3_offset2 + mb2->data_off;
+	  b3->current_data = l3_offset3 + mb3->data_off;
+
+	  b0->current_data -= RTE_PKTMBUF_HEADROOM;
+	  b1->current_data -= RTE_PKTMBUF_HEADROOM;
+	  b2->current_data -= RTE_PKTMBUF_HEADROOM;
+	  b3->current_data -= RTE_PKTMBUF_HEADROOM;
+
+	  b0->current_length = mb0->data_len - l3_offset0;
+	  b1->current_length = mb1->data_len - l3_offset1;
+	  b2->current_length = mb2->data_len - l3_offset2;
+	  b3->current_length = mb3->data_len - l3_offset3;
+
+	  b0->flags = buffer_flags_template;
+	  b1->flags = buffer_flags_template;
+	  b2->flags = buffer_flags_template;
+	  b3->flags = buffer_flags_template;
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
+	  vnet_buffer (b1)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
+	  vnet_buffer (b2)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
+	  vnet_buffer (b3)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+	  vnet_buffer (b1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+	  vnet_buffer (b2)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+	  vnet_buffer (b3)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+
+	  n_rx_bytes += mb0->pkt_len;
+	  n_rx_bytes += mb1->pkt_len;
+	  n_rx_bytes += mb2->pkt_len;
+	  n_rx_bytes += mb3->pkt_len;
+
+	  /* Process subsequent segments of multi-segment packets */
+	  if (xd->flags & DPDK_DEVICE_FLAG_MAYBE_MULTISEG)
+	    {
+	      dpdk_process_subseq_segs (vm, b0, mb0, fl);
+	      dpdk_process_subseq_segs (vm, b1, mb1, fl);
+	      dpdk_process_subseq_segs (vm, b2, mb2, fl);
+	      dpdk_process_subseq_segs (vm, b3, mb3, fl);
+	    }
+
+	  /*
+	   * Turn this on if you run into
+	   * "bad monkey" contexts, and you want to know exactly
+	   * which nodes they've visited... See main.c...
+	   */
+	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b1);
+	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b2);
+	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b3);
+
+	  /* Do we have any driver RX features configured on the interface? */
+	  vnet_feature_start_device_input_x4 (xd->vlib_sw_if_index,
+					      &next0, &next1, &next2, &next3,
+					      b0, b1, b2, b3,
+					      l3_offset0, l3_offset1,
+					      l3_offset2, l3_offset3);
+
+	  vlib_validate_buffer_enqueue_x4 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, bi2, bi3,
+					   next0, next1, next2, next3);
+	  n_buffers -= 4;
+	  mb_index += 4;
+	}
+      while (n_buffers > 0 && n_left_to_next > 0)
+	{
+	  struct rte_mbuf *mb0 = xd->rx_vectors[queue_id][mb_index];
+
+	  ASSERT (mb0);
+
+	  b0 = vlib_buffer_from_rte_mbuf (mb0);
+
+	  /* Prefetch one next segment if it exists. */
+	  if (PREDICT_FALSE (mb0->nb_segs > 1))
+	    dpdk_prefetch_buffer (mb0->next);
+
+	  vlib_buffer_init_for_free_list (b0, fl);
+
+	  bi0 = vlib_get_buffer_index (vm, b0);
+
+	  to_next[0] = bi0;
+	  to_next++;
+	  n_left_to_next--;
+
+	  if (PREDICT_FALSE (xd->per_interface_next_index != ~0))
+	    next0 = xd->per_interface_next_index;
+	  else if (PREDICT_TRUE
+		   ((xd->flags & DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE) != 0))
+	    next0 = dpdk_rx_next_from_mb (mb0, b0);
+	  else
+	    next0 = dpdk_rx_next_from_etype (mb0, b0);
+
+	  dpdk_rx_error_from_mb (mb0, &next0, &error0);
+	  b0->error = node->errors[error0];
+
+	  l3_offset0 = device_input_next_node_advance[next0];
+
+	  b0->current_data = l3_offset0;
+	  b0->current_data += mb0->data_off - RTE_PKTMBUF_HEADROOM;
+	  b0->current_length = mb0->data_len - l3_offset0;
+
+	  b0->flags = buffer_flags_template;
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+	  n_rx_bytes += mb0->pkt_len;
+
+	  /* Process subsequent segments of multi-segment packets */
+	  dpdk_process_subseq_segs (vm, b0, mb0, fl);
+
+	  /*
+	   * Turn this on if you run into
+	   * "bad monkey" contexts, and you want to know exactly
+	   * which nodes they've visited... See main.c...
+	   */
+	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+
+	  /* Do we have any driver RX features configured on the interface? */
+	  vnet_feature_start_device_input_x1 (xd->vlib_sw_if_index, &next0,
+					      b0, l3_offset0);
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	  n_buffers--;
+	  mb_index++;
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  if (PREDICT_FALSE (vec_len (xd->d_trace_buffers[cpu_index]) > 0))
+    {
+      dpdk_rx_trace (dm, node, xd, queue_id, xd->d_trace_buffers[cpu_index],
+		     vec_len (xd->d_trace_buffers[cpu_index]));
+      vlib_set_trace_count (vm, node, n_trace -
+			    vec_len (xd->d_trace_buffers[cpu_index]));
+    }
+
+  vlib_increment_combined_counter
+    (vnet_get_main ()->interface_main.combined_sw_if_counters
+     + VNET_INTERFACE_COUNTER_RX,
+     cpu_index, xd->vlib_sw_if_index, mb_index, n_rx_bytes);
+
+  dpdk_worker_t *dw = vec_elt_at_index (dm->workers, cpu_index);
+  dw->aggregate_rx_packets += mb_index;
+
+  return mb_index;
+}
+
+static inline void
+poll_rate_limit (dpdk_main_t * dm)
+{
+  /* Limit the poll rate by sleeping for N msec between polls */
+  if (PREDICT_FALSE (dm->poll_sleep != 0))
+    {
+      struct timespec ts, tsrem;
+
+      ts.tv_sec = 0;
+      ts.tv_nsec = 1000 * 1000 * dm->poll_sleep;	/* 1ms */
+
+      while (nanosleep (&ts, &tsrem) < 0)
+	{
+	  ts = tsrem;
+	}
+    }
+}
+
+/** \brief Main DPDK input node
+    @node dpdk-input
+
+    This is the main DPDK input node: across each assigned interface,
+    call rte_eth_rx_burst(...) or similar to obtain a vector of
+    packets to process. Handle early packet discard. Derive @c
+    vlib_buffer_t metadata from <code>struct rte_mbuf</code> metadata,
+    Depending on the resulting metadata: adjust <code>b->current_data,
+    b->current_length </code> and dispatch directly to
+    ip4-input-no-checksum, or ip6-input. Trace the packet if required.
+
+    @param vm   vlib_main_t corresponding to the current thread
+    @param node vlib_node_runtime_t
+    @param f    vlib_frame_t input-node, not used.
+
+    @par Graph mechanics: buffer metadata, next index usage
+
+    @em Uses:
+    - <code>struct rte_mbuf mb->ol_flags</code>
+        - PKT_RX_IP_CKSUM_BAD
+    - <code> RTE_ETH_IS_xxx_HDR(mb->packet_type) </code>
+        - packet classification result
+
+    @em Sets:
+    - <code>b->error</code> if the packet is to be dropped immediately
+    - <code>b->current_data, b->current_length</code>
+        - adjusted as needed to skip the L2 header in  direct-dispatch cases
+    - <code>vnet_buffer(b)->sw_if_index[VLIB_RX]</code>
+        - rx interface sw_if_index
+    - <code>vnet_buffer(b)->sw_if_index[VLIB_TX] = ~0</code>
+        - required by ipX-lookup
+    - <code>b->flags</code>
+        - to indicate multi-segment pkts (VLIB_BUFFER_NEXT_PRESENT), etc.
+
+    <em>Next Nodes:</em>
+    - Static arcs to: error-drop, ethernet-input,
+      ip4-input-no-checksum, ip6-input, mpls-input
+    - per-interface redirection, controlled by
+      <code>xd->per_interface_next_index</code>
+*/
+
+static uword
+dpdk_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_t *xd;
+  uword n_rx_packets = 0;
+  dpdk_device_and_queue_t *dq;
+  u32 cpu_index = os_get_cpu_number ();
+
+  /*
+   * Poll all devices on this cpu for input/interrupts.
+   */
+  /* *INDENT-OFF* */
+  vec_foreach (dq, dm->devices_by_cpu[cpu_index])
+    {
+      xd = vec_elt_at_index(dm->devices, dq->device);
+      n_rx_packets += dpdk_device_input (dm, xd, node, cpu_index, dq->queue_id);
+    }
+  /* *INDENT-ON* */
+
+  poll_rate_limit (dm);
+
+  return n_rx_packets;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (dpdk_input_node) = {
+  .function = dpdk_input,
+  .type = VLIB_NODE_TYPE_INPUT,
+  .name = "dpdk-input",
+  .sibling_of = "device-input",
+
+  /* Will be enabled if/when hardware is detected. */
+  .state = VLIB_NODE_STATE_DISABLED,
+
+  .format_buffer = format_ethernet_header_with_length,
+  .format_trace = format_dpdk_rx_dma_trace,
+
+  .n_errors = DPDK_N_ERROR,
+  .error_strings = dpdk_error_strings,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (dpdk_input_node, dpdk_input);
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/dpdk/qos_doc.md b/src/vnet/devices/dpdk/qos_doc.md
new file mode 100644
index 00000000..9bd0659d
--- /dev/null
+++ b/src/vnet/devices/dpdk/qos_doc.md
@@ -0,0 +1,404 @@
+# QoS Hierarchical Scheduler    {#qos_doc}
+
+The Quality-of-Service (QoS) scheduler performs egress-traffic management by
+prioritizing the transmission of the packets of different type services and
+subcribers based on the Service Level Agreements (SLAs). The QoS scheduler can
+be enabled on one or more NIC output interfaces depending upon the
+requirement.
+
+
+## Overview
+
+The QoS schdeuler supports a number of scheduling and shaping levels which
+construct hierarchical-tree. The first level in the hierarchy is port (i.e.
+the physical interface) that constitutes the root node of the tree. The
+subsequent level is subport which represents the group of the
+users/subscribers. The individual user/subscriber is represented by the pipe
+at the next level. Each user can have different traffic type based on the
+criteria of specific loss rate, jitter, and latency. These traffic types are
+represented at the traffic-class level in the form of different traffic-
+classes. The last level contains number of queues which are grouped together
+to host the packets of the specific class type traffic.
+
+The QoS scheduler implementation requires flow classification, enqueue  and
+dequeue operations. The flow classification is mandatory stage for HQoS where
+incoming packets are classified by mapping the packet fields information to
+5-tuple (HQoS subport, pipe, traffic class, queue within traffic class, and
+color) and storing that information in mbuf sched field. The enqueue operation
+uses this information to determine the queue for storing the packet, and at
+this stage, if the specific queue is full, QoS drops the packet. The dequeue
+operation consists of scheduling the packet based on its length and available
+credits, and handing over the scheduled packet to the output interface.
+
+For more information on QoS Scheduler, please refer DPDK Programmer's Guide-
+http://dpdk.org/doc/guides/prog_guide/qos_framework.html
+
+
+### QoS Schdeuler Parameters
+
+Following illustrates the default HQoS configuration for each 10GbE output
+port:
+
+Single subport (subport 0):
+  - Subport rate set to 100% of port rate
+  - Each of the 4 traffic classes has rate set to 100% of port rate
+
+4K pipes per subport 0 (pipes 0 .. 4095) with identical configuration:
+  - Pipe rate set to 1/4K of port rate
+  - Each of the 4 traffic classes has rate set to 100% of pipe rate
+  - Within each traffic class, the byte-level WRR weights for the 4 queues are set to 1:1:1:1
+
+
+#### Port configuration
+
+```
+port {
+  rate 1250000000           /* Assuming 10GbE port */
+  frame_overhead 24         /* Overhead fields per Ethernet frame:
+                             * 7B (Preamble) +
+                             * 1B (Start of Frame Delimiter (SFD)) + 
+                             * 4B (Frame Check Sequence (FCS)) +
+                             * 12B (Inter Frame Gap (IFG))
+                             */
+  mtu 1522                  /* Assuming Ethernet/IPv4 pkt (FCS not included) */
+  n_subports_per_port 1     /* Number of subports per output interface */
+  n_pipes_per_subport 4096  /* Number of pipes (users/subscribers) */
+  queue_sizes 64 64 64 64   /* Packet queue size for each traffic class.
+                             * All queues within the same pipe traffic class
+                             * have the same size. Queues from different
+                             * pipes serving the same traffic class have
+                             * the same size. */
+}
+```
+
+
+#### Subport configuration
+
+```
+subport 0 {
+  tb_rate 1250000000        /* Subport level token bucket rate (bytes per second) */
+  tb_size 1000000           /* Subport level token bucket size (bytes) */
+  tc0_rate 1250000000       /* Subport level token bucket rate for traffic class 0 (bytes per second) */
+  tc1_rate 1250000000       /* Subport level token bucket rate for traffic class 1 (bytes per second) */
+  tc2_rate 1250000000       /* Subport level token bucket rate for traffic class 2 (bytes per second) */
+  tc3_rate 1250000000       /* Subport level token bucket rate for traffic class 3 (bytes per second) */
+  tc_period 10              /* Time interval for refilling the token bucket associated with traffic class (Milliseconds) */
+  pipe 0 4095 profile 0     /* pipes (users/subscribers) configured with pipe profile 0 */
+}
+```
+
+
+#### Pipe configuration
+
+```
+pipe_profile 0 {
+  tb_rate 305175          /* Pipe level token bucket rate (bytes per second) */
+  tb_size 1000000         /* Pipe level token bucket size (bytes) */
+  tc0_rate 305175         /* Pipe level token bucket rate for traffic class 0 (bytes per second) */
+  tc1_rate 305175         /* Pipe level token bucket rate for traffic class 1 (bytes per second) */
+  tc2_rate 305175         /* Pipe level token bucket rate for traffic class 2 (bytes per second) */
+  tc3_rate 305175         /* Pipe level token bucket rate for traffic class 3 (bytes per second) */
+  tc_period 40            /* Time interval for refilling the token bucket associated with traffic class at pipe level (Milliseconds) */
+  tc3_oversubscription_weight 1 /* Weight traffic class 3 oversubscription */
+  tc0_wrr_weights 1 1 1 1     /* Pipe queues WRR weights for traffic class 0 */
+  tc1_wrr_weights 1 1 1 1     /* Pipe queues WRR weights for traffic class 1 */
+  tc2_wrr_weights 1 1 1 1     /* Pipe queues WRR weights for traffic class 2 */
+  tc3_wrr_weights 1 1 1 1     /* Pipe queues WRR weights for traffic class 3 */
+}
+```
+
+
+#### Random Early Detection (RED) parameters per traffic class and color (Green / Yellow / Red)
+
+```
+red {
+  tc0_wred_min 48 40 32     /* Minimum threshold for traffic class 0 queue (min_th) in number of packets */
+  tc0_wred_max 64 64 64     /* Maximum threshold for traffic class 0 queue (max_th) in number of packets */
+  tc0_wred_inv_prob 10 10 10    /* Inverse of packet marking probability for traffic class 0 queue (maxp = 1 / maxp_inv) */
+  tc0_wred_weight 9 9 9     /* Traffic Class 0 queue weight */
+  tc1_wred_min 48 40 32     /* Minimum threshold for traffic class 1 queue (min_th) in number of packets */
+  tc1_wred_max 64 64 64     /* Maximum threshold for traffic class 1 queue (max_th) in number of packets */
+  tc1_wred_inv_prob 10 10 10    /* Inverse of packet marking probability for traffic class 1 queue (maxp = 1 / maxp_inv) */
+  tc1_wred_weight 9 9 9     /* Traffic Class 1 queue weight */
+  tc2_wred_min 48 40 32     /* Minimum threshold for traffic class 2 queue (min_th) in number of packets */
+  tc2_wred_max 64 64 64     /* Maximum threshold for traffic class 2 queue (max_th) in number of packets */
+  tc2_wred_inv_prob 10 10 10    /* Inverse of packet marking probability for traffic class 2 queue (maxp = 1 / maxp_inv) */
+  tc2_wred_weight 9 9 9     /* Traffic Class 2 queue weight */
+  tc3_wred_min 48 40 32     /* Minimum threshold for traffic class 3 queue (min_th) in number of packets */
+  tc3_wred_max 64 64 64     /* Maximum threshold for traffic class 3 queue (max_th) in number of packets */
+  tc3_wred_inv_prob 10 10 10    /* Inverse of packet marking probability for traffic class 3 queue (maxp = 1 / maxp_inv) */
+  tc3_wred_weight 9 9 9     /* Traffic Class 3 queue weight */
+}
+```
+
+
+### DPDK QoS Scheduler Integration in VPP
+
+The Hierarchical Quaity-of-Service (HQoS) scheduler object could be seen as
+part of the logical NIC output interface. To enable HQoS on specific output
+interface, vpp startup.conf file has to be configured accordingly. The output
+interface that requires HQoS, should have "hqos" parameter specified in dpdk
+section. Another optional parameter "hqos-thread"  has been defined which can
+be used to associate the output interface with specific hqos thread. In cpu
+section of the config file, "corelist-hqos-threads" is introduced to assign
+logical cpu cores to run the HQoS threads. A HQoS thread can run multiple HQoS
+objects each associated with different output interfaces. All worker threads
+instead of writing packets to NIC TX queue directly, write the packets to a
+software queues. The hqos_threads read the software queues, and enqueue the
+packets to HQoS objects, as well as dequeue packets from HQOS objects and
+write them to NIC output interfaces. The worker threads need to be able to
+send the packets to any output interface, therefore, each HQoS object
+associated with NIC output interface should have software queues equal to
+worker threads count.
+
+Following illustrates the sample startup configuration file with 4x worker
+threads feeding 2x hqos threads that handle each QoS scheduler for 1x output
+interface.
+
+```
+dpdk {
+  socket-mem 16384,16384
+
+  dev 0000:02:00.0 {
+    num-rx-queues 2
+    hqos
+  }
+  dev 0000:06:00.0 {
+    num-rx-queues 2
+    hqos
+  }
+
+  num-mbufs 1000000
+}
+
+cpu {
+  main-core 0
+  corelist-workers  1, 2, 3, 4
+  corelist-hqos-threads  5, 6
+}
+```
+
+
+### QoS scheduler CLI Commands
+
+Each QoS scheduler instance is initialised with default parameters required to
+configure hqos port, subport, pipe and queues. Some of the parameters can be
+re-configured in run-time through CLI commands.
+
+
+#### Configuration
+
+Following commands can be used to configure QoS scheduler parameters.
+
+The command below can be used to set the subport level parameters such as
+token bucket rate (bytes per seconds), token bucket size (bytes), traffic
+class rates (bytes per seconds) and token update period (Milliseconds).
+
+```
+set dpdk interface hqos subport <if-name> subport <n> [rate <n>]
+    [bktsize <n>] [tc0 <n>] [tc1 <n>] [tc2 <n>] [tc3 <n>] [period <n>]
+```
+
+For setting the pipe profile, following command can be used.    
+
+```
+set dpdk interface hqos pipe <if-name> subport <n> pipe <n> profile <n>
+```
+
+To assign QoS scheduler instance to the specific thread, following command can
+be used.
+
+```
+set dpdk interface hqos placement <if-name> thread <n>
+```
+
+The command below is used to set the packet fields required for classifiying
+the incoming packet. As a result of classification process,     packet field
+information will be mapped to 5 tuples (subport, pipe, traffic class, pipe,
+color) and stored in packet mbuf.
+
+```
+set dpdk interface hqos pktfield <if-name> id <n> offset <n> mask <n>
+```
+
+The DSCP table entries used for idenfiying the traffic class and queue can be set using the command below;   
+
+```  
+set dpdk interface hqos tctbl <if-name> entry <n> tc <n> queue <n>
+```
+
+
+#### Show Command
+
+The QoS Scheduler configuration can displayed using the command below.
+
+```
+   vpp# show dpdk interface hqos TenGigabitEthernet2/0/0
+   Thread:
+     Input SWQ size = 4096 packets
+     Enqueue burst size = 256 packets
+     Dequeue burst size = 220 packets
+     Packet field 0: slab position =    0, slab bitmask = 0x0000000000000000
+     Packet field 1: slab position =   40, slab bitmask = 0x0000000fff000000
+     Packet field 2: slab position =    8, slab bitmask = 0x00000000000000fc
+     Packet field 2 translation table:
+     [ 0 .. 15]:  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
+     [16 .. 31]:  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
+     [32 .. 47]:  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
+     [48 .. 63]:  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
+   Port:
+     Rate = 1250000000 bytes/second
+     MTU = 1514 bytes
+     Frame overhead = 24 bytes
+     Number of subports = 1
+     Number of pipes per subport = 4096
+     Packet queue size: TC0 = 64, TC1 = 64, TC2 = 64, TC3 = 64 packets
+     Number of pipe profiles = 1
+     Pipe profile 0:
+     Rate = 305175 bytes/second
+     Token bucket size = 1000000 bytes
+     Traffic class rate: TC0 = 305175, TC1 = 305175, TC2 = 305175, TC3 = 305175 bytes/second
+     TC period = 40 milliseconds
+     TC0 WRR weights: Q0 = 1, Q1 = 1, Q2 = 1, Q3 = 1
+     TC1 WRR weights: Q0 = 1, Q1 = 1, Q2 = 1, Q3 = 1
+     TC2 WRR weights: Q0 = 1, Q1 = 1, Q2 = 1, Q3 = 1
+     TC3 WRR weights: Q0 = 1, Q1 = 1, Q2 = 1, Q3 = 1
+```
+
+The QoS Scheduler placement over the logical cpu cores can be displayed using
+below command.
+
+```
+    vpp# show dpdk interface hqos placement
+      Thread 5 (vpp_hqos-threads_0 at lcore 5):
+      TenGigabitEthernet2/0/0 queue 0
+      Thread 6 (vpp_hqos-threads_1 at lcore 6):
+      TenGigabitEthernet4/0/1 queue 0
+```
+
+
+### QoS Scheduler Binary APIs
+
+This section explans the available binary APIs for configuring QoS scheduler
+parameters in run-time.
+
+The following API can be used to set the pipe profile of a pipe that belongs
+to a given subport:
+
+```
+sw_interface_set_dpdk_hqos_pipe rx <intfc> | sw_if_index <id>
+    subport <subport-id> pipe <pipe-id> profile <profile-id>
+```
+
+The data structures used for set the pipe profile parameter are as follows;
+
+```
+  /** \\brief DPDK interface HQoS pipe profile set request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - the interface
+    @param subport - subport ID
+    @param pipe - pipe ID within its subport
+    @param profile - pipe profile ID
+  */
+  define sw_interface_set_dpdk_hqos_pipe {
+    u32 client_index;
+    u32 context;
+    u32 sw_if_index;
+    u32 subport;
+    u32 pipe;
+    u32 profile;
+  };
+
+  /** \\brief DPDK interface HQoS pipe profile set reply
+    @param context - sender context, to match reply w/ request
+    @param retval - request return code
+  */
+  define sw_interface_set_dpdk_hqos_pipe_reply {
+    u32 context;
+    i32 retval;
+  };
+```
+
+The following API can be used to set the subport level parameters, for
+example- token bucket rate (bytes per seconds), token bucket size (bytes),
+traffic class rate (bytes per seconds) and tokens update period.
+
+```
+sw_interface_set_dpdk_hqos_subport rx <intfc> | sw_if_index <id>
+    subport <subport-id> [rate <n>] [bktsize <n>]
+    [tc0 <n>] [tc1 <n>] [tc2 <n>] [tc3 <n>] [period <n>]
+```
+
+The data structures used for set the subport level parameter are as follows;
+
+```
+  /** \\brief DPDK interface HQoS subport parameters set request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - the interface
+    @param subport - subport ID
+    @param tb_rate - subport token bucket rate (measured in bytes/second)
+    @param tb_size - subport token bucket size (measured in credits)
+    @param tc_rate - subport traffic class 0 .. 3 rates (measured in bytes/second)
+    @param tc_period - enforcement period for rates (measured in milliseconds)
+  */
+  define sw_interface_set_dpdk_hqos_subport {
+    u32 client_index;
+    u32 context;
+    u32 sw_if_index;
+    u32 subport;
+    u32 tb_rate;
+    u32 tb_size;
+    u32 tc_rate[4];
+    u32 tc_period;
+  };
+
+  /** \\brief DPDK interface HQoS subport parameters set reply
+    @param context - sender context, to match reply w/ request
+    @param retval - request return code
+  */
+  define sw_interface_set_dpdk_hqos_subport_reply {
+    u32 context;
+    i32 retval;
+  };
+```
+
+The following API can be used set the DSCP table entry. The DSCP table have
+64 entries to map the packet DSCP field onto traffic class and hqos input
+queue.
+
+```
+sw_interface_set_dpdk_hqos_tctbl rx <intfc> | sw_if_index <id> 
+    entry <n> tc <n> queue <n>
+```
+
+The data structures used for setting DSCP table entries are given below.
+
+```
+  /** \\brief DPDK interface HQoS tctbl entry set request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - the interface
+    @param entry - entry index ID
+    @param tc - traffic class (0 .. 3)
+    @param queue - traffic class queue (0 .. 3)
+  */
+  define sw_interface_set_dpdk_hqos_tctbl {
+    u32 client_index;
+    u32 context;
+    u32 sw_if_index;
+    u32 entry;
+    u32 tc;
+    u32 queue;
+  };
+
+  /** \\brief DPDK interface HQoS tctbl entry set reply
+    @param context - sender context, to match reply w/ request
+    @param retval - request return code
+  */
+  define sw_interface_set_dpdk_hqos_tctbl_reply {
+    u32 context;
+    i32 retval;
+  };
+```
diff --git a/src/vnet/devices/netmap/cli.c b/src/vnet/devices/netmap/cli.c
new file mode 100644
index 00000000..68695250
--- /dev/null
+++ b/src/vnet/devices/netmap/cli.c
@@ -0,0 +1,146 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+#include <stdint.h>
+#include <net/if.h>
+#include <sys/ioctl.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vnet/ethernet/ethernet.h>
+
+#include <vnet/devices/netmap/net_netmap.h>
+#include <vnet/devices/netmap/netmap.h>
+
+static clib_error_t *
+netmap_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
+			  vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 *host_if_name = NULL;
+  u8 hwaddr[6];
+  u8 *hw_addr_ptr = 0;
+  int r;
+  u8 is_pipe = 0;
+  u8 is_master = 0;
+  u32 sw_if_index = ~0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "name %s", &host_if_name))
+	;
+      else
+	if (unformat
+	    (line_input, "hw-addr %U", unformat_ethernet_address, hwaddr))
+	hw_addr_ptr = hwaddr;
+      else if (unformat (line_input, "pipe"))
+	is_pipe = 1;
+      else if (unformat (line_input, "master"))
+	is_master = 1;
+      else if (unformat (line_input, "slave"))
+	is_master = 0;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  if (host_if_name == NULL)
+    return clib_error_return (0, "missing host interface name");
+
+  r =
+    netmap_create_if (vm, host_if_name, hw_addr_ptr, is_pipe, is_master,
+		      &sw_if_index);
+
+  if (r == VNET_API_ERROR_SYSCALL_ERROR_1)
+    return clib_error_return (0, "%s (errno %d)", strerror (errno), errno);
+
+  if (r == VNET_API_ERROR_INVALID_INTERFACE)
+    return clib_error_return (0, "Invalid interface name");
+
+  if (r == VNET_API_ERROR_SUBIF_ALREADY_EXISTS)
+    return clib_error_return (0, "Interface already exists");
+
+  vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main (),
+		   sw_if_index);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (netmap_create_command, static) = {
+  .path = "create netmap",
+  .short_help = "create netmap name [<intf name>|valeXXX:YYY] "
+    "[hw-addr <mac>] [pipe] [master|slave]",
+  .function = netmap_create_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+netmap_delete_command_fn (vlib_main_t * vm, unformat_input_t * input,
+			  vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 *host_if_name = NULL;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "name %s", &host_if_name))
+	;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  if (host_if_name == NULL)
+    return clib_error_return (0, "missing host interface name");
+
+  netmap_delete_if (vm, host_if_name);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (netmap_delete_command, static) = {
+  .path = "delete netmap",
+  .short_help = "delete netmap name <interface name>",
+  .function = netmap_delete_command_fn,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+netmap_cli_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (netmap_cli_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/netmap/device.c b/src/vnet/devices/netmap/device.c
new file mode 100644
index 00000000..2152824f
--- /dev/null
+++ b/src/vnet/devices/netmap/device.c
@@ -0,0 +1,261 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdint.h>
+#include <net/if.h>
+#include <sys/ioctl.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vnet/ethernet/ethernet.h>
+
+#include <vnet/devices/netmap/net_netmap.h>
+#include <vnet/devices/netmap/netmap.h>
+
+#define foreach_netmap_tx_func_error	       \
+_(NO_FREE_SLOTS, "no free tx slots")           \
+_(PENDING_MSGS, "pending msgs in tx ring")
+
+typedef enum
+{
+#define _(f,s) NETMAP_TX_ERROR_##f,
+  foreach_netmap_tx_func_error
+#undef _
+    NETMAP_TX_N_ERROR,
+} netmap_tx_func_error_t;
+
+static char *netmap_tx_func_error_strings[] = {
+#define _(n,s) s,
+  foreach_netmap_tx_func_error
+#undef _
+};
+
+
+static u8 *
+format_netmap_device_name (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+  netmap_main_t *apm = &netmap_main;
+  netmap_if_t *nif = pool_elt_at_index (apm->interfaces, i);
+
+  s = format (s, "netmap-%s", nif->host_if_name);
+  return s;
+}
+
+static u8 *
+format_netmap_device (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  int verbose = va_arg (*args, int);
+  netmap_main_t *nm = &netmap_main;
+  netmap_if_t *nif = vec_elt_at_index (nm->interfaces, dev_instance);
+  uword indent = format_get_indent (s);
+
+  s = format (s, "NETMAP interface");
+  if (verbose)
+    {
+      s = format (s, "\n%U version %d flags 0x%x"
+		  "\n%U region %u memsize 0x%x offset 0x%x"
+		  "\n%U tx_slots %u rx_slots %u tx_rings %u rx_rings %u",
+		  format_white_space, indent + 2,
+		  nif->req->nr_version,
+		  nif->req->nr_flags,
+		  format_white_space, indent + 2,
+		  nif->mem_region,
+		  nif->req->nr_memsize,
+		  nif->req->nr_offset,
+		  format_white_space, indent + 2,
+		  nif->req->nr_tx_slots,
+		  nif->req->nr_rx_slots,
+		  nif->req->nr_tx_rings, nif->req->nr_rx_rings);
+    }
+  return s;
+}
+
+static u8 *
+format_netmap_tx_trace (u8 * s, va_list * args)
+{
+  s = format (s, "Unimplemented...");
+  return s;
+}
+
+static uword
+netmap_interface_tx (vlib_main_t * vm,
+		     vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  netmap_main_t *nm = &netmap_main;
+  u32 *buffers = vlib_frame_args (frame);
+  u32 n_left = frame->n_vectors;
+  f64 const time_constant = 1e3;
+  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
+  netmap_if_t *nif = pool_elt_at_index (nm->interfaces, rd->dev_instance);
+  int cur_ring;
+
+  if (PREDICT_FALSE (nif->lockp != 0))
+    {
+      while (__sync_lock_test_and_set (nif->lockp, 1))
+	;
+    }
+
+  cur_ring = nif->first_tx_ring;
+
+  while (n_left && cur_ring <= nif->last_tx_ring)
+    {
+      struct netmap_ring *ring = NETMAP_TXRING (nif->nifp, cur_ring);
+      int n_free_slots = nm_ring_space (ring);
+      uint cur = ring->cur;
+
+      if (nm_tx_pending (ring))
+	{
+	  if (ioctl (nif->fd, NIOCTXSYNC, NULL) < 0)
+	    clib_unix_warning ("NIOCTXSYNC");
+	  clib_cpu_time_wait (time_constant);
+
+	  if (nm_tx_pending (ring) && !n_free_slots)
+	    {
+	      cur_ring++;
+	      continue;
+	    }
+	}
+
+      while (n_left && n_free_slots)
+	{
+	  vlib_buffer_t *b0 = 0;
+	  u32 bi = buffers[0];
+	  u32 len;
+	  u32 offset = 0;
+	  buffers++;
+
+	  struct netmap_slot *slot = &ring->slot[cur];
+
+	  do
+	    {
+	      b0 = vlib_get_buffer (vm, bi);
+	      len = b0->current_length;
+	      /* memcpy */
+	      clib_memcpy ((u8 *) NETMAP_BUF (ring, slot->buf_idx) + offset,
+			   vlib_buffer_get_current (b0), len);
+	      offset += len;
+	    }
+	  while ((bi = b0->next_buffer));
+
+	  slot->len = offset;
+	  cur = (cur + 1) % ring->num_slots;
+	  n_free_slots--;
+	  n_left--;
+	}
+      CLIB_MEMORY_BARRIER ();
+      ring->head = ring->cur = cur;
+    }
+
+  if (n_left < frame->n_vectors)
+    ioctl (nif->fd, NIOCTXSYNC, NULL);
+
+  if (PREDICT_FALSE (nif->lockp != 0))
+    *nif->lockp = 0;
+
+  if (n_left)
+    vlib_error_count (vm, node->node_index,
+		      (n_left ==
+		       frame->n_vectors ? NETMAP_TX_ERROR_PENDING_MSGS :
+		       NETMAP_TX_ERROR_NO_FREE_SLOTS), n_left);
+
+  vlib_buffer_free (vm, vlib_frame_args (frame), frame->n_vectors);
+  return frame->n_vectors;
+}
+
+static void
+netmap_set_interface_next_node (vnet_main_t * vnm, u32 hw_if_index,
+				u32 node_index)
+{
+  netmap_main_t *apm = &netmap_main;
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+  netmap_if_t *nif = pool_elt_at_index (apm->interfaces, hw->dev_instance);
+
+  /* Shut off redirection */
+  if (node_index == ~0)
+    {
+      nif->per_interface_next_index = node_index;
+      return;
+    }
+
+  nif->per_interface_next_index =
+    vlib_node_add_next (vlib_get_main (), netmap_input_node.index,
+			node_index);
+}
+
+static void
+netmap_clear_hw_interface_counters (u32 instance)
+{
+  /* Nothing for now */
+}
+
+static clib_error_t *
+netmap_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+  netmap_main_t *apm = &netmap_main;
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+  netmap_if_t *nif = pool_elt_at_index (apm->interfaces, hw->dev_instance);
+  u32 hw_flags;
+
+  nif->is_admin_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
+
+  if (nif->is_admin_up)
+    hw_flags = VNET_HW_INTERFACE_FLAG_LINK_UP;
+  else
+    hw_flags = 0;
+
+  vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
+
+  return 0;
+}
+
+static clib_error_t *
+netmap_subif_add_del_function (vnet_main_t * vnm,
+			       u32 hw_if_index,
+			       struct vnet_sw_interface_t *st, int is_add)
+{
+  /* Nothing for now */
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (netmap_device_class) = {
+  .name = "netmap",
+  .tx_function = netmap_interface_tx,
+  .format_device_name = format_netmap_device_name,
+  .format_device = format_netmap_device,
+  .format_tx_trace = format_netmap_tx_trace,
+  .tx_function_n_errors = NETMAP_TX_N_ERROR,
+  .tx_function_error_strings = netmap_tx_func_error_strings,
+  .rx_redirect_to_node = netmap_set_interface_next_node,
+  .clear_counters = netmap_clear_hw_interface_counters,
+  .admin_up_down_function = netmap_interface_admin_up_down,
+  .subif_add_del_function = netmap_subif_add_del_function,
+};
+
+VLIB_DEVICE_TX_FUNCTION_MULTIARCH(netmap_device_class,
+				  netmap_interface_tx)
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/netmap/net_netmap.h b/src/vnet/devices/netmap/net_netmap.h
new file mode 100644
index 00000000..fd4253b7
--- /dev/null
+++ b/src/vnet/devices/netmap/net_netmap.h
@@ -0,0 +1,650 @@
+/*
+ * Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``S IS''AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * $FreeBSD: head/sys/net/netmap.h 251139 2013-05-30 14:07:14Z luigi $
+ *
+ * Definitions of constants and the structures used by the netmap
+ * framework, for the part visible to both kernel and userspace.
+ * Detailed info on netmap is available with "man netmap" or at
+ *
+ *	http://info.iet.unipi.it/~luigi/netmap/
+ *
+ * This API is also used to communicate with the VALE software switch
+ */
+
+#ifndef _NET_NETMAP_H_
+#define _NET_NETMAP_H_
+
+#define	NETMAP_API	11		/* current API version */
+
+#define	NETMAP_MIN_API	11		/* min and max versions accepted */
+#define	NETMAP_MAX_API	15
+/*
+ * Some fields should be cache-aligned to reduce contention.
+ * The alignment is architecture and OS dependent, but rather than
+ * digging into OS headers to find the exact value we use an estimate
+ * that should cover most architectures.
+ */
+#define NM_CACHE_ALIGN	128
+
+/*
+ * --- Netmap data structures ---
+ *
+ * The userspace data structures used by netmap are shown below.
+ * They are allocated by the kernel and mmap()ed by userspace threads.
+ * Pointers are implemented as memory offsets or indexes,
+ * so that they can be easily dereferenced in kernel and userspace.
+
+   KERNEL (opaque, obviously)
+
+  ====================================================================
+                                         |
+   USERSPACE                             |      struct netmap_ring
+                                         +---->+---------------+
+                                             / | head,cur,tail |
+   struct netmap_if (nifp, 1 per fd)        /  | buf_ofs       |
+    +---------------+                      /   | other fields  |
+    | ni_tx_rings   |                     /    +===============+
+    | ni_rx_rings   |                    /     | buf_idx, len  | slot[0]
+    |               |                   /      | flags, ptr    |
+    |               |                  /       +---------------+
+    +===============+                 /        | buf_idx, len  | slot[1]
+    | txring_ofs[0] | (rel.to nifp)--'         | flags, ptr    |
+    | txring_ofs[1] |                          +---------------+
+     (tx+1 entries)                           (num_slots entries)
+    | txring_ofs[t] |                          | buf_idx, len  | slot[n-1]
+    +---------------+                          | flags, ptr    |
+    | rxring_ofs[0] |                          +---------------+
+    | rxring_ofs[1] |
+     (rx+1 entries)
+    | rxring_ofs[r] |
+    +---------------+
+
+ * For each "interface" (NIC, host stack, PIPE, VALE switch port) bound to
+ * a file descriptor, the mmap()ed region contains a (logically readonly)
+ * struct netmap_if pointing to struct netmap_ring's.
+ *
+ * There is one netmap_ring per physical NIC ring, plus one tx/rx ring
+ * pair attached to the host stack (this pair is unused for non-NIC ports).
+ *
+ * All physical/host stack ports share the same memory region,
+ * so that zero-copy can be implemented between them.
+ * VALE switch ports instead have separate memory regions.
+ *
+ * The netmap_ring is the userspace-visible replica of the NIC ring.
+ * Each slot has the index of a buffer (MTU-sized and residing in the
+ * mmapped region), its length and some flags. An extra 64-bit pointer
+ * is provided for user-supplied buffers in the tx path.
+ *
+ * In user space, the buffer address is computed as
+ *	(char *)ring + buf_ofs + index * NETMAP_BUF_SIZE
+ *
+ * Added in NETMAP_API 11:
+ *
+ * + NIOCREGIF can request the allocation of extra spare buffers from
+ *   the same memory pool. The desired number of buffers must be in
+ *   nr_arg3. The ioctl may return fewer buffers, depending on memory
+ *   availability. nr_arg3 will return the actual value, and, once
+ *   mapped, nifp->ni_bufs_head will be the index of the first buffer.
+ *
+ *   The buffers are linked to each other using the first uint32_t
+ *   as the index. On close, ni_bufs_head must point to the list of
+ *   buffers to be released.
+ *
+ * + NIOCREGIF can request space for extra rings (and buffers)
+ *   allocated in the same memory space. The number of extra rings
+ *   is in nr_arg1, and is advisory. This is a no-op on NICs where
+ *   the size of the memory space is fixed.
+ *
+ * + NIOCREGIF can attach to PIPE rings sharing the same memory
+ *   space with a parent device. The ifname indicates the parent device,
+ *   which must already exist. Flags in nr_flags indicate if we want to
+ *   bind the master or slave side, the index (from nr_ringid)
+ *   is just a cookie and does not need to be sequential.
+ *
+ * + NIOCREGIF can also attach to 'monitor' rings that replicate
+ *   the content of specific rings, also from the same memory space.
+ *
+ *   Extra flags in nr_flags support the above functions.
+ *   Application libraries may use the following naming scheme:
+ *	netmap:foo			all NIC ring pairs
+ *	netmap:foo^			only host ring pair
+ *	netmap:foo+			all NIC ring + host ring pairs
+ *	netmap:foo-k			the k-th NIC ring pair
+ *	netmap:foo{k			PIPE ring pair k, master side
+ *	netmap:foo}k			PIPE ring pair k, slave side
+ */
+
+/*
+ * struct netmap_slot is a buffer descriptor
+ */
+struct netmap_slot {
+	uint32_t buf_idx;	/* buffer index */
+	uint16_t len;		/* length for this slot */
+	uint16_t flags;		/* buf changed, etc. */
+	uint64_t ptr;		/* pointer for indirect buffers */
+};
+
+/*
+ * The following flags control how the slot is used
+ */
+
+#define	NS_BUF_CHANGED	0x0001	/* buf_idx changed */
+	/*
+	 * must be set whenever buf_idx is changed (as it might be
+	 * necessary to recompute the physical address and mapping)
+	 *
+	 * It is also set by the kernel whenever the buf_idx is
+	 * changed internally (e.g., by pipes). Applications may
+	 * use this information to know when they can reuse the
+	 * contents of previously prepared buffers.
+	 */
+
+#define	NS_REPORT	0x0002	/* ask the hardware to report results */
+	/*
+	 * Request notification when slot is used by the hardware.
+	 * Normally transmit completions are handled lazily and
+	 * may be unreported. This flag lets us know when a slot
+	 * has been sent (e.g. to terminate the sender).
+	 */
+
+#define	NS_FORWARD	0x0004	/* pass packet 'forward' */
+	/*
+	 * (Only for physical ports, rx rings with NR_FORWARD set).
+	 * Slot released to the kernel (i.e. before ring->head) with
+	 * this flag set are passed to the peer ring (host/NIC),
+	 * thus restoring the host-NIC connection for these slots.
+	 * This supports efficient traffic monitoring or firewalling.
+	 */
+
+#define	NS_NO_LEARN	0x0008	/* disable bridge learning */
+ 	/*
+	 * On a VALE switch, do not 'learn' the source port for
+ 	 * this buffer.
+	 */
+
+#define	NS_INDIRECT	0x0010	/* userspace buffer */
+ 	/*
+	 * (VALE tx rings only) data is in a userspace buffer,
+	 * whose address is in the 'ptr' field in the slot.
+	 */
+
+#define	NS_MOREFRAG	0x0020	/* packet has more fragments */
+ 	/*
+	 * (VALE ports only)
+	 * Set on all but the last slot of a multi-segment packet.
+	 * The 'len' field refers to the individual fragment.
+	 */
+
+#define	NS_PORT_SHIFT	8
+#define	NS_PORT_MASK	(0xff << NS_PORT_SHIFT)
+	/*
+ 	 * The high 8 bits of the flag, if not zero, indicate the
+	 * destination port for the VALE switch, overriding
+ 	 * the lookup table.
+ 	 */
+
+#define	NS_RFRAGS(_slot)	( ((_slot)->flags >> 8) & 0xff)
+	/*
+	 * (VALE rx rings only) the high 8 bits
+	 *  are the number of fragments.
+	 */
+
+
+/*
+ * struct netmap_ring
+ *
+ * Netmap representation of a TX or RX ring (also known as "queue").
+ * This is a queue implemented as a fixed-size circular array.
+ * At the software level the important fields are: head, cur, tail.
+ *
+ * In TX rings:
+ *
+ *	head	first slot available for transmission.
+ *	cur	wakeup point. select() and poll() will unblock
+ *		when 'tail' moves past 'cur'
+ *	tail	(readonly) first slot reserved to the kernel
+ *
+ *	[head .. tail-1] can be used for new packets to send;
+ *	'head' and 'cur' must be incremented as slots are filled
+ *	    with new packets to be sent;
+ *	'cur' can be moved further ahead if we need more space
+ *	for new transmissions. XXX todo (2014-03-12)
+ *
+ * In RX rings:
+ *
+ *	head	first valid received packet
+ *	cur	wakeup point. select() and poll() will unblock
+ *		when 'tail' moves past 'cur'
+ *	tail	(readonly) first slot reserved to the kernel
+ *
+ *	[head .. tail-1] contain received packets;
+ *	'head' and 'cur' must be incremented as slots are consumed
+ *		and can be returned to the kernel;
+ *	'cur' can be moved further ahead if we want to wait for
+ *		new packets without returning the previous ones.
+ *
+ * DATA OWNERSHIP/LOCKING:
+ *	The netmap_ring, and all slots and buffers in the range
+ *	[head .. tail-1] are owned by the user program;
+ *	the kernel only accesses them during a netmap system call
+ *	and in the user thread context.
+ *
+ *	Other slots and buffers are reserved for use by the kernel
+ */
+struct netmap_ring {
+	/*
+	 * buf_ofs is meant to be used through macros.
+	 * It contains the offset of the buffer region from this
+	 * descriptor.
+	 */
+	const int64_t	buf_ofs;
+	const uint32_t	num_slots;	/* number of slots in the ring. */
+	const uint32_t	nr_buf_size;
+	const uint16_t	ringid;
+	const uint16_t	dir;		/* 0: tx, 1: rx */
+
+	uint32_t        head;		/* (u) first user slot */
+	uint32_t        cur;		/* (u) wakeup point */
+	uint32_t	tail;		/* (k) first kernel slot */
+
+	uint32_t	flags;
+
+	struct timeval	ts;		/* (k) time of last *sync() */
+
+	/* opaque room for a mutex or similar object */
+#if !defined(_WIN32) || defined(__CYGWIN__)
+	uint8_t	__attribute__((__aligned__(NM_CACHE_ALIGN))) sem[128];
+#else
+	uint8_t	__declspec(align(NM_CACHE_ALIGN)) sem[128];
+#endif
+
+	/* the slots follow. This struct has variable size */
+	struct netmap_slot slot[0];	/* array of slots. */
+};
+
+
+/*
+ * RING FLAGS
+ */
+#define	NR_TIMESTAMP	0x0002		/* set timestamp on *sync() */
+	/*
+	 * updates the 'ts' field on each netmap syscall. This saves
+	 * saves a separate gettimeofday(), and is not much worse than
+	 * software timestamps generated in the interrupt handler.
+	 */
+
+#define	NR_FORWARD	0x0004		/* enable NS_FORWARD for ring */
+ 	/*
+	 * Enables the NS_FORWARD slot flag for the ring.
+	 */
+
+
+/*
+ * Netmap representation of an interface and its queue(s).
+ * This is initialized by the kernel when binding a file
+ * descriptor to a port, and should be considered as readonly
+ * by user programs. The kernel never uses it.
+ *
+ * There is one netmap_if for each file descriptor on which we want
+ * to select/poll.
+ * select/poll operates on one or all pairs depending on the value of
+ * nmr_queueid passed on the ioctl.
+ */
+struct netmap_if {
+	char		ni_name[IFNAMSIZ]; /* name of the interface. */
+	const uint32_t	ni_version;	/* API version, currently unused */
+	const uint32_t	ni_flags;	/* properties */
+#define	NI_PRIV_MEM	0x1		/* private memory region */
+
+	/*
+	 * The number of packet rings available in netmap mode.
+	 * Physical NICs can have different numbers of tx and rx rings.
+	 * Physical NICs also have a 'host' ring pair.
+	 * Additionally, clients can request additional ring pairs to
+	 * be used for internal communication.
+	 */
+	const uint32_t	ni_tx_rings;	/* number of HW tx rings */
+	const uint32_t	ni_rx_rings;	/* number of HW rx rings */
+
+	uint32_t	ni_bufs_head;	/* head index for extra bufs */
+	uint32_t	ni_spare1[5];
+	/*
+	 * The following array contains the offset of each netmap ring
+	 * from this structure, in the following order:
+	 * NIC tx rings (ni_tx_rings); host tx ring (1); extra tx rings;
+	 * NIC rx rings (ni_rx_rings); host tx ring (1); extra rx rings.
+	 *
+	 * The area is filled up by the kernel on NIOCREGIF,
+	 * and then only read by userspace code.
+	 */
+	const ssize_t	ring_ofs[0];
+};
+
+
+#ifndef NIOCREGIF
+/*
+ * ioctl names and related fields
+ *
+ * NIOCTXSYNC, NIOCRXSYNC synchronize tx or rx queues,
+ *	whose identity is set in NIOCREGIF through nr_ringid.
+ *	These are non blocking and take no argument.
+ *
+ * NIOCGINFO takes a struct ifreq, the interface name is the input,
+ *	the outputs are number of queues and number of descriptor
+ *	for each queue (useful to set number of threads etc.).
+ *	The info returned is only advisory and may change before
+ *	the interface is bound to a file descriptor.
+ *
+ * NIOCREGIF takes an interface name within a struct nmre,
+ *	and activates netmap mode on the interface (if possible).
+ *
+ * The argument to NIOCGINFO/NIOCREGIF overlays struct ifreq so we
+ * can pass it down to other NIC-related ioctls.
+ *
+ * The actual argument (struct nmreq) has a number of options to request
+ * different functions.
+ * The following are used in NIOCREGIF when nr_cmd == 0:
+ *
+ * nr_name	(in)
+ *	The name of the port (em0, valeXXX:YYY, etc.)
+ *	limited to IFNAMSIZ for backward compatibility.
+ *
+ * nr_version	(in/out)
+ *	Must match NETMAP_API as used in the kernel, error otherwise.
+ *	Always returns the desired value on output.
+ *
+ * nr_tx_slots, nr_tx_slots, nr_tx_rings, nr_rx_rings (in/out)
+ *	On input, non-zero values may be used to reconfigure the port
+ *	according to the requested values, but this is not guaranteed.
+ *	On output the actual values in use are reported.
+ *
+ * nr_ringid (in)
+ *	Indicates how rings should be bound to the file descriptors.
+ *	If nr_flags != 0, then the low bits (in NETMAP_RING_MASK)
+ *	are used to indicate the ring number, and nr_flags specifies
+ *	the actual rings to bind. NETMAP_NO_TX_POLL is unaffected.
+ *
+ *	NOTE: THE FOLLOWING (nr_flags == 0) IS DEPRECATED:
+ *	If nr_flags == 0, NETMAP_HW_RING and NETMAP_SW_RING control
+ *	the binding as follows:
+ *	0 (default)			binds all physical rings
+ *	NETMAP_HW_RING | ring number	binds a single ring pair
+ *	NETMAP_SW_RING			binds only the host tx/rx rings
+ *
+ *	NETMAP_NO_TX_POLL can be OR-ed to make select()/poll() push
+ *		packets on tx rings only if POLLOUT is set.
+ *		The default is to push any pending packet.
+ *
+ *	NETMAP_DO_RX_POLL can be OR-ed to make select()/poll() release
+ *		packets on rx rings also when POLLIN is NOT set.
+ *		The default is to touch the rx ring only with POLLIN.
+ *		Note that this is the opposite of TX because it
+ *		reflects the common usage.
+ *
+ *	NOTE: NETMAP_PRIV_MEM IS DEPRECATED, use nr_arg2 instead.
+ *	NETMAP_PRIV_MEM is set on return for ports that do not use
+ *		the global memory allocator.
+ *		This information is not significant and applications
+ *		should look at the region id in nr_arg2
+ *
+ * nr_flags	is the recommended mode to indicate which rings should
+ *		be bound to a file descriptor. Values are NR_REG_*
+ *
+ * nr_arg1 (in)	The number of extra rings to be reserved.
+ *		Especially when allocating a VALE port the system only
+ *		allocates the amount of memory needed for the port.
+ *		If more shared memory rings are desired (e.g. for pipes),
+ *		the first invocation for the same basename/allocator
+ *		should specify a suitable number. Memory cannot be
+ *		extended after the first allocation without closing
+ *		all ports on the same region.
+ *
+ * nr_arg2 (in/out) The identity of the memory region used.
+ *		On input, 0 means the system decides autonomously,
+ *		other values may try to select a specific region.
+ *		On return the actual value is reported.
+ *		Region '1' is the global allocator, normally shared
+ *		by all interfaces. Other values are private regions.
+ *		If two ports the same region zero-copy is possible.
+ *
+ * nr_arg3 (in/out)	number of extra buffers to be allocated.
+ *
+ *
+ *
+ * nr_cmd (in)	if non-zero indicates a special command:
+ *	NETMAP_BDG_ATTACH	 and nr_name = vale*:ifname
+ *		attaches the NIC to the switch; nr_ringid specifies
+ *		which rings to use. Used by vale-ctl -a ...
+ *	    nr_arg1 = NETMAP_BDG_HOST also attaches the host port
+ *		as in vale-ctl -h ...
+ *
+ *	NETMAP_BDG_DETACH	and nr_name = vale*:ifname
+ *		disconnects a previously attached NIC.
+ *		Used by vale-ctl -d ...
+ *
+ *	NETMAP_BDG_LIST
+ *		list the configuration of VALE switches.
+ *
+ *	NETMAP_BDG_VNET_HDR
+ *		Set the virtio-net header length used by the client
+ *		of a VALE switch port.
+ *
+ *	NETMAP_BDG_NEWIF
+ *		create a persistent VALE port with name nr_name.
+ *		Used by vale-ctl -n ...
+ *
+ *	NETMAP_BDG_DELIF
+ *		delete a persistent VALE port. Used by vale-ctl -d ...
+ *
+ * nr_arg1, nr_arg2, nr_arg3  (in/out)		command specific
+ *
+ *
+ *
+ */
+
+
+/*
+ * struct nmreq overlays a struct ifreq (just the name)
+ */
+struct nmreq {
+	char		nr_name[IFNAMSIZ];
+	uint32_t	nr_version;	/* API version */
+	uint32_t	nr_offset;	/* nifp offset in the shared region */
+	uint32_t	nr_memsize;	/* size of the shared region */
+	uint32_t	nr_tx_slots;	/* slots in tx rings */
+	uint32_t	nr_rx_slots;	/* slots in rx rings */
+	uint16_t	nr_tx_rings;	/* number of tx rings */
+	uint16_t	nr_rx_rings;	/* number of rx rings */
+
+	uint16_t	nr_ringid;	/* ring(s) we care about */
+#define NETMAP_HW_RING		0x4000	/* single NIC ring pair */
+#define NETMAP_SW_RING		0x2000	/* only host ring pair */
+
+#define NETMAP_RING_MASK	0x0fff	/* the ring number */
+
+#define NETMAP_NO_TX_POLL	0x1000	/* no automatic txsync on poll */
+
+#define NETMAP_DO_RX_POLL	0x8000	/* DO automatic rxsync on poll */
+
+	uint16_t	nr_cmd;
+#define NETMAP_BDG_ATTACH	1	/* attach the NIC */
+#define NETMAP_BDG_DETACH	2	/* detach the NIC */
+#define NETMAP_BDG_REGOPS	3	/* register bridge callbacks */
+#define NETMAP_BDG_LIST		4	/* get bridge's info */
+#define NETMAP_BDG_VNET_HDR     5       /* set the port virtio-net-hdr length */
+#define NETMAP_BDG_OFFSET	NETMAP_BDG_VNET_HDR	/* deprecated alias */
+#define NETMAP_BDG_NEWIF	6	/* create a virtual port */
+#define NETMAP_BDG_DELIF	7	/* destroy a virtual port */
+#define NETMAP_PT_HOST_CREATE	8	/* create ptnetmap kthreads */
+#define NETMAP_PT_HOST_DELETE	9	/* delete ptnetmap kthreads */
+#define NETMAP_BDG_POLLING_ON	10	/* delete polling kthread */
+#define NETMAP_BDG_POLLING_OFF	11	/* delete polling kthread */
+#define NETMAP_VNET_HDR_GET	12      /* get the port virtio-net-hdr length */
+	uint16_t	nr_arg1;	/* reserve extra rings in NIOCREGIF */
+#define NETMAP_BDG_HOST		1	/* attach the host stack on ATTACH */
+
+	uint16_t	nr_arg2;
+	uint32_t	nr_arg3;	/* req. extra buffers in NIOCREGIF */
+	uint32_t	nr_flags;
+	/* various modes, extends nr_ringid */
+	uint32_t	spare2[1];
+};
+
+#define NR_REG_MASK		0xf /* values for nr_flags */
+enum {	NR_REG_DEFAULT	= 0,	/* backward compat, should not be used. */
+	NR_REG_ALL_NIC	= 1,
+	NR_REG_SW	= 2,
+	NR_REG_NIC_SW	= 3,
+	NR_REG_ONE_NIC	= 4,
+	NR_REG_PIPE_MASTER = 5,
+	NR_REG_PIPE_SLAVE = 6,
+};
+/* monitor uses the NR_REG to select the rings to monitor */
+#define NR_MONITOR_TX	0x100
+#define NR_MONITOR_RX	0x200
+#define NR_ZCOPY_MON	0x400
+/* request exclusive access to the selected rings */
+#define NR_EXCLUSIVE	0x800
+/* request ptnetmap host support */
+#define NR_PASSTHROUGH_HOST	NR_PTNETMAP_HOST /* deprecated */
+#define NR_PTNETMAP_HOST	0x1000
+#define NR_RX_RINGS_ONLY	0x2000
+#define NR_TX_RINGS_ONLY	0x4000
+/* Applications set this flag if they are able to deal with virtio-net headers,
+ * that is send/receive frames that start with a virtio-net header.
+ * If not set, NIOCREGIF will fail with netmap ports that require applications
+ * to use those headers. If the flag is set, the application can use the
+ * NETMAP_VNET_HDR_GET command to figure out the header length. */
+#define NR_ACCEPT_VNET_HDR	0x8000
+
+
+/*
+ * Windows does not have _IOWR(). _IO(), _IOW() and _IOR() are defined
+ * in ws2def.h but not sure if they are in the form we need.
+ * XXX so we redefine them
+ * in a convenient way to use for DeviceIoControl signatures
+ */
+#ifdef _WIN32
+#undef _IO	// ws2def.h
+#define _WIN_NM_IOCTL_TYPE 40000
+#define _IO(_c, _n)	CTL_CODE(_WIN_NM_IOCTL_TYPE, ((_n) + 0x800) , \
+		METHOD_BUFFERED, FILE_ANY_ACCESS  )
+#define _IO_direct(_c, _n)	CTL_CODE(_WIN_NM_IOCTL_TYPE, ((_n) + 0x800) , \
+		METHOD_OUT_DIRECT, FILE_ANY_ACCESS  )
+
+#define _IOWR(_c, _n, _s)	_IO(_c, _n)
+
+/* We havesome internal sysctl in addition to the externally visible ones */
+#define NETMAP_MMAP _IO_direct('i', 160)	// note METHOD_OUT_DIRECT
+#define NETMAP_POLL _IO('i', 162)
+
+/* and also two setsockopt for sysctl emulation */
+#define NETMAP_SETSOCKOPT _IO('i', 140)
+#define NETMAP_GETSOCKOPT _IO('i', 141)
+
+
+//These linknames are for the Netmap Core Driver
+#define NETMAP_NT_DEVICE_NAME			L"\\Device\\NETMAP"
+#define NETMAP_DOS_DEVICE_NAME			L"\\DosDevices\\netmap"
+
+//Definition of a structure used to pass a virtual address within an IOCTL
+typedef struct _MEMORY_ENTRY {
+	PVOID       pUsermodeVirtualAddress;
+} MEMORY_ENTRY, *PMEMORY_ENTRY;
+
+typedef struct _POLL_REQUEST_DATA {
+	int events;
+	int timeout;
+	int revents;
+} POLL_REQUEST_DATA;
+
+#endif /* _WIN32 */
+
+/*
+ * FreeBSD uses the size value embedded in the _IOWR to determine
+ * how much to copy in/out. So we need it to match the actual
+ * data structure we pass. We put some spares in the structure
+ * to ease compatibility with other versions
+ */
+#define NIOCGINFO	_IOWR('i', 145, struct nmreq) /* return IF info */
+#define NIOCREGIF	_IOWR('i', 146, struct nmreq) /* interface register */
+#define NIOCTXSYNC	_IO('i', 148) /* sync tx queues */
+#define NIOCRXSYNC	_IO('i', 149) /* sync rx queues */
+#define NIOCCONFIG	_IOWR('i',150, struct nm_ifreq) /* for ext. modules */
+#endif /* !NIOCREGIF */
+
+
+/*
+ * Helper functions for kernel and userspace
+ */
+
+/*
+ * check if space is available in the ring.
+ */
+static inline int
+nm_ring_empty(struct netmap_ring *ring)
+{
+	return (ring->cur == ring->tail);
+}
+
+/*
+ * Opaque structure that is passed to an external kernel
+ * module via ioctl(fd, NIOCCONFIG, req) for a user-owned
+ * bridge port (at this point ephemeral VALE interface).
+ */
+#define NM_IFRDATA_LEN 256
+struct nm_ifreq {
+	char nifr_name[IFNAMSIZ];
+	char data[NM_IFRDATA_LEN];
+};
+
+/*
+ * netmap kernel thread configuration
+ */
+/* bhyve/vmm.ko MSIX parameters for IOCTL */
+struct ptn_vmm_ioctl_msix {
+	uint64_t        msg;
+	uint64_t        addr;
+};
+
+/* IOCTL parameters */
+struct nm_kth_ioctl {
+	u_long				com;
+	/* TODO: use union */
+	union {
+		struct ptn_vmm_ioctl_msix msix;
+	} data;
+};
+
+/* Configuration of a ptnetmap ring */
+struct ptnet_ring_cfg {
+	uint64_t ioeventfd;		/* eventfd in linux, tsleep() parameter in FreeBSD */
+	uint64_t irqfd;			/* eventfd in linux, ioctl fd in FreeBSD */
+	struct nm_kth_ioctl ioctl;	/* ioctl parameter to send irq (only used in bhyve/FreeBSD) */
+};
+#endif /* _NET_NETMAP_H_ */
diff --git a/src/vnet/devices/netmap/netmap.api b/src/vnet/devices/netmap/netmap.api
new file mode 100644
index 00000000..377ccffd
--- /dev/null
+++ b/src/vnet/devices/netmap/netmap.api
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \brief Create netmap
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param netmap_if_name - interface name
+    @param hw_addr - interface MAC
+    @param use_random_hw_addr - use random generated MAC
+    @param is_pipe - is pipe
+    @param is_master - 0=slave, 1=master
+*/
+define netmap_create
+{
+  u32 client_index;
+  u32 context;
+
+  u8 netmap_if_name[64];
+  u8 hw_addr[6];
+  u8 use_random_hw_addr;
+  u8 is_pipe;
+  u8 is_master;
+};
+
+/** \brief Create netmap response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define netmap_create_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Delete netmap
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param netmap_if_name - interface name
+*/
+define netmap_delete
+{
+  u32 client_index;
+  u32 context;
+
+  u8 netmap_if_name[64];
+};
+
+/** \brief Delete netmap response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define netmap_delete_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/netmap/netmap.c b/src/vnet/devices/netmap/netmap.c
new file mode 100644
index 00000000..3bdb442d
--- /dev/null
+++ b/src/vnet/devices/netmap/netmap.c
@@ -0,0 +1,316 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdint.h>
+#include <net/if.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <vnet/devices/netmap/net_netmap.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/devices/netmap/netmap.h>
+
+static u32
+netmap_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi,
+			u32 flags)
+{
+  /* nothing for now */
+  return 0;
+}
+
+static clib_error_t *
+netmap_fd_read_ready (unix_file_t * uf)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  netmap_main_t *nm = &netmap_main;
+  u32 idx = uf->private_data;
+
+  nm->pending_input_bitmap =
+    clib_bitmap_set (nm->pending_input_bitmap, idx, 1);
+
+  /* Schedule the rx node */
+  vlib_node_set_interrupt_pending (vm, netmap_input_node.index);
+
+  return 0;
+}
+
+static void
+close_netmap_if (netmap_main_t * nm, netmap_if_t * nif)
+{
+  if (nif->unix_file_index != ~0)
+    {
+      unix_file_del (&unix_main, unix_main.file_pool + nif->unix_file_index);
+      nif->unix_file_index = ~0;
+    }
+  else if (nif->fd > -1)
+    close (nif->fd);
+
+  if (nif->mem_region)
+    {
+      netmap_mem_region_t *reg = &nm->mem_regions[nif->mem_region];
+      if (--reg->refcnt == 0)
+	{
+	  munmap (reg->mem, reg->region_size);
+	  reg->region_size = 0;
+	}
+    }
+
+
+  mhash_unset (&nm->if_index_by_host_if_name, nif->host_if_name,
+	       &nif->if_index);
+  vec_free (nif->host_if_name);
+  vec_free (nif->req);
+
+  memset (nif, 0, sizeof (*nif));
+  pool_put (nm->interfaces, nif);
+}
+
+int
+netmap_worker_thread_enable ()
+{
+  /* if worker threads are enabled, switch to polling mode */
+  foreach_vlib_main ((
+		       {
+		       vlib_node_set_state (this_vlib_main,
+					    netmap_input_node.index,
+					    VLIB_NODE_STATE_POLLING);
+		       }));
+
+  return 0;
+}
+
+int
+netmap_worker_thread_disable ()
+{
+  foreach_vlib_main ((
+		       {
+		       vlib_node_set_state (this_vlib_main,
+					    netmap_input_node.index,
+					    VLIB_NODE_STATE_INTERRUPT);
+		       }));
+
+  return 0;
+}
+
+int
+netmap_create_if (vlib_main_t * vm, u8 * if_name, u8 * hw_addr_set,
+		  u8 is_pipe, u8 is_master, u32 * sw_if_index)
+{
+  netmap_main_t *nm = &netmap_main;
+  int ret = 0;
+  netmap_if_t *nif = 0;
+  u8 hw_addr[6];
+  clib_error_t *error = 0;
+  vnet_sw_interface_t *sw;
+  vnet_main_t *vnm = vnet_get_main ();
+  uword *p;
+  struct nmreq *req = 0;
+  netmap_mem_region_t *reg;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  int fd;
+
+  p = mhash_get (&nm->if_index_by_host_if_name, if_name);
+  if (p)
+    return VNET_API_ERROR_SUBIF_ALREADY_EXISTS;
+
+  fd = open ("/dev/netmap", O_RDWR);
+  if (fd < 0)
+    return VNET_API_ERROR_SUBIF_ALREADY_EXISTS;
+
+  pool_get (nm->interfaces, nif);
+  nif->if_index = nif - nm->interfaces;
+  nif->fd = fd;
+  nif->unix_file_index = ~0;
+
+  vec_validate (req, 0);
+  nif->req = req;
+  req->nr_version = NETMAP_API;
+  req->nr_flags = NR_REG_ALL_NIC;
+
+  if (is_pipe)
+    req->nr_flags = is_master ? NR_REG_PIPE_MASTER : NR_REG_PIPE_SLAVE;
+  else
+    req->nr_flags = NR_REG_ALL_NIC;
+
+  req->nr_flags |= NR_ACCEPT_VNET_HDR;
+  snprintf (req->nr_name, IFNAMSIZ, "%s", if_name);
+  req->nr_name[IFNAMSIZ - 1] = 0;
+
+  if (ioctl (nif->fd, NIOCREGIF, req))
+    {
+      ret = VNET_API_ERROR_NOT_CONNECTED;
+      goto error;
+    }
+
+  nif->mem_region = req->nr_arg2;
+  vec_validate (nm->mem_regions, nif->mem_region);
+  reg = &nm->mem_regions[nif->mem_region];
+  if (reg->region_size == 0)
+    {
+      reg->mem = mmap (NULL, req->nr_memsize, PROT_READ | PROT_WRITE,
+		       MAP_SHARED, fd, 0);
+      clib_warning ("mem %p", reg->mem);
+      if (reg->mem == MAP_FAILED)
+	{
+	  ret = VNET_API_ERROR_NOT_CONNECTED;
+	  goto error;
+	}
+      reg->region_size = req->nr_memsize;
+    }
+  reg->refcnt++;
+
+  nif->nifp = NETMAP_IF (reg->mem, req->nr_offset);
+  nif->first_rx_ring = 0;
+  nif->last_rx_ring = 0;
+  nif->first_tx_ring = 0;
+  nif->last_tx_ring = 0;
+  nif->host_if_name = if_name;
+  nif->per_interface_next_index = ~0;
+
+  if (tm->n_vlib_mains > 1)
+    {
+      nif->lockp = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
+					   CLIB_CACHE_LINE_BYTES);
+      memset ((void *) nif->lockp, 0, CLIB_CACHE_LINE_BYTES);
+    }
+
+  {
+    unix_file_t template = { 0 };
+    template.read_function = netmap_fd_read_ready;
+    template.file_descriptor = nif->fd;
+    template.private_data = nif->if_index;
+    nif->unix_file_index = unix_file_add (&unix_main, &template);
+  }
+
+  /*use configured or generate random MAC address */
+  if (hw_addr_set)
+    memcpy (hw_addr, hw_addr_set, 6);
+  else
+    {
+      f64 now = vlib_time_now (vm);
+      u32 rnd;
+      rnd = (u32) (now * 1e6);
+      rnd = random_u32 (&rnd);
+
+      memcpy (hw_addr + 2, &rnd, sizeof (rnd));
+      hw_addr[0] = 2;
+      hw_addr[1] = 0xfe;
+    }
+
+  error = ethernet_register_interface (vnm, netmap_device_class.index,
+				       nif->if_index, hw_addr,
+				       &nif->hw_if_index,
+				       netmap_eth_flag_change);
+
+  if (error)
+    {
+      clib_error_report (error);
+      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
+      goto error;
+    }
+
+  sw = vnet_get_hw_sw_interface (vnm, nif->hw_if_index);
+  nif->sw_if_index = sw->sw_if_index;
+
+  mhash_set_mem (&nm->if_index_by_host_if_name, if_name, &nif->if_index, 0);
+
+  if (sw_if_index)
+    *sw_if_index = nif->sw_if_index;
+
+  if (tm->n_vlib_mains > 1 && pool_elts (nm->interfaces) == 1)
+    netmap_worker_thread_enable ();
+
+  return 0;
+
+error:
+  close_netmap_if (nm, nif);
+  return ret;
+}
+
+int
+netmap_delete_if (vlib_main_t * vm, u8 * host_if_name)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  netmap_main_t *nm = &netmap_main;
+  netmap_if_t *nif;
+  uword *p;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+
+  p = mhash_get (&nm->if_index_by_host_if_name, host_if_name);
+  if (p == NULL)
+    {
+      clib_warning ("Host interface %s does not exist", host_if_name);
+      return VNET_API_ERROR_SYSCALL_ERROR_1;
+    }
+  nif = pool_elt_at_index (nm->interfaces, p[0]);
+
+  /* bring down the interface */
+  vnet_hw_interface_set_flags (vnm, nif->hw_if_index, 0);
+
+  ethernet_delete_interface (vnm, nif->hw_if_index);
+
+  close_netmap_if (nm, nif);
+
+  if (tm->n_vlib_mains > 1 && pool_elts (nm->interfaces) == 0)
+    netmap_worker_thread_disable ();
+
+  return 0;
+}
+
+static clib_error_t *
+netmap_init (vlib_main_t * vm)
+{
+  netmap_main_t *nm = &netmap_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  vlib_thread_registration_t *tr;
+  uword *p;
+
+  memset (nm, 0, sizeof (netmap_main_t));
+
+  nm->input_cpu_first_index = 0;
+  nm->input_cpu_count = 1;
+
+  /* find out which cpus will be used for input */
+  p = hash_get_mem (tm->thread_registrations_by_name, "workers");
+  tr = p ? (vlib_thread_registration_t *) p[0] : 0;
+
+  if (tr && tr->count > 0)
+    {
+      nm->input_cpu_first_index = tr->first_index;
+      nm->input_cpu_count = tr->count;
+    }
+
+  mhash_init_vec_string (&nm->if_index_by_host_if_name, sizeof (uword));
+
+  vec_validate_aligned (nm->rx_buffers, tm->n_vlib_mains - 1,
+			CLIB_CACHE_LINE_BYTES);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (netmap_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/netmap/netmap.h b/src/vnet/devices/netmap/netmap.h
new file mode 100644
index 00000000..39a94043
--- /dev/null
+++ b/src/vnet/devices/netmap/netmap.h
@@ -0,0 +1,164 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+/*
+ * Copyright (C) 2011-2014 Universita` di Pisa. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  volatile u32 *lockp;
+  u8 *host_if_name;
+  uword if_index;
+  u32 hw_if_index;
+  u32 sw_if_index;
+  u32 unix_file_index;
+
+  u32 per_interface_next_index;
+  u8 is_admin_up;
+
+  /* netmap */
+  struct nmreq *req;
+  u16 mem_region;
+  int fd;
+  struct netmap_if *nifp;
+  u16 first_tx_ring;
+  u16 last_tx_ring;
+  u16 first_rx_ring;
+  u16 last_rx_ring;
+
+} netmap_if_t;
+
+typedef struct
+{
+  char *mem;
+  u32 region_size;
+  int refcnt;
+} netmap_mem_region_t;
+
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  netmap_if_t *interfaces;
+
+  /* bitmap of pending rx interfaces */
+  uword *pending_input_bitmap;
+
+  /* rx buffer cache */
+  u32 **rx_buffers;
+
+  /* hash of host interface names */
+  mhash_t if_index_by_host_if_name;
+
+  /* vector of memory regions */
+  netmap_mem_region_t *mem_regions;
+
+  /* first cpu index */
+  u32 input_cpu_first_index;
+
+  /* total cpu count */
+  u32 input_cpu_count;
+} netmap_main_t;
+
+netmap_main_t netmap_main;
+extern vnet_device_class_t netmap_device_class;
+extern vlib_node_registration_t netmap_input_node;
+
+int netmap_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set,
+		      u8 is_pipe, u8 is_master, u32 * sw_if_index);
+int netmap_delete_if (vlib_main_t * vm, u8 * host_if_name);
+
+
+/* Macros and helper functions from sys/net/netmap_user.h */
+
+#ifdef _NET_NETMAP_H_
+
+#define _NETMAP_OFFSET(type, ptr, offset) \
+	((type)(void *)((char *)(ptr) + (offset)))
+
+#define NETMAP_IF(_base, _ofs)	_NETMAP_OFFSET(struct netmap_if *, _base, _ofs)
+
+#define NETMAP_TXRING(nifp, index) _NETMAP_OFFSET(struct netmap_ring *, \
+	nifp, (nifp)->ring_ofs[index] )
+
+#define NETMAP_RXRING(nifp, index) _NETMAP_OFFSET(struct netmap_ring *,	\
+	nifp, (nifp)->ring_ofs[index + (nifp)->ni_tx_rings + 1] )
+
+#define NETMAP_BUF(ring, index)				\
+	((char *)(ring) + (ring)->buf_ofs + ((index)*(ring)->nr_buf_size))
+
+#define NETMAP_BUF_IDX(ring, buf)			\
+	( ((char *)(buf) - ((char *)(ring) + (ring)->buf_ofs) ) / \
+		(ring)->nr_buf_size )
+
+static inline uint32_t
+nm_ring_next (struct netmap_ring *ring, uint32_t i)
+{
+  return (PREDICT_FALSE (i + 1 == ring->num_slots) ? 0 : i + 1);
+}
+
+
+/*
+ * Return 1 if we have pending transmissions in the tx ring.
+ * When everything is complete ring->head = ring->tail + 1 (modulo ring size)
+ */
+static inline int
+nm_tx_pending (struct netmap_ring *ring)
+{
+  return nm_ring_next (ring, ring->tail) != ring->head;
+}
+
+static inline uint32_t
+nm_ring_space (struct netmap_ring *ring)
+{
+  int ret = ring->tail - ring->cur;
+  if (ret < 0)
+    ret += ring->num_slots;
+  return ret;
+}
+#endif
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/netmap/netmap_api.c b/src/vnet/devices/netmap/netmap_api.c
new file mode 100644
index 00000000..9a393b1f
--- /dev/null
+++ b/src/vnet/devices/netmap/netmap_api.c
@@ -0,0 +1,137 @@
+/*
+ *------------------------------------------------------------------
+ * netmap_api.c - netmap api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/devices/netmap/netmap.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                             \
+_(NETMAP_CREATE, netmap_create)                                         \
+_(NETMAP_DELETE, netmap_delete)                                         \
+
+static void
+vl_api_netmap_create_t_handler (vl_api_netmap_create_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_netmap_create_reply_t *rmp;
+  int rv = 0;
+  u8 *if_name = NULL;
+
+  if_name = format (0, "%s", mp->netmap_if_name);
+  vec_add1 (if_name, 0);
+
+  rv =
+    netmap_create_if (vm, if_name, mp->use_random_hw_addr ? 0 : mp->hw_addr,
+		      mp->is_pipe, mp->is_master, 0);
+
+  vec_free (if_name);
+
+  REPLY_MACRO (VL_API_NETMAP_CREATE_REPLY);
+}
+
+static void
+vl_api_netmap_delete_t_handler (vl_api_netmap_delete_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_netmap_delete_reply_t *rmp;
+  int rv = 0;
+  u8 *if_name = NULL;
+
+  if_name = format (0, "%s", mp->netmap_if_name);
+  vec_add1 (if_name, 0);
+
+  rv = netmap_delete_if (vm, if_name);
+
+  vec_free (if_name);
+
+  REPLY_MACRO (VL_API_NETMAP_DELETE_REPLY);
+}
+
+/*
+ * netmap_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_netmap;
+#undef _
+}
+
+static clib_error_t *
+netmap_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (netmap_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/netmap/node.c b/src/vnet/devices/netmap/node.c
new file mode 100644
index 00000000..19895e47
--- /dev/null
+++ b/src/vnet/devices/netmap/node.c
@@ -0,0 +1,300 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdint.h>
+#include <net/if.h>
+#include <sys/ioctl.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/devices/devices.h>
+#include <vnet/feature/feature.h>
+
+#include <vnet/devices/netmap/net_netmap.h>
+#include <vnet/devices/netmap/netmap.h>
+
+#define foreach_netmap_input_error
+
+typedef enum
+{
+#define _(f,s) NETMAP_INPUT_ERROR_##f,
+  foreach_netmap_input_error
+#undef _
+    NETMAP_INPUT_N_ERROR,
+} netmap_input_error_t;
+
+static char *netmap_input_error_strings[] = {
+#define _(n,s) s,
+  foreach_netmap_input_error
+#undef _
+};
+
+typedef struct
+{
+  u32 next_index;
+  u32 hw_if_index;
+  struct netmap_slot slot;
+} netmap_input_trace_t;
+
+static u8 *
+format_netmap_input_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  netmap_input_trace_t *t = va_arg (*args, netmap_input_trace_t *);
+  uword indent = format_get_indent (s);
+
+  s = format (s, "netmap: hw_if_index %d next-index %d",
+	      t->hw_if_index, t->next_index);
+  s = format (s, "\n%Uslot: flags 0x%x len %u buf_idx %u",
+	      format_white_space, indent + 2,
+	      t->slot.flags, t->slot.len, t->slot.buf_idx);
+  return s;
+}
+
+always_inline void
+buffer_add_to_chain (vlib_main_t * vm, u32 bi, u32 first_bi, u32 prev_bi)
+{
+  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+  vlib_buffer_t *first_b = vlib_get_buffer (vm, first_bi);
+  vlib_buffer_t *prev_b = vlib_get_buffer (vm, prev_bi);
+
+  /* update first buffer */
+  first_b->total_length_not_including_first_buffer += b->current_length;
+
+  /* update previous buffer */
+  prev_b->next_buffer = bi;
+  prev_b->flags |= VLIB_BUFFER_NEXT_PRESENT;
+
+  /* update current buffer */
+  b->next_buffer = 0;
+}
+
+always_inline uword
+netmap_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+			vlib_frame_t * frame, netmap_if_t * nif)
+{
+  u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
+  uword n_trace = vlib_get_trace_count (vm, node);
+  netmap_main_t *nm = &netmap_main;
+  u32 n_rx_packets = 0;
+  u32 n_rx_bytes = 0;
+  u32 *to_next = 0;
+  u32 n_free_bufs;
+  struct netmap_ring *ring;
+  int cur_ring;
+  u32 cpu_index = os_get_cpu_number ();
+  u32 n_buffer_bytes = vlib_buffer_free_list_buffer_size (vm,
+							  VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+
+  if (nif->per_interface_next_index != ~0)
+    next_index = nif->per_interface_next_index;
+
+  n_free_bufs = vec_len (nm->rx_buffers[cpu_index]);
+  if (PREDICT_FALSE (n_free_bufs < VLIB_FRAME_SIZE))
+    {
+      vec_validate (nm->rx_buffers[cpu_index],
+		    VLIB_FRAME_SIZE + n_free_bufs - 1);
+      n_free_bufs +=
+	vlib_buffer_alloc (vm, &nm->rx_buffers[cpu_index][n_free_bufs],
+			   VLIB_FRAME_SIZE);
+      _vec_len (nm->rx_buffers[cpu_index]) = n_free_bufs;
+    }
+
+  cur_ring = nif->first_rx_ring;
+  while (cur_ring <= nif->last_rx_ring && n_free_bufs)
+    {
+      int r = 0;
+      u32 cur_slot_index;
+      ring = NETMAP_RXRING (nif->nifp, cur_ring);
+      r = nm_ring_space (ring);
+
+      if (!r)
+	{
+	  cur_ring++;
+	  continue;
+	}
+
+      if (r > n_free_bufs)
+	r = n_free_bufs;
+
+      cur_slot_index = ring->cur;
+      while (r)
+	{
+	  u32 n_left_to_next;
+	  u32 next0 = next_index;
+	  vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+	  while (r && n_left_to_next)
+	    {
+	      vlib_buffer_t *first_b0 = 0;
+	      u32 offset = 0;
+	      u32 bi0 = 0, first_bi0 = 0, prev_bi0;
+	      u32 next_slot_index = (cur_slot_index + 1) % ring->num_slots;
+	      u32 next2_slot_index = (cur_slot_index + 2) % ring->num_slots;
+	      struct netmap_slot *slot = &ring->slot[cur_slot_index];
+	      u32 data_len = slot->len;
+
+	      /* prefetch 2 slots in advance */
+	      CLIB_PREFETCH (&ring->slot[next2_slot_index],
+			     CLIB_CACHE_LINE_BYTES, LOAD);
+	      /* prefetch start of next packet */
+	      CLIB_PREFETCH (NETMAP_BUF
+			     (ring, ring->slot[next_slot_index].buf_idx),
+			     CLIB_CACHE_LINE_BYTES, LOAD);
+
+	      while (data_len && n_free_bufs)
+		{
+		  vlib_buffer_t *b0;
+		  /* grab free buffer */
+		  u32 last_empty_buffer =
+		    vec_len (nm->rx_buffers[cpu_index]) - 1;
+		  prev_bi0 = bi0;
+		  bi0 = nm->rx_buffers[cpu_index][last_empty_buffer];
+		  b0 = vlib_get_buffer (vm, bi0);
+		  _vec_len (nm->rx_buffers[cpu_index]) = last_empty_buffer;
+		  n_free_bufs--;
+
+		  /* copy data */
+		  u32 bytes_to_copy =
+		    data_len > n_buffer_bytes ? n_buffer_bytes : data_len;
+		  b0->current_data = 0;
+		  clib_memcpy (vlib_buffer_get_current (b0),
+			       (u8 *) NETMAP_BUF (ring,
+						  slot->buf_idx) + offset,
+			       bytes_to_copy);
+
+		  /* fill buffer header */
+		  b0->current_length = bytes_to_copy;
+
+		  if (offset == 0)
+		    {
+		      b0->total_length_not_including_first_buffer = 0;
+		      b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
+		      vnet_buffer (b0)->sw_if_index[VLIB_RX] =
+			nif->sw_if_index;
+		      vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+		      first_bi0 = bi0;
+		      first_b0 = vlib_get_buffer (vm, first_bi0);
+		    }
+		  else
+		    buffer_add_to_chain (vm, bi0, first_bi0, prev_bi0);
+
+		  offset += bytes_to_copy;
+		  data_len -= bytes_to_copy;
+		}
+
+	      /* trace */
+	      VLIB_BUFFER_TRACE_TRAJECTORY_INIT (first_b0);
+	      if (PREDICT_FALSE (n_trace > 0))
+		{
+		  if (PREDICT_TRUE (first_b0 != 0))
+		    {
+		      netmap_input_trace_t *tr;
+		      vlib_trace_buffer (vm, node, next0, first_b0,
+					 /* follow_chain */ 0);
+		      vlib_set_trace_count (vm, node, --n_trace);
+		      tr = vlib_add_trace (vm, node, first_b0, sizeof (*tr));
+		      tr->next_index = next0;
+		      tr->hw_if_index = nif->hw_if_index;
+		      memcpy (&tr->slot, slot, sizeof (struct netmap_slot));
+		    }
+		}
+
+	      /* redirect if feature path enabled */
+	      vnet_feature_start_device_input_x1 (nif->sw_if_index, &next0,
+						  first_b0, 0);
+
+	      /* enque and take next packet */
+	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					       n_left_to_next, first_bi0,
+					       next0);
+
+	      /* next packet */
+	      n_rx_packets++;
+	      n_rx_bytes += slot->len;
+	      to_next[0] = first_bi0;
+	      to_next += 1;
+	      n_left_to_next--;
+	      cur_slot_index = next_slot_index;
+
+	      r--;
+	    }
+	  vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+	}
+      ring->head = ring->cur = cur_slot_index;
+      cur_ring++;
+    }
+
+  if (n_rx_packets)
+    ioctl (nif->fd, NIOCRXSYNC, NULL);
+
+  vlib_increment_combined_counter
+    (vnet_get_main ()->interface_main.combined_sw_if_counters
+     + VNET_INTERFACE_COUNTER_RX,
+     os_get_cpu_number (), nif->hw_if_index, n_rx_packets, n_rx_bytes);
+
+  return n_rx_packets;
+}
+
+static uword
+netmap_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+		 vlib_frame_t * frame)
+{
+  int i;
+  u32 n_rx_packets = 0;
+  u32 cpu_index = os_get_cpu_number ();
+  netmap_main_t *nm = &netmap_main;
+  netmap_if_t *nmi;
+
+  for (i = 0; i < vec_len (nm->interfaces); i++)
+    {
+      nmi = vec_elt_at_index (nm->interfaces, i);
+      if (nmi->is_admin_up &&
+	  (i % nm->input_cpu_count) ==
+	  (cpu_index - nm->input_cpu_first_index))
+	n_rx_packets += netmap_device_input_fn (vm, node, frame, nmi);
+    }
+
+  return n_rx_packets;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (netmap_input_node) = {
+  .function = netmap_input_fn,
+  .name = "netmap-input",
+  .sibling_of = "device-input",
+  .format_trace = format_netmap_input_trace,
+  .type = VLIB_NODE_TYPE_INPUT,
+  /* default state is INTERRUPT mode, switch to POLLING if worker threads are enabled */
+  .state = VLIB_NODE_STATE_INTERRUPT,
+  .n_errors = NETMAP_INPUT_N_ERROR,
+  .error_strings = netmap_input_error_strings,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (netmap_input_node, netmap_input_fn)
+/* *INDENT-ON* */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/nic/ixge.c b/src/vnet/devices/nic/ixge.c
new file mode 100644
index 00000000..d4c4c6b7
--- /dev/null
+++ b/src/vnet/devices/nic/ixge.c
@@ -0,0 +1,2938 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ *   WARNING!
+ *   This driver is not intended for production use and it is unsupported.
+ *   It is provided for educational use only.
+ *   Please use supported DPDK driver instead.
+ */
+
+#if __x86_64__
+#include <vppinfra/vector.h>
+
+#ifndef CLIB_HAVE_VEC128
+#warning HACK: ixge driver wont really work, missing u32x4
+typedef unsigned long long u32x4;
+#endif
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlib/pci/pci.h>
+#include <vnet/vnet.h>
+#include <vnet/devices/nic/ixge.h>
+#include <vnet/ethernet/ethernet.h>
+
+#define IXGE_ALWAYS_POLL 0
+
+#define EVENT_SET_FLAGS 0
+#define IXGE_HWBP_RACE_ELOG 0
+
+#define PCI_VENDOR_ID_INTEL 0x8086
+
+/* 10 GIG E (XGE) PHY IEEE 802.3 clause 45 definitions. */
+#define XGE_PHY_DEV_TYPE_PMA_PMD 1
+#define XGE_PHY_DEV_TYPE_PHY_XS 4
+#define XGE_PHY_ID1 0x2
+#define XGE_PHY_ID2 0x3
+#define XGE_PHY_CONTROL 0x0
+#define XGE_PHY_CONTROL_RESET (1 << 15)
+
+ixge_main_t ixge_main;
+static vlib_node_registration_t ixge_input_node;
+static vlib_node_registration_t ixge_process_node;
+
+static void
+ixge_semaphore_get (ixge_device_t * xd)
+{
+  ixge_main_t *xm = &ixge_main;
+  vlib_main_t *vm = xm->vlib_main;
+  ixge_regs_t *r = xd->regs;
+  u32 i;
+
+  i = 0;
+  while (!(r->software_semaphore & (1 << 0)))
+    {
+      if (i > 0)
+	vlib_process_suspend (vm, 100e-6);
+      i++;
+    }
+  do
+    {
+      r->software_semaphore |= 1 << 1;
+    }
+  while (!(r->software_semaphore & (1 << 1)));
+}
+
+static void
+ixge_semaphore_release (ixge_device_t * xd)
+{
+  ixge_regs_t *r = xd->regs;
+  r->software_semaphore &= ~3;
+}
+
+static void
+ixge_software_firmware_sync (ixge_device_t * xd, u32 sw_mask)
+{
+  ixge_main_t *xm = &ixge_main;
+  vlib_main_t *vm = xm->vlib_main;
+  ixge_regs_t *r = xd->regs;
+  u32 fw_mask = sw_mask << 5;
+  u32 m, done = 0;
+
+  while (!done)
+    {
+      ixge_semaphore_get (xd);
+      m = r->software_firmware_sync;
+      done = (m & fw_mask) == 0;
+      if (done)
+	r->software_firmware_sync = m | sw_mask;
+      ixge_semaphore_release (xd);
+      if (!done)
+	vlib_process_suspend (vm, 10e-3);
+    }
+}
+
+static void
+ixge_software_firmware_sync_release (ixge_device_t * xd, u32 sw_mask)
+{
+  ixge_regs_t *r = xd->regs;
+  ixge_semaphore_get (xd);
+  r->software_firmware_sync &= ~sw_mask;
+  ixge_semaphore_release (xd);
+}
+
+u32
+ixge_read_write_phy_reg (ixge_device_t * xd, u32 dev_type, u32 reg_index,
+			 u32 v, u32 is_read)
+{
+  ixge_regs_t *r = xd->regs;
+  const u32 busy_bit = 1 << 30;
+  u32 x;
+
+  ASSERT (xd->phy_index < 2);
+  ixge_software_firmware_sync (xd, 1 << (1 + xd->phy_index));
+
+  ASSERT (reg_index < (1 << 16));
+  ASSERT (dev_type < (1 << 5));
+  if (!is_read)
+    r->xge_mac.phy_data = v;
+
+  /* Address cycle. */
+  x =
+    reg_index | (dev_type << 16) | (xd->
+				    phys[xd->phy_index].mdio_address << 21);
+  r->xge_mac.phy_command = x | busy_bit;
+  /* Busy wait timed to take 28e-6 secs.  No suspend. */
+  while (r->xge_mac.phy_command & busy_bit)
+    ;
+
+  r->xge_mac.phy_command = x | ((is_read ? 2 : 1) << 26) | busy_bit;
+  while (r->xge_mac.phy_command & busy_bit)
+    ;
+
+  if (is_read)
+    v = r->xge_mac.phy_data >> 16;
+
+  ixge_software_firmware_sync_release (xd, 1 << (1 + xd->phy_index));
+
+  return v;
+}
+
+static u32
+ixge_read_phy_reg (ixge_device_t * xd, u32 dev_type, u32 reg_index)
+{
+  return ixge_read_write_phy_reg (xd, dev_type, reg_index, 0,	/* is_read */
+				  1);
+}
+
+static void
+ixge_write_phy_reg (ixge_device_t * xd, u32 dev_type, u32 reg_index, u32 v)
+{
+  (void) ixge_read_write_phy_reg (xd, dev_type, reg_index, v,	/* is_read */
+				  0);
+}
+
+static void
+ixge_i2c_put_bits (i2c_bus_t * b, int scl, int sda)
+{
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, b->private_data);
+  u32 v;
+
+  v = 0;
+  v |= (sda != 0) << 3;
+  v |= (scl != 0) << 1;
+  xd->regs->i2c_control = v;
+}
+
+static void
+ixge_i2c_get_bits (i2c_bus_t * b, int *scl, int *sda)
+{
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, b->private_data);
+  u32 v;
+
+  v = xd->regs->i2c_control;
+  *sda = (v & (1 << 2)) != 0;
+  *scl = (v & (1 << 0)) != 0;
+}
+
+static u16
+ixge_read_eeprom (ixge_device_t * xd, u32 address)
+{
+  ixge_regs_t *r = xd->regs;
+  u32 v;
+  r->eeprom_read = (( /* start bit */ (1 << 0)) | (address << 2));
+  /* Wait for done bit. */
+  while (!((v = r->eeprom_read) & (1 << 1)))
+    ;
+  return v >> 16;
+}
+
+static void
+ixge_sfp_enable_disable_laser (ixge_device_t * xd, uword enable)
+{
+  u32 tx_disable_bit = 1 << 3;
+  if (enable)
+    xd->regs->sdp_control &= ~tx_disable_bit;
+  else
+    xd->regs->sdp_control |= tx_disable_bit;
+}
+
+static void
+ixge_sfp_enable_disable_10g (ixge_device_t * xd, uword enable)
+{
+  u32 is_10g_bit = 1 << 5;
+  if (enable)
+    xd->regs->sdp_control |= is_10g_bit;
+  else
+    xd->regs->sdp_control &= ~is_10g_bit;
+}
+
+static clib_error_t *
+ixge_sfp_phy_init_from_eeprom (ixge_device_t * xd, u16 sfp_type)
+{
+  u16 a, id, reg_values_addr = 0;
+
+  a = ixge_read_eeprom (xd, 0x2b);
+  if (a == 0 || a == 0xffff)
+    return clib_error_create ("no init sequence in eeprom");
+
+  while (1)
+    {
+      id = ixge_read_eeprom (xd, ++a);
+      if (id == 0xffff)
+	break;
+      reg_values_addr = ixge_read_eeprom (xd, ++a);
+      if (id == sfp_type)
+	break;
+    }
+  if (id != sfp_type)
+    return clib_error_create ("failed to find id 0x%x", sfp_type);
+
+  ixge_software_firmware_sync (xd, 1 << 3);
+  while (1)
+    {
+      u16 v = ixge_read_eeprom (xd, ++reg_values_addr);
+      if (v == 0xffff)
+	break;
+      xd->regs->core_analog_config = v;
+    }
+  ixge_software_firmware_sync_release (xd, 1 << 3);
+
+  /* Make sure laser is off.  We'll turn on the laser when
+     the interface is brought up. */
+  ixge_sfp_enable_disable_laser (xd, /* enable */ 0);
+  ixge_sfp_enable_disable_10g (xd, /* is_10g */ 1);
+
+  return 0;
+}
+
+static void
+ixge_sfp_device_up_down (ixge_device_t * xd, uword is_up)
+{
+  u32 v;
+
+  if (is_up)
+    {
+      /* pma/pmd 10g serial SFI. */
+      xd->regs->xge_mac.auto_negotiation_control2 &= ~(3 << 16);
+      xd->regs->xge_mac.auto_negotiation_control2 |= 2 << 16;
+
+      v = xd->regs->xge_mac.auto_negotiation_control;
+      v &= ~(7 << 13);
+      v |= (0 << 13);
+      /* Restart autoneg. */
+      v |= (1 << 12);
+      xd->regs->xge_mac.auto_negotiation_control = v;
+
+      while (!(xd->regs->xge_mac.link_partner_ability[0] & 0xf0000))
+	;
+
+      v = xd->regs->xge_mac.auto_negotiation_control;
+
+      /* link mode 10g sfi serdes */
+      v &= ~(7 << 13);
+      v |= (3 << 13);
+
+      /* Restart autoneg. */
+      v |= (1 << 12);
+      xd->regs->xge_mac.auto_negotiation_control = v;
+
+      xd->regs->xge_mac.link_status;
+    }
+
+  ixge_sfp_enable_disable_laser (xd, /* enable */ is_up);
+
+  /* Give time for link partner to notice that we're up. */
+  if (is_up && vlib_in_process_context (vlib_get_main ()))
+    {
+      vlib_process_suspend (vlib_get_main (), 300e-3);
+    }
+}
+
+always_inline ixge_dma_regs_t *
+get_dma_regs (ixge_device_t * xd, vlib_rx_or_tx_t rt, u32 qi)
+{
+  ixge_regs_t *r = xd->regs;
+  ASSERT (qi < 128);
+  if (rt == VLIB_RX)
+    return qi < 64 ? &r->rx_dma0[qi] : &r->rx_dma1[qi - 64];
+  else
+    return &r->tx_dma[qi];
+}
+
+static clib_error_t *
+ixge_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+  vnet_hw_interface_t *hif = vnet_get_hw_interface (vnm, hw_if_index);
+  uword is_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, hif->dev_instance);
+  ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_RX, 0);
+
+  if (is_up)
+    {
+      xd->regs->rx_enable |= 1;
+      xd->regs->tx_dma_control |= 1;
+      dr->control |= 1 << 25;
+      while (!(dr->control & (1 << 25)))
+	;
+    }
+  else
+    {
+      xd->regs->rx_enable &= ~1;
+      xd->regs->tx_dma_control &= ~1;
+    }
+
+  ixge_sfp_device_up_down (xd, is_up);
+
+  return /* no error */ 0;
+}
+
+static void
+ixge_sfp_phy_init (ixge_device_t * xd)
+{
+  ixge_phy_t *phy = xd->phys + xd->phy_index;
+  i2c_bus_t *ib = &xd->i2c_bus;
+
+  ib->private_data = xd->device_index;
+  ib->put_bits = ixge_i2c_put_bits;
+  ib->get_bits = ixge_i2c_get_bits;
+  vlib_i2c_init (ib);
+
+  vlib_i2c_read_eeprom (ib, 0x50, 0, 128, (u8 *) & xd->sfp_eeprom);
+
+  if (vlib_i2c_bus_timed_out (ib) || !sfp_eeprom_is_valid (&xd->sfp_eeprom))
+    xd->sfp_eeprom.id = SFP_ID_unknown;
+  else
+    {
+      /* FIXME 5 => SR/LR eeprom ID. */
+      clib_error_t *e =
+	ixge_sfp_phy_init_from_eeprom (xd, 5 + xd->pci_function);
+      if (e)
+	clib_error_report (e);
+    }
+
+  phy->mdio_address = ~0;
+}
+
+static void
+ixge_phy_init (ixge_device_t * xd)
+{
+  ixge_main_t *xm = &ixge_main;
+  vlib_main_t *vm = xm->vlib_main;
+  ixge_phy_t *phy = xd->phys + xd->phy_index;
+
+  switch (xd->device_id)
+    {
+    case IXGE_82599_sfp:
+    case IXGE_82599_sfp_em:
+    case IXGE_82599_sfp_fcoe:
+      /* others? */
+      return ixge_sfp_phy_init (xd);
+
+    default:
+      break;
+    }
+
+  /* Probe address of phy. */
+  {
+    u32 i, v;
+
+    phy->mdio_address = ~0;
+    for (i = 0; i < 32; i++)
+      {
+	phy->mdio_address = i;
+	v = ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PMA_PMD, XGE_PHY_ID1);
+	if (v != 0xffff && v != 0)
+	  break;
+      }
+
+    /* No PHY found? */
+    if (i >= 32)
+      return;
+  }
+
+  phy->id =
+    ((ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PMA_PMD, XGE_PHY_ID1) << 16) |
+     ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PMA_PMD, XGE_PHY_ID2));
+
+  {
+    ELOG_TYPE_DECLARE (e) =
+    {
+    .function = (char *) __FUNCTION__,.format =
+	"ixge %d, phy id 0x%d mdio address %d",.format_args = "i4i4i4",};
+    struct
+    {
+      u32 instance, id, address;
+    } *ed;
+    ed = ELOG_DATA (&vm->elog_main, e);
+    ed->instance = xd->device_index;
+    ed->id = phy->id;
+    ed->address = phy->mdio_address;
+  }
+
+  /* Reset phy. */
+  ixge_write_phy_reg (xd, XGE_PHY_DEV_TYPE_PHY_XS, XGE_PHY_CONTROL,
+		      XGE_PHY_CONTROL_RESET);
+
+  /* Wait for self-clearning reset bit to clear. */
+  do
+    {
+      vlib_process_suspend (vm, 1e-3);
+    }
+  while (ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PHY_XS, XGE_PHY_CONTROL) &
+	 XGE_PHY_CONTROL_RESET);
+}
+
+static u8 *
+format_ixge_rx_from_hw_descriptor (u8 * s, va_list * va)
+{
+  ixge_rx_from_hw_descriptor_t *d =
+    va_arg (*va, ixge_rx_from_hw_descriptor_t *);
+  u32 s0 = d->status[0], s2 = d->status[2];
+  u32 is_ip4, is_ip6, is_ip, is_tcp, is_udp;
+  uword indent = format_get_indent (s);
+
+  s = format (s, "%s-owned",
+	      (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE) ? "sw" :
+	      "hw");
+  s =
+    format (s, ", length this descriptor %d, l3 offset %d",
+	    d->n_packet_bytes_this_descriptor,
+	    IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s0));
+  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET)
+    s = format (s, ", end-of-packet");
+
+  s = format (s, "\n%U", format_white_space, indent);
+
+  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_ETHERNET_ERROR)
+    s = format (s, "layer2 error");
+
+  if (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_LAYER2)
+    {
+      s = format (s, "layer 2 type %d", (s0 & 0x1f));
+      return s;
+    }
+
+  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_VLAN)
+    s = format (s, "vlan header 0x%x\n%U", d->vlan_tag,
+		format_white_space, indent);
+
+  if ((is_ip4 = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4)))
+    {
+      s = format (s, "ip4%s",
+		  (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4_EXT) ? " options" :
+		  "");
+      if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED)
+	s = format (s, " checksum %s",
+		    (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR) ?
+		    "bad" : "ok");
+    }
+  if ((is_ip6 = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6)))
+    s = format (s, "ip6%s",
+		(s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6_EXT) ? " extended" :
+		"");
+  is_tcp = is_udp = 0;
+  if ((is_ip = (is_ip4 | is_ip6)))
+    {
+      is_tcp = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_TCP) != 0;
+      is_udp = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_UDP) != 0;
+      if (is_tcp)
+	s = format (s, ", tcp");
+      if (is_udp)
+	s = format (s, ", udp");
+    }
+
+  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED)
+    s = format (s, ", tcp checksum %s",
+		(s2 & IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR) ? "bad" :
+		"ok");
+  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED)
+    s = format (s, ", udp checksum %s",
+		(s2 & IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR) ? "bad" :
+		"ok");
+
+  return s;
+}
+
+static u8 *
+format_ixge_tx_descriptor (u8 * s, va_list * va)
+{
+  ixge_tx_descriptor_t *d = va_arg (*va, ixge_tx_descriptor_t *);
+  u32 s0 = d->status0, s1 = d->status1;
+  uword indent = format_get_indent (s);
+  u32 v;
+
+  s = format (s, "buffer 0x%Lx, %d packet bytes, %d bytes this buffer",
+	      d->buffer_address, s1 >> 14, d->n_bytes_this_buffer);
+
+  s = format (s, "\n%U", format_white_space, indent);
+
+  if ((v = (s0 >> 0) & 3))
+    s = format (s, "reserved 0x%x, ", v);
+
+  if ((v = (s0 >> 2) & 3))
+    s = format (s, "mac 0x%x, ", v);
+
+  if ((v = (s0 >> 4) & 0xf) != 3)
+    s = format (s, "type 0x%x, ", v);
+
+  s = format (s, "%s%s%s%s%s%s%s%s",
+	      (s0 & (1 << 8)) ? "eop, " : "",
+	      (s0 & (1 << 9)) ? "insert-fcs, " : "",
+	      (s0 & (1 << 10)) ? "reserved26, " : "",
+	      (s0 & (1 << 11)) ? "report-status, " : "",
+	      (s0 & (1 << 12)) ? "reserved28, " : "",
+	      (s0 & (1 << 13)) ? "is-advanced, " : "",
+	      (s0 & (1 << 14)) ? "vlan-enable, " : "",
+	      (s0 & (1 << 15)) ? "tx-segmentation, " : "");
+
+  if ((v = s1 & 0xf) != 0)
+    s = format (s, "status 0x%x, ", v);
+
+  if ((v = (s1 >> 4) & 0xf))
+    s = format (s, "context 0x%x, ", v);
+
+  if ((v = (s1 >> 8) & 0x3f))
+    s = format (s, "options 0x%x, ", v);
+
+  return s;
+}
+
+typedef struct
+{
+  ixge_descriptor_t before, after;
+
+  u32 buffer_index;
+
+  u16 device_index;
+
+  u8 queue_index;
+
+  u8 is_start_of_packet;
+
+  /* Copy of VLIB buffer; packet data stored in pre_data. */
+  vlib_buffer_t buffer;
+} ixge_rx_dma_trace_t;
+
+static u8 *
+format_ixge_rx_dma_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  vlib_node_t *node = va_arg (*va, vlib_node_t *);
+  vnet_main_t *vnm = vnet_get_main ();
+  ixge_rx_dma_trace_t *t = va_arg (*va, ixge_rx_dma_trace_t *);
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, t->device_index);
+  format_function_t *f;
+  uword indent = format_get_indent (s);
+
+  {
+    vnet_sw_interface_t *sw =
+      vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
+    s =
+      format (s, "%U rx queue %d", format_vnet_sw_interface_name, vnm, sw,
+	      t->queue_index);
+  }
+
+  s = format (s, "\n%Ubefore: %U",
+	      format_white_space, indent,
+	      format_ixge_rx_from_hw_descriptor, &t->before);
+  s = format (s, "\n%Uafter : head/tail address 0x%Lx/0x%Lx",
+	      format_white_space, indent,
+	      t->after.rx_to_hw.head_address, t->after.rx_to_hw.tail_address);
+
+  s = format (s, "\n%Ubuffer 0x%x: %U",
+	      format_white_space, indent,
+	      t->buffer_index, format_vlib_buffer, &t->buffer);
+
+  s = format (s, "\n%U", format_white_space, indent);
+
+  f = node->format_buffer;
+  if (!f || !t->is_start_of_packet)
+    f = format_hex_bytes;
+  s = format (s, "%U", f, t->buffer.pre_data, sizeof (t->buffer.pre_data));
+
+  return s;
+}
+
+#define foreach_ixge_error					\
+  _ (none, "no error")						\
+  _ (tx_full_drops, "tx ring full drops")			\
+  _ (ip4_checksum_error, "ip4 checksum errors")			\
+  _ (rx_alloc_fail, "rx buf alloc from free list failed")	\
+  _ (rx_alloc_no_physmem, "rx buf alloc failed no physmem")
+
+typedef enum
+{
+#define _(f,s) IXGE_ERROR_##f,
+  foreach_ixge_error
+#undef _
+    IXGE_N_ERROR,
+} ixge_error_t;
+
+always_inline void
+ixge_rx_next_and_error_from_status_x1 (ixge_device_t * xd,
+				       u32 s00, u32 s02,
+				       u8 * next0, u8 * error0, u32 * flags0)
+{
+  u8 is0_ip4, is0_ip6, n0, e0;
+  u32 f0;
+
+  e0 = IXGE_ERROR_none;
+  n0 = IXGE_RX_NEXT_ETHERNET_INPUT;
+
+  is0_ip4 = s02 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED;
+  n0 = is0_ip4 ? IXGE_RX_NEXT_IP4_INPUT : n0;
+
+  e0 = (is0_ip4 && (s02 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR)
+	? IXGE_ERROR_ip4_checksum_error : e0);
+
+  is0_ip6 = s00 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6;
+  n0 = is0_ip6 ? IXGE_RX_NEXT_IP6_INPUT : n0;
+
+  n0 = (xd->per_interface_next_index != ~0) ?
+    xd->per_interface_next_index : n0;
+
+  /* Check for error. */
+  n0 = e0 != IXGE_ERROR_none ? IXGE_RX_NEXT_DROP : n0;
+
+  f0 = ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
+		| IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
+	? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
+
+  f0 |= ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
+		 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
+	 ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
+
+  *error0 = e0;
+  *next0 = n0;
+  *flags0 = f0;
+}
+
+always_inline void
+ixge_rx_next_and_error_from_status_x2 (ixge_device_t * xd,
+				       u32 s00, u32 s02,
+				       u32 s10, u32 s12,
+				       u8 * next0, u8 * error0, u32 * flags0,
+				       u8 * next1, u8 * error1, u32 * flags1)
+{
+  u8 is0_ip4, is0_ip6, n0, e0;
+  u8 is1_ip4, is1_ip6, n1, e1;
+  u32 f0, f1;
+
+  e0 = e1 = IXGE_ERROR_none;
+  n0 = n1 = IXGE_RX_NEXT_IP4_INPUT;
+
+  is0_ip4 = s02 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED;
+  is1_ip4 = s12 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED;
+
+  n0 = is0_ip4 ? IXGE_RX_NEXT_IP4_INPUT : n0;
+  n1 = is1_ip4 ? IXGE_RX_NEXT_IP4_INPUT : n1;
+
+  e0 = (is0_ip4 && (s02 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR)
+	? IXGE_ERROR_ip4_checksum_error : e0);
+  e1 = (is1_ip4 && (s12 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR)
+	? IXGE_ERROR_ip4_checksum_error : e1);
+
+  is0_ip6 = s00 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6;
+  is1_ip6 = s10 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6;
+
+  n0 = is0_ip6 ? IXGE_RX_NEXT_IP6_INPUT : n0;
+  n1 = is1_ip6 ? IXGE_RX_NEXT_IP6_INPUT : n1;
+
+  n0 = (xd->per_interface_next_index != ~0) ?
+    xd->per_interface_next_index : n0;
+  n1 = (xd->per_interface_next_index != ~0) ?
+    xd->per_interface_next_index : n1;
+
+  /* Check for error. */
+  n0 = e0 != IXGE_ERROR_none ? IXGE_RX_NEXT_DROP : n0;
+  n1 = e1 != IXGE_ERROR_none ? IXGE_RX_NEXT_DROP : n1;
+
+  *error0 = e0;
+  *error1 = e1;
+
+  *next0 = n0;
+  *next1 = n1;
+
+  f0 = ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
+		| IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
+	? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
+  f1 = ((s12 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
+		| IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
+	? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
+
+  f0 |= ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
+		 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
+	 ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
+  f1 |= ((s12 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
+		 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
+	 ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
+
+  *flags0 = f0;
+  *flags1 = f1;
+}
+
+static void
+ixge_rx_trace (ixge_main_t * xm,
+	       ixge_device_t * xd,
+	       ixge_dma_queue_t * dq,
+	       ixge_descriptor_t * before_descriptors,
+	       u32 * before_buffers,
+	       ixge_descriptor_t * after_descriptors, uword n_descriptors)
+{
+  vlib_main_t *vm = xm->vlib_main;
+  vlib_node_runtime_t *node = dq->rx.node;
+  ixge_rx_from_hw_descriptor_t *bd;
+  ixge_rx_to_hw_descriptor_t *ad;
+  u32 *b, n_left, is_sop, next_index_sop;
+
+  n_left = n_descriptors;
+  b = before_buffers;
+  bd = &before_descriptors->rx_from_hw;
+  ad = &after_descriptors->rx_to_hw;
+  is_sop = dq->rx.is_start_of_packet;
+  next_index_sop = dq->rx.saved_start_of_packet_next_index;
+
+  while (n_left >= 2)
+    {
+      u32 bi0, bi1, flags0, flags1;
+      vlib_buffer_t *b0, *b1;
+      ixge_rx_dma_trace_t *t0, *t1;
+      u8 next0, error0, next1, error1;
+
+      bi0 = b[0];
+      bi1 = b[1];
+      n_left -= 2;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      ixge_rx_next_and_error_from_status_x2 (xd,
+					     bd[0].status[0], bd[0].status[2],
+					     bd[1].status[0], bd[1].status[2],
+					     &next0, &error0, &flags0,
+					     &next1, &error1, &flags1);
+
+      next_index_sop = is_sop ? next0 : next_index_sop;
+      vlib_trace_buffer (vm, node, next_index_sop, b0, /* follow_chain */ 0);
+      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+      t0->is_start_of_packet = is_sop;
+      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      next_index_sop = is_sop ? next1 : next_index_sop;
+      vlib_trace_buffer (vm, node, next_index_sop, b1, /* follow_chain */ 0);
+      t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
+      t1->is_start_of_packet = is_sop;
+      is_sop = (b1->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      t0->queue_index = dq->queue_index;
+      t1->queue_index = dq->queue_index;
+      t0->device_index = xd->device_index;
+      t1->device_index = xd->device_index;
+      t0->before.rx_from_hw = bd[0];
+      t1->before.rx_from_hw = bd[1];
+      t0->after.rx_to_hw = ad[0];
+      t1->after.rx_to_hw = ad[1];
+      t0->buffer_index = bi0;
+      t1->buffer_index = bi1;
+      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
+      memcpy (&t1->buffer, b1, sizeof (b1[0]) - sizeof (b0->pre_data));
+      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
+	      sizeof (t0->buffer.pre_data));
+      memcpy (t1->buffer.pre_data, b1->data + b1->current_data,
+	      sizeof (t1->buffer.pre_data));
+
+      b += 2;
+      bd += 2;
+      ad += 2;
+    }
+
+  while (n_left >= 1)
+    {
+      u32 bi0, flags0;
+      vlib_buffer_t *b0;
+      ixge_rx_dma_trace_t *t0;
+      u8 next0, error0;
+
+      bi0 = b[0];
+      n_left -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      ixge_rx_next_and_error_from_status_x1 (xd,
+					     bd[0].status[0], bd[0].status[2],
+					     &next0, &error0, &flags0);
+
+      next_index_sop = is_sop ? next0 : next_index_sop;
+      vlib_trace_buffer (vm, node, next_index_sop, b0, /* follow_chain */ 0);
+      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+      t0->is_start_of_packet = is_sop;
+      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      t0->queue_index = dq->queue_index;
+      t0->device_index = xd->device_index;
+      t0->before.rx_from_hw = bd[0];
+      t0->after.rx_to_hw = ad[0];
+      t0->buffer_index = bi0;
+      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
+      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
+	      sizeof (t0->buffer.pre_data));
+
+      b += 1;
+      bd += 1;
+      ad += 1;
+    }
+}
+
+typedef struct
+{
+  ixge_tx_descriptor_t descriptor;
+
+  u32 buffer_index;
+
+  u16 device_index;
+
+  u8 queue_index;
+
+  u8 is_start_of_packet;
+
+  /* Copy of VLIB buffer; packet data stored in pre_data. */
+  vlib_buffer_t buffer;
+} ixge_tx_dma_trace_t;
+
+static u8 *
+format_ixge_tx_dma_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  ixge_tx_dma_trace_t *t = va_arg (*va, ixge_tx_dma_trace_t *);
+  vnet_main_t *vnm = vnet_get_main ();
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, t->device_index);
+  format_function_t *f;
+  uword indent = format_get_indent (s);
+
+  {
+    vnet_sw_interface_t *sw =
+      vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
+    s =
+      format (s, "%U tx queue %d", format_vnet_sw_interface_name, vnm, sw,
+	      t->queue_index);
+  }
+
+  s = format (s, "\n%Udescriptor: %U",
+	      format_white_space, indent,
+	      format_ixge_tx_descriptor, &t->descriptor);
+
+  s = format (s, "\n%Ubuffer 0x%x: %U",
+	      format_white_space, indent,
+	      t->buffer_index, format_vlib_buffer, &t->buffer);
+
+  s = format (s, "\n%U", format_white_space, indent);
+
+  f = format_ethernet_header_with_length;
+  if (!f || !t->is_start_of_packet)
+    f = format_hex_bytes;
+  s = format (s, "%U", f, t->buffer.pre_data, sizeof (t->buffer.pre_data));
+
+  return s;
+}
+
+typedef struct
+{
+  vlib_node_runtime_t *node;
+
+  u32 is_start_of_packet;
+
+  u32 n_bytes_in_packet;
+
+  ixge_tx_descriptor_t *start_of_packet_descriptor;
+} ixge_tx_state_t;
+
+static void
+ixge_tx_trace (ixge_main_t * xm,
+	       ixge_device_t * xd,
+	       ixge_dma_queue_t * dq,
+	       ixge_tx_state_t * tx_state,
+	       ixge_tx_descriptor_t * descriptors,
+	       u32 * buffers, uword n_descriptors)
+{
+  vlib_main_t *vm = xm->vlib_main;
+  vlib_node_runtime_t *node = tx_state->node;
+  ixge_tx_descriptor_t *d;
+  u32 *b, n_left, is_sop;
+
+  n_left = n_descriptors;
+  b = buffers;
+  d = descriptors;
+  is_sop = tx_state->is_start_of_packet;
+
+  while (n_left >= 2)
+    {
+      u32 bi0, bi1;
+      vlib_buffer_t *b0, *b1;
+      ixge_tx_dma_trace_t *t0, *t1;
+
+      bi0 = b[0];
+      bi1 = b[1];
+      n_left -= 2;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+      t0->is_start_of_packet = is_sop;
+      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
+      t1->is_start_of_packet = is_sop;
+      is_sop = (b1->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      t0->queue_index = dq->queue_index;
+      t1->queue_index = dq->queue_index;
+      t0->device_index = xd->device_index;
+      t1->device_index = xd->device_index;
+      t0->descriptor = d[0];
+      t1->descriptor = d[1];
+      t0->buffer_index = bi0;
+      t1->buffer_index = bi1;
+      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
+      memcpy (&t1->buffer, b1, sizeof (b1[0]) - sizeof (b0->pre_data));
+      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
+	      sizeof (t0->buffer.pre_data));
+      memcpy (t1->buffer.pre_data, b1->data + b1->current_data,
+	      sizeof (t1->buffer.pre_data));
+
+      b += 2;
+      d += 2;
+    }
+
+  while (n_left >= 1)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      ixge_tx_dma_trace_t *t0;
+
+      bi0 = b[0];
+      n_left -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+      t0->is_start_of_packet = is_sop;
+      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      t0->queue_index = dq->queue_index;
+      t0->device_index = xd->device_index;
+      t0->descriptor = d[0];
+      t0->buffer_index = bi0;
+      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
+      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
+	      sizeof (t0->buffer.pre_data));
+
+      b += 1;
+      d += 1;
+    }
+}
+
+always_inline uword
+ixge_ring_sub (ixge_dma_queue_t * q, u32 i0, u32 i1)
+{
+  i32 d = i1 - i0;
+  ASSERT (i0 < q->n_descriptors);
+  ASSERT (i1 < q->n_descriptors);
+  return d < 0 ? q->n_descriptors + d : d;
+}
+
+always_inline uword
+ixge_ring_add (ixge_dma_queue_t * q, u32 i0, u32 i1)
+{
+  u32 d = i0 + i1;
+  ASSERT (i0 < q->n_descriptors);
+  ASSERT (i1 < q->n_descriptors);
+  d -= d >= q->n_descriptors ? q->n_descriptors : 0;
+  return d;
+}
+
+always_inline uword
+ixge_tx_descriptor_matches_template (ixge_main_t * xm,
+				     ixge_tx_descriptor_t * d)
+{
+  u32 cmp;
+
+  cmp = ((d->status0 & xm->tx_descriptor_template_mask.status0)
+	 ^ xm->tx_descriptor_template.status0);
+  if (cmp)
+    return 0;
+  cmp = ((d->status1 & xm->tx_descriptor_template_mask.status1)
+	 ^ xm->tx_descriptor_template.status1);
+  if (cmp)
+    return 0;
+
+  return 1;
+}
+
+static uword
+ixge_tx_no_wrap (ixge_main_t * xm,
+		 ixge_device_t * xd,
+		 ixge_dma_queue_t * dq,
+		 u32 * buffers,
+		 u32 start_descriptor_index,
+		 u32 n_descriptors, ixge_tx_state_t * tx_state)
+{
+  vlib_main_t *vm = xm->vlib_main;
+  ixge_tx_descriptor_t *d, *d_sop;
+  u32 n_left = n_descriptors;
+  u32 *to_free = vec_end (xm->tx_buffers_pending_free);
+  u32 *to_tx =
+    vec_elt_at_index (dq->descriptor_buffer_indices, start_descriptor_index);
+  u32 is_sop = tx_state->is_start_of_packet;
+  u32 len_sop = tx_state->n_bytes_in_packet;
+  u16 template_status = xm->tx_descriptor_template.status0;
+  u32 descriptor_prefetch_rotor = 0;
+
+  ASSERT (start_descriptor_index + n_descriptors <= dq->n_descriptors);
+  d = &dq->descriptors[start_descriptor_index].tx;
+  d_sop = is_sop ? d : tx_state->start_of_packet_descriptor;
+
+  while (n_left >= 4)
+    {
+      vlib_buffer_t *b0, *b1;
+      u32 bi0, fi0, len0;
+      u32 bi1, fi1, len1;
+      u8 is_eop0, is_eop1;
+
+      /* Prefetch next iteration. */
+      vlib_prefetch_buffer_with_index (vm, buffers[2], LOAD);
+      vlib_prefetch_buffer_with_index (vm, buffers[3], LOAD);
+
+      if ((descriptor_prefetch_rotor & 0x3) == 0)
+	CLIB_PREFETCH (d + 4, CLIB_CACHE_LINE_BYTES, STORE);
+
+      descriptor_prefetch_rotor += 2;
+
+      bi0 = buffers[0];
+      bi1 = buffers[1];
+
+      to_free[0] = fi0 = to_tx[0];
+      to_tx[0] = bi0;
+      to_free += fi0 != 0;
+
+      to_free[0] = fi1 = to_tx[1];
+      to_tx[1] = bi1;
+      to_free += fi1 != 0;
+
+      buffers += 2;
+      n_left -= 2;
+      to_tx += 2;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      is_eop0 = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+      is_eop1 = (b1->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      len0 = b0->current_length;
+      len1 = b1->current_length;
+
+      ASSERT (ixge_tx_descriptor_matches_template (xm, d + 0));
+      ASSERT (ixge_tx_descriptor_matches_template (xm, d + 1));
+
+      d[0].buffer_address =
+	vlib_get_buffer_data_physical_address (vm, bi0) + b0->current_data;
+      d[1].buffer_address =
+	vlib_get_buffer_data_physical_address (vm, bi1) + b1->current_data;
+
+      d[0].n_bytes_this_buffer = len0;
+      d[1].n_bytes_this_buffer = len1;
+
+      d[0].status0 =
+	template_status | (is_eop0 <<
+			   IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET);
+      d[1].status0 =
+	template_status | (is_eop1 <<
+			   IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET);
+
+      len_sop = (is_sop ? 0 : len_sop) + len0;
+      d_sop[0].status1 =
+	IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET (len_sop);
+      d += 1;
+      d_sop = is_eop0 ? d : d_sop;
+
+      is_sop = is_eop0;
+
+      len_sop = (is_sop ? 0 : len_sop) + len1;
+      d_sop[0].status1 =
+	IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET (len_sop);
+      d += 1;
+      d_sop = is_eop1 ? d : d_sop;
+
+      is_sop = is_eop1;
+    }
+
+  while (n_left > 0)
+    {
+      vlib_buffer_t *b0;
+      u32 bi0, fi0, len0;
+      u8 is_eop0;
+
+      bi0 = buffers[0];
+
+      to_free[0] = fi0 = to_tx[0];
+      to_tx[0] = bi0;
+      to_free += fi0 != 0;
+
+      buffers += 1;
+      n_left -= 1;
+      to_tx += 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      is_eop0 = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      len0 = b0->current_length;
+
+      ASSERT (ixge_tx_descriptor_matches_template (xm, d + 0));
+
+      d[0].buffer_address =
+	vlib_get_buffer_data_physical_address (vm, bi0) + b0->current_data;
+
+      d[0].n_bytes_this_buffer = len0;
+
+      d[0].status0 =
+	template_status | (is_eop0 <<
+			   IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET);
+
+      len_sop = (is_sop ? 0 : len_sop) + len0;
+      d_sop[0].status1 =
+	IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET (len_sop);
+      d += 1;
+      d_sop = is_eop0 ? d : d_sop;
+
+      is_sop = is_eop0;
+    }
+
+  if (tx_state->node->flags & VLIB_NODE_FLAG_TRACE)
+    {
+      to_tx =
+	vec_elt_at_index (dq->descriptor_buffer_indices,
+			  start_descriptor_index);
+      ixge_tx_trace (xm, xd, dq, tx_state,
+		     &dq->descriptors[start_descriptor_index].tx, to_tx,
+		     n_descriptors);
+    }
+
+  _vec_len (xm->tx_buffers_pending_free) =
+    to_free - xm->tx_buffers_pending_free;
+
+  /* When we are done d_sop can point to end of ring.  Wrap it if so. */
+  {
+    ixge_tx_descriptor_t *d_start = &dq->descriptors[0].tx;
+
+    ASSERT (d_sop - d_start <= dq->n_descriptors);
+    d_sop = d_sop - d_start == dq->n_descriptors ? d_start : d_sop;
+  }
+
+  tx_state->is_start_of_packet = is_sop;
+  tx_state->start_of_packet_descriptor = d_sop;
+  tx_state->n_bytes_in_packet = len_sop;
+
+  return n_descriptors;
+}
+
+static uword
+ixge_interface_tx (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  ixge_main_t *xm = &ixge_main;
+  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, rd->dev_instance);
+  ixge_dma_queue_t *dq;
+  u32 *from, n_left_tx, n_descriptors_to_tx, n_tail_drop;
+  u32 queue_index = 0;		/* fixme parameter */
+  ixge_tx_state_t tx_state;
+
+  tx_state.node = node;
+  tx_state.is_start_of_packet = 1;
+  tx_state.start_of_packet_descriptor = 0;
+  tx_state.n_bytes_in_packet = 0;
+
+  from = vlib_frame_vector_args (f);
+
+  dq = vec_elt_at_index (xd->dma_queues[VLIB_TX], queue_index);
+
+  dq->head_index = dq->tx.head_index_write_back[0];
+
+  /* Since head == tail means ring is empty we can send up to dq->n_descriptors - 1. */
+  n_left_tx = dq->n_descriptors - 1;
+  n_left_tx -= ixge_ring_sub (dq, dq->head_index, dq->tail_index);
+
+  _vec_len (xm->tx_buffers_pending_free) = 0;
+
+  n_descriptors_to_tx = f->n_vectors;
+  n_tail_drop = 0;
+  if (PREDICT_FALSE (n_descriptors_to_tx > n_left_tx))
+    {
+      i32 i, n_ok, i_eop, i_sop;
+
+      i_sop = i_eop = ~0;
+      for (i = n_left_tx - 1; i >= 0; i--)
+	{
+	  vlib_buffer_t *b = vlib_get_buffer (vm, from[i]);
+	  if (!(b->flags & VLIB_BUFFER_NEXT_PRESENT))
+	    {
+	      if (i_sop != ~0 && i_eop != ~0)
+		break;
+	      i_eop = i;
+	      i_sop = i + 1;
+	    }
+	}
+      if (i == 0)
+	n_ok = 0;
+      else
+	n_ok = i_eop + 1;
+
+      {
+	ELOG_TYPE_DECLARE (e) =
+	{
+	.function = (char *) __FUNCTION__,.format =
+	    "ixge %d, ring full to tx %d head %d tail %d",.format_args =
+	    "i2i2i2i2",};
+	struct
+	{
+	  u16 instance, to_tx, head, tail;
+	} *ed;
+	ed = ELOG_DATA (&vm->elog_main, e);
+	ed->instance = xd->device_index;
+	ed->to_tx = n_descriptors_to_tx;
+	ed->head = dq->head_index;
+	ed->tail = dq->tail_index;
+      }
+
+      if (n_ok < n_descriptors_to_tx)
+	{
+	  n_tail_drop = n_descriptors_to_tx - n_ok;
+	  vec_add (xm->tx_buffers_pending_free, from + n_ok, n_tail_drop);
+	  vlib_error_count (vm, ixge_input_node.index,
+			    IXGE_ERROR_tx_full_drops, n_tail_drop);
+	}
+
+      n_descriptors_to_tx = n_ok;
+    }
+
+  dq->tx.n_buffers_on_ring += n_descriptors_to_tx;
+
+  /* Process from tail to end of descriptor ring. */
+  if (n_descriptors_to_tx > 0 && dq->tail_index < dq->n_descriptors)
+    {
+      u32 n =
+	clib_min (dq->n_descriptors - dq->tail_index, n_descriptors_to_tx);
+      n = ixge_tx_no_wrap (xm, xd, dq, from, dq->tail_index, n, &tx_state);
+      from += n;
+      n_descriptors_to_tx -= n;
+      dq->tail_index += n;
+      ASSERT (dq->tail_index <= dq->n_descriptors);
+      if (dq->tail_index == dq->n_descriptors)
+	dq->tail_index = 0;
+    }
+
+  if (n_descriptors_to_tx > 0)
+    {
+      u32 n =
+	ixge_tx_no_wrap (xm, xd, dq, from, 0, n_descriptors_to_tx, &tx_state);
+      from += n;
+      ASSERT (n == n_descriptors_to_tx);
+      dq->tail_index += n;
+      ASSERT (dq->tail_index <= dq->n_descriptors);
+      if (dq->tail_index == dq->n_descriptors)
+	dq->tail_index = 0;
+    }
+
+  /* We should only get full packets. */
+  ASSERT (tx_state.is_start_of_packet);
+
+  /* Report status when last descriptor is done. */
+  {
+    u32 i = dq->tail_index == 0 ? dq->n_descriptors - 1 : dq->tail_index - 1;
+    ixge_tx_descriptor_t *d = &dq->descriptors[i].tx;
+    d->status0 |= IXGE_TX_DESCRIPTOR_STATUS0_REPORT_STATUS;
+  }
+
+  /* Give new descriptors to hardware. */
+  {
+    ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_TX, queue_index);
+
+    CLIB_MEMORY_BARRIER ();
+
+    dr->tail_index = dq->tail_index;
+  }
+
+  /* Free any buffers that are done. */
+  {
+    u32 n = _vec_len (xm->tx_buffers_pending_free);
+    if (n > 0)
+      {
+	vlib_buffer_free_no_next (vm, xm->tx_buffers_pending_free, n);
+	_vec_len (xm->tx_buffers_pending_free) = 0;
+	ASSERT (dq->tx.n_buffers_on_ring >= n);
+	dq->tx.n_buffers_on_ring -= (n - n_tail_drop);
+      }
+  }
+
+  return f->n_vectors;
+}
+
+static uword
+ixge_rx_queue_no_wrap (ixge_main_t * xm,
+		       ixge_device_t * xd,
+		       ixge_dma_queue_t * dq,
+		       u32 start_descriptor_index, u32 n_descriptors)
+{
+  vlib_main_t *vm = xm->vlib_main;
+  vlib_node_runtime_t *node = dq->rx.node;
+  ixge_descriptor_t *d;
+  static ixge_descriptor_t *d_trace_save;
+  static u32 *d_trace_buffers;
+  u32 n_descriptors_left = n_descriptors;
+  u32 *to_rx =
+    vec_elt_at_index (dq->descriptor_buffer_indices, start_descriptor_index);
+  u32 *to_add;
+  u32 bi_sop = dq->rx.saved_start_of_packet_buffer_index;
+  u32 bi_last = dq->rx.saved_last_buffer_index;
+  u32 next_index_sop = dq->rx.saved_start_of_packet_next_index;
+  u32 is_sop = dq->rx.is_start_of_packet;
+  u32 next_index, n_left_to_next, *to_next;
+  u32 n_packets = 0;
+  u32 n_bytes = 0;
+  u32 n_trace = vlib_get_trace_count (vm, node);
+  vlib_buffer_t *b_last, b_dummy;
+
+  ASSERT (start_descriptor_index + n_descriptors <= dq->n_descriptors);
+  d = &dq->descriptors[start_descriptor_index];
+
+  b_last = bi_last != ~0 ? vlib_get_buffer (vm, bi_last) : &b_dummy;
+  next_index = dq->rx.next_index;
+
+  if (n_trace > 0)
+    {
+      u32 n = clib_min (n_trace, n_descriptors);
+      if (d_trace_save)
+	{
+	  _vec_len (d_trace_save) = 0;
+	  _vec_len (d_trace_buffers) = 0;
+	}
+      vec_add (d_trace_save, (ixge_descriptor_t *) d, n);
+      vec_add (d_trace_buffers, to_rx, n);
+    }
+
+  {
+    uword l = vec_len (xm->rx_buffers_to_add);
+
+    if (l < n_descriptors_left)
+      {
+	u32 n_to_alloc = 2 * dq->n_descriptors - l;
+	u32 n_allocated;
+
+	vec_resize (xm->rx_buffers_to_add, n_to_alloc);
+
+	_vec_len (xm->rx_buffers_to_add) = l;
+	n_allocated = vlib_buffer_alloc_from_free_list
+	  (vm, xm->rx_buffers_to_add + l, n_to_alloc,
+	   xm->vlib_buffer_free_list_index);
+	_vec_len (xm->rx_buffers_to_add) += n_allocated;
+
+	/* Handle transient allocation failure */
+	if (PREDICT_FALSE (l + n_allocated <= n_descriptors_left))
+	  {
+	    if (n_allocated == 0)
+	      vlib_error_count (vm, ixge_input_node.index,
+				IXGE_ERROR_rx_alloc_no_physmem, 1);
+	    else
+	      vlib_error_count (vm, ixge_input_node.index,
+				IXGE_ERROR_rx_alloc_fail, 1);
+
+	    n_descriptors_left = l + n_allocated;
+	  }
+	n_descriptors = n_descriptors_left;
+      }
+
+    /* Add buffers from end of vector going backwards. */
+    to_add = vec_end (xm->rx_buffers_to_add) - 1;
+  }
+
+  while (n_descriptors_left > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_descriptors_left >= 4 && n_left_to_next >= 2)
+	{
+	  vlib_buffer_t *b0, *b1;
+	  u32 bi0, fi0, len0, l3_offset0, s20, s00, flags0;
+	  u32 bi1, fi1, len1, l3_offset1, s21, s01, flags1;
+	  u8 is_eop0, error0, next0;
+	  u8 is_eop1, error1, next1;
+	  ixge_descriptor_t d0, d1;
+
+	  vlib_prefetch_buffer_with_index (vm, to_rx[2], STORE);
+	  vlib_prefetch_buffer_with_index (vm, to_rx[3], STORE);
+
+	  CLIB_PREFETCH (d + 2, 32, STORE);
+
+	  d0.as_u32x4 = d[0].as_u32x4;
+	  d1.as_u32x4 = d[1].as_u32x4;
+
+	  s20 = d0.rx_from_hw.status[2];
+	  s21 = d1.rx_from_hw.status[2];
+
+	  s00 = d0.rx_from_hw.status[0];
+	  s01 = d1.rx_from_hw.status[0];
+
+	  if (!
+	      ((s20 & s21) & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE))
+	    goto found_hw_owned_descriptor_x2;
+
+	  bi0 = to_rx[0];
+	  bi1 = to_rx[1];
+
+	  ASSERT (to_add - 1 >= xm->rx_buffers_to_add);
+	  fi0 = to_add[0];
+	  fi1 = to_add[-1];
+
+	  to_rx[0] = fi0;
+	  to_rx[1] = fi1;
+	  to_rx += 2;
+	  to_add -= 2;
+
+	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
+		  vlib_buffer_is_known (vm, bi0));
+	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
+		  vlib_buffer_is_known (vm, bi1));
+	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
+		  vlib_buffer_is_known (vm, fi0));
+	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
+		  vlib_buffer_is_known (vm, fi1));
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /*
+	   * Turn this on if you run into
+	   * "bad monkey" contexts, and you want to know exactly
+	   * which nodes they've visited... See main.c...
+	   */
+	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b1);
+
+	  CLIB_PREFETCH (b0->data, CLIB_CACHE_LINE_BYTES, LOAD);
+	  CLIB_PREFETCH (b1->data, CLIB_CACHE_LINE_BYTES, LOAD);
+
+	  is_eop0 = (s20 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET) != 0;
+	  is_eop1 = (s21 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET) != 0;
+
+	  ixge_rx_next_and_error_from_status_x2 (xd, s00, s20, s01, s21,
+						 &next0, &error0, &flags0,
+						 &next1, &error1, &flags1);
+
+	  next0 = is_sop ? next0 : next_index_sop;
+	  next1 = is_eop0 ? next1 : next0;
+	  next_index_sop = next1;
+
+	  b0->flags |= flags0 | (!is_eop0 << VLIB_BUFFER_LOG2_NEXT_PRESENT);
+	  b1->flags |= flags1 | (!is_eop1 << VLIB_BUFFER_LOG2_NEXT_PRESENT);
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
+	  vnet_buffer (b1)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+	  vnet_buffer (b1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+
+	  b0->error = node->errors[error0];
+	  b1->error = node->errors[error1];
+
+	  len0 = d0.rx_from_hw.n_packet_bytes_this_descriptor;
+	  len1 = d1.rx_from_hw.n_packet_bytes_this_descriptor;
+	  n_bytes += len0 + len1;
+	  n_packets += is_eop0 + is_eop1;
+
+	  /* Give new buffers to hardware. */
+	  d0.rx_to_hw.tail_address =
+	    vlib_get_buffer_data_physical_address (vm, fi0);
+	  d1.rx_to_hw.tail_address =
+	    vlib_get_buffer_data_physical_address (vm, fi1);
+	  d0.rx_to_hw.head_address = d[0].rx_to_hw.tail_address;
+	  d1.rx_to_hw.head_address = d[1].rx_to_hw.tail_address;
+	  d[0].as_u32x4 = d0.as_u32x4;
+	  d[1].as_u32x4 = d1.as_u32x4;
+
+	  d += 2;
+	  n_descriptors_left -= 2;
+
+	  /* Point to either l2 or l3 header depending on next. */
+	  l3_offset0 = (is_sop && (next0 != IXGE_RX_NEXT_ETHERNET_INPUT))
+	    ? IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s00) : 0;
+	  l3_offset1 = (is_eop0 && (next1 != IXGE_RX_NEXT_ETHERNET_INPUT))
+	    ? IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s01) : 0;
+
+	  b0->current_length = len0 - l3_offset0;
+	  b1->current_length = len1 - l3_offset1;
+	  b0->current_data = l3_offset0;
+	  b1->current_data = l3_offset1;
+
+	  b_last->next_buffer = is_sop ? ~0 : bi0;
+	  b0->next_buffer = is_eop0 ? ~0 : bi1;
+	  bi_last = bi1;
+	  b_last = b1;
+
+	  if (CLIB_DEBUG > 0)
+	    {
+	      u32 bi_sop0 = is_sop ? bi0 : bi_sop;
+	      u32 bi_sop1 = is_eop0 ? bi1 : bi_sop0;
+
+	      if (is_eop0)
+		{
+		  u8 *msg = vlib_validate_buffer (vm, bi_sop0,
+						  /* follow_buffer_next */ 1);
+		  ASSERT (!msg);
+		}
+	      if (is_eop1)
+		{
+		  u8 *msg = vlib_validate_buffer (vm, bi_sop1,
+						  /* follow_buffer_next */ 1);
+		  ASSERT (!msg);
+		}
+	    }
+	  if (0)		/* "Dave" version */
+	    {
+	      u32 bi_sop0 = is_sop ? bi0 : bi_sop;
+	      u32 bi_sop1 = is_eop0 ? bi1 : bi_sop0;
+
+	      if (is_eop0)
+		{
+		  to_next[0] = bi_sop0;
+		  to_next++;
+		  n_left_to_next--;
+
+		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+						   to_next, n_left_to_next,
+						   bi_sop0, next0);
+		}
+	      if (is_eop1)
+		{
+		  to_next[0] = bi_sop1;
+		  to_next++;
+		  n_left_to_next--;
+
+		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+						   to_next, n_left_to_next,
+						   bi_sop1, next1);
+		}
+	      is_sop = is_eop1;
+	      bi_sop = bi_sop1;
+	    }
+	  if (1)		/* "Eliot" version */
+	    {
+	      /* Speculatively enqueue to cached next. */
+	      u8 saved_is_sop = is_sop;
+	      u32 bi_sop_save = bi_sop;
+
+	      bi_sop = saved_is_sop ? bi0 : bi_sop;
+	      to_next[0] = bi_sop;
+	      to_next += is_eop0;
+	      n_left_to_next -= is_eop0;
+
+	      bi_sop = is_eop0 ? bi1 : bi_sop;
+	      to_next[0] = bi_sop;
+	      to_next += is_eop1;
+	      n_left_to_next -= is_eop1;
+
+	      is_sop = is_eop1;
+
+	      if (PREDICT_FALSE
+		  (!(next0 == next_index && next1 == next_index)))
+		{
+		  /* Undo speculation. */
+		  to_next -= is_eop0 + is_eop1;
+		  n_left_to_next += is_eop0 + is_eop1;
+
+		  /* Re-do both descriptors being careful about where we enqueue. */
+		  bi_sop = saved_is_sop ? bi0 : bi_sop_save;
+		  if (is_eop0)
+		    {
+		      if (next0 != next_index)
+			vlib_set_next_frame_buffer (vm, node, next0, bi_sop);
+		      else
+			{
+			  to_next[0] = bi_sop;
+			  to_next += 1;
+			  n_left_to_next -= 1;
+			}
+		    }
+
+		  bi_sop = is_eop0 ? bi1 : bi_sop;
+		  if (is_eop1)
+		    {
+		      if (next1 != next_index)
+			vlib_set_next_frame_buffer (vm, node, next1, bi_sop);
+		      else
+			{
+			  to_next[0] = bi_sop;
+			  to_next += 1;
+			  n_left_to_next -= 1;
+			}
+		    }
+
+		  /* Switch cached next index when next for both packets is the same. */
+		  if (is_eop0 && is_eop1 && next0 == next1)
+		    {
+		      vlib_put_next_frame (vm, node, next_index,
+					   n_left_to_next);
+		      next_index = next0;
+		      vlib_get_next_frame (vm, node, next_index,
+					   to_next, n_left_to_next);
+		    }
+		}
+	    }
+	}
+
+      /* Bail out of dual loop and proceed with single loop. */
+    found_hw_owned_descriptor_x2:
+
+      while (n_descriptors_left > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *b0;
+	  u32 bi0, fi0, len0, l3_offset0, s20, s00, flags0;
+	  u8 is_eop0, error0, next0;
+	  ixge_descriptor_t d0;
+
+	  d0.as_u32x4 = d[0].as_u32x4;
+
+	  s20 = d0.rx_from_hw.status[2];
+	  s00 = d0.rx_from_hw.status[0];
+
+	  if (!(s20 & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE))
+	    goto found_hw_owned_descriptor_x1;
+
+	  bi0 = to_rx[0];
+	  ASSERT (to_add >= xm->rx_buffers_to_add);
+	  fi0 = to_add[0];
+
+	  to_rx[0] = fi0;
+	  to_rx += 1;
+	  to_add -= 1;
+
+	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
+		  vlib_buffer_is_known (vm, bi0));
+	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
+		  vlib_buffer_is_known (vm, fi0));
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  /*
+	   * Turn this on if you run into
+	   * "bad monkey" contexts, and you want to know exactly
+	   * which nodes they've visited...
+	   */
+	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+
+	  is_eop0 = (s20 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET) != 0;
+	  ixge_rx_next_and_error_from_status_x1
+	    (xd, s00, s20, &next0, &error0, &flags0);
+
+	  next0 = is_sop ? next0 : next_index_sop;
+	  next_index_sop = next0;
+
+	  b0->flags |= flags0 | (!is_eop0 << VLIB_BUFFER_LOG2_NEXT_PRESENT);
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+
+	  b0->error = node->errors[error0];
+
+	  len0 = d0.rx_from_hw.n_packet_bytes_this_descriptor;
+	  n_bytes += len0;
+	  n_packets += is_eop0;
+
+	  /* Give new buffer to hardware. */
+	  d0.rx_to_hw.tail_address =
+	    vlib_get_buffer_data_physical_address (vm, fi0);
+	  d0.rx_to_hw.head_address = d0.rx_to_hw.tail_address;
+	  d[0].as_u32x4 = d0.as_u32x4;
+
+	  d += 1;
+	  n_descriptors_left -= 1;
+
+	  /* Point to either l2 or l3 header depending on next. */
+	  l3_offset0 = (is_sop && (next0 != IXGE_RX_NEXT_ETHERNET_INPUT))
+	    ? IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s00) : 0;
+	  b0->current_length = len0 - l3_offset0;
+	  b0->current_data = l3_offset0;
+
+	  b_last->next_buffer = is_sop ? ~0 : bi0;
+	  bi_last = bi0;
+	  b_last = b0;
+
+	  bi_sop = is_sop ? bi0 : bi_sop;
+
+	  if (CLIB_DEBUG > 0 && is_eop0)
+	    {
+	      u8 *msg =
+		vlib_validate_buffer (vm, bi_sop, /* follow_buffer_next */ 1);
+	      ASSERT (!msg);
+	    }
+
+	  if (0)		/* "Dave" version */
+	    {
+	      if (is_eop0)
+		{
+		  to_next[0] = bi_sop;
+		  to_next++;
+		  n_left_to_next--;
+
+		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+						   to_next, n_left_to_next,
+						   bi_sop, next0);
+		}
+	    }
+	  if (1)		/* "Eliot" version */
+	    {
+	      if (PREDICT_TRUE (next0 == next_index))
+		{
+		  to_next[0] = bi_sop;
+		  to_next += is_eop0;
+		  n_left_to_next -= is_eop0;
+		}
+	      else
+		{
+		  if (next0 != next_index && is_eop0)
+		    vlib_set_next_frame_buffer (vm, node, next0, bi_sop);
+
+		  vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+		  next_index = next0;
+		  vlib_get_next_frame (vm, node, next_index,
+				       to_next, n_left_to_next);
+		}
+	    }
+	  is_sop = is_eop0;
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+found_hw_owned_descriptor_x1:
+  if (n_descriptors_left > 0)
+    vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+
+  _vec_len (xm->rx_buffers_to_add) = (to_add + 1) - xm->rx_buffers_to_add;
+
+  {
+    u32 n_done = n_descriptors - n_descriptors_left;
+
+    if (n_trace > 0 && n_done > 0)
+      {
+	u32 n = clib_min (n_trace, n_done);
+	ixge_rx_trace (xm, xd, dq,
+		       d_trace_save,
+		       d_trace_buffers,
+		       &dq->descriptors[start_descriptor_index], n);
+	vlib_set_trace_count (vm, node, n_trace - n);
+      }
+    if (d_trace_save)
+      {
+	_vec_len (d_trace_save) = 0;
+	_vec_len (d_trace_buffers) = 0;
+      }
+
+    /* Don't keep a reference to b_last if we don't have to.
+       Otherwise we can over-write a next_buffer pointer after already haven
+       enqueued a packet. */
+    if (is_sop)
+      {
+	b_last->next_buffer = ~0;
+	bi_last = ~0;
+      }
+
+    dq->rx.n_descriptors_done_this_call = n_done;
+    dq->rx.n_descriptors_done_total += n_done;
+    dq->rx.is_start_of_packet = is_sop;
+    dq->rx.saved_start_of_packet_buffer_index = bi_sop;
+    dq->rx.saved_last_buffer_index = bi_last;
+    dq->rx.saved_start_of_packet_next_index = next_index_sop;
+    dq->rx.next_index = next_index;
+    dq->rx.n_bytes += n_bytes;
+
+    return n_packets;
+  }
+}
+
+static uword
+ixge_rx_queue (ixge_main_t * xm,
+	       ixge_device_t * xd,
+	       vlib_node_runtime_t * node, u32 queue_index)
+{
+  ixge_dma_queue_t *dq =
+    vec_elt_at_index (xd->dma_queues[VLIB_RX], queue_index);
+  ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_RX, dq->queue_index);
+  uword n_packets = 0;
+  u32 hw_head_index, sw_head_index;
+
+  /* One time initialization. */
+  if (!dq->rx.node)
+    {
+      dq->rx.node = node;
+      dq->rx.is_start_of_packet = 1;
+      dq->rx.saved_start_of_packet_buffer_index = ~0;
+      dq->rx.saved_last_buffer_index = ~0;
+    }
+
+  dq->rx.next_index = node->cached_next_index;
+
+  dq->rx.n_descriptors_done_total = 0;
+  dq->rx.n_descriptors_done_this_call = 0;
+  dq->rx.n_bytes = 0;
+
+  /* Fetch head from hardware and compare to where we think we are. */
+  hw_head_index = dr->head_index;
+  sw_head_index = dq->head_index;
+
+  if (hw_head_index == sw_head_index)
+    goto done;
+
+  if (hw_head_index < sw_head_index)
+    {
+      u32 n_tried = dq->n_descriptors - sw_head_index;
+      n_packets += ixge_rx_queue_no_wrap (xm, xd, dq, sw_head_index, n_tried);
+      sw_head_index =
+	ixge_ring_add (dq, sw_head_index,
+		       dq->rx.n_descriptors_done_this_call);
+
+      if (dq->rx.n_descriptors_done_this_call != n_tried)
+	goto done;
+    }
+  if (hw_head_index >= sw_head_index)
+    {
+      u32 n_tried = hw_head_index - sw_head_index;
+      n_packets += ixge_rx_queue_no_wrap (xm, xd, dq, sw_head_index, n_tried);
+      sw_head_index =
+	ixge_ring_add (dq, sw_head_index,
+		       dq->rx.n_descriptors_done_this_call);
+    }
+
+done:
+  dq->head_index = sw_head_index;
+  dq->tail_index =
+    ixge_ring_add (dq, dq->tail_index, dq->rx.n_descriptors_done_total);
+
+  /* Give tail back to hardware. */
+  CLIB_MEMORY_BARRIER ();
+
+  dr->tail_index = dq->tail_index;
+
+  vlib_increment_combined_counter (vnet_main.
+				   interface_main.combined_sw_if_counters +
+				   VNET_INTERFACE_COUNTER_RX,
+				   0 /* cpu_index */ ,
+				   xd->vlib_sw_if_index, n_packets,
+				   dq->rx.n_bytes);
+
+  return n_packets;
+}
+
+static void
+ixge_interrupt (ixge_main_t * xm, ixge_device_t * xd, u32 i)
+{
+  vlib_main_t *vm = xm->vlib_main;
+  ixge_regs_t *r = xd->regs;
+
+  if (i != 20)
+    {
+      ELOG_TYPE_DECLARE (e) =
+      {
+	.function = (char *) __FUNCTION__,.format =
+	  "ixge %d, %s",.format_args = "i1t1",.n_enum_strings =
+	  16,.enum_strings =
+	{
+      "flow director",
+	    "rx miss",
+	    "pci exception",
+	    "mailbox",
+	    "link status change",
+	    "linksec key exchange",
+	    "manageability event",
+	    "reserved23",
+	    "sdp0",
+	    "sdp1",
+	    "sdp2",
+	    "sdp3",
+	    "ecc", "descriptor handler error", "tcp timer", "other",},};
+      struct
+      {
+	u8 instance;
+	u8 index;
+      } *ed;
+      ed = ELOG_DATA (&vm->elog_main, e);
+      ed->instance = xd->device_index;
+      ed->index = i - 16;
+    }
+  else
+    {
+      u32 v = r->xge_mac.link_status;
+      uword is_up = (v & (1 << 30)) != 0;
+
+      ELOG_TYPE_DECLARE (e) =
+      {
+      .function = (char *) __FUNCTION__,.format =
+	  "ixge %d, link status change 0x%x",.format_args = "i4i4",};
+      struct
+      {
+	u32 instance, link_status;
+      } *ed;
+      ed = ELOG_DATA (&vm->elog_main, e);
+      ed->instance = xd->device_index;
+      ed->link_status = v;
+      xd->link_status_at_last_link_change = v;
+
+      vlib_process_signal_event (vm, ixge_process_node.index,
+				 EVENT_SET_FLAGS,
+				 ((is_up << 31) | xd->vlib_hw_if_index));
+    }
+}
+
+always_inline u32
+clean_block (u32 * b, u32 * t, u32 n_left)
+{
+  u32 *t0 = t;
+
+  while (n_left >= 4)
+    {
+      u32 bi0, bi1, bi2, bi3;
+
+      t[0] = bi0 = b[0];
+      b[0] = 0;
+      t += bi0 != 0;
+
+      t[0] = bi1 = b[1];
+      b[1] = 0;
+      t += bi1 != 0;
+
+      t[0] = bi2 = b[2];
+      b[2] = 0;
+      t += bi2 != 0;
+
+      t[0] = bi3 = b[3];
+      b[3] = 0;
+      t += bi3 != 0;
+
+      b += 4;
+      n_left -= 4;
+    }
+
+  while (n_left > 0)
+    {
+      u32 bi0;
+
+      t[0] = bi0 = b[0];
+      b[0] = 0;
+      t += bi0 != 0;
+      b += 1;
+      n_left -= 1;
+    }
+
+  return t - t0;
+}
+
+static void
+ixge_tx_queue (ixge_main_t * xm, ixge_device_t * xd, u32 queue_index)
+{
+  vlib_main_t *vm = xm->vlib_main;
+  ixge_dma_queue_t *dq =
+    vec_elt_at_index (xd->dma_queues[VLIB_TX], queue_index);
+  u32 n_clean, *b, *t, *t0;
+  i32 n_hw_owned_descriptors;
+  i32 first_to_clean, last_to_clean;
+  u64 hwbp_race = 0;
+
+  /* Handle case where head write back pointer update
+   * arrives after the interrupt during high PCI bus loads.
+   */
+  while ((dq->head_index == dq->tx.head_index_write_back[0]) &&
+	 dq->tx.n_buffers_on_ring && (dq->head_index != dq->tail_index))
+    {
+      hwbp_race++;
+      if (IXGE_HWBP_RACE_ELOG && (hwbp_race == 1))
+	{
+	  ELOG_TYPE_DECLARE (e) =
+	  {
+	  .function = (char *) __FUNCTION__,.format =
+	      "ixge %d tx head index race: head %4d, tail %4d, buffs %4d",.format_args
+	      = "i4i4i4i4",};
+	  struct
+	  {
+	    u32 instance, head_index, tail_index, n_buffers_on_ring;
+	  } *ed;
+	  ed = ELOG_DATA (&vm->elog_main, e);
+	  ed->instance = xd->device_index;
+	  ed->head_index = dq->head_index;
+	  ed->tail_index = dq->tail_index;
+	  ed->n_buffers_on_ring = dq->tx.n_buffers_on_ring;
+	}
+    }
+
+  dq->head_index = dq->tx.head_index_write_back[0];
+  n_hw_owned_descriptors = ixge_ring_sub (dq, dq->head_index, dq->tail_index);
+  ASSERT (dq->tx.n_buffers_on_ring >= n_hw_owned_descriptors);
+  n_clean = dq->tx.n_buffers_on_ring - n_hw_owned_descriptors;
+
+  if (IXGE_HWBP_RACE_ELOG && hwbp_race)
+    {
+      ELOG_TYPE_DECLARE (e) =
+      {
+      .function = (char *) __FUNCTION__,.format =
+	  "ixge %d tx head index race: head %4d, hw_owned %4d, n_clean %4d, retries %d",.format_args
+	  = "i4i4i4i4i4",};
+      struct
+      {
+	u32 instance, head_index, n_hw_owned_descriptors, n_clean, retries;
+      } *ed;
+      ed = ELOG_DATA (&vm->elog_main, e);
+      ed->instance = xd->device_index;
+      ed->head_index = dq->head_index;
+      ed->n_hw_owned_descriptors = n_hw_owned_descriptors;
+      ed->n_clean = n_clean;
+      ed->retries = hwbp_race;
+    }
+
+  /*
+   * This function used to wait until hardware owned zero descriptors.
+   * At high PPS rates, that doesn't happen until the TX ring is
+   * completely full of descriptors which need to be cleaned up.
+   * That, in turn, causes TX ring-full drops and/or long RX service
+   * interruptions.
+   */
+  if (n_clean == 0)
+    return;
+
+  /* Clean the n_clean descriptors prior to the reported hardware head */
+  last_to_clean = dq->head_index - 1;
+  last_to_clean = (last_to_clean < 0) ? last_to_clean + dq->n_descriptors :
+    last_to_clean;
+
+  first_to_clean = (last_to_clean) - (n_clean - 1);
+  first_to_clean = (first_to_clean < 0) ? first_to_clean + dq->n_descriptors :
+    first_to_clean;
+
+  vec_resize (xm->tx_buffers_pending_free, dq->n_descriptors - 1);
+  t0 = t = xm->tx_buffers_pending_free;
+  b = dq->descriptor_buffer_indices + first_to_clean;
+
+  /* Wrap case: clean from first to end, then start to last */
+  if (first_to_clean > last_to_clean)
+    {
+      t += clean_block (b, t, (dq->n_descriptors - 1) - first_to_clean);
+      first_to_clean = 0;
+      b = dq->descriptor_buffer_indices;
+    }
+
+  /* Typical case: clean from first to last */
+  if (first_to_clean <= last_to_clean)
+    t += clean_block (b, t, (last_to_clean - first_to_clean) + 1);
+
+  if (t > t0)
+    {
+      u32 n = t - t0;
+      vlib_buffer_free_no_next (vm, t0, n);
+      ASSERT (dq->tx.n_buffers_on_ring >= n);
+      dq->tx.n_buffers_on_ring -= n;
+      _vec_len (xm->tx_buffers_pending_free) = 0;
+    }
+}
+
+/* RX queue interrupts 0 thru 7; TX 8 thru 15. */
+always_inline uword
+ixge_interrupt_is_rx_queue (uword i)
+{
+  return i < 8;
+}
+
+always_inline uword
+ixge_interrupt_is_tx_queue (uword i)
+{
+  return i >= 8 && i < 16;
+}
+
+always_inline uword
+ixge_tx_queue_to_interrupt (uword i)
+{
+  return 8 + i;
+}
+
+always_inline uword
+ixge_rx_queue_to_interrupt (uword i)
+{
+  return 0 + i;
+}
+
+always_inline uword
+ixge_interrupt_rx_queue (uword i)
+{
+  ASSERT (ixge_interrupt_is_rx_queue (i));
+  return i - 0;
+}
+
+always_inline uword
+ixge_interrupt_tx_queue (uword i)
+{
+  ASSERT (ixge_interrupt_is_tx_queue (i));
+  return i - 8;
+}
+
+static uword
+ixge_device_input (ixge_main_t * xm,
+		   ixge_device_t * xd, vlib_node_runtime_t * node)
+{
+  ixge_regs_t *r = xd->regs;
+  u32 i, s;
+  uword n_rx_packets = 0;
+
+  s = r->interrupt.status_write_1_to_set;
+  if (s)
+    r->interrupt.status_write_1_to_clear = s;
+
+  /* *INDENT-OFF* */
+  foreach_set_bit (i, s, ({
+    if (ixge_interrupt_is_rx_queue (i))
+      n_rx_packets += ixge_rx_queue (xm, xd, node, ixge_interrupt_rx_queue (i));
+
+    else if (ixge_interrupt_is_tx_queue (i))
+      ixge_tx_queue (xm, xd, ixge_interrupt_tx_queue (i));
+
+    else
+      ixge_interrupt (xm, xd, i);
+  }));
+  /* *INDENT-ON* */
+
+  return n_rx_packets;
+}
+
+static uword
+ixge_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd;
+  uword n_rx_packets = 0;
+
+  if (node->state == VLIB_NODE_STATE_INTERRUPT)
+    {
+      uword i;
+
+      /* Loop over devices with interrupts. */
+      /* *INDENT-OFF* */
+      foreach_set_bit (i, node->runtime_data[0], ({
+	xd = vec_elt_at_index (xm->devices, i);
+	n_rx_packets += ixge_device_input (xm, xd, node);
+
+	/* Re-enable interrupts since we're going to stay in interrupt mode. */
+	if (! (node->flags & VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE))
+	  xd->regs->interrupt.enable_write_1_to_set = ~0;
+      }));
+      /* *INDENT-ON* */
+
+      /* Clear mask of devices with pending interrupts. */
+      node->runtime_data[0] = 0;
+    }
+  else
+    {
+      /* Poll all devices for input/interrupts. */
+      vec_foreach (xd, xm->devices)
+      {
+	n_rx_packets += ixge_device_input (xm, xd, node);
+
+	/* Re-enable interrupts when switching out of polling mode. */
+	if (node->flags &
+	    VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE)
+	  xd->regs->interrupt.enable_write_1_to_set = ~0;
+      }
+    }
+
+  return n_rx_packets;
+}
+
+static char *ixge_error_strings[] = {
+#define _(n,s) s,
+  foreach_ixge_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ixge_input_node, static) = {
+  .function = ixge_input,
+  .type = VLIB_NODE_TYPE_INPUT,
+  .name = "ixge-input",
+
+  /* Will be enabled if/when hardware is detected. */
+  .state = VLIB_NODE_STATE_DISABLED,
+
+  .format_buffer = format_ethernet_header_with_length,
+  .format_trace = format_ixge_rx_dma_trace,
+
+  .n_errors = IXGE_N_ERROR,
+  .error_strings = ixge_error_strings,
+
+  .n_next_nodes = IXGE_RX_N_NEXT,
+  .next_nodes = {
+    [IXGE_RX_NEXT_DROP] = "error-drop",
+    [IXGE_RX_NEXT_ETHERNET_INPUT] = "ethernet-input",
+    [IXGE_RX_NEXT_IP4_INPUT] = "ip4-input",
+    [IXGE_RX_NEXT_IP6_INPUT] = "ip6-input",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH_CLONE (ixge_input)
+CLIB_MULTIARCH_SELECT_FN (ixge_input)
+/* *INDENT-ON* */
+
+static u8 *
+format_ixge_device_name (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, i);
+  return format (s, "TenGigabitEthernet%U",
+		 format_vlib_pci_handle, &xd->pci_device.bus_address);
+}
+
+#define IXGE_COUNTER_IS_64_BIT (1 << 0)
+#define IXGE_COUNTER_NOT_CLEAR_ON_READ (1 << 1)
+
+static u8 ixge_counter_flags[] = {
+#define _(a,f) 0,
+#define _64(a,f) IXGE_COUNTER_IS_64_BIT,
+  foreach_ixge_counter
+#undef _
+#undef _64
+};
+
+static void
+ixge_update_counters (ixge_device_t * xd)
+{
+  /* Byte offset for counter registers. */
+  static u32 reg_offsets[] = {
+#define _(a,f) (a) / sizeof (u32),
+#define _64(a,f) _(a,f)
+    foreach_ixge_counter
+#undef _
+#undef _64
+  };
+  volatile u32 *r = (volatile u32 *) xd->regs;
+  int i;
+
+  for (i = 0; i < ARRAY_LEN (xd->counters); i++)
+    {
+      u32 o = reg_offsets[i];
+      xd->counters[i] += r[o];
+      if (ixge_counter_flags[i] & IXGE_COUNTER_NOT_CLEAR_ON_READ)
+	r[o] = 0;
+      if (ixge_counter_flags[i] & IXGE_COUNTER_IS_64_BIT)
+	xd->counters[i] += (u64) r[o + 1] << (u64) 32;
+    }
+}
+
+static u8 *
+format_ixge_device_id (u8 * s, va_list * args)
+{
+  u32 device_id = va_arg (*args, u32);
+  char *t = 0;
+  switch (device_id)
+    {
+#define _(f,n) case n: t = #f; break;
+      foreach_ixge_pci_device_id;
+#undef _
+    default:
+      t = 0;
+      break;
+    }
+  if (t == 0)
+    s = format (s, "unknown 0x%x", device_id);
+  else
+    s = format (s, "%s", t);
+  return s;
+}
+
+static u8 *
+format_ixge_link_status (u8 * s, va_list * args)
+{
+  ixge_device_t *xd = va_arg (*args, ixge_device_t *);
+  u32 v = xd->link_status_at_last_link_change;
+
+  s = format (s, "%s", (v & (1 << 30)) ? "up" : "down");
+
+  {
+    char *modes[] = {
+      "1g", "10g parallel", "10g serial", "autoneg",
+    };
+    char *speeds[] = {
+      "unknown", "100m", "1g", "10g",
+    };
+    s = format (s, ", mode %s, speed %s",
+		modes[(v >> 26) & 3], speeds[(v >> 28) & 3]);
+  }
+
+  return s;
+}
+
+static u8 *
+format_ixge_device (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  CLIB_UNUSED (int verbose) = va_arg (*args, int);
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, dev_instance);
+  ixge_phy_t *phy = xd->phys + xd->phy_index;
+  uword indent = format_get_indent (s);
+
+  ixge_update_counters (xd);
+  xd->link_status_at_last_link_change = xd->regs->xge_mac.link_status;
+
+  s = format (s, "Intel 8259X: id %U\n%Ulink %U",
+	      format_ixge_device_id, xd->device_id,
+	      format_white_space, indent + 2, format_ixge_link_status, xd);
+
+  {
+
+    s = format (s, "\n%UPCIe %U", format_white_space, indent + 2,
+		format_vlib_pci_link_speed, &xd->pci_device);
+  }
+
+  s = format (s, "\n%U", format_white_space, indent + 2);
+  if (phy->mdio_address != ~0)
+    s = format (s, "PHY address %d, id 0x%x", phy->mdio_address, phy->id);
+  else if (xd->sfp_eeprom.id == SFP_ID_sfp)
+    s = format (s, "SFP %U", format_sfp_eeprom, &xd->sfp_eeprom);
+  else
+    s = format (s, "PHY not found");
+
+  /* FIXME */
+  {
+    ixge_dma_queue_t *dq = vec_elt_at_index (xd->dma_queues[VLIB_RX], 0);
+    ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_RX, 0);
+    u32 hw_head_index = dr->head_index;
+    u32 sw_head_index = dq->head_index;
+    u32 nitems;
+
+    nitems = ixge_ring_sub (dq, hw_head_index, sw_head_index);
+    s = format (s, "\n%U%d unprocessed, %d total buffers on rx queue 0 ring",
+		format_white_space, indent + 2, nitems, dq->n_descriptors);
+
+    s = format (s, "\n%U%d buffers in driver rx cache",
+		format_white_space, indent + 2,
+		vec_len (xm->rx_buffers_to_add));
+
+    s = format (s, "\n%U%d buffers on tx queue 0 ring",
+		format_white_space, indent + 2,
+		xd->dma_queues[VLIB_TX][0].tx.n_buffers_on_ring);
+  }
+  {
+    u32 i;
+    u64 v;
+    static char *names[] = {
+#define _(a,f) #f,
+#define _64(a,f) _(a,f)
+      foreach_ixge_counter
+#undef _
+#undef _64
+    };
+
+    for (i = 0; i < ARRAY_LEN (names); i++)
+      {
+	v = xd->counters[i] - xd->counters_last_clear[i];
+	if (v != 0)
+	  s = format (s, "\n%U%-40U%16Ld",
+		      format_white_space, indent + 2,
+		      format_c_identifier, names[i], v);
+      }
+  }
+
+  return s;
+}
+
+static void
+ixge_clear_hw_interface_counters (u32 instance)
+{
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, instance);
+  ixge_update_counters (xd);
+  memcpy (xd->counters_last_clear, xd->counters, sizeof (xd->counters));
+}
+
+/*
+ * Dynamically redirect all pkts from a specific interface
+ * to the specified node
+ */
+static void
+ixge_set_interface_next_node (vnet_main_t * vnm, u32 hw_if_index,
+			      u32 node_index)
+{
+  ixge_main_t *xm = &ixge_main;
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, hw->dev_instance);
+
+  /* Shut off redirection */
+  if (node_index == ~0)
+    {
+      xd->per_interface_next_index = node_index;
+      return;
+    }
+
+  xd->per_interface_next_index =
+    vlib_node_add_next (xm->vlib_main, ixge_input_node.index, node_index);
+}
+
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (ixge_device_class) = {
+  .name = "ixge",
+  .tx_function = ixge_interface_tx,
+  .format_device_name = format_ixge_device_name,
+  .format_device = format_ixge_device,
+  .format_tx_trace = format_ixge_tx_dma_trace,
+  .clear_counters = ixge_clear_hw_interface_counters,
+  .admin_up_down_function = ixge_interface_admin_up_down,
+  .rx_redirect_to_node = ixge_set_interface_next_node,
+  .flatten_output_chains = 1,
+};
+/* *INDENT-ON* */
+
+#define IXGE_N_BYTES_IN_RX_BUFFER  (2048)	// DAW-HACK: Set Rx buffer size so all packets < ETH_MTU_SIZE fit in the buffer (i.e. sop & eop for all descriptors).
+
+static clib_error_t *
+ixge_dma_init (ixge_device_t * xd, vlib_rx_or_tx_t rt, u32 queue_index)
+{
+  ixge_main_t *xm = &ixge_main;
+  vlib_main_t *vm = xm->vlib_main;
+  ixge_dma_queue_t *dq;
+  clib_error_t *error = 0;
+
+  vec_validate (xd->dma_queues[rt], queue_index);
+  dq = vec_elt_at_index (xd->dma_queues[rt], queue_index);
+
+  if (!xm->n_descriptors_per_cache_line)
+    xm->n_descriptors_per_cache_line =
+      CLIB_CACHE_LINE_BYTES / sizeof (dq->descriptors[0]);
+
+  if (!xm->n_bytes_in_rx_buffer)
+    xm->n_bytes_in_rx_buffer = IXGE_N_BYTES_IN_RX_BUFFER;
+  xm->n_bytes_in_rx_buffer = round_pow2 (xm->n_bytes_in_rx_buffer, 1024);
+  if (!xm->vlib_buffer_free_list_index)
+    {
+      xm->vlib_buffer_free_list_index =
+	vlib_buffer_get_or_create_free_list (vm, xm->n_bytes_in_rx_buffer,
+					     "ixge rx");
+      ASSERT (xm->vlib_buffer_free_list_index != 0);
+    }
+
+  if (!xm->n_descriptors[rt])
+    xm->n_descriptors[rt] = 4 * VLIB_FRAME_SIZE;
+
+  dq->queue_index = queue_index;
+  dq->n_descriptors =
+    round_pow2 (xm->n_descriptors[rt], xm->n_descriptors_per_cache_line);
+  dq->head_index = dq->tail_index = 0;
+
+  dq->descriptors = vlib_physmem_alloc_aligned (vm, &error,
+						dq->n_descriptors *
+						sizeof (dq->descriptors[0]),
+						128 /* per chip spec */ );
+  if (error)
+    return error;
+
+  memset (dq->descriptors, 0,
+	  dq->n_descriptors * sizeof (dq->descriptors[0]));
+  vec_resize (dq->descriptor_buffer_indices, dq->n_descriptors);
+
+  if (rt == VLIB_RX)
+    {
+      u32 n_alloc, i;
+
+      n_alloc = vlib_buffer_alloc_from_free_list
+	(vm, dq->descriptor_buffer_indices,
+	 vec_len (dq->descriptor_buffer_indices),
+	 xm->vlib_buffer_free_list_index);
+      ASSERT (n_alloc == vec_len (dq->descriptor_buffer_indices));
+      for (i = 0; i < n_alloc; i++)
+	{
+	  vlib_buffer_t *b =
+	    vlib_get_buffer (vm, dq->descriptor_buffer_indices[i]);
+	  dq->descriptors[i].rx_to_hw.tail_address =
+	    vlib_physmem_virtual_to_physical (vm, b->data);
+	}
+    }
+  else
+    {
+      u32 i;
+
+      dq->tx.head_index_write_back =
+	vlib_physmem_alloc (vm, &error, CLIB_CACHE_LINE_BYTES);
+
+      for (i = 0; i < dq->n_descriptors; i++)
+	dq->descriptors[i].tx = xm->tx_descriptor_template;
+
+      vec_validate (xm->tx_buffers_pending_free, dq->n_descriptors - 1);
+    }
+
+  {
+    ixge_dma_regs_t *dr = get_dma_regs (xd, rt, queue_index);
+    u64 a;
+
+    a = vlib_physmem_virtual_to_physical (vm, dq->descriptors);
+    dr->descriptor_address[0] = a & 0xFFFFFFFF;
+    dr->descriptor_address[1] = a >> (u64) 32;
+    dr->n_descriptor_bytes = dq->n_descriptors * sizeof (dq->descriptors[0]);
+    dq->head_index = dq->tail_index = 0;
+
+    if (rt == VLIB_RX)
+      {
+	ASSERT ((xm->n_bytes_in_rx_buffer / 1024) < 32);
+	dr->rx_split_control =
+	  ( /* buffer size */ ((xm->n_bytes_in_rx_buffer / 1024) << 0)
+	   | (			/* lo free descriptor threshold (units of 64 descriptors) */
+	       (1 << 22)) | (	/* descriptor type: advanced one buffer */
+			      (1 << 25)) | (	/* drop if no descriptors available */
+					     (1 << 28)));
+
+	/* Give hardware all but last 16 cache lines' worth of descriptors. */
+	dq->tail_index = dq->n_descriptors -
+	  16 * xm->n_descriptors_per_cache_line;
+      }
+    else
+      {
+	/* Make sure its initialized before hardware can get to it. */
+	dq->tx.head_index_write_back[0] = dq->head_index;
+
+	a =
+	  vlib_physmem_virtual_to_physical (vm, dq->tx.head_index_write_back);
+	dr->tx.head_index_write_back_address[0] = /* enable bit */ 1 | a;
+	dr->tx.head_index_write_back_address[1] = (u64) a >> (u64) 32;
+      }
+
+    /* DMA on 82599 does not work with [13] rx data write relaxed ordering
+       and [12] undocumented set. */
+    if (rt == VLIB_RX)
+      dr->dca_control &= ~((1 << 13) | (1 << 12));
+
+    CLIB_MEMORY_BARRIER ();
+
+    if (rt == VLIB_TX)
+      {
+	xd->regs->tx_dma_control |= (1 << 0);
+	dr->control |= ((32 << 0)	/* prefetch threshold */
+			| (64 << 8)	/* host threshold */
+			| (0 << 16) /* writeback threshold */ );
+      }
+
+    /* Enable this queue and wait for hardware to initialize
+       before adding to tail. */
+    if (rt == VLIB_TX)
+      {
+	dr->control |= 1 << 25;
+	while (!(dr->control & (1 << 25)))
+	  ;
+      }
+
+    /* Set head/tail indices and enable DMA. */
+    dr->head_index = dq->head_index;
+    dr->tail_index = dq->tail_index;
+  }
+
+  return error;
+}
+
+static u32
+ixge_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hw, u32 flags)
+{
+  ixge_device_t *xd;
+  ixge_regs_t *r;
+  u32 old;
+  ixge_main_t *xm = &ixge_main;
+
+  xd = vec_elt_at_index (xm->devices, hw->dev_instance);
+  r = xd->regs;
+
+  old = r->filter_control;
+
+  if (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL)
+    r->filter_control = old | (1 << 9) /* unicast promiscuous */ ;
+  else
+    r->filter_control = old & ~(1 << 9);
+
+  return old;
+}
+
+static void
+ixge_device_init (ixge_main_t * xm)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ixge_device_t *xd;
+
+  /* Reset chip(s). */
+  vec_foreach (xd, xm->devices)
+  {
+    ixge_regs_t *r = xd->regs;
+    const u32 reset_bit = (1 << 26) | (1 << 3);
+
+    r->control |= reset_bit;
+
+    /* No need to suspend.  Timed to take ~1e-6 secs */
+    while (r->control & reset_bit)
+      ;
+
+    /* Software loaded. */
+    r->extended_control |= (1 << 28);
+
+    ixge_phy_init (xd);
+
+    /* Register ethernet interface. */
+    {
+      u8 addr8[6];
+      u32 i, addr32[2];
+      clib_error_t *error;
+
+      addr32[0] = r->rx_ethernet_address0[0][0];
+      addr32[1] = r->rx_ethernet_address0[0][1];
+      for (i = 0; i < 6; i++)
+	addr8[i] = addr32[i / 4] >> ((i % 4) * 8);
+
+      error = ethernet_register_interface
+	(vnm, ixge_device_class.index, xd->device_index,
+	 /* ethernet address */ addr8,
+	 &xd->vlib_hw_if_index, ixge_flag_change);
+      if (error)
+	clib_error_report (error);
+    }
+
+    {
+      vnet_sw_interface_t *sw =
+	vnet_get_hw_sw_interface (vnm, xd->vlib_hw_if_index);
+      xd->vlib_sw_if_index = sw->sw_if_index;
+    }
+
+    ixge_dma_init (xd, VLIB_RX, /* queue_index */ 0);
+
+    xm->n_descriptors[VLIB_TX] = 20 * VLIB_FRAME_SIZE;
+
+    ixge_dma_init (xd, VLIB_TX, /* queue_index */ 0);
+
+    /* RX/TX queue 0 gets mapped to interrupt bits 0 & 8. */
+    r->interrupt.queue_mapping[0] = (( /* valid bit */ (1 << 7) |
+				      ixge_rx_queue_to_interrupt (0)) << 0);
+
+    r->interrupt.queue_mapping[0] |= (( /* valid bit */ (1 << 7) |
+				       ixge_tx_queue_to_interrupt (0)) << 8);
+
+    /* No use in getting too many interrupts.
+       Limit them to one every 3/4 ring size at line rate
+       min sized packets.
+       No need for this since kernel/vlib main loop provides adequate interrupt
+       limiting scheme. */
+    if (0)
+      {
+	f64 line_rate_max_pps =
+	  10e9 / (8 * (64 + /* interframe padding */ 20));
+	ixge_throttle_queue_interrupt (r, 0,
+				       .75 * xm->n_descriptors[VLIB_RX] /
+				       line_rate_max_pps);
+      }
+
+    /* Accept all multicast and broadcast packets. Should really add them
+       to the dst_ethernet_address register array. */
+    r->filter_control |= (1 << 10) | (1 << 8);
+
+    /* Enable frames up to size in mac frame size register. */
+    r->xge_mac.control |= 1 << 2;
+    r->xge_mac.rx_max_frame_size = (9216 + 14) << 16;
+
+    /* Enable all interrupts. */
+    if (!IXGE_ALWAYS_POLL)
+      r->interrupt.enable_write_1_to_set = ~0;
+  }
+}
+
+static uword
+ixge_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd;
+  uword event_type, *event_data = 0;
+  f64 timeout, link_debounce_deadline;
+
+  ixge_device_init (xm);
+
+  /* Clear all counters. */
+  vec_foreach (xd, xm->devices)
+  {
+    ixge_update_counters (xd);
+    memset (xd->counters, 0, sizeof (xd->counters));
+  }
+
+  timeout = 30.0;
+  link_debounce_deadline = 1e70;
+
+  while (1)
+    {
+      /* 36 bit stat counters could overflow in ~50 secs.
+         We poll every 30 secs to be conservative. */
+      vlib_process_wait_for_event_or_clock (vm, timeout);
+
+      event_type = vlib_process_get_events (vm, &event_data);
+
+      switch (event_type)
+	{
+	case EVENT_SET_FLAGS:
+	  /* 1 ms */
+	  link_debounce_deadline = vlib_time_now (vm) + 1e-3;
+	  timeout = 1e-3;
+	  break;
+
+	case ~0:
+	  /* No events found: timer expired. */
+	  if (vlib_time_now (vm) > link_debounce_deadline)
+	    {
+	      vec_foreach (xd, xm->devices)
+	      {
+		ixge_regs_t *r = xd->regs;
+		u32 v = r->xge_mac.link_status;
+		uword is_up = (v & (1 << 30)) != 0;
+
+		vnet_hw_interface_set_flags
+		  (vnm, xd->vlib_hw_if_index,
+		   is_up ? VNET_HW_INTERFACE_FLAG_LINK_UP : 0);
+	      }
+	      link_debounce_deadline = 1e70;
+	      timeout = 30.0;
+	    }
+	  break;
+
+	default:
+	  ASSERT (0);
+	}
+
+      if (event_data)
+	_vec_len (event_data) = 0;
+
+      /* Query stats every 30 secs. */
+      {
+	f64 now = vlib_time_now (vm);
+	if (now - xm->time_last_stats_update > 30)
+	  {
+	    xm->time_last_stats_update = now;
+	    vec_foreach (xd, xm->devices) ixge_update_counters (xd);
+	  }
+      }
+    }
+
+  return 0;
+}
+
+static vlib_node_registration_t ixge_process_node = {
+  .function = ixge_process,
+  .type = VLIB_NODE_TYPE_PROCESS,
+  .name = "ixge-process",
+};
+
+clib_error_t *
+ixge_init (vlib_main_t * vm)
+{
+  ixge_main_t *xm = &ixge_main;
+  clib_error_t *error;
+
+  xm->vlib_main = vm;
+  memset (&xm->tx_descriptor_template, 0,
+	  sizeof (xm->tx_descriptor_template));
+  memset (&xm->tx_descriptor_template_mask, 0,
+	  sizeof (xm->tx_descriptor_template_mask));
+  xm->tx_descriptor_template.status0 =
+    (IXGE_TX_DESCRIPTOR_STATUS0_ADVANCED |
+     IXGE_TX_DESCRIPTOR_STATUS0_IS_ADVANCED |
+     IXGE_TX_DESCRIPTOR_STATUS0_INSERT_FCS);
+  xm->tx_descriptor_template_mask.status0 = 0xffff;
+  xm->tx_descriptor_template_mask.status1 = 0x00003fff;
+
+  xm->tx_descriptor_template_mask.status0 &=
+    ~(IXGE_TX_DESCRIPTOR_STATUS0_IS_END_OF_PACKET
+      | IXGE_TX_DESCRIPTOR_STATUS0_REPORT_STATUS);
+  xm->tx_descriptor_template_mask.status1 &=
+    ~(IXGE_TX_DESCRIPTOR_STATUS1_DONE);
+
+  error = vlib_call_init_function (vm, pci_bus_init);
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (ixge_init);
+
+
+static void
+ixge_pci_intr_handler (vlib_pci_device_t * dev)
+{
+  ixge_main_t *xm = &ixge_main;
+  vlib_main_t *vm = xm->vlib_main;
+
+  vlib_node_set_interrupt_pending (vm, ixge_input_node.index);
+
+  /* Let node know which device is interrupting. */
+  {
+    vlib_node_runtime_t *rt =
+      vlib_node_get_runtime (vm, ixge_input_node.index);
+    rt->runtime_data[0] |= 1 << dev->private_data;
+  }
+}
+
+static clib_error_t *
+ixge_pci_init (vlib_main_t * vm, vlib_pci_device_t * dev)
+{
+  ixge_main_t *xm = &ixge_main;
+  clib_error_t *error;
+  void *r;
+  ixge_device_t *xd;
+
+  /* Device found: make sure we have dma memory. */
+  if (unix_physmem_is_fake (vm))
+    return clib_error_return (0, "no physical memory available");
+
+  error = vlib_pci_map_resource (dev, 0, &r);
+  if (error)
+    return error;
+
+  vec_add2 (xm->devices, xd, 1);
+
+  if (vec_len (xm->devices) == 1)
+    {
+      ixge_input_node.function = ixge_input_multiarch_select ();
+    }
+
+  xd->pci_device = dev[0];
+  xd->device_id = xd->pci_device.config0.header.device_id;
+  xd->regs = r;
+  xd->device_index = xd - xm->devices;
+  xd->pci_function = dev->bus_address.function;
+  xd->per_interface_next_index = ~0;
+
+
+  /* Chip found so enable node. */
+  {
+    vlib_node_set_state (vm, ixge_input_node.index,
+			 (IXGE_ALWAYS_POLL
+			  ? VLIB_NODE_STATE_POLLING
+			  : VLIB_NODE_STATE_INTERRUPT));
+
+    dev->private_data = xd->device_index;
+  }
+
+  if (vec_len (xm->devices) == 1)
+    {
+      vlib_register_node (vm, &ixge_process_node);
+      xm->process_node_index = ixge_process_node.index;
+    }
+
+  error = vlib_pci_bus_master_enable (dev);
+
+  if (error)
+    return error;
+
+  return vlib_pci_intr_enable (dev);
+}
+
+/* *INDENT-OFF* */
+PCI_REGISTER_DEVICE (ixge_pci_device_registration,static) = {
+  .init_function = ixge_pci_init,
+  .interrupt_handler = ixge_pci_intr_handler,
+  .supported_devices = {
+#define _(t,i) { .vendor_id = PCI_VENDOR_ID_INTEL, .device_id = i, },
+    foreach_ixge_pci_device_id
+#undef _
+    { 0 },
+  },
+};
+/* *INDENT-ON* */
+
+void
+ixge_set_next_node (ixge_rx_next_t next, char *name)
+{
+  vlib_node_registration_t *r = &ixge_input_node;
+
+  switch (next)
+    {
+    case IXGE_RX_NEXT_IP4_INPUT:
+    case IXGE_RX_NEXT_IP6_INPUT:
+    case IXGE_RX_NEXT_ETHERNET_INPUT:
+      r->next_nodes[next] = name;
+      break;
+
+    default:
+      clib_warning ("%s: illegal next %d\n", __FUNCTION__, next);
+      break;
+    }
+}
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/nic/ixge.h b/src/vnet/devices/nic/ixge.h
new file mode 100644
index 00000000..a8e652dc
--- /dev/null
+++ b/src/vnet/devices/nic/ixge.h
@@ -0,0 +1,1293 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_ixge_h
+#define included_ixge_h
+
+#include <vnet/vnet.h>
+#include <vlib/pci/pci.h>
+#include <vlib/i2c.h>
+#include <vnet/devices/nic/sfp.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+
+typedef volatile struct
+{
+  /* [31:7] 128 byte aligned. */
+  u32 descriptor_address[2];
+  u32 n_descriptor_bytes;
+
+  /* [5] rx/tx descriptor dca enable
+     [6] rx packet head dca enable
+     [7] rx packet tail dca enable
+     [9] rx/tx descriptor relaxed order
+     [11] rx/tx descriptor write back relaxed order
+     [13] rx/tx data write/read relaxed order
+     [15] rx head data write relaxed order
+     [31:24] apic id for cpu's cache. */
+  u32 dca_control;
+
+  u32 head_index;
+
+  /* [4:0] tail buffer size (in 1k byte units)
+     [13:8] head buffer size (in 64 byte units)
+     [24:22] lo free descriptors threshold (units of 64 descriptors)
+     [27:25] descriptor type 0 = legacy, 1 = advanced one buffer (e.g. tail),
+     2 = advanced header splitting (head + tail), 5 = advanced header
+     splitting (head only).
+     [28] drop if no descriptors available. */
+  u32 rx_split_control;
+
+  u32 tail_index;
+    CLIB_PAD_FROM_TO (0x1c, 0x28);
+
+  /* [7:0] rx/tx prefetch threshold
+     [15:8] rx/tx host threshold
+     [24:16] rx/tx write back threshold
+     [25] rx/tx enable
+     [26] tx descriptor writeback flush
+     [30] rx strip vlan enable */
+  u32 control;
+
+  u32 rx_coallesce_control;
+
+  union
+  {
+    struct
+    {
+      /* packets bytes lo hi */
+      u32 stats[3];
+
+      u32 unused;
+    } rx;
+
+    struct
+    {
+      u32 unused[2];
+
+      /* [0] enables head write back. */
+      u32 head_index_write_back_address[2];
+    } tx;
+  };
+} ixge_dma_regs_t;
+
+/* Only advanced descriptors are supported. */
+typedef struct
+{
+  u64 tail_address;
+  u64 head_address;
+} ixge_rx_to_hw_descriptor_t;
+
+typedef struct
+{
+  u32 status[3];
+  u16 n_packet_bytes_this_descriptor;
+  u16 vlan_tag;
+} ixge_rx_from_hw_descriptor_t;
+
+#define IXGE_RX_DESCRIPTOR_STATUS0_IS_LAYER2 (1 << (4 + 11))
+/* Valid if not layer2. */
+#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4 (1 << (4 + 0))
+#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4_EXT (1 << (4 + 1))
+#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6 (1 << (4 + 2))
+#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6_EXT (1 << (4 + 3))
+#define IXGE_RX_DESCRIPTOR_STATUS0_IS_TCP (1 << (4 + 4))
+#define IXGE_RX_DESCRIPTOR_STATUS0_IS_UDP (1 << (4 + 5))
+#define IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET(s) (((s) >> 21) & 0x3ff)
+
+#define IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE (1 << (0 + 0))
+#define IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET (1 << (0 + 1))
+#define IXGE_RX_DESCRIPTOR_STATUS2_IS_VLAN (1 << (0 + 3))
+#define IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED (1 << (0 + 4))
+#define IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED (1 << (0 + 5))
+#define IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED (1 << (0 + 6))
+#define IXGE_RX_DESCRIPTOR_STATUS2_NOT_UNICAST (1 << (0 + 7))
+#define IXGE_RX_DESCRIPTOR_STATUS2_IS_DOUBLE_VLAN (1 << (0 + 9))
+#define IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR (1 << (0 + 10))
+#define IXGE_RX_DESCRIPTOR_STATUS2_ETHERNET_ERROR (1 << (20 + 9))
+#define IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR (1 << (20 + 10))
+#define IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR (1 << (20 + 11))
+
+/* For layer2 packets stats0 bottom 3 bits give ether type index from filter. */
+#define IXGE_RX_DESCRIPTOR_STATUS0_LAYER2_ETHERNET_TYPE(s) ((s) & 7)
+
+typedef struct
+{
+  u64 buffer_address;
+  u16 n_bytes_this_buffer;
+  u16 status0;
+  u32 status1;
+#define IXGE_TX_DESCRIPTOR_STATUS0_ADVANCED (3 << 4)
+#define IXGE_TX_DESCRIPTOR_STATUS0_IS_ADVANCED (1 << (8 + 5))
+#define IXGE_TX_DESCRIPTOR_STATUS0_LOG2_REPORT_STATUS (8 + 3)
+#define IXGE_TX_DESCRIPTOR_STATUS0_REPORT_STATUS (1 << IXGE_TX_DESCRIPTOR_STATUS0_LOG2_REPORT_STATUS)
+#define IXGE_TX_DESCRIPTOR_STATUS0_INSERT_FCS (1 << (8 + 1))
+#define IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET (8 + 0)
+#define IXGE_TX_DESCRIPTOR_STATUS0_IS_END_OF_PACKET (1 << IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET)
+#define IXGE_TX_DESCRIPTOR_STATUS1_DONE (1 << 0)
+#define IXGE_TX_DESCRIPTOR_STATUS1_CONTEXT(i) (/* valid */ (1 << 7) | ((i) << 4))
+#define IXGE_TX_DESCRIPTOR_STATUS1_IPSEC_OFFLOAD (1 << (8 + 2))
+#define IXGE_TX_DESCRIPTOR_STATUS1_INSERT_TCP_UDP_CHECKSUM (1 << (8 + 1))
+#define IXGE_TX_DESCRIPTOR_STATUS1_INSERT_IP4_CHECKSUM (1 << (8 + 0))
+#define IXGE_TX_DESCRIPTOR_STATUS0_N_BYTES_THIS_BUFFER(l) ((l) << 0)
+#define IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET(l) ((l) << 14)
+} ixge_tx_descriptor_t;
+
+typedef struct
+{
+  struct
+  {
+    u8 checksum_start_offset;
+    u8 checksum_insert_offset;
+    u16 checksum_end_offset;
+  } ip, tcp;
+  u32 status0;
+
+  u8 status1;
+
+  /* Byte offset after UDP/TCP header. */
+  u8 payload_offset;
+
+  u16 max_tcp_segment_size;
+} __attribute__ ((packed)) ixge_tx_context_descriptor_t;
+
+typedef union
+{
+  ixge_rx_to_hw_descriptor_t rx_to_hw;
+  ixge_rx_from_hw_descriptor_t rx_from_hw;
+  ixge_tx_descriptor_t tx;
+  u32x4 as_u32x4;
+} ixge_descriptor_t;
+
+typedef volatile struct
+{
+  /* [2] pcie master disable
+     [3] mac reset
+     [26] global device reset */
+  u32 control;
+  u32 control_alias;
+  /* [3:2] device id (0 or 1 for dual port chips)
+     [7] link is up
+     [17:10] num vfs
+     [18] io active
+     [19] pcie master enable status */
+  u32 status_read_only;
+    CLIB_PAD_FROM_TO (0xc, 0x18);
+  /* [14] pf reset done
+     [17] relaxed ordering disable
+     [26] extended vlan enable
+     [28] driver loaded */
+  u32 extended_control;
+    CLIB_PAD_FROM_TO (0x1c, 0x20);
+
+  /* software definable pins.
+     sdp_data [7:0]
+     sdp_is_output [15:8]
+     sdp_is_native [23:16]
+     sdp_function [31:24].
+   */
+  u32 sdp_control;
+    CLIB_PAD_FROM_TO (0x24, 0x28);
+
+  /* [0] i2c clock in
+     [1] i2c clock out
+     [2] i2c data in
+     [3] i2c data out */
+  u32 i2c_control;
+    CLIB_PAD_FROM_TO (0x2c, 0x4c);
+  u32 tcp_timer;
+
+    CLIB_PAD_FROM_TO (0x50, 0x200);
+
+  u32 led_control;
+
+    CLIB_PAD_FROM_TO (0x204, 0x600);
+  u32 core_spare;
+    CLIB_PAD_FROM_TO (0x604, 0x700);
+
+  struct
+  {
+    u32 vflr_events_clear[4];
+    u32 mailbox_interrupt_status[4];
+    u32 mailbox_interrupt_enable[4];
+      CLIB_PAD_FROM_TO (0x730, 0x800);
+  } pf_foo;
+
+  struct
+  {
+    u32 status_write_1_to_clear;
+      CLIB_PAD_FROM_TO (0x804, 0x808);
+    u32 status_write_1_to_set;
+      CLIB_PAD_FROM_TO (0x80c, 0x810);
+    u32 status_auto_clear_enable;
+      CLIB_PAD_FROM_TO (0x814, 0x820);
+
+    /* [11:3] minimum inter-interrupt interval
+       (2e-6 units; 20e-6 units for fast ethernet).
+       [15] low-latency interrupt moderation enable
+       [20:16] low-latency interrupt credit
+       [27:21] interval counter
+       [31] write disable for credit and counter (write only). */
+    u32 throttle0[24];
+
+    u32 enable_write_1_to_set;
+      CLIB_PAD_FROM_TO (0x884, 0x888);
+    u32 enable_write_1_to_clear;
+      CLIB_PAD_FROM_TO (0x88c, 0x890);
+    u32 enable_auto_clear;
+    u32 msi_to_eitr_select;
+    /* [3:0] spd 0-3 interrupt detection enable
+       [4] msi-x enable
+       [5] other clear disable (makes other bits in status not clear on read)
+       etc. */
+    u32 control;
+      CLIB_PAD_FROM_TO (0x89c, 0x900);
+
+    /* Defines interrupt mapping for 128 rx + 128 tx queues.
+       64 x 4 8 bit entries.
+       For register [i]:
+       [5:0] bit in interrupt status for rx queue 2*i + 0
+       [7] valid bit
+       [13:8] bit for tx queue 2*i + 0
+       [15] valid bit
+       similar for rx 2*i + 1 and tx 2*i + 1. */
+    u32 queue_mapping[64];
+
+    /* tcp timer [7:0] and other interrupts [15:8] */
+    u32 misc_mapping;
+      CLIB_PAD_FROM_TO (0xa04, 0xa90);
+
+    /* 64 interrupts determined by mappings. */
+    u32 status1_write_1_to_clear[4];
+    u32 enable1_write_1_to_set[4];
+    u32 enable1_write_1_to_clear[4];
+      CLIB_PAD_FROM_TO (0xac0, 0xad0);
+    u32 status1_enable_auto_clear[4];
+      CLIB_PAD_FROM_TO (0xae0, 0x1000);
+  } interrupt;
+
+  ixge_dma_regs_t rx_dma0[64];
+
+    CLIB_PAD_FROM_TO (0x2000, 0x2140);
+  u32 dcb_rx_packet_plane_t4_config[8];
+  u32 dcb_rx_packet_plane_t4_status[8];
+    CLIB_PAD_FROM_TO (0x2180, 0x2300);
+
+  /* reg i defines mapping for 4 rx queues starting at 4*i + 0. */
+  u32 rx_queue_stats_mapping[32];
+  u32 rx_queue_stats_control;
+
+    CLIB_PAD_FROM_TO (0x2384, 0x2410);
+  u32 fc_user_descriptor_ptr[2];
+  u32 fc_buffer_control;
+    CLIB_PAD_FROM_TO (0x241c, 0x2420);
+  u32 fc_rx_dma;
+    CLIB_PAD_FROM_TO (0x2424, 0x2430);
+  u32 dcb_packet_plane_control;
+    CLIB_PAD_FROM_TO (0x2434, 0x2f00);
+
+  u32 rx_dma_control;
+  u32 pf_queue_drop_enable;
+    CLIB_PAD_FROM_TO (0x2f08, 0x2f20);
+  u32 rx_dma_descriptor_cache_config;
+    CLIB_PAD_FROM_TO (0x2f24, 0x3000);
+
+  /* 1 bit. */
+  u32 rx_enable;
+    CLIB_PAD_FROM_TO (0x3004, 0x3008);
+  /* [15:0] ether type (little endian)
+     [31:16] opcode (big endian) */
+  u32 flow_control_control;
+    CLIB_PAD_FROM_TO (0x300c, 0x3020);
+  /* 3 bit traffic class for each of 8 priorities. */
+  u32 rx_priority_to_traffic_class;
+    CLIB_PAD_FROM_TO (0x3024, 0x3028);
+  u32 rx_coallesce_data_buffer_control;
+    CLIB_PAD_FROM_TO (0x302c, 0x3190);
+  u32 rx_packet_buffer_flush_detect;
+    CLIB_PAD_FROM_TO (0x3194, 0x3200);
+  u32 flow_control_tx_timers[4];	/* 2 timer values */
+    CLIB_PAD_FROM_TO (0x3210, 0x3220);
+  u32 flow_control_rx_threshold_lo[8];
+    CLIB_PAD_FROM_TO (0x3240, 0x3260);
+  u32 flow_control_rx_threshold_hi[8];
+    CLIB_PAD_FROM_TO (0x3280, 0x32a0);
+  u32 flow_control_refresh_threshold;
+    CLIB_PAD_FROM_TO (0x32a4, 0x3c00);
+  /* For each of 8 traffic classes (units of bytes). */
+  u32 rx_packet_buffer_size[8];
+    CLIB_PAD_FROM_TO (0x3c20, 0x3d00);
+  u32 flow_control_config;
+    CLIB_PAD_FROM_TO (0x3d04, 0x4200);
+
+  struct
+  {
+    u32 pcs_config;
+      CLIB_PAD_FROM_TO (0x4204, 0x4208);
+    u32 link_control;
+    u32 link_status;
+    u32 pcs_debug[2];
+    u32 auto_negotiation;
+    u32 link_partner_ability;
+    u32 auto_negotiation_tx_next_page;
+    u32 auto_negotiation_link_partner_next_page;
+      CLIB_PAD_FROM_TO (0x4228, 0x4240);
+  } gige_mac;
+
+  struct
+  {
+    /* [0] tx crc enable
+       [2] enable frames up to max frame size register [31:16]
+       [10] pad frames < 64 bytes if specified by user
+       [15] loopback enable
+       [16] mdc hi speed
+       [17] turn off mdc between mdio packets */
+    u32 control;
+
+    /* [5] rx symbol error (all bits clear on read)
+       [6] rx illegal symbol
+       [7] rx idle error
+       [8] rx local fault
+       [9] rx remote fault */
+    u32 status;
+
+    u32 pause_and_pace_control;
+      CLIB_PAD_FROM_TO (0x424c, 0x425c);
+    u32 phy_command;
+    u32 phy_data;
+      CLIB_PAD_FROM_TO (0x4264, 0x4268);
+
+    /* [31:16] max frame size in bytes. */
+    u32 rx_max_frame_size;
+      CLIB_PAD_FROM_TO (0x426c, 0x4288);
+
+    /* [0]
+       [2] pcs receive link up? (latch lo)
+       [7] local fault
+       [1]
+       [0] pcs 10g base r capable
+       [1] pcs 10g base x capable
+       [2] pcs 10g base w capable
+       [10] rx local fault
+       [11] tx local fault
+       [15:14] 2 => device present at this address (else not present) */
+    u32 xgxs_status[2];
+
+    u32 base_x_pcs_status;
+
+    /* [0] pass unrecognized flow control frames
+       [1] discard pause frames
+       [2] rx priority flow control enable (only in dcb mode)
+       [3] rx flow control enable. */
+    u32 flow_control;
+
+    /* [3:0] tx lanes change polarity
+       [7:4] rx lanes change polarity
+       [11:8] swizzle tx lanes
+       [15:12] swizzle rx lanes
+       4 x 2 bit tx lane swap
+       4 x 2 bit rx lane swap. */
+    u32 serdes_control;
+
+    u32 fifo_control;
+
+    /* [0] force link up
+       [1] autoneg ack2 bit to transmit
+       [6:2] autoneg selector field to transmit
+       [8:7] 10g pma/pmd type 0 => xaui, 1 kx4, 2 cx4
+       [9] 1g pma/pmd type 0 => sfi, 1 => kx/bx
+       [10] disable 10g on without main power
+       [11] restart autoneg on transition to dx power state
+       [12] restart autoneg
+       [15:13] link mode:
+       0 => 1g no autoneg
+       1 => 10g kx4 parallel link no autoneg
+       2 => 1g bx autoneg
+       3 => 10g sfi serdes
+       4 => kx4/kx/kr
+       5 => xgmii 1g/100m
+       6 => kx4/kx/kr 1g an
+       7 kx4/kx/kr sgmii.
+       [16] kr support
+       [17] fec requested
+       [18] fec ability
+       etc. */
+    u32 auto_negotiation_control;
+
+    /* [0] signal detect 1g/100m
+       [1] fec signal detect
+       [2] 10g serial pcs fec block lock
+       [3] 10g serial high error rate
+       [4] 10g serial pcs block lock
+       [5] kx/kx4/kr autoneg next page received
+       [6] kx/kx4/kr backplane autoneg next page received
+       [7] link status clear to read
+       [11:8] 10g signal detect (4 lanes) (for serial just lane 0)
+       [12] 10g serial signal detect
+       [16:13] 10g parallel lane sync status
+       [17] 10g parallel align status
+       [18] 1g sync status
+       [19] kx/kx4/kr backplane autoneg is idle
+       [20] 1g autoneg enabled
+       [21] 1g pcs enabled for sgmii
+       [22] 10g xgxs enabled
+       [23] 10g serial fec enabled (forward error detection)
+       [24] 10g kr pcs enabled
+       [25] sgmii enabled
+       [27:26] mac link mode
+       0 => 1g
+       1 => 10g parallel
+       2 => 10g serial
+       3 => autoneg
+       [29:28] link speed
+       1 => 100m
+       2 => 1g
+       3 => 10g
+       [30] link is up
+       [31] kx/kx4/kr backplane autoneg completed successfully. */
+    u32 link_status;
+
+    /* [17:16] pma/pmd for 10g serial
+       0 => kr, 2 => sfi
+       [18] disable dme pages */
+    u32 auto_negotiation_control2;
+
+      CLIB_PAD_FROM_TO (0x42ac, 0x42b0);
+    u32 link_partner_ability[2];
+      CLIB_PAD_FROM_TO (0x42b8, 0x42d0);
+    u32 manageability_control;
+    u32 link_partner_next_page[2];
+      CLIB_PAD_FROM_TO (0x42dc, 0x42e0);
+    u32 kr_pcs_control;
+    u32 kr_pcs_status;
+    u32 fec_status[2];
+      CLIB_PAD_FROM_TO (0x42f0, 0x4314);
+    u32 sgmii_control;
+      CLIB_PAD_FROM_TO (0x4318, 0x4324);
+    u32 link_status2;
+      CLIB_PAD_FROM_TO (0x4328, 0x4900);
+  } xge_mac;
+
+  u32 tx_dcb_control;
+  u32 tx_dcb_descriptor_plane_queue_select;
+  u32 tx_dcb_descriptor_plane_t1_config;
+  u32 tx_dcb_descriptor_plane_t1_status;
+    CLIB_PAD_FROM_TO (0x4910, 0x4950);
+
+  /* For each TC in units of 1k bytes. */
+  u32 tx_packet_buffer_thresholds[8];
+    CLIB_PAD_FROM_TO (0x4970, 0x4980);
+  struct
+  {
+    u32 mmw;
+    u32 config;
+    u32 status;
+    u32 rate_drift;
+  } dcb_tx_rate_scheduler;
+    CLIB_PAD_FROM_TO (0x4990, 0x4a80);
+  u32 tx_dma_control;
+    CLIB_PAD_FROM_TO (0x4a84, 0x4a88);
+  u32 tx_dma_tcp_flags_control[2];
+    CLIB_PAD_FROM_TO (0x4a90, 0x4b00);
+  u32 pf_mailbox[64];
+    CLIB_PAD_FROM_TO (0x4c00, 0x5000);
+
+  /* RX */
+  u32 checksum_control;
+    CLIB_PAD_FROM_TO (0x5004, 0x5008);
+  u32 rx_filter_control;
+    CLIB_PAD_FROM_TO (0x500c, 0x5010);
+  u32 management_vlan_tag[8];
+  u32 management_udp_tcp_ports[8];
+    CLIB_PAD_FROM_TO (0x5050, 0x5078);
+  /* little endian. */
+  u32 extended_vlan_ether_type;
+    CLIB_PAD_FROM_TO (0x507c, 0x5080);
+  /* [1] store/dma bad packets
+     [8] accept all multicast
+     [9] accept all unicast
+     [10] accept all broadcast. */
+  u32 filter_control;
+    CLIB_PAD_FROM_TO (0x5084, 0x5088);
+  /* [15:0] vlan ethernet type (0x8100) little endian
+     [28] cfi bit expected
+     [29] drop packets with unexpected cfi bit
+     [30] vlan filter enable. */
+  u32 vlan_control;
+    CLIB_PAD_FROM_TO (0x508c, 0x5090);
+  /* [1:0] hi bit of ethernet address for 12 bit index into multicast table
+     0 => 47, 1 => 46, 2 => 45, 3 => 43.
+     [2] enable multicast filter
+   */
+  u32 multicast_control;
+    CLIB_PAD_FROM_TO (0x5094, 0x5100);
+  u32 fcoe_rx_control;
+    CLIB_PAD_FROM_TO (0x5104, 0x5108);
+  u32 fc_flt_context;
+    CLIB_PAD_FROM_TO (0x510c, 0x5110);
+  u32 fc_filter_control;
+    CLIB_PAD_FROM_TO (0x5114, 0x5120);
+  u32 rx_message_type_lo;
+    CLIB_PAD_FROM_TO (0x5124, 0x5128);
+  /* [15:0] ethernet type (little endian)
+     [18:16] matche pri in vlan tag
+     [19] priority match enable
+     [25:20] virtualization pool
+     [26] pool enable
+     [27] is fcoe
+     [30] ieee 1588 timestamp enable
+     [31] filter enable.
+     (See ethernet_type_queue_select.) */
+  u32 ethernet_type_queue_filter[8];
+    CLIB_PAD_FROM_TO (0x5148, 0x5160);
+  /* [7:0] l2 ethernet type and
+     [15:8] l2 ethernet type or */
+  u32 management_decision_filters1[8];
+  u32 vf_vm_tx_switch_loopback_enable[2];
+  u32 rx_time_sync_control;
+    CLIB_PAD_FROM_TO (0x518c, 0x5190);
+  u32 management_ethernet_type_filters[4];
+  u32 rx_timestamp_attributes_lo;
+  u32 rx_timestamp_hi;
+  u32 rx_timestamp_attributes_hi;
+    CLIB_PAD_FROM_TO (0x51ac, 0x51b0);
+  u32 pf_virtual_control;
+    CLIB_PAD_FROM_TO (0x51b4, 0x51d8);
+  u32 fc_offset_parameter;
+    CLIB_PAD_FROM_TO (0x51dc, 0x51e0);
+  u32 vf_rx_enable[2];
+  u32 rx_timestamp_lo;
+    CLIB_PAD_FROM_TO (0x51ec, 0x5200);
+  /* 12 bits determined by multicast_control
+     lookup bits in this vector. */
+  u32 multicast_enable[128];
+
+  /* [0] ethernet address [31:0]
+     [1] [15:0] ethernet address [47:32]
+     [31] valid bit.
+     Index 0 is read from eeprom after reset. */
+  u32 rx_ethernet_address0[16][2];
+
+    CLIB_PAD_FROM_TO (0x5480, 0x5800);
+  u32 wake_up_control;
+    CLIB_PAD_FROM_TO (0x5804, 0x5808);
+  u32 wake_up_filter_control;
+    CLIB_PAD_FROM_TO (0x580c, 0x5818);
+  u32 multiple_rx_queue_command_82598;
+    CLIB_PAD_FROM_TO (0x581c, 0x5820);
+  u32 management_control;
+  u32 management_filter_control;
+    CLIB_PAD_FROM_TO (0x5828, 0x5838);
+  u32 wake_up_ip4_address_valid;
+    CLIB_PAD_FROM_TO (0x583c, 0x5840);
+  u32 wake_up_ip4_address_table[4];
+  u32 management_control_to_host;
+    CLIB_PAD_FROM_TO (0x5854, 0x5880);
+  u32 wake_up_ip6_address_table[4];
+
+  /* unicast_and broadcast_and vlan_and ip_address_and
+     etc. */
+  u32 management_decision_filters[8];
+
+  u32 management_ip4_or_ip6_address_filters[4][4];
+    CLIB_PAD_FROM_TO (0x58f0, 0x5900);
+  u32 wake_up_packet_length;
+    CLIB_PAD_FROM_TO (0x5904, 0x5910);
+  u32 management_ethernet_address_filters[4][2];
+    CLIB_PAD_FROM_TO (0x5930, 0x5a00);
+  u32 wake_up_packet_memory[32];
+    CLIB_PAD_FROM_TO (0x5a80, 0x5c00);
+  u32 redirection_table_82598[32];
+  u32 rss_random_keys_82598[10];
+    CLIB_PAD_FROM_TO (0x5ca8, 0x6000);
+
+  ixge_dma_regs_t tx_dma[128];
+
+  u32 pf_vm_vlan_insert[64];
+  u32 tx_dma_tcp_max_alloc_size_requests;
+    CLIB_PAD_FROM_TO (0x8104, 0x8110);
+  u32 vf_tx_enable[2];
+    CLIB_PAD_FROM_TO (0x8118, 0x8120);
+  /* [0] dcb mode enable
+     [1] virtualization mode enable
+     [3:2] number of tcs/qs per pool. */
+  u32 multiple_tx_queues_command;
+    CLIB_PAD_FROM_TO (0x8124, 0x8200);
+  u32 pf_vf_anti_spoof[8];
+  u32 pf_dma_tx_switch_control;
+    CLIB_PAD_FROM_TO (0x8224, 0x82e0);
+  u32 tx_strict_low_latency_queues[4];
+    CLIB_PAD_FROM_TO (0x82f0, 0x8600);
+  u32 tx_queue_stats_mapping_82599[32];
+  u32 tx_queue_packet_counts[32];
+  u32 tx_queue_byte_counts[32][2];
+
+  struct
+  {
+    u32 control;
+    u32 status;
+    u32 buffer_almost_full;
+      CLIB_PAD_FROM_TO (0x880c, 0x8810);
+    u32 buffer_min_ifg;
+      CLIB_PAD_FROM_TO (0x8814, 0x8900);
+  } tx_security;
+
+  struct
+  {
+    u32 index;
+    u32 salt;
+    u32 key[4];
+      CLIB_PAD_FROM_TO (0x8918, 0x8a00);
+  } tx_ipsec;
+
+  struct
+  {
+    u32 capabilities;
+    u32 control;
+    u32 tx_sci[2];
+    u32 sa;
+    u32 sa_pn[2];
+    u32 key[2][4];
+    /* untagged packets, encrypted packets, protected packets,
+       encrypted bytes, protected bytes */
+    u32 stats[5];
+      CLIB_PAD_FROM_TO (0x8a50, 0x8c00);
+  } tx_link_security;
+
+  struct
+  {
+    u32 control;
+    u32 timestamp_value[2];
+    u32 system_time[2];
+    u32 increment_attributes;
+    u32 time_adjustment_offset[2];
+    u32 aux_control;
+    u32 target_time[2][2];
+      CLIB_PAD_FROM_TO (0x8c34, 0x8c3c);
+    u32 aux_time_stamp[2][2];
+      CLIB_PAD_FROM_TO (0x8c4c, 0x8d00);
+  } tx_timesync;
+
+  struct
+  {
+    u32 control;
+    u32 status;
+      CLIB_PAD_FROM_TO (0x8d08, 0x8e00);
+  } rx_security;
+
+  struct
+  {
+    u32 index;
+    u32 ip_address[4];
+    u32 spi;
+    u32 ip_index;
+    u32 key[4];
+    u32 salt;
+    u32 mode;
+      CLIB_PAD_FROM_TO (0x8e34, 0x8f00);
+  } rx_ipsec;
+
+  struct
+  {
+    u32 capabilities;
+    u32 control;
+    u32 sci[2];
+    u32 sa[2];
+    u32 sa_pn[2];
+    u32 key[2][4];
+    /* see datasheet */
+    u32 stats[17];
+      CLIB_PAD_FROM_TO (0x8f84, 0x9000);
+  } rx_link_security;
+
+  /* 4 wake up, 2 management, 2 wake up. */
+  u32 flexible_filters[8][16][4];
+    CLIB_PAD_FROM_TO (0x9800, 0xa000);
+
+  /* 4096 bits. */
+  u32 vlan_filter[128];
+
+  /* [0] ethernet address [31:0]
+     [1] [15:0] ethernet address [47:32]
+     [31] valid bit.
+     Index 0 is read from eeprom after reset. */
+  u32 rx_ethernet_address1[128][2];
+
+  /* select one of 64 pools for each rx address. */
+  u32 rx_ethernet_address_pool_select[128][2];
+    CLIB_PAD_FROM_TO (0xaa00, 0xc800);
+  u32 tx_priority_to_traffic_class;
+    CLIB_PAD_FROM_TO (0xc804, 0xcc00);
+
+  /* In bytes units of 1k.  Total packet buffer is 160k. */
+  u32 tx_packet_buffer_size[8];
+
+    CLIB_PAD_FROM_TO (0xcc20, 0xcd10);
+  u32 tx_manageability_tc_mapping;
+    CLIB_PAD_FROM_TO (0xcd14, 0xcd20);
+  u32 dcb_tx_packet_plane_t2_config[8];
+  u32 dcb_tx_packet_plane_t2_status[8];
+    CLIB_PAD_FROM_TO (0xcd60, 0xce00);
+
+  u32 tx_flow_control_status;
+    CLIB_PAD_FROM_TO (0xce04, 0xd000);
+
+  ixge_dma_regs_t rx_dma1[64];
+
+  struct
+  {
+    /* Bigendian ip4 src/dst address. */
+    u32 src_address[128];
+    u32 dst_address[128];
+
+    /* TCP/UDP ports [15:0] src [31:16] dst; bigendian. */
+    u32 tcp_udp_port[128];
+
+    /* [1:0] protocol tcp, udp, sctp, other
+       [4:2] match priority (highest wins)
+       [13:8] pool
+       [25] src address match disable
+       [26] dst address match disable
+       [27] src port match disable
+       [28] dst port match disable
+       [29] protocol match disable
+       [30] pool match disable
+       [31] enable. */
+    u32 control[128];
+
+    /* [12] size bypass
+       [19:13] must be 0x80
+       [20] low-latency interrupt
+       [27:21] rx queue. */
+    u32 interrupt[128];
+  } ip4_filters;
+
+    CLIB_PAD_FROM_TO (0xea00, 0xeb00);
+  /* 4 bit rss output index indexed by 7 bit hash.
+     128 8 bit fields = 32 registers. */
+  u32 redirection_table_82599[32];
+
+  u32 rss_random_key_82599[10];
+    CLIB_PAD_FROM_TO (0xeba8, 0xec00);
+  /* [15:0] reserved
+     [22:16] rx queue index
+     [29] low-latency interrupt on match
+     [31] enable */
+  u32 ethernet_type_queue_select[8];
+    CLIB_PAD_FROM_TO (0xec20, 0xec30);
+  u32 syn_packet_queue_filter;
+    CLIB_PAD_FROM_TO (0xec34, 0xec60);
+  u32 immediate_interrupt_rx_vlan_priority;
+    CLIB_PAD_FROM_TO (0xec64, 0xec70);
+  u32 rss_queues_per_traffic_class;
+    CLIB_PAD_FROM_TO (0xec74, 0xec90);
+  u32 lli_size_threshold;
+    CLIB_PAD_FROM_TO (0xec94, 0xed00);
+
+  struct
+  {
+    u32 control;
+      CLIB_PAD_FROM_TO (0xed04, 0xed10);
+    u32 table[8];
+      CLIB_PAD_FROM_TO (0xed30, 0xee00);
+  } fcoe_redirection;
+
+  struct
+  {
+    /* [1:0] packet buffer allocation 0 => disabled, else 64k*2^(f-1)
+       [3] packet buffer initialization done
+       [4] perfetch match mode
+       [5] report status in rss field of rx descriptors
+       [7] report status always
+       [14:8] drop queue
+       [20:16] flex 2 byte packet offset (units of 2 bytes)
+       [27:24] max linked list length
+       [31:28] full threshold. */
+    u32 control;
+      CLIB_PAD_FROM_TO (0xee04, 0xee0c);
+
+    u32 data[8];
+
+    /* [1:0] 0 => no action, 1 => add, 2 => remove, 3 => query.
+       [2] valid filter found by query command
+       [3] filter update override
+       [4] ip6 adress table
+       [6:5] l4 protocol reserved, udp, tcp, sctp
+       [7] is ip6
+       [8] clear head/tail
+       [9] packet drop action
+       [10] matched packet generates low-latency interrupt
+       [11] last in linked list
+       [12] collision
+       [15] rx queue enable
+       [22:16] rx queue
+       [29:24] pool. */
+    u32 command;
+
+      CLIB_PAD_FROM_TO (0xee30, 0xee3c);
+    /* ip4 dst/src address, tcp ports, udp ports.
+       set bits mean bit is ignored. */
+    u32 ip4_masks[4];
+    u32 filter_length;
+    u32 usage_stats;
+    u32 failed_usage_stats;
+    u32 filters_match_stats;
+    u32 filters_miss_stats;
+      CLIB_PAD_FROM_TO (0xee60, 0xee68);
+    /* Lookup, signature. */
+    u32 hash_keys[2];
+    /* [15:0] ip6 src address 1 bit per byte
+       [31:16] ip6 dst address. */
+    u32 ip6_mask;
+    /* [0] vlan id
+       [1] vlan priority
+       [2] pool
+       [3] ip protocol
+       [4] flex
+       [5] dst ip6. */
+    u32 other_mask;
+      CLIB_PAD_FROM_TO (0xee78, 0xf000);
+  } flow_director;
+
+  struct
+  {
+    u32 l2_control[64];
+    u32 vlan_pool_filter[64];
+    u32 vlan_pool_filter_bitmap[128];
+    u32 dst_ethernet_address[128];
+    u32 mirror_rule[4];
+    u32 mirror_rule_vlan[8];
+    u32 mirror_rule_pool[8];
+      CLIB_PAD_FROM_TO (0xf650, 0x10010);
+  } pf_bar;
+
+  u32 eeprom_flash_control;
+  /* [0] start
+     [1] done
+     [15:2] address
+     [31:16] read data. */
+  u32 eeprom_read;
+    CLIB_PAD_FROM_TO (0x10018, 0x1001c);
+  u32 flash_access;
+    CLIB_PAD_FROM_TO (0x10020, 0x10114);
+  u32 flash_data;
+  u32 flash_control;
+  u32 flash_read_data;
+    CLIB_PAD_FROM_TO (0x10120, 0x1013c);
+  u32 flash_opcode;
+  u32 software_semaphore;
+    CLIB_PAD_FROM_TO (0x10144, 0x10148);
+  u32 firmware_semaphore;
+    CLIB_PAD_FROM_TO (0x1014c, 0x10160);
+  u32 software_firmware_sync;
+    CLIB_PAD_FROM_TO (0x10164, 0x10200);
+  u32 general_rx_control;
+    CLIB_PAD_FROM_TO (0x10204, 0x11000);
+
+  struct
+  {
+    u32 control;
+      CLIB_PAD_FROM_TO (0x11004, 0x11010);
+    /* [3:0] enable counters
+       [7:4] leaky bucket counter mode
+       [29] reset
+       [30] stop
+       [31] start. */
+    u32 counter_control;
+    /* [7:0],[15:8],[23:16],[31:24] event for counters 0-3.
+       event codes:
+       0x0 bad tlp
+       0x10 reqs that reached timeout
+       etc. */
+    u32 counter_event;
+      CLIB_PAD_FROM_TO (0x11018, 0x11020);
+    u32 counters_clear_on_read[4];
+    u32 counter_config[4];
+    struct
+    {
+      u32 address;
+      u32 data;
+    } indirect_access;
+      CLIB_PAD_FROM_TO (0x11048, 0x11050);
+    u32 extended_control;
+      CLIB_PAD_FROM_TO (0x11054, 0x11064);
+    u32 mirrored_revision_id;
+      CLIB_PAD_FROM_TO (0x11068, 0x11070);
+    u32 dca_requester_id_information;
+
+    /* [0] global disable
+       [4:1] mode: 0 => legacy, 1 => dca 1.0. */
+    u32 dca_control;
+      CLIB_PAD_FROM_TO (0x11078, 0x110b0);
+    /* [0] pci completion abort
+       [1] unsupported i/o address
+       [2] wrong byte enable
+       [3] pci timeout */
+    u32 pcie_interrupt_status;
+      CLIB_PAD_FROM_TO (0x110b4, 0x110b8);
+    u32 pcie_interrupt_enable;
+      CLIB_PAD_FROM_TO (0x110bc, 0x110c0);
+    u32 msi_x_pba_clear[8];
+      CLIB_PAD_FROM_TO (0x110e0, 0x12300);
+  } pcie;
+
+  u32 interrupt_throttle1[128 - 24];
+    CLIB_PAD_FROM_TO (0x124a0, 0x14f00);
+
+  u32 core_analog_config;
+    CLIB_PAD_FROM_TO (0x14f04, 0x14f10);
+  u32 core_common_config;
+    CLIB_PAD_FROM_TO (0x14f14, 0x15f14);
+
+  u32 link_sec_software_firmware_interface;
+} ixge_regs_t;
+
+typedef union
+{
+  struct
+  {
+    /* Addresses bigendian. */
+    union
+    {
+      struct
+      {
+	ip6_address_t src_address;
+	u32 unused[1];
+      } ip6;
+      struct
+      {
+	u32 unused[3];
+	ip4_address_t src_address, dst_address;
+      } ip4;
+    };
+
+    /* [15:0] src port (little endian).
+       [31:16] dst port. */
+    u32 tcp_udp_ports;
+
+    /* [15:0] vlan (cfi bit set to 0).
+       [31:16] flex bytes.  bigendian. */
+    u32 vlan_and_flex_word;
+
+    /* [14:0] hash
+       [15] bucket valid
+       [31:16] signature (signature filers)/sw-index (perfect match). */
+    u32 hash;
+  };
+
+  u32 as_u32[8];
+} ixge_flow_director_key_t;
+
+always_inline void
+ixge_throttle_queue_interrupt (ixge_regs_t * r,
+			       u32 queue_interrupt_index,
+			       f64 inter_interrupt_interval_in_secs)
+{
+  volatile u32 *tr =
+    (queue_interrupt_index < ARRAY_LEN (r->interrupt.throttle0)
+     ? &r->interrupt.throttle0[queue_interrupt_index]
+     : &r->interrupt_throttle1[queue_interrupt_index]);
+  ASSERT (queue_interrupt_index < 128);
+  u32 v;
+  i32 i, mask = (1 << 9) - 1;
+
+  i = flt_round_nearest (inter_interrupt_interval_in_secs / 2e-6);
+  i = i < 1 ? 1 : i;
+  i = i >= mask ? mask : i;
+
+  v = tr[0];
+  v &= ~(mask << 3);
+  v |= i << 3;
+  tr[0] = v;
+}
+
+#define foreach_ixge_counter				\
+  _ (0x40d0, rx_total_packets)				\
+  _64 (0x40c0, rx_total_bytes)				\
+  _ (0x41b0, rx_good_packets_before_filtering)		\
+  _64 (0x41b4, rx_good_bytes_before_filtering)		\
+  _ (0x2f50, rx_dma_good_packets)			\
+  _64 (0x2f54, rx_dma_good_bytes)			\
+  _ (0x2f5c, rx_dma_duplicated_good_packets)		\
+  _64 (0x2f60, rx_dma_duplicated_good_bytes)		\
+  _ (0x2f68, rx_dma_good_loopback_packets)		\
+  _64 (0x2f6c, rx_dma_good_loopback_bytes)		\
+  _ (0x2f74, rx_dma_good_duplicated_loopback_packets)	\
+  _64 (0x2f78, rx_dma_good_duplicated_loopback_bytes)	\
+  _ (0x4074, rx_good_packets)				\
+  _64 (0x4088, rx_good_bytes)				\
+  _ (0x407c, rx_multicast_packets)			\
+  _ (0x4078, rx_broadcast_packets)			\
+  _ (0x405c, rx_64_byte_packets)			\
+  _ (0x4060, rx_65_127_byte_packets)			\
+  _ (0x4064, rx_128_255_byte_packets)			\
+  _ (0x4068, rx_256_511_byte_packets)			\
+  _ (0x406c, rx_512_1023_byte_packets)			\
+  _ (0x4070, rx_gt_1023_byte_packets)			\
+  _ (0x4000, rx_crc_errors)				\
+  _ (0x4120, rx_ip_checksum_errors)			\
+  _ (0x4004, rx_illegal_symbol_errors)			\
+  _ (0x4008, rx_error_symbol_errors)			\
+  _ (0x4034, rx_mac_local_faults)			\
+  _ (0x4038, rx_mac_remote_faults)			\
+  _ (0x4040, rx_length_errors)				\
+  _ (0x41a4, rx_xons)					\
+  _ (0x41a8, rx_xoffs)					\
+  _ (0x40a4, rx_undersize_packets)			\
+  _ (0x40a8, rx_fragments)				\
+  _ (0x40ac, rx_oversize_packets)			\
+  _ (0x40b0, rx_jabbers)				\
+  _ (0x40b4, rx_management_packets)			\
+  _ (0x40b8, rx_management_drops)			\
+  _ (0x3fa0, rx_missed_packets_pool_0)			\
+  _ (0x40d4, tx_total_packets)				\
+  _ (0x4080, tx_good_packets)				\
+  _64 (0x4090, tx_good_bytes)				\
+  _ (0x40f0, tx_multicast_packets)			\
+  _ (0x40f4, tx_broadcast_packets)			\
+  _ (0x87a0, tx_dma_good_packets)			\
+  _64 (0x87a4, tx_dma_good_bytes)			\
+  _ (0x40d8, tx_64_byte_packets)			\
+  _ (0x40dc, tx_65_127_byte_packets)			\
+  _ (0x40e0, tx_128_255_byte_packets)			\
+  _ (0x40e4, tx_256_511_byte_packets)			\
+  _ (0x40e8, tx_512_1023_byte_packets)			\
+  _ (0x40ec, tx_gt_1023_byte_packets)			\
+  _ (0x4010, tx_undersize_drops)			\
+  _ (0x8780, switch_security_violation_packets)		\
+  _ (0x5118, fc_crc_errors)				\
+  _ (0x241c, fc_rx_drops)				\
+  _ (0x2424, fc_last_error_count)			\
+  _ (0x2428, fcoe_rx_packets)				\
+  _ (0x242c, fcoe_rx_dwords)				\
+  _ (0x8784, fcoe_tx_packets)				\
+  _ (0x8788, fcoe_tx_dwords)				\
+  _ (0x1030, queue_0_rx_count)				\
+  _ (0x1430, queue_0_drop_count)			\
+  _ (0x1070, queue_1_rx_count)				\
+  _ (0x1470, queue_1_drop_count)			\
+  _ (0x10b0, queue_2_rx_count)				\
+  _ (0x14b0, queue_2_drop_count)			\
+  _ (0x10f0, queue_3_rx_count)				\
+  _ (0x14f0, queue_3_drop_count)			\
+  _ (0x1130, queue_4_rx_count)				\
+  _ (0x1530, queue_4_drop_count)			\
+  _ (0x1170, queue_5_rx_count)				\
+  _ (0x1570, queue_5_drop_count)			\
+  _ (0x11b0, queue_6_rx_count)				\
+  _ (0x15b0, queue_6_drop_count)			\
+  _ (0x11f0, queue_7_rx_count)				\
+  _ (0x15f0, queue_7_drop_count)			\
+  _ (0x1230, queue_8_rx_count)				\
+  _ (0x1630, queue_8_drop_count)			\
+  _ (0x1270, queue_9_rx_count)				\
+  _ (0x1270, queue_9_drop_count)
+
+
+
+
+typedef enum
+{
+#define _(a,f) IXGE_COUNTER_##f,
+#define _64(a,f) _(a,f)
+  foreach_ixge_counter
+#undef _
+#undef _64
+    IXGE_N_COUNTER,
+} ixge_counter_type_t;
+
+typedef struct
+{
+  u32 mdio_address;
+
+  /* 32 bit ID read from ID registers. */
+  u32 id;
+} ixge_phy_t;
+
+typedef struct
+{
+  /* Cache aligned descriptors. */
+  ixge_descriptor_t *descriptors;
+
+  /* Number of descriptors in table. */
+  u32 n_descriptors;
+
+  /* Software head and tail pointers into descriptor ring. */
+  u32 head_index, tail_index;
+
+  /* Index into dma_queues vector. */
+  u32 queue_index;
+
+  /* Buffer indices corresponding to each active descriptor. */
+  u32 *descriptor_buffer_indices;
+
+  union
+  {
+    struct
+    {
+      u32 *volatile head_index_write_back;
+
+      u32 n_buffers_on_ring;
+    } tx;
+
+    struct
+    {
+      /* Buffer indices to use to replenish each descriptor. */
+      u32 *replenish_buffer_indices;
+
+      vlib_node_runtime_t *node;
+      u32 next_index;
+
+      u32 saved_start_of_packet_buffer_index;
+
+      u32 saved_start_of_packet_next_index;
+      u32 saved_last_buffer_index;
+
+      u32 is_start_of_packet;
+
+      u32 n_descriptors_done_total;
+
+      u32 n_descriptors_done_this_call;
+
+      u32 n_bytes;
+    } rx;
+  };
+} ixge_dma_queue_t;
+
+#define foreach_ixge_pci_device_id		\
+  _ (82598, 0x10b6)				\
+  _ (82598_bx, 0x1508)				\
+  _ (82598af_dual_port, 0x10c6)			\
+  _ (82598af_single_port, 0x10c7)		\
+  _ (82598at, 0x10c8)				\
+  _ (82598at2, 0x150b)				\
+  _ (82598eb_sfp_lom, 0x10db)			\
+  _ (82598eb_cx4, 0x10dd)			\
+  _ (82598_cx4_dual_port, 0x10ec)		\
+  _ (82598_da_dual_port, 0x10f1)		\
+  _ (82598_sr_dual_port_em, 0x10e1)		\
+  _ (82598eb_xf_lr, 0x10f4)			\
+  _ (82599_kx4, 0x10f7)				\
+  _ (82599_kx4_mezz, 0x1514)			\
+  _ (82599_kr, 0x1517)				\
+  _ (82599_combo_backplane, 0x10f8)		\
+  _ (82599_cx4, 0x10f9)				\
+  _ (82599_sfp, 0x10fb)				\
+  _ (82599_backplane_fcoe, 0x152a)		\
+  _ (82599_sfp_fcoe, 0x1529)			\
+  _ (82599_sfp_em, 0x1507)			\
+  _ (82599_xaui_lom, 0x10fc)			\
+  _ (82599_t3_lom, 0x151c)			\
+  _ (x540t, 0x1528)
+
+typedef enum
+{
+#define _(f,n) IXGE_##f = n,
+  foreach_ixge_pci_device_id
+#undef _
+} ixge_pci_device_id_t;
+
+typedef struct
+{
+  /* registers */
+  ixge_regs_t *regs;
+
+  /* Specific next index when using dynamic redirection */
+  u32 per_interface_next_index;
+
+  /* PCI bus info. */
+  vlib_pci_device_t pci_device;
+
+  /* From PCI config space header. */
+  ixge_pci_device_id_t device_id;
+
+  u16 device_index;
+
+  /* 0 or 1. */
+  u16 pci_function;
+
+  /* VLIB interface for this instance. */
+  u32 vlib_hw_if_index, vlib_sw_if_index;
+
+  ixge_dma_queue_t *dma_queues[VLIB_N_RX_TX];
+
+  /* Phy index (0 or 1) and address on MDI bus. */
+  u32 phy_index;
+  ixge_phy_t phys[2];
+
+  /* Value of link_status register at last link change. */
+  u32 link_status_at_last_link_change;
+
+  i2c_bus_t i2c_bus;
+  sfp_eeprom_t sfp_eeprom;
+
+  /* Counters. */
+  u64 counters[IXGE_N_COUNTER], counters_last_clear[IXGE_N_COUNTER];
+} ixge_device_t;
+
+typedef struct
+{
+  vlib_main_t *vlib_main;
+
+  /* Vector of devices. */
+  ixge_device_t *devices;
+
+  /* Descriptor ring sizes. */
+  u32 n_descriptors[VLIB_N_RX_TX];
+
+  /* RX buffer size.  Must be at least 1k; will be rounded to
+     next largest 1k size. */
+  u32 n_bytes_in_rx_buffer;
+
+  u32 n_descriptors_per_cache_line;
+
+  u32 vlib_buffer_free_list_index;
+
+  u32 process_node_index;
+
+  /* Template and mask for initializing/validating TX descriptors. */
+  ixge_tx_descriptor_t tx_descriptor_template, tx_descriptor_template_mask;
+
+  /* Vector of buffers for which TX is done and can be freed. */
+  u32 *tx_buffers_pending_free;
+
+  u32 *rx_buffers_to_add;
+
+  f64 time_last_stats_update;
+} ixge_main_t;
+
+ixge_main_t ixge_main;
+vnet_device_class_t ixge_device_class;
+
+typedef enum
+{
+  IXGE_RX_NEXT_IP4_INPUT,
+  IXGE_RX_NEXT_IP6_INPUT,
+  IXGE_RX_NEXT_ETHERNET_INPUT,
+  IXGE_RX_NEXT_DROP,
+  IXGE_RX_N_NEXT,
+} ixge_rx_next_t;
+
+void ixge_set_next_node (ixge_rx_next_t, char *);
+
+#endif /* included_ixge_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/nic/sfp.c b/src/vnet/devices/nic/sfp.c
new file mode 100644
index 00000000..9e9c008d
--- /dev/null
+++ b/src/vnet/devices/nic/sfp.c
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/devices/nic/sfp.h>
+
+static u8 *
+format_space_terminated (u8 * s, va_list * args)
+{
+  u32 l = va_arg (*args, u32);
+  u8 *v = va_arg (*args, u8 *);
+  u8 *p;
+
+  for (p = v + l - 1; p >= v && p[0] == ' '; p--)
+    ;
+  vec_add (s, v, clib_min (p - v + 1, l));
+  return s;
+}
+
+static u8 *
+format_sfp_id (u8 * s, va_list * args)
+{
+  u32 id = va_arg (*args, u32);
+  char *t = 0;
+  switch (id)
+    {
+#define _(f) case SFP_ID_##f: t = #f; break;
+      foreach_sfp_id
+#undef _
+    default:
+      return format (s, "unknown 0x%x", id);
+    }
+  return format (s, "%s", t);
+}
+
+static u8 *
+format_sfp_compatibility (u8 * s, va_list * args)
+{
+  u32 c = va_arg (*args, u32);
+  char *t = 0;
+  switch (c)
+    {
+#define _(a,b,f) case SFP_COMPATIBILITY_##f: t = #f; break;
+      foreach_sfp_compatibility
+#undef _
+    default:
+      return format (s, "unknown 0x%x", c);
+    }
+  return format (s, "%s", t);
+}
+
+u32
+sfp_is_comatible (sfp_eeprom_t * e, sfp_compatibility_t c)
+{
+  static struct
+  {
+    u8 byte, bit;
+  } t[] =
+  {
+#define _(a,b,f) { .byte = a, .bit = b, },
+    foreach_sfp_compatibility
+#undef _
+  };
+
+  ASSERT (c < ARRAY_LEN (t));
+  return (e->compatibility[t[c].byte] & (1 << t[c].bit)) != 0;
+}
+
+u8 *
+format_sfp_eeprom (u8 * s, va_list * args)
+{
+  sfp_eeprom_t *e = va_arg (*args, sfp_eeprom_t *);
+  uword indent = format_get_indent (s);
+  int i;
+
+  if (e->id != SFP_ID_sfp)
+    s = format (s, "id %U, ", format_sfp_id, e->id);
+
+  s = format (s, "compatibility:");
+  for (i = 0; i < SFP_N_COMPATIBILITY; i++)
+    if (sfp_is_comatible (e, i))
+      s = format (s, " %U", format_sfp_compatibility, i);
+
+  s = format (s, "\n%Uvendor: %U, part %U",
+	      format_white_space, indent,
+	      format_space_terminated, sizeof (e->vendor_name),
+	      e->vendor_name, format_space_terminated,
+	      sizeof (e->vendor_part_number), e->vendor_part_number);
+  s =
+    format (s, "\n%Urevision: %U, serial: %U, date code: %U",
+	    format_white_space, indent, format_space_terminated,
+	    sizeof (e->vendor_revision), e->vendor_revision,
+	    format_space_terminated, sizeof (e->vendor_serial_number),
+	    e->vendor_serial_number, format_space_terminated,
+	    sizeof (e->vendor_date_code), e->vendor_date_code);
+
+  return s;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/nic/sfp.h b/src/vnet/devices/nic/sfp.h
new file mode 100644
index 00000000..a1ac7997
--- /dev/null
+++ b/src/vnet/devices/nic/sfp.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_vnet_optics_sfp_h
+#define included_vnet_optics_sfp_h
+
+#include <vppinfra/format.h>
+
+#define foreach_sfp_id				\
+  _ (unknown)					\
+  _ (gbic)					\
+  _ (on_motherboard)				\
+  _ (sfp)
+
+typedef enum
+{
+#define _(f) SFP_ID_##f,
+  foreach_sfp_id
+#undef _
+} sfp_id_t;
+
+typedef struct
+{
+  u8 id;
+  u8 extended_id;
+  u8 connector_type;
+  u8 compatibility[8];
+  u8 encoding;
+  u8 nominal_bit_rate_100mbits_per_sec;
+  u8 reserved13;
+  u8 link_length[5];
+  u8 reserved19;
+  u8 vendor_name[16];
+  u8 reserved36;
+  u8 vendor_oui[3];
+  u8 vendor_part_number[16];
+  u8 vendor_revision[4];
+  /* 16 bit value network byte order. */
+  u8 laser_wavelength_in_nm[2];
+  u8 reserved62;
+  u8 checksum_0_to_62;
+
+  u8 options[2];
+  u8 max_bit_rate_margin_percent;
+  u8 min_bit_rate_margin_percent;
+  u8 vendor_serial_number[16];
+  u8 vendor_date_code[8];
+  u8 reserved92[3];
+  u8 checksum_63_to_94;
+  u8 vendor_specific[32];
+  u8 reserved128[384];
+
+  /* Vendor specific data follows. */
+  u8 vendor_specific1[0];
+} sfp_eeprom_t;
+
+always_inline uword
+sfp_eeprom_is_valid (sfp_eeprom_t * e)
+{
+  int i;
+  u8 sum = 0;
+  for (i = 0; i < 63; i++)
+    sum += ((u8 *) e)[i];
+  return sum == e->checksum_0_to_62;
+}
+
+/* _ (byte_index, bit_index, name) */
+#define foreach_sfp_compatibility		\
+  _ (0, 4, 10g_base_sr)				\
+  _ (0, 5, 10g_base_lr)				\
+  _ (1, 2, oc48_long_reach)			\
+  _ (1, 1, oc48_intermediate_reach)		\
+  _ (1, 0, oc48_short_reach)			\
+  _ (2, 6, oc12_long_reach)			\
+  _ (2, 5, oc12_intermediate_reach)		\
+  _ (2, 4, oc12_short_reach)			\
+  _ (2, 2, oc3_long_reach)			\
+  _ (2, 1, oc3_intermediate_reach)		\
+  _ (2, 0, oc3_short_reach)			\
+  _ (3, 3, 1g_base_t)				\
+  _ (3, 2, 1g_base_cx)				\
+  _ (3, 1, 1g_base_lx)				\
+  _ (3, 0, 1g_base_sx)
+
+typedef enum
+{
+#define _(a,b,f) SFP_COMPATIBILITY_##f,
+  foreach_sfp_compatibility
+#undef _
+    SFP_N_COMPATIBILITY,
+} sfp_compatibility_t;
+
+u32 sfp_is_comatible (sfp_eeprom_t * e, sfp_compatibility_t c);
+
+format_function_t format_sfp_eeprom;
+
+#endif /* included_vnet_optics_sfp_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/ssvm/node.c b/src/vnet/devices/ssvm/node.c
new file mode 100644
index 00000000..3a695b1d
--- /dev/null
+++ b/src/vnet/devices/ssvm/node.c
@@ -0,0 +1,343 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "ssvm_eth.h"
+
+vlib_node_registration_t ssvm_eth_input_node;
+
+typedef struct
+{
+  u32 next_index;
+  u32 sw_if_index;
+} ssvm_eth_input_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_ssvm_eth_input_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ssvm_eth_input_trace_t *t = va_arg (*args, ssvm_eth_input_trace_t *);
+
+  s = format (s, "SSVM_ETH_INPUT: sw_if_index %d, next index %d",
+	      t->sw_if_index, t->next_index);
+  return s;
+}
+
+vlib_node_registration_t ssvm_eth_input_node;
+
+#define foreach_ssvm_eth_input_error \
+_(NO_BUFFERS, "Rx packet drops (no buffers)")
+
+typedef enum
+{
+#define _(sym,str) SSVM_ETH_INPUT_ERROR_##sym,
+  foreach_ssvm_eth_input_error
+#undef _
+    SSVM_ETH_INPUT_N_ERROR,
+} ssvm_eth_input_error_t;
+
+static char *ssvm_eth_input_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ssvm_eth_input_error
+#undef _
+};
+
+typedef enum
+{
+  SSVM_ETH_INPUT_NEXT_DROP,
+  SSVM_ETH_INPUT_NEXT_ETHERNET_INPUT,
+  SSVM_ETH_INPUT_NEXT_IP4_INPUT,
+  SSVM_ETH_INPUT_NEXT_IP6_INPUT,
+  SSVM_ETH_INPUT_NEXT_MPLS_INPUT,
+  SSVM_ETH_INPUT_N_NEXT,
+} ssvm_eth_input_next_t;
+
+static inline uword
+ssvm_eth_device_input (ssvm_eth_main_t * em,
+		       ssvm_private_t * intfc, vlib_node_runtime_t * node)
+{
+  ssvm_shared_header_t *sh = intfc->sh;
+  vlib_main_t *vm = em->vlib_main;
+  unix_shared_memory_queue_t *q;
+  ssvm_eth_queue_elt_t *elt, *elts;
+  u32 elt_index;
+  u32 my_pid = intfc->my_pid;
+  int rx_queue_index;
+  u32 n_to_alloc = VLIB_FRAME_SIZE * 2;
+  u32 n_allocated, n_present_in_cache;
+  u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
+  vlib_buffer_free_list_t *fl;
+  u32 n_left_to_next, *to_next;
+  u32 next0;
+  u32 n_buffers;
+  u32 n_available;
+  u32 bi0, saved_bi0;
+  vlib_buffer_t *b0, *prev;
+  u32 saved_cache_size = 0;
+  ethernet_header_t *eh0;
+  u16 type0;
+  u32 n_rx_bytes = 0, l3_offset0;
+  u32 cpu_index = os_get_cpu_number ();
+  u32 trace_cnt __attribute__ ((unused)) = vlib_get_trace_count (vm, node);
+  volatile u32 *lock;
+  u32 *elt_indices;
+  uword n_trace = vlib_get_trace_count (vm, node);
+
+  /* Either side down? buh-bye... */
+  if (pointer_to_uword (sh->opaque[MASTER_ADMIN_STATE_INDEX]) == 0 ||
+      pointer_to_uword (sh->opaque[SLAVE_ADMIN_STATE_INDEX]) == 0)
+    return 0;
+
+  if (intfc->i_am_master)
+    q = (unix_shared_memory_queue_t *) (sh->opaque[TO_MASTER_Q_INDEX]);
+  else
+    q = (unix_shared_memory_queue_t *) (sh->opaque[TO_SLAVE_Q_INDEX]);
+
+  /* Nothing to do? */
+  if (q->cursize == 0)
+    return 0;
+
+  fl = vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+
+  vec_reset_length (intfc->rx_queue);
+
+  lock = (u32 *) q;
+  while (__sync_lock_test_and_set (lock, 1))
+    ;
+  while (q->cursize > 0)
+    {
+      unix_shared_memory_queue_sub_raw (q, (u8 *) & elt_index);
+      ASSERT (elt_index < 2048);
+      vec_add1 (intfc->rx_queue, elt_index);
+    }
+  CLIB_MEMORY_BARRIER ();
+  *lock = 0;
+
+  n_present_in_cache = vec_len (em->buffer_cache);
+
+  if (vec_len (em->buffer_cache) < vec_len (intfc->rx_queue) * 2)
+    {
+      vec_validate (em->buffer_cache,
+		    n_to_alloc + vec_len (em->buffer_cache) - 1);
+      n_allocated =
+	vlib_buffer_alloc (vm, &em->buffer_cache[n_present_in_cache],
+			   n_to_alloc);
+
+      n_present_in_cache += n_allocated;
+      _vec_len (em->buffer_cache) = n_present_in_cache;
+    }
+
+  elts = (ssvm_eth_queue_elt_t *) (sh->opaque[CHUNK_POOL_INDEX]);
+
+  n_buffers = vec_len (intfc->rx_queue);
+  rx_queue_index = 0;
+
+  while (n_buffers > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_buffers > 0 && n_left_to_next > 0)
+	{
+	  elt = elts + intfc->rx_queue[rx_queue_index];
+
+	  saved_cache_size = n_present_in_cache;
+	  if (PREDICT_FALSE (saved_cache_size == 0))
+	    {
+	      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+	      goto out;
+	    }
+	  saved_bi0 = bi0 = em->buffer_cache[--n_present_in_cache];
+	  b0 = vlib_get_buffer (vm, bi0);
+	  prev = 0;
+
+	  while (1)
+	    {
+	      vlib_buffer_init_for_free_list (b0, fl);
+
+	      b0->current_data = elt->current_data_hint;
+	      b0->current_length = elt->length_this_buffer;
+	      b0->total_length_not_including_first_buffer =
+		elt->total_length_not_including_first_buffer;
+
+	      clib_memcpy (b0->data + b0->current_data, elt->data,
+			   b0->current_length);
+
+	      if (PREDICT_FALSE (prev != 0))
+		prev->next_buffer = bi0;
+
+	      if (PREDICT_FALSE (elt->flags & SSVM_BUFFER_NEXT_PRESENT))
+		{
+		  prev = b0;
+		  if (PREDICT_FALSE (n_present_in_cache == 0))
+		    {
+		      vlib_put_next_frame (vm, node, next_index,
+					   n_left_to_next);
+		      goto out;
+		    }
+		  bi0 = em->buffer_cache[--n_present_in_cache];
+		  b0 = vlib_get_buffer (vm, bi0);
+		}
+	      else
+		break;
+	    }
+
+	  saved_cache_size = n_present_in_cache;
+
+	  to_next[0] = saved_bi0;
+	  to_next++;
+	  n_left_to_next--;
+
+	  b0 = vlib_get_buffer (vm, saved_bi0);
+	  eh0 = vlib_buffer_get_current (b0);
+
+	  type0 = clib_net_to_host_u16 (eh0->type);
+
+	  next0 = SSVM_ETH_INPUT_NEXT_ETHERNET_INPUT;
+
+	  if (type0 == ETHERNET_TYPE_IP4)
+	    next0 = SSVM_ETH_INPUT_NEXT_IP4_INPUT;
+	  else if (type0 == ETHERNET_TYPE_IP6)
+	    next0 = SSVM_ETH_INPUT_NEXT_IP6_INPUT;
+	  else if (type0 == ETHERNET_TYPE_MPLS_UNICAST)
+	    next0 = SSVM_ETH_INPUT_NEXT_MPLS_INPUT;
+
+	  l3_offset0 = ((next0 == SSVM_ETH_INPUT_NEXT_IP4_INPUT ||
+			 next0 == SSVM_ETH_INPUT_NEXT_IP6_INPUT ||
+			 next0 == SSVM_ETH_INPUT_NEXT_MPLS_INPUT) ?
+			sizeof (ethernet_header_t) : 0);
+
+	  n_rx_bytes += b0->current_length
+	    + b0->total_length_not_including_first_buffer;
+
+	  b0->current_data += l3_offset0;
+	  b0->current_length -= l3_offset0;
+	  b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = intfc->vlib_hw_if_index;
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+
+	  /*
+	   * Turn this on if you run into
+	   * "bad monkey" contexts, and you want to know exactly
+	   * which nodes they've visited... See main.c...
+	   */
+	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+
+	  if (PREDICT_FALSE (n_trace > 0))
+	    {
+	      ssvm_eth_input_trace_t *tr;
+
+	      vlib_trace_buffer (vm, node, next0, b0, /* follow_chain */ 1);
+	      vlib_set_trace_count (vm, node, --n_trace);
+
+	      tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
+
+	      tr->next_index = next0;
+	      tr->sw_if_index = intfc->vlib_hw_if_index;
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	  n_buffers--;
+	  rx_queue_index++;
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+out:
+  if (em->buffer_cache)
+    _vec_len (em->buffer_cache) = saved_cache_size;
+  else
+    ASSERT (saved_cache_size == 0);
+
+  ssvm_lock (sh, my_pid, 2);
+
+  ASSERT (vec_len (intfc->rx_queue) > 0);
+
+  n_available = (u32) pointer_to_uword (sh->opaque[CHUNK_POOL_NFREE]);
+  elt_indices = (u32 *) (sh->opaque[CHUNK_POOL_FREELIST_INDEX]);
+
+  clib_memcpy (&elt_indices[n_available], intfc->rx_queue,
+	       vec_len (intfc->rx_queue) * sizeof (u32));
+
+  n_available += vec_len (intfc->rx_queue);
+  sh->opaque[CHUNK_POOL_NFREE] = uword_to_pointer (n_available, void *);
+
+  ssvm_unlock (sh);
+
+  vlib_error_count (vm, node->node_index, SSVM_ETH_INPUT_ERROR_NO_BUFFERS,
+		    n_buffers);
+
+  vlib_increment_combined_counter
+    (vnet_get_main ()->interface_main.combined_sw_if_counters
+     + VNET_INTERFACE_COUNTER_RX, cpu_index,
+     intfc->vlib_hw_if_index, rx_queue_index, n_rx_bytes);
+
+  return rx_queue_index;
+}
+
+static uword
+ssvm_eth_input_node_fn (vlib_main_t * vm,
+			vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  ssvm_eth_main_t *em = &ssvm_eth_main;
+  ssvm_private_t *intfc;
+  uword n_rx_packets = 0;
+
+  vec_foreach (intfc, em->intfcs)
+  {
+    n_rx_packets += ssvm_eth_device_input (em, intfc, node);
+  }
+
+  return n_rx_packets;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ssvm_eth_input_node) = {
+  .function = ssvm_eth_input_node_fn,
+  .name = "ssvm_eth_input",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ssvm_eth_input_trace,
+  .type = VLIB_NODE_TYPE_INPUT,
+  .state = VLIB_NODE_STATE_DISABLED,
+
+  .n_errors = ARRAY_LEN(ssvm_eth_input_error_strings),
+  .error_strings = ssvm_eth_input_error_strings,
+
+  .n_next_nodes = SSVM_ETH_INPUT_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+        [SSVM_ETH_INPUT_NEXT_DROP] = "error-drop",
+        [SSVM_ETH_INPUT_NEXT_ETHERNET_INPUT] = "ethernet-input",
+        [SSVM_ETH_INPUT_NEXT_IP4_INPUT] = "ip4-input",
+        [SSVM_ETH_INPUT_NEXT_IP6_INPUT] = "ip6-input",
+        [SSVM_ETH_INPUT_NEXT_MPLS_INPUT] = "mpls-input",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ssvm_eth_input_node, ssvm_eth_input_node_fn)
+/* *INDENT-ON* */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/ssvm/ssvm_eth.c b/src/vnet/devices/ssvm/ssvm_eth.c
new file mode 100644
index 00000000..db4fafa9
--- /dev/null
+++ b/src/vnet/devices/ssvm/ssvm_eth.c
@@ -0,0 +1,491 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "ssvm_eth.h"
+
+ssvm_eth_main_t ssvm_eth_main;
+
+#define foreach_ssvm_eth_tx_func_error          \
+_(RING_FULL, "Tx packet drops (ring full)")     \
+_(NO_BUFFERS, "Tx packet drops (no buffers)")   \
+_(ADMIN_DOWN, "Tx packet drops (admin down)")
+
+typedef enum
+{
+#define _(f,s) SSVM_ETH_TX_ERROR_##f,
+  foreach_ssvm_eth_tx_func_error
+#undef _
+    SSVM_ETH_TX_N_ERROR,
+} ssvm_eth_tx_func_error_t;
+
+static u32 ssvm_eth_flag_change (vnet_main_t * vnm,
+				 vnet_hw_interface_t * hi, u32 flags);
+
+int
+ssvm_eth_create (ssvm_eth_main_t * em, u8 * name, int is_master)
+{
+  ssvm_private_t *intfc;
+  void *oldheap;
+  clib_error_t *e;
+  unix_shared_memory_queue_t *q;
+  ssvm_shared_header_t *sh;
+  ssvm_eth_queue_elt_t *elts;
+  u32 *elt_indices;
+  u8 enet_addr[6];
+  int i, rv;
+
+  vec_add2 (em->intfcs, intfc, 1);
+
+  intfc->ssvm_size = em->segment_size;
+  intfc->i_am_master = 1;
+  intfc->name = name;
+  intfc->my_pid = getpid ();
+  if (is_master == 0)
+    {
+      rv = ssvm_slave_init (intfc, 20 /* timeout in seconds */ );
+      if (rv < 0)
+	return rv;
+      goto create_vnet_interface;
+    }
+
+  intfc->requested_va = em->next_base_va;
+  em->next_base_va += em->segment_size;
+  rv = ssvm_master_init (intfc, intfc - em->intfcs /* master index */ );
+
+  if (rv < 0)
+    return rv;
+
+  /* OK, segment created, set up queues and so forth.  */
+
+  sh = intfc->sh;
+  oldheap = ssvm_push_heap (sh);
+
+  q = unix_shared_memory_queue_init (em->queue_elts, sizeof (u32),
+				     0 /* consumer pid not interesting */ ,
+				     0 /* signal not sent */ );
+  sh->opaque[TO_MASTER_Q_INDEX] = (void *) q;
+  q = unix_shared_memory_queue_init (em->queue_elts, sizeof (u32),
+				     0 /* consumer pid not interesting */ ,
+				     0 /* signal not sent */ );
+  sh->opaque[TO_SLAVE_Q_INDEX] = (void *) q;
+
+  /*
+   * Preallocate the requested number of buffer chunks
+   * There must be a better way to do this, etc.
+   * Add some slop to avoid pool reallocation, which will not go well
+   */
+  elts = 0;
+  elt_indices = 0;
+
+  vec_validate_aligned (elts, em->nbuffers - 1, CLIB_CACHE_LINE_BYTES);
+  vec_validate_aligned (elt_indices, em->nbuffers - 1, CLIB_CACHE_LINE_BYTES);
+
+  for (i = 0; i < em->nbuffers; i++)
+    elt_indices[i] = i;
+
+  sh->opaque[CHUNK_POOL_INDEX] = (void *) elts;
+  sh->opaque[CHUNK_POOL_FREELIST_INDEX] = (void *) elt_indices;
+  sh->opaque[CHUNK_POOL_NFREE] = (void *) (uword) em->nbuffers;
+
+  ssvm_pop_heap (oldheap);
+
+create_vnet_interface:
+
+  sh = intfc->sh;
+
+  memset (enet_addr, 0, sizeof (enet_addr));
+  enet_addr[0] = 2;
+  enet_addr[1] = 0xFE;
+  enet_addr[2] = is_master;
+  enet_addr[5] = sh->master_index;
+
+  e = ethernet_register_interface
+    (em->vnet_main, ssvm_eth_device_class.index, intfc - em->intfcs,
+     /* ethernet address */ enet_addr,
+     &intfc->vlib_hw_if_index, ssvm_eth_flag_change);
+
+  if (e)
+    {
+      clib_error_report (e);
+      /* $$$$ unmap offending region? */
+      return VNET_API_ERROR_INVALID_INTERFACE;
+    }
+
+  /* Declare link up */
+  vnet_hw_interface_set_flags (em->vnet_main, intfc->vlib_hw_if_index,
+			       VNET_HW_INTERFACE_FLAG_LINK_UP);
+
+  /* Let the games begin... */
+  if (is_master)
+    sh->ready = 1;
+  return 0;
+}
+
+static clib_error_t *
+ssvm_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  u8 *name;
+  int is_master = 1;
+  int i, rv;
+  ssvm_eth_main_t *em = &ssvm_eth_main;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "base-va %llx", &em->next_base_va))
+	;
+      else if (unformat (input, "segment-size %lld", &em->segment_size))
+	em->segment_size = 1ULL << (max_log2 (em->segment_size));
+      else if (unformat (input, "nbuffers %lld", &em->nbuffers))
+	;
+      else if (unformat (input, "queue-elts %lld", &em->queue_elts))
+	;
+      else if (unformat (input, "slave"))
+	is_master = 0;
+      else if (unformat (input, "%s", &name))
+	vec_add1 (em->names, name);
+      else
+	break;
+    }
+
+  /* No configured instances, we're done... */
+  if (vec_len (em->names) == 0)
+    return 0;
+
+  for (i = 0; i < vec_len (em->names); i++)
+    {
+      rv = ssvm_eth_create (em, em->names[i], is_master);
+      if (rv < 0)
+	return clib_error_return (0, "ssvm_eth_create '%s' failed, error %d",
+				  em->names[i], rv);
+    }
+
+  vlib_node_set_state (vm, ssvm_eth_input_node.index,
+		       VLIB_NODE_STATE_POLLING);
+
+  return 0;
+}
+
+VLIB_CONFIG_FUNCTION (ssvm_config, "ssvm_eth");
+
+
+static clib_error_t *
+ssvm_eth_init (vlib_main_t * vm)
+{
+  ssvm_eth_main_t *em = &ssvm_eth_main;
+
+  if (((sizeof (ssvm_eth_queue_elt_t) / CLIB_CACHE_LINE_BYTES)
+       * CLIB_CACHE_LINE_BYTES) != sizeof (ssvm_eth_queue_elt_t))
+    clib_warning ("ssvm_eth_queue_elt_t size %d not a multiple of %d",
+		  sizeof (ssvm_eth_queue_elt_t), CLIB_CACHE_LINE_BYTES);
+
+  em->vlib_main = vm;
+  em->vnet_main = vnet_get_main ();
+  em->elog_main = &vm->elog_main;
+
+  /* default config param values... */
+
+  em->next_base_va = 0x600000000ULL;
+  /*
+   * Allocate 2 full superframes in each dir (256 x 2 x 2 x 2048 bytes),
+   * 2mb; double that so we have plenty of space... 4mb
+   */
+  em->segment_size = 8 << 20;
+  em->nbuffers = 1024;
+  em->queue_elts = 512;
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ssvm_eth_init);
+
+static char *ssvm_eth_tx_func_error_strings[] = {
+#define _(n,s) s,
+  foreach_ssvm_eth_tx_func_error
+#undef _
+};
+
+static u8 *
+format_ssvm_eth_device_name (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+
+  s = format (s, "ssvmEthernet%d", i);
+  return s;
+}
+
+static u8 *
+format_ssvm_eth_device (u8 * s, va_list * args)
+{
+  s = format (s, "SSVM Ethernet");
+  return s;
+}
+
+static u8 *
+format_ssvm_eth_tx_trace (u8 * s, va_list * args)
+{
+  s = format (s, "Unimplemented...");
+  return s;
+}
+
+
+static uword
+ssvm_eth_interface_tx (vlib_main_t * vm,
+		       vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  ssvm_eth_main_t *em = &ssvm_eth_main;
+  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
+  ssvm_private_t *intfc = vec_elt_at_index (em->intfcs, rd->dev_instance);
+  ssvm_shared_header_t *sh = intfc->sh;
+  unix_shared_memory_queue_t *q;
+  u32 *from;
+  u32 n_left;
+  ssvm_eth_queue_elt_t *elts, *elt, *prev_elt;
+  u32 my_pid = intfc->my_pid;
+  vlib_buffer_t *b0;
+  u32 bi0;
+  u32 size_this_buffer;
+  u32 chunks_this_buffer;
+  u8 i_am_master = intfc->i_am_master;
+  u32 elt_index;
+  int is_ring_full, interface_down;
+  int i;
+  volatile u32 *queue_lock;
+  u32 n_to_alloc = VLIB_FRAME_SIZE;
+  u32 n_allocated, n_present_in_cache, n_available;
+  u32 *elt_indices;
+
+  if (i_am_master)
+    q = (unix_shared_memory_queue_t *) sh->opaque[TO_SLAVE_Q_INDEX];
+  else
+    q = (unix_shared_memory_queue_t *) sh->opaque[TO_MASTER_Q_INDEX];
+
+  queue_lock = (u32 *) q;
+
+  from = vlib_frame_vector_args (f);
+  n_left = f->n_vectors;
+  is_ring_full = 0;
+  interface_down = 0;
+
+  n_present_in_cache = vec_len (em->chunk_cache);
+
+  /* admin / link up/down check */
+  if (sh->opaque[MASTER_ADMIN_STATE_INDEX] == 0 ||
+      sh->opaque[SLAVE_ADMIN_STATE_INDEX] == 0)
+    {
+      interface_down = 1;
+      goto out;
+    }
+
+  ssvm_lock (sh, my_pid, 1);
+
+  elts = (ssvm_eth_queue_elt_t *) (sh->opaque[CHUNK_POOL_INDEX]);
+  elt_indices = (u32 *) (sh->opaque[CHUNK_POOL_FREELIST_INDEX]);
+  n_available = (u32) pointer_to_uword (sh->opaque[CHUNK_POOL_NFREE]);
+
+  if (n_present_in_cache < n_left * 2)
+    {
+      vec_validate (em->chunk_cache, n_to_alloc + n_present_in_cache - 1);
+
+      n_allocated = n_to_alloc < n_available ? n_to_alloc : n_available;
+
+      if (PREDICT_TRUE (n_allocated > 0))
+	{
+	  clib_memcpy (&em->chunk_cache[n_present_in_cache],
+		       &elt_indices[n_available - n_allocated],
+		       sizeof (u32) * n_allocated);
+	}
+
+      n_present_in_cache += n_allocated;
+      n_available -= n_allocated;
+      sh->opaque[CHUNK_POOL_NFREE] = uword_to_pointer (n_available, void *);
+      _vec_len (em->chunk_cache) = n_present_in_cache;
+    }
+
+  ssvm_unlock (sh);
+
+  while (n_left)
+    {
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+
+      size_this_buffer = vlib_buffer_length_in_chain (vm, b0);
+      chunks_this_buffer = (size_this_buffer + (SSVM_BUFFER_SIZE - 1))
+	/ SSVM_BUFFER_SIZE;
+
+      /* If we're not going to be able to enqueue the buffer, tail drop. */
+      if (q->cursize >= q->maxsize)
+	{
+	  is_ring_full = 1;
+	  break;
+	}
+
+      prev_elt = 0;
+      elt_index = ~0;
+      for (i = 0; i < chunks_this_buffer; i++)
+	{
+	  if (PREDICT_FALSE (n_present_in_cache == 0))
+	    goto out;
+
+	  elt_index = em->chunk_cache[--n_present_in_cache];
+	  elt = elts + elt_index;
+
+	  elt->type = SSVM_PACKET_TYPE;
+	  elt->flags = 0;
+	  elt->total_length_not_including_first_buffer =
+	    b0->total_length_not_including_first_buffer;
+	  elt->length_this_buffer = b0->current_length;
+	  elt->current_data_hint = b0->current_data;
+	  elt->owner = !i_am_master;
+	  elt->tag = 1;
+
+	  clib_memcpy (elt->data, b0->data + b0->current_data,
+		       b0->current_length);
+
+	  if (PREDICT_FALSE (prev_elt != 0))
+	    prev_elt->next_index = elt - elts;
+
+	  if (PREDICT_FALSE (i < (chunks_this_buffer - 1)))
+	    {
+	      elt->flags = SSVM_BUFFER_NEXT_PRESENT;
+	      ASSERT (b0->flags & VLIB_BUFFER_NEXT_PRESENT);
+	      b0 = vlib_get_buffer (vm, b0->next_buffer);
+	    }
+	  prev_elt = elt;
+	}
+
+      while (__sync_lock_test_and_set (queue_lock, 1))
+	;
+
+      unix_shared_memory_queue_add_raw (q, (u8 *) & elt_index);
+      CLIB_MEMORY_BARRIER ();
+      *queue_lock = 0;
+
+      from++;
+      n_left--;
+    }
+
+out:
+  if (PREDICT_FALSE (n_left))
+    {
+      if (is_ring_full)
+	vlib_error_count (vm, node->node_index, SSVM_ETH_TX_ERROR_RING_FULL,
+			  n_left);
+      else if (interface_down)
+	vlib_error_count (vm, node->node_index, SSVM_ETH_TX_ERROR_ADMIN_DOWN,
+			  n_left);
+      else
+	vlib_error_count (vm, node->node_index, SSVM_ETH_TX_ERROR_NO_BUFFERS,
+			  n_left);
+
+      vlib_buffer_free (vm, from, n_left);
+    }
+  else
+    vlib_buffer_free (vm, vlib_frame_vector_args (f), f->n_vectors);
+
+  if (PREDICT_TRUE (vec_len (em->chunk_cache)))
+    _vec_len (em->chunk_cache) = n_present_in_cache;
+
+  return f->n_vectors;
+}
+
+static void
+ssvm_eth_clear_hw_interface_counters (u32 instance)
+{
+  /* Nothing for now */
+}
+
+static clib_error_t *
+ssvm_eth_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index,
+				  u32 flags)
+{
+  vnet_hw_interface_t *hif = vnet_get_hw_interface (vnm, hw_if_index);
+  uword is_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
+  ssvm_eth_main_t *em = &ssvm_eth_main;
+  ssvm_private_t *intfc = vec_elt_at_index (em->intfcs, hif->dev_instance);
+  ssvm_shared_header_t *sh;
+
+  /* publish link-state in shared-memory, to discourage buffer-wasting */
+  sh = intfc->sh;
+  if (intfc->i_am_master)
+    sh->opaque[MASTER_ADMIN_STATE_INDEX] = (void *) is_up;
+  else
+    sh->opaque[SLAVE_ADMIN_STATE_INDEX] = (void *) is_up;
+
+  return 0;
+}
+
+static clib_error_t *
+ssvm_eth_subif_add_del_function (vnet_main_t * vnm,
+				 u32 hw_if_index,
+				 struct vnet_sw_interface_t *st, int is_add)
+{
+  /* Nothing for now */
+  return 0;
+}
+
+/*
+ * Dynamically redirect all pkts from a specific interface
+ * to the specified node
+ */
+static void
+ssvm_eth_set_interface_next_node (vnet_main_t * vnm, u32 hw_if_index,
+				  u32 node_index)
+{
+  ssvm_eth_main_t *em = &ssvm_eth_main;
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+  ssvm_private_t *intfc = pool_elt_at_index (em->intfcs, hw->dev_instance);
+
+  /* Shut off redirection */
+  if (node_index == ~0)
+    {
+      intfc->per_interface_next_index = node_index;
+      return;
+    }
+
+  intfc->per_interface_next_index =
+    vlib_node_add_next (em->vlib_main, ssvm_eth_input_node.index, node_index);
+}
+
+static u32
+ssvm_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, u32 flags)
+{
+  /* nothing for now */
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (ssvm_eth_device_class) = {
+  .name = "ssvm-eth",
+  .tx_function = ssvm_eth_interface_tx,
+  .tx_function_n_errors = SSVM_ETH_TX_N_ERROR,
+  .tx_function_error_strings = ssvm_eth_tx_func_error_strings,
+  .format_device_name = format_ssvm_eth_device_name,
+  .format_device = format_ssvm_eth_device,
+  .format_tx_trace = format_ssvm_eth_tx_trace,
+  .clear_counters = ssvm_eth_clear_hw_interface_counters,
+  .admin_up_down_function = ssvm_eth_interface_admin_up_down,
+  .subif_add_del_function = ssvm_eth_subif_add_del_function,
+  .rx_redirect_to_node = ssvm_eth_set_interface_next_node,
+};
+
+VLIB_DEVICE_TX_FUNCTION_MULTIARCH (ssvm_eth_device_class,
+				   ssvm_eth_interface_tx)
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/ssvm/ssvm_eth.h b/src/vnet/devices/ssvm/ssvm_eth.h
new file mode 100644
index 00000000..f877df3c
--- /dev/null
+++ b/src/vnet/devices/ssvm/ssvm_eth.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_ssvm_eth_h__
+#define __included_ssvm_eth_h__
+
+#include <vnet/vnet.h>
+
+#include <vppinfra/elog.h>
+#include <vppinfra/error.h>
+#include <vppinfra/format.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/elog.h>
+#include <vlib/vlib.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/devices/devices.h>
+#include <vnet/ip/ip.h>
+#include <vnet/pg/pg.h>
+#include <vlibmemory/unix_shared_memory_queue.h>
+
+#include <svm/ssvm.h>
+
+extern vnet_device_class_t ssvm_eth_device_class;
+extern vlib_node_registration_t ssvm_eth_input_node;
+
+#define SSVM_BUFFER_SIZE  \
+  (VLIB_BUFFER_DATA_SIZE + VLIB_BUFFER_PRE_DATA_SIZE)
+#define SSVM_PACKET_TYPE 1
+
+typedef struct
+{
+  /* Type of queue element */
+  u8 type;
+  u8 flags;
+#define SSVM_BUFFER_NEXT_PRESENT (1<<0)
+  u8 owner;
+  u8 tag;
+  i16 current_data_hint;
+  u16 length_this_buffer;
+  u16 total_length_not_including_first_buffer;
+  u16 pad;
+  u32 next_index;
+  /* offset 16 */
+  u8 data[SSVM_BUFFER_SIZE];
+  /* pad to an even multiple of 64 octets */
+  u8 pad2[CLIB_CACHE_LINE_BYTES - 16];
+} ssvm_eth_queue_elt_t;
+
+typedef struct
+{
+  /* vector of point-to-point connections */
+  ssvm_private_t *intfcs;
+
+  u32 *buffer_cache;
+  u32 *chunk_cache;
+
+  /* Configurable parameters */
+  /* base address for next placement */
+  u64 next_base_va;
+  u64 segment_size;
+  u64 nbuffers;
+  u64 queue_elts;
+
+  /* Segment names */
+  u8 **names;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+  elog_main_t *elog_main;
+} ssvm_eth_main_t;
+
+ssvm_eth_main_t ssvm_eth_main;
+
+typedef enum
+{
+  CHUNK_POOL_FREELIST_INDEX = 0,
+  CHUNK_POOL_INDEX,
+  CHUNK_POOL_NFREE,
+  TO_MASTER_Q_INDEX,
+  TO_SLAVE_Q_INDEX,
+  MASTER_ADMIN_STATE_INDEX,
+  SLAVE_ADMIN_STATE_INDEX,
+} ssvm_eth_opaque_index_t;
+
+/*
+ * debug scaffolding.
+ */
+static inline void
+ssvm_eth_validate_freelists (int need_lock)
+{
+#if CLIB_DEBUG > 0
+  ssvm_eth_main_t *em = &ssvm_eth_main;
+  ssvm_private_t *intfc;
+  ssvm_shared_header_t *sh;
+  u32 *elt_indices;
+  u32 n_available;
+  int i;
+
+  for (i = 0; i < vec_len (em->intfcs); i++)
+    {
+      intfc = em->intfcs + i;
+      sh = intfc->sh;
+      u32 my_pid = intfc->my_pid;
+
+      if (need_lock)
+	ssvm_lock (sh, my_pid, 15);
+
+      elt_indices = (u32 *) (sh->opaque[CHUNK_POOL_FREELIST_INDEX]);
+      n_available = (u32) (uword) (sh->opaque[CHUNK_POOL_NFREE]);
+
+      for (i = 0; i < n_available; i++)
+	ASSERT (elt_indices[i] < 2048);
+
+      if (need_lock)
+	ssvm_unlock (sh);
+    }
+#endif
+}
+
+#endif /* __included_ssvm_eth_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/virtio/dir.dox b/src/vnet/devices/virtio/dir.dox
new file mode 100644
index 00000000..50150799
--- /dev/null
+++ b/src/vnet/devices/virtio/dir.dox
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Doxygen directory documentation */
+
+/**
+@dir
+@brief vHost User Interface Implementation.
+
+This directory contains the source code for vHost User driver.
+
+*/
+/*? %%clicmd:group_label vHost User %% ?*/
+/*? %%syscfg:group_label vHost User %% ?*/
diff --git a/src/vnet/devices/virtio/vhost-user.c b/src/vnet/devices/virtio/vhost-user.c
new file mode 100644
index 00000000..bde8106c
--- /dev/null
+++ b/src/vnet/devices/virtio/vhost-user.c
@@ -0,0 +1,3314 @@
+/*
+ *------------------------------------------------------------------
+ * vhost.c - vhost-user
+ *
+ * Copyright (c) 2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <fcntl.h>		/* for open */
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/uio.h>		/* for iovec */
+#include <netinet/in.h>
+#include <sys/vfs.h>
+
+#include <linux/if_arp.h>
+#include <linux/if_tun.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+
+#include <vnet/ip/ip.h>
+
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/devices/devices.h>
+#include <vnet/feature/feature.h>
+
+#include <vnet/devices/virtio/vhost-user.h>
+
+/**
+ * @file
+ * @brief vHost User Device Driver.
+ *
+ * This file contains the source code for vHost User interface.
+ */
+
+
+#define VHOST_USER_DEBUG_SOCKET 0
+#define VHOST_DEBUG_VQ 0
+
+#if VHOST_USER_DEBUG_SOCKET == 1
+#define DBG_SOCK(args...) clib_warning(args);
+#else
+#define DBG_SOCK(args...)
+#endif
+
+#if VHOST_DEBUG_VQ == 1
+#define DBG_VQ(args...) clib_warning(args);
+#else
+#define DBG_VQ(args...)
+#endif
+
+/*
+ * When an RX queue is down but active, received packets
+ * must be discarded. This value controls up to how many
+ * packets will be discarded during each round.
+ */
+#define VHOST_USER_DOWN_DISCARD_COUNT 256
+
+/*
+ * When the number of available buffers gets under this threshold,
+ * RX node will start discarding packets.
+ */
+#define VHOST_USER_RX_BUFFER_STARVATION 32
+
+/*
+ * On the receive side, the host should free descriptors as soon
+ * as possible in order to avoid TX drop in the VM.
+ * This value controls the number of copy operations that are stacked
+ * before copy is done for all and descriptors are given back to
+ * the guest.
+ * The value 64 was obtained by testing (48 and 128 were not as good).
+ */
+#define VHOST_USER_RX_COPY_THRESHOLD 64
+
+#define UNIX_GET_FD(unixfd_idx) \
+    (unixfd_idx != ~0) ? \
+	pool_elt_at_index (unix_main.file_pool, \
+			   unixfd_idx)->file_descriptor : -1;
+
+#define foreach_virtio_trace_flags \
+  _ (SIMPLE_CHAINED, 0, "Simple descriptor chaining") \
+  _ (SINGLE_DESC,  1, "Single descriptor packet") \
+  _ (INDIRECT, 2, "Indirect descriptor") \
+  _ (MAP_ERROR, 4, "Memory mapping error")
+
+typedef enum
+{
+#define _(n,i,s) VIRTIO_TRACE_F_##n,
+  foreach_virtio_trace_flags
+#undef _
+} virtio_trace_flag_t;
+
+vlib_node_registration_t vhost_user_input_node;
+
+#define foreach_vhost_user_tx_func_error      \
+  _(NONE, "no error")  \
+  _(NOT_READY, "vhost vring not ready")  \
+  _(DOWN, "vhost interface is down")  \
+  _(PKT_DROP_NOBUF, "tx packet drops (no available descriptors)")  \
+  _(PKT_DROP_NOMRG, "tx packet drops (cannot merge descriptors)")  \
+  _(MMAP_FAIL, "mmap failure") \
+  _(INDIRECT_OVERFLOW, "indirect descriptor table overflow")
+
+typedef enum
+{
+#define _(f,s) VHOST_USER_TX_FUNC_ERROR_##f,
+  foreach_vhost_user_tx_func_error
+#undef _
+    VHOST_USER_TX_FUNC_N_ERROR,
+} vhost_user_tx_func_error_t;
+
+static char *vhost_user_tx_func_error_strings[] = {
+#define _(n,s) s,
+  foreach_vhost_user_tx_func_error
+#undef _
+};
+
+#define foreach_vhost_user_input_func_error      \
+  _(NO_ERROR, "no error")  \
+  _(NO_BUFFER, "no available buffer")  \
+  _(MMAP_FAIL, "mmap failure")  \
+  _(INDIRECT_OVERFLOW, "indirect descriptor overflows table")  \
+  _(UNDERSIZED_FRAME, "undersized ethernet frame received (< 14 bytes)") \
+  _(FULL_RX_QUEUE, "full rx queue (possible driver tx drop)")
+
+typedef enum
+{
+#define _(f,s) VHOST_USER_INPUT_FUNC_ERROR_##f,
+  foreach_vhost_user_input_func_error
+#undef _
+    VHOST_USER_INPUT_FUNC_N_ERROR,
+} vhost_user_input_func_error_t;
+
+static char *vhost_user_input_func_error_strings[] = {
+#define _(n,s) s,
+  foreach_vhost_user_input_func_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+static vhost_user_main_t vhost_user_main = {
+  .mtu_bytes = 1518,
+};
+
+VNET_HW_INTERFACE_CLASS (vhost_interface_class, static) = {
+  .name = "vhost-user",
+};
+/* *INDENT-ON* */
+
+static u8 *
+format_vhost_user_interface_name (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+  u32 show_dev_instance = ~0;
+  vhost_user_main_t *vum = &vhost_user_main;
+
+  if (i < vec_len (vum->show_dev_instance_by_real_dev_instance))
+    show_dev_instance = vum->show_dev_instance_by_real_dev_instance[i];
+
+  if (show_dev_instance != ~0)
+    i = show_dev_instance;
+
+  s = format (s, "VirtualEthernet0/0/%d", i);
+  return s;
+}
+
+static int
+vhost_user_name_renumber (vnet_hw_interface_t * hi, u32 new_dev_instance)
+{
+  // FIXME: check if the new dev instance is already used
+  vhost_user_main_t *vum = &vhost_user_main;
+  vec_validate_init_empty (vum->show_dev_instance_by_real_dev_instance,
+			   hi->dev_instance, ~0);
+
+  vum->show_dev_instance_by_real_dev_instance[hi->dev_instance] =
+    new_dev_instance;
+
+  DBG_SOCK ("renumbered vhost-user interface dev_instance %d to %d",
+	    hi->dev_instance, new_dev_instance);
+
+  return 0;
+}
+
+static_always_inline void *
+map_guest_mem (vhost_user_intf_t * vui, uword addr, u32 * hint)
+{
+  int i = *hint;
+  if (PREDICT_TRUE ((vui->regions[i].guest_phys_addr <= addr) &&
+		    ((vui->regions[i].guest_phys_addr +
+		      vui->regions[i].memory_size) > addr)))
+    {
+      return (void *) (vui->region_mmap_addr[i] + addr -
+		       vui->regions[i].guest_phys_addr);
+    }
+#if __SSE4_2__
+  __m128i rl, rh, al, ah, r;
+  al = _mm_set1_epi64x (addr + 1);
+  ah = _mm_set1_epi64x (addr);
+
+  rl = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_lo[0]);
+  rl = _mm_cmpgt_epi64 (al, rl);
+  rh = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_hi[0]);
+  rh = _mm_cmpgt_epi64 (rh, ah);
+  r = _mm_and_si128 (rl, rh);
+
+  rl = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_lo[2]);
+  rl = _mm_cmpgt_epi64 (al, rl);
+  rh = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_hi[2]);
+  rh = _mm_cmpgt_epi64 (rh, ah);
+  r = _mm_blend_epi16 (r, _mm_and_si128 (rl, rh), 0x22);
+
+  rl = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_lo[4]);
+  rl = _mm_cmpgt_epi64 (al, rl);
+  rh = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_hi[4]);
+  rh = _mm_cmpgt_epi64 (rh, ah);
+  r = _mm_blend_epi16 (r, _mm_and_si128 (rl, rh), 0x44);
+
+  rl = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_lo[6]);
+  rl = _mm_cmpgt_epi64 (al, rl);
+  rh = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_hi[6]);
+  rh = _mm_cmpgt_epi64 (rh, ah);
+  r = _mm_blend_epi16 (r, _mm_and_si128 (rl, rh), 0x88);
+
+  r = _mm_shuffle_epi8 (r, _mm_set_epi64x (0, 0x0e060c040a020800));
+  i = __builtin_ctzll (_mm_movemask_epi8 (r));
+
+  if (i < vui->nregions)
+    {
+      *hint = i;
+      return (void *) (vui->region_mmap_addr[i] + addr -
+		       vui->regions[i].guest_phys_addr);
+    }
+
+#else
+  for (i = 0; i < vui->nregions; i++)
+    {
+      if ((vui->regions[i].guest_phys_addr <= addr) &&
+	  ((vui->regions[i].guest_phys_addr + vui->regions[i].memory_size) >
+	   addr))
+	{
+	  *hint = i;
+	  return (void *) (vui->region_mmap_addr[i] + addr -
+			   vui->regions[i].guest_phys_addr);
+	}
+    }
+#endif
+  DBG_VQ ("failed to map guest mem addr %llx", addr);
+  *hint = 0;
+  return 0;
+}
+
+static inline void *
+map_user_mem (vhost_user_intf_t * vui, uword addr)
+{
+  int i;
+  for (i = 0; i < vui->nregions; i++)
+    {
+      if ((vui->regions[i].userspace_addr <= addr) &&
+	  ((vui->regions[i].userspace_addr + vui->regions[i].memory_size) >
+	   addr))
+	{
+	  return (void *) (vui->region_mmap_addr[i] + addr -
+			   vui->regions[i].userspace_addr);
+	}
+    }
+  return 0;
+}
+
+static long
+get_huge_page_size (int fd)
+{
+  struct statfs s;
+  fstatfs (fd, &s);
+  return s.f_bsize;
+}
+
+static void
+unmap_all_mem_regions (vhost_user_intf_t * vui)
+{
+  int i, r;
+  for (i = 0; i < vui->nregions; i++)
+    {
+      if (vui->region_mmap_addr[i] != (void *) -1)
+	{
+
+	  long page_sz = get_huge_page_size (vui->region_mmap_fd[i]);
+
+	  ssize_t map_sz = (vui->regions[i].memory_size +
+			    vui->regions[i].mmap_offset +
+			    page_sz) & ~(page_sz - 1);
+
+	  r =
+	    munmap (vui->region_mmap_addr[i] - vui->regions[i].mmap_offset,
+		    map_sz);
+
+	  DBG_SOCK
+	    ("unmap memory region %d addr 0x%lx len 0x%lx page_sz 0x%x", i,
+	     vui->region_mmap_addr[i], map_sz, page_sz);
+
+	  vui->region_mmap_addr[i] = (void *) -1;
+
+	  if (r == -1)
+	    {
+	      clib_warning ("failed to unmap memory region (errno %d)",
+			    errno);
+	    }
+	  close (vui->region_mmap_fd[i]);
+	}
+    }
+  vui->nregions = 0;
+}
+
+static void
+vhost_user_tx_thread_placement (vhost_user_intf_t * vui)
+{
+  //Let's try to assign one queue to each thread
+  u32 qid = 0;
+  u32 cpu_index = 0;
+  vui->use_tx_spinlock = 0;
+  while (1)
+    {
+      for (qid = 0; qid < VHOST_VRING_MAX_N / 2; qid++)
+	{
+	  vhost_user_vring_t *rxvq = &vui->vrings[VHOST_VRING_IDX_RX (qid)];
+	  if (!rxvq->started || !rxvq->enabled)
+	    continue;
+
+	  vui->per_cpu_tx_qid[cpu_index] = qid;
+	  cpu_index++;
+	  if (cpu_index == vlib_get_thread_main ()->n_vlib_mains)
+	    return;
+	}
+      //We need to loop, meaning the spinlock has to be used
+      vui->use_tx_spinlock = 1;
+      if (cpu_index == 0)
+	{
+	  //Could not find a single valid one
+	  for (cpu_index = 0;
+	       cpu_index < vlib_get_thread_main ()->n_vlib_mains; cpu_index++)
+	    {
+	      vui->per_cpu_tx_qid[cpu_index] = 0;
+	    }
+	  return;
+	}
+    }
+}
+
+static void
+vhost_user_rx_thread_placement ()
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_user_intf_t *vui;
+  vhost_cpu_t *vhc;
+  u32 *workers = 0;
+
+  //Let's list all workers cpu indexes
+  u32 i;
+  for (i = vum->input_cpu_first_index;
+       i < vum->input_cpu_first_index + vum->input_cpu_count; i++)
+    {
+      vlib_node_set_state (vlib_mains ? vlib_mains[i] : &vlib_global_main,
+			   vhost_user_input_node.index,
+			   VLIB_NODE_STATE_DISABLED);
+      vec_add1 (workers, i);
+    }
+
+  vec_foreach (vhc, vum->cpus)
+  {
+    vec_reset_length (vhc->rx_queues);
+  }
+
+  i = 0;
+  vhost_iface_and_queue_t iaq;
+  /* *INDENT-OFF* */
+  pool_foreach (vui, vum->vhost_user_interfaces, {
+      u32 *vui_workers = vec_len (vui->workers) ? vui->workers : workers;
+      u32 qid;
+      for (qid = 0; qid < VHOST_VRING_MAX_N / 2; qid++)
+	{
+	  vhost_user_vring_t *txvq =
+	      &vui->vrings[VHOST_VRING_IDX_TX (qid)];
+	  if (!txvq->started)
+	    continue;
+
+	  i %= vec_len (vui_workers);
+	  u32 cpu_index = vui_workers[i];
+	  i++;
+	  vhc = &vum->cpus[cpu_index];
+
+	  iaq.qid = qid;
+	  iaq.vhost_iface_index = vui - vum->vhost_user_interfaces;
+	  vec_add1 (vhc->rx_queues, iaq);
+	  vlib_node_set_state (vlib_mains ? vlib_mains[cpu_index] :
+	      &vlib_global_main, vhost_user_input_node.index,
+	      VLIB_NODE_STATE_POLLING);
+	}
+  });
+  /* *INDENT-ON* */
+}
+
+static int
+vhost_user_thread_placement (u32 sw_if_index, u32 worker_thread_index, u8 del)
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_user_intf_t *vui;
+  vnet_hw_interface_t *hw;
+
+  if (worker_thread_index < vum->input_cpu_first_index ||
+      worker_thread_index >=
+      vum->input_cpu_first_index + vum->input_cpu_count)
+    return -1;
+
+  if (!(hw = vnet_get_sup_hw_interface (vnet_get_main (), sw_if_index)))
+    return -2;
+
+  vui = pool_elt_at_index (vum->vhost_user_interfaces, hw->dev_instance);
+  u32 found = ~0, *w;
+  vec_foreach (w, vui->workers)
+  {
+    if (*w == worker_thread_index)
+      {
+	found = w - vui->workers;
+	break;
+      }
+  }
+
+  if (del)
+    {
+      if (found == ~0)
+	return -3;
+      vec_del1 (vui->workers, found);
+    }
+  else if (found == ~0)
+    {
+      vec_add1 (vui->workers, worker_thread_index);
+    }
+
+  vhost_user_rx_thread_placement ();
+  return 0;
+}
+
+/** @brief Returns whether at least one TX and one RX vring are enabled */
+int
+vhost_user_intf_ready (vhost_user_intf_t * vui)
+{
+  int i, found[2] = { };	//RX + TX
+
+  for (i = 0; i < VHOST_VRING_MAX_N; i++)
+    if (vui->vrings[i].started && vui->vrings[i].enabled)
+      found[i & 1] = 1;
+
+  return found[0] && found[1];
+}
+
+static void
+vhost_user_update_iface_state (vhost_user_intf_t * vui)
+{
+  /* if we have pointers to descriptor table, go up */
+  int is_up = vhost_user_intf_ready (vui);
+  if (is_up != vui->is_up)
+    {
+      DBG_SOCK ("interface %d %s", vui->sw_if_index,
+		is_up ? "ready" : "down");
+      vnet_hw_interface_set_flags (vnet_get_main (), vui->hw_if_index,
+				   is_up ? VNET_HW_INTERFACE_FLAG_LINK_UP :
+				   0);
+      vui->is_up = is_up;
+    }
+  vhost_user_rx_thread_placement ();
+  vhost_user_tx_thread_placement (vui);
+}
+
+static clib_error_t *
+vhost_user_callfd_read_ready (unix_file_t * uf)
+{
+  __attribute__ ((unused)) int n;
+  u8 buff[8];
+  n = read (uf->file_descriptor, ((char *) &buff), 8);
+  return 0;
+}
+
+static clib_error_t *
+vhost_user_kickfd_read_ready (unix_file_t * uf)
+{
+  __attribute__ ((unused)) int n;
+  u8 buff[8];
+  vhost_user_intf_t *vui =
+    pool_elt_at_index (vhost_user_main.vhost_user_interfaces,
+		       uf->private_data >> 8);
+  u32 qid = uf->private_data & 0xff;
+  n = read (uf->file_descriptor, ((char *) &buff), 8);
+  DBG_SOCK ("if %d KICK queue %d", uf->private_data >> 8, qid);
+
+  vlib_worker_thread_barrier_sync (vlib_get_main ());
+  vui->vrings[qid].started = 1;
+  vhost_user_update_iface_state (vui);
+  vlib_worker_thread_barrier_release (vlib_get_main ());
+  return 0;
+}
+
+/**
+ * @brief Try once to lock the vring
+ * @return 0 on success, non-zero on failure.
+ */
+static inline int
+vhost_user_vring_try_lock (vhost_user_intf_t * vui, u32 qid)
+{
+  return __sync_lock_test_and_set (vui->vring_locks[qid], 1);
+}
+
+/**
+ * @brief Spin until the vring is successfully locked
+ */
+static inline void
+vhost_user_vring_lock (vhost_user_intf_t * vui, u32 qid)
+{
+  while (vhost_user_vring_try_lock (vui, qid))
+    ;
+}
+
+/**
+ * @brief Unlock the vring lock
+ */
+static inline void
+vhost_user_vring_unlock (vhost_user_intf_t * vui, u32 qid)
+{
+  *vui->vring_locks[qid] = 0;
+}
+
+static inline void
+vhost_user_vring_init (vhost_user_intf_t * vui, u32 qid)
+{
+  vhost_user_vring_t *vring = &vui->vrings[qid];
+  memset (vring, 0, sizeof (*vring));
+  vring->kickfd_idx = ~0;
+  vring->callfd_idx = ~0;
+  vring->errfd = -1;
+
+  /*
+   * We have a bug with some qemu 2.5, and this may be a fix.
+   * Feel like interpretation holy text, but this is from vhost-user.txt.
+   * "
+   * One queue pair is enabled initially. More queues are enabled
+   * dynamically, by sending message VHOST_USER_SET_VRING_ENABLE.
+   * "
+   * Don't know who's right, but this is what DPDK does.
+   */
+  if (qid == 0 || qid == 1)
+    vring->enabled = 1;
+}
+
+static inline void
+vhost_user_vring_close (vhost_user_intf_t * vui, u32 qid)
+{
+  vhost_user_vring_t *vring = &vui->vrings[qid];
+  if (vring->kickfd_idx != ~0)
+    {
+      unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
+					   vring->kickfd_idx);
+      unix_file_del (&unix_main, uf);
+      vring->kickfd_idx = ~0;
+    }
+  if (vring->callfd_idx != ~0)
+    {
+      unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
+					   vring->callfd_idx);
+      unix_file_del (&unix_main, uf);
+      vring->callfd_idx = ~0;
+    }
+  if (vring->errfd != -1)
+    close (vring->errfd);
+  vhost_user_vring_init (vui, qid);
+}
+
+static inline void
+vhost_user_if_disconnect (vhost_user_intf_t * vui)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  int q;
+
+  vnet_hw_interface_set_flags (vnm, vui->hw_if_index, 0);
+
+  if (vui->unix_file_index != ~0)
+    {
+      unix_file_del (&unix_main, unix_main.file_pool + vui->unix_file_index);
+      vui->unix_file_index = ~0;
+    }
+
+  vui->is_up = 0;
+
+  for (q = 0; q < VHOST_VRING_MAX_N; q++)
+    vhost_user_vring_close (vui, q);
+
+  unmap_all_mem_regions (vui);
+  DBG_SOCK ("interface ifindex %d disconnected", vui->sw_if_index);
+}
+
+#define VHOST_LOG_PAGE 0x1000
+static_always_inline void
+vhost_user_log_dirty_pages_2 (vhost_user_intf_t * vui,
+			      u64 addr, u64 len, u8 is_host_address)
+{
+  if (PREDICT_TRUE (vui->log_base_addr == 0
+		    || !(vui->features & (1 << FEAT_VHOST_F_LOG_ALL))))
+    {
+      return;
+    }
+  if (is_host_address)
+    {
+      addr = (u64) map_user_mem (vui, (uword) addr);
+    }
+  if (PREDICT_FALSE ((addr + len - 1) / VHOST_LOG_PAGE / 8 >= vui->log_size))
+    {
+      DBG_SOCK ("vhost_user_log_dirty_pages(): out of range\n");
+      return;
+    }
+
+  CLIB_MEMORY_BARRIER ();
+  u64 page = addr / VHOST_LOG_PAGE;
+  while (page * VHOST_LOG_PAGE < addr + len)
+    {
+      ((u8 *) vui->log_base_addr)[page / 8] |= 1 << page % 8;
+      page++;
+    }
+}
+
+static_always_inline void
+vhost_user_log_dirty_pages (vhost_user_intf_t * vui, u64 addr, u64 len)
+{
+  vhost_user_log_dirty_pages_2 (vui, addr, len, 0);
+}
+
+#define vhost_user_log_dirty_ring(vui, vq, member) \
+  if (PREDICT_FALSE(vq->log_used)) { \
+    vhost_user_log_dirty_pages(vui, vq->log_guest_addr + STRUCT_OFFSET_OF(vring_used_t, member), \
+                             sizeof(vq->used->member)); \
+  }
+
+static clib_error_t *
+vhost_user_socket_read (unix_file_t * uf)
+{
+  int n, i;
+  int fd, number_of_fds = 0;
+  int fds[VHOST_MEMORY_MAX_NREGIONS];
+  vhost_user_msg_t msg;
+  struct msghdr mh;
+  struct iovec iov[1];
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_user_intf_t *vui;
+  struct cmsghdr *cmsg;
+  u8 q;
+  unix_file_t template = { 0 };
+  vnet_main_t *vnm = vnet_get_main ();
+
+  vui = pool_elt_at_index (vum->vhost_user_interfaces, uf->private_data);
+
+  char control[CMSG_SPACE (VHOST_MEMORY_MAX_NREGIONS * sizeof (int))];
+
+  memset (&mh, 0, sizeof (mh));
+  memset (control, 0, sizeof (control));
+
+  for (i = 0; i < VHOST_MEMORY_MAX_NREGIONS; i++)
+    fds[i] = -1;
+
+  /* set the payload */
+  iov[0].iov_base = (void *) &msg;
+  iov[0].iov_len = VHOST_USER_MSG_HDR_SZ;
+
+  mh.msg_iov = iov;
+  mh.msg_iovlen = 1;
+  mh.msg_control = control;
+  mh.msg_controllen = sizeof (control);
+
+  n = recvmsg (uf->file_descriptor, &mh, 0);
+
+  /* Stop workers to avoid end of the world */
+  vlib_worker_thread_barrier_sync (vlib_get_main ());
+
+  if (n != VHOST_USER_MSG_HDR_SZ)
+    {
+      if (n == -1)
+	{
+	  DBG_SOCK ("recvmsg returned error %d %s", errno, strerror (errno));
+	}
+      else
+	{
+	  DBG_SOCK ("n (%d) != VHOST_USER_MSG_HDR_SZ (%d)",
+		    n, VHOST_USER_MSG_HDR_SZ);
+	}
+      goto close_socket;
+    }
+
+  if (mh.msg_flags & MSG_CTRUNC)
+    {
+      DBG_SOCK ("MSG_CTRUNC is set");
+      goto close_socket;
+    }
+
+  cmsg = CMSG_FIRSTHDR (&mh);
+
+  if (cmsg && (cmsg->cmsg_len > 0) && (cmsg->cmsg_level == SOL_SOCKET) &&
+      (cmsg->cmsg_type == SCM_RIGHTS) &&
+      (cmsg->cmsg_len - CMSG_LEN (0) <=
+       VHOST_MEMORY_MAX_NREGIONS * sizeof (int)))
+    {
+      number_of_fds = (cmsg->cmsg_len - CMSG_LEN (0)) / sizeof (int);
+      clib_memcpy (fds, CMSG_DATA (cmsg), number_of_fds * sizeof (int));
+    }
+
+  /* version 1, no reply bit set */
+  if ((msg.flags & 7) != 1)
+    {
+      DBG_SOCK ("malformed message received. closing socket");
+      goto close_socket;
+    }
+
+  {
+    int rv;
+    rv =
+      read (uf->file_descriptor, ((char *) &msg) + VHOST_USER_MSG_HDR_SZ,
+	    msg.size);
+    if (rv < 0)
+      {
+	DBG_SOCK ("read failed %s", strerror (errno));
+	goto close_socket;
+      }
+    else if (rv != msg.size)
+      {
+	DBG_SOCK ("message too short (read %dB should be %dB)", rv, msg.size);
+	goto close_socket;
+      }
+  }
+
+  switch (msg.request)
+    {
+    case VHOST_USER_GET_FEATURES:
+      msg.flags |= 4;
+      msg.u64 = (1ULL << FEAT_VIRTIO_NET_F_MRG_RXBUF) |
+	(1ULL << FEAT_VIRTIO_NET_F_CTRL_VQ) |
+	(1ULL << FEAT_VIRTIO_F_ANY_LAYOUT) |
+	(1ULL << FEAT_VIRTIO_F_INDIRECT_DESC) |
+	(1ULL << FEAT_VHOST_F_LOG_ALL) |
+	(1ULL << FEAT_VIRTIO_NET_F_GUEST_ANNOUNCE) |
+	(1ULL << FEAT_VIRTIO_NET_F_MQ) |
+	(1ULL << FEAT_VHOST_USER_F_PROTOCOL_FEATURES) |
+	(1ULL << FEAT_VIRTIO_F_VERSION_1);
+      msg.u64 &= vui->feature_mask;
+      msg.size = sizeof (msg.u64);
+      DBG_SOCK ("if %d msg VHOST_USER_GET_FEATURES - reply 0x%016llx",
+		vui->hw_if_index, msg.u64);
+      break;
+
+    case VHOST_USER_SET_FEATURES:
+      DBG_SOCK ("if %d msg VHOST_USER_SET_FEATURES features 0x%016llx",
+		vui->hw_if_index, msg.u64);
+
+      vui->features = msg.u64;
+
+      if (vui->features &
+	  ((1 << FEAT_VIRTIO_NET_F_MRG_RXBUF) |
+	   (1ULL << FEAT_VIRTIO_F_VERSION_1)))
+	vui->virtio_net_hdr_sz = 12;
+      else
+	vui->virtio_net_hdr_sz = 10;
+
+      vui->is_any_layout =
+	(vui->features & (1 << FEAT_VIRTIO_F_ANY_LAYOUT)) ? 1 : 0;
+
+      ASSERT (vui->virtio_net_hdr_sz < VLIB_BUFFER_PRE_DATA_SIZE);
+      vnet_hw_interface_set_flags (vnm, vui->hw_if_index, 0);
+      vui->is_up = 0;
+
+      /*for (q = 0; q < VHOST_VRING_MAX_N; q++)
+         vhost_user_vring_close(&vui->vrings[q]); */
+
+      break;
+
+    case VHOST_USER_SET_MEM_TABLE:
+      DBG_SOCK ("if %d msg VHOST_USER_SET_MEM_TABLE nregions %d",
+		vui->hw_if_index, msg.memory.nregions);
+
+      if ((msg.memory.nregions < 1) ||
+	  (msg.memory.nregions > VHOST_MEMORY_MAX_NREGIONS))
+	{
+
+	  DBG_SOCK ("number of mem regions must be between 1 and %i",
+		    VHOST_MEMORY_MAX_NREGIONS);
+
+	  goto close_socket;
+	}
+
+      if (msg.memory.nregions != number_of_fds)
+	{
+	  DBG_SOCK ("each memory region must have FD");
+	  goto close_socket;
+	}
+      unmap_all_mem_regions (vui);
+      for (i = 0; i < msg.memory.nregions; i++)
+	{
+	  clib_memcpy (&(vui->regions[i]), &msg.memory.regions[i],
+		       sizeof (vhost_user_memory_region_t));
+
+	  long page_sz = get_huge_page_size (fds[i]);
+
+	  /* align size to 2M page */
+	  ssize_t map_sz = (vui->regions[i].memory_size +
+			    vui->regions[i].mmap_offset +
+			    page_sz) & ~(page_sz - 1);
+
+	  vui->region_mmap_addr[i] = mmap (0, map_sz, PROT_READ | PROT_WRITE,
+					   MAP_SHARED, fds[i], 0);
+	  vui->region_guest_addr_lo[i] = vui->regions[i].guest_phys_addr;
+	  vui->region_guest_addr_hi[i] = vui->regions[i].guest_phys_addr +
+	    vui->regions[i].memory_size;
+
+	  DBG_SOCK
+	    ("map memory region %d addr 0 len 0x%lx fd %d mapped 0x%lx "
+	     "page_sz 0x%x", i, map_sz, fds[i], vui->region_mmap_addr[i],
+	     page_sz);
+
+	  if (vui->region_mmap_addr[i] == MAP_FAILED)
+	    {
+	      clib_warning ("failed to map memory. errno is %d", errno);
+	      goto close_socket;
+	    }
+	  vui->region_mmap_addr[i] += vui->regions[i].mmap_offset;
+	  vui->region_mmap_fd[i] = fds[i];
+	}
+      vui->nregions = msg.memory.nregions;
+      break;
+
+    case VHOST_USER_SET_VRING_NUM:
+      DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_NUM idx %d num %d",
+		vui->hw_if_index, msg.state.index, msg.state.num);
+
+      if ((msg.state.num > 32768) ||	/* maximum ring size is 32768 */
+	  (msg.state.num == 0) ||	/* it cannot be zero */
+	  ((msg.state.num - 1) & msg.state.num))	/* must be power of 2 */
+	goto close_socket;
+      vui->vrings[msg.state.index].qsz = msg.state.num;
+      break;
+
+    case VHOST_USER_SET_VRING_ADDR:
+      DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_ADDR idx %d",
+		vui->hw_if_index, msg.state.index);
+
+      if (msg.state.index >= VHOST_VRING_MAX_N)
+	{
+	  DBG_SOCK ("invalid vring index VHOST_USER_SET_VRING_ADDR:"
+		    " %d >= %d", msg.state.index, VHOST_VRING_MAX_N);
+	  goto close_socket;
+	}
+
+      if (msg.size < sizeof (msg.addr))
+	{
+	  DBG_SOCK ("vhost message is too short (%d < %d)",
+		    msg.size, sizeof (msg.addr));
+	  goto close_socket;
+	}
+
+      vui->vrings[msg.state.index].desc = (vring_desc_t *)
+	map_user_mem (vui, msg.addr.desc_user_addr);
+      vui->vrings[msg.state.index].used = (vring_used_t *)
+	map_user_mem (vui, msg.addr.used_user_addr);
+      vui->vrings[msg.state.index].avail = (vring_avail_t *)
+	map_user_mem (vui, msg.addr.avail_user_addr);
+
+      if ((vui->vrings[msg.state.index].desc == NULL) ||
+	  (vui->vrings[msg.state.index].used == NULL) ||
+	  (vui->vrings[msg.state.index].avail == NULL))
+	{
+	  DBG_SOCK ("failed to map user memory for hw_if_index %d",
+		    vui->hw_if_index);
+	  goto close_socket;
+	}
+
+      vui->vrings[msg.state.index].log_guest_addr = msg.addr.log_guest_addr;
+      vui->vrings[msg.state.index].log_used =
+	(msg.addr.flags & (1 << VHOST_VRING_F_LOG)) ? 1 : 0;
+
+      /* Spec says: If VHOST_USER_F_PROTOCOL_FEATURES has not been negotiated,
+         the ring is initialized in an enabled state. */
+      if (!(vui->features & (1 << FEAT_VHOST_USER_F_PROTOCOL_FEATURES)))
+	{
+	  vui->vrings[msg.state.index].enabled = 1;
+	}
+
+      vui->vrings[msg.state.index].last_used_idx =
+	vui->vrings[msg.state.index].last_avail_idx =
+	vui->vrings[msg.state.index].used->idx;
+
+      /* tell driver that we don't want interrupts */
+      vui->vrings[msg.state.index].used->flags = VRING_USED_F_NO_NOTIFY;
+      break;
+
+    case VHOST_USER_SET_OWNER:
+      DBG_SOCK ("if %d msg VHOST_USER_SET_OWNER", vui->hw_if_index);
+      break;
+
+    case VHOST_USER_RESET_OWNER:
+      DBG_SOCK ("if %d msg VHOST_USER_RESET_OWNER", vui->hw_if_index);
+      break;
+
+    case VHOST_USER_SET_VRING_CALL:
+      DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_CALL u64 %d",
+		vui->hw_if_index, msg.u64);
+
+      q = (u8) (msg.u64 & 0xFF);
+
+      /* if there is old fd, delete and close it */
+      if (vui->vrings[q].callfd_idx != ~0)
+	{
+	  unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
+					       vui->vrings[q].callfd_idx);
+	  unix_file_del (&unix_main, uf);
+	  vui->vrings[q].callfd_idx = ~0;
+	}
+
+      if (!(msg.u64 & 0x100))
+	{
+	  if (number_of_fds != 1)
+	    {
+	      DBG_SOCK ("More than one fd received !");
+	      goto close_socket;
+	    }
+
+	  template.read_function = vhost_user_callfd_read_ready;
+	  template.file_descriptor = fds[0];
+	  template.private_data =
+	    ((vui - vhost_user_main.vhost_user_interfaces) << 8) + q;
+	  vui->vrings[q].callfd_idx = unix_file_add (&unix_main, &template);
+	}
+      else
+	vui->vrings[q].callfd_idx = ~0;
+      break;
+
+    case VHOST_USER_SET_VRING_KICK:
+      DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_KICK u64 %d",
+		vui->hw_if_index, msg.u64);
+
+      q = (u8) (msg.u64 & 0xFF);
+
+      if (vui->vrings[q].kickfd_idx != ~0)
+	{
+	  unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
+					       vui->vrings[q].kickfd_idx);
+	  unix_file_del (&unix_main, uf);
+	  vui->vrings[q].kickfd_idx = ~0;
+	}
+
+      if (!(msg.u64 & 0x100))
+	{
+	  if (number_of_fds != 1)
+	    {
+	      DBG_SOCK ("More than one fd received !");
+	      goto close_socket;
+	    }
+
+	  template.read_function = vhost_user_kickfd_read_ready;
+	  template.file_descriptor = fds[0];
+	  template.private_data =
+	    (((uword) (vui - vhost_user_main.vhost_user_interfaces)) << 8) +
+	    q;
+	  vui->vrings[q].kickfd_idx = unix_file_add (&unix_main, &template);
+	}
+      else
+	{
+	  //When no kickfd is set, the queue is initialized as started
+	  vui->vrings[q].kickfd_idx = ~0;
+	  vui->vrings[q].started = 1;
+	}
+
+      break;
+
+    case VHOST_USER_SET_VRING_ERR:
+      DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_ERR u64 %d",
+		vui->hw_if_index, msg.u64);
+
+      q = (u8) (msg.u64 & 0xFF);
+
+      if (vui->vrings[q].errfd != -1)
+	close (vui->vrings[q].errfd);
+
+      if (!(msg.u64 & 0x100))
+	{
+	  if (number_of_fds != 1)
+	    goto close_socket;
+
+	  vui->vrings[q].errfd = fds[0];
+	}
+      else
+	vui->vrings[q].errfd = -1;
+
+      break;
+
+    case VHOST_USER_SET_VRING_BASE:
+      DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_BASE idx %d num %d",
+		vui->hw_if_index, msg.state.index, msg.state.num);
+
+      vui->vrings[msg.state.index].last_avail_idx = msg.state.num;
+      break;
+
+    case VHOST_USER_GET_VRING_BASE:
+      DBG_SOCK ("if %d msg VHOST_USER_GET_VRING_BASE idx %d num %d",
+		vui->hw_if_index, msg.state.index, msg.state.num);
+
+      if (msg.state.index >= VHOST_VRING_MAX_N)
+	{
+	  DBG_SOCK ("invalid vring index VHOST_USER_GET_VRING_BASE:"
+		    " %d >= %d", msg.state.index, VHOST_VRING_MAX_N);
+	  goto close_socket;
+	}
+
+      /* Spec says: Client must [...] stop ring upon receiving VHOST_USER_GET_VRING_BASE. */
+      vhost_user_vring_close (vui, msg.state.index);
+
+      msg.state.num = vui->vrings[msg.state.index].last_avail_idx;
+      msg.flags |= 4;
+      msg.size = sizeof (msg.state);
+      break;
+
+    case VHOST_USER_NONE:
+      DBG_SOCK ("if %d msg VHOST_USER_NONE", vui->hw_if_index);
+
+      break;
+
+    case VHOST_USER_SET_LOG_BASE:
+      {
+	DBG_SOCK ("if %d msg VHOST_USER_SET_LOG_BASE", vui->hw_if_index);
+
+	if (msg.size != sizeof (msg.log))
+	  {
+	    DBG_SOCK
+	      ("invalid msg size for VHOST_USER_SET_LOG_BASE: %d instead of %d",
+	       msg.size, sizeof (msg.log));
+	    goto close_socket;
+	  }
+
+	if (!
+	    (vui->protocol_features & (1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD)))
+	  {
+	    DBG_SOCK
+	      ("VHOST_USER_PROTOCOL_F_LOG_SHMFD not set but VHOST_USER_SET_LOG_BASE received");
+	    goto close_socket;
+	  }
+
+	fd = fds[0];
+	/* align size to 2M page */
+	long page_sz = get_huge_page_size (fd);
+	ssize_t map_sz =
+	  (msg.log.size + msg.log.offset + page_sz) & ~(page_sz - 1);
+
+	vui->log_base_addr = mmap (0, map_sz, PROT_READ | PROT_WRITE,
+				   MAP_SHARED, fd, 0);
+
+	DBG_SOCK
+	  ("map log region addr 0 len 0x%lx off 0x%lx fd %d mapped 0x%lx",
+	   map_sz, msg.log.offset, fd, vui->log_base_addr);
+
+	if (vui->log_base_addr == MAP_FAILED)
+	  {
+	    clib_warning ("failed to map memory. errno is %d", errno);
+	    goto close_socket;
+	  }
+
+	vui->log_base_addr += msg.log.offset;
+	vui->log_size = msg.log.size;
+
+	msg.flags |= 4;
+	msg.size = sizeof (msg.u64);
+
+	break;
+      }
+
+    case VHOST_USER_SET_LOG_FD:
+      DBG_SOCK ("if %d msg VHOST_USER_SET_LOG_FD", vui->hw_if_index);
+
+      break;
+
+    case VHOST_USER_GET_PROTOCOL_FEATURES:
+      DBG_SOCK ("if %d msg VHOST_USER_GET_PROTOCOL_FEATURES",
+		vui->hw_if_index);
+
+      msg.flags |= 4;
+      msg.u64 = (1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD) |
+	(1 << VHOST_USER_PROTOCOL_F_MQ);
+      msg.size = sizeof (msg.u64);
+      break;
+
+    case VHOST_USER_SET_PROTOCOL_FEATURES:
+      DBG_SOCK ("if %d msg VHOST_USER_SET_PROTOCOL_FEATURES features 0x%lx",
+		vui->hw_if_index, msg.u64);
+
+      vui->protocol_features = msg.u64;
+
+      break;
+
+    case VHOST_USER_GET_QUEUE_NUM:
+      DBG_SOCK ("if %d msg VHOST_USER_GET_QUEUE_NUM", vui->hw_if_index);
+      msg.flags |= 4;
+      msg.u64 = VHOST_VRING_MAX_N;
+      msg.size = sizeof (msg.u64);
+      break;
+
+    case VHOST_USER_SET_VRING_ENABLE:
+      DBG_SOCK ("if %d VHOST_USER_SET_VRING_ENABLE: %s queue %d",
+		vui->hw_if_index, msg.state.num ? "enable" : "disable",
+		msg.state.index);
+      if (msg.state.index >= VHOST_VRING_MAX_N)
+	{
+	  DBG_SOCK ("invalid vring index VHOST_USER_SET_VRING_ENABLE:"
+		    " %d >= %d", msg.state.index, VHOST_VRING_MAX_N);
+	  goto close_socket;
+	}
+
+      vui->vrings[msg.state.index].enabled = msg.state.num;
+      break;
+
+    default:
+      DBG_SOCK ("unknown vhost-user message %d received. closing socket",
+		msg.request);
+      goto close_socket;
+    }
+
+  /* if we need to reply */
+  if (msg.flags & 4)
+    {
+      n =
+	send (uf->file_descriptor, &msg, VHOST_USER_MSG_HDR_SZ + msg.size, 0);
+      if (n != (msg.size + VHOST_USER_MSG_HDR_SZ))
+	{
+	  DBG_SOCK ("could not send message response");
+	  goto close_socket;
+	}
+    }
+
+  vhost_user_update_iface_state (vui);
+  vlib_worker_thread_barrier_release (vlib_get_main ());
+  return 0;
+
+close_socket:
+  vhost_user_if_disconnect (vui);
+  vhost_user_update_iface_state (vui);
+  vlib_worker_thread_barrier_release (vlib_get_main ());
+  return 0;
+}
+
+static clib_error_t *
+vhost_user_socket_error (unix_file_t * uf)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_user_intf_t *vui =
+    pool_elt_at_index (vum->vhost_user_interfaces, uf->private_data);
+
+  DBG_SOCK ("socket error on if %d", vui->sw_if_index);
+  vlib_worker_thread_barrier_sync (vm);
+  vhost_user_if_disconnect (vui);
+  vhost_user_rx_thread_placement ();
+  vlib_worker_thread_barrier_release (vm);
+  return 0;
+}
+
+static clib_error_t *
+vhost_user_socksvr_accept_ready (unix_file_t * uf)
+{
+  int client_fd, client_len;
+  struct sockaddr_un client;
+  unix_file_t template = { 0 };
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_user_intf_t *vui;
+
+  vui = pool_elt_at_index (vum->vhost_user_interfaces, uf->private_data);
+
+  client_len = sizeof (client);
+  client_fd = accept (uf->file_descriptor,
+		      (struct sockaddr *) &client,
+		      (socklen_t *) & client_len);
+
+  if (client_fd < 0)
+    return clib_error_return_unix (0, "accept");
+
+  DBG_SOCK ("New client socket for vhost interface %d", vui->sw_if_index);
+  template.read_function = vhost_user_socket_read;
+  template.error_function = vhost_user_socket_error;
+  template.file_descriptor = client_fd;
+  template.private_data = vui - vhost_user_main.vhost_user_interfaces;
+  vui->unix_file_index = unix_file_add (&unix_main, &template);
+  return 0;
+}
+
+static clib_error_t *
+vhost_user_init (vlib_main_t * vm)
+{
+  clib_error_t *error;
+  vhost_user_main_t *vum = &vhost_user_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  vlib_thread_registration_t *tr;
+  uword *p;
+
+  error = vlib_call_init_function (vm, ip4_init);
+  if (error)
+    return error;
+
+  vum->coalesce_frames = 32;
+  vum->coalesce_time = 1e-3;
+
+  vec_validate (vum->cpus, tm->n_vlib_mains - 1);
+
+  vhost_cpu_t *cpu;
+  vec_foreach (cpu, vum->cpus)
+  {
+    /* This is actually not necessary as validate already zeroes it
+     * Just keeping the loop here for later because I am lazy. */
+    cpu->rx_buffers_len = 0;
+  }
+
+  /* find out which cpus will be used for input */
+  vum->input_cpu_first_index = 0;
+  vum->input_cpu_count = 1;
+  p = hash_get_mem (tm->thread_registrations_by_name, "workers");
+  tr = p ? (vlib_thread_registration_t *) p[0] : 0;
+
+  if (tr && tr->count > 0)
+    {
+      vum->input_cpu_first_index = tr->first_index;
+      vum->input_cpu_count = tr->count;
+    }
+
+  vum->random = random_default_seed ();
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (vhost_user_init);
+
+static clib_error_t *
+vhost_user_exit (vlib_main_t * vm)
+{
+  /* TODO cleanup */
+  return 0;
+}
+
+VLIB_MAIN_LOOP_EXIT_FUNCTION (vhost_user_exit);
+
+static u8 *
+format_vhost_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  CLIB_UNUSED (vnet_main_t * vnm) = vnet_get_main ();
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_trace_t *t = va_arg (*va, vhost_trace_t *);
+  vhost_user_intf_t *vui = pool_elt_at_index (vum->vhost_user_interfaces,
+					      t->device_index);
+
+  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, vui->sw_if_index);
+
+  uword indent = format_get_indent (s);
+
+  s = format (s, "%U %U queue %d\n", format_white_space, indent,
+	      format_vnet_sw_interface_name, vnm, sw, t->qid);
+
+  s = format (s, "%U virtio flags:\n", format_white_space, indent);
+#define _(n,i,st) \
+	  if (t->virtio_ring_flags & (1 << VIRTIO_TRACE_F_##n)) \
+	    s = format (s, "%U  %s %s\n", format_white_space, indent, #n, st);
+  foreach_virtio_trace_flags
+#undef _
+    s = format (s, "%U virtio_net_hdr first_desc_len %u\n",
+		format_white_space, indent, t->first_desc_len);
+
+  s = format (s, "%U   flags 0x%02x gso_type %u\n",
+	      format_white_space, indent,
+	      t->hdr.hdr.flags, t->hdr.hdr.gso_type);
+
+  if (vui->virtio_net_hdr_sz == 12)
+    s = format (s, "%U   num_buff %u",
+		format_white_space, indent, t->hdr.num_buffers);
+
+  return s;
+}
+
+void
+vhost_user_rx_trace (vhost_trace_t * t,
+		     vhost_user_intf_t * vui, u16 qid,
+		     vlib_buffer_t * b, vhost_user_vring_t * txvq)
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+  u32 qsz_mask = txvq->qsz - 1;
+  u32 last_avail_idx = txvq->last_avail_idx;
+  u32 desc_current = txvq->avail->ring[last_avail_idx & qsz_mask];
+  vring_desc_t *hdr_desc = 0;
+  virtio_net_hdr_mrg_rxbuf_t *hdr;
+  u32 hint = 0;
+
+  memset (t, 0, sizeof (*t));
+  t->device_index = vui - vum->vhost_user_interfaces;
+  t->qid = qid;
+
+  hdr_desc = &txvq->desc[desc_current];
+  if (txvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT)
+    {
+      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_INDIRECT;
+      /* Header is the first here */
+      hdr_desc = map_guest_mem (vui, txvq->desc[desc_current].addr, &hint);
+    }
+  if (txvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT)
+    {
+      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_SIMPLE_CHAINED;
+    }
+  if (!(txvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT) &&
+      !(txvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT))
+    {
+      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_SINGLE_DESC;
+    }
+
+  t->first_desc_len = hdr_desc ? hdr_desc->len : 0;
+
+  if (!hdr_desc || !(hdr = map_guest_mem (vui, hdr_desc->addr, &hint)))
+    {
+      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_MAP_ERROR;
+    }
+  else
+    {
+      u32 len = vui->virtio_net_hdr_sz;
+      memcpy (&t->hdr, hdr, len > hdr_desc->len ? hdr_desc->len : len);
+    }
+}
+
+static inline void
+vhost_user_send_call (vlib_main_t * vm, vhost_user_vring_t * vq)
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+  u64 x = 1;
+  int fd = UNIX_GET_FD (vq->callfd_idx);
+  int rv __attribute__ ((unused));
+  /* TODO: pay attention to rv */
+  rv = write (fd, &x, sizeof (x));
+  vq->n_since_last_int = 0;
+  vq->int_deadline = vlib_time_now (vm) + vum->coalesce_time;
+}
+
+static_always_inline u32
+vhost_user_input_copy (vhost_user_intf_t * vui, vhost_copy_t * cpy,
+		       u16 copy_len, u32 * map_hint)
+{
+  void *src0, *src1, *src2, *src3;
+  if (PREDICT_TRUE (copy_len >= 4))
+    {
+      if (PREDICT_FALSE (!(src2 = map_guest_mem (vui, cpy[0].src, map_hint))))
+	return 1;
+      if (PREDICT_FALSE (!(src3 = map_guest_mem (vui, cpy[1].src, map_hint))))
+	return 1;
+
+      while (PREDICT_TRUE (copy_len >= 4))
+	{
+	  src0 = src2;
+	  src1 = src3;
+
+	  if (PREDICT_FALSE
+	      (!(src2 = map_guest_mem (vui, cpy[2].src, map_hint))))
+	    return 1;
+	  if (PREDICT_FALSE
+	      (!(src3 = map_guest_mem (vui, cpy[3].src, map_hint))))
+	    return 1;
+
+	  CLIB_PREFETCH (src2, 64, LOAD);
+	  CLIB_PREFETCH (src3, 64, LOAD);
+
+	  clib_memcpy ((void *) cpy[0].dst, src0, cpy[0].len);
+	  clib_memcpy ((void *) cpy[1].dst, src1, cpy[1].len);
+	  copy_len -= 2;
+	  cpy += 2;
+	}
+    }
+  while (copy_len)
+    {
+      if (PREDICT_FALSE (!(src0 = map_guest_mem (vui, cpy->src, map_hint))))
+	return 1;
+      clib_memcpy ((void *) cpy->dst, src0, cpy->len);
+      copy_len -= 1;
+      cpy += 1;
+    }
+  return 0;
+}
+
+/**
+ * Try to discard packets from the tx ring (VPP RX path).
+ * Returns the number of discarded packets.
+ */
+u32
+vhost_user_rx_discard_packet (vlib_main_t * vm,
+			      vhost_user_intf_t * vui,
+			      vhost_user_vring_t * txvq, u32 discard_max)
+{
+  /*
+   * On the RX side, each packet corresponds to one descriptor
+   * (it is the same whether it is a shallow descriptor, chained, or indirect).
+   * Therefore, discarding a packet is like discarding a descriptor.
+   */
+  u32 discarded_packets = 0;
+  u32 avail_idx = txvq->avail->idx;
+  u16 qsz_mask = txvq->qsz - 1;
+  while (discarded_packets != discard_max)
+    {
+      if (avail_idx == txvq->last_avail_idx)
+	goto out;
+
+      u16 desc_chain_head =
+	txvq->avail->ring[txvq->last_avail_idx & qsz_mask];
+      txvq->last_avail_idx++;
+      txvq->used->ring[txvq->last_used_idx & qsz_mask].id = desc_chain_head;
+      txvq->used->ring[txvq->last_used_idx & qsz_mask].len = 0;
+      vhost_user_log_dirty_ring (vui, txvq,
+				 ring[txvq->last_used_idx & qsz_mask]);
+      txvq->last_used_idx++;
+      discarded_packets++;
+    }
+
+out:
+  CLIB_MEMORY_BARRIER ();
+  txvq->used->idx = txvq->last_used_idx;
+  vhost_user_log_dirty_ring (vui, txvq, idx);
+  return discarded_packets;
+}
+
+/*
+ * In case of overflow, we need to rewind the array of allocated buffers.
+ */
+static void
+vhost_user_input_rewind_buffers (vlib_main_t * vm,
+				 vhost_cpu_t * cpu, vlib_buffer_t * b_head)
+{
+  u32 bi_current = cpu->rx_buffers[cpu->rx_buffers_len];
+  vlib_buffer_t *b_current = vlib_get_buffer (vm, bi_current);
+  b_current->current_length = 0;
+  b_current->flags = 0;
+  while (b_current != b_head)
+    {
+      cpu->rx_buffers_len++;
+      bi_current = cpu->rx_buffers[cpu->rx_buffers_len];
+      b_current = vlib_get_buffer (vm, bi_current);
+      b_current->current_length = 0;
+      b_current->flags = 0;
+    }
+}
+
+static u32
+vhost_user_if_input (vlib_main_t * vm,
+		     vhost_user_main_t * vum,
+		     vhost_user_intf_t * vui,
+		     u16 qid, vlib_node_runtime_t * node)
+{
+  vhost_user_vring_t *txvq = &vui->vrings[VHOST_VRING_IDX_TX (qid)];
+  u16 n_rx_packets = 0;
+  u32 n_rx_bytes = 0;
+  u16 n_left;
+  u32 n_left_to_next, *to_next;
+  u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
+  u32 n_trace = vlib_get_trace_count (vm, node);
+  u16 qsz_mask;
+  u32 map_hint = 0;
+  u16 cpu_index = os_get_cpu_number ();
+  u16 copy_len = 0;
+
+  {
+    /* do we have pending interrupts ? */
+    vhost_user_vring_t *rxvq = &vui->vrings[VHOST_VRING_IDX_RX (qid)];
+    f64 now = vlib_time_now (vm);
+
+    if ((txvq->n_since_last_int) && (txvq->int_deadline < now))
+      vhost_user_send_call (vm, txvq);
+
+    if ((rxvq->n_since_last_int) && (rxvq->int_deadline < now))
+      vhost_user_send_call (vm, rxvq);
+  }
+
+  if (PREDICT_FALSE (txvq->avail->flags & 0xFFFE))
+    return 0;
+
+  n_left = (u16) (txvq->avail->idx - txvq->last_avail_idx);
+
+  /* nothing to do */
+  if (PREDICT_FALSE (n_left == 0))
+    return 0;
+
+  if (PREDICT_FALSE (!vui->admin_up || !(txvq->enabled)))
+    {
+      /*
+       * Discard input packet if interface is admin down or vring is not
+       * enabled.
+       * "For example, for a networking device, in the disabled state
+       * client must not supply any new RX packets, but must process
+       * and discard any TX packets."
+       */
+      vhost_user_rx_discard_packet (vm, vui, txvq,
+				    VHOST_USER_DOWN_DISCARD_COUNT);
+      return 0;
+    }
+
+  if (PREDICT_FALSE (n_left == txvq->qsz))
+    {
+      /*
+       * Informational error logging when VPP is not
+       * receiving packets fast enough.
+       */
+      vlib_error_count (vm, node->node_index,
+			VHOST_USER_INPUT_FUNC_ERROR_FULL_RX_QUEUE, 1);
+    }
+
+  qsz_mask = txvq->qsz - 1;
+
+  if (n_left > VLIB_FRAME_SIZE)
+    n_left = VLIB_FRAME_SIZE;
+
+  /*
+   * For small packets (<2kB), we will not need more than one vlib buffer
+   * per packet. In case packets are bigger, we will just yeld at some point
+   * in the loop and come back later. This is not an issue as for big packet,
+   * processing cost really comes from the memory copy.
+   */
+  if (PREDICT_FALSE (vum->cpus[cpu_index].rx_buffers_len < n_left + 1))
+    {
+      u32 curr_len = vum->cpus[cpu_index].rx_buffers_len;
+      vum->cpus[cpu_index].rx_buffers_len +=
+	vlib_buffer_alloc_from_free_list (vm,
+					  vum->cpus[cpu_index].rx_buffers +
+					  curr_len,
+					  VHOST_USER_RX_BUFFERS_N - curr_len,
+					  VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+
+      if (PREDICT_FALSE
+	  (vum->cpus[cpu_index].rx_buffers_len <
+	   VHOST_USER_RX_BUFFER_STARVATION))
+	{
+	  /* In case of buffer starvation, discard some packets from the queue
+	   * and log the event.
+	   * We keep doing best effort for the remaining packets. */
+	  u32 flush = (n_left + 1 > vum->cpus[cpu_index].rx_buffers_len) ?
+	    n_left + 1 - vum->cpus[cpu_index].rx_buffers_len : 1;
+	  flush = vhost_user_rx_discard_packet (vm, vui, txvq, flush);
+
+	  n_left -= flush;
+	  vlib_increment_simple_counter (vnet_main.
+					 interface_main.sw_if_counters +
+					 VNET_INTERFACE_COUNTER_DROP,
+					 os_get_cpu_number (),
+					 vui->sw_if_index, flush);
+
+	  vlib_error_count (vm, vhost_user_input_node.index,
+			    VHOST_USER_INPUT_FUNC_ERROR_NO_BUFFER, flush);
+	}
+    }
+
+  while (n_left > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *b_head, *b_current;
+	  u32 bi_current;
+	  u16 desc_current;
+	  u32 desc_data_offset;
+	  vring_desc_t *desc_table = txvq->desc;
+
+	  if (PREDICT_FALSE (vum->cpus[cpu_index].rx_buffers_len <= 1))
+	    {
+	      /* Not enough rx_buffers
+	       * Note: We yeld on 1 so we don't need to do an additional
+	       * check for the next buffer prefetch.
+	       */
+	      n_left = 0;
+	      break;
+	    }
+
+	  desc_current = txvq->avail->ring[txvq->last_avail_idx & qsz_mask];
+	  vum->cpus[cpu_index].rx_buffers_len--;
+	  bi_current = (vum->cpus[cpu_index].rx_buffers)
+	    [vum->cpus[cpu_index].rx_buffers_len];
+	  b_head = b_current = vlib_get_buffer (vm, bi_current);
+	  to_next[0] = bi_current;	//We do that now so we can forget about bi_current
+	  to_next++;
+	  n_left_to_next--;
+
+	  vlib_prefetch_buffer_with_index (vm,
+					   (vum->cpus[cpu_index].rx_buffers)
+					   [vum->cpus[cpu_index].
+					    rx_buffers_len - 1], LOAD);
+
+	  /* Just preset the used descriptor id and length for later */
+	  txvq->used->ring[txvq->last_used_idx & qsz_mask].id = desc_current;
+	  txvq->used->ring[txvq->last_used_idx & qsz_mask].len = 0;
+	  vhost_user_log_dirty_ring (vui, txvq,
+				     ring[txvq->last_used_idx & qsz_mask]);
+
+	  /* The buffer should already be initialized */
+	  b_head->total_length_not_including_first_buffer = 0;
+	  b_head->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
+
+	  if (PREDICT_FALSE (n_trace))
+	    {
+	      //TODO: next_index is not exactly known at that point
+	      vlib_trace_buffer (vm, node, next_index, b_head,
+				 /* follow_chain */ 0);
+	      vhost_trace_t *t0 =
+		vlib_add_trace (vm, node, b_head, sizeof (t0[0]));
+	      vhost_user_rx_trace (t0, vui, qid, b_head, txvq);
+	      n_trace--;
+	      vlib_set_trace_count (vm, node, n_trace);
+	    }
+
+	  /* This depends on the setup but is very consistent
+	   * So I think the CPU branch predictor will make a pretty good job
+	   * at optimizing the decision. */
+	  if (txvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT)
+	    {
+	      desc_table = map_guest_mem (vui, txvq->desc[desc_current].addr,
+					  &map_hint);
+	      desc_current = 0;
+	      if (PREDICT_FALSE (desc_table == 0))
+		{
+		  //FIXME: Handle error by shutdown the queue
+		  goto out;
+		}
+	    }
+
+	  if (PREDICT_TRUE (vui->is_any_layout) ||
+	      (!(desc_table[desc_current].flags & VIRTQ_DESC_F_NEXT)))
+	    {
+	      /* ANYLAYOUT or single buffer */
+	      desc_data_offset = vui->virtio_net_hdr_sz;
+	    }
+	  else
+	    {
+	      /* CSR case without ANYLAYOUT, skip 1st buffer */
+	      desc_data_offset = desc_table[desc_current].len;
+	    }
+
+	  while (1)
+	    {
+	      /* Get more input if necessary. Or end of packet. */
+	      if (desc_data_offset == desc_table[desc_current].len)
+		{
+		  if (PREDICT_FALSE (desc_table[desc_current].flags &
+				     VIRTQ_DESC_F_NEXT))
+		    {
+		      desc_current = desc_table[desc_current].next;
+		      desc_data_offset = 0;
+		    }
+		  else
+		    {
+		      goto out;
+		    }
+		}
+
+	      /* Get more output if necessary. Or end of packet. */
+	      if (PREDICT_FALSE
+		  (b_current->current_length == VLIB_BUFFER_DATA_SIZE))
+		{
+		  if (PREDICT_FALSE
+		      (vum->cpus[cpu_index].rx_buffers_len == 0))
+		    {
+		      /*
+		       * Checking if there are some left buffers.
+		       * If not, just rewind the used buffers and stop.
+		       * Note: Scheduled copies are not cancelled. This is
+		       * not an issue as they would still be valid. Useless,
+		       * but valid.
+		       */
+		      vhost_user_input_rewind_buffers (vm,
+						       &vum->cpus[cpu_index],
+						       b_head);
+		      n_left = 0;
+		      goto stop;
+		    }
+
+		  /* Get next output */
+		  vum->cpus[cpu_index].rx_buffers_len--;
+		  u32 bi_next =
+		    (vum->cpus[cpu_index].rx_buffers)[vum->cpus
+						      [cpu_index].rx_buffers_len];
+		  b_current->next_buffer = bi_next;
+		  b_current->flags |= VLIB_BUFFER_NEXT_PRESENT;
+		  bi_current = bi_next;
+		  b_current = vlib_get_buffer (vm, bi_current);
+		}
+
+	      /* Prepare a copy order executed later for the data */
+	      vhost_copy_t *cpy = &vum->cpus[cpu_index].copy[copy_len];
+	      copy_len++;
+	      u32 desc_data_l =
+		desc_table[desc_current].len - desc_data_offset;
+	      cpy->len = VLIB_BUFFER_DATA_SIZE - b_current->current_length;
+	      cpy->len = (cpy->len > desc_data_l) ? desc_data_l : cpy->len;
+	      cpy->dst = (uword) vlib_buffer_get_current (b_current);
+	      cpy->src = desc_table[desc_current].addr + desc_data_offset;
+
+	      desc_data_offset += cpy->len;
+
+	      b_current->current_length += cpy->len;
+	      b_head->total_length_not_including_first_buffer += cpy->len;
+	    }
+
+	out:
+	  CLIB_PREFETCH (&n_left, sizeof (n_left), LOAD);
+
+	  n_rx_bytes += b_head->total_length_not_including_first_buffer;
+	  n_rx_packets++;
+
+	  b_head->total_length_not_including_first_buffer -=
+	    b_head->current_length;
+
+	  /* consume the descriptor and return it as used */
+	  txvq->last_avail_idx++;
+	  txvq->last_used_idx++;
+
+	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b_head);
+
+	  vnet_buffer (b_head)->sw_if_index[VLIB_RX] = vui->sw_if_index;
+	  vnet_buffer (b_head)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+	  b_head->error = 0;
+
+	  {
+	    u32 next0 = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
+
+	    /* redirect if feature path enabled */
+	    vnet_feature_start_device_input_x1 (vui->sw_if_index, &next0,
+						b_head, 0);
+
+	    u32 bi = to_next[-1];	//Cannot use to_next[-1] in the macro
+	    vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					     to_next, n_left_to_next,
+					     bi, next0);
+	  }
+
+	  n_left--;
+
+	  /*
+	   * Although separating memory copies from virtio ring parsing
+	   * is beneficial, we can offer to perform the copies from time
+	   * to time in order to free some space in the ring.
+	   */
+	  if (PREDICT_FALSE (copy_len >= VHOST_USER_RX_COPY_THRESHOLD))
+	    {
+	      if (PREDICT_FALSE
+		  (vhost_user_input_copy (vui, vum->cpus[cpu_index].copy,
+					  copy_len, &map_hint)))
+		{
+		  clib_warning
+		    ("Memory mapping error on interface hw_if_index=%d "
+		     "(Shutting down - Switch interface down and up to restart)",
+		     vui->hw_if_index);
+		  vui->admin_up = 0;
+		  copy_len = 0;
+		  break;
+		}
+	      copy_len = 0;
+
+	      /* give buffers back to driver */
+	      CLIB_MEMORY_BARRIER ();
+	      txvq->used->idx = txvq->last_used_idx;
+	      vhost_user_log_dirty_ring (vui, txvq, idx);
+	    }
+	}
+    stop:
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  /* Do the memory copies */
+  if (PREDICT_FALSE
+      (vhost_user_input_copy (vui, vum->cpus[cpu_index].copy,
+			      copy_len, &map_hint)))
+    {
+      clib_warning ("Memory mapping error on interface hw_if_index=%d "
+		    "(Shutting down - Switch interface down and up to restart)",
+		    vui->hw_if_index);
+      vui->admin_up = 0;
+    }
+
+  /* give buffers back to driver */
+  CLIB_MEMORY_BARRIER ();
+  txvq->used->idx = txvq->last_used_idx;
+  vhost_user_log_dirty_ring (vui, txvq, idx);
+
+  /* interrupt (call) handling */
+  if ((txvq->callfd_idx != ~0) && !(txvq->avail->flags & 1))
+    {
+      txvq->n_since_last_int += n_rx_packets;
+
+      if (txvq->n_since_last_int > vum->coalesce_frames)
+	vhost_user_send_call (vm, txvq);
+    }
+
+  /* increase rx counters */
+  vlib_increment_combined_counter
+    (vnet_main.interface_main.combined_sw_if_counters
+     + VNET_INTERFACE_COUNTER_RX,
+     os_get_cpu_number (), vui->sw_if_index, n_rx_packets, n_rx_bytes);
+
+  return n_rx_packets;
+}
+
+static uword
+vhost_user_input (vlib_main_t * vm,
+		  vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+  uword n_rx_packets = 0;
+  u32 cpu_index = os_get_cpu_number ();
+
+
+  vhost_iface_and_queue_t *vhiq;
+  vec_foreach (vhiq, vum->cpus[cpu_index].rx_queues)
+  {
+    vhost_user_intf_t *vui =
+      &vum->vhost_user_interfaces[vhiq->vhost_iface_index];
+    n_rx_packets += vhost_user_if_input (vm, vum, vui, vhiq->qid, node);
+  }
+
+  return n_rx_packets;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (vhost_user_input_node) = {
+  .function = vhost_user_input,
+  .type = VLIB_NODE_TYPE_INPUT,
+  .name = "vhost-user-input",
+  .sibling_of = "device-input",
+
+  /* Will be enabled if/when hardware is detected. */
+  .state = VLIB_NODE_STATE_DISABLED,
+
+  .format_buffer = format_ethernet_header_with_length,
+  .format_trace = format_vhost_trace,
+
+  .n_errors = VHOST_USER_INPUT_FUNC_N_ERROR,
+  .error_strings = vhost_user_input_func_error_strings,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (vhost_user_input_node, vhost_user_input)
+/* *INDENT-ON* */
+
+
+void
+vhost_user_tx_trace (vhost_trace_t * t,
+		     vhost_user_intf_t * vui, u16 qid,
+		     vlib_buffer_t * b, vhost_user_vring_t * rxvq)
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+  u32 qsz_mask = rxvq->qsz - 1;
+  u32 last_avail_idx = rxvq->last_avail_idx;
+  u32 desc_current = rxvq->avail->ring[last_avail_idx & qsz_mask];
+  vring_desc_t *hdr_desc = 0;
+  u32 hint = 0;
+
+  memset (t, 0, sizeof (*t));
+  t->device_index = vui - vum->vhost_user_interfaces;
+  t->qid = qid;
+
+  hdr_desc = &rxvq->desc[desc_current];
+  if (rxvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT)
+    {
+      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_INDIRECT;
+      /* Header is the first here */
+      hdr_desc = map_guest_mem (vui, rxvq->desc[desc_current].addr, &hint);
+    }
+  if (rxvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT)
+    {
+      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_SIMPLE_CHAINED;
+    }
+  if (!(rxvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT) &&
+      !(rxvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT))
+    {
+      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_SINGLE_DESC;
+    }
+
+  t->first_desc_len = hdr_desc ? hdr_desc->len : 0;
+}
+
+static_always_inline u32
+vhost_user_tx_copy (vhost_user_intf_t * vui, vhost_copy_t * cpy,
+		    u16 copy_len, u32 * map_hint)
+{
+  void *dst0, *dst1, *dst2, *dst3;
+  if (PREDICT_TRUE (copy_len >= 4))
+    {
+      if (PREDICT_FALSE (!(dst2 = map_guest_mem (vui, cpy[0].dst, map_hint))))
+	return 1;
+      if (PREDICT_FALSE (!(dst3 = map_guest_mem (vui, cpy[1].dst, map_hint))))
+	return 1;
+      while (PREDICT_TRUE (copy_len >= 4))
+	{
+	  dst0 = dst2;
+	  dst1 = dst3;
+
+	  if (PREDICT_FALSE
+	      (!(dst2 = map_guest_mem (vui, cpy[2].dst, map_hint))))
+	    return 1;
+	  if (PREDICT_FALSE
+	      (!(dst3 = map_guest_mem (vui, cpy[3].dst, map_hint))))
+	    return 1;
+
+	  CLIB_PREFETCH ((void *) cpy[2].src, 64, LOAD);
+	  CLIB_PREFETCH ((void *) cpy[3].src, 64, LOAD);
+
+	  clib_memcpy (dst0, (void *) cpy[0].src, cpy[0].len);
+	  clib_memcpy (dst1, (void *) cpy[1].src, cpy[1].len);
+
+	  vhost_user_log_dirty_pages_2 (vui, cpy[0].dst, cpy[0].len, 1);
+	  vhost_user_log_dirty_pages_2 (vui, cpy[1].dst, cpy[1].len, 1);
+	  copy_len -= 2;
+	  cpy += 2;
+	}
+    }
+  while (copy_len)
+    {
+      if (PREDICT_FALSE (!(dst0 = map_guest_mem (vui, cpy->dst, map_hint))))
+	return 1;
+      clib_memcpy (dst0, (void *) cpy->src, cpy->len);
+      vhost_user_log_dirty_pages_2 (vui, cpy->dst, cpy->len, 1);
+      copy_len -= 1;
+      cpy += 1;
+    }
+  return 0;
+}
+
+
+static uword
+vhost_user_tx (vlib_main_t * vm,
+	       vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 *buffers = vlib_frame_args (frame);
+  u32 n_left = frame->n_vectors;
+  vhost_user_main_t *vum = &vhost_user_main;
+  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
+  vhost_user_intf_t *vui =
+    pool_elt_at_index (vum->vhost_user_interfaces, rd->dev_instance);
+  u32 qid = ~0;
+  vhost_user_vring_t *rxvq;
+  u16 qsz_mask;
+  u8 error;
+  u32 cpu_index = os_get_cpu_number ();
+  u32 map_hint = 0;
+  u8 retry = 8;
+  u16 copy_len;
+  u16 tx_headers_len;
+
+  if (PREDICT_FALSE (!vui->admin_up))
+    {
+      error = VHOST_USER_TX_FUNC_ERROR_DOWN;
+      goto done3;
+    }
+
+  if (PREDICT_FALSE (!vui->is_up))
+    {
+      error = VHOST_USER_TX_FUNC_ERROR_NOT_READY;
+      goto done3;
+    }
+
+  qid =
+    VHOST_VRING_IDX_RX (*vec_elt_at_index
+			(vui->per_cpu_tx_qid, os_get_cpu_number ()));
+  rxvq = &vui->vrings[qid];
+  if (PREDICT_FALSE (vui->use_tx_spinlock))
+    vhost_user_vring_lock (vui, qid);
+
+  qsz_mask = rxvq->qsz - 1;	/* qsz is always power of 2 */
+
+retry:
+  error = VHOST_USER_TX_FUNC_ERROR_NONE;
+  tx_headers_len = 0;
+  copy_len = 0;
+  while (n_left > 0)
+    {
+      vlib_buffer_t *b0, *current_b0;
+      u16 desc_head, desc_index, desc_len;
+      vring_desc_t *desc_table;
+      uword buffer_map_addr;
+      u32 buffer_len;
+      u16 bytes_left;
+
+      if (PREDICT_TRUE (n_left > 1))
+	vlib_prefetch_buffer_with_index (vm, buffers[1], LOAD);
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+
+      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	{
+	  vum->cpus[cpu_index].current_trace =
+	    vlib_add_trace (vm, node, b0,
+			    sizeof (*vum->cpus[cpu_index].current_trace));
+	  vhost_user_tx_trace (vum->cpus[cpu_index].current_trace,
+			       vui, qid / 2, b0, rxvq);
+	}
+
+      if (PREDICT_FALSE (rxvq->last_avail_idx == rxvq->avail->idx))
+	{
+	  error = VHOST_USER_TX_FUNC_ERROR_PKT_DROP_NOBUF;
+	  goto done;
+	}
+
+      desc_table = rxvq->desc;
+      desc_head = desc_index =
+	rxvq->avail->ring[rxvq->last_avail_idx & qsz_mask];
+
+      /* Go deeper in case of indirect descriptor
+       * I don't know of any driver providing indirect for RX. */
+      if (PREDICT_FALSE (rxvq->desc[desc_head].flags & VIRTQ_DESC_F_INDIRECT))
+	{
+	  if (PREDICT_FALSE
+	      (rxvq->desc[desc_head].len < sizeof (vring_desc_t)))
+	    {
+	      error = VHOST_USER_TX_FUNC_ERROR_INDIRECT_OVERFLOW;
+	      goto done;
+	    }
+	  if (PREDICT_FALSE
+	      (!(desc_table =
+		 map_guest_mem (vui, rxvq->desc[desc_index].addr,
+				&map_hint))))
+	    {
+	      error = VHOST_USER_TX_FUNC_ERROR_MMAP_FAIL;
+	      goto done;
+	    }
+	  desc_index = 0;
+	}
+
+      desc_len = vui->virtio_net_hdr_sz;
+      buffer_map_addr = desc_table[desc_index].addr;
+      buffer_len = desc_table[desc_index].len;
+
+      {
+	// Get a header from the header array
+	virtio_net_hdr_mrg_rxbuf_t *hdr =
+	  &vum->cpus[cpu_index].tx_headers[tx_headers_len];
+	tx_headers_len++;
+	hdr->hdr.flags = 0;
+	hdr->hdr.gso_type = 0;
+	hdr->num_buffers = 1;	//This is local, no need to check
+
+	// Prepare a copy order executed later for the header
+	vhost_copy_t *cpy = &vum->cpus[cpu_index].copy[copy_len];
+	copy_len++;
+	cpy->len = vui->virtio_net_hdr_sz;
+	cpy->dst = buffer_map_addr;
+	cpy->src = (uword) hdr;
+      }
+
+      buffer_map_addr += vui->virtio_net_hdr_sz;
+      buffer_len -= vui->virtio_net_hdr_sz;
+      bytes_left = b0->current_length;
+      current_b0 = b0;
+      while (1)
+	{
+	  if (buffer_len == 0)
+	    {			//Get new output
+	      if (desc_table[desc_index].flags & VIRTQ_DESC_F_NEXT)
+		{
+		  //Next one is chained
+		  desc_index = desc_table[desc_index].next;
+		  buffer_map_addr = desc_table[desc_index].addr;
+		  buffer_len = desc_table[desc_index].len;
+		}
+	      else if (vui->virtio_net_hdr_sz == 12)	//MRG is available
+		{
+		  virtio_net_hdr_mrg_rxbuf_t *hdr =
+		    &vum->cpus[cpu_index].tx_headers[tx_headers_len - 1];
+
+		  //Move from available to used buffer
+		  rxvq->used->ring[rxvq->last_used_idx & qsz_mask].id =
+		    desc_head;
+		  rxvq->used->ring[rxvq->last_used_idx & qsz_mask].len =
+		    desc_len;
+		  vhost_user_log_dirty_ring (vui, rxvq,
+					     ring[rxvq->last_used_idx &
+						  qsz_mask]);
+
+		  rxvq->last_avail_idx++;
+		  rxvq->last_used_idx++;
+		  hdr->num_buffers++;
+		  desc_len = 0;
+
+		  if (PREDICT_FALSE
+		      (rxvq->last_avail_idx == rxvq->avail->idx))
+		    {
+		      //Dequeue queued descriptors for this packet
+		      rxvq->last_used_idx -= hdr->num_buffers - 1;
+		      rxvq->last_avail_idx -= hdr->num_buffers - 1;
+		      error = VHOST_USER_TX_FUNC_ERROR_PKT_DROP_NOBUF;
+		      goto done;
+		    }
+
+		  desc_table = rxvq->desc;
+		  desc_head = desc_index =
+		    rxvq->avail->ring[rxvq->last_avail_idx & qsz_mask];
+		  if (PREDICT_FALSE
+		      (rxvq->desc[desc_head].flags & VIRTQ_DESC_F_INDIRECT))
+		    {
+		      //It is seriously unlikely that a driver will put indirect descriptor
+		      //after non-indirect descriptor.
+		      if (PREDICT_FALSE
+			  (rxvq->desc[desc_head].len < sizeof (vring_desc_t)))
+			{
+			  error = VHOST_USER_TX_FUNC_ERROR_INDIRECT_OVERFLOW;
+			  goto done;
+			}
+		      if (PREDICT_FALSE
+			  (!(desc_table =
+			     map_guest_mem (vui,
+					    rxvq->desc[desc_index].addr,
+					    &map_hint))))
+			{
+			  error = VHOST_USER_TX_FUNC_ERROR_MMAP_FAIL;
+			  goto done;
+			}
+		      desc_index = 0;
+		    }
+		  buffer_map_addr = desc_table[desc_index].addr;
+		  buffer_len = desc_table[desc_index].len;
+		}
+	      else
+		{
+		  error = VHOST_USER_TX_FUNC_ERROR_PKT_DROP_NOMRG;
+		  goto done;
+		}
+	    }
+
+	  {
+	    vhost_copy_t *cpy = &vum->cpus[cpu_index].copy[copy_len];
+	    copy_len++;
+	    cpy->len = bytes_left;
+	    cpy->len = (cpy->len > buffer_len) ? buffer_len : cpy->len;
+	    cpy->dst = buffer_map_addr;
+	    cpy->src = (uword) vlib_buffer_get_current (current_b0) +
+	      current_b0->current_length - bytes_left;
+
+	    bytes_left -= cpy->len;
+	    buffer_len -= cpy->len;
+	    buffer_map_addr += cpy->len;
+	    desc_len += cpy->len;
+
+	    CLIB_PREFETCH (&rxvq->desc, CLIB_CACHE_LINE_BYTES, LOAD);
+	  }
+
+	  // Check if vlib buffer has more data. If not, get more or break.
+	  if (PREDICT_TRUE (!bytes_left))
+	    {
+	      if (PREDICT_FALSE
+		  (current_b0->flags & VLIB_BUFFER_NEXT_PRESENT))
+		{
+		  current_b0 = vlib_get_buffer (vm, current_b0->next_buffer);
+		  bytes_left = current_b0->current_length;
+		}
+	      else
+		{
+		  //End of packet
+		  break;
+		}
+	    }
+	}
+
+      //Move from available to used ring
+      rxvq->used->ring[rxvq->last_used_idx & qsz_mask].id = desc_head;
+      rxvq->used->ring[rxvq->last_used_idx & qsz_mask].len = desc_len;
+      vhost_user_log_dirty_ring (vui, rxvq,
+				 ring[rxvq->last_used_idx & qsz_mask]);
+      rxvq->last_avail_idx++;
+      rxvq->last_used_idx++;
+
+      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	{
+	  vum->cpus[cpu_index].current_trace->hdr =
+	    vum->cpus[cpu_index].tx_headers[tx_headers_len - 1];
+	}
+
+      n_left--;			//At the end for error counting when 'goto done' is invoked
+      buffers++;
+    }
+
+done:
+  //Do the memory copies
+  if (PREDICT_FALSE
+      (vhost_user_tx_copy (vui, vum->cpus[cpu_index].copy,
+			   copy_len, &map_hint)))
+    {
+      clib_warning ("Memory mapping error on interface hw_if_index=%d "
+		    "(Shutting down - Switch interface down and up to restart)",
+		    vui->hw_if_index);
+      vui->admin_up = 0;
+    }
+
+  CLIB_MEMORY_BARRIER ();
+  rxvq->used->idx = rxvq->last_used_idx;
+  vhost_user_log_dirty_ring (vui, rxvq, idx);
+
+  /*
+   * When n_left is set, error is always set to something too.
+   * In case error is due to lack of remaining buffers, we go back up and
+   * retry.
+   * The idea is that it is better to waste some time on packets
+   * that have been processed already than dropping them and get
+   * more fresh packets with a good likelyhood that they will be dropped too.
+   * This technique also gives more time to VM driver to pick-up packets.
+   * In case the traffic flows from physical to virtual interfaces, this
+   * technique will end-up leveraging the physical NIC buffer in order to
+   * absorb the VM's CPU jitter.
+   */
+  if (n_left && (error == VHOST_USER_TX_FUNC_ERROR_PKT_DROP_NOBUF) && retry)
+    {
+      retry--;
+      goto retry;
+    }
+
+  /* interrupt (call) handling */
+  if ((rxvq->callfd_idx != ~0) && !(rxvq->avail->flags & 1))
+    {
+      rxvq->n_since_last_int += frame->n_vectors - n_left;
+
+      if (rxvq->n_since_last_int > vum->coalesce_frames)
+	vhost_user_send_call (vm, rxvq);
+    }
+
+  vhost_user_vring_unlock (vui, qid);
+
+done3:
+  if (PREDICT_FALSE (n_left && error != VHOST_USER_TX_FUNC_ERROR_NONE))
+    {
+      vlib_error_count (vm, node->node_index, error, n_left);
+      vlib_increment_simple_counter
+	(vnet_main.interface_main.sw_if_counters
+	 + VNET_INTERFACE_COUNTER_DROP,
+	 os_get_cpu_number (), vui->sw_if_index, n_left);
+    }
+
+  vlib_buffer_free (vm, vlib_frame_args (frame), frame->n_vectors);
+  return frame->n_vectors;
+}
+
+static clib_error_t *
+vhost_user_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index,
+				    u32 flags)
+{
+  vnet_hw_interface_t *hif = vnet_get_hw_interface (vnm, hw_if_index);
+  uword is_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_user_intf_t *vui =
+    pool_elt_at_index (vum->vhost_user_interfaces, hif->dev_instance);
+
+  vui->admin_up = is_up;
+
+  if (is_up)
+    vnet_hw_interface_set_flags (vnm, vui->hw_if_index,
+				 VNET_HW_INTERFACE_FLAG_LINK_UP);
+
+  return /* no error */ 0;
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (vhost_user_dev_class,static) = {
+  .name = "vhost-user",
+  .tx_function = vhost_user_tx,
+  .tx_function_n_errors = VHOST_USER_TX_FUNC_N_ERROR,
+  .tx_function_error_strings = vhost_user_tx_func_error_strings,
+  .format_device_name = format_vhost_user_interface_name,
+  .name_renumber = vhost_user_name_renumber,
+  .admin_up_down_function = vhost_user_interface_admin_up_down,
+  .format_tx_trace = format_vhost_trace,
+};
+
+VLIB_DEVICE_TX_FUNCTION_MULTIARCH (vhost_user_dev_class,
+				   vhost_user_tx)
+/* *INDENT-ON* */
+
+static uword
+vhost_user_process (vlib_main_t * vm,
+		    vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_user_intf_t *vui;
+  struct sockaddr_un sun;
+  int sockfd;
+  unix_file_t template = { 0 };
+  f64 timeout = 3153600000.0 /* 100 years */ ;
+  uword *event_data = 0;
+
+  sockfd = socket (AF_UNIX, SOCK_STREAM, 0);
+  sun.sun_family = AF_UNIX;
+  template.read_function = vhost_user_socket_read;
+  template.error_function = vhost_user_socket_error;
+
+  if (sockfd < 0)
+    return 0;
+
+  while (1)
+    {
+      vlib_process_wait_for_event_or_clock (vm, timeout);
+      vlib_process_get_events (vm, &event_data);
+      vec_reset_length (event_data);
+
+      timeout = 3.0;
+
+      /* *INDENT-OFF* */
+      pool_foreach (vui, vum->vhost_user_interfaces, {
+
+	  if (vui->unix_server_index == ~0) { //Nothing to do for server sockets
+	      if (vui->unix_file_index == ~0)
+		{
+		  /* try to connect */
+		  strncpy (sun.sun_path, (char *) vui->sock_filename,
+			   sizeof (sun.sun_path) - 1);
+
+		  if (connect (sockfd, (struct sockaddr *) &sun,
+			       sizeof (struct sockaddr_un)) == 0)
+		    {
+		      vui->sock_errno = 0;
+		      template.file_descriptor = sockfd;
+		      template.private_data =
+			  vui - vhost_user_main.vhost_user_interfaces;
+		      vui->unix_file_index = unix_file_add (&unix_main, &template);
+
+		      //Re-open for next connect
+		      if ((sockfd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) {
+			  clib_warning("Critical: Could not open unix socket");
+			  return 0;
+		      }
+		    }
+		  else
+		    {
+		      vui->sock_errno = errno;
+		    }
+		}
+	      else
+		{
+		  /* check if socket is alive */
+		  int error = 0;
+		  socklen_t len = sizeof (error);
+		  int fd = UNIX_GET_FD(vui->unix_file_index);
+		  int retval =
+		      getsockopt (fd, SOL_SOCKET, SO_ERROR, &error, &len);
+
+		  if (retval)
+		    {
+		      DBG_SOCK ("getsockopt returned %d", retval);
+		      vhost_user_if_disconnect (vui);
+		    }
+		}
+	  }
+      });
+      /* *INDENT-ON* */
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (vhost_user_process_node,static) = {
+    .function = vhost_user_process,
+    .type = VLIB_NODE_TYPE_PROCESS,
+    .name = "vhost-user-process",
+};
+/* *INDENT-ON* */
+
+/**
+ * Disables and reset interface structure.
+ * It can then be either init again, or removed from used interfaces.
+ */
+static void
+vhost_user_term_if (vhost_user_intf_t * vui)
+{
+  // Delete configured thread pinning
+  vec_reset_length (vui->workers);
+  // disconnect interface sockets
+  vhost_user_if_disconnect (vui);
+  vhost_user_update_iface_state (vui);
+
+  if (vui->unix_server_index != ~0)
+    {
+      //Close server socket
+      unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
+					   vui->unix_server_index);
+      unix_file_del (&unix_main, uf);
+      vui->unix_server_index = ~0;
+    }
+}
+
+int
+vhost_user_delete_if (vnet_main_t * vnm, vlib_main_t * vm, u32 sw_if_index)
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_user_intf_t *vui;
+  int rv = 0;
+  vnet_hw_interface_t *hwif;
+
+  if (!(hwif = vnet_get_sup_hw_interface (vnm, sw_if_index)) ||
+      hwif->dev_class_index != vhost_user_dev_class.index)
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+  DBG_SOCK ("Deleting vhost-user interface %s (instance %d)",
+	    hwif->name, hwif->dev_instance);
+
+  vui = pool_elt_at_index (vum->vhost_user_interfaces, hwif->dev_instance);
+
+  // Disable and reset interface
+  vhost_user_term_if (vui);
+
+  // Back to pool
+  pool_put (vum->vhost_user_interfaces, vui);
+
+  // Reset renumbered iface
+  if (hwif->dev_instance <
+      vec_len (vum->show_dev_instance_by_real_dev_instance))
+    vum->show_dev_instance_by_real_dev_instance[hwif->dev_instance] = ~0;
+
+  // Delete ethernet interface
+  ethernet_delete_interface (vnm, vui->hw_if_index);
+  return rv;
+}
+
+/**
+ * Open server unix socket on specified sock_filename.
+ */
+static int
+vhost_user_init_server_sock (const char *sock_filename, int *sock_fd)
+{
+  int rv = 0;
+  struct sockaddr_un un = { };
+  int fd;
+  /* create listening socket */
+  if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
+    return VNET_API_ERROR_SYSCALL_ERROR_1;
+
+  un.sun_family = AF_UNIX;
+  strncpy ((char *) un.sun_path, (char *) sock_filename,
+	   sizeof (un.sun_path) - 1);
+
+  /* remove if exists */
+  unlink ((char *) sock_filename);
+
+  if (bind (fd, (struct sockaddr *) &un, sizeof (un)) == -1)
+    {
+      rv = VNET_API_ERROR_SYSCALL_ERROR_2;
+      goto error;
+    }
+
+  if (listen (fd, 1) == -1)
+    {
+      rv = VNET_API_ERROR_SYSCALL_ERROR_3;
+      goto error;
+    }
+
+  *sock_fd = fd;
+  return 0;
+
+error:
+  close (fd);
+  return rv;
+}
+
+/**
+ * Create ethernet interface for vhost user interface.
+ */
+static void
+vhost_user_create_ethernet (vnet_main_t * vnm, vlib_main_t * vm,
+			    vhost_user_intf_t * vui, u8 * hwaddress)
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+  u8 hwaddr[6];
+  clib_error_t *error;
+
+  /* create hw and sw interface */
+  if (hwaddress)
+    {
+      clib_memcpy (hwaddr, hwaddress, 6);
+    }
+  else
+    {
+      random_u32 (&vum->random);
+      clib_memcpy (hwaddr + 2, &vum->random, sizeof (vum->random));
+      hwaddr[0] = 2;
+      hwaddr[1] = 0xfe;
+    }
+
+  error = ethernet_register_interface
+    (vnm,
+     vhost_user_dev_class.index,
+     vui - vum->vhost_user_interfaces /* device instance */ ,
+     hwaddr /* ethernet address */ ,
+     &vui->hw_if_index, 0 /* flag change */ );
+
+  if (error)
+    clib_error_report (error);
+
+  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, vui->hw_if_index);
+  hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] = 9000;
+}
+
+/*
+ *  Initialize vui with specified attributes
+ */
+static void
+vhost_user_vui_init (vnet_main_t * vnm,
+		     vhost_user_intf_t * vui,
+		     int server_sock_fd,
+		     const char *sock_filename,
+		     u64 feature_mask, u32 * sw_if_index)
+{
+  vnet_sw_interface_t *sw;
+  sw = vnet_get_hw_sw_interface (vnm, vui->hw_if_index);
+  int q;
+
+  if (server_sock_fd != -1)
+    {
+      unix_file_t template = { 0 };
+      template.read_function = vhost_user_socksvr_accept_ready;
+      template.file_descriptor = server_sock_fd;
+      template.private_data = vui - vhost_user_main.vhost_user_interfaces;	//hw index
+      vui->unix_server_index = unix_file_add (&unix_main, &template);
+    }
+  else
+    {
+      vui->unix_server_index = ~0;
+    }
+
+  vui->sw_if_index = sw->sw_if_index;
+  strncpy (vui->sock_filename, sock_filename,
+	   ARRAY_LEN (vui->sock_filename) - 1);
+  vui->sock_errno = 0;
+  vui->is_up = 0;
+  vui->feature_mask = feature_mask;
+  vui->unix_file_index = ~0;
+  vui->log_base_addr = 0;
+
+  for (q = 0; q < VHOST_VRING_MAX_N; q++)
+    vhost_user_vring_init (vui, q);
+
+  vnet_hw_interface_set_flags (vnm, vui->hw_if_index, 0);
+
+  if (sw_if_index)
+    *sw_if_index = vui->sw_if_index;
+
+  for (q = 0; q < VHOST_VRING_MAX_N; q++)
+    {
+      vui->vring_locks[q] = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
+						    CLIB_CACHE_LINE_BYTES);
+      memset ((void *) vui->vring_locks[q], 0, CLIB_CACHE_LINE_BYTES);
+    }
+
+  vec_validate (vui->per_cpu_tx_qid,
+		vlib_get_thread_main ()->n_vlib_mains - 1);
+  vhost_user_tx_thread_placement (vui);
+}
+
+int
+vhost_user_create_if (vnet_main_t * vnm, vlib_main_t * vm,
+		      const char *sock_filename,
+		      u8 is_server,
+		      u32 * sw_if_index,
+		      u64 feature_mask,
+		      u8 renumber, u32 custom_dev_instance, u8 * hwaddr)
+{
+  vhost_user_intf_t *vui = NULL;
+  u32 sw_if_idx = ~0;
+  int rv = 0;
+  int server_sock_fd = -1;
+
+  if (is_server)
+    {
+      if ((rv =
+	   vhost_user_init_server_sock (sock_filename, &server_sock_fd)) != 0)
+	{
+	  return rv;
+	}
+    }
+
+  pool_get (vhost_user_main.vhost_user_interfaces, vui);
+
+  vhost_user_create_ethernet (vnm, vm, vui, hwaddr);
+  vhost_user_vui_init (vnm, vui, server_sock_fd, sock_filename,
+		       feature_mask, &sw_if_idx);
+
+  if (renumber)
+    vnet_interface_name_renumber (sw_if_idx, custom_dev_instance);
+
+  if (sw_if_index)
+    *sw_if_index = sw_if_idx;
+
+  // Process node must connect
+  vlib_process_signal_event (vm, vhost_user_process_node.index, 0, 0);
+  return rv;
+}
+
+int
+vhost_user_modify_if (vnet_main_t * vnm, vlib_main_t * vm,
+		      const char *sock_filename,
+		      u8 is_server,
+		      u32 sw_if_index,
+		      u64 feature_mask, u8 renumber, u32 custom_dev_instance)
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_user_intf_t *vui = NULL;
+  u32 sw_if_idx = ~0;
+  int server_sock_fd = -1;
+  int rv = 0;
+  vnet_hw_interface_t *hwif;
+
+  if (!(hwif = vnet_get_sup_hw_interface (vnm, sw_if_index)) ||
+      hwif->dev_class_index != vhost_user_dev_class.index)
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+  vui = vec_elt_at_index (vum->vhost_user_interfaces, hwif->dev_instance);
+
+  // First try to open server socket
+  if (is_server)
+    if ((rv = vhost_user_init_server_sock (sock_filename,
+					   &server_sock_fd)) != 0)
+      return rv;
+
+  vhost_user_term_if (vui);
+  vhost_user_vui_init (vnm, vui, server_sock_fd,
+		       sock_filename, feature_mask, &sw_if_idx);
+
+  if (renumber)
+    vnet_interface_name_renumber (sw_if_idx, custom_dev_instance);
+
+  // Process node must connect
+  vlib_process_signal_event (vm, vhost_user_process_node.index, 0, 0);
+  return rv;
+}
+
+clib_error_t *
+vhost_user_connect_command_fn (vlib_main_t * vm,
+			       unformat_input_t * input,
+			       vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 *sock_filename = NULL;
+  u32 sw_if_index;
+  u8 is_server = 0;
+  u64 feature_mask = (u64) ~ (0ULL);
+  u8 renumber = 0;
+  u32 custom_dev_instance = ~0;
+  u8 hwaddr[6];
+  u8 *hw = NULL;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "socket %s", &sock_filename))
+	;
+      else if (unformat (line_input, "server"))
+	is_server = 1;
+      else if (unformat (line_input, "feature-mask 0x%llx", &feature_mask))
+	;
+      else
+	if (unformat
+	    (line_input, "hwaddr %U", unformat_ethernet_address, hwaddr))
+	hw = hwaddr;
+      else if (unformat (line_input, "renumber %d", &custom_dev_instance))
+	{
+	  renumber = 1;
+	}
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  vnet_main_t *vnm = vnet_get_main ();
+
+  int rv;
+  if ((rv = vhost_user_create_if (vnm, vm, (char *) sock_filename,
+				  is_server, &sw_if_index, feature_mask,
+				  renumber, custom_dev_instance, hw)))
+    {
+      vec_free (sock_filename);
+      return clib_error_return (0, "vhost_user_create_if returned %d", rv);
+    }
+
+  vec_free (sock_filename);
+  vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main (),
+		   sw_if_index);
+  return 0;
+}
+
+clib_error_t *
+vhost_user_delete_command_fn (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 sw_if_index = ~0;
+  vnet_main_t *vnm = vnet_get_main ();
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+	;
+      else if (unformat
+	       (line_input, "%U", unformat_vnet_sw_interface, vnm,
+		&sw_if_index))
+	{
+	  vnet_hw_interface_t *hwif =
+	    vnet_get_sup_hw_interface (vnm, sw_if_index);
+	  if (hwif == NULL ||
+	      vhost_user_dev_class.index != hwif->dev_class_index)
+	    return clib_error_return (0, "Not a vhost interface");
+	}
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+  vhost_user_delete_if (vnm, vm, sw_if_index);
+  return 0;
+}
+
+int
+vhost_user_dump_ifs (vnet_main_t * vnm, vlib_main_t * vm,
+		     vhost_user_intf_details_t ** out_vuids)
+{
+  int rv = 0;
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_user_intf_t *vui;
+  vhost_user_intf_details_t *r_vuids = NULL;
+  vhost_user_intf_details_t *vuid = NULL;
+  u32 *hw_if_indices = 0;
+  vnet_hw_interface_t *hi;
+  u8 *s = NULL;
+  int i;
+
+  if (!out_vuids)
+    return -1;
+
+  pool_foreach (vui, vum->vhost_user_interfaces,
+		vec_add1 (hw_if_indices, vui->hw_if_index);
+    );
+
+  for (i = 0; i < vec_len (hw_if_indices); i++)
+    {
+      hi = vnet_get_hw_interface (vnm, hw_if_indices[i]);
+      vui = pool_elt_at_index (vum->vhost_user_interfaces, hi->dev_instance);
+
+      vec_add2 (r_vuids, vuid, 1);
+      vuid->sw_if_index = vui->sw_if_index;
+      vuid->virtio_net_hdr_sz = vui->virtio_net_hdr_sz;
+      vuid->features = vui->features;
+      vuid->num_regions = vui->nregions;
+      vuid->sock_errno = vui->sock_errno;
+      strncpy ((char *) vuid->sock_filename, (char *) vui->sock_filename,
+	       ARRAY_LEN (vuid->sock_filename) - 1);
+
+      s = format (s, "%v%c", hi->name, 0);
+
+      strncpy ((char *) vuid->if_name, (char *) s,
+	       ARRAY_LEN (vuid->if_name) - 1);
+      _vec_len (s) = 0;
+    }
+
+  vec_free (s);
+  vec_free (hw_if_indices);
+
+  *out_vuids = r_vuids;
+
+  return rv;
+}
+
+clib_error_t *
+show_vhost_user_command_fn (vlib_main_t * vm,
+			    unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+  clib_error_t *error = 0;
+  vnet_main_t *vnm = vnet_get_main ();
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_user_intf_t *vui;
+  u32 hw_if_index, *hw_if_indices = 0;
+  vnet_hw_interface_t *hi;
+  vhost_cpu_t *vhc;
+  vhost_iface_and_queue_t *vhiq;
+  u32 ci;
+
+  int i, j, q;
+  int show_descr = 0;
+  struct feat_struct
+  {
+    u8 bit;
+    char *str;
+  };
+  struct feat_struct *feat_entry;
+
+  static struct feat_struct feat_array[] = {
+#define _(s,b) { .str = #s, .bit = b, },
+    foreach_virtio_net_feature
+#undef _
+    {.str = NULL}
+  };
+
+#define foreach_protocol_feature \
+  _(VHOST_USER_PROTOCOL_F_MQ) \
+  _(VHOST_USER_PROTOCOL_F_LOG_SHMFD)
+
+  static struct feat_struct proto_feat_array[] = {
+#define _(s) { .str = #s, .bit = s},
+    foreach_protocol_feature
+#undef _
+    {.str = NULL}
+  };
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (input, "%U", unformat_vnet_hw_interface, vnm, &hw_if_index))
+	{
+	  vec_add1 (hw_if_indices, hw_if_index);
+	}
+      else if (unformat (input, "descriptors") || unformat (input, "desc"))
+	show_descr = 1;
+      else
+	{
+	  error = clib_error_return (0, "unknown input `%U'",
+				     format_unformat_error, input);
+	  goto done;
+	}
+    }
+  if (vec_len (hw_if_indices) == 0)
+    {
+      pool_foreach (vui, vum->vhost_user_interfaces,
+		    vec_add1 (hw_if_indices, vui->hw_if_index);
+	);
+    }
+  vlib_cli_output (vm, "Virtio vhost-user interfaces");
+  vlib_cli_output (vm, "Global:\n  coalesce frames %d time %e",
+		   vum->coalesce_frames, vum->coalesce_time);
+
+  for (i = 0; i < vec_len (hw_if_indices); i++)
+    {
+      hi = vnet_get_hw_interface (vnm, hw_if_indices[i]);
+      vui = pool_elt_at_index (vum->vhost_user_interfaces, hi->dev_instance);
+      vlib_cli_output (vm, "Interface: %s (ifindex %d)",
+		       hi->name, hw_if_indices[i]);
+
+      vlib_cli_output (vm, "virtio_net_hdr_sz %d\n"
+		       " features mask (0x%llx): \n"
+		       " features (0x%llx): \n",
+		       vui->virtio_net_hdr_sz, vui->feature_mask,
+		       vui->features);
+
+      feat_entry = (struct feat_struct *) &feat_array;
+      while (feat_entry->str)
+	{
+	  if (vui->features & (1ULL << feat_entry->bit))
+	    vlib_cli_output (vm, "   %s (%d)", feat_entry->str,
+			     feat_entry->bit);
+	  feat_entry++;
+	}
+
+      vlib_cli_output (vm, "  protocol features (0x%llx)",
+		       vui->protocol_features);
+      feat_entry = (struct feat_struct *) &proto_feat_array;
+      while (feat_entry->str)
+	{
+	  if (vui->protocol_features & (1ULL << feat_entry->bit))
+	    vlib_cli_output (vm, "   %s (%d)", feat_entry->str,
+			     feat_entry->bit);
+	  feat_entry++;
+	}
+
+      vlib_cli_output (vm, "\n");
+
+      vlib_cli_output (vm, " socket filename %s type %s errno \"%s\"\n\n",
+		       vui->sock_filename,
+		       (vui->unix_server_index != ~0) ? "server" : "client",
+		       strerror (vui->sock_errno));
+
+      vlib_cli_output (vm, " rx placement: ");
+      vec_foreach (vhc, vum->cpus)
+      {
+	vec_foreach (vhiq, vhc->rx_queues)
+	{
+	  if (vhiq->vhost_iface_index == vui - vum->vhost_user_interfaces)
+	    vlib_cli_output (vm, "   thread %d on vring %d\n",
+			     vhc - vum->cpus, VHOST_VRING_IDX_TX (vhiq->qid));
+	}
+      }
+
+      vlib_cli_output (vm, " tx placement: %s\n",
+		       vui->use_tx_spinlock ? "spin-lock" : "lock-free");
+
+      vec_foreach_index (ci, vui->per_cpu_tx_qid)
+      {
+	vlib_cli_output (vm, "   thread %d on vring %d\n", ci,
+			 VHOST_VRING_IDX_RX (vui->per_cpu_tx_qid[ci]));
+      }
+
+      vlib_cli_output (vm, "\n");
+
+      vlib_cli_output (vm, " Memory regions (total %d)\n", vui->nregions);
+
+      if (vui->nregions)
+	{
+	  vlib_cli_output (vm,
+			   " region fd    guest_phys_addr    memory_size        userspace_addr     mmap_offset        mmap_addr\n");
+	  vlib_cli_output (vm,
+			   " ====== ===== ================== ================== ================== ================== ==================\n");
+	}
+      for (j = 0; j < vui->nregions; j++)
+	{
+	  vlib_cli_output (vm,
+			   "  %d     %-5d 0x%016lx 0x%016lx 0x%016lx 0x%016lx 0x%016lx\n",
+			   j, vui->region_mmap_fd[j],
+			   vui->regions[j].guest_phys_addr,
+			   vui->regions[j].memory_size,
+			   vui->regions[j].userspace_addr,
+			   vui->regions[j].mmap_offset,
+			   pointer_to_uword (vui->region_mmap_addr[j]));
+	}
+      for (q = 0; q < VHOST_VRING_MAX_N; q++)
+	{
+	  if (!vui->vrings[q].started)
+	    continue;
+
+	  vlib_cli_output (vm, "\n Virtqueue %d (%s%s)\n", q,
+			   (q & 1) ? "RX" : "TX",
+			   vui->vrings[q].enabled ? "" : " disabled");
+
+	  vlib_cli_output (vm,
+			   "  qsz %d last_avail_idx %d last_used_idx %d\n",
+			   vui->vrings[q].qsz, vui->vrings[q].last_avail_idx,
+			   vui->vrings[q].last_used_idx);
+
+	  if (vui->vrings[q].avail && vui->vrings[q].used)
+	    vlib_cli_output (vm,
+			     "  avail.flags %x avail.idx %d used.flags %x used.idx %d\n",
+			     vui->vrings[q].avail->flags,
+			     vui->vrings[q].avail->idx,
+			     vui->vrings[q].used->flags,
+			     vui->vrings[q].used->idx);
+
+	  int kickfd = UNIX_GET_FD (vui->vrings[q].kickfd_idx);
+	  int callfd = UNIX_GET_FD (vui->vrings[q].callfd_idx);
+	  vlib_cli_output (vm, "  kickfd %d callfd %d errfd %d\n",
+			   kickfd, callfd, vui->vrings[q].errfd);
+
+	  if (show_descr)
+	    {
+	      vlib_cli_output (vm, "\n  descriptor table:\n");
+	      vlib_cli_output (vm,
+			       "   id          addr         len  flags  next      user_addr\n");
+	      vlib_cli_output (vm,
+			       "  ===== ================== ===== ====== ===== ==================\n");
+	      for (j = 0; j < vui->vrings[q].qsz; j++)
+		{
+		  u32 mem_hint = 0;
+		  vlib_cli_output (vm,
+				   "  %-5d 0x%016lx %-5d 0x%04x %-5d 0x%016lx\n",
+				   j, vui->vrings[q].desc[j].addr,
+				   vui->vrings[q].desc[j].len,
+				   vui->vrings[q].desc[j].flags,
+				   vui->vrings[q].desc[j].next,
+				   pointer_to_uword (map_guest_mem
+						     (vui,
+						      vui->vrings[q].desc[j].
+						      addr, &mem_hint)));
+		}
+	    }
+	}
+      vlib_cli_output (vm, "\n");
+    }
+done:
+  vec_free (hw_if_indices);
+  return error;
+}
+
+/*
+ * CLI functions
+ */
+
+/*?
+ * Create a vHost User interface. Once created, a new virtual interface
+ * will exist with the name '<em>VirtualEthernet0/0/x</em>', where '<em>x</em>'
+ * is the next free index.
+ *
+ * There are several parameters associated with a vHost interface:
+ *
+ * - <b>socket <socket-filename></b> - Name of the linux socket used by QEMU/VM and
+ * VPP to manage the vHost interface. If socket does not already exist, VPP will
+ * create the socket.
+ *
+ * - <b>server</b> - Optional flag to indicate that VPP should be the server for the
+ * linux socket. If not provided, VPP will be the client.
+ *
+ * - <b>feature-mask <hex></b> - Optional virtio/vhost feature set negotiated at
+ * startup. By default, all supported features will be advertised. Otherwise,
+ * provide the set of features desired.
+ *   - 0x000008000 (15) - VIRTIO_NET_F_MRG_RXBUF
+ *   - 0x000020000 (17) - VIRTIO_NET_F_CTRL_VQ
+ *   - 0x000200000 (21) - VIRTIO_NET_F_GUEST_ANNOUNCE
+ *   - 0x000400000 (22) - VIRTIO_NET_F_MQ
+ *   - 0x004000000 (26) - VHOST_F_LOG_ALL
+ *   - 0x008000000 (27) - VIRTIO_F_ANY_LAYOUT
+ *   - 0x010000000 (28) - VIRTIO_F_INDIRECT_DESC
+ *   - 0x040000000 (30) - VHOST_USER_F_PROTOCOL_FEATURES
+ *   - 0x100000000 (32) - VIRTIO_F_VERSION_1
+ *
+ * - <b>hwaddr <mac-addr></b> - Optional ethernet address, can be in either
+ * X:X:X:X:X:X unix or X.X.X cisco format.
+ *
+ * - <b>renumber <dev_instance></b> - Optional parameter which allows the instance
+ * in the name to be specified. If instance already exists, name will be used
+ * anyway and multiple instances will have the same name. Use with caution.
+ *
+ * @cliexpar
+ * Example of how to create a vhost interface with VPP as the client and all features enabled:
+ * @cliexstart{create vhost-user socket /tmp/vhost1.sock}
+ * VirtualEthernet0/0/0
+ * @cliexend
+ * Example of how to create a vhost interface with VPP as the server and with just
+ * multiple queues enabled:
+ * @cliexstart{create vhost-user socket /tmp/vhost2.sock server feature-mask 0x40400000}
+ * VirtualEthernet0/0/1
+ * @cliexend
+ * Once the vHost interface is created, enable the interface using:
+ * @cliexcmd{set interface state VirtualEthernet0/0/0 up}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vhost_user_connect_command, static) = {
+    .path = "create vhost-user",
+    .short_help = "create vhost-user socket <socket-filename> [server] [feature-mask <hex>] [hwaddr <mac-addr>] [renumber <dev_instance>]",
+    .function = vhost_user_connect_command_fn,
+};
+/* *INDENT-ON* */
+
+/*?
+ * Delete a vHost User interface using the interface name or the
+ * software interface index. Use the '<em>show interfaces</em>'
+ * command to determine the software interface index. On deletion,
+ * the linux socket will not be deleted.
+ *
+ * @cliexpar
+ * Example of how to delete a vhost interface by name:
+ * @cliexcmd{delete vhost-user VirtualEthernet0/0/1}
+ * Example of how to delete a vhost interface by software interface index:
+ * @cliexcmd{delete vhost-user sw_if_index 1}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vhost_user_delete_command, static) = {
+    .path = "delete vhost-user",
+    .short_help = "delete vhost-user {<interface> | sw_if_index <sw_idx>}",
+    .function = vhost_user_delete_command_fn,
+};
+
+/*?
+ * Display the attributes of a single vHost User interface (provide interface
+ * name), multiple vHost User interfaces (provide a list of interface names seperated
+ * by spaces) or all Vhost User interfaces (omit an interface name to display all
+ * vHost interfaces).
+ *
+ * @cliexpar
+ * @parblock
+ * Example of how to display a vhost interface:
+ * @cliexstart{show vhost-user VirtualEthernet0/0/0}
+ * Virtio vhost-user interfaces
+ * Global:
+ *   coalesce frames 32 time 1e-3
+ * Interface: VirtualEthernet0/0/0 (ifindex 1)
+ * virtio_net_hdr_sz 12
+ *  features mask (0xffffffffffffffff):
+ *  features (0x50408000):
+ *    VIRTIO_NET_F_MRG_RXBUF (15)
+ *    VIRTIO_NET_F_MQ (22)
+ *    VIRTIO_F_INDIRECT_DESC (28)
+ *    VHOST_USER_F_PROTOCOL_FEATURES (30)
+ *   protocol features (0x3)
+ *    VHOST_USER_PROTOCOL_F_MQ (0)
+ *    VHOST_USER_PROTOCOL_F_LOG_SHMFD (1)
+ *
+ *  socket filename /tmp/vhost1.sock type client errno "Success"
+ *
+ * rx placement:
+ *    thread 1 on vring 1
+ *    thread 1 on vring 5
+ *    thread 2 on vring 3
+ *    thread 2 on vring 7
+ *  tx placement: spin-lock
+ *    thread 0 on vring 0
+ *    thread 1 on vring 2
+ *    thread 2 on vring 0
+ *
+ * Memory regions (total 2)
+ * region fd    guest_phys_addr    memory_size        userspace_addr     mmap_offset        mmap_addr
+ * ====== ===== ================== ================== ================== ================== ==================
+ *   0     60    0x0000000000000000 0x00000000000a0000 0x00002aaaaac00000 0x0000000000000000 0x00002aab2b400000
+ *   1     61    0x00000000000c0000 0x000000003ff40000 0x00002aaaaacc0000 0x00000000000c0000 0x00002aababcc0000
+ *
+ *  Virtqueue 0 (TX)
+ *   qsz 256 last_avail_idx 0 last_used_idx 0
+ *   avail.flags 1 avail.idx 128 used.flags 1 used.idx 0
+ *   kickfd 62 callfd 64 errfd -1
+ *
+ *  Virtqueue 1 (RX)
+ *   qsz 256 last_avail_idx 0 last_used_idx 0
+ *   avail.flags 1 avail.idx 0 used.flags 1 used.idx 0
+ *   kickfd 65 callfd 66 errfd -1
+ *
+ *  Virtqueue 2 (TX)
+ *   qsz 256 last_avail_idx 0 last_used_idx 0
+ *   avail.flags 1 avail.idx 128 used.flags 1 used.idx 0
+ *   kickfd 63 callfd 70 errfd -1
+ *
+ *  Virtqueue 3 (RX)
+ *   qsz 256 last_avail_idx 0 last_used_idx 0
+ *   avail.flags 1 avail.idx 0 used.flags 1 used.idx 0
+ *   kickfd 72 callfd 74 errfd -1
+ *
+ *  Virtqueue 4 (TX disabled)
+ *   qsz 256 last_avail_idx 0 last_used_idx 0
+ *   avail.flags 1 avail.idx 0 used.flags 1 used.idx 0
+ *   kickfd 76 callfd 78 errfd -1
+ *
+ *  Virtqueue 5 (RX disabled)
+ *   qsz 256 last_avail_idx 0 last_used_idx 0
+ *   avail.flags 1 avail.idx 0 used.flags 1 used.idx 0
+ *   kickfd 80 callfd 82 errfd -1
+ *
+ *  Virtqueue 6 (TX disabled)
+ *   qsz 256 last_avail_idx 0 last_used_idx 0
+ *  avail.flags 1 avail.idx 0 used.flags 1 used.idx 0
+ *   kickfd 84 callfd 86 errfd -1
+ *
+ *  Virtqueue 7 (RX disabled)
+ *   qsz 256 last_avail_idx 0 last_used_idx 0
+ *   avail.flags 1 avail.idx 0 used.flags 1 used.idx 0
+ *   kickfd 88 callfd 90 errfd -1
+ *
+ * @cliexend
+ *
+ * The optional '<em>descriptors</em>' parameter will display the same output as
+ * the previous example but will include the descriptor table for each queue.
+ * The output is truncated below:
+ * @cliexstart{show vhost-user VirtualEthernet0/0/0 descriptors}
+ * Virtio vhost-user interfaces
+ * Global:
+ *   coalesce frames 32 time 1e-3
+ * Interface: VirtualEthernet0/0/0 (ifindex 1)
+ * virtio_net_hdr_sz 12
+ *  features mask (0xffffffffffffffff):
+ *  features (0x50408000):
+ *    VIRTIO_NET_F_MRG_RXBUF (15)
+ *    VIRTIO_NET_F_MQ (22)
+ * :
+ *  Virtqueue 0 (TX)
+ *   qsz 256 last_avail_idx 0 last_used_idx 0
+ *   avail.flags 1 avail.idx 128 used.flags 1 used.idx 0
+ *   kickfd 62 callfd 64 errfd -1
+ *
+ *   descriptor table:
+ *    id          addr         len  flags  next      user_addr
+ *   ===== ================== ===== ====== ===== ==================
+ *   0     0x0000000010b6e974 2060  0x0002 1     0x00002aabbc76e974
+ *   1     0x0000000010b6e034 2060  0x0002 2     0x00002aabbc76e034
+ *   2     0x0000000010b6d6f4 2060  0x0002 3     0x00002aabbc76d6f4
+ *   3     0x0000000010b6cdb4 2060  0x0002 4     0x00002aabbc76cdb4
+ *   4     0x0000000010b6c474 2060  0x0002 5     0x00002aabbc76c474
+ *   5     0x0000000010b6bb34 2060  0x0002 6     0x00002aabbc76bb34
+ *   6     0x0000000010b6b1f4 2060  0x0002 7     0x00002aabbc76b1f4
+ *   7     0x0000000010b6a8b4 2060  0x0002 8     0x00002aabbc76a8b4
+ *   8     0x0000000010b69f74 2060  0x0002 9     0x00002aabbc769f74
+ *   9     0x0000000010b69634 2060  0x0002 10    0x00002aabbc769634
+ *   10    0x0000000010b68cf4 2060  0x0002 11    0x00002aabbc768cf4
+ * :
+ *   249   0x0000000000000000 0     0x0000 250   0x00002aab2b400000
+ *   250   0x0000000000000000 0     0x0000 251   0x00002aab2b400000
+ *   251   0x0000000000000000 0     0x0000 252   0x00002aab2b400000
+ *   252   0x0000000000000000 0     0x0000 253   0x00002aab2b400000
+ *   253   0x0000000000000000 0     0x0000 254   0x00002aab2b400000
+ *   254   0x0000000000000000 0     0x0000 255   0x00002aab2b400000
+ *   255   0x0000000000000000 0     0x0000 32768 0x00002aab2b400000
+ *
+ *  Virtqueue 1 (RX)
+ *   qsz 256 last_avail_idx 0 last_used_idx 0
+ * :
+ * @cliexend
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_vhost_user_command, static) = {
+    .path = "show vhost-user",
+    .short_help = "show vhost-user [<interface> [<interface> [..]]] [descriptors]",
+    .function = show_vhost_user_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+vhost_user_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "coalesce-frames %d", &vum->coalesce_frames))
+	;
+      else if (unformat (input, "coalesce-time %f", &vum->coalesce_time))
+	;
+      else if (unformat (input, "dont-dump-memory"))
+	vum->dont_dump_vhost_user_memory = 1;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+
+  return 0;
+}
+
+/* vhost-user { ... } configuration. */
+VLIB_CONFIG_FUNCTION (vhost_user_config, "vhost-user");
+
+void
+vhost_user_unmap_all (void)
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_user_intf_t *vui;
+
+  if (vum->dont_dump_vhost_user_memory)
+    {
+      pool_foreach (vui, vum->vhost_user_interfaces,
+		    unmap_all_mem_regions (vui);
+	);
+    }
+}
+
+static clib_error_t *
+vhost_thread_command_fn (vlib_main_t * vm,
+			 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 worker_thread_index;
+  u32 sw_if_index;
+  u8 del = 0;
+  int rv;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  if (!unformat
+      (line_input, "%U %d", unformat_vnet_sw_interface, vnet_get_main (),
+       &sw_if_index, &worker_thread_index))
+    {
+      unformat_free (line_input);
+      return clib_error_return (0, "unknown input `%U'",
+				format_unformat_error, input);
+    }
+
+  if (unformat (line_input, "del"))
+    del = 1;
+
+  if ((rv =
+       vhost_user_thread_placement (sw_if_index, worker_thread_index, del)))
+    return clib_error_return (0, "vhost_user_thread_placement returned %d",
+			      rv);
+  return 0;
+}
+
+
+/*?
+ * This command is used to move the RX processing for the given
+ * interfaces to the provided thread. If the '<em>del</em>' option is used,
+ * the forced thread assignment is removed and the thread assigment is
+ * reassigned automatically. Use '<em>show vhost-user <interface></em>'
+ * to see the thread assignment.
+ *
+ * @cliexpar
+ * Example of how to move the RX processing for a given interface to a given thread:
+ * @cliexcmd{vhost thread VirtualEthernet0/0/0 1}
+ * Example of how to remove the forced thread assignment for a given interface:
+ * @cliexcmd{vhost thread VirtualEthernet0/0/0 1 del}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vhost_user_thread_command, static) = {
+    .path = "vhost thread",
+    .short_help = "vhost thread <iface> <worker-index> [del]",
+    .function = vhost_thread_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/virtio/vhost-user.h b/src/vnet/devices/virtio/vhost-user.h
new file mode 100644
index 00000000..3083b614
--- /dev/null
+++ b/src/vnet/devices/virtio/vhost-user.h
@@ -0,0 +1,350 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __VIRTIO_VHOST_USER_H__
+#define __VIRTIO_VHOST_USER_H__
+/* vhost-user data structures */
+
+#define VHOST_MEMORY_MAX_NREGIONS       8
+#define VHOST_USER_MSG_HDR_SZ           12
+#define VHOST_VRING_MAX_SIZE            32768
+#define VHOST_VRING_MAX_N               16	//8TX + 8RX
+#define VHOST_VRING_IDX_RX(qid)         (2*qid)
+#define VHOST_VRING_IDX_TX(qid)         (2*qid + 1)
+
+#define VIRTQ_DESC_F_NEXT               1
+#define VIRTQ_DESC_F_INDIRECT           4
+#define VHOST_USER_REPLY_MASK       (0x1 << 2)
+
+#define VHOST_USER_PROTOCOL_F_MQ   0
+#define VHOST_USER_PROTOCOL_F_LOG_SHMFD	1
+#define VHOST_VRING_F_LOG 0
+
+#define VHOST_USER_F_PROTOCOL_FEATURES  30
+#define VHOST_USER_PROTOCOL_FEATURES   ((1ULL << VHOST_USER_PROTOCOL_F_MQ) |	\
+					(1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD))
+
+/* If multiqueue is provided by host, then we suppport it. */
+#define VIRTIO_NET_CTRL_MQ   4
+#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET        0
+#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN        1
+#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX        0x8000
+
+#define VRING_USED_F_NO_NOTIFY  1
+
+#define foreach_virtio_net_feature      \
+ _ (VIRTIO_NET_F_MRG_RXBUF, 15)         \
+ _ (VIRTIO_NET_F_CTRL_VQ, 17)           \
+ _ (VIRTIO_NET_F_GUEST_ANNOUNCE, 21)    \
+ _ (VIRTIO_NET_F_MQ, 22)                \
+ _ (VHOST_F_LOG_ALL, 26)                \
+ _ (VIRTIO_F_ANY_LAYOUT, 27)            \
+ _ (VIRTIO_F_INDIRECT_DESC, 28)         \
+ _ (VHOST_USER_F_PROTOCOL_FEATURES, 30) \
+ _ (VIRTIO_F_VERSION_1, 32)
+
+
+typedef enum
+{
+#define _(f,n) FEAT_##f = (n),
+  foreach_virtio_net_feature
+#undef _
+} virtio_net_feature_t;
+
+int vhost_user_create_if (vnet_main_t * vnm, vlib_main_t * vm,
+			  const char *sock_filename, u8 is_server,
+			  u32 * sw_if_index, u64 feature_mask,
+			  u8 renumber, u32 custom_dev_instance, u8 * hwaddr);
+int vhost_user_modify_if (vnet_main_t * vnm, vlib_main_t * vm,
+			  const char *sock_filename, u8 is_server,
+			  u32 sw_if_index, u64 feature_mask,
+			  u8 renumber, u32 custom_dev_instance);
+int vhost_user_delete_if (vnet_main_t * vnm, vlib_main_t * vm,
+			  u32 sw_if_index);
+
+/* *INDENT-OFF* */
+typedef struct vhost_user_memory_region
+{
+  u64 guest_phys_addr;
+  u64 memory_size;
+  u64 userspace_addr;
+  u64 mmap_offset;
+} __attribute ((packed)) vhost_user_memory_region_t;
+
+typedef struct vhost_user_memory
+{
+  u32 nregions;
+  u32 padding;
+  vhost_user_memory_region_t regions[VHOST_MEMORY_MAX_NREGIONS];
+} __attribute ((packed)) vhost_user_memory_t;
+
+typedef struct
+{
+  u32 index, num;
+} __attribute ((packed)) vhost_vring_state_t;
+
+typedef struct
+{
+  u32 index, flags;
+  u64 desc_user_addr, used_user_addr, avail_user_addr, log_guest_addr;
+} __attribute ((packed)) vhost_vring_addr_t;
+
+typedef struct vhost_user_log
+{
+  u64 size;
+  u64 offset;
+} __attribute ((packed)) vhost_user_log_t;
+
+typedef enum vhost_user_req
+{
+  VHOST_USER_NONE = 0,
+  VHOST_USER_GET_FEATURES = 1,
+  VHOST_USER_SET_FEATURES = 2,
+  VHOST_USER_SET_OWNER = 3,
+  VHOST_USER_RESET_OWNER = 4,
+  VHOST_USER_SET_MEM_TABLE = 5,
+  VHOST_USER_SET_LOG_BASE = 6,
+  VHOST_USER_SET_LOG_FD = 7,
+  VHOST_USER_SET_VRING_NUM = 8,
+  VHOST_USER_SET_VRING_ADDR = 9,
+  VHOST_USER_SET_VRING_BASE = 10,
+  VHOST_USER_GET_VRING_BASE = 11,
+  VHOST_USER_SET_VRING_KICK = 12,
+  VHOST_USER_SET_VRING_CALL = 13,
+  VHOST_USER_SET_VRING_ERR = 14,
+  VHOST_USER_GET_PROTOCOL_FEATURES = 15,
+  VHOST_USER_SET_PROTOCOL_FEATURES = 16,
+  VHOST_USER_GET_QUEUE_NUM = 17,
+  VHOST_USER_SET_VRING_ENABLE = 18,
+  VHOST_USER_MAX
+} vhost_user_req_t;
+
+// vring_desc I/O buffer descriptor
+typedef struct
+{
+  uint64_t addr;  // packet data buffer address
+  uint32_t len;   // packet data buffer size
+  uint16_t flags; // (see below)
+  uint16_t next;  // optional index next descriptor in chain
+} __attribute ((packed)) vring_desc_t;
+
+typedef struct
+{
+  uint16_t flags;
+  volatile uint16_t idx;
+  uint16_t ring[VHOST_VRING_MAX_SIZE];
+} __attribute ((packed)) vring_avail_t;
+
+typedef struct
+{
+  uint16_t flags;
+  uint16_t idx;
+  struct /* vring_used_elem */
+    {
+      uint32_t id;
+      uint32_t len;
+    } ring[VHOST_VRING_MAX_SIZE];
+} __attribute ((packed)) vring_used_t;
+
+typedef struct
+{
+  u8 flags;
+  u8 gso_type;
+  u16 hdr_len;
+  u16 gso_size;
+  u16 csum_start;
+  u16 csum_offset;
+} __attribute ((packed)) virtio_net_hdr_t;
+
+typedef struct  {
+  virtio_net_hdr_t hdr;
+  u16 num_buffers;
+} __attribute ((packed)) virtio_net_hdr_mrg_rxbuf_t;
+
+typedef struct vhost_user_msg {
+  vhost_user_req_t request;
+  u32 flags;
+  u32 size;
+  union
+    {
+      u64 u64;
+      vhost_vring_state_t state;
+      vhost_vring_addr_t addr;
+      vhost_user_memory_t memory;
+      vhost_user_log_t log;
+    };
+} __attribute ((packed)) vhost_user_msg_t;
+/* *INDENT-ON* */
+
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  u16 qsz;
+  u16 last_avail_idx;
+  u16 last_used_idx;
+  u16 n_since_last_int;
+  vring_desc_t *desc;
+  vring_avail_t *avail;
+  vring_used_t *used;
+  f64 int_deadline;
+  u8 started;
+  u8 enabled;
+  u8 log_used;
+  //Put non-runtime in a different cache line
+    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
+  int errfd;
+  u32 callfd_idx;
+  u32 kickfd_idx;
+  u64 log_guest_addr;
+} vhost_user_vring_t;
+
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  u32 is_up;
+  u32 admin_up;
+  u32 unix_server_index;
+  u32 unix_file_index;
+  char sock_filename[256];
+  int sock_errno;
+  u32 hw_if_index, sw_if_index;
+
+  //Feature negotiation
+  u64 features;
+  u64 feature_mask;
+  u64 protocol_features;
+
+  //Memory region information
+  u32 nregions;
+  vhost_user_memory_region_t regions[VHOST_MEMORY_MAX_NREGIONS];
+  void *region_mmap_addr[VHOST_MEMORY_MAX_NREGIONS];
+  u64 region_guest_addr_lo[VHOST_MEMORY_MAX_NREGIONS];
+  u64 region_guest_addr_hi[VHOST_MEMORY_MAX_NREGIONS];
+  u32 region_mmap_fd[VHOST_MEMORY_MAX_NREGIONS];
+
+  //Virtual rings
+  vhost_user_vring_t vrings[VHOST_VRING_MAX_N];
+  volatile u32 *vring_locks[VHOST_VRING_MAX_N];
+
+  int virtio_net_hdr_sz;
+  int is_any_layout;
+
+  void *log_base_addr;
+  u64 log_size;
+
+  /* Whether to use spinlock or per_cpu_tx_qid assignment */
+  u8 use_tx_spinlock;
+  u16 *per_cpu_tx_qid;
+
+  /* Vector of workers for this interface */
+  u32 *workers;
+} vhost_user_intf_t;
+
+typedef struct
+{
+  u16 vhost_iface_index;
+  u16 qid;
+} vhost_iface_and_queue_t;
+
+typedef struct
+{
+  uword dst;
+  uword src;
+  u32 len;
+} vhost_copy_t;
+
+typedef struct
+{
+  u16 qid; /** The interface queue index (Not the virtio vring idx) */
+  u16 device_index; /** The device index */
+  u32 virtio_ring_flags; /** Runtime queue flags  **/
+  u16 first_desc_len; /** Length of the first data descriptor **/
+  virtio_net_hdr_mrg_rxbuf_t hdr; /** Virtio header **/
+} vhost_trace_t;
+
+
+#define VHOST_USER_RX_BUFFERS_N (2 * VLIB_FRAME_SIZE + 2)
+#define VHOST_USER_COPY_ARRAY_N (4 * VLIB_FRAME_SIZE)
+
+typedef struct
+{
+  vhost_iface_and_queue_t *rx_queues;
+  u32 rx_buffers_len;
+  u32 rx_buffers[VHOST_USER_RX_BUFFERS_N];
+
+  virtio_net_hdr_mrg_rxbuf_t tx_headers[VLIB_FRAME_SIZE];
+  vhost_copy_t copy[VHOST_USER_COPY_ARRAY_N];
+
+  /* This is here so it doesn't end-up
+   * using stack or registers. */
+  vhost_trace_t *current_trace;
+} vhost_cpu_t;
+
+typedef struct
+{
+  u32 mtu_bytes;
+  vhost_user_intf_t *vhost_user_interfaces;
+  u32 *show_dev_instance_by_real_dev_instance;
+  u32 coalesce_frames;
+  f64 coalesce_time;
+  int dont_dump_vhost_user_memory;
+
+  /** first cpu index */
+  u32 input_cpu_first_index;
+
+  /** total cpu count */
+  u32 input_cpu_count;
+
+  /** Per-CPU data for vhost-user */
+  vhost_cpu_t *cpus;
+
+  /** Pseudo random iterator */
+  u32 random;
+} vhost_user_main_t;
+
+typedef struct
+{
+  u8 if_name[64];
+  u32 sw_if_index;
+  u32 virtio_net_hdr_sz;
+  u64 features;
+  u8 is_server;
+  u8 sock_filename[256];
+  u32 num_regions;
+  int sock_errno;
+} vhost_user_intf_details_t;
+
+int vhost_user_dump_ifs (vnet_main_t * vnm, vlib_main_t * vm,
+			 vhost_user_intf_details_t ** out_vuids);
+
+// CLI commands to be used from dpdk
+clib_error_t *vhost_user_connect_command_fn (vlib_main_t * vm,
+					     unformat_input_t * input,
+					     vlib_cli_command_t * cmd);
+clib_error_t *vhost_user_delete_command_fn (vlib_main_t * vm,
+					    unformat_input_t * input,
+					    vlib_cli_command_t * cmd);
+clib_error_t *show_vhost_user_command_fn (vlib_main_t * vm,
+					  unformat_input_t * input,
+					  vlib_cli_command_t * cmd);
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/virtio/vhost_user.api b/src/vnet/devices/virtio/vhost_user.api
new file mode 100644
index 00000000..21e42298
--- /dev/null
+++ b/src/vnet/devices/virtio/vhost_user.api
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \brief vhost-user interface create request
+    @param client_index - opaque cookie to identify the sender
+    @param is_server - our side is socket server
+    @param sock_filename - unix socket filename, used to speak with frontend
+    @param use_custom_mac - enable or disable the use of the provided hardware address
+    @param mac_address - hardware address to use if 'use_custom_mac' is set
+*/
+define create_vhost_user_if
+{
+  u32 client_index;
+  u32 context;
+  u8 is_server;
+  u8 sock_filename[256];
+  u8 renumber;
+  u32 custom_dev_instance;
+  u8 use_custom_mac;
+  u8 mac_address[6];
+  u8 tag[64];
+};
+
+/** \brief vhost-user interface create response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+    @param sw_if_index - interface the operation is applied to
+*/
+define create_vhost_user_if_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+};
+
+/** \brief vhost-user interface modify request
+    @param client_index - opaque cookie to identify the sender
+    @param is_server - our side is socket server
+    @param sock_filename - unix socket filename, used to speak with frontend
+*/
+define modify_vhost_user_if
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 is_server;
+  u8 sock_filename[256];
+  u8 renumber;
+  u32 custom_dev_instance;
+};
+
+/** \brief vhost-user interface modify response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define modify_vhost_user_if_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief vhost-user interface delete request
+    @param client_index - opaque cookie to identify the sender
+*/
+define delete_vhost_user_if
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+};
+
+/** \brief vhost-user interface delete response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define delete_vhost_user_if_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Vhost-user interface details structure (fix this)
+    @param sw_if_index - index of the interface
+    @param interface_name - name of interface
+    @param virtio_net_hdr_sz - net header size
+    @param features - interface features
+    @param is_server - vhost-user server socket
+    @param sock_filename - socket filename
+    @param num_regions - number of used memory regions
+*/
+define sw_interface_vhost_user_details
+{
+  u32 context;
+  u32 sw_if_index;
+  u8 interface_name[64];
+  u32 virtio_net_hdr_sz;
+  u64 features;
+  u8 is_server;
+  u8 sock_filename[256];
+  u32 num_regions;
+  i32 sock_errno;
+};
+
+define sw_interface_vhost_user_dump
+{
+  u32 client_index;
+  u32 context;
+};
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/devices/virtio/vhost_user_api.c b/src/vnet/devices/virtio/vhost_user_api.c
new file mode 100644
index 00000000..dd517c26
--- /dev/null
+++ b/src/vnet/devices/virtio/vhost_user_api.c
@@ -0,0 +1,262 @@
+/*
+ *------------------------------------------------------------------
+ * vhost-user_api.c - vhost-user api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/devices/virtio/vhost-user.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                                             \
+_(CREATE_VHOST_USER_IF, create_vhost_user_if)                           \
+_(MODIFY_VHOST_USER_IF, modify_vhost_user_if)                           \
+_(DELETE_VHOST_USER_IF, delete_vhost_user_if)                           \
+_(SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump)           \
+_(SW_INTERFACE_VHOST_USER_DETAILS, sw_interface_vhost_user_details)
+
+/*
+ * WARNING: replicated pending api refactor completion
+ */
+static void
+send_sw_interface_flags_deleted (vpe_api_main_t * am,
+				 unix_shared_memory_queue_t * q,
+				 u32 sw_if_index)
+{
+  vl_api_sw_interface_set_flags_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_FLAGS);
+  mp->sw_if_index = ntohl (sw_if_index);
+
+  mp->admin_up_down = 0;
+  mp->link_up_down = 0;
+  mp->deleted = 1;
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_create_vhost_user_if_t_handler (vl_api_create_vhost_user_if_t * mp)
+{
+  int rv = 0;
+  vl_api_create_vhost_user_if_reply_t *rmp;
+  u32 sw_if_index = (u32) ~ 0;
+  vnet_main_t *vnm = vnet_get_main ();
+  vlib_main_t *vm = vlib_get_main ();
+
+  rv = vhost_user_create_if (vnm, vm, (char *) mp->sock_filename,
+			     mp->is_server, &sw_if_index, (u64) ~ 0,
+			     mp->renumber, ntohl (mp->custom_dev_instance),
+			     (mp->use_custom_mac) ? mp->mac_address : NULL);
+
+  /* Remember an interface tag for the new interface */
+  if (rv == 0)
+    {
+      /* If a tag was supplied... */
+      if (mp->tag[0])
+	{
+	  /* Make sure it's a proper C-string */
+	  mp->tag[ARRAY_LEN (mp->tag) - 1] = 0;
+	  u8 *tag = format (0, "%s%c", mp->tag, 0);
+	  vnet_set_sw_interface_tag (vnm, tag, sw_if_index);
+	}
+    }
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_CREATE_VHOST_USER_IF_REPLY,
+  ({
+    rmp->sw_if_index = ntohl (sw_if_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_modify_vhost_user_if_t_handler (vl_api_modify_vhost_user_if_t * mp)
+{
+  int rv = 0;
+  vl_api_modify_vhost_user_if_reply_t *rmp;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+
+  vnet_main_t *vnm = vnet_get_main ();
+  vlib_main_t *vm = vlib_get_main ();
+
+  rv = vhost_user_modify_if (vnm, vm, (char *) mp->sock_filename,
+			     mp->is_server, sw_if_index, (u64) ~ 0,
+			     mp->renumber, ntohl (mp->custom_dev_instance));
+
+  REPLY_MACRO (VL_API_MODIFY_VHOST_USER_IF_REPLY);
+}
+
+static void
+vl_api_delete_vhost_user_if_t_handler (vl_api_delete_vhost_user_if_t * mp)
+{
+  int rv = 0;
+  vl_api_delete_vhost_user_if_reply_t *rmp;
+  vpe_api_main_t *vam = &vpe_api_main;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+
+  vnet_main_t *vnm = vnet_get_main ();
+  vlib_main_t *vm = vlib_get_main ();
+
+  rv = vhost_user_delete_if (vnm, vm, sw_if_index);
+
+  REPLY_MACRO (VL_API_DELETE_VHOST_USER_IF_REPLY);
+  if (!rv)
+    {
+      unix_shared_memory_queue_t *q =
+	vl_api_client_index_to_input_queue (mp->client_index);
+      if (!q)
+	return;
+
+      vnet_clear_sw_interface_tag (vnm, sw_if_index);
+      send_sw_interface_flags_deleted (vam, q, sw_if_index);
+    }
+}
+
+static void
+  vl_api_sw_interface_vhost_user_details_t_handler
+  (vl_api_sw_interface_vhost_user_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+send_sw_interface_vhost_user_details (vpe_api_main_t * am,
+				      unix_shared_memory_queue_t * q,
+				      vhost_user_intf_details_t * vui,
+				      u32 context)
+{
+  vl_api_sw_interface_vhost_user_details_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_VHOST_USER_DETAILS);
+  mp->sw_if_index = ntohl (vui->sw_if_index);
+  mp->virtio_net_hdr_sz = ntohl (vui->virtio_net_hdr_sz);
+  mp->features = clib_net_to_host_u64 (vui->features);
+  mp->is_server = vui->is_server;
+  mp->num_regions = ntohl (vui->num_regions);
+  mp->sock_errno = ntohl (vui->sock_errno);
+  mp->context = context;
+
+  strncpy ((char *) mp->sock_filename,
+	   (char *) vui->sock_filename, ARRAY_LEN (mp->sock_filename) - 1);
+  strncpy ((char *) mp->interface_name,
+	   (char *) vui->if_name, ARRAY_LEN (mp->interface_name) - 1);
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+  vl_api_sw_interface_vhost_user_dump_t_handler
+  (vl_api_sw_interface_vhost_user_dump_t * mp)
+{
+  int rv = 0;
+  vpe_api_main_t *am = &vpe_api_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  vlib_main_t *vm = vlib_get_main ();
+  vhost_user_intf_details_t *ifaces = NULL;
+  vhost_user_intf_details_t *vuid = NULL;
+  unix_shared_memory_queue_t *q;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  rv = vhost_user_dump_ifs (vnm, vm, &ifaces);
+  if (rv)
+    return;
+
+  vec_foreach (vuid, ifaces)
+  {
+    send_sw_interface_vhost_user_details (am, q, vuid, mp->context);
+  }
+  vec_free (ifaces);
+}
+
+/*
+ * vhost-user_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_vhost_user;
+#undef _
+}
+
+static clib_error_t *
+vhost_user_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (vhost_user_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/dhcp/client.c b/src/vnet/dhcp/client.c
new file mode 100644
index 00000000..c352e310
--- /dev/null
+++ b/src/vnet/dhcp/client.c
@@ -0,0 +1,1031 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/dhcp/proxy.h>
+#include <vnet/fib/fib_table.h>
+
+dhcp_client_main_t dhcp_client_main;
+static u8 * format_dhcp_client_state (u8 * s, va_list * va);
+static vlib_node_registration_t dhcp_client_process_node;
+
+static void 
+dhcp_client_acquire_address (dhcp_client_main_t * dcm, dhcp_client_t * c)
+{
+  /* 
+   * Install any/all info gleaned from dhcp, right here
+   */
+  ip4_add_del_interface_address (dcm->vlib_main, c->sw_if_index,
+                                 (void *) &c->leased_address,
+                                 c->subnet_mask_width, 0 /*is_del*/);
+}
+
+static void 
+dhcp_client_release_address (dhcp_client_main_t * dcm, dhcp_client_t * c)
+{
+  /* 
+   * Remove any/all info gleaned from dhcp, right here. Caller(s)
+   * have not wiped out the info yet.
+   */
+
+  ip4_add_del_interface_address (dcm->vlib_main, c->sw_if_index,
+                                 (void *) &c->leased_address,
+                                 c->subnet_mask_width, 1 /*is_del*/);
+}
+
+static void
+set_l2_rewrite (dhcp_client_main_t * dcm, dhcp_client_t * c)
+{
+  /* Acquire the L2 rewrite string for the indicated sw_if_index */
+  c->l2_rewrite = vnet_build_rewrite_for_sw_interface(
+                      dcm->vnet_main,
+		      c->sw_if_index, 
+		      VNET_LINK_IP4,
+		      0 /* broadcast */);
+}
+
+/* 
+ * dhcp_client_for_us - server-to-client callback.
+ * Called from proxy_node.c:dhcp_proxy_to_client_input().
+ * This function first decides that the packet in question is
+ * actually for the dhcp client code in case we're also acting as
+ * a dhcp proxy. Ay caramba, what a folly!
+ */
+int dhcp_client_for_us (u32 bi, vlib_buffer_t * b,
+                        ip4_header_t * ip,
+                        udp_header_t * udp,
+                        dhcp_header_t * dhcp)
+{
+  dhcp_client_main_t * dcm = &dhcp_client_main;
+  vlib_main_t * vm = dcm->vlib_main;
+  dhcp_client_t * c;
+  uword * p;
+  f64 now = vlib_time_now (dcm->vlib_main);
+  u8 dhcp_message_type = 0;
+  dhcp_option_t * o;
+
+  /* 
+   * Doing dhcp client on this interface? 
+   * Presumably we will always receive dhcp clnt for-us pkts on
+   * the interface that's asking for an address.
+   */
+  p = hash_get (dcm->client_by_sw_if_index, 
+                vnet_buffer(b)->sw_if_index [VLIB_RX]);
+  if (p == 0)
+    return 0;                   /* no */
+  
+  c = pool_elt_at_index (dcm->clients, p[0]);
+
+  /* Mixing dhcp relay and dhcp proxy? DGMS... */
+  if (c->state == DHCP_BOUND && c->retry_count == 0)
+    return 0;
+
+  /* parse through the packet, learn what we can */
+  if (dhcp->your_ip_address.as_u32)
+    c->leased_address.as_u32 = dhcp->your_ip_address.as_u32;
+      
+  o = (dhcp_option_t *) dhcp->options;
+  
+  while (o->option != 0xFF /* end of options */ &&
+         (u8 *) o < (b->data + b->current_data + b->current_length))
+    {
+      switch (o->option)
+        {
+        case 53:                /* dhcp message type */
+          dhcp_message_type = o->data[0];
+          break;
+
+        case 51:                /* lease time */
+          {
+            u32 lease_time_in_seconds = 
+              clib_host_to_net_u32 (o->data_as_u32[0]);
+            c->lease_expires = now + (f64) lease_time_in_seconds;
+            c->lease_lifetime = lease_time_in_seconds;
+            /* Set a sensible default, in case we don't get opt 58 */
+            c->lease_renewal_interval = lease_time_in_seconds / 2;
+          }
+          break;
+
+        case 58:                /* lease renew time in seconds */
+          {
+            u32 lease_renew_time_in_seconds = 
+              clib_host_to_net_u32 (o->data_as_u32[0]);
+            c->lease_renewal_interval = lease_renew_time_in_seconds;
+          }
+          break;
+
+        case 54:                /* dhcp server address */
+          c->dhcp_server.as_u32 = o->data_as_u32[0];
+          break;
+
+        case 1:                 /* subnet mask */
+          {
+            u32 subnet_mask = 
+              clib_host_to_net_u32 (o->data_as_u32[0]);
+            c->subnet_mask_width = count_set_bits (subnet_mask);
+          }
+          break;
+        case 3:                 /* router address */
+          {
+            u32 router_address = o->data_as_u32[0];
+            c->router_address.as_u32 = router_address;
+          }
+          break;
+
+        case 12:                 /* hostname */
+          {
+            /* Replace the existing hostname if necessary */
+            vec_free (c->hostname);
+            vec_validate (c->hostname, o->length - 1);
+            clib_memcpy (c->hostname, o->data, o->length);
+          }
+          break;
+
+          /* $$$$ Your message in this space, parse more options */
+        default:
+          break;
+        }
+
+      o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
+    }
+
+  switch (c->state)
+    {
+    case DHCP_DISCOVER:
+      if (dhcp_message_type != DHCP_PACKET_OFFER)
+        {
+          clib_warning ("sw_if_index %d state %U message type %d",
+                        c->sw_if_index, format_dhcp_client_state,
+                        c->state, dhcp_message_type);
+          c->next_transmit = now + 5.0;
+          break;
+        }
+      /* Received an offer, go send a request */
+      c->state = DHCP_REQUEST;
+      c->retry_count = 0;
+      c->next_transmit = 0;     /* send right now... */
+      /* Poke the client process, which will send the request */
+      vlib_process_signal_event (vm, dhcp_client_process_node.index, 
+                                 EVENT_DHCP_CLIENT_WAKEUP, c - dcm->clients);
+      break;
+
+    case DHCP_BOUND:
+    case DHCP_REQUEST:
+      if (dhcp_message_type != DHCP_PACKET_ACK)
+        {
+          clib_warning ("sw_if_index %d state %U message type %d",
+                        c->sw_if_index, format_dhcp_client_state,
+                        c->state, dhcp_message_type);
+          c->next_transmit = now + 5.0;
+          break;
+        }
+      /* OK, we own the address (etc), add to the routing table(s) */
+      if (c->state == DHCP_REQUEST)
+        {
+          void (*fp)(u32, u32, u8 *, u8, u8 *, u8 *, u8 *) = c->event_callback;
+
+          dhcp_client_acquire_address (dcm, c);
+
+          /*
+           * Configure default IP route:
+           */
+          if (c->router_address.as_u32)
+	    {
+	      fib_prefix_t all_0s =
+	      {
+		  .fp_len = 0,
+		  .fp_addr.ip4.as_u32 = 0x0,
+		  .fp_proto = FIB_PROTOCOL_IP4,
+	      };
+	      ip46_address_t nh =
+	      {
+		  .ip4 = c->router_address,
+	      };
+
+	      fib_table_entry_path_add (fib_table_get_index_for_sw_if_index(
+					   FIB_PROTOCOL_IP4,
+					   c->sw_if_index),
+					&all_0s,
+					FIB_SOURCE_DHCP,
+					FIB_ENTRY_FLAG_NONE,
+					FIB_PROTOCOL_IP4,
+					&nh,
+					c->sw_if_index,
+					~0,
+					1,
+					NULL, // no label stack
+					FIB_ROUTE_PATH_FLAG_NONE);
+	    }
+
+          /*
+           * Call the user's event callback to report DHCP information
+           */
+          if (fp)
+            (*fp) (c->client_index,  /* clinet index */
+                   c->pid,
+                   c->hostname,
+                   0, /* is_ipv6 */
+                   (u8 *)&c->leased_address,  /* host IP address */
+                   (u8 *)&c->router_address,  /* router IP address */
+                   (u8 *)(c->l2_rewrite + 6));/* host MAC address */
+        }
+
+      c->state = DHCP_BOUND;
+      c->retry_count = 0;
+      c->next_transmit = now + (f64) c->lease_renewal_interval;
+      c->lease_expires = now + (f64) c->lease_lifetime;
+      break;
+
+    default:
+      clib_warning ("client %d bogus state %d", 
+                    c - dcm->clients, c->state);
+      break;
+    }
+
+  /* drop the pkt, return 1 */
+  vlib_buffer_free (vm, &bi, 1);
+  return 1;
+}
+
+static void 
+send_dhcp_pkt (dhcp_client_main_t * dcm, dhcp_client_t * c, 
+               dhcp_packet_type_t type, int is_broadcast)
+{
+  vlib_main_t * vm = dcm->vlib_main;
+  vnet_main_t * vnm = dcm->vnet_main;
+  vnet_hw_interface_t * hw = vnet_get_sup_hw_interface (vnm, c->sw_if_index);
+  vnet_sw_interface_t * sup_sw 
+    = vnet_get_sup_sw_interface (vnm, c->sw_if_index);
+  vnet_sw_interface_t * sw = vnet_get_sw_interface (vnm, c->sw_if_index);
+  vlib_buffer_t * b;
+  u32 bi;
+  ip4_header_t * ip;
+  udp_header_t * udp;
+  dhcp_header_t * dhcp;
+  u32 * to_next;
+  vlib_frame_t * f;
+  dhcp_option_t * o;
+  u16 udp_length, ip_length;
+
+  /* Interface(s) down? */
+  if ((hw->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) == 0)
+    return;
+  if ((sup_sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) == 0)
+    return;
+  if ((sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) == 0)
+    return;
+
+  if (vlib_buffer_alloc (vm, &bi, 1) != 1) {
+    clib_warning ("buffer allocation failure");
+    c->next_transmit = 0;
+    return;
+  }
+    
+  /* Build a dhcpv4 pkt from whole cloth */
+  b = vlib_get_buffer (vm, bi);
+
+  ASSERT (b->current_data == 0);
+
+  vnet_buffer(b)->sw_if_index[VLIB_RX] = c->sw_if_index;
+  if (is_broadcast) 
+    {
+      f = vlib_get_frame_to_node (vm, hw->output_node_index);
+      vnet_buffer(b)->sw_if_index[VLIB_TX] = c->sw_if_index;
+      clib_memcpy (b->data, c->l2_rewrite, vec_len(c->l2_rewrite));
+      ip = (void *)
+        (((u8 *)vlib_buffer_get_current (b)) + vec_len (c->l2_rewrite));
+    }
+  else
+    {
+      f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
+      vnet_buffer(b)->sw_if_index[VLIB_TX] = ~0; /* use interface VRF */
+      ip = vlib_buffer_get_current (b);
+    }
+
+  /* Enqueue the packet right now */
+  to_next = vlib_frame_vector_args (f);
+  to_next[0] = bi;
+  f->n_vectors = 1;
+
+  if (is_broadcast)
+    vlib_put_frame_to_node (vm, hw->output_node_index, f);
+  else
+    vlib_put_frame_to_node (vm, ip4_lookup_node.index, f);
+    
+  udp = (udp_header_t *)(ip+1);
+  dhcp = (dhcp_header_t *)(udp+1);
+
+  /* $$$ optimize, maybe */
+  memset (ip, 0, sizeof (*ip) + sizeof (*udp) + sizeof (*dhcp));
+
+  ip->ip_version_and_header_length = 0x45;
+  ip->ttl = 128;
+  ip->protocol = IP_PROTOCOL_UDP;
+  
+  if (is_broadcast)
+    {
+      /* src = 0.0.0.0, dst = 255.255.255.255 */
+      ip->dst_address.as_u32 = ~0;
+    }
+  else
+    {
+      /* Renewing an active lease, plain old ip4 src/dst */
+      ip->src_address.as_u32 = c->leased_address.as_u32;
+      ip->dst_address.as_u32 = c->dhcp_server.as_u32;
+    }
+
+  udp->src_port = clib_host_to_net_u16 (UDP_DST_PORT_dhcp_to_client);
+  udp->dst_port = clib_host_to_net_u16 (UDP_DST_PORT_dhcp_to_server);
+
+  /* Send the interface MAC address */
+  clib_memcpy (dhcp->client_hardware_address, c->l2_rewrite + 6, 6);
+
+  /* Lease renewal, set up client_ip_address */
+  if (is_broadcast == 0)
+    dhcp->client_ip_address.as_u32 = c->leased_address.as_u32;
+
+  dhcp->opcode = 1; /* request, all we send */
+  dhcp->hardware_type = 1; /* ethernet */
+  dhcp->hardware_address_length = 6; 
+  dhcp->transaction_identifier = c->transaction_id;  
+  dhcp->flags = clib_host_to_net_u16(is_broadcast ? DHCP_FLAG_BROADCAST : 0);
+  dhcp->magic_cookie.as_u32 = DHCP_MAGIC;
+  
+  o = (dhcp_option_t * )dhcp->options;
+
+  /* Send option 53, the DHCP message type */
+  o->option = 53;
+  o->length = 1;
+  o->data[0] = type;
+  o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
+
+  /* Send option 57, max msg length */
+  if (0 /* not needed, apparently */)
+    {
+      o->option = 57;
+      o->length = 2;
+      {
+        u16 *o2 = (u16 *) o->data;
+        *o2 = clib_host_to_net_u16 (1152);
+        o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
+      }
+    }
+
+  /*
+   * If server ip address is available with non-zero value,
+   * option 54 (DHCP Server Identifier) is sent.
+   */
+  if (c->dhcp_server.as_u32)
+    {
+      o->option = 54;
+      o->length = 4;
+      clib_memcpy (o->data, &c->dhcp_server.as_u32, 4);
+      o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
+    }
+
+  /* send option 50, requested IP address */
+  if (c->leased_address.as_u32)
+    {
+      o->option = 50;
+      o->length = 4;
+      clib_memcpy (o->data, &c->leased_address.as_u32, 4);
+      o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
+    }
+
+  /* send option 12, host name */
+  if (vec_len (c->hostname))
+    {
+      o->option = 12;
+      o->length = vec_len (c->hostname);
+      clib_memcpy (o->data, c->hostname, vec_len (c->hostname));
+      o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
+    }
+
+  /* $$ maybe send the client s/w version if anyone cares */
+
+  /* 
+   * send option 55, parameter request list
+   * The current list - see below, matches the Linux dhcp client's list
+   * Any specific dhcp server config and/or dhcp server may or may
+   * not yield specific options.
+   */
+  o->option = 55;
+  o->length = vec_len (c->option_55_data);
+  clib_memcpy (o->data, c->option_55_data, vec_len(c->option_55_data));
+  o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
+
+  /* End of list */
+  o->option = 0xff;
+  o->length = 0;
+  o++;
+  
+  b->current_length = ((u8 *)o) - b->data;
+
+  /* fix ip length, checksum and udp length */
+  ip_length = vlib_buffer_length_in_chain (vm, b);
+  if (is_broadcast)
+      ip_length -= vec_len (c->l2_rewrite);
+
+  ip->length = clib_host_to_net_u16(ip_length);
+  ip->checksum = ip4_header_checksum(ip);
+
+  udp_length = ip_length - (sizeof (*ip));
+  udp->length = clib_host_to_net_u16 (udp_length);
+}
+
+static int 
+dhcp_discover_state (dhcp_client_main_t * dcm, dhcp_client_t * c, f64 now)
+{
+  /*
+   * State machine "DISCOVER" state. Send a dhcp discover packet,
+   * eventually back off the retry rate.
+   */
+  send_dhcp_pkt (dcm, c, DHCP_PACKET_DISCOVER, 1 /* is_broadcast */);
+
+  c->retry_count++;
+  if (c->retry_count > 10)
+    c->next_transmit = now + 5.0;
+  else
+    c->next_transmit = now + 1.0;
+  return 0;
+}
+                                
+static int 
+dhcp_request_state (dhcp_client_main_t * dcm, dhcp_client_t * c, f64 now)
+{                              
+  /*
+   * State machine "REQUEST" state. Send a dhcp request packet,
+   * eventually drop back to the discover state.
+   */
+  send_dhcp_pkt (dcm, c, DHCP_PACKET_REQUEST, 1 /* is_broadcast */);
+
+  c->retry_count++;
+  if (c->retry_count > 7 /* lucky you */)
+    {
+      c->state = DHCP_DISCOVER;
+      c->next_transmit = now;
+      c->retry_count = 0;
+      return 1;
+    }
+  c->next_transmit = now + 1.0;
+  return 0;
+}
+
+static int 
+dhcp_bound_state (dhcp_client_main_t * dcm, dhcp_client_t * c, f64 now)
+{
+  /*
+   * State machine "BOUND" state. Send a dhcp request packet,
+   * eventually, when the lease expires, forget the dhcp data
+   * and go back to the stone age.
+   */
+  send_dhcp_pkt (dcm, c, DHCP_PACKET_REQUEST, 0 /* is_broadcast */);
+  
+  c->retry_count++;
+  if (c->retry_count > 10)
+    c->next_transmit = now + 5.0;
+  else
+    c->next_transmit = now + 1.0;
+  
+  if (now > c->lease_expires)
+    {
+      if (c->router_address.as_u32)
+        {
+	  fib_prefix_t all_0s =
+	  {
+	      .fp_len = 0,
+	      .fp_addr.ip4.as_u32 = 0x0,
+	      .fp_proto = FIB_PROTOCOL_IP4,
+	  };
+	  ip46_address_t nh = {
+	      .ip4 = c->router_address,
+	  };
+
+	  fib_table_entry_path_remove(fib_table_get_index_for_sw_if_index(
+					  FIB_PROTOCOL_IP4,
+					  c->sw_if_index),
+				      &all_0s,
+				      FIB_SOURCE_DHCP,
+				      FIB_PROTOCOL_IP4,
+				      &nh,
+				      c->sw_if_index,
+				      ~0,
+				      1,
+				      FIB_ROUTE_PATH_FLAG_NONE);
+	}
+
+      dhcp_client_release_address (dcm, c);
+      c->state = DHCP_DISCOVER;
+      c->next_transmit = now;
+      c->retry_count = 0;
+      /* Wipe out any memory of the address we had... */
+      c->leased_address.as_u32 = 0;
+      c->subnet_mask_width = 0;
+      c->router_address.as_u32 = 0;
+      c->lease_renewal_interval = 0;
+      c->dhcp_server.as_u32 = 0;
+      return 1;
+    }
+  return 0;
+}
+
+static f64 dhcp_client_sm (f64 now, f64 timeout, uword pool_index)
+{
+  dhcp_client_main_t * dcm = &dhcp_client_main;
+  dhcp_client_t * c;
+
+  /* deleted, pooched, yadda yadda yadda */
+  if (pool_is_free_index (dcm->clients, pool_index))
+    return timeout;
+
+  c = pool_elt_at_index (dcm->clients, pool_index);
+
+  /* Time for us to do something with this client? */
+  if (now < c->next_transmit)
+    return timeout;
+
+ again:
+  switch (c->state)
+    {
+    case DHCP_DISCOVER:         /* send a discover */
+      if (dhcp_discover_state (dcm, c, now))
+        goto again;
+      break;
+
+    case DHCP_REQUEST:          /* send a request */
+      if (dhcp_request_state (dcm, c, now))
+        goto again;
+      break;
+      
+    case DHCP_BOUND:            /* bound, renew needed? */
+      if (dhcp_bound_state (dcm, c, now))
+        goto again;
+      break;
+      
+    default:
+      clib_warning ("dhcp client %d bogus state %d", 
+                    c - dcm->clients, c->state);
+      break;
+    }
+  
+  if (c->next_transmit < now + timeout)
+    return c->next_transmit - now;
+
+  return timeout;
+}
+
+static uword
+dhcp_client_process (vlib_main_t * vm,
+                     vlib_node_runtime_t * rt,
+                     vlib_frame_t * f)
+{
+  f64 timeout = 100.0;
+  f64 now;
+  uword event_type;
+  uword * event_data = 0;
+  dhcp_client_main_t * dcm = &dhcp_client_main;
+  dhcp_client_t * c;
+  int i;
+
+  while (1)
+    {
+      vlib_process_wait_for_event_or_clock (vm, timeout);
+
+      event_type = vlib_process_get_events (vm, &event_data);
+
+      now = vlib_time_now (vm);
+
+      switch (event_type)
+        {
+        case EVENT_DHCP_CLIENT_WAKEUP:
+          for (i = 0; i < vec_len (event_data); i++)
+            timeout = dhcp_client_sm (now, timeout, event_data[i]);
+          break;
+
+        case ~0:
+          pool_foreach (c, dcm->clients,
+          ({
+            timeout = dhcp_client_sm (now, timeout, 
+                                          (uword)(c - dcm->clients));
+          }));
+          if (pool_elts (dcm->clients) == 0)
+            timeout = 100.0;
+          break;
+        }
+
+      vec_reset_length (event_data);
+    }
+
+  /* NOTREACHED */
+  return 0;
+}
+
+VLIB_REGISTER_NODE (dhcp_client_process_node,static) = {
+    .function = dhcp_client_process,
+    .type = VLIB_NODE_TYPE_PROCESS,
+    .name = "dhcp-client-process",
+    .process_log2_n_stack_bytes = 16,
+};
+
+static u8 * format_dhcp_client_state (u8 * s, va_list * va)
+{
+  dhcp_client_state_t state = va_arg (*va, dhcp_client_state_t);
+  char * str = "BOGUS!";
+
+  switch (state)
+    {
+#define _(a)                                    \
+    case a:                                     \
+      str = #a;                                 \
+        break;
+      foreach_dhcp_client_state;
+#undef _
+    default:
+      break;
+    }
+
+  s = format (s, "%s", str);
+  return s;
+}
+
+static u8 * format_dhcp_client (u8 * s, va_list * va)
+{
+  dhcp_client_main_t * dcm = va_arg (*va, dhcp_client_main_t *);
+  dhcp_client_t * c = va_arg (*va, dhcp_client_t *);
+  int verbose = va_arg (*va, int);
+
+  s = format (s, "[%d] %U state %U ", c - dcm->clients, 
+              format_vnet_sw_if_index_name, dcm->vnet_main, c->sw_if_index,
+              format_dhcp_client_state, c->state);
+
+  if (c->leased_address.as_u32)
+    s = format (s, "addr %U/%d gw %U\n",
+                format_ip4_address, &c->leased_address, 
+                c->subnet_mask_width, format_ip4_address, &c->router_address);
+  else
+    s = format (s, "no address\n");
+
+  if (verbose)
+    {
+      s = format (s, "retry count %d, next xmt %.2f",
+                  c->retry_count, c->next_transmit);
+    }
+  return s;
+}
+
+static clib_error_t *
+show_dhcp_client_command_fn (vlib_main_t * vm,
+                             unformat_input_t * input,
+                             vlib_cli_command_t * cmd)
+{
+  dhcp_client_main_t * dcm = &dhcp_client_main;
+  dhcp_client_t * c;
+  int verbose = 0;
+  u32 sw_if_index = ~0;
+  uword * p;
+
+  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT) 
+    {
+      if (unformat (input, "intfc %U", 
+                    unformat_vnet_sw_interface, dcm->vnet_main, 
+                    &sw_if_index))
+        ;
+      else if (unformat (input, "verbose"))
+        verbose = 1;
+      else
+        break;
+    }
+
+  if (sw_if_index != ~0)
+    {
+      p = hash_get (dcm->client_by_sw_if_index, sw_if_index);
+      if (p == 0)
+        return clib_error_return (0, "dhcp client not configured");
+      c = pool_elt_at_index (dcm->clients, p[0]);
+      vlib_cli_output (vm, "%U", format_dhcp_client, dcm, c, verbose);
+      return 0;
+    }
+
+  pool_foreach (c, dcm->clients, 
+  ({
+    vlib_cli_output (vm, "%U", format_dhcp_client, dcm, c, verbose);
+  }));
+  
+  return 0;
+}
+
+VLIB_CLI_COMMAND (show_dhcp_client_command, static) = {
+  .path = "show dhcp client",
+  .short_help = "show dhcp client [intfc <intfc>][verbose]",
+  .function = show_dhcp_client_command_fn,
+};
+
+
+int dhcp_client_add_del (dhcp_client_add_del_args_t * a)
+{
+  dhcp_client_main_t * dcm = &dhcp_client_main;
+  vlib_main_t * vm = dcm->vlib_main;
+  dhcp_client_t * c;
+  uword * p;
+  fib_prefix_t all_1s =
+  {
+      .fp_len = 32,
+      .fp_addr.ip4.as_u32 = 0xffffffff,
+      .fp_proto = FIB_PROTOCOL_IP4,
+  };
+  fib_prefix_t all_0s =
+  {
+      .fp_len = 0,
+      .fp_addr.ip4.as_u32 = 0x0,
+      .fp_proto = FIB_PROTOCOL_IP4,
+  };
+
+  p = hash_get (dcm->client_by_sw_if_index, a->sw_if_index);
+
+  if ((p && a->is_add) || (!p && a->is_add == 0))
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  if (a->is_add)
+    {
+      pool_get (dcm->clients, c);
+      memset (c, 0, sizeof (*c));
+      c->state = DHCP_DISCOVER;
+      c->sw_if_index = a->sw_if_index;
+      c->client_index = a->client_index;
+      c->pid = a->pid;
+      c->event_callback = a->event_callback;
+      c->option_55_data = a->option_55_data;
+      c->hostname = a->hostname;
+      c->client_identifier = a->client_identifier;
+      do {
+        c->transaction_id = random_u32 (&dcm->seed);
+      } while (c->transaction_id == 0);
+      set_l2_rewrite (dcm, c);
+      hash_set (dcm->client_by_sw_if_index, a->sw_if_index, c - dcm->clients);
+
+      /* this add is ref counted by FIB so we can add for each itf */
+      fib_table_entry_special_add(fib_table_get_index_for_sw_if_index(
+				      FIB_PROTOCOL_IP4,
+				      c->sw_if_index),
+				  &all_1s,
+				  FIB_SOURCE_DHCP,
+				  FIB_ENTRY_FLAG_LOCAL,
+				  ADJ_INDEX_INVALID);
+
+     /*
+       * enable the interface to RX IPv4 packets
+       * this is also ref counted
+       */
+      ip4_sw_interface_enable_disable (c->sw_if_index, 1);
+
+      vlib_process_signal_event (vm, dhcp_client_process_node.index, 
+                                 EVENT_DHCP_CLIENT_WAKEUP, c - dcm->clients);
+    }
+  else
+    {
+      c = pool_elt_at_index (dcm->clients, p[0]);
+
+      fib_table_entry_special_remove(fib_table_get_index_for_sw_if_index(
+					 FIB_PROTOCOL_IP4,
+					 c->sw_if_index),
+				     &all_1s,
+				     FIB_SOURCE_DHCP);
+
+      if (c->router_address.as_u32)
+      {
+	  ip46_address_t nh = {
+	      .ip4 = c->router_address,
+	  };
+
+	  fib_table_entry_path_remove(fib_table_get_index_for_sw_if_index(
+					  FIB_PROTOCOL_IP4,
+					  c->sw_if_index),
+				      &all_0s,
+				      FIB_SOURCE_DHCP,
+				      FIB_PROTOCOL_IP4,
+				      &nh,
+				      c->sw_if_index,
+				      ~0,
+				      1,
+				      FIB_ROUTE_PATH_FLAG_NONE);
+      }
+      ip4_sw_interface_enable_disable (c->sw_if_index, 0);
+
+      vec_free (c->option_55_data);
+      vec_free (c->hostname);
+      vec_free (c->client_identifier);
+      vec_free (c->l2_rewrite);
+      hash_unset (dcm->client_by_sw_if_index, c->sw_if_index);
+      pool_put (dcm->clients, c);
+    }
+  return 0;
+}
+
+int
+dhcp_client_config (vlib_main_t * vm,
+                    u32 sw_if_index,
+                    u8 * hostname,
+                    u32 is_add,
+                    u32 client_index,
+                    void * event_callback,
+                    u32 pid)
+{
+  dhcp_client_add_del_args_t _a, *a = &_a;
+  int rv;
+
+  memset (a, 0, sizeof (*a));
+  a->is_add = is_add;
+  a->sw_if_index = sw_if_index;
+  a->client_index = client_index;
+  a->pid = pid;
+  a->event_callback = event_callback;
+  vec_validate(a->hostname, strlen((char *)hostname) - 1);
+  strncpy((char *)a->hostname, (char *)hostname, vec_len(a->hostname));
+  a->client_identifier = format (0, "vpe 1.0%c", 0);
+  /* 
+   * Option 55 request list. These data precisely match
+   * the Ubuntu dhcp client. YMMV.
+   */
+
+  /* Subnet Mask */
+  vec_add1 (a->option_55_data, 1);
+  /* Broadcast address */
+  vec_add1 (a->option_55_data, 28);
+  /* time offset */
+  vec_add1 (a->option_55_data, 2);
+  /* Router */
+  vec_add1 (a->option_55_data, 3);
+  /* Domain Name */
+  vec_add1 (a->option_55_data, 15);
+  /* DNS */
+  vec_add1 (a->option_55_data, 6);
+  /* Domain search */
+  vec_add1 (a->option_55_data, 119);
+  /* Host name */
+  vec_add1 (a->option_55_data, 12);
+  /* NetBIOS name server */
+  vec_add1 (a->option_55_data, 44);
+  /* NetBIOS Scope */
+  vec_add1 (a->option_55_data, 47);
+  /* MTU */
+  vec_add1 (a->option_55_data, 26);
+  /* Classless static route */
+  vec_add1 (a->option_55_data, 121);
+  /* NTP servers */
+  vec_add1 (a->option_55_data, 42);
+
+  rv = dhcp_client_add_del (a);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case VNET_API_ERROR_INVALID_VALUE:
+
+      vec_free (a->hostname);
+      vec_free (a->client_identifier);
+      vec_free (a->option_55_data);
+
+      if (is_add)
+        clib_warning ("dhcp client already enabled on intf_idx %d",
+                      sw_if_index);
+      else
+        clib_warning ("dhcp client not enabled on on intf_idx %d",
+                      sw_if_index);
+      break;
+
+    default:
+      clib_warning ("dhcp_client_add_del returned %d", rv);
+    }
+
+  return rv;
+}
+
+static clib_error_t *
+dhcp_client_set_command_fn (vlib_main_t * vm,
+                           unformat_input_t * input,
+                           vlib_cli_command_t * cmd)
+{
+
+  dhcp_client_main_t * dcm = &dhcp_client_main;
+  u32 sw_if_index;
+  u8 * hostname = 0;
+  u8 sw_if_index_set = 0;
+  int is_add = 1;
+  dhcp_client_add_del_args_t _a, *a = &_a;
+  int rv;
+
+  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT) 
+    {
+      if (unformat (input, "intfc %U", 
+                   unformat_vnet_sw_interface, dcm->vnet_main, 
+                   &sw_if_index))
+        sw_if_index_set = 1;
+      else if (unformat (input, "hostname %v", &hostname))
+        ;
+      else if (unformat (input, "del"))
+        is_add = 0;
+      else
+        break;
+    }
+
+  if (sw_if_index_set == 0)
+    return clib_error_return (0, "interface not specified");
+
+  memset (a, 0, sizeof (*a));
+  a->is_add = is_add;
+  a->sw_if_index = sw_if_index;
+  a->hostname = hostname;
+  a->client_identifier = format (0, "vpe 1.0%c", 0);
+
+  /* 
+   * Option 55 request list. These data precisely match
+   * the Ubuntu dhcp client. YMMV.
+   */
+
+  /* Subnet Mask */
+  vec_add1 (a->option_55_data, 1);
+  /* Broadcast address */
+  vec_add1 (a->option_55_data, 28);
+  /* time offset */
+  vec_add1 (a->option_55_data, 2);
+  /* Router */
+  vec_add1 (a->option_55_data, 3);
+  /* Domain Name */
+  vec_add1 (a->option_55_data, 15);
+  /* DNS */
+  vec_add1 (a->option_55_data, 6);
+  /* Domain search */
+  vec_add1 (a->option_55_data, 119);
+  /* Host name */
+  vec_add1 (a->option_55_data, 12);
+  /* NetBIOS name server */
+  vec_add1 (a->option_55_data, 44);
+  /* NetBIOS Scope */
+  vec_add1 (a->option_55_data, 47);
+  /* MTU */
+  vec_add1 (a->option_55_data, 26);
+  /* Classless static route */
+  vec_add1 (a->option_55_data, 121);
+  /* NTP servers */
+  vec_add1 (a->option_55_data, 42);
+
+  rv = dhcp_client_add_del (a);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case VNET_API_ERROR_INVALID_VALUE:
+
+      vec_free (a->hostname);
+      vec_free (a->client_identifier);
+      vec_free (a->option_55_data);
+      if (is_add)
+        return clib_error_return (0, "dhcp client already enabled on %U", 
+                                  format_vnet_sw_if_index_name, 
+                                  dcm->vnet_main, sw_if_index);
+      else
+        return clib_error_return (0, "dhcp client not enabled on %U", 
+                                  format_vnet_sw_if_index_name, 
+                                  dcm->vnet_main, sw_if_index);
+      break;
+
+    default:
+      vlib_cli_output (vm, "dhcp_client_add_del returned %d", rv);
+    }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (dhcp_client_set_command, static) = {
+  .path = "set dhcp client",
+  .short_help = "set dhcp client [del] intfc <interface> [hostname <name>]",
+  .function = dhcp_client_set_command_fn,
+};
+
+static clib_error_t *
+dhcp_client_init (vlib_main_t * vm)
+{
+  dhcp_client_main_t * dcm = &dhcp_client_main;
+
+  dcm->vlib_main = vm;
+  dcm->vnet_main = vnet_get_main();
+  dcm->seed = 0xdeaddabe;
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (dhcp_client_init);
diff --git a/src/vnet/dhcp/client.h b/src/vnet/dhcp/client.h
new file mode 100644
index 00000000..d15e686b
--- /dev/null
+++ b/src/vnet/dhcp/client.h
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * client.h: dhcp client
+ */
+
+#ifndef included_dhcp_client_h
+#define included_dhcp_client_h
+
+#define foreach_dhcp_client_state               \
+_(DHCP_DISCOVER)                                \
+_(DHCP_REQUEST)                                 \
+_(DHCP_BOUND)
+
+typedef enum {
+#define _(a) a,
+  foreach_dhcp_client_state
+#undef _
+} dhcp_client_state_t;
+
+typedef struct {
+  dhcp_client_state_t state;
+
+  /* the interface in question */
+  u32 sw_if_index;
+
+  /* State machine retry counter */
+  u32 retry_count;
+
+  /* Send next pkt at this time */
+  f64 next_transmit;
+  f64 lease_expires;
+
+  /* DHCP transaction ID, a random number */
+  u32 transaction_id;
+
+  /* leased address, other learned info DHCP */
+  ip4_address_t leased_address; /* from your_ip_address field */
+  ip4_address_t dhcp_server;
+  u32 subnet_mask_width;        /* option 1 */
+  ip4_address_t router_address; /* option 3 */
+  u32 lease_renewal_interval;   /* option 51 */
+  u32 lease_lifetime;           /* option 59 */
+
+  /* Requested data (option 55) */
+  u8 * option_55_data;
+
+  u8 * l2_rewrite;
+
+  /* hostname and software client identifiers */
+  u8 * hostname;
+  u8 * client_identifier;       /* software version, e.g. vpe 1.0*/
+
+  /* Information used for event callback */
+  u32 client_index;
+  u32 pid;
+  void * event_callback;
+} dhcp_client_t;
+
+typedef struct {
+  /* DHCP client pool */
+  dhcp_client_t * clients;
+  uword * client_by_sw_if_index;
+  u32 seed;
+
+  /* convenience */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+} dhcp_client_main_t;
+
+typedef struct {
+  int is_add;
+  u32 sw_if_index;
+
+  /* vectors, consumed by dhcp client code */
+  u8 * hostname;
+  u8 * client_identifier;
+
+  /* Bytes containing requested option numbers */
+  u8 * option_55_data;
+
+  /* Information used for event callback */
+  u32 client_index;
+  u32 pid;
+  void * event_callback;
+} dhcp_client_add_del_args_t;
+
+dhcp_client_main_t dhcp_client_main;
+
+#define EVENT_DHCP_CLIENT_WAKEUP	1
+
+int dhcp_client_for_us (u32 bi0, 
+                          vlib_buffer_t * b0,
+                          ip4_header_t * ip0, 
+                          udp_header_t * u0,
+                          dhcp_header_t * dh0);
+
+int dhcp_client_config (vlib_main_t * vm,
+                        u32 sw_if_index,
+                        u8 * hostname,
+                        u32 is_add,
+                        u32 client_index,
+                        void *event_callback,
+                        u32 pid);
+
+#endif /* included_dhcp_client_h */
diff --git a/src/vnet/dhcp/packet.h b/src/vnet/dhcp/packet.h
new file mode 100644
index 00000000..267a8eaf
--- /dev/null
+++ b/src/vnet/dhcp/packet.h
@@ -0,0 +1,61 @@
+#ifndef included_vnet_dhcp_packet_h
+#define included_vnet_dhcp_packet_h
+
+/*
+ * DHCP packet format
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/ip/ip4_packet.h>
+
+typedef struct {
+  u8 opcode;                    /* 1 = request, 2 = reply */
+  u8 hardware_type;             /* 1 = ethernet */
+  u8 hardware_address_length;
+  u8 hops;
+  u32 transaction_identifier;
+  u16 seconds;
+  u16 flags;
+#define DHCP_FLAG_BROADCAST (1<<15)
+  ip4_address_t client_ip_address;
+  ip4_address_t your_ip_address; /* use this one */
+  ip4_address_t server_ip_address;
+  ip4_address_t gateway_ip_address; /* use option 3, not this one */
+  u8 client_hardware_address[16];
+  u8 server_name[64];
+  u8 boot_filename[128];
+  ip4_address_t magic_cookie;
+  u8 options[0];
+} dhcp_header_t;
+
+typedef struct {
+  u8 option;
+  u8 length;
+  union {
+    u8 data[0];
+    u32 data_as_u32[0];
+  };
+} __attribute__((packed)) dhcp_option_t;
+
+typedef enum {
+  DHCP_PACKET_DISCOVER=1,
+  DHCP_PACKET_OFFER,
+  DHCP_PACKET_REQUEST,
+  DHCP_PACKET_ACK=5,
+} dhcp_packet_type_t;
+
+/* charming antique: 99.130.83.99 is the dhcp magic cookie */
+#define DHCP_MAGIC (clib_host_to_net_u32(0x63825363))
+
+#endif /* included_vnet_dhcp_packet_h */
diff --git a/src/vnet/dhcp/proxy.h b/src/vnet/dhcp/proxy.h
new file mode 100644
index 00000000..e12c0d00
--- /dev/null
+++ b/src/vnet/dhcp/proxy.h
@@ -0,0 +1,92 @@
+/*
+ * proxy.h: dhcp proxy 
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_dhcp_proxy_h
+#define included_dhcp_proxy_h
+
+#include <vnet/vnet.h>
+#include <vnet/dhcp/packet.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ip/ip4.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ip/format.h>
+#include <vnet/ip/udp.h>
+#include <vnet/dhcp/client.h>
+
+typedef enum {
+#define dhcp_proxy_error(n,s) DHCP_PROXY_ERROR_##n,
+#include <vnet/dhcp/proxy_error.def>
+#undef dhcp_proxy_error
+  DHCP_PROXY_N_ERROR,
+} dhcp_proxy_error_t;
+
+typedef struct {
+  u32 oui;
+  u32 fib_id;
+} vss_id;
+
+typedef union {
+  u8 as_u8[8];
+  vss_id vpn_id;
+} vss_info;
+
+typedef struct {
+  ip4_address_t dhcp_server;
+  ip4_address_t dhcp_src_address;
+  u32 insert_option_82;
+  u32 server_fib_index;
+  u32 valid;
+} dhcp_server_t;
+
+typedef struct {
+  /* Pool of DHCP servers */
+  dhcp_server_t * dhcp_servers;
+
+  /* Pool of selected DHCP server. Zero is the default server */
+  u32 * dhcp_server_index_by_rx_fib_index;
+
+  /* to drop pkts in server-to-client direction */
+  u32 error_drop_node_index;
+
+  vss_info *opt82vss;
+
+  /* hash lookup specific vrf_id -> option 82 vss suboption  */
+  uword * opt82vss_index_by_vrf_id;
+
+  /* convenience */
+  dhcp_client_main_t * dhcp_client_main;
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+} dhcp_proxy_main_t;
+
+dhcp_proxy_main_t dhcp_proxy_main;
+
+int dhcp_proxy_set_server (ip4_address_t *addr, ip4_address_t *src_address,
+                           u32 fib_id, int insert_option_82, int is_del);
+
+int dhcp_proxy_set_server_2 (ip4_address_t *addr, ip4_address_t *src_address,
+                             u32 rx_fib_id,
+                             u32 server_fib_id, 
+                             int insert_option_82, int is_del);
+
+int dhcp_proxy_set_option82_vss(u32 vrf_id,
+                                u32 oui,
+                                u32 fib_id, 
+                                int is_del);
+#endif /* included_dhcp_proxy_h */
diff --git a/src/vnet/dhcp/proxy_error.def b/src/vnet/dhcp/proxy_error.def
new file mode 100644
index 00000000..6aa06eb5
--- /dev/null
+++ b/src/vnet/dhcp/proxy_error.def
@@ -0,0 +1,30 @@
+/*
+ * dhcp_proxy_error.def: dhcp proxy errors
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+dhcp_proxy_error (NONE, "no error")
+dhcp_proxy_error (NO_SERVER, "no dhcp server configured")
+dhcp_proxy_error (RELAY_TO_SERVER, "DHCP packets relayed to the server")
+dhcp_proxy_error (RELAY_TO_CLIENT, "DHCP packets relayed to clients")
+dhcp_proxy_error (OPTION_82_ERROR, "DHCP failed to insert option 82")
+dhcp_proxy_error (NO_OPTION_82, "DHCP option 82 missing")
+dhcp_proxy_error (BAD_OPTION_82, "Bad DHCP option 82 value")
+dhcp_proxy_error (BAD_FIB_ID, "DHCP option 82 fib-id to fib-index map failure")
+dhcp_proxy_error (NO_INTERFACE_ADDRESS, "DHCP no interface address")
+dhcp_proxy_error (OPTION_82_VSS_NOT_PROCESSED, "DHCP VSS not processed by DHCP server")
+dhcp_proxy_error (BAD_YIADDR, "DHCP packets with bad your_ip_address fields")
+dhcp_proxy_error (BAD_SVR_FIB_OR_ADDRESS, "DHCP packets not from DHCP server or server FIB.")
+dhcp_proxy_error (PKT_TOO_BIG, "DHCP packets which are too big.")
diff --git a/src/vnet/dhcp/proxy_node.c b/src/vnet/dhcp/proxy_node.c
new file mode 100644
index 00000000..d0d99d7e
--- /dev/null
+++ b/src/vnet/dhcp/proxy_node.c
@@ -0,0 +1,1114 @@
+/*
+ * proxy_node.c: dhcp proxy node processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/dhcp/proxy.h>
+#include <vnet/fib/ip4_fib.h>
+
+static char * dhcp_proxy_error_strings[] = {
+#define dhcp_proxy_error(n,s) s,
+#include "proxy_error.def"
+#undef dhcp_proxy_error
+};
+
+#define foreach_dhcp_proxy_to_server_input_next \
+  _ (DROP, "error-drop")			\
+  _ (LOOKUP, "ip4-lookup")			\
+  _ (SEND_TO_CLIENT, "dhcp-proxy-to-client")
+
+typedef enum {
+#define _(s,n) DHCP_PROXY_TO_SERVER_INPUT_NEXT_##s,
+  foreach_dhcp_proxy_to_server_input_next
+#undef _
+  DHCP_PROXY_TO_SERVER_INPUT_N_NEXT,
+} dhcp_proxy_to_server_input_next_t;
+
+typedef struct {
+  /* 0 => to server, 1 => to client */
+  int which; 
+  ip4_address_t trace_ip4_address;
+  u32 error;
+  u32 sw_if_index;
+  u32 original_sw_if_index;
+} dhcp_proxy_trace_t;
+
+#define VPP_DHCP_OPTION82_SUB1_SIZE   6
+#define VPP_DHCP_OPTION82_SUB5_SIZE   6
+#define VPP_DHCP_OPTION82_VSS_SIZE    12
+#define VPP_DHCP_OPTION82_SIZE (VPP_DHCP_OPTION82_SUB1_SIZE + \
+                                VPP_DHCP_OPTION82_SUB5_SIZE + \
+                                VPP_DHCP_OPTION82_VSS_SIZE +3)
+
+vlib_node_registration_t dhcp_proxy_to_server_node;
+vlib_node_registration_t dhcp_proxy_to_client_node;
+
+u8 * format_dhcp_proxy_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  dhcp_proxy_trace_t * t = va_arg (*args, dhcp_proxy_trace_t *);
+    
+  if (t->which == 0)
+    s = format (s, "DHCP proxy: sent to server %U\n",
+                format_ip4_address, &t->trace_ip4_address, t->error);
+  else
+    s = format (s, "DHCP proxy: broadcast to client from %U\n",
+                format_ip4_address, &t->trace_ip4_address);
+      
+  if (t->error != (u32)~0)
+    s = format (s, "  error: %s\n", dhcp_proxy_error_strings[t->error]);
+
+  s = format (s, "  original_sw_if_index: %d, sw_if_index: %d\n",
+              t->original_sw_if_index, t->sw_if_index);
+  
+  return s;
+}
+
+u8 * format_dhcp_proxy_header_with_length (u8 * s, va_list * args)
+{
+  dhcp_header_t * h = va_arg (*args, dhcp_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+  u32 header_bytes;
+
+  header_bytes = sizeof (h[0]);
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    return format (s, "dhcp header truncated");
+
+  s = format (s, "DHCP Proxy");
+
+  return s;
+}
+
+static uword
+dhcp_proxy_to_server_input (vlib_main_t * vm,
+                            vlib_node_runtime_t * node,
+                            vlib_frame_t * from_frame)
+{
+  u32 n_left_from, next_index, * from, * to_next;
+  dhcp_proxy_main_t * dpm = &dhcp_proxy_main;
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+  u32 pkts_to_server=0, pkts_to_client=0, pkts_no_server=0;
+  u32 pkts_no_interface_address=0;
+  u32 pkts_too_big=0;
+  ip4_main_t * im = &ip4_main;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t * b0;
+          udp_header_t * u0;
+	  dhcp_header_t * h0;
+          ip4_header_t * ip0;
+	  u32 next0;
+          u32 old0, new0;
+          ip_csum_t sum0;
+          u32 error0 = (u32) ~0;
+          u32 sw_if_index = 0;
+          u32 original_sw_if_index = 0;
+          u8  *end = NULL;
+          u32 fib_index, server_index;
+          dhcp_server_t * server;
+          u32 rx_sw_if_index;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+          h0 = vlib_buffer_get_current (b0);
+
+          /* 
+           * udp_local hands us the DHCP header, need udp hdr, 
+           * ip hdr to relay to server
+           */
+          vlib_buffer_advance (b0, -(sizeof(*u0)));
+	  u0 = vlib_buffer_get_current (b0);
+
+          /* This blows. Return traffic has src_port = 67, dst_port = 67 */
+          if (u0->src_port == clib_net_to_host_u16(UDP_DST_PORT_dhcp_to_server))
+            {
+              vlib_buffer_advance (b0, sizeof(*u0));
+              next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_SEND_TO_CLIENT;
+              error0 = 0;
+              pkts_to_client++;
+              goto do_enqueue;
+            }
+
+          rx_sw_if_index = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+
+          fib_index = im->fib_index_by_sw_if_index [rx_sw_if_index];
+
+          if (fib_index < vec_len(dpm->dhcp_server_index_by_rx_fib_index))
+            server_index = dpm->dhcp_server_index_by_rx_fib_index[fib_index];
+          else
+            server_index = 0;
+          
+          if (PREDICT_FALSE (pool_is_free_index (dpm->dhcp_servers, 
+                                                 server_index)))
+            {
+            no_server:
+              error0 = DHCP_PROXY_ERROR_NO_SERVER;
+              next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_DROP;
+              pkts_no_server++;
+              goto do_trace;
+            }
+          
+          server = pool_elt_at_index (dpm->dhcp_servers, server_index);
+          if (server->valid == 0)
+            goto no_server;
+
+          vlib_buffer_advance (b0, -(sizeof(*ip0)));
+          ip0 = vlib_buffer_get_current (b0);
+
+          /* disable UDP checksum */
+          u0->checksum = 0;
+          sum0 = ip0->checksum;
+          old0 = ip0->dst_address.as_u32;
+          new0 = server->dhcp_server.as_u32;
+          ip0->dst_address.as_u32 = server->dhcp_server.as_u32;
+          sum0 = ip_csum_update (sum0, old0, new0, 
+                                ip4_header_t /* structure */, 
+                                dst_address /* changed member */);
+          ip0->checksum = ip_csum_fold (sum0);
+
+          sum0 = ip0->checksum;
+          old0 = ip0->src_address.as_u32;
+          new0 = server->dhcp_src_address.as_u32;
+          ip0->src_address.as_u32 = new0;
+          sum0 = ip_csum_update (sum0, old0, new0, 
+                                ip4_header_t /* structure */, 
+                                src_address /* changed member */);
+          ip0->checksum = ip_csum_fold (sum0);
+
+          /* Send to DHCP server via the configured FIB */
+          vnet_buffer(b0)->sw_if_index[VLIB_TX] =
+            server->server_fib_index;
+
+          h0->gateway_ip_address.as_u32 = server->dhcp_src_address.as_u32;
+          pkts_to_server++;
+
+          if (server->insert_option_82) 
+            {
+              u32 fib_index, fib_id, opt82_fib_id=0, opt82_oui=0;
+	      ip4_fib_t * fib;
+              dhcp_option_t *o = (dhcp_option_t *) h0->options;
+              u32 len = 0;
+              vlib_buffer_free_list_t *fl;
+              
+              fib_index = im->fib_index_by_sw_if_index 
+                [vnet_buffer(b0)->sw_if_index[VLIB_RX]];
+	      fib = ip4_fib_get (fib_index);
+	      fib_id = fib->table_id;
+
+              end = b0->data + b0->current_data + b0->current_length;
+              /* TLVs are not performance-friendly... */
+              while  (o->option != 0xFF /* end of options */ && (u8 *)o < end) 
+                  o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
+
+              fl = vlib_buffer_get_free_list (vm, b0->free_list_index);
+              // start write at (option*)o, some packets have padding
+              if (((u8 *)o - (u8 *)b0->data + VPP_DHCP_OPTION82_SIZE) > fl->n_data_bytes)
+                {
+                  next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_DROP;
+                  pkts_too_big++;
+                  goto do_trace;
+                }
+
+              if ((o->option == 0xFF)  && ((u8 *)o <= end))
+                {  
+                  vnet_main_t *vnm = vnet_get_main();   
+                  u16 old_l0, new_l0;
+                  ip4_address_t _ia0, * ia0 = &_ia0;
+                  uword  *p_vss;
+                  vss_info *vss;
+                  vnet_sw_interface_t *swif;
+                  sw_if_index = 0;
+                  original_sw_if_index = 0;
+                  
+                  original_sw_if_index = sw_if_index = 
+                      vnet_buffer(b0)->sw_if_index[VLIB_RX];
+                  swif = vnet_get_sw_interface (vnm, sw_if_index);
+                  if (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
+                      sw_if_index = swif->unnumbered_sw_if_index;
+                  
+                  p_vss = hash_get (dpm->opt82vss_index_by_vrf_id,
+                                    fib_id);
+                  if (p_vss) 
+                    {
+                      vss = pool_elt_at_index (dpm->opt82vss, p_vss[0]);
+                      opt82_oui =  vss->vpn_id.oui;
+                      opt82_fib_id =  vss->vpn_id.fib_id;
+                    }
+                  /* 
+                   * Get the first ip4 address on the [client-side] 
+                   * RX interface, if not unnumbered. otherwise use
+                   * the loopback interface's ip address.
+                   */
+                  ia0 = ip4_interface_first_address(&ip4_main, sw_if_index, 0);
+                  
+                  if (ia0 == 0)
+                    {
+                      error0 = DHCP_PROXY_ERROR_NO_INTERFACE_ADDRESS;
+                      next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_DROP;
+                      pkts_no_interface_address++;
+                      goto do_trace;
+                    }
+
+                  /* Add option 82 */
+                  o->option = 82;   /* option 82 */
+                  o->length = 12;   /* 12 octets to follow */
+                  o->data[0] = 1;   /* suboption 1, circuit ID (=FIB id) */
+                  o->data[1] = 4;   /* length of suboption */
+                  o->data[2] = (original_sw_if_index >> 24) & 0xFF;
+                  o->data[3] = (original_sw_if_index >> 16) & 0xFF;
+                  o->data[4] = (original_sw_if_index >> 8)  & 0xFF;
+                  o->data[5] = (original_sw_if_index >> 0)  & 0xFF;
+		  o->data[6] = 5; /* suboption 5 (client RX intfc address) */
+		  o->data[7] = 4; /* length 4 */
+		  o->data[8] = ia0->as_u8[0];
+		  o->data[9] = ia0->as_u8[1];
+		  o->data[10] = ia0->as_u8[2];
+		  o->data[11] = ia0->as_u8[3];
+                  o->data[12] = 0xFF;
+                  if (opt82_oui !=0 || opt82_fib_id != 0)
+                    {
+                      o->data[12] = 151; /* vss suboption */
+                      if (255 == opt82_fib_id) {
+                          o->data[13] = 1;   /* length */
+                          o->data[14] = 255;   /* vss option type */
+                          o->data[15] = 152; /* vss control suboption */
+                          o->data[16] = 0;   /* length */
+                          /* and a new "end-of-options" option (0xff) */
+                          o->data[17] = 0xFF;
+                          o->length += 5;
+                      } else {
+                          o->data[13] = 8;   /* length */
+                          o->data[14] = 1;   /* vss option type */
+                          o->data[15] = (opt82_oui >> 16) & 0xff;
+                          o->data[16] = (opt82_oui >> 8) & 0xff;
+                          o->data[17] = (opt82_oui ) & 0xff;
+                          o->data[18] = (opt82_fib_id >> 24) & 0xff;
+                          o->data[19] = (opt82_fib_id >> 16) & 0xff;
+                          o->data[20] = (opt82_fib_id >> 8) & 0xff;
+                          o->data[21] = (opt82_fib_id) & 0xff;
+                          o->data[22] = 152; /* vss control suboption */
+                          o->data[23] = 0;   /* length */
+                          
+                          /* and a new "end-of-options" option (0xff) */
+                          o->data[24] = 0xFF;
+                          o->length += 12;
+                      }
+                  }
+
+                  len = o->length + 3;
+                  b0->current_length += len;
+                  /* Fix IP header length and checksum */
+                  old_l0 = ip0->length;
+                  new_l0 = clib_net_to_host_u16 (old_l0);
+                  new_l0 += len;
+                  new_l0 = clib_host_to_net_u16 (new_l0);
+                  ip0->length = new_l0;
+                  sum0 = ip0->checksum;
+                  sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
+                                         length /* changed member */);
+                  ip0->checksum = ip_csum_fold (sum0);
+
+                  /* Fix UDP length */
+                  new_l0 = clib_net_to_host_u16 (u0->length);
+                  new_l0 += len;
+                  u0->length = clib_host_to_net_u16 (new_l0);
+                } else {
+                  vlib_node_increment_counter 
+                      (vm, dhcp_proxy_to_server_node.index,
+                       DHCP_PROXY_ERROR_OPTION_82_ERROR, 1);
+                }
+            }
+          
+          next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_LOOKUP;
+
+        do_trace:
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
+            {
+               dhcp_proxy_trace_t *tr = vlib_add_trace (vm, node, 
+                                                        b0, sizeof (*tr));
+               tr->which = 0; /* to server */
+               tr->error = error0;
+               tr->original_sw_if_index = original_sw_if_index;
+               tr->sw_if_index = sw_if_index;
+               if (next0 == DHCP_PROXY_TO_SERVER_INPUT_NEXT_LOOKUP)
+                 tr->trace_ip4_address.as_u32 = server->dhcp_server.as_u32;
+            }
+
+        do_enqueue:
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
+                               DHCP_PROXY_ERROR_RELAY_TO_CLIENT,
+                               pkts_to_client);
+  vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
+                               DHCP_PROXY_ERROR_RELAY_TO_SERVER,
+                               pkts_to_server);
+  vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
+                               DHCP_PROXY_ERROR_NO_SERVER,
+                               pkts_no_server);
+  vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
+                               DHCP_PROXY_ERROR_NO_INTERFACE_ADDRESS,
+                               pkts_no_interface_address);
+ vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
+                              DHCP_PROXY_ERROR_PKT_TOO_BIG,
+                              pkts_too_big);
+  return from_frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (dhcp_proxy_to_server_node) = {
+  .function = dhcp_proxy_to_server_input,
+  .name = "dhcp-proxy-to-server",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .n_errors = DHCP_PROXY_N_ERROR,
+  .error_strings = dhcp_proxy_error_strings,
+
+  .n_next_nodes = DHCP_PROXY_TO_SERVER_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [DHCP_PROXY_TO_SERVER_INPUT_NEXT_##s] = n,
+    foreach_dhcp_proxy_to_server_input_next
+#undef _
+  },
+
+  .format_buffer = format_dhcp_proxy_header_with_length,
+  .format_trace = format_dhcp_proxy_trace,
+#if 0
+  .unformat_buffer = unformat_dhcp_proxy_header,
+#endif
+};
+
+static uword
+dhcp_proxy_to_client_input (vlib_main_t * vm,
+                            vlib_node_runtime_t * node,
+                            vlib_frame_t * from_frame)
+{
+  u32 n_left_from, * from;
+  ethernet_main_t *em = ethernet_get_main (vm);
+  dhcp_proxy_main_t * dpm = &dhcp_proxy_main;
+  vnet_main_t * vnm = vnet_get_main();
+  ip4_main_t * im = &ip4_main;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t * b0;
+      udp_header_t * u0;
+      dhcp_header_t * h0;
+      ip4_header_t * ip0 = 0;
+      ip4_address_t * ia0 = 0;
+      u32 old0, new0;
+      ip_csum_t sum0;
+      ethernet_interface_t *ei0;
+      ethernet_header_t *mac0;
+      vnet_hw_interface_t *hi0;
+      vlib_frame_t *f0;
+      u32 * to_next0;
+      u32 sw_if_index = ~0;
+      vnet_sw_interface_t *si0;
+      u32 error0 = (u32)~0;
+      vnet_sw_interface_t *swif;
+      u32 server_index;
+      u32 fib_index;
+      dhcp_server_t * server;
+      u32 original_sw_if_index = (u32) ~0;
+          
+      bi0 = from[0];
+      from += 1;
+      n_left_from -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      h0 = vlib_buffer_get_current (b0);
+
+      /* 
+       * udp_local hands us the DHCP header, need udp hdr, 
+       * ip hdr to relay to client
+       */
+      vlib_buffer_advance (b0, -(sizeof(*u0)));
+      u0 = vlib_buffer_get_current (b0);
+
+      vlib_buffer_advance (b0, -(sizeof(*ip0)));
+      ip0 = vlib_buffer_get_current (b0);
+
+      /* Consumed by dhcp client code? */
+      if (dhcp_client_for_us (bi0, b0, ip0, u0, h0))
+          continue;
+
+      if (1 /* dpm->insert_option_82 */)
+        {
+          dhcp_option_t *o = (dhcp_option_t *) h0->options;
+          dhcp_option_t *sub;
+              
+          /* Parse through TLVs looking for option 82.
+             The circuit-ID is the FIB number we need
+             to track down the client-facing interface */
+
+          while (o->option != 0xFF /* end of options */ &&
+                 (u8 *) o < (b0->data + b0->current_data + b0->current_length))
+            {
+              if (o->option == 82)
+                {
+                    u32 vss_exist = 0;
+                    u32 vss_ctrl = 0;
+                    sub = (dhcp_option_t *) &o->data[0];
+                    while (sub->option != 0xFF /* end of options */ &&
+                           (u8 *) sub < (u8 *)(o + o->length)) {
+                        /* If this is one of ours, it will have
+                           total length 12, circuit-id suboption type,
+                           and the sw_if_index */
+                        if (sub->option == 1 && sub->length == 4)
+                          {
+                            sw_if_index = (o->data[2] << 24)
+                                | (o->data[3] << 16)
+                                | (o->data[4] << 8)
+                                | (o->data[5]);
+                          } else if (sub->option == 151 &&
+                                     sub->length == 7 &&
+                                     sub->data[0] == 1)
+                            vss_exist = 1;
+                        else if (sub->option == 152 && sub->length == 0)
+                            vss_ctrl = 1;
+                        sub = (dhcp_option_t *) 
+                          (((uword) sub) + (sub->length + 2));
+                    }
+                    if (vss_ctrl && vss_exist)
+                      vlib_node_increment_counter 
+                        (vm, dhcp_proxy_to_client_node.index,
+                         DHCP_PROXY_ERROR_OPTION_82_VSS_NOT_PROCESSED, 1);
+
+                }
+              o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
+            }
+        }
+
+      if (sw_if_index == (u32)~0)
+        {
+          error0 = DHCP_PROXY_ERROR_NO_OPTION_82;
+          
+        drop_packet:
+          vlib_node_increment_counter (vm, dhcp_proxy_to_client_node.index,
+                                       error0, 1);
+          f0 = vlib_get_frame_to_node (vm, dpm->error_drop_node_index);
+          to_next0 = vlib_frame_vector_args (f0);
+          to_next0[0] = bi0;
+          f0->n_vectors = 1;
+          vlib_put_frame_to_node (vm, dpm->error_drop_node_index, f0);
+          goto do_trace;
+        }
+      
+
+      if (sw_if_index >= vec_len (im->fib_index_by_sw_if_index))
+        {
+          error0 = DHCP_PROXY_ERROR_BAD_OPTION_82;
+          goto drop_packet;
+        }
+
+      fib_index = im->fib_index_by_sw_if_index [sw_if_index];
+
+      if (fib_index < vec_len(dpm->dhcp_server_index_by_rx_fib_index))
+        server_index = dpm->dhcp_server_index_by_rx_fib_index[fib_index];
+      else
+        server_index = 0;
+
+      if (PREDICT_FALSE (pool_is_free_index (dpm->dhcp_servers, 
+                                             server_index)))
+        {
+          error0 = DHCP_PROXY_ERROR_BAD_OPTION_82;
+          goto drop_packet;
+        }
+      
+      server = pool_elt_at_index (dpm->dhcp_servers, server_index);
+      if (server->valid == 0)
+        {
+          error0 = DHCP_PROXY_ERROR_NO_SERVER;
+          goto drop_packet;
+        }
+
+      if (ip0->src_address.as_u32 != server->dhcp_server.as_u32)
+        {             
+          error0 = DHCP_PROXY_ERROR_BAD_SVR_FIB_OR_ADDRESS;
+          goto drop_packet;
+        }
+
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = sw_if_index;
+
+      swif = vnet_get_sw_interface (vnm, sw_if_index);
+      original_sw_if_index = sw_if_index;
+      if (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
+          sw_if_index = swif->unnumbered_sw_if_index;
+
+      ia0 = ip4_interface_first_address (&ip4_main, sw_if_index, 0);
+      if (ia0 == 0)
+        {
+          error0 = DHCP_PROXY_ERROR_NO_INTERFACE_ADDRESS;
+          goto drop_packet;
+        }
+
+      u0->checksum = 0;
+      u0->dst_port = clib_net_to_host_u16 (UDP_DST_PORT_dhcp_to_client);
+      sum0 = ip0->checksum;
+      old0 = ip0->dst_address.as_u32;
+      new0 = 0xFFFFFFFF;
+      ip0->dst_address.as_u32 = new0;
+      sum0 = ip_csum_update (sum0, old0, new0, 
+                            ip4_header_t /* structure */, 
+                            dst_address /* offset of changed member */);
+      ip0->checksum = ip_csum_fold (sum0);
+
+      sum0 = ip0->checksum;
+      old0 = ip0->src_address.as_u32;
+      new0 = ia0->as_u32;
+      ip0->src_address.as_u32 = new0;
+      sum0 = ip_csum_update (sum0, old0, new0, 
+                            ip4_header_t /* structure */, 
+                            src_address /* offset of changed member */);
+      ip0->checksum = ip_csum_fold (sum0);
+
+      vlib_buffer_advance (b0, -(sizeof(ethernet_header_t)));
+      si0 = vnet_get_sw_interface (vnm, original_sw_if_index);
+      if (si0->type == VNET_SW_INTERFACE_TYPE_SUB)
+	  vlib_buffer_advance (b0, -4 /* space for VLAN tag */);
+
+      mac0 = vlib_buffer_get_current (b0);
+
+      hi0 = vnet_get_sup_hw_interface (vnm, original_sw_if_index);
+      ei0 = pool_elt_at_index (em->interfaces, hi0->hw_instance);
+      clib_memcpy (mac0->src_address, ei0->address, sizeof (ei0->address));
+      memset (mac0->dst_address, 0xff, sizeof (mac0->dst_address));
+      mac0->type = (si0->type == VNET_SW_INTERFACE_TYPE_SUB) ?
+	clib_net_to_host_u16(0x8100) : clib_net_to_host_u16 (0x0800);
+
+      if (si0->type == VNET_SW_INTERFACE_TYPE_SUB)
+	{
+	  u32 * vlan_tag = (u32 *)(mac0+1);
+	  u32 tmp;
+	  tmp = (si0->sub.id << 16) | 0x0800;
+	  *vlan_tag = clib_host_to_net_u32 (tmp);
+	}
+
+      /* $$$ This needs to be rewritten, for sure */
+      f0 = vlib_get_frame_to_node (vm, hi0->output_node_index);
+      to_next0 = vlib_frame_vector_args (f0);
+      to_next0[0] = bi0;
+      f0->n_vectors = 1;
+      vlib_put_frame_to_node (vm, hi0->output_node_index, f0);
+
+    do_trace:
+      if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
+        {
+          dhcp_proxy_trace_t *tr = vlib_add_trace (vm, node, 
+                                                   b0, sizeof (*tr));
+          tr->which = 1; /* to client */
+          tr->trace_ip4_address.as_u32 = ia0 ? ia0->as_u32 : 0;
+          tr->error = error0;
+          tr->original_sw_if_index = original_sw_if_index;
+          tr->sw_if_index = sw_if_index;
+        }
+    }
+  return from_frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (dhcp_proxy_to_client_node) = {
+  .function = dhcp_proxy_to_client_input,
+  .name = "dhcp-proxy-to-client",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .n_errors = DHCP_PROXY_N_ERROR,
+  .error_strings = dhcp_proxy_error_strings,
+  .format_buffer = format_dhcp_proxy_header_with_length,
+  .format_trace = format_dhcp_proxy_trace,
+#if 0
+  .unformat_buffer = unformat_dhcp_proxy_header,
+#endif
+};
+
+clib_error_t * dhcp_proxy_init (vlib_main_t * vm)
+{
+  dhcp_proxy_main_t * dm = &dhcp_proxy_main;
+  vlib_node_t * error_drop_node;
+  dhcp_server_t * server;
+
+  dm->vlib_main = vm;
+  dm->vnet_main = vnet_get_main();
+  error_drop_node = vlib_get_node_by_name (vm, (u8 *) "error-drop");
+  dm->error_drop_node_index = error_drop_node->index;
+
+  dm->opt82vss_index_by_vrf_id = hash_create (0, sizeof (uword));
+
+  udp_register_dst_port (vm, UDP_DST_PORT_dhcp_to_client, 
+                         dhcp_proxy_to_client_node.index, 1 /* is_ip4 */);
+
+  udp_register_dst_port (vm, UDP_DST_PORT_dhcp_to_server, 
+                         dhcp_proxy_to_server_node.index, 1 /* is_ip4 */);
+
+  /* Create the default server, don't mark it valid */
+  pool_get (dm->dhcp_servers, server);
+  memset (server, 0, sizeof (*server));
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (dhcp_proxy_init);
+
+int dhcp_proxy_set_server_2 (ip4_address_t *addr, ip4_address_t *src_address,
+                             u32 rx_fib_id,
+                             u32 server_fib_id, 
+                             int insert_option_82, int is_del)
+{
+  dhcp_proxy_main_t * dpm = &dhcp_proxy_main;
+  dhcp_server_t * server = 0;
+  u32 server_index = 0;
+  u32 rx_fib_index = 0;
+
+  if (addr->as_u32 == 0)
+    return VNET_API_ERROR_INVALID_DST_ADDRESS;
+  
+  if (src_address->as_u32 == 0)
+    return VNET_API_ERROR_INVALID_SRC_ADDRESS;
+
+  rx_fib_index = fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP4,
+                                                   rx_fib_id);
+
+  if (rx_fib_id == 0)
+    {
+      server = pool_elt_at_index (dpm->dhcp_servers, 0);
+      
+      if (is_del)
+        {
+          memset (server, 0, sizeof (*server));
+          return 0;
+        }
+      goto initialize_it;
+    }
+
+  if (is_del)
+    {
+      if (rx_fib_index >= vec_len(dpm->dhcp_server_index_by_rx_fib_index))
+        return VNET_API_ERROR_NO_SUCH_ENTRY;
+      
+      server_index = dpm->dhcp_server_index_by_rx_fib_index[rx_fib_index];
+      ASSERT(server_index > 0);
+
+      /* Use the default server again.  */
+      dpm->dhcp_server_index_by_rx_fib_index[rx_fib_index] = 0;
+      server = pool_elt_at_index (dpm->dhcp_servers, server_index);
+      memset (server, 0, sizeof (*server));
+      pool_put (dpm->dhcp_servers, server);
+      return 0;
+    }
+
+  if (rx_fib_index < vec_len(dpm->dhcp_server_index_by_rx_fib_index))
+    {
+      server_index = dpm->dhcp_server_index_by_rx_fib_index[rx_fib_index];
+      if (server_index != 0)
+        {
+          server = pool_elt_at_index (dpm->dhcp_servers, server_index);
+          goto initialize_it;
+        }
+    }
+
+  pool_get (dpm->dhcp_servers, server);
+  
+ initialize_it:
+
+  server->dhcp_server.as_u32 = addr->as_u32;
+  server->server_fib_index = 
+      fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP4,
+	  				server_fib_id);
+  server->dhcp_src_address.as_u32 = src_address->as_u32;
+  server->insert_option_82 = insert_option_82;
+  server->valid = 1;
+  if (rx_fib_index)
+    {
+      vec_validate (dpm->dhcp_server_index_by_rx_fib_index, rx_fib_index);
+      dpm->dhcp_server_index_by_rx_fib_index[rx_fib_index] = 
+        server - dpm->dhcp_servers;
+    }
+
+  return 0;
+}
+
+/* Old API, manipulates the default server (only) */
+int dhcp_proxy_set_server (ip4_address_t *addr, ip4_address_t *src_address,
+                           u32 fib_id, int insert_option_82, int is_del)
+{
+  return dhcp_proxy_set_server_2 (addr, src_address, 0 /* rx_fib_id */,
+                                  fib_id /* server_fib_id */, 
+                                  insert_option_82, is_del);
+}
+
+
+static clib_error_t *
+dhcp_proxy_set_command_fn (vlib_main_t * vm,
+                           unformat_input_t * input,
+                           vlib_cli_command_t * cmd)
+{
+  ip4_address_t server_addr, src_addr;
+  u32 server_fib_id = 0, rx_fib_id = 0;
+  int is_del = 0;
+  int add_option_82 = 0;
+  int set_src = 0, set_server = 0;
+  
+  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT) 
+    {
+      if (unformat (input, "server %U", 
+                    unformat_ip4_address, &server_addr)) 
+        set_server = 1;
+      else if (unformat (input, "server-fib-id %d", &server_fib_id))
+        ;
+      else if (unformat (input, "rx-fib-id %d", &rx_fib_id))
+        ;
+      else if (unformat(input, "src-address %U", 
+			unformat_ip4_address, &src_addr))
+        set_src = 1;
+      else if (unformat (input, "add-option-82")
+               || unformat (input, "insert-option-82"))
+        add_option_82 = 1;
+      else if (unformat (input, "delete") ||
+               unformat (input, "del"))
+        is_del = 1;
+      else
+        break;
+    }
+
+  if (is_del || (set_server && set_src))
+    {
+      int rv;
+
+      rv = dhcp_proxy_set_server_2 (&server_addr, &src_addr, rx_fib_id, 
+                                    server_fib_id, add_option_82, is_del);
+      switch (rv)
+        {
+        case 0:
+          return 0;
+
+        case VNET_API_ERROR_INVALID_DST_ADDRESS:
+          return clib_error_return (0, "Invalid server address");
+          
+        case VNET_API_ERROR_INVALID_SRC_ADDRESS:
+          return clib_error_return (0, "Invalid src address");
+          
+        case VNET_API_ERROR_NO_SUCH_INNER_FIB:
+          return clib_error_return (0, "No such rx fib id %d", rx_fib_id);
+          
+        case VNET_API_ERROR_NO_SUCH_FIB:
+          return clib_error_return (0, "No such server fib id %d", 
+                                    server_fib_id);
+
+        case VNET_API_ERROR_NO_SUCH_ENTRY:
+          return clib_error_return 
+            (0, "Fib id %d: no per-fib DHCP server configured", rx_fib_id);
+
+        default:
+          return clib_error_return (0, "BUG: rv %d", rv);
+        }
+    }
+  else
+    return clib_error_return (0, "parse error`%U'",
+                              format_unformat_error, input);
+}
+
+VLIB_CLI_COMMAND (dhcp_proxy_set_command, static) = {
+  .path = "set dhcp proxy",
+  .short_help = "set dhcp proxy [del] server <ip-addr> src-address <ip-addr> [add-option-82] [server-fib-id <n>] [rx-fib-id <n>]",
+  .function = dhcp_proxy_set_command_fn,
+};
+
+u8 * format_dhcp_proxy_server (u8 * s, va_list * args)
+{
+  dhcp_proxy_main_t * dm = va_arg (*args, dhcp_proxy_main_t *);
+  dhcp_server_t * server = va_arg (*args, dhcp_server_t *);
+  u32 rx_fib_index = va_arg (*args, u32);
+  ip4_fib_t * rx_fib, * server_fib;
+  u32 server_fib_id = ~0, rx_fib_id = ~0;
+
+  if (dm == 0)
+    {
+      s = format (s, "%=16s%=16s%=14s%=14s%=20s", "Server", "Src Address", 
+                  "Server FIB", "RX FIB", "Insert Option 82");
+      return s;
+    }
+
+  server_fib = ip4_fib_get(server->server_fib_index);
+
+  if (server_fib)
+    server_fib_id = server_fib->table_id;
+
+  rx_fib = ip4_fib_get(rx_fib_index);
+
+  if (rx_fib)
+    rx_fib_id = rx_fib->table_id;
+
+  s = format (s, "%=16U%=16U%=14u%=14u%=20s",
+              format_ip4_address, &server->dhcp_server,
+              format_ip4_address, &server->dhcp_src_address,
+              server_fib_id, rx_fib_id,
+              server->insert_option_82 ? "yes" : "no");
+  return s;
+}
+
+static clib_error_t *
+dhcp_proxy_show_command_fn (vlib_main_t * vm,
+                            unformat_input_t * input,
+                            vlib_cli_command_t * cmd)
+{
+  dhcp_proxy_main_t * dpm = &dhcp_proxy_main;
+  ip4_main_t * im = &ip4_main;
+  dhcp_server_t * server;
+  u32 server_index;
+  int i;
+
+  vlib_cli_output (vm, "%U", format_dhcp_proxy_server, 0 /* header line */,
+                   0, 0);
+
+  for (i = 0; i < vec_len (im->fibs); i++)
+    {
+      if (i < vec_len(dpm->dhcp_server_index_by_rx_fib_index))
+        server_index = dpm->dhcp_server_index_by_rx_fib_index[i];
+      else
+        server_index = 0;
+      server = pool_elt_at_index (dpm->dhcp_servers, server_index);
+      if (server->valid)
+        vlib_cli_output (vm, "%U", format_dhcp_proxy_server, dpm, 
+                         server, i);
+    }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (dhcp_proxy_show_command, static) = {
+  .path = "show dhcp proxy",
+  .short_help = "Display dhcp proxy server info",
+  .function = dhcp_proxy_show_command_fn,
+};
+
+
+int dhcp_proxy_set_option82_vss(  u32 vrf_id,
+                                  u32 oui,
+                                  u32 fib_id, 
+                                  int is_del)
+{
+  dhcp_proxy_main_t *dm = &dhcp_proxy_main;
+  uword *p;
+  vss_info *a;
+  u32 old_oui=0, old_fib_id=0;
+  
+  p = hash_get (dm->opt82vss_index_by_vrf_id, vrf_id);
+
+  if (p) 
+    {
+      a = pool_elt_at_index (dm->opt82vss, p[0]);
+      if (!a) 
+        return VNET_API_ERROR_NO_SUCH_FIB;
+      old_oui = a->vpn_id.oui;
+      old_fib_id = a->vpn_id.fib_id;
+          
+      if (is_del)
+        {
+          if (old_oui == oui &&
+              old_fib_id == fib_id)
+            {
+              pool_put(dm->opt82vss, a);
+              hash_unset (dm->opt82vss_index_by_vrf_id, vrf_id);
+              return 0;
+            }
+          else
+            return VNET_API_ERROR_NO_SUCH_ENTRY;
+        }
+      pool_put(dm->opt82vss, a);
+      hash_unset (dm->opt82vss_index_by_vrf_id, vrf_id);
+  } else if (is_del)
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+  pool_get (dm->opt82vss, a);
+  memset (a, ~0, sizeof (a[0]));
+  a->vpn_id.oui = oui;
+  a->vpn_id.fib_id = fib_id;
+  hash_set (dm->opt82vss_index_by_vrf_id, vrf_id, a - dm->opt82vss);
+  
+  return 0;
+}
+
+static clib_error_t *
+dhcp_option_82_vss_fn (vlib_main_t * vm,
+                        unformat_input_t * input,
+                        vlib_cli_command_t * cmd)
+{
+  int is_del = 0, got_new_vpn_id=0;
+  u32 oui=0, fib_id=0, tbl_id=~0;
+ 
+
+  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT) 
+    {
+
+      if (unformat(input, "delete") || unformat(input, "del"))
+          is_del = 1;    
+      else if (unformat (input, "oui %d", &oui))
+          got_new_vpn_id = 1;
+      else if (unformat (input, "vpn-id %d", &fib_id))
+          got_new_vpn_id = 1;
+      else if (unformat (input, "table %d", &tbl_id))
+          got_new_vpn_id = 1;
+      else
+          break;
+  }
+  if (tbl_id == ~0)
+      return clib_error_return (0, "no table ID specified.");
+  
+  if (is_del || got_new_vpn_id)
+    {
+      int rv;
+      rv = dhcp_proxy_set_option82_vss(tbl_id, oui, fib_id, is_del);
+      switch (rv)
+        {
+        case 0:
+            return 0;
+            
+        case VNET_API_ERROR_NO_SUCH_FIB:
+            return clib_error_return (0, "option 82 vss(oui:%d, vpn-id:%d) not found in table %d",
+                                      oui, fib_id, tbl_id);
+            
+        case VNET_API_ERROR_NO_SUCH_ENTRY:
+            return clib_error_return (0, "option 82 vss for table %d not found in in pool.",
+                                      tbl_id);
+        default:
+          return clib_error_return (0, "BUG: rv %d", rv);
+        }
+    }
+  else
+      return clib_error_return (0, "parse error`%U'",
+                                format_unformat_error, input);
+}
+
+VLIB_CLI_COMMAND (dhcp_proxy_vss_command,static) = {
+  .path = "set dhcp option-82 vss",
+  .short_help = "set dhcp option-82 vss [del] table <table id> oui <oui> vpn-id <vpn-id>",
+  .function = dhcp_option_82_vss_fn,
+};
+
+
+static clib_error_t *
+dhcp_vss_show_command_fn (vlib_main_t * vm,
+                          unformat_input_t * input,
+                          vlib_cli_command_t * cmd)
+  
+{
+  dhcp_proxy_main_t * dm = &dhcp_proxy_main;
+  vss_info *v;
+  u32 oui;
+  u32 fib_id;
+  u32 tbl_id;
+  uword index;
+  
+  vlib_cli_output (vm, "%=9s%=11s%=12s","Table", "OUI", "VPN-ID");
+  hash_foreach (tbl_id, index, dm->opt82vss_index_by_vrf_id,
+  ({
+     v = pool_elt_at_index (dm->opt82vss, index);
+     oui = v->vpn_id.oui;
+     fib_id = v->vpn_id.fib_id;
+     vlib_cli_output (vm, "%=9d 0x%08x%=12d",
+                      tbl_id, oui, fib_id);
+  }));
+  
+  return 0;
+}
+
+VLIB_CLI_COMMAND (dhcp_proxy_vss_show_command, static) = {
+  .path = "show dhcp vss",
+  .short_help = "show dhcp VSS",
+  .function = dhcp_vss_show_command_fn,
+};
+
+static clib_error_t *
+dhcp_option_82_address_show_command_fn (vlib_main_t * vm,
+                                unformat_input_t * input,
+                                vlib_cli_command_t * cmd)
+  
+{
+  dhcp_proxy_main_t *dm = &dhcp_proxy_main;
+  vnet_main_t *vnm = vnet_get_main();                                     
+  u32 sw_if_index0=0, sw_if_index;
+  ip4_address_t *ia0;
+  vnet_sw_interface_t *swif;
+  
+  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT) 
+    {
+      
+      if (unformat(input, "%U",
+                   unformat_vnet_sw_interface, dm->vnet_main, &sw_if_index0))
+        {
+          swif = vnet_get_sw_interface (vnm, sw_if_index0);
+          sw_if_index = (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED) ?
+            swif->unnumbered_sw_if_index : sw_if_index0;
+          ia0 = ip4_interface_first_address(&ip4_main, sw_if_index, 0);
+          if (ia0)
+            {
+              vlib_cli_output (vm, "%=20s%=20s", "interface", 
+                               "source IP address");
+              
+              vlib_cli_output (vm, "%=20U%=20U",
+                               format_vnet_sw_if_index_name, 
+                               dm->vnet_main, sw_if_index0,
+                               format_ip4_address, ia0);
+            }
+          else
+            vlib_cli_output (vm, "%=34s %=20U", 
+                             "No IPv4 address configured on",
+                             format_vnet_sw_if_index_name, 
+                             dm->vnet_main, sw_if_index);
+        }
+      else
+        break;
+    }
+  
+  return 0;
+}
+
+VLIB_CLI_COMMAND (dhcp_proxy_address_show_command,static) = {
+  .path = "show dhcp option-82-address interface",
+  .short_help = "show dhcp option-82-address interface <interface>",
+  .function = dhcp_option_82_address_show_command_fn,
+};
diff --git a/src/vnet/dhcpv6/packet.h b/src/vnet/dhcpv6/packet.h
new file mode 100644
index 00000000..8634b5d8
--- /dev/null
+++ b/src/vnet/dhcpv6/packet.h
@@ -0,0 +1,183 @@
+#ifndef included_vnet_dhcp_packet_h
+#define included_vnet_dhcp_packet_h
+
+/*
+ * DHCP packet format
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/ip/ip6_packet.h>
+
+// #define DHCP_VRF_NAME_MAX_LEN L3VM_MAX_NAME_STR_LEN
+// #define DHCPV6_MAX_VRF_NAME_LEN L3VM_MAX_NAME_STR_LEN
+#define DHCP_MAX_RELAY_ADDR    16
+#define PROTO_UDP 17
+#define DHCPV6_CLIENT_PORT 546
+#define DHCPV6_SERVER_PORT 547
+#define HOP_COUNT_LIMIT  32
+#define DHCPV6_CISCO_ENT_NUM 9
+
+/*
+ * DHCPv6 message types
+ */
+typedef enum dhcpv6_msg_type_{
+    DHCPV6_MSG_SOLICIT              = 1,
+    DHCPV6_MSG_ADVERTISE            = 2,
+    DHCPV6_MSG_REQUEST              = 3,
+    DHCPV6_MSG_CONFIRM              = 4,
+    DHCPV6_MSG_RENEW                = 5,
+    DHCPV6_MSG_REBIND               = 6,
+    DHCPV6_MSG_REPLY                = 7,
+    DHCPV6_MSG_RELEASE              = 8,
+    DHCPV6_MSG_DECLINE              = 9,
+    DHCPV6_MSG_RECONFIGURE          = 10,
+    DHCPV6_MSG_INFORMATION_REQUEST  = 11,
+    DHCPV6_MSG_RELAY_FORW           = 12,
+    DHCPV6_MSG_RELAY_REPL           = 13,
+} dhcpv6_msg_type_t;
+
+/*
+ * DHCPv6 options types
+ */
+enum {
+    DHCPV6_OPTION_CLIENTID      = 1,
+    DHCPV6_OPTION_SERVERID      = 2,
+    DHCPV6_OPTION_IA_NA         = 3,
+    DHCPV6_OPTION_IA_TA         = 4,
+    DHCPV6_OPTION_IAADDR        = 5,
+    DHCPV6_OPTION_ORO           = 6,
+    DHCPV6_OPTION_PREFERENCE    = 7,
+    DHCPV6_OPTION_ELAPSED_TIME  = 8,
+    DHCPV6_OPTION_RELAY_MSG     = 9,
+    DHCPV6_OPTION_AUTH          = 11,
+    DHCPV6_OPTION_UNICAST       = 12,
+    DHCPV6_OPTION_STATUS_CODE   = 13,
+    DHCPV6_OPTION_RAPID_COMMIT  = 14,
+    DHCPV6_OPTION_USER_CLASS    = 15,
+    DHCPV6_OPTION_VENDOR_CLASS  = 16,
+    DHCPV6_OPTION_VENDOR_OPTS   = 17,
+    DHCPV6_OPTION_INTERFACE_ID  = 18, // relay agent fills this
+    DHCPV6_OPTION_RECONF_MSG    = 19,
+    DHCPV6_OPTION_RECONF_ACCEPT = 20,
+    DHCPV6_OPTION_REMOTEID      = 37, // relay agent fills this
+    DHCPV6_OPTION_VSS      = 68, // relay agent fills this
+    DHCPV6_OPTION_CLIENT_LINK_LAYER_ADDRESS = 79, 
+    DHCPV6_OPTION_MAX
+};
+
+/*
+* DHCPv6 status codes
+ */
+enum {
+    DHCPV6_STATUS_SUCCESS       = 0,
+    DHCPV6_STATUS_UNSPEC_FAIL   = 1,
+    DHCPV6_STATUS_NOADDRS_AVAIL = 2,
+    DHCPV6_STATUS_NO_BINDING    = 3,
+    DHCPV6_STATUS_NOT_ONLINK    = 4,
+    DHCPV6_STATUS_USE_MULTICAST = 5,
+};
+
+/*
+ * DHCPv6 DUID types
+ */
+enum {
+    DHCPV6_DUID_LLT =   1,  /* DUID Based on Link-layer Address Plus Time */
+    DHCPV6_DUID_EN =    2,  /* DUID Based on Enterprise Number */
+    DHCPV6_DUID_LL =    3,  /* DUID Based on Link-layer Address */
+};
+
+//Structure for DHCPv6 payload from client
+typedef struct dhcpv6_hdr_ {
+    union {
+        u8 msg_type; //DHCP msg type
+        u32 xid;     // transaction id
+    }u;
+    u8  data[0];
+} dhcpv6_header_t;
+
+
+
+typedef CLIB_PACKED (struct dhcpv6_relay_ctx_ {
+    dhcpv6_header_t *pkt;
+    u32  pkt_len;
+    u32  dhcpv6_len; //DHCPv6 payload load
+//    if_ordinal iod;
+    u32 if_index;
+    u32 ctx_id;
+    char ctx_name[32+1];
+    u8 dhcp_msg_type;
+}) dhcpv6_relay_ctx_t;
+
+//Structure for DHCPv6 RELAY-FORWARD and DHCPv6 RELAY-REPLY pkts
+typedef CLIB_PACKED (struct dhcpv6_relay_hdr_ {
+    u8           msg_type;
+    u8           hop_count;
+    ip6_address_t    link_addr;
+    ip6_address_t    peer_addr;
+    u8           data[0];
+}) dhcpv6_relay_hdr_t;
+
+typedef enum dhcp_stats_action_type_ {
+    DHCP_STATS_ACTION_FORWARDED=1,
+    DHCP_STATS_ACTION_RECEIVED,
+    DHCP_STATS_ACTION_DROPPED
+} dhcp_stats_action_type_t;
+//Generic counters for a packet
+typedef  struct dhcp_stats_counters_ {
+    u64  rx_pkts; //counter for received pkts
+    u64  tx_pkts; //counter for forwarded pkts
+    u64  drops;   //counter for dropped pkts
+} dhcp_stats_counters_t;
+
+
+typedef enum dhcpv6_stats_drop_reason_ {
+    DHCPV6_RELAY_PKT_DROP_RELAYDISABLE = 1,
+    DHCPV6_RELAY_PKT_DROP_MAX_HOPS,
+    DHCPV6_RELAY_PKT_DROP_VALIDATION_FAIL,
+    DHCPV6_RELAY_PKT_DROP_UNKNOWN_OP_INTF,
+    DHCPV6_RELAY_PKT_DROP_BAD_CONTEXT,
+    DHCPV6_RELAY_PKT_DROP_OPT_INSERT_FAIL,
+    DHCPV6_RELAY_PKT_DROP_REPLY_FROM_CLIENT,
+} dhcpv6_stats_drop_reason_t;
+
+typedef CLIB_PACKED (struct {
+  u16 option;
+  u16 length;
+  u8 data[0];
+}) dhcpv6_option_t;
+
+typedef CLIB_PACKED (struct {
+  dhcpv6_option_t opt;
+  u32 int_idx;
+}) dhcpv6_int_id_t;
+
+typedef CLIB_PACKED (struct {
+  dhcpv6_option_t opt;
+  u8 data[8];  // data[0]:type, data[1..7]: VPN ID
+}) dhcpv6_vss_t;
+
+typedef CLIB_PACKED (struct {
+  dhcpv6_option_t opt;
+  u32 ent_num;
+  u32 rmt_id;
+}) dhcpv6_rmt_id_t;
+
+typedef CLIB_PACKED (struct {
+  dhcpv6_option_t opt;
+  u16 link_type;
+  u8 data[6];  // data[0]:data[5]: MAC address
+}) dhcpv6_client_mac_t;
+
+
+#endif /* included_vnet_dhcp_packet_h */
diff --git a/src/vnet/dhcpv6/proxy.h b/src/vnet/dhcpv6/proxy.h
new file mode 100644
index 00000000..9e18913a
--- /dev/null
+++ b/src/vnet/dhcpv6/proxy.h
@@ -0,0 +1,95 @@
+/*
+ * proxy.h: dhcp proxy 
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_dhcpv6_proxy_h
+#define included_dhcpv6_proxy_h
+
+#include <vnet/vnet.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ip/ip4.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ip/format.h>
+#include <vnet/ip/udp.h>
+#include <vnet/dhcpv6/packet.h>
+
+typedef enum {
+#define dhcpv6_proxy_error(n,s) DHCPV6_PROXY_ERROR_##n,
+#include <vnet/dhcpv6/proxy_error.def>
+#undef dhcpv6_proxy_error
+  DHCPV6_PROXY_N_ERROR,
+} dhcpv6_proxy_error_t;
+
+typedef struct {
+  u32 oui;
+  u32 fib_id;
+} dhcpv6_vss_id;
+
+typedef union {
+  u8 as_u8[8];
+  dhcpv6_vss_id vpn_id;
+} dhcpv6_vss_info;
+
+typedef struct {
+  ip6_address_t dhcp6_server;
+  ip6_address_t dhcp6_src_address;
+  u32 insert_vss;
+  u32 server_fib6_index;
+  u32 valid;
+} dhcpv6_server_t;
+
+typedef struct {
+  /* Pool of DHCP servers */
+  dhcpv6_server_t * dhcp6_servers;
+
+  /* Pool of selected DHCP server. Zero is the default server */
+   u32 * dhcp6_server_index_by_rx_fib_index;
+
+  /* all DHCP servers address */
+  ip6_address_t all_dhcpv6_server_address;
+  ip6_address_t all_dhcpv6_server_relay_agent_address;
+
+  /* to drop pkts in server-to-client direction */
+  u32 error_drop_node_index;
+
+  dhcpv6_vss_info *vss;
+
+  /* hash lookup specific vrf_id -> VSS vector index*/
+  uword  *vss_index_by_vrf_id;
+   
+  /* convenience */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+} dhcpv6_proxy_main_t;
+
+dhcpv6_proxy_main_t dhcpv6_proxy_main;
+
+int dhcpv6_proxy_set_server (ip6_address_t *addr, ip6_address_t *src_address,
+                             u32 fib_id, int insert_vss, int is_del);
+
+int dhcpv6_proxy_set_vss(u32 tbl_id,
+                         u32 oui,
+                         u32 fib_id, 
+                         int is_del);
+
+int dhcpv6_proxy_set_server_2 (ip6_address_t *addr, ip6_address_t *src_address,
+                             u32 rx_fib_id,
+                             u32 server_fib_id,
+                             int insert_vss, int is_del);
+
+#endif /* included_dhcpv6_proxy_h */
diff --git a/src/vnet/dhcpv6/proxy_error.def b/src/vnet/dhcpv6/proxy_error.def
new file mode 100644
index 00000000..55fa7317
--- /dev/null
+++ b/src/vnet/dhcpv6/proxy_error.def
@@ -0,0 +1,29 @@
+/*
+ * dhcp_proxy_error.def: dhcp proxy errors
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+dhcpv6_proxy_error (NONE, "no error")
+dhcpv6_proxy_error (NO_SERVER, "no dhcpv6 server configured")
+dhcpv6_proxy_error (RELAY_TO_SERVER, "DHCPV6 packets relayed to the server")
+dhcpv6_proxy_error (RELAY_TO_CLIENT, "DHCPV6 packets relayed to clients")
+dhcpv6_proxy_error (NO_INTERFACE_ADDRESS, "DHCPV6 no interface address")
+dhcpv6_proxy_error (WRONG_MESSAGE_TYPE, "DHCPV6 wrong message type.")
+dhcpv6_proxy_error (NO_SRC_ADDRESS, "DHCPV6 no srouce IPv6 address configured.")
+dhcpv6_proxy_error (NO_CIRCUIT_ID_OPTION, "DHCPv6 reply packets without circuit ID option")
+dhcpv6_proxy_error (NO_RELAY_MESSAGE_OPTION, "DHCPv6 reply packets without relay message option")
+dhcpv6_proxy_error (BAD_SVR_FIB_OR_ADDRESS, "DHCPv6 packets not from DHCPv6 server or server FIB.")
+dhcpv6_proxy_error (PKT_TOO_BIG, "DHCPv6 packets which are too big.")
+dhcpv6_proxy_error (WRONG_INTERFACE_ID_OPTION, "DHCPv6 reply to invalid interface.")
diff --git a/src/vnet/dhcpv6/proxy_node.c b/src/vnet/dhcpv6/proxy_node.c
new file mode 100644
index 00000000..40df35cd
--- /dev/null
+++ b/src/vnet/dhcpv6/proxy_node.c
@@ -0,0 +1,1191 @@
+/*
+ * proxy_node.c: dhcpv6 proxy node processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/dhcpv6/proxy.h>
+#include <vnet/fib/ip6_fib.h>
+
+static char * dhcpv6_proxy_error_strings[] = {
+#define dhcpv6_proxy_error(n,s) s,
+#include "proxy_error.def"
+#undef dhcpv6_proxy_error
+};
+
+#define foreach_dhcpv6_proxy_to_server_input_next \
+  _ (DROP, "error-drop")			\
+  _ (LOOKUP, "ip6-lookup")                      \
+  _ (SEND_TO_CLIENT, "dhcpv6-proxy-to-client")
+
+
+typedef enum {
+#define _(s,n) DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_##s,
+  foreach_dhcpv6_proxy_to_server_input_next
+#undef _
+  DHCPV6_PROXY_TO_SERVER_INPUT_N_NEXT,
+} dhcpv6_proxy_to_server_input_next_t;
+
+typedef struct {
+  /* 0 => to server, 1 => to client */
+  int which;
+  u8 packet_data[64];
+  u32 error;
+  u32 sw_if_index;
+  u32 original_sw_if_index;
+} dhcpv6_proxy_trace_t;
+
+vlib_node_registration_t dhcpv6_proxy_to_server_node;
+vlib_node_registration_t dhcpv6_proxy_to_client_node;
+
+
+u8 * format_dhcpv6_proxy_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  dhcpv6_proxy_trace_t * t = va_arg (*args, dhcpv6_proxy_trace_t *);
+
+  if (t->which == 0)
+    s = format (s, "DHCPV6 proxy: sent to server %U",
+                format_ip6_address, &t->packet_data, sizeof (ip6_address_t));
+  else
+    s = format (s, "DHCPV6 proxy: sent to client from %U",
+                format_ip6_address, &t->packet_data, sizeof (ip6_address_t));
+  if (t->error != (u32)~0)
+    s = format (s, " error: %s\n", dhcpv6_proxy_error_strings[t->error]);
+
+  s = format (s, "  original_sw_if_index: %d, sw_if_index: %d\n",
+              t->original_sw_if_index, t->sw_if_index);
+
+  return s;
+}
+
+u8 * format_dhcpv6_proxy_header_with_length (u8 * s, va_list * args)
+{
+  dhcpv6_header_t * h = va_arg (*args, dhcpv6_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+  u32 header_bytes;
+
+  header_bytes = sizeof (h[0]);
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    return format (s, "dhcpv6 header truncated");
+
+  s = format (s, "DHCPV6 Proxy");
+
+  return s;
+}
+/* get first interface address */
+static ip6_address_t *
+ip6_interface_first_global_or_site_address (ip6_main_t * im, u32 sw_if_index)
+{
+  ip_lookup_main_t * lm = &im->lookup_main;
+  ip_interface_address_t * ia = 0;
+  ip6_address_t * result = 0;
+
+  foreach_ip_interface_address (lm, ia, sw_if_index,
+                                1 /* honor unnumbered */,
+  ({
+    ip6_address_t * a = ip_interface_address_get_address (lm, ia);
+    if ((a->as_u8[0] & 0xe0) == 0x20 ||
+        (a->as_u8[0] & 0xfe) == 0xfc)  {
+        result = a;
+        break;
+    }
+  }));
+  return result;
+}
+
+/* get first interface address */
+static ip6_address_t *
+ip6_interface_first_address (ip6_main_t * im, u32 sw_if_index)
+{
+  ip_lookup_main_t * lm = &im->lookup_main;
+  ip_interface_address_t * ia = 0;
+  ip6_address_t * result = 0;
+
+  foreach_ip_interface_address (lm, ia, sw_if_index,
+                                1 /* honor unnumbered */,
+  ({
+    ip6_address_t * a = ip_interface_address_get_address (lm, ia);
+    result = a;
+    break;
+  }));
+  return result;
+}
+
+static inline void copy_ip6_address (ip6_address_t *dst, ip6_address_t *src) 
+{
+
+  dst->as_u64[0] = src->as_u64[0];
+  dst->as_u64[1] = src->as_u64[1];
+} 
+
+static uword
+dhcpv6_proxy_to_server_input (vlib_main_t * vm,
+                            vlib_node_runtime_t * node,
+                            vlib_frame_t * from_frame)
+{
+  u32 n_left_from, next_index, * from, * to_next;
+  dhcpv6_proxy_main_t * dpm = &dhcpv6_proxy_main;
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+  u32 pkts_to_server=0, pkts_to_client=0, pkts_no_server=0;
+  u32 pkts_no_interface_address=0, pkts_no_exceeding_max_hop=0;
+  u32 pkts_no_src_address=0;
+  u32 pkts_wrong_msg_type=0;
+  u32 pkts_too_big=0;
+  ip6_main_t * im = &ip6_main;
+  ip6_fib_t * fib;
+  ip6_address_t * src;
+  int bogus_length;
+  dhcpv6_server_t * server;
+  u32  rx_fib_idx = 0, server_fib_idx = 0;
+  u32 server_idx;
+  u32 fib_id1 = 0;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+          vnet_main_t *vnm = vnet_get_main();
+          u32 sw_if_index = 0;
+          u32 rx_sw_if_index = 0;
+          vnet_sw_interface_t *swif;
+ 	  u32 bi0;
+	  vlib_buffer_t * b0;
+          udp_header_t * u0, *u1;
+	  dhcpv6_header_t * h0;  // client msg hdr
+          ip6_header_t * ip0, *ip1;
+          ip6_address_t _ia0, *ia0=&_ia0;
+	  u32 next0;
+          u32 error0 = (u32) ~0;
+          dhcpv6_option_t *fwd_opt;
+          dhcpv6_relay_hdr_t *r1;
+          u16 len;
+          dhcpv6_int_id_t *id1;
+          dhcpv6_vss_t *vss1;
+          dhcpv6_client_mac_t *cmac; // client mac
+          ethernet_header_t * e_h0;
+          u8 client_src_mac[6];
+          vlib_buffer_free_list_t *fl;
+
+          uword *p_vss;
+          u32  oui1=0;
+          dhcpv6_vss_info *vss;
+
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+          h0 = vlib_buffer_get_current (b0);
+
+          /*
+           * udp_local hands us the DHCPV6 header.
+           */
+          u0 = (void *)h0 -(sizeof(*u0));
+          ip0 = (void *)u0 -(sizeof(*ip0));
+          e_h0 = (void *)ip0 - ethernet_buffer_header_size(b0);
+
+          clib_memcpy(client_src_mac, e_h0->src_address, 6);
+
+          switch (h0->u.msg_type) {
+            case DHCPV6_MSG_SOLICIT:
+            case DHCPV6_MSG_REQUEST:
+            case DHCPV6_MSG_CONFIRM:
+            case DHCPV6_MSG_RENEW:
+            case DHCPV6_MSG_REBIND:
+            case DHCPV6_MSG_RELEASE:
+            case DHCPV6_MSG_DECLINE:
+            case DHCPV6_MSG_INFORMATION_REQUEST:
+            case DHCPV6_MSG_RELAY_FORW:
+                /* send to server */
+                break;
+            case DHCPV6_MSG_RELAY_REPL:
+                /* send to client */
+                next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_SEND_TO_CLIENT;
+                error0 = 0;
+                pkts_to_client++;
+                goto do_enqueue;
+            default:
+                /* drop the packet */
+                pkts_wrong_msg_type++;
+                error0 = DHCPV6_PROXY_ERROR_WRONG_MESSAGE_TYPE;
+                next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP;
+                goto do_trace;
+
+          }
+
+          /* Send to DHCPV6 server via the configured FIB */
+          rx_sw_if_index = sw_if_index =  vnet_buffer(b0)->sw_if_index[VLIB_RX];
+          rx_fib_idx = im->fib_index_by_sw_if_index [rx_sw_if_index];
+          server_idx = dpm->dhcp6_server_index_by_rx_fib_index[rx_fib_idx];
+
+          if (PREDICT_FALSE (pool_is_free_index (dpm->dhcp6_servers,
+                                                          server_idx)))
+                     {
+                     no_server:
+                       error0 = DHCPV6_PROXY_ERROR_NO_SERVER;
+                       next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP;
+                       pkts_no_server++;
+                       goto do_trace;
+                     }
+
+          server = pool_elt_at_index(dpm->dhcp6_servers, server_idx);
+          if (server->valid == 0)
+            goto no_server;
+
+          server_fib_idx = server->server_fib6_index;
+          vnet_buffer(b0)->sw_if_index[VLIB_TX] = server_fib_idx;
+
+
+          /* relay-option header pointer */
+          vlib_buffer_advance(b0, -(sizeof(*fwd_opt)));
+          fwd_opt = vlib_buffer_get_current(b0);
+          /* relay message header pointer */
+          vlib_buffer_advance(b0, -(sizeof(*r1)));
+          r1 = vlib_buffer_get_current(b0);
+
+          vlib_buffer_advance(b0, -(sizeof(*u1)));
+          u1 = vlib_buffer_get_current(b0);
+
+          vlib_buffer_advance(b0, -(sizeof(*ip1)));
+          ip1 = vlib_buffer_get_current(b0);
+
+          /* fill in all that rubbish... */
+          len = clib_net_to_host_u16(u0->length) - sizeof(udp_header_t);
+          copy_ip6_address(&r1->peer_addr, &ip0->src_address);
+
+          r1->msg_type = DHCPV6_MSG_RELAY_FORW;
+          fwd_opt->length = clib_host_to_net_u16(len);
+          fwd_opt->option = clib_host_to_net_u16(DHCPV6_OPTION_RELAY_MSG);
+
+          r1->hop_count++;
+          r1->hop_count = (h0->u.msg_type != DHCPV6_MSG_RELAY_FORW) ? 0 : r1->hop_count;
+
+          if (PREDICT_FALSE(r1->hop_count >= HOP_COUNT_LIMIT))
+            {
+              error0 =  DHCPV6_RELAY_PKT_DROP_MAX_HOPS;
+              next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP;
+              pkts_no_exceeding_max_hop++;
+              goto do_trace;
+            }
+
+
+          /* If relay-fwd and src address is site or global unicast address  */
+          if (h0->u.msg_type == DHCPV6_MSG_RELAY_FORW &&
+              ((ip0->src_address.as_u8[0] & 0xe0) == 0x20 ||
+               (ip0->src_address.as_u8[0] & 0xfe) == 0xfc))
+            {
+              /* Set link address to zero */
+              r1->link_addr.as_u64[0] = 0;
+              r1->link_addr.as_u64[1] = 0;
+              goto link_address_set;
+            }
+
+          /* if receiving interface is unnumbered, use receiving interface
+           * IP address as link address, otherwise use the loopback interface
+           * IP address as link address.
+           */
+
+          swif = vnet_get_sw_interface (vnm, rx_sw_if_index);
+          if (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
+              sw_if_index = swif->unnumbered_sw_if_index;
+
+          ia0 = ip6_interface_first_global_or_site_address(&ip6_main, sw_if_index);
+          if (ia0 == 0)
+            {
+              error0 = DHCPV6_PROXY_ERROR_NO_INTERFACE_ADDRESS;
+              next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP;
+              pkts_no_interface_address++;
+              goto do_trace;
+            }
+
+          copy_ip6_address(&r1->link_addr, ia0);
+
+        link_address_set:
+          fl = vlib_buffer_get_free_list (vm, b0->free_list_index);
+
+          if ((b0->current_length+sizeof(*id1)+sizeof(*vss1)+sizeof(*cmac))
+              > fl->n_data_bytes)
+            {
+              error0 = DHCPV6_PROXY_ERROR_PKT_TOO_BIG;
+              next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP;
+              pkts_too_big++;
+              goto do_trace;
+            }
+
+          id1 = (dhcpv6_int_id_t *) (((uword) ip1) + b0->current_length);
+          b0->current_length += (sizeof (*id1));
+
+
+          fib = ip6_fib_get (rx_fib_idx);
+
+          //TODO: Revisit if hash makes sense here
+          p_vss = hash_get (dpm->vss_index_by_vrf_id,
+                            fib->table_id);
+          if (p_vss)
+            {
+              vss = pool_elt_at_index (dpm->vss, p_vss[0]);
+              oui1 =  vss->vpn_id.oui;
+              fib_id1 =  vss->vpn_id.fib_id;
+            }
+
+          id1->opt.option = clib_host_to_net_u16(DHCPV6_OPTION_INTERFACE_ID);
+          id1->opt.length = clib_host_to_net_u16(sizeof(rx_sw_if_index));
+          id1->int_idx = clib_host_to_net_u32(rx_sw_if_index);
+
+          u1->length =0;
+          if (h0->u.msg_type != DHCPV6_MSG_RELAY_FORW)
+            {
+               cmac = (dhcpv6_client_mac_t *) (((uword) ip1) + b0->current_length);
+               b0->current_length += (sizeof (*cmac));
+               cmac->opt.length =clib_host_to_net_u16(sizeof(*cmac) -
+                                                      sizeof(cmac->opt));
+               cmac->opt.option = clib_host_to_net_u16(DHCPV6_OPTION_CLIENT_LINK_LAYER_ADDRESS);
+               cmac->link_type = clib_host_to_net_u16(1); // ethernet
+               clib_memcpy(cmac->data, client_src_mac, 6);
+               u1->length += sizeof(*cmac);
+            }
+          if (server->insert_vss !=0 ) {
+              vss1 = (dhcpv6_vss_t *) (((uword) ip1) + b0->current_length);
+              b0->current_length += (sizeof (*vss1));
+              vss1->opt.length =clib_host_to_net_u16(sizeof(*vss1) -
+						     sizeof(vss1->opt));
+              vss1->opt.option = clib_host_to_net_u16(DHCPV6_OPTION_VSS);
+              vss1->data[0] = 1;   // type
+              vss1->data[1] = oui1>>16 & 0xff;
+              vss1->data[2] = oui1>>8  & 0xff;
+              vss1->data[3] = oui1 & 0xff;
+              vss1->data[4] = fib_id1>>24 & 0xff;
+              vss1->data[5] = fib_id1>>16 & 0xff;
+              vss1->data[6] = fib_id1>>8 & 0xff;
+              vss1->data[7] = fib_id1 & 0xff;
+              u1->length += sizeof(*vss1);
+          }
+
+          pkts_to_server++;
+          u1->checksum = 0;
+          u1->src_port = clib_host_to_net_u16(UDP_DST_PORT_dhcpv6_to_client);
+          u1->dst_port = clib_host_to_net_u16(UDP_DST_PORT_dhcpv6_to_server);
+
+          u1->length =
+              clib_host_to_net_u16( clib_net_to_host_u16(fwd_opt->length) +
+                                    sizeof(*r1) + sizeof(*fwd_opt) +
+                                    sizeof(*u1) + sizeof(*id1) + u1->length);
+
+          memset(ip1, 0, sizeof(*ip1));
+          ip1->ip_version_traffic_class_and_flow_label = 0x60;
+          ip1->payload_length =  u1->length;
+          ip1->protocol = PROTO_UDP;
+          ip1->hop_limit = HOP_COUNT_LIMIT;
+	      src = (server->dhcp6_server.as_u64[0] || server->dhcp6_server.as_u64[1]) ?
+	        &server->dhcp6_server : &dpm->all_dhcpv6_server_address;
+          copy_ip6_address(&ip1->dst_address, src);
+
+
+          ia0 = ip6_interface_first_global_or_site_address
+              (&ip6_main, vnet_buffer(b0)->sw_if_index[VLIB_RX]);
+
+	      src = (server->dhcp6_src_address.as_u64[0] || server->dhcp6_src_address.as_u64[1]) ?
+	        &server->dhcp6_src_address : ia0;
+          if (ia0 == 0)
+            {
+              error0 = DHCPV6_PROXY_ERROR_NO_SRC_ADDRESS;
+              next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP;
+              pkts_no_src_address++;
+              goto do_trace;
+            }
+
+	  copy_ip6_address (&ip1->src_address, src);
+
+
+          u1->checksum = ip6_tcp_udp_icmp_compute_checksum(vm, b0, ip1,
+                                                           &bogus_length);
+          ASSERT(bogus_length == 0);
+
+          next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_LOOKUP;
+
+        do_trace:
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+            {
+               dhcpv6_proxy_trace_t *tr = vlib_add_trace (vm, node,
+                                                          b0, sizeof (*tr));
+               tr->which = 0; /* to server */
+               tr->error = error0;
+               tr->original_sw_if_index = rx_sw_if_index;
+               tr->sw_if_index = sw_if_index;
+               if (DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_LOOKUP == next0)
+                 copy_ip6_address((ip6_address_t *)&tr->packet_data[0], &server->dhcp6_server);
+            }
+
+        do_enqueue:
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, dhcpv6_proxy_to_server_node.index,
+                               DHCPV6_PROXY_ERROR_RELAY_TO_CLIENT,
+                               pkts_to_client);
+  vlib_node_increment_counter (vm, dhcpv6_proxy_to_server_node.index,
+                               DHCPV6_PROXY_ERROR_RELAY_TO_SERVER,
+                               pkts_to_server);
+  vlib_node_increment_counter (vm, dhcpv6_proxy_to_server_node.index,
+                               DHCPV6_PROXY_ERROR_NO_INTERFACE_ADDRESS,
+                               pkts_no_interface_address);
+  vlib_node_increment_counter (vm, dhcpv6_proxy_to_server_node.index,
+                               DHCPV6_PROXY_ERROR_WRONG_MESSAGE_TYPE,
+                               pkts_wrong_msg_type);
+  vlib_node_increment_counter (vm, dhcpv6_proxy_to_server_node.index,
+                               DHCPV6_PROXY_ERROR_NO_SRC_ADDRESS,
+                               pkts_no_src_address);
+  vlib_node_increment_counter (vm, dhcpv6_proxy_to_server_node.index,
+                               DHCPV6_PROXY_ERROR_PKT_TOO_BIG,
+                               pkts_too_big);
+  return from_frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (dhcpv6_proxy_to_server_node) = {
+  .function = dhcpv6_proxy_to_server_input,
+  .name = "dhcpv6-proxy-to-server",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .n_errors = DHCPV6_PROXY_N_ERROR,
+  .error_strings = dhcpv6_proxy_error_strings,
+
+  .n_next_nodes = DHCPV6_PROXY_TO_SERVER_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_##s] = n,
+    foreach_dhcpv6_proxy_to_server_input_next
+#undef _
+  },
+
+  .format_buffer = format_dhcpv6_proxy_header_with_length,
+  .format_trace = format_dhcpv6_proxy_trace,
+#if 0
+  .unformat_buffer = unformat_dhcpv6_proxy_header,
+#endif
+};
+
+static uword
+dhcpv6_proxy_to_client_input (vlib_main_t * vm,
+                            vlib_node_runtime_t * node,
+                            vlib_frame_t * from_frame)
+{
+
+  u32 n_left_from, * from;
+  ethernet_main_t *em = ethernet_get_main (vm);
+  dhcpv6_proxy_main_t * dm = &dhcpv6_proxy_main;
+  dhcpv6_server_t * server;
+  vnet_main_t * vnm = vnet_get_main();
+  int bogus_length;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t * b0;
+      udp_header_t * u0, *u1=0;
+      dhcpv6_relay_hdr_t * h0;
+      ip6_header_t * ip1 = 0, *ip0;
+      ip6_address_t _ia0, * ia0 = &_ia0;
+      ip6_address_t client_address;
+      ethernet_interface_t *ei0;
+      ethernet_header_t *mac0;
+      vnet_hw_interface_t *hi0;
+      vlib_frame_t *f0;
+      u32 * to_next0;
+      u32 sw_if_index = ~0;
+      u32 original_sw_if_index = ~0;
+      vnet_sw_interface_t *si0;
+      u32 error0 = (u32)~0;
+      vnet_sw_interface_t *swif;
+      dhcpv6_option_t *r0 = 0, *o;
+      u16 len = 0;
+      u8 interface_opt_flag = 0;
+      u8 relay_msg_opt_flag = 0;
+      ip6_fib_t * svr_fib;
+      ip6_main_t * im = &ip6_main;
+      u32 server_fib_idx, svr_fib_id, client_fib_idx, server_idx;
+
+      bi0 = from[0];
+      from += 1;
+      n_left_from -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      h0 = vlib_buffer_get_current (b0);
+
+      if (DHCPV6_MSG_RELAY_REPL != h0->msg_type)
+        {
+          error0 =  DHCPV6_PROXY_ERROR_WRONG_MESSAGE_TYPE;
+
+        drop_packet:
+          vlib_node_increment_counter (vm, dhcpv6_proxy_to_client_node.index,
+                                       error0, 1);
+
+          f0 = vlib_get_frame_to_node (vm, dm->error_drop_node_index);
+          to_next0 = vlib_frame_vector_args (f0);
+          to_next0[0] = bi0;
+          f0->n_vectors = 1;
+          vlib_put_frame_to_node (vm, dm->error_drop_node_index, f0);
+          goto do_trace;
+        }
+      /* hop count seems not need to be checked */
+      if (HOP_COUNT_LIMIT < h0->hop_count)
+        {
+          error0 =  DHCPV6_RELAY_PKT_DROP_MAX_HOPS;
+          goto drop_packet;
+        }
+      u0 = (void *)h0 -(sizeof(*u0));
+      ip0 = (void *)u0 -(sizeof(*ip0));
+
+      vlib_buffer_advance (b0, sizeof(*h0));
+      o = vlib_buffer_get_current (b0);
+
+      /* Parse through TLVs looking for option 18 (DHCPV6_OPTION_INTERFACE_ID)
+         _and_ option 9 (DHCPV6_OPTION_RELAY_MSG) option which must be there.
+         Currently assuming no other options need to be processed
+         The interface-ID is the FIB number we need
+         to track down the client-facing interface */
+
+      while ((u8 *) o < (b0->data + b0->current_data + b0->current_length))
+        {
+           if (DHCPV6_OPTION_INTERFACE_ID == clib_net_to_host_u16(o->option))
+             {
+                interface_opt_flag = 1;
+                if (clib_net_to_host_u16(o->length) == sizeof(sw_if_index))
+                    sw_if_index = clib_net_to_host_u32(((dhcpv6_int_id_t*)o)->int_idx);
+                if (sw_if_index >= vec_len (im->fib_index_by_sw_if_index))
+                  {
+                    error0 = DHCPV6_PROXY_ERROR_WRONG_INTERFACE_ID_OPTION;
+                    goto drop_packet;
+                  }
+             }
+           if (DHCPV6_OPTION_RELAY_MSG == clib_net_to_host_u16(o->option))
+             {
+                relay_msg_opt_flag = 1;
+                r0 = vlib_buffer_get_current (b0);
+             }
+           if ((relay_msg_opt_flag == 1) && (interface_opt_flag == 1))
+             break;
+           vlib_buffer_advance (b0, sizeof(*o) + clib_net_to_host_u16(o->length));
+           o = (dhcpv6_option_t *) (((uword) o) + clib_net_to_host_u16(o->length) + sizeof(*o));
+        }
+
+      if ((relay_msg_opt_flag == 0) || (r0 == 0))
+        {
+    	  error0 = DHCPV6_PROXY_ERROR_NO_RELAY_MESSAGE_OPTION;
+    	  goto drop_packet;
+        }
+
+      if ((u32)~0 == sw_if_index)
+        {
+          error0 = DHCPV6_PROXY_ERROR_NO_CIRCUIT_ID_OPTION;
+          goto drop_packet;
+        }
+
+      //Advance buffer to start of encapsulated DHCPv6 message
+      vlib_buffer_advance (b0, sizeof(*r0));
+
+      client_fib_idx = im->fib_index_by_sw_if_index[sw_if_index];
+      if (client_fib_idx < vec_len(dm->dhcp6_server_index_by_rx_fib_index))
+    	  server_idx = dm->dhcp6_server_index_by_rx_fib_index[client_fib_idx];
+      else
+    	  server_idx = 0;
+
+      if (PREDICT_FALSE (pool_is_free_index (dm->dhcp6_servers, server_idx)))
+        {
+          error0 = DHCPV6_PROXY_ERROR_WRONG_INTERFACE_ID_OPTION;
+          goto drop_packet;
+        }
+
+      server = pool_elt_at_index (dm->dhcp6_servers, server_idx);
+      if (server->valid == 0)
+      {
+    	  error0 = DHCPV6_PROXY_ERROR_NO_SERVER;
+          goto drop_packet;
+      }
+
+
+      server_fib_idx = im->fib_index_by_sw_if_index
+          [vnet_buffer(b0)->sw_if_index[VLIB_RX]];
+      svr_fib = ip6_fib_get (server_fib_idx);
+      svr_fib_id = svr_fib->table_id;
+
+      if (svr_fib_id != server->server_fib6_index ||
+          ip0->src_address.as_u64[0] != server->dhcp6_server.as_u64[0] ||
+          ip0->src_address.as_u64[1] != server->dhcp6_server.as_u64[1])
+        {
+          //drop packet if not from server with configured address or FIB
+          error0 = DHCPV6_PROXY_ERROR_BAD_SVR_FIB_OR_ADDRESS;
+          goto drop_packet;
+        }
+
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = original_sw_if_index
+          = sw_if_index;
+
+      swif = vnet_get_sw_interface (vnm, original_sw_if_index);
+      if (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
+          sw_if_index = swif->unnumbered_sw_if_index;
+
+
+      /*
+       * udp_local hands us the DHCPV6 header, need udp hdr,
+       * ip hdr to relay to client
+       */
+      vlib_buffer_advance (b0, -(sizeof(*u1)));
+      u1 = vlib_buffer_get_current (b0);
+
+      vlib_buffer_advance (b0, -(sizeof(*ip1)));
+      ip1 = vlib_buffer_get_current (b0);
+
+      copy_ip6_address(&client_address, &h0->peer_addr);
+
+      ia0 = ip6_interface_first_address (&ip6_main, sw_if_index);
+      if (ia0 == 0)
+        {
+          error0 = DHCPV6_PROXY_ERROR_NO_INTERFACE_ADDRESS;
+          goto drop_packet;
+        }
+
+      len =  clib_net_to_host_u16(r0->length);
+      memset(ip1, 0, sizeof(*ip1));
+      copy_ip6_address(&ip1->dst_address, &client_address);
+      u1->checksum = 0;
+      u1->src_port = clib_net_to_host_u16 (UDP_DST_PORT_dhcpv6_to_server);
+      u1->dst_port = clib_net_to_host_u16 (UDP_DST_PORT_dhcpv6_to_client);
+      u1->length = clib_host_to_net_u16 (len + sizeof(udp_header_t));
+
+      ip1->ip_version_traffic_class_and_flow_label =
+          ip0->ip_version_traffic_class_and_flow_label &
+          0x00000fff;
+      ip1->payload_length =  u1->length;
+      ip1->protocol = PROTO_UDP;
+      ip1->hop_limit = HOP_COUNT_LIMIT;
+      copy_ip6_address(&ip1->src_address, ia0);
+
+      u1->checksum = ip6_tcp_udp_icmp_compute_checksum(vm, b0, ip1,
+                                                       &bogus_length);
+      ASSERT(bogus_length == 0);
+
+      vlib_buffer_advance (b0, -(sizeof(ethernet_header_t)));
+      si0 = vnet_get_sw_interface (vnm, original_sw_if_index);
+      if (si0->type == VNET_SW_INTERFACE_TYPE_SUB)
+	  vlib_buffer_advance (b0, -4 /* space for VLAN tag */);
+
+      mac0 = vlib_buffer_get_current (b0);
+
+      hi0 = vnet_get_sup_hw_interface (vnm, original_sw_if_index);
+      ei0 = pool_elt_at_index (em->interfaces, hi0->hw_instance);
+      clib_memcpy (mac0->src_address, ei0->address, sizeof (ei0->address));
+      memset (&mac0->dst_address, 0xff, sizeof (mac0->dst_address));
+      mac0->type = (si0->type == VNET_SW_INTERFACE_TYPE_SUB) ?
+	clib_net_to_host_u16(0x8100) : clib_net_to_host_u16 (0x86dd);
+
+      if (si0->type == VNET_SW_INTERFACE_TYPE_SUB)
+	{
+	  u32 * vlan_tag = (u32 *)(mac0+1);
+	  u32 tmp;
+	  tmp = (si0->sub.id << 16) | 0x0800;
+	  *vlan_tag = clib_host_to_net_u32 (tmp);
+	}
+
+      /* $$$ consider adding a dynamic next to the graph node, for performance */
+      f0 = vlib_get_frame_to_node (vm, hi0->output_node_index);
+      to_next0 = vlib_frame_vector_args (f0);
+      to_next0[0] = bi0;
+      f0->n_vectors = 1;
+      vlib_put_frame_to_node (vm, hi0->output_node_index, f0);
+
+    do_trace:
+      if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+        {
+          dhcpv6_proxy_trace_t *tr = vlib_add_trace (vm, node,
+                                                     b0, sizeof (*tr));
+          tr->which = 1; /* to client */
+          if (ia0)
+              copy_ip6_address((ip6_address_t*)tr->packet_data, ia0);
+          tr->error = error0;
+          tr->original_sw_if_index = original_sw_if_index;
+          tr->sw_if_index = sw_if_index;
+        }
+    }
+  return from_frame->n_vectors;
+
+}
+
+VLIB_REGISTER_NODE (dhcpv6_proxy_to_client_node) = {
+  .function = dhcpv6_proxy_to_client_input,
+  .name = "dhcpv6-proxy-to-client",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .n_errors = DHCPV6_PROXY_N_ERROR,
+  .error_strings = dhcpv6_proxy_error_strings,
+  .format_buffer = format_dhcpv6_proxy_header_with_length,
+  .format_trace = format_dhcpv6_proxy_trace,
+#if 0
+  .unformat_buffer = unformat_dhcpv6_proxy_header,
+#endif
+};
+
+clib_error_t * dhcpv6_proxy_init (vlib_main_t * vm)
+{
+  dhcpv6_proxy_main_t * dm = &dhcpv6_proxy_main;
+  vlib_node_t * error_drop_node;
+  dhcpv6_server_t * server;
+
+  dm->vlib_main = vm;
+  dm->vnet_main = vnet_get_main();
+  error_drop_node = vlib_get_node_by_name (vm, (u8 *) "error-drop");
+  dm->error_drop_node_index = error_drop_node->index;
+
+  dm->vss_index_by_vrf_id = hash_create (0, sizeof (uword));
+
+  /* RFC says this is the dhcpv6 server address  */
+  dm->all_dhcpv6_server_address.as_u64[0] = clib_host_to_net_u64 (0xFF05000000000000);
+  dm->all_dhcpv6_server_address.as_u64[1] = clib_host_to_net_u64 (0x00010003);
+
+  /* RFC says this is the server and agent address */
+  dm->all_dhcpv6_server_relay_agent_address.as_u64[0] = clib_host_to_net_u64 (0xFF02000000000000);
+  dm->all_dhcpv6_server_relay_agent_address.as_u64[1] = clib_host_to_net_u64 (0x00010002);
+
+  udp_register_dst_port (vm, UDP_DST_PORT_dhcpv6_to_client,
+                         dhcpv6_proxy_to_client_node.index, 0 /* is_ip6 */);
+
+  udp_register_dst_port (vm, UDP_DST_PORT_dhcpv6_to_server,
+                         dhcpv6_proxy_to_server_node.index, 0 /* is_ip6 */);
+
+  /* Create the default server, don't mark it valid */
+  pool_get (dm->dhcp6_servers, server);
+  memset (server, 0, sizeof (*server));
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (dhcpv6_proxy_init);
+
+/* Old API, manipulates a single server (only) shared by all Rx VRFs */
+int dhcpv6_proxy_set_server (ip6_address_t *addr, ip6_address_t *src_address,
+                             u32 fib_id, int insert_vss, int is_del)
+{
+	return dhcpv6_proxy_set_server_2 (addr, src_address,
+			0, fib_id,
+			insert_vss, is_del);
+}
+
+int dhcpv6_proxy_set_server_2 (ip6_address_t *addr, ip6_address_t *src_address,
+                             u32 rx_fib_id, u32 server_fib_id,
+							 int insert_vss, int is_del)
+{
+  dhcpv6_proxy_main_t * dm = &dhcpv6_proxy_main;
+  dhcpv6_server_t * server = 0;
+  u32 server_fib_index = 0;
+  u32 rx_fib_index = 0;
+
+  rx_fib_index = ip6_fib_table_find_or_create_and_lock(rx_fib_id);
+  server_fib_index = ip6_fib_table_find_or_create_and_lock(server_fib_id);
+
+  if (is_del)
+      {
+
+	  if (rx_fib_index >= vec_len(dm->dhcp6_server_index_by_rx_fib_index))
+		  return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+	  server_fib_index = dm->dhcp6_server_index_by_rx_fib_index[rx_fib_index];
+
+	  dm->dhcp6_server_index_by_rx_fib_index[rx_fib_index] = 0;
+	  server = pool_elt_at_index (dm->dhcp6_servers, server_fib_index);
+	  memset (server, 0, sizeof (*server));
+	  pool_put (dm->dhcp6_servers, server);
+	  return 0;
+      }
+
+  if (addr->as_u64[0] == 0 &&
+        addr->as_u64[1] == 0 )
+      return VNET_API_ERROR_INVALID_DST_ADDRESS;
+
+    if (src_address->as_u64[0] == 0 &&
+        src_address->as_u64[1] == 0)
+      return VNET_API_ERROR_INVALID_SRC_ADDRESS;
+
+  if (rx_fib_id == 0)
+    {
+      server = pool_elt_at_index (dm->dhcp6_servers, 0);
+
+      goto initialize_it;
+    }
+
+  if (rx_fib_index < vec_len(dm->dhcp6_server_index_by_rx_fib_index))
+    {
+      server_fib_index = dm->dhcp6_server_index_by_rx_fib_index[rx_fib_index];
+      if (server_fib_index != 0)
+        {
+          server = pool_elt_at_index (dm->dhcp6_servers, server_fib_index);
+          goto initialize_it;
+        }
+    }
+
+  /*Allocate a new server*/
+  pool_get (dm->dhcp6_servers, server);
+
+  initialize_it:
+
+  copy_ip6_address(&server->dhcp6_server, addr);
+  copy_ip6_address(&server->dhcp6_src_address, src_address);
+  server->server_fib6_index = server_fib_index;
+  server->valid = 1;
+  server->insert_vss = insert_vss;
+
+  vec_validate (dm->dhcp6_server_index_by_rx_fib_index, rx_fib_index);
+  dm->dhcp6_server_index_by_rx_fib_index[rx_fib_index] =
+		  server - dm->dhcp6_servers;
+
+  return 0;
+}
+
+static clib_error_t *
+dhcpv6_proxy_set_command_fn (vlib_main_t * vm,
+                           unformat_input_t * input,
+                           vlib_cli_command_t * cmd)
+{
+  ip6_address_t addr, src_addr;
+  int set_server = 0, set_src_address = 0;
+  u32 rx_fib_id = 0, server_fib_id = 0;
+  int is_del = 0, add_vss = 0;
+
+  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "server %U",
+                    unformat_ip6_address, &addr))
+	 set_server = 1;
+      else if (unformat(input, "src-address %U",
+			unformat_ip6_address, &src_addr))
+	  set_src_address =1;
+       else if (unformat (input, "server-fib-id %d", &server_fib_id))
+        ;
+       else if (unformat (input, "rx-fib-id %d", &rx_fib_id))
+         ;
+       else if (unformat (input, "add-vss-option")
+               || unformat (input, "insert-option"))
+          add_vss = 1;
+       else if (unformat (input, "delete") ||
+                unformat (input, "del"))
+           is_del = 1;
+      else
+        break;
+    }
+
+  if (is_del || (set_server && set_src_address))
+  {
+      int rv;
+
+      rv = dhcpv6_proxy_set_server_2 (&addr, &src_addr, rx_fib_id,
+    		  server_fib_id, add_vss, is_del);
+
+      //TODO: Complete the errors
+      switch (rv)
+        {
+        case 0:
+          return 0;
+
+        case -1:
+          return clib_error_return (0, "FIB id %d does not exist", server_fib_id);
+
+        default:
+          return clib_error_return (0, "BUG: rv %d", rv);
+        }
+  }
+  else
+    return clib_error_return (0, "parse error`%U'",
+                              format_unformat_error, input);
+}
+
+VLIB_CLI_COMMAND (dhcpv6_proxy_set_command, static) = {
+  .path = "set dhcpv6 proxy",
+  .short_help = "set dhcpv6 proxy [del] server <ipv6-addr> src-address <ipv6-addr> "
+		  "[add-vss-option] [server-fib-id <fib-id>] [rx-fib-id <fib-id>] ",
+  .function = dhcpv6_proxy_set_command_fn,
+};
+
+u8 * format_dhcpv6_proxy_server (u8 * s, va_list * args)
+{
+  dhcpv6_proxy_main_t * dm = va_arg (*args, dhcpv6_proxy_main_t *);
+  dhcpv6_server_t * server = va_arg (*args, dhcpv6_server_t *);
+  u32 rx_fib_index = va_arg (*args, u32);
+  ip6_fib_t * rx_fib, * server_fib;
+  u32 server_fib_id = (u32)~0, rx_fib_id = ~0;
+
+  if (dm == 0)
+    {
+      s = format (s, "%=40s%=40s%=14s%=14s%=20s", "Server Address", "Source Address",
+                  "Server FIB", "RX FIB", "Insert VSS Option");
+      return s;
+    }
+
+  server_fib = ip6_fib_get(server->server_fib6_index);
+  if (server_fib)
+	  server_fib_id= server_fib->table_id;
+
+  rx_fib= ip6_fib_get(rx_fib_index);
+
+  if (rx_fib)
+	  rx_fib_id = rx_fib->table_id;
+
+  s = format (s, "%=40U%=40U%=14u%=14u%=20s",
+              format_ip6_address, &server->dhcp6_server,
+              format_ip6_address, &server->dhcp6_src_address,
+			  server_fib_id, rx_fib_id,
+			                server->insert_vss ? "yes" : "no");
+  return s;
+}
+
+static clib_error_t *
+dhcpv6_proxy_show_command_fn (vlib_main_t * vm,
+                            unformat_input_t * input,
+                            vlib_cli_command_t * cmd)
+{
+  dhcpv6_proxy_main_t * dm = &dhcpv6_proxy_main;
+  ip6_main_t * im = &ip6_main;
+  int i;
+  u32 server_index;
+  dhcpv6_server_t * server;
+
+  vlib_cli_output (vm, "%U", format_dhcpv6_proxy_server, 0 /* header line */,
+		  0, 0);
+  for (i = 0; i < vec_len (im->fibs); i++)
+      {
+        if (i < vec_len(dm->dhcp6_server_index_by_rx_fib_index))
+          server_index = dm->dhcp6_server_index_by_rx_fib_index[i];
+        else
+          server_index = 0;
+        server = pool_elt_at_index (dm->dhcp6_servers, server_index);
+        if (server->valid)
+          vlib_cli_output (vm, "%U", format_dhcpv6_proxy_server, dm,
+		  server, i);
+      }
+  return 0;
+}
+
+VLIB_CLI_COMMAND (dhcpv6_proxy_show_command, static) = {
+  .path = "show dhcpv6 proxy",
+  .short_help = "Display dhcpv6 proxy info",
+  .function = dhcpv6_proxy_show_command_fn,
+};
+
+int dhcpv6_proxy_set_vss(u32 tbl_id,
+                         u32 oui,
+                         u32 fib_id,
+                         int is_del)
+{
+  dhcpv6_proxy_main_t *dm = &dhcpv6_proxy_main;
+  u32 old_oui, old_fib_id;
+  uword *p;
+  dhcpv6_vss_info *v;
+
+  p = hash_get (dm->vss_index_by_vrf_id, tbl_id);
+
+  if (p) {
+      v = pool_elt_at_index (dm->vss, p[0]);
+      if (!v)
+        return VNET_API_ERROR_NO_SUCH_FIB;
+
+      old_oui = v->vpn_id.oui;
+      old_fib_id = v->vpn_id.fib_id;
+
+      if (is_del)
+      {
+          if (old_oui == oui &&
+              old_fib_id == fib_id )
+          {
+              pool_put(dm->vss, v);
+              hash_unset (dm->vss_index_by_vrf_id, tbl_id);
+              return 0;
+          }
+          else
+            return VNET_API_ERROR_NO_SUCH_ENTRY;
+      }
+
+      pool_put(dm->vss, v);
+      hash_unset (dm->vss_index_by_vrf_id, tbl_id);
+  } else if (is_del)
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+  pool_get (dm->vss, v);
+  memset (v, ~0, sizeof (*v));
+  v->vpn_id.fib_id = fib_id;
+  v->vpn_id.oui = oui;
+  hash_set (dm->vss_index_by_vrf_id, tbl_id, v - dm->vss);
+
+  return 0;
+}
+
+
+static clib_error_t *
+dhcpv6_vss_command_fn (vlib_main_t * vm,
+                           unformat_input_t * input,
+                           vlib_cli_command_t * cmd)
+{
+  int is_del = 0, got_new_vss=0;
+  u32 oui=0;
+  u32 fib_id=0, tbl_id=~0;
+
+  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "oui %d", &oui))
+          got_new_vss = 1;
+      else if (unformat (input, "vpn-id %d", &fib_id))
+          got_new_vss = 1;
+      else if (unformat (input, "table %d", &tbl_id))
+          got_new_vss = 1;
+      else if (unformat(input, "delete") || unformat(input, "del"))
+          is_del = 1;
+      else
+          break;
+    }
+
+  if (tbl_id ==~0)
+      return clib_error_return (0, "no table ID specified.");
+
+  if (is_del || got_new_vss)
+    {
+      int rv;
+
+      rv = dhcpv6_proxy_set_vss(tbl_id, oui, fib_id, is_del);
+      switch (rv)
+        {
+        case 0:
+          return 0;
+
+        case VNET_API_ERROR_NO_SUCH_FIB:
+            return clib_error_return (0, "vss info (oui:%d, vpn-id:%d)  not found in table %d.",
+                                      oui, fib_id, tbl_id);
+
+        case VNET_API_ERROR_NO_SUCH_ENTRY:
+            return clib_error_return (0, "vss for table %d not found in pool.",
+                                      tbl_id);
+
+        default:
+          return clib_error_return (0, "BUG: rv %d", rv);
+        }
+    }
+  else
+      return clib_error_return (0, "parse error`%U'",
+                                format_unformat_error, input);
+
+}
+
+VLIB_CLI_COMMAND (dhcpv6_proxy_vss_command, static) = {
+  .path = "set dhcpv6 vss",
+  .short_help = "set dhcpv6 vss table <table-id> oui <oui> vpn-idx <vpn-idx>",
+  .function = dhcpv6_vss_command_fn,
+};
+
+static clib_error_t *
+dhcpv6_vss_show_command_fn (vlib_main_t * vm,
+                            unformat_input_t * input,
+                            vlib_cli_command_t * cmd)
+
+{
+  dhcpv6_proxy_main_t * dm = &dhcpv6_proxy_main;
+  dhcpv6_vss_info *v;
+  u32 oui;
+  u32 fib_id;
+  u32 tbl_id;
+  uword index;
+
+  vlib_cli_output (vm, "%=6s%=6s%=12s","Table", "OUI", "VPN ID");
+  hash_foreach (tbl_id, index, dm->vss_index_by_vrf_id,
+  ({
+     v = pool_elt_at_index (dm->vss, index);
+     oui = v->vpn_id.oui;
+     fib_id = v->vpn_id.fib_id;
+     vlib_cli_output (vm, "%=6d%=6d%=12d",
+                      tbl_id, oui, fib_id);
+  }));
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (dhcpv6_proxy_vss_show_command, static) = {
+  .path = "show dhcpv6 vss",
+  .short_help = "show dhcpv6 VSS",
+  .function = dhcpv6_vss_show_command_fn,
+};
+
+static clib_error_t *
+dhcpv6_link_address_show_command_fn (vlib_main_t * vm,
+                                unformat_input_t * input,
+                                vlib_cli_command_t * cmd)
+
+{
+  dhcpv6_proxy_main_t *dm = &dhcpv6_proxy_main;
+  vnet_main_t *vnm = vnet_get_main();
+  u32 sw_if_index0=0, sw_if_index;
+  ip6_address_t *ia0;
+  vnet_sw_interface_t *swif;
+
+  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
+    {
+
+      if (unformat(input, "%U",
+                   unformat_vnet_sw_interface, dm->vnet_main, &sw_if_index0))
+        {
+            swif = vnet_get_sw_interface (vnm, sw_if_index0);
+            sw_if_index = (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED) ?
+                swif->unnumbered_sw_if_index : sw_if_index0;
+            ia0 = ip6_interface_first_address(&ip6_main, sw_if_index);
+            if (ia0)
+              {
+                  vlib_cli_output (vm, "%=20s%=48s", "interface", "link-address");
+
+                  vlib_cli_output (vm, "%=20U%=48U",
+                                   format_vnet_sw_if_index_name, dm->vnet_main, sw_if_index0,
+                                   format_ip6_address, ia0);
+              } else
+                vlib_cli_output (vm, "%=34s%=20U", "No IPv6 address configured on",
+                                 format_vnet_sw_if_index_name, dm->vnet_main, sw_if_index);
+        } else
+          break;
+    }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (dhcpv6_proxy_address_show_command, static) = {
+  .path = "show dhcpv6 link-address interface",
+  .short_help = "show dhcpv6 link-address interface <interface>",
+  .function = dhcpv6_link_address_show_command_fn,
+};
diff --git a/src/vnet/dpo/classify_dpo.c b/src/vnet/dpo/classify_dpo.c
new file mode 100644
index 00000000..9e7886c9
--- /dev/null
+++ b/src/vnet/dpo/classify_dpo.c
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/ip/ip.h>
+#include <vnet/dpo/classify_dpo.h>
+#include <vnet/mpls/mpls.h>
+
+/*
+ * pool of all MPLS Label DPOs
+ */
+classify_dpo_t *classify_dpo_pool;
+
+static classify_dpo_t *
+classify_dpo_alloc (void)
+{
+    classify_dpo_t *cd;
+
+    pool_get_aligned(classify_dpo_pool, cd, CLIB_CACHE_LINE_BYTES);
+    memset(cd, 0, sizeof(*cd));
+
+    return (cd);
+}
+
+static index_t
+classify_dpo_get_index (classify_dpo_t *cd)
+{
+    return (cd - classify_dpo_pool);
+}
+
+index_t
+classify_dpo_create (dpo_proto_t proto,
+                     u32 classify_table_index)
+{
+    classify_dpo_t *cd;
+
+    cd = classify_dpo_alloc();
+    cd->cd_proto = proto;
+    cd->cd_table_index = classify_table_index;
+
+    return (classify_dpo_get_index(cd));
+}
+
+u8*
+format_classify_dpo (u8 *s, va_list *args)
+{
+    index_t index = va_arg (*args, index_t);
+    CLIB_UNUSED(u32 indent) = va_arg (*args, u32);
+    classify_dpo_t *cd;
+
+    cd = classify_dpo_get(index);
+
+    return (format(s, "%U-classify:[%d]:table:%d",
+		   format_dpo_proto, cd->cd_proto,
+		   index, cd->cd_table_index));
+}
+
+static void
+classify_dpo_lock (dpo_id_t *dpo)
+{
+    classify_dpo_t *cd;
+
+    cd = classify_dpo_get(dpo->dpoi_index);
+
+    cd->cd_locks++;
+}
+
+static void
+classify_dpo_unlock (dpo_id_t *dpo)
+{
+    classify_dpo_t *cd;
+
+    cd = classify_dpo_get(dpo->dpoi_index);
+
+    cd->cd_locks--;
+
+    if (0 == cd->cd_locks)
+    {
+	pool_put(classify_dpo_pool, cd);
+    }
+}
+
+static void
+classify_dpo_mem_show (void)
+{
+    fib_show_memory_usage("Classify",
+			  pool_elts(classify_dpo_pool),
+			  pool_len(classify_dpo_pool),
+			  sizeof(classify_dpo_t));
+}
+
+const static dpo_vft_t cd_vft = {
+    .dv_lock = classify_dpo_lock,
+    .dv_unlock = classify_dpo_unlock,
+    .dv_format = format_classify_dpo,
+    .dv_mem_show = classify_dpo_mem_show,
+};
+
+const static char* const classify_ip4_nodes[] =
+{
+    "ip4-classify",
+    NULL,
+};
+const static char* const classify_ip6_nodes[] =
+{
+    "ip6-classify",
+    NULL,
+};
+const static char* const * const classify_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = classify_ip4_nodes,
+    [DPO_PROTO_IP6]  = classify_ip6_nodes,
+    [DPO_PROTO_MPLS] = NULL,
+};
+
+void
+classify_dpo_module_init (void)
+{
+    dpo_register(DPO_CLASSIFY, &cd_vft, classify_nodes);
+}
diff --git a/src/vnet/dpo/classify_dpo.h b/src/vnet/dpo/classify_dpo.h
new file mode 100644
index 00000000..48f4b2bf
--- /dev/null
+++ b/src/vnet/dpo/classify_dpo.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __CLASSIFY_DPO_H__
+#define __CLASSIFY_DPO_H__
+
+#include <vnet/vnet.h>
+#include <vnet/mpls/packet.h>
+#include <vnet/dpo/dpo.h>
+
+/**
+ * A representation of an MPLS label for imposition in the data-path
+ */
+typedef struct classify_dpo_t
+{
+    dpo_proto_t cd_proto;
+
+    u32 cd_table_index;
+
+    /**
+     * Number of locks/users of the label
+     */
+    u16 cd_locks;
+} classify_dpo_t;
+
+extern index_t classify_dpo_create(dpo_proto_t proto,
+                                   u32 classify_table_index);
+
+extern u8* format_classify_dpo(u8 *s, va_list *args);
+
+/*
+ * Encapsulation violation for fast data-path access
+ */
+extern classify_dpo_t *classify_dpo_pool;
+
+static inline classify_dpo_t *
+classify_dpo_get (index_t index)
+{
+    return (pool_elt_at_index(classify_dpo_pool, index));
+}
+
+extern void classify_dpo_module_init(void);
+
+#endif
diff --git a/src/vnet/dpo/dpo.c b/src/vnet/dpo/dpo.c
new file mode 100644
index 00000000..688d2892
--- /dev/null
+++ b/src/vnet/dpo/dpo.c
@@ -0,0 +1,500 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief
+ * A Data-Path Object is an object that represents actions that are
+ * applied to packets are they are switched through VPP.
+ * 
+ * The DPO is a base class that is specialised by other objects to provide
+ * concreate actions
+ *
+ * The VLIB graph nodes are graph of types, the DPO graph is a graph of instances.
+ */
+
+#include <vnet/dpo/dpo.h>
+#include <vnet/ip/lookup.h>
+#include <vnet/ip/format.h>
+#include <vnet/adj/adj.h>
+
+#include <vnet/dpo/load_balance.h>
+#include <vnet/dpo/mpls_label_dpo.h>
+#include <vnet/dpo/lookup_dpo.h>
+#include <vnet/dpo/drop_dpo.h>
+#include <vnet/dpo/receive_dpo.h>
+#include <vnet/dpo/punt_dpo.h>
+#include <vnet/dpo/classify_dpo.h>
+#include <vnet/dpo/ip_null_dpo.h>
+
+/**
+ * Array of char* names for the DPO types and protos
+ */
+static const char* dpo_type_names[] = DPO_TYPES;
+static const char* dpo_proto_names[] = DPO_PROTOS;
+
+/**
+ * @brief Vector of virtual function tables for the DPO types
+ *
+ * This is a vector so we can dynamically register new DPO types in plugins.
+ */
+static dpo_vft_t *dpo_vfts;
+
+/**
+ * @brief vector of graph node names associated with each DPO type and protocol.
+ *
+ *   dpo_nodes[child_type][child_proto][node_X] = node_name;
+ * i.e.
+ *   dpo_node[DPO_LOAD_BALANCE][DPO_PROTO_IP4][0] = "ip4-lookup"
+ *   dpo_node[DPO_LOAD_BALANCE][DPO_PROTO_IP4][1] = "ip4-load-balance"
+ *
+ * This is a vector so we can dynamically register new DPO types in plugins.
+ */
+static const char* const * const ** dpo_nodes;
+
+/**
+ * @brief Vector of edge indicies from parent DPO nodes to child
+ *
+ * dpo_edges[child_type][child_proto][parent_type][parent_proto] = edge_index
+ *
+ * This array is derived at init time from the dpo_nodes above. Note that
+ * the third dimension in dpo_nodes is lost, hence, the edge index from each
+ * node MUST be the same.
+ * Including both the child and parent protocol is required to support the
+ * case where it changes as the grapth is traversed, most notablly when an
+ * MPLS label is popped.
+ *
+ * Note that this array is child type specific, not child instance specific.
+ */
+static u32 ****dpo_edges;
+
+/**
+ * @brief The DPO type value that can be assigend to the next dynamic
+ *        type registration.
+ */
+static dpo_type_t dpo_dynamic = DPO_LAST;
+
+dpo_proto_t
+vnet_link_to_dpo_proto (vnet_link_t linkt)
+{
+    switch (linkt)
+    {
+    case VNET_LINK_IP6:
+        return (DPO_PROTO_IP6);
+    case VNET_LINK_IP4:
+        return (DPO_PROTO_IP4);
+    case VNET_LINK_MPLS:
+        return (DPO_PROTO_MPLS);
+    case VNET_LINK_ETHERNET:
+        return (DPO_PROTO_ETHERNET);
+    case VNET_LINK_ARP:
+	break;
+    }
+    ASSERT(0);
+    return (0);
+}
+
+u8 *
+format_dpo_type (u8 * s, va_list * args)
+{
+    dpo_type_t type = va_arg (*args, int);
+
+    s = format(s, "%s", dpo_type_names[type]);
+
+    return (s);
+}
+
+u8 *
+format_dpo_id (u8 * s, va_list * args)
+{
+    dpo_id_t *dpo = va_arg (*args, dpo_id_t*);
+    u32 indent = va_arg (*args, u32);
+
+    s = format(s, "[@%d]: ", dpo->dpoi_next_node);
+
+    if (NULL != dpo_vfts[dpo->dpoi_type].dv_format)
+    {
+        return (format(s, "%U",
+                       dpo_vfts[dpo->dpoi_type].dv_format,
+                       dpo->dpoi_index,
+                       indent));
+    }
+
+    switch (dpo->dpoi_type)
+    {
+    case DPO_FIRST:
+	s = format(s, "unset");
+	break;
+    default:
+	s = format(s, "unknown");
+	break;
+    }
+    return (s);
+}
+
+u8 *
+format_dpo_proto (u8 * s, va_list * args)
+{
+    dpo_proto_t proto = va_arg (*args, int);
+
+    return (format(s, "%s", dpo_proto_names[proto]));
+}
+
+void
+dpo_set (dpo_id_t *dpo,
+	 dpo_type_t type,
+	 dpo_proto_t proto,
+	 index_t index)
+{
+    dpo_id_t tmp = *dpo;
+
+    dpo->dpoi_type = type;
+    dpo->dpoi_proto = proto,
+    dpo->dpoi_index = index;
+
+    if (DPO_ADJACENCY == type)
+    {
+	/*
+	 * set the adj subtype
+	 */
+	ip_adjacency_t *adj;
+
+	adj = adj_get(index);
+
+	switch (adj->lookup_next_index)
+	{
+	case IP_LOOKUP_NEXT_ARP:
+	    dpo->dpoi_type = DPO_ADJACENCY_INCOMPLETE;
+	    break;
+	case IP_LOOKUP_NEXT_MIDCHAIN:
+	    dpo->dpoi_type = DPO_ADJACENCY_MIDCHAIN;
+	    break;
+	default:
+	    break;
+	}
+    }
+    dpo_lock(dpo);
+    dpo_unlock(&tmp);
+}
+
+void
+dpo_reset (dpo_id_t *dpo)
+{
+    dpo_id_t tmp = DPO_INVALID;
+
+    /*
+     * use the atomic copy operation.
+     */
+    dpo_copy(dpo, &tmp);
+}
+
+/**
+ * \brief
+ * Compare two Data-path objects
+ *
+ * like memcmp, return 0 is matching, !0 otherwise.
+ */
+int
+dpo_cmp (const dpo_id_t *dpo1,
+	 const dpo_id_t *dpo2)
+{
+    int res;
+
+    res = dpo1->dpoi_type - dpo2->dpoi_type;
+
+    if (0 != res) return (res);
+
+    return (dpo1->dpoi_index - dpo2->dpoi_index);
+}
+
+void
+dpo_copy (dpo_id_t *dst,
+	  const dpo_id_t *src)
+{
+    dpo_id_t tmp = *dst;
+
+    /*
+     * the destination is written in a single u64 write - hence atomically w.r.t
+     * any packets inflight.
+     */
+    *((u64*)dst) = *(u64*)src; 
+
+    dpo_lock(dst);
+    dpo_unlock(&tmp);    
+}
+
+int
+dpo_is_adj (const dpo_id_t *dpo)
+{
+    return ((dpo->dpoi_type == DPO_ADJACENCY) ||
+	    (dpo->dpoi_type == DPO_ADJACENCY_INCOMPLETE) ||
+	    (dpo->dpoi_type == DPO_ADJACENCY_MIDCHAIN) ||
+	    (dpo->dpoi_type == DPO_ADJACENCY_GLEAN));
+}
+
+void
+dpo_register (dpo_type_t type,
+	      const dpo_vft_t *vft,
+              const char * const * const * nodes)
+{
+    vec_validate(dpo_vfts, type);
+    dpo_vfts[type] = *vft;
+
+    vec_validate(dpo_nodes, type);
+    dpo_nodes[type] = nodes;
+}
+
+dpo_type_t
+dpo_register_new_type (const dpo_vft_t *vft,
+                       const char * const * const * nodes)
+{
+    dpo_type_t type = dpo_dynamic++;
+
+    dpo_register(type, vft, nodes);
+
+    return (type);
+}
+
+void
+dpo_lock (dpo_id_t *dpo)
+{
+    if (!dpo_id_is_valid(dpo))
+	return;
+
+    dpo_vfts[dpo->dpoi_type].dv_lock(dpo);
+}
+
+void
+dpo_unlock (dpo_id_t *dpo)
+{
+    if (!dpo_id_is_valid(dpo))
+	return;
+
+    dpo_vfts[dpo->dpoi_type].dv_unlock(dpo);
+}
+
+
+static u32
+dpo_get_next_node (dpo_type_t child_type,
+                   dpo_proto_t child_proto,
+                   const dpo_id_t *parent_dpo)
+{
+    dpo_proto_t parent_proto;
+    dpo_type_t parent_type;
+
+    parent_type = parent_dpo->dpoi_type;
+    parent_proto = parent_dpo->dpoi_proto;
+
+    vec_validate(dpo_edges, child_type);
+    vec_validate(dpo_edges[child_type], child_proto);
+    vec_validate(dpo_edges[child_type][child_proto], parent_type);
+    vec_validate_init_empty(
+        dpo_edges[child_type][child_proto][parent_type],
+        parent_proto, ~0);
+
+    /*
+     * if the edge index has not yet been created for this node to node transistion
+     */
+    if (~0 == dpo_edges[child_type][child_proto][parent_type][parent_proto])
+    {
+        vlib_node_t *parent_node, *child_node;
+        vlib_main_t *vm;
+        u32 edge ,pp, cc;
+
+        vm = vlib_get_main();
+
+        ASSERT(NULL != dpo_nodes[child_type]);
+        ASSERT(NULL != dpo_nodes[child_type][child_proto]);
+        ASSERT(NULL != dpo_nodes[parent_type]);
+        ASSERT(NULL != dpo_nodes[parent_type][parent_proto]);
+
+        cc = 0;
+
+        /*
+         * create a graph arc from each of the parent's registered node types,
+         * to each of the childs.
+         */
+        while (NULL != dpo_nodes[child_type][child_proto][cc])
+        {
+            child_node =
+                vlib_get_node_by_name(vm,
+                                      (u8*) dpo_nodes[child_type][child_proto][cc]);
+
+            pp = 0;
+
+            while (NULL != dpo_nodes[parent_type][parent_proto][pp])
+            {
+                parent_node =
+                    vlib_get_node_by_name(vm,
+                                          (u8*) dpo_nodes[parent_type][parent_proto][pp]);
+
+                edge = vlib_node_add_next(vm,
+                                          child_node->index,
+                                          parent_node->index);
+
+                if (~0 == dpo_edges[child_type][child_proto][parent_type][parent_proto])
+                {
+                    dpo_edges[child_type][child_proto][parent_type][parent_proto] = edge;
+                }
+                else
+                {
+                    ASSERT(dpo_edges[child_type][child_proto][parent_type][parent_proto] == edge);
+                }
+                pp++;
+            }
+            cc++;
+        }
+    }
+
+    return (dpo_edges[child_type][child_proto][parent_type][parent_proto]);
+}
+
+/**
+ * @brief Stack one DPO object on another, and thus establish a child parent
+ * relationship. The VLIB graph arc used is taken from the parent and child types
+ * passed.
+ */
+static void
+dpo_stack_i (u32 edge,
+             dpo_id_t *dpo,
+             const dpo_id_t *parent)
+{
+    /*
+     * in order to get an atomic update of the parent we create a temporary,
+     * from a copy of the child, and add the next_node. then we copy to the parent
+     */
+    dpo_id_t tmp = DPO_INVALID;
+    dpo_copy(&tmp, parent);
+
+    /*
+     * get the edge index for the parent to child VLIB graph transisition
+     */
+    tmp.dpoi_next_node = edge;
+
+    /*
+     * this update is atomic.
+     */
+    dpo_copy(dpo, &tmp);
+
+    dpo_reset(&tmp);
+}
+
+/**
+ * @brief Stack one DPO object on another, and thus establish a child-parent
+ * relationship. The VLIB graph arc used is taken from the parent and child types
+ * passed.
+ */
+void
+dpo_stack (dpo_type_t child_type,
+           dpo_proto_t child_proto,
+           dpo_id_t *dpo,
+           const dpo_id_t *parent)
+{
+    dpo_stack_i(dpo_get_next_node(child_type, child_proto, parent), dpo, parent);
+}
+
+/**
+ * @brief Stack one DPO object on another, and thus establish a child parent
+ * relationship. A new VLIB graph arc is created from the child node passed
+ * to the nodes registered by the parent. The VLIB infra will ensure this arc
+ * is added only once.
+ */
+void
+dpo_stack_from_node (u32 child_node_index,
+                     dpo_id_t *dpo,
+                     const dpo_id_t *parent)
+{
+    dpo_proto_t parent_proto;
+    vlib_node_t *parent_node;
+    dpo_type_t parent_type;
+    vlib_main_t *vm;
+    u32 edge;
+
+    parent_type = parent->dpoi_type;
+    parent_proto = parent->dpoi_proto;
+
+    vm = vlib_get_main();
+
+    ASSERT(NULL != dpo_nodes[parent_type]);
+    ASSERT(NULL != dpo_nodes[parent_type][parent_proto]);
+
+    parent_node =
+        vlib_get_node_by_name(vm, (u8*) dpo_nodes[parent_type][parent_proto][0]);
+
+    edge = vlib_node_add_next(vm,
+                              child_node_index,
+                              parent_node->index);
+
+    dpo_stack_i(edge, dpo, parent);
+}
+
+static clib_error_t *
+dpo_module_init (vlib_main_t * vm)
+{
+    drop_dpo_module_init();
+    punt_dpo_module_init();
+    receive_dpo_module_init();
+    load_balance_module_init();
+    mpls_label_dpo_module_init();
+    classify_dpo_module_init();
+    lookup_dpo_module_init();
+    ip_null_dpo_module_init();
+
+    return (NULL);
+}
+
+VLIB_INIT_FUNCTION(dpo_module_init);
+
+static clib_error_t *
+dpo_memory_show (vlib_main_t * vm,
+		 unformat_input_t * input,
+		 vlib_cli_command_t * cmd)
+{
+    dpo_vft_t *vft;
+
+    vlib_cli_output (vm, "DPO memory");
+    vlib_cli_output (vm, "%=30s %=5s %=8s/%=9s   totals",
+		     "Name","Size", "in-use", "allocated");
+
+    vec_foreach(vft, dpo_vfts)
+    {
+	if (NULL != vft->dv_mem_show)
+	    vft->dv_mem_show();
+    }
+
+    return (NULL);
+}
+
+/* *INDENT-OFF* */
+/*?
+ * The '<em>sh dpo memory </em>' command displays the memory usage for each
+ * data-plane object type.
+ *
+ * @cliexpar
+ * @cliexstart{show dpo memory}
+ * DPO memory
+ *             Name               Size  in-use /allocated   totals
+ *         load-balance            64     12   /    12      768/768
+ *           Adjacency            256      1   /    1       256/256
+ *            Receive              24      5   /    5       120/120
+ *            Lookup               12      0   /    0       0/0
+ *           Classify              12      0   /    0       0/0
+ *          MPLS label             24      0   /    0       0/0
+ * @cliexend
+?*/
+VLIB_CLI_COMMAND (show_fib_memory, static) = {
+    .path = "show dpo memory",
+    .function = dpo_memory_show,
+    .short_help = "show dpo memory",
+};
+/* *INDENT-ON* */
diff --git a/src/vnet/dpo/dpo.h b/src/vnet/dpo/dpo.h
new file mode 100644
index 00000000..1efcbc88
--- /dev/null
+++ b/src/vnet/dpo/dpo.h
@@ -0,0 +1,381 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief
+ * A Data-Path Object is an object that represents actions that are
+ * applied to packets are they are switched through VPP's data-path.
+ * 
+ * The DPO can be considered to be like is a base class that is specialised
+ * by other objects to provide concreate actions
+ *
+ * The VLIB graph nodes are graph of DPO types, the DPO graph is a graph of
+ * instances.
+ */
+
+#ifndef __DPO_H__
+#define __DPO_H__
+
+#include <vnet/vnet.h>
+
+/**
+ * @brief An index for adjacencies.
+ * Alas 'C' is not typesafe enough to b0rk when a u32 is used instead of
+ * an index_t. However, for us humans, we can glean much more intent
+ * from the declaration
+ *  foo barindex_t t);
+ * than we can from
+ *  foo bar(u32 t);
+ */
+typedef u32 index_t;
+
+/**
+ * @brief Invalid index - used when no index is known
+ * blazoned capitals INVALID speak volumes where ~0 does not.
+ */
+#define INDEX_INVALID ((index_t)(~0))
+
+/**
+ * @brief Data path protocol.
+ * Actions performed on packets in the data-plane can be described and represented
+ * by protocol independent objects, i.e. ADJACENCY, but the spceifics actions
+ * required during ADJACENCY processing can be protocol dependent. For example,
+ * the adjacency rewrite node performs a ip4 checksum calculation,  ip6 and MPLS
+ * do not, all 3 perform a TTL decrement. The VLIB graph nodes are thus protocol
+ * dependent, and thus each graph edge/arc is too.
+ * When programming a DPO's next node arc from child to parent it is thus required
+ * to know the parent's data-path protocol so the correct arc index can be used.
+ */
+typedef enum dpo_proto_t_
+{
+#if CLIB_DEBUG > 0
+    DPO_PROTO_IP4 = 1,
+#else
+    DPO_PROTO_IP4 = 0,
+#endif
+    DPO_PROTO_IP6,
+    DPO_PROTO_ETHERNET,
+    DPO_PROTO_MPLS,
+} __attribute__((packed)) dpo_proto_t;
+
+#define DPO_PROTO_NUM ((dpo_proto_t)(DPO_PROTO_MPLS+1))
+#define DPO_PROTO_NONE ((dpo_proto_t)(DPO_PROTO_NUM+1))
+
+#define DPO_PROTOS {		\
+    [DPO_PROTO_IP4]  = "ip4",	\
+    [DPO_PROTO_IP6]  = "ip6",	\
+    [DPO_PROTO_ETHERNET]  = "ethernet", \
+    [DPO_PROTO_MPLS] = "mpls",	\
+}
+
+#define FOR_EACH_DPO_PROTO(_proto)    \
+    for (_proto = DPO_PROTO_IP4;      \
+	 _proto <= DPO_PROTO_MPLS;    \
+	 _proto++)
+
+/**
+ * @brief Common types of data-path objects
+ * New types can be dynamically added using dpo_register_new_type()
+ */
+typedef enum dpo_type_t_ {
+    /**
+     * A non-zero value first so we can spot unitialisation errors
+     */
+    DPO_FIRST,
+    DPO_DROP,
+    DPO_IP_NULL,
+    DPO_PUNT,
+    /**
+     * @brief load-balancing over a choice of [un]equal cost paths
+     */
+    DPO_LOAD_BALANCE,
+    DPO_ADJACENCY,
+    DPO_ADJACENCY_INCOMPLETE,
+    DPO_ADJACENCY_MIDCHAIN,
+    DPO_ADJACENCY_GLEAN,
+    DPO_RECEIVE,
+    DPO_LOOKUP,
+    DPO_LISP_CP,
+    DPO_CLASSIFY,
+    DPO_MPLS_LABEL,
+    DPO_LAST,
+} __attribute__((packed)) dpo_type_t;
+
+#define DPO_TYPE_NUM DPO_LAST
+
+#define DPO_TYPES {			\
+    [DPO_FIRST] = "dpo-invalid",	\
+    [DPO_DROP] = "dpo-drop",	\
+    [DPO_IP_NULL] = "dpo-ip-null",		\
+    [DPO_PUNT] = "dpo-punt",	\
+    [DPO_ADJACENCY] = "dpo-adjacency",	\
+    [DPO_ADJACENCY_INCOMPLETE] = "dpo-adjacency-incomplete",	\
+    [DPO_ADJACENCY_MIDCHAIN] = "dpo-adjacency-midcahin",	\
+    [DPO_ADJACENCY_GLEAN] = "dpo-glean",	\
+    [DPO_RECEIVE] = "dpo-receive",	\
+    [DPO_LOOKUP] = "dpo-lookup",	\
+    [DPO_LOAD_BALANCE] = "dpo-load-balance",	\
+    [DPO_LISP_CP] = "dpo-lisp-cp",	\
+    [DPO_CLASSIFY] = "dpo-classify",	\
+    [DPO_MPLS_LABEL] = "dpo-mpls-label"	\
+}
+
+/**
+ * @brief The identity of a DPO is a combination of its type and its
+ * instance number/index of objects of that type
+ */
+typedef struct dpo_id_t_ {
+    /**
+     * the type
+     */
+    dpo_type_t dpoi_type;
+    /**
+     * the data-path protocol of the type.
+     */
+    dpo_proto_t dpoi_proto;
+    /**
+     * The next VLIB node to follow.
+     */
+    u16 dpoi_next_node;
+    /**
+     * the index of objects of that type
+     */
+    index_t dpoi_index;
+} __attribute__ ((aligned(sizeof(u64)))) dpo_id_t;
+
+STATIC_ASSERT(sizeof(dpo_id_t) <= sizeof(u64),
+	      "DPO ID is greater than sizeof u64 "
+	      "atomic updates need to be revisited");
+
+/**
+ * @brief An initialiser for DPOs declared on the stack.
+ * Thenext node is set to 0 since VLIB graph nodes should set 0 index to drop.
+ */
+#define DPO_INVALID                \
+{                                  \
+    .dpoi_type = DPO_FIRST,        \
+    .dpoi_proto = DPO_PROTO_NONE,  \
+    .dpoi_index = INDEX_INVALID,   \
+    .dpoi_next_node = 0,           \
+}
+
+/**
+ * @brief Return true if the DPO object is valid, i.e. has been initialised.
+ */
+static inline int
+dpo_id_is_valid (const dpo_id_t *dpoi)
+{
+    return (dpoi->dpoi_type != DPO_FIRST &&
+	    dpoi->dpoi_index != INDEX_INVALID);
+}
+
+extern dpo_proto_t vnet_link_to_dpo_proto(vnet_link_t linkt);
+
+/**
+ * @brief
+ *  Take a reference counting lock on the DPO
+ */
+extern void dpo_lock(dpo_id_t *dpo);
+
+/**
+ * @brief
+ *  Release a reference counting lock on the DPO
+ */
+extern void dpo_unlock(dpo_id_t *dpo);
+
+/**
+ * @brief Set/create a DPO ID
+ * The DPO will be locked.
+ *
+ * @param dpo
+ *  The DPO object to configure
+ *
+ * @param type
+ *  The dpo_type_t of the DPO
+ *
+ * @param proto
+ *  The dpo_proto_t of the DPO
+ *
+ * @param index
+ *  The type specific index of the DPO
+ */
+extern void dpo_set(dpo_id_t *dpo,
+		    dpo_type_t type,
+		    dpo_proto_t proto,
+		    index_t index);
+
+/**
+ * @brief reset a DPO ID
+ * The DPO will be unlocked.
+ *
+ * @param dpo
+ *  The DPO object to reset
+ */
+extern void dpo_reset(dpo_id_t *dpo);
+
+/**
+ * @brief compare two DPOs for equality
+ */
+extern int dpo_cmp(const dpo_id_t *dpo1,
+		   const dpo_id_t *dpo2);
+
+/**
+ * @brief
+ *  atomic copy a data-plane object.
+ * This is safe to use when the dst DPO is currently switching packets
+ */
+extern void dpo_copy(dpo_id_t *dst,
+		     const dpo_id_t *src);
+
+/**
+ * @brief Return TRUE is the DPO is any type of adjacency
+ */
+extern int dpo_is_adj(const dpo_id_t *dpo);
+
+/**
+ * @biref Format a DPO_id_t oject
+ */
+extern u8 *format_dpo_id(u8 * s, va_list * args);
+
+/**
+ * @biref format a DPO type
+ */
+extern u8 *format_dpo_type(u8 * s, va_list * args);
+
+/**
+ * @brief format a DPO protocol
+ */
+extern u8 *format_dpo_proto(u8 * s, va_list * args);
+
+/**
+ * @brief
+ *  Set and stack a DPO.
+ *  The DPO passed is set to the parent DPO and the necessary
+ *  VLIB graph arcs are created. The child_type and child_proto
+ * are used to get the VLID nodes from which the arcs are added.
+ *
+ * @param child_type
+ *  Child DPO type.
+ *
+ * @param child_proto
+ *  Child DPO proto
+ *
+ * @parem dpo
+ *  This is the DPO to stack and set.
+ *
+ * @paren parent_dpo
+ *  The parent DPO to stack onto.
+ */
+extern void dpo_stack(dpo_type_t child_type,
+                      dpo_proto_t child_proto,
+                      dpo_id_t *dpo,
+                      const dpo_id_t *parent_dpo);
+
+/**
+ * @brief 
+ *  Set and stack a DPO.
+ *  The DPO passed is set to the parent DPO and the necessary
+ *  VLIB graph arcs are created, from the child_node passed.
+ *
+ * @param child_node
+ *  The VLIB grpah node index to create an arc from to the parent
+ *
+ * @parem dpo
+ *  This is the DPO to stack and set.
+ *
+ * @paren parent_dpo
+ *  The parent DPO to stack onto.
+ */ 
+extern void dpo_stack_from_node(u32 child_node,
+                                dpo_id_t *dpo,
+                                const dpo_id_t *parent);
+
+/**
+ * @brief  A lock function registered for a DPO type
+ */
+typedef void (*dpo_lock_fn_t)(dpo_id_t *dpo);
+
+/**
+ * @brief An unlock function registered for a DPO type
+ */
+typedef void (*dpo_unlock_fn_t)(dpo_id_t *dpo);
+
+/**
+ * @brief An memory usage show command
+ */
+typedef void (*dpo_mem_show_t)(void);
+
+/**
+ * @brief A virtual function table regisitered for a DPO type
+ */
+typedef struct dpo_vft_t_
+{
+    /**
+     * A reference counting lock function
+     */
+    dpo_lock_fn_t dv_lock;
+    /**
+     * A reference counting unlock function
+     */
+    dpo_lock_fn_t dv_unlock;
+    /**
+     * A format function
+     */
+    format_function_t *dv_format;
+    /**
+     * A show memory usage function
+     */
+    dpo_mem_show_t dv_mem_show;
+} dpo_vft_t;
+
+
+/**
+ * @brief For a given DPO type Register:
+ *   - a virtual function table
+ *   - a NULL terminated array of graph nodes from which that object type
+ *     will originate packets, i.e. the nodes in which the object type will be
+ *     the parent DPO in the DP graph. The ndoes are per-data-path protocol
+ *     (see above).
+ *
+ * @param type
+ *  The type being registered. 
+ *
+ * @param vft
+ *  The virtual function table to register for the type.
+ *
+ * @param nodes
+ *  The string description of the per-protocol VLIB graph nodes.
+ */
+extern void dpo_register(dpo_type_t type,
+			 const dpo_vft_t *vft,
+			 const char * const * const * nodes);
+
+/**
+ * @brief Create and register a new DPO type.
+ *
+ * This can be used by plugins to create new DPO types that are not listed
+ * in dpo_type_t enum
+ *
+ * @param vft
+ *  The virtual function table to register for the type.
+ *
+ * @param nodes
+ *  The string description of the per-protocol VLIB graph nodes.
+ *
+ * @return The new dpo_type_t
+ */
+extern dpo_type_t dpo_register_new_type(const dpo_vft_t *vft,
+					const char * const * const * nodes);
+
+#endif
diff --git a/src/vnet/dpo/drop_dpo.c b/src/vnet/dpo/drop_dpo.c
new file mode 100644
index 00000000..5118d2a4
--- /dev/null
+++ b/src/vnet/dpo/drop_dpo.c
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief
+ * The data-path object representing dropping the packet
+ */
+
+#include <vnet/dpo/dpo.h>
+
+static dpo_id_t drop_dpos[DPO_PROTO_NUM];
+
+const dpo_id_t *
+drop_dpo_get (dpo_proto_t proto)
+{
+    dpo_set(&drop_dpos[proto], DPO_DROP, proto, proto);
+
+    return (&drop_dpos[proto]);
+}
+
+int
+dpo_is_drop (const dpo_id_t *dpo)
+{
+    return (dpo->dpoi_type == DPO_DROP);
+}
+
+static void
+drop_dpo_lock (dpo_id_t *dpo)
+{
+    /*
+     * not maintaining a lock count on the drop
+     * more trouble than it's worth.
+     * There always needs to be one around. no point it managaing its lifetime
+     */
+}
+static void
+drop_dpo_unlock (dpo_id_t *dpo)
+{
+}
+
+static u8*
+format_drop_dpo (u8 *s, va_list *ap)
+{
+    CLIB_UNUSED(index_t index) = va_arg(*ap, index_t);
+    CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
+
+    return (format(s, "dpo-drop %U", format_dpo_proto, index));
+}
+
+const static dpo_vft_t drop_vft = {
+    .dv_lock   = drop_dpo_lock,
+    .dv_unlock = drop_dpo_unlock,
+    .dv_format = format_drop_dpo,
+};
+
+/**
+ * @brief The per-protocol VLIB graph nodes that are assigned to a drop
+ *        object.
+ *
+ * this means that these graph nodes are ones from which a drop is the
+ * parent object in the DPO-graph.
+ */
+const static char* const drop_ip4_nodes[] =
+{
+    "ip4-drop",
+    NULL,
+};
+const static char* const drop_ip6_nodes[] =
+{
+    "ip6-drop",
+    NULL,
+};
+const static char* const drop_mpls_nodes[] =
+{
+    "mpls-drop",
+    NULL,
+};
+const static char* const drop_ethernet_nodes[] =
+{
+    "error-drop",
+    NULL,
+};
+const static char* const * const drop_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = drop_ip4_nodes,
+    [DPO_PROTO_IP6]  = drop_ip6_nodes,
+    [DPO_PROTO_MPLS] = drop_mpls_nodes,
+    [DPO_PROTO_ETHERNET] = drop_ethernet_nodes,
+};
+
+void
+drop_dpo_module_init (void)
+{
+    dpo_register(DPO_DROP, &drop_vft, drop_nodes);
+}
diff --git a/src/vnet/dpo/drop_dpo.h b/src/vnet/dpo/drop_dpo.h
new file mode 100644
index 00000000..436df36c
--- /dev/null
+++ b/src/vnet/dpo/drop_dpo.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief The Drop DPO will drop all packets, no questions asked. It is valid
+ * for any packet protocol.
+ */
+
+#ifndef __DROP_DPO_H__
+#define __DROP_DPO_H__
+
+#include <vnet/dpo/dpo.h>
+
+extern int dpo_is_drop(const dpo_id_t *dpo);
+
+extern const dpo_id_t *drop_dpo_get(dpo_proto_t proto);
+
+extern void drop_dpo_module_init(void);
+
+#endif
diff --git a/src/vnet/dpo/ip_null_dpo.c b/src/vnet/dpo/ip_null_dpo.c
new file mode 100644
index 00000000..22682e4e
--- /dev/null
+++ b/src/vnet/dpo/ip_null_dpo.c
@@ -0,0 +1,408 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief
+ * The data-path object representing dropping the packet
+ */
+
+#include <vnet/dpo/ip_null_dpo.h>
+#include <vnet/ip/ip.h>
+
+/**
+ * @brief A representation of the IP_NULL DPO
+ */
+typedef struct ip_null_dpo_t_
+{
+    /**
+     * @brief The action to take on a packet
+     */
+    ip_null_dpo_action_t ind_action;
+    /**
+     * @brief The next VLIB node
+     */
+    u32 ind_next_index;
+    /**
+     * rate limits
+     */
+} ip_null_dpo_t;
+
+/**
+ * @brief the IP_NULL dpos are shared by all routes, hence they are global.
+ * As the neame implies this is only for IP, hence 2.
+ */
+static ip_null_dpo_t ip_null_dpos[2 * IP_NULL_DPO_ACTION_NUM] = {
+    [0] = {
+	/* proto ip4, no action */
+	.ind_action = IP_NULL_ACTION_NONE,
+    },
+    [1] = {
+	/* proto ip4, action send unreach */
+	.ind_action = IP_NULL_ACTION_SEND_ICMP_UNREACH,
+    },
+    [2] = {
+	/* proto ip4, action send unreach */
+	.ind_action = IP_NULL_ACTION_SEND_ICMP_PROHIBIT,
+    },
+    [3] = {
+	/* proto ip6, no action */
+	.ind_action = IP_NULL_ACTION_NONE,
+    },
+    [4] = {
+	/* proto ip6, action send unreach */
+	.ind_action = IP_NULL_ACTION_SEND_ICMP_UNREACH,
+    },
+    [5] = {
+	/* proto ip6, action send unreach */
+	.ind_action = IP_NULL_ACTION_SEND_ICMP_PROHIBIT,
+    },
+};
+
+/**
+ * @brief Action strings
+ */
+const char *ip_null_action_strings[] = IP_NULL_ACTIONS;
+
+void
+ip_null_dpo_add_and_lock (dpo_proto_t proto,
+			  ip_null_dpo_action_t action,
+			  dpo_id_t *dpo)
+{
+    int i;
+
+    ASSERT((proto == DPO_PROTO_IP4) ||
+	   (proto == DPO_PROTO_IP6));
+    ASSERT(action < IP_NULL_DPO_ACTION_NUM);
+
+    i = (proto == DPO_PROTO_IP4 ? 0 : 1);
+
+    dpo_set(dpo, DPO_IP_NULL, proto, (i*IP_NULL_DPO_ACTION_NUM) + action);
+}
+
+always_inline const ip_null_dpo_t*
+ip_null_dpo_get (index_t indi)
+{
+    return (&ip_null_dpos[indi]);
+}
+
+static void
+ip_null_dpo_lock (dpo_id_t *dpo)
+{
+    /*
+     * not maintaining a lock count on the ip_null, they are const global and
+     * never die.
+     */
+}
+static void
+ip_null_dpo_unlock (dpo_id_t *dpo)
+{
+}
+
+static u8*
+format_ip_null_dpo (u8 *s, va_list *ap)
+{
+    index_t index = va_arg(*ap, index_t);
+    CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
+    const ip_null_dpo_t *ind;
+    dpo_proto_t proto;
+
+    ind = ip_null_dpo_get(index);
+    proto = (index < IP_NULL_DPO_ACTION_NUM ? DPO_PROTO_IP4 : DPO_PROTO_IP6);
+
+    return (format(s, "%U-null action:%s",
+		   format_dpo_proto, proto,
+		   ip_null_action_strings[ind->ind_action]));
+}
+
+const static dpo_vft_t ip_null_vft = {
+    .dv_lock   = ip_null_dpo_lock,
+    .dv_unlock = ip_null_dpo_unlock,
+    .dv_format = format_ip_null_dpo,
+};
+
+/**
+ * @brief The per-protocol VLIB graph nodes that are assigned to a ip_null
+ *        object.
+ *
+ * this means that these graph nodes are ones from which a ip_null is the
+ * parent object in the DPO-graph.
+ */
+const static char* const ip4_null_nodes[] =
+{
+    "ip4-null",
+    NULL,
+};
+const static char* const ip6_null_nodes[] =
+{
+    "ip6-null",
+    NULL,
+};
+
+const static char* const * const ip_null_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4] = ip4_null_nodes,
+    [DPO_PROTO_IP6] = ip6_null_nodes,
+};
+
+typedef struct ip_null_dpo_trace_t_
+{
+    index_t ind_index;
+} ip_null_dpo_trace_t;
+
+/**
+ * @brief Exit nodes from a IP_NULL
+ */
+typedef enum ip_null_next_t_
+{
+    IP_NULL_NEXT_DROP,
+    IP_NULL_NEXT_ICMP,
+    IP_NULL_NEXT_NUM,
+} ip_null_next_t;
+
+always_inline uword
+ip_null_dpo_switch (vlib_main_t * vm,
+		    vlib_node_runtime_t * node,
+		    vlib_frame_t * frame,
+		    u8 is_ip4)
+{
+    u32 n_left_from, next_index, *from, *to_next;
+    static f64 time_last_seed_change = -1e100;
+    static u32 hash_seeds[3];
+    static uword hash_bitmap[256 / BITS (uword)];
+    f64 time_now;
+
+    from = vlib_frame_vector_args (frame);
+    n_left_from = frame->n_vectors;
+
+    time_now = vlib_time_now (vm);
+    if (time_now - time_last_seed_change > 1e-1)
+    {
+	uword i;
+	u32 * r = clib_random_buffer_get_data (&vm->random_buffer,
+					       sizeof (hash_seeds));
+	for (i = 0; i < ARRAY_LEN (hash_seeds); i++)
+	    hash_seeds[i] = r[i];
+
+	/* Mark all hash keys as been not-seen before. */
+	for (i = 0; i < ARRAY_LEN (hash_bitmap); i++)
+	    hash_bitmap[i] = 0;
+
+	time_last_seed_change = time_now;
+    }
+
+    next_index = node->cached_next_index;
+
+    while (n_left_from > 0)
+    {
+	u32 n_left_to_next;
+
+	vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+	while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	    u32 a0, b0, c0, m0, drop0;
+	    vlib_buffer_t *p0;
+	    u32 bi0, indi0, next0;
+	    const ip_null_dpo_t *ind0;
+	    uword bm0;
+
+	    bi0 = from[0];
+	    to_next[0] = bi0;
+	    from += 1;
+	    to_next += 1;
+	    n_left_from -= 1;
+	    n_left_to_next -= 1;
+
+	    p0 = vlib_get_buffer (vm, bi0);
+
+	    /* lookup dst + src mac */
+	    indi0 =  vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+	    ind0 = ip_null_dpo_get(indi0);
+	    next0 = IP_NULL_NEXT_DROP;
+
+	    /*
+	     * rate limit - don't DoS the sender.
+	     */
+	    a0 = hash_seeds[0];
+	    b0 = hash_seeds[1];
+	    c0 = hash_seeds[2];
+
+	    if (is_ip4)
+	    {
+		ip4_header_t *ip0 = vlib_buffer_get_current (p0);
+
+		a0 ^= ip0->dst_address.data_u32;
+		b0 ^= ip0->src_address.data_u32;
+
+		hash_v3_finalize32 (a0, b0, c0);
+	    }
+	    else
+	    {
+		ip6_header_t *ip0 = vlib_buffer_get_current (p0);
+
+		a0 ^= ip0->dst_address.as_u32[0];
+		b0 ^= ip0->src_address.as_u32[0];
+		c0 ^= ip0->src_address.as_u32[1];
+
+		hash_v3_mix32 (a0, b0, c0);
+
+		a0 ^= ip0->dst_address.as_u32[1];
+		b0 ^= ip0->src_address.as_u32[2];
+		c0 ^= ip0->src_address.as_u32[3];
+
+		hash_v3_finalize32 (a0, b0, c0);
+	    }
+
+	    c0 &= BITS (hash_bitmap) - 1;
+	    c0 = c0 / BITS (uword);
+	    m0 = (uword) 1 << (c0 % BITS (uword));
+
+	    bm0 = hash_bitmap[c0];
+	    drop0 = (bm0 & m0) != 0;
+
+	    /* Mark it as seen. */
+	    hash_bitmap[c0] = bm0 | m0;
+
+	    if (PREDICT_FALSE(!drop0))
+	    {
+		if (is_ip4)
+		{
+		    /*
+		     * There's a trade-off here. This conditinal statement
+		     * versus a graph node per-condition. Given the number
+		     * expect number of packets to reach a null route is 0
+		     * we favour the run-time cost over the graph complexity
+		     */
+		    if (IP_NULL_ACTION_SEND_ICMP_UNREACH == ind0->ind_action)
+		    {
+			next0 = IP_NULL_NEXT_ICMP;
+			icmp4_error_set_vnet_buffer(
+			    p0,
+			    ICMP4_destination_unreachable,
+			    ICMP4_destination_unreachable_destination_unreachable_host,
+			    0);
+		    }
+		    else if (IP_NULL_ACTION_SEND_ICMP_PROHIBIT == ind0->ind_action)
+		    {
+			next0 = IP_NULL_NEXT_ICMP;
+			icmp4_error_set_vnet_buffer(
+			    p0,
+			    ICMP4_destination_unreachable,
+			    ICMP4_destination_unreachable_host_administratively_prohibited,
+			    0);
+		    }
+		}
+		else
+		{
+		    if (IP_NULL_ACTION_SEND_ICMP_UNREACH == ind0->ind_action)
+		    {
+			next0 = IP_NULL_NEXT_ICMP;
+			icmp6_error_set_vnet_buffer(
+			    p0,
+			    ICMP6_destination_unreachable,
+			    ICMP6_destination_unreachable_no_route_to_destination,
+			    0);
+		    }
+		    else if (IP_NULL_ACTION_SEND_ICMP_PROHIBIT == ind0->ind_action)
+		    {
+			next0 = IP_NULL_NEXT_ICMP;
+			icmp6_error_set_vnet_buffer(
+			    p0,
+			    ICMP6_destination_unreachable,
+			    ICMP6_destination_unreachable_destination_administratively_prohibited,
+			    0);
+		    }
+		}
+	    }
+
+	    if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+		ip_null_dpo_trace_t *tr = vlib_add_trace (vm, node, p0,
+							  sizeof (*tr));
+		tr->ind_index = indi0;
+	    }
+	    vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					     n_left_to_next, bi0, next0);
+	}
+
+	vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+    return frame->n_vectors;
+}
+
+static u8 *
+format_ip_null_dpo_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip_null_dpo_trace_t *t = va_arg (*args, ip_null_dpo_trace_t *);
+
+  s = format (s, "%U", format_ip_null_dpo, t->ind_index, 0);
+  return s;
+}
+
+static uword
+ip4_null_dpo_switch (vlib_main_t * vm,
+		    vlib_node_runtime_t * node,
+		    vlib_frame_t * frame)
+{
+    return (ip_null_dpo_switch(vm, node, frame, 1));
+}
+
+/**
+ * @brief
+ */
+VLIB_REGISTER_NODE (ip4_null_dpo_node) = {
+  .function = ip4_null_dpo_switch,
+  .name = "ip4-null",
+  .vector_size = sizeof (u32),
+
+  .format_trace = format_ip_null_dpo_trace,
+  .n_next_nodes = IP_NULL_NEXT_NUM,
+  .next_nodes = {
+      [IP_NULL_NEXT_DROP] = "ip4-drop",
+      [IP_NULL_NEXT_ICMP] = "ip4-icmp-error",
+  },
+};
+
+static uword
+ip6_null_dpo_switch (vlib_main_t * vm,
+		    vlib_node_runtime_t * node,
+		    vlib_frame_t * frame)
+{
+    return (ip_null_dpo_switch(vm, node, frame, 0));
+}
+
+/**
+ * @brief
+ */
+VLIB_REGISTER_NODE (ip6_null_dpo_node) = {
+  .function = ip6_null_dpo_switch,
+  .name = "ip6-null",
+  .vector_size = sizeof (u32),
+
+  .format_trace = format_ip_null_dpo_trace,
+  .n_next_nodes = IP_NULL_NEXT_NUM,
+  .next_nodes = {
+      [IP_NULL_NEXT_DROP] = "ip6-drop",
+      [IP_NULL_NEXT_ICMP] = "ip6-icmp-error",
+  },
+};
+
+void
+ip_null_dpo_module_init (void)
+{
+    dpo_register(DPO_IP_NULL, &ip_null_vft, ip_null_nodes);
+}
diff --git a/src/vnet/dpo/ip_null_dpo.h b/src/vnet/dpo/ip_null_dpo.h
new file mode 100644
index 00000000..002a2a70
--- /dev/null
+++ b/src/vnet/dpo/ip_null_dpo.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief
+ * The IP NULL DPO represents the rubbish bin for IP traffic. Without specifying an
+ * action (i.e. send IMCP type X to sender) it is equivalent to using a drop DPO.
+ * However, in contrast to the drop DPO any route that resovles via a NULL, is
+ * considered to 'resolved' by FIB, i.e. a IP NULL is used when the control plane
+ * is explicitly expressing the desire to drop packets. Drop DPOs are used
+ * internally by FIB when resolution is not possible.
+ *
+ * Any replies to sender are rate limited.
+ */
+
+#ifndef __IP_NULL_DPO_H__
+#define __IP_NULL_DPO_H__
+
+#include <vnet/dpo/dpo.h>
+
+/**
+ * @brief Actions to take when a packet encounters the NULL DPO
+ */
+typedef enum ip_null_dpo_action_t_
+{
+    IP_NULL_ACTION_NONE,
+    IP_NULL_ACTION_SEND_ICMP_UNREACH,
+    IP_NULL_ACTION_SEND_ICMP_PROHIBIT,
+} ip_null_dpo_action_t;
+
+#define IP_NULL_ACTIONS {						\
+    [IP_NULL_ACTION_NONE] = "discard",					\
+    [IP_NULL_ACTION_SEND_ICMP_UNREACH] = "send-unreachable",		\
+    [IP_NULL_ACTION_SEND_ICMP_PROHIBIT] = "send-prohibited",		\
+}
+
+#define IP_NULL_DPO_ACTION_NUM (IP_NULL_ACTION_SEND_ICMP_PROHIBIT+1)
+
+extern void ip_null_dpo_add_and_lock (dpo_proto_t proto,
+				      ip_null_dpo_action_t action,
+				      dpo_id_t *dpo);
+
+extern void ip_null_dpo_module_init(void);
+
+#endif
diff --git a/src/vnet/dpo/load_balance.c b/src/vnet/dpo/load_balance.c
new file mode 100644
index 00000000..a244776f
--- /dev/null
+++ b/src/vnet/dpo/load_balance.c
@@ -0,0 +1,993 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/ip/lookup.h>
+#include <vnet/dpo/load_balance.h>
+#include <vnet/dpo/load_balance_map.h>
+#include <vnet/dpo/drop_dpo.h>
+#include <vppinfra/math.h>              /* for fabs */
+#include <vnet/adj/adj.h>
+#include <vnet/adj/adj_internal.h>
+#include <vnet/fib/fib_urpf_list.h>
+
+/*
+ * distribution error tolerance for load-balancing
+ */
+const f64 multipath_next_hop_error_tolerance = 0.1;
+
+#undef LB_DEBUG
+
+#ifdef LB_DEBUG
+#define LB_DBG(_lb, _fmt, _args...)                                     \
+{                                                                       \
+    u8* _tmp =NULL;                                                     \
+    clib_warning("lb:[%s]:" _fmt,                                       \
+                 load_balance_format(load_balance_get_index((_lb)),     \
+                                     0, _tmp),                          \
+                 ##_args);                                              \
+    vec_free(_tmp);                                                     \
+}
+#else
+#define LB_DBG(_p, _fmt, _args...)
+#endif
+
+
+/**
+ * Pool of all DPOs. It's not static so the DP can have fast access
+ */
+load_balance_t *load_balance_pool;
+
+/**
+ * The one instance of load-balance main
+ */
+load_balance_main_t load_balance_main;
+
+f64
+load_balance_get_multipath_tolerance (void)
+{
+    return (multipath_next_hop_error_tolerance);
+}
+
+static inline index_t
+load_balance_get_index (const load_balance_t *lb)
+{
+    return (lb - load_balance_pool);
+}
+
+static inline dpo_id_t*
+load_balance_get_buckets (load_balance_t *lb)
+{
+    if (LB_HAS_INLINE_BUCKETS(lb))
+    {
+        return (lb->lb_buckets_inline);
+    }
+    else
+    {
+        return (lb->lb_buckets);
+    }
+}
+
+static load_balance_t *
+load_balance_alloc_i (void)
+{
+    load_balance_t *lb;
+
+    pool_get_aligned(load_balance_pool, lb, CLIB_CACHE_LINE_BYTES);
+    memset(lb, 0, sizeof(*lb));
+
+    lb->lb_map = INDEX_INVALID;
+    lb->lb_urpf = INDEX_INVALID;
+    vlib_validate_combined_counter(&(load_balance_main.lbm_to_counters),
+                                   load_balance_get_index(lb));
+    vlib_validate_combined_counter(&(load_balance_main.lbm_via_counters),
+                                   load_balance_get_index(lb));
+    vlib_zero_combined_counter(&(load_balance_main.lbm_to_counters),
+                               load_balance_get_index(lb));
+    vlib_zero_combined_counter(&(load_balance_main.lbm_via_counters),
+                               load_balance_get_index(lb));
+
+    return (lb);
+}
+
+static u8*
+load_balance_format (index_t lbi,
+                     load_balance_format_flags_t flags,
+                     u32 indent,
+                     u8 *s)
+{
+    vlib_counter_t to, via;
+    load_balance_t *lb;
+    dpo_id_t *buckets;
+    u32 i;
+
+    lb = load_balance_get(lbi);
+    vlib_get_combined_counter(&(load_balance_main.lbm_to_counters), lbi, &to);
+    vlib_get_combined_counter(&(load_balance_main.lbm_via_counters), lbi, &via);
+    buckets = load_balance_get_buckets(lb);
+
+    s = format(s, "%U: ", format_dpo_type, DPO_LOAD_BALANCE);
+    s = format(s, "[index:%d buckets:%d ", lbi, lb->lb_n_buckets);
+    s = format(s, "uRPF:%d ", lb->lb_urpf);
+    s = format(s, "to:[%Ld:%Ld]", to.packets, to.bytes);
+    if (0 != via.packets)
+    {
+        s = format(s, " via:[%Ld:%Ld]",
+                   via.packets, via.bytes);
+    }
+    s = format(s, "]");
+
+    if (INDEX_INVALID != lb->lb_map)
+    {
+        s = format(s, "\n%U%U",
+                   format_white_space, indent+4,
+                   format_load_balance_map, lb->lb_map, indent+4);
+    }
+    for (i = 0; i < lb->lb_n_buckets; i++)
+    {
+        s = format(s, "\n%U[%d] %U",
+                   format_white_space, indent+2,
+                   i,
+                   format_dpo_id,
+                   &buckets[i], indent+6);
+    }
+    return (s);
+}
+
+u8*
+format_load_balance (u8 * s, va_list * args)
+{
+    index_t lbi = va_arg(*args, index_t);
+    load_balance_format_flags_t flags = va_arg(*args, load_balance_format_flags_t);
+
+    return (load_balance_format(lbi, flags, 0, s));
+}
+static u8*
+format_load_balance_dpo (u8 * s, va_list * args)
+{
+    index_t lbi = va_arg(*args, index_t);
+    u32 indent = va_arg(*args, u32);
+
+    return (load_balance_format(lbi, LOAD_BALANCE_FORMAT_DETAIL, indent, s));
+}
+
+
+static load_balance_t *
+load_balance_create_i (u32 num_buckets,
+                       dpo_proto_t lb_proto,
+                       flow_hash_config_t fhc)
+{
+    load_balance_t *lb;
+
+    lb = load_balance_alloc_i();
+    lb->lb_hash_config = fhc;
+    lb->lb_n_buckets = num_buckets;
+    lb->lb_n_buckets_minus_1 = num_buckets-1;
+    lb->lb_proto = lb_proto;
+
+    if (!LB_HAS_INLINE_BUCKETS(lb))
+    {
+        vec_validate_aligned(lb->lb_buckets,
+                             lb->lb_n_buckets - 1,
+                             CLIB_CACHE_LINE_BYTES);
+    }
+
+    LB_DBG(lb, "create");
+
+    return (lb);
+}
+
+index_t
+load_balance_create (u32 n_buckets,
+                     dpo_proto_t lb_proto,
+                     flow_hash_config_t fhc)
+{
+    return (load_balance_get_index(load_balance_create_i(n_buckets, lb_proto, fhc)));
+}
+
+static inline void
+load_balance_set_bucket_i (load_balance_t *lb,
+                           u32 bucket,
+                           dpo_id_t *buckets,
+                           const dpo_id_t *next)
+{
+    dpo_stack(DPO_LOAD_BALANCE, lb->lb_proto, &buckets[bucket], next);
+}
+
+void
+load_balance_set_bucket (index_t lbi,
+                         u32 bucket,
+                         const dpo_id_t *next)
+{
+    load_balance_t *lb;
+    dpo_id_t *buckets;
+
+    lb = load_balance_get(lbi);
+    buckets = load_balance_get_buckets(lb);
+
+    ASSERT(bucket < lb->lb_n_buckets);
+
+    load_balance_set_bucket_i(lb, bucket, buckets, next);
+}
+
+int
+load_balance_is_drop (const dpo_id_t *dpo)
+{
+    load_balance_t *lb;
+
+    if (DPO_LOAD_BALANCE != dpo->dpoi_type)
+        return (0);
+
+    lb = load_balance_get(dpo->dpoi_index);
+
+    if (1 == lb->lb_n_buckets)
+    {
+        return (dpo_is_drop(load_balance_get_bucket_i(lb, 0)));
+    }
+    return (0);
+}
+
+void
+load_balance_set_urpf (index_t lbi,
+		       index_t urpf)
+{
+    load_balance_t *lb;
+    index_t old;
+
+    lb = load_balance_get(lbi);
+
+    /*
+     * packets in flight we see this change. but it's atomic, so :P
+     */
+    old = lb->lb_urpf;
+    lb->lb_urpf = urpf;
+
+    fib_urpf_list_unlock(old);
+    fib_urpf_list_lock(urpf);
+}
+
+index_t
+load_balance_get_urpf (index_t lbi)
+{
+    load_balance_t *lb;
+
+    lb = load_balance_get(lbi);
+
+    return (lb->lb_urpf);
+}
+
+const dpo_id_t *
+load_balance_get_bucket (index_t lbi,
+                         u32 bucket)
+{
+    load_balance_t *lb;
+
+    lb = load_balance_get(lbi);
+
+    return (load_balance_get_bucket_i(lb, bucket));
+}
+
+static int
+next_hop_sort_by_weight (load_balance_path_t * n1,
+                         load_balance_path_t * n2)
+{
+    return ((int) n1->path_weight - (int) n2->path_weight);
+}
+
+/* Given next hop vector is over-written with normalized one with sorted weights and
+   with weights corresponding to the number of adjacencies for each next hop.
+   Returns number of adjacencies in block. */
+u32
+ip_multipath_normalize_next_hops (load_balance_path_t * raw_next_hops,
+                                  load_balance_path_t ** normalized_next_hops,
+                                  u32 *sum_weight_in,
+                                  f64 multipath_next_hop_error_tolerance)
+{
+    load_balance_path_t * nhs;
+    uword n_nhs, n_adj, n_adj_left, i, sum_weight;
+    f64 norm, error;
+
+    n_nhs = vec_len (raw_next_hops);
+    ASSERT (n_nhs > 0);
+    if (n_nhs == 0)
+        return 0;
+
+    /* Allocate enough space for 2 copies; we'll use second copy to save original weights. */
+    nhs = *normalized_next_hops;
+    vec_validate (nhs, 2*n_nhs - 1);
+
+    /* Fast path: 1 next hop in block. */
+    n_adj = n_nhs;
+    if (n_nhs == 1)
+    {
+        nhs[0] = raw_next_hops[0];
+        nhs[0].path_weight = 1;
+        _vec_len (nhs) = 1;
+        sum_weight = 1;
+        goto done;
+    }
+
+    else if (n_nhs == 2)
+    {
+        int cmp = next_hop_sort_by_weight (&raw_next_hops[0], &raw_next_hops[1]) < 0;
+
+        /* Fast sort. */
+        nhs[0] = raw_next_hops[cmp];
+        nhs[1] = raw_next_hops[cmp ^ 1];
+
+        /* Fast path: equal cost multipath with 2 next hops. */
+        if (nhs[0].path_weight == nhs[1].path_weight)
+        {
+            nhs[0].path_weight = nhs[1].path_weight = 1;
+            _vec_len (nhs) = 2;
+            sum_weight = 2;
+            goto done;
+        }
+    }
+    else
+    {
+        clib_memcpy (nhs, raw_next_hops, n_nhs * sizeof (raw_next_hops[0]));
+        qsort (nhs, n_nhs, sizeof (nhs[0]), (void *) next_hop_sort_by_weight);
+    }
+
+    /* Find total weight to normalize weights. */
+    sum_weight = 0;
+    for (i = 0; i < n_nhs; i++)
+        sum_weight += nhs[i].path_weight;
+
+    /* In the unlikely case that all weights are given as 0, set them all to 1. */
+    if (sum_weight == 0)
+    {
+        for (i = 0; i < n_nhs; i++)
+            nhs[i].path_weight = 1;
+        sum_weight = n_nhs;
+    }
+
+    /* Save copies of all next hop weights to avoid being overwritten in loop below. */
+    for (i = 0; i < n_nhs; i++)
+        nhs[n_nhs + i].path_weight = nhs[i].path_weight;
+
+    /* Try larger and larger power of 2 sized adjacency blocks until we
+       find one where traffic flows to within 1% of specified weights. */
+    for (n_adj = max_pow2 (n_nhs); ; n_adj *= 2)
+    {
+        error = 0;
+
+        norm = n_adj / ((f64) sum_weight);
+        n_adj_left = n_adj;
+        for (i = 0; i < n_nhs; i++)
+        {
+            f64 nf = nhs[n_nhs + i].path_weight * norm; /* use saved weights */
+            word n = flt_round_nearest (nf);
+
+            n = n > n_adj_left ? n_adj_left : n;
+            n_adj_left -= n;
+            error += fabs (nf - n);
+            nhs[i].path_weight = n;
+
+            if (0 == nhs[i].path_weight)
+            {
+                /*
+                 * when the weight skew is high (norm is small) and n == nf.
+                 * without this correction the path with a low weight would have
+                 * no represenation in the load-balanace - don't want that.
+                 * If the weight skew is high so the load-balance has many buckets
+                 * to allow it. pays ya money takes ya choice.
+                 */
+                error = n_adj;
+                break;
+            }
+        }
+
+        nhs[0].path_weight += n_adj_left;
+
+        /* Less than 5% average error per adjacency with this size adjacency block? */
+        if (error <= multipath_next_hop_error_tolerance*n_adj)
+        {
+            /* Truncate any next hops with zero weight. */
+            _vec_len (nhs) = i;
+            break;
+        }
+    }
+
+done:
+    /* Save vector for next call. */
+    *normalized_next_hops = nhs;
+    *sum_weight_in = sum_weight;
+    return n_adj;
+}
+
+static load_balance_path_t *
+load_balance_multipath_next_hop_fixup (load_balance_path_t *nhs,
+                                       dpo_proto_t drop_proto)
+{
+    if (0 == vec_len(nhs))
+    {
+        load_balance_path_t *nh;
+
+        /*
+         * we need something for the load-balance. so use the drop
+         */
+        vec_add2(nhs, nh, 1);
+
+        nh->path_weight = 1;
+        dpo_copy(&nh->path_dpo, drop_dpo_get(drop_proto));
+    }
+
+    return (nhs);
+}
+
+/*
+ * Fill in adjacencies in block based on corresponding
+ * next hop adjacencies.
+ */
+static void
+load_balance_fill_buckets (load_balance_t *lb,
+                           load_balance_path_t *nhs,
+                           dpo_id_t *buckets,
+                           u32 n_buckets)
+{
+    load_balance_path_t * nh;
+    u16 ii, bucket;
+
+    bucket = 0;
+
+    /*
+     * the next-hops have normalised weights. that means their sum is the number
+     * of buckets we need to fill.
+     */
+    vec_foreach (nh, nhs)
+    {
+        for (ii = 0; ii < nh->path_weight; ii++)
+        {
+            ASSERT(bucket < n_buckets);
+            load_balance_set_bucket_i(lb, bucket++, buckets, &nh->path_dpo);
+        }
+    }
+}
+
+static inline void
+load_balance_set_n_buckets (load_balance_t *lb,
+                            u32 n_buckets)
+{
+    lb->lb_n_buckets = n_buckets;
+    lb->lb_n_buckets_minus_1 = n_buckets-1;
+}
+
+void
+load_balance_multipath_update (const dpo_id_t *dpo,
+                               load_balance_path_t * raw_next_hops,
+                               load_balance_flags_t flags)
+{
+    u32 sum_of_weights,n_buckets, ii;
+    load_balance_path_t * nh, * nhs;
+    index_t lbmi, old_lbmi;
+    load_balance_t *lb;
+    dpo_id_t *tmp_dpo;
+
+    nhs = NULL;
+
+    ASSERT(DPO_LOAD_BALANCE == dpo->dpoi_type);
+    lb = load_balance_get(dpo->dpoi_index);
+    raw_next_hops =
+        load_balance_multipath_next_hop_fixup(raw_next_hops,
+                                              lb->lb_proto);
+    n_buckets =
+        ip_multipath_normalize_next_hops(raw_next_hops,
+                                         &nhs,
+                                         &sum_of_weights,
+                                         multipath_next_hop_error_tolerance);
+
+    ASSERT (n_buckets >= vec_len (raw_next_hops));
+
+    /*
+     * Save the old load-balance map used, and get a new one if required.
+     */
+    old_lbmi = lb->lb_map;
+    if (flags & LOAD_BALANCE_FLAG_USES_MAP)
+    {
+        lbmi = load_balance_map_add_or_lock(n_buckets, sum_of_weights, nhs);
+    }
+    else
+    {
+        lbmi = INDEX_INVALID;
+    }
+
+    if (0 == lb->lb_n_buckets)
+    {
+        /*
+         * first time initialisation. no packets inflight, so we can write
+         * at leisure.
+         */
+        load_balance_set_n_buckets(lb, n_buckets);
+
+        if (!LB_HAS_INLINE_BUCKETS(lb))
+            vec_validate_aligned(lb->lb_buckets,
+                                 lb->lb_n_buckets - 1,
+                                 CLIB_CACHE_LINE_BYTES);
+
+        load_balance_fill_buckets(lb, nhs,
+                                  load_balance_get_buckets(lb),
+                                  n_buckets);
+        lb->lb_map = lbmi;
+    }
+    else
+    {
+        /*
+         * This is a modification of an existing load-balance.
+         * We need to ensure that packets inflight see a consistent state, that
+         * is the number of reported buckets the LB has (read from
+         * lb_n_buckets_minus_1) is not more than it actually has. So if the
+         * number of buckets is increasing, we must update the bucket array first,
+         * then the reported number. vice-versa if the number of buckets goes down.
+         */
+        if (n_buckets == lb->lb_n_buckets)
+        {
+            /*
+             * no change in the number of buckets. we can simply fill what
+             * is new over what is old.
+             */
+            load_balance_fill_buckets(lb, nhs,
+                                      load_balance_get_buckets(lb),
+                                      n_buckets);
+            lb->lb_map = lbmi;
+        }
+        else if (n_buckets > lb->lb_n_buckets)
+        {
+            /*
+             * we have more buckets. the old load-balance map (if there is one)
+             * will remain valid, i.e. mapping to indices within range, so we
+             * update it last.
+             */
+            if (n_buckets > LB_NUM_INLINE_BUCKETS &&
+                lb->lb_n_buckets <= LB_NUM_INLINE_BUCKETS)
+            {
+                /*
+                 * the new increased number of buckets is crossing the threshold
+                 * from the inline storage to out-line. Alloc the outline buckets
+                 * first, then fixup the number. then reset the inlines.
+                 */
+                ASSERT(NULL == lb->lb_buckets);
+                vec_validate_aligned(lb->lb_buckets,
+                                     n_buckets - 1,
+                                     CLIB_CACHE_LINE_BYTES);
+
+                load_balance_fill_buckets(lb, nhs,
+                                          lb->lb_buckets,
+                                          n_buckets);
+                CLIB_MEMORY_BARRIER();
+                load_balance_set_n_buckets(lb, n_buckets);
+
+                CLIB_MEMORY_BARRIER();
+
+                for (ii = 0; ii < LB_NUM_INLINE_BUCKETS; ii++)
+                {
+                    dpo_reset(&lb->lb_buckets_inline[ii]);
+                }
+            }
+            else
+            {
+                if (n_buckets <= LB_NUM_INLINE_BUCKETS)
+                {
+                    /*
+                     * we are not crossing the threshold and it's still inline buckets.
+                     * we can write the new on the old..
+                     */
+                    load_balance_fill_buckets(lb, nhs,
+                                              load_balance_get_buckets(lb),
+                                              n_buckets);
+                    CLIB_MEMORY_BARRIER();
+                    load_balance_set_n_buckets(lb, n_buckets);
+                }
+                else
+                {
+                    /*
+                     * we are not crossing the threshold. We need a new bucket array to
+                     * hold the increased number of choices.
+                     */
+                    dpo_id_t *new_buckets, *old_buckets, *tmp_dpo;
+
+                    new_buckets = NULL;
+                    old_buckets = load_balance_get_buckets(lb);
+
+                    vec_validate_aligned(new_buckets,
+                                         n_buckets - 1,
+                                         CLIB_CACHE_LINE_BYTES);
+
+                    load_balance_fill_buckets(lb, nhs, new_buckets, n_buckets);
+                    CLIB_MEMORY_BARRIER();
+                    lb->lb_buckets = new_buckets;
+                    CLIB_MEMORY_BARRIER();
+                    load_balance_set_n_buckets(lb, n_buckets);
+
+                    vec_foreach(tmp_dpo, old_buckets)
+                    {
+                        dpo_reset(tmp_dpo);
+                    }
+                    vec_free(old_buckets);
+                }
+            }
+
+            /*
+             * buckets fixed. ready for the MAP update.
+             */
+            lb->lb_map = lbmi;
+        }
+        else
+        {
+            /*
+             * bucket size shrinkage.
+             * Any map we have will be based on the old
+             * larger number of buckets, so will be translating to indices
+             * out of range. So the new MAP must be installed first.
+             */
+            lb->lb_map = lbmi;
+            CLIB_MEMORY_BARRIER();
+
+
+            if (n_buckets <= LB_NUM_INLINE_BUCKETS &&
+                lb->lb_n_buckets > LB_NUM_INLINE_BUCKETS)
+            {
+                /*
+                 * the new decreased number of buckets is crossing the threshold
+                 * from out-line storage to inline:
+                 *   1 - Fill the inline buckets,
+                 *   2 - fixup the number (and this point the inline buckets are
+                 *       used).
+                 *   3 - free the outline buckets
+                 */
+                load_balance_fill_buckets(lb, nhs,
+                                          lb->lb_buckets_inline,
+                                          n_buckets);
+                CLIB_MEMORY_BARRIER();
+                load_balance_set_n_buckets(lb, n_buckets);
+                CLIB_MEMORY_BARRIER();
+
+                vec_foreach(tmp_dpo, lb->lb_buckets)
+                {
+                    dpo_reset(tmp_dpo);
+                }
+                vec_free(lb->lb_buckets);
+            }
+            else
+            {
+                /*
+                 * not crossing the threshold.
+                 *  1 - update the number to the smaller size
+                 *  2 - write the new buckets
+                 *  3 - reset those no longer used.
+                 */
+                dpo_id_t *buckets;
+                u32 old_n_buckets;
+
+                old_n_buckets = lb->lb_n_buckets;
+                buckets = load_balance_get_buckets(lb);
+
+                load_balance_set_n_buckets(lb, n_buckets);
+                CLIB_MEMORY_BARRIER();
+
+                load_balance_fill_buckets(lb, nhs,
+                                          buckets,
+                                          n_buckets);
+
+                for (ii = old_n_buckets-n_buckets; ii < old_n_buckets; ii++)
+                {
+                    dpo_reset(&buckets[ii]);
+                }
+            }
+        }
+    }
+
+    vec_foreach (nh, nhs)
+    {
+        dpo_reset(&nh->path_dpo);
+    }
+    vec_free(nhs);
+
+    load_balance_map_unlock(old_lbmi);
+}
+
+static void
+load_balance_lock (dpo_id_t *dpo)
+{
+    load_balance_t *lb;
+
+    lb = load_balance_get(dpo->dpoi_index);
+
+    lb->lb_locks++;
+}
+
+static void
+load_balance_destroy (load_balance_t *lb)
+{
+    dpo_id_t *buckets;
+    int i;
+
+    buckets = load_balance_get_buckets(lb);
+
+    for (i = 0; i < lb->lb_n_buckets; i++)
+    {
+        dpo_reset(&buckets[i]);
+    }
+
+    LB_DBG(lb, "destroy");
+    if (!LB_HAS_INLINE_BUCKETS(lb))
+    {
+        vec_free(lb->lb_buckets);
+    }
+
+    fib_urpf_list_unlock(lb->lb_urpf);
+    load_balance_map_unlock(lb->lb_map);
+
+    pool_put(load_balance_pool, lb);
+}
+
+static void
+load_balance_unlock (dpo_id_t *dpo)
+{
+    load_balance_t *lb;
+
+    lb = load_balance_get(dpo->dpoi_index);
+
+    lb->lb_locks--;
+
+    if (0 == lb->lb_locks)
+    {
+        load_balance_destroy(lb);
+    }
+}
+
+static void
+load_balance_mem_show (void)
+{
+    fib_show_memory_usage("load-balance",
+			  pool_elts(load_balance_pool),
+			  pool_len(load_balance_pool),
+			  sizeof(load_balance_t));
+    load_balance_map_show_mem();
+}
+
+const static dpo_vft_t lb_vft = {
+    .dv_lock = load_balance_lock,
+    .dv_unlock = load_balance_unlock,
+    .dv_format = format_load_balance_dpo,
+    .dv_mem_show = load_balance_mem_show,
+};
+
+/**
+ * @brief The per-protocol VLIB graph nodes that are assigned to a load-balance
+ *        object.
+ *
+ * this means that these graph nodes are ones from which a load-balance is the
+ * parent object in the DPO-graph.
+ *
+ * We do not list all the load-balance nodes, such as the *-lookup. instead
+ * we are relying on the correct use of the .sibling_of field when setting
+ * up these sibling nodes.
+ */
+const static char* const load_balance_ip4_nodes[] =
+{
+    "ip4-load-balance",
+    NULL,
+};
+const static char* const load_balance_ip6_nodes[] =
+{
+    "ip6-load-balance",
+    NULL,
+};
+const static char* const load_balance_mpls_nodes[] =
+{
+    "mpls-load-balance",
+    NULL,
+};
+const static char* const load_balance_l2_nodes[] =
+{
+    "l2-load-balance",
+    NULL,
+};
+const static char* const * const load_balance_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = load_balance_ip4_nodes,
+    [DPO_PROTO_IP6]  = load_balance_ip6_nodes,
+    [DPO_PROTO_MPLS] = load_balance_mpls_nodes,
+    [DPO_PROTO_ETHERNET] = load_balance_l2_nodes,
+};
+
+void
+load_balance_module_init (void)
+{
+    dpo_register(DPO_LOAD_BALANCE, &lb_vft, load_balance_nodes);
+
+    load_balance_map_module_init();
+}
+
+static clib_error_t *
+load_balance_show (vlib_main_t * vm,
+                   unformat_input_t * input,
+                   vlib_cli_command_t * cmd)
+{
+    index_t lbi = INDEX_INVALID;
+
+    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+        if (unformat (input, "%d", &lbi))
+            ;
+        else
+            break;
+    }
+
+    if (INDEX_INVALID != lbi)
+    {
+        vlib_cli_output (vm, "%U", format_load_balance, lbi,
+                         LOAD_BALANCE_FORMAT_DETAIL);
+    }
+    else
+    {
+        load_balance_t *lb;
+
+        pool_foreach(lb, load_balance_pool,
+        ({
+            vlib_cli_output (vm, "%U", format_load_balance,
+                             load_balance_get_index(lb),
+                             LOAD_BALANCE_FORMAT_NONE);
+        }));
+    }
+
+    return 0;
+}
+
+VLIB_CLI_COMMAND (load_balance_show_command, static) = {
+    .path = "show load-balance",
+    .short_help = "show load-balance [<index>]",
+    .function = load_balance_show,
+};
+
+
+always_inline u32
+ip_flow_hash (void *data)
+{
+  ip4_header_t *iph = (ip4_header_t *) data;
+
+  if ((iph->ip_version_and_header_length & 0xF0) == 0x40)
+    return ip4_compute_flow_hash (iph, IP_FLOW_HASH_DEFAULT);
+  else
+    return ip6_compute_flow_hash ((ip6_header_t *) iph, IP_FLOW_HASH_DEFAULT);
+}
+
+always_inline u64
+mac_to_u64 (u8 * m)
+{
+  return (*((u64 *) m) & 0xffffffffffff);
+}
+
+always_inline u32
+l2_flow_hash (vlib_buffer_t * b0)
+{
+  ethernet_header_t *eh;
+  u64 a, b, c;
+  uword is_ip, eh_size;
+  u16 eh_type;
+
+  eh = vlib_buffer_get_current (b0);
+  eh_type = clib_net_to_host_u16 (eh->type);
+  eh_size = ethernet_buffer_header_size (b0);
+
+  is_ip = (eh_type == ETHERNET_TYPE_IP4 || eh_type == ETHERNET_TYPE_IP6);
+
+  /* since we have 2 cache lines, use them */
+  if (is_ip)
+    a = ip_flow_hash ((u8 *) vlib_buffer_get_current (b0) + eh_size);
+  else
+    a = eh->type;
+
+  b = mac_to_u64 ((u8 *) eh->dst_address);
+  c = mac_to_u64 ((u8 *) eh->src_address);
+  hash_mix64 (a, b, c);
+
+  return (u32) c;
+}
+
+typedef struct load_balance_trace_t_
+{
+    index_t lb_index;
+} load_balance_trace_t;
+
+static uword
+l2_load_balance (vlib_main_t * vm,
+		 vlib_node_runtime_t * node,
+		 vlib_frame_t * frame)
+{
+  u32 n_left_from, next_index, *from, *to_next;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *b0;
+	  u32 bi0, lbi0, next0;
+	  const dpo_id_t *dpo0;
+	  const load_balance_t *lb0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  /* lookup dst + src mac */
+	  lbi0 =  vnet_buffer (b0)->ip.adj_index[VLIB_TX];
+	  lb0 = load_balance_get(lbi0);
+
+	  vnet_buffer(b0)->ip.flow_hash = l2_flow_hash(b0);
+
+	  dpo0 = load_balance_get_bucket_i(lb0, 
+					   vnet_buffer(b0)->ip.flow_hash &
+					   (lb0->lb_n_buckets_minus_1));
+
+	  next0 = dpo0->dpoi_next_node;
+	  vnet_buffer (b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      load_balance_trace_t *tr = vlib_add_trace (vm, node, b0,
+							 sizeof (*tr));
+	      tr->lb_index = lbi0;
+	    }
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+static u8 *
+format_load_balance_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  load_balance_trace_t *t = va_arg (*args, load_balance_trace_t *);
+
+  s = format (s, "L2-load-balance: index %d", t->lb_index);
+  return s;
+}
+
+/**
+ * @brief
+ */
+VLIB_REGISTER_NODE (l2_load_balance_node) = {
+  .function = l2_load_balance,
+  .name = "l2-load-balance",
+  .vector_size = sizeof (u32),
+
+  .format_trace = format_load_balance_trace,
+  .n_next_nodes = 1,
+  .next_nodes = {
+      [0] = "error-drop",
+  },
+};
diff --git a/src/vnet/dpo/load_balance.h b/src/vnet/dpo/load_balance.h
new file mode 100644
index 00000000..dc6485e6
--- /dev/null
+++ b/src/vnet/dpo/load_balance.h
@@ -0,0 +1,211 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * \brief
+ * The load-balance object represents an ECMP choice. The buckets of a load
+ * balance object point to the sub-graph after the choice is made.
+ * THe load-balance object is also object type returned from a FIB table lookup.
+ * As such it needs to represent the case where there is only one coice. It may
+ * seem like overkill to use a load-balance object in this case, but the reason
+ * is for performance. If the load-balance object were not the result of the FIB
+ * lookup, then some other object would be. The case where there was ECMP
+ * this other object would need a load-balance as a parent and hence just add
+ * an unnecessary indirection.
+ *
+ * It is also the object in the DP that represents a via-fib-entry in a recursive
+ * route.
+ *
+ */
+
+#ifndef __LOAD_BALANCE_H__
+#define __LOAD_BALANCE_H__
+
+#include <vlib/vlib.h>
+#include <vnet/ip/lookup.h>
+#include <vnet/dpo/dpo.h>
+#include <vnet/fib/fib_types.h>
+
+/**
+ * Load-balance main
+ */
+typedef struct load_balance_main_t_
+{
+    vlib_combined_counter_main_t lbm_to_counters;
+    vlib_combined_counter_main_t lbm_via_counters;
+} load_balance_main_t;
+
+extern load_balance_main_t load_balance_main;
+
+/**
+ * The number of buckets that a load-balance object can have and still
+ * fit in one cache-line
+ */
+#define LB_NUM_INLINE_BUCKETS 4
+
+/**
+ * @brief One path from an [EU]CMP set that the client wants to add to a
+ * load-balance object
+ */
+typedef struct load_balance_path_t_ {
+    /**
+     * ID of the Data-path object.
+     */
+    dpo_id_t path_dpo;
+
+    /**
+     * The index of the FIB path
+     */
+    fib_node_index_t path_index;
+
+    /**
+     * weight for the path.
+     */
+    u32 path_weight;
+} load_balance_path_t;
+
+/**
+ * The FIB DPO provieds;
+ *  - load-balancing over the next DPOs in the chain/graph
+ *  - per-route counters
+ */
+typedef struct load_balance_t_ {
+    /**
+     * number of buckets in the load-balance. always a power of 2.
+     */
+    u16 lb_n_buckets;
+    /**
+     * number of buckets in the load-balance - 1. used in the switch path
+     * as part of the hash calculation.
+     */
+    u16 lb_n_buckets_minus_1;
+
+   /**
+     * The protocol of packets that traverse this LB.
+     * need in combination with the flow hash config to determine how to hash.
+     * u8.
+     */
+    dpo_proto_t lb_proto;
+
+    /**
+     * The number of locks, which is approximately the number of users,
+     * of this load-balance.
+     * Load-balance objects of via-entries are heavily shared by recursives,
+     * so the lock count is a u32.
+     */
+    u32 lb_locks;
+
+    /**
+     * index of the load-balance map, INVALID if this LB does not use one
+     */
+    index_t lb_map;
+
+    /**
+     * This is the index of the uRPF list for this LB
+     */
+    index_t lb_urpf;
+
+    /**
+     * the hash config to use when selecting a bucket. this is a u16
+     */
+    flow_hash_config_t lb_hash_config;
+
+    /**
+     * Vector of buckets containing the next DPOs, sized as lbo_num
+     */
+    dpo_id_t *lb_buckets;
+
+    /**
+     * The rest of the cache line is used for buckets. In the common case
+     * where there there are less than 4 buckets, then the buckets are
+     * on the same cachlie and we save ourselves a pointer dereferance in 
+     * the data-path.
+     */
+    dpo_id_t lb_buckets_inline[LB_NUM_INLINE_BUCKETS];
+} load_balance_t;
+
+STATIC_ASSERT(sizeof(load_balance_t) <= CLIB_CACHE_LINE_BYTES,
+	      "A load_balance object size exceeds one cachline");
+
+/**
+ * Flags controlling load-balance formatting/display
+ */
+typedef enum load_balance_format_flags_t_ {
+    LOAD_BALANCE_FORMAT_NONE,
+    LOAD_BALANCE_FORMAT_DETAIL = (1 << 0),
+} load_balance_format_flags_t;
+
+/**
+ * Flags controlling load-balance creation and modification
+ */
+typedef enum load_balance_flags_t_ {
+    LOAD_BALANCE_FLAG_NONE = 0,
+    LOAD_BALANCE_FLAG_USES_MAP = (1 << 0),
+} load_balance_flags_t;
+
+extern index_t load_balance_create(u32 num_buckets,
+				   dpo_proto_t lb_proto,
+				   flow_hash_config_t fhc);
+extern void load_balance_multipath_update(
+    const dpo_id_t *dpo,
+    load_balance_path_t * raw_next_hops,
+    load_balance_flags_t flags);
+
+extern void load_balance_set_bucket(index_t lbi,
+				    u32 bucket,
+				    const dpo_id_t *next);
+extern void load_balance_set_urpf(index_t lbi,
+				  index_t urpf);
+extern index_t load_balance_get_urpf(index_t lbi);
+
+extern u8* format_load_balance(u8 * s, va_list * args);
+
+extern const dpo_id_t *load_balance_get_bucket(index_t lbi,
+					       u32 bucket);
+extern int load_balance_is_drop(const dpo_id_t *dpo);
+
+extern f64 load_balance_get_multipath_tolerance(void);
+
+/**
+ * The encapsulation breakages are for fast DP access
+ */
+extern load_balance_t *load_balance_pool;
+static inline load_balance_t*
+load_balance_get (index_t lbi)
+{
+    return (pool_elt_at_index(load_balance_pool, lbi));
+}
+
+#define LB_HAS_INLINE_BUCKETS(_lb)		\
+    ((_lb)->lb_n_buckets <= LB_NUM_INLINE_BUCKETS)
+
+static inline const dpo_id_t *
+load_balance_get_bucket_i (const load_balance_t *lb,
+			   u32 bucket)
+{
+    ASSERT(bucket < lb->lb_n_buckets);
+
+    if (PREDICT_TRUE(LB_HAS_INLINE_BUCKETS(lb)))
+    {
+	return (&lb->lb_buckets_inline[bucket]);
+    }
+    else
+    {
+	return (&lb->lb_buckets[bucket]);
+    }
+}
+
+extern void load_balance_module_init(void);
+
+#endif
diff --git a/src/vnet/dpo/load_balance_map.c b/src/vnet/dpo/load_balance_map.c
new file mode 100644
index 00000000..70ce1bf7
--- /dev/null
+++ b/src/vnet/dpo/load_balance_map.c
@@ -0,0 +1,575 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief
+ */
+#include <vnet/fib/fib_path.h>
+#include <vnet/fib/fib_node_list.h>
+#include <vnet/dpo/load_balance_map.h>
+#include <vnet/dpo/load_balance.h>
+
+/**
+ * A hash-table of load-balance maps by path index.
+ * this provides the fast lookup of the LB map when a path goes down
+ */
+static uword *lb_maps_by_path_index;
+
+/**
+ * A hash-table of load-balance maps by set of paths.
+ * This provides the LB map sharing.
+ * LB maps do not necessarily use all the paths in the list, since
+ * the entry that is requesting the map, may not have an out-going
+ * label for each of the paths.
+ */
+static uword *load_balance_map_db;
+
+typedef enum load_balance_map_path_flags_t_
+{
+    LOAD_BALANCE_MAP_PATH_UP     = (1 << 0),
+    LOAD_BALANCE_MAP_PATH_USABLE = (1 << 1),
+} __attribute__ ((packed)) load_balance_map_path_flags_t;
+
+typedef struct load_balance_map_path_t_ {
+    /**
+     * Index of the path
+     */
+    fib_node_index_t lbmp_index;
+
+    /**
+     * Sibling Index in the list of all maps with this path index
+     */
+    fib_node_index_t lbmp_sibling;
+
+    /**
+     * the normalised wegiht of the path
+     */
+    u32 lbmp_weight;
+
+    /**
+     * The sate of the path
+     */
+    load_balance_map_path_flags_t lbmp_flags;
+} load_balance_map_path_t;
+
+/**
+ * The global pool of LB maps
+ */
+load_balance_map_t *load_balance_map_pool;
+
+/*
+ * Debug macro
+ */
+#ifdef FIB_DEBUG
+#define LOAD_BALANCE_MAP_DBG(_pl, _fmt, _args...)       \
+    {                                                   \
+        clib_warning("lbm: FIXME" _fmt,                 \
+                     ##_args);                          \
+    }
+#else
+#define LOAD_BALANCE_MAP_DBG(_pl, _fmt, _args...)
+#endif
+
+static index_t
+load_balance_map_get_index (load_balance_map_t *lbm)
+{
+    return (lbm - load_balance_map_pool);
+}
+
+u8*
+format_load_balance_map (u8 *s, va_list ap)
+{
+    index_t lbmi = va_arg(ap, index_t);
+    u32 indent = va_arg(ap, u32);
+    load_balance_map_t *lbm;
+    u32 n_buckets, ii;
+
+    lbm = load_balance_map_get(lbmi);
+    n_buckets = vec_len(lbm->lbm_buckets);
+
+    s = format(s, "load-balance-map: index:%d buckets:%d", lbmi, n_buckets);
+    s = format(s, "\n%U index:", format_white_space, indent+2);
+    for (ii = 0; ii < n_buckets; ii++)
+    {
+        s = format(s, "%5d", ii);
+    }
+    s = format(s, "\n%U   map:", format_white_space, indent+2);
+    for (ii = 0; ii < n_buckets; ii++)
+    {
+        s = format(s, "%5d", lbm->lbm_buckets[ii]);
+    }
+
+    return (s);
+}
+
+
+static uword
+load_balance_map_hash (load_balance_map_t *lbm)
+{
+    u32 old_lbm_hash, new_lbm_hash, hash;
+    load_balance_map_path_t *lb_path;
+
+    new_lbm_hash = old_lbm_hash = vec_len(lbm->lbm_paths);
+
+    vec_foreach (lb_path, lbm->lbm_paths)
+    {
+        hash = lb_path->lbmp_index;
+        hash_mix32(hash, old_lbm_hash, new_lbm_hash);
+    }
+
+    return (new_lbm_hash);
+}
+
+always_inline uword
+load_balance_map_db_hash_key_from_index (uword index)
+{
+    return 1 + 2*index;
+}
+
+always_inline uword
+load_balance_map_db_hash_key_is_index (uword key)
+{
+    return key & 1;
+}
+
+always_inline uword
+load_balance_map_db_hash_key_2_index (uword key)
+{
+    ASSERT (load_balance_map_db_hash_key_is_index (key));
+    return key / 2;
+}
+
+static load_balance_map_t*
+load_balance_map_db_get_from_hash_key (uword key)
+{
+    load_balance_map_t *lbm;
+
+    if (load_balance_map_db_hash_key_is_index (key))
+    {
+        index_t lbm_index;
+
+        lbm_index = load_balance_map_db_hash_key_2_index(key);
+        lbm = load_balance_map_get(lbm_index);
+    }
+    else
+    {
+        lbm = uword_to_pointer (key, load_balance_map_t *);
+    }
+
+    return (lbm);
+}
+
+static uword
+load_balance_map_db_hash_key_sum (hash_t * h,
+                                  uword key)
+{
+    load_balance_map_t *lbm;
+
+    lbm = load_balance_map_db_get_from_hash_key(key);
+
+    return (load_balance_map_hash(lbm));
+}
+
+static uword
+load_balance_map_db_hash_key_equal (hash_t * h,
+                                    uword key1,
+                                    uword key2)
+{
+    load_balance_map_t *lbm1, *lbm2;
+
+    lbm1 = load_balance_map_db_get_from_hash_key(key1);
+    lbm2 = load_balance_map_db_get_from_hash_key(key2);
+
+    return (load_balance_map_hash(lbm1) ==
+            load_balance_map_hash(lbm2));
+}
+
+static index_t
+load_balance_map_db_find (load_balance_map_t *lbm)
+{
+    uword *p;
+
+    p = hash_get(load_balance_map_db, lbm);
+
+    if (NULL != p)
+    {
+        return p[0];
+    }
+
+    return (FIB_NODE_INDEX_INVALID);
+}
+
+static void
+load_balance_map_db_insert (load_balance_map_t *lbm)
+{
+    load_balance_map_path_t *lbmp;
+    fib_node_list_t list;
+    uword *p;
+
+    ASSERT(FIB_NODE_INDEX_INVALID == load_balance_map_db_find(lbm));
+
+    /*
+     * insert into the DB based on the set of paths.
+     */
+    hash_set (load_balance_map_db,
+              load_balance_map_db_hash_key_from_index(
+                  load_balance_map_get_index(lbm)),
+              load_balance_map_get_index(lbm));
+
+    /*
+     * insert into each per-path list.
+     */
+    vec_foreach(lbmp, lbm->lbm_paths)
+    {
+        p = hash_get(lb_maps_by_path_index, lbmp->lbmp_index);
+
+        if (NULL == p)
+        {
+            list = fib_node_list_create();
+            hash_set(lb_maps_by_path_index, lbmp->lbmp_index, list);
+        }
+        else
+        {
+            list = p[0];
+        }
+
+        lbmp->lbmp_sibling =
+            fib_node_list_push_front(list,
+                                     0, FIB_NODE_TYPE_FIRST,
+                                     load_balance_map_get_index(lbm));
+    }
+
+    LOAD_BALANCE_MAP_DBG(lbm, "DB-inserted");
+}
+
+static void
+load_balance_map_db_remove (load_balance_map_t *lbm)
+{
+    load_balance_map_path_t *lbmp;
+    uword *p;
+
+    ASSERT(FIB_NODE_INDEX_INVALID != load_balance_map_db_find(lbm));
+
+    hash_unset(load_balance_map_db,
+               load_balance_map_db_hash_key_from_index(
+                   load_balance_map_get_index(lbm)));
+
+    /*
+     * remove from each per-path list.
+     */
+    vec_foreach(lbmp, lbm->lbm_paths)
+    {
+        p = hash_get(lb_maps_by_path_index, lbmp->lbmp_index);
+
+        ASSERT(NULL != p);
+
+        fib_node_list_remove(p[0], lbmp->lbmp_sibling);
+    }
+
+    LOAD_BALANCE_MAP_DBG(lbm, "DB-removed");
+}
+
+/**
+ * @brief from the paths that are usable, fill the Map.
+ */
+static void
+load_balance_map_fill (load_balance_map_t *lbm)
+{
+    load_balance_map_path_t *lbmp;
+    u32 n_buckets, bucket, ii, jj;
+    u16 *tmp_buckets;
+
+    tmp_buckets = NULL;
+    n_buckets = vec_len(lbm->lbm_buckets);
+
+    /*
+     * run throught the set of paths once, and build a vector of the
+     * indices that are usable. we do this is a scratch space, since we
+     * need to refer to it multiple times as we build the real buckets.
+     */
+    vec_validate(tmp_buckets, n_buckets-1);
+
+    bucket = jj = 0;
+    vec_foreach (lbmp, lbm->lbm_paths)
+    {
+        if (fib_path_is_resolved(lbmp->lbmp_index))
+        {
+            for (ii = 0; ii < lbmp->lbmp_weight; ii++)
+            {
+                tmp_buckets[jj++] = bucket++;
+            }
+        }
+        else 
+        {
+            bucket += lbmp->lbmp_weight;
+        }
+    }
+    _vec_len(tmp_buckets) = jj;
+
+    /*
+     * If the number of temporaries written is as many as we need, implying
+     * all paths were up, then we can simply copy the scratch area over the
+     * actual buckets' memory
+     */
+    if (jj == n_buckets)
+    {
+        memcpy(lbm->lbm_buckets,
+               tmp_buckets,
+               sizeof(lbm->lbm_buckets[0]) * n_buckets);
+    }
+    else
+    {
+        /*
+         * one or more paths are down.
+         */
+        if (0 == vec_len(tmp_buckets))
+        {
+            /*
+             * if the scratch area is empty, then no paths are usable.
+             * they will all drop. so use them all, lest we account drops
+             * against only one.
+             */
+            for (bucket = 0; bucket < n_buckets; bucket++)
+            {
+                lbm->lbm_buckets[bucket] = bucket;
+            }
+        }
+        else
+        {
+            bucket = jj = 0;
+            vec_foreach (lbmp, lbm->lbm_paths)
+            {
+                if (fib_path_is_resolved(lbmp->lbmp_index))
+                {
+                    for (ii = 0; ii < lbmp->lbmp_weight; ii++)
+                    {
+                        lbm->lbm_buckets[bucket] = bucket;
+                        bucket++;
+                    }
+                }
+                else
+                {
+                    /*
+                     * path is unusable
+                     * cycle through the scratch space selecting a index.
+                     * this means we load balance, in the intended ratio,
+                     * over the paths that are still usable.
+                     */
+                    for (ii = 0; ii < lbmp->lbmp_weight; ii++)
+                    {
+                        lbm->lbm_buckets[bucket] = tmp_buckets[jj];
+                        jj = (jj + 1) % vec_len(tmp_buckets);
+                        bucket++;
+                    }
+                }
+            }
+       }
+    }
+
+    vec_free(tmp_buckets);
+}
+
+static load_balance_map_t*
+load_balance_map_alloc (const load_balance_path_t *paths)
+{
+    load_balance_map_t *lbm;
+    u32 ii;
+
+    pool_get_aligned(load_balance_map_pool, lbm, CLIB_CACHE_LINE_BYTES);
+    memset(lbm, 0, sizeof(*lbm));
+
+    vec_validate(lbm->lbm_paths, vec_len(paths)-1);
+
+    vec_foreach_index(ii, paths)
+    {
+        lbm->lbm_paths[ii].lbmp_index  = paths[ii].path_index;
+        lbm->lbm_paths[ii].lbmp_weight = paths[ii].path_weight;
+    }
+
+    return (lbm);
+}
+
+static load_balance_map_t *
+load_balance_map_init (load_balance_map_t *lbm,
+                       u32 n_buckets,
+                       u32 sum_of_weights)
+{
+    lbm->lbm_sum_of_norm_weights = sum_of_weights;
+    vec_validate(lbm->lbm_buckets, n_buckets-1);
+
+    load_balance_map_db_insert(lbm);
+
+    load_balance_map_fill(lbm);
+
+    return (lbm);
+}
+
+index_t
+load_balance_map_add_or_lock (u32 n_buckets,
+                              u32 sum_of_weights,
+                              const load_balance_path_t *paths)
+{
+    load_balance_map_t *tmp, *lbm;
+    index_t lbmi;
+
+    tmp = load_balance_map_alloc(paths);
+
+    lbmi = load_balance_map_db_find(tmp);
+
+    if (INDEX_INVALID == lbmi)
+    {
+        lbm = load_balance_map_init(tmp, n_buckets, sum_of_weights);
+    }
+    else
+    {
+        lbm = load_balance_map_get(lbmi);
+    }
+
+    lbm->lbm_locks++;
+
+    return (load_balance_map_get_index(lbm));
+}
+
+void
+load_balance_map_lock (index_t lbmi)
+{
+    load_balance_map_t *lbm;
+
+    lbm = load_balance_map_get(lbmi);
+
+    lbm->lbm_locks++;
+}
+
+void
+load_balance_map_unlock (index_t lbmi)
+{
+    load_balance_map_t *lbm;
+
+    if (INDEX_INVALID == lbmi)
+    {
+        return;
+    }
+
+    lbm = load_balance_map_get(lbmi);
+
+    lbm->lbm_locks--;
+
+    if (0 == lbm->lbm_locks)
+    {
+        load_balance_map_db_remove(lbm);
+        vec_free(lbm->lbm_paths);
+        vec_free(lbm->lbm_buckets);
+        pool_put(load_balance_map_pool, lbm);
+    }
+}
+
+static int
+load_balance_map_path_state_change_walk (fib_node_ptr_t *fptr,
+                                         void *ctx)
+{
+    load_balance_map_t *lbm;
+
+    lbm = load_balance_map_get(fptr->fnp_index);
+
+    load_balance_map_fill(lbm);
+
+    return (!0);
+}
+
+/**
+ * @brief the state of a path has changed (it has no doubt gone down).
+ * This is the trigger to perform a PIC edge cutover and update the maps
+ * to exclude this path.
+ */
+void
+load_balance_map_path_state_change (fib_node_index_t path_index)
+{
+    uword *p;
+
+    /*
+     * re-stripe the buckets for each affect MAP
+     */
+    p = hash_get(lb_maps_by_path_index, path_index);
+
+    if (NULL == p)
+        return;
+
+    fib_node_list_walk(p[0], load_balance_map_path_state_change_walk, NULL);
+}
+
+/**
+ * @brief Make/add a new or lock an existing Load-balance map
+ */
+void
+load_balance_map_module_init (void)
+{
+    load_balance_map_db =
+        hash_create2 (/* elts */ 0,
+                      /* user */ 0,
+                      /* value_bytes */ sizeof (index_t),
+                      load_balance_map_db_hash_key_sum,
+                      load_balance_map_db_hash_key_equal,
+                      /* format pair/arg */
+                      0, 0);
+
+    lb_maps_by_path_index = hash_create(0, sizeof(fib_node_list_t));
+}
+
+void
+load_balance_map_show_mem (void)
+{
+    fib_show_memory_usage("Load-Balance Map",
+			  pool_elts(load_balance_map_pool),
+			  pool_len(load_balance_map_pool),
+			  sizeof(load_balance_map_t));
+}
+
+static clib_error_t *
+load_balance_map_show (vlib_main_t * vm,
+                       unformat_input_t * input,
+                       vlib_cli_command_t * cmd)
+{
+    index_t lbmi = INDEX_INVALID;
+
+    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+        if (unformat (input, "%d", &lbmi))
+            ;
+        else
+            break;
+    }
+
+    if (INDEX_INVALID != lbmi)
+    {
+        vlib_cli_output (vm, "%U", format_load_balance_map, lbmi, 0);
+    }
+    else
+    {
+        load_balance_map_t *lbm;
+
+        pool_foreach(lbm, load_balance_map_pool,
+        ({
+            vlib_cli_output (vm, "%U", format_load_balance_map,
+                             load_balance_map_get_index(lbm), 0);
+        }));
+    }
+
+    return 0;
+}
+
+VLIB_CLI_COMMAND (load_balance_map_show_command, static) = {
+    .path = "show load-balance-map",
+    .short_help = "show load-balance-map [<index>]",
+    .function = load_balance_map_show,
+};
diff --git a/src/vnet/dpo/load_balance_map.h b/src/vnet/dpo/load_balance_map.h
new file mode 100644
index 00000000..454bf4b3
--- /dev/null
+++ b/src/vnet/dpo/load_balance_map.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief
+ */
+
+#ifndef __LOAD_BALANCE_MAP_H__
+#define __LOAD_BALANCE_MAP_H__
+
+#include <vlib/vlib.h>
+#include <vnet/fib/fib_types.h>
+#include <vnet/dpo/load_balance.h>
+
+struct load_balance_map_path_t_;
+
+/**
+ */
+typedef struct load_balance_map_t_ {
+    /**
+     * The buckets of the map that provide the index to index translation.
+     * In the first cacheline.
+     */
+    u16 *lbm_buckets;
+
+    /**
+     * the vector of paths this MAP represents
+     */
+    struct load_balance_map_path_t_ *lbm_paths;
+
+    /**
+     * the sum of the normalised weights. cache for convenience
+     */
+    u32 lbm_sum_of_norm_weights;
+
+    /**
+     * Number of locks. Maps are shared by a large number of recrusvie fib_entry_ts
+     */
+    u32 lbm_locks;
+} load_balance_map_t;
+
+extern index_t load_balance_map_add_or_lock(u32 n_buckets,
+                                            u32 sum_of_weights,
+                                            const load_balance_path_t *norm_paths);
+
+extern void load_balance_map_lock(index_t lmbi);
+extern void load_balance_map_unlock(index_t lbmi);
+
+extern void load_balance_map_path_state_change(fib_node_index_t path_index);
+
+extern u8* format_load_balance_map(u8 *s, va_list ap);
+extern void load_balance_map_show_mem(void);
+
+/**
+ * The encapsulation breakages are for fast DP access
+ */
+extern load_balance_map_t *load_balance_map_pool;
+
+static inline load_balance_map_t*
+load_balance_map_get (index_t lbmi)
+{
+    return (pool_elt_at_index(load_balance_map_pool, lbmi));
+}
+
+
+extern void load_balance_map_module_init(void);
+
+#endif
diff --git a/src/vnet/dpo/lookup_dpo.c b/src/vnet/dpo/lookup_dpo.c
new file mode 100644
index 00000000..96fedd27
--- /dev/null
+++ b/src/vnet/dpo/lookup_dpo.c
@@ -0,0 +1,1185 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/ip/ip.h>
+#include <vnet/dpo/lookup_dpo.h>
+#include <vnet/dpo/load_balance.h>
+#include <vnet/mpls/mpls.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/fib/mpls_fib.h>
+
+static const char *const lookup_input_names[] = LOOKUP_INPUTS;
+
+/**
+ * @brief Enumeration of the lookup subtypes
+ */
+typedef enum lookup_sub_type_t_
+{
+    LOOKUP_SUB_TYPE_SRC,
+    LOOKUP_SUB_TYPE_DST,
+    LOOKUP_SUB_TYPE_DST_TABLE_FROM_INTERFACE,
+} lookup_sub_type_t;
+#define LOOKUP_SUB_TYPE_NUM (LOOKUP_SUB_TYPE_DST_TABLE_FROM_INTERFACE+1)
+
+#define FOR_EACH_LOOKUP_SUB_TYPE(_st)                                   \
+    for (_st = LOOKUP_SUB_TYPE_IP4_SRC; _st < LOOKUP_SUB_TYPE_NUM; _st++)
+
+/**
+ * @brief pool of all MPLS Label DPOs
+ */
+lookup_dpo_t *lookup_dpo_pool;
+
+/**
+ * @brief An array of registered DPO type values for the sub-types
+ */
+static dpo_type_t lookup_dpo_sub_types[LOOKUP_SUB_TYPE_NUM];
+
+static lookup_dpo_t *
+lookup_dpo_alloc (void)
+{
+    lookup_dpo_t *lkd;
+
+    pool_get_aligned(lookup_dpo_pool, lkd, CLIB_CACHE_LINE_BYTES);
+
+    return (lkd);
+}
+
+static index_t
+lookup_dpo_get_index (lookup_dpo_t *lkd)
+{
+    return (lkd - lookup_dpo_pool);
+}
+
+static void
+lookup_dpo_add_or_lock_i (fib_node_index_t fib_index,
+                          dpo_proto_t proto,
+                          lookup_input_t input,
+                          lookup_table_t table_config,
+                          dpo_id_t *dpo)
+{
+    lookup_dpo_t *lkd;
+    dpo_type_t type;
+
+    lkd = lookup_dpo_alloc();
+    lkd->lkd_fib_index = fib_index;
+    lkd->lkd_proto = proto;
+    lkd->lkd_input = input;
+    lkd->lkd_table = table_config;
+
+    /*
+     * use the input type to select the lookup sub-type
+     */
+    type = 0;
+
+    switch (input)
+    {
+    case LOOKUP_INPUT_SRC_ADDR:
+        type = lookup_dpo_sub_types[LOOKUP_SUB_TYPE_SRC];
+        break;
+    case LOOKUP_INPUT_DST_ADDR:
+        switch (table_config)
+        {
+        case LOOKUP_TABLE_FROM_INPUT_INTERFACE:
+            type = lookup_dpo_sub_types[LOOKUP_SUB_TYPE_DST_TABLE_FROM_INTERFACE];
+            break;
+        case LOOKUP_TABLE_FROM_CONFIG:
+            type = lookup_dpo_sub_types[LOOKUP_SUB_TYPE_DST];
+            break;
+        }
+    }
+
+    if (0 == type)
+    {
+        dpo_reset(dpo);
+    }
+    else
+    {
+        dpo_set(dpo, type, proto, lookup_dpo_get_index(lkd));
+    }
+}
+
+void
+lookup_dpo_add_or_lock_w_fib_index (fib_node_index_t fib_index,
+                                    dpo_proto_t proto,
+                                    lookup_input_t input,
+                                    lookup_table_t table_config,
+                                    dpo_id_t *dpo)
+{
+    if (LOOKUP_TABLE_FROM_CONFIG == table_config)
+    {
+	fib_table_lock(fib_index, dpo_proto_to_fib(proto));
+    }
+    lookup_dpo_add_or_lock_i(fib_index, proto, input, table_config, dpo);
+}
+
+void
+lookup_dpo_add_or_lock_w_table_id (u32 table_id,
+                                   dpo_proto_t proto,
+                                   lookup_input_t input,
+                                   lookup_table_t table_config,
+                                   dpo_id_t *dpo)
+{
+    fib_node_index_t fib_index = FIB_NODE_INDEX_INVALID;
+
+    if (LOOKUP_TABLE_FROM_CONFIG == table_config)
+    {
+	fib_index =
+	    fib_table_find_or_create_and_lock(dpo_proto_to_fib(proto),
+					      table_id);
+    }
+
+    ASSERT(FIB_NODE_INDEX_INVALID != fib_index);
+    lookup_dpo_add_or_lock_i(fib_index, proto, input, table_config, dpo);    
+}
+
+u8*
+format_lookup_dpo (u8 *s, va_list *args)
+{
+    index_t index = va_arg (*args, index_t);
+    lookup_dpo_t *lkd;
+
+    lkd = lookup_dpo_get(index);
+
+    if (LOOKUP_TABLE_FROM_INPUT_INTERFACE == lkd->lkd_table)
+    {
+        s = format(s, "%s lookup in interface's %U table",
+                   lookup_input_names[lkd->lkd_input],
+                   format_dpo_proto, lkd->lkd_proto);
+    }
+    else
+    {
+	s = format(s, "%s lookup in %U",
+		   lookup_input_names[lkd->lkd_input],
+		   format_fib_table_name, lkd->lkd_fib_index,
+		   dpo_proto_to_fib(lkd->lkd_proto));
+    }
+    return (s);
+}
+
+static void
+lookup_dpo_lock (dpo_id_t *dpo)
+{
+    lookup_dpo_t *lkd;
+
+    lkd = lookup_dpo_get(dpo->dpoi_index);
+
+    lkd->lkd_locks++;
+}
+
+static void
+lookup_dpo_unlock (dpo_id_t *dpo)
+{
+    lookup_dpo_t *lkd;
+
+    lkd = lookup_dpo_get(dpo->dpoi_index);
+
+    lkd->lkd_locks--;
+
+    if (0 == lkd->lkd_locks)
+    {
+        if (LOOKUP_TABLE_FROM_CONFIG == lkd->lkd_table)
+        {
+	    fib_table_unlock(lkd->lkd_fib_index,
+			     dpo_proto_to_fib(lkd->lkd_proto));
+        }
+        pool_put(lookup_dpo_pool, lkd);
+    }
+}
+
+always_inline void
+ip4_src_fib_lookup_one (u32 src_fib_index0,
+                        const ip4_address_t * addr0,
+                        u32 * src_adj_index0)
+{
+    ip4_fib_mtrie_leaf_t leaf0, leaf1;
+    ip4_fib_mtrie_t * mtrie0;
+
+    mtrie0 = &ip4_fib_get (src_fib_index0)->mtrie;
+
+    leaf0 = leaf1 = IP4_FIB_MTRIE_LEAF_ROOT;
+    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 0);
+    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 1);
+    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 2);
+    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 3);
+
+    /* Handle default route. */
+    leaf0 = (leaf0 == IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie0->default_leaf : leaf0);
+    src_adj_index0[0] = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
+}
+
+always_inline void
+ip4_src_fib_lookup_two (u32 src_fib_index0,
+                        u32 src_fib_index1,
+                        const ip4_address_t * addr0,
+                        const ip4_address_t * addr1,
+                        u32 * src_adj_index0,
+                        u32 * src_adj_index1)
+{
+    ip4_fib_mtrie_leaf_t leaf0, leaf1;
+    ip4_fib_mtrie_t * mtrie0, * mtrie1;
+
+    mtrie0 = &ip4_fib_get (src_fib_index0)->mtrie;
+    mtrie1 = &ip4_fib_get (src_fib_index1)->mtrie;
+
+    leaf0 = leaf1 = IP4_FIB_MTRIE_LEAF_ROOT;
+
+    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 0);
+    leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, addr1, 0);
+
+    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 1);
+    leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, addr1, 1);
+
+    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 2);
+    leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, addr1, 2);
+
+    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 3);
+    leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, addr1, 3);
+
+    /* Handle default route. */
+    leaf0 = (leaf0 == IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie0->default_leaf : leaf0);
+    leaf1 = (leaf1 == IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie1->default_leaf : leaf1);
+    src_adj_index0[0] = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
+    src_adj_index1[0] = ip4_fib_mtrie_leaf_get_adj_index (leaf1);
+}
+
+/**
+ * @brief Lookup trace  data
+ */
+typedef struct lookup_trace_t_
+{
+    union {
+	ip46_address_t addr;
+	mpls_unicast_header_t hdr;
+    };
+    fib_node_index_t fib_index;
+    index_t lbi;
+} lookup_trace_t;
+
+
+always_inline uword
+lookup_dpo_ip4_inline (vlib_main_t * vm,
+                       vlib_node_runtime_t * node,
+                       vlib_frame_t * from_frame,
+                       int input_src_addr,
+                       int table_from_interface)
+{
+    u32 n_left_from, next_index, * from, * to_next;
+    u32 cpu_index = os_get_cpu_number();
+    vlib_combined_counter_main_t * cm = &load_balance_main.lbm_to_counters;
+
+    from = vlib_frame_vector_args (from_frame);
+    n_left_from = from_frame->n_vectors;
+
+    next_index = node->cached_next_index;
+
+    while (n_left_from > 0)
+    {
+        u32 n_left_to_next;
+
+        vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
+
+	while (n_left_from >= 4 && n_left_to_next > 2)
+	{
+	    u32 bi0, lkdi0, lbi0, fib_index0, next0, hash_c0;
+	    flow_hash_config_t flow_hash_config0;
+	    const ip4_address_t *input_addr0;
+	    const load_balance_t *lb0;
+	    const lookup_dpo_t * lkd0;
+	    const ip4_header_t * ip0;
+	    const dpo_id_t *dpo0;
+	    vlib_buffer_t * b0;
+	    u32 bi1, lkdi1, lbi1, fib_index1, next1, hash_c1;
+	    flow_hash_config_t flow_hash_config1;
+	    const ip4_address_t *input_addr1;
+	    const load_balance_t *lb1;
+	    const lookup_dpo_t * lkd1;
+	    const ip4_header_t * ip1;
+	    const dpo_id_t *dpo1;
+	    vlib_buffer_t * b1;
+
+	    /* Prefetch next iteration. */
+	    {
+		vlib_buffer_t * p2, * p3;
+
+		p2 = vlib_get_buffer (vm, from[2]);
+		p3 = vlib_get_buffer (vm, from[3]);
+
+		vlib_prefetch_buffer_header (p2, LOAD);
+		vlib_prefetch_buffer_header (p3, LOAD);
+
+		CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+		CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    }
+
+	    bi0 = from[0];
+	    to_next[0] = bi0;
+	    bi1 = from[1];
+	    to_next[1] = bi1;
+	    from += 2;
+	    to_next += 2;
+	    n_left_from -= 2;
+	    n_left_to_next -= 2;
+
+	    b0 = vlib_get_buffer (vm, bi0);
+	    ip0 = vlib_buffer_get_current (b0);
+	    b1 = vlib_get_buffer (vm, bi1);
+	    ip1 = vlib_buffer_get_current (b1);
+
+	    /* dst lookup was done by ip4 lookup */
+	    lkdi0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
+	    lkdi1 = vnet_buffer(b1)->ip.adj_index[VLIB_TX];
+	    lkd0 = lookup_dpo_get(lkdi0);
+	    lkd1 = lookup_dpo_get(lkdi1);
+
+	    /*
+	     * choose between a lookup using the fib index in the DPO
+	     * or getting the FIB index from the interface.
+	     */
+	    if (table_from_interface)
+	    {
+		fib_index0 =
+		    ip4_fib_table_get_index_for_sw_if_index(
+			vnet_buffer(b0)->sw_if_index[VLIB_RX]);
+		fib_index1 =
+		    ip4_fib_table_get_index_for_sw_if_index(
+			vnet_buffer(b1)->sw_if_index[VLIB_RX]);
+	    }
+	    else
+	    {
+		fib_index0 = lkd0->lkd_fib_index;
+		fib_index1 = lkd1->lkd_fib_index;
+	    }
+
+	    /*
+	     * choose between a source or destination address lookup in the table
+	     */
+	    if (input_src_addr)
+	    {
+		input_addr0 = &ip0->src_address;
+		input_addr1 = &ip1->src_address;
+	    }
+	    else
+	    {
+		input_addr0 = &ip0->dst_address;
+		input_addr1 = &ip1->dst_address;
+	    }
+
+	    /* do lookup */
+	    ip4_src_fib_lookup_two (fib_index0, fib_index1,
+                                    input_addr0, input_addr1,
+                                    &lbi0, &lbi1);
+	    lb0 = load_balance_get(lbi0);
+	    lb1 = load_balance_get(lbi1);
+
+            vnet_buffer(b0)->sw_if_index[VLIB_TX] = fib_index0;
+            vnet_buffer(b1)->sw_if_index[VLIB_TX] = fib_index1;
+
+	    /* Use flow hash to compute multipath adjacency. */
+	    hash_c0 = vnet_buffer (b0)->ip.flow_hash = 0;
+	    hash_c1 = vnet_buffer (b1)->ip.flow_hash = 0;
+
+	    if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
+	    {
+		flow_hash_config0 = lb0->lb_hash_config;
+		hash_c0 = vnet_buffer (b0)->ip.flow_hash =
+		    ip4_compute_flow_hash (ip0, flow_hash_config0);
+	    }
+
+	    if (PREDICT_FALSE (lb1->lb_n_buckets > 1))
+	    {
+		flow_hash_config1 = lb1->lb_hash_config;
+		hash_c1 = vnet_buffer (b1)->ip.flow_hash =
+		    ip4_compute_flow_hash (ip1, flow_hash_config1);
+	    }
+
+	    dpo0 = load_balance_get_bucket_i(lb0,
+					     (hash_c0 &
+					      (lb0->lb_n_buckets_minus_1)));
+	    dpo1 = load_balance_get_bucket_i(lb1,
+					     (hash_c1 &
+					      (lb1->lb_n_buckets_minus_1)));
+
+	    next0 = dpo0->dpoi_next_node;
+	    next1 = dpo1->dpoi_next_node;
+	    vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+	    vnet_buffer(b1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
+
+	    vlib_increment_combined_counter
+		(cm, cpu_index, lbi0, 1,
+		 vlib_buffer_length_in_chain (vm, b0));
+	    vlib_increment_combined_counter
+		(cm, cpu_index, lbi1, 1,
+		 vlib_buffer_length_in_chain (vm, b1));
+
+	    if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+		lookup_trace_t *tr = vlib_add_trace (vm, node,
+						     b0, sizeof (*tr));
+		tr->fib_index = fib_index0;
+		tr->lbi = lbi0;
+		tr->addr.ip4 = *input_addr0;
+	    }
+	    if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+		lookup_trace_t *tr = vlib_add_trace (vm, node,
+						     b1, sizeof (*tr));
+		tr->fib_index = fib_index1;
+		tr->lbi = lbi1;
+		tr->addr.ip4 = *input_addr1;
+	    }
+
+	    vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					     to_next, n_left_to_next,
+					     bi0, bi1, next0, next1);
+	}
+
+	while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	    u32 bi0, lkdi0, lbi0, fib_index0, next0, hash_c0;
+	    flow_hash_config_t flow_hash_config0;
+	    const ip4_address_t *input_addr;
+	    const load_balance_t *lb0;
+	    const lookup_dpo_t * lkd0;
+	    const ip4_header_t * ip0;
+	    const dpo_id_t *dpo0;
+	    vlib_buffer_t * b0;
+
+	    bi0 = from[0];
+	    to_next[0] = bi0;
+	    from += 1;
+	    to_next += 1;
+	    n_left_from -= 1;
+	    n_left_to_next -= 1;
+
+	    b0 = vlib_get_buffer (vm, bi0);
+	    ip0 = vlib_buffer_get_current (b0);
+
+	    /* dst lookup was done by ip4 lookup */
+	    lkdi0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
+	    lkd0 = lookup_dpo_get(lkdi0);
+
+	    /*
+	     * choose between a lookup using the fib index in the DPO
+	     * or getting the FIB index from the interface.
+	     */
+	    if (table_from_interface)
+	    {
+		fib_index0 =
+		    ip4_fib_table_get_index_for_sw_if_index(
+			vnet_buffer(b0)->sw_if_index[VLIB_RX]);
+	    }
+	    else
+	    {
+		fib_index0 = lkd0->lkd_fib_index;
+	    }
+
+	    /*
+	     * choose between a source or destination address lookup in the table
+	     */
+	    if (input_src_addr)
+	    {
+		input_addr = &ip0->src_address;
+	    }
+	    else
+	    {
+		input_addr = &ip0->dst_address;
+	    }
+
+	    /* do lookup */
+	    ip4_src_fib_lookup_one (fib_index0, input_addr, &lbi0);
+	    lb0 = load_balance_get(lbi0);
+
+            vnet_buffer(b0)->sw_if_index[VLIB_TX] = fib_index0;
+
+	    /* Use flow hash to compute multipath adjacency. */
+	    hash_c0 = vnet_buffer (b0)->ip.flow_hash = 0;
+
+	    if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
+	    {
+		flow_hash_config0 = lb0->lb_hash_config;
+		hash_c0 = vnet_buffer (b0)->ip.flow_hash =
+		    ip4_compute_flow_hash (ip0, flow_hash_config0);
+	    }
+
+	    dpo0 = load_balance_get_bucket_i(lb0,
+					     (hash_c0 &
+					      (lb0->lb_n_buckets_minus_1)));
+
+	    next0 = dpo0->dpoi_next_node;
+	    vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+
+	    vlib_increment_combined_counter
+		(cm, cpu_index, lbi0, 1,
+		 vlib_buffer_length_in_chain (vm, b0));
+
+	    if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+		lookup_trace_t *tr = vlib_add_trace (vm, node,
+						     b0, sizeof (*tr));
+		tr->fib_index = fib_index0;
+		tr->lbi = lbi0;
+		tr->addr.ip4 = *input_addr;
+	    }
+
+	    vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
+					    n_left_to_next, bi0, next0);
+	}
+        vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+    return from_frame->n_vectors;
+}
+
+static u8 *
+format_lookup_trace (u8 * s, va_list * args)
+{
+    CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+    CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+    lookup_trace_t * t = va_arg (*args, lookup_trace_t *);
+    uword indent = format_get_indent (s);
+    s = format (s, "%U fib-index:%d addr:%U load-balance:%d",
+                format_white_space, indent,
+                t->fib_index,
+                format_ip46_address, &t->addr, IP46_TYPE_ANY,
+                t->lbi);
+    return s;
+}
+
+always_inline uword
+lookup_ip4_dst (vlib_main_t * vm,
+                vlib_node_runtime_t * node,
+                vlib_frame_t * from_frame)
+{
+    return (lookup_dpo_ip4_inline(vm, node, from_frame, 0, 0));
+}
+
+VLIB_REGISTER_NODE (lookup_ip4_dst_node) = {
+    .function = lookup_ip4_dst,
+    .name = "lookup-ip4-dst",
+    .vector_size = sizeof (u32),
+    .sibling_of = "ip4-lookup",
+    .format_trace = format_lookup_trace,
+};
+VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip4_dst_node, lookup_ip4_dst)
+
+always_inline uword
+lookup_ip4_dst_itf (vlib_main_t * vm,
+                    vlib_node_runtime_t * node,
+                    vlib_frame_t * from_frame)
+{
+    return (lookup_dpo_ip4_inline(vm, node, from_frame, 0, 1));
+}
+
+VLIB_REGISTER_NODE (lookup_ip4_dst_itf_node) = {
+    .function = lookup_ip4_dst_itf,
+    .name = "lookup-ip4-dst-itf",
+    .vector_size = sizeof (u32),
+    .sibling_of = "ip4-lookup",
+    .format_trace = format_lookup_trace,
+};
+VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip4_dst_itf_node, lookup_ip4_dst_itf)
+
+always_inline uword
+lookup_ip4_src (vlib_main_t * vm,
+                vlib_node_runtime_t * node,
+                vlib_frame_t * from_frame)
+{
+    return (lookup_dpo_ip4_inline(vm, node, from_frame, 1, 0));
+}
+
+VLIB_REGISTER_NODE (lookup_ip4_src_node) = {
+    .function = lookup_ip4_src,
+    .name = "lookup-ip4-src",
+    .vector_size = sizeof (u32),
+    .format_trace = format_lookup_trace,
+    .sibling_of = "ip4-lookup",
+};
+VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip4_src_node, lookup_ip4_src)
+
+always_inline uword
+lookup_dpo_ip6_inline (vlib_main_t * vm,
+                       vlib_node_runtime_t * node,
+                       vlib_frame_t * from_frame,
+                       int input_src_addr,
+                       int table_from_interface)
+{
+    vlib_combined_counter_main_t * cm = &load_balance_main.lbm_to_counters;
+    u32 n_left_from, next_index, * from, * to_next;
+    u32 cpu_index = os_get_cpu_number();
+
+    from = vlib_frame_vector_args (from_frame);
+    n_left_from = from_frame->n_vectors;
+
+    next_index = node->cached_next_index;
+
+    while (n_left_from > 0)
+    {
+        u32 n_left_to_next;
+
+        vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
+
+	while (n_left_from >= 4 && n_left_to_next > 2)
+	{
+	    u32 bi0, lkdi0, lbi0, fib_index0, next0, hash_c0;
+	    flow_hash_config_t flow_hash_config0;
+	    const ip6_address_t *input_addr0;
+	    const load_balance_t *lb0;
+	    const lookup_dpo_t * lkd0;
+	    const ip6_header_t * ip0;
+	    const dpo_id_t *dpo0;
+	    vlib_buffer_t * b0;
+	    u32 bi1, lkdi1, lbi1, fib_index1, next1, hash_c1;
+	    flow_hash_config_t flow_hash_config1;
+	    const ip6_address_t *input_addr1;
+	    const load_balance_t *lb1;
+	    const lookup_dpo_t * lkd1;
+	    const ip6_header_t * ip1;
+	    const dpo_id_t *dpo1;
+	    vlib_buffer_t * b1;
+
+	    /* Prefetch next iteration. */
+	    {
+		vlib_buffer_t * p2, * p3;
+
+		p2 = vlib_get_buffer (vm, from[2]);
+		p3 = vlib_get_buffer (vm, from[3]);
+
+		vlib_prefetch_buffer_header (p2, LOAD);
+		vlib_prefetch_buffer_header (p3, LOAD);
+
+		CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+		CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    }
+
+	    bi0 = from[0];
+	    to_next[0] = bi0;
+	    bi1 = from[1];
+	    to_next[1] = bi1;
+	    from += 2;
+	    to_next += 2;
+	    n_left_from -= 2;
+	    n_left_to_next -= 2;
+
+	    b0 = vlib_get_buffer (vm, bi0);
+	    ip0 = vlib_buffer_get_current (b0);
+	    b1 = vlib_get_buffer (vm, bi1);
+	    ip1 = vlib_buffer_get_current (b1);
+
+	    /* dst lookup was done by ip6 lookup */
+	    lkdi0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
+	    lkdi1 = vnet_buffer(b1)->ip.adj_index[VLIB_TX];
+	    lkd0 = lookup_dpo_get(lkdi0);
+	    lkd1 = lookup_dpo_get(lkdi1);
+
+	    /*
+	     * choose between a lookup using the fib index in the DPO
+	     * or getting the FIB index from the interface.
+	     */
+	    if (table_from_interface)
+	    {
+		fib_index0 =
+		    ip6_fib_table_get_index_for_sw_if_index(
+			vnet_buffer(b0)->sw_if_index[VLIB_RX]);
+		fib_index1 =
+		    ip6_fib_table_get_index_for_sw_if_index(
+			vnet_buffer(b1)->sw_if_index[VLIB_RX]);
+	    }
+	    else
+	    {
+		fib_index0 = lkd0->lkd_fib_index;
+		fib_index1 = lkd1->lkd_fib_index;
+	    }
+
+	    /*
+	     * choose between a source or destination address lookup in the table
+	     */
+	    if (input_src_addr)
+	    {
+		input_addr0 = &ip0->src_address;
+		input_addr1 = &ip1->src_address;
+	    }
+	    else
+	    {
+		input_addr0 = &ip0->dst_address;
+		input_addr1 = &ip1->dst_address;
+	    }
+
+	    /* do src lookup */
+	    lbi0 = ip6_fib_table_fwding_lookup(&ip6_main,
+					       fib_index0,
+					       input_addr0);
+	    lbi1 = ip6_fib_table_fwding_lookup(&ip6_main,
+					       fib_index1,
+					       input_addr1);
+	    lb0 = load_balance_get(lbi0);
+	    lb1 = load_balance_get(lbi1);
+
+            vnet_buffer(b0)->sw_if_index[VLIB_TX] = fib_index0;
+            vnet_buffer(b1)->sw_if_index[VLIB_TX] = fib_index1;
+
+	    /* Use flow hash to compute multipath adjacency. */
+	    hash_c0 = vnet_buffer (b0)->ip.flow_hash = 0;
+	    hash_c1 = vnet_buffer (b1)->ip.flow_hash = 0;
+
+	    if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
+	    {
+		flow_hash_config0 = lb0->lb_hash_config;
+		hash_c0 = vnet_buffer (b0)->ip.flow_hash =
+		    ip6_compute_flow_hash (ip0, flow_hash_config0);
+	    }
+
+	    if (PREDICT_FALSE (lb1->lb_n_buckets > 1))
+	    {
+		flow_hash_config1 = lb1->lb_hash_config;
+		hash_c1 = vnet_buffer (b1)->ip.flow_hash =
+		    ip6_compute_flow_hash (ip1, flow_hash_config1);
+	    }
+
+	    dpo0 = load_balance_get_bucket_i(lb0,
+					     (hash_c0 &
+					      (lb0->lb_n_buckets_minus_1)));
+	    dpo1 = load_balance_get_bucket_i(lb1,
+					     (hash_c1 &
+					      (lb1->lb_n_buckets_minus_1)));
+
+	    next0 = dpo0->dpoi_next_node;
+	    next1 = dpo1->dpoi_next_node;
+	    vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+	    vnet_buffer(b1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
+
+	    vlib_increment_combined_counter
+		(cm, cpu_index, lbi0, 1,
+		 vlib_buffer_length_in_chain (vm, b0));
+	    vlib_increment_combined_counter
+		(cm, cpu_index, lbi1, 1,
+		 vlib_buffer_length_in_chain (vm, b1));
+
+	    if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+		lookup_trace_t *tr = vlib_add_trace (vm, node,
+						     b0, sizeof (*tr));
+		tr->fib_index = fib_index0;
+		tr->lbi = lbi0;
+		tr->addr.ip6 = *input_addr0;
+	    }
+	    if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+		lookup_trace_t *tr = vlib_add_trace (vm, node,
+						     b1, sizeof (*tr));
+		tr->fib_index = fib_index1;
+		tr->lbi = lbi1;
+		tr->addr.ip6 = *input_addr1;
+	    }
+	    vlib_validate_buffer_enqueue_x2(vm, node, next_index, to_next,
+					    n_left_to_next, bi0, bi1,
+					    next0, next1);
+	}
+	while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	    u32 bi0, lkdi0, lbi0, fib_index0, next0, hash_c0;
+	    flow_hash_config_t flow_hash_config0;
+	    const ip6_address_t *input_addr0;
+	    const load_balance_t *lb0;
+	    const lookup_dpo_t * lkd0;
+	    const ip6_header_t * ip0;
+	    const dpo_id_t *dpo0;
+	    vlib_buffer_t * b0;
+
+	    bi0 = from[0];
+	    to_next[0] = bi0;
+	    from += 1;
+	    to_next += 1;
+	    n_left_from -= 1;
+	    n_left_to_next -= 1;
+
+	    b0 = vlib_get_buffer (vm, bi0);
+	    ip0 = vlib_buffer_get_current (b0);
+
+	    /* dst lookup was done by ip6 lookup */
+	    lkdi0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
+	    lkd0 = lookup_dpo_get(lkdi0);
+
+	    /*
+	     * choose between a lookup using the fib index in the DPO
+	     * or getting the FIB index from the interface.
+	     */
+	    if (table_from_interface)
+	    {
+		fib_index0 =
+		    ip6_fib_table_get_index_for_sw_if_index(
+			vnet_buffer(b0)->sw_if_index[VLIB_RX]);
+	    }
+	    else
+	    {
+		fib_index0 = lkd0->lkd_fib_index;
+	    }
+
+	    /*
+	     * choose between a source or destination address lookup in the table
+	     */
+	    if (input_src_addr)
+	    {
+		input_addr0 = &ip0->src_address;
+	    }
+	    else
+	    {
+		input_addr0 = &ip0->dst_address;
+	    }
+
+	    /* do src lookup */
+	    lbi0 = ip6_fib_table_fwding_lookup(&ip6_main,
+					       fib_index0,
+					       input_addr0);
+	    lb0 = load_balance_get(lbi0);
+
+            vnet_buffer(b0)->sw_if_index[VLIB_TX] = fib_index0;
+
+	    /* Use flow hash to compute multipath adjacency. */
+	    hash_c0 = vnet_buffer (b0)->ip.flow_hash = 0;
+
+	    if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
+	    {
+		flow_hash_config0 = lb0->lb_hash_config;
+		hash_c0 = vnet_buffer (b0)->ip.flow_hash =
+		    ip6_compute_flow_hash (ip0, flow_hash_config0);
+	    }
+
+	    dpo0 = load_balance_get_bucket_i(lb0,
+					     (hash_c0 &
+					      (lb0->lb_n_buckets_minus_1)));
+
+	    next0 = dpo0->dpoi_next_node;
+	    vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+
+	    vlib_increment_combined_counter
+		(cm, cpu_index, lbi0, 1,
+		 vlib_buffer_length_in_chain (vm, b0));
+
+	    if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+		lookup_trace_t *tr = vlib_add_trace (vm, node,
+						     b0, sizeof (*tr));
+		tr->fib_index = fib_index0;
+		tr->lbi = lbi0;
+		tr->addr.ip6 = *input_addr0;
+	    }
+	    vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
+					    n_left_to_next, bi0, next0);
+	}
+        vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+    return from_frame->n_vectors;
+}
+
+always_inline uword
+lookup_ip6_dst (vlib_main_t * vm,
+                vlib_node_runtime_t * node,
+                vlib_frame_t * from_frame)
+{
+    return (lookup_dpo_ip6_inline(vm, node, from_frame, 0 /*use src*/, 0));
+}
+
+VLIB_REGISTER_NODE (lookup_ip6_dst_node) = {
+    .function = lookup_ip6_dst,
+    .name = "lookup-ip6-dst",
+    .vector_size = sizeof (u32),
+    .format_trace = format_lookup_trace,
+    .sibling_of = "ip6-lookup",
+};
+VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip6_dst_node, lookup_ip6_dst)
+
+always_inline uword
+lookup_ip6_dst_itf (vlib_main_t * vm,
+		    vlib_node_runtime_t * node,
+		    vlib_frame_t * from_frame)
+{
+    return (lookup_dpo_ip6_inline(vm, node, from_frame, 0 /*use src*/, 1));
+}
+
+VLIB_REGISTER_NODE (lookup_ip6_dst_itf_node) = {
+    .function = lookup_ip6_dst_itf,
+    .name = "lookup-ip6-dst-itf",
+    .vector_size = sizeof (u32),
+    .format_trace = format_lookup_trace,
+    .sibling_of = "ip6-lookup",
+};
+VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip6_dst_itf_node, lookup_ip6_dst_itf)
+
+always_inline uword
+lookup_ip6_src (vlib_main_t * vm,
+                vlib_node_runtime_t * node,
+                vlib_frame_t * from_frame)
+{
+    return (lookup_dpo_ip6_inline(vm, node, from_frame, 1, 0));
+}
+
+VLIB_REGISTER_NODE (lookup_ip6_src_node) = {
+    .function = lookup_ip6_src,
+    .name = "lookup-ip6-src",
+    .vector_size = sizeof (u32),
+    .format_trace = format_lookup_trace,
+    .sibling_of = "ip6-lookup",
+};
+VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip6_src_node, lookup_ip6_src)
+
+always_inline uword
+lookup_dpo_mpls_inline (vlib_main_t * vm,
+                       vlib_node_runtime_t * node,
+                       vlib_frame_t * from_frame,
+                       int table_from_interface)
+{
+    u32 n_left_from, next_index, * from, * to_next;
+    u32 cpu_index = os_get_cpu_number();
+    vlib_combined_counter_main_t * cm = &load_balance_main.lbm_to_counters;
+
+    from = vlib_frame_vector_args (from_frame);
+    n_left_from = from_frame->n_vectors;
+
+    next_index = node->cached_next_index;
+
+    while (n_left_from > 0)
+    {
+        u32 n_left_to_next;
+
+        vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
+
+        /* while (n_left_from >= 4 && n_left_to_next >= 2) */
+        /*   } */
+
+        while (n_left_from > 0 && n_left_to_next > 0)
+        {
+            u32 bi0, lkdi0, lbi0, fib_index0,  next0;
+            const mpls_unicast_header_t * hdr0;
+            const load_balance_t *lb0;
+            const lookup_dpo_t * lkd0;
+            const dpo_id_t *dpo0;
+            vlib_buffer_t * b0;
+
+            bi0 = from[0];
+            to_next[0] = bi0;
+            from += 1;
+            to_next += 1;
+            n_left_from -= 1;
+            n_left_to_next -= 1;
+
+            b0 = vlib_get_buffer (vm, bi0);
+            hdr0 = vlib_buffer_get_current (b0);
+
+            /* dst lookup was done by mpls lookup */
+            lkdi0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
+            lkd0 = lookup_dpo_get(lkdi0);
+
+            /*
+             * choose between a lookup using the fib index in the DPO
+             * or getting the FIB index from the interface.
+             */
+            if (table_from_interface)
+            {
+                fib_index0 = 
+                    mpls_fib_table_get_index_for_sw_if_index(
+                        vnet_buffer(b0)->sw_if_index[VLIB_RX]);
+            }
+            else
+            {
+                fib_index0 = lkd0->lkd_fib_index;
+            }
+
+            /* do lookup */
+            lbi0 = mpls_fib_table_forwarding_lookup (fib_index0, hdr0);
+            lb0  = load_balance_get(lbi0);
+            dpo0 = load_balance_get_bucket_i(lb0, 0);
+
+            next0 = dpo0->dpoi_next_node;
+            vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+
+            vlib_increment_combined_counter
+                (cm, cpu_index, lbi0, 1,
+                 vlib_buffer_length_in_chain (vm, b0));
+
+	    if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
+            {
+                lookup_trace_t *tr = vlib_add_trace (vm, node, 
+                                                     b0, sizeof (*tr));
+                tr->fib_index = fib_index0;
+                tr->lbi = lbi0;
+                tr->hdr = *hdr0;
+            }
+
+           vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
+                                            n_left_to_next, bi0, next0);
+        }
+        vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+    return from_frame->n_vectors;
+}
+
+static u8 *
+format_lookup_mpls_trace (u8 * s, va_list * args)
+{
+    CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+    CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+    lookup_trace_t * t = va_arg (*args, lookup_trace_t *);
+    uword indent = format_get_indent (s);
+    mpls_unicast_header_t hdr;
+
+    hdr.label_exp_s_ttl = clib_net_to_host_u32(t->hdr.label_exp_s_ttl);
+
+    s = format (s, "%U fib-index:%d hdr:%U load-balance:%d",
+                format_white_space, indent,
+                t->fib_index,
+                format_mpls_header, hdr,
+                t->lbi);
+    return s;
+}
+
+always_inline uword
+lookup_mpls_dst (vlib_main_t * vm,
+                vlib_node_runtime_t * node,
+                vlib_frame_t * from_frame)
+{
+    return (lookup_dpo_mpls_inline(vm, node, from_frame, 0));
+}
+
+VLIB_REGISTER_NODE (lookup_mpls_dst_node) = {
+    .function = lookup_mpls_dst,
+    .name = "lookup-mpls-dst",
+    .vector_size = sizeof (u32),
+    .sibling_of = "mpls-lookup",
+    .format_trace = format_lookup_mpls_trace,
+    .n_next_nodes = 0,
+};
+VLIB_NODE_FUNCTION_MULTIARCH (lookup_mpls_dst_node, lookup_mpls_dst)
+
+always_inline uword
+lookup_mpls_dst_itf (vlib_main_t * vm,
+                    vlib_node_runtime_t * node,
+                    vlib_frame_t * from_frame)
+{
+    return (lookup_dpo_mpls_inline(vm, node, from_frame, 1));
+}
+
+VLIB_REGISTER_NODE (lookup_mpls_dst_itf_node) = {
+    .function = lookup_mpls_dst_itf,
+    .name = "lookup-mpls-dst-itf",
+    .vector_size = sizeof (u32),
+    .sibling_of = "mpls-lookup",
+    .format_trace = format_lookup_mpls_trace,
+    .n_next_nodes = 0,
+};
+VLIB_NODE_FUNCTION_MULTIARCH (lookup_mpls_dst_itf_node, lookup_mpls_dst_itf)
+
+static void
+lookup_dpo_mem_show (void)
+{
+    fib_show_memory_usage("Lookup",
+			  pool_elts(lookup_dpo_pool),
+			  pool_len(lookup_dpo_pool),
+			  sizeof(lookup_dpo_t));
+}
+
+const static dpo_vft_t lkd_vft = {
+    .dv_lock = lookup_dpo_lock,
+    .dv_unlock = lookup_dpo_unlock,
+    .dv_format = format_lookup_dpo,
+};
+const static dpo_vft_t lkd_vft_w_mem_show = {
+    .dv_lock = lookup_dpo_lock,
+    .dv_unlock = lookup_dpo_unlock,
+    .dv_format = format_lookup_dpo,
+    .dv_mem_show = lookup_dpo_mem_show,
+};
+
+const static char* const lookup_src_ip4_nodes[] =
+{
+    "lookup-ip4-src",
+    NULL,
+};
+const static char* const lookup_src_ip6_nodes[] =
+{
+    "lookup-ip6-src",
+    NULL,
+};
+const static char* const * const lookup_src_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = lookup_src_ip4_nodes,
+    [DPO_PROTO_IP6]  = lookup_src_ip6_nodes,
+    [DPO_PROTO_MPLS] = NULL,
+};
+
+const static char* const lookup_dst_ip4_nodes[] =
+{
+    "lookup-ip4-dst",
+    NULL,
+};
+const static char* const lookup_dst_ip6_nodes[] =
+{
+    "lookup-ip6-dst",
+    NULL,
+};
+const static char* const lookup_dst_mpls_nodes[] =
+{
+    "lookup-mpls-dst",
+    NULL,
+};
+const static char* const * const lookup_dst_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = lookup_dst_ip4_nodes,
+    [DPO_PROTO_IP6]  = lookup_dst_ip6_nodes,
+    [DPO_PROTO_MPLS] = lookup_dst_mpls_nodes,
+};
+
+const static char* const lookup_dst_from_interface_ip4_nodes[] =
+{
+    "lookup-ip4-dst-itf",
+    NULL,
+};
+const static char* const lookup_dst_from_interface_ip6_nodes[] =
+{
+    "lookup-ip6-dst-itf",
+    NULL,
+};
+const static char* const lookup_dst_from_interface_mpls_nodes[] =
+{
+    "lookup-mpls-dst-itf",
+    NULL,
+};
+const static char* const * const lookup_dst_from_interface_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = lookup_dst_from_interface_ip4_nodes,
+    [DPO_PROTO_IP6]  = lookup_dst_from_interface_ip6_nodes,
+    [DPO_PROTO_MPLS] = lookup_dst_from_interface_mpls_nodes,
+};
+
+
+void
+lookup_dpo_module_init (void)
+{
+    dpo_register(DPO_LOOKUP, &lkd_vft_w_mem_show, NULL);
+
+    /*
+     * There are various sorts of lookup; src or dst addr v4 /v6 etc.
+     * there isn't an object type for each (there is only the lookup_dpo_t),
+     * but, for performance reasons, there is a data plane function, and hence
+     * VLIB node for each. VLIB graph node construction is based on DPO types
+     * so we create sub-types.
+     */
+    lookup_dpo_sub_types[LOOKUP_SUB_TYPE_SRC] =
+        dpo_register_new_type(&lkd_vft, lookup_src_nodes);
+    lookup_dpo_sub_types[LOOKUP_SUB_TYPE_DST] =
+        dpo_register_new_type(&lkd_vft, lookup_dst_nodes);
+    lookup_dpo_sub_types[LOOKUP_SUB_TYPE_DST_TABLE_FROM_INTERFACE] =
+        dpo_register_new_type(&lkd_vft, lookup_dst_from_interface_nodes);
+}
diff --git a/src/vnet/dpo/lookup_dpo.h b/src/vnet/dpo/lookup_dpo.h
new file mode 100644
index 00000000..ff283388
--- /dev/null
+++ b/src/vnet/dpo/lookup_dpo.h
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __LOOKUP_DPO_H__
+#define __LOOKUP_DPO_H__
+
+#include <vnet/vnet.h>
+#include <vnet/fib/fib_types.h>
+#include <vnet/dpo/dpo.h>
+
+/**
+ * Switch to use the packet's source or destination address for lookup
+ */
+typedef enum lookup_input_t_ {
+    LOOKUP_INPUT_SRC_ADDR,
+    LOOKUP_INPUT_DST_ADDR,
+} __attribute__ ((packed)) lookup_input_t;
+
+#define LOOKUP_INPUTS {                         \
+    [LOOKUP_INPUT_SRC_ADDR] = "src-address",    \
+    [LOOKUP_INPUT_DST_ADDR] = "dst-address",    \
+}
+
+/**
+ * Switch to use the packet's source or destination address for lookup
+ */
+typedef enum lookup_table_t_ {
+    LOOKUP_TABLE_FROM_INPUT_INTERFACE,
+    LOOKUP_TABLE_FROM_CONFIG,
+} __attribute__ ((packed)) lookup_table_t;
+
+#define LOOKUP_TABLES {                                   \
+    [LOOKUP_INPUT_SRC_ADDR] = "table-input-interface",    \
+    [LOOKUP_INPUT_DST_ADDR] = "table-configured",         \
+}
+
+/**
+ * A representation of an MPLS label for imposition in the data-path
+ */
+typedef struct lookup_dpo_t
+{
+    /**
+     * The FIB, or interface from which to get a FIB, in which to perform
+     * the next lookup;
+     */
+    fib_node_index_t lkd_fib_index;
+
+    /**
+     * The protocol of the FIB for the lookup, and hence
+     * the protocol of the packet
+     */
+    dpo_proto_t lkd_proto;
+
+    /**
+     * Switch to use src or dst address
+     */
+    lookup_input_t lkd_input;
+
+    /**
+     * Switch to use the table index passed, or the table of the input interface
+     */
+    lookup_table_t lkd_table;
+
+    /**
+     * Number of locks
+     */
+    u16 lkd_locks;
+} lookup_dpo_t;
+
+extern void lookup_dpo_add_or_lock_w_fib_index(fib_node_index_t fib_index,
+                                               dpo_proto_t proto,
+                                               lookup_input_t input,
+                                               lookup_table_t table,
+                                               dpo_id_t *dpo);
+extern void lookup_dpo_add_or_lock_w_table_id(u32 table_id,
+                                              dpo_proto_t proto,
+                                              lookup_input_t input,
+                                              lookup_table_t table,
+                                              dpo_id_t *dpo);
+
+extern u8* format_lookup_dpo(u8 *s, va_list *args);
+
+/*
+ * Encapsulation violation for fast data-path access
+ */
+extern lookup_dpo_t *lookup_dpo_pool;
+
+static inline lookup_dpo_t *
+lookup_dpo_get (index_t index)
+{
+    return (pool_elt_at_index(lookup_dpo_pool, index));
+}
+
+extern void lookup_dpo_module_init(void);
+
+#endif
diff --git a/src/vnet/dpo/mpls_label_dpo.c b/src/vnet/dpo/mpls_label_dpo.c
new file mode 100644
index 00000000..bbdc9666
--- /dev/null
+++ b/src/vnet/dpo/mpls_label_dpo.c
@@ -0,0 +1,570 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/ip/ip.h>
+#include <vnet/dpo/mpls_label_dpo.h>
+#include <vnet/mpls/mpls.h>
+
+/*
+ * pool of all MPLS Label DPOs
+ */
+mpls_label_dpo_t *mpls_label_dpo_pool;
+
+static mpls_label_dpo_t *
+mpls_label_dpo_alloc (void)
+{
+    mpls_label_dpo_t *mld;
+
+    pool_get_aligned(mpls_label_dpo_pool, mld, CLIB_CACHE_LINE_BYTES);
+    memset(mld, 0, sizeof(*mld));
+
+    dpo_reset(&mld->mld_dpo);
+
+    return (mld);
+}
+
+static index_t
+mpls_label_dpo_get_index (mpls_label_dpo_t *mld)
+{
+    return (mld - mpls_label_dpo_pool);
+}
+
+index_t
+mpls_label_dpo_create (mpls_label_t *label_stack,
+                       mpls_eos_bit_t eos,
+                       u8 ttl,
+                       u8 exp,
+                       dpo_proto_t payload_proto,
+		       const dpo_id_t *dpo)
+{
+    mpls_label_dpo_t *mld;
+    u32 ii;
+
+    mld = mpls_label_dpo_alloc();
+    mld->mld_n_labels = vec_len(label_stack);
+    mld->mld_n_hdr_bytes = mld->mld_n_labels * sizeof(mld->mld_hdr[0]);
+    mld->mld_payload_proto = payload_proto;
+
+    /*
+     * construct label rewrite headers for each value value passed.
+     * get the header in network byte order since we will paint it
+     * on a packet in the data-plane
+     */
+
+    for (ii = 0; ii < mld->mld_n_labels-1; ii++)
+    {
+	vnet_mpls_uc_set_label(&mld->mld_hdr[ii].label_exp_s_ttl, label_stack[ii]);
+	vnet_mpls_uc_set_ttl(&mld->mld_hdr[ii].label_exp_s_ttl, 255);
+	vnet_mpls_uc_set_exp(&mld->mld_hdr[ii].label_exp_s_ttl, 0);
+	vnet_mpls_uc_set_s(&mld->mld_hdr[ii].label_exp_s_ttl, MPLS_NON_EOS);
+	mld->mld_hdr[ii].label_exp_s_ttl =
+	    clib_host_to_net_u32(mld->mld_hdr[ii].label_exp_s_ttl);
+    }
+
+    /*
+     * the inner most label
+     */
+    ii = mld->mld_n_labels-1;
+
+    vnet_mpls_uc_set_label(&mld->mld_hdr[ii].label_exp_s_ttl, label_stack[ii]);
+    vnet_mpls_uc_set_ttl(&mld->mld_hdr[ii].label_exp_s_ttl, ttl);
+    vnet_mpls_uc_set_exp(&mld->mld_hdr[ii].label_exp_s_ttl, exp);
+    vnet_mpls_uc_set_s(&mld->mld_hdr[ii].label_exp_s_ttl, eos);
+    mld->mld_hdr[ii].label_exp_s_ttl =
+	clib_host_to_net_u32(mld->mld_hdr[ii].label_exp_s_ttl);
+
+    /*
+     * stack this label objct on its parent.
+     */
+    dpo_stack(DPO_MPLS_LABEL,
+              mld->mld_payload_proto,
+              &mld->mld_dpo,
+              dpo);
+
+    return (mpls_label_dpo_get_index(mld));
+}
+
+u8*
+format_mpls_label_dpo (u8 *s, va_list *args)
+{
+    index_t index = va_arg (*args, index_t);
+    u32 indent = va_arg (*args, u32);
+    mpls_unicast_header_t hdr;
+    mpls_label_dpo_t *mld;
+    u32 ii;
+
+    mld = mpls_label_dpo_get(index);
+
+    s = format(s, "mpls-label:[%d]:", index);
+
+    for (ii = 0; ii < mld->mld_n_labels; ii++)
+    {
+	hdr.label_exp_s_ttl =
+	    clib_net_to_host_u32(mld->mld_hdr[ii].label_exp_s_ttl);
+	s = format(s, "%U", format_mpls_header, hdr);
+    }
+
+    s = format(s, "\n%U", format_white_space, indent);
+    s = format(s, "%U", format_dpo_id, &mld->mld_dpo, indent+2);
+
+    return (s);
+}
+
+static void
+mpls_label_dpo_lock (dpo_id_t *dpo)
+{
+    mpls_label_dpo_t *mld;
+
+    mld = mpls_label_dpo_get(dpo->dpoi_index);
+
+    mld->mld_locks++;
+}
+
+static void
+mpls_label_dpo_unlock (dpo_id_t *dpo)
+{
+    mpls_label_dpo_t *mld;
+
+    mld = mpls_label_dpo_get(dpo->dpoi_index);
+
+    mld->mld_locks--;
+
+    if (0 == mld->mld_locks)
+    {
+	dpo_reset(&mld->mld_dpo);
+	pool_put(mpls_label_dpo_pool, mld);
+    }
+}
+
+/**
+ * @brief A struct to hold tracing information for the MPLS label imposition
+ * node.
+ */
+typedef struct mpls_label_imposition_trace_t_
+{
+    /**
+     * The MPLS header imposed
+     */
+    mpls_unicast_header_t hdr;
+} mpls_label_imposition_trace_t;
+
+always_inline uword
+mpls_label_imposition_inline (vlib_main_t * vm,
+                              vlib_node_runtime_t * node,
+                              vlib_frame_t * from_frame,
+                              u8 payload_is_ip4,
+                              u8 payload_is_ip6)
+{
+    u32 n_left_from, next_index, * from, * to_next;
+
+    from = vlib_frame_vector_args (from_frame);
+    n_left_from = from_frame->n_vectors;
+
+    next_index = node->cached_next_index;
+
+    while (n_left_from > 0)
+    {
+        u32 n_left_to_next;
+
+        vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
+
+        while (n_left_from >= 4 && n_left_to_next >= 2)
+        {
+            mpls_unicast_header_t *hdr0, *hdr1;
+            mpls_label_dpo_t *mld0, *mld1;
+            u32 bi0, mldi0, bi1, mldi1;
+            vlib_buffer_t * b0, *b1;
+            u32 next0, next1;
+            u8 ttl0, ttl1;
+
+            bi0 = to_next[0] = from[0];
+            bi1 = to_next[1] = from[1];
+
+            /* Prefetch next iteration. */
+            {
+                vlib_buffer_t * p2, * p3;
+
+                p2 = vlib_get_buffer (vm, from[2]);
+                p3 = vlib_get_buffer (vm, from[3]);
+
+                vlib_prefetch_buffer_header (p2, STORE);
+                vlib_prefetch_buffer_header (p3, STORE);
+
+                CLIB_PREFETCH (p2->data, sizeof (hdr0[0]), STORE);
+                CLIB_PREFETCH (p3->data, sizeof (hdr0[0]), STORE);
+            }
+
+            from += 2;
+            to_next += 2;
+            n_left_from -= 2;
+            n_left_to_next -= 2;
+
+            b0 = vlib_get_buffer (vm, bi0);
+            b1 = vlib_get_buffer (vm, bi1);
+
+            /* dst lookup was done by ip4 lookup */
+            mldi0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
+            mldi1 = vnet_buffer(b1)->ip.adj_index[VLIB_TX];
+            mld0 = mpls_label_dpo_get(mldi0);
+            mld1 = mpls_label_dpo_get(mldi1);
+
+            if (payload_is_ip4)
+            {
+                /*
+                 * decrement the TTL on ingress to the LSP
+                 */
+                ip4_header_t * ip0 = vlib_buffer_get_current(b0);
+                ip4_header_t * ip1 = vlib_buffer_get_current(b1);
+                u32 checksum0;
+                u32 checksum1;
+
+                checksum0 = ip0->checksum + clib_host_to_net_u16 (0x0100);
+                checksum1 = ip1->checksum + clib_host_to_net_u16 (0x0100);
+
+                checksum0 += checksum0 >= 0xffff;
+                checksum1 += checksum1 >= 0xffff;
+
+                ip0->checksum = checksum0;
+                ip1->checksum = checksum1;
+
+                ip0->ttl -= 1;
+                ip1->ttl -= 1;
+
+                ttl1 = ip1->ttl;
+                ttl0 = ip0->ttl;
+            }
+            else if (payload_is_ip6)
+            {
+                /*
+                 * decrement the TTL on ingress to the LSP
+                 */
+                ip6_header_t * ip0 = vlib_buffer_get_current(b0);
+                ip6_header_t * ip1 = vlib_buffer_get_current(b1);
+
+
+                ip0->hop_limit -= 1;
+                ip1->hop_limit -= 1;
+
+                ttl0 = ip0->hop_limit;
+                ttl1 = ip1->hop_limit;
+            }
+            else
+            {
+                /*
+                 * else, the packet to be encapped is an MPLS packet
+                 */
+                if (PREDICT_TRUE(vnet_buffer(b0)->mpls.first))
+                {
+                    /*
+                     * The first label to be imposed on the packet. this is a label swap.
+                     * in which case we stashed the TTL and EXP bits in the
+                     * packet in the lookup node
+                     */
+                    ASSERT(0 != vnet_buffer (b0)->mpls.ttl);
+
+                    ttl0 = vnet_buffer(b0)->mpls.ttl - 1;
+                }
+                else
+                {
+                    /*
+                     * not the first label. implying we are recusring down a chain of
+                     * output labels.
+                     * Each layer is considered a new LSP - hence the TTL is reset.
+                     */
+                    ttl0 = 255;
+                }
+                if (PREDICT_TRUE(vnet_buffer(b1)->mpls.first))
+                {
+                    ASSERT(1 != vnet_buffer (b1)->mpls.ttl);
+                    ttl1 = vnet_buffer(b1)->mpls.ttl - 1;
+                }
+                else
+                {
+                    ttl1 = 255;
+                }
+            }
+            vnet_buffer(b0)->mpls.first = 0;
+            vnet_buffer(b1)->mpls.first = 0;
+
+            /* Paint the MPLS header */
+            vlib_buffer_advance(b0, -(mld0->mld_n_hdr_bytes));
+            vlib_buffer_advance(b1, -(mld1->mld_n_hdr_bytes));
+
+            hdr0 = vlib_buffer_get_current(b0);
+            hdr1 = vlib_buffer_get_current(b1);
+
+            clib_memcpy(hdr0, mld0->mld_hdr, mld0->mld_n_hdr_bytes);
+            clib_memcpy(hdr1, mld1->mld_hdr, mld1->mld_n_hdr_bytes);
+
+            /* fixup the TTL for the inner most label */
+            hdr0 = hdr0 + (mld0->mld_n_labels - 1);
+            hdr1 = hdr1 + (mld1->mld_n_labels - 1);
+            ((char*)hdr0)[3] = ttl0;
+            ((char*)hdr1)[3] = ttl1;
+
+            next0 = mld0->mld_dpo.dpoi_next_node;
+            next1 = mld1->mld_dpo.dpoi_next_node;
+            vnet_buffer(b0)->ip.adj_index[VLIB_TX] = mld0->mld_dpo.dpoi_index;
+            vnet_buffer(b1)->ip.adj_index[VLIB_TX] = mld1->mld_dpo.dpoi_index;
+
+            if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+            {
+                mpls_label_imposition_trace_t *tr =
+                    vlib_add_trace (vm, node, b0, sizeof (*tr));
+                tr->hdr = *hdr0;
+            }
+            if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
+            {
+                mpls_label_imposition_trace_t *tr =
+                    vlib_add_trace (vm, node, b1, sizeof (*tr));
+                tr->hdr = *hdr1;
+            }
+
+            vlib_validate_buffer_enqueue_x2(vm, node, next_index, to_next,
+                                            n_left_to_next,
+                                            bi0, bi1, next0, next1);
+        }
+
+        while (n_left_from > 0 && n_left_to_next > 0)
+        {
+            mpls_unicast_header_t *hdr0;
+            mpls_label_dpo_t *mld0;
+            vlib_buffer_t * b0;
+            u32 bi0, mldi0;
+            u32 next0;
+            u8 ttl;
+
+            bi0 = from[0];
+            to_next[0] = bi0;
+            from += 1;
+            to_next += 1;
+            n_left_from -= 1;
+            n_left_to_next -= 1;
+
+            b0 = vlib_get_buffer (vm, bi0);
+
+            /* dst lookup was done by ip4 lookup */
+            mldi0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
+            mld0 = mpls_label_dpo_get(mldi0);
+
+            if (payload_is_ip4)
+            {
+                /*
+                 * decrement the TTL on ingress to the LSP
+                 */
+                ip4_header_t * ip0 = vlib_buffer_get_current(b0);
+                u32 checksum0;
+
+                checksum0 = ip0->checksum + clib_host_to_net_u16 (0x0100);
+                checksum0 += checksum0 >= 0xffff;
+
+                ip0->checksum = checksum0;
+                ip0->ttl -= 1;
+                ttl = ip0->ttl;
+            }
+            else if (payload_is_ip6)
+            {
+                /*
+                 * decrement the TTL on ingress to the LSP
+                 */
+                ip6_header_t * ip0 = vlib_buffer_get_current(b0);
+
+                ip0->hop_limit -= 1;
+                ttl = ip0->hop_limit;
+            }
+            else
+            {
+                /*
+                 * else, the packet to be encapped is an MPLS packet
+                 */
+                if (vnet_buffer(b0)->mpls.first)
+                {
+                    /*
+                     * The first label to be imposed on the packet. this is a label swap.
+                     * in which case we stashed the TTL and EXP bits in the
+                     * packet in the lookup node
+                     */
+                    ASSERT(0 != vnet_buffer (b0)->mpls.ttl);
+
+                    ttl = vnet_buffer(b0)->mpls.ttl - 1;
+                }
+                else
+                {
+                    /*
+                     * not the first label. implying we are recusring down a chain of
+                     * output labels.
+                     * Each layer is considered a new LSP - hence the TTL is reset.
+                     */
+                    ttl = 255;
+                }
+            }
+            vnet_buffer(b0)->mpls.first = 0;
+
+            /* Paint the MPLS header */
+            vlib_buffer_advance(b0, -(mld0->mld_n_hdr_bytes));
+            hdr0 = vlib_buffer_get_current(b0);
+            clib_memcpy(hdr0, mld0->mld_hdr, mld0->mld_n_hdr_bytes);
+
+            /* fixup the TTL for the inner most label */
+            hdr0 = hdr0 + (mld0->mld_n_labels - 1);
+            ((char*)hdr0)[3] = ttl;
+
+            next0 = mld0->mld_dpo.dpoi_next_node;
+            vnet_buffer(b0)->ip.adj_index[VLIB_TX] = mld0->mld_dpo.dpoi_index;
+
+            if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+            {
+                mpls_label_imposition_trace_t *tr =
+                    vlib_add_trace (vm, node, b0, sizeof (*tr));
+                tr->hdr = *hdr0;
+            }
+
+            vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
+                                            n_left_to_next, bi0, next0);
+        }
+        vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+    return from_frame->n_vectors;
+}
+
+static u8 *
+format_mpls_label_imposition_trace (u8 * s, va_list * args)
+{
+    CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+    CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+    mpls_label_imposition_trace_t * t;
+    mpls_unicast_header_t hdr;
+    uword indent;
+
+    t = va_arg (*args, mpls_label_imposition_trace_t *);
+    indent = format_get_indent (s);
+    hdr.label_exp_s_ttl = clib_net_to_host_u32(t->hdr.label_exp_s_ttl);
+
+    s = format (s, "%Umpls-header:%U",
+                format_white_space, indent,
+                format_mpls_header, hdr);
+    return (s);
+}
+
+static uword
+mpls_label_imposition (vlib_main_t * vm,
+                       vlib_node_runtime_t * node,
+                       vlib_frame_t * frame)
+{
+    return (mpls_label_imposition_inline(vm, node, frame, 0, 0));
+}
+
+VLIB_REGISTER_NODE (mpls_label_imposition_node) = {
+    .function = mpls_label_imposition,
+    .name = "mpls-label-imposition",
+    .vector_size = sizeof (u32),
+
+    .format_trace = format_mpls_label_imposition_trace,
+    .n_next_nodes = 1,
+    .next_nodes = {
+        [0] = "error-drop",
+    }
+};
+VLIB_NODE_FUNCTION_MULTIARCH (mpls_label_imposition_node,
+                              mpls_label_imposition)
+
+static uword
+ip4_mpls_label_imposition (vlib_main_t * vm,
+                           vlib_node_runtime_t * node,
+                           vlib_frame_t * frame)
+{
+    return (mpls_label_imposition_inline(vm, node, frame, 1, 0));
+}
+
+VLIB_REGISTER_NODE (ip4_mpls_label_imposition_node) = {
+    .function = ip4_mpls_label_imposition,
+    .name = "ip4-mpls-label-imposition",
+    .vector_size = sizeof (u32),
+
+    .format_trace = format_mpls_label_imposition_trace,
+    .n_next_nodes = 1,
+    .next_nodes = {
+        [0] = "error-drop",
+    }
+};
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_mpls_label_imposition_node,
+                              ip4_mpls_label_imposition)
+
+static uword
+ip6_mpls_label_imposition (vlib_main_t * vm,
+                           vlib_node_runtime_t * node,
+                           vlib_frame_t * frame)
+{
+    return (mpls_label_imposition_inline(vm, node, frame, 0, 1));
+}
+
+VLIB_REGISTER_NODE (ip6_mpls_label_imposition_node) = {
+    .function = ip6_mpls_label_imposition,
+    .name = "ip6-mpls-label-imposition",
+    .vector_size = sizeof (u32),
+
+    .format_trace = format_mpls_label_imposition_trace,
+    .n_next_nodes = 1,
+    .next_nodes = {
+        [0] = "error-drop",
+    }
+};
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_mpls_label_imposition_node,
+                              ip6_mpls_label_imposition)
+
+static void
+mpls_label_dpo_mem_show (void)
+{
+    fib_show_memory_usage("MPLS label",
+			  pool_elts(mpls_label_dpo_pool),
+			  pool_len(mpls_label_dpo_pool),
+			  sizeof(mpls_label_dpo_t));
+}
+
+const static dpo_vft_t mld_vft = {
+    .dv_lock = mpls_label_dpo_lock,
+    .dv_unlock = mpls_label_dpo_unlock,
+    .dv_format = format_mpls_label_dpo,
+    .dv_mem_show = mpls_label_dpo_mem_show,
+};
+
+const static char* const mpls_label_imp_ip4_nodes[] =
+{
+    "ip4-mpls-label-imposition",
+    NULL,
+};
+const static char* const mpls_label_imp_ip6_nodes[] =
+{
+    "ip6-mpls-label-imposition",
+    NULL,
+};
+const static char* const mpls_label_imp_mpls_nodes[] =
+{
+    "mpls-label-imposition",
+    NULL,
+};
+const static char* const * const mpls_label_imp_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = mpls_label_imp_ip4_nodes,
+    [DPO_PROTO_IP6]  = mpls_label_imp_ip6_nodes,
+    [DPO_PROTO_MPLS] = mpls_label_imp_mpls_nodes,
+};
+
+
+void
+mpls_label_dpo_module_init (void)
+{
+    dpo_register(DPO_MPLS_LABEL, &mld_vft, mpls_label_imp_nodes);
+}
diff --git a/src/vnet/dpo/mpls_label_dpo.h b/src/vnet/dpo/mpls_label_dpo.h
new file mode 100644
index 00000000..89bcb093
--- /dev/null
+++ b/src/vnet/dpo/mpls_label_dpo.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPLS_LABEL_DPO_H__
+#define __MPLS_LABEL_DPO_H__
+
+#include <vnet/vnet.h>
+#include <vnet/mpls/packet.h>
+#include <vnet/dpo/dpo.h>
+
+/**
+ * A representation of an MPLS label for imposition in the data-path
+ */
+typedef struct mpls_label_dpo_t
+{
+    /**
+     * The MPLS label header to impose. Outer most label first.
+     */
+    mpls_unicast_header_t mld_hdr[8];
+
+    /**
+     * Next DPO in the graph
+     */
+    dpo_id_t mld_dpo;
+
+    /**
+     * The protocol of the payload/packets that are being encapped
+     */
+    dpo_proto_t mld_payload_proto;
+
+    /**
+     * Size of the label stack
+     */
+    u16 mld_n_labels;
+
+    /**
+     * Cached amount of header bytes to paint
+     */
+    u16 mld_n_hdr_bytes;
+
+    /**
+     * Number of locks/users of the label
+     */
+    u16 mld_locks;
+} mpls_label_dpo_t;
+
+/**
+ * @brief Assert that the MPLS label object is less than a cache line in size.
+ * Should this get any bigger then we will need to reconsider how many labels
+ * can be pushed in one object.
+ */
+_Static_assert((sizeof(mpls_label_dpo_t) <= CLIB_CACHE_LINE_BYTES),
+	       "MPLS label DPO is larger than one cache line.");
+
+/**
+ * @brief Create an MPLS label object
+ *
+ * @param label_stack The stack if labels to impose, outer most label first
+ * @param eos The inner most label's EOS bit
+ * @param ttl The inner most label's TTL bit
+ * @param exp The inner most label's EXP bit
+ * @param payload_proto The ptocool of the payload packets that will
+ *                      be imposed with this label header.
+ * @param dpo The parent of the created MPLS label object
+ */
+extern index_t mpls_label_dpo_create(mpls_label_t *label_stack,
+                                     mpls_eos_bit_t eos,
+                                     u8 ttl,
+                                     u8 exp,
+                                     dpo_proto_t payload_proto,
+				     const dpo_id_t *dpo);
+
+extern u8* format_mpls_label_dpo(u8 *s, va_list *args);
+
+
+/*
+ * Encapsulation violation for fast data-path access
+ */
+extern mpls_label_dpo_t *mpls_label_dpo_pool;
+
+static inline mpls_label_dpo_t *
+mpls_label_dpo_get (index_t index)
+{
+    return (pool_elt_at_index(mpls_label_dpo_pool, index));
+}
+
+extern void mpls_label_dpo_module_init(void);
+
+#endif
diff --git a/src/vnet/dpo/punt_dpo.c b/src/vnet/dpo/punt_dpo.c
new file mode 100644
index 00000000..d1661dcc
--- /dev/null
+++ b/src/vnet/dpo/punt_dpo.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief
+ * The data-path object representing puntping the packet
+ */
+
+#include <vnet/dpo/dpo.h>
+
+static dpo_id_t punt_dpos[DPO_PROTO_NUM];
+
+const dpo_id_t *
+punt_dpo_get (dpo_proto_t proto)
+{
+    dpo_set(&punt_dpos[proto], DPO_PUNT, proto, 1);
+
+    return (&punt_dpos[proto]);
+}
+
+int
+dpo_is_punt (const dpo_id_t *dpo)
+{
+    return (dpo->dpoi_type == DPO_PUNT);
+}
+
+static void
+punt_dpo_lock (dpo_id_t *dpo)
+{
+    /*
+     * not maintaining a lock count on the punt
+     * more trouble than it's worth.
+     * There always needs to be one around. no point it managaing its lifetime
+     */
+}
+static void
+punt_dpo_unlock (dpo_id_t *dpo)
+{
+}
+
+static u8*
+format_punt_dpo (u8 *s, va_list *ap)
+{
+    CLIB_UNUSED(index_t index) = va_arg(*ap, index_t);
+    CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
+
+    return (format(s, "dpo-punt"));
+}
+
+const static dpo_vft_t punt_vft = {
+    .dv_lock   = punt_dpo_lock,
+    .dv_unlock = punt_dpo_unlock,
+    .dv_format = format_punt_dpo,
+};
+
+/**
+ * @brief The per-protocol VLIB graph nodes that are assigned to a punt
+ *        object.
+ *
+ * this means that these graph nodes are ones from which a punt is the
+ * parent object in the DPO-graph.
+ */
+const static char* const punt_ip4_nodes[] =
+{
+    "ip4-punt",
+    NULL,
+};
+const static char* const punt_ip6_nodes[] =
+{
+    "ip6-punt",
+    NULL,
+};
+const static char* const punt_mpls_nodes[] =
+{
+    "mpls-punt",
+    NULL,
+};
+const static char* const * const punt_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = punt_ip4_nodes,
+    [DPO_PROTO_IP6]  = punt_ip6_nodes,
+    [DPO_PROTO_MPLS] = punt_mpls_nodes,
+};
+
+void
+punt_dpo_module_init (void)
+{
+    dpo_register(DPO_PUNT, &punt_vft, punt_nodes);
+}
diff --git a/src/vnet/dpo/punt_dpo.h b/src/vnet/dpo/punt_dpo.h
new file mode 100644
index 00000000..370547c1
--- /dev/null
+++ b/src/vnet/dpo/punt_dpo.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief A DPO to punt packets to the Control-plane
+ */
+
+#ifndef __PUNT_DPO_H__
+#define __PUNT_DPO_H__
+
+#include <vnet/dpo/dpo.h>
+
+extern int dpo_is_punt(const dpo_id_t *dpo);
+
+extern const dpo_id_t *punt_dpo_get(dpo_proto_t proto);
+
+extern void punt_dpo_module_init(void);
+
+#endif
diff --git a/src/vnet/dpo/receive_dpo.c b/src/vnet/dpo/receive_dpo.c
new file mode 100644
index 00000000..2b2571c6
--- /dev/null
+++ b/src/vnet/dpo/receive_dpo.c
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief
+ * The data-path object representing receiveing the packet, i.e. it's for-us
+ */
+#include <vlib/vlib.h>
+#include <vnet/ip/ip.h>
+#include <vnet/dpo/receive_dpo.h>
+
+/**
+ * @brief pool of all receive DPOs
+ */
+receive_dpo_t *receive_dpo_pool;
+
+static receive_dpo_t *
+receive_dpo_alloc (void)
+{
+    receive_dpo_t *rd;
+
+    pool_get_aligned(receive_dpo_pool, rd, CLIB_CACHE_LINE_BYTES);
+    memset(rd, 0, sizeof(*rd));
+
+    return (rd);
+}
+
+static receive_dpo_t *
+receive_dpo_get_from_dpo (const dpo_id_t *dpo)
+{
+    ASSERT(DPO_RECEIVE == dpo->dpoi_type);
+
+    return (receive_dpo_get(dpo->dpoi_index));
+}
+
+
+/*
+ * receive_dpo_add_or_lock
+ *
+ * The next_hop address here is used for source address selection in the DP.
+ * The local adj is added to an interface's receive prefix, the next-hop
+ * passed here is the local prefix on the same interface.
+ */
+void
+receive_dpo_add_or_lock (dpo_proto_t proto,
+                         u32 sw_if_index,
+                         const ip46_address_t *nh_addr,
+                         dpo_id_t *dpo)
+{
+    receive_dpo_t *rd;
+
+    rd = receive_dpo_alloc();
+
+    rd->rd_sw_if_index = sw_if_index;
+    if (NULL != nh_addr)
+    {
+	rd->rd_addr = *nh_addr;
+    }
+
+    dpo_set(dpo, DPO_RECEIVE, proto, (rd - receive_dpo_pool));
+}
+
+static void
+receive_dpo_lock (dpo_id_t *dpo)
+{
+    receive_dpo_t *rd;
+
+    rd = receive_dpo_get_from_dpo(dpo);
+    rd->rd_locks++;
+}
+
+static void
+receive_dpo_unlock (dpo_id_t *dpo)
+{
+    receive_dpo_t *rd;
+
+    rd = receive_dpo_get_from_dpo(dpo);
+    rd->rd_locks--;
+
+    if (0 == rd->rd_locks)
+    {
+        pool_put(receive_dpo_pool, rd);
+    }
+}
+
+static u8*
+format_receive_dpo (u8 *s, va_list *ap)
+{
+    CLIB_UNUSED(index_t index) = va_arg(*ap, index_t);
+    CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
+    vnet_main_t * vnm = vnet_get_main();
+    receive_dpo_t *rd;
+
+    rd = receive_dpo_get(index);
+
+    if (~0 != rd->rd_sw_if_index)
+    {
+        return (format(s, "dpo-receive: %U on %U",
+                       format_ip46_address, &rd->rd_addr, IP46_TYPE_ANY,
+                       format_vnet_sw_interface_name, vnm,
+                       vnet_get_sw_interface(vnm, rd->rd_sw_if_index)));
+    }
+    else
+    {
+        return (format(s, "dpo-receive"));
+    }
+}
+
+static void
+receive_dpo_mem_show (void)
+{
+    fib_show_memory_usage("Receive",
+			  pool_elts(receive_dpo_pool),
+			  pool_len(receive_dpo_pool),
+			  sizeof(receive_dpo_t));
+}
+
+const static dpo_vft_t receive_vft = {
+    .dv_lock = receive_dpo_lock,
+    .dv_unlock = receive_dpo_unlock,
+    .dv_format = format_receive_dpo,
+    .dv_mem_show = receive_dpo_mem_show,
+};
+
+/**
+ * @brief The per-protocol VLIB graph nodes that are assigned to a receive
+ *        object.
+ *
+ * this means that these graph nodes are ones from which a receive is the
+ * parent object in the DPO-graph.
+ */
+const static char* const receive_ip4_nodes[] =
+{
+    "ip4-local",
+    NULL,
+};
+const static char* const receive_ip6_nodes[] =
+{
+    "ip6-local",
+    NULL,
+};
+
+const static char* const * const receive_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = receive_ip4_nodes,
+    [DPO_PROTO_IP6]  = receive_ip6_nodes,
+    [DPO_PROTO_MPLS] = NULL,
+};
+
+void
+receive_dpo_module_init (void)
+{
+    dpo_register(DPO_RECEIVE, &receive_vft, receive_nodes);
+}
diff --git a/src/vnet/dpo/receive_dpo.h b/src/vnet/dpo/receive_dpo.h
new file mode 100644
index 00000000..2420fd78
--- /dev/null
+++ b/src/vnet/dpo/receive_dpo.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief
+ * The data-path object representing receiveing the packet, i.e. it's for-us
+ */
+
+#ifndef __RECEIVE_DPO_H__
+#define __RECEIVE_DPO_H__
+
+#include <vnet/dpo/dpo.h>
+#include <vnet/ip/ip6.h>
+
+typedef struct receive_dpo_t_
+{
+    /**
+     * The Software interface index on which traffic is received
+     */
+    u32 rd_sw_if_index;
+
+    /**
+     * The address on the receive interface. packet are destined to this address
+     */
+    ip46_address_t rd_addr;
+
+    /**
+     * number oflocks.
+     */
+    u16 rd_locks;
+} receive_dpo_t;
+
+extern void receive_dpo_add_or_lock (dpo_proto_t proto,
+                                     u32 sw_if_index,
+                                     const ip46_address_t *nh_addr,
+                                     dpo_id_t *dpo);
+
+extern void receive_dpo_module_init(void);
+
+/**
+ * @brief pool of all receive DPOs
+ */
+receive_dpo_t *receive_dpo_pool;
+
+static inline receive_dpo_t *
+receive_dpo_get (index_t index)
+{
+    return (pool_elt_at_index(receive_dpo_pool, index));
+}
+
+#endif
diff --git a/src/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c
new file mode 100644
index 00000000..b388e778
--- /dev/null
+++ b/src/vnet/ethernet/arp.c
@@ -0,0 +1,2355 @@
+/*
+ * ethernet/arp.c: IP v4 ARP node
+ *
+ * Copyright (c) 2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/ip/ip.h>
+#include <vnet/ip/ip6.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/arp_packet.h>
+#include <vnet/l2/l2_input.h>
+#include <vppinfra/mhash.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/adj/adj_nbr.h>
+#include <vnet/mpls/mpls.h>
+
+/**
+ * @file
+ * @brief IPv4 ARP.
+ *
+ * This file contains code to manage the IPv4 ARP tables (IP Address
+ * to MAC Address lookup).
+ */
+
+
+void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
+
+/**
+ * @brief Per-interface ARP configuration and state
+ */
+typedef struct ethernet_arp_interface_t_
+{
+  /**
+   * Hash table of ARP entries.
+   * Since this hash table is per-interface, the key is only the IPv4 address.
+   */
+  uword *arp_entries;
+} ethernet_arp_interface_t;
+
+typedef struct
+{
+  u32 lo_addr;
+  u32 hi_addr;
+  u32 fib_index;
+} ethernet_proxy_arp_t;
+
+typedef struct
+{
+  u32 next_index;
+  uword node_index;
+  uword type_opaque;
+  uword data;
+  /* Used for arp event notification only */
+  void *data_callback;
+  u32 pid;
+} pending_resolution_t;
+
+typedef struct
+{
+  /* Hash tables mapping name to opcode. */
+  uword *opcode_by_name;
+
+  /* lite beer "glean" adjacency handling */
+  uword *pending_resolutions_by_address;
+  pending_resolution_t *pending_resolutions;
+
+  /* Mac address change notification */
+  uword *mac_changes_by_address;
+  pending_resolution_t *mac_changes;
+
+  ethernet_arp_ip4_entry_t *ip4_entry_pool;
+
+  /* ARP attack mitigation */
+  u32 arp_delete_rotor;
+  u32 limit_arp_cache_size;
+
+  /** Per interface state */
+  ethernet_arp_interface_t *ethernet_arp_by_sw_if_index;
+
+  /* Proxy arp vector */
+  ethernet_proxy_arp_t *proxy_arps;
+} ethernet_arp_main_t;
+
+static ethernet_arp_main_t ethernet_arp_main;
+
+typedef struct
+{
+  u32 sw_if_index;
+  ethernet_arp_ip4_over_ethernet_address_t a;
+  int is_static;
+  int flags;
+#define ETHERNET_ARP_ARGS_REMOVE (1<<0)
+#define ETHERNET_ARP_ARGS_FLUSH  (1<<1)
+#define ETHERNET_ARP_ARGS_POPULATE  (1<<2)
+} vnet_arp_set_ip4_over_ethernet_rpc_args_t;
+
+static void
+set_ip4_over_ethernet_rpc_callback (vnet_arp_set_ip4_over_ethernet_rpc_args_t
+				    * a);
+
+static u8 *
+format_ethernet_arp_hardware_type (u8 * s, va_list * va)
+{
+  ethernet_arp_hardware_type_t h = va_arg (*va, ethernet_arp_hardware_type_t);
+  char *t = 0;
+  switch (h)
+    {
+#define _(n,f) case n: t = #f; break;
+      foreach_ethernet_arp_hardware_type;
+#undef _
+
+    default:
+      return format (s, "unknown 0x%x", h);
+    }
+
+  return format (s, "%s", t);
+}
+
+static u8 *
+format_ethernet_arp_opcode (u8 * s, va_list * va)
+{
+  ethernet_arp_opcode_t o = va_arg (*va, ethernet_arp_opcode_t);
+  char *t = 0;
+  switch (o)
+    {
+#define _(f) case ETHERNET_ARP_OPCODE_##f: t = #f; break;
+      foreach_ethernet_arp_opcode;
+#undef _
+
+    default:
+      return format (s, "unknown 0x%x", o);
+    }
+
+  return format (s, "%s", t);
+}
+
+static uword
+unformat_ethernet_arp_opcode_host_byte_order (unformat_input_t * input,
+					      va_list * args)
+{
+  int *result = va_arg (*args, int *);
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  int x, i;
+
+  /* Numeric opcode. */
+  if (unformat (input, "0x%x", &x) || unformat (input, "%d", &x))
+    {
+      if (x >= (1 << 16))
+	return 0;
+      *result = x;
+      return 1;
+    }
+
+  /* Named type. */
+  if (unformat_user (input, unformat_vlib_number_by_name,
+		     am->opcode_by_name, &i))
+    {
+      *result = i;
+      return 1;
+    }
+
+  return 0;
+}
+
+static uword
+unformat_ethernet_arp_opcode_net_byte_order (unformat_input_t * input,
+					     va_list * args)
+{
+  int *result = va_arg (*args, int *);
+  if (!unformat_user
+      (input, unformat_ethernet_arp_opcode_host_byte_order, result))
+    return 0;
+
+  *result = clib_host_to_net_u16 ((u16) * result);
+  return 1;
+}
+
+static u8 *
+format_ethernet_arp_header (u8 * s, va_list * va)
+{
+  ethernet_arp_header_t *a = va_arg (*va, ethernet_arp_header_t *);
+  u32 max_header_bytes = va_arg (*va, u32);
+  uword indent;
+  u16 l2_type, l3_type;
+
+  if (max_header_bytes != 0 && sizeof (a[0]) > max_header_bytes)
+    return format (s, "ARP header truncated");
+
+  l2_type = clib_net_to_host_u16 (a->l2_type);
+  l3_type = clib_net_to_host_u16 (a->l3_type);
+
+  indent = format_get_indent (s);
+
+  s = format (s, "%U, type %U/%U, address size %d/%d",
+	      format_ethernet_arp_opcode, clib_net_to_host_u16 (a->opcode),
+	      format_ethernet_arp_hardware_type, l2_type,
+	      format_ethernet_type, l3_type,
+	      a->n_l2_address_bytes, a->n_l3_address_bytes);
+
+  if (l2_type == ETHERNET_ARP_HARDWARE_TYPE_ethernet
+      && l3_type == ETHERNET_TYPE_IP4)
+    {
+      s = format (s, "\n%U%U/%U -> %U/%U",
+		  format_white_space, indent,
+		  format_ethernet_address, a->ip4_over_ethernet[0].ethernet,
+		  format_ip4_address, &a->ip4_over_ethernet[0].ip4,
+		  format_ethernet_address, a->ip4_over_ethernet[1].ethernet,
+		  format_ip4_address, &a->ip4_over_ethernet[1].ip4);
+    }
+  else
+    {
+      uword n2 = a->n_l2_address_bytes;
+      uword n3 = a->n_l3_address_bytes;
+      s = format (s, "\n%U%U/%U -> %U/%U",
+		  format_white_space, indent,
+		  format_hex_bytes, a->data + 0 * n2 + 0 * n3, n2,
+		  format_hex_bytes, a->data + 1 * n2 + 0 * n3, n3,
+		  format_hex_bytes, a->data + 1 * n2 + 1 * n3, n2,
+		  format_hex_bytes, a->data + 2 * n2 + 1 * n3, n3);
+    }
+
+  return s;
+}
+
+u8 *
+format_ethernet_arp_ip4_entry (u8 * s, va_list * va)
+{
+  vnet_main_t *vnm = va_arg (*va, vnet_main_t *);
+  ethernet_arp_ip4_entry_t *e = va_arg (*va, ethernet_arp_ip4_entry_t *);
+  vnet_sw_interface_t *si;
+  u8 *flags = 0;
+
+  if (!e)
+    return format (s, "%=12s%=16s%=6s%=20s%=24s", "Time", "IP4",
+		   "Flags", "Ethernet", "Interface");
+
+  si = vnet_get_sw_interface (vnm, e->sw_if_index);
+
+  if (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC)
+    flags = format (flags, "S");
+
+  if (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC)
+    flags = format (flags, "D");
+
+  s = format (s, "%=12U%=16U%=6s%=20U%=24U",
+	      format_vlib_cpu_time, vnm->vlib_main, e->cpu_time_last_updated,
+	      format_ip4_address, &e->ip4_address,
+	      flags ? (char *) flags : "",
+	      format_ethernet_address, e->ethernet_address,
+	      format_vnet_sw_interface_name, vnm, si);
+
+  vec_free (flags);
+  return s;
+}
+
+typedef struct
+{
+  u8 packet_data[64];
+} ethernet_arp_input_trace_t;
+
+static u8 *
+format_ethernet_arp_input_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  ethernet_arp_input_trace_t *t = va_arg (*va, ethernet_arp_input_trace_t *);
+
+  s = format (s, "%U",
+	      format_ethernet_arp_header,
+	      t->packet_data, sizeof (t->packet_data));
+
+  return s;
+}
+
+static u8 *
+format_arp_term_input_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  ethernet_arp_input_trace_t *t = va_arg (*va, ethernet_arp_input_trace_t *);
+
+  /* arp-term trace data saved is either arp or ip6/icmp6 packet:
+     - for arp, the 1st 16-bit field is hw type of value of 0x0001.
+     - for ip6, the first nibble has value of 6. */
+  s = format (s, "%U", t->packet_data[0] == 0 ?
+	      format_ethernet_arp_header : format_ip6_header,
+	      t->packet_data, sizeof (t->packet_data));
+
+  return s;
+}
+
+static void
+arp_nbr_probe (ip_adjacency_t * adj)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip4_main_t *im = &ip4_main;
+  ip_interface_address_t *ia;
+  ethernet_arp_header_t *h;
+  vnet_hw_interface_t *hi;
+  vnet_sw_interface_t *si;
+  ip4_address_t *src;
+  vlib_buffer_t *b;
+  vlib_main_t *vm;
+  u32 bi = 0;
+
+  vm = vlib_get_main ();
+
+  si = vnet_get_sw_interface (vnm, adj->rewrite_header.sw_if_index);
+
+  if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
+    {
+      return;
+    }
+
+  src =
+    ip4_interface_address_matching_destination (im,
+						&adj->sub_type.nbr.next_hop.
+						ip4,
+						adj->rewrite_header.
+						sw_if_index, &ia);
+  if (!src)
+    {
+      return;
+    }
+
+  h =
+    vlib_packet_template_get_packet (vm, &im->ip4_arp_request_packet_template,
+				     &bi);
+
+  hi = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index);
+
+  clib_memcpy (h->ip4_over_ethernet[0].ethernet,
+	       hi->hw_address, sizeof (h->ip4_over_ethernet[0].ethernet));
+
+  h->ip4_over_ethernet[0].ip4 = src[0];
+  h->ip4_over_ethernet[1].ip4 = adj->sub_type.nbr.next_hop.ip4;
+
+  b = vlib_get_buffer (vm, bi);
+  vnet_buffer (b)->sw_if_index[VLIB_RX] =
+    vnet_buffer (b)->sw_if_index[VLIB_TX] = adj->rewrite_header.sw_if_index;
+
+  /* Add encapsulation string for software interface (e.g. ethernet header). */
+  vnet_rewrite_one_header (adj[0], h, sizeof (ethernet_header_t));
+  vlib_buffer_advance (b, -adj->rewrite_header.data_bytes);
+
+  {
+    vlib_frame_t *f = vlib_get_frame_to_node (vm, hi->output_node_index);
+    u32 *to_next = vlib_frame_vector_args (f);
+    to_next[0] = bi;
+    f->n_vectors = 1;
+    vlib_put_frame_to_node (vm, hi->output_node_index, f);
+  }
+}
+
+static void
+arp_mk_complete (adj_index_t ai, ethernet_arp_ip4_entry_t * e)
+{
+  adj_nbr_update_rewrite
+    (ai, ADJ_NBR_REWRITE_FLAG_COMPLETE,
+     ethernet_build_rewrite (vnet_get_main (),
+			     e->sw_if_index,
+			     adj_get_link_type (ai), e->ethernet_address));
+}
+
+static void
+arp_mk_incomplete (adj_index_t ai)
+{
+  ip_adjacency_t *adj = adj_get (ai);
+
+  adj_nbr_update_rewrite
+    (ai,
+     ADJ_NBR_REWRITE_FLAG_INCOMPLETE,
+     ethernet_build_rewrite (vnet_get_main (),
+			     adj->rewrite_header.sw_if_index,
+			     VNET_LINK_ARP,
+			     VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST));
+}
+
+static ethernet_arp_ip4_entry_t *
+arp_entry_find (ethernet_arp_interface_t * eai, const ip4_address_t * addr)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ethernet_arp_ip4_entry_t *e = NULL;
+  uword *p;
+
+  if (NULL != eai->arp_entries)
+    {
+      p = hash_get (eai->arp_entries, addr->as_u32);
+      if (!p)
+	return (NULL);
+
+      e = pool_elt_at_index (am->ip4_entry_pool, p[0]);
+    }
+
+  return (e);
+}
+
+static adj_walk_rc_t
+arp_mk_complete_walk (adj_index_t ai, void *ctx)
+{
+  ethernet_arp_ip4_entry_t *e = ctx;
+
+  arp_mk_complete (ai, e);
+
+  return (ADJ_WALK_RC_CONTINUE);
+}
+
+static adj_walk_rc_t
+arp_mk_incomplete_walk (adj_index_t ai, void *ctx)
+{
+  arp_mk_incomplete (ai);
+
+  return (ADJ_WALK_RC_CONTINUE);
+}
+
+void
+arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ethernet_arp_interface_t *arp_int;
+  ethernet_arp_ip4_entry_t *e;
+  ip_adjacency_t *adj;
+
+  adj = adj_get (ai);
+
+  vec_validate (am->ethernet_arp_by_sw_if_index, sw_if_index);
+  arp_int = &am->ethernet_arp_by_sw_if_index[sw_if_index];
+  e = arp_entry_find (arp_int, &adj->sub_type.nbr.next_hop.ip4);
+
+  if (NULL != e)
+    {
+      adj_nbr_walk_nh4 (sw_if_index,
+			&e->ip4_address, arp_mk_complete_walk, e);
+    }
+  else
+    {
+      /*
+       * no matching ARP entry.
+       * construct the rewire required to for an ARP packet, and stick
+       * that in the adj's pipe to smoke.
+       */
+      adj_nbr_update_rewrite (ai,
+			      ADJ_NBR_REWRITE_FLAG_INCOMPLETE,
+			      ethernet_build_rewrite (vnm,
+						      sw_if_index,
+						      VNET_LINK_ARP,
+						      VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST));
+
+      /*
+       * since the FIB has added this adj for a route, it makes sense it may
+       * want to forward traffic sometime soon. Let's send a speculative ARP.
+       * just one. If we were to do periodically that wouldn't be bad either,
+       * but that's more code than i'm prepared to write at this time for
+       * relatively little reward.
+       */
+      arp_nbr_probe (adj);
+    }
+}
+
+int
+vnet_arp_set_ip4_over_ethernet_internal (vnet_main_t * vnm,
+					 vnet_arp_set_ip4_over_ethernet_rpc_args_t
+					 * args)
+{
+  ethernet_arp_ip4_entry_t *e = 0;
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ethernet_arp_ip4_over_ethernet_address_t *a = &args->a;
+  vlib_main_t *vm = vlib_get_main ();
+  int make_new_arp_cache_entry = 1;
+  uword *p;
+  pending_resolution_t *pr, *mc;
+  ethernet_arp_interface_t *arp_int;
+  int is_static = args->is_static;
+  u32 sw_if_index = args->sw_if_index;
+
+  vec_validate (am->ethernet_arp_by_sw_if_index, sw_if_index);
+
+  arp_int = &am->ethernet_arp_by_sw_if_index[sw_if_index];
+
+  if (NULL != arp_int->arp_entries)
+    {
+      p = hash_get (arp_int->arp_entries, a->ip4.as_u32);
+      if (p)
+	{
+	  e = pool_elt_at_index (am->ip4_entry_pool, p[0]);
+
+	  /* Refuse to over-write static arp. */
+	  if (!is_static && (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC))
+	    return -2;
+	  make_new_arp_cache_entry = 0;
+	}
+    }
+
+  if (make_new_arp_cache_entry)
+    {
+      fib_prefix_t pfx = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+		    .ip4 = a->ip4,
+		    }
+	,
+      };
+      u32 fib_index;
+
+      pool_get (am->ip4_entry_pool, e);
+
+      if (NULL == arp_int->arp_entries)
+	{
+	  arp_int->arp_entries = hash_create (0, sizeof (u32));
+	}
+
+      hash_set (arp_int->arp_entries, a->ip4.as_u32, e - am->ip4_entry_pool);
+
+      e->sw_if_index = sw_if_index;
+      e->ip4_address = a->ip4;
+      clib_memcpy (e->ethernet_address,
+		   a->ethernet, sizeof (e->ethernet_address));
+
+      fib_index = ip4_fib_table_get_index_for_sw_if_index (e->sw_if_index);
+      e->fib_entry_index =
+	fib_table_entry_update_one_path (fib_index,
+					 &pfx,
+					 FIB_SOURCE_ADJ,
+					 FIB_ENTRY_FLAG_ATTACHED,
+					 FIB_PROTOCOL_IP4,
+					 &pfx.fp_addr,
+					 e->sw_if_index,
+					 ~0,
+					 1, NULL, FIB_ROUTE_PATH_FLAG_NONE);
+    }
+  else
+    {
+      /*
+       * prevent a DoS attack from the data-plane that
+       * spams us with no-op updates to the MAC address
+       */
+      if (0 == memcmp (e->ethernet_address,
+		       a->ethernet, sizeof (e->ethernet_address)))
+	return -1;
+
+      /* Update time stamp and ethernet address. */
+      clib_memcpy (e->ethernet_address, a->ethernet,
+		   sizeof (e->ethernet_address));
+    }
+
+  e->cpu_time_last_updated = clib_cpu_time_now ();
+  if (is_static)
+    e->flags |= ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC;
+  else
+    e->flags |= ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC;
+
+  adj_nbr_walk_nh4 (sw_if_index, &e->ip4_address, arp_mk_complete_walk, e);
+
+  /* Customer(s) waiting for this address to be resolved? */
+  p = hash_get (am->pending_resolutions_by_address, a->ip4.as_u32);
+  if (p)
+    {
+      u32 next_index;
+      next_index = p[0];
+
+      while (next_index != (u32) ~ 0)
+	{
+	  pr = pool_elt_at_index (am->pending_resolutions, next_index);
+	  vlib_process_signal_event (vm, pr->node_index,
+				     pr->type_opaque, pr->data);
+	  next_index = pr->next_index;
+	  pool_put (am->pending_resolutions, pr);
+	}
+
+      hash_unset (am->pending_resolutions_by_address, a->ip4.as_u32);
+    }
+
+  /* Customer(s) requesting ARP event for this address? */
+  p = hash_get (am->mac_changes_by_address, a->ip4.as_u32);
+  if (p)
+    {
+      u32 next_index;
+      next_index = p[0];
+
+      while (next_index != (u32) ~ 0)
+	{
+	  int (*fp) (u32, u8 *, u32, u32);
+	  int rv = 1;
+	  mc = pool_elt_at_index (am->mac_changes, next_index);
+	  fp = mc->data_callback;
+
+	  /* Call the user's data callback, return 1 to suppress dup events */
+	  if (fp)
+	    rv = (*fp) (mc->data, a->ethernet, sw_if_index, 0);
+
+	  /*
+	   * Signal the resolver process, as long as the user
+	   * says they want to be notified
+	   */
+	  if (rv == 0)
+	    vlib_process_signal_event (vm, mc->node_index,
+				       mc->type_opaque, mc->data);
+	  next_index = mc->next_index;
+	}
+    }
+
+  return 0;
+}
+
+void
+vnet_register_ip4_arp_resolution_event (vnet_main_t * vnm,
+					void *address_arg,
+					uword node_index,
+					uword type_opaque, uword data)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ip4_address_t *address = address_arg;
+  uword *p;
+  pending_resolution_t *pr;
+
+  pool_get (am->pending_resolutions, pr);
+
+  pr->next_index = ~0;
+  pr->node_index = node_index;
+  pr->type_opaque = type_opaque;
+  pr->data = data;
+  pr->data_callback = 0;
+
+  p = hash_get (am->pending_resolutions_by_address, address->as_u32);
+  if (p)
+    {
+      /* Insert new resolution at the head of the list */
+      pr->next_index = p[0];
+      hash_unset (am->pending_resolutions_by_address, address->as_u32);
+    }
+
+  hash_set (am->pending_resolutions_by_address, address->as_u32,
+	    pr - am->pending_resolutions);
+}
+
+int
+vnet_add_del_ip4_arp_change_event (vnet_main_t * vnm,
+				   void *data_callback,
+				   u32 pid,
+				   void *address_arg,
+				   uword node_index,
+				   uword type_opaque, uword data, int is_add)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ip4_address_t *address = address_arg;
+  uword *p;
+  pending_resolution_t *mc;
+  void (*fp) (u32, u8 *) = data_callback;
+
+  if (is_add)
+    {
+      pool_get (am->mac_changes, mc);
+
+      mc->next_index = ~0;
+      mc->node_index = node_index;
+      mc->type_opaque = type_opaque;
+      mc->data = data;
+      mc->data_callback = data_callback;
+      mc->pid = pid;
+
+      p = hash_get (am->mac_changes_by_address, address->as_u32);
+      if (p)
+	{
+	  /* Insert new resolution at the head of the list */
+	  mc->next_index = p[0];
+	  hash_unset (am->mac_changes_by_address, address->as_u32);
+	}
+
+      hash_set (am->mac_changes_by_address, address->as_u32,
+		mc - am->mac_changes);
+      return 0;
+    }
+  else
+    {
+      u32 index;
+      pending_resolution_t *mc_last = 0;
+
+      p = hash_get (am->mac_changes_by_address, address->as_u32);
+      if (p == 0)
+	return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+      index = p[0];
+
+      while (index != (u32) ~ 0)
+	{
+	  mc = pool_elt_at_index (am->mac_changes, index);
+	  if (mc->node_index == node_index &&
+	      mc->type_opaque == type_opaque && mc->pid == pid)
+	    {
+	      /* Clients may need to clean up pool entries, too */
+	      if (fp)
+		(*fp) (mc->data, 0 /* no new mac addrs */ );
+	      if (index == p[0])
+		{
+		  hash_unset (am->mac_changes_by_address, address->as_u32);
+		  if (mc->next_index != ~0)
+		    hash_set (am->mac_changes_by_address, address->as_u32,
+			      mc->next_index);
+		  pool_put (am->mac_changes, mc);
+		  return 0;
+		}
+	      else
+		{
+		  ASSERT (mc_last);
+		  mc_last->next_index = mc->next_index;
+		  pool_put (am->mac_changes, mc);
+		  return 0;
+		}
+	    }
+	  mc_last = mc;
+	  index = mc->next_index;
+	}
+
+      return VNET_API_ERROR_NO_SUCH_ENTRY;
+    }
+}
+
+/* Either we drop the packet or we send a reply to the sender. */
+typedef enum
+{
+  ARP_INPUT_NEXT_DROP,
+  ARP_INPUT_NEXT_REPLY_TX,
+  ARP_INPUT_N_NEXT,
+} arp_input_next_t;
+
+#define foreach_ethernet_arp_error					\
+  _ (replies_sent, "ARP replies sent")					\
+  _ (l2_type_not_ethernet, "L2 type not ethernet")			\
+  _ (l3_type_not_ip4, "L3 type not IP4")				\
+  _ (l3_src_address_not_local, "IP4 source address not local to subnet") \
+  _ (l3_dst_address_not_local, "IP4 destination address not local to subnet") \
+  _ (l3_src_address_is_local, "IP4 source address matches local interface") \
+  _ (l3_src_address_learned, "ARP request IP4 source address learned")  \
+  _ (replies_received, "ARP replies received")				\
+  _ (opcode_not_request, "ARP opcode not request")                      \
+  _ (proxy_arp_replies_sent, "Proxy ARP replies sent")			\
+  _ (l2_address_mismatch, "ARP hw addr does not match L2 frame src addr") \
+  _ (missing_interface_address, "ARP missing interface address") \
+  _ (gratuitous_arp, "ARP probe or announcement dropped") \
+  _ (interface_no_table, "Interface is not mapped to an IP table") \
+
+typedef enum
+{
+#define _(sym,string) ETHERNET_ARP_ERROR_##sym,
+  foreach_ethernet_arp_error
+#undef _
+    ETHERNET_ARP_N_ERROR,
+} ethernet_arp_input_error_t;
+
+
+static void
+unset_random_arp_entry (void)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ethernet_arp_ip4_entry_t *e;
+  vnet_main_t *vnm = vnet_get_main ();
+  ethernet_arp_ip4_over_ethernet_address_t delme;
+  u32 index;
+
+  index = pool_next_index (am->ip4_entry_pool, am->arp_delete_rotor);
+  am->arp_delete_rotor = index;
+
+  /* Try again from elt 0, could happen if an intfc goes down */
+  if (index == ~0)
+    {
+      index = pool_next_index (am->ip4_entry_pool, am->arp_delete_rotor);
+      am->arp_delete_rotor = index;
+    }
+
+  /* Nothing left in the pool */
+  if (index == ~0)
+    return;
+
+  e = pool_elt_at_index (am->ip4_entry_pool, index);
+
+  clib_memcpy (&delme.ethernet, e->ethernet_address, 6);
+  delme.ip4.as_u32 = e->ip4_address.as_u32;
+
+  vnet_arp_unset_ip4_over_ethernet (vnm, e->sw_if_index, &delme);
+}
+
+static int
+arp_unnumbered (vlib_buffer_t * p0,
+		u32 pi0, ethernet_header_t * eth0, u32 sw_if_index)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *vim = &vnm->interface_main;
+  vnet_sw_interface_t *si;
+  vnet_hw_interface_t *hi;
+  u32 unnum_src_sw_if_index;
+  u32 *broadcast_swifs = 0;
+  u32 *buffers = 0;
+  u32 n_alloc = 0;
+  vlib_buffer_t *b0;
+  int i;
+  u8 dst_mac_address[6];
+  i16 header_size;
+  ethernet_arp_header_t *arp0;
+
+  /* Save the dst mac address */
+  clib_memcpy (dst_mac_address, eth0->dst_address, sizeof (dst_mac_address));
+
+  /* Figure out which sw_if_index supplied the address */
+  unnum_src_sw_if_index = sw_if_index;
+
+  /* Track down all users of the unnumbered source */
+  /* *INDENT-OFF* */
+  pool_foreach (si, vim->sw_interfaces,
+  ({
+    if (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED &&
+	(si->unnumbered_sw_if_index == unnum_src_sw_if_index))
+      {
+	vec_add1 (broadcast_swifs, si->sw_if_index);
+      }
+  }));
+  /* *INDENT-ON* */
+
+  /* If there are no interfaces un-unmbered to this interface,
+     we are done  here. */
+  if (0 == vec_len (broadcast_swifs))
+    return 0;
+
+  /* Allocate buffering if we need it */
+  if (vec_len (broadcast_swifs) > 1)
+    {
+      vec_validate (buffers, vec_len (broadcast_swifs) - 2);
+      n_alloc = vlib_buffer_alloc (vm, buffers, vec_len (buffers));
+      _vec_len (buffers) = n_alloc;
+      for (i = 0; i < n_alloc; i++)
+	{
+	  b0 = vlib_get_buffer (vm, buffers[i]);
+
+	  /* xerox (partially built) ARP pkt */
+	  clib_memcpy (b0->data, p0->data,
+		       p0->current_length + p0->current_data);
+	  b0->current_data = p0->current_data;
+	  b0->current_length = p0->current_length;
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
+	    vnet_buffer (p0)->sw_if_index[VLIB_RX];
+	}
+    }
+
+  vec_insert (buffers, 1, 0);
+  buffers[0] = pi0;
+
+  for (i = 0; i < vec_len (buffers); i++)
+    {
+      b0 = vlib_get_buffer (vm, buffers[i]);
+      arp0 = vlib_buffer_get_current (b0);
+
+      hi = vnet_get_sup_hw_interface (vnm, broadcast_swifs[i]);
+      si = vnet_get_sw_interface (vnm, broadcast_swifs[i]);
+
+      /* For decoration, most likely */
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = hi->sw_if_index;
+
+      /* Fix ARP pkt src address */
+      clib_memcpy (arp0->ip4_over_ethernet[0].ethernet, hi->hw_address, 6);
+
+      /* Build L2 encaps for this swif */
+      header_size = sizeof (ethernet_header_t);
+      if (si->sub.eth.flags.one_tag)
+	header_size += 4;
+      else if (si->sub.eth.flags.two_tags)
+	header_size += 8;
+
+      vlib_buffer_advance (b0, -header_size);
+      eth0 = vlib_buffer_get_current (b0);
+
+      if (si->sub.eth.flags.one_tag)
+	{
+	  ethernet_vlan_header_t *outer = (void *) (eth0 + 1);
+
+	  eth0->type = si->sub.eth.flags.dot1ad ?
+	    clib_host_to_net_u16 (ETHERNET_TYPE_DOT1AD) :
+	    clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
+	  outer->priority_cfi_and_id =
+	    clib_host_to_net_u16 (si->sub.eth.outer_vlan_id);
+	  outer->type = clib_host_to_net_u16 (ETHERNET_TYPE_ARP);
+
+	}
+      else if (si->sub.eth.flags.two_tags)
+	{
+	  ethernet_vlan_header_t *outer = (void *) (eth0 + 1);
+	  ethernet_vlan_header_t *inner = (void *) (outer + 1);
+
+	  eth0->type = si->sub.eth.flags.dot1ad ?
+	    clib_host_to_net_u16 (ETHERNET_TYPE_DOT1AD) :
+	    clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
+	  outer->priority_cfi_and_id =
+	    clib_host_to_net_u16 (si->sub.eth.outer_vlan_id);
+	  outer->type = clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
+	  inner->priority_cfi_and_id =
+	    clib_host_to_net_u16 (si->sub.eth.inner_vlan_id);
+	  inner->type = clib_host_to_net_u16 (ETHERNET_TYPE_ARP);
+
+	}
+      else
+	{
+	  eth0->type = clib_host_to_net_u16 (ETHERNET_TYPE_ARP);
+	}
+
+      /* Restore the original dst address, set src address */
+      clib_memcpy (eth0->dst_address, dst_mac_address,
+		   sizeof (eth0->dst_address));
+      clib_memcpy (eth0->src_address, hi->hw_address,
+		   sizeof (eth0->src_address));
+
+      /* Transmit replicas */
+      if (i > 0)
+	{
+	  vlib_frame_t *f =
+	    vlib_get_frame_to_node (vm, hi->output_node_index);
+	  u32 *to_next = vlib_frame_vector_args (f);
+	  to_next[0] = buffers[i];
+	  f->n_vectors = 1;
+	  vlib_put_frame_to_node (vm, hi->output_node_index, f);
+	}
+    }
+
+  /* The regular path outputs the original pkt.. */
+  vnet_buffer (p0)->sw_if_index[VLIB_TX] = broadcast_swifs[0];
+
+  vec_free (broadcast_swifs);
+  vec_free (buffers);
+
+  return !0;
+}
+
+static uword
+arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  ip4_main_t *im4 = &ip4_main;
+  u32 n_left_from, next_index, *from, *to_next;
+  u32 n_replies_sent = 0, n_proxy_arp_replies_sent = 0;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+				   /* stride */ 1,
+				   sizeof (ethernet_arp_input_trace_t));
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  vnet_hw_interface_t *hw_if0;
+	  ethernet_arp_header_t *arp0;
+	  ethernet_header_t *eth0;
+	  ip_adjacency_t *adj0;
+	  ip4_address_t *if_addr0, proxy_src;
+	  u32 pi0, error0, next0, sw_if_index0, conn_sw_if_index0, fib_index0;
+	  u8 is_request0, dst_is_local0, is_unnum0;
+	  ethernet_proxy_arp_t *pa;
+	  fib_node_index_t dst_fei, src_fei;
+	  fib_prefix_t pfx0;
+	  fib_entry_flag_t src_flags, dst_flags;
+
+	  pi0 = from[0];
+	  to_next[0] = pi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+	  pa = 0;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  arp0 = vlib_buffer_get_current (p0);
+
+	  is_request0 = arp0->opcode
+	    == clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_request);
+
+	  error0 = ETHERNET_ARP_ERROR_replies_sent;
+
+	  error0 =
+	    (arp0->l2_type !=
+	     clib_net_to_host_u16 (ETHERNET_ARP_HARDWARE_TYPE_ethernet) ?
+	     ETHERNET_ARP_ERROR_l2_type_not_ethernet : error0);
+	  error0 =
+	    (arp0->l3_type !=
+	     clib_net_to_host_u16 (ETHERNET_TYPE_IP4) ?
+	     ETHERNET_ARP_ERROR_l3_type_not_ip4 : error0);
+
+	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
+
+	  if (error0)
+	    goto drop2;
+
+	  /* Check that IP address is local and matches incoming interface. */
+	  fib_index0 = ip4_fib_table_get_index_for_sw_if_index (sw_if_index0);
+	  if (~0 == fib_index0)
+	    {
+	      error0 = ETHERNET_ARP_ERROR_interface_no_table;
+	      goto drop2;
+
+	    }
+	  dst_fei = ip4_fib_table_lookup (ip4_fib_get (fib_index0),
+					  &arp0->ip4_over_ethernet[1].ip4,
+					  32);
+	  dst_flags = fib_entry_get_flags_for_source (dst_fei,
+						      FIB_SOURCE_INTERFACE);
+
+	  conn_sw_if_index0 =
+	    fib_entry_get_resolving_interface_for_source (dst_fei,
+							  FIB_SOURCE_INTERFACE);
+
+	  if (!(FIB_ENTRY_FLAG_CONNECTED & dst_flags))
+	    {
+	      error0 = ETHERNET_ARP_ERROR_l3_dst_address_not_local;
+	      goto drop1;
+	    }
+
+	  /* Honor unnumbered interface, if any */
+	  is_unnum0 = sw_if_index0 != conn_sw_if_index0;
+
+	  /* Source must also be local to subnet of matching interface address. */
+	  src_fei = ip4_fib_table_lookup (ip4_fib_get (fib_index0),
+					  &arp0->ip4_over_ethernet[0].ip4,
+					  32);
+	  src_flags = fib_entry_get_flags (src_fei);
+
+	  if (!((FIB_ENTRY_FLAG_ATTACHED & src_flags) ||
+		(FIB_ENTRY_FLAG_CONNECTED & src_flags)) ||
+	      sw_if_index0 != fib_entry_get_resolving_interface (src_fei))
+	    {
+	      error0 = ETHERNET_ARP_ERROR_l3_src_address_not_local;
+	      goto drop2;
+	    }
+
+	  /* Reject requests/replies with our local interface address. */
+	  if (FIB_ENTRY_FLAG_LOCAL & src_flags)
+	    {
+	      error0 = ETHERNET_ARP_ERROR_l3_src_address_is_local;
+	      goto drop2;
+	    }
+
+	  dst_is_local0 = (FIB_ENTRY_FLAG_LOCAL & dst_flags);
+	  fib_entry_get_prefix (dst_fei, &pfx0);
+	  if_addr0 = &pfx0.fp_addr.ip4;
+
+	  /* Fill in ethernet header. */
+	  eth0 = ethernet_buffer_get_header (p0);
+
+	  /* Trash ARP packets whose ARP-level source addresses do not
+	     match their L2-frame-level source addresses */
+	  if (memcmp (eth0->src_address, arp0->ip4_over_ethernet[0].ethernet,
+		      sizeof (eth0->src_address)))
+	    {
+	      error0 = ETHERNET_ARP_ERROR_l2_address_mismatch;
+	      goto drop2;
+	    }
+
+	  /* Learn or update sender's mapping only for requests or unicasts
+	     that don't match local interface address. */
+	  if (ethernet_address_cast (eth0->dst_address) ==
+	      ETHERNET_ADDRESS_UNICAST || is_request0)
+	    {
+	      if (am->limit_arp_cache_size &&
+		  pool_elts (am->ip4_entry_pool) >= am->limit_arp_cache_size)
+		unset_random_arp_entry ();
+
+	      vnet_arp_set_ip4_over_ethernet (vnm, sw_if_index0,
+					      &arp0->ip4_over_ethernet[0],
+					      0 /* is_static */ );
+	      error0 = ETHERNET_ARP_ERROR_l3_src_address_learned;
+	    }
+
+	  /* Only send a reply for requests sent which match a local interface. */
+	  if (!(is_request0 && dst_is_local0))
+	    {
+	      error0 =
+		(arp0->opcode ==
+		 clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply) ?
+		 ETHERNET_ARP_ERROR_replies_received : error0);
+	      goto drop1;
+	    }
+
+	  /* Send a reply. */
+	send_reply:
+	  vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0;
+	  hw_if0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
+
+	  /* Send reply back through input interface */
+	  vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0;
+	  next0 = ARP_INPUT_NEXT_REPLY_TX;
+
+	  arp0->opcode = clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply);
+
+	  arp0->ip4_over_ethernet[1] = arp0->ip4_over_ethernet[0];
+
+	  clib_memcpy (arp0->ip4_over_ethernet[0].ethernet,
+		       hw_if0->hw_address, 6);
+	  clib_mem_unaligned (&arp0->ip4_over_ethernet[0].ip4.data_u32, u32) =
+	    if_addr0->data_u32;
+
+	  /* Hardware must be ethernet-like. */
+	  ASSERT (vec_len (hw_if0->hw_address) == 6);
+
+	  clib_memcpy (eth0->dst_address, eth0->src_address, 6);
+	  clib_memcpy (eth0->src_address, hw_if0->hw_address, 6);
+
+	  /* Figure out how much to rewind current data from adjacency. */
+	  /* get the adj from the destination's covering connected */
+	  if (NULL == pa)
+	    {
+	      adj0 =
+		adj_get (fib_entry_get_adj_for_source
+			 (ip4_fib_table_lookup
+			  (ip4_fib_get (fib_index0),
+			   &arp0->ip4_over_ethernet[1].ip4, 31),
+			  FIB_SOURCE_INTERFACE));
+	      if (adj0->lookup_next_index != IP_LOOKUP_NEXT_GLEAN)
+		{
+		  error0 = ETHERNET_ARP_ERROR_missing_interface_address;
+		  goto drop2;
+		}
+	      if (is_unnum0)
+		{
+		  if (!arp_unnumbered (p0, pi0, eth0, conn_sw_if_index0))
+		    goto drop2;
+		}
+	      else
+		vlib_buffer_advance (p0, -adj0->rewrite_header.data_bytes);
+	    }
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, pi0, next0);
+
+	  n_replies_sent += 1;
+	  continue;
+
+	drop1:
+	  if (0 == arp0->ip4_over_ethernet[0].ip4.as_u32 ||
+	      (arp0->ip4_over_ethernet[0].ip4.as_u32 ==
+	       arp0->ip4_over_ethernet[1].ip4.as_u32))
+	    {
+	      error0 = ETHERNET_ARP_ERROR_gratuitous_arp;
+	      goto drop2;
+	    }
+	  /* See if proxy arp is configured for the address */
+	  if (is_request0)
+	    {
+	      vnet_sw_interface_t *si;
+	      u32 this_addr = clib_net_to_host_u32
+		(arp0->ip4_over_ethernet[1].ip4.as_u32);
+	      u32 fib_index0;
+
+	      si = vnet_get_sw_interface (vnm, sw_if_index0);
+
+	      if (!(si->flags & VNET_SW_INTERFACE_FLAG_PROXY_ARP))
+		goto drop2;
+
+	      fib_index0 = vec_elt (im4->fib_index_by_sw_if_index,
+				    sw_if_index0);
+
+	      vec_foreach (pa, am->proxy_arps)
+	      {
+		u32 lo_addr = clib_net_to_host_u32 (pa->lo_addr);
+		u32 hi_addr = clib_net_to_host_u32 (pa->hi_addr);
+
+		/* an ARP request hit in the proxy-arp table? */
+		if ((this_addr >= lo_addr && this_addr <= hi_addr) &&
+		    (fib_index0 == pa->fib_index))
+		  {
+		    eth0 = ethernet_buffer_get_header (p0);
+		    proxy_src.as_u32 =
+		      arp0->ip4_over_ethernet[1].ip4.data_u32;
+
+		    /*
+		     * Rewind buffer, direct code above not to
+		     * think too hard about it.
+		     */
+		    if_addr0 = &proxy_src;
+		    is_unnum0 = 0;
+		    i32 ethernet_start =
+		      vnet_buffer (p0)->ethernet.start_of_ethernet_header;
+		    i32 rewind = p0->current_data - ethernet_start;
+		    vlib_buffer_advance (p0, -rewind);
+		    n_proxy_arp_replies_sent++;
+		    goto send_reply;
+		  }
+	      }
+	    }
+
+	drop2:
+
+	  next0 = ARP_INPUT_NEXT_DROP;
+	  p0->error = node->errors[error0];
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, pi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_error_count (vm, node->node_index,
+		    ETHERNET_ARP_ERROR_replies_sent,
+		    n_replies_sent - n_proxy_arp_replies_sent);
+
+  vlib_error_count (vm, node->node_index,
+		    ETHERNET_ARP_ERROR_proxy_arp_replies_sent,
+		    n_proxy_arp_replies_sent);
+  return frame->n_vectors;
+}
+
+static char *ethernet_arp_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ethernet_arp_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (arp_input_node, static) =
+{
+  .function = arp_input,
+  .name = "arp-input",
+  .vector_size = sizeof (u32),
+  .n_errors = ETHERNET_ARP_N_ERROR,
+  .error_strings = ethernet_arp_error_strings,
+  .n_next_nodes = ARP_INPUT_N_NEXT,
+  .next_nodes = {
+    [ARP_INPUT_NEXT_DROP] = "error-drop",
+    [ARP_INPUT_NEXT_REPLY_TX] = "interface-output",
+  },
+  .format_buffer = format_ethernet_arp_header,
+  .format_trace = format_ethernet_arp_input_trace,
+};
+/* *INDENT-ON* */
+
+static int
+ip4_arp_entry_sort (void *a1, void *a2)
+{
+  ethernet_arp_ip4_entry_t *e1 = a1;
+  ethernet_arp_ip4_entry_t *e2 = a2;
+
+  int cmp;
+  vnet_main_t *vnm = vnet_get_main ();
+
+  cmp = vnet_sw_interface_compare (vnm, e1->sw_if_index, e2->sw_if_index);
+  if (!cmp)
+    cmp = ip4_address_compare (&e1->ip4_address, &e2->ip4_address);
+  return cmp;
+}
+
+ethernet_arp_ip4_entry_t *
+ip4_neighbor_entries (u32 sw_if_index)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ethernet_arp_ip4_entry_t *n, *ns = 0;
+
+  /* *INDENT-OFF* */
+  pool_foreach (n, am->ip4_entry_pool, ({
+    if (sw_if_index != ~0 && n->sw_if_index != sw_if_index)
+      continue;
+    vec_add1 (ns, n[0]);
+  }));
+  /* *INDENT-ON* */
+
+  if (ns)
+    vec_sort_with_function (ns, ip4_arp_entry_sort);
+  return ns;
+}
+
+static clib_error_t *
+show_ip4_arp (vlib_main_t * vm,
+	      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ethernet_arp_ip4_entry_t *e, *es;
+  ethernet_proxy_arp_t *pa;
+  clib_error_t *error = 0;
+  u32 sw_if_index;
+
+  /* Filter entries by interface if given. */
+  sw_if_index = ~0;
+  (void) unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index);
+
+  es = ip4_neighbor_entries (sw_if_index);
+  if (es)
+    {
+      vlib_cli_output (vm, "%U", format_ethernet_arp_ip4_entry, vnm, 0);
+      vec_foreach (e, es)
+      {
+	vlib_cli_output (vm, "%U", format_ethernet_arp_ip4_entry, vnm, e);
+      }
+      vec_free (es);
+    }
+
+  if (vec_len (am->proxy_arps))
+    {
+      vlib_cli_output (vm, "Proxy arps enabled for:");
+      vec_foreach (pa, am->proxy_arps)
+      {
+	vlib_cli_output (vm, "Fib_index %d   %U - %U ",
+			 pa->fib_index,
+			 format_ip4_address, &pa->lo_addr,
+			 format_ip4_address, &pa->hi_addr);
+      }
+    }
+
+  return error;
+}
+
+/*?
+ * Display all the IPv4 ARP entries.
+ *
+ * @cliexpar
+ * Example of how to display the IPv4 ARP table:
+ * @cliexstart{show ip arp}
+ *    Time      FIB        IP4       Flags      Ethernet              Interface
+ *    346.3028   0       6.1.1.3            de:ad:be:ef:ba:be   GigabitEthernet2/0/0
+ *   3077.4271   0       6.1.1.4       S    de:ad:be:ef:ff:ff   GigabitEthernet2/0/0
+ *   2998.6409   1       6.2.2.3            de:ad:be:ef:00:01   GigabitEthernet2/0/0
+ * Proxy arps enabled for:
+ * Fib_index 0   6.0.0.1 - 6.0.0.11
+ * @cliexend
+ ?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_ip4_arp_command, static) = {
+  .path = "show ip arp",
+  .function = show_ip4_arp,
+  .short_help = "show ip arp",
+};
+/* *INDENT-ON* */
+
+typedef struct
+{
+  pg_edit_t l2_type, l3_type;
+  pg_edit_t n_l2_address_bytes, n_l3_address_bytes;
+  pg_edit_t opcode;
+  struct
+  {
+    pg_edit_t ethernet;
+    pg_edit_t ip4;
+  } ip4_over_ethernet[2];
+} pg_ethernet_arp_header_t;
+
+static inline void
+pg_ethernet_arp_header_init (pg_ethernet_arp_header_t * p)
+{
+  /* Initialize fields that are not bit fields in the IP header. */
+#define _(f) pg_edit_init (&p->f, ethernet_arp_header_t, f);
+  _(l2_type);
+  _(l3_type);
+  _(n_l2_address_bytes);
+  _(n_l3_address_bytes);
+  _(opcode);
+  _(ip4_over_ethernet[0].ethernet);
+  _(ip4_over_ethernet[0].ip4);
+  _(ip4_over_ethernet[1].ethernet);
+  _(ip4_over_ethernet[1].ip4);
+#undef _
+}
+
+uword
+unformat_pg_arp_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  pg_ethernet_arp_header_t *p;
+  u32 group_index;
+
+  p = pg_create_edit_group (s, sizeof (p[0]), sizeof (ethernet_arp_header_t),
+			    &group_index);
+  pg_ethernet_arp_header_init (p);
+
+  /* Defaults. */
+  pg_edit_set_fixed (&p->l2_type, ETHERNET_ARP_HARDWARE_TYPE_ethernet);
+  pg_edit_set_fixed (&p->l3_type, ETHERNET_TYPE_IP4);
+  pg_edit_set_fixed (&p->n_l2_address_bytes, 6);
+  pg_edit_set_fixed (&p->n_l3_address_bytes, 4);
+
+  if (!unformat (input, "%U: %U/%U -> %U/%U",
+		 unformat_pg_edit,
+		 unformat_ethernet_arp_opcode_net_byte_order, &p->opcode,
+		 unformat_pg_edit,
+		 unformat_ethernet_address, &p->ip4_over_ethernet[0].ethernet,
+		 unformat_pg_edit,
+		 unformat_ip4_address, &p->ip4_over_ethernet[0].ip4,
+		 unformat_pg_edit,
+		 unformat_ethernet_address, &p->ip4_over_ethernet[1].ethernet,
+		 unformat_pg_edit,
+		 unformat_ip4_address, &p->ip4_over_ethernet[1].ip4))
+    {
+      /* Free up any edits we may have added. */
+      pg_free_edit_group (s);
+      return 0;
+    }
+  return 1;
+}
+
+clib_error_t *
+ip4_set_arp_limit (u32 arp_limit)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+
+  am->limit_arp_cache_size = arp_limit;
+  return 0;
+}
+
+/**
+ * @brief Control Plane hook to remove an ARP entry
+ */
+int
+vnet_arp_unset_ip4_over_ethernet (vnet_main_t * vnm,
+				  u32 sw_if_index, void *a_arg)
+{
+  ethernet_arp_ip4_over_ethernet_address_t *a = a_arg;
+  vnet_arp_set_ip4_over_ethernet_rpc_args_t args;
+
+  args.sw_if_index = sw_if_index;
+  args.flags = ETHERNET_ARP_ARGS_REMOVE;
+  clib_memcpy (&args.a, a, sizeof (*a));
+
+  vl_api_rpc_call_main_thread (set_ip4_over_ethernet_rpc_callback,
+			       (u8 *) & args, sizeof (args));
+  return 0;
+}
+
+/**
+ * @brief Internally generated event to flush the ARP cache on an
+ * interface state change event.
+ * A flush will remove dynamic ARP entries, and for statics remove the MAC
+ * address from the corresponding adjacencies.
+ */
+static int
+vnet_arp_flush_ip4_over_ethernet (vnet_main_t * vnm,
+				  u32 sw_if_index, void *a_arg)
+{
+  ethernet_arp_ip4_over_ethernet_address_t *a = a_arg;
+  vnet_arp_set_ip4_over_ethernet_rpc_args_t args;
+
+  args.sw_if_index = sw_if_index;
+  args.flags = ETHERNET_ARP_ARGS_FLUSH;
+  clib_memcpy (&args.a, a, sizeof (*a));
+
+  vl_api_rpc_call_main_thread (set_ip4_over_ethernet_rpc_callback,
+			       (u8 *) & args, sizeof (args));
+  return 0;
+}
+
+/**
+ * @brief Internally generated event to populate the ARP cache on an
+ * interface state change event.
+ * For static entries this will re-source the adjacencies.
+ *
+ * @param sw_if_index The interface on which the ARP entires are acted
+ */
+static int
+vnet_arp_populate_ip4_over_ethernet (vnet_main_t * vnm,
+				     u32 sw_if_index, void *a_arg)
+{
+  ethernet_arp_ip4_over_ethernet_address_t *a = a_arg;
+  vnet_arp_set_ip4_over_ethernet_rpc_args_t args;
+
+  args.sw_if_index = sw_if_index;
+  args.flags = ETHERNET_ARP_ARGS_POPULATE;
+  clib_memcpy (&args.a, a, sizeof (*a));
+
+  vl_api_rpc_call_main_thread (set_ip4_over_ethernet_rpc_callback,
+			       (u8 *) & args, sizeof (args));
+  return 0;
+}
+
+/*
+ * arp_add_del_interface_address
+ *
+ * callback when an interface address is added or deleted
+ */
+static void
+arp_add_del_interface_address (ip4_main_t * im,
+			       uword opaque,
+			       u32 sw_if_index,
+			       ip4_address_t * address,
+			       u32 address_length,
+			       u32 if_address_index, u32 is_del)
+{
+  /*
+   * Flush the ARP cache of all entries covered by the address
+   * that is being removed.
+   */
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ethernet_arp_ip4_entry_t *e;
+
+  if (vec_len (am->ethernet_arp_by_sw_if_index) <= sw_if_index)
+    return;
+
+  if (is_del)
+    {
+      ethernet_arp_interface_t *eai;
+      u32 i, *to_delete = 0;
+      hash_pair_t *pair;
+
+      eai = &am->ethernet_arp_by_sw_if_index[sw_if_index];
+
+      /* *INDENT-OFF* */
+      hash_foreach_pair (pair, eai->arp_entries,
+      ({
+	e = pool_elt_at_index(am->ip4_entry_pool,
+			      pair->value[0]);
+	if (ip4_destination_matches_route (im, &e->ip4_address,
+					   address, address_length))
+	  {
+	    vec_add1 (to_delete, e - am->ip4_entry_pool);
+	  }
+      }));
+      /* *INDENT-ON* */
+
+      for (i = 0; i < vec_len (to_delete); i++)
+	{
+	  ethernet_arp_ip4_over_ethernet_address_t delme;
+	  e = pool_elt_at_index (am->ip4_entry_pool, to_delete[i]);
+
+	  clib_memcpy (&delme.ethernet, e->ethernet_address, 6);
+	  delme.ip4.as_u32 = e->ip4_address.as_u32;
+
+	  vnet_arp_flush_ip4_over_ethernet (vnet_get_main (),
+					    e->sw_if_index, &delme);
+	}
+
+      vec_free (to_delete);
+    }
+}
+
+static clib_error_t *
+ethernet_arp_init (vlib_main_t * vm)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ip4_main_t *im = &ip4_main;
+  clib_error_t *error;
+  pg_node_t *pn;
+
+  if ((error = vlib_call_init_function (vm, ethernet_init)))
+    return error;
+
+  ethernet_register_input_type (vm, ETHERNET_TYPE_ARP, arp_input_node.index);
+
+  pn = pg_get_node (arp_input_node.index);
+  pn->unformat_edit = unformat_pg_arp_header;
+
+  am->opcode_by_name = hash_create_string (0, sizeof (uword));
+#define _(o) hash_set_mem (am->opcode_by_name, #o, ETHERNET_ARP_OPCODE_##o);
+  foreach_ethernet_arp_opcode;
+#undef _
+
+  /* $$$ configurable */
+  am->limit_arp_cache_size = 50000;
+
+  am->pending_resolutions_by_address = hash_create (0, sizeof (uword));
+  am->mac_changes_by_address = hash_create (0, sizeof (uword));
+
+  /* don't trace ARP error packets */
+  {
+    vlib_node_runtime_t *rt =
+      vlib_node_get_runtime (vm, arp_input_node.index);
+
+#define _(a,b)                                  \
+    vnet_pcap_drop_trace_filter_add_del         \
+        (rt->errors[ETHERNET_ARP_ERROR_##a],    \
+         1 /* is_add */);
+    foreach_ethernet_arp_error
+#undef _
+  }
+
+  ip4_add_del_interface_address_callback_t cb;
+  cb.function = arp_add_del_interface_address;
+  cb.function_opaque = 0;
+  vec_add1 (im->add_del_interface_address_callbacks, cb);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ethernet_arp_init);
+
+static void
+arp_entry_free (ethernet_arp_interface_t * eai, ethernet_arp_ip4_entry_t * e)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+
+  fib_table_entry_delete_index (e->fib_entry_index, FIB_SOURCE_ADJ);
+  hash_unset (eai->arp_entries, e->ip4_address.as_u32);
+  pool_put (am->ip4_entry_pool, e);
+}
+
+static inline int
+vnet_arp_unset_ip4_over_ethernet_internal (vnet_main_t * vnm,
+					   vnet_arp_set_ip4_over_ethernet_rpc_args_t
+					   * args)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ethernet_arp_ip4_entry_t *e;
+  ethernet_arp_interface_t *eai;
+
+  eai = &am->ethernet_arp_by_sw_if_index[args->sw_if_index];
+
+  e = arp_entry_find (eai, &args->a.ip4);
+
+  if (NULL != e)
+    {
+      arp_entry_free (eai, e);
+
+      adj_nbr_walk_nh4 (e->sw_if_index,
+			&e->ip4_address, arp_mk_incomplete_walk, NULL);
+    }
+
+  return 0;
+}
+
+static int
+vnet_arp_flush_ip4_over_ethernet_internal (vnet_main_t * vnm,
+					   vnet_arp_set_ip4_over_ethernet_rpc_args_t
+					   * args)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ethernet_arp_ip4_entry_t *e;
+  ethernet_arp_interface_t *eai;
+
+  eai = &am->ethernet_arp_by_sw_if_index[args->sw_if_index];
+
+  e = arp_entry_find (eai, &args->a.ip4);
+
+  if (NULL != e)
+    {
+      adj_nbr_walk_nh4 (e->sw_if_index,
+			&e->ip4_address, arp_mk_incomplete_walk, e);
+
+      /*
+       * The difference between flush and unset, is that an unset
+       * means delete for static and dynamic entries. A flush
+       * means delete only for dynamic. Flushing is what the DP
+       * does in response to interface events. unset is only done
+       * by the control plane.
+       */
+      if (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC)
+	{
+	  arp_entry_free (eai, e);
+	}
+    }
+  return (0);
+}
+
+static int
+vnet_arp_populate_ip4_over_ethernet_internal (vnet_main_t * vnm,
+					      vnet_arp_set_ip4_over_ethernet_rpc_args_t
+					      * args)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ethernet_arp_ip4_entry_t *e;
+  ethernet_arp_interface_t *eai;
+
+  eai = &am->ethernet_arp_by_sw_if_index[args->sw_if_index];
+
+  e = arp_entry_find (eai, &args->a.ip4);
+
+  if (NULL != e)
+    {
+      adj_nbr_walk_nh4 (e->sw_if_index,
+			&e->ip4_address, arp_mk_complete_walk, e);
+    }
+  return (0);
+}
+
+static void
+set_ip4_over_ethernet_rpc_callback (vnet_arp_set_ip4_over_ethernet_rpc_args_t
+				    * a)
+{
+  vnet_main_t *vm = vnet_get_main ();
+  ASSERT (os_get_cpu_number () == 0);
+
+  if (a->flags & ETHERNET_ARP_ARGS_REMOVE)
+    vnet_arp_unset_ip4_over_ethernet_internal (vm, a);
+  else if (a->flags & ETHERNET_ARP_ARGS_FLUSH)
+    vnet_arp_flush_ip4_over_ethernet_internal (vm, a);
+  else if (a->flags & ETHERNET_ARP_ARGS_POPULATE)
+    vnet_arp_populate_ip4_over_ethernet_internal (vm, a);
+  else
+    vnet_arp_set_ip4_over_ethernet_internal (vm, a);
+}
+
+/**
+ * @brief Invoked when the interface's admin state changes
+ */
+static clib_error_t *
+ethernet_arp_sw_interface_up_down (vnet_main_t * vnm,
+				   u32 sw_if_index, u32 flags)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ethernet_arp_ip4_entry_t *e;
+  u32 i, *to_delete = 0;
+
+  /* *INDENT-OFF* */
+  pool_foreach (e, am->ip4_entry_pool,
+  ({
+    if (e->sw_if_index == sw_if_index)
+      vec_add1 (to_delete,
+		e - am->ip4_entry_pool);
+  }));
+  /* *INDENT-ON* */
+
+  for (i = 0; i < vec_len (to_delete); i++)
+    {
+      ethernet_arp_ip4_over_ethernet_address_t delme;
+      e = pool_elt_at_index (am->ip4_entry_pool, to_delete[i]);
+
+      clib_memcpy (&delme.ethernet, e->ethernet_address, 6);
+      delme.ip4.as_u32 = e->ip4_address.as_u32;
+
+      if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+	{
+	  vnet_arp_populate_ip4_over_ethernet (vnm, e->sw_if_index, &delme);
+	}
+      else
+	{
+	  vnet_arp_flush_ip4_over_ethernet (vnm, e->sw_if_index, &delme);
+	}
+
+    }
+  vec_free (to_delete);
+
+  return 0;
+}
+
+VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (ethernet_arp_sw_interface_up_down);
+
+static void
+increment_ip4_and_mac_address (ethernet_arp_ip4_over_ethernet_address_t * a)
+{
+  u8 old;
+  int i;
+
+  for (i = 3; i >= 0; i--)
+    {
+      old = a->ip4.as_u8[i];
+      a->ip4.as_u8[i] += 1;
+      if (old < a->ip4.as_u8[i])
+	break;
+    }
+
+  for (i = 5; i >= 0; i--)
+    {
+      old = a->ethernet[i];
+      a->ethernet[i] += 1;
+      if (old < a->ethernet[i])
+	break;
+    }
+}
+
+int
+vnet_arp_set_ip4_over_ethernet (vnet_main_t * vnm,
+				u32 sw_if_index, void *a_arg, int is_static)
+{
+  ethernet_arp_ip4_over_ethernet_address_t *a = a_arg;
+  vnet_arp_set_ip4_over_ethernet_rpc_args_t args;
+
+  args.sw_if_index = sw_if_index;
+  args.is_static = is_static;
+  args.flags = 0;
+  clib_memcpy (&args.a, a, sizeof (*a));
+
+  vl_api_rpc_call_main_thread (set_ip4_over_ethernet_rpc_callback,
+			       (u8 *) & args, sizeof (args));
+  return 0;
+}
+
+int
+vnet_proxy_arp_add_del (ip4_address_t * lo_addr,
+			ip4_address_t * hi_addr, u32 fib_index, int is_del)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ethernet_proxy_arp_t *pa;
+  u32 found_at_index = ~0;
+
+  vec_foreach (pa, am->proxy_arps)
+  {
+    if (pa->lo_addr == lo_addr->as_u32
+	&& pa->hi_addr == hi_addr->as_u32 && pa->fib_index == fib_index)
+      {
+	found_at_index = pa - am->proxy_arps;
+	break;
+      }
+  }
+
+  if (found_at_index != ~0)
+    {
+      /* Delete, otherwise it's already in the table */
+      if (is_del)
+	vec_delete (am->proxy_arps, 1, found_at_index);
+      return 0;
+    }
+  /* delete, no such entry */
+  if (is_del)
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+  /* add, not in table */
+  vec_add2 (am->proxy_arps, pa, 1);
+  pa->lo_addr = lo_addr->as_u32;
+  pa->hi_addr = hi_addr->as_u32;
+  pa->fib_index = fib_index;
+  return 0;
+}
+
+/*
+ * Remove any proxy arp entries asdociated with the
+ * specificed fib.
+ */
+int
+vnet_proxy_arp_fib_reset (u32 fib_id)
+{
+  ip4_main_t *im = &ip4_main;
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ethernet_proxy_arp_t *pa;
+  u32 *entries_to_delete = 0;
+  u32 fib_index;
+  uword *p;
+  int i;
+
+  p = hash_get (im->fib_index_by_table_id, fib_id);
+  if (!p)
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+  fib_index = p[0];
+
+  vec_foreach (pa, am->proxy_arps)
+  {
+    if (pa->fib_index == fib_index)
+      {
+	vec_add1 (entries_to_delete, pa - am->proxy_arps);
+      }
+  }
+
+  for (i = 0; i < vec_len (entries_to_delete); i++)
+    {
+      vec_delete (am->proxy_arps, 1, entries_to_delete[i]);
+    }
+
+  vec_free (entries_to_delete);
+
+  return 0;
+}
+
+static clib_error_t *
+ip_arp_add_del_command_fn (vlib_main_t * vm,
+			   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index;
+  ethernet_arp_ip4_over_ethernet_address_t lo_addr, hi_addr, addr;
+  int addr_valid = 0;
+  int is_del = 0;
+  int count = 1;
+  u32 fib_index = 0;
+  u32 fib_id;
+  int is_static = 0;
+  int is_proxy = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      /* set ip arp TenGigE1/1/0/1 1.2.3.4 aa:bb:... or aabb.ccdd... */
+      if (unformat (input, "%U %U %U",
+		    unformat_vnet_sw_interface, vnm, &sw_if_index,
+		    unformat_ip4_address, &addr.ip4,
+		    unformat_ethernet_address, &addr.ethernet))
+	addr_valid = 1;
+
+      else if (unformat (input, "delete") || unformat (input, "del"))
+	is_del = 1;
+
+      else if (unformat (input, "static"))
+	is_static = 1;
+
+      else if (unformat (input, "count %d", &count))
+	;
+
+      else if (unformat (input, "fib-id %d", &fib_id))
+	{
+	  ip4_main_t *im = &ip4_main;
+	  uword *p = hash_get (im->fib_index_by_table_id, fib_id);
+	  if (!p)
+	    return clib_error_return (0, "fib ID %d doesn't exist\n", fib_id);
+	  fib_index = p[0];
+	}
+
+      else if (unformat (input, "proxy %U - %U",
+			 unformat_ip4_address, &lo_addr.ip4,
+			 unformat_ip4_address, &hi_addr.ip4))
+	is_proxy = 1;
+      else
+	break;
+    }
+
+  if (is_proxy)
+    {
+      (void) vnet_proxy_arp_add_del (&lo_addr.ip4, &hi_addr.ip4,
+				     fib_index, is_del);
+      return 0;
+    }
+
+  if (addr_valid)
+    {
+      int i;
+
+      for (i = 0; i < count; i++)
+	{
+	  if (is_del == 0)
+	    {
+	      uword event_type, *event_data = 0;
+
+	      /* Park the debug CLI until the arp entry is installed */
+	      vnet_register_ip4_arp_resolution_event
+		(vnm, &addr.ip4, vlib_current_process (vm),
+		 1 /* type */ , 0 /* data */ );
+
+	      vnet_arp_set_ip4_over_ethernet
+		(vnm, sw_if_index, &addr, is_static);
+
+	      vlib_process_wait_for_event (vm);
+	      event_type = vlib_process_get_events (vm, &event_data);
+	      vec_reset_length (event_data);
+	      if (event_type != 1)
+		clib_warning ("event type %d unexpected", event_type);
+	    }
+	  else
+	    vnet_arp_unset_ip4_over_ethernet (vnm, sw_if_index, &addr);
+
+	  increment_ip4_and_mac_address (&addr);
+	}
+    }
+  else
+    {
+      return clib_error_return (0, "unknown input `%U'",
+				format_unformat_error, input);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+/*?
+ * Add or delete IPv4 ARP cache entries.
+ *
+ * @note 'set ip arp' options (e.g. delete, static, 'fib-id <id>',
+ * 'count <number>', 'interface ip4_addr mac_addr') can be added in
+ * any order and combination.
+ *
+ * @cliexpar
+ * @parblock
+ * Add or delete IPv4 ARP cache entries as follows. MAC Address can be in
+ * either aa:bb:cc:dd:ee:ff format or aabb.ccdd.eeff format.
+ * @cliexcmd{set ip arp GigabitEthernet2/0/0 6.0.0.3 dead.beef.babe}
+ * @cliexcmd{set ip arp delete GigabitEthernet2/0/0 6.0.0.3 de:ad:be:ef:ba:be}
+ *
+ * To add or delete an IPv4 ARP cache entry to or from a specific fib
+ * table:
+ * @cliexcmd{set ip arp fib-id 1 GigabitEthernet2/0/0 6.0.0.3 dead.beef.babe}
+ * @cliexcmd{set ip arp fib-id 1 delete GigabitEthernet2/0/0 6.0.0.3 dead.beef.babe}
+ *
+ * Add or delete IPv4 static ARP cache entries as follows:
+ * @cliexcmd{set ip arp static GigabitEthernet2/0/0 6.0.0.3 dead.beef.babe}
+ * @cliexcmd{set ip arp static delete GigabitEthernet2/0/0 6.0.0.3 dead.beef.babe}
+ *
+ * For testing / debugging purposes, the 'set ip arp' command can add or
+ * delete multiple entries. Supply the 'count N' parameter:
+ * @cliexcmd{set ip arp count 10 GigabitEthernet2/0/0 6.0.0.3 dead.beef.babe}
+ * @endparblock
+ ?*/
+VLIB_CLI_COMMAND (ip_arp_add_del_command, static) = {
+  .path = "set ip arp",
+  .short_help =
+  "set ip arp [del] <intfc> <ip-address> <mac-address> [static] [count <count>] [fib-id <fib-id>] [proxy <lo-addr> - <hi-addr>]",
+  .function = ip_arp_add_del_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_int_proxy_arp_command_fn (vlib_main_t * vm,
+			      unformat_input_t *
+			      input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index;
+  vnet_sw_interface_t *si;
+  int enable = 0;
+  int intfc_set = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%U", unformat_vnet_sw_interface,
+		    vnm, &sw_if_index))
+	intfc_set = 1;
+      else if (unformat (input, "enable") || unformat (input, "on"))
+	enable = 1;
+      else if (unformat (input, "disable") || unformat (input, "off"))
+	enable = 0;
+      else
+	break;
+    }
+
+  if (intfc_set == 0)
+    return clib_error_return (0, "unknown input '%U'",
+			      format_unformat_error, input);
+
+  si = vnet_get_sw_interface (vnm, sw_if_index);
+  ASSERT (si);
+  if (enable)
+    si->flags |= VNET_SW_INTERFACE_FLAG_PROXY_ARP;
+  else
+    si->flags &= ~VNET_SW_INTERFACE_FLAG_PROXY_ARP;
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+/*?
+ * Enable proxy-arp on an interface. The vpp stack will answer ARP
+ * requests for the indicated address range. Multiple proxy-arp
+ * ranges may be provisioned.
+ *
+ * @note Proxy ARP as a technology is infamous for blackholing traffic.
+ * Also, the underlying implementation has not been performance-tuned.
+ * Avoid creating an unnecessarily large set of ranges.
+ *
+ * @cliexpar
+ * To enable proxy arp on a range of addresses, use:
+ * @cliexcmd{set ip arp proxy 6.0.0.1 - 6.0.0.11}
+ * Append 'del' to delete a range of proxy ARP addresses:
+ * @cliexcmd{set ip arp proxy 6.0.0.1 - 6.0.0.11 del}
+ * You must then specifically enable proxy arp on individual interfaces:
+ * @cliexcmd{set interface proxy-arp GigabitEthernet0/8/0 enable}
+ * To disable proxy arp on an individual interface:
+ * @cliexcmd{set interface proxy-arp GigabitEthernet0/8/0 disable}
+ ?*/
+VLIB_CLI_COMMAND (set_int_proxy_enable_command, static) = {
+  .path = "set interface proxy-arp",
+  .short_help =
+  "set interface proxy-arp <intfc> [enable|disable]",
+  .function = set_int_proxy_arp_command_fn,
+};
+/* *INDENT-ON* */
+
+
+/*
+ * ARP/ND Termination in a L2 Bridge Domain based on IP4/IP6 to MAC
+ * hash tables mac_by_ip4 and mac_by_ip6 for each BD.
+ */
+typedef enum
+{
+  ARP_TERM_NEXT_L2_OUTPUT,
+  ARP_TERM_NEXT_DROP,
+  ARP_TERM_N_NEXT,
+} arp_term_next_t;
+
+u32 arp_term_next_node_index[32];
+
+static uword
+arp_term_l2bd (vlib_main_t * vm,
+	       vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  l2input_main_t *l2im = &l2input_main;
+  u32 n_left_from, next_index, *from, *to_next;
+  u32 n_replies_sent = 0;
+  u16 last_bd_index = ~0;
+  l2_bridge_domain_t *last_bd_config = 0;
+  l2_input_config_t *cfg0;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ethernet_header_t *eth0;
+	  ethernet_arp_header_t *arp0;
+	  ip6_header_t *iph0;
+	  u8 *l3h0;
+	  u32 pi0, error0, next0, sw_if_index0;
+	  u16 ethertype0;
+	  u16 bd_index0;
+	  u32 ip0;
+	  u8 *macp0;
+
+	  pi0 = from[0];
+	  to_next[0] = pi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  eth0 = vlib_buffer_get_current (p0);
+	  l3h0 = (u8 *) eth0 + vnet_buffer (p0)->l2.l2_len;
+	  ethertype0 = clib_net_to_host_u16 (*(u16 *) (l3h0 - 2));
+	  arp0 = (ethernet_arp_header_t *) l3h0;
+
+	  if (PREDICT_FALSE ((ethertype0 != ETHERNET_TYPE_ARP) ||
+			     (arp0->opcode !=
+			      clib_host_to_net_u16
+			      (ETHERNET_ARP_OPCODE_request))))
+	    goto check_ip6_nd;
+
+	  /* Must be ARP request packet here */
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&
+			     (p0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      u8 *t0 = vlib_add_trace (vm, node, p0,
+				       sizeof (ethernet_arp_input_trace_t));
+	      clib_memcpy (t0, l3h0, sizeof (ethernet_arp_input_trace_t));
+	    }
+
+	  error0 = ETHERNET_ARP_ERROR_replies_sent;
+	  error0 =
+	    (arp0->l2_type !=
+	     clib_net_to_host_u16 (ETHERNET_ARP_HARDWARE_TYPE_ethernet)
+	     ? ETHERNET_ARP_ERROR_l2_type_not_ethernet : error0);
+	  error0 =
+	    (arp0->l3_type !=
+	     clib_net_to_host_u16 (ETHERNET_TYPE_IP4) ?
+	     ETHERNET_ARP_ERROR_l3_type_not_ip4 : error0);
+
+	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
+
+	  if (error0)
+	    goto drop;
+
+	  /* Trash ARP packets whose ARP-level source addresses do not
+	     match their L2-frame-level source addresses  */
+	  if (PREDICT_FALSE
+	      (memcmp
+	       (eth0->src_address, arp0->ip4_over_ethernet[0].ethernet,
+		sizeof (eth0->src_address))))
+	    {
+	      error0 = ETHERNET_ARP_ERROR_l2_address_mismatch;
+	      goto drop;
+	    }
+
+	  /* Check if anyone want ARP request events for L2 BDs */
+	  {
+	    pending_resolution_t *mc;
+	    ethernet_arp_main_t *am = &ethernet_arp_main;
+	    uword *p = hash_get (am->mac_changes_by_address, 0);
+	    if (p && (vnet_buffer (p0)->l2.shg == 0))
+	      {			// Only SHG 0 interface which is more likely local
+		u32 next_index = p[0];
+		while (next_index != (u32) ~ 0)
+		  {
+		    int (*fp) (u32, u8 *, u32, u32);
+		    int rv = 1;
+		    mc = pool_elt_at_index (am->mac_changes, next_index);
+		    fp = mc->data_callback;
+		    /* Call the callback, return 1 to suppress dup events */
+		    if (fp)
+		      rv = (*fp) (mc->data,
+				  arp0->ip4_over_ethernet[0].ethernet,
+				  sw_if_index0,
+				  arp0->ip4_over_ethernet[0].ip4.as_u32);
+		    /* Signal the resolver process */
+		    if (rv == 0)
+		      vlib_process_signal_event (vm, mc->node_index,
+						 mc->type_opaque, mc->data);
+		    next_index = mc->next_index;
+		  }
+	      }
+	  }
+
+	  /* lookup BD mac_by_ip4 hash table for MAC entry */
+	  ip0 = arp0->ip4_over_ethernet[1].ip4.as_u32;
+	  bd_index0 = vnet_buffer (p0)->l2.bd_index;
+	  if (PREDICT_FALSE ((bd_index0 != last_bd_index)
+			     || (last_bd_index == (u16) ~ 0)))
+	    {
+	      last_bd_index = bd_index0;
+	      last_bd_config = vec_elt_at_index (l2im->bd_configs, bd_index0);
+	    }
+	  macp0 = (u8 *) hash_get (last_bd_config->mac_by_ip4, ip0);
+
+	  if (PREDICT_FALSE (!macp0))
+	    goto next_l2_feature;	/* MAC not found */
+
+	  /* MAC found, send ARP reply -
+	     Convert ARP request packet to ARP reply */
+	  arp0->opcode = clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply);
+	  arp0->ip4_over_ethernet[1] = arp0->ip4_over_ethernet[0];
+	  arp0->ip4_over_ethernet[0].ip4.as_u32 = ip0;
+	  clib_memcpy (arp0->ip4_over_ethernet[0].ethernet, macp0, 6);
+	  clib_memcpy (eth0->dst_address, eth0->src_address, 6);
+	  clib_memcpy (eth0->src_address, macp0, 6);
+	  n_replies_sent += 1;
+
+	output_response:
+	  /* For BVI, need to use l2-fwd node to send ARP reply as
+	     l2-output node cannot output packet to BVI properly */
+	  cfg0 = vec_elt_at_index (l2im->configs, sw_if_index0);
+	  if (PREDICT_FALSE (cfg0->bvi))
+	    {
+	      vnet_buffer (p0)->l2.feature_bitmap |= L2INPUT_FEAT_FWD;
+	      vnet_buffer (p0)->sw_if_index[VLIB_RX] = 0;
+	      goto next_l2_feature;
+	    }
+
+	  /* Send ARP/ND reply back out input interface through l2-output */
+	  vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0;
+	  next0 = ARP_TERM_NEXT_L2_OUTPUT;
+	  /* Note that output to VXLAN tunnel will fail due to SHG which
+	     is probably desireable since ARP termination is not intended
+	     for ARP requests from other hosts. If output to VXLAN tunnel is
+	     required, however, can just clear the SHG in packet as follows:
+	     vnet_buffer(p0)->l2.shg = 0;         */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next, pi0,
+					   next0);
+	  continue;
+
+	check_ip6_nd:
+	  /* IP6 ND event notification or solicitation handling to generate
+	     local response instead of flooding */
+	  iph0 = (ip6_header_t *) l3h0;
+	  if (PREDICT_FALSE (ethertype0 == ETHERNET_TYPE_IP6 &&
+			     iph0->protocol == IP_PROTOCOL_ICMP6 &&
+			     !ip6_address_is_unspecified
+			     (&iph0->src_address)))
+	    {
+	      sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
+	      if (vnet_ip6_nd_term
+		  (vm, node, p0, eth0, iph0, sw_if_index0,
+		   vnet_buffer (p0)->l2.bd_index, vnet_buffer (p0)->l2.shg))
+		goto output_response;
+	    }
+
+	next_l2_feature:
+	  {
+	    u32 feature_bitmap0 =
+	      vnet_buffer (p0)->l2.feature_bitmap & ~L2INPUT_FEAT_ARP_TERM;
+	    vnet_buffer (p0)->l2.feature_bitmap = feature_bitmap0;
+	    next0 =
+	      feat_bitmap_get_next_node_index (arp_term_next_node_index,
+					       feature_bitmap0);
+	    vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					     to_next, n_left_to_next,
+					     pi0, next0);
+	    continue;
+	  }
+
+	drop:
+	  if (0 == arp0->ip4_over_ethernet[0].ip4.as_u32 ||
+	      (arp0->ip4_over_ethernet[0].ip4.as_u32 ==
+	       arp0->ip4_over_ethernet[1].ip4.as_u32))
+	    {
+	      error0 = ETHERNET_ARP_ERROR_gratuitous_arp;
+	    }
+	  next0 = ARP_TERM_NEXT_DROP;
+	  p0->error = node->errors[error0];
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next, pi0,
+					   next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_error_count (vm, node->node_index,
+		    ETHERNET_ARP_ERROR_replies_sent, n_replies_sent);
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (arp_term_l2bd_node, static) = {
+  .function = arp_term_l2bd,
+  .name = "arp-term-l2bd",
+  .vector_size = sizeof (u32),
+  .n_errors = ETHERNET_ARP_N_ERROR,
+  .error_strings = ethernet_arp_error_strings,
+  .n_next_nodes = ARP_TERM_N_NEXT,
+  .next_nodes = {
+    [ARP_TERM_NEXT_L2_OUTPUT] = "l2-output",
+    [ARP_TERM_NEXT_DROP] = "error-drop",
+  },
+  .format_buffer = format_ethernet_arp_header,
+  .format_trace = format_arp_term_input_trace,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+arp_term_init (vlib_main_t * vm)
+{
+  // Initialize the feature next-node indexes
+  feat_bitmap_init_next_nodes (vm,
+			       arp_term_l2bd_node.index,
+			       L2INPUT_N_FEAT,
+			       l2input_get_feat_names (),
+			       arp_term_next_node_index);
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (arp_term_init);
+
+void
+change_arp_mac (u32 sw_if_index, ethernet_arp_ip4_entry_t * e)
+{
+  if (e->sw_if_index == sw_if_index)
+    {
+      adj_nbr_walk_nh4 (e->sw_if_index,
+			&e->ip4_address, arp_mk_complete_walk, e);
+    }
+}
+
+void
+ethernet_arp_change_mac (u32 sw_if_index)
+{
+  ethernet_arp_main_t *am = &ethernet_arp_main;
+  ethernet_arp_ip4_entry_t *e;
+
+  /* *INDENT-OFF* */
+  pool_foreach (e, am->ip4_entry_pool,
+  ({
+    change_arp_mac (sw_if_index, e);
+  }));
+  /* *INDENT-ON* */
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ethernet/arp_packet.h b/src/vnet/ethernet/arp_packet.h
new file mode 100644
index 00000000..e762ffa4
--- /dev/null
+++ b/src/vnet/ethernet/arp_packet.h
@@ -0,0 +1,173 @@
+/*
+ * ethernet/arp.c: IP v4 ARP node
+ *
+ * Copyright (c) 2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_ethernet_arp_packet_h
+#define included_ethernet_arp_packet_h
+
+#define foreach_ethernet_arp_hardware_type	\
+  _ (0, reserved)				\
+  _ (1, ethernet)				\
+  _ (2, experimental_ethernet)			\
+  _ (3, ax_25)					\
+  _ (4, proteon_pronet_token_ring)		\
+  _ (5, chaos)					\
+  _ (6, ieee_802)				\
+  _ (7, arcnet)					\
+  _ (8, hyperchannel)				\
+  _ (9, lanstar)				\
+  _ (10, autonet)				\
+  _ (11, localtalk)				\
+  _ (12, localnet)				\
+  _ (13, ultra_link)				\
+  _ (14, smds)					\
+  _ (15, frame_relay)				\
+  _ (16, atm)					\
+  _ (17, hdlc)					\
+  _ (18, fibre_channel)				\
+  _ (19, atm19)					\
+  _ (20, serial_line)				\
+  _ (21, atm21)					\
+  _ (22, mil_std_188_220)			\
+  _ (23, metricom)				\
+  _ (24, ieee_1394)				\
+  _ (25, mapos)					\
+  _ (26, twinaxial)				\
+  _ (27, eui_64)				\
+  _ (28, hiparp)				\
+  _ (29, iso_7816_3)				\
+  _ (30, arpsec)				\
+  _ (31, ipsec_tunnel)				\
+  _ (32, infiniband)				\
+  _ (33, cai)					\
+  _ (34, wiegand)				\
+  _ (35, pure_ip)				\
+  _ (36, hw_exp1)				\
+  _ (256, hw_exp2)
+
+#define foreach_ethernet_arp_opcode		\
+  _ (reserved)					\
+  _ (request)					\
+  _ (reply)					\
+  _ (reverse_request)				\
+  _ (reverse_reply)				\
+  _ (drarp_request)				\
+  _ (drarp_reply)				\
+  _ (drarp_error)				\
+  _ (inarp_request)				\
+  _ (inarp_reply)				\
+  _ (arp_nak)					\
+  _ (mars_request)				\
+  _ (mars_multi)				\
+  _ (mars_mserv)				\
+  _ (mars_join)					\
+  _ (mars_leave)				\
+  _ (mars_nak)					\
+  _ (mars_unserv)				\
+  _ (mars_sjoin)				\
+  _ (mars_sleave)				\
+  _ (mars_grouplist_request)			\
+  _ (mars_grouplist_reply)			\
+  _ (mars_redirect_map)				\
+  _ (mapos_unarp)				\
+  _ (exp1)					\
+  _ (exp2)
+
+typedef enum
+{
+#define _(n,f) ETHERNET_ARP_HARDWARE_TYPE_##f = (n),
+  foreach_ethernet_arp_hardware_type
+#undef _
+} ethernet_arp_hardware_type_t;
+
+typedef enum
+{
+#define _(f) ETHERNET_ARP_OPCODE_##f,
+  foreach_ethernet_arp_opcode
+#undef _
+    ETHERNET_ARP_N_OPCODE,
+} ethernet_arp_opcode_t;
+
+typedef enum
+{
+  IP4_ARP_NEXT_DROP,
+  IP4_ARP_N_NEXT,
+} ip4_arp_next_t;
+
+typedef enum
+{
+  IP4_ARP_ERROR_DROP,
+  IP4_ARP_ERROR_REQUEST_SENT,
+  IP4_ARP_ERROR_NON_ARP_ADJ,
+  IP4_ARP_ERROR_REPLICATE_DROP,
+  IP4_ARP_ERROR_REPLICATE_FAIL,
+  IP4_ARP_ERROR_NO_SOURCE_ADDRESS,
+} ip4_arp_error_t;
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u8 ethernet[6];
+  ip4_address_t ip4;
+}) ethernet_arp_ip4_over_ethernet_address_t;
+/* *INDENT-ON* */
+
+typedef struct
+{
+  u16 l2_type;
+  u16 l3_type;
+  u8 n_l2_address_bytes;
+  u8 n_l3_address_bytes;
+  u16 opcode;
+  union
+  {
+    ethernet_arp_ip4_over_ethernet_address_t ip4_over_ethernet[2];
+
+    /* Others... */
+    u8 data[0];
+  };
+} ethernet_arp_header_t;
+
+typedef struct
+{
+  u32 sw_if_index;
+  ip4_address_t ip4_address;
+
+  u8 ethernet_address[6];
+
+  u16 flags;
+#define ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC  (1 << 0)
+#define ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC (1 << 1)
+
+  u64 cpu_time_last_updated;
+
+  /**
+   * The index of the adj-fib entry created
+   */
+  fib_node_index_t fib_entry_index;
+} ethernet_arp_ip4_entry_t;
+
+ethernet_arp_ip4_entry_t *ip4_neighbor_entries (u32 sw_if_index);
+u8 *format_ethernet_arp_ip4_entry (u8 * s, va_list * va);
+
+#endif /* included_ethernet_arp_packet_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ethernet/dir.dox b/src/vnet/ethernet/dir.dox
new file mode 100644
index 00000000..a55a73c0
--- /dev/null
+++ b/src/vnet/ethernet/dir.dox
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+@dir
+@brief Ethernet ARP and Loopback Code.
+
+This directory contains the source code for ARP and Loopback Interfaces.
+
+*/
+/*? %%clicmd:group_label ARP and Loopback CLI %% ?*/
diff --git a/src/vnet/ethernet/error.def b/src/vnet/ethernet/error.def
new file mode 100644
index 00000000..36679c0c
--- /dev/null
+++ b/src/vnet/ethernet/error.def
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ethernet_error.def: ethernet errors
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+ethernet_error (NONE, PUNT, "no error")
+ethernet_error (BAD_LLC_LENGTH, DROP, "llc length > packet length")
+ethernet_error (UNKNOWN_TYPE, PUNT, "unknown ethernet type")
+ethernet_error (UNKNOWN_VLAN, DROP, "unknown vlan")
+ethernet_error (L3_MAC_MISMATCH, DROP, "l3 mac mismatch")
+ethernet_error (DOWN, DROP, "subinterface down")
+
diff --git a/src/vnet/ethernet/ethernet.h b/src/vnet/ethernet/ethernet.h
new file mode 100644
index 00000000..f88b0cf3
--- /dev/null
+++ b/src/vnet/ethernet/ethernet.h
@@ -0,0 +1,561 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ethernet.h: types/functions for ethernet.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_ethernet_h
+#define included_ethernet_h
+
+#include <vnet/vnet.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/feature/feature.h>
+
+always_inline u64
+ethernet_mac_address_u64 (u8 * a)
+{
+  return (((u64) a[0] << (u64) (5 * 8))
+	  | ((u64) a[1] << (u64) (4 * 8))
+	  | ((u64) a[2] << (u64) (3 * 8))
+	  | ((u64) a[3] << (u64) (2 * 8))
+	  | ((u64) a[4] << (u64) (1 * 8)) | ((u64) a[5] << (u64) (0 * 8)));
+}
+
+static inline int
+ethernet_mac_address_is_multicast_u64 (u64 a)
+{
+  return (a & (1ULL << (5 * 8))) != 0;
+}
+
+static_always_inline int
+ethernet_frame_is_tagged (u16 type)
+{
+#if __SSE4_2__
+  const __m128i ethertype_mask = _mm_set_epi16 (ETHERNET_TYPE_VLAN,
+						ETHERNET_TYPE_DOT1AD,
+						ETHERNET_TYPE_VLAN_9100,
+						ETHERNET_TYPE_VLAN_9200,
+						/* duplicate last one to
+						   fill register */
+						ETHERNET_TYPE_VLAN_9200,
+						ETHERNET_TYPE_VLAN_9200,
+						ETHERNET_TYPE_VLAN_9200,
+						ETHERNET_TYPE_VLAN_9200);
+
+  __m128i r = _mm_set1_epi16 (type);
+  r = _mm_cmpeq_epi16 (ethertype_mask, r);
+  return !_mm_test_all_zeros (r, r);
+#else
+  if ((type == ETHERNET_TYPE_VLAN) ||
+      (type == ETHERNET_TYPE_DOT1AD) ||
+      (type == ETHERNET_TYPE_VLAN_9100) || (type == ETHERNET_TYPE_VLAN_9200))
+    return 1;
+#endif
+  return 0;
+}
+
+/* Max. sized ethernet/vlan header for parsing. */
+typedef struct
+{
+  ethernet_header_t ethernet;
+
+  /* Allow up to 2 stacked vlan headers. */
+  ethernet_vlan_header_t vlan[2];
+} ethernet_max_header_t;
+
+struct vnet_hw_interface_t;
+/* Ethernet flag change callback. */
+typedef u32 (ethernet_flag_change_function_t)
+  (vnet_main_t * vnm, struct vnet_hw_interface_t * hi, u32 flags);
+
+#define ETHERNET_MIN_PACKET_BYTES  64
+#define ETHERNET_MAX_PACKET_BYTES  9216
+
+/* Ethernet interface instance. */
+typedef struct ethernet_interface
+{
+
+  /* Accept all packets (promiscuous mode). */
+#define ETHERNET_INTERFACE_FLAG_ACCEPT_ALL (1 << 0)
+#define ETHERNET_INTERFACE_FLAG_CONFIG_PROMISC(flags) \
+  (((flags) & ~ETHERNET_INTERFACE_FLAG_ACCEPT_ALL) == 0)
+
+  /* Change MTU on interface from hw interface structure */
+#define ETHERNET_INTERFACE_FLAG_MTU (1 << 1)
+#define ETHERNET_INTERFACE_FLAG_CONFIG_MTU(flags) \
+  ((flags) & ETHERNET_INTERFACE_FLAG_MTU)
+
+  /* Callback, e.g. to turn on/off promiscuous mode */
+  ethernet_flag_change_function_t *flag_change;
+
+  u32 driver_instance;
+
+  /* Ethernet (MAC) address for this interface. */
+  u8 address[6];
+} ethernet_interface_t;
+
+extern vnet_hw_interface_class_t ethernet_hw_interface_class;
+
+typedef struct
+{
+  /* Name (a c string). */
+  char *name;
+
+  /* Ethernet type in host byte order. */
+  ethernet_type_t type;
+
+  /* Node which handles this type. */
+  u32 node_index;
+
+  /* Next index for this type. */
+  u32 next_index;
+} ethernet_type_info_t;
+
+typedef enum
+{
+#define ethernet_error(n,c,s) ETHERNET_ERROR_##n,
+#include <vnet/ethernet/error.def>
+#undef ethernet_error
+  ETHERNET_N_ERROR,
+} ethernet_error_t;
+
+
+// Structs used when parsing packet to find sw_if_index
+
+typedef struct
+{
+  u32 sw_if_index;
+  u32 flags;
+  // config entry is-valid flag
+  // exact match flags (valid if packet has 0/1/2/3 tags)
+  // L2 vs L3 forwarding mode
+#define SUBINT_CONFIG_MATCH_0_TAG (1<<0)
+#define SUBINT_CONFIG_MATCH_1_TAG (1<<1)
+#define SUBINT_CONFIG_MATCH_2_TAG (1<<2)
+#define SUBINT_CONFIG_MATCH_3_TAG (1<<3)
+#define SUBINT_CONFIG_VALID       (1<<4)
+#define SUBINT_CONFIG_L2          (1<<5)
+
+} subint_config_t;
+
+always_inline u32
+eth_create_valid_subint_match_flags (u32 num_tags)
+{
+  return SUBINT_CONFIG_VALID | (1 << num_tags);
+}
+
+
+typedef struct
+{
+  subint_config_t untagged_subint;
+  subint_config_t default_subint;
+  u16 dot1q_vlans;		// pool id for vlan table
+  u16 dot1ad_vlans;		// pool id for vlan table
+} main_intf_t;
+
+typedef struct
+{
+  subint_config_t single_tag_subint;
+  subint_config_t inner_any_subint;
+  u32 qinqs;			// pool id for qinq table
+} vlan_intf_t;
+
+typedef struct
+{
+  vlan_intf_t vlans[ETHERNET_N_VLAN];
+} vlan_table_t;
+
+typedef struct
+{
+  subint_config_t subint;
+} qinq_intf_t;
+
+typedef struct
+{
+  qinq_intf_t vlans[ETHERNET_N_VLAN];
+} qinq_table_t;
+
+// Structure mapping to a next index based on ethertype.
+// Common ethertypes are stored explicitly, others are
+// stored in a sparse table.
+typedef struct
+{
+  /* Sparse vector mapping ethernet type in network byte order
+     to next index. */
+  u16 *input_next_by_type;
+  u32 *sparse_index_by_input_next_index;
+
+  /* cached next indexes for common ethertypes */
+  u32 input_next_ip4;
+  u32 input_next_ip6;
+  u32 input_next_mpls;
+} next_by_ethertype_t;
+
+typedef struct
+{
+  vlib_main_t *vlib_main;
+
+  /* next node index for the L3 input node of each ethertype */
+  next_by_ethertype_t l3_next;
+
+  /* next node index for L2 interfaces */
+  u32 l2_next;
+
+  /* flag and next node index for L3 redirect */
+  u32 redirect_l3;
+  u32 redirect_l3_next;
+
+  /* Pool of ethernet interface instances. */
+  ethernet_interface_t *interfaces;
+
+  ethernet_type_info_t *type_infos;
+
+  /* Hash tables mapping name/type to type info index. */
+  uword *type_info_by_name, *type_info_by_type;
+
+  // The root of the vlan parsing tables. A vector with one element
+  // for each main interface, indexed by hw_if_index.
+  main_intf_t *main_intfs;
+
+  // Pool of vlan tables
+  vlan_table_t *vlan_pool;
+
+  // Pool of qinq tables;
+  qinq_table_t *qinq_pool;
+
+  /* Set to one to use AB.CD.EF instead of A:B:C:D:E:F as ethernet format. */
+  int format_ethernet_address_16bit;
+
+  /* debug: make sure we don't wipe out an ethernet registration by mistake */
+  u8 next_by_ethertype_register_called;
+
+  /* Feature arc index */
+  u8 output_feature_arc_index;
+} ethernet_main_t;
+
+ethernet_main_t ethernet_main;
+
+always_inline ethernet_type_info_t *
+ethernet_get_type_info (ethernet_main_t * em, ethernet_type_t type)
+{
+  uword *p = hash_get (em->type_info_by_type, type);
+  return p ? vec_elt_at_index (em->type_infos, p[0]) : 0;
+}
+
+ethernet_interface_t *ethernet_get_interface (ethernet_main_t * em,
+					      u32 hw_if_index);
+
+clib_error_t *ethernet_register_interface (vnet_main_t * vnm,
+					   u32 dev_class_index,
+					   u32 dev_instance,
+					   u8 * address,
+					   u32 * hw_if_index_return,
+					   ethernet_flag_change_function_t
+					   flag_change);
+
+void ethernet_delete_interface (vnet_main_t * vnm, u32 hw_if_index);
+
+/* Register given node index to take input for given ethernet type. */
+void
+ethernet_register_input_type (vlib_main_t * vm,
+			      ethernet_type_t type, u32 node_index);
+
+/* Register given node index to take input for packet from L2 interfaces. */
+void ethernet_register_l2_input (vlib_main_t * vm, u32 node_index);
+
+/* Register given node index to take redirected L3 traffic, and enable L3 redirect */
+void ethernet_register_l3_redirect (vlib_main_t * vm, u32 node_index);
+
+/* Formats ethernet address X:X:X:X:X:X */
+u8 *format_ethernet_address (u8 * s, va_list * args);
+u8 *format_ethernet_type (u8 * s, va_list * args);
+u8 *format_ethernet_vlan_tci (u8 * s, va_list * va);
+u8 *format_ethernet_header (u8 * s, va_list * args);
+u8 *format_ethernet_header_with_length (u8 * s, va_list * args);
+
+/* Parse ethernet address in either X:X:X:X:X:X unix or X.X.X cisco format. */
+uword unformat_ethernet_address (unformat_input_t * input, va_list * args);
+
+/* Parse ethernet type as 0xXXXX or type name from ethernet/types.def.
+   In either host or network byte order. */
+uword
+unformat_ethernet_type_host_byte_order (unformat_input_t * input,
+					va_list * args);
+uword
+unformat_ethernet_type_net_byte_order (unformat_input_t * input,
+				       va_list * args);
+
+/* Parse ethernet header. */
+uword unformat_ethernet_header (unformat_input_t * input, va_list * args);
+
+/* Parse ethernet interface name; return hw_if_index. */
+uword unformat_ethernet_interface (unformat_input_t * input, va_list * args);
+
+uword unformat_pg_ethernet_header (unformat_input_t * input, va_list * args);
+
+always_inline void
+ethernet_setup_node (vlib_main_t * vm, u32 node_index)
+{
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  pg_node_t *pn = pg_get_node (node_index);
+
+  n->format_buffer = format_ethernet_header_with_length;
+  n->unformat_buffer = unformat_ethernet_header;
+  pn->unformat_edit = unformat_pg_ethernet_header;
+}
+
+always_inline ethernet_header_t *
+ethernet_buffer_get_header (vlib_buffer_t * b)
+{
+  return (void *)
+    (b->data + vnet_buffer (b)->ethernet.start_of_ethernet_header);
+}
+
+/** Returns the number of VLAN headers in the current Ethernet frame in the
+ * buffer. Returns 0, 1, 2 for the known header count. The value 3 indicates
+ * the number of headers is not known.
+ */
+#define ethernet_buffer_get_vlan_count(b) ( \
+    ((b)->flags & ETH_BUFFER_VLAN_BITS) >> LOG2_ETH_BUFFER_VLAN_1_DEEP \
+)
+
+/** Sets the number of VLAN headers in the current Ethernet frame in the
+ * buffer. Values 0, 1, 2 indicate  the header count. The value 3 indicates
+ * the number of headers is not known.
+ */
+#define ethernet_buffer_set_vlan_count(b, v) ( \
+    (b)->flags = ((b)->flags & ~ETH_BUFFER_VLAN_BITS) | \
+        (((v) << LOG2_ETH_BUFFER_VLAN_1_DEEP) & ETH_BUFFER_VLAN_BITS) \
+)
+
+/** Adjusts the vlan count by the delta in 'v' */
+#define ethernet_buffer_adjust_vlan_count(b, v) ( \
+  ethernet_buffer_set_vlan_count(b,  \
+      (word)ethernet_buffer_get_vlan_count(b) + (word)(v)) \
+)
+
+/** Adjusts the vlan count by the header size byte delta in 'v' */
+#define ethernet_buffer_adjust_vlan_count_by_bytes(b, v) ( \
+    (b)->flags = ((b)->flags & ~ETH_BUFFER_VLAN_BITS) | (( \
+        ((b)->flags & ETH_BUFFER_VLAN_BITS) + \
+        ((v) << (LOG2_ETH_BUFFER_VLAN_1_DEEP - 2)) \
+    ) & ETH_BUFFER_VLAN_BITS) \
+)
+
+/**
+ * Determine the size of the Ethernet headers of the current frame in
+ * the buffer. This uses the VLAN depth flags that are set by
+ * ethernet-input. Because these flags are stored in the vlib_buffer_t
+ * "flags" field this count is valid regardless of the node so long as it's
+ * checked downstream of ethernet-input; That is, the value is not stored in
+ * the opaque space.
+ */
+#define ethernet_buffer_header_size(b) ( \
+        ethernet_buffer_get_vlan_count((b)) * sizeof(ethernet_vlan_header_t) + \
+        sizeof(ethernet_header_t) \
+)
+
+ethernet_main_t *ethernet_get_main (vlib_main_t * vm);
+u32 ethernet_set_flags (vnet_main_t * vnm, u32 hw_if_index, u32 flags);
+void ethernet_sw_interface_set_l2_mode (vnet_main_t * vnm, u32 sw_if_index,
+					u32 l2);
+void ethernet_sw_interface_set_l2_mode_noport (vnet_main_t * vnm,
+					       u32 sw_if_index, u32 l2);
+void ethernet_set_rx_redirect (vnet_main_t * vnm, vnet_hw_interface_t * hi,
+			       u32 enable);
+
+int
+vnet_arp_set_ip4_over_ethernet (vnet_main_t * vnm,
+				u32 sw_if_index, void *a_arg, int is_static);
+
+int
+vnet_arp_unset_ip4_over_ethernet (vnet_main_t * vnm,
+				  u32 sw_if_index, void *a_arg);
+
+int vnet_proxy_arp_fib_reset (u32 fib_id);
+
+clib_error_t *next_by_ethertype_init (next_by_ethertype_t * l3_next);
+clib_error_t *next_by_ethertype_register (next_by_ethertype_t * l3_next,
+					  u32 ethertype, u32 next_index);
+
+int vnet_create_loopback_interface (u32 * sw_if_indexp, u8 * mac_address);
+int vnet_delete_loopback_interface (u32 sw_if_index);
+int vnet_delete_sub_interface (u32 sw_if_index);
+
+// Perform ethernet subinterface classification table lookups given
+// the ports's sw_if_index and fields extracted from the ethernet header.
+// The resulting tables are used by identify_subint().
+always_inline void
+eth_vlan_table_lookups (ethernet_main_t * em,
+			vnet_main_t * vnm,
+			u32 port_sw_if_index0,
+			u16 first_ethertype,
+			u16 outer_id,
+			u16 inner_id,
+			vnet_hw_interface_t ** hi,
+			main_intf_t ** main_intf,
+			vlan_intf_t ** vlan_intf, qinq_intf_t ** qinq_intf)
+{
+  vlan_table_t *vlan_table;
+  qinq_table_t *qinq_table;
+  u32 vlan_table_id;
+
+  // Read the main, vlan, and qinq interface table entries
+  // TODO: Consider if/how to prefetch tables. Also consider
+  // single-entry cache to skip table lookups and identify_subint()
+  // processing.
+  *hi = vnet_get_sup_hw_interface (vnm, port_sw_if_index0);
+  *main_intf = vec_elt_at_index (em->main_intfs, (*hi)->hw_if_index);
+
+  // Always read the vlan and qinq tables, even if there are not that
+  // many tags on the packet. This makes the lookups and comparisons
+  // easier (and less branchy).
+  vlan_table_id = (first_ethertype == ETHERNET_TYPE_DOT1AD) ?
+    (*main_intf)->dot1ad_vlans : (*main_intf)->dot1q_vlans;
+  vlan_table = vec_elt_at_index (em->vlan_pool, vlan_table_id);
+  *vlan_intf = &vlan_table->vlans[outer_id];
+
+  qinq_table = vec_elt_at_index (em->qinq_pool, (*vlan_intf)->qinqs);
+  *qinq_intf = &qinq_table->vlans[inner_id];
+}
+
+
+// Determine the subinterface for this packet, given the result of the
+// vlan table lookups and vlan header parsing. Check the most specific
+// matches first.
+// Returns 1 if a matching subinterface was found, otherwise returns 0.
+always_inline u32
+eth_identify_subint (vnet_hw_interface_t * hi,
+		     vlib_buffer_t * b0,
+		     u32 match_flags,
+		     main_intf_t * main_intf,
+		     vlan_intf_t * vlan_intf,
+		     qinq_intf_t * qinq_intf,
+		     u32 * new_sw_if_index, u8 * error0, u32 * is_l2)
+{
+  subint_config_t *subint;
+
+  // Each comparison is checking both the valid flag and the number of tags
+  // (incorporating exact-match/non-exact-match).
+
+  // check for specific double tag
+  subint = &qinq_intf->subint;
+  if ((subint->flags & match_flags) == match_flags)
+    goto matched;
+
+  // check for specific outer and 'any' inner
+  subint = &vlan_intf->inner_any_subint;
+  if ((subint->flags & match_flags) == match_flags)
+    goto matched;
+
+  // check for specific single tag
+  subint = &vlan_intf->single_tag_subint;
+  if ((subint->flags & match_flags) == match_flags)
+    goto matched;
+
+  // check for untagged interface
+  subint = &main_intf->untagged_subint;
+  if ((subint->flags & match_flags) == match_flags)
+    goto matched;
+
+  // check for default interface
+  subint = &main_intf->default_subint;
+  if ((subint->flags & match_flags) == match_flags)
+    goto matched;
+
+  // No matching subinterface
+  *new_sw_if_index = ~0;
+  *error0 = ETHERNET_ERROR_UNKNOWN_VLAN;
+  *is_l2 = 0;
+  return 0;
+
+matched:
+  *new_sw_if_index = subint->sw_if_index;
+  *is_l2 = subint->flags & SUBINT_CONFIG_L2;
+  return 1;
+}
+
+// Compare two ethernet macs. Return 1 if they are the same, 0 if different
+always_inline u32
+eth_mac_equal (u8 * mac1, u8 * mac2)
+{
+  return (*((u32 *) (mac1 + 0)) == *((u32 *) (mac2 + 0)) &&
+	  *((u32 *) (mac1 + 2)) == *((u32 *) (mac2 + 2)));
+}
+
+
+always_inline ethernet_main_t *
+vnet_get_ethernet_main (void)
+{
+  return &ethernet_main;
+}
+
+void vnet_register_ip4_arp_resolution_event (vnet_main_t * vnm,
+					     void *address_arg,
+					     uword node_index,
+					     uword type_opaque, uword data);
+
+
+int vnet_add_del_ip4_arp_change_event (vnet_main_t * vnm,
+				       void *data_callback,
+				       u32 pid,
+				       void *address_arg,
+				       uword node_index,
+				       uword type_opaque,
+				       uword data, int is_add);
+
+void ethernet_arp_change_mac (u32 sw_if_index);
+void ethernet_ndp_change_mac (u32 sw_if_index);
+
+void arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai);
+
+void ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai);
+u8 *ethernet_build_rewrite (vnet_main_t * vnm,
+			    u32 sw_if_index,
+			    vnet_link_t link_type, const void *dst_address);
+
+extern vlib_node_registration_t ethernet_input_node;
+
+#endif /* included_ethernet_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ethernet/format.c b/src/vnet/ethernet/format.c
new file mode 100644
index 00000000..4edef5ad
--- /dev/null
+++ b/src/vnet/ethernet/format.c
@@ -0,0 +1,366 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ethernet_format.c: ethernet formatting/parsing.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/ethernet/ethernet.h>
+
+u8 *
+format_ethernet_address (u8 * s, va_list * args)
+{
+  ethernet_main_t *em = &ethernet_main;
+  u8 *a = va_arg (*args, u8 *);
+
+  if (em->format_ethernet_address_16bit)
+    return format (s, "%02x%02x.%02x%02x.%02x%02x",
+		   a[0], a[1], a[2], a[3], a[4], a[5]);
+  else
+    return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+		   a[0], a[1], a[2], a[3], a[4], a[5]);
+}
+
+u8 *
+format_ethernet_type (u8 * s, va_list * args)
+{
+  ethernet_type_t type = va_arg (*args, u32);
+  ethernet_main_t *em = &ethernet_main;
+  ethernet_type_info_t *t = ethernet_get_type_info (em, type);
+
+  if (t)
+    s = format (s, "%s", t->name);
+  else
+    s = format (s, "0x%04x", type);
+
+  return s;
+}
+
+u8 *
+format_ethernet_vlan_tci (u8 * s, va_list * va)
+{
+  u32 vlan_tci = va_arg (*va, u32);
+
+  u32 vid = (vlan_tci & 0xfff);
+  u32 cfi = (vlan_tci >> 12) & 1;
+  u32 pri = (vlan_tci >> 13);
+
+  s = format (s, "%d", vid);
+  if (pri != 0)
+    s = format (s, " priority %d", pri);
+  if (cfi != 0)
+    s = format (s, " cfi");
+
+  return s;
+}
+
+u8 *
+format_ethernet_pbb (u8 * s, va_list * va)
+{
+  u32 b_tag = va_arg (*va, u32);
+  u32 i_tag = va_arg (*va, u32);
+  u32 vid = (b_tag & 0xfff);
+  u32 bdei = (b_tag >> 12) & 1;
+  u32 bpcp = (b_tag >> 13);
+  u32 sid = (i_tag & 0xffffff);
+  u8 ires = (i_tag >> 24) & 3;
+  u8 iuca = (i_tag >> 27) & 1;
+  u8 idei = (i_tag >> 28) & 1;
+  u8 ipcp = (i_tag >> 29);
+
+  s =
+    format (s, "B_tag %04X (vid %d, dei %d, pcp %d), ", b_tag, vid, bdei,
+	    bpcp);
+  s =
+    format (s, "I_tag %08X (sid %d, res %d, dei %d, pcp %d)", i_tag, sid,
+	    ires, iuca, idei, ipcp);
+
+  return s;
+}
+
+u8 *
+format_ethernet_header_with_length (u8 * s, va_list * args)
+{
+  ethernet_pbb_header_packed_t *ph =
+    va_arg (*args, ethernet_pbb_header_packed_t *);
+  ethernet_max_header_t *m = (ethernet_max_header_t *) ph;
+  u32 max_header_bytes = va_arg (*args, u32);
+  ethernet_main_t *em = &ethernet_main;
+  ethernet_header_t *e = &m->ethernet;
+  ethernet_vlan_header_t *v;
+  ethernet_type_t type = clib_net_to_host_u16 (e->type);
+  ethernet_type_t vlan_type[ARRAY_LEN (m->vlan)];
+  u32 n_vlan = 0, i, header_bytes;
+  uword indent;
+
+  while ((type == ETHERNET_TYPE_VLAN || type == ETHERNET_TYPE_DOT1AD
+	  || type == ETHERNET_TYPE_DOT1AH) && n_vlan < ARRAY_LEN (m->vlan))
+    {
+      vlan_type[n_vlan] = type;
+      if (type != ETHERNET_TYPE_DOT1AH)
+	{
+	  v = m->vlan + n_vlan;
+	  type = clib_net_to_host_u16 (v->type);
+	}
+      n_vlan++;
+    }
+
+  header_bytes = sizeof (e[0]) + n_vlan * sizeof (v[0]);
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    return format (s, "ethernet header truncated");
+
+  indent = format_get_indent (s);
+
+  s = format (s, "%U: %U -> %U",
+	      format_ethernet_type, type,
+	      format_ethernet_address, e->src_address,
+	      format_ethernet_address, e->dst_address);
+
+  if (type != ETHERNET_TYPE_DOT1AH)
+    {
+      for (i = 0; i < n_vlan; i++)
+	{
+	  u32 v = clib_net_to_host_u16 (m->vlan[i].priority_cfi_and_id);
+	  if (*vlan_type == ETHERNET_TYPE_VLAN)
+	    s = format (s, " 802.1q vlan %U", format_ethernet_vlan_tci, v);
+	  else
+	    s = format (s, " 802.1ad vlan %U", format_ethernet_vlan_tci, v);
+	}
+
+      if (max_header_bytes != 0 && header_bytes < max_header_bytes)
+	{
+	  ethernet_type_info_t *ti;
+	  vlib_node_t *node = 0;
+
+	  ti = ethernet_get_type_info (em, type);
+	  if (ti && ti->node_index != ~0)
+	    node = vlib_get_node (em->vlib_main, ti->node_index);
+	  if (node && node->format_buffer)
+	    s = format (s, "\n%U%U",
+			format_white_space, indent,
+			node->format_buffer, (void *) m + header_bytes,
+			max_header_bytes - header_bytes);
+	}
+    }
+  else
+    {
+      s = format (s, "\n%UPBB header : %U", format_white_space, indent,
+		  format_ethernet_pbb,
+		  clib_net_to_host_u16 (ph->priority_dei_id),
+		  clib_net_to_host_u32 (ph->priority_dei_uca_res_sid));
+    }
+
+  return s;
+}
+
+u8 *
+format_ethernet_header (u8 * s, va_list * args)
+{
+  ethernet_max_header_t *m = va_arg (*args, ethernet_max_header_t *);
+  return format (s, "%U", format_ethernet_header_with_length, m, 0);
+}
+
+/* Parse X:X:X:X:X:X unix style ethernet address. */
+static uword
+unformat_ethernet_address_unix (unformat_input_t * input, va_list * args)
+{
+  u8 *result = va_arg (*args, u8 *);
+  u32 i, a[6];
+
+  if (!unformat (input, "%_%x:%x:%x:%x:%x:%x%_",
+		 &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
+    return 0;
+
+  /* Check range. */
+  for (i = 0; i < ARRAY_LEN (a); i++)
+    if (a[i] >= (1 << 8))
+      return 0;
+
+  for (i = 0; i < ARRAY_LEN (a); i++)
+    result[i] = a[i];
+
+  return 1;
+}
+
+/* Parse X.X.X cisco style ethernet address. */
+static uword
+unformat_ethernet_address_cisco (unformat_input_t * input, va_list * args)
+{
+  u8 *result = va_arg (*args, u8 *);
+  u32 i, a[3];
+
+  if (!unformat (input, "%_%x.%x.%x%_", &a[0], &a[1], &a[2]))
+    return 0;
+
+  /* Check range. */
+  for (i = 0; i < ARRAY_LEN (a); i++)
+    if (a[i] >= (1 << 16))
+      return 0;
+
+  result[0] = (a[0] >> 8) & 0xff;
+  result[1] = (a[0] >> 0) & 0xff;
+  result[2] = (a[1] >> 8) & 0xff;
+  result[3] = (a[1] >> 0) & 0xff;
+  result[4] = (a[2] >> 8) & 0xff;
+  result[5] = (a[2] >> 0) & 0xff;
+
+  return 1;
+}
+
+/* Parse ethernet address; accept either unix or style addresses. */
+uword
+unformat_ethernet_address (unformat_input_t * input, va_list * args)
+{
+  u8 *result = va_arg (*args, u8 *);
+  return (unformat_user (input, unformat_ethernet_address_unix, result)
+	  || unformat_user (input, unformat_ethernet_address_cisco, result));
+}
+
+/* Returns ethernet type as an int in host byte order. */
+uword
+unformat_ethernet_type_host_byte_order (unformat_input_t * input,
+					va_list * args)
+{
+  u16 *result = va_arg (*args, u16 *);
+  ethernet_main_t *em = &ethernet_main;
+  int type, i;
+
+  /* Numeric type. */
+  if (unformat (input, "0x%x", &type) || unformat (input, "%d", &type))
+    {
+      if (type >= (1 << 16))
+	return 0;
+      *result = type;
+      return 1;
+    }
+
+  /* Named type. */
+  if (unformat_user (input, unformat_vlib_number_by_name,
+		     em->type_info_by_name, &i))
+    {
+      ethernet_type_info_t *ti = vec_elt_at_index (em->type_infos, i);
+      *result = ti->type;
+      return 1;
+    }
+
+  return 0;
+}
+
+uword
+unformat_ethernet_type_net_byte_order (unformat_input_t * input,
+				       va_list * args)
+{
+  u16 *result = va_arg (*args, u16 *);
+  if (!unformat_user (input, unformat_ethernet_type_host_byte_order, result))
+    return 0;
+
+  *result = clib_host_to_net_u16 ((u16) * result);
+  return 1;
+}
+
+uword
+unformat_ethernet_header (unformat_input_t * input, va_list * args)
+{
+  u8 **result = va_arg (*args, u8 **);
+  ethernet_max_header_t _m, *m = &_m;
+  ethernet_header_t *e = &m->ethernet;
+  u16 type;
+  u32 n_vlan;
+
+  if (!unformat (input, "%U: %U -> %U",
+		 unformat_ethernet_type_host_byte_order, &type,
+		 unformat_ethernet_address, &e->src_address,
+		 unformat_ethernet_address, &e->dst_address))
+    return 0;
+
+  n_vlan = 0;
+  while (unformat (input, "vlan"))
+    {
+      u32 id, priority;
+
+      if (!unformat_user (input, unformat_vlib_number, &id)
+	  || id >= ETHERNET_N_VLAN)
+	return 0;
+
+      if (unformat (input, "priority %d", &priority))
+	{
+	  if (priority >= 8)
+	    return 0;
+	  id |= priority << 13;
+	}
+
+      if (unformat (input, "cfi"))
+	id |= 1 << 12;
+
+      /* Too many vlans given. */
+      if (n_vlan >= ARRAY_LEN (m->vlan))
+	return 0;
+
+      m->vlan[n_vlan].priority_cfi_and_id = clib_host_to_net_u16 (id);
+      n_vlan++;
+    }
+
+  if (n_vlan == 0)
+    e->type = clib_host_to_net_u16 (type);
+  else
+    {
+      int i;
+
+      e->type = clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
+      for (i = 0; i < n_vlan - 1; i++)
+	m->vlan[i].type = clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
+      m->vlan[n_vlan - 1].type = clib_host_to_net_u16 (type);
+    }
+
+  /* Add header to result. */
+  {
+    void *p;
+    u32 n_bytes = sizeof (e[0]) + n_vlan * sizeof (m->vlan[0]);
+
+    vec_add2 (*result, p, n_bytes);
+    clib_memcpy (p, m, n_bytes);
+  }
+
+  return 1;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ethernet/init.c b/src/vnet/ethernet/init.c
new file mode 100644
index 00000000..2d20adc9
--- /dev/null
+++ b/src/vnet/ethernet/init.c
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ethernet_init.c: ethernet initialization
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/ip.h>		// for feature registration
+
+/* Global main structure. */
+ethernet_main_t ethernet_main;
+
+static void
+add_type (ethernet_main_t * em, ethernet_type_t type, char *type_name)
+{
+  ethernet_type_info_t *ti;
+  u32 i;
+
+  vec_add2 (em->type_infos, ti, 1);
+  i = ti - em->type_infos;
+
+  ti->name = type_name;
+  ti->type = type;
+  ti->next_index = ti->node_index = ~0;
+
+  hash_set (em->type_info_by_type, type, i);
+  hash_set_mem (em->type_info_by_name, ti->name, i);
+}
+
+/* Built-in ip4 tx feature path definition */
+/* *INDENT-OFF* */
+VNET_FEATURE_ARC_INIT (ethernet_output, static) =
+{
+  .arc_name  = "ethernet-output",
+  .start_nodes = VNET_FEATURES ("adj-l2-midchain"),
+  .arc_index_ptr = &ethernet_main.output_feature_arc_index,
+};
+
+VNET_FEATURE_INIT (ethernet_tx_drop, static) =
+{
+  .arc_name = "ethernet-output",
+  .node_name = "error-drop",
+  .runs_before = 0,	/* not before any other features */
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+ethernet_init (vlib_main_t * vm)
+{
+  ethernet_main_t *em = &ethernet_main;
+  clib_error_t *error;
+
+  /*
+   * Set up the L2 path now, or we'll wipe out the L2 ARP
+   * registration set up by ethernet_arp_init.
+   */
+  if ((error = vlib_call_init_function (vm, l2_init)))
+    return error;
+
+  em->vlib_main = vm;
+
+  em->type_info_by_name = hash_create_string (0, sizeof (uword));
+  em->type_info_by_type = hash_create (0, sizeof (uword));
+
+#define ethernet_type(n,s) add_type (em, ETHERNET_TYPE_##s, #s);
+#include "types.def"
+#undef ethernet_type
+
+  if ((error = vlib_call_init_function (vm, llc_init)))
+    return error;
+  if ((error = vlib_call_init_function (vm, ethernet_input_init)))
+    return error;
+  if ((error = vlib_call_init_function (vm, vnet_feature_init)))
+    return error;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ethernet_init);
+
+ethernet_main_t *
+ethernet_get_main (vlib_main_t * vm)
+{
+  vlib_call_init_function (vm, ethernet_init);
+  return &ethernet_main;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ethernet/interface.c b/src/vnet/ethernet/interface.c
new file mode 100644
index 00000000..1c1f4353
--- /dev/null
+++ b/src/vnet/ethernet/interface.c
@@ -0,0 +1,730 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ethernet_interface.c: ethernet interfaces
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/adj/adj.h>
+
+/**
+ * @file
+ * @brief Loopback Interfaces.
+ *
+ * This file contains code to manage loopback interfaces.
+ */
+
+/**
+ * @brief build a rewrite string to use for sending packets of type 'link_type'
+ * to 'dst_address'
+ */
+u8 *
+ethernet_build_rewrite (vnet_main_t * vnm,
+			u32 sw_if_index,
+			vnet_link_t link_type, const void *dst_address)
+{
+  vnet_sw_interface_t *sub_sw = vnet_get_sw_interface (vnm, sw_if_index);
+  vnet_sw_interface_t *sup_sw = vnet_get_sup_sw_interface (vnm, sw_if_index);
+  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  ethernet_main_t *em = &ethernet_main;
+  ethernet_interface_t *ei;
+  ethernet_header_t *h;
+  ethernet_type_t type;
+  uword n_bytes = sizeof (h[0]);
+  u8 *rewrite = NULL;
+
+  if (sub_sw != sup_sw)
+    {
+      if (sub_sw->sub.eth.flags.one_tag)
+	{
+	  n_bytes += sizeof (ethernet_vlan_header_t);
+	}
+      else if (sub_sw->sub.eth.flags.two_tags)
+	{
+	  n_bytes += 2 * (sizeof (ethernet_vlan_header_t));
+	}
+      // Check for encaps that are not supported for L3 interfaces
+      if (!(sub_sw->sub.eth.flags.exact_match) ||
+	  (sub_sw->sub.eth.flags.default_sub) ||
+	  (sub_sw->sub.eth.flags.outer_vlan_id_any) ||
+	  (sub_sw->sub.eth.flags.inner_vlan_id_any))
+	{
+	  return 0;
+	}
+    }
+
+  switch (link_type)
+    {
+#define _(a,b) case VNET_LINK_##a: type = ETHERNET_TYPE_##b; break
+      _(IP4, IP4);
+      _(IP6, IP6);
+      _(MPLS, MPLS_UNICAST);
+      _(ARP, ARP);
+#undef _
+    default:
+      return NULL;
+    }
+
+  vec_validate (rewrite, n_bytes - 1);
+  h = (ethernet_header_t *) rewrite;
+  ei = pool_elt_at_index (em->interfaces, hw->hw_instance);
+  clib_memcpy (h->src_address, ei->address, sizeof (h->src_address));
+  if (dst_address)
+    clib_memcpy (h->dst_address, dst_address, sizeof (h->dst_address));
+  else
+    memset (h->dst_address, ~0, sizeof (h->dst_address));	/* broadcast */
+
+  if (sub_sw->sub.eth.flags.one_tag)
+    {
+      ethernet_vlan_header_t *outer = (void *) (h + 1);
+
+      h->type = sub_sw->sub.eth.flags.dot1ad ?
+	clib_host_to_net_u16 (ETHERNET_TYPE_DOT1AD) :
+	clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
+      outer->priority_cfi_and_id =
+	clib_host_to_net_u16 (sub_sw->sub.eth.outer_vlan_id);
+      outer->type = clib_host_to_net_u16 (type);
+
+    }
+  else if (sub_sw->sub.eth.flags.two_tags)
+    {
+      ethernet_vlan_header_t *outer = (void *) (h + 1);
+      ethernet_vlan_header_t *inner = (void *) (outer + 1);
+
+      h->type = sub_sw->sub.eth.flags.dot1ad ?
+	clib_host_to_net_u16 (ETHERNET_TYPE_DOT1AD) :
+	clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
+      outer->priority_cfi_and_id =
+	clib_host_to_net_u16 (sub_sw->sub.eth.outer_vlan_id);
+      outer->type = clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
+      inner->priority_cfi_and_id =
+	clib_host_to_net_u16 (sub_sw->sub.eth.inner_vlan_id);
+      inner->type = clib_host_to_net_u16 (type);
+
+    }
+  else
+    {
+      h->type = clib_host_to_net_u16 (type);
+    }
+
+  return (rewrite);
+}
+
+void
+ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
+{
+  ip_adjacency_t *adj;
+
+  adj = adj_get (ai);
+
+  if (FIB_PROTOCOL_IP4 == adj->ia_nh_proto)
+    {
+      arp_update_adjacency (vnm, sw_if_index, ai);
+    }
+  else if (FIB_PROTOCOL_IP6 == adj->ia_nh_proto)
+    {
+      ip6_ethernet_update_adjacency (vnm, sw_if_index, ai);
+    }
+  else
+    {
+      ASSERT (0);
+    }
+}
+
+static clib_error_t *
+ethernet_mac_change (vnet_hw_interface_t * hi, char *mac_address)
+{
+  ethernet_interface_t *ei;
+  ethernet_main_t *em;
+
+  em = &ethernet_main;
+  ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
+
+  vec_validate (hi->hw_address,
+		STRUCT_SIZE_OF (ethernet_header_t, src_address) - 1);
+  clib_memcpy (hi->hw_address, mac_address, vec_len (hi->hw_address));
+
+  clib_memcpy (ei->address, (u8 *) mac_address, sizeof (ei->address));
+  ethernet_arp_change_mac (hi->sw_if_index);
+  ethernet_ndp_change_mac (hi->sw_if_index);
+
+  return (NULL);
+}
+
+/* *INDENT-OFF* */
+VNET_HW_INTERFACE_CLASS (ethernet_hw_interface_class) = {
+  .name = "Ethernet",
+  .format_address = format_ethernet_address,
+  .format_header = format_ethernet_header_with_length,
+  .unformat_hw_address = unformat_ethernet_address,
+  .unformat_header = unformat_ethernet_header,
+  .build_rewrite = ethernet_build_rewrite,
+  .update_adjacency = ethernet_update_adjacency,
+  .mac_addr_change_function = ethernet_mac_change,
+};
+/* *INDENT-ON* */
+
+uword
+unformat_ethernet_interface (unformat_input_t * input, va_list * args)
+{
+  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
+  u32 *result = va_arg (*args, u32 *);
+  u32 hw_if_index;
+  ethernet_main_t *em = &ethernet_main;
+  ethernet_interface_t *eif;
+
+  if (!unformat_user (input, unformat_vnet_hw_interface, vnm, &hw_if_index))
+    return 0;
+
+  eif = ethernet_get_interface (em, hw_if_index);
+  if (eif)
+    {
+      *result = hw_if_index;
+      return 1;
+    }
+  return 0;
+}
+
+clib_error_t *
+ethernet_register_interface (vnet_main_t * vnm,
+			     u32 dev_class_index,
+			     u32 dev_instance,
+			     u8 * address,
+			     u32 * hw_if_index_return,
+			     ethernet_flag_change_function_t flag_change)
+{
+  ethernet_main_t *em = &ethernet_main;
+  ethernet_interface_t *ei;
+  vnet_hw_interface_t *hi;
+  clib_error_t *error = 0;
+  u32 hw_if_index;
+
+  pool_get (em->interfaces, ei);
+  ei->flag_change = flag_change;
+
+  hw_if_index = vnet_register_interface
+    (vnm,
+     dev_class_index, dev_instance,
+     ethernet_hw_interface_class.index, ei - em->interfaces);
+  *hw_if_index_return = hw_if_index;
+
+  hi = vnet_get_hw_interface (vnm, hw_if_index);
+
+  ethernet_setup_node (vnm->vlib_main, hi->output_node_index);
+
+  hi->min_packet_bytes = hi->min_supported_packet_bytes =
+    ETHERNET_MIN_PACKET_BYTES;
+  hi->max_packet_bytes = hi->max_supported_packet_bytes =
+    ETHERNET_MAX_PACKET_BYTES;
+  hi->per_packet_overhead_bytes =
+    /* preamble */ 8 + /* inter frame gap */ 12;
+
+  /* Standard default ethernet MTU. */
+  hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] = 9000;
+
+  clib_memcpy (ei->address, address, sizeof (ei->address));
+  vec_free (hi->hw_address);
+  vec_add (hi->hw_address, address, sizeof (ei->address));
+
+  if (error)
+    {
+      pool_put (em->interfaces, ei);
+      return error;
+    }
+  return error;
+}
+
+void
+ethernet_delete_interface (vnet_main_t * vnm, u32 hw_if_index)
+{
+  ethernet_main_t *em = &ethernet_main;
+  ethernet_interface_t *ei;
+  vnet_hw_interface_t *hi;
+  main_intf_t *main_intf;
+  vlan_table_t *vlan_table;
+  u32 idx;
+
+  hi = vnet_get_hw_interface (vnm, hw_if_index);
+  ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
+
+  /* Delete vlan mapping table for dot1q and dot1ad. */
+  main_intf = vec_elt_at_index (em->main_intfs, hi->hw_if_index);
+  if (main_intf->dot1q_vlans)
+    {
+      vlan_table = vec_elt_at_index (em->vlan_pool, main_intf->dot1q_vlans);
+      for (idx = 0; idx < ETHERNET_N_VLAN; idx++)
+	{
+	  if (vlan_table->vlans[idx].qinqs)
+	    {
+	      pool_put_index (em->qinq_pool, vlan_table->vlans[idx].qinqs);
+	    }
+	}
+      pool_put_index (em->vlan_pool, main_intf->dot1q_vlans);
+    }
+  if (main_intf->dot1ad_vlans)
+    {
+      vlan_table = vec_elt_at_index (em->vlan_pool, main_intf->dot1ad_vlans);
+      for (idx = 0; idx < ETHERNET_N_VLAN; idx++)
+	{
+	  if (vlan_table->vlans[idx].qinqs)
+	    {
+	      pool_put_index (em->qinq_pool, vlan_table->vlans[idx].qinqs);
+	    }
+	}
+      pool_put_index (em->vlan_pool, main_intf->dot1ad_vlans);
+    }
+
+  vnet_delete_hw_interface (vnm, hw_if_index);
+  pool_put (em->interfaces, ei);
+}
+
+u32
+ethernet_set_flags (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+  ethernet_main_t *em = &ethernet_main;
+  vnet_hw_interface_t *hi;
+  ethernet_interface_t *ei;
+
+  hi = vnet_get_hw_interface (vnm, hw_if_index);
+
+  ASSERT (hi->hw_class_index == ethernet_hw_interface_class.index);
+
+  ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
+  if (ei->flag_change)
+    return ei->flag_change (vnm, hi, flags);
+  return (u32) ~ 0;
+}
+
+/* Echo packets back to ethernet/l2-input. */
+static uword
+simulated_ethernet_interface_tx (vlib_main_t * vm,
+				 vlib_node_runtime_t * node,
+				 vlib_frame_t * frame)
+{
+  u32 n_left_from, n_left_to_next, n_copy, *from, *to_next;
+  u32 next_index = VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT;
+  u32 i, next_node_index, bvi_flag, sw_if_index;
+  u32 n_pkts = 0, n_bytes = 0;
+  u32 cpu_index = vm->cpu_index;
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vlib_node_main_t *nm = &vm->node_main;
+  vlib_node_t *loop_node;
+  vlib_buffer_t *b;
+
+  // check tx node index, it is ethernet-input on loopback create
+  // but can be changed to l2-input if loopback is configured as
+  // BVI of a BD (Bridge Domain).
+  loop_node = vec_elt (nm->nodes, node->node_index);
+  next_node_index = loop_node->next_nodes[next_index];
+  bvi_flag = (next_node_index == l2input_node.index) ? 1 : 0;
+
+  n_left_from = frame->n_vectors;
+  from = vlib_frame_args (frame);
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      n_copy = clib_min (n_left_from, n_left_to_next);
+
+      clib_memcpy (to_next, from, n_copy * sizeof (from[0]));
+      n_left_to_next -= n_copy;
+      n_left_from -= n_copy;
+      i = 0;
+      b = vlib_get_buffer (vm, from[i]);
+      sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_TX];
+      while (1)
+	{
+	  // Set up RX and TX indices as if received from a real driver
+	  // unless loopback is used as a BVI. For BVI case, leave TX index
+	  // and update l2_len in packet as required for l2 forwarding path
+	  vnet_buffer (b)->sw_if_index[VLIB_RX] = sw_if_index;
+	  if (bvi_flag)
+	    {
+	      vnet_update_l2_len (b);
+	      vnet_buffer (b)->sw_if_index[VLIB_TX] = L2INPUT_BVI;
+	    }
+	  else
+	    vnet_buffer (b)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+
+	  i++;
+	  n_pkts++;
+	  n_bytes += vlib_buffer_length_in_chain (vm, b);
+
+	  if (i < n_copy)
+	    b = vlib_get_buffer (vm, from[i]);
+	  else
+	    break;
+	}
+      from += n_copy;
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+
+      /* increment TX interface stat */
+      vlib_increment_combined_counter (im->combined_sw_if_counters +
+				       VNET_INTERFACE_COUNTER_TX, cpu_index,
+				       sw_if_index, n_pkts, n_bytes);
+    }
+
+  return n_left_from;
+}
+
+static u8 *
+format_simulated_ethernet_name (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  return format (s, "loop%d", dev_instance);
+}
+
+static clib_error_t *
+simulated_ethernet_admin_up_down (vnet_main_t * vnm, u32 hw_if_index,
+				  u32 flags)
+{
+  u32 hw_flags = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ?
+    VNET_HW_INTERFACE_FLAG_LINK_UP : 0;
+  vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (ethernet_simulated_device_class) = {
+  .name = "Loopback",
+  .format_device_name = format_simulated_ethernet_name,
+  .tx_function = simulated_ethernet_interface_tx,
+  .admin_up_down_function = simulated_ethernet_admin_up_down,
+};
+/* *INDENT-ON* */
+
+int
+vnet_create_loopback_interface (u32 * sw_if_indexp, u8 * mac_address)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vlib_main_t *vm = vlib_get_main ();
+  clib_error_t *error;
+  static u32 instance;
+  u8 address[6];
+  u32 hw_if_index;
+  vnet_hw_interface_t *hw_if;
+  u32 slot;
+  int rv = 0;
+
+  ASSERT (sw_if_indexp);
+
+  *sw_if_indexp = (u32) ~ 0;
+
+  memset (address, 0, sizeof (address));
+
+  /*
+   * Default MAC address (dead:0000:0000 + instance) is allocated
+   * if zero mac_address is configured. Otherwise, user-configurable MAC
+   * address is programmed on the loopback interface.
+   */
+  if (memcmp (address, mac_address, sizeof (address)))
+    clib_memcpy (address, mac_address, sizeof (address));
+  else
+    {
+      address[0] = 0xde;
+      address[1] = 0xad;
+      address[5] = instance;
+    }
+
+  error = ethernet_register_interface
+    (vnm,
+     ethernet_simulated_device_class.index, instance++, address, &hw_if_index,
+     /* flag change */ 0);
+
+  if (error)
+    {
+      rv = VNET_API_ERROR_INVALID_REGISTRATION;
+      clib_error_report (error);
+      return rv;
+    }
+
+  hw_if = vnet_get_hw_interface (vnm, hw_if_index);
+  slot = vlib_node_add_named_next_with_slot
+    (vm, hw_if->tx_node_index,
+     "ethernet-input", VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
+  ASSERT (slot == VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
+
+  {
+    vnet_sw_interface_t *si = vnet_get_hw_sw_interface (vnm, hw_if_index);
+    *sw_if_indexp = si->sw_if_index;
+  }
+
+  return 0;
+}
+
+static clib_error_t *
+create_simulated_ethernet_interfaces (vlib_main_t * vm,
+				      unformat_input_t * input,
+				      vlib_cli_command_t * cmd)
+{
+  int rv;
+  u32 sw_if_index;
+  u8 mac_address[6];
+
+  memset (mac_address, 0, sizeof (mac_address));
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "mac %U", unformat_ethernet_address, mac_address))
+	;
+      else
+	break;
+    }
+
+  rv = vnet_create_loopback_interface (&sw_if_index, mac_address);
+
+  if (rv)
+    return clib_error_return (0, "vnet_create_loopback_interface failed");
+
+  vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main (),
+		   sw_if_index);
+  return 0;
+}
+
+/*?
+ * Create a loopback interface. Optionally, a MAC Address can be
+ * provided. If not provided, de:ad:00:00:00:<loopId> will be used.
+ *
+ * @cliexpar
+ * The following two command syntaxes are equivalent:
+ * @cliexcmd{loopback create-interface [mac <mac-addr>]}
+ * @cliexcmd{create loopback interface [mac <mac-addr>]}
+ * Example of how to create a loopback interface:
+ * @cliexcmd{loopback create-interface}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (create_simulated_ethernet_interface_command, static) = {
+  .path = "loopback create-interface",
+  .short_help = "loopback create-interface [mac <mac-addr>]",
+  .function = create_simulated_ethernet_interfaces,
+};
+/* *INDENT-ON* */
+
+/*?
+ * Create a loopback interface. Optionally, a MAC Address can be
+ * provided. If not provided, de:ad:00:00:00:<loopId> will be used.
+ *
+ * @cliexpar
+ * The following two command syntaxes are equivalent:
+ * @cliexcmd{loopback create-interface [mac <mac-addr>]}
+ * @cliexcmd{create loopback interface [mac <mac-addr>]}
+ * Example of how to create a loopback interface:
+ * @cliexcmd{create loopback interface}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (create_loopback_interface_command, static) = {
+  .path = "create loopback interface",
+  .short_help = "create loopback interface [mac <mac-addr>]",
+  .function = create_simulated_ethernet_interfaces,
+};
+/* *INDENT-ON* */
+
+ethernet_interface_t *
+ethernet_get_interface (ethernet_main_t * em, u32 hw_if_index)
+{
+  vnet_hw_interface_t *i =
+    vnet_get_hw_interface (vnet_get_main (), hw_if_index);
+  return (i->hw_class_index ==
+	  ethernet_hw_interface_class.
+	  index ? pool_elt_at_index (em->interfaces, i->hw_instance) : 0);
+}
+
+int
+vnet_delete_loopback_interface (u32 sw_if_index)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_sw_interface_t *si;
+
+  if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+  si = vnet_get_sw_interface (vnm, sw_if_index);
+  ethernet_delete_interface (vnm, si->hw_if_index);
+
+  return 0;
+}
+
+int
+vnet_delete_sub_interface (u32 sw_if_index)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  int rv = 0;
+
+  if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index);
+
+  if (si->type == VNET_SW_INTERFACE_TYPE_SUB)
+    {
+      vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index);
+      u64 sup_and_sub_key =
+	((u64) (si->sup_sw_if_index) << 32) | (u64) si->sub.id;
+
+      hash_unset_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key);
+      vnet_delete_sw_interface (vnm, sw_if_index);
+    }
+  else
+    {
+      rv = VNET_API_ERROR_INVALID_SUB_SW_IF_INDEX;
+    }
+  return rv;
+}
+
+static clib_error_t *
+delete_simulated_ethernet_interfaces (vlib_main_t * vm,
+				      unformat_input_t * input,
+				      vlib_cli_command_t * cmd)
+{
+  int rv;
+  u32 sw_if_index = ~0;
+  vnet_main_t *vnm = vnet_get_main ();
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "intfc %U",
+		    unformat_vnet_sw_interface, vnm, &sw_if_index))
+	;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "interface not specified");
+
+  rv = vnet_delete_loopback_interface (sw_if_index);
+
+  if (rv)
+    return clib_error_return (0, "vnet_delete_loopback_interface failed");
+
+  return 0;
+}
+
+static clib_error_t *
+delete_sub_interface (vlib_main_t * vm,
+		      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  int rv = 0;
+  u32 sw_if_index = ~0;
+  vnet_main_t *vnm = vnet_get_main ();
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
+	;
+      else
+	break;
+    }
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "interface doesn't exist");
+
+  if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
+    rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
+  else
+    rv = vnet_delete_sub_interface (sw_if_index);
+  if (rv)
+    return clib_error_return (0, "delete_subinterface_interface failed");
+  return 0;
+}
+
+/*?
+ * Delete a loopback interface.
+ *
+ * @cliexpar
+ * The following two command syntaxes are equivalent:
+ * @cliexcmd{loopback delete-interface intfc <interface>}
+ * @cliexcmd{delete loopback interface intfc <interface>}
+ * Example of how to delete a loopback interface:
+ * @cliexcmd{loopback delete-interface intfc loop0}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (delete_simulated_ethernet_interface_command, static) = {
+  .path = "loopback delete-interface",
+  .short_help = "loopback delete-interface intfc <interface>",
+  .function = delete_simulated_ethernet_interfaces,
+};
+/* *INDENT-ON* */
+
+/*?
+ * Delete a loopback interface.
+ *
+ * @cliexpar
+ * The following two command syntaxes are equivalent:
+ * @cliexcmd{loopback delete-interface intfc <interface>}
+ * @cliexcmd{delete loopback interface intfc <interface>}
+ * Example of how to delete a loopback interface:
+ * @cliexcmd{delete loopback interface intfc loop0}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (delete_loopback_interface_command, static) = {
+  .path = "delete loopback interface",
+  .short_help = "delete loopback interface intfc <interface>",
+  .function = delete_simulated_ethernet_interfaces,
+};
+/* *INDENT-ON* */
+
+/*?
+ * Delete a sub-interface.
+ *
+ * @cliexpar
+ * Example of how to delete a sub-interface:
+ * @cliexcmd{delete sub-interface GigabitEthernet0/8/0.200}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (delete_sub_interface_command, static) = {
+  .path = "delete sub-interface",
+  .short_help = "delete sub-interface <interface>",
+  .function = delete_sub_interface,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ethernet/mac_swap.c b/src/vnet/ethernet/mac_swap.c
new file mode 100644
index 00000000..c0fec12e
--- /dev/null
+++ b/src/vnet/ethernet/mac_swap.c
@@ -0,0 +1,397 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vppinfra/error.h>
+#include <vnet/devices/pci/ige.h>
+#include <vnet/devices/pci/ixge.h>
+#include <vnet/devices/pci/ixgev.h>
+
+typedef struct
+{
+  u32 cached_next_index;
+  u32 cached_sw_if_index;
+
+  /* Hash table to map sw_if_index to next node index */
+  uword *next_node_index_by_sw_if_index;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} mac_swap_main_t;
+
+typedef struct
+{
+  u8 src[6];
+  u8 dst[6];
+  u32 sw_if_index;
+  u32 next_index;
+} swap_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_swap_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  swap_trace_t *t = va_arg (*args, swap_trace_t *);
+
+  s = format (s, "SWAP: dst now %U src now %U sw_if_index %d next_index %d",
+	      format_ethernet_address, t->dst,
+	      format_ethernet_address, t->src, t->sw_if_index, t->next_index);
+  return s;
+}
+
+#define foreach_hw_driver_next                  \
+  _(IP4)                                        \
+  _(IP6)                                        \
+  _(ETHERNET)
+
+mac_swap_main_t mac_swap_main;
+
+static vlib_node_registration_t mac_swap_node;
+
+#define foreach_mac_swap_error \
+_(SWAPS, "mac addresses swapped")
+
+typedef enum
+{
+#define _(sym,str) MAC_SWAP_ERROR_##sym,
+  foreach_mac_swap_error
+#undef _
+    MAC_SWAP_N_ERROR,
+} mac_swap_error_t;
+
+static char *mac_swap_error_strings[] = {
+#define _(sym,string) string,
+  foreach_mac_swap_error
+#undef _
+};
+
+/*
+ * To drop a pkt and increment one of the previous counters:
+ *
+ * set b0->error = error_node->errors[RANDOM_ERROR_SAMPLE];
+ * set next0 to a disposition index bound to "error-drop".
+ *
+ * To manually increment the specific counter MAC_SWAP_ERROR_SAMPLE:
+ *
+ *  vlib_node_t *n = vlib_get_node (vm, mac_swap.index);
+ *  u32 node_counter_base_index = n->error_heap_index;
+ *  vlib_error_main_t * em = &vm->error_main;
+ *  em->counters[node_counter_base_index + MAC_SWAP_ERROR_SAMPLE] += 1;
+ *
+ */
+
+typedef enum
+{
+  MAC_SWAP_NEXT_DROP,
+  MAC_SWAP_N_NEXT,
+} mac_swap_next_t;
+
+static uword
+mac_swap_node_fn (vlib_main_t * vm,
+		  vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  mac_swap_next_t next_index;
+  mac_swap_main_t *msm = &mac_swap_main;
+  vlib_node_t *n = vlib_get_node (vm, mac_swap_node.index);
+  u32 node_counter_base_index = n->error_heap_index;
+  vlib_error_main_t *em = &vm->error_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+	  u32 sw_if_index0, sw_if_index1;
+	  uword *p0, *p1;
+	  u64 tmp0a, tmp0b;
+	  u64 tmp1a, tmp1b;
+	  ethernet_header_t *h0, *h1;
+
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  next0 = msm->cached_next_index;
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+	  next1 = msm->cached_next_index;
+
+	  if (PREDICT_FALSE (msm->cached_sw_if_index != sw_if_index0))
+	    {
+	      p0 =
+		hash_get (msm->next_node_index_by_sw_if_index, sw_if_index0);
+	      if (p0 == 0)
+		{
+		  vnet_hw_interface_t *hw0;
+
+		  hw0 = vnet_get_sup_hw_interface (msm->vnet_main,
+						   sw_if_index0);
+
+		  next0 = vlib_node_add_next (msm->vlib_main,
+					      mac_swap_node.index,
+					      hw0->output_node_index);
+		  hash_set (msm->next_node_index_by_sw_if_index,
+			    sw_if_index0, next0);
+		}
+	      else
+		next0 = p0[0];
+	      msm->cached_sw_if_index = sw_if_index0;
+	      msm->cached_next_index = next0;
+	      next1 = next0;
+	    }
+	  if (PREDICT_FALSE (msm->cached_sw_if_index != sw_if_index1))
+	    {
+	      p1 =
+		hash_get (msm->next_node_index_by_sw_if_index, sw_if_index1);
+	      if (p1 == 0)
+		{
+		  vnet_hw_interface_t *hw1;
+
+		  hw1 = vnet_get_sup_hw_interface (msm->vnet_main,
+						   sw_if_index1);
+
+		  next1 = vlib_node_add_next (msm->vlib_main,
+					      mac_swap_node.index,
+					      hw1->output_node_index);
+		  hash_set (msm->next_node_index_by_sw_if_index,
+			    sw_if_index1, next1);
+		}
+	      else
+		next1 = p1[0];
+	      msm->cached_sw_if_index = sw_if_index1;
+	      msm->cached_next_index = next1;
+	    }
+
+	  em->counters[node_counter_base_index + MAC_SWAP_ERROR_SWAPS] += 2;
+
+	  /* reset buffer so we always point at the MAC hdr */
+	  vlib_buffer_reset (b0);
+	  vlib_buffer_reset (b1);
+	  h0 = vlib_buffer_get_current (b0);
+	  h1 = vlib_buffer_get_current (b1);
+
+	  /* Swap 2 x src and dst mac addresses using 8-byte load/stores */
+	  tmp0a = clib_net_to_host_u64 (((u64 *) (h0->dst_address))[0]);
+	  tmp1a = clib_net_to_host_u64 (((u64 *) (h1->dst_address))[0]);
+	  tmp0b = clib_net_to_host_u64 (((u64 *) (h0->src_address))[0]);
+	  tmp1b = clib_net_to_host_u64 (((u64 *) (h1->src_address))[0]);
+	  ((u64 *) (h0->dst_address))[0] = clib_host_to_net_u64 (tmp0b);
+	  ((u64 *) (h1->dst_address))[0] = clib_host_to_net_u64 (tmp1b);
+	  /* Move the ethertype from "b" to "a" */
+	  tmp0a &= ~(0xFFFF);
+	  tmp1a &= ~(0xFFFF);
+	  tmp0a |= tmp0b & 0xFFFF;
+	  ((u64 *) (h0->src_address))[0] = clib_host_to_net_u64 (tmp0a);
+	  tmp1a |= tmp1b & 0xFFFF;
+	  ((u64 *) (h1->src_address))[0] = clib_host_to_net_u64 (tmp1a);
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  swap_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  clib_memcpy (t->src, h0->src_address, 6);
+		  clib_memcpy (t->dst, h0->dst_address, 6);
+		  t->sw_if_index = sw_if_index0;
+		  t->next_index = next0;
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  swap_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  clib_memcpy (t->src, h1->src_address, 6);
+		  clib_memcpy (t->dst, h1->dst_address, 6);
+		  t->sw_if_index = sw_if_index1;
+		  t->next_index = next1;
+		}
+	    }
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 sw_if_index0;
+	  uword *p0;
+	  u64 tmp0a, tmp0b;
+	  ethernet_header_t *h0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  next0 = msm->cached_next_index;
+
+	  if (PREDICT_FALSE (msm->cached_sw_if_index != sw_if_index0))
+	    {
+	      p0 =
+		hash_get (msm->next_node_index_by_sw_if_index, sw_if_index0);
+	      if (p0 == 0)
+		{
+		  vnet_hw_interface_t *hw0;
+
+		  hw0 = vnet_get_sup_hw_interface (msm->vnet_main,
+						   sw_if_index0);
+
+		  next0 = vlib_node_add_next (msm->vlib_main,
+					      mac_swap_node.index,
+					      hw0->output_node_index);
+		  hash_set (msm->next_node_index_by_sw_if_index,
+			    sw_if_index0, next0);
+		}
+	      else
+		next0 = p0[0];
+	      msm->cached_sw_if_index = sw_if_index0;
+	      msm->cached_next_index = next0;
+	    }
+
+	  em->counters[node_counter_base_index + MAC_SWAP_ERROR_SWAPS] += 1;
+
+	  /* reset buffer so we always point at the MAC hdr */
+	  vlib_buffer_reset (b0);
+	  h0 = vlib_buffer_get_current (b0);
+
+	  /* Exchange src and dst, preserve the ethertype */
+	  tmp0a = clib_net_to_host_u64 (((u64 *) (h0->dst_address))[0]);
+	  tmp0b = clib_net_to_host_u64 (((u64 *) (h0->src_address))[0]);
+	  ((u64 *) (h0->dst_address))[0] = clib_host_to_net_u64 (tmp0b);
+	  tmp0a &= ~(0xFFFF);
+	  tmp0a |= tmp0b & 0xFFFF;
+	  ((u64 *) (h0->src_address))[0] = clib_host_to_net_u64 (tmp0a);
+
+	  /* ship it */
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      swap_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+	      clib_memcpy (t->src, h0->src_address, 6);
+	      clib_memcpy (t->dst, h0->dst_address, 6);
+	      t->sw_if_index = sw_if_index0;
+	      t->next_index = next0;
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (mac_swap_node,static) = {
+  .function = mac_swap_node_fn,
+  .name = "mac-swap",
+  .vector_size = sizeof (u32),
+  .format_trace = format_swap_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(mac_swap_error_strings),
+  .error_strings = mac_swap_error_strings,
+
+  .n_next_nodes = MAC_SWAP_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+        [MAC_SWAP_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+mac_swap_init (vlib_main_t * vm)
+{
+  mac_swap_main_t *msm = &mac_swap_main;
+
+  msm->next_node_index_by_sw_if_index = hash_create (0, sizeof (uword));
+  msm->cached_next_index = (u32) ~ 0;
+  msm->cached_sw_if_index = (u32) ~ 0;
+  msm->vlib_main = vm;
+  msm->vnet_main = vnet_get_main ();
+
+  /* Driver RX nodes send pkts here... */
+#define _(a) ixge_set_next_node (IXGE_RX_NEXT_##a##_INPUT, "mac-swap");
+  foreach_hw_driver_next
+#undef _
+#define _(a) ixgev_set_next_node (IXGEV_RX_NEXT_##a##_INPUT, "mac-swap");
+    foreach_hw_driver_next
+#undef _
+#define _(a) ige_set_next_node (IGE_RX_NEXT_##a##_INPUT, "mac-swap");
+    foreach_hw_driver_next
+#undef _
+    return 0;
+}
+
+VLIB_INIT_FUNCTION (mac_swap_init);
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ethernet/node.c b/src/vnet/ethernet/node.c
new file mode 100755
index 00000000..6d57da31
--- /dev/null
+++ b/src/vnet/ethernet/node.c
@@ -0,0 +1,1368 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ethernet_node.c: ethernet packet processing
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vppinfra/sparse_vec.h>
+#include <vnet/l2/l2_bvi.h>
+
+
+#define foreach_ethernet_input_next		\
+  _ (PUNT, "error-punt")			\
+  _ (DROP, "error-drop")			\
+  _ (LLC, "llc-input")
+
+typedef enum
+{
+#define _(s,n) ETHERNET_INPUT_NEXT_##s,
+  foreach_ethernet_input_next
+#undef _
+    ETHERNET_INPUT_N_NEXT,
+} ethernet_input_next_t;
+
+typedef struct
+{
+  u8 packet_data[32];
+} ethernet_input_trace_t;
+
+static u8 *
+format_ethernet_input_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  ethernet_input_trace_t *t = va_arg (*va, ethernet_input_trace_t *);
+
+  s = format (s, "%U", format_ethernet_header, t->packet_data);
+
+  return s;
+}
+
+vlib_node_registration_t ethernet_input_node;
+
+typedef enum
+{
+  ETHERNET_INPUT_VARIANT_ETHERNET,
+  ETHERNET_INPUT_VARIANT_ETHERNET_TYPE,
+  ETHERNET_INPUT_VARIANT_NOT_L2,
+} ethernet_input_variant_t;
+
+
+// Parse the ethernet header to extract vlan tags and innermost ethertype
+static_always_inline void
+parse_header (ethernet_input_variant_t variant,
+	      vlib_buffer_t * b0,
+	      u16 * type,
+	      u16 * orig_type,
+	      u16 * outer_id, u16 * inner_id, u32 * match_flags)
+{
+  u8 vlan_count;
+
+  if (variant == ETHERNET_INPUT_VARIANT_ETHERNET
+      || variant == ETHERNET_INPUT_VARIANT_NOT_L2)
+    {
+      ethernet_header_t *e0;
+
+      e0 = (void *) (b0->data + b0->current_data);
+
+      vnet_buffer (b0)->ethernet.start_of_ethernet_header = b0->current_data;
+
+      vlib_buffer_advance (b0, sizeof (e0[0]));
+
+      *type = clib_net_to_host_u16 (e0->type);
+    }
+  else if (variant == ETHERNET_INPUT_VARIANT_ETHERNET_TYPE)
+    {
+      // here when prior node was LLC/SNAP processing
+      u16 *e0;
+
+      e0 = (void *) (b0->data + b0->current_data);
+
+      vlib_buffer_advance (b0, sizeof (e0[0]));
+
+      *type = clib_net_to_host_u16 (e0[0]);
+    }
+
+  // save for distinguishing between dot1q and dot1ad later
+  *orig_type = *type;
+
+  // default the tags to 0 (used if there is no corresponding tag)
+  *outer_id = 0;
+  *inner_id = 0;
+
+  *match_flags = SUBINT_CONFIG_VALID | SUBINT_CONFIG_MATCH_0_TAG;
+  vlan_count = 0;
+
+  // check for vlan encaps
+  if (ethernet_frame_is_tagged (*type))
+    {
+      ethernet_vlan_header_t *h0;
+      u16 tag;
+
+      *match_flags = SUBINT_CONFIG_VALID | SUBINT_CONFIG_MATCH_1_TAG;
+
+      h0 = (void *) (b0->data + b0->current_data);
+
+      tag = clib_net_to_host_u16 (h0->priority_cfi_and_id);
+
+      *outer_id = tag & 0xfff;
+
+      *type = clib_net_to_host_u16 (h0->type);
+
+      vlib_buffer_advance (b0, sizeof (h0[0]));
+      vlan_count = 1;
+
+      if (*type == ETHERNET_TYPE_VLAN)
+	{
+	  // Double tagged packet
+	  *match_flags = SUBINT_CONFIG_VALID | SUBINT_CONFIG_MATCH_2_TAG;
+
+	  h0 = (void *) (b0->data + b0->current_data);
+
+	  tag = clib_net_to_host_u16 (h0->priority_cfi_and_id);
+
+	  *inner_id = tag & 0xfff;
+
+	  *type = clib_net_to_host_u16 (h0->type);
+
+	  vlib_buffer_advance (b0, sizeof (h0[0]));
+	  vlan_count = 2;
+
+	  if (*type == ETHERNET_TYPE_VLAN)
+	    {
+	      // More than double tagged packet
+	      *match_flags = SUBINT_CONFIG_VALID | SUBINT_CONFIG_MATCH_3_TAG;
+	      vlan_count = 3;	// "unknown" number, aka, 3-or-more
+	    }
+	}
+    }
+  ethernet_buffer_set_vlan_count (b0, vlan_count);
+}
+
+// Determine the subinterface for this packet, given the result of the
+// vlan table lookups and vlan header parsing. Check the most specific
+// matches first.
+static_always_inline void
+identify_subint (vnet_hw_interface_t * hi,
+		 vlib_buffer_t * b0,
+		 u32 match_flags,
+		 main_intf_t * main_intf,
+		 vlan_intf_t * vlan_intf,
+		 qinq_intf_t * qinq_intf,
+		 u32 * new_sw_if_index, u8 * error0, u32 * is_l2)
+{
+  u32 matched;
+
+  matched = eth_identify_subint (hi, b0, match_flags,
+				 main_intf, vlan_intf, qinq_intf,
+				 new_sw_if_index, error0, is_l2);
+
+  if (matched)
+    {
+
+      // Perform L3 my-mac filter
+      // A unicast packet arriving on an L3 interface must have a dmac matching the interface mac.
+      // This is required for promiscuous mode, else we will forward packets we aren't supposed to.
+      if (!(*is_l2))
+	{
+	  ethernet_header_t *e0;
+	  e0 =
+	    (void *) (b0->data +
+		      vnet_buffer (b0)->ethernet.start_of_ethernet_header);
+
+	  if (!(ethernet_address_cast (e0->dst_address)))
+	    {
+	      if (!eth_mac_equal ((u8 *) e0, hi->hw_address))
+		{
+		  *error0 = ETHERNET_ERROR_L3_MAC_MISMATCH;
+		}
+	    }
+	}
+
+      // Check for down subinterface
+      *error0 = (*new_sw_if_index) != ~0 ? (*error0) : ETHERNET_ERROR_DOWN;
+    }
+}
+
+static_always_inline void
+determine_next_node (ethernet_main_t * em,
+		     ethernet_input_variant_t variant,
+		     u32 is_l20,
+		     u32 type0, vlib_buffer_t * b0, u8 * error0, u8 * next0)
+{
+  if (PREDICT_FALSE (*error0 != ETHERNET_ERROR_NONE))
+    {
+      // some error occurred
+      *next0 = ETHERNET_INPUT_NEXT_DROP;
+    }
+  else if (is_l20)
+    {
+      *next0 = em->l2_next;
+      // record the L2 len and reset the buffer so the L2 header is preserved
+      u32 eth_start = vnet_buffer (b0)->ethernet.start_of_ethernet_header;
+      vnet_buffer (b0)->l2.l2_len = b0->current_data - eth_start;
+      vlib_buffer_advance (b0, -ethernet_buffer_header_size (b0));
+
+      // check for common IP/MPLS ethertypes
+    }
+  else if (type0 == ETHERNET_TYPE_IP4)
+    {
+      *next0 = em->l3_next.input_next_ip4;
+    }
+  else if (type0 == ETHERNET_TYPE_IP6)
+    {
+      *next0 = em->l3_next.input_next_ip6;
+    }
+  else if (type0 == ETHERNET_TYPE_MPLS_UNICAST)
+    {
+      *next0 = em->l3_next.input_next_mpls;
+
+    }
+  else if (em->redirect_l3)
+    {
+      // L3 Redirect is on, the cached common next nodes will be
+      // pointing to the redirect node, catch the uncommon types here
+      *next0 = em->redirect_l3_next;
+    }
+  else
+    {
+      // uncommon ethertype, check table
+      u32 i0;
+      i0 = sparse_vec_index (em->l3_next.input_next_by_type, type0);
+      *next0 = vec_elt (em->l3_next.input_next_by_type, i0);
+      *error0 =
+	i0 ==
+	SPARSE_VEC_INVALID_INDEX ? ETHERNET_ERROR_UNKNOWN_TYPE : *error0;
+
+      // The table is not populated with LLC values, so check that now.
+      // If variant is variant_ethernet then we came from LLC processing. Don't
+      // go back there; drop instead using by keeping the drop/bad table result.
+      if ((type0 < 0x600) && (variant == ETHERNET_INPUT_VARIANT_ETHERNET))
+	{
+	  *next0 = ETHERNET_INPUT_NEXT_LLC;
+	}
+    }
+}
+
+static_always_inline uword
+ethernet_input_inline (vlib_main_t * vm,
+		       vlib_node_runtime_t * node,
+		       vlib_frame_t * from_frame,
+		       ethernet_input_variant_t variant)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ethernet_main_t *em = &ethernet_main;
+  vlib_node_runtime_t *error_node;
+  u32 n_left_from, next_index, *from, *to_next;
+  u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
+  u32 cpu_index = os_get_cpu_number ();
+  u32 cached_sw_if_index = ~0;
+  u32 cached_is_l2 = 0;		/* shut up gcc */
+
+  if (variant != ETHERNET_INPUT_VARIANT_ETHERNET)
+    error_node = vlib_node_get_runtime (vm, ethernet_input_node.index);
+  else
+    error_node = node;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node,
+				   from,
+				   n_left_from,
+				   sizeof (from[0]),
+				   sizeof (ethernet_input_trace_t));
+
+  next_index = node->cached_next_index;
+  stats_sw_if_index = node->runtime_data[0];
+  stats_n_packets = stats_n_bytes = 0;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u8 next0, next1, error0, error1;
+	  u16 type0, orig_type0, type1, orig_type1;
+	  u16 outer_id0, inner_id0, outer_id1, inner_id1;
+	  u32 match_flags0, match_flags1;
+	  u32 old_sw_if_index0, new_sw_if_index0, len0, old_sw_if_index1,
+	    new_sw_if_index1, len1;
+	  vnet_hw_interface_t *hi0, *hi1;
+	  main_intf_t *main_intf0, *main_intf1;
+	  vlan_intf_t *vlan_intf0, *vlan_intf1;
+	  qinq_intf_t *qinq_intf0, *qinq_intf1;
+	  u32 is_l20, is_l21;
+	  ethernet_header_t *e0, *e1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *b2, *b3;
+
+	    b2 = vlib_get_buffer (vm, from[2]);
+	    b3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (b2, STORE);
+	    vlib_prefetch_buffer_header (b3, STORE);
+
+	    CLIB_PREFETCH (b2->data, sizeof (ethernet_header_t), LOAD);
+	    CLIB_PREFETCH (b3->data, sizeof (ethernet_header_t), LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  error0 = error1 = ETHERNET_ERROR_NONE;
+	  e0 = vlib_buffer_get_current (b0);
+	  type0 = clib_net_to_host_u16 (e0->type);
+	  e1 = vlib_buffer_get_current (b1);
+	  type1 = clib_net_to_host_u16 (e1->type);
+
+	  /* Speed-path for the untagged case */
+	  if (PREDICT_TRUE (variant == ETHERNET_INPUT_VARIANT_ETHERNET
+			    && !ethernet_frame_is_tagged (type0)
+			    && !ethernet_frame_is_tagged (type1)))
+	    {
+	      main_intf_t *intf0;
+	      subint_config_t *subint0;
+	      u32 sw_if_index0, sw_if_index1;
+
+	      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+	      is_l20 = cached_is_l2;
+
+	      /* This is probably wholly unnecessary */
+	      if (PREDICT_FALSE (sw_if_index0 != sw_if_index1))
+		goto slowpath;
+
+	      if (PREDICT_FALSE (cached_sw_if_index != sw_if_index0))
+		{
+		  cached_sw_if_index = sw_if_index0;
+		  hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
+		  intf0 = vec_elt_at_index (em->main_intfs, hi0->hw_if_index);
+		  subint0 = &intf0->untagged_subint;
+		  cached_is_l2 = is_l20 = subint0->flags & SUBINT_CONFIG_L2;
+		}
+
+	      vnet_buffer (b0)->ethernet.start_of_ethernet_header =
+		b0->current_data;
+	      vnet_buffer (b1)->ethernet.start_of_ethernet_header =
+		b1->current_data;
+
+	      if (PREDICT_TRUE (is_l20 != 0))
+		{
+		  next0 = em->l2_next;
+		  vnet_buffer (b0)->l2.l2_len = sizeof (ethernet_header_t);
+		  next1 = em->l2_next;
+		  vnet_buffer (b1)->l2.l2_len = sizeof (ethernet_header_t);
+		}
+	      else
+		{
+		  determine_next_node (em, variant, 0, type0, b0,
+				       &error0, &next0);
+		  vlib_buffer_advance (b0, sizeof (ethernet_header_t));
+		  determine_next_node (em, variant, 0, type1, b1,
+				       &error1, &next1);
+		  vlib_buffer_advance (b1, sizeof (ethernet_header_t));
+		}
+	      goto ship_it01;
+	    }
+
+	  /* Slow-path for the tagged case */
+	slowpath:
+	  parse_header (variant,
+			b0,
+			&type0,
+			&orig_type0, &outer_id0, &inner_id0, &match_flags0);
+
+	  parse_header (variant,
+			b1,
+			&type1,
+			&orig_type1, &outer_id1, &inner_id1, &match_flags1);
+
+	  old_sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  old_sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+
+	  eth_vlan_table_lookups (em,
+				  vnm,
+				  old_sw_if_index0,
+				  orig_type0,
+				  outer_id0,
+				  inner_id0,
+				  &hi0,
+				  &main_intf0, &vlan_intf0, &qinq_intf0);
+
+	  eth_vlan_table_lookups (em,
+				  vnm,
+				  old_sw_if_index1,
+				  orig_type1,
+				  outer_id1,
+				  inner_id1,
+				  &hi1,
+				  &main_intf1, &vlan_intf1, &qinq_intf1);
+
+	  identify_subint (hi0,
+			   b0,
+			   match_flags0,
+			   main_intf0,
+			   vlan_intf0,
+			   qinq_intf0, &new_sw_if_index0, &error0, &is_l20);
+
+	  identify_subint (hi1,
+			   b1,
+			   match_flags1,
+			   main_intf1,
+			   vlan_intf1,
+			   qinq_intf1, &new_sw_if_index1, &error1, &is_l21);
+
+	  // Save RX sw_if_index for later nodes
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
+	    error0 !=
+	    ETHERNET_ERROR_NONE ? old_sw_if_index0 : new_sw_if_index0;
+	  vnet_buffer (b1)->sw_if_index[VLIB_RX] =
+	    error1 !=
+	    ETHERNET_ERROR_NONE ? old_sw_if_index1 : new_sw_if_index1;
+
+	  // Check if there is a stat to take (valid and non-main sw_if_index for pkt 0 or pkt 1)
+	  if (((new_sw_if_index0 != ~0)
+	       && (new_sw_if_index0 != old_sw_if_index0))
+	      || ((new_sw_if_index1 != ~0)
+		  && (new_sw_if_index1 != old_sw_if_index1)))
+	    {
+
+	      len0 = vlib_buffer_length_in_chain (vm, b0) + b0->current_data
+		- vnet_buffer (b0)->ethernet.start_of_ethernet_header;
+	      len1 = vlib_buffer_length_in_chain (vm, b1) + b1->current_data
+		- vnet_buffer (b1)->ethernet.start_of_ethernet_header;
+
+	      stats_n_packets += 2;
+	      stats_n_bytes += len0 + len1;
+
+	      if (PREDICT_FALSE
+		  (!(new_sw_if_index0 == stats_sw_if_index
+		     && new_sw_if_index1 == stats_sw_if_index)))
+		{
+		  stats_n_packets -= 2;
+		  stats_n_bytes -= len0 + len1;
+
+		  if (new_sw_if_index0 != old_sw_if_index0
+		      && new_sw_if_index0 != ~0)
+		    vlib_increment_combined_counter (vnm->
+						     interface_main.combined_sw_if_counters
+						     +
+						     VNET_INTERFACE_COUNTER_RX,
+						     cpu_index,
+						     new_sw_if_index0, 1,
+						     len0);
+		  if (new_sw_if_index1 != old_sw_if_index1
+		      && new_sw_if_index1 != ~0)
+		    vlib_increment_combined_counter (vnm->
+						     interface_main.combined_sw_if_counters
+						     +
+						     VNET_INTERFACE_COUNTER_RX,
+						     cpu_index,
+						     new_sw_if_index1, 1,
+						     len1);
+
+		  if (new_sw_if_index0 == new_sw_if_index1)
+		    {
+		      if (stats_n_packets > 0)
+			{
+			  vlib_increment_combined_counter
+			    (vnm->interface_main.combined_sw_if_counters
+			     + VNET_INTERFACE_COUNTER_RX,
+			     cpu_index,
+			     stats_sw_if_index,
+			     stats_n_packets, stats_n_bytes);
+			  stats_n_packets = stats_n_bytes = 0;
+			}
+		      stats_sw_if_index = new_sw_if_index0;
+		    }
+		}
+	    }
+
+	  if (variant == ETHERNET_INPUT_VARIANT_NOT_L2)
+	    is_l20 = is_l21 = 0;
+
+	  determine_next_node (em, variant, is_l20, type0, b0, &error0,
+			       &next0);
+	  determine_next_node (em, variant, is_l21, type1, b1, &error1,
+			       &next1);
+
+	  b0->error = error_node->errors[error0];
+	  b1->error = error_node->errors[error1];
+
+	ship_it01:
+	  // verify speculative enqueue
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, bi1, next0,
+					   next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u8 error0, next0;
+	  u16 type0, orig_type0;
+	  u16 outer_id0, inner_id0;
+	  u32 match_flags0;
+	  u32 old_sw_if_index0, new_sw_if_index0, len0;
+	  vnet_hw_interface_t *hi0;
+	  main_intf_t *main_intf0;
+	  vlan_intf_t *vlan_intf0;
+	  qinq_intf_t *qinq_intf0;
+	  ethernet_header_t *e0;
+	  u32 is_l20;
+
+	  // Prefetch next iteration
+	  if (n_left_from > 1)
+	    {
+	      vlib_buffer_t *p2;
+
+	      p2 = vlib_get_buffer (vm, from[1]);
+	      vlib_prefetch_buffer_header (p2, STORE);
+	      CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, LOAD);
+	    }
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  error0 = ETHERNET_ERROR_NONE;
+	  e0 = vlib_buffer_get_current (b0);
+	  type0 = clib_net_to_host_u16 (e0->type);
+
+	  /* Speed-path for the untagged case */
+	  if (PREDICT_TRUE (variant == ETHERNET_INPUT_VARIANT_ETHERNET
+			    && !ethernet_frame_is_tagged (type0)))
+	    {
+	      main_intf_t *intf0;
+	      subint_config_t *subint0;
+	      u32 sw_if_index0;
+
+	      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	      is_l20 = cached_is_l2;
+
+	      if (PREDICT_FALSE (cached_sw_if_index != sw_if_index0))
+		{
+		  cached_sw_if_index = sw_if_index0;
+		  hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
+		  intf0 = vec_elt_at_index (em->main_intfs, hi0->hw_if_index);
+		  subint0 = &intf0->untagged_subint;
+		  cached_is_l2 = is_l20 = subint0->flags & SUBINT_CONFIG_L2;
+		}
+
+	      vnet_buffer (b0)->ethernet.start_of_ethernet_header =
+		b0->current_data;
+
+	      if (PREDICT_TRUE (is_l20 != 0))
+		{
+		  next0 = em->l2_next;
+		  vnet_buffer (b0)->l2.l2_len = sizeof (ethernet_header_t);
+		}
+	      else
+		{
+		  determine_next_node (em, variant, 0, type0, b0,
+				       &error0, &next0);
+		  vlib_buffer_advance (b0, sizeof (ethernet_header_t));
+		}
+	      goto ship_it0;
+	    }
+
+	  /* Slow-path for the tagged case */
+	  parse_header (variant,
+			b0,
+			&type0,
+			&orig_type0, &outer_id0, &inner_id0, &match_flags0);
+
+	  old_sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+	  eth_vlan_table_lookups (em,
+				  vnm,
+				  old_sw_if_index0,
+				  orig_type0,
+				  outer_id0,
+				  inner_id0,
+				  &hi0,
+				  &main_intf0, &vlan_intf0, &qinq_intf0);
+
+	  identify_subint (hi0,
+			   b0,
+			   match_flags0,
+			   main_intf0,
+			   vlan_intf0,
+			   qinq_intf0, &new_sw_if_index0, &error0, &is_l20);
+
+	  // Save RX sw_if_index for later nodes
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
+	    error0 !=
+	    ETHERNET_ERROR_NONE ? old_sw_if_index0 : new_sw_if_index0;
+
+	  // Increment subinterface stats
+	  // Note that interface-level counters have already been incremented
+	  // prior to calling this function. Thus only subinterface counters
+	  // are incremented here.
+	  //
+	  // Interface level counters include packets received on the main
+	  // interface and all subinterfaces. Subinterface level counters
+	  // include only those packets received on that subinterface
+	  // Increment stats if the subint is valid and it is not the main intf
+	  if ((new_sw_if_index0 != ~0)
+	      && (new_sw_if_index0 != old_sw_if_index0))
+	    {
+
+	      len0 = vlib_buffer_length_in_chain (vm, b0) + b0->current_data
+		- vnet_buffer (b0)->ethernet.start_of_ethernet_header;
+
+	      stats_n_packets += 1;
+	      stats_n_bytes += len0;
+
+	      // Batch stat increments from the same subinterface so counters
+	      // don't need to be incremented for every packet.
+	      if (PREDICT_FALSE (new_sw_if_index0 != stats_sw_if_index))
+		{
+		  stats_n_packets -= 1;
+		  stats_n_bytes -= len0;
+
+		  if (new_sw_if_index0 != ~0)
+		    vlib_increment_combined_counter
+		      (vnm->interface_main.combined_sw_if_counters
+		       + VNET_INTERFACE_COUNTER_RX,
+		       cpu_index, new_sw_if_index0, 1, len0);
+		  if (stats_n_packets > 0)
+		    {
+		      vlib_increment_combined_counter
+			(vnm->interface_main.combined_sw_if_counters
+			 + VNET_INTERFACE_COUNTER_RX,
+			 cpu_index,
+			 stats_sw_if_index, stats_n_packets, stats_n_bytes);
+		      stats_n_packets = stats_n_bytes = 0;
+		    }
+		  stats_sw_if_index = new_sw_if_index0;
+		}
+	    }
+
+	  if (variant == ETHERNET_INPUT_VARIANT_NOT_L2)
+	    is_l20 = 0;
+
+	  determine_next_node (em, variant, is_l20, type0, b0, &error0,
+			       &next0);
+
+	  b0->error = error_node->errors[error0];
+
+	  // verify speculative enqueue
+	ship_it0:
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  // Increment any remaining batched stats
+  if (stats_n_packets > 0)
+    {
+      vlib_increment_combined_counter
+	(vnm->interface_main.combined_sw_if_counters
+	 + VNET_INTERFACE_COUNTER_RX,
+	 cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
+      node->runtime_data[0] = stats_sw_if_index;
+    }
+
+  return from_frame->n_vectors;
+}
+
+static uword
+ethernet_input (vlib_main_t * vm,
+		vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  return ethernet_input_inline (vm, node, from_frame,
+				ETHERNET_INPUT_VARIANT_ETHERNET);
+}
+
+static uword
+ethernet_input_type (vlib_main_t * vm,
+		     vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  return ethernet_input_inline (vm, node, from_frame,
+				ETHERNET_INPUT_VARIANT_ETHERNET_TYPE);
+}
+
+static uword
+ethernet_input_not_l2 (vlib_main_t * vm,
+		       vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  return ethernet_input_inline (vm, node, from_frame,
+				ETHERNET_INPUT_VARIANT_NOT_L2);
+}
+
+
+// Return the subinterface config struct for the given sw_if_index
+// Also return via parameter the appropriate match flags for the
+// configured number of tags.
+// On error (unsupported or not ethernet) return 0.
+static subint_config_t *
+ethernet_sw_interface_get_config (vnet_main_t * vnm,
+				  u32 sw_if_index,
+				  u32 * flags, u32 * unsupported)
+{
+  ethernet_main_t *em = &ethernet_main;
+  vnet_hw_interface_t *hi;
+  vnet_sw_interface_t *si;
+  main_intf_t *main_intf;
+  vlan_table_t *vlan_table;
+  qinq_table_t *qinq_table;
+  subint_config_t *subint = 0;
+
+  hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+
+  if (!hi || (hi->hw_class_index != ethernet_hw_interface_class.index))
+    {
+      *unsupported = 0;
+      goto done;		// non-ethernet interface
+    }
+
+  // ensure there's an entry for the main intf (shouldn't really be necessary)
+  vec_validate (em->main_intfs, hi->hw_if_index);
+  main_intf = vec_elt_at_index (em->main_intfs, hi->hw_if_index);
+
+  // Locate the subint for the given ethernet config
+  si = vnet_get_sw_interface (vnm, sw_if_index);
+
+  if (si->sub.eth.flags.default_sub)
+    {
+      subint = &main_intf->default_subint;
+      *flags = SUBINT_CONFIG_MATCH_0_TAG |
+	SUBINT_CONFIG_MATCH_1_TAG |
+	SUBINT_CONFIG_MATCH_2_TAG | SUBINT_CONFIG_MATCH_3_TAG;
+    }
+  else if ((si->sub.eth.flags.no_tags) || (si->sub.eth.raw_flags == 0))
+    {
+      // if no flags are set then this is a main interface
+      // so treat as untagged
+      subint = &main_intf->untagged_subint;
+      *flags = SUBINT_CONFIG_MATCH_0_TAG;
+    }
+  else
+    {
+      // one or two tags
+      // first get the vlan table
+      if (si->sub.eth.flags.dot1ad)
+	{
+	  if (main_intf->dot1ad_vlans == 0)
+	    {
+	      // Allocate a vlan table from the pool
+	      pool_get (em->vlan_pool, vlan_table);
+	      main_intf->dot1ad_vlans = vlan_table - em->vlan_pool;
+	    }
+	  else
+	    {
+	      // Get ptr to existing vlan table
+	      vlan_table =
+		vec_elt_at_index (em->vlan_pool, main_intf->dot1ad_vlans);
+	    }
+	}
+      else
+	{			// dot1q
+	  if (main_intf->dot1q_vlans == 0)
+	    {
+	      // Allocate a vlan table from the pool
+	      pool_get (em->vlan_pool, vlan_table);
+	      main_intf->dot1q_vlans = vlan_table - em->vlan_pool;
+	    }
+	  else
+	    {
+	      // Get ptr to existing vlan table
+	      vlan_table =
+		vec_elt_at_index (em->vlan_pool, main_intf->dot1q_vlans);
+	    }
+	}
+
+      if (si->sub.eth.flags.one_tag)
+	{
+	  *flags = si->sub.eth.flags.exact_match ?
+	    SUBINT_CONFIG_MATCH_1_TAG :
+	    (SUBINT_CONFIG_MATCH_1_TAG |
+	     SUBINT_CONFIG_MATCH_2_TAG | SUBINT_CONFIG_MATCH_3_TAG);
+
+	  if (si->sub.eth.flags.outer_vlan_id_any)
+	    {
+	      // not implemented yet
+	      *unsupported = 1;
+	      goto done;
+	    }
+	  else
+	    {
+	      // a single vlan, a common case
+	      subint =
+		&vlan_table->vlans[si->sub.eth.
+				   outer_vlan_id].single_tag_subint;
+	    }
+
+	}
+      else
+	{
+	  // Two tags
+	  *flags = si->sub.eth.flags.exact_match ?
+	    SUBINT_CONFIG_MATCH_2_TAG :
+	    (SUBINT_CONFIG_MATCH_2_TAG | SUBINT_CONFIG_MATCH_3_TAG);
+
+	  if (si->sub.eth.flags.outer_vlan_id_any
+	      && si->sub.eth.flags.inner_vlan_id_any)
+	    {
+	      // not implemented yet
+	      *unsupported = 1;
+	      goto done;
+	    }
+
+	  if (si->sub.eth.flags.inner_vlan_id_any)
+	    {
+	      // a specific outer and "any" inner
+	      // don't need a qinq table for this
+	      subint =
+		&vlan_table->vlans[si->sub.eth.
+				   outer_vlan_id].inner_any_subint;
+	      if (si->sub.eth.flags.exact_match)
+		{
+		  *flags = SUBINT_CONFIG_MATCH_2_TAG;
+		}
+	      else
+		{
+		  *flags = SUBINT_CONFIG_MATCH_2_TAG |
+		    SUBINT_CONFIG_MATCH_3_TAG;
+		}
+	    }
+	  else
+	    {
+	      // a specific outer + specifc innner vlan id, a common case
+
+	      // get the qinq table
+	      if (vlan_table->vlans[si->sub.eth.outer_vlan_id].qinqs == 0)
+		{
+		  // Allocate a qinq table from the pool
+		  pool_get (em->qinq_pool, qinq_table);
+		  vlan_table->vlans[si->sub.eth.outer_vlan_id].qinqs =
+		    qinq_table - em->qinq_pool;
+		}
+	      else
+		{
+		  // Get ptr to existing qinq table
+		  qinq_table =
+		    vec_elt_at_index (em->qinq_pool,
+				      vlan_table->vlans[si->sub.
+							eth.outer_vlan_id].
+				      qinqs);
+		}
+	      subint = &qinq_table->vlans[si->sub.eth.inner_vlan_id].subint;
+	    }
+	}
+    }
+
+done:
+  return subint;
+}
+
+clib_error_t *
+ethernet_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
+{
+  subint_config_t *subint;
+  u32 dummy_flags;
+  u32 dummy_unsup;
+  clib_error_t *error = 0;
+
+  // Find the config for this subinterface
+  subint =
+    ethernet_sw_interface_get_config (vnm, sw_if_index, &dummy_flags,
+				      &dummy_unsup);
+
+  if (subint == 0)
+    {
+      // not implemented yet or not ethernet
+      goto done;
+    }
+
+  subint->sw_if_index =
+    ((flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? sw_if_index : ~0);
+
+done:
+  return error;
+}
+
+VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (ethernet_sw_interface_up_down);
+
+
+// Set the L2/L3 mode for the subinterface
+void
+ethernet_sw_interface_set_l2_mode (vnet_main_t * vnm, u32 sw_if_index, u32 l2)
+{
+  subint_config_t *subint;
+  u32 dummy_flags;
+  u32 dummy_unsup;
+  int is_port;
+  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, sw_if_index);
+
+  is_port = !(sw->type == VNET_SW_INTERFACE_TYPE_SUB);
+
+  // Find the config for this subinterface
+  subint =
+    ethernet_sw_interface_get_config (vnm, sw_if_index, &dummy_flags,
+				      &dummy_unsup);
+
+  if (subint == 0)
+    {
+      // unimplemented or not ethernet
+      goto done;
+    }
+
+  // Double check that the config we found is for our interface (or the interface is down)
+  ASSERT ((subint->sw_if_index == sw_if_index) | (subint->sw_if_index == ~0));
+
+  if (l2)
+    {
+      subint->flags |= SUBINT_CONFIG_L2;
+      if (is_port)
+	subint->flags |=
+	  SUBINT_CONFIG_MATCH_0_TAG | SUBINT_CONFIG_MATCH_1_TAG
+	  | SUBINT_CONFIG_MATCH_2_TAG | SUBINT_CONFIG_MATCH_3_TAG;
+    }
+  else
+    {
+      subint->flags &= ~SUBINT_CONFIG_L2;
+      if (is_port)
+	subint->flags &=
+	  ~(SUBINT_CONFIG_MATCH_1_TAG | SUBINT_CONFIG_MATCH_2_TAG
+	    | SUBINT_CONFIG_MATCH_3_TAG);
+    }
+
+done:
+  return;
+}
+
+/*
+ * Set the L2/L3 mode for the subinterface regardless of port
+ */
+void
+ethernet_sw_interface_set_l2_mode_noport (vnet_main_t * vnm,
+					  u32 sw_if_index, u32 l2)
+{
+  subint_config_t *subint;
+  u32 dummy_flags;
+  u32 dummy_unsup;
+
+  /* Find the config for this subinterface */
+  subint =
+    ethernet_sw_interface_get_config (vnm, sw_if_index, &dummy_flags,
+				      &dummy_unsup);
+
+  if (subint == 0)
+    {
+      /* unimplemented or not ethernet */
+      goto done;
+    }
+
+  /*
+   * Double check that the config we found is for our interface (or the
+   * interface is down)
+   */
+  ASSERT ((subint->sw_if_index == sw_if_index) | (subint->sw_if_index == ~0));
+
+  if (l2)
+    {
+      subint->flags |= SUBINT_CONFIG_L2;
+    }
+  else
+    {
+      subint->flags &= ~SUBINT_CONFIG_L2;
+    }
+
+done:
+  return;
+}
+
+static clib_error_t *
+ethernet_sw_interface_add_del (vnet_main_t * vnm,
+			       u32 sw_if_index, u32 is_create)
+{
+  clib_error_t *error = 0;
+  subint_config_t *subint;
+  u32 match_flags;
+  u32 unsupported = 0;
+
+  // Find the config for this subinterface
+  subint =
+    ethernet_sw_interface_get_config (vnm, sw_if_index, &match_flags,
+				      &unsupported);
+
+  if (subint == 0)
+    {
+      // not implemented yet or not ethernet
+      if (unsupported)
+	{
+	  // this is the NYI case
+	  error = clib_error_return (0, "not implemented yet");
+	}
+      goto done;
+    }
+
+  if (!is_create)
+    {
+      subint->flags = 0;
+      return error;
+    }
+
+  // Initialize the subint
+  if (subint->flags & SUBINT_CONFIG_VALID)
+    {
+      // Error vlan already in use
+      error = clib_error_return (0, "vlan is already in use");
+    }
+  else
+    {
+      // Note that config is L3 by defaulty
+      subint->flags = SUBINT_CONFIG_VALID | match_flags;
+      subint->sw_if_index = ~0;	// because interfaces are initially down
+    }
+
+done:
+  return error;
+}
+
+VNET_SW_INTERFACE_ADD_DEL_FUNCTION (ethernet_sw_interface_add_del);
+
+static char *ethernet_error_strings[] = {
+#define ethernet_error(n,c,s) s,
+#include "error.def"
+#undef ethernet_error
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ethernet_input_node) = {
+  .function = ethernet_input,
+  .name = "ethernet-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+  .n_errors = ETHERNET_N_ERROR,
+  .error_strings = ethernet_error_strings,
+  .n_next_nodes = ETHERNET_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [ETHERNET_INPUT_NEXT_##s] = n,
+    foreach_ethernet_input_next
+#undef _
+  },
+  .format_buffer = format_ethernet_header_with_length,
+  .format_trace = format_ethernet_input_trace,
+  .unformat_buffer = unformat_ethernet_header,
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_NODE_FUNCTION_MULTIARCH (ethernet_input_node, ethernet_input)
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ethernet_input_type_node, static) = {
+  .function = ethernet_input_type,
+  .name = "ethernet-input-type",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+  .n_next_nodes = ETHERNET_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [ETHERNET_INPUT_NEXT_##s] = n,
+    foreach_ethernet_input_next
+#undef _
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_NODE_FUNCTION_MULTIARCH (ethernet_input_type_node, ethernet_input_type)
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ethernet_input_not_l2_node, static) = {
+  .function = ethernet_input_not_l2,
+  .name = "ethernet-input-not-l2",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+  .n_next_nodes = ETHERNET_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [ETHERNET_INPUT_NEXT_##s] = n,
+    foreach_ethernet_input_next
+#undef _
+  },
+};
+/* *INDENT-ON* */
+
+
+/* *INDENT-OFF* */
+VLIB_NODE_FUNCTION_MULTIARCH (ethernet_input_not_l2_node,
+			      ethernet_input_not_l2)
+/* *INDENT-ON* */
+
+
+void
+ethernet_set_rx_redirect (vnet_main_t * vnm,
+			  vnet_hw_interface_t * hi, u32 enable)
+{
+  // Insure all packets go to ethernet-input (i.e. untagged ipv4 packets
+  // don't go directly to ip4-input)
+  vnet_hw_interface_rx_redirect_to_node
+    (vnm, hi->hw_if_index, enable ? ethernet_input_node.index : ~0);
+}
+
+
+/*
+ * Initialization and registration for the next_by_ethernet structure
+ */
+
+clib_error_t *
+next_by_ethertype_init (next_by_ethertype_t * l3_next)
+{
+  l3_next->input_next_by_type = sparse_vec_new
+    ( /* elt bytes */ sizeof (l3_next->input_next_by_type[0]),
+     /* bits in index */ BITS (((ethernet_header_t *) 0)->type));
+
+  vec_validate (l3_next->sparse_index_by_input_next_index,
+		ETHERNET_INPUT_NEXT_DROP);
+  vec_validate (l3_next->sparse_index_by_input_next_index,
+		ETHERNET_INPUT_NEXT_PUNT);
+  l3_next->sparse_index_by_input_next_index[ETHERNET_INPUT_NEXT_DROP] =
+    SPARSE_VEC_INVALID_INDEX;
+  l3_next->sparse_index_by_input_next_index[ETHERNET_INPUT_NEXT_PUNT] =
+    SPARSE_VEC_INVALID_INDEX;
+
+  /*
+   * Make sure we don't wipe out an ethernet registration by mistake
+   * Can happen if init function ordering constraints are missing.
+   */
+  if (CLIB_DEBUG > 0)
+    {
+      ethernet_main_t *em = &ethernet_main;
+      ASSERT (em->next_by_ethertype_register_called == 0);
+    }
+
+  return 0;
+}
+
+// Add an ethertype -> next index mapping to the structure
+clib_error_t *
+next_by_ethertype_register (next_by_ethertype_t * l3_next,
+			    u32 ethertype, u32 next_index)
+{
+  u32 i;
+  u16 *n;
+  ethernet_main_t *em = &ethernet_main;
+
+  if (CLIB_DEBUG > 0)
+    {
+      ethernet_main_t *em = &ethernet_main;
+      em->next_by_ethertype_register_called = 1;
+    }
+
+  /* Setup ethernet type -> next index sparse vector mapping. */
+  n = sparse_vec_validate (l3_next->input_next_by_type, ethertype);
+  n[0] = next_index;
+
+  /* Rebuild next index -> sparse index inverse mapping when sparse vector
+     is updated. */
+  vec_validate (l3_next->sparse_index_by_input_next_index, next_index);
+  for (i = 1; i < vec_len (l3_next->input_next_by_type); i++)
+    l3_next->
+      sparse_index_by_input_next_index[l3_next->input_next_by_type[i]] = i;
+
+  // do not allow the cached next index's to be updated if L3
+  // redirect is enabled, as it will have overwritten them
+  if (!em->redirect_l3)
+    {
+      // Cache common ethertypes directly
+      if (ethertype == ETHERNET_TYPE_IP4)
+	{
+	  l3_next->input_next_ip4 = next_index;
+	}
+      else if (ethertype == ETHERNET_TYPE_IP6)
+	{
+	  l3_next->input_next_ip6 = next_index;
+	}
+      else if (ethertype == ETHERNET_TYPE_MPLS_UNICAST)
+	{
+	  l3_next->input_next_mpls = next_index;
+	}
+    }
+  return 0;
+}
+
+
+static clib_error_t *
+ethernet_input_init (vlib_main_t * vm)
+{
+  ethernet_main_t *em = &ethernet_main;
+  __attribute__ ((unused)) vlan_table_t *invalid_vlan_table;
+  __attribute__ ((unused)) qinq_table_t *invalid_qinq_table;
+
+  ethernet_setup_node (vm, ethernet_input_node.index);
+  ethernet_setup_node (vm, ethernet_input_type_node.index);
+  ethernet_setup_node (vm, ethernet_input_not_l2_node.index);
+
+  next_by_ethertype_init (&em->l3_next);
+
+  // Initialize pools and vector for vlan parsing
+  vec_validate (em->main_intfs, 10);	// 10 main interfaces
+  pool_alloc (em->vlan_pool, 10);
+  pool_alloc (em->qinq_pool, 1);
+
+  // The first vlan pool will always be reserved for an invalid table
+  pool_get (em->vlan_pool, invalid_vlan_table);	// first id = 0
+  // The first qinq pool will always be reserved for an invalid table
+  pool_get (em->qinq_pool, invalid_qinq_table);	// first id = 0
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ethernet_input_init);
+
+void
+ethernet_register_input_type (vlib_main_t * vm,
+			      ethernet_type_t type, u32 node_index)
+{
+  ethernet_main_t *em = &ethernet_main;
+  ethernet_type_info_t *ti;
+  u32 i;
+
+  {
+    clib_error_t *error = vlib_call_init_function (vm, ethernet_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  ti = ethernet_get_type_info (em, type);
+  ti->node_index = node_index;
+  ti->next_index = vlib_node_add_next (vm,
+				       ethernet_input_node.index, node_index);
+  i = vlib_node_add_next (vm, ethernet_input_type_node.index, node_index);
+  ASSERT (i == ti->next_index);
+
+  i = vlib_node_add_next (vm, ethernet_input_not_l2_node.index, node_index);
+  ASSERT (i == ti->next_index);
+
+  // Add the L3 node for this ethertype to the next nodes structure
+  next_by_ethertype_register (&em->l3_next, type, ti->next_index);
+
+  // Call the registration functions for other nodes that want a mapping
+  l2bvi_register_input_type (vm, type, node_index);
+}
+
+void
+ethernet_register_l2_input (vlib_main_t * vm, u32 node_index)
+{
+  ethernet_main_t *em = &ethernet_main;
+  u32 i;
+
+  em->l2_next =
+    vlib_node_add_next (vm, ethernet_input_node.index, node_index);
+
+  /*
+   * Even if we never use these arcs, we have to align the next indices...
+   */
+  i = vlib_node_add_next (vm, ethernet_input_type_node.index, node_index);
+
+  ASSERT (i == em->l2_next);
+
+  i = vlib_node_add_next (vm, ethernet_input_not_l2_node.index, node_index);
+  ASSERT (i == em->l2_next);
+}
+
+// Register a next node for L3 redirect, and enable L3 redirect
+void
+ethernet_register_l3_redirect (vlib_main_t * vm, u32 node_index)
+{
+  ethernet_main_t *em = &ethernet_main;
+  u32 i;
+
+  em->redirect_l3 = 1;
+  em->redirect_l3_next = vlib_node_add_next (vm,
+					     ethernet_input_node.index,
+					     node_index);
+  /*
+   * Change the cached next nodes to the redirect node
+   */
+  em->l3_next.input_next_ip4 = em->redirect_l3_next;
+  em->l3_next.input_next_ip6 = em->redirect_l3_next;
+  em->l3_next.input_next_mpls = em->redirect_l3_next;
+
+  /*
+   * Even if we never use these arcs, we have to align the next indices...
+   */
+  i = vlib_node_add_next (vm, ethernet_input_type_node.index, node_index);
+
+  ASSERT (i == em->redirect_l3_next);
+
+  i = vlib_node_add_next (vm, ethernet_input_not_l2_node.index, node_index);
+
+  ASSERT (i == em->redirect_l3_next);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ethernet/packet.h b/src/vnet/ethernet/packet.h
new file mode 100644
index 00000000..964cf638
--- /dev/null
+++ b/src/vnet/ethernet/packet.h
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ethernet/packet.h: ethernet packet format.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_ethernet_packet_h
+#define included_ethernet_packet_h
+
+typedef enum
+{
+#define ethernet_type(n,s) ETHERNET_TYPE_##s = n,
+#include <vnet/ethernet/types.def>
+#undef ethernet_type
+} ethernet_type_t;
+
+typedef struct
+{
+  /* Source/destination address. */
+  u8 dst_address[6];
+  u8 src_address[6];
+
+  /* Ethernet type. */
+  u16 type;
+} ethernet_header_t;
+
+#define ETHERNET_ADDRESS_UNICAST 0
+#define ETHERNET_ADDRESS_MULTICAST 1
+
+/* I/G bit: individual (unicast)/group (broadcast/multicast). */
+always_inline uword
+ethernet_address_cast (u8 * a)
+{
+  return (a[0] >> 0) & 1;
+}
+
+always_inline uword
+ethernet_address_is_locally_administered (u8 * a)
+{
+  return (a[0] >> 1) & 1;
+}
+
+always_inline void
+ethernet_address_set_locally_administered (u8 * a)
+{
+  a[0] |= 1 << 1;
+}
+
+/* For VLAN ethernet type. */
+typedef struct
+{
+  /* 3 bit priority, 1 bit CFI and 12 bit vlan id. */
+  u16 priority_cfi_and_id;
+
+#define ETHERNET_N_VLAN (1 << 12)
+
+  /* Inner ethernet type. */
+  u16 type;
+} ethernet_vlan_header_t;
+
+
+/* VLAN with ethertype first and vlan id second */
+typedef struct
+{
+  /* vlan type */
+  u16 type;
+
+  /* 3 bit priority, 1 bit CFI and 12 bit vlan id. */
+  u16 priority_cfi_and_id;
+} ethernet_vlan_header_tv_t;
+
+/* PBB header with B-TAG - backbone VLAN indicator and I-TAG - service encapsulation */
+typedef struct
+{
+  /* Backbone source/destination address. */
+  u8 b_dst_address[6];
+  u8 b_src_address[6];
+
+  /* B-tag */
+  u16 b_type;
+  /* 3 bit priority, 1 bit DEI and 12 bit vlan id */
+  u16 priority_dei_id;
+
+  /* I-tag */
+  u16 i_type;
+  /* 3 bit priority, 1 bit DEI, 1 bit UCA, 3 bit RES and 24 bit I_SID (service identifier) */
+  u32 priority_dei_uca_res_sid;
+
+#define ETHERNET_N_PBB (1 << 24)
+} ethernet_pbb_header_t;
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+{
+  /* Backbone source/destination address. */
+  u8 b_dst_address[6];
+  u8 b_src_address[6];
+
+  /* B-tag */
+  u16 b_type;
+  /* 3 bit priority, 1 bit DEI and 12 bit vlan id */
+  u16 priority_dei_id;
+
+  /* I-tag */
+  u16 i_type;
+  /* 3 bit priority, 1 bit DEI, 1 bit UCA, 3 bit RES and 24 bit I_SID (service identifier) */
+  u32 priority_dei_uca_res_sid;
+}) ethernet_pbb_header_packed_t;
+/* *INDENT-ON* */
+
+#endif /* included_ethernet_packet_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ethernet/pg.c b/src/vnet/ethernet/pg.c
new file mode 100644
index 00000000..67ccfcf5
--- /dev/null
+++ b/src/vnet/ethernet/pg.c
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ethernet_pg.c: packet generator ethernet interface
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+
+typedef struct
+{
+  pg_edit_t type;
+  pg_edit_t src_address;
+  pg_edit_t dst_address;
+} pg_ethernet_header_t;
+
+static inline void
+pg_ethernet_header_init (pg_ethernet_header_t * e)
+{
+  pg_edit_init (&e->type, ethernet_header_t, type);
+  pg_edit_init (&e->src_address, ethernet_header_t, src_address);
+  pg_edit_init (&e->dst_address, ethernet_header_t, dst_address);
+}
+
+typedef struct
+{
+  pg_edit_t type;
+  pg_edit_t id;
+  pg_edit_t cfi;
+  pg_edit_t priority;
+} pg_ethernet_vlan_header_t;
+
+static inline void
+pg_ethernet_vlan_header_init (pg_ethernet_vlan_header_t * v, int vlan_index)
+{
+  ASSERT (vlan_index < ARRAY_LEN (((ethernet_max_header_t *) 0)->vlan));
+  pg_edit_init (&v->type, ethernet_max_header_t, vlan[vlan_index].type);
+
+  pg_edit_init_bitfield (&v->id, ethernet_max_header_t,
+			 vlan[vlan_index].priority_cfi_and_id, 0, 12);
+  pg_edit_init_bitfield (&v->cfi, ethernet_max_header_t,
+			 vlan[vlan_index].priority_cfi_and_id, 12, 1);
+  pg_edit_init_bitfield (&v->priority, ethernet_max_header_t,
+			 vlan[vlan_index].priority_cfi_and_id, 13, 3);
+}
+
+uword
+unformat_pg_ethernet_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  pg_ethernet_header_t *e;
+  pg_ethernet_vlan_header_t *v;
+  pg_edit_t *ether_type_edit;
+  u32 n_vlan, error, group_index;
+
+  e = pg_create_edit_group (s, sizeof (e[0]), sizeof (ethernet_header_t),
+			    &group_index);
+  pg_ethernet_header_init (e);
+  error = 1;
+
+  if (!unformat (input, "%U: %U -> %U",
+		 unformat_pg_edit,
+		 unformat_ethernet_type_net_byte_order, &e->type,
+		 unformat_pg_edit,
+		 unformat_ethernet_address, &e->src_address,
+		 unformat_pg_edit,
+		 unformat_ethernet_address, &e->dst_address))
+    goto done;
+
+  n_vlan = 0;
+  while (unformat (input, "vlan"))
+    {
+      v = pg_add_edits (s, sizeof (v[0]), sizeof (ethernet_vlan_header_t),
+			group_index);
+      pg_ethernet_vlan_header_init (v, n_vlan);
+
+      if (!unformat_user (input, unformat_pg_edit,
+			  unformat_pg_number, &v->id))
+	goto done;
+
+      if (!unformat (input, "priority %U", unformat_pg_edit,
+		     unformat_pg_number, &v->priority))
+	pg_edit_set_fixed (&v->priority, 0);
+
+      if (!unformat (input, "cfi %U", unformat_pg_edit,
+		     unformat_pg_number, &v->cfi))
+	pg_edit_set_fixed (&v->cfi, 0);
+
+      /* Too many vlans given. */
+      if (n_vlan >= 2)
+	goto done;
+
+      n_vlan++;
+    }
+
+  /* Address of e may have changed due to vlan edits being added */
+  e = pg_get_edit_group (s, group_index);
+  v = (void *) (e + 1);
+
+  /* Correct types for vlan packets. */
+  ether_type_edit = &e->type;
+  if (n_vlan > 0)
+    {
+      int i;
+
+      ether_type_edit = &v[n_vlan - 1].type;
+      pg_edit_copy_type_and_values (ether_type_edit, &e->type);
+      pg_edit_set_fixed (&e->type, ETHERNET_TYPE_VLAN);
+
+      for (i = 0; i < n_vlan - 1; i++)
+	pg_edit_set_fixed (&v[i].type, ETHERNET_TYPE_VLAN);
+    }
+
+  {
+    ethernet_main_t *em = &ethernet_main;
+    ethernet_type_info_t *ti = 0;
+    pg_node_t *pg_node = 0;
+
+    if (ether_type_edit->type == PG_EDIT_FIXED)
+      {
+	u16 t = *(u16 *) ether_type_edit->values[PG_EDIT_LO];
+	ti = ethernet_get_type_info (em, clib_net_to_host_u16 (t));
+	if (ti && ti->node_index != ~0)
+	  pg_node = pg_get_node (ti->node_index);
+      }
+
+    if (pg_node && pg_node->unformat_edit
+	&& unformat_user (input, pg_node->unformat_edit, s))
+      ;
+    else if (!unformat_user (input, unformat_pg_payload, s))
+      goto done;
+  }
+
+  error = 0;
+
+done:
+  if (error)
+    pg_free_edit_group (s);
+  return error == 0;
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ethernet/types.def b/src/vnet/ethernet/types.def
new file mode 100644
index 00000000..643f3152
--- /dev/null
+++ b/src/vnet/ethernet/types.def
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Emacs editing mode -*-C-*- Ethernet types. */
+
+/*
+ * ethernet types
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Types < 0x600 (1536) are LLC packet lengths. */
+ethernet_type (0x600, LLC_LENGTH)
+
+ethernet_type (0x600, XNS_IDP)
+ethernet_type (0x800, IP4)
+ethernet_type (0x806, ARP)
+ethernet_type (0x0BAD, VINES_IP)
+ethernet_type (0x0BAE, VINES_LOOPBACK)
+ethernet_type (0x0BAF, VINES_ECHO)
+ethernet_type (0x1984, TRAIN)
+ethernet_type (0x2000, CDP)
+ethernet_type (0x2001, CGMP)
+ethernet_type (0x2007, SRP_CONTROL)
+ethernet_type (0x2452, CENTRINO_PROMISC)
+ethernet_type (0x6000, DECNET)
+ethernet_type (0x6001, DECNET_DUMP_LOAD)
+ethernet_type (0x6002, DECNET_REMOTE_CONSOLE)
+ethernet_type (0x6003, DECNET_ROUTE)
+ethernet_type (0x6004, DEC_LAT)
+ethernet_type (0x6005, DEC_DIAGNOSTIC)
+ethernet_type (0x6006, DEC_CUSTOMER)
+ethernet_type (0x6007, DEC_SCA)
+ethernet_type (0x6558, TRANSPARENT_BRIDGING)
+ethernet_type (0x6559, RAW_FRAME_RELAY)
+ethernet_type (0x8035, REVERSE_ARP)
+ethernet_type (0x8038, DEC_LAN_BRIDGE)
+ethernet_type (0x803D, DEC_ETHERNET_ENCRYPTION)
+ethernet_type (0x803F, DEC_LAN_TRAFFIC_MONITOR)
+ethernet_type (0x8041, DEC_LAST)
+ethernet_type (0x809B, APPLETALK)
+ethernet_type (0x80D5, IBM_SNA)
+ethernet_type (0x80F3, APPLETALK_AARP)
+ethernet_type (0x80FF, WELLFLEET_COMPRESSION)
+ethernet_type (0x8100, VLAN)
+ethernet_type (0x8137, IPX)
+ethernet_type (0x814C, SNMP)
+ethernet_type (0x81FD, CABLETRON_ISMP)
+ethernet_type (0x81FF, CABLETRON_ISMP_TBFLOOD)
+ethernet_type (0x86DD, IP6)
+ethernet_type (0x86DF, ATOMIC)
+ethernet_type (0x876B, TCP_IP_COMPRESSION)
+ethernet_type (0x876C, IP_AUTONOMOUS_SYSTEMS)
+ethernet_type (0x876D, SECURE_DATA)
+ethernet_type (0x8808, MAC_CONTROL)
+ethernet_type (0x8809, SLOW_PROTOCOLS)
+ethernet_type (0x880B, PPP)
+ethernet_type (0x8847, MPLS_UNICAST)
+ethernet_type (0x8848, MPLS_MULTICAST)
+ethernet_type (0x8863, PPPOE_DISCOVERY)
+ethernet_type (0x8864, PPPOE_SESSION)
+ethernet_type (0x886D, INTEL_ANS)
+ethernet_type (0x886F, MICROSOFT_NLB_HEARTBEAT)
+ethernet_type (0x8881, CDMA_2000)
+ethernet_type (0x888e, 802_1X_AUTHENTICATION)
+ethernet_type (0x8892, PROFINET)
+ethernet_type (0x889a, HYPERSCSI)
+ethernet_type (0x88a2, AOE)
+ethernet_type (0x88a8, DOT1AD)
+ethernet_type (0x88AE, BRDWALK)
+ethernet_type (0x88B7, 802_OUI_EXTENDED)
+ethernet_type (0x88c7, 802_11I_PRE_AUTHENTICATION)
+ethernet_type (0x88cc, 802_1_LLDP)
+ethernet_type (0x88e7, DOT1AH)
+ethernet_type (0x894f, VPATH_3)
+ethernet_type (0x9000, LOOPBACK)
+ethernet_type (0x9021, RTNET_MAC)
+ethernet_type (0x9022, RTNET_CONFIG)
+ethernet_type (0x9100, VLAN_9100)
+ethernet_type (0x9200, VLAN_9200)
+ethernet_type (0x9999, PGLAN)
+ethernet_type (0xFEFE, SRP_ISIS)
+ethernet_type (0xFFFF, RESERVED)
diff --git a/src/vnet/feature/feature.c b/src/vnet/feature/feature.c
new file mode 100644
index 00000000..032fe784
--- /dev/null
+++ b/src/vnet/feature/feature.c
@@ -0,0 +1,463 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/feature/feature.h>
+
+vnet_feature_main_t feature_main;
+
+static clib_error_t *
+vnet_feature_init (vlib_main_t * vm)
+{
+  vnet_feature_main_t *fm = &feature_main;
+  vnet_feature_registration_t *freg;
+  vnet_feature_arc_registration_t *areg;
+  u32 arc_index = 0;
+
+  fm->arc_index_by_name = hash_create_string (0, sizeof (uword));
+  areg = fm->next_arc;
+
+  /* process feature arc registrations */
+  while (areg)
+    {
+      char *s;
+      int i = 0;
+      areg->feature_arc_index = arc_index;
+      if (areg->arc_index_ptr)
+	*areg->arc_index_ptr = arc_index;
+      hash_set_mem (fm->arc_index_by_name, areg->arc_name,
+		    pointer_to_uword (areg));
+
+      /* process start nodes */
+      while ((s = areg->start_nodes[i]))
+	{
+	  i++;
+	}
+      areg->n_start_nodes = i;
+
+      /* next */
+      areg = areg->next;
+      arc_index++;
+    }
+
+  vec_validate (fm->next_feature_by_arc, arc_index - 1);
+  vec_validate (fm->feature_nodes, arc_index - 1);
+  vec_validate (fm->feature_config_mains, arc_index - 1);
+  vec_validate (fm->next_feature_by_name, arc_index - 1);
+  vec_validate (fm->sw_if_index_has_features, arc_index - 1);
+  vec_validate (fm->feature_count_by_sw_if_index, arc_index - 1);
+
+  freg = fm->next_feature;
+  while (freg)
+    {
+      vnet_feature_registration_t *next;
+      uword *p = hash_get_mem (fm->arc_index_by_name, freg->arc_name);
+      if (p == 0)
+	return clib_error_return (0, "Unknown feature arc '%s'",
+				  freg->arc_name);
+
+      areg = uword_to_pointer (p[0], vnet_feature_arc_registration_t *);
+      arc_index = areg->feature_arc_index;
+
+      next = freg->next;
+      freg->next = fm->next_feature_by_arc[arc_index];
+      fm->next_feature_by_arc[arc_index] = freg;
+
+      /* next */
+      freg = next;
+    }
+
+  areg = fm->next_arc;
+  while (areg)
+    {
+      clib_error_t *error;
+      vnet_feature_config_main_t *cm;
+      vnet_config_main_t *vcm;
+
+      arc_index = areg->feature_arc_index;
+      cm = &fm->feature_config_mains[arc_index];
+      vcm = &cm->config_main;
+      if ((error = vnet_feature_arc_init (vm, vcm,
+					  areg->start_nodes,
+					  areg->n_start_nodes,
+					  fm->next_feature_by_arc[arc_index],
+					  &fm->feature_nodes[arc_index])))
+	{
+	  return error;
+	}
+
+      fm->next_feature_by_name[arc_index] =
+	hash_create_string (0, sizeof (uword));
+      freg = fm->next_feature_by_arc[arc_index];
+
+      while (freg)
+	{
+	  hash_set_mem (fm->next_feature_by_name[arc_index],
+			freg->node_name, pointer_to_uword (freg));
+	  freg = freg->next;
+	}
+
+      cm->end_feature_index =
+	vnet_get_feature_index (arc_index, areg->end_node);
+
+      /* next */
+      areg = areg->next;
+      arc_index++;
+    }
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (vnet_feature_init);
+
+u8
+vnet_get_feature_arc_index (const char *s)
+{
+  vnet_feature_main_t *fm = &feature_main;
+  vnet_feature_arc_registration_t *reg;
+  uword *p;
+
+  p = hash_get_mem (fm->arc_index_by_name, s);
+  if (p == 0)
+    return ~0;
+
+  reg = uword_to_pointer (p[0], vnet_feature_arc_registration_t *);
+  return reg->feature_arc_index;
+}
+
+vnet_feature_registration_t *
+vnet_get_feature_reg (const char *arc_name, const char *node_name)
+{
+  u8 arc_index;
+
+  arc_index = vnet_get_feature_arc_index (arc_name);
+  if (arc_index == (u8) ~ 0)
+    return 0;
+
+  vnet_feature_main_t *fm = &feature_main;
+  vnet_feature_registration_t *reg;
+  uword *p;
+
+  p = hash_get_mem (fm->next_feature_by_name[arc_index], node_name);
+  if (p == 0)
+    return 0;
+
+  reg = uword_to_pointer (p[0], vnet_feature_registration_t *);
+  return reg;
+}
+
+u32
+vnet_get_feature_index (u8 arc, const char *s)
+{
+  vnet_feature_main_t *fm = &feature_main;
+  vnet_feature_registration_t *reg;
+  uword *p;
+
+  if (s == 0)
+    return ~0;
+
+  p = hash_get_mem (fm->next_feature_by_name[arc], s);
+  if (p == 0)
+    return ~0;
+
+  reg = uword_to_pointer (p[0], vnet_feature_registration_t *);
+  return reg->feature_index;
+}
+
+int
+vnet_feature_enable_disable_with_index (u8 arc_index, u32 feature_index,
+					u32 sw_if_index, int enable_disable,
+					void *feature_config,
+					u32 n_feature_config_bytes)
+{
+  vnet_feature_main_t *fm = &feature_main;
+  vnet_feature_config_main_t *cm;
+  i16 feature_count;
+  int is_first_or_last;
+  u32 ci;
+
+  if (arc_index == (u8) ~ 0)
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  if (feature_index == ~0)
+    return VNET_API_ERROR_INVALID_VALUE_2;
+
+  cm = &fm->feature_config_mains[arc_index];
+  vec_validate_init_empty (cm->config_index_by_sw_if_index, sw_if_index, ~0);
+  ci = cm->config_index_by_sw_if_index[sw_if_index];
+
+  vec_validate (fm->feature_count_by_sw_if_index[arc_index], sw_if_index);
+  feature_count = fm->feature_count_by_sw_if_index[arc_index][sw_if_index];
+
+  if (!enable_disable && feature_count < 1)
+    return 0;
+
+  ci = (enable_disable
+	? vnet_config_add_feature
+	: vnet_config_del_feature)
+    (vlib_get_main (), &cm->config_main, ci, feature_index, feature_config,
+     n_feature_config_bytes);
+  cm->config_index_by_sw_if_index[sw_if_index] = ci;
+
+  /* update feature count */
+  enable_disable = (enable_disable > 0);
+  feature_count += enable_disable ? 1 : -1;
+  is_first_or_last = (feature_count == enable_disable);
+  ASSERT (feature_count >= 0);
+
+  if (is_first_or_last && cm->end_feature_index != ~0)
+    {
+      /*register end node */
+      ci = (enable_disable
+	    ? vnet_config_add_feature
+	    : vnet_config_del_feature)
+	(vlib_get_main (), &cm->config_main, ci, cm->end_feature_index, 0, 0);
+      cm->config_index_by_sw_if_index[sw_if_index] = ci;
+    }
+
+  fm->sw_if_index_has_features[arc_index] =
+    clib_bitmap_set (fm->sw_if_index_has_features[arc_index], sw_if_index,
+		     (feature_count > 0));
+
+  fm->feature_count_by_sw_if_index[arc_index][sw_if_index] = feature_count;
+  return 0;
+}
+
+int
+vnet_feature_enable_disable (const char *arc_name, const char *node_name,
+			     u32 sw_if_index, int enable_disable,
+			     void *feature_config, u32 n_feature_config_bytes)
+{
+  u32 feature_index;
+  u8 arc_index;
+
+  arc_index = vnet_get_feature_arc_index (arc_name);
+
+  if (arc_index == (u8) ~ 0)
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  feature_index = vnet_get_feature_index (arc_index, node_name);
+
+  return vnet_feature_enable_disable_with_index (arc_index, feature_index,
+						 sw_if_index, enable_disable,
+						 feature_config,
+						 n_feature_config_bytes);
+}
+
+
+/** Display the set of available driver features.
+    Useful for verifying that expected features are present
+*/
+
+static clib_error_t *
+show_features_command_fn (vlib_main_t * vm,
+			  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_feature_main_t *fm = &feature_main;
+  vnet_feature_arc_registration_t *areg;
+  vnet_feature_registration_t *freg;
+
+  vlib_cli_output (vm, "Available feature paths");
+
+  areg = fm->next_arc;
+  while (areg)
+    {
+      vlib_cli_output (vm, "%s:", areg->arc_name);
+      freg = fm->next_feature_by_arc[areg->feature_arc_index];
+      while (freg)
+	{
+	  vlib_cli_output (vm, "  %s\n", freg->node_name);
+	  freg = freg->next;
+	}
+
+
+      /* next */
+      areg = areg->next;
+    }
+
+  return 0;
+}
+
+/*?
+ * Display the set of available driver features
+ *
+ * @cliexpar
+ * Example:
+ * @cliexcmd{show ip features}
+ * @cliexend
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_features_command, static) = {
+  .path = "show features",
+  .short_help = "show features",
+  .function = show_features_command_fn,
+};
+/* *INDENT-ON* */
+
+/** Display the set of driver features configured on a specific interface
+  * Called by "show interface" handler
+ */
+
+void
+vnet_interface_features_show (vlib_main_t * vm, u32 sw_if_index)
+{
+  vnet_feature_main_t *fm = &feature_main;
+  u32 node_index, current_config_index;
+  u16 feature_arc;
+  vnet_feature_config_main_t *cm = fm->feature_config_mains;
+  vnet_feature_arc_registration_t *areg;
+  vnet_config_main_t *vcm;
+  vnet_config_t *cfg;
+  u32 cfg_index;
+  vnet_config_feature_t *feat;
+  vlib_node_t *n;
+  int i;
+
+  vlib_cli_output (vm, "Driver feature paths configured on %U...",
+		   format_vnet_sw_if_index_name,
+		   vnet_get_main (), sw_if_index);
+
+  areg = fm->next_arc;
+  while (areg)
+    {
+      feature_arc = areg->feature_arc_index;
+      vcm = &(cm[feature_arc].config_main);
+
+      vlib_cli_output (vm, "\n%s:", areg->arc_name);
+      areg = areg->next;
+
+      if (NULL == cm[feature_arc].config_index_by_sw_if_index ||
+	  vec_len (cm[feature_arc].config_index_by_sw_if_index) <=
+	  sw_if_index)
+	{
+	  vlib_cli_output (vm, "  none configured");
+	  continue;
+	}
+
+      current_config_index =
+	vec_elt (cm[feature_arc].config_index_by_sw_if_index, sw_if_index);
+
+      if (current_config_index == ~0)
+	{
+	  vlib_cli_output (vm, "  none configured");
+	  continue;
+	}
+
+      ASSERT (current_config_index
+	      < vec_len (vcm->config_pool_index_by_user_index));
+
+      cfg_index = vcm->config_pool_index_by_user_index[current_config_index];
+      cfg = pool_elt_at_index (vcm->config_pool, cfg_index);
+
+      for (i = 0; i < vec_len (cfg->features); i++)
+	{
+	  feat = cfg->features + i;
+	  node_index = feat->node_index;
+	  n = vlib_get_node (vm, node_index);
+	  vlib_cli_output (vm, "  %v", n->name);
+	}
+    }
+}
+
+static clib_error_t *
+set_interface_features_command_fn (vlib_main_t * vm,
+				   unformat_input_t * input,
+				   vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  unformat_input_t _line_input, *line_input = &_line_input;
+  clib_error_t *error = 0;
+
+  u8 *arc_name = 0;
+  u8 *feature_name = 0;
+  u32 sw_if_index = ~0;
+  u8 enable = 1;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    goto done;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (line_input, "%U %v", unformat_vnet_sw_interface, vnm, &sw_if_index,
+	   &feature_name))
+	;
+      else if (unformat (line_input, "arc %v", &arc_name))
+	;
+      else if (unformat (line_input, "disable"))
+	enable = 0;
+      else
+	{
+	  error = unformat_parse_error (line_input);
+	  goto done;
+	}
+    }
+
+  if (sw_if_index == ~0)
+    {
+      error = clib_error_return (0, "Interface not specified...");
+      goto done;
+    }
+
+  vec_add1 (arc_name, 0);
+  vec_add1 (feature_name, 0);
+
+  vnet_feature_registration_t *reg;
+  reg =
+    vnet_get_feature_reg ((const char *) arc_name,
+			  (const char *) feature_name);
+  if (reg == 0)
+    {
+      error = clib_error_return (0, "Unknown feature...");
+      goto done;
+    }
+  if (reg->enable_disable_cb)
+    error = reg->enable_disable_cb (sw_if_index, enable);
+  if (!error)
+    vnet_feature_enable_disable ((const char *) arc_name,
+				 (const char *) feature_name, sw_if_index,
+				 enable, 0, 0);
+
+done:
+  vec_free (feature_name);
+  vec_free (arc_name);
+  return error;
+}
+
+/*?
+ * Set feature for given interface
+ *
+ * @cliexpar
+ * Example:
+ * @cliexcmd{set interface feature GigabitEthernet2/0/0 ip4_flow_classify arc ip4_unicast}
+ * @cliexend
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_feature_command, static) = {
+  .path = "set interface feature",
+  .short_help = "set interface feature <intfc> <feature_name> arc <arc_name>",
+  .function = set_interface_features_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/feature/feature.h b/src/vnet/feature/feature.h
new file mode 100644
index 00000000..b27aaf17
--- /dev/null
+++ b/src/vnet/feature/feature.h
@@ -0,0 +1,382 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_features_h
+#define included_features_h
+
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+
+/** feature registration object */
+typedef struct _vnet_feature_arc_registration
+{
+  /** next registration in list of all registrations*/
+  struct _vnet_feature_arc_registration *next;
+  /** Feature Arc name */
+  char *arc_name;
+  /** Start nodes */
+  char **start_nodes;
+  int n_start_nodes;
+  /** End node */
+  char *end_node;
+  /* Feature arc index, assigned by init function */
+  u8 feature_arc_index;
+  u8 *arc_index_ptr;
+} vnet_feature_arc_registration_t;
+
+/* Enable feature callback. */
+typedef clib_error_t *(vnet_feature_enable_disable_function_t)
+  (u32 sw_if_index, int enable_disable);
+
+/** feature registration object */
+typedef struct _vnet_feature_registration
+{
+  /** next registration in list of all registrations*/
+  struct _vnet_feature_registration *next;
+  /** Feature arc name */
+  char *arc_name;
+  /** Graph node name */
+  char *node_name;
+  /** Pointer to this feature index, filled in by vnet_feature_arc_init */
+  u32 *feature_index_ptr;
+  u32 feature_index;
+  /** Constraints of the form "this feature runs before X" */
+  char **runs_before;
+  /** Constraints of the form "this feature runs after Y" */
+  char **runs_after;
+
+  /** Function to enable/disable feature  **/
+  vnet_feature_enable_disable_function_t *enable_disable_cb;
+} vnet_feature_registration_t;
+
+typedef struct vnet_feature_config_main_t_
+{
+  vnet_config_main_t config_main;
+  u32 *config_index_by_sw_if_index;
+  u32 end_feature_index;
+} vnet_feature_config_main_t;
+
+typedef struct
+{
+  /** feature arc configuration list */
+  vnet_feature_arc_registration_t *next_arc;
+  uword **arc_index_by_name;
+
+  /** feature path configuration lists */
+  vnet_feature_registration_t *next_feature;
+  vnet_feature_registration_t **next_feature_by_arc;
+  uword **next_feature_by_name;
+
+  /** feature config main objects */
+  vnet_feature_config_main_t *feature_config_mains;
+
+  /** Save partial order results for show command */
+  char ***feature_nodes;
+
+  /** bitmap of interfaces which have driver rx features configured */
+  uword **sw_if_index_has_features;
+
+  /** feature reference counts by interface */
+  i16 **feature_count_by_sw_if_index;
+
+  /** Feature arc index for device-input */
+  u8 device_input_feature_arc_index;
+
+  /** convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} vnet_feature_main_t;
+
+extern vnet_feature_main_t feature_main;
+
+#define VNET_FEATURE_ARC_INIT(x,...)				\
+  __VA_ARGS__ vnet_feature_arc_registration_t vnet_feat_arc_##x;\
+static void __vnet_add_feature_arc_registration_##x (void)	\
+  __attribute__((__constructor__)) ;				\
+static void __vnet_add_feature_arc_registration_##x (void)	\
+{								\
+  vnet_feature_main_t * fm = &feature_main;			\
+  vnet_feat_arc_##x.next = fm->next_arc;			\
+  fm->next_arc = & vnet_feat_arc_##x;				\
+}								\
+__VA_ARGS__ vnet_feature_arc_registration_t vnet_feat_arc_##x
+
+#define VNET_FEATURE_INIT(x,...)				\
+  __VA_ARGS__ vnet_feature_registration_t vnet_feat_##x;	\
+static void __vnet_add_feature_registration_##x (void)		\
+  __attribute__((__constructor__)) ;				\
+static void __vnet_add_feature_registration_##x (void)		\
+{								\
+  vnet_feature_main_t * fm = &feature_main;			\
+  vnet_feat_##x.next = fm->next_feature;			\
+  fm->next_feature = & vnet_feat_##x;				\
+}								\
+__VA_ARGS__ vnet_feature_registration_t vnet_feat_##x
+
+void
+vnet_config_update_feature_count (vnet_feature_main_t * fm, u8 arc,
+				  u32 sw_if_index, int is_add);
+
+u32 vnet_get_feature_index (u8 arc, const char *s);
+u8 vnet_get_feature_arc_index (const char *s);
+vnet_feature_registration_t *vnet_get_feature_reg (const char *arc_name,
+						   const char *node_name);
+
+
+int
+vnet_feature_enable_disable_with_index (u8 arc_index, u32 feature_index,
+					u32 sw_if_index, int enable_disable,
+					void *feature_config,
+					u32 n_feature_config_bytes);
+
+int
+vnet_feature_enable_disable (const char *arc_name, const char *node_name,
+			     u32 sw_if_index, int enable_disable,
+			     void *feature_config,
+			     u32 n_feature_config_bytes);
+
+static inline vnet_feature_config_main_t *
+vnet_get_feature_arc_config_main (u8 arc_index)
+{
+  vnet_feature_main_t *fm = &feature_main;
+
+  if (arc_index == (u8) ~ 0)
+    return 0;
+
+  return &fm->feature_config_mains[arc_index];
+}
+
+static_always_inline vnet_feature_config_main_t *
+vnet_feature_get_config_main (u16 arc)
+{
+  vnet_feature_main_t *fm = &feature_main;
+  return &fm->feature_config_mains[arc];
+}
+
+static_always_inline int
+vnet_have_features (u8 arc, u32 sw_if_index)
+{
+  vnet_feature_main_t *fm = &feature_main;
+  return clib_bitmap_get (fm->sw_if_index_has_features[arc], sw_if_index);
+}
+
+static_always_inline u32
+vnet_get_feature_config_index (u8 arc, u32 sw_if_index)
+{
+  vnet_feature_main_t *fm = &feature_main;
+  vnet_feature_config_main_t *cm = &fm->feature_config_mains[arc];
+  return vec_elt (cm->config_index_by_sw_if_index, sw_if_index);
+}
+
+static_always_inline void *
+vnet_feature_arc_start_with_data (u8 arc, u32 sw_if_index, u32 * next,
+				  vlib_buffer_t * b, u32 n_data_bytes)
+{
+  vnet_feature_main_t *fm = &feature_main;
+  vnet_feature_config_main_t *cm;
+  cm = &fm->feature_config_mains[arc];
+
+  if (PREDICT_FALSE (vnet_have_features (arc, sw_if_index)))
+    {
+      b->feature_arc_index = arc;
+      b->current_config_index =
+	vec_elt (cm->config_index_by_sw_if_index, sw_if_index);
+      return vnet_get_config_data (&cm->config_main, &b->current_config_index,
+				   next, n_data_bytes);
+    }
+  return 0;
+}
+
+static_always_inline void
+vnet_feature_arc_start (u8 arc, u32 sw_if_index, u32 * next0,
+			vlib_buffer_t * b0)
+{
+  vnet_feature_arc_start_with_data (arc, sw_if_index, next0, b0, 0);
+}
+
+static_always_inline void *
+vnet_feature_next_with_data (u32 sw_if_index, u32 * next0,
+			     vlib_buffer_t * b0, u32 n_data_bytes)
+{
+  vnet_feature_main_t *fm = &feature_main;
+  u8 arc = b0->feature_arc_index;
+  vnet_feature_config_main_t *cm = &fm->feature_config_mains[arc];
+
+  return vnet_get_config_data (&cm->config_main,
+			       &b0->current_config_index, next0,
+			       n_data_bytes);
+}
+
+static_always_inline void
+vnet_feature_next (u32 sw_if_index, u32 * next0, vlib_buffer_t * b0)
+{
+  vnet_feature_next_with_data (sw_if_index, next0, b0, 0);
+}
+
+static_always_inline void
+vnet_feature_start_device_input_x1 (u32 sw_if_index, u32 * next0,
+				    vlib_buffer_t * b0, u16 buffer_advanced0)
+{
+  vnet_feature_main_t *fm = &feature_main;
+  vnet_feature_config_main_t *cm;
+  u8 feature_arc_index = fm->device_input_feature_arc_index;
+  cm = &fm->feature_config_mains[feature_arc_index];
+
+  if (PREDICT_FALSE
+      (clib_bitmap_get
+       (fm->sw_if_index_has_features[feature_arc_index], sw_if_index)))
+    {
+      /*
+       * Save next0 so that the last feature in the chain
+       * can skip ethernet-input if indicated...
+       */
+      vnet_buffer (b0)->device_input_feat.saved_next_index = *next0;
+      vnet_buffer (b0)->device_input_feat.buffer_advance = buffer_advanced0;
+      vlib_buffer_advance (b0, -buffer_advanced0);
+
+      b0->feature_arc_index = feature_arc_index;
+      b0->current_config_index =
+	vec_elt (cm->config_index_by_sw_if_index, sw_if_index);
+      vnet_get_config_data (&cm->config_main, &b0->current_config_index,
+			    next0, /* # bytes of config data */ 0);
+    }
+}
+
+static_always_inline void
+vnet_feature_start_device_input_x2 (u32 sw_if_index,
+				    u32 * next0,
+				    u32 * next1,
+				    vlib_buffer_t * b0,
+				    vlib_buffer_t * b1,
+				    u16 buffer_advanced0,
+				    u16 buffer_advanced1)
+{
+  vnet_feature_main_t *fm = &feature_main;
+  vnet_feature_config_main_t *cm;
+  u8 feature_arc_index = fm->device_input_feature_arc_index;
+  cm = &fm->feature_config_mains[feature_arc_index];
+
+  if (PREDICT_FALSE
+      (clib_bitmap_get
+       (fm->sw_if_index_has_features[feature_arc_index], sw_if_index)))
+    {
+      /*
+       * Save next0 so that the last feature in the chain
+       * can skip ethernet-input if indicated...
+       */
+      vnet_buffer (b0)->device_input_feat.saved_next_index = *next0;
+      vnet_buffer (b1)->device_input_feat.saved_next_index = *next1;
+      vnet_buffer (b0)->device_input_feat.buffer_advance = buffer_advanced0;
+      vnet_buffer (b1)->device_input_feat.buffer_advance = buffer_advanced1;
+      vlib_buffer_advance (b0, -buffer_advanced0);
+      vlib_buffer_advance (b1, -buffer_advanced1);
+
+      b0->feature_arc_index = feature_arc_index;
+      b1->feature_arc_index = feature_arc_index;
+      b0->current_config_index =
+	vec_elt (cm->config_index_by_sw_if_index, sw_if_index);
+      b1->current_config_index = b0->current_config_index;
+      vnet_get_config_data (&cm->config_main, &b0->current_config_index,
+			    next0, /* # bytes of config data */ 0);
+      vnet_get_config_data (&cm->config_main, &b1->current_config_index,
+			    next1, /* # bytes of config data */ 0);
+    }
+}
+
+static_always_inline void
+vnet_feature_start_device_input_x4 (u32 sw_if_index,
+				    u32 * next0,
+				    u32 * next1,
+				    u32 * next2,
+				    u32 * next3,
+				    vlib_buffer_t * b0,
+				    vlib_buffer_t * b1,
+				    vlib_buffer_t * b2,
+				    vlib_buffer_t * b3,
+				    u16 buffer_advanced0,
+				    u16 buffer_advanced1,
+				    u16 buffer_advanced2,
+				    u16 buffer_advanced3)
+{
+  vnet_feature_main_t *fm = &feature_main;
+  vnet_feature_config_main_t *cm;
+  u8 feature_arc_index = fm->device_input_feature_arc_index;
+  cm = &fm->feature_config_mains[feature_arc_index];
+
+  if (PREDICT_FALSE
+      (clib_bitmap_get
+       (fm->sw_if_index_has_features[feature_arc_index], sw_if_index)))
+    {
+      /*
+       * Save next0 so that the last feature in the chain
+       * can skip ethernet-input if indicated...
+       */
+      vnet_buffer (b0)->device_input_feat.saved_next_index = *next0;
+      vnet_buffer (b1)->device_input_feat.saved_next_index = *next1;
+      vnet_buffer (b2)->device_input_feat.saved_next_index = *next2;
+      vnet_buffer (b3)->device_input_feat.saved_next_index = *next3;
+
+      vnet_buffer (b0)->device_input_feat.buffer_advance = buffer_advanced0;
+      vnet_buffer (b1)->device_input_feat.buffer_advance = buffer_advanced1;
+      vnet_buffer (b2)->device_input_feat.buffer_advance = buffer_advanced2;
+      vnet_buffer (b3)->device_input_feat.buffer_advance = buffer_advanced3;
+
+      vlib_buffer_advance (b0, -buffer_advanced0);
+      vlib_buffer_advance (b1, -buffer_advanced1);
+      vlib_buffer_advance (b2, -buffer_advanced2);
+      vlib_buffer_advance (b3, -buffer_advanced3);
+
+      b0->feature_arc_index = feature_arc_index;
+      b1->feature_arc_index = feature_arc_index;
+      b2->feature_arc_index = feature_arc_index;
+      b3->feature_arc_index = feature_arc_index;
+
+      b0->current_config_index =
+	vec_elt (cm->config_index_by_sw_if_index, sw_if_index);
+      b1->current_config_index = b0->current_config_index;
+      b2->current_config_index = b0->current_config_index;
+      b3->current_config_index = b0->current_config_index;
+
+      vnet_get_config_data (&cm->config_main, &b0->current_config_index,
+			    next0, /* # bytes of config data */ 0);
+      vnet_get_config_data (&cm->config_main, &b1->current_config_index,
+			    next1, /* # bytes of config data */ 0);
+      vnet_get_config_data (&cm->config_main, &b2->current_config_index,
+			    next2, /* # bytes of config data */ 0);
+      vnet_get_config_data (&cm->config_main, &b3->current_config_index,
+			    next3, /* # bytes of config data */ 0);
+    }
+}
+
+#define VNET_FEATURES(...)  (char*[]) { __VA_ARGS__, 0}
+
+clib_error_t *vnet_feature_arc_init (vlib_main_t * vm,
+				     vnet_config_main_t * vcm,
+				     char **feature_start_nodes,
+				     int num_feature_start_nodes,
+				     vnet_feature_registration_t *
+				     first_reg, char ***feature_nodes);
+
+void vnet_interface_features_show (vlib_main_t * vm, u32 sw_if_index);
+
+#endif /* included_feature_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/feature/registration.c b/src/vnet/feature/registration.c
new file mode 100644
index 00000000..1deeeef9
--- /dev/null
+++ b/src/vnet/feature/registration.c
@@ -0,0 +1,301 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/mpls/mpls.h>
+
+/**
+ * @file
+ * @brief Feature Subgraph Ordering.
+
+    Dynamically compute feature subgraph ordering by performing a
+    topological sort across a set of "feature A before feature B" and
+    "feature C after feature B" constraints.
+
+    Use the topological sort result to set up vnet_config_main_t's for
+    use at runtime.
+
+    Feature subgraph arcs are simple enough. They start at specific
+    fixed nodes, and end at specific fixed nodes.  In between, a
+    per-interface current feature configuration dictates which
+    additional nodes each packet visits. Each so-called feature node
+    can [of course] drop any specific packet.
+
+    See ip4_forward.c, ip6_forward.c in this directory to see the
+    current rx-unicast, rx-multicast, and tx feature subgraph arc
+    definitions.
+
+    Let's say that we wish to add a new feature to the ip4 unicast
+    feature subgraph arc, which needs to run before @c ip4-lookup.  In
+    either base code or a plugin,
+    <CODE><PRE>
+    \#include <vnet/feature/feature.h>
+    </PRE></CODE>
+
+    and add the new feature as shown:
+
+    <CODE><PRE>
+    VNET_FEATURE_INIT (ip4_lookup, static) =
+    {
+      .arch_name = "ip4-unicast",
+      .node_name = "my-ip4-unicast-feature",
+      .runs_before = VLIB_FEATURES ("ip4-lookup")
+    };
+    </PRE></CODE>
+
+    Here's the standard coding pattern to enable / disable
+    @c my-ip4-unicast-feature on an interface:
+
+    <CODE><PRE>
+
+    sw_if_index = <interface-handle>
+    vnet_feature_enable_disable ("ip4-unicast", "my-ip4-unicast-feature",
+                                 sw_if_index, 1 );
+    </PRE></CODE>
+
+    Here's how to obtain the correct next node index in packet
+    processing code, aka in the implementation of @c my-ip4-unicast-feature:
+
+    <CODE><PRE>
+    vnet_feature_next (sw_if_index0, &next0, b0);
+
+    </PRE></CODE>
+
+    Nodes are free to drop or otherwise redirect packets. Packets
+    which "pass" should be enqueued via the next0 arc computed by
+    vnet_feature_next.
+*/
+
+
+static int
+comma_split (u8 * s, u8 ** a, u8 ** b)
+{
+  *a = s;
+
+  while (*s && *s != ',')
+    s++;
+
+  if (*s == ',')
+    *s = 0;
+  else
+    return 1;
+
+  *b = (u8 *) (s + 1);
+  return 0;
+}
+
+/**
+ * @brief Initialize a feature graph arc
+ * @param vm vlib main structure pointer
+ * @param vcm vnet config main structure pointer
+ * @param feature_start_nodes names of start-nodes which use this
+ *	  feature graph arc
+ * @param num_feature_start_nodes number of start-nodes
+ * @param first_reg first element in
+ *        [an __attribute__((constructor)) function built, or
+ *        otherwise created] singly-linked list of feature registrations
+ * @param [out] in_feature_nodes returned vector of
+ *        topologically-sorted feature node names, for use in
+ *        show commands
+ * @returns 0 on success, otherwise an error message. Errors
+ *        are fatal since they invariably involve mistyped node-names, or
+ *        genuinely missing node-names
+ */
+clib_error_t *
+vnet_feature_arc_init (vlib_main_t * vm,
+		       vnet_config_main_t * vcm,
+		       char **feature_start_nodes,
+		       int num_feature_start_nodes,
+		       vnet_feature_registration_t * first_reg,
+		       char ***in_feature_nodes)
+{
+  uword *index_by_name;
+  uword *reg_by_index;
+  u8 **node_names = 0;
+  u8 *node_name;
+  char **these_constraints;
+  char *this_constraint_c;
+  u8 **constraints = 0;
+  u8 *constraint_tuple;
+  u8 *this_constraint;
+  u8 **orig, **closure;
+  uword *p;
+  int i, j, k;
+  u8 *a_name, *b_name;
+  int a_index, b_index;
+  int n_features;
+  u32 *result = 0;
+  vnet_feature_registration_t *this_reg = 0;
+  char **feature_nodes = 0;
+  hash_pair_t *hp;
+  u8 **keys_to_delete = 0;
+
+  index_by_name = hash_create_string (0, sizeof (uword));
+  reg_by_index = hash_create (0, sizeof (uword));
+
+  this_reg = first_reg;
+
+  /* pass 1, collect feature node names, construct a before b pairs */
+  while (this_reg)
+    {
+      node_name = format (0, "%s%c", this_reg->node_name, 0);
+      hash_set (reg_by_index, vec_len (node_names), (uword) this_reg);
+
+      hash_set_mem (index_by_name, node_name, vec_len (node_names));
+
+      vec_add1 (node_names, node_name);
+
+      these_constraints = this_reg->runs_before;
+      while (these_constraints && these_constraints[0])
+	{
+	  this_constraint_c = these_constraints[0];
+
+	  constraint_tuple = format (0, "%s,%s%c", node_name,
+				     this_constraint_c, 0);
+	  vec_add1 (constraints, constraint_tuple);
+	  these_constraints++;
+	}
+
+      these_constraints = this_reg->runs_after;
+      while (these_constraints && these_constraints[0])
+	{
+	  this_constraint_c = these_constraints[0];
+
+	  constraint_tuple = format (0, "%s,%s%c",
+				     this_constraint_c, node_name, 0);
+	  vec_add1 (constraints, constraint_tuple);
+	  these_constraints++;
+	}
+
+      this_reg = this_reg->next;
+    }
+
+  n_features = vec_len (node_names);
+  orig = clib_ptclosure_alloc (n_features);
+
+  for (i = 0; i < vec_len (constraints); i++)
+    {
+      this_constraint = constraints[i];
+
+      if (comma_split (this_constraint, &a_name, &b_name))
+	return clib_error_return (0, "comma_split failed!");
+
+      p = hash_get_mem (index_by_name, a_name);
+      /*
+       * Note: the next two errors mean that something is
+       * b0rked. As in: if you code "A depends on B," and you forget
+       * to define a FEATURE_INIT macro for B, you lose.
+       * Nonexistent graph nodes are tolerated.
+       */
+      if (p == 0)
+	return clib_error_return (0, "feature node '%s' not found", a_name);
+      a_index = p[0];
+
+      p = hash_get_mem (index_by_name, b_name);
+      if (p == 0)
+	return clib_error_return (0, "feature node '%s' not found", b_name);
+      b_index = p[0];
+
+      /* add a before b to the original set of constraints */
+      orig[a_index][b_index] = 1;
+      vec_free (this_constraint);
+    }
+
+  /* Compute the positive transitive closure of the original constraints */
+  closure = clib_ptclosure (orig);
+
+  /* Compute a partial order across feature nodes, if one exists. */
+again:
+  for (i = 0; i < n_features; i++)
+    {
+      for (j = 0; j < n_features; j++)
+	{
+	  if (closure[i][j])
+	    goto item_constrained;
+	}
+      /* Item i can be output */
+      vec_add1 (result, i);
+      {
+	for (k = 0; k < n_features; k++)
+	  closure[k][i] = 0;
+	/*
+	 * Add a "Magic" a before a constraint.
+	 * This means we'll never output it again
+	 */
+	closure[i][i] = 1;
+	goto again;
+      }
+    item_constrained:
+      ;
+    }
+
+  /* see if we got a partial order... */
+  if (vec_len (result) != n_features)
+    return clib_error_return (0, "%d feature_init_cast no partial order!");
+
+  /*
+   * We win.
+   * Bind the index variables, and output the feature node name vector
+   * using the partial order we just computed. Result is in stack
+   * order, because the entry with the fewest constraints (e.g. none)
+   * is output first, etc.
+   */
+
+  for (i = n_features - 1; i >= 0; i--)
+    {
+      p = hash_get (reg_by_index, result[i]);
+      ASSERT (p != 0);
+      this_reg = (vnet_feature_registration_t *) p[0];
+      if (this_reg->feature_index_ptr)
+	*this_reg->feature_index_ptr = n_features - (i + 1);
+      this_reg->feature_index = n_features - (i + 1);
+      vec_add1 (feature_nodes, this_reg->node_name);
+    }
+
+  /* Set up the config infrastructure */
+  vnet_config_init (vm, vcm,
+		    feature_start_nodes,
+		    num_feature_start_nodes,
+		    feature_nodes, vec_len (feature_nodes));
+
+  /* Save a copy for show command */
+  *in_feature_nodes = feature_nodes;
+
+  /* Finally, clean up all the shit we allocated */
+  /* *INDENT-OFF* */
+  hash_foreach_pair (hp, index_by_name,
+  ({
+    vec_add1 (keys_to_delete, (u8 *)hp->key);
+  }));
+  /* *INDENT-ON* */
+  hash_free (index_by_name);
+  for (i = 0; i < vec_len (keys_to_delete); i++)
+    vec_free (keys_to_delete[i]);
+  vec_free (keys_to_delete);
+  hash_free (reg_by_index);
+  vec_free (result);
+  clib_ptclosure_free (orig);
+  clib_ptclosure_free (closure);
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/fib/fib.c b/src/vnet/fib/fib.c
new file mode 100644
index 00000000..413f93e8
--- /dev/null
+++ b/src/vnet/fib/fib.c
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/fib/fib_entry_src.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_path.h>
+#include <vnet/fib/fib_walk.h>
+#include <vnet/fib/fib_path_list.h>
+
+static clib_error_t *
+fib_module_init (vlib_main_t * vm)
+{
+    clib_error_t * error;
+
+    if ((error = vlib_call_init_function (vm, dpo_module_init)))
+	return (error);
+    if ((error = vlib_call_init_function (vm, adj_module_init)))
+	return (error);
+
+    fib_entry_module_init();
+    fib_entry_src_module_init();
+    fib_path_module_init();
+    fib_path_list_module_init();
+    fib_walk_module_init();
+
+    return (NULL);
+}
+
+VLIB_INIT_FUNCTION (fib_module_init);
diff --git a/src/vnet/fib/fib.h b/src/vnet/fib/fib.h
new file mode 100644
index 00000000..7cf1d136
--- /dev/null
+++ b/src/vnet/fib/fib.h
@@ -0,0 +1,652 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * \brief
+ * A IP v4/6 independent FIB.
+ *
+ * The main functions provided by the FIB are as follows;
+ *
+ *  - source priorities
+ *
+ *   A route can be added to the FIB by more than entity or source. Sources
+ * include, but are not limited to, API, CLI, LISP, MAP, etc (for the full list
+ * see fib_entry.h). Each source provides the forwarding information (FI) that
+ * is has determined as required for that route. Since each source determines the
+ * FI using different best  path and loop prevention algorithms, it is not
+ * correct for the FI of multiple sources to be combined. Instead the FIB must
+ * choose to use the FI from only one source. This choose is based on a static
+ * priority assignment. For example;
+ * IF a prefix is added as a result of interface configuration:
+ *    set interface address 192.168.1.1/24 GigE0
+ * and then it is also added from the CLI
+ *    ip route 192.168.1.1/32 via 2.2.2.2/32
+ * then the 'interface' source will prevail, and the route will remain as
+ * 'local'.
+ * The requirement of the FIB is to always install the FI from the winning
+ * source and thus to maintain the FI added by losing sources so it can be
+ * installed should the winning source be withdrawn.
+ *
+ *  - adj-fib maintenance
+ *
+ *   When ARP or ND discover a neighbour on a link an adjacency forms for the
+ * address of that neighbour. It is also required to insert a route in the
+ * appropriate FIB table, corresponding to the VRF for the link, an entry for
+ * that neighbour. This entry is often referred to as an adj-fib. Adj-fibs
+ * have a dedicated source; 'ADJ'.
+ * The priority of the ADJ source is lower than most. This is so the following
+ * config;
+ *    set interface address 192.168.1.1/32 GigE0
+ *    ip arp 192.168.1.2 GigE0 dead.dead.dead
+ *    ip route add 192.168.1.2 via 10.10.10.10 GigE1
+ * will forward traffic for 192.168.1.2 via GigE1. That is the route added
+ * by the control plane is favoured over the adjacency discovered by ARP.
+ * The control plane, with its associated authentication, is considered the
+ * authoritative source.
+ * To counter the nefarious addition of adj-fib, through the nefarious injection
+ * of adjacencies, the FIB is also required to ensure that only adj-fibs whose
+ * less specific covering prefix is connected are installed in forwarding. This
+ * requires the use of 'cover tracking', where a route maintains a dependency
+ * relationship with the route that is its less specific cover. When this cover
+ * changes (i.e. there is a new covering route) or the forwarding information
+ * of the cover changes, then the covered route is notified.
+ *
+ * Overlapping sub-nets are not supported, so no adj-fib has multiple paths.
+ * The control plane is expected to remove a prefix configured for an interface
+ * before the interface changes VRF.
+ * So while the following config is accepted:
+ *    set interface address 192.168.1.1/32 GigE0
+ *    ip arp 192.168.1.2 GigE0 dead.dead.dead
+ *    set interface ip table GigE0 2
+ * it does not result in the desired behaviour.
+ *
+ *  - attached export.
+ *
+ * Further to adj-fib maintenance above consider the following config:
+ *    set interface address 192.168.1.1/24 GigE0
+ *    ip route add table 2 192.168.1.0/24 GigE0
+ * Traffic destined for 192.168.1.2 in table 2 will generate an ARP request
+ * on GigE0. However, since GigE0 is in table 0, all adj-fibs will be added in
+ * FIB 0. Hence all hosts in the sub-net are unreachable from table 2. To resolve
+ * this, all adj-fib and local prefixes are exported (i.e. copied) from the 
+ * 'export' table 0, to the 'import' table 2. There can be many import tables
+ * for a single export table.
+ *
+ *  - recursive route resolution
+ *
+ *   A recursive route is of the form:
+ *       1.1.1.1/32 via 10.10.10.10
+ * i.e. a route for which no egress interface is provided. In order to forward
+ * traffic to 1.1.1.1/32 the FIB must therefore first determine how to forward
+ * traffic to 10.10.10.10/32. This is recursive resolution.
+ * Recursive resolution, just like normal resolution, proceeds via a longest
+ * prefix match for the 'via-address' 10.10.10.10. Note it is only possible
+ * to add routes via an address (i.e. a /32 or /128) not via a shorter mask
+ * prefix. There is no use case for the latter.
+ * Since recursive resolution proceeds via a longest prefix match, the entry
+ * in the FIB that will resolve the recursive route, termed the via-entry, may
+ * change as other routes are added to the FIB. Consider the recursive
+ * route shown above, and this non-recursive route:
+ *       10.10.10.0/24 via 192.168.16.1 GigE0
+ * The entry for 10.10.10.0/24 is thus the resolving via-entry. If this entry is
+ * modified, to say;
+ *       10.10.10.0/24 via 192.16.1.3 GigE0
+ * Then packet for 1.1.1.1/32 must also be sent to the new next-hop.
+ * Now consider the addition of;
+ *       10.10.10.0/28 via 192.168.16.2 GigE0
+ * The more specific /28 is a better longest prefix match and thus becomes the
+ * via-entry. Removal of the /28 means the resolution will revert to the /24.
+ * The tracking to the changes in recursive resolution is the requirement of
+ * the FIB. When the forwarding information of the via-entry changes a back-walk
+ * is used to update dependent recursive routes. When new routes are added to
+ * the table the cover tracking feature provides the necessary notifications to
+ * the via-entry routes.
+ * The adjacency constructed for 1.1.1.1/32 will be a recursive adjacency
+ * whose next adjacency will be contributed from the via-entry. Maintaining
+ * the validity of this recursive adjacency is a requirement of the FIB.
+ *
+ *  - recursive loop avoidance
+ *
+ * Consider this set of routes:
+ *     1.1.1.1/32 via 2.2.2.2
+ *     2.2.2.2/32 via 3.3.3.3
+ *     3.3.3.3/32 via 1.1.1.1
+ * this is termed a recursion loop - all of the routes in the loop are
+ * unresolved in so far as they do not have a resolving adjacency, but each
+ * is resolved because the via-entry is known. It is important here to note
+ * the distinction between the control-plane objects and the data-plane objects
+ * (more details in the implementation section). The control plane objects must
+ * allow the loop to form (i.e. the graph becomes cyclic), however, the
+ * data-plane absolutely must not allow the loop to form, otherwise the packet
+ * would loop indefinitely and never egress the device - meltdown would follow.
+ * The control plane must allow the loop to form, because when the loop breaks,
+ * all members of the loop need to be updated. Forming the loop allows the
+ * dependencies to be correctly setup to allow this to happen.
+ * There is no limit to the depth of recursion supported by VPP so:
+ *    9.9.9.100/32 via 9.9.9.99
+ *    9.9.9.99/32  via 9.9.9.98
+ *    9.9.9.98/32  via 9.9.9.97
+ *      ... turtles, turtles, turtles ...
+ *    9.9.9.1/32 via 10.10.10.10 Gig0
+ * is supported to as many layers of turtles is desired, however, when
+ * back-walking a graph (in this case from 9.9.9.1/32 up toward 9.9.9.100/32)
+ * a FIB needs to differentiate the case where the recursion is deep versus
+ * the case where the recursion is looped. A simple method, employed by VPP FIB,
+ * is to limit the number of steps. VPP FIB limit is 16. Typical BGP scenarios
+ * in the wild do not exceed 3 (BGP Inter-AS option C).
+ * 
+ * - Fast Convergence
+ * 
+ * After a network topology change, the 'convergence' time, is the time taken
+ * for the router to complete a transition to forward traffic using the new
+ * topology. The convergence time is therefore a summation of the time to;
+ *  - detect the failure.
+ *  - calculate the new 'best path' information
+ *  - download the new best paths to the data-plane.
+ *  - install those best best in data-plane forwarding.
+ * The last two points are of relevance to VPP architecture. The download API is
+ * binary and batch, details are not discussed here. There is no HW component to
+ * programme, installation time is bounded by the memory allocation and table
+ * lookup and insert access times.
+ *
+ * 'Fast' convergence refers to a set of technologies that a FIB can employ to
+ * completely or partially restore forwarding whilst the convergence actions
+ * listed above are ongoing. Fast convergence technologies are further
+ * sub-divided into Prefix Independent Convergence (PIC) and Loop Free
+ * Alternate path Fast re-route (LFA-FRR or sometimes called IP-FRR) which
+ * affect recursive and non-recursive routes respectively.
+ *
+ * LFA-FRR
+ *
+ * Consider the network topology below:
+ *
+ *          C
+ *        /   \
+ *  X -- A --- B - Y
+ *       |     |
+ *       D     F
+ *        \   /
+ *          E
+ *
+ * all links are equal cost, traffic is passing from X to Y. the best path is
+ * X-A-B-Y. There are two alternative paths, one via C and one via E. An
+ * alternate path is considered to be loop free if no other router on that path
+ * would forward the traffic back to the sender. Consider router C, its best
+ * path to Y is via B, so if A were to send traffic destined to Y to C, then C
+ * would forward that traffic to B - this is a loop-free alternate path. In
+ * contrast consider router D. D's shortest path to Y is via A, so if A were to
+ * send traffic destined to Y via D, then D would send it back to A; this is
+ * not a loop-free alternate path. There are several points of note;
+ *   - we are considering the pre-failure routing topology
+ *   - any equal-cost multi-path between A and B is also a LFA path.
+ *   - in order for A to calculate LFA paths it must be aware of the best-path
+ *     to Y from the perspective of D. These calculations are thus limited to
+ *     routing protocols that have a full view of the network topology, i.e.
+ *     link-state DB protocols like OSPF or an SDN controller. LFA protected
+ *     prefixes are thus non-recursive.
+ *
+ * LFA is specified as a 1 to 1 redundancy; a primary path has only one LFA
+ * (a.k.a. backup) path. To my knowledge this limitation is one of complexity
+ * in the calculation of and capacity planning using a 1-n redundancy. 
+ *
+ * In the event that the link A-B fails, the alternate path via C can be used.
+ * In order to provide 'fast' failover in the event of a failure, the control
+ * plane will download both the primary and the backup path to the FIB. It is
+ * then a requirement of the FIB to perform the failover (a.k.a cutover) from
+ * the primary to the backup path as quickly as possible, and particularly
+ * without any other control-plane intervention. The expectation is cutover is
+ * less than 50 milli-seconds - a value allegedly from the VOIP QoS. Note that
+ * cutover time still includes the fault detection time, which in a vitalised
+ * environment could be the dominant factor. Failure detection can be either a
+ * link down, which will affect multiple paths on a multi-access interface, or
+ * via a specific path heartbeat (i.e. BFD). 
+ * At this time VPP does not support LFA, that is it does not support the
+ * installation of a primary and backup path[s] for a route. However, it does
+ * support ECMP, and VPP FIB is designed to quickly remove failed paths from
+ * the ECMP set, however, it does not insert shared objects specific to the
+ * protected resource into the forwarding object graph, since this would incur
+ * a forwarding/performance cost. Failover time is thus route number dependent.
+ * Details are provided in the implementation section below.
+ *
+ * PIC
+ *
+ * PIC refers to the concept that the converge time should be independent of
+ * the number of prefixes/routes that are affected by the failure. PIC is
+ * therefore most appropriate when considering networks with large number of
+ * prefixes, i.e. BGP networks and thus recursive prefixes. There are several
+ * flavours of PIC covering different locations of protection and failure
+ * scenarios. An outline is given below, see the literature for more details:
+ *
+ * Y/16 - CE1 -- PE1---\
+ *                | \   P1---\
+ *                |  \        PE3 -- CE3 - X/16
+ *                |   - P2---/
+ * Y/16 - CE2 -- PE2---/
+ *
+ * CE = customer edge, PE = provider edge. external-BGP runs between customer
+ * and provider, internal-BGP runs between provider and provider.
+ *
+ * 1) iBGP PIC-core: consider traffic from CE1 to X/16 via CE3. On PE1 there is
+ *    are routes;
+ *       X/16 (and hundreds of thousands of others like it)
+ *         via PE3
+ *    and
+ *      PE3/32 (its loopback address)
+ *        via 10.0.0.1 Link0 (this is P1)
+ *        via 10.1.1.1 Link1 (this is P2)
+ * the failure is the loss of link0 or link1
+ * As in all PIC scenarios, in order to provide prefix independent convergence
+ * it must be that the route for X/16 (and all other routes via PE3) do not
+ * need to be updated in the FIB. The FIB therefore needs to update a single
+ * object that is shared by all routes - once this shared object is updated,
+ * then all routes using it will be instantly updated to use the new forwarding
+ * information. In this case the shared object is the resolving route via PE3.
+ * Once the route via PE3 is updated via IGP (OSPF) convergence, then all
+ * recursive routes that resolve through it are also updated. VPP FIB
+ * implements this scenario via a recursive-adjacency. the X/16 and it sibling
+ * routes share a recursive-adjacency that links to/points at/stacks on the
+ * normal adjacency contributed by the route for PE3. Once this shared
+ * recursive adj is re-linked then all routes are switched to using the new
+ * forwarding information. This is shown below;
+ *
+ * pre-failure;
+ *   X/16 --> R-ADJ-1 --> ADJ-1-PE3 (multi-path via P1 and P2)
+ *
+ * post-failure:
+ *   X/16 --> R-ADJ-1 --> ADJ-2-PE3 (single path via P1)
+ *
+ * note that R-ADJ-1 (the recursive adj) remains in the forwarding graph,
+ * therefore X/16 (and all its siblings) is not updated.
+ * X/16 and its siblings share the recursive adj since they share the same
+ * path-list. It is the path-list object that contributes the recursive-adj
+ * (see next section for more details)
+ *
+ *
+ * 2) iBGP PIC-edge; Traffic from CE3 to Y/16. On PE3 there is are routes;
+ *      Y/16  (and hundreds of thousands of others like it)
+ *        via PE1
+ *        via PE2 
+ *  and
+ *     PE1/32 (PE1's loopback address)
+ *       via 10.0.2.2 Link0 (this is P1)
+ *     PE2/32 (PE2's loopback address)
+ *       via 10.0.3.3 Link1 (this is P2)
+ *
+ * the failure is the loss of reachability to PE2. this could be either the
+ * loss of the link P2-PE2 or the loss of the node PE2. This is detected either
+ * by the withdrawal of the PE2's loopback route or by some form of failure
+ * detection (i.e. BFD).
+ * VPP FIB again provides PIC via the use of the shared recursive-adj. Y/16 and
+ * its siblings will again share a path-list for the list {PE1,PE2}, this
+ * path-list will contribute a multi-path-recursive-adj, i.e. a multi-path-adj
+ * with each choice therein being another adj;
+ *
+ *  Y/16 -> RM-ADJ --> ADJ1 (for PE1)
+ *                 --> ADJ2 (for PE2)
+ *
+ * when the route for PE1 is withdrawn then the multi-path-recursive-adjacency
+ * is updated to be;
+ *
+ * Y/16 --> RM-ADJ --> ADJ1 (for PE1)
+ *                 --> ADJ1 (for PE1)
+ *
+ * that is both choices in the ECMP set are the same and thus all traffic is
+ * forwarded to PE1. Eventually the control plane will download a route update
+ * for Y/16 to be via PE1 only. At that time the situation will be:
+ *
+ * Y/16 -> R-ADJ --> ADJ1 (for PE1)
+ *
+ * In the scenario above we assumed that PE1 and PE2 are ECMP for Y/16. eBGP
+ * PIC core is also specified for the case were one PE is primary and the other
+ * backup - VPP FIB does not support that case at this time.
+ *
+ * 3) eBGP PIC Edge; Traffic from CE3 to Y/16. On PE1 there is are routes;
+ *      Y/16 (and hundreds of thousands of others like it)
+ *         via CE1 (primary)
+ *         via PE2 (backup)
+ *   and
+ *     CE1 (this is an adj-fib)
+ *       via 11.0.0.1 Link0 (this is CE1) << this is an adj-fib
+ *     PE2 (PE2's loopback address)
+ *       via 10.0.5.5 Link1 (this is link PE1-PE2)
+ * the failure is the loss of link0 to CE1. The failure can be detected by FIB
+ * either as a link down event or by the control plane withdrawing the connected
+ * prefix on the link0 (say 10.0.5.4/30). The latter works because the resolving
+ * entry is an adj-fib, so removing the connected will withdraw the adj-fib, and
+ * hence the recursive path becomes unresolved. The former is faster,
+ * particularly in the case of Inter-AS option A where there are many VLAN
+ * sub-interfaces on the PE-CE link, one for each VRF, and so the control plane
+ * must remove the connected prefix for each sub-interface to trigger PIC in
+ * each VRF. Note though that total PIC cutover time will depend on VRF scale
+ * with either trigger.
+ * Primary and backup paths in this eBGP PIC-edge scenario are calculated by
+ * BGP. Each peer is configured to always advertise its best external path to
+ * its iBGP peers. Backup paths therefore send traffic from the PE back into the
+ * core to an alternate PE. A PE may have multiple external paths, i.e. multiple
+ * directly connected CEs, it may also have multiple backup PEs, however there
+ * is no correlation between the two, so unlike LFA-FRR, the redundancy model is
+ * N-M; N primary paths are backed-up by M backup paths - only when all primary
+ * paths fail, then the cutover is performed onto the M backup paths. Note that
+ * PE2 must be suitably configured to forward traffic on its external path that
+ * was received from PE1. VPP FIB does not support external-internal-BGP (eiBGP)
+ * load-balancing.
+ *
+ * As with LFA-FRR the use of primary and backup paths is not currently
+ * supported, however, the use of a recursive-multi-path-adj, and a suitably
+ * constrained hashing algorithm to choose from the primary or backup path sets,
+ * would again provide the necessary shared object and hence the prefix scale
+ * independent cutover.
+ *
+ * Astute readers will recognise that both of the eBGP PIC scenarios refer only
+ * to a BGP free core.
+ *
+ * Fast convergence implementation options come in two flavours:
+ *  1) Insert switches into the data-path. The switch represents the protected
+ *     resource. If the switch is 'on' the primary path is taken, otherwise
+ *     the backup path is taken. Testing the switch in the data-path comes with
+ *     an associated performance cost. A given packet may encounter more than
+ *     one protected resource as it is forwarded. This approach minimises
+ *     cutover times as packets will be forwarded on the backup path as soon
+ *     as the protected resource is detected to be down and the single switch
+ *     is tripped. However, it comes at a performance cost, which increases
+ *     with each shared resource a packet encounters in the data-path.
+ *     This approach is thus best suited to LFA-FRR where the protected routes
+ *     are non-recursive (i.e. encounter few shared resources) and the
+ *     expectation on cutover times is more stringent (<50msecs).
+ *  2) Update shared objects. Identify objects in the data-path, that are
+ *     required to be present whether or not fast convergence is required (i.e.
+ *     adjacencies) that can be shared by multiple routes. Create a dependency
+ *     between these objects at the protected resource. When the protected
+ *     resource fails, each of the shared objects is updated in a way that all
+ *     users of it see a consistent change. This approach incurs no performance
+ *     penalty as the data-path structure is unchanged, however, the cutover
+ *     times are longer as more work is required when the resource fails. This
+ *     scheme is thus more appropriate to recursive prefixes (where the packet
+ *     will encounter multiple protected resources) and to fast-convergence
+ *     technologies where the cutover times are less stringent (i.e. PIC).
+ *
+ * Implementation:
+ * ---------------
+ *
+ * Due to the requirements outlined above, not all routes known to FIB
+ * (e.g. adj-fibs) are installed in forwarding. However, should circumstances
+ * change, those routes will need to be added. This adds the requirement that
+ * a FIB maintains two tables per-VRF, per-AF (where a 'table' is indexed by
+ * prefix); the forwarding and non-forwarding tables.
+ *
+ * For DP speed in VPP we want the lookup in the forwarding table to directly 
+ * result in the ADJ. So the two tables; one contains all the routes (a 
+ * lookup therein yields a fib_entry_t), the other contains only the forwarding 
+ * routes (a lookup therein yields an ip_adjacency_t). The latter is used by the
+ * DP. 
+ * This trades memory for forwarding performance. A good trade-off in VPP's
+ * expected operating environments.
+ *
+ * Note these tables are keyed only by the prefix (and since there 2 two
+ * per-VRF, implicitly by the VRF too). The key for an adjacency is the
+ * tuple:{next-hop, address (and it's AF), interface, link/ether-type}.
+ * consider this curious, but allowed, config;
+ *
+ *   set int ip addr 10.0.0.1/24 Gig0
+ *   set ip arp Gig0 10.0.0.2 dead.dead.dead
+ *   # a host in that sub-net is routed via a better next hop (say it avoids a
+ *   # big L2 domain)
+ *   ip route add 10.0.0.2 Gig1 192.168.1.1
+ *   # this recursive should go via Gig1
+ *   ip route add 1.1.1.1/32 via 10.0.0.2
+ *   # this non-recursive should go via Gig0
+ *   ip route add 2.2.2.2/32 via Gig0 10.0.0.2
+ *
+ * for the last route, the lookup for the path (via {Gig0, 10.0.0.2}) in the
+ * prefix table would not yield the correct result. To fix this we need a
+ * separate table for the adjacencies.
+ *
+ *  - FIB data structures;
+ *
+ * fib_entry_t:
+ *   - a representation of a route.
+ *     - has a prefix.
+ *    - it maintains an array of path-lists that have been contributed by the
+ *      different sources
+ *    - install an adjacency in the forwarding table contributed by the best
+ *      source's path-list.
+ *
+ * fib_path_list_t:
+ *   - a list of paths
+ *   - path-lists may be shared between FIB entries. The path-lists are thus
+ *     kept in a DB. The key is the combined description of the paths. We share
+ *     path-lists  when it will aid convergence to do so. Adding path-lists to
+ *     this DB that are never shared, or are not shared by prefixes that are
+ *     not subject to PIC, will increase the size of the DB unnecessarily and
+ *     may lead to increased search times due to hash collisions.
+ *   - the path-list contributes the appropriate adj for the entry in the 
+ *     forwarding table. The adj can be 'normal', multi-path or recursive,
+ *     depending on the number of paths and their types.
+ *   - since path-lists are shared there is only one instance of the multi-path 
+ *     adj that they [may] create. As such multi-path adjacencies do not need a
+ *     separate DB.
+ * The path-list with recursive paths and the recursive adjacency that it
+ * contributes forms the backbone of the fast convergence architecture (as 
+ * described previously). 
+ *
+ * fib_path_t:
+ *   - a description of how to forward the traffic (i.e. via {Gig1, K}).
+ *   - the path describes the intent on how to forward. This differs from how 
+ *     the path resolves. I.e. it might not be resolved at all (since the
+ *     interface is deleted or down).
+ *   - paths have different types, most notably recursive or non-recursive.
+ *   - a fib_path_t will contribute the appropriate adjacency object. It is from
+ *     these contributions that the DP graph/chain for the route is built.
+ *   - if the path is recursive and a recursion loop is detected, then the path
+ *     will contribute the special DROP adjacency. This way, whilst the control
+ *     plane graph is looped, the data-plane graph does not.
+ *
+ * we build a graph of these objects;
+ *
+ *  fib_entry_t -> fib_path_list_t -> fib_path_t -> ...
+ *
+ * for recursive paths:
+ *
+ *   fib_path_t -> fib_entry_t -> ....
+ *
+ * for non-recursive paths
+ *
+ *  fib_path_t -> ip_adjacency_t -> interface
+ *
+ * These objects, which constitute the 'control plane' part of the FIB are used
+ * to represent the resolution of a route. As a whole this is referred to as the
+ * control plane graph. There is a separate DP graph to represent the forwarding
+ * of a packet. In the DP graph each object represents an action that is applied
+ * to a packet as it traverses the graph. For example, a lookup of a IP address
+ * in the forwarding table could result in the following graph:
+ *
+ *    recursive-adj --> multi-path-adj --> interface_A
+ *                                     --> interface_B
+ *
+ * A packet traversing this FIB DP graph would thus also traverse a VPP node
+ * graph of:
+ *
+ *    ipX_recursive --> ipX_rewrite --> interface_A_tx --> etc
+ *
+ * The taxonomy of objects in a FIB graph is as follows, consider;
+ *
+ *   A -->  
+ *   B --> D
+ *   C -->
+ *
+ * Where A,B and C are (for example) routes that resolve through D. 
+ *  parent; D is the parent of A, B, and C.
+ *  children: A, B, and C are children of D. 
+ *  sibling: A, B and C are siblings of one another.
+ *
+ * All shared objects in the FIB are reference counted. Users of these objects
+ * are thus expected to use the add_lock/unlock semantics (as one would
+ * normally use malloc/free).
+ *
+ * WALKS
+ *
+ * It is necessary to walk/traverse the graph forwards (entry to interface) to
+ * perform a collapse or build a recursive adj and backwards (interface
+ * to entry) to perform updates, i.e. when interface state changes or when
+ * recursive route resolution updates occur.
+ * A forward walk follows simply by navigating an object's parent pointer to
+ * access its parent object. For objects with multiple parents (e.g. a 
+ * path-list), each parent is walked in turn.
+ * To support back-walks direct dependencies are maintained between objects,
+ * i.e. in the relationship, {A, B, C} --> D, then object D will maintain a list
+ * of 'pointers' to its children {A, B, C}. Bare C-language pointers are not 
+ * allowed, so a pointer is described in terms of an object type (i.e. entry,
+ * path-list, etc) and index - this allows the object to be retrieved from the
+ * appropriate pool. A list is maintained to achieve fast convergence at scale.
+ * When there are millions or recursive prefixes, it is very inefficient to
+ * blindly walk the tables looking for entries that were affected by a given
+ * topology change. The lowest hanging fruit when optimising is to remove
+ * actions that are not required, so all back-walks only traverse objects that
+ * are directly affected by the change.
+ *
+ * PIC Core and fast-reroute rely on FIB reacting quickly to an interface
+ * state change to update the multi-path-adjacencies that use this interface.
+ * An example graph is shown below:
+ *
+ *    E_a -->
+ *    E_b --> PL_2 --> P_a --> Interface_A
+ *    ...          --> P_c -\
+ *    E_k -->                \
+ *                            Interface_K
+ *                            /
+ *    E_l -->                /
+ *    E_m --> PL_1 --> P_d -/ 
+ *    ...          --> P_f --> Interface_F
+ *    E_z -->
+ *
+ * E  = fib_entry_t
+ * PL = fib_path_list_t
+ * P  = fib_path_t 
+ * The subscripts are arbitrary and serve only to distinguish object instances.
+ * This CP graph result in the following DP graph:
+ *
+ *     M-ADJ-2 --> Interface_A
+ *             \
+ *              -> Interface_K
+ *             / 
+ *     M-ADJ-1 --> Interface_F
+ *
+ * M-ADJ = multi-path-adjacency.
+ *
+ * When interface K goes down a back-walk is started over its dependants in the
+ * control plane graph. This back-walk will reach PL_1 and PL_2 and result in
+ * the calculation of new adjacencies that have interface K removed. The walk
+ * will continue to the entry objects and thus the forwarding table is updated
+ * for each prefix with the new adjacency. The DP graph then becomes:
+ *
+ *    ADJ-3 --> Interface_A
+ *
+ *    ADJ-4 --> Interface_F
+ * 
+ * The eBGP PIC scenarios described above relied on the update of a path-list's
+ * recursive-adjacency to provide the shared point of cutover. This is shown
+ * below
+ *
+ *    E_a -->
+ *    E_b --> PL_2 --> P_a --> E_44 --> PL_a --> P_b --> Interface_A
+ *    ...          --> P_c -\
+ *    E_k -->                \
+ *                            \
+ *                           E_1 --> PL_k -> P_k --> Interface_K
+ *                            /
+ *    E_l -->                /
+ *    E_m --> PL_1 --> P_d -/ 
+ *    ...          --> P_f --> E_55 --> PL_e --> P_e --> Interface_E
+ *    E_z -->
+ *
+ * The failure scenario is the removal of entry E_1 and thus the paths P_c and
+ * P_d become unresolved. To achieve PIC the two shared recursive path-lists,
+ * PL_1 and PL_2 must be updated to remove E_1 from the recursive-multi-path-
+ * adjacencies that they contribute, before any entry E_a to E_z is updated.
+ * This means that as the update propagates backwards (right to left) in the
+ * graph it must do so breadth first not depth first. Note this approach leads
+ * to convergence times that are dependent on the number of path-list and so
+ * the number of combinations of egress PEs - this is desirable as this
+ * scale is considerably lower than the number of prefixes.
+ *
+ * If we consider another section of the graph that is similar to the one
+ * shown above where there is another prefix E_2 in a similar position to E_1
+ * and so also has many dependent children. It is reasonable to expect that a
+ * particular network failure may simultaneously render E_1 and E_2 unreachable.
+ * This means that the update to withdraw E_2 is download immediately after the
+ * update to withdraw E_1. It is a requirement on the FIB to not spend large
+ * amounts of time in a back-walk whilst processing the update for E_1, i.e. the
+ * back-walk must not reach as far as E_a and its siblings. Therefore, after the
+ * back-walk has traversed one generation (breadth first) to update all the
+ * path-lists it should be suspended/back-ground and further updates allowed
+ * to be handled. Once the update queue is empty, the suspended walks can be
+ * resumed. Note that in the case that multiple updates affect the same entry
+ * (say E_1) then this will trigger multiple similar walks, these are merged,
+ * so each child is updated only once.
+ * In the presence of more layers of recursion PIC is still a desirable
+ * feature. Consider an extension to the diagram above, where more recursive
+ * routes (E_100 -> E_200) are added as children of E_a:
+ *
+ * E_100 -->
+ * E_101 --> PL_3 --> P_j-\
+ * ...                     \
+ * E_199 -->               E_a -->
+ *                         E_b --> PL_2 --> P_a --> E_44 --> ...etc..
+ *                         ...          --> P_c -\
+ *                         E_k                    \
+ *                                                E_1 --> ...etc..
+ *                                                 /
+ *                         E_l -->                /
+ *                         E_m --> PL_1 --> P_d -/ 
+ *                         ...          --> P_e --> E_55 --> ...etc..
+ *                         E_z -->
+ *
+ * To achieve PIC for the routes E_100->E_199, PL_3 needs to be updated before
+ * E_b -> E_z, a breadth first traversal at each level would not achieve this.
+ * Instead the walk must proceed intelligently. Children on PL_2 are sorted so
+ * those Entry objects that themselves have children appear first in the list,
+ * those without later. When an entry object is walked that has children, a
+ * walk of its children is pushed to the front background queue. The back
+ * ground queue is a priority queue. As the breadth first traversal proceeds
+ * across the dependent entry object E_a to E_k, when the first entry that does
+ * not have children is reached (E_b), the walk is suspended and placed at the
+ * back of the queue. Following this prioritisation method shared path-list
+ * updates are performed before all non-resolving entry objects.
+ * The CPU/core/thread that handles the updates is the same thread that handles
+ * the back-walks. Handling updates has a higher priority than making walk
+ * progress, so a walk is required to be interruptable/suspendable when new
+ * updates are available.
+ * !!! TODO - this section describes how walks should be not how they are !!!
+ *
+ * In the diagram above E_100 is an IP route, however, VPP has no restrictions
+ * on the type of object that can be a dependent of a FIB entry. Children of
+ * a FIB entry can be (and are) GRE & VXLAN tunnels endpoints, L2VPN LSPs etc.
+ * By including all object types into the graph and extending the back-walk, we
+ * can thus deliver fast convergence to technologies that overlay on an IP
+ * network.
+ *
+ * If having read all the above carefully you are still thinking;  'i don't need
+ * all this %&$* i have a route only I know about and I just need to jam it in',
+ * then fib_table_entry_special_add() is your only friend.
+ */
+
+#ifndef __FIB_H__
+#define __FIB_H__
+
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/ip6_fib.h>
+
+#endif
diff --git a/src/vnet/fib/fib_api.h b/src/vnet/fib/fib_api.h
new file mode 100644
index 00000000..f8275317
--- /dev/null
+++ b/src/vnet/fib/fib_api.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __FIB_API_H__
+#define __FIB_API_H__
+
+
+int
+add_del_route_check (fib_protocol_t table_proto,
+		     u32 table_id,
+		     u32 next_hop_sw_if_index,
+		     fib_protocol_t next_hop_table_proto,
+		     u32 next_hop_table_id,
+		     u8 create_missing_tables,
+		     u32 * fib_index, u32 * next_hop_fib_index);
+
+int
+add_del_route_t_handler (u8 is_multipath,
+			 u8 is_add,
+			 u8 is_drop,
+			 u8 is_unreach,
+			 u8 is_prohibit,
+			 u8 is_local,
+			 u8 is_classify,
+			 u32 classify_table_index,
+			 u8 is_resolve_host,
+			 u8 is_resolve_attached,
+			 u32 fib_index,
+			 const fib_prefix_t * prefix,
+			 u8 next_hop_proto_is_ip4,
+			 const ip46_address_t * next_hop,
+			 u32 next_hop_sw_if_index,
+			 u8 next_hop_fib_index,
+			 u32 next_hop_weight,
+			 mpls_label_t next_hop_via_label,
+			 mpls_label_t * next_hop_out_label_stack);
+
+void
+copy_fib_next_hop (fib_route_path_encode_t * api_rpath,
+		   void * fp_arg);
+
+#endif /* __FIB_API_H__ */
diff --git a/src/vnet/fib/fib_attached_export.c b/src/vnet/fib/fib_attached_export.c
new file mode 100644
index 00000000..c389ea43
--- /dev/null
+++ b/src/vnet/fib/fib_attached_export.c
@@ -0,0 +1,572 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_table.h>
+
+#include <vnet/fib/fib_attached_export.h>
+#include <vnet/fib/fib_entry_cover.h>
+#include <vnet/fib/fib_entry_src.h>
+#include <vnet/fib/fib_entry_delegate.h>
+
+/**
+ * A description of the need to import routes from the export table
+ */
+typedef struct fib_ae_import_t_
+{
+    /**
+     * The entry in the epxort table that this importer
+     * is importing covereds from
+     */
+    fib_node_index_t faei_export_entry;
+
+    /**
+     * The attached entry in the import table
+     */
+    fib_node_index_t faei_import_entry;
+    /**
+     * the sibling index on the cover
+     */
+    u32 faei_export_sibling;
+
+    /**
+     * The index of the exporter tracker. Not set if the
+     * export entry is not valid for export
+     */
+    fib_node_index_t faei_exporter;
+
+    /**
+     * A vector/list of imported entry indicies
+     */
+    fib_node_index_t *faei_importeds;
+
+    /**
+     * The FIB index and prefix we are tracking
+     */
+    fib_node_index_t faei_export_fib;
+    fib_prefix_t faei_prefix;
+
+    /**
+     * The FIB index we are importing into
+     */
+    fib_node_index_t faei_import_fib;
+} fib_ae_import_t;
+
+/**
+ * A description of the need to export routes to one or more export tables
+ */
+typedef struct fib_ae_export_t_ {
+    /**
+     * The vector/list of import tracker indicies
+     */
+    fib_node_index_t *faee_importers;
+
+    /**
+     * THe connected entry this export is acting on behalf of
+     */
+    fib_node_index_t faee_ei;
+
+    /**
+     * Reference counting locks
+     */
+    u32 faee_locks;
+} fib_ae_export_t;
+
+/*
+ * memory pools for the importers and exportes
+ */
+static fib_ae_import_t *fib_ae_import_pool;
+static fib_ae_export_t *fib_ae_export_pool;
+
+static fib_ae_export_t *
+fib_entry_ae_add_or_lock (fib_node_index_t connected)
+{
+    fib_entry_delegate_t *fed;
+    fib_ae_export_t *export;
+    fib_entry_t *entry;
+
+    entry = fib_entry_get(connected);
+    fed = fib_entry_delegate_get(entry,
+                                 FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
+
+    if (NULL == fed)
+    {
+        fed = fib_entry_delegate_find_or_add(entry,
+                                             FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
+	pool_get(fib_ae_export_pool, export);
+	memset(export, 0, sizeof(*export));
+
+	fed->fd_index = (export - fib_ae_export_pool);
+	export->faee_ei = connected;
+    }
+    else
+    {
+	export = pool_elt_at_index(fib_ae_export_pool, fed->fd_index);
+    }
+
+    export->faee_locks++;
+
+    return (export);
+}
+
+static void
+fib_entry_import_remove (fib_ae_import_t *import,
+			 fib_node_index_t entry_index)
+{
+    fib_prefix_t prefix;
+    u32 index;
+
+    /*
+     * find the index in the vector of the entry we are removing
+     */
+    index = vec_search(import->faei_importeds, entry_index);
+
+    if (index < vec_len(import->faei_importeds))
+    {
+	/*
+	 * this is an entry that was previsouly imported
+	 */
+	fib_entry_get_prefix(entry_index, &prefix);
+
+	fib_table_entry_special_remove(import->faei_import_fib,
+				       &prefix,
+				       FIB_SOURCE_AE);
+
+	fib_entry_unlock(entry_index);
+	vec_del1(import->faei_importeds, index);
+    }
+}
+
+static void
+fib_entry_import_add (fib_ae_import_t *import,
+		      fib_node_index_t entry_index)
+{
+    fib_node_index_t *existing;
+    fib_prefix_t prefix;
+
+    /*
+     * ensure we only add the exported entry once, since
+     * sourcing prefixes in the table is reference counted
+     */
+    vec_foreach(existing, import->faei_importeds)
+    {
+	if (*existing == entry_index)
+	{
+	    return;
+	}
+    }
+
+    /*
+     * this is the first time this export entry has been imported
+     * Add it to the import FIB and to the list of importeds
+     */
+    fib_entry_get_prefix(entry_index, &prefix);
+
+    /*
+     * don't import entries that have the same prefix the import entry
+     */
+    if (0 != fib_prefix_cmp(&prefix,
+			    &import->faei_prefix))
+    {
+        const dpo_id_t *dpo;
+
+        dpo = fib_entry_contribute_ip_forwarding(entry_index);
+
+        if (dpo_id_is_valid(dpo))
+        {
+            fib_table_entry_special_dpo_add(import->faei_import_fib,
+                                            &prefix,
+                                            FIB_SOURCE_AE,
+                                            (fib_entry_get_flags(entry_index) |
+                                             FIB_ENTRY_FLAG_EXCLUSIVE),
+                                            load_balance_get_bucket(dpo->dpoi_index, 0));
+
+            fib_entry_lock(entry_index);
+            vec_add1(import->faei_importeds, entry_index);
+        }
+        /*
+         * else
+         *   the entry currently has no valid forwarding. when it
+         * does it will export itself
+         */
+    }
+}
+
+/**
+ * Call back when walking a connected prefix's covered prefixes for import
+ */
+static int
+fib_entry_covered_walk_import (fib_entry_t *cover,
+			       fib_node_index_t covered,
+			       void *ctx)
+{
+    fib_ae_import_t *import = ctx;
+
+    fib_entry_import_add(import, covered);
+
+    return (0);
+}
+
+/*
+ * fib_entry_ae_import_add
+ *
+ * Add an importer to a connected entry
+ */
+static void
+fib_ae_export_import_add (fib_ae_export_t *export,
+			  fib_ae_import_t *import)
+{
+    fib_entry_t *entry;
+
+    import->faei_exporter = (export - fib_ae_export_pool);
+    entry = fib_entry_get(export->faee_ei);
+
+    fib_entry_cover_walk(entry,
+			 fib_entry_covered_walk_import,
+			 import);
+}
+
+void
+fib_attached_export_import (fib_entry_t *fib_entry,
+			    fib_node_index_t export_fib)
+{
+    fib_entry_delegate_t *fed;
+    fib_ae_import_t *import;
+
+    pool_get(fib_ae_import_pool, import);
+
+    import->faei_import_fib = fib_entry->fe_fib_index;
+    import->faei_export_fib = export_fib;
+    import->faei_prefix = fib_entry->fe_prefix;
+    import->faei_import_entry = fib_entry_get_index(fib_entry);
+    import->faei_export_sibling = ~0;
+
+    /*
+     * do an exact match in the export table
+     */
+    import->faei_export_entry =
+	fib_table_lookup_exact_match(import->faei_export_fib,
+				     &import->faei_prefix);
+
+    if (FIB_NODE_INDEX_INVALID == import->faei_export_entry)
+    {
+	/*
+	 * no exact matching entry in the export table. can't be good.
+	 * track the next best thing
+	 */
+	import->faei_export_entry =
+	    fib_table_lookup(import->faei_export_fib,
+			     &import->faei_prefix);
+	import->faei_exporter = FIB_NODE_INDEX_INVALID;
+    }
+    else
+    {
+	/*
+	 * found the entry in the export table. import the
+	 * the prefixes that it covers.
+	 * only if the prefix found in the export FIB really is
+	 * attached do we want to import its covered
+	 */
+	if (FIB_ENTRY_FLAG_ATTACHED &
+	    fib_entry_get_flags_i(fib_entry_get(import->faei_export_entry)))
+	{
+	    fib_ae_export_t *export;
+
+	    export = fib_entry_ae_add_or_lock(import->faei_export_entry);
+	    vec_add1(export->faee_importers, (import - fib_ae_import_pool));
+	    fib_ae_export_import_add(export, import);
+	}
+    }
+
+    /*
+     * track the entry in the export table so we can update appropriately
+     * when it changes
+     */
+    import->faei_export_sibling =
+	fib_entry_cover_track(fib_entry_get(import->faei_export_entry),
+			      fib_entry_get_index(fib_entry));
+
+    fed = fib_entry_delegate_find_or_add(fib_entry,
+                                         FIB_ENTRY_DELEGATE_ATTACHED_IMPORT);
+    fed->fd_index = (import - fib_ae_import_pool);
+}
+
+/**
+ * \brief All the imported entries need to be pruged
+ */
+void
+fib_attached_export_purge (fib_entry_t *fib_entry)
+{
+    fib_entry_delegate_t *fed;
+
+    fed = fib_entry_delegate_get(fib_entry,
+                                 FIB_ENTRY_DELEGATE_ATTACHED_IMPORT);
+
+    if (NULL != fed)
+    {
+ 	fib_node_index_t *import_index;
+	fib_entry_t *export_entry;
+	fib_ae_import_t *import;
+	fib_ae_export_t *export;
+
+	import = pool_elt_at_index(fib_ae_import_pool, fed->fd_index);
+
+	/*
+	 * remove each imported entry
+	 */
+	vec_foreach(import_index, import->faei_importeds)
+	{
+	    fib_prefix_t prefix;
+
+	    fib_entry_get_prefix(*import_index, &prefix);
+
+	    fib_table_entry_delete(import->faei_import_fib,
+				   &prefix,
+				   FIB_SOURCE_AE);
+	    fib_entry_unlock(*import_index);
+	}
+	vec_free(import->faei_importeds);
+
+	/*
+	 * stop tracking the export entry
+	 */
+	if (~0 != import->faei_export_sibling)
+	{
+	    fib_entry_cover_untrack(fib_entry_get(import->faei_export_entry),
+				    import->faei_export_sibling);
+	}
+	import->faei_export_sibling = ~0;
+
+	/*
+	 * remove this import tracker from the export's list,
+	 * if it is attached to one. It won't be in the case the tracked
+	 * export entry is not an attached exact match.
+	 */
+	if (FIB_NODE_INDEX_INVALID != import->faei_exporter)
+	{
+            fib_entry_delegate_t *fed;
+
+	    export_entry = fib_entry_get(import->faei_export_entry);
+
+            fed = fib_entry_delegate_get(export_entry,
+                                         FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
+            ASSERT(NULL != fed);
+
+	    export = pool_elt_at_index(fib_ae_export_pool, fed->fd_index);
+
+	    u32 index = vec_search(export->faee_importers,
+				   (import - fib_ae_import_pool));
+
+	    ASSERT(index < vec_len(export->faee_importers));
+	    vec_del1(export->faee_importers, index);
+
+	    /*
+	     * free the exporter if there are no longer importers
+	     */
+	    if (0 == --export->faee_locks)
+	    {
+		pool_put(fib_ae_export_pool, export);
+                fib_entry_delegate_remove(export_entry,
+                                          FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
+	    }
+	}
+
+	/*
+	 * free the import tracker
+	 */
+	pool_put(fib_ae_import_pool, import);
+        fib_entry_delegate_remove(fib_entry,
+                                  FIB_ENTRY_DELEGATE_ATTACHED_IMPORT);
+    }	
+}
+
+void
+fib_attached_export_covered_added (fib_entry_t *cover,
+				   fib_node_index_t covered)
+{
+    fib_entry_delegate_t *fed;
+
+    fed = fib_entry_delegate_get(cover,
+                                 FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
+
+    if (NULL != fed)
+    {
+	/*
+	 * the covering prefix is exporting to other tables
+	 */
+ 	fib_node_index_t *import_index;
+	fib_ae_import_t *import;
+	fib_ae_export_t *export;
+
+	export = pool_elt_at_index(fib_ae_export_pool, fed->fd_index);
+
+	/*
+	 * export the covered entry to each of the importers
+	 */
+	vec_foreach(import_index, export->faee_importers)
+	{
+	    import = pool_elt_at_index(fib_ae_import_pool, *import_index);
+
+	    fib_entry_import_add(import, covered);
+	}
+    }
+}
+
+void
+fib_attached_export_covered_removed (fib_entry_t *cover,
+				     fib_node_index_t covered)
+{
+    fib_entry_delegate_t *fed;
+
+    fed = fib_entry_delegate_get(cover,
+                                 FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
+
+    if (NULL != fed)
+    {
+	/*
+	 * the covering prefix is exporting to other tables
+	 */
+ 	fib_node_index_t *import_index;
+	fib_ae_import_t *import;
+	fib_ae_export_t *export;
+
+	export = pool_elt_at_index(fib_ae_export_pool, fed->fd_index);
+
+	/*
+	 * remove the covered entry from each of the importers
+	 */
+	vec_foreach(import_index, export->faee_importers)
+	{
+	    import = pool_elt_at_index(fib_ae_import_pool, *import_index);
+
+	    fib_entry_import_remove(import, covered);
+	}
+    }
+}
+
+static void
+fib_attached_export_cover_modified_i (fib_entry_t *fib_entry)
+{
+    fib_entry_delegate_t *fed;
+
+    fed = fib_entry_delegate_get(fib_entry,
+                                 FIB_ENTRY_DELEGATE_ATTACHED_IMPORT);
+
+    if (NULL != fed)
+    {
+	fib_ae_import_t *import;
+	u32 export_fib;
+
+	/*
+	 * safe the temporaries we need from the existing import
+	 * since it will be toast after the purge.
+	 */
+	import = pool_elt_at_index(fib_ae_import_pool, fed->fd_index);
+	export_fib = import->faei_export_fib;
+
+	/*
+	 * keep it simple. purge anything that was previously imported.
+	 * then re-evaluate the need to import.
+	 */
+	fib_attached_export_purge(fib_entry);
+	fib_attached_export_import(fib_entry, export_fib);
+    }
+}
+
+/**
+ * \brief If this entry is tracking a cover (in another table)
+ *        then that cover has changed. re-evaluate import.
+ */
+void
+fib_attached_export_cover_change (fib_entry_t *fib_entry)
+{
+    fib_attached_export_cover_modified_i(fib_entry);
+}
+
+/**
+ * \brief If this entry is tracking a cover (in another table)
+ *        then that cover has been updated. re-evaluate import.
+ */
+void
+fib_attached_export_cover_update (fib_entry_t *fib_entry)
+{
+    fib_attached_export_cover_modified_i(fib_entry);
+}
+
+u8*
+fib_ae_import_format (fib_entry_t *fib_entry,
+		      u8* s)
+{
+    fib_entry_delegate_t *fed;
+
+    fed = fib_entry_delegate_get(fib_entry,
+                                 FIB_ENTRY_DELEGATE_ATTACHED_IMPORT);
+
+    if (NULL != fed)
+    {
+	fib_node_index_t *index;
+	fib_ae_import_t *import;
+
+	import = pool_elt_at_index(fib_ae_import_pool, fed->fd_index);
+
+	s = format(s, "\n  Attached-Import:%d:[", (import - fib_ae_import_pool));
+	s = format(s, "export-prefix:%U ", format_fib_prefix, &import->faei_prefix);
+	s = format(s, "export-entry:%d ", import->faei_export_entry);
+	s = format(s, "export-sibling:%d ", import->faei_export_sibling);
+	s = format(s, "exporter:%d ", import->faei_exporter);
+	s = format(s, "export-fib:%d ", import->faei_export_fib);
+
+	s = format(s, "import-entry:%d ", import->faei_import_entry);
+	s = format(s, "import-fib:%d ", import->faei_import_fib);
+
+	s = format(s, "importeds:[");
+	vec_foreach(index, import->faei_importeds)
+	{
+	    s = format(s, "%d, ", *index);
+	}
+	    s = format(s, "]]");
+    }
+
+    return (s);
+}
+
+u8*
+fib_ae_export_format (fib_entry_t *fib_entry,
+		      u8* s)
+{
+    fib_entry_delegate_t *fed;
+
+    fed = fib_entry_delegate_get(fib_entry,
+                                 FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
+
+    if (NULL != fed)
+    {
+        fib_node_index_t *index;
+	fib_ae_export_t *export;
+
+	export = pool_elt_at_index(fib_ae_export_pool, fed->fd_list);
+    
+	s = format(s, "\n  Attached-Export:%d:[", (export - fib_ae_export_pool));
+	s = format(s, "export-entry:%d ", export->faee_ei);
+
+	s = format(s, "importers:[");
+	vec_foreach(index, export->faee_importers)
+	{
+	    s = format(s, "%d, ", *index);
+	}
+	s = format(s, "]]");
+    }
+    return (s);
+}
diff --git a/src/vnet/fib/fib_attached_export.h b/src/vnet/fib/fib_attached_export.h
new file mode 100644
index 00000000..fa28a6e1
--- /dev/null
+++ b/src/vnet/fib/fib_attached_export.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * FIB attached export
+ *
+ * what's it all about?
+ * say one does this:
+ *    set int ip table Gig0 2
+ *    set int ip addr  Gig0 10.0.0.1/24
+ * Ggi0 is in table 2 with a connected address.
+ * Now we add a routing matching said connected in a different table
+ *    ip route add table 3 10.0.0.0/24 via Gig0
+ * How do we expect traffic in table 3 to be forwarded? Clearly out of
+ * Ggi0. It's an attached route, hence we are saying that we can ARP for
+ * hosts in the attached subnet. and we can. but any ARP entries we send
+ * we be received on Gig0, but since Gig0 is in table 2, it will install
+ * the adj-fins in table 2. So traffic in table 3 will never hit an adj-fib
+ * and hence always the glean, and so thus be effectively dropped.
+ * How do we fix this? Attached Export !! All more specfiic entries in table 2
+ * that track and are covered by the connected are automatically exported into
+ * table 3. Now table 3 also has adj-fibs (and the local) so traffic to hosts
+ * is restored.
+ */
+
+#ifndef __FIB_ATTACHED_EXPORT_H__
+#define __FIB_ATTACHED_EXPORT_H__
+
+#include <vnet/fib/fib_types.h>
+
+extern void fib_attached_export_import(fib_entry_t *fib_entry,
+				       fib_node_index_t export_fib);
+				       
+extern void fib_attached_export_purge(fib_entry_t *fib_entry);
+
+extern void fib_attached_export_covered_added(fib_entry_t *cover,
+					      fib_node_index_t covered);
+extern void fib_attached_export_covered_removed(fib_entry_t *cover,
+						fib_node_index_t covered);
+extern void fib_attached_export_cover_change(fib_entry_t *fib_entry);
+extern void fib_attached_export_cover_update(fib_entry_t *fib_entry);
+
+extern u8* fib_ae_import_format(fib_entry_t *fib_entry, u8*s);
+extern u8* fib_ae_export_format(fib_entry_t *fib_entry, u8*s);
+
+#endif
diff --git a/src/vnet/fib/fib_entry.c b/src/vnet/fib/fib_entry.c
new file mode 100644
index 00000000..24b50637
--- /dev/null
+++ b/src/vnet/fib/fib_entry.c
@@ -0,0 +1,1503 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/ip/format.h>
+#include <vnet/ip/lookup.h>
+#include <vnet/adj/adj.h>
+#include <vnet/dpo/load_balance.h>
+#include <vnet/dpo/drop_dpo.h>
+
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_walk.h>
+#include <vnet/fib/fib_entry_src.h>
+#include <vnet/fib/fib_entry_cover.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/fib_internal.h>
+#include <vnet/fib/fib_attached_export.h>
+#include <vnet/fib/fib_path_ext.h>
+
+/*
+ * Array of strings/names for the FIB sources
+ */
+static const char *fib_source_names[] = FIB_SOURCES;
+static const char *fib_attribute_names[] = FIB_ENTRY_ATTRIBUTES;
+
+/*
+ * Pool for all fib_entries
+ */
+static fib_entry_t *fib_entry_pool;
+
+fib_entry_t *
+fib_entry_get (fib_node_index_t index)
+{
+    return (pool_elt_at_index(fib_entry_pool, index));
+}
+
+static fib_node_t *
+fib_entry_get_node (fib_node_index_t index)
+{
+    return ((fib_node_t*)fib_entry_get(index));
+}
+
+fib_node_index_t
+fib_entry_get_index (const fib_entry_t * fib_entry)
+{
+    return (fib_entry - fib_entry_pool);
+}
+
+static fib_protocol_t
+fib_entry_get_proto (const fib_entry_t * fib_entry)
+{
+    return (fib_entry->fe_prefix.fp_proto);
+}
+
+fib_forward_chain_type_t
+fib_entry_get_default_chain_type (const fib_entry_t *fib_entry)
+{
+    switch (fib_entry->fe_prefix.fp_proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
+    case FIB_PROTOCOL_IP6:
+	return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
+    case FIB_PROTOCOL_MPLS:
+	if (MPLS_EOS == fib_entry->fe_prefix.fp_eos)
+	    /*
+	     * If the entry being asked is a eos-MPLS label entry,
+	     * then use the payload-protocol field, that we stashed there
+	     * for just this purpose
+	     */
+	    return (fib_forw_chain_type_from_dpo_proto(
+			fib_entry->fe_prefix.fp_payload_proto));
+	else
+	    return (FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS);
+    }
+
+    return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
+}
+
+u8 *
+format_fib_entry (u8 * s, va_list * args)
+{
+    fib_forward_chain_type_t fct;
+    fib_entry_attribute_t attr;
+    fib_path_ext_t *path_ext;
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *src;
+    fib_node_index_t fei;
+    fib_source_t source;
+    u32 n_covered;
+    int level;
+
+    fei = va_arg (*args, fib_node_index_t);
+    level = va_arg (*args, int);
+    fib_entry = fib_entry_get(fei);
+
+    s = format (s, "%U", format_fib_prefix, &fib_entry->fe_prefix);
+
+    if (level >= FIB_ENTRY_FORMAT_DETAIL)
+    {
+	s = format (s, " fib:%d", fib_entry->fe_fib_index);
+	s = format (s, " index:%d", fib_entry_get_index(fib_entry));
+	s = format (s, " locks:%d", fib_entry->fe_node.fn_locks);
+
+	FOR_EACH_SRC_ADDED(fib_entry, src, source,
+        ({
+	    s = format (s, "\n  src:%s ",
+			fib_source_names[source]);
+	    s = fib_entry_src_format(fib_entry, source, s);
+	    s = format (s, " refs:%d ", src->fes_ref_count);
+	    if (FIB_ENTRY_FLAG_NONE != src->fes_entry_flags) {
+		s = format(s, "flags:");
+		FOR_EACH_FIB_ATTRIBUTE(attr) {
+		    if ((1<<attr) & src->fes_entry_flags) {
+			s = format (s, "%s,", fib_attribute_names[attr]);
+		    }
+		}
+	    }
+	    s = format (s, "\n");
+	    if (FIB_NODE_INDEX_INVALID != src->fes_pl)
+	    {
+		s = fib_path_list_format(src->fes_pl, s);
+	    }
+	    if (NULL != src->fes_path_exts)
+	    {
+		s = format(s, "    Extensions:");
+		vec_foreach(path_ext, src->fes_path_exts)
+		{
+		    s = format(s, "\n     %U", format_fib_path_ext, path_ext);
+		}
+	    }
+	}));
+    
+	n_covered = fib_entry_cover_get_size(fib_entry);
+	if (n_covered > 0) {
+	    s = format(s, "\n tracking %d covered: ", n_covered);
+	    s = fib_entry_cover_list_format(fib_entry, s);
+	}
+	s = fib_ae_import_format(fib_entry, s);
+	s = fib_ae_export_format(fib_entry, s);
+
+	s = format (s, "\n forwarding: ");
+    }
+    else
+    {
+	s = format (s, "\n");
+    }
+
+    fct = fib_entry_get_default_chain_type(fib_entry);
+
+    if (!dpo_id_is_valid(&fib_entry->fe_lb))
+    {
+	s = format (s, "  UNRESOLVED\n");
+	return (s);
+    }
+    else
+    {
+        s = format(s, "  %U-chain\n  %U",
+                   format_fib_forw_chain_type, fct,
+                   format_dpo_id,
+                   &fib_entry->fe_lb,
+                   2);
+        s = format(s, "\n");
+
+        if (level >= FIB_ENTRY_FORMAT_DETAIL2)
+        {
+            fib_entry_delegate_type_t fdt;
+            fib_entry_delegate_t *fed;
+
+            FOR_EACH_DELEGATE_CHAIN(fib_entry, fdt, fed,
+            {
+                s = format(s, "  %U-chain\n  %U",
+                           format_fib_forw_chain_type,
+                           fib_entry_delegate_type_to_chain_type(fdt),
+                           format_dpo_id, &fed->fd_dpo, 2);
+                s = format(s, "\n");
+            });
+        }
+    }
+
+    if (level >= FIB_ENTRY_FORMAT_DETAIL2)
+    {
+        s = format(s, "\nchildren:");
+        s = fib_node_children_format(fib_entry->fe_node.fn_children, s);
+    }
+
+    return (s);
+}
+
+static fib_entry_t*
+fib_entry_from_fib_node (fib_node_t *node)
+{
+#if CLIB_DEBUG > 0
+    ASSERT(FIB_NODE_TYPE_ENTRY == node->fn_type);
+#endif
+    return ((fib_entry_t*)node);
+}
+
+static void
+fib_entry_last_lock_gone (fib_node_t *node)
+{
+    fib_entry_delegate_type_t fdt;
+    fib_entry_delegate_t *fed;
+    fib_entry_t *fib_entry;
+
+    fib_entry = fib_entry_from_fib_node(node);
+
+    FOR_EACH_DELEGATE_CHAIN(fib_entry, fdt, fed,
+    {
+	dpo_reset(&fed->fd_dpo);
+        fib_entry_delegate_remove(fib_entry, fdt);
+    });
+
+    FIB_ENTRY_DBG(fib_entry, "last-lock");
+
+    fib_node_deinit(&fib_entry->fe_node);
+    // FIXME -RR Backwalk
+
+    ASSERT(0 == vec_len(fib_entry->fe_delegates));
+    vec_free(fib_entry->fe_delegates);
+    pool_put(fib_entry_pool, fib_entry);
+}
+
+static fib_entry_src_t*
+fib_entry_get_best_src_i (const fib_entry_t *fib_entry)
+{
+    fib_entry_src_t *bsrc;
+
+    /*
+     * the enum of sources is deliberately arranged in priority order
+     */
+    if (0 == vec_len(fib_entry->fe_srcs))
+    {
+	bsrc = NULL;
+    }
+    else
+    {
+	bsrc = vec_elt_at_index(fib_entry->fe_srcs, 0);
+    }
+
+    return (bsrc);
+}
+
+static fib_source_t
+fib_entry_src_get_source (const fib_entry_src_t *esrc)
+{
+    if (NULL != esrc)
+    {
+	return (esrc->fes_src);
+    }
+    return (FIB_SOURCE_MAX);
+}
+
+static fib_entry_flag_t
+fib_entry_src_get_flags (const fib_entry_src_t *esrc)
+{
+    if (NULL != esrc)
+    {
+	return (esrc->fes_entry_flags);
+    }
+    return (FIB_ENTRY_FLAG_NONE);
+}
+
+fib_entry_flag_t
+fib_entry_get_flags (fib_node_index_t fib_entry_index)
+{
+    return (fib_entry_get_flags_i(fib_entry_get(fib_entry_index)));
+}
+
+/*
+ * fib_entry_back_walk_notify
+ *
+ * A back walk has reach this entry.
+ */
+static fib_node_back_walk_rc_t
+fib_entry_back_walk_notify (fib_node_t *node,
+			    fib_node_back_walk_ctx_t *ctx)
+{
+    fib_entry_t *fib_entry;
+
+    fib_entry = fib_entry_from_fib_node(node);
+
+    if (FIB_NODE_BW_REASON_FLAG_EVALUATE & ctx->fnbw_reason        ||
+        FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE & ctx->fnbw_reason      ||
+        FIB_NODE_BW_REASON_FLAG_ADJ_DOWN & ctx->fnbw_reason        ||
+	FIB_NODE_BW_REASON_FLAG_INTERFACE_UP & ctx->fnbw_reason    ||
+	FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN & ctx->fnbw_reason  ||
+	FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE & ctx->fnbw_reason)
+    {
+	fib_entry_src_action_reactivate(fib_entry,
+                                        fib_entry_get_best_source(
+                                            fib_entry_get_index(fib_entry)));
+    }
+
+    /*
+     * all other walk types can be reclassifed to a re-evaluate to
+     * all recursive dependents.
+     * By reclassifying we ensure that should any of these walk types meet
+     * they can be merged.
+     */
+    ctx->fnbw_reason = FIB_NODE_BW_REASON_FLAG_EVALUATE;
+
+    /*
+     * ... and nothing is forced sync from now on.
+     */
+    ctx->fnbw_flags &= ~FIB_NODE_BW_FLAG_FORCE_SYNC;
+
+    /*
+     * propagate the backwalk further if we haven't already reached the
+     * maximum depth.
+     */
+    fib_walk_sync(FIB_NODE_TYPE_ENTRY,
+		  fib_entry_get_index(fib_entry),
+		  ctx);
+
+    return (FIB_NODE_BACK_WALK_CONTINUE);
+}
+
+static void
+fib_entry_show_memory (void)
+{
+    u32 n_srcs = 0, n_exts = 0;
+    fib_entry_src_t *esrc;
+    fib_entry_t *entry;
+
+    fib_show_memory_usage("Entry",
+			  pool_elts(fib_entry_pool),
+			  pool_len(fib_entry_pool),
+			  sizeof(fib_entry_t));
+
+    pool_foreach(entry, fib_entry_pool,
+    ({
+	n_srcs += vec_len(entry->fe_srcs);
+	vec_foreach(esrc, entry->fe_srcs)
+	{
+	    n_exts += vec_len(esrc->fes_path_exts);
+	}
+    }));
+
+    fib_show_memory_usage("Entry Source",
+			  n_srcs, n_srcs, sizeof(fib_entry_src_t));
+    fib_show_memory_usage("Entry Path-Extensions",
+			  n_exts, n_exts,
+			  sizeof(fib_path_ext_t));
+}
+
+/*
+ * The FIB path-list's graph node virtual function table
+ */
+static const fib_node_vft_t fib_entry_vft = {
+    .fnv_get = fib_entry_get_node,
+    .fnv_last_lock = fib_entry_last_lock_gone,
+    .fnv_back_walk = fib_entry_back_walk_notify,
+    .fnv_mem_show = fib_entry_show_memory,
+};
+
+/**
+ * @brief Contribute the set of Adjacencies that this entry forwards with
+ * to build the uRPF list of its children
+ */
+void
+fib_entry_contribute_urpf (fib_node_index_t entry_index,
+			   index_t urpf)
+{
+    fib_entry_t *fib_entry;
+
+    fib_entry = fib_entry_get(entry_index);
+
+    return (fib_path_list_contribute_urpf(fib_entry->fe_parent, urpf));
+}
+
+/*
+ * fib_entry_contribute_forwarding
+ *
+ * Get an lock the forwarding information (DPO) contributed by the FIB entry.
+ */
+void
+fib_entry_contribute_forwarding (fib_node_index_t fib_entry_index,
+				 fib_forward_chain_type_t fct,
+				 dpo_id_t *dpo)
+{
+    fib_entry_delegate_t *fed;
+    fib_entry_t *fib_entry;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    if (fct == fib_entry_get_default_chain_type(fib_entry))
+    {
+        dpo_copy(dpo, &fib_entry->fe_lb);
+    }
+    else
+    {
+        fed = fib_entry_delegate_get(fib_entry,
+                                     fib_entry_chain_type_to_delegate_type(fct));
+
+        if (NULL == fed)
+        {
+            fed = fib_entry_delegate_find_or_add(
+                      fib_entry,
+                      fib_entry_chain_type_to_delegate_type(fct));
+            /*
+             * on-demand create eos/non-eos.
+             * There is no on-demand delete because:
+             *   - memory versus complexity & reliability:
+             *      leaving unrequired [n]eos LB arounds wastes memory, cleaning
+             *      then up on the right trigger is more code. i favour the latter.
+             */
+            fib_entry_src_mk_lb(fib_entry,
+                                fib_entry_get_best_src_i(fib_entry),
+                                fct,
+                                &fed->fd_dpo);
+        }
+
+        dpo_copy(dpo, &fed->fd_dpo);
+    }
+}
+
+const dpo_id_t *
+fib_entry_contribute_ip_forwarding (fib_node_index_t fib_entry_index)
+{
+    fib_forward_chain_type_t fct;
+    fib_entry_t *fib_entry;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+    fct = fib_entry_get_default_chain_type(fib_entry);
+
+    ASSERT((fct == FIB_FORW_CHAIN_TYPE_UNICAST_IP4 ||
+            fct == FIB_FORW_CHAIN_TYPE_UNICAST_IP6));
+
+    return (&fib_entry->fe_lb);
+}
+
+adj_index_t
+fib_entry_get_adj (fib_node_index_t fib_entry_index)
+{
+    const dpo_id_t *dpo;
+
+    dpo = fib_entry_contribute_ip_forwarding(fib_entry_index);
+    dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
+
+    if (dpo_is_adj(dpo))
+    {
+	return (dpo->dpoi_index);
+    }
+    return (ADJ_INDEX_INVALID);
+}
+
+fib_node_index_t
+fib_entry_get_path_list (fib_node_index_t fib_entry_index)
+{
+    fib_entry_t *fib_entry;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    return (fib_entry->fe_parent);
+}
+
+u32
+fib_entry_child_add (fib_node_index_t fib_entry_index,
+		     fib_node_type_t child_type,
+		     fib_node_index_t child_index)
+{
+    return (fib_node_child_add(FIB_NODE_TYPE_ENTRY,
+                               fib_entry_index,
+                               child_type,
+                               child_index));
+};
+
+void
+fib_entry_child_remove (fib_node_index_t fib_entry_index,
+			u32 sibling_index)
+{
+    fib_node_child_remove(FIB_NODE_TYPE_ENTRY,
+                          fib_entry_index,
+                          sibling_index);
+
+    if (0 == fib_node_get_n_children(FIB_NODE_TYPE_ENTRY,
+                                     fib_entry_index))
+    {
+        /*
+         * if there are no children left then there is no reason to keep
+         * the non-default forwarding chains. those chains are built only
+         * because the children want them.
+         */
+        fib_entry_delegate_type_t fdt;
+        fib_entry_delegate_t *fed;
+        fib_entry_t *fib_entry;
+
+        fib_entry = fib_entry_get(fib_entry_index);
+
+        FOR_EACH_DELEGATE_CHAIN(fib_entry, fdt, fed,
+        {
+            dpo_reset(&fed->fd_dpo);
+            fib_entry_delegate_remove(fib_entry, fdt);
+        });
+    }
+}
+
+static fib_entry_t *
+fib_entry_alloc (u32 fib_index,
+		 const fib_prefix_t *prefix,
+		 fib_node_index_t *fib_entry_index)
+{
+    fib_entry_t *fib_entry;
+    fib_prefix_t *fep;
+
+    pool_get(fib_entry_pool, fib_entry);
+    memset(fib_entry, 0, sizeof(*fib_entry));
+
+    fib_node_init(&fib_entry->fe_node,
+		  FIB_NODE_TYPE_ENTRY);
+
+    fib_entry->fe_fib_index = fib_index;
+
+    /*
+     * the one time we need to update the const prefix is when
+     * the entry is first created
+     */
+    fep = (fib_prefix_t*)&(fib_entry->fe_prefix);
+    *fep = *prefix;
+
+    if (FIB_PROTOCOL_MPLS == fib_entry->fe_prefix.fp_proto)
+    {
+	fep->fp_len = 21;
+	if (MPLS_NON_EOS == fep->fp_eos)
+	{
+	    fep->fp_payload_proto = DPO_PROTO_MPLS;
+	}
+    	ASSERT(DPO_PROTO_NONE != fib_entry->fe_prefix.fp_payload_proto);
+    }
+
+    dpo_reset(&fib_entry->fe_lb);
+
+    *fib_entry_index = fib_entry_get_index(fib_entry);
+
+    FIB_ENTRY_DBG(fib_entry, "alloc");
+
+    return (fib_entry);
+}
+
+static void
+fib_entry_post_flag_update_actions (fib_entry_t *fib_entry,
+				    fib_source_t source,
+				    fib_entry_flag_t old_flags)
+{
+    /*
+     * handle changes to attached export for import entries
+     */
+    int is_import  = (FIB_ENTRY_FLAG_IMPORT & fib_entry_get_flags_i(fib_entry));
+    int was_import = (FIB_ENTRY_FLAG_IMPORT & old_flags);
+
+    if (!was_import && is_import)
+    {
+	/*
+	 * transition from not exported to exported
+	 */
+
+	/*
+	 * there is an assumption here that the entry resolves via only
+	 * one interface and that it is the cross VRF interface.
+	 */
+	u32 sw_if_index = fib_path_list_get_resolving_interface(fib_entry->fe_parent);
+
+	fib_attached_export_import(fib_entry,
+				   fib_table_get_index_for_sw_if_index(
+				       fib_entry_get_proto(fib_entry),
+                                       sw_if_index));
+    }
+    else if (was_import && !is_import)
+    {
+	/*
+	 * transition from exported to not exported
+	 */
+	fib_attached_export_purge(fib_entry);
+    }
+    /*
+     * else
+     *   no change. nothing to do.
+     */
+
+    /*
+     * handle changes to attached export for export entries
+     */
+    int is_attached  = (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(fib_entry));
+    int was_attached = (FIB_ENTRY_FLAG_ATTACHED & old_flags);
+
+    if (!was_attached && is_attached)
+    {
+	/*
+	 * transition to attached. time to export
+	 */
+	// FIXME
+    }
+    // else FIXME
+}
+
+static void
+fib_entry_post_install_actions (fib_entry_t *fib_entry,
+				fib_source_t source,
+				fib_entry_flag_t old_flags)
+{
+    fib_entry_post_flag_update_actions(fib_entry, source, old_flags);
+    fib_entry_src_action_installed(fib_entry, source);
+}
+
+fib_node_index_t
+fib_entry_create (u32 fib_index,
+		  const fib_prefix_t *prefix,
+		  fib_source_t source,
+		  fib_entry_flag_t flags,
+		  const fib_route_path_t *paths)
+{
+    fib_node_index_t fib_entry_index;
+    fib_entry_t *fib_entry;
+
+    ASSERT(0 < vec_len(paths));
+
+    fib_entry = fib_entry_alloc(fib_index, prefix, &fib_entry_index);
+
+    /*
+     * since this is a new entry create, we don't need to check for winning
+     * sources - there is only one.
+     */
+    fib_entry = fib_entry_src_action_add(fib_entry, source, flags,
+                                         drop_dpo_get(
+                                             fib_proto_to_dpo(
+                                                 fib_entry_get_proto(fib_entry))));
+    fib_entry_src_action_path_swap(fib_entry,
+				   source,
+				   flags,
+				   paths);
+    /*
+     * handle possible realloc's by refetching the pointer
+     */
+    fib_entry = fib_entry_get(fib_entry_index);
+    fib_entry_src_action_activate(fib_entry, source);
+
+    fib_entry_post_install_actions(fib_entry, source, FIB_ENTRY_FLAG_NONE);
+
+    return (fib_entry_index);
+}
+
+fib_node_index_t
+fib_entry_create_special (u32 fib_index,
+			  const fib_prefix_t *prefix,
+			  fib_source_t source,
+			  fib_entry_flag_t flags,
+			  const dpo_id_t *dpo)
+{
+    fib_node_index_t fib_entry_index;
+    fib_entry_t *fib_entry;
+
+    /*
+     * create and initiliase the new enty
+     */
+    fib_entry = fib_entry_alloc(fib_index, prefix, &fib_entry_index);
+
+    /*
+     * create the path-list
+     */
+    fib_entry = fib_entry_src_action_add(fib_entry, source, flags, dpo);
+    fib_entry_src_action_activate(fib_entry, source);
+
+    fib_entry_post_install_actions(fib_entry, source, FIB_ENTRY_FLAG_NONE);
+
+    return (fib_entry_index);
+}
+
+static void
+fib_entry_post_update_actions (fib_entry_t *fib_entry,
+			       fib_source_t source,
+			       fib_entry_flag_t old_flags)
+{
+    /*
+     * backwalk to children to inform then of the change to forwarding.
+     */
+    fib_node_back_walk_ctx_t bw_ctx = {
+	.fnbw_reason = FIB_NODE_BW_REASON_FLAG_EVALUATE,
+    };
+
+    fib_walk_sync(FIB_NODE_TYPE_ENTRY, fib_entry_get_index(fib_entry), &bw_ctx);
+
+    /*
+     * then inform any covered prefixes
+     */
+    fib_entry_cover_update_notify(fib_entry);
+
+    fib_entry_post_install_actions(fib_entry, source, old_flags);
+}
+
+static void
+fib_entry_source_change (fib_entry_t *fib_entry,
+			 fib_source_t best_source,
+			 fib_source_t new_source,
+			 fib_entry_flag_t old_flags)
+{
+    /*
+     * if the path list for the source passed is invalid,
+     * then we need to create a new one. else we are updating
+     * an existing.
+     */
+    if (new_source < best_source)
+    {
+	/*
+	 * we have a new winning source.
+	 */
+	fib_entry_src_action_deactivate(fib_entry, best_source);
+	fib_entry_src_action_activate(fib_entry, new_source);
+    }
+    else if (new_source > best_source)
+    {
+	/*
+	 * the new source loses. nothing to do here.
+	 * the data from the source is saved in the path-list created
+	 */
+	return;
+    }
+    else
+    {
+	/*
+	 * the new source is one this entry already has.
+	 * But the path-list was updated, which will contribute new forwarding,
+	 * so install it.
+	 */
+	fib_entry_src_action_deactivate(fib_entry, new_source);
+	fib_entry_src_action_activate(fib_entry, new_source);
+    }
+
+    fib_entry_post_update_actions(fib_entry, new_source, old_flags);
+}
+
+void
+fib_entry_special_add (fib_node_index_t fib_entry_index,
+		       fib_source_t source,
+		       fib_entry_flag_t flags,
+		       const dpo_id_t *dpo)
+{
+    fib_source_t best_source;
+    fib_entry_flag_t bflags;
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *bsrc;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    bsrc = fib_entry_get_best_src_i(fib_entry);
+    best_source = fib_entry_src_get_source(bsrc);
+    bflags = fib_entry_src_get_flags(bsrc);
+
+    fib_entry = fib_entry_src_action_add(fib_entry, source, flags, dpo);
+    fib_entry_source_change(fib_entry, best_source, source, bflags);
+}
+
+void
+fib_entry_special_update (fib_node_index_t fib_entry_index,
+			  fib_source_t source,
+			  fib_entry_flag_t flags,
+			  const dpo_id_t *dpo)
+{
+    fib_source_t best_source;
+    fib_entry_flag_t bflags;
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *bsrc;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    bsrc = fib_entry_get_best_src_i(fib_entry);
+    best_source = fib_entry_src_get_source(bsrc);
+    bflags = fib_entry_src_get_flags(bsrc);
+
+    fib_entry = fib_entry_src_action_update(fib_entry, source, flags, dpo);
+    fib_entry_source_change(fib_entry, best_source, source, bflags);
+}
+
+
+void
+fib_entry_path_add (fib_node_index_t fib_entry_index,
+		    fib_source_t source,
+		    fib_entry_flag_t flags,
+		    const fib_route_path_t *rpath)
+{
+    fib_source_t best_source;
+    fib_entry_flag_t bflags;
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *bsrc;
+
+    ASSERT(1 == vec_len(rpath));
+
+    fib_entry = fib_entry_get(fib_entry_index);
+    ASSERT(NULL != fib_entry);
+
+    bsrc = fib_entry_get_best_src_i(fib_entry);
+    best_source = fib_entry_src_get_source(bsrc);
+    bflags = fib_entry_src_get_flags(bsrc);
+    
+    fib_entry = fib_entry_src_action_path_add(fib_entry, source, flags, rpath);
+
+    /*
+     * if the path list for the source passed is invalid,
+     * then we need to create a new one. else we are updating
+     * an existing.
+     */
+    if (source < best_source)
+    {
+	/*
+	 * we have a new winning source.
+	 */
+	fib_entry_src_action_deactivate(fib_entry, best_source);
+	fib_entry_src_action_activate(fib_entry, source);
+    }
+    else if (source > best_source)
+    {
+	/*
+	 * the new source loses. nothing to do here.
+	 * the data from the source is saved in the path-list created
+	 */
+	return;
+    }
+    else
+    {
+	/*
+	 * the new source is one this entry already has.
+	 * But the path-list was updated, which will contribute new forwarding,
+	 * so install it.
+	 */
+	fib_entry_src_action_deactivate(fib_entry, source);
+	fib_entry_src_action_activate(fib_entry, source);
+    }
+
+    fib_entry_post_update_actions(fib_entry, source, bflags);
+}
+
+/*
+ * fib_entry_path_remove
+ *
+ * remove a path from the entry.
+ * return the fib_entry's index if it is still present, INVALID otherwise.
+ */
+fib_entry_src_flag_t
+fib_entry_path_remove (fib_node_index_t fib_entry_index,
+		       fib_source_t source,
+		       const fib_route_path_t *rpath)
+{
+    fib_entry_src_flag_t sflag;
+    fib_source_t best_source;
+    fib_entry_flag_t bflags;
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *bsrc;
+
+    ASSERT(1 == vec_len(rpath));
+
+    fib_entry = fib_entry_get(fib_entry_index);
+    ASSERT(NULL != fib_entry);
+
+    bsrc = fib_entry_get_best_src_i(fib_entry);
+    best_source = fib_entry_src_get_source(bsrc);
+    bflags = fib_entry_src_get_flags(bsrc);
+
+    sflag = fib_entry_src_action_path_remove(fib_entry, source, rpath);
+
+    /*
+     * if the path list for the source passed is invalid,
+     * then we need to create a new one. else we are updating
+     * an existing.
+     */
+    if (source < best_source )
+    {
+	/*
+	 * Que! removing a path from a source that is better than the
+	 * one this entry is using.
+	 */
+	ASSERT(0);
+    }
+    else if (source > best_source )
+    {
+	/*
+	 * the source is not the best. nothing to do.
+	 */
+	return (FIB_ENTRY_SRC_FLAG_ADDED);
+    }
+    else
+    {
+	/*
+	 * removing a path from the path-list we were using.
+	 */
+	if (!(FIB_ENTRY_SRC_FLAG_ADDED & sflag))
+	{
+	    /*
+	     * the last path from the source was removed.
+	     * fallback to lower source
+	     */
+	    bsrc = fib_entry_get_best_src_i(fib_entry);
+	    best_source = fib_entry_src_get_source(bsrc);
+
+	    if (FIB_SOURCE_MAX == best_source) {
+		/*
+		 * no more sources left. this entry is toast.
+		 */
+		fib_entry_src_action_uninstall(fib_entry);
+		fib_entry_post_flag_update_actions(fib_entry, source, bflags);
+
+		return (FIB_ENTRY_SRC_FLAG_NONE);
+	    }
+	    else
+	    {
+		fib_entry_src_action_activate(fib_entry, best_source);
+		source = best_source;
+	    }
+	}
+	else
+	{
+	    /*
+	     * re-install the new forwarding information
+	     */
+	    fib_entry_src_action_deactivate(fib_entry, source);
+	    fib_entry_src_action_activate(fib_entry, source);
+	}
+    }
+
+    fib_entry_post_update_actions(fib_entry, source, bflags);
+
+    /*
+     * still have sources
+     */
+    return (FIB_ENTRY_SRC_FLAG_ADDED);
+}
+
+/*
+ * fib_entry_special_remove
+ *
+ * remove a special source from the entry.
+ * return the fib_entry's index if it is still present, INVALID otherwise.
+ */
+fib_entry_src_flag_t
+fib_entry_special_remove (fib_node_index_t fib_entry_index,
+			  fib_source_t source)
+{
+    fib_entry_src_flag_t sflag;
+    fib_source_t best_source;
+    fib_entry_flag_t bflags;
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *bsrc;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+    ASSERT(NULL != fib_entry);
+
+    bsrc = fib_entry_get_best_src_i(fib_entry);
+    best_source = fib_entry_src_get_source(bsrc);
+    bflags = fib_entry_src_get_flags(bsrc);
+
+    sflag = fib_entry_src_action_remove(fib_entry, source);
+
+    /*
+     * if the path list for the source passed is invalid,
+     * then we need to create a new one. else we are updating
+     * an existing.
+     */
+    if (source < best_source )
+    {
+	/*
+	 * Que! removing a path from a source that is better than the
+	 * one this entry is using. This can only mean it is a source
+         * this prefix does not have.
+	 */
+        return (FIB_ENTRY_SRC_FLAG_ADDED);
+    }
+    else if (source > best_source ) {
+	/*
+	 * the source is not the best. nothing to do.
+	 */
+	return (FIB_ENTRY_SRC_FLAG_ADDED);
+    }
+    else
+    {
+	if (!(FIB_ENTRY_SRC_FLAG_ADDED & sflag))
+	{
+	    /*
+	     * the source was removed. use the next best.
+	     */
+	    bsrc = fib_entry_get_best_src_i(fib_entry);
+	    best_source = fib_entry_src_get_source(bsrc);
+
+	    if (FIB_SOURCE_MAX == best_source) {
+		/*
+		 * no more sources left. this entry is toast.
+		 */
+		fib_entry_src_action_uninstall(fib_entry);
+		fib_entry_post_flag_update_actions(fib_entry, source, bflags);
+
+		return (FIB_ENTRY_SRC_FLAG_NONE);
+	    }
+	    else
+	    {
+		fib_entry_src_action_activate(fib_entry, best_source);
+		source = best_source;
+	    }
+	}
+	else
+	{
+	    /*
+	     * re-install the new forwarding information
+	     */
+	    fib_entry_src_action_reactivate(fib_entry, source);
+	}
+    }
+
+    fib_entry_post_update_actions(fib_entry, source, bflags);
+
+    /*
+     * still have sources
+     */
+    return (FIB_ENTRY_SRC_FLAG_ADDED);
+}
+
+/**
+ * fib_entry_delete
+ *
+ * The source is withdrawing all the paths it provided
+ */
+fib_entry_src_flag_t
+fib_entry_delete (fib_node_index_t fib_entry_index,
+		  fib_source_t source)
+{
+    return (fib_entry_special_remove(fib_entry_index, source));
+}
+
+/**
+ * fib_entry_update
+ *
+ * The source has provided a new set of paths that will replace the old.
+ */
+void
+fib_entry_update (fib_node_index_t fib_entry_index,
+		  fib_source_t source,
+		  fib_entry_flag_t flags,
+		  const fib_route_path_t *paths)
+{
+    fib_source_t best_source;
+    fib_entry_flag_t bflags;
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *bsrc;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+    ASSERT(NULL != fib_entry);
+
+    bsrc = fib_entry_get_best_src_i(fib_entry);
+    best_source = fib_entry_src_get_source(bsrc);
+    bflags = fib_entry_src_get_flags(bsrc);
+
+    fib_entry_src_action_path_swap(fib_entry,
+				   source,
+				   flags,
+				   paths);
+    /*
+     * handle possible realloc's by refetching the pointer
+     */
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    /*
+     * if the path list for the source passed is invalid,
+     * then we need to create a new one. else we are updating
+     * an existing.
+     */
+    if (source < best_source)
+    {
+	/*
+	 * we have a new winning source.
+	 */
+	fib_entry_src_action_deactivate(fib_entry, best_source);
+	fib_entry_src_action_activate(fib_entry, source);
+    }
+    else if (source > best_source) {
+	/*
+	 * the new source loses. nothing to do here.
+	 * the data from the source is saved in the path-list created
+	 */
+	return;
+    }
+    else
+    {
+	/*
+	 * the new source is one this entry already has.
+	 * But the path-list was updated, which will contribute new forwarding,
+	 * so install it.
+	 */
+	fib_entry_src_action_deactivate(fib_entry, source);
+	fib_entry_src_action_activate(fib_entry, source);
+    }
+
+    fib_entry_post_update_actions(fib_entry, source, bflags);
+}
+
+
+/*
+ * fib_entry_cover_changed
+ *
+ * this entry is tracking its cover and that cover has changed.
+ */
+void
+fib_entry_cover_changed (fib_node_index_t fib_entry_index)
+{
+    fib_entry_src_cover_res_t res = {
+	.install = !0,
+	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
+    };
+    fib_source_t source, best_source;
+    fib_entry_flag_t bflags;
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *esrc;
+    u32 index;
+
+    bflags = FIB_ENTRY_FLAG_NONE;
+    best_source = FIB_SOURCE_FIRST;
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    fib_attached_export_cover_change(fib_entry);
+
+    /*
+     * propagate the notificuation to each of the added sources
+     */
+    index = 0;
+    FOR_EACH_SRC_ADDED(fib_entry, esrc, source,
+    ({
+	if (0 == index)
+	{
+	    /*
+	     * only the best source gets to set the back walk flags
+	     */
+	    res = fib_entry_src_action_cover_change(fib_entry, source);
+            bflags = fib_entry_src_get_flags(esrc);
+            best_source = fib_entry_src_get_source(esrc);
+	}
+	else
+	{
+	    fib_entry_src_action_cover_change(fib_entry, source);
+	}
+	index++;
+    }));
+
+    if (res.install)
+    {
+	fib_entry_src_action_reactivate(fib_entry,
+					fib_entry_src_get_source(
+					    fib_entry_get_best_src_i(fib_entry)));
+        fib_entry_post_install_actions(fib_entry, best_source, bflags);
+    }
+    else
+    {
+	fib_entry_src_action_uninstall(fib_entry);
+    }
+
+    if (FIB_NODE_BW_REASON_FLAG_NONE != res.bw_reason)
+    {
+	/*
+	 * time for walkies fido.
+	 */
+	fib_node_back_walk_ctx_t bw_ctx = {
+	    .fnbw_reason = res.bw_reason,
+        };
+
+	fib_walk_sync(FIB_NODE_TYPE_ENTRY, fib_entry_index, &bw_ctx);
+    }
+}
+
+/*
+ * fib_entry_cover_updated
+ *
+ * this entry is tracking its cover and that cover has been updated
+ * (i.e. its forwarding information has changed).
+ */
+void
+fib_entry_cover_updated (fib_node_index_t fib_entry_index)
+{
+    fib_entry_src_cover_res_t res = {
+	.install = !0,
+	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
+    };
+    fib_source_t source, best_source;
+    fib_entry_flag_t bflags;
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *esrc;
+    u32 index;
+
+    bflags = FIB_ENTRY_FLAG_NONE;
+    best_source = FIB_SOURCE_FIRST;
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    fib_attached_export_cover_update(fib_entry);
+
+    /*
+     * propagate the notificuation to each of the added sources
+     */
+    index = 0;
+    FOR_EACH_SRC_ADDED(fib_entry, esrc, source,
+    ({
+	if (0 == index)
+	{
+	    /*
+	     * only the best source gets to set the back walk flags
+	     */
+	    res = fib_entry_src_action_cover_update(fib_entry, source);
+            bflags = fib_entry_src_get_flags(esrc);
+            best_source = fib_entry_src_get_source(esrc);
+	}
+	else
+	{
+	    fib_entry_src_action_cover_update(fib_entry, source);
+	}
+	index++;
+    }));
+
+    if (res.install)
+    {
+	fib_entry_src_action_reactivate(fib_entry,
+					fib_entry_src_get_source(
+					    fib_entry_get_best_src_i(fib_entry)));
+        fib_entry_post_install_actions(fib_entry, best_source, bflags);
+    }
+    else
+    {
+	fib_entry_src_action_uninstall(fib_entry);
+    }
+
+    if (FIB_NODE_BW_REASON_FLAG_NONE != res.bw_reason)
+    {
+	/*
+	 * time for walkies fido.
+	 */
+	fib_node_back_walk_ctx_t bw_ctx = {
+	    .fnbw_reason = res.bw_reason,
+        };
+
+	fib_walk_sync(FIB_NODE_TYPE_ENTRY, fib_entry_index, &bw_ctx);
+    }
+}
+
+int
+fib_entry_recursive_loop_detect (fib_node_index_t entry_index,
+				 fib_node_index_t **entry_indicies)
+{
+    fib_entry_t *fib_entry;
+    int was_looped, is_looped;
+
+    fib_entry = fib_entry_get(entry_index);
+
+    if (FIB_NODE_INDEX_INVALID != fib_entry->fe_parent)
+    {
+	fib_node_index_t *entries = *entry_indicies;
+
+	vec_add1(entries, entry_index);
+	was_looped = fib_path_list_is_looped(fib_entry->fe_parent);
+	is_looped = fib_path_list_recursive_loop_detect(fib_entry->fe_parent,
+							&entries);
+
+	*entry_indicies = entries;
+
+	if (!!was_looped != !!is_looped)
+	{
+	    /*
+	     * re-evaluate all the entry's forwarding
+	     * NOTE: this is an inplace modify
+	     */
+            fib_entry_delegate_type_t fdt;
+            fib_entry_delegate_t *fed;
+
+            FOR_EACH_DELEGATE_CHAIN(fib_entry, fdt, fed,
+            {
+                fib_entry_src_mk_lb(fib_entry,
+                                    fib_entry_get_best_src_i(fib_entry),
+                                    fib_entry_delegate_type_to_chain_type(fdt),
+                                    &fed->fd_dpo);
+	    });
+	}
+    }
+    else
+    {
+	/*
+	 * the entry is currently not linked to a path-list. this happens
+	 * when it is this entry that is re-linking path-lists and has thus
+	 * broken the loop
+	 */
+	is_looped = 0;
+    }
+
+    return (is_looped);
+}
+
+u32
+fib_entry_get_resolving_interface (fib_node_index_t entry_index)
+{
+    fib_entry_t *fib_entry;
+
+    fib_entry = fib_entry_get(entry_index);
+
+    return (fib_path_list_get_resolving_interface(fib_entry->fe_parent));
+}
+
+fib_source_t
+fib_entry_get_best_source (fib_node_index_t entry_index)
+{
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *bsrc;
+
+    fib_entry = fib_entry_get(entry_index);
+
+    bsrc = fib_entry_get_best_src_i(fib_entry);
+    return (fib_entry_src_get_source(bsrc));
+}
+
+static int
+fib_ip4_address_compare (const ip4_address_t * a1,
+                         const ip4_address_t * a2)
+{
+    /*
+     * IP addresses are unsiged ints. the return value here needs to be signed
+     * a simple subtraction won't cut it.
+     * If the addresses are the same, the sort order is undefiend, so phoey.
+     */
+    return ((clib_net_to_host_u32(a1->data_u32) >
+	     clib_net_to_host_u32(a2->data_u32) ) ?
+	    1 : -1);
+}
+
+static int
+fib_ip6_address_compare (const ip6_address_t * a1,
+                         const ip6_address_t * a2)
+{
+  int i;
+  for (i = 0; i < ARRAY_LEN (a1->as_u16); i++)
+  {
+      int cmp = (clib_net_to_host_u16 (a1->as_u16[i]) -
+		 clib_net_to_host_u16 (a2->as_u16[i]));
+      if (cmp != 0)
+	  return cmp;
+  }
+  return 0;
+}
+
+static int
+fib_entry_cmp (fib_node_index_t fib_entry_index1,
+	       fib_node_index_t fib_entry_index2)
+{
+    fib_entry_t *fib_entry1, *fib_entry2;
+    int cmp = 0;
+
+    fib_entry1 = fib_entry_get(fib_entry_index1);
+    fib_entry2 = fib_entry_get(fib_entry_index2);
+
+    switch (fib_entry1->fe_prefix.fp_proto)
+    {
+    case FIB_PROTOCOL_IP4:
+        cmp = fib_ip4_address_compare(&fib_entry1->fe_prefix.fp_addr.ip4,
+                                      &fib_entry2->fe_prefix.fp_addr.ip4);
+        break;
+    case FIB_PROTOCOL_IP6:
+        cmp = fib_ip6_address_compare(&fib_entry1->fe_prefix.fp_addr.ip6,
+                                      &fib_entry2->fe_prefix.fp_addr.ip6);
+        break;
+    case FIB_PROTOCOL_MPLS:
+	cmp = (fib_entry1->fe_prefix.fp_label - fib_entry2->fe_prefix.fp_label);
+
+	if (0 == cmp)
+	{
+	    cmp = (fib_entry1->fe_prefix.fp_eos - fib_entry2->fe_prefix.fp_eos);
+	}
+        break;
+    }
+
+    if (0 == cmp) {
+	cmp = (fib_entry1->fe_prefix.fp_len - fib_entry2->fe_prefix.fp_len);
+    }
+    return (cmp);   
+}
+
+int
+fib_entry_cmp_for_sort (void *i1, void *i2)
+{
+    fib_node_index_t *fib_entry_index1 = i1, *fib_entry_index2 = i2;
+
+    return (fib_entry_cmp(*fib_entry_index1,
+			  *fib_entry_index2));
+}
+
+void
+fib_entry_lock (fib_node_index_t fib_entry_index)
+{
+    fib_entry_t *fib_entry;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    fib_node_lock(&fib_entry->fe_node);
+}
+
+void
+fib_entry_unlock (fib_node_index_t fib_entry_index)
+{
+    fib_entry_t *fib_entry;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    fib_node_unlock(&fib_entry->fe_node);
+}
+
+void
+fib_entry_module_init (void)
+{
+    fib_node_register_type (FIB_NODE_TYPE_ENTRY, &fib_entry_vft);
+}
+
+void
+fib_entry_encode (fib_node_index_t fib_entry_index,
+		  fib_route_path_encode_t **api_rpaths)
+{
+    fib_entry_t *fib_entry;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+    fib_path_list_walk(fib_entry->fe_parent, fib_path_encode, api_rpaths);
+}
+
+void
+fib_entry_get_prefix (fib_node_index_t fib_entry_index,
+		      fib_prefix_t *pfx)
+{
+    fib_entry_t *fib_entry;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+    *pfx = fib_entry->fe_prefix;
+}
+
+u32
+fib_entry_get_fib_index (fib_node_index_t fib_entry_index)
+{
+    fib_entry_t *fib_entry;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    return (fib_entry->fe_fib_index);
+}
+
+u32
+fib_entry_pool_size (void)
+{
+    return (pool_elts(fib_entry_pool));
+}
+
+static clib_error_t *
+show_fib_entry_command (vlib_main_t * vm,
+			unformat_input_t * input,
+			vlib_cli_command_t * cmd)
+{
+    fib_node_index_t fei;
+
+    if (unformat (input, "%d", &fei))
+    {
+	/*
+	 * show one in detail
+	 */
+	if (!pool_is_free_index(fib_entry_pool, fei))
+	{
+	    vlib_cli_output (vm, "%d@%U",
+			     fei,
+			     format_fib_entry, fei,
+			     FIB_ENTRY_FORMAT_DETAIL2);
+	}
+	else
+	{
+	    vlib_cli_output (vm, "entry %d invalid", fei);
+	}
+    }
+    else
+    {
+	/*
+	 * show all
+	 */
+	vlib_cli_output (vm, "FIB Entries:");
+	pool_foreach_index(fei, fib_entry_pool,
+        ({
+	    vlib_cli_output (vm, "%d@%U",
+			     fei,
+			     format_fib_entry, fei,
+			     FIB_ENTRY_FORMAT_BRIEF);
+	}));
+    }
+
+    return (NULL);
+}
+
+VLIB_CLI_COMMAND (show_fib_entry, static) = {
+  .path = "show fib entry",
+  .function = show_fib_entry_command,
+  .short_help = "show fib entry",
+};
diff --git a/src/vnet/fib/fib_entry.h b/src/vnet/fib/fib_entry.h
new file mode 100644
index 00000000..44a5f2e6
--- /dev/null
+++ b/src/vnet/fib/fib_entry.h
@@ -0,0 +1,530 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __FIB_ENTRY_H__
+#define __FIB_ENTRY_H__
+
+#include <vnet/fib/fib_node.h>
+#include <vnet/fib/fib_entry_delegate.h>
+#include <vnet/adj/adj.h>
+#include <vnet/ip/ip.h>
+#include <vnet/dpo/dpo.h>
+
+/**
+ * The different sources that can create a route.
+ * The sources are defined here the thier relative priority order.
+ * The lower the value the higher the priority
+ */
+typedef enum fib_source_t_ {
+    /**
+     * Marker. Add new values after this one.
+     */
+    FIB_SOURCE_FIRST,
+    /**
+     * Special sources. These are for entries that are added to all
+     * FIBs by default, and should never be over-ridden (hence they
+     * are the highest priority)
+     */
+    FIB_SOURCE_SPECIAL = FIB_SOURCE_FIRST,
+    /**
+     * Classify. A route that links directly to a classify adj
+     */
+    FIB_SOURCE_CLASSIFY,
+    /**
+     * Route added as a result of interface configuration.
+     * this will also come from the API/CLI, but the distinction is
+     * that is from confiiguration on an interface, not a 'ip route' command
+     */
+    FIB_SOURCE_INTERFACE,
+    /**
+     * A high priority source a plugin can use
+     */
+    FIB_SOURCE_PLUGIN_HI,
+    /**
+     * From the control plane API
+     */
+    FIB_SOURCE_API,
+    /**
+     * From the CLI.
+     */
+    FIB_SOURCE_CLI,
+    /**
+     * LISP
+     */
+    FIB_SOURCE_LISP,
+    /**
+     * SRv6
+     */
+    FIB_SOURCE_SR,
+    /**
+     * IPv[46] Mapping
+     */
+    FIB_SOURCE_MAP,
+    /**
+     * SIXRD
+     */
+    FIB_SOURCE_SIXRD,
+    /**
+     * DHCP
+     */
+    FIB_SOURCE_DHCP,
+    /**
+     * Adjacency source.
+     * routes created as a result of ARP/ND entries. This is lower priority
+     * then the API/CLI. This is on purpose. trust me.
+     */
+    FIB_SOURCE_ADJ,
+    /**
+     * MPLS label. The prefix has been assigned a local label. This source
+     * never provides forwarding information, instead it acts as a place-holder
+     * so the association of label to prefix can be maintained
+     */
+    FIB_SOURCE_MPLS,
+    /**
+     * Attached Export source.
+     * routes created as a result of attahced export. routes thus sourced
+     * will be present in the export tables
+     */
+    FIB_SOURCE_AE,
+    /**
+     * Recursive resolution source.
+     * Used to install an entry that is the resolution traget of another.
+     */
+    FIB_SOURCE_RR,
+    /**
+     * uRPF bypass/exemption.
+     * Used to install an entry that is exempt from the loose uRPF check
+     */
+    FIB_SOURCE_URPF_EXEMPT,
+    /**
+     * The default route source.
+     * The default route is always added to the FIB table (like the
+     * special sources) but we need to be able to over-ride it with
+     * 'ip route' sources when provided
+     */
+    FIB_SOURCE_DEFAULT_ROUTE,
+    /**
+     * Marker. add new entries before this one.
+     */
+    FIB_SOURCE_LAST = FIB_SOURCE_DEFAULT_ROUTE,
+} __attribute__ ((packed)) fib_source_t;
+
+STATIC_ASSERT (sizeof(fib_source_t) == 1,
+	       "FIB too many sources");
+
+/**
+ * The maximum number of sources
+ */
+#define FIB_SOURCE_MAX (FIB_SOURCE_LAST+1)
+
+#define FIB_SOURCES {					\
+    [FIB_SOURCE_SPECIAL] = "special",			\
+    [FIB_SOURCE_INTERFACE] = "interface",		\
+    [FIB_SOURCE_API] = "API",			        \
+    [FIB_SOURCE_CLI] = "CLI",			        \
+    [FIB_SOURCE_ADJ] = "adjacency",			\
+    [FIB_SOURCE_MAP] = "MAP",			        \
+    [FIB_SOURCE_SR] = "SR",			        \
+    [FIB_SOURCE_SIXRD] = "SixRD",			\
+    [FIB_SOURCE_LISP] = "LISP", 			\
+    [FIB_SOURCE_CLASSIFY] = "classify",			\
+    [FIB_SOURCE_DHCP] = "DHCP",   			\
+    [FIB_SOURCE_RR] = "recursive-resolution",	        \
+    [FIB_SOURCE_AE] = "attached_export",	        \
+    [FIB_SOURCE_MPLS] = "mpls",           	        \
+    [FIB_SOURCE_URPF_EXEMPT] = "urpf-exempt",	        \
+    [FIB_SOURCE_DEFAULT_ROUTE] = "default-route",	\
+}
+
+#define FOR_EACH_FIB_SOURCE(_item) \
+    for (_item = FIB_SOURCE_FIRST; _item < FIB_SOURCE_MAX; _item++)
+
+/**
+ * The different sources that can create a route.
+ * The sources are defined here the thier relative priority order.
+ * The lower the value the higher the priority
+ */
+typedef enum fib_entry_attribute_t_ {
+    /**
+     * Marker. Add new values after this one.
+     */
+    FIB_ENTRY_ATTRIBUTE_FIRST,
+    /**
+     * Connected. The prefix is configured on an interface.
+     */
+    FIB_ENTRY_ATTRIBUTE_CONNECTED = FIB_ENTRY_ATTRIBUTE_FIRST,
+    /**
+     * Attached. The prefix is attached to an interface.
+     */
+    FIB_ENTRY_ATTRIBUTE_ATTACHED,
+    /**
+     * The route is an explicit drop.
+     */
+    FIB_ENTRY_ATTRIBUTE_DROP,
+    /**
+     * The route is exclusive. The client creating the route is
+     * providing an exclusive adjacency.
+     */
+    FIB_ENTRY_ATTRIBUTE_EXCLUSIVE,
+    /**
+     * The route is attached cross tables and thus imports covered
+     * prefixes from the other table.
+     */
+    FIB_ENTRY_ATTRIBUTE_IMPORT,
+    /**
+     * The prefix/address is local to this device
+     */
+    FIB_ENTRY_ATTRIBUTE_LOCAL,
+    /**
+     * Marker. add new entries before this one.
+     */
+    FIB_ENTRY_ATTRIBUTE_LAST = FIB_ENTRY_ATTRIBUTE_LOCAL,
+} fib_entry_attribute_t;
+
+/**
+ * The maximum number of sources
+ */
+#define FIB_ENTRY_ATTRIBUTE_MAX (FIB_ENTRY_ATTRIBUTE_LAST+1)
+
+#define FIB_ENTRY_ATTRIBUTES {		       		\
+    [FIB_ENTRY_ATTRIBUTE_CONNECTED] = "connected",	\
+    [FIB_ENTRY_ATTRIBUTE_ATTACHED]  = "attached",	\
+    [FIB_ENTRY_ATTRIBUTE_IMPORT]    = "import",	        \
+    [FIB_ENTRY_ATTRIBUTE_DROP]      = "drop",		\
+    [FIB_ENTRY_ATTRIBUTE_EXCLUSIVE] = "exclusive",      \
+    [FIB_ENTRY_ATTRIBUTE_LOCAL]     = "local",		\
+}
+
+#define FOR_EACH_FIB_ATTRIBUTE(_item)			\
+    for (_item = FIB_ENTRY_ATTRIBUTE_FIRST;		\
+	 _item < FIB_ENTRY_ATTRIBUTE_MAX;		\
+	 _item++)
+
+typedef enum fib_entry_flag_t_ {
+    FIB_ENTRY_FLAG_NONE      = 0,
+    FIB_ENTRY_FLAG_CONNECTED = (1 << FIB_ENTRY_ATTRIBUTE_CONNECTED),
+    FIB_ENTRY_FLAG_ATTACHED  = (1 << FIB_ENTRY_ATTRIBUTE_ATTACHED),
+    FIB_ENTRY_FLAG_DROP      = (1 << FIB_ENTRY_ATTRIBUTE_DROP),
+    FIB_ENTRY_FLAG_EXCLUSIVE = (1 << FIB_ENTRY_ATTRIBUTE_EXCLUSIVE),
+    FIB_ENTRY_FLAG_LOCAL     = (1 << FIB_ENTRY_ATTRIBUTE_LOCAL),
+    FIB_ENTRY_FLAG_IMPORT    = (1 << FIB_ENTRY_ATTRIBUTE_IMPORT),
+} fib_entry_flag_t;
+
+/**
+ * Flags for the source data
+ */
+typedef enum fib_entry_src_attribute_t_ {
+    /**
+     * Marker. Add new values after this one.
+     */
+    FIB_ENTRY_SRC_ATTRIBUTE_FIRST,
+    /**
+     * the source has been added to the entry
+     */
+    FIB_ENTRY_SRC_ATTRIBUTE_ADDED = FIB_ENTRY_SRC_ATTRIBUTE_FIRST,
+    /**
+     * the source is active/best
+     */
+    FIB_ENTRY_SRC_ATTRIBUTE_ACTIVE,
+    /**
+     * Marker. add new entries before this one.
+     */
+    FIB_ENTRY_SRC_ATTRIBUTE_LAST = FIB_ENTRY_SRC_ATTRIBUTE_ACTIVE,
+} fib_entry_src_attribute_t;
+
+#define FIB_ENTRY_SRC_ATTRIBUTE_MAX (FIB_ENTRY_SRC_ATTRIBUTE_LAST+1)
+
+#define FIB_ENTRY_SRC_ATTRIBUTES {		 \
+    [FIB_ENTRY_SRC_ATTRIBUTE_ADDED]  = "added",	 \
+    [FIB_ENTRY_SRC_ATTRIBUTE_ACTIVE] = "active", \
+}
+
+typedef enum fib_entry_src_flag_t_ {
+    FIB_ENTRY_SRC_FLAG_NONE   = 0,
+    FIB_ENTRY_SRC_FLAG_ADDED  = (1 << FIB_ENTRY_SRC_ATTRIBUTE_ADDED),
+    FIB_ENTRY_SRC_FLAG_ACTIVE = (1 << FIB_ENTRY_SRC_ATTRIBUTE_ACTIVE),
+} __attribute__ ((packed)) fib_entry_src_flag_t;
+
+/*
+ * Keep the size of the flags field to 2 bytes, so it
+ * can be placed next to the 2 bytes reference count
+ */
+STATIC_ASSERT (sizeof(fib_entry_src_flag_t) <= 2,
+	       "FIB entry flags field size too big");
+
+/**
+ * Information related to the source of a FIB entry
+ */
+typedef struct fib_entry_src_t_ {
+    /**
+     * A vector of path extensions
+     */
+    struct fib_path_ext_t_ *fes_path_exts;
+
+    /**
+     * The path-list created by the source
+     */
+    fib_node_index_t fes_pl;
+    /**
+     * Which source this info block is for
+     */
+    fib_source_t fes_src;
+    /**
+     * Flags on the source
+     */
+    fib_entry_src_flag_t fes_flags;
+
+    /**
+     * 1 bytes ref count. This is not the number of users of the Entry
+     * (which is itself not large, due to path-list sharing), but the number
+     * of times a given source has been added. Which is even fewer
+     */
+    u8 fes_ref_count;
+
+    /**
+     * Flags the source contributes to the entry
+     */
+    fib_entry_flag_t fes_entry_flags;
+    
+    /**
+     * Source specific info
+     */
+    union {
+	struct {
+	    /**
+	     * the index of the FIB entry that is the covering entry
+	     */
+	    fib_node_index_t fesr_cover;
+	    /**
+	     * This source's index in the cover's list
+	     */
+	    u32 fesr_sibling;
+	} rr;
+	struct {
+	    /**
+	     * the index of the FIB entry that is the covering entry
+	     */
+	    fib_node_index_t fesa_cover;
+	    /**
+	     * This source's index in the cover's list
+	     */
+	    u32 fesa_sibling;
+	} adj;
+	struct {
+	    /**
+	     * the index of the FIB entry that is the covering entry
+	     */
+	    fib_node_index_t fesi_cover;
+	    /**
+	     * This source's index in the cover's list
+	     */
+	    u32 fesi_sibling;
+	} interface;
+	struct {
+	    /**
+	     * This MPLS local label associated with the prefix.
+	     */
+	    mpls_label_t fesm_label;
+
+	    /**
+	     * the indicies of the LFIB entries created
+	     */
+	    fib_node_index_t fesm_lfes[2];
+	} mpls;
+	struct {
+	    /**
+	     * The source FIB index.
+	     */
+            fib_node_index_t fesl_fib_index;
+	} lisp;
+    };
+} fib_entry_src_t;
+
+/**
+ * An entry in a FIB table.
+ *
+ * This entry represents a route added to the FIB that is stored
+ * in one of the FIB tables.
+ */
+typedef struct fib_entry_t_ {
+    /**
+     * Base class. The entry's node representation in the graph.
+     */
+    fib_node_t fe_node;
+    /**
+     * The prefix of the route. this is const just to be sure.
+     * It is the entry's key/identity and so should never change.
+     */
+    const fib_prefix_t fe_prefix;
+    /**
+     * The index of the FIB table this entry is in
+     */
+    u32 fe_fib_index;
+    /**
+     * The load-balance used for forwarding.
+     *
+     * We don't share the EOS and non-EOS even in case when they could be
+     * because:
+     *   - complexity & reliability v. memory
+     *       determining the conditions where sharing is possible is non-trivial.
+     *   - separate LBs means we can get the EOS bit right in the MPLS label DPO
+     *     and so save a few clock cycles in the DP imposition node since we can
+     *     paint the header straight on without the need to check the packet
+     *     type to derive the EOS bit value.
+     */
+    dpo_id_t fe_lb; // [FIB_FORW_CHAIN_MPLS_NUM];
+    /**
+     * Vector of source infos.
+     * Most entries will only have 1 source. So we optimise for memory usage,
+     * which is preferable since we have many entries.
+     */
+    fib_entry_src_t *fe_srcs;
+    /**
+     * the path-list for which this entry is a child. This is also the path-list
+     * that is contributing forwarding for this entry.
+     */
+    fib_node_index_t fe_parent;
+    /**
+     * index of this entry in the parent's child list.
+     * This is set when this entry is added as a child, but can also
+     * be changed by the parent as it manages its list.
+     */
+    u32 fe_sibling;
+
+    /**
+     * A vector of delegates.
+     */
+    fib_entry_delegate_t *fe_delegates;
+} fib_entry_t;
+
+#define FOR_EACH_FIB_ENTRY_FLAG(_item) \
+    for (_item = FIB_ENTRY_FLAG_FIRST; _item < FIB_ENTRY_FLAG_MAX; _item++)
+
+#define FIB_ENTRY_FORMAT_BRIEF   (0x0)
+#define FIB_ENTRY_FORMAT_DETAIL  (0x1)
+#define FIB_ENTRY_FORMAT_DETAIL2 (0x2)
+
+extern u8 *format_fib_entry (u8 * s, va_list * args);
+
+extern fib_node_index_t fib_entry_create_special(u32 fib_index,
+						 const fib_prefix_t *prefix,
+						 fib_source_t source,
+						 fib_entry_flag_t flags,
+						 const dpo_id_t *dpo);
+
+extern fib_node_index_t fib_entry_create (u32 fib_index,
+					  const fib_prefix_t *prefix,
+					  fib_source_t source,
+					  fib_entry_flag_t flags,
+					  const fib_route_path_t *paths);
+extern void fib_entry_update (fib_node_index_t fib_entry_index,
+			      fib_source_t source,
+			      fib_entry_flag_t flags,
+			      const fib_route_path_t *paths);
+
+extern void fib_entry_path_add(fib_node_index_t fib_entry_index,
+			       fib_source_t source,
+			       fib_entry_flag_t flags,
+			       const fib_route_path_t *rpath);
+extern void fib_entry_special_add(fib_node_index_t fib_entry_index,
+				  fib_source_t source,
+				  fib_entry_flag_t flags,
+				  const dpo_id_t *dpo);
+extern void fib_entry_special_update(fib_node_index_t fib_entry_index,
+				     fib_source_t source,
+				     fib_entry_flag_t flags,
+				     const dpo_id_t *dpo);
+extern fib_entry_src_flag_t fib_entry_special_remove(fib_node_index_t fib_entry_index,
+						     fib_source_t source);
+
+extern fib_entry_src_flag_t fib_entry_path_remove(fib_node_index_t fib_entry_index,
+						  fib_source_t source,
+						  const fib_route_path_t *rpath);
+extern fib_entry_src_flag_t fib_entry_delete(fib_node_index_t fib_entry_index,
+					     fib_source_t source);
+
+extern void fib_entry_contribute_urpf(fib_node_index_t path_index,
+				      index_t urpf);
+extern void fib_entry_contribute_forwarding(
+    fib_node_index_t fib_entry_index,
+    fib_forward_chain_type_t type,
+    dpo_id_t *dpo);
+extern const dpo_id_t * fib_entry_contribute_ip_forwarding(
+    fib_node_index_t fib_entry_index);
+extern adj_index_t fib_entry_get_adj_for_source(
+    fib_node_index_t fib_entry_index,
+    fib_source_t source);
+extern const int fib_entry_get_dpo_for_source (
+    fib_node_index_t fib_entry_index,
+    fib_source_t source,
+    dpo_id_t *dpo);
+
+extern adj_index_t fib_entry_get_adj(fib_node_index_t fib_entry_index);
+
+extern int fib_entry_cmp_for_sort(void *i1, void *i2);
+
+extern void fib_entry_cover_changed(fib_node_index_t fib_entry);
+extern void fib_entry_cover_updated(fib_node_index_t fib_entry);
+extern int fib_entry_recursive_loop_detect(fib_node_index_t entry_index,
+					   fib_node_index_t **entry_indicies);
+
+extern void fib_entry_lock(fib_node_index_t fib_entry_index);
+extern void fib_entry_unlock(fib_node_index_t fib_entry_index);
+
+extern u32 fib_entry_child_add(fib_node_index_t fib_entry_index,
+			       fib_node_type_t type,
+			       fib_node_index_t child_index);
+extern void fib_entry_child_remove(fib_node_index_t fib_entry_index,
+				   u32 sibling_index);
+extern u32 fib_entry_get_resolving_interface(fib_node_index_t fib_entry_index);
+extern u32 fib_entry_get_resolving_interface_for_source(
+    fib_node_index_t fib_entry_index,
+    fib_source_t source);
+
+extern void fib_entry_encode(fib_node_index_t fib_entry_index,
+			     fib_route_path_encode_t **api_rpaths);
+extern void fib_entry_get_prefix(fib_node_index_t fib_entry_index,
+				 fib_prefix_t *pfx);
+extern u32 fib_entry_get_fib_index(fib_node_index_t fib_entry_index);
+extern void fib_entry_set_source_data(fib_node_index_t fib_entry_index,
+                                      fib_source_t source,
+                                      const void *data);
+extern const void* fib_entry_get_source_data(fib_node_index_t fib_entry_index,
+                                             fib_source_t source);
+
+extern fib_entry_flag_t fib_entry_get_flags(fib_node_index_t fib_entry_index);
+extern fib_entry_flag_t fib_entry_get_flags_for_source(
+    fib_node_index_t fib_entry_index,
+    fib_source_t source);
+extern fib_source_t fib_entry_get_best_source(fib_node_index_t fib_entry_index);
+extern int fib_entry_is_sourced(fib_node_index_t fib_entry_index,
+                                fib_source_t source);
+
+extern fib_node_index_t fib_entry_get_path_list(fib_node_index_t fib_entry_index);
+
+extern void fib_entry_module_init(void);
+
+/*
+ * unsafe... beware the raw pointer.
+ */
+extern fib_node_index_t fib_entry_get_index(const fib_entry_t * fib_entry);
+extern fib_entry_t * fib_entry_get(fib_node_index_t fib_entry_index);
+
+/*
+ * for testing purposes.
+ */
+extern u32 fib_entry_pool_size(void);
+
+#endif
diff --git a/src/vnet/fib/fib_entry_cover.c b/src/vnet/fib/fib_entry_cover.c
new file mode 100644
index 00000000..147c5daa
--- /dev/null
+++ b/src/vnet/fib/fib_entry_cover.c
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/fib/fib_entry_cover.h>
+#include <vnet/fib/fib_entry_src.h>
+#include <vnet/fib/fib_node_list.h>
+
+u32
+fib_entry_cover_track (fib_entry_t* cover,
+		       fib_node_index_t covered)
+{
+    fib_entry_delegate_t *fed;
+
+    FIB_ENTRY_DBG(cover, "cover-track %d", covered);
+
+    ASSERT(fib_entry_get_index(cover) != covered);
+
+    fed = fib_entry_delegate_get(cover, FIB_ENTRY_DELEGATE_COVERED);
+
+    if (NULL == fed)
+    {
+        fed = fib_entry_delegate_find_or_add(cover, FIB_ENTRY_DELEGATE_COVERED);
+        fed->fd_list = fib_node_list_create();
+    }
+
+    return (fib_node_list_push_front(fed->fd_list,
+                                     0, FIB_NODE_TYPE_ENTRY,
+                                     covered));
+}
+
+void
+fib_entry_cover_untrack (fib_entry_t* cover,
+			 u32 tracked_index)
+{
+    fib_entry_delegate_t *fed;
+
+    FIB_ENTRY_DBG(cover, "cover-untrack @ %d", tracked_index);
+
+    fed = fib_entry_delegate_get(cover, FIB_ENTRY_DELEGATE_COVERED);
+
+    if (NULL == fed)
+        return;
+
+    fib_node_list_remove(fed->fd_list, tracked_index);
+
+    if (0 == fib_node_list_get_size(fed->fd_list))
+    {
+        fib_node_list_destroy(&fed->fd_list);
+        fib_entry_delegate_remove(cover, FIB_ENTRY_DELEGATE_COVERED);        
+    }
+}
+
+/**
+ * Internal struct to hold user supplied paraneters for the cover walk
+ */
+typedef struct fib_enty_cover_walk_ctx_t_ {
+    fib_entry_t *cover;
+    fib_entry_covered_walk_t walk;
+    void *ctx;
+} fib_enty_cover_walk_ctx_t;
+
+static int
+fib_entry_cover_walk_node_ptr (fib_node_ptr_t *depend,
+			       void *args)
+{
+    fib_enty_cover_walk_ctx_t *ctx = args;
+
+    ctx->walk(ctx->cover, depend->fnp_index, ctx->ctx);
+
+    /* continue */
+    return (1);
+}
+
+void
+fib_entry_cover_walk (fib_entry_t *cover,
+		      fib_entry_covered_walk_t walk,
+		      void *args)
+{
+    fib_entry_delegate_t *fed;
+
+    fed = fib_entry_delegate_get(cover, FIB_ENTRY_DELEGATE_COVERED);
+
+    if (NULL == fed)
+        return;
+
+    fib_enty_cover_walk_ctx_t ctx = {
+        .cover = cover,
+        .walk = walk,
+        .ctx = args,
+    };
+
+    fib_node_list_walk(fed->fd_list,
+                       fib_entry_cover_walk_node_ptr,
+                       &ctx);
+}
+
+u32
+fib_entry_cover_get_size (fib_entry_t *cover)
+{
+    fib_entry_delegate_t *fed;
+
+    fed = fib_entry_delegate_get(cover, FIB_ENTRY_DELEGATE_COVERED);
+
+    if (NULL == fed)
+        return (0);
+
+    return (fib_node_list_get_size(fed->fd_list));
+}
+
+typedef struct fib_entry_cover_list_format_ctx_t_ {
+    u8 *s;
+} fib_entry_cover_list_format_ctx_t;
+
+static int
+fib_entry_covered_list_format_one (fib_entry_t *cover,
+				   fib_node_index_t covered,
+				   void *args)
+{
+    fib_entry_cover_list_format_ctx_t * ctx = args;
+
+    ctx->s = format(ctx->s, "%d, ", covered);
+
+    /* continue */
+    return (1);
+}
+
+u8*
+fib_entry_cover_list_format (fib_entry_t *fib_entry,
+			     u8 *s)
+{
+    fib_entry_cover_list_format_ctx_t ctx = {
+	.s = s,
+    };
+
+    fib_entry_cover_walk(fib_entry, 
+			 fib_entry_covered_list_format_one,
+			 &ctx);
+
+    return (ctx.s);
+}
+
+static int
+fib_entry_cover_change_one (fib_entry_t *cover,
+			    fib_node_index_t covered,
+			    void *args)
+{
+    fib_node_index_t new_cover;
+
+    /*
+     * The 3 entries involved here are:
+     *   cover - the least specific. It will cover both the others
+     *  new_cover - the enty just inserted below the cover
+     *  covered - the entry that was tracking the cover.
+     *
+     * The checks below are to determine if new_cover is a cover for covered.
+     */
+    new_cover = pointer_to_uword(args);
+
+    if (FIB_NODE_INDEX_INVALID == new_cover)
+    {
+	/*
+	 * nothing has been inserted, which implies the cover was removed.
+	 * 'cover' is thus the new cover.
+	 */
+	fib_entry_cover_changed(covered);
+    }
+    else if (new_cover != covered)
+    {
+	fib_prefix_t pfx_covered, pfx_new_cover;
+
+	fib_entry_get_prefix(covered, &pfx_covered);
+	fib_entry_get_prefix(new_cover, &pfx_new_cover);
+
+	if (fib_prefix_is_cover(&pfx_new_cover, &pfx_covered))
+	{
+	    fib_entry_cover_changed(covered);
+	}
+    }
+    /* continue */
+    return (1);
+}
+
+void
+fib_entry_cover_change_notify (fib_node_index_t cover_index,
+			       fib_node_index_t covered)
+{
+    fib_entry_t *cover;
+
+    cover = fib_entry_get(cover_index);
+
+    fib_entry_cover_walk(cover, 
+			 fib_entry_cover_change_one,
+			 uword_to_pointer(covered, void*));
+}
+
+static int
+fib_entry_cover_update_one (fib_entry_t *cover,
+			    fib_node_index_t covered,
+			    void *args)
+{
+    fib_entry_cover_updated(covered);
+
+    /* continue */
+    return (1);
+}
+
+void
+fib_entry_cover_update_notify (fib_entry_t *fib_entry)
+{
+    fib_entry_cover_walk(fib_entry, 
+			 fib_entry_cover_update_one,
+			 NULL);
+}
diff --git a/src/vnet/fib/fib_entry_cover.h b/src/vnet/fib/fib_entry_cover.h
new file mode 100644
index 00000000..fbbbc211
--- /dev/null
+++ b/src/vnet/fib/fib_entry_cover.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __FIB_ENTRY_COVER_H__
+#define __FIB_ENTRY_COVER_H__
+
+#include "fib_entry.h"
+
+/**
+ * callback function used when walking the covered entries
+ */
+typedef int (*fib_entry_covered_walk_t)(fib_entry_t *cover,
+					fib_node_index_t covered,
+					void *ctx);
+
+extern u32 fib_entry_cover_track(fib_entry_t *cover,
+				 fib_node_index_t covered);
+
+extern void fib_entry_cover_untrack(fib_entry_t *cover,
+				    u32 tracked_index);
+
+extern void fib_entry_cover_walk(fib_entry_t *cover,
+				 fib_entry_covered_walk_t walk,
+				 void *ctx);
+
+extern void fib_entry_cover_change_notify(fib_node_index_t cover_index,
+					  fib_node_index_t covered_index);
+extern void fib_entry_cover_update_notify(fib_entry_t *cover);
+
+extern u32 fib_entry_cover_get_size(fib_entry_t *cover);
+
+extern u8* fib_entry_cover_list_format(fib_entry_t *fib_entry,
+				       u8 *s);
+
+#endif
diff --git a/src/vnet/fib/fib_entry_delegate.c b/src/vnet/fib/fib_entry_delegate.c
new file mode 100644
index 00000000..a0d45f97
--- /dev/null
+++ b/src/vnet/fib/fib_entry_delegate.c
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/fib/fib_entry_delegate.h>
+#include <vnet/fib/fib_entry.h>
+
+static fib_entry_delegate_t *
+fib_entry_delegate_find_i (const fib_entry_t *fib_entry,
+                           fib_entry_delegate_type_t type,
+                           u32 *index)
+{
+    fib_entry_delegate_t *delegate;
+    int ii;
+
+    ii = 0;
+    vec_foreach(delegate, fib_entry->fe_delegates)
+    {
+	if (delegate->fd_type == type)
+	{
+            if (NULL != index)
+                *index = ii;
+
+	    return (delegate);
+	}
+	else
+	{
+	    ii++;
+	}
+    }
+
+    return (NULL);
+}
+
+fib_entry_delegate_t *
+fib_entry_delegate_get (const fib_entry_t *fib_entry,
+                        fib_entry_delegate_type_t type)
+{
+    return (fib_entry_delegate_find_i(fib_entry, type, NULL));
+}
+
+void
+fib_entry_delegate_remove (fib_entry_t *fib_entry,
+                           fib_entry_delegate_type_t type)
+{
+    fib_entry_delegate_t *fed;
+    u32 index = ~0;
+
+    fed = fib_entry_delegate_find_i(fib_entry, type, &index);
+
+    ASSERT(NULL != fed);
+
+    vec_del1(fib_entry->fe_delegates, index);
+}
+
+static int
+fib_entry_delegate_cmp_for_sort (void * v1,
+                                 void * v2)
+{
+    fib_entry_delegate_t *delegate1 = v1, *delegate2 = v2;
+
+    return (delegate1->fd_type - delegate2->fd_type);
+}
+
+static void
+fib_entry_delegate_init (fib_entry_t *fib_entry,
+                         fib_entry_delegate_type_t type)
+
+{
+    fib_entry_delegate_t delegate = {
+	.fd_entry_index = fib_entry_get_index(fib_entry),
+	.fd_type = type,
+    };
+
+    vec_add1(fib_entry->fe_delegates, delegate);
+    vec_sort_with_function(fib_entry->fe_delegates,
+			   fib_entry_delegate_cmp_for_sort);
+}
+
+fib_entry_delegate_t *
+fib_entry_delegate_find_or_add (fib_entry_t *fib_entry,
+                                fib_entry_delegate_type_t fdt)
+{
+    fib_entry_delegate_t *delegate;
+
+    delegate = fib_entry_delegate_get(fib_entry, fdt);
+
+    if (NULL == delegate)
+    {
+	fib_entry_delegate_init(fib_entry, fdt);
+    }
+
+    return (fib_entry_delegate_get(fib_entry, fdt));
+}
+
+fib_entry_delegate_type_t
+fib_entry_chain_type_to_delegate_type (fib_forward_chain_type_t fct)
+{
+    switch (fct)
+    {
+    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
+        return (FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP4);
+    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
+        return (FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP6);
+    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
+        return (FIB_ENTRY_DELEGATE_CHAIN_MPLS_EOS);
+    case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
+        return (FIB_ENTRY_DELEGATE_CHAIN_MPLS_NON_EOS);
+    case FIB_FORW_CHAIN_TYPE_ETHERNET:
+        return (FIB_ENTRY_DELEGATE_CHAIN_ETHERNET);
+    }
+    ASSERT(0);
+    return (FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP4);
+}
+
+fib_forward_chain_type_t
+fib_entry_delegate_type_to_chain_type (fib_entry_delegate_type_t fdt)
+{
+    switch (fdt)
+    {
+    case FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP4:
+        return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
+    case FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP6:
+        return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
+    case FIB_ENTRY_DELEGATE_CHAIN_MPLS_EOS:
+        return (FIB_FORW_CHAIN_TYPE_MPLS_EOS);
+    case FIB_ENTRY_DELEGATE_CHAIN_MPLS_NON_EOS:
+        return (FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS);
+    case FIB_ENTRY_DELEGATE_CHAIN_ETHERNET:
+        return (FIB_FORW_CHAIN_TYPE_ETHERNET);
+    case FIB_ENTRY_DELEGATE_COVERED:
+    case FIB_ENTRY_DELEGATE_ATTACHED_IMPORT:
+    case FIB_ENTRY_DELEGATE_ATTACHED_EXPORT:
+        break;
+    }
+    ASSERT(0);
+    return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
+}
diff --git a/src/vnet/fib/fib_entry_delegate.h b/src/vnet/fib/fib_entry_delegate.h
new file mode 100644
index 00000000..6d3a6549
--- /dev/null
+++ b/src/vnet/fib/fib_entry_delegate.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __FIB_ENTRY_DELEGATE_T__
+#define __FIB_ENTRY_DELEGATE_T__
+
+#include <vnet/fib/fib_node.h>
+
+/**
+ * Delegate types
+ */
+typedef enum fib_entry_delegate_type_t_ {
+    /**
+     * Forwarding chain types:
+     * for the vast majority of FIB entries only one chain is required - the
+     * one that forwards traffic matching the fib_entry_t's fib_prefix_t. For those
+     * fib_entry_t that are a resolution target for other fib_entry_t's they will also
+     * need the chain to provide forwarding for those children. We store these additional
+     * chains in delegates to save memory in the common case.
+     */
+    FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP4 = FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+    FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP6 = FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
+    FIB_ENTRY_DELEGATE_CHAIN_MPLS_EOS = FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+    FIB_ENTRY_DELEGATE_CHAIN_MPLS_NON_EOS = FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+    FIB_ENTRY_DELEGATE_CHAIN_ETHERNET = FIB_FORW_CHAIN_TYPE_ETHERNET,
+    /**
+     * Dependency list of covered entries.
+     * these are more specific entries that are interested in changes
+     * to their respective cover
+     */
+    FIB_ENTRY_DELEGATE_COVERED,
+    /**
+     * Attached import/export functionality
+     */
+    FIB_ENTRY_DELEGATE_ATTACHED_IMPORT,
+    FIB_ENTRY_DELEGATE_ATTACHED_EXPORT,
+} fib_entry_delegate_type_t;
+
+#define FOR_EACH_DELEGATE_CHAIN(_entry, _fdt, _fed, _body)    \
+{                                                             \
+    for (_fdt = FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP4;         \
+         _fdt <= FIB_ENTRY_DELEGATE_CHAIN_ETHERNET;           \
+         _fdt++)                                              \
+    {                                                         \
+        _fed = fib_entry_delegate_get(_entry, _fdt);          \
+        if (NULL != _fed) {                                   \
+            _body;                                            \
+        }                                                     \
+    }                                                         \
+}
+
+/**
+ * A Delagate is a means to implmenet the Delagation design pattern; the extension of an
+ * objects functionality through the composition of, and delgation to, other objects.
+ * These 'other' objects are delegates. Delagates are thus attached to other FIB objects
+ * to extend their functionality.
+ */
+typedef struct fib_entry_delegate_t_
+{
+    /**
+     * The FIB entry object to which the delagate is attached
+     */
+    fib_node_index_t fd_entry_index;
+
+    /**
+     * The delagate type
+     */
+    fib_entry_delegate_type_t fd_type;
+
+    /**
+     * A union of data for the different delegate types
+     * These delegates are stored in a sparse vector on the entry, so they
+     * must all be of the same size. We could use indirection here for all types,
+     * i.e. store an index, that's ok for large delegates, like the attached export
+     * but for the chain delegates it's excessive
+     */
+    union
+    {
+        /**
+         * Valid for the forwarding chain delegates. The LB that is built.
+         */
+        dpo_id_t fd_dpo;
+
+        /**
+         * Valid for the attached import cases. An index of the importer/exporter
+         */
+        fib_node_index_t fd_index;
+
+        /**
+         * For the cover tracking. The node list;
+         */
+        fib_node_list_t fd_list;
+    };
+} fib_entry_delegate_t;
+
+struct fib_entry_t_;
+
+extern void fib_entry_delegate_remove(struct fib_entry_t_ *fib_entry,
+                                      fib_entry_delegate_type_t type);
+
+extern fib_entry_delegate_t *fib_entry_delegate_find_or_add(struct fib_entry_t_ *fib_entry,
+                                                            fib_entry_delegate_type_t fdt);
+extern fib_entry_delegate_t *fib_entry_delegate_get(const struct fib_entry_t_ *fib_entry,
+                                                    fib_entry_delegate_type_t type);
+
+extern fib_forward_chain_type_t fib_entry_delegate_type_to_chain_type(
+    fib_entry_delegate_type_t type);
+
+extern fib_entry_delegate_type_t fib_entry_chain_type_to_delegate_type(
+     fib_forward_chain_type_t type);
+
+#endif
diff --git a/src/vnet/fib/fib_entry_src.c b/src/vnet/fib/fib_entry_src.c
new file mode 100644
index 00000000..060fac94
--- /dev/null
+++ b/src/vnet/fib/fib_entry_src.c
@@ -0,0 +1,1456 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/adj/adj.h>
+#include <vnet/dpo/load_balance.h>
+#include <vnet/dpo/mpls_label_dpo.h>
+#include <vnet/dpo/drop_dpo.h>
+
+#include <vnet/fib/fib_entry_src.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/fib_path_ext.h>
+#include <vnet/fib/fib_urpf_list.h>
+
+/*
+ * per-source type vft
+ */
+static fib_entry_src_vft_t fib_entry_src_vft[FIB_SOURCE_MAX];
+
+static fib_protocol_t
+fib_entry_get_proto (const fib_entry_t * fib_entry)
+{
+    return (fib_entry->fe_prefix.fp_proto);
+}
+
+void
+fib_entry_src_register (fib_source_t source,
+			const fib_entry_src_vft_t *vft)
+{
+    fib_entry_src_vft[source] = *vft;
+}
+
+static int
+fib_entry_src_cmp_for_sort (void * v1,
+			    void * v2)
+{
+    fib_entry_src_t *esrc1 = v1, *esrc2 = v2;
+
+    return (esrc1->fes_src - esrc2->fes_src);
+}
+
+void
+fib_entry_src_action_init (fib_entry_t *fib_entry,
+			   fib_source_t source)
+
+{
+    fib_entry_src_t esrc = {
+	.fes_pl = FIB_NODE_INDEX_INVALID,
+	.fes_flags = FIB_ENTRY_SRC_FLAG_NONE,
+	.fes_src = source,
+    };
+
+    if (NULL != fib_entry_src_vft[source].fesv_init)
+    {
+	fib_entry_src_vft[source].fesv_init(&esrc);
+    }
+
+    vec_add1(fib_entry->fe_srcs, esrc);
+    vec_sort_with_function(fib_entry->fe_srcs,
+			   fib_entry_src_cmp_for_sort);
+}
+
+static fib_entry_src_t *
+fib_entry_src_find (const fib_entry_t *fib_entry,
+		    fib_source_t source,
+		    u32 *index)
+
+{
+    fib_entry_src_t *esrc;
+    int ii;
+
+    ii = 0;
+    vec_foreach(esrc, fib_entry->fe_srcs)
+    {
+	if (esrc->fes_src == source)
+	{
+	    if (NULL != index)
+	    {
+		*index = ii;
+	    }
+	    return (esrc);
+	}
+	else
+	{
+	    ii++;
+	}
+    }
+
+    return (NULL);
+}
+
+int
+fib_entry_is_sourced (fib_node_index_t fib_entry_index,
+                      fib_source_t source)
+{
+    fib_entry_t *fib_entry;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    return (NULL != fib_entry_src_find(fib_entry, source, NULL));
+}
+
+static fib_entry_src_t *
+fib_entry_src_find_or_create (fib_entry_t *fib_entry,
+			      fib_source_t source,
+			      u32 *index)
+{
+    fib_entry_src_t *esrc;
+
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    if (NULL == esrc)
+    {
+	fib_entry_src_action_init(fib_entry, source);
+    }
+
+    return (fib_entry_src_find(fib_entry, source, NULL));
+}
+
+void
+fib_entry_src_action_deinit (fib_entry_t *fib_entry,
+			     fib_source_t source)
+
+{
+    fib_entry_src_t *esrc;
+    u32 index = ~0;
+
+    esrc = fib_entry_src_find(fib_entry, source, &index);
+
+    ASSERT(NULL != esrc);
+
+    if (NULL != fib_entry_src_vft[source].fesv_deinit)
+    {
+	fib_entry_src_vft[source].fesv_deinit(esrc);
+    }
+
+    vec_free(esrc->fes_path_exts);
+    vec_del1(fib_entry->fe_srcs, index);
+}
+
+fib_entry_src_cover_res_t
+fib_entry_src_action_cover_change (fib_entry_t *fib_entry,
+				   fib_source_t source)
+{
+    if (NULL != fib_entry_src_vft[source].fesv_cover_change)
+    {
+	return (fib_entry_src_vft[source].fesv_cover_change(
+		    fib_entry_src_find(fib_entry, source, NULL),
+		    fib_entry));
+    }
+
+    fib_entry_src_cover_res_t res = {
+	.install = !0,
+	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
+    };
+    return (res);
+}
+
+fib_entry_src_cover_res_t
+fib_entry_src_action_cover_update (fib_entry_t *fib_entry,
+				   fib_source_t source)
+{
+    if (NULL != fib_entry_src_vft[source].fesv_cover_update)
+    {
+	return (fib_entry_src_vft[source].fesv_cover_update(
+		    fib_entry_src_find(fib_entry, source, NULL),
+		    fib_entry));
+    }
+
+    fib_entry_src_cover_res_t res = {
+	.install = !0,
+	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
+    };
+    return (res);
+}
+
+typedef struct fib_entry_src_collect_forwarding_ctx_t_
+{
+    load_balance_path_t * next_hops;
+    const fib_entry_t *fib_entry;
+    const fib_entry_src_t *esrc;
+    fib_forward_chain_type_t fct;
+    int is_recursive;
+} fib_entry_src_collect_forwarding_ctx_t;
+
+/**
+ * @brief Determine whether this FIB entry should use a load-balance MAP
+ * to support PIC edge fast convergence
+ */
+load_balance_flags_t
+fib_entry_calc_lb_flags (fib_entry_src_collect_forwarding_ctx_t *ctx)
+{
+    /**
+     * We'll use a LB map is the path-list has recursive paths.
+     * recursive paths implies BGP, and hence scale.
+     */
+    if (ctx->is_recursive)
+    {
+        return (LOAD_BALANCE_FLAG_USES_MAP);
+    }
+    return (LOAD_BALANCE_FLAG_NONE);
+}
+
+static int
+fib_entry_src_valid_out_label (mpls_label_t label)
+{
+    return ((MPLS_LABEL_IS_REAL(label) ||
+             MPLS_IETF_IPV4_EXPLICIT_NULL_LABEL == label ||
+             MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL == label ||
+             MPLS_IETF_IMPLICIT_NULL_LABEL == label));
+}
+
+/**
+ * @brief Turn the chain type requested by the client into the one they
+ * really wanted
+ */
+fib_forward_chain_type_t
+fib_entry_chain_type_fixup (const fib_entry_t *entry,
+			    fib_forward_chain_type_t fct)
+{
+    ASSERT(FIB_FORW_CHAIN_TYPE_MPLS_EOS == fct);
+
+    /*
+     * The EOS chain is a tricky since one cannot know the adjacency
+     * to link to without knowing what the packets payload protocol
+     * will be once the label is popped.
+     */
+    fib_forward_chain_type_t dfct;
+
+    dfct = fib_entry_get_default_chain_type(entry);
+
+    if (FIB_FORW_CHAIN_TYPE_MPLS_EOS == dfct)
+    {
+        /*
+         * If the entry being asked is a eos-MPLS label entry,
+         * then use the payload-protocol field, that we stashed there
+         * for just this purpose
+         */
+        return (fib_forw_chain_type_from_dpo_proto(
+                    entry->fe_prefix.fp_payload_proto));
+    }
+    /*
+     * else give them what this entry would be by default. i.e. if it's a v6
+     * entry, then the label its local labelled should be carrying v6 traffic.
+     * If it's a non-EOS label entry, then there are more labels and we want
+     * a non-eos chain.
+     */
+    return (dfct);
+}
+
+static int
+fib_entry_src_collect_forwarding (fib_node_index_t pl_index,
+                                  fib_node_index_t path_index,
+                                  void *arg)
+{
+    fib_entry_src_collect_forwarding_ctx_t *ctx;
+    fib_path_ext_t *path_ext;
+
+    ctx = arg;
+
+    /*
+     * if the path is not resolved, don't include it.
+     */
+    if (!fib_path_is_resolved(path_index))
+    {
+        return (!0);
+    }
+
+    if (fib_path_is_recursive(path_index))
+    {
+        ctx->is_recursive = 1;
+    }
+
+    /*
+     * get the matching path-extension for the path being visited.
+     */
+    vec_foreach(path_ext, ctx->esrc->fes_path_exts)
+    {
+        if (path_ext->fpe_path_index == path_index)
+            break;
+    }
+    
+    if (NULL != path_ext &&
+        path_ext->fpe_path_index == path_index &&
+        fib_entry_src_valid_out_label(path_ext->fpe_label_stack[0]))
+    {
+        /*
+         * found a matching extension. stack it to obtain the forwarding
+         * info for this path.
+         */
+        ctx->next_hops = fib_path_ext_stack(path_ext, ctx->fib_entry, ctx->fct, ctx->next_hops);
+    }
+    else
+    {
+        load_balance_path_t *nh;
+
+        /*
+         * no extension => no out-going label for this path. that's OK
+         * in the case of an IP or EOS chain, but not for non-EOS
+         */
+        switch (ctx->fct)
+        {
+        case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
+        case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
+            /*
+             * EOS traffic with no label to stack, we need the IP Adj
+             */
+            vec_add2(ctx->next_hops, nh, 1);
+
+            nh->path_index = path_index;
+            nh->path_weight = fib_path_get_weight(path_index);
+            fib_path_contribute_forwarding(path_index, ctx->fct, &nh->path_dpo);
+
+            break;
+        case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
+	    if (fib_path_is_exclusive(path_index) ||
+		fib_path_is_deag(path_index))
+	    {
+		vec_add2(ctx->next_hops, nh, 1);
+
+		nh->path_index = path_index;
+		nh->path_weight = fib_path_get_weight(path_index);
+		fib_path_contribute_forwarding(path_index,
+					       FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+					       &nh->path_dpo);
+	    }
+            break;
+        case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
+        {
+            /*
+             * no label. we need a chain based on the payload. fixup.
+             */
+            vec_add2(ctx->next_hops, nh, 1);
+
+            nh->path_index = path_index;
+            nh->path_weight = fib_path_get_weight(path_index);
+            fib_path_contribute_forwarding(path_index,
+                                           fib_entry_chain_type_fixup(ctx->fib_entry,
+                                                                      ctx->fct),
+                                           &nh->path_dpo);
+
+            break;
+        }
+        case FIB_FORW_CHAIN_TYPE_ETHERNET:
+	    ASSERT(0);
+	    break;
+        }
+    }
+
+    return (!0);
+}
+
+void
+fib_entry_src_mk_lb (fib_entry_t *fib_entry,
+		     const fib_entry_src_t *esrc,
+		     fib_forward_chain_type_t fct,
+		     dpo_id_t *dpo_lb)
+{
+    dpo_proto_t lb_proto;
+
+    /*
+     * If the entry has path extensions then we construct a load-balance
+     * by stacking the extensions on the forwarding chains of the paths.
+     * Otherwise we use the load-balance of the path-list
+     */
+    fib_entry_src_collect_forwarding_ctx_t ctx = {
+        .esrc = esrc,
+        .fib_entry = fib_entry,
+        .next_hops = NULL,
+        .is_recursive = 0,
+        .fct = fct,
+    };
+
+    lb_proto = fib_proto_to_dpo(fib_entry->fe_prefix.fp_proto);
+
+    fib_path_list_walk(esrc->fes_pl,
+                       fib_entry_src_collect_forwarding,
+                       &ctx);
+
+    if (esrc->fes_entry_flags & FIB_ENTRY_FLAG_EXCLUSIVE)
+    {
+	/*
+	 * the client provided the DPO that the entry should link to.
+	 * all entries must link to a LB, so if it is an LB already
+	 * then we can use it.
+	 */
+	if ((1 == vec_len(ctx.next_hops)) &&
+	    (DPO_LOAD_BALANCE == ctx.next_hops[0].path_dpo.dpoi_type))
+	{
+	    dpo_copy(dpo_lb, &ctx.next_hops[0].path_dpo);
+	    dpo_reset(&ctx.next_hops[0].path_dpo);
+	    return;
+	}
+    }
+
+    if (!dpo_id_is_valid(dpo_lb))
+    {
+        /*
+         * first time create
+         */
+        flow_hash_config_t fhc;
+
+        fhc = fib_table_get_flow_hash_config(fib_entry->fe_fib_index,
+                                             dpo_proto_to_fib(lb_proto));
+        dpo_set(dpo_lb,
+                DPO_LOAD_BALANCE,
+                lb_proto,
+                load_balance_create(0, lb_proto, fhc));
+    }
+
+    load_balance_multipath_update(dpo_lb,
+                                  ctx.next_hops,
+                                  fib_entry_calc_lb_flags(&ctx));
+    vec_free(ctx.next_hops);
+
+    /*
+     * if this entry is sourced by the uRPF-exempt source then we
+     * append the always present local0 interface (index 0) to the
+     * uRPF list so it is not empty. that way packets pass the loose check.
+     */
+    index_t ui = fib_path_list_get_urpf(esrc->fes_pl);
+
+    if (fib_entry_is_sourced(fib_entry_get_index(fib_entry),
+			     FIB_SOURCE_URPF_EXEMPT) &&
+	(0 == fib_urpf_check_size(ui)))
+    {
+	/*
+	 * The uRPF list we get from the path-list is shared by all
+	 * other users of the list, but the uRPF exemption applies
+	 * only to this prefix. So we need our own list.
+	 */
+	ui = fib_urpf_list_alloc_and_lock();
+	fib_urpf_list_append(ui, 0);
+	fib_urpf_list_bake(ui);
+	load_balance_set_urpf(dpo_lb->dpoi_index, ui);
+	fib_urpf_list_unlock(ui);
+    }
+    else
+    {
+	load_balance_set_urpf(dpo_lb->dpoi_index, ui);
+    }
+}
+
+void
+fib_entry_src_action_install (fib_entry_t *fib_entry,
+			      fib_source_t source)
+{
+    /*
+     * Install the forwarding chain for the given source into the forwarding
+     * tables
+     */
+    fib_forward_chain_type_t fct;
+    fib_entry_src_t *esrc;
+    int insert;
+
+    fct = fib_entry_get_default_chain_type(fib_entry);
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    /*
+     * Every entry has its own load-balance object. All changes to the entry's
+     * forwarding result in an inplace modify of the load-balance. This means
+     * the load-balance object only needs to be added to the forwarding
+     * DB once, when it is created.
+     */
+    insert = !dpo_id_is_valid(&fib_entry->fe_lb);
+
+    fib_entry_src_mk_lb(fib_entry, esrc, fct, &fib_entry->fe_lb);
+
+    ASSERT(dpo_id_is_valid(&fib_entry->fe_lb));
+    FIB_ENTRY_DBG(fib_entry, "install: %d", fib_entry->fe_lb);
+
+    /*
+     * insert the adj into the data-plane forwarding trie
+     */
+    if (insert)
+    {
+       fib_table_fwding_dpo_update(fib_entry->fe_fib_index,
+                                   &fib_entry->fe_prefix,
+                                   &fib_entry->fe_lb);
+    }
+
+    /*
+     * if any of the other chain types are already created they will need
+     * updating too
+     */
+    fib_entry_delegate_type_t fdt;
+    fib_entry_delegate_t *fed;
+
+    FOR_EACH_DELEGATE_CHAIN(fib_entry, fdt, fed,
+    {
+        fib_entry_src_mk_lb(fib_entry, esrc,
+                            fib_entry_delegate_type_to_chain_type(fdt),
+                            &fed->fd_dpo);
+    });
+}
+
+void
+fib_entry_src_action_uninstall (fib_entry_t *fib_entry)
+{
+    /*
+     * uninstall the forwarding chain from the forwarding tables
+     */
+    FIB_ENTRY_DBG(fib_entry, "uninstall: %d",
+		  fib_entry->fe_adj_index);
+
+    if (dpo_id_is_valid(&fib_entry->fe_lb))
+    {
+	fib_table_fwding_dpo_remove(
+	    fib_entry->fe_fib_index,
+	    &fib_entry->fe_prefix,
+	    &fib_entry->fe_lb);
+
+	dpo_reset(&fib_entry->fe_lb);
+    }
+}
+
+static void
+fib_entry_recursive_loop_detect_i (fib_node_index_t path_list_index)
+{
+    fib_node_index_t *entries = NULL;
+
+    fib_path_list_recursive_loop_detect(path_list_index, &entries);
+
+    vec_free(entries);
+}
+
+void
+fib_entry_src_action_activate (fib_entry_t *fib_entry,
+			       fib_source_t source)
+
+{
+    int houston_we_are_go_for_install;
+    fib_entry_src_t *esrc;
+
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    ASSERT(!(esrc->fes_flags & FIB_ENTRY_SRC_FLAG_ACTIVE));
+    ASSERT(esrc->fes_flags & FIB_ENTRY_SRC_FLAG_ADDED);
+
+    esrc->fes_flags |= FIB_ENTRY_SRC_FLAG_ACTIVE;
+
+    if (NULL != fib_entry_src_vft[source].fesv_activate)
+    {
+	houston_we_are_go_for_install =
+	    fib_entry_src_vft[source].fesv_activate(esrc, fib_entry);
+    }
+    else
+    {
+	/*
+	 * the source is not providing an activate function, we'll assume
+	 * therefore it has no objection to installing the entry
+	 */
+	houston_we_are_go_for_install = !0;
+    }
+
+    /*
+     * link to the path-list provided by the source, and go check
+     * if that forms any loops in the graph.
+     */
+    fib_entry->fe_parent = esrc->fes_pl;
+    fib_entry->fe_sibling =
+	fib_path_list_child_add(fib_entry->fe_parent,
+				FIB_NODE_TYPE_ENTRY,
+				fib_entry_get_index(fib_entry));
+
+    fib_entry_recursive_loop_detect_i(fib_entry->fe_parent);
+
+    FIB_ENTRY_DBG(fib_entry, "activate: %d",
+		  fib_entry->fe_parent);
+
+    if (0 != houston_we_are_go_for_install)
+    {
+	fib_entry_src_action_install(fib_entry, source);
+    }
+    else
+    {
+	fib_entry_src_action_uninstall(fib_entry);
+    }
+}
+
+void
+fib_entry_src_action_deactivate (fib_entry_t *fib_entry,
+				 fib_source_t source)
+
+{
+    fib_node_index_t path_list_index;
+    fib_entry_src_t *esrc;
+
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    ASSERT(esrc->fes_flags & FIB_ENTRY_SRC_FLAG_ACTIVE);
+
+    if (NULL != fib_entry_src_vft[source].fesv_deactivate)
+    {
+	fib_entry_src_vft[source].fesv_deactivate(esrc, fib_entry);
+    }
+
+    esrc->fes_flags &= ~FIB_ENTRY_SRC_FLAG_ACTIVE;
+
+    FIB_ENTRY_DBG(fib_entry, "deactivate: %d", fib_entry->fe_parent);
+
+    /*
+     * un-link from an old path-list. Check for any loops this will clear
+     */
+    path_list_index = fib_entry->fe_parent;
+    fib_entry->fe_parent = FIB_NODE_INDEX_INVALID;
+
+    fib_entry_recursive_loop_detect_i(path_list_index);
+
+    /*
+     * this will unlock the path-list, so it may be invalid thereafter.
+     */
+    fib_path_list_child_remove(path_list_index, fib_entry->fe_sibling);
+    fib_entry->fe_sibling = FIB_NODE_INDEX_INVALID;
+}
+
+static void
+fib_entry_src_action_fwd_update (const fib_entry_t *fib_entry,
+				 fib_source_t source)
+{
+    fib_entry_src_t *esrc;
+
+    vec_foreach(esrc, fib_entry->fe_srcs)
+    {
+	if (NULL != fib_entry_src_vft[esrc->fes_src].fesv_fwd_update)
+	{
+	    fib_entry_src_vft[esrc->fes_src].fesv_fwd_update(esrc,
+							     fib_entry,
+							     source);
+	}
+    }
+}
+
+void
+fib_entry_src_action_reactivate (fib_entry_t *fib_entry,
+				 fib_source_t source)
+{
+    fib_node_index_t path_list_index;
+    fib_entry_src_t *esrc;
+
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    ASSERT(esrc->fes_flags & FIB_ENTRY_SRC_FLAG_ACTIVE);
+
+    FIB_ENTRY_DBG(fib_entry, "reactivate: %d to %d",
+		  fib_entry->fe_parent,
+		  esrc->fes_pl);
+
+    if (fib_entry->fe_parent != esrc->fes_pl)
+    {
+	/*
+	 * un-link from an old path-list. Check for any loops this will clear
+	 */
+	path_list_index = fib_entry->fe_parent;
+	fib_entry->fe_parent = FIB_NODE_INDEX_INVALID;
+
+	/*
+	 * temporary lock so it doesn't get deleted when this entry is no
+	 * longer a child.
+	 */
+	fib_path_list_lock(path_list_index);
+
+	/*
+	 * this entry is no longer a child. after unlinking check if any loops
+	 * were broken
+	 */
+	fib_path_list_child_remove(path_list_index,
+				   fib_entry->fe_sibling);
+
+	fib_entry_recursive_loop_detect_i(path_list_index);
+
+	/*
+	 * link to the path-list provided by the source, and go check
+	 * if that forms any loops in the graph.
+	 */
+	fib_entry->fe_parent = esrc->fes_pl;
+	fib_entry->fe_sibling =
+	    fib_path_list_child_add(fib_entry->fe_parent,
+				    FIB_NODE_TYPE_ENTRY,
+				    fib_entry_get_index(fib_entry));
+
+	fib_entry_recursive_loop_detect_i(fib_entry->fe_parent);
+	fib_path_list_unlock(path_list_index);
+    }
+    fib_entry_src_action_install(fib_entry, source);
+    fib_entry_src_action_fwd_update(fib_entry, source);
+}
+
+void
+fib_entry_src_action_installed (const fib_entry_t *fib_entry,
+				fib_source_t source)
+{
+    fib_entry_src_t *esrc;
+
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    if (NULL != fib_entry_src_vft[source].fesv_installed)
+    {
+	fib_entry_src_vft[source].fesv_installed(esrc,
+						 fib_entry);
+    }
+
+    fib_entry_src_action_fwd_update(fib_entry, source);
+}
+
+/*
+ * fib_entry_src_action_add
+ *
+ * Adding a source can result in a new fib_entry being created, which
+ * can inturn mean the pool is realloc'd and thus the entry passed as
+ * an argument it also realloc'd
+ * @return the original entry
+ */
+fib_entry_t *
+fib_entry_src_action_add (fib_entry_t *fib_entry,
+			  fib_source_t source,
+			  fib_entry_flag_t flags,
+			  const dpo_id_t *dpo)
+{
+    fib_node_index_t fib_entry_index;
+    fib_entry_src_t *esrc;
+
+    esrc = fib_entry_src_find_or_create(fib_entry, source, NULL);
+
+    esrc->fes_ref_count++;
+
+    if (1 != esrc->fes_ref_count)
+    {
+        /*
+         * we only want to add the source on the 0->1 transition
+         */
+        return (fib_entry);
+    }
+
+    esrc->fes_entry_flags = flags;
+
+    /*
+     * save variable so we can recover from a fib_entry realloc.
+     */
+    fib_entry_index = fib_entry_get_index(fib_entry);
+
+    if (NULL != fib_entry_src_vft[source].fesv_add)
+    {
+	fib_entry_src_vft[source].fesv_add(esrc,
+					   fib_entry,
+					   flags,
+					   fib_entry_get_proto(fib_entry),
+					   dpo);
+    }
+
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    esrc->fes_flags |= FIB_ENTRY_SRC_FLAG_ADDED;
+
+    fib_path_list_lock(esrc->fes_pl);
+
+    /*
+     * the source owns a lock on the entry
+     */
+    fib_entry_lock(fib_entry_get_index(fib_entry));
+
+    return (fib_entry);
+}
+
+/*
+ * fib_entry_src_action_update
+ *
+ * Adding a source can result in a new fib_entry being created, which
+ * can inturn mean the pool is realloc'd and thus the entry passed as
+ * an argument it also realloc'd
+ * @return the original entry
+ */
+fib_entry_t *
+fib_entry_src_action_update (fib_entry_t *fib_entry,
+			     fib_source_t source,
+			     fib_entry_flag_t flags,
+			     const dpo_id_t *dpo)
+{
+    fib_node_index_t fib_entry_index, old_path_list_index;
+    fib_entry_src_t *esrc;
+
+    esrc = fib_entry_src_find_or_create(fib_entry, source, NULL);
+
+    if (NULL == esrc)
+	return (fib_entry_src_action_add(fib_entry, source, flags, dpo));
+
+    old_path_list_index = esrc->fes_pl;
+    esrc->fes_entry_flags = flags;
+
+    /*
+     * save variable so we can recover from a fib_entry realloc.
+     */
+    fib_entry_index = fib_entry_get_index(fib_entry);
+
+    if (NULL != fib_entry_src_vft[source].fesv_add)
+    {
+	fib_entry_src_vft[source].fesv_add(esrc,
+					   fib_entry,
+					   flags,
+					   fib_entry_get_proto(fib_entry),
+					   dpo);
+    }
+
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    esrc->fes_flags |= FIB_ENTRY_SRC_FLAG_ADDED;
+
+    fib_path_list_lock(esrc->fes_pl);
+    fib_path_list_unlock(old_path_list_index);
+
+    return (fib_entry);
+}
+
+
+fib_entry_src_flag_t
+fib_entry_src_action_remove (fib_entry_t *fib_entry,
+			     fib_source_t source)
+
+{
+    fib_node_index_t old_path_list;
+    fib_entry_src_flag_t sflags;
+    fib_entry_src_t *esrc;
+
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    if (NULL == esrc)
+	return (FIB_ENTRY_SRC_FLAG_ACTIVE);
+
+    esrc->fes_ref_count--;
+    sflags = esrc->fes_flags;
+
+    if (0 != esrc->fes_ref_count)
+    {
+        /*
+         * only remove the source on the 1->0 transisition
+         */
+        return (sflags);
+    }
+
+    if (esrc->fes_flags & FIB_ENTRY_SRC_FLAG_ACTIVE)
+    {
+	fib_entry_src_action_deactivate(fib_entry, source);
+    }
+
+    old_path_list = esrc->fes_pl;
+
+    if (NULL != fib_entry_src_vft[source].fesv_remove)
+    {
+	fib_entry_src_vft[source].fesv_remove(esrc);
+    }
+
+    fib_path_list_unlock(old_path_list);
+    fib_entry_unlock(fib_entry_get_index(fib_entry));
+
+    sflags &= ~FIB_ENTRY_SRC_FLAG_ADDED;
+    fib_entry_src_action_deinit(fib_entry, source);
+
+    return (sflags);
+}
+
+static inline int
+fib_route_recurses_via_self (const fib_prefix_t *prefix,
+			     const fib_route_path_t *rpath)
+{
+    /*
+     * not all zeros next hop &&
+     * is recursive path &&
+     * nexthop is same as the route's address
+     */
+    return ((!ip46_address_is_zero(&rpath->frp_addr)) &&
+	    (~0 == rpath->frp_sw_if_index) &&
+	    (0 == ip46_address_cmp(&rpath->frp_addr, &prefix->fp_addr)));
+
+}
+
+/*
+ * fib_route_attached_cross_table
+ *
+ * Return true the the route is attached via an interface that
+ * is not in the same table as the route
+ */
+static inline int
+fib_route_attached_cross_table (const fib_entry_t *fib_entry,
+				const fib_route_path_t *rpath)
+{
+    /*
+     * - All zeros next-hop
+     * - a valid interface
+     * - entry's fib index not equeal to interface's index
+     */
+    if (ip46_address_is_zero(&rpath->frp_addr) &&
+	(~0 != rpath->frp_sw_if_index) &&
+	(fib_entry->fe_fib_index != 
+	 fib_table_get_index_for_sw_if_index(fib_entry_get_proto(fib_entry),
+					     rpath->frp_sw_if_index)))
+    {
+	return (!0);
+    }
+    return (0);
+}
+
+/*
+ * fib_route_attached_cross_table
+ *
+ * Return true the the route is attached via an interface that
+ * is not in the same table as the route
+ */
+static inline int
+fib_path_is_attached (const fib_route_path_t *rpath)
+{
+    /*
+     * - All zeros next-hop
+     * - a valid interface
+     */
+    if (ip46_address_is_zero(&rpath->frp_addr) &&
+	(~0 != rpath->frp_sw_if_index))
+    {
+	return (!0);
+    }
+    return (0);
+}
+
+fib_path_list_flags_t
+fib_entry_src_flags_2_path_list_flags (fib_entry_flag_t eflags)
+{
+    fib_path_list_flags_t plf = FIB_PATH_LIST_FLAG_NONE;
+
+    if (eflags & FIB_ENTRY_FLAG_DROP)
+    {
+	plf |= FIB_PATH_LIST_FLAG_DROP;
+    }
+    if (eflags & FIB_ENTRY_FLAG_LOCAL)
+    {
+	plf |= FIB_PATH_LIST_FLAG_LOCAL;
+    }
+    if (eflags & FIB_ENTRY_FLAG_EXCLUSIVE)
+    {
+	plf |= FIB_PATH_LIST_FLAG_EXCLUSIVE;
+    }
+
+    return (plf);
+}
+
+static void
+fib_entry_flags_update (const fib_entry_t *fib_entry,
+			const fib_route_path_t *rpath,
+			fib_path_list_flags_t *pl_flags,
+			fib_entry_src_t *esrc)
+{
+    /*
+     * don't allow the addition of a recursive looped path for prefix
+     * via itself.
+     */
+    if (fib_route_recurses_via_self(&fib_entry->fe_prefix, rpath))	
+    {
+	/*
+	 * force the install of a drop path-list.
+	 * we want the entry to have some path-list, mainly so
+	 * the dodgy path can be rmeoved when the source stops playing
+	 * silly buggers.
+	 */
+	*pl_flags |= FIB_PATH_LIST_FLAG_DROP;
+    }
+    else
+    {
+	*pl_flags &= ~FIB_PATH_LIST_FLAG_DROP;
+    }
+
+    if ((esrc->fes_src == FIB_SOURCE_API) ||
+	(esrc->fes_src == FIB_SOURCE_CLI))
+    {
+	if (fib_path_is_attached(rpath))
+	{
+	    esrc->fes_entry_flags |= FIB_ENTRY_FLAG_ATTACHED;
+	}
+	else
+	{
+	    esrc->fes_entry_flags &= ~FIB_ENTRY_FLAG_ATTACHED;
+	}
+    }
+    if (fib_route_attached_cross_table(fib_entry, rpath))
+    {
+	esrc->fes_entry_flags |= FIB_ENTRY_FLAG_IMPORT;
+    }
+    else
+    {
+	esrc->fes_entry_flags &= ~FIB_ENTRY_FLAG_IMPORT;
+    }
+}
+
+/*
+ * fib_entry_src_path_ext_add
+ *
+ * append a path extension to the entry's list
+ */
+static void
+fib_entry_src_path_ext_append (fib_entry_src_t *esrc,
+			       const fib_route_path_t *rpath)
+{
+    if (NULL != rpath->frp_label_stack)
+    {
+	fib_path_ext_t *path_ext;
+
+	vec_add2(esrc->fes_path_exts, path_ext, 1);
+
+	fib_path_ext_init(path_ext, esrc->fes_pl, rpath);
+    }
+}
+
+/*
+ * fib_entry_src_path_ext_insert
+ *
+ * insert, sorted, a path extension to the entry's list.
+ * It's not strictly necessary in sort the path extensions, since each
+ * extension has the path index to which it resolves. However, by being
+ * sorted the load-balance produced has a deterministic order, not an order
+ * based on the sequence of extension additions. this is a considerable benefit.
+ */
+static void
+fib_entry_src_path_ext_insert (fib_entry_src_t *esrc,
+			       const fib_route_path_t *rpath)
+{
+    if (0 == vec_len(esrc->fes_path_exts))
+	return (fib_entry_src_path_ext_append(esrc, rpath));
+
+    if (NULL != rpath->frp_label_stack)
+    {
+	fib_path_ext_t path_ext;
+	int i = 0;
+
+	fib_path_ext_init(&path_ext, esrc->fes_pl, rpath);
+
+	while (i < vec_len(esrc->fes_path_exts) &&
+	       (fib_path_ext_cmp(&esrc->fes_path_exts[i], rpath) < 0))
+	{
+	    i++;
+	}
+
+	vec_insert_elts(esrc->fes_path_exts, &path_ext, 1, i);
+    }
+}
+
+/*
+ * fib_entry_src_action_add
+ *
+ * Adding a source can result in a new fib_entry being created, which
+ * can inturn mean the pool is realloc'd and thus the entry passed as
+ * an argument it also realloc'd
+ * @return the entry
+ */
+fib_entry_t*
+fib_entry_src_action_path_add (fib_entry_t *fib_entry,
+			       fib_source_t source,
+			       fib_entry_flag_t flags,
+			       const fib_route_path_t *rpath)
+{
+    fib_node_index_t old_path_list, fib_entry_index;
+    fib_path_list_flags_t pl_flags;
+    fib_path_ext_t *path_ext;
+    fib_entry_src_t *esrc;
+
+    /*
+     * save variable so we can recover from a fib_entry realloc.
+     */
+    fib_entry_index = fib_entry_get_index(fib_entry);
+
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+    if (NULL == esrc)
+    {
+	fib_entry =
+            fib_entry_src_action_add(fib_entry,
+                                     source,
+                                     flags,
+                                     drop_dpo_get(
+                                         fib_proto_to_dpo(
+                                             fib_entry_get_proto(fib_entry))));
+	esrc = fib_entry_src_find(fib_entry, source, NULL);
+    }
+
+    /*
+     * we are no doubt modifying a path-list. If the path-list
+     * is shared, and hence not modifiable, then the index returned
+     * will be for a different path-list. This FIB entry to needs
+     * to maintain its lock appropriately.
+     */
+    old_path_list = esrc->fes_pl;
+
+    ASSERT(NULL != fib_entry_src_vft[source].fesv_path_add);
+
+    pl_flags = fib_entry_src_flags_2_path_list_flags(fib_entry_get_flags_i(fib_entry));
+    fib_entry_flags_update(fib_entry, rpath, &pl_flags, esrc);
+
+    fib_entry_src_vft[source].fesv_path_add(esrc, fib_entry, pl_flags, rpath);
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    /*
+     * re-resolve all the path-extensions with the new path-list
+     */
+    vec_foreach(path_ext, esrc->fes_path_exts)
+    {
+	fib_path_ext_resolve(path_ext, esrc->fes_pl);
+    }
+    /*
+     * if the path has a label we need to add a path extension
+     */
+    fib_entry_src_path_ext_insert(esrc, rpath);
+
+    fib_path_list_lock(esrc->fes_pl);
+    fib_path_list_unlock(old_path_list);
+
+    return (fib_entry);
+}
+
+/*
+ * fib_entry_src_action_swap
+ *
+ * The source is providing new paths to replace the old ones.
+ * Adding a source can result in a new fib_entry being created, which
+ * can inturn mean the pool is realloc'd and thus the entry passed as
+ * an argument it also realloc'd
+ * @return the entry
+ */
+fib_entry_t*
+fib_entry_src_action_path_swap (fib_entry_t *fib_entry,
+				fib_source_t source,
+				fib_entry_flag_t flags,				
+				const fib_route_path_t *rpaths)
+{
+    fib_node_index_t old_path_list, fib_entry_index;
+    fib_path_list_flags_t pl_flags;
+    const fib_route_path_t *rpath;
+    fib_path_ext_t *path_ext;
+    fib_entry_src_t *esrc;
+
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    /*
+     * save variable so we can recover from a fib_entry realloc.
+     */
+    fib_entry_index = fib_entry_get_index(fib_entry);
+
+    if (NULL == esrc)
+    {
+	fib_entry = fib_entry_src_action_add(fib_entry,
+					     source,
+					     flags,
+                                             drop_dpo_get(
+                                                 fib_proto_to_dpo(
+                                                     fib_entry_get_proto(fib_entry))));
+	esrc = fib_entry_src_find(fib_entry, source, NULL);
+    }
+
+    /*
+     * swapping paths may create a new path-list (or may use an existing shared)
+     * but we are certainly getting a different one. This FIB entry to needs
+     * to maintain its lock appropriately.
+     */
+    old_path_list = esrc->fes_pl;
+
+    ASSERT(NULL != fib_entry_src_vft[source].fesv_path_swap);
+
+    pl_flags = fib_entry_src_flags_2_path_list_flags(flags);
+
+    vec_foreach(rpath, rpaths)
+    {
+	fib_entry_flags_update(fib_entry, rpath, &pl_flags, esrc);
+    }
+
+    fib_entry_src_vft[source].fesv_path_swap(esrc,
+					     fib_entry,
+					     pl_flags,
+					     rpaths);
+
+    vec_foreach(path_ext, esrc->fes_path_exts)
+    {
+	vec_free(path_ext->fpe_label_stack);
+    }
+    vec_free(esrc->fes_path_exts);
+
+    vec_foreach(rpath, rpaths)
+    {
+	fib_entry_src_path_ext_append(esrc, rpath);
+    }
+
+    fib_entry = fib_entry_get(fib_entry_index);
+
+    fib_path_list_lock(esrc->fes_pl);
+    fib_path_list_unlock(old_path_list);
+
+    return (fib_entry);
+}
+
+fib_entry_src_flag_t
+fib_entry_src_action_path_remove (fib_entry_t *fib_entry,
+				  fib_source_t source,
+				  const fib_route_path_t *rpath)
+{
+    fib_path_list_flags_t pl_flags;
+    fib_node_index_t old_path_list;
+    fib_path_ext_t *path_ext;
+    fib_entry_src_t *esrc;
+
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    ASSERT(NULL != esrc);
+    ASSERT(esrc->fes_flags & FIB_ENTRY_SRC_FLAG_ADDED);
+
+    /*
+     * we no doubt modifying a path-list. If the path-list
+     * is shared, and hence not modifiable, then the index returned
+     * will be for a different path-list. This FIB entry to needs
+     * to maintain its lock appropriately.
+     */
+    old_path_list = esrc->fes_pl;
+
+    ASSERT(NULL != fib_entry_src_vft[source].fesv_path_remove);
+
+    pl_flags = fib_entry_src_flags_2_path_list_flags(fib_entry_get_flags_i(fib_entry));
+    fib_entry_flags_update(fib_entry, rpath, &pl_flags, esrc);
+
+    fib_entry_src_vft[source].fesv_path_remove(esrc, pl_flags, rpath);
+    /*
+     * find the matching path extension and remove it
+     */
+    vec_foreach(path_ext, esrc->fes_path_exts)
+    {
+	if (!fib_path_ext_cmp(path_ext, rpath))
+	{
+	    /*
+	     * delete the element moving the remaining elements down 1 position.
+	     * this preserves the sorted order.
+	     */
+	    vec_free(path_ext->fpe_label_stack);
+	    vec_delete(esrc->fes_path_exts, 1, (path_ext - esrc->fes_path_exts));
+	    break;
+	}
+    }
+    /*
+     * re-resolve all the path-extensions with the new path-list
+     */
+    vec_foreach(path_ext, esrc->fes_path_exts)
+    {
+	fib_path_ext_resolve(path_ext, esrc->fes_pl);
+    }
+
+    /*
+     * lock the new path-list, unlock the old if it had one
+     */
+    fib_path_list_unlock(old_path_list);
+
+    if (FIB_NODE_INDEX_INVALID != esrc->fes_pl) {
+	fib_path_list_lock(esrc->fes_pl);
+	return (FIB_ENTRY_SRC_FLAG_ADDED);
+    }
+    else
+    {
+	/*
+	 * no more paths left from this source
+	 */
+	fib_entry_src_action_remove(fib_entry, source);
+	return (FIB_ENTRY_SRC_FLAG_NONE);
+    }
+}
+
+u8*
+fib_entry_src_format (fib_entry_t *fib_entry,
+		      fib_source_t source,
+		      u8* s)
+{
+    fib_entry_src_t *esrc;
+
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    if (NULL != fib_entry_src_vft[source].fesv_format)
+    {
+	return (fib_entry_src_vft[source].fesv_format(esrc, s));
+    }
+    return (s);
+}
+
+adj_index_t
+fib_entry_get_adj_for_source (fib_node_index_t fib_entry_index,
+			      fib_source_t source)
+{
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *esrc;
+
+    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
+	return (ADJ_INDEX_INVALID);
+
+    fib_entry = fib_entry_get(fib_entry_index);
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    if (NULL != esrc)
+    {
+	if (FIB_NODE_INDEX_INVALID != esrc->fes_pl)
+	{
+	    return (fib_path_list_get_adj(
+			esrc->fes_pl,
+			fib_entry_get_default_chain_type(fib_entry)));
+	}
+    }
+    return (ADJ_INDEX_INVALID);
+}
+
+const int
+fib_entry_get_dpo_for_source (fib_node_index_t fib_entry_index,
+			      fib_source_t source,
+			      dpo_id_t *dpo)
+{
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *esrc;
+
+    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
+	return (0);
+
+    fib_entry = fib_entry_get(fib_entry_index);
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    if (NULL != esrc)
+    {
+	if (FIB_NODE_INDEX_INVALID != esrc->fes_pl)
+	{
+	    fib_path_list_contribute_forwarding(
+		esrc->fes_pl,
+		fib_entry_get_default_chain_type(fib_entry),
+		dpo);
+
+	    return (dpo_id_is_valid(dpo));
+	}
+    }
+    return (0);
+}
+
+u32
+fib_entry_get_resolving_interface_for_source (fib_node_index_t entry_index,
+					      fib_source_t source)
+{
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *esrc;
+
+    fib_entry = fib_entry_get(entry_index);
+
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    if (NULL != esrc)
+    {
+	if (FIB_NODE_INDEX_INVALID != esrc->fes_pl)
+	{
+	    return (fib_path_list_get_resolving_interface(esrc->fes_pl));
+	}
+    }
+    return (~0);
+}
+
+fib_entry_flag_t
+fib_entry_get_flags_for_source (fib_node_index_t entry_index,
+				fib_source_t source)
+{
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *esrc;
+
+    fib_entry = fib_entry_get(entry_index);
+
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    if (NULL != esrc)
+    {
+	return (esrc->fes_entry_flags);
+    }
+
+    return (FIB_ENTRY_FLAG_NONE);
+}
+
+fib_entry_flag_t
+fib_entry_get_flags_i (const fib_entry_t *fib_entry)
+{
+    fib_entry_flag_t flags;
+
+    /*
+     * the vector of sources is deliberately arranged in priority order
+     */
+    if (0 == vec_len(fib_entry->fe_srcs))
+    {
+	flags = FIB_ENTRY_FLAG_NONE;
+    }
+    else
+    {
+	fib_entry_src_t *esrc;
+
+	esrc = vec_elt_at_index(fib_entry->fe_srcs, 0);
+	flags = esrc->fes_entry_flags;
+    }
+
+    return (flags);
+}
+
+void
+fib_entry_set_source_data (fib_node_index_t fib_entry_index,
+                           fib_source_t source,
+                           const void *data)
+{
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *esrc;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    if (NULL != esrc &&
+        NULL != fib_entry_src_vft[source].fesv_set_data)
+    {
+	fib_entry_src_vft[source].fesv_set_data(esrc, fib_entry, data);
+    }
+}
+
+const void*
+fib_entry_get_source_data (fib_node_index_t fib_entry_index,
+                           fib_source_t source)
+{
+    fib_entry_t *fib_entry;
+    fib_entry_src_t *esrc;
+
+    fib_entry = fib_entry_get(fib_entry_index);
+    esrc = fib_entry_src_find(fib_entry, source, NULL);
+
+    if (NULL != esrc &&
+        NULL != fib_entry_src_vft[source].fesv_get_data)
+    {
+	return (fib_entry_src_vft[source].fesv_get_data(esrc, fib_entry));
+    }
+    return (NULL);
+}
+
+void
+fib_entry_src_module_init (void)
+{
+    fib_entry_src_rr_register();
+    fib_entry_src_interface_register();
+    fib_entry_src_default_route_register();
+    fib_entry_src_special_register();
+    fib_entry_src_api_register();
+    fib_entry_src_adj_register();
+    fib_entry_src_mpls_register();
+    fib_entry_src_lisp_register();
+}
diff --git a/src/vnet/fib/fib_entry_src.h b/src/vnet/fib/fib_entry_src.h
new file mode 100644
index 00000000..640c174d
--- /dev/null
+++ b/src/vnet/fib/fib_entry_src.h
@@ -0,0 +1,296 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __FIB_ENTRY_SRC_H__
+#define __FIB_ENTRY_SRC_H__
+
+#include "fib_entry.h"
+#include "fib_path_list.h"
+#include "fib_internal.h"
+
+/**
+ * Debug macro
+ */
+#ifdef FIB_DEBUG
+#define FIB_ENTRY_DBG(_e, _fmt, _args...)		\
+{   		          				\
+    u8*__tmp = NULL;					\
+    __tmp = format(__tmp, "e:[%d:%U",			\
+		   fib_entry_get_index(_e),		\
+		   format_ip46_address,			\
+		   &_e->fe_prefix.fp_addr,		\
+		   IP46_TYPE_ANY);			\
+    __tmp = format(__tmp, "/%d]:",			\
+		   _e->fe_prefix.fp_len);		\
+    __tmp = format(__tmp, _fmt, ##_args);		\
+    clib_warning("%s", __tmp);				\
+    vec_free(__tmp);					\
+}
+#else
+#define FIB_ENTRY_DBG(_e, _fmt, _args...)
+#endif
+
+/**
+ * Source initialisation Function 
+ */
+typedef void (*fib_entry_src_init_t)(fib_entry_src_t *src);
+
+/**
+ * Source deinitialisation Function 
+ */
+typedef void (*fib_entry_src_deinit_t)(fib_entry_src_t *src);
+
+/**
+ * Source activation. Called when the source is the new best source on the entry.
+ * Return non-zero if the entry can now install, 0 otherwise
+ */
+typedef int (*fib_entry_src_activate_t)(fib_entry_src_t *src,
+					 const fib_entry_t *fib_entry);
+
+/**
+ * Source Deactivate. 
+ * Called when the source is no longer best source on the entry
+ */
+typedef void (*fib_entry_src_deactivate_t)(fib_entry_src_t *src,
+					   const fib_entry_t *fib_entry);
+
+/**
+ * Source Add.
+ * Called when the source is added to the entry
+ */
+typedef void (*fib_entry_src_add_t)(fib_entry_src_t *src,
+				    const fib_entry_t *entry,
+				    fib_entry_flag_t flags,
+				    fib_protocol_t proto,
+				    const dpo_id_t *dpo);
+
+/**
+ * Source Remove.
+ */
+typedef void (*fib_entry_src_remove_t)(fib_entry_src_t *src);
+
+/**
+ * Result from a cover update/change
+ */
+typedef struct fib_entry_src_cover_res_t_ {
+    u16 install;
+    fib_node_bw_reason_flag_t bw_reason;
+} fib_entry_src_cover_res_t;
+
+/**
+ * Cover changed. the source should re-evaluate its cover.
+ */
+typedef fib_entry_src_cover_res_t (*fib_entry_src_cover_change_t)(
+    fib_entry_src_t *src,
+    const fib_entry_t *fib_entry);
+
+/**
+ * Cover updated. The cover the source has, has updated (i.e. its forwarding)
+ * the source may need to re-evaluate.
+ */
+typedef fib_entry_src_cover_res_t (*fib_entry_src_cover_update_t)(
+    fib_entry_src_t *src,
+    const fib_entry_t *fib_entry);
+
+/**
+ * Forwarding updated. Notification that the forwarding information for the
+ * entry has been updated. This notification is sent to all sources, not just
+ * the active best.
+ */
+typedef void (*fib_entry_src_fwd_update_t)(fib_entry_src_t *src,
+					   const fib_entry_t *fib_entry,
+					   fib_source_t best_source);
+
+/**
+ * Installed. Notification that the source is now installed as
+ * the entry's forwarding source.
+ */
+typedef void (*fib_entry_src_installed_t)(fib_entry_src_t *src,
+					  const fib_entry_t *fib_entry);
+
+/**
+ * format.
+ */
+typedef u8* (*fib_entry_src_format_t)(fib_entry_src_t *src,
+				      u8* s);
+
+/**
+ * Source path add
+ * the source is adding a new path
+ */
+typedef void (*fib_entry_src_path_add_t)(fib_entry_src_t *src,
+					 const fib_entry_t *fib_entry,
+					 fib_path_list_flags_t pl_flags,
+					 const fib_route_path_t *path);
+
+/**
+ * Source path remove
+ * the source is remoinvg a path
+ */
+typedef void (*fib_entry_src_path_remove_t)(fib_entry_src_t *src,
+					    fib_path_list_flags_t pl_flags,
+					    const fib_route_path_t *path);
+
+/**
+ * Source path replace/swap
+ * the source is providing a new set of paths
+ */
+typedef void (*fib_entry_src_path_swap_t)(fib_entry_src_t *src,
+					  const fib_entry_t *fib_entry,
+					  fib_path_list_flags_t pl_flags,
+					  const fib_route_path_t *path);
+
+/**
+ * Set source specific opaque data
+ */
+typedef void (*fib_entry_src_set_data_t)(fib_entry_src_t *src,
+                                         const fib_entry_t *fib_entry,
+                                         const void *data);
+
+/**
+ * Get source specific opaque data
+ */
+typedef const void* (*fib_entry_src_get_data_t)(fib_entry_src_t *src,
+                                                const fib_entry_t *fib_entry);
+
+/**
+ * Virtual function table each FIB entry source will register
+ */
+typedef struct fib_entry_src_vft_t_ {
+    fib_entry_src_init_t fesv_init;
+    fib_entry_src_deinit_t fesv_deinit;
+    fib_entry_src_activate_t fesv_activate;
+    fib_entry_src_deactivate_t fesv_deactivate;
+    fib_entry_src_add_t fesv_add;
+    fib_entry_src_remove_t fesv_remove;
+    fib_entry_src_path_swap_t fesv_path_swap;
+    fib_entry_src_path_add_t fesv_path_add;
+    fib_entry_src_path_remove_t fesv_path_remove;
+    fib_entry_src_cover_change_t fesv_cover_change;
+    fib_entry_src_cover_update_t fesv_cover_update;
+    fib_entry_src_format_t fesv_format;
+    fib_entry_src_installed_t fesv_installed;
+    fib_entry_src_fwd_update_t fesv_fwd_update;
+    fib_entry_src_get_data_t fesv_get_data;
+    fib_entry_src_set_data_t fesv_set_data;
+} fib_entry_src_vft_t;
+
+#define FOR_EACH_SRC_ADDED(_entry, _src, _source, action)	\
+{								\
+    vec_foreach(_src, _entry->fe_srcs)				\
+    {								\
+	if (_src->fes_flags & FIB_ENTRY_SRC_FLAG_ADDED) {	\
+	    _source = _src->fes_src;				\
+	    do {						\
+		action;						\
+	    } while(0);						\
+	}							\
+    }								\
+}
+
+extern u8* fib_entry_src_format(fib_entry_t *entry,
+				fib_source_t source,
+				u8* s);
+
+extern void fib_entry_src_register(fib_source_t source,
+				   const fib_entry_src_vft_t *vft);
+
+extern void fib_entry_src_action_init(fib_entry_t *entry,
+				      fib_source_t source);
+
+extern void fib_entry_src_action_deinit(fib_entry_t *fib_entry,
+					fib_source_t source);
+
+extern fib_entry_src_cover_res_t fib_entry_src_action_cover_change(
+    fib_entry_t *entry,
+    fib_source_t source);
+
+extern fib_entry_src_cover_res_t fib_entry_src_action_cover_update(
+    fib_entry_t *fib_entry,
+    fib_source_t source);
+
+extern void fib_entry_src_action_activate(fib_entry_t *fib_entry,
+					  fib_source_t source);
+
+extern void fib_entry_src_action_deactivate(fib_entry_t *fib_entry,
+					    fib_source_t source);
+extern void fib_entry_src_action_reactivate(fib_entry_t *fib_entry,
+					    fib_source_t source);
+
+extern fib_entry_t* fib_entry_src_action_add(fib_entry_t *fib_entry,
+					     fib_source_t source,
+					     fib_entry_flag_t flags,
+					     const dpo_id_t *dpo);
+extern fib_entry_t* fib_entry_src_action_update(fib_entry_t *fib_entry,
+						fib_source_t source,
+						fib_entry_flag_t flags,
+						const dpo_id_t *dpo);
+
+extern fib_entry_src_flag_t fib_entry_src_action_remove(fib_entry_t *fib_entry,
+							fib_source_t source);
+
+extern void fib_entry_src_action_install(fib_entry_t *fib_entry,
+					 fib_source_t source);
+
+extern void fib_entry_src_action_uninstall(fib_entry_t *fib_entry);
+
+extern fib_entry_t* fib_entry_src_action_path_add(fib_entry_t *fib_entry,
+						  fib_source_t source,
+						  fib_entry_flag_t flags,
+						  const fib_route_path_t *path);
+
+extern fib_entry_t* fib_entry_src_action_path_swap(fib_entry_t *fib_entry,
+						   fib_source_t source,
+						   fib_entry_flag_t flags,
+						   const fib_route_path_t *path);
+
+extern fib_entry_src_flag_t fib_entry_src_action_path_remove(fib_entry_t *fib_entry,
+							     fib_source_t source,
+							     const fib_route_path_t *path);
+
+extern void fib_entry_src_action_installed(const fib_entry_t *fib_entry,
+					   fib_source_t source);
+
+extern fib_forward_chain_type_t fib_entry_get_default_chain_type(
+    const fib_entry_t *fib_entry);
+extern fib_entry_flag_t fib_entry_get_flags_i(const fib_entry_t *fib_entry);
+extern fib_path_list_flags_t fib_entry_src_flags_2_path_list_flags(
+    fib_entry_flag_t eflags);
+
+extern fib_forward_chain_type_t fib_entry_chain_type_fixup(const fib_entry_t *entry,
+                                                           fib_forward_chain_type_t fct);
+
+extern void fib_entry_src_mk_lb (fib_entry_t *fib_entry,
+				 const fib_entry_src_t *esrc,
+				 fib_forward_chain_type_t fct,
+				 dpo_id_t *dpo_lb);
+
+
+/*
+ * Per-source registration. declared here so we save a separate .h file for each
+ */
+extern void fib_entry_src_default_register(void);
+extern void fib_entry_src_rr_register(void);
+extern void fib_entry_src_interface_register(void);
+extern void fib_entry_src_default_route_register(void);
+extern void fib_entry_src_special_register(void);
+extern void fib_entry_src_api_register(void);
+extern void fib_entry_src_adj_register(void);
+extern void fib_entry_src_mpls_register(void);
+extern void fib_entry_src_lisp_register(void);
+
+extern void fib_entry_src_module_init(void);
+
+#endif
diff --git a/src/vnet/fib/fib_entry_src_adj.c b/src/vnet/fib/fib_entry_src_adj.c
new file mode 100644
index 00000000..64f82a73
--- /dev/null
+++ b/src/vnet/fib/fib_entry_src_adj.c
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "fib_entry.h"
+#include "fib_entry_src.h"
+#include "fib_path_list.h"
+#include "fib_table.h"
+#include "fib_entry_cover.h"
+#include "fib_attached_export.h"
+
+/**
+ * Source initialisation Function 
+ */
+static void
+fib_entry_src_adj_init (fib_entry_src_t *src)
+{
+    src->adj.fesa_cover = FIB_NODE_INDEX_INVALID;
+    src->adj.fesa_sibling = FIB_NODE_INDEX_INVALID;
+}
+
+static void
+fib_entry_src_adj_path_swap (fib_entry_src_t *src,
+			     const fib_entry_t *entry,
+			     fib_path_list_flags_t pl_flags,
+			     const fib_route_path_t *paths)
+{
+    src->fes_pl = fib_path_list_create(pl_flags, paths);
+}
+
+static void
+fib_entry_src_adj_remove (fib_entry_src_t *src)
+{
+    src->fes_pl = FIB_NODE_INDEX_INVALID;
+}
+
+
+/*
+ * Source activate. 
+ * Called when the source is teh new longer best source on the entry
+ */
+static int
+fib_entry_src_adj_activate (fib_entry_src_t *src,
+			    const fib_entry_t *fib_entry)
+{
+    fib_entry_t *cover;
+
+    /*
+     * find the covering prefix. become a dependent thereof.
+     * there should always be a cover, though it may be the default route.
+     */
+    src->adj.fesa_cover = fib_table_get_less_specific(fib_entry->fe_fib_index,
+						      &fib_entry->fe_prefix);
+
+    ASSERT(FIB_NODE_INDEX_INVALID != src->adj.fesa_cover);
+    ASSERT(fib_entry_get_index(fib_entry) != src->adj.fesa_cover);
+
+    cover = fib_entry_get(src->adj.fesa_cover);
+
+    ASSERT(cover != fib_entry);
+
+    src->adj.fesa_sibling =
+	fib_entry_cover_track(cover,
+			      fib_entry_get_index(fib_entry));
+
+    /*
+     * if the ocver is attached then this adj source entry can install, 
+     * via the adj. otherwise install a drop.
+     * This prevents ARP/ND entries that on interface X that do not belong
+     * on X's subnet from being added to the FIB. To do so would allow
+     * nefarious gratuitous ARP requests from attracting traffic to the sender.
+     *
+     * and yes, I really do mean attached and not connected.
+     * this abomination;
+     *   ip route add 10.0.0.0/24 Eth0
+     * is attached. and we want adj-fibs to install on Eth0.
+     */
+    return (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(cover));
+}
+
+/*
+ * Source Deactivate. 
+ * Called when the source is no longer best source on the entry
+ */
+static void
+fib_entry_src_adj_deactivate (fib_entry_src_t *src,
+			      const fib_entry_t *fib_entry)
+{
+    fib_entry_t *cover;
+
+    /*
+     * remove the depednecy on the covering entry
+     */
+    ASSERT(FIB_NODE_INDEX_INVALID != src->adj.fesa_cover);
+    cover = fib_entry_get(src->adj.fesa_cover);
+
+    fib_entry_cover_untrack(cover, src->adj.fesa_sibling);
+
+    /*
+     * tell the cover this entry no longer needs exporting
+     */
+    fib_attached_export_covered_removed(cover, fib_entry_get_index(fib_entry));
+
+    src->adj.fesa_cover = FIB_NODE_INDEX_INVALID;
+}
+
+static u8*
+fib_entry_src_adj_format (fib_entry_src_t *src,
+			 u8* s)
+{
+    return (format(s, "cover:%d", src->adj.fesa_cover));
+}
+
+static void
+fib_entry_src_adj_installed (fib_entry_src_t *src,
+			     const fib_entry_t *fib_entry)
+{
+    /*
+     * The adj source now rules! poke our cover to get exported
+     */
+    fib_entry_t *cover;
+
+    ASSERT(FIB_NODE_INDEX_INVALID != src->adj.fesa_cover);
+    cover = fib_entry_get(src->adj.fesa_cover);
+
+    fib_attached_export_covered_added(cover,
+				      fib_entry_get_index(fib_entry));
+}
+
+static fib_entry_src_cover_res_t
+fib_entry_src_adj_cover_change (fib_entry_src_t *src,
+				const fib_entry_t *fib_entry)
+{
+    fib_entry_src_cover_res_t res = {
+	.install = !0,
+	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
+    };
+
+    fib_entry_src_adj_deactivate(src, fib_entry);
+
+    res.install = fib_entry_src_adj_activate(src, fib_entry);
+
+    if (res.install) {
+	/*
+	 * ADJ fib can install
+	 */
+	res.bw_reason = FIB_NODE_BW_REASON_FLAG_EVALUATE;
+    }
+
+    return (res);
+}
+
+/*
+ * fib_entry_src_adj_cover_update
+ */
+static fib_entry_src_cover_res_t
+fib_entry_src_adj_cover_update (fib_entry_src_t *src,
+                                const fib_entry_t *fib_entry)
+{
+    /*
+     * the cover has updated, i.e. its forwarding or flags
+     * have changed. do'nt decativate/activate here, since this
+     * prefix is updated during the covers walk.
+     */
+    fib_entry_src_cover_res_t res = {
+	.install = !0,
+	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
+    };
+    fib_entry_t *cover;
+
+    ASSERT(FIB_NODE_INDEX_INVALID != src->adj.fesa_cover);
+
+    cover = fib_entry_get(src->adj.fesa_cover);
+
+    res.install = (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(cover));
+
+    return (res);
+}
+
+const static fib_entry_src_vft_t adj_src_vft = {
+    .fesv_init = fib_entry_src_adj_init,
+    .fesv_path_swap = fib_entry_src_adj_path_swap,
+    .fesv_remove = fib_entry_src_adj_remove,
+    .fesv_activate = fib_entry_src_adj_activate,
+    .fesv_deactivate = fib_entry_src_adj_deactivate,
+    .fesv_format = fib_entry_src_adj_format,
+    .fesv_installed = fib_entry_src_adj_installed,
+    .fesv_cover_change = fib_entry_src_adj_cover_change,
+    .fesv_cover_update = fib_entry_src_adj_cover_update,
+};
+
+void
+fib_entry_src_adj_register (void)
+{
+    fib_entry_src_register(FIB_SOURCE_ADJ, &adj_src_vft);
+}
diff --git a/src/vnet/fib/fib_entry_src_api.c b/src/vnet/fib/fib_entry_src_api.c
new file mode 100644
index 00000000..edc8a47b
--- /dev/null
+++ b/src/vnet/fib/fib_entry_src_api.c
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "fib_entry.h"
+#include "fib_entry_src.h"
+#include "fib_path_list.h"
+
+/**
+ * Source initialisation Function 
+ */
+static void
+fib_entry_src_api_init (fib_entry_src_t *src)
+{
+}
+
+/**
+ * Source deinitialisation Function 
+ */
+static void
+fib_entry_src_api_deinit (fib_entry_src_t *src)
+{
+}
+
+static void
+fib_entry_src_api_path_swap (fib_entry_src_t *src,
+			     const fib_entry_t *entry,
+			     fib_path_list_flags_t pl_flags,
+			     const fib_route_path_t *paths)
+{
+    src->fes_pl = fib_path_list_create((FIB_PATH_LIST_FLAG_SHARED | pl_flags),
+				       paths);
+}
+
+static void
+fib_entry_src_api_path_add (fib_entry_src_t *src,
+			    const fib_entry_t *entry,
+			    fib_path_list_flags_t pl_flags,
+			    const fib_route_path_t *paths)
+{
+    if (FIB_NODE_INDEX_INVALID == src->fes_pl)
+    {	
+	src->fes_pl =
+	    fib_path_list_create((FIB_PATH_LIST_FLAG_SHARED | pl_flags), paths);
+    }
+    else
+    {
+	src->fes_pl =
+	    fib_path_list_copy_and_path_add(src->fes_pl,
+					    (FIB_PATH_LIST_FLAG_SHARED | pl_flags),
+					    paths);
+    }
+}
+
+static void
+fib_entry_src_api_path_remove (fib_entry_src_t *src,
+			       fib_path_list_flags_t pl_flags,
+			       const fib_route_path_t *paths)
+{
+    if (FIB_NODE_INDEX_INVALID != src->fes_pl)
+    {
+	src->fes_pl =
+	    fib_path_list_copy_and_path_remove(src->fes_pl,
+					       (FIB_PATH_LIST_FLAG_SHARED | pl_flags),
+					       paths);
+    }
+}
+
+static void
+fib_entry_src_api_add (fib_entry_src_t *src,
+		       const fib_entry_t *entry,
+		       fib_entry_flag_t flags,
+		       fib_protocol_t proto,
+		       const dpo_id_t *dpo)
+{
+    if (FIB_ENTRY_FLAG_NONE != flags)
+    {
+	src->fes_pl = fib_path_list_create_special(
+	                  proto,
+			  fib_entry_src_flags_2_path_list_flags(flags),
+			  dpo);
+    }
+}
+
+static void
+fib_entry_src_api_remove (fib_entry_src_t *src)
+{
+    src->fes_pl = FIB_NODE_INDEX_INVALID;
+}
+
+const static fib_entry_src_vft_t api_src_vft = {
+    .fesv_init = fib_entry_src_api_init,
+    .fesv_deinit = fib_entry_src_api_deinit,
+    .fesv_add = fib_entry_src_api_add,
+    .fesv_remove = fib_entry_src_api_remove,
+    .fesv_path_add = fib_entry_src_api_path_add,
+    .fesv_path_swap = fib_entry_src_api_path_swap,
+    .fesv_path_remove = fib_entry_src_api_path_remove,
+};
+
+void
+fib_entry_src_api_register (void)
+{
+    fib_entry_src_register(FIB_SOURCE_PLUGIN_HI, &api_src_vft);
+    fib_entry_src_register(FIB_SOURCE_API, &api_src_vft);
+    fib_entry_src_register(FIB_SOURCE_CLI, &api_src_vft);
+    fib_entry_src_register(FIB_SOURCE_DHCP, &api_src_vft);
+}
diff --git a/src/vnet/fib/fib_entry_src_default.c b/src/vnet/fib/fib_entry_src_default.c
new file mode 100644
index 00000000..9846cf56
--- /dev/null
+++ b/src/vnet/fib/fib_entry_src_default.c
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "fib_entry.h"
+#include "fib_entry_src.h"
+#include "fib_path_list.h"
+
+/**
+ * Source initialisation Function 
+ */
+static void
+fib_entry_src_default_init (fib_entry_src_t *src)
+{
+}
+
+/**
+ * Source deinitialisation Function 
+ */
+static void
+fib_entry_src_default_deinit (fib_entry_src_t *src)
+{
+}
+
+static void
+fib_entry_src_cover_change (fib_entry_src_t *src)
+{
+}
+
+/**
+ * Source deinitialisation Function 
+ */
+static void
+fib_entry_src_default_deinit (fib_entry_src_t *src)
+{
+}
+
+static void
+fib_entry_src_default_path_add (fib_entry_src_t *src,
+				fib_protocol_t proto,
+				const ip46_address_t *next_hop,
+				u32 next_hop_sw_if_index,
+				u32 next_hop_fib_index,
+				u32 next_hop_weight)
+{
+}
+
+static void
+fib_entry_src_default_path_remove (fib_entry_src_t *src,
+				     fib_protocol_t proto,
+				     const ip46_address_t *next_hop,
+				     u32 next_hop_sw_if_index,
+				     u32 next_hop_fib_index,
+				     u32 next_hop_weight)
+{
+}
+
+
+/*
+ * Source activate. 
+ * Called when the source is teh new longer best source on the entry
+ */
+static void
+fib_entry_src_default_activate (fib_entry_src_t *src,
+				  const fib_entry_t *fib_entry)
+{
+}
+
+/*
+ * Source Deactivate. 
+ * Called when the source is no longer best source on the entry
+ */
+static void
+fib_entry_src_default_deactivate (fib_entry_src_t *src,
+				    const fib_entry_t *fib_entry)
+{
+}
+
+static void
+fib_entry_src_default_add (fib_entry_src_t *src,
+			     fib_entry_flag_t flags,
+			     fib_protocol_t proto)
+{
+}
+
+static void
+fib_entry_src_default_remove (fib_entry_src_t *src)			     
+{
+}
+
+const static fib_entry_src_vft_t default_src_vft = {
+    .fesv_init = fib_entry_src_default_init,
+    .fesv_deinit = fib_entry_src_default_deinit,
+    .fesv_add = fib_entry_src_default_add,
+    .fesv_remove = fib_entry_src_default_remove,
+    .fesv_path_add = fib_entry_src_default_path_add,
+    .fesv_path_remove = fib_entry_src_default_path_remove,
+    .fesv_activate = fib_entry_src_default_activate,
+    .fesv_deactivate = fib_entry_src_default_deactivate,
+};
+
+void
+fib_entry_src_default_register (void)
+{
+    fib_source_t source;
+
+    FOR_EACH_FIB_SOURCE(source) {
+	fib_entry_src_register(source, &default_src_vft);    
+    }
+}
diff --git a/src/vnet/fib/fib_entry_src_default_route.c b/src/vnet/fib/fib_entry_src_default_route.c
new file mode 100644
index 00000000..9f4e7c36
--- /dev/null
+++ b/src/vnet/fib/fib_entry_src_default_route.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "fib_entry.h"
+#include "fib_entry_src.h"
+
+/**
+ * Source initialisation Function 
+ */
+static void
+fib_entry_src_default_route_init (fib_entry_src_t *src)
+{
+    src->fes_flags = FIB_ENTRY_SRC_FLAG_NONE;
+}
+
+static void
+fib_entry_src_default_route_remove (fib_entry_src_t *src)
+{
+    src->fes_pl = FIB_NODE_INDEX_INVALID;
+}
+
+static void
+fib_entry_src_default_route_add (fib_entry_src_t *src,
+				 const fib_entry_t *entry,
+				 fib_entry_flag_t flags,
+				 fib_protocol_t proto,
+				 const dpo_id_t *dpo)
+{
+    src->fes_pl = fib_path_list_create_special(proto,
+					       FIB_PATH_LIST_FLAG_DROP,
+					       dpo);
+}
+
+const static fib_entry_src_vft_t interface_src_vft = {
+    .fesv_init = fib_entry_src_default_route_init,
+    .fesv_add = fib_entry_src_default_route_add,
+    .fesv_remove = fib_entry_src_default_route_remove,
+};
+
+void
+fib_entry_src_default_route_register (void)
+{
+    fib_entry_src_register(FIB_SOURCE_DEFAULT_ROUTE, &interface_src_vft);    
+}
+
+
diff --git a/src/vnet/fib/fib_entry_src_interface.c b/src/vnet/fib/fib_entry_src_interface.c
new file mode 100644
index 00000000..ca04716e
--- /dev/null
+++ b/src/vnet/fib/fib_entry_src_interface.c
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "fib_entry.h"
+#include "fib_entry_src.h"
+#include "fib_path_list.h"
+#include "fib_internal.h"
+#include "fib_table.h"
+#include "fib_entry_cover.h"
+#include "fib_attached_export.h"
+
+/**
+ * Source initialisation Function 
+ */
+static void
+fib_entry_src_interface_init (fib_entry_src_t *src)
+{
+    src->interface.fesi_cover = FIB_NODE_INDEX_INVALID;
+    src->interface.fesi_sibling = FIB_NODE_INDEX_INVALID;
+}
+
+static void
+fib_entry_src_interface_path_swap (fib_entry_src_t *src,
+				   const fib_entry_t *entry,
+				   fib_path_list_flags_t pl_flags,
+				   const fib_route_path_t *paths)
+{
+    ip_adjacency_t *adj;
+
+    src->fes_pl = fib_path_list_create(pl_flags, paths);
+
+    /*
+     * this is a hack to get the entry's prefix into the glean adjacnecy
+     * so that it is available for fast retreival in the switch path.
+     */
+    if (!(FIB_ENTRY_FLAG_LOCAL & src->fes_entry_flags))
+    {
+        adj = adj_get(fib_path_list_get_adj(
+			  src->fes_pl,
+			  fib_entry_get_default_chain_type(entry)));
+
+	if (IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index)
+        {
+            /*
+             * the connected prefix will link to a glean on a non-p2p
+             * interface.
+             */
+            adj->sub_type.glean.receive_addr = entry->fe_prefix.fp_addr;
+        }
+    }
+}
+
+/*
+ * Source activate. 
+ * Called when the source is teh new longer best source on the entry
+ */
+static int
+fib_entry_src_interface_activate (fib_entry_src_t *src,
+				  const fib_entry_t *fib_entry)
+{
+    fib_entry_t *cover;
+
+    if (FIB_ENTRY_FLAG_LOCAL & src->fes_entry_flags)
+    {
+	/*
+	 * Track the covering attached/connected cover. This is so that
+	 * during an attached export of the cover, this local prefix is
+	 * also exported
+	 */
+	src->interface.fesi_cover =
+	    fib_table_get_less_specific(fib_entry->fe_fib_index,
+					&fib_entry->fe_prefix);
+
+	ASSERT(FIB_NODE_INDEX_INVALID != src->interface.fesi_cover);
+
+	cover = fib_entry_get(src->interface.fesi_cover);
+
+	src->interface.fesi_sibling =
+	    fib_entry_cover_track(cover, fib_entry_get_index(fib_entry));
+    }
+
+    return (!0);
+}
+
+
+/*
+ * Source Deactivate. 
+ * Called when the source is no longer best source on the entry
+ */
+static void
+fib_entry_src_interface_deactivate (fib_entry_src_t *src,
+				    const fib_entry_t *fib_entry)
+{
+    fib_entry_t *cover;
+
+    /*
+     * remove the depednecy on the covering entry
+     */
+    if (FIB_NODE_INDEX_INVALID != src->interface.fesi_cover)
+    {
+	cover = fib_entry_get(src->interface.fesi_cover);
+
+	fib_entry_cover_untrack(cover, src->interface.fesi_sibling);
+
+	src->interface.fesi_cover = FIB_NODE_INDEX_INVALID;
+    }
+}
+
+static fib_entry_src_cover_res_t
+fib_entry_src_interface_cover_change (fib_entry_src_t *src,
+				      const fib_entry_t *fib_entry)
+{
+    fib_entry_src_cover_res_t res = {
+	.install = !0,
+	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
+    };
+
+    if (FIB_NODE_INDEX_INVALID == src->interface.fesi_cover)
+    {
+	/*
+	 * not tracking the cover. surprised we got poked?
+	 */
+	return (res);
+    }
+
+    /*
+     * this function is called when this entry's cover has a more specific
+     * entry inserted benaeth it. That does not necessarily mean that this
+     * entry is covered by the new prefix. check that
+     */
+    if (src->rr.fesr_cover != fib_table_get_less_specific(fib_entry->fe_fib_index,
+							  &fib_entry->fe_prefix))
+    {
+	fib_entry_src_interface_deactivate(src, fib_entry);
+	fib_entry_src_interface_activate(src, fib_entry);
+    }
+    return (res);
+}
+
+static void
+fib_entry_src_interface_installed (fib_entry_src_t *src,
+				   const fib_entry_t *fib_entry)
+{
+    /*
+     * The interface source now rules! poke our cover to get exported
+     */
+    fib_entry_t *cover;
+
+    if (FIB_NODE_INDEX_INVALID != src->interface.fesi_cover)
+    {
+	cover = fib_entry_get(src->interface.fesi_cover);
+
+	fib_attached_export_covered_added(cover,
+					  fib_entry_get_index(fib_entry));
+    }
+}
+
+static u8*
+fib_entry_src_interface_format (fib_entry_src_t *src,
+				u8* s)
+{
+    return (format(s, "cover:%d", src->interface.fesi_cover));
+}
+
+const static fib_entry_src_vft_t interface_src_vft = {
+    .fesv_init = fib_entry_src_interface_init,
+    .fesv_path_swap = fib_entry_src_interface_path_swap,
+    .fesv_activate = fib_entry_src_interface_activate,
+    .fesv_deactivate = fib_entry_src_interface_deactivate,
+    .fesv_format = fib_entry_src_interface_format,
+    .fesv_installed = fib_entry_src_interface_installed,
+    .fesv_cover_change = fib_entry_src_interface_cover_change,
+    /*
+     * not concerned about updates to the cover. the cover will
+     * decide to export or not
+     */
+};
+
+void
+fib_entry_src_interface_register (void)
+{
+    fib_entry_src_register(FIB_SOURCE_INTERFACE, &interface_src_vft);    
+}
diff --git a/src/vnet/fib/fib_entry_src_lisp.c b/src/vnet/fib/fib_entry_src_lisp.c
new file mode 100644
index 00000000..7f8b91bb
--- /dev/null
+++ b/src/vnet/fib/fib_entry_src_lisp.c
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "fib_entry.h"
+#include "fib_entry_src.h"
+#include "fib_path_list.h"
+
+/**
+ * Source initialisation Function 
+ */
+static void
+fib_entry_src_lisp_init (fib_entry_src_t *src)
+{
+}
+
+/**
+ * Source deinitialisation Function 
+ */
+static void
+fib_entry_src_lisp_deinit (fib_entry_src_t *src)
+{
+}
+
+static void
+fib_entry_src_lisp_path_swap (fib_entry_src_t *src,
+			      const fib_entry_t *entry,
+			      fib_path_list_flags_t pl_flags,
+			     const fib_route_path_t *paths)
+{
+    src->fes_pl = fib_path_list_create((FIB_PATH_LIST_FLAG_SHARED | pl_flags),
+				       paths);
+}
+
+static void
+fib_entry_src_lisp_path_add (fib_entry_src_t *src,
+			    const fib_entry_t *entry,
+			    fib_path_list_flags_t pl_flags,
+			    const fib_route_path_t *paths)
+{
+    if (FIB_NODE_INDEX_INVALID == src->fes_pl)
+    {	
+	src->fes_pl =
+	    fib_path_list_create((FIB_PATH_LIST_FLAG_SHARED | pl_flags), paths);
+    }
+    else
+    {
+	src->fes_pl =
+	    fib_path_list_copy_and_path_add(src->fes_pl,
+					    (FIB_PATH_LIST_FLAG_SHARED | pl_flags),
+					    paths);
+    }
+}
+
+static void
+fib_entry_src_lisp_path_remove (fib_entry_src_t *src,
+			       fib_path_list_flags_t pl_flags,
+			       const fib_route_path_t *paths)
+{
+    if (FIB_NODE_INDEX_INVALID != src->fes_pl)
+    {
+	src->fes_pl =
+	    fib_path_list_copy_and_path_remove(src->fes_pl,
+					       (FIB_PATH_LIST_FLAG_SHARED | pl_flags),
+					       paths);
+    }
+}
+
+static void
+fib_entry_src_lisp_add (fib_entry_src_t *src,
+		       const fib_entry_t *entry,
+		       fib_entry_flag_t flags,
+		       fib_protocol_t proto,
+		       const dpo_id_t *dpo)
+{
+    if (FIB_ENTRY_FLAG_NONE != flags)
+    {
+	src->fes_pl = fib_path_list_create_special(
+	                  proto,
+			  fib_entry_src_flags_2_path_list_flags(flags),
+			  dpo);
+    }
+}
+
+static void
+fib_entry_src_lisp_remove (fib_entry_src_t *src)
+{
+    src->fes_pl = FIB_NODE_INDEX_INVALID;
+}
+
+static void
+fib_entry_src_lisp_set_data (fib_entry_src_t *src,
+                             const fib_entry_t *entry,
+                             const void *data)
+{
+    src->lisp.fesl_fib_index = *(u32*)data;
+}
+
+static const void*
+fib_entry_src_lisp_get_data (fib_entry_src_t *src,
+                             const fib_entry_t *entry)
+{
+    return (&(src->lisp.fesl_fib_index));
+}
+
+const static fib_entry_src_vft_t api_src_vft = {
+    .fesv_init = fib_entry_src_lisp_init,
+    .fesv_deinit = fib_entry_src_lisp_deinit,
+    .fesv_add = fib_entry_src_lisp_add,
+    .fesv_remove = fib_entry_src_lisp_remove,
+    .fesv_path_add = fib_entry_src_lisp_path_add,
+    .fesv_path_swap = fib_entry_src_lisp_path_swap,
+    .fesv_path_remove = fib_entry_src_lisp_path_remove,
+    .fesv_set_data = fib_entry_src_lisp_set_data,
+    .fesv_get_data = fib_entry_src_lisp_get_data,
+};
+
+void
+fib_entry_src_lisp_register (void)
+{
+    fib_entry_src_register(FIB_SOURCE_LISP, &api_src_vft);
+}
diff --git a/src/vnet/fib/fib_entry_src_mpls.c b/src/vnet/fib/fib_entry_src_mpls.c
new file mode 100644
index 00000000..14c7310f
--- /dev/null
+++ b/src/vnet/fib/fib_entry_src_mpls.c
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/mpls/mpls_types.h>
+#include <vnet/dpo/drop_dpo.h>
+
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_entry_src.h>
+#include <vnet/fib/mpls_fib.h>
+
+/**
+ * Source initialisation Function 
+ */
+static void
+fib_entry_src_mpls_init (fib_entry_src_t *src)
+{
+    mpls_eos_bit_t eos;
+
+    src->fes_flags = FIB_ENTRY_SRC_FLAG_NONE;
+    src->mpls.fesm_label = MPLS_LABEL_INVALID;
+
+    FOR_EACH_MPLS_EOS_BIT(eos)
+    {
+	src->mpls.fesm_lfes[eos] = FIB_NODE_INDEX_INVALID;
+    }
+}
+
+/**
+ * Source deinitialisation Function 
+ */
+static void
+fib_entry_src_mpls_deinit (fib_entry_src_t *src)
+{
+}
+
+static void
+fib_entry_src_mpls_remove (fib_entry_src_t *src)
+{
+    src->fes_pl = FIB_NODE_INDEX_INVALID;
+    src->mpls.fesm_label = MPLS_LABEL_INVALID;
+}
+
+static void
+fib_entry_src_mpls_add (fib_entry_src_t *src,
+                        const fib_entry_t *entry,
+                        fib_entry_flag_t flags,
+                        fib_protocol_t proto,
+                        const dpo_id_t *dpo)
+{
+    src->fes_pl =
+	fib_path_list_create_special(proto,
+				     FIB_PATH_LIST_FLAG_DROP,
+				     drop_dpo_get(fib_proto_to_dpo(proto)));
+}
+
+static void
+fib_entry_src_mpls_set_data (fib_entry_src_t *src,
+                             const fib_entry_t *entry,
+                             const void *data)
+{
+    fib_protocol_t payload_proto;
+    fib_node_index_t fei;
+    mpls_label_t label;
+    mpls_eos_bit_t eos;
+
+    /*
+     * post MPLS table alloc and the possible rea-alloc of fib entrys
+     * the entry pointer will no longer be valid. so save its index
+     */
+    payload_proto = entry->fe_prefix.fp_proto;
+    fei = fib_entry_get_index(entry);
+    label = *(mpls_label_t*)data;
+
+    if (MPLS_LABEL_INVALID == label)
+    {
+        /*
+         * removing the local label
+         */
+        FOR_EACH_MPLS_EOS_BIT(eos)
+        {
+	    fib_table_entry_delete_index(src->mpls.fesm_lfes[eos],
+					 FIB_SOURCE_SPECIAL);
+        }
+        fib_table_unlock(MPLS_FIB_DEFAULT_TABLE_ID, FIB_PROTOCOL_MPLS);
+        src->mpls.fesm_label = label;
+    }
+    else
+    {
+	fib_prefix_t prefix = {
+	    .fp_proto = FIB_PROTOCOL_MPLS,
+	    .fp_label = label,
+	};
+	fib_node_index_t fib_index;
+	dpo_id_t dpo = DPO_INVALID;
+
+        /*
+         * adding a new local label. make sure the MPLS fib exists.
+         */
+        if (MPLS_LABEL_INVALID == src->mpls.fesm_label)
+        {
+            fib_index =
+		fib_table_find_or_create_and_lock(FIB_PROTOCOL_MPLS,
+						  MPLS_FIB_DEFAULT_TABLE_ID);
+        }
+	else
+	{
+	    fib_index = mpls_fib_index_from_table_id(MPLS_FIB_DEFAULT_TABLE_ID);
+
+	    /*
+	     * if this is a change in label, reomve the old one first
+	     */
+	    if (src->mpls.fesm_label != label)
+	    {
+		FOR_EACH_MPLS_EOS_BIT(eos)
+		{
+		    ASSERT(FIB_NODE_INDEX_INVALID != src->mpls.fesm_lfes[eos]);
+		    fib_table_entry_delete_index(src->mpls.fesm_lfes[eos],
+						 FIB_SOURCE_SPECIAL);
+		}
+	    }
+	}
+
+        src->mpls.fesm_label = label;
+
+	FOR_EACH_MPLS_EOS_BIT(eos)
+	{
+	    prefix.fp_eos = eos;
+	    prefix.fp_payload_proto = fib_proto_to_dpo(payload_proto);
+
+	    fib_entry_contribute_forwarding(fei,
+					    (eos ?
+					     FIB_FORW_CHAIN_TYPE_MPLS_EOS :
+					     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS),
+					    &dpo);
+	    src->mpls.fesm_lfes[eos] = 
+		fib_table_entry_special_dpo_add(fib_index,
+						&prefix,
+						FIB_SOURCE_SPECIAL,
+						FIB_ENTRY_FLAG_EXCLUSIVE,
+						&dpo);
+	    dpo_reset(&dpo);
+	}
+    }
+}
+
+static const void *
+fib_entry_src_mpls_get_data (fib_entry_src_t *src,
+                             const fib_entry_t *entry)
+{
+    return (&(src->mpls.fesm_label));
+}
+
+static u8*
+fib_entry_src_mpls_format (fib_entry_src_t *src,
+			   u8* s)
+{
+    return (format(s, "MPLS local-label:%d", src->mpls.fesm_label));
+}
+
+const static fib_entry_src_vft_t mpls_src_vft = {
+    .fesv_init = fib_entry_src_mpls_init,
+    .fesv_deinit = fib_entry_src_mpls_deinit,
+    .fesv_add = fib_entry_src_mpls_add,
+    .fesv_remove = fib_entry_src_mpls_remove,
+    .fesv_format = fib_entry_src_mpls_format,
+    .fesv_set_data = fib_entry_src_mpls_set_data,
+    .fesv_get_data = fib_entry_src_mpls_get_data,
+    /*
+     * .fesv_fwd_update = fib_entry_src_mpls_fwd_update,
+     *  When the forwarding for the IP entry is updated, any MPLS chains
+     * it has created are also updated. Since the MPLS entry will have already
+     * installed that chain/load-balance there is no need to update the netry
+     * FIXME: later: propagate any walk to the children of the MPLS entry. for SR
+     */
+};
+
+void
+fib_entry_src_mpls_register (void)
+{
+    fib_entry_src_register(FIB_SOURCE_MPLS, &mpls_src_vft);    
+}
+
+
diff --git a/src/vnet/fib/fib_entry_src_rr.c b/src/vnet/fib/fib_entry_src_rr.c
new file mode 100644
index 00000000..ff15c54e
--- /dev/null
+++ b/src/vnet/fib/fib_entry_src_rr.c
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/ip/format.h>
+#include <vnet/ip/lookup.h>
+#include <vnet/adj/adj.h>
+#include <vnet/dpo/drop_dpo.h>
+
+#include "fib_entry_src.h"
+#include "fib_entry_cover.h"
+#include "fib_entry.h"
+#include "fib_table.h"
+
+/*
+ * fib_entry_src_rr_resolve_via_connected
+ *
+ * Resolve via a connected cover.
+ */
+static void
+fib_entry_src_rr_resolve_via_connected (fib_entry_src_t *src,
+					const fib_entry_t *fib_entry,
+					const fib_entry_t *cover)
+{
+    const fib_route_path_t path = {
+	.frp_proto = fib_entry->fe_prefix.fp_proto,
+	.frp_addr = fib_entry->fe_prefix.fp_addr,
+	.frp_sw_if_index = fib_entry_get_resolving_interface(
+	                       fib_entry_get_index(cover)),
+	.frp_fib_index = ~0,
+	.frp_weight = 1,
+    };
+    fib_route_path_t *paths = NULL;
+    vec_add1(paths, path);
+
+    /*
+     * since the cover is connected, the address this entry corresponds
+     * to is a peer (ARP-able for) on the interface to which the cover is
+     * connected. The fact we resolve via the cover, just means this RR
+     * source is the first SRC to use said peer. The ARP source will be along
+     * shortly to over-rule this RR source.
+     */
+    src->fes_pl = fib_path_list_create(FIB_PATH_LIST_FLAG_NONE, paths);
+    src->fes_entry_flags = fib_entry_get_flags(fib_entry_get_index(cover));
+
+    vec_free(paths);
+}
+
+
+/**
+ * Source initialisation Function 
+ */
+static void
+fib_entry_src_rr_init (fib_entry_src_t *src)
+{
+    src->rr.fesr_cover = FIB_NODE_INDEX_INVALID;
+    src->rr.fesr_sibling = FIB_NODE_INDEX_INVALID;
+}
+
+/*
+ * Source activation. Called when the source is the new best source on the entry
+ */
+static int
+fib_entry_src_rr_activate (fib_entry_src_t *src,
+			   const fib_entry_t *fib_entry)
+{
+    fib_entry_t *cover;
+
+    /*
+     * find the covering prefix. become a dependent thereof.
+     * for IP there should always be a cover, though it may be the default route.
+     * For MPLS there is never a cover.
+     */
+    if (FIB_PROTOCOL_MPLS == fib_entry->fe_prefix.fp_proto)
+    {
+	src->fes_pl = fib_path_list_create_special(FIB_PROTOCOL_MPLS,
+						   FIB_PATH_LIST_FLAG_DROP,
+						   NULL);
+	fib_path_list_lock(src->fes_pl);
+	return (!0);
+    }
+
+    src->rr.fesr_cover = fib_table_get_less_specific(fib_entry->fe_fib_index,
+						     &fib_entry->fe_prefix);
+
+    ASSERT(FIB_NODE_INDEX_INVALID != src->rr.fesr_cover);
+
+    cover = fib_entry_get(src->rr.fesr_cover);
+
+    src->rr.fesr_sibling =
+	fib_entry_cover_track(cover, fib_entry_get_index(fib_entry));
+
+    /*
+     * if the ocver is attached then install an attached-host path
+     * (like an adj-fib). Otherwise inherit the forwarding from the cover
+     */
+    if (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(cover))
+    {
+	fib_entry_src_rr_resolve_via_connected(src, fib_entry, cover);
+    }
+    else
+    {
+        /*
+         * use the path-list of the cover, unless it would form a loop.
+         * that is unless the cover is via this entry.
+         * If a loop were to form it would be a 1 level loop (i.e. X via X),
+         * and there would be 2 locks on the path-list; one since its used
+         * by the cover, and 1 from here. The first lock will go when the
+         * cover is removed, the second, and last, when the covered walk
+         * occurs during the cover's removel - this is not a place where
+         * we can handle last lock gone.
+         * In short, don't let the loop form. The usual rules of 'we must
+         * let it form so we know when it breaks' don't apply here, since
+         * the loop will break when the cover changes, and this function
+         * will be called again when that happens.
+         */
+        fib_node_index_t *entries = NULL;
+        fib_protocol_t proto;
+
+        proto = fib_entry->fe_prefix.fp_proto;
+        vec_add1(entries, fib_entry_get_index(fib_entry));
+
+        if (fib_path_list_recursive_loop_detect(cover->fe_parent,
+                                                &entries))
+        {
+            src->fes_pl = fib_path_list_create_special(
+                              proto,
+                              FIB_PATH_LIST_FLAG_DROP,
+                              drop_dpo_get(fib_proto_to_dpo(proto)));
+        }
+        else
+        {
+            src->fes_pl = cover->fe_parent;
+        }
+        vec_free(entries);
+
+    }
+    fib_path_list_lock(src->fes_pl);
+
+    /*
+     * return go for install
+     */
+    return (!0);
+}
+
+/**
+ * Source Deactivate. 
+ * Called when the source is no longer best source on the entry
+ */
+static void
+fib_entry_src_rr_deactivate (fib_entry_src_t *src,
+			     const fib_entry_t *fib_entry)
+{
+    fib_entry_t *cover;
+
+    /*
+     * remove the depednecy on the covering entry
+     */
+    if (FIB_NODE_INDEX_INVALID != src->rr.fesr_cover)
+    {
+	cover = fib_entry_get(src->rr.fesr_cover);
+	fib_entry_cover_untrack(cover, src->rr.fesr_sibling);
+	src->rr.fesr_cover = FIB_NODE_INDEX_INVALID;
+    }
+
+    fib_path_list_unlock(src->fes_pl);
+    src->fes_pl = FIB_NODE_INDEX_INVALID;
+    src->fes_entry_flags = FIB_ENTRY_FLAG_NONE;
+}
+
+static fib_entry_src_cover_res_t
+fib_entry_src_rr_cover_change (fib_entry_src_t *src,
+			       const fib_entry_t *fib_entry)
+{
+    fib_entry_src_cover_res_t res = {
+	.install = !0,
+	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
+    };
+
+    if (FIB_NODE_INDEX_INVALID == src->rr.fesr_cover)
+    {
+	/*
+	 * the source may be added, but it is not active
+	 * if it is not tracking the cover.
+	 */
+	return (res);
+    }
+
+    /*
+     * this function is called when this entry's cover has a more specific
+     * entry inserted benaeth it. That does not necessarily mean that this
+     * entry is covered by the new prefix. check that
+     */
+    if (src->rr.fesr_cover != fib_table_get_less_specific(fib_entry->fe_fib_index,
+							  &fib_entry->fe_prefix))
+    {
+	fib_entry_src_rr_deactivate(src, fib_entry);
+	fib_entry_src_rr_activate(src, fib_entry);
+
+	/*
+	 * dependent children need to re-resolve to the new forwarding info
+	 */
+	res.bw_reason = FIB_NODE_BW_REASON_FLAG_EVALUATE;
+    }
+    return (res);
+}
+
+/*
+ * fib_entry_src_rr_cover_update
+ *
+ * This entry's cover has updated its forwarding info. This entry
+ * will need to re-inheret.
+ */
+static fib_entry_src_cover_res_t
+fib_entry_src_rr_cover_update (fib_entry_src_t *src,
+			       const fib_entry_t *fib_entry)
+{
+    fib_entry_src_cover_res_t res = {
+	.install = !0,
+	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
+    };
+    fib_node_index_t old_path_list;
+    fib_entry_t *cover;
+
+    if (FIB_NODE_INDEX_INVALID == src->rr.fesr_cover)
+    {
+	/*
+	 * the source may be added, but it is not active
+	 * if it is not tracking the cover.
+	 */
+	return (res);
+    }
+
+    cover = fib_entry_get(src->rr.fesr_cover);
+    old_path_list = src->fes_pl;
+
+    /*
+     * if the ocver is attached then install an attached-host path
+     * (like an adj-fib). Otherwise inherit the forwarding from the cover
+     */
+    if (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(cover))
+    {
+	fib_entry_src_rr_resolve_via_connected(src, fib_entry, cover);
+    }
+    else
+    {
+	src->fes_pl = cover->fe_parent;
+    }
+    fib_path_list_lock(src->fes_pl);
+    fib_path_list_unlock(old_path_list);
+
+    /*
+     * dependent children need to re-resolve to the new forwarding info
+     */
+    res.bw_reason = FIB_NODE_BW_REASON_FLAG_EVALUATE;
+
+    return (res);
+}
+
+static u8*
+fib_entry_src_rr_format (fib_entry_src_t *src,
+			 u8* s)
+{
+    return (format(s, "cover:%d", src->rr.fesr_cover));
+}
+
+const static fib_entry_src_vft_t rr_src_vft = {
+    .fesv_init = fib_entry_src_rr_init,
+    .fesv_activate = fib_entry_src_rr_activate,
+    .fesv_deactivate = fib_entry_src_rr_deactivate,
+    .fesv_cover_change = fib_entry_src_rr_cover_change,
+    .fesv_cover_update = fib_entry_src_rr_cover_update,
+    .fesv_format = fib_entry_src_rr_format,
+};
+
+void
+fib_entry_src_rr_register (void)
+{
+    fib_entry_src_register(FIB_SOURCE_RR, &rr_src_vft);    
+    fib_entry_src_register(FIB_SOURCE_URPF_EXEMPT, &rr_src_vft);    
+}
diff --git a/src/vnet/fib/fib_entry_src_special.c b/src/vnet/fib/fib_entry_src_special.c
new file mode 100644
index 00000000..52a6134e
--- /dev/null
+++ b/src/vnet/fib/fib_entry_src_special.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "fib_entry.h"
+#include "fib_entry_src.h"
+
+/**
+ * Source initialisation Function
+ */
+static void
+fib_entry_src_special_init (fib_entry_src_t *src)
+{
+    src->fes_flags = FIB_ENTRY_SRC_FLAG_NONE;
+}
+
+/**
+ * Source deinitialisation Function
+ */
+static void
+fib_entry_src_special_deinit (fib_entry_src_t *src)
+{
+}
+
+static void
+fib_entry_src_special_remove (fib_entry_src_t *src)
+{
+    src->fes_pl = FIB_NODE_INDEX_INVALID;
+}
+
+static void
+fib_entry_src_special_add (fib_entry_src_t *src,
+			   const fib_entry_t *entry,
+			   fib_entry_flag_t flags,
+			   fib_protocol_t proto,
+			   const dpo_id_t *dpo)
+{
+    src->fes_pl =
+	fib_path_list_create_special(proto,
+				     fib_entry_src_flags_2_path_list_flags(flags),
+				     dpo);
+}
+
+const static fib_entry_src_vft_t special_src_vft = {
+    .fesv_init = fib_entry_src_special_init,
+    .fesv_deinit = fib_entry_src_special_deinit,
+    .fesv_add = fib_entry_src_special_add,
+    .fesv_remove = fib_entry_src_special_remove,
+};
+
+void
+fib_entry_src_special_register (void)
+{
+    fib_entry_src_register(FIB_SOURCE_SPECIAL, &special_src_vft);
+    fib_entry_src_register(FIB_SOURCE_MAP, &special_src_vft);
+    fib_entry_src_register(FIB_SOURCE_SIXRD, &special_src_vft);
+    fib_entry_src_register(FIB_SOURCE_CLASSIFY, &special_src_vft);
+    fib_entry_src_register(FIB_SOURCE_SR, &special_src_vft);
+    fib_entry_src_register(FIB_SOURCE_AE, &special_src_vft);
+}
diff --git a/src/vnet/fib/fib_internal.h b/src/vnet/fib/fib_internal.h
new file mode 100644
index 00000000..2d980bcc
--- /dev/null
+++ b/src/vnet/fib/fib_internal.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __FIB_INTERNAL_H__
+#define __FIB_INTERNAL_H__
+
+#include <vnet/ip/ip.h>
+#include <vnet/dpo/dpo.h>
+
+/**
+ * Big train switch; FIB debugs on or off
+ */
+#undef FIB_DEBUG
+
+extern void fib_prefix_from_mpls_label(mpls_label_t label,
+				       fib_prefix_t *prf);
+
+extern int fib_route_path_cmp(const fib_route_path_t *rpath1,
+			      const fib_route_path_t *rpath2);
+
+/**
+ * @brief
+ *  Add or update an entry in the FIB's forwarding table.
+ * This is called from the fib_entry code. It is not meant to be used
+ * by the client/source.
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix for the entry to add/update
+ *
+ * @param dpo
+ *  The data-path object to use for forwarding
+ */
+extern void fib_table_fwding_dpo_update(u32 fib_index,
+					const fib_prefix_t *prefix,
+					const dpo_id_t *dpo);
+/**
+ * @brief
+ *  remove an entry in the FIB's forwarding table
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix for the entry to add/update
+ *
+ * @param dpo
+ *  The data-path object to use for forwarding
+ */
+extern void fib_table_fwding_dpo_remove(u32 fib_index,
+					const fib_prefix_t *prefix,
+					const dpo_id_t *dpo);
+
+
+#endif
diff --git a/src/vnet/fib/fib_node.c b/src/vnet/fib/fib_node.c
new file mode 100644
index 00000000..db3e22bb
--- /dev/null
+++ b/src/vnet/fib/fib_node.c
@@ -0,0 +1,277 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/fib/fib_node.h>
+#include <vnet/fib/fib_node_list.h>
+
+/*
+ * The per-type vector of virtual function tables
+ */
+static fib_node_vft_t *fn_vfts;
+
+/**
+ * The last registered new type
+ */
+static fib_node_type_t last_new_type = FIB_NODE_TYPE_LAST;
+
+/*
+ * the node type names
+ */
+static const char *fn_type_names[] = FIB_NODE_TYPES;
+
+const char*
+fib_node_type_get_name (fib_node_type_t type)
+{
+    if (type < FIB_NODE_TYPE_LAST)
+	return (fn_type_names[type]);
+    else
+    {
+	if (NULL != fn_vfts[type].fnv_format)
+	{
+	    return ("fixme");
+	}
+	else
+	{
+	    return ("unknown");
+	}
+    }
+}
+
+/**
+ * fib_node_register_type
+ *
+ * Register the function table for a given type
+ */
+void
+fib_node_register_type (fib_node_type_t type,
+			const fib_node_vft_t *vft)
+{
+    /*
+     * assert that one only registration is made per-node type
+     */
+    if (vec_len(fn_vfts) > type)
+	ASSERT(NULL == fn_vfts[type].fnv_get);
+
+    /*
+     * Assert that we are getting each of the required functions
+     */
+    ASSERT(NULL != vft->fnv_get);
+    ASSERT(NULL != vft->fnv_last_lock);
+
+    vec_validate(fn_vfts, type);
+    fn_vfts[type] = *vft;
+}
+
+fib_node_type_t
+fib_node_register_new_type (const fib_node_vft_t *vft)
+{
+    fib_node_type_t new_type;
+
+    new_type = ++last_new_type;
+
+    fib_node_register_type(new_type, vft);
+
+    return (new_type);
+}   
+
+static u8*
+fib_node_format (fib_node_ptr_t *fnp, u8*s)
+{
+    return (format(s, "{%s:%d}", fn_type_names[fnp->fnp_type], fnp->fnp_index)); 
+}
+
+u32
+fib_node_child_add (fib_node_type_t parent_type,
+                    fib_node_index_t parent_index,
+                    fib_node_type_t type,
+		    fib_node_index_t index)
+{
+    fib_node_t *parent;
+
+    parent = fn_vfts[parent_type].fnv_get(parent_index);
+
+    /*
+     * return the index of the sibling in the child list
+     */
+    fib_node_lock(parent);
+
+    if (FIB_NODE_INDEX_INVALID == parent->fn_children)
+    {
+        parent->fn_children = fib_node_list_create();
+    }   
+
+    return (fib_node_list_push_front(parent->fn_children,
+                                     0, type,
+                                     index));
+}
+
+void
+fib_node_child_remove (fib_node_type_t parent_type,
+                       fib_node_index_t parent_index,
+                       fib_node_index_t sibling_index)
+{
+    fib_node_t *parent;
+
+    parent = fn_vfts[parent_type].fnv_get(parent_index);
+
+    fib_node_list_remove(parent->fn_children, sibling_index);
+
+    if (0 == fib_node_list_get_size(parent->fn_children))
+    {
+        fib_node_list_destroy(&parent->fn_children);
+    }
+
+    fib_node_unlock(parent);
+}
+
+u32
+fib_node_get_n_children (fib_node_type_t parent_type,
+                         fib_node_index_t parent_index)
+{
+    fib_node_t *parent;
+
+    parent = fn_vfts[parent_type].fnv_get(parent_index);
+
+    return (fib_node_list_get_size(parent->fn_children));
+}
+
+
+fib_node_back_walk_rc_t
+fib_node_back_walk_one (fib_node_ptr_t *ptr,
+                        fib_node_back_walk_ctx_t *ctx)
+{
+    fib_node_t *node;
+
+    node = fn_vfts[ptr->fnp_type].fnv_get(ptr->fnp_index);
+
+    return (fn_vfts[ptr->fnp_type].fnv_back_walk(node, ctx));
+}
+
+static int
+fib_node_ptr_format_one_child (fib_node_ptr_t *ptr,
+			       void *arg)
+{
+    u8 **s = (u8**) arg;
+
+    *s = fib_node_format(ptr, *s);
+
+    return (1);
+}
+
+u8*
+fib_node_children_format (fib_node_list_t list,
+			  u8 *s)
+{
+    fib_node_list_walk(list, fib_node_ptr_format_one_child, (void*)&s);
+
+    return (s);
+}
+
+void
+fib_node_init (fib_node_t *node,
+	       fib_node_type_t type)
+{
+#if CLIB_DEBUG > 0
+    /**
+     * The node's type. make sure we are dynamic/down casting correctly
+     */
+    node->fn_type = type;
+#endif
+    node->fn_locks = 0;
+    node->fn_vft = &fn_vfts[type];
+    node->fn_children = FIB_NODE_INDEX_INVALID;
+}
+
+void
+fib_node_deinit (fib_node_t *node)
+{
+    fib_node_list_destroy(&node->fn_children);
+}
+
+void
+fib_node_lock (fib_node_t *node)
+{
+    node->fn_locks++;
+}
+
+void
+fib_node_unlock (fib_node_t *node)
+{
+    node->fn_locks--;
+
+    if (0 == node->fn_locks)
+    {
+	node->fn_vft->fnv_last_lock(node);
+    }
+}
+
+void
+fib_show_memory_usage (const char *name,
+		       u32 in_use_elts,
+		       u32 allocd_elts,
+		       size_t size_elt)
+{
+    vlib_cli_output (vlib_get_main(), "%=30s %=5d %=8d/%=9d   %d/%d ",
+		     name, size_elt,
+		     in_use_elts, allocd_elts,
+		     in_use_elts*size_elt, allocd_elts*size_elt);
+}
+
+static clib_error_t *
+fib_memory_show (vlib_main_t * vm,
+		 unformat_input_t * input,
+		 vlib_cli_command_t * cmd)
+{
+    fib_node_vft_t *vft;
+
+    vlib_cli_output (vm, "FIB memory");
+    vlib_cli_output (vm, "%=30s %=5s %=8s/%=9s   totals",
+		     "Name","Size", "in-use", "allocated");
+
+    vec_foreach(vft, fn_vfts)
+    {
+	if (NULL != vft->fnv_mem_show)
+	    vft->fnv_mem_show();
+    }
+
+    fib_node_list_memory_show();
+
+    return (NULL);
+}
+
+/* *INDENT-OFF* */
+/*?
+ * The '<em>sh fib memory </em>' command displays the memory usage for each
+ * FIB object type.
+ *
+ * @cliexpar
+ * @cliexstart{show fib memory}
+ * FIB memory
+ *             Name               Size  in-use /allocated   totals
+ *             Entry              120     11   /    11      1320/1320
+ *         Entry Source            32     11   /    11      352/352
+ *     Entry Path-Extensions       44      0   /    0       0/0
+ *           Path-list             40     11   /    11      440/440
+ *             Path                88     11   /    11      968/968
+ *      Node-list elements         20     11   /    11      220/220
+ *        Node-list heads          8      13   /    13      104/104
+ * @cliexend
+?*/
+VLIB_CLI_COMMAND (show_fib_memory, static) = {
+    .path = "show fib memory",
+    .function = fib_memory_show,
+    .short_help = "show fib memory",
+};
+/* *INDENT-ON* */
diff --git a/src/vnet/fib/fib_node.h b/src/vnet/fib/fib_node.h
new file mode 100644
index 00000000..3ad8ee95
--- /dev/null
+++ b/src/vnet/fib/fib_node.h
@@ -0,0 +1,371 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __FIB_NODE_H__
+#define __FIB_NODE_H__
+
+#include <vnet/fib/fib_types.h>
+
+/**
+ * The types of nodes in a FIB graph
+ */
+typedef enum fib_node_type_t_ {
+    /**
+     * Marker. New types after this one.
+     */
+    FIB_NODE_TYPE_FIRST = 0,
+    /**
+     * See the respective fib_*.h files for descriptions of these objects.
+     */
+    FIB_NODE_TYPE_WALK,
+    FIB_NODE_TYPE_ENTRY,
+    FIB_NODE_TYPE_PATH_LIST,
+    FIB_NODE_TYPE_PATH,
+    FIB_NODE_TYPE_ADJ,
+    FIB_NODE_TYPE_MPLS_ENTRY,
+    FIB_NODE_TYPE_MPLS_TUNNEL,
+    FIB_NODE_TYPE_LISP_GPE_FWD_ENTRY,
+    FIB_NODE_TYPE_LISP_ADJ,
+    FIB_NODE_TYPE_GRE_TUNNEL,
+    FIB_NODE_TYPE_VXLAN_TUNNEL,
+    /**
+     * Marker. New types before this one. leave the test last.
+     */
+    FIB_NODE_TYPE_TEST,
+    FIB_NODE_TYPE_LAST = FIB_NODE_TYPE_TEST,
+} fib_node_type_t;
+
+#define FIB_NODE_TYPE_MAX (FIB_NODE_TYPE_LAST + 1)
+
+#define FIB_NODE_TYPES {                          \
+    [FIB_NODE_TYPE_ENTRY]     = "entry",          \
+    [FIB_NODE_TYPE_WALK]      = "walk",           \
+    [FIB_NODE_TYPE_PATH_LIST] = "path-list",      \
+    [FIB_NODE_TYPE_PATH]      = "path",           \
+    [FIB_NODE_TYPE_MPLS_ENTRY] = "mpls-entry",    \
+    [FIB_NODE_TYPE_MPLS_TUNNEL] = "mpls-tunnel",  \
+    [FIB_NODE_TYPE_ADJ] = "adj",                  \
+    [FIB_NODE_TYPE_LISP_GPE_FWD_ENTRY] = "lisp-gpe-fwd-entry", \
+    [FIB_NODE_TYPE_LISP_ADJ] = "lisp-adj", \
+    [FIB_NODE_TYPE_GRE_TUNNEL] = "gre-tunnel", \
+    [FIB_NODE_TYPE_VXLAN_TUNNEL] = "vxlan-tunnel", \
+}
+
+/**
+ * Reasons for backwalking the FIB object graph
+ */
+typedef enum fib_node_back_walk_reason_t_ {
+    /**
+     * Marker. Add new ones after.
+     */
+    FIB_NODE_BW_REASON_FIRST = 0,
+    /**
+     * Walk to re-resolve the child.
+     * Used when the parent is no longer a valid resolution target
+     */
+    FIB_NODE_BW_REASON_RESOLVE = FIB_NODE_BW_REASON_FIRST,
+    /**
+     * Walk to re-evaluate the forwarding contributed by the parent.
+     * Used when a parent's forwarding changes and the child needs to
+     * incorporate this change in its forwarding.
+     */
+    FIB_NODE_BW_REASON_EVALUATE,
+    /**
+     * A resolving interface has come up
+     */
+    FIB_NODE_BW_REASON_INTERFACE_UP,
+    /**
+     * A resolving interface has gone down
+     */
+    FIB_NODE_BW_REASON_INTERFACE_DOWN,
+    /**
+     * A resolving interface has been deleted.
+     */
+    FIB_NODE_BW_REASON_INTERFACE_DELETE,
+    /**
+     * Walk to re-collapse the multipath adjs when the rewrite of
+     * a unipath adjacency changes
+     */
+    FIB_NODE_BW_REASON_ADJ_UPDATE,
+    /**
+     * Walk to update children to inform them the adjacency is now down.
+     */
+    FIB_NODE_BW_REASON_ADJ_DOWN,
+    /**
+     * Marker. Add new before and update
+     */
+    FIB_NODE_BW_REASON_LAST = FIB_NODE_BW_REASON_ADJ_DOWN,
+} fib_node_back_walk_reason_t;
+
+#define FIB_NODE_BW_REASONS {			            \
+    [FIB_NODE_BW_REASON_RESOLVE] = "resolve",	            \
+    [FIB_NODE_BW_REASON_EVALUATE] = "evaluate",             \
+    [FIB_NODE_BW_REASON_INTERFACE_UP] = "if-up",            \
+    [FIB_NODE_BW_REASON_INTERFACE_DOWN] = "if-down",        \
+    [FIB_NODE_BW_REASON_INTERFACE_DELETE] = "if-delete",    \
+    [FIB_NODE_BW_REASON_ADJ_UPDATE] = "adj-update",         \
+    [FIB_NODE_BW_REASON_ADJ_DOWN] = "adj-down",             \
+}
+
+#define FOR_EACH_FIB_NODE_BW_REASON(_item) \
+    for (_item = FIB_NODE_BW_REASON_FIRST; \
+	 _item <= FIB_NODE_BW_REASON_LAST; \
+	 _item++)
+
+/**
+ * Flags enum constructed from the reaons
+ */
+typedef enum fib_node_bw_reason_flag_t_ {
+    FIB_NODE_BW_REASON_FLAG_NONE = 0,
+    FIB_NODE_BW_REASON_FLAG_RESOLVE = (1 << FIB_NODE_BW_REASON_RESOLVE),
+    FIB_NODE_BW_REASON_FLAG_EVALUATE = (1 << FIB_NODE_BW_REASON_EVALUATE),
+    FIB_NODE_BW_REASON_FLAG_INTERFACE_UP = (1 << FIB_NODE_BW_REASON_INTERFACE_UP),
+    FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN = (1 << FIB_NODE_BW_REASON_INTERFACE_DOWN),
+    FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE = (1 << FIB_NODE_BW_REASON_INTERFACE_DELETE),
+    FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE = (1 << FIB_NODE_BW_REASON_ADJ_UPDATE),
+    FIB_NODE_BW_REASON_FLAG_ADJ_DOWN = (1 << FIB_NODE_BW_REASON_ADJ_DOWN),
+} __attribute__ ((packed)) fib_node_bw_reason_flag_t;
+
+STATIC_ASSERT(sizeof(fib_node_bw_reason_flag_t) < 2,
+	      "BW Reason enum < 2 byte. Consequences for cover_upd_res_t");
+
+/**
+ * Flags on the walk
+ */
+typedef enum fib_node_bw_flags_t_
+{
+    /**
+     * Force the walk to be synchronous
+     */
+    FIB_NODE_BW_FLAG_FORCE_SYNC = (1 << 0),
+} fib_node_bw_flags_t;
+
+/**
+ * Forward eclarations
+ */
+struct fib_node_t_;
+
+/**
+ * A representation of one pointer to another node.
+ * To fully qualify a node, one must know its type and its index so it
+ * can be retrieved from the appropriate pool. Direct pointers to nodes
+ * are forbidden, since all nodes are allocated from pools, which are vectors,
+ * and thus subject to realloc at any time.
+ */
+typedef struct fib_node_ptr_t_ {
+    /**
+     * node type
+     */
+    fib_node_type_t fnp_type;
+    /**
+     * node's index
+     */
+    fib_node_index_t fnp_index;
+} fib_node_ptr_t;
+
+/**
+ * @brief A list of FIB nodes.
+ */
+typedef u32 fib_node_list_t;
+
+/**
+ * Context passed between object during a back walk.
+ */
+typedef struct fib_node_back_walk_ctx_t_ {
+    /**
+     * The reason/trigger for the backwalk
+     */
+    fib_node_bw_reason_flag_t fnbw_reason;
+
+    /**
+     * additional flags for the walk
+     */
+    fib_node_bw_flags_t fnbw_flags;
+
+    /**
+     * the number of levels the walk has already traversed.
+     * this value is maintained by the walk infra, tp limit the depth of
+     * a walk so it does not run indefinately the presence of a loop/cycle
+     * in the graph.
+     */
+    u32 fnbw_depth;
+} fib_node_back_walk_ctx_t;
+
+/**
+ * We consider a depth of 32 to be sufficient to cover all sane
+ * network topologies. Anything more is then an indication that
+ * there is a loop/cycle in the FIB graph.
+ * Note that all object types contribute to 1 to the depth.
+ */
+#define FIB_NODE_GRAPH_MAX_DEPTH ((u32)32)
+
+/**
+ * A callback function for walking a node dependency list
+ */
+typedef int (*fib_node_ptr_walk_t)(fib_node_ptr_t *depend,
+				   void *ctx);
+
+/**
+ * A list of dependent nodes.
+ * This is currently implemented as a hash_table of fib_node_ptr_t
+ */
+typedef fib_node_ptr_t fib_node_ptr_list_t;
+
+/**
+ * Return code from a back walk function
+ */
+typedef enum fib_node_back_walk_rc_t_ {
+    FIB_NODE_BACK_WALK_MERGE,
+    FIB_NODE_BACK_WALK_CONTINUE,
+} fib_node_back_walk_rc_t;
+
+/**
+ * Function definition to backwalk a FIB node
+ */
+typedef fib_node_back_walk_rc_t (*fib_node_back_walk_t)(
+    struct fib_node_t_ *node,
+    fib_node_back_walk_ctx_t *ctx);
+
+/**
+ * Function definition to get a FIB node from its index
+ */
+typedef struct fib_node_t_* (*fib_node_get_t)(fib_node_index_t index);
+
+/**
+ * Function definition to inform the FIB node that its last lock has gone.
+ */
+typedef void (*fib_node_last_lock_gone_t)(struct fib_node_t_ *node);
+
+/**
+ * Function definition to display the amount of memory used by a type.
+ * Implementations should call fib_show_memory_usage()
+ */
+typedef void (*fib_node_memory_show_t)(void);
+
+/**
+ * A FIB graph nodes virtual function table
+ */
+typedef struct fib_node_vft_t_ {
+    fib_node_get_t fnv_get;
+    fib_node_last_lock_gone_t fnv_last_lock;
+    fib_node_back_walk_t fnv_back_walk;
+    format_function_t *fnv_format;
+    fib_node_memory_show_t fnv_mem_show;
+} fib_node_vft_t;
+
+/**
+ * An node in the FIB graph
+ *
+ * Objects in the FIB form a graph. 
+ */
+typedef struct fib_node_t_ {
+#if CLIB_DEBUG > 0
+    /**
+     * The node's type. make sure we are dynamic/down casting correctly
+     */
+    fib_node_type_t fn_type;
+#endif
+    /**
+     * The node's VFT.
+     * we could store the type here instead, and lookup the VFT using that. But
+     * I like this better,
+     */
+    const fib_node_vft_t *fn_vft;
+
+    /**
+     * Vector of nodes that depend upon/use/share this node
+     */
+    fib_node_list_t fn_children;
+
+    /**
+     * Number of dependents on this node. This number includes the number
+     * of children
+     */
+    u32 fn_locks;
+} fib_node_t;
+
+/**
+ * @brief
+ *  Register the function table for a given type
+ *
+ * @param ft
+ *  FIB node type
+ *
+ * @param vft
+ * virtual function table
+ */
+extern void fib_node_register_type (fib_node_type_t ft,
+				    const fib_node_vft_t *vft);
+
+/**
+ * @brief
+ *  Create a new FIB node type and Register the function table for it.
+ *
+ * @param vft
+ * virtual function table
+ *
+ * @return new FIB node type
+ */
+extern fib_node_type_t fib_node_register_new_type (const fib_node_vft_t *vft);
+
+/**
+ * @brief Show the memory usage for a type
+ *
+ * This should be invoked by the type in response to the infra calling
+ * its registered memory show function
+ *
+ * @param name the name of the type
+ * @param in_use_elts The number of elements in use
+ * @param allocd_elts The number of allocated pool elemenets
+ * @param size_elt The size of one element
+ */
+extern void fib_show_memory_usage(const char *name,
+				  u32 in_use_elts,
+				  u32 allocd_elts,
+				  size_t size_elt);
+
+extern void fib_node_init(fib_node_t *node,
+			  fib_node_type_t ft);
+extern void fib_node_deinit(fib_node_t *node);
+
+extern void fib_node_lock(fib_node_t *node);
+extern void fib_node_unlock(fib_node_t *node);
+
+extern u32 fib_node_get_n_children(fib_node_type_t parent_type,
+                                   fib_node_index_t parent_index);
+extern u32 fib_node_child_add(fib_node_type_t parent_type,
+			      fib_node_index_t parent_index,
+			      fib_node_type_t child_type,
+			      fib_node_index_t child_index);
+extern void fib_node_child_remove(fib_node_type_t parent_type,
+                                  fib_node_index_t parent_index,
+                                  fib_node_index_t sibling_index);
+
+extern fib_node_back_walk_rc_t fib_node_back_walk_one(fib_node_ptr_t *ptr,
+                                                      fib_node_back_walk_ctx_t *ctx);
+
+extern u8* fib_node_children_format(fib_node_list_t list,
+				    u8 *s);
+
+extern const char* fib_node_type_get_name(fib_node_type_t type);
+
+static inline int
+fib_node_index_is_valid (fib_node_index_t ni)
+{
+    return (FIB_NODE_INDEX_INVALID != ni);
+}
+
+#endif
+
diff --git a/src/vnet/fib/fib_node_list.c b/src/vnet/fib/fib_node_list.c
new file mode 100644
index 00000000..ceb951b4
--- /dev/null
+++ b/src/vnet/fib/fib_node_list.c
@@ -0,0 +1,390 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief a hetrogeneous w.r.t. FIB node type, of FIB nodes.
+ * Since we cannot use C pointers, due to memeory reallocs, the next/prev
+ * are described as key:{type,index}.
+ */
+
+#include <vnet/fib/fib_node_list.h>
+
+/**
+ * @brief An element in the list
+ */
+typedef struct fib_node_list_elt_t_
+{
+    /**
+     * The index of the list this element is in
+     */
+    fib_node_list_t fnle_list;
+
+    /**
+     * The owner of this element
+     */
+    fib_node_ptr_t fnle_owner;
+
+    /**
+     * The next element in the list
+     */
+    u32 fnle_next;
+
+    /**
+     * The previous element in the list
+     */
+    u32 fnle_prev;
+} fib_node_list_elt_t;
+
+/**
+ * @brief A list of FIB nodes
+ */
+typedef struct fib_node_list_head_t_
+{
+    /**
+     * The head element
+     */
+    u32 fnlh_head;
+
+    /**
+     * Number of elements in the list
+     */
+    u32 fnlh_n_elts;
+} fib_node_list_head_t;
+
+/**
+ * Pools of list elements and heads
+ */
+static fib_node_list_elt_t *fib_node_list_elt_pool;
+static fib_node_list_head_t *fib_node_list_head_pool;
+
+static index_t
+fib_node_list_elt_get_index (fib_node_list_elt_t *elt)
+{
+    return (elt - fib_node_list_elt_pool);
+}
+
+static fib_node_list_elt_t *
+fib_node_list_elt_get (index_t fi)
+{
+    return (pool_elt_at_index(fib_node_list_elt_pool, fi));
+}
+
+static index_t
+fib_node_list_head_get_index (fib_node_list_head_t *head)
+{
+    return (head - fib_node_list_head_pool);
+}
+static fib_node_list_head_t *
+fib_node_list_head_get (fib_node_list_t fi)
+{
+    return (pool_elt_at_index(fib_node_list_head_pool, fi));
+}
+
+static fib_node_list_elt_t *
+fib_node_list_elt_create (fib_node_list_head_t *head,
+                          int id,
+                          fib_node_type_t type,
+                          fib_node_index_t index)
+{
+    fib_node_list_elt_t *elt;
+
+    pool_get(fib_node_list_elt_pool, elt);
+
+    elt->fnle_list = fib_node_list_head_get_index(head);
+    elt->fnle_owner.fnp_type  = type;
+    elt->fnle_owner.fnp_index = index;
+
+    elt->fnle_next = FIB_NODE_INDEX_INVALID;
+    elt->fnle_prev = FIB_NODE_INDEX_INVALID;
+
+    return (elt);
+}
+
+static void
+fib_node_list_head_init (fib_node_list_head_t *head)
+{
+    head->fnlh_n_elts = 0;
+    head->fnlh_head = FIB_NODE_INDEX_INVALID;
+}
+
+/**
+ * @brief Create a new node list.
+ */
+fib_node_list_t
+fib_node_list_create (void)
+{
+    fib_node_list_head_t *head;
+
+    pool_get(fib_node_list_head_pool, head);
+
+    fib_node_list_head_init(head);
+
+    return (fib_node_list_head_get_index(head));
+}
+
+void
+fib_node_list_destroy (fib_node_list_t *list)
+{
+    fib_node_list_head_t *head;
+
+    if (FIB_NODE_INDEX_INVALID == *list)
+        return;
+
+    head = fib_node_list_head_get(*list);
+    ASSERT(0 == head->fnlh_n_elts);
+
+    pool_put(fib_node_list_head_pool, head);
+    *list = FIB_NODE_INDEX_INVALID;
+}
+
+
+/**
+ * @brief Insert an element at the from of the list.
+ */
+u32
+fib_node_list_push_front (fib_node_list_t list,
+                          int owner_id,
+                          fib_node_type_t type,
+                          fib_node_index_t index)
+{
+    fib_node_list_elt_t *elt, *next;
+    fib_node_list_head_t *head;
+
+    head = fib_node_list_head_get(list);
+    elt = fib_node_list_elt_create(head, owner_id, type, index);
+
+    elt->fnle_prev = FIB_NODE_INDEX_INVALID;
+    elt->fnle_next = head->fnlh_head;
+
+    if (FIB_NODE_INDEX_INVALID != head->fnlh_head)
+    {
+        next = fib_node_list_elt_get(head->fnlh_head);
+        next->fnle_prev = fib_node_list_elt_get_index(elt);
+    }
+    head->fnlh_head = fib_node_list_elt_get_index(elt);
+
+    head->fnlh_n_elts++;
+
+    return (fib_node_list_elt_get_index(elt));
+}
+
+u32
+fib_node_list_push_back (fib_node_list_t list,
+                        int owner_id,
+                        fib_node_type_t type,
+                        fib_node_index_t index)
+{
+    ASSERT(0);
+    return (FIB_NODE_INDEX_INVALID);
+}
+
+static void
+fib_node_list_extract (fib_node_list_head_t *head,
+                       fib_node_list_elt_t *elt)
+{
+    fib_node_list_elt_t *next, *prev;
+
+    if (FIB_NODE_INDEX_INVALID != elt->fnle_next)
+    {
+        next = fib_node_list_elt_get(elt->fnle_next);
+        next->fnle_prev = elt->fnle_prev;
+    }
+
+    if (FIB_NODE_INDEX_INVALID != elt->fnle_prev)
+    {
+        prev = fib_node_list_elt_get(elt->fnle_prev);
+        prev->fnle_next = elt->fnle_next;
+    }
+    else
+    {
+        ASSERT (fib_node_list_elt_get_index(elt) == head->fnlh_head);
+        head->fnlh_head = elt->fnle_next;
+    }
+}
+
+static void
+fib_node_list_insert_after (fib_node_list_head_t *head,
+                            fib_node_list_elt_t *prev,
+                            fib_node_list_elt_t *elt)
+{
+    fib_node_list_elt_t *next;
+
+    elt->fnle_next = prev->fnle_next;
+    if (FIB_NODE_INDEX_INVALID != prev->fnle_next)
+    {
+        next = fib_node_list_elt_get(prev->fnle_next);
+        next->fnle_prev = fib_node_list_elt_get_index(elt);
+    }
+    prev->fnle_next = fib_node_list_elt_get_index(elt);
+    elt->fnle_prev = fib_node_list_elt_get_index(prev);
+}
+
+void
+fib_node_list_remove (fib_node_list_t list,
+                      u32 sibling)
+{
+    fib_node_list_head_t *head;
+    fib_node_list_elt_t *elt;
+
+    head = fib_node_list_head_get(list);
+    elt  = fib_node_list_elt_get(sibling);
+
+    fib_node_list_extract(head, elt);
+
+    head->fnlh_n_elts--;
+    pool_put(fib_node_list_elt_pool, elt);
+}
+
+void
+fib_node_list_elt_remove (u32 sibling)
+{
+    fib_node_list_elt_t *elt;
+
+    elt = fib_node_list_elt_get(sibling);
+
+    fib_node_list_remove(elt->fnle_list, sibling);
+}
+
+/**
+ * @brief Advance the sibling one step (toward the tail) in the list.
+ * return 0 if at the end of the list, 1 otherwise.
+ */
+int
+fib_node_list_advance (u32 sibling)
+{
+    fib_node_list_elt_t *elt, *next;
+    fib_node_list_head_t *head;
+
+    elt = fib_node_list_elt_get(sibling);
+    head = fib_node_list_head_get(elt->fnle_list);
+
+    if (FIB_NODE_INDEX_INVALID != elt->fnle_next)
+    {
+        /*
+         * not at the end of the list
+         */
+        next = fib_node_list_elt_get(elt->fnle_next);
+
+        fib_node_list_extract(head, elt);
+        fib_node_list_insert_after(head, next, elt);
+
+        return (1);
+    }
+    else
+    {
+        return (0);
+    }
+}
+
+int
+fib_node_list_elt_get_next (u32 sibling,
+                            fib_node_ptr_t *ptr)
+{
+    fib_node_list_elt_t *elt, *next;
+
+    elt = fib_node_list_elt_get(sibling);
+
+    if (FIB_NODE_INDEX_INVALID != elt->fnle_next)
+    {
+        next = fib_node_list_elt_get(elt->fnle_next);
+
+        *ptr = next->fnle_owner;
+        return (1);
+    }
+    else
+    {
+        ptr->fnp_index = FIB_NODE_INDEX_INVALID;
+        return (0);
+    }
+}
+
+u32
+fib_node_list_get_size (fib_node_list_t list)
+{
+    fib_node_list_head_t *head;
+
+    if (FIB_NODE_INDEX_INVALID == list)
+    {
+        return (0);
+    }
+
+    head = fib_node_list_head_get(list);
+
+    return (head->fnlh_n_elts);
+}
+
+int
+fib_node_list_get_front (fib_node_list_t list,
+                         fib_node_ptr_t *ptr)
+{
+    fib_node_list_head_t *head;
+    fib_node_list_elt_t *elt;
+
+
+    if (0 == fib_node_list_get_size(list))
+    {
+        ptr->fnp_index = FIB_NODE_INDEX_INVALID;
+        return (0);
+    }
+
+    head = fib_node_list_head_get(list);
+    elt = fib_node_list_elt_get(head->fnlh_head);
+    
+    *ptr = elt->fnle_owner;
+
+    return (1);
+}
+
+/**
+ * @brief Walk the list of node. This must be safe w.r.t. the removal
+ * of nodes during the walk.
+ */
+void
+fib_node_list_walk (fib_node_list_t list,
+                    fib_node_list_walk_cb_t fn,
+                    void *args)
+{
+    fib_node_list_elt_t *elt;
+    fib_node_list_head_t *head;
+    u32 sibling;
+
+    if (FIB_NODE_INDEX_INVALID == list)
+    {
+        return;
+    }
+
+    head = fib_node_list_head_get(list);
+    sibling = head->fnlh_head;
+
+    while (FIB_NODE_INDEX_INVALID != sibling)
+    {
+        elt = fib_node_list_elt_get(sibling);
+        sibling = elt->fnle_next;
+
+        fn(&elt->fnle_owner, args);
+    }
+}
+
+void
+fib_node_list_memory_show (void)
+{
+    fib_show_memory_usage("Node-list elements",
+			  pool_elts(fib_node_list_elt_pool),
+			  pool_len(fib_node_list_elt_pool),
+			  sizeof(fib_node_list_elt_t));
+    fib_show_memory_usage("Node-list heads",
+			  pool_elts(fib_node_list_head_pool),
+			  pool_len(fib_node_list_head_pool),
+			  sizeof(fib_node_list_head_t));
+}
diff --git a/src/vnet/fib/fib_node_list.h b/src/vnet/fib/fib_node_list.h
new file mode 100644
index 00000000..9567b966
--- /dev/null
+++ b/src/vnet/fib/fib_node_list.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief a hetrogeneous w.r.t. FIB node type, list of FIB nodes.
+ * Since we cannot use C pointers, due to memeory reallocs, the next/prev
+ * are described as an index to an element. Each element contains a pointer
+ * (key:{type, index}) to a FIB node.
+ */
+
+#ifndef __FIB_NODE_LIST_H__
+#define __FIB_NODE_LIST_H__
+
+#include <vnet/fib/fib_node.h>
+
+extern fib_node_list_t fib_node_list_create(void);
+extern void fib_node_list_destroy(fib_node_list_t *list);
+
+extern u32 fib_node_list_push_front(fib_node_list_t head,
+                                    int owner_id,
+                                    fib_node_type_t type,
+                                    fib_node_index_t index);
+extern u32 fib_node_list_push_back(fib_node_list_t head,
+                                   int owner_id,
+                                   fib_node_type_t type,
+                                   fib_node_index_t index);
+extern void fib_node_list_remove(fib_node_list_t head,
+                                 u32 sibling);
+extern void fib_node_list_elt_remove(u32 sibling);
+
+extern int fib_node_list_advance(u32 sibling);
+
+extern int fib_node_list_get_front(fib_node_list_t head,
+                                   fib_node_ptr_t *ptr);
+
+extern int fib_node_list_elt_get_next(u32 elt,
+                                      fib_node_ptr_t *ptr);
+
+extern u32 fib_node_list_get_size(fib_node_list_t head);
+
+/**
+ * @brief Callback function invoked during a list walk
+ */
+typedef int (*fib_node_list_walk_cb_t)(fib_node_ptr_t *owner,
+                                       void *args);
+
+extern void fib_node_list_walk(fib_node_list_t head,
+                               fib_node_list_walk_cb_t fn,
+                               void *args);
+
+extern void fib_node_list_memory_show(void);
+
+#endif
diff --git a/src/vnet/fib/fib_path.c b/src/vnet/fib/fib_path.c
new file mode 100644
index 00000000..809e3e16
--- /dev/null
+++ b/src/vnet/fib/fib_path.c
@@ -0,0 +1,2001 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/format.h>
+#include <vnet/ip/ip.h>
+#include <vnet/dpo/drop_dpo.h>
+#include <vnet/dpo/receive_dpo.h>
+#include <vnet/dpo/load_balance_map.h>
+#include <vnet/dpo/lookup_dpo.h>
+
+#include <vnet/adj/adj.h>
+
+#include <vnet/fib/fib_path.h>
+#include <vnet/fib/fib_node.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_path_list.h>
+#include <vnet/fib/fib_internal.h>
+#include <vnet/fib/fib_urpf_list.h>
+
+/**
+ * Enurmeration of path types
+ */
+typedef enum fib_path_type_t_ {
+    /**
+     * Marker. Add new types after this one.
+     */
+    FIB_PATH_TYPE_FIRST = 0,
+    /**
+     * Attached-nexthop. An interface and a nexthop are known.
+     */
+    FIB_PATH_TYPE_ATTACHED_NEXT_HOP = FIB_PATH_TYPE_FIRST,
+    /**
+     * attached. Only the interface is known.
+     */
+    FIB_PATH_TYPE_ATTACHED,
+    /**
+     * recursive. Only the next-hop is known.
+     */
+    FIB_PATH_TYPE_RECURSIVE,
+    /**
+     * special. nothing is known. so we drop.
+     */
+    FIB_PATH_TYPE_SPECIAL,
+    /**
+     * exclusive. user provided adj.
+     */
+    FIB_PATH_TYPE_EXCLUSIVE,
+    /**
+     * deag. Link to a lookup adj in the next table
+     */
+    FIB_PATH_TYPE_DEAG,
+    /**
+     * receive. it's for-us.
+     */
+    FIB_PATH_TYPE_RECEIVE,
+    /**
+     * Marker. Add new types before this one, then update it.
+     */
+    FIB_PATH_TYPE_LAST = FIB_PATH_TYPE_RECEIVE,
+} __attribute__ ((packed)) fib_path_type_t;
+
+/**
+ * The maximum number of path_types
+ */
+#define FIB_PATH_TYPE_MAX (FIB_PATH_TYPE_LAST + 1)
+
+#define FIB_PATH_TYPES {					\
+    [FIB_PATH_TYPE_ATTACHED_NEXT_HOP] = "attached-nexthop",	\
+    [FIB_PATH_TYPE_ATTACHED]          = "attached",		\
+    [FIB_PATH_TYPE_RECURSIVE]         = "recursive",	        \
+    [FIB_PATH_TYPE_SPECIAL]           = "special",	        \
+    [FIB_PATH_TYPE_EXCLUSIVE]         = "exclusive",	        \
+    [FIB_PATH_TYPE_DEAG]              = "deag",	                \
+    [FIB_PATH_TYPE_RECEIVE]           = "receive",	        \
+}
+
+#define FOR_EACH_FIB_PATH_TYPE(_item) \
+    for (_item = FIB_PATH_TYPE_FIRST; _item <= FIB_PATH_TYPE_LAST; _item++)
+
+/**
+ * Enurmeration of path operational (i.e. derived) attributes
+ */
+typedef enum fib_path_oper_attribute_t_ {
+    /**
+     * Marker. Add new types after this one.
+     */
+    FIB_PATH_OPER_ATTRIBUTE_FIRST = 0,
+    /**
+     * The path forms part of a recursive loop.
+     */
+    FIB_PATH_OPER_ATTRIBUTE_RECURSIVE_LOOP = FIB_PATH_OPER_ATTRIBUTE_FIRST,
+    /**
+     * The path is resolved
+     */
+    FIB_PATH_OPER_ATTRIBUTE_RESOLVED,
+    /**
+     * The path has become a permanent drop.
+     */
+    FIB_PATH_OPER_ATTRIBUTE_DROP,
+    /**
+     * Marker. Add new types before this one, then update it.
+     */
+    FIB_PATH_OPER_ATTRIBUTE_LAST = FIB_PATH_OPER_ATTRIBUTE_DROP,
+} __attribute__ ((packed)) fib_path_oper_attribute_t;
+
+/**
+ * The maximum number of path operational attributes
+ */
+#define FIB_PATH_OPER_ATTRIBUTE_MAX (FIB_PATH_OPER_ATTRIBUTE_LAST + 1)
+
+#define FIB_PATH_OPER_ATTRIBUTES {					\
+    [FIB_PATH_OPER_ATTRIBUTE_RECURSIVE_LOOP] = "recursive-loop",	\
+    [FIB_PATH_OPER_ATTRIBUTE_RESOLVED]       = "resolved",	        \
+    [FIB_PATH_OPER_ATTRIBUTE_DROP]           = "drop",		        \
+}
+
+#define FOR_EACH_FIB_PATH_OPER_ATTRIBUTE(_item) \
+    for (_item = FIB_PATH_OPER_ATTRIBUTE_FIRST; \
+	 _item <= FIB_PATH_OPER_ATTRIBUTE_LAST; \
+	 _item++)
+
+/**
+ * Path flags from the attributes
+ */
+typedef enum fib_path_oper_flags_t_ {
+    FIB_PATH_OPER_FLAG_NONE = 0,
+    FIB_PATH_OPER_FLAG_RECURSIVE_LOOP = (1 << FIB_PATH_OPER_ATTRIBUTE_RECURSIVE_LOOP),
+    FIB_PATH_OPER_FLAG_DROP = (1 << FIB_PATH_OPER_ATTRIBUTE_DROP),
+    FIB_PATH_OPER_FLAG_RESOLVED = (1 << FIB_PATH_OPER_ATTRIBUTE_RESOLVED),
+} __attribute__ ((packed)) fib_path_oper_flags_t;
+
+/**
+ * A FIB path
+ */
+typedef struct fib_path_t_ {
+    /**
+     * A path is a node in the FIB graph.
+     */
+    fib_node_t fp_node;
+
+    /**
+     * The index of the path-list to which this path belongs
+     */
+    u32 fp_pl_index;
+
+    /**
+     * This marks the start of the memory area used to hash
+     * the path
+     */
+    STRUCT_MARK(path_hash_start);
+
+    /**
+     * Configuration Flags
+     */
+    fib_path_cfg_flags_t fp_cfg_flags;
+
+    /**
+     * The type of the path. This is the selector for the union
+     */
+    fib_path_type_t fp_type;
+
+    /**
+     * The protocol of the next-hop, i.e. the address family of the
+     * next-hop's address. We can't derive this from the address itself
+     * since the address can be all zeros
+     */
+    fib_protocol_t fp_nh_proto;
+
+    /**
+     * UCMP [unnormalised] weigt
+     */
+    u32 fp_weight;
+
+    /**
+     * per-type union of the data required to resolve the path
+     */
+    union {
+	struct {
+	    /**
+	     * The next-hop
+	     */
+	    ip46_address_t fp_nh;
+	    /**
+	     * The interface
+	     */
+	    u32 fp_interface;
+	} attached_next_hop;
+	struct {
+	    /**
+	     * The interface
+	     */
+	    u32 fp_interface;
+	} attached;
+	struct {
+	    union
+	    {
+		/**
+		 * The next-hop
+		 */
+		ip46_address_t fp_ip;
+		/**
+		 * The local label to resolve through.
+		 */
+		mpls_label_t fp_local_label;
+	    } fp_nh;
+	    /**
+	     * The FIB table index in which to find the next-hop.
+	     * This needs to be fixed. We should lookup the adjacencies in
+	     * a separate table of adjacencies, rather than from the FIB.
+	     * Two reasons I can think of:
+	     *   - consider:
+	     *       int ip addr Gig0 10.0.0.1/24
+	     *       ip route 10.0.0.2/32 via Gig1 192.168.1.2
+	     *       ip route 1.1.1.1/32 via Gig0 10.0.0.2
+	     *     this is perfectly valid.
+	     *     Packets addressed to 10.0.0.2 should be sent via Gig1.
+	     *     Packets address to 1.1.1.1 should be sent via Gig0.
+	     *    when we perform the adj resolution from the FIB for the path
+	     *    "via Gig0 10.0.0.2" the lookup will result in the route via Gig1
+	     *    and so we will pick up the adj via Gig1 - which was not what the
+	     *    operator wanted.
+	     *  - we can only return link-type IPv4 and so not the link-type MPLS.
+	     *    more on this in a later commit.
+	     *
+	     * The table ID should only belong to a recursive path and indicate
+	     * which FIB should be used to resolve the next-hop.
+	     */
+	    fib_node_index_t fp_tbl_id;
+	} recursive;
+	struct {
+	    /**
+	     * The FIB index in which to perfom the next lookup
+	     */
+	    fib_node_index_t fp_tbl_id;
+	} deag;
+	struct {
+	} special;
+	struct {
+	    /**
+	     * The user provided 'exclusive' DPO
+	     */
+	    dpo_id_t fp_ex_dpo;
+	} exclusive;
+	struct {
+	    /**
+	     * The interface on which the local address is configured
+	     */
+	    u32 fp_interface;
+	    /**
+	     * The next-hop
+	     */
+	    ip46_address_t fp_addr;
+	} receive;
+    };
+    STRUCT_MARK(path_hash_end);
+
+    /**
+     * Memebers in this last section represent information that is
+     * dervied during resolution. It should not be copied to new paths
+     * nor compared.
+     */
+
+    /**
+     * Operational Flags
+     */
+    fib_path_oper_flags_t fp_oper_flags;
+
+    /**
+     * the resolving via fib. not part of the union, since it it not part
+     * of the path's hash.
+     */
+    fib_node_index_t fp_via_fib;
+
+    /**
+     * The Data-path objects through which this path resolves for IP.
+     */
+    dpo_id_t fp_dpo;
+
+    /**
+     * the index of this path in the parent's child list.
+     */
+    u32 fp_sibling;
+} fib_path_t;
+
+/*
+ * Array of strings/names for the path types and attributes
+ */
+static const char *fib_path_type_names[] = FIB_PATH_TYPES;
+static const char *fib_path_oper_attribute_names[] = FIB_PATH_OPER_ATTRIBUTES;
+static const char *fib_path_cfg_attribute_names[]  = FIB_PATH_CFG_ATTRIBUTES;
+
+/*
+ * The memory pool from which we allocate all the paths
+ */
+static fib_path_t *fib_path_pool;
+
+/*
+ * Debug macro
+ */
+#ifdef FIB_DEBUG
+#define FIB_PATH_DBG(_p, _fmt, _args...)			\
+{       		          				\
+    u8 *_tmp = NULL;						\
+    _tmp = fib_path_format(fib_path_get_index(_p), _tmp);	\
+    clib_warning("path:[%d:%s]:" _fmt,				\
+		 fib_path_get_index(_p), _tmp,			\
+		 ##_args);					\
+    vec_free(_tmp);						\
+}
+#else
+#define FIB_PATH_DBG(_p, _fmt, _args...)
+#endif
+
+static fib_path_t *
+fib_path_get (fib_node_index_t index)
+{
+    return (pool_elt_at_index(fib_path_pool, index));
+}
+
+static fib_node_index_t 
+fib_path_get_index (fib_path_t *path)
+{
+    return (path - fib_path_pool);
+}
+
+static fib_node_t *
+fib_path_get_node (fib_node_index_t index)
+{
+    return ((fib_node_t*)fib_path_get(index));
+}
+
+static fib_path_t*
+fib_path_from_fib_node (fib_node_t *node)
+{
+#if CLIB_DEBUG > 0
+    ASSERT(FIB_NODE_TYPE_PATH == node->fn_type);
+#endif
+    return ((fib_path_t*)node);
+}
+
+u8 *
+format_fib_path (u8 * s, va_list * args)
+{
+    fib_path_t *path = va_arg (*args, fib_path_t *);
+    vnet_main_t * vnm = vnet_get_main();
+    fib_path_oper_attribute_t oattr;
+    fib_path_cfg_attribute_t cattr;
+
+    s = format (s, "      index:%d ", fib_path_get_index(path));
+    s = format (s, "pl-index:%d ", path->fp_pl_index);
+    s = format (s, "%U ", format_fib_protocol, path->fp_nh_proto);
+    s = format (s, "weight=%d ", path->fp_weight);
+    s = format (s, "%s: ", fib_path_type_names[path->fp_type]);
+    if (FIB_PATH_OPER_FLAG_NONE != path->fp_oper_flags) {
+	s = format(s, " oper-flags:");
+	FOR_EACH_FIB_PATH_OPER_ATTRIBUTE(oattr) {
+	    if ((1<<oattr) & path->fp_oper_flags) {
+		s = format (s, "%s,", fib_path_oper_attribute_names[oattr]);
+	    }
+	}
+    }
+    if (FIB_PATH_CFG_FLAG_NONE != path->fp_cfg_flags) {
+	s = format(s, " cfg-flags:");
+	FOR_EACH_FIB_PATH_CFG_ATTRIBUTE(cattr) {
+	    if ((1<<cattr) & path->fp_cfg_flags) {
+		s = format (s, "%s,", fib_path_cfg_attribute_names[cattr]);
+	    }
+	}
+    }
+    s = format(s, "\n       ");
+
+    switch (path->fp_type)
+    {
+    case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
+	s = format (s, "%U", format_ip46_address,
+		    &path->attached_next_hop.fp_nh,
+		    IP46_TYPE_ANY);
+	if (path->fp_oper_flags & FIB_PATH_OPER_FLAG_DROP)
+	{
+	    s = format (s, " if_index:%d", path->attached_next_hop.fp_interface);
+	}
+	else
+	{
+	    s = format (s, " %U",
+			format_vnet_sw_interface_name,
+			vnm,
+			vnet_get_sw_interface(
+			    vnm,
+			    path->attached_next_hop.fp_interface));
+	    if (vnet_sw_interface_is_p2p(vnet_get_main(),
+					 path->attached_next_hop.fp_interface))
+	    {
+		s = format (s, " (p2p)");
+	    }
+	}
+	if (!dpo_id_is_valid(&path->fp_dpo))
+	{
+	    s = format(s, "\n          unresolved");
+	}
+	else
+	{
+	    s = format(s, "\n          %U",
+		       format_dpo_id,
+		       &path->fp_dpo, 13);
+	}
+	break;
+    case FIB_PATH_TYPE_ATTACHED:
+	if (path->fp_oper_flags & FIB_PATH_OPER_FLAG_DROP)
+	{
+	    s = format (s, " if_index:%d", path->attached_next_hop.fp_interface);
+	}
+	else
+	{
+	    s = format (s, " %U",
+			format_vnet_sw_interface_name,
+			vnm,
+			vnet_get_sw_interface(
+			    vnm,
+			    path->attached.fp_interface));
+	}
+	break;
+    case FIB_PATH_TYPE_RECURSIVE:
+	if (FIB_PROTOCOL_MPLS == path->fp_nh_proto)
+	{
+	    s = format (s, "via %U",
+			format_mpls_unicast_label,
+			path->recursive.fp_nh.fp_local_label);
+	}
+	else
+	{
+	    s = format (s, "via %U",
+			format_ip46_address,
+			&path->recursive.fp_nh.fp_ip,
+			IP46_TYPE_ANY);
+	}
+	s = format (s, " in fib:%d",
+		    path->recursive.fp_tbl_id,
+		    path->fp_via_fib); 
+	s = format (s, " via-fib:%d", path->fp_via_fib); 
+	s = format (s, " via-dpo:[%U:%d]",
+		    format_dpo_type, path->fp_dpo.dpoi_type, 
+		    path->fp_dpo.dpoi_index);
+
+	break;
+    case FIB_PATH_TYPE_RECEIVE:
+    case FIB_PATH_TYPE_SPECIAL:
+    case FIB_PATH_TYPE_DEAG:
+    case FIB_PATH_TYPE_EXCLUSIVE:
+	if (dpo_id_is_valid(&path->fp_dpo))
+	{
+	    s = format(s, "%U", format_dpo_id,
+		       &path->fp_dpo, 2);
+	}
+	break;
+    }
+    return (s);
+}
+
+u8 *
+fib_path_format (fib_node_index_t pi, u8 *s)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(pi);
+    ASSERT(NULL != path);
+
+    return (format (s, "%U", format_fib_path, path));
+}
+
+u8 *
+fib_path_adj_format (fib_node_index_t pi,
+		     u32 indent,
+		     u8 *s)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(pi);
+    ASSERT(NULL != path);
+
+    if (!dpo_id_is_valid(&path->fp_dpo))
+    {
+	s = format(s, " unresolved");
+    }
+    else
+    {
+	s = format(s, "%U", format_dpo_id,
+		   &path->fp_dpo, 2);
+    }
+
+    return (s);
+}
+
+/*
+ * fib_path_last_lock_gone
+ *
+ * We don't share paths, we share path lists, so the [un]lock functions
+ * are no-ops
+ */
+static void
+fib_path_last_lock_gone (fib_node_t *node)
+{
+    ASSERT(0);
+}
+
+static const adj_index_t
+fib_path_attached_next_hop_get_adj (fib_path_t *path,
+				    vnet_link_t link)
+{
+    if (vnet_sw_interface_is_p2p(vnet_get_main(),
+				 path->attached_next_hop.fp_interface))
+    {
+	/*
+	 * if the interface is p2p then the adj for the specific
+	 * neighbour on that link will never exist. on p2p links
+	 * the subnet address (the attached route) links to the
+	 * auto-adj (see below), we want that adj here too.
+	 */
+	return (adj_nbr_add_or_lock(path->fp_nh_proto,
+				    link,
+				    &zero_addr,
+				    path->attached_next_hop.fp_interface));
+    }
+    else
+    {
+	return (adj_nbr_add_or_lock(path->fp_nh_proto,
+				    link,
+				    &path->attached_next_hop.fp_nh,
+				    path->attached_next_hop.fp_interface));
+    }
+}
+
+static void
+fib_path_attached_next_hop_set (fib_path_t *path)
+{
+    /*
+     * resolve directly via the adjacnecy discribed by the
+     * interface and next-hop
+     */
+    if (!vnet_sw_interface_is_admin_up(vnet_get_main(),
+				      path->attached_next_hop.fp_interface))
+    {
+	path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
+    }
+
+    dpo_set(&path->fp_dpo,
+	    DPO_ADJACENCY,
+	    fib_proto_to_dpo(path->fp_nh_proto),
+	    fib_path_attached_next_hop_get_adj(
+		 path,
+		 fib_proto_to_link(path->fp_nh_proto)));
+
+    /*
+     * become a child of the adjacency so we receive updates
+     * when its rewrite changes
+     */
+    path->fp_sibling = adj_child_add(path->fp_dpo.dpoi_index,
+				     FIB_NODE_TYPE_PATH,
+				     fib_path_get_index(path));
+}
+
+/*
+ * create of update the paths recursive adj
+ */
+static void
+fib_path_recursive_adj_update (fib_path_t *path,
+			       fib_forward_chain_type_t fct,
+			       dpo_id_t *dpo)
+{
+    dpo_id_t via_dpo = DPO_INVALID;
+
+    /*
+     * get the DPO to resolve through from the via-entry
+     */
+    fib_entry_contribute_forwarding(path->fp_via_fib,
+				    fct,
+				    &via_dpo);
+
+
+    /*
+     * hope for the best - clear if restrictions apply.
+     */
+    path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RESOLVED;
+
+    /*
+     * Validate any recursion constraints and over-ride the via
+     * adj if not met
+     */
+    if (path->fp_oper_flags & FIB_PATH_OPER_FLAG_RECURSIVE_LOOP)
+    {
+	path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
+	dpo_copy(&via_dpo, drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
+    }
+    else if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_RESOLVE_HOST)
+    {
+	/*
+	 * the via FIB must be a host route.
+	 * note the via FIB just added will always be a host route
+	 * since it is an RR source added host route. So what we need to
+	 * check is whether the route has other sources. If it does then
+	 * some other source has added it as a host route. If it doesn't
+	 * then it was added only here and inherits forwarding from a cover.
+	 * the cover is not a host route.
+	 * The RR source is the lowest priority source, so we check if it
+	 * is the best. if it is there are no other sources.
+	 */
+	if (fib_entry_get_best_source(path->fp_via_fib) >= FIB_SOURCE_RR)
+	{
+	    path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
+            dpo_copy(&via_dpo, drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
+
+            /*
+             * PIC edge trigger. let the load-balance maps know
+             */
+            load_balance_map_path_state_change(fib_path_get_index(path));
+	}
+    }
+    else if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_RESOLVE_ATTACHED)
+    {
+	/*
+	 * RR source entries inherit the flags from the cover, so
+	 * we can check the via directly
+	 */
+	if (!(FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags(path->fp_via_fib)))
+	{
+	    path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
+            dpo_copy(&via_dpo, drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
+
+            /*
+             * PIC edge trigger. let the load-balance maps know
+             */
+            load_balance_map_path_state_change(fib_path_get_index(path));
+	}
+    }
+
+    /*
+     * update the path's contributed DPO
+     */
+    dpo_copy(dpo, &via_dpo);
+
+    FIB_PATH_DBG(path, "recursive update: %U",
+		 fib_get_lookup_main(path->fp_nh_proto),
+		 &path->fp_dpo, 2);
+
+    dpo_reset(&via_dpo);
+}
+
+/*
+ * fib_path_is_permanent_drop
+ *
+ * Return !0 if the path is configured to permanently drop,
+ * despite other attributes.
+ */
+static int
+fib_path_is_permanent_drop (fib_path_t *path)
+{
+    return ((path->fp_cfg_flags & FIB_PATH_CFG_FLAG_DROP) ||
+	    (path->fp_oper_flags & FIB_PATH_OPER_FLAG_DROP));
+}
+
+/*
+ * fib_path_unresolve
+ *
+ * Remove our dependency on the resolution target
+ */
+static void
+fib_path_unresolve (fib_path_t *path)
+{
+    /*
+     * the forced drop path does not need unresolving
+     */
+    if (fib_path_is_permanent_drop(path))
+    {
+	return;
+    }
+
+    switch (path->fp_type)
+    {
+    case FIB_PATH_TYPE_RECURSIVE:
+	if (FIB_NODE_INDEX_INVALID != path->fp_via_fib)
+	{
+	    fib_prefix_t pfx;
+
+	    fib_entry_get_prefix(path->fp_via_fib, &pfx);
+	    fib_entry_child_remove(path->fp_via_fib,
+				   path->fp_sibling);
+	    fib_table_entry_special_remove(path->recursive.fp_tbl_id,
+					   &pfx,
+					   FIB_SOURCE_RR);
+	    path->fp_via_fib = FIB_NODE_INDEX_INVALID;
+	}
+	break;
+    case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
+    case FIB_PATH_TYPE_ATTACHED:
+	adj_child_remove(path->fp_dpo.dpoi_index,
+			 path->fp_sibling);
+        adj_unlock(path->fp_dpo.dpoi_index);
+        break;
+    case FIB_PATH_TYPE_EXCLUSIVE:
+	dpo_reset(&path->exclusive.fp_ex_dpo);
+        break;
+    case FIB_PATH_TYPE_SPECIAL:
+    case FIB_PATH_TYPE_RECEIVE:
+    case FIB_PATH_TYPE_DEAG:
+        /*
+         * these hold only the path's DPO, which is reset below.
+         */
+	break;
+    }
+
+    /*
+     * release the adj we were holding and pick up the
+     * drop just in case.
+     */
+    dpo_reset(&path->fp_dpo);
+    path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
+
+    return;
+}
+
+static fib_forward_chain_type_t
+fib_path_proto_to_chain_type (fib_protocol_t proto)
+{
+    switch (proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
+    case FIB_PROTOCOL_IP6:
+	return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
+    case FIB_PROTOCOL_MPLS:
+	return (FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS);
+    }
+    return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
+}
+
+/*
+ * fib_path_back_walk_notify
+ *
+ * A back walk has reach this path.
+ */
+static fib_node_back_walk_rc_t
+fib_path_back_walk_notify (fib_node_t *node,
+			   fib_node_back_walk_ctx_t *ctx)
+{
+    fib_path_t *path;
+
+    path = fib_path_from_fib_node(node);
+
+    switch (path->fp_type)
+    {
+    case FIB_PATH_TYPE_RECURSIVE:
+	if (FIB_NODE_BW_REASON_FLAG_EVALUATE & ctx->fnbw_reason)
+	{
+	    /*
+	     * modify the recursive adjacency to use the new forwarding
+	     * of the via-fib.
+	     * this update is visible to packets in flight in the DP.
+	     */
+	    fib_path_recursive_adj_update(
+		path,
+		fib_path_proto_to_chain_type(path->fp_nh_proto),
+		&path->fp_dpo);
+	}
+	if ((FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE & ctx->fnbw_reason) ||
+            (FIB_NODE_BW_REASON_FLAG_ADJ_DOWN   & ctx->fnbw_reason))
+	{
+	    /*
+	     * ADJ updates (complete<->incomplete) do not need to propagate to
+	     * recursive entries.
+	     * The only reason its needed as far back as here, is that the adj
+	     * and the incomplete adj are a different DPO type, so the LBs need
+	     * to re-stack.
+	     * If this walk was quashed in the fib_entry, then any non-fib_path
+	     * children (like tunnels that collapse out the LB when they stack)
+	     * would not see the update.
+	     */
+	    return (FIB_NODE_BACK_WALK_CONTINUE);
+	}
+	break;
+    case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
+	/*
+FIXME comment
+	 * ADJ_UPDATE backwalk pass silently through here and up to
+	 * the path-list when the multipath adj collapse occurs.
+	 * The reason we do this is that the assumtption is that VPP
+	 * runs in an environment where the Control-Plane is remote
+	 * and hence reacts slowly to link up down. In order to remove
+	 * this down link from the ECMP set quickly, we back-walk.
+	 * VPP also has dedicated CPUs, so we are not stealing resources
+	 * from the CP to do so.
+	 */
+	if (FIB_NODE_BW_REASON_FLAG_INTERFACE_UP & ctx->fnbw_reason)
+	{
+            if (path->fp_oper_flags & FIB_PATH_OPER_FLAG_RESOLVED)
+            {
+                /*
+                 * alreday resolved. no need to walk back again
+                 */
+                return (FIB_NODE_BACK_WALK_CONTINUE);
+            }
+	    path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RESOLVED;
+	}
+	if (FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN & ctx->fnbw_reason)
+	{
+            if (!(path->fp_oper_flags & FIB_PATH_OPER_FLAG_RESOLVED))
+            {
+                /*
+                 * alreday unresolved. no need to walk back again
+                 */
+                return (FIB_NODE_BACK_WALK_CONTINUE);
+            }
+	    path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
+	}
+	if (FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE & ctx->fnbw_reason)
+	{
+	    /*
+	     * The interface this path resolves through has been deleted.
+	     * This will leave the path in a permanent drop state. The route
+	     * needs to be removed and readded (and hence the path-list deleted)
+	     * before it can forward again.
+	     */
+	    fib_path_unresolve(path);
+	    path->fp_oper_flags |= FIB_PATH_OPER_FLAG_DROP;
+	}
+        if (FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE & ctx->fnbw_reason)
+	{
+            /*
+             * restack the DPO to pick up the correct DPO sub-type
+             */
+            uword if_is_up;
+            adj_index_t ai;
+
+            if_is_up = vnet_sw_interface_is_admin_up(
+                           vnet_get_main(),
+                           path->attached_next_hop.fp_interface);
+
+            if (if_is_up)
+            {
+                path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RESOLVED;
+            }
+
+            ai = fib_path_attached_next_hop_get_adj(
+                     path,
+                     fib_proto_to_link(path->fp_nh_proto));
+
+            dpo_set(&path->fp_dpo, DPO_ADJACENCY,
+                    fib_proto_to_dpo(path->fp_nh_proto),
+                    ai);
+            adj_unlock(ai);
+
+            if (!if_is_up)
+            {
+                /*
+                 * If the interface is not up there is no reason to walk
+                 * back to children. if we did they would only evalute
+                 * that this path is unresolved and hence it would
+                 * not contribute the adjacency - so it would be wasted
+                 * CPU time.
+                 */
+                return (FIB_NODE_BACK_WALK_CONTINUE);
+            }
+        }
+        if (FIB_NODE_BW_REASON_FLAG_ADJ_DOWN & ctx->fnbw_reason)
+	{
+            if (!(path->fp_oper_flags & FIB_PATH_OPER_FLAG_RESOLVED))
+            {
+                /*
+                 * alreday unresolved. no need to walk back again
+                 */
+                return (FIB_NODE_BACK_WALK_CONTINUE);
+            }
+            /*
+             * the adj has gone down. the path is no longer resolved.
+             */
+	    path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
+        }
+	break;
+    case FIB_PATH_TYPE_ATTACHED:
+	/*
+	 * FIXME; this could schedule a lower priority walk, since attached
+	 * routes are not usually in ECMP configurations so the backwalk to
+	 * the FIB entry does not need to be high priority
+	 */
+	if (FIB_NODE_BW_REASON_FLAG_INTERFACE_UP & ctx->fnbw_reason)
+	{
+	    path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RESOLVED;
+	}
+	if (FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN & ctx->fnbw_reason)
+	{
+	    path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
+	}
+	if (FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE & ctx->fnbw_reason)
+	{
+	    fib_path_unresolve(path);
+	    path->fp_oper_flags |= FIB_PATH_OPER_FLAG_DROP;
+	}
+	break;
+    case FIB_PATH_TYPE_DEAG:
+	/*
+	 * FIXME When VRF delete is allowed this will need a poke.
+	 */
+    case FIB_PATH_TYPE_SPECIAL:
+    case FIB_PATH_TYPE_RECEIVE:
+    case FIB_PATH_TYPE_EXCLUSIVE:
+	/*
+	 * these path types have no parents. so to be
+	 * walked from one is unexpected.
+	 */
+	ASSERT(0);
+	break;
+    }
+
+    /*
+     * propagate the backwalk further to the path-list
+     */
+    fib_path_list_back_walk(path->fp_pl_index, ctx);
+
+    return (FIB_NODE_BACK_WALK_CONTINUE);
+}
+
+static void
+fib_path_memory_show (void)
+{
+    fib_show_memory_usage("Path",
+			  pool_elts(fib_path_pool),
+			  pool_len(fib_path_pool),
+			  sizeof(fib_path_t));
+}
+
+/*
+ * The FIB path's graph node virtual function table
+ */
+static const fib_node_vft_t fib_path_vft = {
+    .fnv_get = fib_path_get_node,
+    .fnv_last_lock = fib_path_last_lock_gone,
+    .fnv_back_walk = fib_path_back_walk_notify,
+    .fnv_mem_show = fib_path_memory_show,
+};
+
+static fib_path_cfg_flags_t
+fib_path_route_flags_to_cfg_flags (const fib_route_path_t *rpath)
+{
+    fib_path_cfg_flags_t cfg_flags = FIB_PATH_CFG_FLAG_NONE;
+
+    if (rpath->frp_flags & FIB_ROUTE_PATH_RESOLVE_VIA_HOST)
+	cfg_flags |= FIB_PATH_CFG_FLAG_RESOLVE_HOST;
+    if (rpath->frp_flags & FIB_ROUTE_PATH_RESOLVE_VIA_ATTACHED)
+	cfg_flags |= FIB_PATH_CFG_FLAG_RESOLVE_ATTACHED;
+
+    return (cfg_flags);
+}
+
+/*
+ * fib_path_create
+ *
+ * Create and initialise a new path object.
+ * return the index of the path.
+ */
+fib_node_index_t
+fib_path_create (fib_node_index_t pl_index,
+		 fib_protocol_t nh_proto,
+		 fib_path_cfg_flags_t flags,
+		 const fib_route_path_t *rpath)
+{
+    fib_path_t *path;
+
+    pool_get(fib_path_pool, path);
+    memset(path, 0, sizeof(*path));
+
+    fib_node_init(&path->fp_node,
+		  FIB_NODE_TYPE_PATH);
+
+    dpo_reset(&path->fp_dpo);
+    path->fp_pl_index = pl_index;
+    path->fp_nh_proto = nh_proto;
+    path->fp_via_fib = FIB_NODE_INDEX_INVALID;
+    path->fp_weight = rpath->frp_weight;
+    if (0 == path->fp_weight)
+    {
+        /*
+         * a weight of 0 is a meaningless value. We could either reject it, and thus force
+         * clients to always use 1, or we can accept it and fixup approrpiately.
+         */
+        path->fp_weight = 1;
+    }
+    path->fp_cfg_flags = flags;
+    path->fp_cfg_flags |= fib_path_route_flags_to_cfg_flags(rpath);
+
+    /*
+     * deduce the path's tpye from the parementers and save what is needed.
+     */
+    if (~0 != rpath->frp_sw_if_index)
+    {
+	if (flags & FIB_PATH_CFG_FLAG_LOCAL)
+	{
+	    path->fp_type = FIB_PATH_TYPE_RECEIVE;
+	    path->receive.fp_interface = rpath->frp_sw_if_index;
+            path->receive.fp_addr = rpath->frp_addr;
+	}
+	else
+	{
+	    if (ip46_address_is_zero(&rpath->frp_addr))
+	    {
+		path->fp_type = FIB_PATH_TYPE_ATTACHED;
+		path->attached.fp_interface = rpath->frp_sw_if_index;
+	    }
+	    else
+	    {
+		path->fp_type = FIB_PATH_TYPE_ATTACHED_NEXT_HOP;
+		path->attached_next_hop.fp_interface = rpath->frp_sw_if_index;
+		path->attached_next_hop.fp_nh = rpath->frp_addr;
+	    }
+	}
+    }
+    else
+    {
+	if (ip46_address_is_zero(&rpath->frp_addr))
+	{
+	    if (~0 == rpath->frp_fib_index)
+	    {
+		path->fp_type = FIB_PATH_TYPE_SPECIAL;
+	    }
+	    else
+	    {
+		path->fp_type = FIB_PATH_TYPE_DEAG;
+		path->deag.fp_tbl_id = rpath->frp_fib_index;
+	    }		
+	}
+	else
+	{
+	    path->fp_type = FIB_PATH_TYPE_RECURSIVE;
+	    if (FIB_PROTOCOL_MPLS == path->fp_nh_proto)
+	    {
+		path->recursive.fp_nh.fp_local_label = rpath->frp_local_label;
+	    }
+	    else
+	    {
+		path->recursive.fp_nh.fp_ip = rpath->frp_addr;
+	    }
+	    path->recursive.fp_tbl_id = rpath->frp_fib_index;
+	}
+    }
+
+    FIB_PATH_DBG(path, "create");
+
+    return (fib_path_get_index(path));
+}
+
+/*
+ * fib_path_create_special
+ *
+ * Create and initialise a new path object.
+ * return the index of the path.
+ */
+fib_node_index_t
+fib_path_create_special (fib_node_index_t pl_index,
+			 fib_protocol_t nh_proto,
+			 fib_path_cfg_flags_t flags,
+			 const dpo_id_t *dpo)
+{
+    fib_path_t *path;
+
+    pool_get(fib_path_pool, path);
+    memset(path, 0, sizeof(*path));
+
+    fib_node_init(&path->fp_node,
+		  FIB_NODE_TYPE_PATH);
+    dpo_reset(&path->fp_dpo);
+
+    path->fp_pl_index = pl_index;
+    path->fp_weight = 1;
+    path->fp_nh_proto = nh_proto;
+    path->fp_via_fib = FIB_NODE_INDEX_INVALID;
+    path->fp_cfg_flags = flags;
+
+    if (FIB_PATH_CFG_FLAG_DROP & flags)
+    {
+	path->fp_type = FIB_PATH_TYPE_SPECIAL;
+    }
+    else if (FIB_PATH_CFG_FLAG_LOCAL & flags)
+    {
+	path->fp_type = FIB_PATH_TYPE_RECEIVE;
+	path->attached.fp_interface = FIB_NODE_INDEX_INVALID;
+    }
+    else
+    {
+	path->fp_type = FIB_PATH_TYPE_EXCLUSIVE;
+	ASSERT(NULL != dpo);
+	dpo_copy(&path->exclusive.fp_ex_dpo, dpo);
+    }
+
+    return (fib_path_get_index(path));
+}
+
+/*
+ * fib_path_copy
+ *
+ * Copy a path. return index of new path.
+ */
+fib_node_index_t
+fib_path_copy (fib_node_index_t path_index,
+	       fib_node_index_t path_list_index)
+{
+    fib_path_t *path, *orig_path;
+
+    pool_get(fib_path_pool, path);
+
+    orig_path = fib_path_get(path_index);
+    ASSERT(NULL != orig_path);
+
+    memcpy(path, orig_path, sizeof(*path));
+
+    FIB_PATH_DBG(path, "create-copy:%d", path_index);
+
+    /*
+     * reset the dynamic section
+     */
+    fib_node_init(&path->fp_node, FIB_NODE_TYPE_PATH);
+    path->fp_oper_flags     = FIB_PATH_OPER_FLAG_NONE;
+    path->fp_pl_index  = path_list_index;
+    path->fp_via_fib   = FIB_NODE_INDEX_INVALID;
+    memset(&path->fp_dpo, 0, sizeof(path->fp_dpo));
+    dpo_reset(&path->fp_dpo);
+
+    return (fib_path_get_index(path));
+}
+
+/*
+ * fib_path_destroy
+ *
+ * destroy a path that is no longer required
+ */
+void
+fib_path_destroy (fib_node_index_t path_index)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    ASSERT(NULL != path);
+    FIB_PATH_DBG(path, "destroy");
+
+    fib_path_unresolve(path);
+
+    fib_node_deinit(&path->fp_node);
+    pool_put(fib_path_pool, path);
+}
+
+/*
+ * fib_path_destroy
+ *
+ * destroy a path that is no longer required
+ */
+uword
+fib_path_hash (fib_node_index_t path_index)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    return (hash_memory(STRUCT_MARK_PTR(path, path_hash_start),
+			(STRUCT_OFFSET_OF(fib_path_t, path_hash_end) -
+			 STRUCT_OFFSET_OF(fib_path_t, path_hash_start)),
+			0));
+}
+
+/*
+ * fib_path_cmp_i
+ *
+ * Compare two paths for equivalence.
+ */
+static int
+fib_path_cmp_i (const fib_path_t *path1,
+		const fib_path_t *path2)
+{
+    int res;
+
+    res = 1;
+
+    /*
+     * paths of different types and protocol are not equal.
+     * different weights only are the same path.
+     */
+    if (path1->fp_type != path2->fp_type)
+    {
+	res = (path1->fp_type - path2->fp_type);
+    }
+    if (path1->fp_nh_proto != path2->fp_nh_proto)
+    {
+	res = (path1->fp_nh_proto - path2->fp_nh_proto);
+    }
+    else
+    {
+	/*
+	 * both paths are of the same type.
+	 * consider each type and its attributes in turn.
+	 */
+	switch (path1->fp_type)
+	{
+	case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
+	    res = ip46_address_cmp(&path1->attached_next_hop.fp_nh,
+				   &path2->attached_next_hop.fp_nh);
+	    if (0 == res) {
+		res = vnet_sw_interface_compare(
+			  vnet_get_main(),
+			  path1->attached_next_hop.fp_interface,
+			  path2->attached_next_hop.fp_interface);
+	    }
+	    break;
+	case FIB_PATH_TYPE_ATTACHED:
+	    res = vnet_sw_interface_compare(
+		      vnet_get_main(),
+		      path1->attached.fp_interface,
+		      path2->attached.fp_interface);
+	    break;
+	case FIB_PATH_TYPE_RECURSIVE:
+	    res = ip46_address_cmp(&path1->recursive.fp_nh,
+				   &path2->recursive.fp_nh);
+ 
+	    if (0 == res)
+	    {
+		res = (path1->recursive.fp_tbl_id - path2->recursive.fp_tbl_id);
+	    }
+	    break;
+	case FIB_PATH_TYPE_DEAG:
+	    res = (path1->deag.fp_tbl_id - path2->deag.fp_tbl_id);
+	    break;
+	case FIB_PATH_TYPE_SPECIAL:
+	case FIB_PATH_TYPE_RECEIVE:
+	case FIB_PATH_TYPE_EXCLUSIVE:
+	    res = 0;
+	    break;
+	}
+    }
+    return (res);
+}
+
+/*
+ * fib_path_cmp_for_sort
+ *
+ * Compare two paths for equivalence. Used during path sorting.
+ * As usual 0 means equal.
+ */
+int
+fib_path_cmp_for_sort (void * v1,
+		       void * v2)
+{
+    fib_node_index_t *pi1 = v1, *pi2 = v2;
+    fib_path_t *path1, *path2;
+
+    path1 = fib_path_get(*pi1);
+    path2 = fib_path_get(*pi2);
+
+    return (fib_path_cmp_i(path1, path2));
+}
+
+/*
+ * fib_path_cmp
+ *
+ * Compare two paths for equivalence.
+ */
+int
+fib_path_cmp (fib_node_index_t pi1,
+	      fib_node_index_t pi2)
+{
+    fib_path_t *path1, *path2;
+
+    path1 = fib_path_get(pi1);
+    path2 = fib_path_get(pi2);
+
+    return (fib_path_cmp_i(path1, path2));
+}
+
+int
+fib_path_cmp_w_route_path (fib_node_index_t path_index,
+			   const fib_route_path_t *rpath)
+{
+    fib_path_t *path;
+    int res;
+
+    path = fib_path_get(path_index);
+
+    res = 1;
+
+    if (path->fp_weight != rpath->frp_weight)
+    {
+	res = (path->fp_weight - rpath->frp_weight);
+    }
+    else
+    {
+	/*
+	 * both paths are of the same type.
+	 * consider each type and its attributes in turn.
+	 */
+	switch (path->fp_type)
+	{
+	case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
+	    res = ip46_address_cmp(&path->attached_next_hop.fp_nh,
+				   &rpath->frp_addr);
+	    if (0 == res)
+	    {
+		res = vnet_sw_interface_compare(
+			  vnet_get_main(),
+			  path->attached_next_hop.fp_interface,
+			  rpath->frp_sw_if_index);
+	    }
+	    break;
+	case FIB_PATH_TYPE_ATTACHED:
+	    res = vnet_sw_interface_compare(
+		      vnet_get_main(),
+		      path->attached.fp_interface,
+		      rpath->frp_sw_if_index);
+	    break;
+	case FIB_PATH_TYPE_RECURSIVE:
+            if (FIB_PROTOCOL_MPLS == path->fp_nh_proto)
+            {
+                res = path->recursive.fp_nh.fp_local_label - rpath->frp_local_label;
+            }
+            else
+            {
+                res = ip46_address_cmp(&path->recursive.fp_nh.fp_ip,
+                                       &rpath->frp_addr);
+            }
+
+            if (0 == res)
+            {
+                res = (path->recursive.fp_tbl_id - rpath->frp_fib_index);
+            }
+	    break;
+	case FIB_PATH_TYPE_DEAG:
+	    res = (path->deag.fp_tbl_id - rpath->frp_fib_index);
+	    break;
+	case FIB_PATH_TYPE_SPECIAL:
+	case FIB_PATH_TYPE_RECEIVE:
+	case FIB_PATH_TYPE_EXCLUSIVE:
+	    res = 0;
+	    break;
+	}
+    }
+    return (res);
+}
+
+/*
+ * fib_path_recursive_loop_detect
+ *
+ * A forward walk of the FIB object graph to detect for a cycle/loop. This
+ * walk is initiated when an entry is linking to a new path list or from an old.
+ * The entry vector passed contains all the FIB entrys that are children of this
+ * path (it is all the entries encountered on the walk so far). If this vector
+ * contains the entry this path resolve via, then a loop is about to form.
+ * The loop must be allowed to form, since we need the dependencies in place
+ * so that we can track when the loop breaks.
+ * However, we MUST not produce a loop in the forwarding graph (else packets
+ * would loop around the switch path until the loop breaks), so we mark recursive
+ * paths as looped so that they do not contribute forwarding information.
+ * By marking the path as looped, an etry such as;
+ *    X/Y
+ *     via a.a.a.a (looped)
+ *     via b.b.b.b (not looped)
+ * can still forward using the info provided by b.b.b.b only
+ */
+int
+fib_path_recursive_loop_detect (fib_node_index_t path_index,
+				fib_node_index_t **entry_indicies)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    /*
+     * the forced drop path is never looped, cos it is never resolved.
+     */
+    if (fib_path_is_permanent_drop(path))
+    {
+	return (0);
+    }
+
+    switch (path->fp_type)
+    {
+    case FIB_PATH_TYPE_RECURSIVE:
+    {
+	fib_node_index_t *entry_index, *entries;
+	int looped = 0;
+	entries = *entry_indicies;
+
+	vec_foreach(entry_index, entries) {
+	    if (*entry_index == path->fp_via_fib)
+	    {
+		/*
+		 * the entry that is about to link to this path-list (or
+		 * one of this path-list's children) is the same entry that
+		 * this recursive path resolves through. this is a cycle.
+		 * abort the walk.
+		 */
+		looped = 1;
+		break;
+	    }
+	}
+
+	if (looped)
+	{
+	    FIB_PATH_DBG(path, "recursive loop formed");
+	    path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RECURSIVE_LOOP;
+
+	    dpo_copy(&path->fp_dpo,
+                    drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
+	}
+	else
+	{
+	    /*
+	     * no loop here yet. keep forward walking the graph.
+	     */	    
+	    if (fib_entry_recursive_loop_detect(path->fp_via_fib, entry_indicies))
+	    {
+		FIB_PATH_DBG(path, "recursive loop formed");
+		path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RECURSIVE_LOOP;
+	    }
+	    else
+	    {
+		FIB_PATH_DBG(path, "recursive loop cleared");
+		path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RECURSIVE_LOOP;
+	    }
+	}
+	break;
+    }
+    case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
+    case FIB_PATH_TYPE_ATTACHED:
+    case FIB_PATH_TYPE_SPECIAL:
+    case FIB_PATH_TYPE_DEAG:
+    case FIB_PATH_TYPE_RECEIVE:
+    case FIB_PATH_TYPE_EXCLUSIVE:
+	/*
+	 * these path types cannot be part of a loop, since they are the leaves
+	 * of the graph.
+	 */
+	break;
+    }
+
+    return (fib_path_is_looped(path_index));
+}
+
+int
+fib_path_resolve (fib_node_index_t path_index)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    /*
+     * hope for the best.
+     */
+    path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RESOLVED;
+
+    /*
+     * the forced drop path resolves via the drop adj
+     */
+    if (fib_path_is_permanent_drop(path))
+    {
+	dpo_copy(&path->fp_dpo,
+                 drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
+	path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
+	return (fib_path_is_resolved(path_index));
+    }
+
+    switch (path->fp_type)
+    {
+    case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
+	fib_path_attached_next_hop_set(path);
+	break;
+    case FIB_PATH_TYPE_ATTACHED:
+	/*
+	 * path->attached.fp_interface
+	 */
+	if (!vnet_sw_interface_is_admin_up(vnet_get_main(),
+					   path->attached.fp_interface))
+	{
+	    path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
+	}
+	if (vnet_sw_interface_is_p2p(vnet_get_main(),
+				     path->attached.fp_interface))
+	{
+	    /*
+	     * point-2-point interfaces do not require a glean, since
+	     * there is nothing to ARP. Install a rewrite/nbr adj instead
+	     */
+	    dpo_set(&path->fp_dpo,
+		    DPO_ADJACENCY,
+		    fib_proto_to_dpo(path->fp_nh_proto),
+		    adj_nbr_add_or_lock(
+			path->fp_nh_proto,
+			fib_proto_to_link(path->fp_nh_proto),
+			&zero_addr,
+			path->attached.fp_interface));
+	}
+	else
+	{
+	    dpo_set(&path->fp_dpo,
+		    DPO_ADJACENCY_GLEAN,
+		    fib_proto_to_dpo(path->fp_nh_proto),
+		    adj_glean_add_or_lock(path->fp_nh_proto,
+					  path->attached.fp_interface,
+					  NULL));
+	}
+	/*
+	 * become a child of the adjacency so we receive updates
+	 * when the interface state changes
+	 */
+	path->fp_sibling = adj_child_add(path->fp_dpo.dpoi_index,
+					 FIB_NODE_TYPE_PATH,
+					 fib_path_get_index(path));
+
+	break;
+    case FIB_PATH_TYPE_RECURSIVE:
+    {
+	/*
+	 * Create a RR source entry in the table for the address
+	 * that this path recurses through.
+	 * This resolve action is recursive, hence we may create
+	 * more paths in the process. more creates mean maybe realloc
+	 * of this path.
+	 */
+	fib_node_index_t fei;
+	fib_prefix_t pfx;
+
+	ASSERT(FIB_NODE_INDEX_INVALID == path->fp_via_fib);
+
+	if (FIB_PROTOCOL_MPLS == path->fp_nh_proto)
+	{
+	    fib_prefix_from_mpls_label(path->recursive.fp_nh.fp_local_label, &pfx);
+	}
+	else
+	{
+	    fib_prefix_from_ip46_addr(&path->recursive.fp_nh.fp_ip, &pfx);
+	}
+
+	fei = fib_table_entry_special_add(path->recursive.fp_tbl_id,
+					  &pfx,
+					  FIB_SOURCE_RR,
+					  FIB_ENTRY_FLAG_NONE,
+					  ADJ_INDEX_INVALID);
+
+	path = fib_path_get(path_index);
+	path->fp_via_fib = fei;
+
+	/*
+	 * become a dependent child of the entry so the path is 
+	 * informed when the forwarding for the entry changes.
+	 */
+	path->fp_sibling = fib_entry_child_add(path->fp_via_fib,
+					       FIB_NODE_TYPE_PATH,
+					       fib_path_get_index(path));
+
+	/*
+	 * create and configure the IP DPO
+	 */
+	fib_path_recursive_adj_update(
+	    path,
+	    fib_path_proto_to_chain_type(path->fp_nh_proto),
+	    &path->fp_dpo);
+
+	break;
+    }
+    case FIB_PATH_TYPE_SPECIAL:
+	/*
+	 * Resolve via the drop
+	 */
+	dpo_copy(&path->fp_dpo,
+                 drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
+	break;
+    case FIB_PATH_TYPE_DEAG:
+	/*
+	 * Resolve via a lookup DPO.
+         * FIXME. control plane should add routes with a table ID
+	 */
+	lookup_dpo_add_or_lock_w_fib_index(path->deag.fp_tbl_id,
+                                          fib_proto_to_dpo(path->fp_nh_proto),
+                                          LOOKUP_INPUT_DST_ADDR,
+                                          LOOKUP_TABLE_FROM_CONFIG,
+                                          &path->fp_dpo);
+	break;
+    case FIB_PATH_TYPE_RECEIVE:
+	/*
+	 * Resolve via a receive DPO.
+	 */
+	receive_dpo_add_or_lock(fib_proto_to_dpo(path->fp_nh_proto),
+                                path->receive.fp_interface,
+                                &path->receive.fp_addr,
+                                &path->fp_dpo);
+	break;
+    case FIB_PATH_TYPE_EXCLUSIVE:
+	/*
+	 * Resolve via the user provided DPO
+	 */
+	dpo_copy(&path->fp_dpo, &path->exclusive.fp_ex_dpo);
+	break;
+    }
+
+    return (fib_path_is_resolved(path_index));
+}
+
+u32
+fib_path_get_resolving_interface (fib_node_index_t path_index)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    switch (path->fp_type)
+    {
+    case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
+	return (path->attached_next_hop.fp_interface);
+    case FIB_PATH_TYPE_ATTACHED:
+	return (path->attached.fp_interface);
+    case FIB_PATH_TYPE_RECEIVE:
+	return (path->receive.fp_interface);
+    case FIB_PATH_TYPE_RECURSIVE:
+	return (fib_entry_get_resolving_interface(path->fp_via_fib));    
+    case FIB_PATH_TYPE_SPECIAL:
+    case FIB_PATH_TYPE_DEAG:
+    case FIB_PATH_TYPE_EXCLUSIVE:
+	break;
+    }
+    return (~0);
+}
+
+adj_index_t
+fib_path_get_adj (fib_node_index_t path_index)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    ASSERT(dpo_is_adj(&path->fp_dpo));
+    if (dpo_is_adj(&path->fp_dpo))
+    {
+	return (path->fp_dpo.dpoi_index);
+    }
+    return (ADJ_INDEX_INVALID);
+}
+
+int
+fib_path_get_weight (fib_node_index_t path_index)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    ASSERT(path);
+
+    return (path->fp_weight);
+}
+
+/**
+ * @brief Contribute the path's adjacency to the list passed.
+ * By calling this function over all paths, recursively, a child
+ * can construct its full set of forwarding adjacencies, and hence its
+ * uRPF list.
+ */
+void
+fib_path_contribute_urpf (fib_node_index_t path_index,
+			  index_t urpf)
+{
+    fib_path_t *path;
+
+    if (!fib_path_is_resolved(path_index))
+	return;
+
+    path = fib_path_get(path_index);
+
+    switch (path->fp_type)
+    {
+    case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
+	fib_urpf_list_append(urpf, path->attached_next_hop.fp_interface);
+	break;
+
+    case FIB_PATH_TYPE_ATTACHED:
+	fib_urpf_list_append(urpf, path->attached.fp_interface);
+	break;
+
+    case FIB_PATH_TYPE_RECURSIVE:
+	fib_entry_contribute_urpf(path->fp_via_fib, urpf);
+	break;
+
+    case FIB_PATH_TYPE_EXCLUSIVE:
+    case FIB_PATH_TYPE_SPECIAL:
+	/*
+	 * these path types may link to an adj, if that's what
+	 * the clinet gave
+	 */
+	if (dpo_is_adj(&path->fp_dpo))
+	{
+	    ip_adjacency_t *adj;
+
+	    adj = adj_get(path->fp_dpo.dpoi_index);
+
+	    fib_urpf_list_append(urpf, adj->rewrite_header.sw_if_index);
+	}
+	break;
+
+    case FIB_PATH_TYPE_DEAG:
+    case FIB_PATH_TYPE_RECEIVE:
+	/*
+	 * these path types don't link to an adj
+	 */
+	break;
+    }
+}
+
+void
+fib_path_contribute_forwarding (fib_node_index_t path_index,
+				fib_forward_chain_type_t fct,
+				dpo_id_t *dpo)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    ASSERT(path);
+    ASSERT(FIB_FORW_CHAIN_TYPE_MPLS_EOS != fct);
+
+    FIB_PATH_DBG(path, "contribute");
+
+    /*
+     * The DPO stored in the path was created when the path was resolved.
+     * This then represents the path's 'native' protocol; IP.
+     * For all others will need to go find something else.
+     */
+    if (fib_path_proto_to_chain_type(path->fp_nh_proto) == fct)
+    {
+	dpo_copy(dpo, &path->fp_dpo);
+    }
+    else
+    {
+	switch (path->fp_type)
+	{
+	case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
+	    switch (fct)
+	    {
+	    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
+	    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
+	    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
+	    case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
+	    case FIB_FORW_CHAIN_TYPE_ETHERNET:
+	    {
+		adj_index_t ai;
+
+		/*
+		 * get a appropriate link type adj.
+		 */
+		ai = fib_path_attached_next_hop_get_adj(
+		         path,
+			 fib_forw_chain_type_to_link_type(fct));
+		dpo_set(dpo, DPO_ADJACENCY,
+			fib_forw_chain_type_to_dpo_proto(fct), ai);
+		adj_unlock(ai);
+
+		break;
+	    }
+	    }
+	    break;
+	case FIB_PATH_TYPE_RECURSIVE:
+	    switch (fct)
+	    {
+	    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
+	    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
+	    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
+	    case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
+		fib_path_recursive_adj_update(path, fct, dpo);
+		break;
+	    case FIB_FORW_CHAIN_TYPE_ETHERNET:
+		ASSERT(0);
+		break;
+	    }
+	    break;
+	case FIB_PATH_TYPE_DEAG:
+	    switch (fct)
+	    {
+	    case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
+                lookup_dpo_add_or_lock_w_table_id(MPLS_FIB_DEFAULT_TABLE_ID,
+                                                  DPO_PROTO_MPLS,
+                                                  LOOKUP_INPUT_DST_ADDR,
+                                                  LOOKUP_TABLE_FROM_CONFIG,
+                                                  dpo);
+                break;
+	    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
+	    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
+	    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
+		dpo_copy(dpo, &path->fp_dpo);
+		break;		
+	    case FIB_FORW_CHAIN_TYPE_ETHERNET:
+		ASSERT(0);
+		break;
+            }
+            break;
+	case FIB_PATH_TYPE_EXCLUSIVE:
+	    dpo_copy(dpo, &path->exclusive.fp_ex_dpo);
+	    break;
+        case FIB_PATH_TYPE_ATTACHED:
+	case FIB_PATH_TYPE_RECEIVE:
+	case FIB_PATH_TYPE_SPECIAL:
+	    ASSERT(0);
+            break;
+	}
+
+    }
+}
+
+load_balance_path_t *
+fib_path_append_nh_for_multipath_hash (fib_node_index_t path_index,
+				       fib_forward_chain_type_t fct,
+				       load_balance_path_t *hash_key)
+{
+    load_balance_path_t *mnh;
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    ASSERT(path);
+
+    if (fib_path_is_resolved(path_index))
+    {
+	vec_add2(hash_key, mnh, 1);
+
+	mnh->path_weight = path->fp_weight;
+	mnh->path_index = path_index;
+	fib_path_contribute_forwarding(path_index, fct, &mnh->path_dpo);
+    }
+
+    return (hash_key);
+}
+
+int
+fib_path_is_recursive (fib_node_index_t path_index)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    return (FIB_PATH_TYPE_RECURSIVE == path->fp_type);
+}
+
+int
+fib_path_is_exclusive (fib_node_index_t path_index)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    return (FIB_PATH_TYPE_EXCLUSIVE == path->fp_type);
+}
+
+int
+fib_path_is_deag (fib_node_index_t path_index)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    return (FIB_PATH_TYPE_DEAG == path->fp_type);
+}
+
+int
+fib_path_is_resolved (fib_node_index_t path_index)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    return (dpo_id_is_valid(&path->fp_dpo) &&
+	    (path->fp_oper_flags & FIB_PATH_OPER_FLAG_RESOLVED) &&
+	    !fib_path_is_looped(path_index) &&
+	    !fib_path_is_permanent_drop(path));
+}
+
+int
+fib_path_is_looped (fib_node_index_t path_index)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    return (path->fp_oper_flags & FIB_PATH_OPER_FLAG_RECURSIVE_LOOP);
+}
+
+int
+fib_path_encode (fib_node_index_t path_list_index,
+		 fib_node_index_t path_index,
+                 void *ctx)
+{
+    fib_route_path_encode_t **api_rpaths = ctx;
+    fib_route_path_encode_t *api_rpath;
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+    if (!path)
+      return (0);
+    vec_add2(*api_rpaths, api_rpath, 1);
+    api_rpath->rpath.frp_weight = path->fp_weight;
+    api_rpath->rpath.frp_proto = path->fp_nh_proto;
+    api_rpath->rpath.frp_sw_if_index = ~0;
+    api_rpath->dpo = path->exclusive.fp_ex_dpo;
+    switch (path->fp_type)
+      {
+      case FIB_PATH_TYPE_RECEIVE:
+        api_rpath->rpath.frp_addr = path->receive.fp_addr;
+        api_rpath->rpath.frp_sw_if_index = path->receive.fp_interface;
+        break;
+      case FIB_PATH_TYPE_ATTACHED:
+        api_rpath->rpath.frp_sw_if_index = path->attached.fp_interface;
+        break;
+      case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
+        api_rpath->rpath.frp_sw_if_index = path->attached_next_hop.fp_interface;
+        api_rpath->rpath.frp_addr = path->attached_next_hop.fp_nh;
+        break;
+      case FIB_PATH_TYPE_SPECIAL:
+        break;
+      case FIB_PATH_TYPE_DEAG:
+        break;
+      case FIB_PATH_TYPE_RECURSIVE:
+        api_rpath->rpath.frp_addr = path->recursive.fp_nh.fp_ip;
+        break;
+      default:
+        break;
+      }
+    return (1);
+}
+
+fib_protocol_t
+fib_path_get_proto (fib_node_index_t path_index)
+{
+    fib_path_t *path;
+
+    path = fib_path_get(path_index);
+
+    return (path->fp_nh_proto);
+}
+
+void
+fib_path_module_init (void)
+{
+    fib_node_register_type (FIB_NODE_TYPE_PATH, &fib_path_vft);
+}
+
+static clib_error_t *
+show_fib_path_command (vlib_main_t * vm,
+			unformat_input_t * input,
+			vlib_cli_command_t * cmd)
+{
+    fib_node_index_t pi;
+    fib_path_t *path;
+
+    if (unformat (input, "%d", &pi))
+    {
+	/*
+	 * show one in detail
+	 */
+	if (!pool_is_free_index(fib_path_pool, pi))
+	{
+	    path = fib_path_get(pi);
+	    u8 *s = fib_path_format(pi, NULL);
+	    s = format(s, "children:");
+	    s = fib_node_children_format(path->fp_node.fn_children, s);
+	    vlib_cli_output (vm, "%s", s);
+	    vec_free(s);
+	}
+	else
+	{
+	    vlib_cli_output (vm, "path %d invalid", pi);
+	}
+    }
+    else
+    {
+	vlib_cli_output (vm, "FIB Paths");
+	pool_foreach(path, fib_path_pool,
+	({
+	    vlib_cli_output (vm, "%U", format_fib_path, path);
+	}));
+    }
+
+    return (NULL);
+}
+
+VLIB_CLI_COMMAND (show_fib_path, static) = {
+  .path = "show fib paths",
+  .function = show_fib_path_command,
+  .short_help = "show fib paths",
+};
diff --git a/src/vnet/fib/fib_path.h b/src/vnet/fib/fib_path.h
new file mode 100644
index 00000000..91f49d09
--- /dev/null
+++ b/src/vnet/fib/fib_path.h
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Given a route of the form;
+ *   q.r.s.t/Y
+ *     via <interface> <next-hop>
+ *
+ * The prefix is: q.r.s.t./Y
+ * the path is: 'via <interface> <next-hop>
+ *
+ * The path is the description of where to send the traffic, and the
+ * the prefix is a description of which traffic to send.
+ * It is the aim of the FIB to resolve the path, i.e. to find the corresponding
+ * adjacency to match the path's description.
+ */
+
+#ifndef __FIB_PATH_H__
+#define __FIB_PATH_H__
+
+#include <vnet/ip/ip.h>
+#include <vnet/dpo/load_balance.h>
+
+#include <vnet/fib/fib_types.h>
+#include <vnet/adj/adj_types.h>
+
+/**
+ * Enurmeration of path configuration attributes
+ */
+typedef enum fib_path_cfg_attribute_t_ {
+    /**
+     * Marker. Add new types after this one.
+     */
+    FIB_PATH_CFG_ATTRIBUTE_FIRST = 0,
+    /**
+     * The path is forced to a drop, whatever the next-hop info says.
+     * something somewhere knows better...
+     */
+    FIB_PATH_CFG_ATTRIBUTE_DROP = FIB_PATH_CFG_ATTRIBUTE_FIRST,
+    /**
+     * The path uses an adj that is exclusive. I.e. it is known only by
+     * the source of the route.
+     */
+    FIB_PATH_CFG_ATTRIBUTE_EXCLUSIVE,
+    /**
+     * Recursion constraint via host
+     */
+    FIB_PATH_CFG_ATTRIBUTE_RESOLVE_HOST,
+    /**
+     * Recursion constraint via attached
+     */
+    FIB_PATH_CFG_ATTRIBUTE_RESOLVE_ATTACHED,
+    /**
+     * The path is a for-us path
+     */
+    FIB_PATH_CFG_ATTRIBUTE_LOCAL,
+    /**
+     * Marker. Add new types before this one, then update it.
+     */
+    FIB_PATH_CFG_ATTRIBUTE_LAST = FIB_PATH_CFG_ATTRIBUTE_LOCAL,
+} __attribute__ ((packed)) fib_path_cfg_attribute_t;
+
+/**
+ * The maximum number of path attributes
+ */
+#define FIB_PATH_CFG_ATTRIBUTE_MAX (FIB_PATH_CFG_ATTRIBUTE_LAST + 1)
+
+#define FIB_PATH_CFG_ATTRIBUTES {			\
+    [FIB_PATH_CFG_ATTRIBUTE_DROP]  = "drop",	        \
+    [FIB_PATH_CFG_ATTRIBUTE_EXCLUSIVE] = "exclusive",	\
+    [FIB_PATH_CFG_ATTRIBUTE_RESOLVE_HOST] = "resolve-host", \
+    [FIB_PATH_CFG_ATTRIBUTE_RESOLVE_ATTACHED] = "resolve-attached", \
+    [FIB_PATH_CFG_ATTRIBUTE_LOCAL] = "local",	        \
+}
+
+#define FOR_EACH_FIB_PATH_CFG_ATTRIBUTE(_item) \
+    for (_item = FIB_PATH_CFG_ATTRIBUTE_FIRST; \
+	 _item <= FIB_PATH_CFG_ATTRIBUTE_LAST; \
+	 _item++)
+
+/**
+ * Path config flags from the attributes
+ */
+typedef enum fib_path_cfg_flags_t_ {
+    FIB_PATH_CFG_FLAG_NONE  = 0,
+    FIB_PATH_CFG_FLAG_DROP  = (1 << FIB_PATH_CFG_ATTRIBUTE_DROP),
+    FIB_PATH_CFG_FLAG_EXCLUSIVE = (1 << FIB_PATH_CFG_ATTRIBUTE_EXCLUSIVE),
+    FIB_PATH_CFG_FLAG_RESOLVE_HOST = (1 << FIB_PATH_CFG_ATTRIBUTE_RESOLVE_HOST),
+    FIB_PATH_CFG_FLAG_RESOLVE_ATTACHED = (1 << FIB_PATH_CFG_ATTRIBUTE_RESOLVE_ATTACHED),
+    FIB_PATH_CFG_FLAG_LOCAL = (1 << FIB_PATH_CFG_ATTRIBUTE_LOCAL),
+} __attribute__ ((packed)) fib_path_cfg_flags_t;
+
+
+extern u8 *fib_path_format(fib_node_index_t pi, u8 *s);
+extern u8 *fib_path_adj_format(fib_node_index_t pi,
+			       u32 indent,
+			       u8 *s);
+
+extern u8 * format_fib_path(u8 * s, va_list * args);
+
+extern fib_node_index_t fib_path_create(fib_node_index_t pl_index,
+					fib_protocol_t nh_proto,
+					fib_path_cfg_flags_t flags,
+					const fib_route_path_t *path);
+extern fib_node_index_t fib_path_create_special(fib_node_index_t pl_index,
+						fib_protocol_t nh_proto,
+						fib_path_cfg_flags_t flags,
+						const dpo_id_t *dpo);
+
+extern int fib_path_cmp(fib_node_index_t path_index1,
+			fib_node_index_t path_index2);
+extern int fib_path_cmp_for_sort(void * a1, void * a2);
+extern int fib_path_cmp_w_route_path(fib_node_index_t path_index,
+				     const fib_route_path_t *rpath);
+extern fib_node_index_t fib_path_copy(fib_node_index_t path_index,
+				      fib_node_index_t path_list_index);
+extern int fib_path_resolve(fib_node_index_t path_index);
+extern int fib_path_is_resolved(fib_node_index_t path_index);
+extern int fib_path_is_recursive(fib_node_index_t path_index);
+extern int fib_path_is_exclusive(fib_node_index_t path_index);
+extern int fib_path_is_deag(fib_node_index_t path_index);
+extern int fib_path_is_looped(fib_node_index_t path_index);
+extern fib_protocol_t fib_path_get_proto(fib_node_index_t path_index);
+extern void fib_path_destroy(fib_node_index_t path_index);
+extern uword fib_path_hash(fib_node_index_t path_index);
+extern load_balance_path_t * fib_path_append_nh_for_multipath_hash(
+    fib_node_index_t path_index,
+    fib_forward_chain_type_t fct,
+    load_balance_path_t *hash_key);
+extern void fib_path_contribute_forwarding(fib_node_index_t path_index,
+					   fib_forward_chain_type_t type,
+					   dpo_id_t *dpo);
+extern void fib_path_contribute_urpf(fib_node_index_t path_index,
+				     index_t urpf);
+extern adj_index_t fib_path_get_adj(fib_node_index_t path_index);
+extern int fib_path_recursive_loop_detect(fib_node_index_t path_index,
+					  fib_node_index_t **entry_indicies);
+extern u32 fib_path_get_resolving_interface(fib_node_index_t fib_entry_index);
+extern int fib_path_get_weight(fib_node_index_t path_index);
+
+extern void fib_path_module_init(void);
+extern int fib_path_encode(fib_node_index_t path_list_index,
+                           fib_node_index_t path_index,
+			   void *ctx);
+
+#endif
diff --git a/src/vnet/fib/fib_path_ext.c b/src/vnet/fib/fib_path_ext.c
new file mode 100644
index 00000000..f75b5626
--- /dev/null
+++ b/src/vnet/fib/fib_path_ext.c
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/mpls/mpls.h>
+#include <vnet/dpo/mpls_label_dpo.h>
+#include <vnet/dpo/load_balance.h>
+#include <vnet/dpo/drop_dpo.h>
+
+#include <vnet/fib/fib_path_ext.h>
+#include <vnet/fib/fib_entry_src.h>
+#include <vnet/fib/fib_path.h>
+#include <vnet/fib/fib_path_list.h>
+#include <vnet/fib/fib_internal.h>
+
+u8 *
+format_fib_path_ext (u8 * s, va_list * args)
+{
+    fib_path_ext_t *path_ext;
+    u32 ii;
+
+    path_ext = va_arg (*args, fib_path_ext_t *);
+
+    s = format(s, "path:%d labels:",
+	       path_ext->fpe_path_index);
+    for (ii = 0; ii < vec_len(path_ext->fpe_path.frp_label_stack); ii++)
+    {
+	s = format(s, "%U ",
+		   format_mpls_unicast_label,
+		   path_ext->fpe_path.frp_label_stack[ii]);
+    }
+    return (s);
+}
+
+int
+fib_path_ext_cmp (fib_path_ext_t *path_ext,
+		  const fib_route_path_t *rpath)
+{
+    return (fib_route_path_cmp(&path_ext->fpe_path, rpath));
+}
+
+static int
+fib_path_ext_match (fib_node_index_t pl_index,
+		    fib_node_index_t path_index,
+		    void *ctx)
+{
+    fib_path_ext_t *path_ext = ctx;
+
+    if (!fib_path_cmp_w_route_path(path_index,
+				   &path_ext->fpe_path))
+    {
+	path_ext->fpe_path_index = path_index;
+	return (0);
+    }
+    // keep going
+    return (1);
+}
+
+void
+fib_path_ext_resolve (fib_path_ext_t *path_ext,
+		      fib_node_index_t path_list_index)
+{
+    /*
+     * Find the path on the path list that this is an extension for
+     */
+    path_ext->fpe_path_index = FIB_NODE_INDEX_INVALID;
+    fib_path_list_walk(path_list_index,
+		       fib_path_ext_match,
+		       path_ext);
+}
+
+void
+fib_path_ext_init (fib_path_ext_t *path_ext,
+		   fib_node_index_t path_list_index,
+		   const fib_route_path_t *rpath)
+{
+    path_ext->fpe_path = *rpath;
+    path_ext->fpe_path_index = FIB_NODE_INDEX_INVALID;
+
+    fib_path_ext_resolve(path_ext, path_list_index);
+}
+
+/**
+ * @brief Return true if the label stack is implicit null
+ */
+static int
+fib_path_ext_is_imp_null (fib_path_ext_t *path_ext)
+{
+    return ((1 == vec_len(path_ext->fpe_label_stack)) &&
+	    (MPLS_IETF_IMPLICIT_NULL_LABEL == path_ext->fpe_label_stack[0]));
+}
+
+load_balance_path_t *
+fib_path_ext_stack (fib_path_ext_t *path_ext,
+		    const fib_entry_t *entry,
+                    fib_forward_chain_type_t child_fct,
+		    load_balance_path_t *nhs)
+{
+    fib_forward_chain_type_t parent_fct;
+    load_balance_path_t *nh;
+
+    if (!fib_path_is_resolved(path_ext->fpe_path_index))
+	return (nhs);
+
+    /*
+     * Since we are stacking this path-extension, it must have a valid out
+     * label. From the chain type request by the child, determine what
+     * chain type we will request from the parent.
+     */
+    switch (child_fct)
+    {
+    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
+    {
+	/*
+	 * The EOS chain is a tricky since, when the path has an imp NULL one cannot know
+         * the adjacency to link to without knowing what the packets payload protocol
+	 * will be once the label is popped.
+	 */
+	if (fib_path_ext_is_imp_null(path_ext))
+	{
+            parent_fct = fib_entry_chain_type_fixup(entry, child_fct);
+        }
+        else
+        {
+            /*
+             * we have a label to stack. packets will thus be labelled when
+             * they encounter the child, ergo, non-eos.
+             */
+	    parent_fct = FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS;
+        }
+	break;
+    }
+    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
+    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
+	if (fib_path_ext_is_imp_null(path_ext))
+	{
+            /*
+             * implicit-null label for the eos or IP chain, need to pick up
+             * the IP adj
+             */
+	    parent_fct = child_fct;
+	}
+        else
+        {
+            /*
+             * we have a label to stack. packets will thus be labelled when
+             * they encounter the child, ergo, non-eos.
+             */
+	    parent_fct = FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS;
+        }
+	break;
+    case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
+        parent_fct = child_fct;
+	break;
+    default:
+        return (nhs);
+	break;
+    }
+
+    dpo_id_t via_dpo = DPO_INVALID;
+
+    /*
+     * The next object in the graph after the imposition of the label
+     * will be the DPO contributed by the path through which the packets
+     * are to be sent. We stack the MPLS Label DPO on this path DPO
+     */
+    fib_path_contribute_forwarding(path_ext->fpe_path_index,
+				   parent_fct,
+				   &via_dpo);
+
+    if (dpo_is_drop(&via_dpo) ||
+	load_balance_is_drop(&via_dpo))
+    {
+	/*
+	 * don't stack a path extension on a drop. doing so will create
+	 * a LB bucket entry on drop, and we will lose a percentage of traffic.
+	 */
+    }
+    else
+    {
+	vec_add2(nhs, nh, 1);
+	nh->path_weight = fib_path_get_weight(path_ext->fpe_path_index);
+	nh->path_index = path_ext->fpe_path_index;
+	dpo_copy(&nh->path_dpo, &via_dpo);
+
+	/*
+	 * The label is stackable for this chain type
+	 * construct the mpls header that will be imposed in the data-path
+	 */
+	if (!fib_path_ext_is_imp_null(path_ext))
+	{
+            /*
+             * we use the parent protocol for the label so that
+             * we pickup the correct MPLS imposition nodes to do
+             * ip[46] processing.
+             */
+            dpo_proto_t chain_proto;
+            mpls_eos_bit_t eos;
+            index_t mldi;
+
+            eos = (child_fct == FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS ?
+                   MPLS_NON_EOS :
+                   MPLS_EOS);
+            chain_proto = fib_forw_chain_type_to_dpo_proto(child_fct);
+
+            mldi = mpls_label_dpo_create(path_ext->fpe_label_stack,
+                                         eos, 255, 0,
+                                         chain_proto,
+                                         &nh->path_dpo);
+
+	    dpo_set(&nh->path_dpo,
+		    DPO_MPLS_LABEL,
+                    chain_proto,
+                    mldi);
+	}
+    }
+    dpo_reset(&via_dpo);
+
+    return (nhs);
+}
diff --git a/src/vnet/fib/fib_path_ext.h b/src/vnet/fib/fib_path_ext.h
new file mode 100644
index 00000000..cf8f8df0
--- /dev/null
+++ b/src/vnet/fib/fib_path_ext.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __FIB_PATH_EXT_H__
+#define __FIB_PATH_EXT_H__
+
+#include <vnet/mpls/mpls.h>
+#include <vnet/fib/fib_types.h>
+
+/**
+ * A path extension is a per-entry addition to the forwarding information
+ * when packets are sent for that entry over that path.
+ *
+ * For example:
+ *    ip route add 1.1.1.1/32 via 10.10.10.10 out-label 100
+ *
+ * The out-going MPLS label value 100 is a path-extension. It is a value sepcific
+ * to the entry 1.1.1.1/32 and valid only when packets are sent via 10.10.10.10.
+ */
+typedef struct fib_path_ext_t_
+{
+    /**
+     * A description of the path that is being extended.
+     * This description is used to match this extension with the [changing]
+     * instance of a fib_path_t that is extended
+     */
+    fib_route_path_t fpe_path;
+#define fpe_label_stack fpe_path.frp_label_stack
+
+    /**
+     * The index of the path. This is the global index, not the path's
+     * position in the path-list.
+     */
+    fib_node_index_t fpe_path_index;
+} fib_path_ext_t;
+
+struct fib_entry_t_;
+
+extern u8 * format_fib_path_ext(u8 * s, va_list * args);
+
+extern void fib_path_ext_init(fib_path_ext_t *path_ext,
+			      fib_node_index_t path_list_index,
+			      const fib_route_path_t *rpath);
+
+extern int fib_path_ext_cmp(fib_path_ext_t *path_ext,
+			    const fib_route_path_t *rpath);
+
+extern void fib_path_ext_resolve(fib_path_ext_t *path_ext,
+				 fib_node_index_t path_list_index);
+
+extern load_balance_path_t *fib_path_ext_stack(fib_path_ext_t *path_ext,
+                                               const struct fib_entry_t_ *entry,
+                                               fib_forward_chain_type_t fct,
+                                               load_balance_path_t *nhs);
+
+#endif
+
diff --git a/src/vnet/fib/fib_path_list.c b/src/vnet/fib/fib_path_list.c
new file mode 100644
index 00000000..5b35e9b8
--- /dev/null
+++ b/src/vnet/fib/fib_path_list.c
@@ -0,0 +1,1223 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vppinfra/mhash.h>
+#include <vnet/ip/ip.h>
+#include <vnet/adj/adj.h>
+#include <vnet/dpo/load_balance.h>
+#include <vnet/dpo/load_balance_map.h>
+
+#include <vnet/fib/fib_path_list.h>
+#include <vnet/fib/fib_internal.h>
+#include <vnet/fib/fib_node_list.h>
+#include <vnet/fib/fib_walk.h>
+#include <vnet/fib/fib_urpf_list.h>
+
+/**
+ * FIB path-list
+ * A representation of the list/set of path trough which a prefix is reachable
+ */
+typedef struct fib_path_list_t_ {
+    /**
+     * A path-list is a node in the FIB graph.
+     */
+    fib_node_t fpl_node;
+
+    /**
+     * Flags on the path-list
+     */
+    fib_path_list_flags_t fpl_flags;
+
+    /**
+     * The next-hop protocol for the paths in this path list.
+     * Note that fixing the proto here means we don't support a mix of
+     * v4 and v6 paths. ho hum.
+     */
+    fib_protocol_t fpl_nh_proto;
+
+    /**
+     * Vector of paths indicies for all configured paths.
+     * For shareable path-lists this list MUST not change.
+     */
+    fib_node_index_t *fpl_paths;
+
+    /**
+     * the RPF list calculated for this path list
+     */
+    fib_node_index_t fpl_urpf;
+} fib_path_list_t;
+
+/*
+ * Array of strings/names for the FIB sources
+ */
+static const char *fib_path_list_attr_names[] = FIB_PATH_LIST_ATTRIBUTES;
+
+/*
+ * The memory pool from which we allocate all the path-lists
+ */
+static fib_path_list_t * fib_path_list_pool;
+
+/*
+ * The data-base of shared path-lists
+ */
+static uword *fib_path_list_db;
+
+/*
+ * Debug macro
+ */
+#ifdef FIB_DEBUG
+#define FIB_PATH_LIST_DBG(_pl, _fmt, _args...)		  \
+{   		            				  \
+    u8 *_tmp = 0;					  \
+    _tmp = fib_path_list_format(			  \
+	fib_path_list_get_index(_pl), _tmp);		  \
+    clib_warning("pl:[%d:%p:%p:%s]:" _fmt,		  \
+		 fib_path_list_get_index(_pl),		  \
+		 _pl, _pl->fpl_paths, _tmp,		  \
+		 ##_args);				  \
+    vec_free(_tmp);					  \
+}
+#else
+#define FIB_PATH_LIST_DBG(_pl, _fmt, _args...)
+#endif
+
+static fib_path_list_t *
+fib_path_list_get (fib_node_index_t index)
+{
+    return (pool_elt_at_index(fib_path_list_pool, index));
+}
+
+static fib_node_t *
+fib_path_list_get_node (fib_node_index_t index)
+{
+    return ((fib_node_t*)fib_path_list_get(index));
+}
+
+static fib_path_list_t*
+fib_path_list_from_fib_node (fib_node_t *node)
+{
+#if CLIB_DEBUG > 0
+    ASSERT(FIB_NODE_TYPE_PATH_LIST == node->fn_type);
+#endif
+    return ((fib_path_list_t*)node);
+}
+
+static fib_node_index_t
+fib_path_list_get_index (fib_path_list_t *path_list)
+{
+    return (path_list - fib_path_list_pool);
+}
+
+static u8 *
+format_fib_path_list (u8 * s, va_list * args)
+{
+    fib_path_list_attribute_t attr;
+    fib_node_index_t *path_index;
+    fib_path_list_t *path_list;
+
+    path_list = va_arg (*args, fib_path_list_t *);
+    
+    s = format (s, "    index:%u", fib_path_list_get_index(path_list));
+    s = format (s, " locks:%u", path_list->fpl_node.fn_locks);
+    s = format (s, " proto:%U", format_fib_protocol, path_list->fpl_nh_proto);
+
+    if (FIB_PATH_LIST_FLAG_NONE != path_list->fpl_flags)
+    {
+	s = format (s, " flags:");
+	FOR_EACH_PATH_LIST_ATTRIBUTE(attr)
+        {
+	    if ((1<<attr) & path_list->fpl_flags)
+            {
+		s = format (s, "%s,", fib_path_list_attr_names[attr]);
+	    }
+	}
+    }
+    s = format (s, " %U\n", format_fib_urpf_list, path_list->fpl_urpf);
+
+    vec_foreach (path_index, path_list->fpl_paths)
+    {
+	s = fib_path_format(*path_index, s);
+	s = format(s, "\n");
+    }
+
+    return (s);
+}
+
+u8 *
+fib_path_list_adjs_format (fib_node_index_t path_list_index,
+			   u32 indent,
+			   u8 * s)
+{
+    fib_path_list_t *path_list;
+    u32 i;
+
+    path_list = fib_path_list_get(path_list_index);
+
+    vec_foreach_index (i, path_list->fpl_paths)
+    {
+	s = fib_path_adj_format(path_list->fpl_paths[i],
+				indent, s);
+    }
+
+    return (s);
+}
+
+
+u8 *
+fib_path_list_format (fib_node_index_t path_list_index,
+		      u8 * s)
+{
+    fib_path_list_t *path_list;
+
+    path_list = fib_path_list_get(path_list_index);
+
+    return (format(s, "%U", format_fib_path_list, path_list));
+}
+
+static uword
+fib_path_list_hash (fib_path_list_t *path_list)
+{
+    uword old_path_list_hash, new_path_list_hash, path_hash;
+    fib_node_index_t *path_index;
+
+    ASSERT(path_list);
+
+    new_path_list_hash = old_path_list_hash = vec_len(path_list->fpl_paths);
+
+    vec_foreach (path_index, path_list->fpl_paths)
+    {
+	path_hash = fib_path_hash(*path_index);
+#if uword_bits == 64
+	hash_mix64(path_hash, old_path_list_hash, new_path_list_hash);
+#else
+	hash_mix32(path_hash, old_path_list_hash, new_path_list_hash);
+#endif
+    }
+
+    return (new_path_list_hash);
+}
+
+always_inline uword
+fib_path_list_db_hash_key_from_index (uword index)
+{
+    return 1 + 2*index;
+}
+
+always_inline uword
+fib_path_list_db_hash_key_is_index (uword key)
+{
+    return key & 1;
+}
+
+always_inline uword
+fib_path_list_db_hash_key_2_index (uword key)
+{
+    ASSERT (fib_path_list_db_hash_key_is_index (key));
+    return key / 2;
+}
+
+static fib_path_list_t*
+fib_path_list_db_get_from_hash_key (uword key)
+{
+    fib_path_list_t *path_list;
+
+    if (fib_path_list_db_hash_key_is_index (key))
+    {
+	fib_node_index_t path_list_index;
+
+	path_list_index = fib_path_list_db_hash_key_2_index(key);
+	path_list = fib_path_list_get(path_list_index);
+    }
+    else
+    {       
+	path_list = uword_to_pointer (key, fib_path_list_t *);
+    }
+
+    return (path_list);
+}
+
+static uword
+fib_path_list_db_hash_key_sum (hash_t * h,
+			       uword key)
+{
+    fib_path_list_t *path_list;
+
+    path_list = fib_path_list_db_get_from_hash_key(key);
+
+    return (fib_path_list_hash(path_list));
+}
+
+static uword
+fib_path_list_db_hash_key_equal (hash_t * h,
+				 uword key1,
+				 uword key2)
+{
+    fib_path_list_t *path_list1, *path_list2;
+
+    path_list1 = fib_path_list_db_get_from_hash_key(key1);
+    path_list2 = fib_path_list_db_get_from_hash_key(key2);
+
+    return (fib_path_list_hash(path_list1) ==
+	    fib_path_list_hash(path_list2));
+}
+
+static fib_node_index_t
+fib_path_list_db_find (fib_path_list_t *path_list)
+{
+    uword *p;
+
+    p = hash_get(fib_path_list_db, path_list);
+
+    if (NULL != p)
+    {
+	return p[0];
+    }
+
+    return (FIB_NODE_INDEX_INVALID);
+}
+
+static void
+fib_path_list_db_insert (fib_node_index_t path_list_index)
+{
+    fib_path_list_t *path_list;
+
+    path_list = fib_path_list_get(path_list_index);
+
+    ASSERT(FIB_NODE_INDEX_INVALID == fib_path_list_db_find(path_list));
+
+    hash_set (fib_path_list_db,
+	      fib_path_list_db_hash_key_from_index(path_list_index),
+	      path_list_index);
+
+    FIB_PATH_LIST_DBG(path_list, "DB-inserted");
+}
+
+static void
+fib_path_list_db_remove (fib_node_index_t path_list_index)
+{
+    fib_path_list_t *path_list;
+
+    path_list = fib_path_list_get(path_list_index);
+
+    ASSERT(FIB_NODE_INDEX_INVALID != fib_path_list_db_find(path_list));
+
+    hash_unset(fib_path_list_db,
+	       fib_path_list_db_hash_key_from_index(path_list_index));
+
+    FIB_PATH_LIST_DBG(path_list, "DB-removed");
+}
+
+static void
+fib_path_list_destroy (fib_path_list_t *path_list)
+{
+    fib_node_index_t *path_index;
+
+    FIB_PATH_LIST_DBG(path_list, "destroy");
+
+    vec_foreach (path_index, path_list->fpl_paths)
+    {
+	fib_path_destroy(*path_index);
+    }
+
+    vec_free(path_list->fpl_paths);
+    fib_urpf_list_unlock(path_list->fpl_urpf);
+
+    fib_node_deinit(&path_list->fpl_node);
+    pool_put(fib_path_list_pool, path_list);
+}
+
+static void
+fib_path_list_last_lock_gone (fib_node_t *node)
+{
+    fib_path_list_t *path_list;
+
+    path_list = fib_path_list_from_fib_node(node);
+
+    FIB_PATH_LIST_DBG(path_list, "last-lock");
+
+    if (path_list->fpl_flags & FIB_PATH_LIST_FLAG_SHARED)
+    {
+	fib_path_list_db_remove(fib_path_list_get_index(path_list));
+    }
+    fib_path_list_destroy(path_list);
+}
+
+/*
+ * fib_path_mk_lb
+ *
+ * update the multipath adj this path-list will contribute to its
+ * children's forwarding.
+ */
+static void
+fib_path_list_mk_lb (fib_path_list_t *path_list,
+		     fib_forward_chain_type_t fct,
+		     dpo_id_t *dpo)
+{
+    load_balance_path_t *hash_key;
+    fib_node_index_t *path_index;
+
+    hash_key  = NULL;
+
+    if (!dpo_id_is_valid(dpo))
+    {
+        /*
+         * first time create
+         */
+        dpo_set(dpo,
+                DPO_LOAD_BALANCE,
+                fib_forw_chain_type_to_dpo_proto(fct),
+                load_balance_create(0,
+				    fib_forw_chain_type_to_dpo_proto(fct),
+				    0 /* FIXME FLOW HASH */));
+    }
+
+    /*
+     * We gather the DPOs from resolved paths.
+     */
+    vec_foreach (path_index, path_list->fpl_paths)
+    {
+	hash_key = fib_path_append_nh_for_multipath_hash(
+	               *path_index,
+		       fct,
+		       hash_key);
+    }
+
+    /*
+     * Path-list load-balances, which if used, would be shared and hence
+     * never need a load-balance map.
+     */
+    load_balance_multipath_update(dpo, hash_key, LOAD_BALANCE_FLAG_NONE);
+
+    FIB_PATH_LIST_DBG(path_list, "mk lb: %d", dpo->dpoi_index);
+
+    vec_free(hash_key);
+}
+
+/**
+ * @brief [re]build the path list's uRPF list
+ */
+static void
+fib_path_list_mk_urpf (fib_path_list_t *path_list)
+{
+    fib_node_index_t *path_index;
+
+    /*
+     * ditch the old one. by iterating through all paths we are going
+     * to re-find all the adjs that were in the old one anyway. If we
+     * keep the old one, then the |sort|uniq requires more work.
+     * All users of the RPF list have their own lock, so we can release
+     * immediately.
+     */
+    fib_urpf_list_unlock(path_list->fpl_urpf);
+    path_list->fpl_urpf = fib_urpf_list_alloc_and_lock();
+
+    vec_foreach (path_index, path_list->fpl_paths)
+    {
+	fib_path_contribute_urpf(*path_index, path_list->fpl_urpf);
+    }
+
+    fib_urpf_list_bake(path_list->fpl_urpf);
+}
+
+/**
+ * @brief Contribute (add) this path list's uRPF list. This allows the child
+ * to construct an aggregate list.
+ */
+void
+fib_path_list_contribute_urpf (fib_node_index_t path_list_index,
+			       index_t urpf)
+{
+    fib_path_list_t *path_list;
+
+    path_list = fib_path_list_get(path_list_index);
+
+    fib_urpf_list_combine(urpf, path_list->fpl_urpf);
+}
+
+/**
+ * @brief Return the the child the RPF list pre-built for this path list
+ */
+index_t
+fib_path_list_get_urpf (fib_node_index_t path_list_index)
+{
+    fib_path_list_t *path_list;
+
+    path_list = fib_path_list_get(path_list_index);
+
+    return (path_list->fpl_urpf);
+}
+
+/*
+ * fib_path_list_back_walk
+ *
+ * Called from one of this path-list's paths to progate
+ * a back walk
+ */
+void
+fib_path_list_back_walk (fib_node_index_t path_list_index,
+			 fib_node_back_walk_ctx_t *ctx)
+{
+    fib_path_list_t *path_list;
+
+    path_list = fib_path_list_get(path_list_index);
+
+    fib_path_list_mk_urpf(path_list);
+
+    /*
+     * propagate the backwalk further
+     */
+    if (32 >= fib_node_list_get_size(path_list->fpl_node.fn_children))
+    {
+        /*
+         * only a few children. continue the walk synchronously
+         */
+	fib_walk_sync(FIB_NODE_TYPE_PATH_LIST, path_list_index, ctx);
+    }
+    else
+    {
+        /*
+         * many children. schedule a async walk
+         */
+        fib_walk_async(FIB_NODE_TYPE_PATH_LIST,
+                       path_list_index,
+                       FIB_WALK_PRIORITY_LOW,
+                       ctx);
+    }
+}
+
+/*
+ * fib_path_list_back_walk_notify
+ *
+ * A back walk has reach this path-list.
+ */
+static fib_node_back_walk_rc_t
+fib_path_list_back_walk_notify (fib_node_t *node,
+				fib_node_back_walk_ctx_t *ctx)
+{
+    /*
+     * the path-list is not a direct child of any other node type
+     * paths, which do not change thier to-list-mapping, save the
+     * list they are a member of, and invoke the BW function directly.
+     */
+    ASSERT(0);
+
+    return (FIB_NODE_BACK_WALK_CONTINUE);
+}
+
+/*
+ * Display the path-list memory usage
+ */
+static void
+fib_path_list_memory_show (void)
+{
+    fib_show_memory_usage("Path-list",
+			  pool_elts(fib_path_list_pool),
+			  pool_len(fib_path_list_pool),
+			  sizeof(fib_path_list_t));
+    fib_urpf_list_show_mem();
+}
+
+/*
+ * The FIB path-list's graph node virtual function table
+ */
+static const fib_node_vft_t fib_path_list_vft = {
+    .fnv_get = fib_path_list_get_node,
+    .fnv_last_lock = fib_path_list_last_lock_gone,
+    .fnv_back_walk = fib_path_list_back_walk_notify,
+    .fnv_mem_show = fib_path_list_memory_show,
+};
+
+static fib_path_list_t *
+fib_path_list_alloc (fib_node_index_t *path_list_index)
+{
+    fib_path_list_t *path_list;
+
+    pool_get(fib_path_list_pool, path_list);
+    memset(path_list, 0, sizeof(*path_list));
+
+    fib_node_init(&path_list->fpl_node,
+		  FIB_NODE_TYPE_PATH_LIST);
+    path_list->fpl_urpf = INDEX_INVALID;
+
+    if (NULL != path_list_index)
+    {
+	*path_list_index = fib_path_list_get_index(path_list);
+    }
+
+    FIB_PATH_LIST_DBG(path_list, "alloc");
+
+    return (path_list);
+}
+
+static fib_path_list_t *
+fib_path_list_resolve (fib_path_list_t *path_list)
+{
+    fib_node_index_t *path_index, *paths, path_list_index;
+
+    ASSERT(!(path_list->fpl_flags & FIB_PATH_LIST_FLAG_RESOLVED));
+
+    /*
+     * resolving a path-list is a recursive action. this means more path
+     * lists can be created during this call, and hence this path-list
+     * can be realloc'd. so we work with copies.
+     * this function is called only once per-path list, so its no great overhead.
+     */
+    path_list_index = fib_path_list_get_index(path_list);
+    paths = vec_dup(path_list->fpl_paths);
+
+    vec_foreach (path_index, paths)
+    {
+	fib_path_resolve(*path_index);
+    }
+
+    vec_free(paths);
+    path_list = fib_path_list_get(path_list_index);
+
+    FIB_PATH_LIST_DBG(path_list, "resovled");
+    fib_path_list_mk_urpf(path_list);
+
+    return (path_list);
+}
+
+u32
+fib_path_list_get_resolving_interface (fib_node_index_t path_list_index)
+{
+    fib_node_index_t *path_index;
+    fib_path_list_t *path_list;
+    u32 sw_if_index;
+
+    path_list = fib_path_list_get(path_list_index);
+
+    sw_if_index = ~0;
+    vec_foreach (path_index, path_list->fpl_paths)
+    {
+	sw_if_index = fib_path_get_resolving_interface(*path_index);
+	if (~0 != sw_if_index)
+	{
+	    return (sw_if_index);
+	}
+    }
+
+    return (sw_if_index);
+}
+
+fib_protocol_t
+fib_path_list_get_proto (fib_node_index_t path_list_index)
+{
+    fib_path_list_t *path_list;
+
+    path_list = fib_path_list_get(path_list_index);
+
+    /*
+     * we don't support a mix of path protocols, so we can return the proto
+     * of the first
+     */
+    return (fib_path_get_proto(path_list->fpl_paths[0]));
+}
+
+int
+fib_path_list_is_looped (fib_node_index_t path_list_index)
+{
+    fib_path_list_t *path_list;
+
+    path_list = fib_path_list_get(path_list_index);
+
+    return (path_list->fpl_flags & FIB_PATH_LIST_FLAG_LOOPED);
+}
+
+static fib_path_cfg_flags_t 
+fib_path_list_flags_2_path_flags (fib_path_list_flags_t plf)
+{
+    fib_path_cfg_flags_t pf = FIB_PATH_CFG_FLAG_NONE;
+
+    if (plf & FIB_PATH_LIST_FLAG_LOCAL)
+    {
+	pf |= FIB_PATH_CFG_FLAG_LOCAL;
+    }
+    if (plf & FIB_PATH_LIST_FLAG_DROP)
+    {
+	pf |= FIB_PATH_CFG_FLAG_DROP;
+    }
+    if (plf & FIB_PATH_LIST_FLAG_EXCLUSIVE)
+    {
+	pf |= FIB_PATH_CFG_FLAG_EXCLUSIVE;
+    }
+
+    return (pf);
+}
+
+static fib_path_list_flags_t
+fib_path_list_flags_fixup (fib_path_list_flags_t flags)
+{
+    /*
+     * we do no share drop nor exclusive path-lists
+     */
+    if (flags & FIB_PATH_LIST_FLAG_DROP ||
+	flags & FIB_PATH_LIST_FLAG_EXCLUSIVE)
+    {
+	flags &= ~FIB_PATH_LIST_FLAG_SHARED;
+    }
+
+    return (flags);
+}
+
+fib_node_index_t
+fib_path_list_create (fib_path_list_flags_t flags,
+		      const fib_route_path_t *rpaths)
+{
+    fib_node_index_t path_list_index, old_path_list_index;
+    fib_path_list_t *path_list;
+    int i;
+
+    flags = fib_path_list_flags_fixup(flags);
+    path_list = fib_path_list_alloc(&path_list_index);
+    path_list->fpl_flags = flags;
+    /*
+     * we'll assume for now all paths are the same next-hop protocol
+     */
+    path_list->fpl_nh_proto = rpaths[0].frp_proto;
+
+    vec_foreach_index(i, rpaths)
+    {
+	vec_add1(path_list->fpl_paths,
+		 fib_path_create(path_list_index,
+				 path_list->fpl_nh_proto,
+				 fib_path_list_flags_2_path_flags(flags),
+				 &rpaths[i]));
+    }
+
+    /*
+     * If a shared path list is requested, consult the DB for a match
+     */
+    if (flags & FIB_PATH_LIST_FLAG_SHARED)
+    {
+	/*
+	 * check for a matching path-list in the DB.
+	 * If we find one then we can return the existing one and destroy the
+	 * new one just created.
+	 */
+	old_path_list_index = fib_path_list_db_find(path_list);
+	if (FIB_NODE_INDEX_INVALID != old_path_list_index)
+	{
+	    fib_path_list_destroy(path_list);
+	
+	    path_list_index = old_path_list_index;
+	}
+	else
+	{
+	    /*
+	     * if there was not a matching path-list, then this
+	     * new one will need inserting into the DB and resolving.
+	     */
+	    fib_path_list_db_insert(path_list_index);
+	    path_list = fib_path_list_resolve(path_list);
+	}
+    }
+    else
+    {
+	/*
+	 * no shared path list requested. resolve and use the one
+	 * just created.
+	 */
+	path_list = fib_path_list_resolve(path_list);
+    }
+
+    return (path_list_index);
+}
+
+fib_node_index_t
+fib_path_list_create_special (fib_protocol_t nh_proto,
+			      fib_path_list_flags_t flags,
+			      const dpo_id_t *dpo)
+{
+    fib_node_index_t path_index, path_list_index;
+    fib_path_list_t *path_list;
+
+    path_list = fib_path_list_alloc(&path_list_index);
+    path_list->fpl_flags = flags;
+    path_list->fpl_nh_proto = nh_proto;
+
+    path_index =
+	fib_path_create_special(path_list_index,
+				path_list->fpl_nh_proto,
+				fib_path_list_flags_2_path_flags(flags),
+				dpo);
+    vec_add1(path_list->fpl_paths, path_index);
+
+    /*
+     * we don't share path-lists. we can do PIC on them so why bother.
+     */
+    path_list = fib_path_list_resolve(path_list);
+
+    return (path_list_index);
+}
+
+/*
+ * fib_path_list_copy_and_path_add
+ *
+ * Create a copy of a path-list and append one more path to it.
+ * The path-list returned could either have been newly created, or
+ * can be a shared path-list from the data-base.
+ */
+fib_node_index_t
+fib_path_list_copy_and_path_add (fib_node_index_t orig_path_list_index,
+				 fib_path_list_flags_t flags,
+				 const fib_route_path_t *rpaths)
+{
+    fib_node_index_t path_index, new_path_index, *orig_path_index;
+    fib_path_list_t *path_list, *orig_path_list;
+    fib_node_index_t path_list_index;
+    fib_node_index_t pi;
+
+    ASSERT(1 == vec_len(rpaths));
+
+    /*
+     * alloc the new list before we retrieve the old one, lest
+     * the alloc result in a realloc
+     */
+    path_list = fib_path_list_alloc(&path_list_index);
+
+    orig_path_list = fib_path_list_get(orig_path_list_index);
+
+    FIB_PATH_LIST_DBG(orig_path_list, "copy-add");
+
+    flags = fib_path_list_flags_fixup(flags);
+    path_list->fpl_flags = flags;
+    path_list->fpl_nh_proto = orig_path_list->fpl_nh_proto;
+    vec_validate(path_list->fpl_paths, vec_len(orig_path_list->fpl_paths));
+    pi = 0;
+
+    new_path_index = fib_path_create(path_list_index,
+                                     path_list->fpl_nh_proto,
+                                     fib_path_list_flags_2_path_flags(flags),
+                                     rpaths);
+
+    vec_foreach (orig_path_index, orig_path_list->fpl_paths)
+    {
+        /*
+         * don't add duplicate paths
+         * In the unlikely event the path is a duplicate, then we'll
+         * find a matching path-list later and this one will be toast.
+         */
+	if (0 != fib_path_cmp(new_path_index, *orig_path_index))
+        {
+            path_index = fib_path_copy(*orig_path_index, path_list_index);
+            path_list->fpl_paths[pi++] = path_index;
+        }
+        else
+        {
+            _vec_len(path_list->fpl_paths) = vec_len(orig_path_list->fpl_paths);
+        }
+    }
+
+    path_list->fpl_paths[pi] = new_path_index;
+
+    /*
+     * we sort the paths since the key for the path-list is
+     * the description of the paths it contains. The paths need to
+     * be sorted else this description will differ.
+     */
+    vec_sort_with_function(path_list->fpl_paths, fib_path_cmp_for_sort);
+
+    FIB_PATH_LIST_DBG(path_list, "path-added");
+
+    /*
+     * If a shared path list is requested, consult the DB for a match
+     */
+    if (path_list->fpl_flags & FIB_PATH_LIST_FLAG_SHARED)
+    {
+	fib_node_index_t exist_path_list_index;
+	/*
+	 * check for a matching path-list in the DB.
+	 * If we find one then we can return the existing one and destroy the
+	 * new one just created.
+	 */
+	exist_path_list_index = fib_path_list_db_find(path_list);
+	if (FIB_NODE_INDEX_INVALID != exist_path_list_index)
+	{
+	    fib_path_list_destroy(path_list);
+	
+	    path_list_index = exist_path_list_index;
+	}
+	else
+	{
+	    /*
+	     * if there was not a matching path-list, then this
+	     * new one will need inserting into the DB and resolving.
+	     */
+	    fib_path_list_db_insert(path_list_index);
+
+	    path_list = fib_path_list_resolve(path_list);
+	}
+    }
+    else
+    {
+	/*
+	 * no shared path list requested. resolve and use the one
+	 * just created.
+	 */
+	path_list = fib_path_list_resolve(path_list);
+    }
+
+    return (path_list_index);
+}
+
+/*
+ * fib_path_list_copy_and_path_remove
+ *
+ * Copy the path-list excluding the path passed.
+ * If the path is the last one, then the index reurned will be invalid.
+ * i.e. the path-list is toast.
+ */
+fib_node_index_t
+fib_path_list_copy_and_path_remove (fib_node_index_t orig_path_list_index,
+				    fib_path_list_flags_t flags,
+				    const fib_route_path_t *rpaths)
+{
+    fib_node_index_t path_index, *orig_path_index, path_list_index, tmp_path_index;
+    fib_path_list_t *path_list,  *orig_path_list;
+    fib_node_index_t pi;
+
+    ASSERT(1 == vec_len(rpaths));
+
+    path_list = fib_path_list_alloc(&path_list_index);
+
+    flags = fib_path_list_flags_fixup(flags);
+    orig_path_list = fib_path_list_get(orig_path_list_index);
+
+    FIB_PATH_LIST_DBG(orig_path_list, "copy-remove");
+
+    path_list->fpl_flags = flags;
+    path_list->fpl_nh_proto = orig_path_list->fpl_nh_proto;
+    /*
+     * allocate as many paths as we might need in one go, rather than
+     * using vec_add to do a few at a time.
+     */
+    if (vec_len(orig_path_list->fpl_paths) > 1)
+    {
+	vec_validate(path_list->fpl_paths, vec_len(orig_path_list->fpl_paths) - 2);
+    }
+    pi = 0;
+
+    /*
+     * create a representation of the path to be removed, so it
+     * can be used as a comparison object during the copy.
+     */
+    tmp_path_index = fib_path_create(path_list_index,
+				     path_list->fpl_nh_proto,
+				     fib_path_list_flags_2_path_flags(flags),
+				     rpaths);
+
+    vec_foreach (orig_path_index, orig_path_list->fpl_paths)
+    {
+	if (0 != fib_path_cmp(tmp_path_index, *orig_path_index)) {
+	    path_index = fib_path_copy(*orig_path_index, path_list_index);
+	    if (pi < vec_len(path_list->fpl_paths))
+	    {
+		path_list->fpl_paths[pi++] = path_index;
+	    }
+	    else
+	    {
+		/*
+		 * this is the unlikely case that the path being
+		 * removed does not match one in the path-list, so
+		 * we end up with as many paths as we started with.
+		 * the paths vector was sized above with the expectation
+		 * that we would have 1 less.
+		 */
+		vec_add1(path_list->fpl_paths, path_index);
+	    }
+	}
+    }
+
+    /*
+     * done with the temporary now
+     */
+    fib_path_destroy(tmp_path_index);
+
+    /*
+     * if there are no paths, then the new path-list is aborted
+     */
+    if (0 == vec_len(path_list->fpl_paths)) {
+	FIB_PATH_LIST_DBG(path_list, "last-path-removed");
+
+	fib_path_list_destroy(path_list);
+
+	path_list_index = FIB_NODE_INDEX_INVALID;
+    } else {
+	/*
+	 * we sort the paths since the key for the path-list is
+	 * the description of the paths it contains. The paths need to
+	 * be sorted else this description will differ.
+	 */
+	vec_sort_with_function(path_list->fpl_paths, fib_path_cmp_for_sort);
+    
+	/*
+	 * If a shared path list is requested, consult the DB for a match
+	 */
+	if (path_list->fpl_flags & FIB_PATH_LIST_FLAG_SHARED)
+	{
+	    fib_node_index_t exist_path_list_index;
+
+            /*
+	     * check for a matching path-list in the DB.
+	     * If we find one then we can return the existing one and destroy the
+	     * new one just created.
+	     */
+	    exist_path_list_index = fib_path_list_db_find(path_list);
+	    if (FIB_NODE_INDEX_INVALID != exist_path_list_index)
+	    {
+		fib_path_list_destroy(path_list);
+	
+		path_list_index = exist_path_list_index;
+	    }
+	    else
+	    {
+		/*
+		 * if there was not a matching path-list, then this
+		 * new one will need inserting into the DB and resolving.
+		 */
+		fib_path_list_db_insert(path_list_index);
+
+		path_list = fib_path_list_resolve(path_list);
+	    }
+	}
+	else
+	{
+	    /*
+	     * no shared path list requested. resolve and use the one
+	     * just created.
+	     */
+	    path_list = fib_path_list_resolve(path_list);
+	}
+    }
+
+    return (path_list_index);
+}
+
+/*
+ * fib_path_list_contribute_forwarding
+ *
+ * Return the index of a load-balance that user of this path-list should
+ * use for forwarding
+ */
+void
+fib_path_list_contribute_forwarding (fib_node_index_t path_list_index,
+				     fib_forward_chain_type_t type,
+				     dpo_id_t *dpo)
+{
+    fib_path_list_t *path_list;
+
+    path_list = fib_path_list_get(path_list_index);
+
+    fib_path_list_mk_lb(path_list, type, dpo);
+}
+
+/*
+ * fib_path_list_get_adj
+ *
+ * Return the index of a adjacency for the first path that user of this
+ * path-list should use for forwarding
+ */
+adj_index_t
+fib_path_list_get_adj (fib_node_index_t path_list_index,
+		       fib_forward_chain_type_t type)
+{
+    fib_path_list_t *path_list;
+
+    path_list = fib_path_list_get(path_list_index);
+    return (fib_path_get_adj(path_list->fpl_paths[0]));
+}
+
+int
+fib_path_list_recursive_loop_detect (fib_node_index_t path_list_index,
+				     fib_node_index_t **entry_indicies)
+{
+    fib_node_index_t *path_index;
+    int is_looped, list_looped;
+    fib_path_list_t *path_list;
+
+    list_looped = 0;
+    path_list = fib_path_list_get(path_list_index);
+
+    vec_foreach (path_index, path_list->fpl_paths)
+    {
+	fib_node_index_t *copy, **copy_ptr;
+
+	/*
+	 * we need a copy of the nodes visited so that when we add entries
+	 * we explore on the nth path and a looped is detected, those entries
+	 * are not again searched for n+1 path and so finding a loop that does
+	 * not exist.
+	 */
+	copy = vec_dup(*entry_indicies);
+	copy_ptr = &copy;
+
+	is_looped  = fib_path_recursive_loop_detect(*path_index, copy_ptr);
+	list_looped += is_looped;
+    }
+
+    FIB_PATH_LIST_DBG(path_list, "loop-detect: eval:%d", eval);
+
+    if (list_looped)
+    {
+	path_list->fpl_flags |= FIB_PATH_LIST_FLAG_LOOPED;
+    }
+    else
+    {
+	path_list->fpl_flags &= ~FIB_PATH_LIST_FLAG_LOOPED;
+    }
+
+    return (list_looped);
+}
+
+u32
+fib_path_list_child_add (fib_node_index_t path_list_index,
+			 fib_node_type_t child_type,
+			 fib_node_index_t child_index)
+{
+    return (fib_node_child_add(FIB_NODE_TYPE_PATH_LIST,
+                               path_list_index,
+                               child_type,
+                               child_index));
+}
+
+void
+fib_path_list_child_remove (fib_node_index_t path_list_index,
+			    u32 si)
+{
+    fib_node_child_remove(FIB_NODE_TYPE_PATH_LIST,
+                          path_list_index,
+                          si);
+}
+
+void
+fib_path_list_lock(fib_node_index_t path_list_index)
+{
+    fib_path_list_t *path_list;
+
+    if (FIB_NODE_INDEX_INVALID != path_list_index)
+    {
+	path_list = fib_path_list_get(path_list_index);
+
+	fib_node_lock(&path_list->fpl_node);
+	FIB_PATH_LIST_DBG(path_list, "lock");
+    }
+}
+
+void
+fib_path_list_unlock (fib_node_index_t path_list_index)
+{
+    fib_path_list_t *path_list;
+
+    if (FIB_NODE_INDEX_INVALID != path_list_index)
+    {
+	path_list = fib_path_list_get(path_list_index);
+	FIB_PATH_LIST_DBG(path_list, "unlock");
+    
+	fib_node_unlock(&path_list->fpl_node);
+    }
+}
+
+u32
+fib_path_list_pool_size (void)
+{
+    return (pool_elts(fib_path_list_pool));    
+}
+
+u32
+fib_path_list_db_size (void)
+{
+    return (hash_elts(fib_path_list_db));
+}
+
+void
+fib_path_list_walk (fib_node_index_t path_list_index,
+		    fib_path_list_walk_fn_t func,
+		    void *ctx)
+{
+    fib_node_index_t *path_index;
+    fib_path_list_t *path_list;
+
+    path_list = fib_path_list_get(path_list_index);
+
+    vec_foreach(path_index, path_list->fpl_paths)
+    {
+	if (!func(path_list_index, *path_index, ctx))
+	    break;
+    }
+}
+
+
+void
+fib_path_list_module_init (void)
+{
+    fib_node_register_type (FIB_NODE_TYPE_PATH_LIST, &fib_path_list_vft);
+
+    fib_path_list_db = hash_create2 (/* elts */ 0,
+    				     /* user */ 0,
+    				     /* value_bytes */ sizeof (fib_node_index_t),
+    				     fib_path_list_db_hash_key_sum,
+    				     fib_path_list_db_hash_key_equal,
+    				     /* format pair/arg */
+    				     0, 0);
+}
+
+static clib_error_t *
+show_fib_path_list_command (vlib_main_t * vm,
+			    unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+    fib_path_list_t *path_list;
+    fib_node_index_t pli;
+
+    if (unformat (input, "%d", &pli))
+    {
+	/*
+	 * show one in detail
+	 */
+	if (!pool_is_free_index(fib_path_list_pool, pli))
+	{
+	    path_list = fib_path_list_get(pli);
+	    u8 *s = fib_path_list_format(pli, NULL);
+	    s = format(s, "children:");
+	    s = fib_node_children_format(path_list->fpl_node.fn_children, s);
+	    vlib_cli_output (vm, "%s", s);
+	    vec_free(s);
+	}
+	else
+	{
+	    vlib_cli_output (vm, "path list %d invalid", pli);
+	}
+    }
+    else
+    {
+	/*
+	 * show all
+	 */
+	vlib_cli_output (vm, "FIB Path Lists");
+	pool_foreach(path_list, fib_path_list_pool,
+	({
+	    vlib_cli_output (vm, "%U", format_fib_path_list, path_list);
+	}));
+    }
+    return (NULL);
+}
+
+VLIB_CLI_COMMAND (show_fib_path_list, static) = {
+  .path = "show fib path-lists",
+  .function = show_fib_path_list_command,
+  .short_help = "show fib path-lists",
+};
diff --git a/src/vnet/fib/fib_path_list.h b/src/vnet/fib/fib_path_list.h
new file mode 100644
index 00000000..8bc1b20b
--- /dev/null
+++ b/src/vnet/fib/fib_path_list.h
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __FIB_PATH_LIST_H__
+#define __FIB_PATH_LIST_H__
+
+#include <vlib/vlib.h>
+#include <vnet/adj/adj.h>
+
+#include "fib_node.h"
+#include "fib_path.h"
+
+/**
+ * Enumeration of path-list flags.
+ */
+typedef enum fib_path_list_attribute_t_ {
+    /**
+     * Marker. Add new flags after this one.
+     */
+    FIB_PATH_LIST_ATTRIBUTE_FIRST = 0,
+    /**
+     * This path list is shareable. Shareable path-lists
+     * are inserted into the path-list data-base.
+     * All path-list are inherently shareable, the reason we share some and
+     * not others is to limit the size of the path-list database. This DB must
+     * be searched for each route update.
+     */
+    FIB_PATH_LIST_ATTRIBUTE_SHARED = FIB_PATH_LIST_ATTRIBUTE_FIRST,
+    /**
+     * explicit drop path-list. Used when the entry source needs to 
+     * force a drop, despite the fact the path info is present.
+     */
+    FIB_PATH_LIST_ATTRIBUTE_DROP,
+    /**
+     * explicit local path-list.
+     */
+    FIB_PATH_LIST_ATTRIBUTE_LOCAL,
+    /**
+     * exclusive path-list. Exclusive means the path will resolve via the
+     * exclusive (user provided) adj.
+     */
+    FIB_PATH_LIST_ATTRIBUTE_EXCLUSIVE,
+    /**
+     * resolved path-list
+     */
+    FIB_PATH_LIST_ATTRIBUTE_RESOLVED,
+    /**
+     * looped path-list. one path looped implies the whole list is
+     */
+    FIB_PATH_LIST_ATTRIBUTE_LOOPED,
+    /**
+     * Marher. Add new flags before this one, and then update it.
+     */
+    FIB_PATH_LIST_ATTRIBUTE_LAST = FIB_PATH_LIST_ATTRIBUTE_LOOPED,
+} fib_path_list_attribute_t;
+
+typedef enum fib_path_list_flags_t_ {
+    FIB_PATH_LIST_FLAG_NONE      = 0,
+    FIB_PATH_LIST_FLAG_SHARED    = (1 << FIB_PATH_LIST_ATTRIBUTE_SHARED),
+    FIB_PATH_LIST_FLAG_DROP      = (1 << FIB_PATH_LIST_ATTRIBUTE_DROP),
+    FIB_PATH_LIST_FLAG_LOCAL     = (1 << FIB_PATH_LIST_ATTRIBUTE_LOCAL),
+    FIB_PATH_LIST_FLAG_EXCLUSIVE = (1 << FIB_PATH_LIST_ATTRIBUTE_EXCLUSIVE),
+    FIB_PATH_LIST_FLAG_RESOLVED  = (1 << FIB_PATH_LIST_ATTRIBUTE_RESOLVED),
+    FIB_PATH_LIST_FLAG_LOOPED    = (1 << FIB_PATH_LIST_ATTRIBUTE_LOOPED),
+} fib_path_list_flags_t;
+
+#define FIB_PATH_LIST_ATTRIBUTES {       		 \
+    [FIB_PATH_LIST_ATTRIBUTE_SHARED]    = "shared",	 \
+    [FIB_PATH_LIST_ATTRIBUTE_RESOLVED]  = "resolved",	 \
+    [FIB_PATH_LIST_ATTRIBUTE_DROP]      = "drop",	 \
+    [FIB_PATH_LIST_ATTRIBUTE_EXCLUSIVE] = "exclusive",   \
+    [FIB_PATH_LIST_ATTRIBUTE_LOCAL]     = "local",	 \
+    [FIB_PATH_LIST_ATTRIBUTE_LOOPED]     = "looped",	 \
+}
+
+#define FOR_EACH_PATH_LIST_ATTRIBUTE(_item)		\
+    for (_item = FIB_PATH_LIST_ATTRIBUTE_FIRST;		\
+	 _item <= FIB_PATH_LIST_ATTRIBUTE_LAST;		\
+	 _item++)
+
+extern fib_node_index_t fib_path_list_create(fib_path_list_flags_t flags,
+					     const fib_route_path_t *paths);
+extern fib_node_index_t fib_path_list_create_special(fib_protocol_t nh_proto,
+						     fib_path_list_flags_t flags,
+						     const dpo_id_t *dpo);
+
+extern fib_node_index_t fib_path_list_copy_and_path_add(
+    fib_node_index_t pl_index,
+    fib_path_list_flags_t flags,
+    const fib_route_path_t *path);
+extern fib_node_index_t fib_path_list_copy_and_path_remove(
+    fib_node_index_t pl_index,
+    fib_path_list_flags_t flags,
+    const fib_route_path_t *path);
+extern void fib_path_list_contribute_forwarding(fib_node_index_t path_list_index,
+						fib_forward_chain_type_t type,
+						dpo_id_t *dpo);
+extern void fib_path_list_contribute_urpf(fib_node_index_t path_index,
+					  index_t urpf);
+extern index_t fib_path_list_get_urpf(fib_node_index_t path_list_index);
+extern index_t fib_path_list_get_adj(fib_node_index_t path_list_index,
+				     fib_forward_chain_type_t type);
+
+extern u32 fib_path_list_child_add(fib_node_index_t pl_index,
+				   fib_node_type_t type,
+				   fib_node_index_t child_index);
+extern void fib_path_list_child_remove(fib_node_index_t pl_index,
+				       fib_node_index_t sibling_index);
+extern void fib_path_list_back_walk(fib_node_index_t pl_index,
+				    fib_node_back_walk_ctx_t *ctx);
+extern void fib_path_list_lock(fib_node_index_t pl_index);
+extern void fib_path_list_unlock(fib_node_index_t pl_index);
+extern int fib_path_list_recursive_loop_detect(fib_node_index_t path_list_index,
+					       fib_node_index_t **entry_indicies);
+extern u32 fib_path_list_get_resolving_interface(fib_node_index_t path_list_index);
+extern int fib_path_list_is_looped(fib_node_index_t path_list_index);
+extern fib_protocol_t fib_path_list_get_proto(fib_node_index_t path_list_index);
+extern u8 * fib_path_list_format(fib_node_index_t pl_index,
+				 u8 * s);
+extern u8 * fib_path_list_adjs_format(fib_node_index_t pl_index,
+				      u32 indent,
+				      u8 * s);
+extern index_t fib_path_list_lb_map_add_or_lock(fib_node_index_t pl_index,
+                                                const fib_node_index_t *pis);
+/**
+ * A callback function type for walking a path-list's paths
+ */
+typedef int (*fib_path_list_walk_fn_t)(fib_node_index_t pl_index,
+				       fib_node_index_t path_index,
+				       void *ctx);
+
+extern void fib_path_list_walk(fib_node_index_t pl_index,
+			       fib_path_list_walk_fn_t func,
+			       void *ctx);
+
+extern void fib_path_list_module_init(void);
+
+extern void fib_path_list_module_init(void);
+
+/*
+ * functions for testing.
+ */
+u32 fib_path_list_pool_size(void);
+u32 fib_path_list_db_size(void);
+
+#endif
diff --git a/src/vnet/fib/fib_table.c b/src/vnet/fib/fib_table.c
new file mode 100644
index 00000000..76db42d0
--- /dev/null
+++ b/src/vnet/fib/fib_table.c
@@ -0,0 +1,1104 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/dpo/drop_dpo.h>
+
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/fib_entry_cover.h>
+#include <vnet/fib/fib_internal.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/fib/mpls_fib.h>
+
+fib_table_t *
+fib_table_get (fib_node_index_t index,
+	       fib_protocol_t proto)
+{
+    switch (proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (pool_elt_at_index(ip4_main.fibs, index));
+    case FIB_PROTOCOL_IP6:
+	return (pool_elt_at_index(ip6_main.fibs, index));
+    case FIB_PROTOCOL_MPLS:
+	return (pool_elt_at_index(mpls_main.fibs, index));
+    }
+    ASSERT(0);
+    return (NULL);
+}
+
+static inline fib_node_index_t
+fib_table_lookup_i (fib_table_t *fib_table,
+		    const fib_prefix_t *prefix)
+{
+    switch (prefix->fp_proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (ip4_fib_table_lookup(&fib_table->v4,
+				     &prefix->fp_addr.ip4,
+				     prefix->fp_len));
+    case FIB_PROTOCOL_IP6:
+	return (ip6_fib_table_lookup(fib_table->ft_index,
+				     &prefix->fp_addr.ip6,
+				     prefix->fp_len));
+    case FIB_PROTOCOL_MPLS:
+	return (mpls_fib_table_lookup(&fib_table->mpls,
+				      prefix->fp_label,
+				      prefix->fp_eos));
+    }
+    return (FIB_NODE_INDEX_INVALID);
+}
+
+fib_node_index_t
+fib_table_lookup (u32 fib_index,
+		  const fib_prefix_t *prefix)
+{
+    return (fib_table_lookup_i(fib_table_get(fib_index, prefix->fp_proto), prefix));
+}
+
+static inline fib_node_index_t
+fib_table_lookup_exact_match_i (const fib_table_t *fib_table,
+				const fib_prefix_t *prefix)
+{
+    switch (prefix->fp_proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (ip4_fib_table_lookup_exact_match(&fib_table->v4,
+						 &prefix->fp_addr.ip4,
+						 prefix->fp_len));
+    case FIB_PROTOCOL_IP6:
+	return (ip6_fib_table_lookup_exact_match(fib_table->ft_index,
+						 &prefix->fp_addr.ip6,
+						 prefix->fp_len));
+    case FIB_PROTOCOL_MPLS:
+	return (mpls_fib_table_lookup(&fib_table->mpls,
+				      prefix->fp_label,
+				      prefix->fp_eos));
+    }
+    return (FIB_NODE_INDEX_INVALID);
+}
+
+fib_node_index_t
+fib_table_lookup_exact_match (u32 fib_index,
+			      const fib_prefix_t *prefix)
+{
+    return (fib_table_lookup_exact_match_i(fib_table_get(fib_index,
+							 prefix->fp_proto),
+					   prefix));
+}
+
+static fib_node_index_t
+fib_table_get_less_specific_i (fib_table_t *fib_table,
+			       const fib_prefix_t *prefix)
+{
+    fib_prefix_t pfx;
+
+    pfx = *prefix;
+
+    if (FIB_PROTOCOL_MPLS == pfx.fp_proto)
+    {
+	return (FIB_NODE_INDEX_INVALID);
+    }
+
+    /*
+     * in the absence of a tree structure for the table that allows for an O(1)
+     * parent get, a cheeky way to find the cover is to LPM for the prefix with
+     * mask-1.
+     * there should always be a cover, though it may be the default route. the
+     * default route's cover is the default route.
+     */
+    if (pfx.fp_len != 0) {
+	pfx.fp_len -= 1;
+    }
+
+    return (fib_table_lookup_i(fib_table, &pfx));    
+}
+
+fib_node_index_t
+fib_table_get_less_specific (u32 fib_index,
+			     const fib_prefix_t *prefix)
+{
+    return (fib_table_get_less_specific_i(fib_table_get(fib_index,
+							prefix->fp_proto),
+					  prefix));
+}
+
+static void
+fib_table_entry_remove (fib_table_t *fib_table,
+			const fib_prefix_t *prefix,
+			fib_node_index_t fib_entry_index)
+{
+    vlib_smp_unsafe_warning();
+
+    fib_table->ft_total_route_counts--;
+
+    switch (prefix->fp_proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	ip4_fib_table_entry_remove(&fib_table->v4,
+				   &prefix->fp_addr.ip4,
+				   prefix->fp_len);
+	break;
+    case FIB_PROTOCOL_IP6:
+	ip6_fib_table_entry_remove(fib_table->ft_index,
+				   &prefix->fp_addr.ip6,
+				   prefix->fp_len);
+	break;
+    case FIB_PROTOCOL_MPLS:
+	mpls_fib_table_entry_remove(&fib_table->mpls,
+				    prefix->fp_label,
+				    prefix->fp_eos);
+	break;
+    }
+
+    fib_entry_unlock(fib_entry_index);
+}
+
+static void
+fib_table_post_insert_actions (fib_table_t *fib_table,
+			       const fib_prefix_t *prefix,
+			       fib_node_index_t fib_entry_index)
+{
+    fib_node_index_t fib_entry_cover_index;
+
+    /*
+     * no cover relationships in the MPLS FIB
+     */
+    if (FIB_PROTOCOL_MPLS == prefix->fp_proto)
+	return;
+
+    /*
+     * find and inform the covering entry that a new more specific
+     * has been inserted beneath it
+     */
+    fib_entry_cover_index = fib_table_get_less_specific_i(fib_table, prefix);
+    /*
+     * the indicies are the same when the default route is first added
+     */
+    if (fib_entry_cover_index != fib_entry_index)
+    {
+	fib_entry_cover_change_notify(fib_entry_cover_index,
+				      fib_entry_index);
+    }
+}
+
+static void
+fib_table_entry_insert (fib_table_t *fib_table,
+			const fib_prefix_t *prefix,
+			fib_node_index_t fib_entry_index)
+{
+    vlib_smp_unsafe_warning();
+
+    fib_entry_lock(fib_entry_index);
+    fib_table->ft_total_route_counts++;
+
+    switch (prefix->fp_proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	ip4_fib_table_entry_insert(&fib_table->v4,
+				   &prefix->fp_addr.ip4,
+				   prefix->fp_len,
+				   fib_entry_index);
+	break;
+    case FIB_PROTOCOL_IP6:
+	ip6_fib_table_entry_insert(fib_table->ft_index,
+				   &prefix->fp_addr.ip6,
+				   prefix->fp_len,
+				   fib_entry_index);
+	break;
+    case FIB_PROTOCOL_MPLS:
+	mpls_fib_table_entry_insert(&fib_table->mpls,
+				    prefix->fp_label,
+				    prefix->fp_eos,
+				    fib_entry_index);
+	break;
+    }
+
+    fib_table_post_insert_actions(fib_table, prefix, fib_entry_index);
+}
+
+void
+fib_table_fwding_dpo_update (u32 fib_index,
+			     const fib_prefix_t *prefix,
+			     const dpo_id_t *dpo)
+{
+    vlib_smp_unsafe_warning();
+
+    switch (prefix->fp_proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (ip4_fib_table_fwding_dpo_update(ip4_fib_get(fib_index),
+						&prefix->fp_addr.ip4,
+						prefix->fp_len,
+						dpo));
+    case FIB_PROTOCOL_IP6:
+	return (ip6_fib_table_fwding_dpo_update(fib_index,
+						&prefix->fp_addr.ip6,
+						prefix->fp_len,
+						dpo));
+    case FIB_PROTOCOL_MPLS:
+	return (mpls_fib_forwarding_table_update(mpls_fib_get(fib_index),
+						 prefix->fp_label,
+						 prefix->fp_eos,
+						 dpo));
+    }
+}
+
+void
+fib_table_fwding_dpo_remove (u32 fib_index,
+			     const fib_prefix_t *prefix,
+			     const dpo_id_t *dpo)
+{
+    vlib_smp_unsafe_warning();
+
+    switch (prefix->fp_proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (ip4_fib_table_fwding_dpo_remove(ip4_fib_get(fib_index),
+						&prefix->fp_addr.ip4,
+						prefix->fp_len,
+						dpo));
+    case FIB_PROTOCOL_IP6:
+	return (ip6_fib_table_fwding_dpo_remove(fib_index,
+						&prefix->fp_addr.ip6,
+						prefix->fp_len,
+						dpo));
+    case FIB_PROTOCOL_MPLS:
+	return (mpls_fib_forwarding_table_reset(mpls_fib_get(fib_index),
+						prefix->fp_label,
+						prefix->fp_eos));
+    }
+}
+
+
+fib_node_index_t
+fib_table_entry_special_dpo_add (u32 fib_index,
+                                 const fib_prefix_t *prefix,
+                                 fib_source_t source,
+                                 fib_entry_flag_t flags,
+                                 const dpo_id_t *dpo)
+{
+    fib_node_index_t fib_entry_index;
+    fib_table_t *fib_table;
+
+    fib_table = fib_table_get(fib_index, prefix->fp_proto);
+    fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
+
+    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
+    {
+	fib_entry_index = fib_entry_create_special(fib_index, prefix,
+						   source, flags,
+						   dpo);
+
+	fib_table_entry_insert(fib_table, prefix, fib_entry_index);
+        fib_table->ft_src_route_counts[source]++;
+    }
+    else
+    {
+        int was_sourced;
+
+        was_sourced = fib_entry_is_sourced(fib_entry_index, source);
+	fib_entry_special_add(fib_entry_index, source, flags, dpo);
+
+        if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
+        {
+            fib_table->ft_src_route_counts[source]++;
+        }
+    }
+
+
+    return (fib_entry_index);
+}
+
+fib_node_index_t
+fib_table_entry_special_dpo_update (u32 fib_index,
+				    const fib_prefix_t *prefix,
+				    fib_source_t source,
+				    fib_entry_flag_t flags,
+				    const dpo_id_t *dpo)
+{
+    fib_node_index_t fib_entry_index;
+    fib_table_t *fib_table;
+
+    fib_table = fib_table_get(fib_index, prefix->fp_proto);
+    fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
+
+    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
+    {
+	fib_entry_index = fib_entry_create_special(fib_index, prefix,
+						   source, flags,
+						   dpo);
+
+	fib_table_entry_insert(fib_table, prefix, fib_entry_index);
+        fib_table->ft_src_route_counts[source]++;
+    }
+    else
+    {
+        int was_sourced;
+
+        was_sourced = fib_entry_is_sourced(fib_entry_index, source);
+
+	if (was_sourced)
+	    fib_entry_special_update(fib_entry_index, source, flags, dpo);
+	else
+	    fib_entry_special_add(fib_entry_index, source, flags, dpo);
+
+        if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
+        {
+            fib_table->ft_src_route_counts[source]++;
+        }
+    }
+
+    return (fib_entry_index);
+}
+
+fib_node_index_t
+fib_table_entry_special_add (u32 fib_index,
+			     const fib_prefix_t *prefix,
+			     fib_source_t source,
+			     fib_entry_flag_t flags,
+			     adj_index_t adj_index)
+{
+    fib_node_index_t fib_entry_index;
+    dpo_id_t tmp_dpo = DPO_INVALID;
+
+    if (ADJ_INDEX_INVALID != adj_index)
+    {
+        dpo_set(&tmp_dpo,
+                DPO_ADJACENCY,
+                FIB_PROTOCOL_MAX,
+                adj_index);
+    }
+    else
+    {
+        dpo_copy(&tmp_dpo, drop_dpo_get(fib_proto_to_dpo(prefix->fp_proto)));
+    }
+ 
+    fib_entry_index = fib_table_entry_special_dpo_add(fib_index, prefix, source,
+                                                      flags, &tmp_dpo);
+
+    dpo_unlock(&tmp_dpo);
+
+    return (fib_entry_index);
+}
+
+void
+fib_table_entry_special_remove (u32 fib_index,
+				const fib_prefix_t *prefix,
+				fib_source_t source)
+{
+    /*
+     * 1 is it present
+     *   yes => remove source
+     *    2 - is it still sourced?
+     *      no => cover walk
+     */
+    fib_node_index_t fib_entry_index;
+    fib_table_t *fib_table;
+
+    fib_table = fib_table_get(fib_index, prefix->fp_proto);
+    fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
+
+    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
+    {
+	/*
+	 * removing an etry that does not exist. i'll allow it.
+	 */
+    }
+    else
+    {
+	fib_entry_src_flag_t src_flag;
+        int was_sourced;
+
+	/*
+	 * don't nobody go nowhere
+	 */
+	fib_entry_lock(fib_entry_index);
+        was_sourced = fib_entry_is_sourced(fib_entry_index, source);
+
+	src_flag = fib_entry_special_remove(fib_entry_index, source);
+
+	if (!(FIB_ENTRY_SRC_FLAG_ADDED & src_flag))
+	{
+	    /*
+	     * last source gone. remove from the table
+	     */
+	    fib_table_entry_remove(fib_table, prefix, fib_entry_index);
+
+	    /*
+	     * now the entry is no longer in the table, we can
+	     * inform the entries that it covers to re-calculate their cover
+	     */
+	    fib_entry_cover_change_notify(fib_entry_index,
+					  FIB_NODE_INDEX_INVALID);
+	}
+	/*
+	 * else
+	 *   still has sources, leave it be.
+	 */
+        if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
+        {
+            fib_table->ft_src_route_counts[source]--;
+        }
+
+	fib_entry_unlock(fib_entry_index);
+    }
+}
+
+/**
+ * fib_table_route_path_fixup
+ *
+ * Convert attached hosts to attached next-hops.
+ * 
+ * This special case is required because an attached path will link to a
+ * glean, and the FIB entry will have the interface or API/CLI source. When
+ * the ARP/ND process is completes then that source (which will provide a
+ * complete adjacency) will be lower priority and so the FIB entry will
+ * remain linked to a glean and traffic will never reach the hosts. For
+ * an ATTAHCED_HOST path we can link the path directly to the [incomplete]
+ * adjacency.
+ */
+static void
+fib_table_route_path_fixup (const fib_prefix_t *prefix,
+			    fib_route_path_t *path)
+{
+    if (fib_prefix_is_host(prefix) &&
+	ip46_address_is_zero(&path->frp_addr) &&
+	path->frp_sw_if_index != ~0)
+    {
+	path->frp_addr = prefix->fp_addr;
+    }
+}		  
+
+fib_node_index_t
+fib_table_entry_path_add (u32 fib_index,
+			  const fib_prefix_t *prefix,
+			  fib_source_t source,
+			  fib_entry_flag_t flags,
+			  fib_protocol_t next_hop_proto,
+			  const ip46_address_t *next_hop,
+			  u32 next_hop_sw_if_index,
+			  u32 next_hop_fib_index,
+			  u32 next_hop_weight,
+			  mpls_label_t *next_hop_labels,
+			  fib_route_path_flags_t path_flags)
+{
+    fib_route_path_t path = {
+	.frp_proto = next_hop_proto,
+	.frp_addr = (NULL == next_hop? zero_addr : *next_hop),
+	.frp_sw_if_index = next_hop_sw_if_index,
+	.frp_fib_index = next_hop_fib_index,
+	.frp_weight = next_hop_weight,
+	.frp_flags = path_flags,
+	.frp_label_stack = next_hop_labels,
+    };
+    fib_node_index_t fib_entry_index;
+    fib_route_path_t *paths = NULL;
+
+    vec_add1(paths, path);
+
+    fib_entry_index = fib_table_entry_path_add2(fib_index, prefix,
+						source, flags, paths);
+
+    vec_free(paths);
+    return (fib_entry_index);
+}
+
+fib_node_index_t
+fib_table_entry_path_add2 (u32 fib_index,
+			   const fib_prefix_t *prefix,
+			   fib_source_t source,
+			   fib_entry_flag_t flags,
+			   fib_route_path_t *rpath)
+{
+    fib_node_index_t fib_entry_index;
+    fib_table_t *fib_table;
+    u32 ii;
+
+    fib_table = fib_table_get(fib_index, prefix->fp_proto);
+    fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
+
+    for (ii = 0; ii < vec_len(rpath); ii++)
+    {
+	fib_table_route_path_fixup(prefix, &rpath[ii]);
+    }
+
+    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
+    {
+	fib_entry_index = fib_entry_create(fib_index, prefix,
+					   source, flags,
+					   rpath);
+
+	fib_table_entry_insert(fib_table, prefix, fib_entry_index);
+        fib_table->ft_src_route_counts[source]++;
+    }
+    else
+    {
+        int was_sourced;
+
+        was_sourced = fib_entry_is_sourced(fib_entry_index, source);
+	fib_entry_path_add(fib_entry_index, source, flags, rpath);;
+
+        if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
+        {
+            fib_table->ft_src_route_counts[source]++;
+        }
+    }
+
+    return (fib_entry_index);
+}
+
+void
+fib_table_entry_path_remove2 (u32 fib_index,
+			      const fib_prefix_t *prefix,
+			      fib_source_t source,
+			      fib_route_path_t *rpath)
+{
+    /*
+     * 1 is it present
+     *   yes => remove source
+     *    2 - is it still sourced?
+     *      no => cover walk
+     */
+    fib_node_index_t fib_entry_index;
+    fib_table_t *fib_table;
+    u32 ii;
+
+    fib_table = fib_table_get(fib_index, prefix->fp_proto);
+    fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
+
+    for (ii = 0; ii < vec_len(rpath); ii++)
+    {
+	fib_table_route_path_fixup(prefix, &rpath[ii]);
+    }
+
+    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
+    {
+	/*
+	 * removing an etry that does not exist. i'll allow it.
+	 */
+    }
+    else
+    {
+	fib_entry_src_flag_t src_flag;
+        int was_sourced;
+
+	/*
+	 * don't nobody go nowhere
+	 */
+	fib_entry_lock(fib_entry_index);
+        was_sourced = fib_entry_is_sourced(fib_entry_index, source);
+
+	src_flag = fib_entry_path_remove(fib_entry_index, source, rpath);
+
+	if (!(FIB_ENTRY_SRC_FLAG_ADDED & src_flag))
+	{
+	    /*
+	     * last source gone. remove from the table
+	     */
+	    fib_table_entry_remove(fib_table, prefix, fib_entry_index);
+
+	    /*
+	     * now the entry is no longer in the table, we can
+	     * inform the entries that it covers to re-calculate their cover
+	     */
+	    fib_entry_cover_change_notify(fib_entry_index,
+					  FIB_NODE_INDEX_INVALID);
+	}
+	/*
+	 * else
+	 *   still has sources, leave it be.
+	 */
+        if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
+        {
+            fib_table->ft_src_route_counts[source]--;
+        }
+
+	fib_entry_unlock(fib_entry_index);
+    }
+}
+
+void
+fib_table_entry_path_remove (u32 fib_index,
+			     const fib_prefix_t *prefix,
+			     fib_source_t source,
+			     fib_protocol_t next_hop_proto,
+			     const ip46_address_t *next_hop,
+			     u32 next_hop_sw_if_index,
+			     u32 next_hop_fib_index,
+			     u32 next_hop_weight,
+			     fib_route_path_flags_t path_flags)
+{
+    /*
+     * 1 is it present
+     *   yes => remove source
+     *    2 - is it still sourced?
+     *      no => cover walk
+     */
+    fib_route_path_t path = {
+	.frp_proto = next_hop_proto,
+	.frp_addr = (NULL == next_hop? zero_addr : *next_hop),
+	.frp_sw_if_index = next_hop_sw_if_index,
+	.frp_fib_index = next_hop_fib_index,
+	.frp_weight = next_hop_weight,
+	.frp_flags = path_flags,
+    };
+    fib_route_path_t *paths = NULL;
+
+    fib_table_route_path_fixup(prefix, &path);
+    vec_add1(paths, path);
+
+    fib_table_entry_path_remove2(fib_index, prefix, source, paths);
+
+    vec_free(paths);
+}
+
+static int
+fib_route_path_cmp_for_sort (void * v1,
+			     void * v2)
+{
+    return (fib_route_path_cmp(v1, v2));
+}
+
+fib_node_index_t
+fib_table_entry_update (u32 fib_index,
+			const fib_prefix_t *prefix,
+			fib_source_t source,
+			fib_entry_flag_t flags,
+			fib_route_path_t *paths)
+{
+    fib_node_index_t fib_entry_index;
+    fib_table_t *fib_table;
+    u32 ii;
+
+    fib_table = fib_table_get(fib_index, prefix->fp_proto);
+    fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
+
+    for (ii = 0; ii < vec_len(paths); ii++)
+    {
+	fib_table_route_path_fixup(prefix, &paths[ii]);
+    }
+    /*
+     * sort the paths provided by the control plane. this means
+     * the paths and the extension on the entry will be sorted.
+     */
+    vec_sort_with_function(paths, fib_route_path_cmp_for_sort);
+
+    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
+    {
+    	fib_entry_index = fib_entry_create(fib_index, prefix,
+    					   source, flags,
+					   paths);
+
+    	fib_table_entry_insert(fib_table, prefix, fib_entry_index);
+        fib_table->ft_src_route_counts[source]++;
+    }
+    else
+    {
+        int was_sourced;
+
+        was_sourced = fib_entry_is_sourced(fib_entry_index, source);
+    	fib_entry_update(fib_entry_index, source, flags, paths);
+
+        if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
+        {
+            fib_table->ft_src_route_counts[source]++;
+        }
+    }
+
+    return (fib_entry_index);
+}
+
+fib_node_index_t
+fib_table_entry_update_one_path (u32 fib_index,
+				 const fib_prefix_t *prefix,
+				 fib_source_t source,
+				 fib_entry_flag_t flags,
+				 fib_protocol_t next_hop_proto,
+				 const ip46_address_t *next_hop,
+				 u32 next_hop_sw_if_index,
+				 u32 next_hop_fib_index,
+				 u32 next_hop_weight,
+				 mpls_label_t *next_hop_labels,
+				 fib_route_path_flags_t path_flags)
+{
+    fib_node_index_t fib_entry_index;
+    fib_route_path_t path = {
+	.frp_proto = next_hop_proto,
+	.frp_addr = (NULL == next_hop? zero_addr : *next_hop),
+	.frp_sw_if_index = next_hop_sw_if_index,
+	.frp_fib_index = next_hop_fib_index,
+	.frp_weight = next_hop_weight,
+	.frp_flags = path_flags,
+	.frp_label_stack = next_hop_labels,
+    };
+    fib_route_path_t *paths = NULL;
+
+    fib_table_route_path_fixup(prefix, &path);
+    vec_add1(paths, path);
+
+    fib_entry_index = 
+	fib_table_entry_update(fib_index, prefix, source, flags, paths);
+
+    vec_free(paths);
+
+    return (fib_entry_index);
+}
+
+static void
+fib_table_entry_delete_i (u32 fib_index,
+			  fib_node_index_t fib_entry_index,
+			  const fib_prefix_t *prefix,
+			  fib_source_t source)
+{
+    fib_entry_src_flag_t src_flag;
+    fib_table_t *fib_table;
+    int was_sourced;
+
+    fib_table = fib_table_get(fib_index, prefix->fp_proto);
+    was_sourced = fib_entry_is_sourced(fib_entry_index, source);
+
+    /*
+     * don't nobody go nowhere
+     */
+    fib_entry_lock(fib_entry_index);
+
+    src_flag = fib_entry_delete(fib_entry_index, source);
+
+    if (!(FIB_ENTRY_SRC_FLAG_ADDED & src_flag))
+    {
+	/*
+	 * last source gone. remove from the table
+	 */
+	fib_table_entry_remove(fib_table, prefix, fib_entry_index);
+
+	/*
+	 * now the entry is no longer in the table, we can
+	 * inform the entries that it covers to re-calculate their cover
+	 */
+	fib_entry_cover_change_notify(fib_entry_index,
+				      FIB_NODE_INDEX_INVALID);
+    }
+    /*
+     * else
+     *   still has sources, leave it be.
+     */
+    if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
+    {
+        fib_table->ft_src_route_counts[source]--;
+    }
+
+    fib_entry_unlock(fib_entry_index);
+}
+
+void
+fib_table_entry_delete (u32 fib_index,
+			const fib_prefix_t *prefix,
+			fib_source_t source)
+{
+    fib_node_index_t fib_entry_index;
+
+    fib_entry_index = fib_table_lookup_exact_match(fib_index, prefix);
+
+    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
+    {
+	/*
+	 * removing an etry that does not exist.
+	 * i'll allow it, but i won't like it.
+	 */
+	clib_warning("%U not in FIB", format_fib_prefix, prefix);
+    }
+    else
+    {
+	fib_table_entry_delete_i(fib_index, fib_entry_index, prefix, source);
+    }
+}
+
+void
+fib_table_entry_delete_index (fib_node_index_t fib_entry_index,
+			      fib_source_t source)
+{
+    fib_prefix_t prefix;
+
+    fib_entry_get_prefix(fib_entry_index, &prefix);
+
+    fib_table_entry_delete_i(fib_entry_get_fib_index(fib_entry_index),
+                             fib_entry_index, &prefix, source);
+}
+
+fib_node_index_t
+fib_table_entry_local_label_add (u32 fib_index,
+				 const fib_prefix_t *prefix,
+				 mpls_label_t label)
+{
+    fib_node_index_t fib_entry_index;
+ 
+    fib_entry_index = fib_table_lookup_exact_match(fib_index, prefix);
+
+    if (FIB_NODE_INDEX_INVALID == fib_entry_index ||
+	!fib_entry_is_sourced(fib_entry_index, FIB_SOURCE_MPLS))
+    {
+	/*
+	 * only source the prefix once. this allows the label change
+	 * operation to work
+	 */
+	fib_entry_index = fib_table_entry_special_dpo_add(fib_index, prefix,
+							  FIB_SOURCE_MPLS,
+							  FIB_ENTRY_FLAG_NONE,
+							  NULL);
+    }
+
+    fib_entry_set_source_data(fib_entry_index, FIB_SOURCE_MPLS, &label);
+
+    return (fib_entry_index);
+}
+
+void
+fib_table_entry_local_label_remove (u32 fib_index,
+				    const fib_prefix_t *prefix,
+				    mpls_label_t label)
+{
+    fib_node_index_t fib_entry_index;
+    const void *data;
+    mpls_label_t pl;
+
+    fib_entry_index = fib_table_lookup_exact_match(fib_index, prefix);
+
+    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
+        return;
+
+    data = fib_entry_get_source_data(fib_entry_index, FIB_SOURCE_MPLS);
+
+    if (NULL == data)
+        return;
+
+    pl = *(mpls_label_t*)data;
+
+    if (pl != label)
+        return;
+
+    pl = MPLS_LABEL_INVALID;
+
+    fib_entry_set_source_data(fib_entry_index, FIB_SOURCE_MPLS, &pl);
+    fib_table_entry_special_remove(fib_index,
+				   prefix,
+				   FIB_SOURCE_MPLS);
+}
+
+u32
+fib_table_get_index_for_sw_if_index (fib_protocol_t proto,
+				     u32 sw_if_index)
+{
+    switch (proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (ip4_fib_table_get_index_for_sw_if_index(sw_if_index));
+    case FIB_PROTOCOL_IP6:
+	return (ip6_fib_table_get_index_for_sw_if_index(sw_if_index));
+    case FIB_PROTOCOL_MPLS:
+	return (mpls_fib_table_get_index_for_sw_if_index(sw_if_index));
+    }
+    return (~0);
+}
+
+flow_hash_config_t
+fib_table_get_flow_hash_config (u32 fib_index,
+				fib_protocol_t proto)
+{
+    switch (proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (ip4_fib_table_get_flow_hash_config(fib_index));
+    case FIB_PROTOCOL_IP6:
+	return (ip6_fib_table_get_flow_hash_config(fib_index));
+    case FIB_PROTOCOL_MPLS:
+	return (mpls_fib_table_get_flow_hash_config(fib_index));
+    }
+    return (0);
+}
+
+
+u32
+fib_table_get_table_id_for_sw_if_index (fib_protocol_t proto,
+					u32 sw_if_index)
+{
+    fib_table_t *fib_table;
+
+    fib_table = fib_table_get(fib_table_get_index_for_sw_if_index(
+				  proto, sw_if_index),
+			      proto);
+
+    return ((NULL != fib_table ? fib_table->ft_table_id : ~0));
+}
+
+u32
+fib_table_find (fib_protocol_t proto,
+		u32 table_id)
+{
+    switch (proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (ip4_fib_index_from_table_id(table_id));
+    case FIB_PROTOCOL_IP6:
+	return (ip6_fib_index_from_table_id(table_id));
+    case FIB_PROTOCOL_MPLS:
+	return (mpls_fib_index_from_table_id(table_id));
+    }
+    return (~0);
+}
+
+u32
+fib_table_find_or_create_and_lock (fib_protocol_t proto,
+				   u32 table_id)
+{
+    fib_table_t *fib_table;
+    fib_node_index_t fi;
+
+    switch (proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	fi = ip4_fib_table_find_or_create_and_lock(table_id);
+        break;
+    case FIB_PROTOCOL_IP6:
+	fi = ip6_fib_table_find_or_create_and_lock(table_id);
+        break;
+    case FIB_PROTOCOL_MPLS:
+	fi = mpls_fib_table_find_or_create_and_lock(table_id);
+        break;
+    default:
+        return (~0);        
+    }
+
+    fib_table = fib_table_get(fi, proto);
+
+    fib_table->ft_desc = format(NULL, "%U-VRF:%d",
+                                format_fib_protocol, proto,
+                                table_id);
+
+    return (fi);
+}
+
+u32
+fib_table_create_and_lock (fib_protocol_t proto,
+                           const char *const fmt,
+                           ...)
+{
+    fib_table_t *fib_table;
+    fib_node_index_t fi;
+    va_list ap;
+
+    va_start(ap, fmt);
+
+    switch (proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	fi = ip4_fib_table_create_and_lock();
+        break;
+    case FIB_PROTOCOL_IP6:
+	fi = ip6_fib_table_create_and_lock();
+        break;
+     case FIB_PROTOCOL_MPLS:
+	fi = mpls_fib_table_create_and_lock();
+        break;
+   default:
+        return (~0);        
+    }
+
+    fib_table = fib_table_get(fi, proto);
+
+    fib_table->ft_desc = va_format(fib_table->ft_desc, fmt, &ap);
+
+    va_end(ap);
+    return (fi);
+}
+
+static void
+fib_table_destroy (fib_table_t *fib_table)
+{
+    vec_free(fib_table->ft_desc);
+
+    switch (fib_table->ft_proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	ip4_fib_table_destroy(&fib_table->v4);
+	break;
+    case FIB_PROTOCOL_IP6:
+	ip6_fib_table_destroy(fib_table->ft_index);
+	break;
+    case FIB_PROTOCOL_MPLS:
+	mpls_fib_table_destroy(&fib_table->mpls);
+	break;
+    }
+}
+
+void
+fib_table_unlock (u32 fib_index,
+		  fib_protocol_t proto)
+{
+    fib_table_t *fib_table;
+
+    fib_table = fib_table_get(fib_index, proto);
+    fib_table->ft_locks--;
+
+    if (0 == fib_table->ft_locks)
+    {
+	fib_table_destroy(fib_table);
+    }
+}
+void
+fib_table_lock (u32 fib_index,
+		fib_protocol_t proto)
+{
+    fib_table_t *fib_table;
+
+    fib_table = fib_table_get(fib_index, proto);
+    fib_table->ft_locks++;
+}
+
+u32
+fib_table_get_num_entries (u32 fib_index,
+			   fib_protocol_t proto,
+			   fib_source_t source)
+{
+    fib_table_t *fib_table;
+
+    fib_table = fib_table_get(fib_index, proto);
+
+    return (fib_table->ft_src_route_counts[source]);
+}
+
+u8*
+format_fib_table_name (u8* s, va_list ap)
+{
+    fib_node_index_t fib_index = va_arg(ap, fib_node_index_t);
+    fib_protocol_t proto = va_arg(ap, int); // int promotion
+    fib_table_t *fib_table;
+
+    fib_table = fib_table_get(fib_index, proto);
+
+    s = format(s, "%v", fib_table->ft_desc);
+
+    return (s);
+}
+
+void
+fib_table_flush (u32 fib_index,
+		 fib_protocol_t proto,
+		 fib_source_t source)
+{
+    // FIXME
+    ASSERT(0);
+}
diff --git a/src/vnet/fib/fib_table.h b/src/vnet/fib/fib_table.h
new file mode 100644
index 00000000..cfec516d
--- /dev/null
+++ b/src/vnet/fib/fib_table.h
@@ -0,0 +1,732 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __FIB_TABLE_H__
+#define __FIB_TABLE_H__
+
+#include <vnet/ip/ip.h>
+#include <vnet/adj/adj.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/mpls/mpls.h>
+#include <vnet/mpls/packet.h>
+
+/**
+ * @brief 
+ *   A protocol Independent FIB table
+ */
+typedef struct fib_table_t_
+{
+    /**
+     * A union of the protocol specific FIBs that provide the
+     * underlying LPM mechanism.
+     * This element is first in the struct so that it is in the
+     * first cache line.
+     */
+    union {
+	ip4_fib_t v4;
+	ip6_fib_t v6;
+	mpls_fib_t mpls;
+    };
+
+    /**
+     * Which protocol this table serves. Used to switch on the union above.
+     */
+    fib_protocol_t ft_proto;
+
+    /**
+     * number of locks on the table
+     */
+    u16 ft_locks;
+
+    /**
+     * Table ID (hash key) for this FIB.
+     */
+    u32 ft_table_id;
+
+    /**
+     * Index into FIB vector.
+     */
+    fib_node_index_t ft_index;
+
+    /**
+     * flow hash configuration
+     */
+    u32 ft_flow_hash_config;
+
+    /**
+     * Per-source route counters
+     */
+    u32 ft_src_route_counts[FIB_SOURCE_MAX];
+
+    /**
+     * Total route counters
+     */
+    u32 ft_total_route_counts;
+
+    /**
+     * Table description
+     */
+    u8* ft_desc;
+} fib_table_t;
+
+/**
+ * @brief
+ *  Format the description/name of the table
+ */
+extern u8* format_fib_table_name(u8* s, va_list ap);
+
+/**
+ * @brief
+ *  Perfom a longest prefix match in the non-forwarding table
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix to lookup
+ *
+ * @return
+ *  The index of the fib_entry_t for the best match, which may be the default route
+ */
+extern fib_node_index_t fib_table_lookup(u32 fib_index,
+					 const fib_prefix_t *prefix);
+
+/**
+ * @brief
+ *  Perfom an exact match in the non-forwarding table
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix to lookup
+ *
+ * @return
+ *  The index of the fib_entry_t for the exact match, or INVALID
+ *  is there is no match.
+ */
+extern fib_node_index_t fib_table_lookup_exact_match(u32 fib_index,
+						     const fib_prefix_t *prefix);
+
+/**
+ * @brief
+ *  Get the less specific (covering) prefix
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix to lookup
+ *
+ * @return
+ *  The index of the less specific fib_entry_t.
+ */
+extern fib_node_index_t fib_table_get_less_specific(u32 fib_index,
+						    const fib_prefix_t *prefix);
+
+/**
+ * @brief
+ *  Add a 'special' entry to the FIB that links to the adj passed
+ *  A special entry is an entry that the FIB is not expect to resolve
+ *  via the usual mechanisms (i.e. recurisve or neighbour adj DB lookup).
+ *  Instead the client/source provides the adj to link to.
+ *  This add is reference counting per-source. So n 'removes' are required
+ *  for n 'adds', if the entry is no longer required.
+ *
+  * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix to add
+ *
+ * @param source
+ *  The ID of the client/source adding the entry.
+ *
+ * @param flags
+ *  Flags for the entry.
+ *
+ * @param adj_index
+ *  The adjacency to link to.
+ *
+ * @return
+ *  the index of the fib_entry_t that is created (or exists already).
+ */
+extern fib_node_index_t fib_table_entry_special_add(u32 fib_index,
+						    const fib_prefix_t *prefix,
+						    fib_source_t source,
+						    fib_entry_flag_t flags,
+						    adj_index_t adj_index);
+
+/**
+ * @brief
+ *  Add a 'special' entry to the FIB that links to the DPO passed
+ *  A special entry is an entry that the FIB is not expect to resolve
+ *  via the usual mechanisms (i.e. recurisve or neighbour adj DB lookup).
+ *  Instead the client/source provides the DPO to link to.
+ *  This add is reference counting per-source. So n 'removes' are required
+ *  for n 'adds', if the entry is no longer required.
+ *
+  * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix to add
+ *
+ * @param source
+ *  The ID of the client/source adding the entry.
+ *
+ * @param flags
+ *  Flags for the entry.
+ *
+ * @param dpo
+ *  The DPO to link to.
+ *
+ * @return
+ *  the index of the fib_entry_t that is created (or existed already).
+ */
+extern fib_node_index_t fib_table_entry_special_dpo_add(u32 fib_index,
+                                                        const fib_prefix_t *prefix,
+                                                        fib_source_t source,
+                                                        fib_entry_flag_t stype,
+                                                        const dpo_id_t *dpo);
+
+/**
+ * @brief
+ *  Update a 'special' entry to the FIB that links to the DPO passed
+ *  A special entry is an entry that the FIB is not expect to resolve
+ *  via the usual mechanisms (i.e. recurisve or neighbour adj DB lookup).
+ *  Instead the client/source provides the DPO to link to.
+ *  Special entries are add/remove reference counted per-source. So n
+ * 'removes' are required for n 'adds', if the entry is no longer required.
+ *  An 'update' is an 'add' if no 'add' has already been called, otherwise an 'add'
+ * is therefore assumed to act on the reference instance of that add.
+ *
+ * @param fib_entry_index
+ *  The index of the FIB entry to update
+ *
+ * @param source
+ *  The ID of the client/source adding the entry.
+ *
+ * @param flags
+ *  Flags for the entry.
+ *
+ * @param dpo
+ *  The DPO to link to.
+ *
+ * @return
+ *  the index of the fib_entry_t that is created (or existed already).
+ */
+extern fib_node_index_t fib_table_entry_special_dpo_update (u32 fib_index,
+							    const fib_prefix_t *prefix,
+							    fib_source_t source,
+							    fib_entry_flag_t stype,
+							    const dpo_id_t *dpo);
+
+/**
+ * @brief
+ *  Remove a 'special' entry from the FIB.
+ *  This add is reference counting per-source. So n 'removes' are required
+ *  for n 'adds', if the entry is no longer required.
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix to remove
+ *
+ * @param source
+ *  The ID of the client/source adding the entry.
+ *
+ */
+extern void fib_table_entry_special_remove(u32 fib_index,
+					   const fib_prefix_t *prefix,
+					   fib_source_t source);
+
+/**
+ * @brief
+ *  Add one path to an entry (aka route) in the FIB. If the entry does not
+ *  exist, it will be created.
+ * See the documentation for fib_route_path_t for more descirptions of
+ * the path parameters.
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix for the entry to add
+ *
+ * @param source
+ *  The ID of the client/source adding the entry.
+ *
+ * @param flags
+ *  Flags for the entry.
+ *
+ * @paran next_hop_proto
+ *  The protocol of the next hop. This cannot be derived in the event that
+ * the next hop is all zeros.
+ *
+ * @param next_hop
+ *  The address of the next-hop.
+ *
+ * @param sw_if_index
+ *  The index of the interface.
+ *
+ * @param next_hop_fib_index,
+ *  The fib index of the next-hop for recursive resolution
+ *
+ * @param next_hop_weight
+ *  [un]equal cost path weight
+ *
+ * @param  next_hop_label_stack
+ *  The path's out-going label stack. NULL is there is none.
+ *
+ * @param  pf
+ *  Flags for the path
+ *
+ * @return
+ *  the index of the fib_entry_t that is created (or existed already).
+ */
+extern fib_node_index_t fib_table_entry_path_add(u32 fib_index,
+						 const fib_prefix_t *prefix,
+						 fib_source_t source,
+						 fib_entry_flag_t flags,
+						 fib_protocol_t next_hop_proto,
+						 const ip46_address_t *next_hop,
+						 u32 next_hop_sw_if_index,
+						 u32 next_hop_fib_index,
+						 u32 next_hop_weight,
+						 mpls_label_t *next_hop_label_stack,
+						 fib_route_path_flags_t pf);
+/**
+ * @brief
+ *  Add n paths to an entry (aka route) in the FIB. If the entry does not
+ *  exist, it will be created.
+ * See the documentation for fib_route_path_t for more descirptions of
+ * the path parameters.
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix for the entry to add
+ *
+ * @param source
+ *  The ID of the client/source adding the entry.
+ *
+ * @param flags
+ *  Flags for the entry.
+ *
+ * @param rpaths
+ *  A vector of paths. Not const since they may be modified.
+ *
+ * @return
+ *  the index of the fib_entry_t that is created (or existed already).
+ */
+extern fib_node_index_t fib_table_entry_path_add2(u32 fib_index,
+						  const fib_prefix_t *prefix,
+						  fib_source_t source,
+						  fib_entry_flag_t flags,
+						  fib_route_path_t *rpath);
+
+/**
+ * @brief
+ * remove one path to an entry (aka route) in the FIB. If this is the entry's
+ * last path, then the entry will be removed, unless it has other sources.
+ * See the documentation for fib_route_path_t for more descirptions of
+ * the path parameters.
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix for the entry to add
+ *
+ * @param source
+ *  The ID of the client/source adding the entry.
+ *
+ * @paran next_hop_proto
+ *  The protocol of the next hop. This cannot be derived in the event that
+ * the next hop is all zeros.
+ *
+ * @param next_hop
+ *  The address of the next-hop.
+ *
+ * @param sw_if_index
+ *  The index of the interface.
+ *
+ * @param next_hop_fib_index,
+ *  The fib index of the next-hop for recursive resolution
+ *
+ * @param next_hop_weight
+ *  [un]equal cost path weight
+ *
+ * @param  pf
+ *  Flags for the path
+ */
+extern void fib_table_entry_path_remove(u32 fib_index,
+					const fib_prefix_t *prefix,
+					fib_source_t source,
+					fib_protocol_t next_hop_proto,
+					const ip46_address_t *next_hop,
+					u32 next_hop_sw_if_index,
+					u32 next_hop_fib_index,
+					u32 next_hop_weight,
+					fib_route_path_flags_t pf);
+
+/**
+ * @brief
+ * Remove n paths to an entry (aka route) in the FIB. If this is the entry's
+ * last path, then the entry will be removed, unless it has other sources.
+ * See the documentation for fib_route_path_t for more descirptions of
+ * the path parameters.
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix for the entry to add
+ *
+ * @param source
+ *  The ID of the client/source adding the entry.
+ *
+ * @param rpaths
+ *  A vector of paths.
+ */
+extern void fib_table_entry_path_remove2(u32 fib_index,
+					 const fib_prefix_t *prefix,
+					 fib_source_t source,
+					 fib_route_path_t *paths);
+
+/**
+ * @brief
+ *  Update an entry to have a new set of paths. If the entry does not
+ *  exist, it will be created.
+ * The difference between an 'path-add' and an update, is that path-add is
+ * an incremental addition of paths, whereas an update is a wholesale swap.
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix for the entry to add
+ *
+ * @param source
+ *  The ID of the client/source adding the entry.
+ *
+ * @param rpaths
+ *  A vector of paths. Not const since they may be modified.
+ *
+ * @return
+ *  the index of the fib_entry_t that is created (or existed already).
+ */
+extern fib_node_index_t fib_table_entry_update(u32 fib_index,
+					       const fib_prefix_t *prefix,
+					       fib_source_t source,
+					       fib_entry_flag_t flags,
+					       fib_route_path_t *paths);
+
+/**
+ * @brief
+ *  Update the entry to have just one path. If the entry does not
+ *  exist, it will be created.
+ * See the documentation for fib_route_path_t for more descirptions of
+ * the path parameters.
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix for the entry to add
+ *
+ * @param source
+ *  The ID of the client/source adding the entry.
+ *
+ * @param flags
+ *  Flags for the entry.
+ *
+ * @paran next_hop_proto
+ *  The protocol of the next hop. This cannot be derived in the event that
+ * the next hop is all zeros.
+ *
+ * @param next_hop
+ *  The address of the next-hop.
+ *
+ * @param sw_if_index
+ *  The index of the interface.
+ *
+ * @param next_hop_fib_index,
+ *  The fib index of the next-hop for recursive resolution
+ *
+ * @param next_hop_weight
+ *  [un]equal cost path weight
+ *
+ * @param  next_hop_label_stack
+ *  The path's out-going label stack. NULL is there is none.
+ *
+ * @param  pf
+ *  Flags for the path
+ *
+ * @return
+ *  the index of the fib_entry_t that is created (or existed already).
+ */
+extern fib_node_index_t fib_table_entry_update_one_path(u32 fib_index,
+							const fib_prefix_t *prefix,
+							fib_source_t source,
+							fib_entry_flag_t flags,
+							fib_protocol_t next_hop_proto,
+							const ip46_address_t *next_hop,
+							u32 next_hop_sw_if_index,
+							u32 next_hop_fib_index,
+							u32 next_hop_weight,
+							mpls_label_t *next_hop_label_stack,
+							fib_route_path_flags_t pf);
+
+/**
+ * @brief
+ *  Add a MPLS local label for the prefix/route. If the entry does not
+ *  exist, it will be created. In theory more than one local label can be
+ *  added, but this is not yet supported.
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix for the entry to which to add the label
+ *
+ * @param label
+ *  The MPLS label to add
+ *
+ * @return
+ *  the index of the fib_entry_t that is created (or existed already).
+ */
+extern fib_node_index_t fib_table_entry_local_label_add(u32 fib_index,
+							const fib_prefix_t *prefix,
+							mpls_label_t label);
+/**
+ * @brief
+ *  remove a MPLS local label for the prefix/route.
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix for the entry to which to add the label
+ *
+ * @param label
+ *  The MPLS label to add
+ */
+extern void fib_table_entry_local_label_remove(u32 fib_index,
+					       const fib_prefix_t *prefix,
+					       mpls_label_t label);
+
+/**
+ * @brief
+ *  Delete a FIB entry. If the entry has no more sources, then it is
+ * removed from the table.
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @param prefix
+ *  The prefix for the entry to remove
+ *
+ * @param source
+ *  The ID of the client/source adding the entry.
+ */
+extern void fib_table_entry_delete(u32 fib_index,
+				   const fib_prefix_t *prefix,
+				   fib_source_t source);
+
+/**
+ * @brief
+ *  Delete a FIB entry. If the entry has no more sources, then it is
+ * removed from the table.
+ *
+ * @param entry_index
+ *  The index of the FIB entry
+ *
+ * @param source
+ *  The ID of the client/source adding the entry.
+ */
+extern void fib_table_entry_delete_index(fib_node_index_t entry_index,
+					 fib_source_t source);
+
+/**
+ * @brief
+ *  Flush all entries from a table for the source
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @paran proto
+ *  The protocol of the entries in the table
+ *
+ * @param source
+ *  the source to flush
+ */
+extern void fib_table_flush(u32 fib_index,
+			    fib_protocol_t proto,
+			    fib_source_t source);
+
+/**
+ * @brief
+ *  Get the index of the FIB bound to the interface
+ *
+ * @paran proto
+ *  The protocol of the FIB (and thus the entries therein)
+ *
+ * @param sw_if_index
+ *  The interface index
+ *
+ * @return fib_index
+ *  The index of the FIB
+ */
+extern u32 fib_table_get_index_for_sw_if_index(fib_protocol_t proto,
+					       u32 sw_if_index);
+
+/**
+ * @brief
+ *  Get the Table-ID of the FIB bound to the interface
+ *
+ * @paran proto
+ *  The protocol of the FIB (and thus the entries therein)
+ *
+ * @param sw_if_index
+ *  The interface index
+ *
+ * @return fib_index
+ *  The tableID of the FIB
+ */
+extern u32 fib_table_get_table_id_for_sw_if_index(fib_protocol_t proto,
+						  u32 sw_if_index);
+
+/**
+ * @brief
+ *  Get the index of the FIB for a Table-ID. This DOES NOT create the
+ * FIB if it does not exist.
+ *
+ * @paran proto
+ *  The protocol of the FIB (and thus the entries therein)
+ *
+ * @param table-id
+ *  The Table-ID
+ *
+ * @return fib_index
+ *  The index of the FIB, which may be INVALID.
+ */
+extern u32 fib_table_find(fib_protocol_t proto, u32 table_id);
+
+
+/**
+ * @brief
+ *  Get the index of the FIB for a Table-ID. This DOES create the
+ * FIB if it does not exist.
+ *
+ * @paran proto
+ *  The protocol of the FIB (and thus the entries therein)
+ *
+ * @param table-id
+ *  The Table-ID
+ *
+ * @return fib_index
+ *  The index of the FIB
+ */
+extern u32 fib_table_find_or_create_and_lock(fib_protocol_t proto,
+					     u32 table_id);
+
+/**
+ * @brief
+ *  Create a new table with no table ID. This means it does not get
+ * added to the hash-table and so can only be found by using the index returned.
+ *
+ * @paran proto
+ *  The protocol of the FIB (and thus the entries therein)
+ *
+ * @param fmt
+ *  A string to describe the table
+ *
+ * @return fib_index
+ *  The index of the FIB
+ */
+extern u32 fib_table_create_and_lock(fib_protocol_t proto,
+                                     const char *const fmt,
+                                     ...);
+
+/**
+ * @brief
+ *  Get the flow hash configured used by the table
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @paran proto
+ *  The protocol of the FIB (and thus the entries therein)
+ *
+ * @return The flow hash config
+ */
+extern flow_hash_config_t fib_table_get_flow_hash_config(u32 fib_index,
+							 fib_protocol_t proto);
+
+/**
+ * @brief
+ * Take a reference counting lock on the table
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @paran proto
+ *  The protocol of the FIB (and thus the entries therein)
+ */ 
+extern void fib_table_unlock(u32 fib_index,
+			     fib_protocol_t proto);
+
+/**
+ * @brief
+ * Release a reference counting lock on the table. When the last lock
+ * has gone. the FIB is deleted.
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @paran proto
+ *  The protocol of the FIB (and thus the entries therein)
+ */ 
+extern void fib_table_lock(u32 fib_index,
+			   fib_protocol_t proto);
+
+/**
+ * @brief
+ * Return the number of entries in the FIB added by a given source.
+ *
+ * @param fib_index
+ *  The index of the FIB
+ *
+ * @paran proto
+ *  The protocol of the FIB (and thus the entries therein)
+ *
+ * @return number of sourced entries.
+ */ 
+extern u32 fib_table_get_num_entries(u32 fib_index,
+				     fib_protocol_t proto,
+				     fib_source_t source);
+
+/**
+ * @brief
+ * Get a pointer to a FIB table
+ */
+extern fib_table_t *fib_table_get(fib_node_index_t index,
+				  fib_protocol_t proto);
+
+#endif
diff --git a/src/vnet/fib/fib_test.c b/src/vnet/fib/fib_test.c
new file mode 100644
index 00000000..5083db26
--- /dev/null
+++ b/src/vnet/fib/fib_test.c
@@ -0,0 +1,7112 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/mpls_fib.h>
+#include <vnet/adj/adj.h>
+#include <vnet/dpo/load_balance.h>
+#include <vnet/dpo/load_balance_map.h>
+#include <vnet/dpo/mpls_label_dpo.h>
+#include <vnet/dpo/lookup_dpo.h>
+#include <vnet/dpo/drop_dpo.h>
+#include <vnet/dpo/receive_dpo.h>
+#include <vnet/dpo/ip_null_dpo.h>
+
+#include <vnet/mpls/mpls.h>
+
+#include <vnet/fib/fib_path_list.h>
+#include <vnet/fib/fib_entry_src.h>
+#include <vnet/fib/fib_walk.h>
+#include <vnet/fib/fib_node_list.h>
+#include <vnet/fib/fib_urpf_list.h>
+
+#define FIB_TEST_I(_cond, _comment, _args...)			\
+({								\
+    int _evald = (_cond);					\
+    if (!(_evald)) {						\
+	fformat(stderr, "FAIL:%d: " _comment "\n",		\
+		__LINE__, ##_args);				\
+    } else {							\
+	fformat(stderr, "PASS:%d: " _comment "\n",		\
+		__LINE__, ##_args);				\
+    }								\
+    _evald;							\
+})
+#define FIB_TEST(_cond, _comment, _args...)			\
+{								\
+    if (!FIB_TEST_I(_cond, _comment, ##_args)) {		\
+	return 1;                                               \
+	ASSERT(!("FAIL: " _comment));				\
+    }								\
+}
+
+/**
+ * A 'i'm not fussed is this is not efficient' store of test data
+ */
+typedef struct test_main_t_ {
+    /**
+     * HW if indicies
+     */
+    u32 hw_if_indicies[4];
+    /**
+     * HW interfaces
+     */
+    vnet_hw_interface_t * hw[4];
+
+} test_main_t;
+static test_main_t test_main;
+
+/* fake ethernet device class, distinct from "fake-ethX" */
+static u8 * format_test_interface_name (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  return format (s, "test-eth%d", dev_instance);
+}
+
+static uword dummy_interface_tx (vlib_main_t * vm,
+				 vlib_node_runtime_t * node,
+				 vlib_frame_t * frame)
+{
+  clib_warning ("you shouldn't be here, leaking buffers...");
+  return frame->n_vectors;
+}
+
+static clib_error_t *
+test_interface_admin_up_down (vnet_main_t * vnm,
+                              u32 hw_if_index,
+                              u32 flags)
+{
+  u32 hw_flags = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ?
+    VNET_HW_INTERFACE_FLAG_LINK_UP : 0;
+  vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
+  return 0;
+}
+
+VNET_DEVICE_CLASS (test_interface_device_class,static) = {
+  .name = "Test interface",
+  .format_device_name = format_test_interface_name,
+  .tx_function = dummy_interface_tx,
+  .admin_up_down_function = test_interface_admin_up_down,
+};
+
+static u8 *hw_address;
+
+static int
+fib_test_mk_intf (u32 ninterfaces)
+{
+    clib_error_t * error = NULL;
+    test_main_t *tm = &test_main;
+    u8 byte;
+    u32 i;
+
+    ASSERT(ninterfaces <= ARRAY_LEN(tm->hw_if_indicies));
+
+    for (i=0; i<6; i++)
+    {
+	byte = 0xd0+i;
+	vec_add1(hw_address, byte);
+    }
+
+    for (i = 0; i < ninterfaces; i++)
+    {
+	hw_address[5] = i;
+
+	error = ethernet_register_interface(vnet_get_main(),
+                                            test_interface_device_class.index,
+					    i /* instance */,
+					    hw_address,
+					    &tm->hw_if_indicies[i], 
+					    /* flag change */ 0);
+
+	FIB_TEST((NULL == error), "ADD interface %d", i);
+      
+        error = vnet_hw_interface_set_flags(vnet_get_main(),
+                                            tm->hw_if_indicies[i],
+                                            VNET_HW_INTERFACE_FLAG_LINK_UP);
+        tm->hw[i] = vnet_get_hw_interface(vnet_get_main(),
+					  tm->hw_if_indicies[i]);
+	vec_validate (ip4_main.fib_index_by_sw_if_index,
+                      tm->hw[i]->sw_if_index);
+	vec_validate (ip6_main.fib_index_by_sw_if_index,
+                      tm->hw[i]->sw_if_index);
+	ip4_main.fib_index_by_sw_if_index[tm->hw[i]->sw_if_index] = 0;
+	ip6_main.fib_index_by_sw_if_index[tm->hw[i]->sw_if_index] = 0;
+
+	error = vnet_sw_interface_set_flags(vnet_get_main(),
+					    tm->hw[i]->sw_if_index,
+					    VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+	FIB_TEST((NULL == error), "UP interface %d", i);
+    }
+    /*
+     * re-eval after the inevitable realloc
+     */
+    for (i = 0; i < ninterfaces; i++)
+    {
+	tm->hw[i] = vnet_get_hw_interface(vnet_get_main(),
+					  tm->hw_if_indicies[i]);
+    }
+
+    return (0);
+}
+
+#define FIB_TEST_REC_FORW(_rec_prefix, _via_prefix, _bucket)		\
+{                                                                       \
+    const dpo_id_t *_rec_dpo = fib_entry_contribute_ip_forwarding(      \
+        fib_table_lookup_exact_match(fib_index, (_rec_prefix)));        \
+    const dpo_id_t *_via_dpo = fib_entry_contribute_ip_forwarding(      \
+        fib_table_lookup(fib_index, (_via_prefix)));                    \
+    FIB_TEST(!dpo_cmp(_via_dpo,                                         \
+                      load_balance_get_bucket(_rec_dpo->dpoi_index,	\
+					      _bucket)),		\
+             "%U is recursive via %U",                                  \
+             format_fib_prefix, (_rec_prefix),                          \
+             format_fib_prefix, _via_prefix);                           \
+}
+
+#define FIB_TEST_LB_BUCKET_VIA_ADJ(_prefix, _bucket, _ai)               \
+{                                                                       \
+    const dpo_id_t *_dpo = fib_entry_contribute_ip_forwarding(          \
+        fib_table_lookup_exact_match(fib_index, (_prefix)));            \
+    const dpo_id_t *_dpo1 =                                             \
+        load_balance_get_bucket(_dpo->dpoi_index, _bucket);             \
+    FIB_TEST(DPO_ADJACENCY == _dpo1->dpoi_type, "type is %U",           \
+             format_dpo_type, _dpo1->dpoi_type);                        \
+    FIB_TEST((_ai == _dpo1->dpoi_index),                                \
+	     "%U bucket %d resolves via %U",                            \
+             format_fib_prefix, (_prefix),                              \
+             _bucket,                                                   \
+             format_dpo_id, _dpo1, 0);                                  \
+}
+
+#define FIB_TEST_RPF(_cond, _comment, _args...)			\
+{								\
+    if (!FIB_TEST_I(_cond, _comment, ##_args)) {		\
+	return (0);						\
+    }								\
+}
+
+static int
+fib_test_urpf_is_equal (fib_node_index_t fei,
+		       fib_forward_chain_type_t fct,
+		       u32 num, ...)
+{
+    dpo_id_t dpo = DPO_INVALID;
+    fib_urpf_list_t *urpf;
+    index_t ui;
+    va_list ap;
+    int ii;
+
+    va_start(ap, num);
+
+    fib_entry_contribute_forwarding(fei, fct, &dpo);
+    ui = load_balance_get_urpf(dpo.dpoi_index);
+
+    urpf = fib_urpf_list_get(ui);
+
+    FIB_TEST_RPF(num == vec_len(urpf->furpf_itfs),
+		 "RPF:%U len %d == %d",
+		 format_fib_urpf_list, ui,
+		 num, vec_len(urpf->furpf_itfs));
+    FIB_TEST_RPF(num == fib_urpf_check_size(ui),
+		 "RPF:%U check-size %d == %d",
+		 format_fib_urpf_list, ui,
+		 num, vec_len(urpf->furpf_itfs));
+
+    for (ii = 0; ii < num; ii++)
+    {
+	adj_index_t ai = va_arg(ap, adj_index_t);
+
+	FIB_TEST_RPF(ai == urpf->furpf_itfs[ii],
+		     "RPF:%d item:%d - %d == %d",
+		     ui, ii, ai, urpf->furpf_itfs[ii]);
+	FIB_TEST_RPF(fib_urpf_check(ui, ai),
+		     "RPF:%d %d found",
+		     ui, ai);
+    }
+
+    dpo_reset(&dpo);
+
+    va_end(ap);
+
+    return (1);
+}
+
+static u8*
+fib_test_build_rewrite (u8 *eth_addr)
+{
+    u8* rewrite = NULL;
+
+    vec_validate(rewrite, 13);
+
+    memcpy(rewrite, eth_addr, 6);
+    memcpy(rewrite+6, eth_addr, 6);
+
+    return (rewrite);
+}
+
+typedef enum fib_test_lb_bucket_type_t_ {
+    FT_LB_LABEL_O_ADJ,
+    FT_LB_LABEL_STACK_O_ADJ,
+    FT_LB_LABEL_O_LB,
+    FT_LB_O_LB,
+    FT_LB_SPECIAL,
+    FT_LB_ADJ,
+} fib_test_lb_bucket_type_t;
+
+typedef struct fib_test_lb_bucket_t_ {
+    fib_test_lb_bucket_type_t type;
+
+    union
+    {
+	struct
+	{
+	    mpls_eos_bit_t eos;
+	    mpls_label_t label;
+	    u8 ttl;
+	    adj_index_t adj;
+	} label_o_adj;
+	struct
+	{
+	    mpls_eos_bit_t eos;
+	    mpls_label_t label_stack[8];
+	    u8 label_stack_size;
+	    u8 ttl;
+	    adj_index_t adj;
+	} label_stack_o_adj;
+	struct
+	{
+	    mpls_eos_bit_t eos;
+	    mpls_label_t label;
+	    u8 ttl;
+	    index_t lb;
+	} label_o_lb;
+	struct
+	{
+	    index_t adj;
+	} adj;
+	struct
+	{
+	    index_t lb;
+	} lb;
+	struct
+	{
+	    index_t adj;
+	} special;
+    };
+} fib_test_lb_bucket_t;
+
+#define FIB_TEST_LB(_cond, _comment, _args...)			\
+{								\
+    if (!FIB_TEST_I(_cond, _comment, ##_args)) {		\
+	return (0);						\
+    }								\
+}
+
+static int
+fib_test_validate_lb_v (const load_balance_t *lb,
+			u16 n_buckets,
+			va_list ap)
+{
+    const dpo_id_t *dpo;
+    int bucket;
+
+    FIB_TEST_LB((n_buckets == lb->lb_n_buckets), "n_buckets = %d", lb->lb_n_buckets);
+
+    for (bucket = 0; bucket < n_buckets; bucket++)
+    {
+	const fib_test_lb_bucket_t *exp;
+
+	exp = va_arg(ap, fib_test_lb_bucket_t*);
+	dpo = load_balance_get_bucket_i(lb, bucket);
+
+	switch (exp->type)
+	{
+	case FT_LB_LABEL_STACK_O_ADJ:
+	    {
+		const mpls_label_dpo_t *mld;
+                mpls_label_t hdr;
+		u32 ii;
+
+		FIB_TEST_LB((DPO_MPLS_LABEL == dpo->dpoi_type),
+			   "bucket %d stacks on %U",
+			   bucket,
+			   format_dpo_type, dpo->dpoi_type);
+	    
+		mld = mpls_label_dpo_get(dpo->dpoi_index);
+
+		FIB_TEST_LB(exp->label_stack_o_adj.label_stack_size == mld->mld_n_labels,
+			    "label stack size",
+			    mld->mld_n_labels);
+
+		for (ii = 0; ii < mld->mld_n_labels; ii++)
+		{
+		    hdr = clib_net_to_host_u32(mld->mld_hdr[ii].label_exp_s_ttl);
+		    FIB_TEST_LB((vnet_mpls_uc_get_label(hdr) ==
+				 exp->label_stack_o_adj.label_stack[ii]),
+				"bucket %d stacks on label %d",
+				bucket,
+				exp->label_stack_o_adj.label_stack[ii]);
+
+		    if (ii == mld->mld_n_labels-1)
+		    {
+			FIB_TEST_LB((vnet_mpls_uc_get_s(hdr) ==
+				     exp->label_o_adj.eos),
+				    "bucket %d stacks on label %d %U!=%U",
+				    bucket,
+				    exp->label_stack_o_adj.label_stack[ii],
+				    format_mpls_eos_bit, exp->label_o_adj.eos,
+				    format_mpls_eos_bit, vnet_mpls_uc_get_s(hdr));
+		    }
+		    else
+		    {
+			FIB_TEST_LB((vnet_mpls_uc_get_s(hdr) == MPLS_NON_EOS),
+				    "bucket %d stacks on label %d %U",
+				    bucket,
+				    exp->label_stack_o_adj.label_stack[ii],
+				    format_mpls_eos_bit, vnet_mpls_uc_get_s(hdr));
+		    }
+		}
+
+		FIB_TEST_LB((DPO_ADJACENCY_INCOMPLETE == mld->mld_dpo.dpoi_type),
+			    "bucket %d label stacks on %U",
+			    bucket,
+			    format_dpo_type, mld->mld_dpo.dpoi_type);
+
+		FIB_TEST_LB((exp->label_stack_o_adj.adj == mld->mld_dpo.dpoi_index),
+			    "bucket %d label stacks on adj %d",
+			    bucket,
+			    exp->label_stack_o_adj.adj);
+	    }
+	    break;
+	case FT_LB_LABEL_O_ADJ:
+	    {
+		const mpls_label_dpo_t *mld;
+                mpls_label_t hdr;
+		FIB_TEST_LB((DPO_MPLS_LABEL == dpo->dpoi_type),
+			   "bucket %d stacks on %U",
+			   bucket,
+			   format_dpo_type, dpo->dpoi_type);
+	    
+		mld = mpls_label_dpo_get(dpo->dpoi_index);
+                hdr = clib_net_to_host_u32(mld->mld_hdr[0].label_exp_s_ttl);
+
+		FIB_TEST_LB((vnet_mpls_uc_get_label(hdr) ==
+			     exp->label_o_adj.label),
+			    "bucket %d stacks on label %d",
+			    bucket,
+			    exp->label_o_adj.label);
+
+		FIB_TEST_LB((vnet_mpls_uc_get_s(hdr) ==
+			     exp->label_o_adj.eos),
+			    "bucket %d stacks on label %d %U",
+			    bucket,
+			    exp->label_o_adj.label,
+			    format_mpls_eos_bit, exp->label_o_adj.eos);
+
+		FIB_TEST_LB((DPO_ADJACENCY_INCOMPLETE == mld->mld_dpo.dpoi_type),
+			    "bucket %d label stacks on %U",
+			    bucket,
+			    format_dpo_type, mld->mld_dpo.dpoi_type);
+
+		FIB_TEST_LB((exp->label_o_adj.adj == mld->mld_dpo.dpoi_index),
+			    "bucket %d label stacks on adj %d",
+			    bucket,
+			    exp->label_o_adj.adj);
+	    }
+	    break;
+	case FT_LB_LABEL_O_LB:
+	    {
+		const mpls_label_dpo_t *mld;
+                mpls_label_t hdr;
+
+		FIB_TEST_LB((DPO_MPLS_LABEL == dpo->dpoi_type),
+			   "bucket %d stacks on %U",
+			   bucket,
+			   format_dpo_type, dpo->dpoi_type);
+	    
+		mld = mpls_label_dpo_get(dpo->dpoi_index);
+                hdr = clib_net_to_host_u32(mld->mld_hdr[0].label_exp_s_ttl);
+
+		FIB_TEST_LB(1 == mld->mld_n_labels, "label stack size",
+			    mld->mld_n_labels);
+		FIB_TEST_LB((vnet_mpls_uc_get_label(hdr) ==
+			     exp->label_o_lb.label),
+			    "bucket %d stacks on label %d",
+			    bucket,
+			    exp->label_o_lb.label);
+
+		FIB_TEST_LB((vnet_mpls_uc_get_s(hdr) ==
+			     exp->label_o_lb.eos),
+			    "bucket %d stacks on label %d %U",
+			    bucket,
+			    exp->label_o_lb.label,
+			    format_mpls_eos_bit, exp->label_o_lb.eos);
+
+		FIB_TEST_LB((DPO_LOAD_BALANCE == mld->mld_dpo.dpoi_type),
+			    "bucket %d label stacks on %U",
+			    bucket,
+			    format_dpo_type, mld->mld_dpo.dpoi_type);
+
+		FIB_TEST_LB((exp->label_o_lb.lb == mld->mld_dpo.dpoi_index),
+			    "bucket %d label stacks on LB %d",
+			    bucket,
+			    exp->label_o_lb.lb);
+	    }
+	    break;
+	case FT_LB_ADJ:
+	    FIB_TEST_I(((DPO_ADJACENCY == dpo->dpoi_type) ||
+			(DPO_ADJACENCY_INCOMPLETE == dpo->dpoi_type)),
+		       "bucket %d stacks on %U",
+		       bucket,
+		       format_dpo_type, dpo->dpoi_type);
+	    FIB_TEST_LB((exp->adj.adj == dpo->dpoi_index),
+			"bucket %d stacks on adj %d",
+			bucket,
+			exp->adj.adj);
+	    break;
+	case FT_LB_O_LB:
+	    FIB_TEST_I((DPO_LOAD_BALANCE == dpo->dpoi_type),
+                       "bucket %d stacks on %U",
+                       bucket,
+                       format_dpo_type, dpo->dpoi_type);
+	    FIB_TEST_LB((exp->lb.lb == dpo->dpoi_index),
+			"bucket %d stacks on lb %d",
+			bucket,
+			exp->lb.lb);
+	    break;
+	case FT_LB_SPECIAL:
+	    FIB_TEST_I((DPO_DROP == dpo->dpoi_type),
+		       "bucket %d stacks on %U",
+		       bucket,
+		       format_dpo_type, dpo->dpoi_type);
+	    FIB_TEST_LB((exp->special.adj == dpo->dpoi_index),
+			"bucket %d stacks on drop %d",
+			bucket,
+			exp->special.adj);
+	    break;
+	}
+    }
+    return (!0);
+}
+
+static int
+fib_test_validate_entry (fib_node_index_t fei,
+			 fib_forward_chain_type_t fct,
+			 u16 n_buckets,
+			 ...)
+{
+    dpo_id_t dpo = DPO_INVALID;
+    const load_balance_t *lb;
+    fib_prefix_t pfx;
+    index_t fw_lbi;
+    u32 fib_index;
+    va_list ap;
+    int res;
+
+    va_start(ap, n_buckets);
+
+    fib_entry_get_prefix(fei, &pfx);
+    fib_index = fib_entry_get_fib_index(fei);
+    fib_entry_contribute_forwarding(fei, fct, &dpo);
+
+    FIB_TEST_LB((DPO_LOAD_BALANCE == dpo.dpoi_type),
+		"Entry links to %U",
+		format_dpo_type, dpo.dpoi_type);
+    lb = load_balance_get(dpo.dpoi_index);
+
+    res = fib_test_validate_lb_v(lb, n_buckets, ap);
+
+    /*
+     * ensure that the LB contributed by the entry is the
+     * same as the LB in the forwarding tables
+     */
+    if (fct == fib_entry_get_default_chain_type(fib_entry_get(fei)))
+    {
+        switch (pfx.fp_proto)
+        {
+        case FIB_PROTOCOL_IP4:
+            fw_lbi = ip4_fib_forwarding_lookup(fib_index, &pfx.fp_addr.ip4);
+            break;
+        case FIB_PROTOCOL_IP6:
+            fw_lbi = ip6_fib_table_fwding_lookup(&ip6_main, fib_index, &pfx.fp_addr.ip6);
+            break;
+        case FIB_PROTOCOL_MPLS:
+            {
+                mpls_unicast_header_t hdr = {
+                    .label_exp_s_ttl = 0,
+                };
+
+                vnet_mpls_uc_set_label(&hdr.label_exp_s_ttl, pfx.fp_label);
+                vnet_mpls_uc_set_s(&hdr.label_exp_s_ttl, pfx.fp_eos);
+                hdr.label_exp_s_ttl = clib_host_to_net_u32(hdr.label_exp_s_ttl);
+
+                fw_lbi = mpls_fib_table_forwarding_lookup(fib_index, &hdr);
+                break;
+            }
+        default:
+            fw_lbi = 0;
+        }
+        FIB_TEST_LB((fw_lbi == dpo.dpoi_index),
+                    "Contributed LB = FW LB: %U\n %U",
+                    format_load_balance, fw_lbi, 0,
+                    format_load_balance, dpo.dpoi_index, 0);
+    }
+
+    dpo_reset(&dpo);
+
+    va_end(ap);
+
+    return (res);
+}
+
+static int
+fib_test_v4 (void)
+{
+    /*
+     * In the default table check for the presence and correct forwarding
+     * of the special entries
+     */
+    fib_node_index_t dfrt, fei, ai, ai2, locked_ai, ai_01, ai_02, ai_03;
+    const dpo_id_t *dpo, *dpo1, *dpo2, *dpo_drop;
+    const ip_adjacency_t *adj;
+    const load_balance_t *lb;
+    test_main_t *tm;
+    u32 fib_index;
+    int ii;
+
+    /* via 10.10.10.1 */
+    ip46_address_t nh_10_10_10_1 = {
+	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
+    };
+    /* via 10.10.10.2 */
+    ip46_address_t nh_10_10_10_2 = {
+	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02),
+    };
+
+    tm = &test_main;
+
+    /* Find or create FIB table 11 */
+    fib_index = fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP4, 11);
+
+    for (ii = 0; ii < 4; ii++)
+    {
+	ip4_main.fib_index_by_sw_if_index[tm->hw[ii]->sw_if_index] = fib_index;
+    }
+
+    fib_prefix_t pfx_0_0_0_0_s_0 = {
+	.fp_len = 0,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4 = {
+		{0}
+	    },
+	},
+    };
+
+    fib_prefix_t pfx = {
+	.fp_len = 0,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4 = {
+		{0}
+	    },
+	},
+    };
+
+    dpo_drop = drop_dpo_get(DPO_PROTO_IP4);
+
+    dfrt = fib_table_lookup(fib_index, &pfx_0_0_0_0_s_0);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != dfrt), "default route present");
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(dfrt)),
+	     "Default route is DROP");
+
+    pfx.fp_len = 32;
+    fei = fib_table_lookup(fib_index, &pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "all zeros route present");
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "all 0s route is DROP");
+
+    pfx.fp_addr.ip4.as_u32 = clib_host_to_net_u32(0xffffffff);
+    pfx.fp_len = 32;
+    fei = fib_table_lookup(fib_index, &pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "all ones route present");
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "all 1s route is DROP");
+
+    pfx.fp_addr.ip4.as_u32 = clib_host_to_net_u32(0xe0000000);
+    pfx.fp_len = 8;
+    fei = fib_table_lookup(fib_index, &pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "all-mcast route present");
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "all-mcast route is DROP");
+
+    pfx.fp_addr.ip4.as_u32 = clib_host_to_net_u32(0xf0000000);
+    pfx.fp_len = 8;
+    fei = fib_table_lookup(fib_index, &pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "class-e route present");
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "class-e route is DROP");
+
+    /*
+     * at this stage there are 5 entries in the test FIB (plus 5 in the default),
+     * all of which are special sourced and so none of which share path-lists.
+     * There are also 6 entries, and 6 non-shared path-lists, in the v6 default
+     * table
+     */
+#define NBR (5+5+6)
+    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
+    FIB_TEST((NBR == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * add interface routes.
+     *  validate presence of /24 attached and /32 recieve.
+     *  test for the presence of the receive address in the glean and local adj
+     */
+    fib_prefix_t local_pfx = {
+	.fp_len = 24,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4 = {
+		.as_u32 = clib_host_to_net_u32(0x0a0a0a0a),
+	    },
+	},
+    };
+
+    fib_table_entry_update_one_path(fib_index, &local_pfx,
+				    FIB_SOURCE_INTERFACE,
+				    (FIB_ENTRY_FLAG_CONNECTED |
+				     FIB_ENTRY_FLAG_ATTACHED),
+				    FIB_PROTOCOL_IP4,
+				    NULL,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1, // weight
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached interface route present");
+    FIB_TEST(((FIB_ENTRY_FLAG_ATTACHED | FIB_ENTRY_FLAG_CONNECTED) ==
+	      fib_entry_get_flags(fei)),
+	     "Flags set on attached interface");
+
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != ai), "attached interface route adj present");
+    adj = adj_get(ai);
+    FIB_TEST((IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index),
+	     "attached interface adj is glean");
+    FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
+				    &adj->sub_type.glean.receive_addr)),
+	      "attached interface adj is receive ok");
+
+    local_pfx.fp_len = 32;
+    fib_table_entry_update_one_path(fib_index, &local_pfx,
+				    FIB_SOURCE_INTERFACE,
+				    (FIB_ENTRY_FLAG_CONNECTED |
+				     FIB_ENTRY_FLAG_LOCAL),
+				    FIB_PROTOCOL_IP4,
+				    NULL,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1, // weight
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &local_pfx);
+    FIB_TEST(((FIB_ENTRY_FLAG_LOCAL | FIB_ENTRY_FLAG_CONNECTED) ==
+	      fib_entry_get_flags(fei)),
+	     "Flags set on local interface");
+
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local interface route present");
+
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
+	     "RPF list for local length 0");
+    dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
+    FIB_TEST((DPO_RECEIVE == dpo->dpoi_type),
+	     "local interface adj is local");
+    receive_dpo_t *rd = receive_dpo_get(dpo->dpoi_index);
+
+    FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
+				    &rd->rd_addr)),
+	      "local interface adj is receive ok");
+
+    FIB_TEST((2 == fib_table_get_num_entries(fib_index,
+                                             FIB_PROTOCOL_IP4,
+                                             FIB_SOURCE_INTERFACE)),
+             "2 Interface Source'd prefixes");
+
+    /*
+     * +2 interface routes +2 non-shared path-lists
+     */
+    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
+    FIB_TEST((NBR+2 == fib_path_list_pool_size()), "path list pool size is%d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+2 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * Modify the default route to be via an adj not yet known.
+     * this sources the defalut route with the API source, which is
+     * a higher preference to the DEFAULT_ROUTE source
+     */
+    pfx.fp_addr.ip4.as_u32 = 0;
+    pfx.fp_len = 0;
+    fib_table_entry_path_add(fib_index, &pfx,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_1,
+			     tm->hw[0]->sw_if_index,
+			     ~0, // invalid fib index
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &pfx);
+    FIB_TEST((FIB_ENTRY_FLAG_NONE == fib_entry_get_flags(fei)),
+	     "Flags set on API route");
+
+    FIB_TEST((fei == dfrt), "default route same index");
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != ai), "default route adj present");
+    adj = adj_get(ai);
+    FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
+	     "adj is incomplete");
+    FIB_TEST((0 == ip46_address_cmp(&nh_10_10_10_1, &adj->sub_type.nbr.next_hop)),
+	      "adj nbr next-hop ok");
+    FIB_TEST((1 == fib_table_get_num_entries(fib_index,
+                                             FIB_PROTOCOL_IP4,
+                                             FIB_SOURCE_API)),
+             "1 API Source'd prefixes");
+
+    /*
+     * find the adj in the shared db
+     */
+    locked_ai = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
+				    VNET_LINK_IP4,
+				    &nh_10_10_10_1,
+				    tm->hw[0]->sw_if_index);
+    FIB_TEST((locked_ai == ai), "ADJ NBR DB find");
+    adj_unlock(locked_ai);
+
+    /*
+     * +1 shared path-list
+     */
+    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+3 == fib_path_list_pool_size()), "path list pool size is%d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+2 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * remove the API source from the default route. We expected
+     * the route to remain, sourced by DEFAULT_ROUTE, and hence a DROP
+     */
+    pfx.fp_addr.ip4.as_u32 = 0;
+    pfx.fp_len = 0;
+    fib_table_entry_path_remove(fib_index, &pfx,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_10_10_10_1,
+				tm->hw[0]->sw_if_index,
+				~0, // non-recursive path, so no FIB index
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx);
+
+    FIB_TEST((fei == dfrt), "default route same index");
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "Default route is DROP");
+
+    /*
+     * -1 shared-path-list
+     */
+    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
+    FIB_TEST((NBR+2 == fib_path_list_pool_size()), "path list pool size is%d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+2 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * Add an 2 ARP entry => a complete ADJ plus adj-fib.
+     */
+    fib_prefix_t pfx_10_10_10_1_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 10.10.10.1 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
+	},
+    };
+    fib_prefix_t pfx_10_10_10_2_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 10.10.10.2 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02),
+	},
+    };
+    fib_prefix_t pfx_11_11_11_11_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 11.11.11.11 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x0b0b0b0b),
+	},
+    };
+    u8 eth_addr[] = {
+	0xde, 0xde, 0xde, 0xba, 0xba, 0xba,
+    };
+
+    ip46_address_t nh_12_12_12_12 = {
+	.ip4.as_u32 = clib_host_to_net_u32(0x0c0c0c0c),
+    };
+    adj_index_t ai_12_12_12_12;
+
+    /*
+     * Add a route via an incomplete ADJ. then complete the ADJ
+     * Expect the route LB is updated to use complete adj type.
+     */
+    fei = fib_table_entry_update_one_path(fib_index,
+                                          &pfx_11_11_11_11_s_32,
+                                          FIB_SOURCE_API,
+                                          FIB_ENTRY_FLAG_ATTACHED,
+					  FIB_PROTOCOL_IP4,
+                                          &pfx_10_10_10_1_s_32.fp_addr,
+                                          tm->hw[0]->sw_if_index,
+                                          ~0, // invalid fib index
+                                          1,
+                                          NULL,
+                                          FIB_ROUTE_PATH_FLAG_NONE);
+
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    dpo1 = load_balance_get_bucket(dpo->dpoi_index, 0);
+    FIB_TEST(DPO_ADJACENCY_INCOMPLETE == dpo1->dpoi_type,
+             "11.11.11.11/32 via incomplete adj");
+
+    ai_01 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
+				VNET_LINK_IP4,
+				&pfx_10_10_10_1_s_32.fp_addr,
+				tm->hw[0]->sw_if_index);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != ai_01), "adj created");
+    adj = adj_get(ai_01);
+    FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
+	     "adj is incomplete");
+    FIB_TEST((0 == ip46_address_cmp(&pfx_10_10_10_1_s_32.fp_addr,
+				    &adj->sub_type.nbr.next_hop)),
+	      "adj nbr next-hop ok");
+
+    adj_nbr_update_rewrite(ai_01, ADJ_NBR_REWRITE_FLAG_COMPLETE,
+			   fib_test_build_rewrite(eth_addr));
+    FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
+	     "adj is complete");
+    FIB_TEST((0 == ip46_address_cmp(&pfx_10_10_10_1_s_32.fp_addr,
+				    &adj->sub_type.nbr.next_hop)),
+	      "adj nbr next-hop ok");
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "ADJ-FIB resolves via adj");
+
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    dpo1 = load_balance_get_bucket(dpo->dpoi_index, 0);
+    FIB_TEST(DPO_ADJACENCY == dpo1->dpoi_type,
+             "11.11.11.11/32 via complete adj");
+    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
+				    tm->hw[0]->sw_if_index),
+	     "RPF list for adj-fib contains adj");
+
+    ai_12_12_12_12 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
+					 VNET_LINK_IP4,
+					 &nh_12_12_12_12,
+					 tm->hw[1]->sw_if_index);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != ai_12_12_12_12), "adj created");
+    adj = adj_get(ai_12_12_12_12);
+    FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
+	     "adj is incomplete");
+    FIB_TEST((0 == ip46_address_cmp(&nh_12_12_12_12,
+				    &adj->sub_type.nbr.next_hop)),
+	      "adj nbr next-hop ok");
+    adj_nbr_update_rewrite(ai_12_12_12_12, ADJ_NBR_REWRITE_FLAG_COMPLETE,
+			   fib_test_build_rewrite(eth_addr));
+    FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
+	     "adj is complete");
+
+    /*
+     * add the adj fib
+     */
+    fei = fib_table_entry_update_one_path(fib_index,
+                                          &pfx_10_10_10_1_s_32,
+                                          FIB_SOURCE_ADJ,
+                                          FIB_ENTRY_FLAG_ATTACHED,
+					  FIB_PROTOCOL_IP4,
+                                          &pfx_10_10_10_1_s_32.fp_addr,
+                                          tm->hw[0]->sw_if_index,
+                                          ~0, // invalid fib index
+                                          1,
+                                          NULL,
+                                          FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST((FIB_ENTRY_FLAG_ATTACHED  == fib_entry_get_flags(fei)),
+	     "Flags set on adj-fib");
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "ADJ-FIB resolves via adj");
+
+    fib_table_entry_path_remove(fib_index,
+                                &pfx_11_11_11_11_s_32,
+                                FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+                                &pfx_10_10_10_1_s_32.fp_addr,
+                                tm->hw[0]->sw_if_index,
+                                ~0, // invalid fib index
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
+
+    eth_addr[5] = 0xb2;
+
+    ai_02 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
+				VNET_LINK_IP4,
+				&pfx_10_10_10_2_s_32.fp_addr,
+				tm->hw[0]->sw_if_index);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != ai_02), "adj created");
+    adj = adj_get(ai_02);
+    FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
+	     "adj is incomplete");
+    FIB_TEST((0 == ip46_address_cmp(&pfx_10_10_10_2_s_32.fp_addr,
+				    &adj->sub_type.nbr.next_hop)),
+	      "adj nbr next-hop ok");
+
+    adj_nbr_update_rewrite(ai_02, ADJ_NBR_REWRITE_FLAG_COMPLETE,
+			   fib_test_build_rewrite(eth_addr));
+    FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
+	     "adj is complete");
+    FIB_TEST((0 == ip46_address_cmp(&pfx_10_10_10_2_s_32.fp_addr,
+				    &adj->sub_type.nbr.next_hop)),
+	      "adj nbr next-hop ok");
+    FIB_TEST((ai_01 != ai_02), "ADJs are different");
+
+    fib_table_entry_update_one_path(fib_index,
+				    &pfx_10_10_10_2_s_32,
+				    FIB_SOURCE_ADJ,
+				    FIB_ENTRY_FLAG_ATTACHED,
+				    FIB_PROTOCOL_IP4,
+				    &pfx_10_10_10_2_s_32.fp_addr,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_10_10_10_2_s_32);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_02 == ai), "ADJ-FIB resolves via adj");
+
+    /*
+     * +2 adj-fibs, and their non-shared path-lists
+     */
+    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
+    FIB_TEST((NBR+4 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+4 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * Add 2 routes via the first ADJ. ensure path-list sharing
+     */
+    fib_prefix_t pfx_1_1_1_1_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 1.1.1.1/32 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x01010101),
+	},
+    };
+
+    fib_table_entry_path_add(fib_index,
+			     &pfx_1_1_1_1_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_1,
+			     tm->hw[0]->sw_if_index,
+			     ~0, // invalid fib index
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "1.1.1.1 resolves via 10.10.10.1");
+
+    /*
+     * +1 entry and a shared path-list
+     */
+    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB is empty");
+    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+5 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /* 1.1.2.0/24 */
+    fib_prefix_t pfx_1_1_2_0_s_24 = {
+	.fp_len = 24,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x01010200),
+	}
+    };
+
+    fib_table_entry_path_add(fib_index,
+			     &pfx_1_1_2_0_s_24,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_1,
+			     tm->hw[0]->sw_if_index,
+			     ~0, // invalid fib index
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &pfx_1_1_2_0_s_24);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "1.1.2.0/24 resolves via 10.10.10.1");
+
+    /*
+     * +1 entry only
+     */
+    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB is empty");
+    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+6 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * modify 1.1.2.0/24 to use multipath.
+     */
+    fib_table_entry_path_add(fib_index,
+			     &pfx_1_1_2_0_s_24,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_2,
+			     tm->hw[0]->sw_if_index,
+			     ~0, // invalid fib index
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &pfx_1_1_2_0_s_24);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				    1, tm->hw[0]->sw_if_index),
+	     "RPF list for 1.1.2.0/24 contains both adjs");
+
+    dpo1 = load_balance_get_bucket(dpo->dpoi_index, 0);
+    FIB_TEST(DPO_ADJACENCY == dpo1->dpoi_type, "type is %d", dpo1->dpoi_type);
+    FIB_TEST((ai_01 == dpo1->dpoi_index),
+	     "1.1.2.0/24 bucket 0 resolves via 10.10.10.1 (%d=%d)",
+             ai_01, dpo1->dpoi_index);
+
+    dpo1 = load_balance_get_bucket(dpo->dpoi_index, 1);
+    FIB_TEST(DPO_ADJACENCY == dpo1->dpoi_type, "type is %d", dpo1->dpoi_type);
+    FIB_TEST((ai_02 == dpo1->dpoi_index),
+	     "1.1.2.0/24 bucket 1 resolves via 10.10.10.2");
+
+    /*
+     * +1 shared-pathlist
+     */
+    FIB_TEST((2 == fib_path_list_db_size()),   "path list DB is empty");
+    FIB_TEST((NBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+6 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * revert the modify
+     */
+    fib_table_entry_path_remove(fib_index,
+				&pfx_1_1_2_0_s_24,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_10_10_10_2,
+				tm->hw[0]->sw_if_index,
+				~0,
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &pfx_1_1_2_0_s_24);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				   1, tm->hw[0]->sw_if_index),
+	     "RPF list for 1.1.2.0/24 contains one adj");
+
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "1.1.2.0/24 resolves via 10.10.10.1");
+
+    /*
+     * +1 shared-pathlist
+     */
+    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB is %d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+6 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * Add 2 recursive routes:
+     *   100.100.100.100/32 via 1.1.1.1/32  => the via entry is installed.
+     *   100.100.100.101/32 via 1.1.1.1/32  => the via entry is installed.
+     */
+    fib_prefix_t bgp_100_pfx = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 100.100.100.100/32 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x64646464),
+	},
+    };
+    /* via 1.1.1.1 */
+    ip46_address_t nh_1_1_1_1 = {
+	.ip4.as_u32 = clib_host_to_net_u32(0x01010101),
+    };
+
+    fei = fib_table_entry_path_add(fib_index,
+				   &bgp_100_pfx,
+				   FIB_SOURCE_API,
+				   FIB_ENTRY_FLAG_NONE,
+				   FIB_PROTOCOL_IP4,
+				   &nh_1_1_1_1,
+				   ~0, // no index provided.
+				   fib_index, // nexthop in same fib as route
+				   1,
+				   NULL,
+				   FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST_REC_FORW(&bgp_100_pfx, &pfx_1_1_1_1_s_32, 0);
+    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
+				    tm->hw[0]->sw_if_index),
+	     "RPF list for adj-fib contains adj");
+
+    /*
+     * +1 entry and +1 shared-path-list
+     */
+    FIB_TEST((2  == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    fib_prefix_t bgp_101_pfx = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 100.100.100.101/32 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x64646465),
+	},
+    };
+
+    fib_table_entry_path_add(fib_index,
+			     &bgp_101_pfx,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_1_1_1_1,
+			     ~0, // no index provided.
+			     fib_index, // nexthop in same fib as route
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST_REC_FORW(&bgp_101_pfx, &pfx_1_1_1_1_s_32, 0);
+    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
+				    tm->hw[0]->sw_if_index),
+	     "RPF list for adj-fib contains adj");
+
+    /*
+     * +1 entry, but the recursive path-list is shared.
+     */
+    FIB_TEST((2  == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+8 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * An EXCLUSIVE route; one where the user (me) provides the exclusive
+     * adjacency through which the route will resovle
+     */
+    fib_prefix_t ex_pfx = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 4.4.4.4/32 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x04040404),
+	},
+    };
+
+    fib_table_entry_special_add(fib_index,
+				&ex_pfx,
+				FIB_SOURCE_SPECIAL,
+				FIB_ENTRY_FLAG_EXCLUSIVE,
+				locked_ai);
+    fei = fib_table_lookup_exact_match(fib_index, &ex_pfx);
+    FIB_TEST((ai == fib_entry_get_adj(fei)),
+	     "Exclusive route links to user adj");
+
+    fib_table_entry_special_remove(fib_index,
+				   &ex_pfx,
+				   FIB_SOURCE_SPECIAL);
+    FIB_TEST(FIB_NODE_INDEX_INVALID ==
+	     fib_table_lookup_exact_match(fib_index, &ex_pfx),
+	     "Exclusive reoute removed");
+
+    /*
+     * An EXCLUSIVE route; one where the user (me) provides the exclusive
+     * adjacency through which the route will resovle
+     */
+    dpo_id_t ex_dpo = DPO_INVALID;
+
+    lookup_dpo_add_or_lock_w_fib_index(fib_index,
+                                       DPO_PROTO_IP4,
+                                       LOOKUP_INPUT_DST_ADDR,
+                                       LOOKUP_TABLE_FROM_CONFIG,
+                                       &ex_dpo);
+
+    fib_table_entry_special_dpo_add(fib_index,
+                                    &ex_pfx,
+                                    FIB_SOURCE_SPECIAL,
+                                    FIB_ENTRY_FLAG_EXCLUSIVE,
+                                    &ex_dpo);
+    fei = fib_table_lookup_exact_match(fib_index, &ex_pfx);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(!dpo_cmp(&ex_dpo, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "exclusive remote uses lookup DPO");
+
+    /*
+     * update the exclusive to use a different DPO
+     */
+    ip_null_dpo_add_and_lock(DPO_PROTO_IP4,
+			     IP_NULL_ACTION_SEND_ICMP_UNREACH,
+			     &ex_dpo);
+    fib_table_entry_special_dpo_update(fib_index,
+				       &ex_pfx,
+				       FIB_SOURCE_SPECIAL,
+				       FIB_ENTRY_FLAG_EXCLUSIVE,
+				       &ex_dpo);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(!dpo_cmp(&ex_dpo, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "exclusive remote uses now uses NULL DPO");
+
+    fib_table_entry_special_remove(fib_index,
+				   &ex_pfx,
+				   FIB_SOURCE_SPECIAL);
+    FIB_TEST(FIB_NODE_INDEX_INVALID ==
+	     fib_table_lookup_exact_match(fib_index, &ex_pfx),
+	     "Exclusive reoute removed");
+    dpo_reset(&ex_dpo);
+
+    /*
+     * Add a recursive route:
+     *   200.200.200.200/32 via 1.1.1.2/32  => the via entry is NOT installed.
+     */
+    fib_prefix_t bgp_200_pfx = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 200.200.200.200/32 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0xc8c8c8c8),
+	},
+    };
+    /* via 1.1.1.2 */
+    fib_prefix_t pfx_1_1_1_2_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x01010102),
+	},
+    };
+
+    fib_table_entry_path_add(fib_index,
+			     &bgp_200_pfx,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &pfx_1_1_1_2_s_32.fp_addr,
+			     ~0, // no index provided.
+			     fib_index, // nexthop in same fib as route
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST_REC_FORW(&bgp_200_pfx, &pfx_1_1_1_2_s_32, 0);
+
+    /*
+     * the adj should be recursive via drop, since the route resolves via
+     * the default route, which is itself a DROP 
+     */
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_2_s_32);
+    dpo1 = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(load_balance_is_drop(dpo1), "1.1.1.2/32 is drop");
+    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
+	     "RPF list for 1.1.1.2/32 contains 0 adjs");
+
+    /*
+     * +2 entry and +1 shared-path-list
+     */
+    FIB_TEST((3  == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+7 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+10 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * Unequal Cost load-balance. 3:1 ratio. fits in a 4 bucket LB
+     * The paths are sort by NH first. in this case the the path with greater
+     * weight is first in the set. This ordering is to test the RPF sort|uniq logic
+     */
+    fib_prefix_t pfx_1_2_3_4_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x01020304),
+	},
+    };
+    fib_table_entry_path_add(fib_index,
+			     &pfx_1_2_3_4_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+                             &nh_10_10_10_1,
+                             tm->hw[0]->sw_if_index,
+                             ~0,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_entry_path_add(fib_index,
+                                   &pfx_1_2_3_4_s_32,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+				   FIB_PROTOCOL_IP4,
+                                   &nh_12_12_12_12,
+                                   tm->hw[1]->sw_if_index,
+                                   ~0,
+                                   3,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "1.2.3.4/32 presnet");
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    lb = load_balance_get(dpo->dpoi_index);
+    FIB_TEST((lb->lb_n_buckets == 4),
+             "1.2.3.4/32 LB has %d bucket",
+             lb->lb_n_buckets);
+
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_4_s_32, 0, ai_12_12_12_12);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_4_s_32, 1, ai_12_12_12_12);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_4_s_32, 2, ai_12_12_12_12);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_4_s_32, 3, ai_01);
+
+    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 2,
+				    tm->hw[0]->sw_if_index,
+				    tm->hw[1]->sw_if_index),
+	     "RPF list for 1.2.3.4/32 contains both adjs");
+
+
+    /*
+     * Unequal Cost load-balance. 4:1 ratio.
+     *  fits in a 16 bucket LB with ratio 13:3
+     */
+    fib_prefix_t pfx_1_2_3_5_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x01020305),
+	},
+    };
+    fib_table_entry_path_add(fib_index,
+			     &pfx_1_2_3_5_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+                             &nh_12_12_12_12,
+                             tm->hw[1]->sw_if_index,
+                             ~0,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_entry_path_add(fib_index,
+                                   &pfx_1_2_3_5_s_32,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+				   FIB_PROTOCOL_IP4,
+                                   &nh_10_10_10_1,
+                                   tm->hw[0]->sw_if_index,
+                                   ~0,
+                                   4,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "1.2.3.5/32 presnet");
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    lb = load_balance_get(dpo->dpoi_index);
+    FIB_TEST((lb->lb_n_buckets == 16),
+             "1.2.3.5/32 LB has %d bucket",
+             lb->lb_n_buckets);
+
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 0, ai_01);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 1, ai_01);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 2, ai_01);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 3, ai_01);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 4, ai_01);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 5, ai_01);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 6, ai_01);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 7, ai_01);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 8, ai_01);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 9, ai_01);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 10, ai_01);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 11, ai_01);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 12, ai_01);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 13, ai_12_12_12_12);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 14, ai_12_12_12_12);
+    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 15, ai_12_12_12_12);
+
+    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 2,
+				    tm->hw[0]->sw_if_index,
+				    tm->hw[1]->sw_if_index),
+	     "RPF list for 1.2.3.4/32 contains both adjs");
+
+    /*
+     * Test UCMP with a large weight skew - this produces load-balance objects with large
+     * numbers of buckets to accommodate the skew. By updating said load-balances we are
+     * laso testing the LB in placce modify code when number of buckets is large.
+     */
+    fib_prefix_t pfx_6_6_6_6_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 1.1.1.1/32 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x06060606),
+	},
+    };
+    fib_test_lb_bucket_t ip_6_6_6_6_o_10_10_10_1 = {
+	.type = FT_LB_ADJ,
+	.adj = {
+	    .adj = ai_01,
+	},
+    };
+    fib_test_lb_bucket_t ip_6_6_6_6_o_10_10_10_2 = {
+        .type = FT_LB_ADJ,
+        .adj = {
+            .adj = ai_02,
+        },
+    };
+    fib_test_lb_bucket_t ip_6_6_6_6_o_12_12_12_12 = {
+        .type = FT_LB_ADJ,
+        .adj = {
+            .adj = ai_12_12_12_12,
+        },
+    };
+    fib_table_entry_update_one_path(fib_index,
+				    &pfx_6_6_6_6_s_32,
+				    FIB_SOURCE_API,
+				    FIB_ENTRY_FLAG_NONE,
+				    FIB_PROTOCOL_IP4,
+				    &nh_10_10_10_1,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    0,  // zero weigth
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
+    FIB_TEST(fib_test_validate_entry(fei,
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &ip_6_6_6_6_o_10_10_10_1),
+	     "6.6.6.6/32 via 10.10.10.1");
+
+    fib_table_entry_path_add(fib_index,
+                             &pfx_6_6_6_6_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             FIB_PROTOCOL_IP4,
+                             &nh_10_10_10_2,
+                             tm->hw[0]->sw_if_index,
+                             ~0, // invalid fib index
+                             100,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
+    FIB_TEST(fib_test_validate_entry(fei,
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     64,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_1),
+	     "6.6.6.6/32 via 10.10.10.1 and 10.10.10.2 in 63:1 ratio");
+
+    fib_table_entry_path_add(fib_index,
+                             &pfx_6_6_6_6_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             FIB_PROTOCOL_IP4,
+                             &nh_12_12_12_12,
+                             tm->hw[1]->sw_if_index,
+                             ~0, // invalid fib index
+                             100,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
+    FIB_TEST(fib_test_validate_entry(fei,
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     128,
+				     &ip_6_6_6_6_o_10_10_10_1,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12,
+				     &ip_6_6_6_6_o_12_12_12_12),
+	     "6.6.6.6/32 via 10.10.10.1 and 10.10.10.2 in 63:1 ratio");
+
+    fib_table_entry_path_remove(fib_index,
+                                &pfx_6_6_6_6_s_32,
+                                FIB_SOURCE_API,
+                                FIB_PROTOCOL_IP4,
+                                &nh_12_12_12_12,
+                                tm->hw[1]->sw_if_index,
+                                ~0, // invalid fib index
+                                100,
+                                FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
+    FIB_TEST(fib_test_validate_entry(fei,
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     64,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_2,
+				     &ip_6_6_6_6_o_10_10_10_1),
+	     "6.6.6.6/32 via 10.10.10.1 and 10.10.10.2 in 63:1 ratio");
+
+    fib_table_entry_path_remove(fib_index,
+                                &pfx_6_6_6_6_s_32,
+                                FIB_SOURCE_API,
+                                FIB_PROTOCOL_IP4,
+                                &nh_10_10_10_2,
+                                tm->hw[0]->sw_if_index,
+                                ~0, // invalid fib index
+                                100,
+                                FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
+    FIB_TEST(fib_test_validate_entry(fei,
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &ip_6_6_6_6_o_10_10_10_1),
+	     "6.6.6.6/32 via 10.10.10.1");
+
+    fib_table_entry_delete(fib_index, &pfx_6_6_6_6_s_32, FIB_SOURCE_API);
+
+    /*
+     * A recursive via the two unequal cost entries
+     */
+    fib_prefix_t bgp_44_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 200.200.200.201/32 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x44444444),
+	},
+    };
+    fei = fib_table_entry_path_add(fib_index,
+                                   &bgp_44_s_32,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+				   FIB_PROTOCOL_IP4,
+				   &pfx_1_2_3_4_s_32.fp_addr,
+                                   ~0,
+                                   fib_index,
+                                   1,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_entry_path_add(fib_index,
+                                   &bgp_44_s_32,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+				   FIB_PROTOCOL_IP4,
+				   &pfx_1_2_3_5_s_32.fp_addr,
+                                   ~0,
+                                   fib_index,
+                                   1,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST_REC_FORW(&bgp_44_s_32, &pfx_1_2_3_4_s_32, 0);
+    FIB_TEST_REC_FORW(&bgp_44_s_32, &pfx_1_2_3_5_s_32, 1);
+    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 2,
+				    tm->hw[0]->sw_if_index,
+				    tm->hw[1]->sw_if_index),
+	     "RPF list for 1.2.3.4/32 contains both adjs");
+
+    /*
+     * test the uRPF check functions
+     */
+    dpo_id_t dpo_44 = DPO_INVALID;
+    index_t urpfi;
+
+    fib_entry_contribute_forwarding(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, &dpo_44);
+    urpfi = load_balance_get_urpf(dpo_44.dpoi_index);
+
+    FIB_TEST(fib_urpf_check(urpfi, tm->hw[0]->sw_if_index),
+	     "uRPF check for 68.68.68.68/32 on %d OK",
+	     tm->hw[0]->sw_if_index);
+    FIB_TEST(fib_urpf_check(urpfi, tm->hw[1]->sw_if_index),
+	     "uRPF check for 68.68.68.68/32 on %d OK",
+	     tm->hw[1]->sw_if_index);
+    FIB_TEST(!fib_urpf_check(urpfi, 99),
+	     "uRPF check for 68.68.68.68/32 on 99 not-OK",
+	     99);
+    dpo_reset(&dpo_44);
+
+    fib_table_entry_delete(fib_index,
+                           &bgp_44_s_32,
+                           FIB_SOURCE_API);
+    fib_table_entry_delete(fib_index,
+                           &pfx_1_2_3_5_s_32,
+                           FIB_SOURCE_API);
+    fib_table_entry_delete(fib_index,
+                           &pfx_1_2_3_4_s_32,
+                           FIB_SOURCE_API);
+
+    /*
+     * Add a recursive route:
+     *   200.200.200.201/32 via 1.1.1.200/32  => the via entry is NOT installed.
+     */
+    fib_prefix_t bgp_201_pfx = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 200.200.200.201/32 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0xc8c8c8c9),
+	},
+    };
+    /* via 1.1.1.200 */
+    fib_prefix_t pfx_1_1_1_200_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x010101c8),
+	},
+    };
+
+    fib_table_entry_path_add(fib_index,
+			     &bgp_201_pfx,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &pfx_1_1_1_200_s_32.fp_addr,
+			     ~0, // no index provided.
+			     fib_index, // nexthop in same fib as route
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST_REC_FORW(&bgp_201_pfx, &pfx_1_1_1_200_s_32, 0);
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_200_s_32);
+    FIB_TEST((FIB_ENTRY_FLAG_NONE == fib_entry_get_flags(fei)),
+	     "Flags set on RR via non-attached");
+    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
+	     "RPF list for BGP route empty");
+
+    /*
+     * +2 entry (BGP & RR) and +1 shared-path-list
+     */
+    FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+12 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * insert a route that covers the missing 1.1.1.2/32. we epxect
+     * 200.200.200.200/32 and 200.200.200.201/32 to resolve through it.
+     */
+    fib_prefix_t pfx_1_1_1_0_s_24 = {
+	.fp_len = 24,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 1.1.1.0/24 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x01010100),
+	},
+    };
+
+    fib_table_entry_path_add(fib_index,
+			     &pfx_1_1_1_0_s_24,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_1,
+			     tm->hw[0]->sw_if_index,
+			     ~0, // invalid fib index
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_0_s_24);
+    dpo1 = fib_entry_contribute_ip_forwarding(fei);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "1.1.1.0/24 resolves via 10.10.10.1");
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_2_s_32);
+    dpo1 = fib_entry_contribute_ip_forwarding(fei);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "1.1.1.2/32 resolves via 10.10.10.1");
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_200_s_32);
+    dpo1 = fib_entry_contribute_ip_forwarding(fei);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "1.1.1.200/24 resolves via 10.10.10.1");
+
+    /*
+     * +1 entry. 1.1.1.1/32 already uses 10.10.10.1 so no new pah-list
+     */
+    FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+13 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * the recursive adj for 200.200.200.200 should be updated.
+     */
+    FIB_TEST_REC_FORW(&bgp_201_pfx, &pfx_1_1_1_200_s_32, 0);
+    FIB_TEST_REC_FORW(&bgp_200_pfx, &pfx_1_1_1_2_s_32, 0);
+    fei = fib_table_lookup(fib_index, &bgp_200_pfx);
+    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
+				    tm->hw[0]->sw_if_index),
+	     "RPF list for BGP route has itf index 0");
+
+    /*
+     * insert a more specific route than 1.1.1.0/24 that also covers the
+     * missing 1.1.1.2/32, but not 1.1.1.200/32. we epxect
+     * 200.200.200.200 to resolve through it.
+     */
+    fib_prefix_t pfx_1_1_1_0_s_28 = {
+	.fp_len = 28,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 1.1.1.0/24 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x01010100),
+	},
+    };
+
+    fib_table_entry_path_add(fib_index,
+			     &pfx_1_1_1_0_s_28,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_2,
+			     tm->hw[0]->sw_if_index,
+			     ~0, // invalid fib index
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_0_s_28);
+    dpo2 = fib_entry_contribute_ip_forwarding(fei);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_02 == ai), "1.1.1.0/24 resolves via 10.10.10.2");
+
+    /*
+     * +1 entry. +1 shared path-list
+     */
+    FIB_TEST((5  == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+9 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+14 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * the recursive adj for 200.200.200.200 should be updated.
+     * 200.200.200.201 remains unchanged.
+     */
+    FIB_TEST_REC_FORW(&bgp_201_pfx, &pfx_1_1_1_200_s_32, 0);
+    FIB_TEST_REC_FORW(&bgp_200_pfx, &pfx_1_1_1_2_s_32, 0);
+
+    /*
+     * remove this /28. 200.200.200.200/32 should revert back to via 1.1.1.0/24
+     */
+    fib_table_entry_path_remove(fib_index,
+				&pfx_1_1_1_0_s_28,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_10_10_10_2,
+				tm->hw[0]->sw_if_index,
+				~0,
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_28) == 
+	      FIB_NODE_INDEX_INVALID),
+	     "1.1.1.0/28 removed");
+    FIB_TEST((fib_table_lookup(fib_index, &pfx_1_1_1_0_s_28) == 
+	      fib_table_lookup(fib_index, &pfx_1_1_1_0_s_24)),
+	     "1.1.1.0/28 lookup via /24");
+    FIB_TEST_REC_FORW(&bgp_201_pfx, &pfx_1_1_1_200_s_32, 0);
+    FIB_TEST_REC_FORW(&bgp_200_pfx, &pfx_1_1_1_2_s_32, 0);
+
+    /*
+     * -1 entry. -1 shared path-list
+     */
+    FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+13 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * remove 1.1.1.0/24. 200.200.200.200/32 should revert back to via 0.0.0.0/0
+     */
+    fib_table_entry_path_remove(fib_index,
+				&pfx_1_1_1_0_s_24,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_10_10_10_1,
+				tm->hw[0]->sw_if_index,
+				~0,
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_24) == 
+	      FIB_NODE_INDEX_INVALID),
+	     "1.1.1.0/24 removed");
+
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_2_s_32);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "1.1.1.2/32 route is DROP");
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_200_s_32);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "1.1.1.200/32 route is DROP");
+
+    FIB_TEST_REC_FORW(&bgp_201_pfx, &pfx_1_1_1_200_s_32, 0);
+    FIB_TEST_REC_FORW(&bgp_200_pfx, &pfx_1_1_1_2_s_32, 0);
+
+    /*
+     * -1 entry
+     */
+    FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
+	fib_path_list_db_size());
+    FIB_TEST((NBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
+	fib_path_list_pool_size());
+    FIB_TEST((NBR+12 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * insert the missing 1.1.1.2/32
+     */
+    fei = fib_table_entry_path_add(fib_index,
+	                           &pfx_1_1_1_2_s_32,
+				   FIB_SOURCE_API,
+				   FIB_ENTRY_FLAG_NONE,
+				   FIB_PROTOCOL_IP4,
+				   &nh_10_10_10_1,
+				   tm->hw[0]->sw_if_index,
+				   ~0, // invalid fib index
+				   1,
+				   NULL,
+				   FIB_ROUTE_PATH_FLAG_NONE);
+    dpo1 = fib_entry_contribute_ip_forwarding(fei);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai = ai_01), "1.1.1.2/32 resolves via 10.10.10.1");
+
+    FIB_TEST_REC_FORW(&bgp_201_pfx, &pfx_1_1_1_200_s_32, 0);
+    FIB_TEST_REC_FORW(&bgp_200_pfx, &pfx_1_1_1_2_s_32, 0);
+
+    /*
+     * no change. 1.1.1.2/32 was already there RR sourced.
+     */
+    FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+12 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * remove 200.200.200.201/32 which does not have a valid via FIB
+     */
+    fib_table_entry_path_remove(fib_index,
+				&bgp_201_pfx,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&pfx_1_1_1_200_s_32.fp_addr,
+				~0, // no index provided.
+				fib_index,
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+
+    /*
+     * -2 entries (BGP and RR). -1 shared path-list;
+     */
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_201_pfx) == 
+	      FIB_NODE_INDEX_INVALID),
+	     "200.200.200.201/32 removed");
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_200_s_32) == 
+	      FIB_NODE_INDEX_INVALID),
+	     "1.1.1.200/32 removed");
+
+    FIB_TEST((3  == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+7 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+10 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * remove 200.200.200.200/32 which does have a valid via FIB
+     */
+    fib_table_entry_path_remove(fib_index,
+				&bgp_200_pfx,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&pfx_1_1_1_2_s_32.fp_addr,
+				~0, // no index provided.
+				fib_index,
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_200_pfx) == 
+	      FIB_NODE_INDEX_INVALID),
+	     "200.200.200.200/32 removed");
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_2_s_32) != 
+	      FIB_NODE_INDEX_INVALID),
+	     "1.1.1.2/32 still present");
+
+    /*
+     * -1 entry (BGP, the RR source is also API sourced). -1 shared path-list;
+     */
+    FIB_TEST((2  == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+9 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * A recursive prefix that has a 2 path  load-balance.
+     * It also shares a next-hop with other BGP prefixes and hence
+     * test the ref counting of RR sourced prefixes and 2 level LB.
+     */
+    const fib_prefix_t bgp_102 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 100.100.100.101/32 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x64646466),
+	},
+    };
+    fib_table_entry_path_add(fib_index,
+			     &bgp_102,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &pfx_1_1_1_1_s_32.fp_addr,
+			     ~0, // no index provided.
+			     fib_index, // same as route
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fib_table_entry_path_add(fib_index,
+			     &bgp_102,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &pfx_1_1_1_2_s_32.fp_addr,
+			     ~0, // no index provided.
+			     fib_index, // same as route's FIB
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &bgp_102);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "100.100.100.102/32 presnet");
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+
+    fei  = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_1_s_32);
+    dpo1 = fib_entry_contribute_ip_forwarding(fei);
+    fei  = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_2_s_32);
+    dpo2 = fib_entry_contribute_ip_forwarding(fei);
+
+    lb = load_balance_get(dpo->dpoi_index);
+    FIB_TEST((lb->lb_n_buckets == 2), "Recursive LB has %d bucket", lb->lb_n_buckets);
+    FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "First via 10.10.10.1");
+    FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo->dpoi_index, 1)),
+	     "Second via 10.10.10.1");
+
+    fib_table_entry_path_remove(fib_index,
+				&bgp_102,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&pfx_1_1_1_1_s_32.fp_addr,
+				~0, // no index provided.
+				fib_index, // same as route's FIB
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    fib_table_entry_path_remove(fib_index,
+				&bgp_102,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&pfx_1_1_1_2_s_32.fp_addr,
+				~0, // no index provided.
+				fib_index, // same as route's FIB
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &bgp_102);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "100.100.100.102/32 removed");
+
+    /*
+     * remove the remaining recursives
+     */
+    fib_table_entry_path_remove(fib_index,
+				&bgp_100_pfx,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&pfx_1_1_1_1_s_32.fp_addr,
+				~0, // no index provided.
+				fib_index, // same as route's FIB
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    fib_table_entry_path_remove(fib_index,
+				&bgp_101_pfx,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&pfx_1_1_1_1_s_32.fp_addr,
+				~0, // no index provided.
+				fib_index, // same as route's FIB
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_100_pfx) == 
+	      FIB_NODE_INDEX_INVALID),
+	     "100.100.100.100/32 removed");
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_101_pfx) == 
+	      FIB_NODE_INDEX_INVALID),
+	     "100.100.100.101/32 removed");
+
+    /*
+     * -2 entry (2*BGP, the RR source is also API sourced). -1 shared path-list;
+     */
+    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * Add a recursive route via a connected cover, using an adj-fib that does exist
+     */
+    fib_table_entry_path_add(fib_index,
+			     &bgp_200_pfx,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_1,
+			     ~0, // no index provided.
+			     fib_index, // Same as route's FIB
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+
+    /*
+     * +1 entry. +1 shared path-list (recursive via 10.10.10.1)
+     */
+    FIB_TEST((2  == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+8 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+
+    fei  = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32);
+    dpo1 = fib_entry_contribute_ip_forwarding(fei);
+
+    FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "200.200.200.200/32 is recursive via adj for 10.10.10.1");
+
+    FIB_TEST((FIB_ENTRY_FLAG_ATTACHED  == fib_entry_get_flags(fei)),
+	     "Flags set on RR via existing attached");
+
+    /*
+     * Add a recursive route via a connected cover, using and adj-fib that does
+     * not exist
+     */
+    ip46_address_t nh_10_10_10_3 = {
+	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a03),
+    };
+    fib_prefix_t pfx_10_10_10_3 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = nh_10_10_10_3,
+    };
+
+    fib_table_entry_path_add(fib_index,
+			     &bgp_201_pfx,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_3,
+			     ~0, // no index provided.
+			     fib_index,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+
+    /*
+     * +2 entries (BGP and RR). +1 shared path-list (recursive via 10.10.10.3) and
+     * one unshared non-recursive via 10.10.10.3
+     */
+    FIB_TEST((3  == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NBR+10 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    ai_03 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
+				VNET_LINK_IP4,
+				&nh_10_10_10_3,
+				tm->hw[0]->sw_if_index);
+
+    fei  = fib_table_lookup_exact_match(fib_index, &bgp_201_pfx);
+    dpo  = fib_entry_contribute_ip_forwarding(fei);
+    fei  = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_3);
+    dpo1 = fib_entry_contribute_ip_forwarding(fei);
+
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai == ai_03), "adj for 10.10.10.3/32 is via adj for 10.10.10.3");
+    FIB_TEST(((FIB_ENTRY_FLAG_ATTACHED | FIB_ENTRY_FLAG_CONNECTED) ==
+	      fib_entry_get_flags(fei)),
+	     "Flags set on RR via non-existing attached");
+
+    FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "adj for 200.200.200.200/32 is recursive via adj for 10.10.10.3");
+
+    adj_unlock(ai_03);
+
+    /*
+     * remove the recursives
+     */
+    fib_table_entry_path_remove(fib_index,
+    				&bgp_200_pfx,
+    				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+    				&nh_10_10_10_1,
+    				~0, // no index provided.
+				fib_index, // same as route's FIB
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    fib_table_entry_path_remove(fib_index,
+    				&bgp_201_pfx,
+    				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+    				&nh_10_10_10_3,
+    				~0, // no index provided.
+				fib_index, // same as route's FIB
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_201_pfx) ==
+    	      FIB_NODE_INDEX_INVALID),
+    	     "200.200.200.201/32 removed");
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_200_pfx) ==
+    	      FIB_NODE_INDEX_INVALID),
+    	     "200.200.200.200/32 removed");
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_3) ==
+    	      FIB_NODE_INDEX_INVALID),
+    	     "10.10.10.3/32 removed");
+
+    /*
+     * -3 entries (2*BGP and RR). -2 shared path-list (recursive via 10.10.10.3 &
+     *  10.10.10.1) and one unshared non-recursive via 10.10.10.3
+     */
+    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
+    	     fib_path_list_db_size());
+    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
+    	     fib_path_list_pool_size());
+    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
+    	     fib_entry_pool_size());
+
+
+    /*
+     * RECURSION LOOPS
+     *  Add 5.5.5.5/32 -> 5.5.5.6/32 -> 5.5.5.7/32 -> 5.5.5.5/32
+     */
+    fib_prefix_t pfx_5_5_5_5_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x05050505),
+	},
+    };
+    fib_prefix_t pfx_5_5_5_6_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x05050506),
+	},
+    };
+    fib_prefix_t pfx_5_5_5_7_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x05050507),
+	},
+    };
+
+    fib_table_entry_path_add(fib_index,
+			     &pfx_5_5_5_5_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &pfx_5_5_5_6_s_32.fp_addr,
+			     ~0, // no index provided.
+			     fib_index,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fib_table_entry_path_add(fib_index,
+			     &pfx_5_5_5_6_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &pfx_5_5_5_7_s_32.fp_addr,
+			     ~0, // no index provided.
+			     fib_index,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fib_table_entry_path_add(fib_index,
+			     &pfx_5_5_5_7_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &pfx_5_5_5_5_s_32.fp_addr,
+			     ~0, // no index provided.
+			     fib_index,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    /*
+     * +3 entries, +3 shared path-list
+     */
+    FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
+    	     fib_path_list_db_size());
+    FIB_TEST((NBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
+    	     fib_path_list_pool_size());
+    FIB_TEST((NBR+10 == fib_entry_pool_size()), "entry pool size is %d",
+    	     fib_entry_pool_size());
+
+    /*
+     * All the entries have only looped paths, so they are all drop
+     */
+    fei = fib_table_lookup(fib_index, &pfx_5_5_5_7_s_32);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "LB for 5.5.5.7/32 is via adj for DROP");
+    fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "LB for 5.5.5.5/32 is via adj for DROP");
+    fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "LB for 5.5.5.6/32 is via adj for DROP");
+
+    /*
+     * provide 5.5.5.6/32 with alternate path.
+     * this will allow only 5.5.5.6/32 to forward with this path, the others
+     * are still drop since the loop is still present.
+     */
+    fib_table_entry_path_add(fib_index,
+			     &pfx_5_5_5_6_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_1,
+			     tm->hw[0]->sw_if_index,
+			     ~0,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+
+
+    fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
+    dpo1 = fib_entry_contribute_ip_forwarding(fei);
+
+    lb = load_balance_get(dpo1->dpoi_index);
+    FIB_TEST((lb->lb_n_buckets == 1), "5.5.5.6 LB has %d bucket", lb->lb_n_buckets);
+
+    dpo2 = load_balance_get_bucket(dpo1->dpoi_index, 0);
+    FIB_TEST(DPO_ADJACENCY == dpo2->dpoi_type, "type is %d", dpo2->dpoi_type);
+    FIB_TEST((ai_01 == dpo2->dpoi_index),
+	     "5.5.5.6 bucket 0 resolves via 10.10.10.2");
+
+    fei = fib_table_lookup(fib_index, &pfx_5_5_5_7_s_32);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "LB for 5.5.5.7/32 is via adj for DROP");
+    fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "LB for 5.5.5.5/32 is via adj for DROP");
+
+    /*
+     * remove the alternate path for 5.5.5.6/32
+     * back to all drop
+     */
+    fib_table_entry_path_remove(fib_index,
+				&pfx_5_5_5_6_s_32,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_10_10_10_1,
+				tm->hw[0]->sw_if_index,
+				~0,
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_5_5_5_7_s_32);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "LB for 5.5.5.7/32 is via adj for DROP");
+    fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "LB for 5.5.5.5/32 is via adj for DROP");
+    fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "LB for 5.5.5.6/32 is via adj for DROP");
+
+    /*
+     * break the loop by giving 5.5.5.5/32 a new set of paths
+     * expect all to forward via this new path.
+     */
+    fib_table_entry_update_one_path(fib_index,
+				    &pfx_5_5_5_5_s_32,
+				    FIB_SOURCE_API,
+				    FIB_ENTRY_FLAG_NONE,
+				    FIB_PROTOCOL_IP4,
+				    &nh_10_10_10_1,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
+    dpo1 = fib_entry_contribute_ip_forwarding(fei);
+    lb = load_balance_get(dpo1->dpoi_index);
+    FIB_TEST((lb->lb_n_buckets == 1), "5.5.5.5 LB has %d bucket", lb->lb_n_buckets);
+
+    dpo2 = load_balance_get_bucket(dpo1->dpoi_index, 0);
+    FIB_TEST(DPO_ADJACENCY == dpo2->dpoi_type, "type is %d", dpo2->dpoi_type);
+    FIB_TEST((ai_01 == dpo2->dpoi_index),
+	     "5.5.5.5 bucket 0 resolves via 10.10.10.2");
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_5_5_5_7_s_32);
+    dpo2 = fib_entry_contribute_ip_forwarding(fei);
+
+    lb = load_balance_get(dpo2->dpoi_index);
+    FIB_TEST((lb->lb_n_buckets == 1), "Recursive LB has %d bucket", lb->lb_n_buckets);
+    FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo2->dpoi_index, 0)),
+	     "5.5.5.5.7 via 5.5.5.5");
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_5_5_5_6_s_32);
+    dpo1 = fib_entry_contribute_ip_forwarding(fei);
+
+    lb = load_balance_get(dpo1->dpoi_index);
+    FIB_TEST((lb->lb_n_buckets == 1), "Recursive LB has %d bucket", lb->lb_n_buckets);
+    FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo1->dpoi_index, 0)),
+	     "5.5.5.5.6 via 5.5.5.7");
+
+    /*
+     * revert back to the loop. so we can remove the prefixes with
+     * the loop intact
+     */
+    fib_table_entry_update_one_path(fib_index,
+				    &pfx_5_5_5_5_s_32,
+				    FIB_SOURCE_API,
+				    FIB_ENTRY_FLAG_NONE,
+				    FIB_PROTOCOL_IP4,
+				    &pfx_5_5_5_6_s_32.fp_addr,
+				    ~0, // no index provided.
+				    fib_index,
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_5_5_5_7_s_32);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "LB for 5.5.5.7/32 is via adj for DROP");
+    fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "LB for 5.5.5.5/32 is via adj for DROP");
+    fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "LB for 5.5.5.6/32 is via adj for DROP");
+
+    /*
+     * remove all the 5.5.5.x/32 prefixes
+     */
+    fib_table_entry_path_remove(fib_index,
+				&pfx_5_5_5_5_s_32,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&pfx_5_5_5_6_s_32.fp_addr,
+				~0, // no index provided.
+				fib_index, // same as route's FIB
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    fib_table_entry_path_remove(fib_index,
+				&pfx_5_5_5_6_s_32,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&pfx_5_5_5_7_s_32.fp_addr,
+				~0, // no index provided.
+				fib_index, // same as route's FIB
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    fib_table_entry_path_remove(fib_index,
+				&pfx_5_5_5_7_s_32,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&pfx_5_5_5_5_s_32.fp_addr,
+				~0, // no index provided.
+				fib_index, // same as route's FIB
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    fib_table_entry_path_remove(fib_index,
+				&pfx_5_5_5_6_s_32,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_10_10_10_2,
+				~0, // no index provided.
+				fib_index, // same as route's FIB
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+
+    /*
+     * -3 entries, -3 shared path-list
+     */
+    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
+    	     fib_path_list_db_size());
+    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
+    	     fib_path_list_pool_size());
+    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
+    	     fib_entry_pool_size());
+
+    /*
+     * Single level loop 5.5.5.5/32 via 5.5.5.5/32
+     */
+    fib_table_entry_path_add(fib_index,
+			     &pfx_5_5_5_6_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &pfx_5_5_5_6_s_32.fp_addr,
+			     ~0, // no index provided.
+			     fib_index,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+	     "1-level 5.5.5.6/32 loop is via adj for DROP");
+ 
+    fib_table_entry_path_remove(fib_index,
+				&pfx_5_5_5_6_s_32,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&pfx_5_5_5_6_s_32.fp_addr,
+				~0, // no index provided.
+				fib_index, // same as route's FIB
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST(FIB_NODE_INDEX_INVALID ==
+	     fib_table_lookup_exact_match(fib_index, &pfx_5_5_5_6_s_32),
+	     "1-level 5.5.5.6/32 loop is removed");
+
+    /*
+     * A recursive route whose next-hop is covered by the prefix.
+     * This would mean the via-fib, which inherits forwarding from its
+     * cover, thus picks up forwarding from the prfix, which is via the
+     * via-fib, and we have a loop.
+     */
+    fib_prefix_t pfx_23_23_23_0_s_24 = {
+	.fp_len = 24,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x17171700),
+	},
+    };
+    fib_prefix_t pfx_23_23_23_23_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x17171717),
+        },
+    };
+    fei = fib_table_entry_path_add(fib_index,
+				   &pfx_23_23_23_0_s_24,
+				   FIB_SOURCE_API,
+				   FIB_ENTRY_FLAG_NONE,
+				   FIB_PROTOCOL_IP4,
+				   &pfx_23_23_23_23_s_32.fp_addr,
+				   ~0, // recursive
+				   fib_index,
+				   1,
+				   NULL,
+				   FIB_ROUTE_PATH_FLAG_NONE);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(load_balance_is_drop(dpo),
+	     "23.23.23.0/24 via covered is DROP");
+    fib_table_entry_delete_index(fei, FIB_SOURCE_API);
+
+    /*
+     * add-remove test. no change.
+     */
+    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
+    	     fib_path_list_db_size());
+    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
+    	     fib_path_list_pool_size());
+    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
+    	     fib_entry_pool_size());
+
+    /*
+     * A recursive route with recursion constraints.
+     *  200.200.200.200/32 via 1.1.1.1 is recurse via host constrained
+     */
+    fib_table_entry_path_add(fib_index,
+			     &bgp_200_pfx,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_1_1_1_1,
+			     ~0,
+			     fib_index,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_1_s_32);
+    dpo2 = fib_entry_contribute_ip_forwarding(fei);
+
+    fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
+    dpo1 = fib_entry_contribute_ip_forwarding(fei);
+
+    FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo1->dpoi_index, 0)),
+	     "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.1");
+
+    /*
+     * save the load-balance. we expect it to be inplace modified
+     */
+    lb = load_balance_get(dpo1->dpoi_index);
+
+    /*
+     * add a covering prefix for the via fib that would otherwise serve
+     * as the resolving route when the host is removed
+     */
+    fib_table_entry_path_add(fib_index,
+			     &pfx_1_1_1_0_s_28,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_1,
+			     tm->hw[0]->sw_if_index,
+			     ~0, // invalid fib index
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_28);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai == ai_01),
+	     "adj for 1.1.1.0/28 is via adj for 1.1.1.1");
+
+    /*
+     * remove the host via FIB - expect the BGP prefix to be drop
+     */
+    fib_table_entry_path_remove(fib_index,
+				&pfx_1_1_1_1_s_32,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_10_10_10_1,
+				tm->hw[0]->sw_if_index,
+				~0, // invalid fib index
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo1->dpoi_index, 0)),
+	     "adj for 200.200.200.200/32 is recursive via adj for DROP");
+
+    /*
+     * add the via-entry host reoute back. expect to resolve again
+     */
+    fib_table_entry_path_add(fib_index,
+			     &pfx_1_1_1_1_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_1,
+			     tm->hw[0]->sw_if_index,
+			     ~0, // invalid fib index
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo1->dpoi_index, 0)),
+	     "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.1");
+
+    /*
+     * add another path for the recursive. it will then have 2.
+     */
+    fib_prefix_t pfx_1_1_1_3_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x01010103),
+	},
+    };
+    fib_table_entry_path_add(fib_index,
+			     &pfx_1_1_1_3_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_2,
+			     tm->hw[0]->sw_if_index,
+			     ~0, // invalid fib index
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+
+    fib_table_entry_path_add(fib_index,
+			     &bgp_200_pfx,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &pfx_1_1_1_3_s_32.fp_addr,
+			     ~0,
+			     fib_index,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
+
+    fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_1_s_32);
+    dpo2 = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.1");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_3_s_32);
+    dpo1 = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo->dpoi_index, 1)),
+	     "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.3");
+
+    /*
+     * expect the lb-map used by the recursive's load-balance is using both buckets
+     */
+    load_balance_map_t *lbm;
+    index_t lbmi;
+
+    lb = load_balance_get(dpo->dpoi_index);
+    lbmi = lb->lb_map;
+    load_balance_map_lock(lbmi);
+    lbm = load_balance_map_get(lbmi);
+
+    FIB_TEST(lbm->lbm_buckets[0] == 0,
+             "LB maps's bucket 0 is %d",
+             lbm->lbm_buckets[0]);
+    FIB_TEST(lbm->lbm_buckets[1] == 1,
+             "LB maps's bucket 1 is %d",
+             lbm->lbm_buckets[1]);
+
+    /*
+     * withdraw one of the /32 via-entrys.
+     * that ECMP path will be unresolved and forwarding should continue on the
+     * other available path. this is an iBGP PIC edge failover.
+     * Test the forwarding changes without re-fetching the adj from the
+     * recursive entry. this ensures its the same one that is updated; i.e. an
+     * inplace-modify.
+     */
+    fib_table_entry_path_remove(fib_index,
+				&pfx_1_1_1_1_s_32,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_10_10_10_1,
+				tm->hw[0]->sw_if_index,
+				~0, // invalid fib index
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
+    FIB_TEST(!dpo_cmp(dpo, fib_entry_contribute_ip_forwarding(fei)),
+	     "post PIC 200.200.200.200/32 was inplace modified");
+
+    FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket_i(lb, 0)),
+	     "post PIC adj for 200.200.200.200/32 is recursive"
+	     " via adj for 1.1.1.3");
+
+    /*
+     * the LB maps that was locked above should have been modified to remove
+     * the path that was down, and thus its bucket points to a path that is
+     * still up.
+     */
+    FIB_TEST(lbm->lbm_buckets[0] == 1,
+             "LB maps's bucket 0 is %d",
+             lbm->lbm_buckets[0]);
+    FIB_TEST(lbm->lbm_buckets[1] == 1,
+             "LB maps's bucket 1 is %d",
+             lbm->lbm_buckets[1]);
+
+    load_balance_map_unlock(lb->lb_map);
+
+    /*
+     * add it back. again 
+     */
+    fib_table_entry_path_add(fib_index,
+			     &pfx_1_1_1_1_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_1,
+			     tm->hw[0]->sw_if_index,
+			     ~0, // invalid fib index
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket_i(lb, 0)),
+	     "post PIC recovery adj for 200.200.200.200/32 is recursive "
+	     "via adj for 1.1.1.1");
+    FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket_i(lb, 1)),
+	     "post PIC recovery adj for 200.200.200.200/32 is recursive "
+	     "via adj for 1.1.1.3");
+
+    fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(lb == load_balance_get(dpo->dpoi_index),
+	     "post PIC 200.200.200.200/32 was inplace modified");
+
+    /*
+     * add a 3rd path. this makes the LB 16 buckets. 
+     */
+    fib_table_entry_path_add(fib_index,
+			     &bgp_200_pfx,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &pfx_1_1_1_2_s_32.fp_addr,
+			     ~0,
+			     fib_index,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
+
+    fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(lb == load_balance_get(dpo->dpoi_index),
+	     "200.200.200.200/32 was inplace modified for 3rd path");
+    FIB_TEST(16 == lb->lb_n_buckets,
+	     "200.200.200.200/32 was inplace modified for 3rd path to 16 buckets");
+
+    lbmi = lb->lb_map;
+    load_balance_map_lock(lbmi);
+    lbm = load_balance_map_get(lbmi);
+
+    for (ii = 0; ii < 16; ii++)
+    {
+        FIB_TEST(lbm->lbm_buckets[ii] == ii,
+                 "LB Map for 200.200.200.200/32 at %d is %d",
+                 ii, lbm->lbm_buckets[ii]);
+    }
+
+    /*
+     * trigger PIC by removing the first via-entry
+     * the first 6 buckets of the map should map to the next 6
+     */
+    fib_table_entry_path_remove(fib_index,
+				&pfx_1_1_1_1_s_32,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_10_10_10_1,
+				tm->hw[0]->sw_if_index,
+				~0,
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(lb == load_balance_get(dpo->dpoi_index),
+	     "200.200.200.200/32 was inplace modified for 3rd path");
+    FIB_TEST(2 == lb->lb_n_buckets,
+	     "200.200.200.200/32 was inplace modified for 3rd path remove to 2 buckets");
+
+    for (ii = 0; ii < 6; ii++)
+    {
+        FIB_TEST(lbm->lbm_buckets[ii] == ii+6,
+                 "LB Map for 200.200.200.200/32 at %d is %d",
+                 ii, lbm->lbm_buckets[ii]);
+    }
+    for (ii = 6; ii < 16; ii++)
+    {
+        FIB_TEST(lbm->lbm_buckets[ii] == ii,
+                 "LB Map for 200.200.200.200/32 at %d is %d",
+                 ii, lbm->lbm_buckets[ii]);
+    }
+
+
+    /*
+     * tidy up
+     */
+    fib_table_entry_path_add(fib_index,
+                             &pfx_1_1_1_1_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+                             &nh_10_10_10_1,
+                             tm->hw[0]->sw_if_index,
+                             ~0,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
+
+    fib_table_entry_path_remove(fib_index,
+                                &bgp_200_pfx,
+                                FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+                                &pfx_1_1_1_2_s_32.fp_addr,
+                                ~0,
+                                fib_index,
+                                1,
+                                MPLS_LABEL_INVALID);
+    fib_table_entry_path_remove(fib_index,
+				&bgp_200_pfx,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_1_1_1_1,
+				~0,
+				fib_index,
+				1,
+				FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
+    fib_table_entry_path_remove(fib_index,
+				&bgp_200_pfx,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&pfx_1_1_1_3_s_32.fp_addr,
+				~0,
+				fib_index,
+				1,
+				FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
+    fib_table_entry_delete(fib_index,
+			   &pfx_1_1_1_3_s_32,
+			   FIB_SOURCE_API);
+    fib_table_entry_delete(fib_index,
+			   &pfx_1_1_1_0_s_28,
+			   FIB_SOURCE_API);
+    FIB_TEST((FIB_NODE_INDEX_INVALID ==
+	      fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_28)),
+	     "1.1.1.1/28 removed");
+    FIB_TEST((FIB_NODE_INDEX_INVALID ==
+	      fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_3_s_32)),
+	     "1.1.1.3/32 removed");
+    FIB_TEST((FIB_NODE_INDEX_INVALID ==
+	      fib_table_lookup_exact_match(fib_index, &bgp_200_pfx)),
+	     "200.200.200.200/32 removed");
+
+    /*
+     * add-remove test. no change.
+     */
+    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
+    	     fib_path_list_db_size());
+    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
+    	     fib_path_list_pool_size());
+    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
+    	     fib_entry_pool_size());
+
+    /*
+     * A route whose paths are built up iteratively and then removed
+     * all at once
+     */
+    fib_prefix_t pfx_4_4_4_4_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 4.4.4.4/32 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x04040404),
+	},
+    };
+
+    fib_table_entry_path_add(fib_index,
+			     &pfx_4_4_4_4_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_1,
+			     tm->hw[0]->sw_if_index,
+			     ~0,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fib_table_entry_path_add(fib_index,
+			     &pfx_4_4_4_4_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_2,
+			     tm->hw[0]->sw_if_index,
+			     ~0,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fib_table_entry_path_add(fib_index,
+			     &pfx_4_4_4_4_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_3,
+			     tm->hw[0]->sw_if_index,
+			     ~0,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST(FIB_NODE_INDEX_INVALID !=
+	     fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
+	     "4.4.4.4/32 present");
+
+    fib_table_entry_delete(fib_index,
+			   &pfx_4_4_4_4_s_32,
+			   FIB_SOURCE_API);
+    FIB_TEST(FIB_NODE_INDEX_INVALID ==
+	     fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
+	     "4.4.4.4/32 removed");
+
+    /*
+     * add-remove test. no change.
+     */
+    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
+    	     fib_path_list_db_size());
+    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
+    	     fib_path_list_pool_size());
+    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
+    	     fib_entry_pool_size());
+
+    /*
+     * A route with multiple paths at once
+     */
+    fib_route_path_t *r_paths = NULL;
+
+    for (ii = 0; ii < 4; ii++)
+    {
+	fib_route_path_t r_path = {
+	    .frp_proto = FIB_PROTOCOL_IP4,
+	    .frp_addr = {
+		.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02 + ii),
+	    },
+	    .frp_sw_if_index = tm->hw[0]->sw_if_index,
+	    .frp_weight = 1,
+	    .frp_fib_index = ~0,
+	};
+	vec_add1(r_paths, r_path);
+    }
+
+    fib_table_entry_update(fib_index,
+			   &pfx_4_4_4_4_s_32,
+			   FIB_SOURCE_API,
+			   FIB_ENTRY_FLAG_NONE,
+			   r_paths);
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "4.4.4.4/32 present");
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+
+    lb = load_balance_get(dpo->dpoi_index);
+    FIB_TEST((lb->lb_n_buckets == 4), "4.4.4.4/32 lb over %d paths", lb->lb_n_buckets);
+
+    fib_table_entry_delete(fib_index,
+			   &pfx_4_4_4_4_s_32,
+			   FIB_SOURCE_API);
+    FIB_TEST(FIB_NODE_INDEX_INVALID ==
+	     fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
+	     "4.4.4.4/32 removed");
+    vec_free(r_paths);
+
+    /*
+     * add-remove test. no change.
+     */
+    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
+    	     fib_path_list_db_size());
+    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
+    	     fib_path_list_pool_size());
+    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
+    	     fib_entry_pool_size());
+
+    /*
+     * A route deag route
+     */
+    fib_table_entry_path_add(fib_index,
+			     &pfx_4_4_4_4_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &zero_addr,
+			     ~0,
+			     fib_index,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "4.4.4.4/32 present");
+
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
+    lookup_dpo_t *lkd = lookup_dpo_get(dpo->dpoi_index);
+
+    FIB_TEST((fib_index == lkd->lkd_fib_index),
+	     "4.4.4.4/32 is deag in %d %U",
+             lkd->lkd_fib_index,
+             format_dpo_id, dpo, 0);
+
+    fib_table_entry_delete(fib_index,
+			   &pfx_4_4_4_4_s_32,
+			   FIB_SOURCE_API);
+    FIB_TEST(FIB_NODE_INDEX_INVALID ==
+	     fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
+	     "4.4.4.4/32 removed");
+    vec_free(r_paths);
+
+    /*
+     * add-remove test. no change.
+     */
+    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
+    	     fib_path_list_db_size());
+    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
+    	     fib_path_list_pool_size());
+    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
+    	     fib_entry_pool_size());
+
+    /*
+     * Duplicate paths:
+     *  add a recursive with duplicate paths. Expect the duplicate to be ignored.
+     */
+    fib_prefix_t pfx_34_1_1_1_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x22010101),
+	},
+    };
+    fib_prefix_t pfx_34_34_1_1_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x22220101),
+	},
+    };
+    fei = fib_table_entry_path_add(fib_index,
+                                   &pfx_34_1_1_1_s_32,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+                                   FIB_PROTOCOL_IP4,
+                                   &pfx_34_34_1_1_s_32.fp_addr,
+                                   ~0,
+                                   fib_index,
+                                   1,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_entry_path_add(fib_index,
+                                   &pfx_34_1_1_1_s_32,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+                                   FIB_PROTOCOL_IP4,
+                                   &pfx_34_34_1_1_s_32.fp_addr,
+                                   ~0,
+                                   fib_index,
+                                   1,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST_REC_FORW(&pfx_34_1_1_1_s_32, &pfx_34_34_1_1_s_32, 0);
+    fib_table_entry_delete_index(fei, FIB_SOURCE_API);
+
+    /*
+     * CLEANUP
+     *   remove: 1.1.1.2/32, 1.1.2.0/24 and 1.1.1.1/32
+     *           all of which are via 10.10.10.1, Itf1
+     */
+    fib_table_entry_path_remove(fib_index,
+				&pfx_1_1_1_2_s_32,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_10_10_10_1,
+				tm->hw[0]->sw_if_index,
+				~0,
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    fib_table_entry_path_remove(fib_index,
+				&pfx_1_1_1_1_s_32,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_10_10_10_1,
+				tm->hw[0]->sw_if_index,
+				~0,
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    fib_table_entry_path_remove(fib_index,
+				&pfx_1_1_2_0_s_24,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_10_10_10_1,
+				tm->hw[0]->sw_if_index,
+				~0,
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST(FIB_NODE_INDEX_INVALID ==
+	     fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_1_s_32),
+	     "1.1.1.1/32 removed");
+    FIB_TEST(FIB_NODE_INDEX_INVALID ==
+	     fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_2_s_32),
+	     "1.1.1.2/32 removed");
+    FIB_TEST(FIB_NODE_INDEX_INVALID ==
+	     fib_table_lookup_exact_match(fib_index, &pfx_1_1_2_0_s_24),
+	     "1.1.2.0/24 removed");
+
+    /*
+     * -3 entries and -1 shared path-list
+     */
+    FIB_TEST((0  == fib_path_list_db_size()),   "path list DB population:%d",
+    	     fib_path_list_db_size());
+    FIB_TEST((NBR+4 == fib_path_list_pool_size()), "path list pool size is %d",
+    	     fib_path_list_pool_size());
+    FIB_TEST((NBR+4 == fib_entry_pool_size()), "entry pool size is %d",
+    	     fib_entry_pool_size());
+
+    /*
+     * An attached-host route. Expect to link to the incomplete adj
+     */
+    fib_prefix_t pfx_4_1_1_1_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 4.1.1.1/32 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x04010101),
+	},
+    };
+    fib_table_entry_path_add(fib_index,
+			     &pfx_4_1_1_1_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &zero_addr,
+			     tm->hw[0]->sw_if_index,
+			     fib_index,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_4_1_1_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "4.1.1.1/32 present");
+    ai = fib_entry_get_adj(fei);
+
+    ai2 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
+			      VNET_LINK_IP4,
+			      &pfx_4_1_1_1_s_32.fp_addr,
+			      tm->hw[0]->sw_if_index);
+    FIB_TEST((ai == ai2), "Attached-host link to incomplete ADJ");
+    adj_unlock(ai2);
+
+    /*
+     * +1 entry and +1 shared path-list
+     */
+    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
+    	     fib_path_list_db_size());
+    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
+    	     fib_path_list_pool_size());
+    FIB_TEST((NBR+5 == fib_entry_pool_size()), "entry pool size is %d",
+    	     fib_entry_pool_size());
+
+    fib_table_entry_delete(fib_index,
+			   &pfx_4_1_1_1_s_32,
+			   FIB_SOURCE_API);
+
+    FIB_TEST((0  == fib_path_list_db_size()),   "path list DB population:%d",
+    	     fib_path_list_db_size());
+    FIB_TEST((NBR+4 == fib_path_list_pool_size()), "path list pool size is %d",
+    	     fib_path_list_pool_size());
+    FIB_TEST((NBR+4 == fib_entry_pool_size()), "entry pool size is %d",
+    	     fib_entry_pool_size());
+
+    /*
+     * add a v6 prefix via v4 next-hops
+     */
+    fib_prefix_t pfx_2001_s_64 = {
+	.fp_len = 64,
+	.fp_proto = FIB_PROTOCOL_IP6,
+	.fp_addr = {
+	    .ip6.as_u64[0] = clib_host_to_net_u64(0x2001000000000000),
+	},
+    };
+    fei = fib_table_entry_path_add(0, //default v6 table
+				   &pfx_2001_s_64,
+				   FIB_SOURCE_API,
+				   FIB_ENTRY_FLAG_NONE,
+				   FIB_PROTOCOL_IP4,
+				   &nh_10_10_10_1,
+				   tm->hw[0]->sw_if_index,
+				   fib_index,
+				   1,
+				   NULL,
+				   FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup_exact_match(0, &pfx_2001_s_64);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "2001::/64 present");
+    ai = fib_entry_get_adj(fei);
+    adj = adj_get(ai);
+    FIB_TEST((adj->lookup_next_index == IP_LOOKUP_NEXT_ARP),
+	     "2001::/64 via ARP-adj");
+    FIB_TEST((adj->ia_link == VNET_LINK_IP6),
+	     "2001::/64 is link type v6");
+    FIB_TEST((adj->ia_nh_proto == FIB_PROTOCOL_IP4),
+	     "2001::/64 ADJ-adj is NH proto v4");
+    fib_table_entry_delete(0, &pfx_2001_s_64, FIB_SOURCE_API);
+
+    /*
+     * add a uRPF exempt prefix:
+     *  test:
+     *   - it's forwarding is drop
+     *   - it's uRPF list is not empty
+     *   - the uRPF list for the default route (it's cover) is empty
+     */
+    fei = fib_table_entry_special_add(fib_index,
+				      &pfx_4_1_1_1_s_32,
+				      FIB_SOURCE_URPF_EXEMPT,
+				      FIB_ENTRY_FLAG_DROP,
+				      ADJ_INDEX_INVALID);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(load_balance_is_drop(dpo),
+	     "uRPF exempt 4.1.1.1/32 DROP");
+    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1, 0),
+	     "uRPF list for exempt prefix has itf index 0");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_0_0_0_0_s_0);
+    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
+	     "uRPF list for 0.0.0.0/0 empty");
+
+    fib_table_entry_delete(fib_index, &pfx_4_1_1_1_s_32, FIB_SOURCE_URPF_EXEMPT);
+
+    /*
+     * CLEANUP
+     *    remove adj-fibs: 
+     */
+    fib_table_entry_delete(fib_index,
+			   &pfx_10_10_10_1_s_32,
+			   FIB_SOURCE_ADJ);
+    fib_table_entry_delete(fib_index,
+			   &pfx_10_10_10_2_s_32,
+			   FIB_SOURCE_ADJ);
+    FIB_TEST(FIB_NODE_INDEX_INVALID ==
+	     fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32),
+	     "10.10.10.1/32 adj-fib removed");
+    FIB_TEST(FIB_NODE_INDEX_INVALID ==
+	     fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_2_s_32),
+	     "10.10.10.2/32 adj-fib removed");
+
+    /*
+     * -2 entries and -2 non-shared path-list
+     */
+    FIB_TEST((0  == fib_path_list_db_size()),   "path list DB population:%d",
+    	     fib_path_list_db_size());
+    FIB_TEST((NBR+2 == fib_path_list_pool_size()), "path list pool size is %d",
+    	     fib_path_list_pool_size());
+    FIB_TEST((NBR+2 == fib_entry_pool_size()), "entry pool size is %d",
+    	     fib_entry_pool_size());
+
+    /*
+     * unlock the adjacencies for which this test provided a rewrite.
+     * These are the last locks on these adjs. they should thus go away.
+     */
+    adj_unlock(ai_02);
+    adj_unlock(ai_01);
+    adj_unlock(ai_12_12_12_12);
+
+    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
+	     adj_nbr_db_size());
+
+    /*
+     * CLEANUP
+     *   remove the interface prefixes
+     */
+    local_pfx.fp_len = 32;
+    fib_table_entry_special_remove(fib_index, &local_pfx,
+				   FIB_SOURCE_INTERFACE);
+    fei = fib_table_lookup(fib_index, &local_pfx);
+
+    FIB_TEST(FIB_NODE_INDEX_INVALID ==
+	     fib_table_lookup_exact_match(fib_index, &local_pfx),
+	     "10.10.10.10/32 adj-fib removed");
+
+    local_pfx.fp_len = 24;
+    fib_table_entry_delete(fib_index, &local_pfx,
+			   FIB_SOURCE_INTERFACE);
+
+    FIB_TEST(FIB_NODE_INDEX_INVALID ==
+	     fib_table_lookup_exact_match(fib_index, &local_pfx),
+	     "10.10.10.10/24 adj-fib removed");
+
+    /*
+     * -2 entries and -2 non-shared path-list
+     */
+    FIB_TEST((0  == fib_path_list_db_size()),   "path list DB population:%d",
+    	     fib_path_list_db_size());
+    FIB_TEST((NBR == fib_path_list_pool_size()), "path list pool size is %d",
+    	     fib_path_list_pool_size());
+    FIB_TEST((NBR == fib_entry_pool_size()), "entry pool size is %d",
+    	     fib_entry_pool_size());
+
+    /*
+     * Last but not least, remove the VRF
+     */
+    FIB_TEST((0 == fib_table_get_num_entries(fib_index,
+                                             FIB_PROTOCOL_IP4,
+                                             FIB_SOURCE_API)),
+             "NO API Source'd prefixes");
+    FIB_TEST((0 == fib_table_get_num_entries(fib_index,
+                                             FIB_PROTOCOL_IP4,
+                                             FIB_SOURCE_RR)),
+             "NO RR Source'd prefixes");
+    FIB_TEST((0 == fib_table_get_num_entries(fib_index,
+                                             FIB_PROTOCOL_IP4,
+                                             FIB_SOURCE_INTERFACE)),
+             "NO INterface Source'd prefixes");
+
+    fib_table_unlock(fib_index, FIB_PROTOCOL_IP4);
+
+    FIB_TEST((0  == fib_path_list_db_size()), "path list DB population:%d",
+    	     fib_path_list_db_size());
+    FIB_TEST((NBR-5 == fib_path_list_pool_size()), "path list pool size is %d",
+    	     fib_path_list_pool_size());
+    FIB_TEST((NBR-5 == fib_entry_pool_size()), "entry pool size is %d",
+    	     fib_entry_pool_size());
+    FIB_TEST((NBR-5 == pool_elts(fib_urpf_list_pool)), "uRPF pool size is %d",
+    	     pool_elts(fib_urpf_list_pool));
+
+    return 0;
+}
+
+static int
+fib_test_v6 (void)
+{
+    /*
+     * In the default table check for the presence and correct forwarding
+     * of the special entries
+     */
+    fib_node_index_t dfrt, fei, ai, locked_ai, ai_01, ai_02;
+    const dpo_id_t *dpo, *dpo_drop;
+    const ip_adjacency_t *adj;
+    const receive_dpo_t *rd;
+    test_main_t *tm;
+    u32 fib_index;
+    int ii;
+
+    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
+	     adj_nbr_db_size());
+
+    /* via 2001:0:0:1::2 */
+    ip46_address_t nh_2001_2 = {
+	.ip6 = {
+	    .as_u64 = {
+		[0] = clib_host_to_net_u64(0x2001000000000001),
+		[1] = clib_host_to_net_u64(0x0000000000000002),
+	    },
+	},
+    };
+
+    tm = &test_main;
+
+    dpo_drop = drop_dpo_get(DPO_PROTO_IP6);
+
+    /* Find or create FIB table 11 */
+    fib_index = fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP6, 11);
+
+    for (ii = 0; ii < 4; ii++)
+    {
+	ip6_main.fib_index_by_sw_if_index[tm->hw[ii]->sw_if_index] = fib_index;
+    }
+
+    fib_prefix_t pfx_0_0 = {
+	.fp_len = 0,
+	.fp_proto = FIB_PROTOCOL_IP6,
+	.fp_addr = {
+	    .ip6 = {
+		{0, 0},
+	    },
+	},
+    };
+
+    dfrt = fib_table_lookup(fib_index, &pfx_0_0);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != dfrt), "default route present");
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(dfrt)),
+	     "Default route is DROP");
+
+    dpo = fib_entry_contribute_ip_forwarding(dfrt);
+    FIB_TEST((dpo->dpoi_index == ip6_fib_table_fwding_lookup(
+		                     &ip6_main,
+				     1,
+				     &pfx_0_0.fp_addr.ip6)),
+	     "default-route; fwd and non-fwd tables match");
+
+    // FIXME - check specials.
+
+    /*
+     * At this stage there is one v4 FIB with 5 routes and two v6 FIBs
+     * each with 6 entries. All entries are special so no path-list sharing.
+     */
+#define NPS (5+6+6)
+    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
+    FIB_TEST((NPS == fib_path_list_pool_size()), "path list pool size is %d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NPS == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * add interface routes.
+     *  validate presence of /64 attached and /128 recieve.
+     *  test for the presence of the receive address in the glean and local adj
+     *
+     * receive on 2001:0:0:1::1/128
+     */
+    fib_prefix_t local_pfx = {
+	.fp_len = 64,
+	.fp_proto = FIB_PROTOCOL_IP6,
+	.fp_addr = {
+	    .ip6 = {
+		.as_u64 = {
+		    [0] = clib_host_to_net_u64(0x2001000000000001),
+		    [1] = clib_host_to_net_u64(0x0000000000000001),
+		},
+	    },
+	}
+    };
+
+    fib_table_entry_update_one_path(fib_index, &local_pfx,
+				    FIB_SOURCE_INTERFACE,
+				    (FIB_ENTRY_FLAG_CONNECTED |
+				     FIB_ENTRY_FLAG_ATTACHED),
+				    FIB_PROTOCOL_IP6,
+				    NULL,
+				    tm->hw[0]->sw_if_index,
+				    ~0,
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached interface route present");
+
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != ai), "attached interface route adj present");
+    adj = adj_get(ai);
+    FIB_TEST((IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index),
+	     "attached interface adj is glean");
+    FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
+				    &adj->sub_type.glean.receive_addr)),
+	      "attached interface adj is receive ok");
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST((dpo->dpoi_index == ip6_fib_table_fwding_lookup(
+		                     &ip6_main,
+				     1,
+				     &local_pfx.fp_addr.ip6)),
+	     "attached-route; fwd and non-fwd tables match");
+
+    local_pfx.fp_len = 128;
+    fib_table_entry_update_one_path(fib_index, &local_pfx,
+				    FIB_SOURCE_INTERFACE,
+				    (FIB_ENTRY_FLAG_CONNECTED |
+				     FIB_ENTRY_FLAG_LOCAL),
+				    FIB_PROTOCOL_IP6,
+				    NULL,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &local_pfx);
+
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local interface route present");
+
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
+    FIB_TEST((DPO_RECEIVE == dpo->dpoi_type),
+	     "local interface adj is local");
+    rd = receive_dpo_get(dpo->dpoi_index);
+
+    FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
+				    &rd->rd_addr)),
+	      "local interface adj is receive ok");
+
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST((dpo->dpoi_index == ip6_fib_table_fwding_lookup(
+		                     &ip6_main,
+				     1,
+				     &local_pfx.fp_addr.ip6)),
+	     "local-route; fwd and non-fwd tables match");
+
+    /*
+     * +2 entries. +2 unshared path-lists
+     */
+    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
+    FIB_TEST((NPS+2 == fib_path_list_pool_size()), "path list pool size is%d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NPS+2 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * Modify the default route to be via an adj not yet known.
+     * this sources the defalut route with the API source, which is
+     * a higher preference to the DEFAULT_ROUTE source
+     */
+    fib_table_entry_path_add(fib_index, &pfx_0_0,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP6,
+			     &nh_2001_2,
+			     tm->hw[0]->sw_if_index,
+			     ~0,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &pfx_0_0);
+
+    FIB_TEST((fei == dfrt), "default route same index");
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != ai), "default route adj present");
+    adj = adj_get(ai);
+    FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
+	     "adj is incomplete");
+    FIB_TEST((0 == ip46_address_cmp(&nh_2001_2, &adj->sub_type.nbr.next_hop)),
+	      "adj nbr next-hop ok");
+
+    /*
+     * find the adj in the shared db
+     */
+    locked_ai = adj_nbr_add_or_lock(FIB_PROTOCOL_IP6,
+				    VNET_LINK_IP6,
+				    &nh_2001_2,
+				    tm->hw[0]->sw_if_index);
+    FIB_TEST((locked_ai == ai), "ADJ NBR DB find");
+    adj_unlock(locked_ai);
+
+    /*
+     * no more entires. +1 shared path-list
+     */
+    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NPS+3 == fib_path_list_pool_size()), "path list pool size is%d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NPS+2 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * remove the API source from the default route. We expected
+     * the route to remain, sourced by DEFAULT_ROUTE, and hence a DROP
+     */
+    fib_table_entry_path_remove(fib_index, &pfx_0_0,
+				FIB_SOURCE_API,	
+				FIB_PROTOCOL_IP6,
+				&nh_2001_2,
+				tm->hw[0]->sw_if_index,
+				~0,
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &pfx_0_0);
+
+    FIB_TEST((fei == dfrt), "default route same index");
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(dfrt)),
+	     "Default route is DROP");
+
+    /*
+     * no more entires. -1 shared path-list
+     */
+    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NPS+2 == fib_path_list_pool_size()), "path list pool size is%d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NPS+2 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * Add an 2 ARP entry => a complete ADJ plus adj-fib.
+     */
+    fib_prefix_t pfx_2001_1_2_s_128 = {
+	.fp_len   = 128,
+	.fp_proto = FIB_PROTOCOL_IP6,
+	.fp_addr  = {
+	    .ip6 = {
+		.as_u64 = {
+		    [0] = clib_host_to_net_u64(0x2001000000000001),
+		    [1] = clib_host_to_net_u64(0x0000000000000002),
+		},
+	    },
+	}
+    };
+    fib_prefix_t pfx_2001_1_3_s_128 = {
+	.fp_len   = 128,
+	.fp_proto = FIB_PROTOCOL_IP6,
+	.fp_addr  = {
+	    .ip6 = {
+		.as_u64 = {
+		    [0] = clib_host_to_net_u64(0x2001000000000001),
+		    [1] = clib_host_to_net_u64(0x0000000000000003),
+		},
+	    },
+	}
+    };
+    u8 eth_addr[] = {
+	0xde, 0xde, 0xde, 0xba, 0xba, 0xba,
+    };
+
+    ai_01 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP6,
+				VNET_LINK_IP6,
+				&pfx_2001_1_2_s_128.fp_addr,
+				tm->hw[0]->sw_if_index);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != ai_01), "adj created");
+    adj = adj_get(ai_01);
+    FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
+	     "adj is incomplete");
+    FIB_TEST((0 == ip46_address_cmp(&pfx_2001_1_2_s_128.fp_addr,
+				    &adj->sub_type.nbr.next_hop)),
+	      "adj nbr next-hop ok");
+
+    adj_nbr_update_rewrite(ai_01, ADJ_NBR_REWRITE_FLAG_COMPLETE,
+			   fib_test_build_rewrite(eth_addr));
+    FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
+	     "adj is complete");
+    FIB_TEST((0 == ip46_address_cmp(&pfx_2001_1_2_s_128.fp_addr,
+				    &adj->sub_type.nbr.next_hop)),
+	      "adj nbr next-hop ok");
+
+    fib_table_entry_update_one_path(fib_index,
+				    &pfx_2001_1_2_s_128,
+				    FIB_SOURCE_ADJ,
+				    FIB_ENTRY_FLAG_ATTACHED,
+				    FIB_PROTOCOL_IP6,
+				    &pfx_2001_1_2_s_128.fp_addr,
+				    tm->hw[0]->sw_if_index,
+				    ~0,
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_2001_1_2_s_128);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "ADJ-FIB resolves via adj");
+
+    eth_addr[5] = 0xb2;
+
+    ai_02 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP6,
+				VNET_LINK_IP6,
+				&pfx_2001_1_3_s_128.fp_addr,
+				tm->hw[0]->sw_if_index);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != ai_02), "adj created");
+    adj = adj_get(ai_02);
+    FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
+	     "adj is incomplete");
+    FIB_TEST((0 == ip46_address_cmp(&pfx_2001_1_3_s_128.fp_addr,
+				    &adj->sub_type.nbr.next_hop)),
+	      "adj nbr next-hop ok");
+
+    adj_nbr_update_rewrite(ai_02, ADJ_NBR_REWRITE_FLAG_COMPLETE,
+			   fib_test_build_rewrite(eth_addr));
+    FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
+	     "adj is complete");
+    FIB_TEST((0 == ip46_address_cmp(&pfx_2001_1_3_s_128.fp_addr,
+				    &adj->sub_type.nbr.next_hop)),
+	      "adj nbr next-hop ok");
+    FIB_TEST((ai_01 != ai_02), "ADJs are different");
+
+    fib_table_entry_update_one_path(fib_index,
+				    &pfx_2001_1_3_s_128,
+				    FIB_SOURCE_ADJ,
+				    FIB_ENTRY_FLAG_ATTACHED,
+				    FIB_PROTOCOL_IP6,
+				    &pfx_2001_1_3_s_128.fp_addr,
+				    tm->hw[0]->sw_if_index,
+				    ~0,
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_2001_1_3_s_128);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_02 == ai), "ADJ-FIB resolves via adj");
+
+    /*
+     * +2 entries, +2 unshread path-lists.
+     */
+    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NPS+4 == fib_path_list_pool_size()), "path list pool size is%d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NPS+4 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * Add a 2 routes via the first ADJ. ensure path-list sharing
+     */
+    fib_prefix_t pfx_2001_a_s_64 = {
+	.fp_len   = 64,
+	.fp_proto = FIB_PROTOCOL_IP6,
+	.fp_addr  = {
+	    .ip6 = {
+		.as_u64 = {
+		    [0] = clib_host_to_net_u64(0x200100000000000a),
+		    [1] = clib_host_to_net_u64(0x0000000000000000),
+		},
+	    },
+	}
+    };
+    fib_prefix_t pfx_2001_b_s_64 = {
+	.fp_len   = 64,
+	.fp_proto = FIB_PROTOCOL_IP6,
+	.fp_addr  = {
+	    .ip6 = {
+		.as_u64 = {
+		    [0] = clib_host_to_net_u64(0x200100000000000b),
+		    [1] = clib_host_to_net_u64(0x0000000000000000),
+		},
+	    },
+	}
+    };
+
+    fib_table_entry_path_add(fib_index,
+			     &pfx_2001_a_s_64,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP6,
+			     &nh_2001_2,
+			     tm->hw[0]->sw_if_index,
+			     ~0,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &pfx_2001_a_s_64);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "2001::a/64 resolves via 2001:0:0:1::1");
+    fib_table_entry_path_add(fib_index,
+			     &pfx_2001_b_s_64,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP6,
+			     &nh_2001_2,
+			     tm->hw[0]->sw_if_index,
+			     ~0,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &pfx_2001_b_s_64);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "2001::b/64 resolves via 2001:0:0:1::1");
+
+    /*
+     * +2 entries, +1 shared path-list.
+     */
+    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NPS+5 == fib_path_list_pool_size()), "path list pool size is%d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NPS+6 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * add a v4 prefix via a v6 next-hop
+     */
+    fib_prefix_t pfx_1_1_1_1_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = 0x01010101,
+	},
+    };
+    fei = fib_table_entry_path_add(0, // default table
+				   &pfx_1_1_1_1_s_32,
+				   FIB_SOURCE_API,
+				   FIB_ENTRY_FLAG_NONE,
+				   FIB_PROTOCOL_IP6,
+				   &nh_2001_2,
+				   tm->hw[0]->sw_if_index,
+				   ~0,
+				   1,
+				   NULL,
+				   FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST(fei == fib_table_lookup_exact_match(0, &pfx_1_1_1_1_s_32),
+	     "1.1.1.1/32 o v6 route present");
+    ai = fib_entry_get_adj(fei);
+    adj = adj_get(ai);
+    FIB_TEST((adj->lookup_next_index == IP_LOOKUP_NEXT_ARP),
+	     "1.1.1.1/32 via ARP-adj");
+    FIB_TEST((adj->ia_link == VNET_LINK_IP4),
+	     "1.1.1.1/32 ADJ-adj is link type v4");
+    FIB_TEST((adj->ia_nh_proto == FIB_PROTOCOL_IP6),
+	     "1.1.1.1/32 ADJ-adj is NH proto v6");
+    fib_table_entry_delete(0, &pfx_1_1_1_1_s_32, FIB_SOURCE_API);
+
+    /*
+     * An attached route
+     */
+    fib_prefix_t pfx_2001_c_s_64 = {
+	.fp_len   = 64,
+	.fp_proto = FIB_PROTOCOL_IP6,
+	.fp_addr  = {
+	    .ip6 = {
+		.as_u64 = {
+		    [0] = clib_host_to_net_u64(0x200100000000000c),
+		    [1] = clib_host_to_net_u64(0x0000000000000000),
+		},
+	    },
+	}
+    };
+    fib_table_entry_path_add(fib_index,
+			     &pfx_2001_c_s_64,
+			     FIB_SOURCE_CLI,
+			     FIB_ENTRY_FLAG_ATTACHED,
+			     FIB_PROTOCOL_IP6,
+			     NULL,
+			     tm->hw[0]->sw_if_index,
+			     ~0,
+			     1,
+			     NULL,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_c_s_64);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached route present");
+    ai = fib_entry_get_adj(fei);
+    adj = adj_get(ai);
+    FIB_TEST((adj->lookup_next_index == IP_LOOKUP_NEXT_GLEAN),
+	     "2001:0:0:c/64 attached resolves via glean");
+
+    fib_table_entry_path_remove(fib_index,
+				&pfx_2001_c_s_64,
+				FIB_SOURCE_CLI,
+				FIB_PROTOCOL_IP6,
+				NULL,
+				tm->hw[0]->sw_if_index,
+				~0,
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_c_s_64);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "attached route removed");
+
+    /*
+     * Shutdown the interface on which we have a connected and through
+     * which the routes are reachable.
+     * This will result in the connected, adj-fibs, and routes linking to drop
+     * The local/for-us prefix continues to receive.
+     */
+    clib_error_t * error;
+
+    error = vnet_sw_interface_set_flags(vnet_get_main(),
+					tm->hw[0]->sw_if_index,
+					~VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+    FIB_TEST((NULL == error), "Interface shutdown OK");
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "2001::b/64 resolves via drop");
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "2001::a/64 resolves via drop");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "2001:0:0:1::3/64 resolves via drop");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "2001:0:0:1::2/64 resolves via drop");
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "2001:0:0:1::1/128 not drop");
+    local_pfx.fp_len = 64;
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "2001:0:0:1/64 resolves via drop");
+
+    /*
+     * no change
+     */
+    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NPS+5 == fib_path_list_pool_size()), "path list pool size is%d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NPS+6 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * shutdown one of the other interfaces, then add a connected.
+     * and swap one of the routes to it.
+     */
+    error = vnet_sw_interface_set_flags(vnet_get_main(),
+					tm->hw[1]->sw_if_index,
+					~VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+    FIB_TEST((NULL == error), "Interface 1 shutdown OK");
+
+    fib_prefix_t connected_pfx = {
+	.fp_len = 64,
+	.fp_proto = FIB_PROTOCOL_IP6,
+	.fp_addr = {
+	    .ip6 = {
+		/* 2001:0:0:2::1/64 */
+		.as_u64 = {
+		    [0] = clib_host_to_net_u64(0x2001000000000002),
+		    [1] = clib_host_to_net_u64(0x0000000000000001),
+		},
+	    },
+	}
+    };
+    fib_table_entry_update_one_path(fib_index, &connected_pfx,
+				    FIB_SOURCE_INTERFACE,
+				    (FIB_ENTRY_FLAG_CONNECTED |
+				     FIB_ENTRY_FLAG_ATTACHED),
+				    FIB_PROTOCOL_IP6,
+				    NULL,
+				    tm->hw[1]->sw_if_index,
+				    ~0,
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &connected_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached interface route present");
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
+    FIB_TEST(!dpo_cmp(dpo, dpo_drop),
+             "2001:0:0:2/64 not resolves via drop");
+
+    connected_pfx.fp_len = 128;
+    fib_table_entry_update_one_path(fib_index, &connected_pfx,
+				    FIB_SOURCE_INTERFACE,
+				    (FIB_ENTRY_FLAG_CONNECTED |
+				     FIB_ENTRY_FLAG_LOCAL),
+				    FIB_PROTOCOL_IP6,
+				    NULL,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup(fib_index, &connected_pfx);
+
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local interface route present");
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
+    FIB_TEST((DPO_RECEIVE == dpo->dpoi_type),
+	     "local interface adj is local");
+    rd = receive_dpo_get(dpo->dpoi_index);
+    FIB_TEST((0 == ip46_address_cmp(&connected_pfx.fp_addr,
+				    &rd->rd_addr)),
+	      "local interface adj is receive ok");
+
+    /*
+     * +2 entries, +2 unshared path-lists
+     */
+    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NPS+7 == fib_path_list_pool_size()), "path list pool size is%d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NPS+8 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+
+    /*
+     * bring the interface back up. we expected the routes to return
+     * to normal forwarding.
+     */
+    error = vnet_sw_interface_set_flags(vnet_get_main(),
+					tm->hw[0]->sw_if_index,
+					VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+    FIB_TEST((NULL == error), "Interface bring-up OK");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "2001::a/64 resolves via 2001:0:0:1::1");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "2001::b/64 resolves via 2001:0:0:1::1");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_02 == ai), "ADJ-FIB resolves via adj");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "ADJ-FIB resolves via adj");
+    local_pfx.fp_len = 64;
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+    ai = fib_entry_get_adj(fei);
+    adj = adj_get(ai);
+    FIB_TEST((IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index),
+	     "attached interface adj is glean");
+
+    /*
+     * Same test as above, but this time the HW interface goes down
+     */
+    error = vnet_hw_interface_set_flags(vnet_get_main(),
+					tm->hw_if_indicies[0],
+					~VNET_HW_INTERFACE_FLAG_LINK_UP);
+    FIB_TEST((NULL == error), "Interface shutdown OK");
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "2001::b/64 resolves via drop");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "2001::a/64 resolves via drop");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "2001:0:0:1::3/128 resolves via drop");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "2001:0:0:1::2/128 resolves via drop");
+    local_pfx.fp_len = 128;
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "2001:0:0:1::1/128 not drop");
+    local_pfx.fp_len = 64;
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "2001:0:0:1/64 resolves via drop");
+
+    error = vnet_hw_interface_set_flags(vnet_get_main(),
+					tm->hw_if_indicies[0],
+					VNET_HW_INTERFACE_FLAG_LINK_UP);
+    FIB_TEST((NULL == error), "Interface bring-up OK");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "2001::a/64 resolves via 2001:0:0:1::1");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "2001::b/64 resolves via 2001:0:0:1::1");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_02 == ai), "ADJ-FIB resolves via adj");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128);
+    ai = fib_entry_get_adj(fei);
+    FIB_TEST((ai_01 == ai), "ADJ-FIB resolves via adj");
+    local_pfx.fp_len = 64;
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+    ai = fib_entry_get_adj(fei);
+    adj = adj_get(ai);
+    FIB_TEST((IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index),
+	     "attached interface adj is glean");
+
+    /*
+     * Delete the interface that the routes reolve through.
+     * Again no routes are removed. They all point to drop.
+     *
+     * This is considered an error case. The control plane should
+     * not remove interfaces through which routes resolve, but
+     * such things can happen. ALL affected routes will drop.
+     */
+    vnet_delete_hw_interface(vnet_get_main(), tm->hw_if_indicies[0]);
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+             "2001::b/64 resolves via drop");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+             "2001::b/64 resolves via drop");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+             "2001:0:0:1::3/64 resolves via drop");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+             "2001:0:0:1::2/64 resolves via drop");
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+             "2001:0:0:1::1/128 is drop");
+    local_pfx.fp_len = 64;
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+             "2001:0:0:1/64 resolves via drop");
+
+    /*
+     * no change
+     */
+    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NPS+7 == fib_path_list_pool_size()), "path list pool size is%d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NPS+8 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * Add the interface back. routes stay unresolved.
+     */
+    error = ethernet_register_interface(vnet_get_main(),
+					test_interface_device_class.index,
+					0 /* instance */,
+					hw_address,
+					&tm->hw_if_indicies[0],
+					/* flag change */ 0);
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+             "2001::b/64 resolves via drop");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+             "2001::b/64 resolves via drop");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+             "2001:0:0:1::3/64 resolves via drop");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+             "2001:0:0:1::2/64 resolves via drop");
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+             "2001:0:0:1::1/128 is drop");
+    local_pfx.fp_len = 64;
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
+             "2001:0:0:1/64 resolves via drop");
+
+    /*
+     * CLEANUP ALL the routes
+     */
+    fib_table_entry_delete(fib_index,
+			   &pfx_2001_c_s_64,
+			   FIB_SOURCE_API);
+    fib_table_entry_delete(fib_index,
+			   &pfx_2001_a_s_64,
+			   FIB_SOURCE_API);
+    fib_table_entry_delete(fib_index,
+			   &pfx_2001_b_s_64,
+			   FIB_SOURCE_API);
+    fib_table_entry_delete(fib_index,
+			   &pfx_2001_1_3_s_128,
+			   FIB_SOURCE_ADJ);
+    fib_table_entry_delete(fib_index,
+			   &pfx_2001_1_2_s_128,
+			   FIB_SOURCE_ADJ);
+    local_pfx.fp_len = 64;
+    fib_table_entry_delete(fib_index, &local_pfx,
+			   FIB_SOURCE_INTERFACE);
+    local_pfx.fp_len = 128;
+    fib_table_entry_special_remove(fib_index, &local_pfx,
+				   FIB_SOURCE_INTERFACE);
+    connected_pfx.fp_len = 64;
+    fib_table_entry_delete(fib_index, &connected_pfx,
+			   FIB_SOURCE_INTERFACE);
+    connected_pfx.fp_len = 128;
+    fib_table_entry_special_remove(fib_index, &connected_pfx,
+				   FIB_SOURCE_INTERFACE);
+
+    FIB_TEST((FIB_NODE_INDEX_INVALID ==
+	      fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64)),
+	     "2001::a/64 removed");
+    FIB_TEST((FIB_NODE_INDEX_INVALID ==
+	      fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64)),
+	     "2001::b/64 removed");
+    FIB_TEST((FIB_NODE_INDEX_INVALID ==
+	      fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128)),
+	     "2001:0:0:1::3/128 removed");
+    FIB_TEST((FIB_NODE_INDEX_INVALID ==
+	      fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128)),
+	     "2001:0:0:1::3/128 removed");
+    local_pfx.fp_len = 64;
+    FIB_TEST((FIB_NODE_INDEX_INVALID ==
+	      fib_table_lookup_exact_match(fib_index, &local_pfx)),
+	     "2001:0:0:1/64 removed");
+    local_pfx.fp_len = 128;
+    FIB_TEST((FIB_NODE_INDEX_INVALID ==
+	      fib_table_lookup_exact_match(fib_index, &local_pfx)),
+	     "2001:0:0:1::1/128 removed");
+    connected_pfx.fp_len = 64;
+    FIB_TEST((FIB_NODE_INDEX_INVALID ==
+	      fib_table_lookup_exact_match(fib_index, &connected_pfx)),
+	     "2001:0:0:2/64 removed");
+    connected_pfx.fp_len = 128;
+    FIB_TEST((FIB_NODE_INDEX_INVALID ==
+	      fib_table_lookup_exact_match(fib_index, &connected_pfx)),
+	     "2001:0:0:2::1/128 removed");
+
+    /*
+     * -8 entries. -7 path-lists (1 was shared).
+     */
+    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NPS == fib_path_list_pool_size()), "path list pool size is%d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NPS == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    /*
+     * now remove the VRF
+     */
+    fib_table_unlock(fib_index, FIB_PROTOCOL_IP6);
+
+    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB population:%d",
+	     fib_path_list_db_size());
+    FIB_TEST((NPS-6 == fib_path_list_pool_size()), "path list pool size is%d",
+	     fib_path_list_pool_size());
+    FIB_TEST((NPS-6 == fib_entry_pool_size()), "entry pool size is %d",
+	     fib_entry_pool_size());
+
+    adj_unlock(ai_02);
+    adj_unlock(ai_01);
+
+    /*
+     * return the interfaces to up state
+     */
+    error = vnet_sw_interface_set_flags(vnet_get_main(),
+					tm->hw[0]->sw_if_index,
+					VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+    error = vnet_sw_interface_set_flags(vnet_get_main(),
+					tm->hw[1]->sw_if_index,
+					VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+
+    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
+	     adj_nbr_db_size());
+
+    return (0);
+}
+
+/*
+ * Test Attached Exports
+ */
+static int
+fib_test_ae (void)
+{
+    const dpo_id_t *dpo, *dpo_drop;
+    const u32 fib_index = 0;
+    fib_node_index_t fei;
+    test_main_t *tm;
+    ip4_main_t *im;
+
+    tm = &test_main;
+    im = &ip4_main;
+
+    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
+	     adj_nbr_db_size());
+
+    /*
+     * add interface routes. We'll assume this works. It's more rigorously
+     * tested elsewhere.
+     */
+    fib_prefix_t local_pfx = {
+	.fp_len = 24,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4 = {
+		/* 10.10.10.10 */
+		.as_u32 = clib_host_to_net_u32(0x0a0a0a0a),
+	    },
+	},
+    };
+
+    vec_validate(im->fib_index_by_sw_if_index, tm->hw[0]->sw_if_index);
+    im->fib_index_by_sw_if_index[tm->hw[0]->sw_if_index] = fib_index;
+
+    dpo_drop = drop_dpo_get(DPO_PROTO_IP4);
+
+    fib_table_entry_update_one_path(fib_index, &local_pfx,
+				    FIB_SOURCE_INTERFACE,
+				    (FIB_ENTRY_FLAG_CONNECTED |
+				     FIB_ENTRY_FLAG_ATTACHED),
+				    FIB_PROTOCOL_IP4,
+				    NULL,
+				    tm->hw[0]->sw_if_index,
+				    ~0,
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
+	     "attached interface route present");
+
+    local_pfx.fp_len = 32;
+    fib_table_entry_update_one_path(fib_index, &local_pfx,
+				    FIB_SOURCE_INTERFACE,
+				    (FIB_ENTRY_FLAG_CONNECTED |
+				     FIB_ENTRY_FLAG_LOCAL),
+				    FIB_PROTOCOL_IP4,
+				    NULL,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
+	     "local interface route present");
+
+    /*
+     * Add an 2 ARP entry => a complete ADJ plus adj-fib.
+     */
+    fib_prefix_t pfx_10_10_10_1_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    /* 10.10.10.1 */
+	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
+	},
+    };
+    fib_node_index_t ai;
+
+    fib_table_entry_update_one_path(fib_index,
+				    &pfx_10_10_10_1_s_32,
+				    FIB_SOURCE_ADJ,
+				    FIB_ENTRY_FLAG_ATTACHED,
+				    FIB_PROTOCOL_IP4,
+				    &pfx_10_10_10_1_s_32.fp_addr,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 created");
+    ai = fib_entry_get_adj(fei);
+
+    /*
+     * create another FIB table into which routes will be imported
+     */
+    u32 import_fib_index1;
+
+    import_fib_index1 = fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP4, 11);
+
+    /*
+     * Add an attached route in the import FIB
+     */
+    local_pfx.fp_len = 24;
+    fib_table_entry_update_one_path(import_fib_index1,
+				    &local_pfx,
+				    FIB_SOURCE_API,
+				    FIB_ENTRY_FLAG_NONE,
+				    FIB_PROTOCOL_IP4,
+				    NULL,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached export created");
+
+    /*
+     * check for the presence of the adj-fibs in the import table
+     */
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 imported");
+    FIB_TEST((ai == fib_entry_get_adj(fei)),
+	     "adj-fib1 Import uses same adj as export");
+
+    /*
+     * check for the presence of the local in the import table
+     */
+    local_pfx.fp_len = 32;
+    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local imported");
+
+    /*
+     * Add another adj-fin in the export table. Expect this
+     * to get magically exported;
+     */
+    fib_prefix_t pfx_10_10_10_2_s_32 = {
+    	.fp_len = 32,
+    	.fp_proto = FIB_PROTOCOL_IP4,
+    	.fp_addr = {
+    	    /* 10.10.10.2 */
+    	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02),
+    	},
+    };
+
+    fib_table_entry_update_one_path(fib_index,
+				    &pfx_10_10_10_2_s_32,
+				    FIB_SOURCE_ADJ,
+				    FIB_ENTRY_FLAG_ATTACHED,
+				    FIB_PROTOCOL_IP4,
+				    &pfx_10_10_10_2_s_32.fp_addr,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_2_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 present");
+    ai = fib_entry_get_adj(fei);
+
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 imported");
+    FIB_TEST((ai == fib_entry_get_adj(fei)),
+	     "Import uses same adj as export");
+    FIB_TEST((FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags(fei)),
+             "ADJ-fib2 imported flags %d",
+             fib_entry_get_flags(fei));
+
+    /*
+     * create a 2nd FIB table into which routes will be imported
+     */
+    u32 import_fib_index2;
+
+    import_fib_index2 = fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP4, 12);
+
+    /*
+     * Add an attached route in the import FIB
+     */
+    local_pfx.fp_len = 24;
+    fib_table_entry_update_one_path(import_fib_index2,
+				    &local_pfx,
+				    FIB_SOURCE_API,
+				    FIB_ENTRY_FLAG_NONE,
+				    FIB_PROTOCOL_IP4,
+				    NULL,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached export created");
+
+    /*
+     * check for the presence of all the adj-fibs and local in the import table
+     */
+    fei = fib_table_lookup_exact_match(import_fib_index2, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 imported");
+    fei = fib_table_lookup_exact_match(import_fib_index2, &pfx_10_10_10_2_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 imported");
+    local_pfx.fp_len = 32;
+    fei = fib_table_lookup_exact_match(import_fib_index2, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local imported");
+
+    /*
+     * add a 3rd adj-fib. expect it to be exported to both tables.
+     */
+    fib_prefix_t pfx_10_10_10_3_s_32 = {
+    	.fp_len = 32,
+    	.fp_proto = FIB_PROTOCOL_IP4,
+    	.fp_addr = {
+    	    /* 10.10.10.3 */
+    	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a03),
+    	},
+    };
+
+    fib_table_entry_update_one_path(fib_index,
+				    &pfx_10_10_10_3_s_32,
+				    FIB_SOURCE_ADJ,
+				    FIB_ENTRY_FLAG_ATTACHED,
+				    FIB_PROTOCOL_IP4,
+				    &pfx_10_10_10_3_s_32.fp_addr,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_3_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib3 present");
+    ai = fib_entry_get_adj(fei);
+
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_3_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib3 imported to FIB1");
+    FIB_TEST((ai == fib_entry_get_adj(fei)),
+	     "Import uses same adj as export");
+    fei = fib_table_lookup_exact_match(import_fib_index2, &pfx_10_10_10_3_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib3 imported to FIB2");
+    FIB_TEST((ai == fib_entry_get_adj(fei)),
+	     "Import uses same adj as export");
+
+    /*
+     * remove the 3rd adj fib. we expect it to be removed from both FIBs
+     */
+    fib_table_entry_delete(fib_index,
+			   &pfx_10_10_10_3_s_32,
+			   FIB_SOURCE_ADJ);
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_3_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib3 remved");
+
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_3_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib3 removed from FIB1");
+
+    fei = fib_table_lookup_exact_match(import_fib_index2, &pfx_10_10_10_3_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib3 removed from FIB2");
+
+    /*
+     * remove the attached route from the 2nd FIB. expect the imported
+     * entires to be removed
+     */
+    local_pfx.fp_len = 24;
+    fib_table_entry_delete(import_fib_index2,
+			   &local_pfx,
+			   FIB_SOURCE_API);
+    fei = fib_table_lookup_exact_match(import_fib_index2, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "attached export removed");
+
+    fei = fib_table_lookup_exact_match(import_fib_index2, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib1 removed from FIB2");
+    fei = fib_table_lookup_exact_match(import_fib_index2, &pfx_10_10_10_2_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib2 removed from FIB2");
+    local_pfx.fp_len = 32;
+    fei = fib_table_lookup_exact_match(import_fib_index2, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "local removed from FIB2");
+
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 still in FIB1");
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 still in FIB1");
+    local_pfx.fp_len = 32;
+    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local still in FIB1");
+
+    /*
+     * modify the route in FIB1 so it is no longer attached. expect the imported
+     * entires to be removed
+     */
+    local_pfx.fp_len = 24;
+    fib_table_entry_update_one_path(import_fib_index1,
+				    &local_pfx,
+				    FIB_SOURCE_API,
+				    FIB_ENTRY_FLAG_NONE,
+				    FIB_PROTOCOL_IP4,
+				    &pfx_10_10_10_2_s_32.fp_addr,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib1 removed from FIB1");
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib2 removed from FIB1");
+    local_pfx.fp_len = 32;
+    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "local removed from FIB1");
+
+    /*
+     * modify it back to attached. expect the adj-fibs back
+     */
+    local_pfx.fp_len = 24;
+    fib_table_entry_update_one_path(import_fib_index1,
+				    &local_pfx,
+				    FIB_SOURCE_API,
+				    FIB_ENTRY_FLAG_NONE,
+				    FIB_PROTOCOL_IP4,
+				    NULL,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 imported in FIB1");
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 imported in FIB1");
+    local_pfx.fp_len = 32;
+    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local imported in FIB1");
+
+    /*
+     * add a covering attached next-hop for the interface address, so we have
+     * a valid adj to find when we check the forwarding tables
+     */
+    fib_prefix_t pfx_10_0_0_0_s_8 = {
+    	.fp_len = 8,
+    	.fp_proto = FIB_PROTOCOL_IP4,
+    	.fp_addr = {
+    	    /* 10.0.0.0 */
+    	    .ip4.as_u32 = clib_host_to_net_u32(0x0a000000),
+    	},
+    };
+
+    fei = fib_table_entry_update_one_path(fib_index,
+                                          &pfx_10_0_0_0_s_8,
+                                          FIB_SOURCE_API,
+                                          FIB_ENTRY_FLAG_NONE,
+					  FIB_PROTOCOL_IP4,
+                                          &pfx_10_10_10_3_s_32.fp_addr,
+                                          tm->hw[0]->sw_if_index,
+                                          ~0, // invalid fib index
+                                          1,
+                                          NULL,
+                                          FIB_ROUTE_PATH_FLAG_NONE);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+
+    /*
+     * remove the route in the export fib. expect the adj-fibs to be removed
+     */
+    local_pfx.fp_len = 24;
+    fib_table_entry_delete(fib_index,
+			   &local_pfx,
+			   FIB_SOURCE_INTERFACE);
+
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "Delete export: ADJ-fib1 removed from FIB1");
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib2 removed from FIB1");
+    local_pfx.fp_len = 32;
+    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "local removed from FIB1");
+
+    /*
+     * the adj-fibs in the export VRF are present in the FIB table,
+     * but not installed in forwarding, since they have no attached cover.
+     * Consequently a lookup in the MTRIE gives the adj for the covering
+     * route 10.0.0.0/8.
+     */
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 in export");
+
+    index_t lbi;
+    lbi = ip4_fib_forwarding_lookup(fib_index, &pfx_10_10_10_1_s_32.fp_addr.ip4);
+    FIB_TEST(lbi == dpo->dpoi_index,
+             "10.10.10.1 forwards on \n%U not \n%U",
+             format_load_balance, lbi, 0,
+             format_dpo_id, dpo, 0);
+    lbi = ip4_fib_forwarding_lookup(fib_index, &pfx_10_10_10_2_s_32.fp_addr.ip4);
+    FIB_TEST(lbi == dpo->dpoi_index,
+             "10.10.10.2 forwards on %U", format_dpo_id, dpo, 0);
+    lbi = ip4_fib_forwarding_lookup(fib_index, &pfx_10_10_10_3_s_32.fp_addr.ip4);
+    FIB_TEST(lbi == dpo->dpoi_index,
+             "10.10.10.3 forwards on %U", format_dpo_id, dpo, 0);
+
+    /*
+     * add the export prefix back, but not as attached.
+     * No adj-fibs in export nor import tables
+     */
+    local_pfx.fp_len = 24;
+    fei = fib_table_entry_update_one_path(fib_index,
+                                          &local_pfx,
+                                          FIB_SOURCE_API,
+                                          FIB_ENTRY_FLAG_NONE,
+					  FIB_PROTOCOL_IP4,
+                                          &pfx_10_10_10_1_s_32.fp_addr,
+                                          tm->hw[0]->sw_if_index,
+                                          ~0, // invalid fib index
+                                          1,
+                                          NULL,
+                                          FIB_ROUTE_PATH_FLAG_NONE);
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "non-attached in export: ADJ-fib1 in export");
+    lbi = ip4_fib_forwarding_lookup(fib_index, &pfx_10_10_10_1_s_32.fp_addr.ip4);
+    FIB_TEST(lbi == dpo->dpoi_index,
+             "10.10.10.1 forwards on %U", format_dpo_id, dpo, 0);
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 in export");
+    lbi = ip4_fib_forwarding_lookup(fib_index, &pfx_10_10_10_2_s_32.fp_addr.ip4);
+    FIB_TEST(lbi == dpo->dpoi_index,
+             "10.10.10.2 forwards on %U", format_dpo_id, dpo, 0);
+
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib1 removed from FIB1");
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib2 removed from FIB1");
+    local_pfx.fp_len = 32;
+    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "local removed from FIB1");
+
+    /*
+     * modify the export prefix so it is attached. expect all covereds to return
+     */
+    local_pfx.fp_len = 24;
+    fib_table_entry_update_one_path(fib_index,
+				    &local_pfx,
+				    FIB_SOURCE_API,
+				    FIB_ENTRY_FLAG_NONE,
+				    FIB_PROTOCOL_IP4,
+				    NULL,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 reinstalled in export");
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "Adj-fib1 is not drop in export");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_2_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 reinstalled in export");
+    local_pfx.fp_len = 32;
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local reinstalled in export");
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached in export: ADJ-fib1 imported");
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "Adj-fib1 is not drop in export");
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 imported");
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 imported");
+    local_pfx.fp_len = 32;
+    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local imported");
+
+    /*
+     * modify the export prefix so connected. no change.
+     */
+    local_pfx.fp_len = 24;
+    fib_table_entry_update_one_path(fib_index, &local_pfx,
+				    FIB_SOURCE_INTERFACE,
+				    (FIB_ENTRY_FLAG_CONNECTED |
+				     FIB_ENTRY_FLAG_ATTACHED),
+				    FIB_PROTOCOL_IP4,
+				    NULL,
+				    tm->hw[0]->sw_if_index,
+				    ~0,
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 reinstalled in export");
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "Adj-fib1 is not drop in export");
+    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_2_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 reinstalled in export");
+    local_pfx.fp_len = 32;
+    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local reinstalled in export");
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached in export: ADJ-fib1 imported");
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
+	     "Adj-fib1 is not drop in export");
+    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 imported");
+    local_pfx.fp_len = 32;
+    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local imported");
+
+    /*
+     * CLEANUP
+     */
+    fib_table_entry_delete(fib_index,
+                           &pfx_10_0_0_0_s_8,
+                           FIB_SOURCE_API);
+    fib_table_entry_delete(fib_index,
+			   &pfx_10_10_10_1_s_32,
+			   FIB_SOURCE_ADJ);
+    fib_table_entry_delete(fib_index,
+			   &pfx_10_10_10_2_s_32,
+			   FIB_SOURCE_ADJ);
+    local_pfx.fp_len = 32;
+    fib_table_entry_delete(fib_index,
+			   &local_pfx,
+			   FIB_SOURCE_INTERFACE);
+    local_pfx.fp_len = 24;
+    fib_table_entry_delete(fib_index,
+			   &local_pfx,
+			   FIB_SOURCE_API);
+    fib_table_entry_delete(fib_index,
+			   &local_pfx,
+			   FIB_SOURCE_INTERFACE);
+    local_pfx.fp_len = 24;
+    fib_table_entry_delete(import_fib_index1,
+			   &local_pfx,
+			   FIB_SOURCE_API);
+
+    fib_table_unlock(import_fib_index1, FIB_PROTOCOL_IP4);
+    fib_table_unlock(import_fib_index2, FIB_PROTOCOL_IP4);
+
+    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
+	     adj_nbr_db_size());
+
+    return (0);
+}
+
+
+/*
+ * Test the recursive route route handling for GRE tunnels
+ */
+static int
+fib_test_label (void)
+{
+    fib_node_index_t fei, ai_mpls_10_10_10_1, ai_v4_10_10_11_1, ai_v4_10_10_11_2, ai_mpls_10_10_11_2, ai_mpls_10_10_11_1;
+    const u32 fib_index = 0;
+    test_main_t *tm;
+    ip4_main_t *im;
+    int lb_count, ii;
+
+    lb_count = pool_elts(load_balance_pool);
+    tm = &test_main;
+    im = &ip4_main;
+
+    /*
+     * add interface routes. We'll assume this works. It's more rigorously
+     * tested elsewhere.
+     */
+    fib_prefix_t local0_pfx = {
+	.fp_len = 24,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4 = {
+		/* 10.10.10.10 */
+		.as_u32 = clib_host_to_net_u32(0x0a0a0a0a),
+	    },
+	},
+    };
+
+    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
+	     adj_nbr_db_size());
+
+    vec_validate(im->fib_index_by_sw_if_index, tm->hw[0]->sw_if_index);
+    im->fib_index_by_sw_if_index[tm->hw[0]->sw_if_index] = fib_index;
+
+    fib_table_entry_update_one_path(fib_index, &local0_pfx,
+				    FIB_SOURCE_INTERFACE,
+				    (FIB_ENTRY_FLAG_CONNECTED |
+				     FIB_ENTRY_FLAG_ATTACHED),
+				    FIB_PROTOCOL_IP4,
+				    NULL,
+				    tm->hw[0]->sw_if_index,
+				    ~0,
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &local0_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
+	     "attached interface route present");
+
+    local0_pfx.fp_len = 32;
+    fib_table_entry_update_one_path(fib_index, &local0_pfx,
+				    FIB_SOURCE_INTERFACE,
+				    (FIB_ENTRY_FLAG_CONNECTED |
+				     FIB_ENTRY_FLAG_LOCAL),
+				    FIB_PROTOCOL_IP4,
+				    NULL,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &local0_pfx);
+
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
+	     "local interface route present");
+
+    fib_prefix_t local1_pfx = {
+	.fp_len = 24,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4 = {
+		/* 10.10.11.10 */
+		.as_u32 = clib_host_to_net_u32(0x0a0a0b0a),
+	    },
+	},
+    };
+
+    vec_validate(im->fib_index_by_sw_if_index, tm->hw[1]->sw_if_index);
+    im->fib_index_by_sw_if_index[tm->hw[1]->sw_if_index] = fib_index;
+
+    fib_table_entry_update_one_path(fib_index, &local1_pfx,
+				    FIB_SOURCE_INTERFACE,
+				    (FIB_ENTRY_FLAG_CONNECTED |
+				     FIB_ENTRY_FLAG_ATTACHED),
+				    FIB_PROTOCOL_IP4,
+				    NULL,
+				    tm->hw[1]->sw_if_index,
+				    ~0,
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &local1_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
+	     "attached interface route present");
+
+    local1_pfx.fp_len = 32;
+    fib_table_entry_update_one_path(fib_index, &local1_pfx,
+				    FIB_SOURCE_INTERFACE,
+				    (FIB_ENTRY_FLAG_CONNECTED |
+				     FIB_ENTRY_FLAG_LOCAL),
+				    FIB_PROTOCOL_IP4,
+				    NULL,
+				    tm->hw[1]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_lookup_exact_match(fib_index, &local1_pfx);
+
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
+	     "local interface route present");
+
+    ip46_address_t nh_10_10_10_1 = {
+	.ip4 = {
+	    .as_u32 = clib_host_to_net_u32(0x0a0a0a01),
+	},
+    };
+    ip46_address_t nh_10_10_11_1 = {
+	.ip4 = {
+	    .as_u32 = clib_host_to_net_u32(0x0a0a0b01),
+	},
+    };
+    ip46_address_t nh_10_10_11_2 = {
+	.ip4 = {
+	    .as_u32 = clib_host_to_net_u32(0x0a0a0b02),
+	},
+    };
+
+    ai_v4_10_10_11_1 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
+                                           VNET_LINK_IP4,
+                                           &nh_10_10_11_1,
+                                           tm->hw[1]->sw_if_index);
+    ai_v4_10_10_11_2 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
+                                           VNET_LINK_IP4,
+                                           &nh_10_10_11_2,
+                                           tm->hw[1]->sw_if_index);
+    ai_mpls_10_10_10_1 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
+                                             VNET_LINK_MPLS,
+                                             &nh_10_10_10_1,
+                                             tm->hw[0]->sw_if_index);
+    ai_mpls_10_10_11_2 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
+                                             VNET_LINK_MPLS,
+                                             &nh_10_10_11_2,
+                                             tm->hw[1]->sw_if_index);
+    ai_mpls_10_10_11_1 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
+                                             VNET_LINK_MPLS,
+                                             &nh_10_10_11_1,
+                                             tm->hw[1]->sw_if_index);
+
+    /*
+     * Add an etry with one path with a real out-going label
+     */
+    fib_prefix_t pfx_1_1_1_1_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x01010101),
+	},
+    };
+    fib_test_lb_bucket_t l99_eos_o_10_10_10_1 = {
+	.type = FT_LB_LABEL_O_ADJ,
+	.label_o_adj = {
+	    .adj = ai_mpls_10_10_10_1,
+	    .label = 99,
+	    .eos = MPLS_EOS,
+	},
+    };
+    fib_test_lb_bucket_t l99_neos_o_10_10_10_1 = {
+	.type = FT_LB_LABEL_O_ADJ,
+	.label_o_adj = {
+	    .adj = ai_mpls_10_10_10_1,
+	    .label = 99,
+	    .eos = MPLS_NON_EOS,
+	},
+    };
+    mpls_label_t *l99 = NULL;
+    vec_add1(l99, 99);
+
+    fib_table_entry_update_one_path(fib_index,
+				    &pfx_1_1_1_1_s_32,
+				    FIB_SOURCE_API,
+				    FIB_ENTRY_FLAG_NONE,
+				    FIB_PROTOCOL_IP4,
+				    &nh_10_10_10_1,
+				    tm->hw[0]->sw_if_index,
+				    ~0, // invalid fib index
+				    1,
+				    l99,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "1.1.1.1/32 created");
+
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &l99_eos_o_10_10_10_1),
+	     "1.1.1.1/32 LB 1 bucket via label 99 over 10.10.10.1");
+
+    /*
+     * add a path with an implicit NULL label
+     */
+    fib_test_lb_bucket_t a_o_10_10_11_1 = {
+	.type = FT_LB_ADJ,
+	.adj = {
+	    .adj = ai_v4_10_10_11_1,
+	},
+    };
+    fib_test_lb_bucket_t a_mpls_o_10_10_11_1 = {
+	.type = FT_LB_ADJ,
+	.adj = {
+	    .adj = ai_mpls_10_10_11_1,
+	},
+    };
+    mpls_label_t *l_imp_null = NULL;
+    vec_add1(l_imp_null, MPLS_IETF_IMPLICIT_NULL_LABEL);
+
+    fei = fib_table_entry_path_add(fib_index,
+				   &pfx_1_1_1_1_s_32,
+				   FIB_SOURCE_API,
+				   FIB_ENTRY_FLAG_NONE,
+				   FIB_PROTOCOL_IP4,
+				   &nh_10_10_11_1,
+				   tm->hw[1]->sw_if_index,
+				   ~0, // invalid fib index
+				   1,
+				   l_imp_null,
+				   FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     2,
+				     &l99_eos_o_10_10_10_1,
+				     &a_o_10_10_11_1),
+	     "1.1.1.1/32 LB 2 buckets via: "
+	     "label 99 over 10.10.10.1, "
+	     "adj over 10.10.11.1");
+
+    /*
+     * assign the route a local label
+     */
+    fib_table_entry_local_label_add(fib_index,
+				    &pfx_1_1_1_1_s_32,
+				    24001);
+
+    fib_prefix_t pfx_24001_eos = {
+	.fp_proto = FIB_PROTOCOL_MPLS,
+	.fp_label = 24001,
+	.fp_eos = MPLS_EOS,
+    };
+    fib_prefix_t pfx_24001_neos = {
+	.fp_proto = FIB_PROTOCOL_MPLS,
+	.fp_label = 24001,
+	.fp_eos = MPLS_NON_EOS,
+    };
+
+    /*
+     * The EOS entry should link to both the paths,
+     *  and use an ip adj for the imp-null
+     * The NON-EOS entry should link to both the paths,
+     *  and use an mpls adj for the imp-null
+     */
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_24001_eos);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+				     2,
+				     &l99_eos_o_10_10_10_1,
+				     &a_o_10_10_11_1),
+	     "24001/eos LB 2 buckets via: "
+	     "label 99 over 10.10.10.1, "
+	     "adj over 10.10.11.1");
+
+
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_24001_neos);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+				     2,
+				     &l99_neos_o_10_10_10_1,
+				     &a_mpls_o_10_10_11_1),
+	     "24001/neos LB 1 bucket via: "
+	     "label 99 over 10.10.10.1 ",
+	     "mpls-adj via 10.10.11.1");
+
+    /*
+     * add an unlabelled path, this is excluded from the neos chains,
+     */
+    fib_test_lb_bucket_t adj_o_10_10_11_2 = {
+	.type = FT_LB_ADJ,
+	.adj = {
+	    .adj = ai_v4_10_10_11_2,
+	},
+    };
+
+    fei = fib_table_entry_path_add(fib_index,
+				   &pfx_1_1_1_1_s_32,
+				   FIB_SOURCE_API,
+				   FIB_ENTRY_FLAG_NONE,
+				   FIB_PROTOCOL_IP4,
+				   &nh_10_10_11_2,
+				   tm->hw[1]->sw_if_index,
+				   ~0, // invalid fib index
+				   1,
+				   NULL,
+				   FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     16, // 3 choices spread over 16 buckets
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &a_o_10_10_11_1,
+				     &a_o_10_10_11_1,
+				     &a_o_10_10_11_1,
+				     &a_o_10_10_11_1,
+				     &a_o_10_10_11_1,
+				     &adj_o_10_10_11_2,
+				     &adj_o_10_10_11_2,
+				     &adj_o_10_10_11_2,
+				     &adj_o_10_10_11_2,
+				     &adj_o_10_10_11_2),
+	     "1.1.1.1/32 LB 16 buckets via: "
+	     "label 99 over 10.10.10.1, "
+	     "adj over 10.10.11.1",
+	     "adj over 10.10.11.2");
+
+    /*
+     * get and lock a reference to the non-eos of the via entry 1.1.1.1/32
+     */
+    dpo_id_t non_eos_1_1_1_1 = DPO_INVALID;
+    fib_entry_contribute_forwarding(fei,
+				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+				    &non_eos_1_1_1_1);
+
+    /*
+     * n-eos has only the 2 labelled paths
+     */
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_24001_neos);
+
+    FIB_TEST(fib_test_validate_entry(fei,
+				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+				     2,
+				     &l99_neos_o_10_10_10_1,
+				     &a_mpls_o_10_10_11_1),
+	     "24001/neos LB 2 buckets via: "
+	     "label 99 over 10.10.10.1, "
+	     "adj-mpls over 10.10.11.2");
+
+    /*
+     * A labelled recursive
+     */
+    fib_prefix_t pfx_2_2_2_2_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x02020202),
+	},
+    };
+    fib_test_lb_bucket_t l1600_eos_o_1_1_1_1 = {
+	.type = FT_LB_LABEL_O_LB,
+	.label_o_lb = {
+	    .lb = non_eos_1_1_1_1.dpoi_index,
+	    .label = 1600,
+	    .eos = MPLS_EOS,
+	},
+    };
+    mpls_label_t *l1600 = NULL;
+    vec_add1(l1600, 1600);
+
+    fib_table_entry_update_one_path(fib_index,
+				    &pfx_2_2_2_2_s_32,
+				    FIB_SOURCE_API,
+				    FIB_ENTRY_FLAG_NONE,
+				    FIB_PROTOCOL_IP4,
+				    &pfx_1_1_1_1_s_32.fp_addr,
+				    ~0,
+				    fib_index,
+				    1,
+				    l1600,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_2_2_2_2_s_32);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &l1600_eos_o_1_1_1_1),
+	     "2.2.2.2.2/32 LB 1 buckets via: "
+	     "label 1600 over 1.1.1.1");
+
+    dpo_id_t dpo_44 = DPO_INVALID;
+    index_t urpfi;
+
+    fib_entry_contribute_forwarding(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, &dpo_44);
+    urpfi = load_balance_get_urpf(dpo_44.dpoi_index);
+
+    FIB_TEST(fib_urpf_check(urpfi, tm->hw[0]->sw_if_index),
+	     "uRPF check for 2.2.2.2/32 on %d OK",
+	     tm->hw[0]->sw_if_index);
+    FIB_TEST(fib_urpf_check(urpfi, tm->hw[1]->sw_if_index),
+	     "uRPF check for 2.2.2.2/32 on %d OK",
+	     tm->hw[1]->sw_if_index);
+    FIB_TEST(!fib_urpf_check(urpfi, 99),
+	     "uRPF check for 2.2.2.2/32 on 99 not-OK",
+	     99);
+
+    fib_entry_contribute_forwarding(fei, FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS, &dpo_44);
+    FIB_TEST(urpfi == load_balance_get_urpf(dpo_44.dpoi_index),
+	     "Shared uRPF on IP and non-EOS chain");
+
+    dpo_reset(&dpo_44);
+
+    /*
+     * we are holding a lock on the non-eos LB of the via-entry.
+     * do a PIC-core failover by shutting the link of the via-entry.
+     *
+     * shut down the link with the valid label
+     */
+    vnet_sw_interface_set_flags(vnet_get_main(),
+				tm->hw[0]->sw_if_index,
+				0);
+
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     2,
+				     &a_o_10_10_11_1,
+				     &adj_o_10_10_11_2),
+	     "1.1.1.1/32 LB 2 buckets via: "
+	     "adj over 10.10.11.1, ",
+	     "adj-v4 over 10.10.11.2");
+
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_24001_eos);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+				     2,
+				     &a_o_10_10_11_1,
+				     &adj_o_10_10_11_2),
+	     "24001/eos LB 2 buckets via: "
+	     "adj over 10.10.11.1, ",
+	     "adj-v4 over 10.10.11.2");
+
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_24001_neos);
+    FIB_TEST(fib_test_validate_entry(fei,
+				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+				     1,
+				     &a_mpls_o_10_10_11_1),
+	     "24001/neos LB 1 buckets via: "
+	     "adj-mpls over 10.10.11.2");
+
+    /*
+     * test that the pre-failover load-balance has been in-place
+     * modified
+     */
+    dpo_id_t current = DPO_INVALID;
+    fib_entry_contribute_forwarding(fei,
+				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+				    &current);
+
+    FIB_TEST(!dpo_cmp(&non_eos_1_1_1_1,
+                      &current),
+	     "PIC-core LB inplace modified %U %U",
+             format_dpo_id, &non_eos_1_1_1_1, 0,
+             format_dpo_id, &current, 0);
+
+    dpo_reset(&non_eos_1_1_1_1);
+    dpo_reset(&current);
+
+    /*
+     * no-shut the link with the valid label
+     */
+    vnet_sw_interface_set_flags(vnet_get_main(),
+				tm->hw[0]->sw_if_index,
+				VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     16, // 3 choices spread over 16 buckets
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &a_o_10_10_11_1,
+				     &a_o_10_10_11_1,
+				     &a_o_10_10_11_1,
+				     &a_o_10_10_11_1,
+				     &a_o_10_10_11_1,
+				     &adj_o_10_10_11_2,
+				     &adj_o_10_10_11_2,
+				     &adj_o_10_10_11_2,
+				     &adj_o_10_10_11_2,
+				     &adj_o_10_10_11_2),
+	     "1.1.1.1/32 LB 16 buckets via: "
+	     "label 99 over 10.10.10.1, "
+	     "adj over 10.10.11.1",
+	     "adj-v4 over 10.10.11.2");
+
+
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_24001_eos);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+				     16, // 3 choices spread over 16 buckets
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &l99_eos_o_10_10_10_1,
+				     &a_o_10_10_11_1,
+				     &a_o_10_10_11_1,
+				     &a_o_10_10_11_1,
+				     &a_o_10_10_11_1,
+				     &a_o_10_10_11_1,
+				     &adj_o_10_10_11_2,
+				     &adj_o_10_10_11_2,
+				     &adj_o_10_10_11_2,
+				     &adj_o_10_10_11_2,
+				     &adj_o_10_10_11_2),
+	     "24001/eos LB 16 buckets via: "
+	     "label 99 over 10.10.10.1, "
+	     "adj over 10.10.11.1",
+	     "adj-v4 over 10.10.11.2");
+
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_24001_neos);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+				     2,
+				     &l99_neos_o_10_10_10_1,
+				     &a_mpls_o_10_10_11_1),
+	     "24001/neos LB 2 buckets via: "
+	     "label 99 over 10.10.10.1, "
+	     "adj-mpls over 10.10.11.2");
+
+    /*
+     * remove the first path with the valid label
+     */
+    fib_table_entry_path_remove(fib_index,
+				&pfx_1_1_1_1_s_32,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_10_10_10_1,
+				tm->hw[0]->sw_if_index,
+				~0, // invalid fib index
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     2,
+				     &a_o_10_10_11_1,
+				     &adj_o_10_10_11_2),
+	     "1.1.1.1/32 LB 2 buckets via: "
+	     "adj over 10.10.11.1",
+	     "adj-v4 over 10.10.11.2");
+
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_24001_eos);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+				     2,
+				     &a_o_10_10_11_1,
+				     &adj_o_10_10_11_2),
+	     "24001/eos LB 2 buckets via: "
+	     "adj over 10.10.11.1",
+	     "adj-v4 over 10.10.11.2");
+
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_24001_neos);
+
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+				     1,
+				     &a_mpls_o_10_10_11_1),
+	     "24001/neos LB 1 buckets via: "
+	     "adj-mpls over 10.10.11.2");
+
+    /*
+     * remove the other path with a valid label
+     */
+    fib_test_lb_bucket_t bucket_drop = {
+	.type = FT_LB_SPECIAL,
+	.special = {
+	    .adj = DPO_PROTO_IP4,
+	},
+    };
+
+    fib_table_entry_path_remove(fib_index,
+				&pfx_1_1_1_1_s_32,
+				FIB_SOURCE_API,
+				FIB_PROTOCOL_IP4,
+				&nh_10_10_11_1,
+				tm->hw[1]->sw_if_index,
+				~0, // invalid fib index
+				1,
+				FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &adj_o_10_10_11_2),
+	     "1.1.1.1/32 LB 1 buckets via: "
+	     "adj over 10.10.11.2");
+
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_24001_eos);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+				     1,
+				     &adj_o_10_10_11_2),
+	     "24001/eos LB 1 buckets via: "
+	     "adj over 10.10.11.2");
+
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_24001_neos);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+				      1,
+				      &bucket_drop),
+	     "24001/eos LB 1 buckets via: DROP");
+
+    /*
+     * add back the path with the valid label
+     */
+    l99 = NULL;
+    vec_add1(l99, 99);
+
+    fib_table_entry_path_add(fib_index,
+			     &pfx_1_1_1_1_s_32,
+			     FIB_SOURCE_API,
+			     FIB_ENTRY_FLAG_NONE,
+			     FIB_PROTOCOL_IP4,
+			     &nh_10_10_10_1,
+			     tm->hw[0]->sw_if_index,
+			     ~0, // invalid fib index
+			     1,
+			     l99,
+			     FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
+    FIB_TEST(fib_test_validate_entry(fei,
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     2,
+				     &l99_eos_o_10_10_10_1,
+				     &adj_o_10_10_11_2),
+	     "1.1.1.1/32 LB 2 buckets via: "
+	     "label 99 over 10.10.10.1, "
+	     "adj over 10.10.11.2");
+
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_24001_eos);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+				     2,
+				     &l99_eos_o_10_10_10_1,
+				     &adj_o_10_10_11_2),
+	     "24001/eos LB 2 buckets via: "
+	     "label 99 over 10.10.10.1, "
+	     "adj over 10.10.11.2");
+
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_24001_neos);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+				     1,
+				     &l99_neos_o_10_10_10_1),
+	     "24001/neos LB 1 buckets via: "
+	     "label 99 over 10.10.10.1");
+
+    /*
+     * change the local label
+     */
+    fib_table_entry_local_label_add(fib_index,
+				    &pfx_1_1_1_1_s_32,
+				    25005);
+
+    fib_prefix_t pfx_25005_eos = {
+	.fp_proto = FIB_PROTOCOL_MPLS,
+	.fp_label = 25005,
+	.fp_eos = MPLS_EOS,
+    };
+    fib_prefix_t pfx_25005_neos = {
+	.fp_proto = FIB_PROTOCOL_MPLS,
+	.fp_label = 25005,
+	.fp_eos = MPLS_NON_EOS,
+    };
+
+    FIB_TEST((FIB_NODE_INDEX_INVALID ==
+	      fib_table_lookup(fib_index, &pfx_24001_eos)),
+	     "24001/eos removed after label change");
+    FIB_TEST((FIB_NODE_INDEX_INVALID ==
+	      fib_table_lookup(fib_index, &pfx_24001_neos)),
+	     "24001/eos removed after label change");
+
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_25005_eos);
+    FIB_TEST(fib_test_validate_entry(fei,
+				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+				     2,
+				     &l99_eos_o_10_10_10_1,
+				     &adj_o_10_10_11_2),
+	     "25005/eos LB 2 buckets via: "
+	     "label 99 over 10.10.10.1, "
+	     "adj over 10.10.11.2");
+
+    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
+			   &pfx_25005_neos);
+    FIB_TEST(fib_test_validate_entry(fei,
+				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+				     1,
+				     &l99_neos_o_10_10_10_1),
+	     "25005/neos LB 1 buckets via: "
+	     "label 99 over 10.10.10.1");
+
+    /*
+     * remove the local label.
+     * the check that the MPLS entries are gone is done by the fact the
+     * MPLS table is no longer present.
+     */
+    fib_table_entry_local_label_remove(fib_index,
+				       &pfx_1_1_1_1_s_32,
+				       25005);
+
+    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     2,
+				     &l99_eos_o_10_10_10_1,
+				     &adj_o_10_10_11_2),
+	     "24001/eos LB 2 buckets via: "
+	     "label 99 over 10.10.10.1, "
+	     "adj over 10.10.11.2");
+
+    FIB_TEST((FIB_NODE_INDEX_INVALID ==
+	      mpls_fib_index_from_table_id(MPLS_FIB_DEFAULT_TABLE_ID)),
+	     "No more MPLS FIB entries => table removed");
+
+    /*
+     * add another via-entry for the recursive
+     */
+    fib_prefix_t pfx_1_1_1_2_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x01010102),
+	},
+    };
+    fib_test_lb_bucket_t l101_eos_o_10_10_10_1 = {
+	.type = FT_LB_LABEL_O_ADJ,
+	.label_o_adj = {
+	    .adj = ai_mpls_10_10_10_1,
+	    .label = 101,
+	    .eos = MPLS_EOS,
+	},
+    };
+    mpls_label_t *l101 = NULL;
+    vec_add1(l101, 101);
+
+    fei = fib_table_entry_update_one_path(fib_index,
+					  &pfx_1_1_1_2_s_32,
+					  FIB_SOURCE_API,
+					  FIB_ENTRY_FLAG_NONE,
+					  FIB_PROTOCOL_IP4,
+					  &nh_10_10_10_1,
+					  tm->hw[0]->sw_if_index,
+					  ~0, // invalid fib index
+					  1,
+					  l101,
+					  FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST(fib_test_validate_entry(fei,
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &l101_eos_o_10_10_10_1),
+	     "1.1.1.2/32 LB 1 buckets via: "
+	     "label 101 over 10.10.10.1");
+
+    dpo_id_t non_eos_1_1_1_2 = DPO_INVALID;
+    fib_entry_contribute_forwarding(fib_table_lookup(fib_index,
+						     &pfx_1_1_1_1_s_32),
+				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+				    &non_eos_1_1_1_1);
+    fib_entry_contribute_forwarding(fib_table_lookup(fib_index,
+						     &pfx_1_1_1_2_s_32),
+				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+				    &non_eos_1_1_1_2);
+
+    fib_test_lb_bucket_t l1601_eos_o_1_1_1_2 = {
+    	.type = FT_LB_LABEL_O_LB,
+    	.label_o_lb = {
+    	    .lb = non_eos_1_1_1_2.dpoi_index,
+    	    .label = 1601,
+    	    .eos = MPLS_EOS,
+    	},
+    };
+    mpls_label_t *l1601 = NULL;
+    vec_add1(l1601, 1601);
+
+    l1600_eos_o_1_1_1_1.label_o_lb.lb = non_eos_1_1_1_1.dpoi_index;
+
+    fei = fib_table_entry_path_add(fib_index,
+				   &pfx_2_2_2_2_s_32,
+				   FIB_SOURCE_API,
+				   FIB_ENTRY_FLAG_NONE,
+				   FIB_PROTOCOL_IP4,
+				   &pfx_1_1_1_2_s_32.fp_addr,
+				   ~0,
+				   fib_index,
+				   1,
+				   l1601,
+				   FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     2,
+				     &l1600_eos_o_1_1_1_1,
+				     &l1601_eos_o_1_1_1_2),
+	     "2.2.2.2/32 LB 2 buckets via: "
+	     "label 1600 via 1.1,1.1, "
+	     "label 16001 via 1.1.1.2");
+
+    /*
+     * update the via-entry so it no longer has an imp-null path.
+     * the LB for the recursive can use an imp-null
+     */
+    l_imp_null = NULL;
+    vec_add1(l_imp_null, MPLS_IETF_IMPLICIT_NULL_LABEL);
+
+    fei = fib_table_entry_update_one_path(fib_index,
+					  &pfx_1_1_1_2_s_32,
+					  FIB_SOURCE_API,
+					  FIB_ENTRY_FLAG_NONE,
+					  FIB_PROTOCOL_IP4,
+					  &nh_10_10_11_1,
+					  tm->hw[1]->sw_if_index,
+					  ~0, // invalid fib index
+					  1,
+					  l_imp_null,
+					  FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST(fib_test_validate_entry(fei,
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &a_o_10_10_11_1),
+	     "1.1.1.2/32 LB 1 buckets via: "
+	     "adj 10.10.11.1");
+ 
+    fei = fib_table_lookup(fib_index, &pfx_2_2_2_2_s_32);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     2,
+				     &l1600_eos_o_1_1_1_1,
+				     &l1601_eos_o_1_1_1_2),
+	     "2.2.2.2/32 LB 2 buckets via: "
+	     "label 1600 via 1.1,1.1, "
+	     "label 16001 via 1.1.1.2");
+
+    /*
+     * update the via-entry so it no longer has labelled paths.
+     * the LB for the recursive should exclue this via form its LB
+     */
+    fei = fib_table_entry_update_one_path(fib_index,
+					  &pfx_1_1_1_2_s_32,
+					  FIB_SOURCE_API,
+					  FIB_ENTRY_FLAG_NONE,
+					  FIB_PROTOCOL_IP4,
+					  &nh_10_10_11_1,
+					  tm->hw[1]->sw_if_index,
+					  ~0, // invalid fib index
+					  1,
+					  NULL,
+					  FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST(fib_test_validate_entry(fei,
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &a_o_10_10_11_1),
+	     "1.1.1.2/32 LB 1 buckets via: "
+	     "adj 10.10.11.1");
+ 
+    fei = fib_table_lookup(fib_index, &pfx_2_2_2_2_s_32);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &l1600_eos_o_1_1_1_1),
+	     "2.2.2.2/32 LB 1 buckets via: "
+	     "label 1600 via 1.1,1.1");
+
+    dpo_reset(&non_eos_1_1_1_1);
+    dpo_reset(&non_eos_1_1_1_2);
+
+    /*
+     * Add a recursive with no out-labels. We expect to use the IP of the via
+     */
+    fib_prefix_t pfx_2_2_2_3_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x02020203),
+	},
+    };
+    dpo_id_t ip_1_1_1_1 = DPO_INVALID;
+
+    fib_table_entry_update_one_path(fib_index,
+				    &pfx_2_2_2_3_s_32,
+				    FIB_SOURCE_API,
+				    FIB_ENTRY_FLAG_NONE,
+				    FIB_PROTOCOL_IP4,
+				    &pfx_1_1_1_1_s_32.fp_addr,
+				    ~0,
+				    fib_index,
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+
+    fib_entry_contribute_forwarding(fib_table_lookup(fib_index,
+						     &pfx_1_1_1_1_s_32),
+				    FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				    &ip_1_1_1_1);
+
+    fib_test_lb_bucket_t ip_o_1_1_1_1 = {
+	.type = FT_LB_O_LB,
+	.lb = {
+	    .lb = ip_1_1_1_1.dpoi_index,
+	},
+    };
+
+    fei = fib_table_lookup(fib_index, &pfx_2_2_2_3_s_32);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &ip_o_1_1_1_1),
+	     "2.2.2.2.3/32 LB 1 buckets via: "
+	     "ip 1.1.1.1");
+
+    /*
+     * Add a recursive with an imp-null out-label. 
+     * We expect to use the IP of the via
+     */
+    fib_prefix_t pfx_2_2_2_4_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x02020204),
+	},
+    };
+
+    fib_table_entry_update_one_path(fib_index,
+				    &pfx_2_2_2_4_s_32,
+				    FIB_SOURCE_API,
+				    FIB_ENTRY_FLAG_NONE,
+				    FIB_PROTOCOL_IP4,
+				    &pfx_1_1_1_1_s_32.fp_addr,
+				    ~0,
+				    fib_index,
+				    1,
+				    NULL,
+				    FIB_ROUTE_PATH_FLAG_NONE);
+
+    fei = fib_table_lookup(fib_index, &pfx_2_2_2_4_s_32);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &ip_o_1_1_1_1),
+	     "2.2.2.2.4/32 LB 1 buckets via: "
+	     "ip 1.1.1.1");
+
+    dpo_reset(&ip_1_1_1_1);
+
+    /*
+     * Create an entry with a deep label stack
+     */
+    fib_prefix_t pfx_2_2_5_5_s_32 = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr = {
+	    .ip4.as_u32 = clib_host_to_net_u32(0x02020505),
+	},
+    };
+    fib_test_lb_bucket_t ls_eos_o_10_10_10_1 = {
+	.type = FT_LB_LABEL_STACK_O_ADJ,
+	.label_stack_o_adj = {
+	    .adj = ai_mpls_10_10_11_1,
+	    .label_stack_size = 8,
+	    .label_stack = {
+		200, 201, 202, 203, 204, 205, 206, 207
+	    },
+	    .eos = MPLS_EOS,
+	},
+    };
+    mpls_label_t *label_stack = NULL;
+    vec_validate(label_stack, 7);
+    for (ii = 0; ii < 8; ii++)
+    {
+	label_stack[ii] = ii + 200;
+    }
+
+    fei = fib_table_entry_update_one_path(fib_index,
+					  &pfx_2_2_5_5_s_32,
+					  FIB_SOURCE_API,
+					  FIB_ENTRY_FLAG_NONE,
+					  FIB_PROTOCOL_IP4,
+					  &nh_10_10_11_1,
+					  tm->hw[1]->sw_if_index,
+					  ~0, // invalid fib index
+					  1,
+					  label_stack,
+					  FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST(fib_test_validate_entry(fei,
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &ls_eos_o_10_10_10_1),
+	     "2.2.5.5/32 LB 1 buckets via: "
+	     "adj 10.10.11.1");
+    fib_table_entry_delete_index(fei, FIB_SOURCE_API);
+
+    /*
+     * cleanup
+     */
+    fib_table_entry_delete(fib_index,
+			   &pfx_1_1_1_2_s_32,
+			   FIB_SOURCE_API);
+
+    fei = fib_table_lookup(fib_index, &pfx_2_2_2_2_s_32);
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &l1600_eos_o_1_1_1_1),
+	     "2.2.2.2/32 LB 1 buckets via: "
+	     "label 1600 via 1.1,1.1");
+
+    fib_table_entry_delete(fib_index,
+			   &pfx_1_1_1_1_s_32,
+			   FIB_SOURCE_API);
+
+    FIB_TEST(fib_test_validate_entry(fei, 
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &bucket_drop),
+	     "2.2.2.2/32 LB 1 buckets via: DROP");
+
+    fib_table_entry_delete(fib_index,
+			   &pfx_2_2_2_2_s_32,
+			   FIB_SOURCE_API);
+    fib_table_entry_delete(fib_index,
+			   &pfx_2_2_2_3_s_32,
+			   FIB_SOURCE_API);
+    fib_table_entry_delete(fib_index,
+			   &pfx_2_2_2_4_s_32,
+			   FIB_SOURCE_API);
+
+    adj_unlock(ai_mpls_10_10_10_1);
+    adj_unlock(ai_mpls_10_10_11_2);
+    adj_unlock(ai_v4_10_10_11_1);
+    adj_unlock(ai_v4_10_10_11_2);
+    adj_unlock(ai_mpls_10_10_11_1);
+
+    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
+	     adj_nbr_db_size());
+
+    local0_pfx.fp_len = 32;
+    fib_table_entry_delete(fib_index,
+			   &local0_pfx,
+			   FIB_SOURCE_INTERFACE);
+    local0_pfx.fp_len = 24;
+    fib_table_entry_delete(fib_index,
+			   &local0_pfx,
+			   FIB_SOURCE_INTERFACE);
+    local1_pfx.fp_len = 32;
+    fib_table_entry_delete(fib_index,
+			   &local1_pfx,
+			   FIB_SOURCE_INTERFACE);
+    local1_pfx.fp_len = 24;
+    fib_table_entry_delete(fib_index,
+			   &local1_pfx,
+			   FIB_SOURCE_INTERFACE);
+
+    /*
+     * +1 for the drop LB in the MPLS tables.
+     */
+    FIB_TEST(lb_count+1 == pool_elts(load_balance_pool),
+	     "Load-balance resources freed %d of %d",
+             lb_count+1, pool_elts(load_balance_pool));
+
+    return (0);
+}
+
+#define N_TEST_CHILDREN 4
+#define PARENT_INDEX 0
+
+typedef struct fib_node_test_t_
+{
+    fib_node_t node;
+    u32 sibling;
+    u32 index;
+    fib_node_back_walk_ctx_t *ctxs;
+    u32 destroyed;
+} fib_node_test_t;
+
+static fib_node_test_t fib_test_nodes[N_TEST_CHILDREN+1];
+
+#define PARENT() (&fib_test_nodes[PARENT_INDEX].node)
+
+#define FOR_EACH_TEST_CHILD(_tc)                     \
+    for (ii = 1, (_tc) = &fib_test_nodes[1];         \
+         ii < N_TEST_CHILDREN+1;                     \
+         ii++, (_tc) = &fib_test_nodes[ii])
+
+static fib_node_t *
+fib_test_child_get_node (fib_node_index_t index)
+{
+    return (&fib_test_nodes[index].node);
+}
+
+static int fib_test_walk_spawns_walks;
+
+static fib_node_back_walk_rc_t
+fib_test_child_back_walk_notify (fib_node_t *node,
+                                 fib_node_back_walk_ctx_t *ctx)
+{
+    fib_node_test_t *tc = (fib_node_test_t*) node;
+
+    vec_add1(tc->ctxs, *ctx);
+
+    if (1 == fib_test_walk_spawns_walks)
+        fib_walk_sync(FIB_NODE_TYPE_TEST, tc->index, ctx);
+    if (2 == fib_test_walk_spawns_walks)
+        fib_walk_async(FIB_NODE_TYPE_TEST, tc->index,
+                       FIB_WALK_PRIORITY_HIGH, ctx);
+
+    return (FIB_NODE_BACK_WALK_CONTINUE);
+}
+
+static void
+fib_test_child_last_lock_gone (fib_node_t *node)
+{
+    fib_node_test_t *tc = (fib_node_test_t *)node;
+
+    tc->destroyed = 1;
+}
+
+/**
+ * The FIB walk's graph node virtual function table
+ */
+static const fib_node_vft_t fib_test_child_vft = {
+    .fnv_get = fib_test_child_get_node,
+    .fnv_last_lock = fib_test_child_last_lock_gone,
+    .fnv_back_walk = fib_test_child_back_walk_notify,
+};
+
+/*
+ * the function (that should have been static but isn't so I can do this)
+ * that processes the walk from the async queue,
+ */
+f64 fib_walk_process_queues(vlib_main_t * vm,
+                            const f64 quota);
+u32 fib_walk_queue_get_size(fib_walk_priority_t prio);
+
+static int
+fib_test_walk (void)
+{
+    fib_node_back_walk_ctx_t high_ctx = {}, low_ctx = {};
+    fib_node_test_t *tc;
+    vlib_main_t *vm;
+    u32 ii;
+
+    vm = vlib_get_main();
+    fib_node_register_type(FIB_NODE_TYPE_TEST, &fib_test_child_vft);
+
+    /*
+     * init a fake node on which we will add children
+     */
+    fib_node_init(&fib_test_nodes[PARENT_INDEX].node,
+                  FIB_NODE_TYPE_TEST);
+
+    FOR_EACH_TEST_CHILD(tc)
+    {
+        fib_node_init(&tc->node, FIB_NODE_TYPE_TEST);
+        fib_node_lock(&tc->node);
+        tc->ctxs = NULL;
+        tc->index = ii;
+        tc->sibling = fib_node_child_add(FIB_NODE_TYPE_TEST,
+                                         PARENT_INDEX,
+                                         FIB_NODE_TYPE_TEST, ii);
+    }
+
+    /*
+     * enqueue a walk across the parents children.
+     */
+    high_ctx.fnbw_reason = FIB_NODE_BW_REASON_FLAG_RESOLVE;
+
+    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
+                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
+    FIB_TEST(N_TEST_CHILDREN+1 == fib_node_list_get_size(PARENT()->fn_children),
+             "Parent has %d children pre-walk",
+             fib_node_list_get_size(PARENT()->fn_children));
+
+    /*
+     * give the walk a large amount of time so it gets to the end
+     */
+    fib_walk_process_queues(vm, 1);
+
+    FOR_EACH_TEST_CHILD(tc)
+    {
+        FIB_TEST(1 == vec_len(tc->ctxs),
+                 "%d child visitsed %d times",
+                 ii, vec_len(tc->ctxs));
+        vec_free(tc->ctxs);
+    }
+    FIB_TEST(0 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
+             "Queue is empty post walk");
+    FIB_TEST(N_TEST_CHILDREN == fib_node_list_get_size(PARENT()->fn_children),
+             "Parent has %d children post walk",
+             fib_node_list_get_size(PARENT()->fn_children));
+
+    /*
+     * walk again. should be no increase in the number of visits, since
+     * the walk will have terminated.
+     */
+    fib_walk_process_queues(vm, 1);
+
+    FOR_EACH_TEST_CHILD(tc)
+    {
+        FIB_TEST(0 == vec_len(tc->ctxs),
+                 "%d child visitsed %d times",
+                 ii, vec_len(tc->ctxs));
+    }
+
+    /*
+     * schedule a low and hig priority walk. expect the high to be performed
+     * before the low.
+     * schedule the high prio walk first so that it is further from the head
+     * of the dependency list. that way it won't merge with the low one.
+     */
+    high_ctx.fnbw_reason = FIB_NODE_BW_REASON_FLAG_RESOLVE;
+    low_ctx.fnbw_reason = FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE;
+
+    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
+                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
+    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
+                   FIB_WALK_PRIORITY_LOW, &low_ctx);
+
+    fib_walk_process_queues(vm, 1);
+
+    FOR_EACH_TEST_CHILD(tc)
+    {
+        FIB_TEST(high_ctx.fnbw_reason == tc->ctxs[0].fnbw_reason,
+                 "%d child visitsed by high prio walk", ii);
+        FIB_TEST(low_ctx.fnbw_reason  == tc->ctxs[1].fnbw_reason,
+                 "%d child visitsed by low prio walk", ii);
+        vec_free(tc->ctxs);
+    }
+    FIB_TEST(0 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
+             "Queue is empty post prio walk");
+    FIB_TEST(N_TEST_CHILDREN == fib_node_list_get_size(PARENT()->fn_children),
+             "Parent has %d children post prio walk",
+             fib_node_list_get_size(PARENT()->fn_children));
+
+    /*
+     * schedule 2 walks of the same priority that can be megred.
+     * expect that each child is thus visited only once.
+     */
+    high_ctx.fnbw_reason = FIB_NODE_BW_REASON_FLAG_RESOLVE;
+    low_ctx.fnbw_reason  = FIB_NODE_BW_REASON_FLAG_RESOLVE;
+
+    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
+                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
+    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
+                   FIB_WALK_PRIORITY_HIGH, &low_ctx);
+
+    fib_walk_process_queues(vm, 1);
+
+    FOR_EACH_TEST_CHILD(tc)
+    {
+        FIB_TEST(1 == vec_len(tc->ctxs),
+                 "%d child visitsed %d times during merge walk",
+                 ii, vec_len(tc->ctxs));
+        vec_free(tc->ctxs);
+    }
+    FIB_TEST(0 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
+             "Queue is empty post merge walk");
+    FIB_TEST(N_TEST_CHILDREN == fib_node_list_get_size(PARENT()->fn_children),
+             "Parent has %d children post merge walk",
+             fib_node_list_get_size(PARENT()->fn_children));
+
+    /*
+     * schedule 2 walks of the same priority that cannot be megred.
+     * expect that each child is thus visited twice and in the order
+     * in which the walks were scheduled.
+     */
+    high_ctx.fnbw_reason = FIB_NODE_BW_REASON_FLAG_RESOLVE;
+    low_ctx.fnbw_reason  = FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE;
+
+    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
+                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
+    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
+                   FIB_WALK_PRIORITY_HIGH, &low_ctx);
+
+    fib_walk_process_queues(vm, 1);
+
+    FOR_EACH_TEST_CHILD(tc)
+    {
+        FIB_TEST(high_ctx.fnbw_reason == tc->ctxs[0].fnbw_reason,
+                 "%d child visitsed by high prio walk", ii);
+        FIB_TEST(low_ctx.fnbw_reason  == tc->ctxs[1].fnbw_reason,
+                 "%d child visitsed by low prio walk", ii);
+        vec_free(tc->ctxs);
+    }
+    FIB_TEST(0 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
+             "Queue is empty post no-merge walk");
+    FIB_TEST(N_TEST_CHILDREN == fib_node_list_get_size(PARENT()->fn_children),
+             "Parent has %d children post no-merge walk",
+             fib_node_list_get_size(PARENT()->fn_children));
+
+    /*
+     * schedule a walk that makes one one child progress.
+     * we do this by giving the queue draining process zero
+     * time quanta. it's a do..while loop, so it does something.
+     */
+    high_ctx.fnbw_reason = FIB_NODE_BW_REASON_FLAG_RESOLVE;
+
+    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
+                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
+    fib_walk_process_queues(vm, 0);
+
+    FOR_EACH_TEST_CHILD(tc)
+    {
+        if (ii == N_TEST_CHILDREN)
+        {
+            FIB_TEST(1 == vec_len(tc->ctxs),
+                     "%d child visitsed %d times in zero quanta walk",
+                     ii, vec_len(tc->ctxs));
+        }
+        else
+        {
+            FIB_TEST(0 == vec_len(tc->ctxs),
+                     "%d child visitsed %d times in 0 quanta walk",
+                     ii, vec_len(tc->ctxs));
+        }
+    }
+    FIB_TEST(1 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
+             "Queue is not empty post zero quanta walk");
+    FIB_TEST(N_TEST_CHILDREN+1 == fib_node_list_get_size(PARENT()->fn_children),
+             "Parent has %d children post zero qunta walk",
+             fib_node_list_get_size(PARENT()->fn_children));
+
+    /*
+     * another one step
+     */
+    fib_walk_process_queues(vm, 0);
+
+    FOR_EACH_TEST_CHILD(tc)
+    {
+        if (ii >= N_TEST_CHILDREN-1)
+        {
+            FIB_TEST(1 == vec_len(tc->ctxs),
+                     "%d child visitsed %d times in 2nd zero quanta walk",
+                     ii, vec_len(tc->ctxs));
+        }
+        else
+        {
+            FIB_TEST(0 == vec_len(tc->ctxs),
+                     "%d child visitsed %d times in 2nd 0 quanta walk",
+                     ii, vec_len(tc->ctxs));
+        }
+    }
+    FIB_TEST(1 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
+             "Queue is not empty post zero quanta walk");
+    FIB_TEST(N_TEST_CHILDREN+1 == fib_node_list_get_size(PARENT()->fn_children),
+             "Parent has %d children post zero qunta walk",
+             fib_node_list_get_size(PARENT()->fn_children));
+
+    /*
+     * schedule another walk that will catch-up and merge.
+     */
+    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
+                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
+    fib_walk_process_queues(vm, 1);
+
+    FOR_EACH_TEST_CHILD(tc)
+    {
+        if (ii >= N_TEST_CHILDREN-1)
+        {
+            FIB_TEST(2 == vec_len(tc->ctxs),
+                     "%d child visitsed %d times in 2nd zero quanta merge walk",
+                     ii, vec_len(tc->ctxs));
+            vec_free(tc->ctxs);
+        }
+        else
+        {
+            FIB_TEST(1 == vec_len(tc->ctxs),
+                     "%d child visitsed %d times in 2nd 0 quanta merge walk",
+                     ii, vec_len(tc->ctxs));
+            vec_free(tc->ctxs);
+        }
+    }
+    FIB_TEST(0 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
+             "Queue is not empty post 2nd zero quanta merge walk");
+    FIB_TEST(N_TEST_CHILDREN == fib_node_list_get_size(PARENT()->fn_children),
+             "Parent has %d children post 2nd zero qunta merge walk",
+             fib_node_list_get_size(PARENT()->fn_children));
+
+    /*
+     * park a async walk in the middle of the list, then have an sync walk catch
+     * it. same expectations as async catches async.
+     */
+    high_ctx.fnbw_reason = FIB_NODE_BW_REASON_FLAG_RESOLVE;
+
+    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
+                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
+
+    fib_walk_process_queues(vm, 0);
+    fib_walk_process_queues(vm, 0);
+
+    fib_walk_sync(FIB_NODE_TYPE_TEST, PARENT_INDEX, &high_ctx);
+
+    FOR_EACH_TEST_CHILD(tc)
+    {
+        if (ii >= N_TEST_CHILDREN-1)
+        {
+            FIB_TEST(2 == vec_len(tc->ctxs),
+                     "%d child visitsed %d times in sync catches async walk",
+                     ii, vec_len(tc->ctxs));
+            vec_free(tc->ctxs);
+        }
+        else
+        {
+            FIB_TEST(1 == vec_len(tc->ctxs),
+                     "%d child visitsed %d times in sync catches async walk",
+                     ii, vec_len(tc->ctxs));
+            vec_free(tc->ctxs);
+        }
+    }
+    FIB_TEST(0 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
+             "Queue is not empty post 2nd zero quanta merge walk");
+    FIB_TEST(N_TEST_CHILDREN == fib_node_list_get_size(PARENT()->fn_children),
+             "Parent has %d children post 2nd zero qunta merge walk",
+             fib_node_list_get_size(PARENT()->fn_children));
+
+    /*
+     * make the parent a child of one of its children, thus inducing a routing loop.
+     */
+    fib_test_nodes[PARENT_INDEX].sibling =
+        fib_node_child_add(FIB_NODE_TYPE_TEST,
+                           1, // the first child
+                           FIB_NODE_TYPE_TEST,
+                           PARENT_INDEX);
+
+    /*
+     * execute a sync walk from the parent. each child visited spawns more sync
+     * walks. we expect the walk to terminate.
+     */
+    fib_test_walk_spawns_walks = 1;
+
+    fib_walk_sync(FIB_NODE_TYPE_TEST, PARENT_INDEX, &high_ctx);
+
+    FOR_EACH_TEST_CHILD(tc)
+    {
+        /*
+         * child 1 - which is last in the list - has the loop.
+         * the other children a re thus visitsed first. the we meet
+         * child 1. we go round the loop again, visting the other children.
+         * then we meet the walk in the dep list and bail. child 1 is not visitsed
+         * again.
+         */
+        if (1 == ii)
+        {
+            FIB_TEST(1 == vec_len(tc->ctxs),
+                     "child %d visitsed %d times during looped sync walk",
+                     ii, vec_len(tc->ctxs));
+        }
+        else
+        {
+            FIB_TEST(2 == vec_len(tc->ctxs),
+                     "child %d visitsed %d times during looped sync walk",
+                     ii, vec_len(tc->ctxs));
+        }
+        vec_free(tc->ctxs);
+    }
+    FIB_TEST(N_TEST_CHILDREN == fib_node_list_get_size(PARENT()->fn_children),
+             "Parent has %d children post sync loop walk",
+             fib_node_list_get_size(PARENT()->fn_children));
+
+    /*
+     * the walk doesn't reach the max depth because the infra knows that sync
+     * meets sync implies a loop and bails early.
+     */
+    FIB_TEST(high_ctx.fnbw_depth == 9,
+             "Walk context depth %d post sync loop walk",
+             high_ctx.fnbw_depth);
+
+    /*
+     * execute an async walk of the graph loop, with each child spawns sync walks
+     */
+    high_ctx.fnbw_depth = 0;
+    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
+                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
+
+    fib_walk_process_queues(vm, 1);
+
+    FOR_EACH_TEST_CHILD(tc)
+    {
+        /*
+         * we don't really care how many times the children are visisted, as long as
+         * it is more than once.
+         */
+        FIB_TEST(1 <= vec_len(tc->ctxs),
+                 "child %d visitsed %d times during looped aync spawns sync walk",
+                 ii, vec_len(tc->ctxs));
+        vec_free(tc->ctxs);
+    }
+
+    /*
+     * execute an async walk of the graph loop, with each child spawns async walks
+     */
+    fib_test_walk_spawns_walks = 2;
+    high_ctx.fnbw_depth = 0;
+    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
+                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
+
+    fib_walk_process_queues(vm, 1);
+
+    FOR_EACH_TEST_CHILD(tc)
+    {
+        /*
+         * we don't really care how many times the children are visisted, as long as
+         * it is more than once.
+         */
+        FIB_TEST(1 <= vec_len(tc->ctxs),
+                 "child %d visitsed %d times during looped async spawns async walk",
+                 ii, vec_len(tc->ctxs));
+                vec_free(tc->ctxs);
+    }
+
+
+    fib_node_child_remove(FIB_NODE_TYPE_TEST,
+                          1, // the first child
+                          fib_test_nodes[PARENT_INDEX].sibling);
+
+    /*
+     * cleanup
+     */
+    FOR_EACH_TEST_CHILD(tc)
+    {
+        fib_node_child_remove(FIB_NODE_TYPE_TEST, PARENT_INDEX,
+                              tc->sibling);
+        fib_node_deinit(&tc->node);
+        fib_node_unlock(&tc->node);
+    }
+    fib_node_deinit(PARENT());
+
+    /*
+     * The parent will be destroyed when the last lock on it goes.
+     * this test ensures all the walk objects are unlocking it.
+     */
+    FIB_TEST((1 == fib_test_nodes[PARENT_INDEX].destroyed),
+             "Parent was destroyed");
+
+    return (0);
+}
+
+static int
+lfib_test (void)
+{
+    const mpls_label_t deag_label = 50;
+    const u32 lfib_index = 0;
+    const u32 fib_index = 0;
+    dpo_id_t dpo = DPO_INVALID;
+    const dpo_id_t *dpo1;
+    fib_node_index_t lfe;
+    lookup_dpo_t *lkd;
+    test_main_t *tm;
+    int lb_count;
+    adj_index_t ai_mpls_10_10_10_1;
+
+    tm = &test_main;
+    lb_count = pool_elts(load_balance_pool);
+
+    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
+	     adj_nbr_db_size());
+
+    /*
+     * MPLS enable an interface so we get the MPLS table created
+     */
+    mpls_sw_interface_enable_disable(&mpls_main,
+                                     tm->hw[0]->sw_if_index,
+                                     1);
+
+    ip46_address_t nh_10_10_10_1 = {
+	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
+    };
+    ai_mpls_10_10_10_1 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
+                                             VNET_LINK_MPLS,
+                                             &nh_10_10_10_1,
+                                             tm->hw[0]->sw_if_index);
+
+    /*
+     * Test the specials stack properly.
+     */
+    fib_prefix_t exp_null_v6_pfx = {
+	.fp_proto = FIB_PROTOCOL_MPLS,
+	.fp_eos = MPLS_EOS,
+	.fp_label = MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL,
+	.fp_payload_proto = DPO_PROTO_IP6,
+    };
+    lfe = fib_table_lookup(lfib_index, &exp_null_v6_pfx);
+    FIB_TEST((FIB_NODE_INDEX_INVALID != lfe),
+	     "%U/%U present",
+	     format_mpls_unicast_label, MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL,
+	     format_mpls_eos_bit, MPLS_EOS);
+    fib_entry_contribute_forwarding(lfe,
+				    FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+				    &dpo);
+    dpo1 = load_balance_get_bucket(dpo.dpoi_index, 0);
+    lkd = lookup_dpo_get(dpo1->dpoi_index);
+
+    FIB_TEST((fib_index == lkd->lkd_fib_index),
+              "%U/%U is deag in %d %U",
+             format_mpls_unicast_label, deag_label,
+             format_mpls_eos_bit, MPLS_EOS,
+             lkd->lkd_fib_index,
+             format_dpo_id, &dpo, 0);
+    FIB_TEST((LOOKUP_INPUT_DST_ADDR == lkd->lkd_input),
+             "%U/%U is dst deag",
+             format_mpls_unicast_label, deag_label,
+             format_mpls_eos_bit, MPLS_EOS);
+    FIB_TEST((LOOKUP_TABLE_FROM_INPUT_INTERFACE == lkd->lkd_table),
+             "%U/%U is lookup in interface's table",
+             format_mpls_unicast_label, deag_label,
+             format_mpls_eos_bit, MPLS_EOS);
+    FIB_TEST((DPO_PROTO_IP6 == lkd->lkd_proto),
+             "%U/%U is %U dst deag",
+             format_mpls_unicast_label, deag_label,
+             format_mpls_eos_bit, MPLS_EOS,
+             format_dpo_proto, lkd->lkd_proto);
+
+
+    /*
+     * A route deag route for EOS
+     */
+    fib_prefix_t pfx = {
+	.fp_proto = FIB_PROTOCOL_MPLS,
+	.fp_eos = MPLS_EOS,
+	.fp_label = deag_label,
+	.fp_payload_proto = DPO_PROTO_IP4,
+    };
+    lfe = fib_table_entry_path_add(lfib_index,
+				   &pfx,
+				   FIB_SOURCE_CLI,
+				   FIB_ENTRY_FLAG_NONE,
+				   FIB_PROTOCOL_IP4,
+				   &zero_addr,
+				   ~0,
+				   fib_index,
+				   1,
+				   NULL,
+				   FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST((lfe == fib_table_lookup(lfib_index, &pfx)),
+              "%U/%U present",
+              format_mpls_unicast_label, deag_label,
+              format_mpls_eos_bit, MPLS_EOS);
+
+    fib_entry_contribute_forwarding(lfe,
+				    FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+				    &dpo);
+    dpo1 = load_balance_get_bucket(dpo.dpoi_index, 0);
+    lkd = lookup_dpo_get(dpo1->dpoi_index);
+
+    FIB_TEST((fib_index == lkd->lkd_fib_index),
+              "%U/%U is deag in %d %U",
+             format_mpls_unicast_label, deag_label,
+             format_mpls_eos_bit, MPLS_EOS,
+             lkd->lkd_fib_index,
+             format_dpo_id, &dpo, 0);
+    FIB_TEST((LOOKUP_INPUT_DST_ADDR == lkd->lkd_input),
+             "%U/%U is dst deag",
+             format_mpls_unicast_label, deag_label,
+             format_mpls_eos_bit, MPLS_EOS);
+    FIB_TEST((DPO_PROTO_IP4 == lkd->lkd_proto),
+             "%U/%U is %U dst deag",
+             format_mpls_unicast_label, deag_label,
+             format_mpls_eos_bit, MPLS_EOS,
+             format_dpo_proto, lkd->lkd_proto);
+
+    fib_table_entry_delete_index(lfe, FIB_SOURCE_CLI);
+
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fib_table_lookup(lfib_index,
+							 &pfx)),
+              "%U/%U not present",
+              format_mpls_unicast_label, deag_label,
+              format_mpls_eos_bit, MPLS_EOS);
+
+    /*
+     * A route deag route for non-EOS
+     */
+    pfx.fp_eos = MPLS_NON_EOS;
+    lfe = fib_table_entry_path_add(lfib_index,
+				   &pfx,
+				   FIB_SOURCE_CLI,
+				   FIB_ENTRY_FLAG_NONE,
+				   FIB_PROTOCOL_IP4,
+				   &zero_addr,
+				   ~0,
+				   lfib_index,
+				   1,
+				   NULL,
+				   FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST((lfe == fib_table_lookup(lfib_index, &pfx)),
+              "%U/%U present",
+              format_mpls_unicast_label, deag_label,
+              format_mpls_eos_bit, MPLS_NON_EOS);
+
+    fib_entry_contribute_forwarding(lfe,
+				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+				    &dpo);
+    dpo1 = load_balance_get_bucket(dpo.dpoi_index, 0);
+    lkd = lookup_dpo_get(dpo1->dpoi_index);
+
+    FIB_TEST((fib_index == lkd->lkd_fib_index),
+              "%U/%U is deag in %d %U",
+             format_mpls_unicast_label, deag_label,
+             format_mpls_eos_bit, MPLS_NON_EOS,
+             lkd->lkd_fib_index,
+             format_dpo_id, &dpo, 0);
+    FIB_TEST((LOOKUP_INPUT_DST_ADDR == lkd->lkd_input),
+             "%U/%U is dst deag",
+             format_mpls_unicast_label, deag_label,
+             format_mpls_eos_bit, MPLS_NON_EOS);
+
+    FIB_TEST((DPO_PROTO_MPLS == lkd->lkd_proto),
+             "%U/%U is %U dst deag",
+             format_mpls_unicast_label, deag_label,
+             format_mpls_eos_bit, MPLS_NON_EOS,
+             format_dpo_proto, lkd->lkd_proto);
+
+    fib_table_entry_delete_index(lfe, FIB_SOURCE_CLI);
+
+    FIB_TEST((FIB_NODE_INDEX_INVALID == fib_table_lookup(lfib_index,
+							 &pfx)),
+              "%U/%U not present",
+              format_mpls_unicast_label, deag_label,
+              format_mpls_eos_bit, MPLS_EOS);
+
+    dpo_reset(&dpo);
+
+    /*
+     * An MPLS x-connect
+     */
+    fib_prefix_t pfx_1200 = {
+	.fp_len = 21,
+	.fp_proto = FIB_PROTOCOL_MPLS,
+	.fp_label = 1200,
+	.fp_eos = MPLS_NON_EOS,
+    };
+    fib_test_lb_bucket_t neos_o_10_10_10_1 = {
+	.type = FT_LB_LABEL_STACK_O_ADJ,
+	.label_stack_o_adj = {
+	    .adj = ai_mpls_10_10_10_1,
+	    .label_stack_size = 4,
+	    .label_stack = {
+		200, 300, 400, 500,
+	    },
+	    .eos = MPLS_NON_EOS,
+	},
+    };
+    dpo_id_t neos_1200 = DPO_INVALID;
+    dpo_id_t ip_1200 = DPO_INVALID;
+    mpls_label_t *l200 = NULL;
+    vec_add1(l200, 200);
+    vec_add1(l200, 300);
+    vec_add1(l200, 400);
+    vec_add1(l200, 500);
+
+    lfe = fib_table_entry_update_one_path(fib_index,
+					  &pfx_1200,
+					  FIB_SOURCE_API,
+					  FIB_ENTRY_FLAG_NONE,
+					  FIB_PROTOCOL_IP4,
+					  &nh_10_10_10_1,
+					  tm->hw[0]->sw_if_index,
+					  ~0, // invalid fib index
+					  1,
+					  l200,
+					  FIB_ROUTE_PATH_FLAG_NONE);
+
+    FIB_TEST(fib_test_validate_entry(lfe,
+				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+				     1,
+				     &neos_o_10_10_10_1),
+	     "1200/0 LB 1 buckets via: "
+	     "adj 10.10.11.1");
+
+    /*
+     * A recursive route via the MPLS x-connect
+     */
+    fib_prefix_t pfx_2_2_2_3_s_32 = {
+    	.fp_len = 32,
+    	.fp_proto = FIB_PROTOCOL_IP4,
+    	.fp_addr = {
+    	    .ip4.as_u32 = clib_host_to_net_u32(0x02020203),
+    	},
+    };
+    fib_route_path_t *rpaths = NULL, rpath = {
+    	.frp_proto = FIB_PROTOCOL_MPLS,
+    	.frp_local_label = 1200,
+    	.frp_sw_if_index = ~0, // recurive
+    	.frp_fib_index = 0, // Default MPLS fib
+    	.frp_weight = 1,
+    	.frp_flags = FIB_ROUTE_PATH_FLAG_NONE,
+    	.frp_label_stack = NULL,
+    };
+    vec_add1(rpaths, rpath);
+
+    fib_table_entry_path_add2(fib_index,
+    			      &pfx_2_2_2_3_s_32,
+    			      FIB_SOURCE_API,
+    			      FIB_ENTRY_FLAG_NONE,
+    			      rpaths);
+
+    /*
+     * A labelled recursive route via the MPLS x-connect
+     */
+    fib_prefix_t pfx_2_2_2_4_s_32 = {
+    	.fp_len = 32,
+    	.fp_proto = FIB_PROTOCOL_IP4,
+    	.fp_addr = {
+    	    .ip4.as_u32 = clib_host_to_net_u32(0x02020204),
+    	},
+    };
+    mpls_label_t *l999 = NULL;
+    vec_add1(l999, 999);
+    rpaths[0].frp_label_stack = l999,
+
+    fib_table_entry_path_add2(fib_index,
+    			      &pfx_2_2_2_4_s_32,
+    			      FIB_SOURCE_API,
+    			      FIB_ENTRY_FLAG_NONE,
+    			      rpaths);
+
+    fib_entry_contribute_forwarding(fib_table_lookup(fib_index, &pfx_1200),
+    				    FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+    				    &ip_1200);
+    fib_entry_contribute_forwarding(fib_table_lookup(fib_index, &pfx_1200),
+    				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+    				    &neos_1200);
+
+    fib_test_lb_bucket_t ip_o_1200 = {
+    	.type = FT_LB_O_LB,
+    	.lb = {
+    	    .lb = ip_1200.dpoi_index,
+    	},
+    };
+    fib_test_lb_bucket_t mpls_o_1200 = {
+	.type = FT_LB_LABEL_O_LB,
+	.label_o_lb = {
+    	    .lb = neos_1200.dpoi_index,
+	    .label = 999,
+	    .eos = MPLS_EOS,
+	},
+    };
+
+    lfe = fib_table_lookup(fib_index, &pfx_2_2_2_3_s_32);
+    FIB_TEST(fib_test_validate_entry(lfe,
+    				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+    				     1,
+    				     &ip_o_1200),
+    	     "2.2.2.2.3/32 LB 1 buckets via: label 1200 EOS");
+    lfe = fib_table_lookup(fib_index, &pfx_2_2_2_4_s_32);
+    FIB_TEST(fib_test_validate_entry(lfe,
+    				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+    				     1,
+    				     &mpls_o_1200),
+    	     "2.2.2.2.4/32 LB 1 buckets via: label 1200 non-EOS");
+
+    fib_table_entry_delete(fib_index, &pfx_1200, FIB_SOURCE_API);
+    fib_table_entry_delete(fib_index, &pfx_2_2_2_3_s_32, FIB_SOURCE_API);
+    fib_table_entry_delete(fib_index, &pfx_2_2_2_4_s_32, FIB_SOURCE_API);
+
+    dpo_reset(&neos_1200);
+    dpo_reset(&ip_1200);
+
+    /*
+     * A recursive via a label that does not exist
+     */
+    fib_test_lb_bucket_t bucket_drop = {
+	.type = FT_LB_SPECIAL,
+	.special = {
+	    .adj = DPO_PROTO_MPLS,
+	},
+    };
+
+    rpaths[0].frp_label_stack = NULL;
+    lfe = fib_table_entry_path_add2(fib_index,
+				    &pfx_2_2_2_4_s_32,
+				    FIB_SOURCE_API,
+				    FIB_ENTRY_FLAG_NONE,
+				    rpaths);
+
+    fib_entry_contribute_forwarding(fib_table_lookup(fib_index, &pfx_1200),
+    				    FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+    				    &ip_1200);
+    ip_o_1200.lb.lb = ip_1200.dpoi_index;
+
+    FIB_TEST(fib_test_validate_entry(lfe,
+    				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+    				     1,
+    				     &ip_o_1200),
+    	     "2.2.2.2.4/32 LB 1 buckets via: label 1200 EOS");
+    lfe = fib_table_lookup(fib_index, &pfx_1200);
+    FIB_TEST(fib_test_validate_entry(lfe,
+				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+				     1,
+				     &bucket_drop),
+	     "2.2.2.4/32 LB 1 buckets via: ip4-DROP");
+
+    fib_table_entry_delete(fib_index, &pfx_2_2_2_4_s_32, FIB_SOURCE_API);
+
+    dpo_reset(&ip_1200);
+
+    /*
+     * cleanup
+     */
+    mpls_sw_interface_enable_disable(&mpls_main,
+                                     tm->hw[0]->sw_if_index,
+                                     0);
+
+    FIB_TEST(lb_count == pool_elts(load_balance_pool),
+	     "Load-balance resources freed %d of %d",
+             lb_count, pool_elts(load_balance_pool));
+
+    return (0);
+}
+
+static clib_error_t *
+fib_test (vlib_main_t * vm, 
+	  unformat_input_t * input,
+	  vlib_cli_command_t * cmd_arg)
+{
+    int res;
+
+    res = 0;
+    fib_test_mk_intf(4);
+
+    if (unformat (input, "ip"))
+    {
+	res += fib_test_v4();
+	res += fib_test_v6();
+    }
+    else if (unformat (input, "label"))
+    {
+	res += fib_test_label();
+    }
+    else if (unformat (input, "ae"))
+    {
+	res += fib_test_ae();
+    }
+    else if (unformat (input, "lfib"))
+    {
+	res += lfib_test();
+    }
+    else if (unformat (input, "walk"))
+    {
+	res += fib_test_walk();
+    }
+    else
+    {
+        /*
+         * These walk UT aren't run as part of the full suite, since the
+         * fib-walk process must be disabled in order for the tests to work
+         *
+         * fib_test_walk();
+         */
+	res += fib_test_v4();
+	res += fib_test_v6();
+	res += fib_test_ae();
+	res += fib_test_label();
+	res += lfib_test();
+    }
+
+    if (res)
+    {
+        return clib_error_return(0, "FIB Unit Test Failed");
+    }
+    else
+    {
+        return (NULL);
+    }
+}
+
+VLIB_CLI_COMMAND (test_fib_command, static) = {
+    .path = "test fib",
+    .short_help = "fib unit tests - DO NOT RUN ON A LIVE SYSTEM",
+    .function = fib_test,
+};
+
+clib_error_t *
+fib_test_init (vlib_main_t *vm)
+{
+    return 0;
+}
+
+VLIB_INIT_FUNCTION (fib_test_init);
diff --git a/src/vnet/fib/fib_types.c b/src/vnet/fib/fib_types.c
new file mode 100644
index 00000000..b66e7194
--- /dev/null
+++ b/src/vnet/fib/fib_types.c
@@ -0,0 +1,326 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/ip/ip.h>
+
+#include <vnet/fib/fib_types.h>
+#include <vnet/fib/fib_internal.h>
+#include <vnet/mpls/mpls.h>
+
+/*
+ * arrays of protocol and link names
+ */
+static const char* fib_protocol_names[] = FIB_PROTOCOLS;
+static const char* vnet_link_names[] = VNET_LINKS;
+static const char* fib_forw_chain_names[] = FIB_FORW_CHAINS;
+
+u8 *
+format_fib_protocol (u8 * s, va_list ap)
+{
+    fib_protocol_t proto = va_arg(ap, int); // fib_protocol_t promotion
+
+    return (format (s, "%s", fib_protocol_names[proto]));
+}
+
+u8 *
+format_vnet_link (u8 * s, va_list ap)
+{
+    vnet_link_t link = va_arg(ap, int); // vnet_link_t promotion
+
+    return (format (s, "%s", vnet_link_names[link]));
+}
+
+u8 *
+format_fib_forw_chain_type (u8 * s, va_list * args)
+{
+    fib_forward_chain_type_t fct = va_arg(*args, int);
+
+    return (format (s, "%s", fib_forw_chain_names[fct]));
+}
+
+void
+fib_prefix_from_ip46_addr (const ip46_address_t *addr,
+			   fib_prefix_t *pfx)
+{
+    ASSERT(!ip46_address_is_zero(addr));
+
+    pfx->fp_proto = ((ip46_address_is_ip4(addr) ?
+		      FIB_PROTOCOL_IP4 :
+		      FIB_PROTOCOL_IP6));
+    pfx->fp_len = ((ip46_address_is_ip4(addr) ?
+		    32 : 128));
+    pfx->fp_addr = *addr;
+}
+
+void
+fib_prefix_from_mpls_label (mpls_label_t label,
+			    fib_prefix_t *pfx)
+{
+    pfx->fp_proto = FIB_PROTOCOL_MPLS;
+    pfx->fp_len = 21;
+    pfx->fp_label = label;
+    pfx->fp_eos = MPLS_NON_EOS;
+}
+
+int
+fib_prefix_cmp (const fib_prefix_t *p1,
+		const fib_prefix_t *p2)
+{
+    int res;
+
+    res = (p1->fp_proto - p2->fp_proto);
+
+    if (0 == res)
+    {
+	switch (p1->fp_proto)
+	{
+	case FIB_PROTOCOL_IP4:
+	case FIB_PROTOCOL_IP6:
+	    res = (p1->fp_len - p2->fp_len);
+
+	    if (0 == res)
+	    {
+		res = ip46_address_cmp(&p1->fp_addr, &p2->fp_addr);
+	    }
+	    break;
+	case FIB_PROTOCOL_MPLS:
+	    res = (p1->fp_label - p2->fp_label);
+
+	    if (0 == res)
+	    {
+		res = (p1->fp_eos - p2->fp_eos);
+	    }
+	    break;
+	}
+    }
+
+    return (res);
+}
+
+int
+fib_prefix_is_cover (const fib_prefix_t *p1,
+		     const fib_prefix_t *p2)
+{
+    switch (p1->fp_proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (ip4_destination_matches_route(&ip4_main,
+					      &p1->fp_addr.ip4,
+					      &p2->fp_addr.ip4,
+					      p1->fp_len));
+    case FIB_PROTOCOL_IP6:
+	return (ip6_destination_matches_route(&ip6_main,
+					      &p1->fp_addr.ip6,
+					      &p2->fp_addr.ip6,
+					      p1->fp_len));
+    case FIB_PROTOCOL_MPLS:
+	break;
+    }
+    return (0);
+}
+
+int
+fib_prefix_is_host (const fib_prefix_t *prefix)
+{
+    switch (prefix->fp_proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (prefix->fp_len == 32);
+    case FIB_PROTOCOL_IP6:
+	return (prefix->fp_len == 128);
+    case FIB_PROTOCOL_MPLS:
+	return (!0);
+    }
+    return (0);
+}
+
+u8 *
+format_fib_prefix (u8 * s, va_list * args)
+{
+    fib_prefix_t *fp = va_arg (*args, fib_prefix_t *);
+
+    /*
+     * protocol specific so it prints ::/0 correctly.
+     */
+    switch (fp->fp_proto)
+    {
+    case FIB_PROTOCOL_IP6:
+    {
+	ip6_address_t p6 = fp->fp_addr.ip6;
+
+	ip6_address_mask(&p6, &(ip6_main.fib_masks[fp->fp_len]));
+	s = format (s, "%U", format_ip6_address, &p6);
+	break;
+    }
+    case FIB_PROTOCOL_IP4:
+    {
+	ip4_address_t p4 = fp->fp_addr.ip4;
+	p4.as_u32 &= ip4_main.fib_masks[fp->fp_len];
+
+	s = format (s, "%U", format_ip4_address, &p4);
+	break;
+    }
+    case FIB_PROTOCOL_MPLS:
+	s = format (s, "%U:%U",
+		    format_mpls_unicast_label, fp->fp_label,
+		    format_mpls_eos_bit, fp->fp_eos);
+	break;
+    }
+    s = format (s, "/%d", fp->fp_len);
+
+    return (s);
+}
+
+int
+fib_route_path_cmp (const fib_route_path_t *rpath1,
+		    const fib_route_path_t *rpath2)
+{
+    int res;
+
+    res = ip46_address_cmp(&rpath1->frp_addr,
+			   &rpath2->frp_addr);
+
+    if (0 != res) return (res);
+
+    if (~0 != rpath1->frp_sw_if_index &&
+        ~0 != rpath2->frp_sw_if_index)
+    {
+        res = vnet_sw_interface_compare(vnet_get_main(),
+                                        rpath1->frp_sw_if_index,
+                                        rpath2->frp_sw_if_index);
+    }
+    else
+    {
+        res = rpath1->frp_sw_if_index - rpath2->frp_sw_if_index;
+    }
+
+    if (0 != res) return (res);
+
+    if (ip46_address_is_zero(&rpath1->frp_addr))
+    {
+	res = rpath1->frp_fib_index - rpath2->frp_fib_index;
+    }
+
+    return (res);
+}
+
+dpo_proto_t
+fib_proto_to_dpo (fib_protocol_t fib_proto)
+{
+    switch (fib_proto)
+    {
+    case FIB_PROTOCOL_IP6:
+        return (DPO_PROTO_IP6);
+    case FIB_PROTOCOL_IP4:
+        return (DPO_PROTO_IP4);
+    case FIB_PROTOCOL_MPLS:
+        return (DPO_PROTO_MPLS);
+    }
+    ASSERT(0);
+    return (0);
+}
+
+fib_protocol_t
+dpo_proto_to_fib (dpo_proto_t dpo_proto)
+{
+    switch (dpo_proto)
+    {
+    case DPO_PROTO_IP6:
+        return (FIB_PROTOCOL_IP6);
+    case DPO_PROTO_IP4:
+        return (FIB_PROTOCOL_IP4);
+    case DPO_PROTO_MPLS:
+        return (FIB_PROTOCOL_MPLS);
+    default:
+	break;
+    }
+    ASSERT(0);
+    return (0);
+}
+
+vnet_link_t
+fib_proto_to_link (fib_protocol_t proto)
+{
+    switch (proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (VNET_LINK_IP4);
+    case FIB_PROTOCOL_IP6:
+	return (VNET_LINK_IP6);
+    case FIB_PROTOCOL_MPLS:
+	return (VNET_LINK_MPLS);
+    }
+    ASSERT(0);
+    return (0);
+}
+
+fib_forward_chain_type_t
+fib_forw_chain_type_from_dpo_proto (dpo_proto_t proto)
+{
+    switch (proto)
+    {
+    case DPO_PROTO_IP4:
+	return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
+    case DPO_PROTO_IP6:
+	return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
+    case DPO_PROTO_MPLS:
+	return (FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS);
+    case DPO_PROTO_ETHERNET:
+	return (FIB_FORW_CHAIN_TYPE_ETHERNET);
+    }
+    ASSERT(0);
+    return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
+}
+
+vnet_link_t
+fib_forw_chain_type_to_link_type (fib_forward_chain_type_t fct)
+{
+    switch (fct)
+    {
+    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
+	return (VNET_LINK_IP4);
+    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
+	return (VNET_LINK_IP6);
+    case FIB_FORW_CHAIN_TYPE_ETHERNET:
+	return (VNET_LINK_ETHERNET);
+    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
+	/*
+	 * insufficient information to to convert
+	 */
+	ASSERT(0);
+	break;
+    case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
+	return (VNET_LINK_MPLS);
+    }
+    return (VNET_LINK_IP4);
+}
+
+dpo_proto_t
+fib_forw_chain_type_to_dpo_proto (fib_forward_chain_type_t fct)
+{
+    switch (fct)
+    {
+    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
+	return (DPO_PROTO_IP4);
+    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
+	return (DPO_PROTO_IP6);
+    case FIB_FORW_CHAIN_TYPE_ETHERNET:
+	return (DPO_PROTO_ETHERNET);
+    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
+    case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
+	return (DPO_PROTO_MPLS);
+    }
+    return (DPO_PROTO_IP4);
+}
diff --git a/src/vnet/fib/fib_types.h b/src/vnet/fib/fib_types.h
new file mode 100644
index 00000000..0a15fef1
--- /dev/null
+++ b/src/vnet/fib/fib_types.h
@@ -0,0 +1,340 @@
+ /*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __FIB_TYPES_H__
+#define __FIB_TYPES_H__
+
+#include <vlib/vlib.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/mpls/packet.h>
+#include <vnet/dpo/dpo.h>
+
+/**
+ * A typedef of a node index.
+ * we make this typedef so the code becomes easier for a human to parse.
+ */
+typedef u32 fib_node_index_t;
+#define FIB_NODE_INDEX_INVALID ((fib_node_index_t)(~0))
+
+/**
+ * Protocol Type. packed so it consumes a u8 only
+ */
+typedef enum fib_protocol_t_ {
+    FIB_PROTOCOL_IP4 = 0,
+    FIB_PROTOCOL_IP6,
+    FIB_PROTOCOL_MPLS,
+}  __attribute__ ((packed)) fib_protocol_t;
+
+#define FIB_PROTOCOLS {			\
+    [FIB_PROTOCOL_IP4] = "ipv4",	\
+    [FIB_PROTOCOL_IP6] = "ipv6",        \
+    [FIB_PROTOCOL_MPLS] = "MPLS",       \
+}
+
+/**
+ * Definition outside of enum so it does not need to be included in non-defaulted
+ * switch statements
+ */
+#define FIB_PROTOCOL_MAX (FIB_PROTOCOL_MPLS + 1)
+
+/**
+ * Not part of the enum so it does not have to be handled in switch statements
+ */
+#define FIB_PROTOCOL_NONE (FIB_PROTOCOL_MAX+1)
+
+#define FOR_EACH_FIB_PROTOCOL(_item)    \
+    for (_item = FIB_PROTOCOL_IP4;      \
+	 _item <= FIB_PROTOCOL_MPLS;    \
+	 _item++)
+
+#define FOR_EACH_FIB_IP_PROTOCOL(_item)    \
+    for (_item = FIB_PROTOCOL_IP4;         \
+	 _item <= FIB_PROTOCOL_IP6;        \
+	 _item++)
+
+/**
+ * @brief Convert from a protocol to a link type
+ */
+vnet_link_t fib_proto_to_link (fib_protocol_t proto);
+
+/**
+ * FIB output chain type. When a child object requests a forwarding contribution
+ * from a parent, it does so for a particular scenario. This enumererates those
+ * sceanrios
+ */
+typedef enum fib_forward_chain_type_t_ {
+    /**
+     * Contribute an object that is to be used to forward IP4 packets
+     */
+    FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+    /**
+     * Contribute an object that is to be used to forward IP6 packets
+     */
+    FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
+    /**
+     * Contribute an object that is to be used to forward non-end-of-stack
+     * MPLS packets
+     */
+    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+    /**
+     * Contribute an object that is to be used to forward end-of-stack
+     * MPLS packets. This is a convenient ID for clients. A real EOS chain
+     * must be pay-load protocol specific. This
+     * option is converted into one of the other three internally.
+     */
+    FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+    /**
+     * Contribute an object that is to be used to forward Ethernet packets.
+     * This is last in the list since it is not valid for many FIB objects,
+     * and thus their array of per-chain-type DPOs can be sized smaller.
+     */
+    FIB_FORW_CHAIN_TYPE_ETHERNET,
+}  __attribute__ ((packed)) fib_forward_chain_type_t;
+
+#define FIB_FORW_CHAINS {					\
+    [FIB_FORW_CHAIN_TYPE_ETHERNET]      = "ethernet",     	\
+    [FIB_FORW_CHAIN_TYPE_UNICAST_IP4]   = "unicast-ip4",	\
+    [FIB_FORW_CHAIN_TYPE_UNICAST_IP6]   = "unicast-ip6",	\
+    [FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS]  = "mpls-neos",	        \
+    [FIB_FORW_CHAIN_TYPE_MPLS_EOS]      = "mpls-eos",	        \
+}
+
+#define FIB_FORW_CHAIN_NUM (FIB_FORW_CHAIN_TYPE_MPLS_ETHERNET+1)
+#define FIB_FORW_CHAIN_MPLS_NUM (FIB_FORW_CHAIN_TYPE_MPLS_EOS+1)
+
+#define FOR_EACH_FIB_FORW_CHAIN(_item)			  \
+    for (_item = FIB_FORW_CHAIN_TYPE_UNICAST_IP4;   	  \
+	 _item <= FIB_FORW_CHAIN_TYPE_ETHERNET;		  \
+	 _item++)
+
+#define FOR_EACH_FIB_FORW_MPLS_CHAIN(_item)		  \
+    for (_item = FIB_FORW_CHAIN_TYPE_UNICAST_IP4;   	  \
+	 _item <= FIB_FORW_CHAIN_TYPE_MPLS_EOS;		  \
+	 _item++)
+
+/**
+ * @brief Convert from a chain type to the adjacencies link type
+ */
+extern vnet_link_t fib_forw_chain_type_to_link_type(fib_forward_chain_type_t fct);
+
+/**
+ * @brief Convert from a payload-protocol to a chain type.
+ */
+extern fib_forward_chain_type_t fib_forw_chain_type_from_dpo_proto(dpo_proto_t proto);
+
+/**
+ * @brief Convert from a chain type to the DPO proto it will install
+ */
+extern dpo_proto_t fib_forw_chain_type_to_dpo_proto(fib_forward_chain_type_t fct);
+
+/**
+ * Aggregrate type for a prefix
+ */
+typedef struct fib_prefix_t_ {
+    /**
+     * The mask length
+     */
+    u16 fp_len;
+
+    /**
+     * protocol type
+     */
+    fib_protocol_t fp_proto;
+
+    /**
+     * Pad to keep the address 4 byte aligned
+     */
+    u8 ___fp___pad;
+
+    union {
+	/**
+	 * The address type is not deriveable from the fp_addr member.
+	 * If it's v4, then the first 3 u32s of the address will be 0.
+	 * v6 addresses (even v4 mapped ones) have at least 2 u32s assigned
+	 * to non-zero values. true. but when it's all zero, one cannot decide.
+	 */
+	ip46_address_t fp_addr;
+
+	struct {
+	    mpls_label_t fp_label;
+	    mpls_eos_bit_t fp_eos;
+	    /**
+	     * This protocol determines the payload protocol of packets
+	     * that will be forwarded by this entry once the label is popped.
+	     * For a non-eos entry it will be MPLS.
+	     */
+	    dpo_proto_t fp_payload_proto;
+	};
+    };
+} fib_prefix_t;
+
+STATIC_ASSERT(STRUCT_OFFSET_OF(fib_prefix_t, fp_addr) == 4,
+	      "FIB Prefix's address is 4 byte aligned.");
+
+/**
+ * \brief Compare two prefixes for equality
+ */
+extern int fib_prefix_cmp(const fib_prefix_t *p1,
+			  const fib_prefix_t *p2);
+
+/**
+ * \brief Compare two prefixes for covering relationship
+ *
+ * \return non-zero if the first prefix is a cover for the second
+ */
+extern int fib_prefix_is_cover(const fib_prefix_t *p1,
+			       const fib_prefix_t *p2);
+
+/**
+ * \brief Return true is the prefix is a host prefix
+ */
+extern int fib_prefix_is_host(const fib_prefix_t *p);
+
+
+/**
+ * \brief Host prefix from ip
+ */
+extern void fib_prefix_from_ip46_addr (const ip46_address_t *addr,
+			   fib_prefix_t *pfx);
+
+extern u8 * format_fib_prefix(u8 * s, va_list * args);
+extern u8 * format_fib_forw_chain_type(u8 * s, va_list * args);
+
+extern dpo_proto_t fib_proto_to_dpo(fib_protocol_t fib_proto);
+extern fib_protocol_t dpo_proto_to_fib(dpo_proto_t dpo_proto);
+
+/**
+ * Enurmeration of special path/entry types
+ */
+typedef enum fib_special_type_t_ {
+    /**
+     * Marker. Add new types after this one.
+     */
+    FIB_SPECIAL_TYPE_FIRST = 0,
+    /**
+     * Local/for-us paths
+     */
+    FIB_SPECIAL_TYPE_LOCAL = FIB_SPECIAL_TYPE_FIRST,
+    /**
+     * drop paths
+     */
+    FIB_SPECIAL_TYPE_DROP,
+    /**
+     * Marker. Add new types before this one, then update it.
+     */
+    FIB_SPECIAL_TYPE_LAST = FIB_SPECIAL_TYPE_DROP,
+} __attribute__ ((packed)) fib_special_type_t;
+
+/**
+ * The maximum number of types
+ */
+#define FIB_SPEICAL_TYPE_MAX (FIB_SPEICAL_TYPE_LAST + 1)
+
+#define FOR_EACH_FIB_SPEICAL_TYPE(_item)		\
+    for (_item = FIB_TYPE_SPEICAL_FIRST;		\
+	 _item <= FIB_SPEICAL_TYPE_LAST; _item++)
+
+extern u8 * format_fib_protocol(u8 * s, va_list ap);
+extern u8 * format_vnet_link(u8 *s, va_list ap);
+
+/**
+ * Path flags from the control plane
+ */
+typedef enum fib_route_path_flags_t_
+{
+    FIB_ROUTE_PATH_FLAG_NONE = 0,
+    /**
+     * Recursion constraint of via a host prefix
+     */
+    FIB_ROUTE_PATH_RESOLVE_VIA_HOST = (1 << 0),
+    /**
+     * Recursion constraint of via an attahced prefix
+     */
+    FIB_ROUTE_PATH_RESOLVE_VIA_ATTACHED = (1 << 1),
+} fib_route_path_flags_t;
+
+/**
+ * @brief 
+ * A representation of a path as described by a route producer.
+ * These paramenters will determine the path 'type', of which there are:
+ * 1) Attached-next-hop:
+ *   a single peer on a link.
+ *   It is 'attached' because it is in the same sub-net as the router, on a link
+ *   directly connected to the route.
+ *   It is 'next=hop' since the next-hop address of the peer is known.
+ * 2) Attached:
+ *  the next-hop is not known. but we can ARP for it.
+ * 3) Recursive.
+ *  The next-hop is known but the interface is not. So to find the adj to use
+ *  we must recursively resolve the next-hop.
+ * 3) deaggregate (deag)
+ *  A further lookup is required.
+ */
+typedef struct fib_route_path_t_ {
+    /**
+     * The protocol of the address below. We need this since the all
+     * zeros address is ambiguous.
+     */
+    fib_protocol_t frp_proto;
+
+    union {
+	/**
+	 * The next-hop address.
+	 * Will be NULL for attached paths.
+	 * Will be all zeros for attached-next-hop paths on a p2p interface
+	 * Will be all zeros for a deag path.
+	 */
+	ip46_address_t frp_addr;
+
+	/**
+	 * The MPLS local Label to reursively resolve through.
+	 * This is valid when the path type is MPLS.
+	 */
+	mpls_label_t frp_local_label;
+    };
+    /**
+     * The interface.
+     * Will be invalid for recursive paths.
+     */
+    u32 frp_sw_if_index;
+    /**
+     * The FIB index to lookup the nexthop
+     * Only valid for recursive paths.
+     */
+    u32 frp_fib_index;
+    /**
+     * [un]equal cost path weight
+     */
+    u32 frp_weight;
+    /**
+     * flags on the path
+     */
+    fib_route_path_flags_t frp_flags;
+    /**
+     * The outgoing MPLS label Stack. NULL implies no label.
+     */
+    mpls_label_t *frp_label_stack;
+} fib_route_path_t;
+
+/**
+ * @brief 
+ * A representation of a fib path for fib_path_encode to convey the information to the caller
+ */
+typedef struct fib_route_path_encode_t_ {
+    fib_route_path_t rpath;
+    dpo_id_t dpo;
+} fib_route_path_encode_t;
+
+#endif
diff --git a/src/vnet/fib/fib_urpf_list.c b/src/vnet/fib/fib_urpf_list.c
new file mode 100644
index 00000000..263812ad
--- /dev/null
+++ b/src/vnet/fib/fib_urpf_list.c
@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/fib/fib_urpf_list.h>
+#include <vnet/adj/adj.h>
+
+/**
+ * @brief pool of all fib_urpf_list
+ */
+fib_urpf_list_t *fib_urpf_list_pool;
+
+u8 *
+format_fib_urpf_list (u8 *s, va_list args)
+{
+    fib_urpf_list_t *urpf;
+    index_t ui;
+    u32 *swi;
+
+    ui = va_arg(args, index_t);
+    urpf = fib_urpf_list_get(ui);
+
+    s = format(s, "uPRF-list:%d len:%d itfs:[",
+	       ui, vec_len(urpf->furpf_itfs));
+
+    vec_foreach(swi, urpf->furpf_itfs)
+    {
+	s = format(s, "%d, ", *swi);
+    }
+    s = format(s, "]");
+
+    return (s);
+}
+
+index_t
+fib_urpf_list_alloc_and_lock (void)
+{
+    fib_urpf_list_t *urpf;
+
+    pool_get(fib_urpf_list_pool, urpf);
+    memset(urpf, 0, sizeof(*urpf));
+
+    urpf->furpf_locks++;
+
+    return (urpf - fib_urpf_list_pool);
+}
+
+void
+fib_urpf_list_unlock (index_t ui)
+{
+    fib_urpf_list_t *urpf;
+
+    if (INDEX_INVALID == ui)
+	return;
+
+    urpf = fib_urpf_list_get(ui);
+
+    urpf->furpf_locks--;
+
+    if (0 == urpf->furpf_locks)
+    {
+	vec_free(urpf->furpf_itfs);
+	pool_put(fib_urpf_list_pool, urpf);
+    }
+}
+
+void
+fib_urpf_list_lock (index_t ui)
+{
+    fib_urpf_list_t *urpf;
+
+    urpf = fib_urpf_list_get(ui);
+
+    urpf->furpf_locks++;
+}
+
+/**
+ * @brief Append another interface to the list.
+ */
+void
+fib_urpf_list_append (index_t ui,
+		      u32 sw_if_index)
+{
+    fib_urpf_list_t *urpf;
+
+    urpf = fib_urpf_list_get(ui);
+
+    vec_add1(urpf->furpf_itfs, sw_if_index);
+}
+
+/**
+ * @brief Combine to interface lists
+ */
+void
+fib_urpf_list_combine (index_t ui1,
+		       index_t ui2)
+{
+    fib_urpf_list_t *urpf1, *urpf2;
+
+    urpf1 = fib_urpf_list_get(ui1);
+    urpf2 = fib_urpf_list_get(ui2);
+
+    vec_append(urpf1->furpf_itfs, urpf2->furpf_itfs);
+}
+
+/**
+ * @brief Sort the interface indicies.
+ * The sort is the first step in obtaining a unique list, so the order,
+ * w.r.t. next-hop, interface,etc is not important. So a sort based on the
+ * index is all we need.
+ */
+static int
+fib_urpf_itf_cmp_for_sort (void * v1,
+			   void * v2)
+{
+    fib_node_index_t *i1 = v1, *i2 = v2;
+
+    return (*i2 < *i1);
+}
+
+/**
+ * @brief Convert the uRPF list from the itf set obtained during the walk
+ * to a unique list.
+ */
+void
+fib_urpf_list_bake (index_t ui)
+{
+    fib_urpf_list_t *urpf;
+
+    urpf = fib_urpf_list_get(ui);
+
+    ASSERT(!(urpf->furpf_flags & FIB_URPF_LIST_BAKED));
+
+    if (vec_len(urpf->furpf_itfs) > 1)
+    {
+	u32 i,j;
+
+	/*
+	 * cat list | sort | uniq > rpf_list
+	 */
+	vec_sort_with_function(urpf->furpf_itfs, fib_urpf_itf_cmp_for_sort);
+
+	i = 0, j = 1;
+	while (j < vec_len(urpf->furpf_itfs))
+	{
+	    if (urpf->furpf_itfs[i] == urpf->furpf_itfs[j])
+	    {
+		/*
+		 * the itfacenct entries are the same.
+		 * search forward for a unique one
+		 */
+		while (urpf->furpf_itfs[i] == urpf->furpf_itfs[j] &&
+		       j < vec_len(urpf->furpf_itfs))
+		{
+		    j++;
+		}
+		if (j == vec_len(urpf->furpf_itfs))
+		{
+		    /*
+		     * ran off the end without finding a unique index.
+		     * we are done.
+		     */
+		    break;
+		}
+		else
+		{
+		    urpf->furpf_itfs[i+1] = urpf->furpf_itfs[j];
+		}
+	    }
+	    i++, j++;
+	}
+
+	/*
+	 * set the length of the vector to the number of unique itfs
+	 */
+	_vec_len(urpf->furpf_itfs) = i+1;
+    }
+
+    urpf->furpf_flags |= FIB_URPF_LIST_BAKED;
+}
+
+void
+fib_urpf_list_show_mem (void)
+{
+    fib_show_memory_usage("uRPF-list",
+			  pool_elts(fib_urpf_list_pool),
+			  pool_len(fib_urpf_list_pool),
+			  sizeof(fib_urpf_list_t));
+}
+
+static clib_error_t *
+show_fib_urpf_list_command (vlib_main_t * vm,
+			    unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+    index_t ui;
+
+    if (unformat (input, "%d", &ui))
+    {
+	/*
+	 * show one in detail
+	 */
+	if (!pool_is_free_index(fib_urpf_list_pool, ui))
+	{
+	    vlib_cli_output (vm, "%d@%U",
+			     ui,
+			     format_fib_urpf_list, ui);
+	}
+	else
+	{
+	    vlib_cli_output (vm, "uRPF %d invalid", ui);
+	}
+    }
+    else
+    {
+	/*
+	 * show all
+	 */
+	vlib_cli_output (vm, "FIB uRPF Entries:");
+	pool_foreach_index(ui, fib_urpf_list_pool,
+        ({
+	    vlib_cli_output (vm, "%d@%U",
+			     ui,
+			     format_fib_urpf_list, ui);
+	}));
+    }
+
+    return (NULL);
+}
+
+/* *INDENT-OFF* */
+/*?
+ * The '<em>sh fib uRPF [index] </em>' command displays the uRPF lists
+ *
+ * @cliexpar
+ * @cliexstart{show fib uRPF}
+ * FIB uRPF Entries:
+ *  0@uPRF-list:0 len:0 itfs:[]
+ *  1@uPRF-list:1 len:2 itfs:[1, 2, ]
+ *  2@uPRF-list:2 len:1 itfs:[3, ]
+ *  3@uPRF-list:3 len:1 itfs:[9, ]
+ * @cliexend
+?*/
+VLIB_CLI_COMMAND (show_fib_urpf_list, static) = {
+  .path = "show fib uRPF",
+  .function = show_fib_urpf_list_command,
+  .short_help = "show fib uRPF",
+};
+/* *INDENT-OFF* */
diff --git a/src/vnet/fib/fib_urpf_list.h b/src/vnet/fib/fib_urpf_list.h
new file mode 100644
index 00000000..09f47574
--- /dev/null
+++ b/src/vnet/fib/fib_urpf_list.h
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief A unicast RPF list.
+ * The uRPF list is the set of interfaces that a prefix can be reached through.
+ * There are 3 levels of RPF check:
+ *   - do we have any route to the source (i.e. it's not drop)
+ *   - did the packet arrive on an interface that the source is reachable through
+ *   - did the packet arrive from a peer that the source is reachable through
+ * we don't support the last. But it could be done by storing adjs in the uPRF
+ * list rather than interface indices.
+ *
+ * these conditions are checked against the list by:
+ *   - the list is not empty
+ *   - there is an interface in the list that is on the input interface.
+ *   - there is an adj in the list whose MAC address matches the packet's
+ *     source MAC and input interface.
+ *
+ * To speed the last two checks the interface list only needs to have the unique
+ * interfaces present. If the uRPF check was instead implemented by forward
+ * walking the DPO chain, then that walk would encounter a great deal of
+ * non-adjacency objects (i.e. load-balances, mpls-labels, etc) and potentially
+ * the same adjacency many times (esp. when UCMP is used).
+ * To that end the uRPF list is a collapsed, unique interface only list.
+ */
+
+#ifndef __FIB_URPF_LIST_H__
+#define __FIB_URPF_LIST_H__
+
+#include <vnet/fib/fib_types.h>
+#include <vnet/adj/adj.h>
+
+/**
+ * @brief flags
+ */
+typedef enum fib_urpf_list_flag_t_
+{
+    /**
+     * @brief Set to indicated that the uRPF list has already been baked.
+     * This is protection against it being baked more than once. These
+     * are not chunky fries - once is enough.
+     */
+    FIB_URPF_LIST_BAKED = (1 << 0),
+} fib_urpf_list_flag_t;
+
+typedef struct fib_urpf_list_t_
+{
+    /**
+     * The list of interfaces that comprise the allowed accepting interfaces
+     */
+    adj_index_t *furpf_itfs;
+
+    /**
+     * flags
+     */
+    fib_urpf_list_flag_t furpf_flags;
+
+    /**
+     * uRPF lists are shared amongst many entries so we require a locking
+     * mechanism.
+     */
+    u32 furpf_locks;
+} fib_urpf_list_t;
+
+extern index_t fib_urpf_list_alloc_and_lock(void);
+extern void fib_urpf_list_unlock(index_t urpf);
+extern void fib_urpf_list_lock(index_t urpf);
+
+extern void fib_urpf_list_append(index_t urpf, adj_index_t adj);
+extern void fib_urpf_list_combine(index_t urpf1, index_t urpf2);
+
+extern void fib_urpf_list_bake(index_t urpf);
+
+extern u8 *format_fib_urpf_list(u8 *s, va_list ap);
+
+extern void fib_urpf_list_show_mem(void);
+
+/**
+ * @brief pool of all fib_urpf_list
+ */
+extern fib_urpf_list_t *fib_urpf_list_pool;
+
+static inline fib_urpf_list_t *
+fib_urpf_list_get (index_t index)
+{
+    return (pool_elt_at_index(fib_urpf_list_pool, index));
+}
+
+/**
+ * @brief Data-Plane function to check an input interface against an uRPF list
+ *
+ * @param ui The uRPF list index to check against. Get this from the load-balance
+ *             object that is the result of the FIB lookup
+ * @param sw_if_index The SW interface index to validate
+ *
+ * @return 1 if the interface is found, 0 otherwise
+ */
+always_inline int
+fib_urpf_check (index_t ui, u32 sw_if_index)
+{
+    fib_urpf_list_t *urpf;
+    u32 *swi;
+
+    urpf = fib_urpf_list_get(ui);
+
+    vec_foreach(swi, urpf->furpf_itfs)
+    {
+	if (*swi == sw_if_index)
+	    return (1);
+    }
+
+    return (0);
+}
+
+/**
+ * @brief Data-Plane function to check the size of an uRPF list, (i.e. the number
+ *        of interfaces in the list).
+ *
+ * @param ui The uRPF list index to check against. Get this from the load-balance
+ *             object that is the result of the FIB lookup
+ *
+ * @return the number of interfaces in the list
+ */
+always_inline int
+fib_urpf_check_size (index_t ui)
+{
+    fib_urpf_list_t *urpf;
+
+    urpf = fib_urpf_list_get(ui);
+
+    return (vec_len(urpf->furpf_itfs));
+}
+
+#endif
diff --git a/src/vnet/fib/fib_walk.c b/src/vnet/fib/fib_walk.c
new file mode 100644
index 00000000..938f7b8c
--- /dev/null
+++ b/src/vnet/fib/fib_walk.c
@@ -0,0 +1,1108 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/fib/fib_walk.h>
+#include <vnet/fib/fib_node_list.h>
+
+/**
+ * The flags on a walk
+ */
+typedef enum fib_walk_flags_t_
+{
+    /**
+     * A synchronous walk.
+     * This walk will run to completion, i.e. visit ALL the children.
+     * It is a depth first traversal of the graph.
+     */
+    FIB_WALK_FLAG_SYNC = (1 << 0),
+    /**
+     * An asynchronous walk.
+     * This walk will be scheduled to run in the background. It will thus visits
+     * the children at a later point in time.
+     * It is a depth first traversal of the graph.
+     */
+    FIB_WALK_FLAG_ASYNC = (1 << 1),
+    /**
+     * An indication that the walk is currently executing.
+     */
+    FIB_WALK_FLAG_EXECUTING = (1 << 2),
+} fib_walk_flags_t;
+
+/**
+ * A representation of a graph walk from a parent object to its children
+ */
+typedef struct fib_walk_t_
+{
+    /**
+     * FIB node linkage. This object is not in the FIB object graph,
+     * but it is present in other node's dependency lists, so it needs to
+     * be pointerable to.
+     */
+    fib_node_t fw_node;
+
+    /**
+     * the walk's flags
+     */
+    fib_walk_flags_t fw_flags;
+
+    /**
+     * Sibling index in the dependency list
+     */
+    u32 fw_dep_sibling;
+
+    /**
+     * Sibling index in the list of all walks
+     */
+    u32 fw_prio_sibling;
+
+    /**
+     * Pointer to the node whose dependants this walk is walking
+     */
+    fib_node_ptr_t fw_parent;
+
+    /**
+     * Number of nodes visited by this walk. saved for debugging purposes.
+     */
+    u32 fw_n_visits;
+
+    /**
+     * Time the walk started
+     */
+    f64 fw_start_time;
+
+    /**
+     * The reasons this walk is occuring.
+     * This is a vector ordered in time. The reasons and the front were started
+     * first, and so should be acted first when a node is visisted.
+     */
+    fib_node_back_walk_ctx_t *fw_ctx;
+} fib_walk_t;
+
+/**
+ * @brief The pool of all walk objects
+ */
+static fib_walk_t *fib_walk_pool;
+
+/**
+ * @brief There's only one event type sent to the walk process
+ */
+#define FIB_WALK_EVENT 0
+
+/**
+ * Statistics maintained per-walk queue
+ */
+typedef enum fib_walk_queue_stats_t_
+{
+    FIB_WALK_SCHEDULED,
+    FIB_WALK_COMPLETED,
+} fib_walk_queue_stats_t;
+#define FIB_WALK_QUEUE_STATS_NUM ((fib_walk_queue_stats_t)(FIB_WALK_COMPLETED+1))
+
+#define FIB_WALK_QUEUE_STATS {           \
+    [FIB_WALK_SCHEDULED] = "scheduled",  \
+    [FIB_WALK_COMPLETED] = "completed",  \
+}
+
+#define FOR_EACH_FIB_WALK_QUEUE_STATS(_wqs)   \
+    for ((_wqs) = FIB_WALK_SCHEDULED;         \
+	 (_wqs) < FIB_WALK_QUEUE_STATS_NUM;   \
+	 (_wqs)++)
+
+/**
+ * The names of the walk stats
+ */
+static const char * const fib_walk_queue_stats_names[] = FIB_WALK_QUEUE_STATS;
+/**
+ * The names of the walk reasons
+ */
+static const char * const fib_node_bw_reason_names[] = FIB_NODE_BW_REASONS;
+
+/**
+ * A represenation of one queue of walk
+ */
+typedef struct fib_walk_queue_t_
+{
+    /**
+     * Qeuee stats
+     */
+    u64 fwq_stats[FIB_WALK_QUEUE_STATS_NUM];
+
+    /**
+     * The node list which acts as the queue
+     */
+    fib_node_list_t fwq_queue;
+} fib_walk_queue_t;
+
+/**
+ * A set of priority queues for outstanding walks
+ */
+typedef struct fib_walk_queues_t_
+{
+    fib_walk_queue_t fwqs_queues[FIB_WALK_PRIORITY_NUM];
+} fib_walk_queues_t;
+
+/**
+ * The global queues of outstanding walks
+ */
+static fib_walk_queues_t fib_walk_queues;
+
+/**
+ * The names of the walk priorities
+ */
+static const char * const fib_walk_priority_names[] = FIB_WALK_PRIORITIES;
+
+/**
+ * @brief Histogram stats on the lenths of each walk in elemenets visisted.
+ * Store upto 1<<23 elements in increments of 1<<10
+ */
+#define HISTOGRAM_VISITS_PER_WALK_MAX (1<<23)
+#define HISTOGRAM_VISITS_PER_WALK_INCR (1<<10)
+#define HISTOGRAM_VISITS_PER_WALK_N_BUCKETS \
+    (HISTOGRAM_VISITS_PER_WALK_MAX/HISTOGRAM_VISITS_PER_WALK_INCR)
+static u64 fib_walk_hist_vists_per_walk[HISTOGRAM_VISITS_PER_WALK_N_BUCKETS];
+
+/**
+ * @brief History of state for the last 128 walks
+ */
+#define HISTORY_N_WALKS 128
+#define MAX_HISTORY_REASONS 16
+static u32 history_last_walk_pos;
+typedef struct fib_walk_history_t_ {
+    u32 fwh_n_visits;
+    f64 fwh_duration;
+    f64 fwh_completed;
+    fib_node_ptr_t fwh_parent;
+    fib_walk_flags_t fwh_flags;
+    fib_node_bw_reason_flag_t fwh_reason[MAX_HISTORY_REASONS];
+} fib_walk_history_t;
+static fib_walk_history_t fib_walk_history[HISTORY_N_WALKS];
+
+u8*
+format_fib_walk_priority (u8 *s, va_list ap)
+{
+    fib_walk_priority_t prio = va_arg(ap, fib_walk_priority_t);
+
+    ASSERT(prio < FIB_WALK_PRIORITY_NUM);
+
+    return (format(s, "%s", fib_walk_priority_names[prio]));
+}
+static u8*
+format_fib_walk_queue_stats (u8 *s, va_list ap)
+{
+    fib_walk_queue_stats_t wqs = va_arg(ap, fib_walk_queue_stats_t);
+
+    ASSERT(wqs < FIB_WALK_QUEUE_STATS_NUM);
+
+    return (format(s, "%s", fib_walk_queue_stats_names[wqs]));
+}
+
+static index_t
+fib_walk_get_index (fib_walk_t *fwalk)
+{
+    return (fwalk - fib_walk_pool);
+}
+
+static fib_walk_t *
+fib_walk_get (index_t fwi)
+{
+    return (pool_elt_at_index(fib_walk_pool, fwi));
+}
+
+/*
+ * not static so it can be used in the unit tests
+ */
+u32
+fib_walk_queue_get_size (fib_walk_priority_t prio)
+{
+    return (fib_node_list_get_size(fib_walk_queues.fwqs_queues[prio].fwq_queue));
+}
+
+static fib_node_index_t
+fib_walk_queue_get_front (fib_walk_priority_t prio)
+{
+    fib_node_ptr_t wp;
+
+    fib_node_list_get_front(fib_walk_queues.fwqs_queues[prio].fwq_queue, &wp);
+
+    return (wp.fnp_index);
+}
+
+static void
+fib_walk_destroy (fib_walk_t *fwalk)
+{
+    u32 bucket, ii;
+
+    if (FIB_NODE_INDEX_INVALID != fwalk->fw_prio_sibling)
+    {
+	fib_node_list_elt_remove(fwalk->fw_prio_sibling);
+    }
+    fib_node_child_remove(fwalk->fw_parent.fnp_type,
+			  fwalk->fw_parent.fnp_index,
+			  fwalk->fw_dep_sibling);
+
+    /*
+     * add the stats to the continuous histogram collection.
+     */
+    bucket = (fwalk->fw_n_visits / HISTOGRAM_VISITS_PER_WALK_INCR);
+    bucket = (bucket >= HISTOGRAM_VISITS_PER_WALK_N_BUCKETS ?
+	      HISTOGRAM_VISITS_PER_WALK_N_BUCKETS - 1 :
+	      bucket);
+    fib_walk_hist_vists_per_walk[bucket]++;
+
+    /*
+     * save stats to the recent history
+     */
+
+    fib_walk_history[history_last_walk_pos].fwh_n_visits =
+	fwalk->fw_n_visits;
+    fib_walk_history[history_last_walk_pos].fwh_completed =
+	vlib_time_now(vlib_get_main());
+    fib_walk_history[history_last_walk_pos].fwh_duration =
+	fib_walk_history[history_last_walk_pos].fwh_completed -
+        fwalk->fw_start_time;
+    fib_walk_history[history_last_walk_pos].fwh_parent =
+	fwalk->fw_parent;
+    fib_walk_history[history_last_walk_pos].fwh_flags =
+	fwalk->fw_flags;
+
+    vec_foreach_index(ii, fwalk->fw_ctx)
+    {
+        if (ii < MAX_HISTORY_REASONS)
+        {
+            fib_walk_history[history_last_walk_pos].fwh_reason[ii] =
+                fwalk->fw_ctx[ii].fnbw_reason;
+        }
+    }
+
+    history_last_walk_pos = (history_last_walk_pos + 1) % HISTORY_N_WALKS;
+
+    fib_node_deinit(&fwalk->fw_node);
+    vec_free(fwalk->fw_ctx);
+    pool_put(fib_walk_pool, fwalk);
+}
+
+/**
+ * return code when advancing a walk
+ */
+typedef enum fib_walk_advance_rc_t_
+{
+    /**
+     * The walk is complete
+     */
+    FIB_WALK_ADVANCE_DONE,
+    /**
+     * the walk has more work
+     */
+    FIB_WALK_ADVANCE_MORE,
+    /**
+     * The walk merged with the one in front
+     */
+    FIB_WALK_ADVANCE_MERGE,
+} fib_walk_advance_rc_t;
+
+/**
+ * @brief Advance the walk one element in its work list
+ */
+static fib_walk_advance_rc_t
+fib_walk_advance (fib_node_index_t fwi)
+{
+    fib_node_back_walk_ctx_t *ctx, *old;
+    fib_node_back_walk_rc_t wrc;
+    fib_node_ptr_t sibling;
+    fib_walk_t *fwalk;
+    int more_elts;
+
+    /*
+     * this walk function is re-entrant - walks acan spawn walks.
+     * fib_walk_t objects come from a pool, so they can realloc. we need
+     * to retch from said pool at the appropriate times.
+     */
+    fwalk = fib_walk_get(fwi);
+
+    more_elts = fib_node_list_elt_get_next(fwalk->fw_dep_sibling, &sibling);
+
+    if (more_elts)
+    {
+        old = fwalk->fw_ctx;
+
+	vec_foreach(ctx, fwalk->fw_ctx)
+	{
+	    wrc = fib_node_back_walk_one(&sibling, ctx);
+
+	    fwalk = fib_walk_get(fwi);
+	    fwalk->fw_n_visits++;
+
+	    if (FIB_NODE_BACK_WALK_MERGE == wrc)
+	    {
+		/*
+		 * this walk has merged with the one further along the node's
+		 * dependecy list.
+		 */
+		return (FIB_WALK_ADVANCE_MERGE);
+	    }
+            if (old != fwalk->fw_ctx)
+            {
+                /*
+                 * nasty re-entrant addition of a walk has realloc'd the vector
+                 * break out
+                 */
+		return (FIB_WALK_ADVANCE_MERGE);
+	    }
+	}
+	/*
+	 * move foward to the next node to visit
+	 */
+	more_elts = fib_node_list_advance(fwalk->fw_dep_sibling);
+    }
+
+    if (more_elts)
+    {
+	return (FIB_WALK_ADVANCE_MORE);
+    }
+
+    return (FIB_WALK_ADVANCE_DONE);
+}
+
+/**
+ * @breif Enurmerate the times of sleep between walks
+ */
+typedef enum fib_walk_sleep_type_t_
+{
+    FIB_WALK_SHORT_SLEEP,
+    FIB_WALK_LONG_SLEEP,
+} fib_walk_sleep_type_t;
+
+#define FIB_WALK_N_SLEEP (FIB_WALK_LONG_SLEEP+1)
+
+/**
+ * @brief Durations for the sleep types
+ */
+static f64 fib_walk_sleep_duration[] = {
+    [FIB_WALK_LONG_SLEEP] = 1e-3,
+    [FIB_WALK_SHORT_SLEEP] = 1e-8,
+};
+
+/**
+ * @brief The time quota for a walk. When more than this amount of time is
+ * spent, the walk process will yield.
+ */
+static f64 quota = 1e-4;
+
+/**
+ * Histogram on the amount of work done (in msecs) in each walk
+ */
+#define N_TIME_BUCKETS 128
+#define TIME_INCREMENTS (N_TIME_BUCKETS/2)
+static u64 fib_walk_work_time_taken[N_TIME_BUCKETS];
+
+/**
+ * Histogram on the number of nodes visted in each quota
+ */
+#define N_ELTS_BUCKETS 128
+static u32 fib_walk_work_nodes_visisted_incr = 2;
+static u64 fib_walk_work_nodes_visited[N_ELTS_BUCKETS];
+
+/**
+ * Histogram of the sleep lengths
+ */
+static u64 fib_walk_sleep_lengths[2];
+
+/**
+ * @brief Service the queues
+ * This is not declared static so that it can be unit tested - i know i know...
+ */
+f64
+fib_walk_process_queues (vlib_main_t * vm,
+			 const f64 quota)
+{
+    f64 start_time, consumed_time;
+    fib_walk_sleep_type_t sleep;
+    fib_walk_priority_t prio;
+    fib_walk_advance_rc_t rc;
+    fib_node_index_t fwi;
+    fib_walk_t *fwalk;
+    u32 n_elts;
+    i32 bucket;
+
+    consumed_time = 0;
+    start_time = vlib_time_now(vm);
+    n_elts = 0;
+
+    FOR_EACH_FIB_WALK_PRIORITY(prio)
+    {
+	while (0 != fib_walk_queue_get_size(prio))
+	{
+	    fwi = fib_walk_queue_get_front(prio);
+
+	    /*
+	     * set this walk as executing
+	     */
+	    fwalk = fib_walk_get(fwi);
+	    fwalk->fw_flags |= FIB_WALK_FLAG_EXECUTING;
+
+	    do
+	    {
+		rc = fib_walk_advance(fwi);
+		n_elts++;
+		consumed_time = (vlib_time_now(vm) - start_time);
+	    } while ((consumed_time < quota) &&
+		     (FIB_WALK_ADVANCE_MORE == rc));
+
+	    /*
+	     * if this walk has no more work then pop it from the queue
+	     * and move on to the next.
+	     */
+	    if (FIB_WALK_ADVANCE_MORE != rc)
+	    {
+		fwalk = fib_walk_get(fwi);
+		fib_walk_destroy(fwalk);
+		fib_walk_queues.fwqs_queues[prio].fwq_stats[FIB_WALK_COMPLETED]++;
+	    }
+	    else
+	    {
+		/*
+		 * passed our work quota. sleep time.
+		 */
+		fwalk = fib_walk_get(fwi);
+		fwalk->fw_flags &= ~FIB_WALK_FLAG_EXECUTING;
+		sleep = FIB_WALK_SHORT_SLEEP;
+		goto that_will_do_for_now;
+	    }
+	}
+    }
+    /*
+     * got to the end of all the work
+     */
+    sleep = FIB_WALK_LONG_SLEEP;
+
+that_will_do_for_now:
+
+    /*
+     * collect the stats:
+     *  - for the number of nodes visisted we store 128 increments
+     *  - for the time consumed we store quota/TIME_INCREMENTS increments.
+     */
+    bucket = ((n_elts/fib_walk_work_nodes_visisted_incr) > N_ELTS_BUCKETS ?
+	      N_ELTS_BUCKETS-1 :
+	      n_elts/fib_walk_work_nodes_visisted_incr);
+    ++fib_walk_work_nodes_visited[bucket];
+
+    bucket = (consumed_time - quota) / (quota / TIME_INCREMENTS);
+    bucket += N_TIME_BUCKETS/2;
+    bucket = (bucket < 0 ? 0 : bucket);
+    bucket = (bucket > N_TIME_BUCKETS-1 ? N_TIME_BUCKETS-1 : bucket);
+    ++fib_walk_work_time_taken[bucket];
+
+    ++fib_walk_sleep_lengths[sleep];
+
+    return (fib_walk_sleep_duration[sleep]);
+}
+
+/**
+ * @brief The 'fib-walk' process's main loop.
+ */
+static uword
+fib_walk_process (vlib_main_t * vm,
+		  vlib_node_runtime_t * node,
+		  vlib_frame_t * f)
+{
+    f64 sleep_time;
+
+    sleep_time = fib_walk_sleep_duration[FIB_WALK_SHORT_SLEEP];
+
+    while (1)
+    {
+	vlib_process_wait_for_event_or_clock(vm, sleep_time);
+
+	/*
+	 * there may be lots of event queued between the processes,
+	 * but the walks we want to schedule are in the priority queues,
+	 * so we ignore the process events.
+	 */
+	vlib_process_get_events(vm, NULL);
+
+	sleep_time = fib_walk_process_queues(vm, quota);
+    }
+
+    /*
+     * Unreached
+     */
+    ASSERT(!"WTF");
+    return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (fib_walk_process_node,static) = {
+    .function = fib_walk_process,
+    .type = VLIB_NODE_TYPE_PROCESS,
+    .name = "fib-walk",
+};
+/* *INDENT-ON* */
+
+/**
+ * @brief Allocate a new walk object
+ */
+static fib_walk_t *
+fib_walk_alloc (fib_node_type_t parent_type,
+		fib_node_index_t parent_index,
+		fib_walk_flags_t flags,
+		fib_node_back_walk_ctx_t *ctx)
+{
+    fib_walk_t *fwalk;
+
+    pool_get(fib_walk_pool, fwalk);
+
+    fib_node_init(&fwalk->fw_node, FIB_NODE_TYPE_WALK);
+
+    fwalk->fw_flags = flags;
+    fwalk->fw_dep_sibling  = FIB_NODE_INDEX_INVALID;
+    fwalk->fw_prio_sibling = FIB_NODE_INDEX_INVALID;
+    fwalk->fw_parent.fnp_index = parent_index;
+    fwalk->fw_parent.fnp_type = parent_type;
+    fwalk->fw_ctx = NULL;
+    fwalk->fw_start_time = vlib_time_now(vlib_get_main());
+    fwalk->fw_n_visits = 0;
+
+    /*
+     * make a copy of the backwalk context so the depth count remains
+     * the same for each sibling visitsed. This is important in the case
+     * where a parent has a loop via one child, but all the others are not.
+     * if the looped child were visited first, the depth count would exceed, the
+     * max and the walk would terminate before it reached the other siblings.
+     */
+    vec_add1(fwalk->fw_ctx, *ctx);
+
+    return (fwalk);
+}
+
+/**
+ * @brief Enqueue a walk onto the appropriate priority queue. Then signal
+ * the background process there is work to do.
+ */
+static index_t
+fib_walk_prio_queue_enquue (fib_walk_priority_t prio,
+			    fib_walk_t *fwalk)
+{
+    index_t sibling;
+
+    sibling = fib_node_list_push_front(fib_walk_queues.fwqs_queues[prio].fwq_queue,
+				       0,
+				       FIB_NODE_TYPE_WALK,
+				       fib_walk_get_index(fwalk));
+    fib_walk_queues.fwqs_queues[prio].fwq_stats[FIB_WALK_SCHEDULED]++;
+
+    /*
+     * poke the fib-walk process to perform the async walk.
+     * we are not passing it specific data, hence the last two args,
+     * the process will drain the queues
+     */
+    vlib_process_signal_event(vlib_get_main(),
+			      fib_walk_process_node.index,
+			      FIB_WALK_EVENT,
+			      FIB_WALK_EVENT);
+
+    return (sibling);
+}
+
+void
+fib_walk_async (fib_node_type_t parent_type,
+		fib_node_index_t parent_index,
+		fib_walk_priority_t prio,
+		fib_node_back_walk_ctx_t *ctx)
+{
+    fib_walk_t *fwalk;
+
+    if (FIB_NODE_GRAPH_MAX_DEPTH < ++ctx->fnbw_depth)
+    {
+	/*
+	 * The walk has reached the maximum depth. there is a loop in the graph.
+	 * bail.
+	 */
+	return;
+    }
+    if (0 == fib_node_get_n_children(parent_type,
+                                     parent_index))
+    {
+        /*
+         * no children to walk - quit now
+         */
+        return;
+    }
+    if (ctx->fnbw_flags & FIB_NODE_BW_FLAG_FORCE_SYNC)
+    {
+        /*
+         * the originator of the walk wanted it to be synchronous, but the
+         * parent object chose async - denied.
+         */
+        return (fib_walk_sync(parent_type, parent_index, ctx));
+    }
+
+
+    fwalk = fib_walk_alloc(parent_type,
+			   parent_index,
+			   FIB_WALK_FLAG_ASYNC,
+			   ctx);
+
+    fwalk->fw_dep_sibling = fib_node_child_add(parent_type,
+					       parent_index,
+					       FIB_NODE_TYPE_WALK,
+					       fib_walk_get_index(fwalk));
+
+    fwalk->fw_prio_sibling = fib_walk_prio_queue_enquue(prio, fwalk);
+}
+
+/**
+ * @brief Back walk all the children of a FIB node.
+ *
+ * note this is a synchronous depth first walk. Children visited may propagate
+ * the walk to thier children. Other children node types may not propagate,
+ * synchronously but instead queue the walk for later async completion.
+ */
+void
+fib_walk_sync (fib_node_type_t parent_type,
+	       fib_node_index_t parent_index,
+	       fib_node_back_walk_ctx_t *ctx)
+{
+    fib_walk_advance_rc_t rc;
+    fib_node_index_t fwi;
+    fib_walk_t *fwalk;
+
+    if (FIB_NODE_GRAPH_MAX_DEPTH < ++ctx->fnbw_depth)
+    {
+	/*
+	 * The walk has reached the maximum depth. there is a loop in the graph.
+	 * bail.
+	 */
+	return;
+    }
+    if (0 == fib_node_get_n_children(parent_type,
+                                     parent_index))
+    {
+        /*
+         * no children to walk - quit now
+         */
+        return;
+    }
+
+    fwalk = fib_walk_alloc(parent_type,
+			   parent_index,
+			   FIB_WALK_FLAG_SYNC,
+			   ctx);
+
+    fwalk->fw_dep_sibling = fib_node_child_add(parent_type,
+					       parent_index,
+					       FIB_NODE_TYPE_WALK,
+					       fib_walk_get_index(fwalk));
+    fwi = fib_walk_get_index(fwalk);
+
+    while (1)
+    {
+	/*
+	 * set this walk as executing
+	 */
+	fwalk->fw_flags |= FIB_WALK_FLAG_EXECUTING;
+
+	do
+	{
+	    rc = fib_walk_advance(fwi);
+	} while (FIB_WALK_ADVANCE_MORE == rc);
+
+
+	/*
+	 * this walk function is re-entrant - walks can spawn walks.
+	 * fib_walk_t objects come from a pool, so they can realloc. we need
+	 * to re-fetch from said pool at the appropriate times.
+	 */
+	fwalk = fib_walk_get(fwi);
+
+	if (FIB_WALK_ADVANCE_MERGE == rc)
+	{
+	    /*
+	     * this sync walk merged with an walk in front.
+	     * by reqeusting a sync walk the client wanted all children walked,
+	     * so we ditch the walk object in hand and continue with the one
+	     * we merged into
+	     */
+	    fib_node_ptr_t merged_walk;
+
+	    fib_node_list_elt_get_next(fwalk->fw_dep_sibling, &merged_walk);
+
+	    ASSERT(FIB_NODE_INDEX_INVALID != merged_walk.fnp_index);
+	    ASSERT(FIB_NODE_TYPE_WALK == merged_walk.fnp_type);
+
+	    fib_walk_destroy(fwalk);
+
+	    fwi = merged_walk.fnp_index;
+	    fwalk = fib_walk_get(fwi);
+
+	    if (FIB_WALK_FLAG_EXECUTING & fwalk->fw_flags)
+	    {
+		/*
+		 * we are executing a sync walk, and we have met with another
+		 * walk that is also executing. since only one walk executs at once
+		 * (there is no multi-threading) this implies we have met ourselves
+		 * and hence the is a loop in the graph.
+		 * This function is re-entrant, so the walk object we met is being
+		 * acted on in a stack frame below this one. We must therefore not
+		 * continue with it now, but let the stack unwind and along the
+		 * appropriate frame to read the depth count and bail.
+		 */
+		fwalk = NULL;
+		break;
+	    }
+	}
+	else
+	{
+	    /*
+	     * the walk reached the end of the depdency list.
+	     */
+	    break;
+	}
+    }
+
+    if (NULL != fwalk)
+    {
+	fib_walk_destroy(fwalk);
+    }
+}
+
+static fib_node_t *
+fib_walk_get_node (fib_node_index_t index)
+{
+    fib_walk_t *fwalk;
+
+    fwalk = fib_walk_get(index);
+
+    return (&(fwalk->fw_node));
+}
+
+/**
+ * Walk objects are not parents, nor are they locked.
+ * are no-ops
+ */
+static void
+fib_walk_last_lock_gone (fib_node_t *node)
+{
+    ASSERT(0);
+}
+
+static fib_walk_t*
+fib_walk_get_from_node (fib_node_t *node)
+{
+    return ((fib_walk_t*)(((char*)node) -
+			  STRUCT_OFFSET_OF(fib_walk_t, fw_node)));
+}
+
+/**
+ * @brief Another back walk has reach this walk.
+ * Megre them so there is only one left. It is this node being
+ * visited that will remain, so copy or merge the context onto it.
+ */
+static fib_node_back_walk_rc_t
+fib_walk_back_walk_notify (fib_node_t *node,
+			   fib_node_back_walk_ctx_t *ctx)
+{
+    fib_node_back_walk_ctx_t *last;
+    fib_walk_t *fwalk;
+
+    fwalk = fib_walk_get_from_node(node);
+
+    /*
+     * check whether the walk context can be merged with the most recent.
+     * the most recent was the one last added and is thus at the back of the vector.
+     * we can merge walks if the reason for the walk is the same.
+     */
+    last = vec_end(fwalk->fw_ctx) - 1;
+
+    if (last->fnbw_reason == ctx->fnbw_reason)
+    {
+        /*
+         * copy the largest of the depth values. in the presence of a loop,
+         * the same walk will merge with itself. if we take the smaller depth
+         * then it will never end.
+         */
+        last->fnbw_depth = ((last->fnbw_depth >= ctx->fnbw_depth) ?
+                            last->fnbw_depth :
+                            ctx->fnbw_depth);
+    }
+    else
+    {
+        /*
+         * walks could not be merged, this means that the walk infront needs to
+         * perform different action to this one that has caught up. the one in
+         * front was scheduled first so append the new walk context to the back
+         * of the list.
+         */
+        vec_add1(fwalk->fw_ctx, *ctx);
+    }
+
+    return (FIB_NODE_BACK_WALK_MERGE);
+}
+
+/**
+ * The FIB walk's graph node virtual function table
+ */
+static const fib_node_vft_t fib_walk_vft = {
+    .fnv_get = fib_walk_get_node,
+    .fnv_last_lock = fib_walk_last_lock_gone,
+    .fnv_back_walk = fib_walk_back_walk_notify,
+};
+
+void
+fib_walk_module_init (void)
+{
+    fib_walk_priority_t prio;
+
+    FOR_EACH_FIB_WALK_PRIORITY(prio)
+    {
+	fib_walk_queues.fwqs_queues[prio].fwq_queue = fib_node_list_create();
+    }
+
+    fib_node_register_type(FIB_NODE_TYPE_WALK, &fib_walk_vft);
+}
+
+static u8*
+format_fib_walk (u8* s, va_list ap)
+{
+    fib_node_index_t fwi = va_arg(ap, fib_node_index_t);
+    fib_walk_t *fwalk;
+
+    fwalk = fib_walk_get(fwi);
+
+    return (format(s, "  parent:{%s:%d} visits:%d flags:%d",
+		   fib_node_type_get_name(fwalk->fw_parent.fnp_type),
+		   fwalk->fw_parent.fnp_index,
+		   fwalk->fw_n_visits,
+		   fwalk->fw_flags));
+}
+
+static clib_error_t *
+fib_walk_show (vlib_main_t * vm,
+	       unformat_input_t * input,
+	       vlib_cli_command_t * cmd)
+{
+    fib_walk_queue_stats_t wqs;
+    fib_walk_priority_t prio;
+    fib_node_ptr_t sibling;
+    fib_node_index_t fwi;
+    fib_walk_t *fwalk;
+    int more_elts, ii;
+    u8 *s = NULL;
+
+#define USEC 1000000
+    vlib_cli_output(vm, "FIB Walk Quota = %.2fusec:", quota * USEC);
+    vlib_cli_output(vm, "FIB Walk queues:");
+
+    FOR_EACH_FIB_WALK_PRIORITY(prio)
+    {
+	vlib_cli_output(vm, " %U priority queue:",
+			format_fib_walk_priority, prio);
+	vlib_cli_output(vm, "  Stats: ");
+
+	FOR_EACH_FIB_WALK_QUEUE_STATS(wqs)
+	{
+	    vlib_cli_output(vm, "    %U:%d",
+			    format_fib_walk_queue_stats, wqs,
+			    fib_walk_queues.fwqs_queues[prio].fwq_stats[wqs]);
+	}
+	vlib_cli_output(vm, "  Occupancy:%d",
+			fib_node_list_get_size(
+			    fib_walk_queues.fwqs_queues[prio].fwq_queue));
+
+	more_elts = fib_node_list_get_front(
+			fib_walk_queues.fwqs_queues[prio].fwq_queue,
+			&sibling);
+
+	while (more_elts)
+	{
+	    ASSERT(FIB_NODE_INDEX_INVALID != sibling.fnp_index);
+	    ASSERT(FIB_NODE_TYPE_WALK == sibling.fnp_type);
+
+	    fwi = sibling.fnp_index;
+	    fwalk = fib_walk_get(fwi);
+
+	    vlib_cli_output(vm, "  %U", format_fib_walk, fwi);
+
+	    more_elts = fib_node_list_elt_get_next(fwalk->fw_prio_sibling,
+						   &sibling);
+	}
+    }
+
+    vlib_cli_output(vm, "Histogram Statistics:");
+    vlib_cli_output(vm, " Number of Elements visit per-quota:");
+    for (ii = 0; ii < N_ELTS_BUCKETS; ii++)
+    {
+	if (0 != fib_walk_work_nodes_visited[ii])
+	    s = format(s, "%d:%d ",
+		       (ii * fib_walk_work_nodes_visisted_incr),
+		       fib_walk_work_nodes_visited[ii]);
+    }
+    vlib_cli_output(vm, "  %v", s);
+    vec_free(s);
+
+    vlib_cli_output(vm, " Time consumed per-quota (Quota=%f usec):", quota*USEC);
+    s = format(s, "0:%d ", fib_walk_work_time_taken[0]);
+    for (ii = 1; ii < N_TIME_BUCKETS; ii++)
+    {
+	if (0 != fib_walk_work_time_taken[ii])
+	    s = format(s, "%d:%d ", (u32)((((ii - N_TIME_BUCKETS/2) *
+					   (quota / TIME_INCREMENTS)) + quota) *
+					 USEC),
+		       fib_walk_work_time_taken[ii]);
+    }
+    vlib_cli_output(vm, "  %v", s);
+    vec_free(s);
+
+    vlib_cli_output(vm, " Sleep Types:");
+    vlib_cli_output(vm, "  Short  Long:");
+    vlib_cli_output(vm, "  %d %d:",
+		    fib_walk_sleep_lengths[FIB_WALK_SHORT_SLEEP],
+		    fib_walk_sleep_lengths[FIB_WALK_LONG_SLEEP]);
+
+    vlib_cli_output(vm, " Number of Elements visited per-walk:");
+    for (ii = 0; ii < HISTOGRAM_VISITS_PER_WALK_N_BUCKETS; ii++)
+    {
+	if (0 != fib_walk_hist_vists_per_walk[ii])
+	    s = format(s, "%d:%d ",
+		       ii*HISTOGRAM_VISITS_PER_WALK_INCR,
+		       fib_walk_hist_vists_per_walk[ii]);
+    }
+    vlib_cli_output(vm, "  %v", s);
+    vec_free(s);
+
+
+    vlib_cli_output(vm, "Brief History (last %d walks):", HISTORY_N_WALKS);
+    ii = history_last_walk_pos - 1;
+    if (ii < 0)
+        ii = HISTORY_N_WALKS - 1;
+
+    while (ii != history_last_walk_pos)
+    {
+	if (0 != fib_walk_history[ii].fwh_reason[0])
+	{
+            fib_node_back_walk_reason_t reason;
+            u8 *s = NULL;
+            u32 jj;
+
+	    s = format(s, "[@%d]: %s:%d visits:%d duration:%.2f completed:%.2f ",
+                       ii, fib_node_type_get_name(fib_walk_history[ii].fwh_parent.fnp_type),
+                       fib_walk_history[ii].fwh_parent.fnp_index,
+                       fib_walk_history[ii].fwh_n_visits,
+                       fib_walk_history[ii].fwh_duration,
+                       fib_walk_history[ii].fwh_completed);
+            if (FIB_WALK_FLAG_SYNC & fib_walk_history[ii].fwh_flags)
+                s = format(s, "sync, ");
+            if (FIB_WALK_FLAG_ASYNC & fib_walk_history[ii].fwh_flags)
+                s = format(s, "async, ");
+
+            s = format(s, "reason:");
+            jj = 0;
+            while (0 != fib_walk_history[ii].fwh_reason[jj])
+            {
+                FOR_EACH_FIB_NODE_BW_REASON(reason) {
+                    if ((1<<reason) & fib_walk_history[ii].fwh_reason[jj]) {
+                        s = format (s, "%s,", fib_node_bw_reason_names[reason]);
+                    }
+                }
+                jj++;
+            }
+            vlib_cli_output(vm, "%v", s);
+	}
+
+        ii--;
+        if (ii < 0)
+            ii = HISTORY_N_WALKS - 1;
+    }
+
+    return (NULL);
+}
+
+VLIB_CLI_COMMAND (fib_walk_show_command, static) = {
+    .path = "show fib walk",
+    .short_help = "show fib walk",
+    .function = fib_walk_show,
+};
+
+static clib_error_t *
+fib_walk_set_quota (vlib_main_t * vm,
+		    unformat_input_t * input,
+		    vlib_cli_command_t * cmd)
+{
+    clib_error_t * error = NULL;
+    f64 new_quota;
+
+    if (unformat (input, "%f", &new_quota))
+    {
+	quota = new_quota;
+    }
+    else
+    {
+	error = clib_error_return(0 , "Pass a float value");
+    }
+
+    return (error);
+}
+
+VLIB_CLI_COMMAND (fib_walk_set_quota_command, static) = {
+    .path = "set fib walk quota",
+    .short_help = "set fib walk quota",
+    .function = fib_walk_set_quota,
+};
+
+static clib_error_t *
+fib_walk_set_histogram_elements_size (vlib_main_t * vm,
+				      unformat_input_t * input,
+				      vlib_cli_command_t * cmd)
+{
+    clib_error_t * error = NULL;
+    u32 new;
+
+    if (unformat (input, "%d", &new))
+    {
+	fib_walk_work_nodes_visisted_incr = new;
+    }
+    else
+    {
+	error = clib_error_return(0 , "Pass an int value");
+    }
+
+    return (error);
+}
+
+VLIB_CLI_COMMAND (fib_walk_set_histogram_elements_size_command, static) = {
+    .path = "set fib walk histogram elements size",
+    .short_help = "set fib walk histogram elements size",
+    .function = fib_walk_set_histogram_elements_size,
+};
+
+static clib_error_t *
+fib_walk_clear (vlib_main_t * vm,
+		unformat_input_t * input,
+		vlib_cli_command_t * cmd)
+{
+    memset(fib_walk_hist_vists_per_walk, 0, sizeof(fib_walk_hist_vists_per_walk));
+    memset(fib_walk_history, 0, sizeof(fib_walk_history));
+    memset(fib_walk_work_time_taken, 0, sizeof(fib_walk_work_time_taken));
+    memset(fib_walk_work_nodes_visited, 0, sizeof(fib_walk_work_nodes_visited));
+    memset(fib_walk_sleep_lengths, 0, sizeof(fib_walk_sleep_lengths));
+
+    return (NULL);
+}
+
+VLIB_CLI_COMMAND (fib_walk_clear_command, static) = {
+    .path = "clear fib walk",
+    .short_help = "clear fib walk",
+    .function = fib_walk_clear,
+};
diff --git a/src/vnet/fib/fib_walk.h b/src/vnet/fib/fib_walk.h
new file mode 100644
index 00000000..7413d8a2
--- /dev/null
+++ b/src/vnet/fib/fib_walk.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __FIB_WALK_H__
+#define __FIB_WALK_H__
+
+#include <vnet/fib/fib_node.h>
+
+/**
+ * @brief Walk priorities.
+ * Strict priorities. All walks a priority n are completed before n+1 is started.
+ * Increasing numerical value implies decreasing priority.
+ */
+typedef enum fib_walk_priority_t_
+{
+    FIB_WALK_PRIORITY_HIGH = 0,
+    FIB_WALK_PRIORITY_LOW  = 1,
+} fib_walk_priority_t;
+
+#define FIB_WALK_PRIORITY_NUM ((fib_walk_priority_t)(FIB_WALK_PRIORITY_LOW+1))
+
+#define FIB_WALK_PRIORITIES {           \
+    [FIB_WALK_PRIORITY_HIGH] = "high",  \
+    [FIB_WALK_PRIORITY_LOW]  = "low",   \
+}
+
+#define FOR_EACH_FIB_WALK_PRIORITY(_prio)         \
+    for ((_prio) = FIB_WALK_PRIORITY_HIGH;        \
+         (_prio) < FIB_WALK_PRIORITY_NUM;         \
+         (_prio)++)
+
+extern void fib_walk_module_init(void);
+
+extern void fib_walk_async(fib_node_type_t parent_type,
+                           fib_node_index_t parent_index,
+                           fib_walk_priority_t prio,
+                           fib_node_back_walk_ctx_t *ctx);
+
+extern void fib_walk_sync(fib_node_type_t parent_type,
+                          fib_node_index_t parent_index,
+                          fib_node_back_walk_ctx_t *ctx);
+
+extern u8* format_fib_walk_priority(u8 *s, va_list ap);
+
+#endif
+
diff --git a/src/vnet/fib/ip4_fib.c b/src/vnet/fib/ip4_fib.c
new file mode 100644
index 00000000..f6ebce00
--- /dev/null
+++ b/src/vnet/fib/ip4_fib.c
@@ -0,0 +1,664 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/ip4_fib.h>
+
+/*
+ * A table of pefixes to be added to tables and the sources for them
+ */
+typedef struct ip4_fib_table_special_prefix_t_ {
+    fib_prefix_t ift_prefix;
+    fib_source_t ift_source;
+    fib_entry_flag_t ift_flag;
+} ip4_fib_table_special_prefix_t;
+
+static const ip4_fib_table_special_prefix_t ip4_specials[] = {
+    {
+	/* 0.0.0.0/0*/
+	.ift_prefix = {
+	    .fp_addr = {
+		.ip4.data_u32 = 0,
+	    },
+	    .fp_len  = 0,
+	    .fp_proto = FIB_PROTOCOL_IP4,
+	},
+	.ift_source = FIB_SOURCE_DEFAULT_ROUTE,
+	.ift_flag   = FIB_ENTRY_FLAG_DROP,
+    },
+    {
+	/* 0.0.0.0/32*/
+	.ift_prefix = {
+	    .fp_addr = {
+		.ip4.data_u32 = 0,
+	    },
+	    .fp_len  = 32,
+	    .fp_proto = FIB_PROTOCOL_IP4,
+	},
+	.ift_source = FIB_SOURCE_DEFAULT_ROUTE,
+	.ift_flag   = FIB_ENTRY_FLAG_DROP,
+    },
+    {
+	/*
+	 * 240.0.0.0/4
+	 * drop class E
+	 */
+	.ift_prefix = {
+	    .fp_addr = {
+		.ip4.data_u32 = 0xf0000000,
+	    },
+	    .fp_len   = 4,
+	    .fp_proto = FIB_PROTOCOL_IP4,
+	},
+	.ift_source = FIB_SOURCE_SPECIAL,
+	.ift_flag   = FIB_ENTRY_FLAG_DROP,
+
+    },
+    {
+	/*
+	 * 224.0.0.0/4
+	 * drop all mcast
+	 */
+	.ift_prefix = {
+	    .fp_addr = {
+		.ip4.data_u32 = 0xe0000000,
+	    },
+	    .fp_len   = 4,
+	    .fp_proto = FIB_PROTOCOL_IP4,
+	},
+	.ift_source = FIB_SOURCE_SPECIAL,
+	.ift_flag    = FIB_ENTRY_FLAG_DROP,
+    },
+    {
+	/*
+	 * 255.255.255.255/32
+	 * drop, but we'll allow it to be usurped by the likes of DHCP
+	 */
+	.ift_prefix = {
+	    .fp_addr = {
+		.ip4.data_u32 = 0xffffffff,
+	    },
+	    .fp_len   = 32,
+	    .fp_proto = FIB_PROTOCOL_IP4,
+	},
+	.ift_source = FIB_SOURCE_DEFAULT_ROUTE,
+	.ift_flag   = FIB_ENTRY_FLAG_DROP,
+    }
+};
+
+
+static u32
+ip4_create_fib_with_table_id (u32 table_id)
+{
+    fib_table_t *fib_table;
+
+    pool_get_aligned(ip4_main.fibs, fib_table, CLIB_CACHE_LINE_BYTES);
+    memset(fib_table, 0, sizeof(*fib_table));
+
+    fib_table->ft_proto = FIB_PROTOCOL_IP4;
+    fib_table->ft_index =
+	fib_table->v4.index =
+	    (fib_table - ip4_main.fibs);
+
+    hash_set (ip4_main.fib_index_by_table_id, table_id, fib_table->ft_index);
+
+    fib_table->ft_table_id =
+	fib_table->v4.table_id =
+	    table_id;
+    fib_table->ft_flow_hash_config = 
+	fib_table->v4.flow_hash_config =
+	    IP_FLOW_HASH_DEFAULT;
+    fib_table->v4.fwd_classify_table_index = ~0;
+    fib_table->v4.rev_classify_table_index = ~0;
+    
+    fib_table_lock(fib_table->ft_index, FIB_PROTOCOL_IP4);
+
+    ip4_mtrie_init(&fib_table->v4.mtrie);
+
+    /*
+     * add the special entries into the new FIB
+     */
+    int ii;
+
+    for (ii = 0; ii < ARRAY_LEN(ip4_specials); ii++)
+    {
+	fib_prefix_t prefix = ip4_specials[ii].ift_prefix;
+
+	prefix.fp_addr.ip4.data_u32 =
+	    clib_host_to_net_u32(prefix.fp_addr.ip4.data_u32);
+
+	fib_table_entry_special_add(fib_table->ft_index,
+				    &prefix,
+				    ip4_specials[ii].ift_source,
+				    ip4_specials[ii].ift_flag,
+				    ADJ_INDEX_INVALID);
+    }
+
+    return (fib_table->ft_index);
+}
+
+void
+ip4_fib_table_destroy (ip4_fib_t *fib)
+{
+    fib_table_t *fib_table = (fib_table_t*)fib;
+    int ii;
+
+    /*
+     * remove all the specials we added when the table was created.
+     */
+    for (ii = 0; ii < ARRAY_LEN(ip4_specials); ii++)
+    {
+	fib_prefix_t prefix = ip4_specials[ii].ift_prefix;
+
+	prefix.fp_addr.ip4.data_u32 =
+	    clib_host_to_net_u32(prefix.fp_addr.ip4.data_u32);
+
+	fib_table_entry_special_remove(fib_table->ft_index,
+				       &prefix,
+				       ip4_specials[ii].ift_source);
+    }
+
+    /*
+     * validate no more routes.
+     */
+    ASSERT(0 == fib_table->ft_total_route_counts);
+    FOR_EACH_FIB_SOURCE(ii)
+    {
+	ASSERT(0 == fib_table->ft_src_route_counts[ii]);
+    }
+
+    if (~0 != fib_table->ft_table_id)
+    {
+	hash_unset (ip4_main.fib_index_by_table_id, fib_table->ft_table_id);
+    }
+    pool_put(ip4_main.fibs, fib_table);
+}
+
+
+u32
+ip4_fib_table_find_or_create_and_lock (u32 table_id)
+{
+    u32 index;
+
+    index = ip4_fib_index_from_table_id(table_id);
+    if (~0 == index)
+	return ip4_create_fib_with_table_id(table_id);
+
+    fib_table_lock(index, FIB_PROTOCOL_IP4);
+
+    return (index);
+}
+
+u32
+ip4_fib_table_create_and_lock (void)
+{
+    return (ip4_create_fib_with_table_id(~0));
+}
+
+u32
+ip4_fib_table_get_index_for_sw_if_index (u32 sw_if_index)
+{
+    if (sw_if_index >= vec_len(ip4_main.fib_index_by_sw_if_index))
+    {
+	/*
+	 * This is the case for interfaces that are not yet mapped to
+	 * a IP table
+	 */
+	return (~0);
+    }
+    return (ip4_main.fib_index_by_sw_if_index[sw_if_index]);
+}
+
+flow_hash_config_t
+ip4_fib_table_get_flow_hash_config (u32 fib_index)
+{
+    return (ip4_fib_get(fib_index)->flow_hash_config);
+}
+
+/*
+ * ip4_fib_table_lookup_exact_match
+ *
+ * Exact match prefix lookup
+ */
+fib_node_index_t
+ip4_fib_table_lookup_exact_match (const ip4_fib_t *fib,
+				  const ip4_address_t *addr,
+				  u32 len)
+{
+    uword * hash, * result;
+    u32 key;
+
+    hash = fib->fib_entry_by_dst_address[len];
+    key  = (addr->data_u32 & ip4_main.fib_masks[len]);
+
+    result = hash_get(hash, key);
+
+    if (NULL != result) {
+	return (result[0]);
+    }
+    return (FIB_NODE_INDEX_INVALID);
+}
+
+/*
+ * ip4_fib_table_lookup_adj
+ *
+ * Longest prefix match
+ */
+index_t
+ip4_fib_table_lookup_lb (ip4_fib_t *fib,
+			 const ip4_address_t *addr)
+{
+    fib_node_index_t fei;
+
+    fei = ip4_fib_table_lookup(fib, addr, 32);
+
+    if (FIB_NODE_INDEX_INVALID != fei)
+    {
+	const dpo_id_t *dpo;
+
+	dpo = fib_entry_contribute_ip_forwarding(fei);
+
+	return (dpo->dpoi_index);
+    }
+    return (INDEX_INVALID);
+}
+
+/*
+ * ip4_fib_table_lookup
+ *
+ * Longest prefix match
+ */
+fib_node_index_t
+ip4_fib_table_lookup (const ip4_fib_t *fib,
+		      const ip4_address_t *addr,
+		      u32 len)
+{
+    uword * hash, * result;
+    i32 mask_len;
+    u32 key;
+
+    for (mask_len = len; mask_len >= 0; mask_len--)
+    {
+	hash = fib->fib_entry_by_dst_address[mask_len];
+	key = (addr->data_u32 & ip4_main.fib_masks[mask_len]);
+
+	result = hash_get (hash, key);
+
+	if (NULL != result) {
+	    return (result[0]);
+	}
+    }
+    return (FIB_NODE_INDEX_INVALID);
+}
+
+void
+ip4_fib_table_entry_insert (ip4_fib_t *fib,
+			    const ip4_address_t *addr,
+			    u32 len,
+			    fib_node_index_t fib_entry_index)
+{
+    uword * hash, * result;
+    u32 key;
+
+    key = (addr->data_u32 & ip4_main.fib_masks[len]);
+    hash = fib->fib_entry_by_dst_address[len];
+    result = hash_get (hash, key);
+
+    if (NULL == result) {
+	/*
+	 * adding a new entry
+	 */
+	if (NULL == hash) {
+	    hash = hash_create (32 /* elts */, sizeof (uword));
+	    hash_set_flags (hash, HASH_FLAG_NO_AUTO_SHRINK);
+	}
+	hash = hash_set(hash, key, fib_entry_index);
+	fib->fib_entry_by_dst_address[len] = hash;
+    }
+    else
+    {
+	ASSERT(0);
+    }
+}
+
+void
+ip4_fib_table_entry_remove (ip4_fib_t *fib,
+			    const ip4_address_t *addr,
+			    u32 len)
+{
+    uword * hash, * result;
+    u32 key;
+
+    key = (addr->data_u32 & ip4_main.fib_masks[len]);
+    hash = fib->fib_entry_by_dst_address[len];
+    result = hash_get (hash, key);
+
+    if (NULL == result)
+    {
+	/*
+	 * removing a non-existant entry. i'll allow it.
+	 */
+    }
+    else 
+    {
+	hash_unset(hash, key);
+    }
+
+    fib->fib_entry_by_dst_address[len] = hash;
+}
+
+void
+ip4_fib_table_fwding_dpo_update (ip4_fib_t *fib,
+				 const ip4_address_t *addr,
+				 u32 len,
+				 const dpo_id_t *dpo)
+{
+    ip4_fib_mtrie_add_del_route(fib, *addr, len, dpo->dpoi_index, 0); // ADD
+}
+
+void
+ip4_fib_table_fwding_dpo_remove (ip4_fib_t *fib,
+				 const ip4_address_t *addr,
+				 u32 len,
+				 const dpo_id_t *dpo)
+{
+    ip4_fib_mtrie_add_del_route(fib, *addr, len, dpo->dpoi_index, 1); // DELETE
+}
+
+static void
+ip4_fib_table_show_all (ip4_fib_t *fib,
+			vlib_main_t * vm)
+{
+    fib_node_index_t *fib_entry_indicies;
+    fib_node_index_t *fib_entry_index;
+    int i;
+
+    fib_entry_indicies = NULL;
+
+    for (i = 0; i < ARRAY_LEN (fib->fib_entry_by_dst_address); i++)
+    {
+	uword * hash = fib->fib_entry_by_dst_address[i];
+
+	if (NULL != hash)
+	{
+	    hash_pair_t * p;
+
+	    hash_foreach_pair (p, hash,
+	    ({
+		vec_add1(fib_entry_indicies, p->value[0]);
+	    }));
+	}
+    }
+
+    vec_sort_with_function(fib_entry_indicies, fib_entry_cmp_for_sort);
+
+    vec_foreach(fib_entry_index, fib_entry_indicies)
+    {
+	vlib_cli_output(vm, "%U",
+                        format_fib_entry,
+                        *fib_entry_index,
+                        FIB_ENTRY_FORMAT_BRIEF);
+    }
+
+    vec_free(fib_entry_indicies);
+}
+
+static void
+ip4_fib_table_show_one (ip4_fib_t *fib,
+			vlib_main_t * vm,
+			ip4_address_t *address,
+			u32 mask_len)
+{    
+    vlib_cli_output(vm, "%U",
+                    format_fib_entry,
+                    ip4_fib_table_lookup(fib, address, mask_len),
+                    FIB_ENTRY_FORMAT_DETAIL);
+}
+
+static clib_error_t *
+ip4_show_fib (vlib_main_t * vm,
+	      unformat_input_t * input,
+	      vlib_cli_command_t * cmd)
+{
+    ip4_main_t * im4 = &ip4_main;
+    fib_table_t * fib_table;
+    int verbose, matching, mtrie;
+    ip4_address_t matching_address;
+    u32 matching_mask = 32;
+    int i, table_id = -1, fib_index = ~0;
+
+    verbose = 1;
+    matching = 0;
+    mtrie = 0;
+    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+	if (unformat (input, "brief") || unformat (input, "summary")
+	    || unformat (input, "sum"))
+	    verbose = 0;
+
+	else if (unformat (input, "mtrie"))
+	    mtrie = 1;
+
+	else if (unformat (input, "%U/%d",
+			   unformat_ip4_address, &matching_address, &matching_mask))
+	    matching = 1;
+
+	else if (unformat (input, "%U", unformat_ip4_address, &matching_address))
+	    matching = 1;
+
+	else if (unformat (input, "table %d", &table_id))
+	    ;
+	else if (unformat (input, "index %d", &fib_index))
+	    ;
+	else
+	    break;
+    }
+
+    pool_foreach (fib_table, im4->fibs,
+    ({
+	ip4_fib_t *fib = &fib_table->v4;
+
+	if (table_id >= 0 && table_id != (int)fib->table_id)
+	    continue;
+	if (fib_index != ~0 && fib_index != (int)fib->index)
+	    continue;
+
+	vlib_cli_output (vm, "%U, fib_index %d, flow hash: %U", 
+			 format_fib_table_name, fib->index, FIB_PROTOCOL_IP4,
+			 fib->index,
+			 format_ip_flow_hash_config, fib->flow_hash_config);
+
+	/* Show summary? */
+	if (! verbose)
+	{
+	    vlib_cli_output (vm, "%=20s%=16s", "Prefix length", "Count");
+	    for (i = 0; i < ARRAY_LEN (fib->fib_entry_by_dst_address); i++)
+	    {
+		uword * hash = fib->fib_entry_by_dst_address[i];
+		uword n_elts = hash_elts (hash);
+		if (n_elts > 0)
+		    vlib_cli_output (vm, "%20d%16d", i, n_elts);
+	    }
+	    continue;
+	}
+
+	if (!matching)
+	{
+	    ip4_fib_table_show_all(fib, vm);
+	}
+	else
+	{
+	    ip4_fib_table_show_one(fib, vm, &matching_address, matching_mask);
+	}
+
+	if (mtrie)
+	    vlib_cli_output (vm, "%U", format_ip4_fib_mtrie, &fib->mtrie);
+    }));
+
+    return 0;
+}
+
+/*?
+ * This command displays the IPv4 FIB Tables (VRF Tables) and the route
+ * entries for each table.
+ *
+ * @note This command will run for a long time when the FIB tables are
+ * comprised of millions of entries. For those senarios, consider displaying
+ * a single table or summary mode.
+ *
+ * @cliexpar
+ * Example of how to display all the IPv4 FIB tables:
+ * @cliexstart{show ip fib}
+ * ipv4-VRF:0, fib_index 0, flow hash: src dst sport dport proto
+ * 0.0.0.0/0
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:0 buckets:1 uRPF:0 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 0.0.0.0/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:1 buckets:1 uRPF:1 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 6.0.1.2/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:30 buckets:1 uRPF:29 to:[0:0]]
+ *     [0] [@3]: arp-ipv4: via 6.0.0.1 af_packet0
+ * 7.0.0.1/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:31 buckets:4 uRPF:30 to:[0:0]]
+ *     [0] [@3]: arp-ipv4: via 6.0.0.2 af_packet0
+ *     [1] [@3]: arp-ipv4: via 6.0.0.2 af_packet0
+ *     [2] [@3]: arp-ipv4: via 6.0.0.2 af_packet0
+ *     [3] [@3]: arp-ipv4: via 6.0.0.1 af_packet0
+ * 224.0.0.0/8
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:3 buckets:1 uRPF:3 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 240.0.0.0/8
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:2 buckets:1 uRPF:2 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 255.255.255.255/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:4 buckets:1 uRPF:4 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * ipv4-VRF:7, fib_index 1, flow hash: src dst sport dport proto
+ * 0.0.0.0/0
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:12 buckets:1 uRPF:11 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 0.0.0.0/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:13 buckets:1 uRPF:12 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 172.16.1.0/24
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:17 buckets:1 uRPF:16 to:[0:0]]
+ *     [0] [@4]: ipv4-glean: af_packet0
+ * 172.16.1.1/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:18 buckets:1 uRPF:17 to:[1:84]]
+ *     [0] [@2]: dpo-receive: 172.16.1.1 on af_packet0
+ * 172.16.1.2/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:21 buckets:1 uRPF:20 to:[0:0]]
+ *     [0] [@5]: ipv4 via 172.16.1.2 af_packet0: IP4: 02:fe:9e:70:7a:2b -> 26:a5:f6:9c:3a:36
+ * 172.16.2.0/24
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:19 buckets:1 uRPF:18 to:[0:0]]
+ *     [0] [@4]: ipv4-glean: af_packet1
+ * 172.16.2.1/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:20 buckets:1 uRPF:19 to:[0:0]]
+ *     [0] [@2]: dpo-receive: 172.16.2.1 on af_packet1
+ * 224.0.0.0/8
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:15 buckets:1 uRPF:14 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 240.0.0.0/8
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:14 buckets:1 uRPF:13 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 255.255.255.255/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:16 buckets:1 uRPF:15 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * @cliexend
+ * Example of how to display a single IPv4 FIB table:
+ * @cliexstart{show ip fib table 7}
+ * ipv4-VRF:7, fib_index 1, flow hash: src dst sport dport proto
+ * 0.0.0.0/0
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:12 buckets:1 uRPF:11 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 0.0.0.0/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:13 buckets:1 uRPF:12 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 172.16.1.0/24
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:17 buckets:1 uRPF:16 to:[0:0]]
+ *     [0] [@4]: ipv4-glean: af_packet0
+ * 172.16.1.1/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:18 buckets:1 uRPF:17 to:[1:84]]
+ *     [0] [@2]: dpo-receive: 172.16.1.1 on af_packet0
+ * 172.16.1.2/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:21 buckets:1 uRPF:20 to:[0:0]]
+ *     [0] [@5]: ipv4 via 172.16.1.2 af_packet0: IP4: 02:fe:9e:70:7a:2b -> 26:a5:f6:9c:3a:36
+ * 172.16.2.0/24
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:19 buckets:1 uRPF:18 to:[0:0]]
+ *     [0] [@4]: ipv4-glean: af_packet1
+ * 172.16.2.1/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:20 buckets:1 uRPF:19 to:[0:0]]
+ *     [0] [@2]: dpo-receive: 172.16.2.1 on af_packet1
+ * 224.0.0.0/8
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:15 buckets:1 uRPF:14 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 240.0.0.0/8
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:14 buckets:1 uRPF:13 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 255.255.255.255/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:16 buckets:1 uRPF:15 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * @cliexend
+ * Example of how to display a summary of all IPv4 FIB tables:
+ * @cliexstart{show ip fib summary}
+ * ipv4-VRF:0, fib_index 0, flow hash: src dst sport dport proto
+ *     Prefix length         Count
+ *                    0               1
+ *                    8               2
+ *                   32               4
+ * ipv4-VRF:7, fib_index 1, flow hash: src dst sport dport proto
+ *     Prefix length         Count
+ *                    0               1
+ *                    8               2
+ *                   24               2
+ *                   32               4
+ * @cliexend
+ ?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip4_show_fib_command, static) = {
+    .path = "show ip fib",
+    .short_help = "show ip fib [summary] [table <table-id>] [index <fib-id>] [<ip4-addr>[/<mask>]] [mtrie]",
+    .function = ip4_show_fib,
+};
+/* *INDENT-ON* */
diff --git a/src/vnet/fib/ip4_fib.h b/src/vnet/fib/ip4_fib.h
new file mode 100644
index 00000000..cf312cdc
--- /dev/null
+++ b/src/vnet/fib/ip4_fib.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @brief The IPv4 FIB
+ *
+ * FIBs are composed of two prefix data-bases (akak tables). The non-forwarding
+ * table contains all the routes that the control plane has programmed, the
+ * forwarding table contains the sub-set of those routes that can be used to
+ * forward packets.
+ * In the IPv4 FIB the non-forwarding table is an array of hash tables indexed
+ * by mask length, the forwarding table is an mtrie
+ *
+ * This IPv4 FIB is used by the protocol independent FIB. So directly using
+ * this APIs in client code is not encouraged. However, this IPv4 FIB can be
+ * used if all the client wants is an IPv4 prefix data-base
+ */
+
+#ifndef __IP4_FIB_H__
+#define __IP4_FIB_H__
+
+#include <vlib/vlib.h>
+#include <vnet/ip/ip.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_table.h>
+
+extern fib_node_index_t ip4_fib_table_lookup(const ip4_fib_t *fib,
+					     const ip4_address_t *addr,
+					     u32 len);
+extern fib_node_index_t ip4_fib_table_lookup_exact_match(const ip4_fib_t *fib,
+							 const ip4_address_t *addr,
+							 u32 len);
+
+extern void ip4_fib_table_entry_remove(ip4_fib_t *fib,
+				       const ip4_address_t *addr,
+				       u32 len);
+
+extern void ip4_fib_table_entry_insert(ip4_fib_t *fib,
+				       const ip4_address_t *addr,
+				       u32 len,
+				       fib_node_index_t fib_entry_index);
+extern void ip4_fib_table_destroy(ip4_fib_t *fib);
+
+extern void ip4_fib_table_fwding_dpo_update(ip4_fib_t *fib,
+					    const ip4_address_t *addr,
+					    u32 len,
+					    const dpo_id_t *dpo);
+
+extern void ip4_fib_table_fwding_dpo_remove(ip4_fib_t *fib,
+					    const ip4_address_t *addr,
+					    u32 len,
+					    const dpo_id_t *dpo);
+extern u32 ip4_fib_table_lookup_lb (ip4_fib_t *fib,
+				    const ip4_address_t * dst);
+
+/**
+ * @brief Get the FIB at the given index
+ */
+static inline ip4_fib_t *
+ip4_fib_get (u32 index)
+{
+    return (&(pool_elt_at_index(ip4_main.fibs, index)->v4));
+}
+
+always_inline u32
+ip4_fib_lookup (ip4_main_t * im, u32 sw_if_index, ip4_address_t * dst)
+{
+    return (ip4_fib_table_lookup_lb(
+		ip4_fib_get(vec_elt (im->fib_index_by_sw_if_index, sw_if_index)),
+		dst));
+}
+
+/**
+ * @brief Get or create an IPv4 fib.
+ *
+ * Get or create an IPv4 fib with the provided table ID.
+ *
+ * @param table_id
+ *      When set to \c ~0, an arbitrary and unused fib ID is picked
+ *      and can be retrieved with \c ret->table_id.
+ *      Otherwise, the fib ID to be used to retrieve or create the desired fib.
+ * @returns A pointer to the retrieved or created fib.
+ *
+ */
+extern u32 ip4_fib_table_find_or_create_and_lock(u32 table_id);
+extern u32 ip4_fib_table_create_and_lock(void);
+
+
+static inline 
+u32 ip4_fib_index_from_table_id (u32 table_id)
+{
+  ip4_main_t * im = &ip4_main;
+  uword * p;
+
+  p = hash_get (im->fib_index_by_table_id, table_id);
+  if (!p)
+    return ~0;
+
+  return p[0];
+}
+
+extern u32 ip4_fib_table_get_index_for_sw_if_index(u32 sw_if_index);
+
+extern flow_hash_config_t ip4_fib_table_get_flow_hash_config(u32 fib_index);
+
+
+always_inline index_t
+ip4_fib_forwarding_lookup (u32 fib_index,
+                           const ip4_address_t * addr)
+{
+    ip4_fib_mtrie_leaf_t leaf;
+    ip4_fib_mtrie_t * mtrie;
+
+    mtrie = &ip4_fib_get(fib_index)->mtrie;
+
+    leaf = IP4_FIB_MTRIE_LEAF_ROOT;
+    leaf = ip4_fib_mtrie_lookup_step (mtrie, leaf, addr, 0);
+    leaf = ip4_fib_mtrie_lookup_step (mtrie, leaf, addr, 1);
+    leaf = ip4_fib_mtrie_lookup_step (mtrie, leaf, addr, 2);
+    leaf = ip4_fib_mtrie_lookup_step (mtrie, leaf, addr, 3);
+
+    /* Handle default route. */
+    leaf = (leaf == IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie->default_leaf : leaf);
+    
+    return (ip4_fib_mtrie_leaf_get_adj_index(leaf));
+}
+
+
+#endif
+
diff --git a/src/vnet/fib/ip6_fib.c b/src/vnet/fib/ip6_fib.c
new file mode 100644
index 00000000..d5b9bdcb
--- /dev/null
+++ b/src/vnet/fib/ip6_fib.c
@@ -0,0 +1,784 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/fib/fib_table.h>
+
+static void
+vnet_ip6_fib_init (u32 fib_index)
+{
+    fib_prefix_t pfx = {
+	.fp_proto = FIB_PROTOCOL_IP6,
+	.fp_len = 0,
+	.fp_addr = {
+	    .ip6 = {
+		{ 0, 0, },
+	    },
+	}
+    };
+
+    /*
+     * Add the default route.
+     */
+    fib_table_entry_special_add(fib_index,
+				&pfx,
+				FIB_SOURCE_DEFAULT_ROUTE,
+				FIB_ENTRY_FLAG_DROP,
+				ADJ_INDEX_INVALID);
+
+    /*
+     * Add ff02::1:ff00:0/104 via local route for all tables.
+     *  This is required for neighbor discovery to work.
+     */
+    ip6_set_solicited_node_multicast_address(&pfx.fp_addr.ip6, 0);
+    pfx.fp_len = 104;
+    fib_table_entry_special_add(fib_index,
+				&pfx,
+				FIB_SOURCE_SPECIAL,
+				FIB_ENTRY_FLAG_LOCAL,
+				ADJ_INDEX_INVALID);
+
+    /*
+     * Add all-routers multicast address via local route for all tables
+     */
+    ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6,
+					IP6_MULTICAST_SCOPE_link_local,
+					IP6_MULTICAST_GROUP_ID_all_routers);
+    pfx.fp_len = 128;
+    fib_table_entry_special_add(fib_index,
+				&pfx,
+				FIB_SOURCE_SPECIAL,
+				FIB_ENTRY_FLAG_LOCAL,
+				ADJ_INDEX_INVALID);
+
+    /*
+     * Add all-nodes multicast address via local route for all tables
+     */
+    ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6,
+					IP6_MULTICAST_SCOPE_link_local,
+					IP6_MULTICAST_GROUP_ID_all_hosts);
+    pfx.fp_len = 128;
+    fib_table_entry_special_add(fib_index,
+				&pfx,
+				FIB_SOURCE_SPECIAL,
+				FIB_ENTRY_FLAG_LOCAL,
+				ADJ_INDEX_INVALID);
+
+    /*
+     *  Add all-mldv2  multicast address via local route for all tables
+     */
+    ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6,
+					IP6_MULTICAST_SCOPE_link_local,
+					IP6_MULTICAST_GROUP_ID_mldv2_routers);
+    pfx.fp_len = 128;
+    fib_table_entry_special_add(fib_index,
+				&pfx,
+				FIB_SOURCE_SPECIAL,
+				FIB_ENTRY_FLAG_LOCAL,
+				ADJ_INDEX_INVALID);
+
+    /*
+     * all link local for us
+     */
+    pfx.fp_addr.ip6.as_u64[0] = clib_host_to_net_u64 (0xFE80000000000000ULL);
+    pfx.fp_addr.ip6.as_u64[1] = 0;
+    pfx.fp_len = 10;
+    fib_table_entry_special_add(fib_index,
+				&pfx,
+				FIB_SOURCE_SPECIAL,
+				FIB_ENTRY_FLAG_LOCAL,
+				ADJ_INDEX_INVALID);
+}
+
+static u32
+create_fib_with_table_id (u32 table_id)
+{
+    fib_table_t *fib_table;
+
+    pool_get_aligned(ip6_main.fibs, fib_table, CLIB_CACHE_LINE_BYTES);
+    memset(fib_table, 0, sizeof(*fib_table));
+
+    fib_table->ft_proto = FIB_PROTOCOL_IP6;
+    fib_table->ft_index =
+	fib_table->v6.index =
+	    (fib_table - ip6_main.fibs);
+
+    hash_set(ip6_main.fib_index_by_table_id, table_id, fib_table->ft_index);
+
+    fib_table->ft_table_id =
+	fib_table->v6.table_id =
+	    table_id;
+    fib_table->ft_flow_hash_config = 
+	fib_table->v6.flow_hash_config =
+	    IP_FLOW_HASH_DEFAULT;
+
+    vnet_ip6_fib_init(fib_table->ft_index);
+    fib_table_lock(fib_table->ft_index, FIB_PROTOCOL_IP6);
+
+    return (fib_table->ft_index);
+}
+
+u32
+ip6_fib_table_find_or_create_and_lock (u32 table_id)
+{
+    uword * p;
+
+    p = hash_get (ip6_main.fib_index_by_table_id, table_id);
+    if (NULL == p)
+	return create_fib_with_table_id(table_id);
+    
+    fib_table_lock(p[0], FIB_PROTOCOL_IP6);
+
+    return (p[0]);
+}
+
+u32
+ip6_fib_table_create_and_lock (void)
+{
+    return (create_fib_with_table_id(~0));
+}
+
+void
+ip6_fib_table_destroy (u32 fib_index)
+{
+    fib_prefix_t pfx = {
+	.fp_proto = FIB_PROTOCOL_IP6,
+	.fp_len = 0,
+	.fp_addr = {
+	    .ip6 = {
+		{ 0, 0, },
+	    },
+	}
+    };
+
+    /*
+     * the default route.
+     */
+    fib_table_entry_special_remove(fib_index,
+				   &pfx,
+				   FIB_SOURCE_DEFAULT_ROUTE);
+
+
+    /*
+     * ff02::1:ff00:0/104
+     */
+    ip6_set_solicited_node_multicast_address(&pfx.fp_addr.ip6, 0);
+    pfx.fp_len = 104;
+    fib_table_entry_special_remove(fib_index,
+				   &pfx,
+				   FIB_SOURCE_SPECIAL);
+
+    /*
+     * all-routers multicast address
+     */
+    ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6,
+					IP6_MULTICAST_SCOPE_link_local,
+					IP6_MULTICAST_GROUP_ID_all_routers);
+    pfx.fp_len = 128;
+    fib_table_entry_special_remove(fib_index,
+				   &pfx,
+				   FIB_SOURCE_SPECIAL);
+
+    /*
+     * all-nodes multicast address
+     */
+    ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6,
+					IP6_MULTICAST_SCOPE_link_local,
+					IP6_MULTICAST_GROUP_ID_all_hosts);
+    pfx.fp_len = 128;
+    fib_table_entry_special_remove(fib_index,
+				   &pfx,
+				   FIB_SOURCE_SPECIAL);
+
+    /*
+     * all-mldv2 multicast address
+     */
+    ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6,
+					IP6_MULTICAST_SCOPE_link_local,
+					IP6_MULTICAST_GROUP_ID_mldv2_routers);
+    pfx.fp_len = 128;
+    fib_table_entry_special_remove(fib_index,
+				   &pfx,
+				   FIB_SOURCE_SPECIAL);
+
+    /*
+     * all link local 
+     */
+    pfx.fp_addr.ip6.as_u64[0] = clib_host_to_net_u64 (0xFE80000000000000ULL);
+    pfx.fp_addr.ip6.as_u64[1] = 0;
+    pfx.fp_len = 10;
+    fib_table_entry_special_remove(fib_index,
+				   &pfx,
+				   FIB_SOURCE_SPECIAL);
+
+    fib_table_t *fib_table = fib_table_get(fib_index, FIB_PROTOCOL_IP6);
+    fib_source_t source;
+    
+     /*
+     * validate no more routes.
+     */
+    ASSERT(0 == fib_table->ft_total_route_counts);
+    FOR_EACH_FIB_SOURCE(source)
+    {
+	ASSERT(0 == fib_table->ft_src_route_counts[source]);
+    }
+
+    if (~0 != fib_table->ft_table_id)
+    {
+	hash_unset (ip6_main.fib_index_by_table_id, fib_table->ft_table_id);
+    }
+    pool_put(ip6_main.fibs, fib_table);
+}
+
+fib_node_index_t
+ip6_fib_table_lookup (u32 fib_index,
+		      const ip6_address_t *addr,
+		      u32 len)
+{
+    const ip6_fib_table_instance_t *table;
+    BVT(clib_bihash_kv) kv, value;
+    int i, n_p, rv;
+    u64 fib;
+
+    table = &ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING];
+    n_p = vec_len (table->prefix_lengths_in_search_order);
+
+    kv.key[0] = addr->as_u64[0];
+    kv.key[1] = addr->as_u64[1];
+    fib = ((u64)((fib_index))<<32);
+
+    /*
+     * start search from a mask length same length or shorter.
+     * we don't want matches longer than the mask passed
+     */
+    i = 0;
+    while (i < n_p && table->prefix_lengths_in_search_order[i] > len)
+    {
+        i++;
+    }
+
+    for (; i < n_p; i++)
+    {
+	int dst_address_length = table->prefix_lengths_in_search_order[i];
+	ip6_address_t * mask = &ip6_main.fib_masks[dst_address_length];
+      
+	ASSERT(dst_address_length >= 0 && dst_address_length <= 128);
+	//As lengths are decreasing, masks are increasingly specific.
+	kv.key[0] &= mask->as_u64[0];
+	kv.key[1] &= mask->as_u64[1];
+	kv.key[2] = fib | dst_address_length;
+      
+	rv = BV(clib_bihash_search_inline_2)(&table->ip6_hash, &kv, &value);
+	if (rv == 0)
+	    return value.value;
+    }
+
+    return (FIB_NODE_INDEX_INVALID);
+}
+
+fib_node_index_t
+ip6_fib_table_lookup_exact_match (u32 fib_index,
+				  const ip6_address_t *addr,
+				  u32 len)
+{
+    const ip6_fib_table_instance_t *table;
+    BVT(clib_bihash_kv) kv, value;
+    ip6_address_t *mask;
+    u64 fib;
+    int rv;
+
+    table = &ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING];
+    mask = &ip6_main.fib_masks[len];
+    fib = ((u64)((fib_index))<<32);
+
+    kv.key[0] = addr->as_u64[0] & mask->as_u64[0];
+    kv.key[1] = addr->as_u64[1] & mask->as_u64[1];
+    kv.key[2] = fib | len;
+      
+    rv = BV(clib_bihash_search_inline_2)(&table->ip6_hash, &kv, &value);
+    if (rv == 0)
+	return value.value;
+
+    return (FIB_NODE_INDEX_INVALID);
+}
+
+static void
+compute_prefix_lengths_in_search_order (ip6_fib_table_instance_t *table)
+{
+    int i;
+    vec_reset_length (table->prefix_lengths_in_search_order);
+    /* Note: bitmap reversed so this is in fact a longest prefix match */
+    clib_bitmap_foreach (i, table->non_empty_dst_address_length_bitmap,
+    ({
+	int dst_address_length = 128 - i;
+	vec_add1(table->prefix_lengths_in_search_order, dst_address_length);
+    }));
+}
+
+void
+ip6_fib_table_entry_remove (u32 fib_index,
+			    const ip6_address_t *addr,
+			    u32 len)
+{
+    ip6_fib_table_instance_t *table;
+    BVT(clib_bihash_kv) kv;
+    ip6_address_t *mask;
+    u64 fib;
+
+    table = &ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING];
+    mask = &ip6_main.fib_masks[len];
+    fib = ((u64)((fib_index))<<32);
+
+    kv.key[0] = addr->as_u64[0] & mask->as_u64[0];
+    kv.key[1] = addr->as_u64[1] & mask->as_u64[1];
+    kv.key[2] = fib | len;
+
+    BV(clib_bihash_add_del)(&table->ip6_hash, &kv, 0);
+
+    /* refcount accounting */
+    ASSERT (table->dst_address_length_refcounts[len] > 0);
+    if (--table->dst_address_length_refcounts[len] == 0)
+    {
+	table->non_empty_dst_address_length_bitmap =
+            clib_bitmap_set (table->non_empty_dst_address_length_bitmap, 
+                             128 - len, 0);
+	compute_prefix_lengths_in_search_order (table);
+    }
+}
+
+void
+ip6_fib_table_entry_insert (u32 fib_index,
+			    const ip6_address_t *addr,
+			    u32 len,
+			    fib_node_index_t fib_entry_index)
+{
+    ip6_fib_table_instance_t *table;
+    BVT(clib_bihash_kv) kv;
+    ip6_address_t *mask;
+    u64 fib;
+
+    table = &ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING];
+    mask = &ip6_main.fib_masks[len];
+    fib = ((u64)((fib_index))<<32);
+
+    kv.key[0] = addr->as_u64[0] & mask->as_u64[0];
+    kv.key[1] = addr->as_u64[1] & mask->as_u64[1];
+    kv.key[2] = fib | len;
+    kv.value = fib_entry_index;
+
+    BV(clib_bihash_add_del)(&table->ip6_hash, &kv, 1);
+
+    table->dst_address_length_refcounts[len]++;
+
+    table->non_empty_dst_address_length_bitmap =
+        clib_bitmap_set (table->non_empty_dst_address_length_bitmap, 
+			 128 - len, 1);
+    compute_prefix_lengths_in_search_order (table);
+}
+
+u32 
+ip6_fib_table_fwding_lookup (ip6_main_t * im,
+                             u32 fib_index,
+                             const ip6_address_t * dst)
+{
+    const ip6_fib_table_instance_t *table;
+    int i, len;
+    int rv;
+    BVT(clib_bihash_kv) kv, value;
+    u64 fib;
+
+    table = &ip6_main.ip6_table[IP6_FIB_TABLE_FWDING];
+    len = vec_len (table->prefix_lengths_in_search_order);
+
+    kv.key[0] = dst->as_u64[0];
+    kv.key[1] = dst->as_u64[1];
+    fib = ((u64)((fib_index))<<32);
+
+    for (i = 0; i < len; i++)
+    {
+	int dst_address_length = table->prefix_lengths_in_search_order[i];
+	ip6_address_t * mask = &ip6_main.fib_masks[dst_address_length];
+      
+	ASSERT(dst_address_length >= 0 && dst_address_length <= 128);
+	//As lengths are decreasing, masks are increasingly specific.
+	kv.key[0] &= mask->as_u64[0];
+	kv.key[1] &= mask->as_u64[1];
+	kv.key[2] = fib | dst_address_length;
+      
+	rv = BV(clib_bihash_search_inline_2)(&table->ip6_hash, &kv, &value);
+	if (rv == 0)
+	    return value.value;
+    }
+
+    /* default route is always present */
+    ASSERT(0);
+    return 0;
+}
+
+u32 ip6_fib_table_fwding_lookup_with_if_index (ip6_main_t * im,
+					       u32 sw_if_index,
+					       const ip6_address_t * dst)
+{
+    u32 fib_index = vec_elt (im->fib_index_by_sw_if_index, sw_if_index);
+    return ip6_fib_table_fwding_lookup(im, fib_index, dst);
+}
+
+flow_hash_config_t
+ip6_fib_table_get_flow_hash_config (u32 fib_index)
+{
+    return (ip6_fib_get(fib_index)->flow_hash_config);
+}
+
+u32
+ip6_fib_table_get_index_for_sw_if_index (u32 sw_if_index)
+{
+    if (sw_if_index >= vec_len(ip6_main.fib_index_by_sw_if_index))
+    {
+	/*
+	 * This is the case for interfaces that are not yet mapped to
+	 * a IP table
+	 */
+	return (~0);
+    }
+    return (ip6_main.fib_index_by_sw_if_index[sw_if_index]);
+}
+
+void
+ip6_fib_table_fwding_dpo_update (u32 fib_index,
+				 const ip6_address_t *addr,
+				 u32 len,
+				 const dpo_id_t *dpo)
+{
+    ip6_fib_table_instance_t *table;
+    BVT(clib_bihash_kv) kv;
+    ip6_address_t *mask;
+    u64 fib;
+
+    table = &ip6_main.ip6_table[IP6_FIB_TABLE_FWDING];
+    mask = &ip6_main.fib_masks[len];
+    fib = ((u64)((fib_index))<<32);
+
+    kv.key[0] = addr->as_u64[0] & mask->as_u64[0];
+    kv.key[1] = addr->as_u64[1] & mask->as_u64[1];
+    kv.key[2] = fib | len;
+    kv.value = dpo->dpoi_index;
+
+    BV(clib_bihash_add_del)(&table->ip6_hash, &kv, 1);
+
+    table->dst_address_length_refcounts[len]++;
+
+    table->non_empty_dst_address_length_bitmap =
+        clib_bitmap_set (table->non_empty_dst_address_length_bitmap, 
+			 128 - len, 1);
+    compute_prefix_lengths_in_search_order (table);
+}
+
+void
+ip6_fib_table_fwding_dpo_remove (u32 fib_index,
+				 const ip6_address_t *addr,
+				 u32 len,
+				 const dpo_id_t *dpo)
+{
+    ip6_fib_table_instance_t *table;
+    BVT(clib_bihash_kv) kv;
+    ip6_address_t *mask;
+    u64 fib;
+
+    table = &ip6_main.ip6_table[IP6_FIB_TABLE_FWDING];
+    mask = &ip6_main.fib_masks[len];
+    fib = ((u64)((fib_index))<<32);
+
+    kv.key[0] = addr->as_u64[0] & mask->as_u64[0];
+    kv.key[1] = addr->as_u64[1] & mask->as_u64[1];
+    kv.key[2] = fib | len;
+    kv.value = dpo->dpoi_index;
+
+    BV(clib_bihash_add_del)(&table->ip6_hash, &kv, 0);
+
+    /* refcount accounting */
+    ASSERT (table->dst_address_length_refcounts[len] > 0);
+    if (--table->dst_address_length_refcounts[len] == 0)
+    {
+	table->non_empty_dst_address_length_bitmap =
+            clib_bitmap_set (table->non_empty_dst_address_length_bitmap, 
+                             128 - len, 0);
+	compute_prefix_lengths_in_search_order (table);
+    }
+}
+
+typedef struct ip6_fib_show_ctx_t_ {
+    u32 fib_index;
+    fib_node_index_t *entries;
+} ip6_fib_show_ctx_t;
+
+static void
+ip6_fib_table_collect_entries (clib_bihash_kv_24_8_t * kvp,
+			       void *arg)
+{
+    ip6_fib_show_ctx_t *ctx = arg;
+
+    if ((kvp->key[2] >> 32) == ctx->fib_index)
+    {
+	vec_add1(ctx->entries, kvp->value);
+    }
+}
+
+static void
+ip6_fib_table_show_all (ip6_fib_t *fib,
+			vlib_main_t * vm)
+{
+    fib_node_index_t *fib_entry_index;
+    ip6_fib_show_ctx_t ctx = {
+	.fib_index = fib->index,
+	.entries = NULL,
+    };
+    ip6_main_t *im = &ip6_main;
+
+    BV(clib_bihash_foreach_key_value_pair)(&im->ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash,
+					   ip6_fib_table_collect_entries,
+					   &ctx);
+
+    vec_sort_with_function(ctx.entries, fib_entry_cmp_for_sort);
+
+    vec_foreach(fib_entry_index, ctx.entries)
+    {
+	vlib_cli_output(vm, "%U",
+                        format_fib_entry,
+                        *fib_entry_index,
+                        FIB_ENTRY_FORMAT_BRIEF);
+    }
+
+    vec_free(ctx.entries);
+}
+
+static void
+ip6_fib_table_show_one (ip6_fib_t *fib,
+			vlib_main_t * vm,
+			ip6_address_t *address,
+			u32 mask_len)
+{
+    vlib_cli_output(vm, "%U",
+                    format_fib_entry,
+                    ip6_fib_table_lookup(fib->index, address, mask_len),
+                    FIB_ENTRY_FORMAT_DETAIL);
+}
+
+typedef struct {
+  u32 fib_index;
+  u64 count_by_prefix_length[129];
+} count_routes_in_fib_at_prefix_length_arg_t;
+
+static void count_routes_in_fib_at_prefix_length 
+(BVT(clib_bihash_kv) * kvp, void *arg)
+{
+  count_routes_in_fib_at_prefix_length_arg_t * ap = arg;
+  int mask_width;
+
+  if ((kvp->key[2]>>32) != ap->fib_index)
+    return;
+
+  mask_width = kvp->key[2] & 0xFF;
+
+  ap->count_by_prefix_length[mask_width]++;
+}
+
+static clib_error_t *
+ip6_show_fib (vlib_main_t * vm,
+	      unformat_input_t * input,
+	      vlib_cli_command_t * cmd)
+{
+    count_routes_in_fib_at_prefix_length_arg_t _ca, *ca = &_ca;
+    ip6_main_t * im6 = &ip6_main;
+    fib_table_t *fib_table;
+    ip6_fib_t * fib;
+    int verbose, matching;
+    ip6_address_t matching_address;
+    u32 mask_len  = 128;
+    int table_id = -1, fib_index = ~0;
+
+    verbose = 1;
+    matching = 0;
+
+    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+	if (unformat (input, "brief")   ||
+	    unformat (input, "summary") ||
+	    unformat (input, "sum"))
+	    verbose = 0;
+
+	else if (unformat (input, "%U/%d",
+			   unformat_ip6_address, &matching_address, &mask_len))
+	    matching = 1;
+
+	else if (unformat (input, "%U", unformat_ip6_address, &matching_address))
+	    matching = 1;
+
+	else if (unformat (input, "table %d", &table_id))
+	    ;
+	else if (unformat (input, "index %d", &fib_index))
+	    ;
+	else
+	    break;
+    }
+
+    pool_foreach (fib_table, im6->fibs,
+    ({
+	fib = &(fib_table->v6);
+	if (table_id >= 0 && table_id != (int)fib->table_id)
+	    continue;
+	if (fib_index != ~0 && fib_index != (int)fib->index)
+	    continue;
+
+	vlib_cli_output (vm, "%s, fib_index %d, flow hash: %U", 
+			 fib_table->ft_desc, fib->index,
+			 format_ip_flow_hash_config, fib->flow_hash_config);
+
+	/* Show summary? */
+	if (! verbose)
+	{
+	    BVT(clib_bihash) * h = &im6->ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash;
+	    int len;
+
+	    vlib_cli_output (vm, "%=20s%=16s", "Prefix length", "Count");
+
+	    memset (ca, 0, sizeof(*ca));
+	    ca->fib_index = fib->index;
+
+	    BV(clib_bihash_foreach_key_value_pair)
+		(h, count_routes_in_fib_at_prefix_length, ca);
+
+	    for (len = 128; len >= 0; len--)
+            {
+		if (ca->count_by_prefix_length[len])
+		    vlib_cli_output (vm, "%=20d%=16lld", 
+				     len, ca->count_by_prefix_length[len]);
+            }
+	    continue;
+	}
+
+	if (!matching)
+	{
+	    ip6_fib_table_show_all(fib, vm);
+	}
+	else
+	{
+	    ip6_fib_table_show_one(fib, vm, &matching_address, mask_len);
+	}
+    }));
+
+    return 0;
+}
+
+/*?
+ * This command displays the IPv6 FIB Tables (VRF Tables) and the route
+ * entries for each table.
+ *
+ * @note This command will run for a long time when the FIB tables are
+ * comprised of millions of entries. For those senarios, consider displaying
+ * in summary mode.
+ *
+ * @cliexpar
+ * @parblock
+ * Example of how to display all the IPv6 FIB tables:
+ * @cliexstart{show ip6 fib}
+ * ipv6-VRF:0, fib_index 0, flow hash: src dst sport dport proto
+ * @::/0
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:5 buckets:1 uRPF:5 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * fe80::/10
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:10 buckets:1 uRPF:10 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ff02::1/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:8 buckets:1 uRPF:8 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ff02::2/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:7 buckets:1 uRPF:7 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ff02::16/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:9 buckets:1 uRPF:9 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ff02::1:ff00:0/104
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:6 buckets:1 uRPF:6 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ipv6-VRF:8, fib_index 1, flow hash: src dst sport dport proto
+ * @::/0
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:21 buckets:1 uRPF:20 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * @::a:1:1:0:4/126
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:27 buckets:1 uRPF:26 to:[0:0]]
+ *     [0] [@4]: ipv6-glean: af_packet0
+ * @::a:1:1:0:7/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:28 buckets:1 uRPF:27 to:[0:0]]
+ *     [0] [@2]: dpo-receive: @::a:1:1:0:7 on af_packet0
+ * fe80::/10
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:26 buckets:1 uRPF:25 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * fe80::fe:3eff:fe3e:9222/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:29 buckets:1 uRPF:28 to:[0:0]]
+ *     [0] [@2]: dpo-receive: fe80::fe:3eff:fe3e:9222 on af_packet0
+ * ff02::1/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:24 buckets:1 uRPF:23 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ff02::2/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:23 buckets:1 uRPF:22 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ff02::16/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:25 buckets:1 uRPF:24 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ff02::1:ff00:0/104
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:22 buckets:1 uRPF:21 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * @cliexend
+ *
+ * Example of how to display a summary of all IPv6 FIB tables:
+ * @cliexstart{show ip6 fib summary}
+ * ipv6-VRF:0, fib_index 0, flow hash: src dst sport dport proto
+ *     Prefix length         Count
+ *          128                3
+ *          104                1
+ *          10                 1
+ *           0                 1
+ * ipv6-VRF:8, fib_index 1, flow hash: src dst sport dport proto
+ *     Prefix length         Count
+ *          128                5
+ *          126                1
+ *          104                1
+ *          10                 1
+ *           0                 1
+ * @cliexend
+ * @endparblock
+ ?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip6_show_fib_command, static) = {
+    .path = "show ip6 fib",
+    .short_help = "show ip6 fib [summary] [table <table-id>] [index <fib-id>] [<ip6-addr>[/<width>]]",
+    .function = ip6_show_fib,
+};
+/* *INDENT-ON* */
diff --git a/src/vnet/fib/ip6_fib.h b/src/vnet/fib/ip6_fib.h
new file mode 100644
index 00000000..f6af993a
--- /dev/null
+++ b/src/vnet/fib/ip6_fib.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __IP6_FIB_H__
+#define __IP6_FIB_H__
+
+#include <vlib/vlib.h>
+#include <vnet/ip/format.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/ip/lookup.h>
+#include <vnet/dpo/load_balance.h>
+
+extern fib_node_index_t ip6_fib_table_lookup(u32 fib_index,
+					     const ip6_address_t *addr,
+					     u32 len);
+extern fib_node_index_t ip6_fib_table_lookup_exact_match(u32 fib_index,
+							 const ip6_address_t *addr,
+							 u32 len);
+
+extern void ip6_fib_table_entry_remove(u32 fib_index,
+				       const ip6_address_t *addr,
+				       u32 len);
+
+extern void ip6_fib_table_entry_insert(u32 fib_index,
+				       const ip6_address_t *addr,
+				       u32 len,
+				       fib_node_index_t fib_entry_index);
+extern void ip6_fib_table_destroy(u32 fib_index);
+
+extern void ip6_fib_table_fwding_dpo_update(u32 fib_index,
+					    const ip6_address_t *addr,
+					    u32 len,
+					    const dpo_id_t *dpo);
+
+extern void ip6_fib_table_fwding_dpo_remove(u32 fib_index,
+					    const ip6_address_t *addr,
+					    u32 len,
+					    const dpo_id_t *dpo);
+
+u32 ip6_fib_table_fwding_lookup_with_if_index(ip6_main_t * im,
+					      u32 sw_if_index,
+					      const ip6_address_t * dst);
+u32 ip6_fib_table_fwding_lookup(ip6_main_t * im,
+				u32 fib_index, 
+				const ip6_address_t * dst);
+
+/**
+ * @biref return the DPO that the LB stacks on.
+ */
+always_inline u32
+ip6_src_lookup_for_packet (ip6_main_t * im,
+                           vlib_buffer_t * b,
+                           ip6_header_t * i)
+{
+    if (vnet_buffer (b)->ip.adj_index[VLIB_RX] == ~0)
+    {
+        const dpo_id_t *dpo;
+        index_t lbi;
+
+        lbi = ip6_fib_table_fwding_lookup_with_if_index(
+                  im,
+                  vnet_buffer (b)->sw_if_index[VLIB_RX],
+                  &i->src_address);
+
+        dpo = load_balance_get_bucket_i(load_balance_get(lbi), 0);
+
+        if (dpo_is_adj(dpo))
+        {
+            vnet_buffer (b)->ip.adj_index[VLIB_RX] = dpo->dpoi_index;
+        }
+    }
+    return vnet_buffer (b)->ip.adj_index[VLIB_RX];
+}
+
+/**
+ * \brief Get or create an IPv6 fib.
+ *
+ * Get or create an IPv4 fib with the provided table ID.
+ *
+ * \param im
+ *      ip4_main pointer.
+ * \param table_id
+ *      When set to \c ~0, an arbitrary and unused fib ID is picked
+ *      and can be retrieved with \c ret->table_id.
+ *      Otherwise, the fib ID to be used to retrieve or create the desired fib.
+ * \returns A pointer to the retrieved or created fib.
+ *
+ */
+extern u32 ip6_fib_table_find_or_create_and_lock(u32 table_id);
+extern u32 ip6_fib_table_create_and_lock(void);
+
+static inline ip6_fib_t *
+ip6_fib_get (fib_node_index_t index)
+{
+    ASSERT(!pool_is_free_index(ip6_main.fibs, index));
+    return (&pool_elt_at_index (ip6_main.fibs, index)->v6);
+}
+
+static inline 
+u32 ip6_fib_index_from_table_id (u32 table_id)
+{
+  ip6_main_t * im = &ip6_main;
+  uword * p;
+
+  p = hash_get (im->fib_index_by_table_id, table_id);
+  if (!p)
+    return ~0;
+
+  return p[0];
+}
+
+extern u32 ip6_fib_table_get_index_for_sw_if_index(u32 sw_if_index);
+
+extern flow_hash_config_t ip6_fib_table_get_flow_hash_config(u32 fib_index);
+
+#endif
+
diff --git a/src/vnet/fib/mpls_fib.c b/src/vnet/fib/mpls_fib.c
new file mode 100644
index 00000000..6a9b1ac2
--- /dev/null
+++ b/src/vnet/fib/mpls_fib.c
@@ -0,0 +1,439 @@
+/*
+ * mpls_fib.h: The Label/MPLS FIB
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * An MPLS_FIB table;
+ *
+ * The entries in the table are programmed wtih one or more MOIs. These MOIs
+ * may result in different forwarding actions for end-of-stack (EOS) and non-EOS
+ * packets. Whether the two actions are the same more often than they are
+ * different, or vice versa, is a function of the deployment in which the router
+ * is used and thus not predictable.
+ * The desgin choice to make with an MPLS_FIB table is:
+ *  1 - 20 bit key: label only.
+ *      When the EOS and non-EOS actions differ the result is a 'EOS-choice' object.
+ *  2 - 21 bit key: label and EOS-bit.
+ *      The result is then the specific action based on EOS-bit.
+ *
+ * 20 bit key:
+ *   Advantages:
+ *    - lower memory overhead, since there are few DB entries.
+ *   Disadvantages:
+ *    - slower DP performance in the case the chains differ, as more objects are
+ *      encounterd in the switch path
+ *
+ * 21 bit key:
+ *   Advantages:
+ *    - faster DP performance
+ *   Disadvantages
+ *    - increased memory footprint.
+ *
+ * Switching between schemes based on observed/measured action similarity is not
+ * considered on the grounds of complexity and flip-flopping.
+ *
+ * VPP mantra - favour performance over memory. We choose a 21 bit key.  
+ */
+
+#include <vnet/fib/fib_table.h>
+#include <vnet/dpo/load_balance.h>
+#include <vnet/dpo/drop_dpo.h>
+#include <vnet/dpo/punt_dpo.h>
+#include <vnet/dpo/lookup_dpo.h>
+#include <vnet/mpls/mpls.h>
+
+/**
+ * All lookups in an MPLS_FIB table must result in a DPO of type load-balance.
+ * This is the default result which links to drop
+ */
+static index_t mpls_fib_drop_dpo_index = INDEX_INVALID;
+
+/**
+ * FIXME
+ */
+#define MPLS_FLOW_HASH_DEFAULT 0
+
+static inline u32
+mpls_fib_entry_mk_key (mpls_label_t label,
+		       mpls_eos_bit_t eos)
+{
+    ASSERT(eos <= 1);
+    return (label << 1 | eos);
+}
+
+u32
+mpls_fib_index_from_table_id (u32 table_id)
+{
+    mpls_main_t *mm = &mpls_main;
+    uword * p;
+
+    p = hash_get (mm->fib_index_by_table_id, table_id);
+    if (!p)
+	return FIB_NODE_INDEX_INVALID;
+
+    return p[0];
+}
+
+static u32
+mpls_fib_create_with_table_id (u32 table_id)
+{
+    dpo_id_t dpo = DPO_INVALID;
+    fib_table_t *fib_table;
+    mpls_eos_bit_t eos;
+    mpls_fib_t *mf;
+    int i;
+
+    pool_get_aligned(mpls_main.fibs, fib_table, CLIB_CACHE_LINE_BYTES);
+    memset(fib_table, 0, sizeof(*fib_table));
+
+    fib_table->ft_proto = FIB_PROTOCOL_MPLS;
+    fib_table->ft_index =
+	(fib_table - mpls_main.fibs);
+
+    hash_set (mpls_main.fib_index_by_table_id, table_id, fib_table->ft_index);
+
+    fib_table->ft_table_id =
+	table_id;
+    fib_table->ft_flow_hash_config = 
+	MPLS_FLOW_HASH_DEFAULT;
+    fib_table->v4.fwd_classify_table_index = ~0;
+    fib_table->v4.rev_classify_table_index = ~0;
+    
+    fib_table_lock(fib_table->ft_index, FIB_PROTOCOL_MPLS);
+
+    if (INDEX_INVALID == mpls_fib_drop_dpo_index)
+    {
+	mpls_fib_drop_dpo_index = load_balance_create(1, DPO_PROTO_MPLS, 0);
+	load_balance_set_bucket(mpls_fib_drop_dpo_index,
+				0,
+                                drop_dpo_get(DPO_PROTO_MPLS));
+    }
+
+    mf = &fib_table->mpls;
+    mf->mf_entries = hash_create(0, sizeof(fib_node_index_t));
+    for (i = 0; i < MPLS_FIB_DB_SIZE; i++)
+    {
+	/*
+	 * initialise each DPO in the data-path lookup table
+	 * to be the special MPLS drop
+	 */
+	mf->mf_lbs[i] = mpls_fib_drop_dpo_index;
+    }
+
+    /*
+     * non-default forwarding for the special labels.
+     */
+    fib_prefix_t prefix = {
+	.fp_proto = FIB_PROTOCOL_MPLS,
+	.fp_payload_proto = DPO_PROTO_MPLS,
+    };
+
+    /*
+     * PUNT the router alert, both EOS and non-eos
+     */
+    prefix.fp_label = MPLS_IETF_ROUTER_ALERT_LABEL;
+    FOR_EACH_MPLS_EOS_BIT(eos)
+    {
+	prefix.fp_eos = eos;
+        fib_table_entry_special_dpo_add(fib_table->ft_index,
+					&prefix,
+					FIB_SOURCE_SPECIAL,
+					FIB_ENTRY_FLAG_EXCLUSIVE,
+					punt_dpo_get(DPO_PROTO_MPLS));
+    }
+
+    /*
+     * IPv4 explicit NULL EOS lookup in the interface's IPv4 table
+     */
+    prefix.fp_label = MPLS_IETF_IPV4_EXPLICIT_NULL_LABEL;
+    prefix.fp_payload_proto = DPO_PROTO_IP4;
+    prefix.fp_eos = MPLS_EOS;
+
+    lookup_dpo_add_or_lock_w_fib_index(0, // unused
+                                       DPO_PROTO_IP4,
+                                       LOOKUP_INPUT_DST_ADDR,
+                                       LOOKUP_TABLE_FROM_INPUT_INTERFACE,
+                                       &dpo);
+    fib_table_entry_special_dpo_add(fib_table->ft_index,
+				    &prefix,
+				    FIB_SOURCE_SPECIAL,
+				    FIB_ENTRY_FLAG_EXCLUSIVE,
+                                    &dpo);
+
+    prefix.fp_payload_proto = DPO_PROTO_MPLS;
+    prefix.fp_eos = MPLS_NON_EOS;
+
+    lookup_dpo_add_or_lock_w_fib_index(0, //unsued
+                                       DPO_PROTO_MPLS,
+                                       LOOKUP_INPUT_DST_ADDR,
+                                       LOOKUP_TABLE_FROM_INPUT_INTERFACE,
+                                       &dpo);
+    fib_table_entry_special_dpo_add(fib_table->ft_index,
+				    &prefix,
+				    FIB_SOURCE_SPECIAL,
+				    FIB_ENTRY_FLAG_EXCLUSIVE,
+                                    &dpo);
+
+    /*
+     * IPv6 explicit NULL EOS lookup in the interface's IPv6 table
+     */
+    prefix.fp_label = MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL;
+    prefix.fp_payload_proto = DPO_PROTO_IP6;
+    prefix.fp_eos = MPLS_EOS;
+
+    lookup_dpo_add_or_lock_w_fib_index(0, //unused
+                                       DPO_PROTO_IP6,
+                                       LOOKUP_INPUT_DST_ADDR,
+                                       LOOKUP_TABLE_FROM_INPUT_INTERFACE,
+                                       &dpo);
+    fib_table_entry_special_dpo_add(fib_table->ft_index,
+				    &prefix,
+				    FIB_SOURCE_SPECIAL,
+				    FIB_ENTRY_FLAG_EXCLUSIVE,
+                                    &dpo);
+
+    prefix.fp_payload_proto = DPO_PROTO_MPLS;
+    prefix.fp_eos = MPLS_NON_EOS;
+    lookup_dpo_add_or_lock_w_fib_index(0, // unsued
+                                       DPO_PROTO_MPLS,
+                                       LOOKUP_INPUT_DST_ADDR,
+                                       LOOKUP_TABLE_FROM_INPUT_INTERFACE,
+                                       &dpo);
+    fib_table_entry_special_dpo_add(fib_table->ft_index,
+				    &prefix,
+				    FIB_SOURCE_SPECIAL,
+				    FIB_ENTRY_FLAG_EXCLUSIVE,
+                                    &dpo);
+
+    return (fib_table->ft_index);
+}
+
+u32
+mpls_fib_table_find_or_create_and_lock (u32 table_id)
+{
+    u32 index;
+
+    index = mpls_fib_index_from_table_id(table_id);
+    if (~0 == index)
+	return mpls_fib_create_with_table_id(table_id);
+
+    fib_table_lock(index, FIB_PROTOCOL_MPLS);
+
+    return (index);
+}
+u32
+mpls_fib_table_create_and_lock (void)
+{
+    return (mpls_fib_create_with_table_id(~0));
+}
+
+void
+mpls_fib_table_destroy (mpls_fib_t *mf)
+{
+    fib_table_t *fib_table = (fib_table_t*)mf;
+    fib_prefix_t prefix = {
+	.fp_proto = FIB_PROTOCOL_MPLS,
+    };
+    mpls_label_t special_labels[] = {
+	MPLS_IETF_ROUTER_ALERT_LABEL,
+	MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL,
+	MPLS_IETF_IPV4_EXPLICIT_NULL_LABEL,
+    };
+    mpls_eos_bit_t eos;
+    u32 ii;
+
+    for (ii = 0; ii < ARRAY_LEN(special_labels); ii++)
+    {
+	FOR_EACH_MPLS_EOS_BIT(eos)
+	{
+	    prefix.fp_label = special_labels[ii];
+	    prefix.fp_eos   = eos;
+
+	    fib_table_entry_delete(fib_table->ft_index,
+				   &prefix,
+				   FIB_SOURCE_SPECIAL);
+	}
+    }
+    if (~0 != fib_table->ft_table_id)
+    {
+	hash_unset(mpls_main.fib_index_by_table_id,
+		   fib_table->ft_table_id);
+    }
+    hash_delete(mf->mf_entries);
+
+    pool_put(mpls_main.fibs, fib_table);
+}
+
+fib_node_index_t
+mpls_fib_table_lookup (const mpls_fib_t *mf,
+		       mpls_label_t label,
+		       mpls_eos_bit_t eos)
+{
+    uword *p;
+
+    p = hash_get(mf->mf_entries, mpls_fib_entry_mk_key(label, eos));
+
+    if (NULL == p)
+	return FIB_NODE_INDEX_INVALID;
+
+    return p[0];
+}
+
+void
+mpls_fib_table_entry_insert (mpls_fib_t *mf,
+			     mpls_label_t label,
+			     mpls_eos_bit_t eos,
+			     fib_node_index_t lfei)
+{
+    hash_set(mf->mf_entries, mpls_fib_entry_mk_key(label, eos), lfei);
+}
+
+void
+mpls_fib_table_entry_remove (mpls_fib_t *mf,
+			     mpls_label_t label,
+			     mpls_eos_bit_t eos)
+{
+    hash_unset(mf->mf_entries, mpls_fib_entry_mk_key(label, eos));
+}
+
+void
+mpls_fib_forwarding_table_update (mpls_fib_t *mf,
+				  mpls_label_t label,
+				  mpls_eos_bit_t eos,
+				  const dpo_id_t *dpo)
+{
+    mpls_label_t key;
+
+    ASSERT(DPO_LOAD_BALANCE == dpo->dpoi_type);
+
+    key = mpls_fib_entry_mk_key(label, eos);
+
+    mf->mf_lbs[key] = dpo->dpoi_index;
+}
+
+void
+mpls_fib_forwarding_table_reset (mpls_fib_t *mf,
+				 mpls_label_t label,
+				 mpls_eos_bit_t eos)
+{
+    mpls_label_t key;
+
+    key = mpls_fib_entry_mk_key(label, eos);
+
+    mf->mf_lbs[key] = mpls_fib_drop_dpo_index;
+}
+
+flow_hash_config_t
+mpls_fib_table_get_flow_hash_config (u32 fib_index)
+{
+    // FIXME.
+    return (0);
+}
+
+static void
+mpls_fib_table_show_all (const mpls_fib_t *mpls_fib,
+			 vlib_main_t * vm)
+{
+    fib_node_index_t lfei, *lfeip, *lfeis = NULL;
+    mpls_label_t key;
+
+    hash_foreach(key, lfei, mpls_fib->mf_entries,
+    ({
+	vec_add1(lfeis, lfei);
+    }));
+
+    vec_sort_with_function(lfeis, fib_entry_cmp_for_sort);
+
+    vec_foreach(lfeip, lfeis)
+    {
+	vlib_cli_output (vm, "%U",
+			 format_fib_entry, *lfeip,
+			 FIB_ENTRY_FORMAT_DETAIL);
+    }
+    vec_free(lfeis);
+}
+
+static void
+mpls_fib_table_show_one (const mpls_fib_t *mpls_fib,
+			 mpls_label_t label,
+			 vlib_main_t * vm)
+{    
+    fib_node_index_t lfei;
+    mpls_eos_bit_t eos;
+
+    FOR_EACH_MPLS_EOS_BIT(eos)
+    {    
+	lfei = mpls_fib_table_lookup(mpls_fib, label, eos);
+
+	if (FIB_NODE_INDEX_INVALID != lfei)
+	{
+	    vlib_cli_output (vm, "%U", 
+			     format_fib_entry, lfei, FIB_ENTRY_FORMAT_DETAIL);
+	}
+    }
+}
+
+static clib_error_t *
+mpls_fib_show (vlib_main_t * vm,
+	       unformat_input_t * input,
+	       vlib_cli_command_t * cmd)
+{
+    fib_table_t * fib_table;
+    mpls_label_t label;
+    int table_id;
+
+    table_id = -1;
+    label = MPLS_LABEL_INVALID;
+
+    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+	/* if (unformat (input, "brief") || unformat (input, "summary") */
+	/*     || unformat (input, "sum")) */
+	/*     verbose = 0; */
+
+	if (unformat (input, "%d", &label))
+	    continue;
+	else if (unformat (input, "table %d", &table_id))
+	    ;
+	else
+	    break;
+    }
+
+    pool_foreach (fib_table, mpls_main.fibs,
+    ({
+	if (table_id >= 0 && table_id != fib_table->ft_table_id)
+	    continue;
+
+	vlib_cli_output (vm, "%v, fib_index %d",
+			 fib_table->ft_desc, mpls_main.fibs - fib_table);
+
+	if (MPLS_LABEL_INVALID == label)
+	{
+	    mpls_fib_table_show_all(&(fib_table->mpls), vm);
+	}
+	else
+	{
+	    mpls_fib_table_show_one(&(fib_table->mpls), label, vm);
+	}
+    }));
+
+    return 0;
+}
+
+VLIB_CLI_COMMAND (mpls_fib_show_command, static) = {
+    .path = "show mpls fib",
+    .short_help = "show mpls fib [summary] [table <n>]",
+    .function = mpls_fib_show,
+};
diff --git a/src/vnet/fib/mpls_fib.h b/src/vnet/fib/mpls_fib.h
new file mode 100644
index 00000000..93ae4623
--- /dev/null
+++ b/src/vnet/fib/mpls_fib.h
@@ -0,0 +1,106 @@
+/*
+ * mpls_fib.h: The Label/MPLS FIB
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPLS_FIB_TABLE_H__
+#define __MPLS_FIB_TABLE_H__
+
+#include <vnet/vnet.h>
+#include <vnet/mpls/mpls.h>
+#include <vnet/fib/fib_types.h>
+#include <vnet/dpo/dpo.h>
+#include <vnet/mpls/mpls.h>
+#include <vnet/fib/fib_table.h>
+
+static inline mpls_fib_t*
+mpls_fib_get (fib_node_index_t index)
+{
+    if (!pool_is_free_index(mpls_main.fibs, index))
+	return (&(pool_elt_at_index(mpls_main.fibs, index)->mpls));
+    return (NULL);
+}
+
+extern u32 mpls_fib_table_find_or_create_and_lock(u32 table_id);
+extern u32 mpls_fib_table_create_and_lock(void);
+// extern mpls_fib_t * mpls_fib_find(u32 table_id);
+extern u32 mpls_fib_index_from_table_id(u32 table_id);
+
+extern u8 *format_mpls_fib_table_name(u8 * s, va_list * args);
+
+extern fib_node_index_t mpls_fib_table_entry_add_from_ip_fib_entry (
+    u32 table_id,
+    mpls_label_t label,
+    mpls_eos_bit_t eos,
+    fib_node_index_t fib_entry_index);
+
+
+extern fib_node_index_t mpls_fib_table_lookup(const mpls_fib_t *mf,
+					      mpls_label_t label,
+					      mpls_eos_bit_t eos);
+
+extern void mpls_fib_table_entry_remove(mpls_fib_t *mf,
+					mpls_label_t label,
+					mpls_eos_bit_t eos);
+extern void mpls_fib_table_entry_insert(mpls_fib_t *mf,
+					mpls_label_t label,
+					mpls_eos_bit_t eos,
+					fib_node_index_t fei);
+extern void mpls_fib_table_destroy(mpls_fib_t *mf);
+
+
+
+extern void mpls_fib_forwarding_table_update(mpls_fib_t *mf,
+					     mpls_label_t label,
+					     mpls_eos_bit_t eos,
+					     const dpo_id_t *dpo);
+extern void mpls_fib_forwarding_table_reset(mpls_fib_t *mf,
+					    mpls_label_t label,
+					    mpls_eos_bit_t eos);
+
+/**
+ * @brief
+ *  Lookup a label and EOS bit in the MPLS_FIB table to retrieve the
+ *  load-balance index to be used for packet forwarding.
+ */
+static inline index_t
+mpls_fib_table_forwarding_lookup (u32 mpls_fib_index,
+				  const mpls_unicast_header_t *hdr)
+{
+    mpls_label_t label;
+    mpls_fib_t *mf;
+    u32 key;
+
+    label = clib_net_to_host_u32(hdr->label_exp_s_ttl);
+    key = (vnet_mpls_uc_get_label(label) << 1) | vnet_mpls_uc_get_s(label);
+
+    mf = mpls_fib_get(mpls_fib_index);
+
+    return (mf->mf_lbs[key]);
+}
+
+static inline u32
+mpls_fib_table_get_index_for_sw_if_index (u32 sw_if_index)
+{
+    mpls_main_t *mm = &mpls_main;
+
+    ASSERT(vec_len(mm->fib_index_by_sw_if_index) > sw_if_index);
+
+    return (mm->fib_index_by_sw_if_index[sw_if_index]);
+}
+
+extern flow_hash_config_t mpls_fib_table_get_flow_hash_config(u32 fib_index);
+
+#endif
diff --git a/src/vnet/flow/flow_report.c b/src/vnet/flow/flow_report.c
new file mode 100644
index 00000000..c78a78a9
--- /dev/null
+++ b/src/vnet/flow/flow_report.c
@@ -0,0 +1,502 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * flow_report.c
+ */
+#include <vnet/flow/flow_report.h>
+#include <vnet/api_errno.h>
+
+flow_report_main_t flow_report_main;
+
+static_always_inline u8 stream_index_valid (u32 index)
+{
+  flow_report_main_t * frm = &flow_report_main;
+  return index < vec_len(frm->streams) &&
+         frm->streams[index].domain_id != ~0;
+}
+
+static_always_inline flow_report_stream_t * add_stream (void)
+{
+  flow_report_main_t * frm = &flow_report_main;
+  u32 i;
+  for (i = 0; i < vec_len(frm->streams); i++)
+    if (!stream_index_valid(i))
+      return &frm->streams[i];
+  u32 index = vec_len(frm->streams);
+  vec_validate(frm->streams, index);
+  return &frm->streams[index];
+}
+
+static_always_inline void delete_stream (u32 index)
+{
+  flow_report_main_t * frm = &flow_report_main;
+  ASSERT (index < vec_len(frm->streams));
+  ASSERT (frm->streams[index].domain_id != ~0);
+  frm->streams[index].domain_id = ~0;
+}
+
+static i32 find_stream (u32 domain_id, u16 src_port)
+{
+  flow_report_main_t * frm = &flow_report_main;
+  flow_report_stream_t * stream;
+  u32 i;
+  for (i = 0; i < vec_len(frm->streams); i++)
+    if (stream_index_valid(i)) {
+      stream = &frm->streams[i];
+      if (domain_id == stream->domain_id) {
+        if (src_port != stream->src_port)
+          return -2;
+        return i;
+      } else if (src_port == stream->src_port) {
+        return -2;
+      }
+    }
+  return -1;
+}
+
+int send_template_packet (flow_report_main_t *frm, 
+                          flow_report_t *fr,
+                          u32 * buffer_indexp)
+{
+  u32 bi0;
+  vlib_buffer_t * b0;
+  ip4_ipfix_template_packet_t * tp;
+  ipfix_message_header_t * h;
+  ip4_header_t * ip;
+  udp_header_t * udp;
+  vlib_main_t * vm = frm->vlib_main;
+  flow_report_stream_t * stream;
+  vlib_buffer_free_list_t *fl;
+
+  ASSERT (buffer_indexp);
+
+  if (fr->update_rewrite || fr->rewrite == 0)
+    {
+      if (frm->ipfix_collector.as_u32 == 0 
+          || frm->src_address.as_u32 == 0)
+        {
+          clib_warning ("no collector: disabling flow collector process");
+          vlib_node_set_state (frm->vlib_main, flow_report_process_node.index,
+                               VLIB_NODE_STATE_DISABLED);
+          return -1;
+        }
+      vec_free (fr->rewrite);
+      fr->update_rewrite = 1;
+    }
+
+  if (fr->update_rewrite)
+    {
+      fr->rewrite = fr->rewrite_callback (frm, fr,
+                                          &frm->ipfix_collector,
+                                          &frm->src_address,
+                                          frm->collector_port);
+      fr->update_rewrite = 0;
+    }
+
+  if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
+    return -1;
+  
+  b0 = vlib_get_buffer (vm, bi0);
+
+  /* Initialize the buffer */
+  fl = vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+  vlib_buffer_init_for_free_list (b0, fl);
+  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+
+  ASSERT (vec_len (fr->rewrite) < VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES);
+    
+  clib_memcpy (b0->data, fr->rewrite, vec_len (fr->rewrite));
+  b0->current_data = 0;
+  b0->current_length = vec_len (fr->rewrite);
+  b0->flags |= (VLIB_BUFFER_TOTAL_LENGTH_VALID | VLIB_BUFFER_FLOW_REPORT);
+  vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
+  vnet_buffer (b0)->sw_if_index[VLIB_TX] = frm->fib_index;
+
+  tp = vlib_buffer_get_current (b0);
+  ip = (ip4_header_t *) &tp->ip4;
+  udp = (udp_header_t *) (ip+1);
+  h = (ipfix_message_header_t *)(udp+1);
+
+  /* FIXUP: message header export_time */ 
+  h->export_time = (u32) 
+    (((f64)frm->unix_time_0) + 
+     (vlib_time_now(frm->vlib_main) - frm->vlib_time_0));
+  h->export_time = clib_host_to_net_u32(h->export_time);
+
+  stream = &frm->streams[fr->stream_index];
+
+  /* FIXUP: message header sequence_number. Templates do not increase it */
+  h->sequence_number = clib_host_to_net_u32(stream->sequence_number);
+
+  /* FIXUP: udp length */
+  udp->length = clib_host_to_net_u16 (b0->current_length - sizeof (*ip));
+
+  if (frm->udp_checksum)
+    {
+      /* RFC 7011 section 10.3.2. */
+      udp->checksum = ip4_tcp_udp_compute_checksum (vm, b0, ip);
+      if (udp->checksum == 0)
+        udp->checksum = 0xffff;
+    }
+
+  *buffer_indexp = bi0;
+
+  fr->last_template_sent = vlib_time_now (vm);
+
+  return 0;
+}
+
+static uword
+flow_report_process (vlib_main_t * vm,
+                     vlib_node_runtime_t * rt,
+                     vlib_frame_t * f)
+{
+  flow_report_main_t * frm = &flow_report_main;
+  flow_report_t * fr;
+  u32 ip4_lookup_node_index;
+  vlib_node_t * ip4_lookup_node;
+  vlib_frame_t * nf = 0;
+  u32 template_bi;
+  u32 * to_next;
+  int send_template;
+  f64 now;
+  int rv;
+  uword event_type;
+  uword *event_data = 0;
+
+  /* Wait for Godot... */
+  vlib_process_wait_for_event_or_clock (vm, 1e9);
+  event_type = vlib_process_get_events (vm, &event_data);
+  if (event_type != 1)
+      clib_warning ("bogus kickoff event received, %d", event_type);
+  vec_reset_length (event_data);
+
+  /* Enqueue pkts to ip4-lookup */
+  ip4_lookup_node = vlib_get_node_by_name (vm, (u8 *) "ip4-lookup");
+  ip4_lookup_node_index = ip4_lookup_node->index;
+
+  while (1) 
+    {
+      vlib_process_wait_for_event_or_clock (vm, 5.0);
+      event_type = vlib_process_get_events (vm, &event_data);
+      vec_reset_length (event_data);
+      
+      vec_foreach (fr, frm->reports)
+        {
+          now = vlib_time_now (vm);
+
+          /* Need to send a template packet? */
+          send_template =
+              now > (fr->last_template_sent + frm->template_interval);
+          send_template += fr->last_template_sent == 0;
+          template_bi = ~0;
+	  rv = 0;
+
+          if (send_template)
+            rv = send_template_packet (frm, fr, &template_bi);
+
+          if (rv < 0)
+            continue;
+
+          nf = vlib_get_frame_to_node (vm, ip4_lookup_node_index);
+          nf->n_vectors = 0;
+          to_next = vlib_frame_vector_args (nf);
+
+          if (template_bi != ~0)
+            {
+              to_next[0] = template_bi;
+              to_next++;
+              nf->n_vectors++;
+            }
+      
+          nf = fr->flow_data_callback (frm, fr, 
+                                       nf, to_next, ip4_lookup_node_index);
+          if (nf)
+            vlib_put_frame_to_node (vm, ip4_lookup_node_index, nf);
+        }
+    }
+
+  return 0; /* not so much */
+}
+
+VLIB_REGISTER_NODE (flow_report_process_node) = {
+    .function = flow_report_process,
+    .type = VLIB_NODE_TYPE_PROCESS,
+    .name = "flow-report-process",
+};
+
+int vnet_flow_report_add_del (flow_report_main_t *frm, 
+                              vnet_flow_report_add_del_args_t *a)
+{
+  int i;
+  int found_index = ~0;
+  flow_report_t *fr;
+  flow_report_stream_t * stream;
+  u32 si;
+  
+  si = find_stream(a->domain_id, a->src_port);
+  if (si == -2)
+    return VNET_API_ERROR_INVALID_VALUE;
+  if (si == -1 && a->is_add == 0)
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+  for (i = 0; i < vec_len(frm->reports); i++)
+    {
+      fr = vec_elt_at_index (frm->reports, i);
+      if (fr->opaque.as_uword == a->opaque.as_uword
+          && fr->rewrite_callback == a->rewrite_callback
+          && fr->flow_data_callback == a->flow_data_callback)
+        {
+          found_index = i;
+          break;
+        }
+    }
+
+  if (a->is_add == 0)
+    {
+      if (found_index != ~0)
+        {
+          vec_delete (frm->reports, 1, found_index);
+          stream = &frm->streams[si];
+          stream->n_reports--;
+          if (stream->n_reports == 0)
+            delete_stream(si);
+          return 0;
+        }
+      return VNET_API_ERROR_NO_SUCH_ENTRY;
+    }
+
+  if (found_index != ~0)
+    return VNET_API_ERROR_VALUE_EXIST;
+
+  if (si == -1)
+    {
+      stream = add_stream();
+      stream->domain_id = a->domain_id;
+      stream->src_port = a->src_port;
+      stream->sequence_number = 0;
+      stream->n_reports = 0;
+      si = stream - frm->streams;
+    }
+  else
+    stream = &frm->streams[si];
+
+  stream->n_reports++;
+
+  vec_add2 (frm->reports, fr, 1);
+
+  fr->stream_index = si;
+  fr->template_id = 256 + stream->next_template_no;
+  stream->next_template_no = (stream->next_template_no + 1) % (65536 - 256);
+  fr->update_rewrite = 1;
+  fr->opaque = a->opaque;
+  fr->rewrite_callback = a->rewrite_callback;
+  fr->flow_data_callback = a->flow_data_callback;
+  
+  return 0;
+}
+
+clib_error_t * flow_report_add_del_error_to_clib_error (int error)
+{
+    switch (error)
+      {
+      case 0:
+	return 0;
+      case VNET_API_ERROR_NO_SUCH_ENTRY:
+        return clib_error_return (0, "Flow report not found");
+      case VNET_API_ERROR_VALUE_EXIST:
+        return clib_error_return (0, "Flow report already exists");
+      case VNET_API_ERROR_INVALID_VALUE:
+        return clib_error_return (0, "Expecting either still unused values "
+                                     "for both domain_id and src_port "
+                                     "or already used values for both fields");
+      default:
+        return clib_error_return (0, "vnet_flow_report_add_del returned %d",
+                                  error);
+      }
+}
+
+void vnet_flow_reports_reset (flow_report_main_t * frm)
+{
+  flow_report_t *fr;
+  u32 i;
+
+  for (i = 0; i < vec_len(frm->streams); i++)
+    if (stream_index_valid(i))
+      frm->streams[i].sequence_number = 0;
+
+  vec_foreach (fr, frm->reports)
+    {
+      fr->update_rewrite = 1;
+      fr->last_template_sent = 0;
+    }
+}
+
+void vnet_stream_reset (flow_report_main_t * frm, u32 stream_index)
+{
+  flow_report_t *fr;
+
+  frm->streams[stream_index].sequence_number = 0;
+
+  vec_foreach (fr, frm->reports)
+    if (frm->reports->stream_index == stream_index) {
+      fr->update_rewrite = 1;
+      fr->last_template_sent = 0;
+    }
+}
+
+int vnet_stream_change (flow_report_main_t * frm,
+                        u32 old_domain_id, u16 old_src_port,
+                        u32 new_domain_id, u16 new_src_port)
+{
+  i32 stream_index = find_stream (old_domain_id, old_src_port);
+  if (stream_index < 0)
+    return 1;
+  flow_report_stream_t * stream = &frm->streams[stream_index];
+  stream->domain_id = new_domain_id;
+  stream->src_port = new_src_port;
+  if (old_domain_id != new_domain_id || old_src_port != new_src_port)
+    vnet_stream_reset (frm, stream_index);
+  return 0;
+}
+
+static clib_error_t *
+set_ipfix_exporter_command_fn (vlib_main_t * vm,
+                               unformat_input_t * input,
+                               vlib_cli_command_t * cmd)
+{
+  flow_report_main_t * frm = &flow_report_main;
+  ip4_address_t collector, src;
+  u16 collector_port = UDP_DST_PORT_ipfix;
+  u32 fib_id;
+  u32 fib_index = ~0;
+  
+  collector.as_u32 = 0;
+  src.as_u32 = 0;
+  u32 path_mtu = 512; // RFC 7011 section 10.3.3.
+  u32 template_interval = 20;
+  u8 udp_checksum = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "collector %U", unformat_ip4_address, &collector))
+      ;
+    else if (unformat (input, "port %u", &collector_port))
+      ;
+    else if (unformat (input, "src %U", unformat_ip4_address, &src))
+      ;
+    else if (unformat (input, "fib-id %u", &fib_id))
+      {
+        ip4_main_t * im = &ip4_main;
+        uword * p = hash_get (im->fib_index_by_table_id, fib_id);
+        if (! p)
+          return clib_error_return (0, "fib ID %d doesn't exist\n",
+                                    fib_id);
+        fib_index = p[0];
+      }
+    else if (unformat (input, "path-mtu %u", &path_mtu))
+      ;
+    else if (unformat (input, "template-interval %u", &template_interval))
+      ;
+    else if (unformat (input, "udp-checksum"))
+      udp_checksum = 1;
+    else
+      break;
+  }
+  
+  if (collector.as_u32 == 0)
+    return clib_error_return (0, "collector address required");
+
+  if (src.as_u32 == 0)
+    return clib_error_return (0, "src address required");
+
+  if (path_mtu > 1450 /* vpp does not support fragmentation */)
+	return clib_error_return (0, "too big path-mtu value, maximum is 1450");
+
+  if (path_mtu < 68)
+	return clib_error_return (0, "too small path-mtu value, minimum is 68");
+
+  /* Reset report streams if we are reconfiguring IP addresses */
+  if (frm->ipfix_collector.as_u32 != collector.as_u32 ||
+      frm->src_address.as_u32 != src.as_u32 ||
+      frm->collector_port != collector_port)
+    vnet_flow_reports_reset(frm);
+
+  frm->ipfix_collector.as_u32 = collector.as_u32;
+  frm->collector_port = collector_port;
+  frm->src_address.as_u32 = src.as_u32;
+  frm->fib_index = fib_index;
+  frm->path_mtu = path_mtu;
+  frm->template_interval = template_interval;
+  frm->udp_checksum = udp_checksum;
+  
+  vlib_cli_output (vm, "Collector %U, src address %U, "
+		           "fib index %d, path MTU %u, "
+		           "template resend interval %us, "
+		           "udp checksum %s",
+                   format_ip4_address, &frm->ipfix_collector,
+                   format_ip4_address, &frm->src_address,
+                   fib_index, path_mtu, template_interval,
+                   udp_checksum ? "enabled" : "disabled");
+
+  /* Turn on the flow reporting process */
+  vlib_process_signal_event (vm, flow_report_process_node.index,
+                             1, 0);
+  return 0;
+}
+
+VLIB_CLI_COMMAND (set_ipfix_exporter_command, static) = {
+    .path = "set ipfix exporter",
+    .short_help = "set ipfix exporter "
+                  "collector <ip4-address> [port <port>] "
+                  "src <ip4-address> [fib-id <fib-id>] "
+                  "[path-mtu <path-mtu>] "
+                  "[template-interval <template-interval>]",
+                  "[udp-checksum]",
+    .function = set_ipfix_exporter_command_fn,
+};
+
+
+static clib_error_t *
+ipfix_flush_command_fn (vlib_main_t * vm,
+                        unformat_input_t * input,
+                        vlib_cli_command_t * cmd)
+{
+  /* poke the flow reporting process */
+  vlib_process_signal_event (vm, flow_report_process_node.index,
+                             1, 0);
+  return 0;
+}
+
+VLIB_CLI_COMMAND (ipfix_flush_command, static) = {
+    .path = "ipfix flush",
+    .short_help = "flush the current ipfix data [for make test]",
+    .function = ipfix_flush_command_fn,
+};
+
+static clib_error_t * 
+flow_report_init (vlib_main_t *vm)
+{
+  flow_report_main_t * frm = &flow_report_main;
+
+  frm->vlib_main = vm;
+  frm->vnet_main = vnet_get_main();
+  frm->unix_time_0 = time(0);
+  frm->vlib_time_0 = vlib_time_now(frm->vlib_main);
+  frm->fib_index = ~0;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (flow_report_init)
diff --git a/src/vnet/flow/flow_report.h b/src/vnet/flow/flow_report.h
new file mode 100644
index 00000000..4e764377
--- /dev/null
+++ b/src/vnet/flow/flow_report.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_vnet_flow_report_h__
+#define __included_vnet_flow_report_h__
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/ip/ip_packet.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/ip/udp.h>
+#include <vlib/cli.h>
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/cache.h>
+
+#include <vnet/flow/ipfix_packet.h>
+
+/* Used to build the rewrite */
+typedef struct {
+  ip4_header_t ip4;
+  udp_header_t udp;
+  ipfix_template_packet_t ipfix;
+} ip4_ipfix_template_packet_t;
+
+struct flow_report_main;
+struct flow_report;
+
+typedef u8 * (vnet_flow_rewrite_callback_t)(struct flow_report_main *, 
+                                            struct flow_report *,
+                                            ip4_address_t *,
+                                            ip4_address_t *,
+                                            u16);
+
+typedef vlib_frame_t * (vnet_flow_data_callback_t) (struct flow_report_main *, 
+                                                    struct flow_report *,
+                                                    vlib_frame_t *, u32 *, 
+                                                    u32);
+
+typedef union {
+  void * as_ptr;
+  uword as_uword;
+} opaque_t;
+
+typedef struct {
+  u32 domain_id;
+  u32 sequence_number;
+  u16 src_port;
+  u16 n_reports;
+  u16 next_template_no;
+} flow_report_stream_t;
+
+typedef struct flow_report {
+  /* ipfix rewrite, set by callback */
+  u8 * rewrite;
+  u16 template_id;
+  u32 stream_index;
+  f64 last_template_sent;
+  int update_rewrite;
+
+  /* Bitmap of fields to send */
+  uword * fields_to_send;
+
+  /* Opaque data */
+  opaque_t opaque;
+
+  /* build-the-rewrite callback */
+  vnet_flow_rewrite_callback_t *rewrite_callback;
+
+  /* Send-flow-data callback */
+  vnet_flow_data_callback_t *flow_data_callback;
+} flow_report_t;
+
+typedef struct flow_report_main {
+  flow_report_t * reports;
+  flow_report_stream_t * streams;
+
+  /* ipfix collector ip address, port, our ip address, fib index */
+  ip4_address_t ipfix_collector;
+  u16 collector_port;
+  ip4_address_t src_address;
+  u32 fib_index;
+
+  /* Path MTU */
+  u32 path_mtu;
+
+  /* time interval in seconds after which to resend templates */
+  u32 template_interval;
+
+  /* UDP checksum calculation enable flag */
+  u8 udp_checksum;
+
+  /* time scale transform. Joy. */
+  u32 unix_time_0;
+  f64 vlib_time_0;
+
+  /* convenience variables */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+} flow_report_main_t;
+
+extern flow_report_main_t flow_report_main;
+
+extern vlib_node_registration_t flow_report_process_node;
+
+int vnet_flow_report_enable_disable (u32 sw_if_index, u32 table_index,
+                                       int enable_disable);
+typedef struct {
+  vnet_flow_data_callback_t *flow_data_callback;
+  vnet_flow_rewrite_callback_t *rewrite_callback;
+  opaque_t opaque;
+  int is_add;
+  u32 domain_id;
+  u16 src_port;
+} vnet_flow_report_add_del_args_t;  
+
+int vnet_flow_report_add_del (flow_report_main_t *frm, 
+                              vnet_flow_report_add_del_args_t *a);
+
+clib_error_t * flow_report_add_del_error_to_clib_error (int error);
+
+void vnet_flow_reports_reset (flow_report_main_t * frm);
+
+void vnet_stream_reset (flow_report_main_t * frm, u32 stream_index);
+
+int vnet_stream_change (flow_report_main_t * frm,
+                        u32 old_domain_id, u16 old_src_port,
+                        u32 new_domain_id, u16 new_src_port);
+
+#endif /* __included_vnet_flow_report_h__ */
diff --git a/src/vnet/flow/flow_report_classify.c b/src/vnet/flow/flow_report_classify.c
new file mode 100644
index 00000000..cb8fe069
--- /dev/null
+++ b/src/vnet/flow/flow_report_classify.c
@@ -0,0 +1,529 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/flow/flow_report.h>
+#include <vnet/flow/flow_report_classify.h>
+#include <vnet/api_errno.h>
+
+/* Common prefix of tcp and udp headers
+ * containing only source and destination port fields */
+typedef struct {
+  u16 src_port, dst_port;
+} tcpudp_header_t;
+
+flow_report_classify_main_t flow_report_classify_main;
+
+u8 * ipfix_classify_template_rewrite (flow_report_main_t * frm,
+                                      flow_report_t * fr,
+                                      ip4_address_t * collector_address,
+                                      ip4_address_t * src_address,
+                                      u16 collector_port)
+{
+  flow_report_classify_main_t * fcm = &flow_report_classify_main;
+  vnet_classify_table_t * tblp;
+  vnet_classify_main_t * vcm = &vnet_classify_main;
+  u32 flow_table_index = fr->opaque.as_uword;
+  u8 * ip_start;
+  ip4_header_t * ip;
+  ip6_header_t * ip6;
+  tcpudp_header_t * tcpudp;
+  udp_header_t * udp;
+  ipfix_message_header_t * h;
+  ipfix_set_header_t * s;
+  ipfix_template_header_t * t;
+  ipfix_field_specifier_t * f;
+  ipfix_field_specifier_t * first_field;
+  u8 * rewrite = 0;
+  ip4_ipfix_template_packet_t * tp;
+  i32 l3_offset = -2;  /* sizeof (ethernet_header_t) - sizeof (u32x4) */
+  u32 field_count = 0;
+  u32 field_index = 0;
+  flow_report_stream_t * stream;
+  u8 ip_version;
+  u8 transport_protocol;
+
+  stream = &frm->streams[fr->stream_index];
+
+  ipfix_classify_table_t * table = &fcm->tables[flow_table_index];
+
+  ip_version = table->ip_version;
+  transport_protocol = table->transport_protocol;
+
+  tblp = pool_elt_at_index (vcm->tables, table->classify_table_index);
+
+  /* 
+   * Mumble, assumes that we're not classifying on L2 or first 2 octets
+   * of L3..
+   */
+
+  /* Determine field count */
+  ip_start = ((u8 *)(tblp->mask)) + l3_offset;
+#define _(field,mask,item,length)                                       \
+  if (memcmp(&field, &mask, length) == 0)                               \
+    {                                                                   \
+      field_count++;                                                    \
+                                                                        \
+      fr->fields_to_send = clib_bitmap_set (fr->fields_to_send,         \
+                                            field_index, 1);            \
+    }                                                                   \
+  field_index++;
+  foreach_ipfix_field;
+#undef _
+
+  /* Add packetTotalCount manually */
+  field_count += 1;
+
+  /* $$$ enterprise fields, at some later date */
+
+  /* allocate rewrite space */
+  vec_validate_aligned (rewrite, 
+                        sizeof (ip4_ipfix_template_packet_t) 
+                        + field_count * sizeof (ipfix_field_specifier_t) - 1,
+                        CLIB_CACHE_LINE_BYTES);
+
+  tp = (ip4_ipfix_template_packet_t *) rewrite;
+  ip = (ip4_header_t *) &tp->ip4;
+  udp = (udp_header_t *) (ip+1);
+  h = (ipfix_message_header_t *)(udp+1);
+  s = (ipfix_set_header_t *)(h+1);
+  t = (ipfix_template_header_t *)(s+1);
+  first_field = f = (ipfix_field_specifier_t *)(t+1);
+
+  ip->ip_version_and_header_length = 0x45;
+  ip->ttl = 254;
+  ip->protocol = IP_PROTOCOL_UDP;
+  ip->src_address.as_u32 = src_address->as_u32;
+  ip->dst_address.as_u32 = collector_address->as_u32;
+  udp->src_port = clib_host_to_net_u16 (stream->src_port);
+  udp->dst_port = clib_host_to_net_u16 (collector_port);
+  udp->length = clib_host_to_net_u16 (vec_len(rewrite) - sizeof (*ip));
+
+  /* FIXUP: message header export_time */ 
+  /* FIXUP: message header sequence_number */
+  h->domain_id = clib_host_to_net_u32 (stream->domain_id);
+
+  /* Take another trip through the mask and build the template */
+  ip_start = ((u8 *)(tblp->mask)) + l3_offset;
+#define _(field,mask,item,length)                               \
+  if (memcmp(&field, &mask, length) == 0)                       \
+    {                                                           \
+      f->e_id_length = ipfix_e_id_length (0 /* enterprise */,   \
+                                          item, length);        \
+      f++;                                                      \
+    }
+  foreach_ipfix_field;
+#undef _
+
+  /* Add packetTotalCount manually */
+  f->e_id_length = ipfix_e_id_length (0 /* enterprise */, packetTotalCount, 8);
+  f++;
+
+  /* Back to the template packet... */
+  ip = (ip4_header_t *) &tp->ip4;
+  udp = (udp_header_t *) (ip+1);
+  
+  ASSERT (f - first_field);
+  /* Field count in this template */
+  t->id_count = ipfix_id_count (fr->template_id, f - first_field);
+
+  /* set length in octets*/
+  s->set_id_length = ipfix_set_id_length (2 /* set_id */, (u8 *) f - (u8 *)s);
+
+  /* message length in octets */
+  h->version_length = version_length ((u8 *)f - (u8 *)h);
+
+  ip->length = clib_host_to_net_u16 ((u8 *)f - (u8 *)ip);
+  ip->checksum = ip4_header_checksum (ip);
+
+  return rewrite;
+}
+
+vlib_frame_t * ipfix_classify_send_flows (flow_report_main_t * frm,
+                                          flow_report_t * fr,
+                                          vlib_frame_t * f,
+                                          u32 * to_next,
+                                          u32 node_index)
+{
+  flow_report_classify_main_t * fcm = &flow_report_classify_main;
+  vnet_classify_main_t * vcm = &vnet_classify_main;
+  u32 flow_table_index = fr->opaque.as_uword;
+  vnet_classify_table_t * t;
+  vnet_classify_bucket_t * b;
+  vnet_classify_entry_t * v, * save_v;
+  vlib_buffer_t *b0 = 0;
+  u32 next_offset = 0;
+  u32 record_offset = 0;
+  u32 bi0 = ~0;
+  int i, j, k;
+  ip4_ipfix_template_packet_t * tp;
+  ipfix_message_header_t * h = 0;
+  ipfix_set_header_t * s = 0;
+  u8 * ip_start;
+  ip4_header_t * ip;
+  ip6_header_t * ip6;
+  tcpudp_header_t * tcpudp;
+  udp_header_t * udp;
+  int field_index;
+  u32 records_this_buffer;
+  u16 new_l0, old_l0;
+  ip_csum_t sum0;
+  vlib_main_t * vm = frm->vlib_main;
+  flow_report_stream_t * stream;
+  u8 ip_version;
+  u8 transport_protocol;
+
+  stream = &frm->streams[fr->stream_index];
+
+  ipfix_classify_table_t * table = &fcm->tables[flow_table_index];
+
+  ip_version = table->ip_version;
+  transport_protocol = table->transport_protocol;
+
+  t = pool_elt_at_index (vcm->tables, table->classify_table_index);
+  
+  while (__sync_lock_test_and_set (t->writer_lock, 1))
+    ; 
+  
+  for (i = 0; i < t->nbuckets; i++)
+    {
+      b = &t->buckets [i];
+      if (b->offset == 0)
+        continue;
+      
+      save_v = vnet_classify_get_entry (t, b->offset);
+      for (j = 0; j < (1<<b->log2_pages); j++)
+        {
+          for (k = 0; k < t->entries_per_page; k++)
+            {
+              v = vnet_classify_entry_at_index 
+                (t, save_v, j*t->entries_per_page + k);
+              
+              if (vnet_classify_entry_is_free (v))
+                continue;
+              
+              /* OK, we have something to send... */
+              if (PREDICT_FALSE (b0 == 0))
+                {
+                  if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
+                    goto flush;
+                  b0 = vlib_get_buffer (vm, bi0);
+                  
+                  u32 copy_len = sizeof(ip4_header_t) +
+                                 sizeof(udp_header_t) +
+                                 sizeof(ipfix_message_header_t);
+                  clib_memcpy (b0->data, fr->rewrite, copy_len);
+                  b0->current_data = 0;
+                  b0->current_length = copy_len;
+                  b0->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
+                  vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
+                  vnet_buffer (b0)->sw_if_index[VLIB_TX] = frm->fib_index;
+                  
+                  tp = vlib_buffer_get_current (b0);
+                  ip = (ip4_header_t *) &tp->ip4;
+                  udp = (udp_header_t *) (ip+1);
+                  h = (ipfix_message_header_t *)(udp+1);
+                  s = (ipfix_set_header_t *)(h+1);
+                  
+                  /* FIXUP: message header export_time */ 
+                  h->export_time = (u32) 
+                    (((f64)frm->unix_time_0) + 
+                     (vlib_time_now(frm->vlib_main) - frm->vlib_time_0));
+                  h->export_time = clib_host_to_net_u32(h->export_time);
+                  
+                  /* FIXUP: message header sequence_number */
+                  h->sequence_number = stream->sequence_number;
+                  h->sequence_number = clib_host_to_net_u32 (h->sequence_number);
+
+                  next_offset = (u32) (((u8 *)(s+1)) - (u8 *)tp);
+                  record_offset = next_offset;
+                  records_this_buffer = 0;
+                }
+
+              field_index = 0;
+              ip_start = ((u8 *)v->key) - 2;
+#define _(field,mask,item,length)                                       \
+              if (clib_bitmap_get (fr->fields_to_send, field_index))    \
+                {                                                       \
+                  clib_memcpy (b0->data + next_offset, &field,          \
+                          length);                                      \
+                  next_offset += length;                                \
+                }                                                       \
+              field_index++;
+              foreach_ipfix_field;
+#undef _
+
+              /* Add packetTotalCount manually */
+              {
+                u64 packets = clib_host_to_net_u64 (v->hits);
+                clib_memcpy (b0->data + next_offset, &packets, sizeof (packets));
+                next_offset += sizeof (packets);
+              }
+              records_this_buffer++;
+              stream->sequence_number++;
+              
+              /* Next record will have the same size as this record */
+              u32 next_record_size = next_offset - record_offset;
+              record_offset = next_offset;
+
+              if (next_offset + next_record_size > frm->path_mtu)
+                {
+                  s->set_id_length = ipfix_set_id_length (fr->template_id,
+                                                          next_offset - 
+                                                          (sizeof (*ip) + sizeof (*udp) +
+                                                           sizeof (*h)));
+                  h->version_length = version_length (next_offset -
+                                                      (sizeof (*ip) + sizeof (*udp)));
+                  b0->current_length = next_offset;
+                  b0->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
+                  
+                  tp = vlib_buffer_get_current (b0);
+                  ip = (ip4_header_t *) &tp->ip4;
+                  udp = (udp_header_t *) (ip+1);
+                  
+                  sum0 = ip->checksum;
+                  old_l0 = ip->length;
+                  new_l0 = 
+                    clib_host_to_net_u16 ((u16)next_offset);
+                  
+                  sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
+                                         length /* changed member */);
+                  
+                  ip->checksum = ip_csum_fold (sum0);
+                  ip->length = new_l0;
+                  udp->length = 
+                      clib_host_to_net_u16 (b0->current_length - sizeof (*ip));
+
+                  if (frm->udp_checksum)
+                    {
+                      /* RFC 7011 section 10.3.2. */
+                      udp->checksum = ip4_tcp_udp_compute_checksum (vm, b0, ip);
+                      if (udp->checksum == 0)
+                        udp->checksum = 0xffff;
+                    }
+
+                  ASSERT (ip->checksum == ip4_header_checksum (ip));
+
+                  to_next[0] = bi0;
+                  f->n_vectors++;
+                  to_next++;
+                  
+                  if (f->n_vectors == VLIB_FRAME_SIZE)
+                    {
+                      vlib_put_frame_to_node (vm, node_index, f);
+                      f = vlib_get_frame_to_node (vm, node_index);
+                      f->n_vectors = 0;
+                      to_next = vlib_frame_vector_args (f);
+                    }
+                  b0 = 0;
+                  bi0 = ~0;
+                }
+            }
+        }
+    }
+  
+ flush:
+  if (b0)
+    {
+        s->set_id_length = ipfix_set_id_length (fr->template_id,
+                                                next_offset - 
+                                                (sizeof (*ip) + sizeof (*udp) +
+                                                 sizeof (*h)));
+        h->version_length = version_length (next_offset -
+                                            (sizeof (*ip) + sizeof (*udp)));
+      b0->current_length = next_offset;
+      b0->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
+      
+      tp = vlib_buffer_get_current (b0);
+      ip = (ip4_header_t *) &tp->ip4;
+      udp = (udp_header_t *) (ip+1);
+      
+      sum0 = ip->checksum;
+      old_l0 = ip->length;
+      new_l0 = clib_host_to_net_u16 ((u16)next_offset);
+      
+      sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
+                             length /* changed member */);
+      
+      ip->checksum = ip_csum_fold (sum0);
+      ip->length = new_l0;
+      udp->length = clib_host_to_net_u16 (b0->current_length - sizeof (*ip));
+
+      if (frm->udp_checksum)
+        {
+          /* RFC 7011 section 10.3.2. */
+          udp->checksum = ip4_tcp_udp_compute_checksum (vm, b0, ip);
+          if (udp->checksum == 0)
+          udp->checksum = 0xffff;
+        }
+
+      ASSERT (ip->checksum == ip4_header_checksum (ip));
+      
+      to_next[0] = bi0;
+      f->n_vectors++;
+      
+      b0 = 0;
+      bi0 = ~0;
+    }
+  
+  *(t->writer_lock) = 0;
+  return f;
+}
+
+static clib_error_t *
+ipfix_classify_table_add_del_command_fn (vlib_main_t * vm,
+                                         unformat_input_t * input,
+                                         vlib_cli_command_t * cmd)
+{
+  flow_report_classify_main_t *fcm = &flow_report_classify_main;
+  flow_report_main_t *frm = &flow_report_main;
+  vnet_flow_report_add_del_args_t args;
+  ipfix_classify_table_t * table;
+  int rv;
+  int is_add = -1;
+  u32 classify_table_index = ~0;
+  u8 ip_version = 0;
+  u8 transport_protocol = 255;
+  clib_error_t * error = 0;
+
+  if (fcm->src_port == 0)
+    clib_error_return (0, "call 'set ipfix classify stream' first");
+
+  memset (&args, 0, sizeof (args));
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "add"))
+      is_add = 1;
+    else if (unformat (input, "del"))
+      is_add = 0;
+    else if (unformat (input, "%d", &classify_table_index))
+      ;
+    else if (unformat (input, "ip4"))
+      ip_version = 4;
+    else if (unformat (input, "ip6"))
+      ip_version = 6;
+    else if (unformat (input, "tcp"))
+      transport_protocol = 6;
+    else if (unformat (input, "udp"))
+      transport_protocol = 17;
+    else
+      return clib_error_return (0, "unknown input `%U'",
+                                format_unformat_error, input);
+  }
+
+  if (is_add == -1)
+    return clib_error_return (0, "expecting: add|del");
+  if (classify_table_index == ~0)
+    return clib_error_return (0, "classifier table not specified");
+  if (ip_version == 0)
+    return clib_error_return (0, "IP version not specified");
+
+  table = 0;
+  int i;
+  for (i = 0; i < vec_len(fcm->tables); i++)
+    if (ipfix_classify_table_index_valid(i))
+      if (fcm->tables[i].classify_table_index == classify_table_index) {
+        table = &fcm->tables[i];
+        break;
+      }
+
+  if (is_add) {
+    if (table)
+      return clib_error_return (0, "Specified classifier table already used");
+    table = ipfix_classify_add_table();
+    table->classify_table_index = classify_table_index;
+  } else {
+    if (!table)
+      return clib_error_return (0, "Specified classifier table not registered");
+  }
+
+  table->ip_version = ip_version;
+  table->transport_protocol = transport_protocol;
+
+  args.opaque.as_uword = table - fcm->tables;
+  args.rewrite_callback = ipfix_classify_template_rewrite;
+  args.flow_data_callback = ipfix_classify_send_flows;
+  args.is_add = is_add;
+  args.domain_id = fcm->domain_id;
+  args.src_port = fcm->src_port;
+
+  rv = vnet_flow_report_add_del (frm, &args);
+
+  error = flow_report_add_del_error_to_clib_error(rv);
+
+  /* If deleting, or add failed */
+  if (is_add == 0 || (rv && is_add))
+    ipfix_classify_delete_table (table - fcm->tables);
+
+  return error;
+}
+
+VLIB_CLI_COMMAND (ipfix_classify_table_add_del_command, static) = {
+  .path = "ipfix classify table",
+  .short_help = "ipfix classify table add|del <table-index>",
+  .function = ipfix_classify_table_add_del_command_fn,
+};
+
+static clib_error_t *
+set_ipfix_classify_stream_command_fn (vlib_main_t * vm,
+                                      unformat_input_t * input,
+                                      vlib_cli_command_t * cmd)
+{
+  flow_report_classify_main_t *fcm = &flow_report_classify_main;
+  flow_report_main_t *frm = &flow_report_main;
+  u32 domain_id = 1;
+  u32 src_port = UDP_DST_PORT_ipfix;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "domain %d", &domain_id))
+      ;
+    else if (unformat (input, "src-port %d", &src_port))
+      ;
+    else
+      return clib_error_return (0, "unknown input `%U'",
+                                format_unformat_error, input);
+  }
+
+  if (fcm->src_port != 0 &&
+      (fcm->domain_id != domain_id ||
+       fcm->src_port != (u16)src_port)) {
+    int rv = vnet_stream_change (frm, fcm->domain_id, fcm->src_port,
+                                 domain_id, (u16)src_port);
+    ASSERT (rv == 0);
+  }
+
+  fcm->domain_id = domain_id;
+  fcm->src_port = (u16)src_port;
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (set_ipfix_classify_stream_command, static) = {
+  .path = "set ipfix classify stream",
+  .short_help = "set ipfix classify stream"
+                "[domain <domain-id>] [src-port <src-port>]",
+  .function = set_ipfix_classify_stream_command_fn,
+};
+
+static clib_error_t *
+flow_report_classify_init (vlib_main_t *vm)
+{
+  clib_error_t * error;
+
+  if ((error = vlib_call_init_function (vm, flow_report_init)))
+    return error;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (flow_report_classify_init);
diff --git a/src/vnet/flow/flow_report_classify.h b/src/vnet/flow/flow_report_classify.h
new file mode 100644
index 00000000..77d98b58
--- /dev/null
+++ b/src/vnet/flow/flow_report_classify.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_flow_report_classify_h__
+#define __included_flow_report_classify_h__
+
+#define foreach_ipfix_ip4_field                                             \
+_(ip->src_address.as_u32, ((u32[]){0xFFFFFFFF}), sourceIPv4Address, 4)      \
+_(ip->dst_address.as_u32, ((u32[]){0xFFFFFFFF}), destinationIPv4Address, 4) \
+_(ip->protocol, ((u8[]){0xFF}), protocolIdentifier, 1)
+
+#define foreach_ipfix_ip6_field                                             \
+_(ip6->src_address.as_u8,                                                   \
+  ((u32[]){0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}),                   \
+  sourceIPv6Address, 16)                                                    \
+_(ip6->dst_address.as_u8,                                                   \
+  ((u32[]){0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}),                   \
+  destinationIPv6Address, 16)                                               \
+_(ip6->protocol, ((u8[]){0xFF}), protocolIdentifier, 1)
+
+#define foreach_ipfix_tcpudp_field                                          \
+_(tcpudp->src_port, ((u16[]){0xFFFF}), sourceTransportPort, 2)              \
+_(tcpudp->dst_port, ((u16[]){0xFFFF}), destinationTransportPort, 2)
+
+#define foreach_ipfix_tcp_field                                             \
+_(tcpudp->src_port, ((u16[]){0xFFFF}), tcpSourcePort, 2)                    \
+_(tcpudp->dst_port, ((u16[]){0xFFFF}), tcpDestinationPort, 2)
+
+#define foreach_ipfix_udp_field                                             \
+_(tcpudp->src_port, ((u16[]){0xFFFF}), udpSourcePort, 2)                    \
+_(tcpudp->dst_port, ((u16[]){0xFFFF}), udpDestinationPort, 2)
+
+#define foreach_ipfix_transport_protocol_field                              \
+  switch (transport_protocol) {                                             \
+    case 255:                                                               \
+      foreach_ipfix_tcpudp_field;                                           \
+      break;                                                                \
+    case 6:                                                                 \
+      foreach_ipfix_tcp_field;                                              \
+      break;                                                                \
+    case 17:                                                                \
+      foreach_ipfix_udp_field;                                              \
+      break;                                                                \
+  }
+
+#define foreach_ipfix_field                                                 \
+  if (ip_version == 4) {                                                    \
+    ip = (ip4_header_t *)ip_start;                                          \
+    tcpudp = (tcpudp_header_t *)(ip+1);                                     \
+    foreach_ipfix_ip4_field;                                                \
+  } else {                                                                  \
+    ip6 = (ip6_header_t *)ip_start;                                         \
+    tcpudp = (tcpudp_header_t *)(ip6+1);                                    \
+    foreach_ipfix_ip6_field;                                                \
+  }                                                                         \
+  foreach_ipfix_transport_protocol_field
+
+typedef struct {
+  u32 classify_table_index;
+  u8 ip_version;
+  u8 transport_protocol;
+} ipfix_classify_table_t;
+
+typedef struct {
+  u32 domain_id;
+  u16 src_port;
+  ipfix_classify_table_t * tables;
+} flow_report_classify_main_t;
+
+extern flow_report_classify_main_t flow_report_classify_main;
+
+static_always_inline u8 ipfix_classify_table_index_valid (u32 index)
+{
+  flow_report_classify_main_t * fcm = &flow_report_classify_main;
+  return index < vec_len(fcm->tables) &&
+         fcm->tables[index].classify_table_index != ~0;
+}
+
+static_always_inline ipfix_classify_table_t * ipfix_classify_add_table (void)
+{
+  flow_report_classify_main_t * fcm = &flow_report_classify_main;
+  u32 i;
+  for (i = 0; i < vec_len(fcm->tables); i++)
+    if (!ipfix_classify_table_index_valid(i))
+      return &fcm->tables[i];
+  u32 index = vec_len(fcm->tables);
+  vec_validate(fcm->tables, index);
+  return &fcm->tables[index];
+}
+
+static_always_inline void ipfix_classify_delete_table (u32 index)
+{
+  flow_report_classify_main_t * fcm = &flow_report_classify_main;
+  ASSERT (index < vec_len(fcm->tables));
+  ASSERT (fcm->tables[index].classify_table_index != ~0);
+  fcm->tables[index].classify_table_index = ~0;
+}
+
+u8 * ipfix_classify_template_rewrite (flow_report_main_t * frm,
+                                      flow_report_t * fr,
+                                      ip4_address_t * collector_address,
+                                      ip4_address_t * src_address,
+                                      u16 collector_port);
+
+vlib_frame_t * ipfix_classify_send_flows (flow_report_main_t * frm,
+                                          flow_report_t * fr,
+                                          vlib_frame_t * f,
+                                          u32 * to_next,
+                                          u32 node_index);
+
+#endif /* __included_flow_report_classify_h__ */
diff --git a/src/vnet/flow/ipfix_info_elements.h b/src/vnet/flow/ipfix_info_elements.h
new file mode 100644
index 00000000..5d7e935d
--- /dev/null
+++ b/src/vnet/flow/ipfix_info_elements.h
@@ -0,0 +1,429 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_ipfix_info_elements_h__
+#define __included_ipfix_info_elements_h__
+
+#define foreach_ipfix_info_element_t                                    \
+_(octetDeltaCount, 1, u64)                                              \
+_(packetDeltaCount, 2, u64)                                             \
+_(deltaFlowCount, 3, u64)                                               \
+_(protocolIdentifier, 4, u8)                                            \
+_(ipClassOfService, 5, u8)                                              \
+_(tcpControlBits, 6, u16)                                               \
+_(sourceTransportPort, 7, u16)                                          \
+_(sourceIPv4Address, 8, ip4_address_t)                                  \
+_(sourceIPv4PrefixLength, 9, u8)                                        \
+_(ingressInterface, 10, u32)                                            \
+_(destinationTransportPort, 11, u16)                                    \
+_(destinationIPv4Address, 12, ip4_address_t)                            \
+_(destinationIPv4PrefixLength, 13, u8)                                  \
+_(egressInterface, 14, u32)                                             \
+_(ipNextHopIPv4Address, 15, ip4_address_t)                              \
+_(bgpSourceAsNumber, 16, u32)                                           \
+_(bgpDestinationAsNumber, 17, u32)                                      \
+_(bgpNextHopIPv4Address, 18, ip4_address_t)                             \
+_(postMCastPacketDeltaCount, 19, u64)                                   \
+_(postMCastOctetDeltaCount, 20, u64)                                    \
+_(flowEndSysUpTime, 21, u32)                                            \
+_(flowStartSysUpTime, 22, u32)                                          \
+_(postOctetDeltaCount, 23, u64)                                         \
+_(postPacketDeltaCount, 24, u64)                                        \
+_(minimumIpTotalLength, 25, u64)                                        \
+_(maximumIpTotalLength, 26, u64)                                        \
+_(sourceIPv6Address, 27, ip6_address_t)                                 \
+_(destinationIPv6Address, 28, ip6_address_t)                            \
+_(sourceIPv6PrefixLength, 29, u8)                                       \
+_(destinationIPv6PrefixLength, 30, u8)                                  \
+_(flowLabelIPv6, 31, u32)                                               \
+_(icmpTypeCodeIPv4, 32, u16)                                            \
+_(igmpType, 33, u8)                                                     \
+_(samplingInterval, 34, u32)                                            \
+_(samplingAlgorithm, 35, u8)                                            \
+_(flowActiveTimeout, 36, u16)                                           \
+_(flowIdleTimeout, 37, u16)                                             \
+_(engineType, 38, u8)                                                   \
+_(engineId, 39, u8)                                                     \
+_(exportedOctetTotalCount, 40, u64)                                     \
+_(exportedMessageTotalCount, 41, u64)                                   \
+_(exportedFlowRecordTotalCount, 42, u64)                                \
+_(ipv4RouterSc, 43, ip4_address_t)                                      \
+_(sourceIPv4Prefix, 44, ip4_address_t)                                  \
+_(destinationIPv4Prefix, 45, ip4_address_t)                             \
+_(mplsTopLabelType, 46, u8)                                             \
+_(mplsTopLabelIPv4Address, 47, ip4_address_t)                           \
+_(samplerId, 48, u8)                                                    \
+_(samplerMode, 49, u8)                                                  \
+_(samplerRandomInterval, 50, u32)                                       \
+_(classId, 51, u8)                                                      \
+_(minimumTTL, 52, u8)                                                   \
+_(maximumTTL, 53, u8)                                                   \
+_(fragmentIdentification, 54, u32)                                      \
+_(postIpClassOfService, 55, u8)                                         \
+_(sourceMacAddress, 56, macAddress)                                     \
+_(postDestinationMacAddress, 57, macAddress)                            \
+_(vlanId, 58, u16)                                                      \
+_(postVlanId, 59, u16)                                                  \
+_(ipVersion, 60, u8)                                                    \
+_(flowDirection, 61, u8)                                                \
+_(ipNextHopIPv6Address, 62, ip6_address_t)                              \
+_(bgpNextHopIPv6Address, 63, ip6_address_t)                             \
+_(ipv6ExtensionHeaders, 64, u32)                                        \
+_(mplsTopLabelStackSection, 70, octetArray)                             \
+_(mplsLabelStackSection2, 71, octetArray)                               \
+_(mplsLabelStackSection3, 72, octetArray)                               \
+_(mplsLabelStackSection4, 73, octetArray)                               \
+_(mplsLabelStackSection5, 74, octetArray)                               \
+_(mplsLabelStackSection6, 75, octetArray)                               \
+_(mplsLabelStackSection7, 76, octetArray)                               \
+_(mplsLabelStackSection8, 77, octetArray)                               \
+_(mplsLabelStackSection9, 78, octetArray)                               \
+_(mplsLabelStackSection10, 79, octetArray)                              \
+_(destinationMacAddress, 80, macAddress)                                \
+_(postSourceMacAddress, 81, macAddress)                                 \
+_(interfaceName, 82, string)                                            \
+_(interfaceDescription, 83, string)                                     \
+_(samplerName, 84, string)                                              \
+_(octetTotalCount, 85, u64)                                             \
+_(packetTotalCount, 86, u64)                                            \
+_(flagsAndSamplerId, 87, u32)                                           \
+_(fragmentOffset, 88, u16)                                              \
+_(forwardingStatus, 89, u32)                                            \
+_(mplsVpnRouteDistinguisher, 90, octetArray)                            \
+_(mplsTopLabelPrefixLength, 91, u8)                                     \
+_(srcTrafficIndex, 92, u32)                                             \
+_(dstTrafficIndex, 93, u32)                                             \
+_(applicationDescription, 94, string)                                   \
+_(applicationId, 95, octetArray)                                        \
+_(applicationName, 96, string)                                          \
+_(Assigned, 97, for NetFlow v9 compatibility	)                       \
+_(postIpDiffServCodePoint, 98, u8)                                      \
+_(multicastReplicationFactor, 99, u32)                                  \
+_(className, 100, string)                                               \
+_(classificationEngineId, 101, u8)                                      \
+_(layer2packetSectionOffset, 102, u16)                                  \
+_(layer2packetSectionSize, 103, u16)                                    \
+_(layer2packetSectionData, 104, octetArray)                             \
+_(bgpNextAdjacentAsNumber, 128, u32)                                    \
+_(bgpPrevAdjacentAsNumber, 129, u32)                                    \
+_(exporterIPv4Address, 130, ip4_address_t)                              \
+_(exporterIPv6Address, 131, ip6_address_t)                              \
+_(droppedOctetDeltaCount, 132, u64)                                     \
+_(droppedPacketDeltaCount, 133, u64)                                    \
+_(droppedOctetTotalCount, 134, u64)                                     \
+_(droppedPacketTotalCount, 135, u64)                                    \
+_(flowEndReason, 136, u8)                                               \
+_(commonPropertiesId, 137, u64)                                         \
+_(observationPointId, 138, u64)                                         \
+_(icmpTypeCodeIPv6, 139, u16)                                           \
+_(mplsTopLabelIPv6Address, 140, ip6_address_t)                          \
+_(lineCardId, 141, u32)                                                 \
+_(portId, 142, u32)                                                     \
+_(meteringProcessId, 143, u32)                                          \
+_(exportingProcessId, 144, u32)                                         \
+_(templateId, 145, u16)                                                 \
+_(wlanChannelId, 146, u8)                                               \
+_(wlanSSID, 147, string)                                                \
+_(flowId, 148, u64)                                                     \
+_(observationDomainId, 149, u32)                                        \
+_(flowStartSeconds, 150, dateTimeSeconds)                               \
+_(flowEndSeconds, 151, dateTimeSeconds)                                 \
+_(flowStartMilliseconds, 152, dateTimeMilliseconds)                     \
+_(flowEndMilliseconds, 153, dateTimeMilliseconds)                       \
+_(flowStartMicroseconds, 154, dateTimeMicroseconds)                     \
+_(flowEndMicroseconds, 155, dateTimeMicroseconds)                       \
+_(flowStartNanoseconds, 156, dateTimeNanoseconds)                       \
+_(flowEndNanoseconds, 157, dateTimeNanoseconds)                         \
+_(flowStartDeltaMicroseconds, 158, u32)                                 \
+_(flowEndDeltaMicroseconds, 159, u32)                                   \
+_(systemInitTimeMilliseconds, 160, dateTimeMilliseconds)                \
+_(flowDurationMilliseconds, 161, u32)                                   \
+_(flowDurationMicroseconds, 162, u32)                                   \
+_(observedFlowTotalCount, 163, u64)                                     \
+_(ignoredPacketTotalCount, 164, u64)                                    \
+_(ignoredOctetTotalCount, 165, u64)                                     \
+_(notSentFlowTotalCount, 166, u64)                                      \
+_(notSentPacketTotalCount, 167, u64)                                    \
+_(notSentOctetTotalCount, 168, u64)                                     \
+_(destinationIPv6Prefix, 169, ip6_address_t)                            \
+_(sourceIPv6Prefix, 170, ip6_address_t)                                 \
+_(postOctetTotalCount, 171, u64)                                        \
+_(postPacketTotalCount, 172, u64)                                       \
+_(flowKeyIndicator, 173, u64)                                           \
+_(postMCastPacketTotalCount, 174, u64)                                  \
+_(postMCastOctetTotalCount, 175, u64)                                   \
+_(icmpTypeIPv4, 176, u8)                                                \
+_(icmpCodeIPv4, 177, u8)                                                \
+_(icmpTypeIPv6, 178, u8)                                                \
+_(icmpCodeIPv6, 179, u8)                                                \
+_(udpSourcePort, 180, u16)                                              \
+_(udpDestinationPort, 181, u16)                                         \
+_(tcpSourcePort, 182, u16)                                              \
+_(tcpDestinationPort, 183, u16)                                         \
+_(tcpSequenceNumber, 184, u32)                                          \
+_(tcpAcknowledgementNumber, 185, u32)                                   \
+_(tcpWindowSize, 186, u16)                                              \
+_(tcpUrgentPointer, 187, u16)                                           \
+_(tcpHeaderLength, 188, u8)                                             \
+_(ipHeaderLength, 189, u8)                                              \
+_(totalLengthIPv4, 190, u16)                                            \
+_(payloadLengthIPv6, 191, u16)                                          \
+_(ipTTL, 192, u8)                                                       \
+_(nextHeaderIPv6, 193, u8)                                              \
+_(mplsPayloadLength, 194, u32)                                          \
+_(ipDiffServCodePoint, 195, u8)                                         \
+_(ipPrecedence, 196, u8)                                                \
+_(fragmentFlags, 197, u8)                                               \
+_(octetDeltaSumOfSquares, 198, u64)                                     \
+_(octetTotalSumOfSquares, 199, u64)                                     \
+_(mplsTopLabelTTL, 200, u8)                                             \
+_(mplsLabelStackLength, 201, u32)                                       \
+_(mplsLabelStackDepth, 202, u32)                                        \
+_(mplsTopLabelExp, 203, u8)                                             \
+_(ipPayloadLength, 204, u32)                                            \
+_(udpMessageLength, 205, u16)                                           \
+_(isMulticast, 206, u8)                                                 \
+_(ipv4IHL, 207, u8)                                                     \
+_(ipv4Options, 208, u32)                                                \
+_(tcpOptions, 209, u64)                                                 \
+_(paddingOctets, 210, octetArray)                                       \
+_(collectorIPv4Address, 211, ip4_address_t)                             \
+_(collectorIPv6Address, 212, ip6_address_t)                             \
+_(exportInterface, 213, u32)                                            \
+_(exportProtocolVersion, 214, u8)                                       \
+_(exportTransportProtocol, 215, u8)                                     \
+_(collectorTransportPort, 216, u16)                                     \
+_(exporterTransportPort, 217, u16)                                      \
+_(tcpSynTotalCount, 218, u64)                                           \
+_(tcpFinTotalCount, 219, u64)                                           \
+_(tcpRstTotalCount, 220, u64)                                           \
+_(tcpPshTotalCount, 221, u64)                                           \
+_(tcpAckTotalCount, 222, u64)                                           \
+_(tcpUrgTotalCount, 223, u64)                                           \
+_(ipTotalLength, 224, u64)                                              \
+_(postNATSourceIPv4Address, 225, ip4_address_t)                         \
+_(postNATDestinationIPv4Address, 226, ip4_address_t)                    \
+_(postNAPTSourceTransportPort, 227, u16)                                \
+_(postNAPTDestinationTransportPort, 228, u16)                           \
+_(natOriginatingAddressRealm, 229, u8)                                  \
+_(natEvent, 230, u8)                                                    \
+_(initiatorOctets, 231, u64)                                            \
+_(responderOctets, 232, u64)                                            \
+_(firewallEvent, 233, u8)                                               \
+_(ingressVRFID, 234, u32)                                               \
+_(egressVRFID, 235, u32)                                                \
+_(VRFname, 236, string)                                                 \
+_(postMplsTopLabelExp, 237, u8)                                         \
+_(tcpWindowScale, 238, u16)                                             \
+_(biflowDirection, 239, u8)                                             \
+_(ethernetHeaderLength, 240, u8)                                        \
+_(ethernetPayloadLength, 241, u16)                                      \
+_(ethernetTotalLength, 242, u16)                                        \
+_(dot1qVlanId, 243, u16)                                                \
+_(dot1qPriority, 244, u8)                                               \
+_(dot1qCustomerVlanId, 245, u16)                                        \
+_(dot1qCustomerPriority, 246, u8)                                       \
+_(metroEvcId, 247, string)                                              \
+_(metroEvcType, 248, u8)                                                \
+_(pseudoWireId, 249, u32)                                               \
+_(pseudoWireType, 250, u16)                                             \
+_(pseudoWireControlWord, 251, u32)                                      \
+_(ingressPhysicalInterface, 252, u32)                                   \
+_(egressPhysicalInterface, 253, u32)                                    \
+_(postDot1qVlanId, 254, u16)                                            \
+_(postDot1qCustomerVlanId, 255, u16)                                    \
+_(ethernetType, 256, u16)                                               \
+_(postIpPrecedence, 257, u8)                                            \
+_(collectionTimeMilliseconds, 258, dateTimeMilliseconds)                \
+_(exportSctpStreamId, 259, u16)                                         \
+_(maxExportSeconds, 260, dateTimeSeconds)                               \
+_(maxFlowEndSeconds, 261, dateTimeSeconds)                              \
+_(messageMD5Checksum, 262, octetArray)                                  \
+_(messageScope, 263, u8)                                                \
+_(minExportSeconds, 264, dateTimeSeconds)                               \
+_(minFlowStartSeconds, 265, dateTimeSeconds)                            \
+_(opaqueOctets, 266, octetArray)                                        \
+_(sessionScope, 267, u8)                                                \
+_(maxFlowEndMicroseconds, 268, dateTimeMicroseconds)                    \
+_(maxFlowEndMilliseconds, 269, dateTimeMilliseconds)                    \
+_(maxFlowEndNanoseconds, 270, dateTimeNanoseconds)                      \
+_(minFlowStartMicroseconds, 271, dateTimeMicroseconds)                  \
+_(minFlowStartMilliseconds, 272, dateTimeMilliseconds)                  \
+_(minFlowStartNanoseconds, 273, dateTimeNanoseconds)                    \
+_(collectorCertificate, 274, octetArray)                                \
+_(exporterCertificate, 275, octetArray)                                 \
+_(dataRecordsReliability, 276, boolean)                                 \
+_(observationPointType, 277, u8)                                        \
+_(newConnectionDeltaCount, 278, u32)                                    \
+_(connectionSumDurationSeconds, 279, u64)                               \
+_(connectionTransactionId, 280, u64)                                    \
+_(postNATSourceIPv6Address, 281, ip6_address_t)                         \
+_(postNATDestinationIPv6Address, 282, ip6_address_t)                    \
+_(natPoolId, 283, u32)                                                  \
+_(natPoolName, 284, string)                                             \
+_(anonymizationFlags, 285, u16)                                         \
+_(anonymizationTechnique, 286, u16)                                     \
+_(informationElementIndex, 287, u16)                                    \
+_(p2pTechnology, 288, string)                                           \
+_(tunnelTechnology, 289, string)                                        \
+_(encryptedTechnology, 290, string)                                     \
+_(basicList, 291, basicList)                                            \
+_(subTemplateList, 292, subTemplateList)                                \
+_(subTemplateMultiList, 293, subTemplateMultiList)                      \
+_(bgpValidityState, 294, u8)                                            \
+_(IPSecSPI, 295, u32)                                                   \
+_(greKey, 296, u32)                                                     \
+_(natType, 297, u8)                                                     \
+_(initiatorPackets, 298, u64)                                           \
+_(responderPackets, 299, u64)                                           \
+_(observationDomainName, 300, string)                                   \
+_(selectionSequenceId, 301, u64)                                        \
+_(selectorId, 302, u64)                                                 \
+_(informationElementId, 303, u16)                                       \
+_(selectorAlgorithm, 304, u16)                                          \
+_(samplingPacketInterval, 305, u32)                                     \
+_(samplingPacketSpace, 306, u32)                                        \
+_(samplingTimeInterval, 307, u32)                                       \
+_(samplingTimeSpace, 308, u32)                                          \
+_(samplingSize, 309, u32)                                               \
+_(samplingPopulation, 310, u32)                                         \
+_(samplingProbability, 311, float64)                                    \
+_(dataLinkFrameSize, 312, u16)                                          \
+_(ipHeaderPacketSection, 313, octetArray)                               \
+_(ipPayloadPacketSection, 314, octetArray)                              \
+_(dataLinkFrameSection, 315, octetArray)                                \
+_(mplsLabelStackSection, 316, octetArray)                               \
+_(mplsPayloadPacketSection, 317, octetArray)                            \
+_(selectorIdTotalPktsObserved, 318, u64)                                \
+_(selectorIdTotalPktsSelected, 319, u64)                                \
+_(absoluteError, 320, float64)                                          \
+_(relativeError, 321, float64)                                          \
+_(observationTimeSeconds, 322, dateTimeSeconds)                         \
+_(observationTimeMilliseconds, 323, dateTimeMilliseconds)               \
+_(observationTimeMicroseconds, 324, dateTimeMicroseconds)               \
+_(observationTimeNanoseconds, 325, dateTimeNanoseconds)                 \
+_(digestHashValue, 326, u64)                                            \
+_(hashIPPayloadOffset, 327, u64)                                        \
+_(hashIPPayloadSize, 328, u64)                                          \
+_(hashOutputRangeMin, 329, u64)                                         \
+_(hashOutputRangeMax, 330, u64)                                         \
+_(hashSelectedRangeMin, 331, u64)                                       \
+_(hashSelectedRangeMax, 332, u64)                                       \
+_(hashDigestOutput, 333, boolean)                                       \
+_(hashInitialiserValue, 334, u64)                                       \
+_(selectorName, 335, string)                                            \
+_(upperCILimit, 336, float64)                                           \
+_(lowerCILimit, 337, float64)                                           \
+_(confidenceLevel, 338, float64)                                        \
+_(informationElementDataType, 339, u8)                                  \
+_(informationElementDescription, 340, string)                           \
+_(informationElementName, 341, string)                                  \
+_(informationElementRangeBegin, 342, u64)                               \
+_(informationElementRangeEnd, 343, u64)                                 \
+_(informationElementSemantics, 344, u8)                                 \
+_(informationElementUnits, 345, u16)                                    \
+_(privateEnterpriseNumber, 346, u32)                                    \
+_(virtualStationInterfaceId, 347, octetArray)                           \
+_(virtualStationInterfaceName, 348, string)                             \
+_(virtualStationUUID, 349, octetArray)                                  \
+_(virtualStationName, 350, string)                                      \
+_(layer2SegmentId, 351, u64)                                            \
+_(layer2OctetDeltaCount, 352, u64)                                      \
+_(layer2OctetTotalCount, 353, u64)                                      \
+_(ingressUnicastPacketTotalCount, 354, u64)                             \
+_(ingressMulticastPacketTotalCount, 355, u64)                           \
+_(ingressBroadcastPacketTotalCount, 356, u64)                           \
+_(egressUnicastPacketTotalCount, 357, u64)                              \
+_(egressBroadcastPacketTotalCount, 358, u64)                            \
+_(monitoringIntervalStartMilliSeconds, 359, dateTimeMilliseconds)       \
+_(monitoringIntervalEndMilliSeconds, 360, dateTimeMilliseconds)         \
+_(portRangeStart, 361, u16)                                             \
+_(portRangeEnd, 362, u16)                                               \
+_(portRangeStepSize, 363, u16)                                          \
+_(portRangeNumPorts, 364, u16)                                          \
+_(staMacAddress, 365, macAddress)                                       \
+_(staIPv4Address, 366, ip4_address_t)                                   \
+_(wtpMacAddress, 367, macAddress )                                      \
+_(ingressInterfaceType, 368, u32)                                       \
+_(egressInterfaceType, 369, u32)                                        \
+_(rtpSequenceNumber, 370, u16)                                          \
+_(userName, 371, string)                                                \
+_(applicationCategoryName, 372, string)                                 \
+_(applicationSubCategoryName, 373, string)                              \
+_(applicationGroupName, 374, string)                                    \
+_(originalFlowsPresent, 375, u64)                                       \
+_(originalFlowsInitiated, 376, u64)                                     \
+_(originalFlowsCompleted, 377, u64)                                     \
+_(distinctCountOfSourceIPAddress, 378, u64)                             \
+_(distinctCountOfDestinationIPAddress, 379, u64)                        \
+_(distinctCountOfSourceIPv4Address, 380, u32)                           \
+_(distinctCountOfDestinationIPv4Address, 381, u32)                      \
+_(distinctCountOfSourceIPv6Address, 382, u64)                           \
+_(distinctCountOfDestinationIPv6Address, 383, u64)                      \
+_(valueDistributionMethod, 384, u8)                                     \
+_(rfc3550JitterMilliseconds, 385, u32)                                  \
+_(rfc3550JitterMicroseconds, 386, u32)                                  \
+_(rfc3550JitterNanoseconds, 387, u32)                                   \
+_(dot1qDEI, 388, boolean)                                               \
+_(dot1qCustomerDEI, 389, boolean)                                       \
+_(flowSelectorAlgorithm, 390, u16)                                      \
+_(flowSelectedOctetDeltaCount, 391, u64)                                \
+_(flowSelectedPacketDeltaCount, 392, u64)                               \
+_(flowSelectedFlowDeltaCount, 393, u64)                                 \
+_(selectorIDTotalFlowsObserved, 394, u64)                               \
+_(selectorIDTotalFlowsSelected, 395, u64)                               \
+_(samplingFlowInterval, 396, u64)                                       \
+_(samplingFlowSpacing, 397, u64)                                        \
+_(flowSamplingTimeInterval, 398, u64)                                   \
+_(flowSamplingTimeSpacing, 399, u64)                                    \
+_(hashFlowDomain, 400, u16)                                             \
+_(transportOctetDeltaCount, 401, u64)                                   \
+_(transportPacketDeltaCount, 402, u64)                                  \
+_(originalExporterIPv4Address, 403, ip4_address_t)                      \
+_(originalExporterIPv6Address, 404, ip6_address_t)                      \
+_(originalObservationDomainId, 405, u32)                                \
+_(intermediateProcessId, 406, u32)                                      \
+_(ignoredDataRecordTotalCount, 407, u64)                                \
+_(dataLinkFrameType, 408, u16)                                          \
+_(sectionOffset, 409, u16)                                              \
+_(sectionExportedOctets, 410, u16)                                      \
+_(dot1qServiceInstanceTag, 411, octetArray)                             \
+_(dot1qServiceInstanceId, 412, u32)                                     \
+_(dot1qServiceInstancePriority, 413, u8)                                \
+_(dot1qCustomerSourceMacAddress, 414, macAddress)                       \
+_(dot1qCustomerDestinationMacAddress, 415, macAddress)                  \
+_(postLayer2OctetDeltaCount, 417, u64)                                  \
+_(postMCastLayer2OctetDeltaCount, 418, u64)                             \
+_(postLayer2OctetTotalCount, 420, u64)                                  \
+_(postMCastLayer2OctetTotalCount, 421, u64)                             \
+_(minimumLayer2TotalLength, 422, u64)                                   \
+_(maximumLayer2TotalLength, 423, u64)                                   \
+_(droppedLayer2OctetDeltaCount, 424, u64)                               \
+_(droppedLayer2OctetTotalCount, 425, u64)                               \
+_(ignoredLayer2OctetTotalCount, 426, u64)                               \
+_(notSentLayer2OctetTotalCount, 427, u64)                               \
+_(layer2OctetDeltaSumOfSquares, 428, u64)                               \
+_(layer2OctetTotalSumOfSquares, 429, u64)                               \
+_(layer2FrameDeltaCount, 430, u64)                                      \
+_(layer2FrameTotalCount, 431, u64)                                      \
+_(pseudoWireDestinationIPv4Address, 432, ip4_address_t)                 \
+_(ignoredLayer2FrameTotalCount, 433, u64)
+
+typedef enum {
+#define _(n,v,t) n = v,
+  foreach_ipfix_info_element_t
+#undef _
+} ipfix_info_element_id_t;
+
+#endif /* __included_ipfix_info_elements_h__ */
diff --git a/src/vnet/flow/ipfix_packet.h b/src/vnet/flow/ipfix_packet.h
new file mode 100644
index 00000000..32979619
--- /dev/null
+++ b/src/vnet/flow/ipfix_packet.h
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_ipfix_packet_h__
+#define __included_ipfix_packet_h__
+
+#include <vnet/flow/ipfix_info_elements.h>
+
+/* From RFC-7011:
+ * https://tools.ietf.org/html/rfc7011
+ */
+
+typedef struct {
+  u32 version_length;
+  u32 export_time;
+  u32 sequence_number;
+  u32 domain_id;
+} ipfix_message_header_t;
+
+static inline u32 version_length (u16 length)
+{
+  return clib_host_to_net_u32 (0x000a0000 | length);
+}
+
+
+/*
+ *   The Field Specifier format is shown in Figure G.
+ *
+ *     0                   1                   2                   3
+ *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *     |E|  Information Element ident. |        Field Length           |
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *     |                      Enterprise Number                        |
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ *                     Figure G: Field Specifier Format
+ *
+ *   Where:
+ *
+ *   E
+ *
+ *      Enterprise bit.  This is the first bit of the Field Specifier.  If
+ *      this bit is zero, the Information Element identifier identifies an
+ *      Information Element in [IANA-IPFIX], and the four-octet Enterprise
+ *      Number field MUST NOT be present.  If this bit is one, the
+ *      Information Element identifier identifies an enterprise-specific
+ *      Information Element, and the Enterprise Number field MUST be
+ *      present.
+ */
+
+typedef struct {
+  u32 e_id_length;
+  u32 enterprise;
+} ipfix_enterprise_field_specifier_t;
+
+typedef struct {
+  u32 e_id_length;
+} ipfix_field_specifier_t;
+
+static inline u32 ipfix_e_id_length (int e, u16 id, u16 length)
+{
+  u32 value;
+  value = (e<<31) | ((id&0x7FFF) <<16) | length;
+  return clib_host_to_net_u32 (value);
+}
+
+/* 
+ *   Every Set contains a common header.  This header is defined in
+ *   Figure I.
+ *
+ *      0                   1                   2                   3
+ *      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *     |          Set ID               |          Length               |
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ *                        Figure I: Set Header Format
+ *
+ *   Each Set Header field is exported in network format.  The fields are
+ *   defined as follows:
+ *
+ *   Set ID
+ *
+ *      Identifies the Set.  A value of 2 is reserved for Template Sets.
+ *      A value of 3 is reserved for Options Template Sets.  Values from 4
+ *      to 255 are reserved for future use.  Values 256 and above are used
+ *      for Data Sets.  The Set ID values of 0 and 1 are not used, for
+ *      historical reasons [RFC3954].
+ *
+ *   Length
+ *
+ *      Total length of the Set, in octets, including the Set Header, all
+ *      records, and the optional padding.  Because an individual Set MAY
+ *      contain multiple records, the Length value MUST be used to
+ *      determine the position of the next Set.
+ */
+
+typedef struct {
+  u32 set_id_length;
+} ipfix_set_header_t;
+
+static inline u32 ipfix_set_id_length (u16 set_id, u16 length)
+{
+  return clib_host_to_net_u32 ((set_id<<16) | length);
+}
+
+/* 
+ *   The format of the Template Record is shown in Figure J.  It consists
+ *   of a Template Record Header and one or more Field Specifiers.  Field
+ *   Specifiers are defined in Figure G above.
+ *
+ *           +--------------------------------------------------+
+ *           | Template Record Header                           |
+ *           +--------------------------------------------------+
+ *           | Field Specifier                                  |
+ *           +--------------------------------------------------+
+ *           | Field Specifier                                  |
+ *           +--------------------------------------------------+
+ *            ...
+ *           +--------------------------------------------------+
+ *           | Field Specifier                                  |
+ *           +--------------------------------------------------+
+ *
+ *                     Figure J: Template Record Format
+ *
+ *   The format of the Template Record Header is shown in Figure K.
+ *
+ *     0                   1                   2                   3
+ *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |      Template ID (> 255)      |         Field Count           |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ *                  Figure K: Template Record Header Format
+ *
+ *   The Template Record Header Field definitions are as follows:
+ *
+ *   Template ID
+ *
+ *      Each Template Record is given a unique Template ID in the range
+ *      256 to 65535.  This uniqueness is local to the Transport Session
+ *      and Observation Domain that generated the Template ID.  Since
+ *      Template IDs are used as Set IDs in the Sets they describe (see
+ *      Section 3.4.3), values 0-255 are reserved for special Set types
+ *      (e.g., Template Sets themselves), and Templates and Options
+ *      Templates (see Section 3.4.2) cannot share Template IDs within a
+ *      Transport Session and Observation Domain.  There are no
+ *      constraints regarding the order of the Template ID allocation.  As
+ *      Exporting Processes are free to allocate Template IDs as they see
+ *      fit, Collecting Processes MUST NOT assume incremental Template
+ *      IDs, or anything about the contents of a Template based on its
+ *      Template ID alone.
+ *
+ *   Field Count
+ *
+ *      Number of fields in this Template Record.
+ */
+
+typedef struct {
+  u32 id_count;
+} ipfix_template_header_t;
+
+static inline u32 ipfix_id_count (u16 id, u16 count)
+{
+  return clib_host_to_net_u32 ((id<<16) | count);
+}
+
+/* Template packet */
+typedef struct {
+  ipfix_message_header_t h;
+  ipfix_set_header_t s;
+  ipfix_template_header_t t;
+  ipfix_field_specifier_t fields[0];
+} ipfix_template_packet_t;
+
+#endif /* __included_ipfix_packet_h__ */
diff --git a/src/vnet/global_funcs.h b/src/vnet/global_funcs.h
new file mode 100644
index 00000000..92a5c04d
--- /dev/null
+++ b/src/vnet/global_funcs.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * global_funcs.h: global data structure access functions
+ */
+
+#ifndef included_vnet_global_funcs_h_
+#define included_vnet_global_funcs_h_
+
+vnet_main_t *vnet_get_main (void);
+
+#endif /* included_vnet_global_funcs_h_ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/gre/error.def b/src/vnet/gre/error.def
new file mode 100644
index 00000000..161ecc1d
--- /dev/null
+++ b/src/vnet/gre/error.def
@@ -0,0 +1,23 @@
+/*
+ * gre_error.def: gre errors
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+gre_error (NONE, "no error")
+gre_error (UNKNOWN_PROTOCOL, "unknown protocol")
+gre_error (UNSUPPORTED_VERSION, "unsupported version")
+gre_error (PKTS_DECAP, "GRE input packets decapsulated")
+gre_error (PKTS_ENCAP, "GRE output packets encapsulated")
+gre_error (NO_SUCH_TUNNEL, "GRE input packets dropped due to missing tunnel")
diff --git a/src/vnet/gre/gre.api b/src/vnet/gre/gre.api
new file mode 100644
index 00000000..28f6dbc9
--- /dev/null
+++ b/src/vnet/gre/gre.api
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+define gre_add_del_tunnel
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 is_ipv6;
+  u8 teb;
+  u8 src_address[16];
+  u8 dst_address[16];
+  u32 outer_fib_id;
+};
+
+define gre_add_del_tunnel_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+};
+
+define gre_tunnel_dump
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+};
+
+define gre_tunnel_details
+{
+  u32 context;
+  u32 sw_if_index;
+  u8 is_ipv6;
+  u8 teb;
+  u8 src_address[16];
+  u8 dst_address[16];
+  u32 outer_fib_id;
+};
+
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/gre/gre.c b/src/vnet/gre/gre.c
new file mode 100644
index 00000000..0faed13e
--- /dev/null
+++ b/src/vnet/gre/gre.c
@@ -0,0 +1,455 @@
+/*
+ * gre.c: gre
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/gre/gre.h>
+#include <vnet/adj/adj_midchain.h>
+
+gre_main_t gre_main;
+
+typedef struct {
+  union {
+    ip4_and_gre_header_t ip4_and_gre;
+    u64 as_u64[3];
+  };
+} ip4_and_gre_union_t;
+
+
+/* Packet trace structure */
+typedef struct {
+  /* Tunnel-id / index in tunnel vector */
+  u32 tunnel_id;
+
+  /* pkt length */
+  u32 length;
+
+  /* tunnel ip4 addresses */
+  ip4_address_t src;
+  ip4_address_t dst;
+} gre_tx_trace_t;
+
+u8 * format_gre_tx_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  gre_tx_trace_t * t = va_arg (*args, gre_tx_trace_t *);
+
+  s = format (s, "GRE: tunnel %d len %d src %U dst %U",
+	      t->tunnel_id, clib_net_to_host_u16 (t->length),
+	      format_ip4_address, &t->src.as_u8,
+	      format_ip4_address, &t->dst.as_u8);
+  return s;
+}
+
+u8 * format_gre_protocol (u8 * s, va_list * args)
+{
+  gre_protocol_t p = va_arg (*args, u32);
+  gre_main_t * gm = &gre_main;
+  gre_protocol_info_t * pi = gre_get_protocol_info (gm, p);
+
+  if (pi)
+    s = format (s, "%s", pi->name);
+  else
+    s = format (s, "0x%04x", p);
+
+  return s;
+}
+
+u8 * format_gre_header_with_length (u8 * s, va_list * args)
+{
+  gre_main_t * gm = &gre_main;
+  gre_header_t * h = va_arg (*args, gre_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+  gre_protocol_t p = clib_net_to_host_u16 (h->protocol);
+  uword indent, header_bytes;
+
+  header_bytes = sizeof (h[0]);
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    return format (s, "gre header truncated");
+
+  indent = format_get_indent (s);
+
+  s = format (s, "GRE %U", format_gre_protocol, p);
+
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    {
+      gre_protocol_info_t * pi = gre_get_protocol_info (gm, p);
+      vlib_node_t * node = vlib_get_node (gm->vlib_main, pi->node_index);
+      if (node->format_buffer)
+	s = format (s, "\n%U%U",
+		    format_white_space, indent,
+		    node->format_buffer, (void *) (h + 1),
+		    max_header_bytes - header_bytes);
+    }
+
+  return s;
+}
+
+u8 * format_gre_header (u8 * s, va_list * args)
+{
+  gre_header_t * h = va_arg (*args, gre_header_t *);
+  return format (s, "%U", format_gre_header_with_length, h, 0);
+}
+
+/* Returns gre protocol as an int in host byte order. */
+uword
+unformat_gre_protocol_host_byte_order (unformat_input_t * input,
+				       va_list * args)
+{
+  u16 * result = va_arg (*args, u16 *);
+  gre_main_t * gm = &gre_main;
+  int i;
+
+  /* Named type. */
+  if (unformat_user (input, unformat_vlib_number_by_name,
+		     gm->protocol_info_by_name, &i))
+    {
+      gre_protocol_info_t * pi = vec_elt_at_index (gm->protocol_infos, i);
+      *result = pi->protocol;
+      return 1;
+    }
+
+  return 0;
+}
+
+uword
+unformat_gre_protocol_net_byte_order (unformat_input_t * input,
+				      va_list * args)
+{
+  u16 * result = va_arg (*args, u16 *);
+  if (! unformat_user (input, unformat_gre_protocol_host_byte_order, result))
+    return 0;
+  *result = clib_host_to_net_u16 ((u16) *result);
+  return 1;
+}
+
+uword
+unformat_gre_header (unformat_input_t * input, va_list * args)
+{
+  u8 ** result = va_arg (*args, u8 **);
+  gre_header_t _h, * h = &_h;
+  u16 p;
+
+  if (! unformat (input, "%U",
+		  unformat_gre_protocol_host_byte_order, &p))
+    return 0;
+
+  h->protocol = clib_host_to_net_u16 (p);
+
+  /* Add header to result. */
+  {
+    void * p;
+    u32 n_bytes = sizeof (h[0]);
+
+    vec_add2 (*result, p, n_bytes);
+    clib_memcpy (p, h, n_bytes);
+  }
+
+  return 1;
+}
+
+static int
+gre_proto_from_vnet_link (vnet_link_t link)
+{
+    switch (link)
+    {
+    case VNET_LINK_IP4:
+        return (GRE_PROTOCOL_ip4);
+    case VNET_LINK_IP6:
+        return (GRE_PROTOCOL_ip6);
+    case VNET_LINK_MPLS:
+        return (GRE_PROTOCOL_mpls_unicast);
+    case VNET_LINK_ETHERNET:
+        return (GRE_PROTOCOL_teb);
+    case VNET_LINK_ARP:
+        return (GRE_PROTOCOL_arp);
+    }
+    ASSERT(0);
+    return (GRE_PROTOCOL_ip4);
+}
+
+static u8*
+gre_build_rewrite (vnet_main_t * vnm,
+		   u32 sw_if_index,
+		   vnet_link_t link_type,
+		   const void *dst_address)
+{
+  gre_main_t * gm = &gre_main;
+  ip4_and_gre_header_t * h;
+  u8* rewrite = NULL;
+  gre_tunnel_t *t;
+  u32 ti;
+
+  ti = gm->tunnel_index_by_sw_if_index[sw_if_index];
+
+  if (~0 == ti)
+      /* not one of ours */
+      return (0);
+
+  t = pool_elt_at_index(gm->tunnels, ti);
+
+  vec_validate(rewrite, sizeof(*h)-1);
+  h = (ip4_and_gre_header_t*)rewrite;
+  h->gre.protocol = clib_host_to_net_u16(gre_proto_from_vnet_link(link_type));
+
+  h->ip4.ip_version_and_header_length = 0x45;
+  h->ip4.ttl = 254;
+  h->ip4.protocol = IP_PROTOCOL_GRE;
+  /* fixup ip4 header length and checksum after-the-fact */
+  h->ip4.src_address.as_u32 = t->tunnel_src.as_u32;
+  h->ip4.dst_address.as_u32 = t->tunnel_dst.as_u32;
+  h->ip4.checksum = ip4_header_checksum (&h->ip4);
+
+  return (rewrite);
+}
+
+void
+gre_fixup (vlib_main_t *vm,
+	   ip_adjacency_t *adj,
+	   vlib_buffer_t *b0)
+{
+    ip4_header_t * ip0;
+
+    ip0 = vlib_buffer_get_current (b0);
+
+    /* Fixup the checksum and len fields in the GRE tunnel encap
+     * that was applied at the midchain node */
+    ip0->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
+    ip0->checksum = ip4_header_checksum (ip0);
+}
+
+void
+gre_update_adj (vnet_main_t * vnm,
+		u32 sw_if_index,
+		adj_index_t ai)
+{
+    adj_nbr_midchain_update_rewrite (ai, gre_fixup, 
+				     ADJ_MIDCHAIN_FLAG_NONE,
+				     gre_build_rewrite(vnm, sw_if_index,
+						       adj_get_link_type(ai),
+						       NULL));
+
+    gre_tunnel_stack(ai);
+}
+
+/**
+ * @brief TX function. Only called L2. L3 traffic uses the adj-midchains
+ */
+static uword
+gre_interface_tx_inline (vlib_main_t * vm,
+                         vlib_node_runtime_t * node,
+                         vlib_frame_t * frame)
+{
+  gre_main_t * gm = &gre_main;
+  u32 next_index;
+  u32 * from, * to_next, n_left_from, n_left_to_next;
+  vnet_interface_output_runtime_t * rd = (void *) node->runtime_data;
+  const gre_tunnel_t *gt = pool_elt_at_index (gm->tunnels, rd->dev_instance);
+
+  /* Vector of buffer / pkt indices we're supposed to process */
+  from = vlib_frame_vector_args (frame);
+
+  /* Number of buffers / pkts */
+  n_left_from = frame->n_vectors;
+
+  /* Speculatively send the first buffer to the last disposition we used */
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      /* set up to enqueue to our disposition with index = next_index */
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /*
+       * FIXME DUAL LOOP
+       */
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t * b0;
+	  u32 bi0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer(vm, bi0);
+
+	  vnet_buffer(b0)->ip.adj_index[VLIB_TX] = gt->l2_adj_index;
+
+	  if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      gre_tx_trace_t *tr = vlib_add_trace (vm, node,
+						   b0, sizeof (*tr));
+	      tr->tunnel_id = gt - gm->tunnels;
+	      tr->length = vlib_buffer_length_in_chain (vm, b0);
+	      tr->src.as_u32 = gt->tunnel_src.as_u32;
+	      tr->dst.as_u32 = gt->tunnel_src.as_u32;
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, gt->l2_tx_arc);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, gre_input_node.index,
+			       GRE_ERROR_PKTS_ENCAP, frame->n_vectors);
+
+  return frame->n_vectors;
+}
+
+static uword
+gre_interface_tx (vlib_main_t * vm,
+                  vlib_node_runtime_t * node,
+                  vlib_frame_t * frame)
+{
+    return (gre_interface_tx_inline (vm, node, frame));
+}
+
+static uword
+gre_teb_interface_tx (vlib_main_t * vm,
+                      vlib_node_runtime_t * node,
+                      vlib_frame_t * frame)
+{
+    return (gre_interface_tx_inline (vm, node, frame));
+}
+
+static u8 * format_gre_tunnel_name (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  return format (s, "gre%d", dev_instance);
+}
+
+static u8 * format_gre_tunnel_teb_name (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  return format (s, "teb-gre%d", dev_instance);
+}
+
+static u8 * format_gre_device (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  CLIB_UNUSED (int verbose) = va_arg (*args, int);
+
+  s = format (s, "GRE tunnel: id %d\n", dev_instance);
+  return s;
+}
+
+VNET_DEVICE_CLASS (gre_device_class) = {
+  .name = "GRE tunnel device",
+  .format_device_name = format_gre_tunnel_name,
+  .format_device = format_gre_device,
+  .format_tx_trace = format_gre_tx_trace,
+  .tx_function = gre_interface_tx,
+  .admin_up_down_function = gre_interface_admin_up_down,
+#ifdef SOON
+  .clear counter = 0;
+#endif
+};
+
+VLIB_DEVICE_TX_FUNCTION_MULTIARCH (gre_device_class,
+				   gre_interface_tx)
+
+VNET_DEVICE_CLASS (gre_device_teb_class) = {
+  .name = "GRE TEB tunnel device",
+  .format_device_name = format_gre_tunnel_teb_name,
+  .format_device = format_gre_device,
+  .format_tx_trace = format_gre_tx_trace,
+  .tx_function = gre_teb_interface_tx,
+  .admin_up_down_function = gre_interface_admin_up_down,
+#ifdef SOON
+  .clear counter = 0;
+#endif
+};
+
+VLIB_DEVICE_TX_FUNCTION_MULTIARCH (gre_device_teb_class,
+				   gre_teb_interface_tx)
+
+VNET_HW_INTERFACE_CLASS (gre_hw_interface_class) = {
+  .name = "GRE",
+  .format_header = format_gre_header_with_length,
+  .unformat_header = unformat_gre_header,
+  .build_rewrite = gre_build_rewrite,
+  .update_adjacency = gre_update_adj,
+  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
+};
+
+static void add_protocol (gre_main_t * gm,
+			  gre_protocol_t protocol,
+			  char * protocol_name)
+{
+  gre_protocol_info_t * pi;
+  u32 i;
+
+  vec_add2 (gm->protocol_infos, pi, 1);
+  i = pi - gm->protocol_infos;
+
+  pi->name = protocol_name;
+  pi->protocol = protocol;
+  pi->next_index = pi->node_index = ~0;
+
+  hash_set (gm->protocol_info_by_protocol, protocol, i);
+  hash_set_mem (gm->protocol_info_by_name, pi->name, i);
+}
+
+static clib_error_t * gre_init (vlib_main_t * vm)
+{
+  gre_main_t * gm = &gre_main;
+  clib_error_t * error;
+  ip_main_t * im = &ip_main;
+  ip_protocol_info_t * pi;
+
+  memset (gm, 0, sizeof (gm[0]));
+  gm->vlib_main = vm;
+  gm->vnet_main = vnet_get_main();
+
+  if ((error = vlib_call_init_function (vm, ip_main_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ip4_lookup_init)))
+    return error;
+
+  /* Set up the ip packet generator */
+  pi = ip_get_protocol_info (im, IP_PROTOCOL_GRE);
+  pi->format_header = format_gre_header;
+  pi->unformat_pg_edit = unformat_pg_gre_header;
+
+  gm->protocol_info_by_name = hash_create_string (0, sizeof (uword));
+  gm->protocol_info_by_protocol = hash_create (0, sizeof (uword));
+  gm->tunnel_by_key = hash_create (0, sizeof (uword));
+
+#define _(n,s) add_protocol (gm, GRE_PROTOCOL_##s, #s);
+  foreach_gre_protocol
+#undef _
+
+  return vlib_call_init_function (vm, gre_input_init);
+}
+
+VLIB_INIT_FUNCTION (gre_init);
+
+gre_main_t * gre_get_main (vlib_main_t * vm)
+{
+  vlib_call_init_function (vm, gre_init);
+  return &gre_main;
+}
+
diff --git a/src/vnet/gre/gre.h b/src/vnet/gre/gre.h
new file mode 100644
index 00000000..b6544b9b
--- /dev/null
+++ b/src/vnet/gre/gre.h
@@ -0,0 +1,235 @@
+/*
+ * gre.h: types/functions for gre.
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_gre_h
+#define included_gre_h
+
+#include <vnet/vnet.h>
+#include <vnet/gre/packet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ip/ip4.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ip/format.h>
+#include <vnet/adj/adj_types.h>
+
+extern vnet_hw_interface_class_t gre_hw_interface_class;
+
+typedef enum {
+#define gre_error(n,s) GRE_ERROR_##n,
+#include <vnet/gre/error.def>
+#undef gre_error
+  GRE_N_ERROR,
+} gre_error_t;
+
+/**
+ * A GRE payload protocol registration
+ */
+typedef struct {
+  /** Name (a c string). */
+  char * name;
+
+  /** GRE protocol type in host byte order. */
+  gre_protocol_t protocol;
+
+  /** Node which handles this type. */
+  u32 node_index;
+
+  /** Next index for this type. */
+  u32 next_index;
+} gre_protocol_info_t;
+
+/**
+ * @brief The GRE tunnel type
+ */
+typedef enum gre_tunnel_tyoe_t_
+{
+  /**
+   * L3 GRE (i.e. this tunnel is in L3 mode)
+   */
+  GRE_TUNNEL_TYPE_L3,
+  /**
+   * Transparent Ethernet Bridging - the tunnel is in L2 mode
+   */
+  GRE_TUNNEL_TYPE_TEB,
+} gre_tunnel_type_t;
+
+#define GRE_TUNNEL_TYPE_NAMES {    \
+    [GRE_TUNNEL_TYPE_L3] = "L3",   \
+    [GRE_TUNNEL_TYPE_TEB] = "TEB", \
+}
+
+#define GRE_TUNNEL_N_TYPES ((gre_tunnel_type_t)GRE_TUNNEL_TYPE_TEB+1)
+
+/**
+ * @brief A representation of a GRE tunnel
+ */
+typedef struct {
+  /**
+   * Linkage into the FIB object graph
+   */
+  fib_node_t node;
+
+  /**
+   * The tunnel's source/local address
+   */
+  ip4_address_t tunnel_src;
+  /**
+   * The tunnel's destination/remote address
+   */
+  ip4_address_t tunnel_dst;
+  /**
+   * The FIB in which the src.dst address are present
+   */
+  u32 outer_fib_index;
+  u32 hw_if_index;
+  u32 sw_if_index;
+  gre_tunnel_type_t type;
+
+  /**
+   * The FIB entry sourced by the tunnel for its destination prefix
+   */
+  fib_node_index_t fib_entry_index;
+
+  /**
+   * The tunnel is a child of the FIB entry for its desintion. This is
+   * so it receives updates when the forwarding information for that entry
+   * changes.
+   * The tunnels sibling index on the FIB entry's dependency list.
+   */
+  u32 sibling_index;
+
+  /**
+   * on a L2 tunnel this is the VLIB arc from the L2-tx to the l2-midchain
+   */
+  u32 l2_tx_arc;
+
+  /**
+   * an L2 tunnel always rquires an L2 midchain. cache here for DP.
+   */
+  adj_index_t l2_adj_index;
+} gre_tunnel_t;
+
+/**
+ * @brief GRE related global data
+ */
+typedef struct {
+  /**
+   * pool of tunnel instances
+   */
+  gre_tunnel_t *tunnels;
+
+  /**
+   * GRE payload protocol registrations
+   */
+  gre_protocol_info_t * protocol_infos;
+
+  /**
+   *  Hash tables mapping name/protocol to protocol info index.
+   */
+  uword * protocol_info_by_name, * protocol_info_by_protocol;
+  /**
+   * Hash mapping src/dst addr pair to tunnel
+   */
+  uword * tunnel_by_key;
+
+  /**
+   * Free vlib hw_if_indices.
+   * A free list per-tunnel type since the interfaces ctreated are fo different
+   * types and we cannot change the type.
+   */
+  u32 * free_gre_tunnel_hw_if_indices[GRE_TUNNEL_N_TYPES];
+
+  /**
+   * Mapping from sw_if_index to tunnel index
+   */
+  u32 * tunnel_index_by_sw_if_index;
+
+  /* convenience */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+} gre_main_t;
+
+/**
+ * @brief IPv4 and GRE header.
+ */
+typedef CLIB_PACKED (struct {
+  ip4_header_t ip4;
+  gre_header_t gre;
+}) ip4_and_gre_header_t;
+
+always_inline gre_protocol_info_t *
+gre_get_protocol_info (gre_main_t * em, gre_protocol_t protocol)
+{
+  uword * p = hash_get (em->protocol_info_by_protocol, protocol);
+  return p ? vec_elt_at_index (em->protocol_infos, p[0]) : 0;
+}
+
+gre_main_t gre_main;
+
+/* Register given node index to take input for given gre type. */
+void
+gre_register_input_type (vlib_main_t * vm,
+			 gre_protocol_t protocol,
+			 u32 node_index);
+
+extern  clib_error_t * gre_interface_admin_up_down (vnet_main_t * vnm,
+						    u32 hw_if_index,
+						    u32 flags);
+
+extern void gre_tunnel_stack (adj_index_t ai);
+extern void gre_update_adj (vnet_main_t * vnm,
+                            u32 sw_if_index,
+                            adj_index_t ai);
+
+format_function_t format_gre_protocol;
+format_function_t format_gre_header;
+format_function_t format_gre_header_with_length;
+
+extern vlib_node_registration_t gre_input_node;
+extern vnet_device_class_t gre_device_class;
+extern vnet_device_class_t gre_device_teb_class;
+
+/* Parse gre protocol as 0xXXXX or protocol name.
+   In either host or network byte order. */
+unformat_function_t unformat_gre_protocol_host_byte_order;
+unformat_function_t unformat_gre_protocol_net_byte_order;
+
+/* Parse gre header. */
+unformat_function_t unformat_gre_header;
+unformat_function_t unformat_pg_gre_header;
+
+void
+gre_register_input_protocol (vlib_main_t * vm,
+			     gre_protocol_t protocol,
+			     u32 node_index);
+
+/* manually added to the interface output node in gre.c */
+#define GRE_OUTPUT_NEXT_LOOKUP	1
+
+typedef struct {
+  u8 is_add;
+
+  ip4_address_t src, dst;
+  u32 outer_fib_id;
+  u8 teb;
+} vnet_gre_add_del_tunnel_args_t;
+
+int vnet_gre_add_del_tunnel
+  (vnet_gre_add_del_tunnel_args_t *a, u32 * sw_if_indexp);
+
+#endif /* included_gre_h */
diff --git a/src/vnet/gre/gre_api.c b/src/vnet/gre/gre_api.c
new file mode 100644
index 00000000..333838c0
--- /dev/null
+++ b/src/vnet/gre/gre_api.c
@@ -0,0 +1,204 @@
+/*
+ *------------------------------------------------------------------
+ * gre_api.c - gre api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+
+#include <vnet/gre/gre.h>
+#include <vnet/fib/fib_table.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                             \
+_(GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel)               \
+_(GRE_TUNNEL_DUMP, gre_tunnel_dump)
+
+static void vl_api_gre_add_del_tunnel_t_handler
+  (vl_api_gre_add_del_tunnel_t * mp)
+{
+  vl_api_gre_add_del_tunnel_reply_t *rmp;
+  int rv = 0;
+  vnet_gre_add_del_tunnel_args_t _a, *a = &_a;
+  u32 outer_fib_id;
+  uword *p;
+  ip4_main_t *im = &ip4_main;
+  u32 sw_if_index = ~0;
+
+  p = hash_get (im->fib_index_by_table_id, ntohl (mp->outer_fib_id));
+  if (!p)
+    {
+      rv = VNET_API_ERROR_NO_SUCH_FIB;
+      goto out;
+    }
+  outer_fib_id = p[0];
+
+  /* Check src & dst are different */
+  if ((mp->is_ipv6 && memcmp (mp->src_address, mp->dst_address, 16) == 0) ||
+      (!mp->is_ipv6 && memcmp (mp->src_address, mp->dst_address, 4) == 0))
+    {
+      rv = VNET_API_ERROR_SAME_SRC_DST;
+      goto out;
+    }
+  memset (a, 0, sizeof (*a));
+
+  a->is_add = mp->is_add;
+  a->teb = mp->teb;
+
+  /* ip addresses sent in network byte order */
+  clib_memcpy (&(a->src), mp->src_address, 4);
+  clib_memcpy (&(a->dst), mp->dst_address, 4);
+
+  a->outer_fib_id = outer_fib_id;
+  rv = vnet_gre_add_del_tunnel (a, &sw_if_index);
+
+out:
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_GRE_ADD_DEL_TUNNEL_REPLY,
+  ({
+    rmp->sw_if_index = ntohl (sw_if_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void send_gre_tunnel_details
+  (gre_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_gre_tunnel_details_t *rmp;
+  ip4_main_t *im = &ip4_main;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_GRE_TUNNEL_DETAILS);
+  clib_memcpy (rmp->src_address, &(t->tunnel_src), 4);
+  clib_memcpy (rmp->dst_address, &(t->tunnel_dst), 4);
+  rmp->outer_fib_id = htonl (im->fibs[t->outer_fib_index].ft_table_id);
+  rmp->teb = (GRE_TUNNEL_TYPE_TEB == t->type);
+  rmp->sw_if_index = htonl (t->sw_if_index);
+  rmp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_gre_tunnel_dump_t_handler (vl_api_gre_tunnel_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  gre_main_t *gm = &gre_main;
+  gre_tunnel_t *t;
+  u32 sw_if_index;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  if (~0 == sw_if_index)
+    {
+      /* *INDENT-OFF* */
+      pool_foreach (t, gm->tunnels,
+      ({
+        send_gre_tunnel_details(t, q, mp->context);
+      }));
+      /* *INDENT-ON* */
+    }
+  else
+    {
+      if ((sw_if_index >= vec_len (gm->tunnel_index_by_sw_if_index)) ||
+	  (~0 == gm->tunnel_index_by_sw_if_index[sw_if_index]))
+	{
+	  return;
+	}
+      t = &gm->tunnels[gm->tunnel_index_by_sw_if_index[sw_if_index]];
+      send_gre_tunnel_details (t, q, mp->context);
+    }
+}
+
+/*
+ * gre_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_gre;
+#undef _
+}
+
+static clib_error_t *
+gre_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (gre_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/gre/interface.c b/src/vnet/gre/interface.c
new file mode 100644
index 00000000..d624587d
--- /dev/null
+++ b/src/vnet/gre/interface.c
@@ -0,0 +1,606 @@
+/*
+ * gre_interface.c: gre interfaces
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/gre/gre.h>
+#include <vnet/ip/format.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/adj/adj_midchain.h>
+#include <vnet/adj/adj_nbr.h>
+#include <vnet/mpls/mpls.h>
+
+static const char *gre_tunnel_type_names[] = GRE_TUNNEL_TYPE_NAMES;
+
+static inline u64
+gre_mk_key (const ip4_address_t *src,
+            const ip4_address_t *dst,
+            u32 out_fib_index)
+{
+  // FIXME. the fib index should be part of the key
+  return ((u64)src->as_u32 << 32 | (u64)dst->as_u32);
+}
+
+static u8 *
+format_gre_tunnel_type (u8 * s, va_list * args)
+{
+  gre_tunnel_type_t type = va_arg (*args, gre_tunnel_type_t);
+
+  return (format(s, "%s", gre_tunnel_type_names[type]));
+}
+
+static u8 *
+format_gre_tunnel (u8 * s, va_list * args)
+{
+  gre_tunnel_t * t = va_arg (*args, gre_tunnel_t *);
+  gre_main_t * gm = &gre_main;
+
+  s = format (s,
+              "[%d] %U (src) %U (dst) payload %U outer_fib_index %d",
+              t - gm->tunnels,
+              format_ip4_address, &t->tunnel_src,
+              format_ip4_address, &t->tunnel_dst,
+              format_gre_tunnel_type, t->type,
+              t->outer_fib_index);
+
+  return s;
+}
+
+static gre_tunnel_t *
+gre_tunnel_db_find (const ip4_address_t *src,
+                    const ip4_address_t *dst,
+                    u32 out_fib_index)
+{
+  gre_main_t * gm = &gre_main;
+  uword * p;
+  u64 key;
+
+  key = gre_mk_key(src, dst, out_fib_index);
+
+  p = hash_get (gm->tunnel_by_key, key);
+
+  if (NULL == p)
+    return (NULL);
+
+  return (pool_elt_at_index (gm->tunnels, p[0]));
+}
+
+static void
+gre_tunnel_db_add (const gre_tunnel_t *t)
+{
+  gre_main_t * gm = &gre_main;
+  u64 key;
+
+  key = gre_mk_key(&t->tunnel_src, &t->tunnel_dst, t->outer_fib_index);
+  hash_set (gm->tunnel_by_key, key, t - gm->tunnels);
+}
+
+static void
+gre_tunnel_db_remove (const gre_tunnel_t *t)
+{
+  gre_main_t * gm = &gre_main;
+  u64 key;
+
+  key = gre_mk_key(&t->tunnel_src, &t->tunnel_dst, t->outer_fib_index);
+  hash_unset (gm->tunnel_by_key, key);
+}
+
+static gre_tunnel_t *
+gre_tunnel_from_fib_node (fib_node_t *node)
+{
+#if (CLIB_DEBUG > 0)
+    ASSERT(FIB_NODE_TYPE_GRE_TUNNEL == node->fn_type);
+#endif
+    return ((gre_tunnel_t*) (((char*)node) -
+                             STRUCT_OFFSET_OF(gre_tunnel_t, node)));
+}
+
+/**
+ * gre_tunnel_stack
+ *
+ * 'stack' (resolve the recursion for) the tunnel's midchain adjacency
+ */
+void
+gre_tunnel_stack (adj_index_t ai)
+{
+    gre_main_t * gm = &gre_main;
+    ip_adjacency_t *adj;
+    gre_tunnel_t *gt;
+    u32 sw_if_index;
+
+    adj = adj_get(ai);
+    sw_if_index = adj->rewrite_header.sw_if_index;
+
+    if ((vec_len(gm->tunnel_index_by_sw_if_index) < sw_if_index) ||
+	(~0 == gm->tunnel_index_by_sw_if_index[sw_if_index]))
+	return;
+
+    gt = pool_elt_at_index(gm->tunnels,
+			   gm->tunnel_index_by_sw_if_index[sw_if_index]);
+
+    /*
+     * find the adjacency that is contributed by the FIB entry
+     * that this tunnel resovles via, and use it as the next adj
+     * in the midchain
+     */
+    if (vnet_hw_interface_get_flags(vnet_get_main(),
+				    gt->hw_if_index) &
+	VNET_HW_INTERFACE_FLAG_LINK_UP)
+    {
+	adj_nbr_midchain_stack(
+	    ai,
+	    fib_entry_contribute_ip_forwarding(gt->fib_entry_index));
+    }
+    else
+    {
+	adj_nbr_midchain_unstack(ai);
+    }
+}
+
+/**
+ * @brief Call back when restacking all adjacencies on a GRE interface
+ */
+static adj_walk_rc_t
+gre_adj_walk_cb (adj_index_t ai,
+		 void *ctx)
+{
+    gre_tunnel_stack(ai);
+
+    return (ADJ_WALK_RC_CONTINUE);
+}
+
+static void
+gre_tunnel_restack (gre_tunnel_t *gt)
+{
+    fib_protocol_t proto;
+
+    /*
+     * walk all the adjacencies on th GRE interface and restack them
+     */
+    FOR_EACH_FIB_IP_PROTOCOL(proto)
+    {
+	adj_nbr_walk(gt->sw_if_index,
+		     proto,
+		     gre_adj_walk_cb,
+		     NULL);
+    }
+}
+
+/**
+ * Function definition to backwalk a FIB node
+ */
+static fib_node_back_walk_rc_t
+gre_tunnel_back_walk (fib_node_t *node,
+		      fib_node_back_walk_ctx_t *ctx)
+{
+    gre_tunnel_restack(gre_tunnel_from_fib_node(node));
+
+    return (FIB_NODE_BACK_WALK_CONTINUE);
+}
+
+/**
+ * Function definition to get a FIB node from its index
+ */
+static fib_node_t*
+gre_tunnel_fib_node_get (fib_node_index_t index)
+{
+    gre_tunnel_t * gt;
+    gre_main_t * gm;
+
+    gm  = &gre_main;
+    gt = pool_elt_at_index(gm->tunnels, index);
+
+    return (&gt->node);
+}
+
+/**
+ * Function definition to inform the FIB node that its last lock has gone.
+ */
+static void
+gre_tunnel_last_lock_gone (fib_node_t *node)
+{
+    /*
+     * The MPLS GRE tunnel is a root of the graph. As such
+     * it never has children and thus is never locked.
+     */
+    ASSERT(0);
+}
+
+/*
+ * Virtual function table registered by MPLS GRE tunnels
+ * for participation in the FIB object graph.
+ */
+const static fib_node_vft_t gre_vft = {
+    .fnv_get = gre_tunnel_fib_node_get,
+    .fnv_last_lock = gre_tunnel_last_lock_gone,
+    .fnv_back_walk = gre_tunnel_back_walk,
+};
+
+static int 
+vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t *a,
+                     u32 * sw_if_indexp)
+{
+  gre_main_t * gm = &gre_main;
+  vnet_main_t * vnm = gm->vnet_main;
+  ip4_main_t * im = &ip4_main;
+  gre_tunnel_t * t;
+  vnet_hw_interface_t * hi;
+  u32 hw_if_index, sw_if_index;
+  u32 outer_fib_index;
+  u8 address[6];
+  clib_error_t *error;
+
+  outer_fib_index = ip4_fib_index_from_table_id(a->outer_fib_id);
+
+  if (~0 == outer_fib_index)
+    return VNET_API_ERROR_NO_SUCH_FIB;
+
+  t = gre_tunnel_db_find(&a->src, &a->dst, a->outer_fib_id);
+
+  if (NULL != t)
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  pool_get_aligned (gm->tunnels, t, CLIB_CACHE_LINE_BYTES);
+  memset (t, 0, sizeof (*t));
+  fib_node_init(&t->node, FIB_NODE_TYPE_GRE_TUNNEL);
+
+  if (a->teb)
+      t->type = GRE_TUNNEL_TYPE_TEB;
+  else
+      t->type = GRE_TUNNEL_TYPE_L3;
+
+  if (vec_len (gm->free_gre_tunnel_hw_if_indices[t->type]) > 0) {
+      vnet_interface_main_t * im = &vnm->interface_main;
+
+      hw_if_index = gm->free_gre_tunnel_hw_if_indices[t->type]
+          [vec_len (gm->free_gre_tunnel_hw_if_indices[t->type])-1];
+      _vec_len (gm->free_gre_tunnel_hw_if_indices[t->type]) -= 1;
+
+      hi = vnet_get_hw_interface (vnm, hw_if_index);
+      hi->dev_instance = t - gm->tunnels;
+      hi->hw_instance = hi->dev_instance;
+
+      /* clear old stats of freed tunnel before reuse */
+      sw_if_index = hi->sw_if_index;
+      vnet_interface_counter_lock(im);
+      vlib_zero_combined_counter
+          (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_TX], sw_if_index);
+      vlib_zero_combined_counter
+          (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_RX], sw_if_index);
+      vlib_zero_simple_counter
+          (&im->sw_if_counters[VNET_INTERFACE_COUNTER_DROP], sw_if_index);
+        vnet_interface_counter_unlock(im);
+      if (GRE_TUNNEL_TYPE_TEB == t->type)
+      {
+          t->l2_tx_arc = vlib_node_add_named_next(vlib_get_main(),
+                                                  hi->tx_node_index,
+                                                  "adj-l2-midchain");
+      }
+    } else {
+      if (GRE_TUNNEL_TYPE_TEB == t->type)
+      {
+        /* Default MAC address (d00b:eed0:0000 + sw_if_index) */
+        memset (address, 0, sizeof (address));
+        address[0] = 0xd0;
+        address[1] = 0x0b;
+        address[2] = 0xee;
+        address[3] = 0xd0;
+        address[4] = t - gm->tunnels;
+
+        error = ethernet_register_interface(vnm,
+					    gre_device_teb_class.index,
+					    t - gm->tunnels, address,
+					    &hw_if_index,
+					    0);
+
+        if (error)
+        {
+          clib_error_report (error);
+          return VNET_API_ERROR_INVALID_REGISTRATION;
+        }
+	hi = vnet_get_hw_interface (vnm, hw_if_index);
+
+	t->l2_tx_arc = vlib_node_add_named_next(vlib_get_main(),
+						hi->tx_node_index,
+						"adj-l2-midchain");
+      } else {
+	hw_if_index = vnet_register_interface(vnm,
+					      gre_device_class.index,
+					      t - gm->tunnels,
+					      gre_hw_interface_class.index,
+					      t - gm->tunnels);
+      }
+      hi = vnet_get_hw_interface (vnm, hw_if_index);
+      sw_if_index = hi->sw_if_index;
+    }
+
+  t->hw_if_index = hw_if_index;
+  t->outer_fib_index = outer_fib_index;
+  t->sw_if_index = sw_if_index;
+  t->l2_adj_index = ADJ_INDEX_INVALID;
+
+  vec_validate_init_empty (gm->tunnel_index_by_sw_if_index, sw_if_index, ~0);
+  gm->tunnel_index_by_sw_if_index[sw_if_index] = t - gm->tunnels;
+
+  vec_validate (im->fib_index_by_sw_if_index, sw_if_index);
+
+  hi->min_packet_bytes = 64 + sizeof (gre_header_t) + sizeof (ip4_header_t);
+  hi->per_packet_overhead_bytes =
+      /* preamble */ 8 + /* inter frame gap */ 12;
+
+  /* Standard default gre MTU. */
+  hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] = 9000;
+
+  clib_memcpy (&t->tunnel_src, &a->src, sizeof (t->tunnel_src));
+  clib_memcpy (&t->tunnel_dst, &a->dst, sizeof (t->tunnel_dst));
+
+  gre_tunnel_db_add(t);
+
+  /*
+   * source the FIB entry for the tunnel's destination
+   * and become a child thereof. The tunnel will then get poked
+   * when the forwarding for the entry updates, and the tunnel can
+   * re-stack accordingly
+   */
+  const fib_prefix_t tun_dst_pfx = {
+      .fp_len = 32,
+      .fp_proto = FIB_PROTOCOL_IP4,
+      .fp_addr = {
+          .ip4 = t->tunnel_dst,
+      }
+  };
+
+  t->fib_entry_index =
+      fib_table_entry_special_add(outer_fib_index,
+                                  &tun_dst_pfx,
+                                  FIB_SOURCE_RR,
+                                  FIB_ENTRY_FLAG_NONE,
+                                  ADJ_INDEX_INVALID);
+  t->sibling_index =
+      fib_entry_child_add(t->fib_entry_index,
+                          FIB_NODE_TYPE_GRE_TUNNEL,
+                          t - gm->tunnels);
+
+  clib_memcpy (&t->tunnel_src, &a->src, sizeof (t->tunnel_src));
+  clib_memcpy (&t->tunnel_dst, &a->dst, sizeof (t->tunnel_dst));
+
+  if (GRE_TUNNEL_TYPE_TEB == t->type)
+  {
+      t->l2_adj_index = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
+					    VNET_LINK_ETHERNET,
+					    &zero_addr,
+					    sw_if_index);
+      gre_update_adj(vnm, t->sw_if_index, t->l2_adj_index);
+  }
+
+  if (sw_if_indexp)
+    *sw_if_indexp = sw_if_index;
+
+  return 0;
+}
+
+static int 
+vnet_gre_tunnel_delete (vnet_gre_add_del_tunnel_args_t *a,
+                        u32 * sw_if_indexp)
+{
+  gre_main_t * gm = &gre_main;
+  vnet_main_t * vnm = gm->vnet_main;
+  gre_tunnel_t * t;
+  u32 sw_if_index;
+
+  t = gre_tunnel_db_find(&a->src, &a->dst, a->outer_fib_id);
+
+  if (NULL == t)
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+  sw_if_index = t->sw_if_index;
+  vnet_sw_interface_set_flags (vnm, sw_if_index, 0 /* down */);
+  /* make sure tunnel is removed from l2 bd or xconnect */
+  set_int_l2_mode(gm->vlib_main, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0);
+  vec_add1 (gm->free_gre_tunnel_hw_if_indices[t->type], t->hw_if_index);
+  gm->tunnel_index_by_sw_if_index[sw_if_index] = ~0;
+
+  if (GRE_TUNNEL_TYPE_TEB == t->type)
+    adj_unlock(t->l2_adj_index);
+
+  if (t->l2_adj_index != ADJ_INDEX_INVALID)
+      adj_unlock(t->l2_adj_index);
+
+  fib_entry_child_remove(t->fib_entry_index,
+                         t->sibling_index);
+  fib_table_entry_delete_index(t->fib_entry_index,
+                               FIB_SOURCE_RR);
+
+  gre_tunnel_db_remove(t);
+  fib_node_deinit(&t->node);
+  pool_put (gm->tunnels, t);
+
+  if (sw_if_indexp)
+    *sw_if_indexp = sw_if_index;
+
+  return 0;
+}
+
+int
+vnet_gre_add_del_tunnel (vnet_gre_add_del_tunnel_args_t *a,
+                         u32 * sw_if_indexp)
+{
+  if (a->is_add)
+    return (vnet_gre_tunnel_add(a, sw_if_indexp));
+  else
+    return (vnet_gre_tunnel_delete(a, sw_if_indexp));
+}
+
+clib_error_t *
+gre_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+  gre_main_t * gm = &gre_main;
+  vnet_hw_interface_t * hi;
+  gre_tunnel_t *t;
+  u32 ti;
+
+  hi = vnet_get_hw_interface (vnm, hw_if_index);
+
+  if (NULL == gm->tunnel_index_by_sw_if_index ||
+      hi->sw_if_index >= vec_len(gm->tunnel_index_by_sw_if_index))
+      return (NULL);
+
+  ti = gm->tunnel_index_by_sw_if_index[hi->sw_if_index];
+
+  if (~0 == ti)
+      /* not one of ours */
+      return (NULL);
+
+  t = pool_elt_at_index(gm->tunnels, ti);
+
+  if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+    vnet_hw_interface_set_flags (vnm, hw_if_index, VNET_HW_INTERFACE_FLAG_LINK_UP);
+  else
+    vnet_hw_interface_set_flags (vnm, hw_if_index, 0 /* down */);
+
+  gre_tunnel_restack(t);
+
+  return /* no error */ 0;
+}
+
+static clib_error_t *
+create_gre_tunnel_command_fn (vlib_main_t * vm,
+		 unformat_input_t * input,
+		 vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, * line_input = &_line_input;
+  vnet_gre_add_del_tunnel_args_t _a, * a = &_a;
+  ip4_address_t src, dst;
+  u32 outer_fib_id = 0;
+  u8 teb = 0;
+  int rv;
+  u32 num_m_args = 0;
+  u8 is_add = 1;
+  u32 sw_if_index;
+
+  /* Get a line of input. */
+  if (! unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (line_input, "del"))
+      is_add = 0;
+    else if (unformat (line_input, "src %U", unformat_ip4_address, &src))
+      num_m_args++;
+    else if (unformat (line_input, "dst %U", unformat_ip4_address, &dst))
+      num_m_args++;
+    else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id))
+      ;
+    else if (unformat (line_input, "teb"))
+      teb = 1;
+    else
+      return clib_error_return (0, "unknown input `%U'",
+                                format_unformat_error, input);
+  }
+  unformat_free (line_input);
+
+  if (num_m_args < 2)
+      return clib_error_return (0, "mandatory argument(s) missing");
+
+  if (memcmp (&src, &dst, sizeof(src)) == 0)
+      return clib_error_return (0, "src and dst are identical");
+
+  memset (a, 0, sizeof (*a));
+  a->outer_fib_id = outer_fib_id;
+  a->teb = teb;
+  clib_memcpy(&a->src, &src, sizeof(src));
+  clib_memcpy(&a->dst, &dst, sizeof(dst));
+
+  if (is_add)
+    rv = vnet_gre_tunnel_add(a, &sw_if_index);
+  else
+    rv = vnet_gre_tunnel_delete(a, &sw_if_index);
+
+  switch(rv)
+    {
+    case 0:
+      vlib_cli_output(vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main(), sw_if_index);
+      break;
+    case VNET_API_ERROR_INVALID_VALUE:
+      return clib_error_return (0, "GRE tunnel already exists...");
+    case VNET_API_ERROR_NO_SUCH_FIB:
+      return clib_error_return (0, "outer fib ID %d doesn't exist\n",
+                                outer_fib_id);
+    default:
+      return clib_error_return (0, "vnet_gre_add_del_tunnel returned %d", rv);
+    }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (create_gre_tunnel_command, static) = {
+  .path = "create gre tunnel",
+  .short_help = "create gre tunnel src <addr> dst <addr> "
+                "[outer-fib-id <fib>] [teb] [del]",
+  .function = create_gre_tunnel_command_fn,
+};
+
+static clib_error_t *
+show_gre_tunnel_command_fn (vlib_main_t * vm,
+                            unformat_input_t * input,
+                            vlib_cli_command_t * cmd)
+{
+  gre_main_t * gm = &gre_main;
+  gre_tunnel_t * t;
+  u32 ti = ~0;
+
+  if (pool_elts (gm->tunnels) == 0)
+    vlib_cli_output (vm, "No GRE tunnels configured...");
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%d", &ti))
+        ;
+      else
+        break;
+    }
+
+  if (~0 == ti)
+    {
+      pool_foreach (t, gm->tunnels,
+      ({
+          vlib_cli_output (vm, "%U", format_gre_tunnel, t);
+      }));
+    }
+  else
+  {
+      t = pool_elt_at_index(gm->tunnels, ti);
+
+      vlib_cli_output (vm, "%U", format_gre_tunnel, t);
+  }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (show_gre_tunnel_command, static) = {
+    .path = "show gre tunnel",
+    .function = show_gre_tunnel_command_fn,
+};
+
+/* force inclusion from application's main.c */
+clib_error_t *gre_interface_init (vlib_main_t *vm)
+{
+  fib_node_register_type(FIB_NODE_TYPE_GRE_TUNNEL, &gre_vft);
+
+  return 0;
+}
+VLIB_INIT_FUNCTION(gre_interface_init);
diff --git a/src/vnet/gre/node.c b/src/vnet/gre/node.c
new file mode 100644
index 00000000..86f7a6ee
--- /dev/null
+++ b/src/vnet/gre/node.c
@@ -0,0 +1,531 @@
+/*
+ * node.c: gre packet processing
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/gre/gre.h>
+#include <vnet/mpls/mpls.h>
+#include <vppinfra/sparse_vec.h>
+
+#define foreach_gre_input_next			\
+_(PUNT, "error-punt")                           \
+_(DROP, "error-drop")                           \
+_(ETHERNET_INPUT, "ethernet-input")             \
+_(IP4_INPUT, "ip4-input")                       \
+_(IP6_INPUT, "ip6-input")			\
+_(MPLS_INPUT, "mpls-input")
+
+typedef enum {
+#define _(s,n) GRE_INPUT_NEXT_##s,
+  foreach_gre_input_next
+#undef _
+  GRE_INPUT_N_NEXT,
+} gre_input_next_t;
+
+typedef struct {
+  u32 tunnel_id;
+  u32 length;
+  ip4_address_t src;
+  ip4_address_t dst;
+} gre_rx_trace_t;
+
+u8 * format_gre_rx_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  gre_rx_trace_t * t = va_arg (*args, gre_rx_trace_t *);
+    
+  s = format (s, "GRE: tunnel %d len %d src %U dst %U",
+              t->tunnel_id, clib_net_to_host_u16(t->length),
+              format_ip4_address, &t->src.as_u8,
+              format_ip4_address, &t->dst.as_u8);
+  return s;
+}
+
+typedef struct {
+  /* Sparse vector mapping gre protocol in network byte order
+     to next index. */
+  u16 * next_by_protocol;
+} gre_input_runtime_t;
+
+static uword
+gre_input (vlib_main_t * vm,
+	   vlib_node_runtime_t * node,
+	   vlib_frame_t * from_frame)
+{
+  gre_main_t * gm = &gre_main;
+  gre_input_runtime_t * rt = (void *) node->runtime_data;
+  __attribute__((unused)) u32 n_left_from, next_index, * from, * to_next;
+  u64 cached_tunnel_key = (u64) ~0;
+  u32 cached_tunnel_sw_if_index = 0, tunnel_sw_if_index = 0;
+
+  u32 cpu_index = os_get_cpu_number();
+  u32 len;
+  vnet_interface_main_t *im = &gm->vnet_main->interface_main;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t * b0, * b1;
+	  gre_header_t * h0, * h1;
+          u16 version0, version1;
+          int verr0, verr1;
+	  u32 i0, i1, next0, next1, protocol0, protocol1;
+          ip4_header_t *ip0, *ip1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * p2, * p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, sizeof (h0[0]), LOAD);
+	    CLIB_PREFETCH (p3->data, sizeof (h1[0]), LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+          /* ip4_local hands us the ip header, not the gre header */
+          ip0 = vlib_buffer_get_current (b0);
+          ip1 = vlib_buffer_get_current (b1);
+
+          /* Save src + dst ip4 address, e.g. for mpls-o-gre */
+          vnet_buffer(b0)->gre.src = ip0->src_address.as_u32;
+          vnet_buffer(b0)->gre.dst = ip0->dst_address.as_u32;
+          vnet_buffer(b1)->gre.src = ip1->src_address.as_u32;
+          vnet_buffer(b1)->gre.dst = ip1->dst_address.as_u32;
+
+          vlib_buffer_advance (b0, sizeof (*ip0));
+          vlib_buffer_advance (b1, sizeof (*ip1));
+
+	  h0 = vlib_buffer_get_current (b0);
+	  h1 = vlib_buffer_get_current (b1);
+
+	  /* Index sparse array with network byte order. */
+	  protocol0 = h0->protocol;
+	  protocol1 = h1->protocol;
+	  sparse_vec_index2 (rt->next_by_protocol, protocol0, protocol1,
+                             &i0, &i1);
+          next0 = vec_elt(rt->next_by_protocol, i0);
+          next1 = vec_elt(rt->next_by_protocol, i1);
+
+	  b0->error = node->errors[i0 == SPARSE_VEC_INVALID_INDEX ? GRE_ERROR_UNKNOWN_PROTOCOL : GRE_ERROR_NONE];
+	  b1->error = node->errors[i1 == SPARSE_VEC_INVALID_INDEX ? GRE_ERROR_UNKNOWN_PROTOCOL : GRE_ERROR_NONE];
+          
+          version0 = clib_net_to_host_u16 (h0->flags_and_version);
+          verr0 =  version0 & GRE_VERSION_MASK;
+          version1 = clib_net_to_host_u16 (h1->flags_and_version);
+          verr1 =  version1 & GRE_VERSION_MASK;
+
+          b0->error = verr0 ? node->errors[GRE_ERROR_UNSUPPORTED_VERSION]
+              : b0->error;
+          next0 = verr0 ? GRE_INPUT_NEXT_DROP : next0;
+          b1->error = verr1 ? node->errors[GRE_ERROR_UNSUPPORTED_VERSION]
+              : b1->error;
+          next1 = verr1 ? GRE_INPUT_NEXT_DROP : next1;
+
+
+          /* RPF check for ip4/ip6 input */
+          if (PREDICT_TRUE(next0 == GRE_INPUT_NEXT_IP4_INPUT
+			   || next0 == GRE_INPUT_NEXT_IP6_INPUT
+			   || next0 == GRE_INPUT_NEXT_ETHERNET_INPUT
+			   || next0 == GRE_INPUT_NEXT_MPLS_INPUT))
+            {
+              u64 key = ((u64)(vnet_buffer(b0)->gre.dst) << 32) |
+                         (u64)(vnet_buffer(b0)->gre.src);
+
+              if (cached_tunnel_key != key)
+                {
+                  vnet_hw_interface_t * hi;
+                  gre_tunnel_t * t;
+                  uword * p;
+
+                  p = hash_get (gm->tunnel_by_key, key);
+                  if (!p)
+                    {
+                      next0 = GRE_INPUT_NEXT_DROP;
+                      b0->error = node->errors[GRE_ERROR_NO_SUCH_TUNNEL];
+                      goto drop0;
+                    }
+                  t = pool_elt_at_index (gm->tunnels, p[0]);
+                  hi = vnet_get_hw_interface (gm->vnet_main,
+                            t->hw_if_index);
+                  tunnel_sw_if_index = hi->sw_if_index;
+
+                  cached_tunnel_sw_if_index = tunnel_sw_if_index;
+                }
+              else
+                {
+                  tunnel_sw_if_index = cached_tunnel_sw_if_index;
+                }
+            }
+          else
+            {
+		next0 = GRE_INPUT_NEXT_DROP;
+                goto drop0;
+            }
+          len = vlib_buffer_length_in_chain (vm, b0);
+          vlib_increment_combined_counter (im->combined_sw_if_counters
+                                           + VNET_INTERFACE_COUNTER_RX,
+                                           cpu_index,
+                                           tunnel_sw_if_index,
+                                           1 /* packets */,
+                                           len /* bytes */);
+
+          vnet_buffer(b0)->sw_if_index[VLIB_RX] = tunnel_sw_if_index;
+
+drop0:
+          if (PREDICT_TRUE(next1 == GRE_INPUT_NEXT_IP4_INPUT
+			   || next1 == GRE_INPUT_NEXT_IP6_INPUT
+			   || next1 == GRE_INPUT_NEXT_ETHERNET_INPUT
+			   || next1 == GRE_INPUT_NEXT_MPLS_INPUT))
+            {
+              u64 key = ((u64)(vnet_buffer(b1)->gre.dst) << 32) |
+                         (u64)(vnet_buffer(b1)->gre.src);
+
+              if (cached_tunnel_key != key)
+                {
+                  vnet_hw_interface_t * hi;
+                  gre_tunnel_t * t;
+                  uword * p;
+
+                  p = hash_get (gm->tunnel_by_key, key);
+                  if (!p)
+                    {
+                      next1 = GRE_INPUT_NEXT_DROP;
+                      b1->error = node->errors[GRE_ERROR_NO_SUCH_TUNNEL];
+                      goto drop1;
+                    }
+                  t = pool_elt_at_index (gm->tunnels, p[0]);
+                  hi = vnet_get_hw_interface (gm->vnet_main,
+                            t->hw_if_index);
+                  tunnel_sw_if_index = hi->sw_if_index;
+
+                  cached_tunnel_sw_if_index = tunnel_sw_if_index;
+                }
+              else
+                {
+                  tunnel_sw_if_index = cached_tunnel_sw_if_index;
+                }
+            }
+          else
+            {
+		next1 = GRE_INPUT_NEXT_DROP;
+                goto drop1;
+            }
+          len = vlib_buffer_length_in_chain (vm, b1);
+          vlib_increment_combined_counter (im->combined_sw_if_counters
+                                           + VNET_INTERFACE_COUNTER_RX,
+                                           cpu_index,
+                                           tunnel_sw_if_index,
+                                           1 /* packets */,
+                                           len /* bytes */);
+
+          vnet_buffer(b1)->sw_if_index[VLIB_RX] = tunnel_sw_if_index;
+
+drop1:
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+            {
+              gre_rx_trace_t *tr = vlib_add_trace (vm, node,
+                                                   b0, sizeof (*tr));
+              tr->tunnel_id = tunnel_sw_if_index;
+              tr->length = ip0->length;
+              tr->src.as_u32 = ip0->src_address.as_u32;
+              tr->dst.as_u32 = ip0->dst_address.as_u32;
+            }
+
+          if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
+            {
+              gre_rx_trace_t *tr = vlib_add_trace (vm, node,
+                                                   b1, sizeof (*tr));
+              tr->tunnel_id = tunnel_sw_if_index;
+              tr->length = ip1->length;
+              tr->src.as_u32 = ip1->src_address.as_u32;
+              tr->dst.as_u32 = ip1->dst_address.as_u32;
+            }
+
+          vlib_buffer_advance (b0, sizeof (*h0));
+          vlib_buffer_advance (b1, sizeof (*h1));
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+    
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t * b0;
+	  gre_header_t * h0;
+          ip4_header_t * ip0;
+          u16 version0;
+          int verr0;
+	  u32 i0, next0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+          ip0 = vlib_buffer_get_current (b0);
+
+          vnet_buffer(b0)->gre.src = ip0->src_address.as_u32;
+          vnet_buffer(b0)->gre.dst = ip0->dst_address.as_u32;
+
+          vlib_buffer_advance (b0, sizeof (*ip0));
+
+	  h0 = vlib_buffer_get_current (b0);
+
+	  i0 = sparse_vec_index (rt->next_by_protocol, h0->protocol);
+          next0 = vec_elt(rt->next_by_protocol, i0);
+
+	  b0->error = 
+              node->errors[i0 == SPARSE_VEC_INVALID_INDEX 
+                           ? GRE_ERROR_UNKNOWN_PROTOCOL : GRE_ERROR_NONE];
+	  
+          version0 = clib_net_to_host_u16 (h0->flags_and_version);
+          verr0 =  version0 & GRE_VERSION_MASK;
+          b0->error = verr0 ? node->errors[GRE_ERROR_UNSUPPORTED_VERSION] 
+              : b0->error;
+          next0 = verr0 ? GRE_INPUT_NEXT_DROP : next0;
+
+
+          /* For IP payload we need to find source interface
+             so we can increase counters and help forward node to
+             pick right FIB */
+          /* RPF check for ip4/ip6 input */
+          if (PREDICT_TRUE(next0 == GRE_INPUT_NEXT_IP4_INPUT
+			   || next0 == GRE_INPUT_NEXT_IP6_INPUT
+			   || next0 == GRE_INPUT_NEXT_ETHERNET_INPUT
+			   || next0 == GRE_INPUT_NEXT_MPLS_INPUT))
+            {
+              u64 key = ((u64)(vnet_buffer(b0)->gre.dst) << 32) |
+                         (u64)(vnet_buffer(b0)->gre.src);
+
+              if (cached_tunnel_key != key)
+                {
+                  vnet_hw_interface_t * hi;
+                  gre_tunnel_t * t;
+                  uword * p;
+
+                  p = hash_get (gm->tunnel_by_key, key);
+                  if (!p)
+                    {
+                      next0 = GRE_INPUT_NEXT_DROP;
+                      b0->error = node->errors[GRE_ERROR_NO_SUCH_TUNNEL];
+                      goto drop;
+                    }
+                  t = pool_elt_at_index (gm->tunnels, p[0]);
+                  hi = vnet_get_hw_interface (gm->vnet_main,
+                            t->hw_if_index);
+                  tunnel_sw_if_index = hi->sw_if_index;
+
+                  cached_tunnel_sw_if_index = tunnel_sw_if_index;
+                }
+              else
+                {
+                  tunnel_sw_if_index = cached_tunnel_sw_if_index;
+                }
+            }
+          else
+            {
+		next0 = GRE_INPUT_NEXT_DROP;
+                goto drop;
+            }
+          len = vlib_buffer_length_in_chain (vm, b0);
+          vlib_increment_combined_counter (im->combined_sw_if_counters
+                                           + VNET_INTERFACE_COUNTER_RX,
+                                           cpu_index,
+                                           tunnel_sw_if_index,
+                                           1 /* packets */,
+                                           len /* bytes */);
+
+          vnet_buffer(b0)->sw_if_index[VLIB_RX] = tunnel_sw_if_index;
+
+drop:
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
+            {
+              gre_rx_trace_t *tr = vlib_add_trace (vm, node, 
+                                                   b0, sizeof (*tr));
+              tr->tunnel_id = tunnel_sw_if_index;
+              tr->length = ip0->length;
+              tr->src.as_u32 = ip0->src_address.as_u32;
+              tr->dst.as_u32 = ip0->dst_address.as_u32;
+            }
+
+          vlib_buffer_advance (b0, sizeof (*h0));
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, gre_input_node.index,
+                               GRE_ERROR_PKTS_DECAP, from_frame->n_vectors);
+  return from_frame->n_vectors;
+}
+
+static char * gre_error_strings[] = {
+#define gre_error(n,s) s,
+#include "error.def"
+#undef gre_error
+};
+
+VLIB_REGISTER_NODE (gre_input_node) = {
+  .function = gre_input,
+  .name = "gre-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .runtime_data_bytes = sizeof (gre_input_runtime_t),
+
+  .n_errors = GRE_N_ERROR,
+  .error_strings = gre_error_strings,
+
+  .n_next_nodes = GRE_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [GRE_INPUT_NEXT_##s] = n,
+    foreach_gre_input_next
+#undef _
+  },
+
+  .format_buffer = format_gre_header_with_length,
+  .format_trace = format_gre_rx_trace,
+  .unformat_buffer = unformat_gre_header,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (gre_input_node, gre_input)
+
+void
+gre_register_input_protocol (vlib_main_t * vm,
+			     gre_protocol_t protocol,
+			     u32 node_index)
+{
+  gre_main_t * em = &gre_main;
+  gre_protocol_info_t * pi;
+  gre_input_runtime_t * rt;
+  u16 * n;
+
+  {
+    clib_error_t * error = vlib_call_init_function (vm, gre_input_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  pi = gre_get_protocol_info (em, protocol);
+  pi->node_index = node_index;
+  pi->next_index = vlib_node_add_next (vm, 
+				       gre_input_node.index,
+				       node_index);
+
+  /* Setup gre protocol -> next index sparse vector mapping. */
+  rt = vlib_node_get_runtime_data (vm, gre_input_node.index);
+  n = sparse_vec_validate (rt->next_by_protocol, 
+                           clib_host_to_net_u16 (protocol));
+  n[0] = pi->next_index;
+}
+
+static void
+gre_setup_node (vlib_main_t * vm, u32 node_index)
+{
+  vlib_node_t * n = vlib_get_node (vm, node_index);
+  pg_node_t * pn = pg_get_node (node_index);
+
+  n->format_buffer = format_gre_header_with_length;
+  n->unformat_buffer = unformat_gre_header;
+  pn->unformat_edit = unformat_pg_gre_header;
+}
+
+static clib_error_t * gre_input_init (vlib_main_t * vm)
+{
+  gre_input_runtime_t * rt;
+  vlib_node_t *ethernet_input, *ip4_input, *ip6_input, *mpls_unicast_input;
+
+  {
+    clib_error_t * error; 
+    error = vlib_call_init_function (vm, gre_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  gre_setup_node (vm, gre_input_node.index);
+
+  rt = vlib_node_get_runtime_data (vm, gre_input_node.index);
+
+  rt->next_by_protocol = sparse_vec_new
+    (/* elt bytes */ sizeof (rt->next_by_protocol[0]),
+     /* bits in index */ BITS (((gre_header_t *) 0)->protocol));
+
+  /* These could be moved to the supported protocol input node defn's */
+  ethernet_input = vlib_get_node_by_name (vm, (u8 *)"ethernet-input");
+  ASSERT(ethernet_input);
+  ip4_input = vlib_get_node_by_name (vm, (u8 *)"ip4-input");
+  ASSERT(ip4_input);
+  ip6_input = vlib_get_node_by_name (vm, (u8 *)"ip6-input");
+  ASSERT(ip6_input);
+  mpls_unicast_input = vlib_get_node_by_name (vm, (u8 *)"mpls-input");
+  ASSERT(mpls_unicast_input);
+
+  gre_register_input_protocol (vm, GRE_PROTOCOL_teb,
+                               ethernet_input->index);
+
+  gre_register_input_protocol (vm, GRE_PROTOCOL_ip4, 
+                               ip4_input->index);
+
+  gre_register_input_protocol (vm, GRE_PROTOCOL_ip6, 
+                               ip6_input->index);
+
+  gre_register_input_protocol (vm, GRE_PROTOCOL_mpls_unicast,
+                               mpls_unicast_input->index);
+
+  ip4_register_protocol (IP_PROTOCOL_GRE, gre_input_node.index);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (gre_input_init);
diff --git a/src/vnet/gre/packet.h b/src/vnet/gre/packet.h
new file mode 100644
index 00000000..cc2ccda9
--- /dev/null
+++ b/src/vnet/gre/packet.h
@@ -0,0 +1,55 @@
+#ifndef included_vnet_gre_packet_h
+#define included_vnet_gre_packet_h
+
+/*
+ * GRE packet format
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define foreach_gre_protocol			\
+_ (0x0800, ip4)                                 \
+_ (0x86DD, ip6)                                 \
+_ (0x6558, teb)                                 \
+_ (0x0806, arp)					\
+_ (0x8847, mpls_unicast)			\
+_ (0x894F, nsh)
+
+typedef enum {
+#define _(n,f) GRE_PROTOCOL_##f = n,
+  foreach_gre_protocol
+#undef _
+} gre_protocol_t;
+
+typedef struct {
+  /* flags and version */
+  u16 flags_and_version;
+  /* unimplemented at the moment */
+#define GRE_FLAGS_CHECKSUM (1 << 15)
+
+  /* deprecated, according to rfc2784 */
+#define GRE_FLAGS_ROUTING (1 << 14)
+#define GRE_FLAGS_KEY (1 << 13)
+#define GRE_FLAGS_SEQUENCE (1 << 12)
+#define GRE_FLAGS_STRICT_SOURCE_ROUTE (1 << 11)
+
+  /* version 1 is PPTP which we don't support */
+#define GRE_SUPPORTED_VERSION 0
+#define GRE_VERSION_MASK 0x7
+
+  /* 0x800 for ip4, etc. */
+  u16 protocol;
+} gre_header_t;
+
+#endif /* included_vnet_gre_packet_h */
diff --git a/src/vnet/gre/pg.c b/src/vnet/gre/pg.c
new file mode 100644
index 00000000..cc065d3b
--- /dev/null
+++ b/src/vnet/gre/pg.c
@@ -0,0 +1,77 @@
+/*
+ * hdlc_pg.c: packet generator gre interface
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/gre/gre.h>
+
+typedef struct {
+  pg_edit_t flags_and_version;
+  pg_edit_t protocol;
+} pg_gre_header_t;
+
+static inline void
+pg_gre_header_init (pg_gre_header_t * e)
+{
+  pg_edit_init (&e->flags_and_version, gre_header_t, flags_and_version);
+  pg_edit_init (&e->protocol, gre_header_t, protocol);
+}
+
+uword
+unformat_pg_gre_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t * s = va_arg (*args, pg_stream_t *);
+  pg_gre_header_t * h;
+  u32 group_index, error;
+  
+  h = pg_create_edit_group (s, sizeof (h[0]), sizeof (gre_header_t),
+			    &group_index);
+  pg_gre_header_init (h);
+
+  pg_edit_set_fixed (&h->flags_and_version, 0);
+
+  error = 1;
+  if (! unformat (input, "%U",
+		  unformat_pg_edit,
+                  unformat_gre_protocol_net_byte_order, &h->protocol))
+    goto done;
+
+  {
+    gre_main_t * pm = &gre_main;
+    gre_protocol_info_t * pi = 0;
+    pg_node_t * pg_node = 0;
+
+    if (h->protocol.type == PG_EDIT_FIXED)
+      {
+	u16 t = *(u16 *) h->protocol.values[PG_EDIT_LO];
+	pi = gre_get_protocol_info (pm, clib_net_to_host_u16 (t));
+	if (pi && pi->node_index != ~0)
+	  pg_node = pg_get_node (pi->node_index);
+      }
+
+    if (pg_node && pg_node->unformat_edit
+	&& unformat_user (input, pg_node->unformat_edit, s))
+      ;
+  }
+
+  error = 0;
+ done:
+  if (error)
+    pg_free_edit_group (s);
+  return error == 0;
+}
+
diff --git a/src/vnet/handoff.c b/src/vnet/handoff.c
new file mode 100644
index 00000000..9f3c93b4
--- /dev/null
+++ b/src/vnet/handoff.c
@@ -0,0 +1,594 @@
+
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vppinfra/xxhash.h>
+#include <vlib/threads.h>
+#include <vnet/handoff.h>
+#include <vnet/feature/feature.h>
+
+typedef struct
+{
+  uword *workers_bitmap;
+  u32 *workers;
+} per_inteface_handoff_data_t;
+
+typedef struct
+{
+  u32 cached_next_index;
+  u32 num_workers;
+  u32 first_worker_index;
+
+  per_inteface_handoff_data_t *if_data;
+
+  /* Worker handoff index */
+  u32 frame_queue_index;
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+
+    u64 (*hash_fn) (ethernet_header_t *);
+} handoff_main_t;
+
+handoff_main_t handoff_main;
+vlib_node_registration_t handoff_dispatch_node;
+
+typedef struct
+{
+  u32 sw_if_index;
+  u32 next_worker_index;
+  u32 buffer_index;
+} worker_handoff_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_worker_handoff_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  worker_handoff_trace_t *t = va_arg (*args, worker_handoff_trace_t *);
+
+  s =
+    format (s, "worker-handoff: sw_if_index %d, next_worker %d, buffer 0x%x",
+	    t->sw_if_index, t->next_worker_index, t->buffer_index);
+  return s;
+}
+
+vlib_node_registration_t handoff_node;
+
+static uword
+worker_handoff_node_fn (vlib_main_t * vm,
+			vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  handoff_main_t *hm = &handoff_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  u32 n_left_from, *from;
+  static __thread vlib_frame_queue_elt_t **handoff_queue_elt_by_worker_index;
+  static __thread vlib_frame_queue_t **congested_handoff_queue_by_worker_index
+    = 0;
+  vlib_frame_queue_elt_t *hf = 0;
+  int i;
+  u32 n_left_to_next_worker = 0, *to_next_worker = 0;
+  u32 next_worker_index = 0;
+  u32 current_worker_index = ~0;
+
+  if (PREDICT_FALSE (handoff_queue_elt_by_worker_index == 0))
+    {
+      vec_validate (handoff_queue_elt_by_worker_index, tm->n_vlib_mains - 1);
+
+      vec_validate_init_empty (congested_handoff_queue_by_worker_index,
+			       hm->first_worker_index + hm->num_workers - 1,
+			       (vlib_frame_queue_t *) (~0));
+    }
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      u32 sw_if_index0;
+      u32 hash;
+      u64 hash_key;
+      per_inteface_handoff_data_t *ihd0;
+      u32 index0;
+
+      bi0 = from[0];
+      from += 1;
+      n_left_from -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      ASSERT (hm->if_data);
+      ihd0 = vec_elt_at_index (hm->if_data, sw_if_index0);
+
+      next_worker_index = hm->first_worker_index;
+
+      /*
+       * Force unknown traffic onto worker 0,
+       * and into ethernet-input. $$$$ add more hashes.
+       */
+
+      /* Compute ingress LB hash */
+      hash_key = hm->hash_fn ((ethernet_header_t *) b0->data);
+      hash = (u32) clib_xxhash (hash_key);
+
+      /* if input node did not specify next index, then packet
+         should go to eternet-input */
+      if (PREDICT_FALSE ((b0->flags & BUFFER_HANDOFF_NEXT_VALID) == 0))
+	vnet_buffer (b0)->handoff.next_index =
+	  HANDOFF_DISPATCH_NEXT_ETHERNET_INPUT;
+      else if (vnet_buffer (b0)->handoff.next_index ==
+	       HANDOFF_DISPATCH_NEXT_IP4_INPUT
+	       || vnet_buffer (b0)->handoff.next_index ==
+	       HANDOFF_DISPATCH_NEXT_IP6_INPUT
+	       || vnet_buffer (b0)->handoff.next_index ==
+	       HANDOFF_DISPATCH_NEXT_MPLS_INPUT)
+	vlib_buffer_advance (b0, (sizeof (ethernet_header_t)));
+
+      if (PREDICT_TRUE (is_pow2 (vec_len (ihd0->workers))))
+	index0 = hash & (vec_len (ihd0->workers) - 1);
+      else
+	index0 = hash % vec_len (ihd0->workers);
+
+      next_worker_index += ihd0->workers[index0];
+
+      if (next_worker_index != current_worker_index)
+	{
+	  if (hf)
+	    hf->n_vectors = VLIB_FRAME_SIZE - n_left_to_next_worker;
+
+	  hf = vlib_get_worker_handoff_queue_elt (hm->frame_queue_index,
+						  next_worker_index,
+						  handoff_queue_elt_by_worker_index);
+
+	  n_left_to_next_worker = VLIB_FRAME_SIZE - hf->n_vectors;
+	  to_next_worker = &hf->buffer_index[hf->n_vectors];
+	  current_worker_index = next_worker_index;
+	}
+
+      /* enqueue to correct worker thread */
+      to_next_worker[0] = bi0;
+      to_next_worker++;
+      n_left_to_next_worker--;
+
+      if (n_left_to_next_worker == 0)
+	{
+	  hf->n_vectors = VLIB_FRAME_SIZE;
+	  vlib_put_frame_queue_elt (hf);
+	  current_worker_index = ~0;
+	  handoff_queue_elt_by_worker_index[next_worker_index] = 0;
+	  hf = 0;
+	}
+
+      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			 && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	{
+	  worker_handoff_trace_t *t =
+	    vlib_add_trace (vm, node, b0, sizeof (*t));
+	  t->sw_if_index = sw_if_index0;
+	  t->next_worker_index = next_worker_index - hm->first_worker_index;
+	  t->buffer_index = bi0;
+	}
+
+    }
+
+  if (hf)
+    hf->n_vectors = VLIB_FRAME_SIZE - n_left_to_next_worker;
+
+  /* Ship frames to the worker nodes */
+  for (i = 0; i < vec_len (handoff_queue_elt_by_worker_index); i++)
+    {
+      if (handoff_queue_elt_by_worker_index[i])
+	{
+	  hf = handoff_queue_elt_by_worker_index[i];
+	  /*
+	   * It works better to let the handoff node
+	   * rate-adapt, always ship the handoff queue element.
+	   */
+	  if (1 || hf->n_vectors == hf->last_n_vectors)
+	    {
+	      vlib_put_frame_queue_elt (hf);
+	      handoff_queue_elt_by_worker_index[i] = 0;
+	    }
+	  else
+	    hf->last_n_vectors = hf->n_vectors;
+	}
+      congested_handoff_queue_by_worker_index[i] =
+	(vlib_frame_queue_t *) (~0);
+    }
+  hf = 0;
+  current_worker_index = ~0;
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (worker_handoff_node) = {
+  .function = worker_handoff_node_fn,
+  .name = "worker-handoff",
+  .vector_size = sizeof (u32),
+  .format_trace = format_worker_handoff_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (worker_handoff_node, worker_handoff_node_fn)
+/* *INDENT-ON* */
+
+int
+interface_handoff_enable_disable (vlib_main_t * vm, u32 sw_if_index,
+				  uword * bitmap, int enable_disable)
+{
+  handoff_main_t *hm = &handoff_main;
+  vnet_sw_interface_t *sw;
+  vnet_main_t *vnm = vnet_get_main ();
+  per_inteface_handoff_data_t *d;
+  int i, rv = 0;
+
+  if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+  sw = vnet_get_sw_interface (vnm, sw_if_index);
+  if (sw->type != VNET_SW_INTERFACE_TYPE_HARDWARE)
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+  if (clib_bitmap_last_set (bitmap) >= hm->num_workers)
+    return VNET_API_ERROR_INVALID_WORKER;
+
+  if (hm->frame_queue_index == ~0)
+    hm->frame_queue_index =
+      vlib_frame_queue_main_init (handoff_dispatch_node.index, 0);
+
+  vec_validate (hm->if_data, sw_if_index);
+  d = vec_elt_at_index (hm->if_data, sw_if_index);
+
+  vec_free (d->workers);
+  vec_free (d->workers_bitmap);
+
+  if (enable_disable)
+    {
+      d->workers_bitmap = bitmap;
+      /* *INDENT-OFF* */
+      clib_bitmap_foreach (i, bitmap,
+	({
+	  vec_add1(d->workers, i);
+	}));
+      /* *INDENT-ON* */
+    }
+
+  vnet_feature_enable_disable ("device-input", "worker-handoff",
+			       sw_if_index, enable_disable, 0, 0);
+  return rv;
+}
+
+static clib_error_t *
+set_interface_handoff_command_fn (vlib_main_t * vm,
+				  unformat_input_t * input,
+				  vlib_cli_command_t * cmd)
+{
+  handoff_main_t *hm = &handoff_main;
+  u32 sw_if_index = ~0;
+  int enable_disable = 1;
+  uword *bitmap = 0;
+  u32 sym = ~0;
+
+  int rv = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "disable"))
+	enable_disable = 0;
+      else if (unformat (input, "workers %U", unformat_bitmap_list, &bitmap))
+	;
+      else if (unformat (input, "%U", unformat_vnet_sw_interface,
+			 vnet_get_main (), &sw_if_index))
+	;
+      else if (unformat (input, "symmetrical"))
+	sym = 1;
+      else if (unformat (input, "asymmetrical"))
+	sym = 0;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "Please specify an interface...");
+
+  if (bitmap == 0)
+    return clib_error_return (0, "Please specify list of workers...");
+
+  rv =
+    interface_handoff_enable_disable (vm, sw_if_index, bitmap,
+				      enable_disable);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case VNET_API_ERROR_INVALID_SW_IF_INDEX:
+      return clib_error_return (0, "Invalid interface");
+      break;
+
+    case VNET_API_ERROR_INVALID_WORKER:
+      return clib_error_return (0, "Invalid worker(s)");
+      break;
+
+    case VNET_API_ERROR_UNIMPLEMENTED:
+      return clib_error_return (0,
+				"Device driver doesn't support redirection");
+      break;
+
+    default:
+      return clib_error_return (0, "unknown return value %d", rv);
+    }
+
+  if (sym == 1)
+    hm->hash_fn = eth_get_sym_key;
+  else if (sym == 0)
+    hm->hash_fn = eth_get_key;
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_handoff_command, static) = {
+  .path = "set interface handoff",
+  .short_help =
+  "set interface handoff <interface-name> workers <workers-list> [symmetrical|asymmetrical]",
+  .function = set_interface_handoff_command_fn,
+};
+/* *INDENT-ON* */
+
+typedef struct
+{
+  u32 buffer_index;
+  u32 next_index;
+  u32 sw_if_index;
+} handoff_dispatch_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_handoff_dispatch_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  handoff_dispatch_trace_t *t = va_arg (*args, handoff_dispatch_trace_t *);
+
+  s = format (s, "handoff-dispatch: sw_if_index %d next_index %d buffer 0x%x",
+	      t->sw_if_index, t->next_index, t->buffer_index);
+  return s;
+}
+
+#define foreach_handoff_dispatch_error \
+_(EXAMPLE, "example packets")
+
+typedef enum
+{
+#define _(sym,str) HANDOFF_DISPATCH_ERROR_##sym,
+  foreach_handoff_dispatch_error
+#undef _
+    HANDOFF_DISPATCH_N_ERROR,
+} handoff_dispatch_error_t;
+
+static char *handoff_dispatch_error_strings[] = {
+#define _(sym,string) string,
+  foreach_handoff_dispatch_error
+#undef _
+};
+
+static uword
+handoff_dispatch_node_fn (vlib_main_t * vm,
+			  vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  handoff_dispatch_next_t next_index;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+	  u32 sw_if_index0, sw_if_index1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  next0 = vnet_buffer (b0)->handoff.next_index;
+	  next1 = vnet_buffer (b1)->handoff.next_index;
+
+	  if (PREDICT_FALSE (vm->trace_main.trace_active_hint))
+	    {
+	      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+		{
+		  vlib_trace_buffer (vm, node, next0, b0,	/* follow_chain */
+				     0);
+		  handoff_dispatch_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+		  t->sw_if_index = sw_if_index0;
+		  t->next_index = next0;
+		  t->buffer_index = bi0;
+		}
+	      if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
+		{
+		  vlib_trace_buffer (vm, node, next1, b1,	/* follow_chain */
+				     0);
+		  handoff_dispatch_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+		  t->sw_if_index = sw_if_index1;
+		  t->next_index = next1;
+		  t->buffer_index = bi1;
+		}
+	    }
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 sw_if_index0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  next0 = vnet_buffer (b0)->handoff.next_index;
+
+	  if (PREDICT_FALSE (vm->trace_main.trace_active_hint))
+	    {
+	      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+		{
+		  vlib_trace_buffer (vm, node, next0, b0,	/* follow_chain */
+				     0);
+		  handoff_dispatch_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+		  t->sw_if_index = sw_if_index0;
+		  t->next_index = next0;
+		  t->buffer_index = bi0;
+		}
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (handoff_dispatch_node) = {
+  .function = handoff_dispatch_node_fn,
+  .name = "handoff-dispatch",
+  .vector_size = sizeof (u32),
+  .format_trace = format_handoff_dispatch_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .flags = VLIB_NODE_FLAG_IS_HANDOFF,
+
+  .n_errors = ARRAY_LEN(handoff_dispatch_error_strings),
+  .error_strings = handoff_dispatch_error_strings,
+
+  .n_next_nodes = HANDOFF_DISPATCH_N_NEXT,
+
+  .next_nodes = {
+        [HANDOFF_DISPATCH_NEXT_DROP] = "error-drop",
+        [HANDOFF_DISPATCH_NEXT_ETHERNET_INPUT] = "ethernet-input",
+        [HANDOFF_DISPATCH_NEXT_IP4_INPUT] = "ip4-input-no-checksum",
+        [HANDOFF_DISPATCH_NEXT_IP6_INPUT] = "ip6-input",
+        [HANDOFF_DISPATCH_NEXT_MPLS_INPUT] = "mpls-input",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (handoff_dispatch_node, handoff_dispatch_node_fn)
+/* *INDENT-ON* */
+
+clib_error_t *
+handoff_init (vlib_main_t * vm)
+{
+  handoff_main_t *hm = &handoff_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  clib_error_t *error;
+  uword *p;
+
+  if ((error = vlib_call_init_function (vm, threads_init)))
+    return error;
+
+  vlib_thread_registration_t *tr;
+  /* Only the standard vnet worker threads are supported */
+  p = hash_get_mem (tm->thread_registrations_by_name, "workers");
+  if (p)
+    {
+      tr = (vlib_thread_registration_t *) p[0];
+      if (tr)
+	{
+	  hm->num_workers = tr->count;
+	  hm->first_worker_index = tr->first_index;
+	}
+    }
+
+  hm->hash_fn = eth_get_key;
+
+  hm->vlib_main = vm;
+  hm->vnet_main = &vnet_main;
+
+  hm->frame_queue_index = ~0;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (handoff_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/handoff.h b/src/vnet/handoff.h
new file mode 100644
index 00000000..815206a9
--- /dev/null
+++ b/src/vnet/handoff.h
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_vnet_handoff_h
+#define included_vnet_handoff_h
+
+#include <vlib/vlib.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/mpls/packet.h>
+
+typedef enum
+{
+  HANDOFF_DISPATCH_NEXT_IP4_INPUT,
+  HANDOFF_DISPATCH_NEXT_IP6_INPUT,
+  HANDOFF_DISPATCH_NEXT_MPLS_INPUT,
+  HANDOFF_DISPATCH_NEXT_ETHERNET_INPUT,
+  HANDOFF_DISPATCH_NEXT_DROP,
+  HANDOFF_DISPATCH_N_NEXT,
+} handoff_dispatch_next_t;
+
+
+static inline u64
+ipv4_get_key (ip4_header_t * ip)
+{
+  u64 hash_key;
+
+  hash_key = *((u64 *) (&ip->address_pair)) ^ ip->protocol;
+
+  return hash_key;
+}
+
+static inline u64
+ipv6_get_key (ip6_header_t * ip)
+{
+  u64 hash_key;
+
+  hash_key = ip->src_address.as_u64[0] ^
+    rotate_left (ip->src_address.as_u64[1], 13) ^
+    rotate_left (ip->dst_address.as_u64[0], 26) ^
+    rotate_left (ip->dst_address.as_u64[1], 39) ^ ip->protocol;
+
+  return hash_key;
+}
+
+#define MPLS_BOTTOM_OF_STACK_BIT_MASK   0x00000100U
+#define MPLS_LABEL_MASK                 0xFFFFF000U
+
+static inline u64
+mpls_get_key (mpls_unicast_header_t * m)
+{
+  u64 hash_key;
+  u8 ip_ver;
+
+
+  /* find the bottom of the MPLS label stack. */
+  if (PREDICT_TRUE (m->label_exp_s_ttl &
+		    clib_net_to_host_u32 (MPLS_BOTTOM_OF_STACK_BIT_MASK)))
+    {
+      goto bottom_lbl_found;
+    }
+  m++;
+
+  if (PREDICT_TRUE (m->label_exp_s_ttl &
+		    clib_net_to_host_u32 (MPLS_BOTTOM_OF_STACK_BIT_MASK)))
+    {
+      goto bottom_lbl_found;
+    }
+  m++;
+
+  if (m->label_exp_s_ttl &
+      clib_net_to_host_u32 (MPLS_BOTTOM_OF_STACK_BIT_MASK))
+    {
+      goto bottom_lbl_found;
+    }
+  m++;
+
+  if (m->label_exp_s_ttl &
+      clib_net_to_host_u32 (MPLS_BOTTOM_OF_STACK_BIT_MASK))
+    {
+      goto bottom_lbl_found;
+    }
+  m++;
+
+  if (m->label_exp_s_ttl &
+      clib_net_to_host_u32 (MPLS_BOTTOM_OF_STACK_BIT_MASK))
+    {
+      goto bottom_lbl_found;
+    }
+
+  /* the bottom label was not found - use the last label */
+  hash_key = m->label_exp_s_ttl & clib_net_to_host_u32 (MPLS_LABEL_MASK);
+
+  return hash_key;
+
+bottom_lbl_found:
+  m++;
+  ip_ver = (*((u8 *) m) >> 4);
+
+  /* find out if it is IPV4 or IPV6 header */
+  if (PREDICT_TRUE (ip_ver == 4))
+    {
+      hash_key = ipv4_get_key ((ip4_header_t *) m);
+    }
+  else if (PREDICT_TRUE (ip_ver == 6))
+    {
+      hash_key = ipv6_get_key ((ip6_header_t *) m);
+    }
+  else
+    {
+      /* use the bottom label */
+      hash_key =
+	(m - 1)->label_exp_s_ttl & clib_net_to_host_u32 (MPLS_LABEL_MASK);
+    }
+
+  return hash_key;
+
+}
+
+static inline u64
+eth_get_sym_key (ethernet_header_t * h0)
+{
+  u64 hash_key;
+
+  if (PREDICT_TRUE (h0->type) == clib_host_to_net_u16 (ETHERNET_TYPE_IP4))
+    {
+      ip4_header_t *ip = (ip4_header_t *) (h0 + 1);
+      hash_key =
+	(u64) (ip->src_address.as_u32 ^
+	       ip->dst_address.as_u32 ^ ip->protocol);
+    }
+  else if (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_IP6))
+    {
+      ip6_header_t *ip = (ip6_header_t *) (h0 + 1);
+      hash_key = (u64) (ip->src_address.as_u64[0] ^
+			ip->src_address.as_u64[1] ^
+			ip->dst_address.as_u64[0] ^
+			ip->dst_address.as_u64[1] ^ ip->protocol);
+    }
+  else if (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST))
+    {
+      hash_key = mpls_get_key ((mpls_unicast_header_t *) (h0 + 1));
+    }
+  else
+    if (PREDICT_FALSE
+	((h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_VLAN))
+	 || (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_DOT1AD))))
+    {
+      ethernet_vlan_header_t *outer = (ethernet_vlan_header_t *) (h0 + 1);
+
+      outer = (outer->type == clib_host_to_net_u16 (ETHERNET_TYPE_VLAN)) ?
+	outer + 1 : outer;
+      if (PREDICT_TRUE (outer->type) ==
+	  clib_host_to_net_u16 (ETHERNET_TYPE_IP4))
+	{
+	  ip4_header_t *ip = (ip4_header_t *) (outer + 1);
+	  hash_key =
+	    (u64) (ip->src_address.as_u32 ^
+		   ip->dst_address.as_u32 ^ ip->protocol);
+	}
+      else if (outer->type == clib_host_to_net_u16 (ETHERNET_TYPE_IP6))
+	{
+	  ip6_header_t *ip = (ip6_header_t *) (outer + 1);
+	  hash_key =
+	    (u64) (ip->src_address.as_u64[0] ^ ip->src_address.as_u64[1] ^
+		   ip->dst_address.as_u64[0] ^
+		   ip->dst_address.as_u64[1] ^ ip->protocol);
+	}
+      else if (outer->type ==
+	       clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST))
+	{
+	  hash_key = mpls_get_key ((mpls_unicast_header_t *) (outer + 1));
+	}
+      else
+	{
+	  hash_key = outer->type;
+	}
+    }
+  else
+    {
+      hash_key = 0;
+    }
+
+  return hash_key;
+}
+
+static inline u64
+eth_get_key (ethernet_header_t * h0)
+{
+  u64 hash_key;
+
+  if (PREDICT_TRUE (h0->type) == clib_host_to_net_u16 (ETHERNET_TYPE_IP4))
+    {
+      hash_key = ipv4_get_key ((ip4_header_t *) (h0 + 1));
+    }
+  else if (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_IP6))
+    {
+      hash_key = ipv6_get_key ((ip6_header_t *) (h0 + 1));
+    }
+  else if (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST))
+    {
+      hash_key = mpls_get_key ((mpls_unicast_header_t *) (h0 + 1));
+    }
+  else if ((h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_VLAN)) ||
+	   (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_DOT1AD)))
+    {
+      ethernet_vlan_header_t *outer = (ethernet_vlan_header_t *) (h0 + 1);
+
+      outer = (outer->type == clib_host_to_net_u16 (ETHERNET_TYPE_VLAN)) ?
+	outer + 1 : outer;
+      if (PREDICT_TRUE (outer->type) ==
+	  clib_host_to_net_u16 (ETHERNET_TYPE_IP4))
+	{
+	  hash_key = ipv4_get_key ((ip4_header_t *) (outer + 1));
+	}
+      else if (outer->type == clib_host_to_net_u16 (ETHERNET_TYPE_IP6))
+	{
+	  hash_key = ipv6_get_key ((ip6_header_t *) (outer + 1));
+	}
+      else if (outer->type ==
+	       clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST))
+	{
+	  hash_key = mpls_get_key ((mpls_unicast_header_t *) (outer + 1));
+	}
+      else
+	{
+	  hash_key = outer->type;
+	}
+    }
+  else
+    {
+      hash_key = 0;
+    }
+
+  return hash_key;
+}
+
+#endif /* included_vnet_handoff_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/hdlc/error.def b/src/vnet/hdlc/error.def
new file mode 100644
index 00000000..16e001bb
--- /dev/null
+++ b/src/vnet/hdlc/error.def
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * hdlc_error.def: hdlc errors
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+hdlc_error (NONE, "no error")
+hdlc_error (UNKNOWN_PROTOCOL, "unknown hdlc protocol")
+hdlc_error (UNKNOWN_ADDRESS_CONTROL, "address, control != 0x0f00")
diff --git a/src/vnet/hdlc/hdlc.c b/src/vnet/hdlc/hdlc.c
new file mode 100644
index 00000000..174085ac
--- /dev/null
+++ b/src/vnet/hdlc/hdlc.c
@@ -0,0 +1,249 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * hdlc.c: hdlc
+ *
+ * Copyright (c) 2010 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/hdlc/hdlc.h>
+
+/* Global main structure. */
+hdlc_main_t hdlc_main;
+
+u8 * format_hdlc_protocol (u8 * s, va_list * args)
+{
+  hdlc_protocol_t p = va_arg (*args, u32);
+  hdlc_main_t * pm = &hdlc_main;
+  hdlc_protocol_info_t * pi = hdlc_get_protocol_info (pm, p);
+
+  if (pi)
+    s = format (s, "%s", pi->name);
+  else
+    s = format (s, "0x%04x", p);
+
+  return s;
+}
+
+u8 * format_hdlc_header_with_length (u8 * s, va_list * args)
+{
+  hdlc_main_t * pm = &hdlc_main;
+  hdlc_header_t * h = va_arg (*args, hdlc_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+  hdlc_protocol_t p = clib_net_to_host_u16 (h->protocol);
+  uword indent, header_bytes;
+
+  header_bytes = sizeof (h[0]);
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    return format (s, "hdlc header truncated");
+
+  indent = format_get_indent (s);
+
+  s = format (s, "HDLC %U", format_hdlc_protocol, p);
+
+  if (h->address != 0xff)
+    s = format (s, ", address 0x%02x", h->address);
+  if (h->control != 0x03)
+    s = format (s, ", control 0x%02x", h->control);
+
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    {
+      hdlc_protocol_info_t * pi = hdlc_get_protocol_info (pm, p);
+      vlib_node_t * node = vlib_get_node (pm->vlib_main, pi->node_index);
+      if (node->format_buffer)
+	s = format (s, "\n%U%U",
+		    format_white_space, indent,
+		    node->format_buffer, (void *) (h + 1),
+		    max_header_bytes - header_bytes);
+    }
+
+  return s;
+}
+
+u8 * format_hdlc_header (u8 * s, va_list * args)
+{
+  hdlc_header_t * h = va_arg (*args, hdlc_header_t *);
+  return format (s, "%U", format_hdlc_header_with_length, h, 0);
+}
+
+/* Returns hdlc protocol as an int in host byte order. */
+uword
+unformat_hdlc_protocol_host_byte_order (unformat_input_t * input,
+				       va_list * args)
+{
+  u16 * result = va_arg (*args, u16 *);
+  hdlc_main_t * pm = &hdlc_main;
+  int p, i;
+
+  /* Numeric type. */
+  if (unformat (input, "0x%x", &p)
+      || unformat (input, "%d", &p))
+    {
+      if (p >= (1 << 16))
+	return 0;
+      *result = p;
+      return 1;
+    }
+
+  /* Named type. */
+  if (unformat_user (input, unformat_vlib_number_by_name,
+		     pm->protocol_info_by_name, &i))
+    {
+      hdlc_protocol_info_t * pi = vec_elt_at_index (pm->protocol_infos, i);
+      *result = pi->protocol;
+      return 1;
+    }
+
+  return 0;
+}
+
+uword
+unformat_hdlc_protocol_net_byte_order (unformat_input_t * input,
+				      va_list * args)
+{
+  u16 * result = va_arg (*args, u16 *);
+  if (! unformat_user (input, unformat_hdlc_protocol_host_byte_order, result))
+    return 0;
+  *result = clib_host_to_net_u16 ((u16) *result);
+  return 1;
+}
+
+uword
+unformat_hdlc_header (unformat_input_t * input, va_list * args)
+{
+  u8 ** result = va_arg (*args, u8 **);
+  hdlc_header_t _h, * h = &_h;
+  u16 p;
+
+  if (! unformat (input, "%U",
+		  unformat_hdlc_protocol_host_byte_order, &p))
+    return 0;
+
+  h->address = 0xff;
+  h->control = 0x03;
+  h->protocol = clib_host_to_net_u16 (p);
+
+  /* Add header to result. */
+  {
+    void * p;
+    u32 n_bytes = sizeof (h[0]);
+
+    vec_add2 (*result, p, n_bytes);
+    clib_memcpy (p, h, n_bytes);
+  }
+  
+  return 1;
+}
+
+static u8*
+hdlc_build_rewrite (vnet_main_t * vnm,
+		    u32 sw_if_index,
+		    vnet_link_t link_type,
+		    const void *dst_address)
+{
+  hdlc_header_t * h;
+  u8* rewrite = NULL;
+  hdlc_protocol_t protocol;
+
+  switch (link_type) {
+#define _(a,b) case VNET_LINK_##a: protocol = HDLC_PROTOCOL_##b; break
+    _ (IP4, ip4);
+    _ (IP6, ip6);
+    _ (MPLS, mpls_unicast);
+#undef _
+  default:
+      return (NULL);
+  }
+
+  vec_validate(rewrite, sizeof(*h)-1);
+  h = (hdlc_header_t *)rewrite;
+  h->address = 0x0f;
+  h->control = 0x00;
+  h->protocol = clib_host_to_net_u16 (protocol);
+		     
+  return (rewrite);
+}
+
+VNET_HW_INTERFACE_CLASS (hdlc_hw_interface_class) = {
+  .name = "HDLC",
+  .format_header = format_hdlc_header_with_length,
+  .unformat_header = unformat_hdlc_header,
+  .build_rewrite = hdlc_build_rewrite,
+  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
+};
+
+static void add_protocol (hdlc_main_t * pm,
+			  hdlc_protocol_t protocol,
+			  char * protocol_name)
+{
+  hdlc_protocol_info_t * pi;
+  u32 i;
+
+  vec_add2 (pm->protocol_infos, pi, 1);
+  i = pi - pm->protocol_infos;
+
+  pi->name = protocol_name;
+  pi->protocol = protocol;
+  pi->next_index = pi->node_index = ~0;
+
+  hash_set (pm->protocol_info_by_protocol, protocol, i);
+  hash_set_mem (pm->protocol_info_by_name, pi->name, i);
+}
+
+static clib_error_t * hdlc_init (vlib_main_t * vm)
+{
+  hdlc_main_t * pm = &hdlc_main;
+
+  memset (pm, 0, sizeof (pm[0]));
+  pm->vlib_main = vm;
+
+  pm->protocol_info_by_name = hash_create_string (0, sizeof (uword));
+  pm->protocol_info_by_protocol = hash_create (0, sizeof (uword));
+
+#define _(n,s) add_protocol (pm, HDLC_PROTOCOL_##s, #s);
+  foreach_hdlc_protocol
+#undef _
+
+  return vlib_call_init_function (vm, hdlc_input_init);
+}
+
+VLIB_INIT_FUNCTION (hdlc_init);
+
+hdlc_main_t * hdlc_get_main (vlib_main_t * vm)
+{
+  vlib_call_init_function (vm, hdlc_init);
+  return &hdlc_main;
+}
+
diff --git a/src/vnet/hdlc/hdlc.h b/src/vnet/hdlc/hdlc.h
new file mode 100644
index 00000000..73b15c2f
--- /dev/null
+++ b/src/vnet/hdlc/hdlc.h
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * hdlc.h: types/functions for hdlc.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_hdlc_h
+#define included_hdlc_h
+
+#include <vnet/vnet.h>
+#include <vnet/hdlc/packet.h>
+#include <vnet/pg/pg.h>
+
+extern vnet_hw_interface_class_t hdlc_hw_interface_class;
+
+typedef enum {
+#define hdlc_error(n,s) HDLC_ERROR_##n,
+#include <vnet/hdlc/error.def>
+#undef hdlc_error
+  HDLC_N_ERROR,
+} hdlc_error_t;
+
+typedef struct {
+  /* Name (a c string). */
+  char * name;
+
+  /* HDLC protocol type in host byte order. */
+  hdlc_protocol_t protocol;
+
+  /* Node which handles this type. */
+  u32 node_index;
+
+  /* Next index for this type. */
+  u32 next_index;
+} hdlc_protocol_info_t;
+
+typedef struct {
+  vlib_main_t * vlib_main;
+
+  hdlc_protocol_info_t * protocol_infos;
+
+  /* Hash tables mapping name/protocol to protocol info index. */
+  uword * protocol_info_by_name, * protocol_info_by_protocol;
+} hdlc_main_t;
+
+always_inline hdlc_protocol_info_t *
+hdlc_get_protocol_info (hdlc_main_t * em, hdlc_protocol_t protocol)
+{
+  uword * p = hash_get (em->protocol_info_by_protocol, protocol);
+  return p ? vec_elt_at_index (em->protocol_infos, p[0]) : 0;
+}
+
+extern hdlc_main_t hdlc_main;
+
+/* Register given node index to take input for given hdlc type. */
+void
+hdlc_register_input_type (vlib_main_t * vm,
+			 hdlc_protocol_t protocol,
+			 u32 node_index);
+
+void hdlc_set_adjacency (vnet_rewrite_header_t * rw,
+			uword max_data_bytes,
+			hdlc_protocol_t protocol);
+
+format_function_t format_hdlc_protocol;
+format_function_t format_hdlc_header;
+format_function_t format_hdlc_header_with_length;
+
+/* Parse hdlc protocol as 0xXXXX or protocol name.
+   In either host or network byte order. */
+unformat_function_t unformat_hdlc_protocol_host_byte_order;
+unformat_function_t unformat_hdlc_protocol_net_byte_order;
+
+/* Parse hdlc header. */
+unformat_function_t unformat_hdlc_header;
+unformat_function_t unformat_pg_hdlc_header;
+
+always_inline void
+hdlc_setup_node (vlib_main_t * vm, u32 node_index)
+{
+  vlib_node_t * n = vlib_get_node (vm, node_index);
+  pg_node_t * pn = pg_get_node (node_index);
+
+  n->format_buffer = format_hdlc_header_with_length;
+  n->unformat_buffer = unformat_hdlc_header;
+  pn->unformat_edit = unformat_pg_hdlc_header;
+}
+
+void
+hdlc_register_input_protocol (vlib_main_t * vm,
+			     hdlc_protocol_t protocol,
+			     u32 node_index);
+
+#endif /* included_hdlc_h */
diff --git a/src/vnet/hdlc/node.c b/src/vnet/hdlc/node.c
new file mode 100644
index 00000000..4fe0296a
--- /dev/null
+++ b/src/vnet/hdlc/node.c
@@ -0,0 +1,351 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * hdlc_node.c: hdlc packet processing
+ *
+ * Copyright (c) 2010 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/hdlc/hdlc.h>
+#include <vppinfra/sparse_vec.h>
+
+#define foreach_hdlc_input_next			\
+  _ (PUNT, "error-punt")			\
+  _ (DROP, "error-drop")
+
+typedef enum {
+#define _(s,n) HDLC_INPUT_NEXT_##s,
+  foreach_hdlc_input_next
+#undef _
+  HDLC_INPUT_N_NEXT,
+} hdlc_input_next_t;
+
+typedef struct {
+  u8 packet_data[32];
+} hdlc_input_trace_t;
+
+static u8 * format_hdlc_input_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  hdlc_input_trace_t * t = va_arg (*va, hdlc_input_trace_t *);
+
+  s = format (s, "%U", format_hdlc_header, t->packet_data);
+
+  return s;
+}
+
+typedef struct {
+  /* Sparse vector mapping hdlc protocol in network byte order
+     to next index. */
+  u16 * next_by_protocol;
+
+  u32 * sparse_index_by_next_index;
+} hdlc_input_runtime_t;
+
+static uword
+hdlc_input (vlib_main_t * vm,
+	   vlib_node_runtime_t * node,
+	   vlib_frame_t * from_frame)
+{
+  hdlc_input_runtime_t * rt = (void *) node->runtime_data;
+  u32 n_left_from, next_index, i_next, * from, * to_next;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node,
+				   from,
+				   n_left_from,
+				   sizeof (from[0]),
+				   sizeof (hdlc_input_trace_t));
+
+  next_index = node->cached_next_index;
+  i_next = vec_elt (rt->sparse_index_by_next_index, next_index);
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t * b0, * b1;
+	  hdlc_header_t * h0, * h1;
+	  u32 i0, i1, len0, len1, protocol0, protocol1, enqueue_code;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * b2, * b3;
+
+	    b2 = vlib_get_buffer (vm, from[2]);
+	    b3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (b2, LOAD);
+	    vlib_prefetch_buffer_header (b3, LOAD);
+
+	    CLIB_PREFETCH (b2->data, sizeof (h0[0]), LOAD);
+	    CLIB_PREFETCH (b3->data, sizeof (h1[0]), LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  h0 = (void *) (b0->data + b0->current_data);
+	  h1 = (void *) (b1->data + b1->current_data);
+
+	  protocol0 = h0->protocol;
+	  protocol1 = h1->protocol;
+
+	  /* Add padding bytes for OSI protocols. */
+	  len0 = sizeof (h0[0]);
+	  len1 = sizeof (h1[0]);
+	  
+	  len0 += protocol0 == clib_host_to_net_u16 (HDLC_PROTOCOL_osi);
+	  len1 += protocol1 == clib_host_to_net_u16 (HDLC_PROTOCOL_osi);
+
+	  b0->current_data += len0;
+	  b1->current_data += len1;
+
+	  b0->current_length -= len0;
+	  b1->current_length -= len1;
+
+	  /* Index sparse array with network byte order. */
+	  sparse_vec_index2 (rt->next_by_protocol, protocol0, protocol1, &i0, &i1);
+
+	  b0->error = node->errors[i0 == SPARSE_VEC_INVALID_INDEX ? HDLC_ERROR_UNKNOWN_PROTOCOL : HDLC_ERROR_NONE];
+	  b1->error = node->errors[i1 == SPARSE_VEC_INVALID_INDEX ? HDLC_ERROR_UNKNOWN_PROTOCOL : HDLC_ERROR_NONE];
+
+	  enqueue_code = (i0 != i_next) + 2*(i1 != i_next);
+
+	  if (PREDICT_FALSE (enqueue_code != 0))
+	    {
+	      switch (enqueue_code)
+		{
+		case 1:
+		  /* A B A */
+		  to_next[-2] = bi1;
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node, vec_elt (rt->next_by_protocol, i0), bi0);
+		  break;
+
+		case 2:
+		  /* A A B */
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node, vec_elt (rt->next_by_protocol, i1), bi1);
+		  break;
+
+		case 3:
+		  /* A B B or A B C */
+		  to_next -= 2;
+		  n_left_to_next += 2;
+		  vlib_set_next_frame_buffer (vm, node, vec_elt (rt->next_by_protocol, i0), bi0);
+		  vlib_set_next_frame_buffer (vm, node, vec_elt (rt->next_by_protocol, i1), bi1);
+		  if (i0 == i1)
+		    {
+		      vlib_put_next_frame (vm, node, next_index,
+					   n_left_to_next);
+		      i_next = i1;
+		      next_index = vec_elt (rt->next_by_protocol, i_next);
+		      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+		    }
+		}
+	    }
+	}
+    
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t * b0;
+	  hdlc_header_t * h0;
+	  u32 i0, len0, protocol0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  h0 = (void *) (b0->data + b0->current_data);
+
+	  protocol0 = h0->protocol;
+
+	  /* Add padding bytes for OSI protocols. */
+	  len0 = sizeof (h0[0]);
+	  len0 += protocol0 == clib_host_to_net_u16 (HDLC_PROTOCOL_osi);
+
+	  b0->current_data += len0;
+	  b0->current_length -= len0;
+
+	  i0 = sparse_vec_index (rt->next_by_protocol, protocol0);
+
+	  b0->error = node->errors[i0 == SPARSE_VEC_INVALID_INDEX ? HDLC_ERROR_UNKNOWN_PROTOCOL : HDLC_ERROR_NONE];
+	  
+	  /* Sent packet to wrong next? */
+	  if (PREDICT_FALSE (i0 != i_next))
+	    {
+	      /* Return old frame; remove incorrectly enqueued packet. */
+	      vlib_put_next_frame (vm, node, next_index, n_left_to_next + 1);
+
+	      /* Send to correct next. */
+	      i_next = i0;
+	      next_index = vec_elt (rt->next_by_protocol, i_next);
+	      vlib_get_next_frame (vm, node, next_index,
+				   to_next, n_left_to_next);
+
+	      to_next[0] = bi0;
+	      to_next += 1;
+	      n_left_to_next -= 1;
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+static char * hdlc_error_strings[] = {
+#define hdlc_error(n,s) s,
+#include "error.def"
+#undef hdlc_error
+};
+
+VLIB_REGISTER_NODE (hdlc_input_node) = {
+  .function = hdlc_input,
+  .name = "hdlc-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .runtime_data_bytes = sizeof (hdlc_input_runtime_t),
+
+  .n_errors = HDLC_N_ERROR,
+  .error_strings = hdlc_error_strings,
+
+  .n_next_nodes = HDLC_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [HDLC_INPUT_NEXT_##s] = n,
+    foreach_hdlc_input_next
+#undef _
+  },
+
+  .format_buffer = format_hdlc_header_with_length,
+  .format_trace = format_hdlc_input_trace,
+  .unformat_buffer = unformat_hdlc_header,
+};
+
+static clib_error_t * hdlc_input_init (vlib_main_t * vm)
+{
+  hdlc_input_runtime_t * rt;
+
+  {
+    clib_error_t * error = vlib_call_init_function (vm, hdlc_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  hdlc_setup_node (vm, hdlc_input_node.index);
+
+  rt = vlib_node_get_runtime_data (vm, hdlc_input_node.index);
+
+  rt->next_by_protocol = sparse_vec_new
+    (/* elt bytes */ sizeof (rt->next_by_protocol[0]),
+     /* bits in index */ BITS (((hdlc_header_t *) 0)->protocol));
+
+  vec_validate (rt->sparse_index_by_next_index, HDLC_INPUT_NEXT_DROP);
+  vec_validate (rt->sparse_index_by_next_index, HDLC_INPUT_NEXT_PUNT);
+  rt->sparse_index_by_next_index[HDLC_INPUT_NEXT_DROP]
+    = SPARSE_VEC_INVALID_INDEX;
+  rt->sparse_index_by_next_index[HDLC_INPUT_NEXT_PUNT]
+    = SPARSE_VEC_INVALID_INDEX;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (hdlc_input_init);
+
+void
+hdlc_register_input_protocol (vlib_main_t * vm,
+			     hdlc_protocol_t protocol,
+			     u32 node_index)
+{
+  hdlc_main_t * em = &hdlc_main;
+  hdlc_protocol_info_t * pi;
+  hdlc_input_runtime_t * rt;
+  u16 * n;
+  u32 i;
+
+  {
+    clib_error_t * error = vlib_call_init_function (vm, hdlc_input_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  pi = hdlc_get_protocol_info (em, protocol);
+  pi->node_index = node_index;
+  pi->next_index = vlib_node_add_next (vm, 
+				       hdlc_input_node.index,
+				       node_index);
+
+  /* Setup hdlc protocol -> next index sparse vector mapping. */
+  rt = vlib_node_get_runtime_data (vm, hdlc_input_node.index);
+  n = sparse_vec_validate (rt->next_by_protocol, clib_host_to_net_u16 (protocol));
+  n[0] = pi->next_index;
+
+  /* Rebuild next index -> sparse index inverse mapping when sparse vector
+     is updated. */
+  vec_validate (rt->sparse_index_by_next_index, pi->next_index);
+  for (i = 1; i < vec_len (rt->next_by_protocol); i++)
+    rt->sparse_index_by_next_index[rt->next_by_protocol[i]] = i;
+}
diff --git a/src/vnet/hdlc/packet.h b/src/vnet/hdlc/packet.h
new file mode 100644
index 00000000..45e5496f
--- /dev/null
+++ b/src/vnet/hdlc/packet.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vnet_hdlc_packet_h
+#define included_vnet_hdlc_packet_h
+
+/*
+ * HDLC packet format
+ *
+ * Copyright (c) 2009 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#define foreach_hdlc_protocol			\
+  _ (0x0800, ip4)				\
+  _ (0x2000, cdp)				\
+  _ (0x8035, slarp)				\
+  _ (0x8847, mpls_unicast)			\
+  _ (0x8848, mpls_multicast)			\
+  _ (0x86dd, ip6)				\
+  _ (0xfefe, osi)
+
+typedef enum {
+#define _(n,f) HDLC_PROTOCOL_##f = n,
+  foreach_hdlc_protocol
+#undef _
+} hdlc_protocol_t;
+
+typedef struct {
+  /* Set to 0x0f for unicast; 0x8f for broadcast. */
+  u8 address;
+
+  /* Always zero. */
+  u8 control;
+
+  /* Layer 3 protocol for this packet. */
+  u16 protocol;
+
+  /* Layer 3 payload. */
+  u8 payload[0];
+} hdlc_header_t;
+
+#endif /* included_vnet_hdlc_packet_h */
diff --git a/src/vnet/hdlc/pg.c b/src/vnet/hdlc/pg.c
new file mode 100644
index 00000000..b8e67022
--- /dev/null
+++ b/src/vnet/hdlc/pg.c
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * hdlc_pg.c: packet generator hdlc interface
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/hdlc/hdlc.h>
+
+typedef struct {
+  pg_edit_t address;
+  pg_edit_t control;
+  pg_edit_t protocol;
+} pg_hdlc_header_t;
+
+static inline void
+pg_hdlc_header_init (pg_hdlc_header_t * e)
+{
+  pg_edit_init (&e->address, hdlc_header_t, address);
+  pg_edit_init (&e->control, hdlc_header_t, control);
+  pg_edit_init (&e->protocol, hdlc_header_t, protocol);
+}
+
+uword
+unformat_pg_hdlc_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t * s = va_arg (*args, pg_stream_t *);
+  pg_hdlc_header_t * h;
+  u32 group_index, error;
+  
+  h = pg_create_edit_group (s, sizeof (h[0]), sizeof (hdlc_header_t),
+			    &group_index);
+  pg_hdlc_header_init (h);
+
+  pg_edit_set_fixed (&h->address, 0x0f);
+  pg_edit_set_fixed (&h->control, 0x00);
+
+  error = 1;
+  if (! unformat (input, "%U",
+		  unformat_pg_edit,
+		    unformat_hdlc_protocol_net_byte_order, &h->protocol))
+    goto done;
+
+  {
+    hdlc_main_t * pm = &hdlc_main;
+    hdlc_protocol_info_t * pi = 0;
+    pg_node_t * pg_node = 0;
+
+    if (h->protocol.type == PG_EDIT_FIXED)
+      {
+	u16 t = *(u16 *) h->protocol.values[PG_EDIT_LO];
+	pi = hdlc_get_protocol_info (pm, clib_net_to_host_u16 (t));
+	if (pi && pi->node_index != ~0)
+	  pg_node = pg_get_node (pi->node_index);
+      }
+
+    if (pg_node && pg_node->unformat_edit
+	&& unformat_user (input, pg_node->unformat_edit, s))
+      ;
+
+    else if (! unformat_user (input, unformat_pg_payload, s))
+      goto done;
+  }
+
+  error = 0;
+ done:
+  if (error)
+    pg_free_edit_group (s);
+  return error == 0;
+}
+
diff --git a/src/vnet/interface.api b/src/vnet/interface.api
new file mode 100644
index 00000000..752e79c5
--- /dev/null
+++ b/src/vnet/interface.api
@@ -0,0 +1,339 @@
+/** \brief Set flags on the interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - index of the interface to set flags on
+    @param admin_up_down - set the admin state, 1 = up, 0 = down
+    @param link_up_down - Oper state sent on change event, not used in config.
+    @param deleted - interface was deleted
+*/
+define sw_interface_set_flags
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  /* 1 = up, 0 = down */
+  u8 admin_up_down;
+  u8 link_up_down;
+  u8 deleted;
+};
+
+/** \brief Reply to sw_interface_set_flags 
+    @param context - sender context which was passed in the request
+    @param retval - return code of the set flags request
+*/
+define sw_interface_set_flags_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Set interface MTU
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - index of the interface to set MTU on
+    @param mtu - MTU
+*/
+define sw_interface_set_mtu
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u16 mtu;
+};
+
+/** \brief Reply to sw_interface_set_mtu
+    @param context - sender context which was passed in the request
+    @param retval - return code of the set flags request
+*/
+define sw_interface_set_mtu_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Register for interface events
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param enable_disable - 1 => register for events, 0 => cancel registration
+    @param pid - sender's pid
+*/
+define want_interface_events
+{
+  u32 client_index;
+  u32 context;
+  u32 enable_disable;
+  u32 pid;
+};
+
+/** \brief Reply for interface events registration
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define want_interface_events_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Interface details structure (fix this) 
+    @param sw_if_index - index of the interface
+    @param sup_sw_if_index - index of parent interface if any, else same as sw_if_index  
+    @param l2_address_length - length of the interface's l2 address
+    @param pid - the interface's l2 address
+    @param interface_name - name of the interface
+    @param link_duplex - 1 if half duplex, 2 if full duplex
+    @param link_speed - 1 = 10M, 2 = 100M, 4 = 1G, 8 = 10G, 16 = 40G, 32 = 100G
+    @param link_MTU - max. transmittion unit 
+    @param sub_if_id - A number 0-N to uniquely identify this subif on super if
+    @param sub_dot1ad -  0 = dot1q, 1=dot1ad
+    @param sub_number_of_tags - Number of tags (0 - 2)
+    @param sub_outer_vlan_id
+    @param sub_inner_vlan_id
+    @param sub_exact_match
+    @param sub_default
+    @param sub_outer_vlan_id_any
+    @param sub_inner_vlan_id_any
+    @param vtr_op - vlan tag rewrite operation
+    @param vtr_push_dot1q
+    @param vtr_tag1
+    @param vtr_tag2
+*/
+define sw_interface_details
+{
+  u32 context;
+  u32 sw_if_index;
+
+  /* index of sup interface (e.g. hw interface).
+     equal to sw_if_index for super hw interface. */
+  u32 sup_sw_if_index;
+
+  /* Layer 2 address, if applicable */
+  u32 l2_address_length;
+  u8 l2_address[8];
+
+  /* Interface name */
+  u8 interface_name[64];
+
+  /* 1 = up, 0 = down */
+  u8 admin_up_down;
+  u8 link_up_down;
+
+  /* 1 = half duplex, 2 = full duplex */
+  u8 link_duplex;
+
+  /* 1 = 10M, 2 = 100M, 4 = 1G, 8 = 10G, 16 = 40G, 32 = 100G */
+  u8 link_speed;
+
+  /* MTU */
+  u16 link_mtu;
+
+  /* Subinterface ID. A number 0-N to uniquely identify this subinterface under the super interface */
+  u32 sub_id;
+
+  /* 0 = dot1q, 1=dot1ad */
+  u8 sub_dot1ad;
+
+  /* Number of tags 0-2 */
+  u8 sub_number_of_tags;
+  u16 sub_outer_vlan_id;
+  u16 sub_inner_vlan_id;
+  u8 sub_exact_match;
+  u8 sub_default;
+  u8 sub_outer_vlan_id_any;
+  u8 sub_inner_vlan_id_any;
+
+  /* vlan tag rewrite state */
+  u32 vtr_op;
+  u32 vtr_push_dot1q;		// ethertype of first pushed tag is dot1q/dot1ad
+  u32 vtr_tag1;			// first pushed tag
+  u32 vtr_tag2;			// second pushed tag
+  u8 tag[64];
+};
+
+/* works */
+define sw_interface_dump
+{
+  u32 client_index;
+  u32 context;
+  u8 name_filter_valid;
+  u8 name_filter[49];
+};
+
+/** \brief Set or delete one or all ip addresses on a specified interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - index of the interface to add/del addresses 
+    @param is_add - add address if non-zero, else delete
+    @param is_ipv6 - if non-zero the address is ipv6, else ipv4
+    @param del_all - if non-zero delete all addresses on the interface
+    @param address_length - address length in bytes, 4 for ip4, 16 for ip6
+    @param address - array of address bytes
+*/
+define sw_interface_add_del_address
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 is_add;
+  u8 is_ipv6;
+  u8 del_all;
+  u8 address_length;
+  u8 address[16];
+};
+
+/** \brief Reply to sw_interface_add_del_address
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define sw_interface_add_del_address_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Associate the specified interface with a fib table
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - index of the interface
+    @param is_ipv6 - if non-zero ipv6, else ipv4
+    @param vrf_id - fib table/vrd id to associate the interface with
+*/
+define sw_interface_set_table
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 is_ipv6;
+  u32 vrf_id;
+};
+
+/** \brief Reply to sw_interface_set_table
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define sw_interface_set_table_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Get VRF id assigned to interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - index of the interface
+*/
+define sw_interface_get_table
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 is_ipv6;
+};
+
+/** \brief Reply to get_sw_interface_vrf
+    @param context - sender context which was passed in the request
+    @param vrf_id - VRF id assigned to the interface
+*/
+define sw_interface_get_table_reply
+{
+  u32 context;
+  i32 retval;
+  u32 vrf_id;
+};
+
+/** \brief Stats counters structure 
+    @param vnet_counter_type- such as ip4, ip6, punts, etc
+    @param is_combined - rx & tx total (all types) counts   
+    @param first_sw_if_index - first sw index in block of index, counts
+    @param count - number of interfaces this stats block includes counters for
+    @param data - contiguous block of vlib_counter_t structures 
+*/
+define vnet_interface_counters
+{
+  /* enums - plural - in vnet/interface.h */
+  u8 vnet_counter_type;
+  u8 is_combined;
+  u32 first_sw_if_index;
+  u32 count;
+  u8 data[count];
+};
+
+/** \brief Set unnumbered interface add / del request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface with an IP address
+    @param unnumbered_sw_if_index - interface which will use the address
+    @param is_add - if non-zero set the association, else unset it
+*/
+define sw_interface_set_unnumbered
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;		/* use this intfc address */
+  u32 unnumbered_sw_if_index;	/* on this interface */
+  u8 is_add;
+};
+
+/** \brief Set unnumbered interface add / del response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define sw_interface_set_unnumbered_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Clear interface statistics
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - index of the interface to clear statistics
+*/
+define sw_interface_clear_stats
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+};
+
+/** \brief Reply to sw_interface_clear_stats 
+    @param context - sender context which was passed in the request
+    @param retval - return code of the set flags request
+*/
+define sw_interface_clear_stats_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Set / clear software interface tag
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - the interface
+    @param add_del - 1 = add, 0 = delete
+    @param tag - an ascii tag
+*/
+define sw_interface_tag_add_del 
+{
+    u32 client_index;
+    u32 context;
+    u8 is_add;
+    u32 sw_if_index;
+    u8 tag[64];
+};
+
+/** \brief Reply to set / clear software interface tag
+    @param context - sender context which was passed in the request
+    @param retval - return code for the request
+*/
+define sw_interface_tag_add_del_reply
+{
+    u32 context;
+    i32 retval;
+};
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
+
diff --git a/src/vnet/interface.c b/src/vnet/interface.c
new file mode 100644
index 00000000..78610ed4
--- /dev/null
+++ b/src/vnet/interface.c
@@ -0,0 +1,1398 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * interface.c: VNET interfaces/sub-interfaces
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/plugin/plugin.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/adj/adj.h>
+
+#define VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE (1 << 0)
+#define VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE (1 << 1)
+
+static clib_error_t *vnet_hw_interface_set_flags_helper (vnet_main_t * vnm,
+							 u32 hw_if_index,
+							 u32 flags,
+							 u32 helper_flags);
+
+static clib_error_t *vnet_sw_interface_set_flags_helper (vnet_main_t * vnm,
+							 u32 sw_if_index,
+							 u32 flags,
+							 u32 helper_flags);
+
+static clib_error_t *vnet_hw_interface_set_class_helper (vnet_main_t * vnm,
+							 u32 hw_if_index,
+							 u32 hw_class_index,
+							 u32 redistribute);
+
+typedef struct
+{
+  /* Either sw or hw interface index. */
+  u32 sw_hw_if_index;
+
+  /* Flags. */
+  u32 flags;
+} vnet_sw_hw_interface_state_t;
+
+static void
+serialize_vec_vnet_sw_hw_interface_state (serialize_main_t * m, va_list * va)
+{
+  vnet_sw_hw_interface_state_t *s =
+    va_arg (*va, vnet_sw_hw_interface_state_t *);
+  u32 n = va_arg (*va, u32);
+  u32 i;
+  for (i = 0; i < n; i++)
+    {
+      serialize_integer (m, s[i].sw_hw_if_index,
+			 sizeof (s[i].sw_hw_if_index));
+      serialize_integer (m, s[i].flags, sizeof (s[i].flags));
+    }
+}
+
+static void
+unserialize_vec_vnet_sw_hw_interface_state (serialize_main_t * m,
+					    va_list * va)
+{
+  vnet_sw_hw_interface_state_t *s =
+    va_arg (*va, vnet_sw_hw_interface_state_t *);
+  u32 n = va_arg (*va, u32);
+  u32 i;
+  for (i = 0; i < n; i++)
+    {
+      unserialize_integer (m, &s[i].sw_hw_if_index,
+			   sizeof (s[i].sw_hw_if_index));
+      unserialize_integer (m, &s[i].flags, sizeof (s[i].flags));
+    }
+}
+
+static void
+serialize_vnet_sw_hw_interface_set_flags (serialize_main_t * m, va_list * va)
+{
+  vnet_sw_hw_interface_state_t *s =
+    va_arg (*va, vnet_sw_hw_interface_state_t *);
+  serialize (m, serialize_vec_vnet_sw_hw_interface_state, s, 1);
+}
+
+static void
+unserialize_vnet_sw_interface_set_flags (serialize_main_t * m, va_list * va)
+{
+  CLIB_UNUSED (mc_main_t * mc) = va_arg (*va, mc_main_t *);
+  vnet_sw_hw_interface_state_t s;
+
+  unserialize (m, unserialize_vec_vnet_sw_hw_interface_state, &s, 1);
+
+  vnet_sw_interface_set_flags_helper
+    (vnet_get_main (), s.sw_hw_if_index, s.flags,
+     /* helper_flags no redistribution */ 0);
+}
+
+static void
+unserialize_vnet_hw_interface_set_flags (serialize_main_t * m, va_list * va)
+{
+  CLIB_UNUSED (mc_main_t * mc) = va_arg (*va, mc_main_t *);
+  vnet_sw_hw_interface_state_t s;
+
+  unserialize (m, unserialize_vec_vnet_sw_hw_interface_state, &s, 1);
+
+  vnet_hw_interface_set_flags_helper
+    (vnet_get_main (), s.sw_hw_if_index, s.flags,
+     /* helper_flags no redistribution */ 0);
+}
+
+MC_SERIALIZE_MSG (vnet_sw_interface_set_flags_msg, static) =
+{
+.name = "vnet_sw_interface_set_flags",.serialize =
+    serialize_vnet_sw_hw_interface_set_flags,.unserialize =
+    unserialize_vnet_sw_interface_set_flags,};
+
+MC_SERIALIZE_MSG (vnet_hw_interface_set_flags_msg, static) =
+{
+.name = "vnet_hw_interface_set_flags",.serialize =
+    serialize_vnet_sw_hw_interface_set_flags,.unserialize =
+    unserialize_vnet_hw_interface_set_flags,};
+
+void
+serialize_vnet_interface_state (serialize_main_t * m, va_list * va)
+{
+  vnet_main_t *vnm = va_arg (*va, vnet_main_t *);
+  vnet_sw_hw_interface_state_t *sts = 0, *st;
+  vnet_sw_interface_t *sif;
+  vnet_hw_interface_t *hif;
+  vnet_interface_main_t *im = &vnm->interface_main;
+
+  /* Serialize hardware interface classes since they may have changed.
+     Must do this before sending up/down flags. */
+  /* *INDENT-OFF* */
+  pool_foreach (hif, im->hw_interfaces, ({
+    vnet_hw_interface_class_t * hw_class = vnet_get_hw_interface_class (vnm, hif->hw_class_index);
+    serialize_cstring (m, hw_class->name);
+  }));
+  /* *INDENT-ON* */
+
+  /* Send sw/hw interface state when non-zero. */
+  /* *INDENT-OFF* */
+  pool_foreach (sif, im->sw_interfaces, ({
+    if (sif->flags != 0)
+      {
+	vec_add2 (sts, st, 1);
+	st->sw_hw_if_index = sif->sw_if_index;
+	st->flags = sif->flags;
+      }
+  }));
+  /* *INDENT-ON* */
+
+  vec_serialize (m, sts, serialize_vec_vnet_sw_hw_interface_state);
+
+  if (sts)
+    _vec_len (sts) = 0;
+
+  /* *INDENT-OFF* */
+  pool_foreach (hif, im->hw_interfaces, ({
+    if (hif->flags != 0)
+      {
+	vec_add2 (sts, st, 1);
+	st->sw_hw_if_index = hif->hw_if_index;
+	st->flags = hif->flags;
+      }
+  }));
+  /* *INDENT-ON* */
+
+  vec_serialize (m, sts, serialize_vec_vnet_sw_hw_interface_state);
+
+  vec_free (sts);
+}
+
+void
+unserialize_vnet_interface_state (serialize_main_t * m, va_list * va)
+{
+  vnet_main_t *vnm = va_arg (*va, vnet_main_t *);
+  vnet_sw_hw_interface_state_t *sts = 0, *st;
+
+  /* First set interface hardware class. */
+  {
+    vnet_interface_main_t *im = &vnm->interface_main;
+    vnet_hw_interface_t *hif;
+    char *class_name;
+    uword *p;
+    clib_error_t *error;
+
+    /* *INDENT-OFF* */
+    pool_foreach (hif, im->hw_interfaces, ({
+      unserialize_cstring (m, &class_name);
+      p = hash_get_mem (im->hw_interface_class_by_name, class_name);
+      ASSERT (p != 0);
+      error = vnet_hw_interface_set_class_helper (vnm, hif->hw_if_index, p[0], /* redistribute */ 0);
+      if (error)
+	clib_error_report (error);
+      vec_free (class_name);
+    }));
+    /* *INDENT-ON* */
+  }
+
+  vec_unserialize (m, &sts, unserialize_vec_vnet_sw_hw_interface_state);
+  vec_foreach (st, sts)
+    vnet_sw_interface_set_flags_helper (vnm, st->sw_hw_if_index, st->flags,
+					/* no distribute */ 0);
+  vec_free (sts);
+
+  vec_unserialize (m, &sts, unserialize_vec_vnet_sw_hw_interface_state);
+  vec_foreach (st, sts)
+    vnet_hw_interface_set_flags_helper (vnm, st->sw_hw_if_index, st->flags,
+					/* no distribute */ 0);
+  vec_free (sts);
+}
+
+static clib_error_t *
+call_elf_section_interface_callbacks (vnet_main_t * vnm, u32 if_index,
+				      u32 flags,
+				      _vnet_interface_function_list_elt_t **
+				      elts)
+{
+  _vnet_interface_function_list_elt_t *elt;
+  vnet_interface_function_priority_t prio;
+  clib_error_t *error = 0;
+
+  for (prio = VNET_ITF_FUNC_PRIORITY_LOW;
+       prio <= VNET_ITF_FUNC_PRIORITY_HIGH; prio++)
+    {
+      elt = elts[prio];
+
+      while (elt)
+	{
+	  error = elt->fp (vnm, if_index, flags);
+	  if (error)
+	    return error;
+	  elt = elt->next_interface_function;
+	}
+    }
+  return error;
+}
+
+static clib_error_t *
+call_hw_interface_add_del_callbacks (vnet_main_t * vnm, u32 hw_if_index,
+				     u32 is_create)
+{
+  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
+  vnet_hw_interface_class_t *hw_class =
+    vnet_get_hw_interface_class (vnm, hi->hw_class_index);
+  vnet_device_class_t *dev_class =
+    vnet_get_device_class (vnm, hi->dev_class_index);
+  clib_error_t *error = 0;
+
+  if (hw_class->interface_add_del_function
+      && (error =
+	  hw_class->interface_add_del_function (vnm, hw_if_index, is_create)))
+    return error;
+
+  if (dev_class->interface_add_del_function
+      && (error =
+	  dev_class->interface_add_del_function (vnm, hw_if_index,
+						 is_create)))
+    return error;
+
+  error = call_elf_section_interface_callbacks
+    (vnm, hw_if_index, is_create, vnm->hw_interface_add_del_functions);
+
+  return error;
+}
+
+static clib_error_t *
+call_sw_interface_add_del_callbacks (vnet_main_t * vnm, u32 sw_if_index,
+				     u32 is_create)
+{
+  return call_elf_section_interface_callbacks
+    (vnm, sw_if_index, is_create, vnm->sw_interface_add_del_functions);
+}
+
+#define VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE (1 << 0)
+#define VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE (1 << 1)
+
+static clib_error_t *
+vnet_hw_interface_set_flags_helper (vnet_main_t * vnm, u32 hw_if_index,
+				    u32 flags, u32 helper_flags)
+{
+  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
+  vnet_hw_interface_class_t *hw_class =
+    vnet_get_hw_interface_class (vnm, hi->hw_class_index);
+  vnet_device_class_t *dev_class =
+    vnet_get_device_class (vnm, hi->dev_class_index);
+  vlib_main_t *vm = vnm->vlib_main;
+  u32 mask;
+  clib_error_t *error = 0;
+  u32 is_create =
+    (helper_flags & VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE) != 0;
+
+  mask =
+    (VNET_HW_INTERFACE_FLAG_LINK_UP | VNET_HW_INTERFACE_FLAG_DUPLEX_MASK |
+     VNET_HW_INTERFACE_FLAG_SPEED_MASK);
+  flags &= mask;
+
+  /* Call hardware interface add/del callbacks. */
+  if (is_create)
+    call_hw_interface_add_del_callbacks (vnm, hw_if_index, is_create);
+
+  /* Already in the desired state? */
+  if (!is_create && (hi->flags & mask) == flags)
+    goto done;
+
+  /* Some interface classes do not redistribute (e.g. are local). */
+  if (!dev_class->redistribute)
+    helper_flags &= ~VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE;
+
+  if (vm->mc_main
+      && (helper_flags & VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE))
+    {
+      vnet_sw_hw_interface_state_t s;
+      s.sw_hw_if_index = hw_if_index;
+      s.flags = flags;
+      mc_serialize (vm->mc_main, &vnet_hw_interface_set_flags_msg, &s);
+    }
+
+  if ((hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) !=
+      (flags & VNET_HW_INTERFACE_FLAG_LINK_UP))
+    {
+      /* Do hardware class (e.g. ethernet). */
+      if (hw_class->link_up_down_function
+	  && (error = hw_class->link_up_down_function (vnm, hw_if_index,
+						       flags)))
+	goto done;
+
+      error = call_elf_section_interface_callbacks
+	(vnm, hw_if_index, flags, vnm->hw_interface_link_up_down_functions);
+
+      if (error)
+	goto done;
+    }
+
+  hi->flags &= ~mask;
+  hi->flags |= flags;
+
+done:
+  return error;
+}
+
+static clib_error_t *
+vnet_sw_interface_set_flags_helper (vnet_main_t * vnm, u32 sw_if_index,
+				    u32 flags, u32 helper_flags)
+{
+  vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index);
+  vlib_main_t *vm = vnm->vlib_main;
+  u32 mask;
+  clib_error_t *error = 0;
+  u32 is_create =
+    (helper_flags & VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE) != 0;
+  u32 old_flags;
+
+  mask = VNET_SW_INTERFACE_FLAG_ADMIN_UP | VNET_SW_INTERFACE_FLAG_PUNT;
+  flags &= mask;
+
+  if (is_create)
+    {
+      error =
+	call_sw_interface_add_del_callbacks (vnm, sw_if_index, is_create);
+      if (error)
+	goto done;
+
+      if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+	{
+	  /* Notify everyone when the interface is created as admin up */
+	  error = call_elf_section_interface_callbacks (vnm, sw_if_index,
+							flags,
+							vnm->
+							sw_interface_admin_up_down_functions);
+	  if (error)
+	    goto done;
+	}
+    }
+  else
+    {
+      vnet_sw_interface_t *si_sup = si;
+
+      /* Check that super interface is in correct state. */
+      if (si->type == VNET_SW_INTERFACE_TYPE_SUB)
+	{
+	  si_sup = vnet_get_sw_interface (vnm, si->sup_sw_if_index);
+
+	  /* Check to see if we're bringing down the soft interface and if it's parent is up */
+	  if ((flags != (si_sup->flags & mask)) &&
+	      (!((flags == 0)
+		 && ((si_sup->flags & mask) ==
+		     VNET_SW_INTERFACE_FLAG_ADMIN_UP))))
+	    {
+	      error = clib_error_return (0, "super-interface %U must be %U",
+					 format_vnet_sw_interface_name, vnm,
+					 si_sup,
+					 format_vnet_sw_interface_flags,
+					 flags);
+	      goto done;
+	    }
+	}
+
+      /* Donot change state for slave link of bonded interfaces */
+      if (si->flags & VNET_SW_INTERFACE_FLAG_BOND_SLAVE)
+	{
+	  error = clib_error_return
+	    (0, "not allowed as %U belong to a BondEthernet interface",
+	     format_vnet_sw_interface_name, vnm, si);
+	  goto done;
+	}
+
+      /* Already in the desired state? */
+      if ((si->flags & mask) == flags)
+	goto done;
+
+      /* Sub-interfaces of hardware interfaces that do no redistribute,
+         do not redistribute themselves. */
+      if (si_sup->type == VNET_SW_INTERFACE_TYPE_HARDWARE)
+	{
+	  vnet_hw_interface_t *hi =
+	    vnet_get_hw_interface (vnm, si_sup->hw_if_index);
+	  vnet_device_class_t *dev_class =
+	    vnet_get_device_class (vnm, hi->dev_class_index);
+	  if (!dev_class->redistribute)
+	    helper_flags &=
+	      ~VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE;
+	}
+
+      if (vm->mc_main
+	  && (helper_flags &
+	      VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE))
+	{
+	  vnet_sw_hw_interface_state_t s;
+	  s.sw_hw_if_index = sw_if_index;
+	  s.flags = flags;
+	  mc_serialize (vm->mc_main, &vnet_sw_interface_set_flags_msg, &s);
+	}
+
+      /* set the flags now before invoking the registered clients
+       * so that the state they query is consistent with the state here notified */
+      old_flags = si->flags;
+      si->flags &= ~mask;
+      si->flags |= flags;
+      if ((flags | old_flags) & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+	error = call_elf_section_interface_callbacks
+	  (vnm, sw_if_index, flags,
+	   vnm->sw_interface_admin_up_down_functions);
+      si->flags = old_flags;
+
+      if (error)
+	goto done;
+
+      if (si->type == VNET_SW_INTERFACE_TYPE_HARDWARE)
+	{
+	  vnet_hw_interface_t *hi =
+	    vnet_get_hw_interface (vnm, si->hw_if_index);
+	  vnet_hw_interface_class_t *hw_class =
+	    vnet_get_hw_interface_class (vnm, hi->hw_class_index);
+	  vnet_device_class_t *dev_class =
+	    vnet_get_device_class (vnm, hi->dev_class_index);
+
+	  /* save the si admin up flag */
+	  old_flags = si->flags;
+
+	  /* update si admin up flag in advance if we are going admin down */
+	  if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
+	    si->flags &= ~VNET_SW_INTERFACE_FLAG_ADMIN_UP;
+
+	  if (dev_class->admin_up_down_function
+	      && (error = dev_class->admin_up_down_function (vnm,
+							     si->hw_if_index,
+							     flags)))
+	    {
+	      /* restore si admin up flag to it's original state on errors */
+	      si->flags = old_flags;
+	      goto done;
+	    }
+
+	  if (hw_class->admin_up_down_function
+	      && (error = hw_class->admin_up_down_function (vnm,
+							    si->hw_if_index,
+							    flags)))
+	    {
+	      /* restore si admin up flag to it's original state on errors */
+	      si->flags = old_flags;
+	      goto done;
+	    }
+
+	  /* Admin down implies link down. */
+	  if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+	      && (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP))
+	    vnet_hw_interface_set_flags_helper (vnm, si->hw_if_index,
+						hi->flags &
+						~VNET_HW_INTERFACE_FLAG_LINK_UP,
+						helper_flags);
+	}
+    }
+
+  si->flags &= ~mask;
+  si->flags |= flags;
+
+done:
+  return error;
+}
+
+clib_error_t *
+vnet_hw_interface_set_flags (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+  return vnet_hw_interface_set_flags_helper
+    (vnm, hw_if_index, flags,
+     VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE);
+}
+
+clib_error_t *
+vnet_sw_interface_set_flags (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
+{
+  return vnet_sw_interface_set_flags_helper
+    (vnm, sw_if_index, flags,
+     VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE);
+}
+
+static u32
+vnet_create_sw_interface_no_callbacks (vnet_main_t * vnm,
+				       vnet_sw_interface_t * template)
+{
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_sw_interface_t *sw;
+  u32 sw_if_index;
+
+  pool_get (im->sw_interfaces, sw);
+  sw_if_index = sw - im->sw_interfaces;
+
+  sw[0] = template[0];
+
+  sw->flags = 0;
+  sw->sw_if_index = sw_if_index;
+  if (sw->type == VNET_SW_INTERFACE_TYPE_HARDWARE)
+    sw->sup_sw_if_index = sw->sw_if_index;
+
+  /* Allocate counters for this interface. */
+  {
+    u32 i;
+
+    vnet_interface_counter_lock (im);
+
+    for (i = 0; i < vec_len (im->sw_if_counters); i++)
+      {
+	vlib_validate_simple_counter (&im->sw_if_counters[i], sw_if_index);
+	vlib_zero_simple_counter (&im->sw_if_counters[i], sw_if_index);
+      }
+
+    for (i = 0; i < vec_len (im->combined_sw_if_counters); i++)
+      {
+	vlib_validate_combined_counter (&im->combined_sw_if_counters[i],
+					sw_if_index);
+	vlib_zero_combined_counter (&im->combined_sw_if_counters[i],
+				    sw_if_index);
+      }
+
+    vnet_interface_counter_unlock (im);
+  }
+
+  return sw_if_index;
+}
+
+clib_error_t *
+vnet_create_sw_interface (vnet_main_t * vnm, vnet_sw_interface_t * template,
+			  u32 * sw_if_index)
+{
+  clib_error_t *error;
+  vnet_hw_interface_t *hi;
+  vnet_device_class_t *dev_class;
+
+  hi = vnet_get_sup_hw_interface (vnm, template->sup_sw_if_index);
+  dev_class = vnet_get_device_class (vnm, hi->dev_class_index);
+
+  if (template->type == VNET_SW_INTERFACE_TYPE_SUB &&
+      dev_class->subif_add_del_function)
+    {
+      error = dev_class->subif_add_del_function (vnm, hi->hw_if_index,
+						 (struct vnet_sw_interface_t
+						  *) template, 1);
+      if (error)
+	return error;
+    }
+
+  *sw_if_index = vnet_create_sw_interface_no_callbacks (vnm, template);
+  error = vnet_sw_interface_set_flags_helper
+    (vnm, *sw_if_index, template->flags,
+     VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE);
+
+  if (error)
+    {
+      /* undo the work done by vnet_create_sw_interface_no_callbacks() */
+      vnet_interface_main_t *im = &vnm->interface_main;
+      vnet_sw_interface_t *sw =
+	pool_elt_at_index (im->sw_interfaces, *sw_if_index);
+      pool_put (im->sw_interfaces, sw);
+    }
+
+  return error;
+}
+
+void
+vnet_delete_sw_interface (vnet_main_t * vnm, u32 sw_if_index)
+{
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_sw_interface_t *sw =
+    pool_elt_at_index (im->sw_interfaces, sw_if_index);
+
+  /* Make sure the interface is in L3 mode (removed from L2 BD or XConnect) */
+  vlib_main_t *vm = vlib_get_main ();
+  l2_input_config_t *config;
+  config = vec_elt_at_index (l2input_main.configs, sw_if_index);
+  if (config->xconnect)
+    set_int_l2_mode (vm, vnm, MODE_L3, config->output_sw_if_index, 0, 0, 0,
+		     0);
+  if (config->xconnect || config->bridge)
+    set_int_l2_mode (vm, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0);
+
+  /* Bring down interface in case it is up. */
+  if (sw->flags != 0)
+    vnet_sw_interface_set_flags (vnm, sw_if_index, /* flags */ 0);
+
+  call_sw_interface_add_del_callbacks (vnm, sw_if_index, /* is_create */ 0);
+
+  pool_put (im->sw_interfaces, sw);
+}
+
+static void
+setup_tx_node (vlib_main_t * vm,
+	       u32 node_index, vnet_device_class_t * dev_class)
+{
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+
+  n->function = dev_class->tx_function;
+  n->format_trace = dev_class->format_tx_trace;
+
+  vlib_register_errors (vm, node_index,
+			dev_class->tx_function_n_errors,
+			dev_class->tx_function_error_strings);
+}
+
+static void
+setup_output_node (vlib_main_t * vm,
+		   u32 node_index, vnet_hw_interface_class_t * hw_class)
+{
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  n->format_buffer = hw_class->format_header;
+  n->unformat_buffer = hw_class->unformat_header;
+}
+
+/* Register an interface instance. */
+u32
+vnet_register_interface (vnet_main_t * vnm,
+			 u32 dev_class_index,
+			 u32 dev_instance,
+			 u32 hw_class_index, u32 hw_instance)
+{
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_hw_interface_t *hw;
+  vnet_device_class_t *dev_class =
+    vnet_get_device_class (vnm, dev_class_index);
+  vnet_hw_interface_class_t *hw_class =
+    vnet_get_hw_interface_class (vnm, hw_class_index);
+  vlib_main_t *vm = vnm->vlib_main;
+  vnet_feature_config_main_t *fcm;
+  vnet_config_main_t *cm;
+  u32 hw_index, i;
+  char *tx_node_name, *output_node_name;
+
+  pool_get (im->hw_interfaces, hw);
+
+  hw_index = hw - im->hw_interfaces;
+  hw->hw_if_index = hw_index;
+
+  if (dev_class->format_device_name)
+    hw->name = format (0, "%U", dev_class->format_device_name, dev_instance);
+  else if (hw_class->format_interface_name)
+    hw->name = format (0, "%U", hw_class->format_interface_name,
+		       dev_instance);
+  else
+    hw->name = format (0, "%s%x", hw_class->name, dev_instance);
+
+  if (!im->hw_interface_by_name)
+    im->hw_interface_by_name = hash_create_vec ( /* size */ 0,
+						sizeof (hw->name[0]),
+						sizeof (uword));
+
+  hash_set_mem (im->hw_interface_by_name, hw->name, hw_index);
+
+  /* Make hardware interface point to software interface. */
+  {
+    vnet_sw_interface_t sw = {
+      .type = VNET_SW_INTERFACE_TYPE_HARDWARE,
+      .flood_class = VNET_FLOOD_CLASS_NORMAL,
+      .hw_if_index = hw_index
+    };
+    hw->sw_if_index = vnet_create_sw_interface_no_callbacks (vnm, &sw);
+  }
+
+  hw->dev_class_index = dev_class_index;
+  hw->dev_instance = dev_instance;
+  hw->hw_class_index = hw_class_index;
+  hw->hw_instance = hw_instance;
+
+  hw->max_rate_bits_per_sec = 0;
+  hw->min_packet_bytes = 0;
+  hw->per_packet_overhead_bytes = 0;
+  hw->max_l3_packet_bytes[VLIB_RX] = ~0;
+  hw->max_l3_packet_bytes[VLIB_TX] = ~0;
+
+  tx_node_name = (char *) format (0, "%v-tx", hw->name);
+  output_node_name = (char *) format (0, "%v-output", hw->name);
+
+  /* If we have previously deleted interface nodes, re-use them. */
+  if (vec_len (im->deleted_hw_interface_nodes) > 0)
+    {
+      vnet_hw_interface_nodes_t *hn;
+      vnet_interface_output_runtime_t *rt;
+      vlib_node_t *node;
+      vlib_node_runtime_t *nrt;
+
+      hn = vec_end (im->deleted_hw_interface_nodes) - 1;
+
+      hw->tx_node_index = hn->tx_node_index;
+      hw->output_node_index = hn->output_node_index;
+
+      vlib_node_rename (vm, hw->tx_node_index, "%v", tx_node_name);
+      vlib_node_rename (vm, hw->output_node_index, "%v", output_node_name);
+
+      rt = vlib_node_get_runtime_data (vm, hw->output_node_index);
+      ASSERT (rt->is_deleted == 1);
+      rt->is_deleted = 0;
+      rt->hw_if_index = hw_index;
+      rt->sw_if_index = hw->sw_if_index;
+      rt->dev_instance = hw->dev_instance;
+
+      rt = vlib_node_get_runtime_data (vm, hw->tx_node_index);
+      rt->hw_if_index = hw_index;
+      rt->sw_if_index = hw->sw_if_index;
+      rt->dev_instance = hw->dev_instance;
+
+      /* The new class may differ from the old one.
+       * Functions have to be updated. */
+      node = vlib_get_node (vm, hw->output_node_index);
+      node->function = dev_class->flatten_output_chains ?
+	vnet_interface_output_node_flatten_multiarch_select () :
+	vnet_interface_output_node_multiarch_select ();
+      node->format_trace = format_vnet_interface_output_trace;
+      nrt = vlib_node_get_runtime (vm, hw->output_node_index);
+      nrt->function = node->function;
+
+      node = vlib_get_node (vm, hw->tx_node_index);
+      node->function = dev_class->tx_function;
+      node->format_trace = dev_class->format_tx_trace;
+      nrt = vlib_node_get_runtime (vm, hw->tx_node_index);
+      nrt->function = node->function;
+
+      vlib_worker_thread_node_runtime_update ();
+      _vec_len (im->deleted_hw_interface_nodes) -= 1;
+    }
+  else
+    {
+      vlib_node_registration_t r;
+      vnet_interface_output_runtime_t rt = {
+	.hw_if_index = hw_index,
+	.sw_if_index = hw->sw_if_index,
+	.dev_instance = hw->dev_instance,
+	.is_deleted = 0,
+      };
+
+      memset (&r, 0, sizeof (r));
+      r.type = VLIB_NODE_TYPE_INTERNAL;
+      r.runtime_data = &rt;
+      r.runtime_data_bytes = sizeof (rt);
+      r.scalar_size = 0;
+      r.vector_size = sizeof (u32);
+
+      r.flags = VLIB_NODE_FLAG_IS_OUTPUT;
+      r.name = tx_node_name;
+      r.function = dev_class->tx_function;
+
+      hw->tx_node_index = vlib_register_node (vm, &r);
+
+      vlib_node_add_named_next_with_slot (vm, hw->tx_node_index,
+					  "error-drop",
+					  VNET_INTERFACE_TX_NEXT_DROP);
+
+      r.flags = 0;
+      r.name = output_node_name;
+      r.function = dev_class->flatten_output_chains ?
+	vnet_interface_output_node_flatten_multiarch_select () :
+	vnet_interface_output_node_multiarch_select ();
+      r.format_trace = format_vnet_interface_output_trace;
+
+      {
+	static char *e[] = {
+	  "interface is down",
+	  "interface is deleted",
+	};
+
+	r.n_errors = ARRAY_LEN (e);
+	r.error_strings = e;
+      }
+      hw->output_node_index = vlib_register_node (vm, &r);
+
+      vlib_node_add_named_next_with_slot (vm, hw->output_node_index,
+					  "error-drop",
+					  VNET_INTERFACE_OUTPUT_NEXT_DROP);
+      vlib_node_add_next_with_slot (vm, hw->output_node_index,
+				    hw->tx_node_index,
+				    VNET_INTERFACE_OUTPUT_NEXT_TX);
+
+      /* add interface to the list of "output-interface" feature arc start nodes
+         and clone nexts from 1st interface if it exists */
+      fcm = vnet_feature_get_config_main (im->output_feature_arc_index);
+      cm = &fcm->config_main;
+      i = vec_len (cm->start_node_indices);
+      vec_validate (cm->start_node_indices, i);
+      cm->start_node_indices[i] = hw->output_node_index;
+      if (hw_index)
+	{
+	  /* copy nexts from 1st interface */
+	  vnet_hw_interface_t *first_hw;
+	  vlib_node_t *first_node;
+
+	  first_hw = vnet_get_hw_interface (vnm, /* hw_if_index */ 0);
+	  first_node = vlib_get_node (vm, first_hw->output_node_index);
+
+	  /* 1st 2 nexts are already added above */
+	  for (i = 2; i < vec_len (first_node->next_nodes); i++)
+	    vlib_node_add_next_with_slot (vm, hw->output_node_index,
+					  first_node->next_nodes[i], i);
+	}
+    }
+
+  setup_output_node (vm, hw->output_node_index, hw_class);
+  setup_tx_node (vm, hw->tx_node_index, dev_class);
+
+  /* Call all up/down callbacks with zero flags when interface is created. */
+  vnet_sw_interface_set_flags_helper (vnm, hw->sw_if_index, /* flags */ 0,
+				      VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE);
+  vnet_hw_interface_set_flags_helper (vnm, hw_index, /* flags */ 0,
+				      VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE);
+
+  return hw_index;
+}
+
+void
+vnet_delete_hw_interface (vnet_main_t * vnm, u32 hw_if_index)
+{
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+  vlib_main_t *vm = vnm->vlib_main;
+
+  /* If it is up, mark it down. */
+  if (hw->flags != 0)
+    vnet_hw_interface_set_flags (vnm, hw_if_index, /* flags */ 0);
+
+  /* Call delete callbacks. */
+  call_hw_interface_add_del_callbacks (vnm, hw_if_index, /* is_create */ 0);
+
+  /* Delete software interface corresponding to hardware interface. */
+  vnet_delete_sw_interface (vnm, hw->sw_if_index);
+
+  /* Delete any sub-interfaces. */
+  {
+    u32 id, sw_if_index;
+    /* *INDENT-OFF* */
+    hash_foreach (id, sw_if_index, hw->sub_interface_sw_if_index_by_id, ({
+      vnet_delete_sw_interface (vnm, sw_if_index);
+    }));
+    /* *INDENT-ON* */
+  }
+
+  {
+    vnet_hw_interface_nodes_t *dn;
+    vnet_interface_output_runtime_t *rt =
+      vlib_node_get_runtime_data (vm, hw->output_node_index);
+
+    /* Mark node runtime as deleted so output node (if called) will drop packets. */
+    rt->is_deleted = 1;
+
+    vlib_node_rename (vm, hw->output_node_index,
+		      "interface-%d-output-deleted", hw_if_index);
+    vlib_node_rename (vm, hw->tx_node_index, "interface-%d-tx-deleted",
+		      hw_if_index);
+    vec_add2 (im->deleted_hw_interface_nodes, dn, 1);
+    dn->tx_node_index = hw->tx_node_index;
+    dn->output_node_index = hw->output_node_index;
+  }
+
+  hash_unset_mem (im->hw_interface_by_name, hw->name);
+  vec_free (hw->name);
+
+  pool_put (im->hw_interfaces, hw);
+}
+
+void
+vnet_hw_interface_walk_sw (vnet_main_t * vnm,
+			   u32 hw_if_index,
+			   vnet_hw_sw_interface_walk_t fn, void *ctx)
+{
+  vnet_hw_interface_t *hi;
+  u32 id, sw_if_index;
+
+  hi = vnet_get_hw_interface (vnm, hw_if_index);
+  /* the super first, then the and sub interfaces */
+  fn (vnm, hi->sw_if_index, ctx);
+
+  /* *INDENT-OFF* */
+  hash_foreach (id, sw_if_index,
+                hi->sub_interface_sw_if_index_by_id,
+  ({
+    fn (vnm, sw_if_index, ctx);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+serialize_vnet_hw_interface_set_class (serialize_main_t * m, va_list * va)
+{
+  u32 hw_if_index = va_arg (*va, u32);
+  char *hw_class_name = va_arg (*va, char *);
+  serialize_integer (m, hw_if_index, sizeof (hw_if_index));
+  serialize_cstring (m, hw_class_name);
+}
+
+static void
+unserialize_vnet_hw_interface_set_class (serialize_main_t * m, va_list * va)
+{
+  CLIB_UNUSED (mc_main_t * mc) = va_arg (*va, mc_main_t *);
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 hw_if_index;
+  char *hw_class_name;
+  uword *p;
+  clib_error_t *error;
+
+  unserialize_integer (m, &hw_if_index, sizeof (hw_if_index));
+  unserialize_cstring (m, &hw_class_name);
+  p =
+    hash_get (vnm->interface_main.hw_interface_class_by_name, hw_class_name);
+  ASSERT (p != 0);
+  error = vnet_hw_interface_set_class_helper (vnm, hw_if_index, p[0],
+					      /* redistribute */ 0);
+  if (error)
+    clib_error_report (error);
+}
+
+MC_SERIALIZE_MSG (vnet_hw_interface_set_class_msg, static) =
+{
+.name = "vnet_hw_interface_set_class",.serialize =
+    serialize_vnet_hw_interface_set_class,.unserialize =
+    unserialize_vnet_hw_interface_set_class,};
+
+void
+vnet_hw_interface_init_for_class (vnet_main_t * vnm, u32 hw_if_index,
+				  u32 hw_class_index, u32 hw_instance)
+{
+  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
+  vnet_hw_interface_class_t *hc =
+    vnet_get_hw_interface_class (vnm, hw_class_index);
+
+  hi->hw_class_index = hw_class_index;
+  hi->hw_instance = hw_instance;
+  setup_output_node (vnm->vlib_main, hi->output_node_index, hc);
+}
+
+static clib_error_t *
+vnet_hw_interface_set_class_helper (vnet_main_t * vnm, u32 hw_if_index,
+				    u32 hw_class_index, u32 redistribute)
+{
+  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
+  vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, hi->sw_if_index);
+  vnet_hw_interface_class_t *old_class =
+    vnet_get_hw_interface_class (vnm, hi->hw_class_index);
+  vnet_hw_interface_class_t *new_class =
+    vnet_get_hw_interface_class (vnm, hw_class_index);
+  vnet_device_class_t *dev_class =
+    vnet_get_device_class (vnm, hi->dev_class_index);
+  clib_error_t *error = 0;
+
+  /* New class equals old class?  Nothing to do. */
+  if (hi->hw_class_index == hw_class_index)
+    return 0;
+
+  /* No need (and incorrect since admin up flag may be set) to do error checking when
+     receiving unserialize message. */
+  if (redistribute)
+    {
+      if (si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+	return clib_error_return (0,
+				  "%v must be admin down to change class from %s to %s",
+				  hi->name, old_class->name, new_class->name);
+
+      /* Make sure interface supports given class. */
+      if ((new_class->is_valid_class_for_interface
+	   && !new_class->is_valid_class_for_interface (vnm, hw_if_index,
+							hw_class_index))
+	  || (dev_class->is_valid_class_for_interface
+	      && !dev_class->is_valid_class_for_interface (vnm, hw_if_index,
+							   hw_class_index)))
+	return clib_error_return (0,
+				  "%v class cannot be changed from %s to %s",
+				  hi->name, old_class->name, new_class->name);
+
+      if (vnm->vlib_main->mc_main)
+	{
+	  mc_serialize (vnm->vlib_main->mc_main,
+			&vnet_hw_interface_set_class_msg, hw_if_index,
+			new_class->name);
+	  return 0;
+	}
+    }
+
+  if (old_class->hw_class_change)
+    old_class->hw_class_change (vnm, hw_if_index, old_class->index,
+				new_class->index);
+
+  vnet_hw_interface_init_for_class (vnm, hw_if_index, new_class->index,
+				    /* instance */ ~0);
+
+  if (new_class->hw_class_change)
+    new_class->hw_class_change (vnm, hw_if_index, old_class->index,
+				new_class->index);
+
+  if (dev_class->hw_class_change)
+    dev_class->hw_class_change (vnm, hw_if_index, new_class->index);
+
+  return error;
+}
+
+clib_error_t *
+vnet_hw_interface_set_class (vnet_main_t * vnm, u32 hw_if_index,
+			     u32 hw_class_index)
+{
+  return vnet_hw_interface_set_class_helper (vnm, hw_if_index, hw_class_index,
+					     /* redistribute */ 1);
+}
+
+static int
+vnet_hw_interface_rx_redirect_to_node_helper (vnet_main_t * vnm,
+					      u32 hw_if_index,
+					      u32 node_index,
+					      u32 redistribute)
+{
+  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
+  vnet_device_class_t *dev_class = vnet_get_device_class
+    (vnm, hi->dev_class_index);
+
+  if (redistribute)
+    {
+      /* $$$$ fixme someday maybe */
+      ASSERT (vnm->vlib_main->mc_main == 0);
+    }
+  if (dev_class->rx_redirect_to_node)
+    {
+      dev_class->rx_redirect_to_node (vnm, hw_if_index, node_index);
+      return 0;
+    }
+
+  return VNET_API_ERROR_UNIMPLEMENTED;
+}
+
+int
+vnet_hw_interface_rx_redirect_to_node (vnet_main_t * vnm, u32 hw_if_index,
+				       u32 node_index)
+{
+  return vnet_hw_interface_rx_redirect_to_node_helper (vnm, hw_if_index,
+						       node_index,
+						       1 /* redistribute */ );
+}
+
+word
+vnet_sw_interface_compare (vnet_main_t * vnm,
+			   uword sw_if_index0, uword sw_if_index1)
+{
+  vnet_sw_interface_t *sup0 = vnet_get_sup_sw_interface (vnm, sw_if_index0);
+  vnet_sw_interface_t *sup1 = vnet_get_sup_sw_interface (vnm, sw_if_index1);
+  vnet_hw_interface_t *h0 = vnet_get_hw_interface (vnm, sup0->hw_if_index);
+  vnet_hw_interface_t *h1 = vnet_get_hw_interface (vnm, sup1->hw_if_index);
+
+  if (h0 != h1)
+    return vec_cmp (h0->name, h1->name);
+  return (word) h0->hw_instance - (word) h1->hw_instance;
+}
+
+word
+vnet_hw_interface_compare (vnet_main_t * vnm,
+			   uword hw_if_index0, uword hw_if_index1)
+{
+  vnet_hw_interface_t *h0 = vnet_get_hw_interface (vnm, hw_if_index0);
+  vnet_hw_interface_t *h1 = vnet_get_hw_interface (vnm, hw_if_index1);
+
+  if (h0 != h1)
+    return vec_cmp (h0->name, h1->name);
+  return (word) h0->hw_instance - (word) h1->hw_instance;
+}
+
+int
+vnet_sw_interface_is_p2p (vnet_main_t * vnm, u32 sw_if_index)
+{
+  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  vnet_hw_interface_class_t *hc =
+    vnet_get_hw_interface_class (vnm, hw->hw_class_index);
+
+  return (hc->flags & VNET_HW_INTERFACE_CLASS_FLAG_P2P);
+}
+
+clib_error_t *
+vnet_interface_init (vlib_main_t * vm)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vlib_buffer_t *b = 0;
+  vnet_buffer_opaque_t *o = 0;
+
+  /*
+   * Keep people from shooting themselves in the foot.
+   */
+  if (sizeof (b->opaque) != sizeof (vnet_buffer_opaque_t))
+    {
+#define _(a) if (sizeof(o->a) > sizeof (o->unused))                     \
+      clib_warning                                                      \
+        ("FATAL: size of opaque union subtype %s is %d (max %d)",       \
+         #a, sizeof(o->a), sizeof (o->unused));
+      foreach_buffer_opaque_union_subtype;
+#undef _
+
+      return clib_error_return
+	(0, "FATAL: size of vlib buffer opaque %d, size of vnet opaque %d",
+	 sizeof (b->opaque), sizeof (vnet_buffer_opaque_t));
+    }
+
+  im->sw_if_counter_lock = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
+						   CLIB_CACHE_LINE_BYTES);
+  im->sw_if_counter_lock[0] = 1;	/* should be no need */
+
+  vec_validate (im->sw_if_counters, VNET_N_SIMPLE_INTERFACE_COUNTER - 1);
+  im->sw_if_counters[VNET_INTERFACE_COUNTER_DROP].name = "drops";
+  im->sw_if_counters[VNET_INTERFACE_COUNTER_PUNT].name = "punts";
+  im->sw_if_counters[VNET_INTERFACE_COUNTER_IP4].name = "ip4";
+  im->sw_if_counters[VNET_INTERFACE_COUNTER_IP6].name = "ip6";
+  im->sw_if_counters[VNET_INTERFACE_COUNTER_RX_NO_BUF].name = "rx-no-buf";
+  im->sw_if_counters[VNET_INTERFACE_COUNTER_RX_MISS].name = "rx-miss";
+  im->sw_if_counters[VNET_INTERFACE_COUNTER_RX_ERROR].name = "rx-error";
+  im->sw_if_counters[VNET_INTERFACE_COUNTER_TX_ERROR].name = "tx-error";
+
+  vec_validate (im->combined_sw_if_counters,
+		VNET_N_COMBINED_INTERFACE_COUNTER - 1);
+  im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_RX].name = "rx";
+  im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_TX].name = "tx";
+
+  im->sw_if_counter_lock[0] = 0;
+
+  im->device_class_by_name = hash_create_string ( /* size */ 0,
+						 sizeof (uword));
+  {
+    vnet_device_class_t *c;
+
+    c = vnm->device_class_registrations;
+
+    while (c)
+      {
+	c->index = vec_len (im->device_classes);
+	hash_set_mem (im->device_class_by_name, c->name, c->index);
+	vec_add1 (im->device_classes, c[0]);
+	c = c->next_class_registration;
+      }
+  }
+
+  im->hw_interface_class_by_name = hash_create_string ( /* size */ 0,
+						       sizeof (uword));
+
+  im->sw_if_index_by_sup_and_sub = hash_create_mem (0, sizeof (u64),
+						    sizeof (uword));
+  {
+    vnet_hw_interface_class_t *c;
+
+    c = vnm->hw_interface_class_registrations;
+
+    while (c)
+      {
+	c->index = vec_len (im->hw_interface_classes);
+	hash_set_mem (im->hw_interface_class_by_name, c->name, c->index);
+
+	if (NULL == c->build_rewrite)
+	  c->build_rewrite = default_build_rewrite;
+	if (NULL == c->update_adjacency)
+	  c->update_adjacency = default_update_adjacency;
+
+	vec_add1 (im->hw_interface_classes, c[0]);
+	c = c->next_class_registration;
+      }
+  }
+
+  {
+    clib_error_t *error;
+
+    if ((error = vlib_call_init_function (vm, vnet_interface_cli_init)))
+      return error;
+
+    return error;
+  }
+  vnm->interface_tag_by_sw_if_index = hash_create (0, sizeof (uword));
+}
+
+VLIB_INIT_FUNCTION (vnet_interface_init);
+
+/* Kludge to renumber interface names [only!] */
+int
+vnet_interface_name_renumber (u32 sw_if_index, u32 new_show_dev_instance)
+{
+  int rv;
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+
+  vnet_device_class_t *dev_class = vnet_get_device_class
+    (vnm, hi->dev_class_index);
+
+  if (dev_class->name_renumber == 0 || dev_class->format_device_name == 0)
+    return VNET_API_ERROR_UNIMPLEMENTED;
+
+  rv = dev_class->name_renumber (hi, new_show_dev_instance);
+
+  if (rv)
+    return rv;
+
+  hash_unset_mem (im->hw_interface_by_name, hi->name);
+  vec_free (hi->name);
+  /* Use the mapping we set up to call it Ishmael */
+  hi->name = format (0, "%U", dev_class->format_device_name,
+		     hi->dev_instance);
+
+  hash_set_mem (im->hw_interface_by_name, hi->name, hi->hw_if_index);
+  return rv;
+}
+
+clib_error_t *
+vnet_rename_interface (vnet_main_t * vnm, u32 hw_if_index, char *new_name)
+{
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vlib_main_t *vm = vnm->vlib_main;
+  vnet_hw_interface_t *hw;
+  u8 *old_name;
+  clib_error_t *error = 0;
+
+  hw = vnet_get_hw_interface (vnm, hw_if_index);
+  if (!hw)
+    {
+      return clib_error_return (0,
+				"unable to find hw interface for index %u",
+				hw_if_index);
+    }
+
+  old_name = hw->name;
+
+  /* set new hw->name */
+  hw->name = format (0, "%s", new_name);
+
+  /* remove the old name to hw_if_index mapping and install the new one */
+  hash_unset_mem (im->hw_interface_by_name, old_name);
+  hash_set_mem (im->hw_interface_by_name, hw->name, hw_if_index);
+
+  /* rename tx/output nodes */
+  vlib_node_rename (vm, hw->tx_node_index, "%v-tx", hw->name);
+  vlib_node_rename (vm, hw->output_node_index, "%v-output", hw->name);
+
+  /* free the old name vector */
+  vec_free (old_name);
+
+  return error;
+}
+
+static clib_error_t *
+vnet_hw_interface_change_mac_address_helper (vnet_main_t * vnm,
+					     u32 hw_if_index, u64 mac_address)
+{
+  clib_error_t *error = 0;
+  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
+
+  if (hi->hw_address)
+    {
+      vnet_device_class_t *dev_class =
+	vnet_get_device_class (vnm, hi->dev_class_index);
+      if (dev_class->mac_addr_change_function)
+	{
+	  error =
+	    dev_class->mac_addr_change_function (hi, (char *) &mac_address);
+	}
+      if (!error)
+	{
+	  vnet_hw_interface_class_t *hw_class;
+
+	  hw_class = vnet_get_hw_interface_class (vnm, hi->hw_class_index);
+
+	  if (NULL != hw_class->mac_addr_change_function)
+	    hw_class->mac_addr_change_function (hi, (char *) &mac_address);
+	}
+      else
+	{
+	  error =
+	    clib_error_return (0,
+			       "MAC Address Change is not supported on this interface");
+	}
+    }
+  else
+    {
+      error =
+	clib_error_return (0,
+			   "mac address change is not supported for interface index %u",
+			   hw_if_index);
+    }
+  return error;
+}
+
+clib_error_t *
+vnet_hw_interface_change_mac_address (vnet_main_t * vnm, u32 hw_if_index,
+				      u64 mac_address)
+{
+  return vnet_hw_interface_change_mac_address_helper
+    (vnm, hw_if_index, mac_address);
+}
+
+vnet_l3_packet_type_t
+vnet_link_to_l3_proto (vnet_link_t link)
+{
+  switch (link)
+    {
+    case VNET_LINK_IP4:
+      return (VNET_L3_PACKET_TYPE_IP4);
+    case VNET_LINK_IP6:
+      return (VNET_L3_PACKET_TYPE_IP6);
+    case VNET_LINK_MPLS:
+      return (VNET_L3_PACKET_TYPE_MPLS_UNICAST);
+    case VNET_LINK_ARP:
+      return (VNET_L3_PACKET_TYPE_ARP);
+    case VNET_LINK_ETHERNET:
+      ASSERT (0);
+      break;
+    }
+  ASSERT (0);
+  return (0);
+}
+
+u8 *
+default_build_rewrite (vnet_main_t * vnm,
+		       u32 sw_if_index,
+		       vnet_link_t link_type, const void *dst_address)
+{
+  return (NULL);
+}
+
+void
+default_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
+{
+  u8 *rewrite;
+
+  rewrite = vnet_build_rewrite_for_sw_interface (vnm, sw_if_index,
+						 adj_get_link_type (ai),
+						 NULL);
+
+  adj_nbr_update_rewrite (ai, ADJ_NBR_REWRITE_FLAG_COMPLETE, rewrite);
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/interface.h b/src/vnet/interface.h
new file mode 100644
index 00000000..d42e5fda
--- /dev/null
+++ b/src/vnet/interface.h
@@ -0,0 +1,658 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * interface.h: VNET interfaces/sub-interfaces
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vnet_interface_h
+#define included_vnet_interface_h
+
+#include <vnet/unix/pcap.h>
+#include <vnet/l3_types.h>
+
+struct vnet_main_t;
+struct vnet_hw_interface_t;
+struct vnet_sw_interface_t;
+struct ip46_address_t;
+
+/* Interface up/down callback. */
+typedef clib_error_t *(vnet_interface_function_t)
+  (struct vnet_main_t * vnm, u32 if_index, u32 flags);
+
+/* Sub-interface add/del callback. */
+typedef clib_error_t *(vnet_subif_add_del_function_t)
+  (struct vnet_main_t * vnm, u32 if_index,
+   struct vnet_sw_interface_t * template, int is_add);
+
+/* Interface set mac address callback. */
+typedef clib_error_t *(vnet_interface_set_mac_address_function_t)
+  (struct vnet_hw_interface_t * hi, char *address);
+
+typedef enum vnet_interface_function_priority_t_
+{
+  VNET_ITF_FUNC_PRIORITY_LOW,
+  VNET_ITF_FUNC_PRIORITY_HIGH,
+} vnet_interface_function_priority_t;
+#define VNET_ITF_FUNC_N_PRIO ((vnet_interface_function_priority_t)VNET_ITF_FUNC_PRIORITY_HIGH+1)
+
+typedef struct _vnet_interface_function_list_elt
+{
+  struct _vnet_interface_function_list_elt *next_interface_function;
+  clib_error_t *(*fp) (struct vnet_main_t * vnm, u32 if_index, u32 flags);
+} _vnet_interface_function_list_elt_t;
+
+#define _VNET_INTERFACE_FUNCTION_DECL(f,tag)                            \
+                                                                        \
+static void __vnet_interface_function_init_##tag##_##f (void)           \
+    __attribute__((__constructor__)) ;                                  \
+                                                                        \
+static void __vnet_interface_function_init_##tag##_##f (void)           \
+{                                                                       \
+ vnet_main_t * vnm = vnet_get_main();                                   \
+ static _vnet_interface_function_list_elt_t init_function;              \
+ init_function.next_interface_function =                                \
+   vnm->tag##_functions[VNET_ITF_FUNC_PRIORITY_LOW];                    \
+ vnm->tag##_functions[VNET_ITF_FUNC_PRIORITY_LOW] = &init_function;     \
+ init_function.fp = (void *) &f;                                        \
+}
+
+#define _VNET_INTERFACE_FUNCTION_DECL_PRIO(f,tag,p)                    \
+                                                                        \
+static void __vnet_interface_function_init_##tag##_##f (void)           \
+    __attribute__((__constructor__)) ;                                  \
+                                                                        \
+static void __vnet_interface_function_init_##tag##_##f (void)           \
+{                                                                       \
+ vnet_main_t * vnm = vnet_get_main();                                   \
+ static _vnet_interface_function_list_elt_t init_function;              \
+ init_function.next_interface_function = vnm->tag##_functions[p];       \
+ vnm->tag##_functions[p] = &init_function;                              \
+ init_function.fp = (void *) &f;                                        \
+}
+
+#define VNET_HW_INTERFACE_ADD_DEL_FUNCTION(f)			\
+  _VNET_INTERFACE_FUNCTION_DECL(f,hw_interface_add_del)
+#define VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION(f)		\
+  _VNET_INTERFACE_FUNCTION_DECL(f,hw_interface_link_up_down)
+#define VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION_PRIO(f,p)        \
+  _VNET_INTERFACE_FUNCTION_DECL_PRIO(f,hw_interface_link_up_down,p)
+#define VNET_SW_INTERFACE_ADD_DEL_FUNCTION(f)			\
+  _VNET_INTERFACE_FUNCTION_DECL(f,sw_interface_add_del)
+#define VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION(f)		\
+  _VNET_INTERFACE_FUNCTION_DECL(f,sw_interface_admin_up_down)
+#define VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION_PRIO(f,p)     	\
+  _VNET_INTERFACE_FUNCTION_DECL_PRIO(f,sw_interface_admin_up_down, p)
+
+/* A class of hardware interface devices. */
+typedef struct _vnet_device_class
+{
+  /* Index into main vector. */
+  u32 index;
+
+  /* Device name (e.g. "FOOBAR 1234a"). */
+  char *name;
+
+  /* Function to call when hardware interface is added/deleted. */
+  vnet_interface_function_t *interface_add_del_function;
+
+  /* Function to bring device administratively up/down. */
+  vnet_interface_function_t *admin_up_down_function;
+
+  /* Function to call when sub-interface is added/deleted */
+  vnet_subif_add_del_function_t *subif_add_del_function;
+
+  /* Redistribute flag changes/existence of this interface class. */
+  u32 redistribute;
+
+  /* Transmit function. */
+  vlib_node_function_t *tx_function;
+
+  /* Error strings indexed by error code for this node. */
+  char **tx_function_error_strings;
+
+  /* Number of error codes used by this node. */
+  u32 tx_function_n_errors;
+
+  /* Renumber device name [only!] support, a control-plane kludge */
+  int (*name_renumber) (struct vnet_hw_interface_t * hi,
+			u32 new_dev_instance);
+
+  /* Format device instance as name. */
+  format_function_t *format_device_name;
+
+  /* Parse function for device name. */
+  unformat_function_t *unformat_device_name;
+
+  /* Format device verbosely for this class. */
+  format_function_t *format_device;
+
+  /* Trace buffer format for TX function. */
+  format_function_t *format_tx_trace;
+
+  /* Function to clear hardware counters for device. */
+  void (*clear_counters) (u32 dev_class_instance);
+
+    uword (*is_valid_class_for_interface) (struct vnet_main_t * vnm,
+					   u32 hw_if_index,
+					   u32 hw_class_index);
+
+  /* Called when hardware class of an interface changes. */
+  void (*hw_class_change) (struct vnet_main_t * vnm,
+			   u32 hw_if_index, u32 new_hw_class_index);
+
+  /* Called to redirect traffic from a specific interface instance */
+  void (*rx_redirect_to_node) (struct vnet_main_t * vnm,
+			       u32 hw_if_index, u32 node_index);
+
+  /* Link-list of all device classes set up by constructors created below */
+  struct _vnet_device_class *next_class_registration;
+
+  /* Splice vnet_interface_output_node into TX path */
+  u8 flatten_output_chains;
+
+  /* Function to set mac address. */
+  vnet_interface_set_mac_address_function_t *mac_addr_change_function;
+} vnet_device_class_t;
+
+#define VNET_DEVICE_CLASS(x,...)                                        \
+  __VA_ARGS__ vnet_device_class_t x;                                    \
+static void __vnet_add_device_class_registration_##x (void)             \
+    __attribute__((__constructor__)) ;                                  \
+static void __vnet_add_device_class_registration_##x (void)             \
+{                                                                       \
+    vnet_main_t * vnm = vnet_get_main();                                \
+    x.next_class_registration = vnm->device_class_registrations;        \
+    vnm->device_class_registrations = &x;                               \
+}                                                                       \
+__VA_ARGS__ vnet_device_class_t x
+
+#define VLIB_DEVICE_TX_FUNCTION_CLONE_TEMPLATE(arch, fn, tgt)		\
+  uword									\
+  __attribute__ ((flatten))						\
+  __attribute__ ((target (tgt)))					\
+  CLIB_CPU_OPTIMIZED							\
+  fn ## _ ## arch ( vlib_main_t * vm,					\
+                   vlib_node_runtime_t * node,				\
+                   vlib_frame_t * frame)				\
+  { return fn (vm, node, frame); }
+
+#define VLIB_DEVICE_TX_FUNCTION_MULTIARCH_CLONE(fn)			\
+  foreach_march_variant(VLIB_DEVICE_TX_FUNCTION_CLONE_TEMPLATE, fn)
+
+#if CLIB_DEBUG > 0
+#define VLIB_MULTIARCH_CLONE_AND_SELECT_FN(fn,...)
+#define VLIB_DEVICE_TX_FUNCTION_MULTIARCH(dev, fn)
+#else
+#define VLIB_DEVICE_TX_FUNCTION_MULTIARCH(dev, fn)			\
+  VLIB_DEVICE_TX_FUNCTION_MULTIARCH_CLONE(fn)				\
+  CLIB_MULTIARCH_SELECT_FN(fn, static inline)				\
+  static void __attribute__((__constructor__))				\
+  __vlib_device_tx_function_multiarch_select_##dev (void)		\
+  { dev.tx_function = fn ## _multiarch_select(); }
+#endif
+
+/**
+ * Link Type: A description of the protocol of packets on the link.
+ * On an ethernet link this maps directly into the ethertype. On a GRE tunnel
+ * it maps to the GRE-proto, etc for other lnk types.
+ */
+typedef enum vnet_link_t_
+{
+#if CLIB_DEBUG > 0
+  VNET_LINK_IP4 = 1,
+#else
+  VNET_LINK_IP4 = 0,
+#endif
+  VNET_LINK_IP6,
+  VNET_LINK_MPLS,
+  VNET_LINK_ETHERNET,
+  VNET_LINK_ARP,
+} __attribute__ ((packed)) vnet_link_t;
+
+#define VNET_LINKS {                   \
+    [VNET_LINK_ETHERNET] = "ethernet", \
+    [VNET_LINK_IP4] = "ipv4",          \
+    [VNET_LINK_IP6] = "ipv6",          \
+    [VNET_LINK_MPLS] = "mpls",         \
+    [VNET_LINK_ARP] = "arp",	       \
+}
+
+/**
+ * @brief Number of link types. Not part of the enum so it does not have to be included in
+ * switch statements
+ */
+#define VNET_LINK_NUM (VNET_LINK_ARP+1)
+
+/**
+ * @brief Convert a link to to an Ethertype
+ */
+extern vnet_l3_packet_type_t vnet_link_to_l3_proto (vnet_link_t link);
+
+/**
+ * @brief Attributes assignable to a HW interface Class.
+ */
+typedef enum vnet_hw_interface_class_flags_t_
+{
+  /**
+   * @brief a point 2 point interface
+   */
+  VNET_HW_INTERFACE_CLASS_FLAG_P2P = (1 << 0),
+} vnet_hw_interface_class_flags_t;
+
+/* Layer-2 (e.g. Ethernet) interface class. */
+typedef struct _vnet_hw_interface_class
+{
+  /* Index into main vector. */
+  u32 index;
+
+  /* Class name (e.g. "Ethernet"). */
+  char *name;
+
+  /* Flags */
+  vnet_hw_interface_class_flags_t flags;
+
+  /* Function to call when hardware interface is added/deleted. */
+  vnet_interface_function_t *interface_add_del_function;
+
+  /* Function to bring interface administratively up/down. */
+  vnet_interface_function_t *admin_up_down_function;
+
+  /* Function to call when link state changes. */
+  vnet_interface_function_t *link_up_down_function;
+
+  /* Function to call when link MAC changes. */
+  vnet_interface_set_mac_address_function_t *mac_addr_change_function;
+
+  /* Format function to display interface name. */
+  format_function_t *format_interface_name;
+
+  /* Format function to display interface address. */
+  format_function_t *format_address;
+
+  /* Format packet header for this interface class. */
+  format_function_t *format_header;
+
+  /* Format device verbosely for this class. */
+  format_function_t *format_device;
+
+  /* Parser for hardware (e.g. ethernet) address. */
+  unformat_function_t *unformat_hw_address;
+
+  /* Parser for packet header for e.g. rewrite string. */
+  unformat_function_t *unformat_header;
+
+  /* Builds a rewrite string for the interface to the destination
+   * for the payload/link type. */
+  u8 *(*build_rewrite) (struct vnet_main_t * vnm,
+			u32 sw_if_index,
+			vnet_link_t link_type, const void *dst_hw_address);
+
+  /* Update an adjacecny added by FIB (as opposed to via the
+   * neighbour resolution protocol). */
+  void (*update_adjacency) (struct vnet_main_t * vnm,
+			    u32 sw_if_index, u32 adj_index);
+
+    uword (*is_valid_class_for_interface) (struct vnet_main_t * vnm,
+					   u32 hw_if_index,
+					   u32 hw_class_index);
+
+  /* Called when hw interface class is changed and old hardware instance
+     may want to be deleted. */
+  void (*hw_class_change) (struct vnet_main_t * vnm, u32 hw_if_index,
+			   u32 old_class_index, u32 new_class_index);
+
+  /* List of hw interface classes, built by constructors */
+  struct _vnet_hw_interface_class *next_class_registration;
+
+} vnet_hw_interface_class_t;
+
+/**
+ * @brief Return a complete, zero-length (aka dummy) rewrite
+ */
+extern u8 *default_build_rewrite (struct vnet_main_t *vnm,
+				  u32 sw_if_index,
+				  vnet_link_t link_type,
+				  const void *dst_hw_address);
+
+/**
+ * @brief Default adjacency update function
+ */
+extern void default_update_adjacency (struct vnet_main_t *vnm,
+				      u32 sw_if_index, u32 adj_index);
+
+#define VNET_HW_INTERFACE_CLASS(x,...)                                  \
+  __VA_ARGS__ vnet_hw_interface_class_t x;                              \
+static void __vnet_add_hw_interface_class_registration_##x (void)       \
+    __attribute__((__constructor__)) ;                                  \
+static void __vnet_add_hw_interface_class_registration_##x (void)       \
+{                                                                       \
+    vnet_main_t * vnm = vnet_get_main();                                \
+    x.next_class_registration = vnm->hw_interface_class_registrations;  \
+    vnm->hw_interface_class_registrations = &x;                         \
+}                                                                       \
+__VA_ARGS__ vnet_hw_interface_class_t x
+
+/* Hardware-interface.  This corresponds to a physical wire
+   that packets flow over. */
+typedef struct vnet_hw_interface_t
+{
+  /* Interface name. */
+  u8 *name;
+
+  u32 flags;
+  /* Hardware link state is up. */
+#define VNET_HW_INTERFACE_FLAG_LINK_UP		(1 << 0)
+  /* Hardware duplex state */
+#define VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT	1
+#define VNET_HW_INTERFACE_FLAG_HALF_DUPLEX	(1 << 1)
+#define VNET_HW_INTERFACE_FLAG_FULL_DUPLEX	(1 << 2)
+#define VNET_HW_INTERFACE_FLAG_DUPLEX_MASK	\
+  (VNET_HW_INTERFACE_FLAG_HALF_DUPLEX |		\
+   VNET_HW_INTERFACE_FLAG_FULL_DUPLEX)
+
+  /* Hardware link speed */
+#define VNET_HW_INTERFACE_FLAG_SPEED_SHIFT	3
+#define VNET_HW_INTERFACE_FLAG_SPEED_10M	(1 << 3)
+#define VNET_HW_INTERFACE_FLAG_SPEED_100M	(1 << 4)
+#define VNET_HW_INTERFACE_FLAG_SPEED_1G		(1 << 5)
+#define VNET_HW_INTERFACE_FLAG_SPEED_10G	(1 << 6)
+#define VNET_HW_INTERFACE_FLAG_SPEED_40G	(1 << 7)
+#define VNET_HW_INTERFACE_FLAG_SPEED_100G	(1 << 8)
+#define VNET_HW_INTERFACE_FLAG_SPEED_MASK	\
+  (VNET_HW_INTERFACE_FLAG_SPEED_10M |		\
+   VNET_HW_INTERFACE_FLAG_SPEED_100M |		\
+   VNET_HW_INTERFACE_FLAG_SPEED_1G |		\
+   VNET_HW_INTERFACE_FLAG_SPEED_10G |		\
+   VNET_HW_INTERFACE_FLAG_SPEED_40G |		\
+   VNET_HW_INTERFACE_FLAG_SPEED_100G)
+
+  /* l2output node flags */
+#define VNET_HW_INTERFACE_FLAG_L2OUTPUT_SHIFT	9
+#define VNET_HW_INTERFACE_FLAG_L2OUTPUT_MAPPED	(1 << 9)
+
+  /* Hardware address as vector.  Zero (e.g. zero-length vector) if no
+     address for this class (e.g. PPP). */
+  u8 *hw_address;
+
+  /* Interface is up as far as software is concerned. */
+  /* NAME.{output,tx} nodes for this interface. */
+  u32 output_node_index, tx_node_index;
+
+  /* (dev_class, dev_instance) uniquely identifies hw interface. */
+  u32 dev_class_index;
+  u32 dev_instance;
+
+  /* (hw_class, hw_instance) uniquely identifies hw interface. */
+  u32 hw_class_index;
+  u32 hw_instance;
+
+  /* Hardware index for this hardware interface. */
+  u32 hw_if_index;
+
+  /* Software index for this hardware interface. */
+  u32 sw_if_index;
+
+  /* Maximum transmit rate for this interface in bits/sec. */
+  f64 max_rate_bits_per_sec;
+
+  /* Smallest packet size supported by this interface. */
+  u32 min_supported_packet_bytes;
+
+  /* Largest packet size supported by this interface. */
+  u32 max_supported_packet_bytes;
+
+  /* Smallest packet size for this interface. */
+  u32 min_packet_bytes;
+
+  /* Largest packet size for this interface. */
+  u32 max_packet_bytes;
+
+  /* Number of extra bytes that go on the wire.
+     Packet length on wire
+     = max (length + per_packet_overhead_bytes, min_packet_bytes). */
+  u32 per_packet_overhead_bytes;
+
+  /* Receive and transmit layer 3 packet size limits (MRU/MTU). */
+  u32 max_l3_packet_bytes[VLIB_N_RX_TX];
+
+  /* Hash table mapping sub interface id to sw_if_index. */
+  uword *sub_interface_sw_if_index_by_id;
+
+  /* Count of number of L2 subinterfaces */
+  u32 l2_if_count;
+
+  /* Bonded interface info -
+     0       - not a bonded interface nor a slave
+     ~0      - slave to a bonded interface
+     others  - A bonded interface with a pointer to bitmap for all slaves */
+  uword *bond_info;
+#define VNET_HW_INTERFACE_BOND_INFO_NONE ((uword *) 0)
+#define VNET_HW_INTERFACE_BOND_INFO_SLAVE ((uword *) ~0)
+
+} vnet_hw_interface_t;
+
+extern vnet_device_class_t vnet_local_interface_device_class;
+
+typedef enum
+{
+  /* A hw interface. */
+  VNET_SW_INTERFACE_TYPE_HARDWARE,
+
+  /* A sub-interface. */
+  VNET_SW_INTERFACE_TYPE_SUB,
+} vnet_sw_interface_type_t;
+
+typedef struct
+{
+  /*
+   * Subinterface ID. A number 0-N to uniquely identify
+   * this subinterface under the main (parent?) interface
+   */
+  u32 id;
+
+  /* Classification data. Used to associate packet header with subinterface. */
+  struct
+  {
+    u16 outer_vlan_id;
+    u16 inner_vlan_id;
+    union
+    {
+      u16 raw_flags;
+      struct
+      {
+	u16 no_tags:1;
+	u16 one_tag:1;
+	u16 two_tags:1;
+	u16 dot1ad:1;		/* 0 = dot1q, 1=dot1ad */
+	u16 exact_match:1;
+	u16 default_sub:1;
+	u16 outer_vlan_id_any:1;
+	u16 inner_vlan_id_any:1;
+      } flags;
+    };
+  } eth;
+} vnet_sub_interface_t;
+
+typedef enum
+{
+  /* Always flood */
+  VNET_FLOOD_CLASS_NORMAL,
+  VNET_FLOOD_CLASS_TUNNEL_MASTER,
+  /* Does not flood when tunnel master is in the same L2 BD */
+  VNET_FLOOD_CLASS_TUNNEL_NORMAL
+} vnet_flood_class_t;
+
+/* Software-interface.  This corresponds to a Ethernet VLAN, ATM vc, a
+   tunnel, etc.  Configuration (e.g. IP address) gets attached to
+   software interface. */
+typedef struct
+{
+  vnet_sw_interface_type_t type:16;
+
+  u16 flags;
+  /* Interface is "up" meaning adminstratively up.
+     Up in the sense of link state being up is maintained by hardware interface. */
+#define VNET_SW_INTERFACE_FLAG_ADMIN_UP (1 << 0)
+
+  /* Interface is disabled for forwarding: punt all traffic to slow-path. */
+#define VNET_SW_INTERFACE_FLAG_PUNT (1 << 1)
+
+#define VNET_SW_INTERFACE_FLAG_PROXY_ARP (1 << 2)
+
+#define VNET_SW_INTERFACE_FLAG_UNNUMBERED (1 << 3)
+
+#define VNET_SW_INTERFACE_FLAG_BOND_SLAVE (1 << 4)
+
+  /* Index for this interface. */
+  u32 sw_if_index;
+
+  /* Software interface index of super-interface;
+     equal to sw_if_index if this interface is not a
+     sub-interface. */
+  u32 sup_sw_if_index;
+
+  /* this swif is unnumbered, use addresses on unnumbered_sw_if_index... */
+  u32 unnumbered_sw_if_index;
+
+  u32 link_speed;
+
+  union
+  {
+    /* VNET_SW_INTERFACE_TYPE_HARDWARE. */
+    u32 hw_if_index;
+
+    /* VNET_SW_INTERFACE_TYPE_SUB. */
+    vnet_sub_interface_t sub;
+  };
+
+  vnet_flood_class_t flood_class;
+} vnet_sw_interface_t;
+
+typedef enum
+{
+  /* Simple counters. */
+  VNET_INTERFACE_COUNTER_DROP = 0,
+  VNET_INTERFACE_COUNTER_PUNT = 1,
+  VNET_INTERFACE_COUNTER_IP4 = 2,
+  VNET_INTERFACE_COUNTER_IP6 = 3,
+  VNET_INTERFACE_COUNTER_RX_NO_BUF = 4,
+  VNET_INTERFACE_COUNTER_RX_MISS = 5,
+  VNET_INTERFACE_COUNTER_RX_ERROR = 6,
+  VNET_INTERFACE_COUNTER_TX_ERROR = 7,
+  VNET_INTERFACE_COUNTER_MPLS = 8,
+  VNET_N_SIMPLE_INTERFACE_COUNTER = 9,
+  /* Combined counters. */
+  VNET_INTERFACE_COUNTER_RX = 0,
+  VNET_INTERFACE_COUNTER_TX = 1,
+  VNET_N_COMBINED_INTERFACE_COUNTER = 2,
+} vnet_interface_counter_type_t;
+
+typedef struct
+{
+  u32 output_node_index;
+  u32 tx_node_index;
+} vnet_hw_interface_nodes_t;
+
+typedef struct
+{
+  /* Hardware interfaces. */
+  vnet_hw_interface_t *hw_interfaces;
+
+  /* Hash table mapping HW interface name to index. */
+  uword *hw_interface_by_name;
+
+  /* Vectors if hardware interface classes and device classes. */
+  vnet_hw_interface_class_t *hw_interface_classes;
+  vnet_device_class_t *device_classes;
+
+  /* Hash table mapping name to hw interface/device class. */
+  uword *hw_interface_class_by_name;
+  uword *device_class_by_name;
+
+  /* Software interfaces. */
+  vnet_sw_interface_t *sw_interfaces;
+
+  /* Hash table mapping sub intfc sw_if_index by sup sw_if_index and sub id */
+  uword *sw_if_index_by_sup_and_sub;
+
+  /* Software interface counters both simple and combined
+     packet and byte counters. */
+  volatile u32 *sw_if_counter_lock;
+  vlib_simple_counter_main_t *sw_if_counters;
+  vlib_combined_counter_main_t *combined_sw_if_counters;
+
+  vnet_hw_interface_nodes_t *deleted_hw_interface_nodes;
+
+  /* pcap drop tracing */
+  int drop_pcap_enable;
+  pcap_main_t pcap_main;
+  u8 *pcap_filename;
+  u32 pcap_sw_if_index;
+  u32 pcap_pkts_to_capture;
+  uword *pcap_drop_filter_hash;
+
+  /* feature_arc_index */
+  u8 output_feature_arc_index;
+} vnet_interface_main_t;
+
+static inline void
+vnet_interface_counter_lock (vnet_interface_main_t * im)
+{
+  if (im->sw_if_counter_lock)
+    while (__sync_lock_test_and_set (im->sw_if_counter_lock, 1))
+      /* zzzz */ ;
+}
+
+static inline void
+vnet_interface_counter_unlock (vnet_interface_main_t * im)
+{
+  if (im->sw_if_counter_lock)
+    *im->sw_if_counter_lock = 0;
+}
+
+void vnet_pcap_drop_trace_filter_add_del (u32 error_index, int is_add);
+
+int vnet_interface_name_renumber (u32 sw_if_index, u32 new_show_dev_instance);
+
+#endif /* included_vnet_interface_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c
new file mode 100644
index 00000000..42fd14ee
--- /dev/null
+++ b/src/vnet/interface_api.c
@@ -0,0 +1,725 @@
+/*
+ *------------------------------------------------------------------
+ * interface_api.c - vnet interface api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/l2/l2_vtr.h>
+#include <vnet/vnet_msg_enum.h>
+#include <vnet/fib/fib_api.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                                     \
+_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags)               \
+_(SW_INTERFACE_SET_MTU, sw_interface_set_mtu)                   \
+_(WANT_INTERFACE_EVENTS, want_interface_events)                 \
+_(SW_INTERFACE_DUMP, sw_interface_dump)                         \
+_(SW_INTERFACE_DETAILS, sw_interface_details)                   \
+_(SW_INTERFACE_ADD_DEL_ADDRESS, sw_interface_add_del_address)   \
+_(SW_INTERFACE_SET_TABLE, sw_interface_set_table)               \
+_(SW_INTERFACE_GET_TABLE, sw_interface_get_table)               \
+_(SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered)     \
+_(SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats)           \
+_(SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del)
+
+static void
+vl_api_sw_interface_set_flags_t_handler (vl_api_sw_interface_set_flags_t * mp)
+{
+  vl_api_sw_interface_set_flags_reply_t *rmp;
+  vnet_main_t *vnm = vnet_get_main ();
+  int rv = 0;
+  clib_error_t *error;
+  u16 flags;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  flags = mp->admin_up_down ? VNET_SW_INTERFACE_FLAG_ADMIN_UP : 0;
+
+  error = vnet_sw_interface_set_flags (vnm, ntohl (mp->sw_if_index), flags);
+  if (error)
+    {
+      rv = -1;
+      clib_error_report (error);
+    }
+
+  BAD_SW_IF_INDEX_LABEL;
+  REPLY_MACRO (VL_API_SW_INTERFACE_SET_FLAGS_REPLY);
+}
+
+static void
+vl_api_sw_interface_set_mtu_t_handler (vl_api_sw_interface_set_mtu_t * mp)
+{
+  vl_api_sw_interface_set_mtu_reply_t *rmp;
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 flags = ETHERNET_INTERFACE_FLAG_MTU;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  u16 mtu = ntohs (mp->mtu);
+  ethernet_main_t *em = &ethernet_main;
+  int rv = 0;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, sw_if_index);
+  ethernet_interface_t *eif = ethernet_get_interface (em, sw_if_index);
+
+  if (!eif)
+    {
+      rv = VNET_API_ERROR_FEATURE_DISABLED;
+      goto bad_sw_if_index;
+    }
+
+  if (mtu < hi->min_supported_packet_bytes)
+    {
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto bad_sw_if_index;
+    }
+
+  if (mtu > hi->max_supported_packet_bytes)
+    {
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto bad_sw_if_index;
+    }
+
+  if (hi->max_packet_bytes != mtu)
+    {
+      hi->max_packet_bytes = mtu;
+      ethernet_set_flags (vnm, sw_if_index, flags);
+    }
+
+  BAD_SW_IF_INDEX_LABEL;
+  REPLY_MACRO (VL_API_SW_INTERFACE_SET_MTU_REPLY);
+}
+
+static void
+send_sw_interface_details (vpe_api_main_t * am,
+			   unix_shared_memory_queue_t * q,
+			   vnet_sw_interface_t * swif,
+			   u8 * interface_name, u32 context)
+{
+  vl_api_sw_interface_details_t *mp;
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_hw_interface_t *hi;
+  u8 *tag;
+
+  hi = vnet_get_sup_hw_interface (am->vnet_main, swif->sw_if_index);
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_DETAILS);
+  mp->sw_if_index = ntohl (swif->sw_if_index);
+  mp->sup_sw_if_index = ntohl (swif->sup_sw_if_index);
+  mp->admin_up_down = (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? 1 : 0;
+  mp->link_up_down = (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? 1 : 0;
+  mp->link_duplex = ((hi->flags & VNET_HW_INTERFACE_FLAG_DUPLEX_MASK) >>
+		     VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT);
+  mp->link_speed = ((hi->flags & VNET_HW_INTERFACE_FLAG_SPEED_MASK) >>
+		    VNET_HW_INTERFACE_FLAG_SPEED_SHIFT);
+  mp->link_mtu = ntohs (hi->max_packet_bytes);
+  mp->context = context;
+
+  strncpy ((char *) mp->interface_name,
+	   (char *) interface_name, ARRAY_LEN (mp->interface_name) - 1);
+
+  /* Send the L2 address for ethernet physical intfcs */
+  if (swif->sup_sw_if_index == swif->sw_if_index
+      && hi->hw_class_index == ethernet_hw_interface_class.index)
+    {
+      ethernet_main_t *em = ethernet_get_main (am->vlib_main);
+      ethernet_interface_t *ei;
+
+      ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
+      ASSERT (sizeof (mp->l2_address) >= sizeof (ei->address));
+      clib_memcpy (mp->l2_address, ei->address, sizeof (ei->address));
+      mp->l2_address_length = ntohl (sizeof (ei->address));
+    }
+  else if (swif->sup_sw_if_index != swif->sw_if_index)
+    {
+      vnet_sub_interface_t *sub = &swif->sub;
+      mp->sub_id = ntohl (sub->id);
+      mp->sub_dot1ad = sub->eth.flags.dot1ad;
+      mp->sub_number_of_tags =
+	sub->eth.flags.one_tag + sub->eth.flags.two_tags * 2;
+      mp->sub_outer_vlan_id = ntohs (sub->eth.outer_vlan_id);
+      mp->sub_inner_vlan_id = ntohs (sub->eth.inner_vlan_id);
+      mp->sub_exact_match = sub->eth.flags.exact_match;
+      mp->sub_default = sub->eth.flags.default_sub;
+      mp->sub_outer_vlan_id_any = sub->eth.flags.outer_vlan_id_any;
+      mp->sub_inner_vlan_id_any = sub->eth.flags.inner_vlan_id_any;
+
+      /* vlan tag rewrite data */
+      u32 vtr_op = L2_VTR_DISABLED;
+      u32 vtr_push_dot1q = 0, vtr_tag1 = 0, vtr_tag2 = 0;
+
+      if (l2vtr_get (am->vlib_main, am->vnet_main, swif->sw_if_index,
+		     &vtr_op, &vtr_push_dot1q, &vtr_tag1, &vtr_tag2) != 0)
+	{
+	  // error - default to disabled
+	  mp->vtr_op = ntohl (L2_VTR_DISABLED);
+	  clib_warning ("cannot get vlan tag rewrite for sw_if_index %d",
+			swif->sw_if_index);
+	}
+      else
+	{
+	  mp->vtr_op = ntohl (vtr_op);
+	  mp->vtr_push_dot1q = ntohl (vtr_push_dot1q);
+	  mp->vtr_tag1 = ntohl (vtr_tag1);
+	  mp->vtr_tag2 = ntohl (vtr_tag2);
+	}
+    }
+
+  tag = vnet_get_sw_interface_tag (vnm, swif->sw_if_index);
+  if (tag)
+    strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1);
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_sw_interface_dump_t_handler (vl_api_sw_interface_dump_t * mp)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+  vnet_sw_interface_t *swif;
+  vnet_interface_main_t *im = &am->vnet_main->interface_main;
+  u8 *filter_string = 0, *name_string = 0;
+  unix_shared_memory_queue_t *q;
+  char *strcasestr (char *, char *);	/* lnx hdr file botch */
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+
+  if (q == 0)
+    return;
+
+  if (mp->name_filter_valid)
+    {
+      mp->name_filter[ARRAY_LEN (mp->name_filter) - 1] = 0;
+      filter_string = format (0, "%s%c", mp->name_filter, 0);
+    }
+
+  /* *INDENT-OFF* */
+  pool_foreach (swif, im->sw_interfaces,
+  ({
+    name_string = format (name_string, "%U%c",
+                          format_vnet_sw_interface_name,
+                          am->vnet_main, swif, 0);
+
+    if (mp->name_filter_valid == 0 ||
+        strcasestr((char *) name_string, (char *) filter_string)) {
+
+      send_sw_interface_details (am, q, swif, name_string, mp->context);
+    }
+    _vec_len (name_string) = 0;
+  }));
+  /* *INDENT-ON* */
+
+  vec_free (name_string);
+  vec_free (filter_string);
+}
+
+static void
+  vl_api_sw_interface_add_del_address_t_handler
+  (vl_api_sw_interface_add_del_address_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_sw_interface_add_del_address_reply_t *rmp;
+  int rv = 0;
+  u32 is_del;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  is_del = mp->is_add == 0;
+
+  if (mp->del_all)
+    ip_del_all_interface_addresses (vm, ntohl (mp->sw_if_index));
+  else if (mp->is_ipv6)
+    ip6_add_del_interface_address (vm, ntohl (mp->sw_if_index),
+				   (void *) mp->address,
+				   mp->address_length, is_del);
+  else
+    ip4_add_del_interface_address (vm, ntohl (mp->sw_if_index),
+				   (void *) mp->address,
+				   mp->address_length, is_del);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_ADD_DEL_ADDRESS_REPLY);
+}
+
+void stats_dslock_with_hint (int hint, int tag) __attribute__ ((weak));
+void
+stats_dslock_with_hint (int hint, int tag)
+{
+}
+
+void stats_dsunlock (void) __attribute__ ((weak));
+void
+stats_dsunlock (void)
+{
+}
+
+static void
+vl_api_sw_interface_set_table_t_handler (vl_api_sw_interface_set_table_t * mp)
+{
+  int rv = 0;
+  u32 table_id = ntohl (mp->vrf_id);
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  vl_api_sw_interface_set_table_reply_t *rmp;
+  u32 fib_index;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  stats_dslock_with_hint (1 /* release hint */ , 4 /* tag */ );
+
+  if (mp->is_ipv6)
+    {
+      fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6,
+						     table_id);
+
+      vec_validate (ip6_main.fib_index_by_sw_if_index, sw_if_index);
+      ip6_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
+    }
+  else
+    {
+
+      fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4,
+						     table_id);
+
+      vec_validate (ip4_main.fib_index_by_sw_if_index, sw_if_index);
+      ip4_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
+    }
+  stats_dsunlock ();
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_SET_TABLE_REPLY);
+}
+
+static void
+send_sw_interface_get_table_reply (unix_shared_memory_queue_t * q,
+				   u32 context, int retval, u32 vrf_id)
+{
+  vl_api_sw_interface_get_table_reply_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_GET_TABLE_REPLY);
+  mp->context = context;
+  mp->retval = htonl (retval);
+  mp->vrf_id = htonl (vrf_id);
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_sw_interface_get_table_t_handler (vl_api_sw_interface_get_table_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  fib_table_t *fib_table = 0;
+  u32 sw_if_index = ~0;
+  u32 fib_index = ~0;
+  u32 table_id = ~0;
+  fib_protocol_t fib_proto = FIB_PROTOCOL_IP4;
+  int rv = 0;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  if (mp->is_ipv6)
+    fib_proto = FIB_PROTOCOL_IP6;
+
+  fib_index = fib_table_get_index_for_sw_if_index (fib_proto, sw_if_index);
+  if (fib_index != ~0)
+    {
+      fib_table = fib_table_get (fib_index, fib_proto);
+      table_id = fib_table->ft_table_id;
+    }
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  send_sw_interface_get_table_reply (q, mp->context, rv, table_id);
+}
+
+static void vl_api_sw_interface_set_unnumbered_t_handler
+  (vl_api_sw_interface_set_unnumbered_t * mp)
+{
+  vl_api_sw_interface_set_unnumbered_reply_t *rmp;
+  int rv = 0;
+  vnet_sw_interface_t *si;
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index, unnumbered_sw_if_index;
+
+  sw_if_index = ntohl (mp->sw_if_index);
+  unnumbered_sw_if_index = ntohl (mp->unnumbered_sw_if_index);
+
+  /*
+   * The API message field names are backwards from
+   * the underlying data structure names.
+   * It's not worth changing them now.
+   */
+  if (pool_is_free_index (vnm->interface_main.sw_interfaces,
+			  unnumbered_sw_if_index))
+    {
+      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
+      goto done;
+    }
+
+  /* Only check the "use loop0" field when setting the binding */
+  if (mp->is_add &&
+      pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
+    {
+      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX_2;
+      goto done;
+    }
+
+  si = vnet_get_sw_interface (vnm, unnumbered_sw_if_index);
+
+  if (mp->is_add)
+    {
+      si->flags |= VNET_SW_INTERFACE_FLAG_UNNUMBERED;
+      si->unnumbered_sw_if_index = sw_if_index;
+      ip4_sw_interface_enable_disable (unnumbered_sw_if_index, 1);
+      ip6_sw_interface_enable_disable (unnumbered_sw_if_index, 1);
+    }
+  else
+    {
+      si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED);
+      si->unnumbered_sw_if_index = (u32) ~ 0;
+      ip4_sw_interface_enable_disable (unnumbered_sw_if_index, 0);
+      ip6_sw_interface_enable_disable (unnumbered_sw_if_index, 0);
+    }
+
+done:
+  REPLY_MACRO (VL_API_SW_INTERFACE_SET_UNNUMBERED_REPLY);
+}
+
+static void
+vl_api_sw_interface_clear_stats_t_handler (vl_api_sw_interface_clear_stats_t *
+					   mp)
+{
+  vl_api_sw_interface_clear_stats_reply_t *rmp;
+
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vlib_simple_counter_main_t *sm;
+  vlib_combined_counter_main_t *cm;
+  static vnet_main_t **my_vnet_mains;
+  int i, j, n_counters;
+  int rv = 0;
+
+  if (mp->sw_if_index != ~0)
+    VALIDATE_SW_IF_INDEX (mp);
+
+  vec_reset_length (my_vnet_mains);
+
+  for (i = 0; i < vec_len (vnet_mains); i++)
+    {
+      if (vnet_mains[i])
+	vec_add1 (my_vnet_mains, vnet_mains[i]);
+    }
+
+  if (vec_len (vnet_mains) == 0)
+    vec_add1 (my_vnet_mains, vnm);
+
+  n_counters = vec_len (im->combined_sw_if_counters);
+
+  for (j = 0; j < n_counters; j++)
+    {
+      for (i = 0; i < vec_len (my_vnet_mains); i++)
+	{
+	  im = &my_vnet_mains[i]->interface_main;
+	  cm = im->combined_sw_if_counters + j;
+	  if (mp->sw_if_index == (u32) ~ 0)
+	    vlib_clear_combined_counters (cm);
+	  else
+	    vlib_zero_combined_counter (cm, ntohl (mp->sw_if_index));
+	}
+    }
+
+  n_counters = vec_len (im->sw_if_counters);
+
+  for (j = 0; j < n_counters; j++)
+    {
+      for (i = 0; i < vec_len (my_vnet_mains); i++)
+	{
+	  im = &my_vnet_mains[i]->interface_main;
+	  sm = im->sw_if_counters + j;
+	  if (mp->sw_if_index == (u32) ~ 0)
+	    vlib_clear_simple_counters (sm);
+	  else
+	    vlib_zero_simple_counter (sm, ntohl (mp->sw_if_index));
+	}
+    }
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_CLEAR_STATS_REPLY);
+}
+
+#define API_LINK_STATE_EVENT 1
+#define API_ADMIN_UP_DOWN_EVENT 2
+
+static int
+event_data_cmp (void *a1, void *a2)
+{
+  uword *e1 = a1;
+  uword *e2 = a2;
+
+  return (word) e1[0] - (word) e2[0];
+}
+
+static void
+send_sw_interface_flags (vpe_api_main_t * am,
+			 unix_shared_memory_queue_t * q,
+			 vnet_sw_interface_t * swif)
+{
+  vl_api_sw_interface_set_flags_t *mp;
+  vnet_main_t *vnm = am->vnet_main;
+
+  vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm,
+						       swif->sw_if_index);
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_FLAGS);
+  mp->sw_if_index = ntohl (swif->sw_if_index);
+
+  mp->admin_up_down = (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? 1 : 0;
+  mp->link_up_down = (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? 1 : 0;
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static uword
+link_state_process (vlib_main_t * vm,
+		    vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  vpe_api_main_t *vam = &vpe_api_main;
+  vnet_main_t *vnm = vam->vnet_main;
+  vnet_sw_interface_t *swif;
+  uword *event_data = 0;
+  vpe_client_registration_t *reg;
+  int i;
+  u32 prev_sw_if_index;
+  unix_shared_memory_queue_t *q;
+
+  vam->link_state_process_up = 1;
+
+  while (1)
+    {
+      vlib_process_wait_for_event (vm);
+
+      /* Unified list of changed link or admin state sw_if_indices */
+      vlib_process_get_events_with_type
+	(vm, &event_data, API_LINK_STATE_EVENT);
+      vlib_process_get_events_with_type
+	(vm, &event_data, API_ADMIN_UP_DOWN_EVENT);
+
+      /* Sort, so we can eliminate duplicates */
+      vec_sort_with_function (event_data, event_data_cmp);
+
+      prev_sw_if_index = ~0;
+
+      for (i = 0; i < vec_len (event_data); i++)
+	{
+	  /* Only one message per swif */
+	  if (prev_sw_if_index == event_data[i])
+	    continue;
+	  prev_sw_if_index = event_data[i];
+
+          /* *INDENT-OFF* */
+          pool_foreach(reg, vam->interface_events_registrations,
+          ({
+            q = vl_api_client_index_to_input_queue (reg->client_index);
+            if (q)
+              {
+                /* sw_interface may be deleted already */
+                if (!pool_is_free_index (vnm->interface_main.sw_interfaces,
+                                         event_data[i]))
+                  {
+                    swif = vnet_get_sw_interface (vnm, event_data[i]);
+                    send_sw_interface_flags (vam, q, swif);
+                  }
+              }
+          }));
+          /* *INDENT-ON* */
+	}
+      vec_reset_length (event_data);
+    }
+
+  return 0;
+}
+
+static clib_error_t *link_up_down_function (vnet_main_t * vm, u32 hw_if_index,
+					    u32 flags);
+static clib_error_t *admin_up_down_function (vnet_main_t * vm,
+					     u32 hw_if_index, u32 flags);
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (link_state_process_node,static) = {
+  .function = link_state_process,
+  .type = VLIB_NODE_TYPE_PROCESS,
+  .name = "vpe-link-state-process",
+};
+/* *INDENT-ON* */
+
+VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (admin_up_down_function);
+VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (link_up_down_function);
+
+static clib_error_t *
+link_up_down_function (vnet_main_t * vm, u32 hw_if_index, u32 flags)
+{
+  vpe_api_main_t *vam = &vpe_api_main;
+  vnet_hw_interface_t *hi = vnet_get_hw_interface (vm, hw_if_index);
+
+  if (vam->link_state_process_up)
+    vlib_process_signal_event (vam->vlib_main,
+			       link_state_process_node.index,
+			       API_LINK_STATE_EVENT, hi->sw_if_index);
+  return 0;
+}
+
+static clib_error_t *
+admin_up_down_function (vnet_main_t * vm, u32 sw_if_index, u32 flags)
+{
+  vpe_api_main_t *vam = &vpe_api_main;
+
+  /*
+   * Note: it's perfectly fair to set a subif admin up / admin down.
+   * Note the subtle distinction between this routine and the previous
+   * routine.
+   */
+  if (vam->link_state_process_up)
+    vlib_process_signal_event (vam->vlib_main,
+			       link_state_process_node.index,
+			       API_ADMIN_UP_DOWN_EVENT, sw_if_index);
+  return 0;
+}
+
+static void vl_api_sw_interface_tag_add_del_t_handler
+  (vl_api_sw_interface_tag_add_del_t * mp)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vl_api_sw_interface_tag_add_del_reply_t *rmp;
+  int rv = 0;
+  u8 *tag;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  if (mp->is_add)
+    {
+      if (mp->tag[0] == 0)
+	{
+	  rv = VNET_API_ERROR_INVALID_VALUE;
+	  goto out;
+	}
+
+      mp->tag[ARRAY_LEN (mp->tag) - 1] = 0;
+      tag = format (0, "%s%c", mp->tag, 0);
+      vnet_set_sw_interface_tag (vnm, tag, sw_if_index);
+    }
+  else
+    vnet_clear_sw_interface_tag (vnm, sw_if_index);
+
+  BAD_SW_IF_INDEX_LABEL;
+out:
+  REPLY_MACRO (VL_API_SW_INTERFACE_TAG_ADD_DEL_REPLY);
+}
+
+static void
+vl_api_sw_interface_details_t_handler (vl_api_sw_interface_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+/*
+ * vpe_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/interface.api.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_interface;
+#undef _
+}
+
+pub_sub_handler (interface_events, INTERFACE_EVENTS);
+
+static clib_error_t *
+interface_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (interface_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c
new file mode 100644
index 00000000..7dbee867
--- /dev/null
+++ b/src/vnet/interface_cli.c
@@ -0,0 +1,1165 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * interface_cli.c: interface CLI
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * @file
+ * Interface CLI.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vppinfra/bitmap.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/ip6_fib.h>
+
+static int
+compare_interface_names (void *a1, void *a2)
+{
+  u32 *hi1 = a1;
+  u32 *hi2 = a2;
+
+  return vnet_hw_interface_compare (vnet_get_main (), *hi1, *hi2);
+}
+
+static clib_error_t *
+show_or_clear_hw_interfaces (vlib_main_t * vm,
+			     unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  clib_error_t *error = 0;
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_hw_interface_t *hi;
+  u32 hw_if_index, *hw_if_indices = 0;
+  int i, verbose = -1, is_show, show_bond = 0;
+
+  is_show = strstr (cmd->path, "show") != 0;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      /* See if user wants to show a specific interface. */
+      if (unformat
+	  (input, "%U", unformat_vnet_hw_interface, vnm, &hw_if_index))
+	vec_add1 (hw_if_indices, hw_if_index);
+
+      /* See if user wants to show an interface with a specific hw_if_index. */
+      else if (unformat (input, "%u", &hw_if_index))
+	vec_add1 (hw_if_indices, hw_if_index);
+
+      else if (unformat (input, "verbose"))
+	verbose = 1;		/* this is also the default */
+
+      else if (unformat (input, "detail"))
+	verbose = 2;
+
+      else if (unformat (input, "brief"))
+	verbose = 0;
+
+      else if (unformat (input, "bond"))
+	{
+	  show_bond = 1;
+	  if (verbose < 0)
+	    verbose = 0;	/* default to brief for link bonding */
+	}
+
+      else
+	{
+	  error = clib_error_return (0, "unknown input `%U'",
+				     format_unformat_error, input);
+	  goto done;
+	}
+    }
+
+  /* Gather interfaces. */
+  if (vec_len (hw_if_indices) == 0)
+    pool_foreach (hi, im->hw_interfaces,
+		  vec_add1 (hw_if_indices, hi - im->hw_interfaces));
+
+  if (verbose < 0)
+    verbose = 1;		/* default to verbose (except bond) */
+
+  if (is_show)
+    {
+      /* Sort by name. */
+      vec_sort_with_function (hw_if_indices, compare_interface_names);
+
+      vlib_cli_output (vm, "%U\n", format_vnet_hw_interface, vnm, 0, verbose);
+      for (i = 0; i < vec_len (hw_if_indices); i++)
+	{
+	  hi = vnet_get_hw_interface (vnm, hw_if_indices[i]);
+	  if (show_bond == 0)	/* show all interfaces */
+	    vlib_cli_output (vm, "%U\n", format_vnet_hw_interface, vnm,
+			     hi, verbose);
+	  else if ((hi->bond_info) &&
+		   (hi->bond_info != VNET_HW_INTERFACE_BOND_INFO_SLAVE))
+	    {			/* show only bonded interface and all its slave interfaces */
+	      int hw_idx;
+	      vnet_hw_interface_t *shi;
+	      vlib_cli_output (vm, "%U\n", format_vnet_hw_interface, vnm,
+			       hi, verbose);
+
+              /* *INDENT-OFF* */
+	      clib_bitmap_foreach (hw_idx, hi->bond_info,
+              ({
+                shi = vnet_get_hw_interface(vnm, hw_idx);
+                vlib_cli_output (vm, "%U\n",
+                                 format_vnet_hw_interface, vnm, shi, verbose);
+              }));
+              /* *INDENT-ON* */
+	    }
+	}
+    }
+  else
+    {
+      for (i = 0; i < vec_len (hw_if_indices); i++)
+	{
+	  vnet_device_class_t *dc;
+
+	  hi = vnet_get_hw_interface (vnm, hw_if_indices[i]);
+	  dc = vec_elt_at_index (im->device_classes, hi->dev_class_index);
+
+	  if (dc->clear_counters)
+	    dc->clear_counters (hi->dev_instance);
+	}
+    }
+
+done:
+  vec_free (hw_if_indices);
+  return error;
+}
+
+/* *INDENT-OFF* */
+/*?
+ * Displays various information about the state of the current terminal
+ * session.
+ *
+ * @cliexpar
+ * @cliexstart{show hardware}
+ * Name                Link  Hardware
+ * GigabitEthernet2/0/0               up   GigabitEthernet2/0/0
+ * Ethernet address 00:50:56:b7:7c:83
+ * Intel 82545em_copper
+ *   link up, media 1000T full-duplex, master,
+ *   0 unprocessed, 384 total buffers on rx queue 0 ring
+ *   237 buffers in driver rx cache
+ *   rx total packets                                    1816
+ *   rx total bytes                                    181084
+ *   rx good packets                                     1816
+ *   rx good bytes                                     181084
+ *   rx 65 127 byte packets                              1586
+ *   rx 256 511 byte packets                              230
+ *   tx total packets                                     346
+ *   tx total bytes                                     90224
+ *   tx good packets                                      346
+ *   tx good bytes                                      88840
+ *   tx 64 byte packets                                     1
+ *   tx 65 127 byte packets                               115
+ *   tx 256 511 byte packets                              230
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND (show_hw_interfaces_command, static) = {
+  .path = "show hardware-interfaces",
+  .short_help = "show hardware-interfaces [brief|verbose|detail] [bond] [<if-name1> <if-name2> ...]",
+  .function = show_or_clear_hw_interfaces,
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (clear_hw_interface_counters_command, static) = {
+  .path = "clear hardware-interfaces",
+  .short_help = "Clear hardware interfaces statistics",
+  .function = show_or_clear_hw_interfaces,
+};
+/* *INDENT-ON* */
+
+static int
+sw_interface_name_compare (void *a1, void *a2)
+{
+  vnet_sw_interface_t *si1 = a1;
+  vnet_sw_interface_t *si2 = a2;
+
+  return vnet_sw_interface_compare (vnet_get_main (),
+				    si1->sw_if_index, si2->sw_if_index);
+}
+
+static clib_error_t *
+show_sw_interfaces (vlib_main_t * vm,
+		    unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  clib_error_t *error = 0;
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_sw_interface_t *si, *sorted_sis = 0;
+  u32 sw_if_index = ~(u32) 0;
+  u8 show_addresses = 0;
+  u8 show_features = 0;
+  u8 show_tag = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      /* See if user wants to show specific interface */
+      if (unformat
+	  (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
+	{
+	  si = pool_elt_at_index (im->sw_interfaces, sw_if_index);
+	  vec_add1 (sorted_sis, si[0]);
+	}
+      else if (unformat (input, "address") || unformat (input, "addr"))
+	show_addresses = 1;
+      else if (unformat (input, "features") || unformat (input, "feat"))
+	show_features = 1;
+      else if (unformat (input, "tag"))
+	show_tag = 1;
+      else
+	{
+	  error = clib_error_return (0, "unknown input `%U'",
+				     format_unformat_error, input);
+	  goto done;
+	}
+    }
+
+  if (show_features || show_tag)
+    {
+      if (sw_if_index == ~(u32) 0)
+	return clib_error_return (0, "Interface not specified...");
+    }
+
+  if (show_features)
+    {
+      vnet_interface_features_show (vm, sw_if_index);
+      return 0;
+    }
+  if (show_tag)
+    {
+      u8 *tag;
+      tag = vnet_get_sw_interface_tag (vnm, sw_if_index);
+      vlib_cli_output (vm, "%U: %s",
+		       format_vnet_sw_if_index_name, vnm, sw_if_index,
+		       tag ? (char *) tag : "(none)");
+      return 0;
+    }
+
+  if (!show_addresses)
+    vlib_cli_output (vm, "%U\n", format_vnet_sw_interface, vnm, 0);
+
+  if (vec_len (sorted_sis) == 0)	/* Get all interfaces */
+    {
+      /* Gather interfaces. */
+      sorted_sis =
+	vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces));
+      _vec_len (sorted_sis) = 0;
+      pool_foreach (si, im->sw_interfaces, (
+					     {
+					     vec_add1 (sorted_sis, si[0]);
+					     }
+		    ));
+
+      /* Sort by name. */
+      vec_sort_with_function (sorted_sis, sw_interface_name_compare);
+    }
+
+  if (show_addresses)
+    {
+      vec_foreach (si, sorted_sis)
+      {
+	l2input_main_t *l2m = &l2input_main;
+	ip4_main_t *im4 = &ip4_main;
+	ip6_main_t *im6 = &ip6_main;
+	ip_lookup_main_t *lm4 = &im4->lookup_main;
+	ip_lookup_main_t *lm6 = &im6->lookup_main;
+	ip_interface_address_t *ia = 0;
+	ip4_address_t *r4;
+	ip6_address_t *r6;
+	u32 fib_index4 = 0, fib_index6 = 0;
+	ip4_fib_t *fib4;
+	ip6_fib_t *fib6;
+	l2_input_config_t *config;
+
+	if (vec_len (im4->fib_index_by_sw_if_index) > si->sw_if_index)
+	  fib_index4 = vec_elt (im4->fib_index_by_sw_if_index,
+				si->sw_if_index);
+
+	if (vec_len (im6->fib_index_by_sw_if_index) > si->sw_if_index)
+	  fib_index6 = vec_elt (im6->fib_index_by_sw_if_index,
+				si->sw_if_index);
+
+	fib4 = ip4_fib_get (fib_index4);
+	fib6 = ip6_fib_get (fib_index6);
+
+	if (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
+	  vlib_cli_output
+	    (vm, "%U (%s): \n  unnumbered, use %U",
+	     format_vnet_sw_if_index_name,
+	     vnm, si->sw_if_index,
+	     (si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? "up" : "dn",
+	     format_vnet_sw_if_index_name, vnm, si->unnumbered_sw_if_index);
+
+	else
+	  {
+	    vlib_cli_output (vm, "%U (%s):",
+			     format_vnet_sw_if_index_name,
+			     vnm, si->sw_if_index,
+			     (si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+			     ? "up" : "dn");
+	  }
+
+	/* Display any L2 addressing info */
+	vec_validate (l2m->configs, si->sw_if_index);
+	config = vec_elt_at_index (l2m->configs, si->sw_if_index);
+	if (config->bridge)
+	  {
+	    u32 bd_id = l2input_main.bd_configs[config->bd_index].bd_id;
+	    vlib_cli_output (vm, "  l2 bridge bd_id %d%s%d", bd_id,
+			     config->bvi ? " bvi shg " : " shg ",
+			     config->shg);
+	  }
+	else if (config->xconnect)
+	  {
+	    vlib_cli_output (vm, "  l2 xconnect %U",
+			     format_vnet_sw_if_index_name,
+			     vnm, config->output_sw_if_index);
+	  }
+
+	/* Display any IP4 addressing info */
+          /* *INDENT-OFF* */
+	  foreach_ip_interface_address (lm4, ia, si->sw_if_index,
+					1 /* honor unnumbered */,
+	  ({
+            r4 = ip_interface_address_get_address (lm4, ia);
+            if (fib4->table_id)
+              {
+                vlib_cli_output (vm, "  %U/%d table %d",
+                                 format_ip4_address, r4,
+                                 ia->address_length,
+                                 fib4->table_id);
+              }
+            else
+              {
+                vlib_cli_output (vm, "  %U/%d",
+                                 format_ip4_address, r4,
+                                 ia->address_length);
+              }
+          }));
+          /* *INDENT-ON* */
+
+	/* Display any IP6 addressing info */
+          /* *INDENT-OFF* */
+          foreach_ip_interface_address (lm6, ia, si->sw_if_index,
+                                        1 /* honor unnumbered */,
+          ({
+            r6 = ip_interface_address_get_address (lm6, ia);
+            if (fib6->table_id)
+              {
+                vlib_cli_output (vm, "  %U/%d table %d",
+                                 format_ip6_address, r6,
+                                 ia->address_length,
+                                 fib6->table_id);
+              }
+            else
+              {
+                vlib_cli_output (vm, "  %U/%d",
+                                 format_ip6_address, r6,
+                                 ia->address_length);
+              }
+          }));
+          /* *INDENT-ON* */
+      }
+    }
+  else
+    {
+      vec_foreach (si, sorted_sis)
+      {
+	vlib_cli_output (vm, "%U\n", format_vnet_sw_interface, vnm, si);
+      }
+    }
+
+done:
+  vec_free (sorted_sis);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_sw_interfaces_command, static) = {
+  .path = "show interfaces",
+  .short_help = "show interfaces [address|addr|features|feat] [<if-name1> <if-name2> ...]",
+  .function = show_sw_interfaces,
+};
+/* *INDENT-ON* */
+
+/* Root of all interface commands. */
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vnet_cli_interface_command, static) = {
+  .path = "interface",
+  .short_help = "Interface commands",
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vnet_cli_set_interface_command, static) = {
+  .path = "set interface",
+  .short_help = "Interface commands",
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+clear_interface_counters (vlib_main_t * vm,
+			  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vlib_simple_counter_main_t *sm;
+  vlib_combined_counter_main_t *cm;
+  static vnet_main_t **my_vnet_mains;
+  int i, j, n_counters;
+
+  vec_reset_length (my_vnet_mains);
+
+  for (i = 0; i < vec_len (vnet_mains); i++)
+    {
+      if (vnet_mains[i])
+	vec_add1 (my_vnet_mains, vnet_mains[i]);
+    }
+
+  if (vec_len (vnet_mains) == 0)
+    vec_add1 (my_vnet_mains, vnm);
+
+  n_counters = vec_len (im->combined_sw_if_counters);
+
+  for (j = 0; j < n_counters; j++)
+    {
+      for (i = 0; i < vec_len (my_vnet_mains); i++)
+	{
+	  im = &my_vnet_mains[i]->interface_main;
+	  cm = im->combined_sw_if_counters + j;
+	  vlib_clear_combined_counters (cm);
+	}
+    }
+
+  n_counters = vec_len (im->sw_if_counters);
+
+  for (j = 0; j < n_counters; j++)
+    {
+      for (i = 0; i < vec_len (my_vnet_mains); i++)
+	{
+	  im = &my_vnet_mains[i]->interface_main;
+	  sm = im->sw_if_counters + j;
+	  vlib_clear_simple_counters (sm);
+	}
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (clear_interface_counters_command, static) = {
+  .path = "clear interfaces",
+  .short_help = "Clear interfaces statistics",
+  .function = clear_interface_counters,
+};
+/* *INDENT-ON* */
+
+/**
+ * Parse subinterface names.
+ *
+ * The following subinterface syntax is supported. The first two are for
+ * backwards compatability:
+ *
+ * <intf-name> <id>
+ *     - a subinterface with the name <intf-name>.<id>. The subinterface
+ *       is a single dot1q vlan with vlan id <id> and exact-match semantics.
+ *
+ * <intf-name> <min_id>-<max_id>
+ *     - a set of the above subinterfaces, repeating for each id
+ *       in the range <min_id> to <max_id>
+ *
+ * In the following, exact-match semantics (i.e. the number of vlan tags on the
+ * packet must match the number of tags in the configuration) are used only if
+ * the keyword exact-match is present. Non-exact match is the default.
+ *
+ * <intf-name> <id> dot1q <outer_id> [exact-match]
+ *     - a subinterface with the name <intf-name>.<id>. The subinterface
+ *       is a single dot1q vlan with vlan id <outer_id>.
+ *
+ * <intf-name> <id> dot1q any [exact-match]
+ *     - a subinterface with the name <intf-name>.<id>. The subinterface
+ *       is a single dot1q vlan with any vlan id.
+ *
+ * <intf-name> <id> dot1q <outer_id> inner-dot1q <inner_id> [exact-match]
+ *     - a subinterface with the name <intf-name>.<id>. The subinterface
+ *       is a double dot1q vlan with outer vlan id <outer_id> and inner vlan id
+ *       <inner_id>.
+ *
+ * <intf-name> <id> dot1q <outer_id> inner-dot1q any [exact-match]
+ *     - a subinterface with the name <intf-name>.<id>. The subinterface
+ *       is a double dot1q vlan with outer vlan id <id> and any inner vlan id.
+ *
+ * <intf-name> <id> dot1q any inner-dot1q any [exact-match]
+ *
+ *     - a subinterface with the name <intf-name>.<id>. The subinterface
+ *       is a double dot1q vlan with any outer vlan id and any inner vlan id.
+ *
+ * For each of the above CLI, there is a duplicate that uses the keyword
+ * "dot1ad" in place of the first "dot1q". These interfaces use ethertype
+ * 0x88ad in place of 0x8100 for the outer ethertype. Note that for double-
+ * tagged packets the inner ethertype is always 0x8100. Also note that
+ * the dot1q and dot1ad naming spaces are independent, so it is legal to
+ * have both "Gig3/0/0.1 dot1q 100" and "Gig3/0/0.2 dot1ad 100". For example:
+ *
+ * <intf-name> <id> dot1ad <outer_id> inner-dot1q <inner_id> [exact-match]
+ *     - a subinterface with the name <intf-name>.<id>. The subinterface
+ *       is a double dot1ad vlan with outer vlan id <outer_id> and inner vlan
+ *       id <inner_id>.
+ *
+ * <intf-name> <id> untagged
+ *     - a subinterface with the name <intf-name>.<id>. The subinterface
+ *       has no vlan tags. Only one can be specified per interface.
+ *
+ * <intf-name> <id> default
+ *     - a subinterface with the name <intf-name>.<id>. This is associated
+ *       with a packet that did not match any other configured subinterface
+ *       on this interface. Only one can be specified per interface.
+ */
+
+static clib_error_t *
+parse_vlan_sub_interfaces (unformat_input_t * input,
+			   vnet_sw_interface_t * template)
+{
+  clib_error_t *error = 0;
+  u32 inner_vlan, outer_vlan;
+
+  if (unformat (input, "any inner-dot1q any"))
+    {
+      template->sub.eth.flags.two_tags = 1;
+      template->sub.eth.flags.outer_vlan_id_any = 1;
+      template->sub.eth.flags.inner_vlan_id_any = 1;
+    }
+  else if (unformat (input, "any"))
+    {
+      template->sub.eth.flags.one_tag = 1;
+      template->sub.eth.flags.outer_vlan_id_any = 1;
+    }
+  else if (unformat (input, "%d inner-dot1q any", &outer_vlan))
+    {
+      template->sub.eth.flags.two_tags = 1;
+      template->sub.eth.flags.inner_vlan_id_any = 1;
+      template->sub.eth.outer_vlan_id = outer_vlan;
+    }
+  else if (unformat (input, "%d inner-dot1q %d", &outer_vlan, &inner_vlan))
+    {
+      template->sub.eth.flags.two_tags = 1;
+      template->sub.eth.outer_vlan_id = outer_vlan;
+      template->sub.eth.inner_vlan_id = inner_vlan;
+    }
+  else if (unformat (input, "%d", &outer_vlan))
+    {
+      template->sub.eth.flags.one_tag = 1;
+      template->sub.eth.outer_vlan_id = outer_vlan;
+    }
+  else
+    {
+      error = clib_error_return (0, "expected dot1q config, got `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  if (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "exact-match"))
+	{
+	  template->sub.eth.flags.exact_match = 1;
+	}
+    }
+
+done:
+  return error;
+}
+
+static clib_error_t *
+create_sub_interfaces (vlib_main_t * vm,
+		       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 hw_if_index, sw_if_index;
+  vnet_hw_interface_t *hi;
+  u32 id, id_min, id_max;
+  vnet_sw_interface_t template;
+
+  hw_if_index = ~0;
+  if (!unformat_user (input, unformat_vnet_hw_interface, vnm, &hw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  memset (&template, 0, sizeof (template));
+  template.sub.eth.raw_flags = 0;
+
+  if (unformat (input, "%d default", &id_min))
+    {
+      id_max = id_min;
+      template.sub.eth.flags.default_sub = 1;
+    }
+  else if (unformat (input, "%d untagged", &id_min))
+    {
+      id_max = id_min;
+      template.sub.eth.flags.no_tags = 1;
+      template.sub.eth.flags.exact_match = 1;
+    }
+  else if (unformat (input, "%d dot1q", &id_min))
+    {
+      /* parse dot1q config */
+      id_max = id_min;
+      error = parse_vlan_sub_interfaces (input, &template);
+      if (error)
+	goto done;
+    }
+  else if (unformat (input, "%d dot1ad", &id_min))
+    {
+      /* parse dot1ad config */
+      id_max = id_min;
+      template.sub.eth.flags.dot1ad = 1;
+      error = parse_vlan_sub_interfaces (input, &template);
+      if (error)
+	goto done;
+    }
+  else if (unformat (input, "%d-%d", &id_min, &id_max))
+    {
+      template.sub.eth.flags.one_tag = 1;
+      template.sub.eth.flags.exact_match = 1;
+      if (id_min > id_max)
+	goto id_error;
+    }
+  else if (unformat (input, "%d", &id_min))
+    {
+      id_max = id_min;
+      template.sub.eth.flags.one_tag = 1;
+      template.sub.eth.outer_vlan_id = id_min;
+      template.sub.eth.flags.exact_match = 1;
+    }
+  else
+    {
+    id_error:
+      error = clib_error_return (0, "expected ID or ID MIN-MAX, got `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  hi = vnet_get_hw_interface (vnm, hw_if_index);
+
+  if (hi->bond_info == VNET_HW_INTERFACE_BOND_INFO_SLAVE)
+    {
+      error =
+	clib_error_return (0,
+			   "not allowed as %v belong to a BondEthernet interface",
+			   hi->name);
+      goto done;
+    }
+
+  for (id = id_min; id <= id_max; id++)
+    {
+      uword *p;
+      vnet_interface_main_t *im = &vnm->interface_main;
+      u64 sup_and_sub_key = ((u64) (hi->sw_if_index) << 32) | (u64) id;
+      u64 *kp;
+
+      p = hash_get_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key);
+      if (p)
+	{
+	  if (CLIB_DEBUG > 0)
+	    clib_warning ("sup sw_if_index %d, sub id %d already exists\n",
+			  hi->sw_if_index, id);
+	  continue;
+	}
+
+      kp = clib_mem_alloc (sizeof (*kp));
+      *kp = sup_and_sub_key;
+
+      template.type = VNET_SW_INTERFACE_TYPE_SUB;
+      template.flood_class = VNET_FLOOD_CLASS_NORMAL;
+      template.sup_sw_if_index = hi->sw_if_index;
+      template.sub.id = id;
+      if (id_min < id_max)
+	template.sub.eth.outer_vlan_id = id;
+
+      error = vnet_create_sw_interface (vnm, &template, &sw_if_index);
+      if (error)
+	goto done;
+
+      hash_set (hi->sub_interface_sw_if_index_by_id, id, sw_if_index);
+      hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, sw_if_index);
+      vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name,
+		       vnet_get_main (), sw_if_index);
+    }
+
+done:
+  return error;
+}
+
+/* *INDENT-OFF* */
+/*?
+ * Create vlan subinterfaces
+ *
+ * @cliexpar
+ * @cliexstart{create sub-interfaces}
+ *
+ * To create a vlan subinterface 11 to process packets on 802.1q VLAN id 11, use:
+ *
+ *  vpp# create sub GigabitEthernet2/0/0 11
+ *
+ * This shorthand is equivalent to:
+ *  vpp# create sub GigabitEthernet2/0/0 11 dot1q 11 exact-match
+ *
+ * You can specify a subinterface number that is different from the vlan id:
+ *  vpp# create sub GigabitEthernet2/0/0 11 dot1q 100
+ *
+ * You can create qinq and q-in-any interfaces:
+ *  vpp# create sub GigabitEthernet2/0/0 11 dot1q 100 inner-dot1q 200
+ *  vpp# create sub GigabitEthernet2/0/0 12 dot1q 100 inner-dot1q any
+ *
+ * You can also create dot1ad interfaces:
+ *  vpp# create sub GigabitEthernet2/0/0 11 dot1ad 11
+ *  vpp# create sub GigabitEthernet2/0/0 12 dot1q 100 inner-dot1q 200
+ *
+ * Subinterfaces can be configured as either exact-match or non-exact match.
+ * Non-exact match is the CLI default. If exact-match is specified,
+ * packets must have the same number of vlan tags as the configuration.
+ * For non-exact-match, packets must at least that number of tags.
+ * L3 (routed) interfaces must be configured as exact-match.
+ * L2 interfaces are typically configured as non-exact-match.
+ *
+ * For example, a packet with outer vlan 100 and inner 200 would match this interface:
+ *  vpp# create sub GigabitEthernet2/0/0 5 dot1q 100
+ *
+ * but would not match this interface:
+ *  vpp# create sub GigabitEthernet2/0/0 5 dot1q 100 exact-match
+ *
+ * There are two special subinterfaces that can be configured. Subinterface untagged has no vlan tags:
+ *  vpp# create sub GigabitEthernet2/0/0 5 untagged
+ *
+ * The subinterface default matches any packet that does not match any other subinterface:
+ *  vpp# create sub GigabitEthernet2/0/0 7 default
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND (create_sub_interfaces_command, static) = {
+  .path = "create sub-interfaces",
+  .short_help = "create sub-interfaces <nn>[-<nn>] [dot1q|dot1ad|default|untagged]",
+  .function = create_sub_interfaces,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_state (vlib_main_t * vm,
+	   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error;
+  u32 sw_if_index, flags;
+
+  sw_if_index = ~0;
+  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  if (!unformat (input, "%U", unformat_vnet_sw_interface_flags, &flags))
+    {
+      error = clib_error_return (0, "unknown flags `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  error = vnet_sw_interface_set_flags (vnm, sw_if_index, flags);
+  if (error)
+    goto done;
+
+done:
+  return error;
+}
+
+
+/* *INDENT-OFF* */
+/*?
+ * Interface admin up/down
+ *
+ * @cliexpar
+ * @cliexstart{set interface state}
+ *  vpp# set interface state GigabitEthernet2/0/0 up
+ *  vpp# set interface state GigabitEthernet2/0/0 down
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND (set_state_command, static) = {
+  .path = "set interface state",
+  .short_help = "Set interface state",
+  .function = set_state,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_unnumbered (vlib_main_t * vm,
+		unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 unnumbered_sw_if_index;
+  u32 inherit_from_sw_if_index;
+  vnet_sw_interface_t *si;
+  int is_set = 0;
+  int is_del = 0;
+
+  if (unformat (input, "%U use %U",
+		unformat_vnet_sw_interface, vnm, &unnumbered_sw_if_index,
+		unformat_vnet_sw_interface, vnm, &inherit_from_sw_if_index))
+    is_set = 1;
+  else if (unformat (input, "del %U",
+		     unformat_vnet_sw_interface, vnm,
+		     &unnumbered_sw_if_index))
+    is_del = 1;
+  else
+    return clib_error_return (0, "parse error '%U'",
+			      format_unformat_error, input);
+
+  si = vnet_get_sw_interface (vnm, unnumbered_sw_if_index);
+  if (is_del)
+    {
+      si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED);
+      si->unnumbered_sw_if_index = (u32) ~ 0;
+      ip4_sw_interface_enable_disable (unnumbered_sw_if_index, 0);
+      ip6_sw_interface_enable_disable (unnumbered_sw_if_index, 0);
+    }
+  else if (is_set)
+    {
+      si->flags |= VNET_SW_INTERFACE_FLAG_UNNUMBERED;
+      si->unnumbered_sw_if_index = inherit_from_sw_if_index;
+      ip4_sw_interface_enable_disable (unnumbered_sw_if_index, 1);
+      ip6_sw_interface_enable_disable (unnumbered_sw_if_index, 1);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_unnumbered_command, static) = {
+  .path = "set interface unnumbered",
+  .short_help = "set interface unnumbered [<intfc> use <intfc> | del <intfc>]",
+  .function = set_unnumbered,
+};
+/* *INDENT-ON* */
+
+
+
+static clib_error_t *
+set_hw_class (vlib_main_t * vm,
+	      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  clib_error_t *error;
+  u32 hw_if_index, hw_class_index;
+
+  hw_if_index = ~0;
+  if (!unformat_user (input, unformat_vnet_hw_interface, vnm, &hw_if_index))
+    {
+      error = clib_error_return (0, "unknown hardware interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  if (!unformat_user (input, unformat_hash_string,
+		      im->hw_interface_class_by_name, &hw_class_index))
+    {
+      error = clib_error_return (0, "unknown hardware class `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  error = vnet_hw_interface_set_class (vnm, hw_if_index, hw_class_index);
+  if (error)
+    goto done;
+
+done:
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_hw_class_command, static) = {
+  .path = "set interface hw-class",
+  .short_help = "Set interface hardware class",
+  .function = set_hw_class,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+vnet_interface_cli_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (vnet_interface_cli_init);
+
+static clib_error_t *
+renumber_interface_command_fn (vlib_main_t * vm,
+			       unformat_input_t * input,
+			       vlib_cli_command_t * cmd)
+{
+  u32 hw_if_index;
+  u32 new_dev_instance;
+  vnet_main_t *vnm = vnet_get_main ();
+  int rv;
+
+  if (!unformat_user (input, unformat_vnet_hw_interface, vnm, &hw_if_index))
+    return clib_error_return (0, "unknown hardware interface `%U'",
+			      format_unformat_error, input);
+
+  if (!unformat (input, "%d", &new_dev_instance))
+    return clib_error_return (0, "new dev instance missing");
+
+  rv = vnet_interface_name_renumber (hw_if_index, new_dev_instance);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    default:
+      return clib_error_return (0, "vnet_interface_name_renumber returned %d",
+				rv);
+
+    }
+
+  return 0;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (renumber_interface_command, static) = {
+  .path = "renumber interface",
+  .short_help = "renumber interface <if-name> <new-dev-instance>",
+  .function = renumber_interface_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+promiscuous_cmd (vlib_main_t * vm,
+		 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 hw_if_index;
+  u32 flags = ETHERNET_INTERFACE_FLAG_ACCEPT_ALL;
+  ethernet_main_t *em = &ethernet_main;
+  ethernet_interface_t *eif;
+
+  if (unformat (input, "on %U",
+		unformat_vnet_hw_interface, vnm, &hw_if_index))
+    ;
+  else if (unformat (input, "off %U",
+		     unformat_ethernet_interface, vnm, &hw_if_index))
+    flags = 0;
+  else
+    return clib_error_return (0, "unknown input `%U'",
+			      format_unformat_error, input);
+
+  eif = ethernet_get_interface (em, hw_if_index);
+  if (!eif)
+    return clib_error_return (0, "not supported");
+
+  ethernet_set_flags (vnm, hw_if_index, flags);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_promiscuous_cmd, static) = {
+  .path = "set interface promiscuous",
+  .short_help = "set interface promiscuous [on | off] <intfc>",
+  .function = promiscuous_cmd,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+mtu_cmd (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 hw_if_index, mtu;
+  u32 flags = ETHERNET_INTERFACE_FLAG_MTU;
+  ethernet_main_t *em = &ethernet_main;
+
+  if (unformat (input, "%d %U", &mtu,
+		unformat_vnet_hw_interface, vnm, &hw_if_index))
+    {
+      vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
+      ethernet_interface_t *eif = ethernet_get_interface (em, hw_if_index);
+
+      if (!eif)
+	return clib_error_return (0, "not supported");
+
+      if (mtu < hi->min_supported_packet_bytes)
+	return clib_error_return (0, "Invalid mtu (%d): "
+				  "must be >= min pkt bytes (%d)", mtu,
+				  hi->min_supported_packet_bytes);
+
+      if (mtu > hi->max_supported_packet_bytes)
+	return clib_error_return (0, "Invalid mtu (%d): must be <= (%d)", mtu,
+				  hi->max_supported_packet_bytes);
+
+      if (hi->max_packet_bytes != mtu)
+	{
+	  hi->max_packet_bytes = mtu;
+	  ethernet_set_flags (vnm, hw_if_index, flags);
+	}
+    }
+  else
+    return clib_error_return (0, "unknown input `%U'",
+			      format_unformat_error, input);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_mtu_cmd, static) = {
+  .path = "set interface mtu",
+  .short_help = "set interface mtu <value> <intfc>",
+  .function = mtu_cmd,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_interface_mac_address (vlib_main_t * vm, unformat_input_t * input,
+			   vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index = ~0;
+  u64 mac = 0;
+
+  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+  if (!unformat_user (input, unformat_ethernet_address, &mac))
+    {
+      error = clib_error_return (0, "expected mac address `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+  error = vnet_hw_interface_change_mac_address (vnm, sw_if_index, mac);
+done:
+  return error;
+}
+
+/*?
+ * The '<em>set interface mac address </em>' command allows to set MAC address of given interface.
+ * In case of NIC interfaces the one has to support MAC address change. A side effect of MAC address
+ * change are changes of MAC addresses in FIB tables (ipv4 and ipv6).
+ *
+ * @cliexpar
+ * @parblock
+ * Example of how to change MAC Address of interface:
+ * @cliexcmd{set interface mac address GigabitEthernet0/8/0 aa:bb:cc:dd:ee:01}
+ * @cliexcmd{set interface mac address host-vpp0 aa:bb:cc:dd:ee:02}
+ * @cliexcmd{set interface mac address tap-0 aa:bb:cc:dd:ee:03}
+ * @cliexcmd{set interface mac address pg0 aa:bb:cc:dd:ee:04}
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_mac_address_cmd, static) = {
+  .path = "set interface mac address",
+  .short_help = "set interface mac address <intfc> <mac-address>",
+  .function = set_interface_mac_address,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_tag (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index = ~0;
+  u8 *tag = 0;
+
+  if (!unformat (input, "%U %s", unformat_vnet_sw_interface,
+		 vnm, &sw_if_index, &tag))
+    return clib_error_return (0, "unknown input `%U'",
+			      format_unformat_error, input);
+
+  vnet_set_sw_interface_tag (vnm, tag, sw_if_index);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_tag_command, static) = {
+  .path = "set interface tag",
+  .short_help = "set interface tag <intfc> <tag>",
+  .function = set_tag,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+clear_tag (vlib_main_t * vm, unformat_input_t * input,
+	   vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index = ~0;
+
+  if (!unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
+    return clib_error_return (0, "unknown input `%U'",
+			      format_unformat_error, input);
+
+  vnet_clear_sw_interface_tag (vnm, sw_if_index);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (clear_tag_command, static) = {
+  .path = "clear interface tag",
+  .short_help = "clear interface tag <intfc>",
+  .function = clear_tag,
+};
+/* *INDENT-ON* */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/interface_format.c b/src/vnet/interface_format.c
new file mode 100644
index 00000000..b3a30622
--- /dev/null
+++ b/src/vnet/interface_format.c
@@ -0,0 +1,401 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * interface_format.c: interface formatting
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vppinfra/bitmap.h>
+
+u8 *
+format_vnet_sw_interface_flags (u8 * s, va_list * args)
+{
+  u32 flags = va_arg (*args, u32);
+
+  if (flags & VNET_SW_INTERFACE_FLAG_BOND_SLAVE)
+    s = format (s, "bond-slave");
+  else
+    {
+      s = format (s, "%s",
+		  (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? "up" : "down");
+      if (flags & VNET_SW_INTERFACE_FLAG_PUNT)
+	s = format (s, "/punt");
+    }
+
+  return s;
+}
+
+u8 *
+format_vnet_hw_interface (u8 * s, va_list * args)
+{
+  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
+  vnet_hw_interface_t *hi = va_arg (*args, vnet_hw_interface_t *);
+  vnet_hw_interface_class_t *hw_class;
+  vnet_device_class_t *dev_class;
+  int verbose = va_arg (*args, int);
+  uword indent;
+
+  if (!hi)
+    return format (s, "%=32s%=6s%=8s%s", "Name", "Idx", "Link", "Hardware");
+
+  indent = format_get_indent (s);
+
+  s = format (s, "%-32v%=6d", hi->name, hi->hw_if_index);
+
+  if (hi->bond_info == VNET_HW_INTERFACE_BOND_INFO_SLAVE)
+    s = format (s, "%=8s", "slave");
+  else
+    s = format (s, "%=8s",
+		hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP ? "up" : "down");
+
+  hw_class = vnet_get_hw_interface_class (vnm, hi->hw_class_index);
+  dev_class = vnet_get_device_class (vnm, hi->dev_class_index);
+
+  if (hi->bond_info && (hi->bond_info != VNET_HW_INTERFACE_BOND_INFO_SLAVE))
+    {
+      int hw_idx;
+      s = format (s, "Slave-Idx:");
+      clib_bitmap_foreach (hw_idx, hi->bond_info, s =
+			   format (s, " %d", hw_idx));
+    }
+  else if (dev_class->format_device_name)
+    s = format (s, "%U", dev_class->format_device_name, hi->dev_instance);
+  else
+    s = format (s, "%s%d", dev_class->name, hi->dev_instance);
+
+  if (verbose)
+    {
+      if (hw_class->format_device)
+	s = format (s, "\n%U%U",
+		    format_white_space, indent + 2,
+		    hw_class->format_device, hi->hw_if_index, verbose);
+      else
+	{
+	  s = format (s, "\n%U%s",
+		      format_white_space, indent + 2, hw_class->name);
+	  if (hw_class->format_address && vec_len (hi->hw_address) > 0)
+	    s =
+	      format (s, " address %U", hw_class->format_address,
+		      hi->hw_address);
+	}
+
+      if (dev_class->format_device)
+	s = format (s, "\n%U%U",
+		    format_white_space, indent + 2,
+		    dev_class->format_device, hi->dev_instance, verbose);
+    }
+
+  return s;
+}
+
+u8 *
+format_vnet_sw_interface_name (u8 * s, va_list * args)
+{
+  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
+  vnet_sw_interface_t *si = va_arg (*args, vnet_sw_interface_t *);
+  vnet_sw_interface_t *si_sup =
+    vnet_get_sup_sw_interface (vnm, si->sw_if_index);
+  vnet_hw_interface_t *hi_sup;
+
+  ASSERT (si_sup->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
+  hi_sup = vnet_get_hw_interface (vnm, si_sup->hw_if_index);
+
+  s = format (s, "%v", hi_sup->name);
+
+  if (si->type != VNET_SW_INTERFACE_TYPE_HARDWARE)
+    s = format (s, ".%d", si->sub.id);
+
+  return s;
+}
+
+u8 *
+format_vnet_sw_if_index_name (u8 * s, va_list * args)
+{
+  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
+  u32 sw_if_index = va_arg (*args, u32);
+  return format (s, "%U",
+		 format_vnet_sw_interface_name, vnm,
+		 vnet_get_sw_interface (vnm, sw_if_index));
+}
+
+u8 *
+format_vnet_sw_interface_cntrs (u8 * s, vnet_interface_main_t * im,
+				vnet_sw_interface_t * si)
+{
+  uword indent, n_printed;
+  int i, j, n_counters;
+  static vnet_main_t **my_vnet_mains;
+
+  vec_reset_length (my_vnet_mains);
+
+  indent = format_get_indent (s);
+  n_printed = 0;
+
+  {
+    vlib_combined_counter_main_t *cm;
+    vlib_counter_t v, vtotal;
+    u8 *n = 0;
+
+    for (i = 0; i < vec_len (vnet_mains); i++)
+      {
+	if (vnet_mains[i])
+	  vec_add1 (my_vnet_mains, vnet_mains[i]);
+      }
+
+    if (vec_len (my_vnet_mains) == 0)
+      vec_add1 (my_vnet_mains, &vnet_main);
+
+    /* Each vnet_main_t has its own copy of the interface counters */
+    n_counters = vec_len (im->combined_sw_if_counters);
+
+    /* rx, tx counters... */
+    for (j = 0; j < n_counters; j++)
+      {
+	vtotal.packets = 0;
+	vtotal.bytes = 0;
+
+	for (i = 0; i < vec_len (my_vnet_mains); i++)
+	  {
+	    im = &my_vnet_mains[i]->interface_main;
+	    cm = im->combined_sw_if_counters + j;
+	    vlib_get_combined_counter (cm, si->sw_if_index, &v);
+	    vtotal.packets += v.packets;
+	    vtotal.bytes += v.bytes;
+	  }
+
+	/* Only display non-zero counters. */
+	if (vtotal.packets == 0)
+	  continue;
+
+	if (n_printed > 0)
+	  s = format (s, "\n%U", format_white_space, indent);
+	n_printed += 2;
+
+	if (n)
+	  _vec_len (n) = 0;
+	n = format (n, "%s packets", cm->name);
+	s = format (s, "%-16v%16Ld", n, vtotal.packets);
+
+	_vec_len (n) = 0;
+	n = format (n, "%s bytes", cm->name);
+	s = format (s, "\n%U%-16v%16Ld",
+		    format_white_space, indent, n, vtotal.bytes);
+      }
+    vec_free (n);
+  }
+
+  {
+    vlib_simple_counter_main_t *cm;
+    u64 v, vtotal;
+
+    n_counters = vec_len (im->sw_if_counters);
+
+    for (j = 0; j < n_counters; j++)
+      {
+	vtotal = 0;
+
+	for (i = 0; i < vec_len (my_vnet_mains); i++)
+	  {
+	    im = &my_vnet_mains[i]->interface_main;
+	    cm = im->sw_if_counters + j;
+
+	    v = vlib_get_simple_counter (cm, si->sw_if_index);
+	    vtotal += v;
+	  }
+
+	/* Only display non-zero counters. */
+	if (vtotal == 0)
+	  continue;
+
+	if (n_printed > 0)
+	  s = format (s, "\n%U", format_white_space, indent);
+	n_printed += 1;
+
+	s = format (s, "%-16s%16Ld", cm->name, vtotal);
+      }
+  }
+
+  return s;
+}
+
+u8 *
+format_vnet_sw_interface (u8 * s, va_list * args)
+{
+  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
+  vnet_sw_interface_t *si = va_arg (*args, vnet_sw_interface_t *);
+  vnet_interface_main_t *im = &vnm->interface_main;
+
+  if (!si)
+    return format (s, "%=32s%=5s%=16s%=16s%=16s",
+		   "Name", "Idx", "State", "Counter", "Count");
+
+  s = format (s, "%-32U%=5d%=16U",
+	      format_vnet_sw_interface_name, vnm, si, si->sw_if_index,
+	      format_vnet_sw_interface_flags, si->flags);
+
+  s = format_vnet_sw_interface_cntrs (s, im, si);
+
+  return s;
+}
+
+u8 *
+format_vnet_sw_interface_name_override (u8 * s, va_list * args)
+{
+  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
+  vnet_sw_interface_t *si = va_arg (*args, vnet_sw_interface_t *);
+  /* caller supplied display name for this interface */
+  u8 *name = va_arg (*args, u8 *);
+  vnet_interface_main_t *im = &vnm->interface_main;
+
+
+  if (!si)
+    return format (s, "%=32s%=5s%=16s%=16s%=16s",
+		   "Name", "Idx", "State", "Counter", "Count");
+
+  s = format (s, "%-32v%=5d%=16U",
+	      name, si->sw_if_index,
+	      format_vnet_sw_interface_flags, si->flags);
+
+  s = format_vnet_sw_interface_cntrs (s, im, si);
+
+  return s;
+}
+
+uword
+unformat_vnet_hw_interface (unformat_input_t * input, va_list * args)
+{
+  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
+  u32 *hw_if_index = va_arg (*args, u32 *);
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_device_class_t *c;
+
+  /* Try per device class functions first. */
+  vec_foreach (c, im->device_classes)
+  {
+    if (c->unformat_device_name
+	&& unformat_user (input, c->unformat_device_name, hw_if_index))
+      return 1;
+  }
+
+  return unformat_user (input, unformat_hash_vec_string,
+			im->hw_interface_by_name, hw_if_index);
+}
+
+uword
+unformat_vnet_sw_interface (unformat_input_t * input, va_list * args)
+{
+  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
+  u32 *result = va_arg (*args, u32 *);
+  vnet_hw_interface_t *hi;
+  u32 hw_if_index, id, id_specified;
+  u8 *if_name = 0;
+  uword *p, error = 0;
+
+  id = ~0;
+  if (unformat (input, "%_%v.%d%_", &if_name, &id)
+      && ((p = hash_get (vnm->interface_main.hw_interface_by_name, if_name))))
+    {
+      hw_if_index = p[0];
+      id_specified = 1;
+    }
+  else
+    if (unformat (input, "%U", unformat_vnet_hw_interface, vnm, &hw_if_index))
+    id_specified = 0;
+  else
+    goto done;
+
+  hi = vnet_get_hw_interface (vnm, hw_if_index);
+  if (!id_specified)
+    {
+      *result = hi->sw_if_index;
+    }
+  else
+    {
+      if (!(p = hash_get (hi->sub_interface_sw_if_index_by_id, id)))
+	return 0;
+      *result = p[0];
+    }
+  error = 1;
+done:
+  vec_free (if_name);
+  return error;
+}
+
+uword
+unformat_vnet_sw_interface_flags (unformat_input_t * input, va_list * args)
+{
+  u32 *result = va_arg (*args, u32 *);
+  u32 flags = 0;
+
+  if (unformat (input, "up"))
+    flags |= VNET_SW_INTERFACE_FLAG_ADMIN_UP;
+  else if (unformat (input, "down"))
+    flags &= ~VNET_SW_INTERFACE_FLAG_ADMIN_UP;
+  else if (unformat (input, "punt"))
+    flags |= VNET_SW_INTERFACE_FLAG_PUNT;
+  else if (unformat (input, "enable"))
+    flags &= ~VNET_SW_INTERFACE_FLAG_PUNT;
+  else
+    return 0;
+
+  *result = flags;
+  return 1;
+}
+
+uword
+unformat_vnet_hw_interface_flags (unformat_input_t * input, va_list * args)
+{
+  u32 *result = va_arg (*args, u32 *);
+  u32 flags = 0;
+
+  if (unformat (input, "up"))
+    flags |= VNET_HW_INTERFACE_FLAG_LINK_UP;
+  else if (unformat (input, "down"))
+    flags &= ~VNET_HW_INTERFACE_FLAG_LINK_UP;
+  else
+    return 0;
+
+  *result = flags;
+  return 1;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/interface_funcs.h b/src/vnet/interface_funcs.h
new file mode 100644
index 00000000..b84d151c
--- /dev/null
+++ b/src/vnet/interface_funcs.h
@@ -0,0 +1,318 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * interface_funcs.h: VNET interfaces/sub-interfaces exported functions
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vnet_interface_funcs_h
+#define included_vnet_interface_funcs_h
+
+always_inline vnet_hw_interface_t *
+vnet_get_hw_interface (vnet_main_t * vnm, u32 hw_if_index)
+{
+  return pool_elt_at_index (vnm->interface_main.hw_interfaces, hw_if_index);
+}
+
+always_inline vnet_sw_interface_t *
+vnet_get_sw_interface (vnet_main_t * vnm, u32 sw_if_index)
+{
+  return pool_elt_at_index (vnm->interface_main.sw_interfaces, sw_if_index);
+}
+
+always_inline vnet_sw_interface_t *
+vnet_get_hw_sw_interface (vnet_main_t * vnm, u32 hw_if_index)
+{
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, hw->sw_if_index);
+  ASSERT (sw->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
+  return sw;
+}
+
+always_inline vnet_sw_interface_t *
+vnet_get_sup_sw_interface (vnet_main_t * vnm, u32 sw_if_index)
+{
+  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, sw_if_index);
+  if (sw->type == VNET_SW_INTERFACE_TYPE_SUB)
+    sw = vnet_get_sw_interface (vnm, sw->sup_sw_if_index);
+  return sw;
+}
+
+always_inline vnet_hw_interface_t *
+vnet_get_sup_hw_interface (vnet_main_t * vnm, u32 sw_if_index)
+{
+  vnet_sw_interface_t *sw = vnet_get_sup_sw_interface (vnm, sw_if_index);
+  ASSERT (sw->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
+  return vnet_get_hw_interface (vnm, sw->hw_if_index);
+}
+
+always_inline vnet_hw_interface_class_t *
+vnet_get_hw_interface_class (vnet_main_t * vnm, u32 hw_class_index)
+{
+  return vec_elt_at_index (vnm->interface_main.hw_interface_classes,
+			   hw_class_index);
+}
+
+always_inline vnet_device_class_t *
+vnet_get_device_class (vnet_main_t * vnm, u32 dev_class_index)
+{
+  return vec_elt_at_index (vnm->interface_main.device_classes,
+			   dev_class_index);
+}
+
+static inline u8 *
+vnet_get_sw_interface_tag (vnet_main_t * vnm, u32 sw_if_index)
+{
+  uword *p;
+  p = hash_get (vnm->interface_tag_by_sw_if_index, sw_if_index);
+  if (p)
+    return ((u8 *) p[0]);
+  return 0;
+}
+
+static inline void
+vnet_set_sw_interface_tag (vnet_main_t * vnm, u8 * tag, u32 sw_if_index)
+{
+  uword *p;
+  p = hash_get (vnm->interface_tag_by_sw_if_index, sw_if_index);
+  if (p)
+    {
+      u8 *oldtag = (u8 *) p[0];
+      hash_unset (vnm->interface_tag_by_sw_if_index, sw_if_index);
+      vec_free (oldtag);
+    }
+
+  hash_set (vnm->interface_tag_by_sw_if_index, sw_if_index, tag);
+}
+
+static inline void
+vnet_clear_sw_interface_tag (vnet_main_t * vnm, u32 sw_if_index)
+{
+  uword *p;
+  p = hash_get (vnm->interface_tag_by_sw_if_index, sw_if_index);
+  if (p)
+    {
+      u8 *oldtag = (u8 *) p[0];
+      hash_unset (vnm->interface_tag_by_sw_if_index, sw_if_index);
+      vec_free (oldtag);
+    }
+}
+
+/**
+ * Call back walk type for walking SW indices on a HW interface
+ */
+typedef void (*vnet_hw_sw_interface_walk_t) (vnet_main_t * vnm,
+					     u32 sw_if_index, void *ctx);
+
+/**
+ * @brief
+ * Walk the SW interfaces on a HW interface - this is the super
+ * interface and any sub-interfaces.
+ */
+void vnet_hw_interface_walk_sw (vnet_main_t * vnm,
+				u32 hw_if_index,
+				vnet_hw_sw_interface_walk_t fn, void *ctx);
+
+/* Register a hardware interface instance. */
+u32 vnet_register_interface (vnet_main_t * vnm,
+			     u32 dev_class_index,
+			     u32 dev_instance,
+			     u32 hw_class_index, u32 hw_instance);
+
+/* Creates a software interface given template. */
+clib_error_t *vnet_create_sw_interface (vnet_main_t * vnm,
+					vnet_sw_interface_t * template,
+					u32 * sw_if_index);
+
+void vnet_delete_hw_interface (vnet_main_t * vnm, u32 hw_if_index);
+void vnet_delete_sw_interface (vnet_main_t * vnm, u32 sw_if_index);
+int vnet_sw_interface_is_p2p (vnet_main_t * vnm, u32 sw_if_index);
+
+always_inline uword
+vnet_sw_interface_get_flags (vnet_main_t * vnm, u32 sw_if_index)
+{
+  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, sw_if_index);
+  return sw->flags;
+}
+
+always_inline uword
+vnet_sw_interface_is_admin_up (vnet_main_t * vnm, u32 sw_if_index)
+{
+  return (vnet_sw_interface_get_flags (vnm, sw_if_index) &
+	  VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
+}
+
+always_inline uword
+vnet_hw_interface_get_flags (vnet_main_t * vnm, u32 hw_if_index)
+{
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+  return hw->flags;
+}
+
+always_inline uword
+vnet_hw_interface_get_mtu (vnet_main_t * vnm, u32 hw_if_index,
+			   vlib_rx_or_tx_t dir)
+{
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+  return hw->max_l3_packet_bytes[dir];
+}
+
+always_inline uword
+vnet_sw_interface_get_mtu (vnet_main_t * vnm, u32 sw_if_index,
+			   vlib_rx_or_tx_t dir)
+{
+  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  return (hw->max_l3_packet_bytes[dir]);
+}
+
+always_inline uword
+vnet_hw_interface_is_link_up (vnet_main_t * vnm, u32 hw_if_index)
+{
+  return (vnet_hw_interface_get_flags (vnm, hw_if_index) &
+	  VNET_HW_INTERFACE_FLAG_LINK_UP) != 0;
+}
+
+always_inline vlib_frame_t *
+vnet_get_frame_to_sw_interface (vnet_main_t * vnm, u32 sw_if_index)
+{
+  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  return vlib_get_frame_to_node (vnm->vlib_main, hw->output_node_index);
+}
+
+always_inline void
+vnet_put_frame_to_sw_interface (vnet_main_t * vnm, u32 sw_if_index,
+				vlib_frame_t * f)
+{
+  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  return vlib_put_frame_to_node (vnm->vlib_main, hw->output_node_index, f);
+}
+
+/* Change interface flags (e.g. up, down, enable, disable). */
+clib_error_t *vnet_hw_interface_set_flags (vnet_main_t * vnm, u32 hw_if_index,
+					   u32 flags);
+
+/* Change interface flags (e.g. up, down, enable, disable). */
+clib_error_t *vnet_sw_interface_set_flags (vnet_main_t * vnm, u32 sw_if_index,
+					   u32 flags);
+
+/* Change interface class. */
+clib_error_t *vnet_hw_interface_set_class (vnet_main_t * vnm, u32 hw_if_index,
+					   u32 new_hw_class_index);
+
+/* Redirect rx pkts to node */
+int vnet_hw_interface_rx_redirect_to_node (vnet_main_t * vnm, u32 hw_if_index,
+					   u32 node_index);
+
+void vnet_hw_interface_init_for_class (vnet_main_t * vnm, u32 hw_if_index,
+				       u32 hw_class_index, u32 hw_instance);
+
+/* Rename interface */
+clib_error_t *vnet_rename_interface (vnet_main_t * vnm, u32 hw_if_index,
+				     char *new_name);
+
+/* Change interface mac address*/
+clib_error_t *vnet_hw_interface_change_mac_address (vnet_main_t * vnm,
+						    u32 hw_if_index,
+						    u64 mac_address);
+
+/* Formats sw/hw interface. */
+format_function_t format_vnet_hw_interface;
+format_function_t format_vnet_sw_interface;
+format_function_t format_vnet_sw_interface_name;
+format_function_t format_vnet_sw_interface_name_override;
+format_function_t format_vnet_sw_if_index_name;
+format_function_t format_vnet_sw_interface_flags;
+
+/* Parses sw/hw interface name -> index. */
+unformat_function_t unformat_vnet_sw_interface;
+unformat_function_t unformat_vnet_hw_interface;
+
+/* Parses interface flags (up, down, enable, disable, etc.) */
+unformat_function_t unformat_vnet_hw_interface_flags;
+unformat_function_t unformat_vnet_sw_interface_flags;
+
+/* Node runtime for interface output function. */
+typedef struct
+{
+  u32 hw_if_index;
+  u32 sw_if_index;
+  u32 dev_instance;
+  u32 is_deleted;
+} vnet_interface_output_runtime_t;
+
+/* Interface output functions. */
+void *vnet_interface_output_node_multiarch_select (void);
+void *vnet_interface_output_node_flatten_multiarch_select (void);
+
+word vnet_sw_interface_compare (vnet_main_t * vnm, uword sw_if_index0,
+				uword sw_if_index1);
+word vnet_hw_interface_compare (vnet_main_t * vnm, uword hw_if_index0,
+				uword hw_if_index1);
+
+typedef enum
+{
+  VNET_INTERFACE_OUTPUT_NEXT_DROP,
+  VNET_INTERFACE_OUTPUT_NEXT_TX,
+} vnet_interface_output_next_t;
+
+typedef enum
+{
+  VNET_INTERFACE_TX_NEXT_DROP,
+  VNET_INTERFACE_TX_N_NEXT,
+} vnet_interface_tx_next_t;
+
+#define VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT VNET_INTERFACE_TX_N_NEXT
+
+typedef enum
+{
+  VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DOWN,
+  VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DELETED,
+} vnet_interface_output_error_t;
+
+/* Format for interface output traces. */
+u8 *format_vnet_interface_output_trace (u8 * s, va_list * va);
+
+serialize_function_t serialize_vnet_interface_state,
+  unserialize_vnet_interface_state;
+
+#endif /* included_vnet_interface_funcs_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c
new file mode 100644
index 00000000..475b0b93
--- /dev/null
+++ b/src/vnet/interface_output.c
@@ -0,0 +1,1404 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * interface_output.c: interface output node
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/feature/feature.h>
+
+typedef struct
+{
+  u32 sw_if_index;
+  u8 data[128 - sizeof (u32)];
+}
+interface_output_trace_t;
+
+u8 *
+format_vnet_interface_output_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  vlib_node_t *node = va_arg (*va, vlib_node_t *);
+  interface_output_trace_t *t = va_arg (*va, interface_output_trace_t *);
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_sw_interface_t *si;
+  uword indent;
+
+  if (t->sw_if_index != (u32) ~ 0)
+    {
+      indent = format_get_indent (s);
+
+      if (pool_is_free_index
+	  (vnm->interface_main.sw_interfaces, t->sw_if_index))
+	{
+	  /* the interface may have been deleted by the time the trace is printed */
+	  s = format (s, "sw_if_index: %d\n%U%U",
+		      t->sw_if_index,
+		      format_white_space, indent,
+		      node->format_buffer ? node->
+		      format_buffer : format_hex_bytes, t->data,
+		      sizeof (t->data));
+	}
+      else
+	{
+	  si = vnet_get_sw_interface (vnm, t->sw_if_index);
+
+	  s = format (s, "%U\n%U%U",
+		      format_vnet_sw_interface_name, vnm, si,
+		      format_white_space, indent,
+		      node->format_buffer ? node->
+		      format_buffer : format_hex_bytes, t->data,
+		      sizeof (t->data));
+	}
+    }
+  return s;
+}
+
+static void
+vnet_interface_output_trace (vlib_main_t * vm,
+			     vlib_node_runtime_t * node,
+			     vlib_frame_t * frame, uword n_buffers)
+{
+  u32 n_left, *from;
+
+  n_left = n_buffers;
+  from = vlib_frame_args (frame);
+
+  while (n_left >= 4)
+    {
+      u32 bi0, bi1;
+      vlib_buffer_t *b0, *b1;
+      interface_output_trace_t *t0, *t1;
+
+      /* Prefetch next iteration. */
+      vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
+      vlib_prefetch_buffer_with_index (vm, from[3], LOAD);
+
+      bi0 = from[0];
+      bi1 = from[1];
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+	  t0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	  clib_memcpy (t0->data, vlib_buffer_get_current (b0),
+		       sizeof (t0->data));
+	}
+      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
+	  t1->sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_TX];
+	  clib_memcpy (t1->data, vlib_buffer_get_current (b1),
+		       sizeof (t1->data));
+	}
+      from += 2;
+      n_left -= 2;
+    }
+
+  while (n_left >= 1)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      interface_output_trace_t *t0;
+
+      bi0 = from[0];
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+	  t0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	  clib_memcpy (t0->data, vlib_buffer_get_current (b0),
+		       sizeof (t0->data));
+	}
+      from += 1;
+      n_left -= 1;
+    }
+}
+
+static never_inline u32
+slow_path (vlib_main_t * vm,
+	   u32 bi,
+	   vlib_buffer_t * b,
+	   u32 n_left_to_tx, u32 * to_tx, u32 * n_slow_bytes_result)
+{
+  /* We've already enqueued a single buffer. */
+  u32 n_buffers = 0;
+  u32 n_slow_bytes = 0;
+
+  while (n_left_to_tx > 0)
+    {
+      to_tx[0] = bi;
+      to_tx += 1;
+      n_left_to_tx -= 1;
+      n_buffers += 1;
+      n_slow_bytes += vlib_buffer_length_in_chain (vm, b);
+
+      /* Be grumpy about zero length buffers for benefit of
+         driver tx function. */
+      ASSERT (b->current_length > 0);
+
+      if (!(b->flags & VLIB_BUFFER_NEXT_PRESENT))
+	break;
+
+      bi = b->next_buffer;
+      b = vlib_get_buffer (vm, bi);
+    }
+
+  /* Ran out of space in next frame trying to enqueue buffers? */
+  if (b->flags & VLIB_BUFFER_NEXT_PRESENT)
+    return 0;
+
+  *n_slow_bytes_result = n_slow_bytes;
+  return n_buffers;
+}
+
+/*
+ * Increment TX stats. Roll up consecutive increments to the same sw_if_index
+ * into one increment.
+ */
+static_always_inline void
+incr_output_stats (vnet_main_t * vnm,
+		   u32 cpu_index,
+		   u32 length,
+		   u32 sw_if_index,
+		   u32 * last_sw_if_index, u32 * n_packets, u32 * n_bytes)
+{
+  vnet_interface_main_t *im;
+
+  if (PREDICT_TRUE (sw_if_index == *last_sw_if_index))
+    {
+      *n_packets += 1;
+      *n_bytes += length;
+    }
+  else
+    {
+      if (PREDICT_TRUE (*last_sw_if_index != ~0))
+	{
+	  im = &vnm->interface_main;
+
+	  vlib_increment_combined_counter (im->combined_sw_if_counters
+					   + VNET_INTERFACE_COUNTER_TX,
+					   cpu_index,
+					   *last_sw_if_index,
+					   *n_packets, *n_bytes);
+	}
+      *last_sw_if_index = sw_if_index;
+      *n_packets = 1;
+      *n_bytes = length;
+    }
+}
+
+
+/* Interface output functions. */
+uword
+vnet_interface_output_node_flatten (vlib_main_t * vm,
+				    vlib_node_runtime_t * node,
+				    vlib_frame_t * frame)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_output_runtime_t *rt = (void *) node->runtime_data;
+  vnet_sw_interface_t *si;
+  vnet_hw_interface_t *hi;
+  u32 n_left_to_tx, *from, *from_end, *to_tx;
+  u32 n_bytes, n_buffers, n_packets;
+  u32 last_sw_if_index;
+  u32 cpu_index = vm->cpu_index;
+
+  n_buffers = frame->n_vectors;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vnet_interface_output_trace (vm, node, frame, n_buffers);
+
+  from = vlib_frame_args (frame);
+
+  if (rt->is_deleted)
+    return vlib_error_drop_buffers (vm, node, from,
+				    /* buffer stride */ 1,
+				    n_buffers,
+				    VNET_INTERFACE_OUTPUT_NEXT_DROP,
+				    node->node_index,
+				    VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DELETED);
+
+  si = vnet_get_sw_interface (vnm, rt->sw_if_index);
+  hi = vnet_get_sup_hw_interface (vnm, rt->sw_if_index);
+  if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ||
+      !(hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP))
+    {
+      vlib_simple_counter_main_t *cm;
+
+      cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
+			     VNET_INTERFACE_COUNTER_TX_ERROR);
+      vlib_increment_simple_counter (cm, cpu_index,
+				     rt->sw_if_index, n_buffers);
+      return vlib_error_drop_buffers (vm, node, from,
+				      /* buffer stride */ 1,
+				      n_buffers,
+				      VNET_INTERFACE_OUTPUT_NEXT_DROP,
+				      node->node_index,
+				      VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DOWN);
+    }
+
+  from_end = from + n_buffers;
+
+  /* Total byte count of all buffers. */
+  n_bytes = 0;
+  n_packets = 0;
+  last_sw_if_index = ~0;
+
+  while (from < from_end)
+    {
+      /* Get new next frame since previous incomplete frame may have less
+         than VNET_FRAME_SIZE vectors in it. */
+      vlib_get_new_next_frame (vm, node, VNET_INTERFACE_OUTPUT_NEXT_TX,
+			       to_tx, n_left_to_tx);
+
+      while (from + 4 <= from_end && n_left_to_tx >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+
+	  /* Prefetch next iteration. */
+	  vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
+	  vlib_prefetch_buffer_with_index (vm, from[3], LOAD);
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_tx[0] = bi0;
+	  to_tx[1] = bi1;
+	  from += 2;
+	  to_tx += 2;
+	  n_left_to_tx -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /* Be grumpy about zero length buffers for benefit of
+	     driver tx function. */
+	  ASSERT (b0->current_length > 0);
+	  ASSERT (b1->current_length > 0);
+
+	  if (PREDICT_FALSE
+	      ((b0->flags | b1->flags) & VLIB_BUFFER_NEXT_PRESENT))
+	    {
+	      u32 n_buffers, n_slow_bytes, i;
+
+	      /* Undo. */
+	      from -= 2;
+	      to_tx -= 2;
+	      n_left_to_tx += 2;
+
+	      /* Do slow path two times. */
+	      for (i = 0; i < 2; i++)
+		{
+		  u32 bi = i ? bi1 : bi0;
+		  vlib_buffer_t *b = i ? b1 : b0;
+
+		  n_buffers = slow_path (vm, bi, b,
+					 n_left_to_tx, to_tx, &n_slow_bytes);
+
+		  /* Not enough room for single packet? */
+		  if (n_buffers == 0)
+		    goto put;
+
+		  from += 1;
+		  to_tx += n_buffers;
+		  n_left_to_tx -= n_buffers;
+		  incr_output_stats (vnm, cpu_index, n_slow_bytes,
+				     vnet_buffer (b)->sw_if_index[VLIB_TX],
+				     &last_sw_if_index, &n_packets, &n_bytes);
+		}
+	    }
+	  else
+	    {
+	      incr_output_stats (vnm, cpu_index,
+				 vlib_buffer_length_in_chain (vm, b0),
+				 vnet_buffer (b0)->sw_if_index[VLIB_TX],
+				 &last_sw_if_index, &n_packets, &n_bytes);
+	      incr_output_stats (vnm, cpu_index,
+				 vlib_buffer_length_in_chain (vm, b0),
+				 vnet_buffer (b1)->sw_if_index[VLIB_TX],
+				 &last_sw_if_index, &n_packets, &n_bytes);
+	    }
+	}
+
+      while (from + 1 <= from_end && n_left_to_tx >= 1)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+
+	  bi0 = from[0];
+	  to_tx[0] = bi0;
+	  from += 1;
+	  to_tx += 1;
+	  n_left_to_tx -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  /* Be grumpy about zero length buffers for benefit of
+	     driver tx function. */
+	  ASSERT (b0->current_length > 0);
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_NEXT_PRESENT))
+	    {
+	      u32 n_buffers, n_slow_bytes;
+
+	      /* Undo. */
+	      from -= 1;
+	      to_tx -= 1;
+	      n_left_to_tx += 1;
+
+	      n_buffers = slow_path (vm, bi0, b0,
+				     n_left_to_tx, to_tx, &n_slow_bytes);
+
+	      /* Not enough room for single packet? */
+	      if (n_buffers == 0)
+		goto put;
+
+	      from += 1;
+	      to_tx += n_buffers;
+	      n_left_to_tx -= n_buffers;
+	    }
+	  incr_output_stats (vnm, cpu_index,
+			     vlib_buffer_length_in_chain (vm, b0),
+			     vnet_buffer (b0)->sw_if_index[VLIB_TX],
+			     &last_sw_if_index, &n_packets, &n_bytes);
+	}
+
+    put:
+      vlib_put_next_frame (vm, node, VNET_INTERFACE_OUTPUT_NEXT_TX,
+			   n_left_to_tx);
+    }
+
+  /* Final update of interface stats. */
+  incr_output_stats (vnm, cpu_index, 0, ~0,	/* ~0 will flush stats */
+		     &last_sw_if_index, &n_packets, &n_bytes);
+
+  return n_buffers;
+}
+
+VLIB_NODE_FUNCTION_MULTIARCH_CLONE (vnet_interface_output_node_flatten);
+CLIB_MULTIARCH_SELECT_FN (vnet_interface_output_node_flatten);
+
+uword
+vnet_interface_output_node (vlib_main_t * vm,
+			    vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_output_runtime_t *rt = (void *) node->runtime_data;
+  vnet_sw_interface_t *si;
+  vnet_hw_interface_t *hi;
+  u32 n_left_to_tx, *from, *from_end, *to_tx;
+  u32 n_bytes, n_buffers, n_packets;
+  u32 n_bytes_b0, n_bytes_b1;
+  u32 cpu_index = vm->cpu_index;
+  vnet_interface_main_t *im = &vnm->interface_main;
+  u32 next_index = VNET_INTERFACE_OUTPUT_NEXT_TX;
+  u32 current_config_index = ~0;
+  u8 arc = im->output_feature_arc_index;
+
+  n_buffers = frame->n_vectors;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vnet_interface_output_trace (vm, node, frame, n_buffers);
+
+  from = vlib_frame_args (frame);
+
+  if (rt->is_deleted)
+    return vlib_error_drop_buffers (vm, node, from,
+				    /* buffer stride */ 1,
+				    n_buffers,
+				    VNET_INTERFACE_OUTPUT_NEXT_DROP,
+				    node->node_index,
+				    VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DELETED);
+
+  si = vnet_get_sw_interface (vnm, rt->sw_if_index);
+  hi = vnet_get_sup_hw_interface (vnm, rt->sw_if_index);
+  if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ||
+      !(hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP))
+    {
+      vlib_simple_counter_main_t *cm;
+
+      cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
+			     VNET_INTERFACE_COUNTER_TX_ERROR);
+      vlib_increment_simple_counter (cm, cpu_index,
+				     rt->sw_if_index, n_buffers);
+
+      return vlib_error_drop_buffers (vm, node, from,
+				      /* buffer stride */ 1,
+				      n_buffers,
+				      VNET_INTERFACE_OUTPUT_NEXT_DROP,
+				      node->node_index,
+				      VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DOWN);
+    }
+
+  from_end = from + n_buffers;
+
+  /* Total byte count of all buffers. */
+  n_bytes = 0;
+  n_packets = 0;
+
+  /* interface-output feature arc handling */
+  if (PREDICT_FALSE (vnet_have_features (arc, rt->sw_if_index)))
+    {
+      vnet_feature_config_main_t *fcm;
+      fcm = vnet_feature_get_config_main (arc);
+      current_config_index = vnet_get_feature_config_index (arc,
+							    rt->sw_if_index);
+      vnet_get_config_data (&fcm->config_main, &current_config_index,
+			    &next_index, 0);
+    }
+
+  while (from < from_end)
+    {
+      /* Get new next frame since previous incomplete frame may have less
+         than VNET_FRAME_SIZE vectors in it. */
+      vlib_get_new_next_frame (vm, node, next_index, to_tx, n_left_to_tx);
+
+      while (from + 4 <= from_end && n_left_to_tx >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 tx_swif0, tx_swif1;
+
+	  /* Prefetch next iteration. */
+	  vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
+	  vlib_prefetch_buffer_with_index (vm, from[3], LOAD);
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_tx[0] = bi0;
+	  to_tx[1] = bi1;
+	  from += 2;
+	  to_tx += 2;
+	  n_left_to_tx -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /* Be grumpy about zero length buffers for benefit of
+	     driver tx function. */
+	  ASSERT (b0->current_length > 0);
+	  ASSERT (b1->current_length > 0);
+
+	  n_bytes_b0 = vlib_buffer_length_in_chain (vm, b0);
+	  n_bytes_b1 = vlib_buffer_length_in_chain (vm, b1);
+	  tx_swif0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	  tx_swif1 = vnet_buffer (b1)->sw_if_index[VLIB_TX];
+
+	  n_bytes += n_bytes_b0 + n_bytes_b1;
+	  n_packets += 2;
+
+	  if (PREDICT_FALSE (current_config_index != ~0))
+	    {
+	      b0->feature_arc_index = arc;
+	      b1->feature_arc_index = arc;
+	      b0->current_config_index = current_config_index;
+	      b1->current_config_index = current_config_index;
+	    }
+
+	  if (PREDICT_FALSE (tx_swif0 != rt->sw_if_index))
+	    {
+	      /* update vlan subif tx counts, if required */
+	      vlib_increment_combined_counter (im->combined_sw_if_counters +
+					       VNET_INTERFACE_COUNTER_TX,
+					       cpu_index, tx_swif0, 1,
+					       n_bytes_b0);
+	    }
+
+	  /* update vlan subif tx counts, if required */
+	  if (PREDICT_FALSE (tx_swif1 != rt->sw_if_index))
+	    {
+
+	      vlib_increment_combined_counter (im->combined_sw_if_counters +
+					       VNET_INTERFACE_COUNTER_TX,
+					       cpu_index, tx_swif1, 1,
+					       n_bytes_b1);
+	    }
+	}
+
+      while (from + 1 <= from_end && n_left_to_tx >= 1)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 tx_swif0;
+
+	  bi0 = from[0];
+	  to_tx[0] = bi0;
+	  from += 1;
+	  to_tx += 1;
+	  n_left_to_tx -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  /* Be grumpy about zero length buffers for benefit of
+	     driver tx function. */
+	  ASSERT (b0->current_length > 0);
+
+	  n_bytes_b0 = vlib_buffer_length_in_chain (vm, b0);
+	  tx_swif0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	  n_bytes += n_bytes_b0;
+	  n_packets += 1;
+
+	  if (PREDICT_FALSE (current_config_index != ~0))
+	    {
+	      b0->feature_arc_index = arc;
+	      b0->current_config_index = current_config_index;
+	    }
+
+	  if (PREDICT_FALSE (tx_swif0 != rt->sw_if_index))
+	    {
+
+	      vlib_increment_combined_counter (im->combined_sw_if_counters +
+					       VNET_INTERFACE_COUNTER_TX,
+					       cpu_index, tx_swif0, 1,
+					       n_bytes_b0);
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_tx);
+    }
+
+  /* Update main interface stats. */
+  vlib_increment_combined_counter (im->combined_sw_if_counters
+				   + VNET_INTERFACE_COUNTER_TX,
+				   cpu_index,
+				   rt->sw_if_index, n_packets, n_bytes);
+  return n_buffers;
+}
+
+VLIB_NODE_FUNCTION_MULTIARCH_CLONE (vnet_interface_output_node);
+CLIB_MULTIARCH_SELECT_FN (vnet_interface_output_node);
+
+/* Use buffer's sw_if_index[VNET_TX] to choose output interface. */
+static uword
+vnet_per_buffer_interface_output (vlib_main_t * vm,
+				  vlib_node_runtime_t * node,
+				  vlib_frame_t * frame)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 n_left_to_next, *from, *to_next;
+  u32 n_left_from, next_index;
+
+  n_left_from = frame->n_vectors;
+
+  from = vlib_frame_args (frame);
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1, next0, next1;
+	  vlib_buffer_t *b0, *b1;
+	  vnet_hw_interface_t *hi0, *hi1;
+
+	  /* Prefetch next iteration. */
+	  vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
+	  vlib_prefetch_buffer_with_index (vm, from[3], LOAD);
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  hi0 =
+	    vnet_get_sup_hw_interface (vnm,
+				       vnet_buffer (b0)->sw_if_index
+				       [VLIB_TX]);
+	  hi1 =
+	    vnet_get_sup_hw_interface (vnm,
+				       vnet_buffer (b1)->sw_if_index
+				       [VLIB_TX]);
+
+	  next0 = hi0->hw_if_index;
+	  next1 = hi1->hw_if_index;
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, bi1, next0,
+					   next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, next0;
+	  vlib_buffer_t *b0;
+	  vnet_hw_interface_t *hi0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  n_left_from -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  hi0 =
+	    vnet_get_sup_hw_interface (vnm,
+				       vnet_buffer (b0)->sw_if_index
+				       [VLIB_TX]);
+
+	  next0 = hi0->hw_if_index;
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+always_inline u32
+counter_index (vlib_main_t * vm, vlib_error_t e)
+{
+  vlib_node_t *n;
+  u32 ci, ni;
+
+  ni = vlib_error_get_node (e);
+  n = vlib_get_node (vm, ni);
+
+  ci = vlib_error_get_code (e);
+  ASSERT (ci < n->n_errors);
+
+  ci += n->error_heap_index;
+
+  return ci;
+}
+
+static u8 *
+format_vnet_error_trace (u8 * s, va_list * va)
+{
+  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  vlib_error_t *e = va_arg (*va, vlib_error_t *);
+  vlib_node_t *error_node;
+  vlib_error_main_t *em = &vm->error_main;
+  u32 i;
+
+  error_node = vlib_get_node (vm, vlib_error_get_node (e[0]));
+  i = counter_index (vm, e[0]);
+  s = format (s, "%v: %s", error_node->name, em->error_strings_heap[i]);
+
+  return s;
+}
+
+static void
+trace_errors_with_buffers (vlib_main_t * vm,
+			   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left, *buffers;
+
+  buffers = vlib_frame_vector_args (frame);
+  n_left = frame->n_vectors;
+
+  while (n_left >= 4)
+    {
+      u32 bi0, bi1;
+      vlib_buffer_t *b0, *b1;
+      vlib_error_t *t0, *t1;
+
+      /* Prefetch next iteration. */
+      vlib_prefetch_buffer_with_index (vm, buffers[2], LOAD);
+      vlib_prefetch_buffer_with_index (vm, buffers[3], LOAD);
+
+      bi0 = buffers[0];
+      bi1 = buffers[1];
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+	  t0[0] = b0->error;
+	}
+      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
+	  t1[0] = b1->error;
+	}
+      buffers += 2;
+      n_left -= 2;
+    }
+
+  while (n_left >= 1)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      vlib_error_t *t0;
+
+      bi0 = buffers[0];
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+	  t0[0] = b0->error;
+	}
+      buffers += 1;
+      n_left -= 1;
+    }
+}
+
+static u8 *
+validate_error (vlib_main_t * vm, vlib_error_t * e, u32 index)
+{
+  uword node_index = vlib_error_get_node (e[0]);
+  uword code = vlib_error_get_code (e[0]);
+  vlib_node_t *n;
+
+  if (node_index >= vec_len (vm->node_main.nodes))
+    return format (0, "[%d], node index out of range 0x%x, error 0x%x",
+		   index, node_index, e[0]);
+
+  n = vlib_get_node (vm, node_index);
+  if (code >= n->n_errors)
+    return format (0, "[%d], code %d out of range for node %v",
+		   index, code, n->name);
+
+  return 0;
+}
+
+static u8 *
+validate_error_frame (vlib_main_t * vm,
+		      vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  u32 *buffers = vlib_frame_args (f);
+  vlib_buffer_t *b;
+  u8 *msg = 0;
+  uword i;
+
+  for (i = 0; i < f->n_vectors; i++)
+    {
+      b = vlib_get_buffer (vm, buffers[i]);
+      msg = validate_error (vm, &b->error, i);
+      if (msg)
+	return msg;
+    }
+
+  return msg;
+}
+
+typedef enum
+{
+  VNET_ERROR_DISPOSITION_DROP,
+  VNET_ERROR_DISPOSITION_PUNT,
+  VNET_ERROR_N_DISPOSITION,
+} vnet_error_disposition_t;
+
+always_inline void
+do_packet (vlib_main_t * vm, vlib_error_t a)
+{
+  vlib_error_main_t *em = &vm->error_main;
+  u32 i = counter_index (vm, a);
+  em->counters[i] += 1;
+  vlib_error_elog_count (vm, i, 1);
+}
+
+static_always_inline uword
+process_drop_punt (vlib_main_t * vm,
+		   vlib_node_runtime_t * node,
+		   vlib_frame_t * frame, vnet_error_disposition_t disposition)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vlib_error_main_t *em = &vm->error_main;
+  u32 *buffers, *first_buffer;
+  vlib_error_t current_error;
+  u32 current_counter_index, n_errors_left;
+  u32 current_sw_if_index, n_errors_current_sw_if_index;
+  u64 current_counter;
+  vlib_simple_counter_main_t *cm;
+  u32 cpu_index = vm->cpu_index;
+
+  static vlib_error_t memory[VNET_ERROR_N_DISPOSITION];
+  static char memory_init[VNET_ERROR_N_DISPOSITION];
+
+  buffers = vlib_frame_args (frame);
+  first_buffer = buffers;
+
+  {
+    vlib_buffer_t *b = vlib_get_buffer (vm, first_buffer[0]);
+
+    if (!memory_init[disposition])
+      {
+	memory_init[disposition] = 1;
+	memory[disposition] = b->error;
+      }
+
+    current_sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_RX];
+    n_errors_current_sw_if_index = 0;
+  }
+
+  current_error = memory[disposition];
+  current_counter_index = counter_index (vm, memory[disposition]);
+  current_counter = em->counters[current_counter_index];
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    trace_errors_with_buffers (vm, node, frame);
+
+  n_errors_left = frame->n_vectors;
+  cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
+			 (disposition == VNET_ERROR_DISPOSITION_PUNT
+			  ? VNET_INTERFACE_COUNTER_PUNT
+			  : VNET_INTERFACE_COUNTER_DROP));
+
+  while (n_errors_left >= 2)
+    {
+      vlib_buffer_t *b0, *b1;
+      vnet_sw_interface_t *sw_if0, *sw_if1;
+      vlib_error_t e0, e1;
+      u32 bi0, bi1;
+      u32 sw_if_index0, sw_if_index1;
+
+      bi0 = buffers[0];
+      bi1 = buffers[1];
+
+      buffers += 2;
+      n_errors_left -= 2;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      e0 = b0->error;
+      e1 = b1->error;
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+
+      /* Speculate that sw_if_index == sw_if_index[01]. */
+      n_errors_current_sw_if_index += 2;
+
+      /* Speculatively assume all 2 (node, code) pairs are equal
+         to current (node, code). */
+      current_counter += 2;
+
+      if (PREDICT_FALSE (e0 != current_error
+			 || e1 != current_error
+			 || sw_if_index0 != current_sw_if_index
+			 || sw_if_index1 != current_sw_if_index))
+	{
+	  current_counter -= 2;
+	  n_errors_current_sw_if_index -= 2;
+
+	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
+	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index1, 1);
+
+	  /* Increment super-interface drop/punt counters for
+	     sub-interfaces. */
+	  sw_if0 = vnet_get_sw_interface (vnm, sw_if_index0);
+	  vlib_increment_simple_counter
+	    (cm, cpu_index, sw_if0->sup_sw_if_index,
+	     sw_if0->sup_sw_if_index != sw_if_index0);
+
+	  sw_if1 = vnet_get_sw_interface (vnm, sw_if_index1);
+	  vlib_increment_simple_counter
+	    (cm, cpu_index, sw_if1->sup_sw_if_index,
+	     sw_if1->sup_sw_if_index != sw_if_index1);
+
+	  em->counters[current_counter_index] = current_counter;
+	  do_packet (vm, e0);
+	  do_packet (vm, e1);
+
+	  /* For 2 repeated errors, change current error. */
+	  if (e0 == e1 && e1 != current_error)
+	    {
+	      current_error = e0;
+	      current_counter_index = counter_index (vm, e0);
+	    }
+	  current_counter = em->counters[current_counter_index];
+	}
+    }
+
+  while (n_errors_left >= 1)
+    {
+      vlib_buffer_t *b0;
+      vnet_sw_interface_t *sw_if0;
+      vlib_error_t e0;
+      u32 bi0, sw_if_index0;
+
+      bi0 = buffers[0];
+
+      buffers += 1;
+      n_errors_left -= 1;
+      current_counter += 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      e0 = b0->error;
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+      /* Increment drop/punt counters. */
+      vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
+
+      /* Increment super-interface drop/punt counters for sub-interfaces. */
+      sw_if0 = vnet_get_sw_interface (vnm, sw_if_index0);
+      vlib_increment_simple_counter (cm, cpu_index, sw_if0->sup_sw_if_index,
+				     sw_if0->sup_sw_if_index != sw_if_index0);
+
+      if (PREDICT_FALSE (e0 != current_error))
+	{
+	  current_counter -= 1;
+
+	  vlib_error_elog_count (vm, current_counter_index,
+				 (current_counter
+				  - em->counters[current_counter_index]));
+
+	  em->counters[current_counter_index] = current_counter;
+
+	  do_packet (vm, e0);
+	  current_error = e0;
+	  current_counter_index = counter_index (vm, e0);
+	  current_counter = em->counters[current_counter_index];
+	}
+    }
+
+  if (n_errors_current_sw_if_index > 0)
+    {
+      vnet_sw_interface_t *si;
+
+      vlib_increment_simple_counter (cm, cpu_index, current_sw_if_index,
+				     n_errors_current_sw_if_index);
+
+      si = vnet_get_sw_interface (vnm, current_sw_if_index);
+      if (si->sup_sw_if_index != current_sw_if_index)
+	vlib_increment_simple_counter (cm, cpu_index, si->sup_sw_if_index,
+				       n_errors_current_sw_if_index);
+    }
+
+  vlib_error_elog_count (vm, current_counter_index,
+			 (current_counter
+			  - em->counters[current_counter_index]));
+
+  /* Return cached counter. */
+  em->counters[current_counter_index] = current_counter;
+
+  /* Save memory for next iteration. */
+  memory[disposition] = current_error;
+
+  if (disposition == VNET_ERROR_DISPOSITION_DROP || !vm->os_punt_frame)
+    {
+      vlib_buffer_free (vm, first_buffer, frame->n_vectors);
+
+      /* If there is no punt function, free the frame as well. */
+      if (disposition == VNET_ERROR_DISPOSITION_PUNT && !vm->os_punt_frame)
+	vlib_frame_free (vm, node, frame);
+    }
+  else
+    vm->os_punt_frame (vm, node, frame);
+
+  return frame->n_vectors;
+}
+
+static inline void
+pcap_drop_trace (vlib_main_t * vm,
+		 vnet_interface_main_t * im, vlib_frame_t * f)
+{
+  u32 *from;
+  u32 n_left = f->n_vectors;
+  vlib_buffer_t *b0, *p1;
+  u32 bi0;
+  i16 save_current_data;
+  u16 save_current_length;
+
+  from = vlib_frame_vector_args (f);
+
+  while (n_left > 0)
+    {
+      if (PREDICT_TRUE (n_left > 1))
+	{
+	  p1 = vlib_get_buffer (vm, from[1]);
+	  vlib_prefetch_buffer_header (p1, LOAD);
+	}
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      from++;
+      n_left--;
+
+      /* See if we're pointedly ignoring this specific error */
+      if (im->pcap_drop_filter_hash
+	  && hash_get (im->pcap_drop_filter_hash, b0->error))
+	continue;
+
+      /* Trace all drops, or drops received on a specific interface */
+      if (im->pcap_sw_if_index == 0 ||
+	  im->pcap_sw_if_index == vnet_buffer (b0)->sw_if_index[VLIB_RX])
+	{
+	  save_current_data = b0->current_data;
+	  save_current_length = b0->current_length;
+
+	  /*
+	   * Typically, we'll need to rewind the buffer
+	   */
+	  if (b0->current_data > 0)
+	    vlib_buffer_advance (b0, (word) - b0->current_data);
+
+	  pcap_add_buffer (&im->pcap_main, vm, bi0, 512);
+
+	  b0->current_data = save_current_data;
+	  b0->current_length = save_current_length;
+	}
+    }
+}
+
+void
+vnet_pcap_drop_trace_filter_add_del (u32 error_index, int is_add)
+{
+  vnet_interface_main_t *im = &vnet_get_main ()->interface_main;
+
+  if (im->pcap_drop_filter_hash == 0)
+    im->pcap_drop_filter_hash = hash_create (0, sizeof (uword));
+
+  if (is_add)
+    hash_set (im->pcap_drop_filter_hash, error_index, 1);
+  else
+    hash_unset (im->pcap_drop_filter_hash, error_index);
+}
+
+static uword
+process_drop (vlib_main_t * vm,
+	      vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  vnet_interface_main_t *im = &vnet_get_main ()->interface_main;
+
+  if (PREDICT_FALSE (im->drop_pcap_enable))
+    pcap_drop_trace (vm, im, frame);
+
+  return process_drop_punt (vm, node, frame, VNET_ERROR_DISPOSITION_DROP);
+}
+
+static uword
+process_punt (vlib_main_t * vm,
+	      vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return process_drop_punt (vm, node, frame, VNET_ERROR_DISPOSITION_PUNT);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (drop_buffers,static) = {
+  .function = process_drop,
+  .name = "error-drop",
+  .flags = VLIB_NODE_FLAG_IS_DROP,
+  .vector_size = sizeof (u32),
+  .format_trace = format_vnet_error_trace,
+  .validate_frame = validate_error_frame,
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (drop_buffers, process_drop);
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (punt_buffers,static) = {
+  .function = process_punt,
+  .flags = (VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH
+	    | VLIB_NODE_FLAG_IS_PUNT),
+  .name = "error-punt",
+  .vector_size = sizeof (u32),
+  .format_trace = format_vnet_error_trace,
+  .validate_frame = validate_error_frame,
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (punt_buffers, process_punt);
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (vnet_per_buffer_interface_output_node,static) = {
+  .function = vnet_per_buffer_interface_output,
+  .name = "interface-output",
+  .vector_size = sizeof (u32),
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (vnet_per_buffer_interface_output_node,
+			      vnet_per_buffer_interface_output);
+
+static uword
+interface_tx_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+		      vlib_frame_t * from_frame)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 last_sw_if_index = ~0;
+  vlib_frame_t *to_frame = 0;
+  vnet_hw_interface_t *hw = 0;
+  u32 *from, *to_next = 0;
+  u32 n_left_from;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+  while (n_left_from > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      u32 sw_if_index0;
+
+      bi0 = from[0];
+      from++;
+      n_left_from--;
+      b0 = vlib_get_buffer (vm, bi0);
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+
+      if (PREDICT_FALSE ((last_sw_if_index != sw_if_index0) || to_frame == 0))
+	{
+	  if (to_frame)
+	    {
+	      hw = vnet_get_sup_hw_interface (vnm, last_sw_if_index);
+	      vlib_put_frame_to_node (vm, hw->tx_node_index, to_frame);
+	    }
+	  last_sw_if_index = sw_if_index0;
+	  hw = vnet_get_sup_hw_interface (vnm, sw_if_index0);
+	  to_frame = vlib_get_frame_to_node (vm, hw->tx_node_index);
+	  to_next = vlib_frame_vector_args (to_frame);
+	}
+
+      to_next[0] = bi0;
+      to_next++;
+      to_frame->n_vectors++;
+    }
+  vlib_put_frame_to_node (vm, hw->tx_node_index, to_frame);
+  return from_frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (interface_tx, static) = {
+  .function = interface_tx_node_fn,
+  .name = "interface-tx",
+  .vector_size = sizeof (u32),
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VNET_FEATURE_ARC_INIT (interface_output, static) =
+{
+  .arc_name  = "interface-output",
+  .start_nodes = VNET_FEATURES (0),
+  .end_node = "interface-tx",
+  .arc_index_ptr = &vnet_main.interface_main.output_feature_arc_index,
+};
+
+VNET_FEATURE_INIT (span_tx, static) = {
+  .arc_name = "interface-output",
+  .node_name = "span-output",
+  .runs_before = VNET_FEATURES ("interface-tx"),
+};
+
+VNET_FEATURE_INIT (interface_tx, static) = {
+  .arc_name = "interface-output",
+  .node_name = "interface-tx",
+  .runs_before = 0,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+vnet_per_buffer_interface_output_hw_interface_add_del (vnet_main_t * vnm,
+						       u32 hw_if_index,
+						       u32 is_create)
+{
+  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
+  u32 next_index;
+
+  next_index = vlib_node_add_next_with_slot
+    (vnm->vlib_main, vnet_per_buffer_interface_output_node.index,
+     hi->output_node_index,
+     /* next_index */ hw_if_index);
+
+  ASSERT (next_index == hw_if_index);
+
+  return 0;
+}
+
+VNET_HW_INTERFACE_ADD_DEL_FUNCTION
+  (vnet_per_buffer_interface_output_hw_interface_add_del);
+
+static clib_error_t *
+pcap_drop_trace_command_fn (vlib_main_t * vm,
+			    unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  u8 *filename;
+  u32 max;
+  int matched = 0;
+  clib_error_t *error = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "on"))
+	{
+	  if (im->drop_pcap_enable == 0)
+	    {
+	      if (im->pcap_filename == 0)
+		im->pcap_filename = format (0, "/tmp/drop.pcap%c", 0);
+
+	      memset (&im->pcap_main, 0, sizeof (im->pcap_main));
+	      im->pcap_main.file_name = (char *) im->pcap_filename;
+	      im->pcap_main.n_packets_to_capture = 100;
+	      if (im->pcap_pkts_to_capture)
+		im->pcap_main.n_packets_to_capture = im->pcap_pkts_to_capture;
+
+	      im->pcap_main.packet_type = PCAP_PACKET_TYPE_ethernet;
+	      im->drop_pcap_enable = 1;
+	      matched = 1;
+	      vlib_cli_output (vm, "pcap drop capture on...");
+	    }
+	  else
+	    {
+	      vlib_cli_output (vm, "pcap drop capture already on...");
+	    }
+	  matched = 1;
+	}
+      else if (unformat (input, "off"))
+	{
+	  matched = 1;
+
+	  if (im->drop_pcap_enable)
+	    {
+	      vlib_cli_output (vm, "captured %d pkts...",
+			       im->pcap_main.n_packets_captured);
+	      if (im->pcap_main.n_packets_captured)
+		{
+		  im->pcap_main.n_packets_to_capture =
+		    im->pcap_main.n_packets_captured;
+		  error = pcap_write (&im->pcap_main);
+		  if (error)
+		    clib_error_report (error);
+		  else
+		    vlib_cli_output (vm, "saved to %s...", im->pcap_filename);
+		}
+	    }
+	  else
+	    {
+	      vlib_cli_output (vm, "pcap drop capture already off...");
+	    }
+
+	  im->drop_pcap_enable = 0;
+	}
+      else if (unformat (input, "max %d", &max))
+	{
+	  im->pcap_pkts_to_capture = max;
+	  matched = 1;
+	}
+
+      else if (unformat (input, "intfc %U",
+			 unformat_vnet_sw_interface, vnm,
+			 &im->pcap_sw_if_index))
+	matched = 1;
+      else if (unformat (input, "intfc any"))
+	{
+	  im->pcap_sw_if_index = 0;
+	  matched = 1;
+	}
+      else if (unformat (input, "file %s", &filename))
+	{
+	  u8 *chroot_filename;
+	  /* Brain-police user path input */
+	  if (strstr ((char *) filename, "..")
+	      || index ((char *) filename, '/'))
+	    {
+	      vlib_cli_output (vm, "illegal characters in filename '%s'",
+			       filename);
+	      continue;
+	    }
+
+	  chroot_filename = format (0, "/tmp/%s%c", filename, 0);
+	  vec_free (filename);
+
+	  if (im->pcap_filename)
+	    vec_free (im->pcap_filename);
+	  vec_add1 (filename, 0);
+	  im->pcap_filename = chroot_filename;
+	  matched = 1;
+	}
+      else if (unformat (input, "status"))
+	{
+	  if (im->drop_pcap_enable == 0)
+	    {
+	      vlib_cli_output (vm, "pcap drop capture is off...");
+	      continue;
+	    }
+
+	  vlib_cli_output (vm, "pcap drop capture: %d of %d pkts...",
+			   im->pcap_main.n_packets_captured,
+			   im->pcap_main.n_packets_to_capture);
+	  matched = 1;
+	}
+
+      else
+	break;
+    }
+
+  if (matched == 0)
+    return clib_error_return (0, "unknown input `%U'",
+			      format_unformat_error, input);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (pcap_trace_command, static) = {
+  .path = "pcap drop trace",
+  .short_help =
+  "pcap drop trace on off max <nn> intfc <intfc> file <name> status",
+  .function = pcap_drop_trace_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/dir.dox b/src/vnet/ip/dir.dox
new file mode 100644
index 00000000..a4eb7337
--- /dev/null
+++ b/src/vnet/ip/dir.dox
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Doxygen directory documentation */
+
+/**
+@dir
+@brief Layer 3 IP Code.
+
+This directory contains the source code for IP routing.
+
+*/
+/*? %%clicmd:group_label Layer 3 IP CLI %% ?*/
diff --git a/src/vnet/ip/format.c b/src/vnet/ip/format.c
new file mode 100644
index 00000000..be1c4fd3
--- /dev/null
+++ b/src/vnet/ip/format.c
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip_format.c: ip generic (4 or 6) formatting
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+
+/* Format IP protocol. */
+u8 *
+format_ip_protocol (u8 * s, va_list * args)
+{
+  ip_protocol_t protocol = va_arg (*args, ip_protocol_t);
+  ip_main_t *im = &ip_main;
+  ip_protocol_info_t *pi = ip_get_protocol_info (im, protocol);
+
+  if (pi)
+    return format (s, "%s", pi->name);
+  else
+    return format (s, "unknown %d", protocol);
+}
+
+uword
+unformat_ip_protocol (unformat_input_t * input, va_list * args)
+{
+  u8 *result = va_arg (*args, u8 *);
+  ip_main_t *im = &ip_main;
+  ip_protocol_info_t *pi;
+  int i;
+
+  if (!unformat_user (input, unformat_vlib_number_by_name,
+		      im->protocol_info_by_name, &i))
+    return 0;
+
+  pi = vec_elt_at_index (im->protocol_infos, i);
+  *result = pi->protocol;
+  return 1;
+}
+
+u8 *
+format_tcp_udp_port (u8 * s, va_list * args)
+{
+  int port = va_arg (*args, int);
+  ip_main_t *im = &ip_main;
+  tcp_udp_port_info_t *pi;
+
+  pi = ip_get_tcp_udp_port_info (im, port);
+  if (pi)
+    s = format (s, "%s", pi->name);
+  else
+    s = format (s, "%d", clib_net_to_host_u16 (port));
+
+  return s;
+}
+
+uword
+unformat_tcp_udp_port (unformat_input_t * input, va_list * args)
+{
+  u16 *result = va_arg (*args, u16 *);
+  ip_main_t *im = &ip_main;
+  tcp_udp_port_info_t *pi;
+  u32 i, port;
+
+
+  if (unformat_user (input, unformat_vlib_number_by_name,
+		     im->port_info_by_name, &i))
+    {
+      pi = vec_elt_at_index (im->port_infos, i);
+      port = pi->port;
+    }
+  else if (unformat_user (input, unformat_vlib_number, &port)
+	   && port < (1 << 16))
+    port = clib_host_to_net_u16 (port);
+
+  else
+    return 0;
+
+  *result = port;
+  return 1;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/format.h b/src/vnet/ip/format.h
new file mode 100644
index 00000000..c35f0f4b
--- /dev/null
+++ b/src/vnet/ip/format.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/format.h: ip 4 and/or 6 formatting
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_ip_format_h
+#define included_ip_format_h
+
+/* IP4 or IP6. */
+
+format_function_t format_ip_protocol;
+unformat_function_t unformat_ip_protocol;
+
+format_function_t format_tcp_udp_port;
+unformat_function_t unformat_tcp_udp_port;
+
+typedef enum format_ip_adjacency_flags_t_
+{
+  FORMAT_IP_ADJACENCY_NONE,
+  FORMAT_IP_ADJACENCY_BRIEF = FORMAT_IP_ADJACENCY_NONE,
+  FORMAT_IP_ADJACENCY_DETAIL = (1 << 0),
+} format_ip_adjacency_flags_t;
+
+format_function_t format_ip_adjacency;
+format_function_t format_ip_adjacency_packet_data;
+
+format_function_t format_ip46_address;
+
+typedef enum
+{
+  IP46_TYPE_ANY,
+  IP46_TYPE_IP4,
+  IP46_TYPE_IP6
+} ip46_type_t;
+/* unformat_ip46_address expects arguments (ip46_address_t *, ip46_type_t)
+ * The type argument is used to enforce a particular IP version. */
+unformat_function_t unformat_ip46_address;
+
+/* IP4 */
+
+/* Parse an IP4 address %d.%d.%d.%d. */
+unformat_function_t unformat_ip4_address;
+
+/* Format an IP4 address. */
+format_function_t format_ip4_address;
+format_function_t format_ip4_address_and_length;
+
+/* Parse an IP4 header. */
+unformat_function_t unformat_ip4_header;
+
+/* Format an IP4 header. */
+format_function_t format_ip4_header;
+
+/* Parse an IP packet matching pattern. */
+unformat_function_t unformat_ip4_match;
+
+unformat_function_t unformat_pg_ip4_header;
+
+/* IP6 */
+unformat_function_t unformat_ip6_address;
+format_function_t format_ip6_address;
+format_function_t format_ip6_address_and_length;
+unformat_function_t unformat_ip6_header;
+format_function_t format_ip6_header;
+unformat_function_t unformat_pg_ip6_header;
+
+/* Format a TCP/UDP headers. */
+format_function_t format_tcp_header, format_udp_header;
+
+unformat_function_t unformat_pg_tcp_header, unformat_pg_udp_header;
+
+#endif /* included_ip_format_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/icmp4.c b/src/vnet/ip/icmp4.c
new file mode 100644
index 00000000..c3afff72
--- /dev/null
+++ b/src/vnet/ip/icmp4.c
@@ -0,0 +1,784 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/icmp4.c: ipv4 icmp
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/ip/ip.h>
+#include <vnet/pg/pg.h>
+
+
+static char *icmp_error_strings[] = {
+#define _(f,s) s,
+  foreach_icmp4_error
+#undef _
+};
+
+static u8 *
+format_ip4_icmp_type_and_code (u8 * s, va_list * args)
+{
+  icmp4_type_t type = va_arg (*args, int);
+  u8 code = va_arg (*args, int);
+  char *t = 0;
+
+#define _(n,f) case n: t = #f; break;
+
+  switch (type)
+    {
+      foreach_icmp4_type;
+
+    default:
+      break;
+    }
+
+#undef _
+
+  if (!t)
+    return format (s, "unknown 0x%x", type);
+
+  s = format (s, "%s", t);
+
+  t = 0;
+  switch ((type << 8) | code)
+    {
+#define _(a,n,f) case (ICMP4_##a << 8) | (n): t = #f; break;
+
+      foreach_icmp4_code;
+
+#undef _
+    }
+
+  if (t)
+    s = format (s, " %s", t);
+
+  return s;
+}
+
+static u8 *
+format_ip4_icmp_header (u8 * s, va_list * args)
+{
+  icmp46_header_t *icmp = va_arg (*args, icmp46_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+
+  /* Nothing to do. */
+  if (max_header_bytes < sizeof (icmp[0]))
+    return format (s, "ICMP header truncated");
+
+  s = format (s, "ICMP %U checksum 0x%x",
+	      format_ip4_icmp_type_and_code, icmp->type, icmp->code,
+	      clib_net_to_host_u16 (icmp->checksum));
+
+  return s;
+}
+
+static u8 *
+format_icmp_input_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  icmp_input_trace_t *t = va_arg (*va, icmp_input_trace_t *);
+
+  s = format (s, "%U",
+	      format_ip4_header, t->packet_data, sizeof (t->packet_data));
+
+  return s;
+}
+
+typedef enum
+{
+  ICMP_INPUT_NEXT_ERROR,
+  ICMP_INPUT_N_NEXT,
+} icmp_input_next_t;
+
+typedef struct
+{
+  uword *type_and_code_by_name;
+
+  uword *type_by_name;
+
+  /* Vector dispatch table indexed by [icmp type]. */
+  u8 ip4_input_next_index_by_type[256];
+} icmp4_main_t;
+
+icmp4_main_t icmp4_main;
+
+static uword
+ip4_icmp_input (vlib_main_t * vm,
+		vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  icmp4_main_t *im = &icmp4_main;
+  uword n_packets = frame->n_vectors;
+  u32 *from, *to_next;
+  u32 n_left_from, n_left_to_next, next;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = n_packets;
+  next = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+				   /* stride */ 1,
+				   sizeof (icmp_input_trace_t));
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip4_header_t *ip0;
+	  icmp46_header_t *icmp0;
+	  icmp4_type_t type0;
+	  u32 bi0, next0;
+
+	  if (PREDICT_TRUE (n_left_from > 2))
+	    {
+	      vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
+	      p0 = vlib_get_buffer (vm, from[1]);
+	      ip0 = vlib_buffer_get_current (p0);
+	      CLIB_PREFETCH (ip0, CLIB_CACHE_LINE_BYTES, LOAD);
+	    }
+
+	  bi0 = to_next[0] = from[0];
+
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, bi0);
+	  ip0 = vlib_buffer_get_current (p0);
+	  icmp0 = ip4_next_header (ip0);
+	  type0 = icmp0->type;
+	  next0 = im->ip4_input_next_index_by_type[type0];
+
+	  p0->error = node->errors[ICMP4_ERROR_UNKNOWN_TYPE];
+	  if (PREDICT_FALSE (next0 != next))
+	    {
+	      vlib_put_next_frame (vm, node, next, n_left_to_next + 1);
+	      next = next0;
+	      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
+	      to_next[0] = bi0;
+	      to_next += 1;
+	      n_left_to_next -= 1;
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_icmp_input_node,static) = {
+  .function = ip4_icmp_input,
+  .name = "ip4-icmp-input",
+
+  .vector_size = sizeof (u32),
+
+  .format_trace = format_icmp_input_trace,
+
+  .n_errors = ARRAY_LEN (icmp_error_strings),
+  .error_strings = icmp_error_strings,
+
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [ICMP_INPUT_NEXT_ERROR] = "error-punt",
+  },
+};
+/* *INDENT-ON* */
+
+static uword
+ip4_icmp_echo_request (vlib_main_t * vm,
+		       vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  uword n_packets = frame->n_vectors;
+  u32 *from, *to_next;
+  u32 n_left_from, n_left_to_next, next;
+  ip4_main_t *i4m = &ip4_main;
+  u16 *fragment_ids, *fid;
+  u8 host_config_ttl = i4m->host_config.ttl;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = n_packets;
+  next = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+				   /* stride */ 1,
+				   sizeof (icmp_input_trace_t));
+
+  /* Get random fragment IDs for replies. */
+  fid = fragment_ids = clib_random_buffer_get_data (&vm->random_buffer,
+						    n_packets *
+						    sizeof (fragment_ids[0]));
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
+
+      while (n_left_from > 2 && n_left_to_next > 2)
+	{
+	  vlib_buffer_t *p0, *p1;
+	  ip4_header_t *ip0, *ip1;
+	  icmp46_header_t *icmp0, *icmp1;
+	  u32 bi0, src0, dst0;
+	  u32 bi1, src1, dst1;
+	  ip_csum_t sum0, sum1;
+
+	  bi0 = to_next[0] = from[0];
+	  bi1 = to_next[1] = from[1];
+
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, bi0);
+	  p1 = vlib_get_buffer (vm, bi1);
+	  ip0 = vlib_buffer_get_current (p0);
+	  ip1 = vlib_buffer_get_current (p1);
+	  icmp0 = ip4_next_header (ip0);
+	  icmp1 = ip4_next_header (ip1);
+
+	  vnet_buffer (p0)->sw_if_index[VLIB_RX] =
+	    vnet_main.local_interface_sw_if_index;
+	  vnet_buffer (p1)->sw_if_index[VLIB_RX] =
+	    vnet_main.local_interface_sw_if_index;
+
+	  /* Update ICMP checksum. */
+	  sum0 = icmp0->checksum;
+	  sum1 = icmp1->checksum;
+
+	  ASSERT (icmp0->type == ICMP4_echo_request);
+	  ASSERT (icmp1->type == ICMP4_echo_request);
+	  sum0 = ip_csum_update (sum0, ICMP4_echo_request, ICMP4_echo_reply,
+				 icmp46_header_t, type);
+	  sum1 = ip_csum_update (sum1, ICMP4_echo_request, ICMP4_echo_reply,
+				 icmp46_header_t, type);
+	  icmp0->type = ICMP4_echo_reply;
+	  icmp1->type = ICMP4_echo_reply;
+
+	  icmp0->checksum = ip_csum_fold (sum0);
+	  icmp1->checksum = ip_csum_fold (sum1);
+
+	  src0 = ip0->src_address.data_u32;
+	  src1 = ip1->src_address.data_u32;
+	  dst0 = ip0->dst_address.data_u32;
+	  dst1 = ip1->dst_address.data_u32;
+
+	  /* Swap source and destination address.
+	     Does not change checksum. */
+	  ip0->src_address.data_u32 = dst0;
+	  ip1->src_address.data_u32 = dst1;
+	  ip0->dst_address.data_u32 = src0;
+	  ip1->dst_address.data_u32 = src1;
+
+	  /* Update IP checksum. */
+	  sum0 = ip0->checksum;
+	  sum1 = ip1->checksum;
+
+	  sum0 = ip_csum_update (sum0, ip0->ttl, host_config_ttl,
+				 ip4_header_t, ttl);
+	  sum1 = ip_csum_update (sum1, ip1->ttl, host_config_ttl,
+				 ip4_header_t, ttl);
+	  ip0->ttl = host_config_ttl;
+	  ip1->ttl = host_config_ttl;
+
+	  /* New fragment id. */
+	  sum0 = ip_csum_update (sum0, ip0->fragment_id, fid[0],
+				 ip4_header_t, fragment_id);
+	  sum1 = ip_csum_update (sum1, ip1->fragment_id, fid[1],
+				 ip4_header_t, fragment_id);
+	  ip0->fragment_id = fid[0];
+	  ip1->fragment_id = fid[1];
+	  fid += 2;
+
+	  ip0->checksum = ip_csum_fold (sum0);
+	  ip1->checksum = ip_csum_fold (sum1);
+
+	  ASSERT (ip0->checksum == ip4_header_checksum (ip0));
+	  ASSERT (ip1->checksum == ip4_header_checksum (ip1));
+
+	  p0->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
+	  p1->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip4_header_t *ip0;
+	  icmp46_header_t *icmp0;
+	  u32 bi0, src0, dst0;
+	  ip_csum_t sum0;
+
+	  bi0 = to_next[0] = from[0];
+
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, bi0);
+	  ip0 = vlib_buffer_get_current (p0);
+	  icmp0 = ip4_next_header (ip0);
+
+	  vnet_buffer (p0)->sw_if_index[VLIB_RX] =
+	    vnet_main.local_interface_sw_if_index;
+
+	  /* Update ICMP checksum. */
+	  sum0 = icmp0->checksum;
+
+	  ASSERT (icmp0->type == ICMP4_echo_request);
+	  sum0 = ip_csum_update (sum0, ICMP4_echo_request, ICMP4_echo_reply,
+				 icmp46_header_t, type);
+	  icmp0->type = ICMP4_echo_reply;
+	  icmp0->checksum = ip_csum_fold (sum0);
+
+	  src0 = ip0->src_address.data_u32;
+	  dst0 = ip0->dst_address.data_u32;
+	  ip0->src_address.data_u32 = dst0;
+	  ip0->dst_address.data_u32 = src0;
+
+	  /* Update IP checksum. */
+	  sum0 = ip0->checksum;
+
+	  sum0 = ip_csum_update (sum0, ip0->ttl, host_config_ttl,
+				 ip4_header_t, ttl);
+	  ip0->ttl = host_config_ttl;
+
+	  sum0 = ip_csum_update (sum0, ip0->fragment_id, fid[0],
+				 ip4_header_t, fragment_id);
+	  ip0->fragment_id = fid[0];
+	  fid += 1;
+
+	  ip0->checksum = ip_csum_fold (sum0);
+
+	  ASSERT (ip0->checksum == ip4_header_checksum (ip0));
+
+	  p0->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
+	}
+
+      vlib_put_next_frame (vm, node, next, n_left_to_next);
+    }
+
+  vlib_error_count (vm, ip4_icmp_input_node.index,
+		    ICMP4_ERROR_ECHO_REPLIES_SENT, frame->n_vectors);
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_icmp_echo_request_node,static) = {
+  .function = ip4_icmp_echo_request,
+  .name = "ip4-icmp-echo-request",
+
+  .vector_size = sizeof (u32),
+
+  .format_trace = format_icmp_input_trace,
+
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "ip4-load-balance",
+  },
+};
+/* *INDENT-ON* */
+
+typedef enum
+{
+  IP4_ICMP_ERROR_NEXT_DROP,
+  IP4_ICMP_ERROR_NEXT_LOOKUP,
+  IP4_ICMP_ERROR_N_NEXT,
+} ip4_icmp_error_next_t;
+
+void
+icmp4_error_set_vnet_buffer (vlib_buffer_t * b, u8 type, u8 code, u32 data)
+{
+  vnet_buffer (b)->ip.icmp.type = type;
+  vnet_buffer (b)->ip.icmp.code = code;
+  vnet_buffer (b)->ip.icmp.data = data;
+}
+
+static u8
+icmp4_icmp_type_to_error (u8 type)
+{
+  switch (type)
+    {
+    case ICMP4_destination_unreachable:
+      return ICMP4_ERROR_DEST_UNREACH_SENT;
+    case ICMP4_time_exceeded:
+      return ICMP4_ERROR_TTL_EXPIRE_SENT;
+    case ICMP4_parameter_problem:
+      return ICMP4_ERROR_PARAM_PROBLEM_SENT;
+    default:
+      return ICMP4_ERROR_DROP;
+    }
+}
+
+static uword
+ip4_icmp_error (vlib_main_t * vm,
+		vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 *from, *to_next;
+  uword n_left_from, n_left_to_next;
+  ip4_icmp_error_next_t next_index;
+  ip4_main_t *im = &ip4_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+				   /* stride */ 1,
+				   sizeof (icmp_input_trace_t));
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0 = from[0];
+	  u32 next0 = IP4_ICMP_ERROR_NEXT_LOOKUP;
+	  u8 error0 = ICMP4_ERROR_NONE;
+	  vlib_buffer_t *p0;
+	  ip4_header_t *ip0, *out_ip0;
+	  icmp46_header_t *icmp0;
+	  u32 sw_if_index0, if_add_index0;
+	  ip_csum_t sum;
+
+	  /* Speculatively enqueue p0 to the current next frame */
+	  to_next[0] = pi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip0 = vlib_buffer_get_current (p0);
+	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
+
+	  /*
+	   * RFC1812 says to keep as much of the original packet as
+	   * possible within the minimum MTU (576). We cheat "a little"
+	   * here by keeping whatever fits in the first buffer, to be more
+	   * efficient
+	   */
+	  if (PREDICT_FALSE (p0->total_length_not_including_first_buffer))
+	    {
+	      /* clear current_length of all other buffers in chain */
+	      vlib_buffer_t *b = p0;
+	      p0->total_length_not_including_first_buffer = 0;
+	      while (b->flags & VLIB_BUFFER_NEXT_PRESENT)
+		{
+		  b = vlib_get_buffer (vm, b->next_buffer);
+		  b->current_length = 0;
+		}
+	    }
+	  p0->current_length =
+	    p0->current_length > 576 ? 576 : p0->current_length;
+
+	  /* Add IP header and ICMPv4 header including a 4 byte data field */
+	  vlib_buffer_advance (p0,
+			       -sizeof (ip4_header_t) -
+			       sizeof (icmp46_header_t) - 4);
+	  out_ip0 = vlib_buffer_get_current (p0);
+	  icmp0 = (icmp46_header_t *) & out_ip0[1];
+
+	  /* Fill ip header fields */
+	  out_ip0->ip_version_and_header_length = 0x45;
+	  out_ip0->tos = 0;
+	  out_ip0->length = clib_host_to_net_u16 (p0->current_length);
+	  out_ip0->fragment_id = 0;
+	  out_ip0->flags_and_fragment_offset = 0;
+	  out_ip0->ttl = 0xff;
+	  out_ip0->protocol = IP_PROTOCOL_ICMP;
+	  out_ip0->dst_address = ip0->src_address;
+	  if_add_index0 = ~0;
+	  if (PREDICT_TRUE (vec_len (lm->if_address_pool_index_by_sw_if_index)
+			    > sw_if_index0))
+	    if_add_index0 =
+	      lm->if_address_pool_index_by_sw_if_index[sw_if_index0];
+	  if (PREDICT_TRUE (if_add_index0 != ~0))
+	    {
+	      ip_interface_address_t *if_add =
+		pool_elt_at_index (lm->if_address_pool, if_add_index0);
+	      ip4_address_t *if_ip =
+		ip_interface_address_get_address (lm, if_add);
+	      out_ip0->src_address = *if_ip;
+	    }
+	  else
+	    {
+	      /* interface has no IP4 address - should not happen */
+	      next0 = IP4_ICMP_ERROR_NEXT_DROP;
+	      error0 = ICMP4_ERROR_DROP;
+	    }
+	  out_ip0->checksum = ip4_header_checksum (out_ip0);
+
+	  /* Fill icmp header fields */
+	  icmp0->type = vnet_buffer (p0)->ip.icmp.type;
+	  icmp0->code = vnet_buffer (p0)->ip.icmp.code;
+	  *((u32 *) (icmp0 + 1)) =
+	    clib_host_to_net_u32 (vnet_buffer (p0)->ip.icmp.data);
+	  icmp0->checksum = 0;
+	  sum =
+	    ip_incremental_checksum (0, icmp0,
+				     p0->current_length -
+				     sizeof (ip4_header_t));
+	  icmp0->checksum = ~ip_csum_fold (sum);
+
+	  /* Update error status */
+	  if (error0 == ICMP4_ERROR_NONE)
+	    error0 = icmp4_icmp_type_to_error (icmp0->type);
+	  vlib_error_count (vm, node->node_index, error0, 1);
+
+	  /* Verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_icmp_error_node) = {
+  .function = ip4_icmp_error,
+  .name = "ip4-icmp-error",
+  .vector_size = sizeof (u32),
+
+  .n_errors = ARRAY_LEN (icmp_error_strings),
+  .error_strings = icmp_error_strings,
+
+  .n_next_nodes = IP4_ICMP_ERROR_N_NEXT,
+  .next_nodes = {
+    [IP4_ICMP_ERROR_NEXT_DROP] = "error-drop",
+    [IP4_ICMP_ERROR_NEXT_LOOKUP] = "ip4-lookup",
+  },
+
+  .format_trace = format_icmp_input_trace,
+};
+/* *INDENT-ON* */
+
+
+static uword
+unformat_icmp_type_and_code (unformat_input_t * input, va_list * args)
+{
+  icmp46_header_t *h = va_arg (*args, icmp46_header_t *);
+  icmp4_main_t *cm = &icmp4_main;
+  u32 i;
+
+  if (unformat_user (input, unformat_vlib_number_by_name,
+		     cm->type_and_code_by_name, &i))
+    {
+      h->type = (i >> 8) & 0xff;
+      h->code = (i >> 0) & 0xff;
+    }
+  else if (unformat_user (input, unformat_vlib_number_by_name,
+			  cm->type_by_name, &i))
+    {
+      h->type = i;
+      h->code = 0;
+    }
+  else
+    return 0;
+
+  return 1;
+}
+
+static void
+icmp4_pg_edit_function (pg_main_t * pg,
+			pg_stream_t * s,
+			pg_edit_group_t * g, u32 * packets, u32 n_packets)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  u32 ip_offset, icmp_offset;
+
+  icmp_offset = g->start_byte_offset;
+  ip_offset = (g - 1)->start_byte_offset;
+
+  while (n_packets >= 1)
+    {
+      vlib_buffer_t *p0;
+      ip4_header_t *ip0;
+      icmp46_header_t *icmp0;
+      u32 len0;
+
+      p0 = vlib_get_buffer (vm, packets[0]);
+      n_packets -= 1;
+      packets += 1;
+
+      ASSERT (p0->current_data == 0);
+      ip0 = (void *) (p0->data + ip_offset);
+      icmp0 = (void *) (p0->data + icmp_offset);
+      len0 = clib_net_to_host_u16 (ip0->length) - ip4_header_bytes (ip0);
+      icmp0->checksum =
+	~ip_csum_fold (ip_incremental_checksum (0, icmp0, len0));
+    }
+}
+
+typedef struct
+{
+  pg_edit_t type, code;
+  pg_edit_t checksum;
+} pg_icmp46_header_t;
+
+always_inline void
+pg_icmp_header_init (pg_icmp46_header_t * p)
+{
+  /* Initialize fields that are not bit fields in the IP header. */
+#define _(f) pg_edit_init (&p->f, icmp46_header_t, f);
+  _(type);
+  _(code);
+  _(checksum);
+#undef _
+}
+
+static uword
+unformat_pg_icmp_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  pg_icmp46_header_t *p;
+  u32 group_index;
+
+  p = pg_create_edit_group (s, sizeof (p[0]), sizeof (icmp46_header_t),
+			    &group_index);
+  pg_icmp_header_init (p);
+
+  p->checksum.type = PG_EDIT_UNSPECIFIED;
+
+  {
+    icmp46_header_t tmp;
+
+    if (!unformat (input, "ICMP %U", unformat_icmp_type_and_code, &tmp))
+      goto error;
+
+    pg_edit_set_fixed (&p->type, tmp.type);
+    pg_edit_set_fixed (&p->code, tmp.code);
+  }
+
+  /* Parse options. */
+  while (1)
+    {
+      if (unformat (input, "checksum %U",
+		    unformat_pg_edit, unformat_pg_number, &p->checksum))
+	;
+
+      /* Can't parse input: try next protocol level. */
+      else
+	break;
+    }
+
+  if (!unformat_user (input, unformat_pg_payload, s))
+    goto error;
+
+  if (p->checksum.type == PG_EDIT_UNSPECIFIED)
+    {
+      pg_edit_group_t *g = pg_stream_get_group (s, group_index);
+      g->edit_function = icmp4_pg_edit_function;
+      g->edit_function_opaque = 0;
+    }
+
+  return 1;
+
+error:
+  /* Free up any edits we may have added. */
+  pg_free_edit_group (s);
+  return 0;
+}
+
+void
+ip4_icmp_register_type (vlib_main_t * vm, icmp4_type_t type, u32 node_index)
+{
+  icmp4_main_t *im = &icmp4_main;
+
+  ASSERT ((int) type < ARRAY_LEN (im->ip4_input_next_index_by_type));
+  im->ip4_input_next_index_by_type[type]
+    = vlib_node_add_next (vm, ip4_icmp_input_node.index, node_index);
+}
+
+static clib_error_t *
+icmp4_init (vlib_main_t * vm)
+{
+  ip_main_t *im = &ip_main;
+  ip_protocol_info_t *pi;
+  icmp4_main_t *cm = &icmp4_main;
+  clib_error_t *error;
+
+  error = vlib_call_init_function (vm, ip_main_init);
+
+  if (error)
+    return error;
+
+  pi = ip_get_protocol_info (im, IP_PROTOCOL_ICMP);
+  pi->format_header = format_ip4_icmp_header;
+  pi->unformat_pg_edit = unformat_pg_icmp_header;
+
+  cm->type_by_name = hash_create_string (0, sizeof (uword));
+#define _(n,t) hash_set_mem (cm->type_by_name, #t, (n));
+  foreach_icmp4_type;
+#undef _
+
+  cm->type_and_code_by_name = hash_create_string (0, sizeof (uword));
+#define _(a,n,t) hash_set_mem (cm->type_by_name, #t, (n) | (ICMP4_##a << 8));
+  foreach_icmp4_code;
+#undef _
+
+  memset (cm->ip4_input_next_index_by_type,
+	  ICMP_INPUT_NEXT_ERROR, sizeof (cm->ip4_input_next_index_by_type));
+
+  ip4_icmp_register_type (vm, ICMP4_echo_request,
+			  ip4_icmp_echo_request_node.index);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (icmp4_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/icmp4.h b/src/vnet/ip/icmp4.h
new file mode 100644
index 00000000..ae805148
--- /dev/null
+++ b/src/vnet/ip/icmp4.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vnet_icmp4_h
+#define included_vnet_icmp4_h
+
+#define foreach_icmp4_error                                             \
+  _ (NONE, "valid packets")                                             \
+  _ (UNKNOWN_TYPE, "unknown type")                                      \
+  _ (INVALID_CODE_FOR_TYPE, "invalid code for type")                    \
+  _ (INVALID_HOP_LIMIT_FOR_TYPE, "hop_limit != 255")                    \
+  _ (LENGTH_TOO_SMALL_FOR_TYPE, "payload length too small for type")    \
+  _ (OPTIONS_WITH_ODD_LENGTH,                                           \
+     "total option length not multiple of 8 bytes")                     \
+  _ (OPTION_WITH_ZERO_LENGTH, "option has zero length")                 \
+  _ (ECHO_REPLIES_SENT, "echo replies sent")                            \
+  _ (DST_LOOKUP_MISS, "icmp6 dst address lookup misses")                \
+  _ (DEST_UNREACH_SENT, "destination unreachable response sent")	\
+  _ (TTL_EXPIRE_SENT, "hop limit exceeded response sent")		\
+  _ (PARAM_PROBLEM_SENT, "parameter problem response sent")		\
+  _ (DROP, "error message dropped")
+
+typedef enum
+{
+#define _(f,s) ICMP4_ERROR_##f,
+  foreach_icmp4_error
+#undef _
+} icmp4_error_t;
+
+typedef struct
+{
+  u8 packet_data[64];
+} icmp_input_trace_t;
+
+format_function_t format_icmp4_input_trace;
+void ip4_icmp_register_type (vlib_main_t * vm, icmp4_type_t type,
+			     u32 node_index);
+void icmp4_error_set_vnet_buffer (vlib_buffer_t * b, u8 type, u8 code,
+				  u32 data);
+
+#endif /* included_vnet_icmp4_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/icmp46_packet.h b/src/vnet/ip/icmp46_packet.h
new file mode 100644
index 00000000..a86cbd57
--- /dev/null
+++ b/src/vnet/ip/icmp46_packet.h
@@ -0,0 +1,398 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * icmp46_packet.h: ip4/ip6 icmp packet format
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vnet_icmp46_packet_h
+#define included_vnet_icmp46_packet_h
+
+#include <vnet/ethernet/packet.h>
+#include <vnet/ip/ip6_packet.h>
+
+#define foreach_icmp4_type			\
+  _ (0, echo_reply)				\
+  _ (3, destination_unreachable)		\
+  _ (4, source_quench)				\
+  _ (5, redirect)				\
+  _ (6, alternate_host_address)			\
+  _ (8, echo_request)				\
+  _ (9, router_advertisement)			\
+  _ (10, router_solicitation)			\
+  _ (11, time_exceeded)				\
+  _ (12, parameter_problem)			\
+  _ (13, timestamp_request)			\
+  _ (14, timestamp_reply)			\
+  _ (15, information_request)			\
+  _ (16, information_reply)			\
+  _ (17, address_mask_request)			\
+  _ (18, address_mask_reply)			\
+  _ (30, traceroute)				\
+  _ (31, datagram_conversion_error)		\
+  _ (32, mobile_host_redirect)			\
+  _ (33, ip6_where_are_you)			\
+  _ (34, ip6_i_am_here)				\
+  _ (35, mobile_registration_request)		\
+  _ (36, mobile_registration_reply)		\
+  _ (37, domain_name_request)			\
+  _ (38, domain_name_reply)			\
+  _ (39, skip)					\
+  _ (40, photuris)
+
+#define icmp_no_code 0
+
+#define foreach_icmp4_code						\
+  _ (destination_unreachable, 0, destination_unreachable_net)		\
+  _ (destination_unreachable, 1, destination_unreachable_host)		\
+  _ (destination_unreachable, 2, protocol_unreachable)			\
+  _ (destination_unreachable, 3, port_unreachable)			\
+  _ (destination_unreachable, 4, fragmentation_needed_and_dont_fragment_set) \
+  _ (destination_unreachable, 5, source_route_failed)			\
+  _ (destination_unreachable, 6, destination_network_unknown)		\
+  _ (destination_unreachable, 7, destination_host_unknown)		\
+  _ (destination_unreachable, 8, source_host_isolated)			\
+  _ (destination_unreachable, 9, network_administratively_prohibited)	\
+  _ (destination_unreachable, 10, host_administratively_prohibited)	\
+  _ (destination_unreachable, 11, network_unreachable_for_type_of_service) \
+  _ (destination_unreachable, 12, host_unreachable_for_type_of_service)	\
+  _ (destination_unreachable, 13, communication_administratively_prohibited) \
+  _ (destination_unreachable, 14, host_precedence_violation)		\
+  _ (destination_unreachable, 15, precedence_cutoff_in_effect)		\
+  _ (redirect, 0, network_redirect)					\
+  _ (redirect, 1, host_redirect)					\
+  _ (redirect, 2, type_of_service_and_network_redirect)			\
+  _ (redirect, 3, type_of_service_and_host_redirect)			\
+  _ (router_advertisement, 0, normal_router_advertisement)		\
+  _ (router_advertisement, 16, does_not_route_common_traffic)		\
+  _ (time_exceeded, 0, ttl_exceeded_in_transit)				\
+  _ (time_exceeded, 1, fragment_reassembly_time_exceeded)		\
+  _ (parameter_problem, 0, pointer_indicates_error)			\
+  _ (parameter_problem, 1, missing_required_option)			\
+  _ (parameter_problem, 2, bad_length)
+
+/* ICMPv6 */
+#define foreach_icmp6_type			\
+  _ (1, destination_unreachable)		\
+  _ (2, packet_too_big)				\
+  _ (3, time_exceeded)				\
+  _ (4, parameter_problem)			\
+  _ (128, echo_request)				\
+  _ (129, echo_reply)				\
+  _ (130, multicast_listener_request)		\
+  _ (131, multicast_listener_report)		\
+  _ (132, multicast_listener_done)		\
+  _ (133, router_solicitation)			\
+  _ (134, router_advertisement)			\
+  _ (135, neighbor_solicitation)		\
+  _ (136, neighbor_advertisement)		\
+  _ (137, redirect)				\
+  _ (138, router_renumbering)			\
+  _ (139, node_information_request)		\
+  _ (140, node_information_response)		\
+  _ (141, inverse_neighbor_solicitation)	\
+  _ (142, inverse_neighbor_advertisement)	\
+  _ (143, multicast_listener_report_v2)		\
+  _ (144, home_agent_address_discovery_request)	\
+  _ (145, home_agent_address_discovery_reply)	\
+  _ (146, mobile_prefix_solicitation)		\
+  _ (147, mobile_prefix_advertisement)		\
+  _ (148, certification_path_solicitation)	\
+  _ (149, certification_path_advertisement)	\
+  _ (151, multicast_router_advertisement)	\
+  _ (152, multicast_router_solicitation)	\
+  _ (153, multicast_router_termination)		\
+  _ (154, fmipv6_messages)
+
+#define foreach_icmp6_code						\
+  _ (destination_unreachable, 0, no_route_to_destination)		\
+  _ (destination_unreachable, 1, destination_administratively_prohibited) \
+  _ (destination_unreachable, 2, beyond_scope_of_source_address)	\
+  _ (destination_unreachable, 3, address_unreachable)			\
+  _ (destination_unreachable, 4, port_unreachable)			\
+  _ (destination_unreachable, 5, source_address_failed_policy)		\
+  _ (destination_unreachable, 6, reject_route_to_destination)		\
+  _ (time_exceeded, 0, ttl_exceeded_in_transit)				\
+  _ (time_exceeded, 1, fragment_reassembly_time_exceeded)		\
+  _ (parameter_problem, 0, erroneous_header_field)			\
+  _ (parameter_problem, 1, unrecognized_next_header)			\
+  _ (parameter_problem, 2, unrecognized_option)				\
+  _ (router_renumbering, 0, command)					\
+  _ (router_renumbering, 1, result)					\
+  _ (node_information_request, 0, data_contains_ip6_address)		\
+  _ (node_information_request, 1, data_contains_name)			\
+  _ (node_information_request, 2, data_contains_ip4_address)		\
+  _ (node_information_response, 0, success)				\
+  _ (node_information_response, 1, failed)				\
+  _ (node_information_response, 2, unknown_request)
+
+typedef enum
+{
+#define _(n,f) ICMP4_##f = n,
+  foreach_icmp4_type
+#undef _
+} icmp4_type_t;
+
+typedef enum
+{
+#define _(t,n,f) ICMP4_##t##_##f = n,
+  foreach_icmp4_code
+#undef _
+} icmp4_code_t;
+
+typedef enum
+{
+#define _(n,f) ICMP6_##f = n,
+  foreach_icmp6_type
+#undef _
+} icmp6_type_t;
+
+typedef enum
+{
+#define _(t,n,f) ICMP6_##t##_##f = n,
+  foreach_icmp6_code
+#undef _
+} icmp6_code_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     u8 type;
+		     u8 code;
+		     /* IP checksum of icmp header plus data which follows. */
+		     u16 checksum;
+		     }) icmp46_header_t;
+
+/* ip6 neighbor discovery */
+#define foreach_icmp6_neighbor_discovery_option	\
+  _ (1, source_link_layer_address)		\
+  _ (2, target_link_layer_address)		\
+  _ (3, prefix_information)			\
+  _ (4, redirected_header)			\
+  _ (5, mtu)					\
+  _ (6, nbma_shortcut_limit)			\
+  _ (7, advertisement_interval)			\
+  _ (8, home_agent_information)			\
+  _ (9, source_address_list)			\
+  _ (10, target_address_list)			\
+  _ (11, cryptographically_generated_address)	\
+  _ (12, rsa_signature)				\
+  _ (13, timestamp)				\
+  _ (14, nonce)					\
+  _ (15, trust_anchor)				\
+  _ (16, certificate)				\
+  _ (17, ip_address_and_prefix)			\
+  _ (18, new_router_prefix_information)		\
+  _ (19, mobile_link_layer_address)		\
+  _ (20, neighbor_advertisement_acknowledgment)	\
+  _ (23, map)					\
+  _ (24, route_information)			\
+  _ (25, recursive_dns_server)			\
+  _ (26, ra_flags_extension)			\
+  _ (27, handover_key_request)			\
+  _ (28, handover_key_reply)			\
+  _ (29, handover_assist_information)		\
+  _ (30, mobile_node_identifier)		\
+  _ (31, dns_search_list)			\
+  _ (138, card_request)				\
+  _ (139, card_reply)
+
+typedef enum icmp6_neighbor_discovery_option_type
+{
+#define _(n,f) ICMP6_NEIGHBOR_DISCOVERY_OPTION_##f = n,
+  foreach_icmp6_neighbor_discovery_option
+#undef _
+} icmp6_neighbor_discovery_option_type_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     /* Option type. */
+		     u8 type;
+		     /* Length of this header plus option data in 8 byte units. */
+		     u8 n_data_u64s;
+		     /* Option data follows. */
+		     u8 data[0];
+		     }) icmp6_neighbor_discovery_option_header_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     icmp6_neighbor_discovery_option_header_t header;
+		     u8 dst_address_length;
+		     u8 flags;
+#define ICMP6_NEIGHBOR_DISCOVERY_PREFIX_INFORMATION_FLAG_ON_LINK (1 << 7)
+#define ICMP6_NEIGHBOR_DISCOVERY_PREFIX_INFORMATION_AUTO (1 << 6)
+		     u32 valid_time;
+		     u32 preferred_time;
+		     u32 unused; ip6_address_t dst_address;
+		     }) icmp6_neighbor_discovery_prefix_information_option_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     u8 type;
+		     u8 aux_data_len_u32s;
+		     u16 num_sources;
+		     ip6_address_t mcast_addr; ip6_address_t source_addr[0];
+		     }) icmp6_multicast_address_record_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     ip6_hop_by_hop_ext_t ext_hdr;
+		     ip6_router_alert_option_t alert;
+		     ip6_padN_option_t pad;
+		     icmp46_header_t icmp;
+		     u16 rsvd;
+		     u16 num_addr_records;
+		     icmp6_multicast_address_record_t records[0];
+		     }) icmp6_multicast_listener_report_header_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     icmp6_neighbor_discovery_option_header_t header;
+		     u8 reserved[6];
+		     /* IP6 header plus payload follows. */
+		     u8 data[0];
+		     }) icmp6_neighbor_discovery_redirected_header_option_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     icmp6_neighbor_discovery_option_header_t header;
+		     u16 unused; u32 mtu;
+		     }) icmp6_neighbor_discovery_mtu_option_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     icmp6_neighbor_discovery_option_header_t header;
+		     u8 ethernet_address[6];
+		     })
+  icmp6_neighbor_discovery_ethernet_link_layer_address_option_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     icmp6_neighbor_discovery_option_header_t header;
+		     u8 max_l2_address[6 + 8];
+		     })
+  icmp6_neighbor_discovery_max_link_layer_address_option_t;
+
+/* Generic neighbor discover header.  Used for router solicitations,
+   etc. */
+typedef CLIB_PACKED (struct
+		     {
+		     icmp46_header_t icmp; u32 reserved_must_be_zero;
+		     }) icmp6_neighbor_discovery_header_t;
+
+/* Router advertisement packet formats. */
+typedef CLIB_PACKED (struct
+		     {
+		     icmp46_header_t icmp;
+		     /* Current hop limit to use for outgoing packets. */
+		     u8 current_hop_limit;
+		     u8 flags;
+#define ICMP6_ROUTER_DISCOVERY_FLAG_ADDRESS_CONFIG_VIA_DHCP (1 << 7)
+#define ICMP6_ROUTER_DISCOVERY_FLAG_OTHER_CONFIG_VIA_DHCP (1 << 6)
+		     /* Zero means unspecified. */
+		     u16 router_lifetime_in_sec;
+		     /* Zero means unspecified. */
+		     u32 neighbor_reachable_time_in_msec;
+		     /* Zero means unspecified. */
+		     u32
+		     time_in_msec_between_retransmitted_neighbor_solicitations;
+		     /* Options that may follow: source_link_layer_address, mtu, prefix_information. */
+		     }) icmp6_router_advertisement_header_t;
+
+/* Neighbor solicitation/advertisement header. */
+typedef CLIB_PACKED (struct
+		     {
+		     icmp46_header_t icmp;
+		     /* Zero for solicitation; flags for advertisement. */
+		     u32 advertisement_flags;
+		     /* Set when sent by a router. */
+#define ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_ROUTER (1 << 31)
+		     /* Set when response to solicitation. */
+#define ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_SOLICITED (1 << 30)
+#define ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_OVERRIDE (1 << 29)
+		     ip6_address_t target_address;
+		     /* Options that may follow: source_link_layer_address
+		        (for solicitation) target_link_layer_address (for advertisement). */
+		     }) icmp6_neighbor_solicitation_or_advertisement_header_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     icmp46_header_t icmp;
+		     u32 reserved_must_be_zero;
+		     /* Better next hop to use for given destination. */
+		     ip6_address_t better_next_hop_address;
+		     ip6_address_t dst_address;
+		     /* Options that may follow: target_link_layer_address,
+		        redirected_header. */
+		     }) icmp6_redirect_header_t;
+
+/* Solicitation/advertisement packet format for ethernet. */
+typedef CLIB_PACKED (struct
+		     {
+		     ip6_header_t ip;
+		     icmp6_neighbor_solicitation_or_advertisement_header_t
+		     neighbor;
+		     icmp6_neighbor_discovery_ethernet_link_layer_address_option_t
+		     link_layer_option;
+		     }) icmp6_neighbor_solicitation_header_t;
+
+/* Router solicitation packet format for ethernet. */
+typedef CLIB_PACKED (struct
+		     {
+		     ip6_header_t ip;
+		     icmp6_neighbor_discovery_header_t neighbor;
+		     icmp6_neighbor_discovery_ethernet_link_layer_address_option_t
+		     link_layer_option;
+		     }) icmp6_router_solicitation_header_t;
+
+/* router advertisement packet format for ethernet. */
+typedef CLIB_PACKED (struct
+		     {
+		     ip6_header_t ip;
+		     icmp6_router_advertisement_header_t router;
+		     icmp6_neighbor_discovery_ethernet_link_layer_address_option_t
+		     link_layer_option;
+		     icmp6_neighbor_discovery_mtu_option_t mtu_option;
+		     icmp6_neighbor_discovery_prefix_information_option_t
+		     prefix[0];
+		     }) icmp6_router_advertisement_packet_t;
+
+/* multicast listener report packet format for ethernet. */
+typedef CLIB_PACKED (struct
+		     {
+		     ip6_header_t ip;
+		     icmp6_multicast_listener_report_header_t report_hdr;
+		     }) icmp6_multicast_listener_report_packet_t;
+
+#endif /* included_vnet_icmp46_packet_h */
diff --git a/src/vnet/ip/icmp6.c b/src/vnet/ip/icmp6.c
new file mode 100644
index 00000000..70696d0c
--- /dev/null
+++ b/src/vnet/ip/icmp6.c
@@ -0,0 +1,882 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/icmp6.c: ip6 icmp
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/ip/ip.h>
+#include <vnet/pg/pg.h>
+
+static u8 *
+format_ip6_icmp_type_and_code (u8 * s, va_list * args)
+{
+  icmp6_type_t type = va_arg (*args, int);
+  u8 code = va_arg (*args, int);
+  char *t = 0;
+
+#define _(n,f) case n: t = #f; break;
+
+  switch (type)
+    {
+      foreach_icmp6_type;
+
+    default:
+      break;
+    }
+
+#undef _
+
+  if (!t)
+    return format (s, "unknown 0x%x", type);
+
+  s = format (s, "%s", t);
+
+  t = 0;
+  switch ((type << 8) | code)
+    {
+#define _(a,n,f) case (ICMP6_##a << 8) | (n): t = #f; break;
+
+      foreach_icmp6_code;
+
+#undef _
+    }
+
+  if (t)
+    s = format (s, " %s", t);
+
+  return s;
+}
+
+static u8 *
+format_icmp6_header (u8 * s, va_list * args)
+{
+  icmp46_header_t *icmp = va_arg (*args, icmp46_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+
+  /* Nothing to do. */
+  if (max_header_bytes < sizeof (icmp[0]))
+    return format (s, "ICMP header truncated");
+
+  s = format (s, "ICMP %U checksum 0x%x",
+	      format_ip6_icmp_type_and_code, icmp->type, icmp->code,
+	      clib_net_to_host_u16 (icmp->checksum));
+
+  if (max_header_bytes >=
+      sizeof (icmp6_neighbor_solicitation_or_advertisement_header_t) &&
+      (icmp->type == ICMP6_neighbor_solicitation ||
+       icmp->type == ICMP6_neighbor_advertisement))
+    {
+      icmp6_neighbor_solicitation_or_advertisement_header_t *icmp6_nd =
+	(icmp6_neighbor_solicitation_or_advertisement_header_t *) icmp;
+      s = format (s, "\n    target address %U",
+		  format_ip6_address, &icmp6_nd->target_address);
+    }
+
+  return s;
+}
+
+u8 *
+format_icmp6_input_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  icmp6_input_trace_t *t = va_arg (*va, icmp6_input_trace_t *);
+
+  s = format (s, "%U",
+	      format_ip6_header, t->packet_data, sizeof (t->packet_data));
+
+  return s;
+}
+
+static char *icmp_error_strings[] = {
+#define _(f,s) s,
+  foreach_icmp6_error
+#undef _
+};
+
+typedef enum
+{
+  ICMP_INPUT_NEXT_DROP,
+  ICMP_INPUT_N_NEXT,
+} icmp_input_next_t;
+
+typedef struct
+{
+  uword *type_and_code_by_name;
+
+  uword *type_by_name;
+
+  /* Vector dispatch table indexed by [icmp type]. */
+  u8 input_next_index_by_type[256];
+
+  /* Max valid code indexed by icmp type. */
+  u8 max_valid_code_by_type[256];
+
+  /* hop_limit must be >= this value for this icmp type. */
+  u8 min_valid_hop_limit_by_type[256];
+
+  u8 min_valid_length_by_type[256];
+} icmp6_main_t;
+
+icmp6_main_t icmp6_main;
+
+static uword
+ip6_icmp_input (vlib_main_t * vm,
+		vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  icmp6_main_t *im = &icmp6_main;
+  u32 *from, *to_next;
+  u32 n_left_from, n_left_to_next, next_index;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+				   /* stride */ 1,
+				   sizeof (icmp6_input_trace_t));
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *b0;
+	  ip6_header_t *ip0;
+	  icmp46_header_t *icmp0;
+	  icmp6_type_t type0;
+	  u32 bi0, next0, error0, len0;
+
+	  bi0 = to_next[0] = from[0];
+
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  ip0 = vlib_buffer_get_current (b0);
+	  icmp0 = ip6_next_header (ip0);
+	  type0 = icmp0->type;
+
+	  error0 = ICMP6_ERROR_NONE;
+
+	  next0 = im->input_next_index_by_type[type0];
+	  error0 =
+	    next0 == ICMP_INPUT_NEXT_DROP ? ICMP6_ERROR_UNKNOWN_TYPE : error0;
+
+	  /* Check code is valid for type. */
+	  error0 =
+	    icmp0->code >
+	    im->max_valid_code_by_type[type0] ?
+	    ICMP6_ERROR_INVALID_CODE_FOR_TYPE : error0;
+
+	  /* Checksum is already validated by ip6_local node so we don't need to check that. */
+
+	  /* Check that hop limit == 255 for certain types. */
+	  error0 =
+	    ip0->hop_limit <
+	    im->min_valid_hop_limit_by_type[type0] ?
+	    ICMP6_ERROR_INVALID_HOP_LIMIT_FOR_TYPE : error0;
+
+	  len0 = clib_net_to_host_u16 (ip0->payload_length);
+	  error0 =
+	    len0 <
+	    im->min_valid_length_by_type[type0] ?
+	    ICMP6_ERROR_LENGTH_TOO_SMALL_FOR_TYPE : error0;
+
+	  b0->error = node->errors[error0];
+
+	  next0 = error0 != ICMP6_ERROR_NONE ? ICMP_INPUT_NEXT_DROP : next0;
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_icmp_input_node) = {
+  .function = ip6_icmp_input,
+  .name = "ip6-icmp-input",
+
+  .vector_size = sizeof (u32),
+
+  .format_trace = format_icmp6_input_trace,
+
+  .n_errors = ARRAY_LEN (icmp_error_strings),
+  .error_strings = icmp_error_strings,
+
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [ICMP_INPUT_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+typedef enum
+{
+  ICMP6_ECHO_REQUEST_NEXT_LOOKUP,
+  ICMP6_ECHO_REQUEST_NEXT_OUTPUT,
+  ICMP6_ECHO_REQUEST_N_NEXT,
+} icmp6_echo_request_next_t;
+
+static uword
+ip6_icmp_echo_request (vlib_main_t * vm,
+		       vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 *from, *to_next;
+  u32 n_left_from, n_left_to_next, next_index;
+  ip6_main_t *im = &ip6_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+				   /* stride */ 1,
+				   sizeof (icmp6_input_trace_t));
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 2 && n_left_to_next > 2)
+	{
+	  vlib_buffer_t *p0, *p1;
+	  ip6_header_t *ip0, *ip1;
+	  icmp46_header_t *icmp0, *icmp1;
+	  ip6_address_t tmp0, tmp1;
+	  ip_csum_t sum0, sum1;
+	  u32 bi0, bi1;
+	  u32 fib_index0, fib_index1;
+	  u32 next0 = ICMP6_ECHO_REQUEST_NEXT_LOOKUP;
+	  u32 next1 = ICMP6_ECHO_REQUEST_NEXT_LOOKUP;
+
+	  bi0 = to_next[0] = from[0];
+	  bi1 = to_next[1] = from[1];
+
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, bi0);
+	  p1 = vlib_get_buffer (vm, bi1);
+	  ip0 = vlib_buffer_get_current (p0);
+	  ip1 = vlib_buffer_get_current (p1);
+	  icmp0 = ip6_next_header (ip0);
+	  icmp1 = ip6_next_header (ip1);
+
+	  /* Check icmp type to echo reply and update icmp checksum. */
+	  sum0 = icmp0->checksum;
+	  sum1 = icmp1->checksum;
+
+	  ASSERT (icmp0->type == ICMP6_echo_request);
+	  ASSERT (icmp1->type == ICMP6_echo_request);
+	  sum0 = ip_csum_update (sum0, ICMP6_echo_request, ICMP6_echo_reply,
+				 icmp46_header_t, type);
+	  sum1 = ip_csum_update (sum1, ICMP6_echo_request, ICMP6_echo_reply,
+				 icmp46_header_t, type);
+
+	  icmp0->checksum = ip_csum_fold (sum0);
+	  icmp1->checksum = ip_csum_fold (sum1);
+
+	  icmp0->type = ICMP6_echo_reply;
+	  icmp1->type = ICMP6_echo_reply;
+
+	  /* Swap source and destination address. */
+	  tmp0 = ip0->src_address;
+	  tmp1 = ip1->src_address;
+
+	  ip0->src_address = ip0->dst_address;
+	  ip1->src_address = ip1->dst_address;
+
+	  ip0->dst_address = tmp0;
+	  ip1->dst_address = tmp1;
+
+	  /* New hop count. */
+	  ip0->hop_limit = im->host_config.ttl;
+	  ip1->hop_limit = im->host_config.ttl;
+
+	  if (ip6_address_is_link_local_unicast (&ip0->dst_address))
+	    {
+	      ethernet_header_t *eth0;
+	      u8 tmp_mac[6];
+	      /* For link local, reuse current MAC header by sawpping
+	       *  SMAC to DMAC instead of IP6 lookup since link local
+	       *  is not in the IP6 FIB */
+	      vlib_buffer_reset (p0);
+	      eth0 = vlib_buffer_get_current (p0);
+	      clib_memcpy (tmp_mac, eth0->dst_address, 6);
+	      clib_memcpy (eth0->dst_address, eth0->src_address, 6);
+	      clib_memcpy (eth0->src_address, tmp_mac, 6);
+	      vnet_buffer (p0)->sw_if_index[VLIB_TX] =
+		vnet_buffer (p0)->sw_if_index[VLIB_RX];
+	      next0 = ICMP6_ECHO_REQUEST_NEXT_OUTPUT;
+	    }
+	  else
+	    {
+	      /* Determine the correct lookup fib indices... */
+	      fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
+				    vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+	      vnet_buffer (p0)->sw_if_index[VLIB_TX] = fib_index0;
+	    }
+
+	  if (ip6_address_is_link_local_unicast (&ip1->dst_address))
+	    {
+	      ethernet_header_t *eth1;
+	      u8 tmp_mac[6];
+	      /* For link local, reuse current MAC header by sawpping
+	       *  SMAC to DMAC instead of IP6 lookup since link local
+	       *  is not in the IP6 FIB */
+	      vlib_buffer_reset (p1);
+	      eth1 = vlib_buffer_get_current (p1);
+	      clib_memcpy (tmp_mac, eth1->dst_address, 6);
+	      clib_memcpy (eth1->dst_address, eth1->src_address, 6);
+	      clib_memcpy (eth1->src_address, tmp_mac, 6);
+	      vnet_buffer (p1)->sw_if_index[VLIB_TX] =
+		vnet_buffer (p1)->sw_if_index[VLIB_RX];
+	      next1 = ICMP6_ECHO_REQUEST_NEXT_OUTPUT;
+	    }
+	  else
+	    {
+	      /* Determine the correct lookup fib indices... */
+	      fib_index1 = vec_elt (im->fib_index_by_sw_if_index,
+				    vnet_buffer (p1)->sw_if_index[VLIB_RX]);
+	      vnet_buffer (p1)->sw_if_index[VLIB_TX] = fib_index1;
+	    }
+
+	  vnet_buffer (p0)->sw_if_index[VLIB_RX]
+	    = vnet_main.local_interface_sw_if_index;
+	  vnet_buffer (p1)->sw_if_index[VLIB_RX]
+	    = vnet_main.local_interface_sw_if_index;
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  /* if next0==next1==next_index then nothing special needs to be done */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip6_header_t *ip0;
+	  icmp46_header_t *icmp0;
+	  u32 bi0;
+	  ip6_address_t tmp0;
+	  ip_csum_t sum0;
+	  u32 fib_index0;
+	  u32 next0 = ICMP6_ECHO_REQUEST_NEXT_LOOKUP;
+
+	  bi0 = to_next[0] = from[0];
+
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, bi0);
+	  ip0 = vlib_buffer_get_current (p0);
+	  icmp0 = ip6_next_header (ip0);
+
+	  /* Check icmp type to echo reply and update icmp checksum. */
+	  sum0 = icmp0->checksum;
+
+	  ASSERT (icmp0->type == ICMP6_echo_request);
+	  sum0 = ip_csum_update (sum0, ICMP6_echo_request, ICMP6_echo_reply,
+				 icmp46_header_t, type);
+
+	  icmp0->checksum = ip_csum_fold (sum0);
+
+	  icmp0->type = ICMP6_echo_reply;
+
+	  /* Swap source and destination address. */
+	  tmp0 = ip0->src_address;
+	  ip0->src_address = ip0->dst_address;
+	  ip0->dst_address = tmp0;
+
+	  ip0->hop_limit = im->host_config.ttl;
+
+	  if (ip6_address_is_link_local_unicast (&ip0->dst_address))
+	    {
+	      ethernet_header_t *eth0;
+	      u8 tmp_mac[6];
+	      /* For link local, reuse current MAC header by sawpping
+	       *  SMAC to DMAC instead of IP6 lookup since link local
+	       *  is not in the IP6 FIB */
+	      vlib_buffer_reset (p0);
+	      eth0 = vlib_buffer_get_current (p0);
+	      clib_memcpy (tmp_mac, eth0->dst_address, 6);
+	      clib_memcpy (eth0->dst_address, eth0->src_address, 6);
+	      clib_memcpy (eth0->src_address, tmp_mac, 6);
+	      vnet_buffer (p0)->sw_if_index[VLIB_TX] =
+		vnet_buffer (p0)->sw_if_index[VLIB_RX];
+	      next0 = ICMP6_ECHO_REQUEST_NEXT_OUTPUT;
+	    }
+	  else
+	    {
+	      fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
+				    vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+	      vnet_buffer (p0)->sw_if_index[VLIB_TX] = fib_index0;
+	    }
+	  vnet_buffer (p0)->sw_if_index[VLIB_RX]
+	    = vnet_main.local_interface_sw_if_index;
+
+	  /* Verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_error_count (vm, ip6_icmp_input_node.index,
+		    ICMP6_ERROR_ECHO_REPLIES_SENT, frame->n_vectors);
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_icmp_echo_request_node,static) = {
+  .function = ip6_icmp_echo_request,
+  .name = "ip6-icmp-echo-request",
+
+  .vector_size = sizeof (u32),
+
+  .format_trace = format_icmp6_input_trace,
+
+  .n_next_nodes = ICMP6_ECHO_REQUEST_N_NEXT,
+  .next_nodes = {
+    [ICMP6_ECHO_REQUEST_NEXT_LOOKUP] = "ip6-lookup",
+    [ICMP6_ECHO_REQUEST_NEXT_OUTPUT] = "interface-output",
+  },
+};
+/* *INDENT-ON* */
+
+typedef enum
+{
+  IP6_ICMP_ERROR_NEXT_DROP,
+  IP6_ICMP_ERROR_NEXT_LOOKUP,
+  IP6_ICMP_ERROR_N_NEXT,
+} ip6_icmp_error_next_t;
+
+void
+icmp6_error_set_vnet_buffer (vlib_buffer_t * b, u8 type, u8 code, u32 data)
+{
+  vnet_buffer (b)->ip.icmp.type = type;
+  vnet_buffer (b)->ip.icmp.code = code;
+  vnet_buffer (b)->ip.icmp.data = data;
+}
+
+static u8
+icmp6_icmp_type_to_error (u8 type)
+{
+  switch (type)
+    {
+    case ICMP6_destination_unreachable:
+      return ICMP6_ERROR_DEST_UNREACH_SENT;
+    case ICMP6_packet_too_big:
+      return ICMP6_ERROR_PACKET_TOO_BIG_SENT;
+    case ICMP6_time_exceeded:
+      return ICMP6_ERROR_TTL_EXPIRE_SENT;
+    case ICMP6_parameter_problem:
+      return ICMP6_ERROR_PARAM_PROBLEM_SENT;
+    default:
+      return ICMP6_ERROR_DROP;
+    }
+}
+
+static uword
+ip6_icmp_error (vlib_main_t * vm,
+		vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 *from, *to_next;
+  uword n_left_from, n_left_to_next;
+  ip6_icmp_error_next_t next_index;
+  ip6_main_t *im = &ip6_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+				   /* stride */ 1,
+				   sizeof (icmp6_input_trace_t));
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0 = from[0];
+	  u32 next0 = IP6_ICMP_ERROR_NEXT_LOOKUP;
+	  u8 error0 = ICMP6_ERROR_NONE;
+	  vlib_buffer_t *p0;
+	  ip6_header_t *ip0, *out_ip0;
+	  icmp46_header_t *icmp0;
+	  u32 sw_if_index0, if_add_index0;
+	  int bogus_length;
+
+	  /* Speculatively enqueue p0 to the current next frame */
+	  to_next[0] = pi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip0 = vlib_buffer_get_current (p0);
+	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
+
+	  /* RFC4443 says to keep as much of the original packet as possible
+	   * within the minimum MTU. We cheat "a little" here by keeping whatever fits
+	   * in the first buffer, to be more efficient */
+	  if (PREDICT_FALSE (p0->total_length_not_including_first_buffer))
+	    {			/* clear current_length of all other buffers in chain */
+	      vlib_buffer_t *b = p0;
+	      p0->total_length_not_including_first_buffer = 0;
+	      while (b->flags & VLIB_BUFFER_NEXT_PRESENT)
+		{
+		  b = vlib_get_buffer (vm, b->next_buffer);
+		  b->current_length = 0;
+		}
+	    }
+	  p0->current_length =
+	    p0->current_length > 1280 ? 1280 : p0->current_length;
+
+	  /* Add IP header and ICMPv6 header including a 4 byte data field */
+	  vlib_buffer_advance (p0,
+			       -sizeof (ip6_header_t) -
+			       sizeof (icmp46_header_t) - 4);
+	  out_ip0 = vlib_buffer_get_current (p0);
+	  icmp0 = (icmp46_header_t *) & out_ip0[1];
+
+	  /* Fill ip header fields */
+	  out_ip0->ip_version_traffic_class_and_flow_label =
+	    clib_host_to_net_u32 (0x6 << 28);
+
+	  out_ip0->payload_length =
+	    clib_host_to_net_u16 (p0->current_length - sizeof (ip6_header_t));
+	  out_ip0->protocol = IP_PROTOCOL_ICMP6;
+	  out_ip0->hop_limit = 0xff;
+	  out_ip0->dst_address = ip0->src_address;
+	  if_add_index0 =
+	    lm->if_address_pool_index_by_sw_if_index[sw_if_index0];
+	  if (PREDICT_TRUE (if_add_index0 != ~0))
+	    {
+	      ip_interface_address_t *if_add =
+		pool_elt_at_index (lm->if_address_pool, if_add_index0);
+	      ip6_address_t *if_ip =
+		ip_interface_address_get_address (lm, if_add);
+	      out_ip0->src_address = *if_ip;
+	    }
+	  else			/* interface has no IP6 address - should not happen */
+	    {
+	      next0 = IP6_ICMP_ERROR_NEXT_DROP;
+	      error0 = ICMP6_ERROR_DROP;
+	    }
+
+	  /* Fill icmp header fields */
+	  icmp0->type = vnet_buffer (p0)->ip.icmp.type;
+	  icmp0->code = vnet_buffer (p0)->ip.icmp.code;
+	  *((u32 *) (icmp0 + 1)) =
+	    clib_host_to_net_u32 (vnet_buffer (p0)->ip.icmp.data);
+	  icmp0->checksum = 0;
+	  icmp0->checksum =
+	    ip6_tcp_udp_icmp_compute_checksum (vm, p0, out_ip0,
+					       &bogus_length);
+
+
+
+	  /* Update error status */
+	  if (error0 == ICMP6_ERROR_NONE)
+	    error0 = icmp6_icmp_type_to_error (icmp0->type);
+	  vlib_error_count (vm, node->node_index, error0, 1);
+
+	  /* Verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_icmp_error_node) = {
+  .function = ip6_icmp_error,
+  .name = "ip6-icmp-error",
+  .vector_size = sizeof (u32),
+
+  .n_errors = ARRAY_LEN (icmp_error_strings),
+  .error_strings = icmp_error_strings,
+
+  .n_next_nodes = IP6_ICMP_ERROR_N_NEXT,
+  .next_nodes = {
+    [IP6_ICMP_ERROR_NEXT_DROP] = "error-drop",
+    [IP6_ICMP_ERROR_NEXT_LOOKUP] = "ip6-lookup",
+  },
+
+  .format_trace = format_icmp6_input_trace,
+};
+/* *INDENT-ON* */
+
+
+static uword
+unformat_icmp_type_and_code (unformat_input_t * input, va_list * args)
+{
+  icmp46_header_t *h = va_arg (*args, icmp46_header_t *);
+  icmp6_main_t *cm = &icmp6_main;
+  u32 i;
+
+  if (unformat_user (input, unformat_vlib_number_by_name,
+		     cm->type_and_code_by_name, &i))
+    {
+      h->type = (i >> 8) & 0xff;
+      h->code = (i >> 0) & 0xff;
+    }
+  else if (unformat_user (input, unformat_vlib_number_by_name,
+			  cm->type_by_name, &i))
+    {
+      h->type = i;
+      h->code = 0;
+    }
+  else
+    return 0;
+
+  return 1;
+}
+
+static void
+icmp6_pg_edit_function (pg_main_t * pg,
+			pg_stream_t * s,
+			pg_edit_group_t * g, u32 * packets, u32 n_packets)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  u32 ip_offset, icmp_offset;
+  int bogus_length;
+
+  icmp_offset = g->start_byte_offset;
+  ip_offset = (g - 1)->start_byte_offset;
+
+  while (n_packets >= 1)
+    {
+      vlib_buffer_t *p0;
+      ip6_header_t *ip0;
+      icmp46_header_t *icmp0;
+
+      p0 = vlib_get_buffer (vm, packets[0]);
+      n_packets -= 1;
+      packets += 1;
+
+      ASSERT (p0->current_data == 0);
+      ip0 = (void *) (p0->data + ip_offset);
+      icmp0 = (void *) (p0->data + icmp_offset);
+
+      icmp0->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, p0, ip0,
+							   &bogus_length);
+      ASSERT (bogus_length == 0);
+    }
+}
+
+typedef struct
+{
+  pg_edit_t type, code;
+  pg_edit_t checksum;
+} pg_icmp46_header_t;
+
+always_inline void
+pg_icmp_header_init (pg_icmp46_header_t * p)
+{
+  /* Initialize fields that are not bit fields in the IP header. */
+#define _(f) pg_edit_init (&p->f, icmp46_header_t, f);
+  _(type);
+  _(code);
+  _(checksum);
+#undef _
+}
+
+static uword
+unformat_pg_icmp_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  pg_icmp46_header_t *p;
+  u32 group_index;
+
+  p = pg_create_edit_group (s, sizeof (p[0]), sizeof (icmp46_header_t),
+			    &group_index);
+  pg_icmp_header_init (p);
+
+  p->checksum.type = PG_EDIT_UNSPECIFIED;
+
+  {
+    icmp46_header_t tmp;
+
+    if (!unformat (input, "ICMP %U", unformat_icmp_type_and_code, &tmp))
+      goto error;
+
+    pg_edit_set_fixed (&p->type, tmp.type);
+    pg_edit_set_fixed (&p->code, tmp.code);
+  }
+
+  /* Parse options. */
+  while (1)
+    {
+      if (unformat (input, "checksum %U",
+		    unformat_pg_edit, unformat_pg_number, &p->checksum))
+	;
+
+      /* Can't parse input: try next protocol level. */
+      else
+	break;
+    }
+
+  if (!unformat_user (input, unformat_pg_payload, s))
+    goto error;
+
+  if (p->checksum.type == PG_EDIT_UNSPECIFIED)
+    {
+      pg_edit_group_t *g = pg_stream_get_group (s, group_index);
+      g->edit_function = icmp6_pg_edit_function;
+      g->edit_function_opaque = 0;
+    }
+
+  return 1;
+
+error:
+  /* Free up any edits we may have added. */
+  pg_free_edit_group (s);
+  return 0;
+}
+
+void
+icmp6_register_type (vlib_main_t * vm, icmp6_type_t type, u32 node_index)
+{
+  icmp6_main_t *im = &icmp6_main;
+
+  ASSERT ((int) type < ARRAY_LEN (im->input_next_index_by_type));
+  im->input_next_index_by_type[type]
+    = vlib_node_add_next (vm, ip6_icmp_input_node.index, node_index);
+}
+
+static clib_error_t *
+icmp6_init (vlib_main_t * vm)
+{
+  ip_main_t *im = &ip_main;
+  ip_protocol_info_t *pi;
+  icmp6_main_t *cm = &icmp6_main;
+  clib_error_t *error;
+
+  error = vlib_call_init_function (vm, ip_main_init);
+
+  if (error)
+    return error;
+
+  pi = ip_get_protocol_info (im, IP_PROTOCOL_ICMP6);
+  pi->format_header = format_icmp6_header;
+  pi->unformat_pg_edit = unformat_pg_icmp_header;
+
+  cm->type_by_name = hash_create_string (0, sizeof (uword));
+#define _(n,t) hash_set_mem (cm->type_by_name, #t, (n));
+  foreach_icmp6_type;
+#undef _
+
+  cm->type_and_code_by_name = hash_create_string (0, sizeof (uword));
+#define _(a,n,t) hash_set_mem (cm->type_by_name, #t, (n) | (ICMP6_##a << 8));
+  foreach_icmp6_code;
+#undef _
+
+  memset (cm->input_next_index_by_type,
+	  ICMP_INPUT_NEXT_DROP, sizeof (cm->input_next_index_by_type));
+  memset (cm->max_valid_code_by_type, 0, sizeof (cm->max_valid_code_by_type));
+
+#define _(a,n,t) cm->max_valid_code_by_type[ICMP6_##a] = clib_max (cm->max_valid_code_by_type[ICMP6_##a], n);
+  foreach_icmp6_code;
+#undef _
+
+  memset (cm->min_valid_hop_limit_by_type, 0,
+	  sizeof (cm->min_valid_hop_limit_by_type));
+  cm->min_valid_hop_limit_by_type[ICMP6_router_solicitation] = 255;
+  cm->min_valid_hop_limit_by_type[ICMP6_router_advertisement] = 255;
+  cm->min_valid_hop_limit_by_type[ICMP6_neighbor_solicitation] = 255;
+  cm->min_valid_hop_limit_by_type[ICMP6_neighbor_advertisement] = 255;
+  cm->min_valid_hop_limit_by_type[ICMP6_redirect] = 255;
+
+  memset (cm->min_valid_length_by_type, sizeof (icmp46_header_t),
+	  sizeof (cm->min_valid_length_by_type));
+  cm->min_valid_length_by_type[ICMP6_router_solicitation] =
+    sizeof (icmp6_neighbor_discovery_header_t);
+  cm->min_valid_length_by_type[ICMP6_router_advertisement] =
+    sizeof (icmp6_router_advertisement_header_t);
+  cm->min_valid_length_by_type[ICMP6_neighbor_solicitation] =
+    sizeof (icmp6_neighbor_solicitation_or_advertisement_header_t);
+  cm->min_valid_length_by_type[ICMP6_neighbor_advertisement] =
+    sizeof (icmp6_neighbor_solicitation_or_advertisement_header_t);
+  cm->min_valid_length_by_type[ICMP6_redirect] =
+    sizeof (icmp6_redirect_header_t);
+
+  icmp6_register_type (vm, ICMP6_echo_request,
+		       ip6_icmp_echo_request_node.index);
+
+  return vlib_call_init_function (vm, ip6_neighbor_init);
+}
+
+VLIB_INIT_FUNCTION (icmp6_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/icmp6.h b/src/vnet/ip/icmp6.h
new file mode 100644
index 00000000..a426512e
--- /dev/null
+++ b/src/vnet/ip/icmp6.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vnet_icmp6_h
+#define included_vnet_icmp6_h
+
+#define foreach_icmp6_error                                             \
+  _ (NONE, "valid packets")                                             \
+  _ (UNKNOWN_TYPE, "unknown type")                                      \
+  _ (INVALID_CODE_FOR_TYPE, "invalid code for type")                    \
+  _ (INVALID_HOP_LIMIT_FOR_TYPE, "hop_limit != 255")                    \
+  _ (LENGTH_TOO_SMALL_FOR_TYPE, "payload length too small for type")    \
+  _ (OPTIONS_WITH_ODD_LENGTH,                                           \
+     "total option length not multiple of 8 bytes")                     \
+  _ (OPTION_WITH_ZERO_LENGTH, "option has zero length")                 \
+  _ (ECHO_REPLIES_SENT, "echo replies sent")                            \
+  _ (NEIGHBOR_SOLICITATION_SOURCE_NOT_ON_LINK,                          \
+     "neighbor solicitations from source not on link")                  \
+  _ (NEIGHBOR_SOLICITATION_SOURCE_UNKNOWN,                              \
+     "neighbor solicitations for unknown targets")                      \
+  _ (NEIGHBOR_ADVERTISEMENTS_TX, "neighbor advertisements sent")        \
+  _ (NEIGHBOR_ADVERTISEMENTS_RX, "neighbor advertisements received")    \
+  _ (ROUTER_SOLICITATION_SOURCE_NOT_ON_LINK,                            \
+     "router solicitations from source not on link")                    \
+  _ (ROUTER_SOLICITATION_UNSUPPORTED_INTF,                              \
+     "neighbor discovery unsupported  interface")                       \
+  _ (ROUTER_SOLICITATION_RADV_NOT_CONFIG,                               \
+     "neighbor discovery not configured")                               \
+  _ (ROUTER_SOLICITATION_DEST_UNKNOWN,                                  \
+     "router solicitations for unknown destination")                    \
+  _ (ROUTER_SOLICITATION_SOURCE_UNKNOWN,                                \
+     "router solicitations for unknown source")                         \
+  _ (ROUTER_ADVERTISEMENT_SOURCE_NOT_LINK_LOCAL,                        \
+     "router advertisement source not link local")                      \
+  _ (ROUTER_ADVERTISEMENTS_TX, "router advertisements sent")            \
+  _ (ROUTER_ADVERTISEMENTS_RX, "router advertisements received")        \
+  _ (DST_LOOKUP_MISS, "icmp6 dst address lookup misses")                \
+  _ (DEST_UNREACH_SENT, "destination unreachable response sent")	\
+  _ (PACKET_TOO_BIG_SENT, "packet too big response sent")		\
+  _ (TTL_EXPIRE_SENT, "hop limit exceeded response sent")		\
+  _ (PARAM_PROBLEM_SENT, "parameter Pproblem response sent")		\
+  _ (DROP, "error message dropped")
+
+
+typedef enum
+{
+#define _(f,s) ICMP6_ERROR_##f,
+  foreach_icmp6_error
+#undef _
+} icmp6_error_t;
+
+typedef struct
+{
+  u8 packet_data[64];
+} icmp6_input_trace_t;
+
+format_function_t format_icmp6_input_trace;
+void icmp6_register_type (vlib_main_t * vm, icmp6_type_t type,
+			  u32 node_index);
+void icmp6_error_set_vnet_buffer (vlib_buffer_t * b, u8 type, u8 code,
+				  u32 data);
+
+extern vlib_node_registration_t ip6_icmp_input_node;
+
+#endif /* included_vnet_icmp6_h */
+
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/igmp_packet.h b/src/vnet/ip/igmp_packet.h
new file mode 100644
index 00000000..503259ec
--- /dev/null
+++ b/src/vnet/ip/igmp_packet.h
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * igmp_packet.h: igmp packet format
+ *
+ * Copyright (c) 2011 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vnet_igmp_packet_h
+#define included_vnet_igmp_packet_h
+
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+
+#define foreach_igmp_type			\
+  _ (0x11, membership_query)			\
+  _ (0x12, membership_report_v1)		\
+  _ (0x13, dvmrp)				\
+  _ (0x14, pim_v1)				\
+  _ (0x15, cisco_trace)				\
+  _ (0x16, membership_report_v2)		\
+  _ (0x17, leave_group_v2)			\
+  _ (0x1e, traceroute_response)			\
+  _ (0x1f, traceroute_request)			\
+  _ (0x22, membership_report_v3)		\
+  _ (0x30, router_advertisement)		\
+  _ (0x31, router_solicitation)			\
+  _ (0x32, router_termination)
+
+typedef enum
+{
+#define _(n,f) IGMP_TYPE_##f = n,
+  foreach_igmp_type
+#undef _
+} igmp_type_t;
+
+typedef struct
+{
+  igmp_type_t type:8;
+
+  u8 code;
+
+  u16 checksum;
+} igmp_header_t;
+
+typedef struct
+{
+  /* membership_query, version <= 2 reports. */
+  igmp_header_t header;
+
+  /* Multicast destination address. */
+  ip4_address_t dst;
+} igmp_message_t;
+
+#define foreach_igmp_membership_group_v3_type	\
+  _ (1, mode_is_filter_include)			\
+  _ (2, mode_is_filter_exclude)			\
+  _ (3, change_to_filter_include)		\
+  _ (4, change_to_filter_exclude)		\
+  _ (5, allow_new_sources)			\
+  _ (6, block_old_sources)
+
+typedef enum
+{
+#define _(n,f) IGMP_MEMBERSHIP_GROUP_##f = n,
+  foreach_igmp_membership_group_v3_type
+#undef _
+} igmp_membership_group_v3_type_t;
+
+typedef struct
+{
+  igmp_membership_group_v3_type_t type:8;
+
+  /* Number of 32 bit words of aux data after source addresses. */
+  u8 n_aux_u32s;
+
+  /* Number of source addresses that follow. */
+  u16 n_src_addresses;
+
+  /* Destination multicast address. */
+  ip4_address_t dst_address;
+
+  ip4_address_t src_addresses[0];
+} igmp_membership_group_v3_t;
+
+always_inline igmp_membership_group_v3_t *
+igmp_membership_group_v3_next (igmp_membership_group_v3_t * g)
+{
+  return ((void *) g
+	  + g->n_src_addresses * sizeof (g->src_addresses[0])
+	  + g->n_aux_u32s * sizeof (u32));
+}
+
+typedef struct
+{
+  /* Type 0x22. */
+  igmp_header_t header;
+
+  u16 unused;
+
+  /* Number of groups which follow. */
+  u16 n_groups;
+
+  igmp_membership_group_v3_t groups[0];
+} igmp_membership_report_v3_t;
+
+/* IP6 flavor of IGMP is called MLD which is embedded in ICMP6. */
+typedef struct
+{
+  /* Preceeded by ICMP v6 header. */
+  u16 max_response_delay_in_milliseconds;
+  u16 reserved;
+  ip6_address_t dst;
+} mld_header_t;
+
+#endif /* included_vnet_igmp_packet_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip.api b/src/vnet/ip/ip.api
new file mode 100644
index 00000000..c811e465
--- /dev/null
+++ b/src/vnet/ip/ip.api
@@ -0,0 +1,434 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \file
+
+    This file defines vpp IP control-plane API messages which are generally
+    called through a shared memory interface. 
+*/
+
+/** \brief Dump IP fib table
+    @param client_index - opaque cookie to identify the sender
+*/
+define ip_fib_dump
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief FIB path
+    @param sw_if_index - index of the interface
+    @param weight - The weight, for UCMP
+    @param is_local - local if non-zero, else remote
+    @param is_drop - Drop the packet
+    @param is_unreach - Drop the packet and rate limit send ICMP unreachable
+    @param is_prohibit - Drop the packet and rate limit send ICMP prohibited
+    @param afi - the afi of the next hop, IP46_TYPE_IP4=1, IP46_TYPE_IP6=2
+    @param next_hop[16] - the next hop address
+
+    WARNING: this type is replicated, pending cleanup completion
+*/
+typeonly manual_print manual_endian define fib_path
+{
+  u32 sw_if_index;
+  u32 weight;
+  u8 is_local;
+  u8 is_drop;
+  u8 is_unreach;
+  u8 is_prohibit;
+  u8 afi;
+  u8 next_hop[16];
+};
+
+/** \brief IP FIB table response
+    @param table_id - IP fib table id
+    @address_length - mask length
+    @address - ip4 prefix
+    @param count - the number of fib_path in path
+    @param path  - array of of fib_path structures
+*/
+manual_endian manual_print define ip_fib_details
+{
+  u32 context;
+  u32 table_id;
+  u8  address_length;
+  u8  address[4];
+  u32 count;
+  vl_api_fib_path_t path[count];
+};
+
+/** \brief Dump IP6 fib table
+    @param client_index - opaque cookie to identify the sender
+*/
+define ip6_fib_dump
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief IP6 FIB table response
+    @param table_id - IP6 fib table id
+    @address_length - mask length
+    @address - ip6 prefix
+    @param count - the number of fib_path in path
+    @param path  - array of of fib_path structures
+*/
+manual_endian manual_print define ip6_fib_details
+{
+  u32 context;
+  u32 table_id;
+  u8  address_length;
+  u8  address[16];
+  u32 count;
+  vl_api_fib_path_t path[count];
+};
+
+/** \brief Dump IP neighboors
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - the interface to dump neighboors
+    @param is_ipv6 - [1|0] to indicate if address family is ipv[6|4]
+*/
+define ip_neighbor_dump
+{
+    u32 client_index;
+    u32 context;
+    u32 sw_if_index;
+    u8  is_ipv6;
+};
+
+/** \brief IP neighboors dump response
+    @param context - sender context which was passed in the request
+    @param is_static - [1|0] to indicate if neighbor is statically configured
+    @param is_ipv6 - [1|0] to indicate if address family is ipv[6|4]
+*/
+define ip_neighbor_details {
+    u32 context;
+    u32 is_static;
+    u8  is_ipv6;
+    u8  mac_address[6];
+    u8  ip_address[16];
+};
+
+/** \brief IP neighbor add / del request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param vrf_id - vrf_id, only for IP4
+    @param sw_if_index - interface used to reach neighbor
+    @param is_add - 1 to add neighbor, 0 to delete
+    @param is_ipv6 - 1 for IPv6 neighbor, 0 for IPv4
+    @param is_static - 
+    @param mac_address - l2 address of the neighbor
+    @param dst_address - ip4 or ip6 address of the neighbor
+*/
+define ip_neighbor_add_del
+{
+  u32 client_index;
+  u32 context;
+  u32 vrf_id;			/* only makes sense for ip4 */
+  u32 sw_if_index;
+  /* 1 = add, 0 = delete */
+  u8 is_add;
+  u8 is_ipv6;
+  u8 is_static;
+  u8 mac_address[6];
+  u8 dst_address[16];
+};
+
+/** \brief Reply for IP Neighbor add / delete request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define ip_neighbor_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Set the ip flow hash config for a fib request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param vrf_id - vrf/fib id
+    @param is_ipv6 - if non-zero the fib is ip6, else ip4
+    @param src - if non-zero include src in flow hash
+    @param dst - if non-zero include dst in flow hash
+    @param sport - if non-zero include sport in flow hash
+    @param dport - if non-zero include dport in flow hash
+    @param proto -if non-zero include proto in flow hash
+    @param reverse - if non-zero include reverse in flow hash
+*/
+define set_ip_flow_hash
+{
+  u32 client_index;
+  u32 context;
+  u32 vrf_id;
+  u8 is_ipv6;
+  u8 src;
+  u8 dst;
+  u8 sport;
+  u8 dport;
+  u8 proto;
+  u8 reverse;
+};
+
+/** \brief Set the ip flow hash config for a fib response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define set_ip_flow_hash_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IPv6 router advertisement config request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param suppress -
+    @param managed -
+    @param other -
+    @param ll_option -
+    @param send_unicast -
+    @param cease -
+    @param is_no -
+    @param default_router -
+    @param max_interval -
+    @param min_interval -
+    @param lifetime -
+    @param initial_count -
+    @param initial_interval -
+*/
+define sw_interface_ip6nd_ra_config
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 suppress;
+  u8 managed;
+  u8 other;
+  u8 ll_option;
+  u8 send_unicast;
+  u8 cease;
+  u8 is_no;
+  u8 default_router;
+  u32 max_interval;
+  u32 min_interval;
+  u32 lifetime;
+  u32 initial_count;
+  u32 initial_interval;
+};
+
+/** \brief IPv6 router advertisement config response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define sw_interface_ip6nd_ra_config_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IPv6 router advertisement prefix config request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - 
+    @param address[] -
+    @param address_length -
+    @param use_default -
+    @param no_advertise -
+    @param off_link -
+    @param no_autoconfig -
+    @param no_onlink -
+    @param is_no -
+    @param val_lifetime -
+    @param pref_lifetime -
+*/
+define sw_interface_ip6nd_ra_prefix
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 address[16];
+  u8 address_length;
+  u8 use_default;
+  u8 no_advertise;
+  u8 off_link;
+  u8 no_autoconfig;
+  u8 no_onlink;
+  u8 is_no;
+  u32 val_lifetime;
+  u32 pref_lifetime;
+};
+
+/** \brief IPv6 router advertisement prefix config response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define sw_interface_ip6nd_ra_prefix_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IPv6 interface enable / disable request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface used to reach neighbor
+    @param enable - if non-zero enable ip6 on interface, else disable
+*/
+define sw_interface_ip6_enable_disable
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 enable;			/* set to true if enable */
+};
+
+/** \brief IPv6 interface enable / disable response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define sw_interface_ip6_enable_disable_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IPv6 set link local address on interface request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface to set link local on
+    @param address[] - the new link local address
+    @param address_length - link local address length
+*/
+define sw_interface_ip6_set_link_local_address
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 address[16];
+  u8 address_length;
+};
+
+/** \brief IPv6 set link local address on interface response
+    @param context - sender context, to match reply w/ request
+    @param retval - error code for the request
+*/
+define sw_interface_ip6_set_link_local_address_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Add / del route request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - software index of the new vlan's parent interface
+    @param vrf_id - fib table /vrf associated with the route
+    @param lookup_in_vrf - 
+    @param classify_table_index - 
+    @param create_vrf_if_needed - 
+    @param is_add - 1 if adding the route, 0 if deleting
+    @param is_drop - Drop the packet
+    @param is_unreach - Drop the packet and rate limit send ICMP unreachable
+    @param is_prohibit - Drop the packet and rate limit send ICMP prohibited
+    @param is_ipv6 - 0 if an ip4 route, else ip6
+    @param is_local - 
+    @param is_classify - 
+    @param is_multipath - Set to 1 if this is a multipath route, else 0
+    @param not_last - Is last or not last msg in group of multiple add/del msgs
+    @param next_hop_weight - 
+    @param dst_address_length - 
+    @param dst_address[16] - 
+    @param next_hop_address[16] - 
+    @param next_hop_n_out_labels - the number of labels in the label stack
+    @param next_hop_out_label_stack - the next-hop output label stack, outer most first
+    @param next_hop_via_label - The next-hop is a resolved via a local label
+*/
+define ip_add_del_route
+{
+  u32 client_index;
+  u32 context;
+  u32 next_hop_sw_if_index;
+  u32 table_id;
+  u32 classify_table_index;
+  u32 next_hop_table_id;
+  u8 create_vrf_if_needed;
+  u8 is_add;
+  u8 is_drop;
+  u8 is_unreach;
+  u8 is_prohibit;
+  u8 is_ipv6;
+  u8 is_local;
+  u8 is_classify;
+  u8 is_multipath;
+  u8 is_resolve_host;
+  u8 is_resolve_attached;
+  /* Is last/not-last message in group of multiple add/del messages. */
+  u8 not_last;
+  u8 next_hop_weight;
+  u8 dst_address_length;
+  u8 dst_address[16];
+  u8 next_hop_address[16];
+  u8 next_hop_n_out_labels;
+  u32 next_hop_via_label;
+  u32 next_hop_out_label_stack[next_hop_n_out_labels];
+};
+
+/** \brief Reply for add / del route request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define ip_add_del_route_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+define ip_address_details
+{
+  u32 client_index;
+  u32 context;
+  u8 ip[16];
+  u8 prefix_length;
+};
+
+define ip_address_dump
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 is_ipv6;
+};
+
+define ip_details
+{
+  u32 sw_if_index;
+  u32 context;
+};
+
+define ip_dump
+{
+  u32 client_index;
+  u32 context;
+  u8 is_ipv6;
+};
+
+
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip.h b/src/vnet/ip/ip.h
new file mode 100644
index 00000000..02a1a963
--- /dev/null
+++ b/src/vnet/ip/ip.h
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip.h: ip generic (4 or 6) main
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_ip_main_h
+#define included_ip_main_h
+
+#include <vppinfra/hash.h>
+#include <vppinfra/heap.h>	/* adjacency heap */
+#include <vppinfra/ptclosure.h>
+
+#include <vnet/vnet.h>
+
+#include <vnet/ip/format.h>
+#include <vnet/ip/ip_packet.h>
+#include <vnet/ip/lookup.h>
+
+#include <vnet/ip/tcp_packet.h>
+#include <vnet/ip/udp_packet.h>
+#include <vnet/ip/icmp46_packet.h>
+
+#include <vnet/ip/ip4.h>
+#include <vnet/ip/ip4_error.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/icmp4.h>
+
+#include <vnet/ip/ip6.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/ip/ip6_error.h>
+#include <vnet/ip/icmp6.h>
+#include <vnet/classify/vnet_classify.h>
+
+/* Per protocol info. */
+typedef struct
+{
+  /* Protocol name (also used as hash key). */
+  u8 *name;
+
+  /* Protocol number. */
+  ip_protocol_t protocol;
+
+  /* Format function for this IP protocol. */
+  format_function_t *format_header;
+
+  /* Parser for header. */
+  unformat_function_t *unformat_header;
+
+  /* Parser for per-protocol matches. */
+  unformat_function_t *unformat_match;
+
+  /* Parser for packet generator edits for this protocol. */
+  unformat_function_t *unformat_pg_edit;
+} ip_protocol_info_t;
+
+/* Per TCP/UDP port info. */
+typedef struct
+{
+  /* Port name (used as hash key). */
+  u8 *name;
+
+  /* UDP/TCP port number in network byte order. */
+  u16 port;
+
+  /* Port specific format function. */
+  format_function_t *format_header;
+
+  /* Parser for packet generator edits for this protocol. */
+  unformat_function_t *unformat_pg_edit;
+} tcp_udp_port_info_t;
+
+typedef struct
+{
+  /* Per IP protocol info. */
+  ip_protocol_info_t *protocol_infos;
+
+  /* Protocol info index hashed by 8 bit IP protocol. */
+  uword *protocol_info_by_protocol;
+
+  /* Hash table mapping IP protocol name (see protocols.def)
+     to protocol number. */
+  uword *protocol_info_by_name;
+
+  /* Per TCP/UDP port info. */
+  tcp_udp_port_info_t *port_infos;
+
+  /* Hash table from network-byte-order port to port info index. */
+  uword *port_info_by_port;
+
+  /* Hash table mapping TCP/UDP name to port info index. */
+  uword *port_info_by_name;
+} ip_main_t;
+
+extern ip_main_t ip_main;
+
+clib_error_t *ip_main_init (vlib_main_t * vm);
+
+static inline ip_protocol_info_t *
+ip_get_protocol_info (ip_main_t * im, u32 protocol)
+{
+  uword *p;
+
+  p = hash_get (im->protocol_info_by_protocol, protocol);
+  return p ? vec_elt_at_index (im->protocol_infos, p[0]) : 0;
+}
+
+static inline tcp_udp_port_info_t *
+ip_get_tcp_udp_port_info (ip_main_t * im, u32 port)
+{
+  uword *p;
+
+  p = hash_get (im->port_info_by_port, port);
+  return p ? vec_elt_at_index (im->port_infos, p[0]) : 0;
+}
+
+always_inline ip_csum_t
+ip_incremental_checksum_buffer (vlib_main_t * vm,
+				vlib_buffer_t * first_buffer,
+				u32 first_buffer_offset,
+				u32 n_bytes_to_checksum, ip_csum_t sum)
+{
+  vlib_buffer_t *b = first_buffer;
+  u32 n_bytes_left = n_bytes_to_checksum;
+  ASSERT (b->current_length >= first_buffer_offset);
+  void *h;
+  u32 n;
+
+  n = clib_min (n_bytes_left, b->current_length);
+  h = vlib_buffer_get_current (b) + first_buffer_offset;
+  sum = ip_incremental_checksum (sum, h, n);
+  if (PREDICT_FALSE (b->flags & VLIB_BUFFER_NEXT_PRESENT))
+    {
+      while (1)
+	{
+	  n_bytes_left -= n;
+	  if (n_bytes_left == 0)
+	    break;
+	  b = vlib_get_buffer (vm, b->next_buffer);
+	  n = clib_min (n_bytes_left, b->current_length);
+	  h = vlib_buffer_get_current (b);
+	  sum = ip_incremental_checksum (sum, h, n);
+	}
+    }
+
+  return sum;
+}
+
+void ip_del_all_interface_addresses (vlib_main_t * vm, u32 sw_if_index);
+
+extern vlib_node_registration_t ip4_inacl_node;
+extern vlib_node_registration_t ip6_inacl_node;
+
+#endif /* included_ip_main_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip4.h b/src/vnet/ip/ip4.h
new file mode 100644
index 00000000..0331c445
--- /dev/null
+++ b/src/vnet/ip/ip4.h
@@ -0,0 +1,322 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip4.h: ip4 main include file
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_ip_ip4_h
+#define included_ip_ip4_h
+
+#include <vnet/ip/ip4_mtrie.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/lookup.h>
+#include <vnet/feature/feature.h>
+
+typedef struct ip4_fib_t
+{
+  /* Hash table for each prefix length mapping. */
+  uword *fib_entry_by_dst_address[33];
+
+  /* Mtrie for fast lookups.  Hash is used to maintain overlapping prefixes. */
+  ip4_fib_mtrie_t mtrie;
+
+  /* Table ID (hash key) for this FIB. */
+  u32 table_id;
+
+  /* Index into FIB vector. */
+  u32 index;
+
+  /* flow hash configuration */
+  flow_hash_config_t flow_hash_config;
+
+  /* N-tuple classifier indices */
+  u32 fwd_classify_table_index;
+  u32 rev_classify_table_index;
+
+} ip4_fib_t;
+
+struct ip4_main_t;
+
+typedef void (ip4_add_del_interface_address_function_t)
+  (struct ip4_main_t * im,
+   uword opaque,
+   u32 sw_if_index,
+   ip4_address_t * address,
+   u32 address_length, u32 if_address_index, u32 is_del);
+
+typedef struct
+{
+  ip4_add_del_interface_address_function_t *function;
+  uword function_opaque;
+} ip4_add_del_interface_address_callback_t;
+
+/**
+ * @brief IPv4 main type.
+ *
+ * State of IPv4 VPP processing including:
+ * - FIBs
+ * - Feature indices used in feature topological sort
+ * - Feature node run time references
+ */
+
+typedef struct ip4_main_t
+{
+  ip_lookup_main_t lookup_main;
+
+  /** Vector of FIBs. */
+  struct fib_table_t_ *fibs;
+
+  u32 fib_masks[33];
+
+  /** Table index indexed by software interface. */
+  u32 *fib_index_by_sw_if_index;
+
+  /* IP4 enabled count by software interface */
+  u8 *ip_enabled_by_sw_if_index;
+
+  /** Hash table mapping table id to fib index.
+     ID space is not necessarily dense; index space is dense. */
+  uword *fib_index_by_table_id;
+
+  /** Functions to call when interface address changes. */
+    ip4_add_del_interface_address_callback_t
+    * add_del_interface_address_callbacks;
+
+  /** Template used to generate IP4 ARP packets. */
+  vlib_packet_template_t ip4_arp_request_packet_template;
+
+  /** Seed for Jenkins hash used to compute ip4 flow hash. */
+  u32 flow_hash_seed;
+
+  /** @brief Template information for VPP generated packets */
+  struct
+  {
+    /** TTL to use for host generated packets. */
+    u8 ttl;
+
+    /** TOS byte to use for host generated packets. */
+    u8 tos;
+
+    u8 pad[2];
+  } host_config;
+} ip4_main_t;
+
+/** Global ip4 main structure. */
+extern ip4_main_t ip4_main;
+
+/** Global ip4 input node.  Errors get attached to ip4 input node. */
+extern vlib_node_registration_t ip4_input_node;
+extern vlib_node_registration_t ip4_lookup_node;
+extern vlib_node_registration_t ip4_rewrite_node;
+extern vlib_node_registration_t ip4_rewrite_local_node;
+extern vlib_node_registration_t ip4_arp_node;
+extern vlib_node_registration_t ip4_glean_node;
+extern vlib_node_registration_t ip4_midchain_node;
+
+always_inline uword
+ip4_destination_matches_route (const ip4_main_t * im,
+			       const ip4_address_t * key,
+			       const ip4_address_t * dest, uword dest_length)
+{
+  return 0 == ((key->data_u32 ^ dest->data_u32) & im->fib_masks[dest_length]);
+}
+
+always_inline uword
+ip4_destination_matches_interface (ip4_main_t * im,
+				   ip4_address_t * key,
+				   ip_interface_address_t * ia)
+{
+  ip4_address_t *a = ip_interface_address_get_address (&im->lookup_main, ia);
+  return ip4_destination_matches_route (im, key, a, ia->address_length);
+}
+
+/* As above but allows for unaligned destinations (e.g. works right from IP header of packet). */
+always_inline uword
+ip4_unaligned_destination_matches_route (ip4_main_t * im,
+					 ip4_address_t * key,
+					 ip4_address_t * dest,
+					 uword dest_length)
+{
+  return 0 ==
+    ((clib_mem_unaligned (&key->data_u32, u32) ^ dest->
+      data_u32) & im->fib_masks[dest_length]);
+}
+
+always_inline int
+ip4_src_address_for_packet (ip_lookup_main_t * lm,
+			    u32 sw_if_index, ip4_address_t * src)
+{
+  u32 if_add_index = lm->if_address_pool_index_by_sw_if_index[sw_if_index];
+  if (PREDICT_TRUE (if_add_index != ~0))
+    {
+      ip_interface_address_t *if_add =
+	pool_elt_at_index (lm->if_address_pool, if_add_index);
+      ip4_address_t *if_ip = ip_interface_address_get_address (lm, if_add);
+      *src = *if_ip;
+      return 0;
+    }
+  else
+    {
+      ASSERT (0);
+      src->as_u32 = 0;
+    }
+  return (!0);
+}
+
+/* Find interface address which matches destination. */
+always_inline ip4_address_t *
+ip4_interface_address_matching_destination (ip4_main_t * im,
+					    ip4_address_t * dst,
+					    u32 sw_if_index,
+					    ip_interface_address_t **
+					    result_ia)
+{
+  ip_lookup_main_t *lm = &im->lookup_main;
+  ip_interface_address_t *ia;
+  ip4_address_t *result = 0;
+
+  /* *INDENT-OFF* */
+  foreach_ip_interface_address (lm, ia, sw_if_index,
+                                1 /* honor unnumbered */,
+  ({
+    ip4_address_t * a = ip_interface_address_get_address (lm, ia);
+    if (ip4_destination_matches_route (im, dst, a, ia->address_length))
+      {
+	result = a;
+	break;
+      }
+  }));
+  /* *INDENT-ON* */
+  if (result_ia)
+    *result_ia = result ? ia : 0;
+  return result;
+}
+
+ip4_address_t *ip4_interface_first_address (ip4_main_t * im, u32 sw_if_index,
+					    ip_interface_address_t **
+					    result_ia);
+
+clib_error_t *ip4_add_del_interface_address (vlib_main_t * vm,
+					     u32 sw_if_index,
+					     ip4_address_t * address,
+					     u32 address_length, u32 is_del);
+
+void ip4_sw_interface_enable_disable (u32 sw_if_index, u32 is_enable);
+
+int ip4_address_compare (ip4_address_t * a1, ip4_address_t * a2);
+
+/* Send an ARP request to see if given destination is reachable on given interface. */
+clib_error_t *ip4_probe_neighbor (vlib_main_t * vm, ip4_address_t * dst,
+				  u32 sw_if_index);
+
+clib_error_t *ip4_set_arp_limit (u32 arp_limit);
+
+uword
+ip4_udp_register_listener (vlib_main_t * vm,
+			   u16 dst_port, u32 next_node_index);
+
+void
+ip4_icmp_register_type (vlib_main_t * vm, icmp4_type_t type, u32 node_index);
+
+u16 ip4_tcp_udp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0,
+				  ip4_header_t * ip0);
+
+void ip4_register_protocol (u32 protocol, u32 node_index);
+
+serialize_function_t serialize_vnet_ip4_main, unserialize_vnet_ip4_main;
+
+int vnet_set_ip4_flow_hash (u32 table_id,
+			    flow_hash_config_t flow_hash_config);
+
+void ip4_mtrie_init (ip4_fib_mtrie_t * m);
+
+int vnet_set_ip4_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
+				 u32 table_index);
+
+/* Compute flow hash.  We'll use it to select which adjacency to use for this
+   flow.  And other things. */
+always_inline u32
+ip4_compute_flow_hash (const ip4_header_t * ip,
+		       flow_hash_config_t flow_hash_config)
+{
+  tcp_header_t *tcp = (void *) (ip + 1);
+  u32 a, b, c, t1, t2;
+  uword is_tcp_udp = (ip->protocol == IP_PROTOCOL_TCP
+		      || ip->protocol == IP_PROTOCOL_UDP);
+
+  t1 = (flow_hash_config & IP_FLOW_HASH_SRC_ADDR)
+    ? ip->src_address.data_u32 : 0;
+  t2 = (flow_hash_config & IP_FLOW_HASH_DST_ADDR)
+    ? ip->dst_address.data_u32 : 0;
+
+  a = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ? t2 : t1;
+  b = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ? t1 : t2;
+  b ^= (flow_hash_config & IP_FLOW_HASH_PROTO) ? ip->protocol : 0;
+
+  t1 = is_tcp_udp ? tcp->ports.src : 0;
+  t2 = is_tcp_udp ? tcp->ports.dst : 0;
+
+  t1 = (flow_hash_config & IP_FLOW_HASH_SRC_PORT) ? t1 : 0;
+  t2 = (flow_hash_config & IP_FLOW_HASH_DST_PORT) ? t2 : 0;
+
+  c = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ?
+    (t1 << 16) | t2 : (t2 << 16) | t1;
+
+  hash_v3_mix32 (a, b, c);
+  hash_v3_finalize32 (a, b, c);
+
+  return c;
+}
+
+void
+ip4_forward_next_trace (vlib_main_t * vm,
+			vlib_node_runtime_t * node,
+			vlib_frame_t * frame,
+			vlib_rx_or_tx_t which_adj_index);
+
+u8 *format_ip4_forward_next_trace (u8 * s, va_list * args);
+
+u32 ip4_tcp_udp_validate_checksum (vlib_main_t * vm, vlib_buffer_t * p0);
+
+#endif /* included_ip_ip4_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip46_cli.c b/src/vnet/ip/ip46_cli.c
new file mode 100644
index 00000000..ce1ffa62
--- /dev/null
+++ b/src/vnet/ip/ip46_cli.c
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip4_cli.c: ip4 commands
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+
+/**
+ * @file
+ * @brief Set IP Address.
+ *
+ * Configure an IPv4 or IPv6 address for on an interface.
+ */
+
+
+int
+ip4_address_compare (ip4_address_t * a1, ip4_address_t * a2)
+{
+  return clib_net_to_host_u32 (a1->data_u32) -
+    clib_net_to_host_u32 (a2->data_u32);
+}
+
+int
+ip6_address_compare (ip6_address_t * a1, ip6_address_t * a2)
+{
+  int i;
+  for (i = 0; i < ARRAY_LEN (a1->as_u16); i++)
+    {
+      int cmp =
+	clib_net_to_host_u16 (a1->as_u16[i]) -
+	clib_net_to_host_u16 (a2->as_u16[i]);
+      if (cmp != 0)
+	return cmp;
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_ip_command, static) = {
+  .path = "set interface ip",
+  .short_help = "IP4/IP6 commands",
+};
+/* *INDENT-ON* */
+
+void
+ip_del_all_interface_addresses (vlib_main_t * vm, u32 sw_if_index)
+{
+  ip4_main_t *im4 = &ip4_main;
+  ip4_address_t *ip4_addrs = 0;
+  u32 *ip4_masks = 0;
+  ip6_main_t *im6 = &ip6_main;
+  ip6_address_t *ip6_addrs = 0;
+  u32 *ip6_masks = 0;
+  ip_interface_address_t *ia;
+  int i;
+
+  /* *INDENT-OFF* */
+  foreach_ip_interface_address (&im4->lookup_main, ia, sw_if_index,
+                                0 /* honor unnumbered */,
+  ({
+    ip4_address_t * x = (ip4_address_t *)
+      ip_interface_address_get_address (&im4->lookup_main, ia);
+    vec_add1 (ip4_addrs, x[0]);
+    vec_add1 (ip4_masks, ia->address_length);
+  }));
+  /* *INDENT-ON* */
+
+  /* *INDENT-OFF* */
+  foreach_ip_interface_address (&im6->lookup_main, ia, sw_if_index,
+                                0 /* honor unnumbered */,
+  ({
+    ip6_address_t * x = (ip6_address_t *)
+      ip_interface_address_get_address (&im6->lookup_main, ia);
+    vec_add1 (ip6_addrs, x[0]);
+    vec_add1 (ip6_masks, ia->address_length);
+  }));
+  /* *INDENT-ON* */
+
+  for (i = 0; i < vec_len (ip4_addrs); i++)
+    ip4_add_del_interface_address (vm, sw_if_index, &ip4_addrs[i],
+				   ip4_masks[i], 1 /* is_del */ );
+  for (i = 0; i < vec_len (ip6_addrs); i++)
+    ip6_add_del_interface_address (vm, sw_if_index, &ip6_addrs[i],
+				   ip6_masks[i], 1 /* is_del */ );
+
+  vec_free (ip4_addrs);
+  vec_free (ip4_masks);
+  vec_free (ip6_addrs);
+  vec_free (ip6_masks);
+}
+
+static clib_error_t *
+ip_address_delete_cleanup (vnet_main_t * vnm, u32 hw_if_index, u32 is_create)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vnet_hw_interface_t *hw;
+
+  if (is_create)
+    return 0;
+
+  hw = vnet_get_hw_interface (vnm, hw_if_index);
+
+  ip_del_all_interface_addresses (vm, hw->sw_if_index);
+  return 0;
+}
+
+VNET_HW_INTERFACE_ADD_DEL_FUNCTION (ip_address_delete_cleanup);
+
+static clib_error_t *
+add_del_ip_address (vlib_main_t * vm,
+		    unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip4_address_t a4;
+  ip6_address_t a6;
+  clib_error_t *error = 0;
+  u32 sw_if_index, length, is_del;
+
+  sw_if_index = ~0;
+  is_del = 0;
+
+  if (unformat (input, "del"))
+    is_del = 1;
+
+  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  if (is_del && unformat (input, "all"))
+    ip_del_all_interface_addresses (vm, sw_if_index);
+  else if (unformat (input, "%U/%d", unformat_ip4_address, &a4, &length))
+    error = ip4_add_del_interface_address (vm, sw_if_index, &a4, length,
+					   is_del);
+  else if (unformat (input, "%U/%d", unformat_ip6_address, &a6, &length))
+    error = ip6_add_del_interface_address (vm, sw_if_index, &a6, length,
+					   is_del);
+  else
+    {
+      error = clib_error_return (0, "expected IP4/IP6 address/length `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+
+done:
+  return error;
+}
+
+/*?
+ * Add an IP Address to an interface or remove and IP Address from an interface.
+ * The IP Address can be an IPv4 or an IPv6 address. Interfaces may have multiple
+ * IPv4 and IPv6 addresses. There is no concept of primary vs. secondary
+ * interface addresses; they're just addresses.
+ *
+ * To display the addresses associated with a given interface, use the command
+ * '<em>show interface address <interface></em>'.
+ *
+ * Note that the debug CLI does not enforce classful mask-width / addressing
+ * constraints.
+ *
+ * @cliexpar
+ * @parblock
+ * An example of how to add an IPv4 address to an interface:
+ * @cliexcmd{set interface ip address GigabitEthernet2/0/0 172.16.2.12/24}
+ *
+ * An example of how to add an IPv6 address to an interface:
+ * @cliexcmd{set interface ip address GigabitEthernet2/0/0 @::a:1:1:0:7/126}
+ *
+ * To delete a specific interface ip address:
+ * @cliexcmd{set interface ip address GigabitEthernet2/0/0 172.16.2.12/24 del}
+ *
+ * To delete all interfaces addresses (IPv4 and IPv6):
+ * @cliexcmd{set interface ip address GigabitEthernet2/0/0 del all}
+ * @endparblock
+ ?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_ip_address_command, static) = {
+  .path = "set interface ip address",
+  .function = add_del_ip_address,
+  .short_help = "set interface ip address <interface> [<ip-addr>/<mask> [del]] | [del all]",
+};
+/* *INDENT-ON* */
+
+/* Dummy init function to get us linked in. */
+static clib_error_t *
+ip4_cli_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ip4_cli_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip4_error.h b/src/vnet/ip/ip4_error.h
new file mode 100644
index 00000000..95d12ec2
--- /dev/null
+++ b/src/vnet/ip/ip4_error.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip4_error.h: ip4 fast path errors
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_ip_ip4_error_h
+#define included_ip_ip4_error_h
+
+#define foreach_ip4_error						\
+  /* Must be first. */							\
+  _ (NONE, "valid ip4 packets")						\
+									\
+  /* Errors signalled by ip4-input */					\
+  _ (TOO_SHORT, "ip4 length < 20 bytes")				\
+  _ (BAD_LENGTH, "ip4 length > l2 length")				\
+  _ (BAD_CHECKSUM, "bad ip4 checksum")					\
+  _ (VERSION, "ip4 version != 4")					\
+  _ (OPTIONS, "ip4 options present")					\
+  _ (FRAGMENT_OFFSET_ONE, "ip4 fragment offset == 1")			\
+  _ (TIME_EXPIRED, "ip4 ttl <= 1")					\
+									\
+  /* Errors signalled by ip4-rewrite. */				\
+  _ (MTU_EXCEEDED, "ip4 MTU exceeded and DF set")			\
+  _ (DST_LOOKUP_MISS, "ip4 destination lookup miss")			\
+  _ (SRC_LOOKUP_MISS, "ip4 source lookup miss")				\
+  _ (ADJACENCY_DROP, "ip4 adjacency drop")				\
+  _ (ADJACENCY_PUNT, "ip4 adjacency punt")				\
+									\
+  /* Errors signalled by ip4-local. */					\
+  _ (UNKNOWN_PROTOCOL, "unknown ip protocol")				\
+  _ (TCP_CHECKSUM, "bad tcp checksum")					\
+  _ (UDP_CHECKSUM, "bad udp checksum")					\
+  _ (UDP_LENGTH, "inconsistent udp/ip lengths")				\
+									\
+  /* Errors signalled by ip4-source-check. */				\
+  _ (UNICAST_SOURCE_CHECK_FAILS, "ip4 unicast source check fails")	\
+                                                                        \
+  /* Spoofed packets in ip4-rewrite-local */                            \
+  _(SPOOFED_LOCAL_PACKETS, "ip4 spoofed local-address packet drops")    \
+                                                                        \
+  /* Errors singalled by ip4-inacl */                                   \
+  _ (INACL_TABLE_MISS, "input ACL table-miss drops")                    \
+  _ (INACL_SESSION_DENY, "input ACL session deny drops")
+
+typedef enum
+{
+#define _(sym,str) IP4_ERROR_##sym,
+  foreach_ip4_error
+#undef _
+    IP4_N_ERROR,
+} ip4_error_t;
+
+#endif /* included_ip_ip4_error_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip4_format.c b/src/vnet/ip/ip4_format.c
new file mode 100644
index 00000000..c803e065
--- /dev/null
+++ b/src/vnet/ip/ip4_format.c
@@ -0,0 +1,256 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip4_format.c: ip4 formatting
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+
+/* Format an IP4 address. */
+u8 *
+format_ip4_address (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
+}
+
+/* Format an IP4 route destination and length. */
+u8 *
+format_ip4_address_and_length (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  u8 l = va_arg (*args, u32);
+  return format (s, "%U/%d", format_ip4_address, a, l);
+}
+
+/* Parse an IP4 address %d.%d.%d.%d. */
+uword
+unformat_ip4_address (unformat_input_t * input, va_list * args)
+{
+  u8 *result = va_arg (*args, u8 *);
+  unsigned a[4];
+
+  if (!unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]))
+    return 0;
+
+  if (a[0] >= 256 || a[1] >= 256 || a[2] >= 256 || a[3] >= 256)
+    return 0;
+
+  result[0] = a[0];
+  result[1] = a[1];
+  result[2] = a[2];
+  result[3] = a[3];
+
+  return 1;
+}
+
+/* Format an IP4 header. */
+u8 *
+format_ip4_header (u8 * s, va_list * args)
+{
+  ip4_header_t *ip = va_arg (*args, ip4_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+  u32 ip_version, header_bytes;
+  uword indent;
+
+  /* Nothing to do. */
+  if (max_header_bytes < sizeof (ip[0]))
+    return format (s, "IP header truncated");
+
+  indent = format_get_indent (s);
+  indent += 2;
+
+  ip_version = (ip->ip_version_and_header_length >> 4);
+  header_bytes = (ip->ip_version_and_header_length & 0xf) * sizeof (u32);
+
+  s = format (s, "%U: %U -> %U",
+	      format_ip_protocol, ip->protocol,
+	      format_ip4_address, ip->src_address.data,
+	      format_ip4_address, ip->dst_address.data);
+
+  /* Show IP version and header length only with unexpected values. */
+  if (ip_version != 4 || header_bytes != sizeof (ip4_header_t))
+    s = format (s, "\n%Uversion %d, header length %d",
+		format_white_space, indent, ip_version, header_bytes);
+
+  s = format (s, "\n%Utos 0x%02x, ttl %d, length %d, checksum 0x%04x",
+	      format_white_space, indent,
+	      ip->tos, ip->ttl,
+	      clib_net_to_host_u16 (ip->length),
+	      clib_net_to_host_u16 (ip->checksum));
+
+  /* Check and report invalid checksums. */
+  {
+    u16 c = ip4_header_checksum (ip);
+    if (c != ip->checksum)
+      s = format (s, " (should be 0x%04x)", clib_net_to_host_u16 (c));
+  }
+
+  {
+    u32 f = clib_net_to_host_u16 (ip->flags_and_fragment_offset);
+    u32 o;
+
+    s = format (s, "\n%Ufragment id 0x%04x",
+		format_white_space, indent,
+		clib_net_to_host_u16 (ip->fragment_id));
+
+    /* Fragment offset. */
+    o = 8 * (f & 0x1fff);
+    f ^= o;
+    if (o != 0)
+      s = format (s, " offset %d", o);
+
+    if (f != 0)
+      {
+	s = format (s, ", flags ");
+#define _(l) if (f & IP4_HEADER_FLAG_##l) s = format (s, #l);
+	_(MORE_FRAGMENTS);
+	_(DONT_FRAGMENT);
+	_(CONGESTION);
+#undef _
+      }
+  }
+
+  /* Recurse into next protocol layer. */
+  if (max_header_bytes != 0 && header_bytes < max_header_bytes)
+    {
+      ip_main_t *im = &ip_main;
+      ip_protocol_info_t *pi = ip_get_protocol_info (im, ip->protocol);
+
+      if (pi && pi->format_header)
+	s = format (s, "\n%U%U",
+		    format_white_space, indent - 2, pi->format_header,
+		    /* next protocol header */ (void *) ip + header_bytes,
+		    max_header_bytes - header_bytes);
+    }
+
+  return s;
+}
+
+/* Parse an IP4 header. */
+uword
+unformat_ip4_header (unformat_input_t * input, va_list * args)
+{
+  u8 **result = va_arg (*args, u8 **);
+  ip4_header_t *ip;
+  int old_length;
+
+  /* Allocate space for IP header. */
+  {
+    void *p;
+
+    old_length = vec_len (*result);
+    vec_add2 (*result, p, sizeof (ip4_header_t));
+    ip = p;
+  }
+
+  memset (ip, 0, sizeof (ip[0]));
+  ip->ip_version_and_header_length = IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
+
+  if (!unformat (input, "%U: %U -> %U",
+		 unformat_ip_protocol, &ip->protocol,
+		 unformat_ip4_address, &ip->src_address,
+		 unformat_ip4_address, &ip->dst_address))
+    return 0;
+
+  /* Parse options. */
+  while (1)
+    {
+      int i, j;
+
+      if (unformat (input, "tos %U", unformat_vlib_number, &i))
+	ip->tos = i;
+
+      else if (unformat (input, "ttl %U", unformat_vlib_number, &i))
+	ip->ttl = i;
+
+      else if (unformat (input, "fragment id %U offset %U",
+			 unformat_vlib_number, &i, unformat_vlib_number, &j))
+	{
+	  ip->fragment_id = clib_host_to_net_u16 (i);
+	  ip->flags_and_fragment_offset |=
+	    clib_host_to_net_u16 ((i / 8) & 0x1fff);
+	}
+
+      /* Flags. */
+      else if (unformat (input, "mf") || unformat (input, "MF"))
+	ip->flags_and_fragment_offset |=
+	  clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS);
+
+      else if (unformat (input, "df") || unformat (input, "DF"))
+	ip->flags_and_fragment_offset |=
+	  clib_host_to_net_u16 (IP4_HEADER_FLAG_DONT_FRAGMENT);
+
+      else if (unformat (input, "ce") || unformat (input, "CE"))
+	ip->flags_and_fragment_offset |=
+	  clib_host_to_net_u16 (IP4_HEADER_FLAG_CONGESTION);
+
+      /* Can't parse input: try next protocol level. */
+      else
+	break;
+    }
+
+  /* Fill in checksum. */
+  ip->checksum = ip4_header_checksum (ip);
+
+  /* Recurse into next protocol layer. */
+  {
+    ip_main_t *im = &ip_main;
+    ip_protocol_info_t *pi = ip_get_protocol_info (im, ip->protocol);
+
+    if (pi && pi->unformat_header)
+      {
+	if (!unformat_user (input, pi->unformat_header, result))
+	  return 0;
+
+	/* Result may have moved. */
+	ip = (void *) *result + old_length;
+      }
+  }
+
+  /* Fill in IP length. */
+  ip->length = clib_host_to_net_u16 (vec_len (*result) - old_length);
+
+  return 1;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c
new file mode 100644
index 00000000..6e91b9e9
--- /dev/null
+++ b/src/vnet/ip/ip4_forward.c
@@ -0,0 +1,3345 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip4_forward.c: IP v4 forwarding
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>	/* for ethernet_header_t */
+#include <vnet/ethernet/arp_packet.h>	/* for ethernet_arp_header_t */
+#include <vnet/ppp/ppp.h>
+#include <vnet/srp/srp.h>	/* for srp_hw_interface_class */
+#include <vnet/api_errno.h>	/* for API error numbers */
+#include <vnet/fib/fib_table.h>	/* for FIB table and entry creation */
+#include <vnet/fib/fib_entry.h>	/* for FIB table and entry creation */
+#include <vnet/fib/fib_urpf_list.h>	/* for FIB uRPF check */
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/dpo/load_balance.h>
+#include <vnet/dpo/classify_dpo.h>
+
+/**
+ * @file
+ * @brief IPv4 Forwarding.
+ *
+ * This file contains the source code for IPv4 forwarding.
+ */
+
+void
+ip4_forward_next_trace (vlib_main_t * vm,
+			vlib_node_runtime_t * node,
+			vlib_frame_t * frame,
+			vlib_rx_or_tx_t which_adj_index);
+
+always_inline uword
+ip4_lookup_inline (vlib_main_t * vm,
+		   vlib_node_runtime_t * node,
+		   vlib_frame_t * frame,
+		   int lookup_for_responses_to_locally_received_packets)
+{
+  ip4_main_t *im = &ip4_main;
+  vlib_combined_counter_main_t *cm = &load_balance_main.lbm_to_counters;
+  u32 n_left_from, n_left_to_next, *from, *to_next;
+  ip_lookup_next_t next;
+  u32 cpu_index = os_get_cpu_number ();
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
+
+      while (n_left_from >= 8 && n_left_to_next >= 4)
+	{
+	  vlib_buffer_t *p0, *p1, *p2, *p3;
+	  ip4_header_t *ip0, *ip1, *ip2, *ip3;
+	  __attribute__ ((unused)) tcp_header_t *tcp0, *tcp1, *tcp2, *tcp3;
+	  ip_lookup_next_t next0, next1, next2, next3;
+	  const load_balance_t *lb0, *lb1, *lb2, *lb3;
+	  ip4_fib_mtrie_t *mtrie0, *mtrie1, *mtrie2, *mtrie3;
+	  ip4_fib_mtrie_leaf_t leaf0, leaf1, leaf2, leaf3;
+	  ip4_address_t *dst_addr0, *dst_addr1, *dst_addr2, *dst_addr3;
+	  __attribute__ ((unused)) u32 pi0, fib_index0, lb_index0,
+	    is_tcp_udp0;
+	  __attribute__ ((unused)) u32 pi1, fib_index1, lb_index1,
+	    is_tcp_udp1;
+	  __attribute__ ((unused)) u32 pi2, fib_index2, lb_index2,
+	    is_tcp_udp2;
+	  __attribute__ ((unused)) u32 pi3, fib_index3, lb_index3,
+	    is_tcp_udp3;
+	  flow_hash_config_t flow_hash_config0, flow_hash_config1;
+	  flow_hash_config_t flow_hash_config2, flow_hash_config3;
+	  u32 hash_c0, hash_c1, hash_c2, hash_c3;
+	  const dpo_id_t *dpo0, *dpo1, *dpo2, *dpo3;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p4, *p5, *p6, *p7;
+
+	    p4 = vlib_get_buffer (vm, from[4]);
+	    p5 = vlib_get_buffer (vm, from[5]);
+	    p6 = vlib_get_buffer (vm, from[6]);
+	    p7 = vlib_get_buffer (vm, from[7]);
+
+	    vlib_prefetch_buffer_header (p4, LOAD);
+	    vlib_prefetch_buffer_header (p5, LOAD);
+	    vlib_prefetch_buffer_header (p6, LOAD);
+	    vlib_prefetch_buffer_header (p7, LOAD);
+
+	    CLIB_PREFETCH (p4->data, sizeof (ip0[0]), LOAD);
+	    CLIB_PREFETCH (p5->data, sizeof (ip0[0]), LOAD);
+	    CLIB_PREFETCH (p6->data, sizeof (ip0[0]), LOAD);
+	    CLIB_PREFETCH (p7->data, sizeof (ip0[0]), LOAD);
+	  }
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+	  pi2 = to_next[2] = from[2];
+	  pi3 = to_next[3] = from[3];
+
+	  from += 4;
+	  to_next += 4;
+	  n_left_to_next -= 4;
+	  n_left_from -= 4;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+	  p2 = vlib_get_buffer (vm, pi2);
+	  p3 = vlib_get_buffer (vm, pi3);
+
+	  ip0 = vlib_buffer_get_current (p0);
+	  ip1 = vlib_buffer_get_current (p1);
+	  ip2 = vlib_buffer_get_current (p2);
+	  ip3 = vlib_buffer_get_current (p3);
+
+	  dst_addr0 = &ip0->dst_address;
+	  dst_addr1 = &ip1->dst_address;
+	  dst_addr2 = &ip2->dst_address;
+	  dst_addr3 = &ip3->dst_address;
+
+	  fib_index0 =
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+	  fib_index1 =
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (p1)->sw_if_index[VLIB_RX]);
+	  fib_index2 =
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (p2)->sw_if_index[VLIB_RX]);
+	  fib_index3 =
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (p3)->sw_if_index[VLIB_RX]);
+	  fib_index0 =
+	    (vnet_buffer (p0)->sw_if_index[VLIB_TX] ==
+	     (u32) ~ 0) ? fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
+	  fib_index1 =
+	    (vnet_buffer (p1)->sw_if_index[VLIB_TX] ==
+	     (u32) ~ 0) ? fib_index1 : vnet_buffer (p1)->sw_if_index[VLIB_TX];
+	  fib_index2 =
+	    (vnet_buffer (p2)->sw_if_index[VLIB_TX] ==
+	     (u32) ~ 0) ? fib_index2 : vnet_buffer (p2)->sw_if_index[VLIB_TX];
+	  fib_index3 =
+	    (vnet_buffer (p3)->sw_if_index[VLIB_TX] ==
+	     (u32) ~ 0) ? fib_index3 : vnet_buffer (p3)->sw_if_index[VLIB_TX];
+
+
+	  if (!lookup_for_responses_to_locally_received_packets)
+	    {
+	      mtrie0 = &ip4_fib_get (fib_index0)->mtrie;
+	      mtrie1 = &ip4_fib_get (fib_index1)->mtrie;
+	      mtrie2 = &ip4_fib_get (fib_index2)->mtrie;
+	      mtrie3 = &ip4_fib_get (fib_index3)->mtrie;
+
+	      leaf0 = leaf1 = leaf2 = leaf3 = IP4_FIB_MTRIE_LEAF_ROOT;
+
+	      leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 0);
+	      leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, dst_addr1, 0);
+	      leaf2 = ip4_fib_mtrie_lookup_step (mtrie2, leaf2, dst_addr2, 0);
+	      leaf3 = ip4_fib_mtrie_lookup_step (mtrie3, leaf3, dst_addr3, 0);
+	    }
+
+	  tcp0 = (void *) (ip0 + 1);
+	  tcp1 = (void *) (ip1 + 1);
+	  tcp2 = (void *) (ip2 + 1);
+	  tcp3 = (void *) (ip3 + 1);
+
+	  is_tcp_udp0 = (ip0->protocol == IP_PROTOCOL_TCP
+			 || ip0->protocol == IP_PROTOCOL_UDP);
+	  is_tcp_udp1 = (ip1->protocol == IP_PROTOCOL_TCP
+			 || ip1->protocol == IP_PROTOCOL_UDP);
+	  is_tcp_udp2 = (ip2->protocol == IP_PROTOCOL_TCP
+			 || ip2->protocol == IP_PROTOCOL_UDP);
+	  is_tcp_udp3 = (ip1->protocol == IP_PROTOCOL_TCP
+			 || ip1->protocol == IP_PROTOCOL_UDP);
+
+	  if (!lookup_for_responses_to_locally_received_packets)
+	    {
+	      leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 1);
+	      leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, dst_addr1, 1);
+	      leaf2 = ip4_fib_mtrie_lookup_step (mtrie2, leaf2, dst_addr2, 1);
+	      leaf3 = ip4_fib_mtrie_lookup_step (mtrie3, leaf3, dst_addr3, 1);
+	    }
+
+	  if (!lookup_for_responses_to_locally_received_packets)
+	    {
+	      leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 2);
+	      leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, dst_addr1, 2);
+	      leaf2 = ip4_fib_mtrie_lookup_step (mtrie2, leaf2, dst_addr2, 2);
+	      leaf3 = ip4_fib_mtrie_lookup_step (mtrie3, leaf3, dst_addr3, 2);
+	    }
+
+	  if (!lookup_for_responses_to_locally_received_packets)
+	    {
+	      leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 3);
+	      leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, dst_addr1, 3);
+	      leaf2 = ip4_fib_mtrie_lookup_step (mtrie2, leaf2, dst_addr2, 3);
+	      leaf3 = ip4_fib_mtrie_lookup_step (mtrie3, leaf3, dst_addr3, 3);
+	    }
+
+	  if (lookup_for_responses_to_locally_received_packets)
+	    {
+	      lb_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_RX];
+	      lb_index1 = vnet_buffer (p1)->ip.adj_index[VLIB_RX];
+	      lb_index2 = vnet_buffer (p2)->ip.adj_index[VLIB_RX];
+	      lb_index3 = vnet_buffer (p3)->ip.adj_index[VLIB_RX];
+	    }
+	  else
+	    {
+	      /* Handle default route. */
+	      leaf0 =
+		(leaf0 ==
+		 IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie0->default_leaf : leaf0);
+	      leaf1 =
+		(leaf1 ==
+		 IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie1->default_leaf : leaf1);
+	      leaf2 =
+		(leaf2 ==
+		 IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie2->default_leaf : leaf2);
+	      leaf3 =
+		(leaf3 ==
+		 IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie3->default_leaf : leaf3);
+	      lb_index0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
+	      lb_index1 = ip4_fib_mtrie_leaf_get_adj_index (leaf1);
+	      lb_index2 = ip4_fib_mtrie_leaf_get_adj_index (leaf2);
+	      lb_index3 = ip4_fib_mtrie_leaf_get_adj_index (leaf3);
+	    }
+
+	  lb0 = load_balance_get (lb_index0);
+	  lb1 = load_balance_get (lb_index1);
+	  lb2 = load_balance_get (lb_index2);
+	  lb3 = load_balance_get (lb_index3);
+
+	  /* Use flow hash to compute multipath adjacency. */
+	  hash_c0 = vnet_buffer (p0)->ip.flow_hash = 0;
+	  hash_c1 = vnet_buffer (p1)->ip.flow_hash = 0;
+	  hash_c2 = vnet_buffer (p2)->ip.flow_hash = 0;
+	  hash_c3 = vnet_buffer (p3)->ip.flow_hash = 0;
+	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
+	    {
+	      flow_hash_config0 = lb0->lb_hash_config;
+	      hash_c0 = vnet_buffer (p0)->ip.flow_hash =
+		ip4_compute_flow_hash (ip0, flow_hash_config0);
+	    }
+	  if (PREDICT_FALSE (lb1->lb_n_buckets > 1))
+	    {
+	      flow_hash_config1 = lb1->lb_hash_config;
+	      hash_c1 = vnet_buffer (p1)->ip.flow_hash =
+		ip4_compute_flow_hash (ip1, flow_hash_config1);
+	    }
+	  if (PREDICT_FALSE (lb2->lb_n_buckets > 1))
+	    {
+	      flow_hash_config2 = lb2->lb_hash_config;
+	      hash_c2 = vnet_buffer (p2)->ip.flow_hash =
+		ip4_compute_flow_hash (ip2, flow_hash_config2);
+	    }
+	  if (PREDICT_FALSE (lb3->lb_n_buckets > 1))
+	    {
+	      flow_hash_config3 = lb3->lb_hash_config;
+	      hash_c3 = vnet_buffer (p3)->ip.flow_hash =
+		ip4_compute_flow_hash (ip3, flow_hash_config3);
+	    }
+
+	  ASSERT (lb0->lb_n_buckets > 0);
+	  ASSERT (is_pow2 (lb0->lb_n_buckets));
+	  ASSERT (lb1->lb_n_buckets > 0);
+	  ASSERT (is_pow2 (lb1->lb_n_buckets));
+	  ASSERT (lb2->lb_n_buckets > 0);
+	  ASSERT (is_pow2 (lb2->lb_n_buckets));
+	  ASSERT (lb3->lb_n_buckets > 0);
+	  ASSERT (is_pow2 (lb3->lb_n_buckets));
+
+	  dpo0 = load_balance_get_bucket_i (lb0,
+					    (hash_c0 &
+					     (lb0->lb_n_buckets_minus_1)));
+	  dpo1 = load_balance_get_bucket_i (lb1,
+					    (hash_c1 &
+					     (lb1->lb_n_buckets_minus_1)));
+	  dpo2 = load_balance_get_bucket_i (lb2,
+					    (hash_c2 &
+					     (lb2->lb_n_buckets_minus_1)));
+	  dpo3 = load_balance_get_bucket_i (lb3,
+					    (hash_c3 &
+					     (lb3->lb_n_buckets_minus_1)));
+
+	  next0 = dpo0->dpoi_next_node;
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+	  next1 = dpo1->dpoi_next_node;
+	  vnet_buffer (p1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
+	  next2 = dpo2->dpoi_next_node;
+	  vnet_buffer (p2)->ip.adj_index[VLIB_TX] = dpo2->dpoi_index;
+	  next3 = dpo3->dpoi_next_node;
+	  vnet_buffer (p3)->ip.adj_index[VLIB_TX] = dpo3->dpoi_index;
+
+	  vlib_increment_combined_counter
+	    (cm, cpu_index, lb_index0, 1,
+	     vlib_buffer_length_in_chain (vm, p0)
+	     + sizeof (ethernet_header_t));
+	  vlib_increment_combined_counter
+	    (cm, cpu_index, lb_index1, 1,
+	     vlib_buffer_length_in_chain (vm, p1)
+	     + sizeof (ethernet_header_t));
+	  vlib_increment_combined_counter
+	    (cm, cpu_index, lb_index2, 1,
+	     vlib_buffer_length_in_chain (vm, p2)
+	     + sizeof (ethernet_header_t));
+	  vlib_increment_combined_counter
+	    (cm, cpu_index, lb_index3, 1,
+	     vlib_buffer_length_in_chain (vm, p3)
+	     + sizeof (ethernet_header_t));
+
+	  vlib_validate_buffer_enqueue_x4 (vm, node, next,
+					   to_next, n_left_to_next,
+					   pi0, pi1, pi2, pi3,
+					   next0, next1, next2, next3);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip4_header_t *ip0;
+	  __attribute__ ((unused)) tcp_header_t *tcp0;
+	  ip_lookup_next_t next0;
+	  const load_balance_t *lb0;
+	  ip4_fib_mtrie_t *mtrie0;
+	  ip4_fib_mtrie_leaf_t leaf0;
+	  ip4_address_t *dst_addr0;
+	  __attribute__ ((unused)) u32 pi0, fib_index0, is_tcp_udp0, lbi0;
+	  flow_hash_config_t flow_hash_config0;
+	  const dpo_id_t *dpo0;
+	  u32 hash_c0;
+
+	  pi0 = from[0];
+	  to_next[0] = pi0;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  ip0 = vlib_buffer_get_current (p0);
+
+	  dst_addr0 = &ip0->dst_address;
+
+	  fib_index0 =
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+	  fib_index0 =
+	    (vnet_buffer (p0)->sw_if_index[VLIB_TX] ==
+	     (u32) ~ 0) ? fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
+
+	  if (!lookup_for_responses_to_locally_received_packets)
+	    {
+	      mtrie0 = &ip4_fib_get (fib_index0)->mtrie;
+
+	      leaf0 = IP4_FIB_MTRIE_LEAF_ROOT;
+
+	      leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 0);
+	    }
+
+	  tcp0 = (void *) (ip0 + 1);
+
+	  is_tcp_udp0 = (ip0->protocol == IP_PROTOCOL_TCP
+			 || ip0->protocol == IP_PROTOCOL_UDP);
+
+	  if (!lookup_for_responses_to_locally_received_packets)
+	    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 1);
+
+	  if (!lookup_for_responses_to_locally_received_packets)
+	    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 2);
+
+	  if (!lookup_for_responses_to_locally_received_packets)
+	    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 3);
+
+	  if (lookup_for_responses_to_locally_received_packets)
+	    lbi0 = vnet_buffer (p0)->ip.adj_index[VLIB_RX];
+	  else
+	    {
+	      /* Handle default route. */
+	      leaf0 =
+		(leaf0 ==
+		 IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie0->default_leaf : leaf0);
+	      lbi0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
+	    }
+
+	  lb0 = load_balance_get (lbi0);
+
+	  /* Use flow hash to compute multipath adjacency. */
+	  hash_c0 = vnet_buffer (p0)->ip.flow_hash = 0;
+	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
+	    {
+	      flow_hash_config0 = lb0->lb_hash_config;
+
+	      hash_c0 = vnet_buffer (p0)->ip.flow_hash =
+		ip4_compute_flow_hash (ip0, flow_hash_config0);
+	    }
+
+	  ASSERT (lb0->lb_n_buckets > 0);
+	  ASSERT (is_pow2 (lb0->lb_n_buckets));
+
+	  dpo0 = load_balance_get_bucket_i (lb0,
+					    (hash_c0 &
+					     (lb0->lb_n_buckets_minus_1)));
+
+	  next0 = dpo0->dpoi_next_node;
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+
+	  vlib_increment_combined_counter
+	    (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, p0));
+
+	  from += 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  n_left_from -= 1;
+
+	  if (PREDICT_FALSE (next0 != next))
+	    {
+	      n_left_to_next += 1;
+	      vlib_put_next_frame (vm, node, next, n_left_to_next);
+	      next = next0;
+	      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
+	      to_next[0] = pi0;
+	      to_next += 1;
+	      n_left_to_next -= 1;
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next, n_left_to_next);
+    }
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  return frame->n_vectors;
+}
+
+/** @brief IPv4 lookup node.
+    @node ip4-lookup
+
+    This is the main IPv4 lookup dispatch node.
+
+    @param vm vlib_main_t corresponding to the current thread
+    @param node vlib_node_runtime_t
+    @param frame vlib_frame_t whose contents should be dispatched
+
+    @par Graph mechanics: buffer metadata, next index usage
+
+    @em Uses:
+    - <code>vnet_buffer(b)->sw_if_index[VLIB_RX]</code>
+        - Indicates the @c sw_if_index value of the interface that the
+	  packet was received on.
+    - <code>vnet_buffer(b)->sw_if_index[VLIB_TX]</code>
+        - When the value is @c ~0 then the node performs a longest prefix
+          match (LPM) for the packet destination address in the FIB attached
+          to the receive interface.
+        - Otherwise perform LPM for the packet destination address in the
+          indicated FIB. In this case <code>[VLIB_TX]</code> is a FIB index
+          value (0, 1, ...) and not a VRF id.
+
+    @em Sets:
+    - <code>vnet_buffer(b)->ip.adj_index[VLIB_TX]</code>
+        - The lookup result adjacency index.
+
+    <em>Next Index:</em>
+    - Dispatches the packet to the node index found in
+      ip_adjacency_t @c adj->lookup_next_index
+      (where @c adj is the lookup result adjacency).
+*/
+static uword
+ip4_lookup (vlib_main_t * vm,
+	    vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ip4_lookup_inline (vm, node, frame,
+			    /* lookup_for_responses_to_locally_received_packets */
+			    0);
+
+}
+
+static u8 *format_ip4_lookup_trace (u8 * s, va_list * args);
+
+VLIB_REGISTER_NODE (ip4_lookup_node) =
+{
+.function = ip4_lookup,.name = "ip4-lookup",.vector_size =
+    sizeof (u32),.format_trace = format_ip4_lookup_trace,.n_next_nodes =
+    IP_LOOKUP_N_NEXT,.next_nodes = IP4_LOOKUP_NEXT_NODES,};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_lookup_node, ip4_lookup);
+
+always_inline uword
+ip4_load_balance (vlib_main_t * vm,
+		  vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  vlib_combined_counter_main_t *cm = &load_balance_main.lbm_via_counters;
+  u32 n_left_from, n_left_to_next, *from, *to_next;
+  ip_lookup_next_t next;
+  u32 cpu_index = os_get_cpu_number ();
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
+
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  ip_lookup_next_t next0, next1;
+	  const load_balance_t *lb0, *lb1;
+	  vlib_buffer_t *p0, *p1;
+	  u32 pi0, lbi0, hc0, pi1, lbi1, hc1;
+	  const ip4_header_t *ip0, *ip1;
+	  const dpo_id_t *dpo0, *dpo1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, STORE);
+	    vlib_prefetch_buffer_header (p3, STORE);
+
+	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), STORE);
+	    CLIB_PREFETCH (p3->data, sizeof (ip0[0]), STORE);
+	  }
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+
+	  ip0 = vlib_buffer_get_current (p0);
+	  ip1 = vlib_buffer_get_current (p1);
+	  lbi0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+	  lbi1 = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
+
+	  lb0 = load_balance_get (lbi0);
+	  lb1 = load_balance_get (lbi1);
+
+	  /*
+	   * this node is for via FIBs we can re-use the hash value from the
+	   * to node if present.
+	   * We don't want to use the same hash value at each level in the recursion
+	   * graph as that would lead to polarisation
+	   */
+	  hc0 = vnet_buffer (p0)->ip.flow_hash = 0;
+	  hc1 = vnet_buffer (p1)->ip.flow_hash = 0;
+
+	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
+	    {
+	      if (PREDICT_TRUE (vnet_buffer (p0)->ip.flow_hash))
+		{
+		  hc0 = vnet_buffer (p0)->ip.flow_hash =
+		    vnet_buffer (p0)->ip.flow_hash >> 1;
+		}
+	      else
+		{
+		  hc0 = vnet_buffer (p0)->ip.flow_hash =
+		    ip4_compute_flow_hash (ip0, hc0);
+		}
+	    }
+	  if (PREDICT_FALSE (lb1->lb_n_buckets > 1))
+	    {
+	      if (PREDICT_TRUE (vnet_buffer (p1)->ip.flow_hash))
+		{
+		  hc1 = vnet_buffer (p1)->ip.flow_hash =
+		    vnet_buffer (p1)->ip.flow_hash >> 1;
+		}
+	      else
+		{
+		  hc1 = vnet_buffer (p1)->ip.flow_hash =
+		    ip4_compute_flow_hash (ip1, hc1);
+		}
+	    }
+
+	  dpo0 =
+	    load_balance_get_bucket_i (lb0,
+				       hc0 & (lb0->lb_n_buckets_minus_1));
+	  dpo1 =
+	    load_balance_get_bucket_i (lb1,
+				       hc1 & (lb1->lb_n_buckets_minus_1));
+
+	  next0 = dpo0->dpoi_next_node;
+	  next1 = dpo1->dpoi_next_node;
+
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+	  vnet_buffer (p1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
+
+	  vlib_increment_combined_counter
+	    (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, p0));
+	  vlib_increment_combined_counter
+	    (cm, cpu_index, lbi1, 1, vlib_buffer_length_in_chain (vm, p1));
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next,
+					   to_next, n_left_to_next,
+					   pi0, pi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  ip_lookup_next_t next0;
+	  const load_balance_t *lb0;
+	  vlib_buffer_t *p0;
+	  u32 pi0, lbi0, hc0;
+	  const ip4_header_t *ip0;
+	  const dpo_id_t *dpo0;
+
+	  pi0 = from[0];
+	  to_next[0] = pi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  n_left_from -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  ip0 = vlib_buffer_get_current (p0);
+	  lbi0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+
+	  lb0 = load_balance_get (lbi0);
+
+	  hc0 = vnet_buffer (p0)->ip.flow_hash = 0;
+	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
+	    {
+	      if (PREDICT_TRUE (vnet_buffer (p0)->ip.flow_hash))
+		{
+		  hc0 = vnet_buffer (p0)->ip.flow_hash =
+		    vnet_buffer (p0)->ip.flow_hash >> 1;
+		}
+	      else
+		{
+		  hc0 = vnet_buffer (p0)->ip.flow_hash =
+		    ip4_compute_flow_hash (ip0, hc0);
+		}
+	    }
+
+	  dpo0 =
+	    load_balance_get_bucket_i (lb0,
+				       hc0 & (lb0->lb_n_buckets_minus_1));
+
+	  next0 = dpo0->dpoi_next_node;
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+
+	  vlib_increment_combined_counter
+	    (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, p0));
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next,
+					   to_next, n_left_to_next,
+					   pi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (ip4_load_balance_node) =
+{
+.function = ip4_load_balance,.name = "ip4-load-balance",.vector_size =
+    sizeof (u32),.sibling_of = "ip4-lookup",.format_trace =
+    format_ip4_lookup_trace,};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_load_balance_node, ip4_load_balance);
+
+/* get first interface address */
+ip4_address_t *
+ip4_interface_first_address (ip4_main_t * im, u32 sw_if_index,
+			     ip_interface_address_t ** result_ia)
+{
+  ip_lookup_main_t *lm = &im->lookup_main;
+  ip_interface_address_t *ia = 0;
+  ip4_address_t *result = 0;
+
+  foreach_ip_interface_address (lm, ia, sw_if_index,
+				1 /* honor unnumbered */ ,
+				(
+				  {
+				  ip4_address_t * a =
+				  ip_interface_address_get_address (lm, ia);
+				  result = a;
+				  break;
+				  }
+				));
+  if (result_ia)
+    *result_ia = result ? ia : 0;
+  return result;
+}
+
+static void
+ip4_add_interface_routes (u32 sw_if_index,
+			  ip4_main_t * im, u32 fib_index,
+			  ip_interface_address_t * a)
+{
+  ip_lookup_main_t *lm = &im->lookup_main;
+  ip4_address_t *address = ip_interface_address_get_address (lm, a);
+  fib_prefix_t pfx = {
+    .fp_len = a->address_length,
+    .fp_proto = FIB_PROTOCOL_IP4,
+    .fp_addr.ip4 = *address,
+  };
+
+  a->neighbor_probe_adj_index = ~0;
+
+  if (pfx.fp_len < 32)
+    {
+      fib_node_index_t fei;
+
+      fei = fib_table_entry_update_one_path (fib_index, &pfx, FIB_SOURCE_INTERFACE, (FIB_ENTRY_FLAG_CONNECTED | FIB_ENTRY_FLAG_ATTACHED), FIB_PROTOCOL_IP4, NULL,	/* No next-hop address */
+					     sw_if_index, ~0,	// invalid FIB index
+					     1, NULL,	// no out-label stack
+					     FIB_ROUTE_PATH_FLAG_NONE);
+      a->neighbor_probe_adj_index = fib_entry_get_adj (fei);
+    }
+
+  pfx.fp_len = 32;
+
+  if (sw_if_index < vec_len (lm->classify_table_index_by_sw_if_index))
+    {
+      u32 classify_table_index =
+	lm->classify_table_index_by_sw_if_index[sw_if_index];
+      if (classify_table_index != (u32) ~ 0)
+	{
+	  dpo_id_t dpo = DPO_INVALID;
+
+	  dpo_set (&dpo,
+		   DPO_CLASSIFY,
+		   DPO_PROTO_IP4,
+		   classify_dpo_create (DPO_PROTO_IP4, classify_table_index));
+
+	  fib_table_entry_special_dpo_add (fib_index,
+					   &pfx,
+					   FIB_SOURCE_CLASSIFY,
+					   FIB_ENTRY_FLAG_NONE, &dpo);
+	  dpo_reset (&dpo);
+	}
+    }
+
+  fib_table_entry_update_one_path (fib_index, &pfx, FIB_SOURCE_INTERFACE, (FIB_ENTRY_FLAG_CONNECTED | FIB_ENTRY_FLAG_LOCAL), FIB_PROTOCOL_IP4, &pfx.fp_addr, sw_if_index, ~0,	// invalid FIB index
+				   1, NULL,	// no out-label stack
+				   FIB_ROUTE_PATH_FLAG_NONE);
+}
+
+static void
+ip4_del_interface_routes (ip4_main_t * im,
+			  u32 fib_index,
+			  ip4_address_t * address, u32 address_length)
+{
+  fib_prefix_t pfx = {
+    .fp_len = address_length,
+    .fp_proto = FIB_PROTOCOL_IP4,
+    .fp_addr.ip4 = *address,
+  };
+
+  if (pfx.fp_len < 32)
+    {
+      fib_table_entry_delete (fib_index, &pfx, FIB_SOURCE_INTERFACE);
+    }
+
+  pfx.fp_len = 32;
+  fib_table_entry_delete (fib_index, &pfx, FIB_SOURCE_INTERFACE);
+}
+
+void
+ip4_sw_interface_enable_disable (u32 sw_if_index, u32 is_enable)
+{
+  ip4_main_t *im = &ip4_main;
+
+  vec_validate_init_empty (im->ip_enabled_by_sw_if_index, sw_if_index, 0);
+
+  /*
+   * enable/disable only on the 1<->0 transition
+   */
+  if (is_enable)
+    {
+      if (1 != ++im->ip_enabled_by_sw_if_index[sw_if_index])
+	return;
+    }
+  else
+    {
+      ASSERT (im->ip_enabled_by_sw_if_index[sw_if_index] > 0);
+      if (0 != --im->ip_enabled_by_sw_if_index[sw_if_index])
+	return;
+    }
+  vnet_feature_enable_disable ("ip4-unicast", "ip4-drop", sw_if_index,
+			       !is_enable, 0, 0);
+
+  vnet_feature_enable_disable ("ip4-multicast", "ip4-drop", sw_if_index,
+			       !is_enable, 0, 0);
+
+}
+
+static clib_error_t *
+ip4_add_del_interface_address_internal (vlib_main_t * vm,
+					u32 sw_if_index,
+					ip4_address_t * address,
+					u32 address_length, u32 is_del)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip4_main_t *im = &ip4_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  clib_error_t *error = 0;
+  u32 if_address_index, elts_before;
+  ip4_address_fib_t ip4_af, *addr_fib = 0;
+
+  vec_validate (im->fib_index_by_sw_if_index, sw_if_index);
+  ip4_addr_fib_init (&ip4_af, address,
+		     vec_elt (im->fib_index_by_sw_if_index, sw_if_index));
+  vec_add1 (addr_fib, ip4_af);
+
+  /* FIXME-LATER
+   * there is no support for adj-fib handling in the presence of overlapping
+   * subnets on interfaces. Easy fix - disallow overlapping subnets, like
+   * most routers do.
+   */
+  if (!is_del)
+    {
+      /* When adding an address check that it does not conflict
+         with an existing address. */
+      ip_interface_address_t *ia;
+      foreach_ip_interface_address (&im->lookup_main, ia, sw_if_index,
+				    0 /* honor unnumbered */ ,
+				    (
+				      {
+				      ip4_address_t * x =
+				      ip_interface_address_get_address
+				      (&im->lookup_main, ia);
+				      if (ip4_destination_matches_route
+					  (im, address, x, ia->address_length)
+					  ||
+					  ip4_destination_matches_route (im,
+									 x,
+									 address,
+									 address_length))
+				      return
+				      clib_error_create
+				      ("failed to add %U which conflicts with %U for interface %U",
+				       format_ip4_address_and_length, address,
+				       address_length,
+				       format_ip4_address_and_length, x,
+				       ia->address_length,
+				       format_vnet_sw_if_index_name, vnm,
+				       sw_if_index);}
+				    ));
+    }
+
+  elts_before = pool_elts (lm->if_address_pool);
+
+  error = ip_interface_address_add_del
+    (lm, sw_if_index, addr_fib, address_length, is_del, &if_address_index);
+  if (error)
+    goto done;
+
+  ip4_sw_interface_enable_disable (sw_if_index, !is_del);
+
+  if (is_del)
+    ip4_del_interface_routes (im, ip4_af.fib_index, address, address_length);
+  else
+    ip4_add_interface_routes (sw_if_index,
+			      im, ip4_af.fib_index,
+			      pool_elt_at_index
+			      (lm->if_address_pool, if_address_index));
+
+  /* If pool did not grow/shrink: add duplicate address. */
+  if (elts_before != pool_elts (lm->if_address_pool))
+    {
+      ip4_add_del_interface_address_callback_t *cb;
+      vec_foreach (cb, im->add_del_interface_address_callbacks)
+	cb->function (im, cb->function_opaque, sw_if_index,
+		      address, address_length, if_address_index, is_del);
+    }
+
+done:
+  vec_free (addr_fib);
+  return error;
+}
+
+clib_error_t *
+ip4_add_del_interface_address (vlib_main_t * vm, u32 sw_if_index,
+			       ip4_address_t * address, u32 address_length,
+			       u32 is_del)
+{
+  return ip4_add_del_interface_address_internal
+    (vm, sw_if_index, address, address_length, is_del);
+}
+
+/* Built-in ip4 unicast rx feature path definition */
+/* *INDENT-OFF* */
+VNET_FEATURE_ARC_INIT (ip4_unicast, static) =
+{
+  .arc_name = "ip4-unicast",
+  .start_nodes = VNET_FEATURES ("ip4-input", "ip4-input-no-checksum"),
+  .end_node = "ip4-lookup",
+  .arc_index_ptr = &ip4_main.lookup_main.ucast_feature_arc_index,
+};
+
+VNET_FEATURE_INIT (ip4_flow_classify, static) =
+{
+  .arc_name = "ip4-unicast",
+  .node_name = "ip4-flow-classify",
+  .runs_before = VNET_FEATURES ("ip4-inacl"),
+};
+
+VNET_FEATURE_INIT (ip4_inacl, static) =
+{
+  .arc_name = "ip4-unicast",
+  .node_name = "ip4-inacl",
+  .runs_before = VNET_FEATURES ("ip4-source-check-via-rx"),
+};
+
+VNET_FEATURE_INIT (ip4_source_check_1, static) =
+{
+  .arc_name = "ip4-unicast",
+  .node_name = "ip4-source-check-via-rx",
+  .runs_before = VNET_FEATURES ("ip4-source-check-via-any"),
+};
+
+VNET_FEATURE_INIT (ip4_source_check_2, static) =
+{
+  .arc_name = "ip4-unicast",
+  .node_name = "ip4-source-check-via-any",
+  .runs_before = VNET_FEATURES ("ip4-policer-classify"),
+};
+
+VNET_FEATURE_INIT (ip4_source_and_port_range_check_rx, static) =
+{
+  .arc_name = "ip4-unicast",
+  .node_name = "ip4-source-and-port-range-check-rx",
+  .runs_before = VNET_FEATURES ("ip4-policer-classify"),
+};
+
+VNET_FEATURE_INIT (ip4_policer_classify, static) =
+{
+  .arc_name = "ip4-unicast",
+  .node_name = "ip4-policer-classify",
+  .runs_before = VNET_FEATURES ("ipsec-input-ip4"),
+};
+
+VNET_FEATURE_INIT (ip4_ipsec, static) =
+{
+  .arc_name = "ip4-unicast",
+  .node_name = "ipsec-input-ip4",
+  .runs_before = VNET_FEATURES ("vpath-input-ip4"),
+};
+
+VNET_FEATURE_INIT (ip4_vpath, static) =
+{
+  .arc_name = "ip4-unicast",
+  .node_name = "vpath-input-ip4",
+  .runs_before = VNET_FEATURES ("ip4-vxlan-bypass"),
+};
+
+VNET_FEATURE_INIT (ip4_vxlan_bypass, static) =
+{
+  .arc_name = "ip4-unicast",
+  .node_name = "ip4-vxlan-bypass",
+  .runs_before = VNET_FEATURES ("ip4-lookup"),
+};
+
+VNET_FEATURE_INIT (ip4_lookup, static) =
+{
+  .arc_name = "ip4-unicast",
+  .node_name = "ip4-lookup",
+  .runs_before = VNET_FEATURES ("ip4-drop"),
+};
+
+VNET_FEATURE_INIT (ip4_drop, static) =
+{
+  .arc_name = "ip4-unicast",
+  .node_name = "ip4-drop",
+  .runs_before = 0,	/* not before any other features */
+};
+
+
+/* Built-in ip4 multicast rx feature path definition */
+VNET_FEATURE_ARC_INIT (ip4_multicast, static) =
+{
+  .arc_name = "ip4-multicast",
+  .start_nodes = VNET_FEATURES ("ip4-input", "ip4-input-no-checksum"),
+  .end_node = "ip4-lookup-multicast",
+  .arc_index_ptr = &ip4_main.lookup_main.mcast_feature_arc_index,
+};
+
+VNET_FEATURE_INIT (ip4_vpath_mc, static) =
+{
+  .arc_name = "ip4-multicast",
+  .node_name = "vpath-input-ip4",
+  .runs_before = VNET_FEATURES ("ip4-lookup-multicast"),
+};
+
+VNET_FEATURE_INIT (ip4_lookup_mc, static) =
+{
+  .arc_name = "ip4-multicast",
+  .node_name = "ip4-lookup-multicast",
+  .runs_before = VNET_FEATURES ("ip4-drop"),
+};
+
+VNET_FEATURE_INIT (ip4_mc_drop, static) =
+{
+  .arc_name = "ip4-multicast",
+  .node_name = "ip4-drop",
+  .runs_before = 0,	/* last feature */
+};
+
+/* Source and port-range check ip4 tx feature path definition */
+VNET_FEATURE_ARC_INIT (ip4_output, static) =
+{
+  .arc_name = "ip4-output",
+  .start_nodes = VNET_FEATURES ("ip4-rewrite", "ip4-midchain"),
+  .end_node = "interface-output",
+  .arc_index_ptr = &ip4_main.lookup_main.output_feature_arc_index,
+};
+
+VNET_FEATURE_INIT (ip4_source_and_port_range_check_tx, static) =
+{
+  .arc_name = "ip4-output",
+  .node_name = "ip4-source-and-port-range-check-tx",
+  .runs_before = VNET_FEATURES ("ipsec-output-ip4"),
+};
+
+VNET_FEATURE_INIT (ip4_ipsec_output, static) =
+{
+  .arc_name = "ip4-output",
+  .node_name = "ipsec-output-ip4",
+  .runs_before = VNET_FEATURES ("interface-output"),
+};
+
+/* Built-in ip4 tx feature path definition */
+VNET_FEATURE_INIT (ip4_interface_output, static) =
+{
+  .arc_name = "ip4-output",
+  .node_name = "interface-output",
+  .runs_before = 0,	/* not before any other features */
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+ip4_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
+{
+  ip4_main_t *im = &ip4_main;
+
+  /* Fill in lookup tables with default table (0). */
+  vec_validate (im->fib_index_by_sw_if_index, sw_if_index);
+
+  vnet_feature_enable_disable ("ip4-unicast", "ip4-drop", sw_if_index,
+			       is_add, 0, 0);
+
+  vnet_feature_enable_disable ("ip4-multicast", "ip4-drop", sw_if_index,
+			       is_add, 0, 0);
+
+  return /* no error */ 0;
+}
+
+VNET_SW_INTERFACE_ADD_DEL_FUNCTION (ip4_sw_interface_add_del);
+
+/* Global IP4 main. */
+ip4_main_t ip4_main;
+
+clib_error_t *
+ip4_lookup_init (vlib_main_t * vm)
+{
+  ip4_main_t *im = &ip4_main;
+  clib_error_t *error;
+  uword i;
+
+  if ((error = vlib_call_init_function (vm, vnet_feature_init)))
+    return error;
+
+  for (i = 0; i < ARRAY_LEN (im->fib_masks); i++)
+    {
+      u32 m;
+
+      if (i < 32)
+	m = pow2_mask (i) << (32 - i);
+      else
+	m = ~0;
+      im->fib_masks[i] = clib_host_to_net_u32 (m);
+    }
+
+  ip_lookup_init (&im->lookup_main, /* is_ip6 */ 0);
+
+  /* Create FIB with index 0 and table id of 0. */
+  fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, 0);
+
+  {
+    pg_node_t *pn;
+    pn = pg_get_node (ip4_lookup_node.index);
+    pn->unformat_edit = unformat_pg_ip4_header;
+  }
+
+  {
+    ethernet_arp_header_t h;
+
+    memset (&h, 0, sizeof (h));
+
+    /* Set target ethernet address to all zeros. */
+    memset (h.ip4_over_ethernet[1].ethernet, 0,
+	    sizeof (h.ip4_over_ethernet[1].ethernet));
+
+#define _16(f,v) h.f = clib_host_to_net_u16 (v);
+#define _8(f,v) h.f = v;
+    _16 (l2_type, ETHERNET_ARP_HARDWARE_TYPE_ethernet);
+    _16 (l3_type, ETHERNET_TYPE_IP4);
+    _8 (n_l2_address_bytes, 6);
+    _8 (n_l3_address_bytes, 4);
+    _16 (opcode, ETHERNET_ARP_OPCODE_request);
+#undef _16
+#undef _8
+
+    vlib_packet_template_init (vm, &im->ip4_arp_request_packet_template,
+			       /* data */ &h,
+			       sizeof (h),
+			       /* alloc chunk size */ 8,
+			       "ip4 arp");
+  }
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (ip4_lookup_init);
+
+typedef struct
+{
+  /* Adjacency taken. */
+  u32 dpo_index;
+  u32 flow_hash;
+  u32 fib_index;
+
+  /* Packet data, possibly *after* rewrite. */
+  u8 packet_data[64 - 1 * sizeof (u32)];
+}
+ip4_forward_next_trace_t;
+
+u8 *
+format_ip4_forward_next_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip4_forward_next_trace_t *t = va_arg (*args, ip4_forward_next_trace_t *);
+  uword indent = format_get_indent (s);
+  s = format (s, "%U%U",
+	      format_white_space, indent,
+	      format_ip4_header, t->packet_data, sizeof (t->packet_data));
+  return s;
+}
+
+static u8 *
+format_ip4_lookup_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip4_forward_next_trace_t *t = va_arg (*args, ip4_forward_next_trace_t *);
+  uword indent = format_get_indent (s);
+
+  s = format (s, "fib %d dpo-idx %d flow hash: 0x%08x",
+	      t->fib_index, t->dpo_index, t->flow_hash);
+  s = format (s, "\n%U%U",
+	      format_white_space, indent,
+	      format_ip4_header, t->packet_data, sizeof (t->packet_data));
+  return s;
+}
+
+static u8 *
+format_ip4_rewrite_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip4_forward_next_trace_t *t = va_arg (*args, ip4_forward_next_trace_t *);
+  vnet_main_t *vnm = vnet_get_main ();
+  uword indent = format_get_indent (s);
+
+  s = format (s, "tx_sw_if_index %d dpo-idx %d : %U flow hash: 0x%08x",
+	      t->fib_index, t->dpo_index, format_ip_adjacency,
+	      t->dpo_index, FORMAT_IP_ADJACENCY_NONE, t->flow_hash);
+  s = format (s, "\n%U%U",
+	      format_white_space, indent,
+	      format_ip_adjacency_packet_data,
+	      vnm, t->dpo_index, t->packet_data, sizeof (t->packet_data));
+  return s;
+}
+
+/* Common trace function for all ip4-forward next nodes. */
+void
+ip4_forward_next_trace (vlib_main_t * vm,
+			vlib_node_runtime_t * node,
+			vlib_frame_t * frame, vlib_rx_or_tx_t which_adj_index)
+{
+  u32 *from, n_left;
+  ip4_main_t *im = &ip4_main;
+
+  n_left = frame->n_vectors;
+  from = vlib_frame_vector_args (frame);
+
+  while (n_left >= 4)
+    {
+      u32 bi0, bi1;
+      vlib_buffer_t *b0, *b1;
+      ip4_forward_next_trace_t *t0, *t1;
+
+      /* Prefetch next iteration. */
+      vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
+      vlib_prefetch_buffer_with_index (vm, from[3], LOAD);
+
+      bi0 = from[0];
+      bi1 = from[1];
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+	  t0->dpo_index = vnet_buffer (b0)->ip.adj_index[which_adj_index];
+	  t0->flow_hash = vnet_buffer (b0)->ip.flow_hash;
+	  t0->fib_index =
+	    (vnet_buffer (b0)->sw_if_index[VLIB_TX] !=
+	     (u32) ~ 0) ? vnet_buffer (b0)->sw_if_index[VLIB_TX] :
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (b0)->sw_if_index[VLIB_RX]);
+
+	  clib_memcpy (t0->packet_data,
+		       vlib_buffer_get_current (b0),
+		       sizeof (t0->packet_data));
+	}
+      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
+	  t1->dpo_index = vnet_buffer (b1)->ip.adj_index[which_adj_index];
+	  t1->flow_hash = vnet_buffer (b1)->ip.flow_hash;
+	  t1->fib_index =
+	    (vnet_buffer (b1)->sw_if_index[VLIB_TX] !=
+	     (u32) ~ 0) ? vnet_buffer (b1)->sw_if_index[VLIB_TX] :
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (b1)->sw_if_index[VLIB_RX]);
+	  clib_memcpy (t1->packet_data, vlib_buffer_get_current (b1),
+		       sizeof (t1->packet_data));
+	}
+      from += 2;
+      n_left -= 2;
+    }
+
+  while (n_left >= 1)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      ip4_forward_next_trace_t *t0;
+
+      bi0 = from[0];
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+	  t0->dpo_index = vnet_buffer (b0)->ip.adj_index[which_adj_index];
+	  t0->flow_hash = vnet_buffer (b0)->ip.flow_hash;
+	  t0->fib_index =
+	    (vnet_buffer (b0)->sw_if_index[VLIB_TX] !=
+	     (u32) ~ 0) ? vnet_buffer (b0)->sw_if_index[VLIB_TX] :
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (b0)->sw_if_index[VLIB_RX]);
+	  clib_memcpy (t0->packet_data, vlib_buffer_get_current (b0),
+		       sizeof (t0->packet_data));
+	}
+      from += 1;
+      n_left -= 1;
+    }
+}
+
+static uword
+ip4_drop_or_punt (vlib_main_t * vm,
+		  vlib_node_runtime_t * node,
+		  vlib_frame_t * frame, ip4_error_t error_code)
+{
+  u32 *buffers = vlib_frame_vector_args (frame);
+  uword n_packets = frame->n_vectors;
+
+  vlib_error_drop_buffers (vm, node, buffers,
+			   /* stride */ 1,
+			   n_packets,
+			   /* next */ 0,
+			   ip4_input_node.index, error_code);
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  return n_packets;
+}
+
+static uword
+ip4_drop (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ip4_drop_or_punt (vm, node, frame, IP4_ERROR_ADJACENCY_DROP);
+}
+
+static uword
+ip4_punt (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ip4_drop_or_punt (vm, node, frame, IP4_ERROR_ADJACENCY_PUNT);
+}
+
+VLIB_REGISTER_NODE (ip4_drop_node, static) =
+{
+  .function = ip4_drop,.name = "ip4-drop",.vector_size =
+    sizeof (u32),.format_trace = format_ip4_forward_next_trace,.n_next_nodes =
+    1,.next_nodes =
+  {
+  [0] = "error-drop",}
+,};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_drop_node, ip4_drop);
+
+VLIB_REGISTER_NODE (ip4_punt_node, static) =
+{
+  .function = ip4_punt,.name = "ip4-punt",.vector_size =
+    sizeof (u32),.format_trace = format_ip4_forward_next_trace,.n_next_nodes =
+    1,.next_nodes =
+  {
+  [0] = "error-punt",}
+,};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_punt_node, ip4_punt);
+
+/* Compute TCP/UDP/ICMP4 checksum in software. */
+u16
+ip4_tcp_udp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0,
+			      ip4_header_t * ip0)
+{
+  ip_csum_t sum0;
+  u32 ip_header_length, payload_length_host_byte_order;
+  u32 n_this_buffer, n_bytes_left;
+  u16 sum16;
+  void *data_this_buffer;
+
+  /* Initialize checksum with ip header. */
+  ip_header_length = ip4_header_bytes (ip0);
+  payload_length_host_byte_order =
+    clib_net_to_host_u16 (ip0->length) - ip_header_length;
+  sum0 =
+    clib_host_to_net_u32 (payload_length_host_byte_order +
+			  (ip0->protocol << 16));
+
+  if (BITS (uword) == 32)
+    {
+      sum0 =
+	ip_csum_with_carry (sum0,
+			    clib_mem_unaligned (&ip0->src_address, u32));
+      sum0 =
+	ip_csum_with_carry (sum0,
+			    clib_mem_unaligned (&ip0->dst_address, u32));
+    }
+  else
+    sum0 =
+      ip_csum_with_carry (sum0, clib_mem_unaligned (&ip0->src_address, u64));
+
+  n_bytes_left = n_this_buffer = payload_length_host_byte_order;
+  data_this_buffer = (void *) ip0 + ip_header_length;
+  if (n_this_buffer + ip_header_length > p0->current_length)
+    n_this_buffer =
+      p0->current_length >
+      ip_header_length ? p0->current_length - ip_header_length : 0;
+  while (1)
+    {
+      sum0 = ip_incremental_checksum (sum0, data_this_buffer, n_this_buffer);
+      n_bytes_left -= n_this_buffer;
+      if (n_bytes_left == 0)
+	break;
+
+      ASSERT (p0->flags & VLIB_BUFFER_NEXT_PRESENT);
+      p0 = vlib_get_buffer (vm, p0->next_buffer);
+      data_this_buffer = vlib_buffer_get_current (p0);
+      n_this_buffer = p0->current_length;
+    }
+
+  sum16 = ~ip_csum_fold (sum0);
+
+  return sum16;
+}
+
+u32
+ip4_tcp_udp_validate_checksum (vlib_main_t * vm, vlib_buffer_t * p0)
+{
+  ip4_header_t *ip0 = vlib_buffer_get_current (p0);
+  udp_header_t *udp0;
+  u16 sum16;
+
+  ASSERT (ip0->protocol == IP_PROTOCOL_TCP
+	  || ip0->protocol == IP_PROTOCOL_UDP);
+
+  udp0 = (void *) (ip0 + 1);
+  if (ip0->protocol == IP_PROTOCOL_UDP && udp0->checksum == 0)
+    {
+      p0->flags |= (IP_BUFFER_L4_CHECKSUM_COMPUTED
+		    | IP_BUFFER_L4_CHECKSUM_CORRECT);
+      return p0->flags;
+    }
+
+  sum16 = ip4_tcp_udp_compute_checksum (vm, p0, ip0);
+
+  p0->flags |= (IP_BUFFER_L4_CHECKSUM_COMPUTED
+		| ((sum16 == 0) << LOG2_IP_BUFFER_L4_CHECKSUM_CORRECT));
+
+  return p0->flags;
+}
+
+static uword
+ip4_local (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  ip4_main_t *im = &ip4_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  ip_local_next_t next_index;
+  u32 *from, *to_next, n_left_from, n_left_to_next;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip4_input_node.index);
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  vlib_buffer_t *p0, *p1;
+	  ip4_header_t *ip0, *ip1;
+	  udp_header_t *udp0, *udp1;
+	  ip4_fib_mtrie_t *mtrie0, *mtrie1;
+	  ip4_fib_mtrie_leaf_t leaf0, leaf1;
+	  const dpo_id_t *dpo0, *dpo1;
+	  const load_balance_t *lb0, *lb1;
+	  u32 pi0, ip_len0, udp_len0, flags0, next0, fib_index0, lbi0;
+	  u32 pi1, ip_len1, udp_len1, flags1, next1, fib_index1, lbi1;
+	  i32 len_diff0, len_diff1;
+	  u8 error0, is_udp0, is_tcp_udp0, good_tcp_udp0, proto0;
+	  u8 error1, is_udp1, is_tcp_udp1, good_tcp_udp1, proto1;
+	  u8 enqueue_code;
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+
+	  ip0 = vlib_buffer_get_current (p0);
+	  ip1 = vlib_buffer_get_current (p1);
+
+	  vnet_buffer (p0)->ip.start_of_ip_header = p0->current_data;
+	  vnet_buffer (p1)->ip.start_of_ip_header = p1->current_data;
+
+	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
+				vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+	  fib_index0 = (vnet_buffer (p0)->sw_if_index[VLIB_TX] == (u32) ~ 0) ?
+	    fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
+
+	  fib_index1 = vec_elt (im->fib_index_by_sw_if_index,
+				vnet_buffer (p1)->sw_if_index[VLIB_RX]);
+	  fib_index1 = (vnet_buffer (p1)->sw_if_index[VLIB_TX] == (u32) ~ 0) ?
+	    fib_index1 : vnet_buffer (p1)->sw_if_index[VLIB_TX];
+
+	  mtrie0 = &ip4_fib_get (fib_index0)->mtrie;
+	  mtrie1 = &ip4_fib_get (fib_index1)->mtrie;
+
+	  leaf0 = leaf1 = IP4_FIB_MTRIE_LEAF_ROOT;
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 0);
+	  leaf1 =
+	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 0);
+
+	  /* Treat IP frag packets as "experimental" protocol for now
+	     until support of IP frag reassembly is implemented */
+	  proto0 = ip4_is_fragment (ip0) ? 0xfe : ip0->protocol;
+	  proto1 = ip4_is_fragment (ip1) ? 0xfe : ip1->protocol;
+	  is_udp0 = proto0 == IP_PROTOCOL_UDP;
+	  is_udp1 = proto1 == IP_PROTOCOL_UDP;
+	  is_tcp_udp0 = is_udp0 || proto0 == IP_PROTOCOL_TCP;
+	  is_tcp_udp1 = is_udp1 || proto1 == IP_PROTOCOL_TCP;
+
+	  flags0 = p0->flags;
+	  flags1 = p1->flags;
+
+	  good_tcp_udp0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	  good_tcp_udp1 = (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+
+	  udp0 = ip4_next_header (ip0);
+	  udp1 = ip4_next_header (ip1);
+
+	  /* Don't verify UDP checksum for packets with explicit zero checksum. */
+	  good_tcp_udp0 |= is_udp0 && udp0->checksum == 0;
+	  good_tcp_udp1 |= is_udp1 && udp1->checksum == 0;
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 1);
+	  leaf1 =
+	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 1);
+
+	  /* Verify UDP length. */
+	  ip_len0 = clib_net_to_host_u16 (ip0->length);
+	  ip_len1 = clib_net_to_host_u16 (ip1->length);
+	  udp_len0 = clib_net_to_host_u16 (udp0->length);
+	  udp_len1 = clib_net_to_host_u16 (udp1->length);
+
+	  len_diff0 = ip_len0 - udp_len0;
+	  len_diff1 = ip_len1 - udp_len1;
+
+	  len_diff0 = is_udp0 ? len_diff0 : 0;
+	  len_diff1 = is_udp1 ? len_diff1 : 0;
+
+	  if (PREDICT_FALSE (!(is_tcp_udp0 & is_tcp_udp1
+			       & good_tcp_udp0 & good_tcp_udp1)))
+	    {
+	      if (is_tcp_udp0)
+		{
+		  if (is_tcp_udp0
+		      && !(flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
+		    flags0 = ip4_tcp_udp_validate_checksum (vm, p0);
+		  good_tcp_udp0 =
+		    (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+		  good_tcp_udp0 |= is_udp0 && udp0->checksum == 0;
+		}
+	      if (is_tcp_udp1)
+		{
+		  if (is_tcp_udp1
+		      && !(flags1 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
+		    flags1 = ip4_tcp_udp_validate_checksum (vm, p1);
+		  good_tcp_udp1 =
+		    (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+		  good_tcp_udp1 |= is_udp1 && udp1->checksum == 0;
+		}
+	    }
+
+	  good_tcp_udp0 &= len_diff0 >= 0;
+	  good_tcp_udp1 &= len_diff1 >= 0;
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 2);
+	  leaf1 =
+	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 2);
+
+	  error0 = error1 = IP4_ERROR_UNKNOWN_PROTOCOL;
+
+	  error0 = len_diff0 < 0 ? IP4_ERROR_UDP_LENGTH : error0;
+	  error1 = len_diff1 < 0 ? IP4_ERROR_UDP_LENGTH : error1;
+
+	  ASSERT (IP4_ERROR_TCP_CHECKSUM + 1 == IP4_ERROR_UDP_CHECKSUM);
+	  error0 = (is_tcp_udp0 && !good_tcp_udp0
+		    ? IP4_ERROR_TCP_CHECKSUM + is_udp0 : error0);
+	  error1 = (is_tcp_udp1 && !good_tcp_udp1
+		    ? IP4_ERROR_TCP_CHECKSUM + is_udp1 : error1);
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 3);
+	  leaf1 =
+	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 3);
+	  leaf0 =
+	    (leaf0 ==
+	     IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie0->default_leaf : leaf0);
+	  leaf1 =
+	    (leaf1 ==
+	     IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie1->default_leaf : leaf1);
+
+	  vnet_buffer (p0)->ip.adj_index[VLIB_RX] = lbi0 =
+	    ip4_fib_mtrie_leaf_get_adj_index (leaf0);
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = lbi0;
+
+	  vnet_buffer (p1)->ip.adj_index[VLIB_RX] = lbi1 =
+	    ip4_fib_mtrie_leaf_get_adj_index (leaf1);
+	  vnet_buffer (p1)->ip.adj_index[VLIB_TX] = lbi1;
+
+	  lb0 = load_balance_get (lbi0);
+	  lb1 = load_balance_get (lbi1);
+	  dpo0 = load_balance_get_bucket_i (lb0, 0);
+	  dpo1 = load_balance_get_bucket_i (lb1, 0);
+
+	  /*
+	   * Must have a route to source otherwise we drop the packet.
+	   * ip4 broadcasts are accepted, e.g. to make dhcp client work
+	   *
+	   * The checks are:
+	   *  - the source is a recieve => it's from us => bogus, do this
+	   *    first since it sets a different error code.
+	   *  - uRPF check for any route to source - accept if passes.
+	   *  - allow packets destined to the broadcast address from unknown sources
+	   */
+	  error0 = ((error0 == IP4_ERROR_UNKNOWN_PROTOCOL &&
+		     dpo0->dpoi_type == DPO_RECEIVE) ?
+		    IP4_ERROR_SPOOFED_LOCAL_PACKETS : error0);
+	  error0 = ((error0 == IP4_ERROR_UNKNOWN_PROTOCOL &&
+		     !fib_urpf_check_size (lb0->lb_urpf) &&
+		     ip0->dst_address.as_u32 != 0xFFFFFFFF)
+		    ? IP4_ERROR_SRC_LOOKUP_MISS : error0);
+	  error1 = ((error1 == IP4_ERROR_UNKNOWN_PROTOCOL &&
+		     dpo1->dpoi_type == DPO_RECEIVE) ?
+		    IP4_ERROR_SPOOFED_LOCAL_PACKETS : error1);
+	  error1 = ((error1 == IP4_ERROR_UNKNOWN_PROTOCOL &&
+		     !fib_urpf_check_size (lb1->lb_urpf) &&
+		     ip1->dst_address.as_u32 != 0xFFFFFFFF)
+		    ? IP4_ERROR_SRC_LOOKUP_MISS : error1);
+
+	  next0 = lm->local_next_by_ip_protocol[proto0];
+	  next1 = lm->local_next_by_ip_protocol[proto1];
+
+	  next0 =
+	    error0 != IP4_ERROR_UNKNOWN_PROTOCOL ? IP_LOCAL_NEXT_DROP : next0;
+	  next1 =
+	    error1 != IP4_ERROR_UNKNOWN_PROTOCOL ? IP_LOCAL_NEXT_DROP : next1;
+
+	  p0->error = error0 ? error_node->errors[error0] : 0;
+	  p1->error = error1 ? error_node->errors[error1] : 0;
+
+	  enqueue_code = (next0 != next_index) + 2 * (next1 != next_index);
+
+	  if (PREDICT_FALSE (enqueue_code != 0))
+	    {
+	      switch (enqueue_code)
+		{
+		case 1:
+		  /* A B A */
+		  to_next[-2] = pi1;
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node, next0, pi0);
+		  break;
+
+		case 2:
+		  /* A A B */
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node, next1, pi1);
+		  break;
+
+		case 3:
+		  /* A B B or A B C */
+		  to_next -= 2;
+		  n_left_to_next += 2;
+		  vlib_set_next_frame_buffer (vm, node, next0, pi0);
+		  vlib_set_next_frame_buffer (vm, node, next1, pi1);
+		  if (next0 == next1)
+		    {
+		      vlib_put_next_frame (vm, node, next_index,
+					   n_left_to_next);
+		      next_index = next1;
+		      vlib_get_next_frame (vm, node, next_index, to_next,
+					   n_left_to_next);
+		    }
+		  break;
+		}
+	    }
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip4_header_t *ip0;
+	  udp_header_t *udp0;
+	  ip4_fib_mtrie_t *mtrie0;
+	  ip4_fib_mtrie_leaf_t leaf0;
+	  u32 pi0, next0, ip_len0, udp_len0, flags0, fib_index0, lbi0;
+	  i32 len_diff0;
+	  u8 error0, is_udp0, is_tcp_udp0, good_tcp_udp0, proto0;
+	  load_balance_t *lb0;
+	  const dpo_id_t *dpo0;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  ip0 = vlib_buffer_get_current (p0);
+
+	  vnet_buffer (p0)->ip.start_of_ip_header = p0->current_data;
+
+	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
+				vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+	  fib_index0 = (vnet_buffer (p0)->sw_if_index[VLIB_TX] == (u32) ~ 0) ?
+	    fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
+
+	  mtrie0 = &ip4_fib_get (fib_index0)->mtrie;
+
+	  leaf0 = IP4_FIB_MTRIE_LEAF_ROOT;
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 0);
+
+	  /* Treat IP frag packets as "experimental" protocol for now
+	     until support of IP frag reassembly is implemented */
+	  proto0 = ip4_is_fragment (ip0) ? 0xfe : ip0->protocol;
+	  is_udp0 = proto0 == IP_PROTOCOL_UDP;
+	  is_tcp_udp0 = is_udp0 || proto0 == IP_PROTOCOL_TCP;
+
+	  flags0 = p0->flags;
+
+	  good_tcp_udp0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+
+	  udp0 = ip4_next_header (ip0);
+
+	  /* Don't verify UDP checksum for packets with explicit zero checksum. */
+	  good_tcp_udp0 |= is_udp0 && udp0->checksum == 0;
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 1);
+
+	  /* Verify UDP length. */
+	  ip_len0 = clib_net_to_host_u16 (ip0->length);
+	  udp_len0 = clib_net_to_host_u16 (udp0->length);
+
+	  len_diff0 = ip_len0 - udp_len0;
+
+	  len_diff0 = is_udp0 ? len_diff0 : 0;
+
+	  if (PREDICT_FALSE (!(is_tcp_udp0 & good_tcp_udp0)))
+	    {
+	      if (is_tcp_udp0)
+		{
+		  if (is_tcp_udp0
+		      && !(flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
+		    flags0 = ip4_tcp_udp_validate_checksum (vm, p0);
+		  good_tcp_udp0 =
+		    (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+		  good_tcp_udp0 |= is_udp0 && udp0->checksum == 0;
+		}
+	    }
+
+	  good_tcp_udp0 &= len_diff0 >= 0;
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 2);
+
+	  error0 = IP4_ERROR_UNKNOWN_PROTOCOL;
+
+	  error0 = len_diff0 < 0 ? IP4_ERROR_UDP_LENGTH : error0;
+
+	  ASSERT (IP4_ERROR_TCP_CHECKSUM + 1 == IP4_ERROR_UDP_CHECKSUM);
+	  error0 = (is_tcp_udp0 && !good_tcp_udp0
+		    ? IP4_ERROR_TCP_CHECKSUM + is_udp0 : error0);
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 3);
+	  leaf0 =
+	    (leaf0 ==
+	     IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie0->default_leaf : leaf0);
+
+	  lbi0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = lbi0;
+
+	  lb0 = load_balance_get (lbi0);
+	  dpo0 = load_balance_get_bucket_i (lb0, 0);
+
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] =
+	    vnet_buffer (p0)->ip.adj_index[VLIB_RX] = lbi0;
+
+	  error0 = ((error0 == IP4_ERROR_UNKNOWN_PROTOCOL &&
+		     dpo0->dpoi_type == DPO_RECEIVE) ?
+		    IP4_ERROR_SPOOFED_LOCAL_PACKETS : error0);
+	  error0 = ((error0 == IP4_ERROR_UNKNOWN_PROTOCOL &&
+		     !fib_urpf_check_size (lb0->lb_urpf) &&
+		     ip0->dst_address.as_u32 != 0xFFFFFFFF)
+		    ? IP4_ERROR_SRC_LOOKUP_MISS : error0);
+
+	  next0 = lm->local_next_by_ip_protocol[proto0];
+
+	  next0 =
+	    error0 != IP4_ERROR_UNKNOWN_PROTOCOL ? IP_LOCAL_NEXT_DROP : next0;
+
+	  p0->error = error0 ? error_node->errors[error0] : 0;
+
+	  if (PREDICT_FALSE (next0 != next_index))
+	    {
+	      n_left_to_next += 1;
+	      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+
+	      next_index = next0;
+	      vlib_get_next_frame (vm, node, next_index, to_next,
+				   n_left_to_next);
+	      to_next[0] = pi0;
+	      to_next += 1;
+	      n_left_to_next -= 1;
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (ip4_local_node, static) =
+{
+  .function = ip4_local,.name = "ip4-local",.vector_size =
+    sizeof (u32),.format_trace = format_ip4_forward_next_trace,.n_next_nodes =
+    IP_LOCAL_N_NEXT,.next_nodes =
+  {
+  [IP_LOCAL_NEXT_DROP] = "error-drop",
+      [IP_LOCAL_NEXT_PUNT] = "error-punt",
+      [IP_LOCAL_NEXT_UDP_LOOKUP] = "ip4-udp-lookup",
+      [IP_LOCAL_NEXT_ICMP] = "ip4-icmp-input",}
+,};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_local_node, ip4_local);
+
+void
+ip4_register_protocol (u32 protocol, u32 node_index)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  ip4_main_t *im = &ip4_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+
+  ASSERT (protocol < ARRAY_LEN (lm->local_next_by_ip_protocol));
+  lm->local_next_by_ip_protocol[protocol] =
+    vlib_node_add_next (vm, ip4_local_node.index, node_index);
+}
+
+static clib_error_t *
+show_ip_local_command_fn (vlib_main_t * vm,
+			  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  ip4_main_t *im = &ip4_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  int i;
+
+  vlib_cli_output (vm, "Protocols handled by ip4_local");
+  for (i = 0; i < ARRAY_LEN (lm->local_next_by_ip_protocol); i++)
+    {
+      if (lm->local_next_by_ip_protocol[i] != IP_LOCAL_NEXT_PUNT)
+	vlib_cli_output (vm, "%d", i);
+    }
+  return 0;
+}
+
+
+
+/*?
+ * Display the set of protocols handled by the local IPv4 stack.
+ *
+ * @cliexpar
+ * Example of how to display local protocol table:
+ * @cliexstart{show ip local}
+ * Protocols handled by ip4_local
+ * 1
+ * 17
+ * 47
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_ip_local, static) =
+{
+  .path = "show ip local",
+  .function = show_ip_local_command_fn,
+  .short_help = "show ip local",
+};
+/* *INDENT-ON* */
+
+always_inline uword
+ip4_arp_inline (vlib_main_t * vm,
+		vlib_node_runtime_t * node,
+		vlib_frame_t * frame, int is_glean)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip4_main_t *im = &ip4_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  u32 *from, *to_next_drop;
+  uword n_left_from, n_left_to_next_drop, next_index;
+  static f64 time_last_seed_change = -1e100;
+  static u32 hash_seeds[3];
+  static uword hash_bitmap[256 / BITS (uword)];
+  f64 time_now;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  time_now = vlib_time_now (vm);
+  if (time_now - time_last_seed_change > 1e-3)
+    {
+      uword i;
+      u32 *r = clib_random_buffer_get_data (&vm->random_buffer,
+					    sizeof (hash_seeds));
+      for (i = 0; i < ARRAY_LEN (hash_seeds); i++)
+	hash_seeds[i] = r[i];
+
+      /* Mark all hash keys as been no-seen before. */
+      for (i = 0; i < ARRAY_LEN (hash_bitmap); i++)
+	hash_bitmap[i] = 0;
+
+      time_last_seed_change = time_now;
+    }
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  if (next_index == IP4_ARP_NEXT_DROP)
+    next_index = IP4_ARP_N_NEXT;	/* point to first interface */
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, IP4_ARP_NEXT_DROP,
+			   to_next_drop, n_left_to_next_drop);
+
+      while (n_left_from > 0 && n_left_to_next_drop > 0)
+	{
+	  u32 pi0, adj_index0, a0, b0, c0, m0, sw_if_index0, drop0;
+	  ip_adjacency_t *adj0;
+	  vlib_buffer_t *p0;
+	  ip4_header_t *ip0;
+	  uword bm0;
+
+	  pi0 = from[0];
+
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+	  adj0 = ip_get_adjacency (lm, adj_index0);
+	  ip0 = vlib_buffer_get_current (p0);
+
+	  a0 = hash_seeds[0];
+	  b0 = hash_seeds[1];
+	  c0 = hash_seeds[2];
+
+	  sw_if_index0 = adj0->rewrite_header.sw_if_index;
+	  vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0;
+
+	  if (is_glean)
+	    {
+	      /*
+	       * this is the Glean case, so we are ARPing for the
+	       * packet's destination
+	       */
+	      a0 ^= ip0->dst_address.data_u32;
+	    }
+	  else
+	    {
+	      a0 ^= adj0->sub_type.nbr.next_hop.ip4.data_u32;
+	    }
+	  b0 ^= sw_if_index0;
+
+	  hash_v3_finalize32 (a0, b0, c0);
+
+	  c0 &= BITS (hash_bitmap) - 1;
+	  c0 = c0 / BITS (uword);
+	  m0 = (uword) 1 << (c0 % BITS (uword));
+
+	  bm0 = hash_bitmap[c0];
+	  drop0 = (bm0 & m0) != 0;
+
+	  /* Mark it as seen. */
+	  hash_bitmap[c0] = bm0 | m0;
+
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next_drop[0] = pi0;
+	  to_next_drop += 1;
+	  n_left_to_next_drop -= 1;
+
+	  p0->error =
+	    node->errors[drop0 ? IP4_ARP_ERROR_DROP :
+			 IP4_ARP_ERROR_REQUEST_SENT];
+
+	  /*
+	   * the adj has been updated to a rewrite but the node the DPO that got
+	   * us here hasn't - yet. no big deal. we'll drop while we wait.
+	   */
+	  if (IP_LOOKUP_NEXT_REWRITE == adj0->lookup_next_index)
+	    continue;
+
+	  if (drop0)
+	    continue;
+
+	  /*
+	   * Can happen if the control-plane is programming tables
+	   * with traffic flowing; at least that's today's lame excuse.
+	   */
+	  if ((is_glean && adj0->lookup_next_index != IP_LOOKUP_NEXT_GLEAN) ||
+	      (!is_glean && adj0->lookup_next_index != IP_LOOKUP_NEXT_ARP))
+	    {
+	      p0->error = node->errors[IP4_ARP_ERROR_NON_ARP_ADJ];
+	    }
+	  else
+	    /* Send ARP request. */
+	    {
+	      u32 bi0 = 0;
+	      vlib_buffer_t *b0;
+	      ethernet_arp_header_t *h0;
+	      vnet_hw_interface_t *hw_if0;
+
+	      h0 =
+		vlib_packet_template_get_packet (vm,
+						 &im->ip4_arp_request_packet_template,
+						 &bi0);
+
+	      /* Add rewrite/encap string for ARP packet. */
+	      vnet_rewrite_one_header (adj0[0], h0,
+				       sizeof (ethernet_header_t));
+
+	      hw_if0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
+
+	      /* Src ethernet address in ARP header. */
+	      clib_memcpy (h0->ip4_over_ethernet[0].ethernet,
+			   hw_if0->hw_address,
+			   sizeof (h0->ip4_over_ethernet[0].ethernet));
+
+	      if (is_glean)
+		{
+		  /* The interface's source address is stashed in the Glean Adj */
+		  h0->ip4_over_ethernet[0].ip4 =
+		    adj0->sub_type.glean.receive_addr.ip4;
+
+		  /* Copy in destination address we are requesting. This is the
+		   * glean case, so it's the packet's destination.*/
+		  h0->ip4_over_ethernet[1].ip4.data_u32 =
+		    ip0->dst_address.data_u32;
+		}
+	      else
+		{
+		  /* Src IP address in ARP header. */
+		  if (ip4_src_address_for_packet (lm, sw_if_index0,
+						  &h0->
+						  ip4_over_ethernet[0].ip4))
+		    {
+		      /* No source address available */
+		      p0->error =
+			node->errors[IP4_ARP_ERROR_NO_SOURCE_ADDRESS];
+		      vlib_buffer_free (vm, &bi0, 1);
+		      continue;
+		    }
+
+		  /* Copy in destination address we are requesting from the
+		     incomplete adj */
+		  h0->ip4_over_ethernet[1].ip4.data_u32 =
+		    adj0->sub_type.nbr.next_hop.ip4.as_u32;
+		}
+
+	      vlib_buffer_copy_trace_flag (vm, p0, bi0);
+	      b0 = vlib_get_buffer (vm, bi0);
+	      vnet_buffer (b0)->sw_if_index[VLIB_TX] = sw_if_index0;
+
+	      vlib_buffer_advance (b0, -adj0->rewrite_header.data_bytes);
+
+	      vlib_set_next_frame_buffer (vm, node,
+					  adj0->rewrite_header.next_index,
+					  bi0);
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, IP4_ARP_NEXT_DROP, n_left_to_next_drop);
+    }
+
+  return frame->n_vectors;
+}
+
+static uword
+ip4_arp (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return (ip4_arp_inline (vm, node, frame, 0));
+}
+
+static uword
+ip4_glean (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return (ip4_arp_inline (vm, node, frame, 1));
+}
+
+static char *ip4_arp_error_strings[] = {
+  [IP4_ARP_ERROR_DROP] = "address overflow drops",
+  [IP4_ARP_ERROR_REQUEST_SENT] = "ARP requests sent",
+  [IP4_ARP_ERROR_NON_ARP_ADJ] = "ARPs to non-ARP adjacencies",
+  [IP4_ARP_ERROR_REPLICATE_DROP] = "ARP replication completed",
+  [IP4_ARP_ERROR_REPLICATE_FAIL] = "ARP replication failed",
+  [IP4_ARP_ERROR_NO_SOURCE_ADDRESS] = "no source address for ARP request",
+};
+
+VLIB_REGISTER_NODE (ip4_arp_node) =
+{
+  .function = ip4_arp,.name = "ip4-arp",.vector_size =
+    sizeof (u32),.format_trace = format_ip4_forward_next_trace,.n_errors =
+    ARRAY_LEN (ip4_arp_error_strings),.error_strings =
+    ip4_arp_error_strings,.n_next_nodes = IP4_ARP_N_NEXT,.next_nodes =
+  {
+  [IP4_ARP_NEXT_DROP] = "error-drop",}
+,};
+
+VLIB_REGISTER_NODE (ip4_glean_node) =
+{
+  .function = ip4_glean,.name = "ip4-glean",.vector_size =
+    sizeof (u32),.format_trace = format_ip4_forward_next_trace,.n_errors =
+    ARRAY_LEN (ip4_arp_error_strings),.error_strings =
+    ip4_arp_error_strings,.n_next_nodes = IP4_ARP_N_NEXT,.next_nodes =
+  {
+  [IP4_ARP_NEXT_DROP] = "error-drop",}
+,};
+
+#define foreach_notrace_ip4_arp_error           \
+_(DROP)                                         \
+_(REQUEST_SENT)                                 \
+_(REPLICATE_DROP)                               \
+_(REPLICATE_FAIL)
+
+clib_error_t *
+arp_notrace_init (vlib_main_t * vm)
+{
+  vlib_node_runtime_t *rt = vlib_node_get_runtime (vm, ip4_arp_node.index);
+
+  /* don't trace ARP request packets */
+#define _(a)                                    \
+    vnet_pcap_drop_trace_filter_add_del         \
+        (rt->errors[IP4_ARP_ERROR_##a],         \
+         1 /* is_add */);
+  foreach_notrace_ip4_arp_error;
+#undef _
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (arp_notrace_init);
+
+
+/* Send an ARP request to see if given destination is reachable on given interface. */
+clib_error_t *
+ip4_probe_neighbor (vlib_main_t * vm, ip4_address_t * dst, u32 sw_if_index)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip4_main_t *im = &ip4_main;
+  ethernet_arp_header_t *h;
+  ip4_address_t *src;
+  ip_interface_address_t *ia;
+  ip_adjacency_t *adj;
+  vnet_hw_interface_t *hi;
+  vnet_sw_interface_t *si;
+  vlib_buffer_t *b;
+  u32 bi = 0;
+
+  si = vnet_get_sw_interface (vnm, sw_if_index);
+
+  if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
+    {
+      return clib_error_return (0, "%U: interface %U down",
+				format_ip4_address, dst,
+				format_vnet_sw_if_index_name, vnm,
+				sw_if_index);
+    }
+
+  src =
+    ip4_interface_address_matching_destination (im, dst, sw_if_index, &ia);
+  if (!src)
+    {
+      vnm->api_errno = VNET_API_ERROR_NO_MATCHING_INTERFACE;
+      return clib_error_return
+	(0, "no matching interface address for destination %U (interface %U)",
+	 format_ip4_address, dst,
+	 format_vnet_sw_if_index_name, vnm, sw_if_index);
+    }
+
+  adj = ip_get_adjacency (&im->lookup_main, ia->neighbor_probe_adj_index);
+
+  h =
+    vlib_packet_template_get_packet (vm, &im->ip4_arp_request_packet_template,
+				     &bi);
+
+  hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+
+  clib_memcpy (h->ip4_over_ethernet[0].ethernet, hi->hw_address,
+	       sizeof (h->ip4_over_ethernet[0].ethernet));
+
+  h->ip4_over_ethernet[0].ip4 = src[0];
+  h->ip4_over_ethernet[1].ip4 = dst[0];
+
+  b = vlib_get_buffer (vm, bi);
+  vnet_buffer (b)->sw_if_index[VLIB_RX] =
+    vnet_buffer (b)->sw_if_index[VLIB_TX] = sw_if_index;
+
+  /* Add encapsulation string for software interface (e.g. ethernet header). */
+  vnet_rewrite_one_header (adj[0], h, sizeof (ethernet_header_t));
+  vlib_buffer_advance (b, -adj->rewrite_header.data_bytes);
+
+  {
+    vlib_frame_t *f = vlib_get_frame_to_node (vm, hi->output_node_index);
+    u32 *to_next = vlib_frame_vector_args (f);
+    to_next[0] = bi;
+    f->n_vectors = 1;
+    vlib_put_frame_to_node (vm, hi->output_node_index, f);
+  }
+
+  return /* no error */ 0;
+}
+
+typedef enum
+{
+  IP4_REWRITE_NEXT_DROP,
+  IP4_REWRITE_NEXT_ICMP_ERROR,
+} ip4_rewrite_next_t;
+
+always_inline uword
+ip4_rewrite_inline (vlib_main_t * vm,
+		    vlib_node_runtime_t * node,
+		    vlib_frame_t * frame, int is_midchain)
+{
+  ip_lookup_main_t *lm = &ip4_main.lookup_main;
+  u32 *from = vlib_frame_vector_args (frame);
+  u32 n_left_from, n_left_to_next, *to_next, next_index;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip4_input_node.index);
+
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  u32 cpu_index = os_get_cpu_number ();
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  ip_adjacency_t *adj0, *adj1;
+	  vlib_buffer_t *p0, *p1;
+	  ip4_header_t *ip0, *ip1;
+	  u32 pi0, rw_len0, next0, error0, checksum0, adj_index0;
+	  u32 pi1, rw_len1, next1, error1, checksum1, adj_index1;
+	  u32 tx_sw_if_index0, tx_sw_if_index1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, STORE);
+	    vlib_prefetch_buffer_header (p3, STORE);
+
+	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), STORE);
+	    CLIB_PREFETCH (p3->data, sizeof (ip0[0]), STORE);
+	  }
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+
+	  adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+	  adj_index1 = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
+
+	  /* We should never rewrite a pkt using the MISS adjacency */
+	  ASSERT (adj_index0 && adj_index1);
+
+	  ip0 = vlib_buffer_get_current (p0);
+	  ip1 = vlib_buffer_get_current (p1);
+
+	  error0 = error1 = IP4_ERROR_NONE;
+	  next0 = next1 = IP4_REWRITE_NEXT_DROP;
+
+	  /* Decrement TTL & update checksum.
+	     Works either endian, so no need for byte swap. */
+	  if (PREDICT_TRUE (!(p0->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
+	    {
+	      i32 ttl0 = ip0->ttl;
+
+	      /* Input node should have reject packets with ttl 0. */
+	      ASSERT (ip0->ttl > 0);
+
+	      checksum0 = ip0->checksum + clib_host_to_net_u16 (0x0100);
+	      checksum0 += checksum0 >= 0xffff;
+
+	      ip0->checksum = checksum0;
+	      ttl0 -= 1;
+	      ip0->ttl = ttl0;
+
+	      /*
+	       * If the ttl drops below 1 when forwarding, generate
+	       * an ICMP response.
+	       */
+	      if (PREDICT_FALSE (ttl0 <= 0))
+		{
+		  error0 = IP4_ERROR_TIME_EXPIRED;
+		  vnet_buffer (p0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+		  icmp4_error_set_vnet_buffer (p0, ICMP4_time_exceeded,
+					       ICMP4_time_exceeded_ttl_exceeded_in_transit,
+					       0);
+		  next0 = IP4_REWRITE_NEXT_ICMP_ERROR;
+		}
+
+	      /* Verify checksum. */
+	      ASSERT (ip0->checksum == ip4_header_checksum (ip0));
+	    }
+	  else
+	    {
+	      p0->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
+	    }
+	  if (PREDICT_TRUE (!(p1->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
+	    {
+	      i32 ttl1 = ip1->ttl;
+
+	      /* Input node should have reject packets with ttl 0. */
+	      ASSERT (ip1->ttl > 0);
+
+	      checksum1 = ip1->checksum + clib_host_to_net_u16 (0x0100);
+	      checksum1 += checksum1 >= 0xffff;
+
+	      ip1->checksum = checksum1;
+	      ttl1 -= 1;
+	      ip1->ttl = ttl1;
+
+	      /*
+	       * If the ttl drops below 1 when forwarding, generate
+	       * an ICMP response.
+	       */
+	      if (PREDICT_FALSE (ttl1 <= 0))
+		{
+		  error1 = IP4_ERROR_TIME_EXPIRED;
+		  vnet_buffer (p1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+		  icmp4_error_set_vnet_buffer (p1, ICMP4_time_exceeded,
+					       ICMP4_time_exceeded_ttl_exceeded_in_transit,
+					       0);
+		  next1 = IP4_REWRITE_NEXT_ICMP_ERROR;
+		}
+
+	      /* Verify checksum. */
+	      ASSERT (ip0->checksum == ip4_header_checksum (ip0));
+	      ASSERT (ip1->checksum == ip4_header_checksum (ip1));
+	    }
+	  else
+	    {
+	      p1->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
+	    }
+
+	  /* Rewrite packet header and updates lengths. */
+	  adj0 = ip_get_adjacency (lm, adj_index0);
+	  adj1 = ip_get_adjacency (lm, adj_index1);
+
+	  /* Worth pipelining. No guarantee that adj0,1 are hot... */
+	  rw_len0 = adj0[0].rewrite_header.data_bytes;
+	  rw_len1 = adj1[0].rewrite_header.data_bytes;
+	  vnet_buffer (p0)->ip.save_rewrite_length = rw_len0;
+	  vnet_buffer (p1)->ip.save_rewrite_length = rw_len1;
+
+	  /* Check MTU of outgoing interface. */
+	  error0 =
+	    (vlib_buffer_length_in_chain (vm, p0) >
+	     adj0[0].
+	     rewrite_header.max_l3_packet_bytes ? IP4_ERROR_MTU_EXCEEDED :
+	     error0);
+	  error1 =
+	    (vlib_buffer_length_in_chain (vm, p1) >
+	     adj1[0].
+	     rewrite_header.max_l3_packet_bytes ? IP4_ERROR_MTU_EXCEEDED :
+	     error1);
+
+	  /*
+	   * We've already accounted for an ethernet_header_t elsewhere
+	   */
+	  if (PREDICT_FALSE (rw_len0 > sizeof (ethernet_header_t)))
+	    vlib_increment_combined_counter
+	      (&adjacency_counters, cpu_index, adj_index0,
+	       /* packet increment */ 0,
+	       /* byte increment */ rw_len0 - sizeof (ethernet_header_t));
+
+	  if (PREDICT_FALSE (rw_len1 > sizeof (ethernet_header_t)))
+	    vlib_increment_combined_counter
+	      (&adjacency_counters, cpu_index, adj_index1,
+	       /* packet increment */ 0,
+	       /* byte increment */ rw_len1 - sizeof (ethernet_header_t));
+
+	  /* Don't adjust the buffer for ttl issue; icmp-error node wants
+	   * to see the IP headerr */
+	  if (PREDICT_TRUE (error0 == IP4_ERROR_NONE))
+	    {
+	      next0 = adj0[0].rewrite_header.next_index;
+	      p0->current_data -= rw_len0;
+	      p0->current_length += rw_len0;
+	      tx_sw_if_index0 = adj0[0].rewrite_header.sw_if_index;
+	      vnet_buffer (p0)->sw_if_index[VLIB_TX] = tx_sw_if_index0;
+
+	      vnet_feature_arc_start (lm->output_feature_arc_index,
+				      tx_sw_if_index0, &next0, p0);
+	    }
+	  if (PREDICT_TRUE (error1 == IP4_ERROR_NONE))
+	    {
+	      next1 = adj1[0].rewrite_header.next_index;
+	      p1->current_data -= rw_len1;
+	      p1->current_length += rw_len1;
+
+	      tx_sw_if_index1 = adj1[0].rewrite_header.sw_if_index;
+	      vnet_buffer (p1)->sw_if_index[VLIB_TX] = tx_sw_if_index1;
+
+	      vnet_feature_arc_start (lm->output_feature_arc_index,
+				      tx_sw_if_index1, &next1, p1);
+	    }
+
+	  /* Guess we are only writing on simple Ethernet header. */
+	  vnet_rewrite_two_headers (adj0[0], adj1[0],
+				    ip0, ip1, sizeof (ethernet_header_t));
+
+	  if (is_midchain)
+	    {
+	      adj0->sub_type.midchain.fixup_func (vm, adj0, p0);
+	      adj1->sub_type.midchain.fixup_func (vm, adj1, p1);
+	    }
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, pi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  ip_adjacency_t *adj0;
+	  vlib_buffer_t *p0;
+	  ip4_header_t *ip0;
+	  u32 pi0, rw_len0, adj_index0, next0, error0, checksum0;
+	  u32 tx_sw_if_index0;
+
+	  pi0 = to_next[0] = from[0];
+
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+
+	  /* We should never rewrite a pkt using the MISS adjacency */
+	  ASSERT (adj_index0);
+
+	  adj0 = ip_get_adjacency (lm, adj_index0);
+
+	  ip0 = vlib_buffer_get_current (p0);
+
+	  error0 = IP4_ERROR_NONE;
+	  next0 = IP4_REWRITE_NEXT_DROP;	/* drop on error */
+
+	  /* Decrement TTL & update checksum. */
+	  if (PREDICT_TRUE (!(p0->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
+	    {
+	      i32 ttl0 = ip0->ttl;
+
+	      checksum0 = ip0->checksum + clib_host_to_net_u16 (0x0100);
+
+	      checksum0 += checksum0 >= 0xffff;
+
+	      ip0->checksum = checksum0;
+
+	      ASSERT (ip0->ttl > 0);
+
+	      ttl0 -= 1;
+
+	      ip0->ttl = ttl0;
+
+	      ASSERT (ip0->checksum == ip4_header_checksum (ip0));
+
+	      if (PREDICT_FALSE (ttl0 <= 0))
+		{
+		  /*
+		   * If the ttl drops below 1 when forwarding, generate
+		   * an ICMP response.
+		   */
+		  error0 = IP4_ERROR_TIME_EXPIRED;
+		  next0 = IP4_REWRITE_NEXT_ICMP_ERROR;
+		  vnet_buffer (p0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+		  icmp4_error_set_vnet_buffer (p0, ICMP4_time_exceeded,
+					       ICMP4_time_exceeded_ttl_exceeded_in_transit,
+					       0);
+		}
+	    }
+	  else
+	    {
+	      p0->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
+	    }
+
+	  /* Guess we are only writing on simple Ethernet header. */
+	  vnet_rewrite_one_header (adj0[0], ip0, sizeof (ethernet_header_t));
+
+	  /* Update packet buffer attributes/set output interface. */
+	  rw_len0 = adj0[0].rewrite_header.data_bytes;
+	  vnet_buffer (p0)->ip.save_rewrite_length = rw_len0;
+
+	  if (PREDICT_FALSE (rw_len0 > sizeof (ethernet_header_t)))
+	    vlib_increment_combined_counter
+	      (&adjacency_counters, cpu_index, adj_index0,
+	       /* packet increment */ 0,
+	       /* byte increment */ rw_len0 - sizeof (ethernet_header_t));
+
+	  /* Check MTU of outgoing interface. */
+	  error0 = (vlib_buffer_length_in_chain (vm, p0)
+		    > adj0[0].rewrite_header.max_l3_packet_bytes
+		    ? IP4_ERROR_MTU_EXCEEDED : error0);
+
+	  p0->error = error_node->errors[error0];
+
+	  /* Don't adjust the buffer for ttl issue; icmp-error node wants
+	   * to see the IP headerr */
+	  if (PREDICT_TRUE (error0 == IP4_ERROR_NONE))
+	    {
+	      p0->current_data -= rw_len0;
+	      p0->current_length += rw_len0;
+	      tx_sw_if_index0 = adj0[0].rewrite_header.sw_if_index;
+
+	      vnet_buffer (p0)->sw_if_index[VLIB_TX] = tx_sw_if_index0;
+	      next0 = adj0[0].rewrite_header.next_index;
+
+	      if (is_midchain)
+		{
+		  adj0->sub_type.midchain.fixup_func (vm, adj0, p0);
+		}
+
+	      vnet_feature_arc_start (lm->output_feature_arc_index,
+				      tx_sw_if_index0, &next0, p0);
+
+	    }
+
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  /* Need to do trace after rewrites to pick up new packet data. */
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  return frame->n_vectors;
+}
+
+
+/** @brief IPv4 rewrite node.
+    @node ip4-rewrite
+
+    This is the IPv4 transit-rewrite node: decrement TTL, fix the ipv4
+    header checksum, fetch the ip adjacency, check the outbound mtu,
+    apply the adjacency rewrite, and send pkts to the adjacency
+    rewrite header's rewrite_next_index.
+
+    @param vm vlib_main_t corresponding to the current thread
+    @param node vlib_node_runtime_t
+    @param frame vlib_frame_t whose contents should be dispatched
+
+    @par Graph mechanics: buffer metadata, next index usage
+
+    @em Uses:
+    - <code>vnet_buffer(b)->ip.adj_index[VLIB_TX]</code>
+        - the rewrite adjacency index
+    - <code>adj->lookup_next_index</code>
+        - Must be IP_LOOKUP_NEXT_REWRITE or IP_LOOKUP_NEXT_ARP, otherwise
+          the packet will be dropped.
+    - <code>adj->rewrite_header</code>
+        - Rewrite string length, rewrite string, next_index
+
+    @em Sets:
+    - <code>b->current_data, b->current_length</code>
+        - Updated net of applying the rewrite string
+
+    <em>Next Indices:</em>
+    - <code> adj->rewrite_header.next_index </code>
+      or @c error-drop
+*/
+static uword
+ip4_rewrite (vlib_main_t * vm,
+	     vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ip4_rewrite_inline (vm, node, frame, 0);
+}
+
+static uword
+ip4_midchain (vlib_main_t * vm,
+	      vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ip4_rewrite_inline (vm, node, frame, 1);
+}
+
+
+VLIB_REGISTER_NODE (ip4_rewrite_node) =
+{
+  .function = ip4_rewrite,.name = "ip4-rewrite",.vector_size =
+    sizeof (u32),.format_trace = format_ip4_rewrite_trace,.n_next_nodes =
+    2,.next_nodes =
+  {
+  [IP4_REWRITE_NEXT_DROP] = "error-drop",
+      [IP4_REWRITE_NEXT_ICMP_ERROR] = "ip4-icmp-error",}
+,};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_rewrite_node, ip4_rewrite);
+
+VLIB_REGISTER_NODE (ip4_midchain_node) =
+{
+.function = ip4_midchain,.name = "ip4-midchain",.vector_size =
+    sizeof (u32),.format_trace = format_ip4_forward_next_trace,.sibling_of =
+    "ip4-rewrite",};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_midchain_node, ip4_midchain);
+
+static clib_error_t *
+add_del_interface_table (vlib_main_t * vm,
+			 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index, table_id;
+
+  sw_if_index = ~0;
+
+  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  if (unformat (input, "%d", &table_id))
+    ;
+  else
+    {
+      error = clib_error_return (0, "expected table id `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  {
+    ip4_main_t *im = &ip4_main;
+    u32 fib_index;
+
+    fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4,
+						   table_id);
+
+    //
+    // FIXME-LATER
+    //  changing an interface's table has consequences for any connecteds
+    //  and adj-fibs already installed.
+    //
+    vec_validate (im->fib_index_by_sw_if_index, sw_if_index);
+    im->fib_index_by_sw_if_index[sw_if_index] = fib_index;
+  }
+
+done:
+  return error;
+}
+
+/*?
+ * Place the indicated interface into the supplied IPv4 FIB table (also known
+ * as a VRF). If the FIB table does not exist, this command creates it. To
+ * display the current IPv4 FIB table, use the command '<em>show ip fib</em>'.
+ * FIB table will only be displayed if a route has been added to the table, or
+ * an IP Address is assigned to an interface in the table (which adds a route
+ * automatically).
+ *
+ * @note IP addresses added after setting the interface IP table end up in
+ * the indicated FIB table. If the IP address is added prior to adding the
+ * interface to the FIB table, it will NOT be part of the FIB table. Predictable
+ * but potentially counter-intuitive results occur if you provision interface
+ * addresses in multiple FIBs. Upon RX, packets will be processed in the last
+ * IP table ID provisioned. It might be marginally useful to evade source RPF
+ * drops to put an interface address into multiple FIBs.
+ *
+ * @cliexpar
+ * Example of how to add an interface to an IPv4 FIB table (where 2 is the table-id):
+ * @cliexcmd{set interface ip table GigabitEthernet2/0/0 2}
+ ?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_ip_table_command, static) =
+{
+  .path = "set interface ip table",
+  .function = add_del_interface_table,
+  .short_help = "set interface ip table <interface> <table-id>",
+};
+/* *INDENT-ON* */
+
+
+static uword
+ip4_lookup_multicast (vlib_main_t * vm,
+		      vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  ip4_main_t *im = &ip4_main;
+  vlib_combined_counter_main_t *cm = &load_balance_main.lbm_to_counters;
+  u32 n_left_from, n_left_to_next, *from, *to_next;
+  ip_lookup_next_t next;
+  u32 cpu_index = os_get_cpu_number ();
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  vlib_buffer_t *p0, *p1;
+	  u32 pi0, pi1, lb_index0, lb_index1, wrong_next;
+	  ip_lookup_next_t next0, next1;
+	  ip4_header_t *ip0, *ip1;
+	  u32 fib_index0, fib_index1;
+	  const dpo_id_t *dpo0, *dpo1;
+	  const load_balance_t *lb0, *lb1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), LOAD);
+	    CLIB_PREFETCH (p3->data, sizeof (ip0[0]), LOAD);
+	  }
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+
+	  ip0 = vlib_buffer_get_current (p0);
+	  ip1 = vlib_buffer_get_current (p1);
+
+	  fib_index0 =
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+	  fib_index1 =
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (p1)->sw_if_index[VLIB_RX]);
+	  fib_index0 =
+	    (vnet_buffer (p0)->sw_if_index[VLIB_TX] ==
+	     (u32) ~ 0) ? fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
+	  fib_index1 =
+	    (vnet_buffer (p1)->sw_if_index[VLIB_TX] ==
+	     (u32) ~ 0) ? fib_index1 : vnet_buffer (p1)->sw_if_index[VLIB_TX];
+
+	  lb_index0 = ip4_fib_table_lookup_lb (ip4_fib_get (fib_index0),
+					       &ip0->dst_address);
+	  lb_index1 = ip4_fib_table_lookup_lb (ip4_fib_get (fib_index1),
+					       &ip1->dst_address);
+
+	  lb0 = load_balance_get (lb_index0);
+	  lb1 = load_balance_get (lb_index1);
+
+	  ASSERT (lb0->lb_n_buckets > 0);
+	  ASSERT (is_pow2 (lb0->lb_n_buckets));
+	  ASSERT (lb1->lb_n_buckets > 0);
+	  ASSERT (is_pow2 (lb1->lb_n_buckets));
+
+	  vnet_buffer (p0)->ip.flow_hash = ip4_compute_flow_hash
+	    (ip0, lb0->lb_hash_config);
+
+	  vnet_buffer (p1)->ip.flow_hash = ip4_compute_flow_hash
+	    (ip1, lb1->lb_hash_config);
+
+	  dpo0 = load_balance_get_bucket_i (lb0,
+					    (vnet_buffer (p0)->ip.flow_hash &
+					     (lb0->lb_n_buckets_minus_1)));
+	  dpo1 = load_balance_get_bucket_i (lb1,
+					    (vnet_buffer (p1)->ip.flow_hash &
+					     (lb1->lb_n_buckets_minus_1)));
+
+	  next0 = dpo0->dpoi_next_node;
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+	  next1 = dpo1->dpoi_next_node;
+	  vnet_buffer (p1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
+
+	  if (1)		/* $$$$$$ HACK FIXME */
+	    vlib_increment_combined_counter
+	      (cm, cpu_index, lb_index0, 1,
+	       vlib_buffer_length_in_chain (vm, p0));
+	  if (1)		/* $$$$$$ HACK FIXME */
+	    vlib_increment_combined_counter
+	      (cm, cpu_index, lb_index1, 1,
+	       vlib_buffer_length_in_chain (vm, p1));
+
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  wrong_next = (next0 != next) + 2 * (next1 != next);
+	  if (PREDICT_FALSE (wrong_next != 0))
+	    {
+	      switch (wrong_next)
+		{
+		case 1:
+		  /* A B A */
+		  to_next[-2] = pi1;
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node, next0, pi0);
+		  break;
+
+		case 2:
+		  /* A A B */
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node, next1, pi1);
+		  break;
+
+		case 3:
+		  /* A B C */
+		  to_next -= 2;
+		  n_left_to_next += 2;
+		  vlib_set_next_frame_buffer (vm, node, next0, pi0);
+		  vlib_set_next_frame_buffer (vm, node, next1, pi1);
+		  if (next0 == next1)
+		    {
+		      /* A B B */
+		      vlib_put_next_frame (vm, node, next, n_left_to_next);
+		      next = next1;
+		      vlib_get_next_frame (vm, node, next, to_next,
+					   n_left_to_next);
+		    }
+		}
+	    }
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip4_header_t *ip0;
+	  u32 pi0, lb_index0;
+	  ip_lookup_next_t next0;
+	  u32 fib_index0;
+	  const dpo_id_t *dpo0;
+	  const load_balance_t *lb0;
+
+	  pi0 = from[0];
+	  to_next[0] = pi0;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  ip0 = vlib_buffer_get_current (p0);
+
+	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
+				vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+	  fib_index0 = (vnet_buffer (p0)->sw_if_index[VLIB_TX] == (u32) ~ 0) ?
+	    fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
+
+	  lb_index0 = ip4_fib_table_lookup_lb (ip4_fib_get (fib_index0),
+					       &ip0->dst_address);
+
+	  lb0 = load_balance_get (lb_index0);
+
+	  ASSERT (lb0->lb_n_buckets > 0);
+	  ASSERT (is_pow2 (lb0->lb_n_buckets));
+
+	  vnet_buffer (p0)->ip.flow_hash = ip4_compute_flow_hash
+	    (ip0, lb0->lb_hash_config);
+
+	  dpo0 = load_balance_get_bucket_i (lb0,
+					    (vnet_buffer (p0)->ip.flow_hash &
+					     (lb0->lb_n_buckets_minus_1)));
+
+	  next0 = dpo0->dpoi_next_node;
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+
+	  if (1)		/* $$$$$$ HACK FIXME */
+	    vlib_increment_combined_counter
+	      (cm, cpu_index, lb_index0, 1,
+	       vlib_buffer_length_in_chain (vm, p0));
+
+	  from += 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  n_left_from -= 1;
+
+	  if (PREDICT_FALSE (next0 != next))
+	    {
+	      n_left_to_next += 1;
+	      vlib_put_next_frame (vm, node, next, n_left_to_next);
+	      next = next0;
+	      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
+	      to_next[0] = pi0;
+	      to_next += 1;
+	      n_left_to_next -= 1;
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next, n_left_to_next);
+    }
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (ip4_lookup_multicast_node, static) =
+{
+.function = ip4_lookup_multicast,.name =
+    "ip4-lookup-multicast",.vector_size = sizeof (u32),.sibling_of =
+    "ip4-lookup",.format_trace = format_ip4_lookup_trace,.n_next_nodes = 0,};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_lookup_multicast_node,
+			      ip4_lookup_multicast);
+
+VLIB_REGISTER_NODE (ip4_multicast_node, static) =
+{
+  .function = ip4_drop,.name = "ip4-multicast",.vector_size =
+    sizeof (u32),.format_trace = format_ip4_forward_next_trace,.n_next_nodes =
+    1,.next_nodes =
+  {
+  [0] = "error-drop",}
+,};
+
+int
+ip4_lookup_validate (ip4_address_t * a, u32 fib_index0)
+{
+  ip4_fib_mtrie_t *mtrie0;
+  ip4_fib_mtrie_leaf_t leaf0;
+  u32 lbi0;
+
+  mtrie0 = &ip4_fib_get (fib_index0)->mtrie;
+
+  leaf0 = IP4_FIB_MTRIE_LEAF_ROOT;
+  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, a, 0);
+  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, a, 1);
+  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, a, 2);
+  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, a, 3);
+
+  /* Handle default route. */
+  leaf0 = (leaf0 == IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie0->default_leaf : leaf0);
+
+  lbi0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
+
+  return lbi0 == ip4_fib_table_lookup_lb (ip4_fib_get (fib_index0), a);
+}
+
+static clib_error_t *
+test_lookup_command_fn (vlib_main_t * vm,
+			unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  ip4_fib_t *fib;
+  u32 table_id = 0;
+  f64 count = 1;
+  u32 n;
+  int i;
+  ip4_address_t ip4_base_address;
+  u64 errors = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "table %d", &table_id))
+	{
+	  /* Make sure the entry exists. */
+	  fib = ip4_fib_get (table_id);
+	  if ((fib) && (fib->index != table_id))
+	    return clib_error_return (0, "<fib-index> %d does not exist",
+				      table_id);
+	}
+      else if (unformat (input, "count %f", &count))
+	;
+
+      else if (unformat (input, "%U",
+			 unformat_ip4_address, &ip4_base_address))
+	;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+
+  n = count;
+
+  for (i = 0; i < n; i++)
+    {
+      if (!ip4_lookup_validate (&ip4_base_address, table_id))
+	errors++;
+
+      ip4_base_address.as_u32 =
+	clib_host_to_net_u32 (1 +
+			      clib_net_to_host_u32 (ip4_base_address.as_u32));
+    }
+
+  if (errors)
+    vlib_cli_output (vm, "%llu errors out of %d lookups\n", errors, n);
+  else
+    vlib_cli_output (vm, "No errors in %d lookups\n", n);
+
+  return 0;
+}
+
+/*?
+ * Perform a lookup of an IPv4 Address (or range of addresses) in the
+ * given FIB table to determine if there is a conflict with the
+ * adjacency table. The fib-id can be determined by using the
+ * '<em>show ip fib</em>' command. If fib-id is not entered, default value
+ * of 0 is used.
+ *
+ * @todo This command uses fib-id, other commands use table-id (not
+ * just a name, they are different indexes). Would like to change this
+ * to table-id for consistency.
+ *
+ * @cliexpar
+ * Example of how to run the test lookup command:
+ * @cliexstart{test lookup 172.16.1.1 table 1 count 2}
+ * No errors in 2 lookups
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lookup_test_command, static) =
+{
+  .path = "test lookup",
+  .short_help = "test lookup <ipv4-addr> [table <fib-id>] [count <nn>]",
+  .function = test_lookup_command_fn,
+};
+/* *INDENT-ON* */
+
+int
+vnet_set_ip4_flow_hash (u32 table_id, u32 flow_hash_config)
+{
+  ip4_main_t *im4 = &ip4_main;
+  ip4_fib_t *fib;
+  uword *p = hash_get (im4->fib_index_by_table_id, table_id);
+
+  if (p == 0)
+    return VNET_API_ERROR_NO_SUCH_FIB;
+
+  fib = ip4_fib_get (p[0]);
+
+  fib->flow_hash_config = flow_hash_config;
+  return 0;
+}
+
+static clib_error_t *
+set_ip_flow_hash_command_fn (vlib_main_t * vm,
+			     unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  int matched = 0;
+  u32 table_id = 0;
+  u32 flow_hash_config = 0;
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "table %d", &table_id))
+	matched = 1;
+#define _(a,v) \
+    else if (unformat (input, #a)) { flow_hash_config |= v; matched=1;}
+      foreach_flow_hash_bit
+#undef _
+	else
+	break;
+    }
+
+  if (matched == 0)
+    return clib_error_return (0, "unknown input `%U'",
+			      format_unformat_error, input);
+
+  rv = vnet_set_ip4_flow_hash (table_id, flow_hash_config);
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case VNET_API_ERROR_NO_SUCH_FIB:
+      return clib_error_return (0, "no such FIB table %d", table_id);
+
+    default:
+      clib_warning ("BUG: illegal flow hash config 0x%x", flow_hash_config);
+      break;
+    }
+
+  return 0;
+}
+
+/*?
+ * Configure the set of IPv4 fields used by the flow hash.
+ *
+ * @cliexpar
+ * Example of how to set the flow hash on a given table:
+ * @cliexcmd{set ip flow-hash table 7 dst sport dport proto}
+ * Example of display the configured flow hash:
+ * @cliexstart{show ip fib}
+ * ipv4-VRF:0, fib_index 0, flow hash: src dst sport dport proto
+ * 0.0.0.0/0
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:0 buckets:1 uRPF:0 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 0.0.0.0/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:1 buckets:1 uRPF:1 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 224.0.0.0/8
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:3 buckets:1 uRPF:3 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 6.0.1.2/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:30 buckets:1 uRPF:29 to:[0:0]]
+ *     [0] [@3]: arp-ipv4: via 6.0.0.1 af_packet0
+ * 7.0.0.1/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:31 buckets:4 uRPF:30 to:[0:0]]
+ *     [0] [@3]: arp-ipv4: via 6.0.0.2 af_packet0
+ *     [1] [@3]: arp-ipv4: via 6.0.0.2 af_packet0
+ *     [2] [@3]: arp-ipv4: via 6.0.0.2 af_packet0
+ *     [3] [@3]: arp-ipv4: via 6.0.0.1 af_packet0
+ * 240.0.0.0/8
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:2 buckets:1 uRPF:2 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 255.255.255.255/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:4 buckets:1 uRPF:4 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * ipv4-VRF:7, fib_index 1, flow hash: dst sport dport proto
+ * 0.0.0.0/0
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:12 buckets:1 uRPF:11 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 0.0.0.0/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:13 buckets:1 uRPF:12 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 172.16.1.0/24
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:17 buckets:1 uRPF:16 to:[0:0]]
+ *     [0] [@4]: ipv4-glean: af_packet0
+ * 172.16.1.1/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:18 buckets:1 uRPF:17 to:[1:84]]
+ *     [0] [@2]: dpo-receive: 172.16.1.1 on af_packet0
+ * 172.16.1.2/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:21 buckets:1 uRPF:20 to:[0:0]]
+ *     [0] [@5]: ipv4 via 172.16.1.2 af_packet0: IP4: 02:fe:9e:70:7a:2b -> 26:a5:f6:9c:3a:36
+ * 172.16.2.0/24
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:19 buckets:1 uRPF:18 to:[0:0]]
+ *     [0] [@4]: ipv4-glean: af_packet1
+ * 172.16.2.1/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:20 buckets:1 uRPF:19 to:[0:0]]
+ *     [0] [@2]: dpo-receive: 172.16.2.1 on af_packet1
+ * 224.0.0.0/8
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:15 buckets:1 uRPF:14 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 240.0.0.0/8
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:14 buckets:1 uRPF:13 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * 255.255.255.255/32
+ *   unicast-ip4-chain
+ *   [@0]: dpo-load-balance: [index:16 buckets:1 uRPF:15 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_ip_flow_hash_command, static) =
+{
+  .path = "set ip flow-hash",
+  .short_help =
+  "set ip flow-hash table <table-id> [src] [dst] [sport] [dport] [proto] [reverse]",
+  .function = set_ip_flow_hash_command_fn,
+};
+/* *INDENT-ON* */
+
+int
+vnet_set_ip4_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
+			     u32 table_index)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  ip4_main_t *ipm = &ip4_main;
+  ip_lookup_main_t *lm = &ipm->lookup_main;
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  ip4_address_t *if_addr;
+
+  if (pool_is_free_index (im->sw_interfaces, sw_if_index))
+    return VNET_API_ERROR_NO_MATCHING_INTERFACE;
+
+  if (table_index != ~0 && pool_is_free_index (cm->tables, table_index))
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+  vec_validate (lm->classify_table_index_by_sw_if_index, sw_if_index);
+  lm->classify_table_index_by_sw_if_index[sw_if_index] = table_index;
+
+  if_addr = ip4_interface_first_address (ipm, sw_if_index, NULL);
+
+  if (NULL != if_addr)
+    {
+      fib_prefix_t pfx = {
+	.fp_len = 32,
+	.fp_proto = FIB_PROTOCOL_IP4,
+	.fp_addr.ip4 = *if_addr,
+      };
+      u32 fib_index;
+
+      fib_index = fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4,
+						       sw_if_index);
+
+
+      if (table_index != (u32) ~ 0)
+	{
+	  dpo_id_t dpo = DPO_INVALID;
+
+	  dpo_set (&dpo,
+		   DPO_CLASSIFY,
+		   DPO_PROTO_IP4,
+		   classify_dpo_create (DPO_PROTO_IP4, table_index));
+
+	  fib_table_entry_special_dpo_add (fib_index,
+					   &pfx,
+					   FIB_SOURCE_CLASSIFY,
+					   FIB_ENTRY_FLAG_NONE, &dpo);
+	  dpo_reset (&dpo);
+	}
+      else
+	{
+	  fib_table_entry_special_remove (fib_index,
+					  &pfx, FIB_SOURCE_CLASSIFY);
+	}
+    }
+
+  return 0;
+}
+
+static clib_error_t *
+set_ip_classify_command_fn (vlib_main_t * vm,
+			    unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+  u32 table_index = ~0;
+  int table_index_set = 0;
+  u32 sw_if_index = ~0;
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "table-index %d", &table_index))
+	table_index_set = 1;
+      else if (unformat (input, "intfc %U", unformat_vnet_sw_interface,
+			 vnet_get_main (), &sw_if_index))
+	;
+      else
+	break;
+    }
+
+  if (table_index_set == 0)
+    return clib_error_return (0, "classify table-index must be specified");
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "interface / subif must be specified");
+
+  rv = vnet_set_ip4_classify_intfc (vm, sw_if_index, table_index);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case VNET_API_ERROR_NO_MATCHING_INTERFACE:
+      return clib_error_return (0, "No such interface");
+
+    case VNET_API_ERROR_NO_SUCH_ENTRY:
+      return clib_error_return (0, "No such classifier table");
+    }
+  return 0;
+}
+
+/*?
+ * Assign a classification table to an interface. The classification
+ * table is created using the '<em>classify table</em>' and '<em>classify session</em>'
+ * commands. Once the table is create, use this command to filter packets
+ * on an interface.
+ *
+ * @cliexpar
+ * Example of how to assign a classification table to an interface:
+ * @cliexcmd{set ip classify intfc GigabitEthernet2/0/0 table-index 1}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_ip_classify_command, static) =
+{
+    .path = "set ip classify",
+    .short_help =
+    "set ip classify intfc <interface> table-index <classify-idx>",
+    .function = set_ip_classify_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip4_input.c b/src/vnet/ip/ip4_input.c
new file mode 100644
index 00000000..1cf5e0b8
--- /dev/null
+++ b/src/vnet/ip/ip4_input.c
@@ -0,0 +1,507 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip4_input.c: IP v4 input node
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ppp/ppp.h>
+#include <vnet/hdlc/hdlc.h>
+
+typedef struct
+{
+  u8 packet_data[64];
+} ip4_input_trace_t;
+
+static u8 *
+format_ip4_input_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  ip4_input_trace_t *t = va_arg (*va, ip4_input_trace_t *);
+
+  s = format (s, "%U",
+	      format_ip4_header, t->packet_data, sizeof (t->packet_data));
+
+  return s;
+}
+
+typedef enum
+{
+  IP4_INPUT_NEXT_DROP,
+  IP4_INPUT_NEXT_PUNT,
+  IP4_INPUT_NEXT_LOOKUP,
+  IP4_INPUT_NEXT_LOOKUP_MULTICAST,
+  IP4_INPUT_NEXT_ICMP_ERROR,
+  IP4_INPUT_N_NEXT,
+} ip4_input_next_t;
+
+/* Validate IP v4 packets and pass them either to forwarding code
+   or drop/punt exception packets. */
+always_inline uword
+ip4_input_inline (vlib_main_t * vm,
+		  vlib_node_runtime_t * node,
+		  vlib_frame_t * frame, int verify_checksum)
+{
+  ip4_main_t *im = &ip4_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  ip_lookup_main_t *lm = &im->lookup_main;
+  u32 n_left_from, *from, *to_next;
+  ip4_input_next_t next_index;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip4_input_node.index);
+  vlib_simple_counter_main_t *cm;
+  u32 cpu_index = os_get_cpu_number ();
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+				   /* stride */ 1,
+				   sizeof (ip4_input_trace_t));
+
+  cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
+			 VNET_INTERFACE_COUNTER_IP4);
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  vlib_buffer_t *p0, *p1;
+	  ip4_header_t *ip0, *ip1;
+	  u32 sw_if_index0, pi0, ip_len0, cur_len0, next0;
+	  u32 sw_if_index1, pi1, ip_len1, cur_len1, next1;
+	  i32 len_diff0, len_diff1;
+	  u8 error0, error1, arc0, arc1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), LOAD);
+	    CLIB_PREFETCH (p3->data, sizeof (ip1[0]), LOAD);
+	  }
+
+	  to_next[0] = pi0 = from[0];
+	  to_next[1] = pi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+
+	  ip0 = vlib_buffer_get_current (p0);
+	  ip1 = vlib_buffer_get_current (p1);
+
+	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
+	  sw_if_index1 = vnet_buffer (p1)->sw_if_index[VLIB_RX];
+
+	  error0 = error1 = IP4_ERROR_NONE;
+
+	  if (PREDICT_FALSE (ip4_address_is_multicast (&ip0->dst_address)))
+	    {
+	      arc0 = lm->mcast_feature_arc_index;
+	      next0 = IP4_INPUT_NEXT_LOOKUP_MULTICAST;
+	    }
+	  else
+	    {
+	      arc0 = lm->ucast_feature_arc_index;
+	      next0 = IP4_INPUT_NEXT_LOOKUP;
+	      if (PREDICT_FALSE (ip0->ttl < 1))
+		error0 = IP4_ERROR_TIME_EXPIRED;
+	    }
+
+	  if (PREDICT_FALSE (ip4_address_is_multicast (&ip1->dst_address)))
+	    {
+	      arc1 = lm->mcast_feature_arc_index;
+	      next1 = IP4_INPUT_NEXT_LOOKUP_MULTICAST;
+	    }
+	  else
+	    {
+	      arc1 = lm->ucast_feature_arc_index;
+	      next1 = IP4_INPUT_NEXT_LOOKUP;
+	      if (PREDICT_FALSE (ip1->ttl < 1))
+		error1 = IP4_ERROR_TIME_EXPIRED;
+	    }
+
+	  vnet_buffer (p0)->ip.adj_index[VLIB_RX] = ~0;
+	  vnet_buffer (p1)->ip.adj_index[VLIB_RX] = ~0;
+
+	  vnet_feature_arc_start (arc0, sw_if_index0, &next0, p0);
+	  vnet_feature_arc_start (arc1, sw_if_index1, &next1, p1);
+
+	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
+	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index1, 1);
+
+	  /* Punt packets with options or wrong version. */
+	  if (PREDICT_FALSE (ip0->ip_version_and_header_length != 0x45))
+	    error0 = (ip0->ip_version_and_header_length & 0xf) != 5 ?
+	      IP4_ERROR_OPTIONS : IP4_ERROR_VERSION;
+
+	  if (PREDICT_FALSE (ip1->ip_version_and_header_length != 0x45))
+	    error1 = (ip1->ip_version_and_header_length & 0xf) != 5 ?
+	      IP4_ERROR_OPTIONS : IP4_ERROR_VERSION;
+
+	  /* Verify header checksum. */
+	  if (verify_checksum)
+	    {
+	      ip_csum_t sum0, sum1;
+
+	      ip4_partial_header_checksum_x1 (ip0, sum0);
+	      ip4_partial_header_checksum_x1 (ip1, sum1);
+
+	      error0 = 0xffff != ip_csum_fold (sum0) ?
+		IP4_ERROR_BAD_CHECKSUM : error0;
+	      error1 = 0xffff != ip_csum_fold (sum1) ?
+		IP4_ERROR_BAD_CHECKSUM : error1;
+	    }
+
+	  /* Drop fragmentation offset 1 packets. */
+	  error0 = ip4_get_fragment_offset (ip0) == 1 ?
+	    IP4_ERROR_FRAGMENT_OFFSET_ONE : error0;
+	  error1 = ip4_get_fragment_offset (ip1) == 1 ?
+	    IP4_ERROR_FRAGMENT_OFFSET_ONE : error1;
+
+	  /* Verify lengths. */
+	  ip_len0 = clib_net_to_host_u16 (ip0->length);
+	  ip_len1 = clib_net_to_host_u16 (ip1->length);
+
+	  /* IP length must be at least minimal IP header. */
+	  error0 = ip_len0 < sizeof (ip0[0]) ? IP4_ERROR_TOO_SHORT : error0;
+	  error1 = ip_len1 < sizeof (ip1[0]) ? IP4_ERROR_TOO_SHORT : error1;
+
+	  cur_len0 = vlib_buffer_length_in_chain (vm, p0);
+	  cur_len1 = vlib_buffer_length_in_chain (vm, p1);
+
+	  len_diff0 = cur_len0 - ip_len0;
+	  len_diff1 = cur_len1 - ip_len1;
+
+	  error0 = len_diff0 < 0 ? IP4_ERROR_BAD_LENGTH : error0;
+	  error1 = len_diff1 < 0 ? IP4_ERROR_BAD_LENGTH : error1;
+
+	  p0->error = error_node->errors[error0];
+	  p1->error = error_node->errors[error1];
+
+	  if (PREDICT_FALSE (error0 != IP4_ERROR_NONE))
+	    {
+	      if (error0 == IP4_ERROR_TIME_EXPIRED)
+		{
+		  icmp4_error_set_vnet_buffer (p0, ICMP4_time_exceeded,
+					       ICMP4_time_exceeded_ttl_exceeded_in_transit,
+					       0);
+		  next0 = IP4_INPUT_NEXT_ICMP_ERROR;
+		}
+	      else
+		next0 = error0 != IP4_ERROR_OPTIONS ?
+		  IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
+	    }
+	  if (PREDICT_FALSE (error1 != IP4_ERROR_NONE))
+	    {
+	      if (error1 == IP4_ERROR_TIME_EXPIRED)
+		{
+		  icmp4_error_set_vnet_buffer (p1, ICMP4_time_exceeded,
+					       ICMP4_time_exceeded_ttl_exceeded_in_transit,
+					       0);
+		  next1 = IP4_INPUT_NEXT_ICMP_ERROR;
+		}
+	      else
+		next1 = error1 != IP4_ERROR_OPTIONS ?
+		  IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
+	    }
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, pi1, next0, next1);
+	}
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip4_header_t *ip0;
+	  u32 sw_if_index0, pi0, ip_len0, cur_len0, next0;
+	  i32 len_diff0;
+	  u8 error0, arc0;
+
+	  pi0 = from[0];
+	  to_next[0] = pi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip0 = vlib_buffer_get_current (p0);
+
+	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
+
+	  error0 = IP4_ERROR_NONE;
+
+	  if (PREDICT_FALSE (ip4_address_is_multicast (&ip0->dst_address)))
+	    {
+	      arc0 = lm->mcast_feature_arc_index;
+	      next0 = IP4_INPUT_NEXT_LOOKUP_MULTICAST;
+	    }
+	  else
+	    {
+	      arc0 = lm->ucast_feature_arc_index;
+	      next0 = IP4_INPUT_NEXT_LOOKUP;
+	      if (PREDICT_FALSE (ip0->ttl < 1))
+		error0 = IP4_ERROR_TIME_EXPIRED;
+	    }
+
+	  vnet_buffer (p0)->ip.adj_index[VLIB_RX] = ~0;
+	  vnet_feature_arc_start (arc0, sw_if_index0, &next0, p0);
+
+	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
+
+	  /* Punt packets with options or wrong version. */
+	  if (PREDICT_FALSE (ip0->ip_version_and_header_length != 0x45))
+	    error0 = (ip0->ip_version_and_header_length & 0xf) != 5 ?
+	      IP4_ERROR_OPTIONS : IP4_ERROR_VERSION;
+
+	  /* Verify header checksum. */
+	  if (verify_checksum)
+	    {
+	      ip_csum_t sum0;
+
+	      ip4_partial_header_checksum_x1 (ip0, sum0);
+	      error0 =
+		0xffff !=
+		ip_csum_fold (sum0) ? IP4_ERROR_BAD_CHECKSUM : error0;
+	    }
+
+	  /* Drop fragmentation offset 1 packets. */
+	  error0 =
+	    ip4_get_fragment_offset (ip0) ==
+	    1 ? IP4_ERROR_FRAGMENT_OFFSET_ONE : error0;
+
+	  /* Verify lengths. */
+	  ip_len0 = clib_net_to_host_u16 (ip0->length);
+
+	  /* IP length must be at least minimal IP header. */
+	  error0 = ip_len0 < sizeof (ip0[0]) ? IP4_ERROR_TOO_SHORT : error0;
+
+	  cur_len0 = vlib_buffer_length_in_chain (vm, p0);
+	  len_diff0 = cur_len0 - ip_len0;
+	  error0 = len_diff0 < 0 ? IP4_ERROR_BAD_LENGTH : error0;
+
+	  p0->error = error_node->errors[error0];
+	  if (PREDICT_FALSE (error0 != IP4_ERROR_NONE))
+	    {
+	      if (error0 == IP4_ERROR_TIME_EXPIRED)
+		{
+		  icmp4_error_set_vnet_buffer (p0, ICMP4_time_exceeded,
+					       ICMP4_time_exceeded_ttl_exceeded_in_transit,
+					       0);
+		  next0 = IP4_INPUT_NEXT_ICMP_ERROR;
+		}
+	      else
+		next0 = error0 != IP4_ERROR_OPTIONS ?
+		  IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/** \brief IPv4 input node.
+    @node ip4-input
+
+    This is the IPv4 input node: validates ip4 header checksums,
+    verifies ip header lengths, discards pkts with expired TTLs,
+    and sends pkts to the set of ip feature nodes configured on
+    the rx interface.
+
+    @param vm vlib_main_t corresponding to the current thread
+    @param node vlib_node_runtime_t
+    @param frame vlib_frame_t whose contents should be dispatched
+
+    @par Graph mechanics: buffer metadata, next index usage
+
+    @em Uses:
+    - vnet_feature_config_main_t cm corresponding to each pkt's dst address unicast /
+      multicast status.
+    - <code>b->current_config_index</code> corresponding to each pkt's
+      rx sw_if_index.
+         - This sets the per-packet graph trajectory, ensuring that
+           each packet visits the per-interface features in order.
+
+    - <code>vnet_buffer(b)->sw_if_index[VLIB_RX]</code>
+        - Indicates the @c sw_if_index value of the interface that the
+	  packet was received on.
+
+    @em Sets:
+    - <code>vnet_buffer(b)->ip.adj_index[VLIB_TX]</code>
+        - The lookup result adjacency index.
+
+    <em>Next Indices:</em>
+    - Dispatches pkts to the (first) feature node:
+      <code> vnet_get_config_data (... &next0 ...); </code>
+      or @c error-drop
+*/
+static uword
+ip4_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ip4_input_inline (vm, node, frame, /* verify_checksum */ 1);
+}
+
+static uword
+ip4_input_no_checksum (vlib_main_t * vm,
+		       vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ip4_input_inline (vm, node, frame, /* verify_checksum */ 0);
+}
+
+static char *ip4_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ip4_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_input_node) = {
+  .function = ip4_input,
+  .name = "ip4-input",
+  .vector_size = sizeof (u32),
+
+  .n_errors = IP4_N_ERROR,
+  .error_strings = ip4_error_strings,
+
+  .n_next_nodes = IP4_INPUT_N_NEXT,
+  .next_nodes = {
+    [IP4_INPUT_NEXT_DROP] = "error-drop",
+    [IP4_INPUT_NEXT_PUNT] = "error-punt",
+    [IP4_INPUT_NEXT_LOOKUP] = "ip4-lookup",
+    [IP4_INPUT_NEXT_LOOKUP_MULTICAST] = "ip4-lookup-multicast",
+    [IP4_INPUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
+  },
+
+  .format_buffer = format_ip4_header,
+  .format_trace = format_ip4_input_trace,
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_input_node, ip4_input);
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_input_no_checksum_node,static) = {
+  .function = ip4_input_no_checksum,
+  .name = "ip4-input-no-checksum",
+  .vector_size = sizeof (u32),
+
+  .n_next_nodes = IP4_INPUT_N_NEXT,
+  .next_nodes = {
+    [IP4_INPUT_NEXT_DROP] = "error-drop",
+    [IP4_INPUT_NEXT_PUNT] = "error-punt",
+    [IP4_INPUT_NEXT_LOOKUP] = "ip4-lookup",
+    [IP4_INPUT_NEXT_LOOKUP_MULTICAST] = "ip4-lookup-multicast",
+    [IP4_INPUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
+  },
+
+  .format_buffer = format_ip4_header,
+  .format_trace = format_ip4_input_trace,
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_input_no_checksum_node,
+			      ip4_input_no_checksum);
+
+static clib_error_t *
+ip4_init (vlib_main_t * vm)
+{
+  clib_error_t *error;
+
+  ethernet_register_input_type (vm, ETHERNET_TYPE_IP4, ip4_input_node.index);
+  ppp_register_input_protocol (vm, PPP_PROTOCOL_ip4, ip4_input_node.index);
+  hdlc_register_input_protocol (vm, HDLC_PROTOCOL_ip4, ip4_input_node.index);
+
+  {
+    pg_node_t *pn;
+    pn = pg_get_node (ip4_input_node.index);
+    pn->unformat_edit = unformat_pg_ip4_header;
+    pn = pg_get_node (ip4_input_no_checksum_node.index);
+    pn->unformat_edit = unformat_pg_ip4_header;
+  }
+
+  if ((error = vlib_call_init_function (vm, ip4_cli_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ip4_source_check_init)))
+    return error;
+
+  if ((error = vlib_call_init_function
+       (vm, ip4_source_and_port_range_check_init)))
+    return error;
+
+  /* Set flow hash to something non-zero. */
+  ip4_main.flow_hash_seed = 0xdeadbeef;
+
+  /* Default TTL for packets we generate. */
+  ip4_main.host_config.ttl = 64;
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (ip4_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip4_mtrie.c b/src/vnet/ip/ip4_mtrie.c
new file mode 100644
index 00000000..6e3d0e80
--- /dev/null
+++ b/src/vnet/ip/ip4_mtrie.c
@@ -0,0 +1,568 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip4_fib.h: ip4 mtrie fib
+ *
+ * Copyright (c) 2012 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+#include <vnet/fib/fib_entry.h>
+
+static void
+ply_init (ip4_fib_mtrie_ply_t * p, ip4_fib_mtrie_leaf_t init,
+	  uword prefix_len)
+{
+  p->n_non_empty_leafs =
+    ip4_fib_mtrie_leaf_is_empty (init) ? 0 : ARRAY_LEN (p->leaves);
+  memset (p->dst_address_bits_of_leaves, prefix_len,
+	  sizeof (p->dst_address_bits_of_leaves));
+
+  /* Initialize leaves. */
+#ifdef CLIB_HAVE_VEC128
+  {
+    u32x4 *l, init_x4;
+
+#ifndef __ALTIVEC__
+    init_x4 = u32x4_splat (init);
+#else
+    {
+      u32x4_union_t y;
+      y.as_u32[0] = init;
+      y.as_u32[1] = init;
+      y.as_u32[2] = init;
+      y.as_u32[3] = init;
+      init_x4 = y.as_u32x4;
+    }
+#endif
+
+    for (l = p->leaves_as_u32x4;
+	 l < p->leaves_as_u32x4 + ARRAY_LEN (p->leaves_as_u32x4); l += 4)
+      {
+	l[0] = init_x4;
+	l[1] = init_x4;
+	l[2] = init_x4;
+	l[3] = init_x4;
+      }
+  }
+#else
+  {
+    u32 *l;
+
+    for (l = p->leaves; l < p->leaves + ARRAY_LEN (p->leaves); l += 4)
+      {
+	l[0] = init;
+	l[1] = init;
+	l[2] = init;
+	l[3] = init;
+      }
+  }
+#endif
+}
+
+static ip4_fib_mtrie_leaf_t
+ply_create (ip4_fib_mtrie_t * m, ip4_fib_mtrie_leaf_t init_leaf,
+	    uword prefix_len)
+{
+  ip4_fib_mtrie_ply_t *p;
+
+  /* Get cache aligned ply. */
+  pool_get_aligned (m->ply_pool, p, sizeof (p[0]));
+
+  ply_init (p, init_leaf, prefix_len);
+  return ip4_fib_mtrie_leaf_set_next_ply_index (p - m->ply_pool);
+}
+
+always_inline ip4_fib_mtrie_ply_t *
+get_next_ply_for_leaf (ip4_fib_mtrie_t * m, ip4_fib_mtrie_leaf_t l)
+{
+  uword n = ip4_fib_mtrie_leaf_get_next_ply_index (l);
+  /* It better not be the root ply. */
+  ASSERT (n != 0);
+  return pool_elt_at_index (m->ply_pool, n);
+}
+
+static void
+ply_free (ip4_fib_mtrie_t * m, ip4_fib_mtrie_ply_t * p)
+{
+  uword i, is_root;
+
+  is_root = p - m->ply_pool == 0;
+
+  for (i = 0; i < ARRAY_LEN (p->leaves); i++)
+    {
+      ip4_fib_mtrie_leaf_t l = p->leaves[i];
+      if (ip4_fib_mtrie_leaf_is_next_ply (l))
+	ply_free (m, get_next_ply_for_leaf (m, l));
+    }
+
+  if (is_root)
+    ply_init (p, IP4_FIB_MTRIE_LEAF_EMPTY, /* prefix_len */ 0);
+  else
+    pool_put (m->ply_pool, p);
+}
+
+void
+ip4_fib_free (ip4_fib_mtrie_t * m)
+{
+  ip4_fib_mtrie_ply_t *root_ply = pool_elt_at_index (m->ply_pool, 0);
+  ply_free (m, root_ply);
+}
+
+u32
+ip4_mtrie_lookup_address (ip4_fib_mtrie_t * m, ip4_address_t dst)
+{
+  ip4_fib_mtrie_ply_t *p = pool_elt_at_index (m->ply_pool, 0);
+  ip4_fib_mtrie_leaf_t l;
+
+  l = p->leaves[dst.as_u8[0]];
+  if (ip4_fib_mtrie_leaf_is_terminal (l))
+    return ip4_fib_mtrie_leaf_get_adj_index (l);
+
+  p = get_next_ply_for_leaf (m, l);
+  l = p->leaves[dst.as_u8[1]];
+  if (ip4_fib_mtrie_leaf_is_terminal (l))
+    return ip4_fib_mtrie_leaf_get_adj_index (l);
+
+  p = get_next_ply_for_leaf (m, l);
+  l = p->leaves[dst.as_u8[2]];
+  if (ip4_fib_mtrie_leaf_is_terminal (l))
+    return ip4_fib_mtrie_leaf_get_adj_index (l);
+
+  p = get_next_ply_for_leaf (m, l);
+  l = p->leaves[dst.as_u8[3]];
+
+  ASSERT (ip4_fib_mtrie_leaf_is_terminal (l));
+  return ip4_fib_mtrie_leaf_get_adj_index (l);
+}
+
+typedef struct
+{
+  ip4_address_t dst_address;
+  u32 dst_address_length;
+  u32 adj_index;
+} ip4_fib_mtrie_set_unset_leaf_args_t;
+
+static void
+set_ply_with_more_specific_leaf (ip4_fib_mtrie_t * m,
+				 ip4_fib_mtrie_ply_t * ply,
+				 ip4_fib_mtrie_leaf_t new_leaf,
+				 uword new_leaf_dst_address_bits)
+{
+  ip4_fib_mtrie_leaf_t old_leaf;
+  uword i;
+
+  ASSERT (ip4_fib_mtrie_leaf_is_terminal (new_leaf));
+  ASSERT (!ip4_fib_mtrie_leaf_is_empty (new_leaf));
+
+  for (i = 0; i < ARRAY_LEN (ply->leaves); i++)
+    {
+      old_leaf = ply->leaves[i];
+
+      /* Recurse into sub plies. */
+      if (!ip4_fib_mtrie_leaf_is_terminal (old_leaf))
+	{
+	  ip4_fib_mtrie_ply_t *sub_ply = get_next_ply_for_leaf (m, old_leaf);
+	  set_ply_with_more_specific_leaf (m, sub_ply, new_leaf,
+					   new_leaf_dst_address_bits);
+	}
+
+      /* Replace less specific terminal leaves with new leaf. */
+      else if (new_leaf_dst_address_bits >=
+	       ply->dst_address_bits_of_leaves[i])
+	{
+	  __sync_val_compare_and_swap (&ply->leaves[i], old_leaf, new_leaf);
+	  ASSERT (ply->leaves[i] == new_leaf);
+	  ply->dst_address_bits_of_leaves[i] = new_leaf_dst_address_bits;
+	  ply->n_non_empty_leafs += ip4_fib_mtrie_leaf_is_empty (old_leaf);
+	}
+    }
+}
+
+static void
+set_leaf (ip4_fib_mtrie_t * m,
+	  ip4_fib_mtrie_set_unset_leaf_args_t * a,
+	  u32 old_ply_index, u32 dst_address_byte_index)
+{
+  ip4_fib_mtrie_leaf_t old_leaf, new_leaf;
+  i32 n_dst_bits_next_plies;
+  u8 dst_byte;
+
+  ASSERT (a->dst_address_length > 0 && a->dst_address_length <= 32);
+  ASSERT (dst_address_byte_index < ARRAY_LEN (a->dst_address.as_u8));
+
+  n_dst_bits_next_plies =
+    a->dst_address_length - BITS (u8) * (dst_address_byte_index + 1);
+
+  dst_byte = a->dst_address.as_u8[dst_address_byte_index];
+
+  /* Number of bits next plies <= 0 => insert leaves this ply. */
+  if (n_dst_bits_next_plies <= 0)
+    {
+      uword i, n_dst_bits_this_ply, old_leaf_is_terminal;
+
+      n_dst_bits_this_ply = -n_dst_bits_next_plies;
+      ASSERT ((a->dst_address.as_u8[dst_address_byte_index] &
+	       pow2_mask (n_dst_bits_this_ply)) == 0);
+
+      for (i = dst_byte; i < dst_byte + (1 << n_dst_bits_this_ply); i++)
+	{
+	  ip4_fib_mtrie_ply_t *old_ply, *new_ply;
+
+	  old_ply = pool_elt_at_index (m->ply_pool, old_ply_index);
+
+	  old_leaf = old_ply->leaves[i];
+	  old_leaf_is_terminal = ip4_fib_mtrie_leaf_is_terminal (old_leaf);
+
+	  /* Is leaf to be inserted more specific? */
+	  if (a->dst_address_length >= old_ply->dst_address_bits_of_leaves[i])
+	    {
+	      new_leaf = ip4_fib_mtrie_leaf_set_adj_index (a->adj_index);
+
+	      if (old_leaf_is_terminal)
+		{
+		  old_ply->dst_address_bits_of_leaves[i] =
+		    a->dst_address_length;
+		  __sync_val_compare_and_swap (&old_ply->leaves[i], old_leaf,
+					       new_leaf);
+		  ASSERT (old_ply->leaves[i] == new_leaf);
+		  old_ply->n_non_empty_leafs +=
+		    ip4_fib_mtrie_leaf_is_empty (old_leaf);
+		  ASSERT (old_ply->n_non_empty_leafs <=
+			  ARRAY_LEN (old_ply->leaves));
+		}
+	      else
+		{
+		  /* Existing leaf points to another ply.  We need to place new_leaf into all
+		     more specific slots. */
+		  new_ply = get_next_ply_for_leaf (m, old_leaf);
+		  set_ply_with_more_specific_leaf (m, new_ply, new_leaf,
+						   a->dst_address_length);
+		}
+	    }
+
+	  else if (!old_leaf_is_terminal)
+	    {
+	      new_ply = get_next_ply_for_leaf (m, old_leaf);
+	      set_leaf (m, a, new_ply - m->ply_pool,
+			dst_address_byte_index + 1);
+	    }
+	}
+    }
+  else
+    {
+      ip4_fib_mtrie_ply_t *old_ply, *new_ply;
+
+      old_ply = pool_elt_at_index (m->ply_pool, old_ply_index);
+      old_leaf = old_ply->leaves[dst_byte];
+      if (ip4_fib_mtrie_leaf_is_terminal (old_leaf))
+	{
+	  new_leaf =
+	    ply_create (m, old_leaf,
+			old_ply->dst_address_bits_of_leaves[dst_byte]);
+	  new_ply = get_next_ply_for_leaf (m, new_leaf);
+
+	  /* Refetch since ply_create may move pool. */
+	  old_ply = pool_elt_at_index (m->ply_pool, old_ply_index);
+
+	  __sync_val_compare_and_swap (&old_ply->leaves[dst_byte], old_leaf,
+				       new_leaf);
+	  ASSERT (old_ply->leaves[dst_byte] == new_leaf);
+	  old_ply->dst_address_bits_of_leaves[dst_byte] = 0;
+
+	  old_ply->n_non_empty_leafs -=
+	    ip4_fib_mtrie_leaf_is_non_empty (old_leaf);
+	  ASSERT (old_ply->n_non_empty_leafs >= 0);
+
+	  /* Account for the ply we just created. */
+	  old_ply->n_non_empty_leafs += 1;
+	}
+      else
+	new_ply = get_next_ply_for_leaf (m, old_leaf);
+
+      set_leaf (m, a, new_ply - m->ply_pool, dst_address_byte_index + 1);
+    }
+}
+
+static uword
+unset_leaf (ip4_fib_mtrie_t * m,
+	    ip4_fib_mtrie_set_unset_leaf_args_t * a,
+	    ip4_fib_mtrie_ply_t * old_ply, u32 dst_address_byte_index)
+{
+  ip4_fib_mtrie_leaf_t old_leaf, del_leaf;
+  i32 n_dst_bits_next_plies;
+  i32 i, n_dst_bits_this_ply, old_leaf_is_terminal;
+  u8 dst_byte;
+
+  ASSERT (a->dst_address_length > 0 && a->dst_address_length <= 32);
+  ASSERT (dst_address_byte_index < ARRAY_LEN (a->dst_address.as_u8));
+
+  n_dst_bits_next_plies =
+    a->dst_address_length - BITS (u8) * (dst_address_byte_index + 1);
+
+  dst_byte = a->dst_address.as_u8[dst_address_byte_index];
+  if (n_dst_bits_next_plies < 0)
+    dst_byte &= ~pow2_mask (-n_dst_bits_next_plies);
+
+  n_dst_bits_this_ply =
+    n_dst_bits_next_plies <= 0 ? -n_dst_bits_next_plies : 0;
+  n_dst_bits_this_ply = clib_min (8, n_dst_bits_this_ply);
+
+  del_leaf = ip4_fib_mtrie_leaf_set_adj_index (a->adj_index);
+
+  for (i = dst_byte; i < dst_byte + (1 << n_dst_bits_this_ply); i++)
+    {
+      old_leaf = old_ply->leaves[i];
+      old_leaf_is_terminal = ip4_fib_mtrie_leaf_is_terminal (old_leaf);
+
+      if (old_leaf == del_leaf
+	  || (!old_leaf_is_terminal
+	      && unset_leaf (m, a, get_next_ply_for_leaf (m, old_leaf),
+			     dst_address_byte_index + 1)))
+	{
+	  old_ply->leaves[i] = IP4_FIB_MTRIE_LEAF_EMPTY;
+	  old_ply->dst_address_bits_of_leaves[i] = 0;
+
+	  /* No matter what we just deleted a non-empty leaf. */
+	  ASSERT (!ip4_fib_mtrie_leaf_is_empty (old_leaf));
+	  old_ply->n_non_empty_leafs -= 1;
+
+	  ASSERT (old_ply->n_non_empty_leafs >= 0);
+	  if (old_ply->n_non_empty_leafs == 0 && dst_address_byte_index > 0)
+	    {
+	      pool_put (m->ply_pool, old_ply);
+	      /* Old ply was deleted. */
+	      return 1;
+	    }
+	}
+    }
+
+  /* Old ply was not deleted. */
+  return 0;
+}
+
+void
+ip4_mtrie_init (ip4_fib_mtrie_t * m)
+{
+  ip4_fib_mtrie_leaf_t root;
+  memset (m, 0, sizeof (m[0]));
+  m->default_leaf = IP4_FIB_MTRIE_LEAF_EMPTY;
+  root = ply_create (m, IP4_FIB_MTRIE_LEAF_EMPTY,	/* dst_address_bits_of_leaves */
+		     0);
+  ASSERT (ip4_fib_mtrie_leaf_get_next_ply_index (root) == 0);
+}
+
+void
+ip4_fib_mtrie_add_del_route (ip4_fib_t * fib,
+			     ip4_address_t dst_address,
+			     u32 dst_address_length,
+			     u32 adj_index, u32 is_del)
+{
+  ip4_fib_mtrie_t *m = &fib->mtrie;
+  ip4_fib_mtrie_ply_t *root_ply;
+  ip4_fib_mtrie_set_unset_leaf_args_t a;
+  ip4_main_t *im = &ip4_main;
+
+  ASSERT (m->ply_pool != 0);
+
+  root_ply = pool_elt_at_index (m->ply_pool, 0);
+
+  /* Honor dst_address_length. Fib masks are in network byte order */
+  dst_address.as_u32 &= im->fib_masks[dst_address_length];
+  a.dst_address = dst_address;
+  a.dst_address_length = dst_address_length;
+  a.adj_index = adj_index;
+
+  if (!is_del)
+    {
+      if (dst_address_length == 0)
+	m->default_leaf = ip4_fib_mtrie_leaf_set_adj_index (adj_index);
+      else
+	set_leaf (m, &a, /* ply_index */ 0, /* dst_address_byte_index */ 0);
+    }
+  else
+    {
+      if (dst_address_length == 0)
+	m->default_leaf = IP4_FIB_MTRIE_LEAF_EMPTY;
+
+      else
+	{
+	  ip4_main_t *im = &ip4_main;
+	  uword i;
+
+	  unset_leaf (m, &a, root_ply, 0);
+
+	  /* Find next less specific route and insert into mtrie. */
+	  for (i = dst_address_length - 1; i >= 1; i--)
+	    {
+	      uword *p;
+	      index_t lbi;
+	      ip4_address_t key;
+
+	      if (!fib->fib_entry_by_dst_address[i])
+		continue;
+
+	      key.as_u32 = dst_address.as_u32 & im->fib_masks[i];
+	      p = hash_get (fib->fib_entry_by_dst_address[i], key.as_u32);
+	      if (p)
+		{
+		  lbi = fib_entry_contribute_ip_forwarding (p[0])->dpoi_index;
+		  if (INDEX_INVALID == lbi)
+		    continue;
+
+		  a.dst_address = key;
+		  a.adj_index = lbi;
+		  a.dst_address_length = i;
+
+		  set_leaf (m, &a, /* ply_index */ 0,
+			    /* dst_address_byte_index */ 0);
+		  break;
+		}
+	    }
+	}
+    }
+}
+
+/* Returns number of bytes of memory used by mtrie. */
+static uword
+mtrie_memory_usage (ip4_fib_mtrie_t * m, ip4_fib_mtrie_ply_t * p)
+{
+  uword bytes, i;
+
+  if (!p)
+    {
+      if (pool_is_free_index (m->ply_pool, 0))
+	return 0;
+      p = pool_elt_at_index (m->ply_pool, 0);
+    }
+
+  bytes = sizeof (p[0]);
+  for (i = 0; i < ARRAY_LEN (p->leaves); i++)
+    {
+      ip4_fib_mtrie_leaf_t l = p->leaves[i];
+      if (ip4_fib_mtrie_leaf_is_next_ply (l))
+	bytes += mtrie_memory_usage (m, get_next_ply_for_leaf (m, l));
+    }
+
+  return bytes;
+}
+
+static u8 *
+format_ip4_fib_mtrie_leaf (u8 * s, va_list * va)
+{
+  ip4_fib_mtrie_leaf_t l = va_arg (*va, ip4_fib_mtrie_leaf_t);
+
+  if (ip4_fib_mtrie_leaf_is_empty (l))
+    s = format (s, "miss");
+  else if (ip4_fib_mtrie_leaf_is_terminal (l))
+    s = format (s, "adj %d", ip4_fib_mtrie_leaf_get_adj_index (l));
+  else
+    s = format (s, "next ply %d", ip4_fib_mtrie_leaf_get_next_ply_index (l));
+  return s;
+}
+
+static u8 *
+format_ip4_fib_mtrie_ply (u8 * s, va_list * va)
+{
+  ip4_fib_mtrie_t *m = va_arg (*va, ip4_fib_mtrie_t *);
+  u32 base_address = va_arg (*va, u32);
+  u32 ply_index = va_arg (*va, u32);
+  u32 dst_address_byte_index = va_arg (*va, u32);
+  ip4_fib_mtrie_ply_t *p;
+  uword i, indent;
+
+  p = pool_elt_at_index (m->ply_pool, ply_index);
+  indent = format_get_indent (s);
+  s =
+    format (s, "ply index %d, %d non-empty leaves", ply_index,
+	    p->n_non_empty_leafs);
+  for (i = 0; i < ARRAY_LEN (p->leaves); i++)
+    {
+      ip4_fib_mtrie_leaf_t l = p->leaves[i];
+
+      if (!ip4_fib_mtrie_leaf_is_empty (l))
+	{
+	  u32 a, ia_length;
+	  ip4_address_t ia;
+
+	  a = base_address + (i << (24 - 8 * dst_address_byte_index));
+	  ia.as_u32 = clib_host_to_net_u32 (a);
+	  if (ip4_fib_mtrie_leaf_is_terminal (l))
+	    ia_length = p->dst_address_bits_of_leaves[i];
+	  else
+	    ia_length = 8 * (1 + dst_address_byte_index);
+	  s = format (s, "\n%U%20U %U",
+		      format_white_space, indent + 2,
+		      format_ip4_address_and_length, &ia, ia_length,
+		      format_ip4_fib_mtrie_leaf, l);
+
+	  if (ip4_fib_mtrie_leaf_is_next_ply (l))
+	    s = format (s, "\n%U%U",
+			format_white_space, indent + 2,
+			format_ip4_fib_mtrie_ply, m, a,
+			ip4_fib_mtrie_leaf_get_next_ply_index (l),
+			dst_address_byte_index + 1);
+	}
+    }
+
+  return s;
+}
+
+u8 *
+format_ip4_fib_mtrie (u8 * s, va_list * va)
+{
+  ip4_fib_mtrie_t *m = va_arg (*va, ip4_fib_mtrie_t *);
+
+  s = format (s, "%d plies, memory usage %U",
+	      pool_elts (m->ply_pool),
+	      format_memory_size, mtrie_memory_usage (m, 0));
+
+  if (pool_elts (m->ply_pool) > 0)
+    {
+      ip4_address_t base_address;
+      base_address.as_u32 = 0;
+      s =
+	format (s, "\n  %U", format_ip4_fib_mtrie_ply, m, base_address, 0, 0);
+    }
+
+  return s;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip4_mtrie.h b/src/vnet/ip/ip4_mtrie.h
new file mode 100644
index 00000000..c0afc2cf
--- /dev/null
+++ b/src/vnet/ip/ip4_mtrie.h
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip4_fib.h: ip4 mtrie fib
+ *
+ * Copyright (c) 2012 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_ip_ip4_fib_h
+#define included_ip_ip4_fib_h
+
+#include <vppinfra/cache.h>
+#include <vppinfra/vector.h>
+#include <vnet/ip/lookup.h>
+#include <vnet/ip/ip4_packet.h>	/* for ip4_address_t */
+
+/* ip4 fib leafs: 4 ply 8-8-8-8 mtrie.
+   1 + 2*adj_index for terminal leaves.
+   0 + 2*next_ply_index for non-terminals.
+   1 => empty (adjacency index of zero is special miss adjacency). */
+typedef u32 ip4_fib_mtrie_leaf_t;
+
+#define IP4_FIB_MTRIE_LEAF_EMPTY (1 + 2*0)
+#define IP4_FIB_MTRIE_LEAF_ROOT  (0 + 2*0)
+
+always_inline u32
+ip4_fib_mtrie_leaf_is_empty (ip4_fib_mtrie_leaf_t n)
+{
+  return n == IP4_FIB_MTRIE_LEAF_EMPTY;
+}
+
+always_inline u32
+ip4_fib_mtrie_leaf_is_non_empty (ip4_fib_mtrie_leaf_t n)
+{
+  return n != IP4_FIB_MTRIE_LEAF_EMPTY;
+}
+
+always_inline u32
+ip4_fib_mtrie_leaf_is_terminal (ip4_fib_mtrie_leaf_t n)
+{
+  return n & 1;
+}
+
+always_inline u32
+ip4_fib_mtrie_leaf_get_adj_index (ip4_fib_mtrie_leaf_t n)
+{
+  ASSERT (ip4_fib_mtrie_leaf_is_terminal (n));
+  return n >> 1;
+}
+
+always_inline ip4_fib_mtrie_leaf_t
+ip4_fib_mtrie_leaf_set_adj_index (u32 adj_index)
+{
+  ip4_fib_mtrie_leaf_t l;
+  l = 1 + 2 * adj_index;
+  ASSERT (ip4_fib_mtrie_leaf_get_adj_index (l) == adj_index);
+  return l;
+}
+
+always_inline u32
+ip4_fib_mtrie_leaf_is_next_ply (ip4_fib_mtrie_leaf_t n)
+{
+  return (n & 1) == 0;
+}
+
+always_inline u32
+ip4_fib_mtrie_leaf_get_next_ply_index (ip4_fib_mtrie_leaf_t n)
+{
+  ASSERT (ip4_fib_mtrie_leaf_is_next_ply (n));
+  return n >> 1;
+}
+
+always_inline ip4_fib_mtrie_leaf_t
+ip4_fib_mtrie_leaf_set_next_ply_index (u32 i)
+{
+  ip4_fib_mtrie_leaf_t l;
+  l = 0 + 2 * i;
+  ASSERT (ip4_fib_mtrie_leaf_get_next_ply_index (l) == i);
+  return l;
+}
+
+/* One ply of the 4 ply mtrie fib. */
+typedef struct
+{
+  union
+  {
+    ip4_fib_mtrie_leaf_t leaves[256];
+
+#ifdef CLIB_HAVE_VEC128
+    u32x4 leaves_as_u32x4[256 / 4];
+#endif
+  };
+
+  /* Prefix length for terminal leaves. */
+  u8 dst_address_bits_of_leaves[256];
+
+  /* Number of non-empty leafs (whether terminal or not). */
+  i32 n_non_empty_leafs;
+
+  /* Pad to cache line boundary. */
+  u8 pad[CLIB_CACHE_LINE_BYTES - 1 * sizeof (i32)];
+}
+ip4_fib_mtrie_ply_t;
+
+STATIC_ASSERT (0 == sizeof (ip4_fib_mtrie_ply_t) % CLIB_CACHE_LINE_BYTES,
+	       "IP4 Mtrie ply cache line");
+
+typedef struct
+{
+  /* Pool of plies.  Index zero is root ply. */
+  ip4_fib_mtrie_ply_t *ply_pool;
+
+  /* Special case leaf for default route 0.0.0.0/0. */
+  ip4_fib_mtrie_leaf_t default_leaf;
+} ip4_fib_mtrie_t;
+
+void ip4_fib_mtrie_init (ip4_fib_mtrie_t * m);
+
+struct ip4_fib_t;
+
+void ip4_fib_mtrie_add_del_route (struct ip4_fib_t *f,
+				  ip4_address_t dst_address,
+				  u32 dst_address_length,
+				  u32 adj_index, u32 is_del);
+
+/* Returns adjacency index. */
+u32 ip4_mtrie_lookup_address (ip4_fib_mtrie_t * m, ip4_address_t dst);
+
+format_function_t format_ip4_fib_mtrie;
+
+/* Lookup step.  Processes 1 byte of 4 byte ip4 address. */
+always_inline ip4_fib_mtrie_leaf_t
+ip4_fib_mtrie_lookup_step (ip4_fib_mtrie_t * m,
+			   ip4_fib_mtrie_leaf_t current_leaf,
+			   const ip4_address_t * dst_address,
+			   u32 dst_address_byte_index)
+{
+  ip4_fib_mtrie_leaf_t next_leaf;
+  ip4_fib_mtrie_ply_t *ply;
+  uword current_is_terminal = ip4_fib_mtrie_leaf_is_terminal (current_leaf);
+
+  ply = m->ply_pool + (current_is_terminal ? 0 : (current_leaf >> 1));
+  next_leaf = ply->leaves[dst_address->as_u8[dst_address_byte_index]];
+  next_leaf = current_is_terminal ? current_leaf : next_leaf;
+
+  return next_leaf;
+}
+
+#endif /* included_ip_ip4_fib_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip4_packet.h b/src/vnet/ip/ip4_packet.h
new file mode 100644
index 00000000..8da788b4
--- /dev/null
+++ b/src/vnet/ip/ip4_packet.h
@@ -0,0 +1,384 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip4/packet.h: ip4 packet format
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_ip4_packet_h
+#define included_ip4_packet_h
+
+#include <vnet/ip/ip_packet.h>	/* for ip_csum_t */
+#include <vnet/ip/tcp_packet.h>	/* for tcp_header_t */
+#include <vppinfra/byte_order.h>	/* for clib_net_to_host_u16 */
+
+/* IP4 address which can be accessed either as 4 bytes
+   or as a 32-bit number. */
+typedef union
+{
+  u8 data[4];
+  u32 data_u32;
+  /* Aliases. */
+  u8 as_u8[4];
+  u32 as_u32;
+} ip4_address_t;
+
+typedef struct
+{
+  /* IP address must be first for ip_interface_address_get_address() to work */
+  ip4_address_t ip4_addr;
+  u32 fib_index;
+} ip4_address_fib_t;
+
+always_inline void
+ip4_addr_fib_init (ip4_address_fib_t * addr_fib, ip4_address_t * address,
+		   u32 fib_index)
+{
+  clib_memcpy (&addr_fib->ip4_addr, address, sizeof (addr_fib->ip4_addr));
+  addr_fib->fib_index = fib_index;
+}
+
+/* (src,dst) pair of addresses as found in packet header. */
+typedef struct
+{
+  ip4_address_t src, dst;
+} ip4_address_pair_t;
+
+/* If address is a valid netmask, return length of mask. */
+always_inline uword
+ip4_address_netmask_length (ip4_address_t * a)
+{
+  uword result = 0;
+  uword i;
+  for (i = 0; i < ARRAY_LEN (a->as_u8); i++)
+    {
+      switch (a->as_u8[i])
+	{
+	case 0xff:
+	  result += 8;
+	  break;
+	case 0xfe:
+	  result += 7;
+	  goto done;
+	case 0xfc:
+	  result += 6;
+	  goto done;
+	case 0xf8:
+	  result += 5;
+	  goto done;
+	case 0xf0:
+	  result += 4;
+	  goto done;
+	case 0xe0:
+	  result += 3;
+	  goto done;
+	case 0xc0:
+	  result += 2;
+	  goto done;
+	case 0x80:
+	  result += 1;
+	  goto done;
+	case 0x00:
+	  result += 0;
+	  goto done;
+	default:
+	  /* Not a valid netmask mask. */
+	  return ~0;
+	}
+    }
+done:
+  return result;
+}
+
+typedef union
+{
+  struct
+  {
+    /* 4 bit packet length (in 32bit units) and version VVVVLLLL.
+       e.g. for packets w/ no options ip_version_and_header_length == 0x45. */
+    u8 ip_version_and_header_length;
+
+    /* Type of service. */
+    u8 tos;
+
+    /* Total layer 3 packet length including this header. */
+    u16 length;
+
+    /* Fragmentation ID. */
+    u16 fragment_id;
+
+    /* 3 bits of flags and 13 bits of fragment offset (in units
+       of 8 byte quantities). */
+    u16 flags_and_fragment_offset;
+#define IP4_HEADER_FLAG_MORE_FRAGMENTS (1 << 13)
+#define IP4_HEADER_FLAG_DONT_FRAGMENT (1 << 14)
+#define IP4_HEADER_FLAG_CONGESTION (1 << 15)
+
+    /* Time to live decremented by router at each hop. */
+    u8 ttl;
+
+    /* Next level protocol packet. */
+    u8 protocol;
+
+    /* Checksum. */
+    u16 checksum;
+
+    /* Source and destination address. */
+    union
+    {
+      struct
+      {
+	ip4_address_t src_address, dst_address;
+      };
+      ip4_address_pair_t address_pair;
+    };
+  };
+
+  /* For checksumming we'll want to access IP header in word sized chunks. */
+  /* For 64 bit machines. */
+  /* *INDENT-OFF* */
+  CLIB_PACKED (struct {
+    u64 checksum_data_64[2];
+    u32 checksum_data_64_32[1];
+  });
+  /* *INDENT-ON* */
+
+  /* For 32 bit machines. */
+  /* *INDENT-OFF* */
+  CLIB_PACKED (struct {
+    u32 checksum_data_32[5];
+  });
+  /* *INDENT-ON* */
+} ip4_header_t;
+
+/* Value of ip_version_and_header_length for packets w/o options. */
+#define IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS \
+  ((4 << 4) | (sizeof (ip4_header_t) / sizeof (u32)))
+
+always_inline int
+ip4_get_fragment_offset (ip4_header_t * i)
+{
+  return clib_net_to_host_u16 (i->flags_and_fragment_offset) & 0x1fff;
+}
+
+always_inline int
+ip4_get_fragment_more (ip4_header_t * i)
+{
+  return clib_net_to_host_u16 (i->flags_and_fragment_offset) &
+    IP4_HEADER_FLAG_MORE_FRAGMENTS;
+}
+
+always_inline int
+ip4_is_fragment (ip4_header_t * i)
+{
+  return (i->flags_and_fragment_offset &
+	  clib_net_to_host_u16 (0x1fff | IP4_HEADER_FLAG_MORE_FRAGMENTS));
+}
+
+always_inline int
+ip4_is_first_fragment (ip4_header_t * i)
+{
+  return (i->flags_and_fragment_offset &
+	  clib_net_to_host_u16 (0x1fff | IP4_HEADER_FLAG_MORE_FRAGMENTS)) ==
+    clib_net_to_host_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS);
+}
+
+/* Fragment offset in bytes. */
+always_inline int
+ip4_get_fragment_offset_bytes (ip4_header_t * i)
+{
+  return 8 * ip4_get_fragment_offset (i);
+}
+
+always_inline int
+ip4_header_bytes (ip4_header_t * i)
+{
+  return sizeof (u32) * (i->ip_version_and_header_length & 0xf);
+}
+
+always_inline void *
+ip4_next_header (ip4_header_t * i)
+{
+  return (void *) i + ip4_header_bytes (i);
+}
+
+always_inline u16
+ip4_header_checksum (ip4_header_t * i)
+{
+  u16 save, csum;
+  ip_csum_t sum;
+
+  save = i->checksum;
+  i->checksum = 0;
+  sum = ip_incremental_checksum (0, i, ip4_header_bytes (i));
+  csum = ~ip_csum_fold (sum);
+
+  i->checksum = save;
+
+  /* Make checksum agree for special case where either
+     0 or 0xffff would give same 1s complement sum. */
+  if (csum == 0 && save == 0xffff)
+    csum = save;
+
+  return csum;
+}
+
+static inline uword
+ip4_header_checksum_is_valid (ip4_header_t * i)
+{
+  return i->checksum == ip4_header_checksum (i);
+}
+
+#define ip4_partial_header_checksum_x1(ip0,sum0)			\
+do {									\
+  if (BITS (ip_csum_t) > 32)						\
+    {									\
+      sum0 = ip0->checksum_data_64[0];					\
+      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_64[1]);	\
+      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_64_32[0]);	\
+    }									\
+  else									\
+    {									\
+      sum0 = ip0->checksum_data_32[0];					\
+      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[1]);	\
+      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[2]);	\
+      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[3]);	\
+      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[4]);	\
+    }									\
+} while (0)
+
+#define ip4_partial_header_checksum_x2(ip0,ip1,sum0,sum1)		\
+do {									\
+  if (BITS (ip_csum_t) > 32)						\
+    {									\
+      sum0 = ip0->checksum_data_64[0];					\
+      sum1 = ip1->checksum_data_64[0];					\
+      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_64[1]);	\
+      sum1 = ip_csum_with_carry (sum1, ip1->checksum_data_64[1]);	\
+      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_64_32[0]);	\
+      sum1 = ip_csum_with_carry (sum1, ip1->checksum_data_64_32[0]);	\
+    }									\
+  else									\
+    {									\
+      sum0 = ip0->checksum_data_32[0];					\
+      sum1 = ip1->checksum_data_32[0];					\
+      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[1]);	\
+      sum1 = ip_csum_with_carry (sum1, ip1->checksum_data_32[1]);	\
+      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[2]);	\
+      sum1 = ip_csum_with_carry (sum1, ip1->checksum_data_32[2]);	\
+      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[3]);	\
+      sum1 = ip_csum_with_carry (sum1, ip1->checksum_data_32[3]);	\
+      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[4]);	\
+      sum1 = ip_csum_with_carry (sum1, ip1->checksum_data_32[4]);	\
+    }									\
+} while (0)
+
+always_inline uword
+ip4_address_is_multicast (ip4_address_t * a)
+{
+  return (a->data[0] & 0xf0) == 0xe0;
+}
+
+always_inline void
+ip4_multicast_address_set_for_group (ip4_address_t * a,
+				     ip_multicast_group_t g)
+{
+  ASSERT ((u32) g < (1 << 28));
+  a->as_u32 = clib_host_to_net_u32 ((0xe << 28) + g);
+}
+
+always_inline void
+ip4_multicast_ethernet_address (u8 * ethernet_address, ip4_address_t * a)
+{
+  u8 *d = a->as_u8;
+
+  ethernet_address[0] = 0x01;
+  ethernet_address[1] = 0x00;
+  ethernet_address[2] = 0x5e;
+  ethernet_address[3] = d[1] & 0x7f;
+  ethernet_address[4] = d[2];
+  ethernet_address[5] = d[3];
+}
+
+always_inline void
+ip4_tcp_reply_x1 (ip4_header_t * ip0, tcp_header_t * tcp0)
+{
+  u32 src0, dst0;
+
+  src0 = ip0->src_address.data_u32;
+  dst0 = ip0->dst_address.data_u32;
+  ip0->src_address.data_u32 = dst0;
+  ip0->dst_address.data_u32 = src0;
+
+  src0 = tcp0->ports.src;
+  dst0 = tcp0->ports.dst;
+  tcp0->ports.src = dst0;
+  tcp0->ports.dst = src0;
+}
+
+always_inline void
+ip4_tcp_reply_x2 (ip4_header_t * ip0, ip4_header_t * ip1,
+		  tcp_header_t * tcp0, tcp_header_t * tcp1)
+{
+  u32 src0, dst0, src1, dst1;
+
+  src0 = ip0->src_address.data_u32;
+  src1 = ip1->src_address.data_u32;
+  dst0 = ip0->dst_address.data_u32;
+  dst1 = ip1->dst_address.data_u32;
+  ip0->src_address.data_u32 = dst0;
+  ip1->src_address.data_u32 = dst1;
+  ip0->dst_address.data_u32 = src0;
+  ip1->dst_address.data_u32 = src1;
+
+  src0 = tcp0->ports.src;
+  src1 = tcp1->ports.src;
+  dst0 = tcp0->ports.dst;
+  dst1 = tcp1->ports.dst;
+  tcp0->ports.src = dst0;
+  tcp1->ports.src = dst1;
+  tcp0->ports.dst = src0;
+  tcp1->ports.dst = src1;
+}
+
+#endif /* included_ip4_packet_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip4_pg.c b/src/vnet/ip/ip4_pg.c
new file mode 100644
index 00000000..9697a3b9
--- /dev/null
+++ b/src/vnet/ip/ip4_pg.c
@@ -0,0 +1,387 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip4_pg: IP v4 packet-generator interface
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+#include <vnet/pg/pg.h>
+
+#define IP4_PG_EDIT_CHECKSUM (1 << 0)
+#define IP4_PG_EDIT_LENGTH (1 << 1)
+
+static_always_inline void
+compute_length_and_or_checksum (vlib_main_t * vm,
+				u32 * packets,
+				u32 n_packets,
+				u32 ip_header_offset, u32 flags)
+{
+  ASSERT (flags != 0);
+
+  while (n_packets >= 2)
+    {
+      u32 pi0, pi1;
+      vlib_buffer_t *p0, *p1;
+      ip4_header_t *ip0, *ip1;
+      ip_csum_t sum0, sum1;
+
+      pi0 = packets[0];
+      pi1 = packets[1];
+      p0 = vlib_get_buffer (vm, pi0);
+      p1 = vlib_get_buffer (vm, pi1);
+      n_packets -= 2;
+      packets += 2;
+
+      ip0 = (void *) (p0->data + ip_header_offset);
+      ip1 = (void *) (p1->data + ip_header_offset);
+
+      if (flags & IP4_PG_EDIT_LENGTH)
+	{
+	  ip0->length =
+	    clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, p0) -
+				  ip_header_offset);
+	  ip1->length =
+	    clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, p1) -
+				  ip_header_offset);
+	}
+
+      if (flags & IP4_PG_EDIT_CHECKSUM)
+	{
+	  ASSERT (ip4_header_bytes (ip0) == sizeof (ip0[0]));
+	  ASSERT (ip4_header_bytes (ip1) == sizeof (ip1[0]));
+
+	  ip0->checksum = 0;
+	  ip1->checksum = 0;
+
+	  ip4_partial_header_checksum_x2 (ip0, ip1, sum0, sum1);
+	  ip0->checksum = ~ip_csum_fold (sum0);
+	  ip1->checksum = ~ip_csum_fold (sum1);
+
+	  ASSERT (ip0->checksum == ip4_header_checksum (ip0));
+	  ASSERT (ip1->checksum == ip4_header_checksum (ip1));
+	}
+    }
+
+  while (n_packets >= 1)
+    {
+      u32 pi0;
+      vlib_buffer_t *p0;
+      ip4_header_t *ip0;
+      ip_csum_t sum0;
+
+      pi0 = packets[0];
+      p0 = vlib_get_buffer (vm, pi0);
+      n_packets -= 1;
+      packets += 1;
+
+      ip0 = (void *) (p0->data + ip_header_offset);
+
+      if (flags & IP4_PG_EDIT_LENGTH)
+	ip0->length =
+	  clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, p0) -
+				ip_header_offset);
+
+      if (flags & IP4_PG_EDIT_CHECKSUM)
+	{
+	  ASSERT (ip4_header_bytes (ip0) == sizeof (ip0[0]));
+
+	  ip0->checksum = 0;
+
+	  ip4_partial_header_checksum_x1 (ip0, sum0);
+	  ip0->checksum = ~ip_csum_fold (sum0);
+
+	  ASSERT (ip0->checksum == ip4_header_checksum (ip0));
+	}
+    }
+}
+
+static void
+ip4_pg_edit_function (pg_main_t * pg,
+		      pg_stream_t * s,
+		      pg_edit_group_t * g, u32 * packets, u32 n_packets)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  u32 ip_offset;
+
+  ip_offset = g->start_byte_offset;
+
+  switch (g->edit_function_opaque)
+    {
+    case IP4_PG_EDIT_LENGTH:
+      compute_length_and_or_checksum (vm, packets, n_packets, ip_offset,
+				      IP4_PG_EDIT_LENGTH);
+      break;
+
+    case IP4_PG_EDIT_CHECKSUM:
+      compute_length_and_or_checksum (vm, packets, n_packets, ip_offset,
+				      IP4_PG_EDIT_CHECKSUM);
+      break;
+
+    case IP4_PG_EDIT_LENGTH | IP4_PG_EDIT_CHECKSUM:
+      compute_length_and_or_checksum (vm, packets, n_packets, ip_offset,
+				      IP4_PG_EDIT_LENGTH
+				      | IP4_PG_EDIT_CHECKSUM);
+      break;
+
+    default:
+      ASSERT (0);
+      break;
+    }
+}
+
+typedef struct
+{
+  pg_edit_t ip_version, header_length;
+  pg_edit_t tos;
+  pg_edit_t length;
+
+  pg_edit_t fragment_id, fragment_offset;
+
+  /* Flags together with fragment offset. */
+  pg_edit_t mf_flag, df_flag, ce_flag;
+
+  pg_edit_t ttl;
+
+  pg_edit_t protocol;
+
+  pg_edit_t checksum;
+
+  pg_edit_t src_address, dst_address;
+} pg_ip4_header_t;
+
+static inline void
+pg_ip4_header_init (pg_ip4_header_t * p)
+{
+  /* Initialize fields that are not bit fields in the IP header. */
+#define _(f) pg_edit_init (&p->f, ip4_header_t, f);
+  _(tos);
+  _(length);
+  _(fragment_id);
+  _(ttl);
+  _(protocol);
+  _(checksum);
+  _(src_address);
+  _(dst_address);
+#undef _
+
+  /* Initialize bit fields. */
+  pg_edit_init_bitfield (&p->header_length, ip4_header_t,
+			 ip_version_and_header_length, 0, 4);
+  pg_edit_init_bitfield (&p->ip_version, ip4_header_t,
+			 ip_version_and_header_length, 4, 4);
+
+  pg_edit_init_bitfield (&p->fragment_offset, ip4_header_t,
+			 flags_and_fragment_offset, 0, 13);
+  pg_edit_init_bitfield (&p->mf_flag, ip4_header_t,
+			 flags_and_fragment_offset, 13, 1);
+  pg_edit_init_bitfield (&p->df_flag, ip4_header_t,
+			 flags_and_fragment_offset, 14, 1);
+  pg_edit_init_bitfield (&p->ce_flag, ip4_header_t,
+			 flags_and_fragment_offset, 15, 1);
+}
+
+uword
+unformat_pg_ip4_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  pg_ip4_header_t *p;
+  u32 group_index;
+
+  p = pg_create_edit_group (s, sizeof (p[0]), sizeof (ip4_header_t),
+			    &group_index);
+  pg_ip4_header_init (p);
+
+  /* Defaults. */
+  pg_edit_set_fixed (&p->ip_version, 4);
+  pg_edit_set_fixed (&p->header_length, sizeof (ip4_header_t) / sizeof (u32));
+
+  pg_edit_set_fixed (&p->tos, 0);
+  pg_edit_set_fixed (&p->ttl, 64);
+
+  pg_edit_set_fixed (&p->fragment_id, 0);
+  pg_edit_set_fixed (&p->fragment_offset, 0);
+  pg_edit_set_fixed (&p->mf_flag, 0);
+  pg_edit_set_fixed (&p->df_flag, 0);
+  pg_edit_set_fixed (&p->ce_flag, 0);
+
+  p->length.type = PG_EDIT_UNSPECIFIED;
+  p->checksum.type = PG_EDIT_UNSPECIFIED;
+
+  if (unformat (input, "%U: %U -> %U",
+		unformat_pg_edit,
+		unformat_ip_protocol, &p->protocol,
+		unformat_pg_edit,
+		unformat_ip4_address, &p->src_address,
+		unformat_pg_edit, unformat_ip4_address, &p->dst_address))
+    goto found;
+
+  if (!unformat (input, "%U:",
+		 unformat_pg_edit, unformat_ip_protocol, &p->protocol))
+    goto error;
+
+found:
+  /* Parse options. */
+  while (1)
+    {
+      if (unformat (input, "version %U",
+		    unformat_pg_edit, unformat_pg_number, &p->ip_version))
+	;
+
+      else if (unformat (input, "header-length %U",
+			 unformat_pg_edit,
+			 unformat_pg_number, &p->header_length))
+	;
+
+      else if (unformat (input, "tos %U",
+			 unformat_pg_edit, unformat_pg_number, &p->tos))
+	;
+
+      else if (unformat (input, "length %U",
+			 unformat_pg_edit, unformat_pg_number, &p->length))
+	;
+
+      else if (unformat (input, "checksum %U",
+			 unformat_pg_edit, unformat_pg_number, &p->checksum))
+	;
+
+      else if (unformat (input, "ttl %U",
+			 unformat_pg_edit, unformat_pg_number, &p->ttl))
+	;
+
+      else if (unformat (input, "fragment id %U offset %U",
+			 unformat_pg_edit,
+			 unformat_pg_number, &p->fragment_id,
+			 unformat_pg_edit,
+			 unformat_pg_number, &p->fragment_offset))
+	{
+	  int i;
+	  for (i = 0; i < ARRAY_LEN (p->fragment_offset.values); i++)
+	    pg_edit_set_value (&p->fragment_offset, i,
+			       pg_edit_get_value (&p->fragment_offset,
+						  i) / 8);
+
+	}
+
+      /* Flags. */
+      else if (unformat (input, "mf") || unformat (input, "MF"))
+	pg_edit_set_fixed (&p->mf_flag, 1);
+
+      else if (unformat (input, "df") || unformat (input, "DF"))
+	pg_edit_set_fixed (&p->df_flag, 1);
+
+      else if (unformat (input, "ce") || unformat (input, "CE"))
+	pg_edit_set_fixed (&p->ce_flag, 1);
+
+      /* Can't parse input: try next protocol level. */
+      else
+	break;
+    }
+
+  {
+    ip_main_t *im = &ip_main;
+    ip_protocol_t protocol;
+    ip_protocol_info_t *pi;
+
+    pi = 0;
+    if (p->protocol.type == PG_EDIT_FIXED)
+      {
+	protocol = pg_edit_get_value (&p->protocol, PG_EDIT_LO);
+	pi = ip_get_protocol_info (im, protocol);
+      }
+
+    if (pi && pi->unformat_pg_edit
+	&& unformat_user (input, pi->unformat_pg_edit, s))
+      ;
+
+    else if (!unformat_user (input, unformat_pg_payload, s))
+      goto error;
+
+    if (p->length.type == PG_EDIT_UNSPECIFIED
+	&& s->min_packet_bytes == s->max_packet_bytes
+	&& group_index + 1 < vec_len (s->edit_groups))
+      {
+	pg_edit_set_fixed (&p->length,
+			   pg_edit_group_n_bytes (s, group_index));
+      }
+
+    /* Compute IP header checksum if all edits are fixed. */
+    if (p->checksum.type == PG_EDIT_UNSPECIFIED)
+      {
+	ip4_header_t fixed_header, fixed_mask, cmp_mask;
+
+	/* See if header is all fixed and specified except for
+	   checksum field. */
+	memset (&cmp_mask, ~0, sizeof (cmp_mask));
+	cmp_mask.checksum = 0;
+
+	pg_edit_group_get_fixed_packet_data (s, group_index,
+					     &fixed_header, &fixed_mask);
+	if (!memcmp (&fixed_mask, &cmp_mask, sizeof (cmp_mask)))
+	  pg_edit_set_fixed (&p->checksum,
+			     clib_net_to_host_u16 (ip4_header_checksum
+						   (&fixed_header)));
+      }
+
+    p = pg_get_edit_group (s, group_index);
+    if (p->length.type == PG_EDIT_UNSPECIFIED
+	|| p->checksum.type == PG_EDIT_UNSPECIFIED)
+      {
+	pg_edit_group_t *g = pg_stream_get_group (s, group_index);
+	g->edit_function = ip4_pg_edit_function;
+	g->edit_function_opaque = 0;
+	if (p->length.type == PG_EDIT_UNSPECIFIED)
+	  g->edit_function_opaque |= IP4_PG_EDIT_LENGTH;
+	if (p->checksum.type == PG_EDIT_UNSPECIFIED)
+	  g->edit_function_opaque |= IP4_PG_EDIT_CHECKSUM;
+      }
+
+    return 1;
+  }
+
+error:
+  /* Free up any edits we may have added. */
+  pg_free_edit_group (s);
+  return 0;
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip4_source_and_port_range_check.c b/src/vnet/ip/ip4_source_and_port_range_check.c
new file mode 100644
index 00000000..ae836a11
--- /dev/null
+++ b/src/vnet/ip/ip4_source_and_port_range_check.c
@@ -0,0 +1,1415 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *	   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/ip/ip.h>
+#include <vnet/ip/ip_source_and_port_range_check.h>
+#include <vnet/dpo/load_balance.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/ip4_fib.h>
+
+/**
+ * @file
+ * @brief IPv4 Source and Port Range Checking.
+ *
+ * This file contains the source code for IPv4 source and port range
+ * checking.
+ */
+
+
+/**
+ * @brief The pool of range chack DPOs
+ */
+static protocol_port_range_dpo_t *ppr_dpo_pool;
+
+/**
+ * @brief Dynamically registered DPO type
+ */
+static dpo_type_t ppr_dpo_type;
+
+vlib_node_registration_t ip4_source_port_and_range_check_rx;
+vlib_node_registration_t ip4_source_port_and_range_check_tx;
+
+#define foreach_ip4_source_and_port_range_check_error			\
+  _(CHECK_FAIL, "ip4 source and port range check bad packets")	\
+  _(CHECK_OK, "ip4 source and port range check good packets")
+
+typedef enum
+{
+#define _(sym,str) IP4_SOURCE_AND_PORT_RANGE_CHECK_ERROR_##sym,
+  foreach_ip4_source_and_port_range_check_error
+#undef _
+    IP4_SOURCE_AND_PORT_RANGE_CHECK_N_ERROR,
+} ip4_source_and_port_range_check_error_t;
+
+static char *ip4_source_and_port_range_check_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ip4_source_and_port_range_check_error
+#undef _
+};
+
+typedef struct
+{
+  u32 pass;
+  u32 bypass;
+  u32 is_tcp;
+  ip4_address_t src_addr;
+  u16 port;
+  u32 fib_index;
+} ip4_source_and_port_range_check_trace_t;
+
+static u8 *
+format_ip4_source_and_port_range_check_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  ip4_source_and_port_range_check_trace_t *t =
+    va_arg (*va, ip4_source_and_port_range_check_trace_t *);
+
+  if (t->bypass)
+    s = format (s, "PASS (bypass case)");
+  else
+    s = format (s, "fib %d src ip %U %s dst port %d: %s",
+		t->fib_index, format_ip4_address, &t->src_addr,
+		t->is_tcp ? "TCP" : "UDP", (u32) t->port,
+		(t->pass == 1) ? "PASS" : "FAIL");
+  return s;
+}
+
+typedef enum
+{
+  IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP,
+  IP4_SOURCE_AND_PORT_RANGE_CHECK_N_NEXT,
+} ip4_source_and_port_range_check_next_t;
+
+
+static inline u32
+check_adj_port_range_x1 (const protocol_port_range_dpo_t * ppr_dpo,
+			 u16 dst_port, u32 next)
+{
+  u16x8vec_t key;
+  u16x8vec_t diff1;
+  u16x8vec_t diff2;
+  u16x8vec_t sum, sum_equal_diff2;
+  u16 sum_nonzero, sum_equal, winner_mask;
+  int i;
+
+  if (NULL == ppr_dpo || dst_port == 0)
+    return IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP;
+
+  /* Make the obvious screw-case work. A variant also works w/ no MMX */
+  if (PREDICT_FALSE (dst_port == 65535))
+    {
+      int j;
+
+      for (i = 0;
+	   i < VLIB_BUFFER_PRE_DATA_SIZE / sizeof (protocol_port_range_t);
+	   i++)
+	{
+	  for (j = 0; j < 8; j++)
+	    if (ppr_dpo->blocks[i].low.as_u16[j] == 65535)
+	      return next;
+	}
+      return IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP;
+    }
+
+  key.as_u16x8 = u16x8_splat (dst_port);
+
+  for (i = 0; i < ppr_dpo->n_used_blocks; i++)
+    {
+      diff1.as_u16x8 =
+	u16x8_sub_saturate (ppr_dpo->blocks[i].low.as_u16x8, key.as_u16x8);
+      diff2.as_u16x8 =
+	u16x8_sub_saturate (ppr_dpo->blocks[i].hi.as_u16x8, key.as_u16x8);
+      sum.as_u16x8 = u16x8_add (diff1.as_u16x8, diff2.as_u16x8);
+      sum_equal_diff2.as_u16x8 =
+	u16x8_is_equal (sum.as_u16x8, diff2.as_u16x8);
+      sum_nonzero = ~u16x8_zero_byte_mask (sum.as_u16x8);
+      sum_equal = ~u16x8_zero_byte_mask (sum_equal_diff2.as_u16x8);
+      winner_mask = sum_nonzero & sum_equal;
+      if (winner_mask)
+	return next;
+    }
+  return IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP;
+}
+
+always_inline protocol_port_range_dpo_t *
+protocol_port_range_dpo_get (index_t index)
+{
+  return (pool_elt_at_index (ppr_dpo_pool, index));
+}
+
+always_inline uword
+ip4_source_and_port_range_check_inline (vlib_main_t * vm,
+					vlib_node_runtime_t * node,
+					vlib_frame_t * frame, int is_tx)
+{
+  ip4_main_t *im = &ip4_main;
+  u32 n_left_from, *from, *to_next;
+  u32 next_index;
+  vlib_node_runtime_t *error_node = node;
+  u32 good_packets = 0;
+  int i;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+
+      /*     while (n_left_from >= 4 && n_left_to_next >= 2) */
+      /*       { */
+      /*         vlib_buffer_t *b0, *b1; */
+      /*         ip4_header_t *ip0, *ip1; */
+      /*         ip4_fib_mtrie_t *mtrie0, *mtrie1; */
+      /*         ip4_fib_mtrie_leaf_t leaf0, leaf1; */
+      /*         ip_source_and_port_range_check_config_t *c0, *c1; */
+      /*         ip_adjacency_t *adj0 = 0, *adj1 = 0; */
+      /*         u32 bi0, next0, adj_index0, pass0, save_next0, fib_index0; */
+      /*         u32 bi1, next1, adj_index1, pass1, save_next1, fib_index1; */
+      /*         udp_header_t *udp0, *udp1; */
+
+      /*         /\* Prefetch next iteration. *\/ */
+      /*         { */
+      /*           vlib_buffer_t *p2, *p3; */
+
+      /*           p2 = vlib_get_buffer (vm, from[2]); */
+      /*           p3 = vlib_get_buffer (vm, from[3]); */
+
+      /*           vlib_prefetch_buffer_header (p2, LOAD); */
+      /*           vlib_prefetch_buffer_header (p3, LOAD); */
+
+      /*           CLIB_PREFETCH (p2->data, sizeof (ip0[0]), LOAD); */
+      /*           CLIB_PREFETCH (p3->data, sizeof (ip1[0]), LOAD); */
+      /*         } */
+
+      /*         bi0 = to_next[0] = from[0]; */
+      /*         bi1 = to_next[1] = from[1]; */
+      /*         from += 2; */
+      /*         to_next += 2; */
+      /*         n_left_from -= 2; */
+      /*         n_left_to_next -= 2; */
+
+      /*         b0 = vlib_get_buffer (vm, bi0); */
+      /*         b1 = vlib_get_buffer (vm, bi1); */
+
+      /*         fib_index0 = */
+      /*           vec_elt (im->fib_index_by_sw_if_index, */
+      /*                 vnet_buffer (b0)->sw_if_index[VLIB_RX]); */
+      /*         fib_index1 = */
+      /*           vec_elt (im->fib_index_by_sw_if_index, */
+      /*                 vnet_buffer (b1)->sw_if_index[VLIB_RX]); */
+
+      /*         ip0 = vlib_buffer_get_current (b0); */
+      /*         ip1 = vlib_buffer_get_current (b1); */
+
+      /*         if (is_tx) */
+      /*           { */
+      /*             c0 = vnet_get_config_data (&tx_cm->config_main, */
+      /*                                     &b0->current_config_index, */
+      /*                                     &next0, sizeof (c0[0])); */
+      /*             c1 = vnet_get_config_data (&tx_cm->config_main, */
+      /*                                     &b1->current_config_index, */
+      /*                                     &next1, sizeof (c1[0])); */
+      /*           } */
+      /*         else */
+      /*           { */
+      /*             c0 = vnet_get_config_data (&rx_cm->config_main, */
+      /*                                     &b0->current_config_index, */
+      /*                                     &next0, sizeof (c0[0])); */
+      /*             c1 = vnet_get_config_data (&rx_cm->config_main, */
+      /*                                     &b1->current_config_index, */
+      /*                                     &next1, sizeof (c1[0])); */
+      /*           } */
+
+      /*         /\* we can't use the default VRF here... *\/ */
+      /*         for (i = 0; i < IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS; i++) */
+      /*           { */
+      /*             ASSERT (c0->fib_index[i] && c1->fib_index[i]); */
+      /*           } */
+
+
+      /*         if (is_tx) */
+      /*           { */
+      /*             if (ip0->protocol == IP_PROTOCOL_UDP) */
+      /*            fib_index0 = */
+      /*              c0->fib_index */
+      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN]; */
+      /*             if (ip0->protocol == IP_PROTOCOL_TCP) */
+      /*            fib_index0 = */
+      /*              c0->fib_index */
+      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN]; */
+      /*           } */
+      /*         else */
+      /*           { */
+      /*             if (ip0->protocol == IP_PROTOCOL_UDP) */
+      /*            fib_index0 = */
+      /*              c0->fib_index */
+      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT]; */
+      /*             if (ip0->protocol == IP_PROTOCOL_TCP) */
+      /*            fib_index0 = */
+      /*              c0->fib_index */
+      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT]; */
+      /*           } */
+
+      /*         if (PREDICT_TRUE (fib_index0 != ~0)) */
+      /*           { */
+
+      /*             mtrie0 = &vec_elt_at_index (im->fibs, fib_index0)->mtrie; */
+
+      /*             leaf0 = IP4_FIB_MTRIE_LEAF_ROOT; */
+
+      /*             leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, */
+      /*                                             &ip0->src_address, 0); */
+
+      /*             leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, */
+      /*                                             &ip0->src_address, 1); */
+
+      /*             leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, */
+      /*                                             &ip0->src_address, 2); */
+
+      /*             leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, */
+      /*                                             &ip0->src_address, 3); */
+
+      /*             adj_index0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0); */
+
+      /*             ASSERT (adj_index0 == ip4_fib_lookup_with_table (im, fib_index0, */
+      /*                                                           &ip0->src_address, */
+      /*                                                           0 */
+      /*                                                           /\* use dflt rt *\/ */
+      /*                  )); */
+      /*             adj0 = ip_get_adjacency (lm, adj_index0); */
+      /*           } */
+
+      /*         if (is_tx) */
+      /*           { */
+      /*             if (ip1->protocol == IP_PROTOCOL_UDP) */
+      /*            fib_index1 = */
+      /*              c1->fib_index */
+      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN]; */
+      /*             if (ip1->protocol == IP_PROTOCOL_TCP) */
+      /*            fib_index1 = */
+      /*              c1->fib_index */
+      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN]; */
+      /*           } */
+      /*         else */
+      /*           { */
+      /*             if (ip1->protocol == IP_PROTOCOL_UDP) */
+      /*            fib_index1 = */
+      /*              c1->fib_index */
+      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT]; */
+      /*             if (ip1->protocol == IP_PROTOCOL_TCP) */
+      /*            fib_index1 = */
+      /*              c1->fib_index */
+      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT]; */
+      /*           } */
+
+      /*         if (PREDICT_TRUE (fib_index1 != ~0)) */
+      /*           { */
+
+      /*             mtrie1 = &vec_elt_at_index (im->fibs, fib_index1)->mtrie; */
+
+      /*             leaf1 = IP4_FIB_MTRIE_LEAF_ROOT; */
+
+      /*             leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, */
+      /*                                             &ip1->src_address, 0); */
+
+      /*             leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, */
+      /*                                             &ip1->src_address, 1); */
+
+      /*             leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, */
+      /*                                             &ip1->src_address, 2); */
+
+      /*             leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, */
+      /*                                             &ip1->src_address, 3); */
+
+      /*             adj_index1 = ip4_fib_mtrie_leaf_get_adj_index (leaf1); */
+
+      /*             ASSERT (adj_index1 == ip4_fib_lookup_with_table (im, fib_index1, */
+      /*                                                           &ip1->src_address, */
+      /*                                                           0)); */
+      /*             adj1 = ip_get_adjacency (lm, adj_index1); */
+      /*           } */
+
+      /*         pass0 = 0; */
+      /*         pass0 |= adj0 == 0; */
+      /*         pass0 |= ip4_address_is_multicast (&ip0->src_address); */
+      /*         pass0 |= */
+      /*           ip0->src_address.as_u32 == clib_host_to_net_u32 (0xFFFFFFFF); */
+      /*         pass0 |= (ip0->protocol != IP_PROTOCOL_UDP) */
+      /*           && (ip0->protocol != IP_PROTOCOL_TCP); */
+
+      /*         pass1 = 0; */
+      /*         pass1 |= adj1 == 0; */
+      /*         pass1 |= ip4_address_is_multicast (&ip1->src_address); */
+      /*         pass1 |= */
+      /*           ip1->src_address.as_u32 == clib_host_to_net_u32 (0xFFFFFFFF); */
+      /*         pass1 |= (ip1->protocol != IP_PROTOCOL_UDP) */
+      /*           && (ip1->protocol != IP_PROTOCOL_TCP); */
+
+      /*         save_next0 = next0; */
+      /*         udp0 = ip4_next_header (ip0); */
+      /*         save_next1 = next1; */
+      /*         udp1 = ip4_next_header (ip1); */
+
+      /*         if (PREDICT_TRUE (pass0 == 0)) */
+      /*           { */
+      /*             good_packets++; */
+      /*             next0 = check_adj_port_range_x1 */
+      /*            (adj0, clib_net_to_host_u16 (udp0->dst_port), next0); */
+      /*             good_packets -= (save_next0 != next0); */
+      /*             b0->error = error_node->errors */
+      /*            [IP4_SOURCE_AND_PORT_RANGE_CHECK_ERROR_CHECK_FAIL]; */
+      /*           } */
+
+      /*         if (PREDICT_TRUE (pass1 == 0)) */
+      /*           { */
+      /*             good_packets++; */
+      /*             next1 = check_adj_port_range_x1 */
+      /*            (adj1, clib_net_to_host_u16 (udp1->dst_port), next1); */
+      /*             good_packets -= (save_next1 != next1); */
+      /*             b1->error = error_node->errors */
+      /*            [IP4_SOURCE_AND_PORT_RANGE_CHECK_ERROR_CHECK_FAIL]; */
+      /*           } */
+
+      /*         if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) */
+      /*                         && (b0->flags & VLIB_BUFFER_IS_TRACED))) */
+      /*           { */
+      /*             ip4_source_and_port_range_check_trace_t *t = */
+      /*            vlib_add_trace (vm, node, b0, sizeof (*t)); */
+      /*             t->pass = next0 == save_next0; */
+      /*             t->bypass = pass0; */
+      /*             t->fib_index = fib_index0; */
+      /*             t->src_addr.as_u32 = ip0->src_address.as_u32; */
+      /*             t->port = (pass0 == 0) ? */
+      /*            clib_net_to_host_u16 (udp0->dst_port) : 0; */
+      /*             t->is_tcp = ip0->protocol == IP_PROTOCOL_TCP; */
+      /*           } */
+
+      /*         if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) */
+      /*                         && (b1->flags & VLIB_BUFFER_IS_TRACED))) */
+      /*           { */
+      /*             ip4_source_and_port_range_check_trace_t *t = */
+      /*            vlib_add_trace (vm, node, b1, sizeof (*t)); */
+      /*             t->pass = next1 == save_next1; */
+      /*             t->bypass = pass1; */
+      /*             t->fib_index = fib_index1; */
+      /*             t->src_addr.as_u32 = ip1->src_address.as_u32; */
+      /*             t->port = (pass1 == 0) ? */
+      /*            clib_net_to_host_u16 (udp1->dst_port) : 0; */
+      /*             t->is_tcp = ip1->protocol == IP_PROTOCOL_TCP; */
+      /*           } */
+
+      /*         vlib_validate_buffer_enqueue_x2 (vm, node, next_index, */
+      /*                                       to_next, n_left_to_next, */
+      /*                                       bi0, bi1, next0, next1); */
+      /*       } */
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *b0;
+	  ip4_header_t *ip0;
+	  ip_source_and_port_range_check_config_t *c0;
+	  u32 bi0, next0, lb_index0, pass0, save_next0, fib_index0;
+	  udp_header_t *udp0;
+	  const protocol_port_range_dpo_t *ppr_dpo0 = NULL;
+	  const dpo_id_t *dpo;
+	  u32 sw_if_index0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index, sw_if_index0);
+
+	  if (is_tx)
+	    vlib_buffer_advance (b0, sizeof (ethernet_header_t));
+
+	  ip0 = vlib_buffer_get_current (b0);
+
+	  c0 = vnet_feature_next_with_data (sw_if_index0, &next0,
+					    b0, sizeof (c0[0]));
+
+	  /* we can't use the default VRF here... */
+	  for (i = 0; i < IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS; i++)
+	    {
+	      ASSERT (c0->fib_index[i]);
+	    }
+
+
+	  if (is_tx)
+	    {
+	      if (ip0->protocol == IP_PROTOCOL_UDP)
+		fib_index0 =
+		  c0->fib_index
+		  [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN];
+	      if (ip0->protocol == IP_PROTOCOL_TCP)
+		fib_index0 =
+		  c0->fib_index
+		  [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN];
+	    }
+	  else
+	    {
+	      if (ip0->protocol == IP_PROTOCOL_UDP)
+		fib_index0 =
+		  c0->fib_index
+		  [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT];
+	      if (ip0->protocol == IP_PROTOCOL_TCP)
+		fib_index0 =
+		  c0->fib_index
+		  [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT];
+	    }
+
+	  if (fib_index0 != ~0)
+	    {
+	      lb_index0 = ip4_fib_forwarding_lookup (fib_index0,
+						     &ip0->src_address);
+
+	      dpo =
+		load_balance_get_bucket_i (load_balance_get (lb_index0), 0);
+
+	      if (ppr_dpo_type == dpo->dpoi_type)
+		{
+		  ppr_dpo0 = protocol_port_range_dpo_get (dpo->dpoi_index);
+		}
+	      /*
+	       * else the lookup hit an enty that was no inserted
+	       * by this range checker, which is the default route
+	       */
+	    }
+	  /*
+	   * $$$ which (src,dst) categories should we always pass?
+	   */
+	  pass0 = 0;
+	  pass0 |= ip4_address_is_multicast (&ip0->src_address);
+	  pass0 |=
+	    ip0->src_address.as_u32 == clib_host_to_net_u32 (0xFFFFFFFF);
+	  pass0 |= (ip0->protocol != IP_PROTOCOL_UDP)
+	    && (ip0->protocol != IP_PROTOCOL_TCP);
+
+	  save_next0 = next0;
+	  udp0 = ip4_next_header (ip0);
+
+	  if (PREDICT_TRUE (pass0 == 0))
+	    {
+	      good_packets++;
+	      next0 = check_adj_port_range_x1
+		(ppr_dpo0, clib_net_to_host_u16 (udp0->dst_port), next0);
+	      good_packets -= (save_next0 != next0);
+	      b0->error = error_node->errors
+		[IP4_SOURCE_AND_PORT_RANGE_CHECK_ERROR_CHECK_FAIL];
+	    }
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      ip4_source_and_port_range_check_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->pass = next0 == save_next0;
+	      t->bypass = pass0;
+	      t->fib_index = fib_index0;
+	      t->src_addr.as_u32 = ip0->src_address.as_u32;
+	      t->port = (pass0 == 0) ?
+		clib_net_to_host_u16 (udp0->dst_port) : 0;
+	      t->is_tcp = ip0->protocol == IP_PROTOCOL_TCP;
+	    }
+
+	  if (is_tx)
+	    vlib_buffer_advance (b0, -sizeof (ethernet_header_t));
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  if (is_tx)
+    vlib_node_increment_counter (vm, ip4_source_port_and_range_check_tx.index,
+				 IP4_SOURCE_AND_PORT_RANGE_CHECK_ERROR_CHECK_OK,
+				 good_packets);
+  else
+    vlib_node_increment_counter (vm, ip4_source_port_and_range_check_rx.index,
+				 IP4_SOURCE_AND_PORT_RANGE_CHECK_ERROR_CHECK_OK,
+				 good_packets);
+  return frame->n_vectors;
+}
+
+static uword
+ip4_source_and_port_range_check_rx (vlib_main_t * vm,
+				    vlib_node_runtime_t * node,
+				    vlib_frame_t * frame)
+{
+  return ip4_source_and_port_range_check_inline (vm, node, frame,
+						 0 /* !is_tx */ );
+}
+
+static uword
+ip4_source_and_port_range_check_tx (vlib_main_t * vm,
+				    vlib_node_runtime_t * node,
+				    vlib_frame_t * frame)
+{
+  return ip4_source_and_port_range_check_inline (vm, node, frame,
+						 1 /* is_tx */ );
+}
+
+/* Note: Calling same function for both RX and TX nodes
+   as always checking dst_port, although
+   if this changes can easily make new function
+*/
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_source_port_and_range_check_rx) = {
+  .function = ip4_source_and_port_range_check_rx,
+  .name = "ip4-source-and-port-range-check-rx",
+  .vector_size = sizeof (u32),
+
+  .n_errors = ARRAY_LEN(ip4_source_and_port_range_check_error_strings),
+  .error_strings = ip4_source_and_port_range_check_error_strings,
+
+  .n_next_nodes = IP4_SOURCE_AND_PORT_RANGE_CHECK_N_NEXT,
+  .next_nodes = {
+    [IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP] = "error-drop",
+  },
+
+  .format_buffer = format_ip4_header,
+  .format_trace = format_ip4_source_and_port_range_check_trace,
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_source_port_and_range_check_tx) = {
+  .function = ip4_source_and_port_range_check_tx,
+  .name = "ip4-source-and-port-range-check-tx",
+  .vector_size = sizeof (u32),
+
+  .n_errors = ARRAY_LEN(ip4_source_and_port_range_check_error_strings),
+  .error_strings = ip4_source_and_port_range_check_error_strings,
+
+  .n_next_nodes = IP4_SOURCE_AND_PORT_RANGE_CHECK_N_NEXT,
+  .next_nodes = {
+    [IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP] = "error-drop",
+  },
+
+  .format_buffer = format_ip4_header,
+  .format_trace = format_ip4_source_and_port_range_check_trace,
+};
+/* *INDENT-ON* */
+
+int
+set_ip_source_and_port_range_check (vlib_main_t * vm,
+				    u32 * fib_index,
+				    u32 sw_if_index, u32 is_add)
+{
+  ip_source_and_port_range_check_config_t config;
+  int rv = 0;
+  int i;
+
+  for (i = 0; i < IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS; i++)
+    {
+      config.fib_index[i] = fib_index[i];
+    }
+
+  /* For OUT we are in the RX path */
+  if ((fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT] != ~0) ||
+      (fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT] != ~0))
+    {
+      vnet_feature_enable_disable ("ip4-unicast",
+				   "ip4-source-and-port-range-check-rx",
+				   sw_if_index, is_add, &config,
+				   sizeof (config));
+    }
+
+  /* For IN we are in the TX path */
+  if ((fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN] != ~0) ||
+      (fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN] != ~0))
+    {
+      vnet_feature_enable_disable ("ip4-output",
+				   "ip4-source-and-port-range-check-tx",
+				   sw_if_index, is_add, &config,
+				   sizeof (config));
+    }
+  return rv;
+}
+
+static clib_error_t *
+set_ip_source_and_port_range_check_fn (vlib_main_t * vm,
+				       unformat_input_t * input,
+				       vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip4_main_t *im = &ip4_main;
+  clib_error_t *error = 0;
+  u8 is_add = 1;
+  u32 sw_if_index = ~0;
+  u32 vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS];
+  u32 fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS];
+  int vrf_set = 0;
+  uword *p;
+  int rv = 0;
+  int i;
+
+  sw_if_index = ~0;
+  for (i = 0; i < IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS; i++)
+    {
+      fib_index[i] = ~0;
+      vrf_id[i] = ~0;
+    }
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%U", unformat_vnet_sw_interface, vnm,
+		    &sw_if_index))
+	;
+      else
+	if (unformat
+	    (input, "tcp-out-vrf %d",
+	     &vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT]))
+	vrf_set = 1;
+      else
+	if (unformat
+	    (input, "udp-out-vrf %d",
+	     &vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT]))
+	vrf_set = 1;
+      else
+	if (unformat
+	    (input, "tcp-in-vrf %d",
+	     &vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN]))
+	vrf_set = 1;
+      else
+	if (unformat
+	    (input, "udp-in-vrf %d",
+	     &vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN]))
+	vrf_set = 1;
+      else if (unformat (input, "del"))
+	is_add = 0;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "Interface required but not specified");
+
+  if (!vrf_set)
+    return clib_error_return (0,
+			      "TCP or UDP VRF ID required but not specified");
+
+  for (i = 0; i < IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS; i++)
+    {
+
+      if (vrf_id[i] == 0)
+	return clib_error_return (0,
+				  "TCP, UDP VRF ID should not be 0 (default). Should be distinct VRF for this purpose. ");
+
+      if (vrf_id[i] != ~0)
+	{
+	  p = hash_get (im->fib_index_by_table_id, vrf_id[i]);
+
+	  if (p == 0)
+	    return clib_error_return (0, "Invalid VRF ID %d", vrf_id[i]);
+
+	  fib_index[i] = p[0];
+	}
+    }
+  rv =
+    set_ip_source_and_port_range_check (vm, fib_index, sw_if_index, is_add);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    default:
+      return clib_error_return
+	(0,
+	 "set source and port-range on interface returned an unexpected value: %d",
+	 rv);
+    }
+  return error;
+}
+
+/*?
+ * Add the 'ip4-source-and-port-range-check-rx' or
+ * 'ip4-source-and-port-range-check-tx' graph node for a given
+ * interface. 'tcp-out-vrf' and 'udp-out-vrf' will add to
+ * the RX path. 'tcp-in-vrf' and 'udp-in-vrf' will add to
+ * the TX path. A graph node will be inserted into the chain when
+ * the range check is added to the first interface. It will not
+ * be removed from when range check is removed from the last
+ * interface.
+ *
+ * By adding the range check graph node to the interface, incoming
+ * or outgoing TCP/UDP packets will be validated using the
+ * provided IPv4 FIB table (VRF).
+ *
+ * @note 'ip4-source-and-port-range-check-rx' and
+ * 'ip4-source-and-port-range-check-tx' strings are too long, so
+ * they are truncated on the 'show vlib graph' output.
+ *
+ * @todo This content needs to be validated and potentially more detail added.
+ *
+ * @cliexpar
+ * @parblock
+ * Example of graph node before range checking is enabled:
+ * @cliexstart{show vlib graph ip4-source-and-port-range-check-tx}
+ *            Name                      Next                    Previous
+ * ip4-source-and-port-range-      error-drop [0]
+ * @cliexend
+ *
+ * Example of how to enable range checking on TX:
+ * @cliexcmd{set interface ip source-and-port-range-check GigabitEthernet2/0/0 udp-in-vrf 7}
+ *
+ * Example of graph node after range checking is enabled:
+ * @cliexstart{show vlib graph ip4-source-and-port-range-check-tx}
+ *            Name                      Next                    Previous
+ * ip4-source-and-port-range-      error-drop [0]              ip4-rewrite
+ *                              interface-output [1]
+ * @cliexend
+ *
+ * Example of how to display the features enabed on an interface:
+ * @cliexstart{show ip interface features GigabitEthernet2/0/0}
+ * IP feature paths configured on GigabitEthernet2/0/0...
+ *
+ * ipv4 unicast:
+ *   ip4-source-and-port-range-check-rx
+ *   ip4-lookup
+ *
+ * ipv4 multicast:
+ *   ip4-lookup-multicast
+ *
+ * ipv4 multicast:
+ *   interface-output
+ *
+ * ipv6 unicast:
+ *   ip6-lookup
+ *
+ * ipv6 multicast:
+ *   ip6-lookup
+ *
+ * ipv6 multicast:
+ *   interface-output
+ * @cliexend
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_ip_source_and_port_range_check_command, static) = {
+  .path = "set interface ip source-and-port-range-check",
+  .function = set_ip_source_and_port_range_check_fn,
+  .short_help = "set interface ip source-and-port-range-check <interface> [tcp-out-vrf <table-id>] [udp-out-vrf <table-id>] [tcp-in-vrf <table-id>] [udp-in-vrf <table-id>] [del]",
+};
+/* *INDENT-ON* */
+
+static u8 *
+format_ppr_dpo (u8 * s, va_list * args)
+{
+  index_t index = va_arg (*args, index_t);
+  CLIB_UNUSED (u32 indent) = va_arg (*args, u32);
+
+  protocol_port_range_dpo_t *ppr_dpo;
+  int i, j;
+  int printed = 0;
+
+  ppr_dpo = protocol_port_range_dpo_get (index);
+
+  s = format (s, "allow ");
+
+  for (i = 0; i < ppr_dpo->n_used_blocks; i++)
+    {
+      for (j = 0; j < 8; j++)
+	{
+	  if (ppr_dpo->blocks[i].low.as_u16[j])
+	    {
+	      if (printed)
+		s = format (s, ", ");
+	      if (ppr_dpo->blocks[i].hi.as_u16[j] >
+		  (ppr_dpo->blocks[i].low.as_u16[j] + 1))
+		s =
+		  format (s, "%d-%d", (u32) ppr_dpo->blocks[i].low.as_u16[j],
+			  (u32) ppr_dpo->blocks[i].hi.as_u16[j] - 1);
+	      else
+		s = format (s, "%d", ppr_dpo->blocks[i].low.as_u16[j]);
+	      printed = 1;
+	    }
+	}
+    }
+  return s;
+}
+
+static void
+ppr_dpo_lock (dpo_id_t * dpo)
+{
+}
+
+static void
+ppr_dpo_unlock (dpo_id_t * dpo)
+{
+}
+
+const static dpo_vft_t ppr_vft = {
+  .dv_lock = ppr_dpo_lock,
+  .dv_unlock = ppr_dpo_unlock,
+  .dv_format = format_ppr_dpo,
+};
+
+const static char *const ppr_ip4_nodes[] = {
+  "ip4-source-and-port-range-check-rx",
+  NULL,
+};
+
+const static char *const *const ppr_nodes[DPO_PROTO_NUM] = {
+  [DPO_PROTO_IP4] = ppr_ip4_nodes,
+};
+
+clib_error_t *
+ip4_source_and_port_range_check_init (vlib_main_t * vm)
+{
+  source_range_check_main_t *srm = &source_range_check_main;
+
+  srm->vlib_main = vm;
+  srm->vnet_main = vnet_get_main ();
+
+  ppr_dpo_type = dpo_register_new_type (&ppr_vft, ppr_nodes);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ip4_source_and_port_range_check_init);
+
+protocol_port_range_dpo_t *
+protocol_port_range_dpo_alloc (void)
+{
+  protocol_port_range_dpo_t *ppr_dpo;
+
+  pool_get_aligned (ppr_dpo_pool, ppr_dpo, CLIB_CACHE_LINE_BYTES);
+  memset (ppr_dpo, 0, sizeof (*ppr_dpo));
+
+  ppr_dpo->n_free_ranges = N_PORT_RANGES_PER_DPO;
+
+  return (ppr_dpo);
+}
+
+
+static int
+add_port_range_adjacency (u32 fib_index,
+			  ip4_address_t * address,
+			  u32 length, u16 * low_ports, u16 * high_ports)
+{
+  protocol_port_range_dpo_t *ppr_dpo;
+  dpo_id_t dpop = DPO_INVALID;
+  int i, j, k;
+
+  fib_node_index_t fei;
+  fib_prefix_t pfx = {
+    .fp_proto = FIB_PROTOCOL_IP4,
+    .fp_len = length,
+    .fp_addr = {
+		.ip4 = *address,
+		},
+  };
+
+  /*
+   * check to see if we have already sourced this prefix
+   */
+  fei = fib_table_lookup_exact_match (fib_index, &pfx);
+
+  if (FIB_NODE_INDEX_INVALID == fei)
+    {
+      /*
+       * this is a first time add for this prefix.
+       */
+      ppr_dpo = protocol_port_range_dpo_alloc ();
+    }
+  else
+    {
+      /*
+       * the prefix is already there.
+       * check it was sourced by us, and if so get the ragne DPO from it.
+       */
+      dpo_id_t dpo = DPO_INVALID;
+      const dpo_id_t *bucket;
+
+      if (fib_entry_get_dpo_for_source (fei, FIB_SOURCE_SPECIAL, &dpo))
+	{
+	  /*
+	   * there is existing state. we'll want to add the new ranges to it
+	   */
+	  bucket =
+	    load_balance_get_bucket_i (load_balance_get (dpo.dpoi_index), 0);
+	  ppr_dpo = protocol_port_range_dpo_get (bucket->dpoi_index);
+	  dpo_reset (&dpo);
+	}
+      else
+	{
+	  /*
+	   * there is no PPR state associated with this prefix,
+	   * so we'll need a new DPO
+	   */
+	  ppr_dpo = protocol_port_range_dpo_alloc ();
+	}
+    }
+
+  if (vec_len (low_ports) > ppr_dpo->n_free_ranges)
+    return VNET_API_ERROR_EXCEEDED_NUMBER_OF_RANGES_CAPACITY;
+
+  j = k = 0;
+
+  for (i = 0; i < vec_len (low_ports); i++)
+    {
+      for (; j < N_BLOCKS_PER_DPO; j++)
+	{
+	  for (; k < 8; k++)
+	    {
+	      if (ppr_dpo->blocks[j].low.as_u16[k] == 0)
+		{
+		  ppr_dpo->blocks[j].low.as_u16[k] = low_ports[i];
+		  ppr_dpo->blocks[j].hi.as_u16[k] = high_ports[i];
+		  goto doublebreak;
+		}
+	    }
+	}
+    doublebreak:;
+    }
+  ppr_dpo->n_used_blocks = j + 1;
+
+  /*
+   * add or update the entry in the FIB
+   */
+  dpo_set (&dpop, ppr_dpo_type, DPO_PROTO_IP4, (ppr_dpo - ppr_dpo_pool));
+
+  if (FIB_NODE_INDEX_INVALID == fei)
+    {
+      fib_table_entry_special_dpo_add (fib_index,
+				       &pfx,
+				       FIB_SOURCE_SPECIAL,
+				       FIB_ENTRY_FLAG_NONE, &dpop);
+    }
+  else
+    {
+      fib_entry_special_update (fei,
+				FIB_SOURCE_SPECIAL,
+				FIB_ENTRY_FLAG_NONE, &dpop);
+    }
+
+  return 0;
+}
+
+static int
+remove_port_range_adjacency (u32 fib_index,
+			     ip4_address_t * address,
+			     u32 length, u16 * low_ports, u16 * high_ports)
+{
+  protocol_port_range_dpo_t *ppr_dpo;
+  fib_node_index_t fei;
+  int i, j, k;
+
+  fib_prefix_t pfx = {
+    .fp_proto = FIB_PROTOCOL_IP4,
+    .fp_len = length,
+    .fp_addr = {
+		.ip4 = *address,
+		},
+  };
+
+  /*
+   * check to see if we have sourced this prefix
+   */
+  fei = fib_table_lookup_exact_match (fib_index, &pfx);
+
+  if (FIB_NODE_INDEX_INVALID == fei)
+    {
+      /*
+       * not one of ours
+       */
+      return VNET_API_ERROR_INCORRECT_ADJACENCY_TYPE;
+    }
+  else
+    {
+      /*
+       * the prefix is already there.
+       * check it was sourced by us
+       */
+      dpo_id_t dpo = DPO_INVALID;
+      const dpo_id_t *bucket;
+
+      if (fib_entry_get_dpo_for_source (fei, FIB_SOURCE_SPECIAL, &dpo))
+	{
+	  /*
+	   * there is existing state. we'll want to add the new ranges to it
+	   */
+	  bucket =
+	    load_balance_get_bucket_i (load_balance_get (dpo.dpoi_index), 0);
+	  ppr_dpo = protocol_port_range_dpo_get (bucket->dpoi_index);
+	  dpo_reset (&dpo);
+	}
+      else
+	{
+	  /*
+	   * not one of ours
+	   */
+	  return VNET_API_ERROR_INCORRECT_ADJACENCY_TYPE;
+	}
+    }
+
+  for (i = 0; i < vec_len (low_ports); i++)
+    {
+      for (j = 0; j < N_BLOCKS_PER_DPO; j++)
+	{
+	  for (k = 0; k < 8; k++)
+	    {
+	      if (low_ports[i] == ppr_dpo->blocks[j].low.as_u16[k] &&
+		  high_ports[i] == ppr_dpo->blocks[j].hi.as_u16[k])
+		{
+		  ppr_dpo->blocks[j].low.as_u16[k] =
+		    ppr_dpo->blocks[j].hi.as_u16[k] = 0;
+		  goto doublebreak;
+		}
+	    }
+	}
+    doublebreak:;
+    }
+
+  ppr_dpo->n_free_ranges = 0;
+
+  /* Have we deleted all ranges yet? */
+  for (i = 0; i < N_BLOCKS_PER_DPO; i++)
+    {
+      for (j = 0; j < 8; j++)
+	{
+	  if (ppr_dpo->blocks[j].low.as_u16[i] == 0)
+	    ppr_dpo->n_free_ranges++;
+	}
+    }
+
+  if (N_PORT_RANGES_PER_DPO == ppr_dpo->n_free_ranges)
+    {
+      /* Yes, lose the adjacency... */
+      fib_table_entry_special_remove (fib_index, &pfx, FIB_SOURCE_SPECIAL);
+    }
+  else
+    {
+      /*
+       * compact the ranges down to a contiguous block
+       */
+      // FIXME. TODO.
+    }
+
+  return 0;
+}
+
+// This will be moved to another file and implemented post API freeze.
+int
+ip6_source_and_port_range_check_add_del (ip6_address_t * address,
+					 u32 length,
+					 u32 vrf_id,
+					 u16 * low_ports,
+					 u16 * high_ports, int is_add)
+{
+  return 0;
+}
+
+int
+ip4_source_and_port_range_check_add_del (ip4_address_t * address,
+					 u32 length,
+					 u32 vrf_id,
+					 u16 * low_ports,
+					 u16 * high_ports, int is_add)
+{
+  u32 fib_index;
+
+  fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, vrf_id);
+
+  if (is_add == 0)
+    {
+      remove_port_range_adjacency (fib_index, address, length,
+				   low_ports, high_ports);
+    }
+  else
+    {
+      add_port_range_adjacency (fib_index, address, length,
+				low_ports, high_ports);
+    }
+
+  return 0;
+}
+
+static clib_error_t *
+ip_source_and_port_range_check_command_fn (vlib_main_t * vm,
+					   unformat_input_t * input,
+					   vlib_cli_command_t * cmd)
+{
+  u16 *low_ports = 0;
+  u16 *high_ports = 0;
+  u16 this_low;
+  u16 this_hi;
+  ip4_address_t ip4_addr;
+  ip6_address_t ip6_addr;	//This function will be moved to generic impl when v6 done.
+  u32 length;
+  u32 tmp, tmp2;
+  u32 vrf_id = ~0;
+  int is_add = 1, ip_ver = ~0;
+  int rv;
+
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%U/%d", unformat_ip4_address, &ip4_addr, &length))
+	ip_ver = 4;
+      else
+	if (unformat
+	    (input, "%U/%d", unformat_ip6_address, &ip6_addr, &length))
+	ip_ver = 6;
+      else if (unformat (input, "vrf %d", &vrf_id))
+	;
+      else if (unformat (input, "del"))
+	is_add = 0;
+      else if (unformat (input, "port %d", &tmp))
+	{
+	  if (tmp == 0 || tmp > 65535)
+	    return clib_error_return (0, "port %d out of range", tmp);
+	  this_low = tmp;
+	  this_hi = this_low + 1;
+	  vec_add1 (low_ports, this_low);
+	  vec_add1 (high_ports, this_hi);
+	}
+      else if (unformat (input, "range %d - %d", &tmp, &tmp2))
+	{
+	  if (tmp > tmp2)
+	    return clib_error_return (0, "ports %d and %d out of order",
+				      tmp, tmp2);
+	  if (tmp == 0 || tmp > 65535)
+	    return clib_error_return (0, "low port %d out of range", tmp);
+	  if (tmp2 == 0 || tmp2 > 65535)
+	    return clib_error_return (0, "high port %d out of range", tmp2);
+	  this_low = tmp;
+	  this_hi = tmp2 + 1;
+	  vec_add1 (low_ports, this_low);
+	  vec_add1 (high_ports, this_hi);
+	}
+      else
+	break;
+    }
+
+  if (ip_ver == ~0)
+    return clib_error_return (0, " <address>/<mask> not specified");
+
+  if (vrf_id == ~0)
+    return clib_error_return (0, " VRF ID required, not specified");
+
+  if (vec_len (low_ports) == 0)
+    return clib_error_return (0,
+			      " Both VRF ID and range/port must be set for a protocol.");
+
+  if (vrf_id == 0)
+    return clib_error_return (0, " VRF ID can not be 0 (default).");
+
+
+  if (ip_ver == 4)
+    rv = ip4_source_and_port_range_check_add_del
+      (&ip4_addr, length, vrf_id, low_ports, high_ports, is_add);
+  else
+    return clib_error_return (0, " IPv6 in subsequent patch");
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case VNET_API_ERROR_INCORRECT_ADJACENCY_TYPE:
+      return clib_error_return
+	(0, " Incorrect adjacency for add/del operation");
+
+    case VNET_API_ERROR_EXCEEDED_NUMBER_OF_PORTS_CAPACITY:
+      return clib_error_return (0, " Too many ports in add/del operation");
+
+    case VNET_API_ERROR_EXCEEDED_NUMBER_OF_RANGES_CAPACITY:
+      return clib_error_return
+	(0, " Too many ranges requested for add operation");
+
+    default:
+      return clib_error_return (0, " returned an unexpected value: %d", rv);
+    }
+
+  return 0;
+}
+
+/*?
+ * This command adds an IP Subnet and range of ports to be validated
+ * by an IP FIB table (VRF).
+ *
+ * @todo This is incomplete. This needs a detailed description and a
+ * practical example.
+ *
+ * @cliexpar
+ * Example of how to add an IPv4 subnet and single port to an IPv4 FIB table:
+ * @cliexcmd{set ip source-and-port-range-check vrf 7 172.16.1.0/24 port 23}
+ * Example of how to add an IPv4 subnet and range of ports to an IPv4 FIB table:
+ * @cliexcmd{set ip source-and-port-range-check vrf 7 172.16.1.0/24 range 23 - 100}
+ * Example of how to delete an IPv4 subnet and single port from an IPv4 FIB table:
+ * @cliexcmd{set ip source-and-port-range-check vrf 7 172.16.1.0/24 port 23 del}
+ * Example of how to delete an IPv4 subnet and range of ports from an IPv4 FIB table:
+ * @cliexcmd{set ip source-and-port-range-check vrf 7 172.16.1.0/24 range 23 - 100 del}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip_source_and_port_range_check_command, static) = {
+  .path = "set ip source-and-port-range-check",
+  .function = ip_source_and_port_range_check_command_fn,
+  .short_help =
+  "set ip source-and-port-range-check vrf <table-id> <ip-addr>/<mask> {port nn | range <nn> - <nn>} [del]",
+};
+/* *INDENT-ON* */
+
+
+static clib_error_t *
+show_source_and_port_range_check_fn (vlib_main_t * vm,
+				     unformat_input_t * input,
+				     vlib_cli_command_t * cmd)
+{
+  protocol_port_range_dpo_t *ppr_dpo;
+  u32 fib_index;
+  u8 addr_set = 0;
+  u32 vrf_id = ~0;
+  int rv, i, j;
+  u32 port = 0;
+  fib_prefix_t pfx = {
+    .fp_proto = FIB_PROTOCOL_IP4,
+    .fp_len = 32,
+  };
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%U", unformat_ip4_address, &pfx.fp_addr.ip4))
+	addr_set = 1;
+      else if (unformat (input, "vrf %d", &vrf_id))
+	;
+      else if (unformat (input, "port %d", &port))
+	;
+      else
+	break;
+    }
+
+  if (addr_set == 0)
+    return clib_error_return (0, "<address> not specified");
+
+  if (vrf_id == ~0)
+    return clib_error_return (0, "VRF ID required, not specified");
+
+  fib_index = fib_table_find (FIB_PROTOCOL_IP4, vrf_id);
+  if (~0 == fib_index)
+    return clib_error_return (0, "VRF %d not found", vrf_id);
+
+  /*
+   * find the longest prefix match on the address requested,
+   * check it was sourced by us
+   */
+  dpo_id_t dpo = DPO_INVALID;
+  const dpo_id_t *bucket;
+
+  if (!fib_entry_get_dpo_for_source (fib_table_lookup (fib_index, &pfx),
+				     FIB_SOURCE_SPECIAL, &dpo))
+    {
+      /*
+       * not one of ours
+       */
+      vlib_cli_output (vm, "%U: src address drop", format_ip4_address,
+		       &pfx.fp_addr.ip4);
+      return 0;
+    }
+
+  bucket = load_balance_get_bucket_i (load_balance_get (dpo.dpoi_index), 0);
+  ppr_dpo = protocol_port_range_dpo_get (bucket->dpoi_index);
+  dpo_reset (&dpo);
+
+  if (port)
+    {
+      rv = check_adj_port_range_x1 (ppr_dpo, (u16) port, 1234);
+      if (rv == 1234)
+	vlib_cli_output (vm, "%U port %d PASS", format_ip4_address,
+			 &pfx.fp_addr.ip4, port);
+      else
+	vlib_cli_output (vm, "%U port %d FAIL", format_ip4_address,
+			 &pfx.fp_addr.ip4, port);
+      return 0;
+    }
+  else
+    {
+      u8 *s;
+
+      s = format (0, "%U: ", format_ip4_address, &pfx.fp_addr.ip4);
+
+      for (i = 0; i < N_BLOCKS_PER_DPO; i++)
+	{
+	  for (j = 0; j < 8; j++)
+	    {
+	      if (ppr_dpo->blocks[i].low.as_u16[j])
+		s = format (s, "%d - %d ",
+			    (u32) ppr_dpo->blocks[i].low.as_u16[j],
+			    (u32) ppr_dpo->blocks[i].hi.as_u16[j]);
+	    }
+	}
+      vlib_cli_output (vm, "%s", s);
+      vec_free (s);
+    }
+
+  return 0;
+}
+
+/*?
+ * Display the range of ports being validated by an IPv4 FIB for a given
+ * IP or subnet, or test if a given IP and port are being validated.
+ *
+ * @todo This is incomplete. This needs a detailed description and a
+ * practical example.
+ *
+ * @cliexpar
+ * Example of how to display the set of ports being validated for a given
+ * IPv4 subnet:
+ * @cliexstart{show ip source-and-port-range-check vrf 7 172.16.2.0}
+ * 172.16.2.0: 23 - 101
+ * @cliexend
+ * Example of how to test to determine of a given Pv4 address and port
+ * are being validated:
+ * @cliexstart{show ip source-and-port-range-check vrf 7 172.16.2.2 port 23}
+ * 172.16.2.2 port 23 PASS
+ * @cliexend
+ * @cliexstart{show ip source-and-port-range-check vrf 7 172.16.2.2 port 250}
+ * 172.16.2.2 port 250 FAIL
+ * @cliexend
+ ?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_source_and_port_range_check, static) = {
+  .path = "show ip source-and-port-range-check",
+  .function = show_source_and_port_range_check_fn,
+  .short_help =
+  "show ip source-and-port-range-check vrf <table-id> <ip-addr> [port <n>]",
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip4_source_check.c b/src/vnet/ip/ip4_source_check.c
new file mode 100644
index 00000000..d461cc88
--- /dev/null
+++ b/src/vnet/ip/ip4_source_check.c
@@ -0,0 +1,573 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip4_source_check.c: IP v4 check source address (unicast RPF check)
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/fib_urpf_list.h>
+#include <vnet/dpo/load_balance.h>
+
+/**
+ * @file
+ * @brief IPv4 Unicast Source Check.
+ *
+ * This file contains the IPv4 interface unicast source check.
+ */
+
+
+typedef struct
+{
+  u8 packet_data[64];
+  index_t urpf;
+} ip4_source_check_trace_t;
+
+static u8 *
+format_ip4_source_check_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  ip4_source_check_trace_t *t = va_arg (*va, ip4_source_check_trace_t *);
+
+  s = format (s, "%U",
+	      format_ip4_header, t->packet_data, sizeof (t->packet_data));
+
+  return s;
+}
+
+typedef enum
+{
+  IP4_SOURCE_CHECK_NEXT_DROP,
+  IP4_SOURCE_CHECK_N_NEXT,
+} ip4_source_check_next_t;
+
+typedef enum
+{
+  IP4_SOURCE_CHECK_REACHABLE_VIA_RX,
+  IP4_SOURCE_CHECK_REACHABLE_VIA_ANY,
+} ip4_source_check_type_t;
+
+typedef union
+{
+  u32 fib_index;
+} ip4_source_check_config_t;
+
+always_inline uword
+ip4_source_check_inline (vlib_main_t * vm,
+			 vlib_node_runtime_t * node,
+			 vlib_frame_t * frame,
+			 ip4_source_check_type_t source_check_type)
+{
+  u32 n_left_from, *from, *to_next;
+  u32 next_index;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip4_input_node.index);
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+				   /* stride */ 1,
+				   sizeof (ip4_source_check_trace_t));
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  vlib_buffer_t *p0, *p1;
+	  ip4_header_t *ip0, *ip1;
+	  ip4_fib_mtrie_t *mtrie0, *mtrie1;
+	  ip4_fib_mtrie_leaf_t leaf0, leaf1;
+	  ip4_source_check_config_t *c0, *c1;
+	  const load_balance_t *lb0, *lb1;
+	  u32 pi0, next0, pass0, lb_index0;
+	  u32 pi1, next1, pass1, lb_index1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), LOAD);
+	    CLIB_PREFETCH (p3->data, sizeof (ip1[0]), LOAD);
+	  }
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+
+	  ip0 = vlib_buffer_get_current (p0);
+	  ip1 = vlib_buffer_get_current (p1);
+
+	  c0 =
+	    vnet_feature_next_with_data (vnet_buffer (p0)->sw_if_index
+					 [VLIB_RX], &next0, p0,
+					 sizeof (c0[0]));
+	  c1 =
+	    vnet_feature_next_with_data (vnet_buffer (p1)->sw_if_index
+					 [VLIB_RX], &next1, p1,
+					 sizeof (c1[0]));
+
+	  mtrie0 = &ip4_fib_get (c0->fib_index)->mtrie;
+	  mtrie1 = &ip4_fib_get (c1->fib_index)->mtrie;
+
+	  leaf0 = leaf1 = IP4_FIB_MTRIE_LEAF_ROOT;
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 0);
+	  leaf1 =
+	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 0);
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 1);
+	  leaf1 =
+	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 1);
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 2);
+	  leaf1 =
+	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 2);
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 3);
+	  leaf1 =
+	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 3);
+
+	  lb_index0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
+	  lb_index1 = ip4_fib_mtrie_leaf_get_adj_index (leaf1);
+
+	  lb0 = load_balance_get (lb_index0);
+	  lb1 = load_balance_get (lb_index1);
+
+	  /* Pass multicast. */
+	  pass0 = ip4_address_is_multicast (&ip0->src_address)
+	    || ip0->src_address.as_u32 == clib_host_to_net_u32 (0xFFFFFFFF);
+	  pass1 = ip4_address_is_multicast (&ip1->src_address)
+	    || ip1->src_address.as_u32 == clib_host_to_net_u32 (0xFFFFFFFF);
+
+	  if (IP4_SOURCE_CHECK_REACHABLE_VIA_RX == source_check_type)
+	    {
+	      pass0 |= fib_urpf_check (lb0->lb_urpf,
+				       vnet_buffer (p0)->sw_if_index
+				       [VLIB_RX]);
+	      pass1 |=
+		fib_urpf_check (lb1->lb_urpf,
+				vnet_buffer (p1)->sw_if_index[VLIB_RX]);
+	    }
+	  else
+	    {
+	      pass0 |= fib_urpf_check_size (lb0->lb_urpf);
+	      pass1 |= fib_urpf_check_size (lb1->lb_urpf);
+	    }
+	  next0 = (pass0 ? next0 : IP4_SOURCE_CHECK_NEXT_DROP);
+	  next1 = (pass1 ? next1 : IP4_SOURCE_CHECK_NEXT_DROP);
+
+	  p0->error =
+	    error_node->errors[IP4_ERROR_UNICAST_SOURCE_CHECK_FAILS];
+	  p1->error =
+	    error_node->errors[IP4_ERROR_UNICAST_SOURCE_CHECK_FAILS];
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, pi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip4_header_t *ip0;
+	  ip4_fib_mtrie_t *mtrie0;
+	  ip4_fib_mtrie_leaf_t leaf0;
+	  ip4_source_check_config_t *c0;
+	  u32 pi0, next0, pass0, lb_index0;
+	  const load_balance_t *lb0;
+
+	  pi0 = from[0];
+	  to_next[0] = pi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip0 = vlib_buffer_get_current (p0);
+
+	  c0 =
+	    vnet_feature_next_with_data (vnet_buffer (p0)->sw_if_index
+					 [VLIB_RX], &next0, p0,
+					 sizeof (c0[0]));
+
+	  mtrie0 = &ip4_fib_get (c0->fib_index)->mtrie;
+
+	  leaf0 = IP4_FIB_MTRIE_LEAF_ROOT;
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 0);
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 1);
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 2);
+
+	  leaf0 =
+	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 3);
+
+	  lb_index0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
+
+	  lb0 = load_balance_get (lb_index0);
+
+	  /* Pass multicast. */
+	  pass0 = ip4_address_is_multicast (&ip0->src_address)
+	    || ip0->src_address.as_u32 == clib_host_to_net_u32 (0xFFFFFFFF);
+
+	  if (IP4_SOURCE_CHECK_REACHABLE_VIA_RX == source_check_type)
+	    {
+	      pass0 |= fib_urpf_check (lb0->lb_urpf,
+				       vnet_buffer (p0)->sw_if_index
+				       [VLIB_RX]);
+	    }
+	  else
+	    {
+	      pass0 |= fib_urpf_check_size (lb0->lb_urpf);
+	    }
+
+	  next0 = (pass0 ? next0 : IP4_SOURCE_CHECK_NEXT_DROP);
+	  p0->error =
+	    error_node->errors[IP4_ERROR_UNICAST_SOURCE_CHECK_FAILS];
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+static uword
+ip4_source_check_reachable_via_any (vlib_main_t * vm,
+				    vlib_node_runtime_t * node,
+				    vlib_frame_t * frame)
+{
+  return ip4_source_check_inline (vm, node, frame,
+				  IP4_SOURCE_CHECK_REACHABLE_VIA_ANY);
+}
+
+static uword
+ip4_source_check_reachable_via_rx (vlib_main_t * vm,
+				   vlib_node_runtime_t * node,
+				   vlib_frame_t * frame)
+{
+  return ip4_source_check_inline (vm, node, frame,
+				  IP4_SOURCE_CHECK_REACHABLE_VIA_RX);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_check_source_reachable_via_any) = {
+  .function = ip4_source_check_reachable_via_any,
+  .name = "ip4-source-check-via-any",
+  .vector_size = sizeof (u32),
+
+  .n_next_nodes = IP4_SOURCE_CHECK_N_NEXT,
+  .next_nodes = {
+    [IP4_SOURCE_CHECK_NEXT_DROP] = "error-drop",
+  },
+
+  .format_buffer = format_ip4_header,
+  .format_trace = format_ip4_source_check_trace,
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_check_source_reachable_via_any,
+			      ip4_source_check_reachable_via_any);
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_check_source_reachable_via_rx) = {
+  .function = ip4_source_check_reachable_via_rx,
+  .name = "ip4-source-check-via-rx",
+  .vector_size = sizeof (u32),
+
+  .n_next_nodes = IP4_SOURCE_CHECK_N_NEXT,
+  .next_nodes = {
+    [IP4_SOURCE_CHECK_NEXT_DROP] = "error-drop",
+  },
+
+  .format_buffer = format_ip4_header,
+  .format_trace = format_ip4_source_check_trace,
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_check_source_reachable_via_rx,
+			      ip4_source_check_reachable_via_rx);
+
+static clib_error_t *
+set_ip_source_check (vlib_main_t * vm,
+		     unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  vnet_main_t *vnm = vnet_get_main ();
+  ip4_main_t *im = &ip4_main;
+  clib_error_t *error = 0;
+  u32 sw_if_index, is_del;
+  ip4_source_check_config_t config;
+  char *feature_name = "ip4-source-check-via-rx";
+
+  sw_if_index = ~0;
+  is_del = 0;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat_user
+	  (line_input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+	;
+      else if (unformat (line_input, "del"))
+	is_del = 1;
+      else if (unformat (line_input, "loose"))
+	feature_name = "ip4-source-check-via-any";
+      else
+	{
+	  error = unformat_parse_error (line_input);
+	  goto done;
+	}
+    }
+
+  if (~0 == sw_if_index)
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, line_input);
+      goto done;
+    }
+
+  config.fib_index = im->fib_index_by_sw_if_index[sw_if_index];
+  vnet_feature_enable_disable ("ip4-unicast", feature_name, sw_if_index,
+			       is_del == 0, &config, sizeof (config));
+done:
+  return error;
+}
+
+/*?
+ * This command adds the 'ip4-source-check-via-rx' graph node for
+ * a given interface. By adding the IPv4 source check graph node to
+ * an interface, the code verifies that the source address of incoming
+ * unicast packets are reachable over the incoming interface. Two flavours
+ * are supported (the default is strict):
+ * - loose: accept ingress packet if there is a route to reach the source
+ * - strict: accept ingress packet if it arrived on an interface which
+ *          the route to the source uses. i.e. an interface that the source
+ *          is reachable via.
+ *
+ * @cliexpar
+ * @parblock
+ * Example of graph node before range checking is enabled:
+ * @cliexstart{show vlib graph ip4-source-check-via-rx}
+ *            Name                      Next                    Previous
+ * ip4-source-check-via-rx         error-drop [0]
+ * @cliexend
+ *
+ * Example of how to enable unicast source checking on an interface:
+ * @cliexcmd{set interface ip source-check GigabitEthernet2/0/0 loose}
+ *
+ * Example of graph node after range checking is enabled:
+ * @cliexstart{show vlib graph ip4-source-check-via-rx}
+ *            Name                      Next                    Previous
+ * ip4-source-check-via-rx         error-drop [0]         ip4-input-no-checksum
+ *                           ip4-source-and-port-range-         ip4-input
+ * @cliexend
+ *
+ * Example of how to display the feature enabed on an interface:
+ * @cliexstart{show ip interface features GigabitEthernet2/0/0}
+ * IP feature paths configured on GigabitEthernet2/0/0...
+ *
+ * ipv4 unicast:
+ *   ip4-source-check-via-rx
+ *   ip4-lookup
+ *
+ * ipv4 multicast:
+ *   ip4-lookup-multicast
+ *
+ * ipv4 multicast:
+ *   interface-output
+ *
+ * ipv6 unicast:
+ *   ip6-lookup
+ *
+ * ipv6 multicast:
+ *   ip6-lookup
+ *
+ * ipv6 multicast:
+ *   interface-output
+ * @cliexend
+ *
+ * Example of how to disable unicast source checking on an interface:
+ * @cliexcmd{set interface ip source-check GigabitEthernet2/0/0 del}
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_ip_source_check_command, static) = {
+  .path = "set interface ip source-check",
+  .function = set_ip_source_check,
+  .short_help = "set interface ip source-check <interface> [strict|loose] [del]",
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+ip_source_check_accept (vlib_main_t * vm,
+			unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  fib_prefix_t pfx = {
+    .fp_proto = FIB_PROTOCOL_IP4,
+  };
+  clib_error_t *error = NULL;
+  u32 table_id, is_add, fib_index;
+
+  is_add = 1;
+  table_id = ~0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "table %d", &table_id))
+	;
+      else if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "add"))
+	is_add = 1;
+      else if (unformat (line_input, "%U/%d",
+			 unformat_ip4_address, &pfx.fp_addr.ip4, &pfx.fp_len))
+	pfx.fp_proto = FIB_PROTOCOL_IP4;
+      else
+	{
+	  error = unformat_parse_error (line_input);
+	  goto done;
+	}
+    }
+
+  if (~0 != table_id)
+    {
+      fib_index = fib_table_id_find_fib_index (pfx.fp_proto, table_id);
+      if (~0 == fib_index)
+	{
+	  error = clib_error_return (0, "Nonexistent table id %d", table_id);
+	  goto done;
+	}
+    }
+  else
+    {
+      fib_index = 0;
+    }
+
+  if (is_add)
+    {
+      fib_table_entry_special_add (fib_index,
+				   &pfx,
+				   FIB_SOURCE_URPF_EXEMPT,
+				   FIB_ENTRY_FLAG_DROP, ADJ_INDEX_INVALID);
+    }
+  else
+    {
+      fib_table_entry_special_remove (fib_index,
+				      &pfx, FIB_SOURCE_URPF_EXEMPT);
+    }
+
+done:
+  return (error);
+}
+
+/*?
+ * Add an exemption for a prefix to pass the Unicast Reverse Path
+ * Forwarding (uRPF) loose check. This is for testing purposes only.
+ * If the '<em>table</em>' is not enter it is defaulted to 0. Default
+ * is to '<em>add</em>'. VPP always performs a loose uRPF check for
+ * for-us traffic.
+ *
+ * @cliexpar
+ * Example of how to add a uRPF exception to a FIB table to pass the
+ * loose RPF tests:
+ * @cliexcmd{ip urpf-accept table 7 add}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip_source_check_accept_command, static) = {
+  .path = "ip urpf-accept",
+  .function = ip_source_check_accept,
+  .short_help = "ip urpf-accept [table <table-id>] [add|del]",
+};
+/* *INDENT-ON* */
+
+
+/* Dummy init function to get us linked in. */
+clib_error_t *
+ip4_source_check_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ip4_source_check_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip4_test.c b/src/vnet/ip/ip4_test.c
new file mode 100644
index 00000000..45d17113
--- /dev/null
+++ b/src/vnet/ip/ip4_test.c
@@ -0,0 +1,340 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+
+/**
+ * @file
+ * @brief IPv4 FIB Tester.
+ *
+ * Not compiled in by default. IPv4 FIB tester. Add, probe, delete a bunch of
+ * random routes / masks and make sure that the mtrie agrees with
+ * the hash-table FIB.
+ *
+ * Manipulate the FIB by means of the debug CLI commands, to minimize
+ * the chances of doing something idiotic.
+ */
+
+/*
+ * These routines need to be redeclared non-static elsewhere.
+ *
+ * Also: rename ip_route() -> vnet_ip_route_cmd() and add the usual
+ * test_route_init() call to main.c
+ */
+clib_error_t *vnet_ip_route_cmd (vlib_main_t * vm,
+				 unformat_input_t * input,
+				 vlib_cli_command_t * cmd_arg);
+
+int ip4_lookup_validate (ip4_address_t * a, u32 fib_index0);
+
+ip4_fib_t *find_fib_by_table_index_or_id (ip4_main_t * im,
+					  u32 table_index_or_id, u32 flags);
+
+/* Routes to insert/delete/probe in FIB */
+typedef struct
+{
+  ip4_address_t address;
+  u32 mask_width;
+  u32 interface_id;		/* not an xx_if_index */
+} test_route_t;
+
+typedef struct
+{
+  /* Test routes in use */
+  test_route_t *route_pool;
+
+  /* Number of fake ethernets created */
+  u32 test_interfaces_created;
+} test_main_t;
+
+test_main_t test_main;
+
+/* fake ethernet device class, distinct from "fake-ethX" */
+static u8 *
+format_test_interface_name (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  return format (s, "test-eth%d", dev_instance);
+}
+
+static uword
+dummy_interface_tx (vlib_main_t * vm,
+		    vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  clib_warning ("you shouldn't be here, leaking buffers...");
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (test_interface_device_class,static) = {
+  .name = "Test interface",
+  .format_device_name = format_test_interface_name,
+  .tx_function = dummy_interface_tx,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+thrash (vlib_main_t * vm,
+	unformat_input_t * main_input, vlib_cli_command_t * cmd_arg)
+{
+  u32 seed = 0xdeaddabe;
+  u32 niter = 10;
+  u32 nroutes = 10;
+  u32 ninterfaces = 4;
+  f64 min_mask_bits = 7.0;
+  f64 max_mask_bits = 32.0;
+  u32 table_id = 11;		/* my amp goes to 11 (use fib 11) */
+  u32 table_index;
+  int iter, i;
+  u8 *cmd;
+  test_route_t *tr;
+  test_main_t *tm = &test_main;
+  ip4_main_t *im = &ip4_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  unformat_input_t cmd_input;
+  f64 rf;
+  u32 *masks = 0;
+  u32 tmp;
+  u32 hw_if_index;
+  clib_error_t *error = 0;
+  uword *p;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 hw_address[6];
+  ip4_fib_t *fib;
+  int verbose = 0;
+
+  /* Precompute mask width -> mask vector */
+  tmp = (u32) ~ 0;
+  vec_validate (masks, 32);
+  for (i = 32; i > 0; i--)
+    {
+      masks[i] = tmp;
+      tmp <<= 1;
+    }
+
+  if (unformat_user (main_input, unformat_line_input, line_input))
+    {
+      while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+	{
+	  if (unformat (line_input, "seed %d", &seed))
+	    ;
+	  else if (unformat (line_input, "niter %d", &niter))
+	    ;
+	  else if (unformat (line_input, "nroutes %d", &nroutes))
+	    ;
+	  else if (unformat (line_input, "ninterfaces %d", &ninterfaces))
+	    ;
+	  else if (unformat (line_input, "min-mask-bits %d", &tmp))
+	    min_mask_bits = (f64) tmp;
+	  else if (unformat (line_input, "max-mask-bits %d", &tmp))
+	    max_mask_bits = (f64) tmp;
+	  else if (unformat (line_input, "verbose"))
+	    verbose = 1;
+	  else
+	    return clib_error_return (0, "unknown input `%U'",
+				      format_unformat_error, line_input);
+	}
+    }
+
+  /* Find or create FIB table 11 */
+  fib = ip4_fib_find_or_create_fib_by_table_id (table_id);
+
+  for (i = tm->test_interfaces_created; i < ninterfaces; i++)
+    {
+      vnet_hw_interface_t *hw;
+      memset (hw_address, 0, sizeof (hw_address));
+      hw_address[0] = 0xd0;
+      hw_address[1] = 0x0f;
+      hw_address[5] = i;
+
+      error = ethernet_register_interface
+	(vnm, test_interface_device_class.index, i /* instance */ ,
+	 hw_address, &hw_if_index,
+	 /* flag change */ 0);
+
+      /* Fake interfaces use FIB table 11 */
+      hw = vnet_get_hw_interface (vnm, hw_if_index);
+      vec_validate (im->fib_index_by_sw_if_index, hw->sw_if_index);
+      im->fib_index_by_sw_if_index[hw->sw_if_index] = fib->index;
+      ip4_sw_interface_enable_disable (sw_if_index, 1);
+    }
+
+  tm->test_interfaces_created = ninterfaces;
+
+  /* Find fib index corresponding to FIB id 11 */
+  p = hash_get (im->fib_index_by_table_id, table_id);
+  if (p == 0)
+    {
+      vlib_cli_output (vm, "Couldn't map fib id %d to fib index\n", table_id);
+      return 0;
+    }
+  table_index = p[0];
+
+  for (iter = 0; iter < niter; iter++)
+    {
+      /* Pick random routes to install */
+      for (i = 0; i < nroutes; i++)
+	{
+	  int j;
+
+	  pool_get (tm->route_pool, tr);
+	  memset (tr, 0, sizeof (*tr));
+
+	again:
+	  rf = random_f64 (&seed);
+	  tr->mask_width = (u32) (min_mask_bits
+				  + rf * (max_mask_bits - min_mask_bits));
+	  tmp = random_u32 (&seed);
+	  tmp &= masks[tr->mask_width];
+	  tr->address.as_u32 = clib_host_to_net_u32 (tmp);
+
+	  /* We can't add the same address/mask twice... */
+	  for (j = 0; j < i; j++)
+	    {
+	      test_route_t *prev;
+	      prev = pool_elt_at_index (tm->route_pool, j);
+	      if ((prev->address.as_u32 == tr->address.as_u32)
+		  && (prev->mask_width == tr->mask_width))
+		goto again;
+	    }
+
+	  rf = random_f64 (&seed);
+	  tr->interface_id = (u32) (rf * ninterfaces);
+	}
+
+      /* Add them */
+      for (i = 0; i < nroutes; i++)
+	{
+	  tr = pool_elt_at_index (tm->route_pool, i);
+	  cmd = format (0, "add table %d %U/%d via test-eth%d",
+			table_id,
+			format_ip4_address, &tr->address,
+			tr->mask_width, tr->interface_id);
+	  vec_add1 (cmd, 0);
+	  if (verbose)
+	    fformat (stderr, "ip route %s\n", cmd);
+	  unformat_init_string (&cmd_input, (char *) cmd, vec_len (cmd) - 1);
+	  error = vnet_ip_route_cmd (vm, &cmd_input, cmd_arg);
+	  if (error)
+	    clib_error_report (error);
+	  unformat_free (&cmd_input);
+	  vec_free (cmd);
+	}
+      /* Probe them */
+      for (i = 0; i < nroutes; i++)
+	{
+	  tr = pool_elt_at_index (tm->route_pool, i);
+	  if (!ip4_lookup_validate (&tr->address, table_index))
+	    {
+	      if (verbose)
+		fformat (stderr, "test lookup table %d %U\n",
+			 table_index, format_ip4_address, &tr->address);
+
+	      fformat (stderr, "FAIL-after-insert: %U/%d\n",
+		       format_ip4_address, &tr->address, tr->mask_width);
+	    }
+	}
+
+      /* Delete them */
+      for (i = 0; i < nroutes; i++)
+	{
+	  int j;
+	  tr = pool_elt_at_index (tm->route_pool, i);
+	  if (0)
+	    cmd = format (0, "del table %d %U/%d via test-eth%d",
+			  table_id,
+			  format_ip4_address, &tr->address,
+			  tr->mask_width, tr->interface_id);
+	  else
+	    cmd = format (0, "del table %d %U/%d",
+			  table_id,
+			  format_ip4_address, &tr->address, tr->mask_width);
+	  vec_add1 (cmd, 0);
+	  if (verbose)
+	    fformat (stderr, "ip route %s\n", cmd);
+	  unformat_init_string (&cmd_input, (char *) cmd, vec_len (cmd) - 1);
+	  error = vnet_ip_route_cmd (vm, &cmd_input, cmd_arg);
+	  if (error)
+	    clib_error_report (error);
+	  unformat_free (&cmd_input);
+	  vec_free (cmd);
+
+	  /* Make sure all undeleted routes still work */
+	  for (j = i + 1; j < nroutes; j++)
+	    {
+	      test_route_t *rr;	/* remaining route */
+	      rr = pool_elt_at_index (tm->route_pool, j);
+	      if (!ip4_lookup_validate (&rr->address, table_index))
+		{
+		  if (verbose)
+		    fformat (stderr, "test lookup table %d %U\n",
+			     table_index, format_ip4_address, &rr->address);
+
+		  fformat (stderr, "FAIL: %U/%d AWOL\n",
+			   format_ip4_address, &rr->address, rr->mask_width);
+		  fformat (stderr, " iter %d after %d of %d deletes\n",
+			   iter, i, nroutes);
+		  fformat (stderr, " last route deleted %U/%d\n",
+			   format_ip4_address, &tr->address, tr->mask_width);
+		}
+	    }
+	}
+
+      pool_free (tm->route_pool);
+    }
+  return 0;
+}
+
+/*?
+ * This command in not in the build by default. It is an internal
+ * command used to test the route functonality.
+ *
+ * Create test routes on IPv4 FIB table 11. Table will be created if it
+ * does not exist.
+ *
+ * There are several optional attributes:
+ * - If not provided, <seed> defaults to 0xdeaddabe.
+ * - If not provided, <num-iter> defaults to 10.
+ * - If not provided, <num-iface> defaults to 4.
+ * - If not provided, <min-mask> defaults to 7.0.
+ * - If not provided, <max-mask> defaults to 32.0.
+ *
+ * @cliexpar
+ * Example of how to run:
+ * @cliexcmd{test route}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (test_route_command, static) = {
+    .path = "test route",
+    .short_help = "test route [seed <seed-num>] [niter <num-iter>] [ninterfaces <num-iface>] [min-mask-bits <min-mask>] [max-mask-bits <max-mask>] [verbose]",    .function = thrash,
+    .function = thrash,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+test_route_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (test_route_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip6.h b/src/vnet/ip/ip6.h
new file mode 100644
index 00000000..586b7c1b
--- /dev/null
+++ b/src/vnet/ip/ip6.h
@@ -0,0 +1,476 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip6.h: ip6 main include file
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_ip_ip6_h
+#define included_ip_ip6_h
+
+#include <vlib/mc.h>
+#include <vlib/buffer.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/ip/ip6_hop_by_hop_packet.h>
+#include <vnet/ip/lookup.h>
+#include <stdbool.h>
+#include <vppinfra/bihash_24_8.h>
+#include <vppinfra/bihash_template.h>
+
+/*
+ * Default size of the ip6 fib hash table
+ */
+#define IP6_FIB_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
+#define IP6_FIB_DEFAULT_HASH_MEMORY_SIZE (32<<20)
+
+typedef struct
+{
+  ip6_address_t addr;
+  u32 dst_address_length;
+  u32 vrf_index;
+} ip6_fib_key_t;
+
+typedef struct
+{
+  /* Table ID (hash key) for this FIB. */
+  u32 table_id;
+
+  /* Index into FIB vector. */
+  u32 index;
+
+  /* flow hash configuration */
+  flow_hash_config_t flow_hash_config;
+} ip6_fib_t;
+
+struct ip6_main_t;
+
+typedef void (ip6_add_del_interface_address_function_t)
+  (struct ip6_main_t * im,
+   uword opaque,
+   u32 sw_if_index,
+   ip6_address_t * address,
+   u32 address_length, u32 if_address_index, u32 is_del);
+
+typedef struct
+{
+  ip6_add_del_interface_address_function_t *function;
+  uword function_opaque;
+} ip6_add_del_interface_address_callback_t;
+
+/**
+ * Enumeration of the FIB table instance types
+ */
+typedef enum ip6_fib_table_instance_type_t_
+{
+    /**
+     * This table stores the routes that are used to forward traffic.
+     * The key is the prefix, the result the adjacnecy to forward on.
+     */
+  IP6_FIB_TABLE_FWDING,
+    /**
+     * The table that stores ALL routes learned by the DP.
+     * Some of these routes may not be ready to install in forwarding
+     * at a given time.
+     * The key in this table is the prefix, the result is the fib_entry_t
+     */
+  IP6_FIB_TABLE_NON_FWDING,
+} ip6_fib_table_instance_type_t;
+
+#define IP6_FIB_NUM_TABLES (IP6_FIB_TABLE_NON_FWDING+1)
+
+/**
+ * A represenation of a single IP6 table
+ */
+typedef struct ip6_fib_table_instance_t_
+{
+  /* The hash table */
+  BVT (clib_bihash) ip6_hash;
+
+  /* bitmap / refcounts / vector of mask widths to search */
+  uword *non_empty_dst_address_length_bitmap;
+  u8 *prefix_lengths_in_search_order;
+  i32 dst_address_length_refcounts[129];
+} ip6_fib_table_instance_t;
+
+typedef struct ip6_main_t
+{
+  /**
+   * The two FIB tables; fwding and non-fwding
+   */
+  ip6_fib_table_instance_t ip6_table[IP6_FIB_NUM_TABLES];
+
+  ip_lookup_main_t lookup_main;
+
+  /* Pool of FIBs. */
+  struct fib_table_t_ *fibs;
+
+  /* Network byte orders subnet mask for each prefix length */
+  ip6_address_t fib_masks[129];
+
+  /* Table index indexed by software interface. */
+  u32 *fib_index_by_sw_if_index;
+
+  /* IP6 enabled count by software interface */
+  u8 *ip_enabled_by_sw_if_index;
+
+  /* Hash table mapping table id to fib index.
+     ID space is not necessarily dense; index space is dense. */
+  uword *fib_index_by_table_id;
+
+  /* Hash table mapping interface rewrite adjacency index by sw if index. */
+  uword *interface_route_adj_index_by_sw_if_index;
+
+  /* Functions to call when interface address changes. */
+    ip6_add_del_interface_address_callback_t
+    * add_del_interface_address_callbacks;
+
+  /* Template used to generate IP6 neighbor solicitation packets. */
+  vlib_packet_template_t discover_neighbor_packet_template;
+
+  /* ip6 lookup table config parameters */
+  u32 lookup_table_nbuckets;
+  uword lookup_table_size;
+
+  /* Seed for Jenkins hash used to compute ip6 flow hash. */
+  u32 flow_hash_seed;
+
+  struct
+  {
+    /* TTL to use for host generated packets. */
+    u8 ttl;
+
+    u8 pad[3];
+  } host_config;
+
+  /* HBH processing enabled? */
+  u8 hbh_enabled;
+} ip6_main_t;
+
+/* Global ip6 main structure. */
+extern ip6_main_t ip6_main;
+
+/* Global ip6 input node.  Errors get attached to ip6 input node. */
+extern vlib_node_registration_t ip6_input_node;
+extern vlib_node_registration_t ip6_rewrite_node;
+extern vlib_node_registration_t ip6_rewrite_local_node;
+extern vlib_node_registration_t ip6_discover_neighbor_node;
+extern vlib_node_registration_t ip6_glean_node;
+extern vlib_node_registration_t ip6_midchain_node;
+
+extern vlib_node_registration_t ip6_icmp_neighbor_discovery_event_node;
+
+/* ipv6 neighbor discovery - timer/event types */
+typedef enum
+{
+  ICMP6_ND_EVENT_INIT,
+} ip6_icmp_neighbor_discovery_event_type_t;
+
+typedef union
+{
+  u32 add_del_swindex;
+  struct
+  {
+    u32 up_down_swindex;
+    u32 fib_index;
+  } up_down_event;
+} ip6_icmp_neighbor_discovery_event_data_t;
+
+always_inline uword
+ip6_destination_matches_route (const ip6_main_t * im,
+			       const ip6_address_t * key,
+			       const ip6_address_t * dest, uword dest_length)
+{
+  int i;
+  for (i = 0; i < ARRAY_LEN (key->as_uword); i++)
+    {
+      if ((key->as_uword[i] ^ dest->as_uword[i]) & im->
+	  fib_masks[dest_length].as_uword[i])
+	return 0;
+    }
+  return 1;
+}
+
+always_inline uword
+ip6_destination_matches_interface (ip6_main_t * im,
+				   ip6_address_t * key,
+				   ip_interface_address_t * ia)
+{
+  ip6_address_t *a = ip_interface_address_get_address (&im->lookup_main, ia);
+  return ip6_destination_matches_route (im, key, a, ia->address_length);
+}
+
+/* As above but allows for unaligned destinations (e.g. works right from IP header of packet). */
+always_inline uword
+ip6_unaligned_destination_matches_route (ip6_main_t * im,
+					 ip6_address_t * key,
+					 ip6_address_t * dest,
+					 uword dest_length)
+{
+  int i;
+  for (i = 0; i < ARRAY_LEN (key->as_uword); i++)
+    {
+      if ((clib_mem_unaligned (&key->as_uword[i], uword) ^ dest->as_uword[i])
+	  & im->fib_masks[dest_length].as_uword[i])
+	return 0;
+    }
+  return 1;
+}
+
+always_inline int
+ip6_src_address_for_packet (ip_lookup_main_t * lm,
+			    u32 sw_if_index, ip6_address_t * src)
+{
+  u32 if_add_index = lm->if_address_pool_index_by_sw_if_index[sw_if_index];
+  if (PREDICT_TRUE (if_add_index != ~0))
+    {
+      ip_interface_address_t *if_add =
+	pool_elt_at_index (lm->if_address_pool, if_add_index);
+      ip6_address_t *if_ip = ip_interface_address_get_address (lm, if_add);
+      *src = *if_ip;
+      return (0);
+    }
+  else
+    {
+      src->as_u64[0] = 0;
+      src->as_u64[1] = 0;
+    }
+  return (!0);
+}
+
+/* Find interface address which matches destination. */
+always_inline ip6_address_t *
+ip6_interface_address_matching_destination (ip6_main_t * im,
+					    ip6_address_t * dst,
+					    u32 sw_if_index,
+					    ip_interface_address_t **
+					    result_ia)
+{
+  ip_lookup_main_t *lm = &im->lookup_main;
+  ip_interface_address_t *ia;
+  ip6_address_t *result = 0;
+
+  /* *INDENT-OFF* */
+  foreach_ip_interface_address (lm, ia, sw_if_index,
+                                1 /* honor unnumbered */,
+  ({
+    ip6_address_t * a = ip_interface_address_get_address (lm, ia);
+    if (ip6_destination_matches_route (im, dst, a, ia->address_length))
+      {
+	result = a;
+	break;
+      }
+  }));
+  /* *INDENT-ON* */
+  if (result_ia)
+    *result_ia = result ? ia : 0;
+  return result;
+}
+
+clib_error_t *ip6_add_del_interface_address (vlib_main_t * vm,
+					     u32 sw_if_index,
+					     ip6_address_t * address,
+					     u32 address_length, u32 is_del);
+void ip6_sw_interface_enable_disable (u32 sw_if_index, u32 is_enable);
+
+int ip6_address_compare (ip6_address_t * a1, ip6_address_t * a2);
+
+clib_error_t *ip6_probe_neighbor (vlib_main_t * vm, ip6_address_t * dst,
+				  u32 sw_if_index);
+
+clib_error_t *ip6_set_neighbor_limit (u32 neighbor_limit);
+
+uword
+ip6_udp_register_listener (vlib_main_t * vm,
+			   u16 dst_port, u32 next_node_index);
+
+u16 ip6_tcp_udp_icmp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0,
+				       ip6_header_t * ip0,
+				       int *bogus_lengthp);
+
+void ip6_register_protocol (u32 protocol, u32 node_index);
+
+serialize_function_t serialize_vnet_ip6_main, unserialize_vnet_ip6_main;
+
+void ip6_ethernet_update_adjacency (vnet_main_t * vnm,
+				    u32 sw_if_index, u32 ai);
+
+int
+vnet_set_ip6_ethernet_neighbor (vlib_main_t * vm,
+				u32 sw_if_index,
+				ip6_address_t * a,
+				u8 * link_layer_address,
+				uword n_bytes_link_layer_address,
+				int is_static);
+int
+vnet_unset_ip6_ethernet_neighbor (vlib_main_t * vm,
+				  u32 sw_if_index,
+				  ip6_address_t * a,
+				  u8 * link_layer_address,
+				  uword n_bytes_link_layer_address);
+
+void
+ip6_link_local_address_from_ethernet_mac_address (ip6_address_t * ip,
+						  u8 * mac);
+
+void
+ip6_ethernet_mac_address_from_link_local_address (u8 * mac,
+						  ip6_address_t * ip);
+
+int vnet_set_ip6_flow_hash (u32 table_id,
+			    flow_hash_config_t flow_hash_config);
+
+int
+ip6_neighbor_ra_config (vlib_main_t * vm, u32 sw_if_index,
+			u8 suppress, u8 managed, u8 other,
+			u8 ll_option, u8 send_unicast, u8 cease,
+			u8 use_lifetime, u32 lifetime,
+			u32 initial_count, u32 initial_interval,
+			u32 max_interval, u32 min_interval, u8 is_no);
+
+int
+ip6_neighbor_ra_prefix (vlib_main_t * vm, u32 sw_if_index,
+			ip6_address_t * prefix_addr, u8 prefix_len,
+			u8 use_default, u32 val_lifetime, u32 pref_lifetime,
+			u8 no_advertise, u8 off_link, u8 no_autoconfig,
+			u8 no_onlink, u8 is_no);
+
+
+clib_error_t *enable_ip6_interface (vlib_main_t * vm, u32 sw_if_index);
+
+clib_error_t *disable_ip6_interface (vlib_main_t * vm, u32 sw_if_index);
+
+int ip6_interface_enabled (vlib_main_t * vm, u32 sw_if_index);
+
+clib_error_t *set_ip6_link_local_address (vlib_main_t * vm,
+					  u32 sw_if_index,
+					  ip6_address_t * address,
+					  u8 address_length);
+
+void vnet_register_ip6_neighbor_resolution_event (vnet_main_t * vnm,
+						  void *address_arg,
+						  uword node_index,
+						  uword type_opaque,
+						  uword data);
+
+int vnet_add_del_ip6_nd_change_event (vnet_main_t * vnm,
+				      void *data_callback,
+				      u32 pid,
+				      void *address_arg,
+				      uword node_index,
+				      uword type_opaque,
+				      uword data, int is_add);
+
+int vnet_ip6_nd_term (vlib_main_t * vm,
+		      vlib_node_runtime_t * node,
+		      vlib_buffer_t * p0,
+		      ethernet_header_t * eth,
+		      ip6_header_t * ip,
+		      u32 sw_if_index, u16 bd_index, u8 shg);
+
+int vnet_set_ip6_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
+				 u32 table_index);
+extern vlib_node_registration_t ip6_lookup_node;
+
+/* Compute flow hash.  We'll use it to select which Sponge to use for this
+   flow.  And other things. */
+always_inline u32
+ip6_compute_flow_hash (const ip6_header_t * ip,
+		       flow_hash_config_t flow_hash_config)
+{
+  tcp_header_t *tcp = (void *) (ip + 1);
+  u64 a, b, c;
+  u64 t1, t2;
+  uword is_tcp_udp = (ip->protocol == IP_PROTOCOL_TCP
+		      || ip->protocol == IP_PROTOCOL_UDP);
+
+  t1 = (ip->src_address.as_u64[0] ^ ip->src_address.as_u64[1]);
+  t1 = (flow_hash_config & IP_FLOW_HASH_SRC_ADDR) ? t1 : 0;
+
+  t2 = (ip->dst_address.as_u64[0] ^ ip->dst_address.as_u64[1]);
+  t2 = (flow_hash_config & IP_FLOW_HASH_DST_ADDR) ? t2 : 0;
+
+  a = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ? t2 : t1;
+  b = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ? t1 : t2;
+  b ^= (flow_hash_config & IP_FLOW_HASH_PROTO) ? ip->protocol : 0;
+
+  t1 = is_tcp_udp ? tcp->ports.src : 0;
+  t2 = is_tcp_udp ? tcp->ports.dst : 0;
+
+  t1 = (flow_hash_config & IP_FLOW_HASH_SRC_PORT) ? t1 : 0;
+  t2 = (flow_hash_config & IP_FLOW_HASH_DST_PORT) ? t2 : 0;
+
+  c = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ?
+    ((t1 << 16) | t2) : ((t2 << 16) | t1);
+
+  hash_mix64 (a, b, c);
+  return (u32) c;
+}
+
+/*
+ * Hop-by-Hop handling
+ */
+typedef struct
+{
+  /* Array of function pointers to HBH option handling routines */
+  int (*options[256]) (vlib_buffer_t * b, ip6_header_t * ip,
+		       ip6_hop_by_hop_option_t * opt);
+  u8 *(*trace[256]) (u8 * s, ip6_hop_by_hop_option_t * opt);
+  uword next_override;
+} ip6_hop_by_hop_main_t;
+
+extern ip6_hop_by_hop_main_t ip6_hop_by_hop_main;
+
+int ip6_hbh_register_option (u8 option,
+			     int options (vlib_buffer_t * b,
+					  ip6_header_t * ip,
+					  ip6_hop_by_hop_option_t * opt),
+			     u8 * trace (u8 * s,
+					 ip6_hop_by_hop_option_t * opt));
+int ip6_hbh_unregister_option (u8 option);
+void ip6_hbh_set_next_override (uword next);
+
+/* Flag used by IOAM code. Classifier sets it pop-hop-by-hop checks it */
+#define OI_DECAP   0x80000000
+
+#endif /* included_ip_ip6_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip6_error.h b/src/vnet/ip/ip6_error.h
new file mode 100644
index 00000000..a2807169
--- /dev/null
+++ b/src/vnet/ip/ip6_error.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip6_error.h: ip6 fast path errors
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_ip_ip6_error_h
+#define included_ip_ip6_error_h
+
+#define foreach_ip6_error                                               \
+  /* Must be first. */                                                  \
+  _ (NONE, "valid ip6 packets")                                         \
+                                                                        \
+  /* Errors signalled by ip6-input */                                   \
+  _ (TOO_SHORT, "ip6 length < 40 bytes")                                \
+  _ (BAD_LENGTH, "ip6 length > l2 length")                              \
+  _ (VERSION, "ip6 version != 6")                                       \
+  _ (TIME_EXPIRED, "ip6 ttl <= 1")                                      \
+                                                                        \
+  /* Errors signalled by ip6-rewrite. */                                \
+  _ (MTU_EXCEEDED, "ip6 MTU exceeded")                                  \
+  _ (DST_LOOKUP_MISS, "ip6 destination lookup miss")                    \
+  _ (SRC_LOOKUP_MISS, "ip6 source lookup miss")                         \
+  _ (ADJACENCY_DROP, "ip6 adjacency drop")                              \
+  _ (ADJACENCY_PUNT, "ip6 adjacency punt")                              \
+                                                                        \
+  /* Errors signalled by ip6-local. */                                  \
+  _ (UNKNOWN_PROTOCOL, "unknown ip protocol")                           \
+  _ (UDP_CHECKSUM, "bad udp checksum")                                  \
+  _ (ICMP_CHECKSUM, "bad icmp checksum")                                \
+  _ (UDP_LENGTH, "inconsistent udp/ip lengths")                         \
+                                                                        \
+  /* Errors signalled by udp6-lookup. */				\
+  _ (UNKNOWN_UDP_PORT, "no listener for udp port")                      \
+                                                                        \
+  /* Spoofed packets in ip6-rewrite-local */                            \
+  _(SPOOFED_LOCAL_PACKETS, "ip4 spoofed local-address packet drops")    \
+                                                                        \
+ /* Erros singalled by ip6-inacl */                                     \
+  _ (INACL_TABLE_MISS, "input ACL table-miss drops")                    \
+  _ (INACL_SESSION_DENY, "input ACL session deny drops")
+
+typedef enum
+{
+#define _(sym,str) IP6_ERROR_##sym,
+  foreach_ip6_error
+#undef _
+    IP6_N_ERROR,
+} ip6_error_t;
+
+#endif /* included_ip_ip6_error_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip6_format.c b/src/vnet/ip/ip6_format.c
new file mode 100644
index 00000000..56899b73
--- /dev/null
+++ b/src/vnet/ip/ip6_format.c
@@ -0,0 +1,383 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip6_format.c: ip6 formatting
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+
+/* Format an IP6 address. */
+u8 *
+format_ip6_address (u8 * s, va_list * args)
+{
+  ip6_address_t *a = va_arg (*args, ip6_address_t *);
+  u32 max_zero_run = 0, this_zero_run = 0;
+  int max_zero_run_index = -1, this_zero_run_index = 0;
+  int in_zero_run = 0, i;
+  int last_double_colon = 0;
+
+  /* Ugh, this is a pain. Scan forward looking for runs of 0's */
+  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+    {
+      if (a->as_u16[i] == 0)
+	{
+	  if (in_zero_run)
+	    this_zero_run++;
+	  else
+	    {
+	      in_zero_run = 1;
+	      this_zero_run = 1;
+	      this_zero_run_index = i;
+	    }
+	}
+      else
+	{
+	  if (in_zero_run)
+	    {
+	      /* offer to compress the biggest run of > 1 zero */
+	      if (this_zero_run > max_zero_run && this_zero_run > 1)
+		{
+		  max_zero_run_index = this_zero_run_index;
+		  max_zero_run = this_zero_run;
+		}
+	    }
+	  in_zero_run = 0;
+	  this_zero_run = 0;
+	}
+    }
+
+  if (in_zero_run)
+    {
+      if (this_zero_run > max_zero_run && this_zero_run > 1)
+	{
+	  max_zero_run_index = this_zero_run_index;
+	  max_zero_run = this_zero_run;
+	}
+    }
+
+  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+    {
+      if (i == max_zero_run_index)
+	{
+	  s = format (s, "::");
+	  i += max_zero_run - 1;
+	  last_double_colon = 1;
+	}
+      else
+	{
+	  s = format (s, "%s%x",
+		      (last_double_colon || i == 0) ? "" : ":",
+		      clib_net_to_host_u16 (a->as_u16[i]));
+	  last_double_colon = 0;
+	}
+    }
+
+  return s;
+}
+
+/* Format an IP6 route destination and length. */
+u8 *
+format_ip6_address_and_length (u8 * s, va_list * args)
+{
+  ip6_address_t *a = va_arg (*args, ip6_address_t *);
+  u8 l = va_arg (*args, u32);
+  return format (s, "%U/%d", format_ip6_address, a, l);
+}
+
+/* Parse an IP6 address. */
+uword
+unformat_ip6_address (unformat_input_t * input, va_list * args)
+{
+  ip6_address_t *result = va_arg (*args, ip6_address_t *);
+  u16 hex_quads[8];
+  uword hex_quad, n_hex_quads, hex_digit, n_hex_digits;
+  uword c, n_colon, double_colon_index;
+
+  n_hex_quads = hex_quad = n_hex_digits = n_colon = 0;
+  double_colon_index = ARRAY_LEN (hex_quads);
+  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
+    {
+      hex_digit = 16;
+      if (c >= '0' && c <= '9')
+	hex_digit = c - '0';
+      else if (c >= 'a' && c <= 'f')
+	hex_digit = c + 10 - 'a';
+      else if (c >= 'A' && c <= 'F')
+	hex_digit = c + 10 - 'A';
+      else if (c == ':' && n_colon < 2)
+	n_colon++;
+      else
+	{
+	  unformat_put_input (input);
+	  break;
+	}
+
+      /* Too many hex quads. */
+      if (n_hex_quads >= ARRAY_LEN (hex_quads))
+	return 0;
+
+      if (hex_digit < 16)
+	{
+	  hex_quad = (hex_quad << 4) | hex_digit;
+
+	  /* Hex quad must fit in 16 bits. */
+	  if (n_hex_digits >= 4)
+	    return 0;
+
+	  n_colon = 0;
+	  n_hex_digits++;
+	}
+
+      /* Save position of :: */
+      if (n_colon == 2)
+	{
+	  /* More than one :: ? */
+	  if (double_colon_index < ARRAY_LEN (hex_quads))
+	    return 0;
+	  double_colon_index = n_hex_quads;
+	}
+
+      if (n_colon > 0 && n_hex_digits > 0)
+	{
+	  hex_quads[n_hex_quads++] = hex_quad;
+	  hex_quad = 0;
+	  n_hex_digits = 0;
+	}
+    }
+
+  if (n_hex_digits > 0)
+    hex_quads[n_hex_quads++] = hex_quad;
+
+  {
+    word i;
+
+    /* Expand :: to appropriate number of zero hex quads. */
+    if (double_colon_index < ARRAY_LEN (hex_quads))
+      {
+	word n_zero = ARRAY_LEN (hex_quads) - n_hex_quads;
+
+	for (i = n_hex_quads - 1; i >= (signed) double_colon_index; i--)
+	  hex_quads[n_zero + i] = hex_quads[i];
+
+	for (i = 0; i < n_zero; i++)
+	  {
+	    ASSERT ((double_colon_index + i) < ARRAY_LEN (hex_quads));
+	    hex_quads[double_colon_index + i] = 0;
+	  }
+
+	n_hex_quads = ARRAY_LEN (hex_quads);
+      }
+
+    /* Too few hex quads given. */
+    if (n_hex_quads < ARRAY_LEN (hex_quads))
+      return 0;
+
+    for (i = 0; i < ARRAY_LEN (hex_quads); i++)
+      result->as_u16[i] = clib_host_to_net_u16 (hex_quads[i]);
+
+    return 1;
+  }
+}
+
+/* Format an IP6 header. */
+u8 *
+format_ip6_header (u8 * s, va_list * args)
+{
+  ip6_header_t *ip = va_arg (*args, ip6_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+  u32 i, ip_version, traffic_class, flow_label;
+  uword indent;
+
+  /* Nothing to do. */
+  if (max_header_bytes < sizeof (ip[0]))
+    return format (s, "IP header truncated");
+
+  indent = format_get_indent (s);
+  indent += 2;
+
+  s = format (s, "%U: %U -> %U",
+	      format_ip_protocol, ip->protocol,
+	      format_ip6_address, &ip->src_address,
+	      format_ip6_address, &ip->dst_address);
+
+  i = clib_net_to_host_u32 (ip->ip_version_traffic_class_and_flow_label);
+  ip_version = (i >> 28);
+  traffic_class = (i >> 20) & 0xff;
+  flow_label = i & pow2_mask (20);
+
+  if (ip_version != 6)
+    s = format (s, "\n%Uversion %d", format_white_space, indent, ip_version);
+
+  s =
+    format (s,
+	    "\n%Utos 0x%02x, flow label 0x%x, hop limit %d, payload length %d",
+	    format_white_space, indent, traffic_class, flow_label,
+	    ip->hop_limit, clib_net_to_host_u16 (ip->payload_length));
+
+  /* Recurse into next protocol layer. */
+  if (max_header_bytes != 0 && sizeof (ip[0]) < max_header_bytes)
+    {
+      ip_main_t *im = &ip_main;
+      ip_protocol_info_t *pi = ip_get_protocol_info (im, ip->protocol);
+
+      if (pi && pi->format_header)
+	s = format (s, "\n%U%U",
+		    format_white_space, indent - 2, pi->format_header,
+		    /* next protocol header */ (void *) (ip + 1),
+		    max_header_bytes - sizeof (ip[0]));
+    }
+
+  return s;
+}
+
+/* Parse an IP6 header. */
+uword
+unformat_ip6_header (unformat_input_t * input, va_list * args)
+{
+  u8 **result = va_arg (*args, u8 **);
+  ip6_header_t *ip;
+  int old_length;
+
+  /* Allocate space for IP header. */
+  {
+    void *p;
+
+    old_length = vec_len (*result);
+    vec_add2 (*result, p, sizeof (ip[0]));
+    ip = p;
+  }
+
+  memset (ip, 0, sizeof (ip[0]));
+  ip->ip_version_traffic_class_and_flow_label =
+    clib_host_to_net_u32 (6 << 28);
+
+  if (!unformat (input, "%U: %U -> %U",
+		 unformat_ip_protocol, &ip->protocol,
+		 unformat_ip6_address, &ip->src_address,
+		 unformat_ip6_address, &ip->dst_address))
+    return 0;
+
+  /* Parse options. */
+  while (1)
+    {
+      int i;
+
+      if (unformat (input, "tos %U", unformat_vlib_number, &i))
+	ip->ip_version_traffic_class_and_flow_label |=
+	  clib_host_to_net_u32 ((i & 0xff) << 20);
+
+      else if (unformat (input, "hop-limit %U", unformat_vlib_number, &i))
+	ip->hop_limit = i;
+
+      /* Can't parse input: try next protocol level. */
+      else
+	break;
+    }
+
+  /* Recurse into next protocol layer. */
+  {
+    ip_main_t *im = &ip_main;
+    ip_protocol_info_t *pi = ip_get_protocol_info (im, ip->protocol);
+
+    if (pi && pi->unformat_header)
+      {
+	if (!unformat_user (input, pi->unformat_header, result))
+	  return 0;
+
+	/* Result may have moved. */
+	ip = (void *) *result + old_length;
+      }
+  }
+
+  ip->payload_length =
+    clib_host_to_net_u16 (vec_len (*result) - (old_length + sizeof (ip[0])));
+
+  return 1;
+}
+
+/* Parse an IP46 address. */
+uword
+unformat_ip46_address (unformat_input_t * input, va_list * args)
+{
+  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
+  ip46_type_t type = va_arg (*args, ip46_type_t);
+  if ((type != IP46_TYPE_IP6) &&
+      unformat (input, "%U", unformat_ip4_address, &ip46->ip4))
+    {
+      ip46_address_mask_ip4 (ip46);
+      return 1;
+    }
+  else if ((type != IP46_TYPE_IP4) &&
+	   unformat (input, "%U", unformat_ip6_address, &ip46->ip6))
+    {
+      return 1;
+    }
+  return 0;
+}
+
+/* Format an IP46 address. */
+u8 *
+format_ip46_address (u8 * s, va_list * args)
+{
+  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
+  ip46_type_t type = va_arg (*args, ip46_type_t);
+  int is_ip4 = 1;
+
+  switch (type)
+    {
+    case IP46_TYPE_ANY:
+      is_ip4 = ip46_address_is_ip4 (ip46);
+      break;
+    case IP46_TYPE_IP4:
+      is_ip4 = 1;
+      break;
+    case IP46_TYPE_IP6:
+      is_ip4 = 0;
+      break;
+    }
+
+  return is_ip4 ?
+    format (s, "%U", format_ip4_address, &ip46->ip4) :
+    format (s, "%U", format_ip6_address, &ip46->ip6);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c
new file mode 100644
index 00000000..b5c79552
--- /dev/null
+++ b/src/vnet/ip/ip6_forward.c
@@ -0,0 +1,3402 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip6_forward.c: IP v6 forwarding
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>	/* for ethernet_header_t */
+#include <vnet/srp/srp.h>	/* for srp_hw_interface_class */
+#include <vppinfra/cache.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/dpo/load_balance.h>
+#include <vnet/dpo/classify_dpo.h>
+
+#include <vppinfra/bihash_template.c>
+
+/**
+ * @file
+ * @brief IPv6 Forwarding.
+ *
+ * This file contains the source code for IPv6 forwarding.
+ */
+
+void
+ip6_forward_next_trace (vlib_main_t * vm,
+			vlib_node_runtime_t * node,
+			vlib_frame_t * frame,
+			vlib_rx_or_tx_t which_adj_index);
+
+always_inline uword
+ip6_lookup_inline (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  ip6_main_t *im = &ip6_main;
+  vlib_combined_counter_main_t *cm = &load_balance_main.lbm_to_counters;
+  u32 n_left_from, n_left_to_next, *from, *to_next;
+  ip_lookup_next_t next;
+  u32 cpu_index = os_get_cpu_number ();
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  vlib_buffer_t *p0, *p1;
+	  u32 pi0, pi1, lbi0, lbi1, wrong_next;
+	  ip_lookup_next_t next0, next1;
+	  ip6_header_t *ip0, *ip1;
+	  ip6_address_t *dst_addr0, *dst_addr1;
+	  u32 fib_index0, fib_index1;
+	  u32 flow_hash_config0, flow_hash_config1;
+	  const dpo_id_t *dpo0, *dpo1;
+	  const load_balance_t *lb0, *lb1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), LOAD);
+	    CLIB_PREFETCH (p3->data, sizeof (ip0[0]), LOAD);
+	  }
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+
+	  ip0 = vlib_buffer_get_current (p0);
+	  ip1 = vlib_buffer_get_current (p1);
+
+	  dst_addr0 = &ip0->dst_address;
+	  dst_addr1 = &ip1->dst_address;
+
+	  fib_index0 =
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+	  fib_index1 =
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (p1)->sw_if_index[VLIB_RX]);
+
+	  fib_index0 = (vnet_buffer (p0)->sw_if_index[VLIB_TX] == (u32) ~ 0) ?
+	    fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
+	  fib_index1 = (vnet_buffer (p1)->sw_if_index[VLIB_TX] == (u32) ~ 0) ?
+	    fib_index1 : vnet_buffer (p1)->sw_if_index[VLIB_TX];
+
+	  lbi0 = ip6_fib_table_fwding_lookup (im, fib_index0, dst_addr0);
+	  lbi1 = ip6_fib_table_fwding_lookup (im, fib_index1, dst_addr1);
+
+	  lb0 = load_balance_get (lbi0);
+	  lb1 = load_balance_get (lbi1);
+
+	  vnet_buffer (p0)->ip.flow_hash = vnet_buffer (p1)->ip.flow_hash = 0;
+
+	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
+	    {
+	      flow_hash_config0 = lb0->lb_hash_config;
+	      vnet_buffer (p0)->ip.flow_hash =
+		ip6_compute_flow_hash (ip0, flow_hash_config0);
+	    }
+	  if (PREDICT_FALSE (lb1->lb_n_buckets > 1))
+	    {
+	      flow_hash_config1 = lb1->lb_hash_config;
+	      vnet_buffer (p1)->ip.flow_hash =
+		ip6_compute_flow_hash (ip1, flow_hash_config1);
+	    }
+
+	  ASSERT (lb0->lb_n_buckets > 0);
+	  ASSERT (lb1->lb_n_buckets > 0);
+	  ASSERT (is_pow2 (lb0->lb_n_buckets));
+	  ASSERT (is_pow2 (lb1->lb_n_buckets));
+	  dpo0 = load_balance_get_bucket_i (lb0,
+					    (vnet_buffer (p0)->ip.flow_hash &
+					     lb0->lb_n_buckets_minus_1));
+	  dpo1 = load_balance_get_bucket_i (lb1,
+					    (vnet_buffer (p1)->ip.flow_hash &
+					     lb1->lb_n_buckets_minus_1));
+
+	  next0 = dpo0->dpoi_next_node;
+	  next1 = dpo1->dpoi_next_node;
+
+	  /* Only process the HBH Option Header if explicitly configured to do so */
+	  if (PREDICT_FALSE
+	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+	    {
+	      next0 = (dpo_is_adj (dpo0) && im->hbh_enabled) ?
+		(ip_lookup_next_t) IP6_LOOKUP_NEXT_HOP_BY_HOP : next0;
+	    }
+	  if (PREDICT_FALSE
+	      (ip1->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+	    {
+	      next1 = (dpo_is_adj (dpo1) && im->hbh_enabled) ?
+		(ip_lookup_next_t) IP6_LOOKUP_NEXT_HOP_BY_HOP : next1;
+	    }
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+	  vnet_buffer (p1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
+
+	  vlib_increment_combined_counter
+	    (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, p0));
+	  vlib_increment_combined_counter
+	    (cm, cpu_index, lbi1, 1, vlib_buffer_length_in_chain (vm, p1));
+
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  wrong_next = (next0 != next) + 2 * (next1 != next);
+	  if (PREDICT_FALSE (wrong_next != 0))
+	    {
+	      switch (wrong_next)
+		{
+		case 1:
+		  /* A B A */
+		  to_next[-2] = pi1;
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node, next0, pi0);
+		  break;
+
+		case 2:
+		  /* A A B */
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node, next1, pi1);
+		  break;
+
+		case 3:
+		  /* A B C */
+		  to_next -= 2;
+		  n_left_to_next += 2;
+		  vlib_set_next_frame_buffer (vm, node, next0, pi0);
+		  vlib_set_next_frame_buffer (vm, node, next1, pi1);
+		  if (next0 == next1)
+		    {
+		      /* A B B */
+		      vlib_put_next_frame (vm, node, next, n_left_to_next);
+		      next = next1;
+		      vlib_get_next_frame (vm, node, next, to_next,
+					   n_left_to_next);
+		    }
+		}
+	    }
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip6_header_t *ip0;
+	  u32 pi0, lbi0;
+	  ip_lookup_next_t next0;
+	  load_balance_t *lb0;
+	  ip6_address_t *dst_addr0;
+	  u32 fib_index0, flow_hash_config0;
+	  const dpo_id_t *dpo0;
+
+	  pi0 = from[0];
+	  to_next[0] = pi0;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  ip0 = vlib_buffer_get_current (p0);
+
+	  dst_addr0 = &ip0->dst_address;
+
+	  fib_index0 =
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+	  fib_index0 =
+	    (vnet_buffer (p0)->sw_if_index[VLIB_TX] ==
+	     (u32) ~ 0) ? fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
+
+	  flow_hash_config0 = ip6_fib_get (fib_index0)->flow_hash_config;
+
+	  lbi0 = ip6_fib_table_fwding_lookup (im, fib_index0, dst_addr0);
+
+	  lb0 = load_balance_get (lbi0);
+
+	  vnet_buffer (p0)->ip.flow_hash = 0;
+
+	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
+	    {
+	      flow_hash_config0 = lb0->lb_hash_config;
+	      vnet_buffer (p0)->ip.flow_hash =
+		ip6_compute_flow_hash (ip0, flow_hash_config0);
+	    }
+
+	  ASSERT (lb0->lb_n_buckets > 0);
+	  ASSERT (is_pow2 (lb0->lb_n_buckets));
+	  dpo0 = load_balance_get_bucket_i (lb0,
+					    (vnet_buffer (p0)->ip.flow_hash &
+					     lb0->lb_n_buckets_minus_1));
+	  next0 = dpo0->dpoi_next_node;
+
+	  /* Only process the HBH Option Header if explicitly configured to do so */
+	  if (PREDICT_FALSE
+	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+	    {
+	      next0 = (dpo_is_adj (dpo0) && im->hbh_enabled) ?
+		(ip_lookup_next_t) IP6_LOOKUP_NEXT_HOP_BY_HOP : next0;
+	    }
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+
+	  vlib_increment_combined_counter
+	    (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, p0));
+
+	  from += 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  n_left_from -= 1;
+
+	  if (PREDICT_FALSE (next0 != next))
+	    {
+	      n_left_to_next += 1;
+	      vlib_put_next_frame (vm, node, next, n_left_to_next);
+	      next = next0;
+	      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
+	      to_next[0] = pi0;
+	      to_next += 1;
+	      n_left_to_next -= 1;
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next, n_left_to_next);
+    }
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip6_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  return frame->n_vectors;
+}
+
+static void
+ip6_add_interface_routes (vnet_main_t * vnm, u32 sw_if_index,
+			  ip6_main_t * im, u32 fib_index,
+			  ip_interface_address_t * a)
+{
+  ip_lookup_main_t *lm = &im->lookup_main;
+  ip6_address_t *address = ip_interface_address_get_address (lm, a);
+  fib_prefix_t pfx = {
+    .fp_len = a->address_length,
+    .fp_proto = FIB_PROTOCOL_IP6,
+    .fp_addr.ip6 = *address,
+  };
+
+  a->neighbor_probe_adj_index = ~0;
+  if (a->address_length < 128)
+    {
+      fib_node_index_t fei;
+
+      fei = fib_table_entry_update_one_path (fib_index, &pfx, FIB_SOURCE_INTERFACE, (FIB_ENTRY_FLAG_CONNECTED | FIB_ENTRY_FLAG_ATTACHED), FIB_PROTOCOL_IP6, NULL,	/* No next-hop address */
+					     sw_if_index, ~0,	// invalid FIB index
+					     1, NULL,	// no label stack
+					     FIB_ROUTE_PATH_FLAG_NONE);
+      a->neighbor_probe_adj_index = fib_entry_get_adj (fei);
+    }
+
+  pfx.fp_len = 128;
+  if (sw_if_index < vec_len (lm->classify_table_index_by_sw_if_index))
+    {
+      u32 classify_table_index =
+	lm->classify_table_index_by_sw_if_index[sw_if_index];
+      if (classify_table_index != (u32) ~ 0)
+	{
+	  dpo_id_t dpo = DPO_INVALID;
+
+	  dpo_set (&dpo,
+		   DPO_CLASSIFY,
+		   DPO_PROTO_IP6,
+		   classify_dpo_create (DPO_PROTO_IP6, classify_table_index));
+
+	  fib_table_entry_special_dpo_add (fib_index,
+					   &pfx,
+					   FIB_SOURCE_CLASSIFY,
+					   FIB_ENTRY_FLAG_NONE, &dpo);
+	  dpo_reset (&dpo);
+	}
+    }
+
+  fib_table_entry_update_one_path (fib_index, &pfx, FIB_SOURCE_INTERFACE, (FIB_ENTRY_FLAG_CONNECTED | FIB_ENTRY_FLAG_LOCAL), FIB_PROTOCOL_IP6, &pfx.fp_addr, sw_if_index, ~0,	// invalid FIB index
+				   1, NULL, FIB_ROUTE_PATH_FLAG_NONE);
+}
+
+static void
+ip6_del_interface_routes (ip6_main_t * im,
+			  u32 fib_index,
+			  ip6_address_t * address, u32 address_length)
+{
+  fib_prefix_t pfx = {
+    .fp_len = address_length,
+    .fp_proto = FIB_PROTOCOL_IP6,
+    .fp_addr.ip6 = *address,
+  };
+
+  if (pfx.fp_len < 128)
+    {
+      fib_table_entry_delete (fib_index, &pfx, FIB_SOURCE_INTERFACE);
+
+    }
+
+  pfx.fp_len = 128;
+  fib_table_entry_delete (fib_index, &pfx, FIB_SOURCE_INTERFACE);
+}
+
+void
+ip6_sw_interface_enable_disable (u32 sw_if_index, u32 is_enable)
+{
+  ip6_main_t *im = &ip6_main;
+
+  vec_validate_init_empty (im->ip_enabled_by_sw_if_index, sw_if_index, 0);
+
+  /*
+   * enable/disable only on the 1<->0 transition
+   */
+  if (is_enable)
+    {
+      if (1 != ++im->ip_enabled_by_sw_if_index[sw_if_index])
+	return;
+    }
+  else
+    {
+      ASSERT (im->ip_enabled_by_sw_if_index[sw_if_index] > 0);
+      if (0 != --im->ip_enabled_by_sw_if_index[sw_if_index])
+	return;
+    }
+
+  vnet_feature_enable_disable ("ip6-unicast", "ip6-lookup", sw_if_index,
+			       is_enable, 0, 0);
+
+  vnet_feature_enable_disable ("ip6-multicast", "ip6-lookup", sw_if_index,
+			       is_enable, 0, 0);
+
+}
+
+/* get first interface address */
+ip6_address_t *
+ip6_interface_first_address (ip6_main_t * im,
+			     u32 sw_if_index,
+			     ip_interface_address_t ** result_ia)
+{
+  ip_lookup_main_t *lm = &im->lookup_main;
+  ip_interface_address_t *ia = 0;
+  ip6_address_t *result = 0;
+
+  /* *INDENT-OFF* */
+  foreach_ip_interface_address (lm, ia, sw_if_index,
+                                1 /* honor unnumbered */,
+  ({
+    ip6_address_t * a = ip_interface_address_get_address (lm, ia);
+    result = a;
+    break;
+  }));
+  /* *INDENT-ON* */
+  if (result_ia)
+    *result_ia = result ? ia : 0;
+  return result;
+}
+
+clib_error_t *
+ip6_add_del_interface_address (vlib_main_t * vm,
+			       u32 sw_if_index,
+			       ip6_address_t * address,
+			       u32 address_length, u32 is_del)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_main_t *im = &ip6_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  clib_error_t *error;
+  u32 if_address_index;
+  ip6_address_fib_t ip6_af, *addr_fib = 0;
+
+  vec_validate (im->fib_index_by_sw_if_index, sw_if_index);
+  ip6_addr_fib_init (&ip6_af, address,
+		     vec_elt (im->fib_index_by_sw_if_index, sw_if_index));
+  vec_add1 (addr_fib, ip6_af);
+
+  {
+    uword elts_before = pool_elts (lm->if_address_pool);
+
+    error = ip_interface_address_add_del
+      (lm, sw_if_index, addr_fib, address_length, is_del, &if_address_index);
+    if (error)
+      goto done;
+
+    /* Pool did not grow: add duplicate address. */
+    if (elts_before == pool_elts (lm->if_address_pool))
+      goto done;
+  }
+
+  ip6_sw_interface_enable_disable (sw_if_index, !is_del);
+
+  if (is_del)
+    ip6_del_interface_routes (im, ip6_af.fib_index, address, address_length);
+  else
+    ip6_add_interface_routes (vnm, sw_if_index,
+			      im, ip6_af.fib_index,
+			      pool_elt_at_index (lm->if_address_pool,
+						 if_address_index));
+
+  {
+    ip6_add_del_interface_address_callback_t *cb;
+    vec_foreach (cb, im->add_del_interface_address_callbacks)
+      cb->function (im, cb->function_opaque, sw_if_index,
+		    address, address_length, if_address_index, is_del);
+  }
+
+done:
+  vec_free (addr_fib);
+  return error;
+}
+
+clib_error_t *
+ip6_sw_interface_admin_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
+{
+  ip6_main_t *im = &ip6_main;
+  ip_interface_address_t *ia;
+  ip6_address_t *a;
+  u32 is_admin_up, fib_index;
+
+  /* Fill in lookup tables with default table (0). */
+  vec_validate (im->fib_index_by_sw_if_index, sw_if_index);
+
+  vec_validate_init_empty (im->
+			   lookup_main.if_address_pool_index_by_sw_if_index,
+			   sw_if_index, ~0);
+
+  is_admin_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
+
+  fib_index = vec_elt (im->fib_index_by_sw_if_index, sw_if_index);
+
+  /* *INDENT-OFF* */
+  foreach_ip_interface_address (&im->lookup_main, ia, sw_if_index,
+                                0 /* honor unnumbered */,
+  ({
+    a = ip_interface_address_get_address (&im->lookup_main, ia);
+    if (is_admin_up)
+      ip6_add_interface_routes (vnm, sw_if_index,
+				im, fib_index,
+				ia);
+    else
+      ip6_del_interface_routes (im, fib_index,
+				a, ia->address_length);
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (ip6_sw_interface_admin_up_down);
+
+/* Built-in ip6 unicast rx feature path definition */
+/* *INDENT-OFF* */
+VNET_FEATURE_ARC_INIT (ip6_unicast, static) =
+{
+  .arc_name  = "ip6-unicast",
+  .start_nodes = VNET_FEATURES ("ip6-input"),
+  .arc_index_ptr = &ip6_main.lookup_main.ucast_feature_arc_index,
+};
+
+VNET_FEATURE_INIT (ip6_flow_classify, static) =
+{
+  .arc_name = "ip6-unicast",
+  .node_name = "ip6-flow-classify",
+  .runs_before = VNET_FEATURES ("ip6-inacl"),
+};
+
+VNET_FEATURE_INIT (ip6_inacl, static) =
+{
+  .arc_name = "ip6-unicast",
+  .node_name = "ip6-inacl",
+  .runs_before = VNET_FEATURES ("ip6-policer-classify"),
+};
+
+VNET_FEATURE_INIT (ip6_policer_classify, static) =
+{
+  .arc_name = "ip6-unicast",
+  .node_name = "ip6-policer-classify",
+  .runs_before = VNET_FEATURES ("ipsec-input-ip6"),
+};
+
+VNET_FEATURE_INIT (ip6_ipsec, static) =
+{
+  .arc_name = "ip6-unicast",
+  .node_name = "ipsec-input-ip6",
+  .runs_before = VNET_FEATURES ("l2tp-decap"),
+};
+
+VNET_FEATURE_INIT (ip6_l2tp, static) =
+{
+  .arc_name = "ip6-unicast",
+  .node_name = "l2tp-decap",
+  .runs_before = VNET_FEATURES ("vpath-input-ip6"),
+};
+
+VNET_FEATURE_INIT (ip6_vpath, static) =
+{
+  .arc_name = "ip6-unicast",
+  .node_name = "vpath-input-ip6",
+  .runs_before = VNET_FEATURES ("ip6-lookup"),
+};
+
+VNET_FEATURE_INIT (ip6_lookup, static) =
+{
+  .arc_name = "ip6-unicast",
+  .node_name = "ip6-lookup",
+  .runs_before = VNET_FEATURES ("ip6-drop"),
+};
+
+VNET_FEATURE_INIT (ip6_drop, static) =
+{
+  .arc_name = "ip6-unicast",
+  .node_name = "ip6-drop",
+  .runs_before = 0,  /*last feature*/
+};
+
+/* Built-in ip6 multicast rx feature path definition (none now) */
+VNET_FEATURE_ARC_INIT (ip6_multicast, static) =
+{
+  .arc_name  = "ip6-multicast",
+  .start_nodes = VNET_FEATURES ("ip6-input"),
+  .arc_index_ptr = &ip6_main.lookup_main.mcast_feature_arc_index,
+};
+
+VNET_FEATURE_INIT (ip6_vpath_mc, static) = {
+  .arc_name = "ip6-multicast",
+  .node_name = "vpath-input-ip6",
+  .runs_before = VNET_FEATURES ("ip6-lookup"),
+};
+
+VNET_FEATURE_INIT (ip6_mc_lookup, static) = {
+  .arc_name = "ip6-multicast",
+  .node_name = "ip6-lookup",
+  .runs_before = VNET_FEATURES ("ip6-drop"),
+};
+
+VNET_FEATURE_INIT (ip6_drop_mc, static) = {
+  .arc_name = "ip6-multicast",
+  .node_name = "ip6-drop",
+  .runs_before = 0, /* last feature */
+};
+
+/* Built-in ip4 tx feature path definition */
+VNET_FEATURE_ARC_INIT (ip6_output, static) =
+{
+  .arc_name  = "ip6-output",
+  .start_nodes = VNET_FEATURES ("ip6-rewrite", "ip6-midchain"),
+  .arc_index_ptr = &ip6_main.lookup_main.output_feature_arc_index,
+};
+
+VNET_FEATURE_INIT (ip6_ipsec_output, static) = {
+  .arc_name = "ip6-output",
+  .node_name = "ipsec-output-ip6",
+  .runs_before = VNET_FEATURES ("interface-output"),
+};
+
+VNET_FEATURE_INIT (ip6_interface_output, static) = {
+  .arc_name = "ip6-output",
+  .node_name = "interface-output",
+  .runs_before = 0, /* not before any other features */
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+ip6_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
+{
+  vnet_feature_enable_disable ("ip6-unicast", "ip6-drop", sw_if_index,
+			       is_add, 0, 0);
+
+  vnet_feature_enable_disable ("ip6-multicast", "ip6-drop", sw_if_index,
+			       is_add, 0, 0);
+
+  vnet_feature_enable_disable ("ip6-output", "interface-output", sw_if_index,
+			       is_add, 0, 0);
+
+  return /* no error */ 0;
+}
+
+VNET_SW_INTERFACE_ADD_DEL_FUNCTION (ip6_sw_interface_add_del);
+
+static uword
+ip6_lookup (vlib_main_t * vm,
+	    vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ip6_lookup_inline (vm, node, frame);
+}
+
+static u8 *format_ip6_lookup_trace (u8 * s, va_list * args);
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_lookup_node) =
+{
+  .function = ip6_lookup,
+  .name = "ip6-lookup",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip6_lookup_trace,
+  .n_next_nodes = IP6_LOOKUP_N_NEXT,
+  .next_nodes = IP6_LOOKUP_NEXT_NODES,
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_lookup_node, ip6_lookup);
+
+always_inline uword
+ip6_load_balance (vlib_main_t * vm,
+		  vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  vlib_combined_counter_main_t *cm = &load_balance_main.lbm_via_counters;
+  u32 n_left_from, n_left_to_next, *from, *to_next;
+  ip_lookup_next_t next;
+  u32 cpu_index = os_get_cpu_number ();
+  ip6_main_t *im = &ip6_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip6_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
+
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  ip_lookup_next_t next0, next1;
+	  const load_balance_t *lb0, *lb1;
+	  vlib_buffer_t *p0, *p1;
+	  u32 pi0, lbi0, hc0, pi1, lbi1, hc1;
+	  const ip6_header_t *ip0, *ip1;
+	  const dpo_id_t *dpo0, *dpo1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, STORE);
+	    vlib_prefetch_buffer_header (p3, STORE);
+
+	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), STORE);
+	    CLIB_PREFETCH (p3->data, sizeof (ip0[0]), STORE);
+	  }
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+
+	  ip0 = vlib_buffer_get_current (p0);
+	  ip1 = vlib_buffer_get_current (p1);
+	  lbi0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+	  lbi1 = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
+
+	  lb0 = load_balance_get (lbi0);
+	  lb1 = load_balance_get (lbi1);
+
+	  /*
+	   * this node is for via FIBs we can re-use the hash value from the
+	   * to node if present.
+	   * We don't want to use the same hash value at each level in the recursion
+	   * graph as that would lead to polarisation
+	   */
+	  hc0 = vnet_buffer (p0)->ip.flow_hash = 0;
+	  hc1 = vnet_buffer (p1)->ip.flow_hash = 0;
+
+	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
+	    {
+	      if (PREDICT_TRUE (vnet_buffer (p0)->ip.flow_hash))
+		{
+		  hc0 = vnet_buffer (p0)->ip.flow_hash =
+		    vnet_buffer (p0)->ip.flow_hash >> 1;
+		}
+	      else
+		{
+		  hc0 = vnet_buffer (p0)->ip.flow_hash =
+		    ip6_compute_flow_hash (ip0, hc0);
+		}
+	    }
+	  if (PREDICT_FALSE (lb1->lb_n_buckets > 1))
+	    {
+	      if (PREDICT_TRUE (vnet_buffer (p1)->ip.flow_hash))
+		{
+		  hc1 = vnet_buffer (p1)->ip.flow_hash =
+		    vnet_buffer (p1)->ip.flow_hash >> 1;
+		}
+	      else
+		{
+		  hc1 = vnet_buffer (p1)->ip.flow_hash =
+		    ip6_compute_flow_hash (ip1, hc1);
+		}
+	    }
+
+	  dpo0 =
+	    load_balance_get_bucket_i (lb0,
+				       hc0 & (lb0->lb_n_buckets_minus_1));
+	  dpo1 =
+	    load_balance_get_bucket_i (lb1,
+				       hc1 & (lb1->lb_n_buckets_minus_1));
+
+	  next0 = dpo0->dpoi_next_node;
+	  next1 = dpo1->dpoi_next_node;
+
+	  /* Only process the HBH Option Header if explicitly configured to do so */
+	  if (PREDICT_FALSE
+	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+	    {
+	      next0 = (dpo_is_adj (dpo0) && im->hbh_enabled) ?
+		(ip_lookup_next_t) IP6_LOOKUP_NEXT_HOP_BY_HOP : next0;
+	    }
+	  /* Only process the HBH Option Header if explicitly configured to do so */
+	  if (PREDICT_FALSE
+	      (ip1->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+	    {
+	      next1 = (dpo_is_adj (dpo1) && im->hbh_enabled) ?
+		(ip_lookup_next_t) IP6_LOOKUP_NEXT_HOP_BY_HOP : next1;
+	    }
+
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+	  vnet_buffer (p1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
+
+	  vlib_increment_combined_counter
+	    (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, p0));
+	  vlib_increment_combined_counter
+	    (cm, cpu_index, lbi1, 1, vlib_buffer_length_in_chain (vm, p1));
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next,
+					   to_next, n_left_to_next,
+					   pi0, pi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  ip_lookup_next_t next0;
+	  const load_balance_t *lb0;
+	  vlib_buffer_t *p0;
+	  u32 pi0, lbi0, hc0;
+	  const ip6_header_t *ip0;
+	  const dpo_id_t *dpo0;
+
+	  pi0 = from[0];
+	  to_next[0] = pi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  n_left_from -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  ip0 = vlib_buffer_get_current (p0);
+	  lbi0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+
+	  lb0 = load_balance_get (lbi0);
+
+	  hc0 = vnet_buffer (p0)->ip.flow_hash = 0;
+	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
+	    {
+	      if (PREDICT_TRUE (vnet_buffer (p0)->ip.flow_hash))
+		{
+		  hc0 = vnet_buffer (p0)->ip.flow_hash =
+		    vnet_buffer (p0)->ip.flow_hash >> 1;
+		}
+	      else
+		{
+		  hc0 = vnet_buffer (p0)->ip.flow_hash =
+		    ip6_compute_flow_hash (ip0, hc0);
+		}
+	    }
+	  dpo0 =
+	    load_balance_get_bucket_i (lb0,
+				       hc0 & (lb0->lb_n_buckets_minus_1));
+
+	  next0 = dpo0->dpoi_next_node;
+	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+
+	  /* Only process the HBH Option Header if explicitly configured to do so */
+	  if (PREDICT_FALSE
+	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+	    {
+	      next0 = (dpo_is_adj (dpo0) && im->hbh_enabled) ?
+		(ip_lookup_next_t) IP6_LOOKUP_NEXT_HOP_BY_HOP : next0;
+	    }
+
+	  vlib_increment_combined_counter
+	    (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, p0));
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next,
+					   to_next, n_left_to_next,
+					   pi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_load_balance_node) =
+{
+  .function = ip6_load_balance,
+  .name = "ip6-load-balance",
+  .vector_size = sizeof (u32),
+  .sibling_of = "ip6-lookup",
+  .format_trace = format_ip6_lookup_trace,
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_load_balance_node, ip6_load_balance);
+
+typedef struct
+{
+  /* Adjacency taken. */
+  u32 adj_index;
+  u32 flow_hash;
+  u32 fib_index;
+
+  /* Packet data, possibly *after* rewrite. */
+  u8 packet_data[128 - 1 * sizeof (u32)];
+}
+ip6_forward_next_trace_t;
+
+static u8 *
+format_ip6_forward_next_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip6_forward_next_trace_t *t = va_arg (*args, ip6_forward_next_trace_t *);
+  uword indent = format_get_indent (s);
+
+  s = format (s, "%U%U",
+	      format_white_space, indent,
+	      format_ip6_header, t->packet_data, sizeof (t->packet_data));
+  return s;
+}
+
+static u8 *
+format_ip6_lookup_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip6_forward_next_trace_t *t = va_arg (*args, ip6_forward_next_trace_t *);
+  uword indent = format_get_indent (s);
+
+  s = format (s, "fib %d dpo-idx %d flow hash: 0x%08x",
+	      t->fib_index, t->adj_index, t->flow_hash);
+  s = format (s, "\n%U%U",
+	      format_white_space, indent,
+	      format_ip6_header, t->packet_data, sizeof (t->packet_data));
+  return s;
+}
+
+
+static u8 *
+format_ip6_rewrite_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip6_forward_next_trace_t *t = va_arg (*args, ip6_forward_next_trace_t *);
+  vnet_main_t *vnm = vnet_get_main ();
+  uword indent = format_get_indent (s);
+
+  s = format (s, "tx_sw_if_index %d adj-idx %d : %U flow hash: 0x%08x",
+	      t->fib_index, t->adj_index, format_ip_adjacency,
+	      t->adj_index, FORMAT_IP_ADJACENCY_NONE, t->flow_hash);
+  s = format (s, "\n%U%U",
+	      format_white_space, indent,
+	      format_ip_adjacency_packet_data,
+	      vnm, t->adj_index, t->packet_data, sizeof (t->packet_data));
+  return s;
+}
+
+/* Common trace function for all ip6-forward next nodes. */
+void
+ip6_forward_next_trace (vlib_main_t * vm,
+			vlib_node_runtime_t * node,
+			vlib_frame_t * frame, vlib_rx_or_tx_t which_adj_index)
+{
+  u32 *from, n_left;
+  ip6_main_t *im = &ip6_main;
+
+  n_left = frame->n_vectors;
+  from = vlib_frame_vector_args (frame);
+
+  while (n_left >= 4)
+    {
+      u32 bi0, bi1;
+      vlib_buffer_t *b0, *b1;
+      ip6_forward_next_trace_t *t0, *t1;
+
+      /* Prefetch next iteration. */
+      vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
+      vlib_prefetch_buffer_with_index (vm, from[3], LOAD);
+
+      bi0 = from[0];
+      bi1 = from[1];
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+	  t0->adj_index = vnet_buffer (b0)->ip.adj_index[which_adj_index];
+	  t0->flow_hash = vnet_buffer (b0)->ip.flow_hash;
+	  t0->fib_index =
+	    (vnet_buffer (b0)->sw_if_index[VLIB_TX] !=
+	     (u32) ~ 0) ? vnet_buffer (b0)->sw_if_index[VLIB_TX] :
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (b0)->sw_if_index[VLIB_RX]);
+
+	  clib_memcpy (t0->packet_data,
+		       vlib_buffer_get_current (b0),
+		       sizeof (t0->packet_data));
+	}
+      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
+	  t1->adj_index = vnet_buffer (b1)->ip.adj_index[which_adj_index];
+	  t1->flow_hash = vnet_buffer (b1)->ip.flow_hash;
+	  t1->fib_index =
+	    (vnet_buffer (b1)->sw_if_index[VLIB_TX] !=
+	     (u32) ~ 0) ? vnet_buffer (b1)->sw_if_index[VLIB_TX] :
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (b1)->sw_if_index[VLIB_RX]);
+
+	  clib_memcpy (t1->packet_data,
+		       vlib_buffer_get_current (b1),
+		       sizeof (t1->packet_data));
+	}
+      from += 2;
+      n_left -= 2;
+    }
+
+  while (n_left >= 1)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      ip6_forward_next_trace_t *t0;
+
+      bi0 = from[0];
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+	  t0->adj_index = vnet_buffer (b0)->ip.adj_index[which_adj_index];
+	  t0->flow_hash = vnet_buffer (b0)->ip.flow_hash;
+	  t0->fib_index =
+	    (vnet_buffer (b0)->sw_if_index[VLIB_TX] !=
+	     (u32) ~ 0) ? vnet_buffer (b0)->sw_if_index[VLIB_TX] :
+	    vec_elt (im->fib_index_by_sw_if_index,
+		     vnet_buffer (b0)->sw_if_index[VLIB_RX]);
+
+	  clib_memcpy (t0->packet_data,
+		       vlib_buffer_get_current (b0),
+		       sizeof (t0->packet_data));
+	}
+      from += 1;
+      n_left -= 1;
+    }
+}
+
+static uword
+ip6_drop_or_punt (vlib_main_t * vm,
+		  vlib_node_runtime_t * node,
+		  vlib_frame_t * frame, ip6_error_t error_code)
+{
+  u32 *buffers = vlib_frame_vector_args (frame);
+  uword n_packets = frame->n_vectors;
+
+  vlib_error_drop_buffers (vm, node, buffers,
+			   /* stride */ 1,
+			   n_packets,
+			   /* next */ 0,
+			   ip6_input_node.index, error_code);
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip6_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  return n_packets;
+}
+
+static uword
+ip6_drop (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ip6_drop_or_punt (vm, node, frame, IP6_ERROR_ADJACENCY_DROP);
+}
+
+static uword
+ip6_punt (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ip6_drop_or_punt (vm, node, frame, IP6_ERROR_ADJACENCY_PUNT);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_drop_node, static) =
+{
+  .function = ip6_drop,
+  .name = "ip6-drop",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip6_forward_next_trace,
+  .n_next_nodes = 1,
+  .next_nodes =
+  {
+    [0] = "error-drop",},
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_drop_node, ip6_drop);
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_punt_node, static) =
+{
+  .function = ip6_punt,
+  .name = "ip6-punt",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip6_forward_next_trace,
+  .n_next_nodes = 1,
+  .next_nodes =
+  {
+    [0] = "error-punt",},
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_punt_node, ip6_punt);
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_multicast_node, static) =
+{
+  .function = ip6_drop,
+  .name = "ip6-multicast",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip6_forward_next_trace,
+  .n_next_nodes = 1,
+  .next_nodes =
+  {
+    [0] = "error-drop",
+  },
+};
+
+/* *INDENT-ON* */
+
+/* Compute TCP/UDP/ICMP6 checksum in software. */
+u16
+ip6_tcp_udp_icmp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0,
+				   ip6_header_t * ip0, int *bogus_lengthp)
+{
+  ip_csum_t sum0;
+  u16 sum16, payload_length_host_byte_order;
+  u32 i, n_this_buffer, n_bytes_left;
+  u32 headers_size = sizeof (ip0[0]);
+  void *data_this_buffer;
+
+  ASSERT (bogus_lengthp);
+  *bogus_lengthp = 0;
+
+  /* Initialize checksum with ip header. */
+  sum0 = ip0->payload_length + clib_host_to_net_u16 (ip0->protocol);
+  payload_length_host_byte_order = clib_net_to_host_u16 (ip0->payload_length);
+  data_this_buffer = (void *) (ip0 + 1);
+
+  for (i = 0; i < ARRAY_LEN (ip0->src_address.as_uword); i++)
+    {
+      sum0 = ip_csum_with_carry (sum0,
+				 clib_mem_unaligned (&ip0->
+						     src_address.as_uword[i],
+						     uword));
+      sum0 =
+	ip_csum_with_carry (sum0,
+			    clib_mem_unaligned (&ip0->dst_address.as_uword[i],
+						uword));
+    }
+
+  /* some icmp packets may come with a "router alert" hop-by-hop extension header (e.g., mldv2 packets) */
+  if (PREDICT_FALSE (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+    {
+      u32 skip_bytes;
+      ip6_hop_by_hop_ext_t *ext_hdr =
+	(ip6_hop_by_hop_ext_t *) data_this_buffer;
+
+      /* validate really icmp6 next */
+      ASSERT (ext_hdr->next_hdr == IP_PROTOCOL_ICMP6);
+
+      skip_bytes = 8 * (1 + ext_hdr->n_data_u64s);
+      data_this_buffer = (void *) ((u8 *) data_this_buffer + skip_bytes);
+
+      payload_length_host_byte_order -= skip_bytes;
+      headers_size += skip_bytes;
+    }
+
+  n_bytes_left = n_this_buffer = payload_length_host_byte_order;
+  if (p0 && n_this_buffer + headers_size > p0->current_length)
+    n_this_buffer =
+      p0->current_length >
+      headers_size ? p0->current_length - headers_size : 0;
+  while (1)
+    {
+      sum0 = ip_incremental_checksum (sum0, data_this_buffer, n_this_buffer);
+      n_bytes_left -= n_this_buffer;
+      if (n_bytes_left == 0)
+	break;
+
+      if (!(p0->flags & VLIB_BUFFER_NEXT_PRESENT))
+	{
+	  *bogus_lengthp = 1;
+	  return 0xfefe;
+	}
+      p0 = vlib_get_buffer (vm, p0->next_buffer);
+      data_this_buffer = vlib_buffer_get_current (p0);
+      n_this_buffer = p0->current_length;
+    }
+
+  sum16 = ~ip_csum_fold (sum0);
+
+  return sum16;
+}
+
+u32
+ip6_tcp_udp_icmp_validate_checksum (vlib_main_t * vm, vlib_buffer_t * p0)
+{
+  ip6_header_t *ip0 = vlib_buffer_get_current (p0);
+  udp_header_t *udp0;
+  u16 sum16;
+  int bogus_length;
+
+  /* some icmp packets may come with a "router alert" hop-by-hop extension header (e.g., mldv2 packets) */
+  ASSERT (ip0->protocol == IP_PROTOCOL_TCP
+	  || ip0->protocol == IP_PROTOCOL_ICMP6
+	  || ip0->protocol == IP_PROTOCOL_UDP
+	  || ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS);
+
+  udp0 = (void *) (ip0 + 1);
+  if (ip0->protocol == IP_PROTOCOL_UDP && udp0->checksum == 0)
+    {
+      p0->flags |= (IP_BUFFER_L4_CHECKSUM_COMPUTED
+		    | IP_BUFFER_L4_CHECKSUM_CORRECT);
+      return p0->flags;
+    }
+
+  sum16 = ip6_tcp_udp_icmp_compute_checksum (vm, p0, ip0, &bogus_length);
+
+  p0->flags |= (IP_BUFFER_L4_CHECKSUM_COMPUTED
+		| ((sum16 == 0) << LOG2_IP_BUFFER_L4_CHECKSUM_CORRECT));
+
+  return p0->flags;
+}
+
+/* ip6_locate_header
+ *
+ * This function is to search for the header specified by the find_hdr number.
+ *   1. If the find_hdr < 0 then it finds and returns the protocol number and
+ *   offset stored in *offset of the transport or ESP header in the chain if
+ *   found.
+ *   2. If a header with find_hdr > 0 protocol number is found then the
+ *      offset is stored in *offset and protocol number of the header is
+ *      returned.
+ *   3. If find_hdr header is not found or packet is malformed or
+ *      it is a non-first fragment -1 is returned.
+ */
+always_inline int
+ip6_locate_header (vlib_buffer_t * p0,
+		   ip6_header_t * ip0, int find_hdr, u32 * offset)
+{
+  u8 next_proto = ip0->protocol;
+  u8 *next_header;
+  u8 done = 0;
+  u32 cur_offset;
+  u8 *temp_nxthdr = 0;
+  u32 exthdr_len = 0;
+
+  next_header = ip6_next_header (ip0);
+  cur_offset = sizeof (ip6_header_t);
+  while (1)
+    {
+      done = (next_proto == find_hdr);
+      if (PREDICT_FALSE
+	  (next_header >=
+	   (u8 *) vlib_buffer_get_current (p0) + p0->current_length))
+	{
+	  //A malicious packet could set an extension header with a too big size
+	  return (-1);
+	}
+      if (done)
+	break;
+      if ((!ip6_ext_hdr (next_proto)) || next_proto == IP_PROTOCOL_IP6_NONXT)
+	{
+	  if (find_hdr < 0)
+	    break;
+	  return -1;
+	}
+      if (next_proto == IP_PROTOCOL_IPV6_FRAGMENTATION)
+	{
+	  ip6_frag_hdr_t *frag_hdr = (ip6_frag_hdr_t *) next_header;
+	  u16 frag_off = ip6_frag_hdr_offset (frag_hdr);
+	  /* Non first fragment return -1 */
+	  if (frag_off)
+	    return (-1);
+	  exthdr_len = sizeof (ip6_frag_hdr_t);
+	  temp_nxthdr = next_header + exthdr_len;
+	}
+      else if (next_proto == IP_PROTOCOL_IPSEC_AH)
+	{
+	  exthdr_len =
+	    ip6_ext_authhdr_len (((ip6_ext_header_t *) next_header));
+	  temp_nxthdr = next_header + exthdr_len;
+	}
+      else
+	{
+	  exthdr_len =
+	    ip6_ext_header_len (((ip6_ext_header_t *) next_header));
+	  temp_nxthdr = next_header + exthdr_len;
+	}
+      next_proto = ((ip6_ext_header_t *) next_header)->next_hdr;
+      next_header = temp_nxthdr;
+      cur_offset += exthdr_len;
+    }
+
+  *offset = cur_offset;
+  return (next_proto);
+}
+
+static uword
+ip6_local (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  ip6_main_t *im = &ip6_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  ip_local_next_t next_index;
+  u32 *from, *to_next, n_left_from, n_left_to_next;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip6_input_node.index);
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip6_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  vlib_buffer_t *p0, *p1;
+	  ip6_header_t *ip0, *ip1;
+	  udp_header_t *udp0, *udp1;
+	  u32 pi0, ip_len0, udp_len0, flags0, next0;
+	  u32 pi1, ip_len1, udp_len1, flags1, next1;
+	  i32 len_diff0, len_diff1;
+	  u8 error0, type0, good_l4_checksum0;
+	  u8 error1, type1, good_l4_checksum1;
+	  u32 udp_offset0, udp_offset1;
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+
+	  ip0 = vlib_buffer_get_current (p0);
+	  ip1 = vlib_buffer_get_current (p1);
+
+	  type0 = lm->builtin_protocol_by_ip_protocol[ip0->protocol];
+	  type1 = lm->builtin_protocol_by_ip_protocol[ip1->protocol];
+
+	  next0 = lm->local_next_by_ip_protocol[ip0->protocol];
+	  next1 = lm->local_next_by_ip_protocol[ip1->protocol];
+
+	  flags0 = p0->flags;
+	  flags1 = p1->flags;
+
+	  good_l4_checksum0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	  good_l4_checksum1 = (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	  len_diff0 = 0;
+	  len_diff1 = 0;
+
+	  /* Skip HBH local processing */
+	  if (PREDICT_FALSE
+	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+	    {
+	      ip6_hop_by_hop_ext_t *ext_hdr =
+		(ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
+	      next0 = lm->local_next_by_ip_protocol[ext_hdr->next_hdr];
+	      type0 = lm->builtin_protocol_by_ip_protocol[ext_hdr->next_hdr];
+	    }
+	  if (PREDICT_FALSE
+	      (ip1->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+	    {
+	      ip6_hop_by_hop_ext_t *ext_hdr =
+		(ip6_hop_by_hop_ext_t *) ip6_next_header (ip1);
+	      next1 = lm->local_next_by_ip_protocol[ext_hdr->next_hdr];
+	      type1 = lm->builtin_protocol_by_ip_protocol[ext_hdr->next_hdr];
+	    }
+	  if (PREDICT_TRUE (IP_PROTOCOL_UDP == ip6_locate_header (p0, ip0,
+								  IP_PROTOCOL_UDP,
+								  &udp_offset0)))
+	    {
+	      udp0 = (udp_header_t *) ((u8 *) ip0 + udp_offset0);
+	      /* Don't verify UDP checksum for packets with explicit zero checksum. */
+	      good_l4_checksum0 |= type0 == IP_BUILTIN_PROTOCOL_UDP
+		&& udp0->checksum == 0;
+	      /* Verify UDP length. */
+	      ip_len0 = clib_net_to_host_u16 (ip0->payload_length);
+	      udp_len0 = clib_net_to_host_u16 (udp0->length);
+	      len_diff0 = ip_len0 - udp_len0;
+	    }
+	  if (PREDICT_TRUE (IP_PROTOCOL_UDP == ip6_locate_header (p1, ip1,
+								  IP_PROTOCOL_UDP,
+								  &udp_offset1)))
+	    {
+	      udp1 = (udp_header_t *) ((u8 *) ip1 + udp_offset1);
+	      /* Don't verify UDP checksum for packets with explicit zero checksum. */
+	      good_l4_checksum1 |= type1 == IP_BUILTIN_PROTOCOL_UDP
+		&& udp1->checksum == 0;
+	      /* Verify UDP length. */
+	      ip_len1 = clib_net_to_host_u16 (ip1->payload_length);
+	      udp_len1 = clib_net_to_host_u16 (udp1->length);
+	      len_diff1 = ip_len1 - udp_len1;
+	    }
+
+	  good_l4_checksum0 |= type0 == IP_BUILTIN_PROTOCOL_UNKNOWN;
+	  good_l4_checksum1 |= type1 == IP_BUILTIN_PROTOCOL_UNKNOWN;
+
+	  len_diff0 = type0 == IP_BUILTIN_PROTOCOL_UDP ? len_diff0 : 0;
+	  len_diff1 = type1 == IP_BUILTIN_PROTOCOL_UDP ? len_diff1 : 0;
+
+	  if (PREDICT_FALSE (type0 != IP_BUILTIN_PROTOCOL_UNKNOWN
+			     && !good_l4_checksum0
+			     && !(flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED)))
+	    {
+	      flags0 = ip6_tcp_udp_icmp_validate_checksum (vm, p0);
+	      good_l4_checksum0 =
+		(flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	    }
+	  if (PREDICT_FALSE (type1 != IP_BUILTIN_PROTOCOL_UNKNOWN
+			     && !good_l4_checksum1
+			     && !(flags1 & IP_BUFFER_L4_CHECKSUM_COMPUTED)))
+	    {
+	      flags1 = ip6_tcp_udp_icmp_validate_checksum (vm, p1);
+	      good_l4_checksum1 =
+		(flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	    }
+
+	  error0 = error1 = IP6_ERROR_UNKNOWN_PROTOCOL;
+
+	  error0 = len_diff0 < 0 ? IP6_ERROR_UDP_LENGTH : error0;
+	  error1 = len_diff1 < 0 ? IP6_ERROR_UDP_LENGTH : error1;
+
+	  ASSERT (IP6_ERROR_UDP_CHECKSUM + IP_BUILTIN_PROTOCOL_UDP ==
+		  IP6_ERROR_UDP_CHECKSUM);
+	  ASSERT (IP6_ERROR_UDP_CHECKSUM + IP_BUILTIN_PROTOCOL_ICMP ==
+		  IP6_ERROR_ICMP_CHECKSUM);
+	  error0 =
+	    (!good_l4_checksum0 ? IP6_ERROR_UDP_CHECKSUM + type0 : error0);
+	  error1 =
+	    (!good_l4_checksum1 ? IP6_ERROR_UDP_CHECKSUM + type1 : error1);
+
+	  /* Drop packets from unroutable hosts. */
+	  /* If this is a neighbor solicitation (ICMP), skip source RPF check */
+	  if (error0 == IP6_ERROR_UNKNOWN_PROTOCOL &&
+	      type0 != IP_BUILTIN_PROTOCOL_ICMP &&
+	      !ip6_address_is_link_local_unicast (&ip0->src_address))
+	    {
+	      u32 src_adj_index0 = ip6_src_lookup_for_packet (im, p0, ip0);
+	      error0 = (ADJ_INDEX_INVALID == src_adj_index0
+			? IP6_ERROR_SRC_LOOKUP_MISS : error0);
+	    }
+	  if (error1 == IP6_ERROR_UNKNOWN_PROTOCOL &&
+	      type1 != IP_BUILTIN_PROTOCOL_ICMP &&
+	      !ip6_address_is_link_local_unicast (&ip1->src_address))
+	    {
+	      u32 src_adj_index1 = ip6_src_lookup_for_packet (im, p1, ip1);
+	      error1 = (ADJ_INDEX_INVALID == src_adj_index1
+			? IP6_ERROR_SRC_LOOKUP_MISS : error1);
+	    }
+
+	  next0 =
+	    error0 != IP6_ERROR_UNKNOWN_PROTOCOL ? IP_LOCAL_NEXT_DROP : next0;
+	  next1 =
+	    error1 != IP6_ERROR_UNKNOWN_PROTOCOL ? IP_LOCAL_NEXT_DROP : next1;
+
+	  p0->error = error_node->errors[error0];
+	  p1->error = error_node->errors[error1];
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, pi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip6_header_t *ip0;
+	  udp_header_t *udp0;
+	  u32 pi0, ip_len0, udp_len0, flags0, next0;
+	  i32 len_diff0;
+	  u8 error0, type0, good_l4_checksum0;
+	  u32 udp_offset0;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  ip0 = vlib_buffer_get_current (p0);
+
+	  type0 = lm->builtin_protocol_by_ip_protocol[ip0->protocol];
+	  next0 = lm->local_next_by_ip_protocol[ip0->protocol];
+
+	  flags0 = p0->flags;
+
+	  good_l4_checksum0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	  len_diff0 = 0;
+
+	  /* Skip HBH local processing */
+	  if (PREDICT_FALSE
+	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+	    {
+	      ip6_hop_by_hop_ext_t *ext_hdr =
+		(ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
+	      next0 = lm->local_next_by_ip_protocol[ext_hdr->next_hdr];
+	      type0 = lm->builtin_protocol_by_ip_protocol[ext_hdr->next_hdr];
+	    }
+	  if (PREDICT_TRUE (IP_PROTOCOL_UDP == ip6_locate_header (p0, ip0,
+								  IP_PROTOCOL_UDP,
+								  &udp_offset0)))
+	    {
+	      udp0 = (udp_header_t *) ((u8 *) ip0 + udp_offset0);
+	      /* Don't verify UDP checksum for packets with explicit zero checksum. */
+	      good_l4_checksum0 |= type0 == IP_BUILTIN_PROTOCOL_UDP
+		&& udp0->checksum == 0;
+	      /* Verify UDP length. */
+	      ip_len0 = clib_net_to_host_u16 (ip0->payload_length);
+	      udp_len0 = clib_net_to_host_u16 (udp0->length);
+	      len_diff0 = ip_len0 - udp_len0;
+	    }
+
+	  good_l4_checksum0 |= type0 == IP_BUILTIN_PROTOCOL_UNKNOWN;
+	  len_diff0 = type0 == IP_BUILTIN_PROTOCOL_UDP ? len_diff0 : 0;
+
+	  if (PREDICT_FALSE (type0 != IP_BUILTIN_PROTOCOL_UNKNOWN
+			     && !good_l4_checksum0
+			     && !(flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED)))
+	    {
+	      flags0 = ip6_tcp_udp_icmp_validate_checksum (vm, p0);
+	      good_l4_checksum0 =
+		(flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	    }
+
+	  error0 = IP6_ERROR_UNKNOWN_PROTOCOL;
+
+	  error0 = len_diff0 < 0 ? IP6_ERROR_UDP_LENGTH : error0;
+
+	  ASSERT (IP6_ERROR_UDP_CHECKSUM + IP_BUILTIN_PROTOCOL_UDP ==
+		  IP6_ERROR_UDP_CHECKSUM);
+	  ASSERT (IP6_ERROR_UDP_CHECKSUM + IP_BUILTIN_PROTOCOL_ICMP ==
+		  IP6_ERROR_ICMP_CHECKSUM);
+	  error0 =
+	    (!good_l4_checksum0 ? IP6_ERROR_UDP_CHECKSUM + type0 : error0);
+
+	  /* If this is a neighbor solicitation (ICMP), skip source RPF check */
+	  if (error0 == IP6_ERROR_UNKNOWN_PROTOCOL &&
+	      type0 != IP_BUILTIN_PROTOCOL_ICMP &&
+	      !ip6_address_is_link_local_unicast (&ip0->src_address))
+	    {
+	      u32 src_adj_index0 = ip6_src_lookup_for_packet (im, p0, ip0);
+	      error0 = (ADJ_INDEX_INVALID == src_adj_index0
+			? IP6_ERROR_SRC_LOOKUP_MISS : error0);
+	    }
+
+	  next0 =
+	    error0 != IP6_ERROR_UNKNOWN_PROTOCOL ? IP_LOCAL_NEXT_DROP : next0;
+
+	  p0->error = error_node->errors[error0];
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_local_node, static) =
+{
+  .function = ip6_local,
+  .name = "ip6-local",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip6_forward_next_trace,
+  .n_next_nodes = IP_LOCAL_N_NEXT,
+  .next_nodes =
+  {
+    [IP_LOCAL_NEXT_DROP] = "error-drop",
+    [IP_LOCAL_NEXT_PUNT] = "error-punt",
+    [IP_LOCAL_NEXT_UDP_LOOKUP] = "ip6-udp-lookup",
+    [IP_LOCAL_NEXT_ICMP] = "ip6-icmp-input",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_local_node, ip6_local);
+
+void
+ip6_register_protocol (u32 protocol, u32 node_index)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  ip6_main_t *im = &ip6_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+
+  ASSERT (protocol < ARRAY_LEN (lm->local_next_by_ip_protocol));
+  lm->local_next_by_ip_protocol[protocol] =
+    vlib_node_add_next (vm, ip6_local_node.index, node_index);
+}
+
+typedef enum
+{
+  IP6_DISCOVER_NEIGHBOR_NEXT_DROP,
+  IP6_DISCOVER_NEIGHBOR_NEXT_REPLY_TX,
+  IP6_DISCOVER_NEIGHBOR_N_NEXT,
+} ip6_discover_neighbor_next_t;
+
+typedef enum
+{
+  IP6_DISCOVER_NEIGHBOR_ERROR_DROP,
+  IP6_DISCOVER_NEIGHBOR_ERROR_REQUEST_SENT,
+  IP6_DISCOVER_NEIGHBOR_ERROR_NO_SOURCE_ADDRESS,
+} ip6_discover_neighbor_error_t;
+
+static uword
+ip6_discover_neighbor_inline (vlib_main_t * vm,
+			      vlib_node_runtime_t * node,
+			      vlib_frame_t * frame, int is_glean)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_main_t *im = &ip6_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  u32 *from, *to_next_drop;
+  uword n_left_from, n_left_to_next_drop;
+  static f64 time_last_seed_change = -1e100;
+  static u32 hash_seeds[3];
+  static uword hash_bitmap[256 / BITS (uword)];
+  f64 time_now;
+  int bogus_length;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip6_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  time_now = vlib_time_now (vm);
+  if (time_now - time_last_seed_change > 1e-3)
+    {
+      uword i;
+      u32 *r = clib_random_buffer_get_data (&vm->random_buffer,
+					    sizeof (hash_seeds));
+      for (i = 0; i < ARRAY_LEN (hash_seeds); i++)
+	hash_seeds[i] = r[i];
+
+      /* Mark all hash keys as been not-seen before. */
+      for (i = 0; i < ARRAY_LEN (hash_bitmap); i++)
+	hash_bitmap[i] = 0;
+
+      time_last_seed_change = time_now;
+    }
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, IP6_DISCOVER_NEIGHBOR_NEXT_DROP,
+			   to_next_drop, n_left_to_next_drop);
+
+      while (n_left_from > 0 && n_left_to_next_drop > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip6_header_t *ip0;
+	  u32 pi0, adj_index0, a0, b0, c0, m0, sw_if_index0, drop0;
+	  uword bm0;
+	  ip_adjacency_t *adj0;
+	  vnet_hw_interface_t *hw_if0;
+	  u32 next0;
+
+	  pi0 = from[0];
+
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+
+	  ip0 = vlib_buffer_get_current (p0);
+
+	  adj0 = ip_get_adjacency (lm, adj_index0);
+
+	  if (!is_glean)
+	    {
+	      ip0->dst_address.as_u64[0] =
+		adj0->sub_type.nbr.next_hop.ip6.as_u64[0];
+	      ip0->dst_address.as_u64[1] =
+		adj0->sub_type.nbr.next_hop.ip6.as_u64[1];
+	    }
+
+	  a0 = hash_seeds[0];
+	  b0 = hash_seeds[1];
+	  c0 = hash_seeds[2];
+
+	  sw_if_index0 = adj0->rewrite_header.sw_if_index;
+	  vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0;
+
+	  a0 ^= sw_if_index0;
+	  b0 ^= ip0->dst_address.as_u32[0];
+	  c0 ^= ip0->dst_address.as_u32[1];
+
+	  hash_v3_mix32 (a0, b0, c0);
+
+	  b0 ^= ip0->dst_address.as_u32[2];
+	  c0 ^= ip0->dst_address.as_u32[3];
+
+	  hash_v3_finalize32 (a0, b0, c0);
+
+	  c0 &= BITS (hash_bitmap) - 1;
+	  c0 = c0 / BITS (uword);
+	  m0 = (uword) 1 << (c0 % BITS (uword));
+
+	  bm0 = hash_bitmap[c0];
+	  drop0 = (bm0 & m0) != 0;
+
+	  /* Mark it as seen. */
+	  hash_bitmap[c0] = bm0 | m0;
+
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next_drop[0] = pi0;
+	  to_next_drop += 1;
+	  n_left_to_next_drop -= 1;
+
+	  hw_if0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
+
+	  /* If the interface is link-down, drop the pkt */
+	  if (!(hw_if0->flags & VNET_HW_INTERFACE_FLAG_LINK_UP))
+	    drop0 = 1;
+
+	  p0->error =
+	    node->errors[drop0 ? IP6_DISCOVER_NEIGHBOR_ERROR_DROP
+			 : IP6_DISCOVER_NEIGHBOR_ERROR_REQUEST_SENT];
+	  if (drop0)
+	    continue;
+
+	  /*
+	   * the adj has been updated to a rewrite but the node the DPO that got
+	   * us here hasn't - yet. no big deal. we'll drop while we wait.
+	   */
+	  if (IP_LOOKUP_NEXT_REWRITE == adj0->lookup_next_index)
+	    continue;
+
+	  {
+	    u32 bi0 = 0;
+	    icmp6_neighbor_solicitation_header_t *h0;
+	    vlib_buffer_t *b0;
+
+	    h0 = vlib_packet_template_get_packet
+	      (vm, &im->discover_neighbor_packet_template, &bi0);
+
+	    /*
+	     * Build ethernet header.
+	     * Choose source address based on destination lookup
+	     * adjacency.
+	     */
+	    if (ip6_src_address_for_packet (lm,
+					    sw_if_index0,
+					    &h0->ip.src_address))
+	      {
+		/* There is no address on the interface */
+		p0->error =
+		  node->errors[IP6_DISCOVER_NEIGHBOR_ERROR_NO_SOURCE_ADDRESS];
+		vlib_buffer_free (vm, &bi0, 1);
+		continue;
+	      }
+
+	    /*
+	     * Destination address is a solicited node multicast address.
+	     * We need to fill in
+	     * the low 24 bits with low 24 bits of target's address.
+	     */
+	    h0->ip.dst_address.as_u8[13] = ip0->dst_address.as_u8[13];
+	    h0->ip.dst_address.as_u8[14] = ip0->dst_address.as_u8[14];
+	    h0->ip.dst_address.as_u8[15] = ip0->dst_address.as_u8[15];
+
+	    h0->neighbor.target_address = ip0->dst_address;
+
+	    clib_memcpy (h0->link_layer_option.ethernet_address,
+			 hw_if0->hw_address, vec_len (hw_if0->hw_address));
+
+	    /* $$$$ appears we need this; why is the checksum non-zero? */
+	    h0->neighbor.icmp.checksum = 0;
+	    h0->neighbor.icmp.checksum =
+	      ip6_tcp_udp_icmp_compute_checksum (vm, 0, &h0->ip,
+						 &bogus_length);
+
+	    ASSERT (bogus_length == 0);
+
+	    vlib_buffer_copy_trace_flag (vm, p0, bi0);
+	    b0 = vlib_get_buffer (vm, bi0);
+	    vnet_buffer (b0)->sw_if_index[VLIB_TX]
+	      = vnet_buffer (p0)->sw_if_index[VLIB_TX];
+
+	    /* Add rewrite/encap string. */
+	    vnet_rewrite_one_header (adj0[0], h0, sizeof (ethernet_header_t));
+	    vlib_buffer_advance (b0, -adj0->rewrite_header.data_bytes);
+
+	    next0 = IP6_DISCOVER_NEIGHBOR_NEXT_REPLY_TX;
+
+	    vlib_set_next_frame_buffer (vm, node, next0, bi0);
+	  }
+	}
+
+      vlib_put_next_frame (vm, node, IP6_DISCOVER_NEIGHBOR_NEXT_DROP,
+			   n_left_to_next_drop);
+    }
+
+  return frame->n_vectors;
+}
+
+static uword
+ip6_discover_neighbor (vlib_main_t * vm,
+		       vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return (ip6_discover_neighbor_inline (vm, node, frame, 0));
+}
+
+static uword
+ip6_glean (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return (ip6_discover_neighbor_inline (vm, node, frame, 1));
+}
+
+static char *ip6_discover_neighbor_error_strings[] = {
+  [IP6_DISCOVER_NEIGHBOR_ERROR_DROP] = "address overflow drops",
+  [IP6_DISCOVER_NEIGHBOR_ERROR_REQUEST_SENT] = "neighbor solicitations sent",
+  [IP6_DISCOVER_NEIGHBOR_ERROR_NO_SOURCE_ADDRESS]
+    = "no source address for ND solicitation",
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_discover_neighbor_node) =
+{
+  .function = ip6_discover_neighbor,
+  .name = "ip6-discover-neighbor",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip6_forward_next_trace,
+  .n_errors = ARRAY_LEN (ip6_discover_neighbor_error_strings),
+  .error_strings = ip6_discover_neighbor_error_strings,
+  .n_next_nodes = IP6_DISCOVER_NEIGHBOR_N_NEXT,
+  .next_nodes =
+  {
+    [IP6_DISCOVER_NEIGHBOR_NEXT_DROP] = "error-drop",
+    [IP6_DISCOVER_NEIGHBOR_NEXT_REPLY_TX] = "interface-output",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_glean_node) =
+{
+  .function = ip6_glean,
+  .name = "ip6-glean",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip6_forward_next_trace,
+  .n_errors = ARRAY_LEN (ip6_discover_neighbor_error_strings),
+  .error_strings = ip6_discover_neighbor_error_strings,
+  .n_next_nodes = IP6_DISCOVER_NEIGHBOR_N_NEXT,
+  .next_nodes =
+  {
+    [IP6_DISCOVER_NEIGHBOR_NEXT_DROP] = "error-drop",
+    [IP6_DISCOVER_NEIGHBOR_NEXT_REPLY_TX] = "interface-output",
+  },
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+ip6_probe_neighbor (vlib_main_t * vm, ip6_address_t * dst, u32 sw_if_index)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_main_t *im = &ip6_main;
+  icmp6_neighbor_solicitation_header_t *h;
+  ip6_address_t *src;
+  ip_interface_address_t *ia;
+  ip_adjacency_t *adj;
+  vnet_hw_interface_t *hi;
+  vnet_sw_interface_t *si;
+  vlib_buffer_t *b;
+  u32 bi = 0;
+  int bogus_length;
+
+  si = vnet_get_sw_interface (vnm, sw_if_index);
+
+  if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
+    {
+      return clib_error_return (0, "%U: interface %U down",
+				format_ip6_address, dst,
+				format_vnet_sw_if_index_name, vnm,
+				sw_if_index);
+    }
+
+  src =
+    ip6_interface_address_matching_destination (im, dst, sw_if_index, &ia);
+  if (!src)
+    {
+      vnm->api_errno = VNET_API_ERROR_NO_MATCHING_INTERFACE;
+      return clib_error_return
+	(0, "no matching interface address for destination %U (interface %U)",
+	 format_ip6_address, dst,
+	 format_vnet_sw_if_index_name, vnm, sw_if_index);
+    }
+
+  h =
+    vlib_packet_template_get_packet (vm,
+				     &im->discover_neighbor_packet_template,
+				     &bi);
+
+  hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+
+  /* Destination address is a solicited node multicast address.  We need to fill in
+     the low 24 bits with low 24 bits of target's address. */
+  h->ip.dst_address.as_u8[13] = dst->as_u8[13];
+  h->ip.dst_address.as_u8[14] = dst->as_u8[14];
+  h->ip.dst_address.as_u8[15] = dst->as_u8[15];
+
+  h->ip.src_address = src[0];
+  h->neighbor.target_address = dst[0];
+
+  clib_memcpy (h->link_layer_option.ethernet_address, hi->hw_address,
+	       vec_len (hi->hw_address));
+
+  h->neighbor.icmp.checksum =
+    ip6_tcp_udp_icmp_compute_checksum (vm, 0, &h->ip, &bogus_length);
+  ASSERT (bogus_length == 0);
+
+  b = vlib_get_buffer (vm, bi);
+  vnet_buffer (b)->sw_if_index[VLIB_RX] =
+    vnet_buffer (b)->sw_if_index[VLIB_TX] = sw_if_index;
+
+  /* Add encapsulation string for software interface (e.g. ethernet header). */
+  adj = ip_get_adjacency (&im->lookup_main, ia->neighbor_probe_adj_index);
+  vnet_rewrite_one_header (adj[0], h, sizeof (ethernet_header_t));
+  vlib_buffer_advance (b, -adj->rewrite_header.data_bytes);
+
+  {
+    vlib_frame_t *f = vlib_get_frame_to_node (vm, hi->output_node_index);
+    u32 *to_next = vlib_frame_vector_args (f);
+    to_next[0] = bi;
+    f->n_vectors = 1;
+    vlib_put_frame_to_node (vm, hi->output_node_index, f);
+  }
+
+  return /* no error */ 0;
+}
+
+typedef enum
+{
+  IP6_REWRITE_NEXT_DROP,
+  IP6_REWRITE_NEXT_ICMP_ERROR,
+} ip6_rewrite_next_t;
+
+always_inline uword
+ip6_rewrite_inline (vlib_main_t * vm,
+		    vlib_node_runtime_t * node,
+		    vlib_frame_t * frame, int is_midchain)
+{
+  ip_lookup_main_t *lm = &ip6_main.lookup_main;
+  u32 *from = vlib_frame_vector_args (frame);
+  u32 n_left_from, n_left_to_next, *to_next, next_index;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip6_input_node.index);
+
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  u32 cpu_index = os_get_cpu_number ();
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  ip_adjacency_t *adj0, *adj1;
+	  vlib_buffer_t *p0, *p1;
+	  ip6_header_t *ip0, *ip1;
+	  u32 pi0, rw_len0, next0, error0, adj_index0;
+	  u32 pi1, rw_len1, next1, error1, adj_index1;
+	  u32 tx_sw_if_index0, tx_sw_if_index1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->pre_data, 32, STORE);
+	    CLIB_PREFETCH (p3->pre_data, 32, STORE);
+
+	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), STORE);
+	    CLIB_PREFETCH (p3->data, sizeof (ip0[0]), STORE);
+	  }
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+
+	  adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+	  adj_index1 = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
+
+	  /* We should never rewrite a pkt using the MISS adjacency */
+	  ASSERT (adj_index0 && adj_index1);
+
+	  ip0 = vlib_buffer_get_current (p0);
+	  ip1 = vlib_buffer_get_current (p1);
+
+	  error0 = error1 = IP6_ERROR_NONE;
+	  next0 = next1 = IP6_REWRITE_NEXT_DROP;
+
+	  if (PREDICT_TRUE (!(p0->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
+	    {
+	      i32 hop_limit0 = ip0->hop_limit;
+
+	      /* Input node should have reject packets with hop limit 0. */
+	      ASSERT (ip0->hop_limit > 0);
+
+	      hop_limit0 -= 1;
+
+	      ip0->hop_limit = hop_limit0;
+
+	      /*
+	       * If the hop count drops below 1 when forwarding, generate
+	       * an ICMP response.
+	       */
+	      if (PREDICT_FALSE (hop_limit0 <= 0))
+		{
+		  error0 = IP6_ERROR_TIME_EXPIRED;
+		  next0 = IP6_REWRITE_NEXT_ICMP_ERROR;
+		  vnet_buffer (p0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+		  icmp6_error_set_vnet_buffer (p0, ICMP6_time_exceeded,
+					       ICMP6_time_exceeded_ttl_exceeded_in_transit,
+					       0);
+		}
+	    }
+	  else
+	    {
+	      p0->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
+	    }
+	  if (PREDICT_TRUE (!(p1->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
+	    {
+	      i32 hop_limit1 = ip1->hop_limit;
+
+	      /* Input node should have reject packets with hop limit 0. */
+	      ASSERT (ip1->hop_limit > 0);
+
+	      hop_limit1 -= 1;
+
+	      ip1->hop_limit = hop_limit1;
+
+	      /*
+	       * If the hop count drops below 1 when forwarding, generate
+	       * an ICMP response.
+	       */
+	      if (PREDICT_FALSE (hop_limit1 <= 0))
+		{
+		  error1 = IP6_ERROR_TIME_EXPIRED;
+		  next1 = IP6_REWRITE_NEXT_ICMP_ERROR;
+		  vnet_buffer (p1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+		  icmp6_error_set_vnet_buffer (p1, ICMP6_time_exceeded,
+					       ICMP6_time_exceeded_ttl_exceeded_in_transit,
+					       0);
+		}
+	    }
+	  else
+	    {
+	      p1->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
+	    }
+	  adj0 = ip_get_adjacency (lm, adj_index0);
+	  adj1 = ip_get_adjacency (lm, adj_index1);
+
+	  rw_len0 = adj0[0].rewrite_header.data_bytes;
+	  rw_len1 = adj1[0].rewrite_header.data_bytes;
+	  vnet_buffer (p0)->ip.save_rewrite_length = rw_len0;
+	  vnet_buffer (p1)->ip.save_rewrite_length = rw_len1;
+
+	  vlib_increment_combined_counter (&adjacency_counters,
+					   cpu_index, adj_index0,
+					   /* packet increment */ 0,
+					   /* byte increment */ rw_len0);
+	  vlib_increment_combined_counter (&adjacency_counters,
+					   cpu_index, adj_index1,
+					   /* packet increment */ 0,
+					   /* byte increment */ rw_len1);
+
+	  /* Check MTU of outgoing interface. */
+	  error0 =
+	    (vlib_buffer_length_in_chain (vm, p0) >
+	     adj0[0].
+	     rewrite_header.max_l3_packet_bytes ? IP6_ERROR_MTU_EXCEEDED :
+	     error0);
+	  error1 =
+	    (vlib_buffer_length_in_chain (vm, p1) >
+	     adj1[0].
+	     rewrite_header.max_l3_packet_bytes ? IP6_ERROR_MTU_EXCEEDED :
+	     error1);
+
+	  /* Don't adjust the buffer for hop count issue; icmp-error node
+	   * wants to see the IP headerr */
+	  if (PREDICT_TRUE (error0 == IP6_ERROR_NONE))
+	    {
+	      p0->current_data -= rw_len0;
+	      p0->current_length += rw_len0;
+
+	      tx_sw_if_index0 = adj0[0].rewrite_header.sw_if_index;
+	      vnet_buffer (p0)->sw_if_index[VLIB_TX] = tx_sw_if_index0;
+	      next0 = adj0[0].rewrite_header.next_index;
+
+	      vnet_feature_arc_start (lm->output_feature_arc_index,
+				      tx_sw_if_index0, &next0, p0);
+	    }
+	  if (PREDICT_TRUE (error1 == IP6_ERROR_NONE))
+	    {
+	      p1->current_data -= rw_len1;
+	      p1->current_length += rw_len1;
+
+	      tx_sw_if_index1 = adj1[0].rewrite_header.sw_if_index;
+	      vnet_buffer (p1)->sw_if_index[VLIB_TX] = tx_sw_if_index1;
+	      next1 = adj1[0].rewrite_header.next_index;
+
+	      vnet_feature_arc_start (lm->output_feature_arc_index,
+				      tx_sw_if_index1, &next1, p1);
+	    }
+
+	  /* Guess we are only writing on simple Ethernet header. */
+	  vnet_rewrite_two_headers (adj0[0], adj1[0],
+				    ip0, ip1, sizeof (ethernet_header_t));
+
+	  if (is_midchain)
+	    {
+	      adj0->sub_type.midchain.fixup_func (vm, adj0, p0);
+	      adj1->sub_type.midchain.fixup_func (vm, adj1, p1);
+	    }
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, pi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  ip_adjacency_t *adj0;
+	  vlib_buffer_t *p0;
+	  ip6_header_t *ip0;
+	  u32 pi0, rw_len0;
+	  u32 adj_index0, next0, error0;
+	  u32 tx_sw_if_index0;
+
+	  pi0 = to_next[0] = from[0];
+
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+
+	  /* We should never rewrite a pkt using the MISS adjacency */
+	  ASSERT (adj_index0);
+
+	  adj0 = ip_get_adjacency (lm, adj_index0);
+
+	  ip0 = vlib_buffer_get_current (p0);
+
+	  error0 = IP6_ERROR_NONE;
+	  next0 = IP6_REWRITE_NEXT_DROP;
+
+	  /* Check hop limit */
+	  if (PREDICT_TRUE (!(p0->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
+	    {
+	      i32 hop_limit0 = ip0->hop_limit;
+
+	      ASSERT (ip0->hop_limit > 0);
+
+	      hop_limit0 -= 1;
+
+	      ip0->hop_limit = hop_limit0;
+
+	      if (PREDICT_FALSE (hop_limit0 <= 0))
+		{
+		  /*
+		   * If the hop count drops below 1 when forwarding, generate
+		   * an ICMP response.
+		   */
+		  error0 = IP6_ERROR_TIME_EXPIRED;
+		  next0 = IP6_REWRITE_NEXT_ICMP_ERROR;
+		  vnet_buffer (p0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+		  icmp6_error_set_vnet_buffer (p0, ICMP6_time_exceeded,
+					       ICMP6_time_exceeded_ttl_exceeded_in_transit,
+					       0);
+		}
+	    }
+	  else
+	    {
+	      p0->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
+	    }
+
+	  /* Guess we are only writing on simple Ethernet header. */
+	  vnet_rewrite_one_header (adj0[0], ip0, sizeof (ethernet_header_t));
+
+	  /* Update packet buffer attributes/set output interface. */
+	  rw_len0 = adj0[0].rewrite_header.data_bytes;
+	  vnet_buffer (p0)->ip.save_rewrite_length = rw_len0;
+
+	  vlib_increment_combined_counter (&adjacency_counters,
+					   cpu_index, adj_index0,
+					   /* packet increment */ 0,
+					   /* byte increment */ rw_len0);
+
+	  /* Check MTU of outgoing interface. */
+	  error0 =
+	    (vlib_buffer_length_in_chain (vm, p0) >
+	     adj0[0].
+	     rewrite_header.max_l3_packet_bytes ? IP6_ERROR_MTU_EXCEEDED :
+	     error0);
+
+	  /* Don't adjust the buffer for hop count issue; icmp-error node
+	   * wants to see the IP headerr */
+	  if (PREDICT_TRUE (error0 == IP6_ERROR_NONE))
+	    {
+	      p0->current_data -= rw_len0;
+	      p0->current_length += rw_len0;
+
+	      tx_sw_if_index0 = adj0[0].rewrite_header.sw_if_index;
+
+	      vnet_buffer (p0)->sw_if_index[VLIB_TX] = tx_sw_if_index0;
+	      next0 = adj0[0].rewrite_header.next_index;
+
+	      vnet_feature_arc_start (lm->output_feature_arc_index,
+				      tx_sw_if_index0, &next0, p0);
+	    }
+
+	  if (is_midchain)
+	    {
+	      adj0->sub_type.midchain.fixup_func (vm, adj0, p0);
+	    }
+
+	  p0->error = error_node->errors[error0];
+
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  /* Need to do trace after rewrites to pick up new packet data. */
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip6_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  return frame->n_vectors;
+}
+
+static uword
+ip6_rewrite (vlib_main_t * vm,
+	     vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ip6_rewrite_inline (vm, node, frame,
+			     /* midchain */ 0);
+}
+
+static uword
+ip6_midchain (vlib_main_t * vm,
+	      vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ip6_rewrite_inline (vm, node, frame,
+			     /* midchain */ 1);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_midchain_node) =
+{
+  .function = ip6_midchain,
+  .name = "ip6-midchain",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip6_forward_next_trace,
+  .sibling_of = "ip6-rewrite",
+  };
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_midchain_node, ip6_midchain);
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_rewrite_node) =
+{
+  .function = ip6_rewrite,
+  .name = "ip6-rewrite",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip6_rewrite_trace,
+  .n_next_nodes = 2,
+  .next_nodes =
+  {
+    [IP6_REWRITE_NEXT_DROP] = "error-drop",
+    [IP6_REWRITE_NEXT_ICMP_ERROR] = "ip6-icmp-error",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_rewrite_node, ip6_rewrite);
+
+/*
+ * Hop-by-Hop handling
+ */
+
+ip6_hop_by_hop_main_t ip6_hop_by_hop_main;
+
+#define foreach_ip6_hop_by_hop_error \
+_(PROCESSED, "pkts with ip6 hop-by-hop options") \
+_(FORMAT, "incorrectly formatted hop-by-hop options") \
+_(UNKNOWN_OPTION, "unknown ip6 hop-by-hop options")
+
+typedef enum
+{
+#define _(sym,str) IP6_HOP_BY_HOP_ERROR_##sym,
+  foreach_ip6_hop_by_hop_error
+#undef _
+    IP6_HOP_BY_HOP_N_ERROR,
+} ip6_hop_by_hop_error_t;
+
+/*
+ * Primary h-b-h handler trace support
+ * We work pretty hard on the problem for obvious reasons
+ */
+typedef struct
+{
+  u32 next_index;
+  u32 trace_len;
+  u8 option_data[256];
+} ip6_hop_by_hop_trace_t;
+
+vlib_node_registration_t ip6_hop_by_hop_node;
+
+static char *ip6_hop_by_hop_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ip6_hop_by_hop_error
+#undef _
+};
+
+static u8 *
+format_ip6_hop_by_hop_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip6_hop_by_hop_trace_t *t = va_arg (*args, ip6_hop_by_hop_trace_t *);
+  ip6_hop_by_hop_header_t *hbh0;
+  ip6_hop_by_hop_option_t *opt0, *limit0;
+  ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main;
+
+  u8 type0;
+
+  hbh0 = (ip6_hop_by_hop_header_t *) t->option_data;
+
+  s = format (s, "IP6_HOP_BY_HOP: next index %d len %d traced %d",
+	      t->next_index, (hbh0->length + 1) << 3, t->trace_len);
+
+  opt0 = (ip6_hop_by_hop_option_t *) (hbh0 + 1);
+  limit0 = (ip6_hop_by_hop_option_t *) ((u8 *) hbh0) + t->trace_len;
+
+  while (opt0 < limit0)
+    {
+      type0 = opt0->type;
+      switch (type0)
+	{
+	case 0:		/* Pad, just stop */
+	  opt0 = (ip6_hop_by_hop_option_t *) ((u8 *) opt0) + 1;
+	  break;
+
+	default:
+	  if (hm->trace[type0])
+	    {
+	      s = (*hm->trace[type0]) (s, opt0);
+	    }
+	  else
+	    {
+	      s =
+		format (s, "\n    unrecognized option %d length %d", type0,
+			opt0->length);
+	    }
+	  opt0 =
+	    (ip6_hop_by_hop_option_t *) (((u8 *) opt0) + opt0->length +
+					 sizeof (ip6_hop_by_hop_option_t));
+	  break;
+	}
+    }
+  return s;
+}
+
+always_inline u8
+ip6_scan_hbh_options (vlib_buffer_t * b0,
+		      ip6_header_t * ip0,
+		      ip6_hop_by_hop_header_t * hbh0,
+		      ip6_hop_by_hop_option_t * opt0,
+		      ip6_hop_by_hop_option_t * limit0, u32 * next0)
+{
+  ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main;
+  u8 type0;
+  u8 error0 = 0;
+
+  while (opt0 < limit0)
+    {
+      type0 = opt0->type;
+      switch (type0)
+	{
+	case 0:		/* Pad1 */
+	  opt0 = (ip6_hop_by_hop_option_t *) ((u8 *) opt0) + 1;
+	  continue;
+	case 1:		/* PadN */
+	  break;
+	default:
+	  if (hm->options[type0])
+	    {
+	      if ((*hm->options[type0]) (b0, ip0, opt0) < 0)
+		{
+		  error0 = IP6_HOP_BY_HOP_ERROR_FORMAT;
+		  return (error0);
+		}
+	    }
+	  else
+	    {
+	      /* Unrecognized mandatory option, check the two high order bits */
+	      switch (opt0->type & HBH_OPTION_TYPE_HIGH_ORDER_BITS)
+		{
+		case HBH_OPTION_TYPE_SKIP_UNKNOWN:
+		  break;
+		case HBH_OPTION_TYPE_DISCARD_UNKNOWN:
+		  error0 = IP6_HOP_BY_HOP_ERROR_UNKNOWN_OPTION;
+		  *next0 = IP_LOOKUP_NEXT_DROP;
+		  break;
+		case HBH_OPTION_TYPE_DISCARD_UNKNOWN_ICMP:
+		  error0 = IP6_HOP_BY_HOP_ERROR_UNKNOWN_OPTION;
+		  *next0 = IP_LOOKUP_NEXT_ICMP_ERROR;
+		  icmp6_error_set_vnet_buffer (b0, ICMP6_parameter_problem,
+					       ICMP6_parameter_problem_unrecognized_option,
+					       (u8 *) opt0 - (u8 *) ip0);
+		  break;
+		case HBH_OPTION_TYPE_DISCARD_UNKNOWN_ICMP_NOT_MCAST:
+		  error0 = IP6_HOP_BY_HOP_ERROR_UNKNOWN_OPTION;
+		  if (!ip6_address_is_multicast (&ip0->dst_address))
+		    {
+		      *next0 = IP_LOOKUP_NEXT_ICMP_ERROR;
+		      icmp6_error_set_vnet_buffer (b0,
+						   ICMP6_parameter_problem,
+						   ICMP6_parameter_problem_unrecognized_option,
+						   (u8 *) opt0 - (u8 *) ip0);
+		    }
+		  else
+		    {
+		      *next0 = IP_LOOKUP_NEXT_DROP;
+		    }
+		  break;
+		}
+	      return (error0);
+	    }
+	}
+      opt0 =
+	(ip6_hop_by_hop_option_t *) (((u8 *) opt0) + opt0->length +
+				     sizeof (ip6_hop_by_hop_option_t));
+    }
+  return (error0);
+}
+
+/*
+ * Process the Hop-by-Hop Options header
+ */
+static uword
+ip6_hop_by_hop (vlib_main_t * vm,
+		vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip6_hop_by_hop_node.index);
+  ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main;
+  u32 n_left_from, *from, *to_next;
+  ip_lookup_next_t next_index;
+  ip6_main_t *im = &ip6_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+	  ip6_header_t *ip0, *ip1;
+	  ip6_hop_by_hop_header_t *hbh0, *hbh1;
+	  ip6_hop_by_hop_option_t *opt0, *limit0, *opt1, *limit1;
+	  u8 error0 = 0, error1 = 0;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
+	    CLIB_PREFETCH (p3->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
+	  }
+
+	  /* Speculatively enqueue b0, b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /* Default use the next_index from the adjacency. A HBH option rarely redirects to a different node */
+	  u32 adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
+	  ip_adjacency_t *adj0 = ip_get_adjacency (lm, adj_index0);
+	  u32 adj_index1 = vnet_buffer (b1)->ip.adj_index[VLIB_TX];
+	  ip_adjacency_t *adj1 = ip_get_adjacency (lm, adj_index1);
+
+	  /* Default use the next_index from the adjacency. A HBH option rarely redirects to a different node */
+	  next0 = adj0->lookup_next_index;
+	  next1 = adj1->lookup_next_index;
+
+	  ip0 = vlib_buffer_get_current (b0);
+	  ip1 = vlib_buffer_get_current (b1);
+	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
+	  hbh1 = (ip6_hop_by_hop_header_t *) (ip1 + 1);
+	  opt0 = (ip6_hop_by_hop_option_t *) (hbh0 + 1);
+	  opt1 = (ip6_hop_by_hop_option_t *) (hbh1 + 1);
+	  limit0 =
+	    (ip6_hop_by_hop_option_t *) ((u8 *) hbh0 +
+					 ((hbh0->length + 1) << 3));
+	  limit1 =
+	    (ip6_hop_by_hop_option_t *) ((u8 *) hbh1 +
+					 ((hbh1->length + 1) << 3));
+
+	  /*
+	   * Basic validity checks
+	   */
+	  if ((hbh0->length + 1) << 3 >
+	      clib_net_to_host_u16 (ip0->payload_length))
+	    {
+	      error0 = IP6_HOP_BY_HOP_ERROR_FORMAT;
+	      next0 = IP_LOOKUP_NEXT_DROP;
+	      goto outdual;
+	    }
+	  /* Scan the set of h-b-h options, process ones that we understand */
+	  error0 = ip6_scan_hbh_options (b0, ip0, hbh0, opt0, limit0, &next0);
+
+	  if ((hbh1->length + 1) << 3 >
+	      clib_net_to_host_u16 (ip1->payload_length))
+	    {
+	      error1 = IP6_HOP_BY_HOP_ERROR_FORMAT;
+	      next1 = IP_LOOKUP_NEXT_DROP;
+	      goto outdual;
+	    }
+	  /* Scan the set of h-b-h options, process ones that we understand */
+	  error1 = ip6_scan_hbh_options (b1, ip1, hbh1, opt1, limit1, &next1);
+
+	outdual:
+	  /* Has the classifier flagged this buffer for special treatment? */
+	  if (PREDICT_FALSE
+	      ((error0 == 0)
+	       && (vnet_buffer (b0)->l2_classify.opaque_index & OI_DECAP)))
+	    next0 = hm->next_override;
+
+	  /* Has the classifier flagged this buffer for special treatment? */
+	  if (PREDICT_FALSE
+	      ((error1 == 0)
+	       && (vnet_buffer (b1)->l2_classify.opaque_index & OI_DECAP)))
+	    next1 = hm->next_override;
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  ip6_hop_by_hop_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  u32 trace_len = (hbh0->length + 1) << 3;
+		  t->next_index = next0;
+		  /* Capture the h-b-h option verbatim */
+		  trace_len =
+		    trace_len <
+		    ARRAY_LEN (t->option_data) ? trace_len :
+		    ARRAY_LEN (t->option_data);
+		  t->trace_len = trace_len;
+		  clib_memcpy (t->option_data, hbh0, trace_len);
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  ip6_hop_by_hop_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  u32 trace_len = (hbh1->length + 1) << 3;
+		  t->next_index = next1;
+		  /* Capture the h-b-h option verbatim */
+		  trace_len =
+		    trace_len <
+		    ARRAY_LEN (t->option_data) ? trace_len :
+		    ARRAY_LEN (t->option_data);
+		  t->trace_len = trace_len;
+		  clib_memcpy (t->option_data, hbh1, trace_len);
+		}
+
+	    }
+
+	  b0->error = error_node->errors[error0];
+	  b1->error = error_node->errors[error1];
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, bi1, next0,
+					   next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  ip6_header_t *ip0;
+	  ip6_hop_by_hop_header_t *hbh0;
+	  ip6_hop_by_hop_option_t *opt0, *limit0;
+	  u8 error0 = 0;
+
+	  /* Speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  /*
+	   * Default use the next_index from the adjacency.
+	   * A HBH option rarely redirects to a different node
+	   */
+	  u32 adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
+	  ip_adjacency_t *adj0 = ip_get_adjacency (lm, adj_index0);
+	  next0 = adj0->lookup_next_index;
+
+	  ip0 = vlib_buffer_get_current (b0);
+	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
+	  opt0 = (ip6_hop_by_hop_option_t *) (hbh0 + 1);
+	  limit0 =
+	    (ip6_hop_by_hop_option_t *) ((u8 *) hbh0 +
+					 ((hbh0->length + 1) << 3));
+
+	  /*
+	   * Basic validity checks
+	   */
+	  if ((hbh0->length + 1) << 3 >
+	      clib_net_to_host_u16 (ip0->payload_length))
+	    {
+	      error0 = IP6_HOP_BY_HOP_ERROR_FORMAT;
+	      next0 = IP_LOOKUP_NEXT_DROP;
+	      goto out0;
+	    }
+
+	  /* Scan the set of h-b-h options, process ones that we understand */
+	  error0 = ip6_scan_hbh_options (b0, ip0, hbh0, opt0, limit0, &next0);
+
+	out0:
+	  /* Has the classifier flagged this buffer for special treatment? */
+	  if (PREDICT_FALSE
+	      ((error0 == 0)
+	       && (vnet_buffer (b0)->l2_classify.opaque_index & OI_DECAP)))
+	    next0 = hm->next_override;
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ip6_hop_by_hop_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      u32 trace_len = (hbh0->length + 1) << 3;
+	      t->next_index = next0;
+	      /* Capture the h-b-h option verbatim */
+	      trace_len =
+		trace_len <
+		ARRAY_LEN (t->option_data) ? trace_len :
+		ARRAY_LEN (t->option_data);
+	      t->trace_len = trace_len;
+	      clib_memcpy (t->option_data, hbh0, trace_len);
+	    }
+
+	  b0->error = error_node->errors[error0];
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_hop_by_hop_node) =
+{
+  .function = ip6_hop_by_hop,
+  .name = "ip6-hop-by-hop",
+  .sibling_of = "ip6-lookup",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip6_hop_by_hop_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN (ip6_hop_by_hop_error_strings),
+  .error_strings = ip6_hop_by_hop_error_strings,
+  .n_next_nodes = 0,
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_hop_by_hop_node, ip6_hop_by_hop);
+
+static clib_error_t *
+ip6_hop_by_hop_init (vlib_main_t * vm)
+{
+  ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main;
+  memset (hm->options, 0, sizeof (hm->options));
+  memset (hm->trace, 0, sizeof (hm->trace));
+  hm->next_override = IP6_LOOKUP_NEXT_POP_HOP_BY_HOP;
+  return (0);
+}
+
+VLIB_INIT_FUNCTION (ip6_hop_by_hop_init);
+
+void
+ip6_hbh_set_next_override (uword next)
+{
+  ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main;
+
+  hm->next_override = next;
+}
+
+int
+ip6_hbh_register_option (u8 option,
+			 int options (vlib_buffer_t * b, ip6_header_t * ip,
+				      ip6_hop_by_hop_option_t * opt),
+			 u8 * trace (u8 * s, ip6_hop_by_hop_option_t * opt))
+{
+  ip6_main_t *im = &ip6_main;
+  ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main;
+
+  ASSERT (option < ARRAY_LEN (hm->options));
+
+  /* Already registered */
+  if (hm->options[option])
+    return (-1);
+
+  hm->options[option] = options;
+  hm->trace[option] = trace;
+
+  /* Set global variable */
+  im->hbh_enabled = 1;
+
+  return (0);
+}
+
+int
+ip6_hbh_unregister_option (u8 option)
+{
+  ip6_main_t *im = &ip6_main;
+  ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main;
+
+  ASSERT (option < ARRAY_LEN (hm->options));
+
+  /* Not registered */
+  if (!hm->options[option])
+    return (-1);
+
+  hm->options[option] = NULL;
+  hm->trace[option] = NULL;
+
+  /* Disable global knob if this was the last option configured */
+  int i;
+  bool found = false;
+  for (i = 0; i < 256; i++)
+    {
+      if (hm->options[option])
+	{
+	  found = true;
+	  break;
+	}
+    }
+  if (!found)
+    im->hbh_enabled = 0;
+
+  return (0);
+}
+
+/* Global IP6 main. */
+ip6_main_t ip6_main;
+
+static clib_error_t *
+ip6_lookup_init (vlib_main_t * vm)
+{
+  ip6_main_t *im = &ip6_main;
+  clib_error_t *error;
+  uword i;
+
+  if ((error = vlib_call_init_function (vm, vnet_feature_init)))
+    return error;
+
+  for (i = 0; i < ARRAY_LEN (im->fib_masks); i++)
+    {
+      u32 j, i0, i1;
+
+      i0 = i / 32;
+      i1 = i % 32;
+
+      for (j = 0; j < i0; j++)
+	im->fib_masks[i].as_u32[j] = ~0;
+
+      if (i1)
+	im->fib_masks[i].as_u32[i0] =
+	  clib_host_to_net_u32 (pow2_mask (i1) << (32 - i1));
+    }
+
+  ip_lookup_init (&im->lookup_main, /* is_ip6 */ 1);
+
+  if (im->lookup_table_nbuckets == 0)
+    im->lookup_table_nbuckets = IP6_FIB_DEFAULT_HASH_NUM_BUCKETS;
+
+  im->lookup_table_nbuckets = 1 << max_log2 (im->lookup_table_nbuckets);
+
+  if (im->lookup_table_size == 0)
+    im->lookup_table_size = IP6_FIB_DEFAULT_HASH_MEMORY_SIZE;
+
+  BV (clib_bihash_init) (&(im->ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash),
+			 "ip6 FIB fwding table",
+			 im->lookup_table_nbuckets, im->lookup_table_size);
+  BV (clib_bihash_init) (&im->ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash,
+			 "ip6 FIB non-fwding table",
+			 im->lookup_table_nbuckets, im->lookup_table_size);
+
+  /* Create FIB with index 0 and table id of 0. */
+  fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, 0);
+
+  {
+    pg_node_t *pn;
+    pn = pg_get_node (ip6_lookup_node.index);
+    pn->unformat_edit = unformat_pg_ip6_header;
+  }
+
+  /* Unless explicitly configured, don't process HBH options */
+  im->hbh_enabled = 0;
+
+  {
+    icmp6_neighbor_solicitation_header_t p;
+
+    memset (&p, 0, sizeof (p));
+
+    p.ip.ip_version_traffic_class_and_flow_label =
+      clib_host_to_net_u32 (0x6 << 28);
+    p.ip.payload_length =
+      clib_host_to_net_u16 (sizeof (p) -
+			    STRUCT_OFFSET_OF
+			    (icmp6_neighbor_solicitation_header_t, neighbor));
+    p.ip.protocol = IP_PROTOCOL_ICMP6;
+    p.ip.hop_limit = 255;
+    ip6_set_solicited_node_multicast_address (&p.ip.dst_address, 0);
+
+    p.neighbor.icmp.type = ICMP6_neighbor_solicitation;
+
+    p.link_layer_option.header.type =
+      ICMP6_NEIGHBOR_DISCOVERY_OPTION_source_link_layer_address;
+    p.link_layer_option.header.n_data_u64s =
+      sizeof (p.link_layer_option) / sizeof (u64);
+
+    vlib_packet_template_init (vm,
+			       &im->discover_neighbor_packet_template,
+			       &p, sizeof (p),
+			       /* alloc chunk size */ 8,
+			       "ip6 neighbor discovery");
+  }
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (ip6_lookup_init);
+
+static clib_error_t *
+add_del_ip6_interface_table (vlib_main_t * vm,
+			     unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index, table_id;
+
+  sw_if_index = ~0;
+
+  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  if (unformat (input, "%d", &table_id))
+    ;
+  else
+    {
+      error = clib_error_return (0, "expected table id `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  {
+    u32 fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6,
+						       table_id);
+
+    vec_validate (ip6_main.fib_index_by_sw_if_index, sw_if_index);
+    ip6_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
+  }
+
+
+done:
+  return error;
+}
+
+/*?
+ * Place the indicated interface into the supplied IPv6 FIB table (also known
+ * as a VRF). If the FIB table does not exist, this command creates it. To
+ * display the current IPv6 FIB table, use the command '<em>show ip6 fib</em>'.
+ * FIB table will only be displayed if a route has been added to the table, or
+ * an IP Address is assigned to an interface in the table (which adds a route
+ * automatically).
+ *
+ * @note IP addresses added after setting the interface IP table end up in
+ * the indicated FIB table. If the IP address is added prior to adding the
+ * interface to the FIB table, it will NOT be part of the FIB table. Predictable
+ * but potentially counter-intuitive results occur if you provision interface
+ * addresses in multiple FIBs. Upon RX, packets will be processed in the last
+ * IP table ID provisioned. It might be marginally useful to evade source RPF
+ * drops to put an interface address into multiple FIBs.
+ *
+ * @cliexpar
+ * Example of how to add an interface to an IPv6 FIB table (where 2 is the table-id):
+ * @cliexcmd{set interface ip6 table GigabitEthernet2/0/0 2}
+ ?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_ip6_table_command, static) =
+{
+  .path = "set interface ip6 table",
+  .function = add_del_ip6_interface_table,
+  .short_help = "set interface ip6 table <interface> <table-id>"
+};
+/* *INDENT-ON* */
+
+void
+ip6_link_local_address_from_ethernet_mac_address (ip6_address_t * ip,
+						  u8 * mac)
+{
+  ip->as_u64[0] = clib_host_to_net_u64 (0xFE80000000000000ULL);
+  /* Invert the "u" bit */
+  ip->as_u8[8] = mac[0] ^ (1 << 1);
+  ip->as_u8[9] = mac[1];
+  ip->as_u8[10] = mac[2];
+  ip->as_u8[11] = 0xFF;
+  ip->as_u8[12] = 0xFE;
+  ip->as_u8[13] = mac[3];
+  ip->as_u8[14] = mac[4];
+  ip->as_u8[15] = mac[5];
+}
+
+void
+ip6_ethernet_mac_address_from_link_local_address (u8 * mac,
+						  ip6_address_t * ip)
+{
+  /* Invert the previously inverted "u" bit */
+  mac[0] = ip->as_u8[8] ^ (1 << 1);
+  mac[1] = ip->as_u8[9];
+  mac[2] = ip->as_u8[10];
+  mac[3] = ip->as_u8[13];
+  mac[4] = ip->as_u8[14];
+  mac[5] = ip->as_u8[15];
+}
+
+static clib_error_t *
+test_ip6_link_command_fn (vlib_main_t * vm,
+			  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  u8 mac[6];
+  ip6_address_t _a, *a = &_a;
+
+  if (unformat (input, "%U", unformat_ethernet_address, mac))
+    {
+      ip6_link_local_address_from_ethernet_mac_address (a, mac);
+      vlib_cli_output (vm, "Link local address: %U", format_ip6_address, a);
+      ip6_ethernet_mac_address_from_link_local_address (mac, a);
+      vlib_cli_output (vm, "Original MAC address: %U",
+		       format_ethernet_address, mac);
+    }
+
+  return 0;
+}
+
+/*?
+ * This command converts the given MAC Address into an IPv6 link-local
+ * address.
+ *
+ * @cliexpar
+ * Example of how to create an IPv6 link-local address:
+ * @cliexstart{test ip6 link 16:d9:e0:91:79:86}
+ * Link local address: fe80::14d9:e0ff:fe91:7986
+ * Original MAC address: 16:d9:e0:91:79:86
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (test_link_command, static) =
+{
+  .path = "test ip6 link",
+  .function = test_ip6_link_command_fn,
+  .short_help = "test ip6 link <mac-address>",
+};
+/* *INDENT-ON* */
+
+int
+vnet_set_ip6_flow_hash (u32 table_id, u32 flow_hash_config)
+{
+  ip6_main_t *im6 = &ip6_main;
+  ip6_fib_t *fib;
+  uword *p = hash_get (im6->fib_index_by_table_id, table_id);
+
+  if (p == 0)
+    return -1;
+
+  fib = ip6_fib_get (p[0]);
+
+  fib->flow_hash_config = flow_hash_config;
+  return 1;
+}
+
+static clib_error_t *
+set_ip6_flow_hash_command_fn (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
+{
+  int matched = 0;
+  u32 table_id = 0;
+  u32 flow_hash_config = 0;
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "table %d", &table_id))
+	matched = 1;
+#define _(a,v) \
+    else if (unformat (input, #a)) { flow_hash_config |= v; matched=1;}
+      foreach_flow_hash_bit
+#undef _
+	else
+	break;
+    }
+
+  if (matched == 0)
+    return clib_error_return (0, "unknown input `%U'",
+			      format_unformat_error, input);
+
+  rv = vnet_set_ip6_flow_hash (table_id, flow_hash_config);
+  switch (rv)
+    {
+    case 1:
+      break;
+
+    case -1:
+      return clib_error_return (0, "no such FIB table %d", table_id);
+
+    default:
+      clib_warning ("BUG: illegal flow hash config 0x%x", flow_hash_config);
+      break;
+    }
+
+  return 0;
+}
+
+/*?
+ * Configure the set of IPv6 fields used by the flow hash.
+ *
+ * @cliexpar
+ * @parblock
+ * Example of how to set the flow hash on a given table:
+ * @cliexcmd{set ip6 flow-hash table 8 dst sport dport proto}
+ *
+ * Example of display the configured flow hash:
+ * @cliexstart{show ip6 fib}
+ * ipv6-VRF:0, fib_index 0, flow hash: src dst sport dport proto
+ * @::/0
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:5 buckets:1 uRPF:5 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * fe80::/10
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:10 buckets:1 uRPF:10 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ff02::1/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:8 buckets:1 uRPF:8 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ff02::2/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:7 buckets:1 uRPF:7 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ff02::16/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:9 buckets:1 uRPF:9 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ff02::1:ff00:0/104
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:6 buckets:1 uRPF:6 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ipv6-VRF:8, fib_index 1, flow hash: dst sport dport proto
+ * @::/0
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:21 buckets:1 uRPF:20 to:[0:0]]
+ *     [0] [@0]: dpo-drop ip6
+ * @::a:1:1:0:4/126
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:27 buckets:1 uRPF:26 to:[0:0]]
+ *     [0] [@4]: ipv6-glean: af_packet0
+ * @::a:1:1:0:7/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:28 buckets:1 uRPF:27 to:[0:0]]
+ *     [0] [@2]: dpo-receive: @::a:1:1:0:7 on af_packet0
+ * fe80::/10
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:26 buckets:1 uRPF:25 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * fe80::fe:3eff:fe3e:9222/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:29 buckets:1 uRPF:28 to:[0:0]]
+ *     [0] [@2]: dpo-receive: fe80::fe:3eff:fe3e:9222 on af_packet0
+ * ff02::1/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:24 buckets:1 uRPF:23 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ff02::2/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:23 buckets:1 uRPF:22 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ff02::16/128
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:25 buckets:1 uRPF:24 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * ff02::1:ff00:0/104
+ *   unicast-ip6-chain
+ *   [@0]: dpo-load-balance: [index:22 buckets:1 uRPF:21 to:[0:0]]
+ *     [0] [@2]: dpo-receive
+ * @cliexend
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_ip6_flow_hash_command, static) =
+{
+  .path = "set ip6 flow-hash",
+  .short_help =
+  "set ip6 flow-hash table <table-id> [src] [dst] [sport] [dport] [proto] [reverse]",
+  .function = set_ip6_flow_hash_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+show_ip6_local_command_fn (vlib_main_t * vm,
+			   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  ip6_main_t *im = &ip6_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  int i;
+
+  vlib_cli_output (vm, "Protocols handled by ip6_local");
+  for (i = 0; i < ARRAY_LEN (lm->local_next_by_ip_protocol); i++)
+    {
+      if (lm->local_next_by_ip_protocol[i] != IP_LOCAL_NEXT_PUNT)
+	vlib_cli_output (vm, "%d", i);
+    }
+  return 0;
+}
+
+
+
+/*?
+ * Display the set of protocols handled by the local IPv6 stack.
+ *
+ * @cliexpar
+ * Example of how to display local protocol table:
+ * @cliexstart{show ip6 local}
+ * Protocols handled by ip6_local
+ * 17
+ * 43
+ * 58
+ * 115
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_ip6_local, static) =
+{
+  .path = "show ip6 local",
+  .function = show_ip6_local_command_fn,
+  .short_help = "show ip6 local",
+};
+/* *INDENT-ON* */
+
+int
+vnet_set_ip6_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
+			     u32 table_index)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  ip6_main_t *ipm = &ip6_main;
+  ip_lookup_main_t *lm = &ipm->lookup_main;
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  ip6_address_t *if_addr;
+
+  if (pool_is_free_index (im->sw_interfaces, sw_if_index))
+    return VNET_API_ERROR_NO_MATCHING_INTERFACE;
+
+  if (table_index != ~0 && pool_is_free_index (cm->tables, table_index))
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+  vec_validate (lm->classify_table_index_by_sw_if_index, sw_if_index);
+  lm->classify_table_index_by_sw_if_index[sw_if_index] = table_index;
+
+  if_addr = ip6_interface_first_address (ipm, sw_if_index, NULL);
+
+  if (NULL != if_addr)
+    {
+      fib_prefix_t pfx = {
+	.fp_len = 128,
+	.fp_proto = FIB_PROTOCOL_IP6,
+	.fp_addr.ip6 = *if_addr,
+      };
+      u32 fib_index;
+
+      fib_index = fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4,
+						       sw_if_index);
+
+
+      if (table_index != (u32) ~ 0)
+	{
+	  dpo_id_t dpo = DPO_INVALID;
+
+	  dpo_set (&dpo,
+		   DPO_CLASSIFY,
+		   DPO_PROTO_IP6,
+		   classify_dpo_create (DPO_PROTO_IP6, table_index));
+
+	  fib_table_entry_special_dpo_add (fib_index,
+					   &pfx,
+					   FIB_SOURCE_CLASSIFY,
+					   FIB_ENTRY_FLAG_NONE, &dpo);
+	  dpo_reset (&dpo);
+	}
+      else
+	{
+	  fib_table_entry_special_remove (fib_index,
+					  &pfx, FIB_SOURCE_CLASSIFY);
+	}
+    }
+
+  return 0;
+}
+
+static clib_error_t *
+set_ip6_classify_command_fn (vlib_main_t * vm,
+			     unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  u32 table_index = ~0;
+  int table_index_set = 0;
+  u32 sw_if_index = ~0;
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "table-index %d", &table_index))
+	table_index_set = 1;
+      else if (unformat (input, "intfc %U", unformat_vnet_sw_interface,
+			 vnet_get_main (), &sw_if_index))
+	;
+      else
+	break;
+    }
+
+  if (table_index_set == 0)
+    return clib_error_return (0, "classify table-index must be specified");
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "interface / subif must be specified");
+
+  rv = vnet_set_ip6_classify_intfc (vm, sw_if_index, table_index);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case VNET_API_ERROR_NO_MATCHING_INTERFACE:
+      return clib_error_return (0, "No such interface");
+
+    case VNET_API_ERROR_NO_SUCH_ENTRY:
+      return clib_error_return (0, "No such classifier table");
+    }
+  return 0;
+}
+
+/*?
+ * Assign a classification table to an interface. The classification
+ * table is created using the '<em>classify table</em>' and '<em>classify session</em>'
+ * commands. Once the table is create, use this command to filter packets
+ * on an interface.
+ *
+ * @cliexpar
+ * Example of how to assign a classification table to an interface:
+ * @cliexcmd{set ip6 classify intfc GigabitEthernet2/0/0 table-index 1}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_ip6_classify_command, static) =
+{
+  .path = "set ip6 classify",
+  .short_help =
+  "set ip6 classify intfc <interface> table-index <classify-idx>",
+  .function = set_ip6_classify_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+ip6_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  ip6_main_t *im = &ip6_main;
+  uword heapsize = 0;
+  u32 tmp;
+  u32 nbuckets = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "hash-buckets %d", &tmp))
+	nbuckets = tmp;
+      else if (unformat (input, "heap-size %dm", &tmp))
+	heapsize = ((u64) tmp) << 20;
+      else if (unformat (input, "heap-size %dM", &tmp))
+	heapsize = ((u64) tmp) << 20;
+      else if (unformat (input, "heap-size %dg", &tmp))
+	heapsize = ((u64) tmp) << 30;
+      else if (unformat (input, "heap-size %dG", &tmp))
+	heapsize = ((u64) tmp) << 30;
+      else
+	return clib_error_return (0, "unknown input '%U'",
+				  format_unformat_error, input);
+    }
+
+  im->lookup_table_nbuckets = nbuckets;
+  im->lookup_table_size = heapsize;
+
+  return 0;
+}
+
+VLIB_EARLY_CONFIG_FUNCTION (ip6_config, "ip6");
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip6_hop_by_hop.c b/src/vnet/ip/ip6_hop_by_hop.c
new file mode 100644
index 00000000..3a820b3c
--- /dev/null
+++ b/src/vnet/ip/ip6_hop_by_hop.c
@@ -0,0 +1,1194 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+
+#include <vnet/ip/ip.h>
+
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+
+#include <vnet/ip/ip6_hop_by_hop.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/classify/vnet_classify.h>
+
+/**
+ * @file
+ * @brief In-band OAM (iOAM).
+ *
+ * In-band OAM (iOAM) is an implementation study to record operational
+ * information in the packet while the packet traverses a path between
+ * two points in the network.
+ *
+ * VPP can function as in-band OAM encapsulating, transit and
+ * decapsulating node. In this version of VPP in-band OAM data is
+ * transported as options in an IPv6 hop-by-hop extension header. Hence
+ * in-band OAM can be enabled for IPv6 traffic.
+ */
+
+ip6_hop_by_hop_ioam_main_t ip6_hop_by_hop_ioam_main;
+
+#define foreach_ip6_hbyh_ioam_input_next	\
+  _(IP6_REWRITE, "ip6-rewrite")			\
+  _(IP6_LOOKUP, "ip6-lookup")			\
+  _(DROP, "error-drop")
+
+typedef enum
+{
+#define _(s,n) IP6_HBYH_IOAM_INPUT_NEXT_##s,
+  foreach_ip6_hbyh_ioam_input_next
+#undef _
+    IP6_HBYH_IOAM_INPUT_N_NEXT,
+} ip6_hbyh_ioam_input_next_t;
+
+
+u32
+ioam_flow_add (u8 encap, u8 * flow_name)
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+  flow_data_t *flow = 0;
+  u32 index = 0;
+  u8 i;
+
+  pool_get (hm->flows, flow);
+  memset (flow, 0, sizeof (flow_data_t));
+
+  index = flow - hm->flows;
+  strncpy ((char *) flow->flow_name, (char *) flow_name, 31);
+
+  if (!encap)
+    IOAM_SET_DECAP (index);
+
+  for (i = 0; i < 255; i++)
+    {
+      if (hm->flow_handler[i])
+	flow->ctx[i] = hm->flow_handler[i] (index, 1);
+    }
+  return (index);
+}
+
+static uword
+unformat_opaque_ioam (unformat_input_t * input, va_list * args)
+{
+  u64 *opaquep = va_arg (*args, u64 *);
+  u8 *flow_name = NULL;
+  uword ret = 0;
+
+  if (unformat (input, "ioam-encap %s", &flow_name))
+    {
+      *opaquep = ioam_flow_add (1, flow_name);
+      ret = 1;
+    }
+  else if (unformat (input, "ioam-decap %s", &flow_name))
+    {
+      *opaquep = ioam_flow_add (0, flow_name);
+      ret = 1;
+    }
+
+  vec_free (flow_name);
+  return ret;
+}
+
+u8 *
+get_flow_name_from_flow_ctx (u32 flow_ctx)
+{
+  flow_data_t *flow = NULL;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+  u32 index;
+
+  index = IOAM_MASK_DECAP_BIT (flow_ctx);
+
+  if (pool_is_free_index (hm->flows, index))
+    return NULL;
+
+  flow = pool_elt_at_index (hm->flows, index);
+  return (flow->flow_name);
+}
+
+/* The main h-b-h tracer will be invoked, no need to do much here */
+int
+ip6_hbh_add_register_option (u8 option,
+			     u8 size,
+			     int rewrite_options (u8 * rewrite_string,
+						  u8 * rewrite_size))
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+
+  ASSERT (option < ARRAY_LEN (hm->add_options));
+
+  /* Already registered */
+  if (hm->add_options[option])
+    return (-1);
+
+  hm->add_options[option] = rewrite_options;
+  hm->options_size[option] = size;
+
+  return (0);
+}
+
+int
+ip6_hbh_add_unregister_option (u8 option)
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+
+  ASSERT (option < ARRAY_LEN (hm->add_options));
+
+  /* Not registered */
+  if (!hm->add_options[option])
+    return (-1);
+
+  hm->add_options[option] = NULL;
+  hm->options_size[option] = 0;
+  return (0);
+}
+
+/* Config handler registration */
+int
+ip6_hbh_config_handler_register (u8 option,
+				 int config_handler (void *data, u8 disable))
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+
+  ASSERT (option < ARRAY_LEN (hm->config_handler));
+
+  /* Already registered  */
+  if (hm->config_handler[option])
+    return (VNET_API_ERROR_INVALID_REGISTRATION);
+
+  hm->config_handler[option] = config_handler;
+
+  return (0);
+}
+
+int
+ip6_hbh_config_handler_unregister (u8 option)
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+
+  ASSERT (option < ARRAY_LEN (hm->config_handler));
+
+  /* Not registered */
+  if (!hm->config_handler[option])
+    return (VNET_API_ERROR_INVALID_REGISTRATION);
+
+  hm->config_handler[option] = NULL;
+  return (0);
+}
+
+/* Flow handler registration */
+int
+ip6_hbh_flow_handler_register (u8 option,
+			       u32 ioam_flow_handler (u32 flow_ctx, u8 add))
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+
+  ASSERT (option < ARRAY_LEN (hm->flow_handler));
+
+  /* Already registered */
+  if (hm->flow_handler[option])
+    return (VNET_API_ERROR_INVALID_REGISTRATION);
+
+  hm->flow_handler[option] = ioam_flow_handler;
+
+  return (0);
+}
+
+int
+ip6_hbh_flow_handler_unregister (u8 option)
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+
+  ASSERT (option < ARRAY_LEN (hm->flow_handler));
+
+  /* Not registered */
+  if (!hm->flow_handler[option])
+    return (VNET_API_ERROR_INVALID_REGISTRATION);
+
+  hm->flow_handler[option] = NULL;
+  return (0);
+}
+
+typedef struct
+{
+  u32 next_index;
+} ip6_add_hop_by_hop_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_ip6_add_hop_by_hop_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip6_add_hop_by_hop_trace_t *t = va_arg (*args,
+					  ip6_add_hop_by_hop_trace_t *);
+
+  s = format (s, "IP6_ADD_HOP_BY_HOP: next index %d", t->next_index);
+  return s;
+}
+
+vlib_node_registration_t ip6_add_hop_by_hop_node;
+
+#define foreach_ip6_add_hop_by_hop_error \
+_(PROCESSED, "Pkts w/ added ip6 hop-by-hop options")
+
+typedef enum
+{
+#define _(sym,str) IP6_ADD_HOP_BY_HOP_ERROR_##sym,
+  foreach_ip6_add_hop_by_hop_error
+#undef _
+    IP6_ADD_HOP_BY_HOP_N_ERROR,
+} ip6_add_hop_by_hop_error_t;
+
+static char *ip6_add_hop_by_hop_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ip6_add_hop_by_hop_error
+#undef _
+};
+
+static uword
+ip6_add_hop_by_hop_node_fn (vlib_main_t * vm,
+			    vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+  u32 n_left_from, *from, *to_next;
+  ip_lookup_next_t next_index;
+  u32 processed = 0;
+  u8 *rewrite = hm->rewrite;
+  u32 rewrite_length = vec_len (rewrite);
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+	  ip6_header_t *ip0, *ip1;
+	  ip6_hop_by_hop_header_t *hbh0, *hbh1;
+	  u64 *copy_src0, *copy_dst0, *copy_src1, *copy_dst1;
+	  u16 new_l0, new_l1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data - rewrite_length,
+			   2 * CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data - rewrite_length,
+			   2 * CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /* $$$$$ Dual loop: process 2 x packets here $$$$$ */
+	  ip0 = vlib_buffer_get_current (b0);
+	  ip1 = vlib_buffer_get_current (b1);
+
+	  /* Copy the ip header left by the required amount */
+	  copy_dst0 = (u64 *) (((u8 *) ip0) - rewrite_length);
+	  copy_dst1 = (u64 *) (((u8 *) ip1) - rewrite_length);
+	  copy_src0 = (u64 *) ip0;
+	  copy_src1 = (u64 *) ip1;
+
+	  copy_dst0[0] = copy_src0[0];
+	  copy_dst0[1] = copy_src0[1];
+	  copy_dst0[2] = copy_src0[2];
+	  copy_dst0[3] = copy_src0[3];
+	  copy_dst0[4] = copy_src0[4];
+
+	  copy_dst1[0] = copy_src1[0];
+	  copy_dst1[1] = copy_src1[1];
+	  copy_dst1[2] = copy_src1[2];
+	  copy_dst1[3] = copy_src1[3];
+	  copy_dst1[4] = copy_src1[4];
+
+	  vlib_buffer_advance (b0, -(word) rewrite_length);
+	  vlib_buffer_advance (b1, -(word) rewrite_length);
+	  ip0 = vlib_buffer_get_current (b0);
+	  ip1 = vlib_buffer_get_current (b1);
+
+	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
+	  hbh1 = (ip6_hop_by_hop_header_t *) (ip1 + 1);
+	  /* $$$ tune, rewrite_length is a multiple of 8 */
+	  clib_memcpy (hbh0, rewrite, rewrite_length);
+	  clib_memcpy (hbh1, rewrite, rewrite_length);
+	  /* Patch the protocol chain, insert the h-b-h (type 0) header */
+	  hbh0->protocol = ip0->protocol;
+	  hbh1->protocol = ip1->protocol;
+	  ip0->protocol = 0;
+	  ip1->protocol = 0;
+	  new_l0 =
+	    clib_net_to_host_u16 (ip0->payload_length) + rewrite_length;
+	  new_l1 =
+	    clib_net_to_host_u16 (ip1->payload_length) + rewrite_length;
+	  ip0->payload_length = clib_host_to_net_u16 (new_l0);
+	  ip1->payload_length = clib_host_to_net_u16 (new_l1);
+
+	  /* Populate the (first) h-b-h list elt */
+	  next0 = IP6_HBYH_IOAM_INPUT_NEXT_IP6_LOOKUP;
+	  next1 = IP6_HBYH_IOAM_INPUT_NEXT_IP6_LOOKUP;
+
+
+	  /* $$$$$ End of processing 2 x packets $$$$$ */
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  ip6_add_hop_by_hop_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->next_index = next0;
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  ip6_add_hop_by_hop_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->next_index = next1;
+		}
+	    }
+	  processed += 2;
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  ip6_header_t *ip0;
+	  ip6_hop_by_hop_header_t *hbh0;
+	  u64 *copy_src0, *copy_dst0;
+	  u16 new_l0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  ip0 = vlib_buffer_get_current (b0);
+
+	  /* Copy the ip header left by the required amount */
+	  copy_dst0 = (u64 *) (((u8 *) ip0) - rewrite_length);
+	  copy_src0 = (u64 *) ip0;
+
+	  copy_dst0[0] = copy_src0[0];
+	  copy_dst0[1] = copy_src0[1];
+	  copy_dst0[2] = copy_src0[2];
+	  copy_dst0[3] = copy_src0[3];
+	  copy_dst0[4] = copy_src0[4];
+	  vlib_buffer_advance (b0, -(word) rewrite_length);
+	  ip0 = vlib_buffer_get_current (b0);
+
+	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
+	  /* $$$ tune, rewrite_length is a multiple of 8 */
+	  clib_memcpy (hbh0, rewrite, rewrite_length);
+	  /* Patch the protocol chain, insert the h-b-h (type 0) header */
+	  hbh0->protocol = ip0->protocol;
+	  ip0->protocol = 0;
+	  new_l0 =
+	    clib_net_to_host_u16 (ip0->payload_length) + rewrite_length;
+	  ip0->payload_length = clib_host_to_net_u16 (new_l0);
+
+	  /* Populate the (first) h-b-h list elt */
+	  next0 = IP6_HBYH_IOAM_INPUT_NEXT_IP6_LOOKUP;
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      ip6_add_hop_by_hop_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->next_index = next0;
+	    }
+
+	  processed++;
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, ip6_add_hop_by_hop_node.index,
+			       IP6_ADD_HOP_BY_HOP_ERROR_PROCESSED, processed);
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_add_hop_by_hop_node) =	/* *INDENT-OFF* */
+{
+  .function = ip6_add_hop_by_hop_node_fn,.name =
+    "ip6-add-hop-by-hop",.vector_size = sizeof (u32),.format_trace =
+    format_ip6_add_hop_by_hop_trace,.type =
+    VLIB_NODE_TYPE_INTERNAL,.n_errors =
+    ARRAY_LEN (ip6_add_hop_by_hop_error_strings),.error_strings =
+    ip6_add_hop_by_hop_error_strings,
+    /* See ip/lookup.h */
+    .n_next_nodes = IP6_HBYH_IOAM_INPUT_N_NEXT,.next_nodes =
+  {
+#define _(s,n) [IP6_HBYH_IOAM_INPUT_NEXT_##s] = n,
+    foreach_ip6_hbyh_ioam_input_next
+#undef _
+  }
+,};
+/* *INDENT-ON* */
+
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_add_hop_by_hop_node,
+			      ip6_add_hop_by_hop_node_fn);
+/* The main h-b-h tracer was already invoked, no need to do much here */
+typedef struct
+{
+  u32 next_index;
+} ip6_pop_hop_by_hop_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_ip6_pop_hop_by_hop_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip6_pop_hop_by_hop_trace_t *t =
+    va_arg (*args, ip6_pop_hop_by_hop_trace_t *);
+
+  s = format (s, "IP6_POP_HOP_BY_HOP: next index %d", t->next_index);
+  return s;
+}
+
+int
+ip6_hbh_pop_register_option (u8 option,
+			     int options (vlib_buffer_t * b,
+					  ip6_header_t * ip,
+					  ip6_hop_by_hop_option_t * opt))
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+
+  ASSERT (option < ARRAY_LEN (hm->pop_options));
+
+  /* Already registered */
+  if (hm->pop_options[option])
+    return (-1);
+
+  hm->pop_options[option] = options;
+
+  return (0);
+}
+
+int
+ip6_hbh_pop_unregister_option (u8 option)
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+
+  ASSERT (option < ARRAY_LEN (hm->pop_options));
+
+  /* Not registered */
+  if (!hm->pop_options[option])
+    return (-1);
+
+  hm->pop_options[option] = NULL;
+  return (0);
+}
+
+vlib_node_registration_t ip6_pop_hop_by_hop_node;
+
+#define foreach_ip6_pop_hop_by_hop_error                \
+_(PROCESSED, "Pkts w/ removed ip6 hop-by-hop options")  \
+_(NO_HOHO, "Pkts w/ no ip6 hop-by-hop options")         \
+_(OPTION_FAILED, "ip6 pop hop-by-hop failed to process")
+
+typedef enum
+{
+#define _(sym,str) IP6_POP_HOP_BY_HOP_ERROR_##sym,
+  foreach_ip6_pop_hop_by_hop_error
+#undef _
+    IP6_POP_HOP_BY_HOP_N_ERROR,
+} ip6_pop_hop_by_hop_error_t;
+
+static char *ip6_pop_hop_by_hop_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ip6_pop_hop_by_hop_error
+#undef _
+};
+
+static inline void
+ioam_pop_hop_by_hop_processing (vlib_main_t * vm,
+				ip6_header_t * ip0,
+				ip6_hop_by_hop_header_t * hbh0,
+				vlib_buffer_t * b)
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+  ip6_hop_by_hop_option_t *opt0, *limit0;
+  u8 type0;
+
+  if (!hbh0 || !ip0)
+    return;
+
+  opt0 = (ip6_hop_by_hop_option_t *) (hbh0 + 1);
+  limit0 = (ip6_hop_by_hop_option_t *)
+    ((u8 *) hbh0 + ((hbh0->length + 1) << 3));
+
+  /* Scan the set of h-b-h options, process ones that we understand */
+  while (opt0 < limit0)
+    {
+      type0 = opt0->type;
+      switch (type0)
+	{
+	case 0:		/* Pad1 */
+	  opt0 = (ip6_hop_by_hop_option_t *) ((u8 *) opt0) + 1;
+	  continue;
+	case 1:		/* PadN */
+	  break;
+	default:
+	  if (hm->pop_options[type0])
+	    {
+	      if ((*hm->pop_options[type0]) (b, ip0, opt0) < 0)
+		{
+		  vlib_node_increment_counter (vm,
+					       ip6_pop_hop_by_hop_node.index,
+					       IP6_POP_HOP_BY_HOP_ERROR_OPTION_FAILED,
+					       1);
+		}
+	    }
+	}
+      opt0 =
+	(ip6_hop_by_hop_option_t *) (((u8 *) opt0) + opt0->length +
+				     sizeof (ip6_hop_by_hop_option_t));
+    }
+}
+
+static uword
+ip6_pop_hop_by_hop_node_fn (vlib_main_t * vm,
+			    vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  ip6_main_t *im = &ip6_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  u32 n_left_from, *from, *to_next;
+  ip_lookup_next_t next_index;
+  u32 processed = 0;
+  u32 no_header = 0;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+	  u32 adj_index0, adj_index1;
+	  ip6_header_t *ip0, *ip1;
+	  ip_adjacency_t *adj0, *adj1;
+	  ip6_hop_by_hop_header_t *hbh0, *hbh1;
+	  u64 *copy_dst0, *copy_src0, *copy_dst1, *copy_src1;
+	  u16 new_l0, new_l1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /* $$$$$ Dual loop: process 2 x packets here $$$$$ */
+	  ip0 = vlib_buffer_get_current (b0);
+	  ip1 = vlib_buffer_get_current (b1);
+	  adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
+	  adj_index1 = vnet_buffer (b1)->ip.adj_index[VLIB_TX];
+	  adj0 = ip_get_adjacency (lm, adj_index0);
+	  adj1 = ip_get_adjacency (lm, adj_index1);
+
+	  next0 = adj0->lookup_next_index;
+	  next1 = adj1->lookup_next_index;
+
+	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
+	  hbh1 = (ip6_hop_by_hop_header_t *) (ip1 + 1);
+
+	  ioam_pop_hop_by_hop_processing (vm, ip0, hbh0, b0);
+	  ioam_pop_hop_by_hop_processing (vm, ip1, hbh1, b1);
+
+	  vlib_buffer_advance (b0, (hbh0->length + 1) << 3);
+	  vlib_buffer_advance (b1, (hbh1->length + 1) << 3);
+
+	  new_l0 = clib_net_to_host_u16 (ip0->payload_length) -
+	    ((hbh0->length + 1) << 3);
+	  new_l1 = clib_net_to_host_u16 (ip1->payload_length) -
+	    ((hbh1->length + 1) << 3);
+
+	  ip0->payload_length = clib_host_to_net_u16 (new_l0);
+	  ip1->payload_length = clib_host_to_net_u16 (new_l1);
+
+	  ip0->protocol = hbh0->protocol;
+	  ip1->protocol = hbh1->protocol;
+
+	  copy_src0 = (u64 *) ip0;
+	  copy_src1 = (u64 *) ip1;
+	  copy_dst0 = copy_src0 + (hbh0->length + 1);
+	  copy_dst0[4] = copy_src0[4];
+	  copy_dst0[3] = copy_src0[3];
+	  copy_dst0[2] = copy_src0[2];
+	  copy_dst0[1] = copy_src0[1];
+	  copy_dst0[0] = copy_src0[0];
+	  copy_dst1 = copy_src1 + (hbh1->length + 1);
+	  copy_dst1[4] = copy_src1[4];
+	  copy_dst1[3] = copy_src1[3];
+	  copy_dst1[2] = copy_src1[2];
+	  copy_dst1[1] = copy_src1[1];
+	  copy_dst1[0] = copy_src1[0];
+	  processed += 2;
+	  /* $$$$$ End of processing 2 x packets $$$$$ */
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  ip6_pop_hop_by_hop_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->next_index = next0;
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  ip6_pop_hop_by_hop_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->next_index = next1;
+		}
+	    }
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 adj_index0;
+	  ip6_header_t *ip0;
+	  ip_adjacency_t *adj0;
+	  ip6_hop_by_hop_header_t *hbh0;
+	  u64 *copy_dst0, *copy_src0;
+	  u16 new_l0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  ip0 = vlib_buffer_get_current (b0);
+	  adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
+	  adj0 = ip_get_adjacency (lm, adj_index0);
+
+	  /* Default use the next_index from the adjacency. */
+	  next0 = adj0->lookup_next_index;
+
+	  /* Perfectly normal to end up here w/ out h-b-h header */
+	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
+
+	  /* TODO:Temporarily doing it here.. do this validation in end_of_path_cb */
+	  ioam_pop_hop_by_hop_processing (vm, ip0, hbh0, b0);
+	  /* Pop the trace data */
+	  vlib_buffer_advance (b0, (hbh0->length + 1) << 3);
+	  new_l0 = clib_net_to_host_u16 (ip0->payload_length) -
+	    ((hbh0->length + 1) << 3);
+	  ip0->payload_length = clib_host_to_net_u16 (new_l0);
+	  ip0->protocol = hbh0->protocol;
+	  copy_src0 = (u64 *) ip0;
+	  copy_dst0 = copy_src0 + (hbh0->length + 1);
+	  copy_dst0[4] = copy_src0[4];
+	  copy_dst0[3] = copy_src0[3];
+	  copy_dst0[2] = copy_src0[2];
+	  copy_dst0[1] = copy_src0[1];
+	  copy_dst0[0] = copy_src0[0];
+	  processed++;
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      ip6_pop_hop_by_hop_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->next_index = next0;
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, ip6_pop_hop_by_hop_node.index,
+			       IP6_POP_HOP_BY_HOP_ERROR_PROCESSED, processed);
+  vlib_node_increment_counter (vm, ip6_pop_hop_by_hop_node.index,
+			       IP6_POP_HOP_BY_HOP_ERROR_NO_HOHO, no_header);
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_pop_hop_by_hop_node) =
+{
+  .function = ip6_pop_hop_by_hop_node_fn,.name =
+    "ip6-pop-hop-by-hop",.vector_size = sizeof (u32),.format_trace =
+    format_ip6_pop_hop_by_hop_trace,.type =
+    VLIB_NODE_TYPE_INTERNAL,.sibling_of = "ip6-lookup",.n_errors =
+    ARRAY_LEN (ip6_pop_hop_by_hop_error_strings),.error_strings =
+    ip6_pop_hop_by_hop_error_strings,
+    /* See ip/lookup.h */
+.n_next_nodes = 0,};
+
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_pop_hop_by_hop_node,
+			      ip6_pop_hop_by_hop_node_fn);
+static clib_error_t *
+ip6_hop_by_hop_ioam_init (vlib_main_t * vm)
+{
+  clib_error_t *error;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+
+  if ((error = vlib_call_init_function (vm, ip_main_init)))
+    return (error);
+
+  if ((error = vlib_call_init_function (vm, ip6_lookup_init)))
+    return error;
+
+  hm->vlib_main = vm;
+  hm->vnet_main = vnet_get_main ();
+  hm->unix_time_0 = (u32) time (0);	/* Store starting time */
+  hm->vlib_time_0 = vlib_time_now (vm);
+  hm->ioam_flag = IOAM_HBYH_MOD;
+  memset (hm->add_options, 0, sizeof (hm->add_options));
+  memset (hm->pop_options, 0, sizeof (hm->pop_options));
+  memset (hm->options_size, 0, sizeof (hm->options_size));
+
+  vnet_classify_register_unformat_opaque_index_fn (unformat_opaque_ioam);
+
+  return (0);
+}
+
+VLIB_INIT_FUNCTION (ip6_hop_by_hop_ioam_init);
+
+int
+ip6_ioam_set_rewrite (u8 ** rwp, int has_trace_option,
+		      int has_pot_option, int has_seqno_option)
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+  u8 *rewrite = NULL;
+  u32 size, rnd_size;
+  ip6_hop_by_hop_header_t *hbh;
+  u8 *current;
+  u8 *trace_data_size = NULL;
+  u8 *pot_data_size = NULL;
+
+  vec_free (*rwp);
+
+  if (has_trace_option == 0 && has_pot_option == 0)
+    return -1;
+
+  /* Work out how much space we need */
+  size = sizeof (ip6_hop_by_hop_header_t);
+
+  //if (has_trace_option && hm->get_sizeof_options[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] != 0)
+  if (has_trace_option
+      && hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] != 0)
+    {
+      size += hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST];
+    }
+  if (has_pot_option
+      && hm->add_options[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] != 0)
+    {
+      size += hm->options_size[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT];
+    }
+
+  if (has_seqno_option)
+    {
+      size += hm->options_size[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE];
+    }
+
+  /* Round to a multiple of 8 octets */
+  rnd_size = (size + 7) & ~7;
+
+  /* allocate it, zero-fill / pad by construction */
+  vec_validate (rewrite, rnd_size - 1);
+
+  hbh = (ip6_hop_by_hop_header_t *) rewrite;
+  /* Length of header in 8 octet units, not incl first 8 octets */
+  hbh->length = (rnd_size >> 3) - 1;
+  current = (u8 *) (hbh + 1);
+
+  if (has_trace_option
+      && hm->add_options[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] != 0)
+    {
+      if (0 != (hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST]))
+	{
+	  trace_data_size =
+	    &hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST];
+	  if (0 ==
+	      hm->add_options[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] (current,
+								     trace_data_size))
+	    current += *trace_data_size;
+	}
+    }
+  if (has_pot_option
+      && hm->add_options[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] != 0)
+    {
+      pot_data_size =
+	&hm->options_size[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT];
+      if (0 ==
+	  hm->add_options[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] (current,
+								  pot_data_size))
+	current += *pot_data_size;
+    }
+
+  if (has_seqno_option &&
+      (hm->add_options[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE] != 0))
+    {
+      if (0 == hm->add_options[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE] (current,
+								   &
+								   (hm->options_size
+								    [HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE])))
+	current += hm->options_size[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE];
+    }
+
+  *rwp = rewrite;
+  return 0;
+}
+
+clib_error_t *
+clear_ioam_rewrite_fn (void)
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+
+  vec_free (hm->rewrite);
+  hm->rewrite = 0;
+  hm->has_trace_option = 0;
+  hm->has_pot_option = 0;
+  hm->has_seqno_option = 0;
+  hm->has_analyse_option = 0;
+  if (hm->config_handler[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST])
+    hm->config_handler[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] (NULL, 1);
+
+  if (hm->config_handler[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT])
+    hm->config_handler[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] (NULL, 1);
+
+  if (hm->config_handler[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE])
+    {
+      hm->config_handler[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE] ((void *)
+							     &hm->has_analyse_option,
+							     1);
+    }
+
+  return 0;
+}
+
+clib_error_t *
+clear_ioam_rewrite_command_fn (vlib_main_t * vm,
+			       unformat_input_t * input,
+			       vlib_cli_command_t * cmd)
+{
+  return (clear_ioam_rewrite_fn ());
+}
+
+/*?
+ * This command clears all the In-band OAM (iOAM) features enabled by
+ * the '<em>set ioam rewrite</em>' command. Use '<em>show ioam summary</em>' to
+ * verify the configured settings cleared.
+ *
+ * @cliexpar
+ * Example of how to clear iOAM features:
+ * @cliexcmd{clear ioam rewrite}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip6_clear_ioam_rewrite_cmd, static) = {
+  .path = "clear ioam rewrite",
+  .short_help = "clear ioam rewrite",
+  .function = clear_ioam_rewrite_command_fn,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+ip6_ioam_enable (int has_trace_option, int has_pot_option,
+		 int has_seqno_option, int has_analyse_option)
+{
+  int rv;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+  rv = ip6_ioam_set_rewrite (&hm->rewrite, has_trace_option,
+			     has_pot_option, has_seqno_option);
+
+  switch (rv)
+    {
+    case 0:
+      if (has_trace_option)
+	{
+	  hm->has_trace_option = has_trace_option;
+	  if (hm->config_handler[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST])
+	    hm->config_handler[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] (NULL,
+								      0);
+	}
+
+      if (has_pot_option)
+	{
+	  hm->has_pot_option = has_pot_option;
+	  if (hm->config_handler[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT])
+	    hm->config_handler[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] (NULL,
+								       0);
+	}
+      hm->has_analyse_option = has_analyse_option;
+      if (has_seqno_option)
+	{
+	  hm->has_seqno_option = has_seqno_option;
+	  if (hm->config_handler[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE])
+	    {
+	      hm->config_handler[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE] ((void *)
+								     &has_analyse_option,
+								     0);
+	    }
+	}
+      break;
+
+    default:
+      return clib_error_return_code (0, rv, 0,
+				     "ip6_ioam_set_rewrite returned %d", rv);
+    }
+
+  return 0;
+}
+
+
+static clib_error_t *
+ip6_set_ioam_rewrite_command_fn (vlib_main_t * vm,
+				 unformat_input_t * input,
+				 vlib_cli_command_t * cmd)
+{
+  int has_trace_option = 0;
+  int has_pot_option = 0;
+  int has_seqno_option = 0;
+  int has_analyse_option = 0;
+  clib_error_t *rv = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "trace"))
+	has_trace_option = 1;
+      else if (unformat (input, "pot"))
+	has_pot_option = 1;
+      else if (unformat (input, "seqno"))
+	has_seqno_option = 1;
+      else if (unformat (input, "analyse"))
+	has_analyse_option = 1;
+      else
+	break;
+    }
+
+
+  rv = ip6_ioam_enable (has_trace_option, has_pot_option,
+			has_seqno_option, has_analyse_option);
+
+  return rv;
+}
+
+/*?
+ * This command is used to enable In-band OAM (iOAM) features on IPv6.
+ * '<em>trace</em>' is used to enable iOAM trace feature. '<em>pot</em>' is used to
+ * enable the Proof Of Transit feature. '<em>ppc</em>' is used to indicate the
+ * Per Packet Counter feature for Edge to Edge processing. '<em>ppc</em>' is
+ * used to indicate if this node is an '<em>encap</em>' node (iOAM edge node
+ * where packet enters iOAM domain), a '<em>decap</em>' node (iOAM edge node
+ * where packet leaves iOAM domain) or '<em>none</em>' (iOAM node where packet
+ * is in-transit through the iOAM domain). '<em>ppc</em>' can only be set if
+ * '<em>trace</em>' or '<em>pot</em>' is enabled.
+ *
+ * Use '<em>clear ioam rewrite</em>' to disable all features enabled by this
+ * command. Use '<em>show ioam summary</em>' to verify the configured settings.
+ *
+ * @cliexpar
+ * Example of how to enable trace and pot with ppc set to encap:
+ * @cliexcmd{set ioam rewrite trace pot ppc encap}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip6_set_ioam_rewrite_cmd, static) = {
+  .path = "set ioam rewrite",
+  .short_help = "set ioam [trace] [pot] [seqno] [analyse]",
+  .function = ip6_set_ioam_rewrite_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+ip6_show_ioam_summary_cmd_fn (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+  u8 *s = 0;
+
+
+  if (!is_zero_ip6_address (&hm->adj))
+    {
+      s = format (s, "              REWRITE FLOW CONFIGS - \n");
+      s = format (s, "               Destination Address : %U\n",
+		  format_ip6_address, &hm->adj, sizeof (ip6_address_t));
+      s =
+	format (s, "                    Flow operation : %d (%s)\n",
+		hm->ioam_flag,
+		(hm->ioam_flag ==
+		 IOAM_HBYH_ADD) ? "Add" : ((hm->ioam_flag ==
+					    IOAM_HBYH_MOD) ? "Mod" : "Pop"));
+    }
+  else
+    {
+      s = format (s, "              REWRITE FLOW CONFIGS - Not configured\n");
+    }
+
+
+  s = format (s, "                        TRACE OPTION - %d (%s)\n",
+	      hm->has_trace_option,
+	      (hm->has_trace_option ? "Enabled" : "Disabled"));
+  if (hm->has_trace_option)
+    s =
+      format (s,
+	      "Try 'show ioam trace and show ioam-trace profile' for more information\n");
+
+
+  s = format (s, "                        POT OPTION - %d (%s)\n",
+	      hm->has_pot_option,
+	      (hm->has_pot_option ? "Enabled" : "Disabled"));
+  if (hm->has_pot_option)
+    s =
+      format (s,
+	      "Try 'show ioam pot and show pot profile' for more information\n");
+
+  s = format (s, "         EDGE TO EDGE - SeqNo OPTION - %d (%s)\n",
+	      hm->has_seqno_option,
+	      hm->has_seqno_option ? "Enabled" : "Disabled");
+  if (hm->has_seqno_option)
+    s = format (s, "Try 'show ioam e2e' for more information\n");
+
+  s = format (s, "         iOAM Analyse OPTION - %d (%s)\n",
+	      hm->has_analyse_option,
+	      hm->has_analyse_option ? "Enabled" : "Disabled");
+
+  vlib_cli_output (vm, "%v", s);
+  vec_free (s);
+  return 0;
+}
+
+/*?
+ * This command displays the current configuration data for In-band
+ * OAM (iOAM).
+ *
+ * @cliexpar
+ * Example to show the iOAM configuration:
+ * @cliexstart{show ioam summary}
+ *               REWRITE FLOW CONFIGS -
+ *                Destination Address : ff02::1
+ *                     Flow operation : 2 (Pop)
+ *                         TRACE OPTION - 1 (Enabled)
+ * Try 'show ioam trace and show ioam-trace profile' for more information
+ *                         POT OPTION - 1 (Enabled)
+ * Try 'show ioam pot and show pot profile' for more information
+ *          EDGE TO EDGE - PPC OPTION - 1 (Encap)
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip6_show_ioam_run_cmd, static) = {
+  .path = "show ioam summary",
+  .short_help = "show ioam summary",
+  .function = ip6_show_ioam_summary_cmd_fn,
+};
+/* *INDENT-ON* */
+
+void
+vnet_register_ioam_end_of_path_callback (void *cb)
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+
+  hm->ioam_end_of_path_cb = cb;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip6_hop_by_hop.h b/src/vnet/ip/ip6_hop_by_hop.h
new file mode 100644
index 00000000..acfaa37e
--- /dev/null
+++ b/src/vnet/ip/ip6_hop_by_hop.h
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_ip6_hop_by_hop_ioam_h__
+#define __included_ip6_hop_by_hop_ioam_h__
+
+#include <vnet/ip/ip6_hop_by_hop_packet.h>
+#include <vnet/ip/ip.h>
+
+
+#define MAX_IP6_HBH_OPTION      256
+
+/* To determine whether a node is decap MS bit is set */
+#define IOAM_DECAP_BIT 0x80000000
+
+#define IOAM_DEAP_ENABLED(opaque_data) (opaque_data & IOAM_DECAP_BIT)
+
+#define IOAM_SET_DECAP(opaque_data) \
+    (opaque_data |= IOAM_DECAP_BIT)
+
+#define IOAM_MASK_DECAP_BIT(x) (x & ~IOAM_DECAP_BIT)
+
+/*
+ * Stores the run time flow data of hbh options
+ */
+typedef struct
+{
+  u32 ctx[MAX_IP6_HBH_OPTION];
+  u8 flow_name[64];
+} flow_data_t;
+
+typedef struct
+{
+  /* The current rewrite we're using */
+  u8 *rewrite;
+
+  /* Trace data processing callback */
+  void *ioam_end_of_path_cb;
+  /* Configuration data */
+  /* Adjacency */
+  ip6_address_t adj;
+#define IOAM_HBYH_ADD  0
+#define IOAM_HBYH_MOD  1
+#define IOAM_HBYH_POP  2
+  u8 ioam_flag;
+  /* time scale transform. Joy. */
+  u32 unix_time_0;
+  f64 vlib_time_0;
+
+
+  /* Trace option */
+  u8 has_trace_option;
+
+  /* Pot option */
+  u8 has_pot_option;
+
+  /* Per Packet Counter option */
+  u8 has_seqno_option;
+
+  /* Enabling analyis of iOAM data on decap node */
+  u8 has_analyse_option;
+
+  /* Array of function pointers to ADD and POP HBH option handling routines */
+  u8 options_size[MAX_IP6_HBH_OPTION];
+  int (*add_options[MAX_IP6_HBH_OPTION]) (u8 * rewrite_string,
+					  u8 * rewrite_size);
+  int (*pop_options[MAX_IP6_HBH_OPTION]) (vlib_buffer_t * b,
+					  ip6_header_t * ip,
+					  ip6_hop_by_hop_option_t * opt);
+  int (*get_sizeof_options[MAX_IP6_HBH_OPTION]) (u32 * rewrite_size);
+  int (*config_handler[MAX_IP6_HBH_OPTION]) (void *data, u8 disable);
+
+  /* Array of function pointers to handle hbh options being used with classifier */
+    u32 (*flow_handler[MAX_IP6_HBH_OPTION]) (u32 flow_ctx, u8 add);
+  flow_data_t *flows;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} ip6_hop_by_hop_ioam_main_t;
+
+extern ip6_hop_by_hop_ioam_main_t ip6_hop_by_hop_ioam_main;
+
+extern u8 *format_path_map (u8 * s, va_list * args);
+
+extern clib_error_t *ip6_ioam_enable (int has_trace_option,
+				      int has_pot_option,
+				      int has_seqno_option,
+				      int has_analyse_option);
+
+extern int ip6_ioam_set_destination (ip6_address_t * addr, u32 mask_width,
+				     u32 vrf_id, int is_add, int is_pop,
+				     int is_none);
+
+extern clib_error_t *clear_ioam_rewrite_fn (void);
+
+static inline u8
+is_zero_ip4_address (ip4_address_t * a)
+{
+  return (a->as_u32 == 0);
+}
+
+static inline void
+copy_ip6_address (ip6_address_t * dst, ip6_address_t * src)
+{
+  dst->as_u64[0] = src->as_u64[0];
+  dst->as_u64[1] = src->as_u64[1];
+}
+
+static inline void
+set_zero_ip6_address (ip6_address_t * a)
+{
+  a->as_u64[0] = 0;
+  a->as_u64[1] = 0;
+}
+
+static inline u8
+cmp_ip6_address (ip6_address_t * a1, ip6_address_t * a2)
+{
+  return ((a1->as_u64[0] == a2->as_u64[0])
+	  && (a1->as_u64[1] == a2->as_u64[1]));
+}
+
+static inline u8
+is_zero_ip6_address (ip6_address_t * a)
+{
+  return ((a->as_u64[0] == 0) && (a->as_u64[1] == 0));
+}
+
+int ip6_hbh_add_register_option (u8 option,
+				 u8 size,
+				 int rewrite_options (u8 * rewrite_string,
+						      u8 * size));
+int ip6_hbh_add_unregister_option (u8 option);
+
+int ip6_hbh_pop_register_option (u8 option,
+				 int options (vlib_buffer_t * b,
+					      ip6_header_t * ip,
+					      ip6_hop_by_hop_option_t * opt));
+int ip6_hbh_pop_unregister_option (u8 option);
+
+int
+ip6_hbh_get_sizeof_register_option (u8 option,
+				    int get_sizeof_hdr_options (u32 *
+								rewrite_size));
+
+int
+ip6_ioam_set_rewrite (u8 ** rwp, int has_trace_option,
+		      int has_pot_option, int has_seq_no);
+
+int
+ip6_hbh_config_handler_register (u8 option,
+				 int config_handler (void *data, u8 disable));
+
+int ip6_hbh_config_handler_unregister (u8 option);
+
+int ip6_hbh_flow_handler_register (u8 option,
+				   u32 ioam_flow_handler (u32 flow_ctx,
+							  u8 add));
+
+int ip6_hbh_flow_handler_unregister (u8 option);
+
+u8 *get_flow_name_from_flow_ctx (u32 flow_ctx);
+
+static inline flow_data_t *
+get_flow (u32 index)
+{
+  flow_data_t *flow = NULL;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+
+  if (pool_is_free_index (hm->flows, index))
+    return NULL;
+
+  flow = pool_elt_at_index (hm->flows, index);
+  return flow;
+}
+
+static inline u32
+get_flow_data_from_flow_ctx (u32 flow_ctx, u8 option)
+{
+  flow_data_t *flow = NULL;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+  u32 index;
+
+  index = IOAM_MASK_DECAP_BIT (flow_ctx);
+  //flow = pool_elt_at_index (hm->flows, index);
+  flow = &hm->flows[index];
+  return (flow->ctx[option]);
+}
+
+static inline u8
+is_seqno_enabled (void)
+{
+  return (ip6_hop_by_hop_ioam_main.has_seqno_option);
+}
+
+int ip6_trace_profile_setup ();
+#endif /* __included_ip6_hop_by_hop_ioam_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip6_hop_by_hop_packet.h b/src/vnet/ip/ip6_hop_by_hop_packet.h
new file mode 100644
index 00000000..543ba8b0
--- /dev/null
+++ b/src/vnet/ip/ip6_hop_by_hop_packet.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_ip6_hop_by_hop_packet_h__
+#define __included_ip6_hop_by_hop_packet_h__
+
+typedef struct
+{
+  /* Protocol for next header */
+  u8 protocol;
+  /*
+   * Length of hop_by_hop header in 8 octet units,
+   * not including the first 8 octets
+   */
+  u8 length;
+} ip6_hop_by_hop_header_t;
+
+typedef struct
+{
+  /* Option Type */
+#define HBH_OPTION_TYPE_SKIP_UNKNOWN (0x00)
+#define HBH_OPTION_TYPE_DISCARD_UNKNOWN (0x40)
+#define HBH_OPTION_TYPE_DISCARD_UNKNOWN_ICMP (0x80)
+#define HBH_OPTION_TYPE_DISCARD_UNKNOWN_ICMP_NOT_MCAST (0xc0)
+#define HBH_OPTION_TYPE_HIGH_ORDER_BITS (0xc0)
+#define HBH_OPTION_TYPE_DATA_CHANGE_ENROUTE (1<<5)
+  u8 type;
+  /* Length in octets of the option data field */
+  u8 length;
+} ip6_hop_by_hop_option_t;
+
+/* $$$$ IANA banana constants */
+#define HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST 59	/* Third highest bit set (change en-route) */
+#define HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT 60	/* Third highest bit set (change en-route) */
+#define HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE 29
+
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED(struct {
+  ip6_hop_by_hop_option_t hdr;
+  u8 e2e_type;
+  u8 reserved;
+  u32 e2e_data;
+}) ioam_e2e_option_t;
+/* *INDENT-ON* */
+
+#endif /* __included_ip6_hop_by_hop_packet_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip6_input.c b/src/vnet/ip/ip6_input.c
new file mode 100644
index 00000000..bbc2ceba
--- /dev/null
+++ b/src/vnet/ip/ip6_input.c
@@ -0,0 +1,353 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip6_input.c: IP v6 input node
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ppp/ppp.h>
+#include <vnet/hdlc/hdlc.h>
+
+typedef struct
+{
+  u8 packet_data[64];
+} ip6_input_trace_t;
+
+static u8 *
+format_ip6_input_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  ip6_input_trace_t *t = va_arg (*va, ip6_input_trace_t *);
+
+  s = format (s, "%U",
+	      format_ip6_header, t->packet_data, sizeof (t->packet_data));
+
+  return s;
+}
+
+typedef enum
+{
+  IP6_INPUT_NEXT_DROP,
+  IP6_INPUT_NEXT_LOOKUP,
+  IP6_INPUT_NEXT_ICMP_ERROR,
+  IP6_INPUT_N_NEXT,
+} ip6_input_next_t;
+
+/* Validate IP v6 packets and pass them either to forwarding code
+   or drop exception packets. */
+static uword
+ip6_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_main_t *im = &ip6_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  u32 n_left_from, *from, *to_next;
+  ip6_input_next_t next_index;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip6_input_node.index);
+  vlib_simple_counter_main_t *cm;
+  u32 cpu_index = os_get_cpu_number ();
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+				   /* stride */ 1,
+				   sizeof (ip6_input_trace_t));
+
+  cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
+			 VNET_INTERFACE_COUNTER_IP6);
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  vlib_buffer_t *p0, *p1;
+	  ip6_header_t *ip0, *ip1;
+	  u32 pi0, sw_if_index0, next0 = 0;
+	  u32 pi1, sw_if_index1, next1 = 0;
+	  u8 error0, error1, arc0, arc1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), LOAD);
+	    CLIB_PREFETCH (p3->data, sizeof (ip1[0]), LOAD);
+	  }
+
+	  pi0 = from[0];
+	  pi1 = from[1];
+
+	  to_next[0] = pi0;
+	  to_next[1] = pi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+
+	  ip0 = vlib_buffer_get_current (p0);
+	  ip1 = vlib_buffer_get_current (p1);
+
+	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
+	  sw_if_index1 = vnet_buffer (p1)->sw_if_index[VLIB_RX];
+
+	  arc0 =
+	    ip6_address_is_multicast (&ip0->dst_address) ?
+	    lm->mcast_feature_arc_index : lm->ucast_feature_arc_index;
+	  arc1 =
+	    ip6_address_is_multicast (&ip1->dst_address) ?
+	    lm->mcast_feature_arc_index : lm->ucast_feature_arc_index;
+
+	  vnet_buffer (p0)->ip.adj_index[VLIB_RX] = ~0;
+	  vnet_buffer (p1)->ip.adj_index[VLIB_RX] = ~0;
+
+	  vnet_feature_arc_start (arc0, sw_if_index0, &next0, p0);
+	  vnet_feature_arc_start (arc1, sw_if_index1, &next1, p1);
+
+	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
+	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index1, 1);
+
+	  error0 = error1 = IP6_ERROR_NONE;
+
+	  /* Version != 6?  Drop it. */
+	  error0 =
+	    (clib_net_to_host_u32
+	     (ip0->ip_version_traffic_class_and_flow_label) >> 28) !=
+	    6 ? IP6_ERROR_VERSION : error0;
+	  error1 =
+	    (clib_net_to_host_u32
+	     (ip1->ip_version_traffic_class_and_flow_label) >> 28) !=
+	    6 ? IP6_ERROR_VERSION : error1;
+
+	  /* hop limit < 1? Drop it.  for link-local broadcast packets,
+	   * like dhcpv6 packets from client has hop-limit 1, which should not
+	   * be dropped.
+	   */
+	  error0 = ip0->hop_limit < 1 ? IP6_ERROR_TIME_EXPIRED : error0;
+	  error1 = ip1->hop_limit < 1 ? IP6_ERROR_TIME_EXPIRED : error1;
+
+	  /* L2 length must be at least minimal IP header. */
+	  error0 =
+	    p0->current_length <
+	    sizeof (ip0[0]) ? IP6_ERROR_TOO_SHORT : error0;
+	  error1 =
+	    p1->current_length <
+	    sizeof (ip1[0]) ? IP6_ERROR_TOO_SHORT : error1;
+
+	  if (PREDICT_FALSE (error0 != IP6_ERROR_NONE))
+	    {
+	      if (error0 == IP6_ERROR_TIME_EXPIRED)
+		{
+		  icmp6_error_set_vnet_buffer (p0, ICMP6_time_exceeded,
+					       ICMP6_time_exceeded_ttl_exceeded_in_transit,
+					       0);
+		  next0 = IP6_INPUT_NEXT_ICMP_ERROR;
+		}
+	      else
+		{
+		  next0 = IP6_INPUT_NEXT_DROP;
+		}
+	    }
+	  if (PREDICT_FALSE (error1 != IP6_ERROR_NONE))
+	    {
+	      if (error1 == IP6_ERROR_TIME_EXPIRED)
+		{
+		  icmp6_error_set_vnet_buffer (p1, ICMP6_time_exceeded,
+					       ICMP6_time_exceeded_ttl_exceeded_in_transit,
+					       0);
+		  next1 = IP6_INPUT_NEXT_ICMP_ERROR;
+		}
+	      else
+		{
+		  next1 = IP6_INPUT_NEXT_DROP;
+		}
+	    }
+
+	  p0->error = error_node->errors[error0];
+	  p1->error = error_node->errors[error1];
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, pi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip6_header_t *ip0;
+	  u32 pi0, sw_if_index0, next0 = 0;
+	  u8 error0, arc0;
+
+	  pi0 = from[0];
+	  to_next[0] = pi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip0 = vlib_buffer_get_current (p0);
+
+	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
+	  arc0 =
+	    ip6_address_is_multicast (&ip0->dst_address) ?
+	    lm->mcast_feature_arc_index : lm->ucast_feature_arc_index;
+	  vnet_buffer (p0)->ip.adj_index[VLIB_RX] = ~0;
+	  vnet_feature_arc_start (arc0, sw_if_index0, &next0, p0);
+
+	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
+	  error0 = IP6_ERROR_NONE;
+
+	  /* Version != 6?  Drop it. */
+	  error0 =
+	    (clib_net_to_host_u32
+	     (ip0->ip_version_traffic_class_and_flow_label) >> 28) !=
+	    6 ? IP6_ERROR_VERSION : error0;
+
+	  /* hop limit < 1? Drop it. for link-local broadcast packets,
+	   * like dhcpv6 packets from client has hop-limit 1, which should not
+	   * be dropped.
+	   */
+	  error0 = ip0->hop_limit < 1 ? IP6_ERROR_TIME_EXPIRED : error0;
+
+	  /* L2 length must be at least minimal IP header. */
+	  error0 =
+	    p0->current_length <
+	    sizeof (ip0[0]) ? IP6_ERROR_TOO_SHORT : error0;
+
+	  if (PREDICT_FALSE (error0 != IP6_ERROR_NONE))
+	    {
+	      if (error0 == IP6_ERROR_TIME_EXPIRED)
+		{
+		  icmp6_error_set_vnet_buffer (p0, ICMP6_time_exceeded,
+					       ICMP6_time_exceeded_ttl_exceeded_in_transit,
+					       0);
+		  next0 = IP6_INPUT_NEXT_ICMP_ERROR;
+		}
+	      else
+		{
+		  next0 = IP6_INPUT_NEXT_DROP;
+		}
+	    }
+	  p0->error = error_node->errors[error0];
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+static char *ip6_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ip6_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_input_node) = {
+  .function = ip6_input,
+  .name = "ip6-input",
+  .vector_size = sizeof (u32),
+
+  .n_errors = IP6_N_ERROR,
+  .error_strings = ip6_error_strings,
+
+  .n_next_nodes = IP6_INPUT_N_NEXT,
+  .next_nodes = {
+    [IP6_INPUT_NEXT_DROP] = "error-drop",
+    [IP6_INPUT_NEXT_LOOKUP] = "ip6-lookup",
+    [IP6_INPUT_NEXT_ICMP_ERROR] = "ip6-icmp-error",
+  },
+
+  .format_buffer = format_ip6_header,
+  .format_trace = format_ip6_input_trace,
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_input_node, ip6_input)
+     static clib_error_t *ip6_init (vlib_main_t * vm)
+{
+  ethernet_register_input_type (vm, ETHERNET_TYPE_IP6, ip6_input_node.index);
+  ppp_register_input_protocol (vm, PPP_PROTOCOL_ip6, ip6_input_node.index);
+  hdlc_register_input_protocol (vm, HDLC_PROTOCOL_ip6, ip6_input_node.index);
+
+  {
+    pg_node_t *pn;
+    pn = pg_get_node (ip6_input_node.index);
+    pn->unformat_edit = unformat_pg_ip6_header;
+  }
+
+  /* Set flow hash to something non-zero. */
+  ip6_main.flow_hash_seed = 0xdeadbeef;
+
+  /* Default hop limit for packets we generate. */
+  ip6_main.host_config.ttl = 64;
+
+  return /* no error */ 0;
+}
+
+VLIB_INIT_FUNCTION (ip6_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip6_neighbor.c b/src/vnet/ip/ip6_neighbor.c
new file mode 100644
index 00000000..5a1c9e86
--- /dev/null
+++ b/src/vnet/ip/ip6_neighbor.c
@@ -0,0 +1,4088 @@
+/*
+ * ip/ip6_neighbor.c: IP6 neighbor handling
+ *
+ * Copyright (c) 2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/ip/ip.h>
+#include <vnet/ip/ip6_neighbor.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vppinfra/mhash.h>
+#include <vppinfra/md5.h>
+#include <vnet/adj/adj.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/ip6_fib.h>
+
+/**
+ * @file
+ * @brief IPv6 Neighbor Adjacency and Neighbor Discovery.
+ *
+ * The files contains the API and CLI code for managing IPv6 neighbor
+ * adjacency tables and neighbor discovery logic.
+ */
+
+/* can't use sizeof link_layer_address, that's 8 */
+#define ETHER_MAC_ADDR_LEN 6
+
+/* advertised prefix option */
+typedef struct
+{
+  /* basic advertised information */
+  ip6_address_t prefix;
+  u8 prefix_len;
+  int adv_on_link_flag;
+  int adv_autonomous_flag;
+  u32 adv_valid_lifetime_in_secs;
+  u32 adv_pref_lifetime_in_secs;
+
+  /* advertised values are computed from these times if decrementing */
+  f64 valid_lifetime_expires;
+  f64 pref_lifetime_expires;
+
+  /* local information */
+  int enabled;
+  int deprecated_prefix_flag;
+  int decrement_lifetime_flag;
+
+#define MIN_ADV_VALID_LIFETIME 7203	/* seconds */
+#define DEF_ADV_VALID_LIFETIME  2592000
+#define DEF_ADV_PREF_LIFETIME 604800
+
+  /* extensions are added here, mobile, DNS etc.. */
+} ip6_radv_prefix_t;
+
+
+typedef struct
+{
+  /* group information */
+  u8 type;
+  ip6_address_t mcast_address;
+  u16 num_sources;
+  ip6_address_t *mcast_source_address_pool;
+} ip6_mldp_group_t;
+
+/* configured router advertisement information per ipv6 interface */
+typedef struct
+{
+
+  /* advertised config information, zero means unspecified  */
+  u8 curr_hop_limit;
+  int adv_managed_flag;
+  int adv_other_flag;
+  u16 adv_router_lifetime_in_sec;
+  u32 adv_neighbor_reachable_time_in_msec;
+  u32 adv_time_in_msec_between_retransmitted_neighbor_solicitations;
+
+  /* mtu option */
+  u32 adv_link_mtu;
+
+  /* source link layer option */
+  u8 link_layer_address[8];
+  u8 link_layer_addr_len;
+
+  /* prefix option */
+  ip6_radv_prefix_t *adv_prefixes_pool;
+
+  /* Hash table mapping address to index in interface advertised  prefix pool. */
+  mhash_t address_to_prefix_index;
+
+  /* MLDP  group information */
+  ip6_mldp_group_t *mldp_group_pool;
+
+  /* Hash table mapping address to index in mldp address pool. */
+  mhash_t address_to_mldp_index;
+
+  /* local information */
+  u32 sw_if_index;
+  u32 fib_index;
+  int send_radv;		/* radv on/off on this interface -  set by config */
+  int cease_radv;		/* we are ceasing  to send  - set byf config */
+  int send_unicast;
+  int adv_link_layer_address;
+  int prefix_option;
+  int failed_device_check;
+  int all_routers_mcast;
+  u32 seed;
+  u64 randomizer;
+  int ref_count;
+  adj_index_t all_nodes_adj_index;
+  adj_index_t all_routers_adj_index;
+  adj_index_t all_mldv2_routers_adj_index;
+
+  /* timing information */
+#define DEF_MAX_RADV_INTERVAL 200
+#define DEF_MIN_RADV_INTERVAL .75 * DEF_MAX_RADV_INTERVAL
+#define DEF_CURR_HOP_LIMIT  64
+#define DEF_DEF_RTR_LIFETIME   3 * DEF_MAX_RADV_INTERVAL
+#define MAX_DEF_RTR_LIFETIME   9000
+
+#define MAX_INITIAL_RTR_ADVERT_INTERVAL   16	/* seconds */
+#define MAX_INITIAL_RTR_ADVERTISEMENTS        3	/*transmissions */
+#define MIN_DELAY_BETWEEN_RAS                              3	/* seconds */
+#define MAX_DELAY_BETWEEN_RAS                    1800	/* seconds */
+#define MAX_RA_DELAY_TIME                                          .5	/* seconds */
+
+  f64 max_radv_interval;
+  f64 min_radv_interval;
+  f64 min_delay_between_radv;
+  f64 max_delay_between_radv;
+  f64 max_rtr_default_lifetime;
+
+  f64 last_radv_time;
+  f64 last_multicast_time;
+  f64 next_multicast_time;
+
+
+  u32 initial_adverts_count;
+  f64 initial_adverts_interval;
+  u32 initial_adverts_sent;
+
+  /* stats */
+  u32 n_advertisements_sent;
+  u32 n_solicitations_rcvd;
+  u32 n_solicitations_dropped;
+
+  /* Link local address to use (defaults to underlying physical for logical interfaces */
+  ip6_address_t link_local_address;
+  u8 link_local_prefix_len;
+
+} ip6_radv_t;
+
+typedef struct
+{
+  u32 next_index;
+  uword node_index;
+  uword type_opaque;
+  uword data;
+  /* Used for nd event notification only */
+  void *data_callback;
+  u32 pid;
+} pending_resolution_t;
+
+
+typedef struct
+{
+  /* Hash tables mapping name to opcode. */
+  uword *opcode_by_name;
+
+  /* lite beer "glean" adjacency handling */
+  mhash_t pending_resolutions_by_address;
+  pending_resolution_t *pending_resolutions;
+
+  /* Mac address change notification */
+  mhash_t mac_changes_by_address;
+  pending_resolution_t *mac_changes;
+
+  u32 *neighbor_input_next_index_by_hw_if_index;
+
+  ip6_neighbor_t *neighbor_pool;
+
+  mhash_t neighbor_index_by_key;
+
+  u32 *if_radv_pool_index_by_sw_if_index;
+
+  ip6_radv_t *if_radv_pool;
+
+  /* Neighbor attack mitigation */
+  u32 limit_neighbor_cache_size;
+  u32 neighbor_delete_rotor;
+
+} ip6_neighbor_main_t;
+
+static ip6_neighbor_main_t ip6_neighbor_main;
+static ip6_address_t ip6a_zero;	/* ip6 address 0 */
+
+static u8 *
+format_ip6_neighbor_ip6_entry (u8 * s, va_list * va)
+{
+  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
+  ip6_neighbor_t *n = va_arg (*va, ip6_neighbor_t *);
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_sw_interface_t *si;
+  u8 *flags = 0;
+
+  if (!n)
+    return format (s, "%=12s%=20s%=6s%=20s%=40s", "Time", "Address", "Flags",
+		   "Link layer", "Interface");
+
+  if (n->flags & IP6_NEIGHBOR_FLAG_DYNAMIC)
+    flags = format (flags, "D");
+
+  if (n->flags & IP6_NEIGHBOR_FLAG_STATIC)
+    flags = format (flags, "S");
+
+  si = vnet_get_sw_interface (vnm, n->key.sw_if_index);
+  s = format (s, "%=12U%=20U%=6s%=20U%=40U",
+	      format_vlib_cpu_time, vm, n->cpu_time_last_updated,
+	      format_ip6_address, &n->key.ip6_address,
+	      flags ? (char *) flags : "",
+	      format_ethernet_address, n->link_layer_address,
+	      format_vnet_sw_interface_name, vnm, si);
+
+  vec_free (flags);
+  return s;
+}
+
+static clib_error_t *
+ip6_neighbor_sw_interface_up_down (vnet_main_t * vnm,
+				   u32 sw_if_index, u32 flags)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  ip6_neighbor_t *n;
+
+  if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
+    {
+      u32 i, *to_delete = 0;
+
+      /* *INDENT-OFF* */
+      pool_foreach (n, nm->neighbor_pool,
+      ({
+	if (n->key.sw_if_index == sw_if_index)
+	  vec_add1 (to_delete, n - nm->neighbor_pool);
+      }));
+      /* *INDENT-ON* */
+
+      for (i = 0; i < vec_len (to_delete); i++)
+	{
+	  n = pool_elt_at_index (nm->neighbor_pool, to_delete[i]);
+	  mhash_unset (&nm->neighbor_index_by_key, &n->key, 0);
+	  fib_table_entry_delete_index (n->fib_entry_index, FIB_SOURCE_ADJ);
+	  pool_put (nm->neighbor_pool, n);
+	}
+
+      vec_free (to_delete);
+    }
+
+  return 0;
+}
+
+VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (ip6_neighbor_sw_interface_up_down);
+
+static void
+unset_random_neighbor_entry (void)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  vlib_main_t *vm = vnm->vlib_main;
+  ip6_neighbor_t *e;
+  u32 index;
+
+  index = pool_next_index (nm->neighbor_pool, nm->neighbor_delete_rotor);
+  nm->neighbor_delete_rotor = index;
+
+  /* Try again from elt 0, could happen if an intfc goes down */
+  if (index == ~0)
+    {
+      index = pool_next_index (nm->neighbor_pool, nm->neighbor_delete_rotor);
+      nm->neighbor_delete_rotor = index;
+    }
+
+  /* Nothing left in the pool */
+  if (index == ~0)
+    return;
+
+  e = pool_elt_at_index (nm->neighbor_pool, index);
+
+  vnet_unset_ip6_ethernet_neighbor (vm, e->key.sw_if_index,
+				    &e->key.ip6_address,
+				    e->link_layer_address,
+				    ETHER_MAC_ADDR_LEN);
+}
+
+typedef struct
+{
+  u8 is_add;
+  u8 is_static;
+  u8 link_layer_address[6];
+  u32 sw_if_index;
+  ip6_address_t addr;
+} ip6_neighbor_set_unset_rpc_args_t;
+
+static void ip6_neighbor_set_unset_rpc_callback
+  (ip6_neighbor_set_unset_rpc_args_t * a);
+
+static void set_unset_ip6_neighbor_rpc
+  (vlib_main_t * vm,
+   u32 sw_if_index,
+   ip6_address_t * a, u8 * link_layer_addreess, int is_add, int is_static)
+{
+  ip6_neighbor_set_unset_rpc_args_t args;
+  void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
+
+  args.sw_if_index = sw_if_index;
+  args.is_add = is_add;
+  args.is_static = is_static;
+  clib_memcpy (&args.addr, a, sizeof (*a));
+  clib_memcpy (args.link_layer_address, link_layer_addreess, 6);
+
+  vl_api_rpc_call_main_thread (ip6_neighbor_set_unset_rpc_callback,
+			       (u8 *) & args, sizeof (args));
+}
+
+static void
+ip6_nbr_probe (ip_adjacency_t * adj)
+{
+  icmp6_neighbor_solicitation_header_t *h;
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_main_t *im = &ip6_main;
+  ip_interface_address_t *ia;
+  ip6_address_t *dst, *src;
+  vnet_hw_interface_t *hi;
+  vnet_sw_interface_t *si;
+  vlib_buffer_t *b;
+  int bogus_length;
+  vlib_main_t *vm;
+  u32 bi = 0;
+
+  vm = vlib_get_main ();
+
+  si = vnet_get_sw_interface (vnm, adj->rewrite_header.sw_if_index);
+  dst = &adj->sub_type.nbr.next_hop.ip6;
+
+  if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
+    {
+      return;
+    }
+  src = ip6_interface_address_matching_destination (im, dst,
+						    adj->rewrite_header.
+						    sw_if_index, &ia);
+  if (!src)
+    {
+      return;
+    }
+
+  h = vlib_packet_template_get_packet (vm,
+				       &im->discover_neighbor_packet_template,
+				       &bi);
+
+  hi = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index);
+
+  h->ip.dst_address.as_u8[13] = dst->as_u8[13];
+  h->ip.dst_address.as_u8[14] = dst->as_u8[14];
+  h->ip.dst_address.as_u8[15] = dst->as_u8[15];
+  h->ip.src_address = src[0];
+  h->neighbor.target_address = dst[0];
+
+  clib_memcpy (h->link_layer_option.ethernet_address,
+	       hi->hw_address, vec_len (hi->hw_address));
+
+  h->neighbor.icmp.checksum =
+    ip6_tcp_udp_icmp_compute_checksum (vm, 0, &h->ip, &bogus_length);
+  ASSERT (bogus_length == 0);
+
+  b = vlib_get_buffer (vm, bi);
+  vnet_buffer (b)->sw_if_index[VLIB_RX] =
+    vnet_buffer (b)->sw_if_index[VLIB_TX] = adj->rewrite_header.sw_if_index;
+
+  /* Add encapsulation string for software interface (e.g. ethernet header). */
+  vnet_rewrite_one_header (adj[0], h, sizeof (ethernet_header_t));
+  vlib_buffer_advance (b, -adj->rewrite_header.data_bytes);
+
+  {
+    vlib_frame_t *f = vlib_get_frame_to_node (vm, hi->output_node_index);
+    u32 *to_next = vlib_frame_vector_args (f);
+    to_next[0] = bi;
+    f->n_vectors = 1;
+    vlib_put_frame_to_node (vm, hi->output_node_index, f);
+  }
+}
+
+static void
+ip6_nd_mk_complete (adj_index_t ai, ip6_neighbor_t * nbr)
+{
+  adj_nbr_update_rewrite (ai, ADJ_NBR_REWRITE_FLAG_COMPLETE,
+			  ethernet_build_rewrite (vnet_get_main (),
+						  nbr->key.sw_if_index,
+						  adj_get_link_type (ai),
+						  nbr->link_layer_address));
+}
+
+static void
+ip6_nd_mk_incomplete (adj_index_t ai)
+{
+  ip_adjacency_t *adj = adj_get (ai);
+
+  adj_nbr_update_rewrite (ai,
+			  ADJ_NBR_REWRITE_FLAG_INCOMPLETE,
+			  ethernet_build_rewrite (vnet_get_main (),
+						  adj->rewrite_header.
+						  sw_if_index,
+						  adj_get_link_type (ai),
+						  VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST));
+}
+
+#define IP6_NBR_MK_KEY(k, sw_if_index, addr) \
+{					     \
+    k.sw_if_index = sw_if_index;	     \
+    k.ip6_address = *addr;		     \
+    k.pad = 0;				     \
+}
+
+static ip6_neighbor_t *
+ip6_nd_find (u32 sw_if_index, const ip6_address_t * addr)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  ip6_neighbor_t *n = NULL;
+  ip6_neighbor_key_t k;
+  uword *p;
+
+  IP6_NBR_MK_KEY (k, sw_if_index, addr);
+
+  p = mhash_get (&nm->neighbor_index_by_key, &k);
+  if (p)
+    {
+      n = pool_elt_at_index (nm->neighbor_pool, p[0]);
+    }
+
+  return (n);
+}
+
+static adj_walk_rc_t
+ip6_nd_mk_complete_walk (adj_index_t ai, void *ctx)
+{
+  ip6_neighbor_t *nbr = ctx;
+
+  ip6_nd_mk_complete (ai, nbr);
+
+  return (ADJ_WALK_RC_CONTINUE);
+}
+
+static adj_walk_rc_t
+ip6_nd_mk_incomplete_walk (adj_index_t ai, void *ctx)
+{
+  ip6_nd_mk_incomplete (ai);
+
+  return (ADJ_WALK_RC_CONTINUE);
+}
+
+void
+ip6_ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
+{
+  ip6_neighbor_t *nbr;
+  ip_adjacency_t *adj;
+
+  adj = adj_get (ai);
+
+  nbr = ip6_nd_find (sw_if_index, &adj->sub_type.nbr.next_hop.ip6);
+
+  if (NULL != nbr)
+    {
+      adj_nbr_walk_nh6 (sw_if_index, &nbr->key.ip6_address,
+			ip6_nd_mk_complete_walk, nbr);
+    }
+  else
+    {
+      /*
+       * no matching ND entry.
+       * construct the rewrite required to for an ND packet, and stick
+       * that in the adj's pipe to smoke.
+       */
+      adj_nbr_update_rewrite (ai,
+			      ADJ_NBR_REWRITE_FLAG_INCOMPLETE,
+			      ethernet_build_rewrite (vnm,
+						      sw_if_index,
+						      VNET_LINK_IP6,
+						      VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST));
+
+      /*
+       * since the FIB has added this adj for a route, it makes sense it may
+       * want to forward traffic sometime soon. Let's send a speculative ND.
+       * just one. If we were to do periodically that wouldn't be bad either,
+       * but that's more code than i'm prepared to write at this time for
+       * relatively little reward.
+       */
+      ip6_nbr_probe (adj);
+    }
+}
+
+int
+vnet_set_ip6_ethernet_neighbor (vlib_main_t * vm,
+				u32 sw_if_index,
+				ip6_address_t * a,
+				u8 * link_layer_address,
+				uword n_bytes_link_layer_address,
+				int is_static)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  ip6_neighbor_key_t k;
+  ip6_neighbor_t *n = 0;
+  int make_new_nd_cache_entry = 1;
+  uword *p;
+  u32 next_index;
+  pending_resolution_t *pr, *mc;
+
+  if (os_get_cpu_number ())
+    {
+      set_unset_ip6_neighbor_rpc (vm, sw_if_index, a, link_layer_address,
+				  1 /* set new neighbor */ , is_static);
+      return 0;
+    }
+
+  k.sw_if_index = sw_if_index;
+  k.ip6_address = a[0];
+  k.pad = 0;
+
+  p = mhash_get (&nm->neighbor_index_by_key, &k);
+  if (p)
+    {
+      n = pool_elt_at_index (nm->neighbor_pool, p[0]);
+      /* Refuse to over-write static neighbor entry. */
+      if (!is_static && (n->flags & IP6_NEIGHBOR_FLAG_STATIC))
+	return -2;
+      make_new_nd_cache_entry = 0;
+    }
+
+  if (make_new_nd_cache_entry)
+    {
+      fib_prefix_t pfx = {
+	.fp_len = 128,
+	.fp_proto = FIB_PROTOCOL_IP6,
+	.fp_addr = {
+		    .ip6 = k.ip6_address,
+		    }
+	,
+      };
+      u32 fib_index;
+
+      pool_get (nm->neighbor_pool, n);
+      mhash_set (&nm->neighbor_index_by_key, &k, n - nm->neighbor_pool,
+		 /* old value */ 0);
+      n->key = k;
+
+      clib_memcpy (n->link_layer_address,
+		   link_layer_address, n_bytes_link_layer_address);
+
+      /*
+       * create the adj-fib. the entry in the FIB table for and to the peer.
+       */
+      fib_index = ip6_main.fib_index_by_sw_if_index[n->key.sw_if_index];
+      n->fib_entry_index = fib_table_entry_update_one_path (fib_index, &pfx, FIB_SOURCE_ADJ, FIB_ENTRY_FLAG_NONE, FIB_PROTOCOL_IP6, &pfx.fp_addr, n->key.sw_if_index, ~0, 1, NULL,	// no label stack
+							    FIB_ROUTE_PATH_FLAG_NONE);
+    }
+  else
+    {
+      /*
+       * prevent a DoS attack from the data-plane that
+       * spams us with no-op updates to the MAC address
+       */
+      if (0 == memcmp (n->link_layer_address,
+		       link_layer_address, n_bytes_link_layer_address))
+	return -1;
+
+      clib_memcpy (n->link_layer_address,
+		   link_layer_address, n_bytes_link_layer_address);
+    }
+
+  /* Update time stamp and flags. */
+  n->cpu_time_last_updated = clib_cpu_time_now ();
+  if (is_static)
+    n->flags |= IP6_NEIGHBOR_FLAG_STATIC;
+  else
+    n->flags |= IP6_NEIGHBOR_FLAG_DYNAMIC;
+
+  adj_nbr_walk_nh6 (sw_if_index,
+		    &n->key.ip6_address, ip6_nd_mk_complete_walk, n);
+
+  /* Customer(s) waiting for this address to be resolved? */
+  p = mhash_get (&nm->pending_resolutions_by_address, a);
+  if (p)
+    {
+      next_index = p[0];
+
+      while (next_index != (u32) ~ 0)
+	{
+	  pr = pool_elt_at_index (nm->pending_resolutions, next_index);
+	  vlib_process_signal_event (vm, pr->node_index,
+				     pr->type_opaque, pr->data);
+	  next_index = pr->next_index;
+	  pool_put (nm->pending_resolutions, pr);
+	}
+
+      mhash_unset (&nm->pending_resolutions_by_address, a, 0);
+    }
+
+  /* Customer(s) requesting ND event for this address? */
+  p = mhash_get (&nm->mac_changes_by_address, a);
+  if (p)
+    {
+      next_index = p[0];
+
+      while (next_index != (u32) ~ 0)
+	{
+	  int (*fp) (u32, u8 *, u32, ip6_address_t *);
+	  int rv = 1;
+	  mc = pool_elt_at_index (nm->mac_changes, next_index);
+	  fp = mc->data_callback;
+
+	  /* Call the user's data callback, return 1 to suppress dup events */
+	  if (fp)
+	    rv =
+	      (*fp) (mc->data, link_layer_address, sw_if_index, &ip6a_zero);
+	  /*
+	   * Signal the resolver process, as long as the user
+	   * says they want to be notified
+	   */
+	  if (rv == 0)
+	    vlib_process_signal_event (vm, mc->node_index,
+				       mc->type_opaque, mc->data);
+	  next_index = mc->next_index;
+	}
+    }
+
+  return 0;
+}
+
+int
+vnet_unset_ip6_ethernet_neighbor (vlib_main_t * vm,
+				  u32 sw_if_index,
+				  ip6_address_t * a,
+				  u8 * link_layer_address,
+				  uword n_bytes_link_layer_address)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  ip6_neighbor_key_t k;
+  ip6_neighbor_t *n;
+  uword *p;
+  int rv = 0;
+
+  if (os_get_cpu_number ())
+    {
+      set_unset_ip6_neighbor_rpc (vm, sw_if_index, a, link_layer_address,
+				  0 /* unset */ , 0);
+      return 0;
+    }
+
+  k.sw_if_index = sw_if_index;
+  k.ip6_address = a[0];
+  k.pad = 0;
+
+  p = mhash_get (&nm->neighbor_index_by_key, &k);
+  if (p == 0)
+    {
+      rv = -1;
+      goto out;
+    }
+
+  n = pool_elt_at_index (nm->neighbor_pool, p[0]);
+  mhash_unset (&nm->neighbor_index_by_key, &n->key, 0);
+
+  adj_nbr_walk_nh6 (sw_if_index,
+		    &n->key.ip6_address, ip6_nd_mk_incomplete_walk, NULL);
+
+  fib_table_entry_delete_index (n->fib_entry_index, FIB_SOURCE_ADJ);
+  pool_put (nm->neighbor_pool, n);
+
+out:
+  return rv;
+}
+
+static void ip6_neighbor_set_unset_rpc_callback
+  (ip6_neighbor_set_unset_rpc_args_t * a)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  if (a->is_add)
+    vnet_set_ip6_ethernet_neighbor (vm, a->sw_if_index, &a->addr,
+				    a->link_layer_address, 6, a->is_static);
+  else
+    vnet_unset_ip6_ethernet_neighbor (vm, a->sw_if_index, &a->addr,
+				      a->link_layer_address, 6);
+}
+
+static int
+ip6_neighbor_sort (void *a1, void *a2)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_neighbor_t *n1 = a1, *n2 = a2;
+  int cmp;
+  cmp = vnet_sw_interface_compare (vnm, n1->key.sw_if_index,
+				   n2->key.sw_if_index);
+  if (!cmp)
+    cmp = ip6_address_compare (&n1->key.ip6_address, &n2->key.ip6_address);
+  return cmp;
+}
+
+ip6_neighbor_t *
+ip6_neighbors_entries (u32 sw_if_index)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  ip6_neighbor_t *n, *ns = 0;
+
+  /* *INDENT-OFF* */
+  pool_foreach (n, nm->neighbor_pool,
+  ({
+    if (sw_if_index != ~0 && n->key.sw_if_index != sw_if_index)
+      continue;
+    vec_add1 (ns, n[0]);
+  }));
+  /* *INDENT-ON* */
+
+  if (ns)
+    vec_sort_with_function (ns, ip6_neighbor_sort);
+  return ns;
+}
+
+static clib_error_t *
+show_ip6_neighbors (vlib_main_t * vm,
+		    unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_neighbor_t *n, *ns;
+  clib_error_t *error = 0;
+  u32 sw_if_index;
+
+  /* Filter entries by interface if given. */
+  sw_if_index = ~0;
+  (void) unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index);
+
+  ns = ip6_neighbors_entries (sw_if_index);
+  if (ns)
+    {
+      vlib_cli_output (vm, "%U", format_ip6_neighbor_ip6_entry, vm, 0);
+      vec_foreach (n, ns)
+      {
+	vlib_cli_output (vm, "%U", format_ip6_neighbor_ip6_entry, vm, n);
+      }
+      vec_free (ns);
+    }
+
+  return error;
+}
+
+/*?
+ * This command is used to display the adjacent IPv6 hosts found via
+ * neighbor discovery. Optionally, limit the output to the specified
+ * interface.
+ *
+ * @cliexpar
+ * Example of how to display the IPv6 neighbor adjacency table:
+ * @cliexstart{show ip6 neighbors}
+ *     Time           Address       Flags     Link layer                     Interface
+ *      34.0910     ::a:1:1:0:7            02:fe:6a:07:39:6f                GigabitEthernet2/0/0
+ *     173.2916     ::b:5:1:c:2            02:fe:50:62:3a:94                GigabitEthernet2/0/0
+ *     886.6654     ::1:1:c:0:9       S    02:fe:e4:45:27:5b                GigabitEthernet3/0/0
+ * @cliexend
+ * Example of how to display the IPv6 neighbor adjacency table for given interface:
+ * @cliexstart{show ip6 neighbors GigabitEthernet2/0/0}
+ *     Time           Address       Flags     Link layer                     Interface
+ *      34.0910     ::a:1:1:0:7            02:fe:6a:07:39:6f                GigabitEthernet2/0/0
+ *     173.2916     ::b:5:1:c:2            02:fe:50:62:3a:94                GigabitEthernet2/0/0
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_ip6_neighbors_command, static) = {
+  .path = "show ip6 neighbors",
+  .function = show_ip6_neighbors,
+  .short_help = "show ip6 neighbors [<interface>]",
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_ip6_neighbor (vlib_main_t * vm,
+		  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_address_t addr;
+  u8 mac_address[6];
+  int addr_valid = 0;
+  int is_del = 0;
+  int is_static = 0;
+  u32 sw_if_index;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      /* intfc, ip6-address, mac-address */
+      if (unformat (input, "%U %U %U",
+		    unformat_vnet_sw_interface, vnm, &sw_if_index,
+		    unformat_ip6_address, &addr,
+		    unformat_ethernet_address, mac_address))
+	addr_valid = 1;
+
+      else if (unformat (input, "delete") || unformat (input, "del"))
+	is_del = 1;
+      else if (unformat (input, "static"))
+	is_static = 1;
+      else
+	break;
+    }
+
+  if (!addr_valid)
+    return clib_error_return (0, "Missing interface, ip6 or hw address");
+
+  if (!is_del)
+    vnet_set_ip6_ethernet_neighbor (vm, sw_if_index, &addr,
+				    mac_address, sizeof (mac_address),
+				    is_static);
+  else
+    vnet_unset_ip6_ethernet_neighbor (vm, sw_if_index, &addr,
+				      mac_address, sizeof (mac_address));
+  return 0;
+}
+
+/*?
+ * This command is used to manually add an entry to the IPv6 neighbor
+ * adjacency table. Optionally, the entry can be added as static. It is
+ * also used to remove an entry from the table. Use the '<em>show ip6
+ * neighbors</em>' command to display all learned and manually entered entries.
+ *
+ * @cliexpar
+ * Example of how to add a static entry to the IPv6 neighbor adjacency table:
+ * @cliexcmd{set ip6 neighbor GigabitEthernet2/0/0 ::1:1:c:0:9 02:fe:e4:45:27:5b static}
+ * Example of how to delete an entry from the IPv6 neighbor adjacency table:
+ * @cliexcmd{set ip6 neighbor del GigabitEthernet2/0/0 ::1:1:c:0:9 02:fe:e4:45:27:5b}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_ip6_neighbor_command, static) =
+{
+  .path = "set ip6 neighbor",
+  .function = set_ip6_neighbor,
+  .short_help = "set ip6 neighbor [del] <interface> <ip6-address> <mac-address> [static]",
+};
+/* *INDENT-ON* */
+
+typedef enum
+{
+  ICMP6_NEIGHBOR_SOLICITATION_NEXT_DROP,
+  ICMP6_NEIGHBOR_SOLICITATION_NEXT_REPLY,
+  ICMP6_NEIGHBOR_SOLICITATION_N_NEXT,
+} icmp6_neighbor_solicitation_or_advertisement_next_t;
+
+static_always_inline uword
+icmp6_neighbor_solicitation_or_advertisement (vlib_main_t * vm,
+					      vlib_node_runtime_t * node,
+					      vlib_frame_t * frame,
+					      uword is_solicitation)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_main_t *im = &ip6_main;
+  uword n_packets = frame->n_vectors;
+  u32 *from, *to_next;
+  u32 n_left_from, n_left_to_next, next_index, n_advertisements_sent;
+  icmp6_neighbor_discovery_option_type_t option_type;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip6_icmp_input_node.index);
+  int bogus_length;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = n_packets;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+				   /* stride */ 1,
+				   sizeof (icmp6_input_trace_t));
+
+  option_type =
+    (is_solicitation
+     ? ICMP6_NEIGHBOR_DISCOVERY_OPTION_source_link_layer_address
+     : ICMP6_NEIGHBOR_DISCOVERY_OPTION_target_link_layer_address);
+  n_advertisements_sent = 0;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip6_header_t *ip0;
+	  icmp6_neighbor_solicitation_or_advertisement_header_t *h0;
+	  icmp6_neighbor_discovery_ethernet_link_layer_address_option_t *o0;
+	  u32 bi0, options_len0, sw_if_index0, next0, error0;
+	  u32 ip6_sadd_link_local, ip6_sadd_unspecified;
+	  int is_rewrite0;
+	  u32 ni0;
+
+	  bi0 = to_next[0] = from[0];
+
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, bi0);
+	  ip0 = vlib_buffer_get_current (p0);
+	  h0 = ip6_next_header (ip0);
+	  options_len0 =
+	    clib_net_to_host_u16 (ip0->payload_length) - sizeof (h0[0]);
+
+	  error0 = ICMP6_ERROR_NONE;
+	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
+	  ip6_sadd_link_local =
+	    ip6_address_is_link_local_unicast (&ip0->src_address);
+	  ip6_sadd_unspecified =
+	    ip6_address_is_unspecified (&ip0->src_address);
+
+	  /* Check that source address is unspecified, link-local or else on-link. */
+	  if (!ip6_sadd_unspecified && !ip6_sadd_link_local)
+	    {
+	      u32 src_adj_index0 = ip6_src_lookup_for_packet (im, p0, ip0);
+
+	      if (ADJ_INDEX_INVALID != src_adj_index0)
+		{
+		  ip_adjacency_t *adj0 =
+		    ip_get_adjacency (&im->lookup_main, src_adj_index0);
+
+		  /* Allow all realistic-looking rewrite adjacencies to pass */
+		  ni0 = adj0->lookup_next_index;
+		  is_rewrite0 = (ni0 >= IP_LOOKUP_NEXT_ARP) &&
+		    (ni0 < IP6_LOOKUP_N_NEXT);
+
+		  error0 = ((adj0->rewrite_header.sw_if_index != sw_if_index0
+			     || !is_rewrite0)
+			    ?
+			    ICMP6_ERROR_NEIGHBOR_SOLICITATION_SOURCE_NOT_ON_LINK
+			    : error0);
+		}
+	      else
+		{
+		  error0 =
+		    ICMP6_ERROR_NEIGHBOR_SOLICITATION_SOURCE_NOT_ON_LINK;
+		}
+	    }
+
+	  o0 = (void *) (h0 + 1);
+	  o0 = ((options_len0 == 8 && o0->header.type == option_type
+		 && o0->header.n_data_u64s == 1) ? o0 : 0);
+
+	  /* If src address unspecified or link local, donot learn neighbor MAC */
+	  if (PREDICT_TRUE (error0 == ICMP6_ERROR_NONE && o0 != 0 &&
+			    !ip6_sadd_unspecified && !ip6_sadd_link_local))
+	    {
+	      ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+	      if (nm->limit_neighbor_cache_size &&
+		  pool_elts (nm->neighbor_pool) >=
+		  nm->limit_neighbor_cache_size)
+		unset_random_neighbor_entry ();
+	      vnet_set_ip6_ethernet_neighbor (vm, sw_if_index0,
+					      is_solicitation ?
+					      &ip0->src_address :
+					      &h0->target_address,
+					      o0->ethernet_address,
+					      sizeof (o0->ethernet_address),
+					      0);
+	    }
+
+	  if (is_solicitation && error0 == ICMP6_ERROR_NONE)
+	    {
+	      /* Check that target address is local to this router. */
+	      fib_node_index_t fei;
+	      u32 fib_index;
+
+	      fib_index =
+		ip6_fib_table_get_index_for_sw_if_index (sw_if_index0);
+
+	      if (~0 == fib_index)
+		{
+		  error0 = ICMP6_ERROR_NEIGHBOR_SOLICITATION_SOURCE_UNKNOWN;
+		}
+	      else
+		{
+		  fei = ip6_fib_table_lookup_exact_match (fib_index,
+							  &h0->target_address,
+							  128);
+
+		  if (FIB_NODE_INDEX_INVALID == fei ||
+		      !(FIB_ENTRY_FLAG_LOCAL &
+			fib_entry_get_flags_for_source (fei,
+							FIB_SOURCE_INTERFACE)))
+		    {
+		      error0 =
+			ICMP6_ERROR_NEIGHBOR_SOLICITATION_SOURCE_UNKNOWN;
+		    }
+		}
+	    }
+
+	  if (is_solicitation)
+	    next0 = (error0 != ICMP6_ERROR_NONE
+		     ? ICMP6_NEIGHBOR_SOLICITATION_NEXT_DROP
+		     : ICMP6_NEIGHBOR_SOLICITATION_NEXT_REPLY);
+	  else
+	    {
+	      next0 = 0;
+	      error0 = error0 == ICMP6_ERROR_NONE ?
+		ICMP6_ERROR_NEIGHBOR_ADVERTISEMENTS_RX : error0;
+	    }
+
+	  if (is_solicitation && error0 == ICMP6_ERROR_NONE)
+	    {
+	      vnet_sw_interface_t *sw_if0;
+	      ethernet_interface_t *eth_if0;
+	      ethernet_header_t *eth0;
+
+	      /* dst address is either source address or the all-nodes mcast addr */
+	      if (!ip6_sadd_unspecified)
+		ip0->dst_address = ip0->src_address;
+	      else
+		ip6_set_reserved_multicast_address (&ip0->dst_address,
+						    IP6_MULTICAST_SCOPE_link_local,
+						    IP6_MULTICAST_GROUP_ID_all_hosts);
+
+	      ip0->src_address = h0->target_address;
+	      ip0->hop_limit = 255;
+	      h0->icmp.type = ICMP6_neighbor_advertisement;
+
+	      sw_if0 = vnet_get_sup_sw_interface (vnm, sw_if_index0);
+	      ASSERT (sw_if0->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
+	      eth_if0 =
+		ethernet_get_interface (&ethernet_main, sw_if0->hw_if_index);
+	      if (eth_if0 && o0)
+		{
+		  clib_memcpy (o0->ethernet_address, eth_if0->address, 6);
+		  o0->header.type =
+		    ICMP6_NEIGHBOR_DISCOVERY_OPTION_target_link_layer_address;
+		}
+
+	      h0->advertisement_flags = clib_host_to_net_u32
+		(ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_SOLICITED
+		 | ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_OVERRIDE);
+
+	      h0->icmp.checksum = 0;
+	      h0->icmp.checksum =
+		ip6_tcp_udp_icmp_compute_checksum (vm, p0, ip0,
+						   &bogus_length);
+	      ASSERT (bogus_length == 0);
+
+	      /* Reuse current MAC header, copy SMAC to DMAC and
+	       * interface MAC to SMAC */
+	      vlib_buffer_advance (p0, -ethernet_buffer_header_size (p0));
+	      eth0 = vlib_buffer_get_current (p0);
+	      clib_memcpy (eth0->dst_address, eth0->src_address, 6);
+	      if (eth_if0)
+		clib_memcpy (eth0->src_address, eth_if0->address, 6);
+
+	      /* Setup input and output sw_if_index for packet */
+	      ASSERT (vnet_buffer (p0)->sw_if_index[VLIB_RX] == sw_if_index0);
+	      vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0;
+	      vnet_buffer (p0)->sw_if_index[VLIB_RX] =
+		vnet_main.local_interface_sw_if_index;
+
+	      n_advertisements_sent++;
+	    }
+
+	  p0->error = error_node->errors[error0];
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  /* Account for advertisements sent. */
+  vlib_error_count (vm, error_node->node_index,
+		    ICMP6_ERROR_NEIGHBOR_ADVERTISEMENTS_TX,
+		    n_advertisements_sent);
+
+  return frame->n_vectors;
+}
+
+/* for "syslogging" - use elog for now */
+#define foreach_log_level	     \
+  _ (DEBUG, "DEBUG")                         \
+  _ (INFO, "INFORMATION")	     \
+  _ (NOTICE, "NOTICE")		     \
+  _ (WARNING, "WARNING")	     \
+  _ (ERR, "ERROR")				      \
+  _ (CRIT, "CRITICAL")			      \
+  _ (ALERT, "ALERT")			      \
+  _ (EMERG,  "EMERGENCY")
+
+typedef enum
+{
+#define _(f,s) LOG_##f,
+  foreach_log_level
+#undef _
+} log_level_t;
+
+static char *log_level_strings[] = {
+#define _(f,s) s,
+  foreach_log_level
+#undef _
+};
+
+static int logmask = 1 << LOG_DEBUG;
+
+static void
+ip6_neighbor_syslog (vlib_main_t * vm, int priority, char *fmt, ...)
+{
+  /* just use elog for now */
+  u8 *what;
+  va_list va;
+
+  if ((priority > LOG_EMERG) || !(logmask & (1 << priority)))
+    return;
+
+  va_start (va, fmt);
+  if (fmt)
+    {
+      what = va_format (0, fmt, &va);
+
+      ELOG_TYPE_DECLARE (e) =
+      {
+      .format = "ip6 nd:  (%s): %s",.format_args = "T4T4",};
+      struct
+      {
+	u32 s[2];
+      } *ed;
+      ed = ELOG_DATA (&vm->elog_main, e);
+      ed->s[0] = elog_string (&vm->elog_main, log_level_strings[priority]);
+      ed->s[1] = elog_string (&vm->elog_main, (char *) what);
+    }
+  va_end (va);
+  return;
+}
+
+/* ipv6 neighbor discovery - router advertisements */
+typedef enum
+{
+  ICMP6_ROUTER_SOLICITATION_NEXT_DROP,
+  ICMP6_ROUTER_SOLICITATION_NEXT_REPLY_RW,
+  ICMP6_ROUTER_SOLICITATION_NEXT_REPLY_TX,
+  ICMP6_ROUTER_SOLICITATION_N_NEXT,
+} icmp6_router_solicitation_or_advertisement_next_t;
+
+static_always_inline uword
+icmp6_router_solicitation (vlib_main_t * vm,
+			   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_main_t *im = &ip6_main;
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  uword n_packets = frame->n_vectors;
+  u32 *from, *to_next;
+  u32 n_left_from, n_left_to_next, next_index;
+  u32 n_advertisements_sent = 0;
+  int bogus_length;
+
+  icmp6_neighbor_discovery_option_type_t option_type;
+
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip6_icmp_input_node.index);
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = n_packets;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+				   /* stride */ 1,
+				   sizeof (icmp6_input_trace_t));
+
+  /* source may append his LL address */
+  option_type = ICMP6_NEIGHBOR_DISCOVERY_OPTION_source_link_layer_address;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip6_header_t *ip0;
+	  ip6_radv_t *radv_info = 0;
+
+	  icmp6_neighbor_discovery_header_t *h0;
+	  icmp6_neighbor_discovery_ethernet_link_layer_address_option_t *o0;
+
+	  u32 bi0, options_len0, sw_if_index0, next0, error0;
+	  u32 is_solicitation = 1, is_dropped = 0;
+	  u32 is_unspecified, is_link_local;
+
+	  bi0 = to_next[0] = from[0];
+
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, bi0);
+	  ip0 = vlib_buffer_get_current (p0);
+	  h0 = ip6_next_header (ip0);
+	  options_len0 =
+	    clib_net_to_host_u16 (ip0->payload_length) - sizeof (h0[0]);
+	  is_unspecified = ip6_address_is_unspecified (&ip0->src_address);
+	  is_link_local =
+	    ip6_address_is_link_local_unicast (&ip0->src_address);
+
+	  error0 = ICMP6_ERROR_NONE;
+	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
+
+	  /* check if solicitation  (not from nd_timer node) */
+	  if (ip6_address_is_unspecified (&ip0->dst_address))
+	    is_solicitation = 0;
+
+	  /* Check that source address is unspecified, link-local or else on-link. */
+	  if (!is_unspecified && !is_link_local)
+	    {
+	      u32 src_adj_index0 = ip6_src_lookup_for_packet (im, p0, ip0);
+
+	      if (ADJ_INDEX_INVALID != src_adj_index0)
+		{
+		  ip_adjacency_t *adj0 = ip_get_adjacency (&im->lookup_main,
+							   src_adj_index0);
+
+		  error0 = (adj0->rewrite_header.sw_if_index != sw_if_index0
+			    ?
+			    ICMP6_ERROR_ROUTER_SOLICITATION_SOURCE_NOT_ON_LINK
+			    : error0);
+		}
+	      else
+		{
+		  error0 = ICMP6_ERROR_ROUTER_SOLICITATION_SOURCE_NOT_ON_LINK;
+		}
+	    }
+
+	  /* check for source LL option and process */
+	  o0 = (void *) (h0 + 1);
+	  o0 = ((options_len0 == 8
+		 && o0->header.type == option_type
+		 && o0->header.n_data_u64s == 1) ? o0 : 0);
+
+	  /* if src address unspecified IGNORE any options */
+	  if (PREDICT_TRUE (error0 == ICMP6_ERROR_NONE && o0 != 0 &&
+			    !is_unspecified && !is_link_local))
+	    {
+	      ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+	      if (nm->limit_neighbor_cache_size &&
+		  pool_elts (nm->neighbor_pool) >=
+		  nm->limit_neighbor_cache_size)
+		unset_random_neighbor_entry ();
+
+	      vnet_set_ip6_ethernet_neighbor (vm, sw_if_index0,
+					      &ip0->src_address,
+					      o0->ethernet_address,
+					      sizeof (o0->ethernet_address),
+					      0);
+	    }
+
+	  /* default is to drop */
+	  next0 = ICMP6_ROUTER_SOLICITATION_NEXT_DROP;
+
+	  if (error0 == ICMP6_ERROR_NONE)
+	    {
+	      vnet_sw_interface_t *sw_if0;
+	      ethernet_interface_t *eth_if0;
+	      u32 adj_index0;
+
+	      sw_if0 = vnet_get_sup_sw_interface (vnm, sw_if_index0);
+	      ASSERT (sw_if0->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
+	      eth_if0 =
+		ethernet_get_interface (&ethernet_main, sw_if0->hw_if_index);
+
+	      /* only support ethernet interface type for now */
+	      error0 =
+		(!eth_if0) ? ICMP6_ERROR_ROUTER_SOLICITATION_UNSUPPORTED_INTF
+		: error0;
+
+	      if (error0 == ICMP6_ERROR_NONE)
+		{
+		  u32 ri;
+
+		  /* adjust the sizeof the buffer to just include the ipv6 header */
+		  p0->current_length -=
+		    (options_len0 +
+		     sizeof (icmp6_neighbor_discovery_header_t));
+
+		  /* look up the radv_t information for this interface */
+		  vec_validate_init_empty
+		    (nm->if_radv_pool_index_by_sw_if_index, sw_if_index0, ~0);
+
+		  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index0];
+
+		  if (ri != ~0)
+		    radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
+
+		  error0 =
+		    ((!radv_info) ?
+		     ICMP6_ERROR_ROUTER_SOLICITATION_RADV_NOT_CONFIG :
+		     error0);
+
+		  if (error0 == ICMP6_ERROR_NONE)
+		    {
+		      f64 now = vlib_time_now (vm);
+
+		      /* for solicited adverts - need to rate limit */
+		      if (is_solicitation)
+			{
+			  if ((now - radv_info->last_radv_time) <
+			      MIN_DELAY_BETWEEN_RAS)
+			    is_dropped = 1;
+			  else
+			    radv_info->last_radv_time = now;
+			}
+
+		      /* send now  */
+		      icmp6_router_advertisement_header_t rh;
+
+		      rh.icmp.type = ICMP6_router_advertisement;
+		      rh.icmp.code = 0;
+		      rh.icmp.checksum = 0;
+
+		      rh.current_hop_limit = radv_info->curr_hop_limit;
+		      rh.router_lifetime_in_sec =
+			clib_host_to_net_u16
+			(radv_info->adv_router_lifetime_in_sec);
+		      rh.
+			time_in_msec_between_retransmitted_neighbor_solicitations
+			=
+			clib_host_to_net_u32 (radv_info->
+					      adv_time_in_msec_between_retransmitted_neighbor_solicitations);
+		      rh.neighbor_reachable_time_in_msec =
+			clib_host_to_net_u32 (radv_info->
+					      adv_neighbor_reachable_time_in_msec);
+
+		      rh.flags =
+			(radv_info->adv_managed_flag) ?
+			ICMP6_ROUTER_DISCOVERY_FLAG_ADDRESS_CONFIG_VIA_DHCP :
+			0;
+		      rh.flags |=
+			((radv_info->adv_other_flag) ?
+			 ICMP6_ROUTER_DISCOVERY_FLAG_OTHER_CONFIG_VIA_DHCP :
+			 0);
+
+
+		      u16 payload_length =
+			sizeof (icmp6_router_advertisement_header_t);
+
+		      vlib_buffer_add_data (vm,
+					    p0->free_list_index,
+					    bi0,
+					    (void *) &rh,
+					    sizeof
+					    (icmp6_router_advertisement_header_t));
+
+		      if (radv_info->adv_link_layer_address)
+			{
+			  icmp6_neighbor_discovery_ethernet_link_layer_address_option_t
+			    h;
+
+			  h.header.type =
+			    ICMP6_NEIGHBOR_DISCOVERY_OPTION_source_link_layer_address;
+			  h.header.n_data_u64s = 1;
+
+			  /* copy ll address */
+			  clib_memcpy (&h.ethernet_address[0],
+				       eth_if0->address, 6);
+
+			  vlib_buffer_add_data (vm,
+						p0->free_list_index,
+						bi0,
+						(void *) &h,
+						sizeof
+						(icmp6_neighbor_discovery_ethernet_link_layer_address_option_t));
+
+			  payload_length +=
+			    sizeof
+			    (icmp6_neighbor_discovery_ethernet_link_layer_address_option_t);
+			}
+
+		      /* add MTU option */
+		      if (radv_info->adv_link_mtu)
+			{
+			  icmp6_neighbor_discovery_mtu_option_t h;
+
+			  h.unused = 0;
+			  h.mtu =
+			    clib_host_to_net_u32 (radv_info->adv_link_mtu);
+			  h.header.type = ICMP6_NEIGHBOR_DISCOVERY_OPTION_mtu;
+			  h.header.n_data_u64s = 1;
+
+			  payload_length +=
+			    sizeof (icmp6_neighbor_discovery_mtu_option_t);
+
+			  vlib_buffer_add_data (vm,
+						p0->free_list_index,
+						bi0,
+						(void *) &h,
+						sizeof
+						(icmp6_neighbor_discovery_mtu_option_t));
+			}
+
+		      /* add advertised prefix options  */
+		      ip6_radv_prefix_t *pr_info;
+
+		      /* *INDENT-OFF* */
+		      pool_foreach (pr_info, radv_info->adv_prefixes_pool,
+                      ({
+                        if(pr_info->enabled &&
+                           (!pr_info->decrement_lifetime_flag
+                            || (pr_info->pref_lifetime_expires >0)))
+                          {
+                            /* advertise this prefix */
+                            icmp6_neighbor_discovery_prefix_information_option_t h;
+
+                            h.header.type = ICMP6_NEIGHBOR_DISCOVERY_OPTION_prefix_information;
+                            h.header.n_data_u64s  =  (sizeof(icmp6_neighbor_discovery_prefix_information_option_t) >> 3);
+
+                            h.dst_address_length  = pr_info->prefix_len;
+
+                            h.flags  = (pr_info->adv_on_link_flag) ? ICMP6_NEIGHBOR_DISCOVERY_PREFIX_INFORMATION_FLAG_ON_LINK : 0;
+                            h.flags |= (pr_info->adv_autonomous_flag) ?  ICMP6_NEIGHBOR_DISCOVERY_PREFIX_INFORMATION_AUTO :  0;
+
+                            if(radv_info->cease_radv && pr_info->deprecated_prefix_flag)
+                              {
+                                h.valid_time = clib_host_to_net_u32(MIN_ADV_VALID_LIFETIME);
+                                h.preferred_time  = 0;
+                              }
+                            else
+                              {
+                                if(pr_info->decrement_lifetime_flag)
+                                  {
+                                    pr_info->adv_valid_lifetime_in_secs = ((pr_info->valid_lifetime_expires  > now)) ?
+                                      (pr_info->valid_lifetime_expires  - now) : 0;
+
+                                    pr_info->adv_pref_lifetime_in_secs = ((pr_info->pref_lifetime_expires  > now)) ?
+                                      (pr_info->pref_lifetime_expires  - now) : 0;
+                                  }
+
+                                h.valid_time = clib_host_to_net_u32(pr_info->adv_valid_lifetime_in_secs);
+                                h.preferred_time  = clib_host_to_net_u32(pr_info->adv_pref_lifetime_in_secs) ;
+                              }
+                            h.unused  = 0;
+
+                            clib_memcpy(&h.dst_address, &pr_info->prefix,  sizeof(ip6_address_t));
+
+                            payload_length += sizeof( icmp6_neighbor_discovery_prefix_information_option_t);
+
+                            vlib_buffer_add_data (vm,
+                                                  p0->free_list_index,
+                                                  bi0,
+                                                  (void *)&h, sizeof(icmp6_neighbor_discovery_prefix_information_option_t));
+
+                          }
+                      }));
+		      /* *INDENT-ON* */
+
+		      /* add additional options before here */
+
+		      /* finish building the router advertisement... */
+		      if (!is_unspecified && radv_info->send_unicast)
+			{
+			  ip0->dst_address = ip0->src_address;
+			}
+		      else
+			{
+			  /* target address is all-nodes mcast addr */
+			  ip6_set_reserved_multicast_address
+			    (&ip0->dst_address,
+			     IP6_MULTICAST_SCOPE_link_local,
+			     IP6_MULTICAST_GROUP_ID_all_hosts);
+			}
+
+		      /* source address MUST be the link-local address */
+		      ip0->src_address = radv_info->link_local_address;
+
+		      ip0->hop_limit = 255;
+		      ip0->payload_length =
+			clib_host_to_net_u16 (payload_length);
+
+		      icmp6_router_advertisement_header_t *rh0 =
+			(icmp6_router_advertisement_header_t *) (ip0 + 1);
+		      rh0->icmp.checksum =
+			ip6_tcp_udp_icmp_compute_checksum (vm, p0, ip0,
+							   &bogus_length);
+		      ASSERT (bogus_length == 0);
+
+		      /* setup output if and adjacency */
+		      vnet_buffer (p0)->sw_if_index[VLIB_RX] =
+			vnet_main.local_interface_sw_if_index;
+
+		      if (is_solicitation)
+			{
+			  ethernet_header_t *eth0;
+			  /* Reuse current MAC header, copy SMAC to DMAC and
+			   * interface MAC to SMAC */
+			  vlib_buffer_reset (p0);
+			  eth0 = vlib_buffer_get_current (p0);
+			  clib_memcpy (eth0->dst_address, eth0->src_address,
+				       6);
+			  clib_memcpy (eth0->src_address, eth_if0->address,
+				       6);
+			  next0 =
+			    is_dropped ? next0 :
+			    ICMP6_ROUTER_SOLICITATION_NEXT_REPLY_TX;
+			  vnet_buffer (p0)->sw_if_index[VLIB_TX] =
+			    sw_if_index0;
+			}
+		      else
+			{
+			  adj_index0 = radv_info->all_nodes_adj_index;
+			  if (adj_index0 == 0)
+			    error0 = ICMP6_ERROR_DST_LOOKUP_MISS;
+			  else
+			    {
+			      ip_adjacency_t *adj0 =
+				ip_get_adjacency (&im->lookup_main,
+						  adj_index0);
+			      error0 =
+				((adj0->rewrite_header.sw_if_index !=
+				  sw_if_index0
+				  || adj0->lookup_next_index !=
+				  IP_LOOKUP_NEXT_REWRITE) ?
+				 ICMP6_ERROR_ROUTER_SOLICITATION_DEST_UNKNOWN
+				 : error0);
+			      next0 =
+				is_dropped ? next0 :
+				ICMP6_ROUTER_SOLICITATION_NEXT_REPLY_RW;
+			      vnet_buffer (p0)->ip.adj_index[VLIB_TX] =
+				adj_index0;
+			    }
+			}
+		      p0->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
+
+		      radv_info->n_solicitations_dropped += is_dropped;
+		      radv_info->n_solicitations_rcvd += is_solicitation;
+
+		      if ((error0 == ICMP6_ERROR_NONE) && !is_dropped)
+			{
+			  radv_info->n_advertisements_sent++;
+			  n_advertisements_sent++;
+			}
+		    }
+		}
+	    }
+
+	  p0->error = error_node->errors[error0];
+
+	  if (error0 != ICMP6_ERROR_NONE)
+	    vlib_error_count (vm, error_node->node_index, error0, 1);
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  /* Account for router advertisements sent. */
+  vlib_error_count (vm, error_node->node_index,
+		    ICMP6_ERROR_ROUTER_ADVERTISEMENTS_TX,
+		    n_advertisements_sent);
+
+  return frame->n_vectors;
+}
+
+ /* validate advertised info for consistancy (see RFC-4861 section 6.2.7) - log any inconsistencies, packet will always  be dropped  */
+static_always_inline uword
+icmp6_router_advertisement (vlib_main_t * vm,
+			    vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  uword n_packets = frame->n_vectors;
+  u32 *from, *to_next;
+  u32 n_left_from, n_left_to_next, next_index;
+  u32 n_advertisements_rcvd = 0;
+
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip6_icmp_input_node.index);
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = n_packets;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+				   /* stride */ 1,
+				   sizeof (icmp6_input_trace_t));
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *p0;
+	  ip6_header_t *ip0;
+	  ip6_radv_t *radv_info = 0;
+	  icmp6_router_advertisement_header_t *h0;
+	  u32 bi0, options_len0, sw_if_index0, next0, error0;
+
+	  bi0 = to_next[0] = from[0];
+
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, bi0);
+	  ip0 = vlib_buffer_get_current (p0);
+	  h0 = ip6_next_header (ip0);
+	  options_len0 =
+	    clib_net_to_host_u16 (ip0->payload_length) - sizeof (h0[0]);
+
+	  error0 = ICMP6_ERROR_NONE;
+	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
+
+	  /* Check that source address is link-local */
+	  error0 = (!ip6_address_is_link_local_unicast (&ip0->src_address)) ?
+	    ICMP6_ERROR_ROUTER_ADVERTISEMENT_SOURCE_NOT_LINK_LOCAL : error0;
+
+	  /* default is to drop */
+	  next0 = ICMP6_ROUTER_SOLICITATION_NEXT_DROP;
+
+	  n_advertisements_rcvd++;
+
+	  if (error0 == ICMP6_ERROR_NONE)
+	    {
+	      vnet_sw_interface_t *sw_if0;
+	      ethernet_interface_t *eth_if0;
+
+	      sw_if0 = vnet_get_sup_sw_interface (vnm, sw_if_index0);
+	      ASSERT (sw_if0->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
+	      eth_if0 =
+		ethernet_get_interface (&ethernet_main, sw_if0->hw_if_index);
+
+	      /* only support ethernet interface type for now */
+	      error0 =
+		(!eth_if0) ? ICMP6_ERROR_ROUTER_SOLICITATION_UNSUPPORTED_INTF
+		: error0;
+
+	      if (error0 == ICMP6_ERROR_NONE)
+		{
+		  u32 ri;
+
+		  /* look up the radv_t information for this interface */
+		  vec_validate_init_empty
+		    (nm->if_radv_pool_index_by_sw_if_index, sw_if_index0, ~0);
+
+		  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index0];
+
+		  if (ri != ~0)
+		    radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
+
+		  error0 =
+		    ((!radv_info) ?
+		     ICMP6_ERROR_ROUTER_SOLICITATION_RADV_NOT_CONFIG :
+		     error0);
+
+		  if (error0 == ICMP6_ERROR_NONE)
+		    {
+		      /* validate advertised information */
+		      if ((h0->current_hop_limit && radv_info->curr_hop_limit)
+			  && (h0->current_hop_limit !=
+			      radv_info->curr_hop_limit))
+			{
+			  ip6_neighbor_syslog (vm, LOG_WARNING,
+					       "our AdvCurHopLimit on %U doesn't agree with %U",
+					       format_vnet_sw_if_index_name,
+					       vnm, sw_if_index0,
+					       format_ip6_address,
+					       &ip0->src_address);
+			}
+
+		      if ((h0->flags &
+			   ICMP6_ROUTER_DISCOVERY_FLAG_ADDRESS_CONFIG_VIA_DHCP)
+			  != radv_info->adv_managed_flag)
+			{
+			  ip6_neighbor_syslog (vm, LOG_WARNING,
+					       "our AdvManagedFlag on %U doesn't agree with %U",
+					       format_vnet_sw_if_index_name,
+					       vnm, sw_if_index0,
+					       format_ip6_address,
+					       &ip0->src_address);
+			}
+
+		      if ((h0->flags &
+			   ICMP6_ROUTER_DISCOVERY_FLAG_OTHER_CONFIG_VIA_DHCP)
+			  != radv_info->adv_other_flag)
+			{
+			  ip6_neighbor_syslog (vm, LOG_WARNING,
+					       "our AdvOtherConfigFlag on %U doesn't agree with %U",
+					       format_vnet_sw_if_index_name,
+					       vnm, sw_if_index0,
+					       format_ip6_address,
+					       &ip0->src_address);
+			}
+
+		      if ((h0->
+			   time_in_msec_between_retransmitted_neighbor_solicitations
+			   && radv_info->
+			   adv_time_in_msec_between_retransmitted_neighbor_solicitations)
+			  && (h0->
+			      time_in_msec_between_retransmitted_neighbor_solicitations
+			      !=
+			      clib_host_to_net_u32 (radv_info->
+						    adv_time_in_msec_between_retransmitted_neighbor_solicitations)))
+			{
+			  ip6_neighbor_syslog (vm, LOG_WARNING,
+					       "our AdvRetransTimer on %U doesn't agree with %U",
+					       format_vnet_sw_if_index_name,
+					       vnm, sw_if_index0,
+					       format_ip6_address,
+					       &ip0->src_address);
+			}
+
+		      if ((h0->neighbor_reachable_time_in_msec &&
+			   radv_info->adv_neighbor_reachable_time_in_msec) &&
+			  (h0->neighbor_reachable_time_in_msec !=
+			   clib_host_to_net_u32
+			   (radv_info->adv_neighbor_reachable_time_in_msec)))
+			{
+			  ip6_neighbor_syslog (vm, LOG_WARNING,
+					       "our AdvReachableTime on %U doesn't agree with %U",
+					       format_vnet_sw_if_index_name,
+					       vnm, sw_if_index0,
+					       format_ip6_address,
+					       &ip0->src_address);
+			}
+
+		      /* check for MTU or prefix options or .. */
+		      u8 *opt_hdr = (u8 *) (h0 + 1);
+		      while (options_len0 > 0)
+			{
+			  icmp6_neighbor_discovery_option_header_t *o0 =
+			    (icmp6_neighbor_discovery_option_header_t *)
+			    opt_hdr;
+			  int opt_len = o0->n_data_u64s << 3;
+			  icmp6_neighbor_discovery_option_type_t option_type =
+			    o0->type;
+
+			  if (options_len0 < 2)
+			    {
+			      ip6_neighbor_syslog (vm, LOG_ERR,
+						   "malformed RA packet on %U from %U",
+						   format_vnet_sw_if_index_name,
+						   vnm, sw_if_index0,
+						   format_ip6_address,
+						   &ip0->src_address);
+			      break;
+			    }
+
+			  if (opt_len == 0)
+			    {
+			      ip6_neighbor_syslog (vm, LOG_ERR,
+						   " zero length option in RA on %U from %U",
+						   format_vnet_sw_if_index_name,
+						   vnm, sw_if_index0,
+						   format_ip6_address,
+						   &ip0->src_address);
+			      break;
+			    }
+			  else if (opt_len > options_len0)
+			    {
+			      ip6_neighbor_syslog (vm, LOG_ERR,
+						   "option length in RA packet  greater than total length on %U from %U",
+						   format_vnet_sw_if_index_name,
+						   vnm, sw_if_index0,
+						   format_ip6_address,
+						   &ip0->src_address);
+			      break;
+			    }
+
+			  options_len0 -= opt_len;
+			  opt_hdr += opt_len;
+
+			  switch (option_type)
+			    {
+			    case ICMP6_NEIGHBOR_DISCOVERY_OPTION_mtu:
+			      {
+				icmp6_neighbor_discovery_mtu_option_t *h =
+				  (icmp6_neighbor_discovery_mtu_option_t
+				   *) (o0);
+
+				if (opt_len < sizeof (*h))
+				  break;
+
+				if ((h->mtu && radv_info->adv_link_mtu) &&
+				    (h->mtu !=
+				     clib_host_to_net_u32
+				     (radv_info->adv_link_mtu)))
+				  {
+				    ip6_neighbor_syslog (vm, LOG_WARNING,
+							 "our AdvLinkMTU on %U doesn't agree with %U",
+							 format_vnet_sw_if_index_name,
+							 vnm, sw_if_index0,
+							 format_ip6_address,
+							 &ip0->src_address);
+				  }
+			      }
+			      break;
+
+			    case ICMP6_NEIGHBOR_DISCOVERY_OPTION_prefix_information:
+			      {
+				icmp6_neighbor_discovery_prefix_information_option_t
+				  * h =
+				  (icmp6_neighbor_discovery_prefix_information_option_t
+				   *) (o0);
+
+				/* validate advertised prefix options  */
+				ip6_radv_prefix_t *pr_info;
+				u32 preferred, valid;
+
+				if (opt_len < sizeof (*h))
+				  break;
+
+				preferred =
+				  clib_net_to_host_u32 (h->preferred_time);
+				valid = clib_net_to_host_u32 (h->valid_time);
+
+				/* look for matching prefix - if we our advertising it, it better be consistant */
+				/* *INDENT-OFF* */
+				pool_foreach (pr_info, radv_info->adv_prefixes_pool,
+                                ({
+
+                                  ip6_address_t mask;
+                                  ip6_address_mask_from_width(&mask, pr_info->prefix_len);
+
+                                  if(pr_info->enabled &&
+                                     (pr_info->prefix_len == h->dst_address_length) &&
+                                     ip6_address_is_equal_masked (&pr_info->prefix,  &h->dst_address, &mask))
+                                    {
+                                      /* found it */
+                                      if(!pr_info->decrement_lifetime_flag &&
+                                         valid != pr_info->adv_valid_lifetime_in_secs)
+                                        {
+                                          ip6_neighbor_syslog(vm,  LOG_WARNING,
+                                                              "our ADV validlifetime on  %U for %U does not  agree with %U",
+                                                              format_vnet_sw_if_index_name, vnm, sw_if_index0,format_ip6_address, &pr_info->prefix,
+                                                              format_ip6_address, &h->dst_address);
+                                        }
+                                      if(!pr_info->decrement_lifetime_flag &&
+                                         preferred != pr_info->adv_pref_lifetime_in_secs)
+                                        {
+                                          ip6_neighbor_syslog(vm,  LOG_WARNING,
+                                                              "our ADV preferredlifetime on  %U for %U does not  agree with %U",
+                                                              format_vnet_sw_if_index_name, vnm, sw_if_index0,format_ip6_address, &pr_info->prefix,
+                                                              format_ip6_address, &h->dst_address);
+                                        }
+                                    }
+                                  break;
+                                }));
+				/* *INDENT-ON* */
+				break;
+			      }
+			    default:
+			      /* skip this one */
+			      break;
+			    }
+			}
+		    }
+		}
+	    }
+
+	  p0->error = error_node->errors[error0];
+
+	  if (error0 != ICMP6_ERROR_NONE)
+	    vlib_error_count (vm, error_node->node_index, error0, 1);
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  /* Account for router advertisements sent. */
+  vlib_error_count (vm, error_node->node_index,
+		    ICMP6_ERROR_ROUTER_ADVERTISEMENTS_RX,
+		    n_advertisements_rcvd);
+
+  return frame->n_vectors;
+}
+
+/* create and initialize router advertisement parameters with default values for this intfc */
+static u32
+ip6_neighbor_sw_interface_add_del (vnet_main_t * vnm,
+				   u32 sw_if_index, u32 is_add)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  ip6_radv_t *a = 0;
+  u32 ri = ~0;
+  vnet_sw_interface_t *sw_if0;
+  ethernet_interface_t *eth_if0 = 0;
+
+  /* lookup radv container  - ethernet interfaces only */
+  sw_if0 = vnet_get_sup_sw_interface (vnm, sw_if_index);
+  if (sw_if0->type == VNET_SW_INTERFACE_TYPE_HARDWARE)
+    eth_if0 = ethernet_get_interface (&ethernet_main, sw_if0->hw_if_index);
+
+  if (!eth_if0)
+    return ri;
+
+  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index, sw_if_index,
+			   ~0);
+  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
+
+  if (ri != ~0)
+    {
+      a = pool_elt_at_index (nm->if_radv_pool, ri);
+
+      if (!is_add)
+	{
+	  u32 i, *to_delete = 0;
+	  ip6_radv_prefix_t *p;
+	  ip6_mldp_group_t *m;
+
+	  /* remove adjacencies */
+	  adj_unlock (a->all_nodes_adj_index);
+	  adj_unlock (a->all_routers_adj_index);
+	  adj_unlock (a->all_mldv2_routers_adj_index);
+
+	  /* clean up prefix_pool */
+	  /* *INDENT-OFF* */
+	  pool_foreach (p, a->adv_prefixes_pool,
+          ({
+            vec_add1 (to_delete, p  -  a->adv_prefixes_pool);
+          }));
+	  /* *INDENT-ON* */
+
+	  for (i = 0; i < vec_len (to_delete); i++)
+	    {
+	      p = pool_elt_at_index (a->adv_prefixes_pool, to_delete[i]);
+	      mhash_unset (&a->address_to_prefix_index, &p->prefix, 0);
+	      pool_put (a->adv_prefixes_pool, p);
+	    }
+
+	  vec_free (to_delete);
+	  to_delete = 0;
+
+	  /* clean up mldp group pool */
+	  /* *INDENT-OFF* */
+	  pool_foreach (m, a->mldp_group_pool,
+          ({
+            vec_add1 (to_delete, m  -  a->mldp_group_pool);
+          }));
+	  /* *INDENT-ON* */
+
+	  for (i = 0; i < vec_len (to_delete); i++)
+	    {
+	      m = pool_elt_at_index (a->mldp_group_pool, to_delete[i]);
+	      mhash_unset (&a->address_to_mldp_index, &m->mcast_address, 0);
+	      pool_put (a->mldp_group_pool, m);
+	    }
+
+	  vec_free (to_delete);
+
+	  pool_put (nm->if_radv_pool, a);
+	  nm->if_radv_pool_index_by_sw_if_index[sw_if_index] = ~0;
+	  ri = ~0;
+	}
+    }
+  else
+    {
+      if (is_add)
+	{
+	  vnet_hw_interface_t *hw_if0;
+
+	  hw_if0 = vnet_get_sup_hw_interface (vnm, sw_if_index);
+
+	  pool_get (nm->if_radv_pool, a);
+
+	  ri = a - nm->if_radv_pool;
+	  nm->if_radv_pool_index_by_sw_if_index[sw_if_index] = ri;
+
+	  /* initialize default values (most of which are zero) */
+	  memset (a, 0, sizeof (a[0]));
+
+	  a->sw_if_index = sw_if_index;
+	  a->fib_index = ~0;
+	  a->max_radv_interval = DEF_MAX_RADV_INTERVAL;
+	  a->min_radv_interval = DEF_MIN_RADV_INTERVAL;
+	  a->curr_hop_limit = DEF_CURR_HOP_LIMIT;
+	  a->adv_router_lifetime_in_sec = DEF_DEF_RTR_LIFETIME;
+
+	  a->adv_link_layer_address = 1;	/* send ll address source address option */
+
+	  a->min_delay_between_radv = MIN_DELAY_BETWEEN_RAS;
+	  a->max_delay_between_radv = MAX_DELAY_BETWEEN_RAS;
+	  a->max_rtr_default_lifetime = MAX_DEF_RTR_LIFETIME;
+	  a->seed = (u32) clib_cpu_time_now ();
+	  (void) random_u32 (&a->seed);
+	  a->randomizer = clib_cpu_time_now ();
+	  (void) random_u64 (&a->randomizer);
+
+	  a->initial_adverts_count = MAX_INITIAL_RTR_ADVERTISEMENTS;
+	  a->initial_adverts_sent = a->initial_adverts_count - 1;
+	  a->initial_adverts_interval = MAX_INITIAL_RTR_ADVERT_INTERVAL;
+
+	  /* deafult is to send */
+	  a->send_radv = 1;
+
+	  /* fill in radv_info for this interface that will be needed later */
+	  a->adv_link_mtu = hw_if0->max_l3_packet_bytes[VLIB_RX];
+
+	  clib_memcpy (a->link_layer_address, eth_if0->address, 6);
+
+	  /* fill in default link-local address  (this may be overridden) */
+	  ip6_link_local_address_from_ethernet_address
+	    (&a->link_local_address, eth_if0->address);
+	  a->link_local_prefix_len = 64;
+
+	  mhash_init (&a->address_to_prefix_index, sizeof (uword),
+		      sizeof (ip6_address_t));
+	  mhash_init (&a->address_to_mldp_index, sizeof (uword),
+		      sizeof (ip6_address_t));
+
+	  {
+	    u8 link_layer_address[6] = { 0x33, 0x33, 0x00, 0x00, 0x00,
+	      IP6_MULTICAST_GROUP_ID_all_hosts
+	    };
+
+	    a->all_nodes_adj_index =
+	      adj_rewrite_add_and_lock (FIB_PROTOCOL_IP6, VNET_LINK_IP6,
+					sw_if_index, link_layer_address);
+	  }
+
+	  {
+	    u8 link_layer_address[6] = { 0x33, 0x33, 0x00, 0x00, 0x00,
+	      IP6_MULTICAST_GROUP_ID_all_routers
+	    };
+
+	    a->all_routers_adj_index =
+	      adj_rewrite_add_and_lock (FIB_PROTOCOL_IP6, VNET_LINK_IP6,
+					sw_if_index, link_layer_address);
+	  }
+
+	  {
+	    u8 link_layer_address[6] = { 0x33, 0x33, 0x00, 0x00, 0x00,
+	      IP6_MULTICAST_GROUP_ID_mldv2_routers
+	    };
+
+	    a->all_mldv2_routers_adj_index =
+	      adj_rewrite_add_and_lock (FIB_PROTOCOL_IP6,
+					VNET_LINK_IP6,
+					sw_if_index, link_layer_address);
+	  }
+
+	  /* add multicast groups we will always be reporting  */
+	  ip6_address_t addr;
+	  ip6_mldp_group_t *mcast_group_info;
+
+	  ip6_set_reserved_multicast_address (&addr,
+					      IP6_MULTICAST_SCOPE_link_local,
+					      IP6_MULTICAST_GROUP_ID_all_hosts);
+
+	  /* lookup  mldp info for this interface */
+
+	  uword *p = mhash_get (&a->address_to_mldp_index, &addr);
+	  mcast_group_info =
+	    p ? pool_elt_at_index (a->mldp_group_pool, p[0]) : 0;
+
+	  /* add address */
+	  if (!mcast_group_info)
+	    {
+	      /* add */
+	      u32 mi;
+	      pool_get (a->mldp_group_pool, mcast_group_info);
+
+	      mi = mcast_group_info - a->mldp_group_pool;
+	      mhash_set (&a->address_to_mldp_index, &addr, mi,	/* old_value */
+			 0);
+
+	      mcast_group_info->type = 4;
+	      mcast_group_info->mcast_source_address_pool = 0;
+	      mcast_group_info->num_sources = 0;
+	      clib_memcpy (&mcast_group_info->mcast_address, &addr,
+			   sizeof (ip6_address_t));
+	    }
+
+	  ip6_set_reserved_multicast_address (&addr,
+					      IP6_MULTICAST_SCOPE_link_local,
+					      IP6_MULTICAST_GROUP_ID_all_routers);
+
+	  p = mhash_get (&a->address_to_mldp_index, &addr);
+	  mcast_group_info =
+	    p ? pool_elt_at_index (a->mldp_group_pool, p[0]) : 0;
+
+	  if (!mcast_group_info)
+	    {
+	      /* add */
+	      u32 mi;
+	      pool_get (a->mldp_group_pool, mcast_group_info);
+
+	      mi = mcast_group_info - a->mldp_group_pool;
+	      mhash_set (&a->address_to_mldp_index, &addr, mi,	/* old_value */
+			 0);
+
+	      mcast_group_info->type = 4;
+	      mcast_group_info->mcast_source_address_pool = 0;
+	      mcast_group_info->num_sources = 0;
+	      clib_memcpy (&mcast_group_info->mcast_address, &addr,
+			   sizeof (ip6_address_t));
+	    }
+
+	  ip6_set_reserved_multicast_address (&addr,
+					      IP6_MULTICAST_SCOPE_link_local,
+					      IP6_MULTICAST_GROUP_ID_mldv2_routers);
+
+	  p = mhash_get (&a->address_to_mldp_index, &addr);
+	  mcast_group_info =
+	    p ? pool_elt_at_index (a->mldp_group_pool, p[0]) : 0;
+
+	  if (!mcast_group_info)
+	    {
+	      /* add */
+	      u32 mi;
+	      pool_get (a->mldp_group_pool, mcast_group_info);
+
+	      mi = mcast_group_info - a->mldp_group_pool;
+	      mhash_set (&a->address_to_mldp_index, &addr, mi,	/* old_value */
+			 0);
+
+	      mcast_group_info->type = 4;
+	      mcast_group_info->mcast_source_address_pool = 0;
+	      mcast_group_info->num_sources = 0;
+	      clib_memcpy (&mcast_group_info->mcast_address, &addr,
+			   sizeof (ip6_address_t));
+	    }
+	}
+    }
+  return ri;
+}
+
+/* send an mldpv2 report  */
+static void
+ip6_neighbor_send_mldpv2_report (u32 sw_if_index)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vlib_main_t *vm = vnm->vlib_main;
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  vnet_sw_interface_t *sw_if0;
+  ethernet_interface_t *eth_if0;
+  u32 ri;
+  int bogus_length;
+
+  ip6_radv_t *radv_info;
+  u16 payload_length;
+  vlib_buffer_t *b0;
+  ip6_header_t *ip0;
+  u32 *to_next;
+  vlib_frame_t *f;
+  u32 bo0;
+  u32 n_to_alloc = 1;
+  u32 n_allocated;
+
+  icmp6_multicast_listener_report_header_t *rh0;
+  icmp6_multicast_listener_report_packet_t *rp0;
+
+  sw_if0 = vnet_get_sup_sw_interface (vnm, sw_if_index);
+  ASSERT (sw_if0->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
+  eth_if0 = ethernet_get_interface (&ethernet_main, sw_if0->hw_if_index);
+
+  if (!eth_if0 || !vnet_sw_interface_is_admin_up (vnm, sw_if_index))
+    return;
+
+  /* look up the radv_t  information for this interface */
+  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index, sw_if_index,
+			   ~0);
+
+  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
+
+  if (ri == ~0)
+    return;
+
+  /* send report now - build a mldpv2 report packet  */
+  n_allocated = vlib_buffer_alloc_from_free_list (vm,
+						  &bo0,
+						  n_to_alloc,
+						  VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+  if (PREDICT_FALSE (n_allocated == 0))
+    {
+      clib_warning ("buffer allocation failure");
+      return;
+    }
+
+  b0 = vlib_get_buffer (vm, bo0);
+
+  /* adjust the sizeof the buffer to just include the ipv6 header */
+  b0->current_length = sizeof (icmp6_multicast_listener_report_packet_t);
+
+  payload_length = sizeof (icmp6_multicast_listener_report_header_t);
+
+  b0->error = ICMP6_ERROR_NONE;
+
+  rp0 = vlib_buffer_get_current (b0);
+  ip0 = (ip6_header_t *) & rp0->ip;
+  rh0 = (icmp6_multicast_listener_report_header_t *) & rp0->report_hdr;
+
+  memset (rp0, 0x0, sizeof (icmp6_multicast_listener_report_packet_t));
+
+  ip0->ip_version_traffic_class_and_flow_label =
+    clib_host_to_net_u32 (0x6 << 28);
+
+  ip0->protocol = IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS;
+  /* for DEBUG - vnet driver won't seem to emit router alerts */
+  /* ip0->protocol = IP_PROTOCOL_ICMP6; */
+  ip0->hop_limit = 1;
+
+  rh0->icmp.type = ICMP6_multicast_listener_report_v2;
+
+  /* source address MUST be the link-local address */
+  radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
+  ip0->src_address = radv_info->link_local_address;
+
+  /* destination is all mldpv2 routers */
+  ip6_set_reserved_multicast_address (&ip0->dst_address,
+				      IP6_MULTICAST_SCOPE_link_local,
+				      IP6_MULTICAST_GROUP_ID_mldv2_routers);
+
+  /* add reports here */
+  ip6_mldp_group_t *m;
+  int num_addr_records = 0;
+  icmp6_multicast_address_record_t rr;
+
+  /* fill in the hop-by-hop extension header (router alert) info */
+  rh0->ext_hdr.next_hdr = IP_PROTOCOL_ICMP6;
+  rh0->ext_hdr.n_data_u64s = 0;
+
+  rh0->alert.type = IP6_MLDP_ALERT_TYPE;
+  rh0->alert.len = 2;
+  rh0->alert.value = 0;
+
+  rh0->pad.type = 1;
+  rh0->pad.len = 0;
+
+  rh0->icmp.checksum = 0;
+
+  /* *INDENT-OFF* */
+  pool_foreach (m, radv_info->mldp_group_pool,
+  ({
+    rr.type = m->type;
+    rr.aux_data_len_u32s = 0;
+    rr.num_sources = clib_host_to_net_u16 (m->num_sources);
+    clib_memcpy(&rr.mcast_addr, &m->mcast_address, sizeof(ip6_address_t));
+
+    num_addr_records++;
+
+    vlib_buffer_add_data
+      (vm, b0->free_list_index, bo0,
+       (void *)&rr, sizeof(icmp6_multicast_address_record_t));
+
+    payload_length += sizeof( icmp6_multicast_address_record_t);
+  }));
+  /* *INDENT-ON* */
+
+  rh0->rsvd = 0;
+  rh0->num_addr_records = clib_host_to_net_u16 (num_addr_records);
+
+  /* update lengths */
+  ip0->payload_length = clib_host_to_net_u16 (payload_length);
+
+  rh0->icmp.checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b0, ip0,
+							  &bogus_length);
+  ASSERT (bogus_length == 0);
+
+  /*
+   * OK to override w/ no regard for actual FIB, because
+   * ip6-rewrite only looks at the adjacency.
+   */
+  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
+    vnet_main.local_interface_sw_if_index;
+
+  vnet_buffer (b0)->ip.adj_index[VLIB_TX] =
+    radv_info->all_mldv2_routers_adj_index;
+  b0->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
+
+  vlib_node_t *node = vlib_get_node_by_name (vm, (u8 *) "ip6-rewrite");
+
+  f = vlib_get_frame_to_node (vm, node->index);
+  to_next = vlib_frame_vector_args (f);
+  to_next[0] = bo0;
+  f->n_vectors = 1;
+
+  vlib_put_frame_to_node (vm, node->index, f);
+  return;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_icmp_router_solicitation_node,static) =
+{
+  .function = icmp6_router_solicitation,
+  .name = "icmp6-router-solicitation",
+
+  .vector_size = sizeof (u32),
+
+  .format_trace = format_icmp6_input_trace,
+
+  .n_next_nodes = ICMP6_ROUTER_SOLICITATION_N_NEXT,
+  .next_nodes = {
+    [ICMP6_ROUTER_SOLICITATION_NEXT_DROP] = "error-drop",
+    [ICMP6_ROUTER_SOLICITATION_NEXT_REPLY_RW] = "ip6-rewrite",
+    [ICMP6_ROUTER_SOLICITATION_NEXT_REPLY_TX] = "interface-output",
+  },
+};
+/* *INDENT-ON* */
+
+/* send a RA or update the timer info etc.. */
+static uword
+ip6_neighbor_process_timer_event (vlib_main_t * vm,
+				  vlib_node_runtime_t * node,
+				  vlib_frame_t * frame)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  ip6_radv_t *radv_info;
+  vlib_frame_t *f = 0;
+  u32 n_this_frame = 0;
+  u32 n_left_to_next = 0;
+  u32 *to_next = 0;
+  u32 bo0;
+  icmp6_router_solicitation_header_t *h0;
+  vlib_buffer_t *b0;
+  f64 now = vlib_time_now (vm);
+
+  /* Interface ip6 radv info list */
+  /* *INDENT-OFF* */
+  pool_foreach (radv_info, nm->if_radv_pool,
+  ({
+    if( !vnet_sw_interface_is_admin_up (vnm, radv_info->sw_if_index))
+      {
+        radv_info->initial_adverts_sent = radv_info->initial_adverts_count-1;
+        radv_info->next_multicast_time = now;
+        radv_info->last_multicast_time = now;
+        radv_info->last_radv_time = 0;
+        radv_info->all_routers_mcast = 0;
+        continue;
+      }
+
+    /* Make sure that we've joined the all-routers multicast group */
+    if(!radv_info->all_routers_mcast)
+      {
+        /* send MDLP_REPORT_EVENT message */
+        ip6_neighbor_send_mldpv2_report(radv_info->sw_if_index);
+        radv_info->all_routers_mcast = 1;
+      }
+
+    /* is it time to send a multicast  RA on this interface? */
+    if(radv_info->send_radv && (now >=  radv_info->next_multicast_time))
+      {
+        u32 n_to_alloc = 1;
+        u32 n_allocated;
+
+        f64 rfn = (radv_info->max_radv_interval - radv_info->min_radv_interval) *
+          random_f64 (&radv_info->seed) + radv_info->min_radv_interval;
+
+        /* multicast send - compute next multicast send time */
+        if( radv_info->initial_adverts_sent > 0)
+          {
+            radv_info->initial_adverts_sent--;
+            if(rfn > radv_info-> initial_adverts_interval)
+              rfn =  radv_info-> initial_adverts_interval;
+
+            /* check to see if we are ceasing to send */
+            if( radv_info->initial_adverts_sent  == 0)
+              if(radv_info->cease_radv)
+                radv_info->send_radv = 0;
+          }
+
+        radv_info->next_multicast_time =  rfn + now;
+        radv_info->last_multicast_time = now;
+
+        /* send advert now - build a "solicted" router advert with unspecified source address */
+        n_allocated = vlib_buffer_alloc_from_free_list
+          (vm, &bo0, n_to_alloc, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+
+        if (PREDICT_FALSE(n_allocated == 0))
+          {
+            clib_warning ("buffer allocation failure");
+            continue;
+          }
+        b0 = vlib_get_buffer (vm, bo0);
+        b0->current_length = sizeof( icmp6_router_solicitation_header_t);
+        b0->error = ICMP6_ERROR_NONE;
+        vnet_buffer (b0)->sw_if_index[VLIB_RX] = radv_info->sw_if_index;
+
+        h0 =  vlib_buffer_get_current (b0);
+
+        memset (h0, 0, sizeof (icmp6_router_solicitation_header_t));
+
+        h0->ip.ip_version_traffic_class_and_flow_label = clib_host_to_net_u32 (0x6 << 28);
+        h0->ip.payload_length = clib_host_to_net_u16 (sizeof (icmp6_router_solicitation_header_t)
+                                                      - STRUCT_OFFSET_OF (icmp6_router_solicitation_header_t, neighbor));
+        h0->ip.protocol = IP_PROTOCOL_ICMP6;
+        h0->ip.hop_limit = 255;
+
+        /* set src/dst address as "unspecified" this marks this packet as internally generated rather than recieved */
+        h0->ip.src_address.as_u64[0] = 0;
+        h0->ip.src_address.as_u64[1] = 0;
+
+        h0->ip.dst_address.as_u64[0] = 0;
+        h0->ip.dst_address.as_u64[1] = 0;
+
+        h0->neighbor.icmp.type = ICMP6_router_solicitation;
+
+        if (PREDICT_FALSE(f == 0))
+          {
+            f = vlib_get_frame_to_node (vm, ip6_icmp_router_solicitation_node.index);
+            to_next = vlib_frame_vector_args (f);
+            n_left_to_next = VLIB_FRAME_SIZE;
+            n_this_frame = 0;
+          }
+
+        n_this_frame++;
+        n_left_to_next--;
+        to_next[0] = bo0;
+        to_next += 1;
+
+        if (PREDICT_FALSE(n_left_to_next == 0))
+          {
+            f->n_vectors = n_this_frame;
+            vlib_put_frame_to_node (vm, ip6_icmp_router_solicitation_node.index, f);
+            f = 0;
+          }
+      }
+  }));
+  /* *INDENT-ON* */
+
+  if (f)
+    {
+      ASSERT (n_this_frame);
+      f->n_vectors = n_this_frame;
+      vlib_put_frame_to_node (vm, ip6_icmp_router_solicitation_node.index, f);
+    }
+  return 0;
+}
+
+static uword
+ip6_icmp_neighbor_discovery_event_process (vlib_main_t * vm,
+					   vlib_node_runtime_t * node,
+					   vlib_frame_t * frame)
+{
+  uword event_type;
+  ip6_icmp_neighbor_discovery_event_data_t *event_data;
+
+  /* init code here */
+
+  while (1)
+    {
+      vlib_process_wait_for_event_or_clock (vm, 1. /* seconds */ );
+
+      event_data = vlib_process_get_event_data (vm, &event_type);
+
+      if (!event_data)
+	{
+	  /* No events found: timer expired. */
+	  /* process interface list and send RAs as appropriate, update timer info */
+	  ip6_neighbor_process_timer_event (vm, node, frame);
+	}
+      else
+	{
+	  switch (event_type)
+	    {
+
+	    case ICMP6_ND_EVENT_INIT:
+	      break;
+
+	    case ~0:
+	      break;
+
+	    default:
+	      ASSERT (0);
+	    }
+
+	  if (event_data)
+	    _vec_len (event_data) = 0;
+	}
+    }
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_icmp_router_advertisement_node,static) =
+{
+  .function = icmp6_router_advertisement,
+  .name = "icmp6-router-advertisement",
+
+  .vector_size = sizeof (u32),
+
+  .format_trace = format_icmp6_input_trace,
+
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+vlib_node_registration_t ip6_icmp_neighbor_discovery_event_node = {
+
+  .function = ip6_icmp_neighbor_discovery_event_process,
+  .name = "ip6-icmp-neighbor-discovery-event-process",
+  .type = VLIB_NODE_TYPE_PROCESS,
+};
+
+static uword
+icmp6_neighbor_solicitation (vlib_main_t * vm,
+			     vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return icmp6_neighbor_solicitation_or_advertisement (vm, node, frame,
+						       /* is_solicitation */
+						       1);
+}
+
+static uword
+icmp6_neighbor_advertisement (vlib_main_t * vm,
+			      vlib_node_runtime_t * node,
+			      vlib_frame_t * frame)
+{
+  return icmp6_neighbor_solicitation_or_advertisement (vm, node, frame,
+						       /* is_solicitation */
+						       0);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_icmp_neighbor_solicitation_node,static) =
+{
+  .function = icmp6_neighbor_solicitation,
+  .name = "icmp6-neighbor-solicitation",
+
+  .vector_size = sizeof (u32),
+
+  .format_trace = format_icmp6_input_trace,
+
+  .n_next_nodes = ICMP6_NEIGHBOR_SOLICITATION_N_NEXT,
+  .next_nodes = {
+    [ICMP6_NEIGHBOR_SOLICITATION_NEXT_DROP] = "error-drop",
+    [ICMP6_NEIGHBOR_SOLICITATION_NEXT_REPLY] = "interface-output",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_icmp_neighbor_advertisement_node,static) =
+{
+  .function = icmp6_neighbor_advertisement,
+  .name = "icmp6-neighbor-advertisement",
+
+  .vector_size = sizeof (u32),
+
+  .format_trace = format_icmp6_input_trace,
+
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* API support functions */
+int
+ip6_neighbor_ra_config (vlib_main_t * vm, u32 sw_if_index,
+			u8 suppress, u8 managed, u8 other,
+			u8 ll_option, u8 send_unicast, u8 cease,
+			u8 use_lifetime, u32 lifetime,
+			u32 initial_count, u32 initial_interval,
+			u32 max_interval, u32 min_interval, u8 is_no)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  int error;
+  u32 ri;
+
+  /* look up the radv_t  information for this interface */
+  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index, sw_if_index,
+			   ~0);
+  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
+  error = (ri != ~0) ? 0 : VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+  if (!error)
+    {
+
+      ip6_radv_t *radv_info;
+      radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
+
+      if ((max_interval != 0) && (min_interval == 0))
+	min_interval = .75 * max_interval;
+
+      max_interval =
+	(max_interval !=
+	 0) ? ((is_no) ? DEF_MAX_RADV_INTERVAL : max_interval) :
+	radv_info->max_radv_interval;
+      min_interval =
+	(min_interval !=
+	 0) ? ((is_no) ? DEF_MIN_RADV_INTERVAL : min_interval) :
+	radv_info->min_radv_interval;
+      lifetime =
+	(use_lifetime !=
+	 0) ? ((is_no) ? DEF_DEF_RTR_LIFETIME : lifetime) :
+	radv_info->adv_router_lifetime_in_sec;
+
+      if (lifetime)
+	{
+	  if (lifetime > MAX_DEF_RTR_LIFETIME)
+	    lifetime = MAX_DEF_RTR_LIFETIME;
+
+	  if (lifetime <= max_interval)
+	    return VNET_API_ERROR_INVALID_VALUE;
+	}
+
+      if (min_interval != 0)
+	{
+	  if ((min_interval > .75 * max_interval) || (min_interval < 3))
+	    return VNET_API_ERROR_INVALID_VALUE;
+	}
+
+      if ((initial_count > MAX_INITIAL_RTR_ADVERTISEMENTS) ||
+	  (initial_interval > MAX_INITIAL_RTR_ADVERT_INTERVAL))
+	return VNET_API_ERROR_INVALID_VALUE;
+
+      /*
+         if "flag" is set and is_no is true then restore default value else set value corresponding to "flag"
+         if "flag" is clear  don't change corresponding value
+       */
+      radv_info->send_radv =
+	(suppress != 0) ? ((is_no != 0) ? 1 : 0) : radv_info->send_radv;
+      radv_info->adv_managed_flag =
+	(managed != 0) ? ((is_no) ? 0 : 1) : radv_info->adv_managed_flag;
+      radv_info->adv_other_flag =
+	(other != 0) ? ((is_no) ? 0 : 1) : radv_info->adv_other_flag;
+      radv_info->adv_link_layer_address =
+	(ll_option !=
+	 0) ? ((is_no) ? 1 : 0) : radv_info->adv_link_layer_address;
+      radv_info->send_unicast =
+	(send_unicast != 0) ? ((is_no) ? 0 : 1) : radv_info->send_unicast;
+      radv_info->cease_radv =
+	(cease != 0) ? ((is_no) ? 0 : 1) : radv_info->cease_radv;
+
+      radv_info->min_radv_interval = min_interval;
+      radv_info->max_radv_interval = max_interval;
+      radv_info->adv_router_lifetime_in_sec = lifetime;
+
+      radv_info->initial_adverts_count =
+	(initial_count !=
+	 0) ? ((is_no) ? MAX_INITIAL_RTR_ADVERTISEMENTS : initial_count) :
+	radv_info->initial_adverts_count;
+      radv_info->initial_adverts_interval =
+	(initial_interval !=
+	 0) ? ((is_no) ? MAX_INITIAL_RTR_ADVERT_INTERVAL : initial_interval) :
+	radv_info->initial_adverts_interval;
+
+      /* restart */
+      if ((cease != 0) && (is_no))
+	radv_info->send_radv = 1;
+
+      radv_info->initial_adverts_sent = radv_info->initial_adverts_count - 1;
+      radv_info->next_multicast_time = vlib_time_now (vm);
+      radv_info->last_multicast_time = vlib_time_now (vm);
+      radv_info->last_radv_time = 0;
+    }
+  return (error);
+}
+
+int
+ip6_neighbor_ra_prefix (vlib_main_t * vm, u32 sw_if_index,
+			ip6_address_t * prefix_addr, u8 prefix_len,
+			u8 use_default, u32 val_lifetime, u32 pref_lifetime,
+			u8 no_advertise, u8 off_link, u8 no_autoconfig,
+			u8 no_onlink, u8 is_no)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  int error;
+
+  u32 ri;
+
+  /* look up the radv_t  information for this interface */
+  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index, sw_if_index,
+			   ~0);
+
+  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
+
+  error = (ri != ~0) ? 0 : VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+  if (!error)
+    {
+      f64 now = vlib_time_now (vm);
+      ip6_radv_t *radv_info;
+      radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
+
+      /* prefix info add, delete or update */
+      ip6_radv_prefix_t *prefix;
+
+      /* lookup  prefix info for this  address on this interface */
+      uword *p = mhash_get (&radv_info->address_to_prefix_index, prefix_addr);
+
+      prefix = p ? pool_elt_at_index (radv_info->adv_prefixes_pool, p[0]) : 0;
+
+      if (is_no)
+	{
+	  /* delete */
+	  if (!prefix)
+	    return VNET_API_ERROR_INVALID_VALUE;	/* invalid prefix */
+
+	  if (prefix->prefix_len != prefix_len)
+	    return VNET_API_ERROR_INVALID_VALUE_2;
+
+	  /* FIXME - Should the DP do this or the CP ? */
+	  /* do specific delete processing here before returning */
+	  /* try to remove from routing table */
+
+	  mhash_unset (&radv_info->address_to_prefix_index, prefix_addr,
+		       /* old_value */ 0);
+	  pool_put (radv_info->adv_prefixes_pool, prefix);
+
+	  radv_info->initial_adverts_sent =
+	    radv_info->initial_adverts_count - 1;
+	  radv_info->next_multicast_time = vlib_time_now (vm);
+	  radv_info->last_multicast_time = vlib_time_now (vm);
+	  radv_info->last_radv_time = 0;
+	  return (error);
+	}
+
+      /* adding or changing */
+      if (!prefix)
+	{
+	  /* add */
+	  u32 pi;
+	  pool_get (radv_info->adv_prefixes_pool, prefix);
+	  pi = prefix - radv_info->adv_prefixes_pool;
+	  mhash_set (&radv_info->address_to_prefix_index, prefix_addr, pi,
+		     /* old_value */ 0);
+
+	  memset (prefix, 0x0, sizeof (ip6_radv_prefix_t));
+
+	  prefix->prefix_len = prefix_len;
+	  clib_memcpy (&prefix->prefix, prefix_addr, sizeof (ip6_address_t));
+
+	  /* initialize default values */
+	  prefix->adv_on_link_flag = 1;	/* L bit set */
+	  prefix->adv_autonomous_flag = 1;	/* A bit set */
+	  prefix->adv_valid_lifetime_in_secs = DEF_ADV_VALID_LIFETIME;
+	  prefix->adv_pref_lifetime_in_secs = DEF_ADV_PREF_LIFETIME;
+	  prefix->enabled = 1;
+	  prefix->decrement_lifetime_flag = 1;
+	  prefix->deprecated_prefix_flag = 1;
+
+	  if (off_link == 0)
+	    {
+	      /* FIXME - Should the DP do this or the CP ? */
+	      /* insert prefix into routing table as a connected prefix */
+	    }
+
+	  if (use_default)
+	    goto restart;
+	}
+      else
+	{
+
+	  if (prefix->prefix_len != prefix_len)
+	    return VNET_API_ERROR_INVALID_VALUE_2;
+
+	  if (off_link != 0)
+	    {
+	      /* FIXME - Should the DP do this or the CP ? */
+	      /* remove from routing table if already there */
+	    }
+	}
+
+      if ((val_lifetime == ~0) || (pref_lifetime == ~0))
+	{
+	  prefix->adv_valid_lifetime_in_secs = ~0;
+	  prefix->adv_pref_lifetime_in_secs = ~0;
+	  prefix->decrement_lifetime_flag = 0;
+	}
+      else
+	{
+	  prefix->adv_valid_lifetime_in_secs = val_lifetime;;
+	  prefix->adv_pref_lifetime_in_secs = pref_lifetime;
+	}
+
+      /* copy  remaining */
+      prefix->enabled = !(no_advertise != 0);
+      prefix->adv_on_link_flag = !((off_link != 0) || (no_onlink != 0));
+      prefix->adv_autonomous_flag = !(no_autoconfig != 0);
+
+    restart:
+      /* restart */
+      /* fill in the expiration times  */
+      prefix->valid_lifetime_expires =
+	now + prefix->adv_valid_lifetime_in_secs;
+      prefix->pref_lifetime_expires = now + prefix->adv_pref_lifetime_in_secs;
+
+      radv_info->initial_adverts_sent = radv_info->initial_adverts_count - 1;
+      radv_info->next_multicast_time = vlib_time_now (vm);
+      radv_info->last_multicast_time = vlib_time_now (vm);
+      radv_info->last_radv_time = 0;
+    }
+  return (error);
+}
+
+clib_error_t *
+ip6_neighbor_cmd (vlib_main_t * vm, unformat_input_t * main_input,
+		  vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  clib_error_t *error = 0;
+  u8 is_no = 0;
+  u8 suppress = 0, managed = 0, other = 0;
+  u8 suppress_ll_option = 0, send_unicast = 0, cease = 0;
+  u8 use_lifetime = 0;
+  u32 sw_if_index, ra_lifetime = 0, ra_initial_count =
+    0, ra_initial_interval = 0;
+  u32 ra_max_interval = 0, ra_min_interval = 0;
+
+  unformat_input_t _line_input, *line_input = &_line_input;
+  vnet_sw_interface_t *sw_if0;
+
+  int add_radv_info = 1;
+  __attribute__ ((unused)) ip6_radv_t *radv_info = 0;
+  ip6_address_t ip6_addr;
+  u32 addr_len;
+
+
+  /* Get a line of input. */
+  if (!unformat_user (main_input, unformat_line_input, line_input))
+    return 0;
+
+  /* get basic radv info for this interface */
+  if (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+
+      if (unformat_user (line_input,
+			 unformat_vnet_sw_interface, vnm, &sw_if_index))
+	{
+	  u32 ri;
+	  ethernet_interface_t *eth_if0 = 0;
+
+	  sw_if0 = vnet_get_sup_sw_interface (vnm, sw_if_index);
+	  if (sw_if0->type == VNET_SW_INTERFACE_TYPE_HARDWARE)
+	    eth_if0 =
+	      ethernet_get_interface (&ethernet_main, sw_if0->hw_if_index);
+
+	  if (!eth_if0)
+	    {
+	      error =
+		clib_error_return (0, "Interface must be of ethernet type");
+	      goto done;
+	    }
+
+	  /* look up the radv_t  information for this interface */
+	  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index,
+				   sw_if_index, ~0);
+
+	  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
+
+	  if (ri != ~0)
+	    {
+	      radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
+	    }
+	  else
+	    {
+	      error = clib_error_return (0, "unknown interface %U'",
+					 format_unformat_error, line_input);
+	      goto done;
+	    }
+	}
+      else
+	{
+	  error = clib_error_return (0, "invalid interface name %U'",
+				     format_unformat_error, line_input);
+	  goto done;
+	}
+    }
+
+  /* get the rest of the command */
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "no"))
+	is_no = 1;
+      else if (unformat (line_input, "prefix %U/%d",
+			 unformat_ip6_address, &ip6_addr, &addr_len))
+	{
+	  add_radv_info = 0;
+	  break;
+	}
+      else if (unformat (line_input, "ra-managed-config-flag"))
+	{
+	  managed = 1;
+	  break;
+	}
+      else if (unformat (line_input, "ra-other-config-flag"))
+	{
+	  other = 1;
+	  break;
+	}
+      else if (unformat (line_input, "ra-suppress") ||
+	       unformat (line_input, "ra-surpress"))
+	{
+	  suppress = 1;
+	  break;
+	}
+      else if (unformat (line_input, "ra-suppress-link-layer") ||
+	       unformat (line_input, "ra-surpress-link-layer"))
+	{
+	  suppress_ll_option = 1;
+	  break;
+	}
+      else if (unformat (line_input, "ra-send-unicast"))
+	{
+	  send_unicast = 1;
+	  break;
+	}
+      else if (unformat (line_input, "ra-lifetime"))
+	{
+	  if (!unformat (line_input, "%d", &ra_lifetime))
+	    return (error = unformat_parse_error (line_input));
+	  use_lifetime = 1;
+	  break;
+	}
+      else if (unformat (line_input, "ra-initial"))
+	{
+	  if (!unformat
+	      (line_input, "%d %d", &ra_initial_count, &ra_initial_interval))
+	    return (error = unformat_parse_error (line_input));
+	  break;
+	}
+      else if (unformat (line_input, "ra-interval"))
+	{
+	  if (!unformat (line_input, "%d", &ra_max_interval))
+	    return (error = unformat_parse_error (line_input));
+
+	  if (!unformat (line_input, "%d", &ra_min_interval))
+	    ra_min_interval = 0;
+	  break;
+	}
+      else if (unformat (line_input, "ra-cease"))
+	{
+	  cease = 1;
+	  break;
+	}
+      else
+	return (unformat_parse_error (line_input));
+    }
+
+  if (add_radv_info)
+    {
+      ip6_neighbor_ra_config (vm, sw_if_index,
+			      suppress, managed, other,
+			      suppress_ll_option, send_unicast, cease,
+			      use_lifetime, ra_lifetime,
+			      ra_initial_count, ra_initial_interval,
+			      ra_max_interval, ra_min_interval, is_no);
+    }
+  else
+    {
+      u32 valid_lifetime_in_secs = 0;
+      u32 pref_lifetime_in_secs = 0;
+      u8 use_prefix_default_values = 0;
+      u8 no_advertise = 0;
+      u8 off_link = 0;
+      u8 no_autoconfig = 0;
+      u8 no_onlink = 0;
+
+      /* get the rest of the command */
+      while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+	{
+	  if (unformat (line_input, "default"))
+	    {
+	      use_prefix_default_values = 1;
+	      break;
+	    }
+	  else if (unformat (line_input, "infinite"))
+	    {
+	      valid_lifetime_in_secs = ~0;
+	      pref_lifetime_in_secs = ~0;
+	      break;
+	    }
+	  else if (unformat (line_input, "%d %d", &valid_lifetime_in_secs,
+			     &pref_lifetime_in_secs))
+	    break;
+	  else
+	    break;
+	}
+
+
+      /* get the rest of the command */
+      while (!use_prefix_default_values &&
+	     unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+	{
+	  if (unformat (line_input, "no-advertise"))
+	    no_advertise = 1;
+	  else if (unformat (line_input, "off-link"))
+	    off_link = 1;
+	  else if (unformat (line_input, "no-autoconfig"))
+	    no_autoconfig = 1;
+	  else if (unformat (line_input, "no-onlink"))
+	    no_onlink = 1;
+	  else
+	    return (unformat_parse_error (line_input));
+	}
+
+      ip6_neighbor_ra_prefix (vm, sw_if_index,
+			      &ip6_addr, addr_len,
+			      use_prefix_default_values,
+			      valid_lifetime_in_secs,
+			      pref_lifetime_in_secs,
+			      no_advertise,
+			      off_link, no_autoconfig, no_onlink, is_no);
+    }
+
+  unformat_free (line_input);
+
+done:
+  return error;
+}
+
+static void
+ip6_print_addrs (vlib_main_t * vm, u32 * addrs)
+{
+  ip_lookup_main_t *lm = &ip6_main.lookup_main;
+  u32 i;
+
+  for (i = 0; i < vec_len (addrs); i++)
+    {
+      ip_interface_address_t *a =
+	pool_elt_at_index (lm->if_address_pool, addrs[i]);
+      ip6_address_t *address = ip_interface_address_get_address (lm, a);
+
+      vlib_cli_output (vm, "\t\t%U/%d",
+		       format_ip6_address, address, a->address_length);
+    }
+}
+
+static clib_error_t *
+show_ip6_interface_cmd (vlib_main_t * vm,
+			unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  clib_error_t *error = 0;
+  u32 sw_if_index;
+
+  sw_if_index = ~0;
+
+  if (unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      u32 ri;
+
+      /* look up the radv_t  information for this interface */
+      vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index,
+			       sw_if_index, ~0);
+
+      ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
+
+      if (ri != ~0)
+	{
+	  ip_lookup_main_t *lm = &ip6_main.lookup_main;
+	  ip6_radv_t *radv_info;
+	  radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
+
+	  vlib_cli_output (vm, "%U is admin %s\n",
+			   format_vnet_sw_interface_name, vnm,
+			   vnet_get_sw_interface (vnm, sw_if_index),
+			   (vnet_sw_interface_is_admin_up (vnm, sw_if_index) ?
+			    "up" : "down"));
+
+	  u32 ai;
+	  u32 *link_scope = 0, *global_scope = 0;
+	  u32 *local_scope = 0, *unknown_scope = 0;
+	  ip_interface_address_t *a;
+
+	  vec_validate_init_empty (lm->if_address_pool_index_by_sw_if_index,
+				   sw_if_index, ~0);
+	  ai = lm->if_address_pool_index_by_sw_if_index[sw_if_index];
+
+	  while (ai != (u32) ~ 0)
+	    {
+	      a = pool_elt_at_index (lm->if_address_pool, ai);
+	      ip6_address_t *address =
+		ip_interface_address_get_address (lm, a);
+
+	      if (ip6_address_is_link_local_unicast (address))
+		vec_add1 (link_scope, ai);
+	      else if (ip6_address_is_global_unicast (address))
+		vec_add1 (global_scope, ai);
+	      else if (ip6_address_is_local_unicast (address))
+		vec_add1 (local_scope, ai);
+	      else
+		vec_add1 (unknown_scope, ai);
+
+	      ai = a->next_this_sw_interface;
+	    }
+
+	  if (vec_len (link_scope))
+	    {
+	      vlib_cli_output (vm, "\tLink-local address(es):\n");
+	      ip6_print_addrs (vm, link_scope);
+	      vec_free (link_scope);
+	    }
+
+	  if (vec_len (local_scope))
+	    {
+	      vlib_cli_output (vm, "\tLocal unicast address(es):\n");
+	      ip6_print_addrs (vm, local_scope);
+	      vec_free (local_scope);
+	    }
+
+	  if (vec_len (global_scope))
+	    {
+	      vlib_cli_output (vm, "\tGlobal unicast address(es):\n");
+	      ip6_print_addrs (vm, global_scope);
+	      vec_free (global_scope);
+	    }
+
+	  if (vec_len (unknown_scope))
+	    {
+	      vlib_cli_output (vm, "\tOther-scope address(es):\n");
+	      ip6_print_addrs (vm, unknown_scope);
+	      vec_free (unknown_scope);
+	    }
+
+	  vlib_cli_output (vm, "\tJoined group address(es):\n");
+	  ip6_mldp_group_t *m;
+	  /* *INDENT-OFF* */
+	  pool_foreach (m, radv_info->mldp_group_pool,
+          ({
+            vlib_cli_output (vm, "\t\t%U\n", format_ip6_address,
+                             &m->mcast_address);
+          }));
+	  /* *INDENT-ON* */
+
+	  vlib_cli_output (vm, "\tAdvertised Prefixes:\n");
+	  ip6_radv_prefix_t *p;
+	  /* *INDENT-OFF* */
+	  pool_foreach (p, radv_info->adv_prefixes_pool,
+          ({
+            vlib_cli_output (vm, "\t\tprefix %U,  length %d\n",
+                             format_ip6_address, &p->prefix, p->prefix_len);
+          }));
+	  /* *INDENT-ON* */
+
+	  vlib_cli_output (vm, "\tMTU is %d\n", radv_info->adv_link_mtu);
+	  vlib_cli_output (vm, "\tICMP error messages are unlimited\n");
+	  vlib_cli_output (vm, "\tICMP redirects are disabled\n");
+	  vlib_cli_output (vm, "\tICMP unreachables are not sent\n");
+	  vlib_cli_output (vm, "\tND DAD is disabled\n");
+	  //vlib_cli_output (vm, "\tND reachable time is %d milliseconds\n",);
+	  vlib_cli_output (vm, "\tND advertised reachable time is %d\n",
+			   radv_info->adv_neighbor_reachable_time_in_msec);
+	  vlib_cli_output (vm,
+			   "\tND advertised retransmit interval is %d (msec)\n",
+			   radv_info->
+			   adv_time_in_msec_between_retransmitted_neighbor_solicitations);
+
+	  u32 ra_interval = radv_info->max_radv_interval;
+	  u32 ra_interval_min = radv_info->min_radv_interval;
+	  vlib_cli_output (vm,
+			   "\tND router advertisements are sent every %d seconds (min interval is %d)\n",
+			   ra_interval, ra_interval_min);
+	  vlib_cli_output (vm,
+			   "\tND router advertisements live for %d seconds\n",
+			   radv_info->adv_router_lifetime_in_sec);
+	  vlib_cli_output (vm,
+			   "\tHosts %s stateless autoconfig for addresses\n",
+			   (radv_info->adv_managed_flag) ? "use" :
+			   " don't use");
+	  vlib_cli_output (vm, "\tND router advertisements sent %d\n",
+			   radv_info->n_advertisements_sent);
+	  vlib_cli_output (vm, "\tND router solicitations received %d\n",
+			   radv_info->n_solicitations_rcvd);
+	  vlib_cli_output (vm, "\tND router solicitations dropped %d\n",
+			   radv_info->n_solicitations_dropped);
+	}
+      else
+	{
+	  error = clib_error_return (0, "IPv6 not enabled on interface",
+				     format_unformat_error, input);
+
+	}
+    }
+  return error;
+}
+
+/*?
+ * This command is used to display various IPv6 attributes on a given
+ * interface.
+ *
+ * @cliexpar
+ * Example of how to display IPv6 settings:
+ * @cliexstart{show ip6 interface GigabitEthernet2/0/0}
+ * GigabitEthernet2/0/0 is admin up
+ *         Link-local address(es):
+ *                 fe80::ab8/64
+ *         Joined group address(es):
+ *                 ff02::1
+ *                 ff02::2
+ *                 ff02::16
+ *                 ff02::1:ff00:ab8
+ *         Advertised Prefixes:
+ *                 prefix fe80::fe:28ff:fe9c:75b3,  length 64
+ *         MTU is 1500
+ *         ICMP error messages are unlimited
+ *         ICMP redirects are disabled
+ *         ICMP unreachables are not sent
+ *         ND DAD is disabled
+ *         ND advertised reachable time is 0
+ *         ND advertised retransmit interval is 0 (msec)
+ *         ND router advertisements are sent every 200 seconds (min interval is 150)
+ *         ND router advertisements live for 600 seconds
+ *         Hosts use stateless autoconfig for addresses
+ *         ND router advertisements sent 19336
+ *         ND router solicitations received 0
+ *         ND router solicitations dropped 0
+ * @cliexend
+ * Example of output if IPv6 is not enabled on the interface:
+ * @cliexstart{show ip6 interface GigabitEthernet2/0/0}
+ * show ip6 interface: IPv6 not enabled on interface
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_ip6_interface_command, static) =
+{
+  .path = "show ip6 interface",
+  .function = show_ip6_interface_cmd,
+  .short_help = "show ip6 interface <interface>",
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+disable_ip6_interface (vlib_main_t * vm, u32 sw_if_index)
+{
+  clib_error_t *error = 0;
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  u32 ri;
+
+  /* look up the radv_t  information for this interface */
+  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index, sw_if_index,
+			   ~0);
+  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
+
+  /* if not created - do nothing */
+  if (ri != ~0)
+    {
+      vnet_main_t *vnm = vnet_get_main ();
+      ip6_radv_t *radv_info;
+
+      radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
+
+      /* check radv_info ref count for other ip6 addresses on this interface */
+      if (radv_info->ref_count == 0)
+	{
+	  /* essentially "disables" ipv6 on this interface */
+	  error = ip6_add_del_interface_address (vm, sw_if_index,
+						 &radv_info->
+						 link_local_address,
+						 radv_info->
+						 link_local_prefix_len,
+						 1 /* is_del */ );
+
+	  ip6_neighbor_sw_interface_add_del (vnm, sw_if_index,
+					     0 /* is_add */ );
+	}
+    }
+  return error;
+}
+
+int
+ip6_interface_enabled (vlib_main_t * vm, u32 sw_if_index)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  u32 ri = ~0;
+
+  /* look up the radv_t  information for this interface */
+  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index, sw_if_index,
+			   ~0);
+
+  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
+
+  return ri != ~0;
+}
+
+clib_error_t *
+enable_ip6_interface (vlib_main_t * vm, u32 sw_if_index)
+{
+  clib_error_t *error = 0;
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  u32 ri;
+  int is_add = 1;
+
+  /* look up the radv_t  information for this interface */
+  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index, sw_if_index,
+			   ~0);
+
+  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
+
+  /* if not created yet */
+  if (ri == ~0)
+    {
+      vnet_main_t *vnm = vnet_get_main ();
+      vnet_sw_interface_t *sw_if0;
+
+      sw_if0 = vnet_get_sup_sw_interface (vnm, sw_if_index);
+      if (sw_if0->type == VNET_SW_INTERFACE_TYPE_HARDWARE)
+	{
+	  ethernet_interface_t *eth_if0;
+
+	  eth_if0 =
+	    ethernet_get_interface (&ethernet_main, sw_if0->hw_if_index);
+	  if (eth_if0)
+	    {
+	      /* create radv_info. for this interface.  This holds all the info needed for router adverts */
+	      ri =
+		ip6_neighbor_sw_interface_add_del (vnm, sw_if_index, is_add);
+
+	      if (ri != ~0)
+		{
+		  ip6_radv_t *radv_info;
+		  ip6_address_t link_local_address;
+
+		  radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
+
+		  ip6_link_local_address_from_ethernet_mac_address
+		    (&link_local_address, eth_if0->address);
+
+		  sw_if0 = vnet_get_sw_interface (vnm, sw_if_index);
+		  if (sw_if0->type == VNET_SW_INTERFACE_TYPE_SUB)
+		    {
+		      /* make up  an interface id */
+		      md5_context_t m;
+		      u8 digest[16];
+
+		      link_local_address.as_u64[0] = radv_info->randomizer;
+
+		      md5_init (&m);
+		      md5_add (&m, &link_local_address, 16);
+		      md5_finish (&m, digest);
+
+		      clib_memcpy (&link_local_address, digest, 16);
+
+		      radv_info->randomizer = link_local_address.as_u64[0];
+
+		      link_local_address.as_u64[0] =
+			clib_host_to_net_u64 (0xFE80000000000000ULL);
+		      /* clear u bit */
+		      link_local_address.as_u8[8] &= 0xfd;
+		    }
+
+		  /* essentially "enables" ipv6 on this interface */
+		  error = ip6_add_del_interface_address (vm, sw_if_index,
+							 &link_local_address,
+							 128
+							 /* address width */ ,
+							 0 /* is_del */ );
+
+		  if (error)
+		    ip6_neighbor_sw_interface_add_del (vnm, sw_if_index,
+						       !is_add);
+		  else
+		    {
+		      radv_info->link_local_address = link_local_address;
+		      radv_info->link_local_prefix_len = 64;
+		    }
+		}
+	    }
+	}
+    }
+  return error;
+}
+
+static clib_error_t *
+enable_ip6_interface_cmd (vlib_main_t * vm,
+			  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index;
+
+  sw_if_index = ~0;
+
+  if (unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      enable_ip6_interface (vm, sw_if_index);
+    }
+  else
+    {
+      error = clib_error_return (0, "unknown interface\n'",
+				 format_unformat_error, input);
+
+    }
+  return error;
+}
+
+/*?
+ * This command is used to enable IPv6 on a given interface.
+ *
+ * @cliexpar
+ * Example of how enable IPv6 on a given interface:
+ * @cliexcmd{enable ip6 interface GigabitEthernet2/0/0}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (enable_ip6_interface_command, static) =
+{
+  .path = "enable ip6 interface",
+  .function = enable_ip6_interface_cmd,
+  .short_help = "enable ip6 interface <interface>",
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+disable_ip6_interface_cmd (vlib_main_t * vm,
+			   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index;
+
+  sw_if_index = ~0;
+
+  if (unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = disable_ip6_interface (vm, sw_if_index);
+    }
+  else
+    {
+      error = clib_error_return (0, "unknown interface\n'",
+				 format_unformat_error, input);
+
+    }
+  return error;
+}
+
+/*?
+ * This command is used to disable IPv6 on a given interface.
+ *
+ * @cliexpar
+ * Example of how disable IPv6 on a given interface:
+ * @cliexcmd{disable ip6 interface GigabitEthernet2/0/0}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (disable_ip6_interface_command, static) =
+{
+  .path = "disable ip6 interface",
+  .function = disable_ip6_interface_cmd,
+  .short_help = "disable ip6 interface <interface>",
+};
+/* *INDENT-ON* */
+
+/*?
+ * This command is used to configure the neighbor discovery
+ * parameters on a given interface. Use the '<em>show ip6 interface</em>'
+ * command to display some of the current neighbor discovery parameters
+ * on a given interface. This command has three formats:
+ *
+ *
+ * <b>Format 1 - Router Advertisement Options:</b> (Only one can be entered in a single command)
+ *
+ * '<em><b>ip6 nd <interface> [no] [ra-managed-config-flag] | [ra-other-config-flag] | [ra-suppress] | [ra-suppress-link-layer] | [ra-send-unicast] | [ra-lifetime <lifetime>] | [ra-initial <cnt> <interval>] | [ra-interval <max-interval> [<min-interval>]] | [ra-cease]</b></em>'
+ *
+ * Where:
+ *
+ * <em>[no] ra-managed-config-flag</em> - Advertises in ICMPv6
+ * router-advertisement messages to use stateful address
+ * auto-configuration to obtain address information (sets the M-bit).
+ * Default is the M-bit is not set and the '<em>no</em>' option
+ * returns it to this default state.
+ *
+ * <em>[no] ra-other-config-flag</em> - Indicates in ICMPv6
+ * router-advertisement messages that hosts use stateful auto
+ * configuration to obtain nonaddress related information (sets
+ * the O-bit). Default is the O-bit is not set and the '<em>no</em>'
+ * option returns it to this default state.
+ *
+ * <em>[no] ra-suppress</em> - Disables sending ICMPv6 router-advertisement
+ * messages. The '<em>no</em>' option implies to enable sending ICMPv6
+ * router-advertisement messages.
+ *
+ * <em>[no] ra-suppress-link-layer</em> - Indicates not to include the
+ * optional source link-layer address in the ICMPv6 router-advertisement
+ * messages. Default is to include the optional source link-layer address
+ * and the '<em>no</em>' option returns it to this default state.
+ *
+ * <em>[no] ra-send-unicast</em> - Use the source address of the
+ * router-solicitation message if availiable. The default is to use
+ * multicast address of all nodes, and the '<em>no</em>' option returns
+ * it to this default state.
+ *
+ * <em>[no] ra-lifetime <lifetime></em> - Advertises the lifetime of a
+ * default router in ICMPv6 router-advertisement messages. The range is
+ * from 0 to 9000 seconds. '<em><lifetime></em>' must be greater than
+ * '<em><max-interval></em>'. The default value is 600 seconds and the
+ * '<em>no</em>' option returns it to this default value.
+ *
+ * <em>[no] ra-initial <cnt> <interval></em> - Number of initial ICMPv6
+ * router-advertisement messages sent and the interval between each
+ * message. Range for count is 1 - 3 and default is 3. Range for interval
+ * is 1 to 16 seconds, and default is 16 seconds. The '<em>no</em>' option
+ * returns both to their default value.
+ *
+ * <em>[no] ra-interval <max-interval> [<min-interval>]</em> - Configures the
+ * interval between sending ICMPv6 router-advertisement messages. The
+ * range for max-interval is from 4 to 200 seconds. min-interval can not
+ * be more than 75% of max-interval. If not set, min-interval will be
+ * set to 75% of max-interval. The range for min-interval is from 3 to
+ * 150 seconds.  The '<em>no</em>' option returns both to their default
+ * value.
+ *
+ * <em>[no] ra-cease</em> - Cease sending ICMPv6 router-advertisement messages.
+ * The '<em>no</em>' options implies to start (or restart) sending
+ * ICMPv6 router-advertisement messages.
+ *
+ *
+ * <b>Format 2 - Prefix Options:</b>
+ *
+ * '<em><b>ip6 nd <interface> [no] prefix <ip6-address>/<width> [<valid-lifetime> <pref-lifetime> | infinite] [no-advertise] [off-link] [no-autoconfig] [no-onlink]</b></em>'
+ *
+ * Where:
+ *
+ * <em>no</em> - All additional flags are ignored and the prefix is deleted.
+ *
+ * <em><valid-lifetime> <pref-lifetime></em> - '<em><valid-lifetime></em>' is the
+ * length of time in seconds during what the prefix is valid for the purpose of
+ * on-link determination. Range is 7203 to 2592000 seconds and default is 2592000
+ * seconds (30 days). '<em><pref-lifetime></em>' is the prefered-lifetime and is the
+ * length of time in seconds during what addresses generated from the prefix remain
+ * preferred. Range is 0 to 604800 seconds and default is 604800 seconds (7 days).
+ *
+ * <em>infinite</em> - Both '<em><valid-lifetime></em>' and '<em><<pref-lifetime></em>'
+ * are inifinte, no timeout.
+ *
+ * <em>no-advertise</em> - Do not send full router address in prefix
+ * advertisement. Default is to advertise (i.e. - This flag is off by default).
+ *
+ * <em>off-link</em> - Prefix is off-link, clear L-bit in packet. Default is on-link
+ * (i.e. - This flag is off and L-bit in packet is set by default and this prefix can
+ * be used for on-link determination). '<em>no-onlink</em>' also controls the L-bit.
+ *
+ * <em>no-autoconfig</em> - Do not use prefix for autoconfiguration, clear A-bit in packet.
+ * Default is autoconfig (i.e. - This flag is off and A-bit in packet is set by default.
+ *
+ * <em>no-onlink</em> - Do not use prefix for onlink determination, clear L-bit in packet.
+ * Default is on-link (i.e. - This flag is off and L-bit in packet is set by default and
+ * this prefix can be used for on-link determination). '<em>off-link</em>' also controls
+ * the L-bit.
+ *
+ *
+ * <b>Format 3: - Default of Prefix:</b>
+ *
+ * '<em><b>ip6 nd <interface> [no] prefix <ip6-address>/<width> default</b></em>'
+ *
+ * When a new prefix is added (or existing one is being overwritten) <em>default</em>
+ * uses default values for the prefix. If <em>no</em> is used, the <em>default</em>
+ * is ignored and the prefix is deleted.
+ *
+ *
+ * @cliexpar
+ * Example of how set a router advertisement option:
+ * @cliexcmd{ip6 nd GigabitEthernet2/0/0 ra-interval 100 20}
+ * Example of how to add a prefix:
+ * @cliexcmd{ip6 nd GigabitEthernet2/0/0 prefix fe80::fe:28ff:fe9c:75b3/64 infinite no-advertise}
+ * Example of how to delete a prefix:
+ * @cliexcmd{ip6 nd GigabitEthernet2/0/0 no prefix fe80::fe:28ff:fe9c:75b3/64}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip6_nd_command, static) =
+{
+  .path = "ip6 nd",
+  .short_help = "ip6 nd <interface> ...",
+  .function = ip6_neighbor_cmd,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+set_ip6_link_local_address (vlib_main_t * vm,
+			    u32 sw_if_index,
+			    ip6_address_t * address, u8 address_length)
+{
+  clib_error_t *error = 0;
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  u32 ri;
+  ip6_radv_t *radv_info;
+  vnet_main_t *vnm = vnet_get_main ();
+
+  if (!ip6_address_is_link_local_unicast (address))
+    {
+      vnm->api_errno = VNET_API_ERROR_ADDRESS_NOT_LINK_LOCAL;
+      return (error = clib_error_return (0, "address not link-local",
+					 format_unformat_error));
+    }
+
+  /* call enable ipv6  */
+  enable_ip6_interface (vm, sw_if_index);
+
+  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
+
+  if (ri != ~0)
+    {
+      radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
+
+      /* save if link local address (overwrite default) */
+
+      /* delete the old one */
+      error = ip6_add_del_interface_address (vm, sw_if_index,
+					     &radv_info->link_local_address,
+					     radv_info->link_local_prefix_len
+					     /* address width */ ,
+					     1 /* is_del */ );
+
+      if (!error)
+	{
+	  /* add the new one */
+	  error = ip6_add_del_interface_address (vm, sw_if_index,
+						 address, address_length
+						 /* address width */ ,
+						 0 /* is_del */ );
+
+	  if (!error)
+	    {
+	      radv_info->link_local_address = *address;
+	      radv_info->link_local_prefix_len = address_length;
+	    }
+	}
+    }
+  else
+    {
+      vnm->api_errno = VNET_API_ERROR_IP6_NOT_ENABLED;
+      error = clib_error_return (0, "ip6 not enabled for interface",
+				 format_unformat_error);
+    }
+  return error;
+}
+
+clib_error_t *
+set_ip6_link_local_address_cmd (vlib_main_t * vm,
+				unformat_input_t * input,
+				vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index;
+  ip6_address_t ip6_addr;
+  u32 addr_len = 0;
+
+  if (unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      /* get the rest of the command */
+      while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+	{
+	  if (unformat (input, "%U/%d",
+			unformat_ip6_address, &ip6_addr, &addr_len))
+	    break;
+	  else
+	    return (unformat_parse_error (input));
+	}
+    }
+  error = set_ip6_link_local_address (vm, sw_if_index, &ip6_addr, addr_len);
+  return error;
+}
+
+/*?
+ * This command is used to assign an IPv6 Link-local address to an
+ * interface. This command will enable IPv6 on an interface if it
+ * is not already enabled. Use the '<em>show ip6 interface</em>' command
+ * to display the assigned Link-local address.
+ *
+ * @cliexpar
+ * Example of how to assign an IPv6 Link-local address to an interface:
+ * @cliexcmd{set ip6 link-local address GigabitEthernet2/0/0 FE80::AB8/64}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_ip6_link_local_address_command, static) =
+{
+  .path = "set ip6 link-local address",
+  .short_help = "set ip6 link-local address <interface> <ip6-address>/<width>",
+  .function = set_ip6_link_local_address_cmd,
+};
+/* *INDENT-ON* */
+
+/* callback when an interface address is added or deleted */
+static void
+ip6_neighbor_add_del_interface_address (ip6_main_t * im,
+					uword opaque,
+					u32 sw_if_index,
+					ip6_address_t * address,
+					u32 address_length,
+					u32 if_address_index, u32 is_delete)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  u32 ri;
+  vlib_main_t *vm = vnm->vlib_main;
+  ip6_radv_t *radv_info;
+  ip6_address_t a;
+  ip6_mldp_group_t *mcast_group_info;
+
+  /* create solicited node multicast address for this interface adddress */
+  ip6_set_solicited_node_multicast_address (&a, 0);
+
+  a.as_u8[0xd] = address->as_u8[0xd];
+  a.as_u8[0xe] = address->as_u8[0xe];
+  a.as_u8[0xf] = address->as_u8[0xf];
+
+  if (!is_delete)
+    {
+      /* try to  create radv_info - does nothing if ipv6 already enabled */
+      enable_ip6_interface (vm, sw_if_index);
+
+      /* look up the radv_t  information for this interface */
+      vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index,
+			       sw_if_index, ~0);
+      ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
+      if (ri != ~0)
+	{
+	  /* get radv_info */
+	  radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
+
+	  /* add address */
+	  if (!ip6_address_is_link_local_unicast (address))
+	    radv_info->ref_count++;
+
+	  /* lookup  prefix info for this  address on this interface */
+	  uword *p = mhash_get (&radv_info->address_to_mldp_index, &a);
+	  mcast_group_info =
+	    p ? pool_elt_at_index (radv_info->mldp_group_pool, p[0]) : 0;
+
+	  /* add -solicted node multicast address  */
+	  if (!mcast_group_info)
+	    {
+	      /* add */
+	      u32 mi;
+	      pool_get (radv_info->mldp_group_pool, mcast_group_info);
+
+	      mi = mcast_group_info - radv_info->mldp_group_pool;
+	      mhash_set (&radv_info->address_to_mldp_index, &a, mi,
+			 /* old_value */ 0);
+
+	      mcast_group_info->type = 4;
+	      mcast_group_info->mcast_source_address_pool = 0;
+	      mcast_group_info->num_sources = 0;
+	      clib_memcpy (&mcast_group_info->mcast_address, &a,
+			   sizeof (ip6_address_t));
+	    }
+	}
+    }
+  else
+    {
+
+      /* delete */
+      /* look up the radv_t  information for this interface */
+      vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index,
+			       sw_if_index, ~0);
+      ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
+      if (ri != ~0)
+	{
+	  /* get radv_info */
+	  radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
+
+	  /* lookup  prefix info for this  address on this interface */
+	  uword *p = mhash_get (&radv_info->address_to_mldp_index, &a);
+	  mcast_group_info =
+	    p ? pool_elt_at_index (radv_info->mldp_group_pool, p[0]) : 0;
+
+	  if (mcast_group_info)
+	    {
+	      mhash_unset (&radv_info->address_to_mldp_index, &a,
+			   /* old_value */ 0);
+	      pool_put (radv_info->mldp_group_pool, mcast_group_info);
+	    }
+
+	  /* if interface up send MLDP "report" */
+	  radv_info->all_routers_mcast = 0;
+
+	  /* add address */
+	  if (!ip6_address_is_link_local_unicast (address))
+	    radv_info->ref_count--;
+	}
+    }
+}
+
+clib_error_t *
+ip6_set_neighbor_limit (u32 neighbor_limit)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+
+  nm->limit_neighbor_cache_size = neighbor_limit;
+  return 0;
+}
+
+static clib_error_t *
+ip6_neighbor_init (vlib_main_t * vm)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  ip6_main_t *im = &ip6_main;
+
+  mhash_init (&nm->neighbor_index_by_key,
+	      /* value size */ sizeof (uword),
+	      /* key size */ sizeof (ip6_neighbor_key_t));
+
+  icmp6_register_type (vm, ICMP6_neighbor_solicitation,
+		       ip6_icmp_neighbor_solicitation_node.index);
+  icmp6_register_type (vm, ICMP6_neighbor_advertisement,
+		       ip6_icmp_neighbor_advertisement_node.index);
+  icmp6_register_type (vm, ICMP6_router_solicitation,
+		       ip6_icmp_router_solicitation_node.index);
+  icmp6_register_type (vm, ICMP6_router_advertisement,
+		       ip6_icmp_router_advertisement_node.index);
+
+  /* handler node for ip6 neighbor discovery events and timers */
+  vlib_register_node (vm, &ip6_icmp_neighbor_discovery_event_node);
+
+  /* add call backs */
+  ip6_add_del_interface_address_callback_t cb;
+  memset (&cb, 0x0, sizeof (ip6_add_del_interface_address_callback_t));
+
+  /* when an interface address changes... */
+  cb.function = ip6_neighbor_add_del_interface_address;
+  cb.function_opaque = 0;
+  vec_add1 (im->add_del_interface_address_callbacks, cb);
+
+  mhash_init (&nm->pending_resolutions_by_address,
+	      /* value size */ sizeof (uword),
+	      /* key size */ sizeof (ip6_address_t));
+
+  mhash_init (&nm->mac_changes_by_address,
+	      /* value size */ sizeof (uword),
+	      /* key size */ sizeof (ip6_address_t));
+
+  /* default, configurable */
+  nm->limit_neighbor_cache_size = 50000;
+
+#if 0
+  /* $$$$ Hack fix for today */
+  vec_validate_init_empty
+    (im->discover_neighbor_next_index_by_hw_if_index, 32, 0 /* drop */ );
+#endif
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ip6_neighbor_init);
+
+
+void
+vnet_register_ip6_neighbor_resolution_event (vnet_main_t * vnm,
+					     void *address_arg,
+					     uword node_index,
+					     uword type_opaque, uword data)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  ip6_address_t *address = address_arg;
+  uword *p;
+  pending_resolution_t *pr;
+
+  pool_get (nm->pending_resolutions, pr);
+
+  pr->next_index = ~0;
+  pr->node_index = node_index;
+  pr->type_opaque = type_opaque;
+  pr->data = data;
+
+  p = mhash_get (&nm->pending_resolutions_by_address, address);
+  if (p)
+    {
+      /* Insert new resolution at the head of the list */
+      pr->next_index = p[0];
+      mhash_unset (&nm->pending_resolutions_by_address, address, 0);
+    }
+
+  mhash_set (&nm->pending_resolutions_by_address, address,
+	     pr - nm->pending_resolutions, 0 /* old value */ );
+}
+
+int
+vnet_add_del_ip6_nd_change_event (vnet_main_t * vnm,
+				  void *data_callback,
+				  u32 pid,
+				  void *address_arg,
+				  uword node_index,
+				  uword type_opaque, uword data, int is_add)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  ip6_address_t *address = address_arg;
+  uword *p;
+  pending_resolution_t *mc;
+  void (*fp) (u32, u8 *) = data_callback;
+
+  if (is_add)
+    {
+      pool_get (nm->mac_changes, mc);
+
+      mc->next_index = ~0;
+      mc->node_index = node_index;
+      mc->type_opaque = type_opaque;
+      mc->data = data;
+      mc->data_callback = data_callback;
+      mc->pid = pid;
+
+      p = mhash_get (&nm->mac_changes_by_address, address);
+      if (p)
+	{
+	  /* Insert new resolution at the head of the list */
+	  mc->next_index = p[0];
+	  mhash_unset (&nm->mac_changes_by_address, address, 0);
+	}
+
+      mhash_set (&nm->mac_changes_by_address, address,
+		 mc - nm->mac_changes, 0);
+      return 0;
+    }
+  else
+    {
+      u32 index;
+      pending_resolution_t *mc_last = 0;
+
+      p = mhash_get (&nm->mac_changes_by_address, address);
+      if (p == 0)
+	return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+      index = p[0];
+
+      while (index != (u32) ~ 0)
+	{
+	  mc = pool_elt_at_index (nm->mac_changes, index);
+	  if (mc->node_index == node_index &&
+	      mc->type_opaque == type_opaque && mc->pid == pid)
+	    {
+	      /* Clients may need to clean up pool entries, too */
+	      if (fp)
+		(*fp) (mc->data, 0 /* no new mac addrs */ );
+	      if (index == p[0])
+		{
+		  mhash_unset (&nm->mac_changes_by_address, address, 0);
+		  if (mc->next_index != ~0)
+		    mhash_set (&nm->mac_changes_by_address, address,
+			       mc->next_index, 0);
+		  pool_put (nm->mac_changes, mc);
+		  return 0;
+		}
+	      else
+		{
+		  ASSERT (mc_last);
+		  mc_last->next_index = mc->next_index;
+		  pool_put (nm->mac_changes, mc);
+		  return 0;
+		}
+	    }
+	  mc_last = mc;
+	  index = mc->next_index;
+	}
+
+      return VNET_API_ERROR_NO_SUCH_ENTRY;
+    }
+}
+
+int
+vnet_ip6_nd_term (vlib_main_t * vm,
+		  vlib_node_runtime_t * node,
+		  vlib_buffer_t * p0,
+		  ethernet_header_t * eth,
+		  ip6_header_t * ip, u32 sw_if_index, u16 bd_index, u8 shg)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  icmp6_neighbor_solicitation_or_advertisement_header_t *ndh;
+  pending_resolution_t *mc;
+  uword *p;
+
+  ndh = ip6_next_header (ip);
+  if (ndh->icmp.type != ICMP6_neighbor_solicitation &&
+      ndh->icmp.type != ICMP6_neighbor_advertisement)
+    return 0;
+
+  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&
+		     (p0->flags & VLIB_BUFFER_IS_TRACED)))
+    {
+      u8 *t0 = vlib_add_trace (vm, node, p0,
+			       sizeof (icmp6_input_trace_t));
+      clib_memcpy (t0, ip, sizeof (icmp6_input_trace_t));
+    }
+
+  /* Check if anyone want ND events for L2 BDs */
+  p = mhash_get (&nm->mac_changes_by_address, &ip6a_zero);
+  if (p && shg == 0 &&		/* Only SHG 0 interface which is more likely local */
+      !ip6_address_is_link_local_unicast (&ip->src_address))
+    {
+      u32 next_index = p[0];
+      while (next_index != (u32) ~ 0)
+	{
+	  int (*fp) (u32, u8 *, u32, ip6_address_t *);
+	  int rv = 1;
+	  mc = pool_elt_at_index (nm->mac_changes, next_index);
+	  fp = mc->data_callback;
+	  /* Call the callback, return 1 to suppress dup events */
+	  if (fp)
+	    rv = (*fp) (mc->data,
+			eth->src_address, sw_if_index, &ip->src_address);
+	  /* Signal the resolver process */
+	  if (rv == 0)
+	    vlib_process_signal_event (vm, mc->node_index,
+				       mc->type_opaque, mc->data);
+	  next_index = mc->next_index;
+	}
+    }
+
+  /* Check if MAC entry exsist for solicited target IP */
+  if (ndh->icmp.type == ICMP6_neighbor_solicitation)
+    {
+      icmp6_neighbor_discovery_ethernet_link_layer_address_option_t *opt;
+      l2_bridge_domain_t *bd_config;
+      u8 *macp;
+
+      opt = (void *) (ndh + 1);
+      if ((opt->header.type !=
+	   ICMP6_NEIGHBOR_DISCOVERY_OPTION_source_link_layer_address) ||
+	  (opt->header.n_data_u64s != 1))
+	return 0;		/* source link layer address option not present */
+
+      bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index);
+      macp =
+	(u8 *) hash_get_mem (bd_config->mac_by_ip6, &ndh->target_address);
+      if (macp)
+	{			/* found ip-mac entry, generate eighbor advertisement response */
+	  int bogus_length;
+	  vlib_node_runtime_t *error_node =
+	    vlib_node_get_runtime (vm, ip6_icmp_input_node.index);
+	  ip->dst_address = ip->src_address;
+	  ip->src_address = ndh->target_address;
+	  ip->hop_limit = 255;
+	  opt->header.type =
+	    ICMP6_NEIGHBOR_DISCOVERY_OPTION_target_link_layer_address;
+	  clib_memcpy (opt->ethernet_address, macp, 6);
+	  ndh->icmp.type = ICMP6_neighbor_advertisement;
+	  ndh->advertisement_flags = clib_host_to_net_u32
+	    (ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_SOLICITED |
+	     ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_OVERRIDE);
+	  ndh->icmp.checksum = 0;
+	  ndh->icmp.checksum =
+	    ip6_tcp_udp_icmp_compute_checksum (vm, p0, ip, &bogus_length);
+	  clib_memcpy (eth->dst_address, eth->src_address, 6);
+	  clib_memcpy (eth->src_address, macp, 6);
+	  vlib_error_count (vm, error_node->node_index,
+			    ICMP6_ERROR_NEIGHBOR_ADVERTISEMENTS_TX, 1);
+	  return 1;
+	}
+    }
+
+  return 0;
+
+}
+
+void
+ethernet_ndp_change_mac (u32 sw_if_index)
+{
+  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
+  ip6_neighbor_t *n;
+
+  /* *INDENT-OFF* */
+  pool_foreach (n, nm->neighbor_pool,
+  ({
+    if (n->key.sw_if_index == sw_if_index)
+      {
+	adj_nbr_walk_nh6 (sw_if_index,
+			  &n->key.ip6_address,
+			  ip6_nd_mk_complete_walk, n);
+      }
+  }));
+  /* *INDENT-ON* */
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip6_neighbor.h b/src/vnet/ip/ip6_neighbor.h
new file mode 100644
index 00000000..b2c9f48a
--- /dev/null
+++ b/src/vnet/ip/ip6_neighbor.h
@@ -0,0 +1,52 @@
+/*
+ *
+ * ip6_neighboor.h: ip6 neighbor structures
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_ip6_neighbor_h
+#define included_ip6_neighbor_h
+
+#include <vnet/fib/fib_types.h>
+
+typedef struct
+{
+  ip6_address_t ip6_address;
+  u32 sw_if_index;
+  u32 pad;
+} ip6_neighbor_key_t;
+
+typedef struct
+{
+  ip6_neighbor_key_t key;
+  u8 link_layer_address[8];
+  u16 flags;
+#define IP6_NEIGHBOR_FLAG_STATIC (1 << 0)
+#define IP6_NEIGHBOR_FLAG_DYNAMIC  (2 << 0)
+  u64 cpu_time_last_updated;
+  fib_node_index_t fib_entry_index;
+} ip6_neighbor_t;
+
+ip6_neighbor_t *ip6_neighbors_entries (u32 sw_if_index);
+
+#endif /* included_ip6_neighbor_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip6_packet.h b/src/vnet/ip/ip6_packet.h
new file mode 100644
index 00000000..1e551c8b
--- /dev/null
+++ b/src/vnet/ip/ip6_packet.h
@@ -0,0 +1,499 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip6/packet.h: ip6 packet format
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_ip6_packet_h
+#define included_ip6_packet_h
+
+#include <vnet/ip/tcp_packet.h>
+#include <vnet/ip/ip4_packet.h>
+
+typedef union
+{
+  u8 as_u8[16];
+  u16 as_u16[8];
+  u32 as_u32[4];
+  u64 as_u64[2];
+  uword as_uword[16 / sizeof (uword)];
+}
+ip6_address_t;
+
+/* Packed so that the mhash key doesn't include uninitialized pad bytes */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  /* IP address must be first for ip_interface_address_get_address() to work */
+  ip6_address_t ip6_addr;
+  u32 fib_index;
+}) ip6_address_fib_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (union {
+  struct {
+    u32 pad[3];
+    ip4_address_t ip4;
+  };
+  ip6_address_t ip6;
+  u8 as_u8[16];
+  u64 as_u64[2];
+}) ip46_address_t;
+/* *INDENT-ON* */
+#define ip46_address_is_ip4(ip46)	(((ip46)->pad[0] | (ip46)->pad[1] | (ip46)->pad[2]) == 0)
+#define ip46_address_mask_ip4(ip46)	((ip46)->pad[0] = (ip46)->pad[1] = (ip46)->pad[2] = 0)
+#define ip46_address_set_ip4(ip46, ip)	(ip46_address_mask_ip4(ip46), (ip46)->ip4 = (ip)[0])
+#define ip46_address_reset(ip46)	((ip46)->as_u64[0] = (ip46)->as_u64[1] = 0)
+#define ip46_address_cmp(ip46_1, ip46_2) (memcmp(ip46_1, ip46_2, sizeof(*ip46_1)))
+#define ip46_address_is_zero(ip46)	(((ip46)->as_u64[0] == 0) && ((ip46)->as_u64[1] == 0))
+
+always_inline void
+ip46_from_addr_buf (u32 is_ipv6, u8 * buf, ip46_address_t * ip)
+{
+  if (is_ipv6)
+    ip->ip6 = *((ip6_address_t *) buf);
+  else
+    ip46_address_set_ip4 (ip, (ip4_address_t *) buf);
+}
+
+always_inline void
+ip6_addr_fib_init (ip6_address_fib_t * addr_fib, ip6_address_t * address,
+		   u32 fib_index)
+{
+  addr_fib->ip6_addr.as_u64[0] = address->as_u64[0];
+  addr_fib->ip6_addr.as_u64[1] = address->as_u64[1];
+  addr_fib->fib_index = fib_index;
+}
+
+/* Special addresses:
+   unspecified		::/128
+   loopback		::1/128
+   global unicast       2000::/3
+   unique local unicast fc00::/7
+   link local unicast	fe80::/10
+   multicast		ff00::/8
+   ietf reserved	everything else. */
+
+#define foreach_ip6_multicast_address_scope	\
+  _ (loopback, 0x1)				\
+  _ (link_local, 0x2)				\
+  _ (admin_local, 0x4)				\
+  _ (site_local, 0x5)				\
+  _ (organization_local, 0x8)			\
+  _ (global, 0xe)
+
+#define foreach_ip6_multicast_link_local_group_id	\
+  _ (all_hosts, 0x1)					\
+  _ (all_routers, 0x2)					\
+  _ (rip_routers, 0x9)					\
+  _ (eigrp_routers, 0xa)				\
+  _ (pim_routers, 0xd)                            \
+ _ (mldv2_routers, 0x16)
+
+typedef enum
+{
+#define _(f,n) IP6_MULTICAST_SCOPE_##f = n,
+  foreach_ip6_multicast_address_scope
+#undef _
+} ip6_multicast_address_scope_t;
+
+typedef enum
+{
+#define _(f,n) IP6_MULTICAST_GROUP_ID_##f = n,
+  foreach_ip6_multicast_link_local_group_id
+#undef _
+} ip6_multicast_link_local_group_id_t;
+
+always_inline uword
+ip6_address_is_multicast (ip6_address_t * a)
+{
+  return a->as_u8[0] == 0xff;
+}
+
+always_inline uword
+ip46_address_is_multicast (ip46_address_t * a)
+{
+  return ip46_address_is_ip4 (a) ? ip4_address_is_multicast (&a->ip4) :
+    ip6_address_is_multicast (&a->ip6);
+}
+
+always_inline void
+ip6_set_reserved_multicast_address (ip6_address_t * a,
+				    ip6_multicast_address_scope_t scope,
+				    u16 id)
+{
+  a->as_u64[0] = a->as_u64[1] = 0;
+  a->as_u16[0] = clib_host_to_net_u16 (0xff00 | scope);
+  a->as_u16[7] = clib_host_to_net_u16 (id);
+}
+
+always_inline void
+ip6_set_solicited_node_multicast_address (ip6_address_t * a, u32 id)
+{
+  /* 0xff02::1:ffXX:XXXX. */
+  a->as_u64[0] = a->as_u64[1] = 0;
+  a->as_u16[0] = clib_host_to_net_u16 (0xff02);
+  a->as_u8[11] = 1;
+  ASSERT ((id >> 24) == 0);
+  id |= 0xff << 24;
+  a->as_u32[3] = clib_host_to_net_u32 (id);
+}
+
+always_inline void
+ip6_link_local_address_from_ethernet_address (ip6_address_t * a,
+					      u8 * ethernet_address)
+{
+  a->as_u64[0] = a->as_u64[1] = 0;
+  a->as_u16[0] = clib_host_to_net_u16 (0xfe80);
+  /* Always set locally administered bit (6). */
+  a->as_u8[0x8] = ethernet_address[0] | (1 << 6);
+  a->as_u8[0x9] = ethernet_address[1];
+  a->as_u8[0xa] = ethernet_address[2];
+  a->as_u8[0xb] = 0xff;
+  a->as_u8[0xc] = 0xfe;
+  a->as_u8[0xd] = ethernet_address[3];
+  a->as_u8[0xe] = ethernet_address[4];
+  a->as_u8[0xf] = ethernet_address[5];
+}
+
+always_inline void
+ip6_multicast_ethernet_address (u8 * ethernet_address, u32 group_id)
+{
+  ethernet_address[0] = 0x33;
+  ethernet_address[1] = 0x33;
+  ethernet_address[2] = ((group_id >> 24) & 0xff);
+  ethernet_address[3] = ((group_id >> 16) & 0xff);
+  ethernet_address[4] = ((group_id >> 8) & 0xff);
+  ethernet_address[5] = ((group_id >> 0) & 0xff);
+}
+
+always_inline uword
+ip6_address_is_equal (ip6_address_t * a, ip6_address_t * b)
+{
+  int i;
+  for (i = 0; i < ARRAY_LEN (a->as_uword); i++)
+    if (a->as_uword[i] != b->as_uword[i])
+      return 0;
+  return 1;
+}
+
+always_inline uword
+ip6_address_is_equal_masked (ip6_address_t * a, ip6_address_t * b,
+			     ip6_address_t * mask)
+{
+  int i;
+  for (i = 0; i < ARRAY_LEN (a->as_uword); i++)
+    {
+      uword a_masked, b_masked;
+      a_masked = a->as_uword[i] & mask->as_uword[i];
+      b_masked = b->as_uword[i] & mask->as_uword[i];
+
+      if (a_masked != b_masked)
+	return 0;
+    }
+  return 1;
+}
+
+always_inline void
+ip6_address_mask (ip6_address_t * a, ip6_address_t * mask)
+{
+  int i;
+  for (i = 0; i < ARRAY_LEN (a->as_uword); i++)
+    a->as_uword[i] &= mask->as_uword[i];
+}
+
+always_inline void
+ip6_address_set_zero (ip6_address_t * a)
+{
+  int i;
+  for (i = 0; i < ARRAY_LEN (a->as_uword); i++)
+    a->as_uword[i] = 0;
+}
+
+always_inline void
+ip6_address_mask_from_width (ip6_address_t * a, u32 width)
+{
+  int i, byte, bit, bitnum;
+  ASSERT (width <= 128);
+  memset (a, 0, sizeof (a[0]));
+  for (i = 0; i < width; i++)
+    {
+      bitnum = (7 - (i & 7));
+      byte = i / 8;
+      bit = 1 << bitnum;
+      a->as_u8[byte] |= bit;
+    }
+}
+
+always_inline uword
+ip6_address_is_zero (ip6_address_t * a)
+{
+  int i;
+  for (i = 0; i < ARRAY_LEN (a->as_uword); i++)
+    if (a->as_uword[i] != 0)
+      return 0;
+  return 1;
+}
+
+/* Check for unspecified address ::0 */
+always_inline uword
+ip6_address_is_unspecified (ip6_address_t * a)
+{
+  return ip6_address_is_zero (a);
+}
+
+/* Check for loopback address ::1 */
+always_inline uword
+ip6_address_is_loopback (ip6_address_t * a)
+{
+  uword is_loopback;
+  u8 save = a->as_u8[15];
+  a->as_u8[15] = save ^ 1;
+  is_loopback = ip6_address_is_zero (a);
+  a->as_u8[15] = save;
+  return is_loopback;
+}
+
+/* Check for link local unicast fe80::/10. */
+always_inline uword
+ip6_address_is_link_local_unicast (ip6_address_t * a)
+{
+  return a->as_u8[0] == 0xfe && (a->as_u8[1] & 0xc0) == 0x80;
+}
+
+/* Check for unique local unicast fc00::/7. */
+always_inline uword
+ip6_address_is_local_unicast (ip6_address_t * a)
+{
+  return (a->as_u8[0] & 0xfe) == 0xfc;
+}
+
+/* Check for unique global unicast 2000::/3. */
+always_inline uword
+ip6_address_is_global_unicast (ip6_address_t * a)
+{
+  return (a->as_u8[0] & 0xe0) == 0x20;
+}
+
+/* Check for solicited node multicast 0xff02::1:ff00:0/104 */
+always_inline uword
+ip6_is_solicited_node_multicast_address (ip6_address_t * a)
+{
+  return (a->as_u32[0] == clib_host_to_net_u32 (0xff020000)
+	  && a->as_u32[1] == 0
+	  && a->as_u32[2] == clib_host_to_net_u32 (1)
+	  && a->as_u8[12] == 0xff);
+}
+
+typedef struct
+{
+  /* 4 bit version, 8 bit traffic class and 20 bit flow label. */
+  u32 ip_version_traffic_class_and_flow_label;
+
+  /* Total packet length not including this header (but including
+     any extension headers if present). */
+  u16 payload_length;
+
+  /* Protocol for next header. */
+  u8 protocol;
+
+  /* Hop limit decremented by router at each hop. */
+  u8 hop_limit;
+
+  /* Source and destination address. */
+  ip6_address_t src_address, dst_address;
+} ip6_header_t;
+
+always_inline void *
+ip6_next_header (ip6_header_t * i)
+{
+  return (void *) (i + 1);
+}
+
+always_inline void
+ip6_copy_header (ip6_header_t * dst, const ip6_header_t * src)
+{
+  dst->ip_version_traffic_class_and_flow_label =
+    src->ip_version_traffic_class_and_flow_label;
+  dst->payload_length = src->payload_length;
+  dst->protocol = src->protocol;
+  dst->hop_limit = src->hop_limit;
+
+  dst->src_address.as_uword[0] = src->src_address.as_uword[0];
+  dst->src_address.as_uword[1] = src->src_address.as_uword[1];
+  dst->dst_address.as_uword[0] = src->dst_address.as_uword[0];
+  dst->dst_address.as_uword[1] = src->dst_address.as_uword[1];
+}
+
+always_inline void
+ip6_tcp_reply_x1 (ip6_header_t * ip0, tcp_header_t * tcp0)
+{
+  {
+    ip6_address_t src0, dst0;
+
+    src0 = ip0->src_address;
+    dst0 = ip0->dst_address;
+    ip0->src_address = dst0;
+    ip0->dst_address = src0;
+  }
+
+  {
+    u16 src0, dst0;
+
+    src0 = tcp0->ports.src;
+    dst0 = tcp0->ports.dst;
+    tcp0->ports.src = dst0;
+    tcp0->ports.dst = src0;
+  }
+}
+
+always_inline void
+ip6_tcp_reply_x2 (ip6_header_t * ip0, ip6_header_t * ip1,
+		  tcp_header_t * tcp0, tcp_header_t * tcp1)
+{
+  {
+    ip6_address_t src0, dst0, src1, dst1;
+
+    src0 = ip0->src_address;
+    src1 = ip1->src_address;
+    dst0 = ip0->dst_address;
+    dst1 = ip1->dst_address;
+    ip0->src_address = dst0;
+    ip1->src_address = dst1;
+    ip0->dst_address = src0;
+    ip1->dst_address = src1;
+  }
+
+  {
+    u16 src0, dst0, src1, dst1;
+
+    src0 = tcp0->ports.src;
+    src1 = tcp1->ports.src;
+    dst0 = tcp0->ports.dst;
+    dst1 = tcp1->ports.dst;
+    tcp0->ports.src = dst0;
+    tcp1->ports.src = dst1;
+    tcp0->ports.dst = src0;
+    tcp1->ports.dst = src1;
+  }
+}
+
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u8 data;
+}) ip6_pad1_option_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u8 type;
+  u8 len;
+  u8 data[0];
+}) ip6_padN_option_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+#define IP6_MLDP_ALERT_TYPE  0x5
+  u8 type;
+  u8 len;
+  u16 value;
+}) ip6_router_alert_option_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u8 next_hdr;
+  /* Length of this header plus option data in 8 byte units. */
+  u8 n_data_u64s;
+}) ip6_ext_header_t;
+
+always_inline u8 ip6_ext_hdr(u8 nexthdr)
+{
+  /*
+   * find out if nexthdr is an extension header or a protocol
+   */
+  return   (nexthdr == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS) ||
+    (nexthdr == IP_PROTOCOL_IP6_NONXT) ||
+    (nexthdr == IP_PROTOCOL_IPV6_FRAGMENTATION)  ||
+    (nexthdr == IP_PROTOCOL_IPSEC_AH)      ||
+    (nexthdr == IP_PROTOCOL_IPV6_ROUTE)      ||
+    (nexthdr == IP_PROTOCOL_IP6_DESTINATION_OPTIONS);
+}
+
+#define ip6_ext_header_len(p)  (((p)->n_data_u64s+1) << 3)
+#define ip6_ext_authhdr_len(p) (((p)->n_data_u64s+2) << 2)
+
+always_inline void *
+ip6_ext_next_header (ip6_ext_header_t *ext_hdr )
+{ return (void *)((u8 *) ext_hdr + ip6_ext_header_len(ext_hdr)); }
+
+typedef CLIB_PACKED (struct {
+  u8 next_hdr;
+  /* Length of this header plus option data in 8 byte units. */
+  u8 n_data_u64s;
+  u8 data[0];
+}) ip6_hop_by_hop_ext_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u8 next_hdr;
+  u8 rsv;
+  u16 fragment_offset_and_more;
+  u32 identification;
+}) ip6_frag_hdr_t;
+/* *INDENT-ON* */
+
+#define ip6_frag_hdr_offset(hdr) \
+  (clib_net_to_host_u16((hdr)->fragment_offset_and_more) >> 3)
+
+#define ip6_frag_hdr_more(hdr) \
+  (clib_net_to_host_u16((hdr)->fragment_offset_and_more) & 0x1)
+
+#define ip6_frag_hdr_offset_and_more(offset, more) \
+  clib_host_to_net_u16(((offset) << 3) + !!(more))
+
+#endif /* included_ip6_packet_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip6_pg.c b/src/vnet/ip/ip6_pg.c
new file mode 100644
index 00000000..ba1e4ad9
--- /dev/null
+++ b/src/vnet/ip/ip6_pg.c
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip6_pg: IP v4 packet-generator interface
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+#include <vnet/pg/pg.h>
+
+static void
+ip6_pg_edit_function (pg_main_t * pg,
+		      pg_stream_t * s,
+		      pg_edit_group_t * g, u32 * packets, u32 n_packets)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  u32 ip_header_offset = g->start_byte_offset;
+
+  while (n_packets >= 2)
+    {
+      u32 pi0, pi1;
+      vlib_buffer_t *p0, *p1;
+      ip6_header_t *ip0, *ip1;
+
+      pi0 = packets[0];
+      pi1 = packets[1];
+      p0 = vlib_get_buffer (vm, pi0);
+      p1 = vlib_get_buffer (vm, pi1);
+      n_packets -= 2;
+      packets += 2;
+
+      ip0 = (void *) (p0->data + ip_header_offset);
+      ip1 = (void *) (p1->data + ip_header_offset);
+
+      ip0->payload_length =
+	clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, p0) -
+			      ip_header_offset - sizeof (ip0[0]));
+      ip1->payload_length =
+	clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, p1) -
+			      ip_header_offset - sizeof (ip1[0]));
+    }
+
+  while (n_packets >= 1)
+    {
+      u32 pi0;
+      vlib_buffer_t *p0;
+      ip6_header_t *ip0;
+
+      pi0 = packets[0];
+      p0 = vlib_get_buffer (vm, pi0);
+      n_packets -= 1;
+      packets += 1;
+
+      ip0 = (void *) (p0->data + ip_header_offset);
+
+      ip0->payload_length =
+	clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, p0) -
+			      ip_header_offset - sizeof (ip0[0]));
+    }
+}
+
+typedef struct
+{
+  pg_edit_t ip_version;
+  pg_edit_t traffic_class;
+  pg_edit_t flow_label;
+  pg_edit_t payload_length;
+  pg_edit_t protocol;
+  pg_edit_t hop_limit;
+  pg_edit_t src_address, dst_address;
+} pg_ip6_header_t;
+
+static inline void
+pg_ip6_header_init (pg_ip6_header_t * p)
+{
+  /* Initialize fields that are not bit fields in the IP header. */
+#define _(f) pg_edit_init (&p->f, ip6_header_t, f);
+  _(payload_length);
+  _(hop_limit);
+  _(protocol);
+  _(src_address);
+  _(dst_address);
+#undef _
+
+  /* Initialize bit fields. */
+  pg_edit_init_bitfield (&p->ip_version, ip6_header_t,
+			 ip_version_traffic_class_and_flow_label, 28, 4);
+  pg_edit_init_bitfield (&p->traffic_class, ip6_header_t,
+			 ip_version_traffic_class_and_flow_label, 20, 8);
+  pg_edit_init_bitfield (&p->flow_label, ip6_header_t,
+			 ip_version_traffic_class_and_flow_label, 0, 20);
+}
+
+uword
+unformat_pg_ip6_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  pg_ip6_header_t *p;
+  u32 group_index;
+
+  p = pg_create_edit_group (s, sizeof (p[0]), sizeof (ip6_header_t),
+			    &group_index);
+  pg_ip6_header_init (p);
+
+  /* Defaults. */
+  pg_edit_set_fixed (&p->ip_version, 6);
+  pg_edit_set_fixed (&p->traffic_class, 0);
+  pg_edit_set_fixed (&p->flow_label, 0);
+  pg_edit_set_fixed (&p->hop_limit, 64);
+
+  p->payload_length.type = PG_EDIT_UNSPECIFIED;
+
+  if (!unformat (input, "%U: %U -> %U",
+		 unformat_pg_edit,
+		 unformat_ip_protocol, &p->protocol,
+		 unformat_pg_edit,
+		 unformat_ip6_address, &p->src_address,
+		 unformat_pg_edit, unformat_ip6_address, &p->dst_address))
+    goto error;
+
+  /* Parse options. */
+  while (1)
+    {
+      if (unformat (input, "version %U",
+		    unformat_pg_edit, unformat_pg_number, &p->ip_version))
+	;
+
+      else if (unformat (input, "traffic-class %U",
+			 unformat_pg_edit,
+			 unformat_pg_number, &p->traffic_class))
+	;
+
+      else if (unformat (input, "length %U",
+			 unformat_pg_edit,
+			 unformat_pg_number, &p->payload_length))
+	;
+
+      else if (unformat (input, "hop-limit %U",
+			 unformat_pg_edit, unformat_pg_number, &p->hop_limit))
+	;
+
+      /* Can't parse input: try next protocol level. */
+      else
+	break;
+    }
+
+  {
+    ip_main_t *im = &ip_main;
+    ip_protocol_t protocol;
+    ip_protocol_info_t *pi;
+
+    pi = 0;
+    if (p->protocol.type == PG_EDIT_FIXED)
+      {
+	protocol = pg_edit_get_value (&p->protocol, PG_EDIT_LO);
+	pi = ip_get_protocol_info (im, protocol);
+      }
+
+    if (pi && pi->unformat_pg_edit
+	&& unformat_user (input, pi->unformat_pg_edit, s))
+      ;
+
+    else if (!unformat_user (input, unformat_pg_payload, s))
+      goto error;
+
+    if (p->payload_length.type == PG_EDIT_UNSPECIFIED
+	&& s->min_packet_bytes == s->max_packet_bytes
+	&& group_index + 1 < vec_len (s->edit_groups))
+      {
+	pg_edit_set_fixed (&p->payload_length,
+			   pg_edit_group_n_bytes (s,
+						  group_index) -
+			   sizeof (ip6_header_t));
+      }
+
+    p = pg_get_edit_group (s, group_index);
+    if (p->payload_length.type == PG_EDIT_UNSPECIFIED)
+      {
+	pg_edit_group_t *g = pg_stream_get_group (s, group_index);
+	g->edit_function = ip6_pg_edit_function;
+      }
+
+    return 1;
+  }
+
+error:
+  /* Free up any edits we may have added. */
+  pg_free_edit_group (s);
+  return 0;
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip_api.c b/src/vnet/ip/ip_api.c
new file mode 100644
index 00000000..cd9b7397
--- /dev/null
+++ b/src/vnet/ip/ip_api.c
@@ -0,0 +1,1196 @@
+/*
+ *------------------------------------------------------------------
+ * ip_api.c - vnet ip api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ip/ip6_neighbor.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/fib_api.h>
+#include <vnet/dpo/drop_dpo.h>
+#include <vnet/dpo/receive_dpo.h>
+#include <vnet/dpo/lookup_dpo.h>
+#include <vnet/dpo/classify_dpo.h>
+#include <vnet/dpo/ip_null_dpo.h>
+#include <vnet/ethernet/arp_packet.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_ip_api_msg                                              \
+_(IP_FIB_DUMP, ip_fib_dump)                                             \
+_(IP_FIB_DETAILS, ip_fib_details)                                       \
+_(IP6_FIB_DUMP, ip6_fib_dump)                                           \
+_(IP6_FIB_DETAILS, ip6_fib_details)                                     \
+_(IP_NEIGHBOR_DUMP, ip_neighbor_dump)                                   \
+_(IP_NEIGHBOR_DETAILS, ip_neighbor_details)                             \
+_(IP_ADDRESS_DUMP, ip_address_dump)                                     \
+_(IP_DUMP, ip_dump)                                                     \
+_(IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del)                             \
+_(IP_ADD_DEL_ROUTE, ip_add_del_route)                                   \
+_(SET_IP_FLOW_HASH,set_ip_flow_hash)                                    \
+_(SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config)           \
+_(SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix)           \
+_(SW_INTERFACE_IP6_ENABLE_DISABLE, sw_interface_ip6_enable_disable )    \
+_(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS, 				\
+  sw_interface_ip6_set_link_local_address)
+
+extern void stats_dslock_with_hint (int hint, int tag);
+extern void stats_dsunlock (void);
+
+static void
+send_ip_neighbor_details (u8 is_ipv6,
+			  u8 is_static,
+			  u8 * mac_address,
+			  u8 * ip_address,
+			  unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_ip_neighbor_details_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_IP_NEIGHBOR_DETAILS);
+  mp->context = context;
+  mp->is_ipv6 = is_ipv6;
+  mp->is_static = is_static;
+  memcpy (mp->mac_address, mac_address, 6);
+  memcpy (mp->ip_address, ip_address, (is_ipv6) ? 16 : 4);
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_ip_neighbor_details_t_handler (vl_api_ip_neighbor_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+vl_api_ip_neighbor_dump_t_handler (vl_api_ip_neighbor_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+
+  if (mp->is_ipv6)
+    {
+      ip6_neighbor_t *n, *ns;
+
+      ns = ip6_neighbors_entries (sw_if_index);
+      /* *INDENT-OFF* */
+      vec_foreach (n, ns)
+      {
+        send_ip_neighbor_details
+          (mp->is_ipv6, ((n->flags & IP6_NEIGHBOR_FLAG_STATIC) ? 1 : 0),
+           (u8 *) n->link_layer_address,
+           (u8 *) & (n->key.ip6_address.as_u8),
+           q, mp->context);
+      }
+      /* *INDENT-ON* */
+      vec_free (ns);
+    }
+  else
+    {
+      ethernet_arp_ip4_entry_t *n, *ns;
+
+      ns = ip4_neighbor_entries (sw_if_index);
+      /* *INDENT-OFF* */
+      vec_foreach (n, ns)
+      {
+        send_ip_neighbor_details (mp->is_ipv6,
+          ((n->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC) ? 1 : 0),
+          (u8*) n->ethernet_address,
+          (u8*) & (n->ip4_address.as_u8),
+          q, mp->context);
+      }
+      /* *INDENT-ON* */
+      vec_free (ns);
+    }
+}
+
+
+void
+copy_fib_next_hop (fib_route_path_encode_t * api_rpath, void *fp_arg)
+{
+  int is_ip4;
+  vl_api_fib_path_t *fp = (vl_api_fib_path_t *) fp_arg;
+
+  if (api_rpath->rpath.frp_proto == FIB_PROTOCOL_IP4)
+    fp->afi = IP46_TYPE_IP4;
+  else if (api_rpath->rpath.frp_proto == FIB_PROTOCOL_IP6)
+    fp->afi = IP46_TYPE_IP6;
+  else
+    {
+      is_ip4 = ip46_address_is_ip4 (&api_rpath->rpath.frp_addr);
+      if (is_ip4)
+	fp->afi = IP46_TYPE_IP4;
+      else
+	fp->afi = IP46_TYPE_IP6;
+    }
+  if (fp->afi == IP46_TYPE_IP4)
+    memcpy (fp->next_hop, &api_rpath->rpath.frp_addr.ip4,
+	    sizeof (api_rpath->rpath.frp_addr.ip4));
+  else
+    memcpy (fp->next_hop, &api_rpath->rpath.frp_addr.ip6,
+	    sizeof (api_rpath->rpath.frp_addr.ip6));
+}
+
+static void
+vl_api_ip_fib_details_t_handler (vl_api_ip_fib_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+vl_api_ip_fib_details_t_endian (vl_api_ip_fib_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+vl_api_ip_fib_details_t_print (vl_api_ip_fib_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+send_ip_fib_details (vpe_api_main_t * am,
+		     unix_shared_memory_queue_t * q,
+		     u32 table_id, fib_prefix_t * pfx,
+		     fib_route_path_encode_t * api_rpaths, u32 context)
+{
+  vl_api_ip_fib_details_t *mp;
+  fib_route_path_encode_t *api_rpath;
+  vl_api_fib_path_t *fp;
+  int path_count;
+
+  path_count = vec_len (api_rpaths);
+  mp = vl_msg_api_alloc (sizeof (*mp) + path_count * sizeof (*fp));
+  if (!mp)
+    return;
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_IP_FIB_DETAILS);
+  mp->context = context;
+
+  mp->table_id = htonl (table_id);
+  mp->address_length = pfx->fp_len;
+  memcpy (mp->address, &pfx->fp_addr.ip4, sizeof (pfx->fp_addr.ip4));
+
+  mp->count = htonl (path_count);
+  fp = mp->path;
+  vec_foreach (api_rpath, api_rpaths)
+  {
+    memset (fp, 0, sizeof (*fp));
+    switch (api_rpath->dpo.dpoi_type)
+      {
+      case DPO_RECEIVE:
+	fp->is_local = true;
+	break;
+      case DPO_DROP:
+	fp->is_drop = true;
+	break;
+      case DPO_IP_NULL:
+	switch (api_rpath->dpo.dpoi_index)
+	  {
+	  case IP_NULL_ACTION_NONE:
+	    fp->is_drop = true;
+	    break;
+	  case IP_NULL_ACTION_SEND_ICMP_UNREACH:
+	    fp->is_unreach = true;
+	    break;
+	  case IP_NULL_ACTION_SEND_ICMP_PROHIBIT:
+	    fp->is_prohibit = true;
+	    break;
+	  default:
+	    break;
+	  }
+	break;
+      default:
+	break;
+      }
+    fp->weight = htonl (api_rpath->rpath.frp_weight);
+    fp->sw_if_index = htonl (api_rpath->rpath.frp_sw_if_index);
+    copy_fib_next_hop (api_rpath, fp);
+    fp++;
+  }
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_ip_fib_dump_t_handler (vl_api_ip_fib_dump_t * mp)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+  unix_shared_memory_queue_t *q;
+  ip4_main_t *im = &ip4_main;
+  fib_table_t *fib_table;
+  fib_node_index_t lfei, *lfeip, *lfeis = NULL;
+  mpls_label_t key;
+  fib_prefix_t pfx;
+  u32 fib_index;
+  fib_route_path_encode_t *api_rpaths;
+  int i;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  /* *INDENT-OFF* */
+  pool_foreach (fib_table, im->fibs,
+  ({
+    for (i = 0; i < ARRAY_LEN (fib_table->v4.fib_entry_by_dst_address); i++)
+      {
+        hash_foreach(key, lfei, fib_table->v4.fib_entry_by_dst_address[i],
+        ({
+          vec_add1(lfeis, lfei);
+        }));
+      }
+  }));
+  /* *INDENT-ON* */
+
+  vec_sort_with_function (lfeis, fib_entry_cmp_for_sort);
+
+  vec_foreach (lfeip, lfeis)
+  {
+    fib_entry_get_prefix (*lfeip, &pfx);
+    fib_index = fib_entry_get_fib_index (*lfeip);
+    fib_table = fib_table_get (fib_index, pfx.fp_proto);
+    api_rpaths = NULL;
+    fib_entry_encode (*lfeip, &api_rpaths);
+    send_ip_fib_details (am, q,
+			 fib_table->ft_table_id, &pfx, api_rpaths,
+			 mp->context);
+    vec_free (api_rpaths);
+  }
+
+  vec_free (lfeis);
+}
+
+static void
+vl_api_ip6_fib_details_t_handler (vl_api_ip6_fib_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+vl_api_ip6_fib_details_t_endian (vl_api_ip6_fib_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+vl_api_ip6_fib_details_t_print (vl_api_ip6_fib_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+send_ip6_fib_details (vpe_api_main_t * am,
+		      unix_shared_memory_queue_t * q,
+		      u32 table_id, fib_prefix_t * pfx,
+		      fib_route_path_encode_t * api_rpaths, u32 context)
+{
+  vl_api_ip6_fib_details_t *mp;
+  fib_route_path_encode_t *api_rpath;
+  vl_api_fib_path_t *fp;
+  int path_count;
+
+  path_count = vec_len (api_rpaths);
+  mp = vl_msg_api_alloc (sizeof (*mp) + path_count * sizeof (*fp));
+  if (!mp)
+    return;
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_IP6_FIB_DETAILS);
+  mp->context = context;
+
+  mp->table_id = htonl (table_id);
+  mp->address_length = pfx->fp_len;
+  memcpy (mp->address, &pfx->fp_addr.ip6, sizeof (pfx->fp_addr.ip6));
+
+  mp->count = htonl (path_count);
+  fp = mp->path;
+  vec_foreach (api_rpath, api_rpaths)
+  {
+    memset (fp, 0, sizeof (*fp));
+    switch (api_rpath->dpo.dpoi_type)
+      {
+      case DPO_RECEIVE:
+	fp->is_local = true;
+	break;
+      case DPO_DROP:
+	fp->is_drop = true;
+	break;
+      case DPO_IP_NULL:
+	switch (api_rpath->dpo.dpoi_index)
+	  {
+	  case IP_NULL_DPO_ACTION_NUM + IP_NULL_ACTION_NONE:
+	    fp->is_drop = true;
+	    break;
+	  case IP_NULL_DPO_ACTION_NUM + IP_NULL_ACTION_SEND_ICMP_UNREACH:
+	    fp->is_unreach = true;
+	    break;
+	  case IP_NULL_DPO_ACTION_NUM + IP_NULL_ACTION_SEND_ICMP_PROHIBIT:
+	    fp->is_prohibit = true;
+	    break;
+	  default:
+	    break;
+	  }
+	break;
+      default:
+	break;
+      }
+    fp->weight = htonl (api_rpath->rpath.frp_weight);
+    fp->sw_if_index = htonl (api_rpath->rpath.frp_sw_if_index);
+    copy_fib_next_hop (api_rpath, fp);
+    fp++;
+  }
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+typedef struct apt_ip6_fib_show_ctx_t_
+{
+  u32 fib_index;
+  fib_node_index_t *entries;
+} api_ip6_fib_show_ctx_t;
+
+static void
+api_ip6_fib_table_put_entries (clib_bihash_kv_24_8_t * kvp, void *arg)
+{
+  api_ip6_fib_show_ctx_t *ctx = arg;
+
+  if ((kvp->key[2] >> 32) == ctx->fib_index)
+    {
+      vec_add1 (ctx->entries, kvp->value);
+    }
+}
+
+static void
+api_ip6_fib_table_get_all (unix_shared_memory_queue_t * q,
+			   vl_api_ip6_fib_dump_t * mp,
+			   fib_table_t * fib_table)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+  ip6_main_t *im6 = &ip6_main;
+  ip6_fib_t *fib = &fib_table->v6;
+  fib_node_index_t *fib_entry_index;
+  api_ip6_fib_show_ctx_t ctx = {
+    .fib_index = fib->index,.entries = NULL,
+  };
+  fib_route_path_encode_t *api_rpaths;
+  fib_prefix_t pfx;
+
+  BV (clib_bihash_foreach_key_value_pair)
+    ((BVT (clib_bihash) *) & im6->ip6_table[IP6_FIB_TABLE_NON_FWDING].
+     ip6_hash, api_ip6_fib_table_put_entries, &ctx);
+
+  vec_sort_with_function (ctx.entries, fib_entry_cmp_for_sort);
+
+  vec_foreach (fib_entry_index, ctx.entries)
+  {
+    fib_entry_get_prefix (*fib_entry_index, &pfx);
+    api_rpaths = NULL;
+    fib_entry_encode (*fib_entry_index, &api_rpaths);
+    send_ip6_fib_details (am, q,
+			  fib_table->ft_table_id,
+			  &pfx, api_rpaths, mp->context);
+    vec_free (api_rpaths);
+  }
+
+  vec_free (ctx.entries);
+}
+
+static void
+vl_api_ip6_fib_dump_t_handler (vl_api_ip6_fib_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  ip6_main_t *im6 = &ip6_main;
+  fib_table_t *fib_table;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  /* *INDENT-OFF* */
+  pool_foreach (fib_table, im6->fibs,
+  ({
+    api_ip6_fib_table_get_all(q, mp, fib_table);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_ip_neighbor_add_del_t_handler (vl_api_ip_neighbor_add_del_t * mp,
+				      vlib_main_t * vm)
+{
+  vl_api_ip_neighbor_add_del_reply_t *rmp;
+  vnet_main_t *vnm = vnet_get_main ();
+  int rv = 0;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  stats_dslock_with_hint (1 /* release hint */ , 7 /* tag */ );
+
+  /*
+   * there's no validation here of the ND/ARP entry being added.
+   * The expectation is that the FIB will ensure that nothing bad
+   * will come of adding bogus entries.
+   */
+  if (mp->is_ipv6)
+    {
+      if (mp->is_add)
+	rv = vnet_set_ip6_ethernet_neighbor
+	  (vm, ntohl (mp->sw_if_index),
+	   (ip6_address_t *) (mp->dst_address),
+	   mp->mac_address, sizeof (mp->mac_address), mp->is_static);
+      else
+	rv = vnet_unset_ip6_ethernet_neighbor
+	  (vm, ntohl (mp->sw_if_index),
+	   (ip6_address_t *) (mp->dst_address),
+	   mp->mac_address, sizeof (mp->mac_address));
+    }
+  else
+    {
+      ethernet_arp_ip4_over_ethernet_address_t a;
+
+      clib_memcpy (&a.ethernet, mp->mac_address, 6);
+      clib_memcpy (&a.ip4, mp->dst_address, 4);
+
+      if (mp->is_add)
+	rv = vnet_arp_set_ip4_over_ethernet (vnm, ntohl (mp->sw_if_index),
+					     &a, mp->is_static);
+      else
+	rv =
+	  vnet_arp_unset_ip4_over_ethernet (vnm, ntohl (mp->sw_if_index), &a);
+    }
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  stats_dsunlock ();
+  REPLY_MACRO (VL_API_IP_NEIGHBOR_ADD_DEL_REPLY);
+}
+
+int
+add_del_route_t_handler (u8 is_multipath,
+			 u8 is_add,
+			 u8 is_drop,
+			 u8 is_unreach,
+			 u8 is_prohibit,
+			 u8 is_local,
+			 u8 is_classify,
+			 u32 classify_table_index,
+			 u8 is_resolve_host,
+			 u8 is_resolve_attached,
+			 u32 fib_index,
+			 const fib_prefix_t * prefix,
+			 u8 next_hop_proto_is_ip4,
+			 const ip46_address_t * next_hop,
+			 u32 next_hop_sw_if_index,
+			 u8 next_hop_fib_index,
+			 u32 next_hop_weight,
+			 mpls_label_t next_hop_via_label,
+			 mpls_label_t * next_hop_out_label_stack)
+{
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  fib_route_path_flags_t path_flags = FIB_ROUTE_PATH_FLAG_NONE;
+  fib_route_path_t path = {
+    .frp_proto = (next_hop_proto_is_ip4 ?
+		  FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6),
+    .frp_addr = (NULL == next_hop ? zero_addr : *next_hop),
+    .frp_sw_if_index = next_hop_sw_if_index,
+    .frp_fib_index = next_hop_fib_index,
+    .frp_weight = next_hop_weight,
+    .frp_label_stack = next_hop_out_label_stack,
+  };
+  fib_route_path_t *paths = NULL;
+
+  if (MPLS_LABEL_INVALID != next_hop_via_label)
+    {
+      path.frp_proto = FIB_PROTOCOL_MPLS;
+      path.frp_local_label = next_hop_via_label;
+    }
+  if (is_resolve_host)
+    path_flags |= FIB_ROUTE_PATH_RESOLVE_VIA_HOST;
+  if (is_resolve_attached)
+    path_flags |= FIB_ROUTE_PATH_RESOLVE_VIA_ATTACHED;
+
+  path.frp_flags = path_flags;
+
+  if (is_multipath)
+    {
+      stats_dslock_with_hint (1 /* release hint */ , 10 /* tag */ );
+
+
+      vec_add1 (paths, path);
+
+      if (is_add)
+	fib_table_entry_path_add2 (fib_index,
+				   prefix,
+				   FIB_SOURCE_API,
+				   FIB_ENTRY_FLAG_NONE, paths);
+      else
+	fib_table_entry_path_remove2 (fib_index,
+				      prefix, FIB_SOURCE_API, paths);
+
+      vec_free (paths);
+      stats_dsunlock ();
+      return 0;
+    }
+
+  stats_dslock_with_hint (1 /* release hint */ , 2 /* tag */ );
+
+  if (is_drop || is_local || is_classify || is_unreach || is_prohibit)
+    {
+      /*
+       * special route types that link directly to the adj
+       */
+      if (is_add)
+	{
+	  dpo_id_t dpo = DPO_INVALID;
+	  dpo_proto_t dproto;
+
+	  dproto = fib_proto_to_dpo (prefix->fp_proto);
+
+	  if (is_drop)
+	    ip_null_dpo_add_and_lock (dproto, IP_NULL_ACTION_NONE, &dpo);
+	  else if (is_local)
+	    receive_dpo_add_or_lock (dproto, ~0, NULL, &dpo);
+	  else if (is_unreach)
+	    ip_null_dpo_add_and_lock (dproto,
+				      IP_NULL_ACTION_SEND_ICMP_UNREACH, &dpo);
+	  else if (is_prohibit)
+	    ip_null_dpo_add_and_lock (dproto,
+				      IP_NULL_ACTION_SEND_ICMP_PROHIBIT,
+				      &dpo);
+	  else if (is_classify)
+	    {
+	      if (pool_is_free_index (cm->tables,
+				      ntohl (classify_table_index)))
+		{
+		  stats_dsunlock ();
+		  return VNET_API_ERROR_NO_SUCH_TABLE;
+		}
+
+	      dpo_set (&dpo, DPO_CLASSIFY, dproto,
+		       classify_dpo_create (dproto,
+					    ntohl (classify_table_index)));
+	    }
+	  else
+	    {
+	      stats_dsunlock ();
+	      return VNET_API_ERROR_NO_SUCH_TABLE;
+	    }
+
+	  fib_table_entry_special_dpo_update (fib_index,
+					      prefix,
+					      FIB_SOURCE_API,
+					      FIB_ENTRY_FLAG_EXCLUSIVE, &dpo);
+	  dpo_reset (&dpo);
+	}
+      else
+	{
+	  fib_table_entry_special_remove (fib_index, prefix, FIB_SOURCE_API);
+	}
+    }
+  else
+    {
+      if (is_add)
+	{
+	  vec_add1 (paths, path);
+	  fib_table_entry_update (fib_index,
+				  prefix,
+				  FIB_SOURCE_API, FIB_ENTRY_FLAG_NONE, paths);
+	  vec_free (paths);
+	}
+      else
+	{
+	  fib_table_entry_delete (fib_index, prefix, FIB_SOURCE_API);
+	}
+    }
+
+  stats_dsunlock ();
+  return (0);
+}
+
+int
+add_del_route_check (fib_protocol_t table_proto,
+		     u32 table_id,
+		     u32 next_hop_sw_if_index,
+		     fib_protocol_t next_hop_table_proto,
+		     u32 next_hop_table_id,
+		     u8 create_missing_tables,
+		     u32 * fib_index, u32 * next_hop_fib_index)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+
+  *fib_index = fib_table_find (table_proto, ntohl (table_id));
+  if (~0 == *fib_index)
+    {
+      if (create_missing_tables)
+	{
+	  *fib_index = fib_table_find_or_create_and_lock (table_proto,
+							  ntohl (table_id));
+	}
+      else
+	{
+	  /* No such VRF, and we weren't asked to create one */
+	  return VNET_API_ERROR_NO_SUCH_FIB;
+	}
+    }
+
+  if (~0 != ntohl (next_hop_sw_if_index))
+    {
+      if (pool_is_free_index (vnm->interface_main.sw_interfaces,
+			      ntohl (next_hop_sw_if_index)))
+	{
+	  return VNET_API_ERROR_NO_MATCHING_INTERFACE;
+	}
+    }
+  else
+    {
+      *next_hop_fib_index = fib_table_find (next_hop_table_proto,
+					    ntohl (next_hop_table_id));
+
+      if (~0 == *next_hop_fib_index)
+	{
+	  if (create_missing_tables)
+	    {
+	      *next_hop_fib_index =
+		fib_table_find_or_create_and_lock (next_hop_table_proto,
+						   ntohl (next_hop_table_id));
+	    }
+	  else
+	    {
+	      /* No such VRF, and we weren't asked to create one */
+	      return VNET_API_ERROR_NO_SUCH_FIB;
+	    }
+	}
+    }
+
+  return (0);
+}
+
+static int
+ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp)
+{
+  u32 fib_index, next_hop_fib_index;
+  mpls_label_t *label_stack = NULL;
+  int rv, ii, n_labels;;
+
+  rv = add_del_route_check (FIB_PROTOCOL_IP4,
+			    mp->table_id,
+			    mp->next_hop_sw_if_index,
+			    FIB_PROTOCOL_IP4,
+			    mp->next_hop_table_id,
+			    mp->create_vrf_if_needed,
+			    &fib_index, &next_hop_fib_index);
+
+  if (0 != rv)
+    return (rv);
+
+  fib_prefix_t pfx = {
+    .fp_len = mp->dst_address_length,
+    .fp_proto = FIB_PROTOCOL_IP4,
+  };
+  clib_memcpy (&pfx.fp_addr.ip4, mp->dst_address, sizeof (pfx.fp_addr.ip4));
+
+  ip46_address_t nh;
+  memset (&nh, 0, sizeof (nh));
+  memcpy (&nh.ip4, mp->next_hop_address, sizeof (nh.ip4));
+
+  n_labels = mp->next_hop_n_out_labels;
+  if (n_labels == 0)
+    ;
+  else if (1 == n_labels)
+    vec_add1 (label_stack, ntohl (mp->next_hop_out_label_stack[0]));
+  else
+    {
+      vec_validate (label_stack, n_labels - 1);
+      for (ii = 0; ii < n_labels; ii++)
+	label_stack[ii] = ntohl (mp->next_hop_out_label_stack[ii]);
+    }
+
+  return (add_del_route_t_handler (mp->is_multipath,
+				   mp->is_add,
+				   mp->is_drop,
+				   mp->is_unreach,
+				   mp->is_prohibit,
+				   mp->is_local,
+				   mp->is_classify,
+				   mp->classify_table_index,
+				   mp->is_resolve_host,
+				   mp->is_resolve_attached,
+				   fib_index, &pfx, 1,
+				   &nh,
+				   ntohl (mp->next_hop_sw_if_index),
+				   next_hop_fib_index,
+				   mp->next_hop_weight,
+				   ntohl (mp->next_hop_via_label),
+				   label_stack));
+}
+
+static int
+ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp)
+{
+  u32 fib_index, next_hop_fib_index;
+  mpls_label_t *label_stack = NULL;
+  int rv, ii, n_labels;;
+
+  rv = add_del_route_check (FIB_PROTOCOL_IP6,
+			    mp->table_id,
+			    mp->next_hop_sw_if_index,
+			    FIB_PROTOCOL_IP6,
+			    mp->next_hop_table_id,
+			    mp->create_vrf_if_needed,
+			    &fib_index, &next_hop_fib_index);
+
+  if (0 != rv)
+    return (rv);
+
+  fib_prefix_t pfx = {
+    .fp_len = mp->dst_address_length,
+    .fp_proto = FIB_PROTOCOL_IP6,
+  };
+  clib_memcpy (&pfx.fp_addr.ip6, mp->dst_address, sizeof (pfx.fp_addr.ip6));
+
+  ip46_address_t nh;
+  memset (&nh, 0, sizeof (nh));
+  memcpy (&nh.ip6, mp->next_hop_address, sizeof (nh.ip6));
+
+  n_labels = mp->next_hop_n_out_labels;
+  if (n_labels == 0)
+    ;
+  else if (1 == n_labels)
+    vec_add1 (label_stack, ntohl (mp->next_hop_out_label_stack[0]));
+  else
+    {
+      vec_validate (label_stack, n_labels - 1);
+      for (ii = 0; ii < n_labels; ii++)
+	label_stack[ii] = ntohl (mp->next_hop_out_label_stack[ii]);
+    }
+
+  return (add_del_route_t_handler (mp->is_multipath,
+				   mp->is_add,
+				   mp->is_drop,
+				   mp->is_unreach,
+				   mp->is_prohibit,
+				   mp->is_local,
+				   mp->is_classify,
+				   mp->classify_table_index,
+				   mp->is_resolve_host,
+				   mp->is_resolve_attached,
+				   fib_index, &pfx, 0,
+				   &nh, ntohl (mp->next_hop_sw_if_index),
+				   next_hop_fib_index,
+				   mp->next_hop_weight,
+				   ntohl (mp->next_hop_via_label),
+				   label_stack));
+}
+
+void
+vl_api_ip_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp)
+{
+  vl_api_ip_add_del_route_reply_t *rmp;
+  int rv;
+  vnet_main_t *vnm = vnet_get_main ();
+
+  vnm->api_errno = 0;
+
+  if (mp->is_ipv6)
+    rv = ip6_add_del_route_t_handler (mp);
+  else
+    rv = ip4_add_del_route_t_handler (mp);
+
+  rv = (rv == 0) ? vnm->api_errno : rv;
+
+  REPLY_MACRO (VL_API_IP_ADD_DEL_ROUTE_REPLY);
+}
+
+static void
+send_ip_details (vpe_api_main_t * am,
+		 unix_shared_memory_queue_t * q, u32 sw_if_index, u32 context)
+{
+  vl_api_ip_details_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_IP_DETAILS);
+
+  mp->sw_if_index = ntohl (sw_if_index);
+  mp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+send_ip_address_details (vpe_api_main_t * am,
+			 unix_shared_memory_queue_t * q,
+			 u8 * ip, u16 prefix_length, u8 is_ipv6, u32 context)
+{
+  vl_api_ip_address_details_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_IP_ADDRESS_DETAILS);
+
+  if (is_ipv6)
+    {
+      clib_memcpy (&mp->ip, ip, sizeof (mp->ip));
+    }
+  else
+    {
+      u32 *tp = (u32 *) mp->ip;
+      *tp = *(u32 *) ip;
+    }
+  mp->prefix_length = prefix_length;
+  mp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_ip_address_dump_t_handler (vl_api_ip_address_dump_t * mp)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+  unix_shared_memory_queue_t *q;
+  ip6_address_t *r6;
+  ip4_address_t *r4;
+  ip6_main_t *im6 = &ip6_main;
+  ip4_main_t *im4 = &ip4_main;
+  ip_lookup_main_t *lm6 = &im6->lookup_main;
+  ip_lookup_main_t *lm4 = &im4->lookup_main;
+  ip_interface_address_t *ia = 0;
+  u32 sw_if_index = ~0;
+  int rv __attribute__ ((unused)) = 0;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  if (mp->is_ipv6)
+    {
+      /* *INDENT-OFF* */
+      foreach_ip_interface_address (lm6, ia, sw_if_index,
+                                    1 /* honor unnumbered */,
+      ({
+        r6 = ip_interface_address_get_address (lm6, ia);
+        u16 prefix_length = ia->address_length;
+        send_ip_address_details(am, q, (u8*)r6, prefix_length, 1, mp->context);
+      }));
+      /* *INDENT-ON* */
+    }
+  else
+    {
+      /* *INDENT-OFF* */
+      foreach_ip_interface_address (lm4, ia, sw_if_index,
+                                    1 /* honor unnumbered */,
+      ({
+        r4 = ip_interface_address_get_address (lm4, ia);
+        u16 prefix_length = ia->address_length;
+        send_ip_address_details(am, q, (u8*)r4, prefix_length, 0, mp->context);
+      }));
+      /* *INDENT-ON* */
+    }
+  BAD_SW_IF_INDEX_LABEL;
+}
+
+static void
+vl_api_ip_dump_t_handler (vl_api_ip_dump_t * mp)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  vlib_main_t *vm = vlib_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  unix_shared_memory_queue_t *q;
+  vnet_sw_interface_t *si, *sorted_sis;
+  u32 sw_if_index = ~0;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  /* Gather interfaces. */
+  sorted_sis = vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces));
+  _vec_len (sorted_sis) = 0;
+  /* *INDENT-OFF* */
+  pool_foreach (si, im->sw_interfaces,
+  ({
+    vec_add1 (sorted_sis, si[0]);
+  }));
+  /* *INDENT-ON* */
+
+  vec_foreach (si, sorted_sis)
+  {
+    if (!(si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED))
+      {
+	if (mp->is_ipv6 && !ip6_interface_enabled (vm, si->sw_if_index))
+	  {
+	    continue;
+	  }
+	sw_if_index = si->sw_if_index;
+	send_ip_details (am, q, sw_if_index, mp->context);
+      }
+  }
+}
+
+static void
+set_ip6_flow_hash (vl_api_set_ip_flow_hash_t * mp)
+{
+  vl_api_set_ip_flow_hash_reply_t *rmp;
+  int rv = VNET_API_ERROR_UNIMPLEMENTED;
+
+  clib_warning ("unimplemented...");
+
+  REPLY_MACRO (VL_API_SET_IP_FLOW_HASH_REPLY);
+}
+
+static void
+set_ip4_flow_hash (vl_api_set_ip_flow_hash_t * mp)
+{
+  vl_api_set_ip_flow_hash_reply_t *rmp;
+  int rv;
+  u32 table_id;
+  flow_hash_config_t flow_hash_config = 0;
+
+  table_id = ntohl (mp->vrf_id);
+
+#define _(a,b) if (mp->a) flow_hash_config |= b;
+  foreach_flow_hash_bit;
+#undef _
+
+  rv = vnet_set_ip4_flow_hash (table_id, flow_hash_config);
+
+  REPLY_MACRO (VL_API_SET_IP_FLOW_HASH_REPLY);
+}
+
+
+static void
+vl_api_set_ip_flow_hash_t_handler (vl_api_set_ip_flow_hash_t * mp)
+{
+  if (mp->is_ipv6 == 0)
+    set_ip4_flow_hash (mp);
+  else
+    set_ip6_flow_hash (mp);
+}
+
+static void
+  vl_api_sw_interface_ip6nd_ra_config_t_handler
+  (vl_api_sw_interface_ip6nd_ra_config_t * mp)
+{
+  vl_api_sw_interface_ip6nd_ra_config_reply_t *rmp;
+  vlib_main_t *vm = vlib_get_main ();
+  int rv = 0;
+  u8 is_no, suppress, managed, other, ll_option, send_unicast, cease,
+    default_router;
+
+  is_no = mp->is_no == 1;
+  suppress = mp->suppress == 1;
+  managed = mp->managed == 1;
+  other = mp->other == 1;
+  ll_option = mp->ll_option == 1;
+  send_unicast = mp->send_unicast == 1;
+  cease = mp->cease == 1;
+  default_router = mp->default_router == 1;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  rv = ip6_neighbor_ra_config (vm, ntohl (mp->sw_if_index),
+			       suppress, managed, other,
+			       ll_option, send_unicast, cease,
+			       default_router, ntohl (mp->lifetime),
+			       ntohl (mp->initial_count),
+			       ntohl (mp->initial_interval),
+			       ntohl (mp->max_interval),
+			       ntohl (mp->min_interval), is_no);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_IP6ND_RA_CONFIG_REPLY);
+}
+
+static void
+  vl_api_sw_interface_ip6nd_ra_prefix_t_handler
+  (vl_api_sw_interface_ip6nd_ra_prefix_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_sw_interface_ip6nd_ra_prefix_reply_t *rmp;
+  int rv = 0;
+  u8 is_no, use_default, no_advertise, off_link, no_autoconfig, no_onlink;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  is_no = mp->is_no == 1;
+  use_default = mp->use_default == 1;
+  no_advertise = mp->no_advertise == 1;
+  off_link = mp->off_link == 1;
+  no_autoconfig = mp->no_autoconfig == 1;
+  no_onlink = mp->no_onlink == 1;
+
+  rv = ip6_neighbor_ra_prefix (vm, ntohl (mp->sw_if_index),
+			       (ip6_address_t *) mp->address,
+			       mp->address_length, use_default,
+			       ntohl (mp->val_lifetime),
+			       ntohl (mp->pref_lifetime), no_advertise,
+			       off_link, no_autoconfig, no_onlink, is_no);
+
+  BAD_SW_IF_INDEX_LABEL;
+  REPLY_MACRO (VL_API_SW_INTERFACE_IP6ND_RA_PREFIX_REPLY);
+}
+
+static void
+  vl_api_sw_interface_ip6_enable_disable_t_handler
+  (vl_api_sw_interface_ip6_enable_disable_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_sw_interface_ip6_enable_disable_reply_t *rmp;
+  vnet_main_t *vnm = vnet_get_main ();
+  int rv = 0;
+  clib_error_t *error;
+
+  vnm->api_errno = 0;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  error =
+    (mp->enable == 1) ? enable_ip6_interface (vm,
+					      ntohl (mp->sw_if_index)) :
+    disable_ip6_interface (vm, ntohl (mp->sw_if_index));
+
+  if (error)
+    {
+      clib_error_report (error);
+      rv = VNET_API_ERROR_UNSPECIFIED;
+    }
+  else
+    {
+      rv = vnm->api_errno;
+    }
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY);
+}
+
+static void
+  vl_api_sw_interface_ip6_set_link_local_address_t_handler
+  (vl_api_sw_interface_ip6_set_link_local_address_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_sw_interface_ip6_set_link_local_address_reply_t *rmp;
+  int rv = 0;
+  clib_error_t *error;
+  vnet_main_t *vnm = vnet_get_main ();
+
+  vnm->api_errno = 0;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  error = set_ip6_link_local_address (vm,
+				      ntohl (mp->sw_if_index),
+				      (ip6_address_t *) mp->address,
+				      mp->address_length);
+  if (error)
+    {
+      clib_error_report (error);
+      rv = VNET_API_ERROR_UNSPECIFIED;
+    }
+  else
+    {
+      rv = vnm->api_errno;
+    }
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_REPLY);
+}
+
+
+#define vl_msg_name_crc_list
+#include <vnet/ip/ip.api.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_ip;
+#undef _
+}
+
+static clib_error_t *
+ip_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_ip_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (ip_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip_checksum.c b/src/vnet/ip/ip_checksum.c
new file mode 100644
index 00000000..6a9cf657
--- /dev/null
+++ b/src/vnet/ip/ip_checksum.c
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip4/ip_checksum.c: ip/tcp/udp checksums
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+
+ip_csum_t
+ip_incremental_checksum (ip_csum_t sum, void *_data, uword n_bytes)
+{
+  uword data = pointer_to_uword (_data);
+  ip_csum_t sum0, sum1;
+
+  sum0 = 0;
+  sum1 = sum;
+
+  /* Align data pointer to 64 bits. */
+#define _(t)					\
+do {						\
+  if (n_bytes >= sizeof (t)			\
+      && sizeof (t) < sizeof (ip_csum_t)	\
+      && (data % (2 * sizeof (t))) != 0)	\
+    {						\
+      sum0 += * uword_to_pointer (data, t *);	\
+      data += sizeof (t);			\
+      n_bytes -= sizeof (t);			\
+    }						\
+} while (0)
+
+  _(u8);
+  _(u16);
+  if (BITS (ip_csum_t) > 32)
+    _(u32);
+
+#undef _
+
+  {
+    ip_csum_t *d = uword_to_pointer (data, ip_csum_t *);
+
+    while (n_bytes >= 2 * sizeof (d[0]))
+      {
+	sum0 = ip_csum_with_carry (sum0, d[0]);
+	sum1 = ip_csum_with_carry (sum1, d[1]);
+	d += 2;
+	n_bytes -= 2 * sizeof (d[0]);
+      }
+
+    data = pointer_to_uword (d);
+  }
+
+#define _(t)								\
+do {									\
+  if (n_bytes >= sizeof (t) && sizeof (t) <= sizeof (ip_csum_t))	\
+    {									\
+      sum0 = ip_csum_with_carry (sum0, * uword_to_pointer (data, t *));	\
+      data += sizeof (t);						\
+      n_bytes -= sizeof (t);						\
+    }									\
+} while (0)
+
+  if (BITS (ip_csum_t) > 32)
+    _(u64);
+  _(u32);
+  _(u16);
+  _(u8);
+
+#undef _
+
+  /* Combine even and odd sums. */
+  sum0 = ip_csum_with_carry (sum0, sum1);
+
+  return sum0;
+}
+
+ip_csum_t
+ip_csum_and_memcpy (ip_csum_t sum, void *dst, void *src, uword n_bytes)
+{
+  uword n_left;
+  ip_csum_t sum0 = sum, sum1;
+  n_left = n_bytes;
+
+  if (n_left && (pointer_to_uword (dst) & sizeof (u8)))
+    {
+      u8 *d8, val;
+
+      d8 = dst;
+      val = ((u8 *) src)[0];
+      d8[0] = val;
+      dst += 1;
+      src += 1;
+      n_left -= 1;
+      sum0 =
+	ip_csum_with_carry (sum0, val << (8 * CLIB_ARCH_IS_LITTLE_ENDIAN));
+    }
+
+  while ((n_left >= sizeof (u16))
+	 && (pointer_to_uword (dst) & (sizeof (sum) - sizeof (u16))))
+    {
+      u16 *d16, *s16;
+
+      d16 = dst;
+      s16 = src;
+
+      d16[0] = clib_mem_unaligned (&s16[0], u16);
+
+      sum0 = ip_csum_with_carry (sum0, d16[0]);
+      dst += sizeof (u16);
+      src += sizeof (u16);
+      n_left -= sizeof (u16);
+    }
+
+  sum1 = 0;
+  while (n_left >= 2 * sizeof (sum))
+    {
+      ip_csum_t dst0, dst1;
+      ip_csum_t *dst_even, *src_even;
+
+      dst_even = dst;
+      src_even = src;
+      dst0 = clib_mem_unaligned (&src_even[0], ip_csum_t);
+      dst1 = clib_mem_unaligned (&src_even[1], ip_csum_t);
+
+      dst_even[0] = dst0;
+      dst_even[1] = dst1;
+
+      dst += 2 * sizeof (dst_even[0]);
+      src += 2 * sizeof (dst_even[0]);
+      n_left -= 2 * sizeof (dst_even[0]);
+
+      sum0 = ip_csum_with_carry (sum0, dst0);
+      sum1 = ip_csum_with_carry (sum1, dst1);
+    }
+
+  sum0 = ip_csum_with_carry (sum0, sum1);
+  while (n_left >= 1 * sizeof (sum))
+    {
+      ip_csum_t dst0, *dst_even, *src_even;
+
+      dst_even = dst;
+      src_even = src;
+
+      dst0 = clib_mem_unaligned (&src_even[0], ip_csum_t);
+
+      dst_even[0] = dst0;
+
+      dst += 1 * sizeof (sum);
+      src += 1 * sizeof (sum);
+      n_left -= 1 * sizeof (sum);
+
+      sum0 = ip_csum_with_carry (sum0, dst0);
+    }
+
+  while (n_left >= sizeof (u16))
+    {
+      u16 dst0, *dst_short, *src_short;
+
+      dst_short = dst;
+      src_short = src;
+
+      dst0 = clib_mem_unaligned (&src_short[0], u16);
+
+      dst_short[0] = dst0;
+
+      sum0 = ip_csum_with_carry (sum0, dst_short[0]);
+      dst += 1 * sizeof (dst0);
+      src += 1 * sizeof (dst0);
+      n_left -= 1 * sizeof (dst0);
+
+    }
+
+  if (n_left == 1)
+    {
+      u8 *d8, *s8, val;
+
+      d8 = dst;
+      s8 = src;
+
+      d8[0] = val = s8[0];
+      d8 += 1;
+      s8 += 1;
+      n_left -= 1;
+      sum0 = ip_csum_with_carry (sum0, val << (8 * CLIB_ARCH_IS_BIG_ENDIAN));
+    }
+
+  return sum0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip_frag.c b/src/vnet/ip/ip_frag.c
new file mode 100644
index 00000000..ca062bfd
--- /dev/null
+++ b/src/vnet/ip/ip_frag.c
@@ -0,0 +1,581 @@
+/*---------------------------------------------------------------------------
+ * Copyright (c) 2009-2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *---------------------------------------------------------------------------
+ */
+/*
+ * IPv4 Fragmentation Node
+ *
+ *
+ */
+
+#include "ip_frag.h"
+
+#include <vnet/ip/ip.h>
+
+
+typedef struct
+{
+  u8 ipv6;
+  u16 header_offset;
+  u16 mtu;
+  u8 next;
+  u16 n_fragments;
+} ip_frag_trace_t;
+
+static u8 *
+format_ip_frag_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip_frag_trace_t *t = va_arg (*args, ip_frag_trace_t *);
+  s = format (s, "IPv%s offset: %u mtu: %u fragments: %u",
+	      t->ipv6 ? "6" : "4", t->header_offset, t->mtu, t->n_fragments);
+  return s;
+}
+
+static u32 running_fragment_id;
+
+static void
+ip4_frag_do_fragment (vlib_main_t * vm, u32 pi, u32 ** buffer,
+		      ip_frag_error_t * error)
+{
+  vlib_buffer_t *p;
+  ip4_header_t *ip4;
+  u16 mtu, ptr, len, max, rem, offset, ip_frag_id, ip_frag_offset;
+  u8 *packet, more;
+
+  vec_add1 (*buffer, pi);
+  p = vlib_get_buffer (vm, pi);
+  offset = vnet_buffer (p)->ip_frag.header_offset;
+  mtu = vnet_buffer (p)->ip_frag.mtu;
+  packet = (u8 *) vlib_buffer_get_current (p);
+  ip4 = (ip4_header_t *) (packet + offset);
+
+  rem = clib_net_to_host_u16 (ip4->length) - sizeof (*ip4);
+  ptr = 0;
+  max = (mtu - sizeof (*ip4) - vnet_buffer (p)->ip_frag.header_offset) & ~0x7;
+
+  if (rem < (p->current_length - offset - sizeof (*ip4)))
+    {
+      *error = IP_FRAG_ERROR_MALFORMED;
+      return;
+    }
+
+  if (mtu < sizeof (*ip4))
+    {
+      *error = IP_FRAG_ERROR_CANT_FRAGMENT_HEADER;
+      return;
+    }
+
+  if (ip4->flags_and_fragment_offset &
+      clib_host_to_net_u16 (IP4_HEADER_FLAG_DONT_FRAGMENT))
+    {
+      *error = IP_FRAG_ERROR_DONT_FRAGMENT_SET;
+      return;
+    }
+
+  if (ip4_is_fragment (ip4))
+    {
+      ip_frag_id = ip4->fragment_id;
+      ip_frag_offset = ip4_get_fragment_offset (ip4);
+      more =
+	! !(ip4->flags_and_fragment_offset &
+	    clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS));
+    }
+  else
+    {
+      ip_frag_id = (++running_fragment_id);
+      ip_frag_offset = 0;
+      more = 0;
+    }
+
+  //Do the actual fragmentation
+  while (rem)
+    {
+      u32 bi;
+      vlib_buffer_t *b;
+      ip4_header_t *fip4;
+
+      len =
+	(rem >
+	 (mtu - sizeof (*ip4) -
+	  vnet_buffer (p)->ip_frag.header_offset)) ? max : rem;
+
+      if (ptr == 0)
+	{
+	  bi = pi;
+	  b = p;
+	  fip4 = (ip4_header_t *) (vlib_buffer_get_current (b) + offset);
+	}
+      else
+	{
+	  if (!vlib_buffer_alloc (vm, &bi, 1))
+	    {
+	      *error = IP_FRAG_ERROR_MEMORY;
+	      return;
+	    }
+	  vec_add1 (*buffer, bi);
+	  b = vlib_get_buffer (vm, bi);
+	  vnet_buffer (b)->sw_if_index[VLIB_RX] =
+	    vnet_buffer (p)->sw_if_index[VLIB_RX];
+	  vnet_buffer (b)->sw_if_index[VLIB_TX] =
+	    vnet_buffer (p)->sw_if_index[VLIB_TX];
+	  fip4 = (ip4_header_t *) (vlib_buffer_get_current (b) + offset);
+
+	  //Copy offset and ip4 header
+	  clib_memcpy (b->data, packet, offset + sizeof (*ip4));
+	  //Copy data
+	  clib_memcpy (((u8 *) (fip4)) + sizeof (*fip4),
+		       packet + offset + sizeof (*fip4) + ptr, len);
+	}
+      b->current_length = offset + len + sizeof (*fip4);
+
+      fip4->fragment_id = ip_frag_id;
+      fip4->flags_and_fragment_offset =
+	clib_host_to_net_u16 ((ptr >> 3) + ip_frag_offset);
+      fip4->flags_and_fragment_offset |=
+	clib_host_to_net_u16 (((len != rem) || more) << 13);
+      // ((len0 != rem0) || more0) << 13 is optimization for
+      // ((len0 != rem0) || more0) ? IP4_HEADER_FLAG_MORE_FRAGMENTS : 0
+      fip4->length = clib_host_to_net_u16 (len + sizeof (*fip4));
+      fip4->checksum = ip4_header_checksum (fip4);
+
+      if (vnet_buffer (p)->ip_frag.flags & IP_FRAG_FLAG_IP4_HEADER)
+	{
+	  //Encapsulating ipv4 header
+	  ip4_header_t *encap_header4 =
+	    (ip4_header_t *) vlib_buffer_get_current (b);
+	  encap_header4->length = clib_host_to_net_u16 (b->current_length);
+	  encap_header4->checksum = ip4_header_checksum (encap_header4);
+	}
+      else if (vnet_buffer (p)->ip_frag.flags & IP_FRAG_FLAG_IP6_HEADER)
+	{
+	  //Encapsulating ipv6 header
+	  ip6_header_t *encap_header6 =
+	    (ip6_header_t *) vlib_buffer_get_current (b);
+	  encap_header6->payload_length =
+	    clib_host_to_net_u16 (b->current_length -
+				  sizeof (*encap_header6));
+	}
+
+      rem -= len;
+      ptr += len;
+    }
+}
+
+void
+ip_frag_set_vnet_buffer (vlib_buffer_t * b, u16 offset, u16 mtu,
+			 u8 next_index, u8 flags)
+{
+  vnet_buffer (b)->ip_frag.header_offset = offset;
+  vnet_buffer (b)->ip_frag.mtu = mtu;
+  vnet_buffer (b)->ip_frag.next_index = next_index;
+  vnet_buffer (b)->ip_frag.flags = flags;
+}
+
+static uword
+ip4_frag (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip4_frag_node.index);
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  u32 frag_sent = 0, small_packets = 0;
+  u32 *buffer = 0;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0, *frag_from, frag_left;
+	  vlib_buffer_t *p0;
+	  ip_frag_error_t error0;
+	  ip4_frag_next_t next0;
+
+	  //Note: The packet is not enqueued now.
+	  //It is instead put in a vector where other fragments
+	  //will be put as well.
+	  pi0 = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  error0 = IP_FRAG_ERROR_NONE;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip4_frag_do_fragment (vm, pi0, &buffer, &error0);
+
+	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ip_frag_trace_t *tr =
+		vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->header_offset = vnet_buffer (p0)->ip_frag.header_offset;
+	      tr->mtu = vnet_buffer (p0)->ip_frag.mtu;
+	      tr->ipv6 = 0;
+	      tr->n_fragments = vec_len (buffer);
+	      tr->next = vnet_buffer (p0)->ip_frag.next_index;
+	    }
+
+	  if (error0 == IP_FRAG_ERROR_DONT_FRAGMENT_SET)
+	    {
+	      icmp4_error_set_vnet_buffer (p0, ICMP4_destination_unreachable,
+					   ICMP4_destination_unreachable_fragmentation_needed_and_dont_fragment_set,
+					   vnet_buffer (p0)->ip_frag.mtu);
+	      vlib_buffer_advance (p0,
+				   vnet_buffer (p0)->ip_frag.header_offset);
+	      next0 = IP4_FRAG_NEXT_ICMP_ERROR;
+	    }
+	  else
+	    next0 =
+	      (error0 ==
+	       IP_FRAG_ERROR_NONE) ? vnet_buffer (p0)->
+	      ip_frag.next_index : IP4_FRAG_NEXT_DROP;
+
+	  if (error0 == IP_FRAG_ERROR_NONE)
+	    {
+	      frag_sent += vec_len (buffer);
+	      small_packets += (vec_len (buffer) == 1);
+	    }
+	  else
+	    vlib_error_count (vm, ip4_frag_node.index, error0, 1);
+
+	  //Send fragments that were added in the frame
+	  frag_from = buffer;
+	  frag_left = vec_len (buffer);
+
+	  while (frag_left > 0)
+	    {
+	      while (frag_left > 0 && n_left_to_next > 0)
+		{
+		  u32 i;
+		  i = to_next[0] = frag_from[0];
+		  frag_from += 1;
+		  frag_left -= 1;
+		  to_next += 1;
+		  n_left_to_next -= 1;
+
+		  vlib_get_buffer (vm, i)->error = error_node->errors[error0];
+		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+						   to_next, n_left_to_next, i,
+						   next0);
+		}
+	      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+	      vlib_get_next_frame (vm, node, next_index, to_next,
+				   n_left_to_next);
+	    }
+	  vec_reset_length (buffer);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vec_free (buffer);
+
+  vlib_node_increment_counter (vm, ip4_frag_node.index,
+			       IP_FRAG_ERROR_FRAGMENT_SENT, frag_sent);
+  vlib_node_increment_counter (vm, ip4_frag_node.index,
+			       IP_FRAG_ERROR_SMALL_PACKET, small_packets);
+
+  return frame->n_vectors;
+}
+
+
+static void
+ip6_frag_do_fragment (vlib_main_t * vm, u32 pi, u32 ** buffer,
+		      ip_frag_error_t * error)
+{
+  vlib_buffer_t *p;
+  ip6_header_t *ip6_hdr;
+  ip6_frag_hdr_t *frag_hdr;
+  u8 *payload, *next_header;
+
+  p = vlib_get_buffer (vm, pi);
+
+  //Parsing the IPv6 headers
+  ip6_hdr =
+    vlib_buffer_get_current (p) + vnet_buffer (p)->ip_frag.header_offset;
+  payload = (u8 *) (ip6_hdr + 1);
+  next_header = &ip6_hdr->protocol;
+  if (*next_header == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS)
+    {
+      next_header = payload;
+      payload += payload[1] * 8;
+    }
+
+  if (*next_header == IP_PROTOCOL_IP6_DESTINATION_OPTIONS)
+    {
+      next_header = payload;
+      payload += payload[1] * 8;
+    }
+
+  if (*next_header == IP_PROTOCOL_IPV6_ROUTE)
+    {
+      next_header = payload;
+      payload += payload[1] * 8;
+    }
+
+  if (PREDICT_FALSE
+      (payload >= (u8 *) vlib_buffer_get_current (p) + p->current_length))
+    {
+      //A malicious packet could set an extension header with a too big size
+      //and make us modify another vlib_buffer
+      *error = IP_FRAG_ERROR_MALFORMED;
+      return;
+    }
+
+  u8 has_more;
+  u16 initial_offset;
+  if (*next_header == IP_PROTOCOL_IPV6_FRAGMENTATION)
+    {
+      //The fragmentation header is already there
+      frag_hdr = (ip6_frag_hdr_t *) payload;
+      has_more = ip6_frag_hdr_more (frag_hdr);
+      initial_offset = ip6_frag_hdr_offset (frag_hdr);
+    }
+  else
+    {
+      //Insert a fragmentation header in the packet
+      u8 nh = *next_header;
+      *next_header = IP_PROTOCOL_IPV6_FRAGMENTATION;
+      vlib_buffer_advance (p, -sizeof (*frag_hdr));
+      u8 *start = vlib_buffer_get_current (p);
+      memmove (start, start + sizeof (*frag_hdr),
+	       payload - (start + sizeof (*frag_hdr)));
+      frag_hdr = (ip6_frag_hdr_t *) (payload - sizeof (*frag_hdr));
+      frag_hdr->identification = ++running_fragment_id;
+      frag_hdr->next_hdr = nh;
+      frag_hdr->rsv = 0;
+      has_more = 0;
+      initial_offset = 0;
+    }
+  payload = (u8 *) (frag_hdr + 1);
+
+  u16 headers_len = payload - (u8 *) vlib_buffer_get_current (p);
+  u16 max_payload = vnet_buffer (p)->ip_frag.mtu - headers_len;
+  u16 rem = p->current_length - headers_len;
+  u16 ptr = 0;
+
+  if (max_payload < 8)
+    {
+      *error = IP_FRAG_ERROR_CANT_FRAGMENT_HEADER;
+      return;
+    }
+
+  while (rem)
+    {
+      u32 bi;
+      vlib_buffer_t *b;
+      u16 len = (rem > max_payload) ? (max_payload & ~0x7) : rem;
+      rem -= len;
+
+      if (ptr != 0)
+	{
+	  if (!vlib_buffer_alloc (vm, &bi, 1))
+	    {
+	      *error = IP_FRAG_ERROR_MEMORY;
+	      return;
+	    }
+	  b = vlib_get_buffer (vm, bi);
+	  vnet_buffer (b)->sw_if_index[VLIB_RX] =
+	    vnet_buffer (p)->sw_if_index[VLIB_RX];
+	  vnet_buffer (b)->sw_if_index[VLIB_TX] =
+	    vnet_buffer (p)->sw_if_index[VLIB_TX];
+	  clib_memcpy (vlib_buffer_get_current (b),
+		       vlib_buffer_get_current (p), headers_len);
+	  clib_memcpy (vlib_buffer_get_current (b) + headers_len,
+		       payload + ptr, len);
+	  frag_hdr =
+	    vlib_buffer_get_current (b) + headers_len - sizeof (*frag_hdr);
+	}
+      else
+	{
+	  bi = pi;
+	  b = vlib_get_buffer (vm, bi);
+	  //frag_hdr already set here
+	}
+
+      ip6_hdr =
+	vlib_buffer_get_current (b) + vnet_buffer (p)->ip_frag.header_offset;
+      frag_hdr->fragment_offset_and_more =
+	ip6_frag_hdr_offset_and_more (initial_offset + (ptr >> 3),
+				      (rem || has_more));
+      b->current_length = headers_len + len;
+      ip6_hdr->payload_length =
+	clib_host_to_net_u16 (b->current_length -
+			      vnet_buffer (p)->ip_frag.header_offset -
+			      sizeof (*ip6_hdr));
+
+      if (vnet_buffer (p)->ip_frag.flags & IP_FRAG_FLAG_IP4_HEADER)
+	{
+	  //Encapsulating ipv4 header
+	  ip4_header_t *encap_header4 =
+	    (ip4_header_t *) vlib_buffer_get_current (b);
+	  encap_header4->length = clib_host_to_net_u16 (b->current_length);
+	  encap_header4->checksum = ip4_header_checksum (encap_header4);
+	}
+      else if (vnet_buffer (p)->ip_frag.flags & IP_FRAG_FLAG_IP6_HEADER)
+	{
+	  //Encapsulating ipv6 header
+	  ip6_header_t *encap_header6 =
+	    (ip6_header_t *) vlib_buffer_get_current (b);
+	  encap_header6->payload_length =
+	    clib_host_to_net_u16 (b->current_length -
+				  sizeof (*encap_header6));
+	}
+
+      vec_add1 (*buffer, bi);
+
+      ptr += len;
+    }
+}
+
+static uword
+ip6_frag (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip6_frag_node.index);
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  u32 frag_sent = 0, small_packets = 0;
+  u32 *buffer = 0;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0, *frag_from, frag_left;
+	  vlib_buffer_t *p0;
+	  ip_frag_error_t error0;
+	  ip6_frag_next_t next0;
+
+	  pi0 = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  error0 = IP_FRAG_ERROR_NONE;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip6_frag_do_fragment (vm, pi0, &buffer, &error0);
+
+	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ip_frag_trace_t *tr =
+		vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->header_offset = vnet_buffer (p0)->ip_frag.header_offset;
+	      tr->mtu = vnet_buffer (p0)->ip_frag.mtu;
+	      tr->ipv6 = 1;
+	      tr->n_fragments = vec_len (buffer);
+	      tr->next = vnet_buffer (p0)->ip_frag.next_index;
+	    }
+
+	  next0 =
+	    (error0 ==
+	     IP_FRAG_ERROR_NONE) ? vnet_buffer (p0)->
+	    ip_frag.next_index : IP6_FRAG_NEXT_DROP;
+	  frag_sent += vec_len (buffer);
+	  small_packets += (vec_len (buffer) == 1);
+
+	  //Send fragments that were added in the frame
+	  frag_from = buffer;
+	  frag_left = vec_len (buffer);
+	  while (frag_left > 0)
+	    {
+	      while (frag_left > 0 && n_left_to_next > 0)
+		{
+		  u32 i;
+		  i = to_next[0] = frag_from[0];
+		  frag_from += 1;
+		  frag_left -= 1;
+		  to_next += 1;
+		  n_left_to_next -= 1;
+
+		  vlib_get_buffer (vm, i)->error = error_node->errors[error0];
+		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+						   to_next, n_left_to_next, i,
+						   next0);
+		}
+	      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+	      vlib_get_next_frame (vm, node, next_index, to_next,
+				   n_left_to_next);
+	    }
+	  vec_reset_length (buffer);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vec_free (buffer);
+  vlib_node_increment_counter (vm, ip6_frag_node.index,
+			       IP_FRAG_ERROR_FRAGMENT_SENT, frag_sent);
+  vlib_node_increment_counter (vm, ip6_frag_node.index,
+			       IP_FRAG_ERROR_SMALL_PACKET, small_packets);
+
+  return frame->n_vectors;
+}
+
+static char *ip4_frag_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ip_frag_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_frag_node) = {
+  .function = ip4_frag,
+  .name = IP4_FRAG_NODE_NAME,
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip_frag_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = IP_FRAG_N_ERROR,
+  .error_strings = ip4_frag_error_strings,
+
+  .n_next_nodes = IP4_FRAG_N_NEXT,
+  .next_nodes = {
+    [IP4_FRAG_NEXT_IP4_LOOKUP] = "ip4-lookup",
+    [IP4_FRAG_NEXT_IP6_LOOKUP] = "ip6-lookup",
+    [IP4_FRAG_NEXT_ICMP_ERROR] = "ip4-icmp-error",
+    [IP4_FRAG_NEXT_DROP] = "error-drop"
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_frag_node) = {
+  .function = ip6_frag,
+  .name = IP6_FRAG_NODE_NAME,
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip_frag_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = IP_FRAG_N_ERROR,
+  .error_strings = ip4_frag_error_strings,
+
+  .n_next_nodes = IP6_FRAG_N_NEXT,
+  .next_nodes = {
+    [IP6_FRAG_NEXT_IP4_LOOKUP] = "ip4-lookup",
+    [IP6_FRAG_NEXT_IP6_LOOKUP] = "ip6-lookup",
+    [IP6_FRAG_NEXT_DROP] = "error-drop"
+  },
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip_frag.h b/src/vnet/ip/ip_frag.h
new file mode 100644
index 00000000..348f5a2f
--- /dev/null
+++ b/src/vnet/ip/ip_frag.h
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------
+ * Copyright (c) 2009-2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *---------------------------------------------------------------------------
+ */
+/*
+ * IPv4 and IPv6 Fragmentation Nodes
+ *
+ * A packet sent to those nodes require the following
+ * buffer attributes to be set:
+ * ip_frag.header_offset :
+ *     Where to find the IPv4 (or IPv6) header in the packet. Previous
+ *     bytes are left untouched and copied in every fragment. The fragments
+ *     are then appended. This option is used for fragmented packets
+ *     that are encapsulated.
+ * ip_frag.mtu :
+ *     Maximum size of IP packets, header included, but ignoring
+ *     the 'ip_frag.header_offset' copied bytes.
+ * ip_frag.next_index :
+ *     One of ip_frag_next_t, indicating to which exit node the fragments
+ *     should be sent to.
+ *
+ */
+
+#ifndef IP_FRAG_H
+#define IP_FRAG_H
+
+#include <vnet/vnet.h>
+
+#define IP_FRAG_FLAG_IP4_HEADER 0x01	//Encapsulating IPv4 header
+#define IP_FRAG_FLAG_IP6_HEADER 0x02	//Encapsulating IPv6 header
+
+#define IP4_FRAG_NODE_NAME "ip4-frag"
+#define IP6_FRAG_NODE_NAME "ip6-frag"
+
+extern vlib_node_registration_t ip4_frag_node;
+extern vlib_node_registration_t ip6_frag_node;
+
+typedef enum
+{
+  IP4_FRAG_NEXT_IP4_LOOKUP,
+  IP4_FRAG_NEXT_IP6_LOOKUP,
+  IP4_FRAG_NEXT_ICMP_ERROR,
+  IP4_FRAG_NEXT_DROP,
+  IP4_FRAG_N_NEXT
+} ip4_frag_next_t;
+
+typedef enum
+{
+  IP6_FRAG_NEXT_IP4_LOOKUP,
+  IP6_FRAG_NEXT_IP6_LOOKUP,
+  IP6_FRAG_NEXT_DROP,
+  IP6_FRAG_N_NEXT
+} ip6_frag_next_t;
+
+#define foreach_ip_frag_error				\
+  /* Must be first. */					\
+ _(NONE, "packet fragmented")				\
+ _(SMALL_PACKET, "packet smaller than MTU")             \
+ _(FRAGMENT_SENT, "number of sent fragments")           \
+ _(CANT_FRAGMENT_HEADER, "can't fragment header")	\
+ _(DONT_FRAGMENT_SET, "can't fragment this packet")	\
+ _(MALFORMED, "malformed packet")                       \
+ _(MEMORY, "could not allocate buffer")                 \
+ _(UNKNOWN, "unknown error")
+
+typedef enum
+{
+#define _(sym,str) IP_FRAG_ERROR_##sym,
+  foreach_ip_frag_error
+#undef _
+    IP_FRAG_N_ERROR,
+} ip_frag_error_t;
+
+void ip_frag_set_vnet_buffer (vlib_buffer_t * b, u16 offset, u16 mtu,
+			      u8 next_index, u8 flags);
+
+#endif /* ifndef IP_FRAG_H */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip_init.c b/src/vnet/ip/ip_init.c
new file mode 100644
index 00000000..f7635b35
--- /dev/null
+++ b/src/vnet/ip/ip_init.c
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip_init.c: ip generic initialization
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+
+ip_main_t ip_main;
+
+clib_error_t *
+ip_main_init (vlib_main_t * vm)
+{
+  ip_main_t *im = &ip_main;
+  clib_error_t *error = 0;
+
+  memset (im, 0, sizeof (im[0]));
+
+  {
+    ip_protocol_info_t *pi;
+    u32 i;
+
+#define ip_protocol(n,s)			\
+do {						\
+  vec_add2 (im->protocol_infos, pi, 1);		\
+  pi->protocol = n;				\
+  pi->name = (u8 *) #s;				\
+} while (0);
+
+#include "protocols.def"
+
+#undef ip_protocol
+
+    im->protocol_info_by_name = hash_create_string (0, sizeof (uword));
+    for (i = 0; i < vec_len (im->protocol_infos); i++)
+      {
+	pi = im->protocol_infos + i;
+
+	hash_set_mem (im->protocol_info_by_name, pi->name, i);
+	hash_set (im->protocol_info_by_protocol, pi->protocol, i);
+      }
+  }
+
+  {
+    tcp_udp_port_info_t *pi;
+    u32 i;
+    static char *port_names[] = {
+#define ip_port(s,n) #s,
+#include "ports.def"
+#undef ip_port
+    };
+    static u16 ports[] = {
+#define ip_port(s,n) n,
+#include "ports.def"
+#undef ip_port
+    };
+
+    vec_resize (im->port_infos, ARRAY_LEN (port_names));
+    im->port_info_by_name = hash_create_string (0, sizeof (uword));
+
+    for (i = 0; i < vec_len (im->port_infos); i++)
+      {
+	pi = im->port_infos + i;
+	pi->port = clib_host_to_net_u16 (ports[i]);
+	pi->name = (u8 *) port_names[i];
+	hash_set_mem (im->port_info_by_name, pi->name, i);
+	hash_set (im->port_info_by_port, pi->port, i);
+      }
+  }
+
+  if ((error = vlib_call_init_function (vm, vnet_main_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ip4_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ip6_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, icmp4_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, icmp6_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ip6_hop_by_hop_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, udp_local_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, udp_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ip_classify_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, input_acl_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, policer_classify_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, flow_classify_init)))
+    return error;
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (ip_main_init);
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip_input_acl.c b/src/vnet/ip/ip_input_acl.c
new file mode 100644
index 00000000..b0b52ab1
--- /dev/null
+++ b/src/vnet/ip/ip_input_acl.c
@@ -0,0 +1,450 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/ip/ip.h>
+#include <vnet/classify/vnet_classify.h>
+#include <vnet/classify/input_acl.h>
+
+typedef struct
+{
+  u32 sw_if_index;
+  u32 next_index;
+  u32 table_index;
+  u32 offset;
+} ip_inacl_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_ip_inacl_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ip_inacl_trace_t *t = va_arg (*args, ip_inacl_trace_t *);
+
+  s = format (s, "INACL: sw_if_index %d, next_index %d, table %d, offset %d",
+	      t->sw_if_index, t->next_index, t->table_index, t->offset);
+  return s;
+}
+
+vlib_node_registration_t ip4_inacl_node;
+vlib_node_registration_t ip6_inacl_node;
+
+#define foreach_ip_inacl_error                  \
+_(MISS, "input ACL misses")                     \
+_(HIT, "input ACL hits")                        \
+_(CHAIN_HIT, "input ACL hits after chain walk")
+
+typedef enum
+{
+#define _(sym,str) IP_INACL_ERROR_##sym,
+  foreach_ip_inacl_error
+#undef _
+    IP_INACL_N_ERROR,
+} ip_inacl_error_t;
+
+static char *ip_inacl_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ip_inacl_error
+#undef _
+};
+
+static inline uword
+ip_inacl_inline (vlib_main_t * vm,
+		 vlib_node_runtime_t * node, vlib_frame_t * frame, int is_ip4)
+{
+  u32 n_left_from, *from, *to_next;
+  acl_next_index_t next_index;
+  input_acl_main_t *am = &input_acl_main;
+  vnet_classify_main_t *vcm = am->vnet_classify_main;
+  f64 now = vlib_time_now (vm);
+  u32 hits = 0;
+  u32 misses = 0;
+  u32 chain_hits = 0;
+  input_acl_table_id_t tid;
+  vlib_node_runtime_t *error_node;
+  u32 n_next_nodes;
+
+  n_next_nodes = node->n_next_nodes;
+
+  if (is_ip4)
+    {
+      tid = INPUT_ACL_TABLE_IP4;
+      error_node = vlib_node_get_runtime (vm, ip4_input_node.index);
+    }
+  else
+    {
+      tid = INPUT_ACL_TABLE_IP6;
+      error_node = vlib_node_get_runtime (vm, ip6_input_node.index);
+    }
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  /* First pass: compute hashes */
+
+  while (n_left_from > 2)
+    {
+      vlib_buffer_t *b0, *b1;
+      u32 bi0, bi1;
+      u8 *h0, *h1;
+      u32 sw_if_index0, sw_if_index1;
+      u32 table_index0, table_index1;
+      vnet_classify_table_t *t0, *t1;
+
+      /* prefetch next iteration */
+      {
+	vlib_buffer_t *p1, *p2;
+
+	p1 = vlib_get_buffer (vm, from[1]);
+	p2 = vlib_get_buffer (vm, from[2]);
+
+	vlib_prefetch_buffer_header (p1, STORE);
+	CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE);
+	vlib_prefetch_buffer_header (p2, STORE);
+	CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+      }
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+
+      bi1 = from[1];
+      b1 = vlib_get_buffer (vm, bi1);
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      table_index0 =
+	am->classify_table_index_by_sw_if_index[tid][sw_if_index0];
+
+      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+      table_index1 =
+	am->classify_table_index_by_sw_if_index[tid][sw_if_index1];
+
+      t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+      t1 = pool_elt_at_index (vcm->tables, table_index1);
+
+      if (t0->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
+	h0 = (void *) vlib_buffer_get_current (b0) + t0->current_data_offset;
+      else
+	h0 = b0->data;
+
+      vnet_buffer (b0)->l2_classify.hash =
+	vnet_classify_hash_packet (t0, (u8 *) h0);
+
+      vnet_classify_prefetch_bucket (t0, vnet_buffer (b0)->l2_classify.hash);
+
+      if (t1->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
+	h1 = (void *) vlib_buffer_get_current (b1) + t1->current_data_offset;
+      else
+	h1 = b1->data;
+
+      vnet_buffer (b1)->l2_classify.hash =
+	vnet_classify_hash_packet (t1, (u8 *) h1);
+
+      vnet_classify_prefetch_bucket (t1, vnet_buffer (b1)->l2_classify.hash);
+
+      vnet_buffer (b0)->l2_classify.table_index = table_index0;
+
+      vnet_buffer (b1)->l2_classify.table_index = table_index1;
+
+      from += 2;
+      n_left_from -= 2;
+    }
+
+  while (n_left_from > 0)
+    {
+      vlib_buffer_t *b0;
+      u32 bi0;
+      u8 *h0;
+      u32 sw_if_index0;
+      u32 table_index0;
+      vnet_classify_table_t *t0;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      table_index0 =
+	am->classify_table_index_by_sw_if_index[tid][sw_if_index0];
+
+      t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+      if (t0->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
+	h0 = (void *) vlib_buffer_get_current (b0) + t0->current_data_offset;
+      else
+	h0 = b0->data;
+
+      vnet_buffer (b0)->l2_classify.hash =
+	vnet_classify_hash_packet (t0, (u8 *) h0);
+
+      vnet_buffer (b0)->l2_classify.table_index = table_index0;
+      vnet_classify_prefetch_bucket (t0, vnet_buffer (b0)->l2_classify.hash);
+
+      from++;
+      n_left_from--;
+    }
+
+  next_index = node->cached_next_index;
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /* Not enough load/store slots to dual loop... */
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0 = ACL_NEXT_INDEX_DENY;
+	  u32 table_index0;
+	  vnet_classify_table_t *t0;
+	  vnet_classify_entry_t *e0;
+	  u64 hash0;
+	  u8 *h0;
+	  u8 error0;
+
+	  /* Stride 3 seems to work best */
+	  if (PREDICT_TRUE (n_left_from > 3))
+	    {
+	      vlib_buffer_t *p1 = vlib_get_buffer (vm, from[3]);
+	      vnet_classify_table_t *tp1;
+	      u32 table_index1;
+	      u64 phash1;
+
+	      table_index1 = vnet_buffer (p1)->l2_classify.table_index;
+
+	      if (PREDICT_TRUE (table_index1 != ~0))
+		{
+		  tp1 = pool_elt_at_index (vcm->tables, table_index1);
+		  phash1 = vnet_buffer (p1)->l2_classify.hash;
+		  vnet_classify_prefetch_entry (tp1, phash1);
+		}
+	    }
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  table_index0 = vnet_buffer (b0)->l2_classify.table_index;
+	  e0 = 0;
+	  t0 = 0;
+	  vnet_get_config_data (am->vnet_config_main[tid],
+				&b0->current_config_index, &next0,
+				/* # bytes of config data */ 0);
+
+	  vnet_buffer (b0)->l2_classify.opaque_index = ~0;
+
+	  if (PREDICT_TRUE (table_index0 != ~0))
+	    {
+	      hash0 = vnet_buffer (b0)->l2_classify.hash;
+	      t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+	      if (t0->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
+		h0 =
+		  (void *) vlib_buffer_get_current (b0) +
+		  t0->current_data_offset;
+	      else
+		h0 = b0->data;
+
+	      e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
+	      if (e0)
+		{
+		  vnet_buffer (b0)->l2_classify.opaque_index
+		    = e0->opaque_index;
+		  vlib_buffer_advance (b0, e0->advance);
+
+		  next0 = (e0->next_index < n_next_nodes) ?
+		    e0->next_index : next0;
+
+		  hits++;
+
+		  if (is_ip4)
+		    error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
+		      IP4_ERROR_INACL_SESSION_DENY : IP4_ERROR_NONE;
+		  else
+		    error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
+		      IP6_ERROR_INACL_SESSION_DENY : IP6_ERROR_NONE;
+		  b0->error = error_node->errors[error0];
+
+		  if (e0->action == CLASSIFY_ACTION_SET_IP4_FIB_INDEX ||
+		      e0->action == CLASSIFY_ACTION_SET_IP6_FIB_INDEX)
+		    vnet_buffer (b0)->sw_if_index[VLIB_TX] = e0->metadata;
+		}
+	      else
+		{
+		  while (1)
+		    {
+		      if (PREDICT_TRUE (t0->next_table_index != ~0))
+			t0 = pool_elt_at_index (vcm->tables,
+						t0->next_table_index);
+		      else
+			{
+			  next0 = (t0->miss_next_index < n_next_nodes) ?
+			    t0->miss_next_index : next0;
+
+			  misses++;
+
+			  if (is_ip4)
+			    error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
+			      IP4_ERROR_INACL_TABLE_MISS : IP4_ERROR_NONE;
+			  else
+			    error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
+			      IP6_ERROR_INACL_TABLE_MISS : IP6_ERROR_NONE;
+			  b0->error = error_node->errors[error0];
+			  break;
+			}
+
+		      if (t0->current_data_flag ==
+			  CLASSIFY_FLAG_USE_CURR_DATA)
+			h0 =
+			  (void *) vlib_buffer_get_current (b0) +
+			  t0->current_data_offset;
+		      else
+			h0 = b0->data;
+
+		      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
+		      e0 = vnet_classify_find_entry
+			(t0, (u8 *) h0, hash0, now);
+		      if (e0)
+			{
+			  vnet_buffer (b0)->l2_classify.opaque_index
+			    = e0->opaque_index;
+			  vlib_buffer_advance (b0, e0->advance);
+			  next0 = (e0->next_index < n_next_nodes) ?
+			    e0->next_index : next0;
+			  hits++;
+			  chain_hits++;
+
+			  if (is_ip4)
+			    error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
+			      IP4_ERROR_INACL_SESSION_DENY : IP4_ERROR_NONE;
+			  else
+			    error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
+			      IP6_ERROR_INACL_SESSION_DENY : IP6_ERROR_NONE;
+			  b0->error = error_node->errors[error0];
+
+			  if (e0->action == CLASSIFY_ACTION_SET_IP4_FIB_INDEX
+			      || e0->action ==
+			      CLASSIFY_ACTION_SET_IP6_FIB_INDEX)
+			    vnet_buffer (b0)->sw_if_index[VLIB_TX] =
+			      e0->metadata;
+			  break;
+			}
+		    }
+		}
+	    }
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      ip_inacl_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	      t->next_index = next0;
+	      t->table_index = t0 ? t0 - vcm->tables : ~0;
+	      t->offset = (e0 && t0) ? vnet_classify_get_offset (t0, e0) : ~0;
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, node->node_index,
+			       IP_INACL_ERROR_MISS, misses);
+  vlib_node_increment_counter (vm, node->node_index,
+			       IP_INACL_ERROR_HIT, hits);
+  vlib_node_increment_counter (vm, node->node_index,
+			       IP_INACL_ERROR_CHAIN_HIT, chain_hits);
+  return frame->n_vectors;
+}
+
+static uword
+ip4_inacl (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ip_inacl_inline (vm, node, frame, 1 /* is_ip4 */ );
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_inacl_node) = {
+  .function = ip4_inacl,
+  .name = "ip4-inacl",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip_inacl_trace,
+  .n_errors = ARRAY_LEN(ip_inacl_error_strings),
+  .error_strings = ip_inacl_error_strings,
+
+  .n_next_nodes = ACL_NEXT_INDEX_N_NEXT,
+  .next_nodes = {
+    [ACL_NEXT_INDEX_DENY] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_inacl_node, ip4_inacl);
+
+static uword
+ip6_inacl (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return ip_inacl_inline (vm, node, frame, 0 /* is_ip4 */ );
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_inacl_node) = {
+  .function = ip6_inacl,
+  .name = "ip6-inacl",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip_inacl_trace,
+  .n_errors = ARRAY_LEN(ip_inacl_error_strings),
+  .error_strings = ip_inacl_error_strings,
+
+  .n_next_nodes = ACL_NEXT_INDEX_N_NEXT,
+  .next_nodes = {
+    [ACL_NEXT_INDEX_DENY] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_inacl_node, ip6_inacl);
+
+static clib_error_t *
+ip_inacl_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ip_inacl_init);
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip_packet.h b/src/vnet/ip/ip_packet.h
new file mode 100644
index 00000000..d3f3de77
--- /dev/null
+++ b/src/vnet/ip/ip_packet.h
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip_packet.h: packet format common between ip4 & ip6
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_ip_packet_h
+#define included_ip_packet_h
+
+#include <vppinfra/byte_order.h>
+#include <vppinfra/error.h>
+
+typedef enum ip_protocol
+{
+#define ip_protocol(n,s) IP_PROTOCOL_##s = n,
+#include "protocols.def"
+#undef ip_protocol
+} ip_protocol_t;
+
+/* TCP/UDP ports. */
+typedef enum
+{
+#define ip_port(s,n) IP_PORT_##s = n,
+#include "ports.def"
+#undef ip_port
+} ip_port_t;
+
+/* Classifies protocols into UDP, ICMP or other. */
+typedef enum
+{
+  IP_BUILTIN_PROTOCOL_UDP,
+  IP_BUILTIN_PROTOCOL_ICMP,
+  IP_BUILTIN_PROTOCOL_UNKNOWN,
+} ip_builtin_protocol_t;
+
+#define foreach_ip_builtin_multicast_group	\
+  _ (1, all_hosts_on_subnet)			\
+  _ (2, all_routers_on_subnet)			\
+  _ (4, dvmrp)					\
+  _ (5, ospf_all_routers)			\
+  _ (6, ospf_designated_routers)		\
+  _ (13, pim)					\
+  _ (18, vrrp)					\
+  _ (102, hsrp)					\
+  _ (22, igmp_v3)
+
+typedef enum
+{
+#define _(n,f) IP_MULTICAST_GROUP_##f = n,
+  foreach_ip_builtin_multicast_group
+#undef _
+} ip_multicast_group_t;
+
+/* IP checksum support. */
+
+/* Incremental checksum update. */
+typedef uword ip_csum_t;
+
+always_inline ip_csum_t
+ip_csum_with_carry (ip_csum_t sum, ip_csum_t x)
+{
+  ip_csum_t t = sum + x;
+  return t + (t < x);
+}
+
+/* Update checksum changing field at even byte offset from x -> 0. */
+always_inline ip_csum_t
+ip_csum_add_even (ip_csum_t c, ip_csum_t x)
+{
+  ip_csum_t d;
+
+  d = c - x;
+
+  /* Fold in carry from high bit. */
+  d -= d > c;
+
+  ASSERT (ip_csum_with_carry (d, x) == c);
+
+  return d;
+}
+
+/* Update checksum changing field at even byte offset from 0 -> x. */
+always_inline ip_csum_t
+ip_csum_sub_even (ip_csum_t c, ip_csum_t x)
+{
+  return ip_csum_with_carry (c, x);
+}
+
+always_inline ip_csum_t
+ip_csum_update_inline (ip_csum_t sum, ip_csum_t old, ip_csum_t new,
+		       u32 field_byte_offset, u32 field_n_bytes)
+{
+  /* For even 1-byte fields on big-endian and odd 1-byte fields on little endian
+     we need to shift byte into place for checksum. */
+  if ((field_n_bytes % 2)
+      && (field_byte_offset % 2) == CLIB_ARCH_IS_LITTLE_ENDIAN)
+    {
+      old = old << 8;
+      new = new << 8;
+    }
+  sum = ip_csum_sub_even (sum, old);
+  sum = ip_csum_add_even (sum, new);
+  return sum;
+}
+
+#define ip_csum_update(sum,old,new,type,field)			\
+  ip_csum_update_inline ((sum), (old), (new),			\
+			 STRUCT_OFFSET_OF (type, field),	\
+			 STRUCT_SIZE_OF (type, field))
+
+always_inline u16
+ip_csum_fold (ip_csum_t c)
+{
+  /* Reduce to 16 bits. */
+#if uword_bits == 64
+  c = (c & (ip_csum_t) 0xffffffff) + (c >> (ip_csum_t) 32);
+  c = (c & 0xffff) + (c >> 16);
+#endif
+
+  c = (c & 0xffff) + (c >> 16);
+  c = (c & 0xffff) + (c >> 16);
+
+  return c;
+}
+
+/* Copy data and checksum at the same time. */
+ip_csum_t ip_csum_and_memcpy (ip_csum_t sum, void *dst, void *src,
+			      uword n_bytes);
+
+always_inline u16
+ip_csum_and_memcpy_fold (ip_csum_t sum, void *dst)
+{
+  return ip_csum_fold (sum);
+}
+
+/* Checksum routine. */
+ip_csum_t ip_incremental_checksum (ip_csum_t sum, void *data, uword n_bytes);
+
+#endif /* included_ip_packet_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ip_source_and_port_range_check.h b/src/vnet/ip/ip_source_and_port_range_check.h
new file mode 100644
index 00000000..fefe5ff1
--- /dev/null
+++ b/src/vnet/ip/ip_source_and_port_range_check.h
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_ip_ip_source_and_port_range_check_h
+#define included_ip_ip_source_and_port_range_check_h
+
+
+typedef struct
+{
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} source_range_check_main_t;
+
+source_range_check_main_t source_range_check_main;
+
+typedef enum
+{
+  IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT,
+  IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT,
+  IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN,
+  IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN,
+  IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS,
+} ip_source_and_port_range_check_protocol_t;
+
+typedef struct
+{
+  u32 fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS];
+} ip_source_and_port_range_check_config_t;
+
+#define IP_SOURCE_AND_PORT_RANGE_CHECK_RANGE_LIMIT VLIB_BUFFER_PRE_DATA_SIZE/(2*sizeof(u16x8));
+
+typedef struct
+{
+  union
+  {
+    u16x8 as_u16x8;
+    u16 as_u16[8];
+  };
+} u16x8vec_t;
+
+typedef struct
+{
+  u16x8vec_t low;
+  u16x8vec_t hi;
+} protocol_port_range_t;
+
+/**
+ * @brief The number of supported ranges per-data path object.
+ * If more ranges are required, bump this number.
+ */
+#define N_PORT_RANGES_PER_DPO  64
+#define N_RANGES_PER_BLOCK (sizeof(u16x8vec_t)/2)
+#define N_BLOCKS_PER_DPO (N_PORT_RANGES_PER_DPO/N_RANGES_PER_BLOCK)
+
+/**
+ * @brief
+ *  The object that is in the data-path to perform the check.
+ *
+ * Some trade-offs here; memory vs performance.
+ *
+ * performance:
+ *  the principle factor is d-cache line misses/hits.
+ *  so we want the data layout to minimise the d-cache misses. This
+ *  means not following dependent reads. i.e. not doing
+ *
+ *   struct B {
+ *     u16 n_ranges;
+ *     range_t *ragnes; // vector of ranges.
+ *   }
+ *
+ *   so to read ranges[0] we would first d-cache miss on the address
+ *   of the object of type B, for which we would need to wait before we
+ *   can get the address of B->ranges.
+ *   So this layout is better:
+ *
+ *  struct B {
+ *    u16 n_ranges;
+ *    range_t ragnes[N];
+ *  }
+ *
+ * memory:
+ *  the latter layout above is more memory hungry. And N needs to be:
+ *   1 - sized for the maximum required
+ *   2 - fixed, so that objects of type B can be pool allocated and so
+ *       'get'-able using an index.
+ *       An option over fixed might be to allocate contiguous chunk from
+ *       the pool (like we used to do for multi-path adjs).
+ */
+typedef struct protocol_port_range_dpo_t_
+{
+  /**
+   * The number of blocks from the 'block' array below
+   * that have rnages configured. We keep this count so that in the data-path
+   * we can limit the loop to be only over the blocks we need
+   */
+  u16 n_used_blocks;
+
+  /**
+   * The total number of free ranges from all blocks.
+   * Used to prevent overrun of the ranges available.
+   */
+  u16 n_free_ranges;
+
+  /**
+   * the fixed size array of ranges
+   */
+  protocol_port_range_t blocks[N_BLOCKS_PER_DPO];
+} protocol_port_range_dpo_t;
+
+int ip4_source_and_port_range_check_add_del (ip4_address_t * address,
+					     u32 length,
+					     u32 vrf_id,
+					     u16 * low_ports,
+					     u16 * hi_ports, int is_add);
+
+// This will be moved to another file in another patch -- for API freeze
+int ip6_source_and_port_range_check_add_del (ip6_address_t * address,
+					     u32 length,
+					     u32 vrf_id,
+					     u16 * low_ports,
+					     u16 * hi_ports, int is_add);
+
+int set_ip_source_and_port_range_check (vlib_main_t * vm,
+					u32 * fib_index,
+					u32 sw_if_index, u32 is_add);
+
+#endif /* included ip_source_and_port_range_check_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/lookup.c b/src/vnet/ip/lookup.c
new file mode 100644
index 00000000..734a4cd7
--- /dev/null
+++ b/src/vnet/ip/lookup.c
@@ -0,0 +1,967 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip_lookup.c: ip4/6 adjacency and lookup table managment
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+#include <vnet/adj/adj.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/mpls/mpls.h>
+#include <vnet/dpo/drop_dpo.h>
+#include <vnet/dpo/classify_dpo.h>
+#include <vnet/dpo/punt_dpo.h>
+#include <vnet/dpo/receive_dpo.h>
+#include <vnet/dpo/ip_null_dpo.h>
+
+/**
+ * @file
+ * @brief IPv4 and IPv6 adjacency and lookup table managment.
+ *
+ */
+
+clib_error_t *
+ip_interface_address_add_del (ip_lookup_main_t * lm,
+			      u32 sw_if_index,
+			      void *addr_fib,
+			      u32 address_length,
+			      u32 is_del, u32 * result_if_address_index)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ip_interface_address_t *a, *prev, *next;
+  uword *p = mhash_get (&lm->address_to_if_address_index, addr_fib);
+
+  vec_validate_init_empty (lm->if_address_pool_index_by_sw_if_index,
+			   sw_if_index, ~0);
+  a = p ? pool_elt_at_index (lm->if_address_pool, p[0]) : 0;
+
+  /* Verify given length. */
+  if ((a && (address_length != a->address_length)) || (address_length == 0))
+    {
+      vnm->api_errno = VNET_API_ERROR_ADDRESS_LENGTH_MISMATCH;
+      return clib_error_create
+	("%U wrong length (expected %d) for interface %U",
+	 lm->format_address_and_length, addr_fib,
+	 address_length, a ? a->address_length : -1,
+	 format_vnet_sw_if_index_name, vnm, sw_if_index);
+    }
+
+  if (is_del)
+    {
+      if (!a)
+	{
+	  vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index);
+	  vnm->api_errno = VNET_API_ERROR_ADDRESS_NOT_FOUND_FOR_INTERFACE;
+	  return clib_error_create ("%U not found for interface %U",
+				    lm->format_address_and_length,
+				    addr_fib, address_length,
+				    format_vnet_sw_interface_name, vnm, si);
+	}
+
+      if (a->prev_this_sw_interface != ~0)
+	{
+	  prev =
+	    pool_elt_at_index (lm->if_address_pool,
+			       a->prev_this_sw_interface);
+	  prev->next_this_sw_interface = a->next_this_sw_interface;
+	}
+      if (a->next_this_sw_interface != ~0)
+	{
+	  next =
+	    pool_elt_at_index (lm->if_address_pool,
+			       a->next_this_sw_interface);
+	  next->prev_this_sw_interface = a->prev_this_sw_interface;
+
+	  if (a->prev_this_sw_interface == ~0)
+	    lm->if_address_pool_index_by_sw_if_index[sw_if_index] =
+	      a->next_this_sw_interface;
+	}
+
+      if ((a->next_this_sw_interface == ~0)
+	  && (a->prev_this_sw_interface == ~0))
+	lm->if_address_pool_index_by_sw_if_index[sw_if_index] = ~0;
+
+      mhash_unset (&lm->address_to_if_address_index, addr_fib,
+		   /* old_value */ 0);
+      pool_put (lm->if_address_pool, a);
+
+      if (result_if_address_index)
+	*result_if_address_index = ~0;
+    }
+
+  else if (!a)
+    {
+      u32 pi;			/* previous index */
+      u32 ai;
+      u32 hi;			/* head index */
+
+      pool_get (lm->if_address_pool, a);
+      memset (a, ~0, sizeof (a[0]));
+      ai = a - lm->if_address_pool;
+
+      hi = pi = lm->if_address_pool_index_by_sw_if_index[sw_if_index];
+      prev = 0;
+      while (pi != (u32) ~ 0)
+	{
+	  prev = pool_elt_at_index (lm->if_address_pool, pi);
+	  pi = prev->next_this_sw_interface;
+	}
+      pi = prev ? prev - lm->if_address_pool : (u32) ~ 0;
+
+      a->address_key = mhash_set (&lm->address_to_if_address_index,
+				  addr_fib, ai, /* old_value */ 0);
+      a->address_length = address_length;
+      a->sw_if_index = sw_if_index;
+      a->flags = 0;
+      a->prev_this_sw_interface = pi;
+      a->next_this_sw_interface = ~0;
+      if (prev)
+	prev->next_this_sw_interface = ai;
+
+      lm->if_address_pool_index_by_sw_if_index[sw_if_index] =
+	(hi != ~0) ? hi : ai;
+      if (result_if_address_index)
+	*result_if_address_index = ai;
+    }
+  else
+    {
+      if (result_if_address_index)
+	*result_if_address_index = a - lm->if_address_pool;
+    }
+
+
+  return /* no error */ 0;
+}
+
+void
+ip_lookup_init (ip_lookup_main_t * lm, u32 is_ip6)
+{
+  /* ensure that adjacency is cacheline aligned and sized */
+  STATIC_ASSERT (STRUCT_OFFSET_OF (ip_adjacency_t, cacheline0) == 0,
+		 "Cache line marker must be 1st element in struct");
+  STATIC_ASSERT (STRUCT_OFFSET_OF (ip_adjacency_t, cacheline1) ==
+		 CLIB_CACHE_LINE_BYTES,
+		 "Data in cache line 0 is bigger than cache line size");
+
+  /* Preallocate three "special" adjacencies */
+  lm->adjacency_heap = adj_pool;
+
+  if (!lm->fib_result_n_bytes)
+    lm->fib_result_n_bytes = sizeof (uword);
+
+  lm->is_ip6 = is_ip6;
+  if (is_ip6)
+    {
+      lm->format_address_and_length = format_ip6_address_and_length;
+      mhash_init (&lm->address_to_if_address_index, sizeof (uword),
+		  sizeof (ip6_address_fib_t));
+    }
+  else
+    {
+      lm->format_address_and_length = format_ip4_address_and_length;
+      mhash_init (&lm->address_to_if_address_index, sizeof (uword),
+		  sizeof (ip4_address_fib_t));
+    }
+
+  {
+    int i;
+
+    /* Setup all IP protocols to be punted and builtin-unknown. */
+    for (i = 0; i < 256; i++)
+      {
+	lm->local_next_by_ip_protocol[i] = IP_LOCAL_NEXT_PUNT;
+	lm->builtin_protocol_by_ip_protocol[i] = IP_BUILTIN_PROTOCOL_UNKNOWN;
+      }
+
+    lm->local_next_by_ip_protocol[IP_PROTOCOL_UDP] = IP_LOCAL_NEXT_UDP_LOOKUP;
+    lm->local_next_by_ip_protocol[is_ip6 ? IP_PROTOCOL_ICMP6 :
+				  IP_PROTOCOL_ICMP] = IP_LOCAL_NEXT_ICMP;
+    lm->builtin_protocol_by_ip_protocol[IP_PROTOCOL_UDP] =
+      IP_BUILTIN_PROTOCOL_UDP;
+    lm->builtin_protocol_by_ip_protocol[is_ip6 ? IP_PROTOCOL_ICMP6 :
+					IP_PROTOCOL_ICMP] =
+      IP_BUILTIN_PROTOCOL_ICMP;
+  }
+}
+
+u8 *
+format_ip_flow_hash_config (u8 * s, va_list * args)
+{
+  flow_hash_config_t flow_hash_config = va_arg (*args, u32);
+
+#define _(n,v) if (flow_hash_config & v) s = format (s, "%s ", #n);
+  foreach_flow_hash_bit;
+#undef _
+
+  return s;
+}
+
+u8 *
+format_ip_lookup_next (u8 * s, va_list * args)
+{
+  ip_lookup_next_t n = va_arg (*args, ip_lookup_next_t);
+  char *t = 0;
+
+  switch (n)
+    {
+    default:
+      s = format (s, "unknown %d", n);
+      return s;
+
+    case IP_LOOKUP_NEXT_DROP:
+      t = "drop";
+      break;
+    case IP_LOOKUP_NEXT_PUNT:
+      t = "punt";
+      break;
+    case IP_LOOKUP_NEXT_ARP:
+      t = "arp";
+      break;
+    case IP_LOOKUP_NEXT_MIDCHAIN:
+      t = "midchain";
+      break;
+    case IP_LOOKUP_NEXT_GLEAN:
+      t = "glean";
+      break;
+    case IP_LOOKUP_NEXT_REWRITE:
+      break;
+    }
+
+  if (t)
+    vec_add (s, t, strlen (t));
+
+  return s;
+}
+
+u8 *
+format_ip_adjacency_packet_data (u8 * s, va_list * args)
+{
+  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
+  u32 adj_index = va_arg (*args, u32);
+  u8 *packet_data = va_arg (*args, u8 *);
+  u32 n_packet_data_bytes = va_arg (*args, u32);
+  ip_adjacency_t *adj = adj_get (adj_index);
+
+  switch (adj->lookup_next_index)
+    {
+    case IP_LOOKUP_NEXT_REWRITE:
+      s = format (s, "%U",
+		  format_vnet_rewrite_header,
+		  vnm->vlib_main, &adj->rewrite_header, packet_data,
+		  n_packet_data_bytes);
+      break;
+
+    default:
+      break;
+    }
+
+  return s;
+}
+
+static uword
+unformat_dpo (unformat_input_t * input, va_list * args)
+{
+  dpo_id_t *dpo = va_arg (*args, dpo_id_t *);
+  fib_protocol_t fp = va_arg (*args, int);
+  dpo_proto_t proto;
+
+  proto = fib_proto_to_dpo (fp);
+
+  if (unformat (input, "drop"))
+    dpo_copy (dpo, drop_dpo_get (proto));
+  else if (unformat (input, "punt"))
+    dpo_copy (dpo, punt_dpo_get (proto));
+  else if (unformat (input, "local"))
+    receive_dpo_add_or_lock (proto, ~0, NULL, dpo);
+  else if (unformat (input, "null-send-unreach"))
+    ip_null_dpo_add_and_lock (proto, IP_NULL_ACTION_SEND_ICMP_UNREACH, dpo);
+  else if (unformat (input, "null-send-prohibit"))
+    ip_null_dpo_add_and_lock (proto, IP_NULL_ACTION_SEND_ICMP_PROHIBIT, dpo);
+  else if (unformat (input, "null"))
+    ip_null_dpo_add_and_lock (proto, IP_NULL_ACTION_NONE, dpo);
+  else if (unformat (input, "classify"))
+    {
+      u32 classify_table_index;
+
+      if (!unformat (input, "%d", &classify_table_index))
+	{
+	  clib_warning ("classify adj must specify table index");
+	  return 0;
+	}
+
+      dpo_set (dpo, DPO_CLASSIFY, proto,
+	       classify_dpo_create (proto, classify_table_index));
+    }
+  else
+    return 0;
+
+  return 1;
+}
+
+const ip46_address_t zero_addr = {
+  .as_u64 = {
+	     0, 0},
+};
+
+u32
+fib_table_id_find_fib_index (fib_protocol_t proto, u32 table_id)
+{
+  ip4_main_t *im4 = &ip4_main;
+  ip6_main_t *im6 = &ip6_main;
+  uword *p;
+
+  switch (proto)
+    {
+    case FIB_PROTOCOL_IP4:
+      p = hash_get (im4->fib_index_by_table_id, table_id);
+      break;
+    case FIB_PROTOCOL_IP6:
+      p = hash_get (im6->fib_index_by_table_id, table_id);
+      break;
+    default:
+      p = NULL;
+      break;
+    }
+  if (NULL != p)
+    {
+      return (p[0]);
+    }
+  return (~0);
+}
+
+clib_error_t *
+vnet_ip_route_cmd (vlib_main_t * vm,
+		   unformat_input_t * main_input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  fib_route_path_t *rpaths = NULL, rpath;
+  dpo_id_t dpo = DPO_INVALID, *dpos = NULL;
+  fib_prefix_t *prefixs = NULL, pfx;
+  mpls_label_t out_label, via_label;
+  clib_error_t *error = NULL;
+  u32 table_id, is_del;
+  vnet_main_t *vnm;
+  u32 fib_index;
+  f64 count;
+  int i;
+
+  vnm = vnet_get_main ();
+  is_del = 0;
+  table_id = 0;
+  count = 1;
+  memset (&pfx, 0, sizeof (pfx));
+  out_label = via_label = MPLS_LABEL_INVALID;
+
+  /* Get a line of input. */
+  if (!unformat_user (main_input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      memset (&rpath, 0, sizeof (rpath));
+
+      if (unformat (line_input, "table %d", &table_id))
+	;
+      else if (unformat (line_input, "del"))
+	is_del = 1;
+      else if (unformat (line_input, "add"))
+	is_del = 0;
+      else if (unformat (line_input, "resolve-via-host"))
+	{
+	  if (vec_len (rpaths) == 0)
+	    {
+	      error = clib_error_return (0, "Paths then flags");
+	      goto done;
+	    }
+	  rpaths[vec_len (rpaths) - 1].frp_flags |=
+	    FIB_ROUTE_PATH_RESOLVE_VIA_HOST;
+	}
+      else if (unformat (line_input, "resolve-via-attached"))
+	{
+	  if (vec_len (rpaths) == 0)
+	    {
+	      error = clib_error_return (0, "Paths then flags");
+	      goto done;
+	    }
+	  rpaths[vec_len (rpaths) - 1].frp_flags |=
+	    FIB_ROUTE_PATH_RESOLVE_VIA_ATTACHED;
+	}
+      else if (unformat (line_input, "out-label %U",
+			 unformat_mpls_unicast_label, &out_label))
+	{
+	  if (vec_len (rpaths) == 0)
+	    {
+	      error = clib_error_return (0, "Paths then labels");
+	      goto done;
+	    }
+	  vec_add1 (rpaths[vec_len (rpaths) - 1].frp_label_stack, out_label);
+	}
+      else if (unformat (line_input, "via-label %U",
+			 unformat_mpls_unicast_label, &rpath.frp_local_label))
+	{
+	  rpath.frp_weight = 1;
+	  rpath.frp_proto = FIB_PROTOCOL_MPLS;
+	  rpath.frp_sw_if_index = ~0;
+	  vec_add1 (rpaths, rpath);
+	}
+      else if (unformat (line_input, "count %f", &count))
+	;
+
+      else if (unformat (line_input, "%U/%d",
+			 unformat_ip4_address, &pfx.fp_addr.ip4, &pfx.fp_len))
+	{
+	  pfx.fp_proto = FIB_PROTOCOL_IP4;
+	  vec_add1 (prefixs, pfx);
+	}
+      else if (unformat (line_input, "%U/%d",
+			 unformat_ip6_address, &pfx.fp_addr.ip6, &pfx.fp_len))
+	{
+	  pfx.fp_proto = FIB_PROTOCOL_IP6;
+	  vec_add1 (prefixs, pfx);
+	}
+      else if (unformat (line_input, "via %U %U weight %u",
+			 unformat_ip4_address,
+			 &rpath.frp_addr.ip4,
+			 unformat_vnet_sw_interface, vnm,
+			 &rpath.frp_sw_if_index, &rpath.frp_weight))
+	{
+	  rpath.frp_proto = FIB_PROTOCOL_IP4;
+	  vec_add1 (rpaths, rpath);
+	}
+
+      else if (unformat (line_input, "via %U %U weight %u",
+			 unformat_ip6_address,
+			 &rpath.frp_addr.ip6,
+			 unformat_vnet_sw_interface, vnm,
+			 &rpath.frp_sw_if_index, &rpath.frp_weight))
+	{
+	  rpath.frp_proto = FIB_PROTOCOL_IP6;
+	  vec_add1 (rpaths, rpath);
+	}
+
+      else if (unformat (line_input, "via %U %U",
+			 unformat_ip4_address,
+			 &rpath.frp_addr.ip4,
+			 unformat_vnet_sw_interface, vnm,
+			 &rpath.frp_sw_if_index))
+	{
+	  rpath.frp_weight = 1;
+	  rpath.frp_proto = FIB_PROTOCOL_IP4;
+	  vec_add1 (rpaths, rpath);
+	}
+
+      else if (unformat (line_input, "via %U %U",
+			 unformat_ip6_address,
+			 &rpath.frp_addr.ip6,
+			 unformat_vnet_sw_interface, vnm,
+			 &rpath.frp_sw_if_index))
+	{
+	  rpath.frp_weight = 1;
+	  rpath.frp_proto = FIB_PROTOCOL_IP6;
+	  vec_add1 (rpaths, rpath);
+	}
+      else if (unformat (line_input, "via %U next-hop-table %d",
+			 unformat_ip4_address,
+			 &rpath.frp_addr.ip4, &rpath.frp_fib_index))
+	{
+	  rpath.frp_weight = 1;
+	  rpath.frp_sw_if_index = ~0;
+	  rpath.frp_proto = FIB_PROTOCOL_IP4;
+	  vec_add1 (rpaths, rpath);
+	}
+      else if (unformat (line_input, "via %U next-hop-table %d",
+			 unformat_ip6_address,
+			 &rpath.frp_addr.ip6, &rpath.frp_fib_index))
+	{
+	  rpath.frp_weight = 1;
+	  rpath.frp_sw_if_index = ~0;
+	  rpath.frp_proto = FIB_PROTOCOL_IP6;
+	  vec_add1 (rpaths, rpath);
+	}
+      else if (unformat (line_input, "via %U",
+			 unformat_ip4_address, &rpath.frp_addr.ip4))
+	{
+	  /*
+	   * the recursive next-hops are by default in the same table
+	   * as the prefix
+	   */
+	  rpath.frp_fib_index = table_id;
+	  rpath.frp_weight = 1;
+	  rpath.frp_sw_if_index = ~0;
+	  rpath.frp_proto = FIB_PROTOCOL_IP4;
+	  vec_add1 (rpaths, rpath);
+	}
+      else if (unformat (line_input, "via %U",
+			 unformat_ip6_address, &rpath.frp_addr.ip6))
+	{
+	  rpath.frp_fib_index = table_id;
+	  rpath.frp_weight = 1;
+	  rpath.frp_sw_if_index = ~0;
+	  rpath.frp_proto = FIB_PROTOCOL_IP6;
+	  vec_add1 (rpaths, rpath);
+	}
+      else if (unformat (line_input,
+			 "lookup in table %d", &rpath.frp_fib_index))
+	{
+	  rpath.frp_proto = pfx.fp_proto;
+	  rpath.frp_sw_if_index = ~0;
+	  vec_add1 (rpaths, rpath);
+	}
+      else if (vec_len (prefixs) > 0 &&
+	       unformat (line_input, "via %U",
+			 unformat_vnet_sw_interface, vnm,
+			 &rpath.frp_sw_if_index))
+	{
+	  rpath.frp_weight = 1;
+	  rpath.frp_proto = prefixs[0].fp_proto;
+	  vec_add1 (rpaths, rpath);
+	}
+      else if (vec_len (prefixs) > 0 &&
+	       unformat (line_input, "via %U",
+			 unformat_dpo, &dpo, prefixs[0].fp_proto))
+	{
+	  vec_add1 (dpos, dpo);
+	}
+      else
+	{
+	  error = unformat_parse_error (line_input);
+	  goto done;
+	}
+    }
+
+  unformat_free (line_input);
+
+  if (vec_len (prefixs) == 0)
+    {
+      error =
+	clib_error_return (0, "expected ip4/ip6 destination address/length.");
+      goto done;
+    }
+
+  if (!is_del && vec_len (rpaths) + vec_len (dpos) == 0)
+    {
+      error = clib_error_return (0, "expected paths.");
+      goto done;
+    }
+
+  if (~0 == table_id)
+    {
+      /*
+       * if no table_id is passed we will manipulate the default
+       */
+      fib_index = 0;
+    }
+  else
+    {
+      fib_index = fib_table_id_find_fib_index (prefixs[0].fp_proto, table_id);
+
+      if (~0 == fib_index)
+	{
+	  error = clib_error_return (0, "Nonexistent table id %d", table_id);
+	  goto done;
+	}
+    }
+
+  for (i = 0; i < vec_len (prefixs); i++)
+    {
+      if (is_del && 0 == vec_len (rpaths))
+	{
+	  fib_table_entry_delete (fib_index, &prefixs[i], FIB_SOURCE_CLI);
+	}
+      else if (!is_del && 1 == vec_len (dpos))
+	{
+	  fib_table_entry_special_dpo_add (fib_index,
+					   &prefixs[i],
+					   FIB_SOURCE_CLI,
+					   FIB_ENTRY_FLAG_EXCLUSIVE,
+					   &dpos[0]);
+	  dpo_reset (&dpos[0]);
+	}
+      else if (vec_len (dpos) > 0)
+	{
+	  error =
+	    clib_error_return (0,
+			       "Load-balancing over multiple special adjacencies is unsupported");
+	  goto done;
+	}
+      else if (0 < vec_len (rpaths))
+	{
+	  u32 k, j, n, incr;
+	  ip46_address_t dst = prefixs[i].fp_addr;
+	  f64 t[2];
+	  n = count;
+	  t[0] = vlib_time_now (vm);
+	  incr = 1 << ((FIB_PROTOCOL_IP4 == prefixs[0].fp_proto ? 32 : 128) -
+		       prefixs[i].fp_len);
+
+	  for (k = 0; k < n; k++)
+	    {
+	      for (j = 0; j < vec_len (rpaths); j++)
+		{
+		  u32 fi;
+		  /*
+		   * the CLI parsing stored table Ids, swap to FIB indicies
+		   */
+		  fi = fib_table_id_find_fib_index (prefixs[i].fp_proto,
+						    rpaths[i].frp_fib_index);
+
+		  if (~0 == fi)
+		    {
+		      error =
+			clib_error_return (0, "Via table %d does not exist",
+					   rpaths[i].frp_fib_index);
+		      goto done;
+		    }
+		  rpaths[i].frp_fib_index = fi;
+
+		  fib_prefix_t rpfx = {
+		    .fp_len = prefixs[i].fp_len,
+		    .fp_proto = prefixs[i].fp_proto,
+		    .fp_addr = dst,
+		  };
+
+		  if (is_del)
+		    fib_table_entry_path_remove2 (fib_index,
+						  &rpfx,
+						  FIB_SOURCE_CLI, &rpaths[j]);
+		  else
+		    fib_table_entry_path_add2 (fib_index,
+					       &rpfx,
+					       FIB_SOURCE_CLI,
+					       FIB_ENTRY_FLAG_NONE,
+					       &rpaths[j]);
+		}
+
+	      if (FIB_PROTOCOL_IP4 == prefixs[0].fp_proto)
+		{
+		  dst.ip4.as_u32 =
+		    clib_host_to_net_u32 (incr +
+					  clib_net_to_host_u32 (dst.
+								ip4.as_u32));
+		}
+	      else
+		{
+		  int bucket = (incr < 64 ? 0 : 1);
+		  dst.ip6.as_u64[bucket] =
+		    clib_host_to_net_u64 (incr +
+					  clib_net_to_host_u64 (dst.ip6.as_u64
+								[bucket]));
+
+		}
+	    }
+	  t[1] = vlib_time_now (vm);
+	  if (count > 1)
+	    vlib_cli_output (vm, "%.6e routes/sec", count / (t[1] - t[0]));
+	}
+      else
+	{
+	  error = clib_error_return (0, "Don't understand what you want...");
+	  goto done;
+	}
+    }
+
+
+done:
+  vec_free (dpos);
+  vec_free (prefixs);
+  vec_free (rpaths);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vlib_cli_ip_command, static) = {
+  .path = "ip",
+  .short_help = "Internet protocol (IP) commands",
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vlib_cli_ip6_command, static) = {
+  .path = "ip6",
+  .short_help = "Internet protocol version 6 (IPv6) commands",
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vlib_cli_show_ip_command, static) = {
+  .path = "show ip",
+  .short_help = "Internet protocol (IP) show commands",
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vlib_cli_show_ip6_command, static) = {
+  .path = "show ip6",
+  .short_help = "Internet protocol version 6 (IPv6) show commands",
+};
+/* *INDENT-ON* */
+
+/*?
+ * This command is used to add or delete IPv4 or IPv6 routes. All
+ * IP Addresses ('<em><dst-ip-addr>/<width></em>',
+ * '<em><next-hop-ip-addr></em>' and '<em><adj-hop-ip-addr></em>')
+ * can be IPv4 or IPv6, but all must be of the same form in a single
+ * command. To display the current set of routes, use the commands
+ * '<em>show ip fib</em>' and '<em>show ip6 fib</em>'.
+ *
+ * @cliexpar
+ * Example of how to add a straight forward static route:
+ * @cliexcmd{ip route add 6.0.1.2/32 via 6.0.0.1 GigabitEthernet2/0/0}
+ * Example of how to delete a straight forward static route:
+ * @cliexcmd{ip route del 6.0.1.2/32 via 6.0.0.1 GigabitEthernet2/0/0}
+ * Mainly for route add/del performance testing, one can add or delete
+ * multiple routes by adding 'count N' to the previous item:
+ * @cliexcmd{ip route add count 10 7.0.0.0/24 via 6.0.0.1 GigabitEthernet2/0/0}
+ * Add multiple routes for the same destination to create equal-cost multipath:
+ * @cliexcmd{ip route add 7.0.0.1/32 via 6.0.0.1 GigabitEthernet2/0/0}
+ * @cliexcmd{ip route add 7.0.0.1/32 via 6.0.0.2 GigabitEthernet2/0/0}
+ * For unequal-cost multipath, specify the desired weights. This
+ * combination of weights results in 3/4 of the traffic following the
+ * second path, 1/4 following the first path:
+ * @cliexcmd{ip route add 7.0.0.1/32 via 6.0.0.1 GigabitEthernet2/0/0 weight 1}
+ * @cliexcmd{ip route add 7.0.0.1/32 via 6.0.0.2 GigabitEthernet2/0/0 weight 3}
+ * To add a route to a particular FIB table (VRF), use:
+ * @cliexcmd{ip route add 172.16.24.0/24 table 7 via GigabitEthernet2/0/0}
+ ?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip_route_command, static) = {
+  .path = "ip route",
+  .short_help = "ip route [add|del] [count <n>] <dst-ip-addr>/<width> [table <table-id>] [via <next-hop-ip-addr> [<interface>] [weight <weight>]] | [via arp <interface> <adj-hop-ip-addr>] | [via drop|punt|local<id>|arp|classify <classify-idx>] [lookup in table <out-table-id>]",
+  .function = vnet_ip_route_cmd,
+  .is_mp_safe = 1,
+};
+/* *INDENT-ON* */
+
+/*
+ * The next two routines address a longstanding script hemorrhoid.
+ * Probing a v4 or v6 neighbor needs to appear to be synchronous,
+ * or dependent route-adds will simply fail.
+ */
+static clib_error_t *
+ip6_probe_neighbor_wait (vlib_main_t * vm, ip6_address_t * a, u32 sw_if_index,
+			 int retry_count)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *e;
+  int i;
+  int resolved = 0;
+  uword event_type;
+  uword *event_data = 0;
+
+  ASSERT (vlib_in_process_context (vm));
+
+  if (retry_count > 0)
+    vnet_register_ip6_neighbor_resolution_event
+      (vnm, a, vlib_get_current_process (vm)->node_runtime.node_index,
+       1 /* event */ , 0 /* data */ );
+
+  for (i = 0; i < retry_count; i++)
+    {
+      /* The interface may be down, etc. */
+      e = ip6_probe_neighbor (vm, a, sw_if_index);
+
+      if (e)
+	return e;
+
+      vlib_process_wait_for_event_or_clock (vm, 1.0);
+      event_type = vlib_process_get_events (vm, &event_data);
+      switch (event_type)
+	{
+	case 1:		/* resolved... */
+	  vlib_cli_output (vm, "Resolved %U", format_ip6_address, a);
+	  resolved = 1;
+	  goto done;
+
+	case ~0:		/* timeout */
+	  break;
+
+	default:
+	  clib_warning ("unknown event_type %d", event_type);
+	}
+      vec_reset_length (event_data);
+    }
+
+done:
+
+  if (!resolved)
+    return clib_error_return (0, "Resolution failed for %U",
+			      format_ip6_address, a);
+  return 0;
+}
+
+static clib_error_t *
+ip4_probe_neighbor_wait (vlib_main_t * vm, ip4_address_t * a, u32 sw_if_index,
+			 int retry_count)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *e;
+  int i;
+  int resolved = 0;
+  uword event_type;
+  uword *event_data = 0;
+
+  ASSERT (vlib_in_process_context (vm));
+
+  if (retry_count > 0)
+    vnet_register_ip4_arp_resolution_event
+      (vnm, a, vlib_get_current_process (vm)->node_runtime.node_index,
+       1 /* event */ , 0 /* data */ );
+
+  for (i = 0; i < retry_count; i++)
+    {
+      /* The interface may be down, etc. */
+      e = ip4_probe_neighbor (vm, a, sw_if_index);
+
+      if (e)
+	return e;
+
+      vlib_process_wait_for_event_or_clock (vm, 1.0);
+      event_type = vlib_process_get_events (vm, &event_data);
+      switch (event_type)
+	{
+	case 1:		/* resolved... */
+	  vlib_cli_output (vm, "Resolved %U", format_ip4_address, a);
+	  resolved = 1;
+	  goto done;
+
+	case ~0:		/* timeout */
+	  break;
+
+	default:
+	  clib_warning ("unknown event_type %d", event_type);
+	}
+      vec_reset_length (event_data);
+    }
+
+done:
+
+  vec_reset_length (event_data);
+
+  if (!resolved)
+    return clib_error_return (0, "Resolution failed for %U",
+			      format_ip4_address, a);
+  return 0;
+}
+
+static clib_error_t *
+probe_neighbor_address (vlib_main_t * vm,
+			unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ip4_address_t a4;
+  ip6_address_t a6;
+  clib_error_t *error = 0;
+  u32 sw_if_index = ~0;
+  int retry_count = 3;
+  int is_ip4 = 1;
+  int address_set = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat_user (line_input, unformat_vnet_sw_interface, vnm,
+			 &sw_if_index))
+	;
+      else if (unformat (line_input, "retry %d", &retry_count))
+	;
+
+      else if (unformat (line_input, "%U", unformat_ip4_address, &a4))
+	address_set++;
+      else if (unformat (line_input, "%U", unformat_ip6_address, &a6))
+	{
+	  address_set++;
+	  is_ip4 = 0;
+	}
+      else
+	return clib_error_return (0, "unknown input '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "Interface required, not set.");
+  if (address_set == 0)
+    return clib_error_return (0, "ip address required, not set.");
+  if (address_set > 1)
+    return clib_error_return (0, "Multiple ip addresses not supported.");
+
+  if (is_ip4)
+    error = ip4_probe_neighbor_wait (vm, &a4, sw_if_index, retry_count);
+  else
+    error = ip6_probe_neighbor_wait (vm, &a6, sw_if_index, retry_count);
+
+  return error;
+}
+
+/*?
+ * The '<em>ip probe-neighbor</em>' command ARPs for IPv4 addresses or
+ * attempts IPv6 neighbor discovery depending on the supplied IP address
+ * format.
+ *
+ * @note This command will not immediately affect the indicated FIB; it
+ * is not suitable for use in establishing a FIB entry prior to adding
+ * recursive FIB entries. As in: don't use it in a script to probe a
+ * gateway prior to adding a default route. It won't work. Instead,
+ * configure a static ARP cache entry [see '<em>set ip arp</em>'], or
+ * a static IPv6 neighbor [see '<em>set ip6 neighbor</em>'].
+ *
+ * @cliexpar
+ * Example of probe for an IPv4 address:
+ * @cliexcmd{ip probe-neighbor GigabitEthernet2/0/0 172.16.1.2}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip_probe_neighbor_command, static) = {
+  .path = "ip probe-neighbor",
+  .function = probe_neighbor_address,
+  .short_help = "ip probe-neighbor <interface> <ip4-addr> | <ip6-addr> [retry nn]",
+  .is_mp_safe = 1,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/lookup.h b/src/vnet/ip/lookup.h
new file mode 100644
index 00000000..3dbd7b3b
--- /dev/null
+++ b/src/vnet/ip/lookup.h
@@ -0,0 +1,498 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/ip_lookup.h: ip (4 or 6) lookup structures, adjacencies, ...
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * @file
+ * Definitions for all things IP (v4|v6) unicast and multicast lookup related.
+ *
+ * - Adjacency definitions and registration.
+ * - Callbacks on route add.
+ * - Callbacks on interface address change.
+ */
+#ifndef included_ip_lookup_h
+#define included_ip_lookup_h
+
+#include <vnet/vnet.h>
+#include <vlib/buffer.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/fib/fib_node.h>
+#include <vnet/dpo/dpo.h>
+#include <vnet/feature/feature.h>
+
+/** @brief Common (IP4/IP6) next index stored in adjacency. */
+typedef enum
+{
+  /** Adjacency to drop this packet. */
+  IP_LOOKUP_NEXT_DROP,
+  /** Adjacency to punt this packet. */
+  IP_LOOKUP_NEXT_PUNT,
+
+  /** This packet is for one of our own IP addresses. */
+  IP_LOOKUP_NEXT_LOCAL,
+
+  /** This packet matches an "incomplete adjacency" and packets
+     need to be passed to ARP to find rewrite string for
+     this destination. */
+  IP_LOOKUP_NEXT_ARP,
+
+  /** This packet matches an "interface route" and packets
+     need to be passed to ARP to find rewrite string for
+     this destination. */
+  IP_LOOKUP_NEXT_GLEAN,
+
+  /** This packet is to be rewritten and forwarded to the next
+     processing node.  This is typically the output interface but
+     might be another node for further output processing. */
+  IP_LOOKUP_NEXT_REWRITE,
+
+  /** This packets follow a load-balance */
+  IP_LOOKUP_NEXT_LOAD_BALANCE,
+
+  /** This packets follow a mid-chain adjacency */
+  IP_LOOKUP_NEXT_MIDCHAIN,
+
+  /** This packets needs to go to ICMP error */
+  IP_LOOKUP_NEXT_ICMP_ERROR,
+
+  IP_LOOKUP_N_NEXT,
+} ip_lookup_next_t;
+
+typedef enum
+{
+  IP4_LOOKUP_N_NEXT = IP_LOOKUP_N_NEXT,
+} ip4_lookup_next_t;
+
+typedef enum
+{
+  /* Hop-by-hop header handling */
+  IP6_LOOKUP_NEXT_HOP_BY_HOP = IP_LOOKUP_N_NEXT,
+  IP6_LOOKUP_NEXT_ADD_HOP_BY_HOP,
+  IP6_LOOKUP_NEXT_POP_HOP_BY_HOP,
+  IP6_LOOKUP_N_NEXT,
+} ip6_lookup_next_t;
+
+#define IP4_LOOKUP_NEXT_NODES {					\
+    [IP_LOOKUP_NEXT_DROP] = "ip4-drop",				\
+    [IP_LOOKUP_NEXT_PUNT] = "ip4-punt",				\
+    [IP_LOOKUP_NEXT_LOCAL] = "ip4-local",			\
+    [IP_LOOKUP_NEXT_ARP] = "ip4-arp",				\
+    [IP_LOOKUP_NEXT_GLEAN] = "ip4-glean",			\
+    [IP_LOOKUP_NEXT_REWRITE] = "ip4-rewrite",    		\
+    [IP_LOOKUP_NEXT_MIDCHAIN] = "ip4-midchain",		        \
+    [IP_LOOKUP_NEXT_LOAD_BALANCE] = "ip4-load-balance",		\
+    [IP_LOOKUP_NEXT_ICMP_ERROR] = "ip4-icmp-error",		\
+}
+
+#define IP6_LOOKUP_NEXT_NODES {					\
+    [IP_LOOKUP_NEXT_DROP] = "ip6-drop",				\
+    [IP_LOOKUP_NEXT_PUNT] = "ip6-punt",				\
+    [IP_LOOKUP_NEXT_LOCAL] = "ip6-local",			\
+    [IP_LOOKUP_NEXT_ARP] = "ip6-discover-neighbor",		\
+    [IP_LOOKUP_NEXT_GLEAN] = "ip6-glean",			\
+    [IP_LOOKUP_NEXT_REWRITE] = "ip6-rewrite",			\
+    [IP_LOOKUP_NEXT_MIDCHAIN] = "ip6-midchain",			\
+    [IP_LOOKUP_NEXT_LOAD_BALANCE] = "ip6-load-balance",		\
+    [IP_LOOKUP_NEXT_ICMP_ERROR] = "ip6-icmp-error",		\
+    [IP6_LOOKUP_NEXT_HOP_BY_HOP] = "ip6-hop-by-hop",		\
+    [IP6_LOOKUP_NEXT_ADD_HOP_BY_HOP] = "ip6-add-hop-by-hop",	\
+    [IP6_LOOKUP_NEXT_POP_HOP_BY_HOP] = "ip6-pop-hop-by-hop",	\
+}
+
+/** Flow hash configuration */
+#define IP_FLOW_HASH_SRC_ADDR (1<<0)
+#define IP_FLOW_HASH_DST_ADDR (1<<1)
+#define IP_FLOW_HASH_PROTO (1<<2)
+#define IP_FLOW_HASH_SRC_PORT (1<<3)
+#define IP_FLOW_HASH_DST_PORT (1<<4)
+#define IP_FLOW_HASH_REVERSE_SRC_DST (1<<5)
+
+/** Default: 5-tuple without the "reverse" bit */
+#define IP_FLOW_HASH_DEFAULT (0x1F)
+
+#define foreach_flow_hash_bit                   \
+_(src, IP_FLOW_HASH_SRC_ADDR)                   \
+_(dst, IP_FLOW_HASH_DST_ADDR)                   \
+_(sport, IP_FLOW_HASH_SRC_PORT)                 \
+_(dport, IP_FLOW_HASH_DST_PORT)                 \
+_(proto, IP_FLOW_HASH_PROTO)	                \
+_(reverse, IP_FLOW_HASH_REVERSE_SRC_DST)
+
+/**
+ * A flow hash configuration is a mask of the flow hash options
+ */
+typedef u32 flow_hash_config_t;
+
+/**
+ * Forward delcartion
+ */
+struct ip_adjacency_t_;
+
+/**
+ * @brief A function type for post-rewrite fixups on midchain adjacency
+ */
+typedef void (*adj_midchain_fixup_t) (vlib_main_t * vm,
+				      struct ip_adjacency_t_ * adj,
+				      vlib_buffer_t * b0);
+
+/**
+ * @brief Flags on an IP adjacency
+ */
+typedef enum ip_adjacency_flags_t_
+{
+    /**
+     * Currently a sync walk is active. Used to prevent re-entrant walking
+     */
+  IP_ADJ_SYNC_WALK_ACTIVE = (1 << 0),
+} ip_adjacency_flags_t;
+
+/** @brief IP unicast adjacency.
+    @note cache aligned.
+*/
+typedef struct ip_adjacency_t_
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+
+  /** Number of adjecencies in block.  Greater than 1 means multipath;
+     otherwise equal to 1. */
+  u16 n_adj;
+
+  /** Next hop after ip4-lookup. */
+  union
+  {
+    ip_lookup_next_t lookup_next_index:16;
+    u16 lookup_next_index_as_int;
+  };
+
+  /** Interface address index for this local/arp adjacency. */
+  u32 if_address_index;
+
+  /** Force re-lookup in a different FIB. ~0 => normal behavior */
+  u16 mcast_group_index;
+
+  /** Highest possible perf subgraph arc interposition, e.g. for ip6 ioam */
+  u16 saved_lookup_next_index;
+
+  /*
+   * link/ether-type
+   */
+  vnet_link_t ia_link;
+  u8 ia_nh_proto;
+
+  union
+  {
+    /**
+     * IP_LOOKUP_NEXT_ARP/IP_LOOKUP_NEXT_REWRITE
+     *
+     * neighbour adjacency sub-type;
+     */
+    struct
+    {
+      ip46_address_t next_hop;
+    } nbr;
+      /**
+       * IP_LOOKUP_NEXT_MIDCHAIN
+       *
+       * A nbr adj that is also recursive. Think tunnels.
+       * A nbr adj can transition to be of type MDICHAIN
+       * so be sure to leave the two structs with the next_hop
+       * fields aligned.
+       */
+    struct
+    {
+	  /**
+	   * The recursive next-hop
+	   */
+      ip46_address_t next_hop;
+	  /**
+	   * The node index of the tunnel's post rewrite/TX function.
+	   */
+      u32 tx_function_node;
+	  /**
+	   * The next DPO to use
+	   */
+      dpo_id_t next_dpo;
+	  /**
+	   * A function to perform the post-rewrite fixup
+	   */
+      adj_midchain_fixup_t fixup_func;
+    } midchain;
+      /**
+       * IP_LOOKUP_NEXT_GLEAN
+       *
+       * Glean the address to ARP for from the packet's destination
+       */
+    struct
+    {
+      ip46_address_t receive_addr;
+    } glean;
+  } sub_type;
+
+    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
+
+  /* Rewrite in second/third cache lines */
+    vnet_declare_rewrite (VLIB_BUFFER_PRE_DATA_SIZE);
+
+  /*
+   * member not accessed in the data plane are relgated to the
+   * remaining cachelines
+   */
+  fib_node_t ia_node;
+
+  /**
+   * Flags on the adjacency
+   */
+  ip_adjacency_flags_t ia_flags;
+
+} ip_adjacency_t;
+
+STATIC_ASSERT ((STRUCT_OFFSET_OF (ip_adjacency_t, cacheline0) == 0),
+	       "IP adjacency cachline 0 is not offset");
+STATIC_ASSERT ((STRUCT_OFFSET_OF (ip_adjacency_t, cacheline1) ==
+		CLIB_CACHE_LINE_BYTES),
+	       "IP adjacency cachline 1 is more than one cachline size offset");
+
+/* An all zeros address */
+extern const ip46_address_t zero_addr;
+
+/* IP multicast adjacency. */
+typedef struct
+{
+  /* Handle for this adjacency in adjacency heap. */
+  u32 heap_handle;
+
+  /* Number of adjecencies in block. */
+  u32 n_adj;
+
+  /* Rewrite string. */
+    vnet_declare_rewrite (64 - 2 * sizeof (u32));
+}
+ip_multicast_rewrite_t;
+
+typedef struct
+{
+  /* ip4-multicast-rewrite next index. */
+  u32 next_index;
+
+  u8 n_rewrite_bytes;
+
+  u8 rewrite_string[64 - 1 * sizeof (u32) - 1 * sizeof (u8)];
+}
+ip_multicast_rewrite_string_t;
+
+typedef struct
+{
+  ip_multicast_rewrite_t *rewrite_heap;
+
+  ip_multicast_rewrite_string_t *rewrite_strings;
+
+  /* Negative rewrite string index; >= 0 sw_if_index.
+     Sorted.  Used to hash. */
+  i32 **adjacency_id_vector;
+
+  uword *adjacency_by_id_vector;
+} ip_multicast_lookup_main_t;
+
+typedef struct
+{
+  /* Key for mhash; in fact, just a byte offset into mhash key vector. */
+  u32 address_key;
+
+  /* Interface which has this address. */
+  u32 sw_if_index;
+
+  /* Adjacency for neighbor probe (ARP) for this interface address. */
+  u32 neighbor_probe_adj_index;
+
+  /* Address (prefix) length for this interface. */
+  u16 address_length;
+
+  /* Will be used for something eventually.  Primary vs. secondary? */
+  u16 flags;
+
+  /* Next and previous pointers for doubly linked list of
+     addresses per software interface. */
+  u32 next_this_sw_interface;
+  u32 prev_this_sw_interface;
+} ip_interface_address_t;
+
+typedef enum
+{
+  IP_LOCAL_NEXT_DROP,
+  IP_LOCAL_NEXT_PUNT,
+  IP_LOCAL_NEXT_UDP_LOOKUP,
+  IP_LOCAL_NEXT_ICMP,
+  IP_LOCAL_N_NEXT,
+} ip_local_next_t;
+
+struct ip_lookup_main_t;
+
+typedef struct ip_lookup_main_t
+{
+  /* Adjacency heap. */
+  ip_adjacency_t *adjacency_heap;
+
+  /** load-balance  packet/byte counters indexed by LB index. */
+  vlib_combined_counter_main_t load_balance_counters;
+
+  /** Pool of addresses that are assigned to interfaces. */
+  ip_interface_address_t *if_address_pool;
+
+  /** Hash table mapping address to index in interface address pool. */
+  mhash_t address_to_if_address_index;
+
+  /** Head of doubly linked list of interface addresses for each software interface.
+     ~0 means this interface has no address. */
+  u32 *if_address_pool_index_by_sw_if_index;
+
+  /** First table index to use for this interface, ~0 => none */
+  u32 *classify_table_index_by_sw_if_index;
+
+  /** Feature arc indices */
+  u8 mcast_feature_arc_index;
+  u8 ucast_feature_arc_index;
+  u8 output_feature_arc_index;
+
+  /** Number of bytes in a fib result.  Must be at least
+     sizeof (uword).  First word is always adjacency index. */
+  u32 fib_result_n_bytes, fib_result_n_words;
+
+  format_function_t *format_fib_result;
+
+  /** 1 for ip6; 0 for ip4. */
+  u32 is_ip6;
+
+  /** Either format_ip4_address_and_length or format_ip6_address_and_length. */
+  format_function_t *format_address_and_length;
+
+  /** Special adjacency format functions */
+  format_function_t **special_adjacency_format_functions;
+
+  /** Table mapping ip protocol to ip[46]-local node next index. */
+  u8 local_next_by_ip_protocol[256];
+
+  /** IP_BUILTIN_PROTOCOL_{TCP,UDP,ICMP,OTHER} by protocol in IP header. */
+  u8 builtin_protocol_by_ip_protocol[256];
+} ip_lookup_main_t;
+
+always_inline ip_adjacency_t *
+ip_get_adjacency (ip_lookup_main_t * lm, u32 adj_index)
+{
+  ip_adjacency_t *adj;
+
+  adj = vec_elt_at_index (lm->adjacency_heap, adj_index);
+
+  return adj;
+}
+
+#define ip_prefetch_adjacency(lm,adj_index,type)		\
+do {								\
+  ip_adjacency_t * _adj = (lm)->adjacency_heap + (adj_index);	\
+  CLIB_PREFETCH (_adj, sizeof (_adj[0]), type);			\
+} while (0)
+
+/* Create new block of given number of contiguous adjacencies. */
+ip_adjacency_t *ip_add_adjacency (ip_lookup_main_t * lm,
+				  ip_adjacency_t * adj,
+				  u32 n_adj, u32 * adj_index_result);
+
+clib_error_t *ip_interface_address_add_del (ip_lookup_main_t * lm,
+					    u32 sw_if_index,
+					    void *address,
+					    u32 address_length,
+					    u32 is_del, u32 * result_index);
+
+u8 *format_ip_flow_hash_config (u8 * s, va_list * args);
+
+always_inline ip_interface_address_t *
+ip_get_interface_address (ip_lookup_main_t * lm, void *addr_fib)
+{
+  uword *p = mhash_get (&lm->address_to_if_address_index, addr_fib);
+  return p ? pool_elt_at_index (lm->if_address_pool, p[0]) : 0;
+}
+
+u32 fib_table_id_find_fib_index (fib_protocol_t proto, u32 table_id);
+
+always_inline void *
+ip_interface_address_get_address (ip_lookup_main_t * lm,
+				  ip_interface_address_t * a)
+{
+  return mhash_key_to_mem (&lm->address_to_if_address_index, a->address_key);
+}
+
+/* *INDENT-OFF* */
+#define foreach_ip_interface_address(lm,a,sw_if_index,loop,body)        \
+do {                                                                    \
+    vnet_main_t *_vnm = vnet_get_main();                                     \
+    u32 _sw_if_index = sw_if_index;                                     \
+    vnet_sw_interface_t *_swif;                                         \
+    _swif = vnet_get_sw_interface (_vnm, _sw_if_index);                 \
+                                                                        \
+    /*                                                                  \
+     * Loop => honor unnumbered interface addressing.                   \
+     */                                                                 \
+    if (loop && _swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)       \
+      _sw_if_index = _swif->unnumbered_sw_if_index;                     \
+    u32 _ia =                                                           \
+      (vec_len((lm)->if_address_pool_index_by_sw_if_index)              \
+       > (_sw_if_index))                                                \
+        ? vec_elt ((lm)->if_address_pool_index_by_sw_if_index,          \
+                   (_sw_if_index)) : (u32)~0;                           \
+    ip_interface_address_t * _a;                                        \
+    while (_ia != ~0)                                                   \
+    {                                                                   \
+        _a = pool_elt_at_index ((lm)->if_address_pool, _ia);            \
+        _ia = _a->next_this_sw_interface;                               \
+        (a) = _a;                                                       \
+        body;                                                           \
+    }                                                                   \
+} while (0)
+/* *INDENT-ON* */
+
+void ip_lookup_init (ip_lookup_main_t * lm, u32 ip_lookup_node_index);
+
+#endif /* included_ip_lookup_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ping.c b/src/vnet/ip/ping.c
new file mode 100644
index 00000000..68dbe759
--- /dev/null
+++ b/src/vnet/ip/ping.c
@@ -0,0 +1,888 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/ip/ping.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/fib_entry.h>
+
+/**
+ * @file
+ * @brief IPv4 and IPv6 ICMP Ping.
+ *
+ * This file contains code to suppport IPv4 or IPv6 ICMP ECHO_REQUEST to
+ * network hosts.
+ *
+ */
+
+
+u8 *
+format_icmp_echo_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  icmp_echo_trace_t *t = va_arg (*va, icmp_echo_trace_t *);
+
+  s = format (s, "ICMP echo id %d seq %d%s",
+	      clib_net_to_host_u16 (t->id),
+	      clib_net_to_host_u16 (t->seq), t->bound ? "" : " (unknown)");
+
+  return s;
+}
+
+/*
+ * If we can find the ping run by an ICMP ID, then we send the signal
+ * to the CLI process referenced by that ping run, alongside with
+ * a freshly made copy of the packet.
+ * I opted for a packet copy to keep the main packet processing path
+ * the same as for all the other nodes.
+ *
+ */
+
+static int
+signal_ip46_icmp_reply_event (vlib_main_t * vm,
+			      u8 event_type, vlib_buffer_t * b0)
+{
+  ping_main_t *pm = &ping_main;
+  u16 net_icmp_id = 0;
+  u32 bi0_copy = 0;
+
+  switch (event_type)
+    {
+    case PING_RESPONSE_IP4:
+      {
+	icmp4_echo_request_header_t *h0 = vlib_buffer_get_current (b0);
+	net_icmp_id = h0->icmp_echo.id;
+      }
+      break;
+    case PING_RESPONSE_IP6:
+      {
+	icmp6_echo_request_header_t *h0 = vlib_buffer_get_current (b0);
+	net_icmp_id = h0->icmp_echo.id;
+      }
+      break;
+    default:
+      return 0;
+    }
+
+  uword *p = hash_get (pm->ping_run_by_icmp_id,
+		       clib_net_to_host_u16 (net_icmp_id));
+  if (!p)
+    return 0;
+
+  ping_run_t *pr = vec_elt_at_index (pm->ping_runs, p[0]);
+  if (vlib_buffer_alloc (vm, &bi0_copy, 1) == 1)
+    {
+      void *dst = vlib_buffer_get_current (vlib_get_buffer (vm, bi0_copy));
+      clib_memcpy (dst, vlib_buffer_get_current (b0), b0->current_length);
+    }
+  /* If buffer_alloc failed, bi0_copy == 0 - just signaling an event. */
+
+  vlib_process_signal_event (vm, pr->cli_process_id, event_type, bi0_copy);
+  return 1;
+}
+
+/*
+ * Process ICMPv6 echo replies
+ */
+static uword
+ip6_icmp_echo_reply_node_fn (vlib_main_t * vm,
+			     vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from;
+
+  from = vlib_frame_vector_args (frame);	/* array of buffer indices */
+  n_left_from = frame->n_vectors;	/* number of buffer indices */
+
+  while (n_left_from > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      u32 next0;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+
+      next0 = signal_ip46_icmp_reply_event (vm, PING_RESPONSE_IP6, b0) ?
+	ICMP6_ECHO_REPLY_NEXT_DROP : ICMP6_ECHO_REPLY_NEXT_PUNT;
+
+      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	{
+	  icmp6_echo_request_header_t *h0 = vlib_buffer_get_current (b0);
+	  icmp_echo_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
+	  tr->id = h0->icmp_echo.id;
+	  tr->seq = h0->icmp_echo.seq;
+	  tr->bound = (next0 == ICMP6_ECHO_REPLY_NEXT_DROP);
+	}
+
+      /* push this pkt to the next graph node */
+      vlib_set_next_frame_buffer (vm, node, next0, bi0);
+
+      from += 1;
+      n_left_from -= 1;
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_icmp_echo_reply_node, static) =
+{
+  .function = ip6_icmp_echo_reply_node_fn,
+  .name = "ip6-icmp-echo-reply",
+  .vector_size = sizeof (u32),
+  .format_trace = format_icmp_echo_trace,
+  .n_next_nodes = ICMP6_ECHO_REPLY_N_NEXT,
+  .next_nodes = {
+    [ICMP6_ECHO_REPLY_NEXT_DROP] = "error-drop",
+    [ICMP6_ECHO_REPLY_NEXT_PUNT] = "error-punt",
+  },
+};
+/* *INDENT-ON* */
+
+/*
+ * Process ICMPv4 echo replies
+ */
+static uword
+ip4_icmp_echo_reply_node_fn (vlib_main_t * vm,
+			     vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from;
+
+  from = vlib_frame_vector_args (frame);	/* array of buffer indices */
+  n_left_from = frame->n_vectors;	/* number of buffer indices */
+
+  while (n_left_from > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      u32 next0;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+
+      next0 = signal_ip46_icmp_reply_event (vm, PING_RESPONSE_IP4, b0) ?
+	ICMP4_ECHO_REPLY_NEXT_DROP : ICMP4_ECHO_REPLY_NEXT_PUNT;
+
+      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	{
+	  icmp4_echo_request_header_t *h0 = vlib_buffer_get_current (b0);
+	  icmp_echo_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
+	  tr->id = h0->icmp_echo.id;
+	  tr->seq = h0->icmp_echo.seq;
+	  tr->bound = (next0 == ICMP4_ECHO_REPLY_NEXT_DROP);
+	}
+
+      /* push this pkt to the next graph node */
+      vlib_set_next_frame_buffer (vm, node, next0, bi0);
+
+      from += 1;
+      n_left_from -= 1;
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_icmp_echo_reply_node, static) =
+{
+  .function = ip4_icmp_echo_reply_node_fn,
+  .name = "ip4-icmp-echo-reply",
+  .vector_size = sizeof (u32),
+  .format_trace = format_icmp_echo_trace,
+  .n_next_nodes = ICMP4_ECHO_REPLY_N_NEXT,
+  .next_nodes = {
+    [ICMP4_ECHO_REPLY_NEXT_DROP] = "error-drop",
+    [ICMP4_ECHO_REPLY_NEXT_PUNT] = "error-punt",
+  },
+};
+/* *INDENT-ON* */
+
+char *ip6_lookup_next_nodes[] = IP6_LOOKUP_NEXT_NODES;
+char *ip4_lookup_next_nodes[] = IP4_LOOKUP_NEXT_NODES;
+
+/* get first interface address */
+static ip6_address_t *
+ip6_interface_first_address (ip6_main_t * im, u32 sw_if_index)
+{
+  ip_lookup_main_t *lm = &im->lookup_main;
+  ip_interface_address_t *ia = 0;
+  ip6_address_t *result = 0;
+
+  /* *INDENT-OFF* */
+  foreach_ip_interface_address (lm, ia, sw_if_index,
+                                1 /* honor unnumbered */ ,
+  ({
+    ip6_address_t * a =
+      ip_interface_address_get_address (lm, ia);
+    result = a;
+    break;
+  }));
+  /* *INDENT-ON* */
+  return result;
+}
+
+/* Fill in the ICMP ECHO structure, return the safety-checked and possibly shrunk data_len */
+static u16
+init_icmp46_echo_request (icmp46_echo_request_t * icmp46_echo,
+			  u16 seq_host, u16 id_host, u16 data_len)
+{
+  int i;
+  icmp46_echo->seq = clib_host_to_net_u16 (seq_host);
+  icmp46_echo->id = clib_host_to_net_u16 (id_host);
+
+  for (i = 0; i < sizeof (icmp46_echo->data); i++)
+    {
+      icmp46_echo->data[i] = i % 256;
+    }
+
+  if (data_len > sizeof (icmp46_echo_request_t))
+    {
+      data_len = sizeof (icmp46_echo_request_t);
+    }
+  return data_len;
+}
+
+static send_ip46_ping_result_t
+send_ip6_ping (vlib_main_t * vm, ip6_main_t * im,
+	       u32 table_id, ip6_address_t * pa6,
+	       u32 sw_if_index, u16 seq_host, u16 id_host, u16 data_len,
+	       u8 verbose)
+{
+  icmp6_echo_request_header_t *h0;
+  u32 bi0 = 0;
+  int bogus_length = 0;
+  vlib_buffer_t *p0;
+  vlib_frame_t *f;
+  u32 *to_next;
+
+  if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
+    return SEND_PING_ALLOC_FAIL;
+
+  p0 = vlib_get_buffer (vm, bi0);
+
+  /*
+   * if the user did not provide a source interface, use the any interface
+   * that the destination resolves via.
+   */
+  if (~0 == sw_if_index)
+    {
+      fib_node_index_t fib_entry_index;
+      u32 fib_index;
+
+      fib_index = ip6_fib_index_from_table_id (table_id);
+
+      if (~0 == fib_index)
+	{
+	  vlib_buffer_free (vm, &bi0, 1);
+	  return SEND_PING_NO_TABLE;
+	}
+
+      fib_entry_index = ip6_fib_table_lookup (fib_index, pa6, 128);
+      sw_if_index = fib_entry_get_resolving_interface (fib_entry_index);
+      /*
+       * Set the TX interface to force ip-lookup to use its table ID
+       */
+      vnet_buffer (p0)->sw_if_index[VLIB_TX] = fib_index;
+    }
+  else
+    {
+      /*
+       * force an IP lookup in the table bound to the user's chosen
+       * source interface.
+       */
+      vnet_buffer (p0)->sw_if_index[VLIB_TX] =
+	ip6_fib_table_get_index_for_sw_if_index (sw_if_index);
+    }
+
+  if (~0 == sw_if_index)
+    {
+      vlib_buffer_free (vm, &bi0, 1);
+      return SEND_PING_NO_INTERFACE;
+    }
+
+  vnet_buffer (p0)->sw_if_index[VLIB_RX] = sw_if_index;
+
+  h0 = vlib_buffer_get_current (p0);
+
+  /* Fill in ip6 header fields */
+  h0->ip6.ip_version_traffic_class_and_flow_label =
+    clib_host_to_net_u32 (0x6 << 28);
+  h0->ip6.payload_length = 0;	/* Set below */
+  h0->ip6.protocol = IP_PROTOCOL_ICMP6;
+  h0->ip6.hop_limit = 255;
+  h0->ip6.dst_address = *pa6;
+  h0->ip6.src_address = *pa6;
+
+  /* Fill in the correct source now */
+  ip6_address_t *a = ip6_interface_first_address (im, sw_if_index);
+  h0->ip6.src_address = a[0];
+
+  /* Fill in icmp fields */
+  h0->icmp.type = ICMP6_echo_request;
+  h0->icmp.code = 0;
+  h0->icmp.checksum = 0;
+
+  data_len =
+    init_icmp46_echo_request (&h0->icmp_echo, seq_host, id_host, data_len);
+  h0->icmp_echo.time_sent = vlib_time_now (vm);
+
+  /* Fix up the lengths */
+  h0->ip6.payload_length =
+    clib_host_to_net_u16 (data_len + sizeof (icmp46_header_t));
+
+  p0->current_length = clib_net_to_host_u16 (h0->ip6.payload_length) +
+    STRUCT_OFFSET_OF (icmp6_echo_request_header_t, icmp);
+
+  /* Calculate the ICMP checksum */
+  h0->icmp.checksum = 0;
+  h0->icmp.checksum =
+    ip6_tcp_udp_icmp_compute_checksum (vm, 0, &h0->ip6, &bogus_length);
+
+  /* Enqueue the packet right now */
+  f = vlib_get_frame_to_node (vm, ip6_lookup_node.index);
+  to_next = vlib_frame_vector_args (f);
+  to_next[0] = bi0;
+  f->n_vectors = 1;
+  vlib_put_frame_to_node (vm, ip6_lookup_node.index, f);
+
+  return SEND_PING_OK;
+}
+
+static send_ip46_ping_result_t
+send_ip4_ping (vlib_main_t * vm,
+	       ip4_main_t * im,
+	       u32 table_id,
+	       ip4_address_t * pa4,
+	       u32 sw_if_index,
+	       u16 seq_host, u16 id_host, u16 data_len, u8 verbose)
+{
+  icmp4_echo_request_header_t *h0;
+  u32 bi0 = 0;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  vlib_buffer_t *p0;
+  vlib_frame_t *f;
+  u32 *to_next;
+  u32 if_add_index0;
+
+  if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
+    return SEND_PING_ALLOC_FAIL;
+
+  p0 = vlib_get_buffer (vm, bi0);
+
+  /*
+   * if the user did not provide a source interface, use the any interface
+   * that the destination resolves via.
+   */
+  if (~0 == sw_if_index)
+    {
+      fib_node_index_t fib_entry_index;
+      u32 fib_index;
+
+      fib_index = ip4_fib_index_from_table_id (table_id);
+
+      if (~0 == fib_index)
+	{
+	  vlib_buffer_free (vm, &bi0, 1);
+	  return SEND_PING_NO_TABLE;
+	}
+
+      fib_entry_index =
+	ip4_fib_table_lookup (ip4_fib_get (fib_index), pa4, 32);
+      sw_if_index = fib_entry_get_resolving_interface (fib_entry_index);
+      /*
+       * Set the TX interface to force ip-lookup to use the user's table ID
+       */
+      vnet_buffer (p0)->sw_if_index[VLIB_TX] = fib_index;
+    }
+  else
+    {
+      /*
+       * force an IP lookup in the table bound to the user's chosen
+       * source interface.
+       */
+      vnet_buffer (p0)->sw_if_index[VLIB_TX] =
+	ip4_fib_table_get_index_for_sw_if_index (sw_if_index);
+    }
+
+  if (~0 == sw_if_index)
+    {
+      vlib_buffer_free (vm, &bi0, 1);
+      return SEND_PING_NO_INTERFACE;
+    }
+
+  vnet_buffer (p0)->sw_if_index[VLIB_RX] = sw_if_index;
+
+  h0 = vlib_buffer_get_current (p0);
+
+  /* Fill in ip4 header fields */
+  h0->ip4.checksum = 0;
+  h0->ip4.ip_version_and_header_length = 0x45;
+  h0->ip4.tos = 0;
+  h0->ip4.length = 0;		/* Set below */
+  h0->ip4.fragment_id = 0;
+  h0->ip4.flags_and_fragment_offset = 0;
+  h0->ip4.ttl = 0xff;
+  h0->ip4.protocol = IP_PROTOCOL_ICMP;
+  h0->ip4.dst_address = *pa4;
+  h0->ip4.src_address = *pa4;
+
+  /* Fill in the correct source now */
+  if_add_index0 = lm->if_address_pool_index_by_sw_if_index[sw_if_index];
+  if (PREDICT_TRUE (if_add_index0 != ~0))
+    {
+      ip_interface_address_t *if_add =
+	pool_elt_at_index (lm->if_address_pool, if_add_index0);
+      ip4_address_t *if_ip = ip_interface_address_get_address (lm, if_add);
+      h0->ip4.src_address = *if_ip;
+      if (verbose)
+	{
+	  vlib_cli_output (vm, "Source address: %U",
+			   format_ip4_address, &h0->ip4.src_address);
+	}
+    }
+
+  /* Fill in icmp fields */
+  h0->icmp.type = ICMP4_echo_request;
+  h0->icmp.code = 0;
+  h0->icmp.checksum = 0;
+
+  data_len =
+    init_icmp46_echo_request (&h0->icmp_echo, seq_host, id_host, data_len);
+  h0->icmp_echo.time_sent = vlib_time_now (vm);
+
+  /* Fix up the lengths */
+  h0->ip4.length =
+    clib_host_to_net_u16 (data_len + sizeof (icmp46_header_t) +
+			  sizeof (ip4_header_t));
+
+  p0->current_length = clib_net_to_host_u16 (h0->ip4.length);
+
+  /* Calculate the IP and ICMP checksums */
+  h0->ip4.checksum = ip4_header_checksum (&(h0->ip4));
+  h0->icmp.checksum =
+    ~ip_csum_fold (ip_incremental_checksum (0, &(h0->icmp),
+					    p0->current_length -
+					    sizeof (ip4_header_t)));
+
+  /* Enqueue the packet right now */
+  f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
+  to_next = vlib_frame_vector_args (f);
+  to_next[0] = bi0;
+  f->n_vectors = 1;
+  vlib_put_frame_to_node (vm, ip4_lookup_node.index, f);
+
+  return SEND_PING_OK;
+}
+
+
+static void
+print_ip6_icmp_reply (vlib_main_t * vm, u32 bi0)
+{
+  vlib_buffer_t *b0 = vlib_get_buffer (vm, bi0);
+  icmp6_echo_request_header_t *h0 = vlib_buffer_get_current (b0);
+  f64 rtt = vlib_time_now (vm) - h0->icmp_echo.time_sent;
+
+  vlib_cli_output (vm,
+		   "%d bytes from %U: icmp_seq=%d ttl=%d time=%.4f ms",
+		   clib_host_to_net_u16 (h0->ip6.payload_length),
+		   format_ip6_address,
+		   &h0->ip6.src_address,
+		   clib_host_to_net_u16 (h0->icmp_echo.seq),
+		   h0->ip6.hop_limit, rtt * 1000.0);
+}
+
+static void
+print_ip4_icmp_reply (vlib_main_t * vm, u32 bi0)
+{
+  vlib_buffer_t *b0 = vlib_get_buffer (vm, bi0);
+  icmp4_echo_request_header_t *h0 = vlib_buffer_get_current (b0);
+  f64 rtt = vlib_time_now (vm) - h0->icmp_echo.time_sent;
+  u32 rcvd_icmp_len =
+    clib_host_to_net_u16 (h0->ip4.length) -
+    (4 * (0xF & h0->ip4.ip_version_and_header_length));
+
+  vlib_cli_output (vm,
+		   "%d bytes from %U: icmp_seq=%d ttl=%d time=%.4f ms",
+		   rcvd_icmp_len,
+		   format_ip4_address,
+		   &h0->ip4.src_address,
+		   clib_host_to_net_u16 (h0->icmp_echo.seq),
+		   h0->ip4.ttl, rtt * 1000.0);
+}
+
+
+/*
+ * Perform the ping run with the given parameters in the current CLI process.
+ * Depending on whether pa4 or pa6 is set, runs IPv4 or IPv6 ping.
+ * The amusing side effect is of course if both are set, then both pings are sent.
+ * This behavior can be used to ping a dualstack host over IPv4 and IPv6 at once.
+ */
+
+static void
+run_ping_ip46_address (vlib_main_t * vm, u32 table_id, ip4_address_t * pa4,
+		       ip6_address_t * pa6, u32 sw_if_index,
+		       f64 ping_interval, u32 ping_repeat, u32 data_len,
+		       u32 verbose)
+{
+  int i;
+  ping_main_t *pm = &ping_main;
+  uword curr_proc = vlib_current_process (vm);
+  u32 n_replies = 0;
+  u32 n_requests = 0;
+  ping_run_t *pr = 0;
+  u32 ping_run_index = 0;
+  u16 icmp_id;
+
+  static u32 rand_seed = 0;
+
+  if (PREDICT_FALSE (!rand_seed))
+    rand_seed = random_default_seed ();
+
+  icmp_id = random_u32 (&rand_seed) & 0xffff;
+
+  while (hash_get (pm->ping_run_by_icmp_id, icmp_id))
+    {
+      vlib_cli_output (vm, "ICMP ID collision at %d, incrementing", icmp_id);
+      icmp_id++;
+    }
+  pool_get (pm->ping_runs, pr);
+  ping_run_index = pr - pm->ping_runs;
+  pr->cli_process_id = curr_proc;
+  pr->icmp_id = icmp_id;
+  hash_set (pm->ping_run_by_icmp_id, icmp_id, ping_run_index);
+  for (i = 1; i <= ping_repeat; i++)
+    {
+      f64 sleep_interval;
+      f64 time_ping_sent = vlib_time_now (vm);
+      /* Reset pr: running ping in other process could have changed pm->ping_runs */
+      pr = vec_elt_at_index (pm->ping_runs, ping_run_index);
+      pr->curr_seq = i;
+      if (pa6 &&
+	  (SEND_PING_OK ==
+	   send_ip6_ping (vm, ping_main.ip6_main, table_id, pa6, sw_if_index,
+			  i, icmp_id, data_len, verbose)))
+	{
+	  n_requests++;
+	}
+      if (pa4 &&
+	  (SEND_PING_OK ==
+	   send_ip4_ping (vm, ping_main.ip4_main, table_id, pa4, sw_if_index,
+			  i, icmp_id, data_len, verbose)))
+	{
+	  n_requests++;
+	}
+      while ((i <= ping_repeat)
+	     &&
+	     ((sleep_interval =
+	       time_ping_sent + ping_interval - vlib_time_now (vm)) > 0.0))
+	{
+	  uword event_type, *event_data = 0;
+	  vlib_process_wait_for_event_or_clock (vm, sleep_interval);
+	  event_type = vlib_process_get_events (vm, &event_data);
+	  switch (event_type)
+	    {
+	    case ~0:		/* no events => timeout */
+	      break;
+	    case PING_RESPONSE_IP6:
+	      {
+		int i;
+		for (i = 0; i < vec_len (event_data); i++)
+		  {
+		    u32 bi0 = event_data[0];
+		    print_ip6_icmp_reply (vm, bi0);
+		    n_replies++;
+		    if (0 != bi0)
+		      {
+			vlib_buffer_free (vm, &bi0, 1);
+		      }
+		  }
+	      }
+	      break;
+	    case PING_RESPONSE_IP4:
+	      {
+		int i;
+		for (i = 0; i < vec_len (event_data); i++)
+		  {
+		    u32 bi0 = event_data[0];
+		    print_ip4_icmp_reply (vm, bi0);
+		    n_replies++;
+		    if (0 != bi0)
+		      {
+			vlib_buffer_free (vm, &bi0, 1);
+		      }
+		  }
+	      }
+	      break;
+	    default:
+	      /* someone pressed a key, abort */
+	      vlib_cli_output (vm, "Aborted due to a keypress.");
+	      i = 1 + ping_repeat;
+	      break;
+	    }
+	}
+    }
+  vlib_cli_output (vm, "\n");
+  {
+    float loss =
+      (0 ==
+       n_requests) ? 0 : 100.0 * ((float) n_requests -
+				  (float) n_replies) / (float) n_requests;
+    vlib_cli_output (vm,
+		     "Statistics: %u sent, %u received, %f%% packet loss\n",
+		     n_requests, n_replies, loss);
+    /* Reset pr: running ping in other process could have changed pm->ping_runs */
+    pr = vec_elt_at_index (pm->ping_runs, ping_run_index);
+    hash_unset (pm->ping_run_by_icmp_id, icmp_id);
+    pool_put (pm->ping_runs, pr);
+  }
+}
+
+
+
+
+
+static clib_error_t *
+ping_ip_address (vlib_main_t * vm,
+		 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  ip4_address_t a4;
+  ip6_address_t a6;
+  clib_error_t *error = 0;
+  u32 ping_repeat = 5;
+  u8 ping_ip4, ping_ip6;
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 data_len = PING_DEFAULT_DATA_LEN;
+  u32 verbose = 0;
+  f64 ping_interval = PING_DEFAULT_INTERVAL;
+  u32 sw_if_index, table_id;
+
+  table_id = 0;
+  ping_ip4 = ping_ip6 = 0;
+  sw_if_index = ~0;
+
+  if (unformat (input, "%U", unformat_ip4_address, &a4))
+    {
+      ping_ip4 = 1;
+    }
+  else if (unformat (input, "%U", unformat_ip6_address, &a6))
+    {
+      ping_ip6 = 1;
+    }
+  else if (unformat (input, "ipv4"))
+    {
+      if (unformat (input, "%U", unformat_ip4_address, &a4))
+	{
+	  ping_ip4 = 1;
+	}
+      else
+	{
+	  error =
+	    clib_error_return (0,
+			       "expecting IPv4 address but got `%U'",
+			       format_unformat_error, input);
+	}
+    }
+  else if (unformat (input, "ipv6"))
+    {
+      if (unformat (input, "%U", unformat_ip6_address, &a6))
+	{
+	  ping_ip6 = 1;
+	}
+      else
+	{
+	  error =
+	    clib_error_return (0,
+			       "expecting IPv6 address but got `%U'",
+			       format_unformat_error, input);
+	}
+    }
+  else
+    {
+      error =
+	clib_error_return (0,
+			   "expecting IP4/IP6 address `%U'. Usage: ping <addr> [source <intf>] [size <datasz>] [repeat <count>] [verbose]",
+			   format_unformat_error, input);
+      goto done;
+    }
+
+  /* allow for the second AF in the same ping */
+  if (!ping_ip4 && (unformat (input, "ipv4")))
+    {
+      if (unformat (input, "%U", unformat_ip4_address, &a4))
+	{
+	  ping_ip4 = 1;
+	}
+    }
+  else if (!ping_ip6 && (unformat (input, "ipv6")))
+    {
+      if (unformat (input, "%U", unformat_ip6_address, &a6))
+	{
+	  ping_ip6 = 1;
+	}
+    }
+
+  /* parse the rest of the parameters  in a cycle */
+  while (!unformat_eof (input, NULL))
+    {
+      if (unformat (input, "source"))
+	{
+	  if (!unformat_user
+	      (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+	    {
+	      error =
+		clib_error_return (0,
+				   "unknown interface `%U'",
+				   format_unformat_error, input);
+	      goto done;
+	    }
+	}
+      else if (unformat (input, "size"))
+	{
+	  if (!unformat (input, "%u", &data_len))
+	    {
+	      error =
+		clib_error_return (0,
+				   "expecting size but got `%U'",
+				   format_unformat_error, input);
+	      goto done;
+	    }
+	}
+      else if (unformat (input, "table-id"))
+	{
+	  if (!unformat (input, "du", &table_id))
+	    {
+	      error =
+		clib_error_return (0,
+				   "expecting table-id but got `%U'",
+				   format_unformat_error, input);
+	      goto done;
+	    }
+	}
+      else if (unformat (input, "interval"))
+	{
+	  if (!unformat (input, "%f", &ping_interval))
+	    {
+	      error =
+		clib_error_return (0,
+				   "expecting interval (floating point number) got `%U'",
+				   format_unformat_error, input);
+	      goto done;
+	    }
+	}
+      else if (unformat (input, "repeat"))
+	{
+	  if (!unformat (input, "%u", &ping_repeat))
+	    {
+	      error =
+		clib_error_return (0,
+				   "expecting repeat count but got `%U'",
+				   format_unformat_error, input);
+	      goto done;
+	    }
+	}
+      else if (unformat (input, "verbose"))
+	{
+	  verbose = 1;
+	}
+      else
+	{
+	  error = clib_error_return (0, "unknown input `%U'",
+				     format_unformat_error, input);
+	  goto done;
+	}
+    }
+
+  run_ping_ip46_address (vm, table_id, ping_ip4 ? &a4 : NULL,
+			 ping_ip6 ? &a6 : NULL, sw_if_index, ping_interval,
+			 ping_repeat, data_len, verbose);
+done:
+  return error;
+}
+
+/*?
+ * This command sends an ICMP ECHO_REQUEST to network hosts. The address
+ * can be an IPv4 or IPv6 address (or both at the same time).
+ *
+ * @cliexpar
+ * @parblock
+ * Example of how ping an IPv4 address:
+ * @cliexstart{ping 172.16.1.2 source GigabitEthernet2/0/0 repeat 2}
+ * 64 bytes from 172.16.1.2: icmp_seq=1 ttl=64 time=.1090 ms
+ * 64 bytes from 172.16.1.2: icmp_seq=2 ttl=64 time=.0914 ms
+ *
+ * Statistics: 2 sent, 2 received, 0% packet loss
+ * @cliexend
+ *
+ * Example of how ping both an IPv4 address and IPv6 address at the same time:
+ * @cliexstart{ping 172.16.1.2 ipv6 fe80::24a5:f6ff:fe9c:3a36 source GigabitEthernet2/0/0 repeat 2 verbose}
+ * Adjacency index: 10, sw_if_index: 1
+ * Adj: ip6-discover-neighbor
+ * Adj Interface: 0
+ * Forced set interface: 1
+ * Adjacency index: 0, sw_if_index: 4294967295
+ * Adj: ip4-miss
+ * Adj Interface: 0
+ * Forced set interface: 1
+ * Source address: 172.16.1.1
+ * 64 bytes from 172.16.1.2: icmp_seq=1 ttl=64 time=.1899 ms
+ * Adjacency index: 10, sw_if_index: 1
+ * Adj: ip6-discover-neighbor
+ * Adj Interface: 0
+ * Forced set interface: 1
+ * Adjacency index: 0, sw_if_index: 4294967295
+ * Adj: ip4-miss
+ * Adj Interface: 0
+ * Forced set interface: 1
+ * Source address: 172.16.1.1
+ * 64 bytes from 172.16.1.2: icmp_seq=2 ttl=64 time=.0910 ms
+ *
+ * Statistics: 4 sent, 2 received, 50% packet loss
+ * @cliexend
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ping_command, static) =
+{
+  .path = "ping",
+  .function = ping_ip_address,
+  .short_help = "ping {<ip-addr> | ipv4 <ip4-addr> | ipv6 <ip6-addr>}"
+  " [ipv4 <ip4-addr> | ipv6 <ip6-addr>] [source <interface>]"
+  " [size <pktsize>] [interval <sec>] [repeat <cnt>] [table-id <id>]"
+  " [verbose]",
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+ping_cli_init (vlib_main_t * vm)
+{
+  ping_main_t *pm = &ping_main;
+  pm->ip6_main = &ip6_main;
+  pm->ip4_main = &ip4_main;
+  icmp6_register_type (vm, ICMP6_echo_reply, ip6_icmp_echo_reply_node.index);
+  ip4_icmp_register_type (vm, ICMP4_echo_reply,
+			  ip4_icmp_echo_reply_node.index);
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ping_cli_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/ping.h b/src/vnet/ip/ping.h
new file mode 100644
index 00000000..8f41f45c
--- /dev/null
+++ b/src/vnet/ip/ping.h
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vnet_ping_h
+#define included_vnet_ping_h
+
+
+#include <vnet/ip/ip.h>
+
+#include <vnet/ip/lookup.h>
+
+typedef enum
+{
+  PING_RESPONSE_IP6 = 42,
+  PING_RESPONSE_IP4,
+} ping_response_type_t;
+
+typedef enum
+{
+  SEND_PING_OK = 0,
+  SEND_PING_ALLOC_FAIL,
+  SEND_PING_NO_INTERFACE,
+  SEND_PING_NO_TABLE,
+} send_ip46_ping_result_t;
+
+/*
+ * Currently running ping command.
+ */
+typedef struct ping_run_t
+{
+  u16 icmp_id;
+  u16 curr_seq;
+  uword cli_process_id;
+} ping_run_t;
+
+typedef struct ping_main_t
+{
+  ip6_main_t *ip6_main;
+  ip4_main_t *ip4_main;
+  ping_run_t *ping_runs;
+  /* hash table to find back the CLI process for a reply */
+  // uword *cli_proc_by_icmp_id;
+  ping_run_t *ping_run_by_icmp_id;
+} ping_main_t;
+
+ping_main_t ping_main;
+
+#define PING_DEFAULT_DATA_LEN 60
+#define PING_DEFAULT_INTERVAL 1.0
+
+#define PING_MAXIMUM_DATA_SIZE 2000
+
+typedef CLIB_PACKED (struct
+		     {
+		     u16 id;
+		     u16 seq; f64 time_sent; u8 data[PING_MAXIMUM_DATA_SIZE];
+		     }) icmp46_echo_request_t;
+
+
+typedef CLIB_PACKED (struct
+		     {
+		     ip6_header_t ip6;
+		     icmp46_header_t icmp; icmp46_echo_request_t icmp_echo;
+		     }) icmp6_echo_request_header_t;
+
+typedef CLIB_PACKED (struct
+		     {
+		     ip4_header_t ip4;
+		     icmp46_header_t icmp; icmp46_echo_request_t icmp_echo;
+		     }) icmp4_echo_request_header_t;
+
+
+typedef struct
+{
+  u16 id;
+  u16 seq;
+  u8 bound;
+} icmp_echo_trace_t;
+
+
+
+
+typedef enum
+{
+  ICMP6_ECHO_REPLY_NEXT_DROP,
+  ICMP6_ECHO_REPLY_NEXT_PUNT,
+  ICMP6_ECHO_REPLY_N_NEXT,
+} icmp6_echo_reply_next_t;
+
+typedef enum
+{
+  ICMP4_ECHO_REPLY_NEXT_DROP,
+  ICMP4_ECHO_REPLY_NEXT_PUNT,
+  ICMP4_ECHO_REPLY_N_NEXT,
+} icmp4_echo_reply_next_t;
+
+#endif /* included_vnet_ping_h */
diff --git a/src/vnet/ip/ports.def b/src/vnet/ip/ports.def
new file mode 100644
index 00000000..cdb754f5
--- /dev/null
+++ b/src/vnet/ip/ports.def
@@ -0,0 +1,757 @@
+/*
+ * ip/ports.def: tcp/udp port definitions
+ *
+ * Eliot Dresselhaus
+ * August, 2005
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+PORT NUMBERS
+
+(last updated 18 October 2005) 
+
+The port numbers are divided into three ranges: the Well Known Ports,
+the Registered Ports, and the Dynamic and/or Private Ports.
+
+The Well Known Ports are those from 0 through 1023.
+
+The Registered Ports are those from 1024 through 49151
+
+The Dynamic and/or Private Ports are those from 49152 through 65535
+
+
+************************************************************************
+* PLEASE NOTE THE FOLLOWING:                                           *
+*                                                                      *
+* 1. UNASSIGNED PORT NUMBERS SHOULD NOT BE USED.  THE IANA WILL ASSIGN *
+* THE NUMBER FOR THE PORT AFTER YOUR APPLICATION HAS BEEN APPROVED.    *
+*                                                                      *
+* 2. ASSIGNMENT OF A PORT NUMBER DOES NOT IN ANY WAY IMPLY AN          *
+* ENDORSEMENT OF AN APPLICATION OR PRODUCT, AND THE FACT THAT NETWORK  *
+* TRAFFIC IS FLOWING TO OR FROM A REGISTERED PORT DOES NOT MEAN THAT   *
+* IT IS "GOOD" TRAFFIC. FIREWALL AND SYSTEM ADMINISTRATORS SHOULD      *
+* CHOOSE HOW TO CONFIGURE THEIR SYSTEMS BASED ON THEIR KNOWLEDGE OF    *
+* THE TRAFFIC IN QUESTION, NOT WHETHER THERE IS A PORT NUMBER          *
+* REGISTERED OR NOT.                                                   *
+************************************************************************
+
+
+WELL KNOWN PORT NUMBERS
+
+The Well Known Ports are assigned by the IANA and on most systems can
+only be used by system (or root) processes or by programs executed by
+privileged users.
+
+Ports are used in the TCP [RFC793] to name the ends of logical
+connections which carry long term conversations.  For the purpose of
+providing services to unknown callers, a service contact port is
+defined.  This list specifies the port used by the server process as
+its contact port.  The contact port is sometimes called the
+"well-known port".
+
+To the extent possible, these same port assignments are used with the
+UDP [RFC768].
+
+The range for assigned ports managed by the IANA is 0-1023.
+*/
+ip_port (TCPMUX, 1)
+ip_port (COMPRESS_NET_MANAGEMENT, 2)
+ip_port (COMPRESS_NET, 3)
+ip_port (RJE, 5)
+ip_port (ECHO, 7)
+ip_port (DISCARD, 9)
+ip_port (SYSTAT, 11)
+ip_port (DAYTIME, 13)
+ip_port (QOTD, 17)
+ip_port (MSP, 18)
+ip_port (CHARGEN, 19)
+ip_port (FTP_DATA, 20)
+ip_port (FTP, 21)
+ip_port (SSH, 22)
+ip_port (TELNET, 23)
+ip_port (SMTP, 25)
+ip_port (NSW_FE, 27)
+ip_port (MSG_ICP, 29)
+ip_port (MSG_AUTH, 31)
+ip_port (DSP, 33)
+ip_port (TIME, 37)
+ip_port (RAP, 38)
+ip_port (RLP, 39)
+ip_port (GRAPHICS, 41)
+ip_port (NAME, 42)
+ip_port (NAMESERVER, 42)
+ip_port (NICNAME, 43)
+ip_port (MPM_FLAGS, 44)
+ip_port (MPM, 45)
+ip_port (MPM_SND, 46)
+ip_port (NI_FTP, 47)
+ip_port (AUDITD, 48)
+ip_port (TACACS, 49)
+ip_port (RE_MAIL_CK, 50)
+ip_port (LA_MAINT, 51)
+ip_port (XNS_TIME, 52)
+ip_port (DNS, 53)
+ip_port (XNS_CH, 54)
+ip_port (ISI_GL, 55)
+ip_port (XNS_AUTH, 56)
+ip_port (XNS_MAIL, 58)
+ip_port (NI_MAIL, 61)
+ip_port (ACAS, 62)
+ip_port (WHOIS_PLUS_PLUS, 63)
+ip_port (COVIA, 64)
+ip_port (TACACS_DS, 65)
+ip_port (ORACLE_SQL_NET, 66)
+ip_port (BOOTPS, 67)
+ip_port (BOOTPC, 68)
+ip_port (TFTP, 69)
+ip_port (GOPHER, 70)
+ip_port (NETRJS_1, 71)
+ip_port (NETRJS_2, 72)
+ip_port (NETRJS_3, 73)
+ip_port (NETRJS_4, 74)
+ip_port (DEOS, 76)
+ip_port (VETTCP, 78)
+ip_port (FINGER, 79)
+ip_port (WWW, 80)
+ip_port (HOSTS2_NS, 81)
+ip_port (XFER, 82)
+ip_port (MIT_ML_DEV, 83)
+ip_port (CTF, 84)
+ip_port (MIT_ML_DEV1, 85)
+ip_port (MFCOBOL, 86)
+ip_port (KERBEROS, 88)
+ip_port (SU_MIT_TG, 89)
+ip_port (DNSIX, 90)
+ip_port (MIT_DOV, 91)
+ip_port (NPP, 92)
+ip_port (DCP, 93)
+ip_port (OBJCALL, 94)
+ip_port (SUPDUP, 95)
+ip_port (DIXIE, 96)
+ip_port (SWIFT_RVF, 97)
+ip_port (TACNEWS, 98)
+ip_port (METAGRAM, 99)
+ip_port (NEWACCT, 100)
+ip_port (HOSTNAME, 101)
+ip_port (ISO_TSAP, 102)
+ip_port (GPPITNP, 103)
+ip_port (ACR_NEMA, 104)
+ip_port (CSO, 105)
+ip_port (CSNET_NS, 105)
+ip_port (3COM_TSMUX, 106)
+ip_port (RTELNET, 107)
+ip_port (SNAGAS, 108)
+ip_port (POP2, 109)
+ip_port (POP3, 110)
+ip_port (SUNRPC, 111)
+ip_port (MCIDAS, 112)
+ip_port (IDENT, 113)
+ip_port (SFTP, 115)
+ip_port (ANSANOTIFY, 116)
+ip_port (UUCP_PATH, 117)
+ip_port (SQLSERV, 118)
+ip_port (NNTP, 119)
+ip_port (CFDPTKT, 120)
+ip_port (ERPC, 121)
+ip_port (SMAKYNET, 122)
+ip_port (NTP, 123)
+ip_port (ANSATRADER, 124)
+ip_port (LOCUS_MAP, 125)
+ip_port (NXEDIT, 126)
+ip_port (LOCUS_CON, 127)
+ip_port (GSS_XLICEN, 128)
+ip_port (PWDGEN, 129)
+ip_port (CISCO_FNA, 130)
+ip_port (CISCO_TNA, 131)
+ip_port (CISCO_SYS, 132)
+ip_port (STATSRV, 133)
+ip_port (INGRES_NET, 134)
+ip_port (EPMAP, 135)
+ip_port (PROFILE, 136)
+ip_port (NETBIOS_NS, 137)
+ip_port (NETBIOS_DGM, 138)
+ip_port (NETBIOS_SSN, 139)
+ip_port (EMFIS_DATA, 140)
+ip_port (EMFIS_CNTL, 141)
+ip_port (BL_IDM, 142)
+ip_port (IMAP, 143)
+ip_port (UMA, 144)
+ip_port (UAAC, 145)
+ip_port (ISO_TP0, 146)
+ip_port (ISO_IP, 147)
+ip_port (JARGON, 148)
+ip_port (AED_512, 149)
+ip_port (SQL_NET, 150)
+ip_port (HEMS, 151)
+ip_port (BFTP, 152)
+ip_port (SGMP, 153)
+ip_port (NETSC_PROD, 154)
+ip_port (NETSC_DEV, 155)
+ip_port (SQLSRV, 156)
+ip_port (KNET_CMP, 157)
+ip_port (PCMAIL_SRV, 158)
+ip_port (NSS_ROUTING, 159)
+ip_port (SGMP_TRAPS, 160)
+ip_port (SNMP, 161)
+ip_port (SNMPTRAP, 162)
+ip_port (CMIP_MAN, 163)
+ip_port (CMIP_AGENT, 164)
+ip_port (XNS_COURIER, 165)
+ip_port (S_NET, 166)
+ip_port (NAMP, 167)
+ip_port (RSVD, 168)
+ip_port (SEND, 169)
+ip_port (PRINT_SRV, 170)
+ip_port (MULTIPLEX, 171)
+ip_port (CL1, 172)
+ip_port (XYPLEX_MUX, 173)
+ip_port (MAILQ, 174)
+ip_port (VMNET, 175)
+ip_port (GENRAD_MUX, 176)
+ip_port (XDMCP, 177)
+ip_port (NEXTSTEP, 178)
+ip_port (BGP, 179)
+ip_port (RIS, 180)
+ip_port (UNIFY, 181)
+ip_port (AUDIT, 182)
+ip_port (OCBINDER, 183)
+ip_port (OCSERVER, 184)
+ip_port (REMOTE_KIS, 185)
+ip_port (KIS, 186)
+ip_port (ACI, 187)
+ip_port (MUMPS, 188)
+ip_port (QFT, 189)
+ip_port (GACP, 190)
+ip_port (PROSPERO, 191)
+ip_port (OSU_NMS, 192)
+ip_port (SRMP, 193)
+ip_port (IRC, 194)
+ip_port (DN6_NLM_AUD, 195)
+ip_port (DN6_SMM_RED, 196)
+ip_port (DLS, 197)
+ip_port (DLS_MON, 198)
+ip_port (SMUX, 199)
+ip_port (SRC, 200)
+ip_port (AT_RTMP, 201)
+ip_port (AT_NBP, 202)
+ip_port (AT_3, 203)
+ip_port (AT_ECHO, 204)
+ip_port (AT_5, 205)
+ip_port (AT_ZIS, 206)
+ip_port (AT_7, 207)
+ip_port (AT_8, 208)
+ip_port (QMTP, 209)
+ip_port (Z39_50, 210)
+ip_port (TI914CG, 211)
+ip_port (ANET, 212)
+ip_port (IPX, 213)
+ip_port (VMPWSCS, 214)
+ip_port (SOFTPC, 215)
+ip_port (CAILIC, 216)
+ip_port (DBASE, 217)
+ip_port (MPP, 218)
+ip_port (UARPS, 219)
+ip_port (IMAP3, 220)
+ip_port (FLN_SPX, 221)
+ip_port (RSH_SPX, 222)
+ip_port (CDC, 223)
+ip_port (MASQDIALER, 224)
+ip_port (DIRECT, 242)
+ip_port (SUR_MEAS, 243)
+ip_port (INBUSINESS, 244)
+ip_port (LINK, 245)
+ip_port (DSP3270, 246)
+ip_port (SUBNTBCST_TFTP, 247)
+ip_port (BHFHS, 248)
+ip_port (RAP1, 256)
+ip_port (SET, 257)
+ip_port (YAK_CHAT, 258)
+ip_port (ESRO_GEN, 259)
+ip_port (OPENPORT, 260)
+ip_port (NSIIOPS, 261)
+ip_port (ARCISDMS, 262)
+ip_port (HDAP, 263)
+ip_port (BGMP, 264)
+ip_port (X_BONE_CTL, 265)
+ip_port (SST, 266)
+ip_port (TD_SERVICE, 267)
+ip_port (TD_REPLICA, 268)
+ip_port (HTTP_MGMT, 280)
+ip_port (PERSONAL_LINK, 281)
+ip_port (CABLEPORT_AX, 282)
+ip_port (RESCAP, 283)
+ip_port (CORERJD, 284)
+ip_port (FXP, 286)
+ip_port (K_BLOCK, 287)
+ip_port (NOVASTORBAKCUP, 308)
+ip_port (ENTRUSTTIME, 309)
+ip_port (BHMDS, 310)
+ip_port (ASIP_WEBADMIN, 311)
+ip_port (VSLMP, 312)
+ip_port (MAGENTA_LOGIC, 313)
+ip_port (OPALIS_ROBOT, 314)
+ip_port (DPSI, 315)
+ip_port (DECAUTH, 316)
+ip_port (ZANNET, 317)
+ip_port (PKIX_TIMESTAMP, 318)
+ip_port (PTP_EVENT, 319)
+ip_port (PTP_GENERAL, 320)
+ip_port (PIP, 321)
+ip_port (RTSPS, 322)
+ip_port (TEXAR, 333)
+ip_port (PDAP, 344)
+ip_port (PAWSERV, 345)
+ip_port (ZSERV, 346)
+ip_port (FATSERV, 347)
+ip_port (CSI_SGWP, 348)
+ip_port (MFTP, 349)
+ip_port (MATIP_TYPE_A, 350)
+ip_port (MATIP_TYPE_B, 351)
+ip_port (BHOETTY, 351)
+ip_port (DTAG_STE_SB, 352)
+ip_port (BHOEDAP4, 352)
+ip_port (NDSAUTH, 353)
+ip_port (BH611, 354)
+ip_port (DATEX_ASN, 355)
+ip_port (CLOANTO_NET_1, 356)
+ip_port (BHEVENT, 357)
+ip_port (SHRINKWRAP, 358)
+ip_port (NSRMP, 359)
+ip_port (SCOI2ODIALOG, 360)
+ip_port (SEMANTIX, 361)
+ip_port (SRSSEND, 362)
+ip_port (RSVP_TUNNEL, 363)
+ip_port (AURORA_CMGR, 364)
+ip_port (DTK, 365)
+ip_port (ODMR, 366)
+ip_port (MORTGAGEWARE, 367)
+ip_port (QBIKGDP, 368)
+ip_port (RPC2PORTMAP, 369)
+ip_port (CODAAUTH2, 370)
+ip_port (CLEARCASE, 371)
+ip_port (ULISTPROC, 372)
+ip_port (LEGENT_1, 373)
+ip_port (LEGENT_2, 374)
+ip_port (HASSLE, 375)
+ip_port (NIP, 376)
+ip_port (TNETOS, 377)
+ip_port (DSETOS, 378)
+ip_port (IS99C, 379)
+ip_port (IS99S, 380)
+ip_port (HP_COLLECTOR, 381)
+ip_port (HP_MANAGED_NODE, 382)
+ip_port (HP_ALARM_MGR, 383)
+ip_port (ARNS, 384)
+ip_port (IBM_APP, 385)
+ip_port (ASA, 386)
+ip_port (AURP, 387)
+ip_port (UNIDATA_LDM, 388)
+ip_port (LDAP, 389)
+ip_port (UIS, 390)
+ip_port (SYNOTICS_RELAY, 391)
+ip_port (SYNOTICS_BROKER, 392)
+ip_port (META5, 393)
+ip_port (EMBL_NDT, 394)
+ip_port (NETCP, 395)
+ip_port (NETWARE_IP, 396)
+ip_port (MPTN, 397)
+ip_port (KRYPTOLAN, 398)
+ip_port (ISO_TSAP_C2, 399)
+ip_port (WORK_SOL, 400)
+ip_port (UPS, 401)
+ip_port (GENIE, 402)
+ip_port (DECAP, 403)
+ip_port (NCED, 404)
+ip_port (NCLD, 405)
+ip_port (IMSP, 406)
+ip_port (TIMBUKTU, 407)
+ip_port (PRM_SM, 408)
+ip_port (PRM_NM, 409)
+ip_port (DECLADEBUG, 410)
+ip_port (RMT, 411)
+ip_port (SYNOPTICS_TRAP, 412)
+ip_port (SMSP, 413)
+ip_port (INFOSEEK, 414)
+ip_port (BNET, 415)
+ip_port (SILVERPLATTER, 416)
+ip_port (ONMUX, 417)
+ip_port (HYPER_G, 418)
+ip_port (ARIEL1, 419)
+ip_port (SMPTE, 420)
+ip_port (ARIEL2, 421)
+ip_port (ARIEL3, 422)
+ip_port (OPC_JOB_START, 423)
+ip_port (OPC_JOB_TRACK, 424)
+ip_port (ICAD_EL, 425)
+ip_port (SMARTSDP, 426)
+ip_port (SVRLOC, 427)
+ip_port (OCS_CMU, 428)
+ip_port (OCS_AMU, 429)
+ip_port (UTMPSD, 430)
+ip_port (UTMPCD, 431)
+ip_port (IASD, 432)
+ip_port (NNSP, 433)
+ip_port (MOBILEIP_AGENT, 434)
+ip_port (MOBILIP_MN, 435)
+ip_port (DNA_CML, 436)
+ip_port (COMSCM, 437)
+ip_port (DSFGW, 438)
+ip_port (DASP, 439)
+ip_port (SGCP, 440)
+ip_port (DECVMS_SYSMGT, 441)
+ip_port (CVC_HOSTD, 442)
+ip_port (HTTPS, 443)
+ip_port (SNPP, 444)
+ip_port (MICROSOFT_DS, 445)
+ip_port (DDM_RDB, 446)
+ip_port (DDM_DFM, 447)
+ip_port (DDM_SSL, 448)
+ip_port (AS_SERVERMAP, 449)
+ip_port (TSERVER, 450)
+ip_port (SFS_SMP_NET, 451)
+ip_port (SFS_CONFIG, 452)
+ip_port (CREATIVESERVER, 453)
+ip_port (CONTENTSERVER, 454)
+ip_port (CREATIVEPARTNR, 455)
+ip_port (MACON_TCP, 456)
+ip_port (SCOHELP, 457)
+ip_port (APPLEQTC, 458)
+ip_port (AMPR_RCMD, 459)
+ip_port (SKRONK, 460)
+ip_port (DATASURFSRV, 461)
+ip_port (DATASURFSRVSEC, 462)
+ip_port (ALPES, 463)
+ip_port (KPASSWD, 464)
+ip_port (URD, 465)
+ip_port (DIGITAL_VRC, 466)
+ip_port (MYLEX_MAPD, 467)
+ip_port (PHOTURIS, 468)
+ip_port (RCP, 469)
+ip_port (SCX_PROXY, 470)
+ip_port (MONDEX, 471)
+ip_port (LJK_LOGIN, 472)
+ip_port (HYBRID_POP, 473)
+ip_port (TN_TL_W1, 474)
+ip_port (TCPNETHASPSRV, 475)
+ip_port (TN_TL_FD1, 476)
+ip_port (SS7NS, 477)
+ip_port (SPSC, 478)
+ip_port (IAFSERVER, 479)
+ip_port (IAFDBASE, 480)
+ip_port (PH, 481)
+ip_port (BGS_NSI, 482)
+ip_port (ULPNET, 483)
+ip_port (INTEGRA_SME, 484)
+ip_port (POWERBURST, 485)
+ip_port (AVIAN, 486)
+ip_port (SAFT, 487)
+ip_port (GSS_HTTP, 488)
+ip_port (NEST_PROTOCOL, 489)
+ip_port (MICOM_PFS, 490)
+ip_port (GO_LOGIN, 491)
+ip_port (TICF_1, 492)
+ip_port (TICF_2, 493)
+ip_port (POV_RAY, 494)
+ip_port (INTECOURIER, 495)
+ip_port (PIM_RP_DISC, 496)
+ip_port (DANTZ, 497)
+ip_port (SIAM, 498)
+ip_port (ISO_ILL, 499)
+ip_port (ISAKMP, 500)
+ip_port (STMF, 501)
+ip_port (ASA_APPL_PROTO, 502)
+ip_port (INTRINSA, 503)
+ip_port (CITADEL, 504)
+ip_port (MAILBOX_LM, 505)
+ip_port (OHIMSRV, 506)
+ip_port (CRS, 507)
+ip_port (XVTTP, 508)
+ip_port (SNARE, 509)
+ip_port (FCP, 510)
+ip_port (PASSGO, 511)
+ip_port (EXEC, 512)
+ip_port (LOGIN, 513)
+ip_port (SHELL, 514)
+ip_port (PRINTER, 515)
+ip_port (VIDEOTEX, 516)
+ip_port (TALK, 517)
+ip_port (NTALK, 518)
+ip_port (UTIME, 519)
+ip_port (EFS, 520)
+ip_port (RIPNG, 521)
+ip_port (ULP, 522)
+ip_port (IBM_DB2, 523)
+ip_port (NCP, 524)
+ip_port (TIMED, 525)
+ip_port (TEMPO, 526)
+ip_port (STX, 527)
+ip_port (CUSTIX, 528)
+ip_port (IRC_SERV, 529)
+ip_port (COURIER, 530)
+ip_port (CONFERENCE, 531)
+ip_port (NETNEWS, 532)
+ip_port (NETWALL, 533)
+ip_port (MM_ADMIN, 534)
+ip_port (IIOP, 535)
+ip_port (OPALIS_RDV, 536)
+ip_port (NMSP, 537)
+ip_port (GDOMAP, 538)
+ip_port (APERTUS_LDP, 539)
+ip_port (UUCP, 540)
+ip_port (UUCP_RLOGIN, 541)
+ip_port (COMMERCE, 542)
+ip_port (KLOGIN, 543)
+ip_port (KSHELL, 544)
+ip_port (APPLEQTCSRVR, 545)
+ip_port (DHCPV6_CLIENT, 546)
+ip_port (DHCPV6_SERVER, 547)
+ip_port (AFPOVERTCP, 548)
+ip_port (IDFP, 549)
+ip_port (NEW_RWHO, 550)
+ip_port (CYBERCASH, 551)
+ip_port (DEVSHR_NTS, 552)
+ip_port (PIRP, 553)
+ip_port (RTSP, 554)
+ip_port (DSF, 555)
+ip_port (REMOTEFS, 556)
+ip_port (OPENVMS_SYSIPC, 557)
+ip_port (SDNSKMP, 558)
+ip_port (TEEDTAP, 559)
+ip_port (RMONITOR, 560)
+ip_port (MONITOR, 561)
+ip_port (CHSHELL, 562)
+ip_port (NNTPS, 563)
+ip_port (9PFS, 564)
+ip_port (WHOAMI, 565)
+ip_port (STREETTALK, 566)
+ip_port (BANYAN_RPC, 567)
+ip_port (MS_SHUTTLE, 568)
+ip_port (MS_ROME, 569)
+ip_port (METER, 570)
+ip_port (METER1, 571)
+ip_port (SONAR, 572)
+ip_port (BANYAN_VIP, 573)
+ip_port (FTP_AGENT, 574)
+ip_port (VEMMI, 575)
+ip_port (IPCD, 576)
+ip_port (VNAS, 577)
+ip_port (IPDD, 578)
+ip_port (DECBSRV, 579)
+ip_port (SNTP_HEARTBEAT, 580)
+ip_port (BDP, 581)
+ip_port (SCC_SECURITY, 582)
+ip_port (PHILIPS_VC, 583)
+ip_port (KEYSERVER, 584)
+ip_port (IMAP4_SSL, 585)
+ip_port (PASSWORD_CHG, 586)
+ip_port (SUBMISSION, 587)
+ip_port (CAL, 588)
+ip_port (EYELINK, 589)
+ip_port (TNS_CML, 590)
+ip_port (HTTP_ALT, 591)
+ip_port (EUDORA_SET, 592)
+ip_port (HTTP_RPC_EPMAP, 593)
+ip_port (TPIP, 594)
+ip_port (CAB_PROTOCOL, 595)
+ip_port (SMSD, 596)
+ip_port (PTCNAMESERVICE, 597)
+ip_port (SCO_WEBSRVRMG3, 598)
+ip_port (ACP, 599)
+ip_port (IPCSERVER, 600)
+ip_port (SYSLOG_CONN, 601)
+ip_port (XMLRPC_BEEP, 602)
+ip_port (IDXP, 603)
+ip_port (TUNNEL, 604)
+ip_port (SOAP_BEEP, 605)
+ip_port (URM, 606)
+ip_port (NQS, 607)
+ip_port (SIFT_UFT, 608)
+ip_port (NPMP_TRAP, 609)
+ip_port (NPMP_LOCAL, 610)
+ip_port (NPMP_GUI, 611)
+ip_port (HMMP_IND, 612)
+ip_port (HMMP_OP, 613)
+ip_port (SSHELL, 614)
+ip_port (SCO_INETMGR, 615)
+ip_port (SCO_SYSMGR, 616)
+ip_port (SCO_DTMGR, 617)
+ip_port (DEI_ICDA, 618)
+ip_port (COMPAQ_EVM, 619)
+ip_port (SCO_WEBSRVRMGR, 620)
+ip_port (ESCP_IP, 621)
+ip_port (COLLABORATOR, 622)
+ip_port (ASF_RMCP, 623)
+ip_port (CRYPTOADMIN, 624)
+ip_port (DEC_DLM, 625)
+ip_port (ASIA, 626)
+ip_port (PASSGO_TIVOLI, 627)
+ip_port (QMQP, 628)
+ip_port (3COM_AMP3, 629)
+ip_port (RDA, 630)
+ip_port (IPP, 631)
+ip_port (BMPP, 632)
+ip_port (SERVSTAT, 633)
+ip_port (GINAD, 634)
+ip_port (RLZDBASE, 635)
+ip_port (LDAPS, 636)
+ip_port (LANSERVER, 637)
+ip_port (MCNS_SEC, 638)
+ip_port (MSDP, 639)
+ip_port (ENTRUST_SPS, 640)
+ip_port (REPCMD, 641)
+ip_port (ESRO_EMSDP, 642)
+ip_port (SANITY, 643)
+ip_port (DWR, 644)
+ip_port (PSSC, 645)
+ip_port (LDP, 646)
+ip_port (DHCP_FAILOVER, 647)
+ip_port (RRP, 648)
+ip_port (CADVIEW_3D, 649)
+ip_port (OBEX, 650)
+ip_port (IEEE_MMS, 651)
+ip_port (HELLO_PORT, 652)
+ip_port (REPSCMD, 653)
+ip_port (AODV, 654)
+ip_port (TINC, 655)
+ip_port (SPMP, 656)
+ip_port (RMC, 657)
+ip_port (TENFOLD, 658)
+ip_port (MAC_SRVR_ADMIN, 660)
+ip_port (HAP, 661)
+ip_port (PFTP, 662)
+ip_port (PURENOISE, 663)
+ip_port (ASF_SECURE_RMCP, 664)
+ip_port (SUN_DR, 665)
+ip_port (MDQS, 666)
+ip_port (DOOM, 666)
+ip_port (DISCLOSE, 667)
+ip_port (MECOMM, 668)
+ip_port (MEREGISTER, 669)
+ip_port (VACDSM_SWS, 670)
+ip_port (VACDSM_APP, 671)
+ip_port (VPPS_QUA, 672)
+ip_port (CIMPLEX, 673)
+ip_port (ACAP, 674)
+ip_port (DCTP, 675)
+ip_port (VPPS_VIA, 676)
+ip_port (VPP, 677)
+ip_port (GGF_NCP, 678)
+ip_port (MRM, 679)
+ip_port (ENTRUST_AAAS, 680)
+ip_port (ENTRUST_AAMS, 681)
+ip_port (XFR, 682)
+ip_port (CORBA_IIOP, 683)
+ip_port (CORBA_IIOP_SSL, 684)
+ip_port (MDC_PORTMAPPER, 685)
+ip_port (HCP_WISMAR, 686)
+ip_port (ASIPREGISTRY, 687)
+ip_port (REALM_RUSD, 688)
+ip_port (NMAP, 689)
+ip_port (VATP, 690)
+ip_port (MSEXCH_ROUTING, 691)
+ip_port (HYPERWAVE_ISP, 692)
+ip_port (CONNENDP, 693)
+ip_port (HA_CLUSTER, 694)
+ip_port (IEEE_MMS_SSL, 695)
+ip_port (RUSHD, 696)
+ip_port (UUIDGEN, 697)
+ip_port (OLSR, 698)
+ip_port (ACCESSNETWORK, 699)
+ip_port (EPP, 700)
+ip_port (LMP, 701)
+ip_port (IRIS_BEEP, 702)
+ip_port (ELCSD, 704)
+ip_port (AGENTX, 705)
+ip_port (SILC, 706)
+ip_port (BORLAND_DSJ, 707)
+ip_port (ENTRUST_KMSH, 709)
+ip_port (ENTRUST_ASH, 710)
+ip_port (CISCO_TDP, 711)
+ip_port (TBRPF, 712)
+ip_port (NETVIEWDM1, 729)
+ip_port (NETVIEWDM2, 730)
+ip_port (NETVIEWDM3, 731)
+ip_port (NETGW, 741)
+ip_port (NETRCS, 742)
+ip_port (FLEXLM, 744)
+ip_port (FUJITSU_DEV, 747)
+ip_port (RIS_CM, 748)
+ip_port (KERBEROS_ADM, 749)
+ip_port (RFILE, 750)
+ip_port (PUMP, 751)
+ip_port (QRH, 752)
+ip_port (RRH, 753)
+ip_port (TELL, 754)
+ip_port (NLOGIN, 758)
+ip_port (CON, 759)
+ip_port (NS, 760)
+ip_port (RXE, 761)
+ip_port (QUOTAD, 762)
+ip_port (CYCLESERV, 763)
+ip_port (OMSERV, 764)
+ip_port (WEBSTER, 765)
+ip_port (PHONEBOOK, 767)
+ip_port (VID, 769)
+ip_port (CADLOCK, 770)
+ip_port (RTIP, 771)
+ip_port (CYCLESERV2, 772)
+ip_port (SUBMIT, 773)
+ip_port (RPASSWD, 774)
+ip_port (ENTOMB, 775)
+ip_port (WPAGES, 776)
+ip_port (MULTILING_HTTP, 777)
+ip_port (WPGS, 780)
+ip_port (MDBS_DAEMON, 800)
+ip_port (DEVICE, 801)
+ip_port (FCP_UDP, 810)
+ip_port (ITM_MCELL_S, 828)
+ip_port (PKIX_3_CA_RA, 829)
+ip_port (DHCP_FAILOVER2, 847)
+ip_port (GDOI, 848)
+ip_port (ISCSI, 860)
+ip_port (RSYNC, 873)
+ip_port (ICLCNET_LOCATE, 886)
+ip_port (ICLCNET_SVINFO, 887)
+ip_port (ACCESSBUILDER, 888)
+ip_port (CDDBP, 888)
+ip_port (OMGINITIALREFS, 900)
+ip_port (SMPNAMERES, 901)
+ip_port (IDEAFARM_CHAT, 902)
+ip_port (IDEAFARM_CATCH, 903)
+ip_port (XACT_BACKUP, 911)
+ip_port (APEX_MESH, 912)
+ip_port (APEX_EDGE, 913)
+ip_port (FTPS_DATA, 989)
+ip_port (FTPS, 990)
+ip_port (NAS, 991)
+ip_port (TELNETS, 992)
+ip_port (IMAPS, 993)
+ip_port (IRCS, 994)
+ip_port (POP3S, 995)
+ip_port (VSINET, 996)
+ip_port (MAITRD, 997)
+ip_port (BUSBOY, 998)
+ip_port (GARCON, 999)
+ip_port (PUPROUTER, 999)
+ip_port (CADLOCK2, 1000)
+ip_port (SURF, 1010)
+
diff --git a/src/vnet/ip/protocols.def b/src/vnet/ip/protocols.def
new file mode 100644
index 00000000..77fab31d
--- /dev/null
+++ b/src/vnet/ip/protocols.def
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Emacs editing mode -*-C-*-
+
+From http://www.iana.org/assignments/protocol-numbers
+
+PROTOCOL NUMBERS
+
+(last updated 18 October 2004)
+
+In the Internet Protocol version 4 (IPv4) [RFC791] there is a field,
+called "Protocol", to identify the next level protocol.  This is an 8
+bit field.  In Internet Protocol version 6 (IPv6) [RFC1883] this field
+is called the "Next Header" field.
+*/
+ip_protocol (0, IP6_HOP_BY_HOP_OPTIONS)
+ip_protocol (1, ICMP)
+ip_protocol (2, IGMP)
+ip_protocol (3, GGP)
+ip_protocol (4, IP_IN_IP)
+ip_protocol (5, ST)
+ip_protocol (6, TCP)
+ip_protocol (7, CBT)
+ip_protocol (8, EGP)
+ip_protocol (9, IGP)
+ip_protocol (10, BBN_RCC_MON)
+ip_protocol (11, NVP_II)
+ip_protocol (12, PUP)
+ip_protocol (13, ARGUS)
+ip_protocol (14, EMCON)
+ip_protocol (15, XNET)
+ip_protocol (16, CHAOS)
+ip_protocol (17, UDP)
+ip_protocol (18, MUX)
+ip_protocol (19, DCN_MEAS)
+ip_protocol (20, HMP)
+ip_protocol (21, PRM)
+ip_protocol (22, XNS_IDP)
+ip_protocol (23, TRUNK_1)
+ip_protocol (24, TRUNK_2)
+ip_protocol (25, LEAF_1)
+ip_protocol (26, LEAF_2)
+ip_protocol (27, RDP)
+ip_protocol (28, IRTP)
+ip_protocol (29, ISO_TP4)
+ip_protocol (30, NETBLT)
+ip_protocol (31, MFE_NSP)
+ip_protocol (32, MERIT_INP)
+ip_protocol (33, SEP)
+ip_protocol (34, 3PC)
+ip_protocol (35, IDPR)
+ip_protocol (36, XTP)
+ip_protocol (37, DDP)
+ip_protocol (38, IDPR_CMTP)
+ip_protocol (39, TP)
+ip_protocol (40, IL)
+ip_protocol (41, IPV6)
+ip_protocol (42, SDRP)
+ip_protocol (43, IPV6_ROUTE)
+ip_protocol (44, IPV6_FRAGMENTATION)
+ip_protocol (45, IDRP)
+ip_protocol (46, RSVP)
+ip_protocol (47, GRE)
+ip_protocol (48, MHRP)
+ip_protocol (49, BNA)
+ip_protocol (50, IPSEC_ESP)
+ip_protocol (51, IPSEC_AH)
+ip_protocol (52, I_NLSP)
+ip_protocol (53, SWIPE)
+ip_protocol (54, NARP)
+ip_protocol (55, MOBILE)
+ip_protocol (56, TLSP)
+ip_protocol (57, SKIP)
+ip_protocol (58, ICMP6)
+ip_protocol (59, IP6_NONXT)
+ip_protocol (60, IP6_DESTINATION_OPTIONS)
+ip_protocol (62, CFTP)
+ip_protocol (64, SAT_EXPAK)
+ip_protocol (65, KRYPTOLAN)
+ip_protocol (66, RVD)
+ip_protocol (67, IPPC)
+ip_protocol (69, SAT_MON)
+ip_protocol (70, VISA)
+ip_protocol (71, IPCV)
+ip_protocol (72, CPNX)
+ip_protocol (73, CPHB)
+ip_protocol (74, WSN)
+ip_protocol (75, PVP)
+ip_protocol (76, BR_SAT_MON)
+ip_protocol (77, SUN_ND)
+ip_protocol (78, WB_MON)
+ip_protocol (79, WB_EXPAK)
+ip_protocol (80, ISO_IP)
+ip_protocol (81, VMTP)
+ip_protocol (82, SECURE_VMTP)
+ip_protocol (83, VINES)
+ip_protocol (84, TTP)
+ip_protocol (85, NSFNET_IGP)
+ip_protocol (86, DGP)
+ip_protocol (87, TCF)
+ip_protocol (88, EIGRP)
+ip_protocol (89, OSPF)
+ip_protocol (90, SPRITE_RPC)
+ip_protocol (91, LARP)
+ip_protocol (92, MTP)
+ip_protocol (93, AX)
+ip_protocol (94, IPIP)
+ip_protocol (95, MICP)
+ip_protocol (96, SCC_SP)
+ip_protocol (97, ETHERIP)
+ip_protocol (98, ENCAP)
+ip_protocol (100, GMTP)
+ip_protocol (101, IFMP)
+ip_protocol (102, PNNI)
+ip_protocol (103, PIM)
+ip_protocol (104, ARIS)
+ip_protocol (105, SCPS)
+ip_protocol (106, QNX)
+ip_protocol (107, A)
+ip_protocol (108, IPCOMP)
+ip_protocol (109, SNP)
+ip_protocol (110, COMPAQ_PEER)
+ip_protocol (111, IPX_IN_IP)
+ip_protocol (112, VRRP)
+ip_protocol (113, PGM)
+ip_protocol (115, L2TP)
+ip_protocol (116, DDX)
+ip_protocol (117, IATP)
+ip_protocol (118, STP)
+ip_protocol (119, SRP)
+ip_protocol (120, UTI)
+ip_protocol (121, SMP)
+ip_protocol (122, SM)
+ip_protocol (123, PTP)
+ip_protocol (124, ISIS)
+ip_protocol (125, FIRE)
+ip_protocol (126, CRTP)
+ip_protocol (127, CRUDP)
+ip_protocol (128, SSCOPMCE)
+ip_protocol (129, IPLT)
+ip_protocol (130, SPS)
+ip_protocol (131, PIPE)
+ip_protocol (132, SCTP)
+ip_protocol (133, FC)
+ip_protocol (134, RSVP_E2E_IGNORE)
+ip_protocol (135, MOBILITY)
+ip_protocol (136, UDP_LITE)
+ip_protocol (137, MPLS_IN_IP)
+ip_protocol (255, RESERVED)
+
diff --git a/src/vnet/ip/punt.c b/src/vnet/ip/punt.c
new file mode 100644
index 00000000..9c735128
--- /dev/null
+++ b/src/vnet/ip/punt.c
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file
+ * @brief Local TCP/IP stack punt infrastructure.
+ *
+ * Provides a set of VPP nodes togather with the relevant APIs and CLI
+ * commands in order to adjust and dispatch packets from the VPP data plane
+ * to the local TCP/IP stack
+ */
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ip/udp.h>
+#include <vnet/ip/punt.h>
+
+#define foreach_punt_next \
+  _ (PUNT, "error-punt")
+
+typedef enum
+{
+#define _(s,n) PUNT_NEXT_##s,
+  foreach_punt_next
+#undef _
+    PUNT_N_NEXT,
+} punt_next_t;
+
+vlib_node_registration_t udp4_punt_node;
+vlib_node_registration_t udp6_punt_node;
+
+/** @brief IPv4/IPv6 UDP punt node main loop.
+
+    This is the main loop inline function for IPv4/IPv6 UDP punt
+    transition node.
+
+    @param vm vlib_main_t corresponding to the current thread
+    @param node vlib_node_runtime_t
+    @param frame vlib_frame_t whose contents should be dispatched
+    @param is_ipv4 indicates if called for IPv4 or IPv6 node
+*/
+always_inline uword
+udp46_punt_inline (vlib_main_t * vm,
+		   vlib_node_runtime_t * node,
+		   vlib_frame_t * from_frame, int is_ip4)
+{
+  u32 n_left_from, *from, *to_next;
+  word advance;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  /* udp[46]_lookup hands us the data payload, not the IP header */
+  if (is_ip4)
+    advance = -(sizeof (ip4_header_t) + sizeof (udp_header_t));
+  else
+    advance = -(sizeof (ip6_header_t) + sizeof (udp_header_t));
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, PUNT_NEXT_PUNT, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  vlib_buffer_advance (b0, advance);
+	  b0->error = node->errors[PUNT_ERROR_UDP_PORT];
+	}
+
+      vlib_put_next_frame (vm, node, PUNT_NEXT_PUNT, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+static char *punt_error_strings[] = {
+#define punt_error(n,s) s,
+#include "punt_error.def"
+#undef punt_error
+};
+
+/** @brief IPv4 UDP punt node.
+    @node ip4-udp-punt
+
+    This is the IPv4 UDP punt transition node. It is registered as a next
+    node for the "ip4-udp-lookup" handling UDP port(s) requested for punt.
+    The buffer's current data pointer is adjusted to the original packet
+    IPv4 header. All buffers are dispatched to "error-punt".
+
+    @param vm vlib_main_t corresponding to the current thread
+    @param node vlib_node_runtime_t
+    @param frame vlib_frame_t whose contents should be dispatched
+
+    @par Graph mechanics: next index usage
+
+    @em Sets:
+    - <code>vnet_buffer(b)->current_data</code>
+    - <code>vnet_buffer(b)->current_len</code>
+
+    <em>Next Index:</em>
+    - Dispatches the packet to the "error-punt" node
+*/
+static uword
+udp4_punt (vlib_main_t * vm,
+	   vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  return udp46_punt_inline (vm, node, from_frame, 1 /* is_ip4 */ );
+}
+
+/** @brief IPv6 UDP punt node.
+    @node ip6-udp-punt
+
+    This is the IPv6 UDP punt transition node. It is registered as a next
+    node for the "ip6-udp-lookup" handling UDP port(s) requested for punt.
+    The buffer's current data pointer is adjusted to the original packet
+    IPv6 header. All buffers are dispatched to "error-punt".
+
+    @param vm vlib_main_t corresponding to the current thread
+    @param node vlib_node_runtime_t
+    @param frame vlib_frame_t whose contents should be dispatched
+
+    @par Graph mechanics: next index usage
+
+    @em Sets:
+    - <code>vnet_buffer(b)->current_data</code>
+    - <code>vnet_buffer(b)->current_len</code>
+
+    <em>Next Index:</em>
+    - Dispatches the packet to the "error-punt" node
+*/
+static uword
+udp6_punt (vlib_main_t * vm,
+	   vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  return udp46_punt_inline (vm, node, from_frame, 0 /* is_ip4 */ );
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (udp4_punt_node) = {
+  .function = udp4_punt,
+  .name = "ip4-udp-punt",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .n_errors = PUNT_N_ERROR,
+  .error_strings = punt_error_strings,
+
+  .n_next_nodes = PUNT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [PUNT_NEXT_##s] = n,
+     foreach_punt_next
+#undef _
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (udp4_punt_node, udp4_punt);
+
+VLIB_REGISTER_NODE (udp6_punt_node) = {
+  .function = udp6_punt,
+  .name = "ip6-udp-punt",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .n_errors = PUNT_N_ERROR,
+  .error_strings = punt_error_strings,
+
+  .n_next_nodes = PUNT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [PUNT_NEXT_##s] = n,
+     foreach_punt_next
+#undef _
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (udp6_punt_node, udp6_punt);;
+
+/**
+ * @brief Request IP traffic punt to the local TCP/IP stack.
+ *
+ * @em Note
+ * - UDP is the only protocol supported in the current implementation
+ * - When requesting UDP punt port number(s) must be specified
+ * - All TCP traffic is currently punted to the host by default
+ *
+ * @param vm       vlib_main_t corresponding to the current thread
+ * @param ipv      IP protcol version.
+ *                 4 - IPv4, 6 - IPv6, ~0 for both IPv6 and IPv4
+ * @param protocol 8-bits L4 protocol value
+ *                 Only value of 17 (UDP) is currently supported
+ * @param port     16-bits L4 (TCP/IP) port number when applicable
+ *
+ * @returns 0 on success, non-zero value otherwise
+ */
+clib_error_t *
+vnet_punt_add_del (vlib_main_t * vm, u8 ipv, u8 protocol, u16 port,
+		   int is_add)
+{
+  /* For now we only support UDP punt */
+  if (protocol != IP_PROTOCOL_UDP)
+    return clib_error_return (0,
+			      "only UDP protocol (%d) is supported, got %d",
+			      IP_PROTOCOL_UDP, protocol);
+
+  if (ipv != (u8) ~ 0 && ipv != 4 && ipv != 6)
+    return clib_error_return (0, "IP version must be 4 or 6, got %d", ipv);
+
+  if (port == (u16) ~ 0)
+    {
+      if (ipv == 4 || ipv == (u8) ~ 0)
+	udp_punt_unknown (vm, 1, is_add);
+
+      if (ipv == 6 || ipv == (u8) ~ 0)
+	udp_punt_unknown (vm, 0, is_add);
+
+      return 0;
+    }
+
+  else if (is_add)
+    {
+      if (ipv == 4 || ipv == (u8) ~ 0)
+	udp_register_dst_port (vm, port, udp4_punt_node.index, 1);
+
+      if (ipv == 6 || ipv == (u8) ~ 0)
+	udp_register_dst_port (vm, port, udp6_punt_node.index, 0);
+
+      return 0;
+    }
+
+  else
+    return clib_error_return (0, "punt delete is not supported yet");
+}
+
+static clib_error_t *
+udp_punt_cli (vlib_main_t * vm,
+	      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  u32 udp_port;
+  int is_add = 1;
+  clib_error_t *error;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	is_add = 0;
+      if (unformat (input, "all"))
+	{
+	  /* punt both IPv6 and IPv4 when used in CLI */
+	  error = vnet_punt_add_del (vm, ~0, IP_PROTOCOL_UDP, ~0, is_add);
+	  if (error)
+	    clib_error_report (error);
+	}
+      else if (unformat (input, "%d", &udp_port))
+	{
+	  /* punt both IPv6 and IPv4 when used in CLI */
+	  error = vnet_punt_add_del (vm, ~0, IP_PROTOCOL_UDP,
+				     udp_port, is_add);
+	  if (error)
+	    clib_error_report (error);
+	}
+    }
+
+  return 0;
+}
+
+/*?
+ * The set of '<em>set punt</em>' commands allows specific IP traffic to
+ * be punted to the host TCP/IP stack
+ *
+ * @em Note
+ * - UDP is the only protocol supported in the current implementation
+ * - All TCP traffic is currently punted to the host by default
+ *
+ * @cliexpar
+ * @parblock
+ * Example of how to request NTP traffic to be punted
+ * @cliexcmd{set punt udp 125}
+ *
+ * Example of how to request all 'unknown' UDP traffic to be punted
+ * @cliexcmd{set punt udp all}
+ *
+ * Example of how to stop all 'unknown' UDP traffic to be punted
+ * @cliexcmd{set punt udp del all}
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (punt_udp_command, static) = {
+  .path = "set punt udp",
+  .short_help = "set punt udp [del] <all | port-num1 [port-num2 ...]>",
+  .function = udp_punt_cli,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/punt.h b/src/vnet/ip/punt.h
new file mode 100644
index 00000000..09a9d4c5
--- /dev/null
+++ b/src/vnet/ip/punt.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file
+ * @brief Definitions for punt infrastructure.
+ */
+#ifndef included_punt_h
+#define included_punt_h
+
+typedef enum
+{
+#define punt_error(n,s) PUNT_ERROR_##n,
+#include <vnet/ip/punt_error.def>
+#undef punt_error
+  PUNT_N_ERROR,
+} punt_error_t;
+
+
+clib_error_t *vnet_punt_add_del (vlib_main_t * vm, u8 ipv,
+				 u8 protocol, u16 port, int is_add);
+
+#endif /* included_punt_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/punt_error.def b/src/vnet/ip/punt_error.def
new file mode 100644
index 00000000..a76d7e7b
--- /dev/null
+++ b/src/vnet/ip/punt_error.def
@@ -0,0 +1,19 @@
+/*
+ * punt_error.def: punt errors
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+punt_error (NONE, "no error")
+punt_error (UDP_PORT, "udp port punt")
diff --git a/src/vnet/ip/tcp_packet.h b/src/vnet/ip/tcp_packet.h
new file mode 100644
index 00000000..ed402403
--- /dev/null
+++ b/src/vnet/ip/tcp_packet.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip4/tcp_packet.h: TCP packet format (see RFC 793)
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_tcp_packet_h
+#define included_tcp_packet_h
+
+/* TCP flags bit 0 first. */
+#define foreach_tcp_flag			\
+  _ (FIN)					\
+  _ (SYN)					\
+  _ (RST)					\
+  _ (PSH)					\
+  _ (ACK)					\
+  _ (URG)					\
+  _ (ECE)					\
+  _ (CWR)
+
+enum
+{
+#define _(f) TCP_FLAG_BIT_##f,
+  foreach_tcp_flag
+#undef _
+    TCP_N_FLAG_BITS,
+
+#define _(f) TCP_FLAG_##f = 1 << TCP_FLAG_BIT_##f,
+  foreach_tcp_flag
+#undef _
+};
+
+typedef struct
+{
+  /* Source and destination port. */
+  union
+  {
+    union
+    {
+      struct
+      {
+	u16 src, dst;
+      };
+      u32 src_and_dst;
+    } ports;
+    u16 src_port, dst_port;
+  };
+
+  /* Sequence and acknowledgment number. */
+  u32 seq_number, ack_number;
+
+  /* Size of TCP header in 32-bit units plus 4 reserved bits. */
+  u8 tcp_header_u32s_and_reserved;
+
+  /* see foreach_tcp_flag for enumation of tcp flags. */
+  u8 flags;
+
+  /* Current window advertised by sender.
+     This is the number of bytes sender is willing to receive
+     right now. */
+  u16 window;
+
+  /* Checksum of TCP pseudo header and data. */
+  u16 checksum;
+
+  u16 urgent_pointer;
+} tcp_header_t;
+
+always_inline int
+tcp_header_bytes (tcp_header_t * t)
+{
+  return (t->tcp_header_u32s_and_reserved >> 4) * sizeof (u32);
+}
+
+/* TCP options. */
+typedef enum tcp_option_type
+{
+  TCP_OPTION_END = 0,
+  TCP_OPTION_NOP = 1,
+  TCP_OPTION_MSS = 2,
+  TCP_OPTION_WINDOW_SCALE = 3,
+  TCP_OPTION_SACK_PERMITTED = 4,
+  TCP_OPTION_SACK_BLOCK = 5,
+  TCP_OPTION_TIME_STAMP = 8,
+} tcp_option_type_t;
+
+/* All except NOP and END have 1 byte length field. */
+typedef struct
+{
+  tcp_option_type_t type:8;
+
+  /* Length of this option in bytes. */
+  u8 length;
+} tcp_option_with_length_t;
+
+#endif /* included_tcp_packet_h */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/udp.h b/src/vnet/ip/udp.h
new file mode 100644
index 00000000..03c62e0b
--- /dev/null
+++ b/src/vnet/ip/udp.h
@@ -0,0 +1,313 @@
+/*
+ * ip/udp.h: udp protocol
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_udp_h
+#define included_udp_h
+
+#include <vnet/vnet.h>
+#include <vnet/ip/udp_packet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ip/ip4.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ip/format.h>
+
+typedef enum
+{
+#define udp_error(n,s) UDP_ERROR_##n,
+#include <vnet/ip/udp_error.def>
+#undef udp_error
+  UDP_N_ERROR,
+} udp_error_t;
+
+#define foreach_udp4_dst_port			\
+_ (67, dhcp_to_server)                          \
+_ (68, dhcp_to_client)                          \
+_ (500, ikev2)                                  \
+_ (3784, bfd4)                                   \
+_ (4341, lisp_gpe)                              \
+_ (4342, lisp_cp)                          	\
+_ (4739, ipfix)                                 \
+_ (4789, vxlan)					\
+_ (4789, vxlan6)				\
+_ (4790, vxlan_gpe)				\
+_ (6633, vpath_3)
+
+
+#define foreach_udp6_dst_port                   \
+_ (547, dhcpv6_to_server)                       \
+_ (546, dhcpv6_to_client)			\
+_ (3784, bfd6)                                   \
+_ (4341, lisp_gpe6)                             \
+_ (4342, lisp_cp6)                          	\
+_ (4790, vxlan6_gpe)      \
+_ (6633, vpath6_3)
+
+typedef enum
+{
+#define _(n,f) UDP_DST_PORT_##f = n,
+  foreach_udp4_dst_port foreach_udp6_dst_port
+#undef _
+} udp_dst_port_t;
+
+typedef enum
+{
+#define _(n,f) UDP6_DST_PORT_##f = n,
+  foreach_udp6_dst_port
+#undef _
+} udp6_dst_port_t;
+
+typedef struct
+{
+  /* Name (a c string). */
+  char *name;
+
+  /* GRE protocol type in host byte order. */
+  udp_dst_port_t dst_port;
+
+  /* Node which handles this type. */
+  u32 node_index;
+
+  /* Next index for this type. */
+  u32 next_index;
+} udp_dst_port_info_t;
+
+typedef enum
+{
+  UDP_IP6 = 0,
+  UDP_IP4,			/* the code is full of is_ip4... */
+  N_UDP_AF,
+} udp_af_t;
+
+typedef struct
+{
+  udp_dst_port_info_t *dst_port_infos[N_UDP_AF];
+
+  /* Hash tables mapping name/protocol to protocol info index. */
+  uword *dst_port_info_by_name[N_UDP_AF];
+  uword *dst_port_info_by_dst_port[N_UDP_AF];
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+} udp_main_t;
+
+always_inline udp_dst_port_info_t *
+udp_get_dst_port_info (udp_main_t * um, udp_dst_port_t dst_port, u8 is_ip4)
+{
+  uword *p = hash_get (um->dst_port_info_by_dst_port[is_ip4], dst_port);
+  return p ? vec_elt_at_index (um->dst_port_infos[is_ip4], p[0]) : 0;
+}
+
+format_function_t format_udp_header;
+format_function_t format_udp_rx_trace;
+
+unformat_function_t unformat_udp_header;
+
+void udp_register_dst_port (vlib_main_t * vm,
+			    udp_dst_port_t dst_port,
+			    u32 node_index, u8 is_ip4);
+
+void udp_punt_unknown (vlib_main_t * vm, u8 is_ip4, u8 is_add);
+
+always_inline void
+ip_udp_fixup_one (vlib_main_t * vm, vlib_buffer_t * b0, u8 is_ip4)
+{
+  u16 new_l0;
+  udp_header_t *udp0;
+
+  if (is_ip4)
+    {
+      ip4_header_t *ip0;
+      ip_csum_t sum0;
+      u16 old_l0 = 0;
+
+      ip0 = vlib_buffer_get_current (b0);
+
+      /* fix the <bleep>ing outer-IP checksum */
+      sum0 = ip0->checksum;
+      /* old_l0 always 0, see the rewrite setup */
+      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
+
+      sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
+			     length /* changed member */ );
+      ip0->checksum = ip_csum_fold (sum0);
+      ip0->length = new_l0;
+
+      /* Fix UDP length */
+      udp0 = (udp_header_t *) (ip0 + 1);
+      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
+				     - sizeof (*ip0));
+      udp0->length = new_l0;
+    }
+  else
+    {
+      ip6_header_t *ip0;
+      int bogus0;
+
+      ip0 = vlib_buffer_get_current (b0);
+
+      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
+				     - sizeof (*ip0));
+      ip0->payload_length = new_l0;
+
+      /* Fix UDP length */
+      udp0 = (udp_header_t *) (ip0 + 1);
+      udp0->length = new_l0;
+
+      udp0->checksum =
+	ip6_tcp_udp_icmp_compute_checksum (vm, b0, ip0, &bogus0);
+      ASSERT (bogus0 == 0);
+
+      if (udp0->checksum == 0)
+	udp0->checksum = 0xffff;
+    }
+}
+
+always_inline void
+ip_udp_encap_one (vlib_main_t * vm, vlib_buffer_t * b0, u8 * ec0, word ec_len,
+		  u8 is_ip4)
+{
+  vlib_buffer_advance (b0, -ec_len);
+
+  if (is_ip4)
+    {
+      ip4_header_t *ip0;
+
+      ip0 = vlib_buffer_get_current (b0);
+
+      /* Apply the encap string. */
+      clib_memcpy (ip0, ec0, ec_len);
+      ip_udp_fixup_one (vm, b0, 1);
+    }
+  else
+    {
+      ip6_header_t *ip0;
+
+      ip0 = vlib_buffer_get_current (b0);
+
+      /* Apply the encap string. */
+      clib_memcpy (ip0, ec0, ec_len);
+      ip_udp_fixup_one (vm, b0, 0);
+    }
+}
+
+always_inline void
+ip_udp_encap_two (vlib_main_t * vm, vlib_buffer_t * b0, vlib_buffer_t * b1,
+		  u8 * ec0, u8 * ec1, word ec_len, u8 is_v4)
+{
+  u16 new_l0, new_l1;
+  udp_header_t *udp0, *udp1;
+
+  ASSERT (_vec_len (ec0) == _vec_len (ec1));
+
+  vlib_buffer_advance (b0, -ec_len);
+  vlib_buffer_advance (b1, -ec_len);
+
+  if (is_v4)
+    {
+      ip4_header_t *ip0, *ip1;
+      ip_csum_t sum0, sum1;
+      u16 old_l0 = 0, old_l1 = 0;
+
+      ip0 = vlib_buffer_get_current (b0);
+      ip1 = vlib_buffer_get_current (b1);
+
+      /* Apply the encap string */
+      clib_memcpy (ip0, ec0, ec_len);
+      clib_memcpy (ip1, ec1, ec_len);
+
+      /* fix the <bleep>ing outer-IP checksum */
+      sum0 = ip0->checksum;
+      sum1 = ip1->checksum;
+
+      /* old_l0 always 0, see the rewrite setup */
+      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
+      new_l1 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1));
+
+      sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
+			     length /* changed member */ );
+      sum1 = ip_csum_update (sum1, old_l1, new_l1, ip4_header_t,
+			     length /* changed member */ );
+
+      ip0->checksum = ip_csum_fold (sum0);
+      ip1->checksum = ip_csum_fold (sum1);
+
+      ip0->length = new_l0;
+      ip1->length = new_l1;
+
+      /* Fix UDP length */
+      udp0 = (udp_header_t *) (ip0 + 1);
+      udp1 = (udp_header_t *) (ip1 + 1);
+
+      new_l0 =
+	clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0) -
+			      sizeof (*ip0));
+      new_l1 =
+	clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1) -
+			      sizeof (*ip1));
+      udp0->length = new_l0;
+      udp1->length = new_l1;
+    }
+  else
+    {
+      ip6_header_t *ip0, *ip1;
+      int bogus0, bogus1;
+
+      ip0 = vlib_buffer_get_current (b0);
+      ip1 = vlib_buffer_get_current (b1);
+
+      /* Apply the encap string. */
+      clib_memcpy (ip0, ec0, ec_len);
+      clib_memcpy (ip1, ec1, ec_len);
+
+      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
+				     - sizeof (*ip0));
+      new_l1 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1)
+				     - sizeof (*ip1));
+      ip0->payload_length = new_l0;
+      ip1->payload_length = new_l1;
+
+      /* Fix UDP length */
+      udp0 = (udp_header_t *) (ip0 + 1);
+      udp1 = (udp_header_t *) (ip1 + 1);
+
+      udp0->length = new_l0;
+      udp1->length = new_l1;
+
+      udp0->checksum =
+	ip6_tcp_udp_icmp_compute_checksum (vm, b0, ip0, &bogus0);
+      udp1->checksum =
+	ip6_tcp_udp_icmp_compute_checksum (vm, b1, ip1, &bogus1);
+      ASSERT (bogus0 == 0);
+      ASSERT (bogus1 == 0);
+
+      if (udp0->checksum == 0)
+	udp0->checksum = 0xffff;
+      if (udp1->checksum == 0)
+	udp1->checksum = 0xffff;
+    }
+}
+
+#endif /* included_udp_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/udp_error.def b/src/vnet/ip/udp_error.def
new file mode 100644
index 00000000..bfdae0ac
--- /dev/null
+++ b/src/vnet/ip/udp_error.def
@@ -0,0 +1,21 @@
+/*
+ * udp_error.def: udp errors
+ *
+ * Copyright (c) 2013-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+udp_error (NONE, "no error")
+udp_error (NO_LISTENER, "no listener for dst port")
+udp_error (LENGTH_ERROR, "UDP packets with length errors")
+udp_error (PUNT, "no listener punt")
diff --git a/src/vnet/ip/udp_format.c b/src/vnet/ip/udp_format.c
new file mode 100644
index 00000000..abdf561e
--- /dev/null
+++ b/src/vnet/ip/udp_format.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/udp_format.c: udp formatting
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+
+/* Format UDP header. */
+u8 *
+format_udp_header (u8 * s, va_list * args)
+{
+  udp_header_t *udp = va_arg (*args, udp_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+  uword indent;
+  u32 header_bytes = sizeof (udp[0]);
+
+  /* Nothing to do. */
+  if (max_header_bytes < sizeof (udp[0]))
+    return format (s, "UDP header truncated");
+
+  indent = format_get_indent (s);
+  indent += 2;
+
+  s = format (s, "UDP: %d -> %d",
+	      clib_net_to_host_u16 (udp->src_port),
+	      clib_net_to_host_u16 (udp->dst_port));
+
+  s = format (s, "\n%Ulength %d, checksum 0x%04x",
+	      format_white_space, indent,
+	      clib_net_to_host_u16 (udp->length),
+	      clib_net_to_host_u16 (udp->checksum));
+
+  /* Recurse into next protocol layer. */
+  if (max_header_bytes != 0 && header_bytes < max_header_bytes)
+    {
+      ip_main_t *im = &ip_main;
+      tcp_udp_port_info_t *pi;
+
+      pi = ip_get_tcp_udp_port_info (im, udp->dst_port);
+
+      if (pi && pi->format_header)
+	s = format (s, "\n%U%U",
+		    format_white_space, indent - 2, pi->format_header,
+		    /* next protocol header */ (udp + 1),
+		    max_header_bytes - sizeof (udp[0]));
+    }
+
+  return s;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/udp_init.c b/src/vnet/ip/udp_init.c
new file mode 100644
index 00000000..1241ca4a
--- /dev/null
+++ b/src/vnet/ip/udp_init.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/udp_init.c: udp initialization
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/ip/ip.h>
+
+clib_error_t *
+udp_init (vlib_main_t * vm)
+{
+  ip_main_t *im = &ip_main;
+  ip_protocol_info_t *pi;
+  clib_error_t *error;
+
+  error = vlib_call_init_function (vm, ip_main_init);
+
+  if (!error)
+    {
+      pi = ip_get_protocol_info (im, IP_PROTOCOL_UDP);
+      if (pi == 0)
+	return clib_error_return (0, "UDP protocol info AWOL");
+      pi->format_header = format_udp_header;
+      pi->unformat_pg_edit = unformat_pg_udp_header;
+    }
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (udp_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/udp_local.c b/src/vnet/ip/udp_local.c
new file mode 100644
index 00000000..13ab6e4f
--- /dev/null
+++ b/src/vnet/ip/udp_local.c
@@ -0,0 +1,645 @@
+/*
+ * node.c: udp packet processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ip/udp.h>
+#include <vnet/ip/udp_packet.h>
+#include <vppinfra/sparse_vec.h>
+
+udp_main_t udp_main;
+
+#define foreach_udp_input_next                  \
+  _ (PUNT, "error-punt")                        \
+  _ (DROP, "error-drop")                        \
+  _ (ICMP4_ERROR, "ip4-icmp-error")             \
+  _ (ICMP6_ERROR, "ip6-icmp-error")
+
+typedef enum
+{
+#define _(s,n) UDP_INPUT_NEXT_##s,
+  foreach_udp_input_next
+#undef _
+    UDP_INPUT_N_NEXT,
+} udp_input_next_t;
+
+typedef struct
+{
+  u16 src_port;
+  u16 dst_port;
+  u8 bound;
+} udp_rx_trace_t;
+
+u8 *
+format_udp_rx_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  udp_rx_trace_t *t = va_arg (*args, udp_rx_trace_t *);
+
+  s = format (s, "UDP: src-port %d dst-port %d%s",
+	      clib_net_to_host_u16 (t->src_port),
+	      clib_net_to_host_u16 (t->dst_port),
+	      t->bound ? "" : " (no listener)");
+  return s;
+}
+
+typedef struct
+{
+  /* Sparse vector mapping udp dst_port in network byte order
+     to next index. */
+  u16 *next_by_dst_port;
+  u8 punt_unknown;
+} udp_input_runtime_t;
+
+vlib_node_registration_t udp4_input_node;
+vlib_node_registration_t udp6_input_node;
+
+always_inline uword
+udp46_input_inline (vlib_main_t * vm,
+		    vlib_node_runtime_t * node,
+		    vlib_frame_t * from_frame, int is_ip4)
+{
+  udp_input_runtime_t *rt = is_ip4 ?
+    (void *) vlib_node_get_runtime_data (vm, udp4_input_node.index)
+    : (void *) vlib_node_get_runtime_data (vm, udp6_input_node.index);
+  __attribute__ ((unused)) u32 n_left_from, next_index, *from, *to_next;
+  word n_no_listener = 0;
+  u8 punt_unknown = rt->punt_unknown;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  udp_header_t *h0 = 0, *h1 = 0;
+	  u32 i0, i1, dst_port0, dst_port1;
+	  u32 advance0, advance1;
+	  u32 error0, next0, error1, next1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, sizeof (h0[0]), LOAD);
+	    CLIB_PREFETCH (p3->data, sizeof (h1[0]), LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /* ip4/6_local hands us the ip header, not the udp header */
+	  if (is_ip4)
+	    {
+	      advance0 = sizeof (ip4_header_t);
+	      advance1 = sizeof (ip4_header_t);
+	    }
+	  else
+	    {
+	      advance0 = sizeof (ip6_header_t);
+	      advance1 = sizeof (ip6_header_t);
+	    }
+
+	  if (PREDICT_FALSE (b0->current_length < advance0 + sizeof (*h0)))
+	    {
+	      error0 = UDP_ERROR_LENGTH_ERROR;
+	      next0 = UDP_INPUT_NEXT_DROP;
+	    }
+	  else
+	    {
+	      vlib_buffer_advance (b0, advance0);
+	      h0 = vlib_buffer_get_current (b0);
+	      error0 = next0 = 0;
+	      if (PREDICT_FALSE (clib_net_to_host_u16 (h0->length) >
+				 vlib_buffer_length_in_chain (vm, b0)))
+		{
+		  error0 = UDP_ERROR_LENGTH_ERROR;
+		  next0 = UDP_INPUT_NEXT_DROP;
+		}
+	    }
+
+	  if (PREDICT_FALSE (b1->current_length < advance1 + sizeof (*h1)))
+	    {
+	      error1 = UDP_ERROR_LENGTH_ERROR;
+	      next1 = UDP_INPUT_NEXT_DROP;
+	    }
+	  else
+	    {
+	      vlib_buffer_advance (b1, advance1);
+	      h1 = vlib_buffer_get_current (b1);
+	      error1 = next1 = 0;
+	      if (PREDICT_FALSE (clib_net_to_host_u16 (h1->length) >
+				 vlib_buffer_length_in_chain (vm, b1)))
+		{
+		  error1 = UDP_ERROR_LENGTH_ERROR;
+		  next1 = UDP_INPUT_NEXT_DROP;
+		}
+	    }
+
+	  /* Index sparse array with network byte order. */
+	  dst_port0 = (error0 == 0) ? h0->dst_port : 0;
+	  dst_port1 = (error1 == 0) ? h1->dst_port : 0;
+	  sparse_vec_index2 (rt->next_by_dst_port, dst_port0, dst_port1,
+			     &i0, &i1);
+	  next0 = (error0 == 0) ? vec_elt (rt->next_by_dst_port, i0) : next0;
+	  next1 = (error1 == 0) ? vec_elt (rt->next_by_dst_port, i1) : next1;
+
+	  if (PREDICT_FALSE (i0 == SPARSE_VEC_INVALID_INDEX))
+	    {
+	      // move the pointer back so icmp-error can find the
+	      // ip packet header
+	      vlib_buffer_advance (b0, -(word) advance0);
+
+	      if (PREDICT_FALSE (punt_unknown))
+		{
+		  b0->error = node->errors[UDP_ERROR_PUNT];
+		  next0 = UDP_INPUT_NEXT_PUNT;
+		}
+	      else if (is_ip4)
+		{
+		  icmp4_error_set_vnet_buffer (b0,
+					       ICMP4_destination_unreachable,
+					       ICMP4_destination_unreachable_port_unreachable,
+					       0);
+		  next0 = UDP_INPUT_NEXT_ICMP4_ERROR;
+		  n_no_listener++;
+		}
+	      else
+		{
+		  icmp6_error_set_vnet_buffer (b0,
+					       ICMP6_destination_unreachable,
+					       ICMP6_destination_unreachable_port_unreachable,
+					       0);
+		  next0 = UDP_INPUT_NEXT_ICMP6_ERROR;
+		  n_no_listener++;
+		}
+	    }
+	  else
+	    {
+	      b0->error = node->errors[UDP_ERROR_NONE];
+	      // advance to the payload
+	      vlib_buffer_advance (b0, sizeof (*h0));
+	    }
+
+	  if (PREDICT_FALSE (i1 == SPARSE_VEC_INVALID_INDEX))
+	    {
+	      // move the pointer back so icmp-error can find the
+	      // ip packet header
+	      vlib_buffer_advance (b1, -(word) advance1);
+
+	      if (PREDICT_FALSE (punt_unknown))
+		{
+		  b1->error = node->errors[UDP_ERROR_PUNT];
+		  next1 = UDP_INPUT_NEXT_PUNT;
+		}
+	      else if (is_ip4)
+		{
+		  icmp4_error_set_vnet_buffer (b1,
+					       ICMP4_destination_unreachable,
+					       ICMP4_destination_unreachable_port_unreachable,
+					       0);
+		  next1 = UDP_INPUT_NEXT_ICMP4_ERROR;
+		  n_no_listener++;
+		}
+	      else
+		{
+		  icmp6_error_set_vnet_buffer (b1,
+					       ICMP6_destination_unreachable,
+					       ICMP6_destination_unreachable_port_unreachable,
+					       0);
+		  next1 = UDP_INPUT_NEXT_ICMP6_ERROR;
+		  n_no_listener++;
+		}
+	    }
+	  else
+	    {
+	      b1->error = node->errors[UDP_ERROR_NONE];
+	      // advance to the payload
+	      vlib_buffer_advance (b1, sizeof (*h1));
+	    }
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      udp_rx_trace_t *tr = vlib_add_trace (vm, node,
+						   b0, sizeof (*tr));
+	      if (b0->error != node->errors[UDP_ERROR_LENGTH_ERROR])
+		{
+		  tr->src_port = h0 ? h0->src_port : 0;
+		  tr->dst_port = h0 ? h0->dst_port : 0;
+		  tr->bound = (next0 != UDP_INPUT_NEXT_ICMP4_ERROR &&
+			       next0 != UDP_INPUT_NEXT_ICMP6_ERROR);
+		}
+	    }
+	  if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      udp_rx_trace_t *tr = vlib_add_trace (vm, node,
+						   b1, sizeof (*tr));
+	      if (b1->error != node->errors[UDP_ERROR_LENGTH_ERROR])
+		{
+		  tr->src_port = h1 ? h1->src_port : 0;
+		  tr->dst_port = h1 ? h1->dst_port : 0;
+		  tr->bound = (next1 != UDP_INPUT_NEXT_ICMP4_ERROR &&
+			       next1 != UDP_INPUT_NEXT_ICMP6_ERROR);
+		}
+	    }
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  udp_header_t *h0 = 0;
+	  u32 i0, next0;
+	  u32 advance0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  /* ip4/6_local hands us the ip header, not the udp header */
+	  if (is_ip4)
+	    advance0 = sizeof (ip4_header_t);
+	  else
+	    advance0 = sizeof (ip6_header_t);
+
+	  if (PREDICT_FALSE (b0->current_length < advance0 + sizeof (*h0)))
+	    {
+	      b0->error = node->errors[UDP_ERROR_LENGTH_ERROR];
+	      next0 = UDP_INPUT_NEXT_DROP;
+	      goto trace_x1;
+	    }
+
+	  vlib_buffer_advance (b0, advance0);
+
+	  h0 = vlib_buffer_get_current (b0);
+
+	  if (PREDICT_TRUE (clib_net_to_host_u16 (h0->length) <=
+			    vlib_buffer_length_in_chain (vm, b0)))
+	    {
+	      i0 = sparse_vec_index (rt->next_by_dst_port, h0->dst_port);
+	      next0 = vec_elt (rt->next_by_dst_port, i0);
+
+	      if (PREDICT_FALSE (i0 == SPARSE_VEC_INVALID_INDEX))
+		{
+		  // move the pointer back so icmp-error can find the
+		  // ip packet header
+		  vlib_buffer_advance (b0, -(word) advance0);
+
+		  if (PREDICT_FALSE (punt_unknown))
+		    {
+		      b0->error = node->errors[UDP_ERROR_PUNT];
+		      next0 = UDP_INPUT_NEXT_PUNT;
+		    }
+		  else if (is_ip4)
+		    {
+		      icmp4_error_set_vnet_buffer (b0,
+						   ICMP4_destination_unreachable,
+						   ICMP4_destination_unreachable_port_unreachable,
+						   0);
+		      next0 = UDP_INPUT_NEXT_ICMP4_ERROR;
+		      n_no_listener++;
+		    }
+		  else
+		    {
+		      icmp6_error_set_vnet_buffer (b0,
+						   ICMP6_destination_unreachable,
+						   ICMP6_destination_unreachable_port_unreachable,
+						   0);
+		      next0 = UDP_INPUT_NEXT_ICMP6_ERROR;
+		      n_no_listener++;
+		    }
+		}
+	      else
+		{
+		  b0->error = node->errors[UDP_ERROR_NONE];
+		  // advance to the payload
+		  vlib_buffer_advance (b0, sizeof (*h0));
+		}
+	    }
+	  else
+	    {
+	      b0->error = node->errors[UDP_ERROR_LENGTH_ERROR];
+	      next0 = UDP_INPUT_NEXT_DROP;
+	    }
+
+	trace_x1:
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      udp_rx_trace_t *tr = vlib_add_trace (vm, node,
+						   b0, sizeof (*tr));
+	      if (b0->error != node->errors[UDP_ERROR_LENGTH_ERROR])
+		{
+		  tr->src_port = h0->src_port;
+		  tr->dst_port = h0->dst_port;
+		  tr->bound = (next0 != UDP_INPUT_NEXT_ICMP4_ERROR &&
+			       next0 != UDP_INPUT_NEXT_ICMP6_ERROR);
+		}
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_error_count (vm, node->node_index, UDP_ERROR_NO_LISTENER,
+		    n_no_listener);
+  return from_frame->n_vectors;
+}
+
+static char *udp_error_strings[] = {
+#define udp_error(n,s) s,
+#include "udp_error.def"
+#undef udp_error
+};
+
+static uword
+udp4_input (vlib_main_t * vm,
+	    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  return udp46_input_inline (vm, node, from_frame, 1 /* is_ip4 */ );
+}
+
+static uword
+udp6_input (vlib_main_t * vm,
+	    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  return udp46_input_inline (vm, node, from_frame, 0 /* is_ip4 */ );
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (udp4_input_node) = {
+  .function = udp4_input,
+  .name = "ip4-udp-lookup",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .runtime_data_bytes = sizeof (udp_input_runtime_t),
+
+  .n_errors = UDP_N_ERROR,
+  .error_strings = udp_error_strings,
+
+  .n_next_nodes = UDP_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [UDP_INPUT_NEXT_##s] = n,
+    foreach_udp_input_next
+#undef _
+  },
+
+  .format_buffer = format_udp_header,
+  .format_trace = format_udp_rx_trace,
+  .unformat_buffer = unformat_udp_header,
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (udp4_input_node, udp4_input);
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (udp6_input_node) = {
+  .function = udp6_input,
+  .name = "ip6-udp-lookup",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .runtime_data_bytes = sizeof (udp_input_runtime_t),
+
+  .n_errors = UDP_N_ERROR,
+  .error_strings = udp_error_strings,
+
+  .n_next_nodes = UDP_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [UDP_INPUT_NEXT_##s] = n,
+    foreach_udp_input_next
+#undef _
+  },
+
+  .format_buffer = format_udp_header,
+  .format_trace = format_udp_rx_trace,
+  .unformat_buffer = unformat_udp_header,
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (udp6_input_node, udp6_input);
+
+static void
+add_dst_port (udp_main_t * um,
+	      udp_dst_port_t dst_port, char *dst_port_name, u8 is_ip4)
+{
+  udp_dst_port_info_t *pi;
+  u32 i;
+
+  vec_add2 (um->dst_port_infos[is_ip4], pi, 1);
+  i = pi - um->dst_port_infos[is_ip4];
+
+  pi->name = dst_port_name;
+  pi->dst_port = dst_port;
+  pi->next_index = pi->node_index = ~0;
+
+  hash_set (um->dst_port_info_by_dst_port[is_ip4], dst_port, i);
+
+  if (pi->name)
+    hash_set_mem (um->dst_port_info_by_name[is_ip4], pi->name, i);
+}
+
+void
+udp_register_dst_port (vlib_main_t * vm,
+		       udp_dst_port_t dst_port, u32 node_index, u8 is_ip4)
+{
+  udp_main_t *um = &udp_main;
+  udp_dst_port_info_t *pi;
+  udp_input_runtime_t *rt;
+  u16 *n;
+
+  {
+    clib_error_t *error = vlib_call_init_function (vm, udp_local_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  pi = udp_get_dst_port_info (um, dst_port, is_ip4);
+  if (!pi)
+    {
+      add_dst_port (um, dst_port, 0, is_ip4);
+      pi = udp_get_dst_port_info (um, dst_port, is_ip4);
+      ASSERT (pi);
+    }
+
+  pi->node_index = node_index;
+  pi->next_index = vlib_node_add_next (vm,
+				       is_ip4 ? udp4_input_node.index
+				       : udp6_input_node.index, node_index);
+
+  /* Setup udp protocol -> next index sparse vector mapping. */
+  rt = vlib_node_get_runtime_data
+    (vm, is_ip4 ? udp4_input_node.index : udp6_input_node.index);
+  n = sparse_vec_validate (rt->next_by_dst_port,
+			   clib_host_to_net_u16 (dst_port));
+  n[0] = pi->next_index;
+}
+
+void
+udp_punt_unknown (vlib_main_t * vm, u8 is_ip4, u8 is_add)
+{
+  udp_input_runtime_t *rt;
+
+  {
+    clib_error_t *error = vlib_call_init_function (vm, udp_local_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  rt = vlib_node_get_runtime_data
+    (vm, is_ip4 ? udp4_input_node.index : udp6_input_node.index);
+
+  rt->punt_unknown = is_add;
+}
+
+/* Parse a UDP header. */
+uword
+unformat_udp_header (unformat_input_t * input, va_list * args)
+{
+  u8 **result = va_arg (*args, u8 **);
+  udp_header_t *udp;
+  __attribute__ ((unused)) int old_length;
+  u16 src_port, dst_port;
+
+  /* Allocate space for IP header. */
+  {
+    void *p;
+
+    old_length = vec_len (*result);
+    vec_add2 (*result, p, sizeof (ip4_header_t));
+    udp = p;
+  }
+
+  memset (udp, 0, sizeof (udp[0]));
+  if (unformat (input, "src-port %d dst-port %d", &src_port, &dst_port))
+    {
+      udp->src_port = clib_host_to_net_u16 (src_port);
+      udp->dst_port = clib_host_to_net_u16 (dst_port);
+      return 1;
+    }
+  return 0;
+}
+
+static void
+udp_setup_node (vlib_main_t * vm, u32 node_index)
+{
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  pg_node_t *pn = pg_get_node (node_index);
+
+  n->format_buffer = format_udp_header;
+  n->unformat_buffer = unformat_udp_header;
+  pn->unformat_edit = unformat_pg_udp_header;
+}
+
+clib_error_t *
+udp_local_init (vlib_main_t * vm)
+{
+  udp_input_runtime_t *rt;
+  udp_main_t *um = &udp_main;
+  int i;
+
+  {
+    clib_error_t *error;
+    error = vlib_call_init_function (vm, udp_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+
+  for (i = 0; i < 2; i++)
+    {
+      um->dst_port_info_by_name[i] = hash_create_string (0, sizeof (uword));
+      um->dst_port_info_by_dst_port[i] = hash_create (0, sizeof (uword));
+    }
+
+  udp_setup_node (vm, udp4_input_node.index);
+  udp_setup_node (vm, udp6_input_node.index);
+
+  rt = vlib_node_get_runtime_data (vm, udp4_input_node.index);
+
+  rt->next_by_dst_port = sparse_vec_new
+    ( /* elt bytes */ sizeof (rt->next_by_dst_port[0]),
+     /* bits in index */ BITS (((udp_header_t *) 0)->dst_port));
+
+  rt->punt_unknown = 0;
+
+#define _(n,s) add_dst_port (um, UDP_DST_PORT_##s, #s, 1 /* is_ip4 */);
+  foreach_udp4_dst_port
+#undef _
+    rt = vlib_node_get_runtime_data (vm, udp6_input_node.index);
+
+  rt->next_by_dst_port = sparse_vec_new
+    ( /* elt bytes */ sizeof (rt->next_by_dst_port[0]),
+     /* bits in index */ BITS (((udp_header_t *) 0)->dst_port));
+
+  rt->punt_unknown = 0;
+
+#define _(n,s) add_dst_port (um, UDP_DST_PORT_##s, #s, 0 /* is_ip4 */);
+  foreach_udp6_dst_port
+#undef _
+    ip4_register_protocol (IP_PROTOCOL_UDP, udp4_input_node.index);
+  /* Note: ip6 differs from ip4, UDP is hotwired to ip6-udp-lookup */
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (udp_local_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/udp_packet.h b/src/vnet/ip/udp_packet.h
new file mode 100644
index 00000000..beea3059
--- /dev/null
+++ b/src/vnet/ip/udp_packet.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip4/udp_packet.h: UDP packet format
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_udp_packet_h
+#define included_udp_packet_h
+
+typedef struct
+{
+  /* Source and destination port. */
+  u16 src_port, dst_port;
+
+  /* Length of UDP header plus payload. */
+  u16 length;
+
+  /* Checksum of UDP pseudo-header and data or
+     zero if checksum is disabled. */
+  u16 checksum;
+} udp_header_t;
+
+#endif /* included_udp_packet_h */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ip/udp_pg.c b/src/vnet/ip/udp_pg.c
new file mode 100644
index 00000000..c9d8d38c
--- /dev/null
+++ b/src/vnet/ip/udp_pg.c
@@ -0,0 +1,237 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ip/udp_pg: UDP packet-generator interface
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/pg/pg.h>
+#include <vnet/ip/ip.h>		/* for unformat_udp_udp_port */
+
+#define UDP_PG_EDIT_LENGTH (1 << 0)
+#define UDP_PG_EDIT_CHECKSUM (1 << 1)
+
+always_inline void
+udp_pg_edit_function_inline (pg_main_t * pg,
+			     pg_stream_t * s,
+			     pg_edit_group_t * g,
+			     u32 * packets, u32 n_packets, u32 flags)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  u32 ip_offset, udp_offset;
+
+  udp_offset = g->start_byte_offset;
+  ip_offset = (g - 1)->start_byte_offset;
+
+  while (n_packets >= 1)
+    {
+      vlib_buffer_t *p0;
+      ip4_header_t *ip0;
+      udp_header_t *udp0;
+      u32 udp_len0;
+
+      p0 = vlib_get_buffer (vm, packets[0]);
+      n_packets -= 1;
+      packets += 1;
+
+      ip0 = (void *) (p0->data + ip_offset);
+      udp0 = (void *) (p0->data + udp_offset);
+      udp_len0 = clib_net_to_host_u16 (ip0->length) - sizeof (ip0[0]);
+
+      if (flags & UDP_PG_EDIT_LENGTH)
+	udp0->length =
+	  clib_net_to_host_u16 (vlib_buffer_length_in_chain (vm, p0)
+				- ip_offset);
+
+      /* Initialize checksum with header. */
+      if (flags & UDP_PG_EDIT_CHECKSUM)
+	{
+	  ip_csum_t sum0;
+
+	  sum0 = clib_mem_unaligned (&ip0->src_address, u64);
+
+	  sum0 = ip_csum_with_carry
+	    (sum0, clib_host_to_net_u32 (udp_len0 + (ip0->protocol << 16)));
+
+	  /* Invalidate possibly old checksum. */
+	  udp0->checksum = 0;
+
+	  sum0 =
+	    ip_incremental_checksum_buffer (vm, p0, udp_offset, udp_len0,
+					    sum0);
+
+	  sum0 = ~ip_csum_fold (sum0);
+
+	  /* Zero checksum means checksumming disabled. */
+	  sum0 = sum0 != 0 ? sum0 : 0xffff;
+
+	  udp0->checksum = sum0;
+	}
+    }
+}
+
+static void
+udp_pg_edit_function (pg_main_t * pg,
+		      pg_stream_t * s,
+		      pg_edit_group_t * g, u32 * packets, u32 n_packets)
+{
+  switch (g->edit_function_opaque)
+    {
+    case UDP_PG_EDIT_LENGTH:
+      udp_pg_edit_function_inline (pg, s, g, packets, n_packets,
+				   UDP_PG_EDIT_LENGTH);
+      break;
+
+    case UDP_PG_EDIT_CHECKSUM:
+      udp_pg_edit_function_inline (pg, s, g, packets, n_packets,
+				   UDP_PG_EDIT_CHECKSUM);
+      break;
+
+    case UDP_PG_EDIT_CHECKSUM | UDP_PG_EDIT_LENGTH:
+      udp_pg_edit_function_inline (pg, s, g, packets, n_packets,
+				   UDP_PG_EDIT_CHECKSUM | UDP_PG_EDIT_LENGTH);
+      break;
+
+    default:
+      ASSERT (0);
+      break;
+    }
+}
+
+typedef struct
+{
+  pg_edit_t src_port, dst_port;
+  pg_edit_t length;
+  pg_edit_t checksum;
+} pg_udp_header_t;
+
+static inline void
+pg_udp_header_init (pg_udp_header_t * p)
+{
+  /* Initialize fields that are not bit fields in the IP header. */
+#define _(f) pg_edit_init (&p->f, udp_header_t, f);
+  _(src_port);
+  _(dst_port);
+  _(length);
+  _(checksum);
+#undef _
+}
+
+uword
+unformat_pg_udp_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  pg_udp_header_t *p;
+  u32 group_index;
+
+  p = pg_create_edit_group (s, sizeof (p[0]), sizeof (udp_header_t),
+			    &group_index);
+  pg_udp_header_init (p);
+
+  /* Defaults. */
+  p->checksum.type = PG_EDIT_UNSPECIFIED;
+  p->length.type = PG_EDIT_UNSPECIFIED;
+
+  if (!unformat (input, "UDP: %U -> %U",
+		 unformat_pg_edit,
+		 unformat_tcp_udp_port, &p->src_port,
+		 unformat_pg_edit, unformat_tcp_udp_port, &p->dst_port))
+    goto error;
+
+  /* Parse options. */
+  while (1)
+    {
+      if (unformat (input, "length %U",
+		    unformat_pg_edit, unformat_pg_number, &p->length))
+	;
+
+      else if (unformat (input, "checksum %U",
+			 unformat_pg_edit, unformat_pg_number, &p->checksum))
+	;
+
+      /* Can't parse input: try next protocol level. */
+      else
+	break;
+    }
+
+  {
+    ip_main_t *im = &ip_main;
+    u16 dst_port;
+    tcp_udp_port_info_t *pi;
+
+    pi = 0;
+    if (p->dst_port.type == PG_EDIT_FIXED)
+      {
+	dst_port = pg_edit_get_value (&p->dst_port, PG_EDIT_LO);
+	pi = ip_get_tcp_udp_port_info (im, dst_port);
+      }
+
+    if (pi && pi->unformat_pg_edit
+	&& unformat_user (input, pi->unformat_pg_edit, s))
+      ;
+
+    else if (!unformat_user (input, unformat_pg_payload, s))
+      goto error;
+
+    p = pg_get_edit_group (s, group_index);
+    if (p->checksum.type == PG_EDIT_UNSPECIFIED
+	|| p->length.type == PG_EDIT_UNSPECIFIED)
+      {
+	pg_edit_group_t *g = pg_stream_get_group (s, group_index);
+	g->edit_function = udp_pg_edit_function;
+	g->edit_function_opaque = 0;
+	if (p->checksum.type == PG_EDIT_UNSPECIFIED)
+	  g->edit_function_opaque |= UDP_PG_EDIT_CHECKSUM;
+	if (p->length.type == PG_EDIT_UNSPECIFIED)
+	  g->edit_function_opaque |= UDP_PG_EDIT_LENGTH;
+      }
+
+    return 1;
+  }
+
+error:
+  /* Free up any edits we may have added. */
+  pg_free_edit_group (s);
+  return 0;
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec-gre/dir.dox b/src/vnet/ipsec-gre/dir.dox
new file mode 100644
index 00000000..e6ffd10b
--- /dev/null
+++ b/src/vnet/ipsec-gre/dir.dox
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ @dir vnet/vnet/ipsec-gre
+ @brief L2-GRE over IPSec tunnel interface implementation
+*/
diff --git a/src/vnet/ipsec-gre/error.def b/src/vnet/ipsec-gre/error.def
new file mode 100644
index 00000000..d84e8ed1
--- /dev/null
+++ b/src/vnet/ipsec-gre/error.def
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief L2-GRE over IPSec errors.
+ */
+
+
+ipsec_gre_error (NONE, "no error")
+ipsec_gre_error (UNKNOWN_PROTOCOL, "unknown protocol")
+ipsec_gre_error (UNSUPPORTED_VERSION, "unsupported version")
+ipsec_gre_error (PKTS_DECAP, "GRE input packets decapsulated")
+ipsec_gre_error (PKTS_ENCAP, "GRE output packets encapsulated")
+ipsec_gre_error (NO_SUCH_TUNNEL, "GRE input packets dropped due to missing tunnel")
diff --git a/src/vnet/ipsec-gre/interface.c b/src/vnet/ipsec-gre/interface.c
new file mode 100644
index 00000000..56832ee1
--- /dev/null
+++ b/src/vnet/ipsec-gre/interface.c
@@ -0,0 +1,311 @@
+/*
+ * gre_interface.c: gre interfaces
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief L2-GRE over IPSec tunnel interface.
+ *
+ * Creates ipsec-gre tunnel interface.
+ * Provides a command line interface so humans can interact with VPP.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ipsec-gre/ipsec_gre.h>
+#include <vnet/ip/format.h>
+#include <vnet/ipsec/ipsec.h>
+
+#if DPDK_CRYPTO==1
+#include <vnet/devices/dpdk/ipsec/esp.h>
+#define ESP_NODE "dpdk-esp-encrypt"
+#else
+#include <vnet/ipsec/esp.h>
+#define ESP_NODE "esp-encrypt"
+#endif
+
+u8 *
+format_ipsec_gre_tunnel (u8 * s, va_list * args)
+{
+  ipsec_gre_tunnel_t *t = va_arg (*args, ipsec_gre_tunnel_t *);
+  ipsec_gre_main_t *gm = &ipsec_gre_main;
+
+  s = format (s,
+	      "[%d] %U (src) %U (dst) local-sa %d remote-sa %d",
+	      t - gm->tunnels,
+	      format_ip4_address, &t->tunnel_src,
+	      format_ip4_address, &t->tunnel_dst,
+	      t->local_sa_id, t->remote_sa_id);
+  return s;
+}
+
+static clib_error_t *
+show_ipsec_gre_tunnel_command_fn (vlib_main_t * vm,
+				  unformat_input_t * input,
+				  vlib_cli_command_t * cmd)
+{
+  ipsec_gre_main_t *igm = &ipsec_gre_main;
+  ipsec_gre_tunnel_t *t;
+
+  if (pool_elts (igm->tunnels) == 0)
+    vlib_cli_output (vm, "No IPSec GRE tunnels configured...");
+
+  /* *INDENT-OFF* */
+  pool_foreach (t, igm->tunnels,
+  ({
+    vlib_cli_output (vm, "%U", format_ipsec_gre_tunnel, t);
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_ipsec_gre_tunnel_command, static) = {
+    .path = "show ipsec gre tunnel",
+    .function = show_ipsec_gre_tunnel_command_fn,
+};
+/* *INDENT-ON* */
+
+/* force inclusion from application's main.c */
+clib_error_t *
+ipsec_gre_interface_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ipsec_gre_interface_init);
+
+/**
+ * @brief Add or delete ipsec-gre tunnel interface.
+ *
+ * @param *a vnet_ipsec_gre_add_del_tunnel_args_t - tunnel interface parameters
+ * @param *sw_if_indexp u32 - software interface index
+ * @return int - 0 if success otherwise <code>VNET_API_ERROR_</code>
+ */
+int
+vnet_ipsec_gre_add_del_tunnel (vnet_ipsec_gre_add_del_tunnel_args_t * a,
+			       u32 * sw_if_indexp)
+{
+  ipsec_gre_main_t *igm = &ipsec_gre_main;
+  vnet_main_t *vnm = igm->vnet_main;
+  ip4_main_t *im = &ip4_main;
+  ipsec_gre_tunnel_t *t;
+  vnet_hw_interface_t *hi;
+  u32 hw_if_index, sw_if_index;
+  u32 slot;
+  uword *p;
+  u64 key;
+  ipsec_add_del_ipsec_gre_tunnel_args_t args;
+
+  memset (&args, 0, sizeof (args));
+  args.is_add = a->is_add;
+  args.local_sa_id = a->lsa;
+  args.remote_sa_id = a->rsa;
+  args.local_ip.as_u32 = a->src.as_u32;
+  args.remote_ip.as_u32 = a->dst.as_u32;
+
+  key = (u64) a->src.as_u32 << 32 | (u64) a->dst.as_u32;
+  p = hash_get (igm->tunnel_by_key, key);
+
+  if (a->is_add)
+    {
+      /* check if same src/dst pair exists */
+      if (p)
+	return VNET_API_ERROR_INVALID_VALUE;
+
+      pool_get_aligned (igm->tunnels, t, CLIB_CACHE_LINE_BYTES);
+      memset (t, 0, sizeof (*t));
+
+      if (vec_len (igm->free_ipsec_gre_tunnel_hw_if_indices) > 0)
+	{
+	  vnet_interface_main_t *im = &vnm->interface_main;
+
+	  hw_if_index = igm->free_ipsec_gre_tunnel_hw_if_indices
+	    [vec_len (igm->free_ipsec_gre_tunnel_hw_if_indices) - 1];
+	  _vec_len (igm->free_ipsec_gre_tunnel_hw_if_indices) -= 1;
+
+	  hi = vnet_get_hw_interface (vnm, hw_if_index);
+	  hi->dev_instance = t - igm->tunnels;
+	  hi->hw_instance = hi->dev_instance;
+
+	  /* clear old stats of freed tunnel before reuse */
+	  sw_if_index = hi->sw_if_index;
+	  vnet_interface_counter_lock (im);
+	  vlib_zero_combined_counter
+	    (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_TX],
+	     sw_if_index);
+	  vlib_zero_combined_counter
+	    (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_RX],
+	     sw_if_index);
+	  vlib_zero_simple_counter
+	    (&im->sw_if_counters[VNET_INTERFACE_COUNTER_DROP], sw_if_index);
+	  vnet_interface_counter_unlock (im);
+	}
+      else
+	{
+	  hw_if_index = vnet_register_interface
+	    (vnm, ipsec_gre_device_class.index, t - igm->tunnels,
+	     ipsec_gre_hw_interface_class.index, t - igm->tunnels);
+	  hi = vnet_get_hw_interface (vnm, hw_if_index);
+	  sw_if_index = hi->sw_if_index;
+	}
+
+      t->hw_if_index = hw_if_index;
+      t->sw_if_index = sw_if_index;
+      t->local_sa_id = a->lsa;
+      t->remote_sa_id = a->rsa;
+      t->local_sa = ipsec_get_sa_index_by_sa_id (a->lsa);
+      t->remote_sa = ipsec_get_sa_index_by_sa_id (a->rsa);
+
+      ip4_sw_interface_enable_disable (sw_if_index, 1);
+
+      vec_validate_init_empty (igm->tunnel_index_by_sw_if_index,
+			       sw_if_index, ~0);
+      igm->tunnel_index_by_sw_if_index[sw_if_index] = t - igm->tunnels;
+
+      vec_validate (im->fib_index_by_sw_if_index, sw_if_index);
+
+      hi->min_packet_bytes = 64 + sizeof (gre_header_t) +
+	sizeof (ip4_header_t) + sizeof (esp_header_t) + sizeof (esp_footer_t);
+      hi->per_packet_overhead_bytes =
+	/* preamble */ 8 + /* inter frame gap */ 12;
+
+      /* Standard default gre MTU. */
+      hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] =
+	9000;
+
+      clib_memcpy (&t->tunnel_src, &a->src, sizeof (t->tunnel_src));
+      clib_memcpy (&t->tunnel_dst, &a->dst, sizeof (t->tunnel_dst));
+
+      hash_set (igm->tunnel_by_key, key, t - igm->tunnels);
+
+      slot = vlib_node_add_named_next_with_slot
+	(vnm->vlib_main, hi->tx_node_index, ESP_NODE,
+	 IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT);
+
+      ASSERT (slot == IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT);
+
+    }
+  else
+    {				/* !is_add => delete */
+      /* tunnel needs to exist */
+      if (!p)
+	return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+      t = pool_elt_at_index (igm->tunnels, p[0]);
+
+      sw_if_index = t->sw_if_index;
+      ip4_sw_interface_enable_disable (sw_if_index, 0);
+      vnet_sw_interface_set_flags (vnm, sw_if_index, 0 /* down */ );
+      /* make sure tunnel is removed from l2 bd or xconnect */
+      set_int_l2_mode (igm->vlib_main, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0);
+      vec_add1 (igm->free_ipsec_gre_tunnel_hw_if_indices, t->hw_if_index);
+      igm->tunnel_index_by_sw_if_index[sw_if_index] = ~0;
+
+      hash_unset (igm->tunnel_by_key, key);
+      pool_put (igm->tunnels, t);
+    }
+
+  if (sw_if_indexp)
+    *sw_if_indexp = sw_if_index;
+
+  return ipsec_add_del_ipsec_gre_tunnel (vnm, &args);
+}
+
+static clib_error_t *
+create_ipsec_gre_tunnel_command_fn (vlib_main_t * vm,
+				    unformat_input_t * input,
+				    vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1;
+  u32 num_m_args = 0;
+  ip4_address_t src, dst;
+  u32 lsa = 0, rsa = 0;
+  vnet_ipsec_gre_add_del_tunnel_args_t _a, *a = &_a;
+  int rv;
+  u32 sw_if_index;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "src %U", unformat_ip4_address, &src))
+	num_m_args++;
+      else if (unformat (line_input, "dst %U", unformat_ip4_address, &dst))
+	num_m_args++;
+      else if (unformat (line_input, "local-sa %d", &lsa))
+	num_m_args++;
+      else if (unformat (line_input, "remote-sa %d", &rsa))
+	num_m_args++;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  if (num_m_args < 4)
+    return clib_error_return (0, "mandatory argument(s) missing");
+
+  if (memcmp (&src, &dst, sizeof (src)) == 0)
+    return clib_error_return (0, "src and dst are identical");
+
+  memset (a, 0, sizeof (*a));
+  a->is_add = is_add;
+  a->lsa = lsa;
+  a->rsa = rsa;
+  clib_memcpy (&a->src, &src, sizeof (src));
+  clib_memcpy (&a->dst, &dst, sizeof (dst));
+
+  rv = vnet_ipsec_gre_add_del_tunnel (a, &sw_if_index);
+
+  switch (rv)
+    {
+    case 0:
+      vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name,
+		       vnet_get_main (), sw_if_index);
+      break;
+    case VNET_API_ERROR_INVALID_VALUE:
+      return clib_error_return (0, "GRE tunnel already exists...");
+    default:
+      return clib_error_return (0,
+				"vnet_ipsec_gre_add_del_tunnel returned %d",
+				rv);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (create_ipsec_gre_tunnel_command, static) = {
+  .path = "create ipsec gre tunnel",
+  .short_help = "create ipsec gre tunnel src <addr> dst <addr> "
+                "local-sa <id> remote-sa <id> [del]",
+  .function = create_ipsec_gre_tunnel_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+* fd.io coding-style-patch-verification: ON
+*
+* Local Variables:
+* eval: (c-set-style "gnu")
+* End:
+*/
diff --git a/src/vnet/ipsec-gre/ipsec_gre.api b/src/vnet/ipsec-gre/ipsec_gre.api
new file mode 100644
index 00000000..793bca0a
--- /dev/null
+++ b/src/vnet/ipsec-gre/ipsec_gre.api
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \brief Add / del ipsec gre tunnel request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param local_sa_id - local SA id
+    @param remote_sa_id - remote SA id
+    @param is_add - 1 if adding the tunnel, 0 if deleting
+    @param src_address - tunnel source address
+    @param dst_address - tunnel destination address
+*/
+define ipsec_gre_add_del_tunnel {
+    u32 client_index;
+    u32 context;
+    u32 local_sa_id;
+    u32 remote_sa_id;
+    u8 is_add;
+    u8 src_address[4];
+    u8 dst_address[4];
+};
+
+/** \brief Reply for add / del ipsec gre tunnel request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+    @param sw_if_index - software index of the new ipsec gre tunnel
+*/
+define ipsec_gre_add_del_tunnel_reply {
+    u32 context;
+    i32 retval;
+    u32 sw_if_index;
+};
+
+/** \brief Dump ipsec gre tunnel table
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param tunnel_index - gre tunnel identifier or -1 in case of all tunnels
+*/
+define ipsec_gre_tunnel_dump {
+    u32 client_index;
+    u32 context;
+    u32 sw_if_index;
+};
+
+/** \brief ipsec gre tunnel operational state response
+    @param context - returned sender context, to match reply w/ request
+    @param sw_if_index - software index of the ipsec gre tunnel
+    @param local_sa_id - local SA id
+    @param remote_sa_id - remote SA id
+    @param src_address - tunnel source address
+    @param dst_address - tunnel destination address
+*/
+define ipsec_gre_tunnel_details {
+    u32 context;
+    u32 sw_if_index;
+    u32 local_sa_id;
+    u32 remote_sa_id;
+    u8 src_address[4];
+    u8 dst_address[4];
+};
+
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
+ 
\ No newline at end of file
diff --git a/src/vnet/ipsec-gre/ipsec_gre.c b/src/vnet/ipsec-gre/ipsec_gre.c
new file mode 100644
index 00000000..a0b065ac
--- /dev/null
+++ b/src/vnet/ipsec-gre/ipsec_gre.c
@@ -0,0 +1,407 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief L2-GRE over IPSec packet processing.
+ *
+ * Add GRE header to thr packet and send it to the esp-encrypt node.
+*/
+
+#include <vnet/vnet.h>
+#include <vnet/ipsec-gre/ipsec_gre.h>
+
+ipsec_gre_main_t ipsec_gre_main;
+
+/**
+ * @brief IPv4 and GRE header union.
+ *
+*/
+typedef struct
+{
+  union
+  {
+    ip4_and_gre_header_t ip4_and_gre;
+    u64 as_u64[3];
+  };
+} ip4_and_gre_union_t;
+
+/**
+ * @brief Packet trace.
+ *
+*/
+typedef struct
+{
+  u32 tunnel_id; /**< Tunnel-id / index in tunnel vector */
+
+  u32 length; /**< pkt length */
+
+  ip4_address_t src; /**< tunnel src IPv4 address */
+  ip4_address_t dst; /**< tunnel dst IPv4 address */
+
+  u32 sa_id; /**< tunnel IPSec SA id */
+} ipsec_gre_tx_trace_t;
+
+u8 *
+format_ipsec_gre_tx_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ipsec_gre_tx_trace_t *t = va_arg (*args, ipsec_gre_tx_trace_t *);
+
+  s = format (s, "GRE: tunnel %d len %d src %U dst %U sa-id %d",
+	      t->tunnel_id, clib_net_to_host_u16 (t->length),
+	      format_ip4_address, &t->src.as_u8,
+	      format_ip4_address, &t->dst.as_u8, t->sa_id);
+  return s;
+}
+
+/**
+ * @brief IPSec-GRE tunnel interface tx function.
+ *
+ * Add GRE header to the packet.
+ *
+ * @param vm vlib_main_t corresponding to the current thread.
+ * @param node vlib_node_runtime_t data for this node.
+ * @param frame vlib_frame_t whose contents should be dispatched.
+ *
+ * @par Graph mechanics: buffer metadata, next index usage
+ *
+ * <em>Uses:</em>
+ * - <code>node->runtime_data</code>
+ *     - Match tunnel by <code>rd->dev_instance</code> in IPSec-GRE tunnels
+ *       pool.
+ *
+ * <em>Sets:</em>
+ * - <code>vnet_buffer(b)->output_features.ipsec_sad_index</code>
+ *     - Set IPSec Security Association for packet encryption.
+ * - <code>vnet_buffer(b)->sw_if_index[VLIB_TX]</code>
+ *     - Reset output sw_if_index.
+ *
+ * <em>Nexd Index:</em>
+ * - Dispatches the packet to the esp-encrypt node.
+*/
+static uword
+ipsec_gre_interface_tx (vlib_main_t * vm,
+			vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  ipsec_gre_main_t *igm = &ipsec_gre_main;
+  u32 next_index;
+  u32 *from, *to_next, n_left_from, n_left_to_next;
+  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
+  ipsec_gre_tunnel_t *t = pool_elt_at_index (igm->tunnels, rd->dev_instance);
+
+  /* Vector of buffer / pkt indices we're supposed to process */
+  from = vlib_frame_vector_args (frame);
+
+  /* Number of buffers / pkts */
+  n_left_from = frame->n_vectors;
+
+  /* Speculatively send the first buffer to the last disposition we used */
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      /* set up to enqueue to our disposition with index = next_index */
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /*
+       * As long as we have enough pkts left to process two pkts
+       * and prefetch two pkts...
+       */
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  vlib_buffer_t *b0, *b1;
+	  ip4_header_t *ip0, *ip1;
+	  ip4_and_gre_union_t *h0, *h1;
+	  u32 bi0, next0, bi1, next1;
+	  __attribute__ ((unused)) u8 error0, error1;
+	  u16 gre_protocol0, gre_protocol1;
+
+	  /* Prefetch the next iteration */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    /*
+	     * Prefetch packet data. We expect to overwrite
+	     * the inbound L2 header with an ip header and a
+	     * gre header. Might want to prefetch the last line
+	     * of rewrite space as well; need profile data
+	     */
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+	  /* Pick up the next two buffer indices */
+	  bi0 = from[0];
+	  bi1 = from[1];
+
+	  /* Speculatively enqueue them where we sent the last buffer */
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  ip0 = vlib_buffer_get_current (b0);
+	  gre_protocol0 = clib_net_to_host_u16 (0x01);
+
+	  ip1 = vlib_buffer_get_current (b1);
+	  gre_protocol1 = clib_net_to_host_u16 (0x01);
+
+	  vlib_buffer_advance (b0, -sizeof (*h0));
+	  vlib_buffer_advance (b1, -sizeof (*h1));
+
+	  h0 = vlib_buffer_get_current (b0);
+	  h1 = vlib_buffer_get_current (b1);
+	  h0->as_u64[0] = 0;
+	  h0->as_u64[1] = 0;
+	  h0->as_u64[2] = 0;
+
+	  h1->as_u64[0] = 0;
+	  h1->as_u64[1] = 0;
+	  h1->as_u64[2] = 0;
+
+	  ip0 = &h0->ip4_and_gre.ip4;
+	  h0->ip4_and_gre.gre.protocol = gre_protocol0;
+	  ip0->ip_version_and_header_length = 0x45;
+	  ip0->ttl = 254;
+	  ip0->protocol = IP_PROTOCOL_GRE;
+
+	  ip1 = &h1->ip4_and_gre.ip4;
+	  h1->ip4_and_gre.gre.protocol = gre_protocol1;
+	  ip1->ip_version_and_header_length = 0x45;
+	  ip1->ttl = 254;
+	  ip1->protocol = IP_PROTOCOL_GRE;
+
+	  ip0->length =
+	    clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
+	  ip1->length =
+	    clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1));
+	  ip0->src_address.as_u32 = t->tunnel_src.as_u32;
+	  ip1->src_address.as_u32 = t->tunnel_src.as_u32;
+	  ip0->dst_address.as_u32 = t->tunnel_dst.as_u32;
+	  ip1->dst_address.as_u32 = t->tunnel_dst.as_u32;
+	  ip0->checksum = ip4_header_checksum (ip0);
+	  ip1->checksum = ip4_header_checksum (ip1);
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
+	    vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	  vnet_buffer (b1)->sw_if_index[VLIB_RX] =
+	    vnet_buffer (b1)->sw_if_index[VLIB_TX];
+
+	  vnet_buffer (b0)->ipsec.sad_index = t->local_sa;
+	  vnet_buffer (b1)->ipsec.sad_index = t->local_sa;
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+	  vnet_buffer (b1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+
+	  next0 = IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT;
+	  next1 = IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT;
+	  error0 = IPSEC_GRE_ERROR_NONE;
+	  error1 = IPSEC_GRE_ERROR_NONE;
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ipsec_gre_tx_trace_t *tr = vlib_add_trace (vm, node,
+							 b0, sizeof (*tr));
+	      tr->tunnel_id = t - igm->tunnels;
+	      tr->length = ip0->length;
+	      tr->src.as_u32 = ip0->src_address.as_u32;
+	      tr->dst.as_u32 = ip0->dst_address.as_u32;
+	      tr->sa_id = t->local_sa_id;
+	    }
+
+	  if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ipsec_gre_tx_trace_t *tr = vlib_add_trace (vm, node,
+							 b1, sizeof (*tr));
+	      tr->tunnel_id = t - igm->tunnels;
+	      tr->length = ip1->length;
+	      tr->src.as_u32 = ip1->src_address.as_u32;
+	      tr->dst.as_u32 = ip1->dst_address.as_u32;
+	      tr->sa_id = t->local_sa_id;
+	    }
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *b0;
+	  ip4_header_t *ip0;
+	  ip4_and_gre_union_t *h0;
+	  u32 bi0, next0;
+	  __attribute__ ((unused)) u8 error0;
+	  u16 gre_protocol0;
+
+	  bi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  gre_protocol0 = clib_net_to_host_u16 (0x01);
+
+	  vlib_buffer_advance (b0, -sizeof (*h0));
+
+	  h0 = vlib_buffer_get_current (b0);
+	  h0->as_u64[0] = 0;
+	  h0->as_u64[1] = 0;
+	  h0->as_u64[2] = 0;
+
+	  ip0 = &h0->ip4_and_gre.ip4;
+	  h0->ip4_and_gre.gre.protocol = gre_protocol0;
+	  ip0->ip_version_and_header_length = 0x45;
+	  ip0->ttl = 254;
+	  ip0->protocol = IP_PROTOCOL_GRE;
+	  ip0->length =
+	    clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
+	  ip0->src_address.as_u32 = t->tunnel_src.as_u32;
+	  ip0->dst_address.as_u32 = t->tunnel_dst.as_u32;
+	  ip0->checksum = ip4_header_checksum (ip0);
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
+	    vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	  vnet_buffer (b0)->ipsec.sad_index = t->local_sa;
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+
+	  next0 = IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT;
+	  error0 = IPSEC_GRE_ERROR_NONE;
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ipsec_gre_tx_trace_t *tr = vlib_add_trace (vm, node,
+							 b0, sizeof (*tr));
+	      tr->tunnel_id = t - igm->tunnels;
+	      tr->length = ip0->length;
+	      tr->src.as_u32 = ip0->src_address.as_u32;
+	      tr->dst.as_u32 = ip0->dst_address.as_u32;
+	      tr->sa_id = t->local_sa_id;
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, ipsec_gre_input_node.index,
+			       IPSEC_GRE_ERROR_PKTS_ENCAP, frame->n_vectors);
+
+  return frame->n_vectors;
+}
+
+static clib_error_t *
+ipsec_gre_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index,
+				   u32 flags)
+{
+  if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+    vnet_hw_interface_set_flags (vnm, hw_if_index,
+				 VNET_HW_INTERFACE_FLAG_LINK_UP);
+  else
+    vnet_hw_interface_set_flags (vnm, hw_if_index, 0 /* down */ );
+
+  return /* no error */ 0;
+}
+
+static u8 *
+format_ipsec_gre_tunnel_name (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  return format (s, "ipsec-gre%d", dev_instance);
+}
+
+static u8 *
+format_ipsec_gre_device (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  CLIB_UNUSED (int verbose) = va_arg (*args, int);
+
+  s = format (s, "IPSEC-GRE tunnel: id %d\n", dev_instance);
+  return s;
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (ipsec_gre_device_class) = {
+  .name = "IPSec GRE tunnel device",
+  .format_device_name = format_ipsec_gre_tunnel_name,
+  .format_device = format_ipsec_gre_device,
+  .format_tx_trace = format_ipsec_gre_tx_trace,
+  .tx_function = ipsec_gre_interface_tx,
+  .admin_up_down_function = ipsec_gre_interface_admin_up_down,
+};
+
+VLIB_DEVICE_TX_FUNCTION_MULTIARCH (ipsec_gre_device_class,
+				   ipsec_gre_interface_tx)
+
+
+VNET_HW_INTERFACE_CLASS (ipsec_gre_hw_interface_class) = {
+  .name = "IPSEC-GRE",
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+ipsec_gre_init (vlib_main_t * vm)
+{
+  ipsec_gre_main_t *igm = &ipsec_gre_main;
+  clib_error_t *error;
+
+  memset (igm, 0, sizeof (igm[0]));
+  igm->vlib_main = vm;
+  igm->vnet_main = vnet_get_main ();
+
+  if ((error = vlib_call_init_function (vm, ip_main_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ip4_lookup_init)))
+    return error;
+
+  igm->tunnel_by_key = hash_create (0, sizeof (uword));
+
+  return vlib_call_init_function (vm, ipsec_gre_input_init);
+}
+
+VLIB_INIT_FUNCTION (ipsec_gre_init);
+
+ipsec_gre_main_t *
+ipsec_gre_get_main (vlib_main_t * vm)
+{
+  vlib_call_init_function (vm, ipsec_gre_init);
+  return &ipsec_gre_main;
+}
+
+/*
+* fd.io coding-style-patch-verification: ON
+*
+* Local Variables:
+* eval: (c-set-style "gnu")
+* End:
+*/
diff --git a/src/vnet/ipsec-gre/ipsec_gre.h b/src/vnet/ipsec-gre/ipsec_gre.h
new file mode 100644
index 00000000..a2ca64b6
--- /dev/null
+++ b/src/vnet/ipsec-gre/ipsec_gre.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief L2-GRE over IPSec packet processing.
+*/
+
+#ifndef included_ipsec_gre_h
+#define included_ipsec_gre_h
+
+#include <vnet/vnet.h>
+#include <vnet/gre/packet.h>
+#include <vnet/gre/gre.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ip/ip4.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ip/format.h>
+
+extern vnet_hw_interface_class_t ipsec_gre_hw_interface_class;
+
+/**
+ * @brief IPSec-GRE errors.
+ *
+*/
+typedef enum
+{
+#define ipsec_gre_error(n,s) IPSEC_GRE_ERROR_##n,
+#include <vnet/ipsec-gre/error.def>
+#undef ipsec_gre_error
+  IPSEC_GRE_N_ERROR,
+} ipsec_gre_error_t;
+
+/**
+ * @brief IPSec-GRE tunnel parameters.
+ *
+*/
+typedef struct
+{
+  ip4_address_t tunnel_src; /**< tunnel IPv4 src address */
+  ip4_address_t tunnel_dst; /**< tunnel IPv4 dst address */
+  u32 local_sa;		    /**< local IPSec SA index */
+  u32 remote_sa;	    /**< remote IPSec SA index */
+  u32 local_sa_id;	    /**< local IPSec SA id */
+  u32 remote_sa_id;	    /**< remote IPSec SA id */
+  u32 hw_if_index;;	    /**< hardware interface index */
+  u32 sw_if_index;;	    /**< software interface index */
+} ipsec_gre_tunnel_t;
+
+/**
+ * @brief IPSec-GRE state.
+ *
+*/
+typedef struct
+{
+  ipsec_gre_tunnel_t *tunnels; /**< pool of tunnel instances */
+
+  uword *tunnel_by_key;	 /**< hash mapping src/dst addr pair to tunnel */
+
+  u32 *free_ipsec_gre_tunnel_hw_if_indices;  /**< free vlib hw_if_indices */
+
+  u32 *tunnel_index_by_sw_if_index;  /**< mapping from sw_if_index to tunnel
+                                          index */
+
+  vlib_main_t *vlib_main;  /**< convenience */
+  vnet_main_t *vnet_main;  /**< convenience */
+} ipsec_gre_main_t;
+
+ipsec_gre_main_t ipsec_gre_main;
+
+extern vlib_node_registration_t ipsec_gre_input_node;
+extern vnet_device_class_t ipsec_gre_device_class;
+
+/* manually added to the interface output node in ipsec_gre.c */
+#define IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT 1
+
+/**
+ * @brief IPSec-GRE tunnel add/del arguments.
+ *
+*/
+typedef struct
+{
+  u8 is_add; /**< 1 - add, 0 - delete */
+
+  ip4_address_t src; /**< tunnel IPv4 src address */
+  ip4_address_t dst; /**< tunnel IPv4 dst address */
+  u32 lsa;	     /**< local IPSec SA id */
+  u32 rsa;	     /**< remote IPSec SA id */
+} vnet_ipsec_gre_add_del_tunnel_args_t;
+
+int vnet_ipsec_gre_add_del_tunnel
+  (vnet_ipsec_gre_add_del_tunnel_args_t * a, u32 * sw_if_indexp);
+
+#endif /* included_ipsec_gre_h */
+
+/*
+* fd.io coding-style-patch-verification: ON
+*
+* Local Variables:
+* eval: (c-set-style "gnu")
+* End:
+*/
diff --git a/src/vnet/ipsec-gre/ipsec_gre_api.c b/src/vnet/ipsec-gre/ipsec_gre_api.c
new file mode 100644
index 00000000..a7ea1490
--- /dev/null
+++ b/src/vnet/ipsec-gre/ipsec_gre_api.c
@@ -0,0 +1,190 @@
+/*
+ *------------------------------------------------------------------
+ * ipsec_gre_api.c - ipsec_gre api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/ipsec-gre/ipsec_gre.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                             \
+_(IPSEC_GRE_ADD_DEL_TUNNEL, ipsec_gre_add_del_tunnel)                   \
+_(IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump)
+
+static void
+vl_api_ipsec_gre_add_del_tunnel_t_handler (vl_api_ipsec_gre_add_del_tunnel_t *
+					   mp)
+{
+  vl_api_ipsec_gre_add_del_tunnel_reply_t *rmp;
+  int rv = 0;
+  vnet_ipsec_gre_add_del_tunnel_args_t _a, *a = &_a;
+  u32 sw_if_index = ~0;
+
+  /* Check src & dst are different */
+  if (memcmp (mp->src_address, mp->dst_address, 4) == 0)
+    {
+      rv = VNET_API_ERROR_SAME_SRC_DST;
+      goto out;
+    }
+
+  memset (a, 0, sizeof (*a));
+
+  /* ip addresses sent in network byte order */
+  clib_memcpy (&(a->src), mp->src_address, 4);
+  clib_memcpy (&(a->dst), mp->dst_address, 4);
+  a->is_add = mp->is_add;
+  a->lsa = ntohl (mp->local_sa_id);
+  a->rsa = ntohl (mp->remote_sa_id);
+
+  rv = vnet_ipsec_gre_add_del_tunnel (a, &sw_if_index);
+
+out:
+    /* *INDENT-OFF* */
+    REPLY_MACRO2(VL_API_GRE_ADD_DEL_TUNNEL_REPLY,
+    ({
+        rmp->sw_if_index = ntohl (sw_if_index);
+    }));
+    /* *INDENT-ON* */
+}
+
+static void send_ipsec_gre_tunnel_details
+  (ipsec_gre_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_ipsec_gre_tunnel_details_t *rmp;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_IPSEC_GRE_TUNNEL_DETAILS);
+  clib_memcpy (rmp->src_address, &(t->tunnel_src), 4);
+  clib_memcpy (rmp->dst_address, &(t->tunnel_dst), 4);
+  rmp->sw_if_index = htonl (t->sw_if_index);
+  rmp->local_sa_id = htonl (t->local_sa_id);
+  rmp->remote_sa_id = htonl (t->remote_sa_id);
+  rmp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void vl_api_ipsec_gre_tunnel_dump_t_handler
+  (vl_api_ipsec_gre_tunnel_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  ipsec_gre_main_t *igm = &ipsec_gre_main;
+  ipsec_gre_tunnel_t *t;
+  u32 sw_if_index;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  if (~0 == sw_if_index)
+    {
+        /* *INDENT-OFF* */
+        pool_foreach (t, igm->tunnels,
+        ({
+            send_ipsec_gre_tunnel_details(t, q, mp->context);
+        }));
+        /* *INDENT-ON* */
+    }
+  else
+    {
+      if ((sw_if_index >= vec_len (igm->tunnel_index_by_sw_if_index)) ||
+	  (~0 == igm->tunnel_index_by_sw_if_index[sw_if_index]))
+	{
+	  return;
+	}
+      t = &igm->tunnels[igm->tunnel_index_by_sw_if_index[sw_if_index]];
+      send_ipsec_gre_tunnel_details (t, q, mp->context);
+    }
+}
+
+/*
+ * ipsec_gre_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_ipsec_gre;
+#undef _
+}
+
+static clib_error_t *
+ipsec_gre_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (ipsec_gre_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec-gre/ipsec_gre_doc.md b/src/vnet/ipsec-gre/ipsec_gre_doc.md
new file mode 100644
index 00000000..e1bb9cda
--- /dev/null
+++ b/src/vnet/ipsec-gre/ipsec_gre_doc.md
@@ -0,0 +1,74 @@
+# VPP L2-GRE over IPsec implementation    {#ipsec_gre_doc}
+
+This is a memo intended to contain documentation of the VPP L2-GRE over IPsec implementation.
+Everything that is not directly obvious should come here.
+
+
+## L2-GRE over IPsec
+GRE encapsulate layer 2 traffic and IPSec encrypt what is encapsulated by GRE. The whole point of L2-GRE over IPSec is to tunnel layer 2 over GRE and IPSec by bridging the physical interface with IPSec-GRE tunnel interface.
+
+There are 2 dedicated nodes for encapsulation:
+* ipsec-gre<n>-tx - add GRE header
+* esp-encrypt - encrypt GRE packet to ESP packet
+
+There are 3 dedicated nodes for decapsulation:
+* ipsec-if-input - match IPSec SA by source IP address and SPI in ESP packet
+* esp-decrypt - decrypt ESP packet
+* ipsec-gre-input - remove GRE header
+
+
+### Configuration
+
+L2-GRE over IPsec support the following CLI configuration command:
+    create ipsec gre tunnel src <addr> dst <addr> local-sa <id> remote-sa <id> [del]
+
+src: tunnel source IPv4 address
+dst: tunnel destination IPv4 address
+local-sa: tunnel local IPSec Security Association
+remote-sa: tunnel remote IPSec Security Association
+del: delete IPSec-GRE tunnel
+
+L2-GRE over IPsec support the following API configuration command:
+    ipsec_gre_add_del_tunnel src <addr> dst <addr> local_sa <sa-id> remote_sa <sa-id> [del]
+
+src: tunnel source IPv4 address
+dst: tunnel destination IPv4 address
+local_sa: tunnel local IPSec Security Association
+remote_sa: tunnel remote IPSec Security Association
+del: delete IPSec-GRE tunnel
+
+
+### Configuration example
+
+Interface GigabitEthernet0/9/0 is in bridge with ipsec-gre0 tunnel interface, interface GigabitEthernet0/8/0 sending encapsulated and encrypted traffic.
+
+Configure IPv4 address on sending interface:
+set int ip address GigabitEthernet0/8/0 192.168.1.1/24
+
+Configure IPSec Security Associations:
+ipsec sa add 10 spi 1001 esp crypto-key 4a506a794f574265564551694d653768 crypto-alg aes-cbc-128 integ-key 4339314b55523947594d6d3547666b45764e6a58 integ-alg sha1-96
+ipsec sa add 20 spi 1000 esp crypto-key 49517065716d6235726c734a4372466c crypto-alg aes-cbc-128 integ-key 307439636a5542735133595835546f68534e4f64 integ-alg sha1-96
+
+Create IPSec-GRE tunnel:
+create ipsec gre tunnel src 192.168.1.1 dst 192.168.1.2 local-sa 10 remote-sa 20
+
+Set interfaces state:
+set int state GigabitEthernet0/8/0 up
+set int state GigabitEthernet0/9/0 up
+set int state ipsec-gre0 up
+
+Bridge physical interface with IPSec-GRE tunnel interface:
+set interface l2 bridge GigabitEthernet0/9/0 1
+set interface l2 bridge ipsec-gre0 1
+
+
+### Operational data
+
+L2-GRE over IPsec support the following CLI show command:
+    show ipsec gre tunnel
+
+L2-GRE over IPsec support the following API dump command:
+    ipsec_gre_tunnel_dump [sw_if_index <nn>]
+
+sw_if_index: software interface index of the IPSec-GRE tunnel interface
+
diff --git a/src/vnet/ipsec-gre/node.c b/src/vnet/ipsec-gre/node.c
new file mode 100644
index 00000000..d20f248a
--- /dev/null
+++ b/src/vnet/ipsec-gre/node.c
@@ -0,0 +1,433 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief L2-GRE over IPSec packet processing.
+ *
+ * Removes GRE header from the packet and sends it to the l2-input node.
+*/
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ipsec-gre/ipsec_gre.h>
+#include <vppinfra/sparse_vec.h>
+
+#define foreach_ipsec_gre_input_next		\
+_(PUNT, "error-punt")                           \
+_(DROP, "error-drop")                           \
+_(L2_INPUT, "l2-input")
+
+typedef enum {
+#define _(s,n) IPSEC_GRE_INPUT_NEXT_##s,
+  foreach_ipsec_gre_input_next
+#undef _
+  IPSEC_GRE_INPUT_N_NEXT,
+} ipsec_gre_input_next_t;
+
+typedef struct {
+  u32 tunnel_id;
+  u32 length;
+  ip4_address_t src;
+  ip4_address_t dst;
+} ipsec_gre_rx_trace_t;
+
+u8 * format_ipsec_gre_rx_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ipsec_gre_rx_trace_t * t = va_arg (*args, ipsec_gre_rx_trace_t *);
+
+  s = format (s, "GRE: tunnel %d len %d src %U dst %U",
+              t->tunnel_id, clib_net_to_host_u16(t->length),
+              format_ip4_address, &t->src.as_u8,
+              format_ip4_address, &t->dst.as_u8);
+  return s;
+}
+
+/**
+ * @brief L2-GRE over IPSec input node.
+ * @node ipsec-gre-input
+ *
+ * This node remove GRE header.
+ *
+ * @param vm         vlib_main_t corresponding to the current thread.
+ * @param node       vlib_node_runtime_t data for this node.
+ * @param from_frame vlib_frame_t whose contents should be dispatched.
+ *
+ * @par Graph mechanics: buffer metadata, next index usage
+ *
+ * <em>Uses:</em>
+ * - <code>ip->src_address</code> and <code>ip->dst_address</code>
+ *     - Match tunnel by source and destination addresses in GRE IP header.
+ *
+ * <em>Sets:</em>
+ * - <code>vnet_buffer(b)->gre.src</code>
+ *     - Save tunnel source IPv4 address.
+ * - <code>vnet_buffer(b)->gre.dst</code>
+ *     - Save tunnel destination IPv4 address.
+ * - <code>vnet_buffer(b)->sw_if_index[VLIB_RX]</code>
+ *     - Set input sw_if_index to IPSec-GRE tunnel for learning.
+ *
+ * <em>Next Index:</em>
+ * - Dispatches the packet to the l2-input node.
+*/
+static uword
+ipsec_gre_input (vlib_main_t * vm,
+                 vlib_node_runtime_t * node,
+                 vlib_frame_t * from_frame)
+{
+  ipsec_gre_main_t * igm = &ipsec_gre_main;
+  u32 n_left_from, next_index, * from, * to_next;
+  u64 cached_tunnel_key = (u64) ~0;
+  u32 cached_tunnel_sw_if_index = 0, tunnel_sw_if_index;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t * b0, * b1;
+	  gre_header_t * h0, * h1;
+          u16 version0, version1, protocol0, protocol1;
+          int verr0, verr1;
+	  u32 next0, next1;
+          ip4_header_t *ip0, *ip1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * p2, * p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, sizeof (h0[0]), LOAD);
+	    CLIB_PREFETCH (p3->data, sizeof (h1[0]), LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+          /* ip4_local hands us the ip header, not the gre header */
+          ip0 = vlib_buffer_get_current (b0);
+          ip1 = vlib_buffer_get_current (b1);
+
+          /* Save src + dst ip4 address */
+          vnet_buffer(b0)->gre.src = ip0->src_address.as_u32;
+          vnet_buffer(b0)->gre.dst = ip0->dst_address.as_u32;
+          vnet_buffer(b1)->gre.src = ip1->src_address.as_u32;
+          vnet_buffer(b1)->gre.dst = ip1->dst_address.as_u32;
+
+          vlib_buffer_advance (b0, sizeof (*ip0));
+          vlib_buffer_advance (b1, sizeof (*ip1));
+
+	  h0 = vlib_buffer_get_current (b0);
+	  h1 = vlib_buffer_get_current (b1);
+
+          protocol0 = clib_net_to_host_u16 (h0->protocol);
+          protocol1 = clib_net_to_host_u16 (h1->protocol);
+          if (PREDICT_TRUE(protocol0 == 0x0001))
+            {
+              next0 = IPSEC_GRE_INPUT_NEXT_L2_INPUT;
+              b0->error = node->errors[IPSEC_GRE_ERROR_NONE];
+            }
+          else
+            {
+              clib_warning("unknown GRE protocol: %d", protocol0);
+              b0->error = node->errors[IPSEC_GRE_ERROR_UNKNOWN_PROTOCOL];
+              next0 = IPSEC_GRE_INPUT_NEXT_DROP;
+            }
+          if (PREDICT_TRUE(protocol1 == 0x0001))
+            {
+              next1 = IPSEC_GRE_INPUT_NEXT_L2_INPUT;
+              b1->error = node->errors[IPSEC_GRE_ERROR_NONE];
+            }
+          else
+            {
+              clib_warning("unknown GRE protocol: %d", protocol1);
+              b1->error = node->errors[IPSEC_GRE_ERROR_UNKNOWN_PROTOCOL];
+              next1 = IPSEC_GRE_INPUT_NEXT_DROP;
+            }
+
+          version0 = clib_net_to_host_u16 (h0->flags_and_version);
+          verr0 =  version0 & GRE_VERSION_MASK;
+          version1 = clib_net_to_host_u16 (h1->flags_and_version);
+          verr1 =  version1 & GRE_VERSION_MASK;
+
+          b0->error = verr0 ? node->errors[IPSEC_GRE_ERROR_UNSUPPORTED_VERSION]
+              : b0->error;
+          next0 = verr0 ? IPSEC_GRE_INPUT_NEXT_DROP : next0;
+          b1->error = verr1 ? node->errors[IPSEC_GRE_ERROR_UNSUPPORTED_VERSION]
+              : b1->error;
+          next1 = verr1 ? IPSEC_GRE_INPUT_NEXT_DROP : next1;
+
+          /* For L2 payload set input sw_if_index to GRE tunnel for learning */
+          if (PREDICT_TRUE(next0 == IPSEC_GRE_INPUT_NEXT_L2_INPUT))
+            {
+              u64 key = ((u64)(vnet_buffer(b0)->gre.dst) << 32) |
+                         (u64)(vnet_buffer(b0)->gre.src);
+
+              if (cached_tunnel_key != key)
+                {
+                  vnet_hw_interface_t * hi;
+                  ipsec_gre_tunnel_t * t;
+                  uword * p;
+
+                  p = hash_get (igm->tunnel_by_key, key);
+                  if (!p)
+                    {
+                      next0 = IPSEC_GRE_INPUT_NEXT_DROP;
+                      b0->error = node->errors[IPSEC_GRE_ERROR_NO_SUCH_TUNNEL];
+                      goto drop0;
+                    }
+                  t = pool_elt_at_index (igm->tunnels, p[0]);
+                  hi = vnet_get_hw_interface (igm->vnet_main,
+                            t->hw_if_index);
+                  tunnel_sw_if_index = hi->sw_if_index;
+                  cached_tunnel_sw_if_index = tunnel_sw_if_index;
+                }
+              else
+                {
+                  tunnel_sw_if_index = cached_tunnel_sw_if_index;
+                }
+              vnet_buffer(b0)->sw_if_index[VLIB_RX] = tunnel_sw_if_index;
+            }
+
+drop0:
+          /* For L2 payload set input sw_if_index to GRE tunnel for learning */
+          if (PREDICT_TRUE(next1 == IPSEC_GRE_INPUT_NEXT_L2_INPUT))
+            {
+              u64 key = ((u64)(vnet_buffer(b1)->gre.dst) << 32) |
+                         (u64)(vnet_buffer(b1)->gre.src);
+
+              if (cached_tunnel_key != key)
+                {
+                  vnet_hw_interface_t * hi;
+                  ipsec_gre_tunnel_t * t;
+                  uword * p;
+
+                  p = hash_get (igm->tunnel_by_key, key);
+                  if (!p)
+                    {
+                      next1 = IPSEC_GRE_INPUT_NEXT_DROP;
+                      b1->error = node->errors[IPSEC_GRE_ERROR_NO_SUCH_TUNNEL];
+                      goto drop1;
+                    }
+                  t = pool_elt_at_index (igm->tunnels, p[0]);
+                  hi = vnet_get_hw_interface (igm->vnet_main,
+                            t->hw_if_index);
+                  tunnel_sw_if_index = hi->sw_if_index;
+                  cached_tunnel_sw_if_index = tunnel_sw_if_index;
+                }
+              else
+                {
+                  tunnel_sw_if_index = cached_tunnel_sw_if_index;
+                }
+              vnet_buffer(b1)->sw_if_index[VLIB_RX] = tunnel_sw_if_index;
+            }
+
+drop1:
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+            {
+              ipsec_gre_rx_trace_t *tr = vlib_add_trace (vm, node,
+                                                   b0, sizeof (*tr));
+              tr->tunnel_id = ~0;
+              tr->length = ip0->length;
+              tr->src.as_u32 = ip0->src_address.as_u32;
+              tr->dst.as_u32 = ip0->dst_address.as_u32;
+            }
+
+          if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
+            {
+              ipsec_gre_rx_trace_t *tr = vlib_add_trace (vm, node,
+                                                   b1, sizeof (*tr));
+              tr->tunnel_id = ~0;
+              tr->length = ip1->length;
+              tr->src.as_u32 = ip1->src_address.as_u32;
+              tr->dst.as_u32 = ip1->dst_address.as_u32;
+            }
+
+          vlib_buffer_advance (b0, sizeof (*h0));
+          vlib_buffer_advance (b1, sizeof (*h1));
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t * b0;
+	  gre_header_t * h0;
+          ip4_header_t * ip0;
+          u16 version0, protocol0;
+          int verr0;
+	  u32 next0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+          ip0 = vlib_buffer_get_current (b0);
+
+          vnet_buffer(b0)->gre.src = ip0->src_address.as_u32;
+          vnet_buffer(b0)->gre.dst = ip0->dst_address.as_u32;
+
+          vlib_buffer_advance (b0, sizeof (*ip0));
+
+	  h0 = vlib_buffer_get_current (b0);
+
+          protocol0 = clib_net_to_host_u16 (h0->protocol);
+          if (PREDICT_TRUE(protocol0 == 0x0001))
+            {
+              next0 = IPSEC_GRE_INPUT_NEXT_L2_INPUT;
+              b0->error = node->errors[IPSEC_GRE_ERROR_NONE];
+            }
+          else
+            {
+              clib_warning("unknown GRE protocol: %d", protocol0);
+              b0->error = node->errors[IPSEC_GRE_ERROR_UNKNOWN_PROTOCOL];
+              next0 = IPSEC_GRE_INPUT_NEXT_DROP;
+            }
+
+          version0 = clib_net_to_host_u16 (h0->flags_and_version);
+          verr0 =  version0 & GRE_VERSION_MASK;
+          b0->error = verr0 ? node->errors[IPSEC_GRE_ERROR_UNSUPPORTED_VERSION]
+              : b0->error;
+          next0 = verr0 ? IPSEC_GRE_INPUT_NEXT_DROP : next0;
+
+          /* For L2 payload set input sw_if_index to GRE tunnel for learning */
+          if (PREDICT_FALSE(next0 == IPSEC_GRE_INPUT_NEXT_L2_INPUT))
+            {
+              u64 key = ((u64)(vnet_buffer(b0)->gre.dst) << 32) |
+                         (u64)(vnet_buffer(b0)->gre.src);
+
+              if (cached_tunnel_key != key)
+                {
+                  vnet_hw_interface_t * hi;
+                  ipsec_gre_tunnel_t * t;
+                  uword * p;
+
+                  p = hash_get (igm->tunnel_by_key, key);
+                  if (!p)
+                    {
+                      next0 = IPSEC_GRE_INPUT_NEXT_DROP;
+                      b0->error = node->errors[IPSEC_GRE_ERROR_NO_SUCH_TUNNEL];
+                      goto drop;
+                    }
+                  t = pool_elt_at_index (igm->tunnels, p[0]);
+                  hi = vnet_get_hw_interface (igm->vnet_main,
+                            t->hw_if_index);
+                  tunnel_sw_if_index = hi->sw_if_index;
+                  cached_tunnel_sw_if_index = tunnel_sw_if_index;
+                }
+              else
+                {
+                  tunnel_sw_if_index = cached_tunnel_sw_if_index;
+                }
+              vnet_buffer(b0)->sw_if_index[VLIB_RX] = tunnel_sw_if_index;
+            }
+
+drop:
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+            {
+              ipsec_gre_rx_trace_t *tr = vlib_add_trace (vm, node,
+                                                   b0, sizeof (*tr));
+              tr->tunnel_id = ~0;
+              tr->length = ip0->length;
+              tr->src.as_u32 = ip0->src_address.as_u32;
+              tr->dst.as_u32 = ip0->dst_address.as_u32;
+            }
+
+          vlib_buffer_advance (b0, sizeof (*h0));
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, ipsec_gre_input_node.index,
+                               IPSEC_GRE_ERROR_PKTS_DECAP, from_frame->n_vectors);
+  return from_frame->n_vectors;
+}
+
+static char * ipsec_gre_error_strings[] = {
+#define ipsec_gre_error(n,s) s,
+#include "error.def"
+#undef ipsec_gre_error
+};
+
+VLIB_REGISTER_NODE (ipsec_gre_input_node) = {
+  .function = ipsec_gre_input,
+  .name = "ipsec-gre-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .n_errors = IPSEC_GRE_N_ERROR,
+  .error_strings = ipsec_gre_error_strings,
+
+  .n_next_nodes = IPSEC_GRE_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [IPSEC_GRE_INPUT_NEXT_##s] = n,
+    foreach_ipsec_gre_input_next
+#undef _
+  },
+
+  .format_trace = format_ipsec_gre_rx_trace,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ipsec_gre_input_node, ipsec_gre_input)
+
+static clib_error_t * ipsec_gre_input_init (vlib_main_t * vm)
+{
+  {
+    clib_error_t * error;
+    error = vlib_call_init_function (vm, ipsec_gre_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ipsec_gre_input_init);
diff --git a/src/vnet/ipsec/esp.h b/src/vnet/ipsec/esp.h
new file mode 100644
index 00000000..50cac806
--- /dev/null
+++ b/src/vnet/ipsec/esp.h
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __ESP_H__
+#define __ESP_H__
+
+#include <openssl/hmac.h>
+#include <openssl/rand.h>
+#include <openssl/evp.h>
+
+typedef struct
+{
+  u32 spi;
+  u32 seq;
+  u8 data[0];
+} esp_header_t;
+
+typedef struct
+{
+  u8 pad_length;
+  u8 next_header;
+} esp_footer_t;
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  ip4_header_t ip4;
+  esp_header_t esp;
+}) ip4_and_esp_header_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  ip6_header_t ip6;
+  esp_header_t esp;
+}) ip6_and_esp_header_t;
+/* *INDENT-ON* */
+
+typedef struct
+{
+  const EVP_CIPHER *type;
+} esp_crypto_alg_t;
+
+typedef struct
+{
+  const EVP_MD *md;
+  u8 trunc_size;
+} esp_integ_alg_t;
+
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  EVP_CIPHER_CTX encrypt_ctx;
+    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
+  EVP_CIPHER_CTX decrypt_ctx;
+    CLIB_CACHE_LINE_ALIGN_MARK (cacheline2);
+  HMAC_CTX hmac_ctx;
+  ipsec_crypto_alg_t last_encrypt_alg;
+  ipsec_crypto_alg_t last_decrypt_alg;
+  ipsec_integ_alg_t last_integ_alg;
+} esp_main_per_thread_data_t;
+
+typedef struct
+{
+  esp_crypto_alg_t *esp_crypto_algs;
+  esp_integ_alg_t *esp_integ_algs;
+  esp_main_per_thread_data_t *per_thread_data;
+} esp_main_t;
+
+esp_main_t esp_main;
+
+#define ESP_WINDOW_SIZE		(64)
+#define ESP_SEQ_MAX 		(4294967295UL)
+
+
+always_inline int
+esp_replay_check (ipsec_sa_t * sa, u32 seq)
+{
+  u32 diff;
+
+  if (PREDICT_TRUE (seq > sa->last_seq))
+    return 0;
+
+  diff = sa->last_seq - seq;
+
+  if (ESP_WINDOW_SIZE > diff)
+    return (sa->replay_window & (1ULL << diff)) ? 1 : 0;
+  else
+    return 1;
+
+  return 0;
+}
+
+always_inline int
+esp_replay_check_esn (ipsec_sa_t * sa, u32 seq)
+{
+  u32 tl = sa->last_seq;
+  u32 th = sa->last_seq_hi;
+  u32 diff = tl - seq;
+
+  if (PREDICT_TRUE (tl >= (ESP_WINDOW_SIZE - 1)))
+    {
+      if (seq >= (tl - ESP_WINDOW_SIZE + 1))
+	{
+	  sa->seq_hi = th;
+	  if (seq <= tl)
+	    return (sa->replay_window & (1ULL << diff)) ? 1 : 0;
+	  else
+	    return 0;
+	}
+      else
+	{
+	  sa->seq_hi = th + 1;
+	  return 0;
+	}
+    }
+  else
+    {
+      if (seq >= (tl - ESP_WINDOW_SIZE + 1))
+	{
+	  sa->seq_hi = th - 1;
+	  return (sa->replay_window & (1ULL << diff)) ? 1 : 0;
+	}
+      else
+	{
+	  sa->seq_hi = th;
+	  if (seq <= tl)
+	    return (sa->replay_window & (1ULL << diff)) ? 1 : 0;
+	  else
+	    return 0;
+	}
+    }
+
+  return 0;
+}
+
+/* TODO seq increment should be atomic to be accessed by multiple workers */
+always_inline void
+esp_replay_advance (ipsec_sa_t * sa, u32 seq)
+{
+  u32 pos;
+
+  if (seq > sa->last_seq)
+    {
+      pos = seq - sa->last_seq;
+      if (pos < ESP_WINDOW_SIZE)
+	sa->replay_window = ((sa->replay_window) << pos) | 1;
+      else
+	sa->replay_window = 1;
+      sa->last_seq = seq;
+    }
+  else
+    {
+      pos = sa->last_seq - seq;
+      sa->replay_window |= (1ULL << pos);
+    }
+}
+
+always_inline void
+esp_replay_advance_esn (ipsec_sa_t * sa, u32 seq)
+{
+  int wrap = sa->seq_hi - sa->last_seq_hi;
+  u32 pos;
+
+  if (wrap == 0 && seq > sa->last_seq)
+    {
+      pos = seq - sa->last_seq;
+      if (pos < ESP_WINDOW_SIZE)
+	sa->replay_window = ((sa->replay_window) << pos) | 1;
+      else
+	sa->replay_window = 1;
+      sa->last_seq = seq;
+    }
+  else if (wrap > 0)
+    {
+      pos = ~seq + sa->last_seq + 1;
+      if (pos < ESP_WINDOW_SIZE)
+	sa->replay_window = ((sa->replay_window) << pos) | 1;
+      else
+	sa->replay_window = 1;
+      sa->last_seq = seq;
+      sa->last_seq_hi = sa->seq_hi;
+    }
+  else if (wrap < 0)
+    {
+      pos = ~seq + sa->last_seq + 1;
+      sa->replay_window |= (1ULL << pos);
+    }
+  else
+    {
+      pos = sa->last_seq - seq;
+      sa->replay_window |= (1ULL << pos);
+    }
+}
+
+always_inline int
+esp_seq_advance (ipsec_sa_t * sa)
+{
+  if (PREDICT_TRUE (sa->use_esn))
+    {
+      if (PREDICT_FALSE (sa->seq == ESP_SEQ_MAX))
+	{
+	  if (PREDICT_FALSE
+	      (sa->use_anti_replay && sa->seq_hi == ESP_SEQ_MAX))
+	    return 1;
+	  sa->seq_hi++;
+	}
+      sa->seq++;
+    }
+  else
+    {
+      if (PREDICT_FALSE (sa->use_anti_replay && sa->seq == ESP_SEQ_MAX))
+	return 1;
+      sa->seq++;
+    }
+
+  return 0;
+}
+
+always_inline void
+esp_init ()
+{
+  esp_main_t *em = &esp_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+
+  memset (em, 0, sizeof (em[0]));
+
+  vec_validate (em->esp_crypto_algs, IPSEC_CRYPTO_N_ALG - 1);
+  em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_CBC_128].type = EVP_aes_128_cbc ();
+  em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_CBC_192].type = EVP_aes_192_cbc ();
+  em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_CBC_256].type = EVP_aes_256_cbc ();
+
+  vec_validate (em->esp_integ_algs, IPSEC_INTEG_N_ALG - 1);
+  esp_integ_alg_t *i;
+
+  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA1_96];
+  i->md = EVP_sha1 ();
+  i->trunc_size = 12;
+
+  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_256_96];
+  i->md = EVP_sha256 ();
+  i->trunc_size = 12;
+
+  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_256_128];
+  i->md = EVP_sha256 ();
+  i->trunc_size = 16;
+
+  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_384_192];
+  i->md = EVP_sha384 ();
+  i->trunc_size = 24;
+
+  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_512_256];
+  i->md = EVP_sha512 ();
+  i->trunc_size = 32;
+
+  vec_validate_aligned (em->per_thread_data, tm->n_vlib_mains - 1,
+			CLIB_CACHE_LINE_BYTES);
+  int thread_id;
+
+  for (thread_id = 0; thread_id < tm->n_vlib_mains - 1; thread_id++)
+    {
+      EVP_CIPHER_CTX_init (&(em->per_thread_data[thread_id].encrypt_ctx));
+      EVP_CIPHER_CTX_init (&(em->per_thread_data[thread_id].decrypt_ctx));
+      HMAC_CTX_init (&(em->per_thread_data[thread_id].hmac_ctx));
+    }
+}
+
+always_inline unsigned int
+hmac_calc (ipsec_integ_alg_t alg,
+	   u8 * key,
+	   int key_len,
+	   u8 * data, int data_len, u8 * signature, u8 use_esn, u32 seq_hi)
+{
+  esp_main_t *em = &esp_main;
+  u32 cpu_index = os_get_cpu_number ();
+  HMAC_CTX *ctx = &(em->per_thread_data[cpu_index].hmac_ctx);
+  const EVP_MD *md = NULL;
+  unsigned int len;
+
+  ASSERT (alg < IPSEC_INTEG_N_ALG);
+
+  if (PREDICT_FALSE (em->esp_integ_algs[alg].md == 0))
+    return 0;
+
+  if (PREDICT_FALSE (alg != em->per_thread_data[cpu_index].last_integ_alg))
+    {
+      md = em->esp_integ_algs[alg].md;
+      em->per_thread_data[cpu_index].last_integ_alg = alg;
+    }
+
+  HMAC_Init (ctx, key, key_len, md);
+
+  HMAC_Update (ctx, data, data_len);
+
+  if (PREDICT_TRUE (use_esn))
+    HMAC_Update (ctx, (u8 *) & seq_hi, sizeof (seq_hi));
+  HMAC_Final (ctx, signature, &len);
+
+  return em->esp_integ_algs[alg].trunc_size;
+}
+
+#endif /* __ESP_H__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/esp_decrypt.c b/src/vnet/ipsec/esp_decrypt.c
new file mode 100644
index 00000000..e69cd851
--- /dev/null
+++ b/src/vnet/ipsec/esp_decrypt.c
@@ -0,0 +1,430 @@
+/*
+ * esp_decrypt.c : IPSec ESP decrypt node
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+
+#include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/esp.h>
+
+#define foreach_esp_decrypt_next                \
+_(DROP, "error-drop")                           \
+_(IP4_INPUT, "ip4-input")                       \
+_(IP6_INPUT, "ip6-input")                       \
+_(IPSEC_GRE_INPUT, "ipsec-gre-input")
+
+#define _(v, s) ESP_DECRYPT_NEXT_##v,
+typedef enum
+{
+  foreach_esp_decrypt_next
+#undef _
+    ESP_DECRYPT_N_NEXT,
+} esp_decrypt_next_t;
+
+
+#define foreach_esp_decrypt_error                   \
+ _(RX_PKTS, "ESP pkts received")                    \
+ _(NO_BUFFER, "No buffer (packed dropped)")         \
+ _(DECRYPTION_FAILED, "ESP decryption failed")      \
+ _(INTEG_ERROR, "Integrity check failed")           \
+ _(REPLAY, "SA replayed packet")                    \
+ _(NOT_IP, "Not IP packet (dropped)")
+
+
+typedef enum
+{
+#define _(sym,str) ESP_DECRYPT_ERROR_##sym,
+  foreach_esp_decrypt_error
+#undef _
+    ESP_DECRYPT_N_ERROR,
+} esp_decrypt_error_t;
+
+static char *esp_decrypt_error_strings[] = {
+#define _(sym,string) string,
+  foreach_esp_decrypt_error
+#undef _
+};
+
+typedef struct
+{
+  ipsec_crypto_alg_t crypto_alg;
+  ipsec_integ_alg_t integ_alg;
+} esp_decrypt_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_esp_decrypt_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  esp_decrypt_trace_t *t = va_arg (*args, esp_decrypt_trace_t *);
+
+  s = format (s, "esp: crypto %U integrity %U",
+	      format_ipsec_crypto_alg, t->crypto_alg,
+	      format_ipsec_integ_alg, t->integ_alg);
+  return s;
+}
+
+always_inline void
+esp_decrypt_aes_cbc (ipsec_crypto_alg_t alg,
+		     u8 * in, u8 * out, size_t in_len, u8 * key, u8 * iv)
+{
+  esp_main_t *em = &esp_main;
+  u32 cpu_index = os_get_cpu_number ();
+  EVP_CIPHER_CTX *ctx = &(em->per_thread_data[cpu_index].decrypt_ctx);
+  const EVP_CIPHER *cipher = NULL;
+  int out_len;
+
+  ASSERT (alg < IPSEC_CRYPTO_N_ALG);
+
+  if (PREDICT_FALSE (em->esp_crypto_algs[alg].type == 0))
+    return;
+
+  if (PREDICT_FALSE (alg != em->per_thread_data[cpu_index].last_decrypt_alg))
+    {
+      cipher = em->esp_crypto_algs[alg].type;
+      em->per_thread_data[cpu_index].last_decrypt_alg = alg;
+    }
+
+  EVP_DecryptInit_ex (ctx, cipher, NULL, key, iv);
+
+  EVP_DecryptUpdate (ctx, out, &out_len, in, in_len);
+  EVP_DecryptFinal_ex (ctx, out + out_len, &out_len);
+}
+
+static uword
+esp_decrypt_node_fn (vlib_main_t * vm,
+		     vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  u32 n_left_from, *from, next_index, *to_next;
+  ipsec_main_t *im = &ipsec_main;
+  esp_main_t *em = &esp_main;
+  u32 *recycle = 0;
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+  u32 cpu_index = os_get_cpu_number ();
+
+  ipsec_alloc_empty_buffers (vm, im);
+
+  u32 *empty_buffers = im->empty_buffers[cpu_index];
+
+  if (PREDICT_FALSE (vec_len (empty_buffers) < n_left_from))
+    {
+      vlib_node_increment_counter (vm, esp_decrypt_node.index,
+				   ESP_DECRYPT_ERROR_NO_BUFFER, n_left_from);
+      goto free_buffers_and_exit;
+    }
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 i_bi0, o_bi0 = (u32) ~ 0, next0;
+	  vlib_buffer_t *i_b0;
+	  vlib_buffer_t *o_b0 = 0;
+	  esp_header_t *esp0;
+	  ipsec_sa_t *sa0;
+	  u32 sa_index0 = ~0;
+	  u32 seq;
+	  ip4_header_t *ih4 = 0, *oh4 = 0;
+	  ip6_header_t *ih6 = 0, *oh6 = 0;
+	  u8 tunnel_mode = 1;
+	  u8 transport_ip6 = 0;
+
+
+	  i_bi0 = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  next0 = ESP_DECRYPT_NEXT_DROP;
+
+	  i_b0 = vlib_get_buffer (vm, i_bi0);
+	  esp0 = vlib_buffer_get_current (i_b0);
+
+	  sa_index0 = vnet_buffer (i_b0)->ipsec.sad_index;
+	  sa0 = pool_elt_at_index (im->sad, sa_index0);
+
+	  seq = clib_host_to_net_u32 (esp0->seq);
+
+	  /* anti-replay check */
+	  if (sa0->use_anti_replay)
+	    {
+	      int rv = 0;
+
+	      if (PREDICT_TRUE (sa0->use_esn))
+		rv = esp_replay_check_esn (sa0, seq);
+	      else
+		rv = esp_replay_check (sa0, seq);
+
+	      if (PREDICT_FALSE (rv))
+		{
+		  clib_warning ("anti-replay SPI %u seq %u", sa0->spi, seq);
+		  vlib_node_increment_counter (vm, esp_decrypt_node.index,
+					       ESP_DECRYPT_ERROR_REPLAY, 1);
+		  o_bi0 = i_bi0;
+		  to_next[0] = o_bi0;
+		  to_next += 1;
+		  goto trace;
+		}
+	    }
+
+	  if (PREDICT_TRUE (sa0->integ_alg != IPSEC_INTEG_ALG_NONE))
+	    {
+	      u8 sig[64];
+	      int icv_size = em->esp_integ_algs[sa0->integ_alg].trunc_size;
+	      memset (sig, 0, sizeof (sig));
+	      u8 *icv =
+		vlib_buffer_get_current (i_b0) + i_b0->current_length -
+		icv_size;
+	      i_b0->current_length -= icv_size;
+
+	      hmac_calc (sa0->integ_alg, sa0->integ_key, sa0->integ_key_len,
+			 (u8 *) esp0, i_b0->current_length, sig, sa0->use_esn,
+			 sa0->seq_hi);
+
+	      if (PREDICT_FALSE (memcmp (icv, sig, icv_size)))
+		{
+		  vlib_node_increment_counter (vm, esp_decrypt_node.index,
+					       ESP_DECRYPT_ERROR_INTEG_ERROR,
+					       1);
+		  o_bi0 = i_bi0;
+		  to_next[0] = o_bi0;
+		  to_next += 1;
+		  goto trace;
+		}
+	    }
+
+	  if (PREDICT_TRUE (sa0->use_anti_replay))
+	    {
+	      if (PREDICT_TRUE (sa0->use_esn))
+		esp_replay_advance_esn (sa0, seq);
+	      else
+		esp_replay_advance (sa0, seq);
+	    }
+
+	  /* grab free buffer */
+	  uword last_empty_buffer = vec_len (empty_buffers) - 1;
+	  o_bi0 = empty_buffers[last_empty_buffer];
+	  to_next[0] = o_bi0;
+	  to_next += 1;
+	  o_b0 = vlib_get_buffer (vm, o_bi0);
+	  vlib_prefetch_buffer_with_index (vm,
+					   empty_buffers[last_empty_buffer -
+							 1], STORE);
+	  _vec_len (empty_buffers) = last_empty_buffer;
+
+	  /* add old buffer to the recycle list */
+	  vec_add1 (recycle, i_bi0);
+
+	  if (sa0->crypto_alg >= IPSEC_CRYPTO_ALG_AES_CBC_128 &&
+	      sa0->crypto_alg <= IPSEC_CRYPTO_ALG_AES_CBC_256)
+	    {
+	      const int BLOCK_SIZE = 16;
+	      const int IV_SIZE = 16;
+	      esp_footer_t *f0;
+	      u8 ip_hdr_size = 0;
+
+	      int blocks =
+		(i_b0->current_length - sizeof (esp_header_t) -
+		 IV_SIZE) / BLOCK_SIZE;
+
+	      o_b0->current_data = sizeof (ethernet_header_t);
+
+	      /* transport mode */
+	      if (PREDICT_FALSE (!sa0->is_tunnel && !sa0->is_tunnel_ip6))
+		{
+		  tunnel_mode = 0;
+		  ih4 =
+		    (ip4_header_t *) (i_b0->data +
+				      sizeof (ethernet_header_t));
+		  if (PREDICT_TRUE
+		      ((ih4->ip_version_and_header_length & 0xF0) != 0x40))
+		    {
+		      if (PREDICT_TRUE
+			  ((ih4->ip_version_and_header_length & 0xF0) ==
+			   0x60))
+			{
+			  transport_ip6 = 1;
+			  ip_hdr_size = sizeof (ip6_header_t);
+			  ih6 =
+			    (ip6_header_t *) (i_b0->data +
+					      sizeof (ethernet_header_t));
+			  oh6 = vlib_buffer_get_current (o_b0);
+			}
+		      else
+			{
+			  vlib_node_increment_counter (vm,
+						       esp_decrypt_node.index,
+						       ESP_DECRYPT_ERROR_NOT_IP,
+						       1);
+			  o_b0 = 0;
+			  goto trace;
+			}
+		    }
+		  else
+		    {
+		      oh4 = vlib_buffer_get_current (o_b0);
+		      ip_hdr_size = sizeof (ip4_header_t);
+		    }
+		}
+
+	      esp_decrypt_aes_cbc (sa0->crypto_alg,
+				   esp0->data + IV_SIZE,
+				   (u8 *) vlib_buffer_get_current (o_b0) +
+				   ip_hdr_size, BLOCK_SIZE * blocks,
+				   sa0->crypto_key, esp0->data);
+
+	      o_b0->current_length = (blocks * 16) - 2 + ip_hdr_size;
+	      o_b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
+	      f0 =
+		(esp_footer_t *) ((u8 *) vlib_buffer_get_current (o_b0) +
+				  o_b0->current_length);
+	      o_b0->current_length -= f0->pad_length;
+
+	      /* tunnel mode */
+	      if (PREDICT_TRUE (tunnel_mode))
+		{
+		  if (PREDICT_TRUE (f0->next_header == IP_PROTOCOL_IP_IN_IP))
+		    {
+		      next0 = ESP_DECRYPT_NEXT_IP4_INPUT;
+		      oh4 = vlib_buffer_get_current (o_b0);
+		    }
+		  else if (f0->next_header == IP_PROTOCOL_IPV6)
+		    next0 = ESP_DECRYPT_NEXT_IP6_INPUT;
+		  else
+		    {
+		      clib_warning ("next header: 0x%x", f0->next_header);
+		      vlib_node_increment_counter (vm, esp_decrypt_node.index,
+						   ESP_DECRYPT_ERROR_DECRYPTION_FAILED,
+						   1);
+		      o_b0 = 0;
+		      goto trace;
+		    }
+		}
+	      /* transport mode */
+	      else
+		{
+		  if (PREDICT_FALSE (transport_ip6))
+		    {
+		      next0 = ESP_DECRYPT_NEXT_IP6_INPUT;
+		      oh6->ip_version_traffic_class_and_flow_label =
+			ih6->ip_version_traffic_class_and_flow_label;
+		      oh6->protocol = f0->next_header;
+		      oh6->hop_limit = ih6->hop_limit;
+		      oh6->src_address.as_u64[0] = ih6->src_address.as_u64[0];
+		      oh6->src_address.as_u64[1] = ih6->src_address.as_u64[1];
+		      oh6->dst_address.as_u64[0] = ih6->dst_address.as_u64[0];
+		      oh6->dst_address.as_u64[1] = ih6->dst_address.as_u64[1];
+		      oh6->payload_length =
+			clib_host_to_net_u16 (vlib_buffer_length_in_chain
+					      (vm,
+					       o_b0) - sizeof (ip6_header_t));
+		    }
+		  else
+		    {
+		      next0 = ESP_DECRYPT_NEXT_IP4_INPUT;
+		      oh4->ip_version_and_header_length = 0x45;
+		      oh4->tos = ih4->tos;
+		      oh4->fragment_id = 0;
+		      oh4->flags_and_fragment_offset = 0;
+		      oh4->ttl = ih4->ttl;
+		      oh4->protocol = f0->next_header;
+		      oh4->src_address.as_u32 = ih4->src_address.as_u32;
+		      oh4->dst_address.as_u32 = ih4->dst_address.as_u32;
+		      oh4->length =
+			clib_host_to_net_u16 (vlib_buffer_length_in_chain
+					      (vm, o_b0));
+		      oh4->checksum = ip4_header_checksum (oh4);
+		    }
+		}
+
+	      /* for IPSec-GRE tunnel next node is ipsec-gre-input */
+	      if (PREDICT_FALSE
+		  ((vnet_buffer (i_b0)->ipsec.flags) &
+		   IPSEC_FLAG_IPSEC_GRE_TUNNEL))
+		next0 = ESP_DECRYPT_NEXT_IPSEC_GRE_INPUT;
+
+	      vnet_buffer (o_b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+	    }
+
+	trace:
+	  if (PREDICT_FALSE (i_b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      if (o_b0)
+		{
+		  o_b0->flags |= VLIB_BUFFER_IS_TRACED;
+		  o_b0->trace_index = i_b0->trace_index;
+		  esp_decrypt_trace_t *tr =
+		    vlib_add_trace (vm, node, o_b0, sizeof (*tr));
+		  tr->crypto_alg = sa0->crypto_alg;
+		  tr->integ_alg = sa0->integ_alg;
+		}
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, o_bi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, esp_decrypt_node.index,
+			       ESP_DECRYPT_ERROR_RX_PKTS,
+			       from_frame->n_vectors);
+
+free_buffers_and_exit:
+  if (recycle)
+    vlib_buffer_free (vm, recycle, vec_len (recycle));
+  vec_free (recycle);
+  return from_frame->n_vectors;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (esp_decrypt_node) = {
+  .function = esp_decrypt_node_fn,
+  .name = "esp-decrypt",
+  .vector_size = sizeof (u32),
+  .format_trace = format_esp_decrypt_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(esp_decrypt_error_strings),
+  .error_strings = esp_decrypt_error_strings,
+
+  .n_next_nodes = ESP_DECRYPT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [ESP_DECRYPT_NEXT_##s] = n,
+    foreach_esp_decrypt_next
+#undef _
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (esp_decrypt_node, esp_decrypt_node_fn)
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/esp_encrypt.c b/src/vnet/ipsec/esp_encrypt.c
new file mode 100644
index 00000000..7b7f9b9c
--- /dev/null
+++ b/src/vnet/ipsec/esp_encrypt.c
@@ -0,0 +1,425 @@
+/*
+ * esp_encrypt.c : IPSec ESP encrypt node
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+
+#include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/esp.h>
+
+
+#define foreach_esp_encrypt_next                   \
+_(DROP, "error-drop")                              \
+_(IP4_LOOKUP, "ip4-lookup")                        \
+_(IP6_LOOKUP, "ip6-lookup")                        \
+_(INTERFACE_OUTPUT, "interface-output")
+
+#define _(v, s) ESP_ENCRYPT_NEXT_##v,
+typedef enum
+{
+  foreach_esp_encrypt_next
+#undef _
+    ESP_ENCRYPT_N_NEXT,
+} esp_encrypt_next_t;
+
+#define foreach_esp_encrypt_error                   \
+ _(RX_PKTS, "ESP pkts received")                    \
+ _(NO_BUFFER, "No buffer (packet dropped)")         \
+ _(DECRYPTION_FAILED, "ESP encryption failed")      \
+ _(SEQ_CYCLED, "sequence number cycled")
+
+
+typedef enum
+{
+#define _(sym,str) ESP_ENCRYPT_ERROR_##sym,
+  foreach_esp_encrypt_error
+#undef _
+    ESP_ENCRYPT_N_ERROR,
+} esp_encrypt_error_t;
+
+static char *esp_encrypt_error_strings[] = {
+#define _(sym,string) string,
+  foreach_esp_encrypt_error
+#undef _
+};
+
+vlib_node_registration_t esp_encrypt_node;
+
+typedef struct
+{
+  u32 spi;
+  u32 seq;
+  ipsec_crypto_alg_t crypto_alg;
+  ipsec_integ_alg_t integ_alg;
+} esp_encrypt_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_esp_encrypt_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  esp_encrypt_trace_t *t = va_arg (*args, esp_encrypt_trace_t *);
+
+  s = format (s, "esp: spi %u seq %u crypto %U integrity %U",
+	      t->spi, t->seq,
+	      format_ipsec_crypto_alg, t->crypto_alg,
+	      format_ipsec_integ_alg, t->integ_alg);
+  return s;
+}
+
+always_inline void
+esp_encrypt_aes_cbc (ipsec_crypto_alg_t alg,
+		     u8 * in, u8 * out, size_t in_len, u8 * key, u8 * iv)
+{
+  esp_main_t *em = &esp_main;
+  u32 cpu_index = os_get_cpu_number ();
+  EVP_CIPHER_CTX *ctx = &(em->per_thread_data[cpu_index].encrypt_ctx);
+  const EVP_CIPHER *cipher = NULL;
+  int out_len;
+
+  ASSERT (alg < IPSEC_CRYPTO_N_ALG);
+
+  if (PREDICT_FALSE (em->esp_crypto_algs[alg].type == IPSEC_CRYPTO_ALG_NONE))
+    return;
+
+  if (PREDICT_FALSE (alg != em->per_thread_data[cpu_index].last_encrypt_alg))
+    {
+      cipher = em->esp_crypto_algs[alg].type;
+      em->per_thread_data[cpu_index].last_encrypt_alg = alg;
+    }
+
+  EVP_EncryptInit_ex (ctx, cipher, NULL, key, iv);
+
+  EVP_EncryptUpdate (ctx, out, &out_len, in, in_len);
+  EVP_EncryptFinal_ex (ctx, out + out_len, &out_len);
+}
+
+static uword
+esp_encrypt_node_fn (vlib_main_t * vm,
+		     vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  u32 n_left_from, *from, *to_next = 0, next_index;
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+  ipsec_main_t *im = &ipsec_main;
+  u32 *recycle = 0;
+  u32 cpu_index = os_get_cpu_number ();
+
+  ipsec_alloc_empty_buffers (vm, im);
+
+  u32 *empty_buffers = im->empty_buffers[cpu_index];
+
+  if (PREDICT_FALSE (vec_len (empty_buffers) < n_left_from))
+    {
+      vlib_node_increment_counter (vm, esp_encrypt_node.index,
+				   ESP_ENCRYPT_ERROR_NO_BUFFER, n_left_from);
+      clib_warning ("no enough empty buffers. discarding frame");
+      goto free_buffers_and_exit;
+    }
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 i_bi0, o_bi0, next0;
+	  vlib_buffer_t *i_b0, *o_b0 = 0;
+	  u32 sa_index0;
+	  ipsec_sa_t *sa0;
+	  ip4_and_esp_header_t *ih0, *oh0 = 0;
+	  ip6_and_esp_header_t *ih6_0, *oh6_0 = 0;
+	  uword last_empty_buffer;
+	  esp_header_t *o_esp0;
+	  esp_footer_t *f0;
+	  u8 is_ipv6;
+	  u8 ip_hdr_size;
+	  u8 next_hdr_type;
+	  u32 ip_proto = 0;
+	  u8 transport_mode = 0;
+
+	  i_bi0 = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  next0 = ESP_ENCRYPT_NEXT_DROP;
+
+	  i_b0 = vlib_get_buffer (vm, i_bi0);
+	  sa_index0 = vnet_buffer (i_b0)->ipsec.sad_index;
+	  sa0 = pool_elt_at_index (im->sad, sa_index0);
+
+	  if (PREDICT_FALSE (esp_seq_advance (sa0)))
+	    {
+	      clib_warning ("sequence number counter has cycled SPI %u",
+			    sa0->spi);
+	      vlib_node_increment_counter (vm, esp_encrypt_node.index,
+					   ESP_ENCRYPT_ERROR_SEQ_CYCLED, 1);
+	      //TODO: rekey SA
+	      o_bi0 = i_bi0;
+	      to_next[0] = o_bi0;
+	      to_next += 1;
+	      goto trace;
+	    }
+
+	  /* grab free buffer */
+	  last_empty_buffer = vec_len (empty_buffers) - 1;
+	  o_bi0 = empty_buffers[last_empty_buffer];
+	  o_b0 = vlib_get_buffer (vm, o_bi0);
+	  o_b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
+	  o_b0->current_data = sizeof (ethernet_header_t);
+	  ih0 = vlib_buffer_get_current (i_b0);
+	  vlib_prefetch_buffer_with_index (vm,
+					   empty_buffers[last_empty_buffer -
+							 1], STORE);
+	  _vec_len (empty_buffers) = last_empty_buffer;
+	  to_next[0] = o_bi0;
+	  to_next += 1;
+
+	  /* add old buffer to the recycle list */
+	  vec_add1 (recycle, i_bi0);
+
+	  /* is ipv6 */
+	  if (PREDICT_FALSE
+	      ((ih0->ip4.ip_version_and_header_length & 0xF0) == 0x60))
+	    {
+	      is_ipv6 = 1;
+	      ih6_0 = vlib_buffer_get_current (i_b0);
+	      ip_hdr_size = sizeof (ip6_header_t);
+	      next_hdr_type = IP_PROTOCOL_IPV6;
+	      oh6_0 = vlib_buffer_get_current (o_b0);
+	      o_esp0 = vlib_buffer_get_current (o_b0) + sizeof (ip6_header_t);
+
+	      oh6_0->ip6.ip_version_traffic_class_and_flow_label =
+		ih6_0->ip6.ip_version_traffic_class_and_flow_label;
+	      oh6_0->ip6.protocol = IP_PROTOCOL_IPSEC_ESP;
+	      oh6_0->ip6.hop_limit = 254;
+	      oh6_0->ip6.src_address.as_u64[0] =
+		ih6_0->ip6.src_address.as_u64[0];
+	      oh6_0->ip6.src_address.as_u64[1] =
+		ih6_0->ip6.src_address.as_u64[1];
+	      oh6_0->ip6.dst_address.as_u64[0] =
+		ih6_0->ip6.dst_address.as_u64[0];
+	      oh6_0->ip6.dst_address.as_u64[1] =
+		ih6_0->ip6.dst_address.as_u64[1];
+	      oh6_0->esp.spi = clib_net_to_host_u32 (sa0->spi);
+	      oh6_0->esp.seq = clib_net_to_host_u32 (sa0->seq);
+	      ip_proto = ih6_0->ip6.protocol;
+
+	      next0 = ESP_ENCRYPT_NEXT_IP6_LOOKUP;
+	    }
+	  else
+	    {
+	      is_ipv6 = 0;
+	      ip_hdr_size = sizeof (ip4_header_t);
+	      next_hdr_type = IP_PROTOCOL_IP_IN_IP;
+	      oh0 = vlib_buffer_get_current (o_b0);
+	      o_esp0 = vlib_buffer_get_current (o_b0) + sizeof (ip4_header_t);
+
+	      oh0->ip4.ip_version_and_header_length = 0x45;
+	      oh0->ip4.tos = ih0->ip4.tos;
+	      oh0->ip4.fragment_id = 0;
+	      oh0->ip4.flags_and_fragment_offset = 0;
+	      oh0->ip4.ttl = 254;
+	      oh0->ip4.protocol = IP_PROTOCOL_IPSEC_ESP;
+	      oh0->ip4.src_address.as_u32 = ih0->ip4.src_address.as_u32;
+	      oh0->ip4.dst_address.as_u32 = ih0->ip4.dst_address.as_u32;
+	      oh0->esp.spi = clib_net_to_host_u32 (sa0->spi);
+	      oh0->esp.seq = clib_net_to_host_u32 (sa0->seq);
+	      ip_proto = ih0->ip4.protocol;
+
+	      next0 = ESP_ENCRYPT_NEXT_IP4_LOOKUP;
+	    }
+
+	  if (PREDICT_TRUE
+	      (!is_ipv6 && sa0->is_tunnel && !sa0->is_tunnel_ip6))
+	    {
+	      oh0->ip4.src_address.as_u32 = sa0->tunnel_src_addr.ip4.as_u32;
+	      oh0->ip4.dst_address.as_u32 = sa0->tunnel_dst_addr.ip4.as_u32;
+
+	      vnet_buffer (o_b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+	    }
+	  else if (is_ipv6 && sa0->is_tunnel && sa0->is_tunnel_ip6)
+	    {
+	      oh6_0->ip6.src_address.as_u64[0] =
+		sa0->tunnel_src_addr.ip6.as_u64[0];
+	      oh6_0->ip6.src_address.as_u64[1] =
+		sa0->tunnel_src_addr.ip6.as_u64[1];
+	      oh6_0->ip6.dst_address.as_u64[0] =
+		sa0->tunnel_dst_addr.ip6.as_u64[0];
+	      oh6_0->ip6.dst_address.as_u64[1] =
+		sa0->tunnel_dst_addr.ip6.as_u64[1];
+
+	      vnet_buffer (o_b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+	    }
+	  else
+	    {
+	      next_hdr_type = ip_proto;
+	      if (vnet_buffer (i_b0)->sw_if_index[VLIB_TX] != ~0)
+		{
+		  transport_mode = 1;
+		  ethernet_header_t *ieh0, *oeh0;
+		  ieh0 =
+		    (ethernet_header_t *) ((u8 *)
+					   vlib_buffer_get_current (i_b0) -
+					   sizeof (ethernet_header_t));
+		  oeh0 = (ethernet_header_t *) o_b0->data;
+		  clib_memcpy (oeh0, ieh0, sizeof (ethernet_header_t));
+		  next0 = ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT;
+		  vnet_buffer (o_b0)->sw_if_index[VLIB_TX] =
+		    vnet_buffer (i_b0)->sw_if_index[VLIB_TX];
+		}
+	      vlib_buffer_advance (i_b0, ip_hdr_size);
+	    }
+
+	  ASSERT (sa0->crypto_alg < IPSEC_CRYPTO_N_ALG);
+
+	  if (PREDICT_TRUE (sa0->crypto_alg != IPSEC_CRYPTO_ALG_NONE))
+	    {
+
+	      const int BLOCK_SIZE = 16;
+	      const int IV_SIZE = 16;
+	      int blocks = 1 + (i_b0->current_length + 1) / BLOCK_SIZE;
+
+	      /* pad packet in input buffer */
+	      u8 pad_bytes = BLOCK_SIZE * blocks - 2 - i_b0->current_length;
+	      u8 i;
+	      u8 *padding =
+		vlib_buffer_get_current (i_b0) + i_b0->current_length;
+	      i_b0->current_length = BLOCK_SIZE * blocks;
+	      for (i = 0; i < pad_bytes; ++i)
+		{
+		  padding[i] = i + 1;
+		}
+	      f0 = vlib_buffer_get_current (i_b0) + i_b0->current_length - 2;
+	      f0->pad_length = pad_bytes;
+	      f0->next_header = next_hdr_type;
+
+	      o_b0->current_length = ip_hdr_size + sizeof (esp_header_t) +
+		BLOCK_SIZE * blocks + IV_SIZE;
+
+	      vnet_buffer (o_b0)->sw_if_index[VLIB_RX] =
+		vnet_buffer (i_b0)->sw_if_index[VLIB_RX];
+
+	      u8 iv[16];
+	      RAND_bytes (iv, sizeof (iv));
+
+	      clib_memcpy ((u8 *) vlib_buffer_get_current (o_b0) +
+			   ip_hdr_size + sizeof (esp_header_t), iv, 16);
+
+	      esp_encrypt_aes_cbc (sa0->crypto_alg,
+				   (u8 *) vlib_buffer_get_current (i_b0),
+				   (u8 *) vlib_buffer_get_current (o_b0) +
+				   ip_hdr_size + sizeof (esp_header_t) +
+				   IV_SIZE, BLOCK_SIZE * blocks,
+				   sa0->crypto_key, iv);
+	    }
+
+	  o_b0->current_length += hmac_calc (sa0->integ_alg, sa0->integ_key,
+					     sa0->integ_key_len,
+					     (u8 *) o_esp0,
+					     o_b0->current_length -
+					     ip_hdr_size,
+					     vlib_buffer_get_current (o_b0) +
+					     o_b0->current_length,
+					     sa0->use_esn, sa0->seq_hi);
+
+
+	  if (PREDICT_FALSE (is_ipv6))
+	    {
+	      oh6_0->ip6.payload_length =
+		clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, o_b0) -
+				      sizeof (ip6_header_t));
+	    }
+	  else
+	    {
+	      oh0->ip4.length =
+		clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, o_b0));
+	      oh0->ip4.checksum = ip4_header_checksum (&oh0->ip4);
+	    }
+
+	  if (transport_mode)
+	    vlib_buffer_reset (o_b0);
+
+	trace:
+	  if (PREDICT_FALSE (i_b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      if (o_b0)
+		{
+		  o_b0->flags |= VLIB_BUFFER_IS_TRACED;
+		  o_b0->trace_index = i_b0->trace_index;
+		  esp_encrypt_trace_t *tr =
+		    vlib_add_trace (vm, node, o_b0, sizeof (*tr));
+		  tr->spi = sa0->spi;
+		  tr->seq = sa0->seq - 1;
+		  tr->crypto_alg = sa0->crypto_alg;
+		  tr->integ_alg = sa0->integ_alg;
+		}
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next, o_bi0,
+					   next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, esp_encrypt_node.index,
+			       ESP_ENCRYPT_ERROR_RX_PKTS,
+			       from_frame->n_vectors);
+
+free_buffers_and_exit:
+  if (recycle)
+    vlib_buffer_free (vm, recycle, vec_len (recycle));
+  vec_free (recycle);
+  return from_frame->n_vectors;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (esp_encrypt_node) = {
+  .function = esp_encrypt_node_fn,
+  .name = "esp-encrypt",
+  .vector_size = sizeof (u32),
+  .format_trace = format_esp_encrypt_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(esp_encrypt_error_strings),
+  .error_strings = esp_encrypt_error_strings,
+
+  .n_next_nodes = ESP_ENCRYPT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [ESP_ENCRYPT_NEXT_##s] = n,
+    foreach_esp_encrypt_next
+#undef _
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (esp_encrypt_node, esp_encrypt_node_fn)
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ikev2.c b/src/vnet/ipsec/ikev2.c
new file mode 100644
index 00000000..5a6c3674
--- /dev/null
+++ b/src/vnet/ipsec/ikev2.c
@@ -0,0 +1,2186 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+#include <vnet/ip/udp.h>
+#include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/ikev2.h>
+#include <vnet/ipsec/ikev2_priv.h>
+
+static int ikev2_delete_tunnel_interface (vnet_main_t * vnm,
+					  ikev2_sa_t * sa,
+					  ikev2_child_sa_t * child);
+
+#define ikev2_set_state(sa, v) do { \
+    (sa)->state = v; \
+    clib_warning("sa state changed to " #v); \
+  } while(0);
+
+typedef struct
+{
+  u32 next_index;
+  u32 sw_if_index;
+} ikev2_trace_t;
+
+static u8 *
+format_ikev2_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ikev2_trace_t *t = va_arg (*args, ikev2_trace_t *);
+
+  s = format (s, "ikev2: sw_if_index %d, next index %d",
+	      t->sw_if_index, t->next_index);
+  return s;
+}
+
+static vlib_node_registration_t ikev2_node;
+
+#define foreach_ikev2_error \
+_(PROCESSED, "IKEv2 packets processed") \
+_(IKE_SA_INIT_RETRANSMIT, "IKE_SA_INIT retransmit ") \
+_(IKE_SA_INIT_IGNORE, "IKE_SA_INIT ignore (IKE SA already auth)") \
+_(IKE_REQ_RETRANSMIT, "IKE request retransmit") \
+_(IKE_REQ_IGNORE, "IKE request ignore (old msgid)") \
+_(NOT_IKEV2, "Non IKEv2 packets received")
+
+typedef enum
+{
+#define _(sym,str) IKEV2_ERROR_##sym,
+  foreach_ikev2_error
+#undef _
+    IKEV2_N_ERROR,
+} ikev2_error_t;
+
+static char *ikev2_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ikev2_error
+#undef _
+};
+
+typedef enum
+{
+  IKEV2_NEXT_IP4_LOOKUP,
+  IKEV2_NEXT_ERROR_DROP,
+  IKEV2_N_NEXT,
+} ikev2_next_t;
+
+static ikev2_sa_transform_t *
+ikev2_find_transform_data (ikev2_sa_transform_t * t)
+{
+  ikev2_main_t *km = &ikev2_main;
+  ikev2_sa_transform_t *td;
+
+  vec_foreach (td, km->supported_transforms)
+  {
+    if (td->type != t->type)
+      continue;
+
+    if (td->transform_id != t->transform_id)
+      continue;
+
+    if (td->type == IKEV2_TRANSFORM_TYPE_ENCR)
+      {
+	if (vec_len (t->attrs) != 4 || t->attrs[0] != 0x80
+	    || t->attrs[1] != 14)
+	  continue;
+
+	if (((t->attrs[2] << 8 | t->attrs[3]) / 8) != td->key_len)
+	  continue;
+      }
+    return td;
+  }
+  return 0;
+}
+
+static ikev2_sa_proposal_t *
+ikev2_select_proposal (ikev2_sa_proposal_t * proposals,
+		       ikev2_protocol_id_t prot_id)
+{
+  ikev2_sa_proposal_t *rv = 0;
+  ikev2_sa_proposal_t *proposal;
+  ikev2_sa_transform_t *transform, *new_t;
+  u8 mandatory_bitmap, optional_bitmap;
+
+  if (prot_id == IKEV2_PROTOCOL_IKE)
+    {
+      mandatory_bitmap = (1 << IKEV2_TRANSFORM_TYPE_ENCR) |
+	(1 << IKEV2_TRANSFORM_TYPE_PRF) |
+	(1 << IKEV2_TRANSFORM_TYPE_INTEG) | (1 << IKEV2_TRANSFORM_TYPE_DH);
+      optional_bitmap = mandatory_bitmap;
+    }
+  else if (prot_id == IKEV2_PROTOCOL_ESP)
+    {
+      mandatory_bitmap = (1 << IKEV2_TRANSFORM_TYPE_ENCR) |
+	(1 << IKEV2_TRANSFORM_TYPE_ESN);
+      optional_bitmap = mandatory_bitmap |
+	(1 << IKEV2_TRANSFORM_TYPE_INTEG) | (1 << IKEV2_TRANSFORM_TYPE_DH);
+    }
+  else if (prot_id == IKEV2_PROTOCOL_AH)
+    {
+      mandatory_bitmap = (1 << IKEV2_TRANSFORM_TYPE_INTEG) |
+	(1 << IKEV2_TRANSFORM_TYPE_ESN);
+      optional_bitmap = mandatory_bitmap | (1 << IKEV2_TRANSFORM_TYPE_DH);
+    }
+  else
+    return 0;
+
+  vec_add2 (rv, proposal, 1);
+
+  vec_foreach (proposal, proposals)
+  {
+    u8 bitmap = 0;
+    if (proposal->protocol_id != prot_id)
+      continue;
+
+    vec_foreach (transform, proposal->transforms)
+    {
+      if ((1 << transform->type) & bitmap)
+	continue;
+
+      if (ikev2_find_transform_data (transform))
+	{
+	  bitmap |= 1 << transform->type;
+	  vec_add2 (rv->transforms, new_t, 1);
+	  clib_memcpy (new_t, transform, sizeof (*new_t));
+	  new_t->attrs = vec_dup (transform->attrs);
+	}
+    }
+
+    clib_warning ("bitmap is %x mandatory is %x optional is %x",
+		  bitmap, mandatory_bitmap, optional_bitmap);
+
+    if ((bitmap & mandatory_bitmap) == mandatory_bitmap &&
+	(bitmap & ~optional_bitmap) == 0)
+      {
+	rv->proposal_num = proposal->proposal_num;
+	rv->protocol_id = proposal->protocol_id;
+	RAND_bytes ((u8 *) & rv->spi, sizeof (rv->spi));
+	goto done;
+      }
+    else
+      {
+	vec_free (rv->transforms);
+      }
+  }
+
+  vec_free (rv);
+done:
+  return rv;
+}
+
+ikev2_sa_transform_t *
+ikev2_sa_get_td_for_type (ikev2_sa_proposal_t * p,
+			  ikev2_transform_type_t type)
+{
+  ikev2_sa_transform_t *t;
+
+  if (!p)
+    return 0;
+
+  vec_foreach (t, p->transforms)
+  {
+    if (t->type == type)
+      return ikev2_find_transform_data (t);
+  }
+  return 0;
+}
+
+ikev2_child_sa_t *
+ikev2_sa_get_child (ikev2_sa_t * sa, u32 spi, ikev2_protocol_id_t prot_id)
+{
+  ikev2_child_sa_t *c;
+  vec_foreach (c, sa->childs)
+  {
+    if (c->i_proposals[0].spi == spi
+	&& c->i_proposals[0].protocol_id == prot_id)
+      return c;
+  }
+
+  return 0;
+}
+
+void
+ikev2_sa_free_proposal_vector (ikev2_sa_proposal_t ** v)
+{
+  ikev2_sa_proposal_t *p;
+  ikev2_sa_transform_t *t;
+
+  if (!*v)
+    return;
+
+  vec_foreach (p, *v)
+  {
+    vec_foreach (t, p->transforms)
+    {
+      vec_free (t->attrs);
+    }
+    vec_free (p->transforms);
+  }
+  vec_free (*v);
+};
+
+static void
+ikev2_sa_free_all_child_sa (ikev2_child_sa_t ** childs)
+{
+  ikev2_child_sa_t *c;
+  vec_foreach (c, *childs)
+  {
+    ikev2_sa_free_proposal_vector (&c->r_proposals);
+    ikev2_sa_free_proposal_vector (&c->i_proposals);
+    vec_free (c->sk_ai);
+    vec_free (c->sk_ar);
+    vec_free (c->sk_ei);
+    vec_free (c->sk_er);
+  }
+
+  vec_free (*childs);
+}
+
+static void
+ikev2_sa_del_child_sa (ikev2_sa_t * sa, ikev2_child_sa_t * child)
+{
+  ikev2_sa_free_proposal_vector (&child->r_proposals);
+  ikev2_sa_free_proposal_vector (&child->i_proposals);
+  vec_free (child->sk_ai);
+  vec_free (child->sk_ar);
+  vec_free (child->sk_ei);
+  vec_free (child->sk_er);
+
+  vec_del1 (sa->childs, child - sa->childs);
+}
+
+static void
+ikev2_sa_free_all_vec (ikev2_sa_t * sa)
+{
+  vec_free (sa->i_nonce);
+  vec_free (sa->i_dh_data);
+  vec_free (sa->dh_shared_key);
+
+  ikev2_sa_free_proposal_vector (&sa->r_proposals);
+  ikev2_sa_free_proposal_vector (&sa->i_proposals);
+
+  vec_free (sa->sk_d);
+  vec_free (sa->sk_ai);
+  vec_free (sa->sk_ar);
+  vec_free (sa->sk_ei);
+  vec_free (sa->sk_er);
+  vec_free (sa->sk_pi);
+  vec_free (sa->sk_pr);
+
+  vec_free (sa->i_id.data);
+  vec_free (sa->i_auth.data);
+  vec_free (sa->r_id.data);
+  vec_free (sa->r_auth.data);
+  if (sa->r_auth.key)
+    EVP_PKEY_free (sa->r_auth.key);
+
+  vec_free (sa->del);
+
+  ikev2_sa_free_all_child_sa (&sa->childs);
+}
+
+static void
+ikev2_delete_sa (ikev2_sa_t * sa)
+{
+  ikev2_main_t *km = &ikev2_main;
+  u32 cpu_index = os_get_cpu_number ();
+  uword *p;
+
+  ikev2_sa_free_all_vec (sa);
+
+  p = hash_get (km->per_thread_data[cpu_index].sa_by_rspi, sa->rspi);
+  if (p)
+    {
+      hash_unset (km->per_thread_data[cpu_index].sa_by_rspi, sa->rspi);
+      pool_put (km->per_thread_data[cpu_index].sas, sa);
+    }
+}
+
+static void
+ikev2_generate_sa_init_data (ikev2_sa_t * sa)
+{
+  ikev2_sa_transform_t *t = 0, *t2;
+  ikev2_main_t *km = &ikev2_main;
+
+  if (sa->dh_group == IKEV2_TRANSFORM_DH_TYPE_NONE)
+    {
+      return;
+    }
+
+  /* check if received DH group is on our list of supported groups */
+  vec_foreach (t2, km->supported_transforms)
+  {
+    if (t2->type == IKEV2_TRANSFORM_TYPE_DH && sa->dh_group == t2->dh_type)
+      {
+	t = t2;
+	break;
+      }
+  }
+
+  if (!t)
+    {
+      clib_warning ("unknown dh data group %u (data len %u)", sa->dh_group,
+		    vec_len (sa->i_dh_data));
+      sa->dh_group = IKEV2_TRANSFORM_DH_TYPE_NONE;
+      return;
+    }
+
+  /* generate rspi */
+  RAND_bytes ((u8 *) & sa->rspi, 8);
+
+  /* generate nonce */
+  sa->r_nonce = vec_new (u8, IKEV2_NONCE_SIZE);
+  RAND_bytes ((u8 *) sa->r_nonce, IKEV2_NONCE_SIZE);
+
+  /* generate dh keys */
+  ikev2_generate_dh (sa, t);
+}
+
+static void
+ikev2_calc_keys (ikev2_sa_t * sa)
+{
+  u8 *tmp;
+  /* calculate SKEYSEED = prf(Ni | Nr, g^ir) */
+  u8 *skeyseed = 0;
+  u8 *s = 0;
+  ikev2_sa_transform_t *tr_encr, *tr_prf, *tr_integ;
+  tr_encr =
+    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
+  tr_prf =
+    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_PRF);
+  tr_integ =
+    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
+
+  vec_append (s, sa->i_nonce);
+  vec_append (s, sa->r_nonce);
+  skeyseed = ikev2_calc_prf (tr_prf, s, sa->dh_shared_key);
+
+  /* Calculate S = Ni | Nr | SPIi | SPIr */
+  u64 *spi;
+  vec_add2 (s, tmp, 2 * sizeof (*spi));
+  spi = (u64 *) tmp;
+  spi[0] = clib_host_to_net_u64 (sa->ispi);
+  spi[1] = clib_host_to_net_u64 (sa->rspi);
+
+  /* calculate PRFplus */
+  u8 *keymat;
+  int len = tr_prf->key_trunc +	/* SK_d */
+    tr_integ->key_len * 2 +	/* SK_ai, SK_ar */
+    tr_encr->key_len * 2 +	/* SK_ei, SK_er */
+    tr_prf->key_len * 2;	/* SK_pi, SK_pr */
+
+  keymat = ikev2_calc_prfplus (tr_prf, skeyseed, s, len);
+  vec_free (skeyseed);
+  vec_free (s);
+
+  int pos = 0;
+
+  /* SK_d */
+  sa->sk_d = vec_new (u8, tr_prf->key_trunc);
+  clib_memcpy (sa->sk_d, keymat + pos, tr_prf->key_trunc);
+  pos += tr_prf->key_trunc;
+
+  /* SK_ai */
+  sa->sk_ai = vec_new (u8, tr_integ->key_len);
+  clib_memcpy (sa->sk_ai, keymat + pos, tr_integ->key_len);
+  pos += tr_integ->key_len;
+
+  /* SK_ar */
+  sa->sk_ar = vec_new (u8, tr_integ->key_len);
+  clib_memcpy (sa->sk_ar, keymat + pos, tr_integ->key_len);
+  pos += tr_integ->key_len;
+
+  /* SK_ei */
+  sa->sk_ei = vec_new (u8, tr_encr->key_len);
+  clib_memcpy (sa->sk_ei, keymat + pos, tr_encr->key_len);
+  pos += tr_encr->key_len;
+
+  /* SK_er */
+  sa->sk_er = vec_new (u8, tr_encr->key_len);
+  clib_memcpy (sa->sk_er, keymat + pos, tr_encr->key_len);
+  pos += tr_encr->key_len;
+
+  /* SK_pi */
+  sa->sk_pi = vec_new (u8, tr_prf->key_len);
+  clib_memcpy (sa->sk_pi, keymat + pos, tr_prf->key_len);
+  pos += tr_prf->key_len;
+
+  /* SK_pr */
+  sa->sk_pr = vec_new (u8, tr_prf->key_len);
+  clib_memcpy (sa->sk_pr, keymat + pos, tr_prf->key_len);
+  pos += tr_prf->key_len;
+
+  vec_free (keymat);
+}
+
+static void
+ikev2_calc_child_keys (ikev2_sa_t * sa, ikev2_child_sa_t * child)
+{
+  u8 *s = 0;
+  ikev2_sa_transform_t *tr_prf, *ctr_encr, *ctr_integ;
+  tr_prf =
+    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_PRF);
+  ctr_encr =
+    ikev2_sa_get_td_for_type (child->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
+  ctr_integ =
+    ikev2_sa_get_td_for_type (child->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
+
+  vec_append (s, sa->i_nonce);
+  vec_append (s, sa->r_nonce);
+  /* calculate PRFplus */
+  u8 *keymat;
+  int len = ctr_encr->key_len * 2 + ctr_integ->key_len * 2;
+
+  keymat = ikev2_calc_prfplus (tr_prf, sa->sk_d, s, len);
+
+  int pos = 0;
+
+  /* SK_ei */
+  child->sk_ei = vec_new (u8, ctr_encr->key_len);
+  clib_memcpy (child->sk_ei, keymat + pos, ctr_encr->key_len);
+  pos += ctr_encr->key_len;
+
+  /* SK_ai */
+  child->sk_ai = vec_new (u8, ctr_integ->key_len);
+  clib_memcpy (child->sk_ai, keymat + pos, ctr_integ->key_len);
+  pos += ctr_integ->key_len;
+
+  /* SK_er */
+  child->sk_er = vec_new (u8, ctr_encr->key_len);
+  clib_memcpy (child->sk_er, keymat + pos, ctr_encr->key_len);
+  pos += ctr_encr->key_len;
+
+  /* SK_ar */
+  child->sk_ar = vec_new (u8, ctr_integ->key_len);
+  clib_memcpy (child->sk_ar, keymat + pos, ctr_integ->key_len);
+  pos += ctr_integ->key_len;
+
+  ASSERT (pos == len);
+
+  vec_free (keymat);
+}
+
+static void
+ikev2_process_sa_init_req (vlib_main_t * vm, ikev2_sa_t * sa,
+			   ike_header_t * ike)
+{
+  int p = 0;
+  u32 len = clib_net_to_host_u32 (ike->length);
+  u8 payload = ike->nextpayload;
+
+  clib_warning ("ispi %lx rspi %lx nextpayload %x version %x "
+		"exchange %x flags %x msgid %x length %u",
+		clib_net_to_host_u64 (ike->ispi),
+		clib_net_to_host_u64 (ike->rspi),
+		payload, ike->version,
+		ike->exchange, ike->flags,
+		clib_net_to_host_u32 (ike->msgid), len);
+
+  sa->ispi = clib_net_to_host_u64 (ike->ispi);
+
+  /* store whole IKE payload - needed for PSK auth */
+  vec_free (sa->last_sa_init_req_packet_data);
+  vec_add (sa->last_sa_init_req_packet_data, ike, len);
+
+  while (p < len && payload != IKEV2_PAYLOAD_NONE)
+    {
+      ike_payload_header_t *ikep = (ike_payload_header_t *) & ike->payload[p];
+      u32 plen = clib_net_to_host_u16 (ikep->length);
+
+      if (plen < sizeof (ike_payload_header_t))
+	return;
+
+      if (payload == IKEV2_PAYLOAD_SA)
+	{
+	  ikev2_sa_free_proposal_vector (&sa->i_proposals);
+	  sa->i_proposals = ikev2_parse_sa_payload (ikep);
+	}
+      else if (payload == IKEV2_PAYLOAD_KE)
+	{
+	  ike_ke_payload_header_t *ke = (ike_ke_payload_header_t *) ikep;
+	  sa->dh_group = clib_net_to_host_u16 (ke->dh_group);
+	  vec_free (sa->i_dh_data);
+	  vec_add (sa->i_dh_data, ke->payload, plen - sizeof (*ke));
+	}
+      else if (payload == IKEV2_PAYLOAD_NONCE)
+	{
+	  vec_free (sa->i_nonce);
+	  vec_add (sa->i_nonce, ikep->payload, plen - sizeof (*ikep));
+	}
+      else if (payload == IKEV2_PAYLOAD_NOTIFY)
+	{
+	  ikev2_notify_t *n = ikev2_parse_notify_payload (ikep);
+	  vec_free (n);
+	}
+      else if (payload == IKEV2_PAYLOAD_VENDOR)
+	{
+	  ikev2_parse_vendor_payload (ikep);
+	}
+      else
+	{
+	  clib_warning ("unknown payload %u flags %x length %u", payload,
+			ikep->flags, plen);
+	  if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
+	    {
+	      ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
+	      sa->unsupported_cp = payload;
+	      return;
+	    }
+	}
+
+      payload = ikep->nextpayload;
+      p += plen;
+    }
+
+  ikev2_set_state (sa, IKEV2_STATE_SA_INIT);
+}
+
+static u8 *
+ikev2_decrypt_sk_payload (ikev2_sa_t * sa, ike_header_t * ike, u8 * payload)
+{
+  int p = 0;
+  u8 last_payload = 0;
+  u8 *hmac = 0;
+  u32 len = clib_net_to_host_u32 (ike->length);
+  ike_payload_header_t *ikep = 0;
+  u32 plen = 0;
+  ikev2_sa_transform_t *tr_integ;
+  tr_integ =
+    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
+
+  while (p < len &&
+	 *payload != IKEV2_PAYLOAD_NONE && last_payload != IKEV2_PAYLOAD_SK)
+    {
+      ikep = (ike_payload_header_t *) & ike->payload[p];
+      plen = clib_net_to_host_u16 (ikep->length);
+
+      if (plen < sizeof (*ikep))
+	return 0;
+
+      if (*payload == IKEV2_PAYLOAD_SK)
+	{
+	  clib_warning ("received IKEv2 payload SK, len %u", plen - 4);
+	  last_payload = *payload;
+	}
+      else
+	{
+	  clib_warning ("unknown payload %u flags %x length %u", payload,
+			ikep->flags, plen);
+	  if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
+	    {
+	      sa->unsupported_cp = *payload;
+	      return 0;
+	    }
+	}
+
+      *payload = ikep->nextpayload;
+      p += plen;
+    }
+
+  if (last_payload != IKEV2_PAYLOAD_SK)
+    {
+      clib_warning ("Last payload must be SK");
+      return 0;
+    }
+
+  hmac = ikev2_calc_integr (tr_integ, sa->sk_ai, (u8 *) ike,
+			    len - tr_integ->key_trunc);
+
+  plen = plen - sizeof (*ikep) - tr_integ->key_trunc;
+
+  if (memcmp (hmac, &ikep->payload[plen], tr_integ->key_trunc))
+    {
+      clib_warning ("message integrity check failed");
+      vec_free (hmac);
+      return 0;
+    }
+  vec_free (hmac);
+
+  return ikev2_decrypt_data (sa, ikep->payload, plen);
+}
+
+static void
+ikev2_initial_contact_cleanup (ikev2_sa_t * sa)
+{
+  ikev2_main_t *km = &ikev2_main;
+  ikev2_sa_t *tmp;
+  u32 i, *delete = 0;
+  ikev2_child_sa_t *c;
+  u32 cpu_index = os_get_cpu_number ();
+
+  if (!sa->initial_contact)
+    return;
+
+  /* find old IKE SAs with the same authenticated identity */
+  /* *INDENT-OFF* */
+  pool_foreach (tmp, km->per_thread_data[cpu_index].sas, ({
+        if (tmp->i_id.type != sa->i_id.type ||
+            vec_len(tmp->i_id.data) != vec_len(sa->i_id.data) ||
+            memcmp(sa->i_id.data, tmp->i_id.data, vec_len(sa->i_id.data)))
+          continue;
+
+        if (sa->rspi != tmp->rspi)
+          vec_add1(delete, tmp - km->per_thread_data[cpu_index].sas);
+  }));
+  /* *INDENT-ON* */
+
+  for (i = 0; i < vec_len (delete); i++)
+    {
+      tmp = pool_elt_at_index (km->per_thread_data[cpu_index].sas, delete[i]);
+      vec_foreach (c, tmp->childs)
+	ikev2_delete_tunnel_interface (km->vnet_main, tmp, c);
+      ikev2_delete_sa (tmp);
+    }
+
+  vec_free (delete);
+  sa->initial_contact = 0;
+}
+
+static void
+ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike)
+{
+  ikev2_child_sa_t *first_child_sa;
+  int p = 0;
+  u32 len = clib_net_to_host_u32 (ike->length);
+  u8 payload = ike->nextpayload;
+  u8 *plaintext = 0;
+
+  ike_payload_header_t *ikep;
+  u32 plen;
+
+  clib_warning ("ispi %lx rspi %lx nextpayload %x version %x "
+		"exchange %x flags %x msgid %x length %u",
+		clib_net_to_host_u64 (ike->ispi),
+		clib_net_to_host_u64 (ike->rspi),
+		payload, ike->version,
+		ike->exchange, ike->flags,
+		clib_net_to_host_u32 (ike->msgid), len);
+
+  ikev2_calc_keys (sa);
+
+  plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload);
+
+  if (!plaintext)
+    {
+      if (sa->unsupported_cp)
+	ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
+      goto cleanup_and_exit;
+    }
+
+  /* create 1st child SA */
+  ikev2_sa_free_all_child_sa (&sa->childs);
+  vec_add2 (sa->childs, first_child_sa, 1);
+
+
+  /* process encrypted payload */
+  p = 0;
+  while (p < vec_len (plaintext) && payload != IKEV2_PAYLOAD_NONE)
+    {
+      ikep = (ike_payload_header_t *) & plaintext[p];
+      plen = clib_net_to_host_u16 (ikep->length);
+
+      if (plen < sizeof (ike_payload_header_t))
+	goto cleanup_and_exit;
+
+      if (payload == IKEV2_PAYLOAD_SA)	/* 33 */
+	{
+	  clib_warning ("received payload SA, len %u", plen - sizeof (*ikep));
+	  ikev2_sa_free_proposal_vector (&first_child_sa->i_proposals);
+	  first_child_sa->i_proposals = ikev2_parse_sa_payload (ikep);
+	}
+      else if (payload == IKEV2_PAYLOAD_IDI)	/* 35 */
+	{
+	  ike_id_payload_header_t *id = (ike_id_payload_header_t *) ikep;
+
+	  sa->i_id.type = id->id_type;
+	  vec_free (sa->i_id.data);
+	  vec_add (sa->i_id.data, id->payload, plen - sizeof (*id));
+
+	  clib_warning ("received payload IDi, len %u id_type %u",
+			plen - sizeof (*id), id->id_type);
+	}
+      else if (payload == IKEV2_PAYLOAD_AUTH)	/* 39 */
+	{
+	  ike_auth_payload_header_t *a = (ike_auth_payload_header_t *) ikep;
+
+	  sa->i_auth.method = a->auth_method;
+	  vec_free (sa->i_auth.data);
+	  vec_add (sa->i_auth.data, a->payload, plen - sizeof (*a));
+
+	  clib_warning ("received payload AUTH, len %u auth_type %u",
+			plen - sizeof (*a), a->auth_method);
+	}
+      else if (payload == IKEV2_PAYLOAD_NOTIFY)	/* 41 */
+	{
+	  ikev2_notify_t *n = ikev2_parse_notify_payload (ikep);
+	  if (n->msg_type == IKEV2_NOTIFY_MSG_INITIAL_CONTACT)
+	    {
+	      sa->initial_contact = 1;
+	    }
+	  vec_free (n);
+	}
+      else if (payload == IKEV2_PAYLOAD_VENDOR)	/* 43 */
+	{
+	  ikev2_parse_vendor_payload (ikep);
+	}
+      else if (payload == IKEV2_PAYLOAD_TSI)	/* 44 */
+	{
+	  clib_warning ("received payload TSi, len %u",
+			plen - sizeof (*ikep));
+
+	  vec_free (first_child_sa->tsi);
+	  first_child_sa->tsi = ikev2_parse_ts_payload (ikep);
+	}
+      else if (payload == IKEV2_PAYLOAD_TSR)	/* 45 */
+	{
+	  clib_warning ("received payload TSr, len %u",
+			plen - sizeof (*ikep));
+
+	  vec_free (first_child_sa->tsr);
+	  first_child_sa->tsr = ikev2_parse_ts_payload (ikep);
+	}
+      else
+	{
+	  clib_warning ("unknown payload %u flags %x length %u data %u",
+			payload, ikep->flags, plen - 4,
+			format_hex_bytes, ikep->payload, plen - 4);
+
+	  if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
+	    {
+	      ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
+	      sa->unsupported_cp = payload;
+	      return;
+	    }
+	}
+
+      payload = ikep->nextpayload;
+      p += plen;
+    }
+
+cleanup_and_exit:
+  vec_free (plaintext);
+}
+
+static void
+ikev2_process_informational_req (vlib_main_t * vm, ikev2_sa_t * sa,
+				 ike_header_t * ike)
+{
+  int p = 0;
+  u32 len = clib_net_to_host_u32 (ike->length);
+  u8 payload = ike->nextpayload;
+  u8 *plaintext = 0;
+
+  ike_payload_header_t *ikep;
+  u32 plen;
+
+  clib_warning ("ispi %lx rspi %lx nextpayload %x version %x "
+		"exchange %x flags %x msgid %x length %u",
+		clib_net_to_host_u64 (ike->ispi),
+		clib_net_to_host_u64 (ike->rspi),
+		payload, ike->version,
+		ike->exchange, ike->flags,
+		clib_net_to_host_u32 (ike->msgid), len);
+
+  plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload);
+
+  if (!plaintext)
+    goto cleanup_and_exit;
+
+  /* process encrypted payload */
+  p = 0;
+  while (p < vec_len (plaintext) && payload != IKEV2_PAYLOAD_NONE)
+    {
+      ikep = (ike_payload_header_t *) & plaintext[p];
+      plen = clib_net_to_host_u16 (ikep->length);
+
+      if (plen < sizeof (ike_payload_header_t))
+	goto cleanup_and_exit;
+
+      if (payload == IKEV2_PAYLOAD_NOTIFY)	/* 41 */
+	{
+	  ikev2_notify_t *n = ikev2_parse_notify_payload (ikep);
+	  if (n->msg_type == IKEV2_NOTIFY_MSG_AUTHENTICATION_FAILED)
+	    ikev2_set_state (sa, IKEV2_STATE_AUTH_FAILED);
+	  vec_free (n);
+	}
+      else if (payload == IKEV2_PAYLOAD_DELETE)	/* 42 */
+	{
+	  sa->del = ikev2_parse_delete_payload (ikep);
+	}
+      else if (payload == IKEV2_PAYLOAD_VENDOR)	/* 43 */
+	{
+	  ikev2_parse_vendor_payload (ikep);
+	}
+      else
+	{
+	  clib_warning ("unknown payload %u flags %x length %u data %u",
+			payload, ikep->flags, plen - 4,
+			format_hex_bytes, ikep->payload, plen - 4);
+
+	  if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
+	    {
+	      sa->unsupported_cp = payload;
+	      return;
+	    }
+	}
+
+      payload = ikep->nextpayload;
+      p += plen;
+    }
+
+cleanup_and_exit:
+  vec_free (plaintext);
+}
+
+static void
+ikev2_process_create_child_sa_req (vlib_main_t * vm, ikev2_sa_t * sa,
+				   ike_header_t * ike)
+{
+  int p = 0;
+  u32 len = clib_net_to_host_u32 (ike->length);
+  u8 payload = ike->nextpayload;
+  u8 *plaintext = 0;
+  u8 rekeying = 0;
+  u8 i_nonce[IKEV2_NONCE_SIZE];
+
+  ike_payload_header_t *ikep;
+  u32 plen;
+  ikev2_notify_t *n = 0;
+  ikev2_ts_t *tsi = 0;
+  ikev2_ts_t *tsr = 0;
+  ikev2_sa_proposal_t *proposal = 0;
+  ikev2_child_sa_t *child_sa;
+
+  clib_warning ("ispi %lx rspi %lx nextpayload %x version %x "
+		"exchange %x flags %x msgid %x length %u",
+		clib_net_to_host_u64 (ike->ispi),
+		clib_net_to_host_u64 (ike->rspi),
+		payload, ike->version,
+		ike->exchange, ike->flags,
+		clib_net_to_host_u32 (ike->msgid), len);
+
+  plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload);
+
+  if (!plaintext)
+    goto cleanup_and_exit;
+
+  /* process encrypted payload */
+  p = 0;
+  while (p < vec_len (plaintext) && payload != IKEV2_PAYLOAD_NONE)
+    {
+      ikep = (ike_payload_header_t *) & plaintext[p];
+      plen = clib_net_to_host_u16 (ikep->length);
+
+      if (plen < sizeof (ike_payload_header_t))
+	goto cleanup_and_exit;
+
+      else if (payload == IKEV2_PAYLOAD_SA)
+	{
+	  proposal = ikev2_parse_sa_payload (ikep);
+	}
+      else if (payload == IKEV2_PAYLOAD_NOTIFY)
+	{
+	  n = ikev2_parse_notify_payload (ikep);
+	  if (n->msg_type == IKEV2_NOTIFY_MSG_REKEY_SA)
+	    {
+	      rekeying = 1;
+	    }
+	}
+      else if (payload == IKEV2_PAYLOAD_DELETE)
+	{
+	  sa->del = ikev2_parse_delete_payload (ikep);
+	}
+      else if (payload == IKEV2_PAYLOAD_VENDOR)
+	{
+	  ikev2_parse_vendor_payload (ikep);
+	}
+      else if (payload == IKEV2_PAYLOAD_NONCE)
+	{
+	  clib_memcpy (i_nonce, ikep->payload, plen - sizeof (*ikep));
+	}
+      else if (payload == IKEV2_PAYLOAD_TSI)
+	{
+	  tsi = ikev2_parse_ts_payload (ikep);
+	}
+      else if (payload == IKEV2_PAYLOAD_TSR)
+	{
+	  tsr = ikev2_parse_ts_payload (ikep);
+	}
+      else
+	{
+	  clib_warning ("unknown payload %u flags %x length %u data %u",
+			payload, ikep->flags, plen - 4,
+			format_hex_bytes, ikep->payload, plen - 4);
+
+	  if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
+	    {
+	      sa->unsupported_cp = payload;
+	      return;
+	    }
+	}
+
+      payload = ikep->nextpayload;
+      p += plen;
+    }
+
+  if (rekeying)
+    {
+      ikev2_rekey_t *rekey;
+      child_sa = ikev2_sa_get_child (sa, n->spi, n->protocol_id);
+      if (!child_sa)
+	{
+	  clib_warning ("child SA spi %lx not found", n->spi);
+	  goto cleanup_and_exit;
+	}
+      vec_add2 (sa->rekey, rekey, 1);
+      rekey->protocol_id = n->protocol_id;
+      rekey->spi = n->spi;
+      rekey->i_proposal = proposal;
+      rekey->r_proposal =
+	ikev2_select_proposal (proposal, IKEV2_PROTOCOL_ESP);
+      rekey->tsi = tsi;
+      rekey->tsr = tsr;
+      /* update Ni */
+      vec_free (sa->i_nonce);
+      vec_add (sa->i_nonce, i_nonce, IKEV2_NONCE_SIZE);
+      /* generate new Nr */
+      vec_free (sa->r_nonce);
+      sa->r_nonce = vec_new (u8, IKEV2_NONCE_SIZE);
+      RAND_bytes ((u8 *) sa->r_nonce, IKEV2_NONCE_SIZE);
+    }
+
+cleanup_and_exit:
+  vec_free (plaintext);
+  vec_free (n);
+}
+
+static u8 *
+ikev2_sa_generate_authmsg (ikev2_sa_t * sa, int is_responder)
+{
+  u8 *authmsg = 0;
+  u8 *data;
+  u8 *nonce;
+  ikev2_id_t *id;
+  u8 *key;
+  u8 *packet_data;
+  ikev2_sa_transform_t *tr_prf;
+
+  tr_prf =
+    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_PRF);
+
+  if (is_responder)
+    {
+      id = &sa->r_id;
+      key = sa->sk_pr;
+      nonce = sa->i_nonce;
+      packet_data = sa->last_sa_init_res_packet_data;
+    }
+  else
+    {
+      id = &sa->i_id;
+      key = sa->sk_pi;
+      nonce = sa->r_nonce;
+      packet_data = sa->last_sa_init_req_packet_data;
+    }
+
+  data = vec_new (u8, 4);
+  data[0] = id->type;
+  vec_append (data, id->data);
+
+  u8 *id_hash = ikev2_calc_prf (tr_prf, key, data);
+  vec_append (authmsg, packet_data);
+  vec_append (authmsg, nonce);
+  vec_append (authmsg, id_hash);
+  vec_free (id_hash);
+  vec_free (data);
+
+  return authmsg;
+}
+
+static int
+ikev2_ts_cmp (ikev2_ts_t * ts1, ikev2_ts_t * ts2)
+{
+  if (ts1->ts_type == ts2->ts_type && ts1->protocol_id == ts2->protocol_id &&
+      ts1->start_port == ts2->start_port && ts1->end_port == ts2->end_port &&
+      ts1->start_addr.as_u32 == ts2->start_addr.as_u32 &&
+      ts1->end_addr.as_u32 == ts2->end_addr.as_u32)
+    return 1;
+
+  return 0;
+}
+
+static void
+ikev2_sa_match_ts (ikev2_sa_t * sa)
+{
+  ikev2_main_t *km = &ikev2_main;
+  ikev2_profile_t *p;
+  ikev2_ts_t *ts, *tsi = 0, *tsr = 0;
+
+  /* *INDENT-OFF* */
+  pool_foreach (p, km->profiles, ({
+
+    /* check id */
+    if (p->rem_id.type != sa->i_id.type ||
+        vec_len(p->rem_id.data) != vec_len(sa->i_id.data) ||
+        memcmp(p->rem_id.data, sa->i_id.data, vec_len(p->rem_id.data)))
+      continue;
+
+    vec_foreach(ts, sa->childs[0].tsi)
+      {
+        if (ikev2_ts_cmp(&p->rem_ts, ts))
+          {
+            tsi = vec_dup(ts);
+            break;
+          }
+      }
+
+    vec_foreach(ts, sa->childs[0].tsr)
+      {
+        if (ikev2_ts_cmp(&p->loc_ts, ts))
+          {
+            tsr = vec_dup(ts);
+            break;
+          }
+      }
+
+    break;
+  }));
+  /* *INDENT-ON* */
+
+  if (tsi && tsr)
+    {
+      vec_free (sa->childs[0].tsi);
+      vec_free (sa->childs[0].tsr);
+      sa->childs[0].tsi = tsi;
+      sa->childs[0].tsr = tsr;
+    }
+  else
+    {
+      vec_free (tsi);
+      vec_free (tsr);
+      ikev2_set_state (sa, IKEV2_STATE_TS_UNACCEPTABLE);
+    }
+}
+
+static void
+ikev2_sa_auth (ikev2_sa_t * sa)
+{
+  ikev2_main_t *km = &ikev2_main;
+  ikev2_profile_t *p, *sel_p = 0;
+  u8 *authmsg, *key_pad, *psk = 0, *auth = 0;
+  ikev2_sa_transform_t *tr_prf;
+
+  tr_prf =
+    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_PRF);
+
+  /* only shared key and rsa signature */
+  if (!(sa->i_auth.method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC ||
+	sa->i_auth.method == IKEV2_AUTH_METHOD_RSA_SIG))
+    {
+      clib_warning ("unsupported authentication method %u",
+		    sa->i_auth.method);
+      ikev2_set_state (sa, IKEV2_STATE_AUTH_FAILED);
+      return;
+    }
+
+  key_pad = format (0, "%s", IKEV2_KEY_PAD);
+  authmsg = ikev2_sa_generate_authmsg (sa, 0);
+
+  /* *INDENT-OFF* */
+  pool_foreach (p, km->profiles, ({
+
+    /* check id */
+    if (p->rem_id.type != sa->i_id.type ||
+        vec_len(p->rem_id.data) != vec_len(sa->i_id.data) ||
+        memcmp(p->rem_id.data, sa->i_id.data, vec_len(p->rem_id.data)))
+      continue;
+
+    if (sa->i_auth.method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC)
+      {
+        if (!p->auth.data ||
+             p->auth.method != IKEV2_AUTH_METHOD_SHARED_KEY_MIC)
+          continue;
+
+        psk = ikev2_calc_prf(tr_prf, p->auth.data, key_pad);
+        auth = ikev2_calc_prf(tr_prf, psk, authmsg);
+
+        if (!memcmp(auth, sa->i_auth.data, vec_len(sa->i_auth.data)))
+          {
+            ikev2_set_state(sa, IKEV2_STATE_AUTHENTICATED);
+            vec_free(auth);
+            sel_p = p;
+            break;
+          }
+
+      }
+    else if (sa->i_auth.method == IKEV2_AUTH_METHOD_RSA_SIG)
+      {
+        if (p->auth.method != IKEV2_AUTH_METHOD_RSA_SIG)
+          continue;
+
+        if (ikev2_verify_sign(p->auth.key, sa->i_auth.data, authmsg) == 1)
+          {
+            ikev2_set_state(sa, IKEV2_STATE_AUTHENTICATED);
+            sel_p = p;
+            break;
+          }
+      }
+
+    vec_free(auth);
+    vec_free(psk);
+  }));
+  /* *INDENT-ON* */
+
+  vec_free (authmsg);
+
+  if (sa->state == IKEV2_STATE_AUTHENTICATED)
+    {
+      vec_free (sa->r_id.data);
+      sa->r_id.data = vec_dup (sel_p->loc_id.data);
+      sa->r_id.type = sel_p->loc_id.type;
+
+      /* generate our auth data */
+      authmsg = ikev2_sa_generate_authmsg (sa, 1);
+      if (sel_p->auth.method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC)
+	{
+	  sa->r_auth.data = ikev2_calc_prf (tr_prf, psk, authmsg);
+	  sa->r_auth.method = IKEV2_AUTH_METHOD_SHARED_KEY_MIC;
+	}
+      else if (sel_p->auth.method == IKEV2_AUTH_METHOD_RSA_SIG)
+	{
+	  sa->r_auth.data = ikev2_calc_sign (km->pkey, authmsg);
+	  sa->r_auth.method = IKEV2_AUTH_METHOD_RSA_SIG;
+	}
+      vec_free (authmsg);
+
+      /* select transforms for 1st child sa */
+      ikev2_sa_free_proposal_vector (&sa->childs[0].r_proposals);
+      sa->childs[0].r_proposals =
+	ikev2_select_proposal (sa->childs[0].i_proposals, IKEV2_PROTOCOL_ESP);
+    }
+  else
+    {
+      ikev2_set_state (sa, IKEV2_STATE_AUTH_FAILED);
+    }
+  vec_free (psk);
+  vec_free (key_pad);
+}
+
+static int
+ikev2_create_tunnel_interface (vnet_main_t * vnm, ikev2_sa_t * sa,
+			       ikev2_child_sa_t * child)
+{
+  ipsec_add_del_tunnel_args_t a;
+  ikev2_sa_transform_t *tr;
+  u8 encr_type = 0;
+
+  if (!child->r_proposals)
+    {
+      ikev2_set_state (sa, IKEV2_STATE_NO_PROPOSAL_CHOSEN);
+      return 1;
+    }
+
+  memset (&a, 0, sizeof (a));
+  a.is_add = 1;
+  a.local_ip.as_u32 = sa->raddr.as_u32;
+  a.remote_ip.as_u32 = sa->iaddr.as_u32;
+  a.local_spi = child->i_proposals[0].spi;
+  a.remote_spi = child->r_proposals[0].spi;
+  a.anti_replay = 1;
+
+  tr =
+    ikev2_sa_get_td_for_type (child->r_proposals, IKEV2_TRANSFORM_TYPE_ESN);
+  if (tr)
+    a.esn = tr->esn_type;
+  else
+    a.esn = 0;
+
+  tr =
+    ikev2_sa_get_td_for_type (child->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
+  if (tr)
+    {
+      if (tr->encr_type == IKEV2_TRANSFORM_ENCR_TYPE_AES_CBC && tr->key_len)
+	{
+	  switch (tr->key_len)
+	    {
+	    case 16:
+	      encr_type = IPSEC_CRYPTO_ALG_AES_CBC_128;
+	      break;
+	    case 24:
+	      encr_type = IPSEC_CRYPTO_ALG_AES_CBC_192;
+	      break;
+	    case 32:
+	      encr_type = IPSEC_CRYPTO_ALG_AES_CBC_256;
+	      break;
+	    default:
+	      ikev2_set_state (sa, IKEV2_STATE_NO_PROPOSAL_CHOSEN);
+	      return 1;
+	      break;
+	    }
+	}
+      else
+	{
+	  ikev2_set_state (sa, IKEV2_STATE_NO_PROPOSAL_CHOSEN);
+	  return 1;
+	}
+    }
+  else
+    {
+      ikev2_set_state (sa, IKEV2_STATE_NO_PROPOSAL_CHOSEN);
+      return 1;
+    }
+
+  tr =
+    ikev2_sa_get_td_for_type (child->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
+  if (tr)
+    {
+      if (tr->integ_type != IKEV2_TRANSFORM_INTEG_TYPE_AUTH_HMAC_SHA1_96)
+	{
+	  ikev2_set_state (sa, IKEV2_STATE_NO_PROPOSAL_CHOSEN);
+	  return 1;
+	}
+    }
+  else
+    {
+      ikev2_set_state (sa, IKEV2_STATE_NO_PROPOSAL_CHOSEN);
+      return 1;
+    }
+
+  ikev2_calc_child_keys (sa, child);
+
+  a.integ_alg = IPSEC_INTEG_ALG_SHA1_96;
+  a.local_integ_key_len = vec_len (child->sk_ar);
+  clib_memcpy (a.local_integ_key, child->sk_ar, a.local_integ_key_len);
+  a.remote_integ_key_len = vec_len (child->sk_ai);
+  clib_memcpy (a.remote_integ_key, child->sk_ai, a.remote_integ_key_len);
+
+  a.crypto_alg = encr_type;
+  a.local_crypto_key_len = vec_len (child->sk_er);
+  clib_memcpy (a.local_crypto_key, child->sk_er, a.local_crypto_key_len);
+  a.remote_crypto_key_len = vec_len (child->sk_ei);
+  clib_memcpy (a.remote_crypto_key, child->sk_ei, a.remote_crypto_key_len);
+
+  ipsec_add_del_tunnel_if (&a);
+
+  return 0;
+}
+
+static int
+ikev2_delete_tunnel_interface (vnet_main_t * vnm, ikev2_sa_t * sa,
+			       ikev2_child_sa_t * child)
+{
+  ipsec_add_del_tunnel_args_t a;
+
+  if (!vec_len (child->r_proposals))
+    return 0;
+
+  a.is_add = 0;
+  a.local_ip.as_u32 = sa->raddr.as_u32;
+  a.remote_ip.as_u32 = sa->iaddr.as_u32;
+  a.local_spi = child->i_proposals[0].spi;
+  a.remote_spi = child->r_proposals[0].spi;
+
+  ipsec_add_del_tunnel_if (&a);
+  return 0;
+}
+
+static u32
+ikev2_generate_resp (ikev2_sa_t * sa, ike_header_t * ike)
+{
+  v8 *integ = 0;
+  ike_payload_header_t *ph;
+  u16 plen;
+  u32 tlen = 0;
+
+  ikev2_sa_transform_t *tr_encr, *tr_integ;
+  tr_encr =
+    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
+  tr_integ =
+    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
+
+  ikev2_payload_chain_t *chain = 0;
+  ikev2_payload_new_chain (chain);
+
+  if (ike->exchange == IKEV2_EXCHANGE_SA_INIT)
+    {
+      if (sa->r_proposals == 0)
+	{
+	  ikev2_payload_add_notify (chain,
+				    IKEV2_NOTIFY_MSG_NO_PROPOSAL_CHOSEN, 0);
+	  ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
+	}
+      else if (sa->dh_group == IKEV2_TRANSFORM_DH_TYPE_NONE)
+	{
+	  u8 *data = vec_new (u8, 2);
+	  ikev2_sa_transform_t *tr_dh;
+	  tr_dh =
+	    ikev2_sa_get_td_for_type (sa->r_proposals,
+				      IKEV2_TRANSFORM_TYPE_DH);
+	  ASSERT (tr_dh && tr_dh->dh_type);
+
+	  data[0] = (tr_dh->dh_type >> 8) & 0xff;
+	  data[1] = (tr_dh->dh_type) & 0xff;
+
+	  ikev2_payload_add_notify (chain,
+				    IKEV2_NOTIFY_MSG_INVALID_KE_PAYLOAD,
+				    data);
+	  vec_free (data);
+	  ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
+	}
+      else if (sa->state == IKEV2_STATE_NOTIFY_AND_DELETE)
+	{
+	  u8 *data = vec_new (u8, 1);
+
+	  data[0] = sa->unsupported_cp;
+	  ikev2_payload_add_notify (chain,
+				    IKEV2_NOTIFY_MSG_UNSUPPORTED_CRITICAL_PAYLOAD,
+				    data);
+	  vec_free (data);
+	}
+      else
+	{
+	  ike->rspi = clib_host_to_net_u64 (sa->rspi);
+	  ikev2_payload_add_sa (chain, sa->r_proposals);
+	  ikev2_payload_add_ke (chain, sa->dh_group, sa->r_dh_data);
+	  ikev2_payload_add_nonce (chain, sa->r_nonce);
+	}
+    }
+  else if (ike->exchange == IKEV2_EXCHANGE_IKE_AUTH)
+    {
+      if (sa->state == IKEV2_STATE_AUTHENTICATED)
+	{
+	  ikev2_payload_add_id (chain, &sa->r_id, IKEV2_PAYLOAD_IDR);
+	  ikev2_payload_add_auth (chain, &sa->r_auth);
+	  ikev2_payload_add_sa (chain, sa->childs[0].r_proposals);
+	  ikev2_payload_add_ts (chain, sa->childs[0].tsi, IKEV2_PAYLOAD_TSI);
+	  ikev2_payload_add_ts (chain, sa->childs[0].tsr, IKEV2_PAYLOAD_TSR);
+	}
+      else if (sa->state == IKEV2_STATE_AUTH_FAILED)
+	{
+	  ikev2_payload_add_notify (chain,
+				    IKEV2_NOTIFY_MSG_AUTHENTICATION_FAILED,
+				    0);
+	  ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
+	}
+      else if (sa->state == IKEV2_STATE_TS_UNACCEPTABLE)
+	{
+	  ikev2_payload_add_notify (chain, IKEV2_NOTIFY_MSG_TS_UNACCEPTABLE,
+				    0);
+	  ikev2_payload_add_id (chain, &sa->r_id, IKEV2_PAYLOAD_IDR);
+	  ikev2_payload_add_auth (chain, &sa->r_auth);
+	}
+      else if (sa->state == IKEV2_STATE_NO_PROPOSAL_CHOSEN)
+	{
+	  ikev2_payload_add_notify (chain,
+				    IKEV2_NOTIFY_MSG_NO_PROPOSAL_CHOSEN, 0);
+	  ikev2_payload_add_id (chain, &sa->r_id, IKEV2_PAYLOAD_IDR);
+	  ikev2_payload_add_auth (chain, &sa->r_auth);
+	  ikev2_payload_add_ts (chain, sa->childs[0].tsi, IKEV2_PAYLOAD_TSI);
+	  ikev2_payload_add_ts (chain, sa->childs[0].tsr, IKEV2_PAYLOAD_TSR);
+	}
+      else if (sa->state == IKEV2_STATE_NOTIFY_AND_DELETE)
+	{
+	  u8 *data = vec_new (u8, 1);
+
+	  data[0] = sa->unsupported_cp;
+	  ikev2_payload_add_notify (chain,
+				    IKEV2_NOTIFY_MSG_UNSUPPORTED_CRITICAL_PAYLOAD,
+				    data);
+	  vec_free (data);
+	}
+      else
+	{
+	  ikev2_set_state (sa, IKEV2_STATE_DELETED);
+	  goto done;
+	}
+    }
+  else if (ike->exchange == IKEV2_EXCHANGE_INFORMATIONAL)
+    {
+      /* if pending delete */
+      if (sa->del)
+	{
+	  /* The response to a request that deletes the IKE SA is an empty
+	     INFORMATIONAL response. */
+	  if (sa->del[0].protocol_id == IKEV2_PROTOCOL_IKE)
+	    {
+	      ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
+	    }
+	  /* The response to a request that deletes ESP or AH SAs will contain
+	     delete payloads for the paired SAs going in the other direction. */
+	  else
+	    {
+	      ikev2_payload_add_delete (chain, sa->del);
+	    }
+	  vec_free (sa->del);
+	  sa->del = 0;
+	}
+      /* received N(AUTHENTICATION_FAILED) */
+      else if (sa->state == IKEV2_STATE_AUTH_FAILED)
+	{
+	  ikev2_set_state (sa, IKEV2_STATE_DELETED);
+	  goto done;
+	}
+      /* received unsupported critical payload */
+      else if (sa->unsupported_cp)
+	{
+	  u8 *data = vec_new (u8, 1);
+
+	  data[0] = sa->unsupported_cp;
+	  ikev2_payload_add_notify (chain,
+				    IKEV2_NOTIFY_MSG_UNSUPPORTED_CRITICAL_PAYLOAD,
+				    data);
+	  vec_free (data);
+	  sa->unsupported_cp = 0;
+	}
+      /* else send empty response */
+    }
+  else if (ike->exchange == IKEV2_EXCHANGE_CREATE_CHILD_SA)
+    {
+      if (sa->rekey)
+	{
+	  ikev2_payload_add_sa (chain, sa->rekey[0].r_proposal);
+	  ikev2_payload_add_nonce (chain, sa->r_nonce);
+	  ikev2_payload_add_ts (chain, sa->rekey[0].tsi, IKEV2_PAYLOAD_TSI);
+	  ikev2_payload_add_ts (chain, sa->rekey[0].tsr, IKEV2_PAYLOAD_TSR);
+	  vec_del1 (sa->rekey, 0);
+	}
+      else if (sa->unsupported_cp)
+	{
+	  u8 *data = vec_new (u8, 1);
+
+	  data[0] = sa->unsupported_cp;
+	  ikev2_payload_add_notify (chain,
+				    IKEV2_NOTIFY_MSG_UNSUPPORTED_CRITICAL_PAYLOAD,
+				    data);
+	  vec_free (data);
+	  sa->unsupported_cp = 0;
+	}
+      else
+	{
+	  ikev2_payload_add_notify (chain, IKEV2_NOTIFY_MSG_NO_ADDITIONAL_SAS,
+				    0);
+	}
+    }
+
+  /* IKEv2 header */
+  ike->version = IKE_VERSION_2;
+  ike->flags = IKEV2_HDR_FLAG_RESPONSE;
+  ike->nextpayload = IKEV2_PAYLOAD_SK;
+  tlen = sizeof (*ike);
+
+
+  if (ike->exchange == IKEV2_EXCHANGE_SA_INIT)
+    {
+      tlen += vec_len (chain->data);
+      ike->nextpayload = chain->first_payload_type;
+      ike->length = clib_host_to_net_u32 (tlen);
+      clib_memcpy (ike->payload, chain->data, vec_len (chain->data));
+
+      /* store whole IKE payload - needed for PSK auth */
+      vec_free (sa->last_sa_init_res_packet_data);
+      vec_add (sa->last_sa_init_res_packet_data, ike, tlen);
+    }
+  else
+    {
+
+      ikev2_payload_chain_add_padding (chain, tr_encr->block_size);
+
+      /* SK payload */
+      plen = sizeof (*ph);
+      ph = (ike_payload_header_t *) & ike->payload[0];
+      ph->nextpayload = chain->first_payload_type;
+      ph->flags = 0;
+      int enc_len = ikev2_encrypt_data (sa, chain->data, ph->payload);
+      plen += enc_len;
+
+      /* add space for hmac */
+      plen += tr_integ->key_trunc;
+      tlen += plen;
+
+      /* payload and total length */
+      ph->length = clib_host_to_net_u16 (plen);
+      ike->length = clib_host_to_net_u32 (tlen);
+
+      /* calc integrity data for whole packet except hash itself */
+      integ = ikev2_calc_integr (tr_integ, sa->sk_ar, (u8 *) ike,
+				 tlen - tr_integ->key_trunc);
+
+      clib_memcpy (ike->payload + tlen - tr_integ->key_trunc - sizeof (*ike),
+		   integ, tr_integ->key_trunc);
+
+      /* store whole IKE payload - needed for retransmit */
+      vec_free (sa->last_res_packet_data);
+      vec_add (sa->last_res_packet_data, ike, tlen);
+    }
+
+done:
+  ikev2_payload_destroy_chain (chain);
+  vec_free (integ);
+  return tlen;
+}
+
+static int
+ikev2_retransmit_sa_init (ike_header_t * ike,
+			  ip4_address_t iaddr, ip4_address_t raddr)
+{
+  ikev2_main_t *km = &ikev2_main;
+  ikev2_sa_t *sa;
+  u32 cpu_index = os_get_cpu_number ();
+
+  /* *INDENT-OFF* */
+  pool_foreach (sa, km->per_thread_data[cpu_index].sas, ({
+    if (sa->ispi == clib_net_to_host_u64(ike->ispi) &&
+        sa->iaddr.as_u32 == iaddr.as_u32 &&
+        sa->raddr.as_u32 == raddr.as_u32)
+      {
+        int p = 0;
+        u32 len = clib_net_to_host_u32(ike->length);
+        u8 payload = ike->nextpayload;
+
+        while (p < len && payload!= IKEV2_PAYLOAD_NONE) {
+          ike_payload_header_t * ikep = (ike_payload_header_t *) &ike->payload[p];
+          u32 plen = clib_net_to_host_u16(ikep->length);
+
+          if (plen < sizeof(ike_payload_header_t))
+            return -1;
+
+          if (payload == IKEV2_PAYLOAD_NONCE)
+            {
+              if (!memcmp(sa->i_nonce, ikep->payload, plen - sizeof(*ikep)))
+                {
+                  /* req is retransmit */
+                  if (sa->state == IKEV2_STATE_SA_INIT)
+                    {
+                      ike_header_t * tmp;
+                      tmp = (ike_header_t*)sa->last_sa_init_res_packet_data;
+                      ike->ispi = tmp->ispi;
+                      ike->rspi = tmp->rspi;
+                      ike->nextpayload = tmp->nextpayload;
+                      ike->version = tmp->version;
+                      ike->exchange = tmp->exchange;
+                      ike->flags = tmp->flags;
+                      ike->msgid = tmp->msgid;
+                      ike->length = tmp->length;
+                      clib_memcpy(ike->payload, tmp->payload,
+                             clib_net_to_host_u32(tmp->length) - sizeof(*ike));
+                      clib_warning("IKE_SA_INIT retransmit from %U to %U",
+                                   format_ip4_address, &raddr,
+                                   format_ip4_address, &iaddr);
+                      return 1;
+                    }
+                  /* else ignore req */
+                  else
+                    {
+                      clib_warning("IKE_SA_INIT ignore from %U to %U",
+                                   format_ip4_address, &raddr,
+                                   format_ip4_address, &iaddr);
+                      return -1;
+                    }
+                }
+            }
+          payload = ikep->nextpayload;
+          p+=plen;
+        }
+      }
+  }));
+  /* *INDENT-ON* */
+
+  /* req is not retransmit */
+  return 0;
+}
+
+static int
+ikev2_retransmit_resp (ikev2_sa_t * sa, ike_header_t * ike)
+{
+  u32 msg_id = clib_net_to_host_u32 (ike->msgid);
+
+  /* new req */
+  if (msg_id > sa->last_msg_id)
+    {
+      sa->last_msg_id = msg_id;
+      return 0;
+    }
+  /* retransmitted req */
+  else if (msg_id == sa->last_msg_id)
+    {
+      ike_header_t *tmp;
+      tmp = (ike_header_t *) sa->last_res_packet_data;
+      ike->ispi = tmp->ispi;
+      ike->rspi = tmp->rspi;
+      ike->nextpayload = tmp->nextpayload;
+      ike->version = tmp->version;
+      ike->exchange = tmp->exchange;
+      ike->flags = tmp->flags;
+      ike->msgid = tmp->msgid;
+      ike->length = tmp->length;
+      clib_memcpy (ike->payload, tmp->payload,
+		   clib_net_to_host_u32 (tmp->length) - sizeof (*ike));
+      clib_warning ("IKE msgid %u retransmit from %U to %U",
+		    msg_id,
+		    format_ip4_address, &sa->raddr,
+		    format_ip4_address, &sa->iaddr);
+      return 1;
+    }
+  /* old req ignore */
+  else
+    {
+      clib_warning ("IKE msgid %u req ignore from %U to %U",
+		    msg_id,
+		    format_ip4_address, &sa->raddr,
+		    format_ip4_address, &sa->iaddr);
+      return -1;
+    }
+}
+
+static uword
+ikev2_node_fn (vlib_main_t * vm,
+	       vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  ikev2_next_t next_index;
+  ikev2_main_t *km = &ikev2_main;
+  u32 cpu_index = os_get_cpu_number ();
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0 = IKEV2_NEXT_ERROR_DROP;
+	  u32 sw_if_index0;
+	  ip4_header_t *ip40;
+	  udp_header_t *udp0;
+	  ike_header_t *ike0;
+	  ikev2_sa_t *sa0 = 0;
+	  ikev2_sa_t sa;	/* temporary store for SA */
+	  int len = 0;
+	  int r;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  ike0 = vlib_buffer_get_current (b0);
+	  vlib_buffer_advance (b0, -sizeof (*udp0));
+	  udp0 = vlib_buffer_get_current (b0);
+	  vlib_buffer_advance (b0, -sizeof (*ip40));
+	  ip40 = vlib_buffer_get_current (b0);
+
+	  if (ike0->version != IKE_VERSION_2)
+	    {
+	      vlib_node_increment_counter (vm, ikev2_node.index,
+					   IKEV2_ERROR_NOT_IKEV2, 1);
+	      goto dispatch0;
+	    }
+
+	  if (ike0->exchange == IKEV2_EXCHANGE_SA_INIT)
+	    {
+	      sa0 = &sa;
+	      memset (sa0, 0, sizeof (*sa0));
+
+	      if (ike0->rspi == 0)
+		{
+		  sa0->raddr.as_u32 = ip40->dst_address.as_u32;
+		  sa0->iaddr.as_u32 = ip40->src_address.as_u32;
+
+		  r = ikev2_retransmit_sa_init (ike0, sa0->iaddr, sa0->raddr);
+		  if (r == 1)
+		    {
+		      vlib_node_increment_counter (vm, ikev2_node.index,
+						   IKEV2_ERROR_IKE_SA_INIT_RETRANSMIT,
+						   1);
+		      len = clib_net_to_host_u32 (ike0->length);
+		      goto dispatch0;
+		    }
+		  else if (r == -1)
+		    {
+		      vlib_node_increment_counter (vm, ikev2_node.index,
+						   IKEV2_ERROR_IKE_SA_INIT_IGNORE,
+						   1);
+		      goto dispatch0;
+		    }
+
+		  ikev2_process_sa_init_req (vm, sa0, ike0);
+
+		  if (sa0->state == IKEV2_STATE_SA_INIT)
+		    {
+		      ikev2_sa_free_proposal_vector (&sa0->r_proposals);
+		      sa0->r_proposals =
+			ikev2_select_proposal (sa0->i_proposals,
+					       IKEV2_PROTOCOL_IKE);
+		      ikev2_generate_sa_init_data (sa0);
+		    }
+
+		  if (sa0->state == IKEV2_STATE_SA_INIT ||
+		      sa0->state == IKEV2_STATE_NOTIFY_AND_DELETE)
+		    {
+		      len = ikev2_generate_resp (sa0, ike0);
+		    }
+
+		  if (sa0->state == IKEV2_STATE_SA_INIT)
+		    {
+		      /* add SA to the pool */
+		      pool_get (km->per_thread_data[cpu_index].sas, sa0);
+		      clib_memcpy (sa0, &sa, sizeof (*sa0));
+		      hash_set (km->per_thread_data[cpu_index].sa_by_rspi,
+				sa0->rspi,
+				sa0 - km->per_thread_data[cpu_index].sas);
+		    }
+		  else
+		    {
+		      ikev2_sa_free_all_vec (sa0);
+		    }
+		}
+	    }
+	  else if (ike0->exchange == IKEV2_EXCHANGE_IKE_AUTH)
+	    {
+	      uword *p;
+	      p = hash_get (km->per_thread_data[cpu_index].sa_by_rspi,
+			    clib_net_to_host_u64 (ike0->rspi));
+	      if (p)
+		{
+		  sa0 = pool_elt_at_index (km->per_thread_data[cpu_index].sas,
+					   p[0]);
+
+		  r = ikev2_retransmit_resp (sa0, ike0);
+		  if (r == 1)
+		    {
+		      vlib_node_increment_counter (vm, ikev2_node.index,
+						   IKEV2_ERROR_IKE_REQ_RETRANSMIT,
+						   1);
+		      len = clib_net_to_host_u32 (ike0->length);
+		      goto dispatch0;
+		    }
+		  else if (r == -1)
+		    {
+		      vlib_node_increment_counter (vm, ikev2_node.index,
+						   IKEV2_ERROR_IKE_REQ_IGNORE,
+						   1);
+		      goto dispatch0;
+		    }
+
+		  ikev2_process_auth_req (vm, sa0, ike0);
+		  ikev2_sa_auth (sa0);
+		  if (sa0->state == IKEV2_STATE_AUTHENTICATED)
+		    {
+		      ikev2_initial_contact_cleanup (sa0);
+		      ikev2_sa_match_ts (sa0);
+		      if (sa0->state != IKEV2_STATE_TS_UNACCEPTABLE)
+			ikev2_create_tunnel_interface (km->vnet_main, sa0,
+						       &sa0->childs[0]);
+		    }
+		  len = ikev2_generate_resp (sa0, ike0);
+		}
+	    }
+	  else if (ike0->exchange == IKEV2_EXCHANGE_INFORMATIONAL)
+	    {
+	      uword *p;
+	      p = hash_get (km->per_thread_data[cpu_index].sa_by_rspi,
+			    clib_net_to_host_u64 (ike0->rspi));
+	      if (p)
+		{
+		  sa0 = pool_elt_at_index (km->per_thread_data[cpu_index].sas,
+					   p[0]);
+
+		  r = ikev2_retransmit_resp (sa0, ike0);
+		  if (r == 1)
+		    {
+		      vlib_node_increment_counter (vm, ikev2_node.index,
+						   IKEV2_ERROR_IKE_REQ_RETRANSMIT,
+						   1);
+		      len = clib_net_to_host_u32 (ike0->length);
+		      goto dispatch0;
+		    }
+		  else if (r == -1)
+		    {
+		      vlib_node_increment_counter (vm, ikev2_node.index,
+						   IKEV2_ERROR_IKE_REQ_IGNORE,
+						   1);
+		      goto dispatch0;
+		    }
+
+		  ikev2_process_informational_req (vm, sa0, ike0);
+		  if (sa0->del)
+		    {
+		      if (sa0->del[0].protocol_id != IKEV2_PROTOCOL_IKE)
+			{
+			  ikev2_delete_t *d, *tmp, *resp = 0;
+			  vec_foreach (d, sa0->del)
+			  {
+			    ikev2_child_sa_t *ch_sa;
+			    ch_sa = ikev2_sa_get_child (sa0, d->spi,
+							d->protocol_id);
+			    if (ch_sa)
+			      {
+				ikev2_delete_tunnel_interface (km->vnet_main,
+							       sa0, ch_sa);
+				vec_add2 (resp, tmp, 1);
+				tmp->protocol_id = d->protocol_id;
+				tmp->spi = ch_sa->r_proposals[0].spi;
+				ikev2_sa_del_child_sa (sa0, ch_sa);
+			      }
+			  }
+			  vec_free (sa0->del);
+			  sa0->del = resp;
+			}
+		    }
+		  len = ikev2_generate_resp (sa0, ike0);
+		}
+	    }
+	  else if (ike0->exchange == IKEV2_EXCHANGE_CREATE_CHILD_SA)
+	    {
+	      uword *p;
+	      p = hash_get (km->per_thread_data[cpu_index].sa_by_rspi,
+			    clib_net_to_host_u64 (ike0->rspi));
+	      if (p)
+		{
+		  sa0 = pool_elt_at_index (km->per_thread_data[cpu_index].sas,
+					   p[0]);
+
+		  r = ikev2_retransmit_resp (sa0, ike0);
+		  if (r == 1)
+		    {
+		      vlib_node_increment_counter (vm, ikev2_node.index,
+						   IKEV2_ERROR_IKE_REQ_RETRANSMIT,
+						   1);
+		      len = clib_net_to_host_u32 (ike0->length);
+		      goto dispatch0;
+		    }
+		  else if (r == -1)
+		    {
+		      vlib_node_increment_counter (vm, ikev2_node.index,
+						   IKEV2_ERROR_IKE_REQ_IGNORE,
+						   1);
+		      goto dispatch0;
+		    }
+
+		  ikev2_process_create_child_sa_req (vm, sa0, ike0);
+		  if (sa0->rekey)
+		    {
+		      if (sa0->rekey[0].protocol_id != IKEV2_PROTOCOL_IKE)
+			{
+			  ikev2_child_sa_t *child;
+			  vec_add2 (sa0->childs, child, 1);
+			  child->r_proposals = sa0->rekey[0].r_proposal;
+			  child->i_proposals = sa0->rekey[0].i_proposal;
+			  child->tsi = sa0->rekey[0].tsi;
+			  child->tsr = sa0->rekey[0].tsr;
+			  ikev2_create_tunnel_interface (km->vnet_main, sa0,
+							 child);
+			}
+		      len = ikev2_generate_resp (sa0, ike0);
+		    }
+		}
+	    }
+	  else
+	    {
+	      clib_warning ("IKEv2 exchange %u packet received from %U to %U",
+			    ike0->exchange,
+			    format_ip4_address, ip40->src_address.as_u8,
+			    format_ip4_address, ip40->dst_address.as_u8);
+	    }
+
+	dispatch0:
+	  /* if we are sending packet back, rewrite headers */
+	  if (len)
+	    {
+	      next0 = IKEV2_NEXT_IP4_LOOKUP;
+	      ip40->dst_address.as_u32 = sa0->iaddr.as_u32;
+	      ip40->src_address.as_u32 = sa0->raddr.as_u32;
+	      udp0->length =
+		clib_host_to_net_u16 (len + sizeof (udp_header_t));
+	      udp0->checksum = 0;
+	      b0->current_length =
+		len + sizeof (ip4_header_t) + sizeof (udp_header_t);
+	      ip40->length = clib_host_to_net_u16 (b0->current_length);
+	      ip40->checksum = ip4_header_checksum (ip40);
+	    }
+	  /* delete sa */
+	  if (sa0 && (sa0->state == IKEV2_STATE_DELETED ||
+		      sa0->state == IKEV2_STATE_NOTIFY_AND_DELETE))
+	    {
+	      ikev2_child_sa_t *c;
+
+	      vec_foreach (c, sa0->childs)
+		ikev2_delete_tunnel_interface (km->vnet_main, sa0, c);
+
+	      ikev2_delete_sa (sa0);
+	    }
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      ikev2_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = sw_if_index0;
+	      t->next_index = next0;
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, ikev2_node.index,
+			       IKEV2_ERROR_PROCESSED, frame->n_vectors);
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ikev2_node,static) = {
+  .function = ikev2_node_fn,
+  .name = "ikev2",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ikev2_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(ikev2_error_strings),
+  .error_strings = ikev2_error_strings,
+
+  .n_next_nodes = IKEV2_N_NEXT,
+
+  .next_nodes = {
+    [IKEV2_NEXT_IP4_LOOKUP] = "ip4-lookup",
+        [IKEV2_NEXT_ERROR_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+
+static ikev2_profile_t *
+ikev2_profile_index_by_name (u8 * name)
+{
+  ikev2_main_t *km = &ikev2_main;
+  uword *p;
+
+  p = mhash_get (&km->profile_index_by_name, name);
+  if (!p)
+    return 0;
+
+  return pool_elt_at_index (km->profiles, p[0]);
+}
+
+clib_error_t *
+ikev2_set_local_key (vlib_main_t * vm, u8 * file)
+{
+  ikev2_main_t *km = &ikev2_main;
+
+  km->pkey = ikev2_load_key_file (file);
+  if (km->pkey == NULL)
+    return clib_error_return (0, "load key '%s' failed", file);
+
+  return 0;
+}
+
+clib_error_t *
+ikev2_add_del_profile (vlib_main_t * vm, u8 * name, int is_add)
+{
+  ikev2_main_t *km = &ikev2_main;
+  ikev2_profile_t *p;
+
+  if (is_add)
+    {
+      if (ikev2_profile_index_by_name (name))
+	return clib_error_return (0, "policy %v already exists", name);
+
+      pool_get (km->profiles, p);
+      memset (p, 0, sizeof (*p));
+      p->name = vec_dup (name);
+      uword index = p - km->profiles;
+      mhash_set_mem (&km->profile_index_by_name, name, &index, 0);
+    }
+  else
+    {
+      p = ikev2_profile_index_by_name (name);
+      if (!p)
+	return clib_error_return (0, "policy %v does not exists", name);
+
+      vec_free (p->name);
+      pool_put (km->profiles, p);
+      mhash_unset (&km->profile_index_by_name, name, 0);
+    }
+  return 0;
+}
+
+clib_error_t *
+ikev2_set_profile_auth (vlib_main_t * vm, u8 * name, u8 auth_method,
+			u8 * auth_data, u8 data_hex_format)
+{
+  ikev2_profile_t *p;
+  clib_error_t *r;
+
+  p = ikev2_profile_index_by_name (name);
+
+  if (!p)
+    {
+      r = clib_error_return (0, "unknown profile %v", name);
+      return r;
+    }
+  vec_free (p->auth.data);
+  p->auth.method = auth_method;
+  p->auth.data = vec_dup (auth_data);
+  p->auth.hex = data_hex_format;
+
+  if (auth_method == IKEV2_AUTH_METHOD_RSA_SIG)
+    {
+      vec_add1 (p->auth.data, 0);
+      if (p->auth.key)
+	EVP_PKEY_free (p->auth.key);
+      p->auth.key = ikev2_load_cert_file (auth_data);
+      if (p->auth.key == NULL)
+	return clib_error_return (0, "load cert '%s' failed", auth_data);
+    }
+
+  return 0;
+}
+
+clib_error_t *
+ikev2_set_profile_id (vlib_main_t * vm, u8 * name, u8 id_type, u8 * data,
+		      int is_local)
+{
+  ikev2_profile_t *p;
+  clib_error_t *r;
+
+  if (id_type > IKEV2_ID_TYPE_ID_RFC822_ADDR
+      && id_type < IKEV2_ID_TYPE_ID_KEY_ID)
+    {
+      r = clib_error_return (0, "unsupported identity type %U",
+			     format_ikev2_id_type, id_type);
+      return r;
+    }
+
+  p = ikev2_profile_index_by_name (name);
+
+  if (!p)
+    {
+      r = clib_error_return (0, "unknown profile %v", name);
+      return r;
+    }
+
+  if (is_local)
+    {
+      vec_free (p->loc_id.data);
+      p->loc_id.type = id_type;
+      p->loc_id.data = vec_dup (data);
+    }
+  else
+    {
+      vec_free (p->rem_id.data);
+      p->rem_id.type = id_type;
+      p->rem_id.data = vec_dup (data);
+    }
+
+  return 0;
+}
+
+clib_error_t *
+ikev2_set_profile_ts (vlib_main_t * vm, u8 * name, u8 protocol_id,
+		      u16 start_port, u16 end_port, ip4_address_t start_addr,
+		      ip4_address_t end_addr, int is_local)
+{
+  ikev2_profile_t *p;
+  clib_error_t *r;
+
+  p = ikev2_profile_index_by_name (name);
+
+  if (!p)
+    {
+      r = clib_error_return (0, "unknown profile %v", name);
+      return r;
+    }
+
+  if (is_local)
+    {
+      p->loc_ts.start_addr.as_u32 = start_addr.as_u32;
+      p->loc_ts.end_addr.as_u32 = end_addr.as_u32;
+      p->loc_ts.start_port = start_port;
+      p->loc_ts.end_port = end_port;
+      p->loc_ts.protocol_id = protocol_id;
+      p->loc_ts.ts_type = 7;
+    }
+  else
+    {
+      p->rem_ts.start_addr.as_u32 = start_addr.as_u32;
+      p->rem_ts.end_addr.as_u32 = end_addr.as_u32;
+      p->rem_ts.start_port = start_port;
+      p->rem_ts.end_port = end_port;
+      p->rem_ts.protocol_id = protocol_id;
+      p->rem_ts.ts_type = 7;
+    }
+
+  return 0;
+}
+
+
+clib_error_t *
+ikev2_init (vlib_main_t * vm)
+{
+  ikev2_main_t *km = &ikev2_main;
+  clib_error_t *error;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  int thread_id;
+
+  memset (km, 0, sizeof (ikev2_main_t));
+  km->vnet_main = vnet_get_main ();
+  km->vlib_main = vm;
+
+  ikev2_crypto_init (km);
+
+  mhash_init_vec_string (&km->profile_index_by_name, sizeof (uword));
+
+  vec_validate (km->per_thread_data, tm->n_vlib_mains - 1);
+  for (thread_id = 0; thread_id < tm->n_vlib_mains - 1; thread_id++)
+    {
+      km->per_thread_data[thread_id].sa_by_rspi =
+	hash_create (0, sizeof (uword));
+    }
+
+  if ((error = vlib_call_init_function (vm, ikev2_cli_init)))
+    return error;
+
+  udp_register_dst_port (vm, 500, ikev2_node.index, 1);
+
+  return 0;
+}
+
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ikev2.h b/src/vnet/ipsec/ikev2.h
new file mode 100644
index 00000000..723fdde8
--- /dev/null
+++ b/src/vnet/ipsec/ikev2.h
@@ -0,0 +1,410 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_ikev2_h__
+#define __included_ikev2_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+
+#include <vppinfra/error.h>
+
+#define IKEV2_NONCE_SIZE  32
+
+#define IKEV2_KEY_PAD "Key Pad for IKEv2"
+
+typedef u8 v8;
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u64 ispi;
+  u64 rspi;
+  u8 nextpayload;
+  u8 version;
+  u8 exchange;
+  u8 flags;
+  u32 msgid; u32 length; u8 payload[0];
+}) ike_header_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     u8 nextpayload;
+		     u8 flags;
+		     u16 length;
+		     u16 dh_group;
+		     u8 reserved[2]; u8 payload[0];}) ike_ke_payload_header_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u8 nextpayload;
+  u8 flags;
+  u16 length; u8 payload[0];
+}) ike_payload_header_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u8 nextpayload;
+  u8 flags;
+  u16 length;
+  u8 auth_method;
+  u8 reserved[3];
+  u8 payload[0];
+}) ike_auth_payload_header_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u8 nextpayload;
+  u8 flags;
+  u16 length;
+  u8 id_type;
+  u8 reserved[3]; u8 payload[0];
+}) ike_id_payload_header_t;
+/* *INDENT-ON* */
+
+#define IKE_VERSION_2                    0x20
+
+#define IKEV2_EXCHANGE_SA_INIT           34
+#define IKEV2_EXCHANGE_IKE_AUTH          35
+#define IKEV2_EXCHANGE_CREATE_CHILD_SA   36
+#define IKEV2_EXCHANGE_INFORMATIONAL     37
+
+#define IKEV2_HDR_FLAG_INITIATOR         (1<<3)
+#define IKEV2_HDR_FLAG_VERSION           (1<<4)
+#define IKEV2_HDR_FLAG_RESPONSE          (1<<5)
+
+#define IKEV2_PAYLOAD_FLAG_CRITICAL      (1<<7)
+
+#define IKEV2_PAYLOAD_NONE      0
+#define IKEV2_PAYLOAD_SA        33
+#define IKEV2_PAYLOAD_KE        34
+#define IKEV2_PAYLOAD_IDI       35
+#define IKEV2_PAYLOAD_IDR       36
+#define IKEV2_PAYLOAD_AUTH      39
+#define IKEV2_PAYLOAD_NONCE     40
+#define IKEV2_PAYLOAD_NOTIFY    41
+#define IKEV2_PAYLOAD_DELETE    42
+#define IKEV2_PAYLOAD_VENDOR    43
+#define IKEV2_PAYLOAD_TSI       44
+#define IKEV2_PAYLOAD_TSR       45
+#define IKEV2_PAYLOAD_SK        46
+
+typedef enum
+{
+  IKEV2_PROTOCOL_IKE = 1,
+  IKEV2_PROTOCOL_AH = 2,
+  IKEV2_PROTOCOL_ESP = 3,
+} ikev2_protocol_id_t;
+
+#define foreach_ikev2_notify_msg_type \
+  _(    0, NONE)                                \
+  _(    1, UNSUPPORTED_CRITICAL_PAYLOAD)        \
+  _(    4, INVALID_IKE_SPI)                     \
+  _(    5, INVALID_MAJOR_VERSION)               \
+  _(    7, INVALID_SYNTAX)                      \
+  _(    8, INVALID_MESSAGE_ID)                  \
+  _(   11, INVALID_SPI)                         \
+  _(   14, NO_PROPOSAL_CHOSEN)                  \
+  _(   17, INVALID_KE_PAYLOAD)                  \
+  _(   24, AUTHENTICATION_FAILED)               \
+  _(   34, SINGLE_PAIR_REQUIRED)                \
+  _(   35, NO_ADDITIONAL_SAS)                   \
+  _(   36, INTERNAL_ADDRESS_FAILURE)            \
+  _(   37, FAILED_CP_REQUIRED)                  \
+  _(   38, TS_UNACCEPTABLE)                     \
+  _(   39, INVALID_SELECTORS)                   \
+  _(   40, UNACCEPTABLE_ADDRESSES)              \
+  _(   41, UNEXPECTED_NAT_DETECTED)             \
+  _(   42, USE_ASSIGNED_HoA)                    \
+  _(   43, TEMPORARY_FAILURE)                   \
+  _(   44, CHILD_SA_NOT_FOUND)                  \
+  _(   45, INVALID_GROUP_ID)                    \
+  _(   46, AUTHORIZATION_FAILED)                \
+  _(16384, INITIAL_CONTACT)                     \
+  _(16385, SET_WINDOW_SIZE)                     \
+  _(16386, ADDITIONAL_TS_POSSIBLE)              \
+  _(16387, IPCOMP_SUPPORTED)                    \
+  _(16388, NAT_DETECTION_SOURCE_IP)             \
+  _(16389, NAT_DETECTION_DESTINATION_IP)        \
+  _(16390, COOKIE)                              \
+  _(16391, USE_TRANSPORT_MODE)                  \
+  _(16392, HTTP_CERT_LOOKUP_SUPPORTED)          \
+  _(16393, REKEY_SA)                            \
+  _(16394, ESP_TFC_PADDING_NOT_SUPPORTED)       \
+  _(16395, NON_FIRST_FRAGMENTS_ALSO)            \
+  _(16396, MOBIKE_SUPPORTED)                    \
+  _(16397, ADDITIONAL_IP4_ADDRESS)              \
+  _(16398, ADDITIONAL_IP6_ADDRESS)              \
+  _(16399, NO_ADDITIONAL_ADDRESSES)             \
+  _(16400, UPDATE_SA_ADDRESSES)                 \
+  _(16401, COOKIE2)                             \
+  _(16402, NO_NATS_ALLOWED)                     \
+  _(16403, AUTH_LIFETIME)                       \
+  _(16404, MULTIPLE_AUTH_SUPPORTED)             \
+  _(16405, ANOTHER_AUTH_FOLLOWS)                \
+  _(16406, REDIRECT_SUPPORTED)                  \
+  _(16407, REDIRECT)                            \
+  _(16408, REDIRECTED_FROM)                     \
+  _(16409, TICKET_LT_OPAQUE)                    \
+  _(16410, TICKET_REQUEST)                      \
+  _(16411, TICKET_ACK)                          \
+  _(16412, TICKET_NACK)                         \
+  _(16413, TICKET_OPAQUE)                       \
+  _(16414, LINK_ID)                             \
+  _(16415, USE_WESP_MODE)                       \
+  _(16416, ROHC_SUPPORTED)                      \
+  _(16417, EAP_ONLY_AUTHENTICATION)             \
+  _(16418, CHILDLESS_IKEV2_SUPPORTED)           \
+  _(16419, QUICK_CRASH_DETECTION)               \
+  _(16420, IKEV2_MESSAGE_ID_SYNC_SUPPORTED)     \
+  _(16421, IPSEC_REPLAY_COUNTER_SYNC_SUPPORTED) \
+  _(16422, IKEV2_MESSAGE_ID_SYNC)               \
+  _(16423, IPSEC_REPLAY_COUNTER_SYNC)           \
+  _(16424, SECURE_PASSWORD_METHODS)             \
+  _(16425, PSK_PERSIST)                         \
+  _(16426, PSK_CONFIRM)                         \
+  _(16427, ERX_SUPPORTED)                       \
+  _(16428, IFOM_CAPABILITY)                     \
+  _(16429, SENDER_REQUEST_ID)                   \
+  _(16430, IKEV2_FRAGMENTATION_SUPPORTED)       \
+  _(16431, SIGNATURE_HASH_ALGORITHMS)
+
+
+typedef enum
+{
+#define _(v,f) IKEV2_NOTIFY_MSG_##f = v,
+  foreach_ikev2_notify_msg_type
+#undef _
+} ikev2_notify_msg_type_t;
+
+#define foreach_ikev2_transform_type       \
+  _(0, UNDEFINED, "undefinded") \
+  _(1, ENCR,  "encr")           \
+  _(2, PRF,   "prf")            \
+  _(3, INTEG, "integ")          \
+  _(4, DH,    "dh-group")       \
+  _(5, ESN,   "esn")
+
+typedef enum
+{
+#define _(v,f,s) IKEV2_TRANSFORM_TYPE_##f = v,
+  foreach_ikev2_transform_type
+#undef _
+  IKEV2_TRANSFORM_NUM_TYPES
+} ikev2_transform_type_t;
+
+
+#define foreach_ikev2_transform_encr_type     \
+  _(1 , DES_IV64,  "des-iv64") \
+  _(2 , DES,       "des")      \
+  _(3 , 3DES,      "3des")     \
+  _(4 , RC5,       "rc5")      \
+  _(5 , IDEA,      "idea")     \
+  _(6 , CAST,      "cast")     \
+  _(7 , BLOWFISH,  "blowfish") \
+  _(8 , 3IDEA,     "3idea")    \
+  _(9 , DES_IV32,  "des-iv32") \
+  _(11, NULL,      "null")     \
+  _(12, AES_CBC,   "aes-cbc")  \
+  _(13, AES_CTR,   "aes-ctr")
+
+typedef enum
+{
+#define _(v,f,str) IKEV2_TRANSFORM_ENCR_TYPE_##f = v,
+  foreach_ikev2_transform_encr_type
+#undef _
+} ikev2_transform_encr_type_t;
+
+#define foreach_ikev2_transform_prf_type   \
+  _(1, PRF_HMAC_MD5,      "hmac-md5")      \
+  _(2, PRF_HMAC_SHA1,     "hmac-sha1")     \
+  _(3, PRF_MAC_TIGER,     "mac-tiger")     \
+  _(4, PRF_AES128_XCBC,   "aes128-xcbc")   \
+  _(5, PRF_HMAC_SHA2_256, "hmac-sha2-256") \
+  _(6, PRF_HMAC_SHA2_384, "hmac-sha2-384") \
+  _(7, PRF_HMAC_SHA2_512, "hmac-sha2-512") \
+  _(8, PRF_AES128_CMAC,   "aes128-cmac")
+
+typedef enum
+{
+#define _(v,f,str) IKEV2_TRANSFORM_PRF_TYPE_##f = v,
+  foreach_ikev2_transform_prf_type
+#undef _
+} ikev2_transform_prf_type_t;
+
+#define foreach_ikev2_transform_integ_type           \
+  _(0,  NONE,                   "none")              \
+  _(1,  AUTH_HMAC_MD5_96,       "md5-96")            \
+  _(2,  AUTH_HMAC_SHA1_96,      "sha1-96")           \
+  _(3,  AUTH_DES_MAC,           "des-mac")           \
+  _(4,  AUTH_KPDK_MD5,          "kpdk-md5")          \
+  _(5,  AUTH_AES_XCBC_96,       "aes-xcbc-96")       \
+  _(6,  AUTH_HMAC_MD5_128,      "md5-128")           \
+  _(7,  AUTH_HMAC_SHA1_160,     "sha1-160")          \
+  _(8,  AUTH_AES_CMAC_96,       "cmac-96")           \
+  _(9,  AUTH_AES_128_GMAC,      "aes-128-gmac")      \
+  _(10, AUTH_AES_192_GMAC,      "aes-192-gmac")      \
+  _(11, AUTH_AES_256_GMAC,      "aes-256-gmac")      \
+  _(12, AUTH_HMAC_SHA2_256_128, "hmac-sha2-256-128") \
+  _(13, AUTH_HMAC_SHA2_384_192, "hmac-sha2-384-192") \
+  _(14, AUTH_HMAC_SHA2_512_256, "hmac-sha2-512-256")
+
+typedef enum
+{
+#define _(v,f, str) IKEV2_TRANSFORM_INTEG_TYPE_##f = v,
+  foreach_ikev2_transform_integ_type
+#undef _
+} ikev2_transform_integ_type_t;
+
+#if defined(OPENSSL_NO_CISCO_FECDH)
+#define foreach_ikev2_transform_dh_type \
+  _(0, NONE,           "none")          \
+  _(1, MODP_768,       "modp-768")      \
+  _(2, MODP_1024,      "modp-1024")     \
+  _(5, MODP_1536,      "modp-1536")     \
+  _(14, MODP_2048,     "modp-2048")     \
+  _(15, MODP_3072,     "modp-3072")     \
+  _(16, MODP_4096,     "modp-4096")     \
+  _(17, MODP_6144,     "modp-6144")     \
+  _(18, MODP_8192,     "modp-8192")     \
+  _(19, ECP_256,       "ecp-256")       \
+  _(20, ECP_384,       "ecp-384")       \
+  _(21, ECP_521,       "ecp-521")       \
+  _(22, MODP_1024_160, "modp-1024-160") \
+  _(23, MODP_2048_224, "modp-2048-224") \
+  _(24, MODP_2048_256, "modp-2048-256") \
+  _(25, ECP_192,       "ecp-192")       \
+  _(26, ECP_224,       "ecp-224")       \
+  _(27, BRAINPOOL_224, "brainpool-224") \
+  _(28, BRAINPOOL_256, "brainpool-256") \
+  _(29, BRAINPOOL_384, "brainpool-384") \
+  _(30, BRAINPOOL_512, "brainpool-512")
+#else
+#define foreach_ikev2_transform_dh_type \
+  _(0, NONE,           "none")          \
+  _(1, MODP_768,       "modp-768")      \
+  _(2, MODP_1024,      "modp-1024")     \
+  _(5, MODP_1536,      "modp-1536")     \
+  _(14, MODP_2048,     "modp-2048")     \
+  _(15, MODP_3072,     "modp-3072")     \
+  _(16, MODP_4096,     "modp-4096")     \
+  _(17, MODP_6144,     "modp-6144")     \
+  _(18, MODP_8192,     "modp-8192")     \
+  _(19, ECP_256,       "ecp-256")       \
+  _(20, ECP_384,       "ecp-384")       \
+  _(21, ECP_521,       "ecp-521")       \
+  _(22, MODP_1024_160, "modp-1024-160") \
+  _(23, MODP_2048_224, "modp-2048-224") \
+  _(24, MODP_2048_256, "modp-2048-256") \
+  _(25, ECP_192,       "ecp-192")
+#endif
+
+typedef enum
+{
+#define _(v,f, str) IKEV2_TRANSFORM_DH_TYPE_##f = v,
+  foreach_ikev2_transform_dh_type
+#undef _
+} ikev2_transform_dh_type_t;
+
+#define foreach_ikev2_transform_esn_type     \
+  _(0, NO_ESN, "no")       \
+  _(1, ESN,    "yes")
+
+typedef enum
+{
+#define _(v,f,str) IKEV2_TRANSFORM_ESN_TYPE_##f = v,
+  foreach_ikev2_transform_esn_type
+#undef _
+} ikev2_transform_esn_type_t;
+
+#define foreach_ikev2_auth_method \
+ _( 1, RSA_SIG,        "rsa-sig")        \
+ _( 2, SHARED_KEY_MIC, "shared-key-mic")
+
+typedef enum
+{
+#define _(v,f,s) IKEV2_AUTH_METHOD_##f = v,
+  foreach_ikev2_auth_method
+#undef _
+} ikev2_auth_method_t;
+
+#define foreach_ikev2_id_type \
+ _( 1, ID_IPV4_ADDR,   "ip4-addr")    \
+ _( 2, ID_FQDN,        "fqdn")        \
+ _( 3, ID_RFC822_ADDR, "rfc822")      \
+ _( 5, ID_IPV6_ADDR,   "ip6-addr")    \
+ _( 9, ID_DER_ASN1_DN, "der-asn1-dn") \
+ _(10, ID_DER_ASN1_GN, "der-asn1-gn") \
+ _(11, ID_KEY_ID,      "key-id")
+
+typedef enum
+{
+#define _(v,f,s) IKEV2_ID_TYPE_##f = v,
+  foreach_ikev2_id_type
+#undef _
+} ikev2_id_type_t;
+
+clib_error_t *ikev2_init (vlib_main_t * vm);
+clib_error_t *ikev2_set_local_key (vlib_main_t * vm, u8 * file);
+clib_error_t *ikev2_add_del_profile (vlib_main_t * vm, u8 * name, int is_add);
+clib_error_t *ikev2_set_profile_auth (vlib_main_t * vm, u8 * name,
+				      u8 auth_method, u8 * data,
+				      u8 data_hex_format);
+clib_error_t *ikev2_set_profile_id (vlib_main_t * vm, u8 * name,
+				    u8 id_type, u8 * data, int is_local);
+clib_error_t *ikev2_set_profile_ts (vlib_main_t * vm, u8 * name,
+				    u8 protocol_id, u16 start_port,
+				    u16 end_port, ip4_address_t start_addr,
+				    ip4_address_t end_addr, int is_local);
+/* ikev2_format.c */
+u8 *format_ikev2_auth_method (u8 * s, va_list * args);
+u8 *format_ikev2_id_type (u8 * s, va_list * args);
+u8 *format_ikev2_transform_type (u8 * s, va_list * args);
+u8 *format_ikev2_notify_msg_type (u8 * s, va_list * args);
+u8 *format_ikev2_transform_encr_type (u8 * s, va_list * args);
+u8 *format_ikev2_transform_prf_type (u8 * s, va_list * args);
+u8 *format_ikev2_transform_integ_type (u8 * s, va_list * args);
+u8 *format_ikev2_transform_dh_type (u8 * s, va_list * args);
+u8 *format_ikev2_transform_esn_type (u8 * s, va_list * args);
+u8 *format_ikev2_sa_transform (u8 * s, va_list * args);
+
+uword unformat_ikev2_auth_method (unformat_input_t * input, va_list * args);
+uword unformat_ikev2_id_type (unformat_input_t * input, va_list * args);
+uword unformat_ikev2_transform_type (unformat_input_t * input,
+				     va_list * args);
+uword unformat_ikev2_transform_encr_type (unformat_input_t * input,
+					  va_list * args);
+uword unformat_ikev2_transform_prf_type (unformat_input_t * input,
+					 va_list * args);
+uword unformat_ikev2_transform_integ_type (unformat_input_t * input,
+					   va_list * args);
+uword unformat_ikev2_transform_dh_type (unformat_input_t * input,
+					va_list * args);
+uword unformat_ikev2_transform_esn_type (unformat_input_t * input,
+					 va_list * args);
+
+#endif /* __included_ikev2_h__ */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ikev2_cli.c b/src/vnet/ipsec/ikev2_cli.c
new file mode 100644
index 00000000..1369c187
--- /dev/null
+++ b/src/vnet/ipsec/ikev2_cli.c
@@ -0,0 +1,479 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+#include <vnet/ip/udp.h>
+#include <vnet/ipsec/ikev2.h>
+#include <vnet/ipsec/ikev2_priv.h>
+
+u8 *
+format_ikev2_id_type_and_data (u8 * s, va_list * args)
+{
+  ikev2_id_t *id = va_arg (*args, ikev2_id_t *);
+
+  if (id->type == 0 || vec_len (id->data) == 0)
+    return format (s, "none");
+
+  s = format (s, "%U", format_ikev2_id_type, id->type);
+
+  if (id->type == IKEV2_ID_TYPE_ID_FQDN ||
+      id->type == IKEV2_ID_TYPE_ID_RFC822_ADDR)
+    {
+      s = format (s, " %v", id->data);
+    }
+  else
+    {
+      s =
+	format (s, " %U", format_hex_bytes, &id->data,
+		(uword) (vec_len (id->data)));
+    }
+
+  return s;
+}
+
+
+static clib_error_t *
+show_ikev2_sa_command_fn (vlib_main_t * vm,
+			  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  ikev2_main_t *km = &ikev2_main;
+  ikev2_main_per_thread_data_t *tkm;
+  ikev2_sa_t *sa;
+  ikev2_ts_t *ts;
+  ikev2_child_sa_t *child;
+  ikev2_sa_transform_t *tr;
+
+  vec_foreach (tkm, km->per_thread_data)
+  {
+    /* *INDENT-OFF* */
+    pool_foreach (sa, tkm->sas, ({
+      u8 * s = 0;
+      vlib_cli_output(vm, " iip %U ispi %lx rip %U rspi %lx",
+                      format_ip4_address, &sa->iaddr, sa->ispi,
+                      format_ip4_address, &sa->raddr, sa->rspi);
+
+       tr = ikev2_sa_get_td_for_type(sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
+       s = format(s, "%U ", format_ikev2_sa_transform, tr);
+
+       tr = ikev2_sa_get_td_for_type(sa->r_proposals, IKEV2_TRANSFORM_TYPE_PRF);
+       s = format(s, "%U ", format_ikev2_sa_transform, tr);
+
+       tr = ikev2_sa_get_td_for_type(sa->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
+       s = format(s, "%U ", format_ikev2_sa_transform, tr);
+
+       tr = ikev2_sa_get_td_for_type(sa->r_proposals, IKEV2_TRANSFORM_TYPE_DH);
+       s = format(s, "%U ", format_ikev2_sa_transform, tr);
+
+      vlib_cli_output(vm, " %v", s);
+      vec_free(s);
+
+      vlib_cli_output(vm, "  nonce i:%U\n        r:%U",
+                      format_hex_bytes, sa->i_nonce,  vec_len(sa->i_nonce),
+                      format_hex_bytes, sa->r_nonce,  vec_len(sa->r_nonce));
+
+      vlib_cli_output(vm, "  SK_d    %U",
+                      format_hex_bytes, sa->sk_d,  vec_len(sa->sk_d));
+      vlib_cli_output(vm, "  SK_a  i:%U\n        r:%U",
+                      format_hex_bytes, sa->sk_ai, vec_len(sa->sk_ai),
+                      format_hex_bytes, sa->sk_ar, vec_len(sa->sk_ar));
+      vlib_cli_output(vm, "  SK_e  i:%U\n        r:%U",
+                      format_hex_bytes, sa->sk_ei, vec_len(sa->sk_ei),
+                      format_hex_bytes, sa->sk_er, vec_len(sa->sk_er));
+      vlib_cli_output(vm, "  SK_p  i:%U\n        r:%U",
+                      format_hex_bytes, sa->sk_pi, vec_len(sa->sk_pi),
+                      format_hex_bytes, sa->sk_pr, vec_len(sa->sk_pr));
+
+      vlib_cli_output(vm, "  identifier (i) %U",
+                      format_ikev2_id_type_and_data, &sa->i_id);
+      vlib_cli_output(vm, "  identifier (r) %U",
+                      format_ikev2_id_type_and_data, &sa->r_id);
+
+      vec_foreach(child, sa->childs)
+        {
+          vlib_cli_output(vm, "  child sa %u:", child - sa->childs);
+
+          tr = ikev2_sa_get_td_for_type(child->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
+          s = format(s, "%U ", format_ikev2_sa_transform, tr);
+
+          tr = ikev2_sa_get_td_for_type(child->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
+          s = format(s, "%U ", format_ikev2_sa_transform, tr);
+
+          tr = ikev2_sa_get_td_for_type(child->r_proposals, IKEV2_TRANSFORM_TYPE_ESN);
+          s = format(s, "%U ", format_ikev2_sa_transform, tr);
+
+          vlib_cli_output(vm, "    %v", s);
+          vec_free(s);
+
+          vlib_cli_output(vm, "    spi(i) %lx spi(r) %lx",
+                          child->i_proposals ? child->i_proposals[0].spi : 0,
+                          child->r_proposals ? child->r_proposals[0].spi : 0);
+
+          vlib_cli_output(vm, "    SK_e  i:%U\n          r:%U",
+                          format_hex_bytes, child->sk_ei, vec_len(child->sk_ei),
+                          format_hex_bytes, child->sk_er, vec_len(child->sk_er));
+          vlib_cli_output(vm, "    SK_a  i:%U\n          r:%U",
+                          format_hex_bytes, child->sk_ai, vec_len(child->sk_ai),
+                          format_hex_bytes, child->sk_ar, vec_len(child->sk_ar));
+          vlib_cli_output(vm, "    traffic selectors (i):");
+          vec_foreach(ts, child->tsi)
+            {
+              vlib_cli_output(vm, "      %u type %u protocol_id %u addr "
+                              "%U - %U port %u - %u",
+                              ts - child->tsi,
+                              ts->ts_type, ts->protocol_id,
+                              format_ip4_address, &ts->start_addr,
+                              format_ip4_address, &ts->end_addr,
+                              clib_net_to_host_u16( ts->start_port),
+                              clib_net_to_host_u16( ts->end_port));
+            }
+          vlib_cli_output(vm, "    traffic selectors (r):");
+          vec_foreach(ts, child->tsr)
+            {
+              vlib_cli_output(vm, "      %u type %u protocol_id %u addr "
+                              "%U - %U port %u - %u",
+                              ts - child->tsr,
+                              ts->ts_type, ts->protocol_id,
+                              format_ip4_address, &ts->start_addr,
+                              format_ip4_address, &ts->end_addr,
+                              clib_net_to_host_u16( ts->start_port),
+                              clib_net_to_host_u16( ts->end_port));
+            }
+        }
+      vlib_cli_output(vm, "");
+    }));
+    /* *INDENT-ON* */
+  }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_ikev2_sa_command, static) = {
+    .path = "show ikev2 sa",
+    .short_help = "show ikev2 sa",
+    .function = show_ikev2_sa_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+ikev2_profile_add_del_command_fn (vlib_main_t * vm,
+				  unformat_input_t * input,
+				  vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 *name = 0;
+  clib_error_t *r = 0;
+  u32 id_type;
+  u8 *data = 0;
+  u32 tmp1, tmp2, tmp3;
+  ip4_address_t ip4;
+  ip4_address_t end_addr;
+
+  const char *valid_chars = "a-zA-Z0-9_";
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "add %U", unformat_token, valid_chars, &name))
+	{
+	  r = ikev2_add_del_profile (vm, name, 1);
+	  goto done;
+	}
+      else
+	if (unformat
+	    (line_input, "del %U", unformat_token, valid_chars, &name))
+	{
+	  r = ikev2_add_del_profile (vm, name, 0);
+	  goto done;
+	}
+      else if (unformat (line_input, "set %U auth shared-key-mic string %v",
+			 unformat_token, valid_chars, &name, &data))
+	{
+	  r =
+	    ikev2_set_profile_auth (vm, name,
+				    IKEV2_AUTH_METHOD_SHARED_KEY_MIC, data,
+				    0);
+	  goto done;
+	}
+      else if (unformat (line_input, "set %U auth shared-key-mic hex %U",
+			 unformat_token, valid_chars, &name,
+			 unformat_hex_string, &data))
+	{
+	  r =
+	    ikev2_set_profile_auth (vm, name,
+				    IKEV2_AUTH_METHOD_SHARED_KEY_MIC, data,
+				    1);
+	  goto done;
+	}
+      else if (unformat (line_input, "set %U auth rsa-sig cert-file %v",
+			 unformat_token, valid_chars, &name, &data))
+	{
+	  r =
+	    ikev2_set_profile_auth (vm, name, IKEV2_AUTH_METHOD_RSA_SIG, data,
+				    0);
+	  goto done;
+	}
+      else if (unformat (line_input, "set %U id local %U %U",
+			 unformat_token, valid_chars, &name,
+			 unformat_ikev2_id_type, &id_type,
+			 unformat_ip4_address, &ip4))
+	{
+	  data = vec_new (u8, 4);
+	  clib_memcpy (data, ip4.as_u8, 4);
+	  r =
+	    ikev2_set_profile_id (vm, name, (u8) id_type, data, /*local */ 1);
+	  goto done;
+	}
+      else if (unformat (line_input, "set %U id local %U 0x%U",
+			 unformat_token, valid_chars, &name,
+			 unformat_ikev2_id_type, &id_type,
+			 unformat_hex_string, &data))
+	{
+	  r =
+	    ikev2_set_profile_id (vm, name, (u8) id_type, data, /*local */ 1);
+	  goto done;
+	}
+      else if (unformat (line_input, "set %U id local %U %v",
+			 unformat_token, valid_chars, &name,
+			 unformat_ikev2_id_type, &id_type, &data))
+	{
+	  r =
+	    ikev2_set_profile_id (vm, name, (u8) id_type, data, /*local */ 1);
+	  goto done;
+	}
+      else if (unformat (line_input, "set %U id remote %U %U",
+			 unformat_token, valid_chars, &name,
+			 unformat_ikev2_id_type, &id_type,
+			 unformat_ip4_address, &ip4))
+	{
+	  data = vec_new (u8, 4);
+	  clib_memcpy (data, ip4.as_u8, 4);
+	  r = ikev2_set_profile_id (vm, name, (u8) id_type, data,	/*remote */
+				    0);
+	  goto done;
+	}
+      else if (unformat (line_input, "set %U id remote %U 0x%U",
+			 unformat_token, valid_chars, &name,
+			 unformat_ikev2_id_type, &id_type,
+			 unformat_hex_string, &data))
+	{
+	  r = ikev2_set_profile_id (vm, name, (u8) id_type, data,	/*remote */
+				    0);
+	  goto done;
+	}
+      else if (unformat (line_input, "set %U id remote %U %v",
+			 unformat_token, valid_chars, &name,
+			 unformat_ikev2_id_type, &id_type, &data))
+	{
+	  r = ikev2_set_profile_id (vm, name, (u8) id_type, data,	/*remote */
+				    0);
+	  goto done;
+	}
+      else if (unformat (line_input, "set %U traffic-selector local "
+			 "ip-range %U - %U port-range %u - %u protocol %u",
+			 unformat_token, valid_chars, &name,
+			 unformat_ip4_address, &ip4,
+			 unformat_ip4_address, &end_addr,
+			 &tmp1, &tmp2, &tmp3))
+	{
+	  r =
+	    ikev2_set_profile_ts (vm, name, (u8) tmp3, (u16) tmp1, (u16) tmp2,
+				  ip4, end_addr, /*local */ 1);
+	  goto done;
+	}
+      else if (unformat (line_input, "set %U traffic-selector remote "
+			 "ip-range %U - %U port-range %u - %u protocol %u",
+			 unformat_token, valid_chars, &name,
+			 unformat_ip4_address, &ip4,
+			 unformat_ip4_address, &end_addr,
+			 &tmp1, &tmp2, &tmp3))
+	{
+	  r =
+	    ikev2_set_profile_ts (vm, name, (u8) tmp3, (u16) tmp1, (u16) tmp2,
+				  ip4, end_addr, /*remote */ 0);
+	  goto done;
+	}
+      else
+	break;
+    }
+
+  r = clib_error_return (0, "parse error: '%U'",
+			 format_unformat_error, line_input);
+
+done:
+  vec_free (name);
+  vec_free (data);
+  unformat_free (line_input);
+  return r;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ikev2_profile_add_del_command, static) = {
+    .path = "ikev2 profile",
+    .short_help =
+    "ikev2 profile [add|del] <id>\n"
+    "ikev2 profile set <id> auth [rsa-sig|shared-key-mic] [cert-file|string|hex]"
+    " <data>\n"
+    "ikev2 profile set <id> id <local|remote> <type> <data>\n"
+    "ikev2 profile set <id> traffic-selector <local|remote> ip-range "
+    "<start-addr> - <end-addr> port-range <start-port> - <end-port> "
+    "protocol <protocol-number>",
+    .function = ikev2_profile_add_del_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+show_ikev2_profile_command_fn (vlib_main_t * vm,
+			       unformat_input_t * input,
+			       vlib_cli_command_t * cmd)
+{
+  ikev2_main_t *km = &ikev2_main;
+  ikev2_profile_t *p;
+
+  /* *INDENT-OFF* */
+  pool_foreach (p, km->profiles, ({
+    vlib_cli_output(vm, "profile %v", p->name);
+
+    if (p->auth.data)
+      {
+        if (p->auth.hex)
+          vlib_cli_output(vm, "  auth-method %U auth data 0x%U",
+                          format_ikev2_auth_method, p->auth.method,
+                          format_hex_bytes, p->auth.data, vec_len(p->auth.data));
+        else
+          vlib_cli_output(vm, "  auth-method %U auth data %v",
+                   format_ikev2_auth_method, p->auth.method, p->auth.data);
+      }
+
+    if (p->loc_id.data)
+      {
+        if (p->loc_id.type == IKEV2_ID_TYPE_ID_IPV4_ADDR)
+          vlib_cli_output(vm, "  local id-type %U data %U",
+                          format_ikev2_id_type, p->loc_id.type,
+                          format_ip4_address, p->loc_id.data);
+        else if (p->loc_id.type == IKEV2_ID_TYPE_ID_KEY_ID)
+          vlib_cli_output(vm, "  local id-type %U data 0x%U",
+                          format_ikev2_id_type, p->loc_id.type,
+                          format_hex_bytes, p->loc_id.data,
+                          vec_len(p->loc_id.data));
+        else
+          vlib_cli_output(vm, "  local id-type %U data %v",
+                          format_ikev2_id_type, p->loc_id.type, p->loc_id.data);
+      }
+
+    if (p->rem_id.data)
+      {
+        if (p->rem_id.type == IKEV2_ID_TYPE_ID_IPV4_ADDR)
+          vlib_cli_output(vm, "  remote id-type %U data %U",
+                          format_ikev2_id_type, p->rem_id.type,
+                          format_ip4_address, p->rem_id.data);
+        else if (p->rem_id.type == IKEV2_ID_TYPE_ID_KEY_ID)
+          vlib_cli_output(vm, "  remote id-type %U data 0x%U",
+                          format_ikev2_id_type, p->rem_id.type,
+                          format_hex_bytes, p->rem_id.data,
+                          vec_len(p->rem_id.data));
+        else
+          vlib_cli_output(vm, "  remote id-type %U data %v",
+                          format_ikev2_id_type, p->rem_id.type, p->rem_id.data);
+      }
+
+    if (p->loc_ts.end_addr.as_u32)
+      vlib_cli_output(vm, "  local traffic-selector addr %U - %U port %u - %u"
+                      " protocol %u",
+                      format_ip4_address, &p->loc_ts.start_addr,
+                      format_ip4_address, &p->loc_ts.end_addr,
+                      p->loc_ts.start_port, p->loc_ts.end_port,
+                      p->loc_ts.protocol_id);
+
+    if (p->rem_ts.end_addr.as_u32)
+      vlib_cli_output(vm, "  remote traffic-selector addr %U - %U port %u - %u"
+                      " protocol %u",
+                      format_ip4_address, &p->rem_ts.start_addr,
+                      format_ip4_address, &p->rem_ts.end_addr,
+                      p->rem_ts.start_port, p->rem_ts.end_port,
+                      p->rem_ts.protocol_id);
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_ikev2_profile_command, static) = {
+    .path = "show ikev2 profile",
+    .short_help = "show ikev2 profile",
+    .function = show_ikev2_profile_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_ikev2_local_key_command_fn (vlib_main_t * vm,
+				unformat_input_t * input,
+				vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  clib_error_t *r = 0;
+  u8 *data = 0;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "%s", &data))
+	{
+	  r = ikev2_set_local_key (vm, data);
+	  goto done;
+	}
+      else
+	break;
+    }
+
+  r = clib_error_return (0, "parse error: '%U'",
+			 format_unformat_error, line_input);
+
+done:
+  vec_free (data);
+  unformat_free (line_input);
+  return r;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_ikev2_local_key_command, static) = {
+    .path = "set ikev2 local key",
+    .short_help =
+    "set ikev2 local key <file>",
+    .function = set_ikev2_local_key_command_fn,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+ikev2_cli_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ikev2_cli_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ikev2_crypto.c b/src/vnet/ipsec/ikev2_crypto.c
new file mode 100644
index 00000000..32927629
--- /dev/null
+++ b/src/vnet/ipsec/ikev2_crypto.c
@@ -0,0 +1,765 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+#include <vnet/ip/udp.h>
+#include <vnet/ipsec/ikev2.h>
+#include <vnet/ipsec/ikev2_priv.h>
+#include <openssl/obj_mac.h>
+#include <openssl/ec.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/bn.h>
+
+/* from RFC7296 */
+static const char modp_dh_768_prime[] =
+  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
+  "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
+  "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
+  "E485B576625E7EC6F44C42E9A63A3620FFFFFFFFFFFFFFFF";
+static const char modp_dh_768_generator[] = "02";
+
+static const char modp_dh_1024_prime[] =
+  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
+  "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
+  "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
+  "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
+  "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381" "FFFFFFFFFFFFFFFF";
+static const char modp_dh_1024_generator[] = "02";
+
+/* from RFC3526 */
+static const char modp_dh_1536_prime[] =
+  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
+  "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
+  "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
+  "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
+  "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
+  "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F"
+  "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
+  "670C354E4ABC9804F1746C08CA237327FFFFFFFFFFFFFFFF";
+static const char modp_dh_1536_generator[] = "02";
+
+static const char modp_dh_2048_prime[] =
+  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
+  "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
+  "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
+  "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
+  "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
+  "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F"
+  "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
+  "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B"
+  "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9"
+  "DE2BCBF6955817183995497CEA956AE515D2261898FA0510"
+  "15728E5A8AACAA68FFFFFFFFFFFFFFFF";
+static const char modp_dh_2048_generator[] = "02";
+
+static const char modp_dh_3072_prime[] =
+  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
+  "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
+  "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
+  "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
+  "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
+  "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F"
+  "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
+  "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B"
+  "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9"
+  "DE2BCBF6955817183995497CEA956AE515D2261898FA0510"
+  "15728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64"
+  "ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7"
+  "ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6B"
+  "F12FFA06D98A0864D87602733EC86A64521F2B18177B200C"
+  "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB31"
+  "43DB5BFCE0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF";
+static const char modp_dh_3072_generator[] = "02";
+
+static const char modp_dh_4096_prime[] =
+  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
+  "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
+  "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
+  "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
+  "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
+  "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F"
+  "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
+  "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B"
+  "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9"
+  "DE2BCBF6955817183995497CEA956AE515D2261898FA0510"
+  "15728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64"
+  "ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7"
+  "ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6B"
+  "F12FFA06D98A0864D87602733EC86A64521F2B18177B200C"
+  "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB31"
+  "43DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7"
+  "88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA"
+  "2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6"
+  "287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED"
+  "1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9"
+  "93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199" "FFFFFFFFFFFFFFFF";
+static const char modp_dh_4096_generator[] = "02";
+
+static const char modp_dh_6144_prime[] =
+  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08"
+  "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B"
+  "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9"
+  "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6"
+  "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8"
+  "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D"
+  "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C"
+  "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718"
+  "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D"
+  "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D"
+  "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226"
+  "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C"
+  "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC"
+  "E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26"
+  "99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB"
+  "04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2"
+  "233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127"
+  "D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934028492"
+  "36C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BDF8FF9406"
+  "AD9E530EE5DB382F413001AEB06A53ED9027D831179727B0865A8918"
+  "DA3EDBEBCF9B14ED44CE6CBACED4BB1BDB7F1447E6CC254B33205151"
+  "2BD7AF426FB8F401378CD2BF5983CA01C64B92ECF032EA15D1721D03"
+  "F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E59E7C97F"
+  "BEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA"
+  "CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58B"
+  "B7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632"
+  "387FE8D76E3C0468043E8F663F4860EE12BF2D5B0B7474D6E694F91E"
+  "6DCC4024FFFFFFFFFFFFFFFF";
+static const char modp_dh_6144_generator[] = "02";
+
+static const char modp_dh_8192_prime[] =
+  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
+  "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
+  "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
+  "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
+  "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
+  "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F"
+  "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
+  "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B"
+  "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9"
+  "DE2BCBF6955817183995497CEA956AE515D2261898FA0510"
+  "15728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64"
+  "ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7"
+  "ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6B"
+  "F12FFA06D98A0864D87602733EC86A64521F2B18177B200C"
+  "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB31"
+  "43DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7"
+  "88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA"
+  "2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6"
+  "287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED"
+  "1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9"
+  "93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934028492"
+  "36C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BD"
+  "F8FF9406AD9E530EE5DB382F413001AEB06A53ED9027D831"
+  "179727B0865A8918DA3EDBEBCF9B14ED44CE6CBACED4BB1B"
+  "DB7F1447E6CC254B332051512BD7AF426FB8F401378CD2BF"
+  "5983CA01C64B92ECF032EA15D1721D03F482D7CE6E74FEF6"
+  "D55E702F46980C82B5A84031900B1C9E59E7C97FBEC7E8F3"
+  "23A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA"
+  "CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE328"
+  "06A1D58BB7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55C"
+  "DA56C9EC2EF29632387FE8D76E3C0468043E8F663F4860EE"
+  "12BF2D5B0B7474D6E694F91E6DBE115974A3926F12FEE5E4"
+  "38777CB6A932DF8CD8BEC4D073B931BA3BC832B68D9DD300"
+  "741FA7BF8AFC47ED2576F6936BA424663AAB639C5AE4F568"
+  "3423B4742BF1C978238F16CBE39D652DE3FDB8BEFC848AD9"
+  "22222E04A4037C0713EB57A81A23F0C73473FC646CEA306B"
+  "4BCBC8862F8385DDFA9D4B7FA2C087E879683303ED5BDD3A"
+  "062B3CF5B3A278A66D2A13F83F44F82DDF310EE074AB6A36"
+  "4597E899A0255DC164F31CC50846851DF9AB48195DED7EA1"
+  "B1D510BD7EE74D73FAF36BC31ECFA268359046F4EB879F92"
+  "4009438B481C6CD7889A002ED5EE382BC9190DA6FC026E47"
+  "9558E4475677E9AA9E3050E2765694DFC81F56E880B96E71"
+  "60C980DD98EDD3DFFFFFFFFFFFFFFFFF";
+static const char modp_dh_8192_generator[] = "02";
+
+/* from RFC5114 */
+static const char modp_dh_1024_160_prime[] =
+  "B10B8F96A080E01DDE92DE5EAE5D54EC52C99FBCFB06A3C6"
+  "9A6A9DCA52D23B616073E28675A23D189838EF1E2EE652C0"
+  "13ECB4AEA906112324975C3CD49B83BFACCBDD7D90C4BD70"
+  "98488E9C219A73724EFFD6FAE5644738FAA31A4FF55BCCC0"
+  "A151AF5F0DC8B4BD45BF37DF365C1A65E68CFDA76D4DA708" "DF1FB2BC2E4A4371";
+static const char modp_dh_1024_160_generator[] =
+  "A4D1CBD5C3FD34126765A442EFB99905F8104DD258AC507F"
+  "D6406CFF14266D31266FEA1E5C41564B777E690F5504F213"
+  "160217B4B01B886A5E91547F9E2749F4D7FBD7D3B9A92EE1"
+  "909D0D2263F80A76A6A24C087A091F531DBF0A0169B6A28A"
+  "D662A4D18E73AFA32D779D5918D08BC8858F4DCEF97C2A24" "855E6EEB22B3B2E5";
+
+static const char modp_dh_2048_224_prime[] =
+  "AD107E1E9123A9D0D660FAA79559C51FA20D64E5683B9FD1"
+  "B54B1597B61D0A75E6FA141DF95A56DBAF9A3C407BA1DF15"
+  "EB3D688A309C180E1DE6B85A1274A0A66D3F8152AD6AC212"
+  "9037C9EDEFDA4DF8D91E8FEF55B7394B7AD5B7D0B6C12207"
+  "C9F98D11ED34DBF6C6BA0B2C8BBC27BE6A00E0A0B9C49708"
+  "B3BF8A317091883681286130BC8985DB1602E714415D9330"
+  "278273C7DE31EFDC7310F7121FD5A07415987D9ADC0A486D"
+  "CDF93ACC44328387315D75E198C641A480CD86A1B9E587E8"
+  "BE60E69CC928B2B9C52172E413042E9B23F10B0E16E79763"
+  "C9B53DCF4BA80A29E3FB73C16B8E75B97EF363E2FFA31F71"
+  "CF9DE5384E71B81C0AC4DFFE0C10E64F";
+static const char modp_dh_2048_224_generator[] =
+  "AC4032EF4F2D9AE39DF30B5C8FFDAC506CDEBE7B89998CAF"
+  "74866A08CFE4FFE3A6824A4E10B9A6F0DD921F01A70C4AFA"
+  "AB739D7700C29F52C57DB17C620A8652BE5E9001A8D66AD7"
+  "C17669101999024AF4D027275AC1348BB8A762D0521BC98A"
+  "E247150422EA1ED409939D54DA7460CDB5F6C6B250717CBE"
+  "F180EB34118E98D119529A45D6F834566E3025E316A330EF"
+  "BB77A86F0C1AB15B051AE3D428C8F8ACB70A8137150B8EEB"
+  "10E183EDD19963DDD9E263E4770589EF6AA21E7F5F2FF381"
+  "B539CCE3409D13CD566AFBB48D6C019181E1BCFE94B30269"
+  "EDFE72FE9B6AA4BD7B5A0F1C71CFFF4C19C418E1F6EC0179"
+  "81BC087F2A7065B384B890D3191F2BFA";
+
+static const char modp_dh_2048_256_prime[] =
+  "87A8E61DB4B6663CFFBBD19C651959998CEEF608660DD0F2"
+  "5D2CEED4435E3B00E00DF8F1D61957D4FAF7DF4561B2AA30"
+  "16C3D91134096FAA3BF4296D830E9A7C209E0C6497517ABD"
+  "5A8A9D306BCF67ED91F9E6725B4758C022E0B1EF4275BF7B"
+  "6C5BFC11D45F9088B941F54EB1E59BB8BC39A0BF12307F5C"
+  "4FDB70C581B23F76B63ACAE1CAA6B7902D52526735488A0E"
+  "F13C6D9A51BFA4AB3AD8347796524D8EF6A167B5A41825D9"
+  "67E144E5140564251CCACB83E6B486F6B3CA3F7971506026"
+  "C0B857F689962856DED4010ABD0BE621C3A3960A54E710C3"
+  "75F26375D7014103A4B54330C198AF126116D2276E11715F"
+  "693877FAD7EF09CADB094AE91E1A1597";
+static const char modp_dh_2048_256_generator[] =
+  "3FB32C9B73134D0B2E77506660EDBD484CA7B18F21EF2054"
+  "07F4793A1A0BA12510DBC15077BE463FFF4FED4AAC0BB555"
+  "BE3A6C1B0C6B47B1BC3773BF7E8C6F62901228F8C28CBB18"
+  "A55AE31341000A650196F931C77A57F2DDF463E5E9EC144B"
+  "777DE62AAAB8A8628AC376D282D6ED3864E67982428EBC83"
+  "1D14348F6F2F9193B5045AF2767164E1DFC967C1FB3F2E55"
+  "A4BD1BFFE83B9C80D052B985D182EA0ADB2A3B7313D3FE14"
+  "C8484B1E052588B9B7D2BBD2DF016199ECD06E1557CD0915"
+  "B3353BBB64E0EC377FD028370DF92B52C7891428CDC67EB6"
+  "184B523D1DB246C32F63078490F00EF8D647D148D4795451"
+  "5E2327CFEF98C582664B4C0F6CC41659";
+
+v8 *
+ikev2_calc_prf (ikev2_sa_transform_t * tr, v8 * key, v8 * data)
+{
+  HMAC_CTX ctx;
+  v8 *prf;
+  unsigned int len = 0;
+
+  prf = vec_new (u8, tr->key_trunc);
+  HMAC_CTX_init (&ctx);
+  HMAC_Init_ex (&ctx, key, vec_len (key), tr->md, NULL);
+  HMAC_Update (&ctx, data, vec_len (data));
+  HMAC_Final (&ctx, prf, &len);
+  HMAC_CTX_cleanup (&ctx);
+
+  ASSERT (len == tr->key_trunc);
+
+  return prf;
+}
+
+u8 *
+ikev2_calc_prfplus (ikev2_sa_transform_t * tr, u8 * key, u8 * seed, int len)
+{
+  v8 *t = 0, *s = 0, *tmp = 0, *ret = 0;
+  u8 x = 0;
+
+  /* prf+ (K,S) = T1 | T2 | T3 | T4 | ...
+
+     where:
+     T1 = prf (K, S | 0x01)
+     T2 = prf (K, T1 | S | 0x02)
+     T3 = prf (K, T2 | S | 0x03)
+     T4 = prf (K, T3 | S | 0x04)
+   */
+
+  while (vec_len (ret) < len && x < 255)
+    {
+      if (t)
+	{
+	  vec_append (s, t);
+	  vec_free (t);
+	}
+
+      vec_append (s, seed);
+      vec_add2 (s, tmp, 1);
+      *tmp = x + 1;
+      t = ikev2_calc_prf (tr, key, s);
+      vec_append (ret, t);
+      vec_free (s);
+      x++;
+    }
+
+  vec_free (t);
+
+  if (x == 255)
+    {
+      vec_free (ret);
+    }
+
+  return ret;
+}
+
+v8 *
+ikev2_calc_integr (ikev2_sa_transform_t * tr, v8 * key, u8 * data, int len)
+{
+  v8 *r;
+  HMAC_CTX hctx;
+  unsigned int l;
+
+  ASSERT (tr->type == IKEV2_TRANSFORM_TYPE_INTEG);
+
+  r = vec_new (u8, tr->key_len);
+
+  /* verify integrity of data */
+  HMAC_CTX_init (&hctx);
+  HMAC_Init (&hctx, key, vec_len (key), tr->md);
+  HMAC_Update (&hctx, (const u8 *) data, len);
+  HMAC_Final (&hctx, r, &l);
+  HMAC_CTX_cleanup (&hctx);
+
+  ASSERT (l == tr->key_len);
+
+  return r;
+}
+
+v8 *
+ikev2_decrypt_data (ikev2_sa_t * sa, u8 * data, int len)
+{
+  EVP_CIPHER_CTX ctx;
+  v8 *r;
+  int out_len = 0, block_size;
+  ikev2_sa_transform_t *tr_encr;
+
+  tr_encr =
+    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
+  block_size = tr_encr->block_size;
+
+  /* check if data is multiplier of cipher block size */
+  if (len % block_size)
+    {
+      clib_warning ("wrong data length");
+      return 0;
+    }
+
+  EVP_CIPHER_CTX_init (&ctx);
+  r = vec_new (u8, len - block_size);
+  EVP_DecryptInit_ex (&ctx, tr_encr->cipher, NULL, sa->sk_ei, data);
+  EVP_DecryptUpdate (&ctx, r, &out_len, data + block_size, len - block_size);
+  EVP_DecryptFinal_ex (&ctx, r + out_len, &out_len);
+
+  /* remove padding */
+  _vec_len (r) -= r[vec_len (r) - 1] + 1;
+
+  EVP_CIPHER_CTX_cleanup (&ctx);
+  return r;
+}
+
+int
+ikev2_encrypt_data (ikev2_sa_t * sa, v8 * src, u8 * dst)
+{
+  EVP_CIPHER_CTX ctx;
+  int out_len;
+  int bs;
+  ikev2_sa_transform_t *tr_encr;
+
+  tr_encr =
+    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
+  bs = tr_encr->block_size;
+
+  /* generate IV */
+  RAND_bytes (dst, bs);
+
+  EVP_CIPHER_CTX_init (&ctx);
+
+  EVP_EncryptInit_ex (&ctx, tr_encr->cipher, NULL, sa->sk_er, dst /* dst */ );
+  EVP_EncryptUpdate (&ctx, dst + bs, &out_len, src, vec_len (src));
+
+  EVP_CIPHER_CTX_cleanup (&ctx);
+
+  ASSERT (vec_len (src) == out_len);
+
+  return out_len + bs;
+}
+
+void
+ikev2_generate_dh (ikev2_sa_t * sa, ikev2_sa_transform_t * t)
+{
+  int r;
+
+  if (t->dh_group == IKEV2_DH_GROUP_MODP)
+    {
+      DH *dh = DH_new ();
+      BN_hex2bn (&dh->p, t->dh_p);
+      BN_hex2bn (&dh->g, t->dh_g);
+      DH_generate_key (dh);
+
+      sa->r_dh_data = vec_new (u8, t->key_len);
+      r = BN_bn2bin (dh->pub_key, sa->r_dh_data);
+      ASSERT (r == t->key_len);
+
+      BIGNUM *ex;
+      sa->dh_shared_key = vec_new (u8, t->key_len);
+      ex = BN_bin2bn (sa->i_dh_data, vec_len (sa->i_dh_data), NULL);
+      r = DH_compute_key (sa->dh_shared_key, ex, dh);
+      ASSERT (r == t->key_len);
+      BN_clear_free (ex);
+      DH_free (dh);
+    }
+  else if (t->dh_group == IKEV2_DH_GROUP_ECP)
+    {
+      EC_KEY *ec = EC_KEY_new_by_curve_name (t->nid);
+      ASSERT (ec);
+
+      EC_KEY_generate_key (ec);
+
+      const EC_POINT *r_point = EC_KEY_get0_public_key (ec);
+      const EC_GROUP *group = EC_KEY_get0_group (ec);
+      BIGNUM *x = NULL, *y = NULL;
+      BN_CTX *bn_ctx = BN_CTX_new ();
+      u16 x_off, y_off, len;
+      EC_POINT *i_point = EC_POINT_new (group);
+      EC_POINT *shared_point = EC_POINT_new (group);
+
+      x = BN_new ();
+      y = BN_new ();
+      len = t->key_len / 2;
+
+      EC_POINT_get_affine_coordinates_GFp (group, r_point, x, y, bn_ctx);
+      sa->r_dh_data = vec_new (u8, t->key_len);
+      x_off = len - BN_num_bytes (x);
+      memset (sa->r_dh_data, 0, x_off);
+      BN_bn2bin (x, sa->r_dh_data + x_off);
+      y_off = t->key_len - BN_num_bytes (y);
+      memset (sa->r_dh_data + len, 0, y_off - len);
+      BN_bn2bin (y, sa->r_dh_data + y_off);
+
+      x = BN_bin2bn (sa->i_dh_data, len, x);
+      y = BN_bin2bn (sa->i_dh_data + len, len, y);
+      EC_POINT_set_affine_coordinates_GFp (group, i_point, x, y, bn_ctx);
+      sa->dh_shared_key = vec_new (u8, t->key_len);
+      EC_POINT_mul (group, shared_point, NULL, i_point,
+		    EC_KEY_get0_private_key (ec), NULL);
+      EC_POINT_get_affine_coordinates_GFp (group, shared_point, x, y, bn_ctx);
+      x_off = len - BN_num_bytes (x);
+      memset (sa->dh_shared_key, 0, x_off);
+      BN_bn2bin (x, sa->dh_shared_key + x_off);
+      y_off = t->key_len - BN_num_bytes (y);
+      memset (sa->dh_shared_key + len, 0, y_off - len);
+      BN_bn2bin (y, sa->dh_shared_key + y_off);
+
+      EC_KEY_free (ec);
+      BN_free (x);
+      BN_free (y);
+      BN_CTX_free (bn_ctx);
+      EC_POINT_free (i_point);
+      EC_POINT_free (shared_point);
+    }
+}
+
+int
+ikev2_verify_sign (EVP_PKEY * pkey, u8 * sigbuf, u8 * data)
+{
+  EVP_MD_CTX md_ctx;
+
+  EVP_VerifyInit (&md_ctx, EVP_sha1 ());
+  EVP_VerifyUpdate (&md_ctx, data, vec_len (data));
+
+  return EVP_VerifyFinal (&md_ctx, sigbuf, vec_len (sigbuf), pkey);
+}
+
+u8 *
+ikev2_calc_sign (EVP_PKEY * pkey, u8 * data)
+{
+  EVP_MD_CTX md_ctx;
+  unsigned int sig_len = 0;
+  u8 *sign;
+
+  EVP_SignInit (&md_ctx, EVP_sha1 ());
+  EVP_SignUpdate (&md_ctx, data, vec_len (data));
+  /* get sign len */
+  EVP_SignFinal (&md_ctx, NULL, &sig_len, pkey);
+  sign = vec_new (u8, sig_len);
+  /* calc sign */
+  EVP_SignFinal (&md_ctx, sign, &sig_len, pkey);
+
+  return sign;
+}
+
+EVP_PKEY *
+ikev2_load_cert_file (u8 * file)
+{
+  FILE *fp;
+  X509 *x509;
+  EVP_PKEY *pkey = NULL;
+
+  fp = fopen ((char *) file, "r");
+  if (!fp)
+    {
+      clib_warning ("open %s failed", file);
+      goto end;
+    }
+
+  x509 = PEM_read_X509 (fp, NULL, NULL, NULL);
+  fclose (fp);
+  if (x509 == NULL)
+    {
+      clib_warning ("read cert %s failed", file);
+      goto end;
+    }
+
+  pkey = X509_get_pubkey (x509);
+  if (pkey == NULL)
+    clib_warning ("get pubkey %s failed", file);
+
+end:
+  return pkey;
+}
+
+EVP_PKEY *
+ikev2_load_key_file (u8 * file)
+{
+  FILE *fp;
+  EVP_PKEY *pkey = NULL;
+
+  fp = fopen ((char *) file, "r");
+  if (!fp)
+    {
+      clib_warning ("open %s failed", file);
+      goto end;
+    }
+
+  pkey = PEM_read_PrivateKey (fp, NULL, NULL, NULL);
+  fclose (fp);
+  if (pkey == NULL)
+    clib_warning ("read %s failed", file);
+
+end:
+  return pkey;
+}
+
+void
+ikev2_crypto_init (ikev2_main_t * km)
+{
+  ikev2_sa_transform_t *tr;
+
+  /* vector of supported transforms - in order of preference */
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_ENCR;
+  tr->encr_type = IKEV2_TRANSFORM_ENCR_TYPE_AES_CBC;
+  tr->key_len = 256 / 8;
+  tr->block_size = 128 / 8;
+  tr->cipher = EVP_aes_256_cbc ();
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_ENCR;
+  tr->encr_type = IKEV2_TRANSFORM_ENCR_TYPE_AES_CBC;
+  tr->key_len = 192 / 8;
+  tr->block_size = 128 / 8;
+  tr->cipher = EVP_aes_192_cbc ();
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_ENCR;
+  tr->encr_type = IKEV2_TRANSFORM_ENCR_TYPE_AES_CBC;
+  tr->key_len = 128 / 8;
+  tr->block_size = 128 / 8;
+  tr->cipher = EVP_aes_128_cbc ();
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_PRF;
+  tr->prf_type = IKEV2_TRANSFORM_PRF_TYPE_PRF_HMAC_SHA1;
+  tr->key_len = 160 / 8;
+  tr->key_trunc = 160 / 8;
+  tr->md = EVP_sha1 ();
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_INTEG;
+  tr->integ_type = IKEV2_TRANSFORM_INTEG_TYPE_AUTH_HMAC_SHA1_96;
+  tr->key_len = 160 / 8;
+  tr->key_trunc = 96 / 8;
+  tr->md = EVP_sha1 ();
+
+#if defined(OPENSSL_NO_CISCO_FECDH)
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_BRAINPOOL_512;
+  tr->key_len = (512 * 2) / 8;
+  tr->nid = NID_brainpoolP512r1;
+  tr->dh_group = IKEV2_DH_GROUP_ECP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_BRAINPOOL_384;
+  tr->key_len = (384 * 2) / 8;
+  tr->nid = NID_brainpoolP384r1;
+  tr->dh_group = IKEV2_DH_GROUP_ECP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_BRAINPOOL_256;
+  tr->key_len = (256 * 2) / 8;
+  tr->nid = NID_brainpoolP256r1;
+  tr->dh_group = IKEV2_DH_GROUP_ECP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_BRAINPOOL_224;
+  tr->key_len = (224 * 2) / 8;
+  tr->nid = NID_brainpoolP224r1;
+  tr->dh_group = IKEV2_DH_GROUP_ECP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_ECP_224;
+  tr->key_len = (224 * 2) / 8;
+  tr->nid = NID_secp224r1;
+  tr->dh_group = IKEV2_DH_GROUP_ECP;
+#endif
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_ECP_521;
+  tr->key_len = (528 * 2) / 8;
+  tr->nid = NID_secp521r1;
+  tr->dh_group = IKEV2_DH_GROUP_ECP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_ECP_384;
+  tr->key_len = (384 * 2) / 8;
+  tr->nid = NID_secp384r1;
+  tr->dh_group = IKEV2_DH_GROUP_ECP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_ECP_256;
+  tr->key_len = (256 * 2) / 8;
+  tr->nid = NID_X9_62_prime256v1;
+  tr->dh_group = IKEV2_DH_GROUP_ECP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_ECP_192;
+  tr->key_len = (192 * 2) / 8;
+  tr->nid = NID_X9_62_prime192v1;
+  tr->dh_group = IKEV2_DH_GROUP_ECP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_2048_256;
+  tr->key_len = 2048 / 8;
+  tr->dh_p = (const char *) &modp_dh_2048_256_prime;
+  tr->dh_g = (const char *) &modp_dh_2048_256_generator;
+  tr->dh_group = IKEV2_DH_GROUP_MODP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_2048_224;
+  tr->key_len = 2048 / 8;
+  tr->dh_p = (const char *) &modp_dh_2048_224_prime;
+  tr->dh_g = (const char *) &modp_dh_2048_224_generator;
+  tr->dh_group = IKEV2_DH_GROUP_MODP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_1024_160;
+  tr->key_len = 1024 / 8;
+  tr->dh_p = (const char *) &modp_dh_1024_160_prime;
+  tr->dh_g = (const char *) &modp_dh_1024_160_generator;
+  tr->dh_group = IKEV2_DH_GROUP_MODP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_8192;
+  tr->key_len = 8192 / 8;
+  tr->dh_p = (const char *) &modp_dh_8192_prime;
+  tr->dh_g = (const char *) &modp_dh_8192_generator;
+  tr->dh_group = IKEV2_DH_GROUP_MODP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_6144;
+  tr->key_len = 6144 / 8;
+  tr->dh_p = (const char *) &modp_dh_6144_prime;
+  tr->dh_g = (const char *) &modp_dh_6144_generator;
+  tr->dh_group = IKEV2_DH_GROUP_MODP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_4096;
+  tr->key_len = 4096 / 8;
+  tr->dh_p = (const char *) &modp_dh_4096_prime;
+  tr->dh_g = (const char *) &modp_dh_4096_generator;
+  tr->dh_group = IKEV2_DH_GROUP_MODP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_3072;
+  tr->key_len = 3072 / 8;
+  tr->dh_p = (const char *) &modp_dh_3072_prime;
+  tr->dh_g = (const char *) &modp_dh_3072_generator;
+  tr->dh_group = IKEV2_DH_GROUP_MODP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_2048;
+  tr->key_len = 2048 / 8;
+  tr->dh_p = (const char *) &modp_dh_2048_prime;
+  tr->dh_g = (const char *) &modp_dh_2048_generator;
+  tr->dh_group = IKEV2_DH_GROUP_MODP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_1536;
+  tr->key_len = 1536 / 8;
+  tr->dh_p = (const char *) &modp_dh_1536_prime;
+  tr->dh_g = (const char *) &modp_dh_1536_generator;
+  tr->dh_group = IKEV2_DH_GROUP_MODP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_1024;
+  tr->key_len = 1024 / 8;
+  tr->dh_p = (const char *) &modp_dh_1024_prime;
+  tr->dh_g = (const char *) &modp_dh_1024_generator;
+  tr->dh_group = IKEV2_DH_GROUP_MODP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_DH;
+  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_768;
+  tr->key_len = 768 / 8;
+  tr->dh_p = (const char *) &modp_dh_768_prime;
+  tr->dh_g = (const char *) &modp_dh_768_generator;
+  tr->dh_group = IKEV2_DH_GROUP_MODP;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_ESN;
+  tr->esn_type = IKEV2_TRANSFORM_ESN_TYPE_ESN;
+
+  vec_add2 (km->supported_transforms, tr, 1);
+  tr->type = IKEV2_TRANSFORM_TYPE_ESN;
+  tr->esn_type = IKEV2_TRANSFORM_ESN_TYPE_NO_ESN;
+}
+
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ikev2_format.c b/src/vnet/ipsec/ikev2_format.c
new file mode 100644
index 00000000..4d7a007f
--- /dev/null
+++ b/src/vnet/ipsec/ikev2_format.c
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+#include <vnet/interface.h>
+
+#include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/ikev2.h>
+#include <vnet/ipsec/ikev2_priv.h>
+
+u8 *
+format_ikev2_sa_transform (u8 * s, va_list * args)
+{
+  ikev2_sa_transform_t *tr = va_arg (*args, ikev2_sa_transform_t *);
+
+  if (!tr)
+    return s;
+
+  if (tr->type >= IKEV2_TRANSFORM_NUM_TYPES)
+    return s;
+
+  s = format (s, "%U:", format_ikev2_transform_type, tr->type);
+
+  switch (tr->type)
+    {
+    case IKEV2_TRANSFORM_TYPE_ENCR:
+      s = format (s, "%U", format_ikev2_transform_encr_type, tr->encr_type);
+      break;
+    case IKEV2_TRANSFORM_TYPE_PRF:
+      s = format (s, "%U", format_ikev2_transform_prf_type, tr->prf_type);
+      break;
+    case IKEV2_TRANSFORM_TYPE_INTEG:
+      s = format (s, "%U", format_ikev2_transform_integ_type, tr->integ_type);
+      break;
+    case IKEV2_TRANSFORM_TYPE_DH:
+      s = format (s, "%U", format_ikev2_transform_dh_type, tr->dh_type);
+      break;
+    case IKEV2_TRANSFORM_TYPE_ESN:
+      s = format (s, "%U", format_ikev2_transform_esn_type, tr->esn_type);
+      break;
+    default:
+      break;
+    }
+
+  if (tr->type == IKEV2_TRANSFORM_TYPE_ENCR &&
+      tr->encr_type == IKEV2_TRANSFORM_ENCR_TYPE_AES_CBC && tr->key_len)
+    s = format (s, "-%u", tr->key_len * 8);
+  else if (vec_len (tr->attrs) == 4 && tr->attrs[0] == 0x80
+	   && tr->attrs[1] == 0x0e)
+    s = format (s, "-%u", tr->attrs[2] * 256 + tr->attrs[3]);
+  else if (vec_len (tr->attrs))
+    s = format (s, "(unknown attr %U)", format_hex_bytes,
+		tr->attrs, vec_len (tr->attrs));
+
+  return s;
+}
+
+#define MACRO_FORMAT(lc)                                \
+u8 * format_ikev2_##lc (u8 * s, va_list * args)         \
+{                                                       \
+  u32 i = va_arg (*args, u32);                          \
+  char * t = 0;                                         \
+  switch (i) {                                          \
+        foreach_ikev2_##lc                              \
+      default:                                          \
+        return format (s, "unknown (%u)", i);           \
+    }                                                   \
+  s = format (s, "%s", t);                              \
+  return s;                                             \
+}
+
+#define MACRO_UNFORMAT(lc)                              \
+uword                                                   \
+unformat_ikev2_##lc (unformat_input_t * input,          \
+                     va_list * args)                    \
+{                                                       \
+  u32 * r = va_arg (*args, u32 *);                      \
+  if (0) ;                                              \
+  foreach_ikev2_##lc                                    \
+  else                                                  \
+    return 0;                                           \
+  return 1;                                             \
+}
+
+#define _(v,f,str) case IKEV2_AUTH_METHOD_##f: t = str; break;
+MACRO_FORMAT (auth_method)
+#undef _
+#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_AUTH_METHOD_##f;
+  MACRO_UNFORMAT (auth_method)
+#undef _
+#define _(v,f,str) case IKEV2_TRANSFORM_TYPE_##f: t = str; break;
+  MACRO_FORMAT (transform_type)
+#undef _
+#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_TRANSFORM_TYPE_##f;
+  MACRO_UNFORMAT (transform_type)
+#undef _
+#define _(v,f) case IKEV2_NOTIFY_MSG_##f: t = #f; break;
+  MACRO_FORMAT (notify_msg_type)
+#undef _
+#define _(v,f,str) case IKEV2_ID_TYPE_##f: t = str; break;
+  MACRO_FORMAT (id_type)
+#undef _
+#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_ID_TYPE_##f;
+  MACRO_UNFORMAT (id_type)
+#undef _
+#define _(v,f,str) case IKEV2_TRANSFORM_ENCR_TYPE_##f: t = str; break;
+  MACRO_FORMAT (transform_encr_type)
+#undef _
+#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_TRANSFORM_ENCR_TYPE_##f;
+  MACRO_UNFORMAT (transform_encr_type)
+#undef _
+#define _(v,f,str) case IKEV2_TRANSFORM_PRF_TYPE_##f: t = str; break;
+  MACRO_FORMAT (transform_prf_type)
+#undef _
+#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_TRANSFORM_PRF_TYPE_##f;
+  MACRO_UNFORMAT (transform_prf_type)
+#undef _
+#define _(v,f,str) case IKEV2_TRANSFORM_INTEG_TYPE_##f: t = str; break;
+  MACRO_FORMAT (transform_integ_type)
+#undef _
+#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_TRANSFORM_INTEG_TYPE_##f;
+  MACRO_UNFORMAT (transform_integ_type)
+#undef _
+#define _(v,f,str) case IKEV2_TRANSFORM_DH_TYPE_##f: t = str; break;
+  MACRO_FORMAT (transform_dh_type)
+#undef _
+#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_TRANSFORM_DH_TYPE_##f;
+  MACRO_UNFORMAT (transform_dh_type)
+#undef _
+#define _(v,f,str) case IKEV2_TRANSFORM_ESN_TYPE_##f: t = str; break;
+  MACRO_FORMAT (transform_esn_type)
+#undef _
+#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_TRANSFORM_ESN_TYPE_##f;
+  MACRO_UNFORMAT (transform_esn_type)
+#undef _
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ikev2_payload.c b/src/vnet/ipsec/ikev2_payload.c
new file mode 100644
index 00000000..dd14812b
--- /dev/null
+++ b/src/vnet/ipsec/ikev2_payload.c
@@ -0,0 +1,535 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <ctype.h>
+
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+#include <vnet/interface.h>
+
+#include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/ikev2.h>
+#include <vnet/ipsec/ikev2_priv.h>
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     u8 nextpayload;
+		     u8 flags;
+		     u16 length;
+		     u8 protocol_id;
+		     u8 spi_size;
+		     u16 msg_type;
+		     u8 payload[0];}) ike_notify_payload_header_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     u8 ts_type;
+		     u8 protocol_id;
+		     u16 selector_len;
+		     u16 start_port;
+		     u16 end_port;
+		     ip4_address_t start_addr;
+		     ip4_address_t end_addr;}) ikev2_ts_payload_entry_t;
+/* *INDENT-OFF* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+		     {
+		     u8 nextpayload;
+		     u8 flags;
+		     u16 length;
+		     u8 num_ts;
+		     u8 reserved[3];
+		     ikev2_ts_payload_entry_t ts[0];})
+  ike_ts_payload_header_t;
+/* *INDENT-OFF* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u8 last_or_more;
+  u8 reserved;
+  u16 proposal_len;
+  u8 proposal_num;
+  u8 protocol_id;
+  u8 spi_size;
+  u8 num_transforms; u32 spi[0];
+}) ike_sa_proposal_data_t;
+/* *INDENT-OFF* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u8 last_or_more;
+  u8 reserved;
+  u16 transform_len;
+  u8 transform_type;
+  u8 reserved2;
+  u16 transform_id;
+  u8 attributes[0];
+}) ike_sa_transform_data_t;
+/* *INDENT-OFF* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u8 nextpayload;
+  u8 flags;
+  u16 length;
+  u8 protocol_id;
+  u8 spi_size;
+  u16 num_of_spi;
+  u32 spi[0];
+}) ike_delete_payload_header_t;
+/* *INDENT-OFF* */
+
+static ike_payload_header_t *
+ikev2_payload_add_hdr (ikev2_payload_chain_t * c, u8 payload_type, int len)
+{
+  ike_payload_header_t *hdr =
+    (ike_payload_header_t *) & c->data[c->last_hdr_off];
+  u8 *tmp;
+
+  if (c->data)
+    hdr->nextpayload = payload_type;
+  else
+    c->first_payload_type = payload_type;
+
+  c->last_hdr_off = vec_len (c->data);
+  vec_add2 (c->data, tmp, len);
+  hdr = (ike_payload_header_t *) tmp;
+  memset (hdr, 0, len);
+
+  hdr->length = clib_host_to_net_u16 (len);
+
+  return hdr;
+}
+
+static void
+ikev2_payload_add_data (ikev2_payload_chain_t * c, u8 * data)
+{
+  u16 len;
+  ike_payload_header_t *hdr;
+
+  vec_append (c->data, data);
+  hdr = (ike_payload_header_t *) & c->data[c->last_hdr_off];
+  len = clib_net_to_host_u16 (hdr->length);
+  hdr->length = clib_host_to_net_u16 (len + vec_len (data));
+}
+
+void
+ikev2_payload_add_notify (ikev2_payload_chain_t * c, u16 msg_type, u8 * data)
+{
+  ike_notify_payload_header_t *n;
+
+  n =
+    (ike_notify_payload_header_t *) ikev2_payload_add_hdr (c,
+							   IKEV2_PAYLOAD_NOTIFY,
+							   sizeof (*n));
+  n->msg_type = clib_host_to_net_u16 (msg_type);
+  ikev2_payload_add_data (c, data);
+}
+
+void
+ikev2_payload_add_sa (ikev2_payload_chain_t * c,
+		      ikev2_sa_proposal_t * proposals)
+{
+  ike_payload_header_t *ph;
+  ike_sa_proposal_data_t *prop;
+  ike_sa_transform_data_t *tr;
+  ikev2_sa_proposal_t *p;
+  ikev2_sa_transform_t *t;
+
+  u8 *tmp;
+  u8 *pr_data = 0;
+  u8 *tr_data = 0;
+
+  ikev2_payload_add_hdr (c, IKEV2_PAYLOAD_SA, sizeof (*ph));
+
+  vec_foreach (p, proposals)
+  {
+    int spi_size = (p->protocol_id == IKEV2_PROTOCOL_ESP) ? 4 : 0;
+    pr_data = vec_new (u8, sizeof (ike_sa_proposal_data_t) + spi_size);
+    prop = (ike_sa_proposal_data_t *) pr_data;
+    prop->last_or_more = proposals - p + 1 < vec_len (proposals) ? 2 : 0;
+    prop->protocol_id = p->protocol_id;
+    prop->proposal_num = p->proposal_num;
+    prop->spi_size = spi_size;
+    prop->num_transforms = vec_len (p->transforms);
+
+    if (spi_size)
+      prop->spi[0] = clib_host_to_net_u32 (p->spi);
+
+    DBG_PLD ("proposal num %u protocol_id %u last_or_more %u spi_size %u%s%U",
+	     prop->proposal_num, prop->protocol_id, prop->last_or_more,
+	     prop->spi_size, prop->spi_size ? " spi_data " : "",
+	     format_hex_bytes, prop->spi, prop->spi_size);
+
+    vec_foreach (t, p->transforms)
+    {
+      vec_add2 (tr_data, tmp, sizeof (*tr) + vec_len (t->attrs));
+      tr = (ike_sa_transform_data_t *) tmp;
+      tr->last_or_more =
+	((t - p->transforms) + 1 < vec_len (p->transforms)) ? 3 : 0;
+      tr->transform_type = t->type;
+      tr->transform_id = clib_host_to_net_u16 (t->transform_id);
+      tr->transform_len =
+	clib_host_to_net_u16 (sizeof (*tr) + vec_len (t->attrs));
+
+      if (vec_len (t->attrs) > 0)
+	clib_memcpy (tr->attributes, t->attrs, vec_len (t->attrs));
+
+      DBG_PLD
+	("transform type %U transform_id %u last_or_more %u attr_size %u%s%U",
+	 format_ikev2_transform_type, tr->transform_type, t->transform_id,
+	 tr->last_or_more, vec_len (t->attrs),
+	 vec_len (t->attrs) ? " attrs " : "", format_hex_bytes,
+	 tr->attributes, vec_len (t->attrs));
+    }
+
+    prop->proposal_len =
+      clib_host_to_net_u16 (vec_len (tr_data) + vec_len (pr_data));
+    ikev2_payload_add_data (c, pr_data);
+    ikev2_payload_add_data (c, tr_data);
+    vec_free (pr_data);
+    vec_free (tr_data);
+  }
+}
+
+void
+ikev2_payload_add_ke (ikev2_payload_chain_t * c, u16 dh_group, u8 * dh_data)
+{
+  ike_ke_payload_header_t *ke;
+  ke = (ike_ke_payload_header_t *) ikev2_payload_add_hdr (c, IKEV2_PAYLOAD_KE,
+							  sizeof (*ke));
+
+  ke->dh_group = clib_host_to_net_u16 (dh_group);
+  ikev2_payload_add_data (c, dh_data);
+}
+
+void
+ikev2_payload_add_nonce (ikev2_payload_chain_t * c, u8 * nonce)
+{
+  ikev2_payload_add_hdr (c, IKEV2_PAYLOAD_NONCE,
+			 sizeof (ike_payload_header_t));
+  ikev2_payload_add_data (c, nonce);
+}
+
+void
+ikev2_payload_add_id (ikev2_payload_chain_t * c, ikev2_id_t * id, u8 type)
+{
+  ike_id_payload_header_t *idp;
+  idp =
+    (ike_id_payload_header_t *) ikev2_payload_add_hdr (c, type,
+						       sizeof (*idp));
+
+  idp->id_type = id->type;
+  ikev2_payload_add_data (c, id->data);
+}
+
+void
+ikev2_payload_add_delete (ikev2_payload_chain_t * c, ikev2_delete_t * d)
+{
+  ike_delete_payload_header_t *dp;
+  u16 num_of_spi = vec_len (d);
+  ikev2_delete_t *d2;
+  dp =
+    (ike_delete_payload_header_t *) ikev2_payload_add_hdr (c,
+							   IKEV2_PAYLOAD_DELETE,
+							   sizeof (*dp));
+
+  if (d[0].protocol_id == IKEV2_PROTOCOL_IKE)
+    {
+      dp->protocol_id = 1;
+    }
+  else
+    {
+      dp->protocol_id = d[0].protocol_id;
+      dp->spi_size = 4;
+      dp->num_of_spi = clib_host_to_net_u16 (num_of_spi);
+      vec_foreach (d2, d)
+      {
+	u8 *data = vec_new (u8, 4);
+	u32 spi = clib_host_to_net_u32 (d2->spi);
+	clib_memcpy (data, &spi, 4);
+	ikev2_payload_add_data (c, data);
+	vec_free (data);
+      }
+    }
+}
+
+void
+ikev2_payload_add_auth (ikev2_payload_chain_t * c, ikev2_auth_t * auth)
+{
+  ike_auth_payload_header_t *ap;
+  ap =
+    (ike_auth_payload_header_t *) ikev2_payload_add_hdr (c,
+							 IKEV2_PAYLOAD_AUTH,
+							 sizeof (*ap));
+
+  ap->auth_method = auth->method;
+  ikev2_payload_add_data (c, auth->data);
+}
+
+void
+ikev2_payload_add_ts (ikev2_payload_chain_t * c, ikev2_ts_t * ts, u8 type)
+{
+  ike_ts_payload_header_t *tsh;
+  ikev2_ts_t *ts2;
+  u8 *data = 0, *tmp;
+
+  tsh =
+    (ike_ts_payload_header_t *) ikev2_payload_add_hdr (c, type,
+						       sizeof (*tsh));
+  tsh->num_ts = vec_len (ts);
+
+  vec_foreach (ts2, ts)
+  {
+    ASSERT (ts2->ts_type == 7);	/*TS_IPV4_ADDR_RANGE */
+    ikev2_ts_payload_entry_t *entry;
+    vec_add2 (data, tmp, sizeof (*entry));
+    entry = (ikev2_ts_payload_entry_t *) tmp;
+    entry->ts_type = ts2->ts_type;
+    entry->protocol_id = ts2->protocol_id;
+    entry->selector_len = clib_host_to_net_u16 (16);
+    entry->start_port = clib_host_to_net_u16 (ts2->start_port);
+    entry->end_port = clib_host_to_net_u16 (ts2->end_port);
+    entry->start_addr.as_u32 = ts2->start_addr.as_u32;
+    entry->end_addr.as_u32 = ts2->end_addr.as_u32;
+  }
+
+  ikev2_payload_add_data (c, data);
+  vec_free (data);
+}
+
+void
+ikev2_payload_chain_add_padding (ikev2_payload_chain_t * c, int bs)
+{
+  u8 *tmp __attribute__ ((unused));
+  u8 pad_len = (vec_len (c->data) / bs + 1) * bs - vec_len (c->data);
+  vec_add2 (c->data, tmp, pad_len);
+  c->data[vec_len (c->data) - 1] = pad_len - 1;
+}
+
+ikev2_sa_proposal_t *
+ikev2_parse_sa_payload (ike_payload_header_t * ikep)
+{
+  ikev2_sa_proposal_t *v = 0;
+  ikev2_sa_proposal_t *proposal;
+  ikev2_sa_transform_t *transform;
+
+  u32 plen = clib_net_to_host_u16 (ikep->length);
+
+  ike_sa_proposal_data_t *sap;
+  int proposal_ptr = 0;
+
+  do
+    {
+      sap = (ike_sa_proposal_data_t *) & ikep->payload[proposal_ptr];
+      int i;
+      int transform_ptr;
+
+      DBG_PLD ("proposal num %u len %u last_or_more %u id %u "
+	       "spi_size %u num_transforms %u",
+	       sap->proposal_num, clib_net_to_host_u16 (sap->proposal_len),
+	       sap->last_or_more, sap->protocol_id, sap->spi_size,
+	       sap->num_transforms);
+
+      /* IKE proposal should not have SPI */
+      if (sap->protocol_id == IKEV2_PROTOCOL_IKE && sap->spi_size != 0)
+	goto data_corrupted;
+
+      /* IKE proposal should not have SPI */
+      if (sap->protocol_id == IKEV2_PROTOCOL_ESP && sap->spi_size != 4)
+	goto data_corrupted;
+
+      transform_ptr = proposal_ptr + sizeof (*sap) + sap->spi_size;
+
+      vec_add2 (v, proposal, 1);
+      proposal->proposal_num = sap->proposal_num;
+      proposal->protocol_id = sap->protocol_id;
+
+      if (sap->spi_size == 4)
+	{
+	  proposal->spi = clib_net_to_host_u32 (sap->spi[0]);
+	}
+
+      for (i = 0; i < sap->num_transforms; i++)
+	{
+	  ike_sa_transform_data_t *tr =
+	    (ike_sa_transform_data_t *) & ikep->payload[transform_ptr];
+	  u16 tlen = clib_net_to_host_u16 (tr->transform_len);
+
+	  if (tlen < sizeof (*tr))
+	    goto data_corrupted;
+
+	  vec_add2 (proposal->transforms, transform, 1);
+
+	  transform->type = tr->transform_type;
+	  transform->transform_id = clib_net_to_host_u16 (tr->transform_id);
+	  if (tlen > sizeof (*tr))
+	    vec_add (transform->attrs, tr->attributes, tlen - sizeof (*tr));
+
+	  DBG_PLD
+	    ("transform num %u len %u last_or_more %u type %U id %u%s%U", i,
+	     tlen, tr->last_or_more, format_ikev2_sa_transform, transform,
+	     clib_net_to_host_u16 (tr->transform_id),
+	     tlen > sizeof (*tr) ? " attrs " : "", format_hex_bytes,
+	     tr->attributes, tlen - sizeof (*tr));
+
+	  transform_ptr += tlen;
+	}
+
+      proposal_ptr += clib_net_to_host_u16 (sap->proposal_len);
+    }
+  while (proposal_ptr < (plen - sizeof (*ikep)) && sap->last_or_more == 2);
+
+  /* data validation */
+  if (proposal_ptr != (plen - sizeof (*ikep)) || sap->last_or_more)
+    goto data_corrupted;
+
+  return v;
+
+data_corrupted:
+  DBG_PLD ("SA payload data corrupted");
+  ikev2_sa_free_proposal_vector (&v);
+  return 0;
+}
+
+ikev2_ts_t *
+ikev2_parse_ts_payload (ike_payload_header_t * ikep)
+{
+  ike_ts_payload_header_t *tsp = (ike_ts_payload_header_t *) ikep;
+  ikev2_ts_t *r = 0, *ts;
+  u8 i;
+
+  for (i = 0; i < tsp->num_ts; i++)
+    {
+      if (tsp->ts[i].ts_type != 7)	/*  TS_IPV4_ADDR_RANGE */
+	{
+	  DBG_PLD ("unsupported TS type received (%u)", tsp->ts[i].ts_type);
+	  continue;
+	}
+
+      vec_add2 (r, ts, 1);
+      ts->ts_type = tsp->ts[i].ts_type;
+      ts->protocol_id = tsp->ts[i].protocol_id;
+      ts->start_port = tsp->ts[i].start_port;
+      ts->end_port = tsp->ts[i].end_port;
+      ts->start_addr.as_u32 = tsp->ts[i].start_addr.as_u32;
+      ts->end_addr.as_u32 = tsp->ts[i].end_addr.as_u32;
+    }
+  return r;
+}
+
+ikev2_notify_t *
+ikev2_parse_notify_payload (ike_payload_header_t * ikep)
+{
+  ike_notify_payload_header_t *n = (ike_notify_payload_header_t *) ikep;
+  u32 plen = clib_net_to_host_u16 (ikep->length);
+  ikev2_notify_t *r = 0;
+  u32 spi;
+
+  DBG_PLD ("msg_type %U len %u%s%U",
+	   format_ikev2_notify_msg_type, clib_net_to_host_u16 (n->msg_type),
+	   plen, plen > sizeof (*n) ? " data " : "",
+	   format_hex_bytes, n->payload, plen - sizeof (*n));
+
+  r = vec_new (ikev2_notify_t, 1);
+  r->msg_type = clib_net_to_host_u16 (n->msg_type);
+  r->protocol_id = n->protocol_id;
+
+  if (n->spi_size == 4)
+    {
+      clib_memcpy (&spi, n->payload, n->spi_size);
+      r->spi = clib_net_to_host_u32 (spi);
+      DBG_PLD ("spi %lx", r->spi);
+    }
+  else if (n->spi_size == 0)
+    {
+      r->spi = 0;
+    }
+  else
+    {
+      clib_warning ("invalid SPI Size %d", n->spi_size);
+    }
+
+  if (plen > (sizeof (*n) + n->spi_size))
+    {
+      vec_add (r->data, n->payload + n->spi_size,
+	       plen - sizeof (*n) - n->spi_size);
+    }
+
+  return r;
+}
+
+void
+ikev2_parse_vendor_payload (ike_payload_header_t * ikep)
+{
+  u32 plen = clib_net_to_host_u16 (ikep->length);
+  int i;
+  int is_string = 1;
+
+  for (i = 0; i < plen - 4; i++)
+    if (!isprint (ikep->payload[i]))
+      is_string = 0;
+
+  DBG_PLD ("len %u data %s:%U",
+	   plen,
+	   is_string ? "string" : "hex",
+	   is_string ? format_ascii_bytes : format_hex_bytes,
+	   ikep->payload, plen - sizeof (*ikep));
+}
+
+ikev2_delete_t *
+ikev2_parse_delete_payload (ike_payload_header_t * ikep)
+{
+  ike_delete_payload_header_t *d = (ike_delete_payload_header_t *) ikep;
+  u32 plen = clib_net_to_host_u16 (ikep->length);
+  ikev2_delete_t *r = 0, *del;
+  u16 num_of_spi = clib_net_to_host_u16 (d->num_of_spi);
+  u16 i = 0;
+
+  DBG_PLD ("protocol_id %u spi_size %u num_of_spi %u len %u%s%U",
+	   d->protocol_id, d->spi_size, num_of_spi,
+	   plen, plen > sizeof (d) ? " data " : "",
+	   format_hex_bytes, d->spi, plen - sizeof (*d));
+
+  if (d->protocol_id == IKEV2_PROTOCOL_IKE)
+    {
+      r = vec_new (ikev2_delete_t, 1);
+      r->protocol_id = 1;
+    }
+  else
+    {
+      r = vec_new (ikev2_delete_t, num_of_spi);
+      vec_foreach (del, r)
+      {
+	del->protocol_id = d->protocol_id;
+	del->spi = clib_net_to_host_u32 (d->spi[i++]);
+      }
+    }
+
+  return r;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ikev2_priv.h b/src/vnet/ipsec/ikev2_priv.h
new file mode 100644
index 00000000..9f67ad2a
--- /dev/null
+++ b/src/vnet/ipsec/ikev2_priv.h
@@ -0,0 +1,321 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_ikev2_priv_h__
+#define __included_ikev2_priv_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+
+#include <vnet/ipsec/ikev2.h>
+
+#include <vppinfra/hash.h>
+#include <vppinfra/elog.h>
+#include <vppinfra/error.h>
+
+#include <openssl/rand.h>
+#include <openssl/dh.h>
+#include <openssl/hmac.h>
+#include <openssl/evp.h>
+
+#define IKEV2_DEBUG_PAYLOAD 1
+
+#if IKEV2_DEBUG_PAYLOAD == 1
+#define DBG_PLD(my_args...) clib_warning(my_args)
+#else
+#define DBG_PLD(my_args...)
+#endif
+
+typedef enum
+{
+  IKEV2_STATE_UNKNOWN,
+  IKEV2_STATE_SA_INIT,
+  IKEV2_STATE_DELETED,
+  IKEV2_STATE_AUTH_FAILED,
+  IKEV2_STATE_AUTHENTICATED,
+  IKEV2_STATE_NOTIFY_AND_DELETE,
+  IKEV2_STATE_TS_UNACCEPTABLE,
+  IKEV2_STATE_NO_PROPOSAL_CHOSEN,
+} ikev2_state_t;
+
+typedef struct
+{
+  ikev2_auth_method_t method:8;
+  u8 *data;
+  u8 hex;			/* hex encoding of the shared secret */
+  EVP_PKEY *key;
+} ikev2_auth_t;
+
+typedef enum
+{
+  IKEV2_DH_GROUP_MODP = 0,
+  IKEV2_DH_GROUP_ECP = 1,
+} ikev2_dh_group_t;
+
+typedef struct
+{
+  ikev2_transform_type_t type;
+  union
+  {
+    u16 transform_id;
+    ikev2_transform_encr_type_t encr_type:16;
+    ikev2_transform_prf_type_t prf_type:16;
+    ikev2_transform_integ_type_t integ_type:16;
+    ikev2_transform_dh_type_t dh_type:16;
+    ikev2_transform_esn_type_t esn_type:16;
+  };
+  u8 *attrs;
+  u16 key_len;
+  u16 key_trunc;
+  u16 block_size;
+  u8 dh_group;
+  int nid;
+  const char *dh_p;
+  const char *dh_g;
+  const void *md;
+  const void *cipher;
+} ikev2_sa_transform_t;
+
+typedef struct
+{
+  u8 proposal_num;
+  ikev2_protocol_id_t protocol_id:8;
+  u32 spi;
+  ikev2_sa_transform_t *transforms;
+} ikev2_sa_proposal_t;
+
+typedef struct
+{
+  u8 ts_type;
+  u8 protocol_id;
+  u16 selector_len;
+  u16 start_port;
+  u16 end_port;
+  ip4_address_t start_addr;
+  ip4_address_t end_addr;
+} ikev2_ts_t;
+
+typedef struct
+{
+  ikev2_id_type_t type:8;
+  u8 *data;
+} ikev2_id_t;
+
+typedef struct
+{
+  /* sa proposals vectors */
+  ikev2_sa_proposal_t *i_proposals;
+  ikev2_sa_proposal_t *r_proposals;
+
+  /* Traffic Selectors */
+  ikev2_ts_t *tsi;
+  ikev2_ts_t *tsr;
+
+  /* keys */
+  u8 *sk_ai;
+  u8 *sk_ar;
+  u8 *sk_ei;
+  u8 *sk_er;
+} ikev2_child_sa_t;
+
+typedef struct
+{
+  u8 protocol_id;
+  u32 spi;			/*for ESP and AH SPI size is 4, for IKE size is 0 */
+} ikev2_delete_t;
+
+typedef struct
+{
+  u8 protocol_id;
+  u32 spi;
+  ikev2_sa_proposal_t *i_proposal;
+  ikev2_sa_proposal_t *r_proposal;
+  ikev2_ts_t *tsi;
+  ikev2_ts_t *tsr;
+} ikev2_rekey_t;
+
+typedef struct
+{
+  u16 msg_type;
+  u8 protocol_id;
+  u32 spi;
+  u8 *data;
+} ikev2_notify_t;
+
+
+typedef struct
+{
+  ikev2_state_t state;
+  u8 unsupported_cp;
+  u8 initial_contact;
+  ip4_address_t iaddr;
+  ip4_address_t raddr;
+  u64 ispi;
+  u64 rspi;
+  u8 *i_nonce;
+  u8 *r_nonce;
+
+  /* DH data */
+  u16 dh_group;
+  u8 *dh_shared_key;
+  u8 *i_dh_data;
+  u8 *r_dh_data;
+
+  /* sa proposals vectors */
+  ikev2_sa_proposal_t *i_proposals;
+  ikev2_sa_proposal_t *r_proposals;
+
+  /* keys */
+  u8 *sk_d;
+  u8 *sk_ai;
+  u8 *sk_ar;
+  u8 *sk_ei;
+  u8 *sk_er;
+  u8 *sk_pi;
+  u8 *sk_pr;
+
+  /* auth */
+  ikev2_auth_t i_auth;
+  ikev2_auth_t r_auth;
+
+  /* ID */
+  ikev2_id_t i_id;
+  ikev2_id_t r_id;
+
+  /* pending deletes */
+  ikev2_delete_t *del;
+
+  /* pending rekeyings */
+  ikev2_rekey_t *rekey;
+
+  /* packet data */
+  u8 *last_sa_init_req_packet_data;
+  u8 *last_sa_init_res_packet_data;
+
+  /* retransmit */
+  u32 last_msg_id;
+  u8 *last_res_packet_data;
+
+  ikev2_child_sa_t *childs;
+} ikev2_sa_t;
+
+typedef struct
+{
+  u8 *name;
+  u8 is_enabled;
+
+  ikev2_auth_t auth;
+  ikev2_id_t loc_id;
+  ikev2_id_t rem_id;
+  ikev2_ts_t loc_ts;
+  ikev2_ts_t rem_ts;
+} ikev2_profile_t;
+
+typedef struct
+{
+  /* pool of IKEv2 Security Associations */
+  ikev2_sa_t *sas;
+
+  /* hash */
+  uword *sa_by_rspi;
+} ikev2_main_per_thread_data_t;
+
+typedef struct
+{
+  /* pool of IKEv2 profiles */
+  ikev2_profile_t *profiles;
+
+  /* vector of supported transform types */
+  ikev2_sa_transform_t *supported_transforms;
+
+  /* hash */
+  mhash_t profile_index_by_name;
+
+  /* local private key */
+  EVP_PKEY *pkey;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+
+  ikev2_main_per_thread_data_t *per_thread_data;
+
+} ikev2_main_t;
+
+ikev2_main_t ikev2_main;
+
+void ikev2_sa_free_proposal_vector (ikev2_sa_proposal_t ** v);
+ikev2_sa_transform_t *ikev2_sa_get_td_for_type (ikev2_sa_proposal_t * p,
+						ikev2_transform_type_t type);
+
+/* ikev2_crypto.c */
+v8 *ikev2_calc_prf (ikev2_sa_transform_t * tr, v8 * key, v8 * data);
+u8 *ikev2_calc_prfplus (ikev2_sa_transform_t * tr, u8 * key, u8 * seed,
+			int len);
+v8 *ikev2_calc_integr (ikev2_sa_transform_t * tr, v8 * key, u8 * data,
+		       int len);
+v8 *ikev2_decrypt_data (ikev2_sa_t * sa, u8 * data, int len);
+int ikev2_encrypt_data (ikev2_sa_t * sa, v8 * src, u8 * dst);
+void ikev2_generate_dh (ikev2_sa_t * sa, ikev2_sa_transform_t * t);
+int ikev2_verify_sign (EVP_PKEY * pkey, u8 * sigbuf, u8 * data);
+u8 *ikev2_calc_sign (EVP_PKEY * pkey, u8 * data);
+EVP_PKEY *ikev2_load_cert_file (u8 * file);
+EVP_PKEY *ikev2_load_key_file (u8 * file);
+void ikev2_crypto_init (ikev2_main_t * km);
+
+/* ikev2_payload.c */
+typedef struct
+{
+  u8 first_payload_type;
+  u16 last_hdr_off;
+  u8 *data;
+} ikev2_payload_chain_t;
+
+#define ikev2_payload_new_chain(V) vec_validate (V, 0)
+#define ikev2_payload_destroy_chain(V) do { \
+  vec_free((V)->data);                 \
+  vec_free(V);                         \
+} while (0)
+
+void ikev2_payload_add_notify (ikev2_payload_chain_t * c, u16 msg_type,
+			       u8 * data);
+void ikev2_payload_add_sa (ikev2_payload_chain_t * c,
+			   ikev2_sa_proposal_t * proposals);
+void ikev2_payload_add_ke (ikev2_payload_chain_t * c, u16 dh_group,
+			   u8 * dh_data);
+void ikev2_payload_add_nonce (ikev2_payload_chain_t * c, u8 * nonce);
+void ikev2_payload_add_id (ikev2_payload_chain_t * c, ikev2_id_t * id,
+			   u8 type);
+void ikev2_payload_add_auth (ikev2_payload_chain_t * c, ikev2_auth_t * auth);
+void ikev2_payload_add_ts (ikev2_payload_chain_t * c, ikev2_ts_t * ts,
+			   u8 type);
+void ikev2_payload_add_delete (ikev2_payload_chain_t * c, ikev2_delete_t * d);
+void ikev2_payload_chain_add_padding (ikev2_payload_chain_t * c, int bs);
+void ikev2_parse_vendor_payload (ike_payload_header_t * ikep);
+ikev2_sa_proposal_t *ikev2_parse_sa_payload (ike_payload_header_t * ikep);
+ikev2_ts_t *ikev2_parse_ts_payload (ike_payload_header_t * ikep);
+ikev2_delete_t *ikev2_parse_delete_payload (ike_payload_header_t * ikep);
+ikev2_notify_t *ikev2_parse_notify_payload (ike_payload_header_t * ikep);
+
+#endif /* __included_ikev2_priv_h__ */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ipsec.api b/src/vnet/ipsec/ipsec.api
new file mode 100644
index 00000000..178bb757
--- /dev/null
+++ b/src/vnet/ipsec/ipsec.api
@@ -0,0 +1,457 @@
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \brief IPsec: Add/delete Security Policy Database
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add SPD if non-zero, else delete
+    @param spd_id - SPD instance id (control plane allocated)
+*/
+
+define ipsec_spd_add_del
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u32 spd_id;
+};
+
+/** \brief Reply for IPsec: Add/delete Security Policy Database entry
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+
+define ipsec_spd_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IPsec: Add/delete SPD from interface
+
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add security mode if non-zero, else delete
+    @param sw_if_index - index of the interface
+    @param spd_id - SPD instance id to use for lookups
+*/
+
+
+define ipsec_interface_add_del_spd
+{
+  u32 client_index;
+  u32 context;
+
+  u8 is_add;
+  u32 sw_if_index;
+  u32 spd_id;
+};
+
+/** \brief Reply for IPsec: Add/delete SPD from interface
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+
+define ipsec_interface_add_del_spd_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IPsec: Add/delete Security Policy Database entry
+
+    See RFC 4301, 4.4.1.1 on how to match packet to selectors
+
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add SPD if non-zero, else delete
+    @param spd_id - SPD instance id (control plane allocated)
+    @param priority - priority of SPD entry (non-unique value).  Used to order SPD matching - higher priorities match before lower
+    @param is_outbound - entry applies to outbound traffic if non-zero, otherwise applies to inbound traffic
+    @param is_ipv6 - remote/local address are IPv6 if non-zero, else IPv4
+    @param remote_address_start - start of remote address range to match
+    @param remote_address_stop - end of remote address range to match
+    @param local_address_start - start of local address range to match
+    @param local_address_stop - end of local address range to match
+    @param protocol - protocol type to match [0 means any]
+    @param remote_port_start - start of remote port range to match ...
+    @param remote_port_stop - end of remote port range to match [0 to 65535 means ANY, 65535 to 0 means OPAQUE]
+    @param local_port_start - start of local port range to match ...
+    @param local_port_stop - end of remote port range to match [0 to 65535 means ANY, 65535 to 0 means OPAQUE]
+    @param policy - 0 = bypass (no IPsec processing), 1 = discard (discard packet with ICMP processing), 2 = resolve (send request to control plane for SA resolving, and discard without ICMP processing), 3 = protect (apply IPsec policy using following parameters)
+    @param sa_id - SAD instance id (control plane allocated)
+
+*/
+
+define ipsec_spd_add_del_entry
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+
+  u32 spd_id;
+  i32 priority;
+  u8 is_outbound;
+
+  // Selector
+  u8 is_ipv6;
+  u8 is_ip_any;
+  u8 remote_address_start[16];
+  u8 remote_address_stop[16];
+  u8 local_address_start[16];
+  u8 local_address_stop[16];
+
+  u8 protocol;
+
+  u16 remote_port_start;
+  u16 remote_port_stop;
+  u16 local_port_start;
+  u16 local_port_stop;
+
+  // Policy
+  u8 policy;
+  u32 sa_id;
+};
+
+/** \brief Reply for IPsec: Add/delete Security Policy Database entry
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+
+define ipsec_spd_add_del_entry_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IPsec: Add/delete Security Association Database entry
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add SAD entry if non-zero, else delete
+
+    @param sad_id - sad id
+
+    @param spi - security parameter index
+
+    @param protocol - 0 = AH, 1 = ESP
+
+    @param crypto_algorithm - 0 = Null, 1 = AES-CBC-128, 2 = AES-CBC-192, 3 = AES-CBC-256, 4 = 3DES-CBC
+    @param crypto_key_length - length of crypto_key in bytes
+    @param crypto_key - crypto keying material
+
+    @param integrity_algorithm - 0 = None, 1 = MD5-96, 2 = SHA1-96, 3 = SHA-256, 4 = SHA-384, 5=SHA-512
+    @param integrity_key_length - length of integrity_key in bytes
+    @param integrity_key - integrity keying material
+
+    @param use_extended_sequence_number - use ESN when non-zero
+
+    @param is_tunnel - IPsec tunnel mode if non-zero, else transport mode
+    @param is_tunnel_ipv6 - IPsec tunnel mode is IPv6 if non-zero, else IPv4 tunnel only valid if is_tunnel is non-zero
+    @param tunnel_src_address - IPsec tunnel source address IPv6 if is_tunnel_ipv6 is non-zero, else IPv4. Only valid if is_tunnel is non-zero
+    @param tunnel_dst_address - IPsec tunnel destination address IPv6 if is_tunnel_ipv6 is non-zero, else IPv4. Only valid if is_tunnel is non-zero
+
+    To be added:
+     Anti-replay
+     IPsec tunnel address copy mode (to support GDOI)
+ */
+
+define ipsec_sad_add_del_entry
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+
+  u32 sad_id;
+
+  u32 spi;
+
+  u8 protocol;
+
+  u8 crypto_algorithm;
+  u8 crypto_key_length;
+  u8 crypto_key[128];
+
+  u8 integrity_algorithm;
+  u8 integrity_key_length;
+  u8 integrity_key[128];
+
+  u8 use_extended_sequence_number;
+
+  u8 is_tunnel;
+  u8 is_tunnel_ipv6;
+  u8 tunnel_src_address[16];
+  u8 tunnel_dst_address[16];
+};
+
+/** \brief Reply for IPsec: Add/delete Security Association Database entry
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+
+define ipsec_sad_add_del_entry_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IPsec: Update Security Association keys
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+
+    @param sa_id - sa id
+
+    @param crypto_key_length - length of crypto_key in bytes
+    @param crypto_key - crypto keying material
+
+    @param integrity_key_length - length of integrity_key in bytes
+    @param integrity_key - integrity keying material
+*/
+
+define ipsec_sa_set_key
+{
+  u32 client_index;
+  u32 context;
+
+  u32 sa_id;
+
+  u8 crypto_key_length;
+  u8 crypto_key[128];
+
+  u8 integrity_key_length;
+  u8 integrity_key[128];
+};
+
+/** \brief Reply for IPsec: Update Security Association keys
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+
+define ipsec_sa_set_key_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IKEv2: Add/delete profile
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+
+    @param name - IKEv2 profile name
+    @param is_add - Add IKEv2 profile if non-zero, else delete
+*/
+define ikev2_profile_add_del
+{
+  u32 client_index;
+  u32 context;
+
+  u8 name[64];
+  u8 is_add;
+};
+
+/** \brief Reply for IKEv2: Add/delete profile
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define ikev2_profile_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IKEv2: Set IKEv2 profile authentication method
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+
+    @param name - IKEv2 profile name
+    @param auth_method - IKEv2 authentication method (shared-key-mic/rsa-sig)
+    @param is_hex - Authentication data in hex format if non-zero, else string
+    @param data_len - Authentication data length
+    @param data - Authentication data (for rsa-sig cert file path)
+*/
+define ikev2_profile_set_auth
+{
+  u32 client_index;
+  u32 context;
+
+  u8 name[64];
+  u8 auth_method;
+  u8 is_hex;
+  u32 data_len;
+  u8 data[0];
+};
+
+/** \brief Reply for IKEv2: Set IKEv2 profile authentication method
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define ikev2_profile_set_auth_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IKEv2: Set IKEv2 profile local/remote identification
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+
+    @param name - IKEv2 profile name
+    @param is_local - Identification is local if non-zero, else remote
+    @param id_type - Identification type
+    @param data_len - Identification data length
+    @param data - Identification data
+*/
+define ikev2_profile_set_id
+{
+  u32 client_index;
+  u32 context;
+
+  u8 name[64];
+  u8 is_local;
+  u8 id_type;
+  u32 data_len;
+  u8 data[0];
+};
+
+/** \brief Reply for IKEv2:
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define ikev2_profile_set_id_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IKEv2: Set IKEv2 profile traffic selector parameters
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+
+    @param name - IKEv2 profile name
+    @param is_local - Traffic selector is local if non-zero, else remote
+    @param proto - Traffic selector IP protocol (if zero not relevant)
+    @param start_port - The smallest port number allowed by traffic selector
+    @param end_port - The largest port number allowed by traffic selector
+    @param start_addr - The smallest address included in traffic selector
+    @param end_addr - The largest address included in traffic selector
+*/
+define ikev2_profile_set_ts
+{
+  u32 client_index;
+  u32 context;
+
+  u8 name[64];
+  u8 is_local;
+  u8 proto;
+  u16 start_port;
+  u16 end_port;
+  u32 start_addr;
+  u32 end_addr;
+};
+
+/** \brief Reply for IKEv2: Set IKEv2 profile traffic selector parameters
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define ikev2_profile_set_ts_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IKEv2: Set IKEv2 local RSA private key
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+
+    @param key_file - Key file absolute path
+*/
+define ikev2_set_local_key
+{
+  u32 client_index;
+  u32 context;
+
+  u8 key_file[256];
+};
+
+/** \brief Reply for IKEv2: Set IKEv2 local key
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define ikev2_set_local_key_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Dump ipsec policy database data
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param spd_id - SPD instance id
+    @param sa_id - SA id, optional, set to ~0 to see all policies in SPD
+*/
+define ipsec_spd_dump {
+    u32 client_index;
+    u32 context;
+    u32 spd_id;
+    u32 sa_id;
+};
+
+/** \brief IPsec policy database response
+    @param context - sender context which was passed in the request
+    @param spd_id - SPD instance id
+    @param priority - numeric value to control policy evaluation order
+    @param is_outbound - [1|0] to indicate if direction is [out|in]bound
+    @param is_ipv6 - [1|0] to indicate if address family is ipv[6|4]
+    @param local_start_addr - first address in local traffic selector range
+    @param local_stop_addr - last address in local traffic selector range
+    @param local_start_port - first port in local traffic selector range
+    @param local_stop_port - last port in local traffic selector range
+    @param remote_start_addr - first address in remote traffic selector range
+    @param remote_stop_addr - last address in remote traffic selector range
+    @param remote_start_port - first port in remote traffic selector range
+    @param remote_stop_port - last port in remote traffic selector range
+    @param protocol - traffic selector protocol
+    @param policy - policy action
+    @param sa_id - SA id
+    @param bytes - byte count of packets matching this policy
+    @param packets - count of packets matching this policy
+*/
+
+define ipsec_spd_details {
+    u32 context;
+    u32 spd_id;
+    i32 priority;
+    u8 is_outbound;
+    u8 is_ipv6;
+    u8 local_start_addr[16];
+    u8 local_stop_addr[16];
+    u16 local_start_port;
+    u16 local_stop_port;
+    u8 remote_start_addr[16];
+    u8 remote_stop_addr[16];
+    u16 remote_start_port;
+    u16 remote_stop_port;
+    u8 protocol;
+    u8 policy;
+    u32 sa_id;
+    u64 bytes;
+    u64 packets;
+};
+
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
+ 
\ No newline at end of file
diff --git a/src/vnet/ipsec/ipsec.c b/src/vnet/ipsec/ipsec.c
new file mode 100644
index 00000000..ee85c402
--- /dev/null
+++ b/src/vnet/ipsec/ipsec.c
@@ -0,0 +1,581 @@
+/*
+ * decap.c : IPSec tunnel support
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+#include <vnet/interface.h>
+
+#include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/ikev2.h>
+
+#if DPDK_CRYPTO==1
+#include <vnet/devices/dpdk/ipsec/esp.h>
+#define ESP_NODE "dpdk-esp-encrypt"
+#else
+#include <vnet/ipsec/esp.h>
+#define ESP_NODE "esp-encrypt"
+#endif
+
+#if DPDK_CRYPTO==0
+/* dummy function */
+static int
+add_del_sa_sess (u32 sa_index, u8 is_add)
+{
+  return 0;
+}
+#endif
+
+u32
+ipsec_get_sa_index_by_sa_id (u32 sa_id)
+{
+  ipsec_main_t *im = &ipsec_main;
+  uword *p = hash_get (im->sa_index_by_sa_id, sa_id);
+  if (!p)
+    return ~0;
+
+  return p[0];
+}
+
+int
+ipsec_set_interface_spd (vlib_main_t * vm, u32 sw_if_index, u32 spd_id,
+			 int is_add)
+{
+  ipsec_main_t *im = &ipsec_main;
+  ip4_ipsec_config_t config;
+
+  u32 spd_index;
+  uword *p;
+
+  p = hash_get (im->spd_index_by_spd_id, spd_id);
+  if (!p)
+    return VNET_API_ERROR_SYSCALL_ERROR_1;	/* no such spd-id */
+
+  spd_index = p[0];
+
+  p = hash_get (im->spd_index_by_sw_if_index, sw_if_index);
+  if (p && is_add)
+    return VNET_API_ERROR_SYSCALL_ERROR_1;	/* spd already assigned */
+
+  if (is_add)
+    {
+      hash_set (im->spd_index_by_sw_if_index, sw_if_index, spd_index);
+    }
+  else
+    {
+      hash_unset (im->spd_index_by_sw_if_index, sw_if_index);
+    }
+
+  clib_warning ("sw_if_index %u spd_id %u spd_index %u",
+		sw_if_index, spd_id, spd_index);
+
+  /* enable IPsec on TX */
+  vnet_feature_enable_disable ("ip4-output", "ipsec-output-ip4", sw_if_index,
+			       is_add, 0, 0);
+  vnet_feature_enable_disable ("ip6-output", "ipsec-output-ip6", sw_if_index,
+			       is_add, 0, 0);
+
+  /* enable IPsec on RX */
+  vnet_feature_enable_disable ("ip4-unicast", "ipsec-input-ip4", sw_if_index,
+			       is_add, &config, sizeof (config));
+  vnet_feature_enable_disable ("ip6-unicast", "ipsec-input-ip6", sw_if_index,
+			       is_add, &config, sizeof (config));
+
+  return 0;
+}
+
+int
+ipsec_add_del_spd (vlib_main_t * vm, u32 spd_id, int is_add)
+{
+  ipsec_main_t *im = &ipsec_main;
+  ipsec_spd_t *spd = 0;
+  uword *p;
+  u32 spd_index, k, v;
+
+  p = hash_get (im->spd_index_by_spd_id, spd_id);
+  if (p && is_add)
+    return VNET_API_ERROR_INVALID_VALUE;
+  if (!p && !is_add)
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  if (!is_add)			/* delete */
+    {
+      spd_index = p[0];
+      spd = pool_elt_at_index (im->spds, spd_index);
+      if (!spd)
+	return VNET_API_ERROR_INVALID_VALUE;
+      /* *INDENT-OFF* */
+      hash_foreach (k, v, im->spd_index_by_sw_if_index, ({
+        if (v == spd_index)
+          ipsec_set_interface_spd(vm, k, spd_id, 0);
+      }));
+      /* *INDENT-ON* */
+      hash_unset (im->spd_index_by_spd_id, spd_id);
+      pool_free (spd->policies);
+      vec_free (spd->ipv4_outbound_policies);
+      vec_free (spd->ipv6_outbound_policies);
+      vec_free (spd->ipv4_inbound_protect_policy_indices);
+      vec_free (spd->ipv4_inbound_policy_discard_and_bypass_indices);
+      pool_put (im->spds, spd);
+    }
+  else				/* create new SPD */
+    {
+      pool_get (im->spds, spd);
+      memset (spd, 0, sizeof (*spd));
+      spd_index = spd - im->spds;
+      spd->id = spd_id;
+      hash_set (im->spd_index_by_spd_id, spd_id, spd_index);
+    }
+  return 0;
+}
+
+static int
+ipsec_spd_entry_sort (void *a1, void *a2)
+{
+  ipsec_main_t *im = &ipsec_main;
+  u32 *id1 = a1;
+  u32 *id2 = a2;
+  ipsec_spd_t *spd;
+  ipsec_policy_t *p1, *p2;
+
+  /* *INDENT-OFF* */
+  pool_foreach (spd, im->spds, ({
+    p1 = pool_elt_at_index(spd->policies, *id1);
+    p2 = pool_elt_at_index(spd->policies, *id2);
+    if (p1 && p2)
+      return p2->priority - p1->priority;
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+int
+ipsec_add_del_policy (vlib_main_t * vm, ipsec_policy_t * policy, int is_add)
+{
+  ipsec_main_t *im = &ipsec_main;
+  ipsec_spd_t *spd = 0;
+  ipsec_policy_t *vp;
+  uword *p;
+  u32 spd_index;
+
+  clib_warning ("policy-id %u priority %d is_outbound %u", policy->id,
+		policy->priority, policy->is_outbound);
+
+  if (policy->policy == IPSEC_POLICY_ACTION_PROTECT)
+    {
+      p = hash_get (im->sa_index_by_sa_id, policy->sa_id);
+      if (!p)
+	return VNET_API_ERROR_SYSCALL_ERROR_1;
+      policy->sa_index = p[0];
+    }
+
+  p = hash_get (im->spd_index_by_spd_id, policy->id);
+
+  if (!p)
+    return VNET_API_ERROR_SYSCALL_ERROR_1;
+
+  spd_index = p[0];
+  spd = pool_elt_at_index (im->spds, spd_index);
+  if (!spd)
+    return VNET_API_ERROR_SYSCALL_ERROR_1;
+
+  if (is_add)
+    {
+      u32 policy_index;
+
+      pool_get (spd->policies, vp);
+      clib_memcpy (vp, policy, sizeof (*vp));
+      policy_index = vp - spd->policies;
+
+      if (policy->is_outbound)
+	{
+	  if (policy->is_ipv6)
+	    {
+	      vec_add1 (spd->ipv6_outbound_policies, policy_index);
+	      clib_memcpy (vp, policy, sizeof (ipsec_policy_t));
+	      vec_sort_with_function (spd->ipv6_outbound_policies,
+				      ipsec_spd_entry_sort);
+	    }
+	  else
+	    {
+	      vec_add1 (spd->ipv4_outbound_policies, policy_index);
+	      clib_memcpy (vp, policy, sizeof (ipsec_policy_t));
+	      vec_sort_with_function (spd->ipv4_outbound_policies,
+				      ipsec_spd_entry_sort);
+	    }
+	}
+      else
+	{
+	  if (policy->is_ipv6)
+	    {
+	      if (policy->policy == IPSEC_POLICY_ACTION_PROTECT)
+		{
+		  vec_add1 (spd->ipv6_inbound_protect_policy_indices,
+			    policy_index);
+		  clib_memcpy (vp, policy, sizeof (ipsec_policy_t));
+		  vec_sort_with_function
+		    (spd->ipv6_inbound_protect_policy_indices,
+		     ipsec_spd_entry_sort);
+		}
+	      else
+		{
+		  vec_add1
+		    (spd->ipv6_inbound_policy_discard_and_bypass_indices,
+		     policy_index);
+		  clib_memcpy (vp, policy, sizeof (ipsec_policy_t));
+		  vec_sort_with_function
+		    (spd->ipv6_inbound_policy_discard_and_bypass_indices,
+		     ipsec_spd_entry_sort);
+		}
+	    }
+	  else
+	    {
+	      if (policy->policy == IPSEC_POLICY_ACTION_PROTECT)
+		{
+		  vec_add1 (spd->ipv4_inbound_protect_policy_indices,
+			    policy_index);
+		  clib_memcpy (vp, policy, sizeof (ipsec_policy_t));
+		  vec_sort_with_function
+		    (spd->ipv4_inbound_protect_policy_indices,
+		     ipsec_spd_entry_sort);
+		}
+	      else
+		{
+		  vec_add1
+		    (spd->ipv4_inbound_policy_discard_and_bypass_indices,
+		     policy_index);
+		  clib_memcpy (vp, policy, sizeof (ipsec_policy_t));
+		  vec_sort_with_function
+		    (spd->ipv4_inbound_policy_discard_and_bypass_indices,
+		     ipsec_spd_entry_sort);
+		}
+	    }
+	}
+
+    }
+  else
+    {
+      u32 i, j;
+      /* *INDENT-OFF* */
+      pool_foreach_index(i, spd->policies, ({
+        vp = pool_elt_at_index(spd->policies, i);
+        if (vp->priority != policy->priority)
+          continue;
+        if (vp->is_outbound != policy->is_outbound)
+          continue;
+        if (vp->policy != policy->policy)
+          continue;
+        if (vp->sa_id != policy->sa_id)
+          continue;
+        if (vp->protocol != policy->protocol)
+          continue;
+        if (vp->lport.start != policy->lport.start)
+          continue;
+        if (vp->lport.stop != policy->lport.stop)
+          continue;
+        if (vp->rport.start != policy->rport.start)
+          continue;
+        if (vp->rport.stop != policy->rport.stop)
+          continue;
+        if (vp->is_ipv6 != policy->is_ipv6)
+          continue;
+        if (policy->is_ipv6)
+          {
+            if (vp->laddr.start.ip6.as_u64[0] != policy->laddr.start.ip6.as_u64[0])
+              continue;
+            if (vp->laddr.start.ip6.as_u64[1] != policy->laddr.start.ip6.as_u64[1])
+              continue;
+            if (vp->laddr.stop.ip6.as_u64[0] != policy->laddr.stop.ip6.as_u64[0])
+              continue;
+            if (vp->laddr.stop.ip6.as_u64[1] != policy->laddr.stop.ip6.as_u64[1])
+              continue;
+            if (vp->raddr.start.ip6.as_u64[0] != policy->raddr.start.ip6.as_u64[0])
+              continue;
+            if (vp->raddr.start.ip6.as_u64[1] != policy->raddr.start.ip6.as_u64[1])
+              continue;
+            if (vp->raddr.stop.ip6.as_u64[0] != policy->raddr.stop.ip6.as_u64[0])
+              continue;
+           if (vp->laddr.stop.ip6.as_u64[1] != policy->laddr.stop.ip6.as_u64[1])
+              continue;
+           if (policy->is_outbound)
+             {
+               vec_foreach_index(j, spd->ipv6_outbound_policies) {
+                 if (vec_elt(spd->ipv6_outbound_policies, j) == i) {
+                   vec_del1 (spd->ipv6_outbound_policies, j);
+                   break;
+                 }
+               }
+             }
+           else
+             {
+               if (policy->policy == IPSEC_POLICY_ACTION_PROTECT)
+                 {
+                   vec_foreach_index(j, spd->ipv6_inbound_protect_policy_indices) {
+                     if (vec_elt(spd->ipv6_inbound_protect_policy_indices, j) == i) {
+                       vec_del1 (spd->ipv6_inbound_protect_policy_indices, j);
+                       break;
+                     }
+                   }
+                 }
+               else
+                 {
+                   vec_foreach_index(j, spd->ipv6_inbound_policy_discard_and_bypass_indices) {
+                     if (vec_elt(spd->ipv6_inbound_policy_discard_and_bypass_indices, j) == i) {
+                       vec_del1 (spd->ipv6_inbound_policy_discard_and_bypass_indices, j);
+                       break;
+                     }
+                   }
+                 }
+             }
+          }
+        else
+          {
+            if (vp->laddr.start.ip4.as_u32 != policy->laddr.start.ip4.as_u32)
+              continue;
+            if (vp->laddr.stop.ip4.as_u32 != policy->laddr.stop.ip4.as_u32)
+              continue;
+            if (vp->raddr.start.ip4.as_u32 != policy->raddr.start.ip4.as_u32)
+              continue;
+            if (vp->raddr.stop.ip4.as_u32 != policy->raddr.stop.ip4.as_u32)
+              continue;
+            if (policy->is_outbound)
+              {
+                vec_foreach_index(j, spd->ipv4_outbound_policies) {
+                  if (vec_elt(spd->ipv4_outbound_policies, j) == i) {
+                    vec_del1 (spd->ipv4_outbound_policies, j);
+                    break;
+                  }
+                }
+              }
+            else
+              {
+                if (policy->policy == IPSEC_POLICY_ACTION_PROTECT)
+                  {
+                    vec_foreach_index(j, spd->ipv4_inbound_protect_policy_indices) {
+                      if (vec_elt(spd->ipv4_inbound_protect_policy_indices, j) == i) {
+                        vec_del1 (spd->ipv4_inbound_protect_policy_indices, j);
+                        break;
+                      }
+                    }
+                  }
+                else
+                  {
+                    vec_foreach_index(j, spd->ipv4_inbound_policy_discard_and_bypass_indices) {
+                      if (vec_elt(spd->ipv4_inbound_policy_discard_and_bypass_indices, j) == i) {
+                        vec_del1 (spd->ipv4_inbound_policy_discard_and_bypass_indices, j);
+                        break;
+                    }
+                  }
+              }
+          }
+          pool_put (spd->policies, vp);
+          break;
+        }
+      }));
+      /* *INDENT-ON* */
+    }
+
+  return 0;
+}
+
+static u8
+ipsec_is_sa_used (u32 sa_index)
+{
+  ipsec_main_t *im = &ipsec_main;
+  ipsec_spd_t *spd;
+  ipsec_policy_t *p;
+  ipsec_tunnel_if_t *t;
+
+  /* *INDENT-OFF* */
+  pool_foreach(spd, im->spds, ({
+    pool_foreach(p, spd->policies, ({
+      if (p->policy == IPSEC_POLICY_ACTION_PROTECT)
+        {
+          if (p->sa_index == sa_index)
+            return 1;
+        }
+    }));
+  }));
+
+  pool_foreach(t, im->tunnel_interfaces, ({
+    if (t->input_sa_index == sa_index)
+      return 1;
+    if (t->output_sa_index == sa_index)
+      return 1;
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+int
+ipsec_add_del_sa (vlib_main_t * vm, ipsec_sa_t * new_sa, int is_add)
+{
+  ipsec_main_t *im = &ipsec_main;
+  ipsec_sa_t *sa = 0;
+  uword *p;
+  u32 sa_index;
+
+  clib_warning ("id %u spi %u", new_sa->id, new_sa->spi);
+
+  p = hash_get (im->sa_index_by_sa_id, new_sa->id);
+  if (p && is_add)
+    return VNET_API_ERROR_SYSCALL_ERROR_1;	/* already exists */
+  if (!p && !is_add)
+    return VNET_API_ERROR_SYSCALL_ERROR_1;
+
+  if (!is_add)			/* delete */
+    {
+      sa_index = p[0];
+      sa = pool_elt_at_index (im->sad, sa_index);
+      if (ipsec_is_sa_used (sa_index))
+	{
+	  clib_warning ("sa_id %u used in policy", sa->id);
+	  return VNET_API_ERROR_SYSCALL_ERROR_1;	/* sa used in policy */
+	}
+      hash_unset (im->sa_index_by_sa_id, sa->id);
+      add_del_sa_sess (sa_index, is_add);
+      pool_put (im->sad, sa);
+    }
+  else				/* create new SA */
+    {
+      pool_get (im->sad, sa);
+      clib_memcpy (sa, new_sa, sizeof (*sa));
+      sa_index = sa - im->sad;
+      hash_set (im->sa_index_by_sa_id, sa->id, sa_index);
+      if (add_del_sa_sess (sa_index, is_add) < 0)
+	return VNET_API_ERROR_SYSCALL_ERROR_1;
+    }
+  return 0;
+}
+
+int
+ipsec_set_sa_key (vlib_main_t * vm, ipsec_sa_t * sa_update)
+{
+  ipsec_main_t *im = &ipsec_main;
+  uword *p;
+  u32 sa_index;
+  ipsec_sa_t *sa = 0;
+
+  p = hash_get (im->sa_index_by_sa_id, sa_update->id);
+  if (!p)
+    return VNET_API_ERROR_SYSCALL_ERROR_1;	/* no such sa-id */
+
+  sa_index = p[0];
+  sa = pool_elt_at_index (im->sad, sa_index);
+
+  /* new crypto key */
+  if (0 < sa_update->crypto_key_len)
+    {
+      clib_memcpy (sa->crypto_key, sa_update->crypto_key,
+		   sa_update->crypto_key_len);
+      sa->crypto_key_len = sa_update->crypto_key_len;
+    }
+
+  /* new integ key */
+  if (0 < sa_update->integ_key_len)
+    {
+      clib_memcpy (sa->integ_key, sa_update->integ_key,
+		   sa_update->integ_key_len);
+      sa->integ_key_len = sa_update->integ_key_len;
+    }
+
+  if (sa->crypto_key_len + sa->integ_key_len > 0)
+    {
+      if (add_del_sa_sess (sa_index, 0) < 0)
+	return VNET_API_ERROR_SYSCALL_ERROR_1;
+    }
+
+  return 0;
+}
+
+static void
+ipsec_rand_seed (void)
+{
+  struct
+  {
+    time_t time;
+    pid_t pid;
+    void *p;
+  } seed_data;
+
+  seed_data.time = time (NULL);
+  seed_data.pid = getpid ();
+  seed_data.p = (void *) &seed_data;
+
+  RAND_seed ((const void *) &seed_data, sizeof (seed_data));
+}
+
+static clib_error_t *
+ipsec_init (vlib_main_t * vm)
+{
+  clib_error_t *error;
+  ipsec_main_t *im = &ipsec_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  vlib_node_t *node;
+
+  ipsec_rand_seed ();
+
+  memset (im, 0, sizeof (im[0]));
+
+  im->vnet_main = vnet_get_main ();
+  im->vlib_main = vm;
+
+  im->spd_index_by_spd_id = hash_create (0, sizeof (uword));
+  im->sa_index_by_sa_id = hash_create (0, sizeof (uword));
+  im->spd_index_by_sw_if_index = hash_create (0, sizeof (uword));
+
+  vec_validate_aligned (im->empty_buffers, tm->n_vlib_mains - 1,
+			CLIB_CACHE_LINE_BYTES);
+
+  node = vlib_get_node_by_name (vm, (u8 *) "error-drop");
+  ASSERT (node);
+  im->error_drop_node_index = node->index;
+
+  node = vlib_get_node_by_name (vm, (u8 *) ESP_NODE);
+
+  ASSERT (node);
+  im->esp_encrypt_node_index = node->index;
+
+  node = vlib_get_node_by_name (vm, (u8 *) "ip4-lookup");
+  ASSERT (node);
+  im->ip4_lookup_node_index = node->index;
+
+  if ((error = vlib_call_init_function (vm, ipsec_cli_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ipsec_tunnel_if_init)))
+    return error;
+
+  esp_init ();
+
+  if ((error = ikev2_init (vm)))
+    return error;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ipsec_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ipsec.h b/src/vnet/ipsec/ipsec.h
new file mode 100644
index 00000000..32c7edfc
--- /dev/null
+++ b/src/vnet/ipsec/ipsec.h
@@ -0,0 +1,344 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __IPSEC_H__
+#define __IPSEC_H__
+
+#define IPSEC_FLAG_IPSEC_GRE_TUNNEL (1 << 0)
+
+#define foreach_ipsec_policy_action \
+  _(0, BYPASS,  "bypass")          \
+  _(1, DISCARD, "discard")         \
+  _(2, RESOLVE, "resolve")         \
+  _(3, PROTECT, "protect")
+
+typedef enum
+{
+#define _(v,f,s) IPSEC_POLICY_ACTION_##f = v,
+  foreach_ipsec_policy_action
+#undef _
+    IPSEC_POLICY_N_ACTION,
+} ipsec_policy_action_t;
+
+#if DPDK_CRYPTO==1
+#define foreach_ipsec_crypto_alg \
+  _(0, NONE,  "none")               \
+  _(1, AES_CBC_128, "aes-cbc-128")  \
+  _(2, AES_CBC_192, "aes-cbc-192")  \
+  _(3, AES_CBC_256, "aes-cbc-256")  \
+  _(4, AES_GCM_128, "aes-gcm-128")
+#else
+#define foreach_ipsec_crypto_alg \
+  _(0, NONE,  "none")               \
+  _(1, AES_CBC_128, "aes-cbc-128")  \
+  _(2, AES_CBC_192, "aes-cbc-192")  \
+  _(3, AES_CBC_256, "aes-cbc-256")
+#endif
+
+typedef enum
+{
+#define _(v,f,s) IPSEC_CRYPTO_ALG_##f = v,
+  foreach_ipsec_crypto_alg
+#undef _
+    IPSEC_CRYPTO_N_ALG,
+} ipsec_crypto_alg_t;
+
+#if DPDK_CRYPTO==1
+#define foreach_ipsec_integ_alg \
+  _(0, NONE,  "none")                                                     \
+  _(1, MD5_96, "md5-96")           /* RFC2403 */                          \
+  _(2, SHA1_96, "sha1-96")         /* RFC2404 */                          \
+  _(3, SHA_256_96, "sha-256-96")   /* draft-ietf-ipsec-ciph-sha-256-00 */ \
+  _(4, SHA_256_128, "sha-256-128") /* RFC4868 */                          \
+  _(5, SHA_384_192, "sha-384-192") /* RFC4868 */                          \
+  _(6, SHA_512_256, "sha-512-256") /* RFC4868 */                          \
+  _(7, AES_GCM_128, "aes-gcm-128")
+#else
+#define foreach_ipsec_integ_alg \
+  _(0, NONE,  "none")                                                     \
+  _(1, MD5_96, "md5-96")           /* RFC2403 */                          \
+  _(2, SHA1_96, "sha1-96")         /* RFC2404 */                          \
+  _(3, SHA_256_96, "sha-256-96")   /* draft-ietf-ipsec-ciph-sha-256-00 */ \
+  _(4, SHA_256_128, "sha-256-128") /* RFC4868 */                          \
+  _(5, SHA_384_192, "sha-384-192") /* RFC4868 */                          \
+  _(6, SHA_512_256, "sha-512-256")	/* RFC4868 */
+#endif
+
+typedef enum
+{
+#define _(v,f,s) IPSEC_INTEG_ALG_##f = v,
+  foreach_ipsec_integ_alg
+#undef _
+    IPSEC_INTEG_N_ALG,
+} ipsec_integ_alg_t;
+
+typedef enum
+{
+  IPSEC_PROTOCOL_AH = 0,
+  IPSEC_PROTOCOL_ESP = 1
+} ipsec_protocol_t;
+
+typedef struct
+{
+  u32 id;
+  u32 spi;
+  ipsec_protocol_t protocol;
+
+  ipsec_crypto_alg_t crypto_alg;
+  u8 crypto_key_len;
+  u8 crypto_key[128];
+
+  ipsec_integ_alg_t integ_alg;
+  u8 integ_key_len;
+  u8 integ_key[128];
+
+  u8 use_esn;
+  u8 use_anti_replay;
+
+  u8 is_tunnel;
+  u8 is_tunnel_ip6;
+  ip46_address_t tunnel_src_addr;
+  ip46_address_t tunnel_dst_addr;
+
+  u32 salt;
+
+  /* runtime */
+  u32 seq;
+  u32 seq_hi;
+  u32 last_seq;
+  u32 last_seq_hi;
+  u64 replay_window;
+} ipsec_sa_t;
+
+typedef struct
+{
+  ip46_address_t start, stop;
+} ip46_address_range_t;
+
+typedef struct
+{
+  u16 start, stop;
+} port_range_t;
+
+typedef struct
+{
+  u8 is_add;
+  u8 esn;
+  u8 anti_replay;
+  ip4_address_t local_ip, remote_ip;
+  u32 local_spi;
+  u32 remote_spi;
+  ipsec_crypto_alg_t crypto_alg;
+  u8 local_crypto_key_len;
+  u8 local_crypto_key[128];
+  u8 remote_crypto_key_len;
+  u8 remote_crypto_key[128];
+  ipsec_integ_alg_t integ_alg;
+  u8 local_integ_key_len;
+  u8 local_integ_key[128];
+  u8 remote_integ_key_len;
+  u8 remote_integ_key[128];
+} ipsec_add_del_tunnel_args_t;
+
+typedef struct
+{
+  u8 is_add;
+  u32 local_sa_id;
+  u32 remote_sa_id;
+  ip4_address_t local_ip;
+  ip4_address_t remote_ip;
+} ipsec_add_del_ipsec_gre_tunnel_args_t;
+
+typedef enum
+{
+  IPSEC_IF_SET_KEY_TYPE_NONE,
+  IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO,
+  IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO,
+  IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG,
+  IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG,
+} ipsec_if_set_key_type_t;
+
+typedef struct
+{
+  u32 id;
+  i32 priority;
+  u8 is_outbound;
+
+  // Selector
+  u8 is_ipv6;
+  ip46_address_range_t laddr;
+  ip46_address_range_t raddr;
+  u8 protocol;
+  port_range_t lport;
+  port_range_t rport;
+
+  // Policy
+  u8 policy;
+  u32 sa_id;
+  u32 sa_index;
+
+  // Counter
+  vlib_counter_t counter;
+} ipsec_policy_t;
+
+typedef struct
+{
+  u32 id;
+  /* pool of policies */
+  ipsec_policy_t *policies;
+  /* vectors of policy indices */
+  u32 *ipv4_outbound_policies;
+  u32 *ipv6_outbound_policies;
+  u32 *ipv4_inbound_protect_policy_indices;
+  u32 *ipv4_inbound_policy_discard_and_bypass_indices;
+  u32 *ipv6_inbound_protect_policy_indices;
+  u32 *ipv6_inbound_policy_discard_and_bypass_indices;
+} ipsec_spd_t;
+
+typedef struct
+{
+  u32 spd_index;
+} ip4_ipsec_config_t;
+
+typedef struct
+{
+  u32 spd_index;
+} ip6_ipsec_config_t;
+
+typedef struct
+{
+  u32 input_sa_index;
+  u32 output_sa_index;
+  u32 hw_if_index;
+} ipsec_tunnel_if_t;
+
+typedef struct
+{
+  /* pool of tunnel instances */
+  ipsec_spd_t *spds;
+  ipsec_sa_t *sad;
+
+  /* pool of tunnel interfaces */
+  ipsec_tunnel_if_t *tunnel_interfaces;
+  u32 *free_tunnel_if_indices;
+
+  u32 **empty_buffers;
+
+  uword *tunnel_index_by_key;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+
+  /* next node indices */
+  u32 feature_next_node_index[32];
+
+  /* hashes */
+  uword *spd_index_by_spd_id;
+  uword *spd_index_by_sw_if_index;
+  uword *sa_index_by_sa_id;
+  uword *ipsec_if_pool_index_by_key;
+
+  /* node indexes */
+  u32 error_drop_node_index;
+  u32 ip4_lookup_node_index;
+  u32 esp_encrypt_node_index;
+
+} ipsec_main_t;
+
+ipsec_main_t ipsec_main;
+
+extern vlib_node_registration_t esp_encrypt_node;
+extern vlib_node_registration_t esp_decrypt_node;
+extern vlib_node_registration_t ipsec_if_output_node;
+extern vlib_node_registration_t ipsec_if_input_node;
+
+
+/*
+ * functions
+ */
+int ipsec_set_interface_spd (vlib_main_t * vm, u32 sw_if_index, u32 spd_id,
+			     int is_add);
+int ipsec_add_del_spd (vlib_main_t * vm, u32 spd_id, int is_add);
+int ipsec_add_del_policy (vlib_main_t * vm, ipsec_policy_t * policy,
+			  int is_add);
+int ipsec_add_del_sa (vlib_main_t * vm, ipsec_sa_t * new_sa, int is_add);
+int ipsec_set_sa_key (vlib_main_t * vm, ipsec_sa_t * sa_update);
+
+u32 ipsec_get_sa_index_by_sa_id (u32 sa_id);
+u8 *format_ipsec_if_output_trace (u8 * s, va_list * args);
+u8 *format_ipsec_policy_action (u8 * s, va_list * args);
+u8 *format_ipsec_crypto_alg (u8 * s, va_list * args);
+u8 *format_ipsec_integ_alg (u8 * s, va_list * args);
+u8 *format_ipsec_replay_window (u8 * s, va_list * args);
+uword unformat_ipsec_policy_action (unformat_input_t * input, va_list * args);
+uword unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args);
+uword unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args);
+
+/*u32 ipsec_add_del_tunnel_if (vnet_main_t * vnm, ipsec_add_del_tunnel_args_t * args); */
+int ipsec_add_del_tunnel_if (ipsec_add_del_tunnel_args_t * args);
+int ipsec_add_del_ipsec_gre_tunnel (vnet_main_t * vnm,
+				    ipsec_add_del_ipsec_gre_tunnel_args_t *
+				    args);
+int ipsec_set_interface_key (vnet_main_t * vnm, u32 hw_if_index,
+			     ipsec_if_set_key_type_t type, u8 alg, u8 * key);
+
+
+/*
+ *  inline functions
+ */
+
+always_inline void
+ipsec_alloc_empty_buffers (vlib_main_t * vm, ipsec_main_t * im)
+{
+  u32 cpu_index = os_get_cpu_number ();
+  uword l = vec_len (im->empty_buffers[cpu_index]);
+  uword n_alloc = 0;
+
+  if (PREDICT_FALSE (l < VLIB_FRAME_SIZE))
+    {
+      if (!im->empty_buffers[cpu_index])
+	{
+	  vec_alloc (im->empty_buffers[cpu_index], 2 * VLIB_FRAME_SIZE);
+	}
+
+      n_alloc = vlib_buffer_alloc (vm, im->empty_buffers[cpu_index] + l,
+				   2 * VLIB_FRAME_SIZE - l);
+
+      _vec_len (im->empty_buffers[cpu_index]) = l + n_alloc;
+    }
+}
+
+static_always_inline u32
+get_next_output_feature_node_index (vlib_buffer_t * b,
+				    vlib_node_runtime_t * nr)
+{
+  u32 next;
+  u32 sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_TX];
+  vlib_main_t *vm = vlib_get_main ();
+  vlib_node_t *node = vlib_get_node (vm, nr->node_index);
+
+  vnet_feature_next (sw_if_index, &next, b);
+  return node->next_nodes[next];
+}
+
+#endif /* __IPSEC_H__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ipsec_api.c b/src/vnet/ipsec/ipsec_api.c
new file mode 100644
index 00000000..30cc5bd2
--- /dev/null
+++ b/src/vnet/ipsec/ipsec_api.c
@@ -0,0 +1,537 @@
+/*
+ *------------------------------------------------------------------
+ * ipsec_api.c - ipsec api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#if IPSEC > 0
+#include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/ikev2.h>
+#endif /* IPSEC */
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                                             \
+_(IPSEC_SPD_ADD_DEL, ipsec_spd_add_del)                                 \
+_(IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd)             \
+_(IPSEC_SPD_ADD_DEL_ENTRY, ipsec_spd_add_del_entry)                     \
+_(IPSEC_SAD_ADD_DEL_ENTRY, ipsec_sad_add_del_entry)                     \
+_(IPSEC_SA_SET_KEY, ipsec_sa_set_key)                                   \
+_(IPSEC_SPD_DUMP, ipsec_spd_dump)                                       \
+_(IKEV2_PROFILE_ADD_DEL, ikev2_profile_add_del)                         \
+_(IKEV2_PROFILE_SET_AUTH, ikev2_profile_set_auth)                       \
+_(IKEV2_PROFILE_SET_ID, ikev2_profile_set_id)                           \
+_(IKEV2_PROFILE_SET_TS, ikev2_profile_set_ts)                           \
+_(IKEV2_SET_LOCAL_KEY, ikev2_set_local_key)
+
+static void vl_api_ipsec_spd_add_del_t_handler
+  (vl_api_ipsec_spd_add_del_t * mp)
+{
+#if IPSEC == 0
+  clib_warning ("unimplemented");
+#else
+
+  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
+  vl_api_ipsec_spd_add_del_reply_t *rmp;
+  int rv;
+
+#if DPDK > 0
+  rv = ipsec_add_del_spd (vm, ntohl (mp->spd_id), mp->is_add);
+#else
+  rv = VNET_API_ERROR_UNIMPLEMENTED;
+#endif
+
+  REPLY_MACRO (VL_API_IPSEC_SPD_ADD_DEL_REPLY);
+#endif
+}
+
+static void vl_api_ipsec_interface_add_del_spd_t_handler
+  (vl_api_ipsec_interface_add_del_spd_t * mp)
+{
+  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
+  vl_api_ipsec_interface_add_del_spd_reply_t *rmp;
+  int rv;
+  u32 sw_if_index __attribute__ ((unused));
+  u32 spd_id __attribute__ ((unused));
+
+  sw_if_index = ntohl (mp->sw_if_index);
+  spd_id = ntohl (mp->spd_id);
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+#if IPSEC > 0
+  rv = ipsec_set_interface_spd (vm, sw_if_index, spd_id, mp->is_add);
+#else
+  rv = VNET_API_ERROR_UNIMPLEMENTED;
+#endif
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_IPSEC_INTERFACE_ADD_DEL_SPD_REPLY);
+}
+
+static void vl_api_ipsec_spd_add_del_entry_t_handler
+  (vl_api_ipsec_spd_add_del_entry_t * mp)
+{
+  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
+  vl_api_ipsec_spd_add_del_entry_reply_t *rmp;
+  int rv;
+
+#if IPSEC > 0
+  ipsec_policy_t p;
+
+  memset (&p, 0, sizeof (p));
+
+  p.id = ntohl (mp->spd_id);
+  p.priority = ntohl (mp->priority);
+  p.is_outbound = mp->is_outbound;
+  p.is_ipv6 = mp->is_ipv6;
+
+  if (mp->is_ipv6 || mp->is_ip_any)
+    {
+      clib_memcpy (&p.raddr.start, mp->remote_address_start, 16);
+      clib_memcpy (&p.raddr.stop, mp->remote_address_stop, 16);
+      clib_memcpy (&p.laddr.start, mp->local_address_start, 16);
+      clib_memcpy (&p.laddr.stop, mp->local_address_stop, 16);
+    }
+  else
+    {
+      clib_memcpy (&p.raddr.start.ip4.data, mp->remote_address_start, 4);
+      clib_memcpy (&p.raddr.stop.ip4.data, mp->remote_address_stop, 4);
+      clib_memcpy (&p.laddr.start.ip4.data, mp->local_address_start, 4);
+      clib_memcpy (&p.laddr.stop.ip4.data, mp->local_address_stop, 4);
+    }
+  p.protocol = mp->protocol;
+  p.rport.start = ntohs (mp->remote_port_start);
+  p.rport.stop = ntohs (mp->remote_port_stop);
+  p.lport.start = ntohs (mp->local_port_start);
+  p.lport.stop = ntohs (mp->local_port_stop);
+  /* policy action resolve unsupported */
+  if (mp->policy == IPSEC_POLICY_ACTION_RESOLVE)
+    {
+      clib_warning ("unsupported action: 'resolve'");
+      rv = VNET_API_ERROR_UNIMPLEMENTED;
+      goto out;
+    }
+  p.policy = mp->policy;
+  p.sa_id = ntohl (mp->sa_id);
+
+  rv = ipsec_add_del_policy (vm, &p, mp->is_add);
+  if (rv)
+    goto out;
+
+  if (mp->is_ip_any)
+    {
+      p.is_ipv6 = 1;
+      rv = ipsec_add_del_policy (vm, &p, mp->is_add);
+    }
+#else
+  rv = VNET_API_ERROR_UNIMPLEMENTED;
+  goto out;
+#endif
+
+out:
+  REPLY_MACRO (VL_API_IPSEC_SPD_ADD_DEL_ENTRY_REPLY);
+}
+
+static void vl_api_ipsec_sad_add_del_entry_t_handler
+  (vl_api_ipsec_sad_add_del_entry_t * mp)
+{
+  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
+  vl_api_ipsec_sad_add_del_entry_reply_t *rmp;
+  int rv;
+#if IPSEC > 0
+  ipsec_sa_t sa;
+
+  memset (&sa, 0, sizeof (sa));
+
+  sa.id = ntohl (mp->sad_id);
+  sa.spi = ntohl (mp->spi);
+  /* security protocol AH unsupported */
+  if (mp->protocol == IPSEC_PROTOCOL_AH)
+    {
+      clib_warning ("unsupported security protocol 'AH'");
+      rv = VNET_API_ERROR_UNIMPLEMENTED;
+      goto out;
+    }
+  sa.protocol = mp->protocol;
+  /* check for unsupported crypto-alg */
+  if (mp->crypto_algorithm < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
+      mp->crypto_algorithm >= IPSEC_CRYPTO_N_ALG)
+    {
+      clib_warning ("unsupported crypto-alg: '%U'", format_ipsec_crypto_alg,
+		    mp->crypto_algorithm);
+      rv = VNET_API_ERROR_UNIMPLEMENTED;
+      goto out;
+    }
+  sa.crypto_alg = mp->crypto_algorithm;
+  sa.crypto_key_len = mp->crypto_key_length;
+  clib_memcpy (&sa.crypto_key, mp->crypto_key, sizeof (sa.crypto_key));
+  /* check for unsupported integ-alg */
+#if DPDK_CRYPTO==1
+  if (mp->integrity_algorithm < IPSEC_INTEG_ALG_NONE ||
+#else
+  if (mp->integrity_algorithm < IPSEC_INTEG_ALG_SHA1_96 ||
+#endif
+      mp->integrity_algorithm >= IPSEC_INTEG_N_ALG)
+    {
+      clib_warning ("unsupported integ-alg: '%U'", format_ipsec_integ_alg,
+		    mp->integrity_algorithm);
+      rv = VNET_API_ERROR_UNIMPLEMENTED;
+      goto out;
+    }
+
+#if DPDK_CRYPTO==1
+  /*Special cases, aes-gcm-128 encryption */
+  if (mp->crypto_algorithm == IPSEC_CRYPTO_ALG_AES_GCM_128)
+    {
+      if (mp->integrity_algorithm != IPSEC_INTEG_ALG_NONE
+	  && mp->integrity_algorithm != IPSEC_INTEG_ALG_AES_GCM_128)
+	{
+	  clib_warning
+	    ("unsupported: aes-gcm-128 crypto-alg needs none as integ-alg");
+	  rv = VNET_API_ERROR_UNIMPLEMENTED;
+	  goto out;
+	}
+      else			/*set integ-alg internally to aes-gcm-128 */
+	mp->integrity_algorithm = IPSEC_INTEG_ALG_AES_GCM_128;
+    }
+  else if (mp->integrity_algorithm == IPSEC_INTEG_ALG_AES_GCM_128)
+    {
+      clib_warning ("unsupported integ-alg: aes-gcm-128");
+      rv = VNET_API_ERROR_UNIMPLEMENTED;
+      goto out;
+    }
+  else if (mp->integrity_algorithm == IPSEC_INTEG_ALG_NONE)
+    {
+      clib_warning ("unsupported integ-alg: none");
+      rv = VNET_API_ERROR_UNIMPLEMENTED;
+      goto out;
+    }
+#endif
+
+  sa.integ_alg = mp->integrity_algorithm;
+  sa.integ_key_len = mp->integrity_key_length;
+  clib_memcpy (&sa.integ_key, mp->integrity_key, sizeof (sa.integ_key));
+  sa.use_esn = mp->use_extended_sequence_number;
+  sa.is_tunnel = mp->is_tunnel;
+  sa.is_tunnel_ip6 = mp->is_tunnel_ipv6;
+  if (sa.is_tunnel_ip6)
+    {
+      clib_memcpy (&sa.tunnel_src_addr, mp->tunnel_src_address, 16);
+      clib_memcpy (&sa.tunnel_dst_addr, mp->tunnel_dst_address, 16);
+    }
+  else
+    {
+      clib_memcpy (&sa.tunnel_src_addr.ip4.data, mp->tunnel_src_address, 4);
+      clib_memcpy (&sa.tunnel_dst_addr.ip4.data, mp->tunnel_dst_address, 4);
+    }
+
+  rv = ipsec_add_del_sa (vm, &sa, mp->is_add);
+#else
+  rv = VNET_API_ERROR_UNIMPLEMENTED;
+  goto out;
+#endif
+
+out:
+  REPLY_MACRO (VL_API_IPSEC_SAD_ADD_DEL_ENTRY_REPLY);
+}
+
+static void
+send_ipsec_spd_details (ipsec_policy_t * p, unix_shared_memory_queue_t * q,
+			u32 context)
+{
+  vl_api_ipsec_spd_details_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_IPSEC_SPD_DETAILS);
+  mp->context = context;
+
+  mp->spd_id = htonl (p->id);
+  mp->priority = htonl (p->priority);
+  mp->is_outbound = p->is_outbound;
+  mp->is_ipv6 = p->is_ipv6;
+  if (p->is_ipv6)
+    {
+      memcpy (mp->local_start_addr, &p->laddr.start.ip6, 16);
+      memcpy (mp->local_stop_addr, &p->laddr.stop.ip6, 16);
+      memcpy (mp->remote_start_addr, &p->raddr.start.ip6, 16);
+      memcpy (mp->remote_stop_addr, &p->raddr.stop.ip6, 16);
+    }
+  else
+    {
+      memcpy (mp->local_start_addr, &p->laddr.start.ip4, 4);
+      memcpy (mp->local_stop_addr, &p->laddr.stop.ip4, 4);
+      memcpy (mp->remote_start_addr, &p->raddr.start.ip4, 4);
+      memcpy (mp->remote_stop_addr, &p->raddr.stop.ip4, 4);
+    }
+  mp->local_start_port = htons (p->lport.start);
+  mp->local_stop_port = htons (p->lport.stop);
+  mp->remote_start_port = htons (p->rport.start);
+  mp->remote_stop_port = htons (p->rport.stop);
+  mp->protocol = p->protocol;
+  mp->policy = p->policy;
+  mp->sa_id = htonl (p->sa_id);
+  mp->bytes = clib_host_to_net_u64 (p->counter.bytes);
+  mp->packets = clib_host_to_net_u64 (p->counter.packets);
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_ipsec_spd_dump_t_handler (vl_api_ipsec_spd_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  ipsec_main_t *im = &ipsec_main;
+  ipsec_policy_t *policy;
+  ipsec_spd_t *spd;
+  uword *p;
+  u32 spd_index;
+#if IPSEC > 0
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  p = hash_get (im->spd_index_by_spd_id, ntohl (mp->spd_id));
+  if (!p)
+    return;
+
+  spd_index = p[0];
+  spd = pool_elt_at_index (im->spds, spd_index);
+
+  /* *INDENT-OFF* */
+  pool_foreach (policy, spd->policies,
+  ({
+    if (mp->sa_id == ~(0) || ntohl (mp->sa_id) == policy->sa_id)
+      send_ipsec_spd_details (policy, q,
+                              mp->context);}
+    ));
+  /* *INDENT-ON* */
+#else
+  clib_warning ("unimplemented");
+#endif
+}
+
+static void
+vl_api_ipsec_sa_set_key_t_handler (vl_api_ipsec_sa_set_key_t * mp)
+{
+  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
+  vl_api_ipsec_sa_set_key_reply_t *rmp;
+  int rv;
+#if IPSEC > 0
+  ipsec_sa_t sa;
+  sa.id = ntohl (mp->sa_id);
+  sa.crypto_key_len = mp->crypto_key_length;
+  clib_memcpy (&sa.crypto_key, mp->crypto_key, sizeof (sa.crypto_key));
+  sa.integ_key_len = mp->integrity_key_length;
+  clib_memcpy (&sa.integ_key, mp->integrity_key, sizeof (sa.integ_key));
+
+  rv = ipsec_set_sa_key (vm, &sa);
+#else
+  rv = VNET_API_ERROR_UNIMPLEMENTED;
+#endif
+
+  REPLY_MACRO (VL_API_IPSEC_SA_SET_KEY_REPLY);
+}
+
+static void
+vl_api_ikev2_profile_add_del_t_handler (vl_api_ikev2_profile_add_del_t * mp)
+{
+  vl_api_ikev2_profile_add_del_reply_t *rmp;
+  int rv = 0;
+
+#if IPSEC > 0
+  vlib_main_t *vm = vlib_get_main ();
+  clib_error_t *error;
+  u8 *tmp = format (0, "%s", mp->name);
+  error = ikev2_add_del_profile (vm, tmp, mp->is_add);
+  vec_free (tmp);
+  if (error)
+    rv = VNET_API_ERROR_UNSPECIFIED;
+#else
+  rv = VNET_API_ERROR_UNIMPLEMENTED;
+#endif
+
+  REPLY_MACRO (VL_API_IKEV2_PROFILE_ADD_DEL_REPLY);
+}
+
+static void
+  vl_api_ikev2_profile_set_auth_t_handler
+  (vl_api_ikev2_profile_set_auth_t * mp)
+{
+  vl_api_ikev2_profile_set_auth_reply_t *rmp;
+  int rv = 0;
+
+#if IPSEC > 0
+  vlib_main_t *vm = vlib_get_main ();
+  clib_error_t *error;
+  u8 *tmp = format (0, "%s", mp->name);
+  u8 *data = vec_new (u8, mp->data_len);
+  clib_memcpy (data, mp->data, mp->data_len);
+  error = ikev2_set_profile_auth (vm, tmp, mp->auth_method, data, mp->is_hex);
+  vec_free (tmp);
+  vec_free (data);
+  if (error)
+    rv = VNET_API_ERROR_UNSPECIFIED;
+#else
+  rv = VNET_API_ERROR_UNIMPLEMENTED;
+#endif
+
+  REPLY_MACRO (VL_API_IKEV2_PROFILE_SET_AUTH_REPLY);
+}
+
+static void
+vl_api_ikev2_profile_set_id_t_handler (vl_api_ikev2_profile_set_id_t * mp)
+{
+  vl_api_ikev2_profile_add_del_reply_t *rmp;
+  int rv = 0;
+
+#if IPSEC > 0
+  vlib_main_t *vm = vlib_get_main ();
+  clib_error_t *error;
+  u8 *tmp = format (0, "%s", mp->name);
+  u8 *data = vec_new (u8, mp->data_len);
+  clib_memcpy (data, mp->data, mp->data_len);
+  error = ikev2_set_profile_id (vm, tmp, mp->id_type, data, mp->is_local);
+  vec_free (tmp);
+  vec_free (data);
+  if (error)
+    rv = VNET_API_ERROR_UNSPECIFIED;
+#else
+  rv = VNET_API_ERROR_UNIMPLEMENTED;
+#endif
+
+  REPLY_MACRO (VL_API_IKEV2_PROFILE_SET_ID_REPLY);
+}
+
+static void
+vl_api_ikev2_profile_set_ts_t_handler (vl_api_ikev2_profile_set_ts_t * mp)
+{
+  vl_api_ikev2_profile_set_ts_reply_t *rmp;
+  int rv = 0;
+
+#if IPSEC > 0
+  vlib_main_t *vm = vlib_get_main ();
+  clib_error_t *error;
+  u8 *tmp = format (0, "%s", mp->name);
+  error = ikev2_set_profile_ts (vm, tmp, mp->proto, mp->start_port,
+				mp->end_port, (ip4_address_t) mp->start_addr,
+				(ip4_address_t) mp->end_addr, mp->is_local);
+  vec_free (tmp);
+  if (error)
+    rv = VNET_API_ERROR_UNSPECIFIED;
+#else
+  rv = VNET_API_ERROR_UNIMPLEMENTED;
+#endif
+
+  REPLY_MACRO (VL_API_IKEV2_PROFILE_SET_TS_REPLY);
+}
+
+static void
+vl_api_ikev2_set_local_key_t_handler (vl_api_ikev2_set_local_key_t * mp)
+{
+  vl_api_ikev2_profile_set_ts_reply_t *rmp;
+  int rv = 0;
+
+#if IPSEC > 0
+  vlib_main_t *vm = vlib_get_main ();
+  clib_error_t *error;
+
+  error = ikev2_set_local_key (vm, mp->key_file);
+  if (error)
+    rv = VNET_API_ERROR_UNSPECIFIED;
+#else
+  rv = VNET_API_ERROR_UNIMPLEMENTED;
+#endif
+
+  REPLY_MACRO (VL_API_IKEV2_SET_LOCAL_KEY_REPLY);
+}
+
+/*
+ * ipsec_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_ipsec;
+#undef _
+}
+
+static clib_error_t *
+ipsec_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (ipsec_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ipsec_cli.c b/src/vnet/ipsec/ipsec_cli.c
new file mode 100644
index 00000000..7ab85d4a
--- /dev/null
+++ b/src/vnet/ipsec/ipsec_cli.c
@@ -0,0 +1,807 @@
+/*
+ * decap.c : IPSec tunnel support
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+#include <vnet/interface.h>
+
+#include <vnet/ipsec/ipsec.h>
+
+static clib_error_t *
+set_interface_spd_command_fn (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ipsec_main_t *im = &ipsec_main;
+  u32 sw_if_index = (u32) ~ 0;
+  u32 spd_id;
+  int is_add = 1;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  if (unformat
+      (line_input, "%U %u", unformat_vnet_sw_interface, im->vnet_main,
+       &sw_if_index, &spd_id))
+    ;
+  else if (unformat (line_input, "del"))
+    is_add = 0;
+  else
+    return clib_error_return (0, "parse error: '%U'",
+			      format_unformat_error, line_input);
+
+  unformat_free (line_input);
+
+  ipsec_set_interface_spd (vm, sw_if_index, spd_id, is_add);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_spd_command, static) = {
+    .path = "set interface ipsec spd",
+    .short_help =
+    "set interface ipsec spd <int> <id>",
+    .function = set_interface_spd_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+ipsec_sa_add_del_command_fn (vlib_main_t * vm,
+			     unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ipsec_sa_t sa;
+  int is_add = ~0;
+  u8 *ck = 0, *ik = 0;
+
+  memset (&sa, 0, sizeof (sa));
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "add %u", &sa.id))
+	is_add = 1;
+      else if (unformat (line_input, "del %u", &sa.id))
+	is_add = 0;
+      else if (unformat (line_input, "spi %u", &sa.spi))
+	;
+      else if (unformat (line_input, "esp"))
+	sa.protocol = IPSEC_PROTOCOL_ESP;
+      else if (unformat (line_input, "ah"))
+	//sa.protocol = IPSEC_PROTOCOL_AH;
+	return clib_error_return (0, "unsupported security protocol 'AH'");
+      else
+	if (unformat (line_input, "crypto-key %U", unformat_hex_string, &ck))
+	sa.crypto_key_len = vec_len (ck);
+      else
+	if (unformat
+	    (line_input, "crypto-alg %U", unformat_ipsec_crypto_alg,
+	     &sa.crypto_alg))
+	{
+	  if (sa.crypto_alg < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
+	      sa.crypto_alg >= IPSEC_CRYPTO_N_ALG)
+	    return clib_error_return (0, "unsupported crypto-alg: '%U'",
+				      format_ipsec_crypto_alg, sa.crypto_alg);
+	}
+      else
+	if (unformat (line_input, "integ-key %U", unformat_hex_string, &ik))
+	sa.integ_key_len = vec_len (ik);
+      else if (unformat (line_input, "integ-alg %U", unformat_ipsec_integ_alg,
+			 &sa.integ_alg))
+	{
+#if DPDK_CRYPTO==1
+	  if (sa.integ_alg < IPSEC_INTEG_ALG_NONE ||
+#else
+	  if (sa.integ_alg < IPSEC_INTEG_ALG_SHA1_96 ||
+#endif
+	      sa.integ_alg >= IPSEC_INTEG_N_ALG)
+	    return clib_error_return (0, "unsupported integ-alg: '%U'",
+				      format_ipsec_integ_alg, sa.integ_alg);
+	}
+      else if (unformat (line_input, "tunnel-src %U",
+			 unformat_ip4_address, &sa.tunnel_src_addr.ip4))
+	sa.is_tunnel = 1;
+      else if (unformat (line_input, "tunnel-dst %U",
+			 unformat_ip4_address, &sa.tunnel_dst_addr.ip4))
+	sa.is_tunnel = 1;
+      else if (unformat (line_input, "tunnel-src %U",
+			 unformat_ip6_address, &sa.tunnel_src_addr.ip6))
+	{
+	  sa.is_tunnel = 1;
+	  sa.is_tunnel_ip6 = 1;
+	}
+      else if (unformat (line_input, "tunnel-dst %U",
+			 unformat_ip6_address, &sa.tunnel_dst_addr.ip6))
+	{
+	  sa.is_tunnel = 1;
+	  sa.is_tunnel_ip6 = 1;
+	}
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+#if DPDK_CRYPTO==1
+  /*Special cases, aes-gcm-128 encryption */
+  if (sa.crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
+    {
+      if (sa.integ_alg != IPSEC_INTEG_ALG_NONE
+	  && sa.integ_alg != IPSEC_INTEG_ALG_AES_GCM_128)
+	return clib_error_return (0,
+				  "unsupported: aes-gcm-128 crypto-alg needs none as integ-alg");
+      else			/*set integ-alg internally to aes-gcm-128 */
+	sa.integ_alg = IPSEC_INTEG_ALG_AES_GCM_128;
+    }
+  else if (sa.integ_alg == IPSEC_INTEG_ALG_AES_GCM_128)
+    return clib_error_return (0, "unsupported integ-alg: aes-gcm-128");
+  else if (sa.integ_alg == IPSEC_INTEG_ALG_NONE)
+    return clib_error_return (0, "unsupported integ-alg: none");
+#endif
+
+  unformat_free (line_input);
+
+  if (sa.crypto_key_len > sizeof (sa.crypto_key))
+    sa.crypto_key_len = sizeof (sa.crypto_key);
+
+  if (sa.integ_key_len > sizeof (sa.integ_key))
+    sa.integ_key_len = sizeof (sa.integ_key);
+
+  if (ck)
+    strncpy ((char *) sa.crypto_key, (char *) ck, sa.crypto_key_len);
+
+  if (ik)
+    strncpy ((char *) sa.integ_key, (char *) ik, sa.integ_key_len);
+
+  ipsec_add_del_sa (vm, &sa, is_add);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ipsec_sa_add_del_command, static) = {
+    .path = "ipsec sa",
+    .short_help =
+    "ipsec sa [add|del]",
+    .function = ipsec_sa_add_del_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+ipsec_spd_add_del_command_fn (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 spd_id = ~0;
+  int is_add = ~0;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "add"))
+	is_add = 1;
+      else if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "%u", &spd_id))
+	;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (spd_id == ~0)
+    return clib_error_return (0, "please specify SPD ID");
+
+  ipsec_add_del_spd (vm, spd_id, is_add);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ipsec_spd_add_del_command, static) = {
+    .path = "ipsec spd",
+    .short_help =
+    "ipsec spd [add|del] <id>",
+    .function = ipsec_spd_add_del_command_fn,
+};
+/* *INDENT-ON* */
+
+
+static clib_error_t *
+ipsec_policy_add_del_command_fn (vlib_main_t * vm,
+				 unformat_input_t * input,
+				 vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ipsec_policy_t p;
+  int is_add = 0;
+  int is_ip_any = 1;
+  u32 tmp, tmp2;
+
+  memset (&p, 0, sizeof (p));
+  p.lport.stop = p.rport.stop = ~0;
+  p.laddr.stop.ip4.as_u32 = p.raddr.stop.ip4.as_u32 = (u32) ~ 0;
+  p.laddr.stop.ip6.as_u64[0] = p.laddr.stop.ip6.as_u64[1] = (u64) ~ 0;
+  p.raddr.stop.ip6.as_u64[0] = p.raddr.stop.ip6.as_u64[1] = (u64) ~ 0;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "add"))
+	is_add = 1;
+      else if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "spd %u", &p.id))
+	;
+      else if (unformat (line_input, "inbound"))
+	p.is_outbound = 0;
+      else if (unformat (line_input, "outbound"))
+	p.is_outbound = 1;
+      else if (unformat (line_input, "priority %d", &p.priority))
+	;
+      else if (unformat (line_input, "protocol %u", &tmp))
+	p.protocol = (u8) tmp;
+      else
+	if (unformat
+	    (line_input, "action %U", unformat_ipsec_policy_action,
+	     &p.policy))
+	{
+	  if (p.policy == IPSEC_POLICY_ACTION_RESOLVE)
+	    return clib_error_return (0, "unsupported action: 'resolve'");
+	}
+      else if (unformat (line_input, "sa %u", &p.sa_id))
+	;
+      else if (unformat (line_input, "local-ip-range %U - %U",
+			 unformat_ip4_address, &p.laddr.start.ip4,
+			 unformat_ip4_address, &p.laddr.stop.ip4))
+	is_ip_any = 0;
+      else if (unformat (line_input, "remote-ip-range %U - %U",
+			 unformat_ip4_address, &p.raddr.start.ip4,
+			 unformat_ip4_address, &p.raddr.stop.ip4))
+	is_ip_any = 0;
+      else if (unformat (line_input, "local-ip-range %U - %U",
+			 unformat_ip6_address, &p.laddr.start.ip6,
+			 unformat_ip6_address, &p.laddr.stop.ip6))
+	{
+	  p.is_ipv6 = 1;
+	  is_ip_any = 0;
+	}
+      else if (unformat (line_input, "remote-ip-range %U - %U",
+			 unformat_ip6_address, &p.raddr.start.ip6,
+			 unformat_ip6_address, &p.raddr.stop.ip6))
+	{
+	  p.is_ipv6 = 1;
+	  is_ip_any = 0;
+	}
+      else if (unformat (line_input, "local-port-range %u - %u", &tmp, &tmp2))
+	{
+	  p.lport.start = tmp;
+	  p.lport.stop = tmp2;
+	}
+      else
+	if (unformat (line_input, "remote-port-range %u - %u", &tmp, &tmp2))
+	{
+	  p.rport.start = tmp;
+	  p.rport.stop = tmp2;
+	}
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  ipsec_add_del_policy (vm, &p, is_add);
+  if (is_ip_any)
+    {
+      p.is_ipv6 = 1;
+      ipsec_add_del_policy (vm, &p, is_add);
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ipsec_policy_add_del_command, static) = {
+    .path = "ipsec policy",
+    .short_help =
+    "ipsec policy [add|del] spd <id> priority <n> ",
+    .function = ipsec_policy_add_del_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_ipsec_sa_key_command_fn (vlib_main_t * vm,
+			     unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ipsec_sa_t sa;
+  u8 *ck = 0, *ik = 0;
+
+  memset (&sa, 0, sizeof (sa));
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "%u", &sa.id))
+	;
+      else
+	if (unformat (line_input, "crypto-key %U", unformat_hex_string, &ck))
+	sa.crypto_key_len = vec_len (ck);
+      else
+	if (unformat (line_input, "integ-key %U", unformat_hex_string, &ik))
+	sa.integ_key_len = vec_len (ik);
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (sa.crypto_key_len > sizeof (sa.crypto_key))
+    sa.crypto_key_len = sizeof (sa.crypto_key);
+
+  if (sa.integ_key_len > sizeof (sa.integ_key))
+    sa.integ_key_len = sizeof (sa.integ_key);
+
+  if (ck)
+    strncpy ((char *) sa.crypto_key, (char *) ck, sa.crypto_key_len);
+
+  if (ik)
+    strncpy ((char *) sa.integ_key, (char *) ik, sa.integ_key_len);
+
+  ipsec_set_sa_key (vm, &sa);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_ipsec_sa_key_command, static) = {
+    .path = "set ipsec sa",
+    .short_help =
+    "set ipsec sa <id> crypto-key <key> integ-key <key>",
+    .function = set_ipsec_sa_key_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+show_ipsec_command_fn (vlib_main_t * vm,
+		       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  ipsec_spd_t *spd;
+  ipsec_sa_t *sa;
+  ipsec_policy_t *p;
+  ipsec_main_t *im = &ipsec_main;
+  u32 *i;
+  ipsec_tunnel_if_t *t;
+  vnet_hw_interface_t *hi;
+
+  /* *INDENT-OFF* */
+  pool_foreach (sa, im->sad, ({
+    if (sa->id) {
+      vlib_cli_output(vm, "sa %u spi %u mode %s protocol %s", sa->id, sa->spi,
+                      sa->is_tunnel ? "tunnel" : "transport",
+                      sa->protocol ? "esp" : "ah");
+      if (sa->protocol == IPSEC_PROTOCOL_ESP) {
+        vlib_cli_output(vm, "  crypto alg %U%s%U integrity alg %U%s%U",
+                        format_ipsec_crypto_alg, sa->crypto_alg,
+                        sa->crypto_alg ? " key " : "",
+                        format_hex_bytes, sa->crypto_key, sa->crypto_key_len,
+                        format_ipsec_integ_alg, sa->integ_alg,
+                        sa->integ_alg ? " key " : "",
+                        format_hex_bytes, sa->integ_key, sa->integ_key_len);
+      }
+      if (sa->is_tunnel && sa->is_tunnel_ip6) {
+        vlib_cli_output(vm, "  tunnel src %U dst %U",
+                        format_ip6_address, &sa->tunnel_src_addr.ip6,
+                        format_ip6_address, &sa->tunnel_dst_addr.ip6);
+      } else if (sa->is_tunnel) {
+        vlib_cli_output(vm, "  tunnel src %U dst %U",
+                        format_ip4_address, &sa->tunnel_src_addr.ip4,
+                        format_ip4_address, &sa->tunnel_dst_addr.ip4);
+      }
+    }
+  }));
+  /* *INDENT-ON* */
+
+  /* *INDENT-OFF* */
+  pool_foreach (spd, im->spds, ({
+    vlib_cli_output(vm, "spd %u", spd->id);
+
+    vlib_cli_output(vm, " outbound policies");
+    vec_foreach(i, spd->ipv4_outbound_policies)
+      {
+        p = pool_elt_at_index(spd->policies, *i);
+        vlib_cli_output(vm, "  priority %d action %U protocol %s%s",
+                        p->priority,
+                        format_ipsec_policy_action, p->policy,
+                        p->protocol ?
+                          format(0, "%U", format_ip_protocol, p->protocol) :
+                          (u8 *) "any",
+                        p->policy == IPSEC_POLICY_ACTION_PROTECT ?
+                          format(0, " sa %u", p->sa_id) :
+                          (u8 *) "");
+        vlib_cli_output(vm, "   local addr range %U - %U port range %u - %u",
+                        format_ip4_address, &p->laddr.start.ip4,
+                        format_ip4_address, &p->laddr.stop.ip4,
+                        p->lport.start, p->lport.stop);
+        vlib_cli_output(vm, "   remte addr range %U - %U port range %u - %u",
+                        format_ip4_address, &p->raddr.start.ip4,
+                        format_ip4_address, &p->raddr.stop.ip4,
+                        p->rport.start, p->rport.stop);
+        vlib_cli_output(vm, "   packets %u bytes %u", p->counter.packets,
+                        p->counter.bytes);
+      };
+    vec_foreach(i, spd->ipv6_outbound_policies)
+      {
+        p = pool_elt_at_index(spd->policies, *i);
+        vlib_cli_output(vm, "  priority %d action %U protocol %s%s",
+                        p->priority,
+                        format_ipsec_policy_action, p->policy,
+                        p->protocol ?
+                          format(0, "%U", format_ip_protocol, p->protocol) :
+                          (u8 *) "any",
+                        p->policy == IPSEC_POLICY_ACTION_PROTECT ?
+                          format(0, " sa %u", p->sa_id) :
+                          (u8 *) "");
+        vlib_cli_output(vm, "   local addr range %U - %U port range %u - %u",
+                        format_ip6_address, &p->laddr.start.ip6,
+                        format_ip6_address, &p->laddr.stop.ip6,
+                        p->lport.start, p->lport.stop);
+        vlib_cli_output(vm, "   remote addr range %U - %U port range %u - %u",
+                        format_ip6_address, &p->raddr.start.ip6,
+                        format_ip6_address, &p->raddr.stop.ip6,
+                        p->rport.start, p->rport.stop);
+        vlib_cli_output(vm, "   packets %u bytes %u", p->counter.packets,
+                        p->counter.bytes);
+      };
+    vlib_cli_output(vm, " inbound policies");
+    vec_foreach(i, spd->ipv4_inbound_protect_policy_indices)
+      {
+        p = pool_elt_at_index(spd->policies, *i);
+        vlib_cli_output(vm, "  priority %d action %U protocol %s%s",
+                        p->priority,
+                        format_ipsec_policy_action, p->policy,
+                        p->protocol ?
+                          format(0, "%U", format_ip_protocol, p->protocol) :
+                          (u8 *) "any",
+                        p->policy == IPSEC_POLICY_ACTION_PROTECT ?
+                          format(0, " sa %u", p->sa_id) :
+                          (u8 *) "");
+        vlib_cli_output(vm, "   local addr range %U - %U port range %u - %u",
+                        format_ip4_address, &p->laddr.start.ip4,
+                        format_ip4_address, &p->laddr.stop.ip4,
+                        p->lport.start, p->lport.stop);
+        vlib_cli_output(vm, "   remte addr range %U - %U port range %u - %u",
+                        format_ip4_address, &p->raddr.start.ip4,
+                        format_ip4_address, &p->raddr.stop.ip4,
+                        p->rport.start, p->rport.stop);
+        vlib_cli_output(vm, "   packets %u bytes %u", p->counter.packets,
+                        p->counter.bytes);
+      };
+    vec_foreach(i, spd->ipv4_inbound_policy_discard_and_bypass_indices)
+      {
+        p = pool_elt_at_index(spd->policies, *i);
+        vlib_cli_output(vm, "  priority %d action %U protocol %s%s",
+                        p->priority,
+                        format_ipsec_policy_action, p->policy,
+                        p->protocol ?
+                          format(0, "%U", format_ip_protocol, p->protocol) :
+                          (u8 *) "any",
+                        p->policy == IPSEC_POLICY_ACTION_PROTECT ?
+                          format(0, " sa %u", p->sa_id) :
+                          (u8 *) "");
+        vlib_cli_output(vm, "   local addr range %U - %U port range %u - %u",
+                        format_ip4_address, &p->laddr.start.ip4,
+                        format_ip4_address, &p->laddr.stop.ip4,
+                        p->lport.start, p->lport.stop);
+        vlib_cli_output(vm, "   remte addr range %U - %U port range %u - %u",
+                        format_ip4_address, &p->raddr.start.ip4,
+                        format_ip4_address, &p->raddr.stop.ip4,
+                        p->rport.start, p->rport.stop);
+        vlib_cli_output(vm, "   packets %u bytes %u", p->counter.packets,
+                        p->counter.bytes);
+      };
+    vec_foreach(i, spd->ipv6_inbound_protect_policy_indices)
+      {
+        p = pool_elt_at_index(spd->policies, *i);
+        vlib_cli_output(vm, "  priority %d action %U protocol %s%s",
+                        p->priority,
+                        format_ipsec_policy_action, p->policy,
+                        p->protocol ?
+                          format(0, "%U", format_ip_protocol, p->protocol) :
+                          (u8 *) "any",
+                        p->policy == IPSEC_POLICY_ACTION_PROTECT ?
+                          format(0, " sa %u", p->sa_id) :
+                          (u8 *) "");
+        vlib_cli_output(vm, "   local addr range %U - %U port range %u - %u",
+                        format_ip6_address, &p->laddr.start.ip6,
+                        format_ip6_address, &p->laddr.stop.ip6,
+                        p->lport.start, p->lport.stop);
+        vlib_cli_output(vm, "   remote addr range %U - %U port range %u - %u",
+                        format_ip6_address, &p->raddr.start.ip6,
+                        format_ip6_address, &p->raddr.stop.ip6,
+                        p->rport.start, p->rport.stop);
+        vlib_cli_output(vm, "   packets %u bytes %u", p->counter.packets,
+                        p->counter.bytes);
+      };
+    vec_foreach(i, spd->ipv6_inbound_policy_discard_and_bypass_indices)
+      {
+        p = pool_elt_at_index(spd->policies, *i);
+        vlib_cli_output(vm, "  priority %d action %U protocol %s%s",
+                        p->priority,
+                        format_ipsec_policy_action, p->policy,
+                        p->protocol ?
+                          format(0, "%U", format_ip_protocol, p->protocol) :
+                          (u8 *) "any",
+                        p->policy == IPSEC_POLICY_ACTION_PROTECT ?
+                          format(0, " sa %u", p->sa_id) :
+                          (u8 *) "");
+        vlib_cli_output(vm, "   local addr range %U - %U port range %u - %u",
+                        format_ip6_address, &p->laddr.start.ip6,
+                        format_ip6_address, &p->laddr.stop.ip6,
+                        p->lport.start, p->lport.stop);
+        vlib_cli_output(vm, "   remote addr range %U - %U port range %u - %u",
+                        format_ip6_address, &p->raddr.start.ip6,
+                        format_ip6_address, &p->raddr.stop.ip6,
+                        p->rport.start, p->rport.stop);
+        vlib_cli_output(vm, "   packets %u bytes %u", p->counter.packets,
+                        p->counter.bytes);
+      };
+  }));
+  /* *INDENT-ON* */
+
+  vlib_cli_output (vm, "tunnel interfaces");
+  /* *INDENT-OFF* */
+  pool_foreach (t, im->tunnel_interfaces, ({
+    if (t->hw_if_index == ~0)
+      continue;
+    hi = vnet_get_hw_interface (im->vnet_main, t->hw_if_index);
+    vlib_cli_output(vm, "  %s seq", hi->name);
+    sa = pool_elt_at_index(im->sad, t->output_sa_index);
+    vlib_cli_output(vm, "   seq %u seq-hi %u esn %u anti-replay %u",
+                    sa->seq, sa->seq_hi, sa->use_esn, sa->use_anti_replay);
+    vlib_cli_output(vm, "   local-spi %u local-ip %U", sa->spi,
+                    format_ip4_address, &sa->tunnel_src_addr.ip4);
+    vlib_cli_output(vm, "   local-crypto %U %U",
+                    format_ipsec_crypto_alg, sa->crypto_alg,
+                    format_hex_bytes, sa->crypto_key, sa->crypto_key_len);
+    vlib_cli_output(vm, "   local-integrity %U %U",
+                    format_ipsec_integ_alg, sa->integ_alg,
+                    format_hex_bytes, sa->integ_key, sa->integ_key_len);
+    sa = pool_elt_at_index(im->sad, t->input_sa_index);
+    vlib_cli_output(vm, "   last-seq %u last-seq-hi %u esn %u anti-replay %u window %U",
+                    sa->last_seq, sa->last_seq_hi, sa->use_esn,
+                    sa->use_anti_replay,
+                    format_ipsec_replay_window, sa->replay_window);
+    vlib_cli_output(vm, "   remote-spi %u remote-ip %U", sa->spi,
+                    format_ip4_address, &sa->tunnel_src_addr.ip4);
+    vlib_cli_output(vm, "   remote-crypto %U %U",
+                    format_ipsec_crypto_alg, sa->crypto_alg,
+                    format_hex_bytes, sa->crypto_key, sa->crypto_key_len);
+    vlib_cli_output(vm, "   remote-integrity %U %U",
+                    format_ipsec_integ_alg, sa->integ_alg,
+                    format_hex_bytes, sa->integ_key, sa->integ_key_len);
+  }));
+  /* *INDENT-ON* */
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_ipsec_command, static) = {
+    .path = "show ipsec",
+    .short_help = "show ipsec",
+    .function = show_ipsec_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+clear_ipsec_counters_command_fn (vlib_main_t * vm,
+				 unformat_input_t * input,
+				 vlib_cli_command_t * cmd)
+{
+  ipsec_main_t *im = &ipsec_main;
+  ipsec_spd_t *spd;
+  ipsec_policy_t *p;
+
+  /* *INDENT-OFF* */
+  pool_foreach (spd, im->spds, ({
+    pool_foreach(p, spd->policies, ({
+      p->counter.packets = p->counter.bytes = 0;
+    }));
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (clear_ipsec_counters_command, static) = {
+    .path = "clear ipsec counters",
+    .short_help = "clear ipsec counters",
+    .function = clear_ipsec_counters_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+create_ipsec_tunnel_command_fn (vlib_main_t * vm,
+				unformat_input_t * input,
+				vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ipsec_add_del_tunnel_args_t a;
+  int rv;
+  u32 num_m_args = 0;
+
+  memset (&a, 0, sizeof (a));
+  a.is_add = 1;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (line_input, "local-ip %U", unformat_ip4_address, &a.local_ip))
+	num_m_args++;
+      else
+	if (unformat
+	    (line_input, "remote-ip %U", unformat_ip4_address, &a.remote_ip))
+	num_m_args++;
+      else if (unformat (line_input, "local-spi %u", &a.local_spi))
+	num_m_args++;
+      else if (unformat (line_input, "remote-spi %u", &a.remote_spi))
+	num_m_args++;
+      else if (unformat (line_input, "del"))
+	a.is_add = 0;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  if (num_m_args < 4)
+    return clib_error_return (0, "mandatory argument(s) missing");
+
+  rv = ipsec_add_del_tunnel_if (&a);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+    case VNET_API_ERROR_INVALID_VALUE:
+      if (a.is_add)
+	return clib_error_return (0,
+				  "IPSec tunnel interface already exists...");
+      else
+	return clib_error_return (0, "IPSec tunnel interface not exists...");
+    default:
+      return clib_error_return (0, "ipsec_register_interface returned %d",
+				rv);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (create_ipsec_tunnel_command, static) = {
+  .path = "create ipsec tunnel",
+  .short_help = "create ipsec tunnel local-ip <addr> local-spi <spi> remote-ip <addr> remote-spi <spi>",
+  .function = create_ipsec_tunnel_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_interface_key_command_fn (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ipsec_main_t *im = &ipsec_main;
+  ipsec_if_set_key_type_t type = IPSEC_IF_SET_KEY_TYPE_NONE;
+  u32 hw_if_index = (u32) ~ 0;
+  u32 alg;
+  u8 *key = 0;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "%U",
+		    unformat_vnet_hw_interface, im->vnet_main, &hw_if_index))
+	;
+      else
+	if (unformat
+	    (line_input, "local crypto %U", unformat_ipsec_crypto_alg, &alg))
+	type = IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO;
+      else
+	if (unformat
+	    (line_input, "remote crypto %U", unformat_ipsec_crypto_alg, &alg))
+	type = IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO;
+      else
+	if (unformat
+	    (line_input, "local integ %U", unformat_ipsec_integ_alg, &alg))
+	type = IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG;
+      else
+	if (unformat
+	    (line_input, "remote integ %U", unformat_ipsec_integ_alg, &alg))
+	type = IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG;
+      else if (unformat (line_input, "%U", unformat_hex_string, &key))
+	;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (type == IPSEC_IF_SET_KEY_TYPE_NONE)
+    return clib_error_return (0, "unknown key type");
+
+  if (alg > 0 && vec_len (key) == 0)
+    return clib_error_return (0, "key is not specified");
+
+  if (hw_if_index == (u32) ~ 0)
+    return clib_error_return (0, "interface not specified");
+
+  ipsec_set_interface_key (im->vnet_main, hw_if_index, type, alg, key);
+  vec_free (key);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_key_command, static) = {
+    .path = "set interface ipsec key",
+    .short_help =
+    "set interface ipsec key <int> <local|remote> <crypto|integ> <key type> <key>",
+    .function = set_interface_key_command_fn,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+ipsec_cli_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ipsec_cli_init);
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ipsec_format.c b/src/vnet/ipsec/ipsec_format.c
new file mode 100644
index 00000000..38aed79a
--- /dev/null
+++ b/src/vnet/ipsec/ipsec_format.c
@@ -0,0 +1,141 @@
+/*
+ * decap.c : IPSec tunnel support
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+#include <vnet/interface.h>
+
+#include <vnet/ipsec/ipsec.h>
+
+u8 *
+format_ipsec_policy_action (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+  char *t = 0;
+
+  switch (i)
+    {
+#define _(v,f,str) case IPSEC_POLICY_ACTION_##f: t = str; break;
+      foreach_ipsec_policy_action
+#undef _
+    default:
+      s = format (s, "unknown");
+    }
+  s = format (s, "%s", t);
+  return s;
+}
+
+uword
+unformat_ipsec_policy_action (unformat_input_t * input, va_list * args)
+{
+  u32 *r = va_arg (*args, u32 *);
+
+  if (0);
+#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_POLICY_ACTION_##f;
+  foreach_ipsec_policy_action
+#undef _
+    else
+    return 0;
+  return 1;
+}
+
+u8 *
+format_ipsec_crypto_alg (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+  u8 *t = 0;
+
+  switch (i)
+    {
+#define _(v,f,str) case IPSEC_CRYPTO_ALG_##f: t = (u8 *) str; break;
+      foreach_ipsec_crypto_alg
+#undef _
+    default:
+      s = format (s, "unknown");
+    }
+  s = format (s, "%s", t);
+  return s;
+}
+
+uword
+unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args)
+{
+  u32 *r = va_arg (*args, u32 *);
+
+  if (0);
+#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_CRYPTO_ALG_##f;
+  foreach_ipsec_crypto_alg
+#undef _
+    else
+    return 0;
+  return 1;
+}
+
+u8 *
+format_ipsec_integ_alg (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+  u8 *t = 0;
+
+  switch (i)
+    {
+#define _(v,f,str) case IPSEC_INTEG_ALG_##f: t = (u8 *) str; break;
+      foreach_ipsec_integ_alg
+#undef _
+    default:
+      s = format (s, "unknown");
+    }
+  s = format (s, "%s", t);
+  return s;
+}
+
+uword
+unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args)
+{
+  u32 *r = va_arg (*args, u32 *);
+
+  if (0);
+#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_INTEG_ALG_##f;
+  foreach_ipsec_integ_alg
+#undef _
+    else
+    return 0;
+  return 1;
+}
+
+u8 *
+format_ipsec_replay_window (u8 * s, va_list * args)
+{
+  u64 w = va_arg (*args, u64);
+  u8 i;
+
+  for (i = 0; i < 64; i++)
+    {
+      s = format (s, "%u", w & (1ULL << i) ? 1 : 0);
+    }
+
+  return s;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ipsec_if.c b/src/vnet/ipsec/ipsec_if.c
new file mode 100644
index 00000000..a8da046f
--- /dev/null
+++ b/src/vnet/ipsec/ipsec_if.c
@@ -0,0 +1,372 @@
+/*
+ * ipsec_if.c : IPSec interface support
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+
+#include <vnet/ipsec/ipsec.h>
+#if DPDK_CRYPTO==1
+#include <vnet/devices/dpdk/ipsec/esp.h>
+#else
+#include <vnet/ipsec/esp.h>
+#endif
+
+#if DPDK_CRYPTO==0
+/* dummy function */
+static int
+add_del_sa_sess (u32 sa_index, u8 is_add)
+{
+  return 0;
+}
+#endif
+
+void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
+
+static u8 *
+format_ipsec_name (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  return format (s, "ipsec%d", dev_instance);
+}
+
+static uword
+dummy_interface_tx (vlib_main_t * vm,
+		    vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  clib_warning ("you shouldn't be here, leaking buffers...");
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (ipsec_device_class, static) =
+{
+  .name = "IPSec",
+  .format_device_name = format_ipsec_name,
+  .format_tx_trace = format_ipsec_if_output_trace,
+  .tx_function = dummy_interface_tx,
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VNET_HW_INTERFACE_CLASS (ipsec_hw_class) =
+{
+  .name = "IPSec",
+  .build_rewrite = default_build_rewrite,
+};
+/* *INDENT-ON* */
+
+static int
+ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm,
+				  ipsec_add_del_tunnel_args_t * args);
+
+static int
+ipsec_add_del_tunnel_if_rpc_callback (ipsec_add_del_tunnel_args_t * a)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ASSERT (os_get_cpu_number () == 0);
+
+  return ipsec_add_del_tunnel_if_internal (vnm, a);
+}
+
+int
+ipsec_add_del_tunnel_if (ipsec_add_del_tunnel_args_t * args)
+{
+  vl_api_rpc_call_main_thread (ipsec_add_del_tunnel_if_rpc_callback,
+			       (u8 *) args, sizeof (*args));
+  return 0;
+}
+
+int
+ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm,
+				  ipsec_add_del_tunnel_args_t * args)
+{
+  ipsec_tunnel_if_t *t;
+  ipsec_main_t *im = &ipsec_main;
+  vnet_hw_interface_t *hi;
+  u32 hw_if_index = ~0;
+  uword *p;
+  ipsec_sa_t *sa;
+
+  u64 key = (u64) args->remote_ip.as_u32 << 32 | (u64) args->remote_spi;
+  p = hash_get (im->ipsec_if_pool_index_by_key, key);
+
+  if (args->is_add)
+    {
+      /* check if same src/dst pair exists */
+      if (p)
+	return VNET_API_ERROR_INVALID_VALUE;
+
+      pool_get_aligned (im->tunnel_interfaces, t, CLIB_CACHE_LINE_BYTES);
+      memset (t, 0, sizeof (*t));
+
+      pool_get (im->sad, sa);
+      memset (sa, 0, sizeof (*sa));
+      t->input_sa_index = sa - im->sad;
+      sa->spi = args->remote_spi;
+      sa->tunnel_src_addr.ip4.as_u32 = args->remote_ip.as_u32;
+      sa->tunnel_dst_addr.ip4.as_u32 = args->local_ip.as_u32;
+      sa->is_tunnel = 1;
+      sa->use_esn = args->esn;
+      sa->use_anti_replay = args->anti_replay;
+      sa->integ_alg = args->integ_alg;
+      if (args->remote_integ_key_len <= sizeof (args->remote_integ_key))
+	{
+	  sa->integ_key_len = args->remote_integ_key_len;
+	  clib_memcpy (sa->integ_key, args->remote_integ_key,
+		       args->remote_integ_key_len);
+	}
+      sa->crypto_alg = args->crypto_alg;
+      if (args->remote_crypto_key_len <= sizeof (args->remote_crypto_key))
+	{
+	  sa->crypto_key_len = args->remote_crypto_key_len;
+	  clib_memcpy (sa->crypto_key, args->remote_crypto_key,
+		       args->remote_crypto_key_len);
+	}
+
+      add_del_sa_sess (t->input_sa_index, args->is_add);
+
+      pool_get (im->sad, sa);
+      memset (sa, 0, sizeof (*sa));
+      t->output_sa_index = sa - im->sad;
+      sa->spi = args->local_spi;
+      sa->tunnel_src_addr.ip4.as_u32 = args->local_ip.as_u32;
+      sa->tunnel_dst_addr.ip4.as_u32 = args->remote_ip.as_u32;
+      sa->is_tunnel = 1;
+      sa->seq = 1;
+      sa->use_esn = args->esn;
+      sa->use_anti_replay = args->anti_replay;
+      sa->integ_alg = args->integ_alg;
+      if (args->local_integ_key_len <= sizeof (args->local_integ_key))
+	{
+	  sa->integ_key_len = args->local_integ_key_len;
+	  clib_memcpy (sa->integ_key, args->local_integ_key,
+		       args->local_integ_key_len);
+	}
+      sa->crypto_alg = args->crypto_alg;
+      if (args->local_crypto_key_len <= sizeof (args->local_crypto_key))
+	{
+	  sa->crypto_key_len = args->local_crypto_key_len;
+	  clib_memcpy (sa->crypto_key, args->local_crypto_key,
+		       args->local_crypto_key_len);
+	}
+
+      add_del_sa_sess (t->output_sa_index, args->is_add);
+
+      hash_set (im->ipsec_if_pool_index_by_key, key,
+		t - im->tunnel_interfaces);
+
+      if (vec_len (im->free_tunnel_if_indices) > 0)
+	{
+	  hw_if_index =
+	    im->free_tunnel_if_indices[vec_len (im->free_tunnel_if_indices) -
+				       1];
+	  _vec_len (im->free_tunnel_if_indices) -= 1;
+	}
+      else
+	{
+	  hw_if_index =
+	    vnet_register_interface (vnm, ipsec_device_class.index,
+				     t - im->tunnel_interfaces,
+				     ipsec_hw_class.index,
+				     t - im->tunnel_interfaces);
+
+	  hi = vnet_get_hw_interface (vnm, hw_if_index);
+	  hi->output_node_index = ipsec_if_output_node.index;
+	}
+      t->hw_if_index = hw_if_index;
+
+      /*1st interface, register protocol */
+      if (pool_elts (im->tunnel_interfaces) == 1)
+	ip4_register_protocol (IP_PROTOCOL_IPSEC_ESP,
+			       ipsec_if_input_node.index);
+
+      return hw_if_index;
+    }
+  else
+    {
+      /* check if exists */
+      if (!p)
+	return VNET_API_ERROR_INVALID_VALUE;
+
+      t = pool_elt_at_index (im->tunnel_interfaces, p[0]);
+      hi = vnet_get_hw_interface (vnm, t->hw_if_index);
+      vnet_sw_interface_set_flags (vnm, hi->sw_if_index, 0);	/* admin down */
+      vec_add1 (im->free_tunnel_if_indices, t->hw_if_index);
+
+      /* delete input and output SA */
+      sa = pool_elt_at_index (im->sad, t->input_sa_index);
+
+      if (add_del_sa_sess (t->input_sa_index, args->is_add) < 0)
+	return VNET_API_ERROR_SYSCALL_ERROR_1;
+
+      pool_put (im->sad, sa);
+
+      sa = pool_elt_at_index (im->sad, t->output_sa_index);
+
+      if (add_del_sa_sess (t->output_sa_index, args->is_add) < 0)
+	return VNET_API_ERROR_SYSCALL_ERROR_1;
+
+      pool_put (im->sad, sa);
+
+      hash_unset (im->ipsec_if_pool_index_by_key, key);
+      pool_put (im->tunnel_interfaces, t);
+    }
+  return 0;
+}
+
+int
+ipsec_add_del_ipsec_gre_tunnel (vnet_main_t * vnm,
+				ipsec_add_del_ipsec_gre_tunnel_args_t * args)
+{
+  ipsec_tunnel_if_t *t = 0;
+  ipsec_main_t *im = &ipsec_main;
+  uword *p;
+  ipsec_sa_t *sa;
+  u64 key;
+  u32 isa, osa;
+
+  p = hash_get (im->sa_index_by_sa_id, args->local_sa_id);
+  if (!p)
+    return VNET_API_ERROR_INVALID_VALUE;
+  isa = p[0];
+
+  p = hash_get (im->sa_index_by_sa_id, args->remote_sa_id);
+  if (!p)
+    return VNET_API_ERROR_INVALID_VALUE;
+  osa = p[0];
+  sa = pool_elt_at_index (im->sad, p[0]);
+
+  if (sa->is_tunnel)
+    key = (u64) sa->tunnel_dst_addr.ip4.as_u32 << 32 | (u64) sa->spi;
+  else
+    key = (u64) args->remote_ip.as_u32 << 32 | (u64) sa->spi;
+
+  p = hash_get (im->ipsec_if_pool_index_by_key, key);
+
+  if (args->is_add)
+    {
+      /* check if same src/dst pair exists */
+      if (p)
+	return VNET_API_ERROR_INVALID_VALUE;
+
+      pool_get_aligned (im->tunnel_interfaces, t, CLIB_CACHE_LINE_BYTES);
+      memset (t, 0, sizeof (*t));
+
+      t->input_sa_index = isa;
+      t->output_sa_index = osa;
+      t->hw_if_index = ~0;
+      hash_set (im->ipsec_if_pool_index_by_key, key,
+		t - im->tunnel_interfaces);
+
+      /*1st interface, register protocol */
+      if (pool_elts (im->tunnel_interfaces) == 1)
+	ip4_register_protocol (IP_PROTOCOL_IPSEC_ESP,
+			       ipsec_if_input_node.index);
+    }
+  else
+    {
+      /* check if exists */
+      if (!p)
+	return VNET_API_ERROR_INVALID_VALUE;
+
+      t = pool_elt_at_index (im->tunnel_interfaces, p[0]);
+      hash_unset (im->ipsec_if_pool_index_by_key, key);
+      pool_put (im->tunnel_interfaces, t);
+    }
+  return 0;
+}
+
+int
+ipsec_set_interface_key (vnet_main_t * vnm, u32 hw_if_index,
+			 ipsec_if_set_key_type_t type, u8 alg, u8 * key)
+{
+  ipsec_main_t *im = &ipsec_main;
+  vnet_hw_interface_t *hi;
+  ipsec_tunnel_if_t *t;
+  ipsec_sa_t *sa;
+
+  hi = vnet_get_hw_interface (vnm, hw_if_index);
+  t = pool_elt_at_index (im->tunnel_interfaces, hi->dev_instance);
+
+  if (type == IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO)
+    {
+      sa = pool_elt_at_index (im->sad, t->output_sa_index);
+      sa->crypto_alg = alg;
+      sa->crypto_key_len = vec_len (key);
+      clib_memcpy (sa->crypto_key, key, vec_len (key));
+
+      if (add_del_sa_sess (t->input_sa_index, 0) < 0)
+	return VNET_API_ERROR_SYSCALL_ERROR_1;
+    }
+  else if (type == IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG)
+    {
+      sa = pool_elt_at_index (im->sad, t->output_sa_index);
+      sa->integ_alg = alg;
+      sa->integ_key_len = vec_len (key);
+      clib_memcpy (sa->integ_key, key, vec_len (key));
+
+      if (add_del_sa_sess (t->output_sa_index, 0) < 0)
+	return VNET_API_ERROR_SYSCALL_ERROR_1;
+    }
+  else if (type == IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO)
+    {
+      sa = pool_elt_at_index (im->sad, t->input_sa_index);
+      sa->crypto_alg = alg;
+      sa->crypto_key_len = vec_len (key);
+      clib_memcpy (sa->crypto_key, key, vec_len (key));
+
+      if (add_del_sa_sess (t->input_sa_index, 0) < 0)
+	return VNET_API_ERROR_SYSCALL_ERROR_1;
+    }
+  else if (type == IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG)
+    {
+      sa = pool_elt_at_index (im->sad, t->input_sa_index);
+      sa->integ_alg = alg;
+      sa->integ_key_len = vec_len (key);
+      clib_memcpy (sa->integ_key, key, vec_len (key));
+
+      if (add_del_sa_sess (t->output_sa_index, 0) < 0)
+	return VNET_API_ERROR_SYSCALL_ERROR_1;
+    }
+  else
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  return 0;
+}
+
+
+clib_error_t *
+ipsec_tunnel_if_init (vlib_main_t * vm)
+{
+  ipsec_main_t *im = &ipsec_main;
+
+  im->ipsec_if_pool_index_by_key = hash_create (0, sizeof (uword));
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ipsec_tunnel_if_init);
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ipsec_if_in.c b/src/vnet/ipsec/ipsec_if_in.c
new file mode 100644
index 00000000..db75ab92
--- /dev/null
+++ b/src/vnet/ipsec/ipsec_if_in.c
@@ -0,0 +1,175 @@
+/*
+ * ipsec_if_in.c : IPSec interface input node
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+
+#include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/esp.h>
+
+#if DPDK_CRYPTO==1
+#define ESP_NODE "dpdk-esp-decrypt"
+#else
+#define ESP_NODE "esp-decrypt"
+#endif
+
+/* Statistics (not really errors) */
+#define foreach_ipsec_if_input_error    \
+_(RX, "good packets received")
+
+static char *ipsec_if_input_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ipsec_if_input_error
+#undef _
+};
+
+typedef enum
+{
+#define _(sym,str) IPSEC_IF_INPUT_ERROR_##sym,
+  foreach_ipsec_if_input_error
+#undef _
+    IPSEC_IF_INPUT_N_ERROR,
+} ipsec_if_input_error_t;
+
+typedef enum
+{
+  IPSEC_IF_INPUT_NEXT_ESP_DECRYPT,
+  IPSEC_IF_INPUT_NEXT_DROP,
+  IPSEC_IF_INPUT_N_NEXT,
+} ipsec_if_input_next_t;
+
+typedef struct
+{
+  u32 spi;
+  u32 seq;
+} ipsec_if_input_trace_t;
+
+
+u8 *
+format_ipsec_if_input_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ipsec_if_input_trace_t *t = va_arg (*args, ipsec_if_input_trace_t *);
+
+  s = format (s, "IPSec: spi %u seq %u", t->spi, t->seq);
+  return s;
+}
+
+static uword
+ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+			vlib_frame_t * from_frame)
+{
+  ipsec_main_t *im = &ipsec_main;
+  u32 *from, *to_next = 0, next_index;
+  u32 n_left_from;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, next0;
+	  vlib_buffer_t *b0;
+	  ip4_header_t *ip0;
+	  esp_header_t *esp0;
+	  uword *p;
+
+	  bi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  b0 = vlib_get_buffer (vm, bi0);
+	  ip0 = vlib_buffer_get_current (b0);
+	  esp0 = (esp_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0));
+
+	  next0 = IPSEC_IF_INPUT_NEXT_DROP;
+
+	  u64 key = (u64) ip0->src_address.as_u32 << 32 |
+	    (u64) clib_net_to_host_u32 (esp0->spi);
+
+	  p = hash_get (im->ipsec_if_pool_index_by_key, key);
+
+	  if (p)
+	    {
+	      ipsec_tunnel_if_t *t;
+	      t = pool_elt_at_index (im->tunnel_interfaces, p[0]);
+	      vnet_buffer (b0)->ipsec.sad_index = t->input_sa_index;
+	      vnet_buffer (b0)->ipsec.flags =
+		t->hw_if_index == ~0 ? IPSEC_FLAG_IPSEC_GRE_TUNNEL : 0;
+	      vlib_buffer_advance (b0, ip4_header_bytes (ip0));
+	      next0 = IPSEC_IF_INPUT_NEXT_ESP_DECRYPT;
+	    }
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ipsec_if_input_trace_t *tr =
+		vlib_add_trace (vm, node, b0, sizeof (*tr));
+	      tr->spi = clib_host_to_net_u32 (esp0->spi);
+	      tr->seq = clib_host_to_net_u32 (esp0->seq);
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, ipsec_if_input_node.index,
+			       IPSEC_IF_INPUT_ERROR_RX,
+			       from_frame->n_vectors);
+
+  return from_frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ipsec_if_input_node) = {
+  .function = ipsec_if_input_node_fn,
+  .name = "ipsec-if-input",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ipsec_if_input_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(ipsec_if_input_error_strings),
+  .error_strings = ipsec_if_input_error_strings,
+
+  .n_next_nodes = IPSEC_IF_INPUT_N_NEXT,
+
+  .next_nodes = {
+	[IPSEC_IF_INPUT_NEXT_ESP_DECRYPT] = ESP_NODE,
+	[IPSEC_IF_INPUT_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ipsec_if_input_node, ipsec_if_input_node_fn)
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ipsec_if_out.c b/src/vnet/ipsec/ipsec_if_out.c
new file mode 100644
index 00000000..8f062828
--- /dev/null
+++ b/src/vnet/ipsec/ipsec_if_out.c
@@ -0,0 +1,161 @@
+/*
+ * ipsec_if_out.c : IPSec interface output node
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+
+#include <vnet/ipsec/ipsec.h>
+
+#if DPDK_CRYPTO==1
+#define ESP_NODE "dpdk-esp-encrypt"
+#else
+#define ESP_NODE "esp-encrypt"
+#endif
+
+/* Statistics (not really errors) */
+#define foreach_ipsec_if_output_error    \
+_(TX, "good packets transmitted")
+
+static char *ipsec_if_output_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ipsec_if_output_error
+#undef _
+};
+
+typedef enum
+{
+#define _(sym,str) IPSEC_IF_OUTPUT_ERROR_##sym,
+  foreach_ipsec_if_output_error
+#undef _
+    IPSEC_IF_OUTPUT_N_ERROR,
+} ipsec_if_output_error_t;
+
+typedef enum
+{
+  IPSEC_IF_OUTPUT_NEXT_ESP_ENCRYPT,
+  IPSEC_IF_OUTPUT_NEXT_DROP,
+  IPSEC_IF_OUTPUT_N_NEXT,
+} ipsec_if_output_next_t;
+
+typedef struct
+{
+  u32 spi;
+  u32 seq;
+} ipsec_if_output_trace_t;
+
+
+u8 *
+format_ipsec_if_output_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ipsec_if_output_trace_t *t = va_arg (*args, ipsec_if_output_trace_t *);
+
+  s = format (s, "IPSec: spi %u seq %u", t->spi, t->seq);
+  return s;
+}
+
+static uword
+ipsec_if_output_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+			 vlib_frame_t * from_frame)
+{
+  ipsec_main_t *im = &ipsec_main;
+  vnet_main_t *vnm = im->vnet_main;
+  u32 *from, *to_next = 0, next_index;
+  u32 n_left_from, sw_if_index0;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, next0;
+	  vlib_buffer_t *b0;
+	  ipsec_tunnel_if_t *t0;
+	  vnet_hw_interface_t *hi0;
+
+	  bi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  b0 = vlib_get_buffer (vm, bi0);
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	  hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
+	  t0 = pool_elt_at_index (im->tunnel_interfaces, hi0->dev_instance);
+	  vnet_buffer (b0)->ipsec.sad_index = t0->output_sa_index;
+	  next0 = IPSEC_IF_OUTPUT_NEXT_ESP_ENCRYPT;
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ipsec_if_output_trace_t *tr =
+		vlib_add_trace (vm, node, b0, sizeof (*tr));
+	      ipsec_sa_t *sa0 =
+		pool_elt_at_index (im->sad, t0->output_sa_index);
+	      tr->spi = sa0->spi;
+	      tr->seq = sa0->seq;
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, ipsec_if_output_node.index,
+			       IPSEC_IF_OUTPUT_ERROR_TX,
+			       from_frame->n_vectors);
+
+  return from_frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ipsec_if_output_node) = {
+  .function = ipsec_if_output_node_fn,
+  .name = "ipsec-if-output",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ipsec_if_output_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(ipsec_if_output_error_strings),
+  .error_strings = ipsec_if_output_error_strings,
+
+  .n_next_nodes = IPSEC_IF_OUTPUT_N_NEXT,
+
+  .next_nodes = {
+        [IPSEC_IF_OUTPUT_NEXT_ESP_ENCRYPT] = ESP_NODE,
+        [IPSEC_IF_OUTPUT_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ipsec_if_output_node, ipsec_if_output_node_fn)
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ipsec_input.c b/src/vnet/ipsec/ipsec_input.c
new file mode 100644
index 00000000..4662c1a1
--- /dev/null
+++ b/src/vnet/ipsec/ipsec_input.c
@@ -0,0 +1,455 @@
+/*
+ * decap.c : IPSec tunnel decapsulation
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+#include <vnet/feature/feature.h>
+
+#include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/esp.h>
+
+#if DPDK_CRYPTO==1
+#define ESP_NODE "dpdk-esp-decrypt"
+#else
+#define ESP_NODE "esp-decrypt"
+#endif
+
+#define foreach_ipsec_input_next                \
+_(DROP, "error-drop")                           \
+_(ESP_DECRYPT, ESP_NODE)
+
+#define _(v, s) IPSEC_INPUT_NEXT_##v,
+typedef enum
+{
+  foreach_ipsec_input_next
+#undef _
+    IPSEC_INPUT_N_NEXT,
+} ipsec_input_next_t;
+
+
+#define foreach_ipsec_input_error                   \
+ _(RX_PKTS, "IPSEC pkts received")                  \
+ _(DECRYPTION_FAILED, "IPSEC decryption failed")
+
+
+typedef enum
+{
+#define _(sym,str) IPSEC_INPUT_ERROR_##sym,
+  foreach_ipsec_input_error
+#undef _
+    IPSEC_INPUT_N_ERROR,
+} ipsec_input_error_t;
+
+static char *ipsec_input_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ipsec_input_error
+#undef _
+};
+
+typedef struct
+{
+  u32 sa_id;
+  u32 spi;
+  u32 seq;
+} ipsec_input_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_ipsec_input_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ipsec_input_trace_t *t = va_arg (*args, ipsec_input_trace_t *);
+
+  if (t->spi == 0 && t->seq == 0)
+    {
+      s = format (s, "esp: no esp packet");
+      return s;
+    }
+
+  if (t->sa_id != 0)
+    {
+      s = format (s, "esp: sa_id %u spi %u seq %u", t->sa_id, t->spi, t->seq);
+    }
+  else
+    {
+      s = format (s, "esp: no sa spi %u seq %u", t->spi, t->seq);
+    }
+  return s;
+}
+
+always_inline ipsec_policy_t *
+ipsec_input_protect_policy_match (ipsec_spd_t * spd, u32 sa, u32 da, u32 spi)
+{
+  ipsec_main_t *im = &ipsec_main;
+  ipsec_policy_t *p;
+  ipsec_sa_t *s;
+  u32 *i;
+
+  vec_foreach (i, spd->ipv4_inbound_protect_policy_indices)
+  {
+    p = pool_elt_at_index (spd->policies, *i);
+    s = pool_elt_at_index (im->sad, p->sa_index);
+
+    if (spi != s->spi)
+      continue;
+
+    if (s->is_tunnel)
+      {
+	if (da != clib_net_to_host_u32 (s->tunnel_dst_addr.ip4.as_u32))
+	  continue;
+
+	if (sa != clib_net_to_host_u32 (s->tunnel_src_addr.ip4.as_u32))
+	  continue;
+
+	return p;
+      }
+
+    if (da < clib_net_to_host_u32 (p->laddr.start.ip4.as_u32))
+      continue;
+
+    if (da > clib_net_to_host_u32 (p->laddr.stop.ip4.as_u32))
+      continue;
+
+    if (sa < clib_net_to_host_u32 (p->raddr.start.ip4.as_u32))
+      continue;
+
+    if (sa > clib_net_to_host_u32 (p->raddr.stop.ip4.as_u32))
+      continue;
+
+    return p;
+  }
+  return 0;
+}
+
+always_inline uword
+ip6_addr_match_range (ip6_address_t * a, ip6_address_t * la,
+		      ip6_address_t * ua)
+{
+  if ((memcmp (a->as_u64, la->as_u64, 2 * sizeof (u64)) >= 0) &&
+      (memcmp (a->as_u64, ua->as_u64, 2 * sizeof (u64)) <= 0))
+    return 1;
+  return 0;
+}
+
+always_inline ipsec_policy_t *
+ipsec_input_ip6_protect_policy_match (ipsec_spd_t * spd,
+				      ip6_address_t * sa,
+				      ip6_address_t * da, u32 spi)
+{
+  ipsec_main_t *im = &ipsec_main;
+  ipsec_policy_t *p;
+  ipsec_sa_t *s;
+  u32 *i;
+
+  vec_foreach (i, spd->ipv6_inbound_protect_policy_indices)
+  {
+    p = pool_elt_at_index (spd->policies, *i);
+    s = pool_elt_at_index (im->sad, p->sa_index);
+
+    if (spi != s->spi)
+      continue;
+
+    if (s->is_tunnel)
+      {
+	if (!ip6_address_is_equal (sa, &s->tunnel_src_addr.ip6))
+	  continue;
+
+	if (!ip6_address_is_equal (da, &s->tunnel_dst_addr.ip6))
+	  continue;
+
+	return p;
+      }
+
+    if (!ip6_addr_match_range (sa, &p->raddr.start.ip6, &p->raddr.stop.ip6))
+      continue;
+
+    if (!ip6_addr_match_range (da, &p->laddr.start.ip6, &p->laddr.stop.ip6))
+      continue;
+
+    return p;
+  }
+  return 0;
+}
+
+static vlib_node_registration_t ipsec_input_ip4_node;
+
+static uword
+ipsec_input_ip4_node_fn (vlib_main_t * vm,
+			 vlib_node_runtime_t * node,
+			 vlib_frame_t * from_frame)
+{
+  u32 n_left_from, *from, next_index, *to_next;
+  ipsec_main_t *im = &ipsec_main;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, next0;
+	  vlib_buffer_t *b0;
+	  ip4_header_t *ip0;
+	  esp_header_t *esp0;
+	  ip4_ipsec_config_t *c0;
+	  ipsec_spd_t *spd0;
+	  ipsec_policy_t *p0 = 0;
+
+	  bi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  c0 =
+	    vnet_feature_next_with_data (vnet_buffer (b0)->sw_if_index
+					 [VLIB_RX], &next0, b0,
+					 sizeof (c0[0]));
+
+	  spd0 = pool_elt_at_index (im->spds, c0->spd_index);
+
+	  ip0 = vlib_buffer_get_current (b0);
+	  esp0 = (esp_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0));
+
+	  if (PREDICT_TRUE (ip0->protocol == IP_PROTOCOL_IPSEC_ESP))
+	    {
+#if 0
+	      clib_warning
+		("packet received from %U to %U spi %u size %u spd_id %u",
+		 format_ip4_address, ip0->src_address.as_u8,
+		 format_ip4_address, ip0->dst_address.as_u8,
+		 clib_net_to_host_u32 (esp0->spi),
+		 clib_net_to_host_u16 (ip0->length), spd0->id);
+#endif
+
+	      p0 = ipsec_input_protect_policy_match (spd0,
+						     clib_net_to_host_u32
+						     (ip0->src_address.
+						      as_u32),
+						     clib_net_to_host_u32
+						     (ip0->dst_address.
+						      as_u32),
+						     clib_net_to_host_u32
+						     (esp0->spi));
+
+	      if (PREDICT_TRUE (p0 != 0))
+		{
+		  p0->counter.packets++;
+		  p0->counter.bytes += clib_net_to_host_u16 (ip0->length);
+		  vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
+		  vnet_buffer (b0)->ipsec.flags = 0;
+		  next0 = IPSEC_INPUT_NEXT_ESP_DECRYPT;
+		  vlib_buffer_advance (b0, ip4_header_bytes (ip0));
+		  goto trace0;
+		}
+	    }
+
+	  /* FIXME bypass and discard */
+
+	trace0:
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ipsec_input_trace_t *tr =
+		vlib_add_trace (vm, node, b0, sizeof (*tr));
+	      if (ip0->protocol == IP_PROTOCOL_IPSEC_ESP)
+		{
+		  if (p0)
+		    tr->sa_id = p0->sa_id;
+		  tr->spi = clib_host_to_net_u32 (esp0->spi);
+		  tr->seq = clib_host_to_net_u32 (esp0->seq);
+		}
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next, bi0,
+					   next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, ipsec_input_ip4_node.index,
+			       IPSEC_INPUT_ERROR_RX_PKTS,
+			       from_frame->n_vectors);
+
+  return from_frame->n_vectors;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ipsec_input_ip4_node,static) = {
+  .function = ipsec_input_ip4_node_fn,
+  .name = "ipsec-input-ip4",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ipsec_input_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(ipsec_input_error_strings),
+  .error_strings = ipsec_input_error_strings,
+
+  .n_next_nodes = IPSEC_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [IPSEC_INPUT_NEXT_##s] = n,
+    foreach_ipsec_input_next
+#undef _
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn)
+     static vlib_node_registration_t ipsec_input_ip6_node;
+
+     static uword
+       ipsec_input_ip6_node_fn (vlib_main_t * vm,
+				vlib_node_runtime_t * node,
+				vlib_frame_t * from_frame)
+{
+  u32 n_left_from, *from, next_index, *to_next;
+  ipsec_main_t *im = &ipsec_main;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, next0;
+	  vlib_buffer_t *b0;
+	  ip6_header_t *ip0;
+	  esp_header_t *esp0;
+	  ip4_ipsec_config_t *c0;
+	  ipsec_spd_t *spd0;
+	  ipsec_policy_t *p0 = 0;
+	  u32 header_size = sizeof (ip0[0]);
+
+	  bi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  c0 =
+	    vnet_feature_next_with_data (vnet_buffer (b0)->sw_if_index
+					 [VLIB_RX], &next0, b0,
+					 sizeof (c0[0]));
+
+	  spd0 = pool_elt_at_index (im->spds, c0->spd_index);
+
+	  ip0 = vlib_buffer_get_current (b0);
+	  esp0 = (esp_header_t *) ((u8 *) ip0 + header_size);
+
+	  if (PREDICT_TRUE (ip0->protocol == IP_PROTOCOL_IPSEC_ESP))
+	    {
+#if 0
+	      clib_warning
+		("packet received from %U to %U spi %u size %u spd_id %u",
+		 format_ip6_address, &ip0->src_address, format_ip6_address,
+		 &ip0->dst_address, clib_net_to_host_u32 (esp0->spi),
+		 clib_net_to_host_u16 (ip0->payload_length) + header_size,
+		 spd0->id);
+#endif
+	      p0 = ipsec_input_ip6_protect_policy_match (spd0,
+							 &ip0->src_address,
+							 &ip0->dst_address,
+							 clib_net_to_host_u32
+							 (esp0->spi));
+
+	      if (PREDICT_TRUE (p0 != 0))
+		{
+		  p0->counter.packets++;
+		  p0->counter.bytes +=
+		    clib_net_to_host_u16 (ip0->payload_length);
+		  p0->counter.bytes += header_size;
+		  vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
+		  vnet_buffer (b0)->ipsec.flags = 0;
+		  next0 = IPSEC_INPUT_NEXT_ESP_DECRYPT;
+		  vlib_buffer_advance (b0, header_size);
+		  goto trace0;
+		}
+	    }
+
+	trace0:
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      ipsec_input_trace_t *tr =
+		vlib_add_trace (vm, node, b0, sizeof (*tr));
+	      if (ip0->protocol == IP_PROTOCOL_IPSEC_ESP)
+		{
+		  if (p0)
+		    tr->sa_id = p0->sa_id;
+		  tr->spi = clib_host_to_net_u32 (esp0->spi);
+		  tr->seq = clib_host_to_net_u32 (esp0->seq);
+		}
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, ipsec_input_ip6_node.index,
+			       IPSEC_INPUT_ERROR_RX_PKTS,
+			       from_frame->n_vectors);
+
+  return from_frame->n_vectors;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ipsec_input_ip6_node,static) = {
+  .function = ipsec_input_ip6_node_fn,
+  .name = "ipsec-input-ip6",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ipsec_input_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(ipsec_input_error_strings),
+  .error_strings = ipsec_input_error_strings,
+
+  .n_next_nodes = IPSEC_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [IPSEC_INPUT_NEXT_##s] = n,
+    foreach_ipsec_input_next
+#undef _
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip6_node, ipsec_input_ip6_node_fn)
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ipsec/ipsec_output.c b/src/vnet/ipsec/ipsec_output.c
new file mode 100644
index 00000000..97977899
--- /dev/null
+++ b/src/vnet/ipsec/ipsec_output.c
@@ -0,0 +1,478 @@
+/*
+ * ipsec_output.c : IPSec output node
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+
+#include <vnet/ipsec/ipsec.h>
+
+#if DPDK_CRYPTO==1
+#define ESP_NODE "dpdk-esp-encrypt"
+#else
+#define ESP_NODE "esp-encrypt"
+#endif
+
+#if IPSEC > 0
+
+#define foreach_ipsec_output_next                \
+_(DROP, "error-drop")                            \
+_(ESP_ENCRYPT, ESP_NODE)
+
+#define _(v, s) IPSEC_OUTPUT_NEXT_##v,
+typedef enum
+{
+  foreach_ipsec_output_next
+#undef _
+    IPSEC_OUTPUT_N_NEXT,
+} ipsec_output_next_t;
+
+
+#define foreach_ipsec_output_error                   \
+ _(RX_PKTS, "IPSec pkts received")                   \
+ _(POLICY_DISCARD, "IPSec policy discard")           \
+ _(POLICY_NO_MATCH, "IPSec policy (no match)")       \
+ _(POLICY_PROTECT, "IPSec policy protect")           \
+ _(POLICY_BYPASS, "IPSec policy bypass")             \
+ _(ENCAPS_FAILED, "IPSec encapsulation failed")
+
+
+typedef enum
+{
+#define _(sym,str) IPSEC_OUTPUT_ERROR_##sym,
+  foreach_ipsec_output_error
+#undef _
+    IPSEC_DECAP_N_ERROR,
+} ipsec_output_error_t;
+
+static char *ipsec_output_error_strings[] = {
+#define _(sym,string) string,
+  foreach_ipsec_output_error
+#undef _
+};
+
+static vlib_node_registration_t ipsec_output_ip4_node;
+static vlib_node_registration_t ipsec_output_ip6_node;
+
+typedef struct
+{
+  u32 spd_id;
+} ipsec_output_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_ipsec_output_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  ipsec_output_trace_t *t = va_arg (*args, ipsec_output_trace_t *);
+
+  if (t->spd_id != ~0)
+    {
+      s = format (s, "spd %u ", t->spd_id);
+    }
+  else
+    {
+      s = format (s, "no spd");
+    }
+  return s;
+}
+
+always_inline ipsec_policy_t *
+ipsec_output_policy_match (ipsec_spd_t * spd, u8 pr, u32 la, u32 ra, u16 lp,
+			   u16 rp)
+{
+  ipsec_policy_t *p;
+  u32 *i;
+
+  if (!spd)
+    return 0;
+
+  vec_foreach (i, spd->ipv4_outbound_policies)
+  {
+    p = pool_elt_at_index (spd->policies, *i);
+    if (PREDICT_FALSE (p->protocol && (p->protocol != pr)))
+      continue;
+
+    if (la < clib_net_to_host_u32 (p->laddr.start.ip4.as_u32))
+      continue;
+
+    if (la > clib_net_to_host_u32 (p->laddr.stop.ip4.as_u32))
+      continue;
+
+    if (ra < clib_net_to_host_u32 (p->raddr.start.ip4.as_u32))
+      continue;
+
+    if (ra > clib_net_to_host_u32 (p->raddr.stop.ip4.as_u32))
+      continue;
+
+    if (PREDICT_FALSE ((pr != IP_PROTOCOL_TCP) && (pr != IP_PROTOCOL_UDP)))
+      return p;
+
+    if (lp < p->lport.start)
+      continue;
+
+    if (lp > p->lport.stop)
+      continue;
+
+    if (rp < p->rport.start)
+      continue;
+
+    if (rp > p->rport.stop)
+      continue;
+
+    return p;
+  }
+  return 0;
+}
+
+always_inline uword
+ip6_addr_match_range (ip6_address_t * a, ip6_address_t * la,
+		      ip6_address_t * ua)
+{
+  if ((memcmp (a->as_u64, la->as_u64, 2 * sizeof (u64)) >= 0) &&
+      (memcmp (a->as_u64, ua->as_u64, 2 * sizeof (u64)) <= 0))
+    return 1;
+  return 0;
+}
+
+always_inline ipsec_policy_t *
+ipsec_output_ip6_policy_match (ipsec_spd_t * spd,
+			       ip6_address_t * la,
+			       ip6_address_t * ra, u16 lp, u16 rp, u8 pr)
+{
+  ipsec_policy_t *p;
+  u32 *i;
+
+  if (!spd)
+    return 0;
+
+  vec_foreach (i, spd->ipv6_outbound_policies)
+  {
+    p = pool_elt_at_index (spd->policies, *i);
+    if (PREDICT_FALSE (p->protocol && (p->protocol != pr)))
+      continue;
+
+    if (!ip6_addr_match_range (ra, &p->raddr.start.ip6, &p->raddr.stop.ip6))
+      continue;
+
+    if (!ip6_addr_match_range (la, &p->laddr.start.ip6, &p->laddr.stop.ip6))
+      continue;
+
+    if (PREDICT_FALSE ((pr != IP_PROTOCOL_TCP) && (pr != IP_PROTOCOL_UDP)))
+      return p;
+
+    if (lp < p->lport.start)
+      continue;
+
+    if (lp > p->lport.stop)
+      continue;
+
+    if (rp < p->rport.start)
+      continue;
+
+    if (rp > p->rport.stop)
+      continue;
+
+    return p;
+  }
+
+  return 0;
+}
+
+static inline uword
+ipsec_output_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
+		     vlib_frame_t * from_frame, int is_ipv6)
+{
+  ipsec_main_t *im = &ipsec_main;
+
+  u32 *from, *to_next = 0;
+  u32 n_left_from, sw_if_index0, last_sw_if_index = (u32) ~ 0;
+  u32 next_node_index = (u32) ~ 0, last_next_node_index = (u32) ~ 0;
+  vlib_frame_t *f = 0;
+  u32 spd_index0 = ~0;
+  ipsec_spd_t *spd0 = 0;
+  u64 nc_protect = 0, nc_bypass = 0, nc_discard = 0, nc_nomatch = 0;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      ipsec_policy_t *p0;
+      ip4_header_t *ip0;
+      ip6_header_t *ip6_0 = 0;
+      udp_header_t *udp0;
+      u32 iph_offset = 0;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+      iph_offset = vnet_buffer (b0)->ip.save_rewrite_length;
+      ip0 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b0)
+			      + iph_offset);
+
+      /* lookup for SPD only if sw_if_index is changed */
+      if (PREDICT_FALSE (last_sw_if_index != sw_if_index0))
+	{
+	  uword *p = hash_get (im->spd_index_by_sw_if_index, sw_if_index0);
+	  ASSERT (p);
+	  spd_index0 = p[0];
+	  spd0 = pool_elt_at_index (im->spds, spd_index0);
+	  last_sw_if_index = sw_if_index0;
+	}
+
+      if (is_ipv6)
+	{
+	  ip6_0 = (ip6_header_t *) ((u8 *) vlib_buffer_get_current (b0)
+				    + iph_offset);
+
+	  udp0 = ip6_next_header (ip6_0);
+#if 0
+	  clib_warning
+	    ("packet received from %U port %u to %U port %u spd_id %u",
+	     format_ip6_address, &ip6_0->src_address,
+	     clib_net_to_host_u16 (udp0->src_port), format_ip6_address,
+	     &ip6_0->dst_address, clib_net_to_host_u16 (udp0->dst_port),
+	     spd0->id);
+#endif
+
+	  p0 = ipsec_output_ip6_policy_match (spd0,
+					      &ip6_0->src_address,
+					      &ip6_0->dst_address,
+					      clib_net_to_host_u16
+					      (udp0->src_port),
+					      clib_net_to_host_u16
+					      (udp0->dst_port),
+					      ip6_0->protocol);
+	}
+      else
+	{
+	  udp0 = (udp_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0));
+
+#if 0
+	  clib_warning ("packet received from %U to %U port %u",
+			format_ip4_address, ip0->src_address.as_u8,
+			format_ip4_address, ip0->dst_address.as_u8,
+			clib_net_to_host_u16 (udp0->dst_port));
+	  clib_warning ("sw_if_index0 %u spd_index0 %u spd_id %u",
+			sw_if_index0, spd_index0, spd0->id);
+#endif
+
+	  p0 = ipsec_output_policy_match (spd0, ip0->protocol,
+					  clib_net_to_host_u32
+					  (ip0->src_address.as_u32),
+					  clib_net_to_host_u32
+					  (ip0->dst_address.as_u32),
+					  clib_net_to_host_u16
+					  (udp0->src_port),
+					  clib_net_to_host_u16
+					  (udp0->dst_port));
+	}
+
+      if (PREDICT_TRUE (p0 != NULL))
+	{
+	  if (p0->policy == IPSEC_POLICY_ACTION_PROTECT)
+	    {
+	      nc_protect++;
+	      next_node_index = im->esp_encrypt_node_index;
+	      vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
+	      vlib_buffer_advance (b0, iph_offset);
+	      p0->counter.packets++;
+	      if (is_ipv6)
+		{
+		  p0->counter.bytes +=
+		    clib_net_to_host_u16 (ip6_0->payload_length);
+		  p0->counter.bytes += sizeof (ip6_header_t);
+		}
+	      else
+		{
+		  p0->counter.bytes += clib_net_to_host_u16 (ip0->length);
+		}
+	    }
+	  else if (p0->policy == IPSEC_POLICY_ACTION_BYPASS)
+	    {
+	      nc_bypass++;
+	      next_node_index = get_next_output_feature_node_index (b0, node);
+	      p0->counter.packets++;
+	      if (is_ipv6)
+		{
+		  p0->counter.bytes +=
+		    clib_net_to_host_u16 (ip6_0->payload_length);
+		  p0->counter.bytes += sizeof (ip6_header_t);
+		}
+	      else
+		{
+		  p0->counter.bytes += clib_net_to_host_u16 (ip0->length);
+		}
+	    }
+	  else
+	    {
+	      nc_discard++;
+	      p0->counter.packets++;
+	      if (is_ipv6)
+		{
+		  p0->counter.bytes +=
+		    clib_net_to_host_u16 (ip6_0->payload_length);
+		  p0->counter.bytes += sizeof (ip6_header_t);
+		}
+	      else
+		{
+		  p0->counter.bytes += clib_net_to_host_u16 (ip0->length);
+		}
+	      next_node_index = im->error_drop_node_index;
+	    }
+	}
+      else
+	{
+	  nc_nomatch++;
+	  next_node_index = im->error_drop_node_index;
+	}
+
+      from += 1;
+      n_left_from -= 1;
+
+      if (PREDICT_FALSE ((last_next_node_index != next_node_index) || f == 0))
+	{
+	  /* if this is not 1st frame */
+	  if (f)
+	    vlib_put_frame_to_node (vm, last_next_node_index, f);
+
+	  last_next_node_index = next_node_index;
+
+	  f = vlib_get_frame_to_node (vm, next_node_index);
+	  to_next = vlib_frame_vector_args (f);
+	}
+
+      to_next[0] = bi0;
+      to_next += 1;
+      f->n_vectors++;
+
+      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	{
+	  ipsec_output_trace_t *tr =
+	    vlib_add_trace (vm, node, b0, sizeof (*tr));
+	  if (spd0)
+	    tr->spd_id = spd0->id;
+	}
+    }
+
+  vlib_put_frame_to_node (vm, next_node_index, f);
+  vlib_node_increment_counter (vm, node->node_index,
+			       IPSEC_OUTPUT_ERROR_POLICY_PROTECT, nc_protect);
+  vlib_node_increment_counter (vm, node->node_index,
+			       IPSEC_OUTPUT_ERROR_POLICY_BYPASS, nc_bypass);
+  vlib_node_increment_counter (vm, node->node_index,
+			       IPSEC_OUTPUT_ERROR_POLICY_DISCARD, nc_discard);
+  vlib_node_increment_counter (vm, node->node_index,
+			       IPSEC_OUTPUT_ERROR_POLICY_NO_MATCH,
+			       nc_nomatch);
+  return from_frame->n_vectors;
+}
+
+static uword
+ipsec_output_ip4_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+			  vlib_frame_t * frame)
+{
+  return ipsec_output_inline (vm, node, frame, 0);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ipsec_output_ip4_node,static) = {
+  .function = ipsec_output_ip4_node_fn,
+  .name = "ipsec-output-ip4",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ipsec_output_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(ipsec_output_error_strings),
+  .error_strings = ipsec_output_error_strings,
+
+  .n_next_nodes = IPSEC_OUTPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [IPSEC_OUTPUT_NEXT_##s] = n,
+    foreach_ipsec_output_next
+#undef _
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ipsec_output_ip4_node, ipsec_output_ip4_node_fn)
+     static uword
+       ipsec_output_ip6_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+				 vlib_frame_t * frame)
+{
+  return ipsec_output_inline (vm, node, frame, 1);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ipsec_output_ip6_node,static) = {
+  .function = ipsec_output_ip6_node_fn,
+  .name = "ipsec-output-ip6",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ipsec_output_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(ipsec_output_error_strings),
+  .error_strings = ipsec_output_error_strings,
+
+  .n_next_nodes = IPSEC_OUTPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [IPSEC_OUTPUT_NEXT_##s] = n,
+    foreach_ipsec_output_next
+#undef _
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (ipsec_output_ip6_node, ipsec_output_ip6_node_fn)
+#else /* IPSEC > 1 */
+
+/* Dummy ipsec output node, in case when IPSec is disabled */
+
+static uword
+ipsec_output_node_fn (vlib_main_t * vm,
+		      vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  clib_warning ("IPSec disabled");
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ipsec_output_node) = {
+  .vector_size = sizeof (u32),
+  .function = ipsec_output_node_fn,
+  .name = "ipsec-output-ip4",
+};
+
+VLIB_REGISTER_NODE (ipsec_output_node) = {
+  .vector_size = sizeof (u32),
+  .function = ipsec_output_node_fn,
+  .name = "ipsec-output-ip6",
+};
+/* *INDENT-ON* */
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/dir.dox b/src/vnet/l2/dir.dox
new file mode 100644
index 00000000..8497a2f6
--- /dev/null
+++ b/src/vnet/l2/dir.dox
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+@dir
+@brief Layer 2 Forwarding Code.
+
+This directory contains the source code for basic Layer 2 forwarding.
+
+*/
+/*? %%clicmd:group_label Layer 2 CLI %% ?*/
diff --git a/src/vnet/l2/feat_bitmap.c b/src/vnet/l2/feat_bitmap.c
new file mode 100644
index 00000000..6c046467
--- /dev/null
+++ b/src/vnet/l2/feat_bitmap.c
@@ -0,0 +1,185 @@
+/*
+ * feat_bitmap.c: bitmap for managing feature invocation
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/packet.h>
+#include <vlib/cli.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/feat_bitmap.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/cache.h>
+
+
+/*
+ * Drop node for feature bitmaps
+ * For features that just do a drop, or are not yet implemented.
+ * Initial feature dispatch nodes don't need to set b0->error
+ * in case of a possible drop because that will be done here.
+ *The next node is always error-drop.
+ */
+
+static vlib_node_registration_t feat_bitmap_drop_node;
+
+#define foreach_feat_bitmap_drop_error		\
+_(NO_FWD,     "L2 feature forwarding disabled")	\
+_(NYI,        "L2 feature not implemented")
+
+typedef enum
+{
+#define _(sym,str) FEAT_BITMAP_DROP_ERROR_##sym,
+  foreach_feat_bitmap_drop_error
+#undef _
+    FEAT_BITMAP_DROP_N_ERROR,
+} feat_bitmap_drop_error_t;
+
+static char *feat_bitmap_drop_error_strings[] = {
+#define _(sym,string) string,
+  foreach_feat_bitmap_drop_error
+#undef _
+};
+
+typedef enum
+{
+  FEAT_BITMAP_DROP_NEXT_DROP,
+  FEAT_BITMAP_DROP_N_NEXT,
+} feat_bitmap_drop_next_t;
+
+typedef struct
+{
+  u32 feature_bitmap;
+} feat_bitmap_drop_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_feat_bitmap_drop_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  feat_bitmap_drop_trace_t *t = va_arg (*args, feat_bitmap_drop_trace_t *);
+
+  s =
+    format (s, "feat_bitmap_drop: feature bitmap 0x%08x", t->feature_bitmap);
+  return s;
+}
+
+static uword
+feat_bitmap_drop_node_fn (vlib_main_t * vm,
+			  vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  feat_bitmap_drop_next_t next_index;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;	/* number of packets to process */
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      /* get space to enqueue frame to graph node "next_index" */
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      feat_bitmap_drop_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->feature_bitmap = vnet_buffer (b0)->l2.feature_bitmap;
+	    }
+
+	  if (vnet_buffer (b0)->l2.feature_bitmap == 1)
+	    {
+	      /*
+	       * If we are executing the last feature, this is the
+	       * No forwarding catch-all
+	       */
+	      b0->error = node->errors[FEAT_BITMAP_DROP_ERROR_NO_FWD];
+	    }
+	  else
+	    {
+	      b0->error = node->errors[FEAT_BITMAP_DROP_ERROR_NYI];
+	    }
+	  next0 = FEAT_BITMAP_DROP_NEXT_DROP;
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return frame->n_vectors;
+}
+
+clib_error_t *
+feat_bitmap_drop_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (feat_bitmap_drop_init);
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (feat_bitmap_drop_node,static) = {
+  .function = feat_bitmap_drop_node_fn,
+  .name = "feature-bitmap-drop",
+  .vector_size = sizeof (u32),
+  .format_trace = format_feat_bitmap_drop_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(feat_bitmap_drop_error_strings),
+  .error_strings = feat_bitmap_drop_error_strings,
+
+  .n_next_nodes = FEAT_BITMAP_DROP_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [FEAT_BITMAP_DROP_NEXT_DROP]  = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/feat_bitmap.h b/src/vnet/l2/feat_bitmap.h
new file mode 100644
index 00000000..c6e02ecc
--- /dev/null
+++ b/src/vnet/l2/feat_bitmap.h
@@ -0,0 +1,96 @@
+/*
+ * feat_bitmap.h: bitmap for managing feature invocation
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_vnet_l2_feat_bitmap_h
+#define included_vnet_l2_feat_bitmap_h
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+
+/*
+ * The feature bitmap is a way of organizing input and output feature graph nodes.
+ * The set of features to be executed are arranged in a bitmap with one bit per
+ * feature and each bit positioned in the same order that the features should be
+ * executed. Features can be dynamically removed from the set by masking off their
+ * corresponding bits. The bitmap is stored in packet context. Each feature clears
+ * its bit and then calls feat_bitmap_get_next_node_index() to go to the next
+ * graph node.
+ */
+
+
+/* 32 features in a u32 bitmap */
+#define FEAT_MAX 32
+
+/**
+ Initialize the feature next-node indexes of a graph node.
+ Should be called by the init function of each feature graph node.
+*/
+always_inline void
+feat_bitmap_init_next_nodes (vlib_main_t * vm, u32 node_index,	/* the current graph node index  */
+			     u32 num_features,	/* number of entries in feat_names */
+			     char **feat_names,	/* array of feature graph node names */
+			     u32 * next_nodes)	/* array of 32 next indexes to init */
+{
+  u32 idx;
+
+  ASSERT (num_features <= FEAT_MAX);
+
+  for (idx = 0; idx < num_features; idx++)
+    {
+      if (vlib_get_node_by_name (vm, (u8 *) feat_names[idx]))
+	{
+	  next_nodes[idx] =
+	    vlib_node_add_named_next (vm, node_index, feat_names[idx]);
+	}
+      else
+	{			// Node may be in plugin which is not installed, use drop node
+	  next_nodes[idx] =
+	    vlib_node_add_named_next (vm, node_index, "feature-bitmap-drop");
+	}
+    }
+
+  /* All unassigned bits go to the drop node */
+  for (; idx < FEAT_MAX; idx++)
+    {
+      next_nodes[idx] = vlib_node_add_named_next (vm, node_index,
+						  "feature-bitmap-drop");
+    }
+}
+
+/**
+ Return the graph node index for the feature corresponding to the
+ first set bit in the bitmap.
+*/
+always_inline
+  u32 feat_bitmap_get_next_node_index (u32 * next_nodes, u32 bitmap)
+{
+  u32 first_bit;
+
+  count_leading_zeros (first_bit, bitmap);
+  first_bit = uword_bits - 1 - first_bit;
+  return next_nodes[first_bit];
+}
+
+#endif /* included_vnet_l2_feat_bitmap_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2.api b/src/vnet/l2/l2.api
new file mode 100644
index 00000000..5fce7944
--- /dev/null
+++ b/src/vnet/l2/l2.api
@@ -0,0 +1,38 @@
+/* Hey Emacs use -*- mode: C -*- */
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \brief Reply to l2_xconnect_dump 
+    @param context - sender context which was passed in the request
+    @param rx_sw_if_index - Receive interface index
+    @param tx_sw_if_index - Transmit interface index
+ */
+define l2_xconnect_details
+{
+  u32 context;
+  u32 rx_sw_if_index;
+  u32 tx_sw_if_index;
+};
+
+/** \brief Dump L2 XConnects
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define l2_xconnect_dump
+{
+  u32 client_index;
+  u32 context;
+};
+
diff --git a/src/vnet/l2/l2_api.c b/src/vnet/l2/l2_api.c
new file mode 100644
index 00000000..ca4f593f
--- /dev/null
+++ b/src/vnet/l2/l2_api.c
@@ -0,0 +1,140 @@
+/*
+ *------------------------------------------------------------------
+ * l2_api.c - layer 2 forwarding api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/l2/l2_input.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                             \
+_(L2_XCONNECT_DUMP, l2_xconnect_dump)
+
+static void
+send_l2_xconnect_details (unix_shared_memory_queue_t * q, u32 context,
+			  u32 rx_sw_if_index, u32 tx_sw_if_index)
+{
+  vl_api_l2_xconnect_details_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_L2_XCONNECT_DETAILS);
+  mp->context = context;
+  mp->rx_sw_if_index = htonl (rx_sw_if_index);
+  mp->tx_sw_if_index = htonl (tx_sw_if_index);
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_l2_xconnect_dump_t_handler (vl_api_l2_xconnect_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  l2input_main_t *l2im = &l2input_main;
+  vnet_sw_interface_t *swif;
+  l2_input_config_t *config;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  /* *INDENT-OFF* */
+  pool_foreach (swif, im->sw_interfaces,
+  ({
+    config = vec_elt_at_index (l2im->configs, swif->sw_if_index);
+    if (config->xconnect)
+      send_l2_xconnect_details (q, mp->context, swif->sw_if_index,
+                                config->output_sw_if_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+
+/*
+ * vpe_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_l2;
+#undef _
+}
+
+static clib_error_t *
+l2_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (l2_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_bd.c b/src/vnet/l2/l2_bd.c
new file mode 100644
index 00000000..22f83d0b
--- /dev/null
+++ b/src/vnet/l2/l2_bd.c
@@ -0,0 +1,1079 @@
+/*
+ * l2_bd.c : layer 2 bridge domain
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vlib/cli.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/format.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/feat_bitmap.h>
+#include <vnet/l2/l2_bd.h>
+#include <vnet/l2/l2_learn.h>
+#include <vnet/l2/l2_fib.h>
+#include <vnet/l2/l2_vtr.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/vec.h>
+
+/**
+ * @file
+ * @brief Ethernet Bridge Domain.
+ *
+ * Code in this file manages Layer 2 bridge domains.
+ *
+ */
+
+bd_main_t bd_main;
+
+/**
+  Init bridge domain if not done already.
+  For feature bitmap, set all bits except ARP termination
+*/
+void
+bd_validate (l2_bridge_domain_t * bd_config)
+{
+  if (!bd_is_valid (bd_config))
+    {
+      bd_config->feature_bitmap = ~L2INPUT_FEAT_ARP_TERM;
+      bd_config->bvi_sw_if_index = ~0;
+      bd_config->members = 0;
+      bd_config->flood_count = 0;
+      bd_config->tun_master_count = 0;
+      bd_config->tun_normal_count = 0;
+      bd_config->mac_by_ip4 = 0;
+      bd_config->mac_by_ip6 = hash_create_mem (0, sizeof (ip6_address_t),
+					       sizeof (uword));
+    }
+}
+
+u32
+bd_find_or_add_bd_index (bd_main_t * bdm, u32 bd_id)
+{
+  uword *p;
+  u32 rv;
+
+  if (bd_id == ~0)
+    {
+      bd_id = 0;
+      while (hash_get (bdm->bd_index_by_bd_id, bd_id))
+	bd_id++;
+    }
+  else
+    {
+      p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+      if (p)
+	return (p[0]);
+    }
+
+  rv = clib_bitmap_first_clear (bdm->bd_index_bitmap);
+
+  /* mark this index busy */
+  bdm->bd_index_bitmap = clib_bitmap_set (bdm->bd_index_bitmap, rv, 1);
+
+  hash_set (bdm->bd_index_by_bd_id, bd_id, rv);
+
+  vec_validate (l2input_main.bd_configs, rv);
+  l2input_main.bd_configs[rv].bd_id = bd_id;
+
+  return rv;
+}
+
+int
+bd_delete_bd_index (bd_main_t * bdm, u32 bd_id)
+{
+  uword *p;
+  u32 bd_index;
+
+  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+  if (p == 0)
+    return -1;
+
+  bd_index = p[0];
+
+  /* mark this index clear */
+  bdm->bd_index_bitmap = clib_bitmap_set (bdm->bd_index_bitmap, bd_index, 0);
+  hash_unset (bdm->bd_index_by_bd_id, bd_id);
+
+  l2input_main.bd_configs[bd_index].bd_id = ~0;
+  l2input_main.bd_configs[bd_index].feature_bitmap = 0;
+
+  return 0;
+}
+
+static void
+update_flood_count (l2_bridge_domain_t * bd_config)
+{
+  bd_config->flood_count = vec_len (bd_config->members) -
+    (bd_config->tun_master_count ? bd_config->tun_normal_count : 0);
+}
+
+void
+bd_add_member (l2_bridge_domain_t * bd_config, l2_flood_member_t * member)
+{
+  u32 ix;
+  vnet_sw_interface_t *sw_if = vnet_get_sw_interface
+    (vnet_get_main (), member->sw_if_index);
+
+  /*
+   * Add one element to the vector
+   * vector is ordered [ bvi, normal/tun_masters..., tun_normals... ]
+   * When flooding, the bvi interface (if present) must be the last member
+   * processed due to how BVI processing can change the packet. To enable
+   * this order, we make the bvi interface the first in the vector and
+   * flooding walks the vector in reverse.
+   */
+  switch (sw_if->flood_class)
+    {
+    case VNET_FLOOD_CLASS_TUNNEL_MASTER:
+      bd_config->tun_master_count++;
+      /* Fall through */
+    default:
+      /* Fall through */
+    case VNET_FLOOD_CLASS_NORMAL:
+      ix = (member->flags & L2_FLOOD_MEMBER_BVI) ? 0 :
+	vec_len (bd_config->members) - bd_config->tun_normal_count;
+      break;
+    case VNET_FLOOD_CLASS_TUNNEL_NORMAL:
+      ix = vec_len (bd_config->members);
+      bd_config->tun_normal_count++;
+      break;
+    }
+
+  vec_insert_elts (bd_config->members, member, 1, ix);
+  update_flood_count (bd_config);
+}
+
+#define BD_REMOVE_ERROR_OK        0
+#define BD_REMOVE_ERROR_NOT_FOUND 1
+
+u32
+bd_remove_member (l2_bridge_domain_t * bd_config, u32 sw_if_index)
+{
+  u32 ix;
+
+  /* Find and delete the member */
+  vec_foreach_index (ix, bd_config->members)
+  {
+    l2_flood_member_t *m = vec_elt_at_index (bd_config->members, ix);
+    if (m->sw_if_index == sw_if_index)
+      {
+	vnet_sw_interface_t *sw_if = vnet_get_sw_interface
+	  (vnet_get_main (), sw_if_index);
+
+	if (sw_if->flood_class != VNET_FLOOD_CLASS_NORMAL)
+	  {
+	    if (sw_if->flood_class == VNET_FLOOD_CLASS_TUNNEL_MASTER)
+	      bd_config->tun_master_count--;
+	    else if (sw_if->flood_class == VNET_FLOOD_CLASS_TUNNEL_NORMAL)
+	      bd_config->tun_normal_count--;
+	  }
+	vec_del1 (bd_config->members, ix);
+	update_flood_count (bd_config);
+
+	return BD_REMOVE_ERROR_OK;
+      }
+  }
+
+  return BD_REMOVE_ERROR_NOT_FOUND;
+}
+
+
+clib_error_t *
+l2bd_init (vlib_main_t * vm)
+{
+  bd_main_t *bdm = &bd_main;
+  u32 bd_index;
+  bdm->bd_index_by_bd_id = hash_create (0, sizeof (uword));
+  /*
+   * create a dummy bd with bd_id of 0 and bd_index of 0 with feature set
+   * to packet drop only. Thus, packets received from any L2 interface with
+   * uninitialized bd_index of 0 can be dropped safely.
+   */
+  bd_index = bd_find_or_add_bd_index (bdm, 0);
+  ASSERT (bd_index == 0);
+  l2input_main.bd_configs[0].feature_bitmap = L2INPUT_FEAT_DROP;
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2bd_init);
+
+
+/**
+    Set the learn/forward/flood flags for the bridge domain.
+    Return 0 if ok, non-zero if for an error.
+*/
+u32
+bd_set_flags (vlib_main_t * vm, u32 bd_index, u32 flags, u32 enable)
+{
+
+  l2_bridge_domain_t *bd_config;
+  u32 feature_bitmap = 0;
+
+  vec_validate (l2input_main.bd_configs, bd_index);
+  bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index);
+
+  bd_validate (bd_config);
+
+  if (flags & L2_LEARN)
+    {
+      feature_bitmap |= L2INPUT_FEAT_LEARN;
+    }
+  if (flags & L2_FWD)
+    {
+      feature_bitmap |= L2INPUT_FEAT_FWD;
+    }
+  if (flags & L2_FLOOD)
+    {
+      feature_bitmap |= L2INPUT_FEAT_FLOOD;
+    }
+  if (flags & L2_UU_FLOOD)
+    {
+      feature_bitmap |= L2INPUT_FEAT_UU_FLOOD;
+    }
+  if (flags & L2_ARP_TERM)
+    {
+      feature_bitmap |= L2INPUT_FEAT_ARP_TERM;
+    }
+
+  if (enable)
+    {
+      bd_config->feature_bitmap |= feature_bitmap;
+    }
+  else
+    {
+      bd_config->feature_bitmap &= ~feature_bitmap;
+    }
+
+  return 0;
+}
+
+/**
+    Set the mac age for the bridge domain.
+*/
+void
+bd_set_mac_age (vlib_main_t * vm, u32 bd_index, u8 age)
+{
+  l2_bridge_domain_t *bd_config;
+  int enable = 0;
+
+  vec_validate (l2input_main.bd_configs, bd_index);
+  bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index);
+  bd_config->mac_age = age;
+
+  /* check if there is at least one bd with mac aging enabled */
+  vec_foreach (bd_config, l2input_main.bd_configs)
+    if (bd_config->bd_id != ~0 && bd_config->mac_age != 0)
+    enable = 1;
+
+  vlib_process_signal_event (vm, l2fib_mac_age_scanner_process_node.index,
+			     enable ? L2_MAC_AGE_PROCESS_EVENT_START :
+			     L2_MAC_AGE_PROCESS_EVENT_STOP, 0);
+}
+
+/**
+   Set bridge-domain learn enable/disable.
+   The CLI format is:
+   set bridge-domain learn <bd_id> [disable]
+*/
+static clib_error_t *
+bd_learn (vlib_main_t * vm,
+	  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  bd_main_t *bdm = &bd_main;
+  clib_error_t *error = 0;
+  u32 bd_index, bd_id;
+  u32 enable;
+  uword *p;
+
+  if (!unformat (input, "%d", &bd_id))
+    {
+      error = clib_error_return (0, "expecting bridge-domain id but got `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+
+  if (p == 0)
+    return clib_error_return (0, "No such bridge domain %d", bd_id);
+
+  bd_index = p[0];
+
+  enable = 1;
+  if (unformat (input, "disable"))
+    {
+      enable = 0;
+    }
+
+  /* set the bridge domain flag */
+  if (bd_set_flags (vm, bd_index, L2_LEARN, enable))
+    {
+      error =
+	clib_error_return (0, "bridge-domain id %d out of range", bd_index);
+      goto done;
+    }
+
+done:
+  return error;
+}
+
+/*?
+ * Layer 2 learning can be enabled and disabled on each
+ * interface and on each bridge-domain. Use this command to
+ * manage bridge-domains. It is enabled by default.
+ *
+ * @cliexpar
+ * Example of how to enable learning (where 200 is the bridge-domain-id):
+ * @cliexcmd{set bridge-domain learn 200}
+ * Example of how to disable learning (where 200 is the bridge-domain-id):
+ * @cliexcmd{set bridge-domain learn 200 disable}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (bd_learn_cli, static) = {
+  .path = "set bridge-domain learn",
+  .short_help = "set bridge-domain learn <bridge-domain-id> [disable]",
+  .function = bd_learn,
+};
+/* *INDENT-ON* */
+
+/**
+    Set bridge-domain forward enable/disable.
+    The CLI format is:
+    set bridge-domain forward <bd_index> [disable]
+*/
+static clib_error_t *
+bd_fwd (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  bd_main_t *bdm = &bd_main;
+  clib_error_t *error = 0;
+  u32 bd_index, bd_id;
+  u32 enable;
+  uword *p;
+
+  if (!unformat (input, "%d", &bd_id))
+    {
+      error = clib_error_return (0, "expecting bridge-domain id but got `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+
+  if (p == 0)
+    return clib_error_return (0, "No such bridge domain %d", bd_id);
+
+  bd_index = p[0];
+
+  enable = 1;
+  if (unformat (input, "disable"))
+    {
+      enable = 0;
+    }
+
+  /* set the bridge domain flag */
+  if (bd_set_flags (vm, bd_index, L2_FWD, enable))
+    {
+      error =
+	clib_error_return (0, "bridge-domain id %d out of range", bd_index);
+      goto done;
+    }
+
+done:
+  return error;
+}
+
+
+/*?
+ * Layer 2 unicast forwarding can be enabled and disabled on each
+ * interface and on each bridge-domain. Use this command to
+ * manage bridge-domains. It is enabled by default.
+ *
+ * @cliexpar
+ * Example of how to enable forwarding (where 200 is the bridge-domain-id):
+ * @cliexcmd{set bridge-domain forward 200}
+ * Example of how to disable forwarding (where 200 is the bridge-domain-id):
+ * @cliexcmd{set bridge-domain forward 200 disable}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (bd_fwd_cli, static) = {
+  .path = "set bridge-domain forward",
+  .short_help = "set bridge-domain forward <bridge-domain-id> [disable]",
+  .function = bd_fwd,
+};
+/* *INDENT-ON* */
+
+/**
+    Set bridge-domain flood enable/disable.
+    The CLI format is:
+    set bridge-domain flood <bd_index> [disable]
+*/
+static clib_error_t *
+bd_flood (vlib_main_t * vm,
+	  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  bd_main_t *bdm = &bd_main;
+  clib_error_t *error = 0;
+  u32 bd_index, bd_id;
+  u32 enable;
+  uword *p;
+
+  if (!unformat (input, "%d", &bd_id))
+    {
+      error = clib_error_return (0, "expecting bridge-domain id but got `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+
+  if (p == 0)
+    return clib_error_return (0, "No such bridge domain %d", bd_id);
+
+  bd_index = p[0];
+
+  enable = 1;
+  if (unformat (input, "disable"))
+    {
+      enable = 0;
+    }
+
+  /* set the bridge domain flag */
+  if (bd_set_flags (vm, bd_index, L2_FLOOD, enable))
+    {
+      error =
+	clib_error_return (0, "bridge-domain id %d out of range", bd_index);
+      goto done;
+    }
+
+done:
+  return error;
+}
+
+/*?
+ * Layer 2 flooding can be enabled and disabled on each
+ * interface and on each bridge-domain. Use this command to
+ * manage bridge-domains. It is enabled by default.
+ *
+ * @cliexpar
+ * Example of how to enable flooding (where 200 is the bridge-domain-id):
+ * @cliexcmd{set bridge-domain flood 200}
+ * Example of how to disable flooding (where 200 is the bridge-domain-id):
+ * @cliexcmd{set bridge-domain flood 200 disable}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (bd_flood_cli, static) = {
+  .path = "set bridge-domain flood",
+  .short_help = "set bridge-domain flood <bridge-domain-id> [disable]",
+  .function = bd_flood,
+};
+/* *INDENT-ON* */
+
+/**
+    Set bridge-domain unkown-unicast flood enable/disable.
+    The CLI format is:
+    set bridge-domain uu-flood <bd_index> [disable]
+*/
+static clib_error_t *
+bd_uu_flood (vlib_main_t * vm,
+	     unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  bd_main_t *bdm = &bd_main;
+  clib_error_t *error = 0;
+  u32 bd_index, bd_id;
+  u32 enable;
+  uword *p;
+
+  if (!unformat (input, "%d", &bd_id))
+    {
+      error = clib_error_return (0, "expecting bridge-domain id but got `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+
+  if (p == 0)
+    return clib_error_return (0, "No such bridge domain %d", bd_id);
+
+  bd_index = p[0];
+
+  enable = 1;
+  if (unformat (input, "disable"))
+    {
+      enable = 0;
+    }
+
+  /* set the bridge domain flag */
+  if (bd_set_flags (vm, bd_index, L2_UU_FLOOD, enable))
+    {
+      error =
+	clib_error_return (0, "bridge-domain id %d out of range", bd_index);
+      goto done;
+    }
+
+done:
+  return error;
+}
+
+/*?
+ * Layer 2 unknown-unicast flooding can be enabled and disabled on each
+ * bridge-domain. It is enabled by default.
+ *
+ * @cliexpar
+ * Example of how to enable unknown-unicast flooding (where 200 is the
+ * bridge-domain-id):
+ * @cliexcmd{set bridge-domain uu-flood 200}
+ * Example of how to disable unknown-unicast flooding (where 200 is the bridge-domain-id):
+ * @cliexcmd{set bridge-domain uu-flood 200 disable}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (bd_uu_flood_cli, static) = {
+  .path = "set bridge-domain uu-flood",
+  .short_help = "set bridge-domain uu-flood <bridge-domain-id> [disable]",
+  .function = bd_uu_flood,
+};
+/* *INDENT-ON* */
+
+/**
+    Set bridge-domain arp term enable/disable.
+    The CLI format is:
+    set bridge-domain arp term <bridge-domain-id> [disable]
+*/
+static clib_error_t *
+bd_arp_term (vlib_main_t * vm,
+	     unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  bd_main_t *bdm = &bd_main;
+  clib_error_t *error = 0;
+  u32 bd_index, bd_id;
+  u32 enable;
+  uword *p;
+
+  if (!unformat (input, "%d", &bd_id))
+    {
+      error = clib_error_return (0, "expecting bridge-domain id but got `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+  if (p)
+    bd_index = *p;
+  else
+    return clib_error_return (0, "No such bridge domain %d", bd_id);
+
+  enable = 1;
+  if (unformat (input, "disable"))
+    enable = 0;
+
+  /* set the bridge domain flag */
+  if (bd_set_flags (vm, bd_index, L2_ARP_TERM, enable))
+    {
+      error =
+	clib_error_return (0, "bridge-domain id %d out of range", bd_index);
+      goto done;
+    }
+
+done:
+  return error;
+}
+
+static clib_error_t *
+bd_mac_age (vlib_main_t * vm,
+	    unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  bd_main_t *bdm = &bd_main;
+  clib_error_t *error = 0;
+  u32 bd_index, bd_id;
+  u32 age;
+  uword *p;
+
+  if (!unformat (input, "%d", &bd_id))
+    {
+      error = clib_error_return (0, "expecting bridge-domain id but got `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+
+  if (p == 0)
+    return clib_error_return (0, "No such bridge domain %d", bd_id);
+
+  bd_index = p[0];
+
+  if (!unformat (input, "%u", &age))
+    {
+      error =
+	clib_error_return (0, "expecting ageing time in minutes but got `%U'",
+			   format_unformat_error, input);
+      goto done;
+    }
+
+  /* set the bridge domain flag */
+  if (age > 255)
+    {
+      error =
+	clib_error_return (0, "mac aging time cannot be bigger than 255");
+      goto done;
+    }
+  bd_set_mac_age (vm, bd_index, (u8) age);
+
+done:
+  return error;
+}
+
+/*?
+ * Layer 2 mac aging can be enabled and disabled on each
+ * bridge-domain. Use this command to set or disable mac aging
+ * on specific bridge-domains. It is disabled by default.
+ *
+ * @cliexpar
+ * Example of how to set mac aging (where 200 is the bridge-domain-id and
+ * 5 is aging time in minutes):
+ * @cliexcmd{set bridge-domain mac-age 200 5}
+ * Example of how to disable mac aging (where 200 is the bridge-domain-id):
+ * @cliexcmd{set bridge-domain flood 200 0}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (bd_mac_age_cli, static) = {
+  .path = "set bridge-domain mac-age",
+  .short_help = "set bridge-domain mac-age <bridge-domain-id> <mins>",
+  .function = bd_mac_age,
+};
+/* *INDENT-ON* */
+
+/*?
+ * Modify whether or not an existing bridge-domain should terminate and respond
+ * to ARP Requests. ARP Termination is disabled by default.
+ *
+ * @cliexpar
+ * Example of how to enable ARP termination (where 200 is the bridge-domain-id):
+ * @cliexcmd{set bridge-domain arp term 200}
+ * Example of how to disable ARP termination (where 200 is the bridge-domain-id):
+ * @cliexcmd{set bridge-domain arp term 200 disable}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (bd_arp_term_cli, static) = {
+  .path = "set bridge-domain arp term",
+  .short_help = "set bridge-domain arp term <bridge-domain-id> [disable]",
+  .function = bd_arp_term,
+};
+/* *INDENT-ON* */
+
+
+/**
+ * Add/delete IP address to MAC address mapping.
+ *
+ * The clib hash implementation stores uword entries in the hash table.
+ * The hash table mac_by_ip4 is keyed via IP4 address and store the
+ * 6-byte MAC address directly in the hash table entry uword.
+ *
+ * @warning This only works for 64-bit processor with 8-byte uword;
+ * which means this code *WILL NOT WORK* for a 32-bit prcessor with
+ * 4-byte uword.
+ */
+u32
+bd_add_del_ip_mac (u32 bd_index,
+		   u8 * ip_addr, u8 * mac_addr, u8 is_ip6, u8 is_add)
+{
+  l2input_main_t *l2im = &l2input_main;
+  l2_bridge_domain_t *bd_cfg = l2input_bd_config_from_index (l2im, bd_index);
+  u64 new_mac = *(u64 *) mac_addr;
+  u64 *old_mac;
+  u16 *mac16 = (u16 *) & new_mac;
+
+  ASSERT (sizeof (uword) == sizeof (u64));	/* make sure uword is 8 bytes */
+
+  mac16[3] = 0;			/* Clear last 2 unsed bytes of the 8-byte MAC address */
+  if (is_ip6)
+    {
+      ip6_address_t *ip6_addr_key;
+      hash_pair_t *hp;
+      old_mac = (u64 *) hash_get_mem (bd_cfg->mac_by_ip6, ip_addr);
+      if (is_add)
+	{
+	  if (old_mac == 0)
+	    {			/* new entry - allocate and craete ip6 address key */
+	      ip6_addr_key = clib_mem_alloc (sizeof (ip6_address_t));
+	      clib_memcpy (ip6_addr_key, ip_addr, sizeof (ip6_address_t));
+	    }
+	  else if (*old_mac == new_mac)
+	    {			/* same mac entry already exist for ip6 address */
+	      return 0;
+	    }
+	  else
+	    {			/* updat mac for ip6 address */
+	      hp = hash_get_pair (bd_cfg->mac_by_ip6, ip_addr);
+	      ip6_addr_key = (ip6_address_t *) hp->key;
+	    }
+	  hash_set_mem (bd_cfg->mac_by_ip6, ip6_addr_key, new_mac);
+	}
+      else
+	{
+	  if (old_mac && (*old_mac == new_mac))
+	    {
+	      hp = hash_get_pair (bd_cfg->mac_by_ip6, ip_addr);
+	      ip6_addr_key = (ip6_address_t *) hp->key;
+	      hash_unset_mem (bd_cfg->mac_by_ip6, ip_addr);
+	      clib_mem_free (ip6_addr_key);
+	    }
+	  else
+	    return 1;
+	}
+    }
+  else
+    {
+      ip4_address_t ip4_addr = *(ip4_address_t *) ip_addr;
+      old_mac = (u64 *) hash_get (bd_cfg->mac_by_ip4, ip4_addr.as_u32);
+      if (is_add)
+	{
+	  if (old_mac && (*old_mac == new_mac))
+	    return 0;		/* mac entry already exist */
+	  hash_set (bd_cfg->mac_by_ip4, ip4_addr.as_u32, new_mac);
+	}
+      else
+	{
+	  if (old_mac && (*old_mac == new_mac))
+	    hash_unset (bd_cfg->mac_by_ip4, ip4_addr.as_u32);
+	  else
+	    return 1;
+	}
+    }
+  return 0;
+}
+
+/**
+    Set bridge-domain arp entry add/delete.
+    The CLI format is:
+    set bridge-domain arp entry <bridge-domain-id> <ip-addr> <mac-addr> [del]
+*/
+static clib_error_t *
+bd_arp_entry (vlib_main_t * vm,
+	      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  bd_main_t *bdm = &bd_main;
+  clib_error_t *error = 0;
+  u32 bd_index, bd_id;
+  u8 is_add = 1;
+  u8 is_ip6 = 0;
+  u8 ip_addr[16];
+  u8 mac_addr[6];
+  uword *p;
+
+  if (!unformat (input, "%d", &bd_id))
+    {
+      error = clib_error_return (0, "expecting bridge-domain id but got `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+
+  if (p)
+    bd_index = *p;
+  else
+    return clib_error_return (0, "No such bridge domain %d", bd_id);
+
+  if (unformat (input, "%U", unformat_ip4_address, ip_addr))
+    {
+      is_ip6 = 0;
+    }
+  else if (unformat (input, "%U", unformat_ip6_address, ip_addr))
+    {
+      is_ip6 = 1;
+    }
+  else
+    {
+      error = clib_error_return (0, "expecting IP address but got `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  if (!unformat (input, "%U", unformat_ethernet_address, mac_addr))
+    {
+      error = clib_error_return (0, "expecting MAC address but got `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  if (unformat (input, "del"))
+    {
+      is_add = 0;
+    }
+
+  /* set the bridge domain flagAdd IP-MAC entry into bridge domain */
+  if (bd_add_del_ip_mac (bd_index, ip_addr, mac_addr, is_ip6, is_add))
+    {
+      error = clib_error_return (0, "MAC %s for IP %U and MAC %U failed",
+				 is_add ? "add" : "del",
+				 is_ip6 ?
+				 format_ip4_address : format_ip6_address,
+				 ip_addr, format_ethernet_address, mac_addr);
+    }
+
+done:
+  return error;
+}
+
+/*?
+ * Add an ARP entry to an existing bridge-domain.
+ *
+ * @cliexpar
+ * Example of how to add an ARP entry (where 200 is the bridge-domain-id):
+ * @cliexcmd{set bridge-domain arp entry 200 192.168.72.45 52:54:00:3b:83:1a}
+ * Example of how to delete an ARP entry (where 200 is the bridge-domain-id):
+ * @cliexcmd{set bridge-domain arp entry 200 192.168.72.45 52:54:00:3b:83:1a del}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (bd_arp_entry_cli, static) = {
+  .path = "set bridge-domain arp entry",
+  .short_help = "set bridge-domain arp entry <bridge-domain-id> <ip-addr> <mac-addr> [del]",
+  .function = bd_arp_entry,
+};
+/* *INDENT-ON* */
+
+u8 *
+format_vtr (u8 * s, va_list * args)
+{
+  u32 vtr_op = va_arg (*args, u32);
+  u32 dot1q = va_arg (*args, u32);
+  u32 tag1 = va_arg (*args, u32);
+  u32 tag2 = va_arg (*args, u32);
+  switch (vtr_op)
+    {
+    case L2_VTR_DISABLED:
+      return format (s, "none");
+    case L2_VTR_PUSH_1:
+      return format (s, "push-1 %s %d", dot1q ? "dot1q" : "dot1ad", tag1);
+    case L2_VTR_PUSH_2:
+      return format (s, "push-2 %s %d %d", dot1q ? "dot1q" : "dot1ad", tag1,
+		     tag2);
+    case L2_VTR_POP_1:
+      return format (s, "pop-1");
+    case L2_VTR_POP_2:
+      return format (s, "pop-2");
+    case L2_VTR_TRANSLATE_1_1:
+      return format (s, "trans-1-1 %s %d", dot1q ? "dot1q" : "dot1ad", tag1);
+    case L2_VTR_TRANSLATE_1_2:
+      return format (s, "trans-1-2 %s %d %d", dot1q ? "dot1q" : "dot1ad",
+		     tag1, tag2);
+    case L2_VTR_TRANSLATE_2_1:
+      return format (s, "trans-2-1 %s %d", dot1q ? "dot1q" : "dot1ad", tag1);
+    case L2_VTR_TRANSLATE_2_2:
+      return format (s, "trans-2-2 %s %d %d", dot1q ? "dot1q" : "dot1ad",
+		     tag1, tag2);
+    default:
+      return format (s, "none");
+    }
+}
+
+/**
+   Show bridge-domain state.
+   The CLI format is:
+   show bridge-domain [<bd_index>]
+*/
+static clib_error_t *
+bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  bd_main_t *bdm = &bd_main;
+  clib_error_t *error = 0;
+  u32 bd_index = ~0;
+  l2_bridge_domain_t *bd_config;
+  u32 start, end;
+  u32 printed;
+  u32 detail = 0;
+  u32 intf = 0;
+  u32 arp = 0;
+  u32 bd_id = ~0;
+  uword *p;
+
+  start = 0;
+  end = vec_len (l2input_main.bd_configs);
+
+  if (unformat (input, "%d", &bd_id))
+    {
+      if (unformat (input, "detail"))
+	detail = 1;
+      else if (unformat (input, "det"))
+	detail = 1;
+      if (unformat (input, "int"))
+	intf = 1;
+      if (unformat (input, "arp"))
+	arp = 1;
+
+      p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+      if (p)
+	bd_index = *p;
+      else
+	return clib_error_return (0, "No such bridge domain %d", bd_id);
+
+      vec_validate (l2input_main.bd_configs, bd_index);
+      bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index);
+      if (bd_is_valid (bd_config))
+	{
+	  start = bd_index;
+	  end = start + 1;
+	}
+      else
+	{
+	  vlib_cli_output (vm, "bridge-domain %d not in use", bd_id);
+	  goto done;
+	}
+    }
+
+  /* Show all bridge-domains that have been initialized */
+  printed = 0;
+  for (bd_index = start; bd_index < end; bd_index++)
+    {
+      bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index);
+      if (bd_is_valid (bd_config))
+	{
+	  if (!printed)
+	    {
+	      printed = 1;
+	      vlib_cli_output (vm,
+			       "%=5s %=7s %=10s %=10s %=10s %=10s %=10s %=14s",
+			       "ID", "Index", "Learning", "U-Forwrd",
+			       "UU-Flood", "Flooding", "ARP-Term",
+			       "BVI-Intf");
+	    }
+
+	  vlib_cli_output (vm,
+			   "%=5d %=7d %=10s %=10s %=10s %=10s %=10s %=14U",
+			   bd_config->bd_id, bd_index,
+			   bd_config->feature_bitmap & L2INPUT_FEAT_LEARN ?
+			   "on" : "off",
+			   bd_config->feature_bitmap & L2INPUT_FEAT_FWD ? "on"
+			   : "off",
+			   bd_config->feature_bitmap & L2INPUT_FEAT_UU_FLOOD ?
+			   "on" : "off",
+			   bd_config->feature_bitmap & L2INPUT_FEAT_FLOOD ?
+			   "on" : "off",
+			   bd_config->feature_bitmap & L2INPUT_FEAT_ARP_TERM ?
+			   "on" : "off", format_vnet_sw_if_index_name_with_NA,
+			   vnm, bd_config->bvi_sw_if_index);
+
+	  if (detail || intf)
+	    {
+	      /* Show all member interfaces */
+	      int i;
+	      vec_foreach_index (i, bd_config->members)
+	      {
+		l2_flood_member_t *member =
+		  vec_elt_at_index (bd_config->members, i);
+		u32 vtr_opr, dot1q, tag1, tag2;
+		if (i == 0)
+		  {
+		    vlib_cli_output (vm, "\n%=30s%=7s%=5s%=5s%=9s%=30s",
+				     "Interface", "Index", "SHG", "BVI",
+				     "TxFlood", "VLAN-Tag-Rewrite");
+		  }
+		l2vtr_get (vm, vnm, member->sw_if_index, &vtr_opr, &dot1q,
+			   &tag1, &tag2);
+		vlib_cli_output (vm, "%=30U%=7d%=5d%=5s%=9s%=30U",
+				 format_vnet_sw_if_index_name, vnm,
+				 member->sw_if_index, member->sw_if_index,
+				 member->shg,
+				 member->flags & L2_FLOOD_MEMBER_BVI ? "*" :
+				 "-", i < bd_config->flood_count ? "*" : "-",
+				 format_vtr, vtr_opr, dot1q, tag1, tag2);
+	      }
+	    }
+
+	  if ((detail || arp) &&
+	      (bd_config->feature_bitmap & L2INPUT_FEAT_ARP_TERM))
+	    {
+	      u32 ip4_addr;
+	      ip6_address_t *ip6_addr;
+	      u64 mac_addr;
+	      vlib_cli_output (vm,
+			       "\n  IP4/IP6 to MAC table for ARP Termination");
+
+              /* *INDENT-OFF* */
+              hash_foreach (ip4_addr, mac_addr, bd_config->mac_by_ip4,
+              ({
+                vlib_cli_output (vm, "%=40U => %=20U",
+                                 format_ip4_address, &ip4_addr,
+                                 format_ethernet_address, &mac_addr);
+              }));
+
+              hash_foreach_mem (ip6_addr, mac_addr, bd_config->mac_by_ip6,
+              ({
+		vlib_cli_output (vm, "%=40U => %=20U",
+				 format_ip6_address, ip6_addr,
+				 format_ethernet_address, &mac_addr);
+              }));
+              /* *INDENT-ON* */
+	    }
+	}
+    }
+
+  if (!printed)
+    {
+      vlib_cli_output (vm, "no bridge-domains in use");
+    }
+
+done:
+  return error;
+}
+
+/*?
+ * Show a summary of all the bridge-domain instances or detailed view of a
+ * single bridge-domain. Bridge-domains are created by adding an interface
+ * to a bridge using the '<em>set interface l2 bridge</em>' command.
+ *
+ * @cliexpar
+ * @parblock
+ * Example of displaying all bridge-domains:
+ * @cliexstart{show bridge-domain}
+ *  ID   Index   Learning   U-Forwrd   UU-Flood   Flooding   ARP-Term     BVI-Intf
+ *  0      0        off        off        off        off        off        local0
+ * 200     1        on         on         on         on         off          N/A
+ * @cliexend
+ *
+ * Example of displaying details of a single bridge-domains:
+ * @cliexstart{show bridge-domain 200 detail}
+ *  ID   Index   Learning   U-Forwrd   UU-Flood   Flooding   ARP-Term     BVI-Intf
+ * 200     1        on         on         on         on         off          N/A
+ *
+ *          Interface           Index  SHG  BVI        VLAN-Tag-Rewrite
+ *  GigabitEthernet0/8/0.200      3     0    -               none
+ *  GigabitEthernet0/9/0.200      4     0    -               none
+ * @cliexend
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (bd_show_cli, static) = {
+  .path = "show bridge-domain",
+  .short_help = "show bridge-domain [bridge-domain-id [detail|int|arp]]",
+  .function = bd_show,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_bd.h b/src/vnet/l2/l2_bd.h
new file mode 100644
index 00000000..4bb9bc9b
--- /dev/null
+++ b/src/vnet/l2/l2_bd.h
@@ -0,0 +1,150 @@
+/*
+ * l2_bd.h : layer 2 bridge domain
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_l2bd_h
+#define included_l2bd_h
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+
+typedef struct
+{
+  /* hash bd_id -> bd_index */
+  uword *bd_index_by_bd_id;
+
+  /* Busy bd_index bitmap */
+  uword *bd_index_bitmap;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} bd_main_t;
+
+bd_main_t bd_main;
+
+/* Bridge domain member  */
+
+#define L2_FLOOD_MEMBER_NORMAL 0
+#define L2_FLOOD_MEMBER_BVI    1
+
+typedef struct
+{
+  u32 sw_if_index;		/* the output L2 interface */
+  u8 flags;			/* 0=normal, 1=bvi */
+  u8 shg;			/* split horizon group number  */
+  u16 spare;
+} l2_flood_member_t;
+
+
+/* Per-bridge domain configuration */
+
+typedef struct
+{
+  u32 feature_bitmap;
+  /*
+   * Contains bit enables for flooding, learning, and forwarding.
+   * All other feature bits should always be set.
+   *
+   * identity of the bridge-domain's BVI interface
+   * set to ~0 if there is no BVI
+   */
+  u32 bvi_sw_if_index;
+
+  /* bridge domain id, not to be confused with bd_index */
+  u32 bd_id;
+
+  /* Vector of member ports */
+  l2_flood_member_t *members;
+
+  /* First flood_count member ports are flooded */
+  u32 flood_count;
+
+  /* Tunnel Master (Multicast vxlan) are always flooded */
+  u32 tun_master_count;
+
+  /* Tunnels (Unicast vxlan) are flooded if there are no masters */
+  u32 tun_normal_count;
+
+  /* hash ip4/ip6 -> mac for arp/nd termination */
+  uword *mac_by_ip4;
+  uword *mac_by_ip6;
+
+  /* mac aging */
+  u8 mac_age;
+
+} l2_bridge_domain_t;
+
+/* Return 1 if bridge domain has been initialized */
+always_inline u32
+bd_is_valid (l2_bridge_domain_t * bd_config)
+{
+  return (bd_config->feature_bitmap != 0);
+}
+
+/* Init bridge domain if not done already */
+void bd_validate (l2_bridge_domain_t * bd_config);
+
+
+void
+bd_add_member (l2_bridge_domain_t * bd_config, l2_flood_member_t * member);
+
+u32 bd_remove_member (l2_bridge_domain_t * bd_config, u32 sw_if_index);
+
+
+#define L2_LEARN   (1<<0)
+#define L2_FWD     (1<<1)
+#define L2_FLOOD   (1<<2)
+#define L2_UU_FLOOD (1<<3)
+#define L2_ARP_TERM (1<<4)
+
+u32 bd_set_flags (vlib_main_t * vm, u32 bd_index, u32 flags, u32 enable);
+void bd_set_mac_age (vlib_main_t * vm, u32 bd_index, u8 age);
+
+/**
+ * \brief Get or create a bridge domain.
+ *
+ * Get or create a bridge domain with the given bridge domain ID.
+ *
+ * \param bdm bd_main pointer.
+ * \param bd_id The bridge domain ID or ~0 if an arbitrary unused bridge domain should be used.
+ * \return The bridge domain index in \c l2input_main->l2_bridge_domain_t vector.
+ */
+u32 bd_find_or_add_bd_index (bd_main_t * bdm, u32 bd_id);
+
+/**
+ * \brief Delete a bridge domain.
+ *
+ * Delete an existing bridge domain with the given bridge domain ID.
+ *
+ * \param bdm bd_main pointer.
+ * \param bd_id The bridge domain ID.
+ * \return 0 on success and -1 if the bridge domain does not exist.
+ */
+int bd_delete_bd_index (bd_main_t * bdm, u32 bd_id);
+
+u32 bd_add_del_ip_mac (u32 bd_index,
+		       u8 * ip_addr, u8 * mac_addr, u8 is_ip6, u8 is_add);
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_bvi.c b/src/vnet/l2/l2_bvi.c
new file mode 100644
index 00000000..f239743a
--- /dev/null
+++ b/src/vnet/l2/l2_bvi.c
@@ -0,0 +1,40 @@
+/*
+ * l2_bvi.c : layer 2 Bridged Virtual Interface
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/l2/l2_fwd.h>
+#include <vnet/l2/l2_flood.h>
+#include <vnet/l2/l2_bvi.h>
+
+
+/* Call the L2 nodes that need the ethertype mapping */
+void
+l2bvi_register_input_type (vlib_main_t * vm,
+			   ethernet_type_t type, u32 node_index)
+{
+  l2fwd_register_input_type (vm, type, node_index);
+  l2flood_register_input_type (vm, type, node_index);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_bvi.h b/src/vnet/l2/l2_bvi.h
new file mode 100644
index 00000000..dd1130a6
--- /dev/null
+++ b/src/vnet/l2/l2_bvi.h
@@ -0,0 +1,117 @@
+/*
+ * l2_bvi.h : layer 2 Bridged Virtual Interface
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_l2bvi_h
+#define included_l2bvi_h
+
+#include <vlib/vlib.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vppinfra/sparse_vec.h>
+
+#include <vnet/l2/l2_input.h>
+
+#define TO_BVI_ERR_OK        0
+#define TO_BVI_ERR_BAD_MAC   1
+#define TO_BVI_ERR_ETHERTYPE 2
+
+/**
+ * Send a packet from L2 processing to L3 via the BVI interface.
+ * Set next0 to the proper L3 input node.
+ * Return an error if the packet isn't what we expect.
+ */
+
+static_always_inline u32
+l2_to_bvi (vlib_main_t * vlib_main,
+	   vnet_main_t * vnet_main,
+	   vlib_buffer_t * b0,
+	   u32 bvi_sw_if_index, next_by_ethertype_t * l3_next, u32 * next0)
+{
+  u8 l2_len;
+  u16 ethertype;
+  u8 *l3h;
+  ethernet_header_t *e0;
+  vnet_hw_interface_t *hi;
+
+  e0 = vlib_buffer_get_current (b0);
+  hi = vnet_get_sup_hw_interface (vnet_main, bvi_sw_if_index);
+
+  /* Perform L3 my-mac filter */
+  if ((!ethernet_address_cast (e0->dst_address)) &&
+      (!eth_mac_equal ((u8 *) e0, hi->hw_address)))
+    {
+      return TO_BVI_ERR_BAD_MAC;
+    }
+
+  /* Save L2 header position which may be changed due to packet replication */
+  vnet_buffer (b0)->ethernet.start_of_ethernet_header = b0->current_data;
+
+  /* Strip L2 header */
+  l2_len = vnet_buffer (b0)->l2.l2_len;
+  vlib_buffer_advance (b0, l2_len);
+
+  l3h = vlib_buffer_get_current (b0);
+  ethertype = clib_net_to_host_u16 (*(u16 *) (l3h - 2));
+
+  /* Set the input interface to be the BVI interface */
+  vnet_buffer (b0)->sw_if_index[VLIB_RX] = bvi_sw_if_index;
+  vnet_buffer (b0)->sw_if_index[VLIB_TX] = ~0;
+
+  /* Go to appropriate L3 input node */
+  if (ethertype == ETHERNET_TYPE_IP4)
+    {
+      *next0 = l3_next->input_next_ip4;
+    }
+  else if (ethertype == ETHERNET_TYPE_IP6)
+    {
+      *next0 = l3_next->input_next_ip6;
+    }
+  else
+    {
+      /* uncommon ethertype, check table */
+      u32 i0;
+
+      i0 = sparse_vec_index (l3_next->input_next_by_type, ethertype);
+      *next0 = vec_elt (l3_next->input_next_by_type, i0);
+
+      if (i0 == SPARSE_VEC_INVALID_INDEX)
+	{
+	  return TO_BVI_ERR_ETHERTYPE;
+	}
+    }
+
+  /* increment BVI RX interface stat */
+  vlib_increment_combined_counter
+    (vnet_main->interface_main.combined_sw_if_counters
+     + VNET_INTERFACE_COUNTER_RX,
+     vlib_main->cpu_index,
+     vnet_buffer (b0)->sw_if_index[VLIB_RX],
+     1, vlib_buffer_length_in_chain (vlib_main, b0));
+  return TO_BVI_ERR_OK;
+}
+
+void
+l2bvi_register_input_type (vlib_main_t * vm,
+			   ethernet_type_t type, u32 node_index);
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_classify.h b/src/vnet/l2/l2_classify.h
new file mode 100644
index 00000000..184187ff
--- /dev/null
+++ b/src/vnet/l2/l2_classify.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __included_vnet_l2_input_classify_h__
+#define __included_vnet_l2_input_classify_h__
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/ip/ip_packet.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vlib/cli.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/l2_output.h>
+#include <vnet/l2/feat_bitmap.h>
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/cache.h>
+
+#include <vnet/classify/vnet_classify.h>
+
+typedef enum
+{
+  L2_INPUT_CLASSIFY_NEXT_DROP,
+  L2_INPUT_CLASSIFY_NEXT_ETHERNET_INPUT,
+  L2_INPUT_CLASSIFY_NEXT_IP4_INPUT,
+  L2_INPUT_CLASSIFY_NEXT_IP6_INPUT,
+  L2_INPUT_CLASSIFY_NEXT_LI,
+  L2_INPUT_CLASSIFY_N_NEXT,
+} l2_input_classify_next_t;
+
+typedef enum
+{
+  L2_INPUT_CLASSIFY_TABLE_IP4,
+  L2_INPUT_CLASSIFY_TABLE_IP6,
+  L2_INPUT_CLASSIFY_TABLE_OTHER,
+  L2_INPUT_CLASSIFY_N_TABLES,
+} l2_input_classify_table_id_t;
+
+typedef enum
+{
+  L2_OUTPUT_CLASSIFY_NEXT_DROP,
+  L2_OUTPUT_CLASSIFY_N_NEXT,
+} l2_output_classify_next_t;
+
+typedef enum
+{
+  L2_OUTPUT_CLASSIFY_TABLE_IP4,
+  L2_OUTPUT_CLASSIFY_TABLE_IP6,
+  L2_OUTPUT_CLASSIFY_TABLE_OTHER,
+  L2_OUTPUT_CLASSIFY_N_TABLES,
+} l2_output_classify_table_id_t;
+
+typedef struct _l2_classify_main
+{
+  /* Next nodes for each feature */
+  u32 feat_next_node_index[32];
+
+  /* Per-address-family classifier table vectors */
+  u32 *classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_N_TABLES];
+
+  /* Next nodes for features and output interfaces */
+  l2_output_next_nodes_st next_nodes;
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+  vnet_classify_main_t *vnet_classify_main;
+} l2_input_classify_main_t;
+
+typedef struct _l2_classify_main l2_output_classify_main_t;
+
+extern l2_input_classify_main_t l2_input_classify_main;
+extern vlib_node_registration_t l2_input_classify_node;
+
+extern l2_output_classify_main_t l2_output_classify_main;
+extern vlib_node_registration_t l2_output_classify_node;
+
+void vnet_l2_input_classify_enable_disable (u32 sw_if_index,
+					    int enable_disable);
+
+int vnet_l2_input_classify_set_tables (u32 sw_if_index, u32 ip4_table_index,
+				       u32 ip6_table_index,
+				       u32 other_table_index);
+
+void vnet_l2_output_classify_enable_disable (u32 sw_if_index,
+					     int enable_disable);
+
+int vnet_l2_output_classify_set_tables (u32 sw_if_index, u32 ip4_table_index,
+					u32 ip6_table_index,
+					u32 other_table_index);
+
+#endif /* __included_vnet_l2_input_classify_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_efp_filter.c b/src/vnet/l2/l2_efp_filter.c
new file mode 100644
index 00000000..2db4dc69
--- /dev/null
+++ b/src/vnet/l2/l2_efp_filter.c
@@ -0,0 +1,614 @@
+/*
+ * l2_efp_filter.c : layer 2 egress EFP Filter processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/l2/feat_bitmap.h>
+#include <vnet/l2/l2_output.h>
+#include <vnet/ethernet/ethernet.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/cache.h>
+
+/**
+ * @file
+ * @brief EFP-filter - Ethernet Flow Point Filter.
+ *
+ * It is possible to transmit a packet out a subinterface with VLAN tags
+ * that are not compatible with that subinterface. In other words, if that
+ * packet arrived on the output port, it would not be classified as coming
+ * from the output subinterface. This can happen in various ways: through
+ * misconfiguration, by putting subinterfaces with different VLAN encaps in
+ * the same bridge-domain, etc. The EFP Filter Check detects such packets
+ * and drops them. It consists of two checks, one that verifies the packet
+ * prior to output VLAN tag rewrite and one that verifies the packet after
+ * VLAN tag rewrite.
+ *
+ */
+typedef struct
+{
+
+  /* Next nodes for features and output interfaces */
+  l2_output_next_nodes_st next_nodes;
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} l2_efp_filter_main_t;
+
+
+typedef struct
+{
+  /* per-pkt trace data */
+  u8 src[6];
+  u8 dst[6];
+  u8 raw[12];			/* raw data (vlans) */
+  u32 sw_if_index;
+} l2_efp_filter_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_l2_efp_filter_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2_efp_filter_trace_t *t = va_arg (*args, l2_efp_filter_trace_t *);
+
+  s = format (s, "l2-output-vtr: sw_if_index %d dst %U src %U data "
+	      "%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+	      t->sw_if_index,
+	      format_ethernet_address, t->dst,
+	      format_ethernet_address, t->src,
+	      t->raw[0], t->raw[1], t->raw[2], t->raw[3], t->raw[4],
+	      t->raw[5], t->raw[6], t->raw[7], t->raw[8], t->raw[9],
+	      t->raw[10], t->raw[11]);
+  return s;
+}
+
+l2_efp_filter_main_t l2_efp_filter_main;
+
+static vlib_node_registration_t l2_efp_filter_node;
+
+#define foreach_l2_efp_filter_error			\
+_(L2_EFP_FILTER, "L2 EFP filter packets")		\
+_(DROP,          "L2 EFP filter post-rewrite drops")
+
+typedef enum
+{
+#define _(sym,str) L2_EFP_FILTER_ERROR_##sym,
+  foreach_l2_efp_filter_error
+#undef _
+    L2_EFP_FILTER_N_ERROR,
+} l2_efp_filter_error_t;
+
+static char *l2_efp_filter_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2_efp_filter_error
+#undef _
+};
+
+typedef enum
+{
+  L2_EFP_FILTER_NEXT_DROP,
+  L2_EFP_FILTER_N_NEXT,
+} l2_efp_filter_next_t;
+
+
+/**
+ *  Extract fields from the packet that will be used in interface
+ *  classification.
+ */
+static_always_inline void
+extract_keys (vnet_main_t * vnet_main,
+	      u32 sw_if_index0,
+	      vlib_buffer_t * b0,
+	      u32 * port_sw_if_index0,
+	      u16 * first_ethertype0,
+	      u16 * outer_id0, u16 * inner_id0, u32 * match_flags0)
+{
+  ethernet_header_t *e0;
+  ethernet_vlan_header_t *h0;
+  u32 tag_len;
+  u32 tag_num;
+
+  *port_sw_if_index0 =
+    vnet_get_sup_sw_interface (vnet_main, sw_if_index0)->sw_if_index;
+
+  e0 = vlib_buffer_get_current (b0);
+  h0 = (ethernet_vlan_header_t *) (e0 + 1);
+
+  *first_ethertype0 = clib_net_to_host_u16 (e0->type);
+  *outer_id0 = clib_net_to_host_u16 (h0[0].priority_cfi_and_id);
+  *inner_id0 = clib_net_to_host_u16 (h0[1].priority_cfi_and_id);
+
+  tag_len = vnet_buffer (b0)->l2.l2_len - sizeof (ethernet_header_t);
+  tag_num = tag_len / sizeof (ethernet_vlan_header_t);
+  *match_flags0 = eth_create_valid_subint_match_flags (tag_num);
+}
+
+/*
+ * EFP filtering is a basic switch feature which prevents an interface from
+ * transmitting a packet that doesn't match the interface's ingress match
+ * criteria. The check has two parts, one performed before egress vlan tag
+ * rewrite and one after.
+ *
+ * The pre-rewrite check insures the packet matches what an ingress packet looks
+ * like after going through the interface's ingress tag rewrite operation. Only
+ * pushed tags are compared. So:
+ * - if the ingress vlan tag rewrite pushes no tags (or is not enabled),
+ *   any packet passes the filter
+ * - if the ingress vlan tag rewrite pushes one tag,
+ *   the packet must have at least one tag, and the outer tag must match the pushed tag
+ * - if the ingress vlan tag rewrite pushes two tags,
+ *   the packet must have at least two tags, and the outer two tags must match the pushed tags
+ *
+ * The pre-rewrite check is performed in the l2-output node.
+ *
+ * The post-rewrite check insures the packet matches what an ingress packet looks
+ * like before going through the interface's ingress tag rewrite operation. It verifies
+ * that such a packet arriving on the wire at this port would be classified as arriving
+ * an input interface equal to the packet's output interface. This can be done by running
+ * the output packet's vlan tags and output port through the interface classification,
+ * and checking if the resulting interface matches the output interface.
+ *
+ * The post-rewrite check is performed here.
+ */
+
+static uword
+l2_efp_filter_node_fn (vlib_main_t * vm,
+		       vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  l2_efp_filter_next_t next_index;
+  l2_efp_filter_main_t *msm = &l2_efp_filter_main;
+  vlib_node_t *n = vlib_get_node (vm, l2_efp_filter_node.index);
+  u32 node_counter_base_index = n->error_heap_index;
+  vlib_error_main_t *em = &vm->error_main;
+  u32 cached_sw_if_index = ~0;
+  u32 cached_next_index = ~0;
+
+  /* invalidate cache to begin with */
+  cached_sw_if_index = ~0;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;	/* number of packets to process */
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      /* get space to enqueue frame to graph node "next_index" */
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 6 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+	  u32 sw_if_index0, sw_if_index1;
+	  u32 feature_bitmap0, feature_bitmap1;
+	  u16 first_ethertype0, first_ethertype1;
+	  u16 outer_id0, inner_id0, outer_id1, inner_id1;
+	  u32 match_flags0, match_flags1;
+	  u32 port_sw_if_index0, subint_sw_if_index0, port_sw_if_index1,
+	    subint_sw_if_index1;
+	  vnet_hw_interface_t *hi0, *hi1;
+	  main_intf_t *main_intf0, *main_intf1;
+	  vlan_intf_t *vlan_intf0, *vlan_intf1;
+	  qinq_intf_t *qinq_intf0, *qinq_intf1;
+	  u32 is_l20, is_l21;
+	  __attribute__ ((unused)) u32 matched0, matched1;
+	  u8 error0, error1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3, *p4, *p5;
+	    __attribute__ ((unused)) u32 sw_if_index2, sw_if_index3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+	    p4 = vlib_get_buffer (vm, from[4]);
+	    p5 = vlib_get_buffer (vm, from[5]);
+
+	    /* Prefetch the buffer header and packet for the N+2 loop iteration */
+	    vlib_prefetch_buffer_header (p4, LOAD);
+	    vlib_prefetch_buffer_header (p5, LOAD);
+
+	    CLIB_PREFETCH (p4->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p5->data, CLIB_CACHE_LINE_BYTES, STORE);
+
+	    /*
+	     * Prefetch the input config for the N+1 loop iteration
+	     * This depends on the buffer header above
+	     */
+	    sw_if_index2 = vnet_buffer (p2)->sw_if_index[VLIB_TX];
+	    sw_if_index3 = vnet_buffer (p3)->sw_if_index[VLIB_TX];
+	    /*
+	     * $$$ TODO
+	     * CLIB_PREFETCH (vec_elt_at_index(l2output_main.configs, sw_if_index2), CLIB_CACHE_LINE_BYTES, LOAD);
+	     * CLIB_PREFETCH (vec_elt_at_index(l2output_main.configs, sw_if_index3), CLIB_CACHE_LINE_BYTES, LOAD);
+	     */
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  /* bi is "buffer index", b is pointer to the buffer */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /* TX interface handles */
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_TX];
+
+	  /* process 2 packets */
+	  em->counters[node_counter_base_index +
+		       L2_EFP_FILTER_ERROR_L2_EFP_FILTER] += 2;
+
+	  /* Remove ourself from the feature bitmap */
+	  feature_bitmap0 =
+	    vnet_buffer (b0)->l2.feature_bitmap & ~L2OUTPUT_FEAT_EFP_FILTER;
+	  feature_bitmap1 =
+	    vnet_buffer (b1)->l2.feature_bitmap & ~L2OUTPUT_FEAT_EFP_FILTER;
+
+	  /* Determine next node */
+	  l2_output_dispatch (msm->vlib_main,
+			      msm->vnet_main,
+			      node,
+			      l2_efp_filter_node.index,
+			      &cached_sw_if_index,
+			      &cached_next_index,
+			      &msm->next_nodes,
+			      b0, sw_if_index0, feature_bitmap0, &next0);
+	  l2_output_dispatch (msm->vlib_main,
+			      msm->vnet_main,
+			      node,
+			      l2_efp_filter_node.index,
+			      &cached_sw_if_index,
+			      &cached_next_index,
+			      &msm->next_nodes,
+			      b1, sw_if_index1, feature_bitmap1, &next1);
+
+	  /* perform the efp filter check on two packets */
+
+	  extract_keys (msm->vnet_main,
+			sw_if_index0,
+			b0,
+			&port_sw_if_index0,
+			&first_ethertype0,
+			&outer_id0, &inner_id0, &match_flags0);
+
+	  extract_keys (msm->vnet_main,
+			sw_if_index1,
+			b1,
+			&port_sw_if_index1,
+			&first_ethertype1,
+			&outer_id1, &inner_id1, &match_flags1);
+
+	  eth_vlan_table_lookups (&ethernet_main,
+				  msm->vnet_main,
+				  port_sw_if_index0,
+				  first_ethertype0,
+				  outer_id0,
+				  inner_id0,
+				  &hi0,
+				  &main_intf0, &vlan_intf0, &qinq_intf0);
+
+	  eth_vlan_table_lookups (&ethernet_main,
+				  msm->vnet_main,
+				  port_sw_if_index1,
+				  first_ethertype1,
+				  outer_id1,
+				  inner_id1,
+				  &hi1,
+				  &main_intf1, &vlan_intf1, &qinq_intf1);
+
+	  matched0 = eth_identify_subint (hi0,
+					  b0,
+					  match_flags0,
+					  main_intf0,
+					  vlan_intf0,
+					  qinq_intf0,
+					  &subint_sw_if_index0,
+					  &error0, &is_l20);
+
+	  matched1 = eth_identify_subint (hi1,
+					  b1,
+					  match_flags1,
+					  main_intf1,
+					  vlan_intf1,
+					  qinq_intf1,
+					  &subint_sw_if_index1,
+					  &error1, &is_l21);
+
+	  if (PREDICT_FALSE (sw_if_index0 != subint_sw_if_index0))
+	    {
+	      /* Drop packet */
+	      next0 = L2_EFP_FILTER_NEXT_DROP;
+	      b0->error = node->errors[L2_EFP_FILTER_ERROR_DROP];
+	    }
+
+	  if (PREDICT_FALSE (sw_if_index1 != subint_sw_if_index1))
+	    {
+	      /* Drop packet */
+	      next1 = L2_EFP_FILTER_NEXT_DROP;
+	      b1->error = node->errors[L2_EFP_FILTER_ERROR_DROP];
+	    }
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  ethernet_header_t *h0 = vlib_buffer_get_current (b0);
+		  l2_efp_filter_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->sw_if_index = sw_if_index0;
+		  clib_memcpy (t->src, h0->src_address, 6);
+		  clib_memcpy (t->dst, h0->dst_address, 6);
+		  clib_memcpy (t->raw, &h0->type, sizeof (t->raw));
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  ethernet_header_t *h1 = vlib_buffer_get_current (b1);
+		  l2_efp_filter_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->sw_if_index = sw_if_index1;
+		  clib_memcpy (t->src, h1->src_address, 6);
+		  clib_memcpy (t->dst, h1->dst_address, 6);
+		  clib_memcpy (t->raw, &h1->type, sizeof (t->raw));
+		}
+	    }
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  /* if next0==next1==next_index then nothing special needs to be done */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 sw_if_index0;
+	  u32 feature_bitmap0;
+	  u16 first_ethertype0;
+	  u16 outer_id0, inner_id0;
+	  u32 match_flags0;
+	  u32 port_sw_if_index0, subint_sw_if_index0;
+	  vnet_hw_interface_t *hi0;
+	  main_intf_t *main_intf0;
+	  vlan_intf_t *vlan_intf0;
+	  qinq_intf_t *qinq_intf0;
+	  u32 is_l20;
+	  __attribute__ ((unused)) u32 matched0;
+	  u8 error0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+
+	  /* process 1 packet */
+	  em->counters[node_counter_base_index +
+		       L2_EFP_FILTER_ERROR_L2_EFP_FILTER] += 1;
+
+	  /* Remove ourself from the feature bitmap */
+	  feature_bitmap0 =
+	    vnet_buffer (b0)->l2.feature_bitmap & ~L2OUTPUT_FEAT_EFP_FILTER;
+
+	  /* Determine next node */
+	  l2_output_dispatch (msm->vlib_main,
+			      msm->vnet_main,
+			      node,
+			      l2_efp_filter_node.index,
+			      &cached_sw_if_index,
+			      &cached_next_index,
+			      &msm->next_nodes,
+			      b0, sw_if_index0, feature_bitmap0, &next0);
+
+	  /* perform the efp filter check on one packet */
+
+	  extract_keys (msm->vnet_main,
+			sw_if_index0,
+			b0,
+			&port_sw_if_index0,
+			&first_ethertype0,
+			&outer_id0, &inner_id0, &match_flags0);
+
+	  eth_vlan_table_lookups (&ethernet_main,
+				  msm->vnet_main,
+				  port_sw_if_index0,
+				  first_ethertype0,
+				  outer_id0,
+				  inner_id0,
+				  &hi0,
+				  &main_intf0, &vlan_intf0, &qinq_intf0);
+
+	  matched0 = eth_identify_subint (hi0,
+					  b0,
+					  match_flags0,
+					  main_intf0,
+					  vlan_intf0,
+					  qinq_intf0,
+					  &subint_sw_if_index0,
+					  &error0, &is_l20);
+
+	  if (PREDICT_FALSE (sw_if_index0 != subint_sw_if_index0))
+	    {
+	      /* Drop packet */
+	      next0 = L2_EFP_FILTER_NEXT_DROP;
+	      b0->error = node->errors[L2_EFP_FILTER_ERROR_DROP];
+	    }
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      ethernet_header_t *h0 = vlib_buffer_get_current (b0);
+	      l2_efp_filter_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = sw_if_index0;
+	      clib_memcpy (t->src, h0->src_address, 6);
+	      clib_memcpy (t->dst, h0->dst_address, 6);
+	      clib_memcpy (t->raw, &h0->type, sizeof (t->raw));
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2_efp_filter_node,static) = {
+  .function = l2_efp_filter_node_fn,
+  .name = "l2-efp-filter",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2_efp_filter_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2_efp_filter_error_strings),
+  .error_strings = l2_efp_filter_error_strings,
+
+  .n_next_nodes = L2_EFP_FILTER_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+       [L2_EFP_FILTER_NEXT_DROP]  = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2_efp_filter_node, l2_efp_filter_node_fn)
+     clib_error_t *l2_efp_filter_init (vlib_main_t * vm)
+{
+  l2_efp_filter_main_t *mp = &l2_efp_filter_main;
+
+  mp->vlib_main = vm;
+  mp->vnet_main = vnet_get_main ();
+
+  /* Initialize the feature next-node indexes */
+  feat_bitmap_init_next_nodes (vm,
+			       l2_efp_filter_node.index,
+			       L2OUTPUT_N_FEAT,
+			       l2output_get_feat_names (),
+			       mp->next_nodes.feat_next_node_index);
+
+  /* Initialize the output node mapping table */
+  l2output_init_output_node_vec (&mp->next_nodes.output_node_index_vec);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2_efp_filter_init);
+
+
+/** Enable/disable the EFP Filter check on the subinterface. */
+void
+l2_efp_filter_configure (vnet_main_t * vnet_main, u32 sw_if_index, u32 enable)
+{
+  /* set the interface flag */
+  l2output_intf_bitmap_enable (sw_if_index, L2OUTPUT_FEAT_EFP_FILTER, enable);
+}
+
+
+/**
+ * Set subinterface egress efp filter enable/disable.
+ * The CLI format is:
+ *    set interface l2 efp-filter <interface> [disable]]
+ */
+static clib_error_t *
+int_l2_efp_filter (vlib_main_t * vm,
+		   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index;
+  u32 enable;
+
+  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  enable = 1;
+  if (unformat (input, "disable"))
+    {
+      enable = 0;
+    }
+
+  /* enable/disable the feature */
+  l2_efp_filter_configure (vnm, sw_if_index, enable);
+
+done:
+  return error;
+}
+
+
+/*?
+ * EFP filtering is a basic switch feature which prevents an interface from
+ * transmitting a packet that doesn't match the interface's ingress match
+ * criteria. The check has two parts, one performed before egress vlan tag
+ * rewrite and one after. This command enables or disables the EFP filtering
+ * for a given sub-interface.
+ *
+ * @cliexpar
+ * Example of how to enable a Layer 2 efp-filter on a sub-interface:
+ * @cliexcmd{set interface l2 efp-filter GigabitEthernet0/8/0.200}
+ * Example of how to disable a Layer 2 efp-filter on a sub-interface:
+ * @cliexcmd{set interface l2 efp-filter GigabitEthernet0/8/0.200 disable}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (int_l2_efp_filter_cli, static) = {
+  .path = "set interface l2 efp-filter",
+  .short_help = "set interface l2 efp-filter <interface> [disable]",
+  .function = int_l2_efp_filter,
+};
+/* *INDENT-ON* */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_efp_filter.h b/src/vnet/l2/l2_efp_filter.h
new file mode 100644
index 00000000..f40851df
--- /dev/null
+++ b/src/vnet/l2/l2_efp_filter.h
@@ -0,0 +1,33 @@
+/*
+ * l2_efp_filter.h : layer 2 egress EFP Filter processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef included_vnet_l2_efp_filter_h
+#define included_vnet_l2_efp_filter_h
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_fib.c b/src/vnet/l2/l2_fib.c
new file mode 100644
index 00000000..d34836e3
--- /dev/null
+++ b/src/vnet/l2/l2_fib.c
@@ -0,0 +1,857 @@
+/*
+ * l2_fib.c : layer 2 forwarding table (aka mac table)
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vlib/cli.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/l2_fib.h>
+#include <vnet/l2/l2_learn.h>
+#include <vnet/l2/l2_bd.h>
+
+#include <vppinfra/bihash_template.c>
+
+/**
+ * @file
+ * @brief Ethernet MAC Address FIB Table Management.
+ *
+ * The MAC Address forwarding table for bridge-domains is called the l2fib.
+ * Entries are added automatically as part of mac learning, but MAC Addresses
+ * entries can also be added manually.
+ *
+ */
+
+typedef struct
+{
+
+  /* hash table */
+  BVT (clib_bihash) mac_table;
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} l2fib_main_t;
+
+l2fib_main_t l2fib_main;
+
+
+/** Format sw_if_index. If the value is ~0, use the text "N/A" */
+u8 *
+format_vnet_sw_if_index_name_with_NA (u8 * s, va_list * args)
+{
+  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
+  u32 sw_if_index = va_arg (*args, u32);
+  if (sw_if_index == ~0)
+    return format (s, "N/A");
+  else
+    return format (s, "%U",
+		   format_vnet_sw_interface_name, vnm,
+		   vnet_get_sw_interface (vnm, sw_if_index));
+}
+
+void
+l2fib_table_dump (u32 bd_index, l2fib_entry_key_t ** l2fe_key,
+		  l2fib_entry_result_t ** l2fe_res)
+{
+  l2fib_main_t *msm = &l2fib_main;
+  BVT (clib_bihash) * h = &msm->mac_table;
+  clib_bihash_bucket_t *b;
+  BVT (clib_bihash_value) * v;
+  l2fib_entry_key_t key;
+  l2fib_entry_result_t result;
+  int i, j, k;
+
+  for (i = 0; i < h->nbuckets; i++)
+    {
+      b = &h->buckets[i];
+      if (b->offset == 0)
+	continue;
+      v = BV (clib_bihash_get_value) (h, b->offset);
+      for (j = 0; j < (1 << b->log2_pages); j++)
+	{
+	  for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
+	    {
+	      if (v->kvp[k].key == ~0ULL && v->kvp[k].value == ~0ULL)
+		continue;
+
+	      key.raw = v->kvp[k].key;
+	      result.raw = v->kvp[k].value;
+
+	      if ((bd_index == ~0) || (bd_index == key.fields.bd_index))
+		{
+		  vec_add1 (*l2fe_key, key);
+		  vec_add1 (*l2fe_res, result);
+		}
+	    }
+	  v++;
+	}
+    }
+}
+
+/** Display the contents of the l2fib. */
+static clib_error_t *
+show_l2fib (vlib_main_t * vm,
+	    unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  bd_main_t *bdm = &bd_main;
+  l2fib_main_t *msm = &l2fib_main;
+  l2_bridge_domain_t *bd_config;
+  BVT (clib_bihash) * h = &msm->mac_table;
+  clib_bihash_bucket_t *b;
+  BVT (clib_bihash_value) * v;
+  l2fib_entry_key_t key;
+  l2fib_entry_result_t result;
+  u32 first_entry = 1;
+  u64 total_entries = 0;
+  int i, j, k;
+  u8 verbose = 0;
+  u8 raw = 0;
+  u32 bd_id, bd_index = ~0;
+  u8 now = (u8) (vlib_time_now (vm) / 60);
+  u8 *s = 0;
+
+  if (unformat (input, "raw"))
+    raw = 1;
+  else if (unformat (input, "verbose"))
+    verbose = 1;
+  else if (unformat (input, "bd_index %d", &bd_index))
+    verbose = 1;
+  else if (unformat (input, "bd_id %d", &bd_id))
+    {
+      uword *p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+      if (p)
+	{
+	  verbose = 1;
+	  bd_index = p[0];
+	}
+      else
+	{
+	  vlib_cli_output (vm, "no such bridge domain id");
+	  return 0;
+	}
+    }
+
+  for (i = 0; i < h->nbuckets; i++)
+    {
+      b = &h->buckets[i];
+      if (b->offset == 0)
+	continue;
+      v = BV (clib_bihash_get_value) (h, b->offset);
+      for (j = 0; j < (1 << b->log2_pages); j++)
+	{
+	  for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
+	    {
+	      if (v->kvp[k].key == ~0ULL && v->kvp[k].value == ~0ULL)
+		continue;
+
+	      if (verbose && first_entry)
+		{
+		  first_entry = 0;
+		  vlib_cli_output (vm,
+				   "%=19s%=7s%=30s%=7s%=8s%=8s%=5s%=16s",
+				   "Mac Address", "BD Idx", "Interface",
+				   "Index", "static", "filter", "bvi",
+				   "Mac Age (min)");
+		}
+
+	      key.raw = v->kvp[k].key;
+	      result.raw = v->kvp[k].value;
+
+	      if (verbose
+		  & ((bd_index >> 31) || (bd_index == key.fields.bd_index)))
+		{
+		  bd_config = vec_elt_at_index (l2input_main.bd_configs,
+						key.fields.bd_index);
+
+		  if (bd_config->mac_age)
+		    {
+		      i16 delta = now - result.fields.timestamp;
+		      delta += delta < 0 ? 256 : 0;
+		      s = format (s, "%d", delta);
+		    }
+		  else
+		    s = format (s, "disabled");
+
+		  vlib_cli_output (vm,
+				   "%=19U%=7d%=30U%=7d%=8d%=8d%=5d%=16v",
+				   format_ethernet_address, key.fields.mac,
+				   key.fields.bd_index,
+				   format_vnet_sw_if_index_name_with_NA,
+				   msm->vnet_main, result.fields.sw_if_index,
+				   result.fields.sw_if_index == ~0
+				   ? -1 : result.fields.sw_if_index,
+				   result.fields.static_mac,
+				   result.fields.filter,
+				   result.fields.bvi, s);
+		  vec_reset_length (s);
+		}
+	      total_entries++;
+	    }
+	  v++;
+	}
+    }
+
+  if (total_entries == 0)
+    vlib_cli_output (vm, "no l2fib entries");
+  else
+    vlib_cli_output (vm, "%lld l2fib entries", total_entries);
+
+  if (raw)
+    vlib_cli_output (vm, "Raw Hash Table:\n%U\n",
+		     BV (format_bihash), h, 1 /* verbose */ );
+
+  vec_free (s);
+  return 0;
+}
+
+/*?
+ * This command dispays the MAC Address entries of the L2 FIB table.
+ * Output can be filtered to just get the number of MAC Addresses or display
+ * each MAC Address for all bridge domains or just a single bridge domain.
+ *
+ * @cliexpar
+ * Example of how to display the number of MAC Address entries in the L2
+ * FIB table:
+ * @cliexstart{show l2fib}
+ * 3 l2fib entries
+ * @cliexend
+ * Example of how to display all the MAC Address entries in the L2
+ * FIB table:
+ * @cliexstart{show l2fib verbose}
+ *     Mac Address     BD Idx           Interface           Index  static  filter  bvi  refresh  timestamp
+ *  52:54:00:53:18:33    1      GigabitEthernet0/8/0.200      3       0       0     0      0         0
+ *  52:54:00:53:18:55    1      GigabitEthernet0/8/0.200      3       1       0     0      0         0
+ *  52:54:00:53:18:77    1                 N/A                -1      1       1     0      0         0
+ * 3 l2fib entries
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_l2fib_cli, static) = {
+  .path = "show l2fib",
+  .short_help = "show l2fib [verbose | bd_id <nn> | bd_index <nn> | raw]",
+  .function = show_l2fib,
+};
+/* *INDENT-ON* */
+
+
+/* Remove all entries from the l2fib */
+void
+l2fib_clear_table (uint keep_static)
+{
+  l2fib_main_t *mp = &l2fib_main;
+
+  if (keep_static)
+    {
+      /* TODO: remove only non-static entries */
+    }
+  else
+    {
+      /* Remove all entries */
+      BV (clib_bihash_free) (&mp->mac_table);
+      BV (clib_bihash_init) (&mp->mac_table, "l2fib mac table",
+			     L2FIB_NUM_BUCKETS, L2FIB_MEMORY_SIZE);
+    }
+
+  l2learn_main.global_learn_count = 0;
+}
+
+/** Clear all entries in L2FIB.
+ * @TODO: Later we may want a way to remove only the non-static entries
+ */
+static clib_error_t *
+clear_l2fib (vlib_main_t * vm,
+	     unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  l2fib_clear_table (0);
+  return 0;
+}
+
+/*?
+ * This command clears all the MAC Address entries from the L2 FIB table.
+ *
+ * @cliexpar
+ * Example of how to clear the L2 FIB Table:
+ * @cliexcmd{clear l2fib}
+ * Example to show the L2 FIB Table has been cleared:
+ * @cliexstart{show l2fib verbose}
+ * no l2fib entries
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (clear_l2fib_cli, static) = {
+  .path = "clear l2fib",
+  .short_help = "clear l2fib",
+  .function = clear_l2fib,
+};
+/* *INDENT-ON* */
+
+
+/**
+ * Add an entry to the l2fib.
+ * If the entry already exists then overwrite it
+ */
+void
+l2fib_add_entry (u64 mac,
+		 u32 bd_index,
+		 u32 sw_if_index, u32 static_mac, u32 filter_mac, u32 bvi_mac)
+{
+  l2fib_entry_key_t key;
+  l2fib_entry_result_t result;
+  __attribute__ ((unused)) u32 bucket_contents;
+  l2fib_main_t *mp = &l2fib_main;
+  BVT (clib_bihash_kv) kv;
+
+  /* set up key */
+  key.raw = l2fib_make_key ((u8 *) & mac, bd_index);
+
+  /* set up result */
+  result.raw = 0;		/* clear all fields */
+  result.fields.sw_if_index = sw_if_index;
+  result.fields.static_mac = static_mac;
+  result.fields.filter = filter_mac;
+  result.fields.bvi = bvi_mac;
+
+  kv.key = key.raw;
+  kv.value = result.raw;
+
+  BV (clib_bihash_add_del) (&mp->mac_table, &kv, 1 /* is_add */ );
+
+  /* increment counter if dynamically learned mac */
+  if (result.fields.static_mac)
+    {
+      l2learn_main.global_learn_count++;
+    }
+}
+
+/**
+ * Add an entry to the L2FIB.
+ * The CLI format is:
+ *    l2fib add <mac> <bd> <intf> [static] [bvi]
+ *    l2fib add <mac> <bd> filter
+ * Note that filter and bvi entries are always static
+ */
+static clib_error_t *
+l2fib_add (vlib_main_t * vm,
+	   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  bd_main_t *bdm = &bd_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u64 mac;
+  u32 bd_id;
+  u32 bd_index;
+  u32 sw_if_index = ~0;
+  u32 filter_mac = 0;
+  u32 static_mac = 0;
+  u32 bvi_mac = 0;
+  uword *p;
+
+  if (!unformat_user (input, unformat_ethernet_address, &mac))
+    {
+      error = clib_error_return (0, "expected mac address `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  if (!unformat (input, "%d", &bd_id))
+    {
+      error = clib_error_return (0, "expected bridge domain ID `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+  if (!p)
+    {
+      error = clib_error_return (0, "bridge domain ID %d invalid", bd_id);
+      goto done;
+    }
+  bd_index = p[0];
+
+  if (unformat (input, "filter"))
+    {
+      filter_mac = 1;
+      static_mac = 1;
+
+    }
+  else
+    {
+
+      if (!unformat_user
+	  (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+	{
+	  error = clib_error_return (0, "unknown interface `%U'",
+				     format_unformat_error, input);
+	  goto done;
+	}
+      if (unformat (input, "static"))
+	{
+	  static_mac = 1;
+	}
+      else if (unformat (input, "bvi"))
+	{
+	  bvi_mac = 1;
+	  static_mac = 1;
+	}
+    }
+
+  l2fib_add_entry (mac, bd_index, sw_if_index, static_mac, filter_mac,
+		   bvi_mac);
+
+done:
+  return error;
+}
+
+/*?
+ * This command adds a MAC Address entry to the L2 FIB table
+ * of an existing bridge-domain. The MAC Address can be static
+ * or dynamic. This command also allows a filter to be added,
+ * such that packets with given MAC Addresses (source mac or
+ * destination mac match) are dropped.
+ *
+ * @cliexpar
+ * Example of how to add a dynamic MAC Address entry to the L2 FIB table
+ * of a bridge-domain (where 200 is the bridge-domain-id):
+ * @cliexcmd{l2fib add 52:54:00:53:18:33 200 GigabitEthernet0/8/0.200}
+ * Example of how to add a static MAC Address entry to the L2 FIB table
+ * of a bridge-domain (where 200 is the bridge-domain-id):
+ * @cliexcmd{l2fib add 52:54:00:53:18:55 200 GigabitEthernet0/8/0.200 static}
+ * Example of how to add a filter such that a packet with the given MAC
+ * Address will be dropped in a given bridge-domain (where 200 is the
+ * bridge-domain-id):
+ * @cliexcmd{l2fib add 52:54:00:53:18:77 200 filter}
+ * Example of show command of the provisioned MAC Addresses and filters:
+ * @cliexstart{show l2fib verbose}
+ *     Mac Address     BD Idx           Interface           Index  static  filter  bvi  refresh  timestamp
+ *  52:54:00:53:18:33    1      GigabitEthernet0/8/0.200      3       0       0     0      0         0
+ *  52:54:00:53:18:55    1      GigabitEthernet0/8/0.200      3       1       0     0      0         0
+ *  52:54:00:53:18:77    1                 N/A                -1      1       1     0      0         0
+ * 3 l2fib entries
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (l2fib_add_cli, static) = {
+  .path = "l2fib add",
+  .short_help = "l2fib add <mac> <bridge-domain-id> filter | <intf> [static | bvi]",
+  .function = l2fib_add,
+};
+/* *INDENT-ON* */
+
+
+static clib_error_t *
+l2fib_test_command_fn (vlib_main_t * vm,
+		       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  clib_error_t *error = 0;
+  u64 mac, save_mac;
+  u32 bd_index = 0;
+  u32 sw_if_index = 8;
+  u32 filter_mac = 0;
+  u32 bvi_mac = 0;
+  u32 is_add = 0;
+  u32 is_del = 0;
+  u32 is_check = 0;
+  u32 count = 1;
+  int mac_set = 0;
+  int i;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "mac %U", unformat_ethernet_address, &mac))
+	mac_set = 1;
+      else if (unformat (input, "add"))
+	is_add = 1;
+      else if (unformat (input, "del"))
+	is_del = 1;
+      else if (unformat (input, "check"))
+	is_check = 1;
+      else if (unformat (input, "count %d", &count))
+	;
+      else
+	break;
+    }
+
+  if (mac_set == 0)
+    return clib_error_return (0, "mac not set");
+
+  if (is_add == 0 && is_del == 0 && is_check == 0)
+    return clib_error_return (0,
+			      "noop: pick at least one of (add,del,check)");
+
+  save_mac = mac;
+
+  if (is_add)
+    {
+      for (i = 0; i < count; i++)
+	{
+	  u64 tmp;
+	  l2fib_add_entry (mac, bd_index, sw_if_index, mac,
+			   filter_mac, bvi_mac);
+	  tmp = clib_net_to_host_u64 (mac);
+	  tmp >>= 16;
+	  tmp++;
+	  tmp <<= 16;
+	  mac = clib_host_to_net_u64 (tmp);
+	}
+    }
+
+  if (is_check)
+    {
+      BVT (clib_bihash_kv) kv;
+      l2fib_main_t *mp = &l2fib_main;
+
+      mac = save_mac;
+
+      for (i = 0; i < count; i++)
+	{
+	  u64 tmp;
+	  kv.key = l2fib_make_key ((u8 *) & mac, bd_index);
+	  if (BV (clib_bihash_search) (&mp->mac_table, &kv, &kv))
+	    {
+	      clib_warning ("key %U AWOL", format_ethernet_address, &mac);
+	      break;
+	    }
+	  tmp = clib_net_to_host_u64 (mac);
+	  tmp >>= 16;
+	  tmp++;
+	  tmp <<= 16;
+	  mac = clib_host_to_net_u64 (tmp);
+	}
+    }
+
+  if (is_del)
+    {
+      for (i = 0; i < count; i++)
+	{
+	  u64 tmp;
+
+	  l2fib_del_entry (mac, bd_index);
+
+	  tmp = clib_net_to_host_u64 (mac);
+	  tmp >>= 16;
+	  tmp++;
+	  tmp <<= 16;
+	  mac = clib_host_to_net_u64 (tmp);
+	}
+    }
+
+  return error;
+}
+
+/*?
+ * The set of '<em>test l2fib</em>' commands allow the L2 FIB table of the default
+ * bridge domain (bridge-domain-id of 0) to be modified.
+ *
+ * @cliexpar
+ * @parblock
+ * Example of how to add a set of 4 sequential MAC Address entries to L2
+ * FIB table of the default bridge-domain:
+ * @cliexcmd{test l2fib add mac 52:54:00:53:00:00 count 4}
+ *
+ * Show the set of 4 sequential MAC Address entries that were added:
+ * @cliexstart{show l2fib verbose}
+ *     Mac Address     BD Idx           Interface           Index  static  filter  bvi  refresh  timestamp
+ * 52:54:00:53:00:00    0       GigabitEthernet0/8/0.300     8       0       0     0      0         0
+ * 52:54:00:53:00:01    0       GigabitEthernet0/8/0.300     8       0       0     0      0         0
+ * 52:54:00:53:00:03    0       GigabitEthernet0/8/0.300     8       0       0     0      0         0
+ * 52:54:00:53:00:02    0       GigabitEthernet0/8/0.300     8       0       0     0      0         0
+ * 4 l2fib entries
+ * @cliexend
+ *
+ * Example of how to check that the set of 4 sequential MAC Address
+ * entries were added to L2 FIB table of the default
+ * bridge-domain. Used a count of 5 to produce an error:
+ *
+ * @cliexcmd{test l2fib check mac 52:54:00:53:00:00 count 5}
+ * The output of the check command is in the log files. Log file
+ * location may vary based on your OS and Version:
+ *
+ * <b><em># tail -f /var/log/messages | grep l2fib_test_command_fn</em></b>
+ *
+ * Sep  7 17:15:24 localhost vnet[4952]: l2fib_test_command_fn:446: key 52:54:00:53:00:04 AWOL
+ *
+ * Example of how to delete a set of 4 sequential MAC Address entries
+ * from L2 FIB table of the default bridge-domain:
+ * @cliexcmd{test l2fib del mac 52:54:00:53:00:00 count 4}
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (l2fib_test_command, static) = {
+  .path = "test l2fib",
+  .short_help = "test l2fib [add|del|check] mac <base-addr> count <nn>",
+  .function = l2fib_test_command_fn,
+};
+/* *INDENT-ON* */
+
+
+/**
+ * Delete an entry from the l2fib.
+ * Return 0 if the entry was deleted, or 1 if it was not found
+ */
+u32
+l2fib_del_entry (u64 mac, u32 bd_index)
+{
+
+  l2fib_entry_result_t result;
+  l2fib_main_t *mp = &l2fib_main;
+  BVT (clib_bihash_kv) kv;
+
+  /* set up key */
+  kv.key = l2fib_make_key ((u8 *) & mac, bd_index);
+
+  if (BV (clib_bihash_search) (&mp->mac_table, &kv, &kv))
+    return 1;
+
+  result.raw = kv.value;
+
+  /* decrement counter if dynamically learned mac */
+  if (result.fields.static_mac)
+    {
+      if (l2learn_main.global_learn_count > 0)
+	{
+	  l2learn_main.global_learn_count--;
+	}
+    }
+
+  /* Remove entry from hash table */
+  BV (clib_bihash_add_del) (&mp->mac_table, &kv, 0 /* is_add */ );
+  return 0;
+}
+
+/**
+ * Delete an entry from the L2FIB.
+ * The CLI format is:
+ *    l2fib del <mac> <bd-id>
+ */
+static clib_error_t *
+l2fib_del (vlib_main_t * vm,
+	   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  bd_main_t *bdm = &bd_main;
+  clib_error_t *error = 0;
+  u64 mac;
+  u32 bd_id;
+  u32 bd_index;
+  uword *p;
+
+  if (!unformat_user (input, unformat_ethernet_address, &mac))
+    {
+      error = clib_error_return (0, "expected mac address `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  if (!unformat (input, "%d", &bd_id))
+    {
+      error = clib_error_return (0, "expected bridge domain ID `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+  if (!p)
+    {
+      error = clib_error_return (0, "bridge domain ID %d invalid", bd_id);
+      goto done;
+    }
+  bd_index = p[0];
+
+  /* Delete the entry */
+  if (l2fib_del_entry (mac, bd_index))
+    {
+      error = clib_error_return (0, "mac entry not found");
+      goto done;
+    }
+
+done:
+  return error;
+}
+
+/*?
+ * This command deletes an existing MAC Address entry from the L2 FIB
+ * table of an existing bridge-domain.
+ *
+ * @cliexpar
+ * Example of how to delete a MAC Address entry from the L2 FIB table of a bridge-domain (where 200 is the bridge-domain-id):
+ * @cliexcmd{l2fib del 52:54:00:53:18:33 200}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (l2fib_del_cli, static) = {
+  .path = "l2fib del",
+  .short_help = "l2fib del <mac> <bridge-domain-id>",
+  .function = l2fib_del,
+};
+/* *INDENT-ON* */
+
+
+BVT (clib_bihash) * get_mac_table (void)
+{
+  l2fib_main_t *mp = &l2fib_main;
+  return &mp->mac_table;
+}
+
+static uword
+l2fib_mac_age_scanner_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
+			       vlib_frame_t * f)
+{
+  uword event_type, *event_data = 0;
+  l2fib_main_t *msm = &l2fib_main;
+  l2_bridge_domain_t *bd_config;
+  BVT (clib_bihash) * h = &msm->mac_table;
+  clib_bihash_bucket_t *b;
+  BVT (clib_bihash_value) * v;
+  l2fib_entry_key_t key;
+  l2fib_entry_result_t result;
+  int i, j, k;
+  bool enabled = 0;
+  f64 start_time, last_run_duration = 0, t;
+  i16 delta;
+
+  while (1)
+    {
+      if (enabled)
+	vlib_process_wait_for_event_or_clock (vm, 60 - last_run_duration);
+      else
+	vlib_process_wait_for_event (vm);
+
+      event_type = vlib_process_get_events (vm, &event_data);
+      vec_reset_length (event_data);
+
+      switch (event_type)
+	{
+	case ~0:
+	  break;
+	case L2_MAC_AGE_PROCESS_EVENT_START:
+	  enabled = 1;
+	  break;
+	case L2_MAC_AGE_PROCESS_EVENT_STOP:
+	  enabled = 0;
+	  continue;
+	default:
+	  ASSERT (0);
+	}
+      last_run_duration = start_time = vlib_time_now (vm);
+      for (i = 0; i < h->nbuckets; i++)
+	{
+	  /* Allow no more than 10us without a pause */
+	  t = vlib_time_now (vm);
+	  if (t > start_time + 10e-6)
+	    {
+	      vlib_process_suspend (vm, 100e-6);	/* suspend for 100 us */
+	      start_time = vlib_time_now (vm);
+	    }
+
+	  if (i < (h->nbuckets - 3))
+	    {
+	      b = &h->buckets[i + 3];
+	      CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD);
+	      b = &h->buckets[i + 1];
+	      if (b->offset)
+		{
+		  v = BV (clib_bihash_get_value) (h, b->offset);
+		  CLIB_PREFETCH (v, CLIB_CACHE_LINE_BYTES, LOAD);
+		}
+	    }
+
+	  b = &h->buckets[i];
+	  if (b->offset == 0)
+	    continue;
+	  v = BV (clib_bihash_get_value) (h, b->offset);
+	  for (j = 0; j < (1 << b->log2_pages); j++)
+	    {
+	      for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
+		{
+		  if (v->kvp[k].key == ~0ULL && v->kvp[k].value == ~0ULL)
+		    continue;
+
+		  key.raw = v->kvp[k].key;
+		  result.raw = v->kvp[k].value;
+
+		  if (result.fields.static_mac)
+		    continue;
+
+		  bd_config = vec_elt_at_index (l2input_main.bd_configs,
+						key.fields.bd_index);
+
+		  if (bd_config->mac_age == 0)
+		    continue;
+
+		  delta = (u8) (start_time / 60) - result.fields.timestamp;
+		  delta += delta < 0 ? 256 : 0;
+
+		  if (delta > bd_config->mac_age)
+		    {
+		      void *p = &key.fields.mac;
+		      l2fib_del_entry (*(u64 *) p, key.fields.bd_index);
+		    }
+		}
+	      v++;
+	    }
+	}
+      last_run_duration = vlib_time_now (vm) - last_run_duration;
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2fib_mac_age_scanner_process_node) = {
+    .function = l2fib_mac_age_scanner_process,
+    .type = VLIB_NODE_TYPE_PROCESS,
+    .name = "l2fib-mac-age-scanner-process",
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+l2fib_init (vlib_main_t * vm)
+{
+  l2fib_main_t *mp = &l2fib_main;
+  l2fib_entry_key_t test_key;
+  u8 test_mac[6];
+
+  mp->vlib_main = vm;
+  mp->vnet_main = vnet_get_main ();
+
+  /* Create the hash table  */
+  BV (clib_bihash_init) (&mp->mac_table, "l2fib mac table",
+			 L2FIB_NUM_BUCKETS, L2FIB_MEMORY_SIZE);
+
+  /* verify the key constructor is good, since it is endian-sensitive */
+  memset (test_mac, 0, sizeof (test_mac));
+  test_mac[0] = 0x11;
+  test_key.raw = 0;
+  test_key.raw = l2fib_make_key ((u8 *) & test_mac, 0x1234);
+  ASSERT (test_key.fields.mac[0] == 0x11);
+  ASSERT (test_key.fields.bd_index == 0x1234);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2fib_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_fib.h b/src/vnet/l2/l2_fib.h
new file mode 100644
index 00000000..4a2da59b
--- /dev/null
+++ b/src/vnet/l2/l2_fib.h
@@ -0,0 +1,341 @@
+/*
+ * l2_fib.h : layer 2 forwarding table (aka mac table)
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_l2fib_h
+#define included_l2fib_h
+
+#include <vlib/vlib.h>
+#include <vppinfra/bihash_8_8.h>
+
+/*
+ * The size of the hash table
+ */
+#define L2FIB_NUM_BUCKETS (64 * 1024)
+#define L2FIB_MEMORY_SIZE (256<<20)
+
+/*
+ * The L2fib key is the mac address and bridge domain ID
+ */
+typedef struct
+{
+  union
+  {
+    struct
+    {
+      u16 bd_index;
+      u8 mac[6];
+    } fields;
+    struct
+    {
+      u32 w0;
+      u32 w1;
+    } words;
+    u64 raw;
+  };
+} l2fib_entry_key_t;
+
+STATIC_ASSERT_SIZEOF (l2fib_entry_key_t, 8);
+
+/*
+ * The l2fib entry results
+ */
+typedef struct
+{
+  union
+  {
+    struct
+    {
+      u32 sw_if_index;		/* output sw_if_index (L3 interface if bvi==1) */
+
+      u8 static_mac:1;		/* static mac, no dataplane learning */
+      u8 bvi:1;			/* mac is for a bridged virtual interface */
+      u8 filter:1;		/* drop packets to/from this mac */
+      u8 unused1:5;
+      u8 timestamp;		/* timestamp for aging */
+      u16 unused2;
+    } fields;
+    u64 raw;
+  };
+} l2fib_entry_result_t;
+
+STATIC_ASSERT_SIZEOF (l2fib_entry_result_t, 8);
+
+/**
+ * Compute the hash for the given key and return
+ * the corresponding bucket index
+ */
+always_inline u32
+l2fib_compute_hash_bucket (l2fib_entry_key_t * key)
+{
+  u32 result;
+  u32 temp_a;
+  u32 temp_b;
+
+  result = 0xa5a5a5a5;		/* some seed */
+  temp_a = key->words.w0;
+  temp_b = key->words.w1;
+  hash_mix32 (temp_a, temp_b, result);
+
+  return result % L2FIB_NUM_BUCKETS;
+}
+
+always_inline u64
+l2fib_make_key (u8 * mac_address, u16 bd_index)
+{
+  u64 temp;
+
+  /*
+   * The mac address in memory is A:B:C:D:E:F
+   * The bd id in register is H:L
+   */
+#if CLIB_ARCH_IS_LITTLE_ENDIAN
+  /*
+   * Create the in-register key as F:E:D:C:B:A:H:L
+   * In memory the key is L:H:A:B:C:D:E:F
+   */
+  temp = *((u64 *) (mac_address)) << 16;
+  temp = (temp & ~0xffff) | (u64) (bd_index);
+#else
+  /*
+   * Create the in-register key as H:L:A:B:C:D:E:F
+   * In memory the key is H:L:A:B:C:D:E:F
+   */
+  temp = *((u64 *) (mac_address)) >> 16;
+  temp = temp | (((u64) bd_index) << 48);
+#endif
+
+  return temp;
+}
+
+
+
+/**
+ * Lookup the entry for mac and bd_index in the mac table for 1 packet.
+ * Cached_key and cached_result are used as a one-entry cache.
+ * The function reads and updates them as needed.
+ *
+ * mac0 and bd_index0 are the keys. The entry is written to result0.
+ * If the entry was not found, result0 is set to ~0.
+ *
+ * key0 and bucket0 return with the computed key and hash bucket,
+ * convenient if the entry needs to be updated afterward.
+ * If the cached_result was used, bucket0 is set to ~0.
+ */
+
+static_always_inline void
+l2fib_lookup_1 (BVT (clib_bihash) * mac_table,
+		l2fib_entry_key_t * cached_key,
+		l2fib_entry_result_t * cached_result,
+		u8 * mac0,
+		u16 bd_index0,
+		l2fib_entry_key_t * key0,
+		u32 * bucket0, l2fib_entry_result_t * result0)
+{
+  /* set up key */
+  key0->raw = l2fib_make_key (mac0, bd_index0);
+  *bucket0 = ~0;
+
+  if (key0->raw == cached_key->raw)
+    {
+      /* Hit in the one-entry cache */
+      result0->raw = cached_result->raw;
+    }
+  else
+    {
+      /* Do a regular mac table lookup */
+      BVT (clib_bihash_kv) kv;
+
+      kv.key = key0->raw;
+      kv.value = ~0ULL;
+      BV (clib_bihash_search_inline) (mac_table, &kv);
+      result0->raw = kv.value;
+
+      /* Update one-entry cache */
+      cached_key->raw = key0->raw;
+      cached_result->raw = result0->raw;
+    }
+}
+
+
+/**
+ * Lookup the entry for mac and bd_index in the mac table for 2 packets.
+ * The lookups for the two packets are interleaved.
+ *
+ * Cached_key and cached_result are used as a one-entry cache.
+ * The function reads and updates them as needed.
+ *
+ * mac0 and bd_index0 are the keys. The entry is written to result0.
+ * If the entry was not found, result0 is set to ~0. The same
+ * holds for mac1/bd_index1/result1.
+ */
+static_always_inline void
+l2fib_lookup_2 (BVT (clib_bihash) * mac_table,
+		l2fib_entry_key_t * cached_key,
+		l2fib_entry_result_t * cached_result,
+		u8 * mac0,
+		u8 * mac1,
+		u16 bd_index0,
+		u16 bd_index1,
+		l2fib_entry_key_t * key0,
+		l2fib_entry_key_t * key1,
+		u32 * bucket0,
+		u32 * bucket1,
+		l2fib_entry_result_t * result0,
+		l2fib_entry_result_t * result1)
+{
+  /* set up key */
+  key0->raw = l2fib_make_key (mac0, bd_index0);
+  key1->raw = l2fib_make_key (mac1, bd_index1);
+
+  if ((key0->raw == cached_key->raw) && (key1->raw == cached_key->raw))
+    {
+      /* Both hit in the one-entry cache */
+      result0->raw = cached_result->raw;
+      result1->raw = cached_result->raw;
+      *bucket0 = ~0;
+      *bucket1 = ~0;
+
+    }
+  else
+    {
+      BVT (clib_bihash_kv) kv0, kv1;
+
+      /*
+       * Do a regular mac table lookup
+       * Interleave lookups for packet 0 and packet 1
+       */
+      kv0.key = key0->raw;
+      kv1.key = key1->raw;
+      kv0.value = ~0ULL;
+      kv1.value = ~0ULL;
+
+      BV (clib_bihash_search_inline) (mac_table, &kv0);
+      BV (clib_bihash_search_inline) (mac_table, &kv1);
+
+      result0->raw = kv0.value;
+      result1->raw = kv1.value;
+
+      /* Update one-entry cache */
+      cached_key->raw = key1->raw;
+      cached_result->raw = result1->raw;
+    }
+}
+
+static_always_inline void
+l2fib_lookup_4 (BVT (clib_bihash) * mac_table,
+		l2fib_entry_key_t * cached_key,
+		l2fib_entry_result_t * cached_result,
+		u8 * mac0,
+		u8 * mac1,
+		u8 * mac2,
+		u8 * mac3,
+		u16 bd_index0,
+		u16 bd_index1,
+		u16 bd_index2,
+		u16 bd_index3,
+		l2fib_entry_key_t * key0,
+		l2fib_entry_key_t * key1,
+		l2fib_entry_key_t * key2,
+		l2fib_entry_key_t * key3,
+		u32 * bucket0,
+		u32 * bucket1,
+		u32 * bucket2,
+		u32 * bucket3,
+		l2fib_entry_result_t * result0,
+		l2fib_entry_result_t * result1,
+		l2fib_entry_result_t * result2,
+		l2fib_entry_result_t * result3)
+{
+  /* set up key */
+  key0->raw = l2fib_make_key (mac0, bd_index0);
+  key1->raw = l2fib_make_key (mac1, bd_index1);
+  key2->raw = l2fib_make_key (mac2, bd_index2);
+  key3->raw = l2fib_make_key (mac3, bd_index3);
+
+  if ((key0->raw == cached_key->raw) && (key1->raw == cached_key->raw) &&
+      (key2->raw == cached_key->raw) && (key3->raw == cached_key->raw))
+    {
+      /* Both hit in the one-entry cache */
+      result0->raw = cached_result->raw;
+      result1->raw = cached_result->raw;
+      result2->raw = cached_result->raw;
+      result3->raw = cached_result->raw;
+      *bucket0 = ~0;
+      *bucket1 = ~0;
+      *bucket2 = ~0;
+      *bucket3 = ~0;
+
+    }
+  else
+    {
+      BVT (clib_bihash_kv) kv0, kv1, kv2, kv3;
+
+      /*
+       * Do a regular mac table lookup
+       * Interleave lookups for packet 0 and packet 1
+       */
+      kv0.key = key0->raw;
+      kv1.key = key1->raw;
+      kv2.key = key2->raw;
+      kv3.key = key3->raw;
+      kv0.value = ~0ULL;
+      kv1.value = ~0ULL;
+      kv2.value = ~0ULL;
+      kv3.value = ~0ULL;
+
+      BV (clib_bihash_search_inline) (mac_table, &kv0);
+      BV (clib_bihash_search_inline) (mac_table, &kv1);
+      BV (clib_bihash_search_inline) (mac_table, &kv2);
+      BV (clib_bihash_search_inline) (mac_table, &kv3);
+
+      result0->raw = kv0.value;
+      result1->raw = kv1.value;
+      result2->raw = kv2.value;
+      result3->raw = kv3.value;
+
+      /* Update one-entry cache */
+      cached_key->raw = key1->raw;
+      cached_result->raw = result1->raw;
+    }
+}
+
+BVT (clib_bihash) * get_mac_table (void);
+     void
+     l2fib_clear_table (uint keep_static);
+     void
+     l2fib_add_entry (u64 mac,
+		      u32 bd_index,
+		      u32 sw_if_index,
+		      u32 static_mac, u32 drop_mac, u32 bvi_mac);
+u32
+l2fib_del_entry (u64 mac, u32 bd_index);
+
+     void
+       l2fib_table_dump (u32 bd_index, l2fib_entry_key_t ** l2fe_key,
+			 l2fib_entry_result_t ** l2fe_res);
+
+     u8 *format_vnet_sw_if_index_name_with_NA (u8 * s, va_list * args);
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_flood.c b/src/vnet/l2/l2_flood.c
new file mode 100644
index 00000000..ed9e5ac2
--- /dev/null
+++ b/src/vnet/l2/l2_flood.c
@@ -0,0 +1,568 @@
+/*
+ * l2_flood.c : layer 2 flooding
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vlib/cli.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/feat_bitmap.h>
+#include <vnet/l2/l2_bvi.h>
+#include <vnet/replication.h>
+#include <vnet/l2/l2_fib.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+
+
+/**
+ * @file
+ * @brief Ethernet Flooding.
+ *
+ * Flooding uses the packet replication infrastructure to send a copy of the
+ * packet to each member interface. Logically the replication infrastructure
+ * expects two graph nodes: a prep node that initiates replication and sends the
+ * packet to the first destination, and a recycle node that is passed the packet
+ * after it has been transmitted.
+ *
+ * To decrease the amount of code, l2 flooding implements both functions in
+ * the same graph node. This node can tell if is it being called as the "prep"
+ * or "recycle" using replication_is_recycled().
+ */
+
+
+typedef struct
+{
+
+  /* Next nodes for each feature */
+  u32 feat_next_node_index[32];
+
+  /* next node index for the L3 input node of each ethertype */
+  next_by_ethertype_t l3_next;
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} l2flood_main_t;
+
+typedef struct
+{
+  u8 src[6];
+  u8 dst[6];
+  u32 sw_if_index;
+  u16 bd_index;
+} l2flood_trace_t;
+
+
+/* packet trace format function */
+static u8 *
+format_l2flood_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2flood_trace_t *t = va_arg (*args, l2flood_trace_t *);
+
+  s = format (s, "l2-flood: sw_if_index %d dst %U src %U bd_index %d",
+	      t->sw_if_index,
+	      format_ethernet_address, t->dst,
+	      format_ethernet_address, t->src, t->bd_index);
+  return s;
+}
+
+l2flood_main_t l2flood_main;
+
+static vlib_node_registration_t l2flood_node;
+
+#define foreach_l2flood_error					\
+_(L2FLOOD,           "L2 flood packets")			\
+_(REPL_FAIL,         "L2 replication failures")			\
+_(NO_MEMBERS,        "L2 replication complete")			\
+_(BVI_BAD_MAC,       "BVI L3 mac mismatch")		        \
+_(BVI_ETHERTYPE,     "BVI packet with unhandled ethertype")
+
+typedef enum
+{
+#define _(sym,str) L2FLOOD_ERROR_##sym,
+  foreach_l2flood_error
+#undef _
+    L2FLOOD_N_ERROR,
+} l2flood_error_t;
+
+static char *l2flood_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2flood_error
+#undef _
+};
+
+typedef enum
+{
+  L2FLOOD_NEXT_L2_OUTPUT,
+  L2FLOOD_NEXT_DROP,
+  L2FLOOD_N_NEXT,
+} l2flood_next_t;
+
+/*
+ * Perform flooding on one packet
+ *
+ * Due to the way BVI processing can modify the packet, the BVI interface
+ * (if present) must be processed last in the replication. The member vector
+ * is arranged so that the BVI interface is always the first element.
+ * Flooding walks the vector in reverse.
+ *
+ * BVI processing causes the packet to go to L3 processing. This strips the
+ * L2 header, which is fine because the replication infrastructure restores
+ * it. However L3 processing can trigger larger changes to the packet. For
+ * example, an ARP request could be turned into an ARP reply, an ICMP request
+ * could be turned into an ICMP reply. If BVI processing is not performed
+ * last, the modified packet would be replicated to the remaining members.
+ */
+
+static_always_inline void
+l2flood_process (vlib_main_t * vm,
+		 vlib_node_runtime_t * node,
+		 l2flood_main_t * msm,
+		 u64 * counter_base,
+		 vlib_buffer_t * b0,
+		 u32 * sw_if_index0,
+		 l2fib_entry_key_t * key0,
+		 u32 * bucket0, l2fib_entry_result_t * result0, u32 * next0)
+{
+  u16 bd_index0;
+  l2_bridge_domain_t *bd_config;
+  l2_flood_member_t *members;
+  i32 current_member;		/* signed */
+  replication_context_t *ctx;
+  u8 in_shg = vnet_buffer (b0)->l2.shg;
+
+  if (!replication_is_recycled (b0))
+    {
+
+      /* Do flood "prep node" processing */
+
+      /* Get config for the bridge domain interface */
+      bd_index0 = vnet_buffer (b0)->l2.bd_index;
+      bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index0);
+      members = bd_config->members;
+
+      /* Find first member that passes the reflection and SHG checks */
+      current_member = bd_config->flood_count - 1;
+      while ((current_member >= 0) &&
+	     ((members[current_member].sw_if_index == *sw_if_index0) ||
+	      (in_shg && members[current_member].shg == in_shg)))
+	{
+	  current_member--;
+	}
+
+      if (current_member < 0)
+	{
+	  /* No members to flood to */
+	  *next0 = L2FLOOD_NEXT_DROP;
+	  b0->error = node->errors[L2FLOOD_ERROR_NO_MEMBERS];
+	  return;
+	}
+
+      if ((current_member > 0) &&
+	  ((current_member > 1) ||
+	   ((members[0].sw_if_index != *sw_if_index0) &&
+	    (!in_shg || members[0].shg != in_shg))))
+	{
+	  /* If more than one member then initiate replication */
+	  ctx =
+	    replication_prep (vm, b0, l2flood_node.index, 1 /* l2_packet */ );
+	  ctx->feature_replicas = (uword) members;
+	  ctx->feature_counter = current_member;
+	}
+
+    }
+  else
+    {
+      vnet_buffer_opaque_t *vnet_buff_op;
+
+      /* Do flood "recycle node" processing */
+
+      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_REPL_FAIL))
+	{
+	  (void) replication_recycle (vm, b0, 1 /* is_last */ );
+	  *next0 = L2FLOOD_NEXT_DROP;
+	  b0->error = node->errors[L2FLOOD_ERROR_REPL_FAIL];
+	  return;
+	}
+
+      ctx = replication_get_ctx (b0);
+      replication_clear_recycled (b0);
+
+      members = (l2_flood_member_t *) (intptr_t) ctx->feature_replicas;
+      current_member = (i32) ctx->feature_counter - 1;
+
+      /* Need to update input index from saved packet context */
+      vnet_buff_op = (vnet_buffer_opaque_t *) ctx->vnet_buffer;
+      *sw_if_index0 = vnet_buff_op->sw_if_index[VLIB_RX];
+
+      /* Find next member that passes the reflection and SHG check */
+      while ((current_member >= 0) &&
+	     ((members[current_member].sw_if_index == *sw_if_index0) ||
+	      (in_shg && members[current_member].shg == in_shg)))
+	{
+	  current_member--;
+	}
+
+      if (current_member < 0)
+	{
+	  /*
+	   * No more members to flood to.
+	   * Terminate replication and drop packet.
+	   */
+
+	  replication_recycle (vm, b0, 1 /* is_last */ );
+
+	  *next0 = L2FLOOD_NEXT_DROP;
+	  /* Ideally we woudn't bump a counter here, just silently complete */
+	  b0->error = node->errors[L2FLOOD_ERROR_NO_MEMBERS];
+	  return;
+	}
+
+      /* Restore packet and context and continue replication */
+      ctx->feature_counter = current_member;
+      replication_recycle (vm, b0, ((current_member == 0) ||	/*is_last */
+				    ((current_member == 1) &&
+				     ((members[0].sw_if_index ==
+				       *sw_if_index0) || (in_shg
+							  && members[0].shg ==
+							  in_shg)))));
+    }
+
+  /* Forward packet to the current member */
+  if (PREDICT_FALSE (members[current_member].flags & L2_FLOOD_MEMBER_BVI))
+    {
+      /* Do BVI processing */
+      u32 rc;
+      rc = l2_to_bvi (vm,
+		      msm->vnet_main,
+		      b0,
+		      members[current_member].sw_if_index,
+		      &msm->l3_next, next0);
+
+      if (PREDICT_FALSE (rc))
+	{
+	  if (rc == TO_BVI_ERR_BAD_MAC)
+	    {
+	      b0->error = node->errors[L2FLOOD_ERROR_BVI_BAD_MAC];
+	      *next0 = L2FLOOD_NEXT_DROP;
+	    }
+	  else if (rc == TO_BVI_ERR_ETHERTYPE)
+	    {
+	      b0->error = node->errors[L2FLOOD_ERROR_BVI_ETHERTYPE];
+	      *next0 = L2FLOOD_NEXT_DROP;
+	    }
+	}
+    }
+  else
+    {
+      /* Do normal L2 forwarding */
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] =
+	members[current_member].sw_if_index;
+      *next0 = L2FLOOD_NEXT_L2_OUTPUT;
+
+    }
+
+}
+
+
+static uword
+l2flood_node_fn (vlib_main_t * vm,
+		 vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  l2flood_next_t next_index;
+  l2flood_main_t *msm = &l2flood_main;
+  vlib_node_t *n = vlib_get_node (vm, l2flood_node.index);
+  u32 node_counter_base_index = n->error_heap_index;
+  vlib_error_main_t *em = &vm->error_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;	/* number of packets to process */
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      /* get space to enqueue frame to graph node "next_index" */
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 6 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+	  u32 sw_if_index0, sw_if_index1;
+	  l2fib_entry_key_t key0, key1;
+	  l2fib_entry_result_t result0, result1;
+	  u32 bucket0, bucket1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3, *p4, *p5;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+	    p4 = vlib_get_buffer (vm, from[4]);
+	    p5 = vlib_get_buffer (vm, from[5]);
+
+	    /* Prefetch the buffer header for the N+2 loop iteration */
+	    vlib_prefetch_buffer_header (p4, LOAD);
+	    vlib_prefetch_buffer_header (p5, LOAD);
+
+	    /* Prefetch the replication context for the N+1 loop iteration */
+	    /* This depends on the buffer header above */
+	    replication_prefetch_ctx (p2);
+	    replication_prefetch_ctx (p3);
+
+	    /* Prefetch the packet for the N+1 loop iteration */
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  /* bi is "buffer index", b is pointer to the buffer */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /* RX interface handles */
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+
+	  /* process 2 pkts */
+	  em->counters[node_counter_base_index + L2FLOOD_ERROR_L2FLOOD] += 2;
+
+	  l2flood_process (vm, node, msm,
+			   &em->counters[node_counter_base_index], b0,
+			   &sw_if_index0, &key0, &bucket0, &result0, &next0);
+
+	  l2flood_process (vm, node, msm,
+			   &em->counters[node_counter_base_index], b1,
+			   &sw_if_index1, &key1, &bucket1, &result1, &next1);
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+		{
+		  l2flood_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  ethernet_header_t *h0 = vlib_buffer_get_current (b0);
+		  t->sw_if_index = sw_if_index0;
+		  t->bd_index = vnet_buffer (b0)->l2.bd_index;
+		  clib_memcpy (t->src, h0->src_address, 6);
+		  clib_memcpy (t->dst, h0->dst_address, 6);
+		}
+	      if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
+		{
+		  l2flood_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  ethernet_header_t *h1 = vlib_buffer_get_current (b1);
+		  t->sw_if_index = sw_if_index1;
+		  t->bd_index = vnet_buffer (b1)->l2.bd_index;
+		  clib_memcpy (t->src, h1->src_address, 6);
+		  clib_memcpy (t->dst, h1->dst_address, 6);
+		}
+	    }
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  /* if next0==next1==next_index then nothing special needs to be done */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 sw_if_index0;
+	  l2fib_entry_key_t key0;
+	  l2fib_entry_result_t result0;
+	  u32 bucket0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+	  /* process 1 pkt */
+	  em->counters[node_counter_base_index + L2FLOOD_ERROR_L2FLOOD] += 1;
+
+	  l2flood_process (vm, node, msm,
+			   &em->counters[node_counter_base_index], b0,
+			   &sw_if_index0, &key0, &bucket0, &result0, &next0);
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&
+			     (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      l2flood_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+	      ethernet_header_t *h0 = vlib_buffer_get_current (b0);
+	      t->sw_if_index = sw_if_index0;
+	      t->bd_index = vnet_buffer (b0)->l2.bd_index;
+	      clib_memcpy (t->src, h0->src_address, 6);
+	      clib_memcpy (t->dst, h0->dst_address, 6);
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2flood_node,static) = {
+  .function = l2flood_node_fn,
+  .name = "l2-flood",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2flood_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2flood_error_strings),
+  .error_strings = l2flood_error_strings,
+
+  .n_next_nodes = L2FLOOD_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+        [L2FLOOD_NEXT_L2_OUTPUT] = "l2-output",
+        [L2FLOOD_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2flood_node, l2flood_node_fn)
+     clib_error_t *l2flood_init (vlib_main_t * vm)
+{
+  l2flood_main_t *mp = &l2flood_main;
+
+  mp->vlib_main = vm;
+  mp->vnet_main = vnet_get_main ();
+
+  /* Initialize the feature next-node indexes */
+  feat_bitmap_init_next_nodes (vm,
+			       l2flood_node.index,
+			       L2INPUT_N_FEAT,
+			       l2input_get_feat_names (),
+			       mp->feat_next_node_index);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2flood_init);
+
+
+
+/** Add the L3 input node for this ethertype to the next nodes structure. */
+void
+l2flood_register_input_type (vlib_main_t * vm,
+			     ethernet_type_t type, u32 node_index)
+{
+  l2flood_main_t *mp = &l2flood_main;
+  u32 next_index;
+
+  next_index = vlib_node_add_next (vm, l2flood_node.index, node_index);
+
+  next_by_ethertype_register (&mp->l3_next, type, next_index);
+}
+
+
+/**
+ * Set subinterface flood enable/disable.
+ * The CLI format is:
+ * set interface l2 flood <interface> [disable]
+ */
+static clib_error_t *
+int_flood (vlib_main_t * vm,
+	   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index;
+  u32 enable;
+
+  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  enable = 1;
+  if (unformat (input, "disable"))
+    {
+      enable = 0;
+    }
+
+  /* set the interface flag */
+  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_FLOOD, enable);
+
+done:
+  return error;
+}
+
+/*?
+ * Layer 2 flooding can be enabled and disabled on each
+ * interface and on each bridge-domain. Use this command to
+ * manage interfaces. It is enabled by default.
+ *
+ * @cliexpar
+ * Example of how to enable flooding:
+ * @cliexcmd{set interface l2 flood GigabitEthernet0/8/0}
+ * Example of how to disable flooding:
+ * @cliexcmd{set interface l2 flood GigabitEthernet0/8/0 disable}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (int_flood_cli, static) = {
+  .path = "set interface l2 flood",
+  .short_help = "set interface l2 flood <interface> [disable]",
+  .function = int_flood,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_flood.h b/src/vnet/l2/l2_flood.h
new file mode 100644
index 00000000..acd7c905
--- /dev/null
+++ b/src/vnet/l2/l2_flood.h
@@ -0,0 +1,35 @@
+/*
+ * l2_flood.h : layer 2 flooding
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_l2flood_h
+#define included_l2flood_h
+
+#include <vlib/vlib.h>
+#include <vnet/ethernet/ethernet.h>
+
+void
+l2flood_register_input_type (vlib_main_t * vm,
+			     ethernet_type_t type, u32 node_index);
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_fwd.c b/src/vnet/l2/l2_fwd.c
new file mode 100644
index 00000000..710a9d9e
--- /dev/null
+++ b/src/vnet/l2/l2_fwd.c
@@ -0,0 +1,544 @@
+/*
+ * l2_fwd.c : layer 2 forwarding using l2fib
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vlib/cli.h>
+
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/l2_bvi.h>
+#include <vnet/l2/l2_fwd.h>
+#include <vnet/l2/l2_fib.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/sparse_vec.h>
+
+
+/**
+ * @file
+ * @brief Ethernet Forwarding.
+ *
+ * Code in this file handles forwarding Layer 2 packets. This file calls
+ * the FIB lookup, packet learning and the packet flooding as necessary.
+ * Packet is then sent to the next graph node.
+ */
+
+typedef struct
+{
+
+  /* Hash table */
+  BVT (clib_bihash) * mac_table;
+
+  /* next node index for the L3 input node of each ethertype */
+  next_by_ethertype_t l3_next;
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} l2fwd_main_t;
+
+typedef struct
+{
+  /* per-pkt trace data */
+  u8 src[6];
+  u8 dst[6];
+  u32 sw_if_index;
+  u16 bd_index;
+} l2fwd_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_l2fwd_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2fwd_trace_t *t = va_arg (*args, l2fwd_trace_t *);
+
+  s = format (s, "l2-fwd:   sw_if_index %d dst %U src %U bd_index %d",
+	      t->sw_if_index,
+	      format_ethernet_address, t->dst,
+	      format_ethernet_address, t->src, t->bd_index);
+  return s;
+}
+
+l2fwd_main_t l2fwd_main;
+
+static vlib_node_registration_t l2fwd_node;
+
+#define foreach_l2fwd_error				\
+_(L2FWD,         "L2 forward packets")			\
+_(FLOOD,         "L2 forward misses")			\
+_(HIT,           "L2 forward hits")			\
+_(BVI_BAD_MAC,   "BVI L3 MAC mismatch")  		\
+_(BVI_ETHERTYPE, "BVI packet with unhandled ethertype")	\
+_(FILTER_DROP,   "Filter Mac Drop")			\
+_(REFLECT_DROP,  "Reflection Drop")
+
+typedef enum
+{
+#define _(sym,str) L2FWD_ERROR_##sym,
+  foreach_l2fwd_error
+#undef _
+    L2FWD_N_ERROR,
+} l2fwd_error_t;
+
+static char *l2fwd_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2fwd_error
+#undef _
+};
+
+typedef enum
+{
+  L2FWD_NEXT_L2_OUTPUT,
+  L2FWD_NEXT_FLOOD,
+  L2FWD_NEXT_DROP,
+  L2FWD_N_NEXT,
+} l2fwd_next_t;
+
+/** Forward one packet based on the mac table lookup result. */
+
+static_always_inline void
+l2fwd_process (vlib_main_t * vm,
+	       vlib_node_runtime_t * node,
+	       l2fwd_main_t * msm,
+	       vlib_error_main_t * em,
+	       vlib_buffer_t * b0,
+	       u32 sw_if_index0, l2fib_entry_result_t * result0, u32 * next0)
+{
+  if (PREDICT_FALSE (result0->raw == ~0))
+    {
+      /*
+       * lookup miss, so flood
+       * TODO:replicate packet to each intf in bridge-domain
+       * For now just drop
+       */
+      if (vnet_buffer (b0)->l2.feature_bitmap & L2INPUT_FEAT_UU_FLOOD)
+	{
+	  *next0 = L2FWD_NEXT_FLOOD;
+	}
+      else
+	{
+	  /* Flooding is disabled */
+	  b0->error = node->errors[L2FWD_ERROR_FLOOD];
+	  *next0 = L2FWD_NEXT_DROP;
+	}
+
+    }
+  else
+    {
+
+      /* lookup hit, forward packet  */
+#ifdef COUNTERS
+      em->counters[node_counter_base_index + L2FWD_ERROR_HIT] += 1;
+#endif
+
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = result0->fields.sw_if_index;
+      *next0 = L2FWD_NEXT_L2_OUTPUT;
+
+      /* perform reflection check */
+      if (PREDICT_FALSE (sw_if_index0 == result0->fields.sw_if_index))
+	{
+	  b0->error = node->errors[L2FWD_ERROR_REFLECT_DROP];
+	  *next0 = L2FWD_NEXT_DROP;
+
+	  /* perform filter check */
+	}
+      else if (PREDICT_FALSE (result0->fields.filter))
+	{
+	  b0->error = node->errors[L2FWD_ERROR_FILTER_DROP];
+	  *next0 = L2FWD_NEXT_DROP;
+
+	  /* perform BVI check */
+	}
+      else if (PREDICT_FALSE (result0->fields.bvi))
+	{
+	  u32 rc;
+	  rc = l2_to_bvi (vm,
+			  msm->vnet_main,
+			  b0,
+			  vnet_buffer (b0)->sw_if_index[VLIB_TX],
+			  &msm->l3_next, next0);
+
+	  if (PREDICT_FALSE (rc))
+	    {
+	      if (rc == TO_BVI_ERR_BAD_MAC)
+		{
+		  b0->error = node->errors[L2FWD_ERROR_BVI_BAD_MAC];
+		  *next0 = L2FWD_NEXT_DROP;
+		}
+	      else if (rc == TO_BVI_ERR_ETHERTYPE)
+		{
+		  b0->error = node->errors[L2FWD_ERROR_BVI_ETHERTYPE];
+		  *next0 = L2FWD_NEXT_DROP;
+		}
+	    }
+	}
+    }
+}
+
+
+static uword
+l2fwd_node_fn (vlib_main_t * vm,
+	       vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  l2fwd_next_t next_index;
+  l2fwd_main_t *msm = &l2fwd_main;
+  vlib_node_t *n = vlib_get_node (vm, l2fwd_node.index);
+  CLIB_UNUSED (u32 node_counter_base_index) = n->error_heap_index;
+  vlib_error_main_t *em = &vm->error_main;
+  l2fib_entry_key_t cached_key;
+  l2fib_entry_result_t cached_result;
+
+  /* Clear the one-entry cache in case mac table was updated */
+  cached_key.raw = ~0;
+  cached_result.raw = ~0;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;	/* number of packets to process */
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      /* get space to enqueue frame to graph node "next_index" */
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 8 && n_left_to_next >= 4)
+	{
+	  u32 bi0, bi1, bi2, bi3;
+	  vlib_buffer_t *b0, *b1, *b2, *b3;
+	  u32 next0, next1, next2, next3;
+	  u32 sw_if_index0, sw_if_index1, sw_if_index2, sw_if_index3;
+	  ethernet_header_t *h0, *h1, *h2, *h3;
+	  l2fib_entry_key_t key0, key1, key2, key3;
+	  l2fib_entry_result_t result0, result1, result2, result3;
+	  u32 bucket0, bucket1, bucket2, bucket3;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p4, *p5, *p6, *p7;
+
+	    p4 = vlib_get_buffer (vm, from[4]);
+	    p5 = vlib_get_buffer (vm, from[5]);
+	    p6 = vlib_get_buffer (vm, from[6]);
+	    p7 = vlib_get_buffer (vm, from[7]);
+
+	    vlib_prefetch_buffer_header (p4, LOAD);
+	    vlib_prefetch_buffer_header (p5, LOAD);
+	    vlib_prefetch_buffer_header (p6, LOAD);
+	    vlib_prefetch_buffer_header (p7, LOAD);
+
+	    CLIB_PREFETCH (p4->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p5->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p6->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p7->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  /* bi is "buffer index", b is pointer to the buffer */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  to_next[2] = bi2 = from[2];
+	  to_next[3] = bi3 = from[3];
+	  from += 4;
+	  to_next += 4;
+	  n_left_from -= 4;
+	  n_left_to_next -= 4;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+	  b2 = vlib_get_buffer (vm, bi2);
+	  b3 = vlib_get_buffer (vm, bi3);
+
+	  /* RX interface handles */
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+	  sw_if_index2 = vnet_buffer (b2)->sw_if_index[VLIB_RX];
+	  sw_if_index3 = vnet_buffer (b3)->sw_if_index[VLIB_RX];
+
+	  h0 = vlib_buffer_get_current (b0);
+	  h1 = vlib_buffer_get_current (b1);
+	  h2 = vlib_buffer_get_current (b2);
+	  h3 = vlib_buffer_get_current (b3);
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2fwd_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->sw_if_index = sw_if_index0;
+		  t->bd_index = vnet_buffer (b0)->l2.bd_index;
+		  clib_memcpy (t->src, h0->src_address, 6);
+		  clib_memcpy (t->dst, h0->dst_address, 6);
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2fwd_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->sw_if_index = sw_if_index1;
+		  t->bd_index = vnet_buffer (b1)->l2.bd_index;
+		  clib_memcpy (t->src, h1->src_address, 6);
+		  clib_memcpy (t->dst, h1->dst_address, 6);
+		}
+	      if (b2->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2fwd_trace_t *t =
+		    vlib_add_trace (vm, node, b2, sizeof (*t));
+		  t->sw_if_index = sw_if_index2;
+		  t->bd_index = vnet_buffer (b2)->l2.bd_index;
+		  clib_memcpy (t->src, h2->src_address, 6);
+		  clib_memcpy (t->dst, h2->dst_address, 6);
+		}
+	      if (b3->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2fwd_trace_t *t =
+		    vlib_add_trace (vm, node, b3, sizeof (*t));
+		  t->sw_if_index = sw_if_index3;
+		  t->bd_index = vnet_buffer (b3)->l2.bd_index;
+		  clib_memcpy (t->src, h3->src_address, 6);
+		  clib_memcpy (t->dst, h3->dst_address, 6);
+		}
+	    }
+
+	  /* process 2 pkts */
+#ifdef COUNTERS
+	  em->counters[node_counter_base_index + L2FWD_ERROR_L2FWD] += 4;
+#endif
+	  /* *INDENT-OFF* */
+	  l2fib_lookup_4 (msm->mac_table, &cached_key, &cached_result,
+			  h0->dst_address, h1->dst_address,
+			  h2->dst_address, h3->dst_address,
+			  vnet_buffer (b0)->l2.bd_index,
+			  vnet_buffer (b1)->l2.bd_index,
+			  vnet_buffer (b2)->l2.bd_index,
+			  vnet_buffer (b3)->l2.bd_index,
+			  &key0,	/* not used */
+			  &key1,	/* not used */
+			  &key2,	/* not used */
+			  &key3,	/* not used */
+			  &bucket0,	/* not used */
+			  &bucket1,	/* not used */
+			  &bucket2,	/* not used */
+			  &bucket3,	/* not used */
+			  &result0,
+			  &result1,
+			  &result2,
+			  &result3);
+	  /* *INDENT-ON* */
+	  l2fwd_process (vm, node, msm, em, b0, sw_if_index0, &result0,
+			 &next0);
+	  l2fwd_process (vm, node, msm, em, b1, sw_if_index1, &result1,
+			 &next1);
+	  l2fwd_process (vm, node, msm, em, b2, sw_if_index2, &result2,
+			 &next2);
+	  l2fwd_process (vm, node, msm, em, b3, sw_if_index3, &result3,
+			 &next3);
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  /* if next0==next1==next_index then nothing special needs to be done */
+	  vlib_validate_buffer_enqueue_x4 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, bi2, bi3,
+					   next0, next1, next2, next3);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 sw_if_index0;
+	  ethernet_header_t *h0;
+	  l2fib_entry_key_t key0;
+	  l2fib_entry_result_t result0;
+	  u32 bucket0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+	  h0 = vlib_buffer_get_current (b0);
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      l2fwd_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = sw_if_index0;
+	      t->bd_index = vnet_buffer (b0)->l2.bd_index;
+	      clib_memcpy (t->src, h0->src_address, 6);
+	      clib_memcpy (t->dst, h0->dst_address, 6);
+	    }
+
+	  /* process 1 pkt */
+#ifdef COUNTERS
+	  em->counters[node_counter_base_index + L2FWD_ERROR_L2FWD] += 1;
+#endif
+	  l2fib_lookup_1 (msm->mac_table, &cached_key, &cached_result, h0->dst_address, vnet_buffer (b0)->l2.bd_index, &key0,	/* not used */
+			  &bucket0,	/* not used */
+			  &result0);
+	  l2fwd_process (vm, node, msm, em, b0, sw_if_index0, &result0,
+			 &next0);
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2fwd_node,static) = {
+  .function = l2fwd_node_fn,
+  .name = "l2-fwd",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2fwd_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2fwd_error_strings),
+  .error_strings = l2fwd_error_strings,
+
+  .n_next_nodes = L2FWD_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [L2FWD_NEXT_L2_OUTPUT] = "l2-output",
+    [L2FWD_NEXT_FLOOD] = "l2-flood",
+    [L2FWD_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2fwd_node, l2fwd_node_fn)
+     clib_error_t *l2fwd_init (vlib_main_t * vm)
+{
+  l2fwd_main_t *mp = &l2fwd_main;
+
+  mp->vlib_main = vm;
+  mp->vnet_main = vnet_get_main ();
+
+  /* init the hash table ptr */
+  mp->mac_table = get_mac_table ();
+
+  /* Initialize the next nodes for each ethertype */
+  next_by_ethertype_init (&mp->l3_next);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2fwd_init);
+
+
+/** Add the L3 input node for this ethertype to the next nodes structure. */
+void
+l2fwd_register_input_type (vlib_main_t * vm,
+			   ethernet_type_t type, u32 node_index)
+{
+  l2fwd_main_t *mp = &l2fwd_main;
+  u32 next_index;
+
+  next_index = vlib_node_add_next (vm, l2fwd_node.index, node_index);
+
+  next_by_ethertype_register (&mp->l3_next, type, next_index);
+}
+
+
+/**
+ * Set subinterface forward enable/disable.
+ * The CLI format is:
+ *   set interface l2 forward <interface> [disable]
+ */
+static clib_error_t *
+int_fwd (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index;
+  u32 enable;
+
+  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  enable = 1;
+  if (unformat (input, "disable"))
+    {
+      enable = 0;
+    }
+
+  /* set the interface flag */
+  if (l2input_intf_config (sw_if_index)->xconnect)
+    {
+      l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_XCONNECT, enable);
+    }
+  else
+    {
+      l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_FWD, enable);
+    }
+
+done:
+  return error;
+}
+
+/*?
+ * Layer 2 unicast forwarding can be enabled and disabled on each
+ * interface and on each bridge-domain. Use this command to
+ * manage interfaces. It is enabled by default.
+ *
+ * @cliexpar
+ * Example of how to enable fowarding:
+ * @cliexcmd{set interface l2 forward GigabitEthernet0/8/0}
+ * Example of how to disable fowarding:
+ * @cliexcmd{set interface l2 forward GigabitEthernet0/8/0 disable}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (int_fwd_cli, static) = {
+  .path = "set interface l2 forward",
+  .short_help = "set interface l2 forward <interface> [disable]",
+  .function = int_fwd,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_fwd.h b/src/vnet/l2/l2_fwd.h
new file mode 100644
index 00000000..3968732d
--- /dev/null
+++ b/src/vnet/l2/l2_fwd.h
@@ -0,0 +1,36 @@
+/*
+ * l2_fwd.c : layer 2 forwarding using l2fib
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_l2fwd_h
+#define included_l2fwd_h
+
+#include <vlib/vlib.h>
+#include <vnet/ethernet/ethernet.h>
+
+
+void
+l2fwd_register_input_type (vlib_main_t * vm,
+			   ethernet_type_t type, u32 node_index);
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_input.c b/src/vnet/l2/l2_input.c
new file mode 100644
index 00000000..a104ec9e
--- /dev/null
+++ b/src/vnet/l2/l2_input.c
@@ -0,0 +1,1116 @@
+/*
+ * l2_input.c : layer 2 input packet processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/ip/ip_packet.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vlib/cli.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/l2_output.h>
+#include <vnet/l2/feat_bitmap.h>
+#include <vnet/l2/l2_bvi.h>
+#include <vnet/l2/l2_fib.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/cache.h>
+
+/**
+ * @file
+ * @brief Interface Input Mode (Layer 2 Cross-Connect or Bridge / Layer 3).
+ *
+ * This file contains the CLI Commands that modify the input mode of an
+ * interface. For interfaces in a Layer 2 cross-connect, all packets
+ * received on one interface will be transmitted to the other. For
+ * interfaces in a bridge-domain, packets will be forwarded to other
+ * interfaces in the same bridge-domain based on destination mac address.
+ * For interfaces in Layer 3 mode, the packets will be routed.
+ */
+
+/* Feature graph node names */
+static char *l2input_feat_names[] = {
+#define _(sym,name) name,
+  foreach_l2input_feat
+#undef _
+};
+
+char **
+l2input_get_feat_names (void)
+{
+  return l2input_feat_names;
+}
+
+
+typedef struct
+{
+  /* per-pkt trace data */
+  u8 src[6];
+  u8 dst[6];
+  u32 next_index;
+  u32 sw_if_index;
+} l2input_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_l2input_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2input_trace_t *t = va_arg (*args, l2input_trace_t *);
+
+  s = format (s, "l2-input: sw_if_index %d dst %U src %U",
+	      t->sw_if_index,
+	      format_ethernet_address, t->dst,
+	      format_ethernet_address, t->src);
+  return s;
+}
+
+l2input_main_t l2input_main;
+
+#define foreach_l2input_error			\
+_(L2INPUT,     "L2 input packets")		\
+_(DROP,        "L2 input drops")
+
+typedef enum
+{
+#define _(sym,str) L2INPUT_ERROR_##sym,
+  foreach_l2input_error
+#undef _
+    L2INPUT_N_ERROR,
+} l2input_error_t;
+
+static char *l2input_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2input_error
+#undef _
+};
+
+typedef enum
+{				/*  */
+  L2INPUT_NEXT_LEARN,
+  L2INPUT_NEXT_FWD,
+  L2INPUT_NEXT_DROP,
+  L2INPUT_N_NEXT,
+} l2input_next_t;
+
+
+static_always_inline void
+classify_and_dispatch (vlib_main_t * vm,
+		       vlib_node_runtime_t * node,
+		       u32 cpu_index,
+		       l2input_main_t * msm, vlib_buffer_t * b0, u32 * next0)
+{
+  /*
+   * Load L2 input feature struct
+   * Load bridge domain struct
+   * Parse ethernet header to determine unicast/mcast/broadcast
+   * take L2 input stat
+   * classify packet as IP/UDP/TCP, control, other
+   * mask feature bitmap
+   * go to first node in bitmap
+   * Later: optimize VTM
+   *
+   * For L2XC,
+   *   set tx sw-if-handle
+   */
+
+  u16 ethertype;
+  u8 protocol;
+  l2_input_config_t *config;
+  l2_bridge_domain_t *bd_config;
+  u16 bd_index0;
+  u32 feature_bitmap;
+  u32 feat_mask;
+  ethernet_header_t *h0;
+  u8 *l3h0;
+  u32 sw_if_index0;
+
+#define get_u16(addr) ( *((u16 *)(addr)) )
+
+  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+  h0 = vlib_buffer_get_current (b0);
+  l3h0 = (u8 *) h0 + vnet_buffer (b0)->l2.l2_len;
+
+  ethertype = clib_net_to_host_u16 (get_u16 (l3h0 - 2));
+  feat_mask = ~0;
+
+  /* Get config for the input interface */
+  config = vec_elt_at_index (msm->configs, sw_if_index0);
+
+  /* Save split horizon group */
+  vnet_buffer (b0)->l2.shg = config->shg;
+
+  /* determine layer2 kind for stat and mask */
+  if (PREDICT_FALSE (ethernet_address_cast (h0->dst_address)))
+    {
+      protocol = ((ip6_header_t *) l3h0)->protocol;
+
+      /* Disable bridge forwarding (flooding will execute instead if not xconnect) */
+      feat_mask &= ~(L2INPUT_FEAT_FWD | L2INPUT_FEAT_UU_FLOOD);
+
+      /* Disable ARP-term for non-ARP and non-ICMP6 packet */
+      if (ethertype != ETHERNET_TYPE_ARP &&
+	  (ethertype != ETHERNET_TYPE_IP6 || protocol != IP_PROTOCOL_ICMP6))
+	feat_mask &= ~(L2INPUT_FEAT_ARP_TERM);
+    }
+  else
+    {
+      /*
+       * Check for from-BVI processing - set SHG of unicast packets from BVI
+       * to 0 so it is not dropped for VXLAN tunnels or other ports with the
+       * same SHG as that of the BVI.
+       */
+      if (PREDICT_FALSE (vnet_buffer (b0)->sw_if_index[VLIB_TX] ==
+			 L2INPUT_BVI))
+	vnet_buffer (b0)->l2.shg = 0;
+    }
+
+
+  if (config->xconnect)
+    {
+      /* Set the output interface */
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = config->output_sw_if_index;
+    }
+  else
+    {
+      /* Do bridge-domain processing */
+      bd_index0 = config->bd_index;
+      /* save BD ID for next feature graph nodes */
+      vnet_buffer (b0)->l2.bd_index = bd_index0;
+
+      /* Get config for the bridge domain interface */
+      bd_config = vec_elt_at_index (msm->bd_configs, bd_index0);
+
+      /*
+       * Process bridge domain feature enables.
+       * To perform learning/flooding/forwarding, the corresponding bit
+       * must be enabled in both the input interface config and in the
+       * bridge domain config. In the bd_bitmap, bits for features other
+       * than learning/flooding/forwarding should always be set.
+       */
+      feat_mask = feat_mask & bd_config->feature_bitmap;
+    }
+
+  /* mask out features from bitmap using packet type and bd config */
+  feature_bitmap = config->feature_bitmap & feat_mask;
+
+  /* save for next feature graph nodes */
+  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap;
+
+  /* Determine the next node */
+  *next0 = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
+					    feature_bitmap);
+}
+
+
+static uword
+l2input_node_fn (vlib_main_t * vm,
+		 vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  l2input_next_t next_index;
+  l2input_main_t *msm = &l2input_main;
+  u32 cpu_index = os_get_cpu_number ();
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;	/* number of packets to process */
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      /* get space to enqueue frame to graph node "next_index" */
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 8 && n_left_to_next >= 4)
+	{
+	  u32 bi0, bi1, bi2, bi3;
+	  vlib_buffer_t *b0, *b1, *b2, *b3;
+	  u32 next0, next1, next2, next3;
+	  u32 sw_if_index0, sw_if_index1, sw_if_index2, sw_if_index3;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p4, *p5, *p6, *p7;
+
+	    p4 = vlib_get_buffer (vm, from[4]);
+	    p5 = vlib_get_buffer (vm, from[5]);
+	    p6 = vlib_get_buffer (vm, from[6]);
+	    p7 = vlib_get_buffer (vm, from[7]);
+
+	    /* Prefetch the buffer header and packet for the N+2 loop iteration */
+	    vlib_prefetch_buffer_header (p4, LOAD);
+	    vlib_prefetch_buffer_header (p5, LOAD);
+	    vlib_prefetch_buffer_header (p6, LOAD);
+	    vlib_prefetch_buffer_header (p7, LOAD);
+
+	    CLIB_PREFETCH (p4->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p5->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p6->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p7->data, CLIB_CACHE_LINE_BYTES, STORE);
+
+	    /*
+	     * Don't bother prefetching the bridge-domain config (which
+	     * depends on the input config above). Only a small number of
+	     * bridge domains are expected. Plus the structure is small
+	     * and several fit in a cache line.
+	     */
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  /* bi is "buffer index", b is pointer to the buffer */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  to_next[2] = bi2 = from[2];
+	  to_next[3] = bi3 = from[3];
+	  from += 4;
+	  to_next += 4;
+	  n_left_from -= 4;
+	  n_left_to_next -= 4;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+	  b2 = vlib_get_buffer (vm, bi2);
+	  b3 = vlib_get_buffer (vm, bi3);
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      /* RX interface handles */
+	      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+	      sw_if_index2 = vnet_buffer (b2)->sw_if_index[VLIB_RX];
+	      sw_if_index3 = vnet_buffer (b3)->sw_if_index[VLIB_RX];
+
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  ethernet_header_t *h0 = vlib_buffer_get_current (b0);
+		  l2input_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->sw_if_index = sw_if_index0;
+		  clib_memcpy (t->src, h0->src_address, 6);
+		  clib_memcpy (t->dst, h0->dst_address, 6);
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  ethernet_header_t *h1 = vlib_buffer_get_current (b1);
+		  l2input_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->sw_if_index = sw_if_index1;
+		  clib_memcpy (t->src, h1->src_address, 6);
+		  clib_memcpy (t->dst, h1->dst_address, 6);
+		}
+	      if (b2->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  ethernet_header_t *h2 = vlib_buffer_get_current (b2);
+		  l2input_trace_t *t =
+		    vlib_add_trace (vm, node, b2, sizeof (*t));
+		  t->sw_if_index = sw_if_index2;
+		  clib_memcpy (t->src, h2->src_address, 6);
+		  clib_memcpy (t->dst, h2->dst_address, 6);
+		}
+	      if (b3->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  ethernet_header_t *h3 = vlib_buffer_get_current (b3);
+		  l2input_trace_t *t =
+		    vlib_add_trace (vm, node, b3, sizeof (*t));
+		  t->sw_if_index = sw_if_index3;
+		  clib_memcpy (t->src, h3->src_address, 6);
+		  clib_memcpy (t->dst, h3->dst_address, 6);
+		}
+	    }
+
+	  vlib_node_increment_counter (vm, l2input_node.index,
+				       L2INPUT_ERROR_L2INPUT, 4);
+
+	  classify_and_dispatch (vm, node, cpu_index, msm, b0, &next0);
+	  classify_and_dispatch (vm, node, cpu_index, msm, b1, &next1);
+	  classify_and_dispatch (vm, node, cpu_index, msm, b2, &next2);
+	  classify_and_dispatch (vm, node, cpu_index, msm, b3, &next3);
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  /* if next0==next1==next_index then nothing special needs to be done */
+	  vlib_validate_buffer_enqueue_x4 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, bi2, bi3,
+					   next0, next1, next2, next3);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 sw_if_index0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      ethernet_header_t *h0 = vlib_buffer_get_current (b0);
+	      l2input_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+	      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	      t->sw_if_index = sw_if_index0;
+	      clib_memcpy (t->src, h0->src_address, 6);
+	      clib_memcpy (t->dst, h0->dst_address, 6);
+	    }
+
+	  vlib_node_increment_counter (vm, l2input_node.index,
+				       L2INPUT_ERROR_L2INPUT, 1);
+
+	  classify_and_dispatch (vm, node, cpu_index, msm, b0, &next0);
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2input_node) = {
+  .function = l2input_node_fn,
+  .name = "l2-input",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2input_trace,
+  .format_buffer = format_ethernet_header_with_length,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2input_error_strings),
+  .error_strings = l2input_error_strings,
+
+  .n_next_nodes = L2INPUT_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+       [L2INPUT_NEXT_LEARN] = "l2-learn",
+       [L2INPUT_NEXT_FWD]   = "l2-fwd",
+       [L2INPUT_NEXT_DROP]  = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2input_node, l2input_node_fn)
+     clib_error_t *l2input_init (vlib_main_t * vm)
+{
+  l2input_main_t *mp = &l2input_main;
+
+  mp->vlib_main = vm;
+  mp->vnet_main = vnet_get_main ();
+
+  /* Get packets RX'd from L2 interfaces */
+  ethernet_register_l2_input (vm, l2input_node.index);
+
+  /* Create the config vector */
+  vec_validate (mp->configs, 100);
+  /* create 100 sw interface entries and zero them */
+
+  /* Initialize the feature next-node indexes */
+  feat_bitmap_init_next_nodes (vm,
+			       l2input_node.index,
+			       L2INPUT_N_FEAT,
+			       l2input_get_feat_names (),
+			       mp->feat_next_node_index);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2input_init);
+
+
+/** Get a pointer to the config for the given interface. */
+l2_input_config_t *
+l2input_intf_config (u32 sw_if_index)
+{
+  l2input_main_t *mp = &l2input_main;
+
+  vec_validate (mp->configs, sw_if_index);
+  return vec_elt_at_index (mp->configs, sw_if_index);
+}
+
+/** Enable (or disable) the feature in the bitmap for the given interface. */
+u32
+l2input_intf_bitmap_enable (u32 sw_if_index, u32 feature_bitmap, u32 enable)
+{
+  l2input_main_t *mp = &l2input_main;
+  l2_input_config_t *config;
+
+  vec_validate (mp->configs, sw_if_index);
+  config = vec_elt_at_index (mp->configs, sw_if_index);
+
+  if (enable)
+    {
+      config->feature_bitmap |= feature_bitmap;
+    }
+  else
+    {
+      config->feature_bitmap &= ~feature_bitmap;
+    }
+
+  return config->feature_bitmap;
+}
+
+u32
+l2input_set_bridge_features (u32 bd_index, u32 feat_mask, u32 feat_value)
+{
+  l2_bridge_domain_t *bd_config;
+  vec_validate (l2input_main.bd_configs, bd_index);
+  bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index);
+  bd_validate (bd_config);
+  bd_config->feature_bitmap =
+    (bd_config->feature_bitmap & ~feat_mask) | feat_value;
+  return bd_config->feature_bitmap;
+}
+
+/**
+ * Set the subinterface to run in l2 or l3 mode.
+ * For L3 mode, just the sw_if_index is specified.
+ * For bridged mode, the bd id and bvi flag are also specified.
+ * For xconnect mode, the peer sw_if_index is also specified.
+ * Return 0 if ok, or non-0 if there was an error.
+ */
+
+u32
+set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, u32 mode, u32 sw_if_index, u32 bd_index,	/* for bridged interface */
+		 u32 bvi,	/* the bridged interface is the BVI */
+		 u32 shg,	/* the bridged interface's split horizon group */
+		 u32 xc_sw_if_index)	/* peer interface for xconnect */
+{
+  l2input_main_t *mp = &l2input_main;
+  l2output_main_t *l2om = &l2output_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_hw_interface_t *hi;
+  l2_output_config_t *out_config;
+  l2_input_config_t *config;
+  l2_bridge_domain_t *bd_config;
+  l2_flood_member_t member;
+  u64 mac;
+  i32 l2_if_adjust = 0;
+  u32 slot;
+
+  hi = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
+  config = l2input_intf_config (sw_if_index);
+
+  if (config->bridge)
+    {
+      /* Interface is already in bridge mode. Undo the existing config. */
+      bd_config = vec_elt_at_index (mp->bd_configs, config->bd_index);
+
+      /* remove interface from flood vector */
+      bd_remove_member (bd_config, sw_if_index);
+
+      /* undo any BVI-related config */
+      if (bd_config->bvi_sw_if_index == sw_if_index)
+	{
+	  bd_config->bvi_sw_if_index = ~0;
+	  config->bvi = 0;
+
+	  /* delete the l2fib entry for the bvi interface */
+	  mac = *((u64 *) hi->hw_address);
+	  l2fib_del_entry (mac, config->bd_index);
+
+	  /* Make loop output node send packet back to ethernet-input node */
+	  slot =
+	    vlib_node_add_named_next_with_slot (vm, hi->tx_node_index,
+						"ethernet-input",
+						VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
+	  ASSERT (slot == VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
+	}
+      l2_if_adjust--;
+    }
+  else if (config->xconnect)
+    {
+      l2_if_adjust--;
+    }
+
+  /*
+   * Directs the l2 output path to work out the interface
+   * output next-arc itself. Needed when recycling a sw_if_index.
+   */
+  vec_validate_init_empty (l2om->next_nodes.output_node_index_vec,
+			   sw_if_index, ~0);
+  l2om->next_nodes.output_node_index_vec[sw_if_index] = ~0;
+
+  /* Initialize the l2-input configuration for the interface */
+  if (mode == MODE_L3)
+    {
+      /* Set L2 config to BD index 0 so that if any packet accidentally
+       * came in on L2 path, it will be dropped in BD 0 */
+      config->xconnect = 0;
+      config->bridge = 0;
+      config->shg = 0;
+      config->bd_index = 0;
+      config->feature_bitmap = L2INPUT_FEAT_DROP;
+
+      /* Make sure any L2-output packet to this interface now in L3 mode is
+       * dropped. This may happen if L2 FIB MAC entry is stale */
+      l2om->next_nodes.output_node_index_vec[sw_if_index] =
+	L2OUTPUT_NEXT_BAD_INTF;
+    }
+  else if (mode == MODE_L2_CLASSIFY)
+    {
+      config->xconnect = 1;
+      config->bridge = 0;
+      config->output_sw_if_index = xc_sw_if_index;
+
+      /* Make sure last-chance drop is configured */
+      config->feature_bitmap |=
+	L2INPUT_FEAT_DROP | L2INPUT_FEAT_INPUT_CLASSIFY;
+
+      /* Make sure bridging features are disabled */
+      config->feature_bitmap &=
+	~(L2INPUT_FEAT_LEARN | L2INPUT_FEAT_FWD | L2INPUT_FEAT_FLOOD);
+      shg = 0;			/* not used in xconnect */
+
+      /* Insure all packets go to ethernet-input */
+      ethernet_set_rx_redirect (vnet_main, hi, 1);
+    }
+  else
+    {
+
+      if (mode == MODE_L2_BRIDGE)
+	{
+	  /*
+	   * Remove a check that the interface must be an Ethernet.
+	   * Specifically so we can bridge to L3 tunnel interfaces.
+	   * Here's the check:
+	   * if (hi->hw_class_index != ethernet_hw_interface_class.index)
+	   *
+	   */
+	  if (!hi)
+	    return MODE_ERROR_ETH;	/* non-ethernet */
+
+	  config->xconnect = 0;
+	  config->bridge = 1;
+	  config->bd_index = bd_index;
+
+	  /*
+	   * Enable forwarding, flooding, learning and ARP termination by default
+	   * (note that ARP term is disabled on BD feature bitmap by default)
+	   */
+	  config->feature_bitmap |= L2INPUT_FEAT_FWD | L2INPUT_FEAT_UU_FLOOD |
+	    L2INPUT_FEAT_FLOOD | L2INPUT_FEAT_LEARN | L2INPUT_FEAT_ARP_TERM;
+
+	  /* Make sure last-chance drop is configured */
+	  config->feature_bitmap |= L2INPUT_FEAT_DROP;
+
+	  /* Make sure xconnect is disabled */
+	  config->feature_bitmap &= ~L2INPUT_FEAT_XCONNECT;
+
+	  /* Set up bridge domain */
+	  vec_validate (mp->bd_configs, bd_index);
+	  bd_config = vec_elt_at_index (mp->bd_configs, bd_index);
+	  bd_validate (bd_config);
+
+	  /* TODO: think: add l2fib entry even for non-bvi interface? */
+
+	  /* Do BVI interface initializations */
+	  if (bvi)
+	    {
+	      /* ensure BD has no bvi interface (or replace that one with this??) */
+	      if (bd_config->bvi_sw_if_index != ~0)
+		{
+		  return MODE_ERROR_BVI_DEF;	/* bd already has a bvi interface */
+		}
+	      bd_config->bvi_sw_if_index = sw_if_index;
+	      config->bvi = 1;
+
+	      /* create the l2fib entry for the bvi interface */
+	      mac = *((u64 *) hi->hw_address);
+	      l2fib_add_entry (mac, bd_index, sw_if_index, 1, 0, 1);	/* static + bvi */
+
+	      /* Disable learning by default. no use since l2fib entry is static. */
+	      config->feature_bitmap &= ~L2INPUT_FEAT_LEARN;
+
+	      /* Make loop output node send packet to l2-input node */
+	      slot =
+		vlib_node_add_named_next_with_slot (vm, hi->tx_node_index,
+						    "l2-input",
+						    VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
+	      ASSERT (slot == VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
+	    }
+
+	  /* Add interface to bridge-domain flood vector */
+	  member.sw_if_index = sw_if_index;
+	  member.flags = bvi ? L2_FLOOD_MEMBER_BVI : L2_FLOOD_MEMBER_NORMAL;
+	  member.shg = shg;
+	  bd_add_member (bd_config, &member);
+
+	}
+      else
+	{
+	  config->xconnect = 1;
+	  config->bridge = 0;
+	  config->output_sw_if_index = xc_sw_if_index;
+
+	  /* Make sure last-chance drop is configured */
+	  config->feature_bitmap |= L2INPUT_FEAT_DROP;
+
+	  /* Make sure bridging features are disabled */
+	  config->feature_bitmap &=
+	    ~(L2INPUT_FEAT_LEARN | L2INPUT_FEAT_FWD | L2INPUT_FEAT_FLOOD);
+
+	  config->feature_bitmap |= L2INPUT_FEAT_XCONNECT;
+	  shg = 0;		/* not used in xconnect */
+	}
+
+      /* set up split-horizon group */
+      config->shg = shg;
+      out_config = l2output_intf_config (sw_if_index);
+      out_config->shg = shg;
+
+      /*
+       * Test: remove this when non-IP features can be configured.
+       * Enable a non-IP feature to test IP feature masking
+       * config->feature_bitmap |= L2INPUT_FEAT_CTRL_PKT;
+       */
+
+      l2_if_adjust++;
+    }
+
+  /* Adjust count of L2 interfaces */
+  hi->l2_if_count += l2_if_adjust;
+
+  if (hi->hw_class_index == ethernet_hw_interface_class.index)
+    {
+      if ((hi->l2_if_count == 1) && (l2_if_adjust == 1))
+	{
+	  /* Just added first L2 interface on this port */
+
+	  /* Set promiscuous mode on the l2 interface */
+	  ethernet_set_flags (vnet_main, hi->hw_if_index,
+			      ETHERNET_INTERFACE_FLAG_ACCEPT_ALL);
+
+	  /* ensure all packets go to ethernet-input */
+	  ethernet_set_rx_redirect (vnet_main, hi, 1);
+
+	}
+      else if ((hi->l2_if_count == 0) && (l2_if_adjust == -1))
+	{
+	  /* Just removed only L2 subinterface on this port */
+
+	  /* Disable promiscuous mode on the l2 interface */
+	  ethernet_set_flags (vnet_main, hi->hw_if_index, 0);
+
+	  /* Allow ip packets to go directly to ip4-input etc */
+	  ethernet_set_rx_redirect (vnet_main, hi, 0);
+	}
+    }
+
+  /* Set up the L2/L3 flag in the interface parsing tables */
+  ethernet_sw_interface_set_l2_mode (vnm, sw_if_index, (mode != MODE_L3));
+
+  return 0;
+}
+
+/**
+ * Set subinterface in bridging mode with a bridge-domain ID.
+ * The CLI format is:
+ *   set interface l2 bridge <interface> <bd> [bvi] [split-horizon-group]
+ */
+static clib_error_t *
+int_l2_bridge (vlib_main_t * vm,
+	       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 bd_index, bd_id;
+  u32 sw_if_index;
+  u32 bvi;
+  u32 rc;
+  u32 shg;
+
+  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  if (!unformat (input, "%d", &bd_id))
+    {
+      error = clib_error_return (0, "expected bridge domain ID `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  bd_index = bd_find_or_add_bd_index (&bd_main, bd_id);
+
+  /* optional bvi  */
+  bvi = unformat (input, "bvi");
+
+  /* optional split horizon group */
+  shg = 0;
+  (void) unformat (input, "%d", &shg);
+
+  /* set the interface mode */
+  if ((rc =
+       set_int_l2_mode (vm, vnm, MODE_L2_BRIDGE, sw_if_index, bd_index, bvi,
+			shg, 0)))
+    {
+      if (rc == MODE_ERROR_ETH)
+	{
+	  error = clib_error_return (0, "bridged interface must be ethernet",
+				     format_unformat_error, input);
+	}
+      else if (rc == MODE_ERROR_BVI_DEF)
+	{
+	  error =
+	    clib_error_return (0, "bridge-domain already has a bvi interface",
+			       format_unformat_error, input);
+	}
+      else
+	{
+	  error = clib_error_return (0, "invalid configuration for interface",
+				     format_unformat_error, input);
+	}
+      goto done;
+    }
+
+done:
+  return error;
+}
+
+/*?
+ * Use this command put an interface into Layer 2 bridge domain. If a
+ * bridge-domain with the provided bridge-domain-id does not exist, it
+ * will be created. Interfaces in a bridge-domain forward packets to
+ * other interfaces in the same bridge-domain based on destination mac
+ * address. To remove an interface from a the Layer 2 bridge domain,
+ * put the interface in a different mode, for example Layer 3 mode.
+ *
+ * Optionally, an interface can be added to a Layer 2 bridge-domain as
+ * a Bridged Virtual Interface (bvi). Only one interface in a Layer 2
+ * bridge-domain can be a bvi.
+ *
+ * Optionally, a split-horizon group can also be specified. This defaults
+ * to 0 if not specified.
+ *
+ * @cliexpar
+ * Example of how to configure a Layer 2 bridge-domain with three
+ * interfaces (where 200 is the bridge-domain-id):
+ * @cliexcmd{set interface l2 bridge GigabitEthernet0/8/0.200 200}
+ * This interface is added a BVI interface:
+ * @cliexcmd{set interface l2 bridge GigabitEthernet0/9/0.200 200 bvi}
+ * This interface also has a split-horizon group of 1 specified:
+ * @cliexcmd{set interface l2 bridge GigabitEthernet0/a/0.200 200 1}
+ * Example of how to remove an interface from a Layer2 bridge-domain:
+ * @cliexcmd{set interface l3 GigabitEthernet0/a/0.200}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (int_l2_bridge_cli, static) = {
+  .path = "set interface l2 bridge",
+  .short_help = "set interface l2 bridge <interface> <bridge-domain-id> [bvi] [shg]",
+  .function = int_l2_bridge,
+};
+/* *INDENT-ON* */
+
+/**
+ * Set subinterface in xconnect mode with another interface.
+ * The CLI format is:
+ *   set interface l2 xconnect <interface> <peer interface>
+ */
+static clib_error_t *
+int_l2_xc (vlib_main_t * vm,
+	   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index;
+  u32 xc_sw_if_index;
+
+  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  if (!unformat_user
+      (input, unformat_vnet_sw_interface, vnm, &xc_sw_if_index))
+    {
+      error = clib_error_return (0, "unknown peer interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  /* set the interface mode */
+  if (set_int_l2_mode
+      (vm, vnm, MODE_L2_XC, sw_if_index, 0, 0, 0, xc_sw_if_index))
+    {
+      error = clib_error_return (0, "invalid configuration for interface",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+done:
+  return error;
+}
+
+/*?
+ * Use this command put an interface into Layer 2 cross-connect mode.
+ * Both interfaces must be in this mode for bi-directioal traffic. All
+ * packets received on one interface will be transmitted to the other.
+ * To remove the Layer 2 cross-connect, put the interface in a different
+ * mode, for example Layer 3 mode.
+ *
+ * @cliexpar
+ * Example of how to configure a Layer2 cross-connect between two interfaces:
+ * @cliexcmd{set interface l2 xconnect GigabitEthernet0/8/0.300 GigabitEthernet0/9/0.300}
+ * @cliexcmd{set interface l2 xconnect GigabitEthernet0/9/0.300 GigabitEthernet0/8/0.300}
+ * Example of how to remove a Layer2 cross-connect:
+ * @cliexcmd{set interface l3 GigabitEthernet0/8/0.300}
+ * @cliexcmd{set interface l3 GigabitEthernet0/9/0.300}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (int_l2_xc_cli, static) = {
+  .path = "set interface l2 xconnect",
+  .short_help = "set interface l2 xconnect <interface> <peer interface>",
+  .function = int_l2_xc,
+};
+/* *INDENT-ON* */
+
+/**
+ * Set subinterface in L3 mode.
+ * The CLI format is:
+ *   set interface l3 <interface>
+ */
+static clib_error_t *
+int_l3 (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index;
+
+  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  /* set the interface mode */
+  if (set_int_l2_mode (vm, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0))
+    {
+      error = clib_error_return (0, "invalid configuration for interface",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+done:
+  return error;
+}
+
+/*?
+ * Modify the packet processing mode of the interface to Layer 3, which
+ * implies packets will be routed. This is the default mode of an interface.
+ * Use this command to remove an interface from a Layer 2 cross-connect or a
+ * Layer 2 bridge.
+ *
+ * @cliexpar
+ * Example of how to set the mode of an interface to Layer 3:
+ * @cliexcmd{set interface l3 GigabitEthernet0/8/0.200}
+?*/
+/* *INDENT-OFF* */
+     VLIB_CLI_COMMAND (int_l3_cli, static) = {
+  .path = "set interface l3",
+  .short_help = "set interface l3 <interface>",
+  .function = int_l3,
+};
+/* *INDENT-ON* */
+
+/**
+ * Show interface mode.
+ * The CLI format is:
+ *    show mode [<if-name1> <if-name2> ...]
+ */
+static clib_error_t *
+show_int_mode (vlib_main_t * vm,
+	       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  char *mode;
+  u8 *args;
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_sw_interface_t *si, *sis = 0;
+  l2input_main_t *mp = &l2input_main;
+  l2_input_config_t *config;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      u32 sw_if_index;
+
+      /* See if user wants to show specific interface */
+      if (unformat
+	  (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
+	{
+	  si = pool_elt_at_index (im->sw_interfaces, sw_if_index);
+	  vec_add1 (sis, si[0]);
+	}
+      else
+	{
+	  error = clib_error_return (0, "unknown input `%U'",
+				     format_unformat_error, input);
+	  goto done;
+	}
+
+    }
+
+  if (vec_len (sis) == 0)	/* Get all interfaces */
+    {
+      /* Gather interfaces. */
+      sis = vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces));
+      _vec_len (sis) = 0;
+      /* *INDENT-OFF* */
+      pool_foreach (si, im->sw_interfaces, ({ vec_add1 (sis, si[0]); }));
+      /* *INDENT-ON* */
+    }
+
+  vec_foreach (si, sis)
+  {
+    vec_validate (mp->configs, si->sw_if_index);
+    config = vec_elt_at_index (mp->configs, si->sw_if_index);
+    if (config->bridge)
+      {
+	u32 bd_id;
+	mode = "l2 bridge";
+	bd_id = l2input_main.bd_configs[config->bd_index].bd_id;
+
+	args = format (0, "bd_id %d%s%d", bd_id,
+		       config->bvi ? " bvi shg " : " shg ", config->shg);
+      }
+    else if (config->xconnect)
+      {
+	mode = "l2 xconnect";
+	args = format (0, "%U",
+		       format_vnet_sw_if_index_name,
+		       vnm, config->output_sw_if_index);
+      }
+    else
+      {
+	mode = "l3";
+	args = format (0, " ");
+      }
+    vlib_cli_output (vm, "%s %U %v\n",
+		     mode,
+		     format_vnet_sw_if_index_name,
+		     vnm, si->sw_if_index, args);
+    vec_free (args);
+  }
+
+done:
+  vec_free (sis);
+
+  return error;
+}
+
+/*?
+ * Show the packet processing mode (Layer2 xcross-onnect, Layer 2 bridge,
+ * Layer 3 routed) of all interfaces and sub-interfaces, or limit the
+ * output to just the provided list of interfaces and sub-interfaces.
+ * The output shows the mode, the interface, and if the interface is
+ * a member of a bridge, the bridge-domain-id and the split horizen group (shg).
+ *
+ * @cliexpar
+ * Example of displaying the mode of all interfaces:
+ * @cliexstart{show mode}
+ * l3 local0
+ * l3 GigabitEthernet0/8/0
+ * l3 GigabitEthernet0/9/0
+ * l3 GigabitEthernet0/a/0
+ * l2 bridge GigabitEthernet0/8/0.200 bd_id 200 shg 0
+ * l2 bridge GigabitEthernet0/9/0.200 bd_id 200 shg 0
+ * l2 bridge GigabitEthernet0/a/0.200 bd_id 200 shg 0
+ * l2 xconnect GigabitEthernet0/8/0.300 GigabitEthernet0/9/0.300
+ * l2 xconnect GigabitEthernet0/9/0.300 GigabitEthernet0/8/0.300
+ * @cliexend
+ * Example of displaying the mode of a seleted list of interfaces:
+ * @cliexstart{show mode GigabitEthernet0/8/0 GigabitEthernet0/8/0.200}
+ * l3 GigabitEthernet0/8/0
+ * l2 bridge GigabitEthernet0/8/0.200 bd_id 200 shg 0
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_l2_mode, static) = {
+  .path = "show mode",
+  .short_help = "show mode [<if-name1> <if-name2> ...]",
+  .function = show_int_mode,
+};
+/* *INDENT-ON* */
+
+#define foreach_l2_init_function                \
+_(feat_bitmap_drop_init)                        \
+_(l2fib_init)                                   \
+_(l2_input_classify_init)                             \
+_(l2bd_init)                                    \
+_(l2fwd_init)                                   \
+_(l2_inacl_init)                                \
+_(l2input_init)                                 \
+_(l2_vtr_init)                                  \
+_(l2_invtr_init)                                \
+_(l2_efp_filter_init)                           \
+_(l2learn_init)                                 \
+_(l2flood_init)                                 \
+_(l2_outacl_init)                               \
+_(l2output_init)				\
+_(l2_patch_init)				\
+_(l2_xcrw_init)
+
+clib_error_t *
+l2_init (vlib_main_t * vm)
+{
+  clib_error_t *error;
+
+#define _(a) do {                                                       \
+  if ((error = vlib_call_init_function (vm, a))) return error; }        \
+while (0);
+  foreach_l2_init_function;
+#undef _
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_input.h b/src/vnet/l2/l2_input.h
new file mode 100644
index 00000000..f3fada6a
--- /dev/null
+++ b/src/vnet/l2/l2_input.h
@@ -0,0 +1,266 @@
+/*
+ * l2_input.h : layer 2 input packet processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_vnet_l2_input_h
+#define included_vnet_l2_input_h
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/l2/l2_bd.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/ip/ip.h>
+
+/* Per-subinterface L2 feature configuration */
+
+typedef struct
+{
+
+  union
+  {
+    u16 bd_index;		/* bridge domain id */
+    u32 output_sw_if_index;	/* for xconnect */
+  };
+
+  /* Interface mode. If both are 0, this interface is in L3 mode */
+  u8 xconnect;
+  u8 bridge;
+
+  /* this is the bvi interface for the bridge-domain */
+  u8 bvi;
+
+  /* config for which input features are configured on this interface */
+  u32 feature_bitmap;
+
+  /* some of these flags are also in the feature bitmap */
+  u8 learn_enable;
+  u8 fwd_enable;
+  u8 flood_enable;
+
+  /* split horizon group */
+  u8 shg;
+
+} l2_input_config_t;
+
+
+typedef struct
+{
+
+  /* Next nodes for the feature bitmap */
+  u32 feat_next_node_index[32];
+
+  /* config vector indexed by sw_if_index */
+  l2_input_config_t *configs;
+
+  /* bridge domain config vector indexed by bd_index */
+  l2_bridge_domain_t *bd_configs;
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} l2input_main_t;
+
+extern l2input_main_t l2input_main;
+
+extern vlib_node_registration_t l2input_node;
+
+static_always_inline l2_bridge_domain_t *
+l2input_bd_config_from_index (l2input_main_t * l2im, u32 bd_index)
+{
+  l2_bridge_domain_t *bd_config;
+
+  bd_config = vec_elt_at_index (l2im->bd_configs, bd_index);
+  return bd_is_valid (bd_config) ? bd_config : NULL;
+}
+
+/* L2 input indication packet is from BVI, using -2 */
+#define L2INPUT_BVI ((u32) (~0-1))
+
+/* L2 input features */
+
+/* Mappings from feature ID to graph node name */
+#define foreach_l2input_feat                    \
+ _(DROP,          "feature-bitmap-drop")        \
+ _(XCONNECT,      "l2-output")                  \
+ _(FLOOD,         "l2-flood")                   \
+ _(ARP_TERM,      "arp-term-l2bd")              \
+ _(UU_FLOOD,      "l2-flood")                   \
+ _(FWD,           "l2-fwd")                     \
+ _(RW,            "l2-rw")                      \
+ _(LEARN,         "l2-learn")                   \
+ _(VTR,           "l2-input-vtr")               \
+ _(VPATH,         "vpath-input-l2")             \
+ _(ACL,           "l2-input-acl")               \
+ _(POLICER_CLAS,  "l2-policer-classify")	\
+ _(INPUT_CLASSIFY, "l2-input-classify")
+
+/* Feature bitmap positions */
+typedef enum
+{
+#define _(sym,str) L2INPUT_FEAT_##sym##_BIT,
+  foreach_l2input_feat
+#undef _
+    L2INPUT_N_FEAT,
+} l2input_feat_t;
+
+/* Feature bit masks */
+typedef enum
+{
+#define _(sym,str) L2INPUT_FEAT_##sym = (1<<L2INPUT_FEAT_##sym##_BIT),
+  foreach_l2input_feat
+#undef _
+} l2input_feat_masks_t;
+
+/** Return an array of strings containing graph node names of each feature */
+char **l2input_get_feat_names (void);
+
+
+static_always_inline u8
+bd_feature_flood (l2_bridge_domain_t * bd_config)
+{
+  return ((bd_config->feature_bitmap & L2INPUT_FEAT_FLOOD) ==
+	  L2INPUT_FEAT_FLOOD);
+}
+
+static_always_inline u8
+bd_feature_uu_flood (l2_bridge_domain_t * bd_config)
+{
+  return ((bd_config->feature_bitmap & L2INPUT_FEAT_UU_FLOOD) ==
+	  L2INPUT_FEAT_UU_FLOOD);
+}
+
+static_always_inline u8
+bd_feature_forward (l2_bridge_domain_t * bd_config)
+{
+  return ((bd_config->feature_bitmap & L2INPUT_FEAT_FWD) == L2INPUT_FEAT_FWD);
+}
+
+static_always_inline u8
+bd_feature_learn (l2_bridge_domain_t * bd_config)
+{
+  return ((bd_config->feature_bitmap & L2INPUT_FEAT_LEARN) ==
+	  L2INPUT_FEAT_LEARN);
+}
+
+static_always_inline u8
+bd_feature_arp_term (l2_bridge_domain_t * bd_config)
+{
+  return ((bd_config->feature_bitmap & L2INPUT_FEAT_ARP_TERM) ==
+	  L2INPUT_FEAT_ARP_TERM);
+}
+
+/** Masks for eliminating features that do not apply to a packet */
+
+/** Get a pointer to the config for the given interface */
+l2_input_config_t *l2input_intf_config (u32 sw_if_index);
+
+/* Enable (or disable) the feature in the bitmap for the given interface */
+u32 l2input_intf_bitmap_enable (u32 sw_if_index,
+				u32 feature_bitmap, u32 enable);
+
+/* Sets modifies flags from a bridge domain */
+u32 l2input_set_bridge_features (u32 bd_index, u32 feat_mask, u32 feat_value);
+
+
+#define MODE_L3        0
+#define MODE_L2_BRIDGE 1
+#define MODE_L2_XC     2
+#define MODE_L2_CLASSIFY 3
+
+#define MODE_ERROR_ETH        1
+#define MODE_ERROR_BVI_DEF    2
+
+u32 set_int_l2_mode (vlib_main_t * vm,
+		     vnet_main_t * vnet_main,
+		     u32 mode,
+		     u32 sw_if_index,
+		     u32 bd_index, u32 bvi, u32 shg, u32 xc_sw_if_index);
+
+static inline void
+vnet_update_l2_len (vlib_buffer_t * b)
+{
+  ethernet_header_t *eth;
+  u16 ethertype;
+  u8 vlan_count = 0;
+
+  /* point at currrent l2 hdr */
+  eth = vlib_buffer_get_current (b);
+
+  /*
+   * l2-output pays no attention to this
+   * but the tag push/pop code on an l2 subif needs it.
+   *
+   * Determine l2 header len, check for up to 2 vlans
+   */
+  vnet_buffer (b)->l2.l2_len = sizeof (ethernet_header_t);
+  ethertype = clib_net_to_host_u16 (eth->type);
+  if (ethernet_frame_is_tagged (ethertype))
+    {
+      ethernet_vlan_header_t *vlan;
+      vnet_buffer (b)->l2.l2_len += sizeof (*vlan);
+      vlan_count = 1;
+      vlan = (void *) (eth + 1);
+      ethertype = clib_net_to_host_u16 (vlan->type);
+      if (ethertype == ETHERNET_TYPE_VLAN)
+	{
+	  vnet_buffer (b)->l2.l2_len += sizeof (*vlan);
+	  vlan_count = 2;
+	}
+    }
+  ethernet_buffer_set_vlan_count (b, vlan_count);
+}
+
+/*
+ * Compute flow hash of an ethernet packet, use 5-tuple hash if L3 packet
+ * is ip4 or ip6. Otherwise hash on smac/dmac/etype.
+ * The vlib buffer current pointer is expected to be at ethernet header
+ * and vnet l2.l2_len is exppected to be setup already.
+ */
+static inline u32
+vnet_l2_compute_flow_hash (vlib_buffer_t * b)
+{
+  ethernet_header_t *eh = vlib_buffer_get_current (b);
+  u8 *l3h = (u8 *) eh + vnet_buffer (b)->l2.l2_len;
+  u16 ethertype = clib_net_to_host_u16 (*(u16 *) (l3h - 2));
+
+  if (ethertype == ETHERNET_TYPE_IP4)
+    return ip4_compute_flow_hash ((ip4_header_t *) l3h, IP_FLOW_HASH_DEFAULT);
+  else if (ethertype == ETHERNET_TYPE_IP6)
+    return ip6_compute_flow_hash ((ip6_header_t *) l3h, IP_FLOW_HASH_DEFAULT);
+  else
+    {
+      u32 a, b, c;
+      u32 *ap = (u32 *) & eh->dst_address[2];
+      u32 *bp = (u32 *) & eh->src_address[2];
+      a = *ap;
+      b = *bp;
+      c = ethertype;
+      hash_v3_mix32 (a, b, c);
+      hash_v3_finalize32 (a, b, c);
+      return c;
+    }
+}
+
+#endif
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_input_acl.c b/src/vnet/l2/l2_input_acl.c
new file mode 100644
index 00000000..104fcd15
--- /dev/null
+++ b/src/vnet/l2/l2_input_acl.c
@@ -0,0 +1,434 @@
+/*
+ * l2_input_acl.c : layer 2 input acl processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/ip/ip_packet.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vlib/cli.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/feat_bitmap.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/cache.h>
+
+#include <vnet/classify/vnet_classify.h>
+#include <vnet/classify/input_acl.h>
+
+typedef struct
+{
+
+  /* Next nodes for each feature */
+  u32 feat_next_node_index[32];
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} l2_inacl_main_t;
+
+typedef struct
+{
+  u32 sw_if_index;
+  u32 next_index;
+  u32 table_index;
+  u32 offset;
+} l2_inacl_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_l2_inacl_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2_inacl_trace_t *t = va_arg (*args, l2_inacl_trace_t *);
+
+  s = format (s, "INACL: sw_if_index %d, next_index %d, table %d, offset %d",
+	      t->sw_if_index, t->next_index, t->table_index, t->offset);
+  return s;
+}
+
+l2_inacl_main_t l2_inacl_main;
+
+static vlib_node_registration_t l2_inacl_node;
+
+#define foreach_l2_inacl_error                  \
+_(NONE, "valid input ACL packets")              \
+_(MISS, "input ACL misses")                     \
+_(HIT, "input ACL hits")                        \
+_(CHAIN_HIT, "input ACL hits after chain walk") \
+_(TABLE_MISS, "input ACL table-miss drops")     \
+_(SESSION_DENY, "input ACL session deny drops")
+
+
+typedef enum
+{
+#define _(sym,str) L2_INACL_ERROR_##sym,
+  foreach_l2_inacl_error
+#undef _
+    L2_INACL_N_ERROR,
+} l2_inacl_error_t;
+
+static char *l2_inacl_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2_inacl_error
+#undef _
+};
+
+static uword
+l2_inacl_node_fn (vlib_main_t * vm,
+		  vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  acl_next_index_t next_index;
+  l2_inacl_main_t *msm = &l2_inacl_main;
+  input_acl_main_t *am = &input_acl_main;
+  vnet_classify_main_t *vcm = am->vnet_classify_main;
+  input_acl_table_id_t tid = INPUT_ACL_TABLE_L2;
+  f64 now = vlib_time_now (vm);
+  u32 hits = 0;
+  u32 misses = 0;
+  u32 chain_hits = 0;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;	/* number of packets to process */
+  next_index = node->cached_next_index;
+
+  /* First pass: compute hashes */
+  while (n_left_from > 2)
+    {
+      vlib_buffer_t *b0, *b1;
+      u32 bi0, bi1;
+      u8 *h0, *h1;
+      u32 sw_if_index0, sw_if_index1;
+      u32 table_index0, table_index1;
+      vnet_classify_table_t *t0, *t1;
+
+      /* prefetch next iteration */
+      {
+	vlib_buffer_t *p1, *p2;
+
+	p1 = vlib_get_buffer (vm, from[1]);
+	p2 = vlib_get_buffer (vm, from[2]);
+
+	vlib_prefetch_buffer_header (p1, STORE);
+	CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE);
+	vlib_prefetch_buffer_header (p2, STORE);
+	CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+      }
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+
+      bi1 = from[1];
+      b1 = vlib_get_buffer (vm, bi1);
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      table_index0 =
+	am->classify_table_index_by_sw_if_index[tid][sw_if_index0];
+
+      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+      table_index1 =
+	am->classify_table_index_by_sw_if_index[tid][sw_if_index1];
+
+      t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+      t1 = pool_elt_at_index (vcm->tables, table_index1);
+
+      if (t0->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
+	h0 = (void *) vlib_buffer_get_current (b0) + t0->current_data_offset;
+      else
+	h0 = b0->data;
+
+      vnet_buffer (b0)->l2_classify.hash =
+	vnet_classify_hash_packet (t0, (u8 *) h0);
+
+      vnet_classify_prefetch_bucket (t0, vnet_buffer (b0)->l2_classify.hash);
+
+      if (t1->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
+	h1 = (void *) vlib_buffer_get_current (b1) + t1->current_data_offset;
+      else
+	h1 = b1->data;
+
+      vnet_buffer (b1)->l2_classify.hash =
+	vnet_classify_hash_packet (t1, (u8 *) h1);
+
+      vnet_classify_prefetch_bucket (t1, vnet_buffer (b1)->l2_classify.hash);
+
+      vnet_buffer (b0)->l2_classify.table_index = table_index0;
+
+      vnet_buffer (b1)->l2_classify.table_index = table_index1;
+
+      from += 2;
+      n_left_from -= 2;
+    }
+
+  while (n_left_from > 0)
+    {
+      vlib_buffer_t *b0;
+      u32 bi0;
+      u8 *h0;
+      u32 sw_if_index0;
+      u32 table_index0;
+      vnet_classify_table_t *t0;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      table_index0 =
+	am->classify_table_index_by_sw_if_index[tid][sw_if_index0];
+
+      t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+      if (t0->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
+	h0 = (void *) vlib_buffer_get_current (b0) + t0->current_data_offset;
+      else
+	h0 = b0->data;
+
+      vnet_buffer (b0)->l2_classify.hash =
+	vnet_classify_hash_packet (t0, (u8 *) h0);
+
+      vnet_buffer (b0)->l2_classify.table_index = table_index0;
+      vnet_classify_prefetch_bucket (t0, vnet_buffer (b0)->l2_classify.hash);
+
+      from++;
+      n_left_from--;
+    }
+
+  next_index = node->cached_next_index;
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /* Not enough load/store slots to dual loop... */
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0 = ACL_NEXT_INDEX_DENY;
+	  u32 table_index0;
+	  vnet_classify_table_t *t0;
+	  vnet_classify_entry_t *e0;
+	  u64 hash0;
+	  u8 *h0;
+	  u8 error0;
+
+	  /* Stride 3 seems to work best */
+	  if (PREDICT_TRUE (n_left_from > 3))
+	    {
+	      vlib_buffer_t *p1 = vlib_get_buffer (vm, from[3]);
+	      vnet_classify_table_t *tp1;
+	      u32 table_index1;
+	      u64 phash1;
+
+	      table_index1 = vnet_buffer (p1)->l2_classify.table_index;
+
+	      if (PREDICT_TRUE (table_index1 != ~0))
+		{
+		  tp1 = pool_elt_at_index (vcm->tables, table_index1);
+		  phash1 = vnet_buffer (p1)->l2_classify.hash;
+		  vnet_classify_prefetch_entry (tp1, phash1);
+		}
+	    }
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  table_index0 = vnet_buffer (b0)->l2_classify.table_index;
+	  e0 = 0;
+	  t0 = 0;
+
+	  /* Feature bitmap update */
+	  vnet_buffer (b0)->l2.feature_bitmap &= ~L2INPUT_FEAT_ACL;
+
+	  vnet_buffer (b0)->l2_classify.opaque_index = ~0;
+	  /* Determine the next node */
+	  next0 = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
+						   vnet_buffer (b0)->
+						   l2.feature_bitmap);
+
+	  if (PREDICT_TRUE (table_index0 != ~0))
+	    {
+	      hash0 = vnet_buffer (b0)->l2_classify.hash;
+	      t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+	      if (t0->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
+		h0 =
+		  (void *) vlib_buffer_get_current (b0) +
+		  t0->current_data_offset;
+	      else
+		h0 = b0->data;
+
+	      e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
+	      if (e0)
+		{
+		  vnet_buffer (b0)->l2_classify.opaque_index
+		    = e0->opaque_index;
+		  vlib_buffer_advance (b0, e0->advance);
+
+		  next0 = (e0->next_index < ACL_NEXT_INDEX_N_NEXT) ?
+		    e0->next_index : next0;
+
+		  hits++;
+
+		  error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
+		    L2_INACL_ERROR_SESSION_DENY : L2_INACL_ERROR_NONE;
+		  b0->error = node->errors[error0];
+		}
+	      else
+		{
+		  while (1)
+		    {
+		      if (PREDICT_TRUE (t0->next_table_index != ~0))
+			t0 = pool_elt_at_index (vcm->tables,
+						t0->next_table_index);
+		      else
+			{
+			  next0 =
+			    (t0->miss_next_index <
+			     ACL_NEXT_INDEX_N_NEXT) ? t0->miss_next_index :
+			    next0;
+
+			  misses++;
+
+			  error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
+			    L2_INACL_ERROR_TABLE_MISS : L2_INACL_ERROR_NONE;
+			  b0->error = node->errors[error0];
+			  break;
+			}
+
+		      if (t0->current_data_flag ==
+			  CLASSIFY_FLAG_USE_CURR_DATA)
+			h0 =
+			  (void *) vlib_buffer_get_current (b0) +
+			  t0->current_data_offset;
+		      else
+			h0 = b0->data;
+
+		      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
+		      e0 = vnet_classify_find_entry
+			(t0, (u8 *) h0, hash0, now);
+		      if (e0)
+			{
+			  vlib_buffer_advance (b0, e0->advance);
+			  next0 = (e0->next_index < ACL_NEXT_INDEX_N_NEXT) ?
+			    e0->next_index : next0;
+			  hits++;
+			  chain_hits++;
+
+			  error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
+			    L2_INACL_ERROR_SESSION_DENY : L2_INACL_ERROR_NONE;
+			  b0->error = node->errors[error0];
+			  break;
+			}
+		    }
+		}
+	    }
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      l2_inacl_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	      t->next_index = next0;
+	      t->table_index = t0 ? t0 - vcm->tables : ~0;
+	      t->offset = (t0 && e0) ? vnet_classify_get_offset (t0, e0) : ~0;
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, node->node_index,
+			       L2_INACL_ERROR_MISS, misses);
+  vlib_node_increment_counter (vm, node->node_index,
+			       L2_INACL_ERROR_HIT, hits);
+  vlib_node_increment_counter (vm, node->node_index,
+			       L2_INACL_ERROR_CHAIN_HIT, chain_hits);
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2_inacl_node,static) = {
+  .function = l2_inacl_node_fn,
+  .name = "l2-input-acl",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2_inacl_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2_inacl_error_strings),
+  .error_strings = l2_inacl_error_strings,
+
+  .n_next_nodes = ACL_NEXT_INDEX_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+       [ACL_NEXT_INDEX_DENY]  = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2_inacl_node, l2_inacl_node_fn)
+     clib_error_t *l2_inacl_init (vlib_main_t * vm)
+{
+  l2_inacl_main_t *mp = &l2_inacl_main;
+
+  mp->vlib_main = vm;
+  mp->vnet_main = vnet_get_main ();
+
+  /* Initialize the feature next-node indexes */
+  feat_bitmap_init_next_nodes (vm,
+			       l2_inacl_node.index,
+			       L2INPUT_N_FEAT,
+			       l2input_get_feat_names (),
+			       mp->feat_next_node_index);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2_inacl_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_input_classify.c b/src/vnet/l2/l2_input_classify.c
new file mode 100644
index 00000000..497df192
--- /dev/null
+++ b/src/vnet/l2/l2_input_classify.c
@@ -0,0 +1,655 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * l2_classify.c
+ */
+
+#include <vnet/l2/l2_classify.h>
+#include <vnet/api_errno.h>
+
+/**
+ * @file
+ * @brief L2 input classifier.
+ *
+ * @sa @ref vnet/vnet/classify/vnet_classify.c
+ * @sa @ref vnet/vnet/classify/vnet_classify.h
+ */
+
+/**
+ * @brief l2_input_classifier packet trace record.
+ */
+typedef struct
+{
+  /** interface handle for the ith packet */
+  u32 sw_if_index;
+  /** graph arc index selected for this packet */
+  u32 next_index;
+  /** classifier table which provided the final result */
+  u32 table_index;
+  /** offset in classifier heap of the corresponding session */
+  u32 session_offset;
+} l2_input_classify_trace_t;
+
+/**
+ * @brief vlib node runtime.
+ */
+typedef struct
+{
+  /** use-case independent main object pointer */
+  vnet_classify_main_t *vcm;
+  /** l2 input classifier main object pointer */
+  l2_input_classify_main_t *l2cm;
+} l2_input_classify_runtime_t;
+
+/** Packet trace format function. */
+static u8 *
+format_l2_input_classify_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2_input_classify_trace_t *t = va_arg (*args, l2_input_classify_trace_t *);
+
+  s = format (s, "l2-classify: sw_if_index %d, table %d, offset %x, next %d",
+	      t->sw_if_index, t->table_index, t->session_offset,
+	      t->next_index);
+  return s;
+}
+
+/** l2 input classifier main data structure. */
+l2_input_classify_main_t l2_input_classify_main;
+
+vlib_node_registration_t l2_input_classify_node;
+
+#define foreach_l2_input_classify_error               \
+_(MISS, "Classify misses")                      \
+_(HIT, "Classify hits")                         \
+_(CHAIN_HIT, "Classify hits after chain walk")  \
+_(DROP, "L2 Classify Drops")
+
+typedef enum
+{
+#define _(sym,str) L2_INPUT_CLASSIFY_ERROR_##sym,
+  foreach_l2_input_classify_error
+#undef _
+    L2_INPUT_CLASSIFY_N_ERROR,
+} l2_input_classify_error_t;
+
+static char *l2_input_classify_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2_input_classify_error
+#undef _
+};
+
+/**
+ * @brief l2 input classifier node.
+ * @node l2-input-classify
+ *
+ * This is the l2 input classifier dispatch node
+ *
+ * @param vm    vlib_main_t corresponding to the current thread.
+ * @param node  vlib_node_runtime_t data for this node.
+ * @param frame vlib_frame_t whose contents should be dispatched.
+ *
+ * @par Graph mechanics: buffer metadata, next index usage
+ *
+ * @em Uses:
+ * - <code>(l2_input_classify_runtime_t *)
+ *         rt->classify_table_index_by_sw_if_index</code>
+ *	- Head of the per-interface, per-protocol classifier table chain
+ * 	  for a specific interface.
+ *      - @c ~0 => send pkts to the next feature in the L2 feature chain.
+ * - <code>vnet_buffer(b)->sw_if_index[VLIB_RX]</code>
+ * 	- Indicates the @c sw_if_index value of the interface that the
+ * 	  packet was received on.
+ * - <code>vnet_buffer(b0)->l2.feature_bitmap</code>
+ * 	- Used to steer packets across l2 features enabled on the interface
+ * - <code>(vnet_classify_entry_t) e0->next_index</code>
+ *	- Used to steer traffic when the classifier hits on a session
+ * - <code>(vnet_classify_entry_t) e0->advance</code>
+ *	- Signed quantity applied via <code>vlib_buffer_advance</code>
+ * 	  when the classifier hits on a session
+ * - <code>(vnet_classify_table_t) t0->miss_next_index</code>
+ *	- Used to steer traffic when the classifier misses
+ *
+ * @em Sets:
+ * - <code>vnet_buffer (b0)->l2_classify.table_index</code>
+ * 	- Classifier table index of the first classifier table in
+ *	the classifier table chain
+ * - <code>vnet_buffer (b0)->l2_classify.hash</code>
+ * 	- Bounded-index extensible hash corresponding to the
+ *	masked fields in the current packet
+ * - <code>vnet_buffer (b0)->l2.feature_bitmap</code>
+ * 	- Used to steer packets across l2 features enabled on the interface
+ * - <code>vnet_buffer (b0)->l2_classify.opaque_index</code>
+ * 	- Copied from the classifier session object upon classifier hit
+ *
+ * @em Counters:
+ * - <code>L2_INPUT_CLASSIFY_ERROR_MISS</code> Classifier misses
+ * - <code>L2_INPUT_CLASSIFY_ERROR_HIT</code> Classifier hits
+ * - <code>L2_INPUT_CLASSIFY_ERROR_CHAIN_HIT</code>
+ *   Classifier hits in other than the first table
+ */
+
+static uword
+l2_input_classify_node_fn (vlib_main_t * vm,
+			   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  l2_input_classify_next_t next_index;
+  l2_input_classify_main_t *cm = &l2_input_classify_main;
+  vnet_classify_main_t *vcm = cm->vnet_classify_main;
+  l2_input_classify_runtime_t *rt =
+    (l2_input_classify_runtime_t *) node->runtime_data;
+  u32 feature_bitmap;
+  u32 hits = 0;
+  u32 misses = 0;
+  u32 chain_hits = 0;
+  f64 now;
+  u32 n_next_nodes;
+
+  n_next_nodes = node->n_next_nodes;
+
+  now = vlib_time_now (vm);
+
+  n_left_from = frame->n_vectors;
+  from = vlib_frame_vector_args (frame);
+
+  /* First pass: compute hash */
+
+  while (n_left_from > 2)
+    {
+      vlib_buffer_t *b0, *b1;
+      u32 bi0, bi1;
+      ethernet_header_t *h0, *h1;
+      u32 sw_if_index0, sw_if_index1;
+      u16 type0, type1;
+      int type_index0, type_index1;
+      vnet_classify_table_t *t0, *t1;
+      u32 table_index0, table_index1;
+      u64 hash0, hash1;
+
+
+      /* prefetch next iteration */
+      {
+	vlib_buffer_t *p1, *p2;
+
+	p1 = vlib_get_buffer (vm, from[1]);
+	p2 = vlib_get_buffer (vm, from[2]);
+
+	vlib_prefetch_buffer_header (p1, STORE);
+	CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE);
+	vlib_prefetch_buffer_header (p2, STORE);
+	CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+      }
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      h0 = vlib_buffer_get_current (b0);
+
+      bi1 = from[1];
+      b1 = vlib_get_buffer (vm, bi1);
+      h1 = vlib_buffer_get_current (b1);
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      vnet_buffer (b0)->l2_classify.table_index = ~0;
+
+      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+      vnet_buffer (b1)->l2_classify.table_index = ~0;
+
+      /* Select classifier table based on ethertype */
+      type0 = clib_net_to_host_u16 (h0->type);
+      type1 = clib_net_to_host_u16 (h1->type);
+
+      type_index0 = (type0 == ETHERNET_TYPE_IP4)
+	? L2_INPUT_CLASSIFY_TABLE_IP4 : L2_INPUT_CLASSIFY_TABLE_OTHER;
+      type_index0 = (type0 == ETHERNET_TYPE_IP6)
+	? L2_INPUT_CLASSIFY_TABLE_IP6 : type_index0;
+
+      type_index1 = (type1 == ETHERNET_TYPE_IP4)
+	? L2_INPUT_CLASSIFY_TABLE_IP4 : L2_INPUT_CLASSIFY_TABLE_OTHER;
+      type_index1 = (type1 == ETHERNET_TYPE_IP6)
+	? L2_INPUT_CLASSIFY_TABLE_IP6 : type_index1;
+
+      vnet_buffer (b0)->l2_classify.table_index =
+	table_index0 =
+	rt->l2cm->classify_table_index_by_sw_if_index
+	[type_index0][sw_if_index0];
+
+      if (table_index0 != ~0)
+	{
+	  t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+	  vnet_buffer (b0)->l2_classify.hash = hash0 =
+	    vnet_classify_hash_packet (t0, (u8 *) h0);
+	  vnet_classify_prefetch_bucket (t0, hash0);
+	}
+
+      vnet_buffer (b1)->l2_classify.table_index =
+	table_index1 =
+	rt->l2cm->classify_table_index_by_sw_if_index
+	[type_index1][sw_if_index1];
+
+      if (table_index1 != ~0)
+	{
+	  t1 = pool_elt_at_index (vcm->tables, table_index1);
+
+	  vnet_buffer (b1)->l2_classify.hash = hash1 =
+	    vnet_classify_hash_packet (t1, (u8 *) h1);
+	  vnet_classify_prefetch_bucket (t1, hash1);
+	}
+
+      from += 2;
+      n_left_from -= 2;
+    }
+
+  while (n_left_from > 0)
+    {
+      vlib_buffer_t *b0;
+      u32 bi0;
+      ethernet_header_t *h0;
+      u32 sw_if_index0;
+      u16 type0;
+      u32 type_index0;
+      vnet_classify_table_t *t0;
+      u32 table_index0;
+      u64 hash0;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      h0 = vlib_buffer_get_current (b0);
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      vnet_buffer (b0)->l2_classify.table_index = ~0;
+
+      /* Select classifier table based on ethertype */
+      type0 = clib_net_to_host_u16 (h0->type);
+
+      type_index0 = (type0 == ETHERNET_TYPE_IP4)
+	? L2_INPUT_CLASSIFY_TABLE_IP4 : L2_INPUT_CLASSIFY_TABLE_OTHER;
+      type_index0 = (type0 == ETHERNET_TYPE_IP6)
+	? L2_INPUT_CLASSIFY_TABLE_IP6 : type_index0;
+
+      vnet_buffer (b0)->l2_classify.table_index =
+	table_index0 = rt->l2cm->classify_table_index_by_sw_if_index
+	[type_index0][sw_if_index0];
+
+      if (table_index0 != ~0)
+	{
+	  t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+	  vnet_buffer (b0)->l2_classify.hash = hash0 =
+	    vnet_classify_hash_packet (t0, (u8 *) h0);
+	  vnet_classify_prefetch_bucket (t0, hash0);
+	}
+      from++;
+      n_left_from--;
+    }
+
+  next_index = node->cached_next_index;
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /* Not enough load/store slots to dual loop... */
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0 = ~0;	/* next l2 input feature, please... */
+	  ethernet_header_t *h0;
+	  u32 table_index0;
+	  u64 hash0;
+	  vnet_classify_table_t *t0;
+	  vnet_classify_entry_t *e0;
+
+	  if (PREDICT_TRUE (n_left_from > 2))
+	    {
+	      vlib_buffer_t *p2 = vlib_get_buffer (vm, from[2]);
+	      u64 phash2;
+	      u32 table_index2;
+	      vnet_classify_table_t *tp2;
+
+	      /*
+	       * Prefetch table entry two ahead. Buffer / data
+	       * were prefetched above...
+	       */
+	      table_index2 = vnet_buffer (p2)->l2_classify.table_index;
+
+	      if (PREDICT_TRUE (table_index2 != ~0))
+		{
+		  tp2 = pool_elt_at_index (vcm->tables, table_index2);
+		  phash2 = vnet_buffer (p2)->l2_classify.hash;
+		  vnet_classify_prefetch_entry (tp2, phash2);
+		}
+	    }
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  h0 = vlib_buffer_get_current (b0);
+	  table_index0 = vnet_buffer (b0)->l2_classify.table_index;
+	  e0 = 0;
+	  vnet_buffer (b0)->l2_classify.opaque_index = ~0;
+
+	  /* Remove ourself from the feature bitmap */
+	  feature_bitmap = vnet_buffer (b0)->l2.feature_bitmap
+	    & ~L2INPUT_FEAT_INPUT_CLASSIFY;
+
+	  /* save for next feature graph nodes */
+	  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap;
+
+	  if (PREDICT_TRUE (table_index0 != ~0))
+	    {
+	      hash0 = vnet_buffer (b0)->l2_classify.hash;
+	      t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+	      e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
+	      if (e0)
+		{
+		  vnet_buffer (b0)->l2_classify.opaque_index
+		    = e0->opaque_index;
+		  vlib_buffer_advance (b0, e0->advance);
+		  next0 = (e0->next_index < n_next_nodes) ?
+		    e0->next_index : next0;
+		  hits++;
+		}
+	      else
+		{
+		  while (1)
+		    {
+		      if (t0->next_table_index != ~0)
+			t0 = pool_elt_at_index (vcm->tables,
+						t0->next_table_index);
+		      else
+			{
+			  next0 = (t0->miss_next_index < n_next_nodes) ?
+			    t0->miss_next_index : next0;
+			  misses++;
+			  break;
+			}
+
+		      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
+		      e0 =
+			vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
+		      if (e0)
+			{
+			  vnet_buffer (b0)->l2_classify.opaque_index
+			    = e0->opaque_index;
+			  vlib_buffer_advance (b0, e0->advance);
+			  next0 = (e0->next_index < n_next_nodes) ?
+			    e0->next_index : next0;
+			  hits++;
+			  chain_hits++;
+			  break;
+			}
+		    }
+		}
+	    }
+
+	  if (PREDICT_FALSE (next0 == 0))
+	    b0->error = node->errors[L2_INPUT_CLASSIFY_ERROR_DROP];
+
+	  if (PREDICT_TRUE (next0 == ~0))
+	    {
+	      // Determine the next node
+	      next0 =
+		feat_bitmap_get_next_node_index (cm->feat_next_node_index,
+						 feature_bitmap);
+	    }
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      l2_input_classify_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	      t->table_index = table_index0;
+	      t->next_index = next0;
+	      t->session_offset = e0 ? vnet_classify_get_offset (t0, e0) : 0;
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, node->node_index,
+			       L2_INPUT_CLASSIFY_ERROR_MISS, misses);
+  vlib_node_increment_counter (vm, node->node_index,
+			       L2_INPUT_CLASSIFY_ERROR_HIT, hits);
+  vlib_node_increment_counter (vm, node->node_index,
+			       L2_INPUT_CLASSIFY_ERROR_CHAIN_HIT, chain_hits);
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2_input_classify_node) = {
+  .function = l2_input_classify_node_fn,
+  .name = "l2-input-classify",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2_input_classify_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2_input_classify_error_strings),
+  .error_strings = l2_input_classify_error_strings,
+
+  .runtime_data_bytes = sizeof (l2_input_classify_runtime_t),
+
+  .n_next_nodes = L2_INPUT_CLASSIFY_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [L2_INPUT_CLASSIFY_NEXT_DROP]  = "error-drop",
+    [L2_INPUT_CLASSIFY_NEXT_ETHERNET_INPUT] = "ethernet-input-not-l2",
+    [L2_INPUT_CLASSIFY_NEXT_IP4_INPUT] = "ip4-input",
+    [L2_INPUT_CLASSIFY_NEXT_IP6_INPUT] = "ip6-input",
+    [L2_INPUT_CLASSIFY_NEXT_LI] = "li-hit",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2_input_classify_node,
+			      l2_input_classify_node_fn);
+
+/** l2 input classsifier feature initialization. */
+clib_error_t *
+l2_input_classify_init (vlib_main_t * vm)
+{
+  l2_input_classify_main_t *cm = &l2_input_classify_main;
+  l2_input_classify_runtime_t *rt;
+
+  rt = vlib_node_get_runtime_data (vm, l2_input_classify_node.index);
+
+  cm->vlib_main = vm;
+  cm->vnet_main = vnet_get_main ();
+  cm->vnet_classify_main = &vnet_classify_main;
+
+  /* Initialize the feature next-node indexes */
+  feat_bitmap_init_next_nodes (vm,
+			       l2_input_classify_node.index,
+			       L2INPUT_N_FEAT,
+			       l2input_get_feat_names (),
+			       cm->feat_next_node_index);
+  rt->l2cm = cm;
+  rt->vcm = cm->vnet_classify_main;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2_input_classify_init);
+
+
+/** Enable/disable l2 input classification on a specific interface. */
+void
+vnet_l2_input_classify_enable_disable (u32 sw_if_index, int enable_disable)
+{
+  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_INPUT_CLASSIFY,
+			      (u32) enable_disable);
+}
+
+/** @brief Set l2 per-protocol, per-interface input classification tables.
+ *
+ *  @param sw_if_index  interface handle
+ *  @param ip4_table_index  ip4 classification table index, or ~0
+ *  @param ip6_table_index  ip6 classification table index, or ~0
+ *  @param other_table_index  non-ip4, non-ip6 classification table index,
+ *         or ~0
+ *  @returns 0 on success, VNET_API_ERROR_NO_SUCH_TABLE, TABLE2, TABLE3
+ *  if the indicated (non-~0) table does not exist.
+ */
+
+int
+vnet_l2_input_classify_set_tables (u32 sw_if_index,
+				   u32 ip4_table_index,
+				   u32 ip6_table_index, u32 other_table_index)
+{
+  l2_input_classify_main_t *cm = &l2_input_classify_main;
+  vnet_classify_main_t *vcm = cm->vnet_classify_main;
+
+  /* Assume that we've validated sw_if_index in the API layer */
+
+  if (ip4_table_index != ~0 &&
+      pool_is_free_index (vcm->tables, ip4_table_index))
+    return VNET_API_ERROR_NO_SUCH_TABLE;
+
+  if (ip6_table_index != ~0 &&
+      pool_is_free_index (vcm->tables, ip6_table_index))
+    return VNET_API_ERROR_NO_SUCH_TABLE2;
+
+  if (other_table_index != ~0 &&
+      pool_is_free_index (vcm->tables, other_table_index))
+    return VNET_API_ERROR_NO_SUCH_TABLE3;
+
+  vec_validate
+    (cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP4],
+     sw_if_index);
+
+  vec_validate
+    (cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP6],
+     sw_if_index);
+
+  vec_validate
+    (cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_OTHER],
+     sw_if_index);
+
+  cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP4]
+    [sw_if_index] = ip4_table_index;
+
+  cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP6]
+    [sw_if_index] = ip6_table_index;
+
+  cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_OTHER]
+    [sw_if_index] = other_table_index;
+
+  return 0;
+}
+
+static clib_error_t *
+int_l2_input_classify_command_fn (vlib_main_t * vm,
+				  unformat_input_t * input,
+				  vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index = ~0;
+  u32 ip4_table_index = ~0;
+  u32 ip6_table_index = ~0;
+  u32 other_table_index = ~0;
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "intfc %U", unformat_vnet_sw_interface,
+		    vnm, &sw_if_index))
+	;
+      else if (unformat (input, "ip4-table %d", &ip4_table_index))
+	;
+      else if (unformat (input, "ip6-table %d", &ip6_table_index))
+	;
+      else if (unformat (input, "other-table %d", &other_table_index))
+	;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "interface must be specified");
+
+
+  if (ip4_table_index == ~0 && ip6_table_index == ~0
+      && other_table_index == ~0)
+    {
+      vlib_cli_output (vm, "L2 classification disabled");
+      vnet_l2_input_classify_enable_disable (sw_if_index, 0 /* enable */ );
+      return 0;
+    }
+
+  rv = vnet_l2_input_classify_set_tables (sw_if_index, ip4_table_index,
+					  ip6_table_index, other_table_index);
+  switch (rv)
+    {
+    case 0:
+      vnet_l2_input_classify_enable_disable (sw_if_index, 1 /* enable */ );
+      break;
+
+    default:
+      return clib_error_return (0, "vnet_l2_input_classify_set_tables: %d",
+				rv);
+      break;
+    }
+
+  return 0;
+}
+
+/*?
+ * Configure l2 input classification.
+ *
+ * @cliexpar
+ * @cliexstart{set interface l2 input classify intfc <interface-name> [ip4-table <index>] [ip6-table <index>] [other-table <index>]}
+ * @cliexend
+ * @todo This is incomplete. This needs a detailed description and a
+ * practical example.
+ ?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (int_l2_input_classify_cli, static) = {
+  .path = "set interface l2 input classify",
+  .short_help =
+  "set interface l2 input classify intfc <interface-name> [ip4-table <n>]\n"
+  "  [ip6-table <n>] [other-table <n>]",
+  .function = int_l2_input_classify_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_input_vtr.c b/src/vnet/l2/l2_input_vtr.c
new file mode 100644
index 00000000..60a39631
--- /dev/null
+++ b/src/vnet/l2/l2_input_vtr.c
@@ -0,0 +1,401 @@
+/*
+ * l2_input_vtr.c : layer 2 input vlan tag rewrite processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/feat_bitmap.h>
+#include <vnet/l2/l2_vtr.h>
+#include <vnet/l2/l2_input_vtr.h>
+#include <vnet/l2/l2_output.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/cache.h>
+
+
+typedef struct
+{
+  /* per-pkt trace data */
+  u8 src[6];
+  u8 dst[6];
+  u8 raw[12];			/* raw data (vlans) */
+  u32 sw_if_index;
+} l2_invtr_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_l2_invtr_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2_invtr_trace_t *t = va_arg (*args, l2_invtr_trace_t *);
+
+  s = format (s, "l2-input-vtr: sw_if_index %d dst %U src %U data "
+	      "%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+	      t->sw_if_index,
+	      format_ethernet_address, t->dst,
+	      format_ethernet_address, t->src,
+	      t->raw[0], t->raw[1], t->raw[2], t->raw[3], t->raw[4],
+	      t->raw[5], t->raw[6], t->raw[7], t->raw[8], t->raw[9],
+	      t->raw[10], t->raw[11]);
+  return s;
+}
+
+l2_invtr_main_t l2_invtr_main;
+
+static vlib_node_registration_t l2_invtr_node;
+
+#define foreach_l2_invtr_error			\
+_(L2_INVTR,    "L2 inverter packets")		\
+_(DROP,        "L2 input tag rewrite drops")
+
+typedef enum
+{
+#define _(sym,str) L2_INVTR_ERROR_##sym,
+  foreach_l2_invtr_error
+#undef _
+    L2_INVTR_N_ERROR,
+} l2_invtr_error_t;
+
+static char *l2_invtr_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2_invtr_error
+#undef _
+};
+
+typedef enum
+{
+  L2_INVTR_NEXT_DROP,
+  L2_INVTR_N_NEXT,
+} l2_invtr_next_t;
+
+
+static uword
+l2_invtr_node_fn (vlib_main_t * vm,
+		  vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  l2_invtr_next_t next_index;
+  l2_invtr_main_t *msm = &l2_invtr_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;	/* number of packets to process */
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      /* get space to enqueue frame to graph node "next_index" */
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 6 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+	  u32 sw_if_index0, sw_if_index1;
+	  u32 feature_bitmap0, feature_bitmap1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3, *p4, *p5;
+	    u32 sw_if_index2, sw_if_index3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+	    p4 = vlib_get_buffer (vm, from[4]);
+	    p5 = vlib_get_buffer (vm, from[5]);
+
+	    /* Prefetch the buffer header and packet for the N+2 loop iteration */
+	    vlib_prefetch_buffer_header (p4, LOAD);
+	    vlib_prefetch_buffer_header (p5, LOAD);
+
+	    CLIB_PREFETCH (p4->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p5->data, CLIB_CACHE_LINE_BYTES, STORE);
+
+	    /*
+	     * Prefetch the input config for the N+1 loop iteration
+	     * This depends on the buffer header above
+	     */
+	    sw_if_index2 = vnet_buffer (p2)->sw_if_index[VLIB_RX];
+	    sw_if_index3 = vnet_buffer (p3)->sw_if_index[VLIB_RX];
+	    CLIB_PREFETCH (vec_elt_at_index
+			   (l2output_main.configs, sw_if_index2),
+			   CLIB_CACHE_LINE_BYTES, LOAD);
+	    CLIB_PREFETCH (vec_elt_at_index
+			   (l2output_main.configs, sw_if_index3),
+			   CLIB_CACHE_LINE_BYTES, LOAD);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  /* bi is "buffer index", b is pointer to the buffer */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /* RX interface handles */
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+
+	  /* process 2 packets */
+
+	  /* Remove ourself from the feature bitmap */
+	  feature_bitmap0 =
+	    vnet_buffer (b0)->l2.feature_bitmap & ~L2INPUT_FEAT_VTR;
+	  feature_bitmap1 =
+	    vnet_buffer (b1)->l2.feature_bitmap & ~L2INPUT_FEAT_VTR;
+
+	  /* save for next feature graph nodes */
+	  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap0;
+	  vnet_buffer (b1)->l2.feature_bitmap = feature_bitmap1;
+
+	  /* Determine the next node */
+	  next0 = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
+						   feature_bitmap0);
+	  next1 = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
+						   feature_bitmap1);
+
+	  l2_output_config_t *config0;
+	  l2_output_config_t *config1;
+	  config0 = vec_elt_at_index (l2output_main.configs, sw_if_index0);
+	  config1 = vec_elt_at_index (l2output_main.configs, sw_if_index1);
+
+	  if (PREDICT_FALSE (config0->out_vtr_flag))
+	    {
+	      if (config0->output_vtr.push_and_pop_bytes)
+		{
+		  /* perform the tag rewrite on two packets */
+		  if (l2_vtr_process
+		      (b0,
+		       &(vec_elt_at_index
+			 (l2output_main.configs, sw_if_index0)->input_vtr)))
+		    {
+		      /* Drop packet */
+		      next0 = L2_INVTR_NEXT_DROP;
+		      b0->error = node->errors[L2_INVTR_ERROR_DROP];
+		    }
+		}
+	      else if (config0->output_pbb_vtr.push_and_pop_bytes)
+		{
+		  if (l2_pbb_process (b0, &(config0->input_pbb_vtr)))
+		    {
+		      /* Drop packet */
+		      next0 = L2_INVTR_NEXT_DROP;
+		      b0->error = node->errors[L2_INVTR_ERROR_DROP];
+		    }
+		}
+	    }
+	  if (PREDICT_FALSE (config1->out_vtr_flag))
+	    {
+	      if (config1->output_vtr.push_and_pop_bytes)
+		{
+		  if (l2_vtr_process
+		      (b1,
+		       &(vec_elt_at_index
+			 (l2output_main.configs, sw_if_index1)->input_vtr)))
+		    {
+		      /* Drop packet */
+		      next1 = L2_INVTR_NEXT_DROP;
+		      b1->error = node->errors[L2_INVTR_ERROR_DROP];
+		    }
+		}
+	      else if (config1->output_pbb_vtr.push_and_pop_bytes)
+		{
+		  if (l2_pbb_process (b1, &(config1->input_pbb_vtr)))
+		    {
+		      /* Drop packet */
+		      next1 = L2_INVTR_NEXT_DROP;
+		      b1->error = node->errors[L2_INVTR_ERROR_DROP];
+		    }
+		}
+	    }
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2_invtr_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  ethernet_header_t *h0 = vlib_buffer_get_current (b0);
+		  t->sw_if_index = sw_if_index0;
+		  clib_memcpy (t->src, h0->src_address, 6);
+		  clib_memcpy (t->dst, h0->dst_address, 6);
+		  clib_memcpy (t->raw, &h0->type, sizeof (t->raw));
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2_invtr_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  ethernet_header_t *h1 = vlib_buffer_get_current (b1);
+		  t->sw_if_index = sw_if_index0;
+		  clib_memcpy (t->src, h1->src_address, 6);
+		  clib_memcpy (t->dst, h1->dst_address, 6);
+		  clib_memcpy (t->raw, &h1->type, sizeof (t->raw));
+		}
+	    }
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  /* if next0==next1==next_index then nothing special needs to be done */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 sw_if_index0;
+	  u32 feature_bitmap0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+	  /* process 1 packet */
+
+	  /* Remove ourself from the feature bitmap */
+	  feature_bitmap0 =
+	    vnet_buffer (b0)->l2.feature_bitmap & ~L2INPUT_FEAT_VTR;
+
+	  /* save for next feature graph nodes */
+	  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap0;
+
+	  /* Determine the next node */
+	  next0 = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
+						   feature_bitmap0);
+
+	  l2_output_config_t *config0;
+	  config0 = vec_elt_at_index (l2output_main.configs, sw_if_index0);
+
+	  if (PREDICT_FALSE (config0->out_vtr_flag))
+	    {
+	      if (config0->output_vtr.push_and_pop_bytes)
+		{
+		  /* perform the tag rewrite on one packet */
+		  if (l2_vtr_process
+		      (b0,
+		       &(vec_elt_at_index
+			 (l2output_main.configs, sw_if_index0)->input_vtr)))
+		    {
+		      /* Drop packet */
+		      next0 = L2_INVTR_NEXT_DROP;
+		      b0->error = node->errors[L2_INVTR_ERROR_DROP];
+		    }
+		}
+	      else if (config0->output_pbb_vtr.push_and_pop_bytes)
+		{
+		  if (l2_pbb_process (b0, &(config0->input_pbb_vtr)))
+		    {
+		      /* Drop packet */
+		      next0 = L2_INVTR_NEXT_DROP;
+		      b0->error = node->errors[L2_INVTR_ERROR_DROP];
+		    }
+		}
+	    }
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      l2_invtr_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      ethernet_header_t *h0 = vlib_buffer_get_current (b0);
+	      t->sw_if_index = sw_if_index0;
+	      clib_memcpy (t->src, h0->src_address, 6);
+	      clib_memcpy (t->dst, h0->dst_address, 6);
+	      clib_memcpy (t->raw, &h0->type, sizeof (t->raw));
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2_invtr_node,static) = {
+  .function = l2_invtr_node_fn,
+  .name = "l2-input-vtr",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2_invtr_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2_invtr_error_strings),
+  .error_strings = l2_invtr_error_strings,
+
+  .n_next_nodes = L2_INVTR_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+       [L2_INVTR_NEXT_DROP]  = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2_invtr_node, l2_invtr_node_fn)
+     clib_error_t *l2_invtr_init (vlib_main_t * vm)
+{
+  l2_invtr_main_t *mp = &l2_invtr_main;
+
+  mp->vlib_main = vm;
+  mp->vnet_main = vnet_get_main ();
+
+  /* Initialize the feature next-node indexes */
+  feat_bitmap_init_next_nodes (vm,
+			       l2_invtr_node.index,
+			       L2INPUT_N_FEAT,
+			       l2input_get_feat_names (),
+			       mp->feat_next_node_index);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2_invtr_init);
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_input_vtr.h b/src/vnet/l2/l2_input_vtr.h
new file mode 100644
index 00000000..f248669e
--- /dev/null
+++ b/src/vnet/l2/l2_input_vtr.h
@@ -0,0 +1,54 @@
+/*
+ * l2_input_vtr.h : layer 2 input vlan tag rewrite processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_vnet_l2_input_vtr_h
+#define included_vnet_l2_input_vtr_h
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/l2/feat_bitmap.h>
+#include <vnet/l2/l2_vtr.h>
+
+
+typedef struct
+{
+
+  /*
+   *  The input vtr data is located in l2_output_config_t because
+   * the same config data is used for the egress EFP Filter check.
+   */
+
+  /* Next nodes for each feature */
+  u32 feat_next_node_index[32];
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} l2_invtr_main_t;
+
+extern l2_invtr_main_t l2_invtr_main;
+
+#endif /* included_vnet_l2_input_vtr_h */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_learn.c b/src/vnet/l2/l2_learn.c
new file mode 100644
index 00000000..7f19f936
--- /dev/null
+++ b/src/vnet/l2/l2_learn.c
@@ -0,0 +1,597 @@
+/*
+ * l2_learn.c : layer 2 learning using l2fib
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vlib/cli.h>
+
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/feat_bitmap.h>
+#include <vnet/l2/l2_fib.h>
+#include <vnet/l2/l2_learn.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+
+/**
+ * @file
+ * @brief Ethernet Bridge Learning.
+ *
+ * Populate the mac table with entries mapping the packet's source mac + bridge
+ * domain ID to the input sw_if_index.
+ *
+ * Note that learning and forwarding are separate graph nodes. This means that
+ * for a set of packets, all learning is performed first, then all nodes are
+ * forwarded. The forwarding is done based on the end-state of the mac table,
+ * instead of the state after each packet. Thus the forwarding results could
+ * differ in certain cases (mac move tests), but this not expected to cause
+ * problems in real-world networks. It is much simpler to separate learning
+ * and forwarding into separate nodes.
+ */
+
+
+typedef struct
+{
+  u8 src[6];
+  u8 dst[6];
+  u32 sw_if_index;
+  u16 bd_index;
+} l2learn_trace_t;
+
+
+/* packet trace format function */
+static u8 *
+format_l2learn_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2learn_trace_t *t = va_arg (*args, l2learn_trace_t *);
+
+  s = format (s, "l2-learn: sw_if_index %d dst %U src %U bd_index %d",
+	      t->sw_if_index,
+	      format_ethernet_address, t->dst,
+	      format_ethernet_address, t->src, t->bd_index);
+  return s;
+}
+
+static vlib_node_registration_t l2learn_node;
+
+#define foreach_l2learn_error				\
+_(L2LEARN,           "L2 learn packets")		\
+_(MISS,              "L2 learn misses")			\
+_(MAC_MOVE,          "L2 mac moves")			\
+_(MAC_MOVE_VIOLATE,  "L2 mac move violations")		\
+_(LIMIT,             "L2 not learned due to limit")	\
+_(HIT,               "L2 learn hits")			\
+_(FILTER_DROP,       "L2 filter mac drops")
+
+typedef enum
+{
+#define _(sym,str) L2LEARN_ERROR_##sym,
+  foreach_l2learn_error
+#undef _
+    L2LEARN_N_ERROR,
+} l2learn_error_t;
+
+static char *l2learn_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2learn_error
+#undef _
+};
+
+typedef enum
+{
+  L2LEARN_NEXT_L2FWD,
+  L2LEARN_NEXT_DROP,
+  L2LEARN_N_NEXT,
+} l2learn_next_t;
+
+
+/** Perform learning on one packet based on the mac table lookup result. */
+
+static_always_inline void
+l2learn_process (vlib_node_runtime_t * node,
+		 l2learn_main_t * msm,
+		 u64 * counter_base,
+		 vlib_buffer_t * b0,
+		 u32 sw_if_index0,
+		 l2fib_entry_key_t * key0,
+		 l2fib_entry_key_t * cached_key,
+		 u32 * bucket0,
+		 l2fib_entry_result_t * result0, u32 * next0, u8 timestamp)
+{
+  u32 feature_bitmap;
+
+  /* Set up the default next node (typically L2FWD) */
+
+  /* Remove ourself from the feature bitmap */
+  feature_bitmap = vnet_buffer (b0)->l2.feature_bitmap & ~L2INPUT_FEAT_LEARN;
+
+  /* Save for next feature graph nodes */
+  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap;
+
+  /* Determine the next node */
+  *next0 = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
+					    feature_bitmap);
+
+  /* Check mac table lookup result */
+
+  if (PREDICT_TRUE (result0->fields.sw_if_index == sw_if_index0))
+    {
+      /*
+       * The entry was in the table, and the sw_if_index matched, the normal case
+       */
+      counter_base[L2LEARN_ERROR_HIT] += 1;
+      if (PREDICT_FALSE (result0->fields.timestamp != timestamp))
+	result0->fields.timestamp = timestamp;
+
+    }
+  else if (result0->raw == ~0)
+    {
+
+      /* The entry was not in table, so add it  */
+
+      counter_base[L2LEARN_ERROR_MISS] += 1;
+
+      if (msm->global_learn_count == msm->global_learn_limit)
+	{
+	  /*
+	   * Global limit reached. Do not learn the mac but forward the packet.
+	   * In the future, limits could also be per-interface or bridge-domain.
+	   */
+	  counter_base[L2LEARN_ERROR_LIMIT] += 1;
+	  goto done;
+
+	}
+      else
+	{
+	  BVT (clib_bihash_kv) kv;
+	  /* It is ok to learn */
+
+	  result0->raw = 0;	/* clear all fields */
+	  result0->fields.sw_if_index = sw_if_index0;
+	  result0->fields.timestamp = timestamp;
+	  kv.key = key0->raw;
+	  kv.value = result0->raw;
+
+	  BV (clib_bihash_add_del) (msm->mac_table, &kv, 1 /* is_add */ );
+
+	  cached_key->raw = ~0;	/* invalidate the cache */
+	  msm->global_learn_count++;
+	}
+
+    }
+  else
+    {
+
+      /* The entry was in the table, but with the wrong sw_if_index mapping (mac move) */
+      counter_base[L2LEARN_ERROR_MAC_MOVE] += 1;
+
+      if (result0->fields.static_mac)
+	{
+	  /*
+	   * Don't overwrite a static mac
+	   * TODO: Check violation policy. For now drop the packet
+	   */
+	  b0->error = node->errors[L2LEARN_ERROR_MAC_MOVE_VIOLATE];
+	  *next0 = L2LEARN_NEXT_DROP;
+	}
+      else
+	{
+	  /*
+	   * Update the entry
+	   * TODO: may want to rate limit mac moves
+	   * TODO: check global/bridge domain/interface learn limits
+	   */
+	  BVT (clib_bihash_kv) kv;
+
+	  result0->raw = 0;	/* clear all fields */
+	  result0->fields.sw_if_index = sw_if_index0;
+	  result0->fields.timestamp = timestamp;
+
+	  kv.key = key0->raw;
+	  kv.value = result0->raw;
+
+	  cached_key->raw = ~0;	/* invalidate the cache */
+
+	  BV (clib_bihash_add_del) (msm->mac_table, &kv, 1 /* is_add */ );
+	}
+    }
+
+  if (result0->fields.filter)
+    {
+      /* drop packet because lookup matched a filter mac entry */
+
+      if (*next0 != L2LEARN_NEXT_DROP)
+	{
+	  /* if we're not already dropping the packet, do it now */
+	  b0->error = node->errors[L2LEARN_ERROR_FILTER_DROP];
+	  *next0 = L2LEARN_NEXT_DROP;
+	}
+    }
+
+done:
+  return;
+}
+
+
+static uword
+l2learn_node_fn (vlib_main_t * vm,
+		 vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  l2learn_next_t next_index;
+  l2learn_main_t *msm = &l2learn_main;
+  vlib_node_t *n = vlib_get_node (vm, l2learn_node.index);
+  u32 node_counter_base_index = n->error_heap_index;
+  vlib_error_main_t *em = &vm->error_main;
+  l2fib_entry_key_t cached_key;
+  l2fib_entry_result_t cached_result;
+  u8 timestamp = (u8) (vlib_time_now (vm) / 60);
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;	/* number of packets to process */
+  next_index = node->cached_next_index;
+
+  /* Clear the one-entry cache in case mac table was updated */
+  cached_key.raw = ~0;
+  cached_result.raw = ~0;	/* warning be gone */
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      /* get space to enqueue frame to graph node "next_index" */
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 8 && n_left_to_next >= 4)
+	{
+	  u32 bi0, bi1, bi2, bi3;
+	  vlib_buffer_t *b0, *b1, *b2, *b3;
+	  u32 next0, next1, next2, next3;
+	  u32 sw_if_index0, sw_if_index1, sw_if_index2, sw_if_index3;
+	  ethernet_header_t *h0, *h1, *h2, *h3;
+	  l2fib_entry_key_t key0, key1, key2, key3;
+	  l2fib_entry_result_t result0, result1, result2, result3;
+	  u32 bucket0, bucket1, bucket2, bucket3;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p4, *p5, *p6, *p7;;
+
+	    p4 = vlib_get_buffer (vm, from[4]);
+	    p5 = vlib_get_buffer (vm, from[5]);
+	    p6 = vlib_get_buffer (vm, from[6]);
+	    p7 = vlib_get_buffer (vm, from[7]);
+
+	    vlib_prefetch_buffer_header (p4, LOAD);
+	    vlib_prefetch_buffer_header (p5, LOAD);
+	    vlib_prefetch_buffer_header (p6, LOAD);
+	    vlib_prefetch_buffer_header (p7, LOAD);
+
+	    CLIB_PREFETCH (p4->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p5->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p6->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p7->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  /* bi is "buffer index", b is pointer to the buffer */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  to_next[2] = bi2 = from[2];
+	  to_next[3] = bi3 = from[3];
+	  from += 4;
+	  to_next += 4;
+	  n_left_from -= 4;
+	  n_left_to_next -= 4;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+	  b2 = vlib_get_buffer (vm, bi2);
+	  b3 = vlib_get_buffer (vm, bi3);
+
+	  /* RX interface handles */
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+	  sw_if_index2 = vnet_buffer (b2)->sw_if_index[VLIB_RX];
+	  sw_if_index3 = vnet_buffer (b3)->sw_if_index[VLIB_RX];
+
+	  /* Process 4 x pkts */
+
+	  h0 = vlib_buffer_get_current (b0);
+	  h1 = vlib_buffer_get_current (b1);
+	  h2 = vlib_buffer_get_current (b2);
+	  h3 = vlib_buffer_get_current (b3);
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2learn_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->sw_if_index = sw_if_index0;
+		  t->bd_index = vnet_buffer (b0)->l2.bd_index;
+		  clib_memcpy (t->src, h0->src_address, 6);
+		  clib_memcpy (t->dst, h0->dst_address, 6);
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2learn_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->sw_if_index = sw_if_index1;
+		  t->bd_index = vnet_buffer (b1)->l2.bd_index;
+		  clib_memcpy (t->src, h1->src_address, 6);
+		  clib_memcpy (t->dst, h1->dst_address, 6);
+		}
+	      if (b2->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2learn_trace_t *t =
+		    vlib_add_trace (vm, node, b2, sizeof (*t));
+		  t->sw_if_index = sw_if_index2;
+		  t->bd_index = vnet_buffer (b2)->l2.bd_index;
+		  clib_memcpy (t->src, h2->src_address, 6);
+		  clib_memcpy (t->dst, h2->dst_address, 6);
+		}
+	      if (b3->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2learn_trace_t *t =
+		    vlib_add_trace (vm, node, b3, sizeof (*t));
+		  t->sw_if_index = sw_if_index3;
+		  t->bd_index = vnet_buffer (b3)->l2.bd_index;
+		  clib_memcpy (t->src, h3->src_address, 6);
+		  clib_memcpy (t->dst, h3->dst_address, 6);
+		}
+	    }
+
+	  /* process 4 pkts */
+	  vlib_node_increment_counter (vm, l2learn_node.index,
+				       L2LEARN_ERROR_L2LEARN, 4);
+
+	  l2fib_lookup_4 (msm->mac_table, &cached_key, &cached_result,
+			  h0->src_address,
+			  h1->src_address,
+			  h2->src_address,
+			  h3->src_address,
+			  vnet_buffer (b0)->l2.bd_index,
+			  vnet_buffer (b1)->l2.bd_index,
+			  vnet_buffer (b2)->l2.bd_index,
+			  vnet_buffer (b3)->l2.bd_index,
+			  &key0, &key1, &key2, &key3,
+			  &bucket0, &bucket1, &bucket2, &bucket3,
+			  &result0, &result1, &result2, &result3);
+
+	  l2learn_process (node, msm, &em->counters[node_counter_base_index],
+			   b0, sw_if_index0, &key0, &cached_key,
+			   &bucket0, &result0, &next0, timestamp);
+
+	  l2learn_process (node, msm, &em->counters[node_counter_base_index],
+			   b1, sw_if_index1, &key1, &cached_key,
+			   &bucket1, &result1, &next1, timestamp);
+
+	  l2learn_process (node, msm, &em->counters[node_counter_base_index],
+			   b2, sw_if_index2, &key2, &cached_key,
+			   &bucket2, &result2, &next2, timestamp);
+
+	  l2learn_process (node, msm, &em->counters[node_counter_base_index],
+			   b3, sw_if_index3, &key3, &cached_key,
+			   &bucket3, &result3, &next3, timestamp);
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  /* if next0==next1==next_index then nothing special needs to be done */
+	  vlib_validate_buffer_enqueue_x4 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, bi2, bi3,
+					   next0, next1, next2, next3);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 sw_if_index0;
+	  ethernet_header_t *h0;
+	  l2fib_entry_key_t key0;
+	  l2fib_entry_result_t result0;
+	  u32 bucket0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+	  h0 = vlib_buffer_get_current (b0);
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      l2learn_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = sw_if_index0;
+	      t->bd_index = vnet_buffer (b0)->l2.bd_index;
+	      clib_memcpy (t->src, h0->src_address, 6);
+	      clib_memcpy (t->dst, h0->dst_address, 6);
+	    }
+
+	  /* process 1 pkt */
+	  vlib_node_increment_counter (vm, l2learn_node.index,
+				       L2LEARN_ERROR_L2LEARN, 1);
+
+
+	  l2fib_lookup_1 (msm->mac_table, &cached_key, &cached_result,
+			  h0->src_address, vnet_buffer (b0)->l2.bd_index,
+			  &key0, &bucket0, &result0);
+
+	  l2learn_process (node, msm, &em->counters[node_counter_base_index],
+			   b0, sw_if_index0, &key0, &cached_key,
+			   &bucket0, &result0, &next0, timestamp);
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2learn_node,static) = {
+  .function = l2learn_node_fn,
+  .name = "l2-learn",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2learn_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2learn_error_strings),
+  .error_strings = l2learn_error_strings,
+
+  .n_next_nodes = L2LEARN_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+        [L2LEARN_NEXT_DROP] = "error-drop",
+        [L2LEARN_NEXT_L2FWD] = "l2-fwd",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2learn_node, l2learn_node_fn)
+     clib_error_t *l2learn_init (vlib_main_t * vm)
+{
+  l2learn_main_t *mp = &l2learn_main;
+
+  mp->vlib_main = vm;
+  mp->vnet_main = vnet_get_main ();
+
+  /* Initialize the feature next-node indexes */
+  feat_bitmap_init_next_nodes (vm,
+			       l2learn_node.index,
+			       L2INPUT_N_FEAT,
+			       l2input_get_feat_names (),
+			       mp->feat_next_node_index);
+
+  /* init the hash table ptr */
+  mp->mac_table = get_mac_table ();
+
+  /*
+   * Set the default number of dynamically learned macs to the number
+   * of buckets.
+   */
+  mp->global_learn_limit = L2FIB_NUM_BUCKETS * 16;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2learn_init);
+
+
+/**
+ * Set subinterface learn enable/disable.
+ * The CLI format is:
+ *    set interface l2 learn <interface> [disable]
+ */
+static clib_error_t *
+int_learn (vlib_main_t * vm,
+	   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index;
+  u32 enable;
+
+  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  enable = 1;
+  if (unformat (input, "disable"))
+    {
+      enable = 0;
+    }
+
+  /* set the interface flag */
+  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_LEARN, enable);
+
+done:
+  return error;
+}
+
+/*?
+ * Layer 2 learning can be enabled and disabled on each
+ * interface and on each bridge-domain. Use this command to
+ * manage interfaces. It is enabled by default.
+ *
+ * @cliexpar
+ * Example of how to enable learning:
+ * @cliexcmd{set interface l2 learn GigabitEthernet0/8/0}
+ * Example of how to disable learning:
+ * @cliexcmd{set interface l2 learn GigabitEthernet0/8/0 disable}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (int_learn_cli, static) = {
+  .path = "set interface l2 learn",
+  .short_help = "set interface l2 learn <interface> [disable]",
+  .function = int_learn,
+};
+/* *INDENT-ON* */
+
+
+static clib_error_t *
+l2learn_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  l2learn_main_t *mp = &l2learn_main;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "limit %d", &mp->global_learn_limit))
+	;
+
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+
+  return 0;
+}
+
+VLIB_CONFIG_FUNCTION (l2learn_config, "l2learn");
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_learn.h b/src/vnet/l2/l2_learn.h
new file mode 100644
index 00000000..5bb1130b
--- /dev/null
+++ b/src/vnet/l2/l2_learn.h
@@ -0,0 +1,64 @@
+/*
+ * l2_learn.c : layer 2 learning using l2fib
+ *
+ * Copyright (c) 2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_l2learn_h
+#define included_l2learn_h
+
+#include <vlib/vlib.h>
+#include <vnet/ethernet/ethernet.h>
+
+
+typedef struct
+{
+
+  /* Hash table */
+  BVT (clib_bihash) * mac_table;
+
+  /* number of dynamically learned mac entries */
+  u32 global_learn_count;
+
+  /* maximum number of dynamically learned mac entries */
+  u32 global_learn_limit;
+
+  /* Next nodes for each feature */
+  u32 feat_next_node_index[32];
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} l2learn_main_t;
+
+
+l2learn_main_t l2learn_main;
+
+extern vlib_node_registration_t l2fib_mac_age_scanner_process_node;
+
+enum
+{
+  L2_MAC_AGE_PROCESS_EVENT_START = 1,
+  L2_MAC_AGE_PROCESS_EVENT_STOP = 2,
+} l2_mac_age_process_event_t;
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_output.c b/src/vnet/l2/l2_output.c
new file mode 100644
index 00000000..953fcb02
--- /dev/null
+++ b/src/vnet/l2/l2_output.c
@@ -0,0 +1,708 @@
+/*
+ * l2_output.c : layer 2 output packet processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vlib/cli.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/l2/feat_bitmap.h>
+#include <vnet/l2/l2_output.h>
+
+
+/* Feature graph node names */
+static char *l2output_feat_names[] = {
+#define _(sym,name) name,
+  foreach_l2output_feat
+#undef _
+};
+
+char **
+l2output_get_feat_names (void)
+{
+  return l2output_feat_names;
+}
+
+l2output_main_t l2output_main;
+
+typedef struct
+{
+  /* per-pkt trace data */
+  u8 src[6];
+  u8 dst[6];
+  u32 sw_if_index;
+} l2output_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_l2output_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2output_trace_t *t = va_arg (*args, l2output_trace_t *);
+
+  s = format (s, "l2-output: sw_if_index %d dst %U src %U",
+	      t->sw_if_index,
+	      format_ethernet_address, t->dst,
+	      format_ethernet_address, t->src);
+  return s;
+}
+
+
+static char *l2output_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2output_error
+#undef _
+};
+
+/**
+ * Check for split horizon violations.
+ * Return 0 if split horizon check passes, otherwise return non-zero.
+ * Packets should not be transmitted out an interface with the same
+ * split-horizon group as the input interface, except if the @c shg is 0
+ * in which case the check always passes.
+ */
+static_always_inline u32
+split_horizon_violation (u8 shg1, u8 shg2)
+{
+  if (PREDICT_TRUE (shg1 == 0))
+    {
+      return 0;
+    }
+  else
+    {
+      return shg1 == shg2;
+    }
+}
+
+static_always_inline void
+l2output_vtr (vlib_node_runtime_t * node, l2_output_config_t * config,
+	      u32 feature_bitmap, vlib_buffer_t * b, u32 * next)
+{
+  if (PREDICT_FALSE (config->out_vtr_flag))
+    {
+      /* Perform pre-vtr EFP filter check if configured */
+      if (config->output_vtr.push_and_pop_bytes)
+	{
+	  /*
+	   * Perform output vlan tag rewrite and the pre-vtr EFP filter check.
+	   * The EFP Filter only needs to be run if there is an output VTR
+	   * configured. The flag for the post-vtr EFP Filter node is used
+	   * to trigger the pre-vtr check as well.
+	   */
+	  u32 failed1 = (feature_bitmap & L2OUTPUT_FEAT_EFP_FILTER)
+	    && (l2_efp_filter_process (b, &(config->input_vtr)));
+	  u32 failed2 = l2_vtr_process (b, &(config->output_vtr));
+
+	  if (PREDICT_FALSE (failed1 | failed2))
+	    {
+	      *next = L2OUTPUT_NEXT_DROP;
+	      if (failed2)
+		{
+		  b->error = node->errors[L2OUTPUT_ERROR_VTR_DROP];
+		}
+	      if (failed1)
+		{
+		  b->error = node->errors[L2OUTPUT_ERROR_EFP_DROP];
+		}
+	    }
+	}
+      // perform the PBB rewrite
+      else if (config->output_pbb_vtr.push_and_pop_bytes)
+	{
+	  u32 failed = l2_pbb_process (b, &(config->output_pbb_vtr));
+	  if (PREDICT_FALSE (failed))
+	    {
+	      *next = L2OUTPUT_NEXT_DROP;
+	      b->error = node->errors[L2OUTPUT_ERROR_VTR_DROP];
+	    }
+	}
+    }
+}
+
+
+static vlib_node_registration_t l2output_node;
+
+static uword
+l2output_node_fn (vlib_main_t * vm,
+		  vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  l2output_next_t next_index;
+  l2output_main_t *msm = &l2output_main;
+  u32 cached_sw_if_index;
+  u32 cached_next_index;
+
+  /* Invalidate cache */
+  cached_sw_if_index = ~0;
+  cached_next_index = ~0;	/* warning be gone */
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;	/* number of packets to process */
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      /* get space to enqueue frame to graph node "next_index" */
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 8 && n_left_to_next >= 4)
+	{
+	  u32 bi0, bi1, bi2, bi3;
+	  vlib_buffer_t *b0, *b1, *b2, *b3;
+	  u32 next0, next1, next2, next3;
+	  u32 sw_if_index0, sw_if_index1, sw_if_index2, sw_if_index3;
+	  ethernet_header_t *h0, *h1, *h2, *h3;
+	  l2_output_config_t *config0, *config1, *config2, *config3;
+	  u32 feature_bitmap0, feature_bitmap1;
+	  u32 feature_bitmap2, feature_bitmap3;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p4, *p5, *p6, *p7;
+
+	    p4 = vlib_get_buffer (vm, from[4]);
+	    p5 = vlib_get_buffer (vm, from[5]);
+	    p6 = vlib_get_buffer (vm, from[6]);
+	    p7 = vlib_get_buffer (vm, from[7]);
+
+	    /* Prefetch the buffer header for the N+2 loop iteration */
+	    vlib_prefetch_buffer_header (p4, LOAD);
+	    vlib_prefetch_buffer_header (p5, LOAD);
+	    vlib_prefetch_buffer_header (p6, LOAD);
+	    vlib_prefetch_buffer_header (p7, LOAD);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  /* bi is "buffer index", b is pointer to the buffer */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  to_next[2] = bi2 = from[2];
+	  to_next[3] = bi3 = from[3];
+	  from += 4;
+	  to_next += 4;
+	  n_left_from -= 4;
+	  n_left_to_next -= 4;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+	  b2 = vlib_get_buffer (vm, bi2);
+	  b3 = vlib_get_buffer (vm, bi3);
+
+	  /* TX interface handles */
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_TX];
+	  sw_if_index2 = vnet_buffer (b2)->sw_if_index[VLIB_TX];
+	  sw_if_index3 = vnet_buffer (b3)->sw_if_index[VLIB_TX];
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      h0 = vlib_buffer_get_current (b0);
+	      h1 = vlib_buffer_get_current (b1);
+	      h2 = vlib_buffer_get_current (b2);
+	      h3 = vlib_buffer_get_current (b3);
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2output_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->sw_if_index = sw_if_index0;
+		  clib_memcpy (t->src, h0->src_address, 6);
+		  clib_memcpy (t->dst, h0->dst_address, 6);
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2output_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->sw_if_index = sw_if_index1;
+		  clib_memcpy (t->src, h1->src_address, 6);
+		  clib_memcpy (t->dst, h1->dst_address, 6);
+		}
+	      if (b2->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2output_trace_t *t =
+		    vlib_add_trace (vm, node, b2, sizeof (*t));
+		  t->sw_if_index = sw_if_index2;
+		  clib_memcpy (t->src, h2->src_address, 6);
+		  clib_memcpy (t->dst, h2->dst_address, 6);
+		}
+	      if (b3->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2output_trace_t *t =
+		    vlib_add_trace (vm, node, b3, sizeof (*t));
+		  t->sw_if_index = sw_if_index3;
+		  clib_memcpy (t->src, h3->src_address, 6);
+		  clib_memcpy (t->dst, h3->dst_address, 6);
+		}
+	    }
+
+	  vlib_node_increment_counter (vm, l2output_node.index,
+				       L2OUTPUT_ERROR_L2OUTPUT, 4);
+
+	  /* Get config for the output interface */
+	  config0 = vec_elt_at_index (msm->configs, sw_if_index0);
+	  config1 = vec_elt_at_index (msm->configs, sw_if_index1);
+	  config2 = vec_elt_at_index (msm->configs, sw_if_index2);
+	  config3 = vec_elt_at_index (msm->configs, sw_if_index3);
+
+	  /*
+	   * Get features from the config
+	   * TODO: mask out any non-applicable features
+	   */
+	  feature_bitmap0 = config0->feature_bitmap;
+	  feature_bitmap1 = config1->feature_bitmap;
+	  feature_bitmap2 = config2->feature_bitmap;
+	  feature_bitmap3 = config3->feature_bitmap;
+
+	  /* Determine next node */
+	  l2_output_dispatch (msm->vlib_main,
+			      msm->vnet_main,
+			      node,
+			      l2output_node.index,
+			      &cached_sw_if_index,
+			      &cached_next_index,
+			      &msm->next_nodes,
+			      b0, sw_if_index0, feature_bitmap0, &next0);
+
+	  l2_output_dispatch (msm->vlib_main,
+			      msm->vnet_main,
+			      node,
+			      l2output_node.index,
+			      &cached_sw_if_index,
+			      &cached_next_index,
+			      &msm->next_nodes,
+			      b1, sw_if_index1, feature_bitmap1, &next1);
+
+	  l2_output_dispatch (msm->vlib_main,
+			      msm->vnet_main,
+			      node,
+			      l2output_node.index,
+			      &cached_sw_if_index,
+			      &cached_next_index,
+			      &msm->next_nodes,
+			      b2, sw_if_index2, feature_bitmap2, &next2);
+
+	  l2_output_dispatch (msm->vlib_main,
+			      msm->vnet_main,
+			      node,
+			      l2output_node.index,
+			      &cached_sw_if_index,
+			      &cached_next_index,
+			      &msm->next_nodes,
+			      b3, sw_if_index3, feature_bitmap3, &next3);
+
+	  l2output_vtr (node, config0, feature_bitmap0, b0, &next0);
+	  l2output_vtr (node, config1, feature_bitmap1, b1, &next1);
+	  l2output_vtr (node, config2, feature_bitmap2, b2, &next2);
+	  l2output_vtr (node, config3, feature_bitmap3, b3, &next3);
+
+	  /*
+	   * Perform the split horizon check
+	   * The check can only fail for non-zero shg's
+	   */
+	  if (PREDICT_FALSE (config0->shg + config1->shg +
+			     config2->shg + config3->shg))
+	    {
+	      /* one of the checks might fail, check both */
+	      if (split_horizon_violation
+		  (config0->shg, vnet_buffer (b0)->l2.shg))
+		{
+		  next0 = L2OUTPUT_NEXT_DROP;
+		  b0->error = node->errors[L2OUTPUT_ERROR_SHG_DROP];
+		}
+	      if (split_horizon_violation
+		  (config1->shg, vnet_buffer (b1)->l2.shg))
+		{
+		  next1 = L2OUTPUT_NEXT_DROP;
+		  b1->error = node->errors[L2OUTPUT_ERROR_SHG_DROP];
+		}
+	      if (split_horizon_violation
+		  (config2->shg, vnet_buffer (b2)->l2.shg))
+		{
+		  next2 = L2OUTPUT_NEXT_DROP;
+		  b2->error = node->errors[L2OUTPUT_ERROR_SHG_DROP];
+		}
+	      if (split_horizon_violation
+		  (config3->shg, vnet_buffer (b3)->l2.shg))
+		{
+		  next3 = L2OUTPUT_NEXT_DROP;
+		  b3->error = node->errors[L2OUTPUT_ERROR_SHG_DROP];
+		}
+	    }
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  /* if next0==next1==next_index then nothing special needs to be done */
+	  vlib_validate_buffer_enqueue_x4 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, bi2, bi3,
+					   next0, next1, next2, next3);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 sw_if_index0;
+	  ethernet_header_t *h0;
+	  l2_output_config_t *config0;
+	  u32 feature_bitmap0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      l2output_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = sw_if_index0;
+	      h0 = vlib_buffer_get_current (b0);
+	      clib_memcpy (t->src, h0->src_address, 6);
+	      clib_memcpy (t->dst, h0->dst_address, 6);
+	    }
+
+	  vlib_node_increment_counter (vm, l2output_node.index,
+				       L2OUTPUT_ERROR_L2OUTPUT, 1);
+
+	  /* Get config for the output interface */
+	  config0 = vec_elt_at_index (msm->configs, sw_if_index0);
+
+	  /*
+	   * Get features from the config
+	   * TODO: mask out any non-applicable features
+	   */
+	  feature_bitmap0 = config0->feature_bitmap;
+
+	  /* Determine next node */
+	  l2_output_dispatch (msm->vlib_main,
+			      msm->vnet_main,
+			      node,
+			      l2output_node.index,
+			      &cached_sw_if_index,
+			      &cached_next_index,
+			      &msm->next_nodes,
+			      b0, sw_if_index0, feature_bitmap0, &next0);
+
+	  l2output_vtr (node, config0, feature_bitmap0, b0, &next0);
+
+	  /* Perform the split horizon check */
+	  if (PREDICT_FALSE
+	      (split_horizon_violation
+	       (config0->shg, vnet_buffer (b0)->l2.shg)))
+	    {
+	      next0 = L2OUTPUT_NEXT_DROP;
+	      b0->error = node->errors[L2OUTPUT_ERROR_SHG_DROP];
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2output_node,static) = {
+  .function = l2output_node_fn,
+  .name = "l2-output",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2output_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2output_error_strings),
+  .error_strings = l2output_error_strings,
+
+  .n_next_nodes = L2OUTPUT_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+        [L2OUTPUT_NEXT_DROP] = "error-drop",
+        [L2OUTPUT_NEXT_BAD_INTF] = "l2-output-bad-intf",
+  },
+};
+/* *INDENT-ON* */
+
+
+#define foreach_l2output_bad_intf_error	\
+_(DROP,     "L2 output to interface not in L2 mode or deleted")
+
+static char *l2output_bad_intf_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2output_bad_intf_error
+#undef _
+};
+
+typedef enum
+{
+#define _(sym,str) L2OUTPUT_BAD_INTF_ERROR_##sym,
+  foreach_l2output_bad_intf_error
+#undef _
+    L2OUTPUT_BAD_INTF_N_ERROR,
+} l2output_bad_intf_error_t;
+
+
+/**
+ * Output node for interfaces/tunnels which was in L2 mode but were changed
+ * to L3 mode or possibly deleted thereafter. On changing forwarding mode
+ * of any tunnel/interface from L2 to L3, its entry in l2_output_main table
+ * next_nodes.output_node_index_vec[sw_if_index] MUST be set to the value of
+ * L2OUTPUT_NEXT_BAD_INTF. Thus, if there are stale entries in the L2FIB for
+ * this sw_if_index, l2-output will send packets for this sw_if_index to the
+ * l2-output-bad-intf node which just setup the proper drop reason before
+ * sending packets to the error-drop node to drop the packet. Then, stale L2FIB
+ * entries for delted tunnels won't cause possible packet or memory corrpution.
+ */
+static vlib_node_registration_t l2output_bad_intf_node;
+
+static uword
+l2output_bad_intf_node_fn (vlib_main_t * vm,
+			   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  l2output_next_t next_index = 0;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;	/* number of packets to process */
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      /* get space to enqueue frame to graph node "next_index" */
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+	  b0->error = node->errors[L2OUTPUT_BAD_INTF_ERROR_DROP];
+	  b1->error = node->errors[L2OUTPUT_BAD_INTF_ERROR_DROP];
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b0->error = node->errors[L2OUTPUT_BAD_INTF_ERROR_DROP];
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2output_bad_intf_node,static) = {
+  .function = l2output_bad_intf_node_fn,
+  .name = "l2-output-bad-intf",
+  .vector_size = sizeof (u32),
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors =  ARRAY_LEN(l2output_bad_intf_error_strings),
+  .error_strings = l2output_bad_intf_error_strings,
+
+  .n_next_nodes = 1,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+	[0] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2output_node, l2output_node_fn)
+     clib_error_t *l2output_init (vlib_main_t * vm)
+{
+  l2output_main_t *mp = &l2output_main;
+
+  mp->vlib_main = vm;
+  mp->vnet_main = vnet_get_main ();
+
+  /* Create the config vector */
+  vec_validate (mp->configs, 100);
+  /* Until we hook up the CLI config, just create 100 sw interface entries  and zero them */
+
+  /* Initialize the feature next-node indexes */
+  feat_bitmap_init_next_nodes (vm,
+			       l2output_node.index,
+			       L2OUTPUT_N_FEAT,
+			       l2output_get_feat_names (),
+			       mp->next_nodes.feat_next_node_index);
+
+  /* Initialize the output node mapping table */
+  l2output_init_output_node_vec (&mp->next_nodes.output_node_index_vec);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2output_init);
+
+typedef struct
+{
+  u32 node_index;
+  u32 sw_if_index;
+} output_node_mapping_rpc_args_t;
+
+static void output_node_rpc_callback (output_node_mapping_rpc_args_t * a);
+
+static void
+output_node_mapping_send_rpc (u32 node_index, u32 sw_if_index)
+{
+  output_node_mapping_rpc_args_t args;
+  void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
+
+  args.node_index = node_index;
+  args.sw_if_index = sw_if_index;
+
+  vl_api_rpc_call_main_thread (output_node_rpc_callback,
+			       (u8 *) & args, sizeof (args));
+}
+
+
+/** Create a mapping in the next node mapping table for the given sw_if_index. */
+u32
+l2output_create_output_node_mapping (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 node_index,	/* index of current node */
+				     u32 * output_node_index_vec,
+				     u32 sw_if_index)
+{
+
+  u32 next;			/* index of next graph node */
+  vnet_hw_interface_t *hw0;
+  u32 *node;
+
+  hw0 = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
+
+  uword cpu_number;
+
+  cpu_number = os_get_cpu_number ();
+
+  if (cpu_number)
+    {
+      u32 oldflags;
+
+      oldflags = __sync_fetch_and_or (&hw0->flags,
+				      VNET_HW_INTERFACE_FLAG_L2OUTPUT_MAPPED);
+
+      if ((oldflags & VNET_HW_INTERFACE_FLAG_L2OUTPUT_MAPPED))
+	return L2OUTPUT_NEXT_DROP;
+
+      output_node_mapping_send_rpc (node_index, sw_if_index);
+      return L2OUTPUT_NEXT_DROP;
+    }
+
+  /* dynamically create graph node arc  */
+  next = vlib_node_add_next (vlib_main, node_index, hw0->output_node_index);
+
+  /* Initialize vector with the mapping */
+
+  node = vec_elt_at_index (output_node_index_vec, sw_if_index);
+  *node = next;
+
+  /* reset mapping bit, includes memory barrier */
+  __sync_fetch_and_and (&hw0->flags, ~VNET_HW_INTERFACE_FLAG_L2OUTPUT_MAPPED);
+
+  return next;
+}
+
+void
+output_node_rpc_callback (output_node_mapping_rpc_args_t * a)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vnet_main_t *vnm = vnet_get_main ();
+  l2output_main_t *mp = &l2output_main;
+
+  (void) l2output_create_output_node_mapping
+    (vm, vnm, a->node_index, mp->next_nodes.output_node_index_vec,
+     a->sw_if_index);
+}
+
+/* Get a pointer to the config for the given interface */
+l2_output_config_t *
+l2output_intf_config (u32 sw_if_index)
+{
+  l2output_main_t *mp = &l2output_main;
+
+  vec_validate (mp->configs, sw_if_index);
+  return vec_elt_at_index (mp->configs, sw_if_index);
+}
+
+/** Enable (or disable) the feature in the bitmap for the given interface. */
+void
+l2output_intf_bitmap_enable (u32 sw_if_index, u32 feature_bitmap, u32 enable)
+{
+  l2output_main_t *mp = &l2output_main;
+  l2_output_config_t *config;
+
+  vec_validate (mp->configs, sw_if_index);
+  config = vec_elt_at_index (mp->configs, sw_if_index);
+
+  if (enable)
+    {
+      config->feature_bitmap |= feature_bitmap;
+    }
+  else
+    {
+      config->feature_bitmap &= ~feature_bitmap;
+    }
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_output.h b/src/vnet/l2/l2_output.h
new file mode 100644
index 00000000..c683b1ad
--- /dev/null
+++ b/src/vnet/l2/l2_output.h
@@ -0,0 +1,285 @@
+/*
+ * l2_output.h : layer 2 output packet processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_vnet_l2_output_h
+#define included_vnet_l2_output_h
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/l2/feat_bitmap.h>
+#include <vnet/l2/l2_vtr.h>
+
+
+/* The L2 output feature configuration, a per-interface struct */
+typedef struct
+{
+
+  u32 feature_bitmap;
+
+  /*
+   * vlan tag rewrite for ingress and egress
+   * ingress vtr is located here because the same config data is used for
+   * the egress EFP filter check
+   */
+  vtr_config_t input_vtr;
+  vtr_config_t output_vtr;
+  ptr_config_t input_pbb_vtr;
+  ptr_config_t output_pbb_vtr;
+
+  /* some of these flags may get integrated into the feature bitmap */
+  u8 fwd_enable;
+  u8 flood_enable;
+
+  /* split horizon group */
+  u8 shg;
+
+  /* flag for output vtr operation */
+  u8 out_vtr_flag;
+
+} l2_output_config_t;
+
+
+/*
+ * The set of next nodes for features and interface output.
+ * Each output feature node should include this.
+ */
+typedef struct
+{
+  /*
+   * vector of output next node index, indexed by sw_if_index.
+   * used when all output features have been executed and the
+   * next nodes are the interface output nodes.
+   */
+  u32 *output_node_index_vec;
+
+  /*
+   * array of next node index for each output feature, indexed
+   * by l2output_feat_t. Used to determine next feature node.
+   */
+  u32 feat_next_node_index[32];
+
+} l2_output_next_nodes_st;
+
+
+typedef struct
+{
+  /* Next nodes for features and output interfaces */
+  l2_output_next_nodes_st next_nodes;
+
+  /* config vector indexed by sw_if_index */
+  l2_output_config_t *configs;
+
+  /* Convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} l2output_main_t;
+
+l2output_main_t l2output_main;
+
+/* L2 output features */
+
+/* Mappings from feature ID to graph node name */
+#define foreach_l2output_feat \
+ _(SPAN,              "feature-bitmap-drop")        \
+ _(CFM,               "feature-bitmap-drop")        \
+ _(QOS,               "feature-bitmap-drop")        \
+ _(ACL,               "l2-output-acl")              \
+ _(L2PT,              "feature-bitmap-drop")        \
+ _(EFP_FILTER,        "l2-efp-filter")              \
+ _(IPIW,              "feature-bitmap-drop")        \
+ _(STP_BLOCKED,       "feature-bitmap-drop")        \
+ _(LINESTATUS_DOWN,   "feature-bitmap-drop")        \
+ _(OUTPUT_CLASSIFY,   "l2-output-classify")	    \
+ _(XCRW,	      "l2-xcrw")
+
+/* Feature bitmap positions */
+typedef enum
+{
+#define _(sym,str) L2OUTPUT_FEAT_##sym##_BIT,
+  foreach_l2output_feat
+#undef _
+    L2OUTPUT_N_FEAT,
+} l2output_feat_t;
+
+/* Feature bit masks */
+typedef enum
+{
+#define _(sym,str) L2OUTPUT_FEAT_##sym = (1<<L2OUTPUT_FEAT_##sym##_BIT),
+  foreach_l2output_feat
+#undef _
+} l2output_feat_masks_t;
+
+#define foreach_l2output_error				\
+_(L2OUTPUT,     "L2 output packets")			\
+_(EFP_DROP,     "L2 EFP filter pre-rewrite drops")	\
+_(VTR_DROP,     "L2 output tag rewrite drops")		\
+_(SHG_DROP,     "L2 split horizon drops")		\
+_(DROP,         "L2 output drops")			\
+_(MAPPING_DROP, "L2 Output interface mapping in progress")
+
+typedef enum
+{
+  L2OUTPUT_NEXT_DROP,
+  L2OUTPUT_NEXT_BAD_INTF,
+  L2OUTPUT_N_NEXT,
+} l2output_next_t;
+
+typedef enum
+{
+#define _(sym,str) L2OUTPUT_ERROR_##sym,
+  foreach_l2output_error
+#undef _
+    L2OUTPUT_N_ERROR,
+} l2output_error_t;
+
+/* Return an array of strings containing graph node names of each feature */
+char **l2output_get_feat_names (void);
+
+
+/**
+ * The next set of functions is for use by output feature graph nodes.
+ * When the last bit has been cleared from the output feature bitmap,
+ * the next node is the output graph node for the TX sw_if_index.
+ * These functions help the feature nodes get that node index.
+ */
+
+/* Create a mapping to the output graph node for the given sw_if_index */
+u32 l2output_create_output_node_mapping (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 node_index,	/* index of current node */
+					 u32 * output_node_index_vec,
+					 u32 sw_if_index);
+
+/* Initialize the next node mapping table */
+always_inline void
+l2output_init_output_node_vec (u32 ** output_node_index_vec)
+{
+
+  /*
+   * Size it at 100 sw_if_indexes initially
+   * Uninitialized mappings are set to ~0
+   */
+  vec_validate_init_empty (*output_node_index_vec, 100, ~0);
+}
+
+
+/**
+ *  Get a mapping from the output node mapping table,
+ * creating the entry if necessary.
+ */
+always_inline u32
+l2output_get_output_node (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 node_index,	/* index of current node */
+			  u32 sw_if_index, u32 ** output_node_index_vec)	/* may be updated */
+{
+  u32 next;			/* index of next graph node */
+
+  /* Insure the vector is big enough */
+  vec_validate_init_empty (*output_node_index_vec, sw_if_index, ~0);
+
+  /* Get the mapping for the sw_if_index */
+  next = vec_elt (*output_node_index_vec, sw_if_index);
+
+  if (next == ~0)
+    {
+      /* Mapping doesn't exist so create it */
+      next = l2output_create_output_node_mapping (vlib_main,
+						  vnet_main,
+						  node_index,
+						  *output_node_index_vec,
+						  sw_if_index);
+    }
+
+  return next;
+}
+
+
+/** Determine the next L2 node based on the output feature bitmap */
+always_inline void
+l2_output_dispatch (vlib_main_t * vlib_main,
+		    vnet_main_t * vnet_main,
+		    vlib_node_runtime_t * node,
+		    u32 node_index,
+		    u32 * cached_sw_if_index,
+		    u32 * cached_next_index,
+		    l2_output_next_nodes_st * next_nodes,
+		    vlib_buffer_t * b0,
+		    u32 sw_if_index, u32 feature_bitmap, u32 * next0)
+{
+  if (feature_bitmap)
+    {
+      /* There are some features to execute */
+
+      /* Save bitmap for the next feature graph nodes */
+      vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap;
+
+      /* Determine the next node */
+      *next0 =
+	feat_bitmap_get_next_node_index (next_nodes->feat_next_node_index,
+					 feature_bitmap);
+    }
+  else
+    {
+      /*
+       * There are no features. Send packet to TX node for sw_if_index0
+       * This is a little tricky in that the output interface next node indexes
+       * are not precomputed at init time.
+       */
+
+      if (sw_if_index == *cached_sw_if_index)
+	{
+	  /* We hit in the one-entry cache. Use it. */
+	  *next0 = *cached_next_index;
+	}
+      else
+	{
+	  /* Look up the output TX node */
+	  *next0 = l2output_get_output_node (vlib_main,
+					     vnet_main,
+					     node_index,
+					     sw_if_index,
+					     &next_nodes->output_node_index_vec);
+
+	  if (*next0 == L2OUTPUT_NEXT_DROP)
+	    {
+	      vnet_hw_interface_t *hw0;
+	      hw0 = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
+
+	      if (hw0->flags & VNET_HW_INTERFACE_FLAG_L2OUTPUT_MAPPED)
+		b0->error = node->errors[L2OUTPUT_ERROR_MAPPING_DROP];
+	    }
+
+	  /* Update the one-entry cache */
+	  *cached_sw_if_index = sw_if_index;
+	  *cached_next_index = *next0;
+	}
+    }
+}
+
+/** Get a pointer to the config for the given interface */
+l2_output_config_t *l2output_intf_config (u32 sw_if_index);
+
+/** Enable (or disable) the feature in the bitmap for the given interface */
+void l2output_intf_bitmap_enable (u32 sw_if_index,
+				  u32 feature_bitmap, u32 enable);
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_output_acl.c b/src/vnet/l2/l2_output_acl.c
new file mode 100644
index 00000000..94a4d66b
--- /dev/null
+++ b/src/vnet/l2/l2_output_acl.c
@@ -0,0 +1,358 @@
+/*
+ * l2_output_acl.c : layer 2 output acl processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/ip/ip_packet.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vlib/cli.h>
+#include <vnet/l2/feat_bitmap.h>
+#include <vnet/l2/l2_output.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/cache.h>
+
+
+typedef struct
+{
+  /* Next nodes for features and output interfaces */
+  l2_output_next_nodes_st next_nodes;
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} l2_outacl_main_t;
+
+
+
+typedef struct
+{
+  /* per-pkt trace data */
+  u8 src[6];
+  u8 dst[6];
+  u32 next_index;
+  u32 sw_if_index;
+} l2_outacl_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_l2_outacl_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2_outacl_trace_t *t = va_arg (*args, l2_outacl_trace_t *);
+
+  s = format (s, "l2-output-acl: sw_if_index %d dst %U src %U",
+	      t->sw_if_index,
+	      format_ethernet_address, t->dst,
+	      format_ethernet_address, t->src);
+  return s;
+}
+
+l2_outacl_main_t l2_outacl_main;
+
+static vlib_node_registration_t l2_outacl_node;
+
+#define foreach_l2_outacl_error			\
+_(L2_OUTACL,    "L2 output ACL packets")	\
+_(DROP,         "L2 output drops")
+
+typedef enum
+{
+#define _(sym,str) L2_OUTACL_ERROR_##sym,
+  foreach_l2_outacl_error
+#undef _
+    L2_OUTACL_N_ERROR,
+} l2_outacl_error_t;
+
+static char *l2_outacl_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2_outacl_error
+#undef _
+};
+
+typedef enum
+{
+  L2_OUTACL_NEXT_DROP,
+  L2_OUTACL_N_NEXT,
+} l2_outacl_next_t;
+
+
+
+static uword
+l2_outacl_node_fn (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  l2_outacl_next_t next_index;
+  l2_outacl_main_t *msm = &l2_outacl_main;
+  vlib_node_t *n = vlib_get_node (vm, l2_outacl_node.index);
+  u32 node_counter_base_index = n->error_heap_index;
+  vlib_error_main_t *em = &vm->error_main;
+  u32 cached_sw_if_index = (u32) ~ 0;
+  u32 cached_next_index = (u32) ~ 0;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;	/* number of packets to process */
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      /* get space to enqueue frame to graph node "next_index" */
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (0 && n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+	  u32 sw_if_index0, sw_if_index1;
+	  ethernet_header_t *h0, *h1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  /* bi is "buffer index", b is pointer to the buffer */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /* TX interface handles */
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_TX];
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2_outacl_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->sw_if_index = sw_if_index0;
+		  t->next_index = next0;
+		  clib_memcpy (t->src, h0->src_address, 6);
+		  clib_memcpy (t->dst, h0->dst_address, 6);
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2_outacl_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->sw_if_index = sw_if_index1;
+		  t->next_index = next1;
+		  clib_memcpy (t->src, h1->src_address, 6);
+		  clib_memcpy (t->dst, h1->dst_address, 6);
+		}
+	    }
+
+	  em->counters[node_counter_base_index + L2_OUTACL_ERROR_L2_OUTACL] +=
+	    2;
+
+	  /* add core loop code here */
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  /* if next0==next1==next_index then nothing special needs to be done */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 sw_if_index0;
+	  ethernet_header_t *h0;
+	  u32 feature_bitmap0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  h0 = vlib_buffer_get_current (b0);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      l2_outacl_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = sw_if_index0;
+	      clib_memcpy (t->src, h0->src_address, 6);
+	      clib_memcpy (t->dst, h0->dst_address, 6);
+	    }
+
+	  em->counters[node_counter_base_index + L2_OUTACL_ERROR_L2_OUTACL] +=
+	    1;
+
+	  /*
+	   * L2_OUTACL code
+	   * Dummy for now, just go to next feature node
+	   */
+
+
+	  /* Remove ourself from the feature bitmap */
+	  feature_bitmap0 =
+	    vnet_buffer (b0)->l2.feature_bitmap & ~L2OUTPUT_FEAT_ACL;
+
+	  /* Determine next node */
+	  l2_output_dispatch (msm->vlib_main,
+			      msm->vnet_main,
+			      node,
+			      l2_outacl_node.index,
+			      &cached_sw_if_index,
+			      &cached_next_index,
+			      &msm->next_nodes,
+			      b0, sw_if_index0, feature_bitmap0, &next0);
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2_outacl_node,static) = {
+  .function = l2_outacl_node_fn,
+  .name = "l2-output-acl",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2_outacl_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2_outacl_error_strings),
+  .error_strings = l2_outacl_error_strings,
+
+  .n_next_nodes = L2_OUTACL_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+       [L2_OUTACL_NEXT_DROP]  = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2_outacl_node, l2_outacl_node_fn)
+     clib_error_t *l2_outacl_init (vlib_main_t * vm)
+{
+  l2_outacl_main_t *mp = &l2_outacl_main;
+
+  mp->vlib_main = vm;
+  mp->vnet_main = vnet_get_main ();
+
+  /* Initialize the feature next-node indexes */
+  feat_bitmap_init_next_nodes (vm,
+			       l2_outacl_node.index,
+			       L2OUTPUT_N_FEAT,
+			       l2output_get_feat_names (),
+			       mp->next_nodes.feat_next_node_index);
+
+  /* Initialize the output node mapping table */
+  l2output_init_output_node_vec (&mp->next_nodes.output_node_index_vec);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2_outacl_init);
+
+#if 0
+/** @todo maybe someone will add output ACL's in the future.
+ * Set subinterface outacl enable/disable.
+ * The CLI format is:
+ *    set interface acl output <interface> [disable]
+ */
+static clib_error_t *
+int_l2_outacl (vlib_main_t * vm,
+	       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index;
+  u32 enable;
+
+  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  enable = 1;
+  if (unformat (input, "disable"))
+    {
+      enable = 0;
+    }
+
+  /* set the interface flag */
+  l2output_intf_bitmap_enable (sw_if_index, L2OUTPUT_FEAT_ACL, enable);
+
+done:
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (int_l2_outacl_cli, static) = {
+  .path = "set interface acl output",
+  .short_help = "set interface acl output <interface> [disable]",
+  .function = int_l2_outacl,
+};
+/* *INDENT-ON* */
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_output_classify.c b/src/vnet/l2/l2_output_classify.c
new file mode 100644
index 00000000..27d5eb39
--- /dev/null
+++ b/src/vnet/l2/l2_output_classify.c
@@ -0,0 +1,657 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/l2/l2_classify.h>
+#include <vnet/api_errno.h>
+
+/**
+ * @file
+ * @brief Layer 2 Output Classifier.
+ *
+ * @sa @ref vnet/vnet/classify/vnet_classify.c
+ * @sa @ref vnet/vnet/classify/vnet_classify.h
+ */
+
+typedef struct
+{
+  /** interface handle for the ith packet */
+  u32 sw_if_index;
+  /** graph arc index selected for this packet */
+  u32 next_index;
+  /** classifier table which provided the final result */
+  u32 table_index;
+  /** offset in classifier heap of the corresponding session */
+  u32 session_offset;
+} l2_output_classify_trace_t;
+
+typedef struct
+{
+  /** use-case independent main object pointer */
+  vnet_classify_main_t *vcm;
+  /** l2 input classifier main object pointer */
+  l2_output_classify_main_t *l2cm;
+} l2_output_classify_runtime_t;
+
+/** Packet trace format function. */
+static u8 *
+format_l2_output_classify_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2_output_classify_trace_t *t =
+    va_arg (*args, l2_output_classify_trace_t *);
+
+  s = format (s, "l2-classify: sw_if_index %d, table %d, offset %x, next %d",
+	      t->sw_if_index, t->table_index, t->session_offset,
+	      t->next_index);
+  return s;
+}
+
+/** l2 output classifier main data structure. */
+l2_output_classify_main_t l2_output_classify_main;
+
+vlib_node_registration_t l2_output_classify_node;
+
+#define foreach_l2_output_classify_error               \
+_(MISS, "Classify misses")                      \
+_(HIT, "Classify hits")                         \
+_(CHAIN_HIT, "Classify hits after chain walk")  \
+_(DROP, "L2 Classify Drops")
+
+typedef enum
+{
+#define _(sym,str) L2_OUTPUT_CLASSIFY_ERROR_##sym,
+  foreach_l2_output_classify_error
+#undef _
+    L2_OUTPUT_CLASSIFY_N_ERROR,
+} l2_output_classify_error_t;
+
+static char *l2_output_classify_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2_output_classify_error
+#undef _
+};
+
+/**
+ * @brief l2 output classifier node.
+ * @node l2-output-classify
+ *
+ * This is the l2 output classifier dispatch node
+ *
+ * @param vm    vlib_main_t corresponding to the current thread.
+ * @param node  vlib_node_runtime_t data for this node.
+ * @param frame vlib_frame_t whose contents should be dispatched.
+ *
+ * @par Graph mechanics: buffer metadata, next index usage
+ *
+ * @em Uses:
+ * - <code>(l2_output_classify_runtime_t *)
+ *         rt->classify_table_index_by_sw_if_index</code>
+ *	   Head of the per-interface, perprotocol classifier table chain
+ * 	   for a specific interface. ~0 => send pkts to the next
+ * 	   feature in the L2 feature chain.
+ * - <code>vnet_buffer(b)->sw_if_index[VLIB_TX]</code>
+ * 	- Indicates the @c sw_if_index value of the interface that the
+ * 	packet was received on.
+ * - <code>vnet_buffer (b0)->l2.feature_bitmap</code>
+ * 	- Used to steer packets across l2 features enabled on the interface
+ * - <code>(vnet_classify_entry_t) e0->next_index</code>
+ *	- Used to steer traffic when the classifier hits on a session
+ * - <code>(vnet_classify_entry_t) e0->advance</code>
+ *	- Signed quantity applied via <code>vlib_buffer_advance</code>
+ * 	when the classifier hits on a session
+ * - <code>(vnet_classify_table_t) t0->miss_next_index</code>
+ *	- Used to steer traffic when the classifier misses
+ *
+ * @em Sets:
+ * - <code>vnet_buffer (b0)->l2_classify.table_index</code>
+ * 	- Classifier table index of the first classifier table in
+ *	the classifier table chain
+ * - <code>vnet_buffer (b0)->l2_classify.hash</code>
+ * 	- Bounded-index extensible hash corresponding to the
+ *	masked fields in the current packet
+ * - <code>vnet_buffer (b0)->l2.feature_bitmap</code>
+ * 	- Used to steer packets across l2 features enabled on the interface
+ * - <code>vnet_buffer (b0)->l2_classify.opaque_index</code>
+ * 	- Copied from the classifier session object upon classifier hit
+ *
+ * @em Counters:
+ * - <code>L2_OUTPUT_CLASSIFY_ERROR_MISS</code> Classifier misses
+ * - <code>L2_OUTPUT_CLASSIFY_ERROR_HIT</code> Classifier hits
+ * - <code>L2_OUTPUT_CLASSIFY_ERROR_CHAIN_HIT</code>
+ *   Classifier hits in other than the first table
+ */
+
+static uword
+l2_output_classify_node_fn (vlib_main_t * vm,
+			    vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  l2_output_classify_next_t next_index;
+  l2_output_classify_main_t *cm = &l2_output_classify_main;
+  vnet_classify_main_t *vcm = cm->vnet_classify_main;
+  l2_output_classify_runtime_t *rt =
+    (l2_output_classify_runtime_t *) node->runtime_data;
+  u32 feature_bitmap0;
+  u32 hits = 0;
+  u32 misses = 0;
+  u32 chain_hits = 0;
+  f64 now;
+  u32 n_next_nodes;
+  u32 cached_sw_if_index = (u32) ~ 0;
+  u32 cached_next_index = (u32) ~ 0;
+  u32 sw_if_index0;
+
+  n_next_nodes = node->n_next_nodes;
+
+  now = vlib_time_now (vm);
+
+  n_left_from = frame->n_vectors;
+  from = vlib_frame_vector_args (frame);
+
+  /* First pass: compute hash */
+
+  while (n_left_from > 2)
+    {
+      vlib_buffer_t *b0, *b1;
+      u32 bi0, bi1;
+      ethernet_header_t *h0, *h1;
+      u32 sw_if_index0, sw_if_index1;
+      u16 type0, type1;
+      int type_index0, type_index1;
+      vnet_classify_table_t *t0, *t1;
+      u32 table_index0, table_index1;
+      u64 hash0, hash1;
+
+
+      /* prefetch next iteration */
+      {
+	vlib_buffer_t *p1, *p2;
+
+	p1 = vlib_get_buffer (vm, from[1]);
+	p2 = vlib_get_buffer (vm, from[2]);
+
+	vlib_prefetch_buffer_header (p1, STORE);
+	CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE);
+	vlib_prefetch_buffer_header (p2, STORE);
+	CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+      }
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      h0 = vlib_buffer_get_current (b0);
+
+      bi1 = from[1];
+      b1 = vlib_get_buffer (vm, bi1);
+      h1 = vlib_buffer_get_current (b1);
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+      vnet_buffer (b0)->l2_classify.table_index = ~0;
+
+      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_TX];
+      vnet_buffer (b1)->l2_classify.table_index = ~0;
+
+      /* Select classifier table based on ethertype */
+      type0 = clib_net_to_host_u16 (h0->type);
+      type1 = clib_net_to_host_u16 (h1->type);
+
+      type_index0 = (type0 == ETHERNET_TYPE_IP4)
+	? L2_OUTPUT_CLASSIFY_TABLE_IP4 : L2_OUTPUT_CLASSIFY_TABLE_OTHER;
+      type_index0 = (type0 == ETHERNET_TYPE_IP6)
+	? L2_OUTPUT_CLASSIFY_TABLE_IP6 : type_index0;
+
+      type_index1 = (type1 == ETHERNET_TYPE_IP4)
+	? L2_OUTPUT_CLASSIFY_TABLE_IP4 : L2_OUTPUT_CLASSIFY_TABLE_OTHER;
+      type_index1 = (type1 == ETHERNET_TYPE_IP6)
+	? L2_OUTPUT_CLASSIFY_TABLE_IP6 : type_index1;
+
+      vnet_buffer (b0)->l2_classify.table_index =
+	table_index0 =
+	rt->l2cm->classify_table_index_by_sw_if_index
+	[type_index0][sw_if_index0];
+
+      if (table_index0 != ~0)
+	{
+	  t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+	  vnet_buffer (b0)->l2_classify.hash = hash0 =
+	    vnet_classify_hash_packet (t0, (u8 *) h0);
+	  vnet_classify_prefetch_bucket (t0, hash0);
+	}
+
+      vnet_buffer (b1)->l2_classify.table_index =
+	table_index1 =
+	rt->l2cm->classify_table_index_by_sw_if_index
+	[type_index1][sw_if_index1];
+
+      if (table_index1 != ~0)
+	{
+	  t1 = pool_elt_at_index (vcm->tables, table_index1);
+
+	  vnet_buffer (b1)->l2_classify.hash = hash1 =
+	    vnet_classify_hash_packet (t1, (u8 *) h1);
+	  vnet_classify_prefetch_bucket (t1, hash1);
+	}
+
+      from += 2;
+      n_left_from -= 2;
+    }
+
+  while (n_left_from > 0)
+    {
+      vlib_buffer_t *b0;
+      u32 bi0;
+      ethernet_header_t *h0;
+      u16 type0;
+      u32 type_index0;
+      vnet_classify_table_t *t0;
+      u32 table_index0;
+      u64 hash0;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      h0 = vlib_buffer_get_current (b0);
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+      vnet_buffer (b0)->l2_classify.table_index = ~0;
+
+      /* Select classifier table based on ethertype */
+      type0 = clib_net_to_host_u16 (h0->type);
+
+      type_index0 = (type0 == ETHERNET_TYPE_IP4)
+	? L2_OUTPUT_CLASSIFY_TABLE_IP4 : L2_OUTPUT_CLASSIFY_TABLE_OTHER;
+      type_index0 = (type0 == ETHERNET_TYPE_IP6)
+	? L2_OUTPUT_CLASSIFY_TABLE_IP6 : type_index0;
+
+      vnet_buffer (b0)->l2_classify.table_index =
+	table_index0 = rt->l2cm->classify_table_index_by_sw_if_index
+	[type_index0][sw_if_index0];
+
+      if (table_index0 != ~0)
+	{
+	  t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+	  vnet_buffer (b0)->l2_classify.hash = hash0 =
+	    vnet_classify_hash_packet (t0, (u8 *) h0);
+	  vnet_classify_prefetch_bucket (t0, hash0);
+	}
+      from++;
+      n_left_from--;
+    }
+
+  next_index = node->cached_next_index;
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /* Not enough load/store slots to dual loop... */
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0 = ~0;
+	  ethernet_header_t *h0;
+	  u32 table_index0;
+	  u64 hash0;
+	  vnet_classify_table_t *t0;
+	  vnet_classify_entry_t *e0;
+
+	  if (PREDICT_TRUE (n_left_from > 2))
+	    {
+	      vlib_buffer_t *p2 = vlib_get_buffer (vm, from[2]);
+	      u64 phash2;
+	      u32 table_index2;
+	      vnet_classify_table_t *tp2;
+
+	      /*
+	       * Prefetch table entry two ahead. Buffer / data
+	       * were prefetched above...
+	       */
+	      table_index2 = vnet_buffer (p2)->l2_classify.table_index;
+
+	      if (PREDICT_TRUE (table_index2 != ~0))
+		{
+		  tp2 = pool_elt_at_index (vcm->tables, table_index2);
+		  phash2 = vnet_buffer (p2)->l2_classify.hash;
+		  vnet_classify_prefetch_entry (tp2, phash2);
+		}
+	    }
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  h0 = vlib_buffer_get_current (b0);
+	  table_index0 = vnet_buffer (b0)->l2_classify.table_index;
+	  e0 = 0;
+	  vnet_buffer (b0)->l2_classify.opaque_index = ~0;
+	  /* Remove ourself from the feature bitmap */
+	  feature_bitmap0 = vnet_buffer (b0)->l2.feature_bitmap
+	    & ~L2OUTPUT_FEAT_OUTPUT_CLASSIFY;
+
+	  /* save for next feature graph nodes */
+	  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap0;
+
+	  if (PREDICT_TRUE (table_index0 != ~0))
+	    {
+	      hash0 = vnet_buffer (b0)->l2_classify.hash;
+	      t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+	      e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
+	      if (e0)
+		{
+		  vnet_buffer (b0)->l2_classify.opaque_index
+		    = e0->opaque_index;
+		  vlib_buffer_advance (b0, e0->advance);
+		  next0 = (e0->next_index < n_next_nodes) ?
+		    e0->next_index : next0;
+		  hits++;
+		}
+	      else
+		{
+		  while (1)
+		    {
+		      if (t0->next_table_index != ~0)
+			t0 = pool_elt_at_index (vcm->tables,
+						t0->next_table_index);
+		      else
+			{
+			  next0 = (t0->miss_next_index < n_next_nodes) ?
+			    t0->miss_next_index : next0;
+			  misses++;
+			  break;
+			}
+
+		      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
+		      e0 =
+			vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
+		      if (e0)
+			{
+			  vnet_buffer (b0)->l2_classify.opaque_index
+			    = e0->opaque_index;
+			  vlib_buffer_advance (b0, e0->advance);
+			  next0 = (e0->next_index < n_next_nodes) ?
+			    e0->next_index : next0;
+			  hits++;
+			  chain_hits++;
+			  break;
+			}
+		    }
+		}
+	    }
+
+	  if (PREDICT_FALSE (next0 == 0))
+	    b0->error = node->errors[L2_OUTPUT_CLASSIFY_ERROR_DROP];
+
+	  if (PREDICT_FALSE (next0 == ~0))
+	    {
+	      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+
+	      /* Determine next node */
+	      l2_output_dispatch (cm->vlib_main,
+				  cm->vnet_main,
+				  node,
+				  l2_output_classify_node.index,
+				  &cached_sw_if_index,
+				  &cached_next_index,
+				  &cm->next_nodes,
+				  b0, sw_if_index0, feature_bitmap0, &next0);
+	    }
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      l2_output_classify_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	      t->table_index = table_index0;
+	      t->next_index = next0;
+	      t->session_offset = e0 ? vnet_classify_get_offset (t0, e0) : 0;
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, node->node_index,
+			       L2_OUTPUT_CLASSIFY_ERROR_MISS, misses);
+  vlib_node_increment_counter (vm, node->node_index,
+			       L2_OUTPUT_CLASSIFY_ERROR_HIT, hits);
+  vlib_node_increment_counter (vm, node->node_index,
+			       L2_OUTPUT_CLASSIFY_ERROR_CHAIN_HIT,
+			       chain_hits);
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2_output_classify_node) = {
+  .function = l2_output_classify_node_fn,
+  .name = "l2-output-classify",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2_output_classify_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2_output_classify_error_strings),
+  .error_strings = l2_output_classify_error_strings,
+
+  .runtime_data_bytes = sizeof (l2_output_classify_runtime_t),
+
+  .n_next_nodes = L2_OUTPUT_CLASSIFY_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [L2_OUTPUT_CLASSIFY_NEXT_DROP]  = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2_output_classify_node,
+			      l2_output_classify_node_fn);
+
+/** l2 output classsifier feature initialization. */
+clib_error_t *
+l2_output_classify_init (vlib_main_t * vm)
+{
+  l2_output_classify_main_t *cm = &l2_output_classify_main;
+  l2_output_classify_runtime_t *rt;
+
+  rt = vlib_node_get_runtime_data (vm, l2_output_classify_node.index);
+
+  cm->vlib_main = vm;
+  cm->vnet_main = vnet_get_main ();
+  cm->vnet_classify_main = &vnet_classify_main;
+
+  /* Initialize the feature next-node indexes */
+  feat_bitmap_init_next_nodes (vm,
+			       l2_output_classify_node.index,
+			       L2OUTPUT_N_FEAT,
+			       l2output_get_feat_names (),
+			       cm->feat_next_node_index);
+  rt->l2cm = cm;
+  rt->vcm = cm->vnet_classify_main;
+
+  /* Initialize the output node mapping table */
+  l2output_init_output_node_vec (&cm->next_nodes.output_node_index_vec);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2_output_classify_init);
+
+/** Enable/disable l2 input classification on a specific interface. */
+void
+vnet_l2_output_classify_enable_disable (u32 sw_if_index, int enable_disable)
+{
+
+  l2output_intf_bitmap_enable (sw_if_index, L2OUTPUT_FEAT_OUTPUT_CLASSIFY,
+			       (u32) enable_disable);
+}
+
+/** @brief Set l2 per-protocol, per-interface output classification tables.
+ *
+ *  @param sw_if_index        interface handle
+ *  @param ip4_table_index    ip4 classification table index, or ~0
+ *  @param ip6_table_index    ip6 classification table index, or ~0
+ *  @param other_table_index  non-ip4, non-ip6 classification table index,
+ *         or ~0
+ *  @returns 0 on success, VNET_API_ERROR_NO_SUCH_TABLE, TABLE2, TABLE3
+ *           if the indicated (non-~0) table does not exist.
+ */
+
+int
+vnet_l2_output_classify_set_tables (u32 sw_if_index,
+				    u32 ip4_table_index,
+				    u32 ip6_table_index,
+				    u32 other_table_index)
+{
+  l2_output_classify_main_t *cm = &l2_output_classify_main;
+  vnet_classify_main_t *vcm = cm->vnet_classify_main;
+
+  /* Assume that we've validated sw_if_index in the API layer */
+
+  if (ip4_table_index != ~0 &&
+      pool_is_free_index (vcm->tables, ip4_table_index))
+    return VNET_API_ERROR_NO_SUCH_TABLE;
+
+  if (ip6_table_index != ~0 &&
+      pool_is_free_index (vcm->tables, ip6_table_index))
+    return VNET_API_ERROR_NO_SUCH_TABLE2;
+
+  if (other_table_index != ~0 &&
+      pool_is_free_index (vcm->tables, other_table_index))
+    return VNET_API_ERROR_NO_SUCH_TABLE3;
+
+  vec_validate
+    (cm->classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_IP4],
+     sw_if_index);
+
+  vec_validate
+    (cm->classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_IP6],
+     sw_if_index);
+
+  vec_validate
+    (cm->classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_OTHER],
+     sw_if_index);
+
+  cm->classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_IP4]
+    [sw_if_index] = ip4_table_index;
+
+  cm->classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_IP6]
+    [sw_if_index] = ip6_table_index;
+
+  cm->classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_OTHER]
+    [sw_if_index] = other_table_index;
+
+  return 0;
+}
+
+static clib_error_t *
+int_l2_output_classify_command_fn (vlib_main_t * vm,
+				   unformat_input_t * input,
+				   vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index = ~0;
+  u32 ip4_table_index = ~0;
+  u32 ip6_table_index = ~0;
+  u32 other_table_index = ~0;
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "intfc %U", unformat_vnet_sw_interface,
+		    vnm, &sw_if_index))
+	;
+      else if (unformat (input, "ip4-table %d", &ip4_table_index))
+	;
+      else if (unformat (input, "ip6-table %d", &ip6_table_index))
+	;
+      else if (unformat (input, "other-table %d", &other_table_index))
+	;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "interface must be specified");
+
+
+  if (ip4_table_index == ~0 && ip6_table_index == ~0
+      && other_table_index == ~0)
+    {
+      vlib_cli_output (vm, "L2 classification disabled");
+      vnet_l2_output_classify_enable_disable (sw_if_index, 0 /* enable */ );
+      return 0;
+    }
+
+  rv = vnet_l2_output_classify_set_tables (sw_if_index, ip4_table_index,
+					   ip6_table_index,
+					   other_table_index);
+  switch (rv)
+    {
+    case 0:
+      vnet_l2_output_classify_enable_disable (sw_if_index, 1 /* enable */ );
+      break;
+
+    default:
+      return clib_error_return (0, "vnet_l2_output_classify_set_tables: %d",
+				rv);
+      break;
+    }
+
+  return 0;
+}
+
+/*?
+ * Configure Layer 2 output classification.
+ *
+ * @cliexpar
+ * @cliexstart{set interface l2 output classify intfc <interface-name> [ip4-table <index>] [ip6-table <index>] [other-table <index>]}
+ * @cliexend
+ * @todo This is incomplete. This needs a detailed description and a
+ * practical example.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (int_l2_output_classify_cli, static) = {
+  .path = "set interface l2 output classify",
+  .short_help =
+  "set interface l2 output classify intfc <<interface-name>> [ip4-table <n>]\n"
+  "  [ip6-table <n>] [other-table <n>]",
+  .function = int_l2_output_classify_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_patch.c b/src/vnet/l2/l2_patch.c
new file mode 100644
index 00000000..5e4691f4
--- /dev/null
+++ b/src/vnet/l2/l2_patch.c
@@ -0,0 +1,452 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/feature/feature.h>
+#include <vppinfra/error.h>
+
+typedef struct
+{
+  /* vector of dispositions, indexed by rx_sw_if_index */
+  u32 *tx_next_by_rx_sw_if_index;
+  u32 *tx_sw_if_index_by_rx_sw_if_index;
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} l2_patch_main_t;
+
+typedef struct
+{
+  u32 rx_sw_if_index;
+  u32 tx_sw_if_index;
+} l2_patch_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_l2_patch_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2_patch_trace_t *t = va_arg (*args, l2_patch_trace_t *);
+
+  s = format (s, "L2_PATCH: rx %d tx %d", t->rx_sw_if_index,
+	      t->tx_sw_if_index);
+  return s;
+}
+
+l2_patch_main_t l2_patch_main;
+
+static vlib_node_registration_t l2_patch_node;
+
+#define foreach_l2_patch_error			\
+_(PATCHED, "L2 patch packets")			\
+_(DROPPED, "L2 patch misconfigured drops")
+
+typedef enum
+{
+#define _(sym,str) L2_PATCH_ERROR_##sym,
+  foreach_l2_patch_error
+#undef _
+    L2_PATCH_N_ERROR,
+} l2_patch_error_t;
+
+static char *l2_patch_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2_patch_error
+#undef _
+};
+
+typedef enum
+{
+  L2_PATCH_NEXT_DROP,
+  L2_PATCH_N_NEXT,
+} l2_patch_next_t;
+
+static uword
+l2_patch_node_fn (vlib_main_t * vm,
+		  vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  l2_patch_next_t next_index;
+  l2_patch_main_t *l2pm = &l2_patch_main;
+  vlib_node_t *n = vlib_get_node (vm, l2_patch_node.index);
+  u32 node_counter_base_index = n->error_heap_index;
+  vlib_error_main_t *em = &vm->error_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+	  u32 sw_if_index0, sw_if_index1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    /* So stupid / simple, we don't need to prefetch data */
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+
+	  ASSERT (l2pm->tx_next_by_rx_sw_if_index[sw_if_index0] != ~0);
+	  ASSERT (l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index0] != ~0);
+	  ASSERT (l2pm->tx_next_by_rx_sw_if_index[sw_if_index1] != ~0);
+	  ASSERT (l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index1] != ~0);
+
+	  next0 = l2pm->tx_next_by_rx_sw_if_index[sw_if_index0];
+	  next1 = l2pm->tx_next_by_rx_sw_if_index[sw_if_index1];
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] =
+	    l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index0];
+	  vnet_buffer (b1)->sw_if_index[VLIB_TX] =
+	    l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index1];
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2_patch_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->rx_sw_if_index = sw_if_index0;
+		  t->tx_sw_if_index =
+		    l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index0];
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2_patch_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->rx_sw_if_index = sw_if_index1;
+		  t->tx_sw_if_index =
+		    l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index1];
+		}
+	    }
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 sw_if_index0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+	  ASSERT (l2pm->tx_next_by_rx_sw_if_index[sw_if_index0] != ~0);
+	  ASSERT (l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index0] != ~0);
+
+	  next0 = l2pm->tx_next_by_rx_sw_if_index[sw_if_index0];
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] =
+	    l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index0];
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  l2_patch_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->rx_sw_if_index = sw_if_index0;
+		  t->tx_sw_if_index =
+		    l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index0];
+		}
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  em->counters[node_counter_base_index + L2_PATCH_ERROR_PATCHED] +=
+    frame->n_vectors;
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2_patch_node, static) = {
+  .function = l2_patch_node_fn,
+  .name = "l2-patch",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2_patch_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2_patch_error_strings),
+  .error_strings = l2_patch_error_strings,
+
+  .n_next_nodes = L2_PATCH_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+        [L2_PATCH_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2_patch_node, l2_patch_node_fn)
+     int vnet_l2_patch_add_del (u32 rx_sw_if_index, u32 tx_sw_if_index,
+				int is_add)
+{
+  l2_patch_main_t *l2pm = &l2_patch_main;
+  vnet_hw_interface_t *rxhi, *txhi;
+  u32 tx_next_index;
+
+  /*
+   * We assume that the API msg handler has used 2x VALIDATE_SW_IF_INDEX
+   * macros...
+   */
+
+  rxhi = vnet_get_sup_hw_interface (l2pm->vnet_main, rx_sw_if_index);
+
+  /* Make sure caller didn't pass a vlan subif, etc. */
+  if (rxhi->sw_if_index != rx_sw_if_index)
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+  txhi = vnet_get_sup_hw_interface (l2pm->vnet_main, tx_sw_if_index);
+  if (txhi->sw_if_index != tx_sw_if_index)
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX_2;
+
+  if (is_add)
+    {
+      tx_next_index = vlib_node_add_next (l2pm->vlib_main,
+					  l2_patch_node.index,
+					  txhi->output_node_index);
+
+      vec_validate_init_empty (l2pm->tx_next_by_rx_sw_if_index,
+			       rx_sw_if_index, ~0);
+
+      l2pm->tx_next_by_rx_sw_if_index[rx_sw_if_index] = tx_next_index;
+      vec_validate_init_empty (l2pm->tx_sw_if_index_by_rx_sw_if_index,
+			       rx_sw_if_index, ~0);
+      l2pm->tx_sw_if_index_by_rx_sw_if_index[rx_sw_if_index]
+	= txhi->sw_if_index;
+
+      ethernet_set_flags (l2pm->vnet_main, rxhi->hw_if_index,
+			  ETHERNET_INTERFACE_FLAG_ACCEPT_ALL);
+
+      vnet_feature_enable_disable ("device-input", "l2-patch",
+				   rxhi->hw_if_index, 1, 0, 0);
+    }
+  else
+    {
+      ethernet_set_flags (l2pm->vnet_main, rxhi->hw_if_index,
+			  0 /* disable promiscuous mode */ );
+
+      vnet_feature_enable_disable ("device-input", "l2-patch",
+				   rxhi->hw_if_index, 0, 0, 0);
+      if (vec_len (l2pm->tx_next_by_rx_sw_if_index) > rx_sw_if_index)
+	{
+	  l2pm->tx_next_by_rx_sw_if_index[rx_sw_if_index] = ~0;
+	  l2pm->tx_sw_if_index_by_rx_sw_if_index[rx_sw_if_index] = ~0;
+	}
+    }
+
+  return 0;
+}
+
+static clib_error_t *
+test_patch_command_fn (vlib_main_t * vm,
+		       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  l2_patch_main_t *l2pm = &l2_patch_main;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 rx_sw_if_index, tx_sw_if_index;
+  int rv;
+  int rx_set = 0;
+  int tx_set = 0;
+  int is_add = 1;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "rx %U", unformat_vnet_sw_interface,
+		    l2pm->vnet_main, &rx_sw_if_index))
+	rx_set = 1;
+      else if (unformat (line_input, "tx %U", unformat_vnet_sw_interface,
+			 l2pm->vnet_main, &tx_sw_if_index))
+	tx_set = 1;
+      else if (unformat (line_input, "del"))
+	is_add = 0;
+      else
+	break;
+    }
+
+  if (rx_set == 0)
+    return clib_error_return (0, "rx interface not set");
+
+  if (tx_set == 0)
+    return clib_error_return (0, "tx interface not set");
+
+  rv = vnet_l2_patch_add_del (rx_sw_if_index, tx_sw_if_index, is_add);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case VNET_API_ERROR_INVALID_SW_IF_INDEX:
+      return clib_error_return (0, "rx interface not a physical port");
+
+    case VNET_API_ERROR_INVALID_SW_IF_INDEX_2:
+      return clib_error_return (0, "tx interface not a physical port");
+
+    default:
+      return clib_error_return
+	(0, "WARNING: vnet_l2_patch_add_del returned %d", rv);
+    }
+
+  return 0;
+}
+
+/*?
+ * Create or delete a Layer 2 patch.
+ *
+ * @cliexpar
+ * @cliexstart{test l2patch rx <intfc> tx <intfc> [del]}
+ * @cliexend
+ * @todo This is incomplete. This needs a detailed description and a
+ * practical example.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (test_patch_command, static) = {
+    .path = "test l2patch",
+    .short_help = "test l2patch rx <intfc> tx <intfc> [del]",
+    .function = test_patch_command_fn,
+};
+/* *INDENT-ON* */
+
+/** Display the contents of the l2patch table. */
+static clib_error_t *
+show_l2patch (vlib_main_t * vm,
+	      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  l2_patch_main_t *l2pm = &l2_patch_main;
+  u32 rx_sw_if_index;
+  u32 no_entries = 1;
+
+  ASSERT (vec_len (l2pm->tx_next_by_rx_sw_if_index) ==
+	  vec_len (l2pm->tx_sw_if_index_by_rx_sw_if_index));
+
+  for (rx_sw_if_index = 0;
+       rx_sw_if_index < vec_len (l2pm->tx_sw_if_index_by_rx_sw_if_index);
+       rx_sw_if_index++)
+    {
+      u32 tx_sw_if_index =
+	l2pm->tx_sw_if_index_by_rx_sw_if_index[rx_sw_if_index];
+      if (tx_sw_if_index != ~0)
+	{
+	  no_entries = 0;
+	  vlib_cli_output (vm, "%26U -> %U",
+			   format_vnet_sw_if_index_name,
+			   l2pm->vnet_main, rx_sw_if_index,
+			   format_vnet_sw_if_index_name,
+			   l2pm->vnet_main, tx_sw_if_index);
+	}
+    }
+
+  if (no_entries)
+    vlib_cli_output (vm, "no l2patch entries");
+
+  return 0;
+}
+
+/*?
+ * Show Layer 2 patch entries.
+ *
+ * @cliexpar
+ * @cliexstart{show l2patch}
+ * @cliexend
+ * @todo This is incomplete. This needs a detailed description and a
+ * practical example.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_l2patch_cli, static) = {
+  .path = "show l2patch",
+  .short_help = "Show l2 interface cross-connect entries",
+  .function = show_l2patch,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+l2_patch_init (vlib_main_t * vm)
+{
+  l2_patch_main_t *mp = &l2_patch_main;
+
+  mp->vlib_main = vm;
+  mp->vnet_main = vnet_get_main ();
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2_patch_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_rw.c b/src/vnet/l2/l2_rw.c
new file mode 100644
index 00000000..c54509d0
--- /dev/null
+++ b/src/vnet/l2/l2_rw.c
@@ -0,0 +1,719 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/l2/feat_bitmap.h>
+#include <vnet/l2/l2_rw.h>
+
+/**
+ * @file
+ * @brief Layer 2 Rewrite.
+ *
+ * Layer 2-Rewrite node uses classify tables to match packets. Then, using
+ * the provisioned mask and value, modfies the packet header.
+ */
+
+
+l2_rw_main_t l2_rw_main;
+
+vlib_node_registration_t l2_rw_node;
+
+typedef struct
+{
+  u32 sw_if_index;
+  u32 classify_table_index;
+  u32 rewrite_entry_index;
+} l2_rw_trace_t;
+
+static u8 *
+format_l2_rw_entry (u8 * s, va_list * args)
+{
+  l2_rw_entry_t *e = va_arg (*args, l2_rw_entry_t *);
+  l2_rw_main_t *rw = &l2_rw_main;
+  s = format (s, "%d -  mask:%U value:%U\n",
+	      e - rw->entries,
+	      format_hex_bytes, e->mask,
+	      e->rewrite_n_vectors * sizeof (u32x4), format_hex_bytes,
+	      e->value, e->rewrite_n_vectors * sizeof (u32x4));
+  s =
+    format (s, "      hits:%d skip_bytes:%d", e->hit_count,
+	    e->skip_n_vectors * sizeof (u32x4));
+  return s;
+}
+
+static u8 *
+format_l2_rw_config (u8 * s, va_list * args)
+{
+  l2_rw_config_t *c = va_arg (*args, l2_rw_config_t *);
+  return format (s, "table-index:%d miss-index:%d",
+		 c->table_index, c->miss_index);
+}
+
+/* packet trace format function */
+static u8 *
+format_l2_rw_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2_rw_trace_t *t = va_arg (*args, l2_rw_trace_t *);
+  return format (s, "l2-rw: sw_if_index %d, table %d, entry %d",
+		 t->sw_if_index, t->classify_table_index,
+		 t->rewrite_entry_index);
+}
+
+always_inline l2_rw_config_t *
+l2_rw_get_config (u32 sw_if_index)
+{
+  l2_rw_main_t *rw = &l2_rw_main;
+  if (PREDICT_FALSE (!clib_bitmap_get (rw->configs_bitmap, sw_if_index)))
+    {
+      vec_validate (rw->configs, sw_if_index);
+      rw->configs[sw_if_index].table_index = ~0;
+      rw->configs[sw_if_index].miss_index = ~0;
+      rw->configs_bitmap =
+	clib_bitmap_set (rw->configs_bitmap, sw_if_index, 1);
+    }
+  return &rw->configs[sw_if_index];
+}
+
+static_always_inline void
+l2_rw_rewrite (l2_rw_entry_t * rwe, u8 * h)
+{
+  if (U32X4_ALIGNED (h))
+    {
+      u32x4 *d = ((u32x4 *) h) + rwe->skip_n_vectors;
+      switch (rwe->rewrite_n_vectors)
+	{
+	case 5:
+	  d[4] = (d[4] & ~rwe->mask[4]) | rwe->value[4];
+	  /* FALLTHROUGH */
+	case 4:
+	  d[3] = (d[3] & ~rwe->mask[3]) | rwe->value[3];
+	  /* FALLTHROUGH */
+	case 3:
+	  d[2] = (d[2] & ~rwe->mask[2]) | rwe->value[2];
+	  /* FALLTHROUGH */
+	case 2:
+	  d[1] = (d[1] & ~rwe->mask[1]) | rwe->value[1];
+	  /* FALLTHROUGH */
+	case 1:
+	  d[0] = (d[0] & ~rwe->mask[0]) | rwe->value[0];
+	  break;
+	default:
+	  abort ();
+	}
+    }
+  else
+    {
+      u64 *d = ((u64 *) h) + rwe->skip_n_vectors * 2;
+      switch (rwe->rewrite_n_vectors)
+	{
+	case 5:
+	  d[8] =
+	    (d[8] & ~(((u64 *) rwe->mask)[8])) | (((u64 *) rwe->value)[8]);
+	  d[9] =
+	    (d[9] & ~(((u64 *) rwe->mask)[9])) | (((u64 *) rwe->value)[9]);
+	  /* FALLTHROUGH */
+	case 4:
+	  d[6] =
+	    (d[6] & ~(((u64 *) rwe->mask)[6])) | (((u64 *) rwe->value)[6]);
+	  d[7] =
+	    (d[7] & ~(((u64 *) rwe->mask)[7])) | (((u64 *) rwe->value)[7]);
+	  /* FALLTHROUGH */
+	case 3:
+	  d[4] =
+	    (d[4] & ~(((u64 *) rwe->mask)[4])) | (((u64 *) rwe->value)[4]);
+	  d[5] =
+	    (d[5] & ~(((u64 *) rwe->mask)[5])) | (((u64 *) rwe->value)[5]);
+	  /* FALLTHROUGH */
+	case 2:
+	  d[2] =
+	    (d[2] & ~(((u64 *) rwe->mask)[2])) | (((u64 *) rwe->value)[2]);
+	  d[3] =
+	    (d[3] & ~(((u64 *) rwe->mask)[3])) | (((u64 *) rwe->value)[3]);
+	  /* FALLTHROUGH */
+	case 1:
+	  d[0] =
+	    (d[0] & ~(((u64 *) rwe->mask)[0])) | (((u64 *) rwe->value)[0]);
+	  d[1] =
+	    (d[1] & ~(((u64 *) rwe->mask)[1])) | (((u64 *) rwe->value)[1]);
+	  break;
+	default:
+	  abort ();
+	}
+    }
+}
+
+static uword
+l2_rw_node_fn (vlib_main_t * vm,
+	       vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  l2_rw_main_t *rw = &l2_rw_main;
+  u32 n_left_from, *from, *to_next, next_index;
+  vnet_classify_main_t *vcm = &vnet_classify_main;
+  f64 now = vlib_time_now (vlib_get_main ());
+  u32 prefetch_size = 0;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;	/* number of packets to process */
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      /* get space to enqueue frame to graph node "next_index" */
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, next0, sw_if_index0, feature_bitmap0, rwe_index0;
+	  u32 bi1, next1, sw_if_index1, feature_bitmap1, rwe_index1;
+	  vlib_buffer_t *b0, *b1;
+	  ethernet_header_t *h0, *h1;
+	  l2_rw_config_t *config0, *config1;
+	  u64 hash0, hash1;
+	  vnet_classify_table_t *t0, *t1;
+	  vnet_classify_entry_t *e0, *e1;
+	  l2_rw_entry_t *rwe0, *rwe1;
+
+	  {
+	    vlib_buffer_t *p2, *p3;
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+	    CLIB_PREFETCH (vlib_buffer_get_current (p2), prefetch_size, LOAD);
+	    CLIB_PREFETCH (vlib_buffer_get_current (p3), prefetch_size, LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+	  h0 = vlib_buffer_get_current (b0);
+	  h1 = vlib_buffer_get_current (b1);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+	  config0 = l2_rw_get_config (sw_if_index0);	/*TODO: check sw_if_index0 value */
+	  config1 = l2_rw_get_config (sw_if_index1);	/*TODO: check sw_if_index0 value */
+	  t0 = pool_elt_at_index (vcm->tables, config0->table_index);
+	  t1 = pool_elt_at_index (vcm->tables, config1->table_index);
+	  prefetch_size =
+	    (t1->skip_n_vectors + t1->match_n_vectors) * sizeof (u32x4);
+
+	  hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
+	  hash1 = vnet_classify_hash_packet (t1, (u8 *) h1);
+	  e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
+	  e1 = vnet_classify_find_entry (t1, (u8 *) h1, hash1, now);
+
+	  while (!e0 && (t0->next_table_index != ~0))
+	    {
+	      t0 = pool_elt_at_index (vcm->tables, t0->next_table_index);
+	      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
+	      e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
+	    }
+
+	  while (!e1 && (t1->next_table_index != ~0))
+	    {
+	      t1 = pool_elt_at_index (vcm->tables, t1->next_table_index);
+	      hash1 = vnet_classify_hash_packet (t1, (u8 *) h1);
+	      e1 = vnet_classify_find_entry (t1, (u8 *) h1, hash1, now);
+	    }
+
+	  rwe_index0 = e0 ? e0->opaque_index : config0->miss_index;
+	  rwe_index1 = e1 ? e1->opaque_index : config1->miss_index;
+
+	  if (rwe_index0 != ~0)
+	    {
+	      rwe0 = pool_elt_at_index (rw->entries, rwe_index0);
+	      l2_rw_rewrite (rwe0, (u8 *) h0);
+	    }
+	  if (rwe_index1 != ~0)
+	    {
+	      rwe1 = pool_elt_at_index (rw->entries, rwe_index1);
+	      l2_rw_rewrite (rwe1, (u8 *) h1);
+	    }
+
+	  if (PREDICT_FALSE ((b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      l2_rw_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = sw_if_index0;
+	      t->classify_table_index = config0->table_index;
+	      t->rewrite_entry_index = rwe_index0;
+	    }
+
+	  if (PREDICT_FALSE ((b1->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      l2_rw_trace_t *t = vlib_add_trace (vm, node, b1, sizeof (*t));
+	      t->sw_if_index = sw_if_index1;
+	      t->classify_table_index = config1->table_index;
+	      t->rewrite_entry_index = rwe_index1;
+	    }
+
+	  /* Update feature bitmap and get next feature index */
+	  feature_bitmap0 =
+	    vnet_buffer (b0)->l2.feature_bitmap & ~L2INPUT_FEAT_RW;
+	  feature_bitmap1 =
+	    vnet_buffer (b1)->l2.feature_bitmap & ~L2INPUT_FEAT_RW;
+	  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap0;
+	  vnet_buffer (b1)->l2.feature_bitmap = feature_bitmap1;
+	  next0 = feat_bitmap_get_next_node_index (rw->feat_next_node_index,
+						   feature_bitmap0);
+	  next1 = feat_bitmap_get_next_node_index (rw->feat_next_node_index,
+						   feature_bitmap1);
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, next0, sw_if_index0, feature_bitmap0, rwe_index0;
+	  vlib_buffer_t *b0;
+	  ethernet_header_t *h0;
+	  l2_rw_config_t *config0;
+	  u64 hash0;
+	  vnet_classify_table_t *t0;
+	  vnet_classify_entry_t *e0;
+	  l2_rw_entry_t *rwe0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  h0 = vlib_buffer_get_current (b0);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  config0 = l2_rw_get_config (sw_if_index0);	/*TODO: check sw_if_index0 value */
+	  t0 = pool_elt_at_index (vcm->tables, config0->table_index);
+
+	  hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
+	  e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
+
+	  while (!e0 && (t0->next_table_index != ~0))
+	    {
+	      t0 = pool_elt_at_index (vcm->tables, t0->next_table_index);
+	      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
+	      e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
+	    }
+
+	  rwe_index0 = e0 ? e0->opaque_index : config0->miss_index;
+
+	  if (rwe_index0 != ~0)
+	    {
+	      rwe0 = pool_elt_at_index (rw->entries, rwe_index0);
+	      l2_rw_rewrite (rwe0, (u8 *) h0);
+	    }
+
+	  if (PREDICT_FALSE ((b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      l2_rw_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = sw_if_index0;
+	      t->classify_table_index = config0->table_index;
+	      t->rewrite_entry_index = rwe_index0;
+	    }
+
+	  /* Update feature bitmap and get next feature index */
+	  feature_bitmap0 =
+	    vnet_buffer (b0)->l2.feature_bitmap & ~L2INPUT_FEAT_RW;
+	  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap0;
+	  next0 = feat_bitmap_get_next_node_index (rw->feat_next_node_index,
+						   feature_bitmap0);
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+int
+l2_rw_mod_entry (u32 * index,
+		 u8 * mask, u8 * value, u32 len, u32 skip, u8 is_del)
+{
+  l2_rw_main_t *rw = &l2_rw_main;
+  l2_rw_entry_t *e = 0;
+  if (*index != ~0)
+    {
+      if (pool_is_free_index (rw->entries, *index))
+	{
+	  return -1;
+	}
+      e = pool_elt_at_index (rw->entries, *index);
+    }
+  else
+    {
+      pool_get (rw->entries, e);
+      *index = e - rw->entries;
+    }
+
+  if (!e)
+    return -1;
+
+  if (is_del)
+    {
+      pool_put (rw->entries, e);
+      return 0;
+    }
+
+  e->skip_n_vectors = skip / sizeof (u32x4);
+  skip -= e->skip_n_vectors * sizeof (u32x4);
+  e->rewrite_n_vectors = (skip + len - 1) / sizeof (u32x4) + 1;
+  vec_alloc_aligned (e->mask, e->rewrite_n_vectors, sizeof (u32x4));
+  memset (e->mask, 0, e->rewrite_n_vectors * sizeof (u32x4));
+  vec_alloc_aligned (e->value, e->rewrite_n_vectors, sizeof (u32x4));
+  memset (e->value, 0, e->rewrite_n_vectors * sizeof (u32x4));
+
+  clib_memcpy (((u8 *) e->value) + skip, value, len);
+  clib_memcpy (((u8 *) e->mask) + skip, mask, len);
+
+  int i;
+  for (i = 0; i < e->rewrite_n_vectors; i++)
+    {
+      e->value[i] &= e->mask[i];
+    }
+
+  return 0;
+}
+
+static clib_error_t *
+l2_rw_entry_cli_fn (vlib_main_t * vm,
+		    unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  u32 index = ~0;
+  u8 *mask = 0;
+  u8 *value = 0;
+  u32 skip = 0;
+  u8 del = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "index %d", &index))
+	;
+      else if (unformat (input, "mask %U", unformat_hex_string, &mask))
+	;
+      else if (unformat (input, "value %U", unformat_hex_string, &value))
+	;
+      else if (unformat (input, "skip %d", &skip))
+	;
+      else if (unformat (input, "del"))
+	del = 1;
+      else
+	break;
+    }
+
+  if (!mask || !value)
+    return clib_error_return (0, "Unspecified mask or value");
+
+  if (vec_len (mask) != vec_len (value))
+    return clib_error_return (0, "Mask and value lengths must be identical");
+
+  int ret;
+  if ((ret =
+       l2_rw_mod_entry (&index, mask, value, vec_len (mask), skip, del)))
+    return clib_error_return (0, "Could not add entry");
+
+  return 0;
+}
+
+/*?
+ * Layer 2-Rewrite node uses classify tables to match packets. Then, using
+ * the provisioned mask and value, modfies the packet header.
+ *
+ * @cliexpar
+ * @todo This is incomplete. This needs a detailed description and a
+ * practical example.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (l2_rw_entry_cli, static) = {
+  .path = "l2 rewrite entry",
+  .short_help =
+  "l2 rewrite entry [index <index>] [mask <hex-mask>] [value <hex-value>] [skip <n_bytes>] [del]",
+  .function = l2_rw_entry_cli_fn,
+};
+/* *INDENT-ON* */
+
+int
+l2_rw_interface_set_table (u32 sw_if_index, u32 table_index, u32 miss_index)
+{
+  l2_rw_config_t *c = l2_rw_get_config (sw_if_index);
+  l2_rw_main_t *rw = &l2_rw_main;
+
+  c->table_index = table_index;
+  c->miss_index = miss_index;
+  u32 feature_bitmap = (table_index == ~0) ? 0 : L2INPUT_FEAT_RW;
+
+  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_RW, feature_bitmap);
+
+  if (c->table_index == ~0)
+    clib_bitmap_set (rw->configs_bitmap, sw_if_index, 0);
+
+  return 0;
+}
+
+static clib_error_t *
+l2_rw_interface_cli_fn (vlib_main_t * vm,
+			unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 table_index = ~0;
+  u32 sw_if_index = ~0;
+  u32 miss_index = ~0;
+
+  if (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index);
+    }
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "table %d", &table_index))
+	;
+      else if (unformat (input, "miss-index %d", &miss_index))
+	;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0,
+			      "You must specify an interface 'iface <interface>'",
+			      format_unformat_error, input);
+  int ret;
+  if ((ret =
+       l2_rw_interface_set_table (sw_if_index, table_index, miss_index)))
+    return clib_error_return (0, "l2_rw_interface_set_table returned %d",
+			      ret);
+
+  return 0;
+}
+
+/*?
+ * Layer 2-Rewrite node uses classify tables to match packets. Then, using
+ * the provisioned mask and value, modfies the packet header.
+ *
+ * @cliexpar
+ * @todo This is incomplete. This needs a detailed description and a
+ * practical example.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (l2_rw_interface_cli, static) = {
+  .path = "set interface l2 rewrite",
+  .short_help =
+  "set interface l2 rewrite <interface> [table <table index>] [miss-index <entry-index>]",
+  .function = l2_rw_interface_cli_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+l2_rw_show_interfaces_cli_fn (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
+{
+  l2_rw_main_t *rw = &l2_rw_main;
+  if (clib_bitmap_count_set_bits (rw->configs_bitmap) == 0)
+    vlib_cli_output (vm, "No interface is currently using l2 rewrite\n");
+
+  uword i;
+  /* *INDENT-OFF* */
+  clib_bitmap_foreach(i, rw->configs_bitmap, {
+      vlib_cli_output (vm, "sw_if_index:%d %U\n", i, format_l2_rw_config, &rw->configs[i]);
+  });
+  /* *INDENT-ON* */
+  return 0;
+}
+
+/*?
+ * Layer 2-Rewrite node uses classify tables to match packets. Then, using
+ * the provisioned mask and value, modfies the packet header.
+ *
+ * @cliexpar
+ * @todo This is incomplete. This needs a detailed description and a
+ * practical example.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (l2_rw_show_interfaces_cli, static) = {
+  .path = "show l2 rewrite interfaces",
+  .short_help =
+  "show l2 rewrite interfaces",
+  .function = l2_rw_show_interfaces_cli_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+l2_rw_show_entries_cli_fn (vlib_main_t * vm,
+			   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  l2_rw_main_t *rw = &l2_rw_main;
+  l2_rw_entry_t *e;
+  if (pool_elts (rw->entries) == 0)
+    vlib_cli_output (vm, "No entries\n");
+
+  /* *INDENT-OFF* */
+  pool_foreach(e, rw->entries, {
+    vlib_cli_output (vm, "%U\n", format_l2_rw_entry, e);
+  });
+  /* *INDENT-ON* */
+  return 0;
+}
+
+/*?
+ * Layer 2-Rewrite node uses classify tables to match packets. Then, using
+ * the provisioned mask and value, modfies the packet header.
+ *
+ * @cliexpar
+ * @todo This is incomplete. This needs a detailed description and a
+ * practical example.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (l2_rw_show_entries_cli, static) = {
+  .path = "show l2 rewrite entries",
+  .short_help =
+  "show l2 rewrite entries",
+  .function = l2_rw_show_entries_cli_fn,
+};
+/* *INDENT-ON* */
+
+int
+l2_rw_enable_disable (u32 bridge_domain, u8 disable)
+{
+  u32 mask = L2INPUT_FEAT_RW;
+  l2input_set_bridge_features (bridge_domain, mask, disable ? 0 : mask);
+  return 0;
+}
+
+static clib_error_t *
+l2_rw_set_cli_fn (vlib_main_t * vm,
+		  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  u32 bridge_domain;
+  u8 disable = 0;
+
+  if (unformat_check_input (input) == UNFORMAT_END_OF_INPUT ||
+      !unformat (input, "%d", &bridge_domain))
+    {
+      return clib_error_return (0, "You must specify a bridge domain");
+    }
+
+  if (unformat_check_input (input) != UNFORMAT_END_OF_INPUT &&
+      unformat (input, "disable"))
+    {
+      disable = 1;
+    }
+
+  if (l2_rw_enable_disable (bridge_domain, disable))
+    return clib_error_return (0, "Could not enable or disable rewrite");
+
+  return 0;
+}
+
+/*?
+ * Layer 2-Rewrite node uses classify tables to match packets. Then, using
+ * the provisioned mask and value, modfies the packet header.
+ *
+ * @cliexpar
+ * @todo This is incomplete. This needs a detailed description and a
+ * practical example.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (l2_rw_set_cli, static) = {
+  .path = "set bridge-domain rewrite",
+  .short_help =
+  "set bridge-domain rewrite <bridge-domain> [disable]",
+  .function = l2_rw_set_cli_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+l2_rw_init (vlib_main_t * vm)
+{
+  l2_rw_main_t *rw = &l2_rw_main;
+  rw->configs = 0;
+  rw->entries = 0;
+  clib_bitmap_alloc (rw->configs_bitmap, 1);
+  feat_bitmap_init_next_nodes (vm,
+			       l2_rw_node.index,
+			       L2INPUT_N_FEAT,
+			       l2input_get_feat_names (),
+			       rw->feat_next_node_index);
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2_rw_init);
+
+enum
+{
+  L2_RW_NEXT_DROP,
+  L2_RW_N_NEXT,
+};
+
+#define foreach_l2_rw_error               \
+_(UNKNOWN, "Unknown error")
+
+typedef enum
+{
+#define _(sym,str) L2_RW_ERROR_##sym,
+  foreach_l2_rw_error
+#undef _
+    L2_RW_N_ERROR,
+} l2_rw_error_t;
+
+static char *l2_rw_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2_rw_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2_rw_node) = {
+  .function = l2_rw_node_fn,
+  .name = "l2-rw",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2_rw_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN(l2_rw_error_strings),
+  .error_strings = l2_rw_error_strings,
+  .runtime_data_bytes = 0,
+  .n_next_nodes = L2_RW_N_NEXT,
+  .next_nodes = { [L2_RW_NEXT_DROP]  = "error-drop"},
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2_rw_node, l2_rw_node_fn)
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_rw.h b/src/vnet/l2/l2_rw.h
new file mode 100644
index 00000000..49aa25fb
--- /dev/null
+++ b/src/vnet/l2/l2_rw.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * l2_rw is based on vnet classifier and provides a way
+ * to modify packets matching a given table.
+ *
+ * Tables must be created using vnet's classify features.
+ * Entries contained within these tables must have their
+ * opaque index set to the rewrite entry created with l2_rw_mod_entry.
+ */
+
+#ifndef L2_RW_H_
+#define L2_RW_H_
+
+#include <vnet/l2/l2_input.h>
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED(struct _l2_rw_entry {
+  u16 skip_n_vectors;
+  u16 rewrite_n_vectors;
+  u64 hit_count;
+  u32x4 *mask;
+  u32x4 *value;
+}) l2_rw_entry_t;
+/* *INDENT-ON* */
+
+/* l2_rw configuration for one interface */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED(struct _l2_rw_config {
+  u32 table_index; /* Which classify table to use */
+  u32 miss_index;  /* Rewrite entry to use if table does not match */
+}) l2_rw_config_t;
+/* *INDENT-ON* */
+
+typedef struct
+{
+  /* Next feature node indexes */
+  u32 feat_next_node_index[32];
+
+  /* A pool of entries */
+  l2_rw_entry_t *entries;
+
+  /* Config vector indexed by sw_if_index */
+  l2_rw_config_t *configs;
+  uword *configs_bitmap;
+} l2_rw_main_t;
+
+extern l2_rw_main_t l2_rw_main;
+
+/*
+ * Specifies which classify table and miss_index should be used
+ * with the given interface.
+ * Use special values ~0 in order to un-set table_index
+ * or miss_index.
+ * l2_rw feature is automatically enabled for the interface
+ * when table_index or miss_index is not ~0.
+ * returns 0 on success and something else on error.
+ */
+int l2_rw_interface_set_table (u32 sw_if_index,
+			       u32 table_index, u32 miss_index);
+
+/*
+ * Creates, modifies or delete a rewrite entry.
+ * If *index != ~0, modifies an existing entry (or simply
+ * deletes it if is_del is set).
+ * If *index == ~0, creates a new entry and the created
+ * entry index is stored in *index (Does nothing if is_del
+ * is set).
+ * returns 0 on success and something else on error.
+ */
+int l2_rw_mod_entry (u32 * index,
+		     u8 * mask, u8 * value, u32 len, u32 skip, u8 is_del);
+
+#endif /* L2_FW_H_ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_vtr.c b/src/vnet/l2/l2_vtr.c
new file mode 100644
index 00000000..95a4f157
--- /dev/null
+++ b/src/vnet/l2/l2_vtr.c
@@ -0,0 +1,770 @@
+/*
+ * l2_vtr.c : layer 2 vlan tag rewrite configuration
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/l2_output.h>
+#include <vnet/l2/feat_bitmap.h>
+#include <vnet/l2/l2_vtr.h>
+#include <vnet/l2/l2_input_vtr.h>
+#include <vnet/l2/l2_output.h>
+
+#include <vppinfra/error.h>
+#include <vlib/cli.h>
+
+/**
+ * @file
+ * @brief Ethernet VLAN Tag Rewrite.
+ *
+ * VLAN tag rewrite provides the ability to change the VLAN tags on a packet.
+ * Existing tags can be popped, new tags can be pushed, and existing tags can
+ * be swapped with new tags. The rewrite feature is attached to a subinterface
+ * as input and output operations. The input operation is explicitly configured.
+ * The output operation is the symmetric opposite and is automatically derived
+ * from the input operation.
+ */
+
+/** Just a placeholder; ensures file is not eliminated by linker. */
+clib_error_t *
+l2_vtr_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2_vtr_init);
+
+u32
+l2pbb_configure (vlib_main_t * vlib_main,
+		 vnet_main_t * vnet_main, u32 sw_if_index, u32 vtr_op,
+		 u8 * b_dmac, u8 * b_smac,
+		 u16 b_vlanid, u32 i_sid, u16 vlan_outer_tag)
+{
+  u32 error = 0;
+  u32 enable = 0;
+
+  l2_output_config_t *config = 0;
+  vnet_hw_interface_t *hi;
+  hi = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
+
+  if (!hi)
+    {
+      error = VNET_API_ERROR_INVALID_INTERFACE;
+      goto done;
+    }
+
+  // Config for this interface should be already initialized
+  ptr_config_t *in_config;
+  ptr_config_t *out_config;
+  config = vec_elt_at_index (l2output_main.configs, sw_if_index);
+  in_config = &(config->input_pbb_vtr);
+  out_config = &(config->output_pbb_vtr);
+
+  in_config->pop_bytes = 0;
+  in_config->push_bytes = 0;
+  out_config->pop_bytes = 0;
+  out_config->push_bytes = 0;
+  enable = (vtr_op != L2_VTR_DISABLED);
+
+  if (!enable)
+    goto done;
+
+  if (vtr_op == L2_VTR_POP_2)
+    {
+      in_config->pop_bytes = sizeof (ethernet_pbb_header_packed_t);
+    }
+  else if (vtr_op == L2_VTR_PUSH_2)
+    {
+      clib_memcpy (in_config->macs_tags.b_dst_address, b_dmac,
+		   sizeof (in_config->macs_tags.b_dst_address));
+      clib_memcpy (in_config->macs_tags.b_src_address, b_smac,
+		   sizeof (in_config->macs_tags.b_src_address));
+      in_config->macs_tags.b_type =
+	clib_net_to_host_u16 (ETHERNET_TYPE_DOT1AD);
+      in_config->macs_tags.priority_dei_id =
+	clib_net_to_host_u16 (b_vlanid & 0xFFF);
+      in_config->macs_tags.i_type =
+	clib_net_to_host_u16 (ETHERNET_TYPE_DOT1AH);
+      in_config->macs_tags.priority_dei_uca_res_sid =
+	clib_net_to_host_u32 (i_sid & 0xFFFFF);
+      in_config->push_bytes = sizeof (ethernet_pbb_header_packed_t);
+    }
+  else if (vtr_op == L2_VTR_TRANSLATE_2_2)
+    {
+      /* TODO after PoC */
+    }
+
+  /*
+   *  Construct the output tag-rewrite config
+   *
+   *  The push/pop values are always reversed
+   */
+  out_config->raw_data = in_config->raw_data;
+  out_config->pop_bytes = in_config->push_bytes;
+  out_config->push_bytes = in_config->pop_bytes;
+
+done:
+  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_VTR, enable);
+  if (config)
+    config->out_vtr_flag = (u8) enable;
+
+  /* output vtr enable is checked explicitly in l2_output */
+  return error;
+}
+
+/**
+ * Configure vtag tag rewrite on the given interface.
+ * Return 1 if there is an error, 0 if ok
+ */
+u32
+l2vtr_configure (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 sw_if_index, u32 vtr_op, u32 push_dot1q,	/* ethertype of first pushed tag is dot1q/dot1ad */
+		 u32 vtr_tag1,	/* first pushed tag */
+		 u32 vtr_tag2)	/* second pushed tag */
+{
+  vnet_hw_interface_t *hi;
+  vnet_sw_interface_t *si;
+  u32 hw_no_tags;
+  u32 error = 0;
+  l2_output_config_t *config;
+  vtr_config_t *in_config;
+  vtr_config_t *out_config;
+  u32 enable;
+  u32 push_inner_et;
+  u32 push_outer_et;
+  u32 cfg_tags;
+
+  hi = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
+  if (!hi || (hi->hw_class_index != ethernet_hw_interface_class.index))
+    {
+      error = VNET_API_ERROR_INVALID_INTERFACE;	/* non-ethernet interface */
+      goto done;
+    }
+
+  /* Init the config for this interface */
+  vec_validate (l2output_main.configs, sw_if_index);
+  config = vec_elt_at_index (l2output_main.configs, sw_if_index);
+  in_config = &(config->input_vtr);
+  out_config = &(config->output_vtr);
+  in_config->raw_tags = 0;
+  out_config->raw_tags = 0;
+
+  /* Get the configured tags for the interface */
+  si = vnet_get_sw_interface (vnet_main, sw_if_index);
+  hw_no_tags = (si->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
+
+  /* Construct the input tag-rewrite config */
+
+  push_outer_et =
+    clib_net_to_host_u16 (push_dot1q ? ETHERNET_TYPE_VLAN :
+			  ETHERNET_TYPE_DOT1AD);
+  push_inner_et = clib_net_to_host_u16 (ETHERNET_TYPE_VLAN);
+  vtr_tag1 = clib_net_to_host_u16 (vtr_tag1);
+  vtr_tag2 = clib_net_to_host_u16 (vtr_tag2);
+
+  /* Determine number of vlan tags with explictly configured values */
+  cfg_tags = 0;
+  if (hw_no_tags || si->sub.eth.flags.no_tags)
+    {
+      cfg_tags = 0;
+    }
+  else if (si->sub.eth.flags.one_tag)
+    {
+      cfg_tags = 1;
+      if (si->sub.eth.flags.outer_vlan_id_any)
+	{
+	  cfg_tags = 0;
+	}
+    }
+  else if (si->sub.eth.flags.two_tags)
+    {
+      cfg_tags = 2;
+      if (si->sub.eth.flags.inner_vlan_id_any)
+	{
+	  cfg_tags = 1;
+	}
+      if (si->sub.eth.flags.outer_vlan_id_any)
+	{
+	  cfg_tags = 0;
+	}
+    }
+
+  switch (vtr_op)
+    {
+    case L2_VTR_DISABLED:
+      in_config->push_and_pop_bytes = 0;
+      break;
+
+    case L2_VTR_POP_1:
+      if (cfg_tags < 1)
+	{
+	  /* Need one or two tags */
+	  error = VNET_API_ERROR_INVALID_VLAN_TAG_COUNT;
+	  goto done;
+	}
+      in_config->pop_bytes = 4;
+      in_config->push_bytes = 0;
+      break;
+
+    case L2_VTR_POP_2:
+      if (cfg_tags < 2)
+	{
+	  error = VNET_API_ERROR_INVALID_VLAN_TAG_COUNT;	/* Need two tags */
+	  goto done;
+	}
+      in_config->pop_bytes = 8;
+      in_config->push_bytes = 0;
+
+      out_config->push_bytes = in_config->pop_bytes;
+      out_config->pop_bytes = in_config->push_bytes;
+      break;
+
+    case L2_VTR_PUSH_1:
+      in_config->pop_bytes = 0;
+      in_config->push_bytes = 4;
+      in_config->tags[1].priority_cfi_and_id = vtr_tag1;
+      in_config->tags[1].type = push_outer_et;
+      break;
+
+    case L2_VTR_PUSH_2:
+      in_config->pop_bytes = 0;
+      in_config->push_bytes = 8;
+      in_config->tags[0].priority_cfi_and_id = vtr_tag1;
+      in_config->tags[0].type = push_outer_et;
+      in_config->tags[1].priority_cfi_and_id = vtr_tag2;
+      in_config->tags[1].type = push_inner_et;
+      break;
+
+    case L2_VTR_TRANSLATE_1_1:
+      if (cfg_tags < 1)
+	{
+	  error = VNET_API_ERROR_INVALID_VLAN_TAG_COUNT;	/* Need one or two tags */
+	  goto done;
+	}
+      in_config->pop_bytes = 4;
+      in_config->push_bytes = 4;
+      in_config->tags[1].priority_cfi_and_id = vtr_tag1;
+      in_config->tags[1].type = push_outer_et;
+      break;
+
+    case L2_VTR_TRANSLATE_1_2:
+      if (cfg_tags < 1)
+	{
+	  error = VNET_API_ERROR_INVALID_VLAN_TAG_COUNT;	/* Need one or two tags */
+	  goto done;
+	}
+      in_config->pop_bytes = 4;
+      in_config->push_bytes = 8;
+      in_config->tags[0].priority_cfi_and_id = vtr_tag1;
+      in_config->tags[0].type = push_outer_et;
+      in_config->tags[1].priority_cfi_and_id = vtr_tag2;
+      in_config->tags[1].type = push_inner_et;
+      break;
+
+    case L2_VTR_TRANSLATE_2_1:
+      if (cfg_tags < 2)
+	{
+	  error = VNET_API_ERROR_INVALID_VLAN_TAG_COUNT;	/* Need two tags */
+	  goto done;
+	}
+      in_config->pop_bytes = 8;
+      in_config->push_bytes = 4;
+      in_config->tags[1].priority_cfi_and_id = vtr_tag1;
+      in_config->tags[1].type = push_outer_et;
+      break;
+
+    case L2_VTR_TRANSLATE_2_2:
+      if (cfg_tags < 2)
+	{
+	  error = VNET_API_ERROR_INVALID_VLAN_TAG_COUNT;	/* Need two tags */
+	  goto done;
+	}
+      in_config->pop_bytes = 8;
+      in_config->push_bytes = 8;
+      in_config->tags[0].priority_cfi_and_id = vtr_tag1;
+      in_config->tags[0].type = push_outer_et;
+      in_config->tags[1].priority_cfi_and_id = vtr_tag2;
+      in_config->tags[1].type = push_inner_et;
+      break;
+    }
+
+  /*
+   *  Construct the output tag-rewrite config
+   *
+   *  The push/pop values are always reversed
+   */
+  out_config->push_bytes = in_config->pop_bytes;
+  out_config->pop_bytes = in_config->push_bytes;
+
+  /* Any pushed tags are derived from the subinterface config */
+  push_outer_et =
+    clib_net_to_host_u16 (si->sub.eth.flags.dot1ad ? ETHERNET_TYPE_DOT1AD :
+			  ETHERNET_TYPE_VLAN);
+  push_inner_et = clib_net_to_host_u16 (ETHERNET_TYPE_VLAN);
+  vtr_tag1 = clib_net_to_host_u16 (si->sub.eth.outer_vlan_id);
+  vtr_tag2 = clib_net_to_host_u16 (si->sub.eth.inner_vlan_id);
+
+  if (out_config->push_bytes == 4)
+    {
+      out_config->tags[1].priority_cfi_and_id = vtr_tag1;
+      out_config->tags[1].type = push_outer_et;
+    }
+  else if (out_config->push_bytes == 8)
+    {
+      out_config->tags[0].priority_cfi_and_id = vtr_tag1;
+      out_config->tags[0].type = push_outer_et;
+      out_config->tags[1].priority_cfi_and_id = vtr_tag2;
+      out_config->tags[1].type = push_inner_et;
+    }
+
+  /* set the interface enable flags */
+  enable = (vtr_op != L2_VTR_DISABLED);
+  config->out_vtr_flag = (u8) enable;
+  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_VTR, enable);
+  /* output vtr enable is checked explicitly in l2_output */
+
+done:
+  return error;
+}
+
+/**
+ * Get vtag tag rewrite on the given interface.
+ * Return 1 if there is an error, 0 if ok
+ */
+u32
+l2vtr_get (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 sw_if_index, u32 * vtr_op, u32 * push_dot1q,	/* ethertype of first pushed tag is dot1q/dot1ad */
+	   u32 * vtr_tag1,	/* first pushed tag */
+	   u32 * vtr_tag2)	/* second pushed tag */
+{
+  vnet_hw_interface_t *hi;
+  u32 error = 0;
+  vtr_config_t *in_config;
+
+  if (!vtr_op || !push_dot1q || !vtr_tag1 || !vtr_tag2)
+    {
+      clib_warning ("invalid arguments");
+      error = VNET_API_ERROR_INVALID_ARGUMENT;
+      goto done;
+    }
+
+  *vtr_op = L2_VTR_DISABLED;
+  *vtr_tag1 = 0;
+  *vtr_tag2 = 0;
+  *push_dot1q = 0;
+
+  hi = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
+  if (!hi || (hi->hw_class_index != ethernet_hw_interface_class.index))
+    {
+      /* non-ethernet interface */
+      goto done;
+    }
+
+  if (sw_if_index >= vec_len (l2output_main.configs))
+    {
+      /* no specific config (return disabled) */
+      goto done;
+    }
+
+  /* Get the config for this interface */
+  in_config =
+    &(vec_elt_at_index (l2output_main.configs, sw_if_index)->input_vtr);
+
+  /* DISABLED */
+  if (in_config->push_and_pop_bytes == 0)
+    {
+      goto done;
+    }
+
+  /* find out vtr_op */
+  switch (in_config->pop_bytes)
+    {
+    case 0:
+      switch (in_config->push_bytes)
+	{
+	case 0:
+	  /* DISABLED */
+	  goto done;
+	case 4:
+	  *vtr_op = L2_VTR_PUSH_1;
+	  *vtr_tag1 =
+	    clib_host_to_net_u16 (in_config->tags[1].priority_cfi_and_id);
+	  *push_dot1q =
+	    (ETHERNET_TYPE_VLAN ==
+	     clib_host_to_net_u16 (in_config->tags[1].type));
+	  break;
+	case 8:
+	  *vtr_op = L2_VTR_PUSH_2;
+	  *vtr_tag1 =
+	    clib_host_to_net_u16 (in_config->tags[0].priority_cfi_and_id);
+	  *vtr_tag2 =
+	    clib_host_to_net_u16 (in_config->tags[1].priority_cfi_and_id);
+	  *push_dot1q =
+	    (ETHERNET_TYPE_VLAN ==
+	     clib_host_to_net_u16 (in_config->tags[0].type));
+	  break;
+	default:
+	  clib_warning ("invalid push_bytes count: %d",
+			in_config->push_bytes);
+	  error = VNET_API_ERROR_UNEXPECTED_INTF_STATE;
+	  goto done;
+	}
+      break;
+
+    case 4:
+      switch (in_config->push_bytes)
+	{
+	case 0:
+	  *vtr_op = L2_VTR_POP_1;
+	  break;
+	case 4:
+	  *vtr_op = L2_VTR_TRANSLATE_1_1;
+	  *vtr_tag1 =
+	    clib_host_to_net_u16 (in_config->tags[1].priority_cfi_and_id);
+	  *push_dot1q =
+	    (ETHERNET_TYPE_VLAN ==
+	     clib_host_to_net_u16 (in_config->tags[1].type));
+	  break;
+	case 8:
+	  *vtr_op = L2_VTR_TRANSLATE_1_2;
+	  *vtr_tag1 =
+	    clib_host_to_net_u16 (in_config->tags[0].priority_cfi_and_id);
+	  *vtr_tag2 =
+	    clib_host_to_net_u16 (in_config->tags[1].priority_cfi_and_id);
+	  *push_dot1q =
+	    (ETHERNET_TYPE_VLAN ==
+	     clib_host_to_net_u16 (in_config->tags[0].type));
+	  break;
+	default:
+	  clib_warning ("invalid push_bytes count: %d",
+			in_config->push_bytes);
+	  error = VNET_API_ERROR_UNEXPECTED_INTF_STATE;
+	  goto done;
+	}
+      break;
+
+    case 8:
+      switch (in_config->push_bytes)
+	{
+	case 0:
+	  *vtr_op = L2_VTR_POP_2;
+	  break;
+	case 4:
+	  *vtr_op = L2_VTR_TRANSLATE_2_1;
+	  *vtr_tag1 =
+	    clib_host_to_net_u16 (in_config->tags[1].priority_cfi_and_id);
+	  *push_dot1q =
+	    (ETHERNET_TYPE_VLAN ==
+	     clib_host_to_net_u16 (in_config->tags[1].type));
+	  break;
+	case 8:
+	  *vtr_op = L2_VTR_TRANSLATE_2_2;
+	  *vtr_tag1 =
+	    clib_host_to_net_u16 (in_config->tags[0].priority_cfi_and_id);
+	  *vtr_tag2 =
+	    clib_host_to_net_u16 (in_config->tags[1].priority_cfi_and_id);
+	  *push_dot1q =
+	    (ETHERNET_TYPE_VLAN ==
+	     clib_host_to_net_u16 (in_config->tags[0].type));
+	  break;
+	default:
+	  clib_warning ("invalid push_bytes count: %d",
+			in_config->push_bytes);
+	  error = VNET_API_ERROR_UNEXPECTED_INTF_STATE;
+	  goto done;
+	}
+      break;
+
+    default:
+      clib_warning ("invalid pop_bytes count: %d", in_config->pop_bytes);
+      error = VNET_API_ERROR_UNEXPECTED_INTF_STATE;
+      goto done;
+    }
+
+done:
+  return error;
+}
+
+/**
+ * Set subinterface vtr enable/disable.
+ * The CLI format is:
+ *    set interface l2 tag-rewrite <interface> [disable | pop 1 | pop 2 | push {dot1q|dot1ad} <tag> [<tag>]]
+ *
+ *  "push" can also be replaced by "translate-{1|2}-{1|2}"
+ */
+static clib_error_t *
+int_l2_vtr (vlib_main_t * vm,
+	    unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index;
+  u32 vtr_op;
+  u32 push_dot1q = 0;
+  u32 tag1 = 0, tag2 = 0;
+
+  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  vtr_op = L2_VTR_DISABLED;
+
+  if (unformat (input, "disable"))
+    {
+      vtr_op = L2_VTR_DISABLED;
+    }
+  else if (unformat (input, "pop 1"))
+    {
+      vtr_op = L2_VTR_POP_1;
+    }
+  else if (unformat (input, "pop 2"))
+    {
+      vtr_op = L2_VTR_POP_2;
+
+    }
+  else if (unformat (input, "push dot1q %d %d", &tag1, &tag2))
+    {
+      vtr_op = L2_VTR_PUSH_2;
+      push_dot1q = 1;
+    }
+  else if (unformat (input, "push dot1ad %d %d", &tag1, &tag2))
+    {
+      vtr_op = L2_VTR_PUSH_2;
+
+    }
+  else if (unformat (input, "push dot1q %d", &tag1))
+    {
+      vtr_op = L2_VTR_PUSH_1;
+      push_dot1q = 1;
+    }
+  else if (unformat (input, "push dot1ad %d", &tag1))
+    {
+      vtr_op = L2_VTR_PUSH_1;
+
+    }
+  else if (unformat (input, "translate 1-1 dot1q %d", &tag1))
+    {
+      vtr_op = L2_VTR_TRANSLATE_1_1;
+      push_dot1q = 1;
+    }
+  else if (unformat (input, "translate 1-1 dot1ad %d", &tag1))
+    {
+      vtr_op = L2_VTR_TRANSLATE_1_1;
+
+    }
+  else if (unformat (input, "translate 2-1 dot1q %d", &tag1))
+    {
+      vtr_op = L2_VTR_TRANSLATE_2_1;
+      push_dot1q = 1;
+    }
+  else if (unformat (input, "translate 2-1 dot1ad %d", &tag1))
+    {
+      vtr_op = L2_VTR_TRANSLATE_2_1;
+
+    }
+  else if (unformat (input, "translate 2-2 dot1q %d %d", &tag1, &tag2))
+    {
+      vtr_op = L2_VTR_TRANSLATE_2_2;
+      push_dot1q = 1;
+    }
+  else if (unformat (input, "translate 2-2 dot1ad %d %d", &tag1, &tag2))
+    {
+      vtr_op = L2_VTR_TRANSLATE_2_2;
+
+    }
+  else if (unformat (input, "translate 1-2 dot1q %d %d", &tag1, &tag2))
+    {
+      vtr_op = L2_VTR_TRANSLATE_1_2;
+      push_dot1q = 1;
+    }
+  else if (unformat (input, "translate 1-2 dot1ad %d %d", &tag1, &tag2))
+    {
+      vtr_op = L2_VTR_TRANSLATE_1_2;
+
+    }
+  else
+    {
+      error =
+	clib_error_return (0,
+			   "expecting [disable | pop 1 | pop 2 | push {dot1q|dot1ah} <tag> [<tag>]\n"
+			   " | translate {1|2}-{1|2} {dot1q|dot1ah} <tag> [<tag>]] but got `%U'",
+			   format_unformat_error, input);
+      goto done;
+    }
+
+  if (l2vtr_configure (vm, vnm, sw_if_index, vtr_op, push_dot1q, tag1, tag2))
+    {
+      error =
+	clib_error_return (0,
+			   "vlan tag rewrite is not compatible with interface");
+      goto done;
+    }
+
+done:
+  return error;
+}
+
+/*?
+ * VLAN tag rewrite provides the ability to change the VLAN tags on a packet.
+ * Existing tags can be popped, new tags can be pushed, and existing tags can
+ * be swapped with new tags. The rewrite feature is attached to a subinterface
+ * as input and output operations. The input operation is explicitly configured.
+ * The output operation is the symmetric opposite and is automatically derived
+ * from the input operation.
+ *
+ * <b>POP:</b> For pop operations, the subinterface encapsulation (the vlan
+ * tags specified when it was created) must have at least the number of popped
+ * tags. e.g. the \"pop 2\" operation would be rejected on a single-vlan interface.
+ * The output tag-rewrite operation for pops is to push the specified number of
+ * vlan tags onto the packet. The pushed tag values are the ones in the
+ * subinterface encapsulation.
+ *
+ * <b>PUSH:</b> For push operations, the ethertype is also specified. The
+ * output tag-rewrite operation for pushes is to pop the same number of tags
+ * off the packet. If the packet doesn't have enough tags it is dropped.
+ *
+ *
+ * @cliexpar
+ * @parblock
+ * By default a subinterface has no tag-rewrite. To return a subinterface to
+ * this state use:
+ * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 disable}
+ *
+ * To pop vlan tags off packets received from a subinterface, use:
+ * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 pop 1}
+ * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 pop 2}
+ *
+ * To push one or two vlan tags onto packets received from an interface, use:
+ * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 push dot1q 100}
+ * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 push dot1ad 100 150}
+ *
+ * Tags can also be translated, which is basically a combination of a pop and push.
+ * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 translate 1-1 dot1ad 100}
+ * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 translate 2-2 dot1ad 100 150}
+ * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 translate 1-2 dot1q 100}
+ * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 translate 2-1 dot1q 100 150}
+ *
+ * To display the VLAN Tag settings, show the associate bridge-domain:
+ * @cliexstart{show bridge-domain 200 detail}
+ *  ID   Index   Learning   U-Forwrd   UU-Flood   Flooding   ARP-Term     BVI-Intf
+ * 200     1        on         on         on         on         off          N/A
+ *
+ *          Interface           Index  SHG  BVI        VLAN-Tag-Rewrite
+ *  GigabitEthernet0/8/0.200      5     0    -       trans-1-1 dot1ad 100
+ *  GigabitEthernet0/9/0.200      4     0    -               none
+ *  GigabitEthernet0/a/0.200      6     0    -               none
+ * @cliexend
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (int_l2_vtr_cli, static) = {
+  .path = "set interface l2 tag-rewrite",
+  .short_help = "set interface l2 tag-rewrite <interface> [disable | pop {1|2} | push {dot1q|dot1ad} <tag> <tag>]",
+  .function = int_l2_vtr,
+};
+/* *INDENT-ON* */
+
+/**
+ * Set subinterface pbb vtr enable/disable.
+ * The CLI format is:
+ *    set interface l2 pbb-tag-rewrite <interface> [disable | pop | push | translate_pbb_stag <outer_tag> dmac <address> smac <address> s_id <nn> [b_vlanid <nn>]]
+ */
+static clib_error_t *
+int_l2_pbb_vtr (vlib_main_t * vm,
+		unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error = 0;
+  u32 sw_if_index, tmp;
+  u32 vtr_op = L2_VTR_DISABLED;
+  u32 outer_tag = 0;
+  u8 dmac[6];
+  u8 smac[6];
+  u8 dmac_set = 0, smac_set = 0;
+  u16 b_vlanid = 0;
+  u32 s_id = ~0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat_user
+	  (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+	;
+      else if (unformat (input, "disable"))
+	vtr_op = L2_VTR_DISABLED;
+      else if (vtr_op == L2_VTR_DISABLED && unformat (input, "pop"))
+	vtr_op = L2_VTR_POP_2;
+      else if (vtr_op == L2_VTR_DISABLED && unformat (input, "push"))
+	vtr_op = L2_VTR_PUSH_2;
+      else if (vtr_op == L2_VTR_DISABLED
+	       && unformat (input, "translate_pbb_stag %d", &outer_tag))
+	vtr_op = L2_VTR_TRANSLATE_2_1;
+      else if (unformat (input, "dmac %U", unformat_ethernet_address, dmac))
+	dmac_set = 1;
+      else if (unformat (input, "smac %U", unformat_ethernet_address, smac))
+	smac_set = 1;
+      else if (unformat (input, "b_vlanid %d", &tmp))
+	b_vlanid = tmp;
+      else if (unformat (input, "s_id %d", &s_id))
+	;
+      else
+	{
+	  error = clib_error_return (0,
+				     "expecting [disable | pop | push | translate_pbb_stag <outer_tag>\n"
+				     "dmac <address> smac <address> s_id <nn> [b_vlanid <nn>]]");
+	  goto done;
+	}
+    }
+
+  if ((vtr_op == L2_VTR_PUSH_2 || vtr_op == L2_VTR_TRANSLATE_2_1)
+      && (!dmac_set || !smac_set || s_id == ~0))
+    {
+      error = clib_error_return (0,
+				 "expecting dmac <address> smac <address> s_id <nn> [b_vlanid <nn>]");
+      goto done;
+    }
+
+  if (l2pbb_configure
+      (vm, vnm, sw_if_index, vtr_op, dmac, smac, b_vlanid, s_id, outer_tag))
+    {
+      error =
+	clib_error_return (0,
+			   "pbb tag rewrite is not compatible with interface");
+      goto done;
+    }
+
+done:
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (int_l2_pbb_vtr_cli, static) = {
+  .path = "set interface l2 pbb-tag-rewrite",
+  .short_help = "set interface l2 pbb-tag-rewrite <interface> [disable | pop | push | translate_pbb_stag <outer_tag> dmac <address> smac <address> s_id <nn> [b_vlanid <nn>]]",
+  .function = int_l2_pbb_vtr,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_vtr.h b/src/vnet/l2/l2_vtr.h
new file mode 100644
index 00000000..893b2272
--- /dev/null
+++ b/src/vnet/l2/l2_vtr.h
@@ -0,0 +1,270 @@
+/*
+ * l2_vtr.h : layer 2 vlan tag rewrite processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_vnet_l2_vtr_h
+#define included_vnet_l2_vtr_h
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/ethernet/packet.h>
+#include <vnet/l2/l2_vtr.h>
+
+/* VTR config options for API and CLI support */
+typedef enum
+{
+  L2_VTR_DISABLED,
+  L2_VTR_PUSH_1,
+  L2_VTR_PUSH_2,
+  L2_VTR_POP_1,
+  L2_VTR_POP_2,
+  L2_VTR_TRANSLATE_1_1,
+  L2_VTR_TRANSLATE_1_2,
+  L2_VTR_TRANSLATE_2_1,
+  L2_VTR_TRANSLATE_2_2
+} l2_vtr_op_t;
+
+/**
+ * Per-interface vlan tag rewrite configuration
+ * There will be one instance of this struct for each sw_if_index
+ * for both input vtr and output vtr
+ */
+typedef struct
+{
+  union
+  {
+    /*
+     * Up to two vlan tags to push.
+     * if there is only one vlan tag to push, it is in tags[1].
+     */
+    ethernet_vlan_header_tv_t tags[2];
+    u64 raw_tags;
+  };
+
+  union
+  {
+    struct
+    {
+      u8 push_bytes;		/* number of bytes to push for up to 2 vlans (0,4,8) */
+      u8 pop_bytes;		/* number of bytes to pop for up to 2 vlans (0,4,8) */
+    };
+    u16 push_and_pop_bytes;	/* if 0 then the feature is disabled */
+  };
+} vtr_config_t;
+
+
+/**
+ * Perform the configured tag rewrite on the packet.
+ * Return 0 if ok, 1 if packet should be dropped (e.g. tried to pop
+ * too many tags)
+ */
+always_inline u32
+l2_vtr_process (vlib_buffer_t * b0, vtr_config_t * config)
+{
+  u64 temp_8;
+  u32 temp_4;
+  u8 *eth;
+
+  eth = vlib_buffer_get_current (b0);
+
+  /* copy the 12B dmac and smac to a temporary location */
+  temp_8 = *((u64 *) eth);
+  temp_4 = *((u32 *) (eth + 8));
+
+  /* adjust for popped tags */
+  eth += config->pop_bytes;
+
+  /* if not enough tags to pop then drop packet */
+  if (PREDICT_FALSE ((vnet_buffer (b0)->l2.l2_len - 12) < config->pop_bytes))
+    {
+      return 1;
+    }
+
+  /* copy the 2 new tags to the start of the packet  */
+  *((u64 *) (eth + 12 - 8)) = config->raw_tags;
+
+  /* TODO: set cos bits */
+
+  /* adjust for pushed tags: */
+  eth -= config->push_bytes;
+
+  /* copy the 12 dmac and smac back to the packet */
+  *((u64 *) eth) = temp_8;
+  *((u32 *) (eth + 8)) = temp_4;
+
+  /* Update l2_len */
+  vnet_buffer (b0)->l2.l2_len +=
+    (word) config->push_bytes - (word) config->pop_bytes;
+
+  /* Update vlan tag count */
+  ethernet_buffer_adjust_vlan_count_by_bytes (b0,
+					      (word) config->push_bytes -
+					      (word) config->pop_bytes);
+
+  /* Update packet len */
+  vlib_buffer_advance (b0,
+		       (word) config->pop_bytes - (word) config->push_bytes);
+
+  return 0;
+}
+
+
+/*
+ *  Perform the egress pre-vlan tag rewrite EFP Filter check.
+ * The post-vlan tag rewrite check is a separate graph node.
+ *
+ *  This check insures that a packet being output to an interface
+ * (before output vtr is performed) has vlan tags that match those
+ * on a packet received from that interface (after vtr has been performed).
+ * This means verifying that any tags pushed by input vtr are present
+ * on the packet.
+ *
+ *  Return 0 if ok, 1 if packet should be dropped.
+ * This function should be passed the input vtr config for the interface.
+ */
+always_inline u8
+l2_efp_filter_process (vlib_buffer_t * b0, vtr_config_t * in_config)
+{
+  u8 *eth;
+  u64 packet_tags;
+  u64 tag_mask;
+
+  eth = vlib_buffer_get_current (b0);
+
+  /*
+   * If there are 2 tags pushed, they must match config->tags[0] and
+   * config->tags[1].
+   * If there is one tag pushed, it must match config->tag[1].
+   * If there are 0 tags pushed, the check passes.
+   */
+
+  /* mask for two vlan id and ethertypes, no cos bits */
+  tag_mask = clib_net_to_host_u64 (0xFFFF0FFFFFFF0FFF);
+  /* mask for one vlan id and ethertype, no cos bits */
+  tag_mask =
+    (in_config->push_bytes ==
+     4) ? clib_net_to_host_u64 (0xFFFF0FFF) : tag_mask;
+  /* mask for always match */
+  tag_mask = (in_config->push_bytes == 0) ? 0 : tag_mask;
+
+  /*
+   * Read 8B from the packet, getting the proper set of vlan tags
+   * For 0 push bytes, the address doesn't matter since the mask
+   * clears the data to 0.
+   */
+  packet_tags = *((u64 *) (eth + 4 + in_config->push_bytes));
+
+  /* Check if the packet tags match the configured tags */
+  return (packet_tags & tag_mask) != in_config->raw_tags;
+}
+
+typedef struct
+{
+  union
+  {
+    ethernet_pbb_header_t macs_tags;
+    struct
+    {
+      u64 data1;
+      u64 data2;
+      u16 data3;
+      u32 data4;
+    } raw_data;
+  };
+  union
+  {
+    struct
+    {
+      u8 push_bytes;		/* number of bytes to push pbb tags */
+      u8 pop_bytes;		/* number of bytes to pop pbb tags */
+    };
+    u16 push_and_pop_bytes;	/* if 0 then the feature is disabled */
+  };
+} ptr_config_t;
+
+always_inline u32
+l2_pbb_process (vlib_buffer_t * b0, ptr_config_t * config)
+{
+  u8 *eth = vlib_buffer_get_current (b0);
+
+  if (config->pop_bytes > 0)
+    {
+      ethernet_pbb_header_packed_t *ph = (ethernet_pbb_header_packed_t *) eth;
+
+      // drop packet without PBB header or with wrong I-tag or B-tag
+      if (clib_net_to_host_u16 (ph->priority_dei_id) !=
+	  clib_net_to_host_u16 (config->macs_tags.priority_dei_id)
+	  || clib_net_to_host_u32 (ph->priority_dei_uca_res_sid) !=
+	  clib_net_to_host_u32 (config->macs_tags.priority_dei_uca_res_sid))
+	return 1;
+
+      eth += config->pop_bytes;
+    }
+
+  if (config->push_bytes > 0)
+    {
+      eth -= config->push_bytes;
+      // copy the B-DA (6B), B-SA (6B), B-TAG (4B), I-TAG (6B)
+      *((u64 *) eth) = config->raw_data.data1;
+      *((u64 *) (eth + 8)) = config->raw_data.data2;
+      *((u16 *) (eth + 16)) = config->raw_data.data3;
+      *((u32 *) (eth + 18)) = config->raw_data.data4;
+    }
+
+  /* Update l2_len */
+  vnet_buffer (b0)->l2.l2_len +=
+    (word) config->push_bytes - (word) config->pop_bytes;
+  /* Update packet len */
+  vlib_buffer_advance (b0,
+		       (word) config->pop_bytes - (word) config->push_bytes);
+
+  return 0;
+}
+
+u32 l2pbb_configure (vlib_main_t * vlib_main,
+		     vnet_main_t * vnet_main, u32 sw_if_index, u32 vtr_op,
+		     u8 * b_dmac, u8 * b_smac,
+		     u16 b_vlanid, u32 i_sid, u16 vlan_outer_tag);
+
+/**
+ * Configure vtag tag rewrite on the given interface.
+ * Return 1 if there is an error, 0 if ok
+ */
+u32 l2vtr_configure (vlib_main_t * vlib_main,
+		     vnet_main_t * vnet_main,
+		     u32 sw_if_index,
+		     u32 vtr_op, u32 push_dot1q, u32 vtr_tag1, u32 vtr_tag2);
+
+/**
+ * Get vtag tag rewrite on the given interface.
+ * Return 1 if there is an error, 0 if ok
+ */
+u32 l2vtr_get (vlib_main_t * vlib_main,
+	       vnet_main_t * vnet_main,
+	       u32 sw_if_index,
+	       u32 * vtr_op,
+	       u32 * push_dot1q, u32 * vtr_tag1, u32 * vtr_tag2);
+
+#endif /* included_vnet_l2_vtr_h */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_xcrw.c b/src/vnet/l2/l2_xcrw.c
new file mode 100644
index 00000000..70610a85
--- /dev/null
+++ b/src/vnet/l2/l2_xcrw.c
@@ -0,0 +1,591 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/l2/l2_xcrw.h>
+
+/**
+ * @file
+ * General L2 / L3 cross-connect, used to set up
+ * "L2 interface <--> your-favorite-tunnel-encap" tunnels.
+ *
+ * We set up a typical L2 cross-connect or (future) bridge
+ * to hook L2 interface(s) up to the L3 stack in arbitrary ways.
+ *
+ * Each l2_xcrw adjacency specifies 3 things:
+ *
+ * 1. The next graph node (presumably in the L3 stack) to
+ *    process the (L2 -> L3) packet
+ *
+ * 2. A new value for vnet_buffer(b)->sw_if_index[VLIB_TX]
+ *    (i.e. a lookup FIB index),
+ *
+ * 3. A rewrite string to apply.
+ *
+ * Example: to cross-connect an L2 interface or (future) bridge
+ * to an mpls-o-gre tunnel, set up the L2 rewrite string as shown in
+ * mpls_gre_rewrite, and use "mpls-post-rewrite" to fix the
+ * GRE IP header checksum and length fields.
+ */
+
+typedef struct
+{
+  u32 next_index;
+  u32 tx_fib_index;
+} l2_xcrw_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_l2_xcrw_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2_xcrw_trace_t *t = va_arg (*args, l2_xcrw_trace_t *);
+
+  s = format (s, "L2_XCRW: next index %d tx_fib_index %d",
+	      t->next_index, t->tx_fib_index);
+  return s;
+}
+
+l2_xcrw_main_t l2_xcrw_main;
+
+static vlib_node_registration_t l2_xcrw_node;
+
+static char *l2_xcrw_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2_xcrw_error
+#undef _
+};
+
+static uword
+l2_xcrw_node_fn (vlib_main_t * vm,
+		 vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  l2_xcrw_next_t next_index;
+  l2_xcrw_main_t *xcm = &l2_xcrw_main;
+  vlib_node_t *n = vlib_get_node (vm, l2_xcrw_node.index);
+  u32 node_counter_base_index = n->error_heap_index;
+  vlib_error_main_t *em = &vm->error_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+	  u32 sw_if_index0, sw_if_index1;
+	  l2_xcrw_adjacency_t *adj0, *adj1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+
+	  adj0 = vec_elt_at_index (xcm->adj_by_sw_if_index, sw_if_index0);
+	  adj1 = vec_elt_at_index (xcm->adj_by_sw_if_index, sw_if_index1);
+
+	  next0 = adj0->rewrite_header.next_index;
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] =
+	    adj0->rewrite_header.sw_if_index;
+
+	  next1 = adj1->rewrite_header.next_index;
+	  vnet_buffer (b1)->sw_if_index[VLIB_TX] =
+	    adj1->rewrite_header.sw_if_index;
+
+	  em->counters[node_counter_base_index + next1]++;
+
+	  if (PREDICT_TRUE (next0 > 0))
+	    {
+	      u8 *h0 = vlib_buffer_get_current (b0);
+	      vnet_rewrite_one_header (adj0[0], h0,
+				       adj0->rewrite_header.data_bytes);
+	      vlib_buffer_advance (b0, -adj0->rewrite_header.data_bytes);
+	      em->counters[node_counter_base_index + L2_XCRW_ERROR_FWD]++;
+	    }
+
+	  if (PREDICT_TRUE (next1 > 0))
+	    {
+	      u8 *h1 = vlib_buffer_get_current (b1);
+	      vnet_rewrite_one_header (adj1[0], h1,
+				       adj1->rewrite_header.data_bytes);
+	      vlib_buffer_advance (b1, -adj1->rewrite_header.data_bytes);
+	      em->counters[node_counter_base_index + L2_XCRW_ERROR_FWD]++;
+	    }
+
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+				 && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+		{
+		  l2_xcrw_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->next_index = next0;
+		  t->tx_fib_index = adj0->rewrite_header.sw_if_index;
+		}
+	      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+				 && (b1->flags & VLIB_BUFFER_IS_TRACED)))
+		{
+		  l2_xcrw_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->next_index = next1;
+		  t->tx_fib_index = adj1->rewrite_header.sw_if_index;
+		}
+	    }
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 sw_if_index0;
+	  l2_xcrw_adjacency_t *adj0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+	  adj0 = vec_elt_at_index (xcm->adj_by_sw_if_index, sw_if_index0);
+
+	  next0 = adj0->rewrite_header.next_index;
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] =
+	    adj0->rewrite_header.sw_if_index;
+
+	  if (PREDICT_TRUE (next0 > 0))
+	    {
+	      u8 *h0 = vlib_buffer_get_current (b0);
+	      vnet_rewrite_one_header (adj0[0], h0,
+				       adj0->rewrite_header.data_bytes);
+	      vlib_buffer_advance (b0, -adj0->rewrite_header.data_bytes);
+	      em->counters[node_counter_base_index + L2_XCRW_ERROR_FWD]++;
+	    }
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      l2_xcrw_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->next_index = next0;
+	      t->tx_fib_index = adj0->rewrite_header.sw_if_index;
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2_xcrw_node, static) = {
+  .function = l2_xcrw_node_fn,
+  .name = "l2-xcrw",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2_xcrw_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2_xcrw_error_strings),
+  .error_strings = l2_xcrw_error_strings,
+
+  .n_next_nodes = L2_XCRW_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+        [L2_XCRW_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2_xcrw_node, l2_xcrw_node_fn)
+     clib_error_t *l2_xcrw_init (vlib_main_t * vm)
+{
+  l2_xcrw_main_t *mp = &l2_xcrw_main;
+
+  mp->vlib_main = vm;
+  mp->vnet_main = &vnet_main;
+  mp->tunnel_index_by_l2_sw_if_index = hash_create (0, sizeof (uword));
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2_xcrw_init);
+
+static uword
+dummy_interface_tx (vlib_main_t * vm,
+		    vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  clib_warning ("you shouldn't be here, leaking buffers...");
+  return frame->n_vectors;
+}
+
+static u8 *
+format_xcrw_name (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  return format (s, "xcrw%d", dev_instance);
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (xcrw_device_class,static) = {
+  .name = "Xcrw",
+  .format_device_name = format_xcrw_name,
+  .tx_function = dummy_interface_tx,
+};
+/* *INDENT-ON* */
+
+/* Create a sham tunnel interface and return its sw_if_index */
+static u32
+create_xcrw_interface (vlib_main_t * vm)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  static u32 instance;
+  u8 address[6];
+  u32 hw_if_index;
+  vnet_hw_interface_t *hi;
+  u32 sw_if_index;
+
+  /* mac address doesn't really matter */
+  memset (address, 0, sizeof (address));
+  address[2] = 0x12;
+
+  /* can returns error iff phy != 0 */
+  (void) ethernet_register_interface
+    (vnm, xcrw_device_class.index, instance++, address, &hw_if_index,
+     /* flag change */ 0);
+
+  hi = vnet_get_hw_interface (vnm, hw_if_index);
+  sw_if_index = hi->sw_if_index;
+  vnet_sw_interface_set_flags (vnm, sw_if_index,
+			       VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+
+  /* Output to the sham tunnel invokes the encap node */
+  hi->output_node_index = l2_xcrw_node.index;
+
+  return sw_if_index;
+}
+
+int
+vnet_configure_l2_xcrw (vlib_main_t * vm, vnet_main_t * vnm,
+			u32 l2_sw_if_index, u32 tx_fib_index,
+			u8 * rewrite, u32 next_node_index, int is_add)
+{
+  l2_xcrw_main_t *xcm = &l2_xcrw_main;
+  l2_xcrw_adjacency_t *a;
+  l2_xcrw_tunnel_t *t;
+  uword *p;
+
+  if (is_add)
+    {
+
+      pool_get (xcm->tunnels, t);
+
+      /* No interface allocated? Do it. Otherwise, set admin up */
+      if (t->tunnel_sw_if_index == 0)
+	t->tunnel_sw_if_index = create_xcrw_interface (vm);
+      else
+	vnet_sw_interface_set_flags (vnm, t->tunnel_sw_if_index,
+				     VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+
+      t->l2_sw_if_index = l2_sw_if_index;
+
+      vec_validate (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
+
+      a = vec_elt_at_index (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
+      memset (a, 0, sizeof (*a));
+
+      a->rewrite_header.sw_if_index = tx_fib_index;
+
+      /*
+       * Add or find a dynamic disposition for the successor node,
+       * e.g. so we can ship pkts to mpls_post_rewrite...
+       */
+      a->rewrite_header.next_index =
+	vlib_node_add_next (vm, l2_xcrw_node.index, next_node_index);
+
+      if (vec_len (rewrite))
+	vnet_rewrite_set_data (a[0], rewrite, vec_len (rewrite));
+
+      set_int_l2_mode (vm, vnm, MODE_L2_XC, t->l2_sw_if_index, 0, 0, 0,
+		       t->tunnel_sw_if_index);
+      hash_set (xcm->tunnel_index_by_l2_sw_if_index,
+		t->l2_sw_if_index, t - xcm->tunnels);
+      return 0;
+    }
+  else
+    {
+      p = hash_get (xcm->tunnel_index_by_l2_sw_if_index, l2_sw_if_index);
+      if (p == 0)
+	return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+      t = pool_elt_at_index (xcm->tunnels, p[0]);
+
+      a = vec_elt_at_index (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
+      /* Reset adj to drop traffic */
+      memset (a, 0, sizeof (*a));
+
+      set_int_l2_mode (vm, vnm, MODE_L3, t->l2_sw_if_index, 0, 0, 0, 0);
+
+      vnet_sw_interface_set_flags (vnm, t->tunnel_sw_if_index, 0 /* down */ );
+
+      hash_unset (xcm->tunnel_index_by_l2_sw_if_index, l2_sw_if_index);
+      pool_put (xcm->tunnels, t);
+    }
+  return 0;
+}
+
+
+static clib_error_t *
+set_l2_xcrw_command_fn (vlib_main_t * vm,
+			unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  int is_add = 1;
+  int is_ipv6 = 0;		/* for fib id -> fib index mapping */
+  u32 tx_fib_id = ~0;
+  u32 tx_fib_index = ~0;
+  u32 next_node_index = ~0;
+  u32 l2_sw_if_index;
+  u8 *rw = 0;
+  vnet_main_t *vnm = vnet_get_main ();
+  int rv;
+
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  if (!unformat (line_input, "%U",
+		 unformat_vnet_sw_interface, vnm, &l2_sw_if_index))
+    return clib_error_return (0, "unknown input '%U'",
+			      format_unformat_error, line_input);
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "next %U",
+		    unformat_vlib_node, vm, &next_node_index))
+	;
+      else if (unformat (line_input, "tx-fib-id %d", &tx_fib_id))
+	;
+      else if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "ipv6"))
+	is_ipv6 = 1;
+      else if (unformat (line_input, "rw %U", unformat_hex_string, &rw));
+      else
+	break;
+    }
+
+  if (next_node_index == ~0)
+    return clib_error_return (0, "next node not specified");
+
+  if (tx_fib_id != ~0)
+    {
+      uword *p;
+
+      if (is_ipv6)
+	p = hash_get (ip6_main.fib_index_by_table_id, tx_fib_id);
+      else
+	p = hash_get (ip4_main.fib_index_by_table_id, tx_fib_id);
+
+      if (p == 0)
+	return clib_error_return (0, "nonexistent tx_fib_id %d", tx_fib_id);
+
+      tx_fib_index = p[0];
+    }
+
+  rv = vnet_configure_l2_xcrw (vm, vnm, l2_sw_if_index, tx_fib_index,
+			       rw, next_node_index, is_add);
+
+  switch (rv)
+    {
+
+    case 0:
+      break;
+
+    case VNET_API_ERROR_INVALID_SW_IF_INDEX:
+      return clib_error_return (0, "%U not cross-connected",
+				format_vnet_sw_if_index_name,
+				vnm, l2_sw_if_index);
+    default:
+      return clib_error_return (0, "vnet_configure_l2_xcrw returned %d", rv);
+    }
+
+  vec_free (rw);
+
+  return 0;
+}
+
+/*?
+ * Add or delete a Layer 2 to Layer 3 rewrite cross-connect. This is
+ * used to hook Layer 2 interface(s) up to the Layer 3 stack in
+ * arbitrary ways. For example, cross-connect an L2 interface or
+ * (future) bridge to an mpls-o-gre tunnel. Set up the L2 rewrite
+ * string as shown in mpls_gre_rewrite, and use \"mpls-post-rewrite\"
+ * to fix the GRE IP header checksum and length fields.
+ *
+ * @cliexpar
+ * @todo This is incomplete. This needs a detailed description and a
+ * practical example.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_l2_xcrw_command, static) = {
+  .path = "set interface l2 xcrw",
+  .short_help =
+  "set interface l2 xcrw <interface> next <node-name>\n"
+  "    [del] [tx-fib-id <id>] [ipv6] rw <hex-bytes>",
+  .function = set_l2_xcrw_command_fn,
+};
+/* *INDENT-ON* */
+
+static u8 *
+format_l2xcrw (u8 * s, va_list * args)
+{
+  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
+  l2_xcrw_tunnel_t *t = va_arg (*args, l2_xcrw_tunnel_t *);
+  l2_xcrw_main_t *xcm = &l2_xcrw_main;
+  vlib_main_t *vm = vlib_get_main ();
+  l2_xcrw_adjacency_t *a;
+  u8 *rewrite_string;
+
+  if (t == 0)
+    {
+      s = format (s, "%-25s%s", "L2 interface", "Tunnel Details");
+      return s;
+    }
+
+  s = format (s, "%-25U %U ",
+	      format_vnet_sw_if_index_name, vnm, t->l2_sw_if_index,
+	      format_vnet_sw_if_index_name, vnm, t->tunnel_sw_if_index);
+
+  a = vec_elt_at_index (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
+
+  s = format (s, "next %U ",
+	      format_vlib_next_node_name, vm, l2_xcrw_node.index,
+	      a->rewrite_header.next_index);
+
+  if (a->rewrite_header.sw_if_index != ~0)
+    s = format (s, "tx fib index %d ", a->rewrite_header.sw_if_index);
+
+  if (a->rewrite_header.data_bytes)
+    {
+      rewrite_string = (u8 *) (a + 1);
+      rewrite_string -= a->rewrite_header.data_bytes;
+      s = format (s, "rewrite data: %U ",
+		  format_hex_bytes, rewrite_string,
+		  a->rewrite_header.data_bytes);
+    }
+
+  s = format (s, "\n");
+
+  return s;
+}
+
+
+static clib_error_t *
+show_l2xcrw_command_fn (vlib_main_t * vm,
+			unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  l2_xcrw_main_t *xcm = &l2_xcrw_main;
+  l2_xcrw_tunnel_t *t;
+
+  if (pool_elts (xcm->tunnels) == 0)
+    {
+      vlib_cli_output (vm, "No L2 / L3 rewrite cross-connects configured");
+      return 0;
+    }
+
+  vlib_cli_output (vm, "%U", format_l2xcrw, 0, 0);
+
+  /* *INDENT-OFF* */
+  pool_foreach (t, xcm->tunnels,
+  ({
+    vlib_cli_output (vm, "%U", format_l2xcrw, vnm, t);
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+/*?
+ * Display a Layer 2 to Layer 3 rewrite cross-connect. This is used to
+ * hook Layer 2 interface(s) up to the Layer 3 stack in arbitrary ways.
+ *
+ * @todo This is incomplete. This needs a detailed description and a
+ * practical example.
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_l2xcrw_command, static) = {
+  .path = "show l2xcrw",
+  .short_help = "show l2xcrw",
+  .function = show_l2xcrw_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2/l2_xcrw.h b/src/vnet/l2/l2_xcrw.h
new file mode 100644
index 00000000..ca80aae9
--- /dev/null
+++ b/src/vnet/l2/l2_xcrw.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_l2_xcrw_h__
+#define __included_l2_xcrw_h__
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+#include <vnet/ip/ip.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/l2_output.h>
+#include <vnet/api_errno.h>
+#include <vnet/ethernet/ethernet.h>
+
+typedef struct
+{
+  /*
+   * Let: rewrite_header.sw_if_index = tx_fib_index or ~0.
+   *      rewrite_header.next_index = L2_XCRW_NEXT_XXX
+   */
+  vnet_declare_rewrite (VLIB_BUFFER_PRE_DATA_SIZE);
+} l2_xcrw_adjacency_t;
+
+typedef struct
+{
+  /* L2 interface */
+  u32 l2_sw_if_index;
+
+  /* Tunnel interface */
+  u32 tunnel_sw_if_index;	/* This field remains set in freed pool elts */
+
+} l2_xcrw_tunnel_t;
+
+typedef struct
+{
+  u32 cached_next_index;
+
+  /* Vector of cross-connect rewrites */
+  l2_xcrw_adjacency_t *adj_by_sw_if_index;
+
+  /* Pool of xcrw tunnels */
+  l2_xcrw_tunnel_t *tunnels;
+
+  /* Tunnel index by tunnel sw_if_index */
+  uword *tunnel_index_by_l2_sw_if_index;
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} l2_xcrw_main_t;
+
+typedef enum
+{
+  L2_XCRW_NEXT_DROP,
+  L2_XCRW_N_NEXT,
+} l2_xcrw_next_t;
+
+#define foreach_l2_xcrw_error                   \
+_(DROP, "Packets dropped")                      \
+_(FWD, "Packets forwarded")
+
+typedef enum
+{
+#define _(sym,str) L2_XCRW_ERROR_##sym,
+  foreach_l2_xcrw_error
+#undef _
+    L2_XCRW_N_ERROR,
+} l2_xcrw_error_t;
+
+#endif /* __included_l2_xcrw_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2tp/decap.c b/src/vnet/l2tp/decap.c
new file mode 100644
index 00000000..e8986935
--- /dev/null
+++ b/src/vnet/l2tp/decap.c
@@ -0,0 +1,309 @@
+/*
+ * decap.c : L2TPv3 tunnel decapsulation
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/l2tp/l2tp.h>
+
+/* Statistics (not really errors) */
+#define foreach_l2t_decap_error                                 \
+_(USER_TO_NETWORK, "L2TP user (ip6) to L2 network pkts")        \
+_(SESSION_ID_MISMATCH, "l2tpv3 local session id mismatches")    \
+_(COOKIE_MISMATCH, "l2tpv3 local cookie mismatches")            \
+_(NO_SESSION, "l2tpv3 session not found")                       \
+_(ADMIN_DOWN, "l2tpv3 tunnel is down")
+
+static char *l2t_decap_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2t_decap_error
+#undef _
+};
+
+typedef enum
+{
+#define _(sym,str) L2T_DECAP_ERROR_##sym,
+  foreach_l2t_decap_error
+#undef _
+    L2T_DECAP_N_ERROR,
+} l2t_DECAP_error_t;
+
+typedef enum
+{
+  L2T_DECAP_NEXT_DROP,
+  L2T_DECAP_NEXT_L2_INPUT,
+  L2T_DECAP_N_NEXT,
+  /* Pseudo next index */
+  L2T_DECAP_NEXT_NO_INTERCEPT = L2T_DECAP_N_NEXT,
+} l2t_decap_next_t;
+
+#define NSTAGES 3
+
+static inline void
+stage0 (vlib_main_t * vm, vlib_node_runtime_t * node, u32 buffer_index)
+{
+  vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
+  vlib_prefetch_buffer_header (b, STORE);
+  /* l2tpv3 header is a long way away, need 2 cache lines */
+  CLIB_PREFETCH (b->data, 2 * CLIB_CACHE_LINE_BYTES, STORE);
+}
+
+static inline void
+stage1 (vlib_main_t * vm, vlib_node_runtime_t * node, u32 bi)
+{
+  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+  l2t_main_t *lm = &l2t_main;
+  ip6_header_t *ip6 = vlib_buffer_get_current (b);
+  u32 session_index;
+  uword *p = 0;
+  l2tpv3_header_t *l2t;
+
+  /* Not L2tpv3 (0x73, 0t115)? Use the normal path. */
+  if (PREDICT_FALSE (ip6->protocol != IP_PROTOCOL_L2TP))
+    {
+      vnet_buffer (b)->l2t.next_index = L2T_DECAP_NEXT_NO_INTERCEPT;
+      return;
+    }
+
+  /* Make up your minds, people... */
+  switch (lm->lookup_type)
+    {
+    case L2T_LOOKUP_SRC_ADDRESS:
+      p = hash_get_mem (lm->session_by_src_address, &ip6->src_address);
+      break;
+    case L2T_LOOKUP_DST_ADDRESS:
+      p = hash_get_mem (lm->session_by_dst_address, &ip6->dst_address);
+      break;
+    case L2T_LOOKUP_SESSION_ID:
+      l2t = (l2tpv3_header_t *) (ip6 + 1);
+      p = hash_get (lm->session_by_session_id, l2t->session_id);
+      break;
+    default:
+      ASSERT (0);
+    }
+
+  if (PREDICT_FALSE (p == 0))
+    {
+      vnet_buffer (b)->l2t.next_index = L2T_DECAP_NEXT_NO_INTERCEPT;
+      return;
+    }
+  else
+    {
+      session_index = p[0];
+    }
+
+  /* Remember mapping index, prefetch the mini counter */
+  vnet_buffer (b)->l2t.next_index = L2T_DECAP_NEXT_L2_INPUT;
+  vnet_buffer (b)->l2t.session_index = session_index;
+
+  /* $$$$$ prefetch counter */
+}
+
+static inline u32
+last_stage (vlib_main_t * vm, vlib_node_runtime_t * node, u32 bi)
+{
+  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+  l2t_main_t *lm = &l2t_main;
+  ip6_header_t *ip6 = vlib_buffer_get_current (b);
+  vlib_node_t *n = vlib_get_node (vm, node->node_index);
+  u32 node_counter_base_index = n->error_heap_index;
+  vlib_error_main_t *em = &vm->error_main;
+  l2tpv3_header_t *l2tp;
+  u32 counter_index;
+  l2t_session_t *session = 0;
+  u32 session_index;
+  u32 next_index;
+  u8 l2tp_decap_local = (l2t_decap_local_node.index == n->index);
+
+  /* Other-than-output pkt? We're done... */
+  if (vnet_buffer (b)->l2t.next_index != L2T_DECAP_NEXT_L2_INPUT)
+    {
+      next_index = vnet_buffer (b)->l2t.next_index;
+      goto done;
+    }
+
+  em->counters[node_counter_base_index + L2T_DECAP_ERROR_USER_TO_NETWORK] +=
+    1;
+
+  session_index = vnet_buffer (b)->l2t.session_index;
+
+  counter_index =
+    session_index_to_counter_index (session_index,
+				    SESSION_COUNTER_USER_TO_NETWORK);
+
+  /* per-mapping byte stats include the ethernet header */
+  vlib_increment_combined_counter (&lm->counter_main,
+				   os_get_cpu_number (),
+				   counter_index, 1 /* packet_increment */ ,
+				   vlib_buffer_length_in_chain (vm, b) +
+				   sizeof (ethernet_header_t));
+
+  session = pool_elt_at_index (lm->sessions, session_index);
+
+  l2tp = vlib_buffer_get_current (b) + sizeof (*ip6);
+
+  if (PREDICT_FALSE (l2tp->session_id != session->local_session_id))
+    {
+      /* Key matched but session id does not. Assume packet is not for us. */
+      em->counters[node_counter_base_index +
+		   L2T_DECAP_ERROR_SESSION_ID_MISMATCH] += 1;
+      next_index = L2T_DECAP_NEXT_NO_INTERCEPT;
+      goto done;
+    }
+
+  if (PREDICT_FALSE (l2tp->cookie != session->local_cookie[0]))
+    {
+      if (l2tp->cookie != session->local_cookie[1])
+	{
+	  /* Key and session ID matched, but cookie doesn't. Drop this packet. */
+	  b->error = node->errors[L2T_DECAP_ERROR_COOKIE_MISMATCH];
+	  next_index = L2T_DECAP_NEXT_DROP;
+	  goto done;
+	}
+    }
+
+  vnet_buffer (b)->sw_if_index[VLIB_RX] = session->sw_if_index;
+
+  if (PREDICT_FALSE (!(session->admin_up)))
+    {
+      b->error = node->errors[L2T_DECAP_ERROR_ADMIN_DOWN];
+      next_index = L2T_DECAP_NEXT_DROP;
+      goto done;
+    }
+
+  /* strip the ip6 and L2TP header */
+  vlib_buffer_advance (b, sizeof (*ip6) + session->l2tp_hdr_size);
+
+  /* Required to make the l2 tag push / pop code work on l2 subifs */
+  vnet_update_l2_len (b);
+
+  if (PREDICT_FALSE (b->flags & VLIB_BUFFER_IS_TRACED))
+    {
+      l2t_trace_t *t = vlib_add_trace (vm, node, b, sizeof (*t));
+      t->is_user_to_network = 1;
+      t->our_address.as_u64[0] = ip6->dst_address.as_u64[0];
+      t->our_address.as_u64[1] = ip6->dst_address.as_u64[1];
+      t->client_address.as_u64[0] = ip6->src_address.as_u64[0];
+      t->client_address.as_u64[1] = ip6->src_address.as_u64[1];
+      t->session_index = session_index;
+    }
+
+  return L2T_DECAP_NEXT_L2_INPUT;
+
+done:
+  if (next_index == L2T_DECAP_NEXT_NO_INTERCEPT)
+    {
+      /* Small behavioral change between l2tp-decap and l2tp-decap-local */
+      if (l2tp_decap_local)
+	{
+	  b->error = node->errors[L2T_DECAP_ERROR_NO_SESSION];
+	  next_index = L2T_DECAP_NEXT_DROP;
+	}
+      else
+	{
+	  /* Go to next node on the ip6 configuration chain */
+	  if (PREDICT_TRUE (session != 0))
+	    vnet_feature_next (session->sw_if_index, &next_index, b);
+	}
+    }
+
+  if (PREDICT_FALSE (b->flags & VLIB_BUFFER_IS_TRACED))
+    {
+      l2t_trace_t *t = vlib_add_trace (vm, node, b, sizeof (*t));
+      t->is_user_to_network = 1;
+      t->our_address.as_u64[0] = ip6->dst_address.as_u64[0];
+      t->our_address.as_u64[1] = ip6->dst_address.as_u64[1];
+      t->client_address.as_u64[0] = ip6->src_address.as_u64[0];
+      t->client_address.as_u64[1] = ip6->src_address.as_u64[1];
+      t->session_index = ~0;
+    }
+  return next_index;
+}
+
+#include <vnet/pipeline.h>
+
+static uword
+l2t_decap_node_fn (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return dispatch_pipeline (vm, node, frame);
+}
+
+/*
+ * l2tp-decap and l2tp-decap-local have very slightly different behavior.
+ * When a packet has no associated session l2tp-decap let it go to ip6 forward,
+ * while l2tp-decap-local drops it.
+ */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2t_decap_node) = {
+  .function = l2t_decap_node_fn,
+  .name = "l2tp-decap",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2t_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2t_decap_error_strings),
+  .error_strings = l2t_decap_error_strings,
+
+  .n_next_nodes = L2T_DECAP_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+        [L2T_DECAP_NEXT_L2_INPUT] = "l2-input",
+        [L2T_DECAP_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2t_decap_node, l2t_decap_node_fn);
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2t_decap_local_node) = {
+  .function = l2t_decap_node_fn,
+  .name = "l2tp-decap-local",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2t_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2t_decap_error_strings),
+  .error_strings = l2t_decap_error_strings,
+
+  .n_next_nodes = L2T_DECAP_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [L2T_DECAP_NEXT_L2_INPUT] = "l2-input",
+    [L2T_DECAP_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+void
+l2tp_decap_init (void)
+{
+  ip6_register_protocol (IP_PROTOCOL_L2TP, l2t_decap_local_node.index);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2tp/encap.c b/src/vnet/l2tp/encap.c
new file mode 100644
index 00000000..ed7a9580
--- /dev/null
+++ b/src/vnet/l2tp/encap.c
@@ -0,0 +1,238 @@
+/*
+ * encap.c : L2TPv3 tunnel encapsulation
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/l2tp/l2tp.h>
+
+/* Statistics (not really errors) */
+#define foreach_l2t_encap_error					\
+_(NETWORK_TO_USER, "L2TP L2 network to user (ip6) pkts")	\
+_(LOOKUP_FAIL_TO_L3, "L2TP L2 session lookup failed pkts")      \
+_(ADMIN_DOWN, "L2TP tunnel is down")
+
+static char *l2t_encap_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2t_encap_error
+#undef _
+};
+
+typedef enum
+{
+#define _(sym,str) L2T_ENCAP_ERROR_##sym,
+  foreach_l2t_encap_error
+#undef _
+    L2T_ENCAP_N_ERROR,
+} l2t_encap_error_t;
+
+
+typedef enum
+{
+  L2T_ENCAP_NEXT_DROP,
+  L2T_ENCAP_NEXT_IP6_LOOKUP,
+  L2T_ENCAP_N_NEXT,
+} l2t_encap_next_t;
+
+typedef struct
+{
+  u32 cached_session_index;
+  u32 cached_sw_if_index;
+  vnet_main_t *vnet_main;
+} l2tp_encap_runtime_t;
+
+vlib_node_registration_t l2t_encap_node;
+
+#define NSTAGES 3
+
+static inline void
+stage0 (vlib_main_t * vm, vlib_node_runtime_t * node, u32 buffer_index)
+{
+  vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
+  vlib_prefetch_buffer_header (b, STORE);
+  CLIB_PREFETCH (b->data, 2 * CLIB_CACHE_LINE_BYTES, STORE);
+}
+
+static inline void
+stage1 (vlib_main_t * vm, vlib_node_runtime_t * node, u32 bi)
+{
+  l2tp_encap_runtime_t *rt = (void *) node->runtime_data;
+  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+  vnet_hw_interface_t *hi;
+
+  u32 sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_TX];
+  u32 session_index = rt->cached_session_index;
+
+  if (PREDICT_FALSE (rt->cached_sw_if_index != sw_if_index))
+    {
+      hi = vnet_get_sup_hw_interface (rt->vnet_main, sw_if_index);
+      session_index = rt->cached_session_index = hi->dev_instance;
+      rt->cached_sw_if_index = sw_if_index;
+    }
+
+  /* Remember mapping index, prefetch the mini counter */
+  vnet_buffer (b)->l2t.next_index = L2T_ENCAP_NEXT_IP6_LOOKUP;
+  vnet_buffer (b)->l2t.session_index = session_index;
+
+  /* $$$$ prefetch counter... */
+}
+
+static inline u32
+last_stage (vlib_main_t * vm, vlib_node_runtime_t * node, u32 bi)
+{
+  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+  l2t_main_t *lm = &l2t_main;
+  vlib_node_t *n = vlib_get_node (vm, l2t_encap_node.index);
+  u32 node_counter_base_index = n->error_heap_index;
+  vlib_error_main_t *em = &vm->error_main;
+  l2tpv3_header_t *l2tp;
+  u32 session_index;
+  u32 counter_index;
+  l2t_session_t *s;
+  ip6_header_t *ip6;
+  u16 payload_length;
+  u32 next_index = L2T_ENCAP_NEXT_IP6_LOOKUP;
+
+  /* Other-than-output pkt? We're done... */
+  if (vnet_buffer (b)->l2t.next_index != L2T_ENCAP_NEXT_IP6_LOOKUP)
+    return vnet_buffer (b)->l2t.next_index;
+
+  em->counters[node_counter_base_index + L2T_ENCAP_ERROR_NETWORK_TO_USER] +=
+    1;
+
+  session_index = vnet_buffer (b)->l2t.session_index;
+
+  counter_index =
+    session_index_to_counter_index (session_index,
+				    SESSION_COUNTER_NETWORK_TO_USER);
+
+  /* per-mapping byte stats include the ethernet header */
+  vlib_increment_combined_counter (&lm->counter_main,
+				   os_get_cpu_number (),
+				   counter_index, 1 /* packet_increment */ ,
+				   vlib_buffer_length_in_chain (vm, b));
+
+  s = pool_elt_at_index (lm->sessions, session_index);
+
+  vnet_buffer (b)->sw_if_index[VLIB_TX] = s->encap_fib_index;
+
+  /* Paint on an l2tpv3 hdr */
+  vlib_buffer_advance (b, -(s->l2tp_hdr_size));
+  l2tp = vlib_buffer_get_current (b);
+
+  l2tp->session_id = s->remote_session_id;
+  l2tp->cookie = s->remote_cookie;
+  if (PREDICT_FALSE (s->l2_sublayer_present))
+    {
+      l2tp->l2_specific_sublayer = 0;
+    }
+
+  /* Paint on an ip6 header */
+  vlib_buffer_advance (b, -(sizeof (*ip6)));
+  ip6 = vlib_buffer_get_current (b);
+
+  if (PREDICT_FALSE (!(s->admin_up)))
+    {
+      b->error = node->errors[L2T_ENCAP_ERROR_ADMIN_DOWN];
+      next_index = L2T_ENCAP_NEXT_DROP;
+      goto done;
+    }
+
+  ip6->ip_version_traffic_class_and_flow_label =
+    clib_host_to_net_u32 (0x6 << 28);
+
+  /* calculate ip6 payload length */
+  payload_length = vlib_buffer_length_in_chain (vm, b);
+  payload_length -= sizeof (*ip6);
+
+  ip6->payload_length = clib_host_to_net_u16 (payload_length);
+  ip6->protocol = IP_PROTOCOL_L2TP;
+  ip6->hop_limit = 0xff;
+  ip6->src_address.as_u64[0] = s->our_address.as_u64[0];
+  ip6->src_address.as_u64[1] = s->our_address.as_u64[1];
+  ip6->dst_address.as_u64[0] = s->client_address.as_u64[0];
+  ip6->dst_address.as_u64[1] = s->client_address.as_u64[1];
+
+
+done:
+  if (PREDICT_FALSE (b->flags & VLIB_BUFFER_IS_TRACED))
+    {
+      l2t_trace_t *t = vlib_add_trace (vm, node, b, sizeof (*t));
+      t->is_user_to_network = 0;
+      t->our_address.as_u64[0] = ip6->src_address.as_u64[0];
+      t->our_address.as_u64[1] = ip6->src_address.as_u64[1];
+      t->client_address.as_u64[0] = ip6->dst_address.as_u64[0];
+      t->client_address.as_u64[1] = ip6->dst_address.as_u64[1];
+      t->session_index = session_index;
+    }
+
+  return next_index;
+}
+
+#include <vnet/pipeline.h>
+
+uword
+l2t_encap_node_fn (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return dispatch_pipeline (vm, node, frame);
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2t_encap_node) = {
+  .function = l2t_encap_node_fn,
+  .name = "l2tp-encap",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2t_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .runtime_data_bytes = sizeof (l2tp_encap_runtime_t),
+
+  .n_errors = ARRAY_LEN(l2t_encap_error_strings),
+  .error_strings = l2t_encap_error_strings,
+
+  .n_next_nodes = L2T_ENCAP_N_NEXT,
+
+  /*  add dispositions here */
+  .next_nodes = {
+    [L2T_ENCAP_NEXT_IP6_LOOKUP] = "ip6-lookup",
+    [L2T_ENCAP_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2t_encap_node, l2t_encap_node_fn);
+void
+l2tp_encap_init (vlib_main_t * vm)
+{
+  l2tp_encap_runtime_t *rt;
+
+  rt = vlib_node_get_runtime_data (vm, l2t_encap_node.index);
+  rt->vnet_main = vnet_get_main ();
+  rt->cached_sw_if_index = (u32) ~ 0;
+  rt->cached_session_index = (u32) ~ 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2tp/l2tp.api b/src/vnet/l2tp/l2tp.api
new file mode 100644
index 00000000..5a5a5a48
--- /dev/null
+++ b/src/vnet/l2tp/l2tp.api
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \brief l2tpv3 tunnel interface create request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param client_address - remote client tunnel ip address
+    @param client_address - local tunnel ip address
+    @param is_ipv6 - ipv6 if non-zero, else ipv4
+    @param local_session_id - local tunnel session id
+    @param remote_session_id - remote tunnel session id
+    @param local_cookie - local tunnel cookie
+    @param l2_sublayer_present - l2 sublayer is present in packets if non-zero
+    @param encap_vrf_id - fib identifier used for outgoing encapsulated packets
+*/
+define l2tpv3_create_tunnel
+{
+  u32 client_index;
+  u32 context;
+  u8 client_address[16];
+  u8 our_address[16];
+  u8 is_ipv6;
+  u32 local_session_id;
+  u32 remote_session_id;
+  u64 local_cookie;
+  u64 remote_cookie;
+  u8 l2_sublayer_present;
+  u32 encap_vrf_id;
+};
+
+/** \brief l2tpv3 tunnel interface create response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+    @param sw_if_index - index of the new tunnel interface
+*/
+define l2tpv3_create_tunnel_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+};
+
+define l2tpv3_set_tunnel_cookies
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u64 new_local_cookie;
+  u64 new_remote_cookie;
+};
+
+/** \brief L2TP tunnel set cookies response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define l2tpv3_set_tunnel_cookies_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+define sw_if_l2tpv3_tunnel_details
+{
+  u32 context;
+  u32 sw_if_index;
+  u8 interface_name[64];
+  u8 client_address[16];
+  u8 our_address[16];
+  u32 local_session_id;
+  u32 remote_session_id;
+  u64 local_cookie[2];
+  u64 remote_cookie;
+  u8 l2_sublayer_present;
+};
+
+define sw_if_l2tpv3_tunnel_dump
+{
+  u32 client_index;
+  u32 context;
+};
+
+define l2tpv3_interface_enable_disable
+{
+  u32 client_index;
+  u32 context;
+  u8 enable_disable;
+  u32 sw_if_index;
+};
+
+define l2tpv3_interface_enable_disable_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+define l2tpv3_set_lookup_key
+{
+  u32 client_index;
+  u32 context;
+  /* 0 = ip6 src_address, 1 = ip6 dst_address, 2 = session_id */
+  u8 key;
+};
+
+define l2tpv3_set_lookup_key_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2tp/l2tp.c b/src/vnet/l2tp/l2tp.c
new file mode 100644
index 00000000..a4531dab
--- /dev/null
+++ b/src/vnet/l2tp/l2tp.c
@@ -0,0 +1,739 @@
+/*
+ * l2tp.c : L2TPv3 tunnel support
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/l2tp/l2tp.h>
+
+l2t_main_t l2t_main;
+
+/* packet trace format function */
+u8 *
+format_l2t_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2t_trace_t *t = va_arg (*args, l2t_trace_t *);
+
+  if (t->is_user_to_network)
+    s = format (s, "L2T: %U (client) -> %U (our) session %d",
+		format_ip6_address, &t->client_address,
+		format_ip6_address, &t->our_address, t->session_index);
+  else
+    s = format (s, "L2T: %U (our) -> %U (client) session %d)",
+		format_ip6_address, &t->our_address,
+		format_ip6_address, &t->client_address, t->session_index);
+  return s;
+}
+
+u8 *
+format_l2t_session (u8 * s, va_list * args)
+{
+  l2t_session_t *session = va_arg (*args, l2t_session_t *);
+  l2t_main_t *lm = &l2t_main;
+  u32 counter_index;
+  vlib_counter_t v;
+
+  s = format (s, "[%d] %U (our) %U (client) %U (sw_if_index %d)\n",
+	      session - lm->sessions,
+	      format_ip6_address, &session->our_address,
+	      format_ip6_address, &session->client_address,
+	      format_vnet_sw_interface_name, lm->vnet_main,
+	      vnet_get_sw_interface (lm->vnet_main, session->sw_if_index),
+	      session->sw_if_index);
+
+  s = format (s, "   local cookies %016llx %016llx remote cookie %016llx\n",
+	      clib_net_to_host_u64 (session->local_cookie[0]),
+	      clib_net_to_host_u64 (session->local_cookie[1]),
+	      clib_net_to_host_u64 (session->remote_cookie));
+
+  s = format (s, "   local session-id %d remote session-id %d\n",
+	      clib_net_to_host_u32 (session->local_session_id),
+	      clib_net_to_host_u32 (session->remote_session_id));
+
+  s = format (s, "   l2 specific sublayer %s\n",
+	      session->l2_sublayer_present ? "preset" : "absent");
+
+  counter_index =
+    session_index_to_counter_index (session - lm->sessions,
+				    SESSION_COUNTER_USER_TO_NETWORK);
+
+  vlib_get_combined_counter (&lm->counter_main, counter_index, &v);
+  if (v.packets != 0)
+    s = format (s, "   user-to-net: %llu pkts %llu bytes\n",
+		v.packets, v.bytes);
+
+  vlib_get_combined_counter (&lm->counter_main, counter_index + 1, &v);
+
+  if (v.packets != 0)
+    s = format (s, "   net-to-user: %llu pkts %llu bytes\n",
+		v.packets, v.bytes);
+  return s;
+}
+
+static clib_error_t *
+show_l2tp_command_fn (vlib_main_t * vm,
+		      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  l2t_session_t *session;
+  l2t_main_t *lm = &l2t_main;
+  char *keystr = 0;
+  int verbose = 0;
+
+  if (unformat (input, "verbose") || unformat (input, "v"))
+    verbose = 1;
+
+  if (pool_elts (lm->sessions) == 0)
+    vlib_cli_output (vm, "No l2tp sessions...");
+  else
+    vlib_cli_output (vm, "%u l2tp sessions...", pool_elts (lm->sessions));
+
+  if (verbose)
+    {
+      switch (lm->lookup_type)
+	{
+	case L2T_LOOKUP_SRC_ADDRESS:
+	  keystr = "src address";
+	  break;
+
+	case L2T_LOOKUP_DST_ADDRESS:
+	  keystr = "dst address";
+	  break;
+
+	case L2T_LOOKUP_SESSION_ID:
+	  keystr = "session id";
+	  break;
+
+	default:
+	  keystr = "BOGUS!";
+	  break;
+	}
+
+      vlib_cli_output (vm, "L2tp session lookup on %s", keystr);
+
+      /* *INDENT-OFF* */
+      pool_foreach (session, lm->sessions,
+      ({
+        vlib_cli_output (vm, "%U", format_l2t_session, session);
+      }));
+      /* *INDENT-ON* */
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_session_detail_command, static) = {
+  .path = "show l2tpv3",
+  .short_help = "show l2tpv3 [verbose]",
+  .function = show_l2tp_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+test_counters_command_fn (vlib_main_t * vm,
+			  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  l2t_session_t *session;
+  l2t_main_t *lm = &l2t_main;
+  u32 session_index;
+  u32 counter_index;
+  u32 nincr = 0;
+  u32 cpu_index = os_get_cpu_number ();
+
+  /* *INDENT-OFF* */
+  pool_foreach (session, lm->sessions,
+  ({
+    session_index = session - lm->sessions;
+    counter_index =
+      session_index_to_counter_index (session_index,
+                                      SESSION_COUNTER_USER_TO_NETWORK);
+    vlib_increment_combined_counter (&lm->counter_main,
+                                     cpu_index,
+                                     counter_index,
+                                     1/*pkt*/, 1111 /*bytes*/);
+    vlib_increment_combined_counter (&lm->counter_main,
+                                     cpu_index,
+                                     counter_index+1,
+                                     1/*pkt*/, 2222 /*bytes*/);
+    nincr++;
+
+  }));
+  /* *INDENT-ON* */
+  vlib_cli_output (vm, "Incremented %d active counters\n", nincr);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (test_counters_command, static) = {
+    .path = "test counters",
+    .short_help = "increment all active counters",
+    .function = test_counters_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+clear_counters_command_fn (vlib_main_t * vm,
+			   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  l2t_session_t *session;
+  l2t_main_t *lm = &l2t_main;
+  u32 session_index;
+  u32 counter_index;
+  u32 nincr = 0;
+
+  /* *INDENT-OFF* */
+  pool_foreach (session, lm->sessions,
+  ({
+    session_index = session - lm->sessions;
+    counter_index =
+      session_index_to_counter_index (session_index,
+                                      SESSION_COUNTER_USER_TO_NETWORK);
+    vlib_zero_combined_counter (&lm->counter_main, counter_index);
+    vlib_zero_combined_counter (&lm->counter_main, counter_index+1);
+    nincr++;
+  }));
+  /* *INDENT-ON* */
+  vlib_cli_output (vm, "Cleared %d active counters\n", nincr);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (clear_counters_command, static) = {
+  .path = "clear counters",
+  .short_help = "clear all active counters",
+  .function = clear_counters_command_fn,
+};
+/* *INDENT-ON* */
+
+static u8 *
+format_l2tpv3_name (u8 * s, va_list * args)
+{
+  l2t_main_t *lm = &l2t_main;
+  u32 i = va_arg (*args, u32);
+  u32 show_dev_instance = ~0;
+
+  if (i < vec_len (lm->dev_inst_by_real))
+    show_dev_instance = lm->dev_inst_by_real[i];
+
+  if (show_dev_instance != ~0)
+    i = show_dev_instance;
+
+  return format (s, "l2tpv3_tunnel%d", i);
+}
+
+static int
+l2tpv3_name_renumber (vnet_hw_interface_t * hi, u32 new_dev_instance)
+{
+  l2t_main_t *lm = &l2t_main;
+
+  vec_validate_init_empty (lm->dev_inst_by_real, hi->dev_instance, ~0);
+
+  lm->dev_inst_by_real[hi->dev_instance] = new_dev_instance;
+
+  return 0;
+}
+
+static uword
+dummy_interface_tx (vlib_main_t * vm,
+		    vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  clib_warning ("you shouldn't be here, leaking buffers...");
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (l2tpv3_device_class,static) = {
+  .name = "L2TPv3",
+  .format_device_name = format_l2tpv3_name,
+  .name_renumber = l2tpv3_name_renumber,
+  .tx_function = dummy_interface_tx,
+};
+/* *INDENT-ON* */
+
+static u8 *
+format_l2tp_header_with_length (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  s = format (s, "unimplemented dev %u", dev_instance);
+  return s;
+}
+
+/* *INDENT-OFF* */
+VNET_HW_INTERFACE_CLASS (l2tpv3_hw_class) = {
+  .name = "L2TPV3",
+  .format_header = format_l2tp_header_with_length,
+  .build_rewrite = default_build_rewrite,
+  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
+};
+/* *INDENT-ON* */
+
+int
+create_l2tpv3_ipv6_tunnel (l2t_main_t * lm,
+			   ip6_address_t * client_address,
+			   ip6_address_t * our_address,
+			   u32 local_session_id,
+			   u32 remote_session_id,
+			   u64 local_cookie,
+			   u64 remote_cookie,
+			   int l2_sublayer_present,
+			   u32 encap_fib_index, u32 * sw_if_index)
+{
+  l2t_session_t *s = 0;
+  vnet_main_t *vnm = lm->vnet_main;
+  vnet_hw_interface_t *hi;
+  uword *p = (uword *) ~ 0;
+  u32 hw_if_index;
+  l2tpv3_header_t l2tp_hdr;
+  ip6_address_t *dst_address_copy, *src_address_copy;
+  u32 counter_index;
+
+  remote_session_id = clib_host_to_net_u32 (remote_session_id);
+  local_session_id = clib_host_to_net_u32 (local_session_id);
+
+  switch (lm->lookup_type)
+    {
+    case L2T_LOOKUP_SRC_ADDRESS:
+      p = hash_get_mem (lm->session_by_src_address, client_address);
+      break;
+
+    case L2T_LOOKUP_DST_ADDRESS:
+      p = hash_get_mem (lm->session_by_dst_address, our_address);
+      break;
+
+    case L2T_LOOKUP_SESSION_ID:
+      p = hash_get (lm->session_by_session_id, local_session_id);
+      break;
+
+    default:
+      ASSERT (0);
+    }
+
+  /* adding a session: session must not already exist */
+  if (p)
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  pool_get (lm->sessions, s);
+  memset (s, 0, sizeof (*s));
+  clib_memcpy (&s->our_address, our_address, sizeof (s->our_address));
+  clib_memcpy (&s->client_address, client_address,
+	       sizeof (s->client_address));
+  s->local_cookie[0] = clib_host_to_net_u64 (local_cookie);
+  s->remote_cookie = clib_host_to_net_u64 (remote_cookie);
+  s->local_session_id = local_session_id;
+  s->remote_session_id = remote_session_id;
+  s->l2_sublayer_present = l2_sublayer_present;
+  /* precompute l2tp header size */
+  s->l2tp_hdr_size = l2_sublayer_present ?
+    sizeof (l2tpv3_header_t) :
+    sizeof (l2tpv3_header_t) - sizeof (l2tp_hdr.l2_specific_sublayer);
+  s->admin_up = 0;
+  s->encap_fib_index = encap_fib_index;
+
+  /* Setup hash table entries */
+  switch (lm->lookup_type)
+    {
+    case L2T_LOOKUP_SRC_ADDRESS:
+      src_address_copy = clib_mem_alloc (sizeof (*src_address_copy));
+      clib_memcpy (src_address_copy, client_address,
+		   sizeof (*src_address_copy));
+      hash_set_mem (lm->session_by_src_address, src_address_copy,
+		    s - lm->sessions);
+      break;
+    case L2T_LOOKUP_DST_ADDRESS:
+      dst_address_copy = clib_mem_alloc (sizeof (*dst_address_copy));
+      clib_memcpy (dst_address_copy, our_address, sizeof (*dst_address_copy));
+      hash_set_mem (lm->session_by_dst_address, dst_address_copy,
+		    s - lm->sessions);
+      break;
+    case L2T_LOOKUP_SESSION_ID:
+      hash_set (lm->session_by_session_id, local_session_id,
+		s - lm->sessions);
+      break;
+
+    default:
+      ASSERT (0);
+    }
+
+  /* validate counters */
+  counter_index =
+    session_index_to_counter_index (s - lm->sessions,
+				    SESSION_COUNTER_USER_TO_NETWORK);
+  vlib_validate_combined_counter (&lm->counter_main, counter_index);
+  vlib_validate_combined_counter (&lm->counter_main, counter_index + 1);
+
+  if (vec_len (lm->free_l2tpv3_tunnel_hw_if_indices) > 0)
+    {
+      hw_if_index = lm->free_l2tpv3_tunnel_hw_if_indices
+	[vec_len (lm->free_l2tpv3_tunnel_hw_if_indices) - 1];
+      _vec_len (lm->free_l2tpv3_tunnel_hw_if_indices) -= 1;
+
+      hi = vnet_get_hw_interface (vnm, hw_if_index);
+      hi->dev_instance = s - lm->sessions;
+      hi->hw_instance = hi->dev_instance;
+    }
+  else
+    {
+      hw_if_index = vnet_register_interface
+	(vnm, l2tpv3_device_class.index, s - lm->sessions,
+	 l2tpv3_hw_class.index, s - lm->sessions);
+      hi = vnet_get_hw_interface (vnm, hw_if_index);
+      hi->output_node_index = l2t_encap_node.index;
+      /* $$$$ initialize custom dispositions, if needed */
+    }
+
+  s->hw_if_index = hw_if_index;
+  s->sw_if_index = hi->sw_if_index;
+
+  if (sw_if_index)
+    *sw_if_index = hi->sw_if_index;
+
+  return 0;
+}
+
+static clib_error_t *
+create_l2tpv3_tunnel_command_fn (vlib_main_t * vm,
+				 unformat_input_t * input,
+				 vlib_cli_command_t * cmd)
+{
+  ip6_address_t client_address, our_address;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  l2t_main_t *lm = &l2t_main;
+  u64 local_cookie = (u64) ~ 0, remote_cookie = (u64) ~ 0;
+  u32 local_session_id = 1, remote_session_id = 1;
+  int our_address_set = 0, client_address_set = 0;
+  int l2_sublayer_present = 0;
+  int rv;
+  u32 sw_if_index;
+  u32 encap_fib_id = ~0;
+  u32 encap_fib_index = ~0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "client %U",
+		    unformat_ip6_address, &client_address))
+	client_address_set = 1;
+      else if (unformat (line_input, "our %U",
+			 unformat_ip6_address, &our_address))
+	our_address_set = 1;
+      else if (unformat (line_input, "local-cookie %llx", &local_cookie))
+	;
+      else if (unformat (line_input, "remote-cookie %llx", &remote_cookie))
+	;
+      else if (unformat (line_input, "local-session-id %d",
+			 &local_session_id))
+	;
+      else if (unformat (line_input, "remote-session-id %d",
+			 &remote_session_id))
+	;
+      else if (unformat (line_input, "fib-id %d", &encap_fib_id))
+	;
+      else if (unformat (line_input, "l2-sublayer-present"))
+	l2_sublayer_present = 1;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (encap_fib_id != ~0)
+    {
+      uword *p;
+      ip6_main_t *im = &ip6_main;
+      if (!(p = hash_get (im->fib_index_by_table_id, encap_fib_id)))
+	return clib_error_return (0, "No fib with id %d", encap_fib_id);
+      encap_fib_index = p[0];
+    }
+  else
+    {
+      encap_fib_index = ~0;
+    }
+
+  if (our_address_set == 0)
+    return clib_error_return (0, "our address not specified");
+  if (client_address_set == 0)
+    return clib_error_return (0, "client address not specified");
+
+  rv = create_l2tpv3_ipv6_tunnel (lm, &client_address, &our_address,
+				  local_session_id, remote_session_id,
+				  local_cookie, remote_cookie,
+				  l2_sublayer_present,
+				  encap_fib_index, &sw_if_index);
+  switch (rv)
+    {
+    case 0:
+      vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name,
+		       vnet_get_main (), sw_if_index);
+      break;
+    case VNET_API_ERROR_INVALID_VALUE:
+      return clib_error_return (0, "session already exists...");
+
+    case VNET_API_ERROR_NO_SUCH_ENTRY:
+      return clib_error_return (0, "session does not exist...");
+
+    default:
+      return clib_error_return (0, "l2tp_session_add_del returned %d", rv);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (create_l2tpv3_tunnel_command, static) =
+{
+  .path = "create l2tpv3 tunnel",
+  .short_help =
+  "create l2tpv3 tunnel client <ip6> our <ip6> local-cookie <hex> remote-cookie <hex> local-session <dec> remote-session <dec>",
+  .function = create_l2tpv3_tunnel_command_fn,
+};
+/* *INDENT-ON* */
+
+int
+l2tpv3_set_tunnel_cookies (l2t_main_t * lm,
+			   u32 sw_if_index,
+			   u64 new_local_cookie, u64 new_remote_cookie)
+{
+  l2t_session_t *s;
+  vnet_hw_interface_t *hi;
+  vnet_main_t *vnm = vnet_get_main ();
+  hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+
+  if (pool_is_free_index (lm->sessions, hi->dev_instance))
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  s = pool_elt_at_index (lm->sessions, hi->dev_instance);
+
+  s->local_cookie[1] = s->local_cookie[0];
+  s->local_cookie[0] = clib_host_to_net_u64 (new_local_cookie);
+  s->remote_cookie = clib_host_to_net_u64 (new_remote_cookie);
+
+  return 0;
+}
+
+
+static clib_error_t *
+set_l2tp_tunnel_cookie_command_fn (vlib_main_t * vm,
+				   unformat_input_t * input,
+				   vlib_cli_command_t * cmd)
+{
+  l2t_main_t *lm = &l2t_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index = ~0;
+  u64 local_cookie = (u64) ~ 0, remote_cookie = (u64) ~ 0;
+
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%U", unformat_vnet_sw_interface, vnm,
+		    &sw_if_index))
+	;
+      else if (unformat (input, "local %llx", &local_cookie))
+	;
+      else if (unformat (input, "remote %llx", &remote_cookie))
+	;
+      else
+	break;
+    }
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "unknown interface");
+  if (local_cookie == ~0)
+    return clib_error_return (0, "local cookie required");
+  if (remote_cookie == ~0)
+    return clib_error_return (0, "remote cookie required");
+
+  rv = l2tpv3_set_tunnel_cookies (lm, sw_if_index,
+				  local_cookie, remote_cookie);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case VNET_API_ERROR_INVALID_SW_IF_INDEX:
+      return clib_error_return (0, "invalid interface");
+
+    default:
+      return clib_error_return (0, "l2tp_session_set_cookies returned %d",
+				rv);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_l2tp_tunnel_cookie_command, static) =
+{
+  .path = "set l2tpv3 tunnel cookie",
+  .short_help =
+  "set l2tpv3 tunnel cookie <intfc> local <hex> remote <hex>",
+  .function = set_l2tp_tunnel_cookie_command_fn,
+};
+/* *INDENT-ON* */
+
+int
+l2tpv3_interface_enable_disable (vnet_main_t * vnm,
+				 u32 sw_if_index, int enable_disable)
+{
+
+  if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+  vnet_feature_enable_disable ("ip6-unicast", "l2tp-decap", sw_if_index,
+			       enable_disable, 0, 0);
+  return 0;
+}
+
+/* Enable/disable L2TPv3 intercept on IP6 fowarding path */
+static clib_error_t *
+set_ip6_l2tpv3 (vlib_main_t * vm,
+		unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  u32 sw_if_index = ~0;
+  int is_add = 1;
+  int rv;
+  vnet_main_t *vnm = vnet_get_main ();
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%U", unformat_vnet_sw_interface, vnm,
+		    &sw_if_index))
+	;
+      else if (unformat (input, "del"))
+	is_add = 0;
+      else
+	break;
+    }
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "interface required");
+
+  rv = l2tpv3_interface_enable_disable (vnm, sw_if_index, is_add);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case VNET_API_ERROR_INVALID_SW_IF_INDEX:
+      return clib_error_return (0, "invalid interface");
+
+    default:
+      return clib_error_return (0,
+				"l2tp_interface_enable_disable returned %d",
+				rv);
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_ip6_l2tpv3, static) =
+{
+  .path = "set interface ip6 l2tpv3",
+  .function = set_ip6_l2tpv3,
+  .short_help = "set interface ip6 l2tpv3 <intfc> [del]",
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+l2tp_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  l2t_main_t *lm = &l2t_main;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "lookup-v6-src"))
+	lm->lookup_type = L2T_LOOKUP_SRC_ADDRESS;
+      else if (unformat (input, "lookup-v6-dst"))
+	lm->lookup_type = L2T_LOOKUP_DST_ADDRESS;
+      else if (unformat (input, "lookup-session-id"))
+	lm->lookup_type = L2T_LOOKUP_SESSION_ID;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  return 0;
+}
+
+VLIB_CONFIG_FUNCTION (l2tp_config, "l2tp");
+
+
+clib_error_t *
+l2tp_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
+{
+  l2t_main_t *lm = &l2t_main;
+  vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  if (hi->hw_class_index != l2tpv3_hw_class.index)
+    return 0;
+
+  u32 session_index = hi->dev_instance;
+  l2t_session_t *s = pool_elt_at_index (lm->sessions, session_index);
+  s->admin_up = ! !(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+  return 0;
+}
+
+VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (l2tp_sw_interface_up_down);
+
+clib_error_t *
+l2tp_init (vlib_main_t * vm)
+{
+  l2t_main_t *lm = &l2t_main;
+  ip_main_t *im = &ip_main;
+  ip_protocol_info_t *pi;
+
+  lm->vnet_main = vnet_get_main ();
+  lm->vlib_main = vm;
+  lm->lookup_type = L2T_LOOKUP_DST_ADDRESS;
+
+  lm->session_by_src_address = hash_create_mem
+    (0, sizeof (ip6_address_t) /* key bytes */ ,
+     sizeof (u32) /* value bytes */ );
+  lm->session_by_dst_address = hash_create_mem
+    (0, sizeof (ip6_address_t) /* key bytes */ ,
+     sizeof (u32) /* value bytes */ );
+  lm->session_by_session_id = hash_create (0, sizeof (uword));
+
+  pi = ip_get_protocol_info (im, IP_PROTOCOL_L2TP);
+  pi->unformat_pg_edit = unformat_pg_l2tp_header;
+
+  /* insure these nodes are included in build */
+  l2tp_encap_init (vm);
+  l2tp_decap_init ();
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (l2tp_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2tp/l2tp.h b/src/vnet/l2tp/l2tp.h
new file mode 100644
index 00000000..e7d2892c
--- /dev/null
+++ b/src/vnet/l2tp/l2tp.h
@@ -0,0 +1,147 @@
+/*
+ * l2tp.h : L2TPv3 tunnel support
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __included_l2tp_h__
+#define __included_l2tp_h__
+
+#include <vlib/vlib.h>
+#include <vnet/ip/ip.h>
+#include <vnet/l2tp/packet.h>
+
+typedef struct
+{
+  /* ip6 addresses */
+  ip6_address_t our_address;
+  ip6_address_t client_address;
+
+  /* l2tpv3 header parameters */
+  u64 local_cookie[2];
+  u64 remote_cookie;
+  u32 local_session_id;
+  u32 remote_session_id;
+
+  /* tunnel interface */
+  u32 hw_if_index;
+  u32 sw_if_index;
+
+  /* fib index used for outgoing encapsulated packets */
+  u32 encap_fib_index;
+
+  u8 l2tp_hdr_size;
+  u8 l2_sublayer_present;
+  u8 cookie_flags;		/* in host byte order */
+
+  u8 admin_up;
+} l2t_session_t;
+
+typedef enum
+{
+  L2T_LOOKUP_SRC_ADDRESS = 0,
+  L2T_LOOKUP_DST_ADDRESS,
+  L2T_LOOKUP_SESSION_ID,
+} ip6_to_l2_lookup_t;
+
+typedef struct
+{
+  /* session pool */
+  l2t_session_t *sessions;
+
+  /* ip6 -> l2 hash tables. Make up your minds, people... */
+  uword *session_by_src_address;
+  uword *session_by_dst_address;
+  uword *session_by_session_id;
+
+  ip6_to_l2_lookup_t lookup_type;
+
+  /* Counters */
+  vlib_combined_counter_main_t counter_main;
+
+  /* vector of free l2tpv3 tunnel interfaces */
+  u32 *free_l2tpv3_tunnel_hw_if_indices;
+
+  /* show device instance by real device instance */
+  u32 *dev_inst_by_real;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+
+} l2t_main_t;
+
+/* Packet trace structure */
+typedef struct
+{
+  int is_user_to_network;
+  u32 session_index;
+  ip6_address_t our_address;
+  ip6_address_t client_address;
+} l2t_trace_t;
+
+l2t_main_t l2t_main;
+extern vlib_node_registration_t l2t_encap_node;
+extern vlib_node_registration_t l2t_decap_node;
+extern vlib_node_registration_t l2t_decap_local_node;
+
+enum
+{
+  SESSION_COUNTER_USER_TO_NETWORK = 0,
+  SESSION_COUNTER_NETWORK_TO_USER,
+};
+
+static inline u32
+session_index_to_counter_index (u32 session_index, u32 counter_id)
+{
+  return ((session_index << 1) + counter_id);
+}
+
+u8 *format_l2t_trace (u8 * s, va_list * args);
+
+typedef struct
+{
+  /* Any per-interface config would go here */
+} ip6_l2tpv3_config_t;
+
+uword unformat_pg_l2tp_header (unformat_input_t * input, va_list * args);
+
+void l2tp_encap_init (vlib_main_t * vm);
+void l2tp_decap_init (void);
+int create_l2tpv3_ipv6_tunnel (l2t_main_t * lm,
+			       ip6_address_t * client_address,
+			       ip6_address_t * our_address,
+			       u32 local_session_id,
+			       u32 remote_session_id,
+			       u64 local_cookie,
+			       u64 remote_cookie,
+			       int l2_sublayer_present,
+			       u32 encap_fib_index, u32 * sw_if_index);
+
+int l2tpv3_set_tunnel_cookies (l2t_main_t * lm,
+			       u32 sw_if_index,
+			       u64 new_local_cookie, u64 new_remote_cookie);
+
+int l2tpv3_interface_enable_disable (vnet_main_t * vnm,
+				     u32 sw_if_index, int enable_disable);
+
+#endif /* __included_l2tp_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2tp/l2tp_api.c b/src/vnet/l2tp/l2tp_api.c
new file mode 100644
index 00000000..88d758c9
--- /dev/null
+++ b/src/vnet/l2tp/l2tp_api.c
@@ -0,0 +1,267 @@
+/*
+ *------------------------------------------------------------------
+ * l2tp_api.c - l2tpv3 api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/l2tp/l2tp.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                             \
+_(L2TPV3_CREATE_TUNNEL, l2tpv3_create_tunnel)                           \
+_(L2TPV3_SET_TUNNEL_COOKIES, l2tpv3_set_tunnel_cookies)                 \
+_(L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable)     \
+_(L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key)                         \
+_(SW_IF_L2TPV3_TUNNEL_DUMP, sw_if_l2tpv3_tunnel_dump)
+
+static void
+send_sw_if_l2tpv3_tunnel_details (vpe_api_main_t * am,
+				  unix_shared_memory_queue_t * q,
+				  l2t_session_t * s,
+				  l2t_main_t * lm, u32 context)
+{
+  vl_api_sw_if_l2tpv3_tunnel_details_t *mp;
+  u8 *if_name = NULL;
+  vnet_sw_interface_t *si = NULL;
+
+  si = vnet_get_hw_sw_interface (lm->vnet_main, s->hw_if_index);
+
+  if_name = format (if_name, "%U",
+		    format_vnet_sw_interface_name, lm->vnet_main, si);
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_IF_L2TPV3_TUNNEL_DETAILS);
+  strncpy ((char *) mp->interface_name,
+	   (char *) if_name, ARRAY_LEN (mp->interface_name) - 1);
+  mp->sw_if_index = ntohl (si->sw_if_index);
+  mp->local_session_id = s->local_session_id;
+  mp->remote_session_id = s->remote_session_id;
+  mp->local_cookie[0] = s->local_cookie[0];
+  mp->local_cookie[1] = s->local_cookie[1];
+  mp->remote_cookie = s->remote_cookie;
+  clib_memcpy (mp->client_address, &s->client_address,
+	       sizeof (s->client_address));
+  clib_memcpy (mp->our_address, &s->our_address, sizeof (s->our_address));
+  mp->l2_sublayer_present = s->l2_sublayer_present;
+  mp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+
+static void
+vl_api_sw_if_l2tpv3_tunnel_dump_t_handler (vl_api_sw_if_l2tpv3_tunnel_dump_t *
+					   mp)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+  l2t_main_t *lm = &l2t_main;
+  unix_shared_memory_queue_t *q;
+  l2t_session_t *session;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  /* *INDENT-OFF* */
+  pool_foreach (session, lm->sessions,
+  ({
+    send_sw_if_l2tpv3_tunnel_details (am, q, session, lm, mp->context);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void vl_api_l2tpv3_create_tunnel_t_handler
+  (vl_api_l2tpv3_create_tunnel_t * mp)
+{
+  vl_api_l2tpv3_create_tunnel_reply_t *rmp;
+  l2t_main_t *lm = &l2t_main;
+  u32 sw_if_index = (u32) ~ 0;
+  int rv;
+
+  if (mp->is_ipv6 != 1)
+    {
+      rv = VNET_API_ERROR_UNIMPLEMENTED;
+      goto out;
+    }
+
+  u32 encap_fib_index;
+
+  if (mp->encap_vrf_id != ~0)
+    {
+      uword *p;
+      ip6_main_t *im = &ip6_main;
+      if (!
+	  (p =
+	   hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id))))
+	{
+	  rv = VNET_API_ERROR_NO_SUCH_FIB;
+	  goto out;
+	}
+      encap_fib_index = p[0];
+    }
+  else
+    {
+      encap_fib_index = ~0;
+    }
+
+  rv = create_l2tpv3_ipv6_tunnel (lm,
+				  (ip6_address_t *) mp->client_address,
+				  (ip6_address_t *) mp->our_address,
+				  ntohl (mp->local_session_id),
+				  ntohl (mp->remote_session_id),
+				  clib_net_to_host_u64 (mp->local_cookie),
+				  clib_net_to_host_u64 (mp->remote_cookie),
+				  mp->l2_sublayer_present,
+				  encap_fib_index, &sw_if_index);
+
+out:
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_L2TPV3_CREATE_TUNNEL_REPLY,
+  ({
+    rmp->sw_if_index = ntohl (sw_if_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void vl_api_l2tpv3_set_tunnel_cookies_t_handler
+  (vl_api_l2tpv3_set_tunnel_cookies_t * mp)
+{
+  vl_api_l2tpv3_set_tunnel_cookies_reply_t *rmp;
+  l2t_main_t *lm = &l2t_main;
+  int rv;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  rv = l2tpv3_set_tunnel_cookies (lm, ntohl (mp->sw_if_index),
+				  clib_net_to_host_u64 (mp->new_local_cookie),
+				  clib_net_to_host_u64
+				  (mp->new_remote_cookie));
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_L2TPV3_SET_TUNNEL_COOKIES_REPLY);
+}
+
+static void vl_api_l2tpv3_interface_enable_disable_t_handler
+  (vl_api_l2tpv3_interface_enable_disable_t * mp)
+{
+  int rv;
+  vnet_main_t *vnm = vnet_get_main ();
+  vl_api_l2tpv3_interface_enable_disable_reply_t *rmp;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  rv = l2tpv3_interface_enable_disable
+    (vnm, ntohl (mp->sw_if_index), mp->enable_disable);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_L2TPV3_INTERFACE_ENABLE_DISABLE_REPLY);
+}
+
+static void vl_api_l2tpv3_set_lookup_key_t_handler
+  (vl_api_l2tpv3_set_lookup_key_t * mp)
+{
+  int rv = 0;
+  l2t_main_t *lm = &l2t_main;
+  vl_api_l2tpv3_set_lookup_key_reply_t *rmp;
+
+  if (mp->key > L2T_LOOKUP_SESSION_ID)
+    {
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto out;
+    }
+
+  lm->lookup_type = mp->key;
+
+out:
+  REPLY_MACRO (VL_API_L2TPV3_SET_LOOKUP_KEY_REPLY);
+}
+
+/*
+ * l2tp_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_l2tp;
+#undef _
+}
+
+static clib_error_t *
+l2tp_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (l2tp_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2tp/packet.h b/src/vnet/l2tp/packet.h
new file mode 100644
index 00000000..66dfea21
--- /dev/null
+++ b/src/vnet/l2tp/packet.h
@@ -0,0 +1,44 @@
+/*
+ * packet.h : L2TPv3 packet header format
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __included_l2tp_packet_h__
+#define __included_l2tp_packet_h__
+
+/*
+ * See RFC4719 for packet format.
+ * Note: the l2_specific_sublayer is present in current Linux l2tpv3
+ * tunnels. It is not present in IOS XR l2tpv3 tunnels.
+ * The Linux implementation is almost certainly wrong.
+ */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+{
+  u32 session_id;
+  u64 cookie; u32
+  l2_specific_sublayer;	/* set to 0 (if present) */
+}) l2tpv3_header_t;
+/* *INDENT-ON* */
+
+#endif /* __included_l2tp_packet_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l2tp/pg.c b/src/vnet/l2tp/pg.c
new file mode 100644
index 00000000..1e523d3b
--- /dev/null
+++ b/src/vnet/l2tp/pg.c
@@ -0,0 +1,106 @@
+/*
+ * pg.c: packet generator for L2TPv3 header
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/l2tp/l2tp.h>
+
+typedef struct
+{
+  pg_edit_t session_id;
+  pg_edit_t cookie;
+} pg_l2tp_header_t;
+
+typedef struct
+{
+  pg_edit_t l2_sublayer;
+} pg_l2tp_header_l2_sublayer_t;
+
+static inline void
+pg_l2tp_header_init (pg_l2tp_header_t * e)
+{
+  pg_edit_init (&e->session_id, l2tpv3_header_t, session_id);
+  pg_edit_init (&e->cookie, l2tpv3_header_t, cookie);
+}
+
+uword
+unformat_pg_l2tp_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  pg_l2tp_header_t *h;
+  u32 group_index, error;
+  vlib_main_t *vm = vlib_get_main ();
+
+  h = pg_create_edit_group (s, sizeof (h[0]),
+			    sizeof (l2tpv3_header_t) - sizeof (u32),
+			    &group_index);
+  pg_l2tp_header_init (h);
+
+  error = 1;
+
+  /* session id and cookie are required */
+  if (!unformat (input, "L2TP: session_id %U cookie %U",
+		 unformat_pg_edit, unformat_pg_number, &h->session_id,
+		 unformat_pg_edit, unformat_pg_number, &h->cookie))
+    {
+      goto done;
+    }
+
+  /* "l2_sublayer <value>" is optional */
+  if (unformat (input, "l2_sublayer"))
+    {
+      pg_l2tp_header_l2_sublayer_t *h2;
+
+      h2 = pg_add_edits (s, sizeof (h2[0]), sizeof (u32), group_index);
+      pg_edit_init (&h2->l2_sublayer, l2tpv3_header_t, l2_specific_sublayer);
+      if (!unformat_user (input, unformat_pg_edit,
+			  unformat_pg_number, &h2->l2_sublayer))
+	{
+	  goto done;
+	}
+    }
+
+  /* Parse an ethernet header if it is present */
+  {
+    pg_node_t *pg_node = 0;
+    vlib_node_t *eth_lookup_node;
+
+    eth_lookup_node = vlib_get_node_by_name (vm, (u8 *) "ethernet-input");
+    ASSERT (eth_lookup_node);
+
+    pg_node = pg_get_node (eth_lookup_node->index);
+
+    if (pg_node && pg_node->unformat_edit
+	&& unformat_user (input, pg_node->unformat_edit, s))
+      ;
+  }
+
+  error = 0;
+
+done:
+  if (error)
+    pg_free_edit_group (s);
+  return error == 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/l3_types.h b/src/vnet/l3_types.h
new file mode 100644
index 00000000..28b0891e
--- /dev/null
+++ b/src/vnet/l3_types.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * l3_types.h: layer 3 packet types
+ *
+ * Copyright (c) 2010 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vnet_l3_types_h
+#define included_vnet_l3_types_h
+
+/* Inherit generic L3 packet types from ethernet. */
+typedef enum
+{
+#define ethernet_type(n,f) VNET_L3_PACKET_TYPE_##f,
+#include <vnet/ethernet/types.def>
+#undef ethernet_type
+} vnet_l3_packet_type_t;
+
+#endif /* included_vnet_l3_types_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lawful-intercept/lawful_intercept.c b/src/vnet/lawful-intercept/lawful_intercept.c
new file mode 100644
index 00000000..ef07a339
--- /dev/null
+++ b/src/vnet/lawful-intercept/lawful_intercept.c
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/lawful-intercept/lawful_intercept.h>
+
+static clib_error_t *
+set_li_command_fn (vlib_main_t * vm,
+		 unformat_input_t * input,
+		 vlib_cli_command_t * cmd)
+{
+  li_main_t * lm = &li_main;
+  ip4_address_t collector;
+  u8 collector_set = 0;
+  ip4_address_t src;
+  u8 src_set = 0;
+  u32 tmp;
+  u16 udp_port = 0;
+  u8 is_add = 1;
+  int i;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "collector %U", unformat_ip4_address, &collector))
+      collector_set = 1;
+    if (unformat (input, "src %U", unformat_ip4_address, &src))
+      src_set = 1;
+    else if (unformat (input, "udp-port %d", &tmp))
+      udp_port = tmp;
+    else if (unformat (input, "del"))
+      is_add = 0;
+    else
+      break;
+  }
+
+  if (collector_set == 0)
+    return clib_error_return (0, "collector must be set...");
+  if (src_set == 0)
+    return clib_error_return (0, "src must be set...");
+  if (udp_port == 0)
+    return clib_error_return (0, "udp-port must be set...");
+
+  if (is_add == 1)
+    {
+      for (i = 0; i < vec_len (lm->collectors); i++)
+        {
+          if (lm->collectors[i].as_u32 == collector.as_u32)
+            {
+              if (lm->ports[i] == udp_port)
+                return clib_error_return 
+                  (0, "collector %U:%d already configured", 
+                   &collector, udp_port);
+              else
+                return clib_error_return
+                  (0, "collector %U already configured with port %d", 
+                   &collector, (int)(lm->ports[i]));
+            }
+        }
+      vec_add1 (lm->collectors, collector);
+      vec_add1 (lm->ports, udp_port);
+      vec_add1 (lm->src_addrs, src);
+      return 0;
+    }
+  else
+    {
+      for (i = 0; i < vec_len (lm->collectors); i++)
+        {
+          if ((lm->collectors[i].as_u32 == collector.as_u32)
+              && lm->ports[i] == udp_port)
+            {
+              vec_delete (lm->collectors, 1, i);
+              vec_delete (lm->ports, 1, i);
+              vec_delete (lm->src_addrs, 1, i);
+              return 0;
+            }
+        }
+      return clib_error_return (0, "collector %U:%d not configured",
+                                &collector, udp_port);
+    }
+  return 0;
+}
+
+VLIB_CLI_COMMAND (set_li_command, static) = {
+    .path = "set li",
+    .short_help = 
+    "set li src <ip4-address> collector <ip4-address> udp-port <nnnn>",
+    .function = set_li_command_fn,
+};
+
+static clib_error_t *
+li_init (vlib_main_t * vm)
+{
+  li_main_t * lm = &li_main;
+
+  lm->vlib_main = vm;
+  lm->vnet_main = vnet_get_main();
+  lm->hit_node_index = li_hit_node.index;
+  return 0;
+}
+
+VLIB_INIT_FUNCTION(li_init);
+
diff --git a/src/vnet/lawful-intercept/lawful_intercept.h b/src/vnet/lawful-intercept/lawful_intercept.h
new file mode 100644
index 00000000..89e699f5
--- /dev/null
+++ b/src/vnet/lawful-intercept/lawful_intercept.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __lawful_intercept_h__
+#define __lawful_intercept_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+
+typedef struct {
+  /* LI collector info */
+  ip4_address_t * src_addrs;
+  ip4_address_t * collectors;
+  u16 * ports;
+
+  /* Hit node index */
+  u32 hit_node_index;
+
+  /* convenience */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+} li_main_t;
+
+li_main_t li_main;
+
+typedef CLIB_PACKED(struct {
+  ip4_header_t ip4;
+  udp_header_t udp;
+}) ip4_udp_header_t;
+
+extern vlib_node_registration_t li_hit_node;
+
+#endif /* __lawful_intercept_h__ */
diff --git a/src/vnet/lawful-intercept/node.c b/src/vnet/lawful-intercept/node.c
new file mode 100644
index 00000000..ea0cd8ef
--- /dev/null
+++ b/src/vnet/lawful-intercept/node.c
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vppinfra/error.h>
+
+#include <vnet/lawful-intercept/lawful_intercept.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+
+vlib_node_registration_t li_hit_node;
+
+typedef struct {
+  u32 next_index;
+} li_hit_trace_t;
+
+/* packet trace format function */
+static u8 * format_li_hit_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  li_hit_trace_t * t = va_arg (*args, li_hit_trace_t *);
+  
+  s = format (s, "LI_HIT: next index %d", t->next_index);
+
+  return s;
+}
+
+vlib_node_registration_t li_hit_node;
+
+#define foreach_li_hit_error                    \
+_(HITS, "LI packets processed")                 \
+_(NO_COLLECTOR, "No collector configured")
+
+typedef enum {
+#define _(sym,str) LI_HIT_ERROR_##sym,
+  foreach_li_hit_error
+#undef _
+  LI_HIT_N_ERROR,
+} li_hit_error_t;
+
+static char * li_hit_error_strings[] = {
+#define _(sym,string) string,
+  foreach_li_hit_error
+#undef _
+};
+
+typedef enum {
+  LI_HIT_NEXT_ETHERNET,
+  LI_HIT_N_NEXT,
+} li_hit_next_t;
+
+static uword
+li_hit_node_fn (vlib_main_t * vm,
+		  vlib_node_runtime_t * node,
+		  vlib_frame_t * frame)
+{
+  u32 n_left_from, * from, * to_next;
+  li_hit_next_t next_index;
+  vlib_frame_t * int_frame = 0;
+  u32 * to_int_next = 0;
+  li_main_t * lm = &li_main;
+  
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  if (PREDICT_FALSE (vec_len (lm->collectors) == 0))
+    {
+      vlib_node_increment_counter (vm, li_hit_node.index, 
+                                   LI_HIT_ERROR_NO_COLLECTOR, 
+                                   n_left_from);
+    }
+  else
+    {
+      /* The intercept frame... */
+      int_frame = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
+      to_int_next = vlib_frame_vector_args (int_frame);
+    }
+  
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+#if 0
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+          u32 next0 = LI_HIT_NEXT_INTERFACE_OUTPUT;
+          u32 next1 = LI_HIT_NEXT_INTERFACE_OUTPUT;
+          u32 sw_if_index0, sw_if_index1;
+          u8 tmp0[6], tmp1[6];
+          ethernet_header_t *en0, *en1;
+          u32 bi0, bi1;
+	  vlib_buffer_t * b0, * b1;
+          
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * p2, * p3;
+            
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+            
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+          /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+          /* $$$$$ Dual loop: process 2 x packets here $$$$$ */
+          ASSERT (b0->current_data == 0);
+          ASSERT (b1->current_data == 0);
+          
+          en0 = vlib_buffer_get_current (b0);
+          en1 = vlib_buffer_get_current (b1);
+
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
+
+          /* Send pkt back out the RX interface */
+          vnet_buffer(b0)->sw_if_index[VLIB_TX] = sw_if_index0;
+          vnet_buffer(b1)->sw_if_index[VLIB_TX] = sw_if_index1;
+
+          /* $$$$$ End of processing 2 x packets $$$$$ */
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)))
+            {
+              if (b0->flags & VLIB_BUFFER_IS_TRACED) 
+                {
+                    li_hit_trace_t *t = 
+                      vlib_add_trace (vm, node, b0, sizeof (*t));
+                    t->sw_if_index = sw_if_index0;
+                    t->next_index = next0;
+                  }
+                if (b1->flags & VLIB_BUFFER_IS_TRACED) 
+                  {
+                    li_hit_trace_t *t = 
+                      vlib_add_trace (vm, node, b1, sizeof (*t));
+                    t->sw_if_index = sw_if_index1;
+                    t->next_index = next1;
+                  }
+              }
+            
+            /* verify speculative enqueues, maybe switch current next frame */
+            vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+                                             to_next, n_left_to_next,
+                                             bi0, bi1, next0, next1);
+        }
+#endif /* $$$ dual-loop off */
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+          u32 bi0;
+	  vlib_buffer_t * b0;
+          vlib_buffer_t * c0;
+          ip4_udp_header_t * iu0;
+          ip4_header_t * ip0;
+          udp_header_t * udp0;
+          u32 next0 = LI_HIT_NEXT_ETHERNET;
+
+          /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+          if (PREDICT_TRUE(to_int_next != 0))
+            {
+              /* Make an intercept copy */
+              c0 = vlib_buffer_copy (vm, b0);
+              
+              vlib_buffer_advance(c0, -sizeof(*iu0));
+
+              iu0 = vlib_buffer_get_current(c0);
+              ip0 = &iu0->ip4;
+              
+              ip0->ip_version_and_header_length = 0x45;
+              ip0->ttl = 254;
+              ip0->protocol = IP_PROTOCOL_UDP;
+              
+              ip0->src_address.as_u32 = lm->src_addrs[0].as_u32;
+              ip0->dst_address.as_u32 = lm->collectors[0].as_u32;
+              ip0->length = vlib_buffer_length_in_chain (vm, c0);
+              ip0->checksum = ip4_header_checksum (ip0);
+              
+              udp0 = &iu0->udp;
+              udp0->src_port = udp0->dst_port = 
+                  clib_host_to_net_u16(lm->ports[0]);
+              udp0->checksum = 0;
+              udp0->length = 
+                  clib_net_to_host_u16 (vlib_buffer_length_in_chain (vm , b0));
+              
+              to_int_next [0] = vlib_get_buffer_index (vm, c0);
+              to_int_next++;
+            }
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              li_hit_trace_t *t = 
+                 vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->next_index = next0;
+            }
+            
+          /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  if (int_frame)
+    {
+      int_frame->n_vectors = frame->n_vectors;
+      vlib_put_frame_to_node (vm, ip4_lookup_node.index, int_frame);
+    }
+
+  vlib_node_increment_counter (vm, li_hit_node.index, 
+                               LI_HIT_ERROR_HITS, frame->n_vectors);
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (li_hit_node) = {
+  .function = li_hit_node_fn,
+  .name = "li-hit",
+  .vector_size = sizeof (u32),
+  .format_trace = format_li_hit_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  
+  .n_errors = ARRAY_LEN(li_hit_error_strings),
+  .error_strings = li_hit_error_strings,
+
+  .n_next_nodes = LI_HIT_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+        [LI_HIT_NEXT_ETHERNET] = "ethernet-input-not-l2",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (li_hit_node, li_hit_node_fn)
+
diff --git a/src/vnet/lisp-cp/control.c b/src/vnet/lisp-cp/control.c
new file mode 100644
index 00000000..de048a41
--- /dev/null
+++ b/src/vnet/lisp-cp/control.c
@@ -0,0 +1,4950 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlibmemory/api.h>
+#include <vnet/lisp-cp/control.h>
+#include <vnet/lisp-cp/packets.h>
+#include <vnet/lisp-cp/lisp_msg_serdes.h>
+#include <vnet/lisp-gpe/lisp_gpe.h>
+#include <vnet/lisp-gpe/lisp_gpe_fwd_entry.h>
+#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_table.h>
+
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+
+typedef struct
+{
+  u8 is_resend;
+  gid_address_t seid;
+  gid_address_t deid;
+  u8 smr_invoked;
+} map_request_args_t;
+
+typedef struct
+{
+  u64 nonce;
+  u8 is_rloc_probe;
+  mapping_t *mappings;
+} map_records_arg_t;
+
+static int
+lisp_add_del_adjacency (lisp_cp_main_t * lcm, gid_address_t * local_eid,
+			gid_address_t * remote_eid, u8 is_add);
+
+u8
+vnet_lisp_get_map_request_mode (void)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  return lcm->map_request_mode;
+}
+
+static u16
+auth_data_len_by_key_id (lisp_key_type_t key_id)
+{
+  switch (key_id)
+    {
+    case HMAC_SHA_1_96:
+      return SHA1_AUTH_DATA_LEN;
+    case HMAC_SHA_256_128:
+      return SHA256_AUTH_DATA_LEN;
+    default:
+      clib_warning ("unsupported key type: %d!", key_id);
+      return (u16) ~ 0;
+    }
+  return (u16) ~ 0;
+}
+
+static const EVP_MD *
+get_encrypt_fcn (lisp_key_type_t key_id)
+{
+  switch (key_id)
+    {
+    case HMAC_SHA_1_96:
+      return EVP_sha1 ();
+    case HMAC_SHA_256_128:
+      return EVP_sha256 ();
+    default:
+      clib_warning ("unsupported encryption key type: %d!", key_id);
+      break;
+    }
+  return 0;
+}
+
+static int
+queue_map_request (gid_address_t * seid, gid_address_t * deid,
+		   u8 smr_invoked, u8 is_resend);
+
+ip_interface_address_t *
+ip_interface_get_first_interface_address (ip_lookup_main_t * lm,
+					  u32 sw_if_index, u8 loop)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_sw_interface_t *swif = vnet_get_sw_interface (vnm, sw_if_index);
+  if (loop && swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
+    sw_if_index = swif->unnumbered_sw_if_index;
+  u32 ia =
+    (vec_len ((lm)->if_address_pool_index_by_sw_if_index) > (sw_if_index)) ?
+    vec_elt ((lm)->if_address_pool_index_by_sw_if_index, (sw_if_index)) :
+    (u32) ~ 0;
+  return pool_elt_at_index ((lm)->if_address_pool, ia);
+}
+
+void *
+ip_interface_get_first_address (ip_lookup_main_t * lm, u32 sw_if_index,
+				u8 version)
+{
+  ip_interface_address_t *ia;
+
+  ia = ip_interface_get_first_interface_address (lm, sw_if_index, 1);
+  if (!ia)
+    return 0;
+  return ip_interface_address_get_address (lm, ia);
+}
+
+int
+ip_interface_get_first_ip_address (lisp_cp_main_t * lcm, u32 sw_if_index,
+				   u8 version, ip_address_t * result)
+{
+  ip_lookup_main_t *lm;
+  void *addr;
+
+  lm = (version == IP4) ? &lcm->im4->lookup_main : &lcm->im6->lookup_main;
+  addr = ip_interface_get_first_address (lm, sw_if_index, version);
+  if (!addr)
+    return 0;
+
+  ip_address_set (result, addr, version);
+  return 1;
+}
+
+/**
+ * convert from a LISP address to a FIB prefix
+ */
+void
+ip_address_to_fib_prefix (const ip_address_t * addr, fib_prefix_t * prefix)
+{
+  if (addr->version == IP4)
+    {
+      prefix->fp_len = 32;
+      prefix->fp_proto = FIB_PROTOCOL_IP4;
+      memset (&prefix->fp_addr.pad, 0, sizeof (prefix->fp_addr.pad));
+      memcpy (&prefix->fp_addr.ip4, &addr->ip, sizeof (prefix->fp_addr.ip4));
+    }
+  else
+    {
+      prefix->fp_len = 128;
+      prefix->fp_proto = FIB_PROTOCOL_IP6;
+      memcpy (&prefix->fp_addr.ip6, &addr->ip, sizeof (prefix->fp_addr.ip6));
+    }
+}
+
+/**
+ * convert from a LISP to a FIB prefix
+ */
+void
+ip_prefix_to_fib_prefix (const ip_prefix_t * ip_prefix,
+			 fib_prefix_t * fib_prefix)
+{
+  ip_address_to_fib_prefix (&ip_prefix->addr, fib_prefix);
+  fib_prefix->fp_len = ip_prefix->len;
+}
+
+/**
+ * Find the sw_if_index of the interface that would be used to egress towards
+ * dst.
+ */
+u32
+ip_fib_get_egress_iface_for_dst (lisp_cp_main_t * lcm, ip_address_t * dst)
+{
+  fib_node_index_t fei;
+  fib_prefix_t prefix;
+
+  ip_address_to_fib_prefix (dst, &prefix);
+
+  fei = fib_table_lookup (0, &prefix);
+
+  return (fib_entry_get_resolving_interface (fei));
+}
+
+/**
+ * Find first IP of the interface that would be used to egress towards dst.
+ * Returns 1 if the address is found 0 otherwise.
+ */
+int
+ip_fib_get_first_egress_ip_for_dst (lisp_cp_main_t * lcm, ip_address_t * dst,
+				    ip_address_t * result)
+{
+  u32 si;
+  ip_lookup_main_t *lm;
+  void *addr = 0;
+  u8 ipver;
+
+  ASSERT (result != 0);
+
+  ipver = ip_addr_version (dst);
+
+  lm = (ipver == IP4) ? &lcm->im4->lookup_main : &lcm->im6->lookup_main;
+  si = ip_fib_get_egress_iface_for_dst (lcm, dst);
+
+  if ((u32) ~ 0 == si)
+    return 0;
+
+  /* find the first ip address */
+  addr = ip_interface_get_first_address (lm, si, ipver);
+  if (0 == addr)
+    return 0;
+
+  ip_address_set (result, addr, ipver);
+  return 1;
+}
+
+static int
+dp_add_del_iface (lisp_cp_main_t * lcm, u32 vni, u8 is_l2, u8 is_add)
+{
+  uword *dp_table;
+
+  if (!is_l2)
+    {
+      dp_table = hash_get (lcm->table_id_by_vni, vni);
+
+      if (!dp_table)
+	{
+	  clib_warning ("vni %d not associated to a vrf!", vni);
+	  return VNET_API_ERROR_INVALID_VALUE;
+	}
+    }
+  else
+    {
+      dp_table = hash_get (lcm->bd_id_by_vni, vni);
+      if (!dp_table)
+	{
+	  clib_warning ("vni %d not associated to a bridge domain!", vni);
+	  return VNET_API_ERROR_INVALID_VALUE;
+	}
+    }
+
+  /* enable/disable data-plane interface */
+  if (is_add)
+    {
+      if (is_l2)
+	lisp_gpe_tenant_l2_iface_add_or_lock (vni, dp_table[0]);
+      else
+	lisp_gpe_tenant_l3_iface_add_or_lock (vni, dp_table[0]);
+    }
+  else
+    {
+      if (is_l2)
+	lisp_gpe_tenant_l2_iface_unlock (vni);
+      else
+	lisp_gpe_tenant_l3_iface_unlock (vni);
+    }
+
+  return 0;
+}
+
+static void
+dp_del_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index)
+{
+  vnet_lisp_gpe_add_del_fwd_entry_args_t _a, *a = &_a;
+  fwd_entry_t *fe = 0;
+  uword *feip = 0;
+  memset (a, 0, sizeof (*a));
+
+  feip = hash_get (lcm->fwd_entry_by_mapping_index, dst_map_index);
+  if (!feip)
+    return;
+
+  fe = pool_elt_at_index (lcm->fwd_entry_pool, feip[0]);
+
+  /* delete dp fwd entry */
+  u32 sw_if_index;
+  a->is_add = 0;
+  a->locator_pairs = fe->locator_pairs;
+  a->vni = gid_address_vni (&fe->reid);
+  gid_address_copy (&a->rmt_eid, &fe->reid);
+  if (fe->is_src_dst)
+    gid_address_copy (&a->lcl_eid, &fe->leid);
+
+  vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index);
+
+  /* delete entry in fwd table */
+  hash_unset (lcm->fwd_entry_by_mapping_index, dst_map_index);
+  vec_free (fe->locator_pairs);
+  pool_put (lcm->fwd_entry_pool, fe);
+}
+
+/**
+ * Finds first remote locator with best (lowest) priority that has a local
+ * peer locator with an underlying route to it.
+ *
+ */
+static u32
+get_locator_pairs (lisp_cp_main_t * lcm, mapping_t * lcl_map,
+		   mapping_t * rmt_map, locator_pair_t ** locator_pairs)
+{
+  u32 i, limitp = 0, li, found = 0, esi;
+  locator_set_t *rmt_ls, *lcl_ls;
+  ip_address_t _lcl_addr, *lcl_addr = &_lcl_addr;
+  locator_t *lp, *rmt = 0;
+  uword *checked = 0;
+  locator_pair_t pair;
+
+  rmt_ls =
+    pool_elt_at_index (lcm->locator_set_pool, rmt_map->locator_set_index);
+  lcl_ls =
+    pool_elt_at_index (lcm->locator_set_pool, lcl_map->locator_set_index);
+
+  if (!rmt_ls || vec_len (rmt_ls->locator_indices) == 0)
+    return 0;
+
+  while (1)
+    {
+      rmt = 0;
+
+      /* find unvisited remote locator with best priority */
+      for (i = 0; i < vec_len (rmt_ls->locator_indices); i++)
+	{
+	  if (0 != hash_get (checked, i))
+	    continue;
+
+	  li = vec_elt (rmt_ls->locator_indices, i);
+	  lp = pool_elt_at_index (lcm->locator_pool, li);
+
+	  /* we don't support non-IP locators for now */
+	  if (gid_address_type (&lp->address) != GID_ADDR_IP_PREFIX)
+	    continue;
+
+	  if ((found && lp->priority == limitp)
+	      || (!found && lp->priority >= limitp))
+	    {
+	      rmt = lp;
+
+	      /* don't search for locators with lower priority and don't
+	       * check this locator again*/
+	      limitp = lp->priority;
+	      hash_set (checked, i, 1);
+	      break;
+	    }
+	}
+      /* check if a local locator with a route to remote locator exists */
+      if (rmt != 0)
+	{
+	  /* find egress sw_if_index for rmt locator */
+	  esi =
+	    ip_fib_get_egress_iface_for_dst (lcm,
+					     &gid_address_ip (&rmt->address));
+	  if ((u32) ~ 0 == esi)
+	    continue;
+
+	  for (i = 0; i < vec_len (lcl_ls->locator_indices); i++)
+	    {
+	      li = vec_elt (lcl_ls->locator_indices, i);
+	      locator_t *sl = pool_elt_at_index (lcm->locator_pool, li);
+
+	      /* found local locator with the needed sw_if_index */
+	      if (sl->sw_if_index == esi)
+		{
+		  /* and it has an address */
+		  if (0 == ip_interface_get_first_ip_address (lcm,
+							      sl->sw_if_index,
+							      gid_address_ip_version
+							      (&rmt->address),
+							      lcl_addr))
+		    continue;
+
+		  memset (&pair, 0, sizeof (pair));
+		  ip_address_copy (&pair.rmt_loc,
+				   &gid_address_ip (&rmt->address));
+		  ip_address_copy (&pair.lcl_loc, lcl_addr);
+		  pair.weight = rmt->weight;
+		  pair.priority = rmt->priority;
+		  vec_add1 (locator_pairs[0], pair);
+		  found = 1;
+		}
+	    }
+	}
+      else
+	break;
+    }
+
+  hash_free (checked);
+  return found;
+}
+
+static void
+gid_address_sd_to_flat (gid_address_t * dst, gid_address_t * src,
+			fid_address_t * fid)
+{
+  ASSERT (GID_ADDR_SRC_DST == gid_address_type (src));
+
+  dst[0] = src[0];
+
+  switch (fid_addr_type (fid))
+    {
+    case FID_ADDR_IP_PREF:
+      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
+      gid_address_ippref (dst) = fid_addr_ippref (fid);
+      break;
+    case FID_ADDR_MAC:
+      gid_address_type (dst) = GID_ADDR_MAC;
+      mac_copy (gid_address_mac (dst), fid_addr_mac (fid));
+      break;
+    default:
+      clib_warning ("Unsupported fid type %d!", fid_addr_type (fid));
+      break;
+    }
+}
+
+u8
+vnet_lisp_map_register_state_get (void)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  return lcm->map_registering;
+}
+
+u8
+vnet_lisp_rloc_probe_state_get (void)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  return lcm->rloc_probing;
+}
+
+static void
+dp_add_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index)
+{
+  vnet_lisp_gpe_add_del_fwd_entry_args_t _a, *a = &_a;
+  mapping_t *src_map, *dst_map;
+  u32 sw_if_index;
+  uword *feip = 0, *dpid;
+  fwd_entry_t *fe;
+  u8 type, is_src_dst = 0;
+
+  memset (a, 0, sizeof (*a));
+
+  /* remove entry if it already exists */
+  feip = hash_get (lcm->fwd_entry_by_mapping_index, dst_map_index);
+  if (feip)
+    dp_del_fwd_entry (lcm, src_map_index, dst_map_index);
+
+  if (lcm->lisp_pitr)
+    src_map = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
+  else
+    src_map = pool_elt_at_index (lcm->mapping_pool, src_map_index);
+  dst_map = pool_elt_at_index (lcm->mapping_pool, dst_map_index);
+
+  /* insert data plane forwarding entry */
+  a->is_add = 1;
+
+  if (MR_MODE_SRC_DST == lcm->map_request_mode)
+    {
+      if (GID_ADDR_SRC_DST == gid_address_type (&dst_map->eid))
+	{
+	  gid_address_sd_to_flat (&a->rmt_eid, &dst_map->eid,
+				  &gid_address_sd_dst (&dst_map->eid));
+	  gid_address_sd_to_flat (&a->lcl_eid, &dst_map->eid,
+				  &gid_address_sd_src (&dst_map->eid));
+	}
+      else
+	{
+	  gid_address_copy (&a->rmt_eid, &dst_map->eid);
+	  gid_address_copy (&a->lcl_eid, &src_map->eid);
+	}
+      is_src_dst = 1;
+    }
+  else
+    gid_address_copy (&a->rmt_eid, &dst_map->eid);
+
+  a->vni = gid_address_vni (&a->rmt_eid);
+
+  /* get vrf or bd_index associated to vni */
+  type = gid_address_type (&a->rmt_eid);
+  if (GID_ADDR_IP_PREFIX == type)
+    {
+      dpid = hash_get (lcm->table_id_by_vni, a->vni);
+      if (!dpid)
+	{
+	  clib_warning ("vni %d not associated to a vrf!", a->vni);
+	  return;
+	}
+      a->table_id = dpid[0];
+    }
+  else if (GID_ADDR_MAC == type)
+    {
+      dpid = hash_get (lcm->bd_id_by_vni, a->vni);
+      if (!dpid)
+	{
+	  clib_warning ("vni %d not associated to a bridge domain !", a->vni);
+	  return;
+	}
+      a->bd_id = dpid[0];
+    }
+
+  /* find best locator pair that 1) verifies LISP policy 2) are connected */
+  if (0 == get_locator_pairs (lcm, src_map, dst_map, &a->locator_pairs))
+    {
+      /* negative entry */
+      a->is_negative = 1;
+      a->action = dst_map->action;
+    }
+
+  /* TODO remove */
+  u8 ipver = ip_prefix_version (&gid_address_ippref (&a->rmt_eid));
+  a->decap_next_index = (ipver == IP4) ?
+    LISP_GPE_INPUT_NEXT_IP4_INPUT : LISP_GPE_INPUT_NEXT_IP6_INPUT;
+
+  vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index);
+
+  /* add tunnel to fwd entry table XXX check return value from DP insertion */
+  pool_get (lcm->fwd_entry_pool, fe);
+  fe->locator_pairs = a->locator_pairs;
+  gid_address_copy (&fe->reid, &a->rmt_eid);
+  gid_address_copy (&fe->leid, &src_map->eid);
+  fe->is_src_dst = is_src_dst;
+  hash_set (lcm->fwd_entry_by_mapping_index, dst_map_index,
+	    fe - lcm->fwd_entry_pool);
+}
+
+/**
+ * Returns vector of adjacencies.
+ *
+ * The caller must free the vector returned by this function.
+ *
+ * @param vni virtual network identifier
+ * @return vector of adjacencies
+ */
+lisp_adjacency_t *
+vnet_lisp_adjacencies_get_by_vni (u32 vni)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  fwd_entry_t *fwd;
+  lisp_adjacency_t *adjs = 0, adj;
+
+  /* *INDENT-OFF* */
+  pool_foreach(fwd, lcm->fwd_entry_pool,
+  ({
+    if (gid_address_vni (&fwd->reid) != vni)
+      continue;
+
+    gid_address_copy (&adj.reid, &fwd->reid);
+    gid_address_copy (&adj.leid, &fwd->leid);
+    vec_add1 (adjs, adj);
+  }));
+  /* *INDENT-ON* */
+
+  return adjs;
+}
+
+static clib_error_t *
+lisp_show_adjacencies_command_fn (vlib_main_t * vm,
+				  unformat_input_t * input,
+				  vlib_cli_command_t * cmd)
+{
+  lisp_adjacency_t *adjs, *adj;
+  vlib_cli_output (vm, "%s %40s\n", "leid", "reid");
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 vni = ~0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "vni %d", &vni))
+	;
+      else
+	{
+	  vlib_cli_output (vm, "parse error: '%U'",
+			   format_unformat_error, line_input);
+	  return 0;
+	}
+    }
+
+  if (~0 == vni)
+    {
+      vlib_cli_output (vm, "error: no vni specified!");
+      return 0;
+    }
+
+  adjs = vnet_lisp_adjacencies_get_by_vni (vni);
+
+  vec_foreach (adj, adjs)
+  {
+    vlib_cli_output (vm, "%U %40U\n", format_gid_address, &adj->leid,
+		     format_gid_address, &adj->reid);
+  }
+  vec_free (adjs);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_adjacencies_command) = {
+    .path = "show lisp adjacencies",
+    .short_help = "show lisp adjacencies",
+    .function = lisp_show_adjacencies_command_fn,
+};
+/* *INDENT-ON* */
+
+static lisp_msmr_t *
+get_map_server (ip_address_t * a)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  lisp_msmr_t *m;
+
+  vec_foreach (m, lcm->map_servers)
+  {
+    if (!ip_address_cmp (&m->address, a))
+      {
+	return m;
+      }
+  }
+  return 0;
+}
+
+static lisp_msmr_t *
+get_map_resolver (ip_address_t * a)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  lisp_msmr_t *m;
+
+  vec_foreach (m, lcm->map_resolvers)
+  {
+    if (!ip_address_cmp (&m->address, a))
+      {
+	return m;
+      }
+  }
+  return 0;
+}
+
+int
+vnet_lisp_add_del_map_server (ip_address_t * addr, u8 is_add)
+{
+  u32 i;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  lisp_msmr_t _ms, *ms = &_ms;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  if (is_add)
+    {
+      if (get_map_server (addr))
+	{
+	  clib_warning ("map-server %U already exists!", format_ip_address,
+			addr);
+	  return -1;
+	}
+
+      memset (ms, 0, sizeof (*ms));
+      ip_address_copy (&ms->address, addr);
+      vec_add1 (lcm->map_servers, ms[0]);
+    }
+  else
+    {
+      for (i = 0; i < vec_len (lcm->map_servers); i++)
+	{
+	  ms = vec_elt_at_index (lcm->map_servers, i);
+	  if (!ip_address_cmp (&ms->address, addr))
+	    {
+	      vec_del1 (lcm->map_servers, i);
+	      break;
+	    }
+	}
+    }
+
+  return 0;
+}
+
+static clib_error_t *
+lisp_add_del_map_server_command_fn (vlib_main_t * vm,
+				    unformat_input_t * input,
+				    vlib_cli_command_t * cmd)
+{
+  int rv = 0;
+  u8 is_add = 1, ip_set = 0;
+  ip_address_t ip;
+  unformat_input_t _line_input, *line_input = &_line_input;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "add"))
+	is_add = 1;
+      else if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "%U", unformat_ip_address, &ip))
+	ip_set = 1;
+      else
+	{
+	  vlib_cli_output (vm, "parse error: '%U'",
+			   format_unformat_error, line_input);
+	  return 0;
+	}
+    }
+
+  if (!ip_set)
+    {
+      vlib_cli_output (vm, "map-server ip address not set!");
+      return 0;
+    }
+
+  rv = vnet_lisp_add_del_map_server (&ip, is_add);
+  if (!rv)
+    vlib_cli_output (vm, "failed to %s map-server!",
+		     is_add ? "add" : "delete");
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_add_del_map_server_command) = {
+    .path = "lisp map-server",
+    .short_help = "lisp map-server add|del <ip>",
+    .function = lisp_add_del_map_server_command_fn,
+};
+/* *INDENT-ON* */
+
+/**
+ * Add/remove mapping to/from map-cache. Overwriting not allowed.
+ */
+int
+vnet_lisp_map_cache_add_del (vnet_lisp_add_del_mapping_args_t * a,
+			     u32 * map_index_result)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  u32 mi, *map_indexp, map_index, i;
+  mapping_t *m, *old_map;
+  u32 **eid_indexes;
+
+  mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &a->eid);
+  old_map = mi != ~0 ? pool_elt_at_index (lcm->mapping_pool, mi) : 0;
+  if (a->is_add)
+    {
+      /* TODO check if overwriting and take appropriate actions */
+      if (mi != GID_LOOKUP_MISS && !gid_address_cmp (&old_map->eid, &a->eid))
+	{
+	  clib_warning ("eid %U found in the eid-table", format_gid_address,
+			&a->eid);
+	  return VNET_API_ERROR_VALUE_EXIST;
+	}
+
+      pool_get (lcm->mapping_pool, m);
+      gid_address_copy (&m->eid, &a->eid);
+      m->locator_set_index = a->locator_set_index;
+      m->ttl = a->ttl;
+      m->action = a->action;
+      m->local = a->local;
+      m->is_static = a->is_static;
+      m->key = vec_dup (a->key);
+      m->key_id = a->key_id;
+
+      map_index = m - lcm->mapping_pool;
+      gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->eid, map_index,
+			      1);
+
+      if (pool_is_free_index (lcm->locator_set_pool, a->locator_set_index))
+	{
+	  clib_warning ("Locator set with index %d doesn't exist",
+			a->locator_set_index);
+	  return VNET_API_ERROR_INVALID_VALUE;
+	}
+
+      /* add eid to list of eids supported by locator-set */
+      vec_validate (lcm->locator_set_to_eids, a->locator_set_index);
+      eid_indexes = vec_elt_at_index (lcm->locator_set_to_eids,
+				      a->locator_set_index);
+      vec_add1 (eid_indexes[0], map_index);
+
+      if (a->local)
+	{
+	  /* mark as local */
+	  vec_add1 (lcm->local_mappings_indexes, map_index);
+	}
+      map_index_result[0] = map_index;
+    }
+  else
+    {
+      if (mi == GID_LOOKUP_MISS)
+	{
+	  clib_warning ("eid %U not found in the eid-table",
+			format_gid_address, &a->eid);
+	  return VNET_API_ERROR_INVALID_VALUE;
+	}
+
+      /* clear locator-set to eids binding */
+      eid_indexes = vec_elt_at_index (lcm->locator_set_to_eids,
+				      a->locator_set_index);
+      for (i = 0; i < vec_len (eid_indexes[0]); i++)
+	{
+	  map_indexp = vec_elt_at_index (eid_indexes[0], i);
+	  if (map_indexp[0] == mi)
+	    break;
+	}
+      vec_del1 (eid_indexes[0], i);
+
+      /* remove local mark if needed */
+      m = pool_elt_at_index (lcm->mapping_pool, mi);
+      if (m->local)
+	{
+	  u32 k, *lm_indexp;
+	  for (k = 0; k < vec_len (lcm->local_mappings_indexes); k++)
+	    {
+	      lm_indexp = vec_elt_at_index (lcm->local_mappings_indexes, k);
+	      if (lm_indexp[0] == mi)
+		break;
+	    }
+	  vec_del1 (lcm->local_mappings_indexes, k);
+	}
+
+      /* remove mapping from dictionary */
+      gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->eid, 0, 0);
+      gid_address_free (&m->eid);
+      pool_put_index (lcm->mapping_pool, mi);
+    }
+
+  return 0;
+}
+
+/**
+ *  Add/update/delete mapping to/in/from map-cache.
+ */
+int
+vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a,
+				 u32 * map_index_result)
+{
+  uword *dp_table = 0;
+  u32 vni;
+  u8 type;
+
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  vni = gid_address_vni (&a->eid);
+  type = gid_address_type (&a->eid);
+  if (GID_ADDR_IP_PREFIX == type)
+    dp_table = hash_get (lcm->table_id_by_vni, vni);
+  else if (GID_ADDR_MAC == type)
+    dp_table = hash_get (lcm->bd_id_by_vni, vni);
+
+  if (!dp_table)
+    {
+      clib_warning ("vni %d not associated to a %s!", vni,
+		    GID_ADDR_IP_PREFIX == type ? "vrf" : "bd");
+      return VNET_API_ERROR_INVALID_VALUE;
+    }
+
+  /* store/remove mapping from map-cache */
+  return vnet_lisp_map_cache_add_del (a, map_index_result);
+}
+
+static clib_error_t *
+lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input,
+				   vlib_cli_command_t * cmd)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1;
+  gid_address_t eid;
+  gid_address_t *eids = 0;
+  clib_error_t *error = 0;
+  u8 *locator_set_name = 0;
+  u32 locator_set_index = 0, map_index = 0;
+  uword *p;
+  vnet_lisp_add_del_mapping_args_t _a, *a = &_a;
+  int rv = 0;
+  u32 vni = 0;
+  u8 *key = 0;
+  u32 key_id = 0;
+
+  memset (&eid, 0, sizeof (eid));
+  memset (a, 0, sizeof (*a));
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "add"))
+	is_add = 1;
+      else if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "eid %U", unformat_gid_address, &eid))
+	;
+      else if (unformat (line_input, "vni %d", &vni))
+	gid_address_vni (&eid) = vni;
+      else if (unformat (line_input, "secret-key %_%v%_", &key))
+	;
+      else if (unformat (line_input, "key-id %U", unformat_hmac_key_id,
+			 &key_id))
+	;
+      else if (unformat (line_input, "locator-set %_%v%_", &locator_set_name))
+	{
+	  p = hash_get_mem (lcm->locator_set_index_by_name, locator_set_name);
+	  if (!p)
+	    {
+	      error = clib_error_return (0, "locator-set %s doesn't exist",
+					 locator_set_name);
+	      goto done;
+	    }
+	  locator_set_index = p[0];
+	}
+      else
+	{
+	  error = unformat_parse_error (line_input);
+	  goto done;
+	}
+    }
+  /* XXX treat batch configuration */
+
+  if (GID_ADDR_SRC_DST == gid_address_type (&eid))
+    {
+      error =
+	clib_error_return (0, "src/dst is not supported for local EIDs!");
+      goto done;
+    }
+
+  if (key && (0 == key_id))
+    {
+      vlib_cli_output (vm, "invalid key_id!");
+      return 0;
+    }
+
+  gid_address_copy (&a->eid, &eid);
+  a->is_add = is_add;
+  a->locator_set_index = locator_set_index;
+  a->local = 1;
+  a->key = key;
+  a->key_id = key_id;
+
+  rv = vnet_lisp_add_del_local_mapping (a, &map_index);
+  if (0 != rv)
+    {
+      error = clib_error_return (0, "failed to %s local mapping!",
+				 is_add ? "add" : "delete");
+    }
+done:
+  vec_free (eids);
+  if (locator_set_name)
+    vec_free (locator_set_name);
+  gid_address_free (&a->eid);
+  vec_free (a->key);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_add_del_local_eid_command) = {
+    .path = "lisp eid-table",
+    .short_help = "lisp eid-table add/del [vni <vni>] eid <eid> "
+      "locator-set <locator-set> [key <secret-key> key-id sha1|sha256 ]",
+    .function = lisp_add_del_local_eid_command_fn,
+};
+/* *INDENT-ON* */
+
+int
+vnet_lisp_eid_table_map (u32 vni, u32 dp_id, u8 is_l2, u8 is_add)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  uword *dp_idp, *vnip, **dp_table_by_vni, **vni_by_dp_table;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return -1;
+    }
+
+  dp_table_by_vni = is_l2 ? &lcm->bd_id_by_vni : &lcm->table_id_by_vni;
+  vni_by_dp_table = is_l2 ? &lcm->vni_by_bd_id : &lcm->vni_by_table_id;
+
+  if (!is_l2 && (vni == 0 || dp_id == 0))
+    {
+      clib_warning ("can't add/del default vni-vrf mapping!");
+      return -1;
+    }
+
+  dp_idp = hash_get (dp_table_by_vni[0], vni);
+  vnip = hash_get (vni_by_dp_table[0], dp_id);
+
+  if (is_add)
+    {
+      if (dp_idp || vnip)
+	{
+	  clib_warning ("vni %d or vrf %d already used in vrf/vni "
+			"mapping!", vni, dp_id);
+	  return -1;
+	}
+      hash_set (dp_table_by_vni[0], vni, dp_id);
+      hash_set (vni_by_dp_table[0], dp_id, vni);
+
+      /* create dp iface */
+      dp_add_del_iface (lcm, vni, is_l2, 1);
+    }
+  else
+    {
+      if (!dp_idp || !vnip)
+	{
+	  clib_warning ("vni %d or vrf %d not used in any vrf/vni! "
+			"mapping!", vni, dp_id);
+	  return -1;
+	}
+      hash_unset (dp_table_by_vni[0], vni);
+      hash_unset (vni_by_dp_table[0], dp_id);
+
+      /* remove dp iface */
+      dp_add_del_iface (lcm, vni, is_l2, 0);
+    }
+  return 0;
+
+}
+
+static clib_error_t *
+lisp_eid_table_map_command_fn (vlib_main_t * vm,
+			       unformat_input_t * input,
+			       vlib_cli_command_t * cmd)
+{
+  u8 is_add = 1, is_l2 = 0;
+  u32 vni = 0, dp_id = 0;
+  unformat_input_t _line_input, *line_input = &_line_input;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "vni %d", &vni))
+	;
+      else if (unformat (line_input, "vrf %d", &dp_id))
+	;
+      else if (unformat (line_input, "bd %d", &dp_id))
+	is_l2 = 1;
+      else
+	{
+	  return unformat_parse_error (line_input);
+	}
+    }
+  vnet_lisp_eid_table_map (vni, dp_id, is_l2, is_add);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_eid_table_map_command) = {
+    .path = "lisp eid-table map",
+    .short_help = "lisp eid-table map [del] vni <vni> vrf <vrf> | bd <bdi>",
+    .function = lisp_eid_table_map_command_fn,
+};
+/* *INDENT-ON* */
+
+/* return 0 if the two locator sets are identical 1 otherwise */
+static u8
+compare_locators (lisp_cp_main_t * lcm, u32 * old_ls_indexes,
+		  locator_t * new_locators)
+{
+  u32 i, old_li;
+  locator_t *old_loc, *new_loc;
+
+  if (vec_len (old_ls_indexes) != vec_len (new_locators))
+    return 1;
+
+  for (i = 0; i < vec_len (new_locators); i++)
+    {
+      old_li = vec_elt (old_ls_indexes, i);
+      old_loc = pool_elt_at_index (lcm->locator_pool, old_li);
+
+      new_loc = vec_elt_at_index (new_locators, i);
+
+      if (locator_cmp (old_loc, new_loc))
+	return 1;
+    }
+  return 0;
+}
+
+typedef struct
+{
+  u8 is_negative;
+  void *lcm;
+  gid_address_t *eids_to_be_deleted;
+} remove_mapping_args_t;
+
+/**
+ * Callback invoked when a sub-prefix is found
+ */
+static void
+remove_mapping_if_needed (u32 mi, void *arg)
+{
+  u8 delete = 0;
+  remove_mapping_args_t *a = arg;
+  lisp_cp_main_t *lcm = a->lcm;
+  mapping_t *m;
+  locator_set_t *ls;
+
+  m = pool_elt_at_index (lcm->mapping_pool, mi);
+  if (!m)
+    return;
+
+  ls = pool_elt_at_index (lcm->locator_set_pool, m->locator_set_index);
+
+  if (a->is_negative)
+    {
+      if (0 != vec_len (ls->locator_indices))
+	delete = 1;
+    }
+  else
+    {
+      if (0 == vec_len (ls->locator_indices))
+	delete = 1;
+    }
+
+  if (delete)
+    vec_add1 (a->eids_to_be_deleted, m->eid);
+}
+
+/**
+ * This function searches map cache and looks for IP prefixes that are subset
+ * of the provided one. If such prefix is found depending on 'is_negative'
+ * it does follows:
+ *
+ * 1) if is_negative is true and found prefix points to positive mapping,
+ *    then the mapping is removed
+ * 2) if is_negative is false and found prefix points to negative mapping,
+ *    then the mapping is removed
+ */
+static void
+remove_overlapping_sub_prefixes (lisp_cp_main_t * lcm, gid_address_t * eid,
+				 u8 is_negative)
+{
+  gid_address_t *e;
+  remove_mapping_args_t a;
+  memset (&a, 0, sizeof (a));
+
+  /* do this only in src/dst mode ... */
+  if (MR_MODE_SRC_DST != lcm->map_request_mode)
+    return;
+
+  /* ... and  only for IP prefix */
+  if (GID_ADDR_SRC_DST != gid_address_type (eid)
+      || (FID_ADDR_IP_PREF != gid_address_sd_dst_type (eid)))
+    return;
+
+  a.is_negative = is_negative;
+  a.lcm = lcm;
+
+  gid_dict_foreach_subprefix (&lcm->mapping_index_by_gid, eid,
+			      remove_mapping_if_needed, &a);
+
+  vec_foreach (e, a.eids_to_be_deleted)
+  {
+    lisp_add_del_adjacency (lcm, 0, e, 0 /* is_add */ );
+    vnet_lisp_add_del_mapping (e, 0, 0, 0, 0, 0 /* is add */ , 0, 0);
+  }
+
+  vec_free (a.eids_to_be_deleted);
+}
+
+static void
+mapping_delete_timer (lisp_cp_main_t * lcm, u32 mi)
+{
+  timing_wheel_delete (&lcm->wheel, mi);
+}
+
+/**
+ * Adds/removes/updates mapping. Does not program forwarding.
+ *
+ * @param eid end-host identifier
+ * @param rlocs vector of remote locators
+ * @param action action for negative map-reply
+ * @param is_add add mapping if non-zero, delete otherwise
+ * @param res_map_index the map-index that was created/updated/removed. It is
+ *                      set to ~0 if no action is taken.
+ * @param is_static used for distinguishing between statically learned
+                    remote mappings and mappings obtained from MR
+ * @return return code
+ */
+int
+vnet_lisp_add_del_mapping (gid_address_t * eid, locator_t * rlocs, u8 action,
+			   u8 authoritative, u32 ttl, u8 is_add, u8 is_static,
+			   u32 * res_map_index)
+{
+  vnet_lisp_add_del_mapping_args_t _m_args, *m_args = &_m_args;
+  vnet_lisp_add_del_locator_set_args_t _ls_args, *ls_args = &_ls_args;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  u32 mi, ls_index = 0, dst_map_index;
+  mapping_t *old_map;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  if (res_map_index)
+    res_map_index[0] = ~0;
+
+  memset (m_args, 0, sizeof (m_args[0]));
+  memset (ls_args, 0, sizeof (ls_args[0]));
+
+  ls_args->locators = rlocs;
+
+  mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, eid);
+  old_map = ((u32) ~ 0 != mi) ? pool_elt_at_index (lcm->mapping_pool, mi) : 0;
+
+  if (is_add)
+    {
+      /* overwrite: if mapping already exists, decide if locators should be
+       * updated and be done */
+      if (old_map && gid_address_cmp (&old_map->eid, eid) == 0)
+	{
+	  if (!is_static && (old_map->is_static || old_map->local))
+	    {
+	      /* do not overwrite local or static remote mappings */
+	      clib_warning ("mapping %U rejected due to collision with local "
+			    "or static remote mapping!", format_gid_address,
+			    eid);
+	      return 0;
+	    }
+
+	  locator_set_t *old_ls;
+
+	  /* update mapping attributes */
+	  old_map->action = action;
+	  old_map->authoritative = authoritative;
+	  old_map->ttl = ttl;
+
+	  old_ls = pool_elt_at_index (lcm->locator_set_pool,
+				      old_map->locator_set_index);
+	  if (compare_locators (lcm, old_ls->locator_indices,
+				ls_args->locators))
+	    {
+	      /* set locator-set index to overwrite */
+	      ls_args->is_add = 1;
+	      ls_args->index = old_map->locator_set_index;
+	      vnet_lisp_add_del_locator_set (ls_args, 0);
+	      if (res_map_index)
+		res_map_index[0] = mi;
+	    }
+	}
+      /* new mapping */
+      else
+	{
+	  remove_overlapping_sub_prefixes (lcm, eid, 0 == ls_args->locators);
+
+	  ls_args->is_add = 1;
+	  ls_args->index = ~0;
+
+	  vnet_lisp_add_del_locator_set (ls_args, &ls_index);
+
+	  /* add mapping */
+	  gid_address_copy (&m_args->eid, eid);
+	  m_args->is_add = 1;
+	  m_args->action = action;
+	  m_args->locator_set_index = ls_index;
+	  m_args->is_static = is_static;
+	  m_args->ttl = ttl;
+	  vnet_lisp_map_cache_add_del (m_args, &dst_map_index);
+
+	  if (res_map_index)
+	    res_map_index[0] = dst_map_index;
+	}
+    }
+  else
+    {
+      if (old_map == 0 || gid_address_cmp (&old_map->eid, eid) != 0)
+	{
+	  clib_warning ("cannot delete mapping for eid %U",
+			format_gid_address, eid);
+	  return -1;
+	}
+
+      m_args->is_add = 0;
+      gid_address_copy (&m_args->eid, eid);
+      m_args->locator_set_index = old_map->locator_set_index;
+
+      /* delete mapping associated from map-cache */
+      vnet_lisp_map_cache_add_del (m_args, 0);
+
+      ls_args->is_add = 0;
+      ls_args->index = old_map->locator_set_index;
+      /* delete locator set */
+      vnet_lisp_add_del_locator_set (ls_args, 0);
+
+      /* delete timer associated to the mapping if any */
+      if (old_map->timer_set)
+	mapping_delete_timer (lcm, mi);
+
+      /* return old mapping index */
+      if (res_map_index)
+	res_map_index[0] = mi;
+    }
+
+  /* success */
+  return 0;
+}
+
+int
+vnet_lisp_clear_all_remote_adjacencies (void)
+{
+  int rv = 0;
+  u32 mi, *map_indices = 0, *map_indexp;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  vnet_lisp_add_del_mapping_args_t _dm_args, *dm_args = &_dm_args;
+  vnet_lisp_add_del_locator_set_args_t _ls, *ls = &_ls;
+
+  /* *INDENT-OFF* */
+  pool_foreach_index (mi, lcm->mapping_pool,
+  ({
+    vec_add1 (map_indices, mi);
+  }));
+  /* *INDENT-ON* */
+
+  vec_foreach (map_indexp, map_indices)
+  {
+    mapping_t *map = pool_elt_at_index (lcm->mapping_pool, map_indexp[0]);
+    if (!map->local)
+      {
+	dp_del_fwd_entry (lcm, 0, map_indexp[0]);
+
+	dm_args->is_add = 0;
+	gid_address_copy (&dm_args->eid, &map->eid);
+	dm_args->locator_set_index = map->locator_set_index;
+
+	/* delete mapping associated to fwd entry */
+	vnet_lisp_map_cache_add_del (dm_args, 0);
+
+	ls->is_add = 0;
+	ls->local = 0;
+	ls->index = map->locator_set_index;
+	/* delete locator set */
+	rv = vnet_lisp_add_del_locator_set (ls, 0);
+	if (rv != 0)
+	  goto cleanup;
+      }
+  }
+
+cleanup:
+  if (map_indices)
+    vec_free (map_indices);
+  return rv;
+}
+
+/**
+ * Adds adjacency or removes forwarding entry associated to remote mapping.
+ * Note that adjacencies are not stored, they only result in forwarding entries
+ * being created.
+ */
+static int
+lisp_add_del_adjacency (lisp_cp_main_t * lcm, gid_address_t * local_eid,
+			gid_address_t * remote_eid, u8 is_add)
+{
+  u32 local_mi, remote_mi = ~0;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  remote_mi = gid_dictionary_sd_lookup (&lcm->mapping_index_by_gid,
+					remote_eid, local_eid);
+  if (GID_LOOKUP_MISS == remote_mi)
+    {
+      clib_warning ("Remote eid %U not found. Cannot add adjacency!",
+		    format_gid_address, remote_eid);
+
+      return -1;
+    }
+
+  if (is_add)
+    {
+      /* TODO 1) check if src/dst 2) once we have src/dst working, use it in
+       * delete*/
+
+      /* check if source eid has an associated mapping. If pitr mode is on,
+       * just use the pitr's mapping */
+      local_mi = lcm->lisp_pitr ? lcm->pitr_map_index :
+	gid_dictionary_lookup (&lcm->mapping_index_by_gid, local_eid);
+
+
+      if (GID_LOOKUP_MISS == local_mi)
+	{
+	  clib_warning ("Local eid %U not found. Cannot add adjacency!",
+			format_gid_address, local_eid);
+
+	  return -1;
+	}
+
+      /* update forwarding */
+      dp_add_fwd_entry (lcm, local_mi, remote_mi);
+    }
+  else
+    dp_del_fwd_entry (lcm, 0, remote_mi);
+
+  return 0;
+}
+
+int
+vnet_lisp_add_del_adjacency (vnet_lisp_add_del_adjacency_args_t * a)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  return lisp_add_del_adjacency (lcm, &a->leid, &a->reid, a->is_add);
+}
+
+/**
+ * Handler for add/del remote mapping CLI.
+ *
+ * @param vm vlib context
+ * @param input input from user
+ * @param cmd cmd
+ * @return pointer to clib error structure
+ */
+static clib_error_t *
+lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm,
+					unformat_input_t * input,
+					vlib_cli_command_t * cmd)
+{
+  clib_error_t *error = 0;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1, del_all = 0;
+  locator_t rloc, *rlocs = 0, *curr_rloc = 0;
+  gid_address_t eid;
+  u8 eid_set = 0;
+  u32 vni, action = ~0, p, w;
+  int rv;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  memset (&eid, 0, sizeof (eid));
+  memset (&rloc, 0, sizeof (rloc));
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "del-all"))
+	del_all = 1;
+      else if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "add"))
+	;
+      else if (unformat (line_input, "eid %U", unformat_gid_address, &eid))
+	eid_set = 1;
+      else if (unformat (line_input, "vni %u", &vni))
+	{
+	  gid_address_vni (&eid) = vni;
+	}
+      else if (unformat (line_input, "p %d w %d", &p, &w))
+	{
+	  if (!curr_rloc)
+	    {
+	      clib_warning
+		("No RLOC configured for setting priority/weight!");
+	      goto done;
+	    }
+	  curr_rloc->priority = p;
+	  curr_rloc->weight = w;
+	}
+      else if (unformat (line_input, "rloc %U", unformat_ip_address,
+			 &gid_address_ip (&rloc.address)))
+	{
+	  /* since rloc is stored in ip prefix we need to set prefix length */
+	  ip_prefix_t *pref = &gid_address_ippref (&rloc.address);
+
+	  u8 version = gid_address_ip_version (&rloc.address);
+	  ip_prefix_len (pref) = ip_address_max_len (version);
+
+	  vec_add1 (rlocs, rloc);
+	  curr_rloc = &rlocs[vec_len (rlocs) - 1];
+	}
+      else if (unformat (line_input, "action %U",
+			 unformat_negative_mapping_action, &action))
+	;
+      else
+	{
+	  clib_warning ("parse error");
+	  goto done;
+	}
+    }
+
+  if (!eid_set)
+    {
+      clib_warning ("missing eid!");
+      goto done;
+    }
+
+  if (!del_all)
+    {
+      if (is_add && (~0 == action) && 0 == vec_len (rlocs))
+	{
+	  clib_warning ("no action set for negative map-reply!");
+	  goto done;
+	}
+    }
+  else
+    {
+      vnet_lisp_clear_all_remote_adjacencies ();
+      goto done;
+    }
+
+  /* TODO build src/dst with seid */
+
+  /* if it's a delete, clean forwarding */
+  if (!is_add)
+    {
+      lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+      rv = lisp_add_del_adjacency (lcm, 0, &eid, /* is_add */ 0);
+      if (rv)
+	{
+	  goto done;
+	}
+    }
+
+  /* add as static remote mapping, i.e., not authoritative and infinite
+   * ttl */
+  rv = vnet_lisp_add_del_mapping (&eid, rlocs, action, 0, ~0, is_add,
+				  1 /* is_static */ , 0);
+
+  if (rv)
+    clib_warning ("failed to %s remote mapping!", is_add ? "add" : "delete");
+
+done:
+  vec_free (rlocs);
+  unformat_free (line_input);
+  return error;
+}
+
+VLIB_CLI_COMMAND (lisp_add_del_remote_mapping_command) =
+{
+.path = "lisp remote-mapping",.short_help =
+    "lisp remote-mapping add|del [del-all] vni <vni> "
+    "eid <est-eid> [action <no-action|natively-forward|"
+    "send-map-request|drop>] rloc <dst-locator> p <prio> w <weight> "
+    "[rloc <dst-locator> ... ]",.function =
+    lisp_add_del_remote_mapping_command_fn,};
+
+/**
+ * Handler for add/del adjacency CLI.
+ */
+static clib_error_t *
+lisp_add_del_adjacency_command_fn (vlib_main_t * vm, unformat_input_t * input,
+				   vlib_cli_command_t * cmd)
+{
+  clib_error_t *error = 0;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
+  u8 is_add = 1;
+  ip_prefix_t *reid_ippref, *leid_ippref;
+  gid_address_t leid, reid;
+  u8 *dmac = gid_address_mac (&reid);
+  u8 *smac = gid_address_mac (&leid);
+  u8 reid_set = 0, leid_set = 0;
+  u32 vni;
+  int rv;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  memset (&reid, 0, sizeof (reid));
+  memset (&leid, 0, sizeof (leid));
+
+  leid_ippref = &gid_address_ippref (&leid);
+  reid_ippref = &gid_address_ippref (&reid);
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "add"))
+	;
+      else if (unformat (line_input, "reid %U",
+			 unformat_ip_prefix, reid_ippref))
+	{
+	  gid_address_type (&reid) = GID_ADDR_IP_PREFIX;
+	  reid_set = 1;
+	}
+      else if (unformat (line_input, "reid %U", unformat_mac_address, dmac))
+	{
+	  gid_address_type (&reid) = GID_ADDR_MAC;
+	  reid_set = 1;
+	}
+      else if (unformat (line_input, "vni %u", &vni))
+	{
+	  gid_address_vni (&leid) = vni;
+	  gid_address_vni (&reid) = vni;
+	}
+      else if (unformat (line_input, "leid %U",
+			 unformat_ip_prefix, leid_ippref))
+	{
+	  gid_address_type (&leid) = GID_ADDR_IP_PREFIX;
+	  leid_set = 1;
+	}
+      else if (unformat (line_input, "leid %U", unformat_mac_address, smac))
+	{
+	  gid_address_type (&leid) = GID_ADDR_MAC;
+	  leid_set = 1;
+	}
+      else
+	{
+	  clib_warning ("parse error");
+	  goto done;
+	}
+    }
+
+  if (!reid_set || !leid_set)
+    {
+      clib_warning ("missing remote or local eid!");
+      goto done;
+    }
+
+  if ((gid_address_type (&leid) != gid_address_type (&reid))
+      || (gid_address_type (&reid) == GID_ADDR_IP_PREFIX
+	  && ip_prefix_version (reid_ippref)
+	  != ip_prefix_version (leid_ippref)))
+    {
+      clib_warning ("remote and local EIDs are of different types!");
+      return error;
+    }
+
+  memset (a, 0, sizeof (a[0]));
+  gid_address_copy (&a->leid, &leid);
+  gid_address_copy (&a->reid, &reid);
+
+  a->is_add = is_add;
+  rv = vnet_lisp_add_del_adjacency (a);
+
+  if (rv)
+    clib_warning ("failed to %s adjacency!", is_add ? "add" : "delete");
+
+done:
+  unformat_free (line_input);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_add_del_adjacency_command) = {
+    .path = "lisp adjacency",
+    .short_help = "lisp adjacency add|del vni <vni> reid <remote-eid> "
+      "leid <local-eid>",
+    .function = lisp_add_del_adjacency_command_fn,
+};
+/* *INDENT-ON* */
+
+int
+vnet_lisp_set_map_request_mode (u8 mode)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  if (mode >= _MR_MODE_MAX)
+    {
+      clib_warning ("Invalid LISP map request mode %d!", mode);
+      return VNET_API_ERROR_INVALID_ARGUMENT;
+    }
+
+  lcm->map_request_mode = mode;
+  return 0;
+}
+
+static clib_error_t *
+lisp_map_request_mode_command_fn (vlib_main_t * vm,
+				  unformat_input_t * input,
+				  vlib_cli_command_t * cmd)
+{
+  unformat_input_t _i, *i = &_i;
+  map_request_mode_t mr_mode = _MR_MODE_MAX;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, i))
+    return 0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "dst-only"))
+	mr_mode = MR_MODE_DST_ONLY;
+      else if (unformat (i, "src-dst"))
+	mr_mode = MR_MODE_SRC_DST;
+      else
+	{
+	  clib_warning ("parse error '%U'", format_unformat_error, i);
+	  goto done;
+	}
+    }
+
+  if (_MR_MODE_MAX == mr_mode)
+    {
+      clib_warning ("No LISP map request mode entered!");
+      return 0;
+    }
+
+  vnet_lisp_set_map_request_mode (mr_mode);
+done:
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_map_request_mode_command) = {
+    .path = "lisp map-request mode",
+    .short_help = "lisp map-request mode dst-only|src-dst",
+    .function = lisp_map_request_mode_command_fn,
+};
+/* *INDENT-ON* */
+
+static u8 *
+format_lisp_map_request_mode (u8 * s, va_list * args)
+{
+  u32 mode = va_arg (*args, u32);
+
+  switch (mode)
+    {
+    case 0:
+      return format (0, "dst-only");
+    case 1:
+      return format (0, "src-dst");
+    }
+  return 0;
+}
+
+static clib_error_t *
+lisp_show_map_request_mode_command_fn (vlib_main_t * vm,
+				       unformat_input_t * input,
+				       vlib_cli_command_t * cmd)
+{
+  vlib_cli_output (vm, "map-request mode: %U", format_lisp_map_request_mode,
+		   vnet_lisp_get_map_request_mode ());
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_map_request_mode_command) = {
+    .path = "show lisp map-request mode",
+    .short_help = "show lisp map-request mode",
+    .function = lisp_show_map_request_mode_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+lisp_show_map_resolvers_command_fn (vlib_main_t * vm,
+				    unformat_input_t * input,
+				    vlib_cli_command_t * cmd)
+{
+  lisp_msmr_t *mr;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  vec_foreach (mr, lcm->map_resolvers)
+  {
+    vlib_cli_output (vm, "%U", format_ip_address, &mr->address);
+  }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_map_resolvers_command) = {
+    .path = "show lisp map-resolvers",
+    .short_help = "show lisp map-resolvers",
+    .function = lisp_show_map_resolvers_command_fn,
+};
+/* *INDENT-ON* */
+
+int
+vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  u32 locator_set_index = ~0;
+  mapping_t *m;
+  uword *p;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  p = hash_get_mem (lcm->locator_set_index_by_name, locator_set_name);
+  if (!p)
+    {
+      clib_warning ("locator-set %v doesn't exist", locator_set_name);
+      return -1;
+    }
+  locator_set_index = p[0];
+
+  if (is_add)
+    {
+      pool_get (lcm->mapping_pool, m);
+      m->locator_set_index = locator_set_index;
+      m->local = 1;
+      lcm->pitr_map_index = m - lcm->mapping_pool;
+
+      /* enable pitr mode */
+      lcm->lisp_pitr = 1;
+    }
+  else
+    {
+      /* remove pitr mapping */
+      pool_put_index (lcm->mapping_pool, lcm->pitr_map_index);
+
+      /* disable pitr mode */
+      lcm->lisp_pitr = 0;
+    }
+  return 0;
+}
+
+static clib_error_t *
+lisp_pitr_set_locator_set_command_fn (vlib_main_t * vm,
+				      unformat_input_t * input,
+				      vlib_cli_command_t * cmd)
+{
+  u8 locator_name_set = 0;
+  u8 *locator_set_name = 0;
+  u8 is_add = 1;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  clib_error_t *error = 0;
+  int rv = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "ls %_%v%_", &locator_set_name))
+	locator_name_set = 1;
+      else if (unformat (line_input, "disable"))
+	is_add = 0;
+      else
+	return clib_error_return (0, "parse error");
+    }
+
+  if (!locator_name_set)
+    {
+      clib_warning ("No locator set specified!");
+      goto done;
+    }
+  rv = vnet_lisp_pitr_set_locator_set (locator_set_name, is_add);
+  if (0 != rv)
+    {
+      error = clib_error_return (0, "failed to %s pitr!",
+				 is_add ? "add" : "delete");
+    }
+
+done:
+  if (locator_set_name)
+    vec_free (locator_set_name);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_pitr_set_locator_set_command) = {
+    .path = "lisp pitr",
+    .short_help = "lisp pitr [disable] ls <locator-set-name>",
+    .function = lisp_pitr_set_locator_set_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+lisp_show_pitr_command_fn (vlib_main_t * vm,
+			   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  mapping_t *m;
+  locator_set_t *ls;
+  u8 *tmp_str = 0;
+
+  vlib_cli_output (vm, "%=20s%=16s",
+		   "pitr", lcm->lisp_pitr ? "locator-set" : "");
+
+  if (!lcm->lisp_pitr)
+    {
+      vlib_cli_output (vm, "%=20s", "disable");
+      return 0;
+    }
+
+  if (~0 == lcm->pitr_map_index)
+    {
+      tmp_str = format (0, "N/A");
+    }
+  else
+    {
+      m = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
+      if (~0 != m->locator_set_index)
+	{
+	  ls =
+	    pool_elt_at_index (lcm->locator_set_pool, m->locator_set_index);
+	  tmp_str = format (0, "%s", ls->name);
+	}
+      else
+	{
+	  tmp_str = format (0, "N/A");
+	}
+    }
+  vec_add1 (tmp_str, 0);
+
+  vlib_cli_output (vm, "%=20s%=16s", "enable", tmp_str);
+
+  vec_free (tmp_str);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_pitr_command) = {
+    .path = "show lisp pitr",
+    .short_help = "Show pitr",
+    .function = lisp_show_pitr_command_fn,
+};
+/* *INDENT-ON* */
+
+static u8 *
+format_eid_entry (u8 * s, va_list * args)
+{
+  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
+  lisp_cp_main_t *lcm = va_arg (*args, lisp_cp_main_t *);
+  mapping_t *mapit = va_arg (*args, mapping_t *);
+  locator_set_t *ls = va_arg (*args, locator_set_t *);
+  gid_address_t *gid = &mapit->eid;
+  u32 ttl = mapit->ttl;
+  u8 aut = mapit->authoritative;
+  u32 *loc_index;
+  u8 first_line = 1;
+  u8 *loc;
+
+  u8 *type = ls->local ? format (0, "local(%s)", ls->name)
+    : format (0, "remote");
+
+  if (vec_len (ls->locator_indices) == 0)
+    {
+      s = format (s, "%-35U%-30s%-20u%-u", format_gid_address, gid,
+		  type, ttl, aut);
+    }
+  else
+    {
+      vec_foreach (loc_index, ls->locator_indices)
+      {
+	locator_t *l = pool_elt_at_index (lcm->locator_pool, loc_index[0]);
+	if (l->local)
+	  loc = format (0, "%U", format_vnet_sw_if_index_name, vnm,
+			l->sw_if_index);
+	else
+	  loc = format (0, "%U", format_ip_address,
+			&gid_address_ip (&l->address));
+
+	if (first_line)
+	  {
+	    s = format (s, "%-35U%-20s%-30v%-20u%-u\n", format_gid_address,
+			gid, type, loc, ttl, aut);
+	    first_line = 0;
+	  }
+	else
+	  s = format (s, "%55s%v\n", "", loc);
+      }
+    }
+  return s;
+}
+
+static clib_error_t *
+lisp_show_eid_table_command_fn (vlib_main_t * vm,
+				unformat_input_t * input,
+				vlib_cli_command_t * cmd)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  mapping_t *mapit;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 mi;
+  gid_address_t eid;
+  u8 print_all = 1;
+  u8 filter = 0;
+
+  memset (&eid, 0, sizeof (eid));
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "eid %U", unformat_gid_address, &eid))
+	print_all = 0;
+      else if (unformat (line_input, "local"))
+	filter = 1;
+      else if (unformat (line_input, "remote"))
+	filter = 2;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  vlib_cli_output (vm, "%-35s%-20s%-30s%-20s%-s",
+		   "EID", "type", "locators", "ttl", "autoritative");
+
+  if (print_all)
+    {
+      /* *INDENT-OFF* */
+      pool_foreach (mapit, lcm->mapping_pool,
+      ({
+        locator_set_t * ls = pool_elt_at_index (lcm->locator_set_pool,
+                                                mapit->locator_set_index);
+        if (filter && !((1 == filter && ls->local) ||
+          (2 == filter && !ls->local)))
+          {
+            continue;
+          }
+        vlib_cli_output (vm, "%U", format_eid_entry, lcm->vnet_main,
+                         lcm, mapit, ls);
+      }));
+      /* *INDENT-ON* */
+    }
+  else
+    {
+      mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &eid);
+      if ((u32) ~ 0 == mi)
+	return 0;
+
+      mapit = pool_elt_at_index (lcm->mapping_pool, mi);
+      locator_set_t *ls = pool_elt_at_index (lcm->locator_set_pool,
+					     mapit->locator_set_index);
+
+      if (filter && !((1 == filter && ls->local) ||
+		      (2 == filter && !ls->local)))
+	{
+	  return 0;
+	}
+
+      vlib_cli_output (vm, "%U,", format_eid_entry, lcm->vnet_main,
+		       lcm, mapit, ls);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_cp_show_eid_table_command) = {
+    .path = "show lisp eid-table",
+    .short_help = "Shows EID table",
+    .function = lisp_show_eid_table_command_fn,
+};
+/* *INDENT-ON* */
+
+/* cleans locator to locator-set data and removes locators not part of
+ * any locator-set */
+static void
+clean_locator_to_locator_set (lisp_cp_main_t * lcm, u32 lsi)
+{
+  u32 i, j, *loc_indexp, *ls_indexp, **ls_indexes, *to_be_deleted = 0;
+  locator_set_t *ls = pool_elt_at_index (lcm->locator_set_pool, lsi);
+  for (i = 0; i < vec_len (ls->locator_indices); i++)
+    {
+      loc_indexp = vec_elt_at_index (ls->locator_indices, i);
+      ls_indexes = vec_elt_at_index (lcm->locator_to_locator_sets,
+				     loc_indexp[0]);
+      for (j = 0; j < vec_len (ls_indexes[0]); j++)
+	{
+	  ls_indexp = vec_elt_at_index (ls_indexes[0], j);
+	  if (ls_indexp[0] == lsi)
+	    break;
+	}
+
+      /* delete index for removed locator-set */
+      vec_del1 (ls_indexes[0], j);
+
+      /* delete locator if it's part of no locator-set */
+      if (vec_len (ls_indexes[0]) == 0)
+	{
+	  pool_put_index (lcm->locator_pool, loc_indexp[0]);
+	  vec_add1 (to_be_deleted, i);
+	}
+    }
+
+  if (to_be_deleted)
+    {
+      for (i = 0; i < vec_len (to_be_deleted); i++)
+	{
+	  loc_indexp = vec_elt_at_index (to_be_deleted, i);
+	  vec_del1 (ls->locator_indices, loc_indexp[0]);
+	}
+      vec_free (to_be_deleted);
+    }
+}
+
+static inline uword *
+get_locator_set_index (vnet_lisp_add_del_locator_set_args_t * a, uword * p)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  ASSERT (a != NULL);
+  ASSERT (p != NULL);
+
+  /* find locator-set */
+  if (a->local)
+    {
+      p = hash_get_mem (lcm->locator_set_index_by_name, a->name);
+    }
+  else
+    {
+      *p = a->index;
+    }
+
+  return p;
+}
+
+static inline int
+is_locator_in_locator_set (lisp_cp_main_t * lcm, locator_set_t * ls,
+			   locator_t * loc)
+{
+  locator_t *itloc;
+  u32 *locit;
+
+  ASSERT (ls != NULL);
+  ASSERT (loc != NULL);
+
+  vec_foreach (locit, ls->locator_indices)
+  {
+    itloc = pool_elt_at_index (lcm->locator_pool, locit[0]);
+    if ((ls->local && itloc->sw_if_index == loc->sw_if_index) ||
+	(!ls->local && !gid_address_cmp (&itloc->address, &loc->address)))
+      {
+	clib_warning ("Duplicate locator");
+	return VNET_API_ERROR_VALUE_EXIST;
+      }
+  }
+
+  return 0;
+}
+
+static inline void
+remove_locator_from_locator_set (locator_set_t * ls, u32 * locit,
+				 u32 ls_index, u32 loc_id)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  u32 **ls_indexes = NULL;
+
+  ASSERT (ls != NULL);
+  ASSERT (locit != NULL);
+
+  ls_indexes = vec_elt_at_index (lcm->locator_to_locator_sets, locit[0]);
+  pool_put_index (lcm->locator_pool, locit[0]);
+  vec_del1 (ls->locator_indices, loc_id);
+  vec_del1 (ls_indexes[0], ls_index);
+}
+
+int
+vnet_lisp_add_del_locator (vnet_lisp_add_del_locator_set_args_t * a,
+			   locator_set_t * ls, u32 * ls_result)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  locator_t *loc = NULL, *itloc = NULL;
+  uword _p = (u32) ~ 0, *p = &_p;
+  u32 loc_index = ~0, ls_index = ~0, *locit = NULL, **ls_indexes = NULL;
+  u32 loc_id = ~0;
+  int ret = 0;
+
+  ASSERT (a != NULL);
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  p = get_locator_set_index (a, p);
+  if (!p)
+    {
+      clib_warning ("locator-set %v doesn't exist", a->name);
+      return VNET_API_ERROR_INVALID_ARGUMENT;
+    }
+
+  if (ls == 0)
+    {
+      ls = pool_elt_at_index (lcm->locator_set_pool, p[0]);
+      if (!ls)
+	{
+	  clib_warning ("locator-set %d to be overwritten doesn't exist!",
+			p[0]);
+	  return VNET_API_ERROR_INVALID_ARGUMENT;
+	}
+    }
+
+  if (a->is_add)
+    {
+      if (ls_result)
+	ls_result[0] = p[0];
+
+      /* allocate locators */
+      vec_foreach (itloc, a->locators)
+      {
+	ret = is_locator_in_locator_set (lcm, ls, itloc);
+	if (0 != ret)
+	  {
+	    return ret;
+	  }
+
+	pool_get (lcm->locator_pool, loc);
+	loc[0] = itloc[0];
+	loc_index = loc - lcm->locator_pool;
+
+	vec_add1 (ls->locator_indices, loc_index);
+
+	vec_validate (lcm->locator_to_locator_sets, loc_index);
+	ls_indexes = vec_elt_at_index (lcm->locator_to_locator_sets,
+				       loc_index);
+	vec_add1 (ls_indexes[0], p[0]);
+      }
+    }
+  else
+    {
+      ls_index = p[0];
+
+      itloc = a->locators;
+      loc_id = 0;
+      vec_foreach (locit, ls->locator_indices)
+      {
+	loc = pool_elt_at_index (lcm->locator_pool, locit[0]);
+
+	if (loc->local && loc->sw_if_index == itloc->sw_if_index)
+	  {
+	    remove_locator_from_locator_set (ls, locit, ls_index, loc_id);
+	  }
+	if (0 == loc->local &&
+	    !gid_address_cmp (&loc->address, &itloc->address))
+	  {
+	    remove_locator_from_locator_set (ls, locit, ls_index, loc_id);
+	  }
+
+	loc_id++;
+      }
+    }
+
+  return 0;
+}
+
+int
+vnet_lisp_add_del_locator_set (vnet_lisp_add_del_locator_set_args_t * a,
+			       u32 * ls_result)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  locator_set_t *ls;
+  uword _p = (u32) ~ 0, *p = &_p;
+  u32 ls_index;
+  u32 **eid_indexes;
+  int ret = 0;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  if (a->is_add)
+    {
+      p = get_locator_set_index (a, p);
+
+      /* overwrite */
+      if (p && p[0] != (u32) ~ 0)
+	{
+	  ls = pool_elt_at_index (lcm->locator_set_pool, p[0]);
+	  if (!ls)
+	    {
+	      clib_warning ("locator-set %d to be overwritten doesn't exist!",
+			    p[0]);
+	      return -1;
+	    }
+
+	  /* clean locator to locator-set vectors and remove locators if
+	   * they're not part of another locator-set */
+	  clean_locator_to_locator_set (lcm, p[0]);
+
+	  /* remove locator indices from locator set */
+	  vec_free (ls->locator_indices);
+
+	  ls_index = p[0];
+
+	  if (ls_result)
+	    ls_result[0] = p[0];
+	}
+      /* new locator-set */
+      else
+	{
+	  pool_get (lcm->locator_set_pool, ls);
+	  memset (ls, 0, sizeof (*ls));
+	  ls_index = ls - lcm->locator_set_pool;
+
+	  if (a->local)
+	    {
+	      ls->name = vec_dup (a->name);
+
+	      if (!lcm->locator_set_index_by_name)
+		lcm->locator_set_index_by_name = hash_create_vec (
+								   /* size */
+								   0,
+								   sizeof
+								   (ls->name
+								    [0]),
+								   sizeof
+								   (uword));
+	      hash_set_mem (lcm->locator_set_index_by_name, ls->name,
+			    ls_index);
+
+	      /* mark as local locator-set */
+	      vec_add1 (lcm->local_locator_set_indexes, ls_index);
+	    }
+	  ls->local = a->local;
+	  if (ls_result)
+	    ls_result[0] = ls_index;
+	}
+
+      ret = vnet_lisp_add_del_locator (a, ls, NULL);
+      if (0 != ret)
+	{
+	  return ret;
+	}
+    }
+  else
+    {
+      p = get_locator_set_index (a, p);
+      if (!p)
+	{
+	  clib_warning ("locator-set %v doesn't exists", a->name);
+	  return -1;
+	}
+
+      ls = pool_elt_at_index (lcm->locator_set_pool, p[0]);
+      if (!ls)
+	{
+	  clib_warning ("locator-set with index %d doesn't exists", p[0]);
+	  return -1;
+	}
+
+      if (lcm->mreq_itr_rlocs == p[0])
+	{
+	  clib_warning ("Can't delete the locator-set used to constrain "
+			"the itr-rlocs in map-requests!");
+	  return -1;
+	}
+
+      if (vec_len (lcm->locator_set_to_eids) != 0)
+	{
+	  eid_indexes = vec_elt_at_index (lcm->locator_set_to_eids, p[0]);
+	  if (vec_len (eid_indexes[0]) != 0)
+	    {
+	      clib_warning
+		("Can't delete a locator that supports a mapping!");
+	      return -1;
+	    }
+	}
+
+      /* clean locator to locator-sets data */
+      clean_locator_to_locator_set (lcm, p[0]);
+
+      if (ls->local)
+	{
+	  u32 it, lsi;
+
+	  vec_foreach_index (it, lcm->local_locator_set_indexes)
+	  {
+	    lsi = vec_elt (lcm->local_locator_set_indexes, it);
+	    if (lsi == p[0])
+	      {
+		vec_del1 (lcm->local_locator_set_indexes, it);
+		break;
+	      }
+	  }
+	  hash_unset_mem (lcm->locator_set_index_by_name, ls->name);
+	}
+      vec_free (ls->name);
+      vec_free (ls->locator_indices);
+      pool_put (lcm->locator_set_pool, ls);
+    }
+  return 0;
+}
+
+int
+vnet_lisp_rloc_probe_enable_disable (u8 is_enable)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  lcm->rloc_probing = is_enable;
+  return 0;
+}
+
+int
+vnet_lisp_map_register_enable_disable (u8 is_enable)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  lcm->map_registering = is_enable;
+  return 0;
+}
+
+clib_error_t *
+vnet_lisp_enable_disable (u8 is_enable)
+{
+  u32 vni, dp_table;
+  clib_error_t *error = 0;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  vnet_lisp_gpe_enable_disable_args_t _a, *a = &_a;
+
+  a->is_en = is_enable;
+  error = vnet_lisp_gpe_enable_disable (a);
+  if (error)
+    {
+      return clib_error_return (0, "failed to %s data-plane!",
+				a->is_en ? "enable" : "disable");
+    }
+
+  if (is_enable)
+    {
+      /* enable all l2 and l3 ifaces */
+
+      /* *INDENT-OFF* */
+      hash_foreach(vni, dp_table, lcm->table_id_by_vni, ({
+        dp_add_del_iface(lcm, vni, 0, 1);
+      }));
+      hash_foreach(vni, dp_table, lcm->bd_id_by_vni, ({
+        dp_add_del_iface(lcm, vni, /* is_l2 */ 1, 1);
+      }));
+      /* *INDENT-ON* */
+    }
+  else
+    {
+      /* clear interface table */
+      hash_free (lcm->fwd_entry_by_mapping_index);
+      pool_free (lcm->fwd_entry_pool);
+    }
+
+  /* update global flag */
+  lcm->is_enabled = is_enable;
+
+  return 0;
+}
+
+static clib_error_t *
+lisp_enable_disable_command_fn (vlib_main_t * vm, unformat_input_t * input,
+				vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_enabled = 0;
+  u8 is_set = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "enable"))
+	{
+	  is_set = 1;
+	  is_enabled = 1;
+	}
+      else if (unformat (line_input, "disable"))
+	is_set = 1;
+      else
+	{
+	  return clib_error_return (0, "parse error: '%U'",
+				    format_unformat_error, line_input);
+	}
+    }
+
+  if (!is_set)
+    return clib_error_return (0, "state not set");
+
+  vnet_lisp_enable_disable (is_enabled);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_cp_enable_disable_command) = {
+    .path = "lisp",
+    .short_help = "lisp [enable|disable]",
+    .function = lisp_enable_disable_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+lisp_map_register_enable_disable_command_fn (vlib_main_t * vm,
+					     unformat_input_t * input,
+					     vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_enabled = 0;
+  u8 is_set = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "enable"))
+	{
+	  is_set = 1;
+	  is_enabled = 1;
+	}
+      else if (unformat (line_input, "disable"))
+	is_set = 1;
+      else
+	{
+	  vlib_cli_output (vm, "parse error: '%U'", format_unformat_error,
+			   line_input);
+	  return 0;
+	}
+    }
+
+  if (!is_set)
+    {
+      vlib_cli_output (vm, "state not set!");
+      return 0;
+    }
+
+  vnet_lisp_map_register_enable_disable (is_enabled);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_map_register_enable_disable_command) = {
+    .path = "lisp map-register",
+    .short_help = "lisp map-register [enable|disable]",
+    .function = lisp_map_register_enable_disable_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+lisp_rloc_probe_enable_disable_command_fn (vlib_main_t * vm,
+					   unformat_input_t * input,
+					   vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_enabled = 0;
+  u8 is_set = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "enable"))
+	{
+	  is_set = 1;
+	  is_enabled = 1;
+	}
+      else if (unformat (line_input, "disable"))
+	is_set = 1;
+      else
+	{
+	  vlib_cli_output (vm, "parse error: '%U'", format_unformat_error,
+			   line_input);
+	  return 0;
+	}
+    }
+
+  if (!is_set)
+    {
+      vlib_cli_output (vm, "state not set!");
+      return 0;
+    }
+
+  vnet_lisp_rloc_probe_enable_disable (is_enabled);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_rloc_probe_enable_disable_command) = {
+    .path = "lisp rloc-probe",
+    .short_help = "lisp rloc-probe [enable|disable]",
+    .function = lisp_rloc_probe_enable_disable_command_fn,
+};
+/* *INDENT-ON* */
+
+u8
+vnet_lisp_enable_disable_status (void)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  return lcm->is_enabled;
+}
+
+static u8 *
+format_lisp_status (u8 * s, va_list * args)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  return format (s, "%s", lcm->is_enabled ? "enabled" : "disabled");
+}
+
+static clib_error_t *
+lisp_show_status_command_fn (vlib_main_t * vm, unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  u8 *msg = 0;
+  msg = format (msg, "feature: %U\ngpe: %U\n",
+		format_lisp_status, format_vnet_lisp_gpe_status);
+  vlib_cli_output (vm, "%v", msg);
+  vec_free (msg);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_status_command) = {
+    .path = "show lisp status",
+    .short_help = "show lisp status",
+    .function = lisp_show_status_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+lisp_show_eid_table_map_command_fn (vlib_main_t * vm,
+				    unformat_input_t * input,
+				    vlib_cli_command_t * cmd)
+{
+  hash_pair_t *p;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  uword *vni_table = 0;
+  u8 is_l2 = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "l2"))
+	{
+	  vni_table = lcm->bd_id_by_vni;
+	  is_l2 = 1;
+	}
+      else if (unformat (line_input, "l3"))
+	{
+	  vni_table = lcm->table_id_by_vni;
+	  is_l2 = 0;
+	}
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  if (!vni_table)
+    {
+      vlib_cli_output (vm, "Error: expected l2|l3 param!\n");
+      return 0;
+    }
+
+  vlib_cli_output (vm, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF");
+
+  /* *INDENT-OFF* */
+  hash_foreach_pair (p, vni_table,
+  ({
+    vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]);
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_eid_table_map_command) = {
+    .path = "show lisp eid-table map",
+    .short_help = "show lisp eid-table l2|l3",
+    .function = lisp_show_eid_table_map_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+lisp_add_del_locator_set_command_fn (vlib_main_t * vm,
+				     unformat_input_t * input,
+				     vlib_cli_command_t * cmd)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  vnet_main_t *vnm = lgm->vnet_main;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1;
+  clib_error_t *error = 0;
+  u8 *locator_set_name = 0;
+  locator_t locator, *locators = 0;
+  vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
+  u32 ls_index = 0;
+  int rv = 0;
+
+  memset (&locator, 0, sizeof (locator));
+  memset (a, 0, sizeof (a[0]));
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "add %_%v%_", &locator_set_name))
+	is_add = 1;
+      else if (unformat (line_input, "del %_%v%_", &locator_set_name))
+	is_add = 0;
+      else if (unformat (line_input, "iface %U p %d w %d",
+			 unformat_vnet_sw_interface, vnm,
+			 &locator.sw_if_index, &locator.priority,
+			 &locator.weight))
+	{
+	  locator.local = 1;
+	  vec_add1 (locators, locator);
+	}
+      else
+	{
+	  error = unformat_parse_error (line_input);
+	  goto done;
+	}
+    }
+
+  a->name = locator_set_name;
+  a->locators = locators;
+  a->is_add = is_add;
+  a->local = 1;
+
+  rv = vnet_lisp_add_del_locator_set (a, &ls_index);
+  if (0 != rv)
+    {
+      error = clib_error_return (0, "failed to %s locator-set!",
+				 is_add ? "add" : "delete");
+    }
+
+done:
+  vec_free (locators);
+  if (locator_set_name)
+    vec_free (locator_set_name);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_cp_add_del_locator_set_command) = {
+    .path = "lisp locator-set",
+    .short_help = "lisp locator-set add/del <name> [iface <iface-name> "
+        "p <priority> w <weight>]",
+    .function = lisp_add_del_locator_set_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+lisp_add_del_locator_in_set_command_fn (vlib_main_t * vm,
+					unformat_input_t * input,
+					vlib_cli_command_t * cmd)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  vnet_main_t *vnm = lgm->vnet_main;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1;
+  clib_error_t *error = 0;
+  u8 *locator_set_name = 0;
+  u8 locator_set_name_set = 0;
+  locator_t locator, *locators = 0;
+  vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
+  u32 ls_index = 0;
+
+  memset (&locator, 0, sizeof (locator));
+  memset (a, 0, sizeof (a[0]));
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "add"))
+	is_add = 1;
+      else if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "locator-set %_%v%_", &locator_set_name))
+	locator_set_name_set = 1;
+      else if (unformat (line_input, "iface %U p %d w %d",
+			 unformat_vnet_sw_interface, vnm,
+			 &locator.sw_if_index, &locator.priority,
+			 &locator.weight))
+	{
+	  locator.local = 1;
+	  vec_add1 (locators, locator);
+	}
+      else
+	{
+	  error = unformat_parse_error (line_input);
+	  goto done;
+	}
+    }
+
+  if (!locator_set_name_set)
+    {
+      error = clib_error_return (0, "locator_set name not set!");
+      goto done;
+    }
+
+  a->name = locator_set_name;
+  a->locators = locators;
+  a->is_add = is_add;
+  a->local = 1;
+
+  vnet_lisp_add_del_locator (a, 0, &ls_index);
+
+done:
+  vec_free (locators);
+  vec_free (locator_set_name);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_cp_add_del_locator_in_set_command) = {
+    .path = "lisp locator",
+    .short_help = "lisp locator add/del locator-set <name> iface <iface-name> "
+                  "p <priority> w <weight>",
+    .function = lisp_add_del_locator_in_set_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm,
+				      unformat_input_t * input,
+				      vlib_cli_command_t * cmd)
+{
+  locator_set_t *lsit;
+  locator_t *loc;
+  u32 *locit;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  vlib_cli_output (vm, "%s%=16s%=16s%=16s", "Locator-set", "Locator",
+		   "Priority", "Weight");
+
+  /* *INDENT-OFF* */
+  pool_foreach (lsit, lcm->locator_set_pool,
+  ({
+    u8 * msg = 0;
+    int next_line = 0;
+    if (lsit->local)
+      {
+        msg = format (msg, "%v", lsit->name);
+      }
+    else
+      {
+        msg = format (msg, "<%s-%d>", "remote", lsit - lcm->locator_set_pool);
+      }
+    vec_foreach (locit, lsit->locator_indices)
+      {
+        if (next_line)
+          {
+            msg = format (msg, "%16s", " ");
+          }
+        loc = pool_elt_at_index (lcm->locator_pool, locit[0]);
+        if (loc->local)
+          msg = format (msg, "%16d%16d%16d\n", loc->sw_if_index, loc->priority,
+                        loc->weight);
+        else
+          msg = format (msg, "%16U%16d%16d\n", format_ip_address,
+                        &gid_address_ip(&loc->address), loc->priority,
+                        loc->weight);
+        next_line = 1;
+      }
+    vlib_cli_output (vm, "%v", msg);
+    vec_free (msg);
+  }));
+  /* *INDENT-ON* */
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_cp_show_locator_sets_command) = {
+    .path = "show lisp locator-set",
+    .short_help = "Shows locator-sets",
+    .function = lisp_cp_show_locator_sets_command_fn,
+};
+/* *INDENT-ON* */
+
+int
+vnet_lisp_add_del_map_resolver (vnet_lisp_add_del_map_resolver_args_t * a)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  u32 i;
+  lisp_msmr_t _mr, *mr = &_mr;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  if (a->is_add)
+    {
+
+      if (get_map_resolver (&a->address))
+	{
+	  clib_warning ("map-resolver %U already exists!", format_ip_address,
+			&a->address);
+	  return -1;
+	}
+
+      memset (mr, 0, sizeof (*mr));
+      ip_address_copy (&mr->address, &a->address);
+      vec_add1 (lcm->map_resolvers, *mr);
+
+      if (vec_len (lcm->map_resolvers) == 1)
+	lcm->do_map_resolver_election = 1;
+    }
+  else
+    {
+      for (i = 0; i < vec_len (lcm->map_resolvers); i++)
+	{
+	  mr = vec_elt_at_index (lcm->map_resolvers, i);
+	  if (!ip_address_cmp (&mr->address, &a->address))
+	    {
+	      if (!ip_address_cmp (&mr->address, &lcm->active_map_resolver))
+		lcm->do_map_resolver_election = 1;
+
+	      vec_del1 (lcm->map_resolvers, i);
+	      break;
+	    }
+	}
+    }
+  return 0;
+}
+
+static clib_error_t *
+lisp_add_del_map_resolver_command_fn (vlib_main_t * vm,
+				      unformat_input_t * input,
+				      vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1, addr_set = 0;
+  ip_address_t ip_addr;
+  clib_error_t *error = 0;
+  int rv = 0;
+  vnet_lisp_add_del_map_resolver_args_t _a, *a = &_a;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "add"))
+	is_add = 1;
+      else if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "%U", unformat_ip_address, &ip_addr))
+	addr_set = 1;
+      else
+	{
+	  error = unformat_parse_error (line_input);
+	  goto done;
+	}
+    }
+
+  if (!addr_set)
+    {
+      error = clib_error_return (0, "Map-resolver address must be set!");
+      goto done;
+    }
+
+  a->is_add = is_add;
+  a->address = ip_addr;
+  rv = vnet_lisp_add_del_map_resolver (a);
+  if (0 != rv)
+    {
+      error = clib_error_return (0, "failed to %s map-resolver!",
+				 is_add ? "add" : "delete");
+    }
+
+done:
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_add_del_map_resolver_command) = {
+    .path = "lisp map-resolver",
+    .short_help = "lisp map-resolver add/del <ip_address>",
+    .function = lisp_add_del_map_resolver_command_fn,
+};
+/* *INDENT-ON* */
+
+int
+vnet_lisp_add_del_mreq_itr_rlocs (vnet_lisp_add_del_mreq_itr_rloc_args_t * a)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  uword *p = 0;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  if (a->is_add)
+    {
+      p = hash_get_mem (lcm->locator_set_index_by_name, a->locator_set_name);
+      if (!p)
+	{
+	  clib_warning ("locator-set %v doesn't exist", a->locator_set_name);
+	  return VNET_API_ERROR_INVALID_ARGUMENT;
+	}
+
+      lcm->mreq_itr_rlocs = p[0];
+    }
+  else
+    {
+      lcm->mreq_itr_rlocs = ~0;
+    }
+
+  return 0;
+}
+
+static clib_error_t *
+lisp_add_del_mreq_itr_rlocs_command_fn (vlib_main_t * vm,
+					unformat_input_t * input,
+					vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1;
+  u8 *locator_set_name = 0;
+  clib_error_t *error = 0;
+  int rv = 0;
+  vnet_lisp_add_del_mreq_itr_rloc_args_t _a, *a = &_a;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "add %_%v%_", &locator_set_name))
+	is_add = 1;
+      else
+	{
+	  error = unformat_parse_error (line_input);
+	  goto done;
+	}
+    }
+
+  a->is_add = is_add;
+  a->locator_set_name = locator_set_name;
+  rv = vnet_lisp_add_del_mreq_itr_rlocs (a);
+  if (0 != rv)
+    {
+      error = clib_error_return (0, "failed to %s map-request itr-rlocs!",
+				 is_add ? "add" : "delete");
+    }
+
+  vec_free (locator_set_name);
+
+done:
+  return error;
+
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_add_del_map_request_command) = {
+    .path = "lisp map-request itr-rlocs",
+    .short_help = "lisp map-request itr-rlocs add/del <locator_set_name>",
+    .function = lisp_add_del_mreq_itr_rlocs_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+lisp_show_mreq_itr_rlocs_command_fn (vlib_main_t * vm,
+				     unformat_input_t * input,
+				     vlib_cli_command_t * cmd)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  locator_set_t *loc_set;
+
+  vlib_cli_output (vm, "%=20s", "itr-rlocs");
+
+  if (~0 == lcm->mreq_itr_rlocs)
+    {
+      return 0;
+    }
+
+  loc_set = pool_elt_at_index (lcm->locator_set_pool, lcm->mreq_itr_rlocs);
+
+  vlib_cli_output (vm, "%=20s", loc_set->name);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_map_request_command) = {
+    .path = "show lisp map-request itr-rlocs",
+    .short_help = "Shows map-request itr-rlocs",
+    .function = lisp_show_mreq_itr_rlocs_command_fn,
+};
+/* *INDENT-ON* */
+
+/* Statistics (not really errors) */
+#define foreach_lisp_cp_lookup_error           \
+_(DROP, "drop")                                \
+_(MAP_REQUESTS_SENT, "map-request sent")
+
+static char *lisp_cp_lookup_error_strings[] = {
+#define _(sym,string) string,
+  foreach_lisp_cp_lookup_error
+#undef _
+};
+
+typedef enum
+{
+#define _(sym,str) LISP_CP_LOOKUP_ERROR_##sym,
+  foreach_lisp_cp_lookup_error
+#undef _
+    LISP_CP_LOOKUP_N_ERROR,
+} lisp_cp_lookup_error_t;
+
+typedef enum
+{
+  LISP_CP_LOOKUP_NEXT_DROP,
+  LISP_CP_LOOKUP_N_NEXT,
+} lisp_cp_lookup_next_t;
+
+typedef struct
+{
+  gid_address_t dst_eid;
+  ip_address_t map_resolver_ip;
+} lisp_cp_lookup_trace_t;
+
+u8 *
+format_lisp_cp_lookup_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  lisp_cp_lookup_trace_t *t = va_arg (*args, lisp_cp_lookup_trace_t *);
+
+  s = format (s, "LISP-CP-LOOKUP: map-resolver: %U destination eid %U",
+	      format_ip_address, &t->map_resolver_ip, format_gid_address,
+	      &t->dst_eid);
+  return s;
+}
+
+int
+get_mr_and_local_iface_ip (lisp_cp_main_t * lcm, ip_address_t * mr_ip,
+			   ip_address_t * sloc)
+{
+  lisp_msmr_t *mrit;
+  ip_address_t *a;
+
+  if (vec_len (lcm->map_resolvers) == 0)
+    {
+      clib_warning ("No map-resolver configured");
+      return 0;
+    }
+
+  /* find the first mr ip we have a route to and the ip of the
+   * iface that has a route to it */
+  vec_foreach (mrit, lcm->map_resolvers)
+  {
+    a = &mrit->address;
+    if (0 != ip_fib_get_first_egress_ip_for_dst (lcm, a, sloc))
+      {
+	ip_address_copy (mr_ip, a);
+
+	/* also update globals */
+	return 1;
+      }
+  }
+
+  clib_warning ("Can't find map-resolver and local interface ip!");
+  return 0;
+}
+
+static gid_address_t *
+build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set)
+{
+  void *addr;
+  u32 i;
+  locator_t *loc;
+  u32 *loc_indexp;
+  ip_interface_address_t *ia = 0;
+  gid_address_t gid_data, *gid = &gid_data;
+  gid_address_t *rlocs = 0;
+  ip_prefix_t *ippref = &gid_address_ippref (gid);
+  ip_address_t *rloc = &ip_prefix_addr (ippref);
+
+  memset (gid, 0, sizeof (gid[0]));
+  gid_address_type (gid) = GID_ADDR_IP_PREFIX;
+  for (i = 0; i < vec_len (loc_set->locator_indices); i++)
+    {
+      loc_indexp = vec_elt_at_index (loc_set->locator_indices, i);
+      loc = pool_elt_at_index (lcm->locator_pool, loc_indexp[0]);
+
+      /* Add ipv4 locators first TODO sort them */
+
+      /* *INDENT-OFF* */
+      foreach_ip_interface_address (&lcm->im4->lookup_main, ia,
+				    loc->sw_if_index, 1 /* unnumbered */,
+      ({
+	addr = ip_interface_address_get_address (&lcm->im4->lookup_main, ia);
+	ip_address_set (rloc, addr, IP4);
+        ip_prefix_len (ippref) = 32;
+        ip_prefix_normalize (ippref);
+        vec_add1 (rlocs, gid[0]);
+      }));
+
+      /* Add ipv6 locators */
+      foreach_ip_interface_address (&lcm->im6->lookup_main, ia,
+				    loc->sw_if_index, 1 /* unnumbered */,
+      ({
+        addr = ip_interface_address_get_address (&lcm->im6->lookup_main, ia);
+        ip_address_set (rloc, addr, IP6);
+        ip_prefix_len (ippref) = 128;
+        ip_prefix_normalize (ippref);
+        vec_add1 (rlocs, gid[0]);
+      }));
+      /* *INDENT-ON* */
+
+    }
+  return rlocs;
+}
+
+static vlib_buffer_t *
+build_map_request (lisp_cp_main_t * lcm, gid_address_t * deid,
+		   ip_address_t * sloc, ip_address_t * rloc,
+		   gid_address_t * itr_rlocs, u64 * nonce_res, u32 * bi_res)
+{
+  vlib_buffer_t *b;
+  u32 bi;
+  vlib_main_t *vm = lcm->vlib_main;
+
+  if (vlib_buffer_alloc (vm, &bi, 1) != 1)
+    {
+      clib_warning ("Can't allocate buffer for Map-Request!");
+      return 0;
+    }
+
+  b = vlib_get_buffer (vm, bi);
+
+  /* leave some space for the encap headers */
+  vlib_buffer_make_headroom (b, MAX_LISP_MSG_ENCAP_LEN);
+
+  /* put lisp msg */
+  lisp_msg_put_mreq (lcm, b, NULL, deid, itr_rlocs, 0 /* smr invoked */ ,
+		     1 /* rloc probe */ , nonce_res);
+
+  /* push outer ip header */
+  pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, sloc,
+		       rloc);
+
+  bi_res[0] = bi;
+
+  return b;
+}
+
+static vlib_buffer_t *
+build_encapsulated_map_request (lisp_cp_main_t * lcm,
+				gid_address_t * seid, gid_address_t * deid,
+				locator_set_t * loc_set, ip_address_t * mr_ip,
+				ip_address_t * sloc, u8 is_smr_invoked,
+				u64 * nonce_res, u32 * bi_res)
+{
+  vlib_buffer_t *b;
+  u32 bi;
+  gid_address_t *rlocs = 0;
+  vlib_main_t *vm = lcm->vlib_main;
+
+  if (vlib_buffer_alloc (vm, &bi, 1) != 1)
+    {
+      clib_warning ("Can't allocate buffer for Map-Request!");
+      return 0;
+    }
+
+  b = vlib_get_buffer (vm, bi);
+
+  /* leave some space for the encap headers */
+  vlib_buffer_make_headroom (b, MAX_LISP_MSG_ENCAP_LEN);
+
+  /* get rlocs */
+  rlocs = build_itr_rloc_list (lcm, loc_set);
+
+  if (MR_MODE_SRC_DST == lcm->map_request_mode
+      && GID_ADDR_SRC_DST != gid_address_type (deid))
+    {
+      gid_address_t sd;
+      memset (&sd, 0, sizeof (sd));
+      build_src_dst (&sd, seid, deid);
+      lisp_msg_put_mreq (lcm, b, seid, &sd, rlocs, is_smr_invoked,
+			 0 /* rloc probe */ , nonce_res);
+    }
+  else
+    {
+      /* put lisp msg */
+      lisp_msg_put_mreq (lcm, b, seid, deid, rlocs, is_smr_invoked,
+			 0 /* rloc probe */ , nonce_res);
+    }
+
+  /* push ecm: udp-ip-lisp */
+  lisp_msg_push_ecm (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, seid, deid);
+
+  /* push outer ip header */
+  pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, sloc,
+		       mr_ip);
+
+  bi_res[0] = bi;
+
+  vec_free (rlocs);
+  return b;
+}
+
+static void
+reset_pending_mr_counters (pending_map_request_t * r)
+{
+  r->time_to_expire = PENDING_MREQ_EXPIRATION_TIME;
+  r->retries_num = 0;
+}
+
+static int
+elect_map_resolver (lisp_cp_main_t * lcm)
+{
+  lisp_msmr_t *mr;
+
+  vec_foreach (mr, lcm->map_resolvers)
+  {
+    if (!mr->is_down)
+      {
+	ip_address_copy (&lcm->active_map_resolver, &mr->address);
+	lcm->do_map_resolver_election = 0;
+	return 1;
+      }
+  }
+  return 0;
+}
+
+static void
+free_map_register_records (mapping_t * maps)
+{
+  mapping_t *map;
+  vec_foreach (map, maps) vec_free (map->locators);
+
+  vec_free (maps);
+}
+
+static void
+add_locators (lisp_cp_main_t * lcm, mapping_t * m, u32 locator_set_index,
+	      ip_address_t * probed_loc)
+{
+  u32 *li;
+  locator_t *loc, new;
+  ip_interface_address_t *ia = 0;
+  void *addr;
+  ip_address_t *new_ip = &gid_address_ip (&new.address);
+
+  m->locators = 0;
+  locator_set_t *ls = pool_elt_at_index (lcm->locator_set_pool,
+					 locator_set_index);
+  vec_foreach (li, ls->locator_indices)
+  {
+    loc = pool_elt_at_index (lcm->locator_pool, li[0]);
+    new = loc[0];
+    if (loc->local)
+      {
+          /* *INDENT-OFF* */
+          foreach_ip_interface_address (&lcm->im4->lookup_main, ia,
+                                        loc->sw_if_index, 1 /* unnumbered */,
+          ({
+            addr = ip_interface_address_get_address (&lcm->im4->lookup_main,
+                                                     ia);
+            ip_address_set (new_ip, addr, IP4);
+          }));
+
+          /* Add ipv6 locators */
+          foreach_ip_interface_address (&lcm->im6->lookup_main, ia,
+                                        loc->sw_if_index, 1 /* unnumbered */,
+          ({
+            addr = ip_interface_address_get_address (&lcm->im6->lookup_main,
+                                                     ia);
+            ip_address_set (new_ip, addr, IP6);
+          }));
+          /* *INDENT-ON* */
+
+	if (probed_loc && ip_address_cmp (probed_loc, new_ip) == 0)
+	  new.probed = 1;
+      }
+    vec_add1 (m->locators, new);
+  }
+}
+
+static mapping_t *
+build_map_register_record_list (lisp_cp_main_t * lcm)
+{
+  mapping_t *recs = 0, rec, *m;
+
+  /* *INDENT-OFF* */
+  pool_foreach(m, lcm->mapping_pool,
+  {
+    /* for now build only local mappings */
+    if (!m->local)
+      continue;
+
+    rec = m[0];
+    add_locators (lcm, &rec, m->locator_set_index, NULL);
+    vec_add1 (recs, rec);
+  });
+  /* *INDENT-ON* */
+
+  return recs;
+}
+
+static int
+update_map_register_auth_data (map_register_hdr_t * map_reg_hdr,
+			       lisp_key_type_t key_id, u8 * key,
+			       u16 auth_data_len, u32 msg_len)
+{
+  MREG_KEY_ID (map_reg_hdr) = clib_host_to_net_u16 (key_id);
+  MREG_AUTH_DATA_LEN (map_reg_hdr) = clib_host_to_net_u16 (auth_data_len);
+
+  unsigned char *result = HMAC (get_encrypt_fcn (key_id), key, vec_len (key),
+				(unsigned char *) map_reg_hdr, msg_len, NULL,
+				NULL);
+  clib_memcpy (MREG_DATA (map_reg_hdr), result, auth_data_len);
+
+  return 0;
+}
+
+static vlib_buffer_t *
+build_map_register (lisp_cp_main_t * lcm, ip_address_t * sloc,
+		    ip_address_t * ms_ip, u64 * nonce_res, u8 want_map_notif,
+		    mapping_t * records, lisp_key_type_t key_id, u8 * key,
+		    u32 * bi_res)
+{
+  void *map_reg_hdr;
+  vlib_buffer_t *b;
+  u32 bi, auth_data_len = 0, msg_len = 0;
+  vlib_main_t *vm = lcm->vlib_main;
+
+  if (vlib_buffer_alloc (vm, &bi, 1) != 1)
+    {
+      clib_warning ("Can't allocate buffer for Map-Register!");
+      return 0;
+    }
+
+  b = vlib_get_buffer (vm, bi);
+
+  /* leave some space for the encap headers */
+  vlib_buffer_make_headroom (b, MAX_LISP_MSG_ENCAP_LEN);
+
+  auth_data_len = auth_data_len_by_key_id (key_id);
+  map_reg_hdr = lisp_msg_put_map_register (b, records, want_map_notif,
+					   auth_data_len, nonce_res,
+					   &msg_len);
+
+  update_map_register_auth_data (map_reg_hdr, key_id, key, auth_data_len,
+				 msg_len);
+
+  /* push outer ip header */
+  pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, sloc,
+		       ms_ip);
+
+  bi_res[0] = bi;
+  return b;
+}
+
+static int
+get_egress_map_resolver_ip (lisp_cp_main_t * lcm, ip_address_t * ip)
+{
+  lisp_msmr_t *mr;
+  while (lcm->do_map_resolver_election
+	 | (0 == ip_fib_get_first_egress_ip_for_dst (lcm,
+						     &lcm->active_map_resolver,
+						     ip)))
+    {
+      if (0 == elect_map_resolver (lcm))
+	/* all map resolvers are down */
+	{
+	  /* restart MR checking by marking all of them up */
+	  vec_foreach (mr, lcm->map_resolvers) mr->is_down = 0;
+	  return -1;
+	}
+    }
+  return 0;
+}
+
+static int
+send_rloc_probe (lisp_cp_main_t * lcm, gid_address_t * deid,
+		 u32 local_locator_set_index, ip_address_t * sloc,
+		 ip_address_t * rloc)
+{
+  locator_set_t *ls;
+  u32 bi;
+  vlib_buffer_t *b;
+  vlib_frame_t *f;
+  u64 nonce = 0;
+  u32 next_index, *to_next;
+  gid_address_t *itr_rlocs;
+
+  ls = pool_elt_at_index (lcm->locator_set_pool, local_locator_set_index);
+  itr_rlocs = build_itr_rloc_list (lcm, ls);
+
+  b = build_map_request (lcm, deid, sloc, rloc, itr_rlocs, &nonce, &bi);
+  vec_free (itr_rlocs);
+  if (!b)
+    return -1;
+
+  vnet_buffer (b)->sw_if_index[VLIB_TX] = 0;
+
+  next_index = (ip_addr_version (&lcm->active_map_resolver) == IP4) ?
+    ip4_lookup_node.index : ip6_lookup_node.index;
+
+  f = vlib_get_frame_to_node (lcm->vlib_main, next_index);
+
+  /* Enqueue the packet */
+  to_next = vlib_frame_vector_args (f);
+  to_next[0] = bi;
+  f->n_vectors = 1;
+  vlib_put_frame_to_node (lcm->vlib_main, next_index, f);
+
+  hash_set (lcm->map_register_messages_by_nonce, nonce, 0);
+  return 0;
+}
+
+static int
+send_rloc_probes (lisp_cp_main_t * lcm)
+{
+  u8 lprio = 0;
+  mapping_t *lm;
+  fwd_entry_t *e;
+  locator_pair_t *lp;
+  u32 si;
+
+  /* *INDENT-OFF* */
+  pool_foreach (e, lcm->fwd_entry_pool,
+  {
+    if (vec_len (e->locator_pairs) == 0)
+      continue;
+
+    si = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &e->leid);
+    if (~0 == si)
+      {
+        clib_warning ("internal error: cannot find local eid %U in "
+                      "map-cache!", format_gid_address, &e->leid);
+        continue;
+      }
+    lm = pool_elt_at_index (lcm->mapping_pool, si);
+
+    /* get the best (lowest) priority */
+    lprio = e->locator_pairs[0].priority;
+
+    /* send rloc-probe for pair(s) with the best remote locator priority */
+    vec_foreach (lp, e->locator_pairs)
+      {
+        if (lp->priority != lprio)
+          break;
+
+        /* get first remote locator */
+        send_rloc_probe (lcm, &e->reid, lm->locator_set_index, &lp->lcl_loc,
+                         &lp->rmt_loc);
+      }
+  });
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+static int
+send_map_register (lisp_cp_main_t * lcm, u8 want_map_notif)
+{
+  u32 bi;
+  vlib_buffer_t *b;
+  ip_address_t sloc;
+  vlib_frame_t *f;
+  u64 nonce = 0;
+  u32 next_index, *to_next;
+  ip_address_t *ms = 0;
+  mapping_t *records, *r, *g;
+
+  // TODO: support multiple map servers and do election
+  if (0 == vec_len (lcm->map_servers))
+    return -1;
+
+  ms = &lcm->map_servers[0].address;
+
+  if (0 == ip_fib_get_first_egress_ip_for_dst (lcm, ms, &sloc))
+    {
+      clib_warning ("no eligible interface address found for %U!",
+		    format_ip_address, &lcm->map_servers[0]);
+      return -1;
+    }
+
+  records = build_map_register_record_list (lcm);
+  if (!records)
+    return -1;
+
+  vec_foreach (r, records)
+  {
+    u8 *key = r->key;
+    u8 key_id = r->key_id;
+
+    if (!key)
+      continue;			/* no secret key -> map-register cannot be sent */
+
+    g = 0;
+    // TODO: group mappings that share common key
+    vec_add1 (g, r[0]);
+    b = build_map_register (lcm, &sloc, ms, &nonce, want_map_notif, g,
+			    key_id, key, &bi);
+    vec_free (g);
+    if (!b)
+      continue;
+
+    vnet_buffer (b)->sw_if_index[VLIB_TX] = 0;
+
+    next_index = (ip_addr_version (&lcm->active_map_resolver) == IP4) ?
+      ip4_lookup_node.index : ip6_lookup_node.index;
+
+    f = vlib_get_frame_to_node (lcm->vlib_main, next_index);
+
+    /* Enqueue the packet */
+    to_next = vlib_frame_vector_args (f);
+    to_next[0] = bi;
+    f->n_vectors = 1;
+    vlib_put_frame_to_node (lcm->vlib_main, next_index, f);
+
+    hash_set (lcm->map_register_messages_by_nonce, nonce, 0);
+  }
+  free_map_register_records (records);
+
+  return 0;
+}
+
+#define send_encapsulated_map_request(lcm, seid, deid, smr) \
+  _send_encapsulated_map_request(lcm, seid, deid, smr, 0)
+
+#define resend_encapsulated_map_request(lcm, seid, deid, smr) \
+  _send_encapsulated_map_request(lcm, seid, deid, smr, 1)
+
+static int
+_send_encapsulated_map_request (lisp_cp_main_t * lcm,
+				gid_address_t * seid, gid_address_t * deid,
+				u8 is_smr_invoked, u8 is_resend)
+{
+  u32 next_index, bi = 0, *to_next, map_index;
+  vlib_buffer_t *b;
+  vlib_frame_t *f;
+  u64 nonce = 0;
+  locator_set_t *loc_set;
+  mapping_t *map;
+  pending_map_request_t *pmr, *duplicate_pmr = 0;
+  ip_address_t sloc;
+  u32 ls_index;
+
+  /* if there is already a pending request remember it */
+
+  /* *INDENT-OFF* */
+  pool_foreach(pmr, lcm->pending_map_requests_pool,
+  ({
+    if (!gid_address_cmp (&pmr->src, seid)
+        && !gid_address_cmp (&pmr->dst, deid))
+      {
+        duplicate_pmr = pmr;
+        break;
+      }
+  }));
+  /* *INDENT-ON* */
+
+  if (!is_resend && duplicate_pmr)
+    {
+      /* don't send the request if there is a pending map request already */
+      return 0;
+    }
+
+  /* get locator-set for seid */
+  if (!lcm->lisp_pitr)
+    {
+      map_index = gid_dictionary_lookup (&lcm->mapping_index_by_gid, seid);
+      if (map_index == ~0)
+	{
+	  clib_warning ("No local mapping found in eid-table for %U!",
+			format_gid_address, seid);
+	  return -1;
+	}
+
+      map = pool_elt_at_index (lcm->mapping_pool, map_index);
+
+      if (!map->local)
+	{
+	  clib_warning
+	    ("Mapping found for src eid %U is not marked as local!",
+	     format_gid_address, seid);
+	  return -1;
+	}
+      ls_index = map->locator_set_index;
+    }
+  else
+    {
+      map_index = lcm->pitr_map_index;
+      map = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
+      ls_index = map->locator_set_index;
+    }
+
+  /* overwrite locator set if map-request itr-rlocs configured */
+  if (~0 != lcm->mreq_itr_rlocs)
+    {
+      ls_index = lcm->mreq_itr_rlocs;
+    }
+
+  loc_set = pool_elt_at_index (lcm->locator_set_pool, ls_index);
+
+  if (get_egress_map_resolver_ip (lcm, &sloc) < 0)
+    {
+      if (duplicate_pmr)
+	duplicate_pmr->to_be_removed = 1;
+      return -1;
+    }
+
+  /* build the encapsulated map request */
+  b = build_encapsulated_map_request (lcm, seid, deid, loc_set,
+				      &lcm->active_map_resolver,
+				      &sloc, is_smr_invoked, &nonce, &bi);
+
+  if (!b)
+    return -1;
+
+  /* set fib index to default and lookup node */
+  vnet_buffer (b)->sw_if_index[VLIB_TX] = 0;
+  next_index = (ip_addr_version (&lcm->active_map_resolver) == IP4) ?
+    ip4_lookup_node.index : ip6_lookup_node.index;
+
+  f = vlib_get_frame_to_node (lcm->vlib_main, next_index);
+
+  /* Enqueue the packet */
+  to_next = vlib_frame_vector_args (f);
+  to_next[0] = bi;
+  f->n_vectors = 1;
+  vlib_put_frame_to_node (lcm->vlib_main, next_index, f);
+
+  if (duplicate_pmr)
+    /* if there is a pending request already update it */
+    {
+      if (clib_fifo_elts (duplicate_pmr->nonces) >= PENDING_MREQ_QUEUE_LEN)
+	{
+	  /* remove the oldest nonce */
+	  u64 CLIB_UNUSED (tmp), *nonce_del;
+	  nonce_del = clib_fifo_head (duplicate_pmr->nonces);
+	  hash_unset (lcm->pending_map_requests_by_nonce, nonce_del[0]);
+	  clib_fifo_sub1 (duplicate_pmr->nonces, tmp);
+	}
+
+      clib_fifo_add1 (duplicate_pmr->nonces, nonce);
+      hash_set (lcm->pending_map_requests_by_nonce, nonce,
+		duplicate_pmr - lcm->pending_map_requests_pool);
+    }
+  else
+    {
+      /* add map-request to pending requests table */
+      pool_get (lcm->pending_map_requests_pool, pmr);
+      memset (pmr, 0, sizeof (*pmr));
+      gid_address_copy (&pmr->src, seid);
+      gid_address_copy (&pmr->dst, deid);
+      clib_fifo_add1 (pmr->nonces, nonce);
+      pmr->is_smr_invoked = is_smr_invoked;
+      reset_pending_mr_counters (pmr);
+      hash_set (lcm->pending_map_requests_by_nonce, nonce,
+		pmr - lcm->pending_map_requests_pool);
+    }
+
+  return 0;
+}
+
+static void
+get_src_and_dst_ip (void *hdr, ip_address_t * src, ip_address_t * dst)
+{
+  ip4_header_t *ip4 = hdr;
+  ip6_header_t *ip6;
+
+  if ((ip4->ip_version_and_header_length & 0xF0) == 0x40)
+    {
+      ip_address_set (src, &ip4->src_address, IP4);
+      ip_address_set (dst, &ip4->dst_address, IP4);
+    }
+  else
+    {
+      ip6 = hdr;
+      ip_address_set (src, &ip6->src_address, IP6);
+      ip_address_set (dst, &ip6->dst_address, IP6);
+    }
+}
+
+static u32
+lisp_get_vni_from_buffer_ip (lisp_cp_main_t * lcm, vlib_buffer_t * b,
+			     u8 version)
+{
+  uword *vnip;
+  u32 vni = ~0, table_id = ~0;
+
+  table_id = fib_table_get_table_id_for_sw_if_index ((version ==
+						      IP4 ? FIB_PROTOCOL_IP4 :
+						      FIB_PROTOCOL_IP6),
+						     vnet_buffer
+						     (b)->sw_if_index
+						     [VLIB_RX]);
+
+  vnip = hash_get (lcm->vni_by_table_id, table_id);
+  if (vnip)
+    vni = vnip[0];
+  else
+    clib_warning ("vrf %d is not mapped to any vni!", table_id);
+
+  return vni;
+}
+
+always_inline u32
+lisp_get_vni_from_buffer_eth (lisp_cp_main_t * lcm, vlib_buffer_t * b)
+{
+  uword *vnip;
+  u32 vni = ~0;
+  u32 sw_if_index0;
+
+  l2input_main_t *l2im = &l2input_main;
+  l2_input_config_t *config;
+  l2_bridge_domain_t *bd_config;
+
+  sw_if_index0 = vnet_buffer (b)->sw_if_index[VLIB_RX];
+  config = vec_elt_at_index (l2im->configs, sw_if_index0);
+  bd_config = vec_elt_at_index (l2im->bd_configs, config->bd_index);
+
+  vnip = hash_get (lcm->vni_by_bd_id, bd_config->bd_id);
+  if (vnip)
+    vni = vnip[0];
+  else
+    clib_warning ("bridge domain %d is not mapped to any vni!",
+		  config->bd_index);
+
+  return vni;
+}
+
+always_inline void
+get_src_and_dst_eids_from_buffer (lisp_cp_main_t * lcm, vlib_buffer_t * b,
+				  gid_address_t * src, gid_address_t * dst)
+{
+  u32 vni = 0;
+  u16 type;
+
+  memset (src, 0, sizeof (*src));
+  memset (dst, 0, sizeof (*dst));
+  type = vnet_buffer (b)->lisp.overlay_afi;
+
+  if (LISP_AFI_IP == type || LISP_AFI_IP6 == type)
+    {
+      ip4_header_t *ip;
+      u8 version, preflen;
+
+      gid_address_type (src) = GID_ADDR_IP_PREFIX;
+      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
+
+      ip = vlib_buffer_get_current (b);
+      get_src_and_dst_ip (ip, &gid_address_ip (src), &gid_address_ip (dst));
+
+      version = gid_address_ip_version (src);
+      preflen = ip_address_max_len (version);
+      gid_address_ippref_len (src) = preflen;
+      gid_address_ippref_len (dst) = preflen;
+
+      vni = lisp_get_vni_from_buffer_ip (lcm, b, version);
+      gid_address_vni (dst) = vni;
+      gid_address_vni (src) = vni;
+    }
+  else if (LISP_AFI_MAC == type)
+    {
+      ethernet_header_t *eh;
+
+      eh = vlib_buffer_get_current (b);
+
+      gid_address_type (src) = GID_ADDR_MAC;
+      gid_address_type (dst) = GID_ADDR_MAC;
+      mac_copy (&gid_address_mac (src), eh->src_address);
+      mac_copy (&gid_address_mac (dst), eh->dst_address);
+
+      /* get vni */
+      vni = lisp_get_vni_from_buffer_eth (lcm, b);
+
+      gid_address_vni (dst) = vni;
+      gid_address_vni (src) = vni;
+    }
+}
+
+static uword
+lisp_cp_lookup_inline (vlib_main_t * vm,
+		       vlib_node_runtime_t * node,
+		       vlib_frame_t * from_frame, int overlay)
+{
+  u32 *from, *to_next_drop, di, si;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  u32 pkts_mapped = 0;
+  uword n_left_from, n_left_to_next_drop;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, LISP_CP_LOOKUP_NEXT_DROP,
+			   to_next_drop, n_left_to_next_drop);
+
+      while (n_left_from > 0 && n_left_to_next_drop > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *b0;
+	  gid_address_t src, dst;
+
+	  pi0 = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next_drop[0] = pi0;
+	  to_next_drop += 1;
+	  n_left_to_next_drop -= 1;
+
+	  b0 = vlib_get_buffer (vm, pi0);
+	  b0->error = node->errors[LISP_CP_LOOKUP_ERROR_DROP];
+	  vnet_buffer (b0)->lisp.overlay_afi = overlay;
+
+	  /* src/dst eid pair */
+	  get_src_and_dst_eids_from_buffer (lcm, b0, &src, &dst);
+
+	  /* if we have remote mapping for destination already in map-chache
+	     add forwarding tunnel directly. If not send a map-request */
+	  di = gid_dictionary_sd_lookup (&lcm->mapping_index_by_gid, &dst,
+					 &src);
+	  if (~0 != di)
+	    {
+	      mapping_t *m = vec_elt_at_index (lcm->mapping_pool, di);
+	      /* send a map-request also in case of negative mapping entry
+	         with corresponding action */
+	      if (m->action == LISP_SEND_MAP_REQUEST)
+		{
+		  /* send map-request */
+		  queue_map_request (&src, &dst, 0 /* smr_invoked */ ,
+				     0 /* is_resend */ );
+		  pkts_mapped++;
+		}
+	      else
+		{
+		  si = gid_dictionary_lookup (&lcm->mapping_index_by_gid,
+					      &src);
+		  if (~0 != si)
+		    {
+		      dp_add_fwd_entry (lcm, si, di);
+		    }
+		}
+	    }
+	  else
+	    {
+	      /* send map-request */
+	      queue_map_request (&src, &dst, 0 /* smr_invoked */ ,
+				 0 /* is_resend */ );
+	      pkts_mapped++;
+	    }
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      lisp_cp_lookup_trace_t *tr = vlib_add_trace (vm, node, b0,
+							   sizeof (*tr));
+
+	      memset (tr, 0, sizeof (*tr));
+	      gid_address_copy (&tr->dst_eid, &dst);
+	      ip_address_copy (&tr->map_resolver_ip,
+			       &lcm->active_map_resolver);
+	    }
+	  gid_address_free (&dst);
+	  gid_address_free (&src);
+	}
+
+      vlib_put_next_frame (vm, node, LISP_CP_LOOKUP_NEXT_DROP,
+			   n_left_to_next_drop);
+    }
+  vlib_node_increment_counter (vm, node->node_index,
+			       LISP_CP_LOOKUP_ERROR_MAP_REQUESTS_SENT,
+			       pkts_mapped);
+  return from_frame->n_vectors;
+}
+
+static uword
+lisp_cp_lookup_ip4 (vlib_main_t * vm,
+		    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  return (lisp_cp_lookup_inline (vm, node, from_frame, LISP_AFI_IP));
+}
+
+static uword
+lisp_cp_lookup_ip6 (vlib_main_t * vm,
+		    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  return (lisp_cp_lookup_inline (vm, node, from_frame, LISP_AFI_IP6));
+}
+
+static uword
+lisp_cp_lookup_l2 (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  return (lisp_cp_lookup_inline (vm, node, from_frame, LISP_AFI_MAC));
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (lisp_cp_lookup_ip4_node) = {
+  .function = lisp_cp_lookup_ip4,
+  .name = "lisp-cp-lookup-ip4",
+  .vector_size = sizeof (u32),
+  .format_trace = format_lisp_cp_lookup_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = LISP_CP_LOOKUP_N_ERROR,
+  .error_strings = lisp_cp_lookup_error_strings,
+
+  .n_next_nodes = LISP_CP_LOOKUP_N_NEXT,
+
+  .next_nodes = {
+      [LISP_CP_LOOKUP_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (lisp_cp_lookup_ip6_node) = {
+  .function = lisp_cp_lookup_ip6,
+  .name = "lisp-cp-lookup-ip6",
+  .vector_size = sizeof (u32),
+  .format_trace = format_lisp_cp_lookup_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = LISP_CP_LOOKUP_N_ERROR,
+  .error_strings = lisp_cp_lookup_error_strings,
+
+  .n_next_nodes = LISP_CP_LOOKUP_N_NEXT,
+
+  .next_nodes = {
+      [LISP_CP_LOOKUP_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (lisp_cp_lookup_l2_node) = {
+  .function = lisp_cp_lookup_l2,
+  .name = "lisp-cp-lookup-l2",
+  .vector_size = sizeof (u32),
+  .format_trace = format_lisp_cp_lookup_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = LISP_CP_LOOKUP_N_ERROR,
+  .error_strings = lisp_cp_lookup_error_strings,
+
+  .n_next_nodes = LISP_CP_LOOKUP_N_NEXT,
+
+  .next_nodes = {
+      [LISP_CP_LOOKUP_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* lisp_cp_input statistics */
+#define foreach_lisp_cp_input_error                     \
+_(DROP, "drop")                                         \
+_(MAP_REPLIES_RECEIVED, "map-replies received")
+
+static char *lisp_cp_input_error_strings[] = {
+#define _(sym,string) string,
+  foreach_lisp_cp_input_error
+#undef _
+};
+
+typedef enum
+{
+#define _(sym,str) LISP_CP_INPUT_ERROR_##sym,
+  foreach_lisp_cp_input_error
+#undef _
+    LISP_CP_INPUT_N_ERROR,
+} lisp_cp_input_error_t;
+
+typedef enum
+{
+  LISP_CP_INPUT_NEXT_DROP,
+  LISP_CP_INPUT_N_NEXT,
+} lisp_cp_input_next_t;
+
+typedef struct
+{
+  gid_address_t dst_eid;
+  ip4_address_t map_resolver_ip;
+} lisp_cp_input_trace_t;
+
+u8 *
+format_lisp_cp_input_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  CLIB_UNUSED (lisp_cp_input_trace_t * t) =
+    va_arg (*args, lisp_cp_input_trace_t *);
+
+  s = format (s, "LISP-CP-INPUT: TODO");
+  return s;
+}
+
+static void
+remove_expired_mapping (lisp_cp_main_t * lcm, u32 mi)
+{
+  mapping_t *m;
+
+  m = pool_elt_at_index (lcm->mapping_pool, mi);
+  lisp_add_del_adjacency (lcm, 0, &m->eid, 0 /* is_add */ );
+  vnet_lisp_add_del_mapping (&m->eid, 0, 0, 0, ~0, 0 /* is_add */ ,
+			     0 /* is_static */ , 0);
+  mapping_delete_timer (lcm, mi);
+}
+
+static void
+mapping_start_expiration_timer (lisp_cp_main_t * lcm, u32 mi,
+				f64 expiration_time)
+{
+  mapping_t *m;
+  u64 now = clib_cpu_time_now ();
+  u64 cpu_cps = lcm->vlib_main->clib_time.clocks_per_second;
+  u64 exp_clock_time = now + expiration_time * cpu_cps;
+
+  m = pool_elt_at_index (lcm->mapping_pool, mi);
+
+  m->timer_set = 1;
+  timing_wheel_insert (&lcm->wheel, exp_clock_time, mi);
+}
+
+static void
+map_records_arg_free (map_records_arg_t * a)
+{
+  mapping_t *m;
+  vec_foreach (m, a->mappings)
+  {
+    vec_free (m->locators);
+    gid_address_free (&m->eid);
+  }
+
+  clib_mem_free (a);
+}
+
+void *
+process_map_reply (map_records_arg_t * a)
+{
+  mapping_t *m;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  u32 dst_map_index = 0;
+  pending_map_request_t *pmr;
+  u64 *noncep;
+  uword *pmr_index;
+
+  if (a->is_rloc_probe)
+    goto done;
+
+  /* Check pending requests table and nonce */
+  pmr_index = hash_get (lcm->pending_map_requests_by_nonce, a->nonce);
+  if (!pmr_index)
+    {
+      clib_warning ("No pending map-request entry with nonce %lu!", a->nonce);
+      goto done;
+    }
+  pmr = pool_elt_at_index (lcm->pending_map_requests_pool, pmr_index[0]);
+
+  vec_foreach (m, a->mappings)
+  {
+    /* insert/update mappings cache */
+    vnet_lisp_add_del_mapping (&m->eid, m->locators, m->action,
+			       m->authoritative, m->ttl,
+			       1, 0 /* is_static */ , &dst_map_index);
+
+    /* try to program forwarding only if mapping saved or updated */
+    if ((u32) ~ 0 != dst_map_index)
+      {
+	lisp_add_del_adjacency (lcm, &pmr->src, &m->eid, 1);
+	if ((u32) ~ 0 != m->ttl)
+	  mapping_start_expiration_timer (lcm, dst_map_index, m->ttl * 60);
+      }
+  }
+
+  /* remove pending map request entry */
+
+  /* *INDENT-OFF* */
+  clib_fifo_foreach (noncep, pmr->nonces, ({
+    hash_unset(lcm->pending_map_requests_by_nonce, noncep[0]);
+  }));
+  /* *INDENT-ON* */
+
+  clib_fifo_free (pmr->nonces);
+  pool_put (lcm->pending_map_requests_pool, pmr);
+
+done:
+  map_records_arg_free (a);
+  return 0;
+}
+
+static int
+is_auth_data_valid (map_notify_hdr_t * h, u32 msg_len,
+		    lisp_key_type_t key_id, u8 * key)
+{
+  u8 *auth_data = 0;
+  u16 auth_data_len;
+  int result;
+
+  auth_data_len = auth_data_len_by_key_id (key_id);
+  if ((u16) ~ 0 == auth_data_len)
+    {
+      clib_warning ("invalid length for key_id %d!", key_id);
+      return 0;
+    }
+
+  /* save auth data */
+  vec_validate (auth_data, auth_data_len - 1);
+  clib_memcpy (auth_data, MNOTIFY_DATA (h), auth_data_len);
+
+  /* clear auth data */
+  memset (MNOTIFY_DATA (h), 0, auth_data_len);
+
+  /* get hash of the message */
+  unsigned char *code = HMAC (get_encrypt_fcn (key_id), key, vec_len (key),
+			      (unsigned char *) h, msg_len, NULL, NULL);
+
+  result = memcmp (code, auth_data, auth_data_len);
+
+  vec_free (auth_data);
+
+  return !result;
+}
+
+static void
+process_map_notify (map_records_arg_t * a)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  uword *pmr_index;
+
+  pmr_index = hash_get (lcm->map_register_messages_by_nonce, a->nonce);
+  if (!pmr_index)
+    {
+      clib_warning ("No pending map-register entry with nonce %lu!",
+		    a->nonce);
+      return;
+    }
+
+  map_records_arg_free (a);
+  hash_unset (lcm->map_register_messages_by_nonce, a->nonce);
+}
+
+static mapping_t *
+get_mapping (lisp_cp_main_t * lcm, gid_address_t * e)
+{
+  u32 mi;
+
+  mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, e);
+  if (~0 == mi)
+    {
+      clib_warning ("eid %U not found in map-cache!", unformat_gid_address,
+		    e);
+      return 0;
+    }
+  return pool_elt_at_index (lcm->mapping_pool, mi);
+}
+
+/**
+ * When map-notify is received it is necessary that all EIDs in the record
+ * list share common key. The key is then used to verify authentication
+ * data in map-notify message.
+ */
+static int
+map_record_integrity_check (lisp_cp_main_t * lcm, mapping_t * maps,
+			    u32 key_id, u8 ** key_out)
+{
+  u32 i, len = vec_len (maps);
+  mapping_t *m;
+
+  /* get key of the first mapping */
+  m = get_mapping (lcm, &maps[0].eid);
+  if (!m || !m->key)
+    return -1;
+
+  key_out[0] = m->key;
+
+  for (i = 1; i < len; i++)
+    {
+      m = get_mapping (lcm, &maps[i].eid);
+      if (!m || !m->key)
+	return -1;
+
+      if (key_id != m->key_id || vec_cmp (m->key, key_out[0]))
+	{
+	  clib_warning ("keys does not match! %v, %v", key_out[0], m->key);
+	  return -1;
+	}
+    }
+  return 0;
+}
+
+static int
+parse_map_records (vlib_buffer_t * b, map_records_arg_t * a, u8 count)
+{
+  locator_t *locators = 0;
+  u32 i, len;
+  gid_address_t deid;
+  mapping_t m;
+  locator_t *loc;
+
+  /* parse record eid */
+  for (i = 0; i < count; i++)
+    {
+      len = lisp_msg_parse_mapping_record (b, &deid, &locators, NULL);
+      if (len == ~0)
+	{
+	  clib_warning ("Failed to parse mapping record!");
+	  vec_foreach (loc, locators) locator_free (loc);
+	  vec_free (locators);
+	  return -1;
+	}
+
+      m.locators = locators;
+      gid_address_copy (&m.eid, &deid);
+      vec_add1 (a->mappings, m);
+    }
+
+  return 0;
+}
+
+static map_records_arg_t *
+parse_map_notify (vlib_buffer_t * b)
+{
+  int rc = 0;
+  map_notify_hdr_t *mnotif_hdr;
+  lisp_key_type_t key_id;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  u8 *key = 0;
+  gid_address_t deid;
+  u16 auth_data_len = 0;
+  u8 record_count;
+  map_records_arg_t *a = clib_mem_alloc (sizeof (*a));
+
+  memset (a, 0, sizeof (*a));
+  mnotif_hdr = vlib_buffer_get_current (b);
+  vlib_buffer_pull (b, sizeof (*mnotif_hdr));
+  memset (&deid, 0, sizeof (deid));
+
+  a->nonce = MNOTIFY_NONCE (mnotif_hdr);
+  key_id = clib_net_to_host_u16 (MNOTIFY_KEY_ID (mnotif_hdr));
+  auth_data_len = auth_data_len_by_key_id (key_id);
+
+  /* advance buffer by authentication data */
+  vlib_buffer_pull (b, auth_data_len);
+
+  record_count = MNOTIFY_REC_COUNT (mnotif_hdr);
+  rc = parse_map_records (b, a, record_count);
+  if (rc != 0)
+    {
+      map_records_arg_free (a);
+      return 0;
+    }
+
+  rc = map_record_integrity_check (lcm, a->mappings, key_id, &key);
+  if (rc != 0)
+    {
+      map_records_arg_free (a);
+      return 0;
+    }
+
+  /* verify authentication data */
+  if (!is_auth_data_valid (mnotif_hdr, vlib_buffer_get_tail (b)
+			   - (u8 *) mnotif_hdr, key_id, key))
+    {
+      clib_warning ("Map-notify auth data verification failed for nonce %lu!",
+		    a->nonce);
+      map_records_arg_free (a);
+      return 0;
+    }
+  return a;
+}
+
+static vlib_buffer_t *
+build_map_reply (lisp_cp_main_t * lcm, ip_address_t * sloc,
+		 ip_address_t * dst, u64 nonce, u8 probe_bit,
+		 mapping_t * records, u16 dst_port, u32 * bi_res)
+{
+  vlib_buffer_t *b;
+  u32 bi;
+  vlib_main_t *vm = lcm->vlib_main;
+
+  if (vlib_buffer_alloc (vm, &bi, 1) != 1)
+    {
+      clib_warning ("Can't allocate buffer for Map-Register!");
+      return 0;
+    }
+
+  b = vlib_get_buffer (vm, bi);
+
+  /* leave some space for the encap headers */
+  vlib_buffer_make_headroom (b, MAX_LISP_MSG_ENCAP_LEN);
+
+  lisp_msg_put_map_reply (b, records, nonce, probe_bit);
+
+  /* push outer ip header */
+  pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, dst_port, sloc, dst);
+
+  bi_res[0] = bi;
+  return b;
+}
+
+static int
+send_map_reply (lisp_cp_main_t * lcm, u32 mi, ip_address_t * dst,
+		u8 probe_bit, u64 nonce, u16 dst_port,
+		ip_address_t * probed_loc)
+{
+  ip_address_t src;
+  u32 bi;
+  vlib_buffer_t *b;
+  vlib_frame_t *f;
+  u32 next_index, *to_next;
+  mapping_t *records = 0, *m;
+
+  m = pool_elt_at_index (lcm->mapping_pool, mi);
+  if (!m)
+    return -1;
+
+  vec_add1 (records, m[0]);
+  add_locators (lcm, &records[0], m->locator_set_index, probed_loc);
+  memset (&src, 0, sizeof (src));
+
+  if (!ip_fib_get_first_egress_ip_for_dst (lcm, dst, &src))
+    {
+      clib_warning ("can't find inteface address for %U", format_ip_address,
+		    dst);
+      return -1;
+    }
+
+  b = build_map_reply (lcm, &src, dst, nonce, probe_bit, records, dst_port,
+		       &bi);
+  if (!b)
+    return -1;
+  free_map_register_records (records);
+
+  vnet_buffer (b)->sw_if_index[VLIB_TX] = 0;
+  next_index = (ip_addr_version (&lcm->active_map_resolver) == IP4) ?
+    ip4_lookup_node.index : ip6_lookup_node.index;
+
+  f = vlib_get_frame_to_node (lcm->vlib_main, next_index);
+
+  /* Enqueue the packet */
+  to_next = vlib_frame_vector_args (f);
+  to_next[0] = bi;
+  f->n_vectors = 1;
+  vlib_put_frame_to_node (lcm->vlib_main, next_index, f);
+  return 0;
+}
+
+void
+process_map_request (vlib_main_t * vm, lisp_cp_main_t * lcm,
+		     vlib_buffer_t * b)
+{
+  u8 *ip_hdr = 0, *udp_hdr;
+  ip4_header_t *ip4;
+  ip6_header_t *ip6;
+  ip_address_t *dst_loc = 0, probed_loc, src_loc;
+  mapping_t m;
+  map_request_hdr_t *mreq_hdr;
+  gid_address_t src, dst;
+  u64 nonce;
+  u32 i, len = 0;
+  gid_address_t *itr_rlocs = 0;
+
+  mreq_hdr = vlib_buffer_get_current (b);
+
+  // TODO ugly workaround to find out whether LISP is carried by ip4 or 6
+  // and needs to be fixed
+  udp_hdr = (u8 *) vlib_buffer_get_current (b) - sizeof (udp_header_t);
+  ip4 = (ip4_header_t *) (udp_hdr - sizeof (ip4_header_t));
+  ip6 = (ip6_header_t *) (udp_hdr - sizeof (ip6_header_t));
+
+  if ((ip4->ip_version_and_header_length & 0xF0) == 0x40)
+    ip_hdr = (u8 *) ip4;
+  else
+    {
+      u32 flags = clib_net_to_host_u32
+	(ip6->ip_version_traffic_class_and_flow_label);
+      if ((flags & 0xF0000000) == 0x60000000)
+	ip_hdr = (u8 *) ip6;
+      else
+	{
+	  clib_warning ("internal error: cannot determine whether packet "
+			"is ip4 or 6!");
+	  return;
+	}
+    }
+
+  vlib_buffer_pull (b, sizeof (*mreq_hdr));
+
+  nonce = MREQ_NONCE (mreq_hdr);
+
+  if (!MREQ_SMR (mreq_hdr) && !MREQ_RLOC_PROBE (mreq_hdr))
+    {
+      clib_warning
+	("Only SMR Map-Requests and RLOC probe supported for now!");
+      return;
+    }
+
+  /* parse src eid */
+  len = lisp_msg_parse_addr (b, &src);
+  if (len == ~0)
+    return;
+
+  len = lisp_msg_parse_itr_rlocs (b, &itr_rlocs,
+				  MREQ_ITR_RLOC_COUNT (mreq_hdr) + 1);
+  if (len == ~0)
+    return;
+
+  /* parse eid records and send SMR-invoked map-requests */
+  for (i = 0; i < MREQ_REC_COUNT (mreq_hdr); i++)
+    {
+      memset (&dst, 0, sizeof (dst));
+      len = lisp_msg_parse_eid_rec (b, &dst);
+      if (len == ~0)
+	{
+	  clib_warning ("Can't parse map-request EID-record");
+	  goto done;
+	}
+
+      if (MREQ_SMR (mreq_hdr))
+	{
+	  /* send SMR-invoked map-requests */
+	  queue_map_request (&dst, &src, 1 /* invoked */ , 0 /* resend */ );
+	}
+      else if (MREQ_RLOC_PROBE (mreq_hdr))
+	{
+	  memset (&m, 0, sizeof (m));
+	  u32 mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &dst);
+
+	  // TODO: select best locator; for now use the first one
+	  dst_loc = &gid_address_ip (&itr_rlocs[0]);
+
+	  /* get src/dst IP addresses */
+	  get_src_and_dst_ip (ip_hdr, &src_loc, &probed_loc);
+
+	  // TODO get source port from buffer
+	  u16 src_port = LISP_CONTROL_PORT;
+
+	  send_map_reply (lcm, mi, dst_loc, 1 /* probe-bit */ , nonce,
+			  src_port, &probed_loc);
+	}
+    }
+
+done:
+  vec_free (itr_rlocs);
+}
+
+static map_records_arg_t *
+parse_map_reply (vlib_buffer_t * b)
+{
+  locator_t probed;
+  gid_address_t deid;
+  void *h;
+  u32 i, len = 0;
+  mapping_t m;
+  map_reply_hdr_t *mrep_hdr;
+  map_records_arg_t *a = clib_mem_alloc (sizeof (*a));
+  memset (a, 0, sizeof (*a));
+  locator_t *locators;
+
+  mrep_hdr = vlib_buffer_get_current (b);
+  a->nonce = MREP_NONCE (mrep_hdr);
+  a->is_rloc_probe = MREP_RLOC_PROBE (mrep_hdr);
+  vlib_buffer_pull (b, sizeof (*mrep_hdr));
+
+  for (i = 0; i < MREP_REC_COUNT (mrep_hdr); i++)
+    {
+      memset (&m, 0, sizeof (m));
+      locators = 0;
+      h = vlib_buffer_get_current (b);
+
+      m.ttl = clib_net_to_host_u32 (MAP_REC_TTL (h));
+      m.action = MAP_REC_ACTION (h);
+      m.authoritative = MAP_REC_AUTH (h);
+
+      len = lisp_msg_parse_mapping_record (b, &deid, &locators, &probed);
+      if (len == ~0)
+	{
+	  clib_warning ("Failed to parse mapping record!");
+	  map_records_arg_free (a);
+	  return 0;
+	}
+
+      m.locators = locators;
+      gid_address_copy (&m.eid, &deid);
+      vec_add1 (a->mappings, m);
+    }
+  return a;
+}
+
+static void
+queue_map_reply_for_processing (map_records_arg_t * a)
+{
+  vl_api_rpc_call_main_thread (process_map_reply, (u8 *) a, sizeof (a));
+}
+
+static void
+queue_map_notify_for_processing (map_records_arg_t * a)
+{
+  vl_api_rpc_call_main_thread (process_map_notify, (u8 *) a, sizeof (a[0]));
+}
+
+static uword
+lisp_cp_input (vlib_main_t * vm, vlib_node_runtime_t * node,
+	       vlib_frame_t * from_frame)
+{
+  u32 n_left_from, *from, *to_next_drop;
+  lisp_msg_type_e type;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  map_records_arg_t *a;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next_drop;
+
+      vlib_get_next_frame (vm, node, LISP_CP_INPUT_NEXT_DROP,
+			   to_next_drop, n_left_to_next_drop);
+      while (n_left_from > 0 && n_left_to_next_drop > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+
+	  bi0 = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next_drop[0] = bi0;
+	  to_next_drop += 1;
+	  n_left_to_next_drop -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  type = lisp_msg_type (vlib_buffer_get_current (b0));
+	  switch (type)
+	    {
+	    case LISP_MAP_REPLY:
+	      a = parse_map_reply (b0);
+	      if (a)
+		queue_map_reply_for_processing (a);
+	      break;
+	    case LISP_MAP_REQUEST:
+	      process_map_request (vm, lcm, b0);
+	      break;
+	    case LISP_MAP_NOTIFY:
+	      a = parse_map_notify (b0);
+	      if (a)
+		queue_map_notify_for_processing (a);
+	      break;
+	    default:
+	      clib_warning ("Unsupported LISP message type %d", type);
+	      break;
+	    }
+
+	  b0->error = node->errors[LISP_CP_INPUT_ERROR_DROP];
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, LISP_CP_INPUT_NEXT_DROP,
+			   n_left_to_next_drop);
+    }
+  return from_frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (lisp_cp_input_node) = {
+  .function = lisp_cp_input,
+  .name = "lisp-cp-input",
+  .vector_size = sizeof (u32),
+  .format_trace = format_lisp_cp_input_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = LISP_CP_INPUT_N_ERROR,
+  .error_strings = lisp_cp_input_error_strings,
+
+  .n_next_nodes = LISP_CP_INPUT_N_NEXT,
+
+  .next_nodes = {
+      [LISP_CP_INPUT_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+lisp_cp_init (vlib_main_t * vm)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  clib_error_t *error = 0;
+
+  if ((error = vlib_call_init_function (vm, lisp_gpe_init)))
+    return error;
+
+  lcm->im4 = &ip4_main;
+  lcm->im6 = &ip6_main;
+  lcm->vlib_main = vm;
+  lcm->vnet_main = vnet_get_main ();
+  lcm->mreq_itr_rlocs = ~0;
+  lcm->lisp_pitr = 0;
+  memset (&lcm->active_map_resolver, 0, sizeof (lcm->active_map_resolver));
+
+  gid_dictionary_init (&lcm->mapping_index_by_gid);
+  lcm->do_map_resolver_election = 1;
+  lcm->map_request_mode = MR_MODE_DST_ONLY;
+
+  /* default vrf mapped to vni 0 */
+  hash_set (lcm->table_id_by_vni, 0, 0);
+  hash_set (lcm->vni_by_table_id, 0, 0);
+
+  udp_register_dst_port (vm, UDP_DST_PORT_lisp_cp,
+			 lisp_cp_input_node.index, 1 /* is_ip4 */ );
+  udp_register_dst_port (vm, UDP_DST_PORT_lisp_cp6,
+			 lisp_cp_input_node.index, 0 /* is_ip4 */ );
+
+  u64 now = clib_cpu_time_now ();
+  timing_wheel_init (&lcm->wheel, now, vm->clib_time.clocks_per_second);
+  return 0;
+}
+
+static void *
+send_map_request_thread_fn (void *arg)
+{
+  map_request_args_t *a = arg;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  if (a->is_resend)
+    resend_encapsulated_map_request (lcm, &a->seid, &a->deid, a->smr_invoked);
+  else
+    send_encapsulated_map_request (lcm, &a->seid, &a->deid, a->smr_invoked);
+
+  return 0;
+}
+
+static int
+queue_map_request (gid_address_t * seid, gid_address_t * deid,
+		   u8 smr_invoked, u8 is_resend)
+{
+  map_request_args_t a;
+
+  a.is_resend = is_resend;
+  gid_address_copy (&a.seid, seid);
+  gid_address_copy (&a.deid, deid);
+  a.smr_invoked = smr_invoked;
+
+  vl_api_rpc_call_main_thread (send_map_request_thread_fn,
+			       (u8 *) & a, sizeof (a));
+  return 0;
+}
+
+/**
+ * Take an action with a pending map request depending on expiration time
+ * and re-try counters.
+ */
+static void
+update_pending_request (pending_map_request_t * r, f64 dt)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  lisp_msmr_t *mr;
+
+  if (r->time_to_expire - dt < 0)
+    /* it's time to decide what to do with this pending request */
+    {
+      if (r->retries_num >= NUMBER_OF_RETRIES)
+	/* too many retries -> assume current map resolver is not available */
+	{
+	  mr = get_map_resolver (&lcm->active_map_resolver);
+	  if (!mr)
+	    {
+	      clib_warning ("Map resolver %U not found - probably deleted "
+			    "by the user recently.", format_ip_address,
+			    &lcm->active_map_resolver);
+	    }
+	  else
+	    {
+	      clib_warning ("map resolver %U is unreachable, ignoring",
+			    format_ip_address, &lcm->active_map_resolver);
+
+	      /* mark current map resolver unavailable so it won't be
+	       * selected next time */
+	      mr->is_down = 1;
+	      mr->last_update = vlib_time_now (lcm->vlib_main);
+	    }
+
+	  reset_pending_mr_counters (r);
+	  elect_map_resolver (lcm);
+
+	  /* try to find a next eligible map resolver and re-send */
+	  queue_map_request (&r->src, &r->dst, r->is_smr_invoked,
+			     1 /* resend */ );
+	}
+      else
+	{
+	  /* try again */
+	  queue_map_request (&r->src, &r->dst, r->is_smr_invoked,
+			     1 /* resend */ );
+	  r->retries_num++;
+	  r->time_to_expire = PENDING_MREQ_EXPIRATION_TIME;
+	}
+    }
+  else
+    r->time_to_expire -= dt;
+}
+
+static void
+remove_dead_pending_map_requests (lisp_cp_main_t * lcm)
+{
+  u64 *nonce;
+  pending_map_request_t *pmr;
+  u32 *to_be_removed = 0, *pmr_index;
+
+  /* *INDENT-OFF* */
+  pool_foreach (pmr, lcm->pending_map_requests_pool,
+  ({
+    if (pmr->to_be_removed)
+      {
+        clib_fifo_foreach (nonce, pmr->nonces, ({
+          hash_unset (lcm->pending_map_requests_by_nonce, nonce[0]);
+        }));
+
+        vec_add1 (to_be_removed, pmr - lcm->pending_map_requests_pool);
+      }
+  }));
+  /* *INDENT-ON* */
+
+  vec_foreach (pmr_index, to_be_removed)
+    pool_put_index (lcm->pending_map_requests_by_nonce, pmr_index[0]);
+
+  vec_free (to_be_removed);
+}
+
+static void
+update_rloc_probing (lisp_cp_main_t * lcm, f64 dt)
+{
+  static f64 time_left = RLOC_PROBING_INTERVAL;
+
+  if (!lcm->is_enabled || !lcm->rloc_probing)
+    return;
+
+  time_left -= dt;
+  if (time_left <= 0)
+    {
+      time_left = RLOC_PROBING_INTERVAL;
+      send_rloc_probes (lcm);
+    }
+}
+
+static void
+update_map_register (lisp_cp_main_t * lcm, f64 dt)
+{
+  static f64 time_left = QUICK_MAP_REGISTER_INTERVAL;
+  static u64 mreg_sent_counter = 0;
+
+  if (!lcm->is_enabled || !lcm->map_registering)
+    return;
+
+  time_left -= dt;
+  if (time_left <= 0)
+    {
+      if (mreg_sent_counter >= QUICK_MAP_REGISTER_MSG_COUNT)
+	time_left = MAP_REGISTER_INTERVAL;
+      else
+	{
+	  mreg_sent_counter++;
+	  time_left = QUICK_MAP_REGISTER_INTERVAL;
+	}
+      send_map_register (lcm, 1 /* want map notify */ );
+    }
+}
+
+static uword
+send_map_resolver_service (vlib_main_t * vm,
+			   vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  u32 *expired = 0;
+  f64 period = 2.0;
+  pending_map_request_t *pmr;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  while (1)
+    {
+      vlib_process_wait_for_event_or_clock (vm, period);
+
+      /* currently no signals are expected - just wait for clock */
+      (void) vlib_process_get_events (vm, 0);
+
+      /* *INDENT-OFF* */
+      pool_foreach (pmr, lcm->pending_map_requests_pool,
+      ({
+        if (!pmr->to_be_removed)
+          update_pending_request (pmr, period);
+      }));
+      /* *INDENT-ON* */
+
+      remove_dead_pending_map_requests (lcm);
+
+      update_map_register (lcm, period);
+      update_rloc_probing (lcm, period);
+
+      u64 now = clib_cpu_time_now ();
+
+      expired = timing_wheel_advance (&lcm->wheel, now, expired, 0);
+      if (vec_len (expired) > 0)
+	{
+	  u32 *mi = 0;
+	  vec_foreach (mi, expired)
+	  {
+	    remove_expired_mapping (lcm, mi[0]);
+	  }
+	  _vec_len (expired) = 0;
+	}
+    }
+
+  /* unreachable */
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (lisp_retry_service_node,static) = {
+    .function = send_map_resolver_service,
+    .type = VLIB_NODE_TYPE_PROCESS,
+    .name = "lisp-retry-service",
+    .process_log2_n_stack_bytes = 16,
+};
+/* *INDENT-ON* */
+
+VLIB_INIT_FUNCTION (lisp_cp_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-cp/control.h b/src/vnet/lisp-cp/control.h
new file mode 100644
index 00000000..e89c6fd6
--- /dev/null
+++ b/src/vnet/lisp-cp/control.h
@@ -0,0 +1,314 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef VNET_CONTROL_H_
+#define VNET_CONTROL_H_
+
+#include <vnet/vnet.h>
+#include <vnet/lisp-cp/gid_dictionary.h>
+#include <vnet/lisp-cp/lisp_types.h>
+
+#define NUMBER_OF_RETRIES                   1
+#define PENDING_MREQ_EXPIRATION_TIME        3.0	/* seconds */
+#define PENDING_MREQ_QUEUE_LEN              5
+
+#define PENDING_MREG_EXPIRATION_TIME        3.0	/* seconds */
+#define RLOC_PROBING_INTERVAL               60.0
+
+/* when map-registration is enabled "quick registration" takes place first.
+   In this mode ETR sends map-register messages at an increased frequency
+   until specified message count is reached */
+#define QUICK_MAP_REGISTER_MSG_COUNT        3
+#define QUICK_MAP_REGISTER_INTERVAL         3.0
+
+/* normal map-register period */
+#define MAP_REGISTER_INTERVAL               60.0
+
+/* 15 minutes */
+#define MAP_REGISTER_DEFAULT_TTL            900
+
+typedef struct
+{
+  gid_address_t src;
+  gid_address_t dst;
+  u32 retries_num;
+  f64 time_to_expire;
+  u8 is_smr_invoked;
+  u64 *nonces;
+  u8 to_be_removed;
+} pending_map_request_t;
+
+typedef struct
+{
+  gid_address_t leid;
+  gid_address_t reid;
+  u8 is_src_dst;
+  locator_pair_t *locator_pairs;
+} fwd_entry_t;
+
+typedef struct
+{
+  gid_address_t leid;
+  gid_address_t reid;
+} lisp_adjacency_t;
+
+typedef enum
+{
+  IP4_MISS_PACKET,
+  IP6_MISS_PACKET
+} miss_packet_type_t;
+
+/* map-server/map-resolver structure */
+typedef struct
+{
+  u8 is_down;
+  f64 last_update;
+  ip_address_t address;
+  char *key;
+} lisp_msmr_t;
+
+typedef struct
+{
+  /* headers */
+  u8 data[100];
+  u32 length;
+  miss_packet_type_t type;
+} miss_packet_t;
+
+typedef enum
+{
+  MR_MODE_DST_ONLY = 0,
+  MR_MODE_SRC_DST,
+  _MR_MODE_MAX
+} map_request_mode_t;
+
+typedef struct
+{
+  /* LISP feature status */
+  u8 is_enabled;
+
+  /* eid table */
+  gid_dictionary_t mapping_index_by_gid;
+
+  /* pool of mappings */
+  mapping_t *mapping_pool;
+
+  /* hash map of secret keys by mapping index */
+  u8 *key_by_mapping_index;
+
+  /* pool of locators */
+  locator_t *locator_pool;
+
+  /* pool of locator-sets */
+  locator_set_t *locator_set_pool;
+
+  /* vector of locator-set vectors composed of and indexed by locator index */
+  u32 **locator_to_locator_sets;
+
+  /* hash map of locators by name */
+  uword *locator_set_index_by_name;
+
+  /* vector of eid index vectors supported and indexed by locator-set index */
+  u32 **locator_set_to_eids;
+
+  /* vectors of indexes for local locator-sets and mappings */
+  u32 *local_mappings_indexes;
+  u32 *local_locator_set_indexes;
+
+  /* hash map of forwarding entries by mapping index */
+  u32 *fwd_entry_by_mapping_index;
+
+  /* forwarding entries pool */
+  fwd_entry_t *fwd_entry_pool;
+
+  /* hash map keyed by nonce of pending map-requests */
+  uword *pending_map_requests_by_nonce;
+
+  /* pool of pending map requests */
+  pending_map_request_t *pending_map_requests_pool;
+
+  /* hash map of sent map register messages */
+  uword *map_register_messages_by_nonce;
+
+  /* vector of map-resolvers */
+  lisp_msmr_t *map_resolvers;
+
+  /* vector of map-servers */
+  lisp_msmr_t *map_servers;
+
+  /* map resolver address currently being used for sending requests.
+   * This has to be an actual address and not an index to map_resolvers vector
+   * since the vector may be modified during request resend/retry procedure
+   * and break things :-) */
+  ip_address_t active_map_resolver;
+
+  u8 do_map_resolver_election;
+
+  /* map-request  locator set index */
+  u32 mreq_itr_rlocs;
+
+  /* vni to vrf hash tables */
+  uword *table_id_by_vni;
+  uword *vni_by_table_id;
+
+  /* vni to bd-index hash tables */
+  uword *bd_id_by_vni;
+  uword *vni_by_bd_id;
+
+  /* track l2 and l3 interfaces that have been created for vni */
+  uword *l2_dp_intf_by_vni;
+
+  /* Proxy ETR map index */
+  u32 pitr_map_index;
+
+  /* LISP PITR mode */
+  u8 lisp_pitr;
+
+  /* map request mode */
+  u8 map_request_mode;
+
+  /* enable/disable map registering */
+  u8 map_registering;
+
+  /* enable/disable rloc-probing */
+  u8 rloc_probing;
+
+  /* timing wheel for mappping timeouts */
+  timing_wheel_t wheel;
+
+  /* commodity */
+  ip4_main_t *im4;
+  ip6_main_t *im6;
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} lisp_cp_main_t;
+
+/* lisp-gpe control plane */
+lisp_cp_main_t lisp_control_main;
+
+extern vlib_node_registration_t lisp_cp_input_node;
+extern vlib_node_registration_t lisp_cp_lookup_ip4_node;
+extern vlib_node_registration_t lisp_cp_lookup_ip6_node;
+
+clib_error_t *lisp_cp_init ();
+
+always_inline lisp_cp_main_t *
+vnet_lisp_cp_get_main ()
+{
+  return &lisp_control_main;
+}
+
+typedef struct
+{
+  u8 is_add;
+  union
+  {
+    u8 *name;
+    u32 index;
+  };
+  locator_t *locators;
+  u8 local;
+} vnet_lisp_add_del_locator_set_args_t;
+
+int
+vnet_lisp_add_del_locator_set (vnet_lisp_add_del_locator_set_args_t * a,
+			       u32 * ls_index);
+int
+vnet_lisp_add_del_locator (vnet_lisp_add_del_locator_set_args_t * a,
+			   locator_set_t * ls, u32 * ls_index);
+
+typedef struct
+{
+  u8 is_add;
+  gid_address_t eid;
+  u32 locator_set_index;
+
+  u32 ttl;
+  u8 action;
+  u8 authoritative;
+
+  u8 local;
+  u8 is_static;
+  u8 *key;
+  u8 key_id;
+} vnet_lisp_add_del_mapping_args_t;
+
+int
+vnet_lisp_map_cache_add_del (vnet_lisp_add_del_mapping_args_t * a,
+			     u32 * map_index);
+int
+vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a,
+				 u32 * map_index_result);
+
+int
+vnet_lisp_add_del_mapping (gid_address_t * deid, locator_t * dlocs, u8 action,
+			   u8 authoritative, u32 ttl, u8 is_add, u8 is_static,
+			   u32 * res_map_index);
+
+typedef struct
+{
+  gid_address_t reid;
+  gid_address_t leid;
+  u8 is_add;
+} vnet_lisp_add_del_adjacency_args_t;
+
+int vnet_lisp_add_del_adjacency (vnet_lisp_add_del_adjacency_args_t * a);
+
+typedef struct
+{
+  u8 is_add;
+  ip_address_t address;
+} vnet_lisp_add_del_map_resolver_args_t;
+
+int
+vnet_lisp_add_del_map_resolver (vnet_lisp_add_del_map_resolver_args_t * a);
+int vnet_lisp_add_del_map_server (ip_address_t * addr, u8 is_add);
+
+clib_error_t *vnet_lisp_enable_disable (u8 is_enabled);
+u8 vnet_lisp_enable_disable_status (void);
+
+int vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add);
+
+typedef struct
+{
+  u8 is_add;
+  u8 *locator_set_name;
+} vnet_lisp_add_del_mreq_itr_rloc_args_t;
+
+int
+vnet_lisp_add_del_mreq_itr_rlocs (vnet_lisp_add_del_mreq_itr_rloc_args_t * a);
+
+int vnet_lisp_clear_all_remote_adjacencies (void);
+
+int vnet_lisp_eid_table_map (u32 vni, u32 vrf, u8 is_l2, u8 is_add);
+int vnet_lisp_add_del_map_table_key (gid_address_t * eid, char *key,
+				     u8 is_add);
+int vnet_lisp_set_map_request_mode (u8 mode);
+u8 vnet_lisp_get_map_request_mode (void);
+lisp_adjacency_t *vnet_lisp_adjacencies_get_by_vni (u32 vni);
+int vnet_lisp_rloc_probe_enable_disable (u8 is_enable);
+int vnet_lisp_map_register_enable_disable (u8 is_enable);
+u8 vnet_lisp_map_register_state_get (void);
+u8 vnet_lisp_rloc_probe_state_get (void);
+
+#endif /* VNET_CONTROL_H_ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-cp/gid_dictionary.c b/src/vnet/lisp-cp/gid_dictionary.c
new file mode 100644
index 00000000..d238124e
--- /dev/null
+++ b/src/vnet/lisp-cp/gid_dictionary.c
@@ -0,0 +1,865 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/lisp-cp/gid_dictionary.h>
+
+typedef struct
+{
+  void *arg;
+  ip_prefix_t src;
+  foreach_subprefix_match_cb_t cb;
+  union
+  {
+    gid_ip4_table_t *ip4_table;
+    gid_ip6_table_t *ip6_table;
+  };
+} sfib_entry_arg_t;
+
+static u32 ip4_lookup (gid_ip4_table_t * db, u32 vni, ip_prefix_t * key);
+
+static u32 ip6_lookup (gid_ip6_table_t * db, u32 vni, ip_prefix_t * key);
+
+static void
+foreach_sfib4_subprefix (BVT (clib_bihash_kv) * kvp, void *arg)
+{
+  sfib_entry_arg_t *a = arg;
+  u32 ip = (u32) kvp->key[0];
+  ip4_address_t *mask;
+  u8 plen = ip_prefix_len (&a->src);
+
+  ASSERT (plen <= 32);
+  mask = &a->ip4_table->ip4_fib_masks[plen];
+
+  u32 src_ip = ip_prefix_v4 (&a->src).as_u32;
+  src_ip &= mask->as_u32;
+  ip &= mask->as_u32;
+
+  if (src_ip == ip)
+    {
+      /* found sub-prefix of src prefix */
+      (a->cb) (kvp->value, a->arg);
+    }
+}
+
+static void
+gid_dict_foreach_ip4_subprefix (gid_dictionary_t * db, u32 vni,
+				ip_prefix_t * src, ip_prefix_t * dst,
+				foreach_subprefix_match_cb_t cb, void *arg)
+{
+  u32 sfi;
+  gid_ip4_table_t *sfib4;
+  sfib_entry_arg_t a;
+
+  sfi = ip4_lookup (&db->dst_ip4_table, vni, dst);
+  if (GID_LOOKUP_MISS == sfi)
+    return;
+
+  sfib4 = pool_elt_at_index (db->src_ip4_table_pool, sfi);
+
+  a.arg = arg;
+  a.cb = cb;
+  a.src = src[0];
+  a.ip4_table = sfib4;
+
+  BV (clib_bihash_foreach_key_value_pair) (&sfib4->ip4_lookup_table,
+					   foreach_sfib4_subprefix, &a);
+}
+
+static void
+foreach_sfib6_subprefix (BVT (clib_bihash_kv) * kvp, void *arg)
+{
+  sfib_entry_arg_t *a = arg;
+  ip6_address_t ip;
+  ip6_address_t *mask;
+  u8 plen = ip_prefix_len (&a->src);
+
+  mask = &a->ip6_table->ip6_fib_masks[plen];
+  ip.as_u64[0] = kvp->key[0];
+  ip.as_u64[1] = kvp->key[1];
+
+  if (ip6_address_is_equal_masked (&ip_prefix_v6 (&a->src), &ip, mask))
+    {
+      /* found sub-prefix of src prefix */
+      (a->cb) (kvp->value, a->arg);
+    }
+}
+
+static void
+gid_dict_foreach_ip6_subprefix (gid_dictionary_t * db, u32 vni,
+				ip_prefix_t * src, ip_prefix_t * dst,
+				foreach_subprefix_match_cb_t cb, void *arg)
+{
+  u32 sfi;
+  gid_ip6_table_t *sfib6;
+  sfib_entry_arg_t a;
+
+  sfi = ip6_lookup (&db->dst_ip6_table, vni, dst);
+  if (GID_LOOKUP_MISS == sfi)
+    return;
+
+  sfib6 = pool_elt_at_index (db->src_ip6_table_pool, sfi);
+
+  a.arg = arg;
+  a.cb = cb;
+  a.src = src[0];
+  a.ip6_table = sfib6;
+
+  BV (clib_bihash_foreach_key_value_pair) (&sfib6->ip6_lookup_table,
+					   foreach_sfib6_subprefix, &a);
+}
+
+void
+gid_dict_foreach_subprefix (gid_dictionary_t * db, gid_address_t * eid,
+			    foreach_subprefix_match_cb_t cb, void *arg)
+{
+  ip_prefix_t *ippref = &gid_address_sd_dst_ippref (eid);
+
+  if (IP4 == ip_prefix_version (ippref))
+    gid_dict_foreach_ip4_subprefix (db, gid_address_vni (eid),
+				    &gid_address_sd_src_ippref (eid),
+				    &gid_address_sd_dst_ippref (eid), cb,
+				    arg);
+  else
+    gid_dict_foreach_ip6_subprefix (db, gid_address_vni (eid),
+				    &gid_address_sd_src_ippref (eid),
+				    &gid_address_sd_dst_ippref (eid), cb,
+				    arg);
+}
+
+static void
+make_mac_sd_key (BVT (clib_bihash_kv) * kv, u32 vni, u8 src_mac[6],
+		 u8 dst_mac[6])
+{
+  kv->key[0] = (u64) vni;
+  kv->key[1] = mac_to_u64 (dst_mac);
+  kv->key[2] = src_mac ? mac_to_u64 (src_mac) : (u64) 0;
+}
+
+static u32
+mac_sd_lookup (gid_mac_table_t * db, u32 vni, u8 * dst, u8 * src)
+{
+  int rv;
+  BVT (clib_bihash_kv) kv, value;
+
+  make_mac_sd_key (&kv, vni, src, dst);
+  rv = BV (clib_bihash_search_inline_2) (&db->mac_lookup_table, &kv, &value);
+
+  /* no match, try with src 0, catch all for dst */
+  if (rv != 0)
+    {
+      kv.key[2] = 0;
+      rv = BV (clib_bihash_search_inline_2) (&db->mac_lookup_table, &kv,
+					     &value);
+      if (rv == 0)
+	return value.value;
+    }
+  else
+    return value.value;
+
+  return GID_LOOKUP_MISS;
+}
+
+static u32
+ip4_lookup_exact_match (gid_ip4_table_t * db, u32 vni, ip_prefix_t * key)
+{
+  int rv;
+  BVT (clib_bihash_kv) kv, value;
+
+  ip4_address_t *mask;
+
+  mask = &db->ip4_fib_masks[ip_prefix_len (key)];
+
+  kv.key[0] = ((u64) vni << 32) | (ip_prefix_v4 (key).as_u32 & mask->as_u32);
+  kv.key[1] = 0;
+  kv.key[2] = 0;
+
+  rv = BV (clib_bihash_search_inline_2) (&db->ip4_lookup_table, &kv, &value);
+  if (rv == 0)
+    return value.value;
+
+  return GID_LOOKUP_MISS;
+}
+
+static u32
+ip4_lookup (gid_ip4_table_t * db, u32 vni, ip_prefix_t * key)
+{
+  int i, len;
+  int rv;
+  BVT (clib_bihash_kv) kv, value;
+
+  len = vec_len (db->ip4_prefix_lengths_in_search_order);
+
+  for (i = 0; i < len; i++)
+    {
+      int dst_address_length = db->ip4_prefix_lengths_in_search_order[i];
+      ip4_address_t *mask;
+
+      ASSERT (dst_address_length >= 0 && dst_address_length <= 32);
+
+      mask = &db->ip4_fib_masks[dst_address_length];
+
+      kv.key[0] =
+	((u64) vni << 32) | (ip_prefix_v4 (key).as_u32 & mask->as_u32);
+      kv.key[1] = 0;
+      kv.key[2] = 0;
+
+      rv =
+	BV (clib_bihash_search_inline_2) (&db->ip4_lookup_table, &kv, &value);
+      if (rv == 0)
+	return value.value;
+    }
+
+  return GID_LOOKUP_MISS;
+}
+
+static u32
+ip6_lookup_exact_match (gid_ip6_table_t * db, u32 vni, ip_prefix_t * key)
+{
+  int rv;
+  BVT (clib_bihash_kv) kv, value;
+
+  ip6_address_t *mask;
+  mask = &db->ip6_fib_masks[ip_prefix_len (key)];
+
+  kv.key[0] = ip_prefix_v6 (key).as_u64[0] & mask->as_u64[0];
+  kv.key[1] = ip_prefix_v6 (key).as_u64[1] & mask->as_u64[1];
+  kv.key[2] = (u64) vni;
+
+  rv = BV (clib_bihash_search_inline_2) (&db->ip6_lookup_table, &kv, &value);
+  if (rv == 0)
+    return value.value;
+
+  return GID_LOOKUP_MISS;
+}
+
+static u32
+ip6_lookup (gid_ip6_table_t * db, u32 vni, ip_prefix_t * key)
+{
+  int i, len;
+  int rv;
+  BVT (clib_bihash_kv) kv, value;
+
+  len = vec_len (db->ip6_prefix_lengths_in_search_order);
+
+  for (i = 0; i < len; i++)
+    {
+      int dst_address_length = db->ip6_prefix_lengths_in_search_order[i];
+      ip6_address_t *mask;
+
+      ASSERT (dst_address_length >= 0 && dst_address_length <= 128);
+
+      mask = &db->ip6_fib_masks[dst_address_length];
+
+      kv.key[0] = ip_prefix_v6 (key).as_u64[0] & mask->as_u64[0];
+      kv.key[1] = ip_prefix_v6 (key).as_u64[1] & mask->as_u64[1];
+      kv.key[2] = (u64) vni;
+
+      rv =
+	BV (clib_bihash_search_inline_2) (&db->ip6_lookup_table, &kv, &value);
+      if (rv == 0)
+	return value.value;
+    }
+
+  return GID_LOOKUP_MISS;
+}
+
+static u32
+ip_sd_lookup (gid_dictionary_t * db, u32 vni, ip_prefix_t * dst,
+	      ip_prefix_t * src)
+{
+  u32 sfi;
+  gid_ip4_table_t *sfib4;
+  gid_ip6_table_t *sfib6;
+
+  switch (ip_prefix_version (dst))
+    {
+    case IP4:
+      sfi = ip4_lookup (&db->dst_ip4_table, vni, dst);
+      if (GID_LOOKUP_MISS != sfi)
+	sfib4 = pool_elt_at_index (db->src_ip4_table_pool, sfi);
+      else
+	return GID_LOOKUP_MISS;
+
+      if (!src)
+	{
+	  ip_prefix_t sp;
+	  memset (&sp, 0, sizeof (sp));
+	  return ip4_lookup_exact_match (sfib4, 0, &sp);
+	}
+      else
+	return ip4_lookup (sfib4, 0, src);
+
+      break;
+    case IP6:
+      sfi = ip6_lookup (&db->dst_ip6_table, vni, dst);
+      if (GID_LOOKUP_MISS != sfi)
+	sfib6 = pool_elt_at_index (db->src_ip6_table_pool, sfi);
+      else
+	return GID_LOOKUP_MISS;
+
+      if (!src)
+	{
+	  ip_prefix_t sp;
+	  memset (&sp, 0, sizeof (sp));
+	  ip_prefix_version (&sp) = IP6;
+	  return ip6_lookup_exact_match (sfib6, 0, &sp);
+	}
+      else
+	return ip6_lookup (sfib6, 0, src);
+
+      break;
+    default:
+      clib_warning ("address type %d not supported!",
+		    ip_prefix_version (dst));
+      break;
+    }
+  return GID_LOOKUP_MISS;
+}
+
+u32
+gid_dictionary_lookup (gid_dictionary_t * db, gid_address_t * key)
+{
+  switch (gid_address_type (key))
+    {
+    case GID_ADDR_IP_PREFIX:
+      return ip_sd_lookup (db, gid_address_vni (key),
+			   &gid_address_ippref (key), 0);
+    case GID_ADDR_MAC:
+      return mac_sd_lookup (&db->sd_mac_table, gid_address_vni (key),
+			    gid_address_mac (key), 0);
+    case GID_ADDR_SRC_DST:
+      switch (gid_address_sd_dst_type (key))
+	{
+	case FID_ADDR_IP_PREF:
+	  return ip_sd_lookup (db, gid_address_vni (key),
+			       &gid_address_sd_dst_ippref (key),
+			       &gid_address_sd_src_ippref (key));
+	  break;
+	case FID_ADDR_MAC:
+	  return mac_sd_lookup (&db->sd_mac_table, gid_address_vni (key),
+				gid_address_sd_dst_mac (key),
+				gid_address_sd_src_mac (key));
+	  break;
+	default:
+	  clib_warning ("Source/Dest address type %d not supported!",
+			gid_address_sd_dst_type (key));
+	  break;
+	}
+      break;
+    default:
+      clib_warning ("address type %d not supported!", gid_address_type (key));
+      break;
+    }
+  return GID_LOOKUP_MISS;
+}
+
+u32
+gid_dictionary_sd_lookup (gid_dictionary_t * db, gid_address_t * dst,
+			  gid_address_t * src)
+{
+  switch (gid_address_type (dst))
+    {
+    case GID_ADDR_IP_PREFIX:
+      return ip_sd_lookup (db, gid_address_vni (dst),
+			   &gid_address_ippref (dst),
+			   &gid_address_ippref (src));
+    case GID_ADDR_MAC:
+      return mac_sd_lookup (&db->sd_mac_table, gid_address_vni (dst),
+			    gid_address_mac (dst), gid_address_mac (src));
+    case GID_ADDR_SRC_DST:
+      switch (gid_address_sd_dst_type (dst))
+	{
+	case FID_ADDR_IP_PREF:
+	  return ip_sd_lookup (db, gid_address_vni (dst),
+			       &gid_address_sd_dst_ippref (dst),
+			       &gid_address_sd_src_ippref (dst));
+	  break;
+	case FID_ADDR_MAC:
+	  return mac_sd_lookup (&db->sd_mac_table, gid_address_vni (dst),
+				gid_address_sd_dst_mac (dst),
+				gid_address_sd_src_mac (dst));
+	  break;
+	default:
+	  clib_warning ("Source/Dest address type %d not supported!",
+			gid_address_sd_dst_type (dst));
+	  break;
+	}
+      break;
+    default:
+      clib_warning ("address type %d not supported!", gid_address_type (dst));
+      break;
+    }
+  return GID_LOOKUP_MISS;
+}
+
+static void
+ip4_compute_prefix_lengths_in_search_order (gid_ip4_table_t * db)
+{
+  int i;
+  vec_reset_length (db->ip4_prefix_lengths_in_search_order);
+  /* Note: bitmap reversed so this is in fact a longest prefix match */
+
+  /* *INDENT-OFF* */
+  clib_bitmap_foreach (i, db->ip4_non_empty_dst_address_length_bitmap,
+  ({
+    int dst_address_length = 32 - i;
+    vec_add1 (db->ip4_prefix_lengths_in_search_order, dst_address_length);
+  }));
+  /* *INDENT-ON* */
+
+}
+
+static u32
+add_del_ip4_key (gid_ip4_table_t * db, u32 vni, ip_prefix_t * pref, u32 val,
+		 u8 is_add)
+{
+  BVT (clib_bihash_kv) kv, value;
+  u32 old_val = ~0;
+  ip4_address_t key;
+  u8 plen = ip_prefix_len (pref);
+
+  clib_memcpy (&key, &ip_prefix_v4 (pref), sizeof (key));
+  key.as_u32 &= db->ip4_fib_masks[plen].as_u32;
+  if (is_add)
+    {
+      db->ip4_non_empty_dst_address_length_bitmap =
+	clib_bitmap_set (db->ip4_non_empty_dst_address_length_bitmap,
+			 32 - plen, 1);
+      ip4_compute_prefix_lengths_in_search_order (db);
+
+      db->ip4_prefix_len_refcount[plen]++;
+    }
+  else
+    {
+      ASSERT (db->ip4_prefix_len_refcount[plen] != 0);
+
+      db->ip4_prefix_len_refcount[plen]--;
+
+      if (db->ip4_prefix_len_refcount[plen] == 0)
+	{
+	  db->ip4_non_empty_dst_address_length_bitmap =
+	    clib_bitmap_set (db->ip4_non_empty_dst_address_length_bitmap,
+			     32 - plen, 0);
+	  ip4_compute_prefix_lengths_in_search_order (db);
+	}
+    }
+
+  kv.key[0] = ((u64) vni << 32) | key.as_u32;
+  kv.key[1] = 0;
+  kv.key[2] = 0;
+
+  if (BV (clib_bihash_search) (&db->ip4_lookup_table, &kv, &value) == 0)
+    old_val = value.value;
+
+  if (!is_add)
+    BV (clib_bihash_add_del) (&db->ip4_lookup_table, &kv, 0 /* is_add */ );
+  else
+    {
+      kv.value = val;
+      BV (clib_bihash_add_del) (&db->ip4_lookup_table, &kv, 1 /* is_add */ );
+    }
+  return old_val;
+}
+
+static void
+ip4_lookup_init (gid_ip4_table_t * db)
+{
+  uword i;
+
+  memset (db->ip4_prefix_len_refcount, 0,
+	  sizeof (db->ip4_prefix_len_refcount));
+
+  for (i = 0; i < ARRAY_LEN (db->ip4_fib_masks); i++)
+    {
+      u32 m;
+
+      if (i < 32)
+	m = pow2_mask (i) << (32 - i);
+      else
+	m = ~0;
+      db->ip4_fib_masks[i].as_u32 = clib_host_to_net_u32 (m);
+    }
+  if (db->ip4_lookup_table_nbuckets == 0)
+    db->ip4_lookup_table_nbuckets = IP4_LOOKUP_DEFAULT_HASH_NUM_BUCKETS;
+
+  db->ip4_lookup_table_nbuckets =
+    1 << max_log2 (db->ip4_lookup_table_nbuckets);
+
+  if (db->ip4_lookup_table_size == 0)
+    db->ip4_lookup_table_size = IP4_LOOKUP_DEFAULT_HASH_MEMORY_SIZE;
+
+  BV (clib_bihash_init) (&db->ip4_lookup_table, "ip4 lookup table",
+			 db->ip4_lookup_table_nbuckets,
+			 db->ip4_lookup_table_size);
+}
+
+static u32
+add_del_sd_ip4_key (gid_dictionary_t * db, u32 vni, ip_prefix_t * dst_pref,
+		    ip_prefix_t * src_pref, u32 val, u8 is_add)
+{
+  u32 sfi, old_val = ~0;
+  gid_ip4_table_t *sfib;
+
+  sfi = ip4_lookup_exact_match (&db->dst_ip4_table, vni, dst_pref);
+
+  if (is_add)
+    {
+      if (GID_LOOKUP_MISS == sfi)
+	{
+	  pool_get (db->src_ip4_table_pool, sfib);
+	  ip4_lookup_init (sfib);
+	  add_del_ip4_key (&db->dst_ip4_table, vni, dst_pref,
+			   sfib - db->src_ip4_table_pool, is_add);
+	  if (src_pref)
+	    add_del_ip4_key (sfib, 0 /* vni */ , src_pref, val, is_add);
+	  else
+	    {
+	      ip_prefix_t sp;
+	      memset (&sp, 0, sizeof (sp));
+	      add_del_ip4_key (sfib, 0 /* vni */ , &sp, val, is_add);
+	    }
+	}
+      else
+	{
+	  ASSERT (!pool_is_free_index (db->src_ip4_table_pool, sfi));
+	  sfib = pool_elt_at_index (db->src_ip4_table_pool, sfi);
+	  if (src_pref)
+	    {
+	      old_val = ip4_lookup_exact_match (sfib, 0, src_pref);
+	      add_del_ip4_key (sfib, 0 /* vni */ , src_pref, val, is_add);
+	    }
+	  else
+	    {
+	      ip_prefix_t sp;
+	      memset (&sp, 0, sizeof (sp));
+	      old_val =
+		add_del_ip4_key (sfib, 0 /* vni */ , &sp, val, is_add);
+	    }
+	}
+    }
+  else
+    {
+      if (GID_LOOKUP_MISS != sfi)
+	{
+	  add_del_ip4_key (&db->dst_ip4_table, vni, dst_pref, 0, is_add);
+	  sfib = pool_elt_at_index (db->src_ip4_table_pool, sfi);
+	  if (src_pref)
+	    old_val = add_del_ip4_key (sfib, 0, src_pref, 0, is_add);
+	  else
+	    {
+	      ip_prefix_t sp;
+	      memset (&sp, 0, sizeof (sp));
+	      old_val = add_del_ip4_key (sfib, 0, &sp, 0, is_add);
+	    }
+	}
+      else
+	clib_warning ("cannot delete dst mapping %U!", format_ip_prefix,
+		      dst_pref);
+    }
+  return old_val;
+}
+
+static void
+ip6_compute_prefix_lengths_in_search_order (gid_ip6_table_t * db)
+{
+  int i;
+  vec_reset_length (db->ip6_prefix_lengths_in_search_order);
+  /* Note: bitmap reversed so this is in fact a longest prefix match */
+
+  /* *INDENT-OFF* */
+  clib_bitmap_foreach (i, db->ip6_non_empty_dst_address_length_bitmap,
+  ({
+    int dst_address_length = 128 - i;
+    vec_add1 (db->ip6_prefix_lengths_in_search_order, dst_address_length);
+  }));
+  /* *INDENT-ON* */
+}
+
+static u32
+add_del_ip6_key (gid_ip6_table_t * db, u32 vni, ip_prefix_t * pref, u32 val,
+		 u8 is_add)
+{
+  BVT (clib_bihash_kv) kv, value;
+  u32 old_val = ~0;
+  ip6_address_t key;
+  u8 plen = ip_prefix_len (pref);
+
+  clib_memcpy (&key, &ip_prefix_v6 (pref), sizeof (key));
+  ip6_address_mask (&key, &db->ip6_fib_masks[plen]);
+  if (is_add)
+    {
+      db->ip6_non_empty_dst_address_length_bitmap =
+	clib_bitmap_set (db->ip6_non_empty_dst_address_length_bitmap,
+			 128 - plen, 1);
+      ip6_compute_prefix_lengths_in_search_order (db);
+      db->ip6_prefix_len_refcount[plen]++;
+    }
+  else
+    {
+      ASSERT (db->ip6_prefix_len_refcount[plen] != 0);
+
+      db->ip6_prefix_len_refcount[plen]--;
+
+      if (db->ip6_prefix_len_refcount[plen] == 0)
+	{
+	  db->ip6_non_empty_dst_address_length_bitmap =
+	    clib_bitmap_set (db->ip6_non_empty_dst_address_length_bitmap,
+			     128 - plen, 0);
+	  ip6_compute_prefix_lengths_in_search_order (db);
+	}
+    }
+
+  kv.key[0] = key.as_u64[0];
+  kv.key[1] = key.as_u64[1];
+  kv.key[2] = (u64) vni;
+//  kv.key[2] = ((u64)((fib - im->fibs))<<32) | ip_prefix_len(key);
+
+  if (BV (clib_bihash_search) (&db->ip6_lookup_table, &kv, &value) == 0)
+    old_val = value.value;
+
+  if (!is_add)
+    BV (clib_bihash_add_del) (&db->ip6_lookup_table, &kv, 0 /* is_add */ );
+  else
+    {
+      kv.value = val;
+      BV (clib_bihash_add_del) (&db->ip6_lookup_table, &kv, 1 /* is_add */ );
+    }
+  return old_val;
+}
+
+static u32
+add_del_mac (gid_mac_table_t * db, u32 vni, u8 * dst_mac, u8 * src_mac,
+	     u32 val, u8 is_add)
+{
+  BVT (clib_bihash_kv) kv, value;
+  u32 old_val = ~0;
+
+  make_mac_sd_key (&kv, vni, src_mac, dst_mac);
+
+  if (BV (clib_bihash_search) (&db->mac_lookup_table, &kv, &value) == 0)
+    old_val = value.value;
+
+  if (!is_add)
+    BV (clib_bihash_add_del) (&db->mac_lookup_table, &kv, 0 /* is_add */ );
+  else
+    {
+      kv.value = val;
+      BV (clib_bihash_add_del) (&db->mac_lookup_table, &kv, 1 /* is_add */ );
+    }
+  return old_val;
+}
+
+static void
+ip6_lookup_init (gid_ip6_table_t * db)
+{
+  uword i;
+
+  memset (db->ip6_prefix_len_refcount, 0,
+	  sizeof (db->ip6_prefix_len_refcount));
+
+  for (i = 0; i < ARRAY_LEN (db->ip6_fib_masks); i++)
+    {
+      u32 j, i0, i1;
+
+      i0 = i / 32;
+      i1 = i % 32;
+
+      for (j = 0; j < i0; j++)
+	db->ip6_fib_masks[i].as_u32[j] = ~0;
+
+      if (i1)
+	db->ip6_fib_masks[i].as_u32[i0] =
+	  clib_host_to_net_u32 (pow2_mask (i1) << (32 - i1));
+    }
+
+  if (db->ip6_lookup_table_nbuckets == 0)
+    db->ip6_lookup_table_nbuckets = IP6_LOOKUP_DEFAULT_HASH_NUM_BUCKETS;
+
+  db->ip6_lookup_table_nbuckets =
+    1 << max_log2 (db->ip6_lookup_table_nbuckets);
+
+  if (db->ip6_lookup_table_size == 0)
+    db->ip6_lookup_table_size = IP6_LOOKUP_DEFAULT_HASH_MEMORY_SIZE;
+
+  BV (clib_bihash_init) (&db->ip6_lookup_table, "ip6 lookup table",
+			 db->ip6_lookup_table_nbuckets,
+			 db->ip6_lookup_table_size);
+}
+
+static u32
+add_del_sd_ip6_key (gid_dictionary_t * db, u32 vni, ip_prefix_t * dst_pref,
+		    ip_prefix_t * src_pref, u32 val, u8 is_add)
+{
+  u32 sfi, old_val = ~0;
+  gid_ip6_table_t *sfib;
+
+  sfi = ip6_lookup_exact_match (&db->dst_ip6_table, vni, dst_pref);
+
+  if (is_add)
+    {
+      if (GID_LOOKUP_MISS == sfi)
+	{
+	  pool_get (db->src_ip6_table_pool, sfib);
+	  ip6_lookup_init (sfib);
+	  add_del_ip6_key (&db->dst_ip6_table, vni, dst_pref,
+			   sfib - db->src_ip6_table_pool, is_add);
+	  if (src_pref)
+	    add_del_ip6_key (sfib, 0 /* vni */ , src_pref, val, is_add);
+	  else
+	    {
+	      ip_prefix_t sp;
+	      memset (&sp, 0, sizeof (sp));
+	      ip_prefix_version (&sp) = IP6;
+	      add_del_ip6_key (sfib, 0 /* vni */ , &sp, val, is_add);
+	    }
+	}
+      else
+	{
+	  ASSERT (!pool_is_free_index (db->src_ip6_table_pool, sfi));
+	  sfib = pool_elt_at_index (db->src_ip6_table_pool, sfi);
+	  if (src_pref)
+	    {
+	      old_val = ip6_lookup_exact_match (sfib, 0, src_pref);
+	      add_del_ip6_key (sfib, 0 /* vni */ , src_pref, val, is_add);
+	    }
+	  else
+	    {
+	      ip_prefix_t sp;
+	      memset (&sp, 0, sizeof (sp));
+	      ip_prefix_version (&sp) = IP6;
+	      old_val =
+		add_del_ip6_key (sfib, 0 /* vni */ , &sp, val, is_add);
+	    }
+	}
+    }
+  else
+    {
+      if (GID_LOOKUP_MISS != sfi)
+	{
+	  add_del_ip6_key (&db->dst_ip6_table, vni, dst_pref, 0, is_add);
+	  sfib = pool_elt_at_index (db->src_ip6_table_pool, sfi);
+	  if (src_pref)
+	    old_val = add_del_ip6_key (sfib, 0, src_pref, 0, is_add);
+	  else
+	    {
+	      ip_prefix_t sp;
+	      memset (&sp, 0, sizeof (sp));
+	      ip_prefix_version (&sp) = IP6;
+	      old_val = add_del_ip6_key (sfib, 0, &sp, 0, is_add);
+	    }
+	}
+      else
+	clib_warning ("cannot delete dst mapping %U!", format_ip_prefix,
+		      dst_pref);
+    }
+  return old_val;
+}
+
+static u32
+add_del_ip (gid_dictionary_t * db, u32 vni, ip_prefix_t * dst_key,
+	    ip_prefix_t * src_key, u32 value, u8 is_add)
+{
+  switch (ip_prefix_version (dst_key))
+    {
+    case IP4:
+      return add_del_sd_ip4_key (db, vni, dst_key, src_key, value, is_add);
+      break;
+    case IP6:
+      return add_del_sd_ip6_key (db, vni, dst_key, src_key, value, is_add);
+      break;
+    default:
+      clib_warning ("address type %d not supported!",
+		    ip_prefix_version (dst_key));
+      break;
+    }
+  return ~0;
+}
+
+static u32
+add_del_sd (gid_dictionary_t * db, u32 vni, source_dest_t * key, u32 value,
+	    u8 is_add)
+{
+  switch (sd_dst_type (key))
+    {
+    case FID_ADDR_IP_PREF:
+      add_del_ip (db, vni, &sd_dst_ippref (key), &sd_src_ippref (key),
+		  value, is_add);
+
+    case FID_ADDR_MAC:
+      return add_del_mac (&db->sd_mac_table, vni, sd_dst_mac (key),
+			  sd_src_mac (key), value, is_add);
+
+    default:
+      clib_warning ("SD address type %d not supprted!", sd_dst_type (key));
+      break;
+    }
+
+  return ~0;
+}
+
+u32
+gid_dictionary_add_del (gid_dictionary_t * db, gid_address_t * key, u32 value,
+			u8 is_add)
+{
+  switch (gid_address_type (key))
+    {
+    case GID_ADDR_IP_PREFIX:
+      return add_del_ip (db, gid_address_vni (key), &gid_address_ippref (key),
+			 0, value, is_add);
+    case GID_ADDR_MAC:
+      return add_del_mac (&db->sd_mac_table, gid_address_vni (key),
+			  gid_address_mac (key), 0, value, is_add);
+    case GID_ADDR_SRC_DST:
+      return add_del_sd (db, gid_address_vni (key), &gid_address_sd (key),
+			 value, is_add);
+    default:
+      clib_warning ("address type %d not supported!", gid_address_type (key));
+      break;
+    }
+  return ~0;
+}
+
+static void
+mac_lookup_init (gid_mac_table_t * db)
+{
+  if (db->mac_lookup_table_nbuckets == 0)
+    db->mac_lookup_table_nbuckets = MAC_LOOKUP_DEFAULT_HASH_NUM_BUCKETS;
+
+  db->mac_lookup_table_nbuckets =
+    1 << max_log2 (db->mac_lookup_table_nbuckets);
+
+  if (db->mac_lookup_table_size == 0)
+    db->mac_lookup_table_size = MAC_LOOKUP_DEFAULT_HASH_MEMORY_SIZE;
+
+  BV (clib_bihash_init) (&db->mac_lookup_table, "mac lookup table",
+			 db->mac_lookup_table_nbuckets,
+			 db->mac_lookup_table_size);
+}
+
+void
+gid_dictionary_init (gid_dictionary_t * db)
+{
+  ip4_lookup_init (&db->dst_ip4_table);
+  ip6_lookup_init (&db->dst_ip6_table);
+  mac_lookup_init (&db->sd_mac_table);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-cp/gid_dictionary.h b/src/vnet/lisp-cp/gid_dictionary.h
new file mode 100644
index 00000000..c5aaf8cb
--- /dev/null
+++ b/src/vnet/lisp-cp/gid_dictionary.h
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef VNET_LISP_GPE_GID_DICTIONARY_H_
+#define VNET_LISP_GPE_GID_DICTIONARY_H_
+
+#include <vnet/vnet.h>
+#include <vnet/lisp-cp/lisp_types.h>
+#include <vppinfra/bihash_24_8.h>
+#include <vppinfra/bihash_template.h>
+
+#define GID_LOOKUP_MISS ((u32)~0)
+
+/* Default size of the ip4 hash table */
+#define IP4_LOOKUP_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
+#define IP4_LOOKUP_DEFAULT_HASH_MEMORY_SIZE (32<<20)
+
+/* Default size of the ip6 hash table */
+#define IP6_LOOKUP_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
+#define IP6_LOOKUP_DEFAULT_HASH_MEMORY_SIZE (32<<20)
+
+/* Default size of the MAC hash table */
+#define MAC_LOOKUP_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
+#define MAC_LOOKUP_DEFAULT_HASH_MEMORY_SIZE (32<<20)
+
+typedef void (*foreach_subprefix_match_cb_t) (u32, void *);
+
+typedef struct
+{
+  BVT (clib_bihash) ip4_lookup_table;
+
+  /* bitmap/vector of mask widths to search */
+  uword *ip4_non_empty_dst_address_length_bitmap;
+  u8 *ip4_prefix_lengths_in_search_order;
+  ip4_address_t ip4_fib_masks[33];
+  u32 ip4_prefix_len_refcount[33];
+
+  /* ip4 lookup table config parameters */
+  u32 ip4_lookup_table_nbuckets;
+  uword ip4_lookup_table_size;
+} gid_ip4_table_t;
+
+typedef struct
+{
+  BVT (clib_bihash) ip6_lookup_table;
+
+  /* bitmap/vector of mask widths to search */
+  uword *ip6_non_empty_dst_address_length_bitmap;
+  u8 *ip6_prefix_lengths_in_search_order;
+  ip6_address_t ip6_fib_masks[129];
+  u64 ip6_prefix_len_refcount[129];
+
+  /* ip6 lookup table config parameters */
+  u32 ip6_lookup_table_nbuckets;
+  uword ip6_lookup_table_size;
+} gid_ip6_table_t;
+
+typedef struct gid_mac_table
+{
+  BVT (clib_bihash) mac_lookup_table;
+
+  /* mac lookup table config parameters */
+  u32 mac_lookup_table_nbuckets;
+  uword mac_lookup_table_size;
+} gid_mac_table_t;
+
+typedef struct
+{
+  /** destination IP LPM ip4 lookup table */
+  gid_ip4_table_t dst_ip4_table;
+
+  /** pool of source IP LPM ip4 lookup tables */
+  gid_ip4_table_t *src_ip4_table_pool;
+
+  /** destination IP LPM ip6 lookup table */
+  gid_ip6_table_t dst_ip6_table;
+
+  /** pool of source IP LPM ip6 lookup tables */
+  gid_ip6_table_t *src_ip6_table_pool;
+
+  /** flat source/dest mac lookup table */
+  gid_mac_table_t sd_mac_table;
+
+} gid_dictionary_t;
+
+u32
+gid_dictionary_add_del (gid_dictionary_t * db, gid_address_t * key, u32 value,
+			u8 is_add);
+
+u32 gid_dictionary_lookup (gid_dictionary_t * db, gid_address_t * key);
+u32 gid_dictionary_sd_lookup (gid_dictionary_t * db, gid_address_t * dst,
+			      gid_address_t * src);
+
+void gid_dictionary_init (gid_dictionary_t * db);
+
+void
+gid_dict_foreach_subprefix (gid_dictionary_t * db, gid_address_t * eid,
+			    foreach_subprefix_match_cb_t cb, void *arg);
+
+#endif /* VNET_LISP_GPE_GID_DICTIONARY_H_ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-cp/lisp.api b/src/vnet/lisp-cp/lisp.api
new file mode 100644
index 00000000..20c17aa3
--- /dev/null
+++ b/src/vnet/lisp-cp/lisp.api
@@ -0,0 +1,835 @@
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \brief add or delete locator_set
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add address if non-zero, else delete
+    @param locator_set_name - locator name
+    @param locator_num - number of locators
+    @param locators - LISP locator records
+        Structure of one locator record is as follows:
+
+        define locator_t {
+          u32 sw_if_index;
+          u8 priority;
+          u8 weight;
+        }
+*/
+define lisp_add_del_locator_set
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 locator_set_name[64];
+  u32 locator_num;
+  u8 locators[0];
+};
+
+/** \brief Reply for locator_set add/del
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+    @param ls_index - locator set index
+*/
+define lisp_add_del_locator_set_reply
+{
+  u32 context;
+  i32 retval;
+  u32 ls_index;
+};
+
+/** \brief add or delete locator for locator_set
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add address if non-zero, else delete
+    @param locator_set_name - name of locator_set to add/del locator
+    @param sw_if_index - index of the interface
+    @param priority - priority of the lisp locator
+    @param weight - weight of the lisp locator
+*/
+define lisp_add_del_locator
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 locator_set_name[64];
+  u32 sw_if_index;
+  u8 priority;
+  u8 weight;
+};
+
+/** \brief Reply for locator add/del
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_add_del_locator_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief add or delete lisp eid-table
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add address if non-zero, else delete
+    @param eid_type:
+      0 : ipv4
+      1 : ipv6
+      2 : mac
+    @param eid - EID can be ip4, ip6 or mac
+    @param prefix_len - prefix len
+    @param locator_set_name - name of locator_set to add/del eid-table
+    @param vni - virtual network instance
+    @param key_id
+      HMAC_NO_KEY           0
+      HMAC_SHA_1_96         1
+      HMAC_SHA_256_128      2
+    @param key - secret key
+*/
+define lisp_add_del_local_eid
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 eid_type;
+  u8 eid[16];
+  u8 prefix_len;
+  u8 locator_set_name[64];
+  u32 vni;
+  u16 key_id;
+  u8 key[64];
+};
+
+/** \brief Reply for local_eid add/del
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_add_del_local_eid_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Add/delete map server
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add address if non-zero; delete otherwise
+    @param is_ipv6 - if non-zero the address is ipv6, else ipv4
+    @param ip_address - map server IP address
+*/
+define lisp_add_del_map_server
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 is_ipv6;
+  u8 ip_address[16];
+};
+
+/** \brief Reply for lisp_add_del_map_server
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_add_del_map_server_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief add or delete map-resolver
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add address if non-zero, else delete
+    @param is_ipv6 - if non-zero the address is ipv6, else ipv4
+    @param ip_address - array of address bytes
+*/
+define lisp_add_del_map_resolver
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 is_ipv6;
+  u8 ip_address[16];
+};
+
+/** \brief Reply for map_resolver add/del
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_add_del_map_resolver_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief enable or disable LISP feature
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_en - enable protocol if non-zero, else disable
+*/
+define lisp_enable_disable
+{
+  u32 client_index;
+  u32 context;
+  u8 is_en;
+};
+
+/** \brief Reply for gpe enable/disable
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_enable_disable_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief configure or disable LISP PITR node
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param ls_name - locator set name
+    @param is_add - add locator set if non-zero, else disable pitr
+*/
+define lisp_pitr_set_locator_set
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 ls_name[64];
+};
+
+/** \brief Reply for lisp_pitr_set_locator_set
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_pitr_set_locator_set_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Get state of LISP RLOC probing
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define show_lisp_rloc_probe_state
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Reply for show_lisp_rloc_probe_state
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+    @param is_enabled - state of RLOC probing
+*/
+define show_lisp_rloc_probe_state_reply
+{
+  u32 context;
+  i32 retval;
+  u8 is_enabled;
+};
+
+/** \brief enable/disable LISP RLOC probing
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_enable - enable if non-zero; disable otherwise
+*/
+define lisp_rloc_probe_enable_disable
+{
+  u32 client_index;
+  u32 context;
+  u8 is_enabled;
+};
+
+/** \brief Reply for lisp_rloc_probe_enable_disable
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_rloc_probe_enable_disable_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief enable/disable LISP map-register
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_enable - enable if non-zero; disable otherwise
+*/
+define lisp_map_register_enable_disable
+{
+  u32 client_index;
+  u32 context;
+  u8 is_enabled;
+};
+
+/** \brief Reply for lisp_map_register_enable_disable
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_map_register_enable_disable_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Get state of LISP map-register
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define show_lisp_map_register_state
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Reply for show_lisp_map_register_state
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define show_lisp_map_register_state_reply
+{
+  u32 context;
+  i32 retval;
+  u8 is_enabled;
+};
+
+/** \brief set LISP map-request mode. Based on configuration VPP will send
+      src/dest or just normal destination map requests.
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param mode - new map-request mode. Supported values are:
+      0 - destination only
+      1 - source/destaination
+*/
+define lisp_map_request_mode
+{
+  u32 client_index;
+  u32 context;
+  u8 mode;
+};
+
+/** \brief Reply for lisp_map_request_mode
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_map_request_mode_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Request for LISP map-request mode
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define show_lisp_map_request_mode
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Reply for show_lisp_map_request_mode
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+    @param mode - map-request mode
+*/
+define show_lisp_map_request_mode_reply
+{
+  u32 context;
+  i32 retval;
+  u8 mode;
+};
+
+/** \brief add or delete remote static mapping
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add address if non-zero, else delete
+    @param is_src_dst - flag indicating src/dst based routing policy
+    @param del_all - if set, delete all remote mappings
+    @param vni - virtual network instance
+    @param action - negative map-reply action
+    @param eid_type -
+      0 : ipv4
+      1 : ipv6
+      2 : mac
+    @param deid - dst EID
+    @param seid - src EID, valid only if is_src_dst is enabled
+    @param rloc_num - number of remote locators
+    @param rlocs - remote locator records
+        Structure of remote locator:
+
+        define rloc_t {
+          u8 is_ip4;
+          u8 priority;
+          u8 weight;
+          u8 addr[16];
+        }
+*/
+define lisp_add_del_remote_mapping
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 is_src_dst;
+  u8 del_all;
+  u32 vni;
+  u8 action;
+  u8 eid_type;
+  u8 eid[16];
+  u8 eid_len;
+  u8 seid[16];
+  u8 seid_len;
+  u32 rloc_num;
+  u8 rlocs[0];
+};
+
+/** \brief Reply for lisp_add_del_remote_mapping
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_add_del_remote_mapping_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief add or delete LISP adjacency adjacency
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add address if non-zero, else delete
+    @param vni - virtual network instance
+    @param eid_type -
+      0 : ipv4
+      1 : ipv6
+      2 : mac
+    @param reid - remote EID
+    @param leid - local EID
+*/
+define lisp_add_del_adjacency
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u32 vni;
+  u8 eid_type;
+  u8 reid[16];
+  u8 leid[16];
+  u8 reid_len;
+  u8 leid_len;
+};
+
+/** \brief Reply for lisp_add_del_adjacency
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_add_del_adjacency_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief add or delete map request itr rlocs
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add address if non-zero, else delete
+    @param locator_set_name - locator set name
+*/
+define lisp_add_del_map_request_itr_rlocs
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 locator_set_name[64];
+};
+
+/** \brief Reply for lisp_add_del_map_request_itr_rlocs
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+
+define lisp_add_del_map_request_itr_rlocs_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief map/unmap vni/bd_index to vrf
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add or delete mapping
+    @param dp_table - virtual network id/bridge domain index
+    @param vrf - vrf
+*/
+define lisp_eid_table_add_del_map
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u32 vni;
+  u32 dp_table;
+  u8 is_l2;
+};
+
+/** \brief Reply for lisp_eid_table_add_del_map
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_eid_table_add_del_map_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Request for map lisp locator status
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param locator_set_index - index of locator_set
+    @param ls_name - locator set name
+    @param is_index_set - flag indicating whether ls_name or ls_index is set
+ */
+define lisp_locator_dump
+{
+  u32 client_index;
+  u32 context;
+  u32 ls_index;
+  u8 ls_name[64];
+  u8 is_index_set;
+};
+
+/** \brief LISP locator_set status
+    @param local - if is set, then locator is local
+    @param locator_set_name - name of the locator_set
+    @param sw_if_index - sw_if_index of the locator
+    @param priority - locator priority
+    @param weight - locator weight
+  */
+define lisp_locator_details
+{
+  u32 context;
+  u8 local;
+  u32 sw_if_index;
+  u8 is_ipv6;
+  u8 ip_address[16];
+  u8 priority;
+  u8 weight;
+};
+
+/** \brief LISP locator_set status
+    @param context - sender context, to match reply w/ request
+    @param ls_index - locator set index
+    @param ls_name - name of the locator set
+ */
+define lisp_locator_set_details
+{
+  u32 context;
+  u32 ls_index;
+  u8 ls_name[64];
+};
+
+/** \brief Request for locator_set summary status
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param filter - filter type
+      Supported values:
+        0: all locator sets
+        1: local locator sets
+        2: remote locator sets
+ */
+define lisp_locator_set_dump
+{
+  u32 client_index;
+  u32 context;
+  u8 filter;
+};
+
+/** \brief Dump lisp eid-table
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param locator_set_index - index of locator_set, if ~0 then the mapping
+                                is negative
+    @param action - negative map request action
+    @param is_local - local if non-zero, else remote
+    @param eid_type:
+      0 : ipv4
+      1 : ipv6
+      2 : mac
+    @param is_src_dst - EID is type of source/destination
+    @param eid - EID can be ip4, ip6 or mac
+    @param eid_prefix_len - prefix length
+    @param seid - source EID can be ip4, ip6 or mac
+    @param seid_prefix_len - source prefix length
+    @param vni - virtual network instance
+    @param ttl - time to live
+    @param authoritative - authoritative
+    @param key_id
+      HMAC_NO_KEY           0
+      HMAC_SHA_1_96         1
+      HMAC_SHA_256_128      2
+    @param key - secret key
+*/
+
+define lisp_eid_table_details
+{
+  u32 context;
+  u32 locator_set_index;
+  u8 action;
+  u8 is_local;
+  u8 eid_type;
+  u8 is_src_dst;
+  u32 vni;
+  u8 eid[16];
+  u8 eid_prefix_len;
+  u8 seid[16];
+  u8 seid_prefix_len;
+  u32 ttl;
+  u8 authoritative;
+  u16 key_id;
+  u8 key[64];
+};
+
+/** \brief Request for eid table summary status
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param eid_set - if non-zero request info about specific mapping
+    @param vni - virtual network instance; valid only if eid_set != 0
+    @param prefix_length - prefix length if EID is IP address;
+      valid only if eid_set != 0
+    @param eid_type - EID type; valid only if eid_set != 0
+      Supported values:
+        0: EID is IPv4
+        1: EID is IPv6
+        2: EID is ethernet address
+    @param eid - endpoint identifier
+    @param filter - filter type;
+      Support values:
+        0: all eid
+        1: local eid
+        2: remote eid
+ */
+define lisp_eid_table_dump
+{
+  u32 client_index;
+  u32 context;
+  u8 eid_set;
+  u8 prefix_length;
+  u32 vni;
+  u8 eid_type;
+  u8 eid[16];
+  u8 filter;
+};
+
+/** \brief LISP adjacency
+    @param eid_type -
+      0 : ipv4
+      1 : ipv6
+      2 : mac
+    @param reid - remote EID
+    @param leid - local EID
+    @param reid_prefix_len - remote EID IP prefix length
+    @param leid_prefix_len - local EID IP prefix length
+  */
+typeonly manual_print manual_endian define lisp_adjacency
+{
+  u8 eid_type;
+  u8 reid[16];
+  u8 leid[16];
+  u8 reid_prefix_len;
+  u8 leid_prefix_len;
+};
+
+/** \brief LISP adjacency reply
+    @param count - number of adjacencies
+    @param adjacencies - array of adjacencies
+  */
+manual_endian manual_print define lisp_adjacencies_get_reply
+{
+  u32 context;
+  i32 retval;
+  u32 count;
+  vl_api_lisp_adjacency_t adjacencies[count];
+};
+
+/** \brief Request for LISP adjacencies
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param vni - filter adjacencies by VNI
+ */
+define lisp_adjacencies_get
+{
+  u32 client_index;
+  u32 context;
+  u32 vni;
+};
+
+/** \brief Shows relationship between vni and vrf/bd
+    @param dp_table - VRF index or bridge domain index
+    @param vni - vitual network instance
+  */
+define lisp_eid_table_map_details
+{
+  u32 context;
+  u32 vni;
+  u32 dp_table;
+};
+
+/** \brief Request for lisp_eid_table_map_details
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_l2 - if set dump vni/bd mappings else vni/vrf
+ */
+define lisp_eid_table_map_dump
+{
+  u32 client_index;
+  u32 context;
+  u8 is_l2;
+};
+
+/** \brief Dumps all VNIs used in mappings
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+  */
+define lisp_eid_table_vni_dump
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief reply to lisp_eid_table_vni_dump
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param vni - virtual network instance
+ */
+define lisp_eid_table_vni_details
+{
+  u32 client_index;
+  u32 context;
+  u32 vni;
+};
+
+/** \brief LISP map resolver status
+    @param is_ipv6 - if non-zero the address is ipv6, else ipv4
+    @param ip_address - array of address bytes
+ */
+define lisp_map_resolver_details
+{
+  u32 context;
+  u8 is_ipv6;
+  u8 ip_address[16];
+};
+
+/** \brief Request for map resolver summary status
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+ */
+define lisp_map_resolver_dump
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief LISP map server details
+    @param is_ipv6 - if non-zero the address is ipv6, else ipv4
+    @param ip_address - array of address bytes
+ */
+define lisp_map_server_details
+{
+  u32 context;
+  u8 is_ipv6;
+  u8 ip_address[16];
+};
+
+/** \brief Request for map server summary status
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+ */
+define lisp_map_server_dump
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Request for lisp-gpe protocol status
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define show_lisp_status
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Status of lisp, enable or disable
+    @param context - sender context, to match reply w/ request
+    @param feature_status - lisp enable if non-zero, else disable
+    @param gpe_status - lisp enable if non-zero, else disable
+*/
+define show_lisp_status_reply
+{
+  u32 context;
+  i32 retval;
+  u8 feature_status;
+  u8 gpe_status;
+};
+
+/** \brief Get LISP map request itr rlocs status
+    @param context - sender context, to match reply w/ request
+    @param locator_set_name - name of the locator_set
+ */
+define lisp_get_map_request_itr_rlocs
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Request for map request itr rlocs summary status
+ */
+define lisp_get_map_request_itr_rlocs_reply
+{
+  u32 context;
+  i32 retval;
+  u8 locator_set_name[64];
+};
+
+/** \brief Request for lisp pitr status
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define show_lisp_pitr
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Status of lisp pitr, enable or disable
+    @param context - sender context, to match reply w/ request
+    @param status - lisp pitr enable if non-zero, else disable
+    @param locator_set_name -  name of the locator_set
+*/
+define show_lisp_pitr_reply
+{
+  u32 context;
+  i32 retval;
+  u8 status;
+  u8 locator_set_name[64];
+};
+
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
+ 
\ No newline at end of file
diff --git a/src/vnet/lisp-cp/lisp_api.c b/src/vnet/lisp-cp/lisp_api.c
new file mode 100644
index 00000000..d3fc4627
--- /dev/null
+++ b/src/vnet/lisp-cp/lisp_api.c
@@ -0,0 +1,1257 @@
+/*
+ *------------------------------------------------------------------
+ * lisp_api.c - lisp api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/lisp-cp/control.h>
+#include <vnet/lisp-gpe/lisp_gpe.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                             \
+_(LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set)                   \
+_(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator)                           \
+_(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid)                       \
+_(LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver)                 \
+_(LISP_ADD_DEL_MAP_SERVER, lisp_add_del_map_server)                     \
+_(LISP_ENABLE_DISABLE, lisp_enable_disable)                             \
+_(LISP_RLOC_PROBE_ENABLE_DISABLE, lisp_rloc_probe_enable_disable)       \
+_(LISP_MAP_REGISTER_ENABLE_DISABLE, lisp_map_register_enable_disable)   \
+_(LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping)             \
+_(LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency)                       \
+_(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set)                 \
+_(LISP_MAP_REQUEST_MODE, lisp_map_request_mode)                         \
+_(LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map)               \
+_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump)                         \
+_(LISP_LOCATOR_DUMP, lisp_locator_dump)                                 \
+_(LISP_EID_TABLE_DUMP, lisp_eid_table_dump)                             \
+_(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump)                       \
+_(LISP_MAP_SERVER_DUMP, lisp_map_server_dump)                           \
+_(LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump)                     \
+_(LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_dump)                     \
+_(LISP_ADJACENCIES_GET, lisp_adjacencies_get)                           \
+_(SHOW_LISP_RLOC_PROBE_STATE, show_lisp_rloc_probe_state)               \
+_(SHOW_LISP_MAP_REGISTER_STATE, show_lisp_map_register_state)           \
+_(SHOW_LISP_STATUS, show_lisp_status)                                   \
+_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS,                                   \
+  lisp_add_del_map_request_itr_rlocs)                                   \
+_(LISP_GET_MAP_REQUEST_ITR_RLOCS, lisp_get_map_request_itr_rlocs)       \
+_(SHOW_LISP_PITR, show_lisp_pitr)                                       \
+_(SHOW_LISP_MAP_REQUEST_MODE, show_lisp_map_request_mode)               \
+
+/** Used for transferring locators via VPP API */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u8 is_ip4; /**< is locator an IPv4 address */
+  u8 priority; /**< locator priority */
+  u8 weight; /**< locator weight */
+  u8 addr[16]; /**< IPv4/IPv6 address */
+}) rloc_t;
+/* *INDENT-ON* */
+
+/** Used for transferring locators via VPP API */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u32 sw_if_index; /**< locator sw_if_index */
+  u8 priority; /**< locator priority */
+  u8 weight; /**< locator weight */
+}) ls_locator_t;
+/* *INDENT-ON* */
+
+static locator_t *
+unformat_lisp_locs (void *rmt_locs, u32 rloc_num)
+{
+  u32 i;
+  locator_t *locs = 0, loc;
+  rloc_t *r;
+
+  for (i = 0; i < rloc_num; i++)
+    {
+      /* remote locators */
+      r = &((rloc_t *) rmt_locs)[i];
+      memset (&loc, 0, sizeof (loc));
+      gid_address_ip_set (&loc.address, &r->addr, r->is_ip4 ? IP4 : IP6);
+
+      loc.priority = r->priority;
+      loc.weight = r->weight;
+
+      vec_add1 (locs, loc);
+    }
+  return locs;
+}
+
+static void
+vl_api_lisp_add_del_locator_set_t_handler (vl_api_lisp_add_del_locator_set_t *
+					   mp)
+{
+  vl_api_lisp_add_del_locator_set_reply_t *rmp;
+  int rv = 0;
+  vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
+  locator_t locator;
+  ls_locator_t *ls_loc;
+  u32 ls_index = ~0, locator_num;
+  u8 *locator_name = NULL;
+  int i;
+
+  memset (a, 0, sizeof (a[0]));
+
+  locator_name = format (0, "%s", mp->locator_set_name);
+
+  a->name = locator_name;
+  a->is_add = mp->is_add;
+  a->local = 1;
+  locator_num = clib_net_to_host_u32 (mp->locator_num);
+
+  memset (&locator, 0, sizeof (locator));
+  for (i = 0; i < locator_num; i++)
+    {
+      ls_loc = &((ls_locator_t *) mp->locators)[i];
+      VALIDATE_SW_IF_INDEX (ls_loc);
+
+      locator.sw_if_index = htonl (ls_loc->sw_if_index);
+      locator.priority = ls_loc->priority;
+      locator.weight = ls_loc->weight;
+      locator.local = 1;
+      vec_add1 (a->locators, locator);
+    }
+
+  rv = vnet_lisp_add_del_locator_set (a, &ls_index);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  vec_free (locator_name);
+  vec_free (a->locators);
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2 (VL_API_LISP_ADD_DEL_LOCATOR_SET_REPLY,
+  ({
+    rmp->ls_index = clib_host_to_net_u32 (ls_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_lisp_add_del_locator_t_handler (vl_api_lisp_add_del_locator_t * mp)
+{
+  vl_api_lisp_add_del_locator_reply_t *rmp;
+  int rv = 0;
+  locator_t locator, *locators = NULL;
+  vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
+  u32 ls_index = ~0;
+  u8 *locator_name = NULL;
+
+  memset (&locator, 0, sizeof (locator));
+  memset (a, 0, sizeof (a[0]));
+
+  locator.sw_if_index = ntohl (mp->sw_if_index);
+  locator.priority = mp->priority;
+  locator.weight = mp->weight;
+  locator.local = 1;
+  vec_add1 (locators, locator);
+
+  locator_name = format (0, "%s", mp->locator_set_name);
+
+  a->name = locator_name;
+  a->locators = locators;
+  a->is_add = mp->is_add;
+  a->local = 1;
+
+  rv = vnet_lisp_add_del_locator (a, NULL, &ls_index);
+
+  vec_free (locators);
+  vec_free (locator_name);
+
+  REPLY_MACRO (VL_API_LISP_ADD_DEL_LOCATOR_REPLY);
+}
+
+static int
+unformat_lisp_eid_api (gid_address_t * dst, u32 vni, u8 type, void *src,
+		       u8 len)
+{
+  switch (type)
+    {
+    case 0:			/* ipv4 */
+      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
+      gid_address_ip_set (dst, src, IP4);
+      gid_address_ippref_len (dst) = len;
+      ip_prefix_normalize (&gid_address_ippref (dst));
+      break;
+    case 1:			/* ipv6 */
+      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
+      gid_address_ip_set (dst, src, IP6);
+      gid_address_ippref_len (dst) = len;
+      ip_prefix_normalize (&gid_address_ippref (dst));
+      break;
+    case 2:			/* l2 mac */
+      gid_address_type (dst) = GID_ADDR_MAC;
+      clib_memcpy (&gid_address_mac (dst), src, 6);
+      break;
+    default:
+      /* unknown type */
+      return VNET_API_ERROR_INVALID_VALUE;
+    }
+
+  gid_address_vni (dst) = vni;
+
+  return 0;
+}
+
+static void
+vl_api_lisp_add_del_local_eid_t_handler (vl_api_lisp_add_del_local_eid_t * mp)
+{
+  vl_api_lisp_add_del_local_eid_reply_t *rmp;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  int rv = 0;
+  gid_address_t _eid, *eid = &_eid;
+  uword *p = NULL;
+  u32 locator_set_index = ~0, map_index = ~0;
+  vnet_lisp_add_del_mapping_args_t _a, *a = &_a;
+  u8 *name = NULL, *key = NULL;
+  memset (a, 0, sizeof (a[0]));
+  memset (eid, 0, sizeof (eid[0]));
+
+  rv = unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
+			      mp->eid_type, mp->eid, mp->prefix_len);
+  if (rv)
+    goto out;
+
+  name = format (0, "%s", mp->locator_set_name);
+  p = hash_get_mem (lcm->locator_set_index_by_name, name);
+  if (!p)
+    {
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto out;
+    }
+  locator_set_index = p[0];
+
+  if (*mp->key)
+    key = format (0, "%s", mp->key);
+
+  /* XXX treat batch configuration */
+  a->is_add = mp->is_add;
+  gid_address_copy (&a->eid, eid);
+  a->locator_set_index = locator_set_index;
+  a->local = 1;
+  a->key = key;
+  a->key_id = clib_net_to_host_u16 (mp->key_id);
+
+  rv = vnet_lisp_add_del_local_mapping (a, &map_index);
+
+out:
+  vec_free (name);
+  vec_free (key);
+  gid_address_free (&a->eid);
+
+  REPLY_MACRO (VL_API_LISP_ADD_DEL_LOCAL_EID_REPLY);
+}
+
+static void
+  vl_api_lisp_eid_table_add_del_map_t_handler
+  (vl_api_lisp_eid_table_add_del_map_t * mp)
+{
+  vl_api_lisp_eid_table_add_del_map_reply_t *rmp;
+  int rv = 0;
+  rv = vnet_lisp_eid_table_map (clib_net_to_host_u32 (mp->vni),
+				clib_net_to_host_u32 (mp->dp_table),
+				mp->is_l2, mp->is_add);
+REPLY_MACRO (VL_API_LISP_EID_TABLE_ADD_DEL_MAP_REPLY)}
+
+static void
+vl_api_lisp_add_del_map_server_t_handler (vl_api_lisp_add_del_map_server_t
+					  * mp)
+{
+  vl_api_lisp_add_del_map_server_reply_t *rmp;
+  int rv = 0;
+  ip_address_t addr;
+
+  memset (&addr, 0, sizeof (addr));
+
+  ip_address_set (&addr, mp->ip_address, mp->is_ipv6 ? IP6 : IP4);
+  rv = vnet_lisp_add_del_map_server (&addr, mp->is_add);
+
+  REPLY_MACRO (VL_API_LISP_ADD_DEL_MAP_SERVER_REPLY);
+}
+
+static void
+vl_api_lisp_add_del_map_resolver_t_handler (vl_api_lisp_add_del_map_resolver_t
+					    * mp)
+{
+  vl_api_lisp_add_del_map_resolver_reply_t *rmp;
+  int rv = 0;
+  vnet_lisp_add_del_map_resolver_args_t _a, *a = &_a;
+
+  memset (a, 0, sizeof (a[0]));
+
+  a->is_add = mp->is_add;
+  ip_address_set (&a->address, mp->ip_address, mp->is_ipv6 ? IP6 : IP4);
+
+  rv = vnet_lisp_add_del_map_resolver (a);
+
+  REPLY_MACRO (VL_API_LISP_ADD_DEL_MAP_RESOLVER_REPLY);
+}
+
+static void
+  vl_api_lisp_map_register_enable_disable_t_handler
+  (vl_api_lisp_map_register_enable_disable_t * mp)
+{
+  vl_api_lisp_map_register_enable_disable_reply_t *rmp;
+  int rv = 0;
+
+  vnet_lisp_map_register_enable_disable (mp->is_enabled);
+  REPLY_MACRO (VL_API_LISP_ENABLE_DISABLE_REPLY);
+}
+
+static void
+  vl_api_lisp_rloc_probe_enable_disable_t_handler
+  (vl_api_lisp_rloc_probe_enable_disable_t * mp)
+{
+  vl_api_lisp_rloc_probe_enable_disable_reply_t *rmp;
+  int rv = 0;
+
+  vnet_lisp_rloc_probe_enable_disable (mp->is_enabled);
+  REPLY_MACRO (VL_API_LISP_ENABLE_DISABLE_REPLY);
+}
+
+static void
+vl_api_lisp_enable_disable_t_handler (vl_api_lisp_enable_disable_t * mp)
+{
+  vl_api_lisp_enable_disable_reply_t *rmp;
+  int rv = 0;
+
+  vnet_lisp_enable_disable (mp->is_en);
+  REPLY_MACRO (VL_API_LISP_ENABLE_DISABLE_REPLY);
+}
+
+static void
+  vl_api_show_lisp_map_request_mode_t_handler
+  (vl_api_show_lisp_map_request_mode_t * mp)
+{
+  int rv = 0;
+  vl_api_show_lisp_map_request_mode_reply_t *rmp;
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_SHOW_LISP_MAP_REQUEST_MODE_REPLY,
+  ({
+    rmp->mode = vnet_lisp_get_map_request_mode ();
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_lisp_map_request_mode_t_handler (vl_api_lisp_map_request_mode_t * mp)
+{
+  vl_api_lisp_map_request_mode_reply_t *rmp;
+  int rv = 0;
+
+  rv = vnet_lisp_set_map_request_mode (mp->mode);
+
+  REPLY_MACRO (VL_API_LISP_MAP_REQUEST_MODE_REPLY);
+}
+
+static void
+vl_api_lisp_pitr_set_locator_set_t_handler (vl_api_lisp_pitr_set_locator_set_t
+					    * mp)
+{
+  vl_api_lisp_pitr_set_locator_set_reply_t *rmp;
+  int rv = 0;
+  u8 *ls_name = 0;
+
+  ls_name = format (0, "%s", mp->ls_name);
+  rv = vnet_lisp_pitr_set_locator_set (ls_name, mp->is_add);
+  vec_free (ls_name);
+
+  REPLY_MACRO (VL_API_LISP_PITR_SET_LOCATOR_SET_REPLY);
+}
+
+static void
+  vl_api_lisp_add_del_map_request_itr_rlocs_t_handler
+  (vl_api_lisp_add_del_map_request_itr_rlocs_t * mp)
+{
+  vl_api_lisp_add_del_map_request_itr_rlocs_reply_t *rmp;
+  int rv = 0;
+  u8 *locator_set_name = NULL;
+  vnet_lisp_add_del_mreq_itr_rloc_args_t _a, *a = &_a;
+
+  locator_set_name = format (0, "%s", mp->locator_set_name);
+
+  a->is_add = mp->is_add;
+  a->locator_set_name = locator_set_name;
+
+  rv = vnet_lisp_add_del_mreq_itr_rlocs (a);
+
+  vec_free (locator_set_name);
+
+  REPLY_MACRO (VL_API_LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS_REPLY);
+}
+
+static void
+  vl_api_lisp_add_del_remote_mapping_t_handler
+  (vl_api_lisp_add_del_remote_mapping_t * mp)
+{
+  locator_t *rlocs = 0;
+  vl_api_lisp_add_del_remote_mapping_reply_t *rmp;
+  int rv = 0;
+  gid_address_t _eid, *eid = &_eid;
+  u32 rloc_num = clib_net_to_host_u32 (mp->rloc_num);
+
+  memset (eid, 0, sizeof (eid[0]));
+
+  rv = unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
+			      mp->eid_type, mp->eid, mp->eid_len);
+  if (rv)
+    goto send_reply;
+
+  rlocs = unformat_lisp_locs (mp->rlocs, rloc_num);
+
+  if (!mp->is_add)
+    {
+      vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
+      gid_address_copy (&a->reid, eid);
+      a->is_add = 0;
+      rv = vnet_lisp_add_del_adjacency (a);
+      if (rv)
+	{
+	  goto out;
+	}
+    }
+
+  /* NOTE: for now this works as a static remote mapping, i.e.,
+   * not authoritative and ttl infinite. */
+  rv = vnet_lisp_add_del_mapping (eid, rlocs, mp->action, 0, ~0,
+				  mp->is_add, 1 /* is_static */ , 0);
+
+  if (mp->del_all)
+    vnet_lisp_clear_all_remote_adjacencies ();
+
+out:
+  vec_free (rlocs);
+send_reply:
+  REPLY_MACRO (VL_API_LISP_ADD_DEL_REMOTE_MAPPING_REPLY);
+}
+
+static void
+vl_api_lisp_add_del_adjacency_t_handler (vl_api_lisp_add_del_adjacency_t * mp)
+{
+  vl_api_lisp_add_del_adjacency_reply_t *rmp;
+  vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
+
+  int rv = 0;
+  memset (a, 0, sizeof (a[0]));
+
+  rv = unformat_lisp_eid_api (&a->leid, clib_net_to_host_u32 (mp->vni),
+			      mp->eid_type, mp->leid, mp->leid_len);
+  rv |= unformat_lisp_eid_api (&a->reid, clib_net_to_host_u32 (mp->vni),
+			       mp->eid_type, mp->reid, mp->reid_len);
+
+  if (rv)
+    goto send_reply;
+
+  a->is_add = mp->is_add;
+  rv = vnet_lisp_add_del_adjacency (a);
+
+send_reply:
+  REPLY_MACRO (VL_API_LISP_ADD_DEL_ADJACENCY_REPLY);
+}
+
+static void
+send_lisp_locator_details (lisp_cp_main_t * lcm,
+			   locator_t * loc,
+			   unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_lisp_locator_details_t *rmp;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_LISP_LOCATOR_DETAILS);
+  rmp->context = context;
+
+  rmp->local = loc->local;
+  if (loc->local)
+    {
+      rmp->sw_if_index = ntohl (loc->sw_if_index);
+    }
+  else
+    {
+      rmp->is_ipv6 = gid_address_ip_version (&loc->address);
+      ip_address_copy_addr (rmp->ip_address, &gid_address_ip (&loc->address));
+    }
+  rmp->priority = loc->priority;
+  rmp->weight = loc->weight;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_lisp_locator_dump_t_handler (vl_api_lisp_locator_dump_t * mp)
+{
+  u8 *ls_name = 0;
+  unix_shared_memory_queue_t *q = 0;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  locator_set_t *lsit = 0;
+  locator_t *loc = 0;
+  u32 ls_index = ~0, *locit = 0;
+  uword *p = 0;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  if (mp->is_index_set)
+    ls_index = htonl (mp->ls_index);
+  else
+    {
+      /* make sure we get a proper C-string */
+      mp->ls_name[sizeof (mp->ls_name) - 1] = 0;
+      ls_name = format (0, "%s", mp->ls_name);
+      p = hash_get_mem (lcm->locator_set_index_by_name, ls_name);
+      if (!p)
+	goto out;
+      ls_index = p[0];
+    }
+
+  if (pool_is_free_index (lcm->locator_set_pool, ls_index))
+    return;
+
+  lsit = pool_elt_at_index (lcm->locator_set_pool, ls_index);
+
+  vec_foreach (locit, lsit->locator_indices)
+  {
+    loc = pool_elt_at_index (lcm->locator_pool, locit[0]);
+    send_lisp_locator_details (lcm, loc, q, mp->context);
+  };
+out:
+  vec_free (ls_name);
+}
+
+static void
+send_lisp_locator_set_details (lisp_cp_main_t * lcm,
+			       locator_set_t * lsit,
+			       unix_shared_memory_queue_t * q,
+			       u32 context, u32 ls_index)
+{
+  vl_api_lisp_locator_set_details_t *rmp;
+  u8 *str = 0;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_LISP_LOCATOR_SET_DETAILS);
+  rmp->context = context;
+
+  rmp->ls_index = htonl (ls_index);
+  if (lsit->local)
+    {
+      ASSERT (lsit->name != NULL);
+      strncpy ((char *) rmp->ls_name, (char *) lsit->name,
+	       vec_len (lsit->name));
+    }
+  else
+    {
+      str = format (0, "<remote-%d>", ls_index);
+      strncpy ((char *) rmp->ls_name, (char *) str, vec_len (str));
+      vec_free (str);
+    }
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_lisp_locator_set_dump_t_handler (vl_api_lisp_locator_set_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q = NULL;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  locator_set_t *lsit = NULL;
+  u8 filter;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  filter = mp->filter;
+  /* *INDENT-OFF* */
+  pool_foreach (lsit, lcm->locator_set_pool,
+  ({
+    if (filter && !((1 == filter && lsit->local) ||
+                    (2 == filter && !lsit->local)))
+      {
+        continue;
+      }
+    send_lisp_locator_set_details (lcm, lsit, q, mp->context,
+                                   lsit - lcm->locator_set_pool);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+lisp_fid_put_api (u8 * dst, fid_address_t * src, u8 * prefix_length)
+{
+  ASSERT (prefix_length);
+  ip_prefix_t *ippref = &fid_addr_ippref (src);
+
+  switch (fid_addr_type (src))
+    {
+    case FID_ADDR_IP_PREF:
+      if (ip_prefix_version (ippref) == IP4)
+	clib_memcpy (dst, &ip_prefix_v4 (ippref), 4);
+      else
+	clib_memcpy (dst, &ip_prefix_v6 (ippref), 16);
+      prefix_length[0] = ip_prefix_len (ippref);
+      break;
+
+    case FID_ADDR_MAC:
+      prefix_length[0] = 0;
+      clib_memcpy (dst, fid_addr_mac (src), 6);
+      break;
+
+    default:
+      clib_warning ("Unknown FID type %d!", fid_addr_type (src));
+      break;
+    }
+}
+
+static u8
+fid_type_to_api_type (fid_address_t * fid)
+{
+  ip_prefix_t *ippref;
+
+  switch (fid_addr_type (fid))
+    {
+    case FID_ADDR_IP_PREF:
+      ippref = &fid_addr_ippref (fid);
+      if (ip_prefix_version (ippref) == IP4)
+	return 0;
+      else if (ip_prefix_version (ippref) == IP6)
+	return 1;
+      else
+	return ~0;
+
+    case FID_ADDR_MAC:
+      return 2;
+    }
+
+  return ~0;
+}
+
+static void
+send_lisp_eid_table_details (mapping_t * mapit,
+			     unix_shared_memory_queue_t * q,
+			     u32 context, u8 filter)
+{
+  fid_address_t *fid;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  locator_set_t *ls = 0;
+  vl_api_lisp_eid_table_details_t *rmp = NULL;
+  gid_address_t *gid = NULL;
+  u8 *mac = 0;
+  ip_prefix_t *ip_prefix = NULL;
+
+  switch (filter)
+    {
+    case 0:			/* all mappings */
+      break;
+
+    case 1:			/* local only */
+      if (!mapit->local)
+	return;
+      break;
+    case 2:			/* remote only */
+      if (mapit->local)
+	return;
+      break;
+    default:
+      clib_warning ("Filter error, unknown filter: %d", filter);
+      return;
+    }
+
+  gid = &mapit->eid;
+  ip_prefix = &gid_address_ippref (gid);
+  mac = gid_address_mac (gid);
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_DETAILS);
+
+  ls = pool_elt_at_index (lcm->locator_set_pool, mapit->locator_set_index);
+  if (vec_len (ls->locator_indices) == 0)
+    rmp->locator_set_index = ~0;
+  else
+    rmp->locator_set_index = clib_host_to_net_u32 (mapit->locator_set_index);
+
+  rmp->is_local = mapit->local;
+  rmp->ttl = clib_host_to_net_u32 (mapit->ttl);
+  rmp->action = mapit->action;
+  rmp->authoritative = mapit->authoritative;
+
+  switch (gid_address_type (gid))
+    {
+    case GID_ADDR_SRC_DST:
+      rmp->is_src_dst = 1;
+      fid = &gid_address_sd_src (gid);
+      rmp->eid_type = fid_type_to_api_type (fid);
+      lisp_fid_put_api (rmp->seid, &gid_address_sd_src (gid),
+			&rmp->seid_prefix_len);
+      lisp_fid_put_api (rmp->eid, &gid_address_sd_dst (gid),
+			&rmp->eid_prefix_len);
+      break;
+    case GID_ADDR_IP_PREFIX:
+      rmp->eid_prefix_len = ip_prefix_len (ip_prefix);
+      if (ip_prefix_version (ip_prefix) == IP4)
+	{
+	  rmp->eid_type = 0;	/* ipv4 type */
+	  clib_memcpy (rmp->eid, &ip_prefix_v4 (ip_prefix),
+		       sizeof (ip_prefix_v4 (ip_prefix)));
+	}
+      else
+	{
+	  rmp->eid_type = 1;	/* ipv6 type */
+	  clib_memcpy (rmp->eid, &ip_prefix_v6 (ip_prefix),
+		       sizeof (ip_prefix_v6 (ip_prefix)));
+	}
+      break;
+    case GID_ADDR_MAC:
+      rmp->eid_type = 2;	/* l2 mac type */
+      clib_memcpy (rmp->eid, mac, 6);
+      break;
+    default:
+      ASSERT (0);
+    }
+  rmp->context = context;
+  rmp->vni = clib_host_to_net_u32 (gid_address_vni (gid));
+  rmp->key_id = clib_host_to_net_u16 (mapit->key_id);
+  memcpy (rmp->key, mapit->key, vec_len (mapit->key));
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_lisp_eid_table_dump_t_handler (vl_api_lisp_eid_table_dump_t * mp)
+{
+  u32 mi;
+  unix_shared_memory_queue_t *q = NULL;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  mapping_t *mapit = NULL;
+  gid_address_t _eid, *eid = &_eid;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  if (mp->eid_set)
+    {
+      memset (eid, 0, sizeof (*eid));
+
+      unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
+			     mp->eid_type, mp->eid, mp->prefix_length);
+
+      mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, eid);
+      if ((u32) ~ 0 == mi)
+	return;
+
+      mapit = pool_elt_at_index (lcm->mapping_pool, mi);
+      send_lisp_eid_table_details (mapit, q, mp->context,
+				   0 /* ignore filter */ );
+    }
+  else
+    {
+      /* *INDENT-OFF* */
+      pool_foreach (mapit, lcm->mapping_pool,
+      ({
+        send_lisp_eid_table_details(mapit, q, mp->context,
+                                    mp->filter);
+      }));
+      /* *INDENT-ON* */
+    }
+}
+
+static void
+send_lisp_map_server_details (ip_address_t * ip,
+			      unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_lisp_map_server_details_t *rmp = NULL;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_LISP_MAP_SERVER_DETAILS);
+
+  switch (ip_addr_version (ip))
+    {
+    case IP4:
+      rmp->is_ipv6 = 0;
+      clib_memcpy (rmp->ip_address, &ip_addr_v4 (ip),
+		   sizeof (ip_addr_v4 (ip)));
+      break;
+
+    case IP6:
+      rmp->is_ipv6 = 1;
+      clib_memcpy (rmp->ip_address, &ip_addr_v6 (ip),
+		   sizeof (ip_addr_v6 (ip)));
+      break;
+
+    default:
+      ASSERT (0);
+    }
+  rmp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_lisp_map_server_dump_t_handler (vl_api_lisp_map_server_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q = NULL;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  lisp_msmr_t *mr;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  vec_foreach (mr, lcm->map_servers)
+  {
+    send_lisp_map_server_details (&mr->address, q, mp->context);
+  }
+}
+
+static void
+send_lisp_map_resolver_details (ip_address_t * ip,
+				unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_lisp_map_resolver_details_t *rmp = NULL;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_LISP_MAP_RESOLVER_DETAILS);
+
+  switch (ip_addr_version (ip))
+    {
+    case IP4:
+      rmp->is_ipv6 = 0;
+      clib_memcpy (rmp->ip_address, &ip_addr_v4 (ip),
+		   sizeof (ip_addr_v4 (ip)));
+      break;
+
+    case IP6:
+      rmp->is_ipv6 = 1;
+      clib_memcpy (rmp->ip_address, &ip_addr_v6 (ip),
+		   sizeof (ip_addr_v6 (ip)));
+      break;
+
+    default:
+      ASSERT (0);
+    }
+  rmp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_lisp_map_resolver_dump_t_handler (vl_api_lisp_map_resolver_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q = NULL;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  lisp_msmr_t *mr;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  vec_foreach (mr, lcm->map_resolvers)
+  {
+    send_lisp_map_resolver_details (&mr->address, q, mp->context);
+  }
+}
+
+static void
+send_eid_table_map_pair (hash_pair_t * p,
+			 unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_lisp_eid_table_map_details_t *rmp = NULL;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_MAP_DETAILS);
+
+  rmp->vni = clib_host_to_net_u32 (p->key);
+  rmp->dp_table = clib_host_to_net_u32 (p->value[0]);
+  rmp->context = context;
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_lisp_eid_table_map_dump_t_handler (vl_api_lisp_eid_table_map_dump_t *
+					  mp)
+{
+  unix_shared_memory_queue_t *q = NULL;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  hash_pair_t *p;
+  uword *vni_table = 0;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  if (mp->is_l2)
+    {
+      vni_table = lcm->bd_id_by_vni;
+    }
+  else
+    {
+      vni_table = lcm->table_id_by_vni;
+    }
+
+  /* *INDENT-OFF* */
+  hash_foreach_pair (p, vni_table,
+  ({
+    send_eid_table_map_pair (p, q, mp->context);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+send_eid_table_vni (u32 vni, unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_lisp_eid_table_vni_details_t *rmp = 0;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_VNI_DETAILS);
+  rmp->context = context;
+  rmp->vni = clib_host_to_net_u32 (vni);
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+lisp_adjacency_copy (vl_api_lisp_adjacency_t * dst, lisp_adjacency_t * adjs)
+{
+  lisp_adjacency_t *adj;
+  vl_api_lisp_adjacency_t a;
+  u32 i, n = vec_len (adjs);
+
+  for (i = 0; i < n; i++)
+    {
+      adj = vec_elt_at_index (adjs, i);
+      memset (&a, 0, sizeof (a));
+
+      switch (gid_address_type (&adj->reid))
+	{
+	case GID_ADDR_IP_PREFIX:
+	  a.reid_prefix_len = gid_address_ippref_len (&adj->reid);
+	  a.leid_prefix_len = gid_address_ippref_len (&adj->leid);
+	  if (gid_address_ip_version (&adj->reid) == IP4)
+	    {
+	      a.eid_type = 0;	/* ipv4 type */
+	      clib_memcpy (a.reid, &gid_address_ip (&adj->reid), 4);
+	      clib_memcpy (a.leid, &gid_address_ip (&adj->leid), 4);
+	    }
+	  else
+	    {
+	      a.eid_type = 1;	/* ipv6 type */
+	      clib_memcpy (a.reid, &gid_address_ip (&adj->reid), 16);
+	      clib_memcpy (a.leid, &gid_address_ip (&adj->leid), 16);
+	    }
+	  break;
+	case GID_ADDR_MAC:
+	  a.eid_type = 2;	/* l2 mac type */
+	  mac_copy (a.reid, gid_address_mac (&adj->reid));
+	  mac_copy (a.leid, gid_address_mac (&adj->leid));
+	  break;
+	default:
+	  ASSERT (0);
+	}
+      dst[i] = a;
+    }
+}
+
+static void
+  vl_api_show_lisp_rloc_probe_state_t_handler
+  (vl_api_show_lisp_rloc_probe_state_t * mp)
+{
+  vl_api_show_lisp_rloc_probe_state_reply_t *rmp = 0;
+  int rv = 0;
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2 (VL_API_SHOW_LISP_RLOC_PROBE_STATE_REPLY,
+  {
+    rmp->is_enabled = vnet_lisp_rloc_probe_state_get ();
+  });
+  /* *INDENT-ON* */
+}
+
+static void
+  vl_api_show_lisp_map_register_state_t_handler
+  (vl_api_show_lisp_map_register_state_t * mp)
+{
+  vl_api_show_lisp_map_register_state_reply_t *rmp = 0;
+  int rv = 0;
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2 (VL_API_SHOW_LISP_MAP_REGISTER_STATE_REPLY,
+  {
+    rmp->is_enabled = vnet_lisp_map_register_state_get ();
+  });
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_lisp_adjacencies_get_t_handler (vl_api_lisp_adjacencies_get_t * mp)
+{
+  vl_api_lisp_adjacencies_get_reply_t *rmp = 0;
+  lisp_adjacency_t *adjs = 0;
+  int rv = 0;
+  vl_api_lisp_adjacency_t a;
+  u32 size = ~0;
+  u32 vni = clib_net_to_host_u32 (mp->vni);
+
+  adjs = vnet_lisp_adjacencies_get_by_vni (vni);
+  size = vec_len (adjs) * sizeof (a);
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO4 (VL_API_LISP_ADJACENCIES_GET_REPLY, size,
+  {
+    rmp->count = clib_host_to_net_u32 (vec_len (adjs));
+    lisp_adjacency_copy (rmp->adjacencies, adjs);
+  });
+  /* *INDENT-ON* */
+
+  vec_free (adjs);
+}
+
+static void
+vl_api_lisp_eid_table_vni_dump_t_handler (vl_api_lisp_eid_table_vni_dump_t *
+					  mp)
+{
+  hash_pair_t *p;
+  u32 *vnis = 0;
+  unix_shared_memory_queue_t *q = 0;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  /* *INDENT-OFF* */
+  hash_foreach_pair (p, lcm->table_id_by_vni,
+  ({
+    hash_set (vnis, p->key, 0);
+  }));
+
+  hash_foreach_pair (p, lcm->bd_id_by_vni,
+  ({
+    hash_set (vnis, p->key, 0);
+  }));
+
+  hash_foreach_pair (p, vnis,
+  ({
+    send_eid_table_vni (p->key, q, mp->context);
+  }));
+  /* *INDENT-ON* */
+
+  hash_free (vnis);
+}
+
+static void
+vl_api_show_lisp_status_t_handler (vl_api_show_lisp_status_t * mp)
+{
+  unix_shared_memory_queue_t *q = NULL;
+  vl_api_show_lisp_status_reply_t *rmp = NULL;
+  int rv = 0;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_SHOW_LISP_STATUS_REPLY,
+  ({
+    rmp->gpe_status = vnet_lisp_gpe_enable_disable_status ();
+    rmp->feature_status = vnet_lisp_enable_disable_status ();
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+  vl_api_lisp_get_map_request_itr_rlocs_t_handler
+  (vl_api_lisp_get_map_request_itr_rlocs_t * mp)
+{
+  unix_shared_memory_queue_t *q = NULL;
+  vl_api_lisp_get_map_request_itr_rlocs_reply_t *rmp = NULL;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  locator_set_t *loc_set = 0;
+  u8 *tmp_str = 0;
+  int rv = 0;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  if (~0 == lcm->mreq_itr_rlocs)
+    {
+      tmp_str = format (0, " ");
+    }
+  else
+    {
+      loc_set =
+	pool_elt_at_index (lcm->locator_set_pool, lcm->mreq_itr_rlocs);
+      tmp_str = format (0, "%s", loc_set->name);
+    }
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_LISP_GET_MAP_REQUEST_ITR_RLOCS_REPLY,
+  ({
+    strncpy((char *) rmp->locator_set_name, (char *) tmp_str,
+            ARRAY_LEN(rmp->locator_set_name) - 1);
+  }));
+  /* *INDENT-ON* */
+
+  vec_free (tmp_str);
+}
+
+static void
+vl_api_show_lisp_pitr_t_handler (vl_api_show_lisp_pitr_t * mp)
+{
+  unix_shared_memory_queue_t *q = NULL;
+  vl_api_show_lisp_pitr_reply_t *rmp = NULL;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  mapping_t *m;
+  locator_set_t *ls = 0;
+  u8 *tmp_str = 0;
+  int rv = 0;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  if (!lcm->lisp_pitr)
+    {
+      tmp_str = format (0, "N/A");
+    }
+  else
+    {
+      m = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
+      if (~0 != m->locator_set_index)
+	{
+	  ls =
+	    pool_elt_at_index (lcm->locator_set_pool, m->locator_set_index);
+	  tmp_str = format (0, "%s", ls->name);
+	}
+      else
+	{
+	  tmp_str = format (0, "N/A");
+	}
+    }
+  vec_add1 (tmp_str, 0);
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_SHOW_LISP_PITR_REPLY,
+  ({
+    rmp->status = lcm->lisp_pitr;
+    strncpy((char *) rmp->locator_set_name, (char *) tmp_str,
+            ARRAY_LEN(rmp->locator_set_name) - 1);
+  }));
+  /* *INDENT-ON* */
+}
+
+/*
+ * lisp_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_lisp;
+#undef _
+}
+
+static clib_error_t *
+lisp_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (lisp_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-cp/lisp_cp_dpo.c b/src/vnet/lisp-cp/lisp_cp_dpo.c
new file mode 100644
index 00000000..185b07a2
--- /dev/null
+++ b/src/vnet/lisp-cp/lisp_cp_dpo.c
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/dpo/dpo.h>
+#include <vnet/lisp-gpe/lisp_gpe.h>
+#include <vnet/lisp-cp/control.h>
+
+/**
+ * The static array of LISP punt DPOs
+ */
+static dpo_id_t lisp_cp_dpos[DPO_PROTO_NUM];
+
+const dpo_id_t *
+lisp_cp_dpo_get (dpo_proto_t proto)
+{
+  /*
+   * there are only two instances of this DPO type.
+   * we can use the protocol as the index
+   */
+  return (&lisp_cp_dpos[proto]);
+}
+
+static u8 *
+format_lisp_cp_dpo (u8 * s, va_list * args)
+{
+  index_t index = va_arg (*args, index_t);
+  CLIB_UNUSED (u32 indent) = va_arg (*args, u32);
+
+  return (format (s, "lisp-cp-punt-%U", format_dpo_proto, index));
+}
+
+static void
+lisp_cp_dpo_lock (dpo_id_t * dpo)
+{
+}
+
+static void
+lisp_cp_dpo_unlock (dpo_id_t * dpo)
+{
+}
+
+const static dpo_vft_t lisp_cp_vft = {
+  .dv_lock = lisp_cp_dpo_lock,
+  .dv_unlock = lisp_cp_dpo_unlock,
+  .dv_format = format_lisp_cp_dpo,
+};
+
+/**
+ * @brief The per-protocol VLIB graph nodes that are assigned to a LISP-CP
+ *        object.
+ *
+ * this means that these graph nodes are ones from which a LISP-CP is the
+ * parent object in the DPO-graph.
+ */
+const static char *const lisp_cp_ip4_nodes[] = {
+  "lisp-cp-lookup-ip4",
+  NULL,
+};
+
+const static char *const lisp_cp_ip6_nodes[] = {
+  "lisp-cp-lookup-ip6",
+  NULL,
+};
+
+const static char *const lisp_cp_ethernet_nodes[] = {
+  "lisp-cp-lookup-l2",
+  NULL,
+};
+
+
+const static char *const *const lisp_cp_nodes[DPO_PROTO_NUM] = {
+  [DPO_PROTO_IP4] = lisp_cp_ip4_nodes,
+  [DPO_PROTO_IP6] = lisp_cp_ip6_nodes,
+  [DPO_PROTO_ETHERNET] = lisp_cp_ethernet_nodes,
+  [DPO_PROTO_MPLS] = NULL,
+};
+
+clib_error_t *
+lisp_cp_dpo_module_init (vlib_main_t * vm)
+{
+  dpo_proto_t dproto;
+
+  /*
+   * there are no exit arcs from the LIS-CP VLIB node, so we
+   * pass NULL as said node array.
+   */
+  dpo_register (DPO_LISP_CP, &lisp_cp_vft, lisp_cp_nodes);
+
+  FOR_EACH_DPO_PROTO (dproto)
+  {
+    dpo_set (&lisp_cp_dpos[dproto], DPO_LISP_CP, dproto, dproto);
+  }
+
+  return (NULL);
+}
+
+VLIB_INIT_FUNCTION (lisp_cp_dpo_module_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-cp/lisp_cp_dpo.h b/src/vnet/lisp-cp/lisp_cp_dpo.h
new file mode 100644
index 00000000..f0f3fae8
--- /dev/null
+++ b/src/vnet/lisp-cp/lisp_cp_dpo.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __LISP_CP_DPO_H__
+#define __LISP_CP_DPO_H__
+
+#include <vnet/vnet.h>
+#include <vnet/dpo/dpo.h>
+
+/**
+ * A representation of punt to the LISP control plane.
+ */
+typedef struct lisp_cp_dpo_t
+{
+  /**
+   * The transport payload type.
+   */
+  dpo_proto_t lcd_proto;
+} lisp_cp_dpo_t;
+
+extern const dpo_id_t *lisp_cp_dpo_get (dpo_proto_t proto);
+
+extern void lisp_cp_dpo_module_init (void);
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-cp/lisp_cp_messages.h b/src/vnet/lisp-cp/lisp_cp_messages.h
new file mode 100644
index 00000000..278f60e1
--- /dev/null
+++ b/src/vnet/lisp-cp/lisp_cp_messages.h
@@ -0,0 +1,613 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef VNET_LISP_GPE_LISP_CP_MESSAGES_H_
+#define VNET_LISP_GPE_LISP_CP_MESSAGES_H_
+
+#include <vnet/vnet.h>
+
+#define MAX_IP_PKT_LEN 4096
+#define MAX_IP_HDR_LEN 40	/* without options or IPv6 hdr extensions */
+#define UDP_HDR_LEN 8
+#define LISP_DATA_HDR_LEN 8
+#define LISP_ECM_HDR_LEN 4
+#define MAX_LISP_MSG_ENCAP_LEN  2*(MAX_IP_HDR_LEN + UDP_HDR_LEN)+ LISP_ECM_HDR_LEN
+#define MAX_LISP_PKT_ENCAP_LEN  MAX_IP_HDR_LEN + UDP_HDR_LEN + LISP_DATA_HDR_LEN
+
+#define LISP_CONTROL_PORT 4342
+
+/*
+ * EID RECORD FIELD
+ */
+
+/*
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    / |   Reserved    | EID mask-len  |        EID-prefix-AFI         |
+ *  Rec +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    \ |                       EID-prefix  ...                         |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+
+
+typedef struct _eid_prefix_record_hdr
+{
+  u8 reserved;
+  u8 eid_prefix_length;
+} __attribute__ ((__packed__)) eid_record_hdr_t;
+
+void eid_rec_hdr_init (eid_record_hdr_t * ptr);
+
+#define EID_REC_CAST(h_) ((eid_record_hdr_t *)(h_))
+#define EID_REC_MLEN(h_) EID_REC_CAST((h_))->eid_prefix_length
+#define EID_REC_ADDR(h) (u8 *)(h) + sizeof(eid_record_hdr_t)
+
+/* LISP Types */
+typedef enum
+{
+  NOT_LISP_MSG,
+  LISP_MAP_REQUEST = 1,
+  LISP_MAP_REPLY,
+  LISP_MAP_REGISTER,
+  LISP_MAP_NOTIFY,
+  LISP_INFO_NAT = 7,
+  LISP_ENCAP_CONTROL_TYPE = 8,
+  LISP_MSG_TYPES
+} lisp_msg_type_e;
+
+/*
+ * ENCAPSULATED CONTROL MESSAGE
+ */
+
+/*
+ *     0                   1                   2                   3
+ *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   / |                       IPv4 or IPv6 Header                     |
+ * OH  |                      (uses RLOC addresses)                    |
+ *   \ |                                                               |
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   / |       Source Port = xxxx      |       Dest Port = 4342        |
+ * UDP +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   \ |           UDP Length          |        UDP Checksum           |
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * LH  |Type=8 |S|                  Reserved                           |
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   / |                       IPv4 or IPv6 Header                     |
+ * IH  |                  (uses RLOC or EID addresses)                 |
+ *   \ |                                                               |
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   / |       Source Port = xxxx      |       Dest Port = yyyy        |
+ * UDP +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   \ |           UDP Length          |        UDP Checksum           |
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * LCM |                      LISP Control Message                     |
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+
+
+/*
+ * Encapsulated control message header. This is followed by the IP
+ * header of the encapsulated LISP control message.
+ *
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |Type=8 |S|                 Reserved                            |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+
+typedef struct
+{
+#if CLIB_ARCH_IS_LITTLE_ENDIAN
+  u8 reserved:3;
+  u8 s_bit:1;
+  u8 type:4;
+#else
+  u8 type:4;
+  u8 s_bit:1;
+  u8 reserved:3;
+#endif
+  u8 reserved2[3];
+} ecm_hdr_t;
+
+char *ecm_hdr_to_char (ecm_hdr_t * h);
+
+#define ECM_TYPE(h_) ((ecm_hdr_t *)(h_))->type
+
+/*
+ * MAP-REQUEST MESSAGE
+ */
+
+/*
+ * Map-Request Message Format
+ *
+ *       0                   1                   2                   3
+ *       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |Type=1 |A|M|P|S|p|s|    Reserved     |   IRC   | Record Count  |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |                         Nonce . . .                           |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |                         . . . Nonce                           |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |         Source-EID-AFI        |   Source EID Address  ...     |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |         ITR-RLOC-AFI 1        |    ITR-RLOC Address 1  ...    |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |                              ...                              |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |         ITR-RLOC-AFI n        |    ITR-RLOC Address n  ...    |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    / |   Reserved    | EID mask-len  |        EID-prefix-AFI         |
+ *  Rec +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    \ |                       EID-prefix  ...                         |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |                   Map-Reply Record  ...                       |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |                     Mapping Protocol Data                     |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+
+
+/*
+ * Fixed size portion of the map request. Variable size source EID
+ * address, originating ITR RLOC AFIs and addresses and then map
+ * request records follow.
+ */
+typedef struct
+{
+#if CLIB_ARCH_IS_LITTLE_ENDIAN
+  u8 solicit_map_request:1;
+  u8 rloc_probe:1;
+  u8 map_data_present:1;
+  u8 authoritative:1;
+  u8 type:4;
+#else
+  u8 type:4;
+  u8 authoritative:1;
+  u8 map_data_present:1;
+  u8 rloc_probe:1;
+  u8 solicit_map_request:1;
+#endif
+#if CLIB_ARCH_IS_LITTLE_ENDIAN
+  u8 reserved1:6;
+  u8 smr_invoked:1;
+  u8 pitr:1;
+#else
+  u8 pitr:1;
+  u8 smr_invoked:1;
+  u8 reserved1:6;
+#endif
+#if CLIB_ARCH_IS_LITTLE_ENDIAN
+  u8 additional_itr_rloc_count:5;
+  u8 reserved2:3;
+#else
+  u8 reserved2:3;
+  u8 additional_itr_rloc_count:5;
+#endif
+  u8 record_count;
+  u64 nonce;
+} __attribute__ ((__packed__)) map_request_hdr_t;
+
+void map_request_hdr_init (void *ptr);
+char *map_request_hdr_to_char (map_request_hdr_t * h);
+
+#define MREQ_TYPE(h_) (h_)->type
+#define MREQ_HDR_CAST(h_) ((map_request_hdr_t *)(h_))
+#define MREQ_REC_COUNT(h_) (MREQ_HDR_CAST(h_))->record_count
+#define MREQ_RLOC_PROBE(h_) (MREQ_HDR_CAST(h_))->rloc_probe
+#define MREQ_ITR_RLOC_COUNT(h_) (MREQ_HDR_CAST(h_))->additional_itr_rloc_count
+#define MREQ_NONCE(h_) (MREQ_HDR_CAST(h_))->nonce
+#define MREQ_SMR(h_) (MREQ_HDR_CAST(h_))->solicit_map_request
+#define MREQ_SMR_INVOKED(h_) (MREQ_HDR_CAST(h_))->smr_invoked
+
+/*
+ * MAP-REPLY MESSAGE
+ */
+
+ /*
+  * Map-Reply Message Format
+  *
+  *       0                   1                   2                   3
+  *       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+  *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  *      |Type=2 |P|E|S|         Reserved                | Record Count  |
+  *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  *      |                         Nonce . . .                           |
+  *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  *      |                         . . . Nonce                           |
+  *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  *  |   |                          Record  TTL                          |
+  *  |   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  *  R   | Locator Count | EID mask-len  | ACT |A|      Reserved         |
+  *  e   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  *  c   | Rsvd  |  Map-Version Number   |            EID-AFI            |
+  *  o   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  *  r   |                          EID-prefix                           |
+  *  d   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  *  |  /|    Priority   |    Weight     |  M Priority   |   M Weight    |
+  *  | L +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  *  | o |        Unused Flags     |L|p|R|           Loc-AFI             |
+  *  | c +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  *  |  \|                            Locator                            |
+  *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  *      |                     Mapping Protocol Data                     |
+  *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  */
+
+ /*
+  * Fixed size portion of the map reply.
+  */
+typedef struct
+{
+#if CLIB_ARCH_IS_LITTLE_ENDIAN
+  u8 reserved1:1;
+  u8 security:1;
+  u8 echo_nonce:1;
+  u8 rloc_probe:1;
+  u8 type:4;
+#else
+  u8 type:4;
+  u8 rloc_probe:1;
+  u8 echo_nonce:1;
+  u8 security:1;
+  u8 reserved1:1;
+#endif
+  u8 reserved2;
+  u8 reserved3;
+  u8 record_count;
+  u64 nonce;
+} __attribute__ ((__packed__)) map_reply_hdr_t;
+
+void map_reply_hdr_init (void *ptr);
+char *map_reply_hdr_to_char (map_reply_hdr_t * h);
+
+#define MREP_TYPE(h_) MREP_HDR_CAST(h_)->type
+#define MREP_HDR_CAST(h_) ((map_reply_hdr_t *)(h_))
+#define MREP_REC_COUNT(h_) MREP_HDR_CAST(h_)->record_count
+#define MREP_RLOC_PROBE(h_) MREP_HDR_CAST(h_)->rloc_probe
+#define MREP_NONCE(h_) MREP_HDR_CAST(h_)->nonce
+
+
+always_inline lisp_msg_type_e
+lisp_msg_type (void *b)
+{
+  ecm_hdr_t *hdr = b;
+  if (!hdr)
+    {
+      return (NOT_LISP_MSG);
+    }
+  return (hdr->type);
+}
+
+always_inline void
+increment_record_count (void *b)
+{
+  switch (lisp_msg_type (b))
+    {
+    case LISP_MAP_REQUEST:
+      MREQ_REC_COUNT (b) += 1;
+      break;
+    case LISP_MAP_REPLY:
+      MREP_REC_COUNT (b) += 1;
+      break;
+    default:
+      return;
+    }
+}
+
+
+/*
+ * LOCATOR FIELD
+ *
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    /|    Priority   |    Weight     |  M Priority   |   M Weight    |
+ *   L +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   o |        Unused Flags     |L|p|R|           Loc-AFI             |
+ *   c +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    \|                            Locator                            |
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ * Fixed portion of the mapping record locator. Variable length
+ * locator address follows.
+ */
+typedef struct _locator_hdr
+{
+  u8 priority;
+  u8 weight;
+  u8 mpriority;
+  u8 mweight;
+  u8 unused1;
+#ifdef CLIB_ARCH_IS_LITTLE_ENDIAN
+  u8 reachable:1;
+  u8 probed:1;
+  u8 local:1;
+  u8 unused2:5;
+#else
+  u8 unused2:5;
+  u8 local:1;
+  u8 probed:1;
+  u8 reachable:1;
+#endif
+} __attribute__ ((__packed__)) locator_hdr_t;
+
+#define LOC_CAST(h_) ((locator_hdr_t *)(h_))
+#define LOC_PROBED(h_) LOC_CAST(h_)->probed
+#define LOC_PRIORITY(h_) LOC_CAST(h_)->priority
+#define LOC_WEIGHT(h_) LOC_CAST(h_)->weight
+#define LOC_MPRIORITY(h_) LOC_CAST(h_)->mpriority
+#define LOC_MWEIGHT(h_) LOC_CAST(h_)->mweight
+#define LOC_REACHABLE(h_) LOC_CAST(h_)->reachable
+#define LOC_LOCAL(h_) LOC_CAST(h_)->local
+#define LOC_ADDR(h_) ((u8 *)(h_)  + sizeof(locator_hdr_t))
+
+/*
+ * MAPPING RECORD
+ *
+ * Mapping record used in all LISP control messages.
+ *
+ *  +--->  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |      |                          Record  TTL                          |
+ *  |      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  R      | Locator Count | EID mask-len  | ACT |A|       Reserved        |
+ *  e      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  c      | Rsvd  |  Map-Version Number   |            EID-AFI            |
+ *  o      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  r      |                          EID-prefix                           |
+ *  d      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |     /|    Priority   |    Weight     |  M Priority   |   M Weight    |
+ *  |    / +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |  Loc |         Unused Flags    |L|p|R|           Loc-AFI             |
+ *  |    \ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |     \|                             Locator                           |
+ *  +--->  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+
+/*
+ * Fixed portion of the mapping record. EID prefix address and
+ * locators follow.
+ */
+
+typedef struct _mapping_record_hdr_t
+{
+  u32 ttl;
+  u8 locator_count;
+  u8 eid_prefix_length;
+#ifdef CLIB_ARCH_IS_LITTLE_ENDIAN
+  u8 reserved1:4;
+  u8 authoritative:1;
+  u8 action:3;
+#else
+  u8 action:3;
+  u8 authoritative:1;
+  u8 reserved1:4;
+#endif
+  u8 reserved2;
+#ifdef CLIB_ARCH_IS_LITTLE_ENDIAN
+  u8 version_hi:4;
+  u8 reserved3:4;
+#else
+  u8 reserved3:4;
+  u8 version_hi:4;
+#endif
+  u8 version_low;
+} __attribute__ ((__packed__)) mapping_record_hdr_t;
+
+void mapping_record_init_hdr (mapping_record_hdr_t * h);
+
+#define MAP_REC_EID_PLEN(h) ((mapping_record_hdr_t *)(h))->eid_prefix_length
+#define MAP_REC_LOC_COUNT(h) ((mapping_record_hdr_t *)(h))->locator_count
+#define MAP_REC_ACTION(h) ((mapping_record_hdr_t *)(h))->action
+#define MAP_REC_AUTH(h) ((mapping_record_hdr_t *)(h))->authoritative
+#define MAP_REC_TTL(h) ((mapping_record_hdr_t *)(h))->ttl
+#define MAP_REC_EID(h) (u8 *)(h)+sizeof(mapping_record_hdr_t)
+#define MAP_REC_VERSION(h) (h)->version_hi << 8 | (h)->version_low
+
+typedef enum
+{
+  LISP_NO_ACTION,
+  LISP_FORWARD_NATIVE,
+  LISP_SEND_MAP_REQUEST,
+  LISP_DROP
+} lisp_action_e;
+
+typedef enum lisp_authoritative
+{
+  A_NO_AUTHORITATIVE = 0,
+  A_AUTHORITATIVE
+} lisp_authoritative_e;
+
+/*
+ * LISP Canonical Address Format Encodings
+ *
+ *   0                   1                   2                   3
+ *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |           AFI = 16387         |     Rsvd1     |     Flags     |
+ *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |    Type       |     Rsvd2     |            Length             |
+ *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+
+typedef struct _lcaf_hdr_t
+{
+  u8 reserved1;
+  u8 flags;
+  u8 type;
+  u8 reserved2;
+  u16 len;
+} __attribute__ ((__packed__)) lcaf_hdr_t;
+
+#define LCAF_TYPE(h) ((lcaf_hdr_t *)(h))->type
+#define LCAF_LENGTH(h) ((lcaf_hdr_t *)(h))->len
+#define LCAF_RES2(h) ((lcaf_hdr_t *)(h))->reserved2
+#define LCAF_FLAGS(h) ((lcaf_hdr_t *)(h))->flags
+#define LCAF_PAYLOAD(h) (u8 *)(h)+sizeof(lcaf_hdr_t)
+
+/*
+ * Source/Dest Key Canonical Address Format:
+ *
+ *   0                   1                   2                   3
+ *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   |            Reserved           |   Source-ML   |    Dest-ML    |
+ *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+typedef struct _lcaf_src_dst_hdr_t
+{
+  u16 reserved;
+  u8 src_mask_len;
+  u8 dst_mask_len;
+} __attribute__ ((__packed__)) lcaf_src_dst_hdr_t;
+
+#define LCAF_SD_SRC_ML(_h) (_h)->src_mask_len
+#define LCAF_SD_DST_ML(_h) (_h)->dst_mask_len
+
+/*
+ * The Map-Register message format is:
+ *
+ *       0                   1                   2                   3
+ *       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |Type=3 |P|            Reserved               |M| Record Count  |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |                         Nonce . . .                           |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |                         . . . Nonce                           |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |            Key ID             |  Authentication Data Length   |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      ~                     Authentication Data                       ~
+ *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |   |                          Record TTL                           |
+ *  |   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  R   | Locator Count | EID mask-len  | ACT |A|      Reserved         |
+ *  e   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  c   | Rsvd  |  Map-Version Number   |        EID-Prefix-AFI         |
+ *  o   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  r   |                          EID-Prefix                           |
+ *  d   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |  /|    Priority   |    Weight     |  M Priority   |   M Weight    |
+ *  | L +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  | o |        Unused Flags     |L|p|R|           Loc-AFI             |
+ *  | c +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |  \|                             Locator                           |
+ *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+typedef struct
+{
+#if CLIB_ARCH_IS_LITTLE_ENDIAN
+  u8 res1:3;
+  u8 proxy_map_reply:1;
+  u8 type:4;
+#else
+  u8 type:4;
+  u8 proxy_map_reply:1;
+  u8 res1:3;
+#endif
+
+  u8 res2;
+
+#if CLIB_ARCH_IS_LITTLE_ENDIAN
+  u8 want_map_notify:1;
+  u8 res3:7;
+#else
+  u8 res3:7;
+  u8 want_map_notify:1;
+#endif
+
+  u8 record_count;
+  u64 nonce;
+  u16 key_id;
+  u16 auth_data_len;
+  u8 data[0];
+} __attribute__ ((__packed__)) map_register_hdr_t;
+
+#define MREG_TYPE(h_) (h_)->type
+#define MREG_HDR_CAST(h_) ((map_register_hdr_t *)(h_))
+#define MREG_PROXY_MR(h_) (MREG_HDR_CAST(h_))->proxy_map_reply
+#define MREG_WANT_MAP_NOTIFY(h_) (MREG_HDR_CAST(h_))->want_map_notify
+#define MREG_REC_COUNT(h_) (MREG_HDR_CAST(h_))->record_count
+#define MREG_NONCE(h_) (MREG_HDR_CAST(h_))->nonce
+#define MREG_KEY_ID(h_) (MREG_HDR_CAST(h_))->key_id
+#define MREG_AUTH_DATA_LEN(h_) (MREG_HDR_CAST(h_))->auth_data_len
+#define MREG_DATA(h_) (MREG_HDR_CAST(h_))->data
+
+/*
+ * The Map-Notify message format is:
+ *
+ *       0                   1                   2                   3
+ *       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |Type=4 |              Reserved                 | Record Count  |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |                         Nonce . . .                           |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |                         . . . Nonce                           |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      |            Key ID             |  Authentication Data Length   |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      ~                     Authentication Data                       ~
+ *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |   |                          Record TTL                           |
+ *  |   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  R   | Locator Count | EID mask-len  | ACT |A|      Reserved         |
+ *  e   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  c   | Rsvd  |  Map-Version Number   |         EID-Prefix-AFI        |
+ *  o   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  r   |                          EID-Prefix                           |
+ *  d   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |  /|    Priority   |    Weight     |  M Priority   |   M Weight    |
+ *  | L +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  | o |        Unused Flags     |L|p|R|           Loc-AFI             |
+ *  | c +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |  \|                             Locator                           |
+ *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+*/
+
+typedef struct
+{
+#if CLIB_ARCH_IS_LITTLE_ENDIAN
+  u8 res1:4;
+  u8 type:4;
+#else
+  u8 type:4;
+  u8 res1:4;
+#endif
+
+  u16 res2;
+
+  u8 record_count;
+  u64 nonce;
+  u16 key_id;
+  u16 auth_data_len;
+  u8 data[0];
+} __attribute__ ((__packed__)) map_notify_hdr_t;
+
+#define MNOTIFY_TYPE(h_) (h_)->type
+#define MNOTIFY_HDR_CAST(h_) ((map_register_hdr_t *)(h_))
+#define MNOTIFY_REC_COUNT(h_) (MREG_HDR_CAST(h_))->record_count
+#define MNOTIFY_NONCE(h_) (MREG_HDR_CAST(h_))->nonce
+#define MNOTIFY_KEY_ID(h_) (MREG_HDR_CAST(h_))->key_id
+#define MNOTIFY_AUTH_DATA_LEN(h_) (MREG_HDR_CAST(h_))->auth_data_len
+#define MNOTIFY_DATA(h_) (MREG_HDR_CAST(h_))->data
+
+#endif /* VNET_LISP_GPE_LISP_CP_MESSAGES_H_ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-cp/lisp_msg_serdes.c b/src/vnet/lisp-cp/lisp_msg_serdes.c
new file mode 100644
index 00000000..eee1885c
--- /dev/null
+++ b/src/vnet/lisp-cp/lisp_msg_serdes.c
@@ -0,0 +1,372 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/lisp-cp/lisp_msg_serdes.h>
+#include <vnet/lisp-cp/packets.h>
+#include <vppinfra/time.h>
+
+void *lisp_msg_put_gid (vlib_buffer_t * b, gid_address_t * gid);
+
+static void
+lisp_msg_put_locators (vlib_buffer_t * b, locator_t * locators)
+{
+  locator_t *loc;
+
+  vec_foreach (loc, locators)
+  {
+    u8 *p = vlib_buffer_put_uninit (b, sizeof (locator_hdr_t));
+    memset (p, 0, sizeof (locator_hdr_t));
+    LOC_PRIORITY (p) = loc->priority;
+    LOC_MPRIORITY (p) = loc->mpriority;
+    LOC_WEIGHT (p) = loc->weight;
+    LOC_MWEIGHT (p) = loc->mweight;
+    LOC_LOCAL (p) = loc->local;
+    LOC_PROBED (p) = loc->probed ? 1 : 0;
+    lisp_msg_put_gid (b, &loc->address);
+  }
+}
+
+static void
+lisp_msg_put_mapping_record (vlib_buffer_t * b, mapping_t * record)
+{
+  mapping_record_hdr_t *p =
+    vlib_buffer_put_uninit (b, sizeof (mapping_record_hdr_t));
+  gid_address_t *eid = &record->eid;
+
+  memset (p, 0, sizeof (*p));
+  MAP_REC_EID_PLEN (p) = gid_address_len (eid);
+  MAP_REC_TTL (p) = clib_host_to_net_u32 (MAP_REGISTER_DEFAULT_TTL);
+  MAP_REC_AUTH (p) = record->authoritative ? 1 : 0;
+  MAP_REC_LOC_COUNT (p) = vec_len (record->locators);
+
+  lisp_msg_put_gid (b, eid);
+  lisp_msg_put_locators (b, record->locators);
+}
+
+static void
+lisp_msg_put_mreg_records (vlib_buffer_t * b, mapping_t * records)
+{
+  u32 i;
+  for (i = 0; i < vec_len (records); i++)
+    lisp_msg_put_mapping_record (b, &records[i]);
+}
+
+void *
+lisp_msg_put_gid (vlib_buffer_t * b, gid_address_t * gid)
+{
+  u8 *p = 0;
+  if (!gid)
+    {
+      /* insert only src-eid-afi field set to 0 */
+      p = vlib_buffer_put_uninit (b, sizeof (u16));
+      *(u16 *) p = 0;
+    }
+  else
+    {
+      p = vlib_buffer_put_uninit (b, gid_address_size_to_put (gid));
+      gid_address_put (p, gid);
+    }
+  return p;
+}
+
+static void *
+lisp_msg_put_itr_rlocs (lisp_cp_main_t * lcm, vlib_buffer_t * b,
+			gid_address_t * rlocs, u8 * locs_put)
+{
+  u8 *bp, count = 0;
+  u32 i;
+
+  bp = vlib_buffer_get_current (b);
+  for (i = 0; i < vec_len (rlocs); i++)
+    {
+      lisp_msg_put_gid (b, &rlocs[i]);
+      count++;
+    }
+
+  *locs_put = count - 1;
+  return bp;
+}
+
+void *
+lisp_msg_put_eid_rec (vlib_buffer_t * b, gid_address_t * eid)
+{
+  eid_record_hdr_t *h = vlib_buffer_put_uninit (b, sizeof (*h));
+
+  memset (h, 0, sizeof (*h));
+  EID_REC_MLEN (h) = gid_address_len (eid);
+  lisp_msg_put_gid (b, eid);
+  return h;
+}
+
+u64
+nonce_build (u32 seed)
+{
+  u64 nonce;
+  u32 nonce_lower;
+  u32 nonce_upper;
+  struct timespec ts;
+
+  /* Put nanosecond clock in lower 32-bits and put an XOR of the nanosecond
+   * clock with the seond clock in the upper 32-bits. */
+  syscall (SYS_clock_gettime, CLOCK_REALTIME, &ts);
+  nonce_lower = ts.tv_nsec;
+  nonce_upper = ts.tv_sec ^ clib_host_to_net_u32 (nonce_lower);
+
+  /* OR in a caller provided seed to the low-order 32-bits. */
+  nonce_lower |= seed;
+
+  /* Return 64-bit nonce. */
+  nonce = nonce_upper;
+  nonce = (nonce << 32) | nonce_lower;
+  return nonce;
+}
+
+void *
+lisp_msg_put_map_reply (vlib_buffer_t * b, mapping_t * records, u64 nonce,
+			u8 probe_bit)
+{
+  map_reply_hdr_t *h = vlib_buffer_put_uninit (b, sizeof (h[0]));
+
+  memset (h, 0, sizeof (h[0]));
+  MREP_TYPE (h) = LISP_MAP_REPLY;
+  MREP_NONCE (h) = nonce;
+  MREP_REC_COUNT (h) = 1;
+  MREP_RLOC_PROBE (h) = probe_bit;
+
+  lisp_msg_put_mreg_records (b, records);
+  return h;
+}
+
+void *
+lisp_msg_put_map_register (vlib_buffer_t * b, mapping_t * records,
+			   u8 want_map_notify, u16 auth_data_len, u64 * nonce,
+			   u32 * msg_len)
+{
+  u8 *auth_data = 0;
+
+  /* Basic header init */
+  map_register_hdr_t *h = vlib_buffer_put_uninit (b, sizeof (h[0]));
+
+  memset (h, 0, sizeof (h[0]));
+  MREG_TYPE (h) = LISP_MAP_REGISTER;
+  MREG_NONCE (h) = nonce_build (0);
+  MREG_WANT_MAP_NOTIFY (h) = want_map_notify ? 1 : 0;
+  MREG_REC_COUNT (h) = vec_len (records);
+
+  auth_data = vlib_buffer_put_uninit (b, auth_data_len);
+  memset (auth_data, 0, auth_data_len);
+
+  /* Put map register records */
+  lisp_msg_put_mreg_records (b, records);
+
+  nonce[0] = MREG_NONCE (h);
+  msg_len[0] = vlib_buffer_get_tail (b) - (u8 *) h;
+  return h;
+}
+
+void *
+lisp_msg_put_mreq (lisp_cp_main_t * lcm, vlib_buffer_t * b,
+		   gid_address_t * seid, gid_address_t * deid,
+		   gid_address_t * rlocs, u8 is_smr_invoked,
+		   u8 rloc_probe_set, u64 * nonce)
+{
+  u8 loc_count = 0;
+
+  /* Basic header init */
+  map_request_hdr_t *h = vlib_buffer_put_uninit (b, sizeof (h[0]));
+
+  memset (h, 0, sizeof (h[0]));
+  MREQ_TYPE (h) = LISP_MAP_REQUEST;
+  MREQ_NONCE (h) = nonce_build (0);
+  MREQ_SMR_INVOKED (h) = is_smr_invoked ? 1 : 0;
+  MREQ_RLOC_PROBE (h) = rloc_probe_set ? 1 : 0;
+
+  /* We're adding one eid record */
+  increment_record_count (h);
+
+  /* Fill source eid */
+  lisp_msg_put_gid (b, seid);
+
+  /* Put itr rlocs */
+  lisp_msg_put_itr_rlocs (lcm, b, rlocs, &loc_count);
+  MREQ_ITR_RLOC_COUNT (h) = loc_count;
+
+  /* Put eid record */
+  lisp_msg_put_eid_rec (b, deid);
+
+  nonce[0] = MREQ_NONCE (h);
+  return h;
+}
+
+void *
+lisp_msg_push_ecm (vlib_main_t * vm, vlib_buffer_t * b, int lp, int rp,
+		   gid_address_t * la, gid_address_t * ra)
+{
+  ecm_hdr_t *h;
+  ip_address_t _src_ip, *src_ip = &_src_ip, _dst_ip, *dst_ip = &_dst_ip;
+  if (gid_address_type (la) != GID_ADDR_IP_PREFIX)
+    {
+      /* empty ip4 */
+      memset (src_ip, 0, sizeof (src_ip[0]));
+      memset (dst_ip, 0, sizeof (dst_ip[0]));
+    }
+  else
+    {
+      src_ip = &gid_address_ip (la);
+      dst_ip = &gid_address_ip (ra);
+    }
+
+  /* Push inner ip and udp */
+  pkt_push_udp_and_ip (vm, b, lp, rp, src_ip, dst_ip);
+
+  /* Push lisp ecm hdr */
+  h = pkt_push_ecm_hdr (b);
+
+  return h;
+}
+
+static u32
+msg_type_to_hdr_len (lisp_msg_type_e type)
+{
+  switch (type)
+    {
+    case LISP_MAP_REQUEST:
+      return (sizeof (map_request_hdr_t));
+    case LISP_MAP_REPLY:
+      return (sizeof (map_reply_hdr_t));
+    default:
+      return (0);
+    }
+}
+
+void *
+lisp_msg_pull_hdr (vlib_buffer_t * b, lisp_msg_type_e type)
+{
+  return vlib_buffer_pull (b, msg_type_to_hdr_len (type));
+}
+
+u32
+lisp_msg_parse_addr (vlib_buffer_t * b, gid_address_t * eid)
+{
+  u32 len;
+  memset (eid, 0, sizeof (*eid));
+  len = gid_address_parse (vlib_buffer_get_current (b), eid);
+  if (len != ~0)
+    vlib_buffer_pull (b, len);
+  return len;
+}
+
+u32
+lisp_msg_parse_eid_rec (vlib_buffer_t * b, gid_address_t * eid)
+{
+  eid_record_hdr_t *h = vlib_buffer_get_current (b);
+  u32 len;
+  memset (eid, 0, sizeof (*eid));
+  len = gid_address_parse (EID_REC_ADDR (h), eid);
+  if (len == ~0)
+    return len;
+
+  gid_address_ippref_len (eid) = EID_REC_MLEN (h);
+  vlib_buffer_pull (b, len + sizeof (eid_record_hdr_t));
+
+  return len + sizeof (eid_record_hdr_t);
+}
+
+u32
+lisp_msg_parse_itr_rlocs (vlib_buffer_t * b, gid_address_t ** rlocs,
+			  u8 rloc_count)
+{
+  gid_address_t tloc;
+  u32 i, len = 0, tlen = 0;
+
+  //MREQ_ITR_RLOC_COUNT(mreq_hdr) + 1
+  for (i = 0; i < rloc_count; i++)
+    {
+      len = lisp_msg_parse_addr (b, &tloc);
+      if (len == ~0)
+	return len;
+      vec_add1 (*rlocs, tloc);
+      tlen += len;
+    }
+  return tlen;
+}
+
+u32
+lisp_msg_parse_loc (vlib_buffer_t * b, locator_t * loc)
+{
+  int len;
+
+  len = locator_parse (vlib_buffer_get_current (b), loc);
+  if (len == ~0)
+    return ~0;
+
+  vlib_buffer_pull (b, len);
+
+  return len;
+}
+
+u32
+lisp_msg_parse_mapping_record (vlib_buffer_t * b, gid_address_t * eid,
+			       locator_t ** locs, locator_t * probed_)
+{
+  void *h = 0, *loc_hdr = 0;
+  locator_t loc, *probed = 0;
+  int i = 0, len = 0, llen = 0;
+
+  h = vlib_buffer_get_current (b);
+  vlib_buffer_pull (b, sizeof (mapping_record_hdr_t));
+
+  memset (eid, 0, sizeof (*eid));
+  len = gid_address_parse (vlib_buffer_get_current (b), eid);
+  if (len == ~0)
+    return len;
+
+  vlib_buffer_pull (b, len);
+  if (GID_ADDR_IP_PREFIX == gid_address_type (eid))
+    gid_address_ippref_len (eid) = MAP_REC_EID_PLEN (h);
+
+  for (i = 0; i < MAP_REC_LOC_COUNT (h); i++)
+    {
+      loc_hdr = vlib_buffer_get_current (b);
+
+      llen = lisp_msg_parse_loc (b, &loc);
+      if (llen == ~0)
+	return llen;
+      vec_add1 (*locs, loc);
+      len += llen;
+
+      if (LOC_PROBED (loc_hdr))
+	{
+	  if (probed != 0)
+	    clib_warning
+	      ("Multiple locators probed! Probing only the first!");
+	  else
+	    probed = &loc;
+	}
+    }
+  /* XXX */
+  if (probed_ != 0 && probed)
+    *probed_ = *probed;
+
+  return len + sizeof (map_reply_hdr_t);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-cp/lisp_msg_serdes.h b/src/vnet/lisp-cp/lisp_msg_serdes.h
new file mode 100644
index 00000000..d794eff6
--- /dev/null
+++ b/src/vnet/lisp-cp/lisp_msg_serdes.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef VNET_LISP_GPE_LISP_MSG_BUILDER_H_
+#define VNET_LISP_GPE_LISP_MSG_BUILDER_H_
+
+#include <vnet/vnet.h>
+#include <vnet/lisp-cp/lisp_cp_messages.h>
+#include <vnet/lisp-cp/control.h>
+
+void *lisp_msg_put_mreq (lisp_cp_main_t * lcm, vlib_buffer_t * b,
+			 gid_address_t * seid, gid_address_t * deid,
+			 gid_address_t * rlocs, u8 is_smr_invoked,
+			 u8 rloc_probe_set, u64 * nonce);
+
+void *lisp_msg_put_map_register (vlib_buffer_t * b, mapping_t * records,
+				 u8 want_map_notify, u16 auth_data_len,
+				 u64 * nonce, u32 * msg_len);
+
+void *lisp_msg_push_ecm (vlib_main_t * vm, vlib_buffer_t * b, int lp, int rp,
+			 gid_address_t * la, gid_address_t * ra);
+
+void *lisp_msg_put_map_reply (vlib_buffer_t * b, mapping_t * record,
+			      u64 nonce, u8 probe_bit);
+
+u32
+lisp_msg_parse_mapping_record (vlib_buffer_t * b, gid_address_t * eid,
+			       locator_t ** locs, locator_t * probed_);
+
+u32 lisp_msg_parse_addr (vlib_buffer_t * b, gid_address_t * eid);
+
+u32 lisp_msg_parse_eid_rec (vlib_buffer_t * b, gid_address_t * eid);
+
+u32
+lisp_msg_parse_itr_rlocs (vlib_buffer_t * b, gid_address_t ** rlocs,
+			  u8 rloc_count);
+
+#endif /* VNET_LISP_GPE_LISP_MSG_BUILDER_H_ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-cp/lisp_types.c b/src/vnet/lisp-cp/lisp_types.c
new file mode 100644
index 00000000..5ab4a5eb
--- /dev/null
+++ b/src/vnet/lisp-cp/lisp_types.c
@@ -0,0 +1,1574 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/lisp-cp/lisp_types.h>
+
+static u16 gid_address_put_no_vni (u8 * b, gid_address_t * gid);
+static u16 gid_address_size_to_put_no_vni (gid_address_t * gid);
+static u16 fid_addr_size_to_write (fid_address_t * a);
+
+u32 mac_parse (u8 * offset, u8 * a);
+
+typedef u16 (*size_to_write_fct) (void *);
+typedef void *(*cast_fct) (gid_address_t *);
+typedef u16 (*serdes_fct) (u8 *, void *);
+typedef u8 (*addr_len_fct) (void *);
+typedef void (*copy_fct) (void *, void *);
+typedef void (*free_fct) (void *);
+typedef int (*cmp_fct) (void *, void *);
+
+size_to_write_fct size_to_write_fcts[GID_ADDR_TYPES] =
+  { ip_prefix_size_to_write, lcaf_size_to_write, mac_size_to_write,
+  sd_size_to_write
+};
+serdes_fct write_fcts[GID_ADDR_TYPES] =
+  { ip_prefix_write, lcaf_write, mac_write, sd_write };
+cast_fct cast_fcts[GID_ADDR_TYPES] =
+  { ip_prefix_cast, lcaf_cast, mac_cast, sd_cast };
+addr_len_fct addr_len_fcts[GID_ADDR_TYPES] =
+  { ip_prefix_length, lcaf_length, mac_length, sd_length };
+copy_fct copy_fcts[GID_ADDR_TYPES] =
+  { ip_prefix_copy, lcaf_copy, mac_copy, sd_copy };
+
+#define foreach_lcaf_type \
+  _(1, no_addr)      \
+  _(0, NULL)         \
+  _(1, vni)          \
+  _(0, NULL)         \
+  _(0, NULL)         \
+  _(0, NULL)         \
+  _(0, NULL)         \
+  _(0, NULL)         \
+  _(0, NULL)         \
+  _(0, NULL)         \
+  _(0, NULL)         \
+  _(0, NULL)         \
+  _(1, sd)
+
+#define _(cond, name)                             \
+  u16 name ## _write (u8 * p, void * a);          \
+  u16 name ## _parse (u8 * p, void * a);          \
+  u16 name ## _size_to_write (void * a);          \
+  void name ## _free (void * a);                  \
+  void name ## _copy (void * dst, void * src);    \
+  u8 name ## _length (void * a);                  \
+  int name ## _cmp (void *, void *);
+foreach_lcaf_type
+#undef _
+#define CONCAT(a,b) a##_##b
+#define IF(c, t, e) CONCAT(IF, c)(t, e)
+#define IF_0(t, e) e
+#define IF_1(t, e) t
+#define EXPAND_FCN(cond, fcn)                           \
+  IF(cond, fcn, NULL)
+  cmp_fct lcaf_cmp_fcts[LCAF_TYPES] =
+{
+#define _(cond, name)                                   \
+    EXPAND_FCN(cond, name##_cmp),
+  foreach_lcaf_type
+#undef _
+};
+
+addr_len_fct lcaf_body_length_fcts[LCAF_TYPES] = {
+#define _(cond, name)                                   \
+    EXPAND_FCN(cond, name##_length),
+  foreach_lcaf_type
+#undef _
+};
+
+copy_fct lcaf_copy_fcts[LCAF_TYPES] = {
+#define _(cond, name)                                   \
+    EXPAND_FCN(cond, name##_copy),
+  foreach_lcaf_type
+#undef _
+};
+
+free_fct lcaf_free_fcts[LCAF_TYPES] = {
+#define _(cond, name)                                   \
+    EXPAND_FCN(cond, name##_free),
+  foreach_lcaf_type
+#undef _
+};
+
+size_to_write_fct lcaf_size_to_write_fcts[LCAF_TYPES] = {
+#define _(cond, name)                                   \
+    EXPAND_FCN(cond, name##_size_to_write),
+  foreach_lcaf_type
+#undef _
+};
+
+serdes_fct lcaf_write_fcts[LCAF_TYPES] = {
+#define _(cond, name)                                   \
+    EXPAND_FCN(cond, name##_write),
+  foreach_lcaf_type
+#undef _
+};
+
+serdes_fct lcaf_parse_fcts[LCAF_TYPES] = {
+#define _(cond, name)                                   \
+    EXPAND_FCN(cond, name##_parse),
+  foreach_lcaf_type
+#undef _
+};
+
+u8 *
+format_ip_address (u8 * s, va_list * args)
+{
+  ip_address_t *a = va_arg (*args, ip_address_t *);
+  u8 ver = ip_addr_version (a);
+  if (ver == IP4)
+    {
+      return format (s, "%U", format_ip4_address, &ip_addr_v4 (a));
+    }
+  else if (ver == IP6)
+    {
+      return format (s, "%U", format_ip6_address, &ip_addr_v6 (a));
+    }
+  else
+    {
+      clib_warning ("Can't format IP version %d!", ver);
+      return 0;
+    }
+}
+
+uword
+unformat_ip_address (unformat_input_t * input, va_list * args)
+{
+  ip_address_t *a = va_arg (*args, ip_address_t *);
+
+  memset (a, 0, sizeof (*a));
+  if (unformat (input, "%U", unformat_ip4_address, &ip_addr_v4 (a)))
+    ip_addr_version (a) = IP4;
+  else if (unformat_user (input, unformat_ip6_address, &ip_addr_v6 (a)))
+    ip_addr_version (a) = IP6;
+  else
+    return 0;
+  return 1;
+}
+
+u8 *
+format_ip_prefix (u8 * s, va_list * args)
+{
+  ip_prefix_t *a = va_arg (*args, ip_prefix_t *);
+  return format (s, "%U/%d", format_ip_address, &ip_prefix_addr (a),
+		 ip_prefix_len (a));
+}
+
+uword
+unformat_ip_prefix (unformat_input_t * input, va_list * args)
+{
+  ip_prefix_t *a = va_arg (*args, ip_prefix_t *);
+  if (unformat (input, "%U/%d", unformat_ip_address, &ip_prefix_addr (a),
+		&ip_prefix_len (a)))
+    {
+      if ((ip_prefix_version (a) == IP4 && 32 < ip_prefix_len (a)) ||
+	  (ip_prefix_version (a) == IP6 && 128 < ip_prefix_length (a)))
+	{
+	  clib_warning ("Prefix length to big: %d!", ip_prefix_len (a));
+	  return 0;
+	}
+      ip_prefix_normalize (a);
+    }
+  else
+    return 0;
+  return 1;
+}
+
+uword
+unformat_mac_address (unformat_input_t * input, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  return unformat (input, "%x:%x:%x:%x:%x:%x", &a[0], &a[1], &a[2], &a[3],
+		   &a[4], &a[5]);
+}
+
+u8 *
+format_mac_address (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+		 a[0], a[1], a[2], a[3], a[4], a[5]);
+}
+
+u8 *
+format_fid_address (u8 * s, va_list * args)
+{
+  fid_address_t *a = va_arg (*args, fid_address_t *);
+
+  switch (fid_addr_type (a))
+    {
+    case FID_ADDR_IP_PREF:
+      return format (s, "%U", format_ip_prefix, &fid_addr_ippref (a));
+
+    case FID_ADDR_MAC:
+      return format (s, "%U", format_mac_address, &fid_addr_mac (a));
+
+    default:
+      clib_warning ("Can't format fid address type %d!", fid_addr_type (a));
+      return 0;
+    }
+  return 0;
+}
+
+u8 *
+format_gid_address (u8 * s, va_list * args)
+{
+  gid_address_t *a = va_arg (*args, gid_address_t *);
+  u8 type = gid_address_type (a);
+  switch (type)
+    {
+    case GID_ADDR_IP_PREFIX:
+      return format (s, "[%d] %U", gid_address_vni (a), format_ip_prefix,
+		     &gid_address_ippref (a));
+    case GID_ADDR_SRC_DST:
+      return format (s, "[%d] %U|%U", gid_address_vni (a),
+		     format_fid_address, &gid_address_sd_src (a),
+		     format_fid_address, &gid_address_sd_dst (a));
+    case GID_ADDR_MAC:
+      return format (s, "[%d] %U", gid_address_vni (a), format_mac_address,
+		     &gid_address_mac (a));
+    default:
+      clib_warning ("Can't format gid type %d", type);
+      return 0;
+    }
+  return 0;
+}
+
+uword
+unformat_fid_address (unformat_input_t * i, va_list * args)
+{
+  fid_address_t *a = va_arg (*args, fid_address_t *);
+  ip_prefix_t ippref;
+  u8 mac[6] = { 0 };
+
+  if (unformat (i, "%U", unformat_ip_prefix, &ippref))
+    {
+      fid_addr_type (a) = FID_ADDR_IP_PREF;
+      ip_prefix_copy (&fid_addr_ippref (a), &ippref);
+    }
+  else if (unformat (i, "%U", unformat_mac_address, mac))
+    {
+      fid_addr_type (a) = FID_ADDR_MAC;
+      mac_copy (fid_addr_mac (a), mac);
+    }
+  else
+    return 0;
+
+  return 1;
+}
+
+uword
+unformat_hmac_key_id (unformat_input_t * input, va_list * args)
+{
+  u32 *key_id = va_arg (*args, u32 *);
+  u8 *s = 0;
+
+  if (unformat (input, "%s", &s))
+    {
+      if (!strcmp ((char *) s, "sha1"))
+	key_id[0] = HMAC_SHA_1_96;
+      else if (!strcmp ((char *) s, "sha256"))
+	key_id[0] = HMAC_SHA_256_128;
+      else
+	{
+	  clib_warning ("invalid key_id: '%s'", s);
+	  key_id[0] = HMAC_NO_KEY;
+	}
+    }
+  else
+    return 0;
+
+  vec_free (s);
+  return 1;
+}
+
+uword
+unformat_gid_address (unformat_input_t * input, va_list * args)
+{
+  gid_address_t *a = va_arg (*args, gid_address_t *);
+  u8 mac[6] = { 0 };
+  ip_prefix_t ippref;
+  fid_address_t sim1, sim2;
+
+  memset (&ippref, 0, sizeof (ippref));
+  memset (&sim1, 0, sizeof (sim1));
+  memset (&sim2, 0, sizeof (sim2));
+
+  if (unformat (input, "%U|%U", unformat_fid_address, &sim1,
+		unformat_fid_address, &sim2))
+    {
+      gid_address_sd_src (a) = sim1;
+      gid_address_sd_dst (a) = sim2;
+      gid_address_type (a) = GID_ADDR_SRC_DST;
+    }
+  else if (unformat (input, "%U", unformat_ip_prefix, &ippref))
+    {
+      ip_prefix_copy (&gid_address_ippref (a), &ippref);
+      gid_address_type (a) = GID_ADDR_IP_PREFIX;
+    }
+  else if (unformat (input, "%U", unformat_mac_address, mac))
+    {
+      mac_copy (gid_address_mac (a), mac);
+      gid_address_type (a) = GID_ADDR_MAC;
+    }
+  else
+    return 0;
+
+  return 1;
+}
+
+uword
+unformat_negative_mapping_action (unformat_input_t * input, va_list * args)
+{
+  u32 *action = va_arg (*args, u32 *);
+  u8 *s = 0;
+
+  if (unformat (input, "%s", &s))
+    {
+      if (!strcmp ((char *) s, "no-action"))
+	action[0] = LISP_NO_ACTION;
+      else if (!strcmp ((char *) s, "natively-forward"))
+	action[0] = LISP_FORWARD_NATIVE;
+      else if (!strcmp ((char *) s, "send-map-request"))
+	action[0] = LISP_SEND_MAP_REQUEST;
+      else if (!strcmp ((char *) s, "drop"))
+	action[0] = LISP_DROP;
+      else
+	{
+	  clib_warning ("invalid action: '%s'", s);
+	  action[0] = LISP_DROP;
+	}
+    }
+  else
+    return 0;
+
+  vec_free (s);
+  return 1;
+}
+
+u8 *
+format_hmac_key_id (u8 * s, va_list * args)
+{
+  lisp_key_type_t key_id = va_arg (*args, lisp_key_type_t);
+
+  switch (key_id)
+    {
+    case HMAC_SHA_1_96:
+      return format (0, "sha1");
+    case HMAC_SHA_256_128:
+      return format (0, "sha256");
+    default:
+      return 0;
+    }
+
+  return 0;
+}
+
+u8 *
+format_negative_mapping_action (u8 * s, va_list * args)
+{
+  lisp_action_e action = va_arg (*args, lisp_action_e);
+
+  switch (action)
+    {
+    case LISP_NO_ACTION:
+      s = format (s, "no-action");
+      break;
+    case LISP_FORWARD_NATIVE:
+      s = format (s, "natively-forward");
+      break;
+    case LISP_SEND_MAP_REQUEST:
+      s = format (s, "send-map-request");
+      break;
+    case LISP_DROP:
+    default:
+      s = format (s, "drop");
+      break;
+    }
+  return (s);
+}
+
+u16
+ip_address_size (const ip_address_t * a)
+{
+  switch (ip_addr_version (a))
+    {
+    case IP4:
+      return sizeof (ip4_address_t);
+      break;
+    case IP6:
+      return sizeof (ip6_address_t);
+      break;
+    }
+  return 0;
+}
+
+u16
+ip_version_to_size (u8 ver)
+{
+  switch (ver)
+    {
+    case IP4:
+      return sizeof (ip4_address_t);
+      break;
+    case IP6:
+      return sizeof (ip6_address_t);
+      break;
+    }
+  return 0;
+}
+
+u8
+ip_version_to_max_plen (u8 ver)
+{
+  switch (ver)
+    {
+    case IP4:
+      return 32;
+      break;
+    case IP6:
+      return 128;
+      break;
+    }
+  return 0;
+}
+
+always_inline lisp_afi_e
+ip_version_to_iana_afi (u16 version)
+{
+  switch (version)
+    {
+    case IP4:
+      return LISP_AFI_IP;
+    case IP6:
+      return LISP_AFI_IP6;
+    default:
+      return 0;
+    }
+  return 0;
+}
+
+always_inline u8
+ip_iana_afi_to_version (lisp_afi_e afi)
+{
+  switch (afi)
+    {
+    case LISP_AFI_IP:
+      return IP4;
+    case LISP_AFI_IP6:
+      return IP6;
+    default:
+      return 0;
+    }
+  return 0;
+}
+
+u16
+ip_address_size_to_write (ip_address_t * a)
+{
+  return ip_address_size (a) + sizeof (u16);
+}
+
+u16
+ip_address_iana_afi (ip_address_t * a)
+{
+  return ip_version_to_iana_afi (ip_addr_version (a));
+}
+
+u8
+ip_address_max_len (u8 version)
+{
+  return version == IP4 ? 32 : 128;
+}
+
+u16
+ip4_address_size_to_put ()
+{
+  // return sizeof(u16) + sizeof (ip4_address_t);
+  return 6;
+}
+
+u16
+ip6_address_size_to_put ()
+{
+  //return sizeof(u16) + sizeof (ip6_address_t);
+  return 18;
+}
+
+u32
+ip4_address_put (u8 * b, ip4_address_t * a)
+{
+  *(u16 *) b = clib_host_to_net_u16 (ip_version_to_iana_afi (IP4));
+  u8 *p = b + sizeof (u16);
+  clib_memcpy (p, a, sizeof (*a));
+  return ip4_address_size_to_put ();
+}
+
+u32
+ip6_address_put (u8 * b, ip6_address_t * a)
+{
+  *(u16 *) b = clib_host_to_net_u16 (ip_version_to_iana_afi (IP6));
+  u8 *p = b + sizeof (u16);
+  clib_memcpy (p, a, sizeof (*a));
+  return ip6_address_size_to_put ();
+}
+
+u32
+ip_address_put (u8 * b, ip_address_t * a)
+{
+  u32 len = ip_address_size (a);
+  *(u16 *) b = clib_host_to_net_u16 (ip_address_iana_afi (a));
+  u8 *p = b + sizeof (u16);
+  clib_memcpy (p, &ip_addr_addr (a), len);
+  return (len + sizeof (u16));
+}
+
+u32
+ip_address_parse (void *offset, u16 iana_afi, ip_address_t * dst)
+{
+  ip_addr_version (dst) = ip_iana_afi_to_version (iana_afi);
+  u8 size = ip_version_to_size (ip_addr_version (dst));
+  clib_memcpy (&ip_addr_addr (dst), offset + sizeof (u16), size);
+  return (sizeof (u16) + size);
+}
+
+u32
+lcaf_hdr_parse (void *offset, lcaf_t * lcaf)
+{
+  lcaf_hdr_t *lh = offset;
+  lcaf->type = lh->type;
+
+  /* this is a bit of hack: since the LCAF Instance ID is the
+     only message that uses reserved2 field, we can set it here.
+     If any LCAF format starts using reserved2 field as well this needs
+     to be moved elsewhere */
+  lcaf_vni_len (lcaf) = lh->reserved2;
+
+  return sizeof (lh[0]);
+}
+
+static u8
+iana_afi_to_fid_addr_type (u16 type)
+{
+  switch (type)
+    {
+    case LISP_AFI_IP:
+    case LISP_AFI_IP6:
+      return FID_ADDR_IP_PREF;
+
+    case LISP_AFI_MAC:
+      return FID_ADDR_MAC;
+    }
+  return ~0;
+}
+
+static u16
+fid_addr_parse (u8 * p, fid_address_t * a)
+{
+  u16 afi = clib_net_to_host_u16 (*(u16 *) p);
+  fid_addr_type (a) = iana_afi_to_fid_addr_type (afi);
+  ip_address_t *ip_addr = &ip_prefix_addr (&fid_addr_ippref (a));
+
+  switch (fid_addr_type (a))
+    {
+    case FID_ADDR_MAC:
+      return mac_parse (p, fid_addr_mac (a));
+
+    case FID_ADDR_IP_PREF:
+      return ip_address_parse (p, afi, ip_addr);
+    }
+  return ~0;
+}
+
+u16
+sd_parse (u8 * p, void *a)
+{
+  lcaf_src_dst_hdr_t *sd_hdr;
+  gid_address_t *g = a;
+  u16 size = 0;
+  fid_address_t *src = &gid_address_sd_src (g);
+  fid_address_t *dst = &gid_address_sd_dst (g);
+
+  gid_address_type (g) = GID_ADDR_SRC_DST;
+
+  sd_hdr = (lcaf_src_dst_hdr_t *) (p + size);
+  size += sizeof (sd_hdr[0]);
+
+  size += fid_addr_parse (p + size, src);
+  size += fid_addr_parse (p + size, dst);
+
+  if (fid_addr_type (src) == FID_ADDR_IP_PREF)
+    {
+      ip_prefix_t *ippref = &fid_addr_ippref (src);
+      ip_prefix_len (ippref) = LCAF_SD_SRC_ML (sd_hdr);
+    }
+  if (fid_addr_type (dst) == FID_ADDR_IP_PREF)
+    {
+      ip_prefix_t *ippref = &fid_addr_ippref (dst);
+      ip_prefix_len (ippref) = LCAF_SD_DST_ML (sd_hdr);
+    }
+  return size;
+}
+
+u16
+try_parse_src_dst_lcaf (u8 * p, gid_address_t * a)
+{
+  lcaf_t lcaf;
+  u16 size = sizeof (u16);	/* skip AFI */
+
+  size += lcaf_hdr_parse (p + size, &lcaf);
+
+  if (LCAF_SOURCE_DEST != lcaf_type (&lcaf))
+    return ~0;
+
+  size += sd_parse (p + size, a);
+  return size;
+}
+
+u16
+vni_parse (u8 * p, void *a)
+{
+  lcaf_t *lcaf = a;
+  gid_address_t *g = a;
+  u16 size = 0;
+
+  gid_address_vni (g) = clib_net_to_host_u32 (*(u32 *) p);
+  size += sizeof (u32);
+  gid_address_vni_mask (g) = lcaf_vni_len (lcaf);
+
+  /* nested LCAFs are not supported except of src/dst with vni - to handle
+   * such case look at the next AFI and process src/dest LCAF separately */
+  u16 afi = clib_net_to_host_u16 (*((u16 *) (p + size)));
+  if (LISP_AFI_LCAF == afi)
+    {
+      u16 len = try_parse_src_dst_lcaf (p + size, g);
+      if ((u16) ~ 0 == len)
+	return ~0;
+      size += len;
+    }
+  else
+    size += gid_address_parse (p + size, g);
+
+  return size;
+}
+
+u16
+no_addr_parse (u8 * p, void *a)
+{
+  /* do nothing */
+  return 0;
+}
+
+u32
+lcaf_parse (void *offset, gid_address_t * addr)
+{
+  /* skip AFI type */
+  offset += sizeof (u16);
+  lcaf_t *lcaf = &gid_address_lcaf (addr);
+
+  u32 size = lcaf_hdr_parse (offset, lcaf);
+  u8 type = lcaf_type (lcaf);
+
+  if (!lcaf_parse_fcts[type])
+    {
+      clib_warning ("Unsupported LCAF type: %u", type);
+      return ~0;
+    }
+  size += (*lcaf_parse_fcts[type]) (offset + size, lcaf);
+  return sizeof (u16) + size;
+}
+
+void
+vni_free (void *a)
+{
+  vni_t *v = a;
+  gid_address_free (vni_gid (v));
+  clib_mem_free (vni_gid (v));
+}
+
+void
+no_addr_free (void *a)
+{
+  /* nothing to do */
+}
+
+void
+sd_free (void *a)
+{
+  /* nothing */
+}
+
+void
+gid_address_free (gid_address_t * a)
+{
+  if (gid_address_type (a) != GID_ADDR_LCAF)
+    return;
+
+  lcaf_t *lcaf = &gid_address_lcaf (a);
+  u8 lcaf_type = lcaf_type (lcaf);
+  (*lcaf_free_fcts[lcaf_type]) (lcaf);
+}
+
+void
+gid_address_from_ip (gid_address_t * g, ip_address_t * ip)
+{
+  memset (g, 0, sizeof (g[0]));
+  ip_address_set (&gid_address_ip (g), ip, ip_addr_version (ip));
+  gid_address_ippref_len (g) = 32;
+}
+
+int
+ip_address_cmp (const ip_address_t * ip1, const ip_address_t * ip2)
+{
+  int res = 0;
+  if (ip_addr_version (ip1) != ip_addr_version (ip2))
+    return -1;
+  res =
+    memcmp (&ip_addr_addr (ip1), &ip_addr_addr (ip2), ip_address_size (ip1));
+
+  if (res < 0)
+    res = 2;
+  else if (res > 0)
+    res = 1;
+
+  return res;
+}
+
+void
+ip_address_copy (ip_address_t * dst, const ip_address_t * src)
+{
+  if (IP4 == ip_addr_version (src))
+    {
+      /* don't copy any garbe from the union */
+      memset (dst, 0, sizeof (*dst));
+      dst->ip.v4 = src->ip.v4;
+      dst->version = IP4;
+    }
+  else
+    {
+      clib_memcpy (dst, src, sizeof (ip_address_t));
+    }
+}
+
+void
+ip_address_copy_addr (void *dst, const ip_address_t * src)
+{
+  clib_memcpy (dst, src, ip_address_size (src));
+}
+
+void
+ip_address_set (ip_address_t * dst, const void *src, u8 version)
+{
+  clib_memcpy (dst, src, ip_version_to_size (version));
+  ip_addr_version (dst) = version;
+}
+
+void
+ip_address_to_46 (const ip_address_t * addr,
+		  ip46_address_t * a, fib_protocol_t * proto)
+{
+  *proto = (IP4 == ip_addr_version (addr) ?
+	    FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6);
+  switch (*proto)
+    {
+    case FIB_PROTOCOL_IP4:
+      ip46_address_set_ip4 (a, &addr->ip.v4);
+      break;
+    case FIB_PROTOCOL_IP6:
+      a->ip6 = addr->ip.v6;
+      break;
+    default:
+      ASSERT (0);
+      break;
+    }
+}
+
+static void
+ip_prefix_normalize_ip4 (ip4_address_t * ip4, u8 preflen)
+{
+  u32 mask = ~0;
+
+  ASSERT (ip4);
+
+  if (32 <= preflen)
+    {
+      return;
+    }
+
+  mask = pow2_mask (preflen) << (32 - preflen);
+  mask = clib_host_to_net_u32 (mask);
+  ip4->data_u32 &= mask;
+}
+
+static void
+ip_prefix_normalize_ip6 (ip6_address_t * ip6, u8 preflen)
+{
+  u8 mask_6[16];
+  u32 *m;
+  u8 j, i0, i1;
+
+  ASSERT (ip6);
+
+  memset (mask_6, 0, sizeof (mask_6));
+
+  if (128 <= preflen)
+    {
+      return;
+    }
+
+  i1 = preflen % 32;
+  i0 = preflen / 32;
+  m = (u32 *) & mask_6[0];
+
+  for (j = 0; j < i0; j++)
+    {
+      m[j] = ~0;
+    }
+
+  if (i1)
+    {
+      m[i0] = clib_host_to_net_u32 (pow2_mask (i1) << (32 - i1));
+    }
+
+  for (j = 0; j < sizeof (mask_6); j++)
+    {
+      ip6->as_u8[j] &= mask_6[j];
+    }
+}
+
+void
+ip_prefix_normalize (ip_prefix_t * a)
+{
+  u8 preflen = ip_prefix_len (a);
+
+  switch (ip_prefix_version (a))
+    {
+    case IP4:
+      ip_prefix_normalize_ip4 (&ip_prefix_v4 (a), preflen);
+      break;
+
+    case IP6:
+      ip_prefix_normalize_ip6 (&ip_prefix_v6 (a), preflen);
+      break;
+
+    default:
+      ASSERT (0);
+    }
+}
+
+void *
+ip_prefix_cast (gid_address_t * a)
+{
+  return &gid_address_ippref (a);
+}
+
+u16
+ip_prefix_size_to_write (void *pref)
+{
+  ip_prefix_t *a = (ip_prefix_t *) pref;
+  return ip_address_size_to_write (&ip_prefix_addr (a));
+}
+
+u16
+ip_prefix_write (u8 * p, void *gid)
+{
+  gid_address_t *g = gid;
+  ip_prefix_t *a = &gid_address_ippref (g);
+
+  switch (ip_prefix_version (a))
+    {
+    case IP4:
+      return ip4_address_put (p, &ip_prefix_v4 (a));
+      break;
+    case IP6:
+      return ip6_address_put (p, &ip_prefix_v6 (a));
+      break;
+    }
+  return 0;
+}
+
+u8
+ip_prefix_length (void *a)
+{
+  return ip_prefix_len ((ip_prefix_t *) a);
+}
+
+void
+ip_prefix_copy (void *dst, void *src)
+{
+  clib_memcpy (dst, src, sizeof (ip_prefix_t));
+}
+
+void
+mac_copy (void *dst, void *src)
+{
+  clib_memcpy (dst, src, 6);
+}
+
+void
+sd_copy (void *dst, void *src)
+{
+  clib_memcpy (dst, src, sizeof (source_dest_t));
+}
+
+int
+ip_prefix_cmp (ip_prefix_t * p1, ip_prefix_t * p2)
+{
+  int cmp = 0;
+
+  ip_prefix_normalize (p1);
+  ip_prefix_normalize (p2);
+
+  cmp = ip_address_cmp (&ip_prefix_addr (p1), &ip_prefix_addr (p2));
+  if (cmp == 0)
+    {
+      if (ip_prefix_len (p1) < ip_prefix_len (p2))
+	{
+	  cmp = 1;
+	}
+      else
+	{
+	  if (ip_prefix_len (p1) > ip_prefix_len (p2))
+	    cmp = 2;
+	}
+    }
+  return cmp;
+}
+
+void
+no_addr_copy (void *dst, void *src)
+{
+  /* nothing to do */
+}
+
+void
+vni_copy (void *dst, void *src)
+{
+  vni_t *vd = dst;
+  vni_t *vs = src;
+
+  clib_memcpy (vd, vs, sizeof (vd[0]));
+  vni_gid (vd) = clib_mem_alloc (sizeof (gid_address_t));
+  gid_address_copy (vni_gid (vd), vni_gid (vs));
+}
+
+void
+lcaf_copy (void *dst, void *src)
+{
+  lcaf_t *lcaf_dst = dst;
+  lcaf_t *lcaf_src = src;
+
+  lcaf_type (lcaf_dst) = lcaf_type (lcaf_src);
+  (*lcaf_copy_fcts[lcaf_type (lcaf_src)]) (dst, src);
+}
+
+u8
+lcaf_length (void *a)
+{
+  return 0;
+}
+
+u8
+mac_length (void *a)
+{
+  return 0;
+}
+
+u8
+sd_length (void *a)
+{
+  return 0;
+}
+
+void *
+lcaf_cast (gid_address_t * a)
+{
+  return &gid_address_lcaf (a);
+}
+
+void *
+mac_cast (gid_address_t * a)
+{
+  return &gid_address_mac (a);
+}
+
+void *
+sd_cast (gid_address_t * a)
+{
+  return &gid_address_sd (a);
+}
+
+u8
+no_addr_length (void *a)
+{
+  return 0;
+}
+
+u8
+vni_length (void *a)
+{
+  vni_t *v = a;
+  return (sizeof (u32)		/* VNI size */
+	  + gid_address_size_to_put (vni_gid (v)) /* vni body size */ );
+}
+
+u16
+lcaf_write (u8 * p, void *a)
+{
+  u16 size = 0, len;
+  lcaf_t *lcaf = a;
+  u8 type = lcaf_type (lcaf);
+  lcaf_hdr_t _h, *h = &_h;
+
+  *(u16 *) p = clib_host_to_net_u16 (LISP_AFI_LCAF);
+  size += sizeof (u16);
+  memset (h, 0, sizeof (h[0]));
+  LCAF_TYPE (h) = type;
+  u16 lcaf_len = (*lcaf_body_length_fcts[type]) (lcaf);
+  LCAF_LENGTH (h) = clib_host_to_net_u16 (lcaf_len);
+
+  clib_memcpy (p + size, h, sizeof (h[0]));
+  size += sizeof (h[0]);
+  len = (*lcaf_write_fcts[type]) (p + size, lcaf);
+
+  if ((u16) ~ 0 == len)
+    return ~0;
+
+  return size + len;
+}
+
+u16
+mac_write (u8 * p, void *a)
+{
+  *(u16 *) p = clib_host_to_net_u16 (LISP_AFI_MAC);
+  clib_memcpy (p + sizeof (u16), a, 6);
+  return mac_size_to_write (a);
+}
+
+static u16
+fid_addr_write (u8 * p, fid_address_t * a)
+{
+  switch (fid_addr_type (a))
+    {
+    case FID_ADDR_IP_PREF:
+      return ip_prefix_write (p, &fid_addr_ippref (a));
+
+    case FID_ADDR_MAC:
+      return mac_write (p, &fid_addr_mac (a));
+
+    default:
+      return ~0;
+    }
+  return ~0;
+}
+
+static u8
+fid_address_length (fid_address_t * a)
+{
+  switch (fid_addr_type (a))
+    {
+    case FID_ADDR_IP_PREF:
+      return ip_prefix_length (&fid_addr_ippref (a));
+    case FID_ADDR_MAC:
+      return 0;
+    }
+  return 0;
+}
+
+u16
+sd_write (u8 * p, void *a)
+{
+  source_dest_t *sd = a;
+  u16 size = 0;
+  lcaf_hdr_t _h, *h = &_h;
+  lcaf_src_dst_hdr_t sd_hdr;
+
+  *(u16 *) p = clib_host_to_net_u16 (LISP_AFI_LCAF);
+  size += sizeof (u16);
+  memset (h, 0, sizeof (h[0]));
+  LCAF_TYPE (h) = LCAF_SOURCE_DEST;
+  u16 lcaf_len = sizeof (lcaf_src_dst_hdr_t)
+    + fid_addr_size_to_write (&sd_src (sd))
+    + fid_addr_size_to_write (&sd_dst (sd));
+  LCAF_LENGTH (h) = clib_host_to_net_u16 (lcaf_len);
+
+  clib_memcpy (p + size, h, sizeof (h[0]));
+  size += sizeof (h[0]);
+
+  memset (&sd_hdr, 0, sizeof (sd_hdr));
+  LCAF_SD_SRC_ML (&sd_hdr) = fid_address_length (&sd_src (sd));
+  LCAF_SD_DST_ML (&sd_hdr) = fid_address_length (&sd_dst (sd));
+  clib_memcpy (p + size, &sd_hdr, sizeof (sd_hdr));
+  size += sizeof (sd_hdr);
+
+  u16 len = fid_addr_write (p + size, &sd_src (sd));
+  if ((u16) ~ 0 == len)
+    return ~0;
+  size += len;
+
+  len = fid_addr_write (p + size, &sd_dst (sd));
+  if ((u16) ~ 0 == len)
+    return ~0;
+  size += len;
+
+  return size;
+}
+
+u16
+vni_write (u8 * p, void *a)
+{
+  lcaf_hdr_t _h, *h = &_h;
+  gid_address_t *g = a;
+  u16 size = 0, len;
+
+  /* put lcaf header */
+  *(u16 *) p = clib_host_to_net_u16 (LISP_AFI_LCAF);
+  size += sizeof (u16);
+  memset (h, 0, sizeof (h[0]));
+  LCAF_TYPE (h) = LCAF_INSTANCE_ID;
+  u16 lcaf_len = sizeof (u32)	/* Instance ID size */
+    + gid_address_size_to_put_no_vni (g);
+  LCAF_LENGTH (h) = clib_host_to_net_u16 (lcaf_len);
+  LCAF_RES2 (h) = gid_address_vni_mask (g);
+
+  /* put vni header */
+  clib_memcpy (p + size, h, sizeof (h[0]));
+  size += sizeof (h[0]);
+
+  u32 *afip = (u32 *) (p + size);
+  afip[0] = clib_host_to_net_u32 (gid_address_vni (g));
+  size += sizeof (u32);
+
+  if (GID_ADDR_SRC_DST == gid_address_type (g))
+    /* write src/dst LCAF */
+    {
+      len = sd_write (p + size, g);
+      if ((u16) ~ 0 == len)
+	return ~0;
+    }
+  else
+    /* write the actual address */
+    len = gid_address_put_no_vni (p + size, g);
+
+  if ((u16) ~ 0 == len)
+    return ~0;
+
+  return size + len;
+}
+
+u16
+no_addr_write (u8 * p, void *a)
+{
+  /* do nothing; return AFI field size */
+  return sizeof (u16);
+}
+
+u16
+no_addr_size_to_write (void *a)
+{
+  return sizeof (u16);		/* AFI field length */
+}
+
+static u16
+fid_addr_size_to_write (fid_address_t * a)
+{
+  switch (fid_addr_type (a))
+    {
+    case FID_ADDR_IP_PREF:
+      return ip_prefix_size_to_write (a);
+
+    case FID_ADDR_MAC:
+      return mac_size_to_write (a);
+
+    default:
+      break;
+    }
+  return 0;
+}
+
+u16
+vni_size_to_write (void *a)
+{
+  gid_address_t *g = a;
+
+  u16 lcaf_size = sizeof (u32) + sizeof (u16)	/* LCAF AFI field size */
+    + sizeof (lcaf_hdr_t);
+
+  if (gid_address_type (g) == GID_ADDR_SRC_DST)
+    /* special case where nested LCAF is supported */
+    return lcaf_size + sd_size_to_write (g);
+  else
+    return lcaf_size + gid_address_size_to_put_no_vni (g);
+}
+
+u16
+lcaf_size_to_write (void *a)
+{
+  lcaf_t *lcaf = (lcaf_t *) a;
+  u32 size = 0, len;
+  u8 type = lcaf_type (lcaf);
+
+  size += sizeof (u16);		/* AFI size */
+
+  len = (*lcaf_size_to_write_fcts[type]) (lcaf);
+  if (~0 == len)
+    return ~0;
+
+  return size + len;
+}
+
+u16
+sd_size_to_write (void *a)
+{
+  source_dest_t *sd = a;
+  return sizeof (u16)
+    + sizeof (lcaf_hdr_t)
+    + sizeof (lcaf_src_dst_hdr_t)
+    + fid_addr_size_to_write (&sd_src (sd))
+    + fid_addr_size_to_write (&sd_dst (sd));
+}
+
+u16
+mac_size_to_write (void *a)
+{
+  return sizeof (u16) + 6;
+}
+
+u8
+gid_address_len (gid_address_t * a)
+{
+  gid_address_type_t type = gid_address_type (a);
+  return (*addr_len_fcts[type]) ((*cast_fcts[type]) (a));
+}
+
+static u16
+gid_address_put_no_vni (u8 * b, gid_address_t * gid)
+{
+  gid_address_type_t type = gid_address_type (gid);
+  return (*write_fcts[type]) (b, (*cast_fcts[type]) (gid));
+}
+
+u16
+gid_address_put (u8 * b, gid_address_t * gid)
+{
+  if (0 != gid_address_vni (gid))
+    return vni_write (b, gid);
+
+  return gid_address_put_no_vni (b, gid);
+}
+
+static u16
+gid_address_size_to_put_no_vni (gid_address_t * gid)
+{
+  gid_address_type_t type = gid_address_type (gid);
+  return (*size_to_write_fcts[type]) ((*cast_fcts[type]) (gid));
+}
+
+u16
+gid_address_size_to_put (gid_address_t * gid)
+{
+  if (0 != gid_address_vni (gid))
+    return vni_size_to_write (gid);
+
+  return gid_address_size_to_put_no_vni (gid);
+}
+
+void *
+gid_address_cast (gid_address_t * gid, gid_address_type_t type)
+{
+  return (*cast_fcts[type]) (gid);
+}
+
+void
+gid_address_copy (gid_address_t * dst, gid_address_t * src)
+{
+  gid_address_type_t type = gid_address_type (src);
+  (*copy_fcts[type]) ((*cast_fcts[type]) (dst), (*cast_fcts[type]) (src));
+  gid_address_type (dst) = type;
+  gid_address_vni (dst) = gid_address_vni (src);
+  gid_address_vni_mask (dst) = gid_address_vni_mask (src);
+}
+
+u32
+mac_parse (u8 * offset, u8 * a)
+{
+  /* skip AFI field */
+  offset += sizeof (u16);
+
+  clib_memcpy (a, offset, 6);
+  return sizeof (u16) + 6;
+}
+
+u32
+gid_address_parse (u8 * offset, gid_address_t * a)
+{
+  lisp_afi_e afi;
+  int len = 0;
+
+  if (!a)
+    return 0;
+
+  /* NOTE: since gid_address_parse may be called by vni_parse, we can't 0
+   * the gid address here */
+  afi = clib_net_to_host_u16 (*((u16 *) offset));
+
+  switch (afi)
+    {
+    case LISP_AFI_NO_ADDR:
+      len = sizeof (u16);
+      gid_address_type (a) = GID_ADDR_NO_ADDRESS;
+      break;
+    case LISP_AFI_IP:
+      len = ip_address_parse (offset, afi, &gid_address_ip (a));
+      gid_address_type (a) = GID_ADDR_IP_PREFIX;
+      /* this should be modified outside if needed */
+      gid_address_ippref_len (a) = 32;
+      break;
+    case LISP_AFI_IP6:
+      len = ip_address_parse (offset, afi, &gid_address_ip (a));
+      gid_address_type (a) = GID_ADDR_IP_PREFIX;
+      /* this should be modified outside if needed */
+      gid_address_ippref_len (a) = 128;
+      break;
+    case LISP_AFI_LCAF:
+      gid_address_type (a) = GID_ADDR_LCAF;
+      len = lcaf_parse (offset, a);
+      break;
+    case LISP_AFI_MAC:
+      len = mac_parse (offset, gid_address_mac (a));
+      gid_address_type (a) = GID_ADDR_MAC;
+      break;
+    default:
+      clib_warning ("LISP AFI %d not supported!", afi);
+      return ~0;
+    }
+  return len;
+}
+
+void
+gid_address_ip_set (gid_address_t * dst, void *src, u8 version)
+{
+  gid_address_ippref_len (dst) = ip_address_max_len (version);
+  ip_address_set (&gid_address_ip (dst), src, version);
+}
+
+int
+no_addr_cmp (void *a1, void *a2)
+{
+  return 0;
+}
+
+int
+vni_cmp (void *a1, void *a2)
+{
+  vni_t *v1 = a1;
+  vni_t *v2 = a2;
+
+  if (vni_mask_len (v1) != vni_mask_len (v2))
+    return -1;
+  if (vni_vni (v1) != vni_vni (v2))
+    return -1;
+  return gid_address_cmp (vni_gid (v1), vni_gid (v2));
+}
+
+static int
+mac_cmp (void *a1, void *a2)
+{
+  return memcmp (a1, a2, 6);
+}
+
+static int
+fid_addr_cmp (fid_address_t * a1, fid_address_t * a2)
+{
+  if (fid_addr_type (a1) != fid_addr_type (a2))
+    return -1;
+
+  switch (fid_addr_type (a1))
+    {
+    case FID_ADDR_IP_PREF:
+      return ip_prefix_cmp (&fid_addr_ippref (a1), &fid_addr_ippref (a2));
+
+    case FID_ADDR_MAC:
+      return mac_cmp (fid_addr_mac (a1), fid_addr_mac (a2));
+
+    default:
+      return -1;
+    }
+  return -1;
+}
+
+int
+sd_cmp (void *a1, void *a2)
+{
+  source_dest_t *sd1 = a1;
+  source_dest_t *sd2 = a2;
+
+  if (fid_addr_cmp (&sd_dst (sd1), &sd_dst (sd2)))
+    return -1;
+  if (fid_addr_cmp (&sd_src (sd1), &sd_src (sd2)))
+    return -1;
+  return 0;
+}
+
+/* Compare two gid_address_t.
+ * Returns:
+ *        -1: If they are from different afi
+ *             0: Both address are the same
+ *             1: Addr1 is bigger than addr2
+ *             2: Addr2 is bigger than addr1
+ */
+int
+gid_address_cmp (gid_address_t * a1, gid_address_t * a2)
+{
+  lcaf_t *lcaf1, *lcaf2;
+  int cmp = -1;
+  if (!a1 || !a2)
+    return -1;
+  if (gid_address_type (a1) != gid_address_type (a2))
+    return -1;
+  if (gid_address_vni (a1) != gid_address_vni (a2))
+    return -1;
+  if (gid_address_vni_mask (a1) != gid_address_vni_mask (a2))
+    return -1;
+
+  switch (gid_address_type (a1))
+    {
+    case GID_ADDR_NO_ADDRESS:
+      if (a1 == a2)
+	cmp = 0;
+      else
+	cmp = 2;
+      break;
+    case GID_ADDR_IP_PREFIX:
+      cmp =
+	ip_prefix_cmp (&gid_address_ippref (a1), &gid_address_ippref (a2));
+      break;
+    case GID_ADDR_LCAF:
+      lcaf1 = &gid_address_lcaf (a1);
+      lcaf2 = &gid_address_lcaf (a2);
+      if (lcaf_type (lcaf1) == lcaf_type (lcaf2))
+	cmp = (*lcaf_cmp_fcts[lcaf_type (lcaf1)]) (lcaf1, lcaf2);
+      break;
+    case GID_ADDR_MAC:
+      cmp = mac_cmp (gid_address_mac (a1), gid_address_mac (a2));
+      break;
+
+    case GID_ADDR_SRC_DST:
+      cmp = sd_cmp (&gid_address_sd (a1), &gid_address_sd (a2));
+      break;
+    default:
+      break;
+    }
+
+  return cmp;
+}
+
+u32
+locator_parse (void *b, locator_t * loc)
+{
+  locator_hdr_t *h;
+  u8 status = 1;		/* locator up */
+  int len;
+
+  h = b;
+  if (!LOC_REACHABLE (h) && LOC_LOCAL (h))
+    status = 0;
+
+  len = gid_address_parse (LOC_ADDR (h), &loc->address);
+  if (len == ~0)
+    return len;
+
+  loc->state = status;
+  loc->local = 0;
+  loc->priority = LOC_PRIORITY (h);
+  loc->weight = LOC_WEIGHT (h);
+  loc->mpriority = LOC_MPRIORITY (h);
+  loc->mweight = LOC_MWEIGHT (h);
+
+  return sizeof (locator_hdr_t) + len;
+}
+
+void
+locator_copy (locator_t * dst, locator_t * src)
+{
+  /* TODO if gid become more complex, this will need to be changed! */
+  clib_memcpy (dst, src, sizeof (*dst));
+  if (!src->local)
+    gid_address_copy (&dst->address, &src->address);
+}
+
+u32
+locator_cmp (locator_t * l1, locator_t * l2)
+{
+  u32 ret = 0;
+  if ((ret = gid_address_cmp (&l1->address, &l2->address)) != 0)
+    return 1;
+
+  if (l1->priority != l2->priority)
+    return 1;
+  if (l1->weight != l2->weight)
+    return 1;
+  if (l1->mpriority != l2->mpriority)
+    return 1;
+  if (l1->mweight != l2->mweight)
+    return 1;
+  return 0;
+}
+
+void
+locator_free (locator_t * l)
+{
+  if (!l->local)
+    gid_address_free (&l->address);
+}
+
+void
+build_src_dst (gid_address_t * sd, gid_address_t * src, gid_address_t * dst)
+{
+  memset (sd, 0, sizeof (*sd));
+  gid_address_type (sd) = GID_ADDR_SRC_DST;
+  gid_address_vni (sd) = gid_address_vni (dst);
+  gid_address_vni_mask (sd) = gid_address_vni_mask (dst);
+
+  switch (gid_address_type (dst))
+    {
+    case GID_ADDR_IP_PREFIX:
+      gid_address_sd_src_type (sd) = FID_ADDR_IP_PREF;
+      gid_address_sd_dst_type (sd) = FID_ADDR_IP_PREF;
+      ip_prefix_copy (&gid_address_sd_src_ippref (sd),
+		      &gid_address_ippref (src));
+      ip_prefix_copy (&gid_address_sd_dst_ippref (sd),
+		      &gid_address_ippref (dst));
+      break;
+    case GID_ADDR_MAC:
+      gid_address_sd_src_type (sd) = FID_ADDR_MAC;
+      gid_address_sd_dst_type (sd) = FID_ADDR_MAC;
+      mac_copy (gid_address_sd_src_mac (sd), gid_address_mac (src));
+      mac_copy (gid_address_sd_dst_mac (sd), gid_address_mac (dst));
+      break;
+    default:
+      clib_warning ("Unsupported gid type %d while conversion!",
+		    gid_address_type (dst));
+      break;
+    }
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-cp/lisp_types.h b/src/vnet/lisp-cp/lisp_types.h
new file mode 100644
index 00000000..ac58b894
--- /dev/null
+++ b/src/vnet/lisp-cp/lisp_types.h
@@ -0,0 +1,354 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef VNET_LISP_GPE_LISP_TYPES_H_
+#define VNET_LISP_GPE_LISP_TYPES_H_
+
+#include <vnet/ip/ip.h>
+#include <vnet/lisp-cp/lisp_cp_messages.h>
+
+#define SHA1_AUTH_DATA_LEN                  20
+#define SHA256_AUTH_DATA_LEN                32
+
+typedef enum
+{
+  HMAC_NO_KEY = 0,
+  HMAC_SHA_1_96,
+  HMAC_SHA_256_128
+} lisp_key_type_t;
+
+uword unformat_hmac_key_id (unformat_input_t * input, va_list * args);
+u8 *format_hmac_key_id (u8 * s, va_list * args);
+
+typedef enum
+{
+  IP4,
+  IP6
+} ip_address_type_t;
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED(struct ip_address
+{
+  union
+  {
+    ip4_address_t v4;
+    ip6_address_t v6;
+  } ip;
+  u8 version;
+}) ip_address_t;
+/* *INDENT-ON* */
+
+#define ip_addr_addr(_a) (_a)->ip
+#define ip_addr_v4(_a) (_a)->ip.v4
+#define ip_addr_v6(_a) (_a)->ip.v6
+#define ip_addr_version(_a) (_a)->version
+
+int ip_address_cmp (const ip_address_t * ip1, const ip_address_t * ip2);
+void ip_address_copy (ip_address_t * dst, const ip_address_t * src);
+void ip_address_copy_addr (void *dst, const ip_address_t * src);
+void ip_address_set (ip_address_t * dst, const void *src, u8 version);
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED(struct ip_prefix
+{
+  ip_address_t addr;
+  u8 len;
+}) ip_prefix_t;
+/* *INDENT-ON* */
+
+#define ip_prefix_addr(_a) (_a)->addr
+#define ip_prefix_version(_a) ip_addr_version(&ip_prefix_addr(_a))
+#define ip_prefix_len(_a) (_a)->len
+#define ip_prefix_v4(_a) ip_addr_v4(&ip_prefix_addr(_a))
+#define ip_prefix_v6(_a) ip_addr_v6(&ip_prefix_addr(_a))
+
+void ip_prefix_normalize (ip_prefix_t * a);
+
+extern void ip_address_to_fib_prefix (const ip_address_t * addr,
+				      fib_prefix_t * prefix);
+extern void ip_prefix_to_fib_prefix (const ip_prefix_t * ipp,
+				     fib_prefix_t * fibp);
+
+typedef enum
+{
+  /* NOTE: ip addresses are left out on purpose. Use max masked ip-prefixes
+   * instead */
+  GID_ADDR_IP_PREFIX,
+  GID_ADDR_LCAF,
+  GID_ADDR_MAC,
+  GID_ADDR_SRC_DST,
+  GID_ADDR_NO_ADDRESS,
+  GID_ADDR_TYPES
+} gid_address_type_t;
+
+typedef enum
+{
+  /* make sure that values corresponds with RFC */
+  LCAF_NULL_BODY = 0,
+  LCAF_AFI_LIST_TYPE,
+  LCAF_INSTANCE_ID,
+  LCAF_SOURCE_DEST = 12,
+  LCAF_TYPES
+} lcaf_type_t;
+
+typedef enum fid_addr_type_t_
+{
+  FID_ADDR_IP_PREF,
+  FID_ADDR_MAC
+} __attribute__ ((packed)) fid_addr_type_t;
+
+/* flat address type */
+typedef struct
+{
+  union
+  {
+    ip_prefix_t ippref;
+    u8 mac[6];
+  };
+  fid_addr_type_t type;
+} fid_address_t;
+
+typedef fid_address_t dp_address_t;
+
+#define fid_addr_ippref(_a) (_a)->ippref
+#define fid_addr_mac(_a) (_a)->mac
+#define fid_addr_type(_a) (_a)->type
+u8 *format_fid_address (u8 * s, va_list * args);
+
+typedef struct
+{
+  fid_address_t src;
+  fid_address_t dst;
+} source_dest_t;
+
+#define sd_dst(_a) (_a)->dst
+#define sd_src(_a) (_a)->src
+#define sd_src_ippref(_a) fid_addr_ippref(&sd_src(_a))
+#define sd_dst_ippref(_a) fid_addr_ippref(&sd_dst(_a))
+#define sd_src_mac(_a) fid_addr_mac(&sd_src(_a))
+#define sd_dst_mac(_a) fid_addr_mac(&sd_dst(_a))
+#define sd_src_type(_a) fid_addr_type(&sd_src(_a))
+#define sd_dst_type(_a) fid_addr_type(&sd_dst(_a))
+
+typedef struct
+{
+  u8 vni_mask_len;
+  u32 vni;
+  struct _gid_address_t *gid_addr;
+} vni_t;
+
+#define vni_vni(_a) (_a)->vni
+#define vni_mask_len(_a) (_a)->vni_mask_len
+#define vni_gid(_a) (_a)->gid_addr
+
+typedef struct
+{
+  /* the union needs to be at the beginning! */
+  union
+  {
+    source_dest_t sd;
+    vni_t uni;
+  };
+  u8 type;
+} lcaf_t;
+
+#define lcaf_type(_a) (_a)->type
+#define lcaf_vni(_a) vni_vni(& (_a)->uni)
+#define lcaf_vni_len(_a) vni_mask_len(& (_a)->uni)
+
+/* might want to expand this in the future :) */
+typedef struct _gid_address_t
+{
+  union
+  {
+    ip_prefix_t ippref;
+    lcaf_t lcaf;
+    u8 mac[6];
+    source_dest_t sd;
+  };
+  u8 type;
+  u32 vni;
+  u8 vni_mask;
+} gid_address_t;
+
+u8 *format_ip_address (u8 * s, va_list * args);
+uword unformat_ip_address (unformat_input_t * input, va_list * args);
+u8 *format_ip_prefix (u8 * s, va_list * args);
+uword unformat_ip_prefix (unformat_input_t * input, va_list * args);
+u8 *format_mac_address (u8 * s, va_list * args);
+uword unformat_mac_address (unformat_input_t * input, va_list * args);
+
+u16 ip4_address_size_to_put ();
+u16 ip6_address_size_to_put ();
+u32 ip4_address_put (u8 * b, ip4_address_t * a);
+u32 ip6_address_put (u8 * b, ip6_address_t * a);
+
+u16 ip_address_size_to_write (ip_address_t * a);
+u16 ip_address_iana_afi (ip_address_t * a);
+u8 ip_address_max_len (u8 ver);
+u32 ip_address_put (u8 * b, ip_address_t * a);
+void ip_address_to_46 (const ip_address_t * addr,
+		       ip46_address_t * a, fib_protocol_t * proto);
+
+/* LISP AFI codes  */
+typedef enum
+{
+  LISP_AFI_NO_ADDR,
+  LISP_AFI_IP,
+  LISP_AFI_IP6,
+  LISP_AFI_LCAF = 16387,
+  LISP_AFI_MAC = 16389
+} lisp_afi_e;
+
+u8 *format_gid_address (u8 * s, va_list * args);
+uword unformat_gid_address (unformat_input_t * input, va_list * args);
+int gid_address_cmp (gid_address_t * a1, gid_address_t * a2);
+void gid_address_free (gid_address_t * a);
+
+u16 gid_address_size_to_put (gid_address_t * a);
+u16 gid_address_put (u8 * b, gid_address_t * gid);
+u8 gid_address_len (gid_address_t * a);
+void *gid_address_cast (gid_address_t * gid, gid_address_type_t type);
+void gid_address_copy (gid_address_t * dst, gid_address_t * src);
+u32 gid_address_parse (u8 * offset, gid_address_t * a);
+void gid_address_ip_set (gid_address_t * dst, void *src, u8 version);
+
+#define gid_address_type(_a) (_a)->type
+#define gid_address_ippref(_a) (_a)->ippref
+#define gid_address_ippref_len(_a) (_a)->ippref.len
+#define gid_address_ip(_a) ip_prefix_addr(&gid_address_ippref(_a))
+#define gid_address_ip_version(_a) ip_addr_version(&gid_address_ip(_a))
+#define gid_address_lcaf(_a) (_a)->lcaf
+#define gid_address_mac(_a) (_a)->mac
+#define gid_address_vni(_a) (_a)->vni
+#define gid_address_vni_mask(_a) (_a)->vni_mask
+#define gid_address_sd_dst_ippref(_a) sd_dst_ippref(&(_a)->sd)
+#define gid_address_sd_src_ippref(_a) sd_src_ippref(&(_a)->sd)
+#define gid_address_sd_dst_mac(_a) sd_dst_mac(&(_a)->sd)
+#define gid_address_sd_src_mac(_a) sd_src_mac(&(_a)->sd)
+#define gid_address_sd(_a) (_a)->sd
+#define gid_address_sd_src(_a) sd_src(&gid_address_sd(_a))
+#define gid_address_sd_dst(_a) sd_dst(&gid_address_sd(_a))
+#define gid_address_sd_src_type(_a) sd_src_type(&gid_address_sd(_a))
+#define gid_address_sd_dst_type(_a) sd_dst_type(&gid_address_sd(_a))
+
+/* 'sub'address functions */
+#define foreach_gid_address_type_fcns  \
+  _(ip_prefix)                    \
+  _(lcaf)                         \
+  _(mac)                          \
+  _(sd)
+
+/* *INDENT-OFF* */
+#define _(_n)                                 \
+u16    _n ## _size_to_write (void * pref);    \
+u16    _n ## _write (u8 * p, void * pref);    \
+u8     _n ## _length (void *a);               \
+void * _n ## _cast (gid_address_t * a);       \
+void   _n ## _copy (void * dst , void * src);
+
+foreach_gid_address_type_fcns
+#undef _
+/* *INDENT-ON* */
+
+always_inline u64
+mac_to_u64 (u8 * m)
+{
+  return (*((u64 *) m) & 0xffffffffffff);
+}
+
+typedef struct
+{
+  /* mark locator as local as opposed to remote */
+  u8 local;
+  u8 state;
+  union
+  {
+    u32 sw_if_index;
+    gid_address_t address;
+  };
+  u8 priority;
+  u8 weight;
+  u8 mpriority;
+  u8 mweight;
+  u8 probed;
+} locator_t;
+
+u32 locator_parse (void *ptr, locator_t * loc);
+void locator_copy (locator_t * dst, locator_t * src);
+u32 locator_cmp (locator_t * l1, locator_t * l2);
+void locator_free (locator_t * l);
+
+typedef struct
+{
+  /* locator-set name */
+  u8 *name;
+
+  /* vector of locator indices */
+  u32 *locator_indices;
+  u8 local;
+} locator_set_t;
+
+typedef struct
+{
+  gid_address_t eid;
+
+  /* index of local locator set */
+  union
+  {
+    u32 locator_set_index;
+    locator_t *locators;	/* used for map register message */
+  };
+
+  u32 ttl;
+  u8 action;
+  u8 authoritative;
+
+  u8 local;
+  /* valid only for remote mappings */
+  u8 is_static;
+  u8 *key;
+  lisp_key_type_t key_id;
+  u8 timer_set;
+} mapping_t;
+
+uword
+unformat_negative_mapping_action (unformat_input_t * input, va_list * args);
+u8 *format_negative_mapping_action (u8 *, va_list * args);
+
+typedef struct locator_pair
+{
+  /* local and remote locators (underlay attachment points) */
+  ip_address_t lcl_loc;
+  ip_address_t rmt_loc;
+
+  u8 priority;
+  u8 weight;
+} locator_pair_t;
+
+void
+build_src_dst (gid_address_t * sd, gid_address_t * src, gid_address_t * dst);
+
+void gid_address_from_ip (gid_address_t * g, ip_address_t * ip);
+
+#endif /* VNET_LISP_GPE_LISP_TYPES_H_ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-cp/packets.c b/src/vnet/lisp-cp/packets.c
new file mode 100644
index 00000000..3a4f421b
--- /dev/null
+++ b/src/vnet/lisp-cp/packets.c
@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/lisp-cp/packets.h>
+#include <vnet/lisp-cp/lisp_cp_messages.h>
+#include <vnet/ip/udp_packet.h>
+
+/* Returns IP ID for the packet */
+/* static u16 ip_id = 0;
+static inline u16
+get_IP_ID()
+{
+    ip_id++;
+    return (ip_id);
+} */
+
+u16
+udp_ip4_checksum (const void *b, u32 len, u8 * src, u8 * dst)
+{
+  const u16 *buf = b;
+  u16 *ip_src = (u16 *) src;
+  u16 *ip_dst = (u16 *) dst;
+  u32 length = len;
+  u32 sum = 0;
+
+  while (len > 1)
+    {
+      sum += *buf++;
+      if (sum & 0x80000000)
+	sum = (sum & 0xFFFF) + (sum >> 16);
+      len -= 2;
+    }
+
+  /* Add the padding if the packet length is odd */
+  if (len & 1)
+    sum += *((u8 *) buf);
+
+  /* Add the pseudo-header */
+  sum += *(ip_src++);
+  sum += *ip_src;
+
+  sum += *(ip_dst++);
+  sum += *ip_dst;
+
+  sum += clib_host_to_net_u16 (IP_PROTOCOL_UDP);
+  sum += clib_host_to_net_u16 (length);
+
+  /* Add the carries */
+  while (sum >> 16)
+    sum = (sum & 0xFFFF) + (sum >> 16);
+
+  /* Return the one's complement of sum */
+  return ((u16) (~sum));
+}
+
+u16
+udp_ip6_checksum (ip6_header_t * ip6, udp_header_t * up, u32 len)
+{
+  size_t i;
+  register const u16 *sp;
+  u32 sum;
+  union
+  {
+    struct
+    {
+      ip6_address_t ph_src;
+      ip6_address_t ph_dst;
+      u32 ph_len;
+      u8 ph_zero[3];
+      u8 ph_nxt;
+    } ph;
+    u16 pa[20];
+  } phu;
+
+  /* pseudo-header */
+  memset (&phu, 0, sizeof (phu));
+  phu.ph.ph_src = ip6->src_address;
+  phu.ph.ph_dst = ip6->dst_address;
+  phu.ph.ph_len = clib_host_to_net_u32 (len);
+  phu.ph.ph_nxt = IP_PROTOCOL_UDP;
+
+  sum = 0;
+  for (i = 0; i < sizeof (phu.pa) / sizeof (phu.pa[0]); i++)
+    sum += phu.pa[i];
+
+  sp = (const u16 *) up;
+
+  for (i = 0; i < (len & ~1); i += 2)
+    sum += *sp++;
+
+  if (len & 1)
+    sum += clib_host_to_net_u16 ((*(const u8 *) sp) << 8);
+
+  while (sum > 0xffff)
+    sum = (sum & 0xffff) + (sum >> 16);
+  sum = ~sum & 0xffff;
+
+  return (sum);
+}
+
+u16
+udp_checksum (udp_header_t * uh, u32 udp_len, void *ih, u8 version)
+{
+  switch (version)
+    {
+    case IP4:
+      return (udp_ip4_checksum (uh, udp_len,
+				((ip4_header_t *) ih)->src_address.as_u8,
+				((ip4_header_t *) ih)->dst_address.as_u8));
+    case IP6:
+      return (udp_ip6_checksum (ih, uh, udp_len));
+    default:
+      return ~0;
+    }
+}
+
+void *
+pkt_push_udp (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp)
+{
+  udp_header_t *uh;
+  u16 udp_len = sizeof (udp_header_t) + vlib_buffer_length_in_chain (vm, b);
+
+  uh = vlib_buffer_push_uninit (b, sizeof (*uh));
+
+  uh->src_port = clib_host_to_net_u16 (sp);
+  uh->dst_port = clib_host_to_net_u16 (dp);
+  uh->length = clib_host_to_net_u16 (udp_len);
+  uh->checksum = 0;
+  return uh;
+}
+
+void *
+pkt_push_ipv4 (vlib_main_t * vm, vlib_buffer_t * b, ip4_address_t * src,
+	       ip4_address_t * dst, int proto)
+{
+  ip4_header_t *ih;
+
+  /* make some room */
+  ih = vlib_buffer_push_uninit (b, sizeof (ip4_header_t));
+
+  ih->ip_version_and_header_length = 0x45;
+  ih->tos = 0;
+  ih->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b));
+
+  /* iph->fragment_id = clib_host_to_net_u16(get_IP_ID ()); */
+
+  /* TODO: decide if we allow fragments in case of control */
+  ih->flags_and_fragment_offset = clib_host_to_net_u16 (IP_DF);
+  ih->ttl = 255;
+  ih->protocol = proto;
+  ih->src_address.as_u32 = src->as_u32;
+  ih->dst_address.as_u32 = dst->as_u32;
+
+  ih->checksum = ip4_header_checksum (ih);
+  return ih;
+}
+
+void *
+pkt_push_ipv6 (vlib_main_t * vm, vlib_buffer_t * b, ip6_address_t * src,
+	       ip6_address_t * dst, int proto)
+{
+  ip6_header_t *ip6h;
+  u16 payload_length;
+
+  /* make some room */
+  ip6h = vlib_buffer_push_uninit (b, sizeof (ip6_header_t));
+
+  ip6h->ip_version_traffic_class_and_flow_label =
+    clib_host_to_net_u32 (0x6 << 28);
+
+  /* calculate ip6 payload length */
+  payload_length = vlib_buffer_length_in_chain (vm, b);
+  payload_length -= sizeof (*ip6h);
+
+  ip6h->payload_length = clib_host_to_net_u16 (payload_length);
+
+  ip6h->hop_limit = 0xff;
+  ip6h->protocol = proto;
+  clib_memcpy (ip6h->src_address.as_u8, src->as_u8,
+	       sizeof (ip6h->src_address));
+  clib_memcpy (ip6h->dst_address.as_u8, dst->as_u8,
+	       sizeof (ip6h->src_address));
+
+  return ip6h;
+}
+
+void *
+pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
+	     ip_address_t * dst, u32 proto)
+{
+  if (ip_addr_version (src) != ip_addr_version (dst))
+    {
+      clib_warning ("src %U and dst %U IP have different AFI! Discarding!",
+		    format_ip_address, src, format_ip_address, dst);
+      return 0;
+    }
+
+  switch (ip_addr_version (src))
+    {
+    case IP4:
+      return pkt_push_ipv4 (vm, b, &ip_addr_v4 (src), &ip_addr_v4 (dst),
+			    proto);
+      break;
+    case IP6:
+      return pkt_push_ipv6 (vm, b, &ip_addr_v6 (src), &ip_addr_v6 (dst),
+			    proto);
+      break;
+    }
+
+  return 0;
+}
+
+void *
+pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp,
+		     ip_address_t * sip, ip_address_t * dip)
+{
+  u16 udpsum;
+  udp_header_t *uh;
+  void *ih;
+
+  uh = pkt_push_udp (vm, b, sp, dp);
+
+  ih = pkt_push_ip (vm, b, sip, dip, IP_PROTOCOL_UDP);
+
+  udpsum = udp_checksum (uh, clib_net_to_host_u16 (uh->length), ih,
+			 ip_addr_version (sip));
+  if (udpsum == (u16) ~ 0)
+    {
+      clib_warning ("Failed UDP checksum! Discarding");
+      return 0;
+    }
+  uh->checksum = udpsum;
+  return ih;
+}
+
+void *
+pkt_push_ecm_hdr (vlib_buffer_t * b)
+{
+  ecm_hdr_t *h;
+  h = vlib_buffer_push_uninit (b, sizeof (h[0]));
+
+  memset (h, 0, sizeof (h[0]));
+  h->type = LISP_ENCAP_CONTROL_TYPE;
+  memset (h->reserved2, 0, sizeof (h->reserved2));
+
+  return h;
+}
+
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-cp/packets.h b/src/vnet/lisp-cp/packets.h
new file mode 100644
index 00000000..212a1d78
--- /dev/null
+++ b/src/vnet/lisp-cp/packets.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/lisp-cp/lisp_types.h>
+
+#define IP_DF 0x4000		/* don't fragment */
+
+void *pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
+		   ip_address_t * dst, u32 proto);
+
+void *pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp,
+			   u16 dp, ip_address_t * sip, ip_address_t * dip);
+
+void *pkt_push_ecm_hdr (vlib_buffer_t * b);
+
+always_inline u8 *
+vlib_buffer_get_tail (vlib_buffer_t * b)
+{
+  return b->data + b->current_data + b->current_length;
+}
+
+always_inline void *
+vlib_buffer_put_uninit (vlib_buffer_t * b, u8 size)
+{
+  /* XXX should make sure there's enough space! */
+  void *p = vlib_buffer_get_tail (b);
+  b->current_length += size;
+  return p;
+}
+
+always_inline void *
+vlib_buffer_push_uninit (vlib_buffer_t * b, u8 size)
+{
+  /* XXX should make sure there's enough space! */
+  ASSERT (b->current_data >= size);
+  b->current_data -= size;
+  b->current_length += size;
+
+  return vlib_buffer_get_current (b);
+}
+
+always_inline void *
+vlib_buffer_make_headroom (vlib_buffer_t * b, u8 size)
+{
+  /* XXX should make sure there's enough space! */
+  b->current_data += size;
+  return vlib_buffer_get_current (b);
+}
+
+always_inline void *
+vlib_buffer_pull (vlib_buffer_t * b, u8 size)
+{
+  if (b->current_length < size)
+    return 0;
+
+  void *data = vlib_buffer_get_current (b);
+  vlib_buffer_advance (b, size);
+  return data;
+}
+
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/decap.c b/src/vnet/lisp-gpe/decap.c
new file mode 100644
index 00000000..637d4a74
--- /dev/null
+++ b/src/vnet/lisp-gpe/decap.c
@@ -0,0 +1,501 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief L2 LISP-GPE decap code.
+ *
+ */
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/lisp-gpe/lisp_gpe.h>
+
+typedef struct
+{
+  u32 next_index;
+  u32 tunnel_index;
+  u32 error;
+  lisp_gpe_header_t h;
+} lisp_gpe_rx_trace_t;
+
+static u8 *
+format_lisp_gpe_rx_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  lisp_gpe_rx_trace_t *t = va_arg (*args, lisp_gpe_rx_trace_t *);
+
+  if (t->tunnel_index != ~0)
+    {
+      s = format (s, "LISP-GPE: tunnel %d next %d error %d", t->tunnel_index,
+		  t->next_index, t->error);
+    }
+  else
+    {
+      s = format (s, "LISP-GPE: no tunnel next %d error %d\n", t->next_index,
+		  t->error);
+    }
+  s = format (s, "\n  %U", format_lisp_gpe_header_with_length, &t->h,
+	      (u32) sizeof (t->h) /* max size */ );
+  return s;
+}
+
+static u32 next_proto_to_next_index[LISP_GPE_NEXT_PROTOS] = {
+  LISP_GPE_INPUT_NEXT_DROP,
+  LISP_GPE_INPUT_NEXT_IP4_INPUT,
+  LISP_GPE_INPUT_NEXT_IP6_INPUT,
+  LISP_GPE_INPUT_NEXT_L2_INPUT,
+  LISP_GPE_INPUT_NEXT_DROP
+};
+
+always_inline u32
+next_protocol_to_next_index (lisp_gpe_header_t * lgh, u8 * next_header)
+{
+  /* lisp-gpe router */
+  if (PREDICT_TRUE ((lgh->flags & LISP_GPE_FLAGS_P)
+		    && lgh->next_protocol < LISP_GPE_NEXT_PROTOS))
+    return next_proto_to_next_index[lgh->next_protocol];
+  /* legacy lisp router */
+  else if ((lgh->flags & LISP_GPE_FLAGS_P) == 0)
+    {
+      ip4_header_t *iph = (ip4_header_t *) next_header;
+      if ((iph->ip_version_and_header_length & 0xF0) == 0x40)
+	return LISP_GPE_INPUT_NEXT_IP4_INPUT;
+      else if ((iph->ip_version_and_header_length & 0xF0) == 0x60)
+	return LISP_GPE_INPUT_NEXT_IP6_INPUT;
+      else
+	return LISP_GPE_INPUT_NEXT_DROP;
+    }
+  else
+    return LISP_GPE_INPUT_NEXT_DROP;
+}
+
+always_inline tunnel_lookup_t *
+next_index_to_iface (lisp_gpe_main_t * lgm, u32 next_index)
+{
+  if (LISP_GPE_INPUT_NEXT_IP4_INPUT == next_index
+      || LISP_GPE_INPUT_NEXT_IP6_INPUT == next_index)
+    return &lgm->l3_ifaces;
+  else if (LISP_GPE_INPUT_NEXT_L2_INPUT == next_index)
+    return &lgm->l2_ifaces;
+  clib_warning ("next_index not associated to an interface!");
+  return 0;
+}
+
+static_always_inline void
+incr_decap_stats (vnet_main_t * vnm, u32 cpu_index, u32 length,
+		  u32 sw_if_index, u32 * last_sw_if_index, u32 * n_packets,
+		  u32 * n_bytes)
+{
+  vnet_interface_main_t *im;
+
+  if (PREDICT_TRUE (sw_if_index == *last_sw_if_index))
+    {
+      *n_packets += 1;
+      *n_bytes += length;
+    }
+  else
+    {
+      if (PREDICT_TRUE (*last_sw_if_index != ~0))
+	{
+	  im = &vnm->interface_main;
+
+	  vlib_increment_combined_counter (im->combined_sw_if_counters +
+					   VNET_INTERFACE_COUNTER_RX,
+					   cpu_index, *last_sw_if_index,
+					   *n_packets, *n_bytes);
+	}
+      *last_sw_if_index = sw_if_index;
+      *n_packets = 1;
+      *n_bytes = length;
+    }
+}
+
+/**
+ * @brief LISP-GPE decap dispatcher.
+ * @node lisp_gpe_input_inline
+ *
+ * LISP-GPE decap dispatcher.
+ *
+ * Decaps IP-UDP-LISP-GPE header and based on the next protocol and in the
+ * GPE header and the vni decides the next node to forward the packet to.
+ *
+ * @param[in]   vm      vlib_main_t corresponding to current thread.
+ * @param[in]   node    vlib_node_runtime_t data for this node.
+ * @param[in]   frame   vlib_frame_t whose contents should be dispatched.
+ *
+ * @return number of vectors in frame.
+ */
+static uword
+lisp_gpe_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
+		       vlib_frame_t * from_frame, u8 is_v4)
+{
+  u32 n_left_from, next_index, *from, *to_next, cpu_index;
+  u32 n_bytes = 0, n_packets = 0, last_sw_if_index = ~0, drops = 0;
+  lisp_gpe_main_t *lgm = vnet_lisp_gpe_get_main ();
+
+  cpu_index = os_get_cpu_number ();
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  ip4_udp_lisp_gpe_header_t *iul4_0, *iul4_1;
+	  ip6_udp_lisp_gpe_header_t *iul6_0, *iul6_1;
+	  lisp_gpe_header_t *lh0, *lh1;
+	  u32 next0, next1, error0, error1;
+	  uword *si0, *si1;
+	  tunnel_lookup_t *tl0, *tl1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
+	    CLIB_PREFETCH (p3->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /* udp leaves current_data pointing at the lisp header */
+	  if (is_v4)
+	    {
+	      vlib_buffer_advance (b0,
+				   -(word) (sizeof (udp_header_t) +
+					    sizeof (ip4_header_t)));
+	      vlib_buffer_advance (b1,
+				   -(word) (sizeof (udp_header_t) +
+					    sizeof (ip4_header_t)));
+
+	      iul4_0 = vlib_buffer_get_current (b0);
+	      iul4_1 = vlib_buffer_get_current (b1);
+
+	      /* pop (ip, udp, lisp-gpe) */
+	      vlib_buffer_advance (b0, sizeof (*iul4_0));
+	      vlib_buffer_advance (b1, sizeof (*iul4_1));
+
+	      lh0 = &iul4_0->lisp;
+	      lh1 = &iul4_1->lisp;
+	    }
+	  else
+	    {
+	      vlib_buffer_advance (b0,
+				   -(word) (sizeof (udp_header_t) +
+					    sizeof (ip6_header_t)));
+	      vlib_buffer_advance (b1,
+				   -(word) (sizeof (udp_header_t) +
+					    sizeof (ip6_header_t)));
+
+	      iul6_0 = vlib_buffer_get_current (b0);
+	      iul6_1 = vlib_buffer_get_current (b1);
+
+	      /* pop (ip, udp, lisp-gpe) */
+	      vlib_buffer_advance (b0, sizeof (*iul6_0));
+	      vlib_buffer_advance (b1, sizeof (*iul6_1));
+
+	      lh0 = &iul6_0->lisp;
+	      lh1 = &iul6_1->lisp;
+	    }
+
+	  /* determine next_index from lisp-gpe header */
+	  next0 = next_protocol_to_next_index (lh0,
+					       vlib_buffer_get_current (b0));
+	  next1 = next_protocol_to_next_index (lh1,
+					       vlib_buffer_get_current (b1));
+
+	  /* determine if tunnel is l2 or l3 */
+	  tl0 = next_index_to_iface (lgm, next0);
+	  tl1 = next_index_to_iface (lgm, next1);
+
+	  /* map iid/vni to lisp-gpe sw_if_index which is used by ipx_input to
+	   * decide the rx vrf and the input features to be applied */
+	  si0 = hash_get (tl0->sw_if_index_by_vni,
+			  clib_net_to_host_u32 (lh0->iid));
+	  si1 = hash_get (tl1->sw_if_index_by_vni,
+			  clib_net_to_host_u32 (lh1->iid));
+
+
+	  /* Required to make the l2 tag push / pop code work on l2 subifs */
+	  vnet_update_l2_len (b0);
+	  vnet_update_l2_len (b1);
+
+	  if (si0)
+	    {
+	      incr_decap_stats (lgm->vnet_main, cpu_index,
+				vlib_buffer_length_in_chain (vm, b0), si0[0],
+				&last_sw_if_index, &n_packets, &n_bytes);
+	      vnet_buffer (b0)->sw_if_index[VLIB_RX] = si0[0];
+	      error0 = 0;
+	    }
+	  else
+	    {
+	      next0 = LISP_GPE_INPUT_NEXT_DROP;
+	      error0 = LISP_GPE_ERROR_NO_TUNNEL;
+	      drops++;
+	    }
+
+	  if (si1)
+	    {
+	      incr_decap_stats (lgm->vnet_main, cpu_index,
+				vlib_buffer_length_in_chain (vm, b1), si1[0],
+				&last_sw_if_index, &n_packets, &n_bytes);
+	      vnet_buffer (b1)->sw_if_index[VLIB_RX] = si1[0];
+	      error1 = 0;
+	    }
+	  else
+	    {
+	      next1 = LISP_GPE_INPUT_NEXT_DROP;
+	      error1 = LISP_GPE_ERROR_NO_TUNNEL;
+	      drops++;
+	    }
+
+	  b0->error = error0 ? node->errors[error0] : 0;
+	  b1->error = error1 ? node->errors[error1] : 0;
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      lisp_gpe_rx_trace_t *tr = vlib_add_trace (vm, node, b0,
+							sizeof (*tr));
+	      tr->next_index = next0;
+	      tr->error = error0;
+	      tr->h = lh0[0];
+	    }
+
+	  if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      lisp_gpe_rx_trace_t *tr = vlib_add_trace (vm, node, b1,
+							sizeof (*tr));
+	      tr->next_index = next1;
+	      tr->error = error1;
+	      tr->h = lh1[0];
+	    }
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, bi1, next0,
+					   next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  ip4_udp_lisp_gpe_header_t *iul4_0;
+	  ip6_udp_lisp_gpe_header_t *iul6_0;
+	  lisp_gpe_header_t *lh0;
+	  u32 error0;
+	  uword *si0;
+	  tunnel_lookup_t *tl0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  /* udp leaves current_data pointing at the lisp header
+	   * TODO: there's no difference in processing between v4 and v6
+	   * encapsulated packets so the code should be simplified if ip header
+	   * info is not going to be used for dp smrs/dpsec */
+	  if (is_v4)
+	    {
+	      vlib_buffer_advance (b0,
+				   -(word) (sizeof (udp_header_t) +
+					    sizeof (ip4_header_t)));
+
+	      iul4_0 = vlib_buffer_get_current (b0);
+
+	      /* pop (ip, udp, lisp-gpe) */
+	      vlib_buffer_advance (b0, sizeof (*iul4_0));
+
+	      lh0 = &iul4_0->lisp;
+	    }
+	  else
+	    {
+	      vlib_buffer_advance (b0,
+				   -(word) (sizeof (udp_header_t) +
+					    sizeof (ip6_header_t)));
+
+	      iul6_0 = vlib_buffer_get_current (b0);
+
+	      /* pop (ip, udp, lisp-gpe) */
+	      vlib_buffer_advance (b0, sizeof (*iul6_0));
+
+	      lh0 = &iul6_0->lisp;
+	    }
+
+	  /* TODO if security is to be implemented, something similar to RPF,
+	   * probably we'd like to check that the peer is allowed to send us
+	   * packets. For this, we should use the tunnel table OR check that
+	   * we have a mapping for the source eid and that the outer source of
+	   * the packet is one of its locators */
+
+	  /* determine next_index from lisp-gpe header */
+	  next0 = next_protocol_to_next_index (lh0,
+					       vlib_buffer_get_current (b0));
+
+	  /* determine if tunnel is l2 or l3 */
+	  tl0 = next_index_to_iface (lgm, next0);
+
+	  /* map iid/vni to lisp-gpe sw_if_index which is used by ipx_input to
+	   * decide the rx vrf and the input features to be applied.
+	   * NOTE: vni uses only the first 24 bits */
+	  si0 = hash_get (tl0->sw_if_index_by_vni,
+			  clib_net_to_host_u32 (lh0->iid << 8));
+
+	  /* Required to make the l2 tag push / pop code work on l2 subifs */
+	  vnet_update_l2_len (b0);
+
+	  if (si0)
+	    {
+	      incr_decap_stats (lgm->vnet_main, cpu_index,
+				vlib_buffer_length_in_chain (vm, b0), si0[0],
+				&last_sw_if_index, &n_packets, &n_bytes);
+	      vnet_buffer (b0)->sw_if_index[VLIB_RX] = si0[0];
+	      error0 = 0;
+	    }
+	  else
+	    {
+	      next0 = LISP_GPE_INPUT_NEXT_DROP;
+	      error0 = LISP_GPE_ERROR_NO_TUNNEL;
+	      drops++;
+	    }
+
+	  /* TODO error handling if security is implemented */
+	  b0->error = error0 ? node->errors[error0] : 0;
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      lisp_gpe_rx_trace_t *tr = vlib_add_trace (vm, node, b0,
+							sizeof (*tr));
+	      tr->next_index = next0;
+	      tr->error = error0;
+	      tr->h = lh0[0];
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  /* flush iface stats */
+  incr_decap_stats (lgm->vnet_main, cpu_index, 0, ~0, &last_sw_if_index,
+		    &n_packets, &n_bytes);
+  vlib_node_increment_counter (vm, lisp_gpe_ip4_input_node.index,
+			       LISP_GPE_ERROR_NO_TUNNEL, drops);
+  return from_frame->n_vectors;
+}
+
+static uword
+lisp_gpe_ip4_input (vlib_main_t * vm, vlib_node_runtime_t * node,
+		    vlib_frame_t * from_frame)
+{
+  return lisp_gpe_input_inline (vm, node, from_frame, 1);
+}
+
+static uword
+lisp_gpe_ip6_input (vlib_main_t * vm, vlib_node_runtime_t * node,
+		    vlib_frame_t * from_frame)
+{
+  return lisp_gpe_input_inline (vm, node, from_frame, 0);
+}
+
+static char *lisp_gpe_ip4_input_error_strings[] = {
+#define lisp_gpe_error(n,s) s,
+#include <vnet/lisp-gpe/lisp_gpe_error.def>
+#undef lisp_gpe_error
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (lisp_gpe_ip4_input_node) = {
+  .function = lisp_gpe_ip4_input,
+  .name = "lisp-gpe-ip4-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+  .n_next_nodes = LISP_GPE_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [LISP_GPE_INPUT_NEXT_##s] = n,
+    foreach_lisp_gpe_ip_input_next
+#undef _
+  },
+
+  .n_errors = ARRAY_LEN (lisp_gpe_ip4_input_error_strings),
+  .error_strings = lisp_gpe_ip4_input_error_strings,
+
+  .format_buffer = format_lisp_gpe_header_with_length,
+  .format_trace = format_lisp_gpe_rx_trace,
+  // $$$$ .unformat_buffer = unformat_lisp_gpe_header,
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (lisp_gpe_ip6_input_node) = {
+  .function = lisp_gpe_ip6_input,
+  .name = "lisp-gpe-ip6-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+  .n_next_nodes = LISP_GPE_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [LISP_GPE_INPUT_NEXT_##s] = n,
+    foreach_lisp_gpe_ip_input_next
+#undef _
+  },
+
+  .n_errors = ARRAY_LEN (lisp_gpe_ip4_input_error_strings),
+  .error_strings = lisp_gpe_ip4_input_error_strings,
+
+  .format_buffer = format_lisp_gpe_header_with_length,
+  .format_trace = format_lisp_gpe_rx_trace,
+  // $$$$ .unformat_buffer = unformat_lisp_gpe_header,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/dir.dox b/src/vnet/lisp-gpe/dir.dox
new file mode 100644
index 00000000..afa6da9a
--- /dev/null
+++ b/src/vnet/lisp-gpe/dir.dox
@@ -0,0 +1,26 @@
+/*
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ @dir
+ @brief LISP-GPE code.
+
+ An implementation of LISP-GPE as per:
+ rfc-6830
+ draft-lewis-lisp-gpe-02
+
+ See file: rfc.txt
+
+*/
\ No newline at end of file
diff --git a/src/vnet/lisp-gpe/interface.c b/src/vnet/lisp-gpe/interface.c
new file mode 100644
index 00000000..3288b241
--- /dev/null
+++ b/src/vnet/lisp-gpe/interface.c
@@ -0,0 +1,709 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file
+ * @brief Common utility functions for LISP-GPE interfaces.
+ *
+ */
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ip/udp.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/lisp-gpe/lisp_gpe.h>
+#include <vnet/lisp-gpe/lisp_gpe_fwd_entry.h>
+#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
+#include <vnet/lisp-gpe/lisp_gpe_adjacency.h>
+#include <vnet/adj/adj.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/lisp-cp/lisp_cp_dpo.h>
+
+/**
+ * @brief The VLIB node arc/edge from the interface's TX node, to the L2
+ * load-balanceing node. Which is where all packets go
+ */
+static uword l2_arc_to_lb;
+
+#define foreach_lisp_gpe_tx_next        \
+  _(DROP, "error-drop")                 \
+  _(IP4_LOOKUP, "ip4-lookup")           \
+  _(IP6_LOOKUP, "ip6-lookup")
+
+typedef enum
+{
+#define _(sym,str) LISP_GPE_TX_NEXT_##sym,
+  foreach_lisp_gpe_tx_next
+#undef _
+    LISP_GPE_TX_N_NEXT,
+} lisp_gpe_tx_next_t;
+
+typedef struct
+{
+  u32 tunnel_index;
+} lisp_gpe_tx_trace_t;
+
+u8 *
+format_lisp_gpe_tx_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  lisp_gpe_tx_trace_t *t = va_arg (*args, lisp_gpe_tx_trace_t *);
+
+  s = format (s, "LISP-GPE-TX: tunnel %d", t->tunnel_index);
+  return s;
+}
+
+#define is_v4_packet(_h) ((*(u8*) _h) & 0xF0) == 0x40
+
+/**
+ * @brief LISP-GPE interface TX (encap) function.
+ * @node lisp_gpe_interface_tx
+ *
+ * The LISP-GPE interface TX (encap) function.
+ *
+ * Looks up the associated tunnel based on the adjacency hit in the SD FIB
+ * and if the tunnel is multihomed it uses the flow hash to determine
+ * sub-tunnel, and rewrite string, to be used to encapsulate the packet.
+ *
+ * @param[in]   vm      vlib_main_t corresponding to the current thread.
+ * @param[in]   node    vlib_node_runtime_t data for this node.
+ * @param[in]   frame   vlib_frame_t whose contents should be dispatched.
+ *
+ * @return number of vectors in frame.
+ */
+static uword
+lisp_gpe_interface_tx (vlib_main_t * vm, vlib_node_runtime_t * node,
+		       vlib_frame_t * from_frame)
+{
+  u32 n_left_from, next_index, *from, *to_next;
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, adj_index0, next0;
+	  const ip_adjacency_t *adj0;
+	  const dpo_id_t *dpo0;
+	  vlib_buffer_t *b0;
+	  u8 is_v4_0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  /* Fixup the checksum and len fields in the LISP tunnel encap
+	   * that was applied at the midchain node */
+	  is_v4_0 = is_v4_packet (vlib_buffer_get_current (b0));
+	  ip_udp_fixup_one (lgm->vlib_main, b0, is_v4_0);
+
+	  /* Follow the DPO on which the midchain is stacked */
+	  adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
+	  adj0 = adj_get (adj_index0);
+	  dpo0 = &adj0->sub_type.midchain.next_dpo;
+	  next0 = dpo0->dpoi_next_node;
+	  vnet_buffer (b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      lisp_gpe_tx_trace_t *tr = vlib_add_trace (vm, node, b0,
+							sizeof (*tr));
+	      tr->tunnel_index = adj_index0;
+	    }
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+static u8 *
+format_lisp_gpe_name (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  return format (s, "lisp_gpe%d", dev_instance);
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (lisp_gpe_device_class) = {
+  .name = "LISP_GPE",
+  .format_device_name = format_lisp_gpe_name,
+  .format_tx_trace = format_lisp_gpe_tx_trace,
+  .tx_function = lisp_gpe_interface_tx,
+};
+/* *INDENT-ON* */
+
+u8 *
+format_lisp_gpe_header_with_length (u8 * s, va_list * args)
+{
+  lisp_gpe_header_t *h = va_arg (*args, lisp_gpe_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+  u32 header_bytes;
+
+  header_bytes = sizeof (h[0]);
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    return format (s, "lisp-gpe header truncated");
+
+  s = format (s, "flags: ");
+#define _(n,v) if (h->flags & v) s = format (s, "%s ", #n);
+  foreach_lisp_gpe_flag_bit;
+#undef _
+
+  s = format (s, "\n  ver_res %d res %d next_protocol %d iid %d(%x)",
+	      h->ver_res, h->res, h->next_protocol,
+	      clib_net_to_host_u32 (h->iid), clib_net_to_host_u32 (h->iid));
+  return s;
+}
+
+/* *INDENT-OFF* */
+VNET_HW_INTERFACE_CLASS (lisp_gpe_hw_class) = {
+  .name = "LISP_GPE",
+  .format_header = format_lisp_gpe_header_with_length,
+  .build_rewrite = lisp_gpe_build_rewrite,
+  .update_adjacency = lisp_gpe_update_adjacency,
+};
+/* *INDENT-ON* */
+
+
+typedef struct
+{
+  u32 lb_index;
+} l2_lisp_gpe_tx_trace_t;
+
+static u8 *
+format_l2_lisp_gpe_tx_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2_lisp_gpe_tx_trace_t *t = va_arg (*args, l2_lisp_gpe_tx_trace_t *);
+
+  s = format (s, "L2-LISP-GPE-TX: load-balance %d", t->lb_index);
+  return s;
+}
+
+/**
+ * @brief LISP-GPE interface TX (encap) function for L2 overlays.
+ * @node l2_lisp_gpe_interface_tx
+ *
+ * The L2 LISP-GPE interface TX (encap) function.
+ *
+ * Uses bridge domain index, source and destination ethernet addresses to
+ * lookup tunnel. If the tunnel is multihomed a flow has is used to determine
+ * the sub-tunnel and therefore the rewrite string to be used to encapsulate
+ * the packets.
+ *
+ * @param[in]   vm        vlib_main_t corresponding to the current thread.
+ * @param[in]   node      vlib_node_runtime_t data for this node.
+ * @param[in]   frame     vlib_frame_t whose contents should be dispatched.
+ *
+ * @return number of vectors in frame.
+ */
+static uword
+l2_lisp_gpe_interface_tx (vlib_main_t * vm, vlib_node_runtime_t * node,
+			  vlib_frame_t * from_frame)
+{
+  u32 n_left_from, next_index, *from, *to_next;
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *b0;
+	  u32 bi0, lbi0;
+	  ethernet_header_t *e0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  e0 = vlib_buffer_get_current (b0);
+
+	  vnet_buffer (b0)->lisp.overlay_afi = LISP_AFI_MAC;
+
+	  /* lookup dst + src mac */
+	  lbi0 = lisp_l2_fib_lookup (lgm, vnet_buffer (b0)->l2.bd_index,
+				     e0->src_address, e0->dst_address);
+	  vnet_buffer (b0)->ip.adj_index[VLIB_TX] = lbi0;
+
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      l2_lisp_gpe_tx_trace_t *tr = vlib_add_trace (vm, node, b0,
+							   sizeof (*tr));
+	      tr->lb_index = lbi0;
+	    }
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, l2_arc_to_lb);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+static u8 *
+format_l2_lisp_gpe_name (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  return format (s, "l2_lisp_gpe%d", dev_instance);
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (l2_lisp_gpe_device_class,static) = {
+  .name = "L2_LISP_GPE",
+  .format_device_name = format_l2_lisp_gpe_name,
+  .format_tx_trace = format_l2_lisp_gpe_tx_trace,
+  .tx_function = l2_lisp_gpe_interface_tx,
+};
+/* *INDENT-ON* */
+
+static vnet_hw_interface_t *
+lisp_gpe_create_iface (lisp_gpe_main_t * lgm, u32 vni, u32 dp_table,
+		       vnet_device_class_t * dev_class,
+		       tunnel_lookup_t * tuns)
+{
+  u32 flen;
+  u32 hw_if_index = ~0;
+  u8 *new_name;
+  vnet_hw_interface_t *hi;
+  vnet_main_t *vnm = lgm->vnet_main;
+
+  /* create hw lisp_gpeX iface if needed, otherwise reuse existing */
+  flen = vec_len (lgm->free_tunnel_hw_if_indices);
+  if (flen > 0)
+    {
+      hw_if_index = lgm->free_tunnel_hw_if_indices[flen - 1];
+      _vec_len (lgm->free_tunnel_hw_if_indices) -= 1;
+
+      hi = vnet_get_hw_interface (vnm, hw_if_index);
+
+      /* rename interface */
+      new_name = format (0, "%U", dev_class->format_device_name, vni);
+
+      vec_add1 (new_name, 0);
+      vnet_rename_interface (vnm, hw_if_index, (char *) new_name);
+      vec_free (new_name);
+
+      /* clear old stats of freed interface before reuse */
+      vnet_interface_main_t *im = &vnm->interface_main;
+      vnet_interface_counter_lock (im);
+      vlib_zero_combined_counter (&im->combined_sw_if_counters
+				  [VNET_INTERFACE_COUNTER_TX],
+				  hi->sw_if_index);
+      vlib_zero_combined_counter (&im->combined_sw_if_counters
+				  [VNET_INTERFACE_COUNTER_RX],
+				  hi->sw_if_index);
+      vlib_zero_simple_counter (&im->sw_if_counters
+				[VNET_INTERFACE_COUNTER_DROP],
+				hi->sw_if_index);
+      vnet_interface_counter_unlock (im);
+    }
+  else
+    {
+      hw_if_index = vnet_register_interface (vnm, dev_class->index, vni,
+					     lisp_gpe_hw_class.index, 0);
+      hi = vnet_get_hw_interface (vnm, hw_if_index);
+    }
+
+  hash_set (tuns->hw_if_index_by_dp_table, dp_table, hw_if_index);
+
+  /* set tunnel termination: post decap, packets are tagged as having been
+   * originated by lisp-gpe interface */
+  hash_set (tuns->sw_if_index_by_vni, vni, hi->sw_if_index);
+  hash_set (tuns->vni_by_sw_if_index, hi->sw_if_index, vni);
+
+  return hi;
+}
+
+static void
+lisp_gpe_remove_iface (lisp_gpe_main_t * lgm, u32 hi_index, u32 dp_table,
+		       tunnel_lookup_t * tuns)
+{
+  vnet_main_t *vnm = lgm->vnet_main;
+  vnet_hw_interface_t *hi;
+  uword *vnip;
+
+  hi = vnet_get_hw_interface (vnm, hi_index);
+
+  /* disable interface */
+  vnet_sw_interface_set_flags (vnm, hi->sw_if_index, 0 /* down */ );
+  vnet_hw_interface_set_flags (vnm, hi->hw_if_index, 0 /* down */ );
+  hash_unset (tuns->hw_if_index_by_dp_table, dp_table);
+  vec_add1 (lgm->free_tunnel_hw_if_indices, hi->hw_if_index);
+
+  /* clean tunnel termination and vni to sw_if_index binding */
+  vnip = hash_get (tuns->vni_by_sw_if_index, hi->sw_if_index);
+  if (0 == vnip)
+    {
+      clib_warning ("No vni associated to interface %d", hi->sw_if_index);
+      return;
+    }
+  hash_unset (tuns->sw_if_index_by_vni, vnip[0]);
+  hash_unset (tuns->vni_by_sw_if_index, hi->sw_if_index);
+}
+
+static void
+lisp_gpe_iface_set_table (u32 sw_if_index, u32 table_id)
+{
+  fib_node_index_t fib_index;
+
+  fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, table_id);
+  vec_validate (ip4_main.fib_index_by_sw_if_index, sw_if_index);
+  ip4_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
+  ip4_sw_interface_enable_disable (sw_if_index, 1);
+
+  fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, table_id);
+  vec_validate (ip6_main.fib_index_by_sw_if_index, sw_if_index);
+  ip6_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
+  ip6_sw_interface_enable_disable (sw_if_index, 1);
+}
+
+static void
+lisp_gpe_tenant_del_default_routes (u32 table_id)
+{
+  fib_protocol_t proto;
+
+  FOR_EACH_FIB_IP_PROTOCOL (proto)
+  {
+    fib_prefix_t prefix = {
+      .fp_proto = proto,
+    };
+    u32 fib_index;
+
+    fib_index = fib_table_find (prefix.fp_proto, table_id);
+    fib_table_entry_special_remove (fib_index, &prefix, FIB_SOURCE_LISP);
+    fib_table_unlock (fib_index, prefix.fp_proto);
+  }
+}
+
+static void
+lisp_gpe_tenant_add_default_routes (u32 table_id)
+{
+  fib_protocol_t proto;
+
+  FOR_EACH_FIB_IP_PROTOCOL (proto)
+  {
+    fib_prefix_t prefix = {
+      .fp_proto = proto,
+    };
+    u32 fib_index;
+
+    /*
+     * Add a deafult route that results in a control plane punt DPO
+     */
+    fib_index = fib_table_find_or_create_and_lock (prefix.fp_proto, table_id);
+    fib_table_entry_special_dpo_add (fib_index, &prefix, FIB_SOURCE_LISP,
+				     FIB_ENTRY_FLAG_EXCLUSIVE,
+				     lisp_cp_dpo_get (fib_proto_to_dpo
+						      (proto)));
+  }
+}
+
+
+/**
+ * @brief Add/del LISP-GPE L3 interface.
+ *
+ * Creates LISP-GPE interface, sets ingress arcs from lisp_gpeX_lookup,
+ * installs default routes that attract all traffic with no more specific
+ * routes to lgpe-ipx-lookup, set egress arcs to ipx-lookup, sets
+ * the interface in the right vrf and enables it.
+ *
+ * @param[in]   lgm     Reference to @ref lisp_gpe_main_t.
+ * @param[in]   a       Parameters to create interface.
+ *
+ * @return number of vectors in frame.
+ */
+u32
+lisp_gpe_add_l3_iface (lisp_gpe_main_t * lgm, u32 vni, u32 table_id)
+{
+  vnet_main_t *vnm = lgm->vnet_main;
+  tunnel_lookup_t *l3_ifaces = &lgm->l3_ifaces;
+  vnet_hw_interface_t *hi;
+  uword *hip, *si;
+
+  hip = hash_get (l3_ifaces->hw_if_index_by_dp_table, table_id);
+
+  if (hip)
+    {
+      clib_warning ("vrf %d already mapped to a vni", table_id);
+      return ~0;
+    }
+
+  si = hash_get (l3_ifaces->sw_if_index_by_vni, vni);
+
+  if (si)
+    {
+      clib_warning ("Interface for vni %d already exists", vni);
+    }
+
+  /* create lisp iface and populate tunnel tables */
+  hi = lisp_gpe_create_iface (lgm, vni, table_id,
+			      &lisp_gpe_device_class, l3_ifaces);
+
+  /* insert default routes that point to lisp-cp lookup */
+  lisp_gpe_iface_set_table (hi->sw_if_index, table_id);
+  lisp_gpe_tenant_add_default_routes (table_id);
+
+  /* enable interface */
+  vnet_sw_interface_set_flags (vnm, hi->sw_if_index,
+			       VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+  vnet_hw_interface_set_flags (vnm, hi->hw_if_index,
+			       VNET_HW_INTERFACE_FLAG_LINK_UP);
+
+  return (hi->sw_if_index);
+}
+
+void
+lisp_gpe_del_l3_iface (lisp_gpe_main_t * lgm, u32 vni, u32 table_id)
+{
+  vnet_main_t *vnm = lgm->vnet_main;
+  tunnel_lookup_t *l3_ifaces = &lgm->l3_ifaces;
+  vnet_hw_interface_t *hi;
+  uword *hip;
+
+  hip = hash_get (l3_ifaces->hw_if_index_by_dp_table, table_id);
+
+  if (hip == 0)
+    {
+      clib_warning ("The interface for vrf %d doesn't exist", table_id);
+      return;
+    }
+
+  hi = vnet_get_hw_interface (vnm, hip[0]);
+
+  lisp_gpe_remove_iface (lgm, hip[0], table_id, &lgm->l3_ifaces);
+
+  /* unset default routes */
+  ip4_sw_interface_enable_disable (hi->sw_if_index, 0);
+  ip6_sw_interface_enable_disable (hi->sw_if_index, 0);
+  lisp_gpe_tenant_del_default_routes (table_id);
+}
+
+/**
+ * @brief Add/del LISP-GPE L2 interface.
+ *
+ * Creates LISP-GPE interface, sets it in L2 mode in the appropriate
+ * bridge domain, sets egress arcs and enables it.
+ *
+ * @param[in]   lgm     Reference to @ref lisp_gpe_main_t.
+ * @param[in]   a       Parameters to create interface.
+ *
+ * @return number of vectors in frame.
+ */
+u32
+lisp_gpe_add_l2_iface (lisp_gpe_main_t * lgm, u32 vni, u32 bd_id)
+{
+  vnet_main_t *vnm = lgm->vnet_main;
+  tunnel_lookup_t *l2_ifaces = &lgm->l2_ifaces;
+  vnet_hw_interface_t *hi;
+  uword *hip, *si;
+  u16 bd_index;
+
+  bd_index = bd_find_or_add_bd_index (&bd_main, bd_id);
+  hip = hash_get (l2_ifaces->hw_if_index_by_dp_table, bd_index);
+
+  if (hip)
+    {
+      clib_warning ("bridge domain %d already mapped to a vni", bd_id);
+      return ~0;
+    }
+
+  si = hash_get (l2_ifaces->sw_if_index_by_vni, vni);
+  if (si)
+    {
+      clib_warning ("Interface for vni %d already exists", vni);
+      return ~0;
+    }
+
+  /* create lisp iface and populate tunnel tables */
+  hi = lisp_gpe_create_iface (lgm, vni, bd_index,
+			      &l2_lisp_gpe_device_class, &lgm->l2_ifaces);
+
+  /* enable interface */
+  vnet_sw_interface_set_flags (vnm, hi->sw_if_index,
+			       VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+  vnet_hw_interface_set_flags (vnm, hi->hw_if_index,
+			       VNET_HW_INTERFACE_FLAG_LINK_UP);
+
+  l2_arc_to_lb = vlib_node_add_named_next (vlib_get_main (),
+					   hi->tx_node_index,
+					   "l2-load-balance");
+
+  /* we're ready. add iface to l2 bridge domain */
+  set_int_l2_mode (lgm->vlib_main, vnm, MODE_L2_BRIDGE, hi->sw_if_index,
+		   bd_index, 0, 0, 0);
+
+  return (hi->sw_if_index);
+}
+
+/**
+ * @brief Add/del LISP-GPE L2 interface.
+ *
+ * Creates LISP-GPE interface, sets it in L2 mode in the appropriate
+ * bridge domain, sets egress arcs and enables it.
+ *
+ * @param[in]   lgm     Reference to @ref lisp_gpe_main_t.
+ * @param[in]   a       Parameters to create interface.
+ *
+ * @return number of vectors in frame.
+ */
+void
+lisp_gpe_del_l2_iface (lisp_gpe_main_t * lgm, u32 vni, u32 bd_id)
+{
+  tunnel_lookup_t *l2_ifaces = &lgm->l2_ifaces;
+  u16 bd_index;
+  uword *hip;
+
+  bd_index = bd_find_or_add_bd_index (&bd_main, bd_id);
+  hip = hash_get (l2_ifaces->hw_if_index_by_dp_table, bd_index);
+
+  if (hip == 0)
+    {
+      clib_warning ("The interface for bridge domain %d doesn't exist",
+		    bd_id);
+      return;
+    }
+  lisp_gpe_remove_iface (lgm, hip[0], bd_index, &lgm->l2_ifaces);
+}
+
+static clib_error_t *
+lisp_gpe_add_del_iface_command_fn (vlib_main_t * vm, unformat_input_t * input,
+				   vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1;
+  u32 table_id, vni, bd_id;
+  u8 vni_is_set = 0, vrf_is_set = 0, bd_index_is_set = 0;
+
+  if (vnet_lisp_gpe_enable_disable_status () == 0)
+    {
+      return clib_error_return (0, "LISP is disabled");
+    }
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "add"))
+	is_add = 1;
+      else if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "vrf %d", &table_id))
+	{
+	  vrf_is_set = 1;
+	}
+      else if (unformat (line_input, "vni %d", &vni))
+	{
+	  vni_is_set = 1;
+	}
+      else if (unformat (line_input, "bd %d", &bd_id))
+	{
+	  bd_index_is_set = 1;
+	}
+      else
+	{
+	  return clib_error_return (0, "parse error: '%U'",
+				    format_unformat_error, line_input);
+	}
+    }
+
+  if (vrf_is_set && bd_index_is_set)
+    return clib_error_return (0,
+			      "Cannot set both vrf and brdige domain index!");
+
+  if (!vni_is_set)
+    return clib_error_return (0, "vni must be set!");
+
+  if (!vrf_is_set && !bd_index_is_set)
+    return clib_error_return (0, "vrf or bridge domain index must be set!");
+
+  if (bd_index_is_set)
+    {
+      if (is_add)
+	{
+	  if (~0 == lisp_gpe_tenant_l2_iface_add_or_lock (vni, bd_id))
+	    return clib_error_return (0, "L2 interface not created");
+	}
+      else
+	lisp_gpe_tenant_l2_iface_unlock (vni);
+    }
+  else
+    {
+      if (is_add)
+	{
+	  if (~0 == lisp_gpe_tenant_l3_iface_add_or_lock (vni, table_id))
+	    return clib_error_return (0, "L3 interface not created");
+	}
+      else
+	lisp_gpe_tenant_l3_iface_unlock (vni);
+    }
+
+  return (NULL);
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (add_del_lisp_gpe_iface_command, static) = {
+  .path = "lisp gpe iface",
+  .short_help = "lisp gpe iface add/del vni <vni> vrf <vrf>",
+  .function = lisp_gpe_add_del_iface_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/lisp_gpe.api b/src/vnet/lisp-gpe/lisp_gpe.api
new file mode 100644
index 00000000..3956b97d
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe.api
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \brief add or delete lisp gpe tunnel
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add address if non-zero, else delete
+    @param eid_type -
+      0 : ipv4
+      1 : ipv6
+      2 : mac
+    @param rmt_eid - remote eid
+    @param lcl_eid - local eid
+    @param rmt_len - remote prefix len
+    @param lcl_len - local prefix len
+    @param vni - virtual network identifier
+    @param dp_table - vrf/bridge domain id
+    @param loc_num - number of locators
+    @param lcl_locs - array of local locators
+    @param rmt_locs - array of remote locators
+    @param action - negative action when 0 locators configured
+*/
+define lisp_gpe_add_del_fwd_entry
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 eid_type;
+  u8 rmt_eid[16];
+  u8 lcl_eid[16];
+  u8 rmt_len;
+  u8 lcl_len;
+  u32 vni;
+  u32 dp_table;
+  u32 loc_num;
+  u8 lcl_locs[loc_num];
+  u8 rmt_locs[loc_num];
+  u8 action;
+};
+
+/** \brief Reply for gpe_fwd_entry add/del
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_gpe_add_del_fwd_entry_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief enable or disable lisp-gpe protocol
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_en - enable protocol if non-zero, else disable
+*/
+define lisp_gpe_enable_disable
+{
+  u32 client_index;
+  u32 context;
+  u8 is_en;
+};
+
+/** \brief Reply for gpe enable/disable
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_gpe_enable_disable_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief add or delete gpe_iface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add address if non-zero, else delete
+*/
+define lisp_gpe_add_del_iface
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 is_l2;
+  u32 dp_table;
+  u32 vni;
+};
+
+/** \brief Reply for gpe_iface add/del
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define lisp_gpe_add_del_iface_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+define lisp_gpe_tunnel_details
+{
+  u32 context;
+  u32 tunnels;
+  u8 is_ipv6;
+  u8 source_ip[16];
+  u8 destination_ip[16];
+  u32 encap_fib_id;
+  u32 decap_fib_id;
+  u32 dcap_next;
+  u8 lisp_ver;
+  u8 next_protocol;
+  u8 flags;
+  u8 ver_res;
+  u8 res;
+  u32 iid;
+};
+
+/** \brief Request for gpe tunnel summary status
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+ */
+define lisp_gpe_tunnel_dump
+{
+  u32 client_index;
+  u32 context;
+};
+
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
+ 
\ No newline at end of file
diff --git a/src/vnet/lisp-gpe/lisp_gpe.c b/src/vnet/lisp-gpe/lisp_gpe.c
new file mode 100644
index 00000000..fbda8687
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe.c
@@ -0,0 +1,327 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief Common utility functions for IPv4, IPv6 and L2 LISP-GPE tunnels.
+ *
+ */
+
+#include <vnet/lisp-gpe/lisp_gpe.h>
+#include <vnet/lisp-gpe/lisp_gpe_fwd_entry.h>
+#include <vnet/lisp-gpe/lisp_gpe_adjacency.h>
+#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
+
+/** LISP-GPE global state */
+lisp_gpe_main_t lisp_gpe_main;
+
+
+/** CLI command to add/del forwarding entry. */
+static clib_error_t *
+lisp_gpe_add_del_fwd_entry_command_fn (vlib_main_t * vm,
+				       unformat_input_t * input,
+				       vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1;
+  ip_address_t lloc, rloc;
+  clib_error_t *error = 0;
+  gid_address_t _reid, *reid = &_reid, _leid, *leid = &_leid;
+  u8 reid_set = 0, leid_set = 0, is_negative = 0, vrf_set = 0, vni_set = 0;
+  u32 vni, vrf, action = ~0, p, w;
+  locator_pair_t pair, *pairs = 0;
+  int rv;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "add"))
+	is_add = 1;
+      else if (unformat (line_input, "leid %U", unformat_gid_address, leid))
+	{
+	  leid_set = 1;
+	}
+      else if (unformat (line_input, "reid %U", unformat_gid_address, reid))
+	{
+	  reid_set = 1;
+	}
+      else if (unformat (line_input, "vni %u", &vni))
+	{
+	  gid_address_vni (leid) = vni;
+	  gid_address_vni (reid) = vni;
+	  vni_set = 1;
+	}
+      else if (unformat (line_input, "vrf %u", &vrf))
+	{
+	  vrf_set = 1;
+	}
+      else if (unformat (line_input, "bd %u", &vrf))
+	{
+	  vrf_set = 1;
+	}
+      else if (unformat (line_input, "negative action %U",
+			 unformat_negative_mapping_action, &action))
+	{
+	  is_negative = 1;
+	}
+      else if (unformat (line_input, "loc-pair %U %U p %d w %d",
+			 unformat_ip_address, &lloc,
+			 unformat_ip_address, &rloc, &p, &w))
+	{
+	  pair.lcl_loc = lloc;
+	  pair.rmt_loc = rloc;
+	  pair.priority = p;
+	  pair.weight = w;
+	  vec_add1 (pairs, pair);
+	}
+      else
+	{
+	  error = unformat_parse_error (line_input);
+	  goto done;
+	}
+    }
+  unformat_free (line_input);
+
+  if (!vni_set || !vrf_set)
+    {
+      error = clib_error_return (0, "vni and vrf must be set!");
+      goto done;
+    }
+
+  if (!reid_set)
+    {
+      error = clib_error_return (0, "remote eid must be set!");
+      goto done;
+    }
+
+  if (is_negative)
+    {
+      if (~0 == action)
+	{
+	  error = clib_error_return (0, "no action set for negative tunnel!");
+	  goto done;
+	}
+    }
+  else
+    {
+      if (vec_len (pairs) == 0)
+	{
+	  error = clib_error_return (0, "expected ip4/ip6 locators.");
+	  goto done;
+	}
+    }
+
+  if (!leid_set)
+    {
+      /* if leid not set, make sure it's the same AFI like reid */
+      gid_address_type (leid) = gid_address_type (reid);
+      if (GID_ADDR_IP_PREFIX == gid_address_type (reid))
+	gid_address_ip_version (leid) = gid_address_ip_version (reid);
+    }
+
+  /* add fwd entry */
+  vnet_lisp_gpe_add_del_fwd_entry_args_t _a, *a = &_a;
+  memset (a, 0, sizeof (a[0]));
+
+  a->is_add = is_add;
+  a->is_negative = is_negative;
+  a->vni = vni;
+  a->table_id = vrf;
+  gid_address_copy (&a->lcl_eid, leid);
+  gid_address_copy (&a->rmt_eid, reid);
+  a->locator_pairs = pairs;
+
+  rv = vnet_lisp_gpe_add_del_fwd_entry (a, 0);
+  if (0 != rv)
+    {
+      error = clib_error_return (0, "failed to %s gpe tunnel!",
+				 is_add ? "add" : "delete");
+    }
+
+done:
+  vec_free (pairs);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_gpe_add_del_fwd_entry_command, static) = {
+  .path = "lisp gpe entry",
+  .short_help = "lisp gpe entry add/del vni <vni> vrf <vrf> [leid <leid>]"
+      "reid <reid> [loc-pair <lloc> <rloc> p <priority> w <weight>] "
+      "[negative action <action>]",
+  .function = lisp_gpe_add_del_fwd_entry_command_fn,
+};
+/* *INDENT-ON* */
+
+/** Check if LISP-GPE is enabled. */
+u8
+vnet_lisp_gpe_enable_disable_status (void)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+
+  return lgm->is_en;
+}
+
+/** Enable/disable LISP-GPE. */
+clib_error_t *
+vnet_lisp_gpe_enable_disable (vnet_lisp_gpe_enable_disable_args_t * a)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+
+  if (a->is_en)
+    {
+      lgm->is_en = 1;
+    }
+  else
+    {
+      /* remove all entries */
+      vnet_lisp_gpe_fwd_entry_flush ();
+
+      /* disable all l3 ifaces */
+      lisp_gpe_tenant_flush ();
+
+      lgm->is_en = 0;
+    }
+
+  return 0;
+}
+
+/** CLI command to enable/disable LISP-GPE. */
+static clib_error_t *
+lisp_gpe_enable_disable_command_fn (vlib_main_t * vm,
+				    unformat_input_t * input,
+				    vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_en = 1;
+  vnet_lisp_gpe_enable_disable_args_t _a, *a = &_a;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "enable"))
+	is_en = 1;
+      else if (unformat (line_input, "disable"))
+	is_en = 0;
+      else
+	{
+	  return clib_error_return (0, "parse error: '%U'",
+				    format_unformat_error, line_input);
+	}
+    }
+  a->is_en = is_en;
+  return vnet_lisp_gpe_enable_disable (a);
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (enable_disable_lisp_gpe_command, static) = {
+  .path = "lisp gpe",
+  .short_help = "lisp gpe [enable|disable]",
+  .function = lisp_gpe_enable_disable_command_fn,
+};
+/* *INDENT-ON* */
+
+/** CLI command to show LISP-GPE interfaces. */
+static clib_error_t *
+lisp_show_iface_command_fn (vlib_main_t * vm,
+			    unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  hash_pair_t *p;
+
+  vlib_cli_output (vm, "%=10s%=12s", "vrf", "hw_if_index");
+
+  /* *INDENT-OFF* */
+  hash_foreach_pair (p, lgm->l3_ifaces.hw_if_index_by_dp_table, ({
+    vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]);
+  }));
+  /* *INDENT-ON* */
+
+  if (0 != lgm->l2_ifaces.hw_if_index_by_dp_table)
+    {
+      vlib_cli_output (vm, "%=10s%=12s", "bd_id", "hw_if_index");
+      /* *INDENT-OFF* */
+      hash_foreach_pair (p, lgm->l2_ifaces.hw_if_index_by_dp_table, ({
+        vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]);
+      }));
+      /* *INDENT-ON* */
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_iface_command) = {
+    .path = "show lisp gpe interface",
+    .short_help = "show lisp gpe interface",
+    .function = lisp_show_iface_command_fn,
+};
+/* *INDENT-ON* */
+
+/** Format LISP-GPE status. */
+u8 *
+format_vnet_lisp_gpe_status (u8 * s, va_list * args)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  return format (s, "%s", lgm->is_en ? "enabled" : "disabled");
+}
+
+
+/** LISP-GPE init function. */
+clib_error_t *
+lisp_gpe_init (vlib_main_t * vm)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  clib_error_t *error = 0;
+
+  if ((error = vlib_call_init_function (vm, ip_main_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ip4_lookup_init)))
+    return error;
+
+  lgm->vnet_main = vnet_get_main ();
+  lgm->vlib_main = vm;
+  lgm->im4 = &ip4_main;
+  lgm->im6 = &ip6_main;
+  lgm->lm4 = &ip4_main.lookup_main;
+  lgm->lm6 = &ip6_main.lookup_main;
+
+  lgm->lisp_gpe_fwd_entries =
+    hash_create_mem (0, sizeof (lisp_gpe_fwd_entry_key_t), sizeof (uword));
+
+  udp_register_dst_port (vm, UDP_DST_PORT_lisp_gpe,
+			 lisp_gpe_ip4_input_node.index, 1 /* is_ip4 */ );
+  udp_register_dst_port (vm, UDP_DST_PORT_lisp_gpe6,
+			 lisp_gpe_ip6_input_node.index, 0 /* is_ip4 */ );
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (lisp_gpe_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/lisp_gpe.h b/src/vnet/lisp-gpe/lisp_gpe.h
new file mode 100644
index 00000000..bb0f788b
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe.h
@@ -0,0 +1,257 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief LISP-GPE definitions.
+ */
+
+#ifndef included_vnet_lisp_gpe_h
+#define included_vnet_lisp_gpe_h
+
+#include <vppinfra/error.h>
+#include <vppinfra/mhash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/udp.h>
+#include <vnet/lisp-cp/lisp_types.h>
+#include <vnet/lisp-gpe/lisp_gpe_packet.h>
+#include <vnet/adj/adj_types.h>
+
+/** IP4-UDP-LISP encap header */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  ip4_header_t ip4;             /* 20 bytes */
+  udp_header_t udp;             /* 8 bytes */
+  lisp_gpe_header_t lisp;       /* 8 bytes */
+}) ip4_udp_lisp_gpe_header_t;
+/* *INDENT-ON* */
+
+/** IP6-UDP-LISP encap header */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  ip6_header_t ip6;             /* 40 bytes */
+  udp_header_t udp;             /* 8 bytes */
+  lisp_gpe_header_t lisp;       /* 8 bytes */
+}) ip6_udp_lisp_gpe_header_t;
+/* *INDENT-ON* */
+
+#define foreach_lisp_gpe_ip_input_next          \
+_(DROP, "error-drop")                           \
+_(IP4_INPUT, "ip4-input")                       \
+_(IP6_INPUT, "ip6-input")                       \
+_(L2_INPUT, "l2-input")
+
+/** Enum of possible next nodes post LISP-GPE decap */
+typedef enum
+{
+#define _(s,n) LISP_GPE_INPUT_NEXT_##s,
+  foreach_lisp_gpe_ip_input_next
+#undef _
+    LISP_GPE_INPUT_N_NEXT,
+} lisp_gpe_input_next_t;
+
+typedef enum
+{
+#define lisp_gpe_error(n,s) LISP_GPE_ERROR_##n,
+#include <vnet/lisp-gpe/lisp_gpe_error.def>
+#undef lisp_gpe_error
+  LISP_GPE_N_ERROR,
+} lisp_gpe_error_t;
+
+typedef struct tunnel_lookup
+{
+  /** Lookup lisp-gpe interfaces by dp table (eg. vrf/bridge index) */
+  uword *hw_if_index_by_dp_table;
+
+  /** lookup decap tunnel termination sw_if_index by vni and vice versa */
+  uword *sw_if_index_by_vni;
+
+  // FIXME - Need this?
+  uword *vni_by_sw_if_index;
+} tunnel_lookup_t;
+
+/** LISP-GPE global state*/
+typedef struct lisp_gpe_main
+{
+  /**
+   * @brief DB of all forwarding entries. The Key is:{l-EID,r-EID,vni}
+   * where the EID encodes L2 or L3
+   */
+  uword *lisp_gpe_fwd_entries;
+
+  /**
+   * @brief A Pool of all LISP forwarding entries
+   */
+  struct lisp_gpe_fwd_entry_t_ *lisp_fwd_entry_pool;
+
+  /** Free vlib hw_if_indices */
+  u32 *free_tunnel_hw_if_indices;
+
+  u8 is_en;
+
+  /* L3 data structures
+   * ================== */
+  tunnel_lookup_t l3_ifaces;
+
+  /* L2 data structures
+   * ================== */
+
+  /** L2 LISP FIB */
+    BVT (clib_bihash) l2_fib;
+
+  tunnel_lookup_t l2_ifaces;
+
+  /** Load-balance for a miss in the table */
+  dpo_id_t l2_lb_cp_lkup;
+
+  /** convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+  ip4_main_t *im4;
+  ip6_main_t *im6;
+  ip_lookup_main_t *lm4;
+  ip_lookup_main_t *lm6;
+} lisp_gpe_main_t;
+
+/** LISP-GPE global state*/
+lisp_gpe_main_t lisp_gpe_main;
+
+always_inline lisp_gpe_main_t *
+vnet_lisp_gpe_get_main ()
+{
+  return &lisp_gpe_main;
+}
+
+
+extern vlib_node_registration_t lisp_gpe_ip4_input_node;
+extern vlib_node_registration_t lisp_gpe_ip6_input_node;
+extern vnet_hw_interface_class_t lisp_gpe_hw_class;
+
+u8 *format_lisp_gpe_header_with_length (u8 * s, va_list * args);
+
+/** Read LISP-GPE status */
+u8 vnet_lisp_gpe_enable_disable_status (void);
+
+u32
+lisp_gpe_l3_iface_find_or_create (lisp_gpe_main_t * lgm,
+				  u32 overlay_table_id, u32 vni);
+
+/** Add/del LISP-GPE interface. */
+extern void lisp_gpe_del_l2_iface (lisp_gpe_main_t * lgm, u32 vni, u32 bd_id);
+extern u32 lisp_gpe_add_l2_iface (lisp_gpe_main_t * lgm, u32 vni, u32 bd_id);
+extern void lisp_gpe_del_l3_iface (lisp_gpe_main_t * lgm, u32 vni, u32 bd_id);
+extern u32 lisp_gpe_add_l3_iface (lisp_gpe_main_t * lgm, u32 vni, u32 bd_id);
+
+
+typedef struct
+{
+  u8 is_en;
+} vnet_lisp_gpe_enable_disable_args_t;
+
+clib_error_t
+  * vnet_lisp_gpe_enable_disable (vnet_lisp_gpe_enable_disable_args_t * a);
+
+typedef enum
+{
+  NO_ACTION,
+  FORWARD_NATIVE,
+  SEND_MAP_REQUEST,
+  DROP
+} negative_fwd_actions_e;
+
+/** */
+typedef struct
+{
+  u8 is_add;
+
+  /** type of mapping */
+  u8 is_negative;
+
+  /** action for negative mappings */
+  negative_fwd_actions_e action;
+
+  /** local eid */
+  gid_address_t lcl_eid;
+
+  /** remote eid */
+  gid_address_t rmt_eid;
+
+  /** vector of locator pairs */
+  locator_pair_t *locator_pairs;
+
+  /** FIB index to lookup remote locator at encap */
+  u32 encap_fib_index;
+
+  /** FIB index to lookup inner IP at decap */
+  u32 decap_fib_index;
+
+  /* TODO remove */
+  u32 decap_next_index;
+
+  /** VNI/tenant id in HOST byte order */
+  u32 vni;
+
+  /** vrf or bd where fwd entry should be inserted */
+  union
+  {
+    /** table (vrf) id */
+    u32 table_id;
+
+    /** bridge domain id */
+    u16 bd_id;
+
+    /** generic access */
+    u32 dp_table;
+  };
+} vnet_lisp_gpe_add_del_fwd_entry_args_t;
+
+#define foreach_lgpe_ip4_lookup_next    \
+  _(DROP, "error-drop")                 \
+  _(LISP_CP_LOOKUP, "lisp-cp-lookup")
+
+typedef enum lgpe_ip4_lookup_next
+{
+#define _(sym,str) LGPE_IP4_LOOKUP_NEXT_##sym,
+  foreach_lgpe_ip4_lookup_next
+#undef _
+    LGPE_IP4_LOOKUP_N_NEXT,
+} lgpe_ip4_lookup_next_t;
+
+#define foreach_lgpe_ip6_lookup_next    \
+  _(DROP, "error-drop")                 \
+  _(LISP_CP_LOOKUP, "lisp-cp-lookup")
+
+typedef enum lgpe_ip6_lookup_next
+{
+#define _(sym,str) LGPE_IP6_LOOKUP_NEXT_##sym,
+  foreach_lgpe_ip6_lookup_next
+#undef _
+    LGPE_IP6_LOOKUP_N_NEXT,
+} lgpe_ip6_lookup_next_t;
+
+u8 *format_vnet_lisp_gpe_status (u8 * s, va_list * args);
+
+#endif /* included_vnet_lisp_gpe_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/lisp_gpe_adjacency.c b/src/vnet/lisp-gpe/lisp_gpe_adjacency.c
new file mode 100644
index 00000000..8c96a25c
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe_adjacency.c
@@ -0,0 +1,542 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief Common utility functions for IPv4, IPv6 and L2 LISP-GPE adjacencys.
+ *
+ */
+
+#include <vnet/dpo/load_balance.h>
+#include <vnet/lisp-cp/lisp_types.h>
+#include <vnet/lisp-gpe/lisp_gpe_sub_interface.h>
+#include <vnet/lisp-gpe/lisp_gpe_adjacency.h>
+#include <vnet/lisp-gpe/lisp_gpe_tunnel.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/adj/adj_midchain.h>
+
+/**
+ * Memory pool of all adjacencies
+ */
+static lisp_gpe_adjacency_t *lisp_adj_pool;
+
+/**
+ * Hash table of all adjacencies. key:{nh, itf}
+ * We never have an all zeros address since the interfaces are multi-access,
+ * therefore there is no ambiguity between a v4 and v6 next-hop, so we don't
+ * need to add the protocol to the key.
+ */
+static
+BVT (clib_bihash)
+  lisp_adj_db;
+
+#define LISP_ADJ_SET_KEY(_key, _itf, _nh)       \
+{						\
+  _key.key[0] = (_nh)->ip.v6.as_u64[0];		\
+  _key.key[1] = (_nh)->ip.v6.as_u64[1];		\
+  _key.key[2] = (_itf);				\
+}
+
+     static index_t lisp_adj_find (const ip_address_t * addr, u32 sw_if_index)
+{
+  BVT (clib_bihash_kv) kv;
+
+  LISP_ADJ_SET_KEY (kv, sw_if_index, addr);
+
+  if (BV (clib_bihash_search) (&lisp_adj_db, &kv, &kv) < 0)
+    {
+      return (INDEX_INVALID);
+    }
+  else
+    {
+      return (kv.value);
+    }
+}
+
+static void
+lisp_adj_insert (const ip_address_t * addr, u32 sw_if_index, index_t ai)
+{
+  BVT (clib_bihash_kv) kv;
+
+  LISP_ADJ_SET_KEY (kv, sw_if_index, addr);
+  kv.value = ai;
+
+  BV (clib_bihash_add_del) (&lisp_adj_db, &kv, 1);
+}
+
+static void
+lisp_adj_remove (const ip_address_t * addr, u32 sw_if_index)
+{
+  BVT (clib_bihash_kv) kv;
+
+  LISP_ADJ_SET_KEY (kv, sw_if_index, addr);
+
+  BV (clib_bihash_add_del) (&lisp_adj_db, &kv, 0);
+}
+
+static lisp_gpe_adjacency_t *
+lisp_gpe_adjacency_get_i (index_t lai)
+{
+  return (pool_elt_at_index (lisp_adj_pool, lai));
+}
+
+fib_forward_chain_type_t
+lisp_gpe_adj_get_fib_chain_type (const lisp_gpe_adjacency_t * ladj)
+{
+  switch (ip_addr_version (&ladj->remote_rloc))
+    {
+    case IP4:
+      return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
+    case IP6:
+      return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
+    default:
+      ASSERT (0);
+      break;
+    }
+  return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
+}
+
+static void
+ip46_address_to_ip_address (const ip46_address_t * a, ip_address_t * b)
+{
+  if (ip46_address_is_ip4 (a))
+    {
+      memset (b, 0, sizeof (*b));
+      ip_address_set (b, &a->ip4, IP4);
+    }
+  else
+    {
+      ip_address_set (b, &a->ip6, IP6);
+    }
+}
+
+/**
+ * @brief Stack the tunnel's midchain on the IP forwarding chain of the via
+ */
+static void
+lisp_gpe_adj_stack_one (lisp_gpe_adjacency_t * ladj, adj_index_t ai)
+{
+  const lisp_gpe_tunnel_t *lgt;
+  dpo_id_t tmp = DPO_INVALID;
+
+  lgt = lisp_gpe_tunnel_get (ladj->tunnel_index);
+  fib_entry_contribute_forwarding (lgt->fib_entry_index,
+				   lisp_gpe_adj_get_fib_chain_type (ladj),
+				   &tmp);
+
+  if (DPO_LOAD_BALANCE == tmp.dpoi_type)
+    {
+      /*
+       * post LISP rewrite we will load-balance. However, the LISP encap
+       * is always the same for this adjacency/tunnel and hence the IP/UDP src,dst
+       * hash is always the same result too. So we do that hash now and
+       * stack on the choice.
+       * If the choice is an incomplete adj then we will need a poke when
+       * it becomes complete. This happens since the adj update walk propagates
+       * as far a recursive paths.
+       */
+      const dpo_id_t *choice;
+      load_balance_t *lb;
+      int hash;
+
+      lb = load_balance_get (tmp.dpoi_index);
+
+      if (IP4 == ip_addr_version (&ladj->remote_rloc))
+	{
+	  hash = ip4_compute_flow_hash ((ip4_header_t *) adj_get_rewrite (ai),
+					lb->lb_hash_config);
+	}
+      else
+	{
+	  hash = ip6_compute_flow_hash ((ip6_header_t *) adj_get_rewrite (ai),
+					lb->lb_hash_config);
+	}
+
+      choice =
+	load_balance_get_bucket_i (lb, hash & lb->lb_n_buckets_minus_1);
+      dpo_copy (&tmp, choice);
+    }
+
+  adj_nbr_midchain_stack (ai, &tmp);
+  dpo_reset (&tmp);
+}
+
+/**
+ * @brief Call back when restacking all adjacencies on a GRE interface
+ */
+static adj_walk_rc_t
+lisp_gpe_adj_walk_cb (adj_index_t ai, void *ctx)
+{
+  lisp_gpe_adjacency_t *ladj = ctx;
+
+  lisp_gpe_adj_stack_one (ladj, ai);
+
+  return (ADJ_WALK_RC_CONTINUE);
+}
+
+static void
+lisp_gpe_adj_stack (lisp_gpe_adjacency_t * ladj)
+{
+  fib_protocol_t nh_proto;
+  ip46_address_t nh;
+
+  ip_address_to_46 (&ladj->remote_rloc, &nh, &nh_proto);
+
+  /*
+   * walk all the adjacencies on th lisp interface and restack them
+   */
+  adj_nbr_walk_nh (ladj->sw_if_index,
+		   nh_proto, &nh, lisp_gpe_adj_walk_cb, ladj);
+}
+
+static lisp_gpe_next_protocol_e
+lisp_gpe_adj_proto_from_vnet_link_type (vnet_link_t linkt)
+{
+  switch (linkt)
+    {
+    case VNET_LINK_IP4:
+      return (LISP_GPE_NEXT_PROTO_IP4);
+    case VNET_LINK_IP6:
+      return (LISP_GPE_NEXT_PROTO_IP6);
+    case VNET_LINK_ETHERNET:
+      return (LISP_GPE_NEXT_PROTO_ETHERNET);
+    default:
+      ASSERT (0);
+    }
+  return (LISP_GPE_NEXT_PROTO_IP4);
+}
+
+#define is_v4_packet(_h) ((*(u8*) _h) & 0xF0) == 0x40
+
+static void
+lisp_gpe_fixup (vlib_main_t * vm, ip_adjacency_t * adj, vlib_buffer_t * b)
+{
+  /* Fixup the checksum and len fields in the LISP tunnel encap
+   * that was applied at the midchain node */
+  ip_udp_fixup_one (vm, b, is_v4_packet (vlib_buffer_get_current (b)));
+}
+
+/**
+ * @brief The LISP-GPE interface registered function to update, i.e.
+ * provide an rewrite string for, an adjacency.
+ */
+void
+lisp_gpe_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai)
+{
+  const lisp_gpe_tunnel_t *lgt;
+  lisp_gpe_adjacency_t *ladj;
+  ip_adjacency_t *adj;
+  ip_address_t rloc;
+  vnet_link_t linkt;
+  index_t lai;
+
+  adj = adj_get (ai);
+  ip46_address_to_ip_address (&adj->sub_type.nbr.next_hop, &rloc);
+
+  /*
+   * find an existing or create a new adj
+   */
+  lai = lisp_adj_find (&rloc, sw_if_index);
+
+  ASSERT (INDEX_INVALID != lai);
+
+  ladj = pool_elt_at_index (lisp_adj_pool, lai);
+  lgt = lisp_gpe_tunnel_get (ladj->tunnel_index);
+  linkt = adj_get_link_type (ai);
+
+  adj_nbr_midchain_update_rewrite
+    (ai, lisp_gpe_fixup,
+     (VNET_LINK_ETHERNET == linkt ?
+      ADJ_MIDCHAIN_FLAG_NO_COUNT :
+      ADJ_MIDCHAIN_FLAG_NONE),
+     lisp_gpe_tunnel_build_rewrite
+     (lgt, ladj, lisp_gpe_adj_proto_from_vnet_link_type (linkt)));
+
+  lisp_gpe_adj_stack_one (ladj, ai);
+}
+
+u8 *
+lisp_gpe_build_rewrite (vnet_main_t * vnm,
+			u32 sw_if_index,
+			vnet_link_t link_type, const void *dst_address)
+{
+  ASSERT (0);
+  return (NULL);
+}
+
+index_t
+lisp_gpe_adjacency_find_or_create_and_lock (const locator_pair_t * pair,
+					    u32 overlay_table_id, u32 vni)
+{
+  const lisp_gpe_sub_interface_t *l3s;
+  const lisp_gpe_tunnel_t *lgt;
+  lisp_gpe_adjacency_t *ladj;
+  index_t lai, l3si;
+
+  /*
+   * first find the L3 sub-interface that corresponds to the loacl-rloc and vni
+   */
+  l3si = lisp_gpe_sub_interface_find_or_create_and_lock (&pair->lcl_loc,
+							 overlay_table_id,
+							 vni);
+  l3s = lisp_gpe_sub_interface_get (l3si);
+
+  /*
+   * find an existing or create a new adj
+   */
+  lai = lisp_adj_find (&pair->rmt_loc, l3s->sw_if_index);
+
+  if (INDEX_INVALID == lai)
+    {
+
+      pool_get (lisp_adj_pool, ladj);
+      memset (ladj, 0, sizeof (*ladj));
+      lai = (ladj - lisp_adj_pool);
+
+      ip_address_copy (&ladj->remote_rloc, &pair->rmt_loc);
+      ladj->vni = vni;
+      /* transfer the lock to the adj */
+      ladj->lisp_l3_sub_index = l3si;
+      ladj->sw_if_index = l3s->sw_if_index;
+
+      /* if vni is non-default */
+      if (ladj->vni)
+	ladj->flags = LISP_GPE_FLAGS_I;
+
+      /* work in lisp-gpe not legacy mode */
+      ladj->flags |= LISP_GPE_FLAGS_P;
+
+      /*
+       * find the tunnel that will provide the underlying transport
+       * and hence the rewrite.
+       * The RLOC FIB index is default table - always.
+       */
+      ladj->tunnel_index = lisp_gpe_tunnel_find_or_create_and_lock (pair, 0);
+
+      lgt = lisp_gpe_tunnel_get (ladj->tunnel_index);
+
+      /*
+       * become of child of the RLOC FIB entry so we are updated when
+       * its reachability changes, allowing us to re-stack the midcahins
+       */
+      ladj->fib_entry_child_index = fib_entry_child_add (lgt->fib_entry_index,
+							 FIB_NODE_TYPE_LISP_ADJ,
+							 lai);
+
+      lisp_adj_insert (&ladj->remote_rloc, ladj->sw_if_index, lai);
+    }
+  else
+    {
+      /* unlock the interface from the find. */
+      lisp_gpe_sub_interface_unlock (l3si);
+      ladj = lisp_gpe_adjacency_get_i (lai);
+    }
+
+  ladj->locks++;
+
+  return (lai);
+}
+
+/**
+ * @brief Get a pointer to a tunnel from a pointer to a FIB node
+ */
+static lisp_gpe_adjacency_t *
+lisp_gpe_adjacency_from_fib_node (const fib_node_t * node)
+{
+  return ((lisp_gpe_adjacency_t *)
+	  ((char *) node -
+	   STRUCT_OFFSET_OF (lisp_gpe_adjacency_t, fib_node)));
+}
+
+static void
+lisp_gpe_adjacency_last_lock_gone (lisp_gpe_adjacency_t * ladj)
+{
+  const lisp_gpe_tunnel_t *lgt;
+
+  /*
+   * no children so we are not counting locks. no-op.
+   * at least not counting
+   */
+  lisp_adj_remove (&ladj->remote_rloc, ladj->sw_if_index);
+
+  /*
+   * unlock the resources this adj holds
+   */
+  lgt = lisp_gpe_tunnel_get (ladj->tunnel_index);
+
+  fib_entry_child_remove (lgt->fib_entry_index, ladj->fib_entry_child_index);
+
+  lisp_gpe_tunnel_unlock (ladj->tunnel_index);
+  lisp_gpe_sub_interface_unlock (ladj->lisp_l3_sub_index);
+
+  pool_put (lisp_adj_pool, ladj);
+}
+
+void
+lisp_gpe_adjacency_unlock (index_t lai)
+{
+  lisp_gpe_adjacency_t *ladj;
+
+  ladj = lisp_gpe_adjacency_get_i (lai);
+
+  ladj->locks--;
+
+  if (0 == ladj->locks)
+    {
+      lisp_gpe_adjacency_last_lock_gone (ladj);
+    }
+}
+
+const lisp_gpe_adjacency_t *
+lisp_gpe_adjacency_get (index_t lai)
+{
+  return (lisp_gpe_adjacency_get_i (lai));
+}
+
+
+/**
+ * @brief LISP GPE tunnel back walk
+ *
+ * The FIB entry through which this tunnel resolves has been updated.
+ * re-stack the midchain on the new forwarding.
+ */
+static fib_node_back_walk_rc_t
+lisp_gpe_adjacency_back_walk (fib_node_t * node,
+			      fib_node_back_walk_ctx_t * ctx)
+{
+  lisp_gpe_adj_stack (lisp_gpe_adjacency_from_fib_node (node));
+
+  return (FIB_NODE_BACK_WALK_CONTINUE);
+}
+
+static fib_node_t *
+lisp_gpe_adjacency_get_fib_node (fib_node_index_t index)
+{
+  lisp_gpe_adjacency_t *ladj;
+
+  ladj = pool_elt_at_index (lisp_adj_pool, index);
+  return (&ladj->fib_node);
+}
+
+static void
+lisp_gpe_adjacency_last_fib_lock_gone (fib_node_t * node)
+{
+  lisp_gpe_adjacency_last_lock_gone (lisp_gpe_adjacency_from_fib_node (node));
+}
+
+const static fib_node_vft_t lisp_gpe_tuennel_vft = {
+  .fnv_get = lisp_gpe_adjacency_get_fib_node,
+  .fnv_back_walk = lisp_gpe_adjacency_back_walk,
+  .fnv_last_lock = lisp_gpe_adjacency_last_fib_lock_gone,
+};
+
+u8 *
+format_lisp_gpe_adjacency (u8 * s, va_list * args)
+{
+  lisp_gpe_adjacency_t *ladj = va_arg (*args, lisp_gpe_adjacency_t *);
+  lisp_gpe_adjacency_format_flags_t flags =
+    va_arg (*args, lisp_gpe_adjacency_format_flags_t);
+
+  if (flags & LISP_GPE_ADJ_FORMAT_FLAG_DETAIL)
+    {
+      s =
+	format (s, "index %d locks:%d\n", ladj - lisp_adj_pool, ladj->locks);
+    }
+
+  s = format (s, " vni: %d,", ladj->vni);
+  s = format (s, " remote-RLOC: %U,", format_ip_address, &ladj->remote_rloc);
+
+  if (flags & LISP_GPE_ADJ_FORMAT_FLAG_DETAIL)
+    {
+      s = format (s, " %U\n",
+		  format_lisp_gpe_sub_interface,
+		  lisp_gpe_sub_interface_get (ladj->lisp_l3_sub_index));
+      s = format (s, " %U\n",
+		  format_lisp_gpe_tunnel,
+		  lisp_gpe_tunnel_get (ladj->tunnel_index));
+    }
+  else
+    {
+      s = format (s, " LISP L3 sub-interface index: %d,",
+		  ladj->lisp_l3_sub_index);
+      s = format (s, " LISP tunnel index: %d", ladj->tunnel_index);
+    }
+
+
+  return (s);
+}
+
+static clib_error_t *
+lisp_gpe_adjacency_show (vlib_main_t * vm,
+			 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  lisp_gpe_adjacency_t *ladj;
+  index_t index;
+
+  if (pool_elts (lisp_adj_pool) == 0)
+    vlib_cli_output (vm, "No lisp-gpe Adjacencies");
+
+  if (unformat (input, "%d", &index))
+    {
+      ladj = lisp_gpe_adjacency_get_i (index);
+      vlib_cli_output (vm, "%U", format_lisp_gpe_adjacency, ladj,
+		       LISP_GPE_ADJ_FORMAT_FLAG_DETAIL);
+    }
+  else
+    {
+      /* *INDENT-OFF* */
+      pool_foreach (ladj, lisp_adj_pool,
+      ({
+	vlib_cli_output (vm, "[%d] %U\n",
+			 ladj - lisp_adj_pool,
+			 format_lisp_gpe_adjacency, ladj,
+			 LISP_GPE_ADJ_FORMAT_FLAG_NONE);
+      }));
+      /* *INDENT-ON* */
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_lisp_gpe_tunnel_command, static) =
+{
+  .path = "show lisp gpe adjacency",
+  .function = lisp_gpe_adjacency_show,
+};
+/* *INDENT-ON* */
+
+#define LISP_ADJ_NBR_DEFAULT_HASH_NUM_BUCKETS (256)
+#define LISP_ADJ_NBR_DEFAULT_HASH_MEMORY_SIZE (1<<20)
+
+static clib_error_t *
+lisp_gpe_adj_module_init (vlib_main_t * vm)
+{
+  BV (clib_bihash_init) (&lisp_adj_db,
+			 "Adjacency Neighbour table",
+			 LISP_ADJ_NBR_DEFAULT_HASH_NUM_BUCKETS,
+			 LISP_ADJ_NBR_DEFAULT_HASH_MEMORY_SIZE);
+
+  fib_node_register_type (FIB_NODE_TYPE_LISP_ADJ, &lisp_gpe_tuennel_vft);
+  return (NULL);
+}
+
+VLIB_INIT_FUNCTION (lisp_gpe_adj_module_init)
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/lisp_gpe_adjacency.h b/src/vnet/lisp-gpe/lisp_gpe_adjacency.h
new file mode 100644
index 00000000..adc3acae
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe_adjacency.h
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief Common utility functions for IPv4, IPv6 and L2 LISP-GPE adjacencys.
+ *
+ */
+
+#ifndef LISP_GPE_ADJACENCY_H__
+#define LISP_GPE_ADJACENCY_H__
+
+#include <vnet/fib/fib_node.h>
+#include <vnet/lisp-gpe/lisp_gpe.h>
+
+/**
+ * @brief A LISP GPE Adjacency.
+ *
+ * A adjacency represents peer on an L3 sub-interface to which to send traffic.
+ * adjacencies are thus present in the EID space.
+ * The peer is identified by the key:{remote-rloc, sub-interface}, which is
+ * equivalent to the usal adjacency key {next-hop, interface}. So curiously
+ * the rloc address from the underlay is used as a next hop address in the overlay
+ * This is OK because:
+ *  1 - the RLOC is unique in the underlay AND there is only one underlay VRF per
+ *      overlay
+ *  2 - the RLOC may overlap with an address in the overlay, but we do not create
+ *      an adj-fib (i.e. a route in the overlay FIB for the rloc)
+ *
+ *
+ */
+typedef struct lisp_gpe_adjacency_t_
+{
+  /**
+   * The LISP adj is a part of the FIB control plane graph.
+   */
+  fib_node_t fib_node;
+
+  /**
+   * remote RLOC. The adjacency's next-hop
+   */
+  ip_address_t remote_rloc;
+
+  /**
+   * The VNI. Used in combination with the local-rloc to get the sub-interface
+   */
+  u32 vni;
+
+  /**
+   * The number of locks/reference counts on the adjacency.
+   */
+  u32 locks;
+
+  /**
+   * The index of the LISP L3 subinterface
+   */
+  u32 lisp_l3_sub_index;
+
+  /**
+   * The SW IF index of the sub-interface this adjacency uses.
+   * Cached for convenience from the LISP L3 sub-interface
+   */
+  u32 sw_if_index;
+
+  /**
+   * The index of the LISP GPE tunnel that provides the transport
+   * in the underlay.
+   */
+  u32 tunnel_index;
+
+  /**
+   * This adjacency is a child of the FIB entry to reach the RLOC.
+   * This is so when the reachability of that RLOC changes, we can restack
+   * the FIB adjacnecies.
+   */
+  u32 fib_entry_child_index;
+
+  /**
+   * LISP header fields in HOST byte order
+   */
+  u8 flags;
+  u8 ver_res;
+  u8 res;
+  u8 next_protocol;
+
+} lisp_gpe_adjacency_t;
+
+extern index_t lisp_gpe_adjacency_find_or_create_and_lock (const
+							   locator_pair_t *
+							   pair,
+							   u32 rloc_fib_index,
+							   u32 vni);
+
+extern void lisp_gpe_adjacency_unlock (index_t l3si);
+
+extern const lisp_gpe_adjacency_t *lisp_gpe_adjacency_get (index_t l3si);
+
+extern void lisp_gpe_update_adjacency (vnet_main_t * vnm,
+				       u32 sw_if_index, adj_index_t ai);
+extern u8 *lisp_gpe_build_rewrite (vnet_main_t * vnm,
+				   u32 sw_if_index,
+				   vnet_link_t link_type,
+				   const void *dst_address);
+
+
+/**
+ * @brief Flags for displaying the adjacency
+ */
+typedef enum lisp_gpe_adjacency_format_flags_t_
+{
+  LISP_GPE_ADJ_FORMAT_FLAG_NONE,
+  LISP_GPE_ADJ_FORMAT_FLAG_DETAIL,
+} lisp_gpe_adjacency_format_flags_t;
+
+extern u8 *format_lisp_gpe_adjacency (u8 * s, va_list * args);
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/lisp_gpe_api.c b/src/vnet/lisp-gpe/lisp_gpe_api.c
new file mode 100644
index 00000000..176ded50
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe_api.c
@@ -0,0 +1,304 @@
+/*
+ *------------------------------------------------------------------
+ * lisp_gpe_api.c - lisp_gpe api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/lisp-gpe/lisp_gpe.h>
+#include <vnet/lisp-gpe/lisp_gpe_fwd_entry.h>
+#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                             \
+_(LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry)               \
+_(LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable)                     \
+_(LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface)                       \
+_(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump)
+
+/** Used for transferring locators via VPP API */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u8 is_ip4; /**< is locator an IPv4 address */
+  u8 priority; /**< locator priority */
+  u8 weight; /**< locator weight */
+  u8 addr[16]; /**< IPv4/IPv6 address */
+}) rloc_t;
+/* *INDENT-ON* */
+
+static locator_pair_t *
+unformat_lisp_loc_pairs (void *lcl_locs, void *rmt_locs, u32 rloc_num)
+{
+  u32 i;
+  locator_pair_t *pairs = 0, pair;
+  rloc_t *r;
+
+  for (i = 0; i < rloc_num; i++)
+    {
+      /* local locator */
+      r = &((rloc_t *) lcl_locs)[i];
+      memset (&pair.lcl_loc, 0, sizeof (pair.lcl_loc));
+      ip_address_set (&pair.lcl_loc, &r->addr, r->is_ip4 ? IP4 : IP6);
+
+      /* remote locators */
+      r = &((rloc_t *) rmt_locs)[i];
+      memset (&pair.rmt_loc, 0, sizeof (pair.rmt_loc));
+      ip_address_set (&pair.rmt_loc, &r->addr, r->is_ip4 ? IP4 : IP6);
+
+      pair.priority = r->priority;
+      pair.weight = r->weight;
+
+      vec_add1 (pairs, pair);
+    }
+  return pairs;
+}
+
+static int
+unformat_lisp_eid_api (gid_address_t * dst, u32 vni, u8 type, void *src,
+		       u8 len)
+{
+  switch (type)
+    {
+    case 0:			/* ipv4 */
+      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
+      gid_address_ip_set (dst, src, IP4);
+      gid_address_ippref_len (dst) = len;
+      ip_prefix_normalize (&gid_address_ippref (dst));
+      break;
+    case 1:			/* ipv6 */
+      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
+      gid_address_ip_set (dst, src, IP6);
+      gid_address_ippref_len (dst) = len;
+      ip_prefix_normalize (&gid_address_ippref (dst));
+      break;
+    case 2:			/* l2 mac */
+      gid_address_type (dst) = GID_ADDR_MAC;
+      clib_memcpy (&gid_address_mac (dst), src, 6);
+      break;
+    default:
+      /* unknown type */
+      return VNET_API_ERROR_INVALID_VALUE;
+    }
+
+  gid_address_vni (dst) = vni;
+
+  return 0;
+}
+
+static void
+  vl_api_lisp_gpe_add_del_fwd_entry_t_handler
+  (vl_api_lisp_gpe_add_del_fwd_entry_t * mp)
+{
+  vl_api_lisp_gpe_add_del_fwd_entry_reply_t *rmp;
+  vnet_lisp_gpe_add_del_fwd_entry_args_t _a, *a = &_a;
+  locator_pair_t *pairs = 0;
+  int rv = 0;
+
+  memset (a, 0, sizeof (a[0]));
+
+  rv = unformat_lisp_eid_api (&a->rmt_eid, mp->vni, mp->eid_type,
+			      mp->rmt_eid, mp->rmt_len);
+  rv |= unformat_lisp_eid_api (&a->lcl_eid, mp->vni, mp->eid_type,
+			       mp->lcl_eid, mp->lcl_len);
+
+  pairs = unformat_lisp_loc_pairs (mp->lcl_locs, mp->rmt_locs, mp->loc_num);
+
+  if (rv || 0 == pairs)
+    goto send_reply;
+
+  a->is_add = mp->is_add;
+  a->locator_pairs = pairs;
+  a->dp_table = mp->dp_table;
+  a->vni = mp->vni;
+  a->action = mp->action;
+
+  rv = vnet_lisp_gpe_add_del_fwd_entry (a, 0);
+  vec_free (pairs);
+send_reply:
+  REPLY_MACRO (VL_API_LISP_GPE_ADD_DEL_FWD_ENTRY_REPLY);
+}
+
+static void
+vl_api_lisp_gpe_enable_disable_t_handler (vl_api_lisp_gpe_enable_disable_t *
+					  mp)
+{
+  vl_api_lisp_gpe_enable_disable_reply_t *rmp;
+  int rv = 0;
+  vnet_lisp_gpe_enable_disable_args_t _a, *a = &_a;
+
+  a->is_en = mp->is_en;
+  vnet_lisp_gpe_enable_disable (a);
+
+  REPLY_MACRO (VL_API_LISP_GPE_ENABLE_DISABLE_REPLY);
+}
+
+static void
+vl_api_lisp_gpe_add_del_iface_t_handler (vl_api_lisp_gpe_add_del_iface_t * mp)
+{
+  vl_api_lisp_gpe_add_del_iface_reply_t *rmp;
+  int rv = 0;
+
+  if (mp->is_l2)
+    {
+      if (mp->is_add)
+	{
+	  if (~0 ==
+	      lisp_gpe_tenant_l2_iface_add_or_lock (mp->vni, mp->dp_table))
+	    rv = 1;
+	}
+      else
+	lisp_gpe_tenant_l2_iface_unlock (mp->vni);
+    }
+  else
+    {
+      if (mp->is_add)
+	{
+	  if (~0 ==
+	      lisp_gpe_tenant_l3_iface_add_or_lock (mp->vni, mp->dp_table))
+	    rv = 1;
+	}
+      else
+	lisp_gpe_tenant_l3_iface_unlock (mp->vni);
+    }
+
+  REPLY_MACRO (VL_API_LISP_GPE_ADD_DEL_IFACE_REPLY);
+}
+
+static void
+send_lisp_gpe_fwd_entry_details (lisp_gpe_fwd_entry_t * lfe,
+				 unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_lisp_gpe_tunnel_details_t *rmp;
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_LISP_GPE_TUNNEL_DETAILS);
+
+  rmp->tunnels = lfe - lgm->lisp_fwd_entry_pool;
+
+  rmp->is_ipv6 = ip_prefix_version (&(lfe->key->rmt.ippref)) == IP6 ? 1 : 0;
+  ip_address_copy_addr (rmp->source_ip,
+			&ip_prefix_addr (&(lfe->key->rmt.ippref)));
+  ip_address_copy_addr (rmp->destination_ip,
+			&ip_prefix_addr (&(lfe->key->rmt.ippref)));
+
+  rmp->encap_fib_id = htonl (0);
+  rmp->decap_fib_id = htonl (lfe->eid_fib_index);
+  rmp->iid = htonl (lfe->key->vni);
+  rmp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_lisp_gpe_tunnel_dump_t_handler (vl_api_lisp_gpe_tunnel_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q = NULL;
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  lisp_gpe_fwd_entry_t *lfe = NULL;
+
+  if (pool_elts (lgm->lisp_fwd_entry_pool) == 0)
+    {
+      return;
+    }
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  /* *INDENT-OFF* */
+  pool_foreach(lfe, lgm->lisp_fwd_entry_pool,
+  ({
+    send_lisp_gpe_fwd_entry_details(lfe, q, mp->context);
+  }));
+  /* *INDENT-ON* */
+}
+
+/*
+ * lisp_gpe_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_lisp_gpe;
+#undef _
+}
+
+static clib_error_t *
+lisp_gpe_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (lisp_gpe_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/lisp_gpe_error.def b/src/vnet/lisp-gpe/lisp_gpe_error.def
new file mode 100644
index 00000000..415fada7
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe_error.def
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+lisp_gpe_error (ENCAPSULATED, "good packets encapsulated")
+lisp_gpe_error (DECAPSULATED, "good packets decapsulated")
+lisp_gpe_error (NO_TUNNEL, "tunnel does not exist")
diff --git a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
new file mode 100644
index 00000000..26a93a87
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
@@ -0,0 +1,1053 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/lisp-gpe/lisp_gpe_fwd_entry.h>
+#include <vnet/lisp-gpe/lisp_gpe_adjacency.h>
+#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
+#include <vnet/lisp-cp/lisp_cp_dpo.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_path_list.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/dpo/drop_dpo.h>
+#include <vnet/dpo/lookup_dpo.h>
+#include <vnet/dpo/load_balance.h>
+#include <vnet/adj/adj_midchain.h>
+
+/**
+ * @brief Add route to IP4 or IP6 Destination FIB.
+ *
+ * Add a route to the destination FIB that results in the lookup
+ * in the SRC FIB. The SRC FIB is created is it does not yet exist.
+ *
+ * @param[in]   dst_table_id    Destination FIB Table-ID
+ * @param[in]   dst_prefix      Destination IP prefix.
+ *
+ * @return  src_fib_index   The index/ID of the SRC FIB created.
+ */
+static u32
+ip_dst_fib_add_route (u32 dst_fib_index, const ip_prefix_t * dst_prefix)
+{
+  fib_node_index_t src_fib_index;
+  fib_prefix_t dst_fib_prefix;
+  fib_node_index_t dst_fei;
+
+  ASSERT (NULL != dst_prefix);
+
+  ip_prefix_to_fib_prefix (dst_prefix, &dst_fib_prefix);
+
+  /*
+   * lookup the destination prefix in the VRF table and retrieve the
+   * LISP associated data
+   */
+  dst_fei = fib_table_lookup_exact_match (dst_fib_index, &dst_fib_prefix);
+
+  /*
+   * If the FIB entry is not present, or not LISP sourced, add it
+   */
+  if (dst_fei == FIB_NODE_INDEX_INVALID ||
+      NULL == fib_entry_get_source_data (dst_fei, FIB_SOURCE_LISP))
+    {
+      dpo_id_t src_lkup_dpo = DPO_INVALID;
+
+      /* create a new src FIB.  */
+      src_fib_index =
+	fib_table_create_and_lock (dst_fib_prefix.fp_proto,
+				   "LISP-src for [%d,%U]",
+				   dst_fib_index,
+				   format_fib_prefix, &dst_fib_prefix);
+      /*
+       * add src fib default route
+       */
+      fib_prefix_t prefix = {
+	.fp_proto = dst_fib_prefix.fp_proto,
+      };
+      fib_table_entry_special_dpo_add (src_fib_index, &prefix,
+				       FIB_SOURCE_LISP,
+				       FIB_ENTRY_FLAG_EXCLUSIVE,
+				       lisp_cp_dpo_get (fib_proto_to_dpo
+							(dst_fib_prefix.fp_proto)));
+      /*
+       * create a data-path object to perform the source address lookup
+       * in the SRC FIB
+       */
+      lookup_dpo_add_or_lock_w_fib_index (src_fib_index,
+					  (ip_prefix_version (dst_prefix) ==
+					   IP6 ? DPO_PROTO_IP6 :
+					   DPO_PROTO_IP4),
+					  LOOKUP_INPUT_SRC_ADDR,
+					  LOOKUP_TABLE_FROM_CONFIG,
+					  &src_lkup_dpo);
+
+      /*
+       * add the entry to the destination FIB that uses the lookup DPO
+       */
+      dst_fei = fib_table_entry_special_dpo_add (dst_fib_index,
+						 &dst_fib_prefix,
+						 FIB_SOURCE_LISP,
+						 FIB_ENTRY_FLAG_EXCLUSIVE,
+						 &src_lkup_dpo);
+
+      /*
+       * the DPO is locked by the FIB entry, and we have no further
+       * need for it.
+       */
+      dpo_unlock (&src_lkup_dpo);
+
+      /*
+       * save the SRC FIB index on the entry so we can retrieve it for
+       * subsequent routes.
+       */
+      fib_entry_set_source_data (dst_fei, FIB_SOURCE_LISP, &src_fib_index);
+    }
+  else
+    {
+      /*
+       * destination FIB entry already present
+       */
+      src_fib_index = *(u32 *) fib_entry_get_source_data (dst_fei,
+							  FIB_SOURCE_LISP);
+    }
+
+  return (src_fib_index);
+}
+
+/**
+ * @brief Del route to IP4 or IP6 SD FIB.
+ *
+ * Remove routes from both destination and source FIBs.
+ *
+ * @param[in]   src_fib_index   The index/ID of the SRC FIB
+ * @param[in]   src_prefix      Source IP prefix.
+ * @param[in]   dst_fib_index   The index/ID of the DST FIB
+ * @param[in]   dst_prefix      Destination IP prefix.
+ */
+static void
+ip_src_dst_fib_del_route (u32 src_fib_index,
+			  const ip_prefix_t * src_prefix,
+			  u32 dst_fib_index, const ip_prefix_t * dst_prefix)
+{
+  fib_prefix_t dst_fib_prefix, src_fib_prefix;
+  u8 have_default = 0;
+  u32 n_entries;
+
+  ASSERT (NULL != dst_prefix);
+  ASSERT (NULL != src_prefix);
+
+  ip_prefix_to_fib_prefix (dst_prefix, &dst_fib_prefix);
+  ip_prefix_to_fib_prefix (src_prefix, &src_fib_prefix);
+
+  fib_table_entry_delete (src_fib_index, &src_fib_prefix, FIB_SOURCE_LISP);
+
+  /* check if only default left or empty */
+  fib_prefix_t default_pref = {
+    .fp_proto = dst_fib_prefix.fp_proto
+  };
+
+  if (fib_table_lookup_exact_match (src_fib_index,
+				    &default_pref) != FIB_NODE_INDEX_INVALID)
+    have_default = 1;
+
+  n_entries = fib_table_get_num_entries (src_fib_index,
+					 src_fib_prefix.fp_proto,
+					 FIB_SOURCE_LISP);
+  if (n_entries == 0 || (have_default && n_entries == 1))
+    {
+      /*
+       * remove src FIB default route
+       */
+      if (have_default)
+	fib_table_entry_special_remove (src_fib_index, &default_pref,
+					FIB_SOURCE_LISP);
+
+      /*
+       * there's nothing left now, unlock the source FIB and the
+       * destination route
+       */
+      fib_table_entry_special_remove (dst_fib_index,
+				      &dst_fib_prefix, FIB_SOURCE_LISP);
+      fib_table_unlock (src_fib_index, src_fib_prefix.fp_proto);
+    }
+}
+
+/**
+ * @brief Add route to IP4 or IP6 SRC FIB.
+ *
+ * Adds a route to in the LISP SRC FIB with the result of the route
+ * being the DPO passed.
+ *
+ * @param[in]   src_fib_index   The index/ID of the SRC FIB
+ * @param[in]   src_prefix      Source IP prefix.
+ * @param[in]   src_dpo         The DPO the route will link to.
+ */
+static void
+ip_src_fib_add_route_w_dpo (u32 src_fib_index,
+			    const ip_prefix_t * src_prefix,
+			    const dpo_id_t * src_dpo)
+{
+  fib_prefix_t src_fib_prefix;
+
+  ip_prefix_to_fib_prefix (src_prefix, &src_fib_prefix);
+
+  /*
+   * add the entry into the source fib.
+   */
+  fib_node_index_t src_fei;
+
+  src_fei = fib_table_lookup_exact_match (src_fib_index, &src_fib_prefix);
+
+  if (FIB_NODE_INDEX_INVALID == src_fei ||
+      !fib_entry_is_sourced (src_fei, FIB_SOURCE_LISP))
+    {
+      fib_table_entry_special_dpo_add (src_fib_index,
+				       &src_fib_prefix,
+				       FIB_SOURCE_LISP,
+				       FIB_ENTRY_FLAG_EXCLUSIVE, src_dpo);
+    }
+}
+
+static fib_route_path_t *
+lisp_gpe_mk_fib_paths (const lisp_fwd_path_t * paths)
+{
+  const lisp_gpe_adjacency_t *ladj;
+  fib_route_path_t *rpaths = NULL;
+  u8 best_priority;
+  u32 ii;
+
+  vec_validate (rpaths, vec_len (paths) - 1);
+
+  best_priority = paths[0].priority;
+
+  vec_foreach_index (ii, paths)
+  {
+    if (paths[0].priority != best_priority)
+      break;
+
+    ladj = lisp_gpe_adjacency_get (paths[ii].lisp_adj);
+
+    ip_address_to_46 (&ladj->remote_rloc,
+		      &rpaths[ii].frp_addr, &rpaths[ii].frp_proto);
+
+    rpaths[ii].frp_sw_if_index = ladj->sw_if_index;
+    rpaths[ii].frp_weight = (paths[ii].weight ? paths[ii].weight : 1);
+  }
+
+  ASSERT (0 != vec_len (rpaths));
+
+  return (rpaths);
+}
+
+/**
+ * @brief Add route to IP4 or IP6 SRC FIB.
+ *
+ * Adds a route to in the LISP SRC FIB for the tunnel.
+ *
+ * @param[in]   src_fib_index   The index/ID of the SRC FIB
+ * @param[in]   src_prefix      Source IP prefix.
+ * @param[in]   paths           The paths from which to construct the
+ *                              load balance
+ */
+static void
+ip_src_fib_add_route (u32 src_fib_index,
+		      const ip_prefix_t * src_prefix,
+		      const lisp_fwd_path_t * paths)
+{
+  fib_prefix_t src_fib_prefix;
+  fib_route_path_t *rpaths;
+
+  ip_prefix_to_fib_prefix (src_prefix, &src_fib_prefix);
+
+  rpaths = lisp_gpe_mk_fib_paths (paths);
+
+  fib_table_entry_update (src_fib_index,
+			  &src_fib_prefix,
+			  FIB_SOURCE_LISP, FIB_ENTRY_FLAG_NONE, rpaths);
+  vec_free (rpaths);
+}
+
+
+static void
+create_fib_entries (lisp_gpe_fwd_entry_t * lfe)
+{
+  dpo_proto_t dproto;
+
+  dproto = (ip_prefix_version (&lfe->key->rmt.ippref) == IP4 ?
+	    DPO_PROTO_IP4 : DPO_PROTO_IP6);
+
+  lfe->src_fib_index = ip_dst_fib_add_route (lfe->eid_fib_index,
+					     &lfe->key->rmt.ippref);
+
+  if (LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE == lfe->type)
+    {
+      dpo_id_t dpo = DPO_INVALID;
+
+      switch (lfe->action)
+	{
+	case LISP_NO_ACTION:
+	  /* TODO update timers? */
+	case LISP_FORWARD_NATIVE:
+	  /* TODO check if route/next-hop for eid exists in fib and add
+	   * more specific for the eid with the next-hop found */
+	case LISP_SEND_MAP_REQUEST:
+	  /* insert tunnel that always sends map-request */
+	  dpo_copy (&dpo, lisp_cp_dpo_get (dproto));
+	  break;
+	case LISP_DROP:
+	  /* for drop fwd entries, just add route, no need to add encap tunnel */
+	  dpo_copy (&dpo, drop_dpo_get (dproto));
+	  break;
+	}
+      ip_src_fib_add_route_w_dpo (lfe->src_fib_index,
+				  &lfe->key->lcl.ippref, &dpo);
+      dpo_reset (&dpo);
+    }
+  else
+    {
+      ip_src_fib_add_route (lfe->src_fib_index,
+			    &lfe->key->lcl.ippref, lfe->paths);
+    }
+}
+
+static void
+delete_fib_entries (lisp_gpe_fwd_entry_t * lfe)
+{
+  ip_src_dst_fib_del_route (lfe->src_fib_index,
+			    &lfe->key->lcl.ippref,
+			    lfe->eid_fib_index, &lfe->key->rmt.ippref);
+}
+
+static void
+gid_to_dp_address (gid_address_t * g, dp_address_t * d)
+{
+  switch (gid_address_type (g))
+    {
+    case GID_ADDR_IP_PREFIX:
+    case GID_ADDR_SRC_DST:
+      ip_prefix_copy (&d->ippref, &gid_address_ippref (g));
+      d->type = FID_ADDR_IP_PREF;
+      break;
+    case GID_ADDR_MAC:
+    default:
+      mac_copy (&d->mac, &gid_address_mac (g));
+      d->type = FID_ADDR_MAC;
+      break;
+    }
+}
+
+static lisp_gpe_fwd_entry_t *
+find_fwd_entry (lisp_gpe_main_t * lgm,
+		vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
+		lisp_gpe_fwd_entry_key_t * key)
+{
+  uword *p;
+
+  memset (key, 0, sizeof (*key));
+
+  if (GID_ADDR_IP_PREFIX == gid_address_type (&a->rmt_eid))
+    {
+      /*
+       * the ip version of the source is not set to ip6 when the
+       * source is all zeros. force it.
+       */
+      ip_prefix_version (&gid_address_ippref (&a->lcl_eid)) =
+	ip_prefix_version (&gid_address_ippref (&a->rmt_eid));
+    }
+
+  gid_to_dp_address (&a->rmt_eid, &key->rmt);
+  gid_to_dp_address (&a->lcl_eid, &key->lcl);
+  key->vni = a->vni;
+
+  p = hash_get_mem (lgm->lisp_gpe_fwd_entries, key);
+
+  if (NULL != p)
+    {
+      return (pool_elt_at_index (lgm->lisp_fwd_entry_pool, p[0]));
+    }
+  return (NULL);
+}
+
+static int
+lisp_gpe_fwd_entry_path_sort (void *a1, void *a2)
+{
+  lisp_fwd_path_t *p1 = a1, *p2 = a2;
+
+  return (p1->priority - p2->priority);
+}
+
+static void
+lisp_gpe_fwd_entry_mk_paths (lisp_gpe_fwd_entry_t * lfe,
+			     vnet_lisp_gpe_add_del_fwd_entry_args_t * a)
+{
+  lisp_fwd_path_t *path;
+  u32 index;
+
+  vec_validate (lfe->paths, vec_len (a->locator_pairs) - 1);
+
+  vec_foreach_index (index, a->locator_pairs)
+  {
+    path = &lfe->paths[index];
+
+    path->priority = a->locator_pairs[index].priority;
+    path->weight = a->locator_pairs[index].weight;
+
+    path->lisp_adj =
+      lisp_gpe_adjacency_find_or_create_and_lock (&a->locator_pairs
+						  [index],
+						  a->dp_table, lfe->key->vni);
+  }
+  vec_sort_with_function (lfe->paths, lisp_gpe_fwd_entry_path_sort);
+}
+
+/**
+ * @brief Add/Delete LISP IP forwarding entry.
+ *
+ * creation of forwarding entries for IP LISP overlay:
+ *
+ * @param[in]   lgm     Reference to @ref lisp_gpe_main_t.
+ * @param[in]   a       Parameters for building the forwarding entry.
+ *
+ * @return 0 on success.
+ */
+static int
+add_ip_fwd_entry (lisp_gpe_main_t * lgm,
+		  vnet_lisp_gpe_add_del_fwd_entry_args_t * a)
+{
+  lisp_gpe_fwd_entry_key_t key;
+  lisp_gpe_fwd_entry_t *lfe;
+  fib_protocol_t fproto;
+
+  lfe = find_fwd_entry (lgm, a, &key);
+
+  if (NULL != lfe)
+    /* don't support updates */
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  pool_get (lgm->lisp_fwd_entry_pool, lfe);
+  memset (lfe, 0, sizeof (*lfe));
+  lfe->key = clib_mem_alloc (sizeof (key));
+  memcpy (lfe->key, &key, sizeof (key));
+
+  hash_set_mem (lgm->lisp_gpe_fwd_entries, lfe->key,
+		lfe - lgm->lisp_fwd_entry_pool);
+
+  fproto = (IP4 == ip_prefix_version (&fid_addr_ippref (&lfe->key->rmt)) ?
+	    FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6);
+
+  lfe->type = (a->is_negative ?
+	       LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE :
+	       LISP_GPE_FWD_ENTRY_TYPE_NORMAL);
+  lfe->tenant = lisp_gpe_tenant_find_or_create (lfe->key->vni);
+  lfe->eid_table_id = a->table_id;
+  lfe->eid_fib_index = fib_table_find_or_create_and_lock (fproto,
+							  lfe->eid_table_id);
+
+  if (LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE != lfe->type)
+    {
+      lisp_gpe_fwd_entry_mk_paths (lfe, a);
+    }
+
+  create_fib_entries (lfe);
+
+  return (0);
+}
+
+static void
+del_ip_fwd_entry_i (lisp_gpe_main_t * lgm, lisp_gpe_fwd_entry_t * lfe)
+{
+  lisp_fwd_path_t *path;
+  fib_protocol_t fproto;
+
+  vec_foreach (path, lfe->paths)
+  {
+    lisp_gpe_adjacency_unlock (path->lisp_adj);
+  }
+
+  delete_fib_entries (lfe);
+
+  fproto = (IP4 == ip_prefix_version (&fid_addr_ippref (&lfe->key->rmt)) ?
+	    FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6);
+  fib_table_unlock (lfe->eid_fib_index, fproto);
+
+  hash_unset_mem (lgm->lisp_gpe_fwd_entries, lfe->key);
+  clib_mem_free (lfe->key);
+  pool_put (lgm->lisp_fwd_entry_pool, lfe);
+}
+
+/**
+ * @brief Add/Delete LISP IP forwarding entry.
+ *
+ * removal of forwarding entries for IP LISP overlay:
+ *
+ * @param[in]   lgm     Reference to @ref lisp_gpe_main_t.
+ * @param[in]   a       Parameters for building the forwarding entry.
+ *
+ * @return 0 on success.
+ */
+static int
+del_ip_fwd_entry (lisp_gpe_main_t * lgm,
+		  vnet_lisp_gpe_add_del_fwd_entry_args_t * a)
+{
+  lisp_gpe_fwd_entry_key_t key;
+  lisp_gpe_fwd_entry_t *lfe;
+
+  lfe = find_fwd_entry (lgm, a, &key);
+
+  if (NULL == lfe)
+    /* no such entry */
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  del_ip_fwd_entry_i (lgm, lfe);
+
+  return (0);
+}
+
+static void
+make_mac_fib_key (BVT (clib_bihash_kv) * kv, u16 bd_index, u8 src_mac[6],
+		  u8 dst_mac[6])
+{
+  kv->key[0] = (((u64) bd_index) << 48) | mac_to_u64 (dst_mac);
+  kv->key[1] = mac_to_u64 (src_mac);
+  kv->key[2] = 0;
+}
+
+/**
+ * @brief Lookup L2 SD FIB entry
+ *
+ * Does a vni + dest + source lookup in the L2 LISP FIB. If the lookup fails
+ * it tries a second time with source set to 0 (i.e., a simple dest lookup).
+ *
+ * @param[in]   lgm             Reference to @ref lisp_gpe_main_t.
+ * @param[in]   bd_index        Bridge domain index.
+ * @param[in]   src_mac         Source mac address.
+ * @param[in]   dst_mac         Destination mac address.
+ *
+ * @return index of mapping matching the lookup key.
+ */
+index_t
+lisp_l2_fib_lookup (lisp_gpe_main_t * lgm, u16 bd_index, u8 src_mac[6],
+		    u8 dst_mac[6])
+{
+  int rv;
+  BVT (clib_bihash_kv) kv, value;
+
+  make_mac_fib_key (&kv, bd_index, src_mac, dst_mac);
+  rv = BV (clib_bihash_search_inline_2) (&lgm->l2_fib, &kv, &value);
+
+  /* no match, try with src 0, catch all for dst */
+  if (rv != 0)
+    {
+      kv.key[1] = 0;
+      rv = BV (clib_bihash_search_inline_2) (&lgm->l2_fib, &kv, &value);
+      if (rv == 0)
+	return value.value;
+    }
+  else
+    return value.value;
+
+  return lisp_gpe_main.l2_lb_cp_lkup.dpoi_index;
+}
+
+/**
+ * @brief Add/del L2 SD FIB entry
+ *
+ * Inserts value in L2 FIB keyed by vni + dest + source. If entry is
+ * overwritten the associated value is returned.
+ *
+ * @param[in]   lgm             Reference to @ref lisp_gpe_main_t.
+ * @param[in]   bd_index        Bridge domain index.
+ * @param[in]   src_mac         Source mac address.
+ * @param[in]   dst_mac         Destination mac address.
+ * @param[in]   val             Value to add.
+ * @param[in]   is_add          Add/del flag.
+ *
+ * @return ~0 or value of overwritten entry.
+ */
+static u32
+lisp_l2_fib_add_del_entry (u16 bd_index, u8 src_mac[6],
+			   u8 dst_mac[6], const dpo_id_t * dpo, u8 is_add)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  BVT (clib_bihash_kv) kv, value;
+  u32 old_val = ~0;
+
+  make_mac_fib_key (&kv, bd_index, src_mac, dst_mac);
+
+  if (BV (clib_bihash_search) (&lgm->l2_fib, &kv, &value) == 0)
+    old_val = value.value;
+
+  if (!is_add)
+    BV (clib_bihash_add_del) (&lgm->l2_fib, &kv, 0 /* is_add */ );
+  else
+    {
+      kv.value = dpo->dpoi_index;
+      BV (clib_bihash_add_del) (&lgm->l2_fib, &kv, 1 /* is_add */ );
+    }
+  return old_val;
+}
+
+#define L2_FIB_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
+#define L2_FIB_DEFAULT_HASH_MEMORY_SIZE (32<<20)
+
+static void
+l2_fib_init (lisp_gpe_main_t * lgm)
+{
+  index_t lbi;
+
+  BV (clib_bihash_init) (&lgm->l2_fib, "l2 fib",
+			 1 << max_log2 (L2_FIB_DEFAULT_HASH_NUM_BUCKETS),
+			 L2_FIB_DEFAULT_HASH_MEMORY_SIZE);
+
+  /*
+   * the result from a 'miss' in a L2 Table
+   */
+  lbi = load_balance_create (1, DPO_PROTO_ETHERNET, 0);
+  load_balance_set_bucket (lbi, 0, lisp_cp_dpo_get (DPO_PROTO_ETHERNET));
+
+  dpo_set (&lgm->l2_lb_cp_lkup, DPO_LOAD_BALANCE, DPO_PROTO_ETHERNET, lbi);
+}
+
+static void
+del_l2_fwd_entry_i (lisp_gpe_main_t * lgm, lisp_gpe_fwd_entry_t * lfe)
+{
+  lisp_fwd_path_t *path;
+
+  if (LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE != lfe->type)
+    {
+      vec_foreach (path, lfe->paths)
+      {
+	lisp_gpe_adjacency_unlock (path->lisp_adj);
+      }
+      fib_path_list_child_remove (lfe->l2.path_list_index,
+				  lfe->l2.child_index);
+    }
+
+  lisp_l2_fib_add_del_entry (lfe->l2.eid_bd_index,
+			     fid_addr_mac (&lfe->key->lcl),
+			     fid_addr_mac (&lfe->key->rmt), NULL, 0);
+
+  hash_unset_mem (lgm->lisp_gpe_fwd_entries, lfe->key);
+  clib_mem_free (lfe->key);
+  pool_put (lgm->lisp_fwd_entry_pool, lfe);
+}
+
+/**
+ * @brief Delete LISP L2 forwarding entry.
+ *
+ * Coordinates the removal of forwarding entries for L2 LISP overlay:
+ *
+ * @param[in]   lgm     Reference to @ref lisp_gpe_main_t.
+ * @param[in]   a       Parameters for building the forwarding entry.
+ *
+ * @return 0 on success.
+ */
+static int
+del_l2_fwd_entry (lisp_gpe_main_t * lgm,
+		  vnet_lisp_gpe_add_del_fwd_entry_args_t * a)
+{
+  lisp_gpe_fwd_entry_key_t key;
+  lisp_gpe_fwd_entry_t *lfe;
+
+  lfe = find_fwd_entry (lgm, a, &key);
+
+  if (NULL == lfe)
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  del_l2_fwd_entry_i (lgm, lfe);
+
+  return (0);
+}
+
+/**
+ * @brief Construct and insert the forwarding information used by a L2 entry
+ */
+static void
+lisp_gpe_l2_update_fwding (lisp_gpe_fwd_entry_t * lfe)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  dpo_id_t dpo = DPO_INVALID;
+
+  if (LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE != lfe->type)
+    {
+      fib_path_list_contribute_forwarding (lfe->l2.path_list_index,
+					   FIB_FORW_CHAIN_TYPE_ETHERNET,
+					   &lfe->l2.dpo);
+      dpo_copy (&dpo, &lfe->l2.dpo);
+    }
+  else
+    {
+      dpo_copy (&dpo, &lgm->l2_lb_cp_lkup);
+    }
+
+  /* add entry to l2 lisp fib */
+  lisp_l2_fib_add_del_entry (lfe->l2.eid_bd_index,
+			     fid_addr_mac (&lfe->key->lcl),
+			     fid_addr_mac (&lfe->key->rmt), &dpo, 1);
+
+  dpo_reset (&dpo);
+}
+
+/**
+ * @brief Add LISP L2 forwarding entry.
+ *
+ * Coordinates the creation of forwarding entries for L2 LISP overlay:
+ * creates lisp-gpe tunnel and injects new entry in Source/Dest L2 FIB.
+ *
+ * @param[in]   lgm     Reference to @ref lisp_gpe_main_t.
+ * @param[in]   a       Parameters for building the forwarding entry.
+ *
+ * @return 0 on success.
+ */
+static int
+add_l2_fwd_entry (lisp_gpe_main_t * lgm,
+		  vnet_lisp_gpe_add_del_fwd_entry_args_t * a)
+{
+  lisp_gpe_fwd_entry_key_t key;
+  bd_main_t *bdm = &bd_main;
+  lisp_gpe_fwd_entry_t *lfe;
+  uword *bd_indexp;
+
+  bd_indexp = hash_get (bdm->bd_index_by_bd_id, a->bd_id);
+  if (!bd_indexp)
+    {
+      clib_warning ("bridge domain %d doesn't exist", a->bd_id);
+      return -1;
+    }
+
+  lfe = find_fwd_entry (lgm, a, &key);
+
+  if (NULL != lfe)
+    /* don't support updates */
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  pool_get (lgm->lisp_fwd_entry_pool, lfe);
+  memset (lfe, 0, sizeof (*lfe));
+  lfe->key = clib_mem_alloc (sizeof (key));
+  memcpy (lfe->key, &key, sizeof (key));
+
+  hash_set_mem (lgm->lisp_gpe_fwd_entries, lfe->key,
+		lfe - lgm->lisp_fwd_entry_pool);
+
+  lfe->type = (a->is_negative ?
+	       LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE :
+	       LISP_GPE_FWD_ENTRY_TYPE_NORMAL);
+  lfe->l2.eid_bd_id = a->bd_id;
+  lfe->l2.eid_bd_index = bd_indexp[0];
+  lfe->tenant = lisp_gpe_tenant_find_or_create (lfe->key->vni);
+
+  if (LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE != lfe->type)
+    {
+      fib_route_path_t *rpaths;
+
+      /*
+       * Make the sorted array of LISP paths with their resp. adjacency
+       */
+      lisp_gpe_fwd_entry_mk_paths (lfe, a);
+
+      /*
+       * From the LISP paths, construct a FIB path list that will
+       * contribute a load-balance.
+       */
+      rpaths = lisp_gpe_mk_fib_paths (lfe->paths);
+
+      lfe->l2.path_list_index =
+	fib_path_list_create (FIB_PATH_LIST_FLAG_NONE, rpaths);
+
+      /*
+       * become a child of the path-list so we receive updates when
+       * its forwarding state changes. this includes an implicit lock.
+       */
+      lfe->l2.child_index =
+	fib_path_list_child_add (lfe->l2.path_list_index,
+				 FIB_NODE_TYPE_LISP_GPE_FWD_ENTRY,
+				 lfe - lgm->lisp_fwd_entry_pool);
+    }
+  else
+    {
+      lfe->action = a->action;
+    }
+
+  lisp_gpe_l2_update_fwding (lfe);
+
+  return 0;
+}
+
+/**
+ * @brief conver from the embedded fib_node_t struct to the LSIP entry
+ */
+static lisp_gpe_fwd_entry_t *
+lisp_gpe_fwd_entry_from_fib_node (fib_node_t * node)
+{
+  return ((lisp_gpe_fwd_entry_t *) (((char *) node) -
+				    STRUCT_OFFSET_OF (lisp_gpe_fwd_entry_t,
+						      node)));
+}
+
+/**
+ * @brief Function invoked during a backwalk of the FIB graph
+ */
+static fib_node_back_walk_rc_t
+lisp_gpe_fib_node_back_walk (fib_node_t * node,
+			     fib_node_back_walk_ctx_t * ctx)
+{
+  lisp_gpe_l2_update_fwding (lisp_gpe_fwd_entry_from_fib_node (node));
+
+  return (FIB_NODE_BACK_WALK_CONTINUE);
+}
+
+/**
+ * @brief Get a fib_node_t struct from the index of a LISP fwd entry
+ */
+static fib_node_t *
+lisp_gpe_fwd_entry_get_fib_node (fib_node_index_t index)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  lisp_gpe_fwd_entry_t *lfe;
+
+  lfe = pool_elt_at_index (lgm->lisp_fwd_entry_pool, index);
+
+  return (&(lfe->node));
+}
+
+/**
+ * @brief An indication from the graph that the last lock has gone
+ */
+static void
+lisp_gpe_fwd_entry_fib_node_last_lock_gone (fib_node_t * node)
+{
+  /* We don't manage the locks of the LISP objects via the graph, since
+   * this object has no children. so this is a no-op. */
+}
+
+/**
+ * @brief Virtual function table to register with FIB for the LISP type
+ */
+const static fib_node_vft_t lisp_fwd_vft = {
+  .fnv_get = lisp_gpe_fwd_entry_get_fib_node,
+  .fnv_last_lock = lisp_gpe_fwd_entry_fib_node_last_lock_gone,
+  .fnv_back_walk = lisp_gpe_fib_node_back_walk,
+};
+
+/**
+ * @brief Forwarding entry create/remove dispatcher.
+ *
+ * Calls l2 or l3 forwarding entry add/del function based on input data.
+ *
+ * @param[in]   a       Forwarding entry parameters.
+ * @param[out]  hw_if_indexp    NOT USED
+ *
+ * @return 0 on success.
+ */
+int
+vnet_lisp_gpe_add_del_fwd_entry (vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
+				 u32 * hw_if_indexp)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  u8 type;
+
+  if (vnet_lisp_gpe_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  type = gid_address_type (&a->rmt_eid);
+  switch (type)
+    {
+    case GID_ADDR_IP_PREFIX:
+      if (a->is_add)
+	return add_ip_fwd_entry (lgm, a);
+      else
+	return del_ip_fwd_entry (lgm, a);
+      break;
+    case GID_ADDR_MAC:
+      if (a->is_add)
+	return add_l2_fwd_entry (lgm, a);
+      else
+	return del_l2_fwd_entry (lgm, a);
+    default:
+      clib_warning ("Forwarding entries for type %d not supported!", type);
+      return -1;
+    }
+}
+
+/**
+ * @brief Flush all the forwrding entries
+ */
+void
+vnet_lisp_gpe_fwd_entry_flush (void)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  lisp_gpe_fwd_entry_t *lfe;
+
+  /* *INDENT-OFF* */
+  pool_foreach (lfe, lgm->lisp_fwd_entry_pool,
+  ({
+    switch (fid_addr_type(&lfe->key->rmt))
+      {
+      case FID_ADDR_MAC:
+	del_l2_fwd_entry_i (lgm, lfe);
+	break;
+      case FID_ADDR_IP_PREF:
+	del_ip_fwd_entry_i (lgm, lfe);
+	break;
+      }
+  }));
+  /* *INDENT-ON* */
+}
+
+static u8 *
+format_lisp_fwd_path (u8 * s, va_list ap)
+{
+  lisp_fwd_path_t *lfp = va_arg (ap, lisp_fwd_path_t *);
+
+  s = format (s, "priority:%d weight:%d ", lfp->priority, lfp->weight);
+  s = format (s, "adj:[%U]\n",
+	      format_lisp_gpe_adjacency,
+	      lisp_gpe_adjacency_get (lfp->lisp_adj),
+	      LISP_GPE_ADJ_FORMAT_FLAG_NONE);
+
+  return (s);
+}
+
+typedef enum lisp_gpe_fwd_entry_format_flag_t_
+{
+  LISP_GPE_FWD_ENTRY_FORMAT_NONE = (0 << 0),
+  LISP_GPE_FWD_ENTRY_FORMAT_DETAIL = (1 << 1),
+} lisp_gpe_fwd_entry_format_flag_t;
+
+
+static u8 *
+format_lisp_gpe_fwd_entry (u8 * s, va_list ap)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  lisp_gpe_fwd_entry_t *lfe = va_arg (ap, lisp_gpe_fwd_entry_t *);
+  lisp_gpe_fwd_entry_format_flag_t flags =
+    va_arg (ap, lisp_gpe_fwd_entry_format_flag_t);
+
+  s = format (s, "VNI:%d VRF:%d EID: %U -> %U  [index:%d]",
+	      lfe->key->vni, lfe->eid_table_id,
+	      format_fid_address, &lfe->key->lcl,
+	      format_fid_address, &lfe->key->rmt,
+	      lfe - lgm->lisp_fwd_entry_pool);
+
+  if (LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE == lfe->type)
+    {
+      s = format (s, "\n Negative - action:%U",
+		  format_negative_mapping_action, lfe->action);
+    }
+  else
+    {
+      lisp_fwd_path_t *path;
+
+      s = format (s, "\n via:");
+      vec_foreach (path, lfe->paths)
+      {
+	s = format (s, "\n  %U", format_lisp_fwd_path, path);
+      }
+    }
+
+  if (flags & LISP_GPE_FWD_ENTRY_FORMAT_DETAIL)
+    {
+      switch (fid_addr_type (&lfe->key->rmt))
+	{
+	case FID_ADDR_MAC:
+	  s = format (s, " fib-path-list:%d\n", lfe->l2.path_list_index);
+	  s = format (s, " dpo:%U\n", format_dpo_id, &lfe->l2.dpo, 0);
+	  break;
+	case FID_ADDR_IP_PREF:
+	  break;
+	}
+    }
+
+  return (s);
+}
+
+static clib_error_t *
+lisp_gpe_fwd_entry_show (vlib_main_t * vm,
+			 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  lisp_gpe_fwd_entry_t *lfe;
+  index_t index;
+  u32 vni = ~0;
+
+  if (unformat (input, "vni %d", &vni))
+    ;
+  else if (unformat (input, "%d", &index))
+    {
+      if (!pool_is_free_index (lgm->lisp_fwd_entry_pool, index))
+	{
+	  lfe = pool_elt_at_index (lgm->lisp_fwd_entry_pool, index);
+
+	  vlib_cli_output (vm, "[%d@] %U",
+			   index,
+			   format_lisp_gpe_fwd_entry, lfe,
+			   LISP_GPE_FWD_ENTRY_FORMAT_DETAIL);
+	}
+      else
+	{
+	  vlib_cli_output (vm, "entry %d invalid", index);
+	}
+
+      return (NULL);
+    }
+
+  /* *INDENT-OFF* */
+  pool_foreach (lfe, lgm->lisp_fwd_entry_pool,
+  ({
+    if ((vni == ~0) ||
+	(lfe->key->vni == vni))
+      vlib_cli_output (vm, "%U", format_lisp_gpe_fwd_entry, lfe,
+		       LISP_GPE_FWD_ENTRY_FORMAT_NONE);
+  }));
+  /* *INDENT-ON* */
+
+  return (NULL);
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_gpe_fwd_entry_show_command, static) = {
+  .path = "show lisp gpe entry",
+  .short_help = "show lisp gpe entry vni <vni> vrf <vrf> [leid <leid>] reid <reid>",
+  .function = lisp_gpe_fwd_entry_show,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+lisp_gpe_fwd_entry_init (vlib_main_t * vm)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  clib_error_t *error = NULL;
+
+  if ((error = vlib_call_init_function (vm, lisp_cp_dpo_module_init)))
+    return (error);
+
+  l2_fib_init (lgm);
+
+  fib_node_register_type (FIB_NODE_TYPE_LISP_GPE_FWD_ENTRY, &lisp_fwd_vft);
+
+  return (error);
+}
+
+VLIB_INIT_FUNCTION (lisp_gpe_fwd_entry_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h
new file mode 100644
index 00000000..f7923671
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief LISP-GPE definitions.
+ */
+
+#ifndef __LISP_GPE_FWD_ENTRY_H__
+#define __LISP_GPE_FWD_ENTRY_H__
+
+#include <vnet/lisp-gpe/lisp_gpe.h>
+
+/**
+ * @brief A path on which to forward lisp traffic
+ */
+typedef struct lisp_fwd_path_t_
+{
+  /**
+   * The adjacency constructed for the locator pair
+   */
+  index_t lisp_adj;
+
+  /**
+   * Priority. Only the paths with the best priority will be installed in FIB
+   */
+  u8 priority;
+
+  /**
+   * [UE]CMP weigt for the path
+   */
+  u8 weight;
+
+} lisp_fwd_path_t;
+
+/**
+ * @brief A Forwarding entry can be 'normal' or 'negative'
+ * Negative implies we deliberately want to add a FIB entry for an EID
+ * that results in 'special' behaviour determined by an 'action'.
+ * @normal means send it down some tunnels.
+ */
+typedef enum lisp_gpe_fwd_entry_type_t_
+{
+  LISP_GPE_FWD_ENTRY_TYPE_NORMAL,
+  LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE,
+} lisp_gpe_fwd_entry_type_t;
+
+
+/**
+ * LISP-GPE fwd entry key
+ */
+typedef struct lisp_gpe_fwd_entry_key_t_
+{
+  dp_address_t rmt;
+  dp_address_t lcl;
+  u32 vni;
+} lisp_gpe_fwd_entry_key_t;
+
+/**
+ * @brief A LISP Forwarding Entry
+ *
+ * A forwarding entry is from a locai EID to a remote EID over a set of rloc pairs
+ */
+typedef struct lisp_gpe_fwd_entry_t_
+{
+  /**
+   * This object joins the FIB control plane graph to receive updates to
+   * for changes to the graph.
+   */
+  fib_node_t node;
+
+  /**
+   * The Entry's key: {lEID,r-EID,vni}
+   */
+  lisp_gpe_fwd_entry_key_t *key;
+
+  /**
+   * The forwarding entry type
+   */
+  lisp_gpe_fwd_entry_type_t type;
+
+  /**
+   * The tenant the entry belongs to
+   */
+  u32 tenant;
+
+  /**
+   * The VRF (in the case of L3) or Bridge-Domain (for L2) index
+   */
+  union
+  {
+    /**
+     * Fields relevant to an L2 entry
+     */
+    struct
+    {
+      /**
+       * The VRF ID
+       */
+      u32 eid_table_id;
+
+      /**
+       * The FIB index for the overlay, i.e. the FIB in which the EIDs
+       * are present
+       */
+      u32 eid_fib_index;
+      /**
+       * The SRC-FIB index for created for anding source-route entries
+       */
+      u32 src_fib_index;
+    };
+    /**
+     * Fields relevant to an L2 entry
+     */
+    struct
+    {
+      /**
+       * The Bridge-Domain (for L2) index
+       */
+      u32 eid_bd_id;
+
+      /**
+       * The Bridge-domain index for the overlay EIDs
+       */
+      u32 eid_bd_index;
+
+      /**
+       * The path-list created for the forwarding
+       */
+      fib_node_index_t path_list_index;
+
+      /**
+       * Child index of this entry on the path-list
+       */
+      u32 child_index;
+
+      /**
+       * The DPO used to forward
+       */
+      dpo_id_t dpo;
+    } l2;
+  };
+
+  union
+  {
+    /**
+     * @brief When the type is 'normal'
+     *        The RLOC pair that form the route's paths. i.e. where to send
+     *        packets for this route.
+     */
+    lisp_fwd_path_t *paths;
+
+    /**
+     * @brief When the type is negative. The action to take.
+     */
+    negative_fwd_actions_e action;
+  };
+} lisp_gpe_fwd_entry_t;
+
+extern int
+vnet_lisp_gpe_add_del_fwd_entry (vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
+				 u32 * hw_if_indexp);
+
+extern void vnet_lisp_gpe_fwd_entry_flush (void);
+
+extern u32 lisp_l2_fib_lookup (lisp_gpe_main_t * lgm,
+			       u16 bd_index, u8 src_mac[8], u8 dst_mac[8]);
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/lisp_gpe_packet.h b/src/vnet/lisp-gpe/lisp_gpe_packet.h
new file mode 100644
index 00000000..62ac9bd7
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe_packet.h
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ *  @file
+ *  @brief LISP-GPE packet header structure
+ *
+ */
+
+#ifndef included_lisp_gpe_packet_h
+#define included_lisp_gpe_packet_h
+
+/*
+ *   From draft-lewis-lisp-gpe-02.txt
+ *
+ *  0                   1                   2                   3
+ *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |N|L|E|V|I|P|R|O|Ver|      Reserved             | Next Protocol |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |                 Instance ID/Locator-Status-Bits               |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ *   N: The N-bit is the nonce-present bit.  When this bit is set to 1,
+ *     the low-order 24 bits of the first 32 bits of the LISP header
+ *     contain a Nonce.  See Section 6.3.1 for details.  Both N- and
+ *     V-bits MUST NOT be set in the same packet.  If they are, a
+ *     decapsulating ETR MUST treat the 'Nonce/Map-Version' field as
+ *     having a Nonce value present.
+ *
+ *  L: The L-bit is the 'Locator-Status-Bits' field enabled bit.  When
+ *     this bit is set to 1, the Locator-Status-Bits in the second
+ *     32 bits of the LISP header are in use.
+ *
+ *  E: The E-bit is the echo-nonce-request bit.  This bit MUST be ignored
+ *     and has no meaning when the N-bit is set to 0.  When the N-bit is
+ *     set to 1 and this bit is set to 1, an ITR is requesting that the
+ *     nonce value in the 'Nonce' field be echoed back in LISP-
+ *     encapsulated packets when the ITR is also an ETR.  See
+ *     Section 6.3.1 for details.
+ *
+ *  V: The V-bit is the Map-Version present bit.  When this bit is set to
+ *     1, the N-bit MUST be 0.  Refer to Section 6.6.3 for more details.
+ *
+ *  I: The I-bit is the Instance ID bit.  See Section 5.5 for more
+ *     details.  When this bit is set to 1, the 'Locator-Status-Bits'
+ *     field is reduced to 8 bits and the high-order 24 bits are used as
+ *     an Instance ID.  If the L-bit is set to 0, then the low-order
+ *     8 bits are transmitted as zero and ignored on receipt.
+ *
+ * P Bit:  Flag bit 5 is defined as the Next Protocol bit.  The P bit
+ *    MUST be set to 1 to indicate the presence of the 8 bit next
+ *    protocol field.
+ *
+ *    P = 0 indicates that the payload MUST conform to LISP as defined
+ *    in [RFC6830].
+ *
+ *    Flag bit 5 was chosen as the P bit because this flag bit is
+ *    currently unallocated in LISP [RFC6830].
+ *
+ *  O: Flag bit 7 is defined as the O bit.  When the O bit is set to 1, the
+ *  packet is an OAM packet and OAM processing MUST occur.  The OAM
+ *  protocol details are out of scope for this document.  As with the
+ *  P-bit, bit 7 is currently a reserved flag in [RFC6830].
+ *
+ * Next Protocol Field:  The lower 8 bits of the first word are used to
+ *    carry a next protocol.  This next protocol field contains the
+ *    protocol of the encapsulated payload packet.
+ *
+ *    LISP [RFC6830] uses the lower 16 bits of the first word for either
+ *    a nonce, an echo-nonce ([RFC6830]) or to support map-versioning
+ *    ([RFC6834]).  These are all optional capabilities that are
+ *    indicated by setting the N, E, and the V bit respectively.
+ *
+ *    To maintain the desired data plane compatibility, when the P bit
+ *    is set, the N, E, and V bits MUST be set to zero.
+ *
+ * A new protocol registry will be requested from IANA for the Next
+ * Protocol field.  This draft defines the following Next Protocol
+ * values:
+ *
+ *    0x1 : IPv4
+ *    0x2 : IPv6
+ *    0x3 : Ethernet
+ *    0x4: Network Service Header
+ */
+
+/** LISP-GPE header */
+typedef struct
+{
+  u8 flags;
+  u8 ver_res;
+  u8 res;
+  u8 next_protocol;
+  u32 iid;
+} lisp_gpe_header_t;
+
+#define foreach_lisp_gpe_flag_bit               \
+_(N, 0x80)                                      \
+_(L, 0x40)                                      \
+_(E, 0x20)                                      \
+_(V, 0x10)                                      \
+_(I, 0x08)                                      \
+_(P, 0x04)                                      \
+_(O, 0x01)
+
+typedef enum
+{
+#define _(n,v) LISP_GPE_FLAGS_##n = v,
+  foreach_lisp_gpe_flag_bit
+#undef _
+} vnet_lisp_gpe_flag_bit_t;
+
+#define LISP_GPE_VERSION 0x0
+
+#define LISP_GPE_NEXT_PROTOCOL_IP4 0x1
+#define LISP_GPE_NEXT_PROTOCOL_IP6 0x2
+#define LISP_GPE_NEXT_PROTOCOL_ETHERNET 0x3
+#define LISP_GPE_NEXT_PROTOCOL_NSH 0x4
+
+typedef enum
+{
+  LISP_GPE_NEXT_PROTO_IP4 = 1,
+  LISP_GPE_NEXT_PROTO_IP6,
+  LISP_GPE_NEXT_PROTO_ETHERNET,
+  LISP_GPE_NEXT_PROTO_NSH,
+  LISP_GPE_NEXT_PROTOS
+} lisp_gpe_next_protocol_e;
+
+#endif /* included_lisp_gpe_packet_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/lisp_gpe_sub_interface.c b/src/vnet/lisp-gpe/lisp_gpe_sub_interface.c
new file mode 100644
index 00000000..5b69bd15
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe_sub_interface.c
@@ -0,0 +1,278 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief LISP sub-interfaces.
+ *
+ */
+#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
+#include <vnet/lisp-gpe/lisp_gpe_sub_interface.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/interface.h>
+
+/**
+ * @brief Pool of all l3-sub-interfaces
+ */
+static lisp_gpe_sub_interface_t *lisp_gpe_sub_interface_pool;
+
+/**
+ * A DB of all LISP L3 sub-interfaces. The key is:{VNI,l-RLOC}
+ */
+static uword *lisp_gpe_sub_interfaces;
+
+/**
+ * A DB of all VNET L3 sub-interfaces. The key is:{VNI,l-RLOC}
+ * Used in the data-plane for interface lookup on decap.
+ */
+uword *lisp_gpe_sub_interfaces_sw_if_index;
+
+/**
+ * The next available sub-interface ID. FIXME
+ */
+static u32 lisp_gpe_sub_interface_id;
+
+
+static index_t
+lisp_gpe_sub_interface_db_find (const ip_address_t * lrloc, u32 vni)
+{
+  uword *p;
+
+  lisp_gpe_sub_interface_key_t key = {
+    .local_rloc = *lrloc,
+    .vni = clib_host_to_net_u32 (vni),
+  };
+
+  p = hash_get_mem (lisp_gpe_sub_interfaces, &key);
+
+  if (NULL == p)
+    return (INDEX_INVALID);
+  else
+    return (p[0]);
+}
+
+static void
+lisp_gpe_sub_interface_db_insert (const lisp_gpe_sub_interface_t * l3s)
+{
+  hash_set_mem (lisp_gpe_sub_interfaces,
+		&l3s->key, l3s - lisp_gpe_sub_interface_pool);
+  hash_set_mem (lisp_gpe_sub_interfaces_sw_if_index,
+		&l3s->key, l3s->sw_if_index);
+}
+
+static void
+lisp_gpe_sub_interface_db_remove (const lisp_gpe_sub_interface_t * l3s)
+{
+  hash_unset_mem (lisp_gpe_sub_interfaces, &l3s->key);
+  hash_unset_mem (lisp_gpe_sub_interfaces_sw_if_index, &l3s->key);
+}
+
+lisp_gpe_sub_interface_t *
+lisp_gpe_sub_interface_get_i (index_t l3si)
+{
+  return (pool_elt_at_index (lisp_gpe_sub_interface_pool, l3si));
+}
+
+static void
+lisp_gpe_sub_interface_set_table (u32 sw_if_index, u32 table_id)
+{
+  fib_node_index_t fib_index;
+
+  fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, table_id);
+  ASSERT (FIB_NODE_INDEX_INVALID != fib_index);
+
+  vec_validate (ip4_main.fib_index_by_sw_if_index, sw_if_index);
+  ip4_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
+
+  fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, table_id);
+  ASSERT (FIB_NODE_INDEX_INVALID != fib_index);
+
+  vec_validate (ip6_main.fib_index_by_sw_if_index, sw_if_index);
+  ip6_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
+}
+
+static void
+lisp_gpe_sub_interface_unset_table (u32 sw_if_index, u32 table_id)
+{
+  ip4_main.fib_index_by_sw_if_index[sw_if_index] = 0;
+  ip4_sw_interface_enable_disable (sw_if_index, 0);
+
+  ip6_main.fib_index_by_sw_if_index[sw_if_index] = 0;
+  ip6_sw_interface_enable_disable (sw_if_index, 0);
+}
+
+index_t
+lisp_gpe_sub_interface_find_or_create_and_lock (const ip_address_t * lrloc,
+						u32 overlay_table_id, u32 vni)
+{
+  lisp_gpe_sub_interface_t *l3s;
+  index_t l3si;
+
+  l3si = lisp_gpe_sub_interface_db_find (lrloc, clib_host_to_net_u32 (vni));
+
+  if (INDEX_INVALID == l3si)
+    {
+      u32 main_sw_if_index, sub_sw_if_index;
+
+      /*
+       * find the main interface from the VNI
+       */
+      main_sw_if_index =
+	lisp_gpe_tenant_l3_iface_add_or_lock (vni, overlay_table_id);
+
+      vnet_sw_interface_t sub_itf_template = {
+	.type = VNET_SW_INTERFACE_TYPE_SUB,
+	.flood_class = VNET_FLOOD_CLASS_NORMAL,
+	.sup_sw_if_index = main_sw_if_index,
+	.sub.id = lisp_gpe_sub_interface_id++,
+      };
+
+      if (NULL != vnet_create_sw_interface (vnet_get_main (),
+					    &sub_itf_template,
+					    &sub_sw_if_index))
+	return (INDEX_INVALID);
+
+      pool_get (lisp_gpe_sub_interface_pool, l3s);
+      memset (l3s, 0, sizeof (*l3s));
+      l3s->key = clib_mem_alloc (sizeof (*l3s->key));
+      memset (l3s->key, 0, sizeof (*l3s->key));
+
+      l3s->key->local_rloc = *lrloc;
+      l3s->key->vni = clib_host_to_net_u32 (vni);
+      l3s->main_sw_if_index = main_sw_if_index;
+      l3s->sw_if_index = sub_sw_if_index;
+      l3s->eid_table_id = overlay_table_id;
+
+      l3si = (l3s - lisp_gpe_sub_interface_pool);
+
+      // FIXME. enable When we get an adj
+      ip6_sw_interface_enable_disable (l3s->sw_if_index, 1);
+      ip4_sw_interface_enable_disable (l3s->sw_if_index, 1);
+
+      vnet_sw_interface_set_flags (vnet_get_main (),
+				   l3s->sw_if_index,
+				   VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+
+      lisp_gpe_sub_interface_db_insert (l3s);
+    }
+  else
+    {
+      l3s = lisp_gpe_sub_interface_get_i (l3si);
+      l3s->eid_table_id = overlay_table_id;
+    }
+
+  lisp_gpe_sub_interface_set_table (l3s->sw_if_index, l3s->eid_table_id);
+  l3s->locks++;
+
+  return (l3si);
+}
+
+void
+lisp_gpe_sub_interface_unlock (index_t l3si)
+{
+  lisp_gpe_sub_interface_t *l3s;
+
+  l3s = lisp_gpe_sub_interface_get_i (l3si);
+
+  l3s->locks--;
+
+  if (0 == l3s->locks)
+    {
+      lisp_gpe_sub_interface_unset_table (l3s->sw_if_index,
+					  l3s->eid_table_id);
+
+      lisp_gpe_tenant_l3_iface_unlock (clib_net_to_host_u32 (l3s->key->vni));
+      vnet_sw_interface_set_flags (vnet_get_main (), l3s->sw_if_index, 0);
+      vnet_delete_sub_interface (l3s->sw_if_index);
+
+      lisp_gpe_sub_interface_db_remove (l3s);
+
+      clib_mem_free (l3s->key);
+      pool_put (lisp_gpe_sub_interface_pool, l3s);
+    }
+}
+
+const lisp_gpe_sub_interface_t *
+lisp_gpe_sub_interface_get (index_t l3si)
+{
+  return (lisp_gpe_sub_interface_get_i (l3si));
+}
+
+u8 *
+format_lisp_gpe_sub_interface (u8 * s, va_list ap)
+{
+  lisp_gpe_sub_interface_t *l3s = va_arg (ap, lisp_gpe_sub_interface_t *);
+  vnet_main_t *vnm = vnet_get_main ();
+
+  s = format (s, "%=16U",
+	      format_vnet_sw_interface_name,
+	      vnm, vnet_get_sw_interface (vnm, l3s->sw_if_index));
+  s = format (s, "%=10d", clib_net_to_host_u32 (l3s->key->vni));
+  s = format (s, "%=12d", l3s->sw_if_index);
+  s = format (s, "%U", format_ip_address, &l3s->key->local_rloc);
+
+  return (s);
+}
+
+/** CLI command to show LISP-GPE interfaces. */
+static clib_error_t *
+lisp_gpe_sub_interface_show (vlib_main_t * vm,
+			     unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  lisp_gpe_sub_interface_t *l3s;
+
+  vlib_cli_output (vm, "%=16s%=10s%=12s%s", "Name", "VNI", "SW IF Index",
+		   "local RLOC");
+
+  /* *INDENT-OFF* */
+  pool_foreach (l3s, lisp_gpe_sub_interface_pool,
+  ({
+    vlib_cli_output (vm, "%U", format_lisp_gpe_sub_interface, l3s);
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_gpe_sub_interface_command) = {
+  .path = "show lisp gpe sub-interface",
+  .short_help = "show lisp gpe sub-interface",
+  .function = lisp_gpe_sub_interface_show,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+lisp_gpe_sub_interface_module_init (vlib_main_t * vm)
+{
+  lisp_gpe_sub_interfaces =
+    hash_create_mem (0,
+		     sizeof (lisp_gpe_sub_interface_key_t), sizeof (uword));
+  lisp_gpe_sub_interfaces_sw_if_index =
+    hash_create_mem (0,
+		     sizeof (lisp_gpe_sub_interface_key_t), sizeof (uword));
+
+  return (NULL);
+}
+
+VLIB_INIT_FUNCTION (lisp_gpe_sub_interface_module_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/lisp_gpe_sub_interface.h b/src/vnet/lisp-gpe/lisp_gpe_sub_interface.h
new file mode 100644
index 00000000..ad942f41
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe_sub_interface.h
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief LISP sub-interfaces.
+ *
+ */
+
+#ifndef __LISP_GPE_SUB_INTERFACE_H__
+#define __LISP_GPE_SUB_INTERFACE_H__
+
+#include <vnet/lisp-gpe/lisp_gpe.h>
+
+/**
+ * A Key for lookup in the L£ sub-interface DB
+ */
+typedef struct lisp_gpe_sub_interface_key_t_
+{
+    /**
+     * The local-RLOC. This is the interface's 'source' address.
+     */
+  ip_address_t local_rloc;
+
+    /**
+     * The VNI. In network byte order!
+     */
+  u32 vni;
+} lisp_gpe_sub_interface_key_t;
+
+/**
+ * @brief A LISP L3 sub-interface
+ *
+ * A LISP sub-interface is a multi-access interface, whose local address is a
+ * single local-RLOC. Adjacencies that form on this sub-interface, represent
+ * remote RLOCs.
+ * This is analogous to an ethernet interface.
+ * As with all interface types it can only be present in one VRF, hence a
+ * LISP sub-interface is per-local-rloc and per-VNI.
+ */
+typedef struct lisp_gpe_sub_interface_t_
+{
+  /**
+   * The interface's key inthe DB; rloc & vni;
+   * The key is allocated from the heap so it can be used in the hash-table.
+   * if it's part of the object, then it is subjet to realloc, which no-worky.
+   */
+  lisp_gpe_sub_interface_key_t *key;
+
+  /**
+   * The Table-ID in the overlay that this interface is bound to.
+   */
+  u32 eid_table_id;
+
+  /**
+   * A reference counting lock on the number of users of this interface.
+   * When this count drops to 0 the interface is deleted.
+   */
+  u32 locks;
+
+  /**
+   * The SW if index assigned to this sub-interface
+   */
+  u32 sw_if_index;
+
+  /**
+   * The SW IF index assigned to the main interface of which this is a sub.
+   */
+  u32 main_sw_if_index;
+} lisp_gpe_sub_interface_t;
+
+extern index_t lisp_gpe_sub_interface_find_or_create_and_lock (const
+							       ip_address_t *
+							       lrloc,
+							       u32
+							       eid_table_id,
+							       u32 vni);
+
+extern u8 *format_lisp_gpe_sub_interface (u8 * s, va_list ap);
+
+extern void lisp_gpe_sub_interface_unlock (index_t itf);
+
+extern const lisp_gpe_sub_interface_t *lisp_gpe_sub_interface_get (index_t
+								   itf);
+
+/**
+ * A DB of all L3 sub-interfaces. The key is:{VNI,l-RLOC}
+ */
+extern uword *lisp_gpe_sub_interfaces_sw_if_index;
+
+/**
+ * @brief
+ *  Get a VNET L3 interface matching the local-RLOC and VNI
+ *  Called from the data-plane
+ */
+always_inline u32
+lisp_gpe_sub_interface_find_ip6 (const ip6_address_t * addr, u32 vni)
+{
+  lisp_gpe_sub_interface_key_t key;
+  const uword *p;
+
+  key.local_rloc.ip.v6.as_u64[0] = addr->as_u64[0];
+  key.local_rloc.ip.v6.as_u64[1] = addr->as_u64[1];
+  key.local_rloc.version = IP6;
+  key.vni = vni;
+
+  p = hash_get_mem (&lisp_gpe_sub_interfaces_sw_if_index, &key);
+
+  if (NULL != p)
+    return p[0];
+
+  return (INDEX_INVALID);
+}
+
+/**
+ * @brief
+ *  Get a VNET L3 interface matching the local-RLOC and VNI
+ *  Called from the data-plane
+ */
+always_inline index_t
+lisp_gpe_sub_interface_find_ip4 (const ip4_address_t * addr, u32 vni)
+{
+  lisp_gpe_sub_interface_key_t key;
+  const uword *p;
+
+  key.local_rloc.ip.v4.as_u32 = addr->as_u32;
+  key.local_rloc.version = IP4;
+  key.vni = vni;
+
+  p = hash_get_mem (&lisp_gpe_sub_interfaces_sw_if_index, &key);
+
+  if (NULL != p)
+    return p[0];
+
+  return (INDEX_INVALID);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
+
+#endif
diff --git a/src/vnet/lisp-gpe/lisp_gpe_tenant.c b/src/vnet/lisp-gpe/lisp_gpe_tenant.c
new file mode 100644
index 00000000..6abb7731
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe_tenant.c
@@ -0,0 +1,330 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
+
+/**
+ * The pool of all tenants
+ */
+static lisp_gpe_tenant_t *lisp_gpe_tenant_pool;
+
+/**
+ * The hash table of all tenants: key:{VNI}.
+ */
+uword *lisp_gpe_tenant_db;
+
+static lisp_gpe_tenant_t *
+lisp_gpe_tenant_find (u32 vni)
+{
+  uword *p;
+
+  p = hash_get (lisp_gpe_tenant_db, vni);
+
+  if (NULL == p)
+    return (NULL);
+
+  return (pool_elt_at_index (lisp_gpe_tenant_pool, p[0]));
+}
+
+static lisp_gpe_tenant_t *
+lisp_gpe_tenant_find_or_create_i (u32 vni)
+{
+  lisp_gpe_tenant_t *lt;
+
+  lt = lisp_gpe_tenant_find (vni);
+
+  if (NULL == lt)
+    {
+      pool_get (lisp_gpe_tenant_pool, lt);
+      memset (lt, 0, sizeof (*lt));
+
+      lt->lt_vni = vni;
+      lt->lt_table_id = ~0;
+      lt->lt_bd_id = ~0;
+
+      hash_set (lisp_gpe_tenant_db, vni, lt - lisp_gpe_tenant_pool);
+    }
+
+  return (lt);
+}
+
+/**
+ * @brief Find or create a tenant for the given VNI
+ */
+u32
+lisp_gpe_tenant_find_or_create (u32 vni)
+{
+  lisp_gpe_tenant_t *lt;
+
+  lt = lisp_gpe_tenant_find (vni);
+
+  if (NULL == lt)
+    {
+      lt = lisp_gpe_tenant_find_or_create_i (vni);
+    }
+
+  return (lt - lisp_gpe_tenant_pool);
+}
+
+/**
+ * @brief If there are no more locks/users of te tenant, then delete it
+ */
+static void
+lisp_gpe_tenant_delete_if_empty (lisp_gpe_tenant_t * lt)
+{
+  int i;
+
+  for (i = 0; i < LISP_GPE_TENANT_LOCK_NUM; i++)
+    {
+      if (lt->lt_locks[i])
+	return;
+    }
+
+  hash_unset (lisp_gpe_tenant_db, lt->lt_vni);
+  pool_put (lisp_gpe_tenant_pool, lt);
+}
+
+/**
+ * @brief Add/create and lock a new or find and lock the existing L3
+ * interface for the tenant
+ *
+ * @paran vni The tenant's VNI
+ * @param table_id the Tenant's L3 table ID.
+ *
+ * @return the SW IF index of the L3 interface
+ */
+u32
+lisp_gpe_tenant_l3_iface_add_or_lock (u32 vni, u32 table_id)
+{
+  lisp_gpe_tenant_t *lt;
+
+  lt = lisp_gpe_tenant_find_or_create_i (vni);
+
+  if (~0 == lt->lt_table_id)
+    lt->lt_table_id = table_id;
+
+  ASSERT (lt->lt_table_id == table_id);
+
+  if (0 == lt->lt_locks[LISP_GPE_TENANT_LOCK_L3_IFACE])
+    {
+      /* create the l3 interface since there are currently no users of it */
+      lt->lt_l3_sw_if_index =
+	lisp_gpe_add_l3_iface (&lisp_gpe_main, vni, table_id);
+    }
+
+  lt->lt_locks[LISP_GPE_TENANT_LOCK_L3_IFACE]++;
+
+  return (lt->lt_l3_sw_if_index);
+}
+
+/**
+ * @brief Release the lock held on the tenant's L3 interface
+ */
+void
+lisp_gpe_tenant_l3_iface_unlock (u32 vni)
+{
+  lisp_gpe_tenant_t *lt;
+
+  lt = lisp_gpe_tenant_find (vni);
+
+  if (NULL == lt)
+    {
+      clib_warning ("No tenant for VNI %d", vni);
+      return;
+    }
+
+  if (0 == lt->lt_locks[LISP_GPE_TENANT_LOCK_L3_IFACE])
+    {
+      clib_warning ("No L3 interface for tenant VNI %d", vni);
+      return;
+    }
+
+  lt->lt_locks[LISP_GPE_TENANT_LOCK_L3_IFACE]--;
+
+  if (0 == lt->lt_locks[LISP_GPE_TENANT_LOCK_L3_IFACE])
+    {
+      /* the last user has gone, so delete the l3 interface */
+      lisp_gpe_del_l3_iface (&lisp_gpe_main, vni, lt->lt_table_id);
+    }
+
+  /*
+   * If there are no more locks on any tenant managed resource, then
+   * this tenant is toast.
+   */
+  lisp_gpe_tenant_delete_if_empty (lt);
+}
+
+/**
+ * @brief Add/create and lock a new or find and lock the existing L2
+ * interface for the tenant
+ *
+ * @paran vni The tenant's VNI
+ * @param table_id the Tenant's L2 Bridge Domain ID.
+ *
+ * @return the SW IF index of the L2 interface
+ */
+u32
+lisp_gpe_tenant_l2_iface_add_or_lock (u32 vni, u32 bd_id)
+{
+  lisp_gpe_tenant_t *lt;
+
+  lt = lisp_gpe_tenant_find_or_create_i (vni);
+
+  if (NULL == lt)
+    {
+      clib_warning ("No tenant for VNI %d", vni);
+      return ~0;
+    }
+
+  if (~0 == lt->lt_bd_id)
+    lt->lt_bd_id = bd_id;
+
+  ASSERT (lt->lt_bd_id == bd_id);
+
+  if (0 == lt->lt_locks[LISP_GPE_TENANT_LOCK_L2_IFACE])
+    {
+      /* create the l2 interface since there are currently no users of it */
+      lt->lt_l2_sw_if_index =
+	lisp_gpe_add_l2_iface (&lisp_gpe_main, vni, bd_id);
+    }
+
+  lt->lt_locks[LISP_GPE_TENANT_LOCK_L2_IFACE]++;
+
+  return (lt->lt_l2_sw_if_index);
+}
+
+/**
+ * @brief Release the lock held on the tenant's L3 interface
+ */
+void
+lisp_gpe_tenant_l2_iface_unlock (u32 vni)
+{
+  lisp_gpe_tenant_t *lt;
+
+  lt = lisp_gpe_tenant_find (vni);
+
+  if (NULL == lt)
+    {
+      clib_warning ("No tenant for VNI %d", vni);
+      return;
+    }
+
+  if (0 == lt->lt_locks[LISP_GPE_TENANT_LOCK_L2_IFACE])
+    {
+      clib_warning ("No L2 interface for tenant VNI %d", vni);
+      return;
+    }
+
+  lt->lt_locks[LISP_GPE_TENANT_LOCK_L2_IFACE]--;
+
+  if (0 == lt->lt_locks[LISP_GPE_TENANT_LOCK_L2_IFACE])
+    {
+      /* the last user has gone, so delete the l2 interface */
+      lisp_gpe_del_l2_iface (&lisp_gpe_main, vni, lt->lt_bd_id);
+    }
+
+  /*
+   * If there are no more locks on any tenant managed resource, then
+   * this tenant is toast.
+   */
+  lisp_gpe_tenant_delete_if_empty (lt);
+}
+
+/**
+ * @brief get a const pointer to the tenant object
+ */
+const lisp_gpe_tenant_t *
+lisp_gpe_tenant_get (u32 index)
+{
+  return (pool_elt_at_index (lisp_gpe_tenant_pool, index));
+}
+
+/**
+ * @brief Flush/delete ALL the tenants
+ */
+void
+lisp_gpe_tenant_flush (void)
+{
+  lisp_gpe_tenant_t *lt;
+
+  /* *INDENT-OFF* */
+  pool_foreach(lt, lisp_gpe_tenant_pool,
+  ({
+    lisp_gpe_tenant_l2_iface_unlock(lt->lt_vni);
+    lisp_gpe_tenant_l3_iface_unlock(lt->lt_vni);
+  }));
+  /* *INDENT-ON* */
+}
+
+/**
+ * @brif Show/display one tenant
+ */
+static u8 *
+format_lisp_gpe_tenant (u8 * s, va_list ap)
+{
+  const lisp_gpe_tenant_t *lt = va_arg (ap, lisp_gpe_tenant_t *);
+
+  s = format (s, "VNI:%d ", lt->lt_vni);
+
+  if (lt->lt_table_id != ~0)
+    {
+      s = format (s, "VRF:%d ", lt->lt_table_id);
+      s = format (s, "L3-SW-IF:%d ", lt->lt_l3_sw_if_index);
+    }
+
+  if (lt->lt_bd_id != ~0)
+    {
+      s = format (s, "BD-ID:%d ", lt->lt_bd_id);
+      s = format (s, "L2-SW-IF:%d ", lt->lt_l2_sw_if_index);
+    }
+
+  return (s);
+}
+
+/**
+ * @brief CLI command to show LISP-GPE tenant.
+ */
+static clib_error_t *
+lisp_gpe_tenant_show (vlib_main_t * vm,
+		      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  lisp_gpe_tenant_t *lt;
+
+  /* *INDENT-OFF* */
+  pool_foreach (lt, lisp_gpe_tenant_pool,
+  ({
+    vlib_cli_output (vm, "%U", format_lisp_gpe_tenant, lt);
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_gpe_tenant_command) = {
+  .path = "show lisp gpe tenant",
+  .short_help = "show lisp gpe tenant",
+  .function = lisp_gpe_tenant_show,
+};
+/* *INDENT-ON* */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/lisp_gpe_tenant.h b/src/vnet/lisp-gpe/lisp_gpe_tenant.h
new file mode 100644
index 00000000..5db7dde8
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe_tenant.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __LISP_GPE_TENANT_H__
+#define __LISP_GPE_TENANT_H__
+
+#include <vnet/lisp-gpe/lisp_gpe.h>
+
+/**
+ * Refernece counting lock types on the tenant.
+ * When all of these counters drop to zero, we no longer need the tenant.
+ */
+typedef enum lisp_gpe_tenant_lock_t_
+{
+  LISP_GPE_TENANT_LOCK_L2_IFACE,
+  LISP_GPE_TENANT_LOCK_L3_IFACE,
+  LISP_GPE_TENANT_LOCK_NUM,
+} lisp_gpe_tenant_lock_t;
+
+/**
+ * @brief Representation of the data associated with a LISP overlay tenant
+ *
+ * This object exists to manage the shared resources of the L2 and L3 interface
+ * of a given tenant.
+ */
+typedef struct lisp_gpe_tenant_t_
+{
+  /**
+   * The VNI is the identifier of the tenant
+   */
+  u32 lt_vni;
+
+  /**
+   * The tenant can have both L2 and L3 services enabled.
+   */
+  u32 lt_table_id;
+  u32 lt_bd_id;
+
+  /**
+   * The number of locks on the tenant's L3 interface.
+   */
+  u32 lt_locks[LISP_GPE_TENANT_LOCK_NUM];
+
+  /**
+   * The L3 SW interface index
+   */
+  u32 lt_l3_sw_if_index;
+
+  /**
+   * The L2 SW interface index
+   */
+  u32 lt_l2_sw_if_index;
+
+} lisp_gpe_tenant_t;
+
+extern u32 lisp_gpe_tenant_find_or_create (u32 vni);
+
+extern u32 lisp_gpe_tenant_l3_iface_add_or_lock (u32 vni, u32 vrf);
+extern void lisp_gpe_tenant_l3_iface_unlock (u32 vni);
+
+extern u32 lisp_gpe_tenant_l2_iface_add_or_lock (u32 vni, u32 vrf);
+extern void lisp_gpe_tenant_l2_iface_unlock (u32 vni);
+
+extern const lisp_gpe_tenant_t *lisp_gpe_tenant_get (u32 index);
+
+extern void lisp_gpe_tenant_flush (void);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
+
+#endif
diff --git a/src/vnet/lisp-gpe/lisp_gpe_tunnel.c b/src/vnet/lisp-gpe/lisp_gpe_tunnel.c
new file mode 100644
index 00000000..e4e59707
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe_tunnel.c
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief Common utility functions for IPv4, IPv6 and L2 LISP-GPE tunnels.
+ *
+ */
+#include <vnet/lisp-gpe/lisp_gpe.h>
+#include <vnet/lisp-gpe/lisp_gpe_tunnel.h>
+#include <vnet/lisp-gpe/lisp_gpe_adjacency.h>
+
+#include <vnet/fib/fib_table.h>
+
+/**
+ * @brief Pool of all LISP tunnels
+ */
+static lisp_gpe_tunnel_t *lisp_gpe_tunnel_pool;
+
+/**
+ * @brief a DB of all tunnels
+ */
+static uword *lisp_gpe_tunnel_db;
+
+/**
+ * @brief Compute IP-UDP-GPE sub-tunnel encap/rewrite header.
+ *
+ * @param[in]   t       Parent of the sub-tunnel.
+ * @param[in]   st      Sub-tunnel.
+ * @param[in]   lp      Local and remote locators used in the encap header.
+ *
+ * @return 0 on success.
+ */
+u8 *
+lisp_gpe_tunnel_build_rewrite (const lisp_gpe_tunnel_t * lgt,
+			       const lisp_gpe_adjacency_t * ladj,
+			       lisp_gpe_next_protocol_e payload_proto)
+{
+  lisp_gpe_header_t *lisp0;
+  u8 *rw = 0;
+  int len;
+
+  if (IP4 == ip_addr_version (&lgt->key->lcl))
+    {
+      ip4_udp_lisp_gpe_header_t *h0;
+      ip4_header_t *ip0;
+
+      len = sizeof (*h0);
+
+      vec_validate_aligned (rw, len - 1, CLIB_CACHE_LINE_BYTES);
+
+      h0 = (ip4_udp_lisp_gpe_header_t *) rw;
+
+      /* Fixed portion of the (outer) ip4 header */
+      ip0 = &h0->ip4;
+      ip0->ip_version_and_header_length = 0x45;
+      ip0->ttl = 254;
+      ip0->protocol = IP_PROTOCOL_UDP;
+
+      /* we fix up the ip4 header length and checksum after-the-fact */
+      ip_address_copy_addr (&ip0->src_address, &lgt->key->lcl);
+      ip_address_copy_addr (&ip0->dst_address, &lgt->key->rmt);
+      ip0->checksum = ip4_header_checksum (ip0);
+
+      /* UDP header, randomize src port on something, maybe? */
+      h0->udp.src_port = clib_host_to_net_u16 (4341);
+      h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_lisp_gpe);
+
+      /* LISP-gpe header */
+      lisp0 = &h0->lisp;
+    }
+  else
+    {
+      ip6_udp_lisp_gpe_header_t *h0;
+      ip6_header_t *ip0;
+
+      len = sizeof (*h0);
+
+      vec_validate_aligned (rw, len - 1, CLIB_CACHE_LINE_BYTES);
+
+      h0 = (ip6_udp_lisp_gpe_header_t *) rw;
+
+      /* Fixed portion of the (outer) ip6 header */
+      ip0 = &h0->ip6;
+      ip0->ip_version_traffic_class_and_flow_label =
+	clib_host_to_net_u32 (0x6 << 28);
+      ip0->hop_limit = 254;
+      ip0->protocol = IP_PROTOCOL_UDP;
+
+      /* we fix up the ip6 header length after-the-fact */
+      ip_address_copy_addr (&ip0->src_address, &lgt->key->lcl);
+      ip_address_copy_addr (&ip0->dst_address, &lgt->key->rmt);
+
+      /* UDP header, randomize src port on something, maybe? */
+      h0->udp.src_port = clib_host_to_net_u16 (4341);
+      h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_lisp_gpe);
+
+      /* LISP-gpe header */
+      lisp0 = &h0->lisp;
+    }
+
+  lisp0->flags = ladj->flags;
+  lisp0->ver_res = 0;
+  lisp0->res = 0;
+  lisp0->next_protocol = payload_proto;
+  lisp0->iid = clib_host_to_net_u32 (ladj->vni) >> 8;	/* first 24 bits only */
+
+  return (rw);
+}
+
+static lisp_gpe_tunnel_t *
+lisp_gpe_tunnel_db_find (const lisp_gpe_tunnel_key_t * key)
+{
+  uword *p;
+
+  p = hash_get_mem (lisp_gpe_tunnel_db, (void *) key);
+
+  if (NULL != p)
+    {
+      return (pool_elt_at_index (lisp_gpe_tunnel_pool, p[0]));
+    }
+  return (NULL);
+}
+
+lisp_gpe_tunnel_t *
+lisp_gpe_tunnel_get_i (index_t lgti)
+{
+  return (pool_elt_at_index (lisp_gpe_tunnel_pool, lgti));
+}
+
+index_t
+lisp_gpe_tunnel_find_or_create_and_lock (const locator_pair_t * pair,
+					 u32 rloc_fib_index)
+{
+  lisp_gpe_tunnel_key_t key = {
+    .lcl = pair->lcl_loc,
+    .rmt = pair->rmt_loc,
+    .fib_index = rloc_fib_index,
+  };
+  lisp_gpe_tunnel_t *lgt;
+  fib_prefix_t pfx;
+
+  lgt = lisp_gpe_tunnel_db_find (&key);
+
+  if (NULL == lgt)
+    {
+      pool_get (lisp_gpe_tunnel_pool, lgt);
+      memset (lgt, 0, sizeof (*lgt));
+
+      lgt->key = clib_mem_alloc (sizeof (*lgt->key));
+      memset (lgt->key, 0, sizeof (*lgt->key));
+
+      lgt->key->rmt = pair->rmt_loc;
+      lgt->key->lcl = pair->lcl_loc;
+      lgt->key->fib_index = rloc_fib_index;
+
+      /*
+       * source the FIB entry for the RLOC so we can track its forwarding
+       * chain
+       */
+      ip_address_to_fib_prefix (&lgt->key->rmt, &pfx);
+
+      lgt->fib_entry_index = fib_table_entry_special_add (rloc_fib_index,
+							  &pfx,
+							  FIB_SOURCE_RR,
+							  FIB_ENTRY_FLAG_NONE,
+							  ADJ_INDEX_INVALID);
+
+      hash_set_mem (lisp_gpe_tunnel_db, &lgt->key,
+		    (lgt - lisp_gpe_tunnel_pool));
+    }
+
+  lgt->locks++;
+
+  return (lgt - lisp_gpe_tunnel_pool);
+}
+
+void
+lisp_gpe_tunnel_unlock (index_t lgti)
+{
+  lisp_gpe_tunnel_t *lgt;
+
+  lgt = lisp_gpe_tunnel_get_i (lgti);
+  lgt->locks--;
+
+  if (0 == lgt->locks)
+    {
+      hash_unset_mem (lisp_gpe_tunnel_db, &lgt->key);
+      clib_mem_free (lgt->key);
+      pool_put (lisp_gpe_tunnel_pool, lgt);
+    }
+}
+
+const lisp_gpe_tunnel_t *
+lisp_gpe_tunnel_get (index_t lgti)
+{
+  return (lisp_gpe_tunnel_get_i (lgti));
+}
+
+/** Format LISP-GPE tunnel. */
+u8 *
+format_lisp_gpe_tunnel (u8 * s, va_list * args)
+{
+  lisp_gpe_tunnel_t *lgt = va_arg (*args, lisp_gpe_tunnel_t *);
+
+  s = format (s, "tunnel %d\n", lgt - lisp_gpe_tunnel_pool);
+  s = format (s, " fib-index: %d, locks:%d \n",
+	      lgt->key->fib_index, lgt->locks);
+  s = format (s, " lisp ver 0\n");
+
+  s = format (s, " locator-pair:\n");
+  s = format (s, "  local: %U remote: %U\n",
+	      format_ip_address, &lgt->key->lcl,
+	      format_ip_address, &lgt->key->rmt);
+  s = format (s, " RLOC FIB entry: %d\n", lgt->fib_entry_index);
+
+  return s;
+}
+
+/**
+ * CLI command to show LISP-GPE tunnels.
+ */
+static clib_error_t *
+show_lisp_gpe_tunnel_command_fn (vlib_main_t * vm,
+				 unformat_input_t * input,
+				 vlib_cli_command_t * cmd)
+{
+  lisp_gpe_tunnel_t *lgt;
+  index_t index;
+
+  if (pool_elts (lisp_gpe_tunnel_pool) == 0)
+    vlib_cli_output (vm, "No lisp-gpe tunnels configured...");
+
+  if (unformat (input, "%d", &index))
+    {
+      lgt = lisp_gpe_tunnel_get_i (index);
+      vlib_cli_output (vm, "%U", format_lisp_gpe_tunnel, lgt);
+    }
+  else
+    {
+      /* *INDENT-OFF* */
+      pool_foreach (lgt, lisp_gpe_tunnel_pool,
+      ({
+	vlib_cli_output (vm, "%U", format_lisp_gpe_tunnel, lgt);
+      }));
+      /* *INDENT-ON* */
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_lisp_gpe_tunnel_command, static) =
+{
+  .path = "show lisp gpe tunnel",
+  .function = show_lisp_gpe_tunnel_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+lisp_gpe_tunnel_module_init (vlib_main_t * vm)
+{
+  lisp_gpe_tunnel_db = hash_create_mem (0,
+					sizeof (lisp_gpe_tunnel_key_t),
+					sizeof (uword));
+
+  return (NULL);
+}
+
+VLIB_INIT_FUNCTION (lisp_gpe_tunnel_module_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/lisp_gpe_tunnel.h b/src/vnet/lisp-gpe/lisp_gpe_tunnel.h
new file mode 100644
index 00000000..333d2882
--- /dev/null
+++ b/src/vnet/lisp-gpe/lisp_gpe_tunnel.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief Common utility functions for IPv4, IPv6 and L2 LISP-GPE tunnels.
+ *
+ */
+
+#ifndef LISP_GPE_TUNNEL_H__
+#define LISP_GPE_TUNNEL_H__
+
+#include <vnet/lisp-gpe/lisp_gpe.h>
+#include <vnet/lisp-gpe/lisp_gpe_packet.h>
+
+/**
+ * Forward declaration
+ */
+struct lisp_gpe_adjacency_t_;
+
+/**
+ * A Key for a tunnel
+ */
+typedef struct lisp_gpe_tunnel_key_t_
+{
+  ip_address_t rmt;
+  ip_address_t lcl;
+  u32 fib_index;
+} lisp_gpe_tunnel_key_t;
+
+/**
+ * @brief A LISP GPE Tunnel.
+ *
+ * A tunnel represents an associatation between a local and remote RLOC.
+ * As such it represents a unique LISP rewrite.
+ */
+typedef struct lisp_gpe_tunnel_t_
+{
+  /**
+   * RLOC pair and rloc fib_index. This is the tunnel's key.
+   */
+  lisp_gpe_tunnel_key_t *key;
+
+  /**
+   * number of reference counting locks
+   */
+  u32 locks;
+
+  /**
+   * the FIB entry through which the remote rloc is reachable
+   s */
+  fib_node_index_t fib_entry_index;
+} lisp_gpe_tunnel_t;
+
+extern index_t lisp_gpe_tunnel_find_or_create_and_lock (const locator_pair_t *
+							pair,
+							u32 rloc_fib_index);
+
+extern void lisp_gpe_tunnel_unlock (index_t lgti);
+
+extern const lisp_gpe_tunnel_t *lisp_gpe_tunnel_get (index_t lgti);
+
+extern u8 *lisp_gpe_tunnel_build_rewrite (const lisp_gpe_tunnel_t * lgt,
+					  const struct lisp_gpe_adjacency_t_
+					  *ladj,
+					  lisp_gpe_next_protocol_e
+					  payload_proto);
+extern u8 *format_lisp_gpe_tunnel (u8 * s, va_list * args);
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lisp-gpe/rfc.txt b/src/vnet/lisp-gpe/rfc.txt
new file mode 100644
index 00000000..5e3da150
--- /dev/null
+++ b/src/vnet/lisp-gpe/rfc.txt
@@ -0,0 +1,826 @@
+Network Working Group                                           D. Lewis
+Internet-Draft                                       Cisco Systems, Inc.
+Intended status: Informational                                P. Agarwal
+Expires: January 5, 2015                                        Broadcom
+                                                              L. Kreeger
+                                                                F. Maino
+                                                                P. Quinn
+                                                                M. Smith
+                                                                N. Yadav
+                                                     Cisco Systems, Inc.
+                                                            July 4, 2014
+
+
+                    LISP Generic Protocol Extension
+                      draft-lewis-lisp-gpe-02.txt
+
+Abstract
+
+   This draft describes extending the Locator/ID Separation Protocol
+   (LISP) [RFC6830], via changes to the LISP header, with three new
+   capabilities: support for multi-protocol encapsulation, operations,
+   administration and management (OAM) signaling, and explicit
+   versioning.
+
+Status of this Memo
+
+   This Internet-Draft is submitted in full conformance with the
+   provisions of BCP 78 and BCP 79.
+
+   Internet-Drafts are working documents of the Internet Engineering
+   Task Force (IETF).  Note that other groups may also distribute
+   working documents as Internet-Drafts.  The list of current Internet-
+   Drafts is at http://datatracker.ietf.org/drafts/current/.
+
+   Internet-Drafts are draft documents valid for a maximum of six months
+   and may be updated, replaced, or obsoleted by other documents at any
+   time.  It is inappropriate to use Internet-Drafts as reference
+   material or to cite them other than as "work in progress."
+
+   This Internet-Draft will expire on January 5, 2015.
+
+Copyright Notice
+
+   Copyright (c) 2014 IETF Trust and the persons identified as the
+   document authors.  All rights reserved.
+
+   This document is subject to BCP 78 and the IETF Trust's Legal
+   Provisions Relating to IETF Documents
+
+
+
+Lewis, et al.            Expires January 5, 2015                [Page 1]
+
+Internet-Draft       LISP Generic Protocol Extension           July 2014
+
+
+   (http://trustee.ietf.org/license-info) in effect on the date of
+   publication of this document.  Please review these documents
+   carefully, as they describe your rights and restrictions with respect
+   to this document.  Code Components extracted from this document must
+   include Simplified BSD License text as described in Section 4.e of
+   the Trust Legal Provisions and are provided without warranty as
+   described in the Simplified BSD License.
+
+
+Table of Contents
+
+   1.  Introduction . . . . . . . . . . . . . . . . . . . . . . . . .  3
+   2.  LISP Header Without Protocol Extensions  . . . . . . . . . . .  4
+   3.  Generic Protocol Extension for LISP (LISP-gpe) . . . . . . . .  5
+     3.1.  Multi Protocol Support . . . . . . . . . . . . . . . . . .  5
+     3.2.  OAM Support  . . . . . . . . . . . . . . . . . . . . . . .  6
+     3.3.  Version Bits . . . . . . . . . . . . . . . . . . . . . . .  6
+   4.  Backward Compatibility . . . . . . . . . . . . . . . . . . . .  8
+     4.1.  LISP-gpe Routers to (legacy) LISP Routers  . . . . . . . .  8
+     4.2.  (legacy) LISP Routers to LISP-gpe Routers  . . . . . . . .  8
+     4.3.  Type of Service  . . . . . . . . . . . . . . . . . . . . .  8
+     4.4.  VLAN Identifier (VID)  . . . . . . . . . . . . . . . . . .  8
+   5.  LISP-gpe Examples  . . . . . . . . . . . . . . . . . . . . . .  9
+   6.  Security Considerations  . . . . . . . . . . . . . . . . . . . 11
+   7.  Acknowledgments  . . . . . . . . . . . . . . . . . . . . . . . 12
+   8.  IANA Considerations  . . . . . . . . . . . . . . . . . . . . . 13
+   9.  References . . . . . . . . . . . . . . . . . . . . . . . . . . 14
+     9.1.  Normative References . . . . . . . . . . . . . . . . . . . 14
+     9.2.  Informative References . . . . . . . . . . . . . . . . . . 14
+   Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . . 15
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Lewis, et al.            Expires January 5, 2015                [Page 2]
+
+Internet-Draft       LISP Generic Protocol Extension           July 2014
+
+
+1.  Introduction
+
+   LISP [RFC6830] defines an encapsulation format that carries IPv4 or
+   IPv6 (henceforth referred to as IP) packets in a LISP header and
+   outer UDP/IP transport.
+
+   The LISP header does not specify the protocol being encapsulated and
+   therefore is currently limited to encapsulating only IP packet
+   payloads.  Other protocols, most notably VXLAN [VXLAN] (which defines
+   a similar header format to LISP), are used to encapsulate L2
+   protocols such as Ethernet.  LISP [RFC6830] can be extended to
+   indicate the inner protocol, enabling the encapsulation of Ethernet,
+   IP or any other desired protocol all the while ensuring compatibility
+   with existing LISP [RFC6830] deployments.
+
+   As LISP is deployed, there's also the need to provide increased
+   visibility and diagnostic capabilities within the overlay.
+
+   This document describes extending LISP ([RFC6830]) via the following
+   changes:
+
+   Next Protocol Bit (P bit):  A reserved flag bit is allocated, and set
+      in the LISP-gpe header to indicate that a next protocol field is
+      present.
+
+   OAM Flag Bit (O bit):  A reserved flag bit is allocated, and set in
+      the LISP-gpe header, to indicate that the packet is an OAM packet.
+
+   Version:  Two reserved bits are allocated, and set in the LISP-gpe
+      header, to indicate LISP-gpe protocol version.
+
+   Next protocol:  An 8 bit next protocol field is present in the LISP-
+      gpe header.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Lewis, et al.            Expires January 5, 2015                [Page 3]
+
+Internet-Draft       LISP Generic Protocol Extension           July 2014
+
+
+2.  LISP Header Without Protocol Extensions
+
+   As described in the introduction, the LISP header has no protocol
+   identifier that indicates the type of payload being carried by LISP.
+   Because of this, LISP is limited to an IP payload.  Furthermore, the
+   LISP header has no mechanism to signal OAM packets.
+
+   The LISP header contains flags (some defined, some reserved), a
+   Nonce/Map-version field and an instance ID/Locator-status-bit field.
+   The flags provide flexibility to define how the reserved bits can be
+   used to change the definition of the LISP header.
+
+
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |N|L|E|V|I|flags|            Nonce/Map-Version                  |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                 Instance ID/Locator-Status-Bits               |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+                           Figure 1: LISP Header
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Lewis, et al.            Expires January 5, 2015                [Page 4]
+
+Internet-Draft       LISP Generic Protocol Extension           July 2014
+
+
+3.  Generic Protocol Extension for LISP (LISP-gpe)
+
+3.1.  Multi Protocol Support
+
+   This draft defines the following changes to the LISP header in order
+   to support multi-protocol encapsulation.
+
+   P Bit:  Flag bit 5 is defined as the Next Protocol bit.  The P bit
+      MUST be set to 1 to indicate the presence of the 8 bit next
+      protocol field.
+
+      P = 0 indicates that the payload MUST conform to LISP as defined
+      in [RFC6830].
+
+      Flag bit 5 was chosen as the P bit because this flag bit is
+      currently unallocated in LISP [RFC6830].
+
+   Next Protocol Field:  The lower 8 bits of the first word are used to
+      carry a next protocol.  This next protocol field contains the
+      protocol of the encapsulated payload packet.
+
+      LISP [RFC6830] uses the lower 16 bits of the first word for either
+      a nonce, an echo-nonce ([RFC6830]) or to support map-versioning
+      ([RFC6834]).  These are all optional capabilities that are
+      indicated by setting the N, E, and the V bit respectively.
+
+      To maintain the desired data plane compatibility, when the P bit
+      is set, the N, E, and V bits MUST be set to zero.
+
+   A new protocol registry will be requested from IANA for the Next
+   Protocol field.  This draft defines the following Next Protocol
+   values:
+
+      0x1 : IPv4
+
+      0x2 : IPv6
+
+      0x3 : Ethernet
+
+      0x4: Network Service Header
+
+
+
+
+
+
+
+
+
+
+
+Lewis, et al.            Expires January 5, 2015                [Page 5]
+
+Internet-Draft       LISP Generic Protocol Extension           July 2014
+
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |N|L|E|V|I|P|R|R|      Reserved                 | Next Protocol |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                 Instance ID/Locator-Status-Bits               |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+
+                  Figure 2: LISP-gpe Next Protocol (P=1)
+
+3.2.  OAM Support
+
+   Flag bit 7 is defined as the O bit.  When the O bit is set to 1, the
+   packet is an OAM packet and OAM processing MUST occur.  The OAM
+   protocol details are out of scope for this document.  As with the
+   P-bit, bit 7 is currently a reserved flag in [RFC6830].
+
+
+
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |N|L|E|V|I|P|R|O|      Reserved                 | Next Protocol |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                 Instance ID/Locator-Status-Bits               |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+
+                     Figure 3: LISP-gpe OAM bit (P=1)
+
+3.3.  Version Bits
+
+   LISP-gpe bits8 and 9 are defined as version bits.  The version field
+   is used to ensure backward compatibility going forward with future
+   LISP-gpe updates.
+
+   The initial version for LISP-gpe is 0.
+
+
+
+
+
+
+
+
+
+
+Lewis, et al.            Expires January 5, 2015                [Page 6]
+
+Internet-Draft       LISP Generic Protocol Extension           July 2014
+
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |N|L|E|V|I|P|R|O|Ver|      Reserved             | Next Protocol |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                 Instance ID/Locator-Status-Bits               |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+
+                   Figure 4: LISP-gpe Version bits (P=1)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Lewis, et al.            Expires January 5, 2015                [Page 7]
+
+Internet-Draft       LISP Generic Protocol Extension           July 2014
+
+
+4.  Backward Compatibility
+
+   Undefined (in RFC6830) flag bits 5 and 7, LISP-gpe P and O bits, were
+   selected to ensure compatibility with existing LISP [RFC6830]
+   deployments.
+
+   Similarly, using P = 0 to indicate that the format of the header and
+   payload conforms to [RFC6830] ensures compatibility with existing
+   LISP hardware forwarding platforms.
+
+4.1.  LISP-gpe Routers to (legacy) LISP Routers
+
+   A LISP-gpe router MUST not encapsulate non-IP packet nor OAM packets
+   to a LISP router.  A method for determining the capabilities of a
+   LISP router (gpe or "legacy") is out of the scope of this draft.
+
+   When encapsulating IP packets to a LISP router the P bit SHOULD be
+   set to 1 and the UDP port MUST be set to 4341.  OAM bit MUST be set
+   to 0.  The Next Protocol field SHOULD be 0x1 (IPv4) or 0x2 (IPv6).
+   The (legacy) LISP router will ignore the P bit and the protocol type
+   field.  The (legacy) LISP router will treat the packet as a LISP
+   packet and inspect the first nibble of the payload to determine the
+   IP version.
+
+   When the P bit is set, the N, E, and V bits MUST be set to zero.  The
+   receiving (legacy) LISP router will ignore N, E and V bits, when the
+   P bit is set.
+
+4.2.  (legacy) LISP Routers to LISP-gpe Routers
+
+   When a LISP-gpe router receives a packet from a (legacy) LISP router,
+   the P bit MUST not be set and the UDP port MUST be 4341.  The payload
+   MUST be IP, and the LISP-gpe router will inspect the first nibble of
+   the payload to determine IP version.
+
+4.3.  Type of Service
+
+   When a LISP-gpe router performs Ethernet encapsulation, the inner
+   802.1Q [IEEE8021Q] priority code point (PCP) field MAY be mapped from
+   the encapsulated frame to the Type of Service field in the outer IPv4
+   header, or in the case of IPv6 the 'Traffic Class' field.
+
+4.4.  VLAN Identifier (VID)
+
+   When a LISP-gpe router performs Ethernet encapsulation, the inner
+   header 802.1Q [IEEE8021Q] VLAN Identifier (VID) MAY be mapped to, or
+   used to determine the LISP Instance ID field.
+
+
+
+
+Lewis, et al.            Expires January 5, 2015                [Page 8]
+
+Internet-Draft       LISP Generic Protocol Extension           July 2014
+
+
+5.  LISP-gpe Examples
+
+   This section provides two examples of IP protocols, and one example
+   of Ethernet encapsulated LISP-gpe using the generic extension
+   described in this document.
+
+
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |N|L|E|V|I|1|0|0|0|   Reserved                  |   NP = IPv4   |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                 Instance ID/Locator-Status-Bits               |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |               Original IPv4 Packet                            |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+
+                        Figure 5: IPv4 and LISP-gpe
+
+
+
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |N|L|E|V|I|1|0|0|0|   Reserved                  |   NP = IPv6   |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                 Instance ID/Locator-Status-Bits               |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |               Original IPv6 Packet                            |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+
+                        Figure 6: IPv6 and LISP-gpe
+
+
+
+
+
+
+
+
+
+
+
+
+
+Lewis, et al.            Expires January 5, 2015                [Page 9]
+
+Internet-Draft       LISP Generic Protocol Extension           July 2014
+
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |N|L|E|V|I|1|0|0|0|   Reserved                  | NP = Ethernet |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                 Instance ID/Locator-Status-Bits               |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |               Original Ethernet Frame                         |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+
+                      Figure 7: Ethernet and LISP-gpe
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Lewis, et al.            Expires January 5, 2015               [Page 10]
+
+Internet-Draft       LISP Generic Protocol Extension           July 2014
+
+
+6.  Security Considerations
+
+   LISP-gpe security considerations are similar to the LISP security
+   considerations documented at length in LISP [RFC6830].  With LISP-
+   gpe, issues such as dataplane spoofing, flooding, and traffic
+   redirection are dependent on the particular protocol payload
+   encapsulated.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Lewis, et al.            Expires January 5, 2015               [Page 11]
+
+Internet-Draft       LISP Generic Protocol Extension           July 2014
+
+
+7.  Acknowledgments
+
+   A special thank you goes to Dino Farinacci for his guidance and
+   detailed review.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Lewis, et al.            Expires January 5, 2015               [Page 12]
+
+Internet-Draft       LISP Generic Protocol Extension           July 2014
+
+
+8.  IANA Considerations
+
+   IANA is requested to set up a registry of "Next Protocol".  These are
+   8-bit values.  Next Protocol values 0, 1, 2, 3 and 4 are defined in
+   this draft.  New values are assigned via Standards Action [RFC5226].
+
+              +---------------+-------------+---------------+
+              | Next Protocol | Description | Reference     |
+              +---------------+-------------+---------------+
+              | 0             | Reserved    | This document |
+              |               |             |               |
+              | 1             | IPv4        | This document |
+              |               |             |               |
+              | 2             | IPv6        | This document |
+              |               |             |               |
+              | 3             | Ethernet    | This document |
+              |               |             |               |
+              | 4             | NSH         | This document |
+              |               |             |               |
+              | 5..253        | Unassigned  |               |
+              +---------------+-------------+---------------+
+
+                                  Table 1
+
+   There are ten bits at the beginning of the LISP-gpe header.  New
+   bits are assigned via Standards Action [RFC5226].
+
+   Bits 0-3 - Assigned by LISP [RFC6830] 
+   Bit 4 - Instance ID (I bit)
+   Bit 5 - Next Protocol (P bit)
+   Bit 6 - Reserved
+   Bit 7 - OAM (O bit)
+   Bits 8-9 - Version
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Lewis, et al.            Expires January 5, 2015               [Page 13]
+
+Internet-Draft       LISP Generic Protocol Extension           July 2014
+
+
+9.  References
+
+9.1.  Normative References
+
+   [RFC0768]  Postel, J., "User Datagram Protocol", STD 6, RFC 768,
+              August 1980.
+
+   [RFC0791]  Postel, J., "Internet Protocol", STD 5, RFC 791,
+              September 1981.
+
+   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
+              Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [RFC5226]  Narten, T. and H. Alvestrand, "Guidelines for Writing an
+              IANA Considerations Section in RFCs", BCP 26, RFC 5226,
+              May 2008.
+
+9.2.  Informative References
+
+   [ETYPES]   The IEEE Registration Authority, "IEEE 802 Numbers", 2012,
+              <http://www.iana.org/assignments/ieee-802-numbers/
+              ieee-802-numbers.xml>.
+
+   [IEEE8021Q]
+              The IEEE Computer Society, "Media Access Control (MAC)
+              Bridges and Virtual Bridge Local Area Networks", August
+              2012, <http://standards.ieee.org/getieee802/download/
+              802.1Q-2011.pdf>.
+
+   [RFC1700]  Reynolds, J. and J. Postel, "Assigned Numbers", RFC 1700,
+              October 1994.
+
+   [RFC6830]  Farinacci, D., Fuller, V., Meyer, D., and D. Lewis, "The
+              Locator/ID Separation Protocol (LISP)", RFC 6830,
+              January 2013.
+
+   [RFC6834]  Iannone, L., Saucez, D., and O. Bonaventure, "Locator/ID
+              Separation Protocol (LISP) Map-Versioning", RFC 6834,
+              January 2013.
+
+   [VXLAN]    Dutt, D., Mahalingam, M., Duda, K., Agarwal, P., Kreeger,
+              L., Sridhar, T., Bursell, M., and C. Wright, "VXLAN: A
+              Framework for Overlaying Virtualized Layer 2 Networks over
+              Layer 3 Networks", 2013.
+
+
+
+
+
+
+
+Lewis, et al.            Expires January 5, 2015               [Page 14]
+
+Internet-Draft       LISP Generic Protocol Extension           July 2014
+
+
+Authors' Addresses
+
+   Darrel Lewis
+   Cisco Systems, Inc.
+
+   Email: darlewis@cisco.com
+
+
+   Puneet Agarwal
+   Broadcom
+
+   Email: pagarwal@broadcom.com
+
+
+   Larry Kreeger
+   Cisco Systems, Inc.
+
+   Email: kreeger@cisco.com
+
+
+   Fabio Maino
+   Cisco Systems, Inc.
+
+   Email: fmaino@cisco.com
+
+
+   Paul Quinn
+   Cisco Systems, Inc.
+
+   Email: paulq@cisco.com
+
+
+   Michael Smith
+   Cisco Systems, Inc.
+
+   Email: michsmit@cisco.com
+
+
+   Navindra Yadav
+   Cisco Systems, Inc.
+
+   Email: nyadav@cisco.com
diff --git a/src/vnet/llc/llc.c b/src/vnet/llc/llc.c
new file mode 100644
index 00000000..975207b6
--- /dev/null
+++ b/src/vnet/llc/llc.c
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * llc.c: llc support
+ *
+ * Copyright (c) 2010 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/llc/llc.h>
+
+/* Global main structure. */
+llc_main_t llc_main;
+
+u8 *
+format_llc_protocol (u8 * s, va_list * args)
+{
+  llc_protocol_t p = va_arg (*args, u32);
+  llc_main_t *pm = &llc_main;
+  llc_protocol_info_t *pi = llc_get_protocol_info (pm, p);
+
+  if (pi)
+    s = format (s, "%s", pi->name);
+  else
+    s = format (s, "0x%02x", p);
+
+  return s;
+}
+
+u8 *
+format_llc_header_with_length (u8 * s, va_list * args)
+{
+  llc_main_t *pm = &llc_main;
+  llc_header_t *h = va_arg (*args, llc_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+  llc_protocol_t p = h->dst_sap;
+  uword indent, header_bytes;
+
+  header_bytes = llc_header_length (h);
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    return format (s, "llc header truncated");
+
+  indent = format_get_indent (s);
+
+  s = format (s, "LLC %U -> %U",
+	      format_llc_protocol, h->src_sap,
+	      format_llc_protocol, h->dst_sap);
+
+  if (h->control != 0x03)
+    s = format (s, ", control 0x%x", llc_header_get_control (h));
+
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    {
+      llc_protocol_info_t *pi = llc_get_protocol_info (pm, p);
+      vlib_node_t *node = vlib_get_node (pm->vlib_main, pi->node_index);
+      if (node->format_buffer)
+	s = format (s, "\n%U%U",
+		    format_white_space, indent,
+		    node->format_buffer, (void *) (h + 1),
+		    max_header_bytes - header_bytes);
+    }
+
+  return s;
+}
+
+u8 *
+format_llc_header (u8 * s, va_list * args)
+{
+  llc_header_t *h = va_arg (*args, llc_header_t *);
+  return format (s, "%U", format_llc_header_with_length, h, 0);
+}
+
+/* Returns llc protocol as an int in host byte order. */
+uword
+unformat_llc_protocol (unformat_input_t * input, va_list * args)
+{
+  u8 *result = va_arg (*args, u8 *);
+  llc_main_t *pm = &llc_main;
+  int p, i;
+
+  /* Numeric type. */
+  if (unformat (input, "0x%x", &p) || unformat (input, "%d", &p))
+    {
+      if (p >= (1 << 8))
+	return 0;
+      *result = p;
+      return 1;
+    }
+
+  /* Named type. */
+  if (unformat_user (input, unformat_vlib_number_by_name,
+		     pm->protocol_info_by_name, &i))
+    {
+      llc_protocol_info_t *pi = vec_elt_at_index (pm->protocol_infos, i);
+      *result = pi->protocol;
+      return 1;
+    }
+
+  return 0;
+}
+
+uword
+unformat_llc_header (unformat_input_t * input, va_list * args)
+{
+  u8 **result = va_arg (*args, u8 **);
+  llc_header_t _h, *h = &_h;
+  u8 p;
+
+  if (!unformat (input, "%U", unformat_llc_protocol, &p))
+    return 0;
+
+  h->src_sap = h->dst_sap = p;
+  h->control = 0x3;
+
+  /* Add header to result. */
+  {
+    void *p;
+    u32 n_bytes = sizeof (h[0]);
+
+    vec_add2 (*result, p, n_bytes);
+    clib_memcpy (p, h, n_bytes);
+  }
+
+  return 1;
+}
+
+static u8 *
+llc_build_rewrite (vnet_main_t * vnm,
+		   u32 sw_if_index,
+		   vnet_link_t link_type, const void *dst_address)
+{
+  llc_header_t *h;
+  u8 *rewrite = NULL;
+  llc_protocol_t protocol;
+
+  switch (link_type)
+    {
+#define _(a,b) case VNET_LINK_##a: protocol = LLC_PROTOCOL_##b; break
+      _(IP4, ip4);
+#undef _
+    default:
+      return (NULL);
+    }
+
+  vec_validate (rewrite, sizeof (*h) - 1);
+  h = (llc_header_t *) rewrite;
+  h->src_sap = h->dst_sap = protocol;
+  h->control = 0x3;
+
+  return (rewrite);
+}
+
+/* *INDENT-OFF* */
+VNET_HW_INTERFACE_CLASS (llc_hw_interface_class) = {
+  .name = "LLC",
+  .format_header = format_llc_header_with_length,
+  .unformat_header = unformat_llc_header,
+  .build_rewrite = llc_build_rewrite,
+};
+/* *INDENT-ON* */
+
+static void
+add_protocol (llc_main_t * pm, llc_protocol_t protocol, char *protocol_name)
+{
+  llc_protocol_info_t *pi;
+  u32 i;
+
+  vec_add2 (pm->protocol_infos, pi, 1);
+  i = pi - pm->protocol_infos;
+
+  pi->name = protocol_name;
+  pi->protocol = protocol;
+  pi->next_index = pi->node_index = ~0;
+
+  hash_set (pm->protocol_info_by_protocol, protocol, i);
+  hash_set_mem (pm->protocol_info_by_name, pi->name, i);
+}
+
+static clib_error_t *
+llc_init (vlib_main_t * vm)
+{
+  clib_error_t *error;
+  llc_main_t *pm = &llc_main;
+
+  memset (pm, 0, sizeof (pm[0]));
+  pm->vlib_main = vm;
+
+  pm->protocol_info_by_name = hash_create_string (0, sizeof (uword));
+  pm->protocol_info_by_protocol = hash_create (0, sizeof (uword));
+
+#define _(f,n) add_protocol (pm, LLC_PROTOCOL_##f, #f);
+  foreach_llc_protocol;
+#undef _
+
+  if ((error = vlib_call_init_function (vm, snap_init)))
+    return error;
+
+  return vlib_call_init_function (vm, llc_input_init);
+}
+
+VLIB_INIT_FUNCTION (llc_init);
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/llc/llc.h b/src/vnet/llc/llc.h
new file mode 100644
index 00000000..0b85f5d8
--- /dev/null
+++ b/src/vnet/llc/llc.h
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * llc.h: LLC definitions
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_llc_h
+#define included_llc_h
+
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+
+/* Protocol (SSAP/DSAP) types. */
+#define foreach_llc_protocol			\
+  _ (null, 0x0)					\
+  _ (sublayer, 0x2)				\
+  _ (sna_path_control, 0x4)			\
+  _ (ip4, 0x6)					\
+  _ (sna1, 0x8)					\
+  _ (sna2, 0xc)					\
+  _ (sna3, 0x40)				\
+  _ (proway_lan, 0x0e)				\
+  _ (netware1, 0x10)				\
+  _ (netware2, 0xe0)				\
+  _ (osi_layer1, 0x14)				\
+  _ (osi_layer2, 0x20)				\
+  _ (osi_layer3, 0x34)				\
+  _ (osi_layer4, 0x54)				\
+  _ (osi_layer5, 0xfe)				\
+  _ (bpdu, 0x42)				\
+  _ (arp, 0x98)					\
+  _ (snap, 0xaa)				\
+  _ (vines1, 0xba)				\
+  _ (vines2, 0xbc)				\
+  _ (netbios, 0xf0)				\
+  _ (global_dsap, 0xff)
+
+typedef enum
+{
+#define _(f,n) LLC_PROTOCOL_##f = n,
+  foreach_llc_protocol
+#undef _
+} llc_protocol_t;
+
+typedef struct
+{
+#define LLC_DST_SAP_IS_GROUP (1 << 0)
+#define LLC_SRC_SAP_IS_RESPONSE (1 << 0)
+  u8 dst_sap, src_sap;
+
+  /* Control byte.
+     [0] 1 => supervisory 0 => information
+     [1] unnumbered frame. */
+  u8 control;
+
+  /* Only present if (control & 3) != 3. */
+  u8 extended_control[0];
+} llc_header_t;
+
+always_inline u16
+llc_header_get_control (llc_header_t * h)
+{
+  u16 r = h->control;
+  return r | ((((r & 3) != 3) ? h->extended_control[0] : 0) << 8);
+}
+
+always_inline u8
+llc_header_length (llc_header_t * h)
+{
+  return ((h->control & 3) != 3 ? 4 : 3);
+}
+
+typedef struct
+{
+  /* Name (a c string). */
+  char *name;
+
+  /* LLC protocol (SAP type). */
+  llc_protocol_t protocol;
+
+  /* Node which handles this type. */
+  u32 node_index;
+
+  /* Next index for this type. */
+  u32 next_index;
+} llc_protocol_info_t;
+
+#define foreach_llc_error			\
+  _ (NONE, "no error")				\
+  _ (UNKNOWN_PROTOCOL, "unknown llc ssap/dsap")	\
+  _ (UNKNOWN_CONTROL, "control != 0x3")
+
+typedef enum
+{
+#define _(f,s) LLC_ERROR_##f,
+  foreach_llc_error
+#undef _
+    LLC_N_ERROR,
+} llc_error_t;
+
+typedef struct
+{
+  vlib_main_t *vlib_main;
+
+  llc_protocol_info_t *protocol_infos;
+
+  /* Hash tables mapping name/protocol to protocol info index. */
+  uword *protocol_info_by_name, *protocol_info_by_protocol;
+
+  /* llc-input next index indexed by protocol. */
+  u8 input_next_by_protocol[256];
+} llc_main_t;
+
+always_inline llc_protocol_info_t *
+llc_get_protocol_info (llc_main_t * m, llc_protocol_t protocol)
+{
+  uword *p = hash_get (m->protocol_info_by_protocol, protocol);
+  return p ? vec_elt_at_index (m->protocol_infos, p[0]) : 0;
+}
+
+extern llc_main_t llc_main;
+
+/* Register given node index to take input for given llc type. */
+void
+llc_register_input_protocol (vlib_main_t * vm,
+			     llc_protocol_t protocol, u32 node_index);
+
+void llc_set_adjacency (vnet_rewrite_header_t * rw,
+			uword max_data_bytes, llc_protocol_t protocol);
+
+format_function_t format_llc_protocol;
+format_function_t format_llc_header;
+format_function_t format_llc_header_with_length;
+
+/* Parse llc protocol as 0xXXXX or protocol name. */
+unformat_function_t unformat_llc_protocol;
+
+/* Parse llc header. */
+unformat_function_t unformat_llc_header;
+unformat_function_t unformat_pg_llc_header;
+
+always_inline void
+llc_setup_node (vlib_main_t * vm, u32 node_index)
+{
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  pg_node_t *pn = pg_get_node (node_index);
+
+  n->format_buffer = format_llc_header_with_length;
+  n->unformat_buffer = unformat_llc_header;
+  pn->unformat_edit = unformat_pg_llc_header;
+}
+
+#endif /* included_llc_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/llc/node.c b/src/vnet/llc/node.c
new file mode 100644
index 00000000..60b5c134
--- /dev/null
+++ b/src/vnet/llc/node.c
@@ -0,0 +1,331 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * llc_node.c: llc packet processing
+ *
+ * Copyright (c) 2010 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/llc/llc.h>
+
+#define foreach_llc_input_next			\
+  _ (PUNT, "error-punt")			\
+  _ (DROP, "error-drop")
+
+typedef enum
+{
+#define _(s,n) LLC_INPUT_NEXT_##s,
+  foreach_llc_input_next
+#undef _
+    LLC_INPUT_N_NEXT,
+} llc_input_next_t;
+
+typedef struct
+{
+  u8 packet_data[32];
+} llc_input_trace_t;
+
+static u8 *
+format_llc_input_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  llc_input_trace_t *t = va_arg (*va, llc_input_trace_t *);
+
+  s = format (s, "%U", format_llc_header, t->packet_data);
+
+  return s;
+}
+
+static uword
+llc_input (vlib_main_t * vm,
+	   vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  llc_main_t *lm = &llc_main;
+  u32 n_left_from, next_index, *from, *to_next;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node,
+				   from,
+				   n_left_from,
+				   sizeof (from[0]),
+				   sizeof (llc_input_trace_t));
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  llc_header_t *h0, *h1;
+	  u8 next0, next1, len0, len1, enqueue_code;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *b2, *b3;
+
+	    b2 = vlib_get_buffer (vm, from[2]);
+	    b3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (b2, LOAD);
+	    vlib_prefetch_buffer_header (b3, LOAD);
+
+	    CLIB_PREFETCH (b2->data, sizeof (h0[0]), LOAD);
+	    CLIB_PREFETCH (b3->data, sizeof (h1[0]), LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  h0 = (void *) (b0->data + b0->current_data);
+	  h1 = (void *) (b1->data + b1->current_data);
+
+	  len0 = llc_header_length (h0);
+	  len1 = llc_header_length (h1);
+
+	  b0->current_data += len0;
+	  b1->current_data += len1;
+
+	  b0->current_length -= len0;
+	  b1->current_length -= len1;
+
+	  next0 = lm->input_next_by_protocol[h0->dst_sap];
+	  next1 = lm->input_next_by_protocol[h1->dst_sap];
+
+	  b0->error =
+	    node->errors[next0 ==
+			 LLC_INPUT_NEXT_DROP ? LLC_ERROR_UNKNOWN_PROTOCOL :
+			 LLC_ERROR_NONE];
+	  b1->error =
+	    node->errors[next1 ==
+			 LLC_INPUT_NEXT_DROP ? LLC_ERROR_UNKNOWN_PROTOCOL :
+			 LLC_ERROR_NONE];
+
+	  enqueue_code = (next0 != next_index) + 2 * (next1 != next_index);
+
+	  if (PREDICT_FALSE (enqueue_code != 0))
+	    {
+	      switch (enqueue_code)
+		{
+		case 1:
+		  /* A B A */
+		  to_next[-2] = bi1;
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node, next0, bi0);
+		  break;
+
+		case 2:
+		  /* A A B */
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node, next1, bi1);
+		  break;
+
+		case 3:
+		  /* A B B or A B C */
+		  to_next -= 2;
+		  n_left_to_next += 2;
+		  vlib_set_next_frame_buffer (vm, node, next0, bi0);
+		  vlib_set_next_frame_buffer (vm, node, next1, bi1);
+		  if (next0 == next1)
+		    {
+		      vlib_put_next_frame (vm, node, next_index,
+					   n_left_to_next);
+		      next_index = next1;
+		      vlib_get_next_frame (vm, node, next_index, to_next,
+					   n_left_to_next);
+		    }
+		}
+	    }
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  llc_header_t *h0;
+	  u8 next0, len0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  h0 = (void *) (b0->data + b0->current_data);
+
+	  len0 = llc_header_length (h0);
+
+	  b0->current_data += len0;
+
+	  b0->current_length -= len0;
+
+	  next0 = lm->input_next_by_protocol[h0->dst_sap];
+
+	  b0->error =
+	    node->errors[next0 ==
+			 LLC_INPUT_NEXT_DROP ? LLC_ERROR_UNKNOWN_PROTOCOL :
+			 LLC_ERROR_NONE];
+
+	  /* Sent packet to wrong next? */
+	  if (PREDICT_FALSE (next0 != next_index))
+	    {
+	      /* Return old frame; remove incorrectly enqueued packet. */
+	      vlib_put_next_frame (vm, node, next_index, n_left_to_next + 1);
+
+	      /* Send to correct next. */
+	      next_index = next0;
+	      vlib_get_next_frame (vm, node, next_index,
+				   to_next, n_left_to_next);
+
+	      to_next[0] = bi0;
+	      to_next += 1;
+	      n_left_to_next -= 1;
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+static char *llc_error_strings[] = {
+#define _(f,s) s,
+  foreach_llc_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (llc_input_node) = {
+  .function = llc_input,
+  .name = "llc-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .n_errors = LLC_N_ERROR,
+  .error_strings = llc_error_strings,
+
+  .n_next_nodes = LLC_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [LLC_INPUT_NEXT_##s] = n,
+    foreach_llc_input_next
+#undef _
+  },
+
+  .format_buffer = format_llc_header_with_length,
+  .format_trace = format_llc_input_trace,
+  .unformat_buffer = unformat_llc_header,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+llc_input_init (vlib_main_t * vm)
+{
+  llc_main_t *lm = &llc_main;
+
+  {
+    clib_error_t *error = vlib_call_init_function (vm, llc_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  llc_setup_node (vm, llc_input_node.index);
+
+  {
+    int i;
+    for (i = 0; i < ARRAY_LEN (lm->input_next_by_protocol); i++)
+      lm->input_next_by_protocol[i] = LLC_INPUT_NEXT_DROP;
+  }
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (llc_input_init);
+
+void
+llc_register_input_protocol (vlib_main_t * vm,
+			     llc_protocol_t protocol, u32 node_index)
+{
+  llc_main_t *lm = &llc_main;
+  llc_protocol_info_t *pi;
+
+  {
+    clib_error_t *error = vlib_call_init_function (vm, llc_input_init);
+    if (error)
+      clib_error_report (error);
+    /* Otherwise, osi_input_init will wipe out e.g. the snap init */
+    error = vlib_call_init_function (vm, osi_input_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  pi = llc_get_protocol_info (lm, protocol);
+  pi->node_index = node_index;
+  pi->next_index = vlib_node_add_next (vm, llc_input_node.index, node_index);
+
+  lm->input_next_by_protocol[protocol] = pi->next_index;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/llc/pg.c b/src/vnet/llc/pg.c
new file mode 100644
index 00000000..ad18a4b0
--- /dev/null
+++ b/src/vnet/llc/pg.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * llc_pg.c: packet generator llc interface
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/llc/llc.h>
+
+typedef struct
+{
+  pg_edit_t dst_sap;
+  pg_edit_t src_sap;
+  pg_edit_t control;
+} pg_llc_header_t;
+
+static inline void
+pg_llc_header_init (pg_llc_header_t * e)
+{
+  pg_edit_init (&e->dst_sap, llc_header_t, dst_sap);
+  pg_edit_init (&e->src_sap, llc_header_t, src_sap);
+  pg_edit_init (&e->control, llc_header_t, control);
+}
+
+uword
+unformat_pg_llc_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  pg_llc_header_t *h;
+  u32 group_index, error;
+
+  h = pg_create_edit_group (s, sizeof (h[0]), sizeof (llc_header_t),
+			    &group_index);
+  pg_llc_header_init (h);
+
+  pg_edit_set_fixed (&h->control, 0x03);
+
+  error = 1;
+  if (!unformat (input, "%U -> %U",
+		 unformat_pg_edit,
+		 unformat_llc_protocol, &h->src_sap, &h->dst_sap))
+    goto done;
+
+  {
+    llc_main_t *pm = &llc_main;
+    llc_protocol_info_t *pi = 0;
+    pg_node_t *pg_node = 0;
+
+    if (h->dst_sap.type == PG_EDIT_FIXED)
+      {
+	u8 t = *h->dst_sap.values[PG_EDIT_LO];
+	pi = llc_get_protocol_info (pm, t);
+	if (pi && pi->node_index != ~0)
+	  pg_node = pg_get_node (pi->node_index);
+      }
+
+    if (pg_node && pg_node->unformat_edit
+	&& unformat_user (input, pg_node->unformat_edit, s))
+      ;
+
+    else if (!unformat_user (input, unformat_pg_payload, s))
+      goto done;
+  }
+
+  error = 0;
+done:
+  if (error)
+    pg_free_edit_group (s);
+  return error == 0;
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lldp/dir.dox b/src/vnet/lldp/dir.dox
new file mode 100644
index 00000000..6aa45f70
--- /dev/null
+++ b/src/vnet/lldp/dir.dox
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ @dir vnet/vnet/lldp
+ @brief Link Layer Discovery Protocol (LLDP) implementation
+*/
diff --git a/src/vnet/lldp/lldp_cli.c b/src/vnet/lldp/lldp_cli.c
new file mode 100644
index 00000000..45f688c5
--- /dev/null
+++ b/src/vnet/lldp/lldp_cli.c
@@ -0,0 +1,646 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file
+ * @brief LLDP CLI handling
+ *
+ */
+#include <vnet/lisp-cp/lisp_types.h>
+#include <vnet/lldp/lldp_node.h>
+
+#ifndef ETHER_ADDR_LEN
+#include <net/ethernet.h>
+#endif
+
+typedef enum lldp_cfg_err
+{
+  lldp_ok,
+  lldp_not_supported,
+  lldp_invalid_arg,
+} lldp_cfg_err_t;
+
+static clib_error_t *
+lldp_cfg_err_to_clib_err (lldp_cfg_err_t e)
+{
+
+  switch (e)
+    {
+    case lldp_ok:
+      return 0;
+    case lldp_not_supported:
+      return clib_error_return (0, "not supported");
+    case lldp_invalid_arg:
+      return clib_error_return (0, "invalid argument");
+    }
+  return 0;
+}
+
+static lldp_cfg_err_t
+lldp_cfg_intf_set (u32 hw_if_index, int enable)
+{
+  lldp_main_t *lm = &lldp_main;
+  vnet_main_t *vnm = lm->vnet_main;
+  ethernet_main_t *em = &ethernet_main;
+  const vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
+  const ethernet_interface_t *eif = ethernet_get_interface (em, hw_if_index);
+
+  if (!eif)
+    {
+      return lldp_not_supported;
+    }
+
+  if (enable)
+    {
+      lldp_intf_t *n = lldp_get_intf (lm, hw_if_index);
+      if (n)
+	{
+	  /* already enabled */
+	  return 0;
+	}
+      n = lldp_create_intf (lm, hw_if_index);
+      const vnet_sw_interface_t *sw =
+	vnet_get_sw_interface (lm->vnet_main, hi->sw_if_index);
+      if (sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+	{
+	  lldp_schedule_intf (lm, n);
+	}
+    }
+  else
+    {
+      lldp_intf_t *n = lldp_get_intf (lm, hi->sw_if_index);
+      lldp_delete_intf (lm, n);
+    }
+
+  return 0;
+}
+
+static clib_error_t *
+lldp_intf_cmd (vlib_main_t * vm, unformat_input_t * input,
+	       vlib_cli_command_t * cmd)
+{
+  lldp_main_t *lm = &lldp_main;
+  vnet_main_t *vnm = lm->vnet_main;
+  u32 hw_if_index;
+  int enable = 0;
+
+  if (unformat (input, "%U %U", unformat_vnet_hw_interface, vnm, &hw_if_index,
+		unformat_vlib_enable_disable, &enable))
+    {
+      return
+	lldp_cfg_err_to_clib_err (lldp_cfg_intf_set (hw_if_index, enable));
+    }
+  else
+    {
+      return clib_error_return (0, "unknown input `%U'",
+				format_unformat_error, input);
+    }
+  return 0;
+}
+
+static lldp_cfg_err_t
+lldp_cfg_set (u8 ** host, int hold_time, int tx_interval)
+{
+  lldp_main_t *lm = &lldp_main;
+  int reschedule = 0;
+  if (host && *host)
+    {
+      vec_free (lm->sys_name);
+      lm->sys_name = *host;
+      *host = NULL;
+    }
+  if (hold_time)
+    {
+      if (hold_time < LLDP_MIN_TX_HOLD || hold_time > LLDP_MAX_TX_HOLD)
+	{
+	  return lldp_invalid_arg;
+	}
+      if (lm->msg_tx_hold != hold_time)
+	{
+	  lm->msg_tx_hold = hold_time;
+	  reschedule = 1;
+	}
+    }
+  if (tx_interval)
+    {
+      if (tx_interval < LLDP_MIN_TX_INTERVAL ||
+	  tx_interval > LLDP_MAX_TX_INTERVAL)
+	{
+	  return lldp_invalid_arg;
+	}
+      if (lm->msg_tx_interval != tx_interval)
+	{
+	  reschedule = 1;
+	  lm->msg_tx_interval = tx_interval;
+	}
+    }
+  if (reschedule)
+    {
+      vlib_process_signal_event (lm->vlib_main, lm->lldp_process_node_index,
+				 LLDP_EVENT_RESCHEDULE, 0);
+    }
+  return lldp_ok;
+}
+
+static clib_error_t *
+lldp_cfg_cmd (vlib_main_t * vm, unformat_input_t * input,
+	      vlib_cli_command_t * cmd)
+{
+  int hold_time = 0;
+  int tx_interval = 0;
+  u8 *host = NULL;
+  clib_error_t *ret = NULL;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "system-name %s", &host))
+	{
+	}
+      else if (unformat (input, "tx-hold %d", &hold_time))
+	{
+	  if (hold_time < LLDP_MIN_TX_HOLD || hold_time > LLDP_MAX_TX_HOLD)
+	    {
+	      ret =
+		clib_error_return (0,
+				   "invalid tx-hold `%d' (out of range <%d,%d>)",
+				   hold_time, LLDP_MIN_TX_HOLD,
+				   LLDP_MAX_TX_HOLD);
+	      goto out;
+	    }
+	}
+      else if (unformat (input, "tx-interval %d", &tx_interval))
+	{
+	  if (tx_interval < LLDP_MIN_TX_INTERVAL ||
+	      tx_interval > LLDP_MAX_TX_INTERVAL)
+	    {
+	      ret =
+		clib_error_return (0,
+				   "invalid tx-interval `%d' (out of range <%d,%d>)",
+				   tx_interval, LLDP_MIN_TX_INTERVAL,
+				   LLDP_MAX_TX_INTERVAL);
+	      goto out;
+	    }
+	}
+      else
+	{
+	  ret = clib_error_return (0, "unknown input `%U'",
+				   format_unformat_error, input);
+	  goto out;
+	}
+    }
+  ret =
+    lldp_cfg_err_to_clib_err (lldp_cfg_set (&host, hold_time, tx_interval));
+out:
+  vec_free (host);
+  return ret;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND(set_interface_lldp_cmd, static) = {
+  .path = "set interface lldp",
+  .short_help = "set interface lldp <interface> (enable | disable) ",
+  .function = lldp_intf_cmd,
+};
+
+VLIB_CLI_COMMAND(set_lldp_cmd, static) = {
+  .path = "set lldp",
+  .short_help = "set lldp [system-name <string>] [tx-hold <value>] "
+                "[tx-interval <value>]",
+  .function = lldp_cfg_cmd,
+};
+/* *INDENT-ON* */
+
+static const char *
+lldp_chassis_id_subtype_str (lldp_chassis_id_subtype_t t)
+{
+  switch (t)
+    {
+#define F(num, val, str) \
+  case num:              \
+    return str;
+      foreach_chassis_id_subtype (F)
+#undef F
+    }
+  return "unknown chassis subtype";
+}
+
+static const char *
+lldp_port_id_subtype_str (lldp_port_id_subtype_t t)
+{
+  switch (t)
+    {
+#define F(num, val, str) \
+  case num:              \
+    return str;
+      foreach_port_id_subtype (F)
+#undef F
+    }
+  return "unknown port subtype";
+}
+
+/*
+ * format port id subtype&value
+ *
+ * @param va - 1st argument - unsigned - port id subtype
+ * @param va - 2nd argument - u8* - port id
+ * @param va - 3rd argument - unsigned - port id length
+ * @param va - 4th argument - int - 1 for detailed output, 0 for simple
+ */
+u8 *
+format_lldp_port_id (u8 * s, va_list * va)
+{
+  const lldp_port_id_subtype_t subtype = va_arg (*va, unsigned);
+  const u8 *id = va_arg (*va, u8 *);
+  const unsigned len = va_arg (*va, unsigned);
+  const int detail = va_arg (*va, int);
+  if (!id)
+    {
+      return s;
+    }
+  switch (subtype)
+    {
+    case LLDP_PORT_ID_SUBTYPE_NAME (intf_alias):
+      /* fallthrough */
+    case LLDP_PORT_ID_SUBTYPE_NAME (port_comp):
+      /* fallthrough */
+    case LLDP_PORT_ID_SUBTYPE_NAME (local):
+      /* fallthrough */
+    case LLDP_PORT_ID_SUBTYPE_NAME (intf_name):
+      if (detail)
+	{
+	  s = format (s, "%U(%s)", format_ascii_bytes, id, len,
+		      lldp_port_id_subtype_str (subtype));
+	}
+      else
+	{
+	  s = format (s, "%U", format_ascii_bytes, id, len);
+	}
+      break;
+    case LLDP_PORT_ID_SUBTYPE_NAME (mac_addr):
+      if (ETHER_ADDR_LEN == len)
+	{
+	  if (detail)
+	    {
+	      s = format (s, "%U(%s)", format_mac_address, id,
+			  lldp_port_id_subtype_str (subtype));
+	    }
+	  else
+	    {
+	      s = format (s, "%U", format_mac_address, id);
+	    }
+	  break;
+	}
+      /* fallthrough */
+    case LLDP_PORT_ID_SUBTYPE_NAME (net_addr):
+      /* TODO */
+      /* fallthrough */
+    default:
+      if (detail)
+	{
+	  s = format (s, "%U(%s)", format_hex_bytes, id, len,
+		      lldp_port_id_subtype_str (subtype));
+	}
+      else
+	{
+	  s = format (s, "%U", format_hex_bytes, id, len);
+	}
+      break;
+    }
+  return s;
+}
+
+/*
+ * format chassis id subtype&value
+ *
+ * @param s format string
+ * @param va - 1st argument - unsigned - chassis id subtype
+ * @param va - 2nd argument - u8* - chassis id
+ * @param va - 3rd argument - unsigned - chassis id length
+ * @param va - 4th argument - int - 1 for detailed output, 0 for simple
+ */
+u8 *
+format_lldp_chassis_id (u8 * s, va_list * va)
+{
+  const lldp_chassis_id_subtype_t subtype =
+    va_arg (*va, lldp_chassis_id_subtype_t);
+  const u8 *id = va_arg (*va, u8 *);
+  const unsigned len = va_arg (*va, unsigned);
+  const int detail = va_arg (*va, int);
+  if (!id)
+    {
+      return s;
+    }
+  switch (subtype)
+    {
+    case LLDP_CHASS_ID_SUBTYPE_NAME (chassis_comp):
+      /* fallthrough */
+    case LLDP_CHASS_ID_SUBTYPE_NAME (intf_alias):
+      /* fallthrough */
+    case LLDP_CHASS_ID_SUBTYPE_NAME (port_comp):
+      /* fallthrough */
+    case LLDP_PORT_ID_SUBTYPE_NAME (local):
+      /* fallthrough */
+    case LLDP_CHASS_ID_SUBTYPE_NAME (intf_name):
+      if (detail)
+	{
+	  s = format (s, "%U(%s)", format_ascii_bytes, id, len,
+		      lldp_chassis_id_subtype_str (subtype));
+	}
+      else
+	{
+	  s = format (s, "%U", format_ascii_bytes, id, len);
+	}
+      break;
+    case LLDP_CHASS_ID_SUBTYPE_NAME (mac_addr):
+      if (ETHER_ADDR_LEN == len)
+	{
+	  if (detail)
+	    {
+	      s = format (s, "%U(%s)", format_mac_address, id,
+			  lldp_chassis_id_subtype_str (subtype));
+	    }
+	  else
+	    {
+	      s = format (s, "%U", format_mac_address, id);
+	    }
+	  break;
+	}
+      /* fallthrough */
+    case LLDP_CHASS_ID_SUBTYPE_NAME (net_addr):
+      /* TODO */
+    default:
+      if (detail)
+	{
+	  s = format (s, "%U(%s)", format_hex_bytes, id, len,
+		      lldp_chassis_id_subtype_str (subtype));
+	}
+      else
+	{
+	  s = format (s, "%U", format_hex_bytes, id, len);
+	}
+      break;
+    }
+  return s;
+}
+
+/*
+ * convert a tlv code to human-readable string
+ */
+static const char *
+lldp_tlv_code_str (lldp_tlv_code_t t)
+{
+  switch (t)
+    {
+#define F(n, t, s) \
+  case n:          \
+    return s;
+      foreach_lldp_tlv_type (F)
+#undef F
+    }
+  return "unknown lldp tlv";
+}
+
+/*
+ * format a single LLDP TLV
+ *
+ * @param s format string
+ * @param va variable list - pointer to lldp_tlv_t is expected
+ */
+u8 *
+format_lldp_tlv (u8 * s, va_list * va)
+{
+  const lldp_tlv_t *tlv = va_arg (*va, lldp_tlv_t *);
+  if (!tlv)
+    {
+      return s;
+    }
+  u16 l = lldp_tlv_get_length (tlv);
+  switch (lldp_tlv_get_code (tlv))
+    {
+    case LLDP_TLV_NAME (chassis_id):
+      s = format (s, "%U", format_lldp_chassis_id,
+		  ((lldp_chassis_id_tlv_t *) tlv)->subtype,
+		  ((lldp_chassis_id_tlv_t *) tlv)->id,
+		  l - STRUCT_SIZE_OF (lldp_chassis_id_tlv_t, subtype), 1);
+      break;
+    case LLDP_TLV_NAME (port_id):
+      s = format (s, "%U", format_lldp_port_id,
+		  ((lldp_port_id_tlv_t *) tlv)->subtype,
+		  ((lldp_port_id_tlv_t *) tlv)->id,
+		  l - STRUCT_SIZE_OF (lldp_port_id_tlv_t, subtype), 1);
+      break;
+    case LLDP_TLV_NAME (ttl):
+      s = format (s, "%d", ntohs (((lldp_ttl_tlv_t *) tlv)->ttl));
+      break;
+    case LLDP_TLV_NAME (sys_name):
+      /* fallthrough */
+    case LLDP_TLV_NAME (sys_desc):
+      s = format (s, "%U", format_ascii_bytes, tlv->v, l);
+      break;
+    default:
+      s = format (s, "%U", format_hex_bytes, tlv->v, l);
+    }
+
+  return s;
+}
+
+static u8 *
+format_time_ago (u8 * s, va_list * va)
+{
+  f64 ago = va_arg (*va, double);
+  f64 now = va_arg (*va, double);
+  if (ago < 0.01)
+    {
+      return format (s, "never");
+    }
+  return format (s, "%.1fs ago", now - ago);
+}
+
+static u8 *
+format_lldp_intfs_detail (u8 * s, vlib_main_t * vm, const lldp_main_t * lm)
+{
+  vnet_main_t *vnm = &vnet_main;
+  const lldp_intf_t *n;
+  const vnet_hw_interface_t *hw;
+  const vnet_sw_interface_t *sw;
+  s = format (s, "LLDP configuration:\n");
+  if (lm->sys_name)
+    {
+      s = format (s, "Configured system name: %U\n", format_ascii_bytes,
+		  lm->sys_name, vec_len (lm->sys_name));
+    }
+  s = format (s, "Configured tx-hold: %d\n", (int) lm->msg_tx_hold);
+  s = format (s, "Configured tx-interval: %d\n", (int) lm->msg_tx_interval);
+  s = format (s, "\nLLDP-enabled interface table:\n");
+  f64 now = vlib_time_now (vm);
+
+  /* *INDENT-OFF* */
+  pool_foreach(
+      n, lm->intfs, ({
+        hw = vnet_get_hw_interface(vnm, n->hw_if_index);
+        sw = vnet_get_sw_interface(lm->vnet_main, hw->sw_if_index);
+        /* Interface shutdown */
+        if (!(sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
+          {
+            s = format(s, "\nInterface name: %s\nInterface/peer state: "
+                          "interface down\nLast packet sent: %U\n",
+                       hw->name, format_time_ago, n->last_sent, now);
+          }
+        else if (now < n->last_heard + n->ttl)
+          {
+            s = format(s,
+                       "\nInterface name: %s\nInterface/peer state: "
+                       "active\nPeer chassis ID: %U\nRemote port ID: %U\nLast "
+                       "packet sent: %U\nLast packet received: %U\n",
+                       hw->name, format_lldp_chassis_id, n->chassis_id_subtype,
+                       n->chassis_id, vec_len(n->chassis_id), 1,
+                       format_lldp_port_id, n->port_id_subtype, n->port_id,
+                       vec_len(n->port_id), 1, format_time_ago, n->last_sent,
+                       now, format_time_ago, n->last_heard, now);
+          }
+        else
+          {
+            s = format(s, "\nInterface name: %s\nInterface/peer state: "
+                          "inactive(timeout)\nLast known peer chassis ID: "
+                          "%U\nLast known peer port ID: %U\nLast packet sent: "
+                          "%U\nLast packet received: %U\n",
+                       hw->name, format_lldp_chassis_id, n->chassis_id_subtype,
+                       n->chassis_id, vec_len(n->chassis_id), 1,
+                       format_lldp_port_id, n->port_id_subtype, n->port_id,
+                       vec_len(n->port_id), 1, format_time_ago, n->last_sent,
+                       now, format_time_ago, n->last_heard, now);
+          }
+      }));
+  /* *INDENT-ON* */
+  return s;
+}
+
+static u8 *
+format_lldp_intfs (u8 * s, va_list * va)
+{
+  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
+  const lldp_main_t *lm = va_arg (*va, lldp_main_t *);
+  const int detail = va_arg (*va, int);
+  vnet_main_t *vnm = &vnet_main;
+  const lldp_intf_t *n;
+
+  if (detail)
+    {
+      return format_lldp_intfs_detail (s, vm, lm);
+    }
+
+  f64 now = vlib_time_now (vm);
+  s = format (s, "%-25s %-25s %-25s %=15s %=15s %=10s\n", "Local interface",
+	      "Peer chassis ID", "Remote port ID", "Last heard", "Last sent",
+	      "Status");
+
+  /* *INDENT-OFF* */
+  pool_foreach(
+      n, lm->intfs, ({
+        const vnet_hw_interface_t *hw =
+            vnet_get_hw_interface(vnm, n->hw_if_index);
+        const vnet_sw_interface_t *sw =
+            vnet_get_sw_interface(lm->vnet_main, hw->sw_if_index);
+        /* Interface shutdown */
+        if (!(sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
+          continue;
+        if (now < n->last_heard + n->ttl)
+          {
+            s = format(s, "%-25s %-25U %-25U %=15U %=15U %=10s\n", hw->name,
+                       format_lldp_chassis_id, n->chassis_id_subtype,
+                       n->chassis_id, vec_len(n->chassis_id), 0,
+                       format_lldp_port_id, n->port_id_subtype, n->port_id,
+                       vec_len(n->port_id), 0, format_time_ago, n->last_heard,
+                       now, format_time_ago, n->last_sent, now, "active");
+          }
+        else
+          {
+            s = format(s, "%-25s %-25s %-25s %=15U %=15U %=10s\n", hw->name,
+                       "", "", format_time_ago, n->last_heard, now,
+                       format_time_ago, n->last_sent, now, "inactive");
+          }
+      }));
+  /* *INDENT-ON* */
+  return s;
+}
+
+static clib_error_t *
+show_lldp (vlib_main_t * vm, unformat_input_t * input,
+	   CLIB_UNUSED (vlib_cli_command_t * lmd))
+{
+  lldp_main_t *lm = &lldp_main;
+
+  if (unformat (input, "detail"))
+    {
+      vlib_cli_output (vm, "%U\n", format_lldp_intfs, vm, lm, 1);
+    }
+  else
+    {
+      vlib_cli_output (vm, "%U\n", format_lldp_intfs, vm, lm, 0);
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND(show_lldp_command, static) = {
+  .path = "show lldp",
+  .short_help = "show lldp [detail]",
+  .function = show_lldp,
+};
+/* *INDENT-ON* */
+
+/*
+ * packet trace format function, very similar to
+ * lldp_packet_scan except that we call the per TLV format
+ * functions instead of the per TLV processing functions
+ */
+u8 *
+lldp_input_format_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  const lldp_input_trace_t *t = va_arg (*args, lldp_input_trace_t *);
+  const u8 *cur;
+  const lldp_tlv_t *tlv;
+  cur = t->data;
+  while (((cur + lldp_tlv_get_length ((lldp_tlv_t *) cur)) <
+	  t->data + t->len))
+    {
+      tlv = (lldp_tlv_t *) cur;
+      if (cur == t->data)
+	{
+	  s = format (s, "TLV #%d(%s): %U\n", lldp_tlv_get_code (tlv),
+		      lldp_tlv_code_str (lldp_tlv_get_code (tlv)),
+		      format_lldp_tlv, tlv);
+	}
+      else
+	{
+	  s = format (s, "  TLV #%d(%s): %U\n", lldp_tlv_get_code (tlv),
+		      lldp_tlv_code_str (lldp_tlv_get_code (tlv)),
+		      format_lldp_tlv, tlv);
+	}
+      cur += STRUCT_SIZE_OF (lldp_tlv_t, head) + lldp_tlv_get_length (tlv);
+    }
+
+  return s;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lldp/lldp_doc.md b/src/vnet/lldp/lldp_doc.md
new file mode 100644
index 00000000..bac480a5
--- /dev/null
+++ b/src/vnet/lldp/lldp_doc.md
@@ -0,0 +1,84 @@
+# VPP Link Layer Discovery Protocol (LLDP) implementation    {#lldp_doc}
+
+This is a memo intended to contain documentation of the VPP LLDP implementation
+Everything that is not directly obvious should come here.
+
+
+## LLDP
+LLDP is a link layer protocol to advertise the capabilities and current status of the system.
+
+There are 2 nodes handling LLDP
+
+1.) input-node which processes incoming packets and updates the local database
+2.) process-node which is responsible for sending out LLDP packets from VPP side
+
+
+### Configuration
+
+LLDP has a global configuration and a per-interface enable setting.
+
+Global configuration is modified using the "set lldp" command
+
+set lldp [system-name <string>] [tx-hold <value>] [tx-interval <value>]
+
+system-name: the name of the VPP system sent to peers in the system-name TLV
+tx-hold: multiplier for tx-interval when setting time-to-live (TTL) value in the LLDP packets (TTL = tx-hold * tx-interval + 1, if TTL > 65535, then TTL = 65535)
+tx-interval: time interval between sending out LLDP packets
+
+Per interface setting is done using the "set interface lldp" command
+
+set interface lldp <interface> (enable | disable)
+
+interface: the name of the interface for which to enable/disable LLDP
+
+
+### Configuration example
+
+Configure system-name as "VPP" and transmit interval to 10 seconds:
+
+set lldp system-name VPP tx-interval 10
+
+Enable LLDP on interface TenGigabitEthernet5/0/1
+
+set interface lldp TenGigabitEthernet5/0/1 enable
+
+
+### Operational data
+
+The list of LLDP-enabled interfaces which are up can be shown using "show lldp" command
+
+Example:
+DBGvpp# show lldp
+Local interface           Peer chassis ID           Remote port ID               Last heard      Last sent      Status
+GigabitEthernet2/0/1                                                               never         27.0s ago     inactive
+TenGigabitEthernet5/0/1   8c:60:4f:dd:ca:52         Eth1/3/3                     20.1s ago       18.3s ago      active
+
+All LLDP configuration data with all LLDP-enabled interfaces can be shown using "show lldp detail" command
+
+Example:
+DBGvpp# show lldp detail
+LLDP configuration:
+Configured system name: vpp
+Configured tx-hold: 4
+Configured tx-interval: 30
+
+LLDP-enabled interface table:
+
+Interface name: GigabitEthernet2/0/1
+Interface/peer state: inactive(timeout)
+Last known peer chassis ID:
+Last known peer port ID:
+Last packet sent: 12.4s ago
+Last packet received: never
+
+Interface name: GigabitEthernet2/0/2
+Interface/peer state: interface down
+Last packet sent: never
+
+Interface name: TenGigabitEthernet5/0/1
+Interface/peer state: active
+Peer chassis ID: 8c:60:4f:dd:ca:52(MAC address)
+Remote port ID: Eth1/3/3(Locally assigned)
+Last packet sent: 3.6s ago
+Last packet received: 5.5s ago
+
diff --git a/src/vnet/lldp/lldp_input.c b/src/vnet/lldp/lldp_input.c
new file mode 100644
index 00000000..762743d0
--- /dev/null
+++ b/src/vnet/lldp/lldp_input.c
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief LLDP packet parsing implementation
+ */
+#include <vnet/lldp/lldp_node.h>
+#include <vnet/lldp/lldp_protocol.h>
+#include <vlibmemory/api.h>
+
+typedef struct
+{
+  u32 hw_if_index;
+  u8 chassis_id_len;
+  u8 chassis_id_subtype;
+  u8 portid_len;
+  u8 portid_subtype;
+  u16 ttl;
+  u8 data[0];			/* this contains both chassis id (chassis_id_len bytes) and port
+				   id (portid_len bytes) */
+} lldp_intf_update_t;
+
+static void
+lldp_rpc_update_peer_cb (const lldp_intf_update_t * a)
+{
+  ASSERT (os_get_cpu_number () == 0);
+
+  lldp_intf_t *n = lldp_get_intf (&lldp_main, a->hw_if_index);
+  if (!n)
+    {
+      /* LLDP turned off for this interface, ignore the update */
+      return;
+    }
+  const u8 *chassis_id = a->data;
+  const u8 *portid = a->data + a->chassis_id_len;
+
+  if (n->chassis_id)
+    {
+      _vec_len (n->chassis_id) = 0;
+    }
+  vec_add (n->chassis_id, chassis_id, a->chassis_id_len);
+  n->chassis_id_subtype = a->chassis_id_subtype;
+  if (n->port_id)
+    {
+      _vec_len (n->port_id) = 0;
+    }
+  vec_add (n->port_id, portid, a->portid_len);
+  n->port_id_subtype = a->portid_subtype;
+  n->ttl = a->ttl;
+  n->last_heard = vlib_time_now (lldp_main.vlib_main);
+}
+
+static void
+lldp_rpc_update_peer (u32 hw_if_index, const u8 * chid, u8 chid_len,
+		      u8 chid_subtype, const u8 * portid,
+		      u8 portid_len, u8 portid_subtype, u16 ttl)
+{
+  const size_t data_size =
+    sizeof (lldp_intf_update_t) + chid_len + portid_len;
+  u8 data[data_size];
+  lldp_intf_update_t *u = (lldp_intf_update_t *) data;
+  u->hw_if_index = hw_if_index;
+  u->chassis_id_len = chid_len;
+  u->chassis_id_subtype = chid_subtype;
+  u->ttl = ttl;
+  u->portid_len = portid_len;
+  u->portid_subtype = portid_subtype;
+  clib_memcpy (u->data, chid, chid_len);
+  clib_memcpy (u->data + chid_len, portid, portid_len);
+  vl_api_rpc_call_main_thread (lldp_rpc_update_peer_cb, data, data_size);
+}
+
+lldp_tlv_code_t
+lldp_tlv_get_code (const lldp_tlv_t * tlv)
+{
+  return tlv->head.byte1 >> 1;
+}
+
+void
+lldp_tlv_set_code (lldp_tlv_t * tlv, lldp_tlv_code_t code)
+{
+  tlv->head.byte1 = (tlv->head.byte1 & 1) + (code << 1);
+}
+
+u16
+lldp_tlv_get_length (const lldp_tlv_t * tlv)
+{
+  return (((u16) (tlv->head.byte1 & 1)) << 8) + tlv->head.byte2;
+}
+
+void
+lldp_tlv_set_length (lldp_tlv_t * tlv, u16 length)
+{
+  tlv->head.byte2 = length & ((1 << 8) - 1);
+  if (length > (1 << 8) - 1)
+    {
+      tlv->head.byte1 |= 1;
+    }
+  else
+    {
+      tlv->head.byte1 &= (1 << 8) - 2;
+    }
+}
+
+lldp_main_t lldp_main;
+
+static int
+lldp_packet_scan (u32 hw_if_index, const lldp_tlv_t * pkt)
+{
+  const lldp_tlv_t *tlv = pkt;
+
+#define TLV_VIOLATES_PKT_BOUNDARY(pkt, tlv)                               \
+  (((((u8 *)tlv) + sizeof (lldp_tlv_t)) > ((u8 *)pkt + vec_len (pkt))) || \
+   ((((u8 *)tlv) + lldp_tlv_get_length (tlv)) > ((u8 *)pkt + vec_len (pkt))))
+
+  /* first tlv is always chassis id, followed by port id and ttl tlvs */
+  if (TLV_VIOLATES_PKT_BOUNDARY (pkt, tlv) ||
+      LLDP_TLV_NAME (chassis_id) != lldp_tlv_get_code (tlv))
+    {
+      return LLDP_ERROR_BAD_TLV;
+    }
+
+  u16 l = lldp_tlv_get_length (tlv);
+  if (l < STRUCT_SIZE_OF (lldp_chassis_id_tlv_t, subtype) +
+      LLDP_MIN_CHASS_ID_LEN ||
+      l > STRUCT_SIZE_OF (lldp_chassis_id_tlv_t, subtype) +
+      LLDP_MAX_CHASS_ID_LEN)
+    {
+      return LLDP_ERROR_BAD_TLV;
+    }
+
+  u8 chid_subtype = ((lldp_chassis_id_tlv_t *) tlv)->subtype;
+  u8 *chid = ((lldp_chassis_id_tlv_t *) tlv)->id;
+  u8 chid_len = l - STRUCT_SIZE_OF (lldp_chassis_id_tlv_t, subtype);
+
+  tlv = (lldp_tlv_t *) ((u8 *) tlv + STRUCT_SIZE_OF (lldp_tlv_t, head) + l);
+
+  if (TLV_VIOLATES_PKT_BOUNDARY (pkt, tlv) ||
+      LLDP_TLV_NAME (port_id) != lldp_tlv_get_code (tlv))
+    {
+      return LLDP_ERROR_BAD_TLV;
+    }
+  l = lldp_tlv_get_length (tlv);
+  if (l < STRUCT_SIZE_OF (lldp_port_id_tlv_t, subtype) +
+      LLDP_MIN_PORT_ID_LEN ||
+      l > STRUCT_SIZE_OF (lldp_chassis_id_tlv_t, subtype) +
+      LLDP_MAX_PORT_ID_LEN)
+    {
+      return LLDP_ERROR_BAD_TLV;
+    }
+
+  u8 portid_subtype = ((lldp_port_id_tlv_t *) tlv)->subtype;
+  u8 *portid = ((lldp_port_id_tlv_t *) tlv)->id;
+  u8 portid_len = l - STRUCT_SIZE_OF (lldp_port_id_tlv_t, subtype);
+
+  tlv = (lldp_tlv_t *) ((u8 *) tlv + STRUCT_SIZE_OF (lldp_tlv_t, head) + l);
+
+  if (TLV_VIOLATES_PKT_BOUNDARY (pkt, tlv) ||
+      LLDP_TLV_NAME (ttl) != lldp_tlv_get_code (tlv))
+    {
+      return LLDP_ERROR_BAD_TLV;
+    }
+  l = lldp_tlv_get_length (tlv);
+  if (l != STRUCT_SIZE_OF (lldp_ttl_tlv_t, ttl))
+    {
+      return LLDP_ERROR_BAD_TLV;
+    }
+  u16 ttl = ntohs (((lldp_ttl_tlv_t *) tlv)->ttl);
+  tlv = (lldp_tlv_t *) ((u8 *) tlv + STRUCT_SIZE_OF (lldp_tlv_t, head) + l);
+  while (!TLV_VIOLATES_PKT_BOUNDARY (pkt, tlv) &&
+	 LLDP_TLV_NAME (pdu_end) != lldp_tlv_get_code (tlv))
+    {
+      switch (lldp_tlv_get_code (tlv))
+	{
+#define F(num, type, str)     \
+  case LLDP_TLV_NAME (type):  \
+    /* ignore optional TLV */ \
+    break;
+	  foreach_lldp_optional_tlv_type (F);
+#undef F
+	default:
+	  return LLDP_ERROR_BAD_TLV;
+	}
+      tlv = (lldp_tlv_t *) ((u8 *) tlv + STRUCT_SIZE_OF (lldp_tlv_t, head) +
+			    lldp_tlv_get_length (tlv));
+    }
+  /* last tlv is pdu_end */
+  if (TLV_VIOLATES_PKT_BOUNDARY (pkt, tlv) ||
+      LLDP_TLV_NAME (pdu_end) != lldp_tlv_get_code (tlv) ||
+      0 != lldp_tlv_get_length (tlv))
+    {
+      return LLDP_ERROR_BAD_TLV;
+    }
+  lldp_rpc_update_peer (hw_if_index, chid, chid_len, chid_subtype, portid,
+			portid_len, portid_subtype, ttl);
+  return LLDP_ERROR_NONE;
+}
+
+lldp_intf_t *
+lldp_get_intf (lldp_main_t * lm, u32 hw_if_index)
+{
+  uword *p = hash_get (lm->intf_by_hw_if_index, hw_if_index);
+
+  if (p)
+    {
+      return pool_elt_at_index (lm->intfs, p[0]);
+    }
+  return NULL;
+}
+
+lldp_intf_t *
+lldp_create_intf (lldp_main_t * lm, u32 hw_if_index)
+{
+
+  uword *p;
+  lldp_intf_t *n;
+  p = hash_get (lm->intf_by_hw_if_index, hw_if_index);
+
+  if (p == 0)
+    {
+      pool_get (lm->intfs, n);
+      memset (n, 0, sizeof (*n));
+      n->hw_if_index = hw_if_index;
+      hash_set (lm->intf_by_hw_if_index, n->hw_if_index, n - lm->intfs);
+    }
+  else
+    {
+      n = pool_elt_at_index (lm->intfs, p[0]);
+    }
+  return n;
+}
+
+/*
+ * lldp input routine
+ */
+lldp_error_t
+lldp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0)
+{
+  lldp_main_t *lm = &lldp_main;
+  lldp_error_t e;
+
+  /* find our interface */
+  vnet_sw_interface_t *sw_interface = vnet_get_sw_interface (lm->vnet_main,
+							     vnet_buffer
+							     (b0)->sw_if_index
+							     [VLIB_RX]);
+  lldp_intf_t *n = lldp_get_intf (lm, sw_interface->hw_if_index);
+
+  if (!n)
+    {
+      /* lldp disabled on this interface, we're done */
+      return LLDP_ERROR_DISABLED;
+    }
+
+  /* Actually scan the packet */
+  e = lldp_packet_scan (sw_interface->hw_if_index,
+			vlib_buffer_get_current (b0));
+
+  return e;
+}
+
+/*
+ * setup function
+ */
+static clib_error_t *
+lldp_init (vlib_main_t * vm)
+{
+  clib_error_t *error;
+  lldp_main_t *lm = &lldp_main;
+
+  if ((error = vlib_call_init_function (vm, lldp_template_init)))
+    return error;
+
+  lm->vlib_main = vm;
+  lm->vnet_main = vnet_get_main ();
+  lm->msg_tx_hold = 4;		/* default value per IEEE 802.1AB-2009 */
+  lm->msg_tx_interval = 30;	/* default value per IEEE 802.1AB-2009 */
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (lldp_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lldp/lldp_node.c b/src/vnet/lldp/lldp_node.c
new file mode 100644
index 00000000..acaa5e10
--- /dev/null
+++ b/src/vnet/lldp/lldp_node.c
@@ -0,0 +1,341 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief LLDP nodes implementation
+ */
+#include <vnet/lldp/lldp_node.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/packet.h>
+
+/* set this to 1 to turn on debug prints via clib_warning() */
+#define LLDP_DEBUG (0)
+
+static vlib_node_registration_t lldp_process_node;
+
+#define F(sym, string) static char LLDP_ERR_##sym##_STR[] = string;
+foreach_lldp_error (F);
+#undef F
+
+/*
+ * packet counter strings
+ * Dump these counters via the "show error" CLI command
+ */
+static char *lldp_error_strings[] = {
+#define F(sym, string) LLDP_ERR_##sym##_STR,
+  foreach_lldp_error (F)
+#undef F
+};
+
+/*
+ * We actually send all lldp pkts to the "error" node after scanning
+ * them, so the graph node has only one next-index. The "error-drop"
+ * node automatically bumps our per-node packet counters for us.
+ */
+typedef enum
+{
+  LLDP_INPUT_NEXT_NORMAL,
+  LLDP_INPUT_N_NEXT,
+} lldp_next_t;
+
+/*
+ * Process a frame of lldp packets
+ * Expect 1 packet / frame
+ */
+static uword
+lldp_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+	      vlib_frame_t * frame)
+{
+  u32 n_left_from, *from;
+  lldp_input_trace_t *t0;
+
+  from = vlib_frame_vector_args (frame);	/* array of buffer indices */
+  n_left_from = frame->n_vectors;	/* number of buffer indices */
+
+  while (n_left_from > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      u32 next0, error0;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+
+      next0 = LLDP_INPUT_NEXT_NORMAL;
+
+      /* scan this lldp pkt. error0 is the counter index to bump */
+      error0 = lldp_input (vm, b0, bi0);
+      b0->error = node->errors[error0];
+
+      /* If this pkt is traced, snapshot the data */
+      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+	{
+	  int len;
+	  t0 = vlib_add_trace (vm, node, b0, sizeof (*t0));
+	  len = (b0->current_length < sizeof (t0->data)) ? b0->current_length
+	    : sizeof (t0->data);
+	  t0->len = len;
+	  clib_memcpy (t0->data, vlib_buffer_get_current (b0), len);
+	}
+      /* push this pkt to the next graph node, always error-drop */
+      vlib_set_next_frame_buffer (vm, node, next0, bi0);
+
+      from += 1;
+      n_left_from -= 1;
+    }
+
+  return frame->n_vectors;
+}
+
+/*
+ * lldp input graph node declaration
+ */
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(lldp_input_node, static) = {
+  .function = lldp_node_fn,
+  .name = "lldp-input",
+  .vector_size = sizeof(u32),
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = LLDP_N_ERROR,
+  .error_strings = lldp_error_strings,
+
+  .format_trace = lldp_input_format_trace,
+
+  .n_next_nodes = LLDP_INPUT_N_NEXT,
+  .next_nodes =
+      {
+              [LLDP_INPUT_NEXT_NORMAL] = "error-drop",
+      },
+};
+/* *INDENT-ON* */
+
+/*
+ * lldp process node function
+ */
+static uword
+lldp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  lldp_main_t *lm = &lldp_main;
+  f64 timeout = 0;
+  uword event_type, *event_data = 0;
+
+  /* So we can send events to the lldp process */
+  lm->lldp_process_node_index = lldp_process_node.index;
+
+  /* with ethernet input */
+  ethernet_register_input_type (vm, ETHERNET_TYPE_802_1_LLDP /* LLDP */ ,
+				lldp_input_node.index);
+
+  while (1)
+    {
+      if (vec_len (lm->intfs_timeouts))
+	{
+#if LLDP_DEBUG
+	  clib_warning ("DEBUG: wait for event with timeout %f", timeout);
+#endif
+	  (void) vlib_process_wait_for_event_or_clock (vm, timeout);
+	}
+      else
+	{
+#if LLDP_DEBUG
+	  clib_warning ("DEBUG: wait for event without timeout");
+#endif
+	  (void) vlib_process_wait_for_event (vm);
+	}
+      event_type = vlib_process_get_events (vm, &event_data);
+      switch (event_type)
+	{
+	case ~0:		/* no events => timeout */
+	  /* nothing to do here */
+	  break;
+	case LLDP_EVENT_RESCHEDULE:
+	  /* nothing to do here - reschedule is done automatically after
+	   * each event or timeout */
+	  break;
+	default:
+	  clib_warning ("BUG: event type 0x%wx", event_type);
+	  break;
+	}
+      if (!vec_len (lm->intfs_timeouts))
+	{
+	  continue;
+	}
+      /* send packet(s) and schedule another timeut */
+      const f64 now = vlib_time_now (lm->vlib_main);
+      while (1)
+	{
+	  lldp_intf_t *n = pool_elt_at_index (lm->intfs,
+					      lm->intfs_timeouts
+					      [lm->intfs_timeouts_idx]);
+	  if (n->last_sent < 0.01 || now > n->last_sent + lm->msg_tx_interval)
+	    {
+#if LLDP_DEBUG
+	      clib_warning ("send packet to lldp %p, if idx %d", n,
+			    n->hw_if_index);
+#endif
+	      lldp_send_ethernet (lm, n, 0);
+	      ++lm->intfs_timeouts_idx;
+	      if (lm->intfs_timeouts_idx >= vec_len (lm->intfs_timeouts))
+		{
+		  lm->intfs_timeouts_idx = 0;
+		}
+	      continue;
+	    }
+	  else
+	    {
+	      timeout = n->last_sent + lm->msg_tx_interval - now;
+	      break;
+	    }
+	}
+#if LLDP_DEBUG
+      clib_warning ("DEBUG: timeout set to %f", timeout);
+      u8 *s = NULL;
+      u32 i;
+      vec_foreach_index (i, lm->intfs_timeouts)
+      {
+	if (i == lm->intfs_timeouts_idx)
+	  {
+	    s = format (s, " [%d]", lm->intfs_timeouts[i]);
+	  }
+	else
+	  {
+	    s = format (s, " %d", lm->intfs_timeouts[i]);
+	  }
+      }
+      clib_warning ("DEBUG: timeout schedule: %s", s);
+      vec_free (s);
+#endif
+      if (event_data)
+	{
+	  _vec_len (event_data) = 0;
+	}
+    }
+
+  return 0;
+}
+
+/*
+ * lldp process node declaration
+ */
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(lldp_process_node, static) = {
+  .function = lldp_process,
+  .type = VLIB_NODE_TYPE_PROCESS,
+  .name = "lldp-process",
+};
+/* *INDENT-ON* */
+
+void
+lldp_schedule_intf (lldp_main_t * lm, lldp_intf_t * n)
+{
+  const int idx = n - lm->intfs;
+  u32 v;
+  vec_foreach_index (v, lm->intfs_timeouts)
+  {
+    if (lm->intfs_timeouts[v] == idx)
+      {
+	/* already scheduled */
+	return;
+      }
+  }
+  n->last_sent = 0;		/* ensure that a packet is sent out immediately */
+  /* put the interface at the current position in the timeouts - it
+   * will timeout immediately */
+  vec_insert (lm->intfs_timeouts, 1, lm->intfs_timeouts_idx);
+  lm->intfs_timeouts[lm->intfs_timeouts_idx] = n - lm->intfs;
+  vlib_process_signal_event (lm->vlib_main, lm->lldp_process_node_index,
+			     LLDP_EVENT_RESCHEDULE, 0);
+#if LLDP_DEBUG
+  clib_warning ("DEBUG: schedule interface %p, if idx %d", n, n->hw_if_index);
+#endif
+}
+
+void
+lldp_unschedule_intf (lldp_main_t * lm, lldp_intf_t * n)
+{
+  if (!n)
+    {
+      return;
+    }
+#if LLDP_DEBUG
+  clib_warning ("DEBUG: unschedule interface %p, if idx %d", n,
+		n->hw_if_index);
+#endif
+  const int idx = n - lm->intfs;
+  u32 v;
+  /* remove intf index from timeouts vector */
+  vec_foreach_index (v, lm->intfs_timeouts)
+  {
+    if (lm->intfs_timeouts[v] == idx)
+      {
+	vec_delete (lm->intfs_timeouts, 1, v);
+	break;
+      }
+  }
+  /* wrap current timeout index to first element if needed */
+  if (lm->intfs_timeouts_idx >= vec_len (lm->intfs_timeouts))
+    {
+      lm->intfs_timeouts_idx = 0;
+    }
+  vlib_process_signal_event (lm->vlib_main, lm->lldp_process_node_index,
+			     LLDP_EVENT_RESCHEDULE, 0);
+}
+
+static clib_error_t *
+lldp_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
+{
+  lldp_main_t *lm = &lldp_main;
+  vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  lldp_intf_t *n = lldp_get_intf (lm, hi->hw_if_index);
+  if (n)
+    {
+      if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
+	{
+	  /* FIXME - the packet sent here isn't send properly - need to find a
+	   * way to send the packet before interface goes down */
+	  lldp_send_ethernet (lm, n, 1);
+	  lldp_unschedule_intf (lm, n);
+	}
+    }
+  return 0;
+}
+
+VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (lldp_sw_interface_up_down);
+
+static clib_error_t *
+lldp_hw_interface_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+  lldp_main_t *lm = &lldp_main;
+  lldp_intf_t *n = lldp_get_intf (lm, hw_if_index);
+  if (n)
+    {
+      if (flags & VNET_HW_INTERFACE_FLAG_LINK_UP)
+	{
+	  lldp_schedule_intf (lm, n);
+	}
+    }
+  return 0;
+}
+
+VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (lldp_hw_interface_up_down);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lldp/lldp_node.h b/src/vnet/lldp/lldp_node.h
new file mode 100644
index 00000000..477ca7dc
--- /dev/null
+++ b/src/vnet/lldp/lldp_node.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief LLDP global declarations
+ */
+#ifndef __included_lldp_node_h__
+#define __included_lldp_node_h__
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vnet/snap/snap.h>
+#include <vppinfra/format.h>
+#include <vppinfra/hash.h>
+
+#include <vnet/lldp/lldp_protocol.h>
+
+typedef struct lldp_intf
+{
+  /* hw interface index */
+  u32 hw_if_index;
+
+  /* Timers */
+  f64 last_heard;
+  f64 last_sent;
+
+  /* Info received from peer */
+  u8 *chassis_id;
+  u8 *port_id;
+  u16 ttl;
+  lldp_port_id_subtype_t port_id_subtype;
+  lldp_chassis_id_subtype_t chassis_id_subtype;
+
+} lldp_intf_t;
+
+typedef struct
+{
+  /* pool of lldp-enabled interface context data */
+  lldp_intf_t *intfs;
+
+  /* rapidly find an interface by vlib hw interface index */
+  uword *intf_by_hw_if_index;
+
+  /* Background process node index */
+  u32 lldp_process_node_index;
+
+  /* interface idxs (into intfs pool) in the order of timing out */
+  u32 *intfs_timeouts;
+
+  /* index of the interface which will time out next */
+  u32 intfs_timeouts_idx;
+
+  /* packet template for sending out packets */
+  vlib_packet_template_t packet_template;
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+
+  /* system name advertised over LLDP (default is none) */
+  u8 *sys_name;
+
+  /* IEEE Std 802.1AB-2009:
+   * 9.2.5.6 msgTxHold
+   * This variable is used, as a multiplier of msgTxInterval, to determine the
+   * value of txTTL that is carried in LLDP frames transmitted by the LLDP
+   * agent. The recommended default value of msgTxHold is 4; this value can
+   * be changed by management to any value in the range 1 through 100.
+   */
+  u8 msg_tx_hold;
+
+  /* IEEE Std 802.1AB-2009:
+   * 9.2.5.7 msgTxInterval
+   * This variable defines the time interval in timer ticks between
+   * transmissions during normal transmission periods (i.e., txFast is zero).
+   * The recommended default value for msgTxInterval is 30 s; this value can
+   * be changed by management to any value in the range 1 through 3600.
+   */
+  u16 msg_tx_interval;
+} lldp_main_t;
+
+#define LLDP_MIN_TX_HOLD (1)
+#define LLDP_MAX_TX_HOLD (100)
+#define LLDP_MIN_TX_INTERVAL (1)
+#define LLDP_MAX_TX_INTERVAL (3600)
+
+extern lldp_main_t lldp_main;
+
+/* Packet counters */
+#define foreach_lldp_error(F)                     \
+    F(NONE, "good lldp packets (processed)")      \
+    F(CACHE_HIT, "good lldp packets (cache hit)") \
+    F(BAD_TLV, "lldp packets with bad TLVs")      \
+    F(DISABLED, "lldp packets received on disabled interfaces")
+
+typedef enum
+{
+#define F(sym, str) LLDP_ERROR_##sym,
+  foreach_lldp_error (F)
+#undef F
+    LLDP_N_ERROR,
+} lldp_error_t;
+
+/* lldp packet trace capture */
+typedef struct
+{
+  u32 len;
+  u8 data[400];
+} lldp_input_trace_t;
+
+enum
+{
+  LLDP_EVENT_RESCHEDULE = 1,
+} lldp_process_event_t;
+
+lldp_intf_t *lldp_get_intf (lldp_main_t * lm, u32 hw_if_index);
+lldp_intf_t *lldp_create_intf (lldp_main_t * lm, u32 hw_if_index);
+void lldp_delete_intf (lldp_main_t * lm, lldp_intf_t * n);
+lldp_error_t lldp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0);
+u8 *lldp_input_format_trace (u8 * s, va_list * args);
+void lldp_send_ethernet (lldp_main_t * lm, lldp_intf_t * n, int shutdown);
+void lldp_schedule_intf (lldp_main_t * lm, lldp_intf_t * n);
+void lldp_unschedule_intf (lldp_main_t * lm, lldp_intf_t * n);
+
+#endif /* __included_lldp_node_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lldp/lldp_output.c b/src/vnet/lldp/lldp_output.c
new file mode 100644
index 00000000..6cb26270
--- /dev/null
+++ b/src/vnet/lldp/lldp_output.c
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief LLDP packet generation implementation
+ */
+#include <vnet/lldp/lldp_node.h>
+
+static void
+lldp_add_chassis_id (const vnet_hw_interface_t * hw, u8 ** t0p)
+{
+  lldp_chassis_id_tlv_t *t = (lldp_chassis_id_tlv_t *) * t0p;
+
+  lldp_tlv_set_code ((lldp_tlv_t *) t, LLDP_TLV_NAME (chassis_id));
+  t->subtype = LLDP_CHASS_ID_SUBTYPE_NAME (mac_addr);
+
+  const size_t addr_len = 6;
+  clib_memcpy (&t->id, hw->hw_address, addr_len);
+  const size_t len =
+    STRUCT_SIZE_OF (lldp_chassis_id_tlv_t, subtype) + addr_len;
+  lldp_tlv_set_length ((lldp_tlv_t *) t, len);
+  *t0p += STRUCT_SIZE_OF (lldp_tlv_t, head) + len;
+}
+
+static void
+lldp_add_port_id (const vnet_hw_interface_t * hw, u8 ** t0p)
+{
+  lldp_port_id_tlv_t *t = (lldp_port_id_tlv_t *) * t0p;
+
+  lldp_tlv_set_code ((lldp_tlv_t *) t, LLDP_TLV_NAME (port_id));
+  t->subtype = LLDP_PORT_ID_SUBTYPE_NAME (intf_name);
+
+  const size_t name_len = vec_len (hw->name);
+  clib_memcpy (&t->id, hw->name, name_len);
+  const size_t len = STRUCT_SIZE_OF (lldp_port_id_tlv_t, subtype) + name_len;
+  lldp_tlv_set_length ((lldp_tlv_t *) t, len);
+  *t0p += STRUCT_SIZE_OF (lldp_tlv_t, head) + len;
+}
+
+static void
+lldp_add_ttl (const lldp_main_t * lm, u8 ** t0p, int shutdown)
+{
+  lldp_ttl_tlv_t *t = (lldp_ttl_tlv_t *) * t0p;
+  lldp_tlv_set_code ((lldp_tlv_t *) t, LLDP_TLV_NAME (ttl));
+  if (shutdown)
+    {
+      t->ttl = 0;
+    }
+  else
+    {
+      if ((size_t) lm->msg_tx_interval * lm->msg_tx_hold + 1 > (1 << 16) - 1)
+	{
+	  t->ttl = htons ((1 << 16) - 1);
+	}
+      else
+	{
+	  t->ttl = htons (lm->msg_tx_hold * lm->msg_tx_interval + 1);
+	}
+    }
+  const size_t len = STRUCT_SIZE_OF (lldp_ttl_tlv_t, ttl);
+  lldp_tlv_set_length ((lldp_tlv_t *) t, len);
+  *t0p += STRUCT_SIZE_OF (lldp_tlv_t, head) + len;
+}
+
+static void
+lldp_add_sys_name (const lldp_main_t * lm, u8 ** t0p)
+{
+  const size_t len = vec_len (lm->sys_name);
+  if (len)
+    {
+      lldp_tlv_t *t = (lldp_tlv_t *) * t0p;
+      lldp_tlv_set_code (t, LLDP_TLV_NAME (sys_name));
+      lldp_tlv_set_length (t, len);
+      clib_memcpy (t->v, lm->sys_name, len);
+      *t0p += STRUCT_SIZE_OF (lldp_tlv_t, head) + len;
+    }
+}
+
+static void
+lldp_add_pdu_end (u8 ** t0p)
+{
+  lldp_tlv_t *t = (lldp_tlv_t *) * t0p;
+  lldp_tlv_set_code (t, LLDP_TLV_NAME (pdu_end));
+  lldp_tlv_set_length (t, 0);
+  *t0p += STRUCT_SIZE_OF (lldp_tlv_t, head);
+}
+
+static void
+lldp_add_tlvs (lldp_main_t * lm, vnet_hw_interface_t * hw, u8 ** t0p,
+	       int shutdown)
+{
+  lldp_add_chassis_id (hw, t0p);
+  lldp_add_port_id (hw, t0p);
+  lldp_add_ttl (lm, t0p, shutdown);
+  lldp_add_sys_name (lm, t0p);
+  lldp_add_pdu_end (t0p);
+}
+
+/*
+ * send a lldp pkt on an ethernet interface
+ */
+void
+lldp_send_ethernet (lldp_main_t * lm, lldp_intf_t * n, int shutdown)
+{
+  u32 *to_next;
+  ethernet_header_t *h0;
+  vnet_hw_interface_t *hw;
+  u32 bi0;
+  vlib_buffer_t *b0;
+  u8 *t0;
+  vlib_frame_t *f;
+  vlib_main_t *vm = lm->vlib_main;
+  vnet_main_t *vnm = lm->vnet_main;
+
+  /*
+   * see lldp_template_init() to understand what's already painted
+   * into the buffer by the packet template mechanism
+   */
+  h0 = vlib_packet_template_get_packet (vm, &lm->packet_template, &bi0);
+
+  /* Add the interface's ethernet source address */
+  hw = vnet_get_hw_interface (vnm, n->hw_if_index);
+
+  clib_memcpy (h0->src_address, hw->hw_address, vec_len (hw->hw_address));
+
+  u8 *data = ((u8 *) h0) + sizeof (*h0);
+  t0 = data;
+
+  /* add TLVs */
+  lldp_add_tlvs (lm, hw, &t0, shutdown);
+
+  /* Set the outbound packet length */
+  b0 = vlib_get_buffer (vm, bi0);
+  b0->current_length = sizeof (*h0) + t0 - data;
+
+  /* And the outbound interface */
+  vnet_buffer (b0)->sw_if_index[VLIB_TX] = hw->sw_if_index;
+
+  /* And output the packet on the correct interface */
+  f = vlib_get_frame_to_node (vm, hw->output_node_index);
+  to_next = vlib_frame_vector_args (f);
+  to_next[0] = bi0;
+  f->n_vectors = 1;
+
+  vlib_put_frame_to_node (vm, hw->output_node_index, f);
+  n->last_sent = vlib_time_now (vm);
+}
+
+void
+lldp_delete_intf (lldp_main_t * lm, lldp_intf_t * n)
+{
+  if (n)
+    {
+      lldp_unschedule_intf (lm, n);
+      hash_unset (lm->intf_by_hw_if_index, n->hw_if_index);
+      vec_free (n->chassis_id);
+      vec_free (n->port_id);
+      pool_put (lm->intfs, n);
+    }
+}
+
+static clib_error_t *
+lldp_template_init (vlib_main_t * vm)
+{
+  lldp_main_t *lm = &lldp_main;
+
+  /* Create the ethernet lldp packet template */
+  {
+    ethernet_header_t h;
+
+    memset (&h, 0, sizeof (h));
+
+    /*
+     * Send to 01:80:C2:00:00:0E - propagation constrained to a single
+     * physical link - stopped by all type of bridge
+     */
+    h.dst_address[0] = 0x01;
+    h.dst_address[1] = 0x80;
+    h.dst_address[2] = 0xC2;
+    /* h.dst_address[3] = 0x00; (memset) */
+    /* h.dst_address[4] = 0x00; (memset) */
+    h.dst_address[5] = 0x0E;
+
+    /* leave src address blank (fill in at send time) */
+
+    h.type = htons (ETHERNET_TYPE_802_1_LLDP);
+
+    vlib_packet_template_init (vm, &lm->packet_template,
+			       /* data */ &h, sizeof (h),
+			       /* alloc chunk size */ 8, "lldp-ethernet");
+  }
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (lldp_template_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/lldp/lldp_protocol.h b/src/vnet/lldp/lldp_protocol.h
new file mode 100644
index 00000000..e641b26e
--- /dev/null
+++ b/src/vnet/lldp/lldp_protocol.h
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2011-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_lldp_protocol_h__
+#define __included_lldp_protocol_h__
+/**
+ * @file
+ * @brief LLDP protocol declarations
+ */
+#include <vnet/srp/packet.h>
+
+/*
+ * optional TLV codes.
+ */
+#define foreach_lldp_optional_tlv_type(F) \
+  F (4, port_desc, "Port Description")    \
+  F (5, sys_name, "System name")          \
+  F (6, sys_desc, "System Description")   \
+  F (7, sys_caps, "System Capabilities")  \
+  F (8, mgmt_addr, "Management Address")  \
+  F (127, org_spec, "Organizationally Specific TLV")
+
+/*
+ * all TLV codes.
+ */
+#define foreach_lldp_tlv_type(F)  \
+  F (0, pdu_end, "End of LLDPDU") \
+  F (1, chassis_id, "Chassis ID") \
+  F (2, port_id, "Port ID")       \
+  F (3, ttl, "Time To Live")      \
+  foreach_lldp_optional_tlv_type (F)
+
+#define LLDP_TLV_NAME(t) LLDP_TLV_##t
+
+typedef enum
+{
+#define F(n, t, s) LLDP_TLV_NAME (t) = n,
+  foreach_lldp_tlv_type (F)
+#undef F
+} lldp_tlv_code_t;
+
+struct lldp_tlv_head
+{
+  u8 byte1;			/* contains TLV code in the upper 7 bits + MSB of length */
+  u8 byte2;			/* contains the lower bits of length */
+};
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  struct lldp_tlv_head head;
+  u8 v[0];
+}) lldp_tlv_t;
+/* *INDENT-ON* */
+
+lldp_tlv_code_t lldp_tlv_get_code (const lldp_tlv_t * tlv);
+void lldp_tlv_set_code (lldp_tlv_t * tlv, lldp_tlv_code_t code);
+u16 lldp_tlv_get_length (const lldp_tlv_t * tlv);
+void lldp_tlv_set_length (lldp_tlv_t * tlv, u16 length);
+
+#define foreach_chassis_id_subtype(F)      \
+  F (0, reserved, "Reserved")              \
+  F (1, chassis_comp, "Chassis component") \
+  F (2, intf_alias, "Interface alias")     \
+  F (3, port_comp, "Port component")       \
+  F (4, mac_addr, "MAC address")           \
+  F (5, net_addr, "Network address")       \
+  F (6, intf_name, "Interface name")       \
+  F (7, local, "Locally assigned")
+
+#define LLDP_CHASS_ID_SUBTYPE_NAME(t) LLDP_CHASS_ID_SUBTYPE_##t
+#define LLDP_MIN_CHASS_ID_LEN (1)
+#define LLDP_MAX_CHASS_ID_LEN (255)
+
+typedef enum
+{
+#define F(n, t, s) LLDP_CHASS_ID_SUBTYPE_NAME (t) = n,
+  foreach_chassis_id_subtype (F)
+#undef F
+} lldp_chassis_id_subtype_t;
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  struct lldp_tlv_head head;
+  u8 subtype;
+  u8 id[0];
+}) lldp_chassis_id_tlv_t;
+/* *INDENT-ON* */
+
+#define foreach_port_id_subtype(F)            \
+  F (0, reserved, "Reserved")                 \
+  F (1, intf_alias, "Interface alias")        \
+  F (2, port_comp, "Port component")          \
+  F (3, mac_addr, "MAC address")              \
+  F (4, net_addr, "Network address")          \
+  F (5, intf_name, "Interface name")          \
+  F (6, agent_circuit_id, "Agent circuit ID") \
+  F (7, local, "Locally assigned")
+
+#define LLDP_PORT_ID_SUBTYPE_NAME(t) LLDP_PORT_ID_SUBTYPE_##t
+#define LLDP_MIN_PORT_ID_LEN (1)
+#define LLDP_MAX_PORT_ID_LEN (255)
+
+typedef enum
+{
+#define F(n, t, s) LLDP_PORT_ID_SUBTYPE_NAME (t) = n,
+  foreach_port_id_subtype (F)
+#undef F
+} lldp_port_id_subtype_t;
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  struct lldp_tlv_head head;
+  u8 subtype;
+  u8 id[0];
+}) lldp_port_id_tlv_t;
+
+typedef CLIB_PACKED (struct {
+  struct lldp_tlv_head head;
+  u16 ttl;
+}) lldp_ttl_tlv_t;
+/* *INDENT-ON* */
+
+#endif /* __included_lldp_protocol_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/map/examples/gen-rules.py b/src/vnet/map/examples/gen-rules.py
new file mode 100755
index 00000000..7964aa9a
--- /dev/null
+++ b/src/vnet/map/examples/gen-rules.py
@@ -0,0 +1,186 @@
+#!/usr/bin/env python3
+
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import ipaddress
+import argparse
+import sys
+
+# map add domain ip4-pfx <pfx> ip6-pfx ::/0 ip6-src <ip6-src> ea-bits-len 0 psid-offset 6 psid-len 6
+# map add rule index <0> psid <psid> ip6-dst <ip6-dst>
+
+def_ip4_pfx = '192.0.2.0/24'
+def_ip6_pfx = '2001:db8::/32'
+def_ip6_src = '2001:db8::1'
+def_psid_offset = 6
+def_psid_len = 6
+def_ea_bits_len = 0
+
+parser = argparse.ArgumentParser(description='MAP VPP configuration generator')
+parser.add_argument('-t', action="store", dest="mapmode")
+parser.add_argument('-f', action="store", dest="format", default="vpp")
+parser.add_argument('--ip4-prefix', action="store", dest="ip4_pfx", default=def_ip4_pfx)
+parser.add_argument('--ip6-prefix', action="store", dest="ip6_pfx", default=def_ip6_pfx)
+parser.add_argument('--ip6-src', action="store", dest="ip6_src", default=def_ip6_src)
+parser.add_argument('--psid-len', action="store", dest="psid_len", default=def_psid_len)
+parser.add_argument('--psid-offset', action="store", dest="psid_offset", default=def_psid_offset)
+parser.add_argument('--ea-bits-len', action="store", dest="ea_bits_len", default=def_ea_bits_len)
+args = parser.parse_args()
+
+#
+# Print domain
+#
+def domain_print(i, ip4_pfx, ip6_pfx, ip6_src, eabits_len, psid_offset, psid_len):
+    if format == 'vpp':
+        print("map add domain ip4-pfx " + ip4_pfx + " ip6-pfx", ip6_pfx, "ip6-src " + ip6_src +
+              " ea-bits-len", eabits_len, "psid-offset", psid_offset, "psid-len", psid_len)
+    if format == 'confd':
+        print("vpp softwire softwire-instances softwire-instance", i, "br-ipv6 " + ip6_src +
+              " ipv6-prefix " + ip6_pfx + " ipv4-prefix " + ip4_pfx +
+              " ea-bits-len", eabits_len, "psid-offset", psid_offset, "psid-len", psid_len)
+    if format == 'xml':
+        print("<softwire-instance>")
+        print("<id>", i, "</id>");
+        print("  <br-ipv6>" + ip6_src + "</br-ipv6>")
+        print("  <ipv6-prefix>" + ip6_pfx + "</ipv6-prefix>")
+        print("  <ipv4-prefix>" + ip4_pfx + "</ipv4-prefix>")
+        print("  <ea-len>", eabits_len, "</ea-len>")
+        print("  <psid-len>", psid_len, "</psid-len>")
+        print("  <psid-offset>", psid_offset, "</psid-offset>")
+
+def domain_print_end():
+    if format == 'xml':
+        print("</softwire-instance>")
+
+def rule_print(i, psid, dst):
+    if format == 'vpp':
+        print("map add rule index", i, "psid", psid, "ip6-dst", dst)
+    if format == 'confd':
+        print("binding", psid, "ipv6-addr", dst)
+    if format == 'xml':
+        print("  <binding>")
+        print("    <psid>", psid, "</psid>")
+        print("    <ipv6-addr>", dst, "</ipv6-addr>")
+        print("  </binding>")
+
+#
+# Algorithmic mapping Shared IPv4 address
+#
+def algo(ip4_pfx_str, ip6_pfx_str, ip6_src_str, ea_bits_len, psid_offset, psid_len, ip6_src_ecmp = False):
+    domain_print(0, ip4_pfx_str, ip6_pfx_str, ip6_src_str, ea_bits_len, psid_offset, psid_len)
+    domain_print_end()
+
+#
+# 1:1 Full IPv4 address
+#
+def lw46(ip4_pfx_str, ip6_pfx_str, ip6_src_str, ea_bits_len, psid_offset, psid_len, ip6_src_ecmp = False):
+    ip4_pfx = ipaddress.ip_network(ip4_pfx_str)
+    ip6_src = ipaddress.ip_address(ip6_src_str)
+    ip6_dst = ipaddress.ip_network(ip6_pfx_str)
+    psid_len = 0
+    mod = ip4_pfx.num_addresses / 1024
+
+    for i in range(ip4_pfx.num_addresses):
+        domain_print(i, str(ip4_pfx[i]) + "/32", str(ip6_dst[i]) + "/128", str(ip6_src), 0, 0, 0)
+        domain_print_end()
+        if ip6_src_ecmp and not i % mod:
+            ip6_src = ip6_src + 1
+
+#
+# 1:1 Shared IPv4 address, shared BR (16) VPP CLI
+#
+def lw46_shared(ip4_pfx_str, ip6_pfx_str, ip6_src_str, ea_bits_len, psid_offset, psid_len, ip6_src_ecmp = False):
+    ip4_pfx = ipaddress.ip_network(ip4_pfx_str)
+    ip6_src = ipaddress.ip_address(ip6_src_str)
+    ip6_dst = ipaddress.ip_network(ip6_pfx_str)
+    mod = ip4_pfx.num_addresses / 1024
+
+    for i in range(ip4_pfx.num_addresses):
+        domain_print(i, str(ip4_pfx[i]) + "/32", "::/0", str(ip6_src), 0, 0, psid_len)
+        for psid in range(0x1 << int(psid_len)):
+            rule_print(i, psid, str(ip6_dst[(i * (0x1<<int(psid_len))) + psid]))
+        domain_print_end()
+        if ip6_src_ecmp and not i % mod:
+            ip6_src = ip6_src + 1
+
+
+#
+# 1:1 Shared IPv4 address, shared BR
+#
+def lw46_shared_b(ip4_pfx_str, ip6_pfx_str, ip6_src_str, ea_bits_len, psid_offset, psid_len, ip6_src_ecmp = False):
+    ip4_pfx = ipaddress.ip_network(ip4_pfx_str)
+    ip6_src = ipaddress.ip_address(ip6_src_str)
+    ip6_dst = list(ipaddress.ip_network(ip6_pfx_str).subnets(new_prefix=56))
+    mod = ip4_pfx.num_addresses / 1024
+
+    for i in range(ip4_pfx.num_addresses):
+        domain_print(i, str(ip4_pfx[i]) + "/32", "::/0", str(ip6_src), 0, 0, psid_len)
+        for psid in range(0x1 << psid_len):
+            enduserprefix = list(ip6_dst.pop(0).subnets(new_prefix=64))[255-1]
+            rule_print(i, psid, enduserprefix[(i * (0x1<<psid_len)) + psid])
+        domain_print_end()
+        if ip6_src_ecmp and not i % mod:
+            ip6_src = ip6_src + 1
+
+
+def xml_header_print():
+    print('''
+<?xml version="1.0" encoding="UTF-8"?>
+    <hello xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+    <capabilities>
+    <capability>urn:ietf:params:netconf:base:1.0</capability>
+    </capabilities>
+    </hello>
+]]>]]>
+
+<?xml version="1.0" encoding="UTF-8"?>
+    <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"  message-id="1">
+    <edit-config>
+    <target>
+    <candidate/>
+    </target>
+    <config>
+
+    <vpp xmlns="http://www.cisco.com/yang/cisco-vpp">
+ <softwire>
+ <softwire-instances>
+
+    ''')
+
+def xml_footer_print():
+    print('''
+</softwire-instances>
+</softwire>
+</vpp>
+    </config>
+    </edit-config>
+    </rpc>
+
+]]>]]>
+
+<?xml version="1.0" encoding="UTF-8"?>
+    <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="2">
+    <close-session/>
+    </rpc>
+
+]]>]]>
+    ''')
+
+
+format = args.format
+if format == 'xml':
+    xml_header_print()
+globals()[args.mapmode](args.ip4_pfx, args.ip6_pfx, args.ip6_src, args.ea_bits_len, args.psid_offset, args.psid_len)
+if format == 'xml':
+    xml_footer_print()
diff --git a/src/vnet/map/examples/health_check.c b/src/vnet/map/examples/health_check.c
new file mode 100644
index 00000000..5f0d85fe
--- /dev/null
+++ b/src/vnet/map/examples/health_check.c
@@ -0,0 +1,109 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/ip_icmp.h>
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <stdbool.h>
+#include <errno.h>
+
+static void
+usage (void) {
+  fprintf(stderr,
+	  "Usage: health_check"
+	  " -d debug"
+	  " -I interface"
+	  "\n");
+  exit(2);
+}
+
+int
+main (int argc, char **argv)
+{
+  int sd, ch;
+  uint8_t *opt, *pkt;
+  struct ifreq ifr;
+  char *interface = NULL;
+  bool debug = false;
+
+  while ((ch = getopt(argc, argv, "h?" "I:" "d")) != EOF) {
+    switch(ch) {
+    case 'I':
+      interface = optarg;
+      break;
+    case 'd':
+      debug = true;
+      break;
+    default:
+      usage();
+      break;
+    }
+  }
+
+  argc -= optind;
+  argv += optind;
+
+  if (!interface)
+    usage();
+
+  /* Request a socket descriptor sd. */
+  if ((sd = socket (AF_INET6, SOCK_RAW, IPPROTO_IPIP)) < 0) {
+    perror ("Failed to get socket descriptor ");
+    exit (EXIT_FAILURE);
+  }
+
+  memset(&ifr, 0, sizeof(ifr));
+  snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", interface);
+
+  /* Bind socket to interface of this node. */
+  if (setsockopt (sd, SOL_SOCKET, SO_BINDTODEVICE, (void *) &ifr, sizeof (ifr)) < 0) {
+    perror ("SO_BINDTODEVICE failed");
+    exit (EXIT_FAILURE);
+  }
+  if (debug) printf("Binding to interface %s\n", interface);
+
+  while (1) {
+    struct sockaddr_in6 src_addr;
+    socklen_t addrlen = sizeof(src_addr);
+    char source[INET6_ADDRSTRLEN+1];
+    int len;
+    uint8_t inpack[IP_MAXPACKET];
+
+    if ((len = recvfrom(sd, inpack, sizeof(inpack), 0, (struct sockaddr *)&src_addr, &addrlen)) < 0) {
+      perror("recvfrom failed ");
+    }
+    if (inet_ntop(AF_INET6, &src_addr.sin6_addr, source, INET6_ADDRSTRLEN) == NULL) {
+      perror("inet_ntop() failed.");
+      exit(EXIT_FAILURE);
+    }
+
+    /* Reply */
+    struct iphdr *ip = (struct iphdr *)inpack;
+    uint32_t saddr;
+    struct icmphdr *icmp;
+
+    saddr = ip->saddr;
+    ip->saddr = ip->daddr;
+    ip->daddr = saddr;
+
+    switch (ip->protocol) {
+    case 1:
+      if (debug) printf ("ICMP Echo request from %s\n", source);
+      icmp = (struct icmphdr *)&ip[1];
+      icmp->type = ICMP_ECHOREPLY;
+      break;
+    default:
+      fprintf(stderr, "Unsupported protocol %d", ip->protocol);
+    }
+    if (len = sendto(sd, inpack, len, 0, (struct sockaddr *)&src_addr, addrlen) < 0) {
+      perror("sendto failed ");
+    }
+  }
+
+  close (sd);
+
+  return (EXIT_SUCCESS);
+}
diff --git a/src/vnet/map/examples/test_map.py b/src/vnet/map/examples/test_map.py
new file mode 100755
index 00000000..21388d49
--- /dev/null
+++ b/src/vnet/map/examples/test_map.py
@@ -0,0 +1,141 @@
+#!/usr/bin/env python
+
+import time,argparse,sys,cmd, unittest
+from ipaddress import *
+
+parser = argparse.ArgumentParser(description='VPP MAP test')
+parser.add_argument('-i', nargs='*', action="store", dest="inputdir")
+args = parser.parse_args()
+
+for dir in args.inputdir:
+    sys.path.append(dir)
+from vpp_papi import *
+
+#
+# 1:1 Shared IPv4 address, shared BR (16) VPP CLI
+#
+def lw46_shared(ip4_pfx_str, ip6_pfx_str, ip6_src_str, ea_bits_len, psid_offset, psid_len, ip6_src_ecmp = False):
+    ip4_pfx = ip_network(ip4_pfx_str)
+    ip6_src = ip_address(ip6_src_str)
+    ip6_dst = ip_network(ip6_pfx_str)
+    ip6_nul = IPv6Address(u'0::0')
+    mod = ip4_pfx.num_addresses / 1024
+
+    for i in range(ip4_pfx.num_addresses):
+        a = time.clock()
+        t = map_add_domain(0, ip6_nul.packed, ip4_pfx[i].packed, ip6_src.packed, 0, 32, 128, ea_bits_len, psid_offset, psid_len, 0, 0)
+        #print "Return from map_add_domain", t
+        if t == None:
+            print "map_add_domain failed"
+            continue
+        if t.retval != 0:
+            print "map_add_domain failed", t
+            continue
+        for psid in range(0x1 << int(psid_len)):
+            r = map_add_del_rule(0, t.index, 1, (ip6_dst[(i * (0x1<<int(psid_len))) + psid]).packed, psid)
+            #print "Return from map_add_del_rule", r
+
+        if ip6_src_ecmp and not i % mod:
+            ip6_src = ip6_src + 1
+
+        print "Running time:", time.clock() - a
+
+class TestMAP(unittest.TestCase):
+    '''
+    def test_delete_all(self):
+        t = map_domain_dump(0)
+        self.assertNotEqual(t, None)
+        print "Number of domains configured: ", len(t)
+        for d in t:
+            ts = map_del_domain(0, d.domainindex)
+            self.assertNotEqual(ts, None)
+        t = map_domain_dump(0)
+        self.assertNotEqual(t, None)
+        print "Number of domains configured: ", len(t)
+        self.assertEqual(len(t), 0)
+
+    '''
+
+    def test_a_million_rules(self):
+        ip4_pfx = u'192.0.2.0/24'
+        ip6_pfx = u'2001:db8::/32'
+        ip6_src = u'2001:db8::1'
+        psid_offset = 6
+        psid_len = 6
+        ea_bits_len = 0
+        lw46_shared(ip4_pfx, ip6_pfx, ip6_src, ea_bits_len, psid_offset, psid_len)
+
+#
+# RX thread, that should sit on blocking vpe_api_read()
+
+# 
+
+
+#
+#
+#
+import threading
+class RXThread (threading.Thread):
+    def __init__(self):
+        threading.Thread.__init__(self)
+
+    def run(self):
+        print "Starting "
+        i = 0
+        while True:
+            msg = vpe_api_read()
+            if msg:
+                #print msg
+                id = unpack('>H', msg[0:2])
+                size = unpack('>H', msg[2:4])
+                print "Received", id, "of size", size
+                i += 1
+                #del msg
+                continue
+
+            #time.sleep(0.001)
+        return
+
+# Create RX thread
+rxthread = RXThread()
+rxthread.setDaemon(True)
+        
+print "Connect", connect_to_vpe("client124")
+import timeit
+rxthread.start()
+print "After thread started"
+
+#pneum_kill_thread()
+print "After thread killed"
+
+#t = show_version(0)
+#print "Result from show version", t
+
+print timeit.timeit('t = show_version(0)', number=1000, setup="from __main__ import show_version")
+time.sleep(10)
+#print timeit.timeit('control_ping(0)', number=10, setup="from __main__ import control_ping")
+
+
+disconnect_from_vpe()
+sys.exit()
+
+
+print t.program, t.version,t.builddate,t.builddirectory
+
+'''
+
+t = map_domain_dump(0)
+if not t:
+    print('show map domain failed')
+
+for d in t:
+    print("IP6 prefix:",str(IPv6Address(d.ip6prefix)))
+    print( "IP4 prefix:",str(IPv4Address(d.ip4prefix)))
+'''
+
+suite = unittest.TestLoader().loadTestsFromTestCase(TestMAP)
+unittest.TextTestRunner(verbosity=2).run(suite)
+
+disconnect_from_vpe()
+
+
diff --git a/src/vnet/map/gen-rules.py b/src/vnet/map/gen-rules.py
new file mode 100755
index 00000000..533a8e23
--- /dev/null
+++ b/src/vnet/map/gen-rules.py
@@ -0,0 +1,107 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import ipaddress
+import argparse
+import sys
+
+# map add domain ip4-pfx <pfx> ip6-pfx ::/0 ip6-src <ip6-src> ea-bits-len 0 psid-offset 6 psid-len 6
+# map add rule index <0> psid <psid> ip6-dst <ip6-dst>
+
+parser = argparse.ArgumentParser(description='MAP VPP configuration generator')
+parser.add_argument('-t', action="store", dest="mapmode")
+args = parser.parse_args()
+
+#
+# 1:1 Shared IPv4 address, shared BR
+#
+def shared11br():
+    ip4_pfx = ipaddress.ip_network('20.0.0.0/16')
+    ip6_dst = ipaddress.ip_network('bbbb::/32')
+    psid_len = 6
+    for i in range(ip4_pfx.num_addresses):
+        print("map add domain ip4-pfx " + str(ip4_pfx[i]) +  "/32 ip6-pfx ::/0 ip6-shared-src cccc:bbbb::1",
+              "ea-bits-len 0 psid-offset 6 psid-len", psid_len)
+        for psid in range(0x1 << psid_len):
+            print("map add rule index", i, "psid", psid, "ip6-dst", ip6_dst[(i * (0x1<<psid_len)) + psid])
+
+
+#
+# 1:1 Shared IPv4 address
+#
+def shared11():
+    ip4_pfx = ipaddress.ip_network('20.0.0.0/16')
+    ip6_src = ipaddress.ip_network('cccc:bbbb::/64')
+    ip6_dst = ipaddress.ip_network('bbbb::/32')
+    psid_len = 6
+    for i in range(ip4_pfx.num_addresses):
+        print("map add domain ip4-pfx " + str(ip4_pfx[i]) +  "/32 ip6-pfx ::/0 ip6-src", ip6_src[i],
+              "ea-bits-len 0 psid-offset 6 psid-len", psid_len)
+        for psid in range(0x1 << psid_len):
+            print("map add rule index", i, "psid", psid, "ip6-dst", ip6_dst[(i * (0x1<<psid_len)) + psid])
+
+#
+# 1:1 Shared IPv4 address small
+#
+def smallshared11():
+    ip4_pfx = ipaddress.ip_network('20.0.0.0/24')
+    ip6_src = ipaddress.ip_network('cccc:bbbb::/64')
+    ip6_dst = ipaddress.ip_network('bbbb::/32')
+    psid_len = 6
+    for i in range(ip4_pfx.num_addresses):
+        print("map add domain ip4-pfx " + str(ip4_pfx[i]) +  "/32 ip6-pfx ::/0 ip6-src", ip6_src[i],
+              "ea-bits-len 0 psid-offset 6 psid-len", psid_len)
+        for psid in range(0x1 << psid_len):
+            print("map add rule index", i, "psid", psid, "ip6-dst", ip6_dst[(i * (0x1<<psid_len)) + psid])
+
+#
+# 1:1 Full IPv4 address
+#
+def full11():
+    ip4_pfx = ipaddress.ip_network('20.0.0.0/16')
+    ip6_src = ipaddress.ip_network('cccc:bbbb::/64')
+    ip6_dst = ipaddress.ip_network('bbbb::/32')
+    psid_len = 0
+    for i in range(ip4_pfx.num_addresses):
+        print("map add domain ip4-pfx " + str(ip4_pfx[i]) +  "/32 ip6-pfx " + str(ip6_dst[i]) + "/128 ip6-src", ip6_src[i],
+              "ea-bits-len 0 psid-offset 0 psid-len 0")
+def full11br():
+    ip4_pfx = ipaddress.ip_network('20.0.0.0/16')
+    ip6_dst = ipaddress.ip_network('bbbb::/32')
+    psid_len = 0
+    for i in range(ip4_pfx.num_addresses):
+        print("map add domain ip4-pfx " + str(ip4_pfx[i]) +  "/32 ip6-pfx " + str(ip6_dst[i]) + "/128 ip6-shared-src cccc:bbbb::1",
+              "ea-bits-len 0 psid-offset 0 psid-len 0")
+
+#
+# Algorithmic mapping Shared IPv4 address
+#
+def algo():
+    print("map add domain ip4-pfx 20.0.0.0/24 ip6-pfx bbbb::/32 ip6-src cccc:bbbb::1 ea-bits-len 16 psid-offset 6 psid-len 8")
+    print("map add domain ip4-pfx 20.0.1.0/24 ip6-pfx bbbb:1::/32 ip6-src cccc:bbbb::2 ea-bits-len 8 psid-offset 0 psid-len 0")
+
+#
+# IP4 forwarding
+#
+def ip4():
+    ip4_pfx = ipaddress.ip_network('20.0.0.0/16')
+    for i in range(ip4_pfx.num_addresses):
+        print("ip route add " + str(ip4_pfx[i]) +  "/32 via 172.16.0.2")
+
+
+globals()[args.mapmode]()
+
+
diff --git a/src/vnet/map/ip4_map.c b/src/vnet/map/ip4_map.c
new file mode 100644
index 00000000..9fd10f62
--- /dev/null
+++ b/src/vnet/map/ip4_map.c
@@ -0,0 +1,813 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * Defines used for testing various optimisation schemes
+ */
+#define MAP_ENCAP_DUAL 0
+
+#include "map.h"
+#include "../ip/ip_frag.h"
+
+vlib_node_registration_t ip4_map_reass_node;
+
+enum ip4_map_next_e
+{
+  IP4_MAP_NEXT_IP6_LOOKUP,
+#ifdef MAP_SKIP_IP6_LOOKUP
+  IP4_MAP_NEXT_IP6_REWRITE,
+#endif
+  IP4_MAP_NEXT_IP4_FRAGMENT,
+  IP4_MAP_NEXT_IP6_FRAGMENT,
+  IP4_MAP_NEXT_REASS,
+  IP4_MAP_NEXT_ICMP_ERROR,
+  IP4_MAP_NEXT_DROP,
+  IP4_MAP_N_NEXT,
+};
+
+enum ip4_map_reass_next_t
+{
+  IP4_MAP_REASS_NEXT_IP6_LOOKUP,
+  IP4_MAP_REASS_NEXT_IP4_FRAGMENT,
+  IP4_MAP_REASS_NEXT_DROP,
+  IP4_MAP_REASS_N_NEXT,
+};
+
+typedef struct
+{
+  u32 map_domain_index;
+  u16 port;
+  u8 cached;
+} map_ip4_map_reass_trace_t;
+
+u8 *
+format_ip4_map_reass_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  map_ip4_map_reass_trace_t *t = va_arg (*args, map_ip4_map_reass_trace_t *);
+  return format (s, "MAP domain index: %d L4 port: %u Status: %s",
+		 t->map_domain_index, t->port,
+		 t->cached ? "cached" : "forwarded");
+}
+
+/*
+ * ip4_map_get_port
+ */
+u16
+ip4_map_get_port (ip4_header_t * ip, map_dir_e dir)
+{
+  /* Find port information */
+  if (PREDICT_TRUE ((ip->protocol == IP_PROTOCOL_TCP) ||
+		    (ip->protocol == IP_PROTOCOL_UDP)))
+    {
+      udp_header_t *udp = (void *) (ip + 1);
+      return (dir == MAP_SENDER ? udp->src_port : udp->dst_port);
+    }
+  else if (ip->protocol == IP_PROTOCOL_ICMP)
+    {
+      /*
+       * 1) ICMP Echo request or Echo reply
+       * 2) ICMP Error with inner packet being UDP or TCP
+       * 3) ICMP Error with inner packet being ICMP Echo request or Echo reply
+       */
+      icmp46_header_t *icmp = (void *) (ip + 1);
+      if (icmp->type == ICMP4_echo_request || icmp->type == ICMP4_echo_reply)
+	{
+	  return *((u16 *) (icmp + 1));
+	}
+      else if (clib_net_to_host_u16 (ip->length) >= 56)
+	{			// IP + ICMP + IP + L4 header
+	  ip4_header_t *icmp_ip = (ip4_header_t *) (icmp + 2);
+	  if (PREDICT_TRUE ((icmp_ip->protocol == IP_PROTOCOL_TCP) ||
+			    (icmp_ip->protocol == IP_PROTOCOL_UDP)))
+	    {
+	      udp_header_t *udp = (void *) (icmp_ip + 1);
+	      return (dir == MAP_SENDER ? udp->dst_port : udp->src_port);
+	    }
+	  else if (icmp_ip->protocol == IP_PROTOCOL_ICMP)
+	    {
+	      icmp46_header_t *inner_icmp = (void *) (icmp_ip + 1);
+	      if (inner_icmp->type == ICMP4_echo_request
+		  || inner_icmp->type == ICMP4_echo_reply)
+		return (*((u16 *) (inner_icmp + 1)));
+	    }
+	}
+    }
+  return (0);
+}
+
+static_always_inline u16
+ip4_map_port_and_security_check (map_domain_t * d, ip4_header_t * ip,
+				 u32 * next, u8 * error)
+{
+  u16 port = 0;
+
+  if (d->psid_length > 0)
+    {
+      if (ip4_get_fragment_offset (ip) == 0)
+	{
+	  if (PREDICT_FALSE
+	      ((ip->ip_version_and_header_length != 0x45)
+	       || clib_host_to_net_u16 (ip->length) < 28))
+	    {
+	      return 0;
+	    }
+	  port = ip4_map_get_port (ip, MAP_RECEIVER);
+	  if (port)
+	    {
+	      /* Verify that port is not among the well-known ports */
+	      if ((d->psid_offset > 0)
+		  && (clib_net_to_host_u16 (port) <
+		      (0x1 << (16 - d->psid_offset))))
+		{
+		  *error = MAP_ERROR_ENCAP_SEC_CHECK;
+		}
+	      else
+		{
+		  if (ip4_get_fragment_more (ip))
+		    *next = IP4_MAP_NEXT_REASS;
+		  return (port);
+		}
+	    }
+	  else
+	    {
+	      *error = MAP_ERROR_BAD_PROTOCOL;
+	    }
+	}
+      else
+	{
+	  *next = IP4_MAP_NEXT_REASS;
+	}
+    }
+  return (0);
+}
+
+/*
+ * ip4_map_vtcfl
+ */
+static_always_inline u32
+ip4_map_vtcfl (ip4_header_t * ip4, vlib_buffer_t * p)
+{
+  map_main_t *mm = &map_main;
+  u8 tc = mm->tc_copy ? ip4->tos : mm->tc;
+  u32 vtcfl = 0x6 << 28;
+  vtcfl |= tc << 20;
+  vtcfl |= vnet_buffer (p)->ip.flow_hash & 0x000fffff;
+
+  return (clib_host_to_net_u32 (vtcfl));
+}
+
+static_always_inline bool
+ip4_map_ip6_lookup_bypass (vlib_buffer_t * p0, ip4_header_t * ip)
+{
+#ifdef MAP_SKIP_IP6_LOOKUP
+  map_main_t *mm = &map_main;
+  u32 adj_index0 = mm->adj6_index;
+  if (adj_index0 > 0)
+    {
+      ip_lookup_main_t *lm6 = &ip6_main.lookup_main;
+      ip_adjacency_t *adj = ip_get_adjacency (lm6, mm->adj6_index);
+      if (adj->n_adj > 1)
+	{
+	  u32 hash_c0 = ip4_compute_flow_hash (ip, IP_FLOW_HASH_DEFAULT);
+	  adj_index0 += (hash_c0 & (adj->n_adj - 1));
+	}
+      vnet_buffer (p0)->ip.adj_index[VLIB_TX] = adj_index0;
+      return (true);
+    }
+#endif
+  return (false);
+}
+
+/*
+ * ip4_map_ttl
+ */
+static inline void
+ip4_map_decrement_ttl (ip4_header_t * ip, u8 * error)
+{
+  i32 ttl = ip->ttl;
+
+  /* Input node should have reject packets with ttl 0. */
+  ASSERT (ip->ttl > 0);
+
+  u32 checksum = ip->checksum + clib_host_to_net_u16 (0x0100);
+  checksum += checksum >= 0xffff;
+  ip->checksum = checksum;
+  ttl -= 1;
+  ip->ttl = ttl;
+  *error = ttl <= 0 ? IP4_ERROR_TIME_EXPIRED : *error;
+
+  /* Verify checksum. */
+  ASSERT (ip->checksum == ip4_header_checksum (ip));
+}
+
+static u32
+ip4_map_fragment (vlib_buffer_t * b, u16 mtu, bool df, u8 * error)
+{
+  map_main_t *mm = &map_main;
+
+  if (mm->frag_inner)
+    {
+      ip_frag_set_vnet_buffer (b, sizeof (ip6_header_t), mtu,
+			       IP4_FRAG_NEXT_IP6_LOOKUP,
+			       IP_FRAG_FLAG_IP6_HEADER);
+      return (IP4_MAP_NEXT_IP4_FRAGMENT);
+    }
+  else
+    {
+      if (df && !mm->frag_ignore_df)
+	{
+	  icmp4_error_set_vnet_buffer (b, ICMP4_destination_unreachable,
+				       ICMP4_destination_unreachable_fragmentation_needed_and_dont_fragment_set,
+				       mtu);
+	  vlib_buffer_advance (b, sizeof (ip6_header_t));
+	  *error = MAP_ERROR_DF_SET;
+	  return (IP4_MAP_NEXT_ICMP_ERROR);
+	}
+      ip_frag_set_vnet_buffer (b, 0, mtu, IP6_FRAG_NEXT_IP6_LOOKUP,
+			       IP_FRAG_FLAG_IP6_HEADER);
+      return (IP4_MAP_NEXT_IP6_FRAGMENT);
+    }
+}
+
+/*
+ * ip4_map
+ */
+static uword
+ip4_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip4_map_node.index);
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  map_main_t *mm = &map_main;
+  vlib_combined_counter_main_t *cm = mm->domain_counters;
+  u32 cpu_index = os_get_cpu_number ();
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /* Dual loop */
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 pi0, pi1;
+	  vlib_buffer_t *p0, *p1;
+	  map_domain_t *d0, *d1;
+	  u8 error0 = MAP_ERROR_NONE, error1 = MAP_ERROR_NONE;
+	  ip4_header_t *ip40, *ip41;
+	  u16 port0 = 0, port1 = 0;
+	  ip6_header_t *ip6h0, *ip6h1;
+	  u32 map_domain_index0 = ~0, map_domain_index1 = ~0;
+	  u32 next0 = IP4_MAP_NEXT_IP6_LOOKUP, next1 =
+	    IP4_MAP_NEXT_IP6_LOOKUP;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, STORE);
+	    vlib_prefetch_buffer_header (p3, STORE);
+	    /* IPv4 + 8 = 28. possibly plus -40 */
+	    CLIB_PREFETCH (p2->data - 40, 68, STORE);
+	    CLIB_PREFETCH (p3->data - 40, 68, STORE);
+	  }
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+	  ip40 = vlib_buffer_get_current (p0);
+	  ip41 = vlib_buffer_get_current (p1);
+	  d0 =
+	    ip4_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
+				&map_domain_index0);
+	  d1 =
+	    ip4_map_get_domain (vnet_buffer (p1)->ip.adj_index[VLIB_TX],
+				&map_domain_index1);
+	  ASSERT (d0);
+	  ASSERT (d1);
+
+	  /*
+	   * Shared IPv4 address
+	   */
+	  port0 = ip4_map_port_and_security_check (d0, ip40, &next0, &error0);
+	  port1 = ip4_map_port_and_security_check (d1, ip41, &next1, &error1);
+
+	  /* Decrement IPv4 TTL */
+	  ip4_map_decrement_ttl (ip40, &error0);
+	  ip4_map_decrement_ttl (ip41, &error1);
+	  bool df0 =
+	    ip40->flags_and_fragment_offset &
+	    clib_host_to_net_u16 (IP4_HEADER_FLAG_DONT_FRAGMENT);
+	  bool df1 =
+	    ip41->flags_and_fragment_offset &
+	    clib_host_to_net_u16 (IP4_HEADER_FLAG_DONT_FRAGMENT);
+
+	  /* MAP calc */
+	  u32 da40 = clib_net_to_host_u32 (ip40->dst_address.as_u32);
+	  u32 da41 = clib_net_to_host_u32 (ip41->dst_address.as_u32);
+	  u16 dp40 = clib_net_to_host_u16 (port0);
+	  u16 dp41 = clib_net_to_host_u16 (port1);
+	  u64 dal60 = map_get_pfx (d0, da40, dp40);
+	  u64 dal61 = map_get_pfx (d1, da41, dp41);
+	  u64 dar60 = map_get_sfx (d0, da40, dp40);
+	  u64 dar61 = map_get_sfx (d1, da41, dp41);
+	  if (dal60 == 0 && dar60 == 0 && error0 == MAP_ERROR_NONE
+	      && next0 != IP4_MAP_NEXT_REASS)
+	    error0 = MAP_ERROR_NO_BINDING;
+	  if (dal61 == 0 && dar61 == 0 && error1 == MAP_ERROR_NONE
+	      && next1 != IP4_MAP_NEXT_REASS)
+	    error1 = MAP_ERROR_NO_BINDING;
+
+	  /* construct ipv6 header */
+	  vlib_buffer_advance (p0, -sizeof (ip6_header_t));
+	  vlib_buffer_advance (p1, -sizeof (ip6_header_t));
+	  ip6h0 = vlib_buffer_get_current (p0);
+	  ip6h1 = vlib_buffer_get_current (p1);
+	  vnet_buffer (p0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+	  vnet_buffer (p1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+
+	  ip6h0->ip_version_traffic_class_and_flow_label =
+	    ip4_map_vtcfl (ip40, p0);
+	  ip6h1->ip_version_traffic_class_and_flow_label =
+	    ip4_map_vtcfl (ip41, p1);
+	  ip6h0->payload_length = ip40->length;
+	  ip6h1->payload_length = ip41->length;
+	  ip6h0->protocol = IP_PROTOCOL_IP_IN_IP;
+	  ip6h1->protocol = IP_PROTOCOL_IP_IN_IP;
+	  ip6h0->hop_limit = 0x40;
+	  ip6h1->hop_limit = 0x40;
+	  ip6h0->src_address = d0->ip6_src;
+	  ip6h1->src_address = d1->ip6_src;
+	  ip6h0->dst_address.as_u64[0] = clib_host_to_net_u64 (dal60);
+	  ip6h0->dst_address.as_u64[1] = clib_host_to_net_u64 (dar60);
+	  ip6h1->dst_address.as_u64[0] = clib_host_to_net_u64 (dal61);
+	  ip6h1->dst_address.as_u64[1] = clib_host_to_net_u64 (dar61);
+
+	  /*
+	   * Determine next node. Can be one of:
+	   * ip6-lookup, ip6-rewrite, ip4-fragment, ip4-virtreass, error-drop
+	   */
+	  if (PREDICT_TRUE (error0 == MAP_ERROR_NONE))
+	    {
+	      if (PREDICT_FALSE
+		  (d0->mtu
+		   && (clib_net_to_host_u16 (ip6h0->payload_length) +
+		       sizeof (*ip6h0) > d0->mtu)))
+		{
+		  next0 = ip4_map_fragment (p0, d0->mtu, df0, &error0);
+		}
+	      else
+		{
+		  next0 =
+		    ip4_map_ip6_lookup_bypass (p0,
+					       ip40) ?
+		    IP4_MAP_NEXT_IP6_REWRITE : next0;
+		  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
+						   cpu_index,
+						   map_domain_index0, 1,
+						   clib_net_to_host_u16
+						   (ip6h0->payload_length) +
+						   40);
+		}
+	    }
+	  else
+	    {
+	      next0 = IP4_MAP_NEXT_DROP;
+	    }
+
+	  /*
+	   * Determine next node. Can be one of:
+	   * ip6-lookup, ip6-rewrite, ip4-fragment, ip4-virtreass, error-drop
+	   */
+	  if (PREDICT_TRUE (error1 == MAP_ERROR_NONE))
+	    {
+	      if (PREDICT_FALSE
+		  (d1->mtu
+		   && (clib_net_to_host_u16 (ip6h1->payload_length) +
+		       sizeof (*ip6h1) > d1->mtu)))
+		{
+		  next1 = ip4_map_fragment (p1, d1->mtu, df1, &error1);
+		}
+	      else
+		{
+		  next1 =
+		    ip4_map_ip6_lookup_bypass (p1,
+					       ip41) ?
+		    IP4_MAP_NEXT_IP6_REWRITE : next1;
+		  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
+						   cpu_index,
+						   map_domain_index1, 1,
+						   clib_net_to_host_u16
+						   (ip6h1->payload_length) +
+						   40);
+		}
+	    }
+	  else
+	    {
+	      next1 = IP4_MAP_NEXT_DROP;
+	    }
+
+	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      map_trace_t *tr = vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->map_domain_index = map_domain_index0;
+	      tr->port = port0;
+	    }
+	  if (PREDICT_FALSE (p1->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      map_trace_t *tr = vlib_add_trace (vm, node, p1, sizeof (*tr));
+	      tr->map_domain_index = map_domain_index1;
+	      tr->port = port1;
+	    }
+
+	  p0->error = error_node->errors[error0];
+	  p1->error = error_node->errors[error1];
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+					   n_left_to_next, pi0, pi1, next0,
+					   next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  map_domain_t *d0;
+	  u8 error0 = MAP_ERROR_NONE;
+	  ip4_header_t *ip40;
+	  u16 port0 = 0;
+	  ip6_header_t *ip6h0;
+	  u32 next0 = IP4_MAP_NEXT_IP6_LOOKUP;
+	  u32 map_domain_index0 = ~0;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip40 = vlib_buffer_get_current (p0);
+	  d0 =
+	    ip4_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
+				&map_domain_index0);
+	  ASSERT (d0);
+
+	  /*
+	   * Shared IPv4 address
+	   */
+	  port0 = ip4_map_port_and_security_check (d0, ip40, &next0, &error0);
+
+	  /* Decrement IPv4 TTL */
+	  ip4_map_decrement_ttl (ip40, &error0);
+	  bool df0 =
+	    ip40->flags_and_fragment_offset &
+	    clib_host_to_net_u16 (IP4_HEADER_FLAG_DONT_FRAGMENT);
+
+	  /* MAP calc */
+	  u32 da40 = clib_net_to_host_u32 (ip40->dst_address.as_u32);
+	  u16 dp40 = clib_net_to_host_u16 (port0);
+	  u64 dal60 = map_get_pfx (d0, da40, dp40);
+	  u64 dar60 = map_get_sfx (d0, da40, dp40);
+	  if (dal60 == 0 && dar60 == 0 && error0 == MAP_ERROR_NONE
+	      && next0 != IP4_MAP_NEXT_REASS)
+	    error0 = MAP_ERROR_NO_BINDING;
+
+	  /* construct ipv6 header */
+	  vlib_buffer_advance (p0, -(sizeof (ip6_header_t)));
+	  ip6h0 = vlib_buffer_get_current (p0);
+	  vnet_buffer (p0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+
+	  ip6h0->ip_version_traffic_class_and_flow_label =
+	    ip4_map_vtcfl (ip40, p0);
+	  ip6h0->payload_length = ip40->length;
+	  ip6h0->protocol = IP_PROTOCOL_IP_IN_IP;
+	  ip6h0->hop_limit = 0x40;
+	  ip6h0->src_address = d0->ip6_src;
+	  ip6h0->dst_address.as_u64[0] = clib_host_to_net_u64 (dal60);
+	  ip6h0->dst_address.as_u64[1] = clib_host_to_net_u64 (dar60);
+
+	  /*
+	   * Determine next node. Can be one of:
+	   * ip6-lookup, ip6-rewrite, ip4-fragment, ip4-virtreass, error-drop
+	   */
+	  if (PREDICT_TRUE (error0 == MAP_ERROR_NONE))
+	    {
+	      if (PREDICT_FALSE
+		  (d0->mtu
+		   && (clib_net_to_host_u16 (ip6h0->payload_length) +
+		       sizeof (*ip6h0) > d0->mtu)))
+		{
+		  next0 = ip4_map_fragment (p0, d0->mtu, df0, &error0);
+		}
+	      else
+		{
+		  next0 =
+		    ip4_map_ip6_lookup_bypass (p0,
+					       ip40) ?
+		    IP4_MAP_NEXT_IP6_REWRITE : next0;
+		  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
+						   cpu_index,
+						   map_domain_index0, 1,
+						   clib_net_to_host_u16
+						   (ip6h0->payload_length) +
+						   40);
+		}
+	    }
+	  else
+	    {
+	      next0 = IP4_MAP_NEXT_DROP;
+	    }
+
+	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      map_trace_t *tr = vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->map_domain_index = map_domain_index0;
+	      tr->port = port0;
+	    }
+
+	  p0->error = error_node->errors[error0];
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, pi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/*
+ * ip4_map_reass
+ */
+static uword
+ip4_map_reass (vlib_main_t * vm,
+	       vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip4_map_reass_node.index);
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  map_main_t *mm = &map_main;
+  vlib_combined_counter_main_t *cm = mm->domain_counters;
+  u32 cpu_index = os_get_cpu_number ();
+  u32 *fragments_to_drop = NULL;
+  u32 *fragments_to_loopback = NULL;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  map_domain_t *d0;
+	  u8 error0 = MAP_ERROR_NONE;
+	  ip4_header_t *ip40;
+	  i32 port0 = 0;
+	  ip6_header_t *ip60;
+	  u32 next0 = IP4_MAP_REASS_NEXT_IP6_LOOKUP;
+	  u32 map_domain_index0;
+	  u8 cached = 0;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip60 = vlib_buffer_get_current (p0);
+	  ip40 = (ip4_header_t *) (ip60 + 1);
+	  d0 =
+	    ip4_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
+				&map_domain_index0);
+
+	  map_ip4_reass_lock ();
+	  map_ip4_reass_t *r = map_ip4_reass_get (ip40->src_address.as_u32,
+						  ip40->dst_address.as_u32,
+						  ip40->fragment_id,
+						  ip40->protocol,
+						  &fragments_to_drop);
+	  if (PREDICT_FALSE (!r))
+	    {
+	      // Could not create a caching entry
+	      error0 = MAP_ERROR_FRAGMENT_MEMORY;
+	    }
+	  else if (PREDICT_TRUE (ip4_get_fragment_offset (ip40)))
+	    {
+	      if (r->port >= 0)
+		{
+		  // We know the port already
+		  port0 = r->port;
+		}
+	      else if (map_ip4_reass_add_fragment (r, pi0))
+		{
+		  // Not enough space for caching
+		  error0 = MAP_ERROR_FRAGMENT_MEMORY;
+		  map_ip4_reass_free (r, &fragments_to_drop);
+		}
+	      else
+		{
+		  cached = 1;
+		}
+	    }
+	  else
+	    if ((port0 =
+		 ip4_get_port (ip40, MAP_RECEIVER, p0->current_length)) < 0)
+	    {
+	      // Could not find port. We'll free the reassembly.
+	      error0 = MAP_ERROR_BAD_PROTOCOL;
+	      port0 = 0;
+	      map_ip4_reass_free (r, &fragments_to_drop);
+	    }
+	  else
+	    {
+	      r->port = port0;
+	      map_ip4_reass_get_fragments (r, &fragments_to_loopback);
+	    }
+
+#ifdef MAP_IP4_REASS_COUNT_BYTES
+	  if (!cached && r)
+	    {
+	      r->forwarded += clib_host_to_net_u16 (ip40->length) - 20;
+	      if (!ip4_get_fragment_more (ip40))
+		r->expected_total =
+		  ip4_get_fragment_offset (ip40) * 8 +
+		  clib_host_to_net_u16 (ip40->length) - 20;
+	      if (r->forwarded >= r->expected_total)
+		map_ip4_reass_free (r, &fragments_to_drop);
+	    }
+#endif
+
+	  map_ip4_reass_unlock ();
+
+	  // NOTE: Most operations have already been performed by ip4_map
+	  // All we need is the right destination address
+	  ip60->dst_address.as_u64[0] =
+	    map_get_pfx_net (d0, ip40->dst_address.as_u32, port0);
+	  ip60->dst_address.as_u64[1] =
+	    map_get_sfx_net (d0, ip40->dst_address.as_u32, port0);
+
+	  if (PREDICT_FALSE
+	      (d0->mtu
+	       && (clib_net_to_host_u16 (ip60->payload_length) +
+		   sizeof (*ip60) > d0->mtu)))
+	    {
+	      vnet_buffer (p0)->ip_frag.header_offset = sizeof (*ip60);
+	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP6_LOOKUP;
+	      vnet_buffer (p0)->ip_frag.mtu = d0->mtu;
+	      vnet_buffer (p0)->ip_frag.flags = IP_FRAG_FLAG_IP6_HEADER;
+	      next0 = IP4_MAP_REASS_NEXT_IP4_FRAGMENT;
+	    }
+
+	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      map_ip4_map_reass_trace_t *tr =
+		vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->map_domain_index = map_domain_index0;
+	      tr->port = port0;
+	      tr->cached = cached;
+	    }
+
+	  if (cached)
+	    {
+	      //Dequeue the packet
+	      n_left_to_next++;
+	      to_next--;
+	    }
+	  else
+	    {
+	      if (error0 == MAP_ERROR_NONE)
+		vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
+						 cpu_index, map_domain_index0,
+						 1,
+						 clib_net_to_host_u16
+						 (ip60->payload_length) + 40);
+	      next0 =
+		(error0 == MAP_ERROR_NONE) ? next0 : IP4_MAP_REASS_NEXT_DROP;
+	      p0->error = error_node->errors[error0];
+	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					       n_left_to_next, pi0, next0);
+	    }
+
+	  //Loopback when we reach the end of the inpu vector
+	  if (n_left_from == 0 && vec_len (fragments_to_loopback))
+	    {
+	      from = vlib_frame_vector_args (frame);
+	      u32 len = vec_len (fragments_to_loopback);
+	      if (len <= VLIB_FRAME_SIZE)
+		{
+		  clib_memcpy (from, fragments_to_loopback,
+			       sizeof (u32) * len);
+		  n_left_from = len;
+		  vec_reset_length (fragments_to_loopback);
+		}
+	      else
+		{
+		  clib_memcpy (from,
+			       fragments_to_loopback + (len -
+							VLIB_FRAME_SIZE),
+			       sizeof (u32) * VLIB_FRAME_SIZE);
+		  n_left_from = VLIB_FRAME_SIZE;
+		  _vec_len (fragments_to_loopback) = len - VLIB_FRAME_SIZE;
+		}
+	    }
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  map_send_all_to_node (vm, fragments_to_drop, node,
+			&error_node->errors[MAP_ERROR_FRAGMENT_DROPPED],
+			IP4_MAP_REASS_NEXT_DROP);
+
+  vec_free (fragments_to_drop);
+  vec_free (fragments_to_loopback);
+  return frame->n_vectors;
+}
+
+static char *map_error_strings[] = {
+#define _(sym,string) string,
+  foreach_map_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(ip4_map_node) = {
+  .function = ip4_map,
+  .name = "ip4-map",
+  .vector_size = sizeof(u32),
+  .format_trace = format_map_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = MAP_N_ERROR,
+  .error_strings = map_error_strings,
+
+  .n_next_nodes = IP4_MAP_N_NEXT,
+  .next_nodes = {
+    [IP4_MAP_NEXT_IP6_LOOKUP] = "ip6-lookup",
+#ifdef MAP_SKIP_IP6_LOOKUP
+    [IP4_MAP_NEXT_IP6_REWRITE] = "ip6-rewrite",
+#endif
+    [IP4_MAP_NEXT_IP4_FRAGMENT] = "ip4-frag",
+    [IP4_MAP_NEXT_IP6_FRAGMENT] = "ip6-frag",
+    [IP4_MAP_NEXT_REASS] = "ip4-map-reass",
+    [IP4_MAP_NEXT_ICMP_ERROR] = "ip4-icmp-error",
+    [IP4_MAP_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(ip4_map_reass_node) = {
+  .function = ip4_map_reass,
+  .name = "ip4-map-reass",
+  .vector_size = sizeof(u32),
+  .format_trace = format_ip4_map_reass_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = MAP_N_ERROR,
+  .error_strings = map_error_strings,
+
+  .n_next_nodes = IP4_MAP_REASS_N_NEXT,
+  .next_nodes = {
+    [IP4_MAP_REASS_NEXT_IP6_LOOKUP] = "ip6-lookup",
+    [IP4_MAP_REASS_NEXT_IP4_FRAGMENT] = "ip4-frag",
+    [IP4_MAP_REASS_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/map/ip4_map_t.c b/src/vnet/map/ip4_map_t.c
new file mode 100644
index 00000000..15974d8a
--- /dev/null
+++ b/src/vnet/map/ip4_map_t.c
@@ -0,0 +1,1363 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "map.h"
+
+#include "../ip/ip_frag.h"
+
+#define IP4_MAP_T_DUAL_LOOP 1
+
+typedef enum
+{
+  IP4_MAPT_NEXT_MAPT_TCP_UDP,
+  IP4_MAPT_NEXT_MAPT_ICMP,
+  IP4_MAPT_NEXT_MAPT_FRAGMENTED,
+  IP4_MAPT_NEXT_DROP,
+  IP4_MAPT_N_NEXT
+} ip4_mapt_next_t;
+
+typedef enum
+{
+  IP4_MAPT_ICMP_NEXT_IP6_LOOKUP,
+  IP4_MAPT_ICMP_NEXT_IP6_FRAG,
+  IP4_MAPT_ICMP_NEXT_DROP,
+  IP4_MAPT_ICMP_N_NEXT
+} ip4_mapt_icmp_next_t;
+
+typedef enum
+{
+  IP4_MAPT_TCP_UDP_NEXT_IP6_LOOKUP,
+  IP4_MAPT_TCP_UDP_NEXT_IP6_FRAG,
+  IP4_MAPT_TCP_UDP_NEXT_DROP,
+  IP4_MAPT_TCP_UDP_N_NEXT
+} ip4_mapt_tcp_udp_next_t;
+
+typedef enum
+{
+  IP4_MAPT_FRAGMENTED_NEXT_IP6_LOOKUP,
+  IP4_MAPT_FRAGMENTED_NEXT_IP6_FRAG,
+  IP4_MAPT_FRAGMENTED_NEXT_DROP,
+  IP4_MAPT_FRAGMENTED_N_NEXT
+} ip4_mapt_fragmented_next_t;
+
+//This is used to pass information within the buffer data.
+//Buffer structure being too small to contain big structures like this.
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  ip6_address_t daddr;
+  ip6_address_t saddr;
+  //IPv6 header + Fragmentation header will be here
+  //sizeof(ip6) + sizeof(ip_frag) - sizeof(ip4)
+  u8 unused[28];
+}) ip4_mapt_pseudo_header_t;
+/* *INDENT-ON* */
+
+#define frag_id_4to6(id) (id)
+
+//TODO: Find the right place in memory for this.
+/* *INDENT-OFF* */
+static u8 icmp_to_icmp6_updater_pointer_table[] =
+  { 0, 1, 4, 4, ~0,
+    ~0, ~0, ~0, 7, 6,
+    ~0, ~0, 8, 8, 8,
+    8, 24, 24, 24, 24
+  };
+/* *INDENT-ON* */
+
+
+static_always_inline int
+ip4_map_fragment_cache (ip4_header_t * ip4, u16 port)
+{
+  u32 *ignore = NULL;
+  map_ip4_reass_lock ();
+  map_ip4_reass_t *r =
+    map_ip4_reass_get (ip4->src_address.as_u32, ip4->dst_address.as_u32,
+		       ip4->fragment_id,
+		       (ip4->protocol ==
+			IP_PROTOCOL_ICMP) ? IP_PROTOCOL_ICMP6 : ip4->protocol,
+		       &ignore);
+  if (r)
+    r->port = port;
+
+  map_ip4_reass_unlock ();
+  return !r;
+}
+
+static_always_inline i32
+ip4_map_fragment_get_port (ip4_header_t * ip4)
+{
+  u32 *ignore = NULL;
+  map_ip4_reass_lock ();
+  map_ip4_reass_t *r =
+    map_ip4_reass_get (ip4->src_address.as_u32, ip4->dst_address.as_u32,
+		       ip4->fragment_id,
+		       (ip4->protocol ==
+			IP_PROTOCOL_ICMP) ? IP_PROTOCOL_ICMP6 : ip4->protocol,
+		       &ignore);
+  i32 ret = r ? r->port : -1;
+  map_ip4_reass_unlock ();
+  return ret;
+}
+
+
+/* Statelessly translates an ICMP packet into ICMPv6.
+ *
+ * Warning: The checksum will need to be recomputed.
+ *
+ */
+static_always_inline int
+ip4_icmp_to_icmp6_in_place (icmp46_header_t * icmp, u32 icmp_len,
+			    i32 * receiver_port, ip4_header_t ** inner_ip4)
+{
+  *inner_ip4 = NULL;
+  switch (icmp->type)
+    {
+    case ICMP4_echo_reply:
+      *receiver_port = ((u16 *) icmp)[2];
+      icmp->type = ICMP6_echo_reply;
+      break;
+    case ICMP4_echo_request:
+      *receiver_port = ((u16 *) icmp)[2];
+      icmp->type = ICMP6_echo_request;
+      break;
+    case ICMP4_destination_unreachable:
+      *inner_ip4 = (ip4_header_t *) (((u8 *) icmp) + 8);
+      *receiver_port = ip4_get_port (*inner_ip4, MAP_SENDER, icmp_len - 8);
+
+      switch (icmp->code)
+	{
+	case ICMP4_destination_unreachable_destination_unreachable_net:	//0
+	case ICMP4_destination_unreachable_destination_unreachable_host:	//1
+	  icmp->type = ICMP6_destination_unreachable;
+	  icmp->code = ICMP6_destination_unreachable_no_route_to_destination;
+	  break;
+	case ICMP4_destination_unreachable_protocol_unreachable:	//2
+	  icmp->type = ICMP6_parameter_problem;
+	  icmp->code = ICMP6_parameter_problem_unrecognized_next_header;
+	  break;
+	case ICMP4_destination_unreachable_port_unreachable:	//3
+	  icmp->type = ICMP6_destination_unreachable;
+	  icmp->code = ICMP6_destination_unreachable_port_unreachable;
+	  break;
+	case ICMP4_destination_unreachable_fragmentation_needed_and_dont_fragment_set:	//4
+	  icmp->type =
+	    ICMP6_packet_too_big;
+	  icmp->code = 0;
+	  {
+	    u32 advertised_mtu = clib_net_to_host_u32 (*((u32 *) (icmp + 1)));
+	    if (advertised_mtu)
+	      advertised_mtu += 20;
+	    else
+	      advertised_mtu = 1000;	//FIXME ! (RFC 1191 - plateau value)
+
+	    //FIXME: = minimum(advertised MTU+20, MTU_of_IPv6_nexthop, (MTU_of_IPv4_nexthop)+20)
+	    *((u32 *) (icmp + 1)) = clib_host_to_net_u32 (advertised_mtu);
+	  }
+	  break;
+
+	case ICMP4_destination_unreachable_source_route_failed:	//5
+	case ICMP4_destination_unreachable_destination_network_unknown:	//6
+	case ICMP4_destination_unreachable_destination_host_unknown:	//7
+	case ICMP4_destination_unreachable_source_host_isolated:	//8
+	case ICMP4_destination_unreachable_network_unreachable_for_type_of_service:	//11
+	case ICMP4_destination_unreachable_host_unreachable_for_type_of_service:	//12
+	  icmp->type =
+	    ICMP6_destination_unreachable;
+	  icmp->code = ICMP6_destination_unreachable_no_route_to_destination;
+	  break;
+	case ICMP4_destination_unreachable_network_administratively_prohibited:	//9
+	case ICMP4_destination_unreachable_host_administratively_prohibited:	//10
+	case ICMP4_destination_unreachable_communication_administratively_prohibited:	//13
+	case ICMP4_destination_unreachable_precedence_cutoff_in_effect:	//15
+	  icmp->type = ICMP6_destination_unreachable;
+	  icmp->code =
+	    ICMP6_destination_unreachable_destination_administratively_prohibited;
+	  break;
+	case ICMP4_destination_unreachable_host_precedence_violation:	//14
+	default:
+	  return -1;
+	}
+      break;
+
+    case ICMP4_time_exceeded:	//11
+      *inner_ip4 = (ip4_header_t *) (((u8 *) icmp) + 8);
+      *receiver_port = ip4_get_port (*inner_ip4, MAP_SENDER, icmp_len - 8);
+      icmp->type = ICMP6_time_exceeded;
+      //icmp->code = icmp->code //unchanged
+      break;
+
+    case ICMP4_parameter_problem:
+      *inner_ip4 = (ip4_header_t *) (((u8 *) icmp) + 8);
+      *receiver_port = ip4_get_port (*inner_ip4, MAP_SENDER, icmp_len - 8);
+
+      switch (icmp->code)
+	{
+	case ICMP4_parameter_problem_pointer_indicates_error:
+	case ICMP4_parameter_problem_bad_length:
+	  icmp->type = ICMP6_parameter_problem;
+	  icmp->code = ICMP6_parameter_problem_erroneous_header_field;
+	  {
+	    u8 ptr =
+	      icmp_to_icmp6_updater_pointer_table[*((u8 *) (icmp + 1))];
+	    if (ptr == 0xff)
+	      return -1;
+
+	    *((u32 *) (icmp + 1)) = clib_host_to_net_u32 (ptr);
+	  }
+	  break;
+	default:
+	  //All other codes cause dropping the packet
+	  return -1;
+	}
+      break;
+
+    default:
+      //All other types cause dropping the packet
+      return -1;
+      break;
+    }
+  return 0;
+}
+
+static_always_inline void
+_ip4_map_t_icmp (map_domain_t * d, vlib_buffer_t * p, u8 * error)
+{
+  ip4_header_t *ip4, *inner_ip4;
+  ip6_header_t *ip6, *inner_ip6;
+  u32 ip_len;
+  icmp46_header_t *icmp;
+  i32 recv_port;
+  ip_csum_t csum;
+  u16 *inner_L4_checksum = 0;
+  ip6_frag_hdr_t *inner_frag;
+  u32 inner_frag_id;
+  u32 inner_frag_offset;
+  u8 inner_frag_more;
+
+  ip4 = vlib_buffer_get_current (p);
+  ip_len = clib_net_to_host_u16 (ip4->length);
+  ASSERT (ip_len <= p->current_length);
+
+  icmp = (icmp46_header_t *) (ip4 + 1);
+  if (ip4_icmp_to_icmp6_in_place (icmp, ip_len - sizeof (*ip4),
+				  &recv_port, &inner_ip4))
+    {
+      *error = MAP_ERROR_ICMP;
+      return;
+    }
+
+  if (recv_port < 0)
+    {
+      // In case of 1:1 mapping, we don't care about the port
+      if (d->ea_bits_len == 0 && d->rules)
+	{
+	  recv_port = 0;
+	}
+      else
+	{
+	  *error = MAP_ERROR_ICMP;
+	  return;
+	}
+    }
+
+  if (inner_ip4)
+    {
+      //We have 2 headers to translate.
+      //We need to make some room in the middle of the packet
+
+      if (PREDICT_FALSE (ip4_is_fragment (inner_ip4)))
+	{
+	  //Here it starts getting really tricky
+	  //We will add a fragmentation header in the inner packet
+
+	  if (!ip4_is_first_fragment (inner_ip4))
+	    {
+	      //For now we do not handle unless it is the first fragment
+	      //Ideally we should handle the case as we are in slow path already
+	      *error = MAP_ERROR_FRAGMENTED;
+	      return;
+	    }
+
+	  vlib_buffer_advance (p,
+			       -2 * (sizeof (*ip6) - sizeof (*ip4)) -
+			       sizeof (*inner_frag));
+	  ip6 = vlib_buffer_get_current (p);
+	  clib_memcpy (u8_ptr_add (ip6, sizeof (*ip6) - sizeof (*ip4)), ip4,
+		       20 + 8);
+	  ip4 =
+	    (ip4_header_t *) u8_ptr_add (ip6, sizeof (*ip6) - sizeof (*ip4));
+	  icmp = (icmp46_header_t *) (ip4 + 1);
+
+	  inner_ip6 =
+	    (ip6_header_t *) u8_ptr_add (inner_ip4,
+					 sizeof (*ip4) - sizeof (*ip6) -
+					 sizeof (*inner_frag));
+	  inner_frag =
+	    (ip6_frag_hdr_t *) u8_ptr_add (inner_ip6, sizeof (*inner_ip6));
+	  ip6->payload_length =
+	    u16_net_add (ip4->length,
+			 sizeof (*ip6) - 2 * sizeof (*ip4) +
+			 sizeof (*inner_frag));
+	  inner_frag_id = frag_id_4to6 (inner_ip4->fragment_id);
+	  inner_frag_offset = ip4_get_fragment_offset (inner_ip4);
+	  inner_frag_more =
+	    ! !(inner_ip4->flags_and_fragment_offset &
+		clib_net_to_host_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS));
+	}
+      else
+	{
+	  vlib_buffer_advance (p, -2 * (sizeof (*ip6) - sizeof (*ip4)));
+	  ip6 = vlib_buffer_get_current (p);
+	  clib_memcpy (u8_ptr_add (ip6, sizeof (*ip6) - sizeof (*ip4)), ip4,
+		       20 + 8);
+	  ip4 =
+	    (ip4_header_t *) u8_ptr_add (ip6, sizeof (*ip6) - sizeof (*ip4));
+	  icmp = (icmp46_header_t *) u8_ptr_add (ip4, sizeof (*ip4));
+	  inner_ip6 =
+	    (ip6_header_t *) u8_ptr_add (inner_ip4,
+					 sizeof (*ip4) - sizeof (*ip6));
+	  ip6->payload_length =
+	    u16_net_add (ip4->length, sizeof (*ip6) - 2 * sizeof (*ip4));
+	  inner_frag = NULL;
+	}
+
+      if (PREDICT_TRUE (inner_ip4->protocol == IP_PROTOCOL_TCP))
+	{
+	  inner_L4_checksum = &((tcp_header_t *) (inner_ip4 + 1))->checksum;
+	  *inner_L4_checksum =
+	    ip_csum_fold (ip_csum_sub_even
+			  (*inner_L4_checksum,
+			   *((u64 *) (&inner_ip4->src_address))));
+	}
+      else if (PREDICT_TRUE (inner_ip4->protocol == IP_PROTOCOL_UDP))
+	{
+	  inner_L4_checksum = &((udp_header_t *) (inner_ip4 + 1))->checksum;
+	  if (!*inner_L4_checksum)
+	    {
+	      //The inner packet was first translated, and therefore came from IPv6.
+	      //As the packet was an IPv6 packet, the UDP checksum can't be NULL
+	      *error = MAP_ERROR_ICMP;
+	      return;
+	    }
+	  *inner_L4_checksum =
+	    ip_csum_fold (ip_csum_sub_even
+			  (*inner_L4_checksum,
+			   *((u64 *) (&inner_ip4->src_address))));
+	}
+      else if (inner_ip4->protocol == IP_PROTOCOL_ICMP)
+	{
+	  //We have an ICMP inside an ICMP
+	  //It needs to be translated, but not for error ICMP messages
+	  icmp46_header_t *inner_icmp = (icmp46_header_t *) (inner_ip4 + 1);
+	  csum = inner_icmp->checksum;
+	  //Only types ICMP4_echo_request and ICMP4_echo_reply are handled by ip4_icmp_to_icmp6_in_place
+	  csum = ip_csum_sub_even (csum, *((u16 *) inner_icmp));
+	  inner_icmp->type = (inner_icmp->type == ICMP4_echo_request) ?
+	    ICMP6_echo_request : ICMP6_echo_reply;
+	  csum = ip_csum_add_even (csum, *((u16 *) inner_icmp));
+	  csum =
+	    ip_csum_add_even (csum, clib_host_to_net_u16 (IP_PROTOCOL_ICMP6));
+	  csum =
+	    ip_csum_add_even (csum, inner_ip4->length - sizeof (*inner_ip4));
+	  inner_icmp->checksum = ip_csum_fold (csum);
+	  inner_L4_checksum = &inner_icmp->checksum;
+	  inner_ip4->protocol = IP_PROTOCOL_ICMP6;
+	}
+      else
+	{
+	  /* To shut up Coverity */
+	  os_panic ();
+	}
+
+      //FIXME: Security check with the port found in the inner packet
+
+      csum = *inner_L4_checksum;	//Initial checksum of the inner L4 header
+      //FIXME: Shouldn't we remove ip addresses from there ?
+
+      inner_ip6->ip_version_traffic_class_and_flow_label =
+	clib_host_to_net_u32 ((6 << 28) + (inner_ip4->tos << 20));
+      inner_ip6->payload_length =
+	u16_net_add (inner_ip4->length, -sizeof (*inner_ip4));
+      inner_ip6->hop_limit = inner_ip4->ttl;
+      inner_ip6->protocol = inner_ip4->protocol;
+
+      //Note that the source address is within the domain
+      //while the destination address is the one outside the domain
+      ip4_map_t_embedded_address (d, &inner_ip6->dst_address,
+				  &inner_ip4->dst_address);
+      inner_ip6->src_address.as_u64[0] =
+	map_get_pfx_net (d, inner_ip4->src_address.as_u32, recv_port);
+      inner_ip6->src_address.as_u64[1] =
+	map_get_sfx_net (d, inner_ip4->src_address.as_u32, recv_port);
+
+      if (PREDICT_FALSE (inner_frag != NULL))
+	{
+	  inner_frag->next_hdr = inner_ip6->protocol;
+	  inner_frag->identification = inner_frag_id;
+	  inner_frag->rsv = 0;
+	  inner_frag->fragment_offset_and_more =
+	    ip6_frag_hdr_offset_and_more (inner_frag_offset, inner_frag_more);
+	  inner_ip6->protocol = IP_PROTOCOL_IPV6_FRAGMENTATION;
+	  inner_ip6->payload_length =
+	    clib_host_to_net_u16 (clib_net_to_host_u16
+				  (inner_ip6->payload_length) +
+				  sizeof (*inner_frag));
+	}
+
+      csum = ip_csum_add_even (csum, inner_ip6->src_address.as_u64[0]);
+      csum = ip_csum_add_even (csum, inner_ip6->src_address.as_u64[1]);
+      csum = ip_csum_add_even (csum, inner_ip6->dst_address.as_u64[0]);
+      csum = ip_csum_add_even (csum, inner_ip6->dst_address.as_u64[1]);
+      *inner_L4_checksum = ip_csum_fold (csum);
+
+    }
+  else
+    {
+      vlib_buffer_advance (p, sizeof (*ip4) - sizeof (*ip6));
+      ip6 = vlib_buffer_get_current (p);
+      ip6->payload_length =
+	clib_host_to_net_u16 (clib_net_to_host_u16 (ip4->length) -
+			      sizeof (*ip4));
+    }
+
+  //Translate outer IPv6
+  ip6->ip_version_traffic_class_and_flow_label =
+    clib_host_to_net_u32 ((6 << 28) + (ip4->tos << 20));
+
+  ip6->hop_limit = ip4->ttl;
+  ip6->protocol = IP_PROTOCOL_ICMP6;
+
+  ip4_map_t_embedded_address (d, &ip6->src_address, &ip4->src_address);
+  ip6->dst_address.as_u64[0] =
+    map_get_pfx_net (d, ip4->dst_address.as_u32, recv_port);
+  ip6->dst_address.as_u64[1] =
+    map_get_sfx_net (d, ip4->dst_address.as_u32, recv_port);
+
+  //Truncate when the packet exceeds the minimal IPv6 MTU
+  if (p->current_length > 1280)
+    {
+      ip6->payload_length = clib_host_to_net_u16 (1280 - sizeof (*ip6));
+      p->current_length = 1280;	//Looks too simple to be correct...
+    }
+
+  //TODO: We could do an easy diff-checksum for echo requests/replies
+  //Recompute ICMP checksum
+  icmp->checksum = 0;
+  csum = ip_csum_with_carry (0, ip6->payload_length);
+  csum = ip_csum_with_carry (csum, clib_host_to_net_u16 (ip6->protocol));
+  csum = ip_csum_with_carry (csum, ip6->src_address.as_u64[0]);
+  csum = ip_csum_with_carry (csum, ip6->src_address.as_u64[1]);
+  csum = ip_csum_with_carry (csum, ip6->dst_address.as_u64[0]);
+  csum = ip_csum_with_carry (csum, ip6->dst_address.as_u64[1]);
+  csum =
+    ip_incremental_checksum (csum, icmp,
+			     clib_net_to_host_u16 (ip6->payload_length));
+  icmp->checksum = ~ip_csum_fold (csum);
+}
+
+static uword
+ip4_map_t_icmp (vlib_main_t * vm,
+		vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip4_map_t_icmp_node.index);
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  vlib_combined_counter_main_t *cm = map_main.domain_counters;
+  u32 cpu_index = os_get_cpu_number ();
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  ip4_mapt_icmp_next_t next0;
+	  u8 error0;
+	  map_domain_t *d0;
+	  u16 len0;
+
+	  next0 = IP4_MAPT_ICMP_NEXT_IP6_LOOKUP;
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  error0 = MAP_ERROR_NONE;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  vlib_buffer_advance (p0, sizeof (ip4_mapt_pseudo_header_t));	//The pseudo-header is not used
+	  len0 =
+	    clib_net_to_host_u16 (((ip4_header_t *)
+				   vlib_buffer_get_current (p0))->length);
+	  d0 =
+	    pool_elt_at_index (map_main.domains,
+			       vnet_buffer (p0)->map_t.map_domain_index);
+	  _ip4_map_t_icmp (d0, p0, &error0);
+
+	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
+	    {
+	      vnet_buffer (p0)->ip_frag.header_offset = 0;
+	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
+	      vnet_buffer (p0)->ip_frag.next_index = IP6_FRAG_NEXT_IP6_LOOKUP;
+	      next0 = IP4_MAPT_ICMP_NEXT_IP6_FRAG;
+	    }
+	  if (PREDICT_TRUE (error0 == MAP_ERROR_NONE))
+	    {
+	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
+					       cpu_index,
+					       vnet_buffer (p0)->map_t.
+					       map_domain_index, 1, len0);
+	    }
+	  else
+	    {
+	      next0 = IP4_MAPT_ICMP_NEXT_DROP;
+	    }
+	  p0->error = error_node->errors[error0];
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next, pi0,
+					   next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return frame->n_vectors;
+}
+
+static uword
+ip4_map_t_fragmented (vlib_main_t * vm,
+		      vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  ip4_header_t *ip40;
+	  ip6_header_t *ip60;
+	  ip6_frag_hdr_t *frag0;
+	  ip4_mapt_pseudo_header_t *pheader0;
+	  ip4_mapt_fragmented_next_t next0;
+
+	  next0 = IP4_MAPT_FRAGMENTED_NEXT_IP6_LOOKUP;
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  //Accessing pseudo header
+	  pheader0 = vlib_buffer_get_current (p0);
+	  vlib_buffer_advance (p0, sizeof (*pheader0));
+
+	  //Accessing ip4 header
+	  ip40 = vlib_buffer_get_current (p0);
+	  frag0 =
+	    (ip6_frag_hdr_t *) u8_ptr_add (ip40,
+					   sizeof (*ip40) - sizeof (*frag0));
+	  ip60 =
+	    (ip6_header_t *) u8_ptr_add (ip40,
+					 sizeof (*ip40) - sizeof (*frag0) -
+					 sizeof (*ip60));
+	  vlib_buffer_advance (p0,
+			       sizeof (*ip40) - sizeof (*ip60) -
+			       sizeof (*frag0));
+
+	  //We know that the protocol was one of ICMP, TCP or UDP
+	  //because the first fragment was found and cached
+	  frag0->next_hdr =
+	    (ip40->protocol ==
+	     IP_PROTOCOL_ICMP) ? IP_PROTOCOL_ICMP6 : ip40->protocol;
+	  frag0->identification = frag_id_4to6 (ip40->fragment_id);
+	  frag0->rsv = 0;
+	  frag0->fragment_offset_and_more =
+	    ip6_frag_hdr_offset_and_more (ip4_get_fragment_offset (ip40),
+					  clib_net_to_host_u16
+					  (ip40->flags_and_fragment_offset) &
+					  IP4_HEADER_FLAG_MORE_FRAGMENTS);
+
+	  ip60->ip_version_traffic_class_and_flow_label =
+	    clib_host_to_net_u32 ((6 << 28) + (ip40->tos << 20));
+	  ip60->payload_length =
+	    clib_host_to_net_u16 (clib_net_to_host_u16 (ip40->length) -
+				  sizeof (*ip40) + sizeof (*frag0));
+	  ip60->hop_limit = ip40->ttl;
+	  ip60->protocol = IP_PROTOCOL_IPV6_FRAGMENTATION;
+	  ip60->dst_address.as_u64[0] = pheader0->daddr.as_u64[0];
+	  ip60->dst_address.as_u64[1] = pheader0->daddr.as_u64[1];
+	  ip60->src_address.as_u64[0] = pheader0->saddr.as_u64[0];
+	  ip60->src_address.as_u64[1] = pheader0->saddr.as_u64[1];
+
+	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
+	    {
+	      vnet_buffer (p0)->ip_frag.header_offset = 0;
+	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
+	      vnet_buffer (p0)->ip_frag.next_index = IP6_FRAG_NEXT_IP6_LOOKUP;
+	      next0 = IP4_MAPT_FRAGMENTED_NEXT_IP6_FRAG;
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next, pi0,
+					   next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return frame->n_vectors;
+}
+
+static uword
+ip4_map_t_tcp_udp (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+#ifdef IP4_MAP_T_DUAL_LOOP
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 pi0, pi1;
+	  vlib_buffer_t *p0, *p1;
+	  ip4_header_t *ip40, *ip41;
+	  ip6_header_t *ip60, *ip61;
+	  ip_csum_t csum0, csum1;
+	  u16 *checksum0, *checksum1;
+	  ip6_frag_hdr_t *frag0, *frag1;
+	  u32 frag_id0, frag_id1;
+	  ip4_mapt_pseudo_header_t *pheader0, *pheader1;
+	  ip4_mapt_tcp_udp_next_t next0, next1;
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  next0 = IP4_MAPT_TCP_UDP_NEXT_IP6_LOOKUP;
+	  next1 = IP4_MAPT_TCP_UDP_NEXT_IP6_LOOKUP;
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+
+	  //Accessing pseudo header
+	  pheader0 = vlib_buffer_get_current (p0);
+	  pheader1 = vlib_buffer_get_current (p1);
+	  vlib_buffer_advance (p0, sizeof (*pheader0));
+	  vlib_buffer_advance (p1, sizeof (*pheader1));
+
+	  //Accessing ip4 header
+	  ip40 = vlib_buffer_get_current (p0);
+	  ip41 = vlib_buffer_get_current (p1);
+	  checksum0 =
+	    (u16 *) u8_ptr_add (ip40,
+				vnet_buffer (p0)->map_t.checksum_offset);
+	  checksum1 =
+	    (u16 *) u8_ptr_add (ip41,
+				vnet_buffer (p1)->map_t.checksum_offset);
+
+	  //UDP checksum is optional over IPv4 but mandatory for IPv6
+	  //We do not check udp->length sanity but use our safe computed value instead
+	  if (PREDICT_FALSE
+	      (!*checksum0 && ip40->protocol == IP_PROTOCOL_UDP))
+	    {
+	      u16 udp_len =
+		clib_host_to_net_u16 (ip40->length) - sizeof (*ip40);
+	      udp_header_t *udp =
+		(udp_header_t *) u8_ptr_add (ip40, sizeof (*ip40));
+	      ip_csum_t csum;
+	      csum = ip_incremental_checksum (0, udp, udp_len);
+	      csum =
+		ip_csum_with_carry (csum, clib_host_to_net_u16 (udp_len));
+	      csum =
+		ip_csum_with_carry (csum,
+				    clib_host_to_net_u16 (IP_PROTOCOL_UDP));
+	      csum =
+		ip_csum_with_carry (csum, *((u64 *) (&ip40->src_address)));
+	      *checksum0 = ~ip_csum_fold (csum);
+	    }
+	  if (PREDICT_FALSE
+	      (!*checksum1 && ip41->protocol == IP_PROTOCOL_UDP))
+	    {
+	      u16 udp_len =
+		clib_host_to_net_u16 (ip41->length) - sizeof (*ip40);
+	      udp_header_t *udp =
+		(udp_header_t *) u8_ptr_add (ip41, sizeof (*ip40));
+	      ip_csum_t csum;
+	      csum = ip_incremental_checksum (0, udp, udp_len);
+	      csum =
+		ip_csum_with_carry (csum, clib_host_to_net_u16 (udp_len));
+	      csum =
+		ip_csum_with_carry (csum,
+				    clib_host_to_net_u16 (IP_PROTOCOL_UDP));
+	      csum =
+		ip_csum_with_carry (csum, *((u64 *) (&ip41->src_address)));
+	      *checksum1 = ~ip_csum_fold (csum);
+	    }
+
+	  csum0 = ip_csum_sub_even (*checksum0, ip40->src_address.as_u32);
+	  csum1 = ip_csum_sub_even (*checksum1, ip41->src_address.as_u32);
+	  csum0 = ip_csum_sub_even (csum0, ip40->dst_address.as_u32);
+	  csum1 = ip_csum_sub_even (csum1, ip41->dst_address.as_u32);
+
+	  // Deal with fragmented packets
+	  if (PREDICT_FALSE (ip40->flags_and_fragment_offset &
+			     clib_host_to_net_u16
+			     (IP4_HEADER_FLAG_MORE_FRAGMENTS)))
+	    {
+	      ip60 =
+		(ip6_header_t *) u8_ptr_add (ip40,
+					     sizeof (*ip40) - sizeof (*ip60) -
+					     sizeof (*frag0));
+	      frag0 =
+		(ip6_frag_hdr_t *) u8_ptr_add (ip40,
+					       sizeof (*ip40) -
+					       sizeof (*frag0));
+	      frag_id0 = frag_id_4to6 (ip40->fragment_id);
+	      vlib_buffer_advance (p0,
+				   sizeof (*ip40) - sizeof (*ip60) -
+				   sizeof (*frag0));
+	    }
+	  else
+	    {
+	      ip60 =
+		(ip6_header_t *) (((u8 *) ip40) + sizeof (*ip40) -
+				  sizeof (*ip60));
+	      vlib_buffer_advance (p0, sizeof (*ip40) - sizeof (*ip60));
+	      frag0 = NULL;
+	    }
+
+	  if (PREDICT_FALSE (ip41->flags_and_fragment_offset &
+			     clib_host_to_net_u16
+			     (IP4_HEADER_FLAG_MORE_FRAGMENTS)))
+	    {
+	      ip61 =
+		(ip6_header_t *) u8_ptr_add (ip41,
+					     sizeof (*ip40) - sizeof (*ip60) -
+					     sizeof (*frag0));
+	      frag1 =
+		(ip6_frag_hdr_t *) u8_ptr_add (ip41,
+					       sizeof (*ip40) -
+					       sizeof (*frag0));
+	      frag_id1 = frag_id_4to6 (ip41->fragment_id);
+	      vlib_buffer_advance (p1,
+				   sizeof (*ip40) - sizeof (*ip60) -
+				   sizeof (*frag0));
+	    }
+	  else
+	    {
+	      ip61 =
+		(ip6_header_t *) (((u8 *) ip41) + sizeof (*ip40) -
+				  sizeof (*ip60));
+	      vlib_buffer_advance (p1, sizeof (*ip40) - sizeof (*ip60));
+	      frag1 = NULL;
+	    }
+
+	  ip60->ip_version_traffic_class_and_flow_label =
+	    clib_host_to_net_u32 ((6 << 28) + (ip40->tos << 20));
+	  ip61->ip_version_traffic_class_and_flow_label =
+	    clib_host_to_net_u32 ((6 << 28) + (ip41->tos << 20));
+	  ip60->payload_length = u16_net_add (ip40->length, -sizeof (*ip40));
+	  ip61->payload_length = u16_net_add (ip41->length, -sizeof (*ip40));
+	  ip60->hop_limit = ip40->ttl;
+	  ip61->hop_limit = ip41->ttl;
+	  ip60->protocol = ip40->protocol;
+	  ip61->protocol = ip41->protocol;
+
+	  if (PREDICT_FALSE (frag0 != NULL))
+	    {
+	      frag0->next_hdr = ip60->protocol;
+	      frag0->identification = frag_id0;
+	      frag0->rsv = 0;
+	      frag0->fragment_offset_and_more =
+		ip6_frag_hdr_offset_and_more (0, 1);
+	      ip60->protocol = IP_PROTOCOL_IPV6_FRAGMENTATION;
+	      ip60->payload_length =
+		u16_net_add (ip60->payload_length, sizeof (*frag0));
+	    }
+
+	  if (PREDICT_FALSE (frag1 != NULL))
+	    {
+	      frag1->next_hdr = ip61->protocol;
+	      frag1->identification = frag_id1;
+	      frag1->rsv = 0;
+	      frag1->fragment_offset_and_more =
+		ip6_frag_hdr_offset_and_more (0, 1);
+	      ip61->protocol = IP_PROTOCOL_IPV6_FRAGMENTATION;
+	      ip61->payload_length =
+		u16_net_add (ip61->payload_length, sizeof (*frag0));
+	    }
+
+	  //Finally copying the address
+	  ip60->dst_address.as_u64[0] = pheader0->daddr.as_u64[0];
+	  ip61->dst_address.as_u64[0] = pheader1->daddr.as_u64[0];
+	  ip60->dst_address.as_u64[1] = pheader0->daddr.as_u64[1];
+	  ip61->dst_address.as_u64[1] = pheader1->daddr.as_u64[1];
+	  ip60->src_address.as_u64[0] = pheader0->saddr.as_u64[0];
+	  ip61->src_address.as_u64[0] = pheader1->saddr.as_u64[0];
+	  ip60->src_address.as_u64[1] = pheader0->saddr.as_u64[1];
+	  ip61->src_address.as_u64[1] = pheader1->saddr.as_u64[1];
+
+	  csum0 = ip_csum_add_even (csum0, ip60->src_address.as_u64[0]);
+	  csum1 = ip_csum_add_even (csum1, ip61->src_address.as_u64[0]);
+	  csum0 = ip_csum_add_even (csum0, ip60->src_address.as_u64[1]);
+	  csum1 = ip_csum_add_even (csum1, ip61->src_address.as_u64[1]);
+	  csum0 = ip_csum_add_even (csum0, ip60->dst_address.as_u64[0]);
+	  csum1 = ip_csum_add_even (csum1, ip61->dst_address.as_u64[0]);
+	  csum0 = ip_csum_add_even (csum0, ip60->dst_address.as_u64[1]);
+	  csum1 = ip_csum_add_even (csum1, ip61->dst_address.as_u64[1]);
+	  *checksum0 = ip_csum_fold (csum0);
+	  *checksum1 = ip_csum_fold (csum1);
+
+	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
+	    {
+	      vnet_buffer (p0)->ip_frag.header_offset = 0;
+	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
+	      vnet_buffer (p0)->ip_frag.next_index = IP6_FRAG_NEXT_IP6_LOOKUP;
+	      next0 = IP4_MAPT_TCP_UDP_NEXT_IP6_FRAG;
+	    }
+
+	  if (vnet_buffer (p1)->map_t.mtu < p1->current_length)
+	    {
+	      vnet_buffer (p1)->ip_frag.header_offset = 0;
+	      vnet_buffer (p1)->ip_frag.mtu = vnet_buffer (p1)->map_t.mtu;
+	      vnet_buffer (p1)->ip_frag.next_index = IP6_FRAG_NEXT_IP6_LOOKUP;
+	      next1 = IP4_MAPT_TCP_UDP_NEXT_IP6_FRAG;
+	    }
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next, pi0, pi1,
+					   next0, next1);
+	}
+#endif
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  ip4_header_t *ip40;
+	  ip6_header_t *ip60;
+	  ip_csum_t csum0;
+	  u16 *checksum0;
+	  ip6_frag_hdr_t *frag0;
+	  u32 frag_id0;
+	  ip4_mapt_pseudo_header_t *pheader0;
+	  ip4_mapt_tcp_udp_next_t next0;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  next0 = IP4_MAPT_TCP_UDP_NEXT_IP6_LOOKUP;
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  //Accessing pseudo header
+	  pheader0 = vlib_buffer_get_current (p0);
+	  vlib_buffer_advance (p0, sizeof (*pheader0));
+
+	  //Accessing ip4 header
+	  ip40 = vlib_buffer_get_current (p0);
+	  checksum0 =
+	    (u16 *) u8_ptr_add (ip40,
+				vnet_buffer (p0)->map_t.checksum_offset);
+
+	  //UDP checksum is optional over IPv4 but mandatory for IPv6
+	  //We do not check udp->length sanity but use our safe computed value instead
+	  if (PREDICT_FALSE
+	      (!*checksum0 && ip40->protocol == IP_PROTOCOL_UDP))
+	    {
+	      u16 udp_len =
+		clib_host_to_net_u16 (ip40->length) - sizeof (*ip40);
+	      udp_header_t *udp =
+		(udp_header_t *) u8_ptr_add (ip40, sizeof (*ip40));
+	      ip_csum_t csum;
+	      csum = ip_incremental_checksum (0, udp, udp_len);
+	      csum =
+		ip_csum_with_carry (csum, clib_host_to_net_u16 (udp_len));
+	      csum =
+		ip_csum_with_carry (csum,
+				    clib_host_to_net_u16 (IP_PROTOCOL_UDP));
+	      csum =
+		ip_csum_with_carry (csum, *((u64 *) (&ip40->src_address)));
+	      *checksum0 = ~ip_csum_fold (csum);
+	    }
+
+	  csum0 = ip_csum_sub_even (*checksum0, ip40->src_address.as_u32);
+	  csum0 = ip_csum_sub_even (csum0, ip40->dst_address.as_u32);
+
+	  // Deal with fragmented packets
+	  if (PREDICT_FALSE (ip40->flags_and_fragment_offset &
+			     clib_host_to_net_u16
+			     (IP4_HEADER_FLAG_MORE_FRAGMENTS)))
+	    {
+	      ip60 =
+		(ip6_header_t *) u8_ptr_add (ip40,
+					     sizeof (*ip40) - sizeof (*ip60) -
+					     sizeof (*frag0));
+	      frag0 =
+		(ip6_frag_hdr_t *) u8_ptr_add (ip40,
+					       sizeof (*ip40) -
+					       sizeof (*frag0));
+	      frag_id0 = frag_id_4to6 (ip40->fragment_id);
+	      vlib_buffer_advance (p0,
+				   sizeof (*ip40) - sizeof (*ip60) -
+				   sizeof (*frag0));
+	    }
+	  else
+	    {
+	      ip60 =
+		(ip6_header_t *) (((u8 *) ip40) + sizeof (*ip40) -
+				  sizeof (*ip60));
+	      vlib_buffer_advance (p0, sizeof (*ip40) - sizeof (*ip60));
+	      frag0 = NULL;
+	    }
+
+	  ip60->ip_version_traffic_class_and_flow_label =
+	    clib_host_to_net_u32 ((6 << 28) + (ip40->tos << 20));
+	  ip60->payload_length = u16_net_add (ip40->length, -sizeof (*ip40));
+	  ip60->hop_limit = ip40->ttl;
+	  ip60->protocol = ip40->protocol;
+
+	  if (PREDICT_FALSE (frag0 != NULL))
+	    {
+	      frag0->next_hdr = ip60->protocol;
+	      frag0->identification = frag_id0;
+	      frag0->rsv = 0;
+	      frag0->fragment_offset_and_more =
+		ip6_frag_hdr_offset_and_more (0, 1);
+	      ip60->protocol = IP_PROTOCOL_IPV6_FRAGMENTATION;
+	      ip60->payload_length =
+		u16_net_add (ip60->payload_length, sizeof (*frag0));
+	    }
+
+	  //Finally copying the address
+	  ip60->dst_address.as_u64[0] = pheader0->daddr.as_u64[0];
+	  ip60->dst_address.as_u64[1] = pheader0->daddr.as_u64[1];
+	  ip60->src_address.as_u64[0] = pheader0->saddr.as_u64[0];
+	  ip60->src_address.as_u64[1] = pheader0->saddr.as_u64[1];
+
+	  csum0 = ip_csum_add_even (csum0, ip60->src_address.as_u64[0]);
+	  csum0 = ip_csum_add_even (csum0, ip60->src_address.as_u64[1]);
+	  csum0 = ip_csum_add_even (csum0, ip60->dst_address.as_u64[0]);
+	  csum0 = ip_csum_add_even (csum0, ip60->dst_address.as_u64[1]);
+	  *checksum0 = ip_csum_fold (csum0);
+
+	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
+	    {
+	      //Send to fragmentation node if necessary
+	      vnet_buffer (p0)->ip_frag.header_offset = 0;
+	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
+	      vnet_buffer (p0)->ip_frag.next_index = IP6_FRAG_NEXT_IP6_LOOKUP;
+	      next0 = IP4_MAPT_TCP_UDP_NEXT_IP6_FRAG;
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next, pi0,
+					   next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+static_always_inline void
+ip4_map_t_classify (vlib_buffer_t * p0, map_domain_t * d0,
+		    ip4_header_t * ip40, u16 ip4_len0, i32 * dst_port0,
+		    u8 * error0, ip4_mapt_next_t * next0)
+{
+  if (PREDICT_FALSE (ip4_get_fragment_offset (ip40)))
+    {
+      *next0 = IP4_MAPT_NEXT_MAPT_FRAGMENTED;
+      if (d0->ea_bits_len == 0 && d0->rules)
+	{
+	  *dst_port0 = 0;
+	}
+      else
+	{
+	  *dst_port0 = ip4_map_fragment_get_port (ip40);
+	  *error0 = (*dst_port0 == -1) ? MAP_ERROR_FRAGMENT_MEMORY : *error0;
+	}
+    }
+  else if (PREDICT_TRUE (ip40->protocol == IP_PROTOCOL_TCP))
+    {
+      vnet_buffer (p0)->map_t.checksum_offset = 36;
+      *next0 = IP4_MAPT_NEXT_MAPT_TCP_UDP;
+      *error0 = ip4_len0 < 40 ? MAP_ERROR_MALFORMED : *error0;
+      *dst_port0 = (i32) * ((u16 *) u8_ptr_add (ip40, sizeof (*ip40) + 2));
+    }
+  else if (PREDICT_TRUE (ip40->protocol == IP_PROTOCOL_UDP))
+    {
+      vnet_buffer (p0)->map_t.checksum_offset = 26;
+      *next0 = IP4_MAPT_NEXT_MAPT_TCP_UDP;
+      *error0 = ip4_len0 < 28 ? MAP_ERROR_MALFORMED : *error0;
+      *dst_port0 = (i32) * ((u16 *) u8_ptr_add (ip40, sizeof (*ip40) + 2));
+    }
+  else if (ip40->protocol == IP_PROTOCOL_ICMP)
+    {
+      *next0 = IP4_MAPT_NEXT_MAPT_ICMP;
+      if (d0->ea_bits_len == 0 && d0->rules)
+	*dst_port0 = 0;
+      else if (((icmp46_header_t *) u8_ptr_add (ip40, sizeof (*ip40)))->code
+	       == ICMP4_echo_reply
+	       || ((icmp46_header_t *)
+		   u8_ptr_add (ip40,
+			       sizeof (*ip40)))->code == ICMP4_echo_request)
+	*dst_port0 = (i32) * ((u16 *) u8_ptr_add (ip40, sizeof (*ip40) + 6));
+    }
+  else
+    {
+      *error0 = MAP_ERROR_BAD_PROTOCOL;
+    }
+}
+
+static uword
+ip4_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip4_map_t_node.index);
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  vlib_combined_counter_main_t *cm = map_main.domain_counters;
+  u32 cpu_index = os_get_cpu_number ();
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+#ifdef IP4_MAP_T_DUAL_LOOP
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 pi0, pi1;
+	  vlib_buffer_t *p0, *p1;
+	  ip4_header_t *ip40, *ip41;
+	  map_domain_t *d0, *d1;
+	  ip4_mapt_next_t next0 = 0, next1 = 0;
+	  u16 ip4_len0, ip4_len1;
+	  u8 error0, error1;
+	  i32 dst_port0, dst_port1;
+	  ip4_mapt_pseudo_header_t *pheader0, *pheader1;
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  error0 = MAP_ERROR_NONE;
+	  error1 = MAP_ERROR_NONE;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+	  ip40 = vlib_buffer_get_current (p0);
+	  ip41 = vlib_buffer_get_current (p1);
+	  ip4_len0 = clib_host_to_net_u16 (ip40->length);
+	  ip4_len1 = clib_host_to_net_u16 (ip41->length);
+
+	  if (PREDICT_FALSE (p0->current_length < ip4_len0 ||
+			     ip40->ip_version_and_header_length != 0x45))
+	    {
+	      error0 = MAP_ERROR_UNKNOWN;
+	      next0 = IP4_MAPT_NEXT_DROP;
+	    }
+
+	  if (PREDICT_FALSE (p1->current_length < ip4_len1 ||
+			     ip41->ip_version_and_header_length != 0x45))
+	    {
+	      error1 = MAP_ERROR_UNKNOWN;
+	      next1 = IP4_MAPT_NEXT_DROP;
+	    }
+
+	  d0 = ip4_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
+				   &vnet_buffer (p0)->map_t.map_domain_index);
+	  d1 = ip4_map_get_domain (vnet_buffer (p1)->ip.adj_index[VLIB_TX],
+				   &vnet_buffer (p1)->map_t.map_domain_index);
+
+	  vnet_buffer (p0)->map_t.mtu = d0->mtu ? d0->mtu : ~0;
+	  vnet_buffer (p1)->map_t.mtu = d1->mtu ? d1->mtu : ~0;
+
+	  dst_port0 = -1;
+	  dst_port1 = -1;
+
+	  ip4_map_t_classify (p0, d0, ip40, ip4_len0, &dst_port0, &error0,
+			      &next0);
+	  ip4_map_t_classify (p1, d1, ip41, ip4_len1, &dst_port1, &error1,
+			      &next1);
+
+	  //Add MAP-T pseudo header in front of the packet
+	  vlib_buffer_advance (p0, -sizeof (*pheader0));
+	  vlib_buffer_advance (p1, -sizeof (*pheader1));
+	  pheader0 = vlib_buffer_get_current (p0);
+	  pheader1 = vlib_buffer_get_current (p1);
+
+	  //Save addresses within the packet
+	  ip4_map_t_embedded_address (d0, &pheader0->saddr,
+				      &ip40->src_address);
+	  ip4_map_t_embedded_address (d1, &pheader1->saddr,
+				      &ip41->src_address);
+	  pheader0->daddr.as_u64[0] =
+	    map_get_pfx_net (d0, ip40->dst_address.as_u32, (u16) dst_port0);
+	  pheader0->daddr.as_u64[1] =
+	    map_get_sfx_net (d0, ip40->dst_address.as_u32, (u16) dst_port0);
+	  pheader1->daddr.as_u64[0] =
+	    map_get_pfx_net (d1, ip41->dst_address.as_u32, (u16) dst_port1);
+	  pheader1->daddr.as_u64[1] =
+	    map_get_sfx_net (d1, ip41->dst_address.as_u32, (u16) dst_port1);
+
+	  if (PREDICT_FALSE
+	      (ip4_is_first_fragment (ip40) && (dst_port0 != -1)
+	       && (d0->ea_bits_len != 0 || !d0->rules)
+	       && ip4_map_fragment_cache (ip40, dst_port0)))
+	    {
+	      error0 = MAP_ERROR_FRAGMENT_MEMORY;
+	    }
+
+	  if (PREDICT_FALSE
+	      (ip4_is_first_fragment (ip41) && (dst_port1 != -1)
+	       && (d1->ea_bits_len != 0 || !d1->rules)
+	       && ip4_map_fragment_cache (ip41, dst_port1)))
+	    {
+	      error1 = MAP_ERROR_FRAGMENT_MEMORY;
+	    }
+
+	  if (PREDICT_TRUE
+	      (error0 == MAP_ERROR_NONE && next0 != IP4_MAPT_NEXT_MAPT_ICMP))
+	    {
+	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
+					       cpu_index,
+					       vnet_buffer (p0)->map_t.
+					       map_domain_index, 1,
+					       clib_net_to_host_u16 (ip40->
+								     length));
+	    }
+
+	  if (PREDICT_TRUE
+	      (error1 == MAP_ERROR_NONE && next1 != IP4_MAPT_NEXT_MAPT_ICMP))
+	    {
+	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
+					       cpu_index,
+					       vnet_buffer (p1)->map_t.
+					       map_domain_index, 1,
+					       clib_net_to_host_u16 (ip41->
+								     length));
+	    }
+
+	  next0 = (error0 != MAP_ERROR_NONE) ? IP4_MAPT_NEXT_DROP : next0;
+	  next1 = (error1 != MAP_ERROR_NONE) ? IP4_MAPT_NEXT_DROP : next1;
+	  p0->error = error_node->errors[error0];
+	  p1->error = error_node->errors[error1];
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+					   n_left_to_next, pi0, pi1, next0,
+					   next1);
+	}
+#endif
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  ip4_header_t *ip40;
+	  map_domain_t *d0;
+	  ip4_mapt_next_t next0;
+	  u16 ip4_len0;
+	  u8 error0;
+	  i32 dst_port0;
+	  ip4_mapt_pseudo_header_t *pheader0;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  error0 = MAP_ERROR_NONE;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip40 = vlib_buffer_get_current (p0);
+	  ip4_len0 = clib_host_to_net_u16 (ip40->length);
+	  if (PREDICT_FALSE (p0->current_length < ip4_len0 ||
+			     ip40->ip_version_and_header_length != 0x45))
+	    {
+	      error0 = MAP_ERROR_UNKNOWN;
+	      next0 = IP4_MAPT_NEXT_DROP;
+	    }
+
+	  d0 = ip4_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
+				   &vnet_buffer (p0)->map_t.map_domain_index);
+
+	  vnet_buffer (p0)->map_t.mtu = d0->mtu ? d0->mtu : ~0;
+
+	  dst_port0 = -1;
+	  ip4_map_t_classify (p0, d0, ip40, ip4_len0, &dst_port0, &error0,
+			      &next0);
+
+	  //Add MAP-T pseudo header in front of the packet
+	  vlib_buffer_advance (p0, -sizeof (*pheader0));
+	  pheader0 = vlib_buffer_get_current (p0);
+
+	  //Save addresses within the packet
+	  ip4_map_t_embedded_address (d0, &pheader0->saddr,
+				      &ip40->src_address);
+	  pheader0->daddr.as_u64[0] =
+	    map_get_pfx_net (d0, ip40->dst_address.as_u32, (u16) dst_port0);
+	  pheader0->daddr.as_u64[1] =
+	    map_get_sfx_net (d0, ip40->dst_address.as_u32, (u16) dst_port0);
+
+	  //It is important to cache at this stage because the result might be necessary
+	  //for packets within the same vector.
+	  //Actually, this approach even provides some limited out-of-order fragments support
+	  if (PREDICT_FALSE
+	      (ip4_is_first_fragment (ip40) && (dst_port0 != -1)
+	       && (d0->ea_bits_len != 0 || !d0->rules)
+	       && ip4_map_fragment_cache (ip40, dst_port0)))
+	    {
+	      error0 = MAP_ERROR_UNKNOWN;
+	    }
+
+	  if (PREDICT_TRUE
+	      (error0 == MAP_ERROR_NONE && next0 != IP4_MAPT_NEXT_MAPT_ICMP))
+	    {
+	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
+					       cpu_index,
+					       vnet_buffer (p0)->map_t.
+					       map_domain_index, 1,
+					       clib_net_to_host_u16 (ip40->
+								     length));
+	    }
+
+	  next0 = (error0 != MAP_ERROR_NONE) ? IP4_MAPT_NEXT_DROP : next0;
+	  p0->error = error_node->errors[error0];
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next, pi0,
+					   next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return frame->n_vectors;
+}
+
+static char *map_t_error_strings[] = {
+#define _(sym,string) string,
+  foreach_map_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(ip4_map_t_fragmented_node) = {
+  .function = ip4_map_t_fragmented,
+  .name = "ip4-map-t-fragmented",
+  .vector_size = sizeof(u32),
+  .format_trace = format_map_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = MAP_N_ERROR,
+  .error_strings = map_t_error_strings,
+
+  .n_next_nodes = IP4_MAPT_FRAGMENTED_N_NEXT,
+  .next_nodes = {
+      [IP4_MAPT_FRAGMENTED_NEXT_IP6_LOOKUP] = "ip6-lookup",
+      [IP4_MAPT_FRAGMENTED_NEXT_IP6_FRAG] = IP6_FRAG_NODE_NAME,
+      [IP4_MAPT_FRAGMENTED_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(ip4_map_t_icmp_node) = {
+  .function = ip4_map_t_icmp,
+  .name = "ip4-map-t-icmp",
+  .vector_size = sizeof(u32),
+  .format_trace = format_map_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = MAP_N_ERROR,
+  .error_strings = map_t_error_strings,
+
+  .n_next_nodes = IP4_MAPT_ICMP_N_NEXT,
+  .next_nodes = {
+      [IP4_MAPT_ICMP_NEXT_IP6_LOOKUP] = "ip6-lookup",
+      [IP4_MAPT_ICMP_NEXT_IP6_FRAG] = IP6_FRAG_NODE_NAME,
+      [IP4_MAPT_ICMP_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(ip4_map_t_tcp_udp_node) = {
+  .function = ip4_map_t_tcp_udp,
+  .name = "ip4-map-t-tcp-udp",
+  .vector_size = sizeof(u32),
+  .format_trace = format_map_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = MAP_N_ERROR,
+  .error_strings = map_t_error_strings,
+
+  .n_next_nodes = IP4_MAPT_TCP_UDP_N_NEXT,
+  .next_nodes = {
+      [IP4_MAPT_TCP_UDP_NEXT_IP6_LOOKUP] = "ip6-lookup",
+      [IP4_MAPT_TCP_UDP_NEXT_IP6_FRAG] = IP6_FRAG_NODE_NAME,
+      [IP4_MAPT_TCP_UDP_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(ip4_map_t_node) = {
+  .function = ip4_map_t,
+  .name = "ip4-map-t",
+  .vector_size = sizeof(u32),
+  .format_trace = format_map_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = MAP_N_ERROR,
+  .error_strings = map_t_error_strings,
+
+  .n_next_nodes = IP4_MAPT_N_NEXT,
+  .next_nodes = {
+      [IP4_MAPT_NEXT_MAPT_TCP_UDP] = "ip4-map-t-tcp-udp",
+      [IP4_MAPT_NEXT_MAPT_ICMP] = "ip4-map-t-icmp",
+      [IP4_MAPT_NEXT_MAPT_FRAGMENTED] = "ip4-map-t-fragmented",
+      [IP4_MAPT_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/map/ip6_map.c b/src/vnet/map/ip6_map.c
new file mode 100644
index 00000000..d2945059
--- /dev/null
+++ b/src/vnet/map/ip6_map.c
@@ -0,0 +1,1269 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "map.h"
+
+#include "../ip/ip_frag.h"
+
+enum ip6_map_next_e
+{
+  IP6_MAP_NEXT_IP4_LOOKUP,
+#ifdef MAP_SKIP_IP6_LOOKUP
+  IP6_MAP_NEXT_IP4_REWRITE,
+#endif
+  IP6_MAP_NEXT_IP6_REASS,
+  IP6_MAP_NEXT_IP4_REASS,
+  IP6_MAP_NEXT_IP4_FRAGMENT,
+  IP6_MAP_NEXT_IP6_ICMP_RELAY,
+  IP6_MAP_NEXT_IP6_LOCAL,
+  IP6_MAP_NEXT_DROP,
+  IP6_MAP_NEXT_ICMP,
+  IP6_MAP_N_NEXT,
+};
+
+enum ip6_map_ip6_reass_next_e
+{
+  IP6_MAP_IP6_REASS_NEXT_IP6_MAP,
+  IP6_MAP_IP6_REASS_NEXT_DROP,
+  IP6_MAP_IP6_REASS_N_NEXT,
+};
+
+enum ip6_map_ip4_reass_next_e
+{
+  IP6_MAP_IP4_REASS_NEXT_IP4_LOOKUP,
+  IP6_MAP_IP4_REASS_NEXT_IP4_FRAGMENT,
+  IP6_MAP_IP4_REASS_NEXT_DROP,
+  IP6_MAP_IP4_REASS_N_NEXT,
+};
+
+enum ip6_icmp_relay_next_e
+{
+  IP6_ICMP_RELAY_NEXT_IP4_LOOKUP,
+  IP6_ICMP_RELAY_NEXT_DROP,
+  IP6_ICMP_RELAY_N_NEXT,
+};
+
+vlib_node_registration_t ip6_map_ip4_reass_node;
+vlib_node_registration_t ip6_map_ip6_reass_node;
+static vlib_node_registration_t ip6_map_icmp_relay_node;
+
+typedef struct
+{
+  u32 map_domain_index;
+  u16 port;
+  u8 cached;
+} map_ip6_map_ip4_reass_trace_t;
+
+u8 *
+format_ip6_map_ip4_reass_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  map_ip6_map_ip4_reass_trace_t *t =
+    va_arg (*args, map_ip6_map_ip4_reass_trace_t *);
+  return format (s, "MAP domain index: %d L4 port: %u Status: %s",
+		 t->map_domain_index, t->port,
+		 t->cached ? "cached" : "forwarded");
+}
+
+typedef struct
+{
+  u16 offset;
+  u16 frag_len;
+  u8 out;
+} map_ip6_map_ip6_reass_trace_t;
+
+u8 *
+format_ip6_map_ip6_reass_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  map_ip6_map_ip6_reass_trace_t *t =
+    va_arg (*args, map_ip6_map_ip6_reass_trace_t *);
+  return format (s, "Offset: %d Fragment length: %d Status: %s", t->offset,
+		 t->frag_len, t->out ? "out" : "in");
+}
+
+/*
+ * ip6_map_sec_check
+ */
+static_always_inline bool
+ip6_map_sec_check (map_domain_t * d, u16 port, ip4_header_t * ip4,
+		   ip6_header_t * ip6)
+{
+  u16 sp4 = clib_net_to_host_u16 (port);
+  u32 sa4 = clib_net_to_host_u32 (ip4->src_address.as_u32);
+  u64 sal6 = map_get_pfx (d, sa4, sp4);
+  u64 sar6 = map_get_sfx (d, sa4, sp4);
+
+  if (PREDICT_FALSE
+      (sal6 != clib_net_to_host_u64 (ip6->src_address.as_u64[0])
+       || sar6 != clib_net_to_host_u64 (ip6->src_address.as_u64[1])))
+    return (false);
+  return (true);
+}
+
+static_always_inline void
+ip6_map_security_check (map_domain_t * d, ip4_header_t * ip4,
+			ip6_header_t * ip6, u32 * next, u8 * error)
+{
+  map_main_t *mm = &map_main;
+  if (d->ea_bits_len || d->rules)
+    {
+      if (d->psid_length > 0)
+	{
+	  if (!ip4_is_fragment (ip4))
+	    {
+	      u16 port = ip4_map_get_port (ip4, MAP_SENDER);
+	      if (port)
+		{
+		  if (mm->sec_check)
+		    *error =
+		      ip6_map_sec_check (d, port, ip4,
+					 ip6) ? MAP_ERROR_NONE :
+		      MAP_ERROR_DECAP_SEC_CHECK;
+		}
+	      else
+		{
+		  *error = MAP_ERROR_BAD_PROTOCOL;
+		}
+	    }
+	  else
+	    {
+	      *next = mm->sec_check_frag ? IP6_MAP_NEXT_IP4_REASS : *next;
+	    }
+	}
+    }
+}
+
+static_always_inline bool
+ip6_map_ip4_lookup_bypass (vlib_buffer_t * p0, ip4_header_t * ip)
+{
+#ifdef MAP_SKIP_IP6_LOOKUP
+  map_main_t *mm = &map_main;
+  u32 adj_index0 = mm->adj4_index;
+  if (adj_index0 > 0)
+    {
+      ip_lookup_main_t *lm4 = &ip4_main.lookup_main;
+      ip_adjacency_t *adj = ip_get_adjacency (lm4, mm->adj4_index);
+      if (adj->n_adj > 1)
+	{
+	  u32 hash_c0 = ip4_compute_flow_hash (ip, IP_FLOW_HASH_DEFAULT);
+	  adj_index0 += (hash_c0 & (adj->n_adj - 1));
+	}
+      vnet_buffer (p0)->ip.adj_index[VLIB_TX] = adj_index0;
+      return (true);
+    }
+#endif
+  return (false);
+}
+
+/*
+ * ip6_map
+ */
+static uword
+ip6_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip6_map_node.index);
+  map_main_t *mm = &map_main;
+  vlib_combined_counter_main_t *cm = mm->domain_counters;
+  u32 cpu_index = os_get_cpu_number ();
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /* Dual loop */
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 pi0, pi1;
+	  vlib_buffer_t *p0, *p1;
+	  u8 error0 = MAP_ERROR_NONE;
+	  u8 error1 = MAP_ERROR_NONE;
+	  map_domain_t *d0 = 0, *d1 = 0;
+	  ip4_header_t *ip40, *ip41;
+	  ip6_header_t *ip60, *ip61;
+	  u16 port0 = 0, port1 = 0;
+	  u32 map_domain_index0 = ~0, map_domain_index1 = ~0;
+	  u32 next0 = IP6_MAP_NEXT_IP4_LOOKUP;
+	  u32 next1 = IP6_MAP_NEXT_IP4_LOOKUP;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    /* IPv6 + IPv4 header + 8 bytes of ULP */
+	    CLIB_PREFETCH (p2->data, 68, LOAD);
+	    CLIB_PREFETCH (p3->data, 68, LOAD);
+	  }
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+	  ip60 = vlib_buffer_get_current (p0);
+	  ip61 = vlib_buffer_get_current (p1);
+	  vlib_buffer_advance (p0, sizeof (ip6_header_t));
+	  vlib_buffer_advance (p1, sizeof (ip6_header_t));
+	  ip40 = vlib_buffer_get_current (p0);
+	  ip41 = vlib_buffer_get_current (p1);
+
+	  /*
+	   * Encapsulated IPv4 packet
+	   *   - IPv4 fragmented -> Pass to virtual reassembly unless security check disabled
+	   *   - Lookup/Rewrite or Fragment node in case of packet > MTU
+	   * Fragmented IPv6 packet
+	   * ICMP IPv6 packet
+	   *   - Error -> Pass to ICMPv6/ICMPv4 relay
+	   *   - Info -> Pass to IPv6 local
+	   * Anything else -> drop
+	   */
+	  if (PREDICT_TRUE
+	      (ip60->protocol == IP_PROTOCOL_IP_IN_IP
+	       && clib_net_to_host_u16 (ip60->payload_length) > 20))
+	    {
+	      d0 =
+		ip6_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
+				    (ip4_address_t *) & ip40->src_address.
+				    as_u32, &map_domain_index0, &error0);
+	    }
+	  else if (ip60->protocol == IP_PROTOCOL_ICMP6 &&
+		   clib_net_to_host_u16 (ip60->payload_length) >
+		   sizeof (icmp46_header_t))
+	    {
+	      icmp46_header_t *icmp = (void *) (ip60 + 1);
+	      next0 = (icmp->type == ICMP6_echo_request
+		       || icmp->type ==
+		       ICMP6_echo_reply) ? IP6_MAP_NEXT_IP6_LOCAL :
+		IP6_MAP_NEXT_IP6_ICMP_RELAY;
+	    }
+	  else if (ip60->protocol == IP_PROTOCOL_IPV6_FRAGMENTATION)
+	    {
+	      next0 = IP6_MAP_NEXT_IP6_REASS;
+	    }
+	  else
+	    {
+	      error0 = MAP_ERROR_BAD_PROTOCOL;
+	    }
+	  if (PREDICT_TRUE
+	      (ip61->protocol == IP_PROTOCOL_IP_IN_IP
+	       && clib_net_to_host_u16 (ip61->payload_length) > 20))
+	    {
+	      d1 =
+		ip6_map_get_domain (vnet_buffer (p1)->ip.adj_index[VLIB_TX],
+				    (ip4_address_t *) & ip41->src_address.
+				    as_u32, &map_domain_index1, &error1);
+	    }
+	  else if (ip61->protocol == IP_PROTOCOL_ICMP6 &&
+		   clib_net_to_host_u16 (ip61->payload_length) >
+		   sizeof (icmp46_header_t))
+	    {
+	      icmp46_header_t *icmp = (void *) (ip61 + 1);
+	      next1 = (icmp->type == ICMP6_echo_request
+		       || icmp->type ==
+		       ICMP6_echo_reply) ? IP6_MAP_NEXT_IP6_LOCAL :
+		IP6_MAP_NEXT_IP6_ICMP_RELAY;
+	    }
+	  else if (ip61->protocol == IP_PROTOCOL_IPV6_FRAGMENTATION)
+	    {
+	      next1 = IP6_MAP_NEXT_IP6_REASS;
+	    }
+	  else
+	    {
+	      error1 = MAP_ERROR_BAD_PROTOCOL;
+	    }
+
+	  if (d0)
+	    {
+	      /* MAP inbound security check */
+	      ip6_map_security_check (d0, ip40, ip60, &next0, &error0);
+
+	      if (PREDICT_TRUE (error0 == MAP_ERROR_NONE &&
+				next0 == IP6_MAP_NEXT_IP4_LOOKUP))
+		{
+		  if (PREDICT_FALSE
+		      (d0->mtu
+		       && (clib_host_to_net_u16 (ip40->length) > d0->mtu)))
+		    {
+		      vnet_buffer (p0)->ip_frag.header_offset = 0;
+		      vnet_buffer (p0)->ip_frag.flags = 0;
+		      vnet_buffer (p0)->ip_frag.next_index =
+			IP4_FRAG_NEXT_IP4_LOOKUP;
+		      vnet_buffer (p0)->ip_frag.mtu = d0->mtu;
+		      next0 = IP6_MAP_NEXT_IP4_FRAGMENT;
+		    }
+		  else
+		    {
+		      next0 =
+			ip6_map_ip4_lookup_bypass (p0,
+						   ip40) ?
+			IP6_MAP_NEXT_IP4_REWRITE : next0;
+		    }
+		  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
+						   cpu_index,
+						   map_domain_index0, 1,
+						   clib_net_to_host_u16
+						   (ip40->length));
+		}
+	    }
+	  if (d1)
+	    {
+	      /* MAP inbound security check */
+	      ip6_map_security_check (d1, ip41, ip61, &next1, &error1);
+
+	      if (PREDICT_TRUE (error1 == MAP_ERROR_NONE &&
+				next1 == IP6_MAP_NEXT_IP4_LOOKUP))
+		{
+		  if (PREDICT_FALSE
+		      (d1->mtu
+		       && (clib_host_to_net_u16 (ip41->length) > d1->mtu)))
+		    {
+		      vnet_buffer (p1)->ip_frag.header_offset = 0;
+		      vnet_buffer (p1)->ip_frag.flags = 0;
+		      vnet_buffer (p1)->ip_frag.next_index =
+			IP4_FRAG_NEXT_IP4_LOOKUP;
+		      vnet_buffer (p1)->ip_frag.mtu = d1->mtu;
+		      next1 = IP6_MAP_NEXT_IP4_FRAGMENT;
+		    }
+		  else
+		    {
+		      next1 =
+			ip6_map_ip4_lookup_bypass (p1,
+						   ip41) ?
+			IP6_MAP_NEXT_IP4_REWRITE : next1;
+		    }
+		  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
+						   cpu_index,
+						   map_domain_index1, 1,
+						   clib_net_to_host_u16
+						   (ip41->length));
+		}
+	    }
+
+	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      map_trace_t *tr = vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->map_domain_index = map_domain_index0;
+	      tr->port = port0;
+	    }
+
+	  if (PREDICT_FALSE (p1->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      map_trace_t *tr = vlib_add_trace (vm, node, p1, sizeof (*tr));
+	      tr->map_domain_index = map_domain_index1;
+	      tr->port = port1;
+	    }
+
+	  if (error0 == MAP_ERROR_DECAP_SEC_CHECK && mm->icmp6_enabled)
+	    {
+	      /* Set ICMP parameters */
+	      vlib_buffer_advance (p0, -sizeof (ip6_header_t));
+	      icmp6_error_set_vnet_buffer (p0, ICMP6_destination_unreachable,
+					   ICMP6_destination_unreachable_source_address_failed_policy,
+					   0);
+	      next0 = IP6_MAP_NEXT_ICMP;
+	    }
+	  else
+	    {
+	      next0 = (error0 == MAP_ERROR_NONE) ? next0 : IP6_MAP_NEXT_DROP;
+	    }
+
+	  if (error1 == MAP_ERROR_DECAP_SEC_CHECK && mm->icmp6_enabled)
+	    {
+	      /* Set ICMP parameters */
+	      vlib_buffer_advance (p1, -sizeof (ip6_header_t));
+	      icmp6_error_set_vnet_buffer (p1, ICMP6_destination_unreachable,
+					   ICMP6_destination_unreachable_source_address_failed_policy,
+					   0);
+	      next1 = IP6_MAP_NEXT_ICMP;
+	    }
+	  else
+	    {
+	      next1 = (error1 == MAP_ERROR_NONE) ? next1 : IP6_MAP_NEXT_DROP;
+	    }
+
+	  /* Reset packet */
+	  if (next0 == IP6_MAP_NEXT_IP6_LOCAL)
+	    vlib_buffer_advance (p0, -sizeof (ip6_header_t));
+	  if (next1 == IP6_MAP_NEXT_IP6_LOCAL)
+	    vlib_buffer_advance (p1, -sizeof (ip6_header_t));
+
+	  p0->error = error_node->errors[error0];
+	  p1->error = error_node->errors[error1];
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+					   n_left_to_next, pi0, pi1, next0,
+					   next1);
+	}
+
+      /* Single loop */
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  u8 error0 = MAP_ERROR_NONE;
+	  map_domain_t *d0 = 0;
+	  ip4_header_t *ip40;
+	  ip6_header_t *ip60;
+	  i32 port0 = 0;
+	  u32 map_domain_index0 = ~0;
+	  u32 next0 = IP6_MAP_NEXT_IP4_LOOKUP;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip60 = vlib_buffer_get_current (p0);
+	  vlib_buffer_advance (p0, sizeof (ip6_header_t));
+	  ip40 = vlib_buffer_get_current (p0);
+
+	  /*
+	   * Encapsulated IPv4 packet
+	   *   - IPv4 fragmented -> Pass to virtual reassembly unless security check disabled
+	   *   - Lookup/Rewrite or Fragment node in case of packet > MTU
+	   * Fragmented IPv6 packet
+	   * ICMP IPv6 packet
+	   *   - Error -> Pass to ICMPv6/ICMPv4 relay
+	   *   - Info -> Pass to IPv6 local
+	   * Anything else -> drop
+	   */
+	  if (PREDICT_TRUE
+	      (ip60->protocol == IP_PROTOCOL_IP_IN_IP
+	       && clib_net_to_host_u16 (ip60->payload_length) > 20))
+	    {
+	      d0 =
+		ip6_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
+				    (ip4_address_t *) & ip40->src_address.
+				    as_u32, &map_domain_index0, &error0);
+	    }
+	  else if (ip60->protocol == IP_PROTOCOL_ICMP6 &&
+		   clib_net_to_host_u16 (ip60->payload_length) >
+		   sizeof (icmp46_header_t))
+	    {
+	      icmp46_header_t *icmp = (void *) (ip60 + 1);
+	      next0 = (icmp->type == ICMP6_echo_request
+		       || icmp->type ==
+		       ICMP6_echo_reply) ? IP6_MAP_NEXT_IP6_LOCAL :
+		IP6_MAP_NEXT_IP6_ICMP_RELAY;
+	    }
+	  else if (ip60->protocol == IP_PROTOCOL_IPV6_FRAGMENTATION &&
+		   (((ip6_frag_hdr_t *) (ip60 + 1))->next_hdr ==
+		    IP_PROTOCOL_IP_IN_IP))
+	    {
+	      next0 = IP6_MAP_NEXT_IP6_REASS;
+	    }
+	  else
+	    {
+	      error0 = MAP_ERROR_BAD_PROTOCOL;
+	    }
+
+	  if (d0)
+	    {
+	      /* MAP inbound security check */
+	      ip6_map_security_check (d0, ip40, ip60, &next0, &error0);
+
+	      if (PREDICT_TRUE (error0 == MAP_ERROR_NONE &&
+				next0 == IP6_MAP_NEXT_IP4_LOOKUP))
+		{
+		  if (PREDICT_FALSE
+		      (d0->mtu
+		       && (clib_host_to_net_u16 (ip40->length) > d0->mtu)))
+		    {
+		      vnet_buffer (p0)->ip_frag.header_offset = 0;
+		      vnet_buffer (p0)->ip_frag.flags = 0;
+		      vnet_buffer (p0)->ip_frag.next_index =
+			IP4_FRAG_NEXT_IP4_LOOKUP;
+		      vnet_buffer (p0)->ip_frag.mtu = d0->mtu;
+		      next0 = IP6_MAP_NEXT_IP4_FRAGMENT;
+		    }
+		  else
+		    {
+		      next0 =
+			ip6_map_ip4_lookup_bypass (p0,
+						   ip40) ?
+			IP6_MAP_NEXT_IP4_REWRITE : next0;
+		    }
+		  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
+						   cpu_index,
+						   map_domain_index0, 1,
+						   clib_net_to_host_u16
+						   (ip40->length));
+		}
+	    }
+
+	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      map_trace_t *tr = vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->map_domain_index = map_domain_index0;
+	      tr->port = (u16) port0;
+	    }
+
+	  if (mm->icmp6_enabled &&
+	      (error0 == MAP_ERROR_DECAP_SEC_CHECK
+	       || error0 == MAP_ERROR_NO_DOMAIN))
+	    {
+	      /* Set ICMP parameters */
+	      vlib_buffer_advance (p0, -sizeof (ip6_header_t));
+	      icmp6_error_set_vnet_buffer (p0, ICMP6_destination_unreachable,
+					   ICMP6_destination_unreachable_source_address_failed_policy,
+					   0);
+	      next0 = IP6_MAP_NEXT_ICMP;
+	    }
+	  else
+	    {
+	      next0 = (error0 == MAP_ERROR_NONE) ? next0 : IP6_MAP_NEXT_DROP;
+	    }
+
+	  /* Reset packet */
+	  if (next0 == IP6_MAP_NEXT_IP6_LOCAL)
+	    vlib_buffer_advance (p0, -sizeof (ip6_header_t));
+
+	  p0->error = error_node->errors[error0];
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, pi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+
+static_always_inline void
+ip6_map_ip6_reass_prepare (vlib_main_t * vm, vlib_node_runtime_t * node,
+			   map_ip6_reass_t * r, u32 ** fragments_ready,
+			   u32 ** fragments_to_drop)
+{
+  ip4_header_t *ip40;
+  ip6_header_t *ip60;
+  ip6_frag_hdr_t *frag0;
+  vlib_buffer_t *p0;
+
+  if (!r->ip4_header.ip_version_and_header_length)
+    return;
+
+  //The IP header is here, we need to check for packets
+  //that can be forwarded
+  int i;
+  for (i = 0; i < MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+    {
+      if (r->fragments[i].pi == ~0 ||
+	  ((!r->fragments[i].next_data_len)
+	   && (r->fragments[i].next_data_offset != (0xffff))))
+	continue;
+
+      p0 = vlib_get_buffer (vm, r->fragments[i].pi);
+      ip60 = vlib_buffer_get_current (p0);
+      frag0 = (ip6_frag_hdr_t *) (ip60 + 1);
+      ip40 = (ip4_header_t *) (frag0 + 1);
+
+      if (ip6_frag_hdr_offset (frag0))
+	{
+	  //Not first fragment, add the IPv4 header
+	  clib_memcpy (ip40, &r->ip4_header, 20);
+	}
+
+#ifdef MAP_IP6_REASS_COUNT_BYTES
+      r->forwarded +=
+	clib_net_to_host_u16 (ip60->payload_length) - sizeof (*frag0);
+#endif
+
+      if (ip6_frag_hdr_more (frag0))
+	{
+	  //Not last fragment, we copy end of next
+	  clib_memcpy (u8_ptr_add (ip60, p0->current_length),
+		       r->fragments[i].next_data, 20);
+	  p0->current_length += 20;
+	  ip60->payload_length = u16_net_add (ip60->payload_length, 20);
+	}
+
+      if (!ip4_is_fragment (ip40))
+	{
+	  ip40->fragment_id = frag_id_6to4 (frag0->identification);
+	  ip40->flags_and_fragment_offset =
+	    clib_host_to_net_u16 (ip6_frag_hdr_offset (frag0));
+	}
+      else
+	{
+	  ip40->flags_and_fragment_offset =
+	    clib_host_to_net_u16 (ip4_get_fragment_offset (ip40) +
+				  ip6_frag_hdr_offset (frag0));
+	}
+
+      if (ip6_frag_hdr_more (frag0))
+	ip40->flags_and_fragment_offset |=
+	  clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS);
+
+      ip40->length =
+	clib_host_to_net_u16 (p0->current_length - sizeof (*ip60) -
+			      sizeof (*frag0));
+      ip40->checksum = ip4_header_checksum (ip40);
+
+      if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	{
+	  map_ip6_map_ip6_reass_trace_t *tr =
+	    vlib_add_trace (vm, node, p0, sizeof (*tr));
+	  tr->offset = ip4_get_fragment_offset (ip40);
+	  tr->frag_len = clib_net_to_host_u16 (ip40->length) - sizeof (*ip40);
+	  tr->out = 1;
+	}
+
+      vec_add1 (*fragments_ready, r->fragments[i].pi);
+      r->fragments[i].pi = ~0;
+      r->fragments[i].next_data_len = 0;
+      r->fragments[i].next_data_offset = 0;
+      map_main.ip6_reass_buffered_counter--;
+
+      //TODO: Best solution would be that ip6_map handles extension headers
+      // and ignores atomic fragment. But in the meantime, let's just copy the header.
+
+      u8 protocol = frag0->next_hdr;
+      memmove (u8_ptr_add (ip40, -sizeof (*ip60)), ip60, sizeof (*ip60));
+      ((ip6_header_t *) u8_ptr_add (ip40, -sizeof (*ip60)))->protocol =
+	protocol;
+      vlib_buffer_advance (p0, sizeof (*frag0));
+    }
+}
+
+void
+map_ip6_drop_pi (u32 pi)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vlib_node_runtime_t *n =
+    vlib_node_get_runtime (vm, ip6_map_ip6_reass_node.index);
+  vlib_set_next_frame_buffer (vm, n, IP6_MAP_IP6_REASS_NEXT_DROP, pi);
+}
+
+void
+map_ip4_drop_pi (u32 pi)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vlib_node_runtime_t *n =
+    vlib_node_get_runtime (vm, ip6_map_ip4_reass_node.index);
+  vlib_set_next_frame_buffer (vm, n, IP6_MAP_IP4_REASS_NEXT_DROP, pi);
+}
+
+/*
+ * ip6_reass
+ * TODO: We should count the number of successfully
+ * transmitted fragment bytes and compare that to the last fragment
+ * offset such that we can free the reassembly structure when all fragments
+ * have been forwarded.
+ */
+static uword
+ip6_map_ip6_reass (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip6_map_ip6_reass_node.index);
+  u32 *fragments_to_drop = NULL;
+  u32 *fragments_ready = NULL;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /* Single loop */
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  u8 error0 = MAP_ERROR_NONE;
+	  ip6_header_t *ip60;
+	  ip6_frag_hdr_t *frag0;
+	  u16 offset;
+	  u16 next_offset;
+	  u16 frag_len;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip60 = vlib_buffer_get_current (p0);
+	  frag0 = (ip6_frag_hdr_t *) (ip60 + 1);
+	  offset =
+	    clib_host_to_net_u16 (frag0->fragment_offset_and_more) & (~7);
+	  frag_len =
+	    clib_net_to_host_u16 (ip60->payload_length) - sizeof (*frag0);
+	  next_offset =
+	    ip6_frag_hdr_more (frag0) ? (offset + frag_len) : (0xffff);
+
+	  //FIXME: Support other extension headers, maybe
+
+	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      map_ip6_map_ip6_reass_trace_t *tr =
+		vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->offset = offset;
+	      tr->frag_len = frag_len;
+	      tr->out = 0;
+	    }
+
+	  map_ip6_reass_lock ();
+	  map_ip6_reass_t *r =
+	    map_ip6_reass_get (&ip60->src_address, &ip60->dst_address,
+			       frag0->identification, frag0->next_hdr,
+			       &fragments_to_drop);
+	  //FIXME: Use better error codes
+	  if (PREDICT_FALSE (!r))
+	    {
+	      // Could not create a caching entry
+	      error0 = MAP_ERROR_FRAGMENT_MEMORY;
+	    }
+	  else if (PREDICT_FALSE ((frag_len <= 20 &&
+				   (ip6_frag_hdr_more (frag0) || (!offset)))))
+	    {
+	      //Very small fragment are restricted to the last one and
+	      //can't be the first one
+	      error0 = MAP_ERROR_FRAGMENT_MALFORMED;
+	    }
+	  else
+	    if (map_ip6_reass_add_fragment
+		(r, pi0, offset, next_offset, (u8 *) (frag0 + 1), frag_len))
+	    {
+	      map_ip6_reass_free (r, &fragments_to_drop);
+	      error0 = MAP_ERROR_FRAGMENT_MEMORY;
+	    }
+	  else
+	    {
+#ifdef MAP_IP6_REASS_COUNT_BYTES
+	      if (!ip6_frag_hdr_more (frag0))
+		r->expected_total = offset + frag_len;
+#endif
+	      ip6_map_ip6_reass_prepare (vm, node, r, &fragments_ready,
+					 &fragments_to_drop);
+#ifdef MAP_IP6_REASS_COUNT_BYTES
+	      if (r->forwarded >= r->expected_total)
+		map_ip6_reass_free (r, &fragments_to_drop);
+#endif
+	    }
+	  map_ip6_reass_unlock ();
+
+	  if (error0 == MAP_ERROR_NONE)
+	    {
+	      if (frag_len > 20)
+		{
+		  //Dequeue the packet
+		  n_left_to_next++;
+		  to_next--;
+		}
+	      else
+		{
+		  //All data from that packet was copied no need to keep it, but this is not an error
+		  p0->error = error_node->errors[MAP_ERROR_NONE];
+		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+						   to_next, n_left_to_next,
+						   pi0,
+						   IP6_MAP_IP6_REASS_NEXT_DROP);
+		}
+	    }
+	  else
+	    {
+	      p0->error = error_node->errors[error0];
+	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					       n_left_to_next, pi0,
+					       IP6_MAP_IP6_REASS_NEXT_DROP);
+	    }
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  map_send_all_to_node (vm, fragments_ready, node,
+			&error_node->errors[MAP_ERROR_NONE],
+			IP6_MAP_IP6_REASS_NEXT_IP6_MAP);
+  map_send_all_to_node (vm, fragments_to_drop, node,
+			&error_node->errors[MAP_ERROR_FRAGMENT_DROPPED],
+			IP6_MAP_IP6_REASS_NEXT_DROP);
+
+  vec_free (fragments_to_drop);
+  vec_free (fragments_ready);
+  return frame->n_vectors;
+}
+
+/*
+ * ip6_ip4_virt_reass
+ */
+static uword
+ip6_map_ip4_reass (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip6_map_ip4_reass_node.index);
+  map_main_t *mm = &map_main;
+  vlib_combined_counter_main_t *cm = mm->domain_counters;
+  u32 cpu_index = os_get_cpu_number ();
+  u32 *fragments_to_drop = NULL;
+  u32 *fragments_to_loopback = NULL;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /* Single loop */
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  u8 error0 = MAP_ERROR_NONE;
+	  map_domain_t *d0;
+	  ip4_header_t *ip40;
+	  ip6_header_t *ip60;
+	  i32 port0 = 0;
+	  u32 map_domain_index0 = ~0;
+	  u32 next0 = IP6_MAP_IP4_REASS_NEXT_IP4_LOOKUP;
+	  u8 cached = 0;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip40 = vlib_buffer_get_current (p0);
+	  ip60 = ((ip6_header_t *) ip40) - 1;
+
+	  d0 =
+	    ip6_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
+				(ip4_address_t *) & ip40->src_address.as_u32,
+				&map_domain_index0, &error0);
+
+	  map_ip4_reass_lock ();
+	  //This node only deals with fragmented ip4
+	  map_ip4_reass_t *r = map_ip4_reass_get (ip40->src_address.as_u32,
+						  ip40->dst_address.as_u32,
+						  ip40->fragment_id,
+						  ip40->protocol,
+						  &fragments_to_drop);
+	  if (PREDICT_FALSE (!r))
+	    {
+	      // Could not create a caching entry
+	      error0 = MAP_ERROR_FRAGMENT_MEMORY;
+	    }
+	  else if (PREDICT_TRUE (ip4_get_fragment_offset (ip40)))
+	    {
+	      // This is a fragment
+	      if (r->port >= 0)
+		{
+		  // We know the port already
+		  port0 = r->port;
+		}
+	      else if (map_ip4_reass_add_fragment (r, pi0))
+		{
+		  // Not enough space for caching
+		  error0 = MAP_ERROR_FRAGMENT_MEMORY;
+		  map_ip4_reass_free (r, &fragments_to_drop);
+		}
+	      else
+		{
+		  cached = 1;
+		}
+	    }
+	  else
+	    if ((port0 =
+		 ip4_get_port (ip40, MAP_SENDER, p0->current_length)) < 0)
+	    {
+	      // Could not find port from first fragment. Stop reassembling.
+	      error0 = MAP_ERROR_BAD_PROTOCOL;
+	      port0 = 0;
+	      map_ip4_reass_free (r, &fragments_to_drop);
+	    }
+	  else
+	    {
+	      // Found port. Remember it and loopback saved fragments
+	      r->port = port0;
+	      map_ip4_reass_get_fragments (r, &fragments_to_loopback);
+	    }
+
+#ifdef MAP_IP4_REASS_COUNT_BYTES
+	  if (!cached && r)
+	    {
+	      r->forwarded += clib_host_to_net_u16 (ip40->length) - 20;
+	      if (!ip4_get_fragment_more (ip40))
+		r->expected_total =
+		  ip4_get_fragment_offset (ip40) * 8 +
+		  clib_host_to_net_u16 (ip40->length) - 20;
+	      if (r->forwarded >= r->expected_total)
+		map_ip4_reass_free (r, &fragments_to_drop);
+	    }
+#endif
+
+	  map_ip4_reass_unlock ();
+
+	  if (PREDICT_TRUE (error0 == MAP_ERROR_NONE))
+	    error0 =
+	      ip6_map_sec_check (d0, port0, ip40,
+				 ip60) ? MAP_ERROR_NONE :
+	      MAP_ERROR_DECAP_SEC_CHECK;
+
+	  if (PREDICT_FALSE
+	      (d0->mtu && (clib_host_to_net_u16 (ip40->length) > d0->mtu)
+	       && error0 == MAP_ERROR_NONE && !cached))
+	    {
+	      vnet_buffer (p0)->ip_frag.header_offset = 0;
+	      vnet_buffer (p0)->ip_frag.flags = 0;
+	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
+	      vnet_buffer (p0)->ip_frag.mtu = d0->mtu;
+	      next0 = IP6_MAP_IP4_REASS_NEXT_IP4_FRAGMENT;
+	    }
+
+	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      map_ip6_map_ip4_reass_trace_t *tr =
+		vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->map_domain_index = map_domain_index0;
+	      tr->port = port0;
+	      tr->cached = cached;
+	    }
+
+	  if (cached)
+	    {
+	      //Dequeue the packet
+	      n_left_to_next++;
+	      to_next--;
+	    }
+	  else
+	    {
+	      if (error0 == MAP_ERROR_NONE)
+		vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
+						 cpu_index, map_domain_index0,
+						 1,
+						 clib_net_to_host_u16
+						 (ip40->length));
+	      next0 =
+		(error0 ==
+		 MAP_ERROR_NONE) ? next0 : IP6_MAP_IP4_REASS_NEXT_DROP;
+	      p0->error = error_node->errors[error0];
+	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					       n_left_to_next, pi0, next0);
+	    }
+
+	  //Loopback when we reach the end of the inpu vector
+	  if (n_left_from == 0 && vec_len (fragments_to_loopback))
+	    {
+	      from = vlib_frame_vector_args (frame);
+	      u32 len = vec_len (fragments_to_loopback);
+	      if (len <= VLIB_FRAME_SIZE)
+		{
+		  clib_memcpy (from, fragments_to_loopback,
+			       sizeof (u32) * len);
+		  n_left_from = len;
+		  vec_reset_length (fragments_to_loopback);
+		}
+	      else
+		{
+		  clib_memcpy (from,
+			       fragments_to_loopback + (len -
+							VLIB_FRAME_SIZE),
+			       sizeof (u32) * VLIB_FRAME_SIZE);
+		  n_left_from = VLIB_FRAME_SIZE;
+		  _vec_len (fragments_to_loopback) = len - VLIB_FRAME_SIZE;
+		}
+	    }
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  map_send_all_to_node (vm, fragments_to_drop, node,
+			&error_node->errors[MAP_ERROR_FRAGMENT_DROPPED],
+			IP6_MAP_IP4_REASS_NEXT_DROP);
+
+  vec_free (fragments_to_drop);
+  vec_free (fragments_to_loopback);
+  return frame->n_vectors;
+}
+
+/*
+ * ip6_icmp_relay
+ */
+static uword
+ip6_map_icmp_relay (vlib_main_t * vm,
+		    vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip6_map_icmp_relay_node.index);
+  map_main_t *mm = &map_main;
+  u32 cpu_index = os_get_cpu_number ();
+  u16 *fragment_ids, *fid;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  /* Get random fragment IDs for replies. */
+  fid = fragment_ids =
+    clib_random_buffer_get_data (&vm->random_buffer,
+				 n_left_from * sizeof (fragment_ids[0]));
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /* Single loop */
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  u8 error0 = MAP_ERROR_NONE;
+	  ip6_header_t *ip60;
+	  u32 next0 = IP6_ICMP_RELAY_NEXT_IP4_LOOKUP;
+	  u32 mtu;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip60 = vlib_buffer_get_current (p0);
+	  u16 tlen = clib_net_to_host_u16 (ip60->payload_length);
+
+	  /*
+	   * In:
+	   *  IPv6 header           (40)
+	   *  ICMPv6 header          (8)
+	   *  IPv6 header           (40)
+	   *  Original IPv4 header / packet
+	   * Out:
+	   *  New IPv4 header
+	   *  New ICMP header
+	   *  Original IPv4 header / packet
+	   */
+
+	  /* Need at least ICMP(8) + IPv6(40) + IPv4(20) + L4 header(8) */
+	  if (tlen < 76)
+	    {
+	      error0 = MAP_ERROR_ICMP_RELAY;
+	      goto error;
+	    }
+
+	  icmp46_header_t *icmp60 = (icmp46_header_t *) (ip60 + 1);
+	  ip6_header_t *inner_ip60 = (ip6_header_t *) (icmp60 + 2);
+
+	  if (inner_ip60->protocol != IP_PROTOCOL_IP_IN_IP)
+	    {
+	      error0 = MAP_ERROR_ICMP_RELAY;
+	      goto error;
+	    }
+
+	  ip4_header_t *inner_ip40 = (ip4_header_t *) (inner_ip60 + 1);
+	  vlib_buffer_advance (p0, 60);	/* sizeof ( IPv6 + ICMP + IPv6 - IPv4 - ICMP ) */
+	  ip4_header_t *new_ip40 = vlib_buffer_get_current (p0);
+	  icmp46_header_t *new_icmp40 = (icmp46_header_t *) (new_ip40 + 1);
+
+	  /*
+	   * Relay according to RFC2473, section 8.3
+	   */
+	  switch (icmp60->type)
+	    {
+	    case ICMP6_destination_unreachable:
+	    case ICMP6_time_exceeded:
+	    case ICMP6_parameter_problem:
+	      /* Type 3 - destination unreachable, Code 1 - host unreachable */
+	      new_icmp40->type = ICMP4_destination_unreachable;
+	      new_icmp40->code =
+		ICMP4_destination_unreachable_destination_unreachable_host;
+	      break;
+
+	    case ICMP6_packet_too_big:
+	      /* Type 3 - destination unreachable, Code 4 - packet too big */
+	      /* Potential TODO: Adjust domain tunnel MTU based on the value received here */
+	      mtu = clib_net_to_host_u32 (*((u32 *) (icmp60 + 1)));
+
+	      /* Check DF flag */
+	      if (!
+		  (inner_ip40->flags_and_fragment_offset &
+		   clib_host_to_net_u16 (IP4_HEADER_FLAG_DONT_FRAGMENT)))
+		{
+		  error0 = MAP_ERROR_ICMP_RELAY;
+		  goto error;
+		}
+
+	      new_icmp40->type = ICMP4_destination_unreachable;
+	      new_icmp40->code =
+		ICMP4_destination_unreachable_fragmentation_needed_and_dont_fragment_set;
+	      *((u32 *) (new_icmp40 + 1)) =
+		clib_host_to_net_u32 (mtu < 1280 ? 1280 : mtu);
+	      break;
+
+	    default:
+	      error0 = MAP_ERROR_ICMP_RELAY;
+	      break;
+	    }
+
+	  /*
+	   * Ensure the total ICMP packet is no longer than 576 bytes (RFC1812)
+	   */
+	  new_ip40->ip_version_and_header_length = 0x45;
+	  new_ip40->tos = 0;
+	  u16 nlen = (tlen - 20) > 576 ? 576 : tlen - 20;
+	  new_ip40->length = clib_host_to_net_u16 (nlen);
+	  new_ip40->fragment_id = fid[0];
+	  fid++;
+	  new_ip40->ttl = 64;
+	  new_ip40->protocol = IP_PROTOCOL_ICMP;
+	  new_ip40->src_address = mm->icmp4_src_address;
+	  new_ip40->dst_address = inner_ip40->src_address;
+	  new_ip40->checksum = ip4_header_checksum (new_ip40);
+
+	  new_icmp40->checksum = 0;
+	  ip_csum_t sum = ip_incremental_checksum (0, new_icmp40, nlen - 20);
+	  new_icmp40->checksum = ~ip_csum_fold (sum);
+
+	  vlib_increment_simple_counter (&mm->icmp_relayed, cpu_index, 0, 1);
+
+	error:
+	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      map_trace_t *tr = vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->map_domain_index = 0;
+	      tr->port = 0;
+	    }
+
+	  next0 =
+	    (error0 == MAP_ERROR_NONE) ? next0 : IP6_ICMP_RELAY_NEXT_DROP;
+	  p0->error = error_node->errors[error0];
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, pi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+
+}
+
+static char *map_error_strings[] = {
+#define _(sym,string) string,
+  foreach_map_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(ip6_map_node) = {
+  .function = ip6_map,
+  .name = "ip6-map",
+  .vector_size = sizeof(u32),
+  .format_trace = format_map_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = MAP_N_ERROR,
+  .error_strings = map_error_strings,
+
+  .n_next_nodes = IP6_MAP_N_NEXT,
+  .next_nodes = {
+    [IP6_MAP_NEXT_IP4_LOOKUP] = "ip4-lookup",
+#ifdef MAP_SKIP_IP6_LOOKUP
+    [IP6_MAP_NEXT_IP4_REWRITE] = "ip4-rewrite",
+#endif
+    [IP6_MAP_NEXT_IP6_REASS] = "ip6-map-ip6-reass",
+    [IP6_MAP_NEXT_IP4_REASS] = "ip6-map-ip4-reass",
+    [IP6_MAP_NEXT_IP4_FRAGMENT] = "ip4-frag",
+    [IP6_MAP_NEXT_IP6_ICMP_RELAY] = "ip6-map-icmp-relay",
+    [IP6_MAP_NEXT_IP6_LOCAL] = "ip6-local",
+    [IP6_MAP_NEXT_DROP] = "error-drop",
+    [IP6_MAP_NEXT_ICMP] = "ip6-icmp-error",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(ip6_map_ip6_reass_node) = {
+  .function = ip6_map_ip6_reass,
+  .name = "ip6-map-ip6-reass",
+  .vector_size = sizeof(u32),
+  .format_trace = format_ip6_map_ip6_reass_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = MAP_N_ERROR,
+  .error_strings = map_error_strings,
+  .n_next_nodes = IP6_MAP_IP6_REASS_N_NEXT,
+  .next_nodes = {
+    [IP6_MAP_IP6_REASS_NEXT_IP6_MAP] = "ip6-map",
+    [IP6_MAP_IP6_REASS_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(ip6_map_ip4_reass_node) = {
+  .function = ip6_map_ip4_reass,
+  .name = "ip6-map-ip4-reass",
+  .vector_size = sizeof(u32),
+  .format_trace = format_ip6_map_ip4_reass_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = MAP_N_ERROR,
+  .error_strings = map_error_strings,
+  .n_next_nodes = IP6_MAP_IP4_REASS_N_NEXT,
+  .next_nodes = {
+    [IP6_MAP_IP4_REASS_NEXT_IP4_LOOKUP] = "ip4-lookup",
+    [IP6_MAP_IP4_REASS_NEXT_IP4_FRAGMENT] = "ip4-frag",
+    [IP6_MAP_IP4_REASS_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(ip6_map_icmp_relay_node, static) = {
+  .function = ip6_map_icmp_relay,
+  .name = "ip6-map-icmp-relay",
+  .vector_size = sizeof(u32),
+  .format_trace = format_map_trace, //FIXME
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = MAP_N_ERROR,
+  .error_strings = map_error_strings,
+  .n_next_nodes = IP6_ICMP_RELAY_N_NEXT,
+  .next_nodes = {
+    [IP6_ICMP_RELAY_NEXT_IP4_LOOKUP] = "ip4-lookup",
+    [IP6_ICMP_RELAY_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/map/ip6_map_t.c b/src/vnet/map/ip6_map_t.c
new file mode 100644
index 00000000..eb3996c2
--- /dev/null
+++ b/src/vnet/map/ip6_map_t.c
@@ -0,0 +1,1517 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "map.h"
+
+#include "../ip/ip_frag.h"
+
+#define IP6_MAP_T_DUAL_LOOP
+
+typedef enum
+{
+  IP6_MAPT_NEXT_MAPT_TCP_UDP,
+  IP6_MAPT_NEXT_MAPT_ICMP,
+  IP6_MAPT_NEXT_MAPT_FRAGMENTED,
+  IP6_MAPT_NEXT_DROP,
+  IP6_MAPT_N_NEXT
+} ip6_mapt_next_t;
+
+typedef enum
+{
+  IP6_MAPT_ICMP_NEXT_IP4_LOOKUP,
+  IP6_MAPT_ICMP_NEXT_IP4_FRAG,
+  IP6_MAPT_ICMP_NEXT_DROP,
+  IP6_MAPT_ICMP_N_NEXT
+} ip6_mapt_icmp_next_t;
+
+typedef enum
+{
+  IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP,
+  IP6_MAPT_TCP_UDP_NEXT_IP4_FRAG,
+  IP6_MAPT_TCP_UDP_NEXT_DROP,
+  IP6_MAPT_TCP_UDP_N_NEXT
+} ip6_mapt_tcp_udp_next_t;
+
+typedef enum
+{
+  IP6_MAPT_FRAGMENTED_NEXT_IP4_LOOKUP,
+  IP6_MAPT_FRAGMENTED_NEXT_IP4_FRAG,
+  IP6_MAPT_FRAGMENTED_NEXT_DROP,
+  IP6_MAPT_FRAGMENTED_N_NEXT
+} ip6_mapt_fragmented_next_t;
+
+static_always_inline int
+ip6_map_fragment_cache (ip6_header_t * ip6, ip6_frag_hdr_t * frag,
+			map_domain_t * d, u16 port)
+{
+  u32 *ignore = NULL;
+  map_ip4_reass_lock ();
+  map_ip4_reass_t *r = map_ip4_reass_get (map_get_ip4 (&ip6->src_address),
+					  ip6_map_t_embedded_address (d,
+								      &ip6->
+								      dst_address),
+					  frag_id_6to4 (frag->identification),
+					  (ip6->protocol ==
+					   IP_PROTOCOL_ICMP6) ?
+					  IP_PROTOCOL_ICMP : ip6->protocol,
+					  &ignore);
+  if (r)
+    r->port = port;
+
+  map_ip4_reass_unlock ();
+  return !r;
+}
+
+/* Returns the associated port or -1 */
+static_always_inline i32
+ip6_map_fragment_get (ip6_header_t * ip6, ip6_frag_hdr_t * frag,
+		      map_domain_t * d)
+{
+  u32 *ignore = NULL;
+  map_ip4_reass_lock ();
+  map_ip4_reass_t *r = map_ip4_reass_get (map_get_ip4 (&ip6->src_address),
+					  ip6_map_t_embedded_address (d,
+								      &ip6->
+								      dst_address),
+					  frag_id_6to4 (frag->identification),
+					  (ip6->protocol ==
+					   IP_PROTOCOL_ICMP6) ?
+					  IP_PROTOCOL_ICMP : ip6->protocol,
+					  &ignore);
+  i32 ret = r ? r->port : -1;
+  map_ip4_reass_unlock ();
+  return ret;
+}
+
+static_always_inline u8
+ip6_translate_tos (const ip6_header_t * ip6)
+{
+#ifdef IP6_MAP_T_OVERRIDE_TOS
+  return IP6_MAP_T_OVERRIDE_TOS;
+#else
+  return (clib_net_to_host_u32 (ip6->ip_version_traffic_class_and_flow_label)
+	  & 0x0ff00000) >> 20;
+#endif
+}
+
+//TODO: Find right place in memory for that
+/* *INDENT-OFF* */
+static u8 icmp6_to_icmp_updater_pointer_table[] =
+  { 0, 1, ~0, ~0,
+    2, 2, 9, 8,
+    12, 12, 12, 12,
+    12, 12, 12, 12,
+    12, 12, 12, 12,
+    12, 12, 12, 12,
+    24, 24, 24, 24,
+    24, 24, 24, 24,
+    24, 24, 24, 24,
+    24, 24, 24, 24
+  };
+/* *INDENT-ON* */
+
+static_always_inline int
+ip6_icmp_to_icmp6_in_place (icmp46_header_t * icmp, u32 icmp_len,
+			    i32 * sender_port, ip6_header_t ** inner_ip6)
+{
+  *inner_ip6 = NULL;
+  switch (icmp->type)
+    {
+    case ICMP6_echo_request:
+      *sender_port = ((u16 *) icmp)[2];
+      icmp->type = ICMP4_echo_request;
+      break;
+    case ICMP6_echo_reply:
+      *sender_port = ((u16 *) icmp)[2];
+      icmp->type = ICMP4_echo_reply;
+      break;
+    case ICMP6_destination_unreachable:
+      *inner_ip6 = (ip6_header_t *) u8_ptr_add (icmp, 8);
+      *sender_port = ip6_get_port (*inner_ip6, MAP_RECEIVER, icmp_len);
+
+      switch (icmp->code)
+	{
+	case ICMP6_destination_unreachable_no_route_to_destination:	//0
+	case ICMP6_destination_unreachable_beyond_scope_of_source_address:	//2
+	case ICMP6_destination_unreachable_address_unreachable:	//3
+	  icmp->type = ICMP4_destination_unreachable;
+	  icmp->code =
+	    ICMP4_destination_unreachable_destination_unreachable_host;
+	  break;
+	case ICMP6_destination_unreachable_destination_administratively_prohibited:	//1
+	  icmp->type =
+	    ICMP4_destination_unreachable;
+	  icmp->code =
+	    ICMP4_destination_unreachable_communication_administratively_prohibited;
+	  break;
+	case ICMP6_destination_unreachable_port_unreachable:
+	  icmp->type = ICMP4_destination_unreachable;
+	  icmp->code = ICMP4_destination_unreachable_port_unreachable;
+	  break;
+	default:
+	  return -1;
+	}
+      break;
+    case ICMP6_packet_too_big:
+      *inner_ip6 = (ip6_header_t *) u8_ptr_add (icmp, 8);
+      *sender_port = ip6_get_port (*inner_ip6, MAP_RECEIVER, icmp_len);
+
+      icmp->type = ICMP4_destination_unreachable;
+      icmp->code = 4;
+      {
+	u32 advertised_mtu = clib_net_to_host_u32 (*((u32 *) (icmp + 1)));
+	advertised_mtu -= 20;
+	//FIXME: = minimum(advertised MTU-20, MTU_of_IPv4_nexthop, (MTU_of_IPv6_nexthop)-20)
+	((u16 *) (icmp))[3] = clib_host_to_net_u16 (advertised_mtu);
+      }
+      break;
+
+    case ICMP6_time_exceeded:
+      *inner_ip6 = (ip6_header_t *) u8_ptr_add (icmp, 8);
+      *sender_port = ip6_get_port (*inner_ip6, MAP_RECEIVER, icmp_len);
+
+      icmp->type = ICMP4_time_exceeded;
+      break;
+
+    case ICMP6_parameter_problem:
+      *inner_ip6 = (ip6_header_t *) u8_ptr_add (icmp, 8);
+      *sender_port = ip6_get_port (*inner_ip6, MAP_RECEIVER, icmp_len);
+
+      switch (icmp->code)
+	{
+	case ICMP6_parameter_problem_erroneous_header_field:
+	  icmp->type = ICMP4_parameter_problem;
+	  icmp->code = ICMP4_parameter_problem_pointer_indicates_error;
+	  u32 pointer = clib_net_to_host_u32 (*((u32 *) (icmp + 1)));
+	  if (pointer >= 40)
+	    return -1;
+
+	  ((u8 *) (icmp + 1))[0] =
+	    icmp6_to_icmp_updater_pointer_table[pointer];
+	  break;
+	case ICMP6_parameter_problem_unrecognized_next_header:
+	  icmp->type = ICMP4_destination_unreachable;
+	  icmp->code = ICMP4_destination_unreachable_port_unreachable;
+	  break;
+	case ICMP6_parameter_problem_unrecognized_option:
+	default:
+	  return -1;
+	}
+      break;
+    default:
+      return -1;
+      break;
+    }
+  return 0;
+}
+
+static_always_inline void
+_ip6_map_t_icmp (map_domain_t * d, vlib_buffer_t * p, u8 * error)
+{
+  ip6_header_t *ip6, *inner_ip6;
+  ip4_header_t *ip4, *inner_ip4;
+  u32 ip6_pay_len;
+  icmp46_header_t *icmp;
+  i32 sender_port;
+  ip_csum_t csum;
+  u32 ip4_sadr, inner_ip4_dadr;
+
+  ip6 = vlib_buffer_get_current (p);
+  ip6_pay_len = clib_net_to_host_u16 (ip6->payload_length);
+  icmp = (icmp46_header_t *) (ip6 + 1);
+  ASSERT (ip6_pay_len + sizeof (*ip6) <= p->current_length);
+
+  if (ip6->protocol != IP_PROTOCOL_ICMP6)
+    {
+      //No extensions headers allowed here
+      //TODO: SR header
+      *error = MAP_ERROR_MALFORMED;
+      return;
+    }
+
+  //There are no fragmented ICMP messages, so no extension header for now
+
+  if (ip6_icmp_to_icmp6_in_place
+      (icmp, ip6_pay_len, &sender_port, &inner_ip6))
+    {
+      //TODO: In case of 1:1 mapping it is not necessary to have the sender port
+      *error = MAP_ERROR_ICMP;
+      return;
+    }
+
+  if (sender_port < 0)
+    {
+      // In case of 1:1 mapping, we don't care about the port
+      if (d->ea_bits_len == 0 && d->rules)
+	{
+	  sender_port = 0;
+	}
+      else
+	{
+	  *error = MAP_ERROR_ICMP;
+	  return;
+	}
+    }
+
+  //Security check
+  //Note that this prevents an intermediate IPv6 router from answering the request
+  ip4_sadr = map_get_ip4 (&ip6->src_address);
+  if (ip6->src_address.as_u64[0] != map_get_pfx_net (d, ip4_sadr, sender_port)
+      || ip6->src_address.as_u64[1] != map_get_sfx_net (d, ip4_sadr,
+							sender_port))
+    {
+      *error = MAP_ERROR_SEC_CHECK;
+      return;
+    }
+
+  if (inner_ip6)
+    {
+      u16 *inner_L4_checksum, inner_l4_offset, inner_frag_offset,
+	inner_frag_id;
+      u8 *inner_l4, inner_protocol;
+
+      //We have two headers to translate
+      //   FROM
+      //   [   IPv6   ]<- ext ->[IC][   IPv6   ]<- ext ->[L4 header ...
+      // Handled cases:
+      //                     [   IPv6   ][IC][   IPv6   ][L4 header ...
+      //                 [   IPv6   ][IC][   IPv6   ][Fr][L4 header ...
+      //    TO
+      //                               [ IPv4][IC][ IPv4][L4 header ...
+
+      //TODO: This was already done deep in ip6_icmp_to_icmp6_in_place
+      //We shouldn't have to do it again
+      if (ip6_parse (inner_ip6, ip6_pay_len - 8,
+		     &inner_protocol, &inner_l4_offset, &inner_frag_offset))
+	{
+	  *error = MAP_ERROR_MALFORMED;
+	  return;
+	}
+
+      inner_l4 = u8_ptr_add (inner_ip6, inner_l4_offset);
+      inner_ip4 =
+	(ip4_header_t *) u8_ptr_add (inner_l4, -sizeof (*inner_ip4));
+      if (inner_frag_offset)
+	{
+	  ip6_frag_hdr_t *inner_frag =
+	    (ip6_frag_hdr_t *) u8_ptr_add (inner_ip6, inner_frag_offset);
+	  inner_frag_id = frag_id_6to4 (inner_frag->identification);
+	}
+      else
+	{
+	  inner_frag_id = 0;
+	}
+
+      //Do the translation of the inner packet
+      if (inner_protocol == IP_PROTOCOL_TCP)
+	{
+	  inner_L4_checksum = (u16 *) u8_ptr_add (inner_l4, 16);
+	}
+      else if (inner_protocol == IP_PROTOCOL_UDP)
+	{
+	  inner_L4_checksum = (u16 *) u8_ptr_add (inner_l4, 6);
+	}
+      else if (inner_protocol == IP_PROTOCOL_ICMP6)
+	{
+	  icmp46_header_t *inner_icmp = (icmp46_header_t *) inner_l4;
+	  csum = inner_icmp->checksum;
+	  csum = ip_csum_sub_even (csum, *((u16 *) inner_icmp));
+	  //It cannot be of a different type as ip6_icmp_to_icmp6_in_place succeeded
+	  inner_icmp->type = (inner_icmp->type == ICMP6_echo_request) ?
+	    ICMP4_echo_request : ICMP4_echo_reply;
+	  csum = ip_csum_add_even (csum, *((u16 *) inner_icmp));
+	  inner_icmp->checksum = ip_csum_fold (csum);
+	  inner_protocol = IP_PROTOCOL_ICMP;	//Will be copied to ip6 later
+	  inner_L4_checksum = &inner_icmp->checksum;
+	}
+      else
+	{
+	  *error = MAP_ERROR_BAD_PROTOCOL;
+	  return;
+	}
+
+      csum = *inner_L4_checksum;
+      csum = ip_csum_sub_even (csum, inner_ip6->src_address.as_u64[0]);
+      csum = ip_csum_sub_even (csum, inner_ip6->src_address.as_u64[1]);
+      csum = ip_csum_sub_even (csum, inner_ip6->dst_address.as_u64[0]);
+      csum = ip_csum_sub_even (csum, inner_ip6->dst_address.as_u64[1]);
+
+      //Sanity check of the outer destination address
+      if (ip6->dst_address.as_u64[0] != inner_ip6->src_address.as_u64[0] &&
+	  ip6->dst_address.as_u64[1] != inner_ip6->src_address.as_u64[1])
+	{
+	  *error = MAP_ERROR_SEC_CHECK;
+	  return;
+	}
+
+      //Security check of inner packet
+      inner_ip4_dadr = map_get_ip4 (&inner_ip6->dst_address);
+      if (inner_ip6->dst_address.as_u64[0] !=
+	  map_get_pfx_net (d, inner_ip4_dadr, sender_port)
+	  || inner_ip6->dst_address.as_u64[1] != map_get_sfx_net (d,
+								  inner_ip4_dadr,
+								  sender_port))
+	{
+	  *error = MAP_ERROR_SEC_CHECK;
+	  return;
+	}
+
+      inner_ip4->dst_address.as_u32 = inner_ip4_dadr;
+      inner_ip4->src_address.as_u32 =
+	ip6_map_t_embedded_address (d, &inner_ip6->src_address);
+      inner_ip4->ip_version_and_header_length =
+	IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
+      inner_ip4->tos = ip6_translate_tos (inner_ip6);
+      inner_ip4->length =
+	u16_net_add (inner_ip6->payload_length,
+		     sizeof (*ip4) + sizeof (*ip6) - inner_l4_offset);
+      inner_ip4->fragment_id = inner_frag_id;
+      inner_ip4->flags_and_fragment_offset =
+	clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS);
+      inner_ip4->ttl = inner_ip6->hop_limit;
+      inner_ip4->protocol = inner_protocol;
+      inner_ip4->checksum = ip4_header_checksum (inner_ip4);
+
+      if (inner_ip4->protocol == IP_PROTOCOL_ICMP)
+	{
+	  //Remove remainings of the pseudo-header in the csum
+	  csum =
+	    ip_csum_sub_even (csum, clib_host_to_net_u16 (IP_PROTOCOL_ICMP6));
+	  csum =
+	    ip_csum_sub_even (csum, inner_ip4->length - sizeof (*inner_ip4));
+	}
+      else
+	{
+	  //Update to new pseudo-header
+	  csum = ip_csum_add_even (csum, inner_ip4->src_address.as_u32);
+	  csum = ip_csum_add_even (csum, inner_ip4->dst_address.as_u32);
+	}
+      *inner_L4_checksum = ip_csum_fold (csum);
+
+      //Move up icmp header
+      ip4 = (ip4_header_t *) u8_ptr_add (inner_l4, -2 * sizeof (*ip4) - 8);
+      clib_memcpy (u8_ptr_add (inner_l4, -sizeof (*ip4) - 8), icmp, 8);
+      icmp = (icmp46_header_t *) u8_ptr_add (inner_l4, -sizeof (*ip4) - 8);
+    }
+  else
+    {
+      //Only one header to translate
+      ip4 = (ip4_header_t *) u8_ptr_add (ip6, sizeof (*ip6) - sizeof (*ip4));
+    }
+  vlib_buffer_advance (p, (u32) (((u8 *) ip4) - ((u8 *) ip6)));
+
+  ip4->dst_address.as_u32 = ip6_map_t_embedded_address (d, &ip6->dst_address);
+  ip4->src_address.as_u32 = ip4_sadr;
+  ip4->ip_version_and_header_length =
+    IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
+  ip4->tos = ip6_translate_tos (ip6);
+  ip4->fragment_id = 0;
+  ip4->flags_and_fragment_offset = 0;
+  ip4->ttl = ip6->hop_limit;
+  ip4->protocol = IP_PROTOCOL_ICMP;
+  //TODO fix the length depending on offset length
+  ip4->length = u16_net_add (ip6->payload_length,
+			     (inner_ip6 ==
+			      NULL) ? sizeof (*ip4) : (2 * sizeof (*ip4) -
+						       sizeof (*ip6)));
+  ip4->checksum = ip4_header_checksum (ip4);
+
+  //TODO: We could do an easy diff-checksum for echo requests/replies
+  //Recompute ICMP checksum
+  icmp->checksum = 0;
+  csum =
+    ip_incremental_checksum (0, icmp,
+			     clib_net_to_host_u16 (ip4->length) -
+			     sizeof (*ip4));
+  icmp->checksum = ~ip_csum_fold (csum);
+}
+
+static uword
+ip6_map_t_icmp (vlib_main_t * vm,
+		vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip6_map_t_icmp_node.index);
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  vlib_combined_counter_main_t *cm = map_main.domain_counters;
+  u32 cpu_index = os_get_cpu_number ();
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  u8 error0;
+	  ip6_mapt_icmp_next_t next0;
+	  map_domain_t *d0;
+	  u16 len0;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  error0 = MAP_ERROR_NONE;
+	  next0 = IP6_MAPT_ICMP_NEXT_IP4_LOOKUP;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  len0 =
+	    clib_net_to_host_u16 (((ip6_header_t *)
+				   vlib_buffer_get_current
+				   (p0))->payload_length);
+	  d0 =
+	    pool_elt_at_index (map_main.domains,
+			       vnet_buffer (p0)->map_t.map_domain_index);
+	  _ip6_map_t_icmp (d0, p0, &error0);
+
+	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
+	    {
+	      //Send to fragmentation node if necessary
+	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
+	      vnet_buffer (p0)->ip_frag.header_offset = 0;
+	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
+	      next0 = IP6_MAPT_ICMP_NEXT_IP4_FRAG;
+	    }
+
+	  if (PREDICT_TRUE (error0 == MAP_ERROR_NONE))
+	    {
+	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
+					       cpu_index,
+					       vnet_buffer (p0)->
+					       map_t.map_domain_index, 1,
+					       len0);
+	    }
+	  else
+	    {
+	      next0 = IP6_MAPT_ICMP_NEXT_DROP;
+	    }
+
+	  p0->error = error_node->errors[error0];
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next, pi0,
+					   next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return frame->n_vectors;
+}
+
+static uword
+ip6_map_t_fragmented (vlib_main_t * vm,
+		      vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+#ifdef IP6_MAP_T_DUAL_LOOP
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 pi0, pi1;
+	  vlib_buffer_t *p0, *p1;
+	  ip6_header_t *ip60, *ip61;
+	  ip6_frag_hdr_t *frag0, *frag1;
+	  ip4_header_t *ip40, *ip41;
+	  u16 frag_id0, frag_offset0, frag_id1, frag_offset1;
+	  u8 frag_more0, frag_more1;
+	  u32 next0, next1;
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  next0 = IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP;
+	  next1 = IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP;
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+	  ip60 = vlib_buffer_get_current (p0);
+	  ip61 = vlib_buffer_get_current (p1);
+	  frag0 =
+	    (ip6_frag_hdr_t *) u8_ptr_add (ip60,
+					   vnet_buffer (p0)->map_t.
+					   v6.frag_offset);
+	  frag1 =
+	    (ip6_frag_hdr_t *) u8_ptr_add (ip61,
+					   vnet_buffer (p1)->map_t.
+					   v6.frag_offset);
+	  ip40 =
+	    (ip4_header_t *) u8_ptr_add (ip60,
+					 vnet_buffer (p0)->map_t.
+					 v6.l4_offset - sizeof (*ip40));
+	  ip41 =
+	    (ip4_header_t *) u8_ptr_add (ip61,
+					 vnet_buffer (p1)->map_t.
+					 v6.l4_offset - sizeof (*ip40));
+	  vlib_buffer_advance (p0,
+			       vnet_buffer (p0)->map_t.v6.l4_offset -
+			       sizeof (*ip40));
+	  vlib_buffer_advance (p1,
+			       vnet_buffer (p1)->map_t.v6.l4_offset -
+			       sizeof (*ip40));
+
+	  frag_id0 = frag_id_6to4 (frag0->identification);
+	  frag_id1 = frag_id_6to4 (frag1->identification);
+	  frag_more0 = ip6_frag_hdr_more (frag0);
+	  frag_more1 = ip6_frag_hdr_more (frag1);
+	  frag_offset0 = ip6_frag_hdr_offset (frag0);
+	  frag_offset1 = ip6_frag_hdr_offset (frag1);
+
+	  ip40->dst_address.as_u32 = vnet_buffer (p0)->map_t.v6.daddr;
+	  ip41->dst_address.as_u32 = vnet_buffer (p1)->map_t.v6.daddr;
+	  ip40->src_address.as_u32 = vnet_buffer (p0)->map_t.v6.saddr;
+	  ip41->src_address.as_u32 = vnet_buffer (p1)->map_t.v6.saddr;
+	  ip40->ip_version_and_header_length =
+	    IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
+	  ip41->ip_version_and_header_length =
+	    IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
+	  ip40->tos = ip6_translate_tos (ip60);
+	  ip41->tos = ip6_translate_tos (ip61);
+	  ip40->length = u16_net_add (ip60->payload_length,
+				      sizeof (*ip40) -
+				      vnet_buffer (p0)->map_t.v6.l4_offset +
+				      sizeof (*ip60));
+	  ip41->length =
+	    u16_net_add (ip61->payload_length,
+			 sizeof (*ip40) -
+			 vnet_buffer (p1)->map_t.v6.l4_offset +
+			 sizeof (*ip60));
+	  ip40->fragment_id = frag_id0;
+	  ip41->fragment_id = frag_id1;
+	  ip40->flags_and_fragment_offset =
+	    clib_host_to_net_u16 (frag_offset0 |
+				  (frag_more0 ? IP4_HEADER_FLAG_MORE_FRAGMENTS
+				   : 0));
+	  ip41->flags_and_fragment_offset =
+	    clib_host_to_net_u16 (frag_offset1 |
+				  (frag_more1 ? IP4_HEADER_FLAG_MORE_FRAGMENTS
+				   : 0));
+	  ip40->ttl = ip60->hop_limit;
+	  ip41->ttl = ip61->hop_limit;
+	  ip40->protocol =
+	    (vnet_buffer (p0)->map_t.v6.l4_protocol ==
+	     IP_PROTOCOL_ICMP6) ? IP_PROTOCOL_ICMP : vnet_buffer (p0)->
+	    map_t.v6.l4_protocol;
+	  ip41->protocol =
+	    (vnet_buffer (p1)->map_t.v6.l4_protocol ==
+	     IP_PROTOCOL_ICMP6) ? IP_PROTOCOL_ICMP : vnet_buffer (p1)->
+	    map_t.v6.l4_protocol;
+	  ip40->checksum = ip4_header_checksum (ip40);
+	  ip41->checksum = ip4_header_checksum (ip41);
+
+	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
+	    {
+	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
+	      vnet_buffer (p0)->ip_frag.header_offset = 0;
+	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
+	      next0 = IP6_MAPT_FRAGMENTED_NEXT_IP4_FRAG;
+	    }
+
+	  if (vnet_buffer (p1)->map_t.mtu < p1->current_length)
+	    {
+	      vnet_buffer (p1)->ip_frag.mtu = vnet_buffer (p1)->map_t.mtu;
+	      vnet_buffer (p1)->ip_frag.header_offset = 0;
+	      vnet_buffer (p1)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
+	      next1 = IP6_MAPT_FRAGMENTED_NEXT_IP4_FRAG;
+	    }
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next, pi0, pi1,
+					   next0, next1);
+	}
+#endif
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  ip6_header_t *ip60;
+	  ip6_frag_hdr_t *frag0;
+	  ip4_header_t *ip40;
+	  u16 frag_id0;
+	  u8 frag_more0;
+	  u16 frag_offset0;
+	  u32 next0;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  next0 = IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP;
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip60 = vlib_buffer_get_current (p0);
+	  frag0 =
+	    (ip6_frag_hdr_t *) u8_ptr_add (ip60,
+					   vnet_buffer (p0)->map_t.
+					   v6.frag_offset);
+	  ip40 =
+	    (ip4_header_t *) u8_ptr_add (ip60,
+					 vnet_buffer (p0)->map_t.
+					 v6.l4_offset - sizeof (*ip40));
+	  vlib_buffer_advance (p0,
+			       vnet_buffer (p0)->map_t.v6.l4_offset -
+			       sizeof (*ip40));
+
+	  frag_id0 = frag_id_6to4 (frag0->identification);
+	  frag_more0 = ip6_frag_hdr_more (frag0);
+	  frag_offset0 = ip6_frag_hdr_offset (frag0);
+
+	  ip40->dst_address.as_u32 = vnet_buffer (p0)->map_t.v6.daddr;
+	  ip40->src_address.as_u32 = vnet_buffer (p0)->map_t.v6.saddr;
+	  ip40->ip_version_and_header_length =
+	    IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
+	  ip40->tos = ip6_translate_tos (ip60);
+	  ip40->length = u16_net_add (ip60->payload_length,
+				      sizeof (*ip40) -
+				      vnet_buffer (p0)->map_t.v6.l4_offset +
+				      sizeof (*ip60));
+	  ip40->fragment_id = frag_id0;
+	  ip40->flags_and_fragment_offset =
+	    clib_host_to_net_u16 (frag_offset0 |
+				  (frag_more0 ? IP4_HEADER_FLAG_MORE_FRAGMENTS
+				   : 0));
+	  ip40->ttl = ip60->hop_limit;
+	  ip40->protocol =
+	    (vnet_buffer (p0)->map_t.v6.l4_protocol ==
+	     IP_PROTOCOL_ICMP6) ? IP_PROTOCOL_ICMP : vnet_buffer (p0)->
+	    map_t.v6.l4_protocol;
+	  ip40->checksum = ip4_header_checksum (ip40);
+
+	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
+	    {
+	      //Send to fragmentation node if necessary
+	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
+	      vnet_buffer (p0)->ip_frag.header_offset = 0;
+	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
+	      next0 = IP6_MAPT_FRAGMENTED_NEXT_IP4_FRAG;
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next, pi0,
+					   next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return frame->n_vectors;
+}
+
+static uword
+ip6_map_t_tcp_udp (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+#ifdef IP6_MAP_T_DUAL_LOOP
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 pi0, pi1;
+	  vlib_buffer_t *p0, *p1;
+	  ip6_header_t *ip60, *ip61;
+	  ip_csum_t csum0, csum1;
+	  ip4_header_t *ip40, *ip41;
+	  u16 fragment_id0, flags0, *checksum0,
+	    fragment_id1, flags1, *checksum1;
+	  ip6_mapt_tcp_udp_next_t next0, next1;
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  next0 = IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP;
+	  next1 = IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+	  ip60 = vlib_buffer_get_current (p0);
+	  ip61 = vlib_buffer_get_current (p1);
+	  ip40 =
+	    (ip4_header_t *) u8_ptr_add (ip60,
+					 vnet_buffer (p0)->map_t.
+					 v6.l4_offset - sizeof (*ip40));
+	  ip41 =
+	    (ip4_header_t *) u8_ptr_add (ip61,
+					 vnet_buffer (p1)->map_t.
+					 v6.l4_offset - sizeof (*ip40));
+	  vlib_buffer_advance (p0,
+			       vnet_buffer (p0)->map_t.v6.l4_offset -
+			       sizeof (*ip40));
+	  vlib_buffer_advance (p1,
+			       vnet_buffer (p1)->map_t.v6.l4_offset -
+			       sizeof (*ip40));
+	  checksum0 =
+	    (u16 *) u8_ptr_add (ip60,
+				vnet_buffer (p0)->map_t.checksum_offset);
+	  checksum1 =
+	    (u16 *) u8_ptr_add (ip61,
+				vnet_buffer (p1)->map_t.checksum_offset);
+
+	  csum0 = ip_csum_sub_even (*checksum0, ip60->src_address.as_u64[0]);
+	  csum1 = ip_csum_sub_even (*checksum1, ip61->src_address.as_u64[0]);
+	  csum0 = ip_csum_sub_even (csum0, ip60->src_address.as_u64[1]);
+	  csum1 = ip_csum_sub_even (csum1, ip61->src_address.as_u64[1]);
+	  csum0 = ip_csum_sub_even (csum0, ip60->dst_address.as_u64[0]);
+	  csum1 = ip_csum_sub_even (csum0, ip61->dst_address.as_u64[0]);
+	  csum0 = ip_csum_sub_even (csum0, ip60->dst_address.as_u64[1]);
+	  csum1 = ip_csum_sub_even (csum1, ip61->dst_address.as_u64[1]);
+	  csum0 = ip_csum_add_even (csum0, vnet_buffer (p0)->map_t.v6.daddr);
+	  csum1 = ip_csum_add_even (csum1, vnet_buffer (p1)->map_t.v6.daddr);
+	  csum0 = ip_csum_add_even (csum0, vnet_buffer (p0)->map_t.v6.saddr);
+	  csum1 = ip_csum_add_even (csum1, vnet_buffer (p1)->map_t.v6.saddr);
+	  *checksum0 = ip_csum_fold (csum0);
+	  *checksum1 = ip_csum_fold (csum1);
+
+	  if (PREDICT_FALSE (vnet_buffer (p0)->map_t.v6.frag_offset))
+	    {
+	      ip6_frag_hdr_t *hdr = (ip6_frag_hdr_t *) u8_ptr_add (ip60,
+								   vnet_buffer
+								   (p0)->
+								   map_t.
+								   v6.frag_offset);
+	      fragment_id0 = frag_id_6to4 (hdr->identification);
+	      flags0 = clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS);
+	    }
+	  else
+	    {
+	      fragment_id0 = 0;
+	      flags0 = 0;
+	    }
+
+	  if (PREDICT_FALSE (vnet_buffer (p1)->map_t.v6.frag_offset))
+	    {
+	      ip6_frag_hdr_t *hdr = (ip6_frag_hdr_t *) u8_ptr_add (ip61,
+								   vnet_buffer
+								   (p1)->
+								   map_t.
+								   v6.frag_offset);
+	      fragment_id1 = frag_id_6to4 (hdr->identification);
+	      flags1 = clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS);
+	    }
+	  else
+	    {
+	      fragment_id1 = 0;
+	      flags1 = 0;
+	    }
+
+	  ip40->dst_address.as_u32 = vnet_buffer (p0)->map_t.v6.daddr;
+	  ip41->dst_address.as_u32 = vnet_buffer (p1)->map_t.v6.daddr;
+	  ip40->src_address.as_u32 = vnet_buffer (p0)->map_t.v6.saddr;
+	  ip41->src_address.as_u32 = vnet_buffer (p1)->map_t.v6.saddr;
+	  ip40->ip_version_and_header_length =
+	    IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
+	  ip41->ip_version_and_header_length =
+	    IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
+	  ip40->tos = ip6_translate_tos (ip60);
+	  ip41->tos = ip6_translate_tos (ip61);
+	  ip40->length = u16_net_add (ip60->payload_length,
+				      sizeof (*ip40) + sizeof (*ip60) -
+				      vnet_buffer (p0)->map_t.v6.l4_offset);
+	  ip41->length =
+	    u16_net_add (ip61->payload_length,
+			 sizeof (*ip40) + sizeof (*ip60) -
+			 vnet_buffer (p1)->map_t.v6.l4_offset);
+	  ip40->fragment_id = fragment_id0;
+	  ip41->fragment_id = fragment_id1;
+	  ip40->flags_and_fragment_offset = flags0;
+	  ip41->flags_and_fragment_offset = flags1;
+	  ip40->ttl = ip60->hop_limit;
+	  ip41->ttl = ip61->hop_limit;
+	  ip40->protocol = vnet_buffer (p0)->map_t.v6.l4_protocol;
+	  ip41->protocol = vnet_buffer (p1)->map_t.v6.l4_protocol;
+	  ip40->checksum = ip4_header_checksum (ip40);
+	  ip41->checksum = ip4_header_checksum (ip41);
+
+	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
+	    {
+	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
+	      vnet_buffer (p0)->ip_frag.header_offset = 0;
+	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
+	      next0 = IP6_MAPT_TCP_UDP_NEXT_IP4_FRAG;
+	    }
+
+	  if (vnet_buffer (p1)->map_t.mtu < p1->current_length)
+	    {
+	      vnet_buffer (p1)->ip_frag.mtu = vnet_buffer (p1)->map_t.mtu;
+	      vnet_buffer (p1)->ip_frag.header_offset = 0;
+	      vnet_buffer (p1)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
+	      next1 = IP6_MAPT_TCP_UDP_NEXT_IP4_FRAG;
+	    }
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+					   n_left_to_next, pi0, pi1, next0,
+					   next1);
+	}
+#endif
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  ip6_header_t *ip60;
+	  u16 *checksum0;
+	  ip_csum_t csum0;
+	  ip4_header_t *ip40;
+	  u16 fragment_id0;
+	  u16 flags0;
+	  ip6_mapt_tcp_udp_next_t next0;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  next0 = IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip60 = vlib_buffer_get_current (p0);
+	  ip40 =
+	    (ip4_header_t *) u8_ptr_add (ip60,
+					 vnet_buffer (p0)->map_t.
+					 v6.l4_offset - sizeof (*ip40));
+	  vlib_buffer_advance (p0,
+			       vnet_buffer (p0)->map_t.v6.l4_offset -
+			       sizeof (*ip40));
+	  checksum0 =
+	    (u16 *) u8_ptr_add (ip60,
+				vnet_buffer (p0)->map_t.checksum_offset);
+
+	  //TODO: This can probably be optimized
+	  csum0 = ip_csum_sub_even (*checksum0, ip60->src_address.as_u64[0]);
+	  csum0 = ip_csum_sub_even (csum0, ip60->src_address.as_u64[1]);
+	  csum0 = ip_csum_sub_even (csum0, ip60->dst_address.as_u64[0]);
+	  csum0 = ip_csum_sub_even (csum0, ip60->dst_address.as_u64[1]);
+	  csum0 = ip_csum_add_even (csum0, vnet_buffer (p0)->map_t.v6.daddr);
+	  csum0 = ip_csum_add_even (csum0, vnet_buffer (p0)->map_t.v6.saddr);
+	  *checksum0 = ip_csum_fold (csum0);
+
+	  if (PREDICT_FALSE (vnet_buffer (p0)->map_t.v6.frag_offset))
+	    {
+	      //Only the first fragment
+	      ip6_frag_hdr_t *hdr = (ip6_frag_hdr_t *) u8_ptr_add (ip60,
+								   vnet_buffer
+								   (p0)->
+								   map_t.
+								   v6.frag_offset);
+	      fragment_id0 = frag_id_6to4 (hdr->identification);
+	      flags0 = clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS);
+	    }
+	  else
+	    {
+	      fragment_id0 = 0;
+	      flags0 = 0;
+	    }
+
+	  ip40->dst_address.as_u32 = vnet_buffer (p0)->map_t.v6.daddr;
+	  ip40->src_address.as_u32 = vnet_buffer (p0)->map_t.v6.saddr;
+	  ip40->ip_version_and_header_length =
+	    IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
+	  ip40->tos = ip6_translate_tos (ip60);
+	  ip40->length = u16_net_add (ip60->payload_length,
+				      sizeof (*ip40) + sizeof (*ip60) -
+				      vnet_buffer (p0)->map_t.v6.l4_offset);
+	  ip40->fragment_id = fragment_id0;
+	  ip40->flags_and_fragment_offset = flags0;
+	  ip40->ttl = ip60->hop_limit;
+	  ip40->protocol = vnet_buffer (p0)->map_t.v6.l4_protocol;
+	  ip40->checksum = ip4_header_checksum (ip40);
+
+	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
+	    {
+	      //Send to fragmentation node if necessary
+	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
+	      vnet_buffer (p0)->ip_frag.header_offset = 0;
+	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
+	      next0 = IP6_MAPT_TCP_UDP_NEXT_IP4_FRAG;
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next, pi0,
+					   next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return frame->n_vectors;
+}
+
+static_always_inline void
+ip6_map_t_classify (vlib_buffer_t * p0, ip6_header_t * ip60,
+		    map_domain_t * d0, i32 * src_port0,
+		    u8 * error0, ip6_mapt_next_t * next0,
+		    u32 l4_len0, ip6_frag_hdr_t * frag0)
+{
+  if (PREDICT_FALSE (vnet_buffer (p0)->map_t.v6.frag_offset &&
+		     ip6_frag_hdr_offset (frag0)))
+    {
+      *next0 = IP6_MAPT_NEXT_MAPT_FRAGMENTED;
+      if (d0->ea_bits_len == 0 && d0->rules)
+	{
+	  *src_port0 = 0;
+	}
+      else
+	{
+	  *src_port0 = ip6_map_fragment_get (ip60, frag0, d0);
+	  *error0 = (*src_port0 != -1) ? *error0 : MAP_ERROR_FRAGMENT_DROPPED;
+	}
+    }
+  else
+    if (PREDICT_TRUE
+	(vnet_buffer (p0)->map_t.v6.l4_protocol == IP_PROTOCOL_TCP))
+    {
+      *error0 =
+	l4_len0 < sizeof (tcp_header_t) ? MAP_ERROR_MALFORMED : *error0;
+      vnet_buffer (p0)->map_t.checksum_offset =
+	vnet_buffer (p0)->map_t.v6.l4_offset + 16;
+      *next0 = IP6_MAPT_NEXT_MAPT_TCP_UDP;
+      *src_port0 =
+	(i32) *
+	((u16 *) u8_ptr_add (ip60, vnet_buffer (p0)->map_t.v6.l4_offset));
+    }
+  else
+    if (PREDICT_TRUE
+	(vnet_buffer (p0)->map_t.v6.l4_protocol == IP_PROTOCOL_UDP))
+    {
+      *error0 =
+	l4_len0 < sizeof (udp_header_t) ? MAP_ERROR_MALFORMED : *error0;
+      vnet_buffer (p0)->map_t.checksum_offset =
+	vnet_buffer (p0)->map_t.v6.l4_offset + 6;
+      *next0 = IP6_MAPT_NEXT_MAPT_TCP_UDP;
+      *src_port0 =
+	(i32) *
+	((u16 *) u8_ptr_add (ip60, vnet_buffer (p0)->map_t.v6.l4_offset));
+    }
+  else if (vnet_buffer (p0)->map_t.v6.l4_protocol == IP_PROTOCOL_ICMP6)
+    {
+      *error0 =
+	l4_len0 < sizeof (icmp46_header_t) ? MAP_ERROR_MALFORMED : *error0;
+      *next0 = IP6_MAPT_NEXT_MAPT_ICMP;
+      if (d0->ea_bits_len == 0 && d0->rules)
+	{
+	  *src_port0 = 0;
+	}
+      else
+	if (((icmp46_header_t *)
+	     u8_ptr_add (ip60,
+			 vnet_buffer (p0)->map_t.v6.l4_offset))->code ==
+	    ICMP6_echo_reply
+	    || ((icmp46_header_t *)
+		u8_ptr_add (ip60,
+			    vnet_buffer (p0)->map_t.v6.l4_offset))->code ==
+	    ICMP6_echo_request)
+	{
+	  *src_port0 =
+	    (i32) *
+	    ((u16 *)
+	     u8_ptr_add (ip60, vnet_buffer (p0)->map_t.v6.l4_offset + 6));
+	}
+    }
+  else
+    {
+      //TODO: In case of 1:1 mapping, it might be possible to do something with those packets.
+      *error0 = MAP_ERROR_BAD_PROTOCOL;
+    }
+}
+
+static uword
+ip6_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, ip6_map_t_node.index);
+  vlib_combined_counter_main_t *cm = map_main.domain_counters;
+  u32 cpu_index = os_get_cpu_number ();
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+#ifdef IP6_MAP_T_DUAL_LOOP
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 pi0, pi1;
+	  vlib_buffer_t *p0, *p1;
+	  ip6_header_t *ip60, *ip61;
+	  u8 error0, error1;
+	  ip6_mapt_next_t next0, next1;
+	  u32 l4_len0, l4_len1;
+	  i32 src_port0, src_port1;
+	  map_domain_t *d0, *d1;
+	  ip6_frag_hdr_t *frag0, *frag1;
+	  u32 saddr0, saddr1;
+	  next0 = next1 = 0;	//Because compiler whines
+
+	  pi0 = to_next[0] = from[0];
+	  pi1 = to_next[1] = from[1];
+	  from += 2;
+	  n_left_from -= 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+
+	  error0 = MAP_ERROR_NONE;
+	  error1 = MAP_ERROR_NONE;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  p1 = vlib_get_buffer (vm, pi1);
+	  ip60 = vlib_buffer_get_current (p0);
+	  ip61 = vlib_buffer_get_current (p1);
+
+	  saddr0 = map_get_ip4 (&ip60->src_address);
+	  saddr1 = map_get_ip4 (&ip61->src_address);
+	  d0 = ip6_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
+				   (ip4_address_t *) & saddr0,
+				   &vnet_buffer (p0)->map_t.map_domain_index,
+				   &error0);
+	  d1 =
+	    ip6_map_get_domain (vnet_buffer (p1)->ip.adj_index[VLIB_TX],
+				(ip4_address_t *) & saddr1,
+				&vnet_buffer (p1)->map_t.map_domain_index,
+				&error1);
+
+	  vnet_buffer (p0)->map_t.v6.saddr = saddr0;
+	  vnet_buffer (p1)->map_t.v6.saddr = saddr1;
+	  vnet_buffer (p0)->map_t.v6.daddr =
+	    ip6_map_t_embedded_address (d0, &ip60->dst_address);
+	  vnet_buffer (p1)->map_t.v6.daddr =
+	    ip6_map_t_embedded_address (d1, &ip61->dst_address);
+	  vnet_buffer (p0)->map_t.mtu = d0->mtu ? d0->mtu : ~0;
+	  vnet_buffer (p1)->map_t.mtu = d1->mtu ? d1->mtu : ~0;
+
+	  if (PREDICT_FALSE (ip6_parse (ip60, p0->current_length,
+					&(vnet_buffer (p0)->map_t.
+					  v6.l4_protocol),
+					&(vnet_buffer (p0)->map_t.
+					  v6.l4_offset),
+					&(vnet_buffer (p0)->map_t.
+					  v6.frag_offset))))
+	    {
+	      error0 = MAP_ERROR_MALFORMED;
+	      next0 = IP6_MAPT_NEXT_DROP;
+	    }
+
+	  if (PREDICT_FALSE (ip6_parse (ip61, p1->current_length,
+					&(vnet_buffer (p1)->map_t.
+					  v6.l4_protocol),
+					&(vnet_buffer (p1)->map_t.
+					  v6.l4_offset),
+					&(vnet_buffer (p1)->map_t.
+					  v6.frag_offset))))
+	    {
+	      error1 = MAP_ERROR_MALFORMED;
+	      next1 = IP6_MAPT_NEXT_DROP;
+	    }
+
+	  src_port0 = src_port1 = -1;
+	  l4_len0 = (u32) clib_net_to_host_u16 (ip60->payload_length) +
+	    sizeof (*ip60) - vnet_buffer (p0)->map_t.v6.l4_offset;
+	  l4_len1 = (u32) clib_net_to_host_u16 (ip61->payload_length) +
+	    sizeof (*ip60) - vnet_buffer (p1)->map_t.v6.l4_offset;
+	  frag0 =
+	    (ip6_frag_hdr_t *) u8_ptr_add (ip60,
+					   vnet_buffer (p0)->map_t.
+					   v6.frag_offset);
+	  frag1 =
+	    (ip6_frag_hdr_t *) u8_ptr_add (ip61,
+					   vnet_buffer (p1)->map_t.
+					   v6.frag_offset);
+
+	  ip6_map_t_classify (p0, ip60, d0, &src_port0, &error0, &next0,
+			      l4_len0, frag0);
+	  ip6_map_t_classify (p1, ip61, d1, &src_port1, &error1, &next1,
+			      l4_len1, frag1);
+
+	  if (PREDICT_FALSE
+	      ((src_port0 != -1)
+	       && (ip60->src_address.as_u64[0] !=
+		   map_get_pfx_net (d0, vnet_buffer (p0)->map_t.v6.saddr,
+				    src_port0)
+		   || ip60->src_address.as_u64[1] != map_get_sfx_net (d0,
+								      vnet_buffer
+								      (p0)->map_t.v6.saddr,
+								      src_port0))))
+	    {
+	      error0 = MAP_ERROR_SEC_CHECK;
+	    }
+
+	  if (PREDICT_FALSE
+	      ((src_port1 != -1)
+	       && (ip61->src_address.as_u64[0] !=
+		   map_get_pfx_net (d1, vnet_buffer (p1)->map_t.v6.saddr,
+				    src_port1)
+		   || ip61->src_address.as_u64[1] != map_get_sfx_net (d1,
+								      vnet_buffer
+								      (p1)->map_t.v6.saddr,
+								      src_port1))))
+	    {
+	      error1 = MAP_ERROR_SEC_CHECK;
+	    }
+
+	  if (PREDICT_FALSE (vnet_buffer (p0)->map_t.v6.frag_offset &&
+			     !ip6_frag_hdr_offset ((ip6_frag_hdr_t *)
+						   u8_ptr_add (ip60,
+							       vnet_buffer
+							       (p0)->map_t.
+							       v6.frag_offset)))
+	      && (src_port0 != -1) && (d0->ea_bits_len != 0 || !d0->rules)
+	      && (error0 == MAP_ERROR_NONE))
+	    {
+	      ip6_map_fragment_cache (ip60,
+				      (ip6_frag_hdr_t *) u8_ptr_add (ip60,
+								     vnet_buffer
+								     (p0)->map_t.
+								     v6.frag_offset),
+				      d0, src_port0);
+	    }
+
+	  if (PREDICT_FALSE (vnet_buffer (p1)->map_t.v6.frag_offset &&
+			     !ip6_frag_hdr_offset ((ip6_frag_hdr_t *)
+						   u8_ptr_add (ip61,
+							       vnet_buffer
+							       (p1)->map_t.
+							       v6.frag_offset)))
+	      && (src_port1 != -1) && (d1->ea_bits_len != 0 || !d1->rules)
+	      && (error1 == MAP_ERROR_NONE))
+	    {
+	      ip6_map_fragment_cache (ip61,
+				      (ip6_frag_hdr_t *) u8_ptr_add (ip61,
+								     vnet_buffer
+								     (p1)->map_t.
+								     v6.frag_offset),
+				      d1, src_port1);
+	    }
+
+	  if (PREDICT_TRUE
+	      (error0 == MAP_ERROR_NONE && next0 != IP6_MAPT_NEXT_MAPT_ICMP))
+	    {
+	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
+					       cpu_index,
+					       vnet_buffer (p0)->
+					       map_t.map_domain_index, 1,
+					       clib_net_to_host_u16
+					       (ip60->payload_length));
+	    }
+
+	  if (PREDICT_TRUE
+	      (error1 == MAP_ERROR_NONE && next1 != IP6_MAPT_NEXT_MAPT_ICMP))
+	    {
+	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
+					       cpu_index,
+					       vnet_buffer (p1)->
+					       map_t.map_domain_index, 1,
+					       clib_net_to_host_u16
+					       (ip61->payload_length));
+	    }
+
+	  next0 = (error0 != MAP_ERROR_NONE) ? IP6_MAPT_NEXT_DROP : next0;
+	  next1 = (error1 != MAP_ERROR_NONE) ? IP6_MAPT_NEXT_DROP : next1;
+	  p0->error = error_node->errors[error0];
+	  p1->error = error_node->errors[error1];
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+					   n_left_to_next, pi0, pi1, next0,
+					   next1);
+	}
+#endif
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 pi0;
+	  vlib_buffer_t *p0;
+	  ip6_header_t *ip60;
+	  u8 error0;
+	  u32 l4_len0;
+	  i32 src_port0;
+	  map_domain_t *d0;
+	  ip6_frag_hdr_t *frag0;
+	  ip6_mapt_next_t next0 = 0;
+	  u32 saddr;
+
+	  pi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  error0 = MAP_ERROR_NONE;
+
+	  p0 = vlib_get_buffer (vm, pi0);
+	  ip60 = vlib_buffer_get_current (p0);
+	  //Save saddr in a different variable to not overwrite ip.adj_index
+	  saddr = map_get_ip4 (&ip60->src_address);
+	  d0 = ip6_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
+				   (ip4_address_t *) & saddr,
+				   &vnet_buffer (p0)->map_t.map_domain_index,
+				   &error0);
+
+	  //FIXME: What if d0 is null
+	  vnet_buffer (p0)->map_t.v6.saddr = saddr;
+	  vnet_buffer (p0)->map_t.v6.daddr =
+	    ip6_map_t_embedded_address (d0, &ip60->dst_address);
+	  vnet_buffer (p0)->map_t.mtu = d0->mtu ? d0->mtu : ~0;
+
+	  if (PREDICT_FALSE (ip6_parse (ip60, p0->current_length,
+					&(vnet_buffer (p0)->map_t.
+					  v6.l4_protocol),
+					&(vnet_buffer (p0)->map_t.
+					  v6.l4_offset),
+					&(vnet_buffer (p0)->map_t.
+					  v6.frag_offset))))
+	    {
+	      error0 = MAP_ERROR_MALFORMED;
+	      next0 = IP6_MAPT_NEXT_DROP;
+	    }
+
+	  src_port0 = -1;
+	  l4_len0 = (u32) clib_net_to_host_u16 (ip60->payload_length) +
+	    sizeof (*ip60) - vnet_buffer (p0)->map_t.v6.l4_offset;
+	  frag0 =
+	    (ip6_frag_hdr_t *) u8_ptr_add (ip60,
+					   vnet_buffer (p0)->map_t.
+					   v6.frag_offset);
+
+
+	  if (PREDICT_FALSE (vnet_buffer (p0)->map_t.v6.frag_offset &&
+			     ip6_frag_hdr_offset (frag0)))
+	    {
+	      src_port0 = ip6_map_fragment_get (ip60, frag0, d0);
+	      error0 = (src_port0 != -1) ? error0 : MAP_ERROR_FRAGMENT_MEMORY;
+	      next0 = IP6_MAPT_NEXT_MAPT_FRAGMENTED;
+	    }
+	  else
+	    if (PREDICT_TRUE
+		(vnet_buffer (p0)->map_t.v6.l4_protocol == IP_PROTOCOL_TCP))
+	    {
+	      error0 =
+		l4_len0 <
+		sizeof (tcp_header_t) ? MAP_ERROR_MALFORMED : error0;
+	      vnet_buffer (p0)->map_t.checksum_offset =
+		vnet_buffer (p0)->map_t.v6.l4_offset + 16;
+	      next0 = IP6_MAPT_NEXT_MAPT_TCP_UDP;
+	      src_port0 =
+		(i32) *
+		((u16 *)
+		 u8_ptr_add (ip60, vnet_buffer (p0)->map_t.v6.l4_offset));
+	    }
+	  else
+	    if (PREDICT_TRUE
+		(vnet_buffer (p0)->map_t.v6.l4_protocol == IP_PROTOCOL_UDP))
+	    {
+	      error0 =
+		l4_len0 <
+		sizeof (udp_header_t) ? MAP_ERROR_MALFORMED : error0;
+	      vnet_buffer (p0)->map_t.checksum_offset =
+		vnet_buffer (p0)->map_t.v6.l4_offset + 6;
+	      next0 = IP6_MAPT_NEXT_MAPT_TCP_UDP;
+	      src_port0 =
+		(i32) *
+		((u16 *)
+		 u8_ptr_add (ip60, vnet_buffer (p0)->map_t.v6.l4_offset));
+	    }
+	  else if (vnet_buffer (p0)->map_t.v6.l4_protocol ==
+		   IP_PROTOCOL_ICMP6)
+	    {
+	      error0 =
+		l4_len0 <
+		sizeof (icmp46_header_t) ? MAP_ERROR_MALFORMED : error0;
+	      next0 = IP6_MAPT_NEXT_MAPT_ICMP;
+	      if (((icmp46_header_t *)
+		   u8_ptr_add (ip60,
+			       vnet_buffer (p0)->map_t.v6.l4_offset))->code ==
+		  ICMP6_echo_reply
+		  || ((icmp46_header_t *)
+		      u8_ptr_add (ip60,
+				  vnet_buffer (p0)->map_t.v6.
+				  l4_offset))->code == ICMP6_echo_request)
+		src_port0 =
+		  (i32) *
+		  ((u16 *)
+		   u8_ptr_add (ip60,
+			       vnet_buffer (p0)->map_t.v6.l4_offset + 6));
+	    }
+	  else
+	    {
+	      //TODO: In case of 1:1 mapping, it might be possible to do something with those packets.
+	      error0 = MAP_ERROR_BAD_PROTOCOL;
+	    }
+
+	  //Security check
+	  if (PREDICT_FALSE
+	      ((src_port0 != -1)
+	       && (ip60->src_address.as_u64[0] !=
+		   map_get_pfx_net (d0, vnet_buffer (p0)->map_t.v6.saddr,
+				    src_port0)
+		   || ip60->src_address.as_u64[1] != map_get_sfx_net (d0,
+								      vnet_buffer
+								      (p0)->map_t.v6.saddr,
+								      src_port0))))
+	    {
+	      //Security check when src_port0 is not zero (non-first fragment, UDP or TCP)
+	      error0 = MAP_ERROR_SEC_CHECK;
+	    }
+
+	  //Fragmented first packet needs to be cached for following packets
+	  if (PREDICT_FALSE (vnet_buffer (p0)->map_t.v6.frag_offset &&
+			     !ip6_frag_hdr_offset ((ip6_frag_hdr_t *)
+						   u8_ptr_add (ip60,
+							       vnet_buffer
+							       (p0)->map_t.
+							       v6.frag_offset)))
+	      && (src_port0 != -1) && (d0->ea_bits_len != 0 || !d0->rules)
+	      && (error0 == MAP_ERROR_NONE))
+	    {
+	      ip6_map_fragment_cache (ip60,
+				      (ip6_frag_hdr_t *) u8_ptr_add (ip60,
+								     vnet_buffer
+								     (p0)->map_t.
+								     v6.frag_offset),
+				      d0, src_port0);
+	    }
+
+	  if (PREDICT_TRUE
+	      (error0 == MAP_ERROR_NONE && next0 != IP6_MAPT_NEXT_MAPT_ICMP))
+	    {
+	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
+					       cpu_index,
+					       vnet_buffer (p0)->
+					       map_t.map_domain_index, 1,
+					       clib_net_to_host_u16
+					       (ip60->payload_length));
+	    }
+
+	  next0 = (error0 != MAP_ERROR_NONE) ? IP6_MAPT_NEXT_DROP : next0;
+	  p0->error = error_node->errors[error0];
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next, pi0,
+					   next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return frame->n_vectors;
+}
+
+static char *map_t_error_strings[] = {
+#define _(sym,string) string,
+  foreach_map_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(ip6_map_t_fragmented_node) = {
+  .function = ip6_map_t_fragmented,
+  .name = "ip6-map-t-fragmented",
+  .vector_size = sizeof (u32),
+  .format_trace = format_map_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = MAP_N_ERROR,
+  .error_strings = map_t_error_strings,
+
+  .n_next_nodes = IP6_MAPT_FRAGMENTED_N_NEXT,
+  .next_nodes = {
+      [IP6_MAPT_FRAGMENTED_NEXT_IP4_LOOKUP] = "ip4-lookup",
+      [IP6_MAPT_FRAGMENTED_NEXT_IP4_FRAG] = IP4_FRAG_NODE_NAME,
+      [IP6_MAPT_FRAGMENTED_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(ip6_map_t_icmp_node) = {
+  .function = ip6_map_t_icmp,
+  .name = "ip6-map-t-icmp",
+  .vector_size = sizeof (u32),
+  .format_trace = format_map_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = MAP_N_ERROR,
+  .error_strings = map_t_error_strings,
+
+  .n_next_nodes = IP6_MAPT_ICMP_N_NEXT,
+  .next_nodes = {
+      [IP6_MAPT_ICMP_NEXT_IP4_LOOKUP] = "ip4-lookup",
+      [IP6_MAPT_ICMP_NEXT_IP4_FRAG] = IP4_FRAG_NODE_NAME,
+      [IP6_MAPT_ICMP_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(ip6_map_t_tcp_udp_node) = {
+  .function = ip6_map_t_tcp_udp,
+  .name = "ip6-map-t-tcp-udp",
+  .vector_size = sizeof (u32),
+  .format_trace = format_map_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = MAP_N_ERROR,
+  .error_strings = map_t_error_strings,
+
+  .n_next_nodes = IP6_MAPT_TCP_UDP_N_NEXT,
+  .next_nodes = {
+      [IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP] = "ip4-lookup",
+      [IP6_MAPT_TCP_UDP_NEXT_IP4_FRAG] = IP4_FRAG_NODE_NAME,
+      [IP6_MAPT_TCP_UDP_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE(ip6_map_t_node) = {
+  .function = ip6_map_t,
+  .name = "ip6-map-t",
+  .vector_size = sizeof(u32),
+  .format_trace = format_map_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = MAP_N_ERROR,
+  .error_strings = map_t_error_strings,
+
+  .n_next_nodes = IP6_MAPT_N_NEXT,
+  .next_nodes = {
+      [IP6_MAPT_NEXT_MAPT_TCP_UDP] = "ip6-map-t-tcp-udp",
+      [IP6_MAPT_NEXT_MAPT_ICMP] = "ip6-map-t-icmp",
+      [IP6_MAPT_NEXT_MAPT_FRAGMENTED] = "ip6-map-t-fragmented",
+      [IP6_MAPT_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/map/map.api b/src/vnet/map/map.api
new file mode 100644
index 00000000..4e4be85e
--- /dev/null
+++ b/src/vnet/map/map.api
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/** \brief Add MAP domains
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param ip6_prefix - Rule IPv6 prefix
+    @param ip4_prefix - Rule IPv4 prefix
+    @param ip6_src - MAP domain IPv6 BR address / Tunnel source
+    @param ip6_prefix_len - Rule IPv6 prefix length
+    @param ip4_prefix_len - Rule IPv4 prefix length
+    @param ea_bits_len - Embedded Address bits length
+    @param psid_offset - Port Set Identifider (PSID) offset
+    @param psid_length - PSID length
+    @param is_translation - MAP-E / MAP-T
+    @param mtu - MTU
+*/
+define map_add_domain
+{
+  u32 client_index;
+  u32 context;
+  u8 ip6_prefix[16];
+  u8 ip4_prefix[4];
+  u8 ip6_src[16];
+  u8 ip6_prefix_len;
+  u8 ip4_prefix_len;
+  u8 ip6_src_prefix_len;
+  u8 ea_bits_len;
+  u8 psid_offset;
+  u8 psid_length;
+  u8 is_translation;
+  u16 mtu;
+};
+
+/** \brief Reply for MAP domain add
+    @param context - returned sender context, to match reply w/ request
+    @param index - MAP domain index
+    @param retval - return code
+*/
+define map_add_domain_reply
+{
+  u32 context;
+  u32 index;
+  i32 retval;
+};
+
+/** \brief Delete MAP domain
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param index - MAP Domain index
+*/
+define map_del_domain
+{
+  u32 client_index;
+  u32 context;
+  u32 index;
+};
+
+/** \brief Reply for MAP domain del
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define map_del_domain_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Add or Delete MAP rule from a domain (Only used for shared IPv4 per subscriber)
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param index - MAP Domain index
+    @param is_add - If 1 add rule, if 0 delete rule
+    @param ip6_dst - MAP CE IPv6 address
+    @param psid - Rule PSID
+*/
+define map_add_del_rule
+{
+  u32 client_index;
+  u32 context;
+  u32 index;
+  u32 is_add;
+  u8 ip6_dst[16];
+  u16 psid;
+};
+
+/** \brief Reply for MAP rule add/del
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define map_add_del_rule_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Get list of map domains
+    @param client_index - opaque cookie to identify the sender
+*/
+define map_domain_dump
+{
+  u32 client_index;
+  u32 context;
+};
+
+define map_domain_details
+{
+  u32 context;
+  u32 domain_index;
+  u8 ip6_prefix[16];
+  u8 ip4_prefix[4];
+  u8 ip6_src[16];
+  u8 ip6_prefix_len;
+  u8 ip4_prefix_len;
+  u8 ip6_src_len;
+  u8 ea_bits_len;
+  u8 psid_offset;
+  u8 psid_length;
+  u8 flags;
+  u16 mtu;
+  u8 is_translation;
+};
+
+define map_rule_dump
+{
+  u32 client_index;
+  u32 context;
+  u32 domain_index;
+};
+
+define map_rule_details
+{
+  u32 context;
+  u8 ip6_dst[16];
+  u16 psid;
+};
+
+/** \brief Request for a single block of summary stats
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define map_summary_stats
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Reply for map_summary_stats request
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for request
+    @param total_bindings -
+    @param total_pkts -
+    @param total_ip4_fragments -
+    @param total_security_check -
+*/
+define map_summary_stats_reply
+{
+  u32 context;
+  i32 retval;
+  u64 total_bindings;
+  u64 total_pkts[2];
+  u64 total_bytes[2];
+  u64 total_ip4_fragments;
+  u64 total_security_check[2];
+};
diff --git a/src/vnet/map/map.c b/src/vnet/map/map.c
new file mode 100644
index 00000000..aeec6a94
--- /dev/null
+++ b/src/vnet/map/map.c
@@ -0,0 +1,2166 @@
+/*
+ * map.c : MAP support
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/fib/fib_table.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/adj/adj.h>
+#include <vnet/map/map_dpo.h>
+
+#include "map.h"
+
+#ifdef __SSE4_2__
+static inline u32
+crc_u32 (u32 data, u32 value)
+{
+  __asm__ volatile ("crc32l %[data], %[value];":[value] "+r" (value):[data]
+		    "rm" (data));
+  return value;
+}
+#else
+#include <vppinfra/xxhash.h>
+
+static inline u32
+crc_u32 (u32 data, u32 value)
+{
+  u64 tmp = ((u64) data << 32) | (u64) value;
+  return (u32) clib_xxhash (tmp);
+}
+#endif
+
+/*
+ * This code supports the following MAP modes:
+ *
+ * Algorithmic Shared IPv4 address (ea_bits_len > 0):
+ *   ea_bits_len + ip4_prefix > 32
+ *   psid_length > 0, ip6_prefix < 64, ip4_prefix <= 32
+ * Algorithmic Full IPv4 address (ea_bits_len > 0):
+ *   ea_bits_len + ip4_prefix = 32
+ *   psid_length = 0, ip6_prefix < 64, ip4_prefix <= 32
+ * Algorithmic IPv4 prefix (ea_bits_len > 0):
+ *   ea_bits_len + ip4_prefix < 32
+ *   psid_length = 0, ip6_prefix < 64, ip4_prefix <= 32
+ *
+ * Independent Shared IPv4 address (ea_bits_len = 0):
+ *   ip4_prefix = 32
+ *   psid_length > 0
+ *   Rule IPv6 address = 128, Rule PSID Set
+ * Independent Full IPv4 address (ea_bits_len = 0):
+ *   ip4_prefix = 32
+ *   psid_length = 0, ip6_prefix = 128
+ * Independent IPv4 prefix (ea_bits_len = 0):
+ *   ip4_prefix < 32
+ *   psid_length = 0, ip6_prefix = 128
+ *
+ */
+
+/*
+ * This code supports MAP-T:
+ *
+ * With DMR prefix length equal to 96.
+ *
+ */
+
+
+i32
+ip4_get_port (ip4_header_t * ip, map_dir_e dir, u16 buffer_len)
+{
+  //TODO: use buffer length
+  if (ip->ip_version_and_header_length != 0x45 ||
+      ip4_get_fragment_offset (ip))
+    return -1;
+
+  if (PREDICT_TRUE ((ip->protocol == IP_PROTOCOL_TCP) ||
+		    (ip->protocol == IP_PROTOCOL_UDP)))
+    {
+      udp_header_t *udp = (void *) (ip + 1);
+      return (dir == MAP_SENDER) ? udp->src_port : udp->dst_port;
+    }
+  else if (ip->protocol == IP_PROTOCOL_ICMP)
+    {
+      icmp46_header_t *icmp = (void *) (ip + 1);
+      if (icmp->type == ICMP4_echo_request || icmp->type == ICMP4_echo_reply)
+	{
+	  return *((u16 *) (icmp + 1));
+	}
+      else if (clib_net_to_host_u16 (ip->length) >= 64)
+	{
+	  ip = (ip4_header_t *) (icmp + 2);
+	  if (PREDICT_TRUE ((ip->protocol == IP_PROTOCOL_TCP) ||
+			    (ip->protocol == IP_PROTOCOL_UDP)))
+	    {
+	      udp_header_t *udp = (void *) (ip + 1);
+	      return (dir == MAP_SENDER) ? udp->dst_port : udp->src_port;
+	    }
+	  else if (ip->protocol == IP_PROTOCOL_ICMP)
+	    {
+	      icmp46_header_t *icmp = (void *) (ip + 1);
+	      if (icmp->type == ICMP4_echo_request ||
+		  icmp->type == ICMP4_echo_reply)
+		{
+		  return *((u16 *) (icmp + 1));
+		}
+	    }
+	}
+    }
+  return -1;
+}
+
+i32
+ip6_get_port (ip6_header_t * ip6, map_dir_e dir, u16 buffer_len)
+{
+  u8 l4_protocol;
+  u16 l4_offset;
+  u16 frag_offset;
+  u8 *l4;
+
+  if (ip6_parse (ip6, buffer_len, &l4_protocol, &l4_offset, &frag_offset))
+    return -1;
+
+  //TODO: Use buffer length
+
+  if (frag_offset &&
+      ip6_frag_hdr_offset (((ip6_frag_hdr_t *)
+			    u8_ptr_add (ip6, frag_offset))))
+    return -1;			//Can't deal with non-first fragment for now
+
+  l4 = u8_ptr_add (ip6, l4_offset);
+  if (l4_protocol == IP_PROTOCOL_TCP || l4_protocol == IP_PROTOCOL_UDP)
+    {
+      return (dir ==
+	      MAP_SENDER) ? ((udp_header_t *) (l4))->src_port : ((udp_header_t
+								  *)
+								 (l4))->dst_port;
+    }
+  else if (l4_protocol == IP_PROTOCOL_ICMP6)
+    {
+      icmp46_header_t *icmp = (icmp46_header_t *) (l4);
+      if (icmp->type == ICMP6_echo_request)
+	{
+	  return (dir == MAP_SENDER) ? ((u16 *) (icmp))[2] : -1;
+	}
+      else if (icmp->type == ICMP6_echo_reply)
+	{
+	  return (dir == MAP_SENDER) ? -1 : ((u16 *) (icmp))[2];
+	}
+    }
+  return -1;
+}
+
+
+int
+map_create_domain (ip4_address_t * ip4_prefix,
+		   u8 ip4_prefix_len,
+		   ip6_address_t * ip6_prefix,
+		   u8 ip6_prefix_len,
+		   ip6_address_t * ip6_src,
+		   u8 ip6_src_len,
+		   u8 ea_bits_len,
+		   u8 psid_offset,
+		   u8 psid_length, u32 * map_domain_index, u16 mtu, u8 flags)
+{
+  u8 suffix_len, suffix_shift;
+  map_main_t *mm = &map_main;
+  dpo_id_t dpo_v4 = DPO_INVALID;
+  dpo_id_t dpo_v6 = DPO_INVALID;
+  fib_node_index_t fei;
+  map_domain_t *d;
+
+  /* Sanity check on the src prefix length */
+  if (flags & MAP_DOMAIN_TRANSLATION)
+    {
+      if (ip6_src_len != 96)
+	{
+	  clib_warning ("MAP-T only supports ip6_src_len = 96 for now.");
+	  return -1;
+	}
+    }
+  else
+    {
+      if (ip6_src_len != 128)
+	{
+	  clib_warning
+	    ("MAP-E requires a BR address, not a prefix (ip6_src_len should "
+	     "be 128).");
+	  return -1;
+	}
+    }
+
+  /* How many, and which bits to grab from the IPv4 DA */
+  if (ip4_prefix_len + ea_bits_len < 32)
+    {
+      flags |= MAP_DOMAIN_PREFIX;
+      suffix_shift = 32 - ip4_prefix_len - ea_bits_len;
+      suffix_len = ea_bits_len;
+    }
+  else
+    {
+      suffix_shift = 0;
+      suffix_len = 32 - ip4_prefix_len;
+    }
+
+  /* EA bits must be within the first 64 bits */
+  if (ea_bits_len > 0 && ((ip6_prefix_len + ea_bits_len) > 64 ||
+			  ip6_prefix_len + suffix_len + psid_length > 64))
+    {
+      clib_warning
+	("Embedded Address bits must be within the first 64 bits of "
+	 "the IPv6 prefix");
+      return -1;
+    }
+
+  /* Get domain index */
+  pool_get_aligned (mm->domains, d, CLIB_CACHE_LINE_BYTES);
+  memset (d, 0, sizeof (*d));
+  *map_domain_index = d - mm->domains;
+
+  /* Init domain struct */
+  d->ip4_prefix.as_u32 = ip4_prefix->as_u32;
+  d->ip4_prefix_len = ip4_prefix_len;
+  d->ip6_prefix = *ip6_prefix;
+  d->ip6_prefix_len = ip6_prefix_len;
+  d->ip6_src = *ip6_src;
+  d->ip6_src_len = ip6_src_len;
+  d->ea_bits_len = ea_bits_len;
+  d->psid_offset = psid_offset;
+  d->psid_length = psid_length;
+  d->mtu = mtu;
+  d->flags = flags;
+  d->suffix_shift = suffix_shift;
+  d->suffix_mask = (1 << suffix_len) - 1;
+
+  d->psid_shift = 16 - psid_length - psid_offset;
+  d->psid_mask = (1 << d->psid_length) - 1;
+  d->ea_shift = 64 - ip6_prefix_len - suffix_len - d->psid_length;
+
+  /* MAP data-plane object */
+  if (d->flags & MAP_DOMAIN_TRANSLATION)
+    map_t_dpo_create (DPO_PROTO_IP4, *map_domain_index, &dpo_v4);
+  else
+    map_dpo_create (DPO_PROTO_IP4, *map_domain_index, &dpo_v4);
+
+  /* Create ip4 route */
+  fib_prefix_t pfx = {
+    .fp_proto = FIB_PROTOCOL_IP4,
+    .fp_len = d->ip4_prefix_len,
+    .fp_addr = {
+		.ip4 = d->ip4_prefix,
+		}
+    ,
+  };
+  fib_table_entry_special_dpo_add (0, &pfx,
+				   FIB_SOURCE_MAP,
+				   FIB_ENTRY_FLAG_EXCLUSIVE, &dpo_v4);
+  dpo_reset (&dpo_v4);
+
+  /*
+   * Multiple MAP domains may share same source IPv6 TEP.
+   * In this case the route will exist and be MAP sourced.
+   * Find the adj (if any) already contributed and modify it
+   */
+  fib_prefix_t pfx6 = {
+    .fp_proto = FIB_PROTOCOL_IP6,
+    .fp_len = d->ip6_src_len,
+    .fp_addr = {
+		.ip6 = d->ip6_src,
+		}
+    ,
+  };
+  fei = fib_table_lookup_exact_match (0, &pfx6);
+
+  if (FIB_NODE_INDEX_INVALID != fei)
+    {
+      dpo_id_t dpo = DPO_INVALID;
+
+      if (fib_entry_get_dpo_for_source (fei, FIB_SOURCE_MAP, &dpo))
+	{
+	  /*
+	   * modify the existing MAP to indicate it's shared
+	   * skip to route add.
+	   */
+	  const dpo_id_t *md_dpo;
+	  map_dpo_t *md;
+
+	  ASSERT (DPO_LOAD_BALANCE == dpo.dpoi_type);
+
+	  md_dpo = load_balance_get_bucket (dpo.dpoi_index, 0);
+	  md = map_dpo_get (md_dpo->dpoi_index);
+
+	  md->md_domain = ~0;
+	  dpo_copy (&dpo_v6, md_dpo);
+	  dpo_reset (&dpo);
+
+	  goto route_add;
+	}
+    }
+
+  if (d->flags & MAP_DOMAIN_TRANSLATION)
+    map_t_dpo_create (DPO_PROTO_IP6, *map_domain_index, &dpo_v6);
+  else
+    map_dpo_create (DPO_PROTO_IP6, *map_domain_index, &dpo_v6);
+
+route_add:
+  /*
+   * Create ip6 route. This is a reference counted add. If the prefix
+   * already exists and is MAP sourced, it is now MAP source n+1 times
+   * and will need to be removed n+1 times.
+   */
+  fib_table_entry_special_dpo_add (0, &pfx6,
+				   FIB_SOURCE_MAP,
+				   FIB_ENTRY_FLAG_EXCLUSIVE, &dpo_v6);
+  dpo_reset (&dpo_v6);
+
+  /* Validate packet/byte counters */
+  map_domain_counter_lock (mm);
+  int i;
+  for (i = 0; i < vec_len (mm->simple_domain_counters); i++)
+    {
+      vlib_validate_simple_counter (&mm->simple_domain_counters[i],
+				    *map_domain_index);
+      vlib_zero_simple_counter (&mm->simple_domain_counters[i],
+				*map_domain_index);
+    }
+  for (i = 0; i < vec_len (mm->domain_counters); i++)
+    {
+      vlib_validate_combined_counter (&mm->domain_counters[i],
+				      *map_domain_index);
+      vlib_zero_combined_counter (&mm->domain_counters[i], *map_domain_index);
+    }
+  map_domain_counter_unlock (mm);
+
+  return 0;
+}
+
+/*
+ * map_delete_domain
+ */
+int
+map_delete_domain (u32 map_domain_index)
+{
+  map_main_t *mm = &map_main;
+  map_domain_t *d;
+
+  if (pool_is_free_index (mm->domains, map_domain_index))
+    {
+      clib_warning ("MAP domain delete: domain does not exist: %d",
+		    map_domain_index);
+      return -1;
+    }
+
+  d = pool_elt_at_index (mm->domains, map_domain_index);
+
+  fib_prefix_t pfx = {
+    .fp_proto = FIB_PROTOCOL_IP4,
+    .fp_len = d->ip4_prefix_len,
+    .fp_addr = {
+		.ip4 = d->ip4_prefix,
+		}
+    ,
+  };
+  fib_table_entry_special_remove (0, &pfx, FIB_SOURCE_MAP);
+
+  fib_prefix_t pfx6 = {
+    .fp_proto = FIB_PROTOCOL_IP6,
+    .fp_len = d->ip6_src_len,
+    .fp_addr = {
+		.ip6 = d->ip6_src,
+		}
+    ,
+  };
+  fib_table_entry_special_remove (0, &pfx6, FIB_SOURCE_MAP);
+
+  /* Deleting rules */
+  if (d->rules)
+    clib_mem_free (d->rules);
+
+  pool_put (mm->domains, d);
+
+  return 0;
+}
+
+int
+map_add_del_psid (u32 map_domain_index, u16 psid, ip6_address_t * tep,
+		  u8 is_add)
+{
+  map_domain_t *d;
+  map_main_t *mm = &map_main;
+
+  if (pool_is_free_index (mm->domains, map_domain_index))
+    {
+      clib_warning ("MAP rule: domain does not exist: %d", map_domain_index);
+      return -1;
+    }
+  d = pool_elt_at_index (mm->domains, map_domain_index);
+
+  /* Rules are only used in 1:1 independent case */
+  if (d->ea_bits_len > 0)
+    return (-1);
+
+  if (!d->rules)
+    {
+      u32 l = (0x1 << d->psid_length) * sizeof (ip6_address_t);
+      d->rules = clib_mem_alloc_aligned (l, CLIB_CACHE_LINE_BYTES);
+      if (!d->rules)
+	return -1;
+      memset (d->rules, 0, l);
+    }
+
+  if (psid >= (0x1 << d->psid_length))
+    {
+      clib_warning ("MAP rule: PSID outside bounds: %d [%d]", psid,
+		    0x1 << d->psid_length);
+      return -1;
+    }
+
+  if (is_add)
+    {
+      d->rules[psid] = *tep;
+    }
+  else
+    {
+      memset (&d->rules[psid], 0, sizeof (ip6_address_t));
+    }
+  return 0;
+}
+
+#ifdef MAP_SKIP_IP6_LOOKUP
+static void
+map_pre_resolve (ip4_address_t * ip4, ip6_address_t * ip6)
+{
+  map_main_t *mm = &map_main;
+  ip6_main_t *im6 = &ip6_main;
+
+  if (ip6->as_u64[0] != 0 || ip6->as_u64[1] != 0)
+    {
+      // FIXME NOT an ADJ
+      mm->adj6_index = ip6_fib_table_fwding_lookup (im6, 0, ip6);
+      clib_warning ("FIB lookup results in: %u", mm->adj6_index);
+    }
+  if (ip4->as_u32 != 0)
+    {
+      // FIXME NOT an ADJ
+      mm->adj4_index = ip4_fib_table_lookup_lb (0, ip4);
+      clib_warning ("FIB lookup results in: %u", mm->adj4_index);
+    }
+}
+#endif
+
+static clib_error_t *
+map_security_check_command_fn (vlib_main_t * vm,
+			       unformat_input_t * input,
+			       vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  map_main_t *mm = &map_main;
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "off"))
+	mm->sec_check = false;
+      else if (unformat (line_input, "on"))
+	mm->sec_check = true;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+  return 0;
+}
+
+static clib_error_t *
+map_security_check_frag_command_fn (vlib_main_t * vm,
+				    unformat_input_t * input,
+				    vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  map_main_t *mm = &map_main;
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "off"))
+	mm->sec_check_frag = false;
+      else if (unformat (line_input, "on"))
+	mm->sec_check_frag = true;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+  return 0;
+}
+
+static clib_error_t *
+map_add_domain_command_fn (vlib_main_t * vm,
+			   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ip4_address_t ip4_prefix;
+  ip6_address_t ip6_prefix;
+  ip6_address_t ip6_src;
+  u32 ip6_prefix_len = 0, ip4_prefix_len = 0, map_domain_index, ip6_src_len;
+  u32 num_m_args = 0;
+  /* Optional arguments */
+  u32 ea_bits_len = 0, psid_offset = 0, psid_length = 0;
+  u32 mtu = 0;
+  u8 flags = 0;
+  ip6_src_len = 128;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (line_input, "ip4-pfx %U/%d", unformat_ip4_address, &ip4_prefix,
+	   &ip4_prefix_len))
+	num_m_args++;
+      else
+	if (unformat
+	    (line_input, "ip6-pfx %U/%d", unformat_ip6_address, &ip6_prefix,
+	     &ip6_prefix_len))
+	num_m_args++;
+      else
+	if (unformat
+	    (line_input, "ip6-src %U/%d", unformat_ip6_address, &ip6_src,
+	     &ip6_src_len))
+	num_m_args++;
+      else
+	if (unformat
+	    (line_input, "ip6-src %U", unformat_ip6_address, &ip6_src))
+	num_m_args++;
+      else if (unformat (line_input, "ea-bits-len %d", &ea_bits_len))
+	num_m_args++;
+      else if (unformat (line_input, "psid-offset %d", &psid_offset))
+	num_m_args++;
+      else if (unformat (line_input, "psid-len %d", &psid_length))
+	num_m_args++;
+      else if (unformat (line_input, "mtu %d", &mtu))
+	num_m_args++;
+      else if (unformat (line_input, "map-t"))
+	flags |= MAP_DOMAIN_TRANSLATION;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  if (num_m_args < 3)
+    return clib_error_return (0, "mandatory argument(s) missing");
+
+  map_create_domain (&ip4_prefix, ip4_prefix_len,
+		     &ip6_prefix, ip6_prefix_len, &ip6_src, ip6_src_len,
+		     ea_bits_len, psid_offset, psid_length, &map_domain_index,
+		     mtu, flags);
+
+  return 0;
+}
+
+static clib_error_t *
+map_del_domain_command_fn (vlib_main_t * vm,
+			   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 num_m_args = 0;
+  u32 map_domain_index;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "index %d", &map_domain_index))
+	num_m_args++;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  if (num_m_args != 1)
+    return clib_error_return (0, "mandatory argument(s) missing");
+
+  map_delete_domain (map_domain_index);
+
+  return 0;
+}
+
+static clib_error_t *
+map_add_rule_command_fn (vlib_main_t * vm,
+			 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ip6_address_t tep;
+  u32 num_m_args = 0;
+  u32 psid = 0, map_domain_index;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "index %d", &map_domain_index))
+	num_m_args++;
+      else if (unformat (line_input, "psid %d", &psid))
+	num_m_args++;
+      else
+	if (unformat (line_input, "ip6-dst %U", unformat_ip6_address, &tep))
+	num_m_args++;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  if (num_m_args != 3)
+    return clib_error_return (0, "mandatory argument(s) missing");
+
+  if (map_add_del_psid (map_domain_index, psid, &tep, 1) != 0)
+    {
+      return clib_error_return (0, "Failing to add Mapping Rule");
+    }
+  return 0;
+}
+
+#if MAP_SKIP_IP6_LOOKUP
+static clib_error_t *
+map_pre_resolve_command_fn (vlib_main_t * vm,
+			    unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ip4_address_t ip4nh;
+  ip6_address_t ip6nh;
+  map_main_t *mm = &map_main;
+
+  memset (&ip4nh, 0, sizeof (ip4nh));
+  memset (&ip6nh, 0, sizeof (ip6nh));
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "ip4-nh %U", unformat_ip4_address, &ip4nh))
+	mm->preresolve_ip4 = ip4nh;
+      else
+	if (unformat (line_input, "ip6-nh %U", unformat_ip6_address, &ip6nh))
+	mm->preresolve_ip6 = ip6nh;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  map_pre_resolve (&ip4nh, &ip6nh);
+
+  return 0;
+}
+#endif
+
+static clib_error_t *
+map_icmp_relay_source_address_command_fn (vlib_main_t * vm,
+					  unformat_input_t * input,
+					  vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ip4_address_t icmp_src_address;
+  map_main_t *mm = &map_main;
+
+  mm->icmp4_src_address.as_u32 = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (line_input, "%U", unformat_ip4_address, &icmp_src_address))
+	mm->icmp4_src_address = icmp_src_address;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  return 0;
+}
+
+static clib_error_t *
+map_icmp_unreachables_command_fn (vlib_main_t * vm,
+				  unformat_input_t * input,
+				  vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  map_main_t *mm = &map_main;
+  int num_m_args = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      num_m_args++;
+      if (unformat (line_input, "on"))
+	mm->icmp6_enabled = true;
+      else if (unformat (line_input, "off"))
+	mm->icmp6_enabled = false;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+
+  if (num_m_args != 1)
+    return clib_error_return (0, "mandatory argument(s) missing");
+
+  return 0;
+}
+
+static clib_error_t *
+map_fragment_command_fn (vlib_main_t * vm,
+			 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  map_main_t *mm = &map_main;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "inner"))
+	mm->frag_inner = true;
+      else if (unformat (line_input, "outer"))
+	mm->frag_inner = false;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  return 0;
+}
+
+static clib_error_t *
+map_fragment_df_command_fn (vlib_main_t * vm,
+			    unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  map_main_t *mm = &map_main;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "on"))
+	mm->frag_ignore_df = true;
+      else if (unformat (line_input, "off"))
+	mm->frag_ignore_df = false;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  return 0;
+}
+
+static clib_error_t *
+map_traffic_class_command_fn (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  map_main_t *mm = &map_main;
+  u32 tc = 0;
+
+  mm->tc_copy = false;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "copy"))
+	mm->tc_copy = true;
+      else if (unformat (line_input, "%x", &tc))
+	mm->tc = tc & 0xff;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  return 0;
+}
+
+static u8 *
+format_map_domain (u8 * s, va_list * args)
+{
+  map_domain_t *d = va_arg (*args, map_domain_t *);
+  bool counters = va_arg (*args, int);
+  map_main_t *mm = &map_main;
+  ip6_address_t ip6_prefix;
+
+  if (d->rules)
+    memset (&ip6_prefix, 0, sizeof (ip6_prefix));
+  else
+    ip6_prefix = d->ip6_prefix;
+
+  s = format (s,
+	      "[%d] ip4-pfx %U/%d ip6-pfx %U/%d ip6-src %U/%d ea_bits_len %d psid-offset %d psid-len %d mtu %d %s",
+	      d - mm->domains,
+	      format_ip4_address, &d->ip4_prefix, d->ip4_prefix_len,
+	      format_ip6_address, &ip6_prefix, d->ip6_prefix_len,
+	      format_ip6_address, &d->ip6_src, d->ip6_src_len,
+	      d->ea_bits_len, d->psid_offset, d->psid_length, d->mtu,
+	      (d->flags & MAP_DOMAIN_TRANSLATION) ? "map-t" : "");
+
+  if (counters)
+    {
+      map_domain_counter_lock (mm);
+      vlib_counter_t v;
+      vlib_get_combined_counter (&mm->domain_counters[MAP_DOMAIN_COUNTER_TX],
+				 d - mm->domains, &v);
+      s = format (s, "  TX: %lld/%lld", v.packets, v.bytes);
+      vlib_get_combined_counter (&mm->domain_counters[MAP_DOMAIN_COUNTER_RX],
+				 d - mm->domains, &v);
+      s = format (s, "  RX: %lld/%lld", v.packets, v.bytes);
+      map_domain_counter_unlock (mm);
+    }
+  s = format (s, "\n");
+
+  if (d->rules)
+    {
+      int i;
+      ip6_address_t dst;
+      for (i = 0; i < (0x1 << d->psid_length); i++)
+	{
+	  dst = d->rules[i];
+	  if (dst.as_u64[0] == 0 && dst.as_u64[1] == 0)
+	    continue;
+	  s = format (s,
+		      " rule psid: %d ip6-dst %U\n", i, format_ip6_address,
+		      &dst);
+	}
+    }
+  return s;
+}
+
+static u8 *
+format_map_ip4_reass (u8 * s, va_list * args)
+{
+  map_main_t *mm = &map_main;
+  map_ip4_reass_t *r = va_arg (*args, map_ip4_reass_t *);
+  map_ip4_reass_key_t *k = &r->key;
+  f64 now = vlib_time_now (mm->vlib_main);
+  f64 lifetime = (((f64) mm->ip4_reass_conf_lifetime_ms) / 1000);
+  f64 dt = (r->ts + lifetime > now) ? (r->ts + lifetime - now) : -1;
+  s = format (s,
+	      "ip4-reass src=%U  dst=%U  protocol=%d  identifier=%d  port=%d  lifetime=%.3lf\n",
+	      format_ip4_address, &k->src.as_u8, format_ip4_address,
+	      &k->dst.as_u8, k->protocol,
+	      clib_net_to_host_u16 (k->fragment_id),
+	      (r->port >= 0) ? clib_net_to_host_u16 (r->port) : -1, dt);
+  return s;
+}
+
+static u8 *
+format_map_ip6_reass (u8 * s, va_list * args)
+{
+  map_main_t *mm = &map_main;
+  map_ip6_reass_t *r = va_arg (*args, map_ip6_reass_t *);
+  map_ip6_reass_key_t *k = &r->key;
+  f64 now = vlib_time_now (mm->vlib_main);
+  f64 lifetime = (((f64) mm->ip6_reass_conf_lifetime_ms) / 1000);
+  f64 dt = (r->ts + lifetime > now) ? (r->ts + lifetime - now) : -1;
+  s = format (s,
+	      "ip6-reass src=%U  dst=%U  protocol=%d  identifier=%d  lifetime=%.3lf\n",
+	      format_ip6_address, &k->src.as_u8, format_ip6_address,
+	      &k->dst.as_u8, k->protocol,
+	      clib_net_to_host_u32 (k->fragment_id), dt);
+  return s;
+}
+
+static clib_error_t *
+show_map_domain_command_fn (vlib_main_t * vm, unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  map_main_t *mm = &map_main;
+  map_domain_t *d;
+  bool counters = false;
+  u32 map_domain_index = ~0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "counters"))
+	counters = true;
+      else if (unformat (line_input, "index %d", &map_domain_index))
+	;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  if (pool_elts (mm->domains) == 0)
+    vlib_cli_output (vm, "No MAP domains are configured...");
+
+  if (map_domain_index == ~0)
+    {
+    /* *INDENT-OFF* */
+    pool_foreach(d, mm->domains, ({vlib_cli_output(vm, "%U", format_map_domain, d, counters);}));
+    /* *INDENT-ON* */
+    }
+  else
+    {
+      if (pool_is_free_index (mm->domains, map_domain_index))
+	{
+	  return clib_error_return (0, "MAP domain does not exists %d",
+				    map_domain_index);
+	}
+
+      d = pool_elt_at_index (mm->domains, map_domain_index);
+      vlib_cli_output (vm, "%U", format_map_domain, d, counters);
+    }
+
+  return 0;
+}
+
+static clib_error_t *
+show_map_fragments_command_fn (vlib_main_t * vm, unformat_input_t * input,
+			       vlib_cli_command_t * cmd)
+{
+  map_main_t *mm = &map_main;
+  map_ip4_reass_t *f4;
+  map_ip6_reass_t *f6;
+
+  /* *INDENT-OFF* */
+  pool_foreach(f4, mm->ip4_reass_pool, ({vlib_cli_output (vm, "%U", format_map_ip4_reass, f4);}));
+  /* *INDENT-ON* */
+  /* *INDENT-OFF* */
+  pool_foreach(f6, mm->ip6_reass_pool, ({vlib_cli_output (vm, "%U", format_map_ip6_reass, f6);}));
+  /* *INDENT-ON* */
+  return (0);
+}
+
+u64
+map_error_counter_get (u32 node_index, map_error_t map_error)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vlib_node_runtime_t *error_node = vlib_node_get_runtime (vm, node_index);
+  vlib_error_main_t *em = &vm->error_main;
+  vlib_error_t e = error_node->errors[map_error];
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  u32 ci;
+
+  ci = vlib_error_get_code (e);
+  ASSERT (ci < n->n_errors);
+  ci += n->error_heap_index;
+
+  return (em->counters[ci]);
+}
+
+static clib_error_t *
+show_map_stats_command_fn (vlib_main_t * vm, unformat_input_t * input,
+			   vlib_cli_command_t * cmd)
+{
+  map_main_t *mm = &map_main;
+  map_domain_t *d;
+  int domains = 0, rules = 0, domaincount = 0, rulecount = 0;
+  if (pool_elts (mm->domains) == 0)
+    vlib_cli_output (vm, "No MAP domains are configured...");
+
+  /* *INDENT-OFF* */
+  pool_foreach(d, mm->domains, ({
+    if (d->rules) {
+      rulecount+= 0x1 << d->psid_length;
+      rules += sizeof(ip6_address_t) * 0x1 << d->psid_length;
+    }
+    domains += sizeof(*d);
+    domaincount++;
+  }));
+  /* *INDENT-ON* */
+
+  vlib_cli_output (vm, "MAP domains structure: %d\n", sizeof (map_domain_t));
+  vlib_cli_output (vm, "MAP domains: %d (%d bytes)\n", domaincount, domains);
+  vlib_cli_output (vm, "MAP rules: %d (%d bytes)\n", rulecount, rules);
+  vlib_cli_output (vm, "Total: %d bytes)\n", rules + domains);
+
+#if MAP_SKIP_IP6_LOOKUP
+  vlib_cli_output (vm,
+		   "MAP pre-resolve: IP6 next-hop: %U (%u), IP4 next-hop: %U (%u)\n",
+		   format_ip6_address, &mm->preresolve_ip6, mm->adj6_index,
+		   format_ip4_address, &mm->preresolve_ip4, mm->adj4_index);
+#endif
+
+  if (mm->tc_copy)
+    vlib_cli_output (vm, "MAP traffic-class: copy");
+  else
+    vlib_cli_output (vm, "MAP traffic-class: %x", mm->tc);
+
+  vlib_cli_output (vm,
+		   "MAP IPv6 inbound security check: %s, fragmented packet security check: %s",
+		   mm->sec_check ? "enabled" : "disabled",
+		   mm->sec_check_frag ? "enabled" : "disabled");
+
+  vlib_cli_output (vm, "ICMP-relay IPv4 source address: %U\n",
+		   format_ip4_address, &mm->icmp4_src_address);
+  vlib_cli_output (vm, "ICMP6 unreachables sent for unmatched packets: %s\n",
+		   mm->icmp6_enabled ? "enabled" : "disabled");
+  vlib_cli_output (vm, "Inner fragmentation: %s\n",
+		   mm->frag_inner ? "enabled" : "disabled");
+  vlib_cli_output (vm, "Fragment packets regardless of DF flag: %s\n",
+		   mm->frag_ignore_df ? "enabled" : "disabled");
+
+  /*
+   * Counters
+   */
+  vlib_combined_counter_main_t *cm = mm->domain_counters;
+  u64 total_pkts[MAP_N_DOMAIN_COUNTER];
+  u64 total_bytes[MAP_N_DOMAIN_COUNTER];
+  int which, i;
+  vlib_counter_t v;
+
+  memset (total_pkts, 0, sizeof (total_pkts));
+  memset (total_bytes, 0, sizeof (total_bytes));
+
+  map_domain_counter_lock (mm);
+  vec_foreach (cm, mm->domain_counters)
+  {
+    which = cm - mm->domain_counters;
+
+    for (i = 0; i < vec_len (cm->maxi); i++)
+      {
+	vlib_get_combined_counter (cm, i, &v);
+	total_pkts[which] += v.packets;
+	total_bytes[which] += v.bytes;
+      }
+  }
+  map_domain_counter_unlock (mm);
+
+  vlib_cli_output (vm, "Encapsulated packets: %lld bytes: %lld\n",
+		   total_pkts[MAP_DOMAIN_COUNTER_TX],
+		   total_bytes[MAP_DOMAIN_COUNTER_TX]);
+  vlib_cli_output (vm, "Decapsulated packets: %lld bytes: %lld\n",
+		   total_pkts[MAP_DOMAIN_COUNTER_RX],
+		   total_bytes[MAP_DOMAIN_COUNTER_RX]);
+
+  vlib_cli_output (vm, "ICMP relayed packets: %d\n",
+		   vlib_get_simple_counter (&mm->icmp_relayed, 0));
+
+  return 0;
+}
+
+static clib_error_t *
+map_params_reass_command_fn (vlib_main_t * vm, unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 lifetime = ~0;
+  f64 ht_ratio = (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1);
+  u32 pool_size = ~0;
+  u64 buffers = ~(0ull);
+  u8 ip4 = 0, ip6 = 0;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "lifetime %u", &lifetime))
+	;
+      else if (unformat (line_input, "ht-ratio %lf", &ht_ratio))
+	;
+      else if (unformat (line_input, "pool-size %u", &pool_size))
+	;
+      else if (unformat (line_input, "buffers %llu", &buffers))
+	;
+      else if (unformat (line_input, "ip4"))
+	ip4 = 1;
+      else if (unformat (line_input, "ip6"))
+	ip6 = 1;
+      else
+	{
+	  unformat_free (line_input);
+	  return clib_error_return (0, "invalid input");
+	}
+    }
+  unformat_free (line_input);
+
+  if (!ip4 && !ip6)
+    return clib_error_return (0, "must specify ip4 and/or ip6");
+
+  if (ip4)
+    {
+      if (pool_size != ~0 && pool_size > MAP_IP4_REASS_CONF_POOL_SIZE_MAX)
+	return clib_error_return (0, "invalid ip4-reass pool-size ( > %d)",
+				  MAP_IP4_REASS_CONF_POOL_SIZE_MAX);
+      if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1)
+	  && ht_ratio > MAP_IP4_REASS_CONF_HT_RATIO_MAX)
+	return clib_error_return (0, "invalid ip4-reass ht-ratio ( > %d)",
+				  MAP_IP4_REASS_CONF_HT_RATIO_MAX);
+      if (lifetime != ~0 && lifetime > MAP_IP4_REASS_CONF_LIFETIME_MAX)
+	return clib_error_return (0, "invalid ip4-reass lifetime ( > %d)",
+				  MAP_IP4_REASS_CONF_LIFETIME_MAX);
+      if (buffers != ~(0ull) && buffers > MAP_IP4_REASS_CONF_BUFFERS_MAX)
+	return clib_error_return (0, "invalid ip4-reass buffers ( > %ld)",
+				  MAP_IP4_REASS_CONF_BUFFERS_MAX);
+    }
+
+  if (ip6)
+    {
+      if (pool_size != ~0 && pool_size > MAP_IP6_REASS_CONF_POOL_SIZE_MAX)
+	return clib_error_return (0, "invalid ip6-reass pool-size ( > %d)",
+				  MAP_IP6_REASS_CONF_POOL_SIZE_MAX);
+      if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1)
+	  && ht_ratio > MAP_IP6_REASS_CONF_HT_RATIO_MAX)
+	return clib_error_return (0, "invalid ip6-reass ht-log2len ( > %d)",
+				  MAP_IP6_REASS_CONF_HT_RATIO_MAX);
+      if (lifetime != ~0 && lifetime > MAP_IP6_REASS_CONF_LIFETIME_MAX)
+	return clib_error_return (0, "invalid ip6-reass lifetime ( > %d)",
+				  MAP_IP6_REASS_CONF_LIFETIME_MAX);
+      if (buffers != ~(0ull) && buffers > MAP_IP6_REASS_CONF_BUFFERS_MAX)
+	return clib_error_return (0, "invalid ip6-reass buffers ( > %ld)",
+				  MAP_IP6_REASS_CONF_BUFFERS_MAX);
+    }
+
+  if (ip4)
+    {
+      u32 reass = 0, packets = 0;
+      if (pool_size != ~0)
+	{
+	  if (map_ip4_reass_conf_pool_size (pool_size, &reass, &packets))
+	    {
+	      vlib_cli_output (vm, "Could not set ip4-reass pool-size");
+	    }
+	  else
+	    {
+	      vlib_cli_output (vm,
+			       "Setting ip4-reass pool-size (destroyed-reassembly=%u , dropped-fragments=%u)",
+			       reass, packets);
+	    }
+	}
+      if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1))
+	{
+	  if (map_ip4_reass_conf_ht_ratio (ht_ratio, &reass, &packets))
+	    {
+	      vlib_cli_output (vm, "Could not set ip4-reass ht-log2len");
+	    }
+	  else
+	    {
+	      vlib_cli_output (vm,
+			       "Setting ip4-reass ht-log2len (destroyed-reassembly=%u , dropped-fragments=%u)",
+			       reass, packets);
+	    }
+	}
+      if (lifetime != ~0)
+	{
+	  if (map_ip4_reass_conf_lifetime (lifetime))
+	    vlib_cli_output (vm, "Could not set ip4-reass lifetime");
+	  else
+	    vlib_cli_output (vm, "Setting ip4-reass lifetime");
+	}
+      if (buffers != ~(0ull))
+	{
+	  if (map_ip4_reass_conf_buffers (buffers))
+	    vlib_cli_output (vm, "Could not set ip4-reass buffers");
+	  else
+	    vlib_cli_output (vm, "Setting ip4-reass buffers");
+	}
+
+      if (map_main.ip4_reass_conf_buffers >
+	  map_main.ip4_reass_conf_pool_size *
+	  MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY)
+	{
+	  vlib_cli_output (vm,
+			   "Note: 'ip4-reass buffers' > pool-size * max-fragments-per-reassembly.");
+	}
+    }
+
+  if (ip6)
+    {
+      u32 reass = 0, packets = 0;
+      if (pool_size != ~0)
+	{
+	  if (map_ip6_reass_conf_pool_size (pool_size, &reass, &packets))
+	    {
+	      vlib_cli_output (vm, "Could not set ip6-reass pool-size");
+	    }
+	  else
+	    {
+	      vlib_cli_output (vm,
+			       "Setting ip6-reass pool-size (destroyed-reassembly=%u , dropped-fragments=%u)",
+			       reass, packets);
+	    }
+	}
+      if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1))
+	{
+	  if (map_ip6_reass_conf_ht_ratio (ht_ratio, &reass, &packets))
+	    {
+	      vlib_cli_output (vm, "Could not set ip6-reass ht-log2len");
+	    }
+	  else
+	    {
+	      vlib_cli_output (vm,
+			       "Setting ip6-reass ht-log2len (destroyed-reassembly=%u , dropped-fragments=%u)",
+			       reass, packets);
+	    }
+	}
+      if (lifetime != ~0)
+	{
+	  if (map_ip6_reass_conf_lifetime (lifetime))
+	    vlib_cli_output (vm, "Could not set ip6-reass lifetime");
+	  else
+	    vlib_cli_output (vm, "Setting ip6-reass lifetime");
+	}
+      if (buffers != ~(0ull))
+	{
+	  if (map_ip6_reass_conf_buffers (buffers))
+	    vlib_cli_output (vm, "Could not set ip6-reass buffers");
+	  else
+	    vlib_cli_output (vm, "Setting ip6-reass buffers");
+	}
+
+      if (map_main.ip6_reass_conf_buffers >
+	  map_main.ip6_reass_conf_pool_size *
+	  MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY)
+	{
+	  vlib_cli_output (vm,
+			   "Note: 'ip6-reass buffers' > pool-size * max-fragments-per-reassembly.");
+	}
+    }
+
+  return 0;
+}
+
+
+/*
+ * packet trace format function
+ */
+u8 *
+format_map_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  map_trace_t *t = va_arg (*args, map_trace_t *);
+  u32 map_domain_index = t->map_domain_index;
+  u16 port = t->port;
+
+  s =
+    format (s, "MAP domain index: %d L4 port: %u", map_domain_index,
+	    clib_net_to_host_u16 (port));
+
+  return s;
+}
+
+static_always_inline map_ip4_reass_t *
+map_ip4_reass_lookup (map_ip4_reass_key_t * k, u32 bucket, f64 now)
+{
+  map_main_t *mm = &map_main;
+  u32 ri = mm->ip4_reass_hash_table[bucket];
+  while (ri != MAP_REASS_INDEX_NONE)
+    {
+      map_ip4_reass_t *r = pool_elt_at_index (mm->ip4_reass_pool, ri);
+      if (r->key.as_u64[0] == k->as_u64[0] &&
+	  r->key.as_u64[1] == k->as_u64[1] &&
+	  now < r->ts + (((f64) mm->ip4_reass_conf_lifetime_ms) / 1000))
+	{
+	  return r;
+	}
+      ri = r->bucket_next;
+    }
+  return NULL;
+}
+
+#define map_ip4_reass_pool_index(r) (r - map_main.ip4_reass_pool)
+
+void
+map_ip4_reass_free (map_ip4_reass_t * r, u32 ** pi_to_drop)
+{
+  map_main_t *mm = &map_main;
+  map_ip4_reass_get_fragments (r, pi_to_drop);
+
+  // Unlink in hash bucket
+  map_ip4_reass_t *r2 = NULL;
+  u32 r2i = mm->ip4_reass_hash_table[r->bucket];
+  while (r2i != map_ip4_reass_pool_index (r))
+    {
+      ASSERT (r2i != MAP_REASS_INDEX_NONE);
+      r2 = pool_elt_at_index (mm->ip4_reass_pool, r2i);
+      r2i = r2->bucket_next;
+    }
+  if (r2)
+    {
+      r2->bucket_next = r->bucket_next;
+    }
+  else
+    {
+      mm->ip4_reass_hash_table[r->bucket] = r->bucket_next;
+    }
+
+  // Unlink in list
+  if (r->fifo_next == map_ip4_reass_pool_index (r))
+    {
+      mm->ip4_reass_fifo_last = MAP_REASS_INDEX_NONE;
+    }
+  else
+    {
+      if (mm->ip4_reass_fifo_last == map_ip4_reass_pool_index (r))
+	mm->ip4_reass_fifo_last = r->fifo_prev;
+      pool_elt_at_index (mm->ip4_reass_pool, r->fifo_prev)->fifo_next =
+	r->fifo_next;
+      pool_elt_at_index (mm->ip4_reass_pool, r->fifo_next)->fifo_prev =
+	r->fifo_prev;
+    }
+
+  pool_put (mm->ip4_reass_pool, r);
+  mm->ip4_reass_allocated--;
+}
+
+map_ip4_reass_t *
+map_ip4_reass_get (u32 src, u32 dst, u16 fragment_id,
+		   u8 protocol, u32 ** pi_to_drop)
+{
+  map_ip4_reass_t *r;
+  map_main_t *mm = &map_main;
+  map_ip4_reass_key_t k = {.src.data_u32 = src,
+    .dst.data_u32 = dst,
+    .fragment_id = fragment_id,
+    .protocol = protocol
+  };
+
+  u32 h = 0;
+  h = crc_u32 (k.as_u32[0], h);
+  h = crc_u32 (k.as_u32[1], h);
+  h = crc_u32 (k.as_u32[2], h);
+  h = crc_u32 (k.as_u32[3], h);
+  h = h >> (32 - mm->ip4_reass_ht_log2len);
+
+  f64 now = vlib_time_now (mm->vlib_main);
+
+  //Cache garbage collection
+  while (mm->ip4_reass_fifo_last != MAP_REASS_INDEX_NONE)
+    {
+      map_ip4_reass_t *last =
+	pool_elt_at_index (mm->ip4_reass_pool, mm->ip4_reass_fifo_last);
+      if (last->ts + (((f64) mm->ip4_reass_conf_lifetime_ms) / 1000) < now)
+	map_ip4_reass_free (last, pi_to_drop);
+      else
+	break;
+    }
+
+  if ((r = map_ip4_reass_lookup (&k, h, now)))
+    return r;
+
+  if (mm->ip4_reass_allocated >= mm->ip4_reass_conf_pool_size)
+    return NULL;
+
+  pool_get (mm->ip4_reass_pool, r);
+  mm->ip4_reass_allocated++;
+  int i;
+  for (i = 0; i < MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+    r->fragments[i] = ~0;
+
+  u32 ri = map_ip4_reass_pool_index (r);
+
+  //Link in new bucket
+  r->bucket = h;
+  r->bucket_next = mm->ip4_reass_hash_table[h];
+  mm->ip4_reass_hash_table[h] = ri;
+
+  //Link in fifo
+  if (mm->ip4_reass_fifo_last != MAP_REASS_INDEX_NONE)
+    {
+      r->fifo_next =
+	pool_elt_at_index (mm->ip4_reass_pool,
+			   mm->ip4_reass_fifo_last)->fifo_next;
+      r->fifo_prev = mm->ip4_reass_fifo_last;
+      pool_elt_at_index (mm->ip4_reass_pool, r->fifo_prev)->fifo_next = ri;
+      pool_elt_at_index (mm->ip4_reass_pool, r->fifo_next)->fifo_prev = ri;
+    }
+  else
+    {
+      r->fifo_next = r->fifo_prev = ri;
+      mm->ip4_reass_fifo_last = ri;
+    }
+
+  //Set other fields
+  r->ts = now;
+  r->key = k;
+  r->port = -1;
+#ifdef MAP_IP4_REASS_COUNT_BYTES
+  r->expected_total = 0xffff;
+  r->forwarded = 0;
+#endif
+
+  return r;
+}
+
+int
+map_ip4_reass_add_fragment (map_ip4_reass_t * r, u32 pi)
+{
+  if (map_main.ip4_reass_buffered_counter >= map_main.ip4_reass_conf_buffers)
+    return -1;
+
+  int i;
+  for (i = 0; i < MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+    if (r->fragments[i] == ~0)
+      {
+	r->fragments[i] = pi;
+	map_main.ip4_reass_buffered_counter++;
+	return 0;
+      }
+  return -1;
+}
+
+static_always_inline map_ip6_reass_t *
+map_ip6_reass_lookup (map_ip6_reass_key_t * k, u32 bucket, f64 now)
+{
+  map_main_t *mm = &map_main;
+  u32 ri = mm->ip6_reass_hash_table[bucket];
+  while (ri != MAP_REASS_INDEX_NONE)
+    {
+      map_ip6_reass_t *r = pool_elt_at_index (mm->ip6_reass_pool, ri);
+      if (now < r->ts + (((f64) mm->ip6_reass_conf_lifetime_ms) / 1000) &&
+	  r->key.as_u64[0] == k->as_u64[0] &&
+	  r->key.as_u64[1] == k->as_u64[1] &&
+	  r->key.as_u64[2] == k->as_u64[2] &&
+	  r->key.as_u64[3] == k->as_u64[3] &&
+	  r->key.as_u64[4] == k->as_u64[4])
+	return r;
+      ri = r->bucket_next;
+    }
+  return NULL;
+}
+
+#define map_ip6_reass_pool_index(r) (r - map_main.ip6_reass_pool)
+
+void
+map_ip6_reass_free (map_ip6_reass_t * r, u32 ** pi_to_drop)
+{
+  map_main_t *mm = &map_main;
+  int i;
+  for (i = 0; i < MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+    if (r->fragments[i].pi != ~0)
+      {
+	vec_add1 (*pi_to_drop, r->fragments[i].pi);
+	r->fragments[i].pi = ~0;
+	map_main.ip6_reass_buffered_counter--;
+      }
+
+  // Unlink in hash bucket
+  map_ip6_reass_t *r2 = NULL;
+  u32 r2i = mm->ip6_reass_hash_table[r->bucket];
+  while (r2i != map_ip6_reass_pool_index (r))
+    {
+      ASSERT (r2i != MAP_REASS_INDEX_NONE);
+      r2 = pool_elt_at_index (mm->ip6_reass_pool, r2i);
+      r2i = r2->bucket_next;
+    }
+  if (r2)
+    {
+      r2->bucket_next = r->bucket_next;
+    }
+  else
+    {
+      mm->ip6_reass_hash_table[r->bucket] = r->bucket_next;
+    }
+
+  // Unlink in list
+  if (r->fifo_next == map_ip6_reass_pool_index (r))
+    {
+      //Single element in the list, list is now empty
+      mm->ip6_reass_fifo_last = MAP_REASS_INDEX_NONE;
+    }
+  else
+    {
+      if (mm->ip6_reass_fifo_last == map_ip6_reass_pool_index (r))	//First element
+	mm->ip6_reass_fifo_last = r->fifo_prev;
+      pool_elt_at_index (mm->ip6_reass_pool, r->fifo_prev)->fifo_next =
+	r->fifo_next;
+      pool_elt_at_index (mm->ip6_reass_pool, r->fifo_next)->fifo_prev =
+	r->fifo_prev;
+    }
+
+  // Free from pool if necessary
+  pool_put (mm->ip6_reass_pool, r);
+  mm->ip6_reass_allocated--;
+}
+
+map_ip6_reass_t *
+map_ip6_reass_get (ip6_address_t * src, ip6_address_t * dst, u32 fragment_id,
+		   u8 protocol, u32 ** pi_to_drop)
+{
+  map_ip6_reass_t *r;
+  map_main_t *mm = &map_main;
+  map_ip6_reass_key_t k = {
+    .src = *src,
+    .dst = *dst,
+    .fragment_id = fragment_id,
+    .protocol = protocol
+  };
+
+  u32 h = 0;
+  int i;
+  for (i = 0; i < 10; i++)
+    h = crc_u32 (k.as_u32[i], h);
+  h = h >> (32 - mm->ip6_reass_ht_log2len);
+
+  f64 now = vlib_time_now (mm->vlib_main);
+
+  //Cache garbage collection
+  while (mm->ip6_reass_fifo_last != MAP_REASS_INDEX_NONE)
+    {
+      map_ip6_reass_t *last =
+	pool_elt_at_index (mm->ip6_reass_pool, mm->ip6_reass_fifo_last);
+      if (last->ts + (((f64) mm->ip6_reass_conf_lifetime_ms) / 1000) < now)
+	map_ip6_reass_free (last, pi_to_drop);
+      else
+	break;
+    }
+
+  if ((r = map_ip6_reass_lookup (&k, h, now)))
+    return r;
+
+  if (mm->ip6_reass_allocated >= mm->ip6_reass_conf_pool_size)
+    return NULL;
+
+  pool_get (mm->ip6_reass_pool, r);
+  mm->ip6_reass_allocated++;
+  for (i = 0; i < MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+    {
+      r->fragments[i].pi = ~0;
+      r->fragments[i].next_data_len = 0;
+      r->fragments[i].next_data_offset = 0;
+    }
+
+  u32 ri = map_ip6_reass_pool_index (r);
+
+  //Link in new bucket
+  r->bucket = h;
+  r->bucket_next = mm->ip6_reass_hash_table[h];
+  mm->ip6_reass_hash_table[h] = ri;
+
+  //Link in fifo
+  if (mm->ip6_reass_fifo_last != MAP_REASS_INDEX_NONE)
+    {
+      r->fifo_next =
+	pool_elt_at_index (mm->ip6_reass_pool,
+			   mm->ip6_reass_fifo_last)->fifo_next;
+      r->fifo_prev = mm->ip6_reass_fifo_last;
+      pool_elt_at_index (mm->ip6_reass_pool, r->fifo_prev)->fifo_next = ri;
+      pool_elt_at_index (mm->ip6_reass_pool, r->fifo_next)->fifo_prev = ri;
+    }
+  else
+    {
+      r->fifo_next = r->fifo_prev = ri;
+      mm->ip6_reass_fifo_last = ri;
+    }
+
+  //Set other fields
+  r->ts = now;
+  r->key = k;
+  r->ip4_header.ip_version_and_header_length = 0;
+#ifdef MAP_IP6_REASS_COUNT_BYTES
+  r->expected_total = 0xffff;
+  r->forwarded = 0;
+#endif
+  return r;
+}
+
+int
+map_ip6_reass_add_fragment (map_ip6_reass_t * r, u32 pi,
+			    u16 data_offset, u16 next_data_offset,
+			    u8 * data_start, u16 data_len)
+{
+  map_ip6_fragment_t *f = NULL, *prev_f = NULL;
+  u16 copied_len = (data_len > 20) ? 20 : data_len;
+
+  if (map_main.ip6_reass_buffered_counter >= map_main.ip6_reass_conf_buffers)
+    return -1;
+
+  //Lookup for fragments for the current buffer
+  //and the one before that
+  int i;
+  for (i = 0; i < MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+    {
+      if (data_offset && r->fragments[i].next_data_offset == data_offset)
+	{
+	  prev_f = &r->fragments[i];	// This is buffer for previous packet
+	}
+      else if (r->fragments[i].next_data_offset == next_data_offset)
+	{
+	  f = &r->fragments[i];	// This is a buffer for the current packet
+	}
+      else if (r->fragments[i].next_data_offset == 0)
+	{			//Available
+	  if (f == NULL)
+	    f = &r->fragments[i];
+	  else if (prev_f == NULL)
+	    prev_f = &r->fragments[i];
+	}
+    }
+
+  if (!f || f->pi != ~0)
+    return -1;
+
+  if (data_offset)
+    {
+      if (!prev_f)
+	return -1;
+
+      clib_memcpy (prev_f->next_data, data_start, copied_len);
+      prev_f->next_data_len = copied_len;
+      prev_f->next_data_offset = data_offset;
+    }
+  else
+    {
+      if (((ip4_header_t *) data_start)->ip_version_and_header_length != 0x45)
+	return -1;
+
+      if (r->ip4_header.ip_version_and_header_length == 0)
+	clib_memcpy (&r->ip4_header, data_start, sizeof (ip4_header_t));
+    }
+
+  if (data_len > 20)
+    {
+      f->next_data_offset = next_data_offset;
+      f->pi = pi;
+      map_main.ip6_reass_buffered_counter++;
+    }
+  return 0;
+}
+
+void
+map_ip4_reass_reinit (u32 * trashed_reass, u32 * dropped_packets)
+{
+  map_main_t *mm = &map_main;
+  int i;
+
+  if (dropped_packets)
+    *dropped_packets = mm->ip4_reass_buffered_counter;
+  if (trashed_reass)
+    *trashed_reass = mm->ip4_reass_allocated;
+  if (mm->ip4_reass_fifo_last != MAP_REASS_INDEX_NONE)
+    {
+      u16 ri = mm->ip4_reass_fifo_last;
+      do
+	{
+	  map_ip4_reass_t *r = pool_elt_at_index (mm->ip4_reass_pool, ri);
+	  for (i = 0; i < MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+	    if (r->fragments[i] != ~0)
+	      map_ip4_drop_pi (r->fragments[i]);
+
+	  ri = r->fifo_next;
+	  pool_put (mm->ip4_reass_pool, r);
+	}
+      while (ri != mm->ip4_reass_fifo_last);
+    }
+
+  vec_free (mm->ip4_reass_hash_table);
+  vec_resize (mm->ip4_reass_hash_table, 1 << mm->ip4_reass_ht_log2len);
+  for (i = 0; i < (1 << mm->ip4_reass_ht_log2len); i++)
+    mm->ip4_reass_hash_table[i] = MAP_REASS_INDEX_NONE;
+  pool_free (mm->ip4_reass_pool);
+  pool_alloc (mm->ip4_reass_pool, mm->ip4_reass_conf_pool_size);
+
+  mm->ip4_reass_allocated = 0;
+  mm->ip4_reass_fifo_last = MAP_REASS_INDEX_NONE;
+  mm->ip4_reass_buffered_counter = 0;
+}
+
+u8
+map_get_ht_log2len (f32 ht_ratio, u16 pool_size)
+{
+  u32 desired_size = (u32) (pool_size * ht_ratio);
+  u8 i;
+  for (i = 1; i < 31; i++)
+    if ((1 << i) >= desired_size)
+      return i;
+  return 4;
+}
+
+int
+map_ip4_reass_conf_ht_ratio (f32 ht_ratio, u32 * trashed_reass,
+			     u32 * dropped_packets)
+{
+  map_main_t *mm = &map_main;
+  if (ht_ratio > MAP_IP4_REASS_CONF_HT_RATIO_MAX)
+    return -1;
+
+  map_ip4_reass_lock ();
+  mm->ip4_reass_conf_ht_ratio = ht_ratio;
+  mm->ip4_reass_ht_log2len =
+    map_get_ht_log2len (ht_ratio, mm->ip4_reass_conf_pool_size);
+  map_ip4_reass_reinit (trashed_reass, dropped_packets);
+  map_ip4_reass_unlock ();
+  return 0;
+}
+
+int
+map_ip4_reass_conf_pool_size (u16 pool_size, u32 * trashed_reass,
+			      u32 * dropped_packets)
+{
+  map_main_t *mm = &map_main;
+  if (pool_size > MAP_IP4_REASS_CONF_POOL_SIZE_MAX)
+    return -1;
+
+  map_ip4_reass_lock ();
+  mm->ip4_reass_conf_pool_size = pool_size;
+  map_ip4_reass_reinit (trashed_reass, dropped_packets);
+  map_ip4_reass_unlock ();
+  return 0;
+}
+
+int
+map_ip4_reass_conf_lifetime (u16 lifetime_ms)
+{
+  map_main.ip4_reass_conf_lifetime_ms = lifetime_ms;
+  return 0;
+}
+
+int
+map_ip4_reass_conf_buffers (u32 buffers)
+{
+  map_main.ip4_reass_conf_buffers = buffers;
+  return 0;
+}
+
+void
+map_ip6_reass_reinit (u32 * trashed_reass, u32 * dropped_packets)
+{
+  map_main_t *mm = &map_main;
+  if (dropped_packets)
+    *dropped_packets = mm->ip6_reass_buffered_counter;
+  if (trashed_reass)
+    *trashed_reass = mm->ip6_reass_allocated;
+  int i;
+  if (mm->ip6_reass_fifo_last != MAP_REASS_INDEX_NONE)
+    {
+      u16 ri = mm->ip6_reass_fifo_last;
+      do
+	{
+	  map_ip6_reass_t *r = pool_elt_at_index (mm->ip6_reass_pool, ri);
+	  for (i = 0; i < MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+	    if (r->fragments[i].pi != ~0)
+	      map_ip6_drop_pi (r->fragments[i].pi);
+
+	  ri = r->fifo_next;
+	  pool_put (mm->ip6_reass_pool, r);
+	}
+      while (ri != mm->ip6_reass_fifo_last);
+      mm->ip6_reass_fifo_last = MAP_REASS_INDEX_NONE;
+    }
+
+  vec_free (mm->ip6_reass_hash_table);
+  vec_resize (mm->ip6_reass_hash_table, 1 << mm->ip6_reass_ht_log2len);
+  for (i = 0; i < (1 << mm->ip6_reass_ht_log2len); i++)
+    mm->ip6_reass_hash_table[i] = MAP_REASS_INDEX_NONE;
+  pool_free (mm->ip6_reass_pool);
+  pool_alloc (mm->ip6_reass_pool, mm->ip4_reass_conf_pool_size);
+
+  mm->ip6_reass_allocated = 0;
+  mm->ip6_reass_buffered_counter = 0;
+}
+
+int
+map_ip6_reass_conf_ht_ratio (f32 ht_ratio, u32 * trashed_reass,
+			     u32 * dropped_packets)
+{
+  map_main_t *mm = &map_main;
+  if (ht_ratio > MAP_IP6_REASS_CONF_HT_RATIO_MAX)
+    return -1;
+
+  map_ip6_reass_lock ();
+  mm->ip6_reass_conf_ht_ratio = ht_ratio;
+  mm->ip6_reass_ht_log2len =
+    map_get_ht_log2len (ht_ratio, mm->ip6_reass_conf_pool_size);
+  map_ip6_reass_reinit (trashed_reass, dropped_packets);
+  map_ip6_reass_unlock ();
+  return 0;
+}
+
+int
+map_ip6_reass_conf_pool_size (u16 pool_size, u32 * trashed_reass,
+			      u32 * dropped_packets)
+{
+  map_main_t *mm = &map_main;
+  if (pool_size > MAP_IP6_REASS_CONF_POOL_SIZE_MAX)
+    return -1;
+
+  map_ip6_reass_lock ();
+  mm->ip6_reass_conf_pool_size = pool_size;
+  map_ip6_reass_reinit (trashed_reass, dropped_packets);
+  map_ip6_reass_unlock ();
+  return 0;
+}
+
+int
+map_ip6_reass_conf_lifetime (u16 lifetime_ms)
+{
+  map_main.ip6_reass_conf_lifetime_ms = lifetime_ms;
+  return 0;
+}
+
+int
+map_ip6_reass_conf_buffers (u32 buffers)
+{
+  map_main.ip6_reass_conf_buffers = buffers;
+  return 0;
+}
+
+/* *INDENT-OFF* */
+
+/*?
+ * Configure MAP reassembly behaviour
+ *
+ * @cliexpar
+ * @cliexstart{map params reassembly}
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(map_ip4_reass_lifetime_command, static) = {
+  .path = "map params reassembly",
+  .short_help = "map params reassembly [ip4 | ip6] [lifetime <lifetime-ms>] "
+                "[pool-size <pool-size>] [buffers <buffers>] "
+                "[ht-ratio <ht-ratio>]",
+  .function = map_params_reass_command_fn,
+};
+
+/*?
+ * Set or copy the IP TOS/Traffic Class field
+ *
+ * @cliexpar
+ * @cliexstart{map params traffic-class}
+ *
+ * This command is used to set the traffic-class field in translated
+ * or encapsulated packets. If copy is specifed (the default) then the
+ * traffic-class/TOS field is copied from the original packet to the
+ * translated / encapsulating header.
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(map_traffic_class_command, static) = {
+  .path = "map params traffic-class",
+  .short_help = "map params traffic-class {0x0-0xff | copy}",
+  .function = map_traffic_class_command_fn,
+};
+
+/*?
+ * Bypass IP4/IP6 lookup
+ *
+ * @cliexpar
+ * @cliexstart{map params pre-resolve}
+ *
+ * Bypass a second FIB lookup of the translated or encapsulated
+ * packet, and forward the packet directly to the specified
+ * next-hop. This optimization trades forwarding flexibility for
+ * performance.
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(map_pre_resolve_command, static) = {
+  .path = "map params pre-resolve",
+  .short_help = " map params pre-resolve {ip4-nh <address>} "
+                "| {ip6-nh <address>}",
+  .function = map_pre_resolve_command_fn,
+};
+
+/*?
+ * Enable or disable the MAP-E inbound security check
+ *
+ * @cliexpar
+ * @cliexstart{map params security-check}
+ *
+ * By default, a decapsulated packet's IPv4 source address will be
+ * verified against the outer header's IPv6 source address. Disabling
+ * this feature will allow IPv4 source address spoofing.
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(map_security_check_command, static) = {
+  .path = "map params security-check",
+  .short_help = "map params security-check on|off",
+  .function = map_security_check_command_fn,
+};
+
+/*?
+ * Specifiy the IPv4 source address used for relayed ICMP error messages
+ *
+ * @cliexpar
+ * @cliexstart{map params icmp source-address}
+ *
+ * This command specifies which IPv4 source address (must be local to
+ * the system), that is used for relayed received IPv6 ICMP error
+ * messages.
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(map_icmp_relay_source_address_command, static) = {
+  .path = "map params icmp source-address",
+  .short_help = "map params icmp source-address <ip4-address>",
+  .function = map_icmp_relay_source_address_command_fn,
+};
+
+/*?
+ * Send IPv6 ICMP unreachables
+ *
+ * @cliexpar
+ * @cliexstart{map params icmp6 unreachables}
+ *
+ * Send IPv6 ICMP unreachable messages back if security check fails or
+ * no MAP domain exists.
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(map_icmp_unreachables_command, static) = {
+  .path = "map params icmp6 unreachables",
+  .short_help = "map params icmp6 unreachables {on|off}",
+  .function = map_icmp_unreachables_command_fn,
+};
+
+/*?
+ * Configure MAP fragmentation behaviour
+ *
+ * @cliexpar
+ * @cliexstart{map params fragment}
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(map_fragment_command, static) = {
+  .path = "map params fragment",
+  .short_help = "map params fragment inner|outer",
+  .function = map_fragment_command_fn,
+};
+
+/*?
+ * Ignore the IPv4 Don't fragment bit
+ *
+ * @cliexpar
+ * @cliexstart{map params fragment ignore-df}
+ *
+ * Allows fragmentation of the IPv4 packet even if the DF bit is
+ * set. The choice between inner or outer fragmentation of tunnel
+ * packets is complicated. The benefit of inner fragmentation is that
+ * the ultimate endpoint must reassemble, instead of the tunnel
+ * endpoint.
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(map_fragment_df_command, static) = {
+  .path = "map params fragment ignore-df",
+  .short_help = "map params fragment ignore-df on|off",
+  .function = map_fragment_df_command_fn,
+};
+
+/*?
+ * Specifiy if the inbound security check should be done on fragments
+ *
+ * @cliexpar
+ * @cliexstart{map params security-check fragments}
+ *
+ * Typically the inbound on-decapsulation security check is only done
+ * on the first packet. The packet that contains the L4
+ * information. While a security check on every fragment is possible,
+ * it has a cost. State must be created on the first fragment.
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(map_security_check_frag_command, static) = {
+  .path = "map params security-check fragments",
+  .short_help = "map params security-check fragments on|off",
+  .function = map_security_check_frag_command_fn,
+};
+
+/*?
+ * Add MAP domain
+ *
+ * @cliexpar
+ * @cliexstart{map add domain}
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(map_add_domain_command, static) = {
+  .path = "map add domain",
+  .short_help = "map add domain ip4-pfx <ip4-pfx> ip6-pfx <ip6-pfx> "
+      "ip6-src <ip6-pfx> ea-bits-len <n> psid-offset <n> psid-len <n> "
+      "[map-t] [mtu <mtu>]",
+  .function = map_add_domain_command_fn,
+};
+
+/*?
+ * Add MAP rule to a domain
+ *
+ * @cliexpar
+ * @cliexstart{map add rule}
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(map_add_rule_command, static) = {
+  .path = "map add rule",
+  .short_help = "map add rule index <domain> psid <psid> ip6-dst <ip6-addr>",
+  .function = map_add_rule_command_fn,
+};
+
+/*?
+ * Delete MAP domain
+ *
+ * @cliexpar
+ * @cliexstart{map del domain}
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(map_del_command, static) = {
+  .path = "map del domain",
+  .short_help = "map del domain index <domain>",
+  .function = map_del_domain_command_fn,
+};
+
+/*?
+ * Show MAP domains
+ *
+ * @cliexpar
+ * @cliexstart{show map domain}
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(show_map_domain_command, static) = {
+  .path = "show map domain",
+  .short_help = "show map domain index <n> [counters]",
+  .function = show_map_domain_command_fn,
+};
+
+/*?
+ * Show MAP statistics
+ *
+ * @cliexpar
+ * @cliexstart{show map stats}
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(show_map_stats_command, static) = {
+  .path = "show map stats",
+  .short_help = "show map stats",
+  .function = show_map_stats_command_fn,
+};
+
+/*?
+ * Show MAP fragmentation information
+ *
+ * @cliexpar
+ * @cliexstart{show map fragments}
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND(show_map_fragments_command, static) = {
+  .path = "show map fragments",
+  .short_help = "show map fragments",
+  .function = show_map_fragments_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * map_init
+ */
+clib_error_t *
+map_init (vlib_main_t * vm)
+{
+  map_main_t *mm = &map_main;
+  mm->vnet_main = vnet_get_main ();
+  mm->vlib_main = vm;
+
+#ifdef MAP_SKIP_IP6_LOOKUP
+  memset (&mm->preresolve_ip4, 0, sizeof (mm->preresolve_ip4));
+  memset (&mm->preresolve_ip6, 0, sizeof (mm->preresolve_ip6));
+  mm->adj4_index = 0;
+  mm->adj6_index = 0;
+#endif
+
+  /* traffic class */
+  mm->tc = 0;
+  mm->tc_copy = true;
+
+  /* Inbound security check */
+  mm->sec_check = true;
+  mm->sec_check_frag = false;
+
+  /* ICMP6 Type 1, Code 5 for security check failure */
+  mm->icmp6_enabled = false;
+
+  /* Inner or outer fragmentation */
+  mm->frag_inner = false;
+  mm->frag_ignore_df = false;
+
+  vec_validate (mm->domain_counters, MAP_N_DOMAIN_COUNTER - 1);
+  mm->domain_counters[MAP_DOMAIN_COUNTER_RX].name = "rx";
+  mm->domain_counters[MAP_DOMAIN_COUNTER_TX].name = "tx";
+
+  vlib_validate_simple_counter (&mm->icmp_relayed, 0);
+  vlib_zero_simple_counter (&mm->icmp_relayed, 0);
+
+  /* IP4 virtual reassembly */
+  mm->ip4_reass_hash_table = 0;
+  mm->ip4_reass_pool = 0;
+  mm->ip4_reass_lock =
+    clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
+  mm->ip4_reass_conf_ht_ratio = MAP_IP4_REASS_HT_RATIO_DEFAULT;
+  mm->ip4_reass_conf_lifetime_ms = MAP_IP4_REASS_LIFETIME_DEFAULT;
+  mm->ip4_reass_conf_pool_size = MAP_IP4_REASS_POOL_SIZE_DEFAULT;
+  mm->ip4_reass_conf_buffers = MAP_IP4_REASS_BUFFERS_DEFAULT;
+  mm->ip4_reass_ht_log2len =
+    map_get_ht_log2len (mm->ip4_reass_conf_ht_ratio,
+			mm->ip4_reass_conf_pool_size);
+  mm->ip4_reass_fifo_last = MAP_REASS_INDEX_NONE;
+  map_ip4_reass_reinit (NULL, NULL);
+
+  /* IP6 virtual reassembly */
+  mm->ip6_reass_hash_table = 0;
+  mm->ip6_reass_pool = 0;
+  mm->ip6_reass_lock =
+    clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
+  mm->ip6_reass_conf_ht_ratio = MAP_IP6_REASS_HT_RATIO_DEFAULT;
+  mm->ip6_reass_conf_lifetime_ms = MAP_IP6_REASS_LIFETIME_DEFAULT;
+  mm->ip6_reass_conf_pool_size = MAP_IP6_REASS_POOL_SIZE_DEFAULT;
+  mm->ip6_reass_conf_buffers = MAP_IP6_REASS_BUFFERS_DEFAULT;
+  mm->ip6_reass_ht_log2len =
+    map_get_ht_log2len (mm->ip6_reass_conf_ht_ratio,
+			mm->ip6_reass_conf_pool_size);
+  mm->ip6_reass_fifo_last = MAP_REASS_INDEX_NONE;
+  map_ip6_reass_reinit (NULL, NULL);
+
+  map_dpo_module_init ();
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (map_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/map/map.h b/src/vnet/map/map.h
new file mode 100644
index 00000000..f446b739
--- /dev/null
+++ b/src/vnet/map/map.h
@@ -0,0 +1,591 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <stdbool.h>
+#include <vppinfra/error.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vlib/vlib.h>
+#include <vnet/fib/fib_types.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/adj/adj.h>
+#include <vnet/map/map_dpo.h>
+#include <vnet/dpo/load_balance.h>
+
+#define MAP_SKIP_IP6_LOOKUP 1
+
+typedef enum
+{
+  MAP_SENDER,
+  MAP_RECEIVER
+} map_dir_e;
+
+int map_create_domain (ip4_address_t * ip4_prefix, u8 ip4_prefix_len,
+		       ip6_address_t * ip6_prefix, u8 ip6_prefix_len,
+		       ip6_address_t * ip6_src, u8 ip6_src_len,
+		       u8 ea_bits_len, u8 psid_offset, u8 psid_length,
+		       u32 * map_domain_index, u16 mtu, u8 flags);
+int map_delete_domain (u32 map_domain_index);
+int map_add_del_psid (u32 map_domain_index, u16 psid, ip6_address_t * tep,
+		      u8 is_add);
+u8 *format_map_trace (u8 * s, va_list * args);
+i32 ip4_get_port (ip4_header_t * ip, map_dir_e dir, u16 buffer_len);
+i32 ip6_get_port (ip6_header_t * ip6, map_dir_e dir, u16 buffer_len);
+u16 ip4_map_get_port (ip4_header_t * ip, map_dir_e dir);
+
+typedef enum __attribute__ ((__packed__))
+{
+  MAP_DOMAIN_PREFIX = 1 << 0, MAP_DOMAIN_TRANSLATION = 1 << 1,	// The domain uses MAP-T
+} map_domain_flags_e;
+
+/**
+ * IP4 reassembly logic:
+ * One virtually reassembled flow requires a map_ip4_reass_t structure in order
+ * to keep the first-fragment port number and, optionally, cache out of sequence
+ * packets.
+ * There are up to MAP_IP4_REASS_MAX_REASSEMBLY such structures.
+ * When in use, those structures are stored in a hash table of MAP_IP4_REASS_BUCKETS buckets.
+ * When a new structure needs to be used, it is allocated from available ones.
+ * If there is no structure available, the oldest in use is selected and used if and
+ * only if it was first allocated more than MAP_IP4_REASS_LIFETIME seconds ago.
+ * In case no structure can be allocated, the fragment is dropped.
+ */
+
+#define MAP_IP4_REASS_LIFETIME_DEFAULT (100)	/* ms */
+#define MAP_IP4_REASS_HT_RATIO_DEFAULT (1.0)
+#define MAP_IP4_REASS_POOL_SIZE_DEFAULT 1024	// Number of reassembly structures
+#define MAP_IP4_REASS_BUFFERS_DEFAULT 2048
+
+#define MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY 5	// Number of fragment per reassembly
+
+#define MAP_IP6_REASS_LIFETIME_DEFAULT (100)	/* ms */
+#define MAP_IP6_REASS_HT_RATIO_DEFAULT (1.0)
+#define MAP_IP6_REASS_POOL_SIZE_DEFAULT 1024	// Number of reassembly structures
+#define MAP_IP6_REASS_BUFFERS_DEFAULT 2048
+
+#define MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY 5
+
+#define MAP_IP6_REASS_COUNT_BYTES
+#define MAP_IP4_REASS_COUNT_BYTES
+
+//#define IP6_MAP_T_OVERRIDE_TOS 0
+
+/*
+ * This structure _MUST_ be no larger than a single cache line (64 bytes).
+ * If more space is needed make a union of ip6_prefix and *rules, those are mutually exclusive.
+ */
+typedef struct
+{
+  ip6_address_t ip6_src;
+  ip6_address_t ip6_prefix;
+  ip6_address_t *rules;
+  u32 suffix_mask;
+  ip4_address_t ip4_prefix;
+  u16 psid_mask;
+  u16 mtu;
+  map_domain_flags_e flags;
+  u8 ip6_prefix_len;
+  u8 ip6_src_len;
+  u8 ea_bits_len;
+  u8 psid_offset;
+  u8 psid_length;
+
+  /* helpers */
+  u8 psid_shift;
+  u8 suffix_shift;
+  u8 ea_shift;
+
+  /* not used by forwarding */
+  u8 ip4_prefix_len;
+} map_domain_t;
+
+STATIC_ASSERT ((sizeof (map_domain_t) <= CLIB_CACHE_LINE_BYTES),
+	       "MAP domain fits in one cacheline");
+
+#define MAP_REASS_INDEX_NONE ((u16)0xffff)
+
+/*
+ * Hash key, padded out to 16 bytes for fast compare
+ */
+/* *INDENT-OFF* */
+typedef union {
+  CLIB_PACKED (struct {
+    ip4_address_t src;
+    ip4_address_t dst;
+    u16 fragment_id;
+    u8 protocol;
+  });
+  u64 as_u64[2];
+  u32 as_u32[4];
+} map_ip4_reass_key_t;
+/* *INDENT-ON* */
+
+typedef struct
+{
+  map_ip4_reass_key_t key;
+  f64 ts;
+#ifdef MAP_IP4_REASS_COUNT_BYTES
+  u16 expected_total;
+  u16 forwarded;
+#endif
+  i32 port;
+  u16 bucket;
+  u16 bucket_next;
+  u16 fifo_prev;
+  u16 fifo_next;
+  u32 fragments[MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY];
+} map_ip4_reass_t;
+
+/*
+ * MAP domain counters
+ */
+typedef enum
+{
+  /* Simple counters */
+  MAP_DOMAIN_IPV4_FRAGMENT = 0,
+  /* Combined counters */
+  MAP_DOMAIN_COUNTER_RX = 0,
+  MAP_DOMAIN_COUNTER_TX,
+  MAP_N_DOMAIN_COUNTER
+} map_domain_counter_t;
+
+/*
+ * main_main_t
+ */
+/* *INDENT-OFF* */
+typedef union {
+  CLIB_PACKED (struct {
+    ip6_address_t src;
+    ip6_address_t dst;
+    u32 fragment_id;
+    u8 protocol;
+  });
+  u64 as_u64[5];
+  u32 as_u32[10];
+} map_ip6_reass_key_t;
+/* *INDENT-OFF* */
+
+typedef struct {
+  u32 pi; //Cached packet or ~0
+  u16 next_data_offset; //The data offset of the additional 20 bytes or ~0
+  u8 next_data_len; //Number of bytes ready to be copied (20 if not last fragment)
+  u8 next_data[20]; //The 20 additional bytes
+} map_ip6_fragment_t;
+
+typedef struct {
+  map_ip6_reass_key_t key;
+  f64 ts;
+#ifdef MAP_IP6_REASS_COUNT_BYTES
+  u16 expected_total;
+  u16 forwarded;
+#endif
+  u16 bucket; //What hash bucket this element is linked in
+  u16 bucket_next;
+  u16 fifo_prev;
+  u16 fifo_next;
+  ip4_header_t ip4_header;
+  map_ip6_fragment_t fragments[MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY];
+} map_ip6_reass_t;
+
+typedef struct {
+  /* pool of MAP domains */
+  map_domain_t *domains;
+
+  /* MAP Domain packet/byte counters indexed by map domain index */
+  vlib_simple_counter_main_t *simple_domain_counters;
+  vlib_combined_counter_main_t *domain_counters;
+  volatile u32 *counter_lock;
+
+#ifdef MAP_SKIP_IP6_LOOKUP
+  /* pre-presolve */
+  u32 adj6_index, adj4_index;
+  ip4_address_t preresolve_ip4;
+  ip6_address_t preresolve_ip6;
+#endif
+
+  /* Traffic class: zero, copy (~0) or fixed value */
+  u8 tc;
+  bool tc_copy;
+
+  bool sec_check;		/* Inbound security check */
+  bool sec_check_frag;		/* Inbound security check for (subsequent) fragments */
+  bool icmp6_enabled;		/* Send destination unreachable for security check failure */
+
+  /* ICMPv6 -> ICMPv4 relay parameters */
+  ip4_address_t icmp4_src_address;
+  vlib_simple_counter_main_t icmp_relayed;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+
+  /*
+   * IPv4 encap and decap reassembly
+   */
+  /* Configuration */
+  f32 ip4_reass_conf_ht_ratio; //Size of ht is 2^ceil(log2(ratio*pool_size))
+  u16 ip4_reass_conf_pool_size; //Max number of allocated reass structures
+  u16 ip4_reass_conf_lifetime_ms; //Time a reassembly struct is considered valid in ms
+  u32 ip4_reass_conf_buffers; //Maximum number of buffers used by ip4 reassembly
+
+  /* Runtime */
+  map_ip4_reass_t *ip4_reass_pool;
+  u8 ip4_reass_ht_log2len; //Hash table size is 2^log2len
+  u16 ip4_reass_allocated;
+  u16 *ip4_reass_hash_table;
+  u16 ip4_reass_fifo_last;
+  volatile u32 *ip4_reass_lock;
+
+  /* Counters */
+  u32 ip4_reass_buffered_counter;
+
+  bool frag_inner;		/* Inner or outer fragmentation */
+  bool frag_ignore_df;		/* Fragment (outer) packet even if DF is set */
+
+  /*
+   * IPv6 decap reassembly
+   */
+  /* Configuration */
+  f32 ip6_reass_conf_ht_ratio; //Size of ht is 2^ceil(log2(ratio*pool_size))
+  u16 ip6_reass_conf_pool_size; //Max number of allocated reass structures
+  u16 ip6_reass_conf_lifetime_ms; //Time a reassembly struct is considered valid in ms
+  u32 ip6_reass_conf_buffers; //Maximum number of buffers used by ip6 reassembly
+
+  /* Runtime */
+  map_ip6_reass_t *ip6_reass_pool;
+  u8 ip6_reass_ht_log2len; //Hash table size is 2^log2len
+  u16 ip6_reass_allocated;
+  u16 *ip6_reass_hash_table;
+  u16 ip6_reass_fifo_last;
+  volatile u32 *ip6_reass_lock;
+
+  /* Counters */
+  u32 ip6_reass_buffered_counter;
+
+} map_main_t;
+
+/*
+ * MAP Error counters/messages
+ */
+#define foreach_map_error				\
+  /* Must be first. */					\
+ _(NONE, "valid MAP packets")				\
+ _(BAD_PROTOCOL, "bad protocol")			\
+ _(SEC_CHECK, "security check failed")			\
+ _(ENCAP_SEC_CHECK, "encap security check failed")	\
+ _(DECAP_SEC_CHECK, "decap security check failed")	\
+ _(ICMP, "unable to translate ICMP")			\
+ _(ICMP_RELAY, "unable to relay ICMP")			\
+ _(UNKNOWN, "unknown")					\
+ _(NO_BINDING, "no binding")				\
+ _(NO_DOMAIN, "no domain")				\
+ _(FRAGMENTED, "packet is a fragment")                  \
+ _(FRAGMENT_MEMORY, "could not cache fragment")	        \
+ _(FRAGMENT_MALFORMED, "fragment has unexpected format")\
+ _(FRAGMENT_DROPPED, "dropped cached fragment")         \
+ _(MALFORMED, "malformed packet")			\
+ _(DF_SET, "can't fragment, DF set")
+
+typedef enum {
+#define _(sym,str) MAP_ERROR_##sym,
+   foreach_map_error
+#undef _
+   MAP_N_ERROR,
+ } map_error_t;
+
+u64 map_error_counter_get(u32 node_index, map_error_t map_error);
+
+typedef struct {
+  u32 map_domain_index;
+  u16 port;
+} map_trace_t;
+
+map_main_t map_main;
+
+extern vlib_node_registration_t ip4_map_node;
+extern vlib_node_registration_t ip6_map_node;
+
+extern vlib_node_registration_t ip4_map_t_node;
+extern vlib_node_registration_t ip4_map_t_fragmented_node;
+extern vlib_node_registration_t ip4_map_t_tcp_udp_node;
+extern vlib_node_registration_t ip4_map_t_icmp_node;
+
+extern vlib_node_registration_t ip6_map_t_node;
+extern vlib_node_registration_t ip6_map_t_fragmented_node;
+extern vlib_node_registration_t ip6_map_t_tcp_udp_node;
+extern vlib_node_registration_t ip6_map_t_icmp_node;
+
+/*
+ * map_get_pfx
+ */
+static_always_inline u64
+map_get_pfx (map_domain_t *d, u32 addr, u16 port)
+{
+  u16 psid = (port >> d->psid_shift) & d->psid_mask;
+
+  if (d->ea_bits_len == 0 && d->rules)
+    return clib_net_to_host_u64(d->rules[psid].as_u64[0]);
+
+  u32 suffix = (addr >> d->suffix_shift) & d->suffix_mask;
+  u64 ea = d->ea_bits_len == 0 ? 0 : (((u64) suffix << d->psid_length)) | psid;
+
+  return clib_net_to_host_u64(d->ip6_prefix.as_u64[0]) | ea << d->ea_shift;
+}
+
+static_always_inline u64
+map_get_pfx_net (map_domain_t *d, u32 addr, u16 port)
+{
+  return clib_host_to_net_u64(map_get_pfx(d, clib_net_to_host_u32(addr),
+                                          clib_net_to_host_u16(port)));
+}
+
+/*
+ * map_get_sfx
+ */
+static_always_inline u64
+map_get_sfx (map_domain_t *d, u32 addr, u16 port)
+{
+  u16 psid = (port >> d->psid_shift) & d->psid_mask;
+
+  /* Shared 1:1 mode. */
+  if (d->ea_bits_len == 0 && d->rules)
+    return clib_net_to_host_u64(d->rules[psid].as_u64[1]);
+  if (d->ip6_prefix_len == 128)
+    return clib_net_to_host_u64(d->ip6_prefix.as_u64[1]);
+
+  /* IPv4 prefix */
+  if (d->flags & MAP_DOMAIN_PREFIX)
+    return (u64) (addr & (0xFFFFFFFF << d->suffix_shift)) << 16;
+
+  /* Shared or full IPv4 address */
+  return ((u64) addr << 16) | psid;
+}
+
+static_always_inline u64
+map_get_sfx_net (map_domain_t *d, u32 addr, u16 port)
+{
+  return clib_host_to_net_u64(map_get_sfx(d, clib_net_to_host_u32(addr),
+                                          clib_net_to_host_u16(port)));
+}
+
+static_always_inline u32
+map_get_ip4 (ip6_address_t *addr)
+{
+  return clib_host_to_net_u32(clib_net_to_host_u64(addr->as_u64[1]) >> 16);
+}
+
+/*
+ * Get the MAP domain from an IPv4 lookup adjacency.
+ */
+static_always_inline map_domain_t *
+ip4_map_get_domain (u32 mdi,
+		    u32 *map_domain_index)
+{
+  map_main_t *mm = &map_main;
+  map_dpo_t *md;
+
+  md = map_dpo_get(mdi);
+
+  ASSERT(md);
+  *map_domain_index = md->md_domain;
+  return pool_elt_at_index(mm->domains, *map_domain_index);
+}
+
+/*
+ * Get the MAP domain from an IPv6 lookup adjacency.
+ * If the IPv6 address or prefix is not shared, no lookup is required.
+ * The IPv4 address is used otherwise.
+ */
+static_always_inline map_domain_t *
+ip6_map_get_domain (u32 mdi, ip4_address_t *addr,
+                    u32 *map_domain_index, u8 *error)
+{
+  map_main_t *mm = &map_main;
+  map_dpo_t *md;
+
+  /*
+   * Disable direct MAP domain lookup on decap, until the security check is updated to verify IPv4 SA.
+   * (That's done implicitly when MAP domain is looked up in the IPv4 FIB)
+   */
+#ifdef MAP_NONSHARED_DOMAIN_ENABLED
+  md = map_dpo_get(mdi);
+
+  ASSERT(md);
+  *map_domain_index = md->md_domain;
+  if (*map_domain_index != ~0)
+    return pool_elt_at_index(mm->domains, *map_domain_index);
+#endif
+
+  u32 lbi = ip4_fib_forwarding_lookup(0, addr);
+  const dpo_id_t *dpo = load_balance_get_bucket(lbi, 0);
+  if (PREDICT_TRUE(dpo->dpoi_type == map_dpo_type ||
+		   dpo->dpoi_type == map_t_dpo_type))
+    {
+      md = map_dpo_get(dpo->dpoi_index);
+     *map_domain_index = md->md_domain;
+      return pool_elt_at_index(mm->domains, *map_domain_index);
+    }
+  *error = MAP_ERROR_NO_DOMAIN;
+  return NULL;
+}
+
+map_ip4_reass_t *
+map_ip4_reass_get(u32 src, u32 dst, u16 fragment_id,
+                  u8 protocol, u32 **pi_to_drop);
+void
+map_ip4_reass_free(map_ip4_reass_t *r, u32 **pi_to_drop);
+
+#define map_ip4_reass_lock() while (__sync_lock_test_and_set(map_main.ip4_reass_lock, 1)) {}
+#define map_ip4_reass_unlock() do {CLIB_MEMORY_BARRIER(); *map_main.ip4_reass_lock = 0;} while(0)
+
+static_always_inline void
+map_ip4_reass_get_fragments(map_ip4_reass_t *r, u32 **pi)
+{
+  int i;
+  for (i=0; i<MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+    if(r->fragments[i] != ~0) {
+      vec_add1(*pi, r->fragments[i]);
+      r->fragments[i] = ~0;
+      map_main.ip4_reass_buffered_counter--;
+    }
+}
+
+int map_ip4_reass_add_fragment(map_ip4_reass_t *r, u32 pi);
+
+map_ip6_reass_t *
+map_ip6_reass_get(ip6_address_t *src, ip6_address_t *dst, u32 fragment_id,
+                  u8 protocol, u32 **pi_to_drop);
+void
+map_ip6_reass_free(map_ip6_reass_t *r, u32 **pi_to_drop);
+
+#define map_ip6_reass_lock() while (__sync_lock_test_and_set(map_main.ip6_reass_lock, 1)) {}
+#define map_ip6_reass_unlock() do {CLIB_MEMORY_BARRIER(); *map_main.ip6_reass_lock = 0;} while(0)
+
+int
+map_ip6_reass_add_fragment(map_ip6_reass_t *r, u32 pi,
+                           u16 data_offset, u16 next_data_offset,
+                           u8 *data_start, u16 data_len);
+
+void map_ip4_drop_pi(u32 pi);
+
+int map_ip4_reass_conf_ht_ratio(f32 ht_ratio, u32 *trashed_reass, u32 *dropped_packets);
+#define MAP_IP4_REASS_CONF_HT_RATIO_MAX 100
+int map_ip4_reass_conf_pool_size(u16 pool_size, u32 *trashed_reass, u32 *dropped_packets);
+#define MAP_IP4_REASS_CONF_POOL_SIZE_MAX (0xfeff)
+int map_ip4_reass_conf_lifetime(u16 lifetime_ms);
+#define MAP_IP4_REASS_CONF_LIFETIME_MAX 0xffff
+int map_ip4_reass_conf_buffers(u32 buffers);
+#define MAP_IP4_REASS_CONF_BUFFERS_MAX (0xffffffff)
+
+void map_ip6_drop_pi(u32 pi);
+
+
+int map_ip6_reass_conf_ht_ratio(f32 ht_ratio, u32 *trashed_reass, u32 *dropped_packets);
+#define MAP_IP6_REASS_CONF_HT_RATIO_MAX 100
+int map_ip6_reass_conf_pool_size(u16 pool_size, u32 *trashed_reass, u32 *dropped_packets);
+#define MAP_IP6_REASS_CONF_POOL_SIZE_MAX (0xfeff)
+int map_ip6_reass_conf_lifetime(u16 lifetime_ms);
+#define MAP_IP6_REASS_CONF_LIFETIME_MAX 0xffff
+int map_ip6_reass_conf_buffers(u32 buffers);
+#define MAP_IP6_REASS_CONF_BUFFERS_MAX (0xffffffff)
+
+static_always_inline
+int ip6_parse(const ip6_header_t *ip6, u32 buff_len,
+              u8 *l4_protocol, u16 *l4_offset, u16 *frag_hdr_offset)
+{
+  if (ip6->protocol == IP_PROTOCOL_IPV6_FRAGMENTATION) {
+    *l4_protocol = ((ip6_frag_hdr_t *)(ip6 + 1))->next_hdr;
+    *frag_hdr_offset = sizeof(*ip6);
+    *l4_offset = sizeof(*ip6) + sizeof(ip6_frag_hdr_t);
+  } else {
+    *l4_protocol = ip6->protocol;
+    *frag_hdr_offset = 0;
+    *l4_offset = sizeof(*ip6);
+  }
+
+  return (buff_len < (*l4_offset + 4)) ||
+      (clib_net_to_host_u16(ip6->payload_length) < (*l4_offset + 4 - sizeof(*ip6)));
+}
+
+
+#define u8_ptr_add(ptr, index) (((u8 *)ptr) + index)
+#define u16_net_add(u, val) clib_host_to_net_u16(clib_net_to_host_u16(u) + (val))
+
+#define frag_id_6to4(id) ((id) ^ ((id) >> 16))
+
+static_always_inline void
+ip4_map_t_embedded_address (map_domain_t *d,
+                                ip6_address_t *ip6, const ip4_address_t *ip4)
+{
+  ASSERT(d->ip6_src_len == 96); //No support for other lengths for now
+  ip6->as_u64[0] = d->ip6_src.as_u64[0];
+  ip6->as_u32[2] = d->ip6_src.as_u32[2];
+  ip6->as_u32[3] = ip4->as_u32;
+}
+
+static_always_inline u32
+ip6_map_t_embedded_address (map_domain_t *d, ip6_address_t *addr)
+{
+  ASSERT(d->ip6_src_len == 96); //No support for other lengths for now
+  return addr->as_u32[3];
+}
+
+static inline void
+map_domain_counter_lock (map_main_t *mm)
+{
+  if (mm->counter_lock)
+    while (__sync_lock_test_and_set(mm->counter_lock, 1))
+      /* zzzz */ ;
+}
+static inline void
+map_domain_counter_unlock (map_main_t *mm)
+{
+  if (mm->counter_lock)
+    *mm->counter_lock = 0;
+}
+
+
+static_always_inline void
+map_send_all_to_node(vlib_main_t *vm, u32 *pi_vector,
+                     vlib_node_runtime_t *node, vlib_error_t *error,
+                     u32 next)
+{
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  //Deal with fragments that are ready
+  from = pi_vector;
+  n_left_from = vec_len(pi_vector);
+  next_index = node->cached_next_index;
+  while (n_left_from > 0) {
+    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
+    while (n_left_from > 0 && n_left_to_next > 0) {
+      u32 pi0 = to_next[0] = from[0];
+      from += 1;
+      n_left_from -= 1;
+      to_next += 1;
+      n_left_to_next -= 1;
+      vlib_buffer_t *p0 = vlib_get_buffer(vm, pi0);
+      p0->error = *error;
+      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next, n_left_to_next, pi0, next);
+    }
+    vlib_put_next_frame(vm, node, next_index, n_left_to_next);
+  }
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/map/map_api.c b/src/vnet/map/map_api.c
new file mode 100644
index 00000000..7febeb3d
--- /dev/null
+++ b/src/vnet/map/map_api.c
@@ -0,0 +1,295 @@
+/*
+ *------------------------------------------------------------------
+ * map_api.c - vnet map api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include "map.h"
+#include <vnet/api_errno.h>
+#include <vnet/ip/ip.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg			\
+_(MAP_ADD_DOMAIN, map_add_domain)		\
+_(MAP_DEL_DOMAIN, map_del_domain)		\
+_(MAP_ADD_DEL_RULE, map_add_del_rule)		\
+_(MAP_DOMAIN_DUMP, map_domain_dump)		\
+_(MAP_RULE_DUMP, map_rule_dump)			\
+_(MAP_SUMMARY_STATS, map_summary_stats)
+
+static void
+vl_api_map_add_domain_t_handler (vl_api_map_add_domain_t * mp)
+{
+  vl_api_map_add_domain_reply_t *rmp;
+  int rv = 0;
+  u32 index;
+  u8 flags = mp->is_translation ? MAP_DOMAIN_TRANSLATION : 0;
+  rv =
+    map_create_domain ((ip4_address_t *) & mp->ip4_prefix, mp->ip4_prefix_len,
+		       (ip6_address_t *) & mp->ip6_prefix, mp->ip6_prefix_len,
+		       (ip6_address_t *) & mp->ip6_src,
+		       mp->ip6_src_prefix_len, mp->ea_bits_len,
+		       mp->psid_offset, mp->psid_length, &index,
+		       ntohs (mp->mtu), flags);
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_MAP_ADD_DOMAIN_REPLY,
+  ({
+    rmp->index = ntohl(index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_map_del_domain_t_handler (vl_api_map_del_domain_t * mp)
+{
+  vl_api_map_del_domain_reply_t *rmp;
+  int rv = 0;
+
+  rv = map_delete_domain (ntohl (mp->index));
+
+  REPLY_MACRO (VL_API_MAP_DEL_DOMAIN_REPLY);
+}
+
+static void
+vl_api_map_add_del_rule_t_handler (vl_api_map_add_del_rule_t * mp)
+{
+  vl_api_map_del_domain_reply_t *rmp;
+  int rv = 0;
+
+  rv =
+    map_add_del_psid (ntohl (mp->index), ntohs (mp->psid),
+		      (ip6_address_t *) mp->ip6_dst, mp->is_add);
+
+  REPLY_MACRO (VL_API_MAP_ADD_DEL_RULE_REPLY);
+}
+
+static void
+vl_api_map_domain_dump_t_handler (vl_api_map_domain_dump_t * mp)
+{
+  vl_api_map_domain_details_t *rmp;
+  map_main_t *mm = &map_main;
+  map_domain_t *d;
+  unix_shared_memory_queue_t *q;
+
+  if (pool_elts (mm->domains) == 0)
+    return;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  /* *INDENT-OFF* */
+  pool_foreach(d, mm->domains,
+  ({
+    /* Make sure every field is initiated (or don't skip the memset()) */
+    rmp = vl_msg_api_alloc (sizeof (*rmp));
+    rmp->_vl_msg_id = ntohs(VL_API_MAP_DOMAIN_DETAILS);
+    rmp->domain_index = htonl(d - mm->domains);
+    rmp->ea_bits_len = d->ea_bits_len;
+    rmp->psid_offset = d->psid_offset;
+    rmp->psid_length = d->psid_length;
+    clib_memcpy(rmp->ip4_prefix, &d->ip4_prefix, sizeof(rmp->ip4_prefix));
+    rmp->ip4_prefix_len = d->ip4_prefix_len;
+    clib_memcpy(rmp->ip6_prefix, &d->ip6_prefix, sizeof(rmp->ip6_prefix));
+    rmp->ip6_prefix_len = d->ip6_prefix_len;
+    clib_memcpy(rmp->ip6_src, &d->ip6_src, sizeof(rmp->ip6_src));
+    rmp->ip6_src_len = d->ip6_src_len;
+    rmp->mtu = htons(d->mtu);
+    rmp->is_translation = (d->flags & MAP_DOMAIN_TRANSLATION);
+    rmp->context = mp->context;
+
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_map_rule_dump_t_handler (vl_api_map_rule_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  u16 i;
+  ip6_address_t dst;
+  vl_api_map_rule_details_t *rmp;
+  map_main_t *mm = &map_main;
+  u32 domain_index = ntohl (mp->domain_index);
+  map_domain_t *d;
+
+  if (pool_elts (mm->domains) == 0)
+    return;
+
+  d = pool_elt_at_index (mm->domains, domain_index);
+  if (!d || !d->rules)
+    {
+      return;
+    }
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  for (i = 0; i < (0x1 << d->psid_length); i++)
+    {
+      dst = d->rules[i];
+      if (dst.as_u64[0] == 0 && dst.as_u64[1] == 0)
+	{
+	  continue;
+	}
+      rmp = vl_msg_api_alloc (sizeof (*rmp));
+      memset (rmp, 0, sizeof (*rmp));
+      rmp->_vl_msg_id = ntohs (VL_API_MAP_RULE_DETAILS);
+      rmp->psid = htons (i);
+      clib_memcpy (rmp->ip6_dst, &dst, sizeof (rmp->ip6_dst));
+      rmp->context = mp->context;
+      vl_msg_api_send_shmem (q, (u8 *) & rmp);
+    }
+}
+
+static void
+vl_api_map_summary_stats_t_handler (vl_api_map_summary_stats_t * mp)
+{
+  vl_api_map_summary_stats_reply_t *rmp;
+  vlib_combined_counter_main_t *cm;
+  vlib_counter_t v;
+  int i, which;
+  u64 total_pkts[VLIB_N_RX_TX];
+  u64 total_bytes[VLIB_N_RX_TX];
+  map_main_t *mm = &map_main;
+  unix_shared_memory_queue_t *q =
+    vl_api_client_index_to_input_queue (mp->client_index);
+
+  if (!q)
+    return;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_MAP_SUMMARY_STATS_REPLY);
+  rmp->context = mp->context;
+  rmp->retval = 0;
+
+  memset (total_pkts, 0, sizeof (total_pkts));
+  memset (total_bytes, 0, sizeof (total_bytes));
+
+  map_domain_counter_lock (mm);
+  vec_foreach (cm, mm->domain_counters)
+  {
+    which = cm - mm->domain_counters;
+
+    for (i = 0; i < vec_len (cm->maxi); i++)
+      {
+	vlib_get_combined_counter (cm, i, &v);
+	total_pkts[which] += v.packets;
+	total_bytes[which] += v.bytes;
+      }
+  }
+
+  map_domain_counter_unlock (mm);
+
+  /* Note: in network byte order! */
+  rmp->total_pkts[MAP_DOMAIN_COUNTER_RX] =
+    clib_host_to_net_u64 (total_pkts[MAP_DOMAIN_COUNTER_RX]);
+  rmp->total_bytes[MAP_DOMAIN_COUNTER_RX] =
+    clib_host_to_net_u64 (total_bytes[MAP_DOMAIN_COUNTER_RX]);
+  rmp->total_pkts[MAP_DOMAIN_COUNTER_TX] =
+    clib_host_to_net_u64 (total_pkts[MAP_DOMAIN_COUNTER_TX]);
+  rmp->total_bytes[MAP_DOMAIN_COUNTER_TX] =
+    clib_host_to_net_u64 (total_bytes[MAP_DOMAIN_COUNTER_TX]);
+  rmp->total_bindings = clib_host_to_net_u64 (pool_elts (mm->domains));
+  rmp->total_ip4_fragments = 0;	// Not yet implemented. Should be a simple counter.
+  rmp->total_security_check[MAP_DOMAIN_COUNTER_TX] =
+    clib_host_to_net_u64 (map_error_counter_get
+			  (ip4_map_node.index, MAP_ERROR_ENCAP_SEC_CHECK));
+  rmp->total_security_check[MAP_DOMAIN_COUNTER_RX] =
+    clib_host_to_net_u64 (map_error_counter_get
+			  (ip4_map_node.index, MAP_ERROR_DECAP_SEC_CHECK));
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+/*
+ * vpe_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_map;
+#undef _
+}
+
+static clib_error_t *
+map_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (map_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/map/map_doc.md b/src/vnet/map/map_doc.md
new file mode 100644
index 00000000..17f3c511
--- /dev/null
+++ b/src/vnet/map/map_doc.md
@@ -0,0 +1,69 @@
+# VPP MAP and Lw4o6 implementation    {#map_doc}
+
+This is a memo intended to contain documentation of the VPP MAP and Lw4o6 implementations.
+Everything that is not directly obvious should come here.
+
+
+
+## MAP-E Virtual Reassembly
+
+The MAP-E implementation supports handling of IPv4 fragments as well as IPv4-in-IPv6 inner and outer fragments. This is called virtual reassembly because the fragments are not actually reassembled. Instead, some meta-data are kept about the first fragment and reused for subsequent fragments.
+
+Fragment caching and handling is not always necessary. It is performed when:
+* An IPv4 fragment is received and the destination IPv4 address is shared.
+* An IPv6 packet is received with an inner IPv4 fragment, the IPv4 source address is shared, and 'security-check fragments' is on.
+* An IPv6 fragment is received.
+
+There are 3 dedicated nodes:
+* ip4-map-reass 
+* ip6-map-ip4-reass
+* ip6-map-ip6-reass
+
+ip4-map sends all fragments to ip4-map-reass.
+ip6-map sends all inner-fragments to ip6-map-ip4-reass.
+ip6-map sends all outer-fragments to ip6-map-ip6-reass.
+
+IPv4 (resp. IPv6) virtual reassembly makes use of a hash table in order to store IPv4 (resp. IPv6) reassembly structures. The hash-key is based on the IPv4-src:IPv4-dst:Frag-ID:Protocol tuple (resp. IPv6-src:IPv6-dst:Frag-ID tuple, as the protocol is IPv4-in-IPv6). Therefore, each packet reassembly makes use of exactly one reassembly structure. When such a structure is allocated, it is timestamped with the current time. Finally, those structures are capable of storing a limited number of buffer indexes.
+
+An IPv4 (resp. IPv6) reassembly structure can cache up to MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY (resp. MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY) buffers. Buffers are cached until the first fragment is received.
+
+#### Virtual Reassembly configuration
+
+IPv4 and IPv6 virtual reassembly support the following configuration:
+    map params reassembly [ip4 | ip6] [lifetime <lifetime-ms>] [pool-size <pool-size>] [buffers <buffers>] [ht-ratio <ht-ratio>]
+
+lifetime: 
+	The time in milliseconds a reassembly structure is considered valid. The longer, the more reliable is reassembly, but the more likely it is to exhaust the pool of reassembly structures. IPv4 standard suggests a lifetime of 15 seconds. IPv6 specifies a lifetime of 60 people. Those values are not realistic for high-throughput cases.
+
+buffers:
+	The upper limit of buffers that are allowed to be cached. It can be used to protect against fragmentation attacks which would aim to exhaust the global buffers pool.
+	
+pool-size:
+	The number of reassembly structures that can be allocated. As each structure can store a small fixed number of fragments, it also sets an upper-bound of 'pool-size * MAP_IPX_REASS_MAX_FRAGMENTS_PER_REASSEMBLY' buffers that can be cached in total.
+	
+ht-ratio:
+	The amount of buckets in the hash-table is pool-size * ht-ratio.
+
+
+Any time pool-size and ht-ratio is modified, the hash-table is destroyed and created again, which means all current state is lost.
+
+
+##### Additional considerations
+
+Reassembly at high rate is expensive in terms of buffers. There is a trade-off between the lifetime and number of allocated buffers. Reducing the lifetime helps, but at the cost of loosing state for fragments that are wide appart.
+
+Let:
+R be the packet rate at which fragments are received.
+F be the number of fragments per packet.
+
+Assuming the first fragment is always received last. We should have:
+buffers > lifetime * R / F * (F - 1)
+pool-size > lifetime * R/F
+
+This is a worst case. Receiving the first fragment earlier helps reducing the number of required buffers. Also, an optimization is implemented (MAP_IP6_REASS_COUNT_BYTES and MAP_IP4_REASS_COUNT_BYTES) which counts the number of transmitted bytes and remembers the total number of bytes which should be transmitted based on the last fragment, and therefore helps reducing 'pool-size'.
+
+But the formula shows that it is challenging to forward a significant amount of fragmented packets at high rates. For instance, with a lifetime of 1 second, 5Mpps packet rate would require buffering up to 2.5 millions fragments.
+
+If you want to do that, be prepared to configure a lot of fragments.
+
+
diff --git a/src/vnet/map/map_dpo.c b/src/vnet/map/map_dpo.c
new file mode 100644
index 00000000..df2b5fa4
--- /dev/null
+++ b/src/vnet/map/map_dpo.c
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/ip/ip.h>
+#include <vnet/map/map_dpo.h>
+
+/**
+ * pool of all MPLS Label DPOs
+ */
+map_dpo_t *map_dpo_pool;
+
+/**
+ * The register MAP DPO type
+ */
+dpo_type_t map_dpo_type;
+dpo_type_t map_t_dpo_type;
+
+static map_dpo_t *
+map_dpo_alloc (void)
+{
+    map_dpo_t *md;
+
+    pool_get_aligned(map_dpo_pool, md, CLIB_CACHE_LINE_BYTES);
+    memset(md, 0, sizeof(*md));
+
+    return (md);
+}
+
+static index_t
+map_dpo_get_index (map_dpo_t *md)
+{
+    return (md - map_dpo_pool);
+}
+
+void
+map_dpo_create (dpo_proto_t dproto,
+		u32 domain_index,
+		dpo_id_t *dpo)
+{
+    map_dpo_t *md;
+
+    md = map_dpo_alloc();
+    md->md_domain = domain_index;
+    md->md_proto = dproto;
+
+    dpo_set(dpo,
+	    map_dpo_type,
+	    dproto,
+	    map_dpo_get_index(md));
+}
+
+void
+map_t_dpo_create (dpo_proto_t dproto,
+		  u32 domain_index,
+		  dpo_id_t *dpo)
+{
+    map_dpo_t *md;
+
+    md = map_dpo_alloc();
+    md->md_domain = domain_index;
+    md->md_proto = dproto;
+
+    dpo_set(dpo,
+	    map_t_dpo_type,
+	    dproto,
+	    map_dpo_get_index(md));
+}
+
+
+u8*
+format_map_dpo (u8 *s, va_list *args)
+{
+    index_t index = va_arg (*args, index_t);
+    CLIB_UNUSED(u32 indent) = va_arg (*args, u32);
+    map_dpo_t *md;
+
+    md = map_dpo_get(index);
+
+    return (format(s, "map:[%d]:%U domain:%d",
+		   index,
+                   format_dpo_proto, md->md_proto,
+		   md->md_domain));
+}
+
+u8*
+format_map_t_dpo (u8 *s, va_list *args)
+{
+    index_t index = va_arg (*args, index_t);
+    CLIB_UNUSED(u32 indent) = va_arg (*args, u32);
+    map_dpo_t *md;
+
+    md = map_dpo_get(index);
+
+    return (format(s, "map-t:[%d]:%U domain:%d",
+		   index,
+                   format_dpo_proto, md->md_proto,
+		   md->md_domain));
+}
+
+
+static void
+map_dpo_lock (dpo_id_t *dpo)
+{
+    map_dpo_t *md;
+
+    md = map_dpo_get(dpo->dpoi_index);
+
+    md->md_locks++;
+}
+
+static void
+map_dpo_unlock (dpo_id_t *dpo)
+{
+    map_dpo_t *md;
+
+    md = map_dpo_get(dpo->dpoi_index);
+
+    md->md_locks--;
+
+    if (0 == md->md_locks)
+    {
+	pool_put(map_dpo_pool, md);
+    }
+}
+
+const static dpo_vft_t md_vft = {
+    .dv_lock = map_dpo_lock,
+    .dv_unlock = map_dpo_unlock,
+    .dv_format = format_map_dpo,
+};
+
+const static char* const map_ip4_nodes[] =
+{
+    "ip4-map",
+    NULL,
+};
+const static char* const map_ip6_nodes[] =
+{
+    "ip6-map",
+    NULL,
+};
+
+const static char* const * const map_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = map_ip4_nodes,
+    [DPO_PROTO_IP6]  = map_ip6_nodes,
+    [DPO_PROTO_MPLS] = NULL,
+};
+
+const static dpo_vft_t md_t_vft = {
+    .dv_lock = map_dpo_lock,
+    .dv_unlock = map_dpo_unlock,
+    .dv_format = format_map_t_dpo,
+};
+
+const static char* const map_t_ip4_nodes[] =
+{
+    "ip4-map-t",
+    NULL,
+};
+const static char* const map_t_ip6_nodes[] =
+{
+    "ip6-map-t",
+    NULL,
+};
+
+const static char* const * const map_t_nodes[DPO_PROTO_NUM] =
+{
+    [DPO_PROTO_IP4]  = map_t_ip4_nodes,
+    [DPO_PROTO_IP6]  = map_t_ip6_nodes,
+    [DPO_PROTO_MPLS] = NULL,
+};
+
+void
+map_dpo_module_init (void)
+{
+    map_dpo_type = dpo_register_new_type(&md_vft, map_nodes);
+    map_t_dpo_type = dpo_register_new_type(&md_t_vft, map_t_nodes);
+}
diff --git a/src/vnet/map/map_dpo.h b/src/vnet/map/map_dpo.h
new file mode 100644
index 00000000..be510dba
--- /dev/null
+++ b/src/vnet/map/map_dpo.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MAP_DPO_H__
+#define __MAP_DPO_H__
+
+#include <vnet/vnet.h>
+#include <vnet/dpo/dpo.h>
+
+/**
+ * A representation of a MAP DPO
+ */
+typedef struct map_dpo_t
+{
+    /**
+     * The dat-plane protocol
+     */
+    dpo_proto_t md_proto;
+
+    /**
+     * the MAP domain index
+     */
+    u32 md_domain;
+
+    /**
+     * Number of locks/users of the label
+     */
+    u16 md_locks;
+} map_dpo_t;
+
+extern void map_dpo_create (dpo_proto_t dproto,
+			    u32 domain_index,
+			    dpo_id_t *dpo);
+extern void map_t_dpo_create (dpo_proto_t dproto,
+			      u32 domain_index,
+			      dpo_id_t *dpo);
+
+extern u8* format_map_dpo(u8 *s, va_list *args);
+
+/*
+ * Encapsulation violation for fast data-path access
+ */
+extern map_dpo_t *map_dpo_pool;
+extern dpo_type_t map_dpo_type;
+extern dpo_type_t map_t_dpo_type;
+
+static inline map_dpo_t *
+map_dpo_get (index_t index)
+{
+    return (pool_elt_at_index(map_dpo_pool, index));
+}
+
+extern void map_dpo_module_init(void);
+
+#endif
diff --git a/src/vnet/map/test.c b/src/vnet/map/test.c
new file mode 100644
index 00000000..f3c893a7
--- /dev/null
+++ b/src/vnet/map/test.c
@@ -0,0 +1,205 @@
+/*
+ * test.c : MAP unit tests
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <assert.h>
+#include "map.h"
+
+static map_domain_t *
+get_domain(ip4_address_t * ip4_prefix, u8 ip4_prefix_len,
+	   ip6_address_t * ip6_prefix, u8 ip6_prefix_len,
+	   ip6_address_t * ip6_src, u8 ip6_src_len,
+	   u8 ea_bits_len, u8 psid_offset,
+	   u8 psid_length, u16 mtu, u8 flags)
+{
+  map_domain_t * d = malloc(sizeof(*d));
+  u8 suffix_len;
+
+  /* EA bits must be within the first 64 bits */
+  if (ea_bits_len > 0 && (ip6_prefix_len + ea_bits_len) > 64)
+    return NULL;
+
+  /* Init domain struct */
+  d->ip4_prefix.as_u32 = ip4_prefix->as_u32;
+  d->ip4_prefix_len = ip4_prefix_len;
+  d->ip6_prefix = *ip6_prefix;
+  d->ip6_prefix_len = ip6_prefix_len;
+  d->ip6_src = *ip6_src;
+  d->ip6_src_len = ip6_src_len;
+  d->ea_bits_len = ea_bits_len;
+  d->psid_offset = psid_offset;
+  d->psid_length = psid_length;
+  d->mtu = mtu;
+  d->flags = flags;
+
+  /* How many, and which bits to grab from the IPv4 DA */
+  if (ip4_prefix_len + ea_bits_len < 32)
+    {
+      d->flags |= MAP_DOMAIN_PREFIX;
+      d->suffix_shift = 32 - ip4_prefix_len - ea_bits_len;
+      suffix_len = ea_bits_len;
+    }
+  else
+    {
+      d->suffix_shift = 0;
+      suffix_len = 32 - ip4_prefix_len;
+    }
+  d->suffix_mask = (1 << suffix_len) - 1;
+
+  d->psid_shift = 16 - psid_length - psid_offset;
+  d->psid_mask = (1 << d->psid_length) - 1;
+
+  if (ip6_prefix_len + suffix_len + d->psid_length > 64)
+    return NULL;
+
+  d->ea_shift = 64 - ip6_prefix_len - suffix_len - d->psid_length;
+
+  return d;
+}
+
+
+/*
+ * VPP-340:
+ * map_add_domain ip4-pfx 20.0.0.0/8 ip6-pfx 2001:db8::/40 ip6-src 2001:db8:ffff::/96 ea-bits-len 24 psid-offset 0 psid-len 0 map-t
+ * IPv4 src = 100.0.0.1
+ * IPv4 dst = 20.169.201.219
+ * UDP dest port = 1232
+ * IPv6 src = 2001:db8:ffff::6400:1
+ * IPv6 dst = a9c9:dfb8::14a9:c9db:0
+ * a9c9:dfb8::14a9:c9db:0 != 2001:db8:a9:c9db:0:14a9:c9db:0
+ */
+static void
+test_map_t_destaddr (void)
+{
+  ip4_address_t ip4_prefix;
+  ip6_address_t ip6_prefix;
+  ip6_address_t ip6_src;
+
+  ip4_prefix.as_u32 = clib_host_to_net_u32(0x14000000);
+  ip6_prefix.as_u64[0] = clib_host_to_net_u64(0x20010db800000000);
+  ip6_prefix.as_u64[1] = 0;
+  ip6_src.as_u64[0] = clib_host_to_net_u64(0x20010db8ffff0000);
+  map_domain_t * d = get_domain (&ip4_prefix, 8, &ip6_prefix, 40, &ip6_src, 96, 24, 0, 0, 0, MAP_DOMAIN_TRANSLATION);
+
+  ip6_address_t dst6;
+
+  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
+  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
+  assert(dst6.as_u64[0] == 0x20010db800a9c9db);
+  assert(dst6.as_u64[1] == 0x000014a9c9db0000);
+}
+
+/*
+ * VPP-228
+ * ip4-pfx 20.0.0.0/8
+ * ip6-pfx 2001:db8::/<n>
+ * ip6-src 2001:db8:ffff::1
+ * ea-bits-len 16 psid-offset 6 psid-len 8
+ * 20.169.201.219 port 1232
+ */
+static void
+test_map_eabits (void)
+{
+  ip4_address_t ip4_prefix;
+  ip6_address_t ip6_prefix;
+  ip6_address_t ip6_src;
+  ip6_address_t dst6;
+
+  ip4_prefix.as_u32 = clib_host_to_net_u32(0x14000000);
+  ip6_prefix.as_u64[0] = clib_host_to_net_u64(0x20010db800000000);
+  ip6_prefix.as_u64[1] = 0;
+  ip6_src.as_u64[0] = clib_host_to_net_u64(0x20010db8ffff0000);
+  ip6_src.as_u64[1] = clib_host_to_net_u64(0x0000000000000001);
+  map_domain_t * d = get_domain (&ip4_prefix, 16, &ip6_prefix, 48, &ip6_src,
+				 128, 16, 6, 8, 0, 0);
+  assert(!d);
+
+  //20.0.0.0/8	2001:db8::/32	4	2001:db8:a000::14a0:0:0
+  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
+		  128, 4, 0, 0, 0, 0);
+  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
+  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
+  assert(dst6.as_u64[0] == 0x20010db8a0000000);
+  assert(dst6.as_u64[1] == 0x000014a000000000);
+
+  //20.0.0.0/8	2001:db8::/32	8	2001:db8:a900::14a9:0:0
+  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
+		  128, 8, 0, 0, 0, 0);
+  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
+  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
+  assert(dst6.as_u64[0] == 0x20010db8a9000000);
+  assert(dst6.as_u64[1] == 0x000014a900000000);
+
+  //20.0.0.0/8	2001:db8::/32	10	2001:db8:a9c0::14a9:c000:0
+  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
+		  128, 10, 0, 0, 0, 0);
+  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
+  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
+  assert(dst6.as_u64[0] == 0x20010db8a9c00000);
+  assert(dst6.as_u64[1] == 0x000014a9c0000000);
+
+  //20.0.0.0/8	2001:db8::/32	16	2001:db8:a9c9::14a9:c900:0
+  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
+		  128, 16, 0, 0, 0, 0);
+  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
+  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
+  assert(dst6.as_u64[0] == 0x20010db8a9c90000);
+  assert(dst6.as_u64[1] == 0x000014a9c9000000);
+
+  //20.0.0.0/8	2001:db8::/32	20	2001:db8:a9c9:d000:0:14a9:c9d0:0
+  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
+		  128, 20, 0, 0, 0, 0);
+  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
+  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
+  assert(dst6.as_u64[0] == 0x20010db8a9c9d000);
+  assert(dst6.as_u64[1] == 0x000014a9c9d00000);
+
+  //20.0.0.0/8	2001:db8::/32	23	2001:db8:a9c9:da00:0:14a9:c9da:0
+  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
+		  128, 23, 0, 0, 0, 0);
+  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
+  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
+  assert(dst6.as_u64[0] == 0x20010db8a9c9da00);
+  assert(dst6.as_u64[1] == 0x000014a9c9da0000);
+
+  //20.169.201.0/24	2001:db8::/32	7	2001:db8:da00::14a9:c9da:0
+  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
+		  128, 7, 0, 0, 0, 0);
+  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
+  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
+  assert(dst6.as_u64[0] == 0x20010db8a8000000);
+  assert(dst6.as_u64[1] == 0x000014a800000000);
+}
+
+#define foreach_test_case			\
+  _(map_t_destaddr)				\
+  _(map_eabits)
+
+static void
+run_tests (void)
+{
+#define _(_test_name)				\
+  test_ ## _test_name ();
+
+  foreach_test_case
+#undef _
+}
+
+int main()
+{
+  run_tests ();
+  return 0;
+}
diff --git a/src/vnet/mcast/mcast.c b/src/vnet/mcast/mcast.c
new file mode 100644
index 00000000..55be89ae
--- /dev/null
+++ b/src/vnet/mcast/mcast.c
@@ -0,0 +1,565 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/mcast/mcast.h>
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/icmp46_packet.h>
+#include <vnet/ip/ip4.h>
+
+typedef struct {
+  u32 sw_if_index;
+  u32 next_index;
+  u32 group_index;
+} mcast_prep_trace_t;
+
+/* packet trace format function */
+static u8 * format_mcast_prep_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  mcast_prep_trace_t * t = va_arg (*args, mcast_prep_trace_t *);
+  
+  s = format (s, "MCAST_PREP: group %d, next index %d, tx_sw_if_index %d",
+              t->group_index, t->next_index, t->sw_if_index);
+  return s;
+}
+
+mcast_main_t mcast_main;
+vlib_node_registration_t mcast_prep_node;
+vlib_node_registration_t mcast_recycle_node;
+
+#define foreach_mcast_prep_error \
+_(MCASTS, "Multicast Packets")
+
+typedef enum {
+#define _(sym,str) MCAST_PREP_ERROR_##sym,
+  foreach_mcast_prep_error
+#undef _
+  MCAST_PREP_N_ERROR,
+} mcast_prep_error_t;
+
+static char * mcast_prep_error_strings[] = {
+#define _(sym,string) string,
+  foreach_mcast_prep_error
+#undef _
+};
+
+typedef enum {
+  MCAST_PREP_NEXT_DROP,
+  MCAST_PREP_N_NEXT,
+} mcast_prep_next_t;
+
+static uword
+mcast_prep_node_fn (vlib_main_t * vm,
+		  vlib_node_runtime_t * node,
+		  vlib_frame_t * frame)
+{
+  u32 n_left_from, * from, * to_next;
+  mcast_prep_next_t next_index;
+  mcast_main_t * mcm = &mcast_main;
+  vlib_node_t *n = vlib_get_node (vm, mcast_prep_node.index);
+  u32 node_counter_base_index = n->error_heap_index;
+  vlib_error_main_t * em = &vm->error_main;
+  ip4_main_t * im = &ip4_main;
+  ip_lookup_main_t * lm = &im->lookup_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (0 && n_left_from >= 4 && n_left_to_next >= 2)
+	{
+          u32 bi0, bi1;
+	  vlib_buffer_t * b0, * b1;
+          u32 next0, next1;
+          u32 sw_if_index0, sw_if_index1;
+          
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * p2, * p3;
+            
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+            
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+          /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+          next0 = 0;
+          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
+          next1 = 0;
+
+          /* $$$$ your message in this space. Process 2 x pkts */
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)))
+            {
+              if (b0->flags & VLIB_BUFFER_IS_TRACED) 
+                {
+                    mcast_prep_trace_t *t = 
+                      vlib_add_trace (vm, node, b0, sizeof (*t));
+                    t->sw_if_index = sw_if_index0;
+                    t->next_index = next0;
+                  }
+                if (b1->flags & VLIB_BUFFER_IS_TRACED) 
+                  {
+                    mcast_prep_trace_t *t = 
+                      vlib_add_trace (vm, node, b1, sizeof (*t));
+                    t->sw_if_index = sw_if_index1;
+                    t->next_index = next1;
+                  }
+              }
+            
+            /* verify speculative enqueues, maybe switch current next frame */
+            vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+                                             to_next, n_left_to_next,
+                                             bi0, bi1, next0, next1);
+        }
+      
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+          u32 bi0;
+	  vlib_buffer_t * b0;
+          u32 next0, adj_index0;
+          mcast_group_t * g0;
+          ip_adjacency_t * adj0;
+          
+          /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+          adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
+          adj0 = ip_get_adjacency (lm, adj_index0);
+          vnet_buffer(b0)->mcast.mcast_group_index = adj0->mcast_group_index;
+          g0 = pool_elt_at_index (mcm->groups, adj0->mcast_group_index);
+
+          /* 
+           * Handle the degenerate single-copy case 
+           * If we don't change the freelist, the packet will never
+           * make it to the recycle node...
+           */
+          if (PREDICT_TRUE(vec_len (g0->members) > 1))
+            {
+              /* Save the original free list index */
+              vnet_buffer(b0)->mcast.original_free_list_index =
+                b0->free_list_index;
+              
+              /* Swap in the multicast recycle list */
+              b0->free_list_index = mcm->mcast_recycle_list_index;
+              
+              /* 
+               * Make sure that intermediate "frees" don't screw up 
+               */
+              b0->recycle_count = vec_len (g0->members);
+              b0->flags |= VLIB_BUFFER_RECYCLE;
+
+              /* Set up for the recycle node */
+              vnet_buffer(b0)->mcast.mcast_current_index = 1;
+            }
+
+          /* Transmit the pkt on the first interface */
+          next0 = g0->members[0].prep_and_recycle_node_next_index;
+          vnet_buffer(b0)->sw_if_index[VLIB_TX] = 
+            g0->members[0].tx_sw_if_index;
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) {
+            mcast_prep_trace_t *t = 
+               vlib_add_trace (vm, node, b0, sizeof (*t));
+            t->next_index = next0;
+            t->sw_if_index = vnet_buffer(b0)->sw_if_index[VLIB_TX];
+            t->group_index = vnet_buffer(b0)->mcast.mcast_group_index;
+            }
+            
+          /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  em->counters[node_counter_base_index + MCAST_PREP_ERROR_MCASTS] += 
+      frame->n_vectors;
+
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (mcast_prep_node) = {
+  .function = mcast_prep_node_fn,
+  .name = "mcast_prep",
+  .vector_size = sizeof (u32),
+  .format_trace = format_mcast_prep_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  
+  .n_errors = ARRAY_LEN(mcast_prep_error_strings),
+  .error_strings = mcast_prep_error_strings,
+
+  .n_next_nodes = MCAST_PREP_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+        [MCAST_PREP_NEXT_DROP] = "error-drop",
+  },
+};
+
+typedef struct {
+  u32 sw_if_index;
+  u32 next_index;
+  u32 current_member;
+  u32 group_index;
+} mcast_recycle_trace_t;
+
+static u8 * format_mcast_recycle_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  mcast_recycle_trace_t * t = va_arg (*args, mcast_recycle_trace_t *);
+  
+  s = format (s, 
+"MCAST_R: group %d, current member %d next (node) index %d, tx_sw_if_index %d",
+              t->group_index, t->current_member, t->next_index, t->sw_if_index);
+  return s;
+}
+
+#define foreach_mcast_recycle_error \
+_(RECYCLES, "Multicast Recycles")
+
+typedef enum {
+#define _(sym,str) MCAST_RECYCLE_ERROR_##sym,
+  foreach_mcast_recycle_error
+#undef _
+  MCAST_RECYCLE_N_ERROR,
+} mcast_recycle_error_t;
+
+static char * mcast_recycle_error_strings[] = {
+#define _(sym,string) string,
+  foreach_mcast_recycle_error
+#undef _
+};
+
+typedef enum {
+  MCAST_RECYCLE_NEXT_DROP,
+  MCAST_RECYCLE_N_NEXT,
+} mcast_recycle_next_t;
+
+static uword
+mcast_recycle_node_fn (vlib_main_t * vm,
+		  vlib_node_runtime_t * node,
+		  vlib_frame_t * frame)
+{
+  u32 n_left_from, * from, * to_next;
+  mcast_recycle_next_t next_index;
+  mcast_main_t * mcm = &mcast_main;
+  vlib_node_t *n = vlib_get_node (vm, mcast_recycle_node.index);
+  u32 node_counter_base_index = n->error_heap_index;
+  vlib_error_main_t * em = &vm->error_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (0 && n_left_from >= 4 && n_left_to_next >= 2)
+	{
+          u32 bi0, bi1;
+	  vlib_buffer_t * b0, * b1;
+          u32 next0, next1;
+          u32 sw_if_index0, sw_if_index1;
+          
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * p2, * p3;
+            
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+            
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+          /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+          next0 = 0;
+          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
+          next1 = 0;
+
+          /* $$$$ your message in this space. Process 2 x pkts */
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)))
+            {
+              if (b0->flags & VLIB_BUFFER_IS_TRACED) 
+                {
+                    mcast_recycle_trace_t *t = 
+                      vlib_add_trace (vm, node, b0, sizeof (*t));
+                    t->sw_if_index = sw_if_index0;
+                    t->next_index = next0;
+                  }
+                if (b1->flags & VLIB_BUFFER_IS_TRACED) 
+                  {
+                    mcast_recycle_trace_t *t = 
+                      vlib_add_trace (vm, node, b1, sizeof (*t));
+                    t->sw_if_index = sw_if_index1;
+                    t->next_index = next1;
+                  }
+              }
+            
+            /* verify speculative enqueues, maybe switch current next frame */
+            vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+                                             to_next, n_left_to_next,
+                                             bi0, bi1, next0, next1);
+        }
+      
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+          u32 bi0;
+	  vlib_buffer_t * b0;
+          u32 next0;
+          u32 current_member0;
+          mcast_group_t * g0;
+          
+          /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+          g0 = pool_elt_at_index (mcm->groups, 
+                                  vnet_buffer(b0)->mcast.mcast_group_index);
+
+          /* No more replicas? */
+          if (b0->recycle_count == 1)
+            {
+              /* Restore the original free list index */
+              b0->free_list_index = 
+                vnet_buffer(b0)->mcast.original_free_list_index;
+              b0->flags &= ~(VLIB_BUFFER_RECYCLE);
+            }
+          current_member0 = vnet_buffer(b0)->mcast.mcast_current_index;
+          
+          next0 = 
+            g0->members[current_member0].prep_and_recycle_node_next_index;
+          vnet_buffer(b0)->sw_if_index[VLIB_TX] = 
+            g0->members[current_member0].tx_sw_if_index;
+          
+          vnet_buffer(b0)->mcast.mcast_current_index = 
+            current_member0 + 1;
+          
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) {
+            mcast_recycle_trace_t *t = 
+               vlib_add_trace (vm, node, b0, sizeof (*t));
+            t->next_index = next0;
+            t->sw_if_index = vnet_buffer(b0)->sw_if_index[VLIB_TX];
+            t->group_index = vnet_buffer(b0)->mcast.mcast_group_index;
+            t->current_member = current_member0;
+            }
+            
+          /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  em->counters[node_counter_base_index + MCAST_RECYCLE_ERROR_RECYCLES] += 
+      frame->n_vectors;
+
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (mcast_recycle_node) = {
+  .function = mcast_recycle_node_fn,
+  .name = "mcast-recycle",
+  .vector_size = sizeof (u32),
+  .format_trace = format_mcast_recycle_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  
+  .n_errors = ARRAY_LEN(mcast_recycle_error_strings),
+  .error_strings = mcast_recycle_error_strings,
+
+  .n_next_nodes = MCAST_RECYCLE_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+        [MCAST_RECYCLE_NEXT_DROP] = "error-drop",
+  },
+};
+
+/*
+ * fish pkts back from the recycle queue/freelist
+ * un-flatten the context chains
+ */
+static void mcast_recycle_callback (vlib_main_t *vm, 
+                                    vlib_buffer_free_list_t * fl)
+{
+  vlib_frame_t * f = 0;
+  u32 n_left_from;
+  u32 n_left_to_next = 0;
+  u32 n_this_frame = 0;
+  u32 * from;
+  u32 * to_next;
+  u32 bi0, pi0;
+  vlib_buffer_t *b0;
+  vlib_buffer_t *bnext0;
+  int i;
+
+  /* aligned, unaligned buffers */
+  for (i = 0; i < 2; i++) 
+    {
+      if (i == 0)
+        {
+          from = fl->aligned_buffers;
+          n_left_from = vec_len (from);
+        }
+      else
+        {
+          from = fl->unaligned_buffers;
+          n_left_from = vec_len (from);
+        }
+    
+      while (n_left_from > 0)
+        {
+          if (PREDICT_FALSE(n_left_to_next == 0)) 
+            {
+              if (f)
+                {
+                  f->n_vectors = n_this_frame;
+                  vlib_put_frame_to_node (vm, mcast_recycle_node.index, f);
+                }
+              
+              f = vlib_get_frame_to_node (vm, mcast_recycle_node.index);
+              to_next = vlib_frame_vector_args (f);
+              n_left_to_next = VLIB_FRAME_SIZE;
+              n_this_frame = 0;
+            }
+          
+          bi0 = from[0];
+          if (PREDICT_TRUE(n_left_from > 1))
+            {
+              pi0 = from[1];
+              vlib_prefetch_buffer_with_index(vm,pi0,LOAD);
+            }
+        
+          bnext0 = b0 = vlib_get_buffer (vm, bi0);
+          
+          while (bnext0->flags & VLIB_BUFFER_NEXT_PRESENT)
+            {
+              from += 1;
+              n_left_from -= 1;
+              bnext0 = vlib_get_buffer (vm, bnext0->next_buffer);
+            }
+          to_next[0] = bi0;
+
+          if (CLIB_DEBUG > 0)
+            vlib_buffer_set_known_state (vm, bi0, VLIB_BUFFER_KNOWN_ALLOCATED);
+
+          from++;
+          to_next++;
+          n_this_frame++;
+          n_left_to_next--;
+          n_left_from--;
+        }
+    }
+  
+  vec_reset_length (fl->aligned_buffers);
+  vec_reset_length (fl->unaligned_buffers);
+
+  if (f)
+    {
+      ASSERT(n_this_frame);
+      f->n_vectors = n_this_frame;
+      vlib_put_frame_to_node (vm, mcast_recycle_node.index, f);
+    }
+}
+
+clib_error_t *mcast_init (vlib_main_t *vm)
+{
+  mcast_main_t * mcm = &mcast_main;
+  vlib_buffer_main_t * bm = vm->buffer_main;
+  vlib_buffer_free_list_t * fl;
+    
+  mcm->vlib_main = vm;
+  mcm->vnet_main = vnet_get_main();
+  mcm->mcast_recycle_list_index = 
+    vlib_buffer_create_free_list (vm, 1024 /* fictional */, "mcast-recycle");
+
+  fl = pool_elt_at_index (bm->buffer_free_list_pool, 
+                          mcm->mcast_recycle_list_index);
+
+  fl->buffers_added_to_freelist_function = mcast_recycle_callback;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (mcast_init);
+
+
diff --git a/src/vnet/mcast/mcast.h b/src/vnet/mcast/mcast.h
new file mode 100644
index 00000000..96e51442
--- /dev/null
+++ b/src/vnet/mcast/mcast.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_vnet_mcast_h__
+#define __included_vnet_mcast_h__
+
+#include <vnet/vnet.h>
+#include <vlib/buffer.h>
+#include <vlib/buffer_funcs.h>
+
+typedef struct {
+  /* Arrange for both prep and recycle nodes to have identical
+     next indices for a given output interface */
+  u32 prep_and_recycle_node_next_index;
+
+  /* Show command, etc. */
+  u32 tx_sw_if_index;
+} mcast_group_member_t;
+
+typedef struct {
+  /* vector of group members */
+  mcast_group_member_t * members;
+} mcast_group_t;
+
+typedef struct {
+  /* pool of multicast (interface) groups */
+  mcast_group_t * groups;
+
+  /* multicast "free" list, aka recycle list */
+  u32 mcast_recycle_list_index;
+
+  /* convenience */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+} mcast_main_t;
+
+mcast_main_t mcast_main;
+
+#endif /* __included_vnet_mcast_h__ */
diff --git a/src/vnet/mcast/mcast_test.c b/src/vnet/mcast/mcast_test.c
new file mode 100644
index 00000000..be80c9fc
--- /dev/null
+++ b/src/vnet/mcast/mcast_test.c
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/mcast/mcast.h>
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+#include <vnet/ip/lookup.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/icmp46_packet.h>
+#include <vnet/ip/ip4.h>
+#include <vnet/mcast/mcast.h>
+
+typedef struct {
+  /* convenience */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+  mcast_main_t * mcast_main;
+} mcast_test_main_t;
+
+mcast_test_main_t mcast_test_main;
+vlib_node_registration_t mcast_prep_node;
+vlib_node_registration_t mcast_recycle_node;
+
+static clib_error_t *
+mcast_test_command_fn (vlib_main_t * vm,
+		 unformat_input_t * input,
+		 vlib_cli_command_t * cmd)
+{
+  /* u8 *rewrite_data; */
+  /* mcast_test_main_t * mtm = &mcast_test_main; */
+  /* mcast_main_t * mcm = mtm->mcast_main; */
+  /* ip_adjacency_t adj; */
+  /* u32 adj_index; */
+  /* mcast_group_t * g; */
+  /* mcast_group_member_t * member; */
+  /* unformat_input_t _line_input, * line_input = &_line_input; */
+  /* ip4_address_t dst_addr, zero; */
+  /* ip4_main_t * im = &ip4_main; */
+  /* ip_lookup_main_t * lm = &im->lookup_main; */
+
+  /* /\* Get a line of input. *\/ */
+  /* if (! unformat_user (input, unformat_line_input, line_input)) */
+  /*   return 0; */
+
+  /* pool_get (mcm->groups, g); */
+  /* memset (g, 0, sizeof (*g)); */
+
+  /* while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) */
+  /*   { */
+  /*     vnet_hw_interface_t *hw; */
+  /*     u32 next, sw_if_index; */
+
+  /*     if (unformat (line_input, "%U", unformat_vnet_sw_interface,  */
+  /*                   mtm->vnet_main, &sw_if_index))  */
+  /*       { */
+  /*         vec_add2 (g->members, member, 1); */
+  /*         member->tx_sw_if_index = sw_if_index; */
+          
+  /*         hw = vnet_get_sup_hw_interface (mtm->vnet_main,  */
+  /*                                         sw_if_index); */
+          
+  /*         next = vlib_node_add_next (mtm->vlib_main,  */
+  /*                                    mcast_prep_node.index, */
+  /*                                    hw->output_node_index); */
+          
+  /*         /\* Required to be the same next index... *\/ */
+  /*         vlib_node_add_next_with_slot (mtm->vlib_main, */
+  /*                                       mcast_recycle_node.index, */
+  /*                                       hw->output_node_index, next); */
+  /*         member->prep_and_recycle_node_next_index = next; */
+  /*       } */
+  /*     else */
+  /*       { */
+  /*         return unformat_parse_error (line_input); */
+  /*       } */
+  /*   } */
+
+  /* if (vec_len (g->members) == 0) */
+  /*   { */
+  /*     pool_put (mcm->groups, g); */
+  /*     vlib_cli_output (vm, "no group members specified"); */
+  /*     return 0; */
+  /*   } */
+
+
+  /* adj.lookup_next_index = IP_LOOKUP_NEXT_REWRITE; */
+  /* adj.mcast_group_index = g - mcm->groups; */
+  /* rewrite_data = format (0, "abcdefg"); */
+
+  /* vnet_rewrite_for_tunnel */
+  /*   (mtm->vnet_main, */
+  /*    (u32)~0, /\* tx_sw_if_index, we dont know yet *\/ */
+  /*    ip4_rewrite_node.index, */
+  /*    mcast_prep_node.index, */
+  /*    &adj.rewrite_header, */
+  /*    rewrite_data, vec_len(rewrite_data)); */
+
+  /* ip_add_adjacency (lm, &adj, 1 /\* one adj *\/, */
+  /*                   &adj_index); */
+  
+  /* dst_addr.as_u32 = clib_host_to_net_u32 (0x0a000002); */
+  /* zero.as_u32 = 0; */
+
+  /* ip4_add_del_route_next_hop (im, */
+  /*                             IP4_ROUTE_FLAG_ADD, */
+  /*                             &dst_addr, */
+  /*                             24 /\* mask width *\/, */
+  /*                             &zero /\* no next hop *\/, */
+                          
+  /*                             0, // next hop sw if index */
+  /*                             1, // weight */
+  /*                             adj_index, */
+  /*                             0 /\* explicit fib 0 *\/); */
+
+  return 0;
+}
+
+static VLIB_CLI_COMMAND (mcast_test_command) = {
+  .path = "test mc",
+  .short_help = "test mc",
+  .function = mcast_test_command_fn,
+};
+
+clib_error_t *mcast_test_init (vlib_main_t *vm)
+{
+  mcast_test_main_t * mtm = &mcast_test_main;
+    
+  mtm->vlib_main = vm;
+  mtm->vnet_main = vnet_get_main();
+  mtm->mcast_main = &mcast_main;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (mcast_test_init);
diff --git a/src/vnet/misc.c b/src/vnet/misc.c
new file mode 100644
index 00000000..4c8c4cad
--- /dev/null
+++ b/src/vnet/misc.c
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * misc.c: vnet misc
+ *
+ * Copyright (c) 2012 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+
+vnet_main_t vnet_main;
+
+vnet_main_t *
+vnet_get_main (void)
+{
+  return &vnet_main;
+}
+
+static uword
+vnet_local_interface_tx (vlib_main_t * vm,
+			 vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  ASSERT (0);
+  return f->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (vnet_local_interface_device_class) = {
+  .name = "local",
+  .tx_function = vnet_local_interface_tx,
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VNET_HW_INTERFACE_CLASS (vnet_local_interface_hw_class,static) = {
+  .name = "local",
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+vnet_main_init (vlib_main_t * vm)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error;
+  u32 hw_if_index;
+  vnet_hw_interface_t *hw;
+
+  if ((error = vlib_call_init_function (vm, vnet_interface_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, fib_module_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ip_main_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ip4_lookup_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ip6_lookup_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, mpls_init)))
+    return error;
+
+  vnm->vlib_main = vm;
+
+  hw_if_index = vnet_register_interface
+    (vnm, vnet_local_interface_device_class.index, /* instance */ 0,
+     vnet_local_interface_hw_class.index, /* instance */ 0);
+  hw = vnet_get_hw_interface (vnm, hw_if_index);
+
+  vnm->local_interface_hw_if_index = hw_if_index;
+  vnm->local_interface_sw_if_index = hw->sw_if_index;
+
+  /* the local interface is used as an input interface when decapping from
+   * an IPSEC tunnel. so it needs to be IP enabled */
+  ip4_sw_interface_enable_disable (hw->sw_if_index, 1);
+  ip6_sw_interface_enable_disable (hw->sw_if_index, 1);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (vnet_main_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/mpls/error.def b/src/vnet/mpls/error.def
new file mode 100644
index 00000000..de8b9665
--- /dev/null
+++ b/src/vnet/mpls/error.def
@@ -0,0 +1,31 @@
+/*
+ * mpls_error.def: mpls errors
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+mpls_error (NONE, "no error")
+mpls_error (UNKNOWN_PROTOCOL, "unknown protocol")
+mpls_error (UNSUPPORTED_VERSION, "unsupported version")
+mpls_error (PKTS_DECAP, "MPLS-GRE input packets decapsulated")
+mpls_error (PKTS_ENCAP, "MPLS-GRE output packets encapsulated")
+mpls_error (NO_LABEL, "MPLS-GRE no label for fib/dst")
+mpls_error (TTL_EXPIRED, "MPLS-GRE ttl expired")
+mpls_error (S_NOT_SET, "MPLS-GRE s-bit not set")
+mpls_error (BAD_LABEL, "invalid FIB id in label")
+mpls_error (NOT_IP4, "non-ip4 packets dropped")
+mpls_error (DISALLOWED_FIB, "disallowed FIB id")
+mpls_error (NOT_ENABLED, "MPLS not enabled")
+mpls_error (DROP, "MPLS DROP DPO")
+mpls_error (PUNT, "MPLS PUNT DPO")
diff --git a/src/vnet/mpls/interface.c b/src/vnet/mpls/interface.c
new file mode 100644
index 00000000..692a2d1e
--- /dev/null
+++ b/src/vnet/mpls/interface.c
@@ -0,0 +1,121 @@
+/*
+ * interface.c: mpls interfaces
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/mpls/mpls.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/adj/adj_midchain.h>
+#include <vnet/dpo/classify_dpo.h>
+
+
+u8
+mpls_sw_interface_is_enabled (u32 sw_if_index)
+{
+    mpls_main_t * mm = &mpls_main;
+
+    if (vec_len(mm->mpls_enabled_by_sw_if_index) < sw_if_index)
+        return (0);
+
+    return (mm->mpls_enabled_by_sw_if_index[sw_if_index]);
+}
+
+void
+mpls_sw_interface_enable_disable (mpls_main_t * mm,
+                                  u32 sw_if_index,
+                                  u8 is_enable)
+{
+  fib_node_index_t lfib_index;
+
+  vec_validate_init_empty (mm->mpls_enabled_by_sw_if_index, sw_if_index, 0);
+
+  /*
+   * enable/disable only on the 1<->0 transition
+   */
+  if (is_enable)
+    {
+      if (1 != ++mm->mpls_enabled_by_sw_if_index[sw_if_index])
+        return;
+
+      lfib_index = fib_table_find_or_create_and_lock(FIB_PROTOCOL_MPLS,
+						     MPLS_FIB_DEFAULT_TABLE_ID);
+      vec_validate(mm->fib_index_by_sw_if_index, 0);
+      mm->fib_index_by_sw_if_index[sw_if_index] = lfib_index;
+    }
+  else
+    {
+      ASSERT(mm->mpls_enabled_by_sw_if_index[sw_if_index] > 0);
+      if (0 != --mm->mpls_enabled_by_sw_if_index[sw_if_index])
+        return;
+
+      fib_table_unlock(mm->fib_index_by_sw_if_index[sw_if_index],
+		       FIB_PROTOCOL_MPLS);
+    }
+
+  vnet_feature_enable_disable ("mpls-input", "mpls-lookup", sw_if_index,
+			       is_enable, 0, 0);
+
+}
+
+static clib_error_t *
+mpls_interface_enable_disable (vlib_main_t * vm,
+                               unformat_input_t * input,
+                               vlib_cli_command_t * cmd)
+{
+  vnet_main_t * vnm = vnet_get_main();
+  clib_error_t * error = 0;
+  u32 sw_if_index, enable;
+
+  sw_if_index = ~0;
+
+  if (! unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  if (unformat (input, "enable"))
+      enable = 1;
+  else if (unformat (input, "disable"))
+      enable = 0;
+  else
+    {
+      error = clib_error_return (0, "expected 'enable' or 'disable'",
+				 format_unformat_error, input);
+      goto done;
+    }
+
+  mpls_sw_interface_enable_disable(&mpls_main, sw_if_index, enable);
+
+ done:
+  return error;
+}
+
+/*?
+ * This command enables an interface to accpet MPLS packets
+ *
+ * @cliexpar
+ * @cliexstart{set interface mpls}
+ *  set interface mpls GigEthernet0/8/0 enable
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND (set_interface_ip_table_command, static) = {
+  .path = "set interface mpls",
+  .function = mpls_interface_enable_disable,
+  .short_help = "Enable/Disable an interface for MPLS forwarding",
+};
diff --git a/src/vnet/mpls/mpls.c b/src/vnet/mpls/mpls.c
new file mode 100644
index 00000000..0e610e17
--- /dev/null
+++ b/src/vnet/mpls/mpls.c
@@ -0,0 +1,511 @@
+/*
+ * mpls.c: mpls
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/mpls/mpls.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/mpls_fib.h>
+
+const static char* mpls_eos_bit_names[] = MPLS_EOS_BITS;
+
+mpls_main_t mpls_main;
+
+u8 * format_mpls_unicast_label (u8 * s, va_list * args)
+{
+  mpls_label_t label = va_arg (*args, mpls_label_t);
+
+  switch (label) {
+  case MPLS_IETF_IPV4_EXPLICIT_NULL_LABEL:
+      s = format (s, "%s", MPLS_IETF_IPV4_EXPLICIT_NULL_STRING);
+      break;
+  case MPLS_IETF_ROUTER_ALERT_LABEL:
+      s = format (s, "%s", MPLS_IETF_ROUTER_ALERT_STRING);
+      break;
+  case MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL:
+      s = format (s, "%s", MPLS_IETF_IPV6_EXPLICIT_NULL_STRING);
+      break;
+  case MPLS_IETF_IMPLICIT_NULL_LABEL:
+      s = format (s, "%s", MPLS_IETF_IMPLICIT_NULL_STRING);
+      break;
+  case MPLS_IETF_ELI_LABEL:
+      s = format (s, "%s", MPLS_IETF_ELI_STRING);
+      break;
+  case MPLS_IETF_GAL_LABEL:
+      s = format (s, "%s", MPLS_IETF_GAL_STRING);
+      break;
+  default:
+      s = format (s, "%d", label);
+      break;
+  }
+  return s;
+}
+
+uword unformat_mpls_unicast_label (unformat_input_t * input, va_list * args)
+{
+  mpls_label_t *label = va_arg (*args, mpls_label_t*);
+  
+  if (unformat (input, MPLS_IETF_IPV4_EXPLICIT_NULL_STRING))
+      *label = MPLS_IETF_IPV4_EXPLICIT_NULL_LABEL;
+  else if (unformat (input, MPLS_IETF_IPV6_EXPLICIT_NULL_STRING))
+      *label = MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL;
+  else if (unformat (input, MPLS_IETF_ROUTER_ALERT_STRING))
+      *label = MPLS_IETF_ROUTER_ALERT_LABEL;
+  else if (unformat (input, MPLS_IETF_IMPLICIT_NULL_STRING))
+      *label = MPLS_IETF_IMPLICIT_NULL_LABEL;
+  else if (unformat (input, "%d", label))
+      ;
+
+  return (1);
+}
+
+u8 * format_mpls_eos_bit (u8 * s, va_list * args)
+{
+  mpls_eos_bit_t eb = va_arg (*args, mpls_eos_bit_t);
+
+  ASSERT(eb <= MPLS_EOS);
+
+  s = format(s, "%s", mpls_eos_bit_names[eb]);
+
+  return (s);
+}
+
+u8 * format_mpls_header (u8 * s, va_list * args)
+{
+  mpls_unicast_header_t hdr = va_arg (*args, mpls_unicast_header_t);
+
+  return (format(s, "[%U:%d:%d:%U]",
+		 format_mpls_unicast_label, 
+		 vnet_mpls_uc_get_label(hdr.label_exp_s_ttl),
+		 vnet_mpls_uc_get_ttl(hdr.label_exp_s_ttl),
+		 vnet_mpls_uc_get_exp(hdr.label_exp_s_ttl),
+		 format_mpls_eos_bit,
+		 vnet_mpls_uc_get_s(hdr.label_exp_s_ttl)));
+}
+
+uword
+unformat_mpls_header (unformat_input_t * input, va_list * args)
+{
+  u8 ** result = va_arg (*args, u8 **);
+  mpls_unicast_header_t _h, * h = &_h;
+  u32 label, label_exp_s_ttl;
+
+  if (! unformat (input, "MPLS %d", &label))
+    return 0;
+
+  label_exp_s_ttl = (label<<12) | (1<<8) /* s-bit */ | 0xFF;
+  h->label_exp_s_ttl = clib_host_to_net_u32 (label_exp_s_ttl);
+
+  /* Add gre, mpls headers to result. */
+  {
+    void * p;
+    u32 h_n_bytes = sizeof (h[0]);
+
+    vec_add2 (*result, p, h_n_bytes);
+    clib_memcpy (p, h, h_n_bytes);
+  }
+
+  return 1;
+}
+
+uword
+unformat_mpls_label_net_byte_order (unformat_input_t * input,
+                                        va_list * args)
+{
+  u32 * result = va_arg (*args, u32 *);
+  u32 label;
+
+  if (!unformat (input, "MPLS: label %d", &label))
+    return 0;
+
+  label = (label<<12) | (1<<8) /* s-bit set */ | 0xFF /* ttl */;
+
+  *result = clib_host_to_net_u32 (label);
+  return 1;
+}
+
+u8 * format_mpls_unicast_header_host_byte_order (u8 * s, va_list * args)
+{
+  mpls_unicast_header_t *h = va_arg(*args, mpls_unicast_header_t *);
+  u32 label = h->label_exp_s_ttl;
+  
+  s = format (s, "label %d exp %d, s %d, ttl %d",
+              vnet_mpls_uc_get_label (label),
+              vnet_mpls_uc_get_exp (label),
+              vnet_mpls_uc_get_s (label),
+              vnet_mpls_uc_get_ttl (label));
+  return s;
+}
+
+u8 * format_mpls_unicast_header_net_byte_order (u8 * s, va_list * args)
+{
+  mpls_unicast_header_t *h = va_arg(*args, mpls_unicast_header_t *);
+  mpls_unicast_header_t h_host;
+
+  h_host.label_exp_s_ttl = clib_net_to_host_u32 (h->label_exp_s_ttl);
+
+  return format (s, "%U", format_mpls_unicast_header_host_byte_order,
+                 &h_host);
+}
+
+int
+mpls_dest_cmp(void * a1, void * a2)
+{
+  show_mpls_fib_t * r1 = a1;
+  show_mpls_fib_t * r2 = a2;
+
+  return clib_net_to_host_u32(r1->dest) - clib_net_to_host_u32(r2->dest);
+}
+
+int
+mpls_fib_index_cmp(void * a1, void * a2)
+{
+  show_mpls_fib_t * r1 = a1;
+  show_mpls_fib_t * r2 = a2;
+
+  return r1->fib_index - r2->fib_index;
+}
+
+int
+mpls_label_cmp(void * a1, void * a2)
+{
+  show_mpls_fib_t * r1 = a1;
+  show_mpls_fib_t * r2 = a2;
+
+  return r1->label - r2->label;
+}
+
+static clib_error_t *
+vnet_mpls_local_label (vlib_main_t * vm,
+                       unformat_input_t * input,
+                       vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, * line_input = &_line_input;
+  fib_route_path_t *rpaths = NULL, rpath;
+  u32 table_id, is_del, is_ip;
+  mpls_label_t local_label;
+  mpls_label_t out_label;
+  clib_error_t * error;
+  mpls_eos_bit_t eos;
+  vnet_main_t * vnm;
+  fib_prefix_t pfx;
+
+  vnm = vnet_get_main();
+  error = NULL;
+  is_ip = 0;
+  table_id = 0;
+  eos = MPLS_EOS;
+  is_del = 0;
+  local_label = MPLS_LABEL_INVALID;
+  memset(&pfx, 0, sizeof(pfx));
+
+   /* Get a line of input. */
+  if (! unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      memset(&rpath, 0, sizeof(rpath));
+
+      if (unformat (line_input, "table %d", &table_id))
+	;
+      else if (unformat (line_input, "del"))
+	is_del = 1;
+      else if (unformat (line_input, "add"))
+	is_del = 0;
+      else if (unformat (line_input, "eos"))
+	pfx.fp_eos = MPLS_EOS;
+      else if (unformat (line_input, "non-eos"))
+	pfx.fp_eos = MPLS_NON_EOS;
+      else if (unformat (line_input, "%U/%d",
+			 unformat_ip4_address,
+			 &pfx.fp_addr.ip4,
+			 &pfx.fp_len))
+      {
+	  pfx.fp_proto = FIB_PROTOCOL_IP4;
+          is_ip = 1;
+      }
+      else if (unformat (line_input, "%U/%d",
+			 unformat_ip6_address,
+			 &pfx.fp_addr.ip6,
+			 &pfx.fp_len))
+      {
+	  pfx.fp_proto = FIB_PROTOCOL_IP6;
+          is_ip = 1;
+      }
+      else if (unformat (line_input, "via %U %U weight %u",
+			 unformat_ip4_address,
+			 &rpath.frp_addr.ip4,
+			 unformat_vnet_sw_interface, vnm,
+			 &rpath.frp_sw_if_index,
+			 &rpath.frp_weight))
+      {
+	  rpath.frp_proto = FIB_PROTOCOL_IP4;
+	  vec_add1(rpaths, rpath);
+      }
+
+      else if (unformat (line_input, "via %U %U weight %u",
+			 unformat_ip6_address,
+			 &rpath.frp_addr.ip6,
+			 unformat_vnet_sw_interface, vnm,
+			 &rpath.frp_sw_if_index,
+			 &rpath.frp_weight))
+      {
+	  rpath.frp_proto = FIB_PROTOCOL_IP6;
+	  vec_add1(rpaths, rpath);
+      }
+
+      else if (unformat (line_input, "via %U %U",
+			 unformat_ip4_address,
+ 			 &rpath.frp_addr.ip4,
+			 unformat_vnet_sw_interface, vnm,
+			 &rpath.frp_sw_if_index))
+      {
+	  rpath.frp_weight = 1;
+	  rpath.frp_proto = FIB_PROTOCOL_IP4;
+	  vec_add1(rpaths, rpath);
+      }
+			 
+      else if (unformat (line_input, "via %U %U",
+			 unformat_ip6_address,
+ 			 &rpath.frp_addr.ip6,
+			 unformat_vnet_sw_interface, vnm,
+			 &rpath.frp_sw_if_index))
+      {
+	  rpath.frp_weight = 1;
+	  rpath.frp_proto = FIB_PROTOCOL_IP6;
+	  vec_add1(rpaths, rpath);
+      }
+      else if (unformat (line_input, "via %U next-hop-table %d",
+			 unformat_ip4_address,
+  			 &rpath.frp_addr.ip4,
+			 &rpath.frp_fib_index))
+      {
+	  rpath.frp_weight = 1;
+	  rpath.frp_sw_if_index = ~0;
+	  rpath.frp_proto = FIB_PROTOCOL_IP4;
+	  vec_add1(rpaths, rpath);
+      }
+      else if (unformat (line_input, "via %U next-hop-table %d",
+			 unformat_ip6_address,
+  			 &rpath.frp_addr.ip6,
+			 &rpath.frp_fib_index))
+      {
+	  rpath.frp_weight = 1;
+	  rpath.frp_sw_if_index = ~0;
+	  rpath.frp_proto = FIB_PROTOCOL_IP6;
+	  vec_add1(rpaths, rpath);
+      }
+      else if (unformat (line_input, "via %U",
+			 unformat_ip4_address,
+  			 &rpath.frp_addr.ip4))
+      {
+	  /*
+	   * the recursive next-hops are by default in the same table
+	   * as the prefix
+	   */
+	  rpath.frp_fib_index = table_id;
+	  rpath.frp_weight = 1;
+	  rpath.frp_sw_if_index = ~0;
+	  rpath.frp_proto = FIB_PROTOCOL_IP4;
+	  vec_add1(rpaths, rpath);
+      }
+      else if (unformat (line_input, "via %U",
+			 unformat_ip6_address,
+  			 &rpath.frp_addr.ip6))
+      {
+	  rpath.frp_fib_index = table_id;
+	  rpath.frp_weight = 1;
+	  rpath.frp_sw_if_index = ~0;
+	  rpath.frp_proto = FIB_PROTOCOL_IP6;
+	  vec_add1(rpaths, rpath);
+      }
+      else if (unformat (line_input, "%d", &local_label))
+	;
+      else if (unformat (line_input,
+			 "ip4-lookup-in-table %d",
+			 &rpath.frp_fib_index))
+      {
+          rpath.frp_proto = FIB_PROTOCOL_IP4;
+          rpath.frp_sw_if_index = FIB_NODE_INDEX_INVALID;
+	  pfx.fp_payload_proto = DPO_PROTO_IP4;
+	  vec_add1(rpaths, rpath);
+      }
+      else if (unformat (line_input,
+			 "ip6-lookup-in-table %d",
+			 &rpath.frp_fib_index))
+      {
+          rpath.frp_proto = FIB_PROTOCOL_IP6;
+          rpath.frp_sw_if_index = FIB_NODE_INDEX_INVALID;
+	  vec_add1(rpaths, rpath);
+	  pfx.fp_payload_proto = DPO_PROTO_IP6;
+      }
+      else if (unformat (line_input,
+			 "mpls-lookup-in-table %d",
+			 &rpath.frp_fib_index))
+      {
+          rpath.frp_proto = FIB_PROTOCOL_MPLS;
+          rpath.frp_sw_if_index = FIB_NODE_INDEX_INVALID;
+	  pfx.fp_payload_proto = DPO_PROTO_MPLS;
+	  vec_add1(rpaths, rpath);
+      }
+      else if (unformat (line_input, "out-label %U",
+                         unformat_mpls_unicast_label,
+			 &out_label))
+      {
+	  if (vec_len(rpaths) == 0)
+	  {
+	      error = clib_error_return(0 , "Paths then labels");
+	      goto done;
+	  }
+	  vec_add1(rpaths[vec_len(rpaths)-1].frp_label_stack, out_label);
+      }
+      else
+      {
+          error = clib_error_return (0, "unkown input: %U",
+                                     format_unformat_error, line_input);
+          goto done;
+      }
+
+    }
+
+  if (MPLS_LABEL_INVALID == local_label)
+  {
+      error = clib_error_return (0, "local-label required: %U",
+				 format_unformat_error, input);
+      goto done;
+  }
+
+
+  if (is_ip)
+  {
+      u32 fib_index = fib_table_find(pfx.fp_proto, table_id);
+
+      if (FIB_NODE_INDEX_INVALID == fib_index)
+      {
+          error = clib_error_return (0, "%U table-id %d does not exist",
+                                     format_fib_protocol, pfx.fp_proto, table_id);
+          goto done;
+      }
+
+      if (is_del)
+      {
+          fib_table_entry_local_label_remove(fib_index, &pfx, local_label);
+      }
+      else
+      {
+          fib_table_entry_local_label_add(fib_index, &pfx, local_label);
+      }
+  }
+  else
+  {
+      fib_node_index_t lfe, fib_index;
+      u32 fi;
+
+      if (NULL == rpaths)
+      {
+	  error = clib_error_return(0 , "no paths");
+	  goto done;
+      }
+
+      pfx.fp_proto = FIB_PROTOCOL_MPLS;
+      pfx.fp_len = 21;
+      pfx.fp_label = local_label;
+      pfx.fp_payload_proto = fib_proto_to_dpo(rpaths[0].frp_proto);
+
+      /*
+       * the CLI parsing stored table Ids, swap to FIB indicies
+       */
+      if (FIB_NODE_INDEX_INVALID == rpath.frp_sw_if_index)
+      {
+	  fi = fib_table_id_find_fib_index(dpo_proto_to_fib(pfx.fp_payload_proto),
+					   rpaths[0].frp_fib_index);
+
+	  if (~0 == fi)
+	  {
+	      error = clib_error_return(0 , "%U Via table %d does not exist",
+					format_dpo_proto, pfx.fp_payload_proto,
+					rpaths[0].frp_fib_index);
+	      goto done;
+	  }
+	  rpaths[0].frp_fib_index = fi;
+      }
+
+      fib_index = mpls_fib_index_from_table_id(table_id);
+
+      if (FIB_NODE_INDEX_INVALID == fib_index)
+      {
+          error = clib_error_return (0, "MPLS table-id %d does not exist",
+                                     table_id);
+          goto done;
+      }
+
+      lfe = fib_table_entry_path_add2(fib_index,
+				      &pfx,
+				      FIB_SOURCE_CLI,
+				      FIB_ENTRY_FLAG_NONE,
+				      rpaths);
+
+      if (FIB_NODE_INDEX_INVALID == lfe)
+      {
+          error = clib_error_return (0, "Failed to create %U-%U in MPLS table-id %d",
+                                     format_mpls_unicast_label, local_label,
+                                     format_mpls_eos_bit, eos,
+                                     table_id);
+          goto done;
+      }
+  }
+
+done:
+  return error;
+}
+
+VLIB_CLI_COMMAND (mpls_local_label_command, static) = {
+  .path = "mpls local-label",
+  .function = vnet_mpls_local_label,
+  .short_help = "Create/Delete MPL local labels",
+};
+
+int
+mpls_fib_reset_labels (u32 fib_id)
+{
+  // FIXME
+  return 0;
+}
+
+static clib_error_t *
+mpls_init (vlib_main_t * vm)
+{
+  mpls_main_t * mm = &mpls_main;
+  clib_error_t * error;
+
+  mm->vlib_main = vm;
+  mm->vnet_main = vnet_get_main();
+
+  if ((error = vlib_call_init_function (vm, ip_main_init)))
+    return error;
+
+  return vlib_call_init_function (vm, mpls_input_init);
+}
+
+VLIB_INIT_FUNCTION (mpls_init);
+
+mpls_main_t * mpls_get_main (vlib_main_t * vm)
+{
+  vlib_call_init_function (vm, mpls_init);
+  return &mpls_main;
+}
+
diff --git a/src/vnet/mpls/mpls.h b/src/vnet/mpls/mpls.h
new file mode 100644
index 00000000..b6fdbce7
--- /dev/null
+++ b/src/vnet/mpls/mpls.h
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vnet_mpls_h
+#define included_vnet_mpls_h
+
+#include <vnet/vnet.h>
+#include <vnet/mpls/packet.h>
+#include <vnet/mpls/mpls_types.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/fib/fib_node.h>
+#include <vnet/adj/adj.h>
+
+typedef enum {
+#define mpls_error(n,s) MPLS_ERROR_##n,
+#include <vnet/mpls/error.def>
+#undef mpls_error
+  MPLS_N_ERROR,
+} mpls_error_t;
+
+#define MPLS_FIB_DEFAULT_TABLE_ID 0
+
+/**
+ * Type exposure is to allow the DP fast/inlined access
+ */
+#define MPLS_FIB_KEY_SIZE 21
+#define MPLS_FIB_DB_SIZE (1 << (MPLS_FIB_KEY_SIZE-1))
+
+typedef struct mpls_fib_t_
+{
+  /**
+   * A hash table of entries. 21 bit key
+   * Hash table for reduced memory footprint
+   */
+  uword * mf_entries;
+
+  /**
+   * The load-balance indeices keyed by 21 bit label+eos bit.
+   * A flat array for maximum lookup performace.
+   */
+  index_t mf_lbs[MPLS_FIB_DB_SIZE];
+} mpls_fib_t;
+
+/**
+ * @brief Definition of a callback for receiving MPLS interface state change
+ * notifications
+ */
+typedef void (*mpls_interface_state_change_callback_t)(u32 sw_if_index,
+                                                       u32 is_enable);
+
+typedef struct {
+  /* MPLS FIB index for each software interface */
+  u32 *fib_index_by_sw_if_index;
+
+  /**  A pool of all the MPLS FIBs */
+  struct fib_table_t_ *fibs;
+
+  /** A hash table to lookup the mpls_fib by table ID */
+  uword *fib_index_by_table_id;
+
+  /* Feature arc indices */
+  u8 input_feature_arc_index;
+  u8 output_feature_arc_index;
+
+  /* IP4 enabled count by software interface */
+  u8 * mpls_enabled_by_sw_if_index;
+
+  /* convenience */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+} mpls_main_t;
+
+extern mpls_main_t mpls_main;
+
+extern clib_error_t * mpls_feature_init(vlib_main_t * vm);
+
+format_function_t format_mpls_protocol;
+format_function_t format_mpls_encap_index;
+
+format_function_t format_mpls_eos_bit;
+format_function_t format_mpls_unicast_header_net_byte_order;
+format_function_t format_mpls_unicast_label;
+format_function_t format_mpls_header;
+
+extern vlib_node_registration_t mpls_input_node;
+extern vlib_node_registration_t mpls_policy_encap_node;
+extern vlib_node_registration_t mpls_output_node;
+extern vlib_node_registration_t mpls_midchain_node;
+
+/* Parse mpls protocol as 0xXXXX or protocol name.
+   In either host or network byte order. */
+unformat_function_t unformat_mpls_protocol_host_byte_order;
+unformat_function_t unformat_mpls_protocol_net_byte_order;
+unformat_function_t unformat_mpls_label_net_byte_order;
+unformat_function_t unformat_mpls_unicast_label;
+
+/* Parse mpls header. */
+unformat_function_t unformat_mpls_header;
+unformat_function_t unformat_pg_mpls_header;
+
+void mpls_sw_interface_enable_disable (mpls_main_t * mm,
+				       u32 sw_if_index,
+				       u8 is_enable);
+
+u8 mpls_sw_interface_is_enabled (u32 sw_if_index);
+
+int mpls_fib_reset_labels (u32 fib_id);
+
+#define foreach_mpls_input_next			\
+_(DROP, "error-drop")                           \
+_(LOOKUP, "mpls-lookup")
+
+typedef enum {
+#define _(s,n) MPLS_INPUT_NEXT_##s,
+  foreach_mpls_input_next
+#undef _
+  MPLS_INPUT_N_NEXT,
+} mpls_input_next_t;
+
+#define foreach_mpls_lookup_next        	\
+_(DROP, "error-drop")                           \
+_(IP4_INPUT, "ip4-input")                       \
+_(L2_OUTPUT, "l2-output")
+
+// FIXME remove.
+typedef enum {
+#define _(s,n) MPLS_LOOKUP_NEXT_##s,
+  foreach_mpls_lookup_next
+#undef _
+  MPLS_LOOKUP_N_NEXT,
+} mpls_lookup_next_t;
+
+#define foreach_mpls_output_next        	\
+_(DROP, "error-drop")
+
+typedef enum {
+#define _(s,n) MPLS_OUTPUT_NEXT_##s,
+  foreach_mpls_output_next
+#undef _
+  MPLS_OUTPUT_N_NEXT,
+} mpls_output_next_t;
+
+typedef struct {
+  u32 fib_index;
+  u32 entry_index;
+  u32 dest;
+  u32 s_bit;
+  u32 label;
+} show_mpls_fib_t;
+
+int
+mpls_dest_cmp(void * a1, void * a2);
+
+int
+mpls_fib_index_cmp(void * a1, void * a2);
+
+int
+mpls_label_cmp(void * a1, void * a2);
+
+#endif /* included_vnet_mpls_h */
diff --git a/src/vnet/mpls/mpls_features.c b/src/vnet/mpls/mpls_features.c
new file mode 100644
index 00000000..a7593c55
--- /dev/null
+++ b/src/vnet/mpls/mpls_features.c
@@ -0,0 +1,156 @@
+/*
+ * mpls_features.c: MPLS input and output features
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/mpls/mpls.h>
+
+always_inline uword
+mpls_terminate (vlib_main_t * vm,
+                vlib_node_runtime_t * node,
+                vlib_frame_t * frame,
+                int error_code)
+{
+  u32 * buffers = vlib_frame_vector_args (frame);
+  uword n_packets = frame->n_vectors;
+
+  vlib_error_drop_buffers (vm, node,
+                           buffers,
+                           /* stride */ 1,
+                           n_packets,
+                           /* next */ 0,
+                           mpls_input_node.index,
+                           error_code);
+
+  return n_packets;
+}
+
+static uword
+mpls_punt (vlib_main_t * vm,
+           vlib_node_runtime_t * node,
+           vlib_frame_t * frame)
+{
+    return (mpls_terminate(vm, node, frame, MPLS_ERROR_PUNT));
+}
+
+VLIB_REGISTER_NODE (mpls_punt_node) = {
+  .function = mpls_punt,
+  .name = "mpls-punt",
+  .vector_size = sizeof (u32),
+
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "error-punt",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (mpls_punt_node, mpls_punt)
+
+static uword
+mpls_drop (vlib_main_t * vm,
+           vlib_node_runtime_t * node,
+           vlib_frame_t * frame)
+{
+    return (mpls_terminate(vm, node, frame, MPLS_ERROR_DROP));
+}
+
+VLIB_REGISTER_NODE (mpls_drop_node) = {
+  .function = mpls_drop,
+  .name = "mpls-drop",
+  .vector_size = sizeof (u32),
+
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (mpls_drop_node, mpls_drop)
+
+static uword
+mpls_not_enabled (vlib_main_t * vm,
+                  vlib_node_runtime_t * node,
+                  vlib_frame_t * frame)
+{
+    return (mpls_terminate(vm, node, frame, MPLS_ERROR_NOT_ENABLED));
+}
+
+VLIB_REGISTER_NODE (mpls_not_enabled_node) = {
+  .function = mpls_not_enabled,
+  .name = "mpls-not-enabled",
+  .vector_size = sizeof (u32),
+
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (mpls_not_enabled_node, mpls_not_enabled)
+
+VNET_FEATURE_ARC_INIT (mpls_input, static) =
+{
+  .arc_name  = "mpls-input",
+  .start_nodes = VNET_FEATURES ("mpls-input"),
+  .arc_index_ptr = &mpls_main.input_feature_arc_index,
+};
+
+VNET_FEATURE_INIT (mpls_lookup, static) = {
+  .arc_name = "mpls-input",
+  .node_name = "mpls-lookup",
+  .runs_before = VNET_FEATURES ("mpls-not-enabled"),
+};
+
+VNET_FEATURE_INIT (mpls_not_enabled, static) = {
+  .arc_name = "mpls-input",
+  .node_name = "mpls-not-enabled",
+  .runs_before = VNET_FEATURES (0), /* not before any other features */
+};
+
+VNET_FEATURE_ARC_INIT (mpls_output, static) =
+{
+  .arc_name  = "mpls-output",
+  .start_nodes = VNET_FEATURES ("mpls-output", "mpls-midchain"),
+  .arc_index_ptr = &mpls_main.output_feature_arc_index,
+};
+
+/* Built-in ip4 tx feature path definition */
+VNET_FEATURE_INIT (mpls_interface_output, static) = {
+  .arc_name = "mpls-output",
+  .node_name = "interface-output",
+  .runs_before = 0, /* not before any other features */
+};
+
+static clib_error_t *
+mpls_sw_interface_add_del (vnet_main_t * vnm,
+                           u32 sw_if_index,
+                           u32 is_add)
+{
+  mpls_main_t * mm = &mpls_main;
+
+  vec_validate_init_empty (mm->mpls_enabled_by_sw_if_index, sw_if_index, 0);
+  vec_validate_init_empty (mm->fib_index_by_sw_if_index, sw_if_index, 0);
+
+  vnet_feature_enable_disable ("mpls-input", "mpls-not-enabled", sw_if_index,
+			       is_add, 0, 0);
+  vnet_feature_enable_disable ("mpls-output", "interface-output", sw_if_index,
+			       is_add, 0, 0);
+
+  return /* no error */ 0;
+}
+
+VNET_SW_INTERFACE_ADD_DEL_FUNCTION (mpls_sw_interface_add_del);
+
+
diff --git a/src/vnet/mpls/mpls_lookup.c b/src/vnet/mpls/mpls_lookup.c
new file mode 100644
index 00000000..2d34cbde
--- /dev/null
+++ b/src/vnet/mpls/mpls_lookup.c
@@ -0,0 +1,531 @@
+/*
+ * mpls_lookup.c: MPLS lookup
+ *
+ * Copyright (c) 2012-2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/mpls/mpls.h>
+#include <vnet/fib/mpls_fib.h>
+#include <vnet/dpo/load_balance.h>
+
+vlib_node_registration_t mpls_lookup_node;
+
+typedef struct {
+  u32 next_index;
+  u32 lb_index;
+  u32 lfib_index;
+  u32 label_net_byte_order;
+  u32 hash;
+} mpls_lookup_trace_t;
+
+static u8 *
+format_mpls_lookup_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  mpls_lookup_trace_t * t = va_arg (*args, mpls_lookup_trace_t *);
+
+  s = format (s, "MPLS: next [%d], lookup fib index %d, LB index %d hash %d"
+              "label %d eos %d", 
+              t->next_index, t->lfib_index, t->lb_index, t->hash,
+              vnet_mpls_uc_get_label(
+                  clib_net_to_host_u32(t->label_net_byte_order)),
+              vnet_mpls_uc_get_s(t->label_net_byte_order));
+  return s;
+}
+
+/*
+ * Compute flow hash. 
+ * We'll use it to select which adjacency to use for this flow.  And other things.
+ */
+always_inline u32
+mpls_compute_flow_hash (const mpls_unicast_header_t * hdr,
+                        flow_hash_config_t flow_hash_config)
+{
+    // FIXME
+    return (vnet_mpls_uc_get_label(hdr->label_exp_s_ttl));
+}
+
+static inline uword
+mpls_lookup (vlib_main_t * vm,
+             vlib_node_runtime_t * node,
+             vlib_frame_t * from_frame)
+{
+  vlib_combined_counter_main_t * cm = &load_balance_main.lbm_to_counters;
+  u32 n_left_from, next_index, * from, * to_next;
+  mpls_main_t * mm = &mpls_main;
+  u32 cpu_index = os_get_cpu_number();
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+                           to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+        {
+          u32 lbi0, next0, lfib_index0, bi0, hash_c0;
+          const mpls_unicast_header_t * h0;
+          const load_balance_t *lb0;
+          const dpo_id_t *dpo0;
+          vlib_buffer_t * b0;
+          u32 lbi1, next1, lfib_index1, bi1, hash_c1;
+          const mpls_unicast_header_t * h1;
+          const load_balance_t *lb1;
+          const dpo_id_t *dpo1;
+          vlib_buffer_t * b1;
+
+           /* Prefetch next iteration. */
+          {
+            vlib_buffer_t * p2, * p3;
+
+            p2 = vlib_get_buffer (vm, from[2]);
+            p3 = vlib_get_buffer (vm, from[3]);
+
+            vlib_prefetch_buffer_header (p2, STORE);
+            vlib_prefetch_buffer_header (p3, STORE);
+
+            CLIB_PREFETCH (p2->data, sizeof (h0[0]), STORE);
+            CLIB_PREFETCH (p3->data, sizeof (h0[0]), STORE);
+          }
+
+          bi0 = to_next[0] = from[0];
+          bi1 = to_next[1] = from[1];
+
+          from += 2;
+          n_left_from -= 2;
+          to_next += 2;
+          n_left_to_next -= 2;
+
+          b0 = vlib_get_buffer (vm, bi0);
+          b1 = vlib_get_buffer (vm, bi1);
+          h0 = vlib_buffer_get_current (b0);
+          h1 = vlib_buffer_get_current (b1);
+
+          lfib_index0 = vec_elt(mm->fib_index_by_sw_if_index,
+                                vnet_buffer(b0)->sw_if_index[VLIB_RX]);
+          lfib_index1 = vec_elt(mm->fib_index_by_sw_if_index,
+                                vnet_buffer(b1)->sw_if_index[VLIB_RX]);
+
+          lbi0 = mpls_fib_table_forwarding_lookup (lfib_index0, h0);
+          lbi1 = mpls_fib_table_forwarding_lookup (lfib_index1, h1);
+          lb0 = load_balance_get(lbi0);
+          lb1 = load_balance_get(lbi1);
+
+          hash_c0 = vnet_buffer(b0)->ip.flow_hash = 0;
+          hash_c1 = vnet_buffer(b1)->ip.flow_hash = 0;
+
+          if (PREDICT_FALSE(lb0->lb_n_buckets > 1))
+          {
+              hash_c0 = vnet_buffer (b0)->ip.flow_hash =
+                  mpls_compute_flow_hash(h0, lb0->lb_hash_config);
+          }
+          if (PREDICT_FALSE(lb1->lb_n_buckets > 1))
+          {
+              hash_c1 = vnet_buffer (b1)->ip.flow_hash =
+                  mpls_compute_flow_hash(h1, lb1->lb_hash_config);
+          }
+
+          ASSERT (lb0->lb_n_buckets > 0);
+          ASSERT (is_pow2 (lb0->lb_n_buckets));
+          ASSERT (lb1->lb_n_buckets > 0);
+          ASSERT (is_pow2 (lb1->lb_n_buckets));
+
+          dpo0 = load_balance_get_bucket_i(lb0,
+                                           (hash_c0 &
+                                            (lb0->lb_n_buckets_minus_1)));
+          dpo1 = load_balance_get_bucket_i(lb1,
+                                           (hash_c1 &
+                                            (lb1->lb_n_buckets_minus_1)));
+
+          next0 = dpo0->dpoi_next_node;
+          next1 = dpo1->dpoi_next_node;
+
+          vnet_buffer (b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+          vnet_buffer (b1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
+
+          vlib_increment_combined_counter
+              (cm, cpu_index, lbi0, 1,
+               vlib_buffer_length_in_chain (vm, b0));
+          vlib_increment_combined_counter
+              (cm, cpu_index, lbi1, 1,
+               vlib_buffer_length_in_chain (vm, b1));
+
+          /*
+           * before we pop the label copy th values we need to maintain.
+           * The label header is in network byte order.
+           *  last byte is the TTL.
+           *  bits 2 to 4 inclusive are the EXP bits
+           */
+          vnet_buffer (b0)->mpls.ttl = ((char*)h0)[3];
+          vnet_buffer (b0)->mpls.exp = (((char*)h0)[2] & 0xe) >> 1;
+          vnet_buffer (b0)->mpls.first = 1;
+          vnet_buffer (b1)->mpls.ttl = ((char*)h1)[3];
+          vnet_buffer (b1)->mpls.exp = (((char*)h1)[2] & 0xe) >> 1;
+          vnet_buffer (b1)->mpls.first = 1;
+
+          /*
+           * pop the label that was just used in the lookup
+           */
+          vlib_buffer_advance(b0, sizeof(*h0));
+          vlib_buffer_advance(b1, sizeof(*h1));
+
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+          {
+              mpls_lookup_trace_t *tr = vlib_add_trace (vm, node,
+                                                        b0, sizeof (*tr));
+              tr->next_index = next0;
+              tr->lb_index = lbi0;
+              tr->lfib_index = lfib_index0;
+              tr->hash = hash_c0;
+              tr->label_net_byte_order = h0->label_exp_s_ttl;
+          }
+
+          if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
+          {
+              mpls_lookup_trace_t *tr = vlib_add_trace (vm, node,
+                                                        b1, sizeof (*tr));
+              tr->next_index = next1;
+              tr->lb_index = lbi1;
+              tr->lfib_index = lfib_index1;
+              tr->hash = hash_c1;
+              tr->label_net_byte_order = h1->label_exp_s_ttl;
+          }
+
+          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+                                           to_next, n_left_to_next,
+                                           bi0, bi1, next0, next1);
+        }
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+      {
+          u32 lbi0, next0, lfib_index0, bi0, hash_c0;
+          const mpls_unicast_header_t * h0;
+          const load_balance_t *lb0;
+          const dpo_id_t *dpo0;
+          vlib_buffer_t * b0;
+
+          bi0 = from[0];
+          to_next[0] = bi0;
+          from += 1;
+          to_next += 1;
+          n_left_from -= 1;
+          n_left_to_next -= 1;
+
+          b0 = vlib_get_buffer (vm, bi0);
+          h0 = vlib_buffer_get_current (b0);
+
+          lfib_index0 = vec_elt(mm->fib_index_by_sw_if_index,
+                                vnet_buffer(b0)->sw_if_index[VLIB_RX]);
+
+          lbi0 = mpls_fib_table_forwarding_lookup(lfib_index0, h0);
+	  lb0 = load_balance_get(lbi0);
+
+          hash_c0 = vnet_buffer(b0)->ip.flow_hash = 0;
+          if (PREDICT_FALSE(lb0->lb_n_buckets > 1))
+          {
+              hash_c0 = vnet_buffer (b0)->ip.flow_hash =
+                  mpls_compute_flow_hash(h0, lb0->lb_hash_config);
+          }
+
+          ASSERT (lb0->lb_n_buckets > 0);
+          ASSERT (is_pow2 (lb0->lb_n_buckets));
+
+          dpo0 = load_balance_get_bucket_i(lb0,
+                                           (hash_c0 &
+                                            (lb0->lb_n_buckets_minus_1)));
+
+          next0 = dpo0->dpoi_next_node;
+          vnet_buffer (b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+
+          vlib_increment_combined_counter
+              (cm, cpu_index, lbi0, 1,
+               vlib_buffer_length_in_chain (vm, b0));
+
+          /*
+           * before we pop the label copy th values we need to maintain.
+           * The label header is in network byte order.
+           *  last byte is the TTL.
+           *  bits 2 to 4 inclusive are the EXP bits
+           */
+          vnet_buffer (b0)->mpls.ttl = ((char*)h0)[3];
+          vnet_buffer (b0)->mpls.exp = (((char*)h0)[2] & 0xe) >> 1;
+          vnet_buffer (b0)->mpls.first = 1;
+
+          /*
+           * pop the label that was just used in the lookup
+           */
+          vlib_buffer_advance(b0, sizeof(*h0));
+
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+          {
+              mpls_lookup_trace_t *tr = vlib_add_trace (vm, node,
+                                                        b0, sizeof (*tr));
+              tr->next_index = next0;
+              tr->lb_index = lbi0;
+              tr->lfib_index = lfib_index0;
+              tr->hash = hash_c0;
+              tr->label_net_byte_order = h0->label_exp_s_ttl;
+          }
+
+          vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+                                           to_next, n_left_to_next,
+                                           bi0, next0);
+        }
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, mpls_lookup_node.index,
+                               MPLS_ERROR_PKTS_DECAP, from_frame->n_vectors);
+  return from_frame->n_vectors;
+}
+
+static char * mpls_error_strings[] = {
+#define mpls_error(n,s) s,
+#include "error.def"
+#undef mpls_error
+};
+
+VLIB_REGISTER_NODE (mpls_lookup_node) = {
+  .function = mpls_lookup,
+  .name = "mpls-lookup",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+  .n_errors = MPLS_N_ERROR,
+  .error_strings = mpls_error_strings,
+
+  .sibling_of = "ip4-lookup",
+
+  .format_buffer = format_mpls_header,
+  .format_trace = format_mpls_lookup_trace,
+  .unformat_buffer = unformat_mpls_header,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (mpls_lookup_node, mpls_lookup)
+
+typedef struct {
+  u32 next_index;
+  u32 lb_index;
+  u32 hash;
+} mpls_load_balance_trace_t;
+
+static u8 *
+format_mpls_load_balance_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  mpls_load_balance_trace_t * t = va_arg (*args, mpls_load_balance_trace_t *);
+
+  s = format (s, "MPLS: next [%d], LB index %d hash %d",
+              t->next_index, t->lb_index, t->hash);
+  return s;
+}
+
+always_inline uword
+mpls_load_balance (vlib_main_t * vm,
+                  vlib_node_runtime_t * node,
+                  vlib_frame_t * frame)
+{
+  vlib_combined_counter_main_t * cm = &load_balance_main.lbm_via_counters;
+  u32 n_left_from, n_left_to_next, * from, * to_next;
+  u32 cpu_index = os_get_cpu_number();
+  u32 next;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next,
+                           to_next, n_left_to_next);
+
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+        {
+          mpls_lookup_next_t next0, next1;
+          const load_balance_t *lb0, *lb1;
+          vlib_buffer_t * p0, *p1;
+          u32 pi0, lbi0, hc0, pi1, lbi1, hc1;
+          const mpls_unicast_header_t *mpls0, *mpls1;
+          const dpo_id_t *dpo0, *dpo1;
+
+          /* Prefetch next iteration. */
+          {
+            vlib_buffer_t * p2, * p3;
+
+            p2 = vlib_get_buffer (vm, from[2]);
+            p3 = vlib_get_buffer (vm, from[3]);
+
+            vlib_prefetch_buffer_header (p2, STORE);
+            vlib_prefetch_buffer_header (p3, STORE);
+
+            CLIB_PREFETCH (p2->data, sizeof (mpls0[0]), STORE);
+            CLIB_PREFETCH (p3->data, sizeof (mpls0[0]), STORE);
+          }
+
+          pi0 = to_next[0] = from[0];
+          pi1 = to_next[1] = from[1];
+
+          from += 2;
+          n_left_from -= 2;
+          to_next += 2;
+          n_left_to_next -= 2;
+
+          p0 = vlib_get_buffer (vm, pi0);
+          p1 = vlib_get_buffer (vm, pi1);
+
+          mpls0 = vlib_buffer_get_current (p0);
+          mpls1 = vlib_buffer_get_current (p1);
+          lbi0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+          lbi1 = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
+
+          lb0 = load_balance_get(lbi0);
+          lb1 = load_balance_get(lbi1);
+
+          /*
+           * this node is for via FIBs we can re-use the hash value from the
+           * to node if present.
+           * We don't want to use the same hash value at each level in the recursion
+           * graph as that would lead to polarisation
+           */
+          hc0 = vnet_buffer (p0)->ip.flow_hash = 0;
+          hc1 = vnet_buffer (p1)->ip.flow_hash = 0;
+
+          if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
+          {
+              if (PREDICT_TRUE (vnet_buffer(p0)->ip.flow_hash))
+              {
+                  hc0 = vnet_buffer(p0)->ip.flow_hash = vnet_buffer(p0)->ip.flow_hash >> 1;
+              }
+              else
+              {
+                  hc0 = vnet_buffer(p0)->ip.flow_hash = mpls_compute_flow_hash(mpls0, hc0);
+              }
+          }
+          if (PREDICT_FALSE (lb1->lb_n_buckets > 1))
+          {
+              if (PREDICT_TRUE (vnet_buffer(p1)->ip.flow_hash))
+              {
+                  hc1 = vnet_buffer(p1)->ip.flow_hash = vnet_buffer(p1)->ip.flow_hash >> 1;
+              }
+              else
+              {
+                  hc1 = vnet_buffer(p1)->ip.flow_hash = mpls_compute_flow_hash(mpls1, hc1);
+              }
+          }
+
+          dpo0 = load_balance_get_bucket_i(lb0, hc0 & (lb0->lb_n_buckets_minus_1));
+          dpo1 = load_balance_get_bucket_i(lb1, hc1 & (lb1->lb_n_buckets_minus_1));
+
+          next0 = dpo0->dpoi_next_node;
+          next1 = dpo1->dpoi_next_node;
+
+          vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+          vnet_buffer (p1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
+
+          vlib_increment_combined_counter
+              (cm, cpu_index, lbi0, 1,
+               vlib_buffer_length_in_chain (vm, p0));
+          vlib_increment_combined_counter
+              (cm, cpu_index, lbi1, 1,
+               vlib_buffer_length_in_chain (vm, p1));
+
+          if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED))
+          {
+              mpls_load_balance_trace_t *tr = vlib_add_trace (vm, node,
+                                                              p0, sizeof (*tr));
+              tr->next_index = next0;
+              tr->lb_index = lbi0;
+              tr->hash = hc0;
+          }
+
+          vlib_validate_buffer_enqueue_x2 (vm, node, next,
+                                           to_next, n_left_to_next,
+                                           pi0, pi1, next0, next1);
+       }
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+        {
+          mpls_lookup_next_t next0;
+          const load_balance_t *lb0;
+          vlib_buffer_t * p0;
+          u32 pi0, lbi0, hc0;
+          const mpls_unicast_header_t *mpls0;
+          const dpo_id_t *dpo0;
+
+          pi0 = from[0];
+          to_next[0] = pi0;
+          from += 1;
+          to_next += 1;
+          n_left_to_next -= 1;
+          n_left_from -= 1;
+
+          p0 = vlib_get_buffer (vm, pi0);
+
+          mpls0 = vlib_buffer_get_current (p0);
+          lbi0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+
+          lb0 = load_balance_get(lbi0);
+
+          hc0 = vnet_buffer (p0)->ip.flow_hash = 0;
+          if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
+          {
+              if (PREDICT_TRUE (vnet_buffer(p0)->ip.flow_hash))
+              {
+                  hc0 = vnet_buffer(p0)->ip.flow_hash = vnet_buffer(p0)->ip.flow_hash >> 1;
+              }
+              else
+              {
+                  hc0 = vnet_buffer(p0)->ip.flow_hash = mpls_compute_flow_hash(mpls0, hc0);
+              }
+          }
+
+          dpo0 = load_balance_get_bucket_i(lb0, hc0 & (lb0->lb_n_buckets_minus_1));
+
+          next0 = dpo0->dpoi_next_node;
+          vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
+
+          vlib_increment_combined_counter
+              (cm, cpu_index, lbi0, 1,
+               vlib_buffer_length_in_chain (vm, p0));
+
+          vlib_validate_buffer_enqueue_x1 (vm, node, next,
+                                           to_next, n_left_to_next,
+                                           pi0, next0);
+        }
+
+      vlib_put_next_frame (vm, node, next, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (mpls_load_balance_node) = {
+  .function = mpls_load_balance,
+  .name = "mpls-load-balance",
+  .vector_size = sizeof (u32),
+  .sibling_of = "mpls-lookup",
+
+  .format_trace = format_mpls_load_balance_trace,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (mpls_load_balance_node, mpls_load_balance)
diff --git a/src/vnet/mpls/mpls_output.c b/src/vnet/mpls/mpls_output.c
new file mode 100644
index 00000000..8292a0cb
--- /dev/null
+++ b/src/vnet/mpls/mpls_output.c
@@ -0,0 +1,479 @@
+/*
+ * mpls_output.c: MPLS Adj rewrite
+ *
+ * Copyright (c) 2012-2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ip/ip.h>
+#include <vnet/mpls/mpls.h>
+
+typedef struct {
+  /* Adjacency taken. */
+  u32 adj_index;
+  u32 flow_hash;
+
+  /* Packet data, possibly *after* rewrite. */
+  u8 packet_data[64 - 1*sizeof(u32)];
+} mpls_output_trace_t;
+
+static u8 *
+format_mpls_output_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  mpls_output_trace_t * t = va_arg (*args, mpls_output_trace_t *);
+  vnet_main_t * vnm = vnet_get_main();
+  uword indent = format_get_indent (s);
+
+  s = format (s, "adj-idx %d : %U flow hash: 0x%08x",
+              t->adj_index,
+              format_ip_adjacency, t->adj_index, FORMAT_IP_ADJACENCY_NONE,
+	      t->flow_hash);
+  s = format (s, "\n%U%U",
+              format_white_space, indent,
+              format_ip_adjacency_packet_data,
+              vnm, t->adj_index,
+              t->packet_data, sizeof (t->packet_data));
+  return s;
+}
+
+static inline uword
+mpls_output_inline (vlib_main_t * vm,
+                    vlib_node_runtime_t * node,
+                    vlib_frame_t * from_frame,
+		    int is_midchain)
+{
+  u32 n_left_from, next_index, * from, * to_next, cpu_index;
+  vlib_node_runtime_t * error_node;
+  u32 n_left_to_next;
+
+  cpu_index = os_get_cpu_number();
+  error_node = vlib_node_get_runtime (vm, mpls_output_node.index);
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index,
+                           to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+        {
+          ip_adjacency_t * adj0;
+          mpls_unicast_header_t *hdr0;
+          vlib_buffer_t * p0;
+          u32 pi0, rw_len0, adj_index0, next0, error0;
+
+          ip_adjacency_t * adj1;
+          mpls_unicast_header_t *hdr1;
+          vlib_buffer_t * p1;
+          u32 pi1, rw_len1, adj_index1, next1, error1;
+
+          /* Prefetch next iteration. */
+          {
+            vlib_buffer_t * p2, * p3;
+
+            p2 = vlib_get_buffer (vm, from[2]);
+            p3 = vlib_get_buffer (vm, from[3]);
+
+            vlib_prefetch_buffer_header (p2, STORE);
+            vlib_prefetch_buffer_header (p3, STORE);
+
+            CLIB_PREFETCH (p2->data, sizeof (hdr0[0]), STORE);
+            CLIB_PREFETCH (p3->data, sizeof (hdr1[0]), STORE);
+          }
+
+          pi0 = to_next[0] = from[0];
+          pi1 = to_next[1] = from[1];
+
+          from += 2;
+          n_left_from -= 2;
+          to_next += 2;
+          n_left_to_next -= 2;
+
+          p0 = vlib_get_buffer (vm, pi0);
+          p1 = vlib_get_buffer (vm, pi1);
+
+          adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+          adj_index1 = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
+
+          /* We should never rewrite a pkt using the MISS adjacency */
+          ASSERT(adj_index0);
+          ASSERT(adj_index1);
+
+          adj0 = adj_get(adj_index0);
+          adj1 = adj_get(adj_index1);
+          hdr0 = vlib_buffer_get_current (p0);
+          hdr1 = vlib_buffer_get_current (p1);
+
+          /* Guess we are only writing on simple Ethernet header. */
+          vnet_rewrite_two_headers (adj0[0], adj1[0], hdr0, hdr1,
+                                   sizeof (ethernet_header_t));
+
+          /* Update packet buffer attributes/set output interface. */
+          rw_len0 = adj0[0].rewrite_header.data_bytes;
+          rw_len1 = adj1[0].rewrite_header.data_bytes;
+
+          if (PREDICT_FALSE (rw_len0 > sizeof(ethernet_header_t)))
+              vlib_increment_combined_counter
+                  (&adjacency_counters,
+                   cpu_index, adj_index0,
+                   /* packet increment */ 0,
+                   /* byte increment */ rw_len0-sizeof(ethernet_header_t));
+          if (PREDICT_FALSE (rw_len1 > sizeof(ethernet_header_t)))
+              vlib_increment_combined_counter
+                  (&adjacency_counters,
+                   cpu_index, adj_index1,
+                   /* packet increment */ 0,
+                   /* byte increment */ rw_len1-sizeof(ethernet_header_t));
+
+          /* Check MTU of outgoing interface. */
+          if (PREDICT_TRUE(vlib_buffer_length_in_chain (vm, p0) <=
+                           adj0[0].rewrite_header.max_l3_packet_bytes))
+            {
+              p0->current_data -= rw_len0;
+              p0->current_length += rw_len0;
+
+              vnet_buffer (p0)->sw_if_index[VLIB_TX] =
+                  adj0[0].rewrite_header.sw_if_index;
+              next0 = adj0[0].rewrite_header.next_index;
+              error0 = IP4_ERROR_NONE;
+
+              if (is_midchain)
+                {
+                  adj0->sub_type.midchain.fixup_func(vm, adj0, p0);
+                }
+            }
+          else
+            {
+              error0 = IP4_ERROR_MTU_EXCEEDED;
+              next0 = MPLS_OUTPUT_NEXT_DROP;
+            }
+          if (PREDICT_TRUE(vlib_buffer_length_in_chain (vm, p1) <=
+                           adj1[0].rewrite_header.max_l3_packet_bytes))
+            {
+              p1->current_data -= rw_len1;
+              p1->current_length += rw_len1;
+
+              vnet_buffer (p1)->sw_if_index[VLIB_TX] =
+                  adj1[0].rewrite_header.sw_if_index;
+              next1 = adj1[0].rewrite_header.next_index;
+              error1 = IP4_ERROR_NONE;
+
+              if (is_midchain)
+                {
+                  adj1->sub_type.midchain.fixup_func(vm, adj1, p1);
+                }
+            }
+          else
+            {
+              error1 = IP4_ERROR_MTU_EXCEEDED;
+              next1 = MPLS_OUTPUT_NEXT_DROP;
+            }
+
+          p0->error = error_node->errors[error0];
+          p1->error = error_node->errors[error1];
+
+          if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED))
+            {
+              mpls_output_trace_t *tr = vlib_add_trace (vm, node,
+                                                        p0, sizeof (*tr));
+              tr->adj_index = vnet_buffer(p0)->ip.adj_index[VLIB_TX];
+              tr->flow_hash = vnet_buffer(p0)->ip.flow_hash;
+            }
+          if (PREDICT_FALSE(p1->flags & VLIB_BUFFER_IS_TRACED))
+            {
+              mpls_output_trace_t *tr = vlib_add_trace (vm, node,
+                                                        p1, sizeof (*tr));
+              tr->adj_index = vnet_buffer(p1)->ip.adj_index[VLIB_TX];
+              tr->flow_hash = vnet_buffer(p1)->ip.flow_hash;
+            }
+
+          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+                                           to_next, n_left_to_next,
+                                           pi0, pi1, next0, next1);
+        }
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+        {
+	  ip_adjacency_t * adj0;
+          mpls_unicast_header_t *hdr0;
+	  vlib_buffer_t * p0;
+	  u32 pi0, rw_len0, adj_index0, next0, error0;
+
+	  pi0 = to_next[0] = from[0];
+
+	  p0 = vlib_get_buffer (vm, pi0);
+
+	  adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+
+          /* We should never rewrite a pkt using the MISS adjacency */
+          ASSERT(adj_index0);
+
+	  adj0 = adj_get(adj_index0);
+      	  hdr0 = vlib_buffer_get_current (p0);
+
+	  /* Guess we are only writing on simple Ethernet header. */
+          vnet_rewrite_one_header (adj0[0], hdr0, 
+                                   sizeof (ethernet_header_t));
+          
+          /* Update packet buffer attributes/set output interface. */
+          rw_len0 = adj0[0].rewrite_header.data_bytes;
+          
+          if (PREDICT_FALSE (rw_len0 > sizeof(ethernet_header_t)))
+              vlib_increment_combined_counter 
+                  (&adjacency_counters,
+                   cpu_index, adj_index0, 
+                   /* packet increment */ 0,
+                   /* byte increment */ rw_len0-sizeof(ethernet_header_t));
+          
+          /* Check MTU of outgoing interface. */
+          if (PREDICT_TRUE(vlib_buffer_length_in_chain (vm, p0) <=
+                           adj0[0].rewrite_header.max_l3_packet_bytes))
+            {
+              p0->current_data -= rw_len0;
+              p0->current_length += rw_len0;
+
+              vnet_buffer (p0)->sw_if_index[VLIB_TX] =
+                  adj0[0].rewrite_header.sw_if_index;
+              next0 = adj0[0].rewrite_header.next_index;
+              error0 = IP4_ERROR_NONE;
+
+	      if (is_midchain)
+	        {
+		  adj0->sub_type.midchain.fixup_func(vm, adj0, p0);
+		}
+            }
+          else
+            {
+              error0 = IP4_ERROR_MTU_EXCEEDED;
+              next0 = MPLS_OUTPUT_NEXT_DROP;
+            }
+	  p0->error = error_node->errors[error0];
+
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+      
+          if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED)) 
+            {
+              mpls_output_trace_t *tr = vlib_add_trace (vm, node, 
+                                                        p0, sizeof (*tr));
+              tr->adj_index = vnet_buffer(p0)->ip.adj_index[VLIB_TX];
+              tr->flow_hash = vnet_buffer(p0)->ip.flow_hash;
+            }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, next0);
+        }
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, mpls_output_node.index,
+                               MPLS_ERROR_PKTS_ENCAP,
+                               from_frame->n_vectors);
+
+  return from_frame->n_vectors;
+}
+
+static char * mpls_error_strings[] = {
+#define mpls_error(n,s) s,
+#include "error.def"
+#undef mpls_error
+};
+
+static inline uword
+mpls_output (vlib_main_t * vm,
+             vlib_node_runtime_t * node,
+             vlib_frame_t * from_frame)
+{
+    return (mpls_output_inline(vm, node, from_frame, /* is_midchain */ 0));
+}
+
+VLIB_REGISTER_NODE (mpls_output_node) = {
+  .function = mpls_output,
+  .name = "mpls-output",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+  .n_errors = MPLS_N_ERROR,
+  .error_strings = mpls_error_strings,
+
+  .n_next_nodes = MPLS_OUTPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [MPLS_OUTPUT_NEXT_##s] = n,
+    foreach_mpls_output_next
+#undef _
+  },
+
+  .format_trace = format_mpls_output_trace,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (mpls_output_node, mpls_output)
+
+static inline uword
+mpls_midchain (vlib_main_t * vm,
+               vlib_node_runtime_t * node,
+               vlib_frame_t * from_frame)
+{
+    return (mpls_output_inline(vm, node, from_frame, /* is_midchain */ 1));
+}
+
+VLIB_REGISTER_NODE (mpls_midchain_node) = {
+  .function = mpls_midchain,
+  .name = "mpls-midchain",
+  .vector_size = sizeof (u32),
+
+  .format_trace = format_mpls_output_trace,
+
+  .sibling_of = "mpls-output",
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (mpls_midchain_node, mpls_midchain)
+
+/**
+ * @brief Next index values from the MPLS incomplete adj node
+ */
+#define foreach_mpls_adj_incomplete_next       	\
+_(DROP, "error-drop")                   \
+_(IP4,  "ip4-arp")                      \
+_(IP6,  "ip6-discover-neighbor")
+
+typedef enum {
+#define _(s,n) MPLS_ADJ_INCOMPLETE_NEXT_##s,
+  foreach_mpls_adj_incomplete_next
+#undef _
+  MPLS_ADJ_INCOMPLETE_N_NEXT,
+} mpls_adj_incomplete_next_t;
+
+/**
+ * @brief A struct to hold tracing information for the MPLS label imposition
+ * node.
+ */
+typedef struct mpls_adj_incomplete_trace_t_
+{
+    u32 next;
+} mpls_adj_incomplete_trace_t;
+
+
+/**
+ * @brief Graph node for incomplete MPLS adjacency.
+ * This node will push traffic to either the v4-arp or v6-nd node
+ * based on the next-hop proto of the adj.
+ * We pay a cost for this 'routing' node, but an incomplete adj is the
+ * exception case.
+ */
+static inline uword
+mpls_adj_incomplete (vlib_main_t * vm,
+                     vlib_node_runtime_t * node,
+                     vlib_frame_t * from_frame)
+{
+    u32 n_left_from, next_index, * from, * to_next;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+                           to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+        {
+          u32 pi0, next0, adj_index0;
+	  ip_adjacency_t * adj0;
+	  vlib_buffer_t * p0;
+
+ 	  pi0 = to_next[0] = from[0];
+	  p0 = vlib_get_buffer (vm, pi0);
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+          adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+          ASSERT(adj_index0);
+
+	  adj0 = adj_get(adj_index0);
+
+          if (PREDICT_TRUE(FIB_PROTOCOL_IP4 == adj0->ia_nh_proto))
+          {
+              next0 = MPLS_ADJ_INCOMPLETE_NEXT_IP4;
+          }
+          else
+          {
+              next0 = MPLS_ADJ_INCOMPLETE_NEXT_IP6;
+          }              
+
+	  if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED)) 
+	  {
+	      mpls_adj_incomplete_trace_t *tr =
+		  vlib_add_trace (vm, node, p0, sizeof (*tr));
+	      tr->next = next0;
+	  }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   pi0, next0);
+        }
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+static u8 *
+format_mpls_adj_incomplete_trace (u8 * s, va_list * args)
+{
+    CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+    CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+    mpls_adj_incomplete_trace_t * t;
+    uword indent;
+
+    t = va_arg (*args, mpls_adj_incomplete_trace_t *);
+    indent = format_get_indent (s);
+
+    s = format (s, "%Unext:%d",
+                format_white_space, indent,
+                t->next);
+    return (s);
+}
+
+VLIB_REGISTER_NODE (mpls_adj_incomplete_node) = {
+  .function = mpls_adj_incomplete,
+  .name = "mpls-adj-incomplete",
+  .format_trace = format_mpls_adj_incomplete_trace,
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+  .n_errors = MPLS_N_ERROR,
+  .error_strings = mpls_error_strings,
+
+  .n_next_nodes = MPLS_ADJ_INCOMPLETE_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [MPLS_ADJ_INCOMPLETE_NEXT_##s] = n,
+    foreach_mpls_adj_incomplete_next
+#undef _
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (mpls_adj_incomplete_node,
+                              mpls_adj_incomplete)
diff --git a/src/vnet/mpls/mpls_tunnel.c b/src/vnet/mpls/mpls_tunnel.c
new file mode 100644
index 00000000..8d1e30a3
--- /dev/null
+++ b/src/vnet/mpls/mpls_tunnel.c
@@ -0,0 +1,787 @@
+/*
+ * mpls_tunnel.c: MPLS tunnel interfaces (i.e. for RSVP-TE)
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/mpls/mpls_tunnel.h>
+#include <vnet/ip/ip.h>
+#include <vnet/fib/fib_path_list.h>
+#include <vnet/adj/adj_midchain.h>
+
+/**
+ * @brief pool of tunnel instances
+ */
+static mpls_tunnel_t *mpls_tunnel_pool;
+
+/**
+ * @brief Pool of free tunnel SW indices - i.e. recycled indices
+ */
+static u32 * mpls_tunnel_free_hw_if_indices;
+
+/**
+ * @brief DB of SW index to tunnel index
+ */
+static u32 *mpls_tunnel_db;
+
+/**
+ * @brief Get a tunnel object from a SW interface index
+ */
+static mpls_tunnel_t*
+mpls_tunnel_get_from_sw_if_index (u32 sw_if_index)
+{
+    if ((vec_len(mpls_tunnel_db) < sw_if_index) ||
+	(~0 == mpls_tunnel_db[sw_if_index]))
+	return (NULL);
+
+    return (pool_elt_at_index(mpls_tunnel_pool,
+			      mpls_tunnel_db[sw_if_index]));
+}
+
+/**
+ * @brief Return true if the label stack is imp-null only
+ */
+static fib_forward_chain_type_t
+mpls_tunnel_get_fwd_chain_type (const mpls_tunnel_t *mt)
+{
+    if ((1 == vec_len(mt->mt_label_stack)) &&
+	(mt->mt_label_stack[0] == MPLS_IETF_IMPLICIT_NULL_LABEL))
+    {
+	/*
+	 * the only label in the label stack is implicit null
+	 * we need to build an IP chain.
+	 */
+	if (FIB_PROTOCOL_IP4 == fib_path_list_get_proto(mt->mt_path_list))
+	{
+	    return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
+	}
+	else
+	{
+	    return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
+	}
+    }
+    else
+    {
+	return (FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS);
+    }
+}
+
+/**
+ * @brief Build a rewrite string for the MPLS tunnel.
+ *
+ * We have choices here;
+ *  1 - have an Adjacency with a zero length string and stack it on
+ *       MPLS label objects
+ *  2 - put the label header rewrites in the adjacency string.
+ *
+ * We choose 2 since it results in fewer graph nodes in the egress path
+ */
+static u8*
+mpls_tunnel_build_rewrite (vnet_main_t * vnm,
+			   u32 sw_if_index,
+			   vnet_link_t link_type,
+			   const void *dst_address)
+{
+    mpls_unicast_header_t *muh;
+    mpls_tunnel_t *mt;
+    u8 *rewrite;
+    u32 mti, ii;
+
+    rewrite = NULL;
+    mti = mpls_tunnel_db[sw_if_index];
+    mt = pool_elt_at_index(mpls_tunnel_pool, mti);
+
+    /*
+     * The vector must be allocated as u8 so the length is correct
+     */
+    ASSERT(0 < vec_len(mt->mt_label_stack));
+    vec_validate(rewrite, (sizeof(*muh) * vec_len(mt->mt_label_stack)) - 1);
+    ASSERT(rewrite);
+    muh = (mpls_unicast_header_t *)rewrite;
+
+    /*
+     * The last (inner most) label in the stack may be EOS, all the rest Non-EOS
+     */
+    for (ii = 0; ii < vec_len(mt->mt_label_stack)-1; ii++)
+    {
+	vnet_mpls_uc_set_label(&muh[ii].label_exp_s_ttl, mt->mt_label_stack[ii]);
+	vnet_mpls_uc_set_ttl(&muh[ii].label_exp_s_ttl, 255);
+	vnet_mpls_uc_set_exp(&muh[ii].label_exp_s_ttl, 0);
+	vnet_mpls_uc_set_s(&muh[ii].label_exp_s_ttl, MPLS_NON_EOS);
+	muh[ii].label_exp_s_ttl = clib_host_to_net_u32(muh[ii].label_exp_s_ttl);
+    }
+
+    vnet_mpls_uc_set_label(&muh[ii].label_exp_s_ttl, mt->mt_label_stack[ii]);
+    vnet_mpls_uc_set_ttl(&muh[ii].label_exp_s_ttl, 255);
+    vnet_mpls_uc_set_exp(&muh[ii].label_exp_s_ttl, 0);
+
+    if ((VNET_LINK_MPLS == link_type) &&
+	(mt->mt_label_stack[ii] != MPLS_IETF_IMPLICIT_NULL_LABEL))
+    {
+	vnet_mpls_uc_set_s(&muh[ii].label_exp_s_ttl, MPLS_NON_EOS);
+    }
+    else
+    {
+	vnet_mpls_uc_set_s(&muh[ii].label_exp_s_ttl, MPLS_EOS);
+    }
+
+    muh[ii].label_exp_s_ttl = clib_host_to_net_u32(muh[ii].label_exp_s_ttl);
+
+    return (rewrite);
+}
+
+/**
+ * mpls_tunnel_stack
+ *
+ * 'stack' (resolve the recursion for) the tunnel's midchain adjacency
+ */
+static void
+mpls_tunnel_stack (adj_index_t ai)
+{
+    ip_adjacency_t *adj;
+    mpls_tunnel_t *mt;
+    u32 sw_if_index;
+
+    adj = adj_get(ai);
+    sw_if_index = adj->rewrite_header.sw_if_index;
+
+    mt = mpls_tunnel_get_from_sw_if_index(sw_if_index);
+
+    if (NULL == mt)
+	return;
+
+    /*
+     * find the adjacency that is contributed by the FIB path-list
+     * that this tunnel resovles via, and use it as the next adj
+     * in the midchain
+     */
+    if (vnet_hw_interface_get_flags(vnet_get_main(),
+				    mt->mt_hw_if_index) &
+	VNET_HW_INTERFACE_FLAG_LINK_UP)
+    {
+	dpo_id_t dpo = DPO_INVALID;
+
+	fib_path_list_contribute_forwarding(mt->mt_path_list,
+					    mpls_tunnel_get_fwd_chain_type(mt),
+					    &dpo);
+
+	if (DPO_LOAD_BALANCE == dpo.dpoi_type)
+	{
+	    /*
+	     * we don't support multiple paths, so no need to load-balance.
+	     * pull the first and only choice and stack directly on that.
+	     */
+	    load_balance_t *lb;
+
+	    lb = load_balance_get (dpo.dpoi_index);
+
+	    ASSERT(1 == lb->lb_n_buckets);
+
+	    dpo_copy(&dpo, load_balance_get_bucket_i (lb, 0));
+	}
+
+	adj_nbr_midchain_stack(ai, &dpo);
+	dpo_reset(&dpo);
+    }
+    else
+    {
+	adj_nbr_midchain_unstack(ai);
+    }
+}
+
+/**
+ * @brief Call back when restacking all adjacencies on a MPLS interface
+ */
+static adj_walk_rc_t
+mpls_adj_walk_cb (adj_index_t ai,
+		 void *ctx)
+{
+    mpls_tunnel_stack(ai);
+
+    return (ADJ_WALK_RC_CONTINUE);
+}
+
+static void
+mpls_tunnel_restack (mpls_tunnel_t *mt)
+{
+    fib_protocol_t proto;
+
+    /*
+     * walk all the adjacencies on the MPLS interface and restack them
+     */
+    FOR_EACH_FIB_PROTOCOL(proto)
+    {
+	adj_nbr_walk(mt->mt_sw_if_index,
+		     proto,
+		     mpls_adj_walk_cb,
+		     NULL);
+    }
+}
+
+static clib_error_t *
+mpls_tunnel_admin_up_down (vnet_main_t * vnm,
+			   u32 hw_if_index,
+			   u32 flags)
+{
+    vnet_hw_interface_t * hi;
+    mpls_tunnel_t *mt;
+
+    hi = vnet_get_hw_interface (vnm, hw_if_index);
+
+    mt = mpls_tunnel_get_from_sw_if_index(hi->sw_if_index);
+
+    if (NULL == mt)
+	return (NULL);
+
+    if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+	vnet_hw_interface_set_flags (vnm, hw_if_index,
+				     VNET_HW_INTERFACE_FLAG_LINK_UP);
+    else
+	vnet_hw_interface_set_flags (vnm, hw_if_index, 0 /* down */);
+
+    mpls_tunnel_restack(mt);
+
+    return (NULL);
+}
+
+/**
+ * @brief Fixup the adj rewrite post encap. This is a no-op since the
+ * rewrite is a stack of labels.
+ */
+static void
+mpls_tunnel_fixup (vlib_main_t *vm,
+		   ip_adjacency_t *adj,
+		   vlib_buffer_t *b0)
+{
+}
+
+static void
+mpls_tunnel_update_adj (vnet_main_t * vnm,
+			u32 sw_if_index,
+			adj_index_t ai)
+{
+    adj_nbr_midchain_update_rewrite(
+	ai, mpls_tunnel_fixup, 
+	ADJ_MIDCHAIN_FLAG_NONE,
+	mpls_tunnel_build_rewrite(vnm, sw_if_index,
+				  adj_get_link_type(ai),
+				  NULL));
+
+    mpls_tunnel_stack(ai);
+}
+
+static u8 *
+format_mpls_tunnel_name (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  return format (s, "mpls-tunnel%d", dev_instance);
+}
+
+static u8 *
+format_mpls_tunnel_device (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  CLIB_UNUSED (int verbose) = va_arg (*args, int);
+
+  return (format (s, "MPLS-tunnel: id %d\n", dev_instance));
+}
+
+/**
+ * @brief Packet trace structure
+ */
+typedef struct mpls_tunnel_trace_t_
+{
+    /**
+   * Tunnel-id / index in tunnel vector
+   */
+  u32 tunnel_id;
+} mpls_tunnel_trace_t;
+
+static u8 *
+format_mpls_tunnel_tx_trace (u8 * s,
+			     va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  mpls_tunnel_trace_t * t = va_arg (*args, mpls_tunnel_trace_t *);
+
+  s = format (s, "MPLS: tunnel %d", t->tunnel_id);
+  return s;
+}
+
+/**
+ * @brief TX function. Only called L2. L3 traffic uses the adj-midchains
+ */
+static uword
+mpls_tunnel_tx (vlib_main_t * vm,
+		vlib_node_runtime_t * node,
+		vlib_frame_t * frame)
+{
+  u32 next_index;
+  u32 * from, * to_next, n_left_from, n_left_to_next;
+  vnet_interface_output_runtime_t * rd = (void *) node->runtime_data;
+  const mpls_tunnel_t *mt;
+
+  mt = pool_elt_at_index(mpls_tunnel_pool, rd->dev_instance);
+
+  /* Vector of buffer / pkt indices we're supposed to process */
+  from = vlib_frame_vector_args (frame);
+
+  /* Number of buffers / pkts */
+  n_left_from = frame->n_vectors;
+
+  /* Speculatively send the first buffer to the last disposition we used */
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      /* set up to enqueue to our disposition with index = next_index */
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /*
+       * FIXME DUAL LOOP
+       */
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t * b0;
+	  u32 bi0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer(vm, bi0);
+
+	  vnet_buffer(b0)->ip.adj_index[VLIB_TX] = mt->mt_l2_adj;
+
+	  if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      mpls_tunnel_trace_t *tr = vlib_add_trace (vm, node,
+						   b0, sizeof (*tr));
+	      tr->tunnel_id = rd->dev_instance;
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, mt->mt_l2_tx_arc);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+VNET_DEVICE_CLASS (mpls_tunnel_class) = {
+    .name = "MPLS tunnel device",
+    .format_device_name = format_mpls_tunnel_name,
+    .format_device = format_mpls_tunnel_device,
+    .format_tx_trace = format_mpls_tunnel_tx_trace,
+    .tx_function = mpls_tunnel_tx,
+    .admin_up_down_function = mpls_tunnel_admin_up_down,
+};
+
+VNET_HW_INTERFACE_CLASS (mpls_tunnel_hw_interface_class) = {
+  .name = "MPLS-Tunnel",
+//  .format_header = format_mpls_eth_header_with_length,
+//  .unformat_header = unformat_mpls_eth_header,
+  .update_adjacency = mpls_tunnel_update_adj,
+  .build_rewrite = mpls_tunnel_build_rewrite,
+  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
+};
+
+const mpls_tunnel_t *
+mpls_tunnel_get (u32 mti)
+{
+    return (pool_elt_at_index(mpls_tunnel_pool, mti));
+}
+
+/**
+ * @brief Walk all the MPLS tunnels
+ */
+void
+mpls_tunnel_walk (mpls_tunnel_walk_cb_t cb,
+		  void *ctx)
+{
+    u32 mti;
+
+    pool_foreach_index(mti, mpls_tunnel_pool,
+    ({
+	cb(mti, ctx);
+    }));
+}
+
+void
+vnet_mpls_tunnel_del (u32 sw_if_index)
+{
+    mpls_tunnel_t *mt;
+
+    mt = mpls_tunnel_get_from_sw_if_index(sw_if_index);
+
+    if (NULL == mt)
+	return;
+    
+    fib_path_list_child_remove(mt->mt_path_list,
+			       mt->mt_sibling_index);
+    if (ADJ_INDEX_INVALID != mt->mt_l2_adj)
+	adj_unlock(mt->mt_l2_adj);
+
+    vec_free(mt->mt_label_stack);
+
+    vec_add1 (mpls_tunnel_free_hw_if_indices, mt->mt_hw_if_index);
+    pool_put(mpls_tunnel_pool, mt);
+    mpls_tunnel_db[sw_if_index] = ~0;
+}
+
+void
+vnet_mpls_tunnel_add (fib_route_path_t *rpaths,
+		      mpls_label_t *label_stack,
+		      u8 l2_only,
+		      u32 *sw_if_index)
+{
+    vnet_hw_interface_t * hi;
+    mpls_tunnel_t *mt;
+    vnet_main_t * vnm;
+    u32 mti;
+
+    vnm = vnet_get_main();
+    pool_get(mpls_tunnel_pool, mt);
+    memset (mt, 0, sizeof (*mt));
+    mti = mt - mpls_tunnel_pool;
+    fib_node_init(&mt->mt_node, FIB_NODE_TYPE_MPLS_TUNNEL);
+    mt->mt_l2_adj = ADJ_INDEX_INVALID;
+
+    /*
+     * Create a new, or re=use and old, tunnel HW interface
+     */
+    if (vec_len (mpls_tunnel_free_hw_if_indices) > 0)
+    {
+	mt->mt_hw_if_index = 
+	    mpls_tunnel_free_hw_if_indices[vec_len(mpls_tunnel_free_hw_if_indices)-1];
+	_vec_len (mpls_tunnel_free_hw_if_indices) -= 1;
+	hi = vnet_get_hw_interface (vnm, mt->mt_hw_if_index);
+	hi->hw_instance = mti;
+	hi->dev_instance = mti;
+    }
+    else 
+    {
+	mt->mt_hw_if_index = vnet_register_interface(
+	                         vnm,
+				 mpls_tunnel_class.index,
+				 mti,
+				 mpls_tunnel_hw_interface_class.index,
+				 mti);
+	hi = vnet_get_hw_interface(vnm, mt->mt_hw_if_index);
+    }
+
+    /*
+     * Add the new tunnel to the tunnel DB - key:SW if index
+     */
+    mt->mt_sw_if_index = hi->sw_if_index;
+    vec_validate_init_empty(mpls_tunnel_db, mt->mt_sw_if_index, ~0);
+    mpls_tunnel_db[mt->mt_sw_if_index] = mti;
+
+    /*
+     * construct a path-list from the path provided
+     */
+    mt->mt_path_list = fib_path_list_create(FIB_PATH_LIST_FLAG_SHARED, rpaths);
+    mt->mt_sibling_index = fib_path_list_child_add(mt->mt_path_list,
+						   FIB_NODE_TYPE_MPLS_TUNNEL,
+						   mti);
+
+    mt->mt_label_stack = vec_dup(label_stack);
+
+    if (l2_only)
+    {
+	mt->mt_l2_adj =
+	    adj_nbr_add_or_lock(fib_path_list_get_proto(mt->mt_path_list),
+				VNET_LINK_ETHERNET,
+				&zero_addr,
+				mt->mt_sw_if_index);
+
+	mt->mt_l2_tx_arc = vlib_node_add_named_next(vlib_get_main(),
+						    hi->tx_node_index,
+						    "adj-l2-midchain");
+    }
+
+    *sw_if_index = mt->mt_sw_if_index;
+}
+
+static clib_error_t *
+vnet_create_mpls_tunnel_command_fn (vlib_main_t * vm,
+				    unformat_input_t * input,
+				    vlib_cli_command_t * cmd)
+{
+    unformat_input_t _line_input, * line_input = &_line_input;
+    vnet_main_t * vnm = vnet_get_main();
+    u8 is_del = 0;
+    u8 l2_only = 0;
+    fib_route_path_t rpath, *rpaths = NULL;
+    mpls_label_t out_label = MPLS_LABEL_INVALID, *labels = NULL;
+    u32 sw_if_index;
+
+    memset(&rpath, 0, sizeof(rpath));
+
+    /* Get a line of input. */
+    if (! unformat_user (input, unformat_line_input, line_input))
+	return 0;
+
+    while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+	if (unformat (line_input, "del %U",
+		      unformat_vnet_sw_interface, vnm,
+		      &sw_if_index))
+	    is_del = 1;
+	else if (unformat (line_input, "add"))
+	    is_del = 0;
+	else if (unformat (line_input, "out-label %U",
+			   unformat_mpls_unicast_label, &out_label))
+	{
+	    vec_add1(labels, out_label);
+	}
+	else if (unformat (line_input, "via %U %U",
+			   unformat_ip4_address,
+			   &rpath.frp_addr.ip4,
+			   unformat_vnet_sw_interface, vnm,
+			   &rpath.frp_sw_if_index))
+	{
+	    rpath.frp_weight = 1;
+	    rpath.frp_proto = FIB_PROTOCOL_IP4;
+	}
+			 
+	else if (unformat (line_input, "via %U %U",
+			   unformat_ip6_address,
+			   &rpath.frp_addr.ip6,
+			   unformat_vnet_sw_interface, vnm,
+			   &rpath.frp_sw_if_index))
+	{
+	    rpath.frp_weight = 1;
+	    rpath.frp_proto = FIB_PROTOCOL_IP6;
+	}
+	else if (unformat (line_input, "via %U",
+			   unformat_ip6_address,
+			   &rpath.frp_addr.ip6))
+	{
+	    rpath.frp_fib_index = 0;
+	    rpath.frp_weight = 1;
+	    rpath.frp_sw_if_index = ~0;
+	    rpath.frp_proto = FIB_PROTOCOL_IP6;
+	}
+	else if (unformat (line_input, "via %U",
+			   unformat_ip4_address,
+			   &rpath.frp_addr.ip4))
+	{
+	    rpath.frp_fib_index = 0;
+	    rpath.frp_weight = 1;
+	    rpath.frp_sw_if_index = ~0;
+	    rpath.frp_proto = FIB_PROTOCOL_IP4;
+	}
+	else if (unformat (line_input, "l2-only"))
+	    l2_only = 1;
+	else
+	    return clib_error_return (0, "unknown input '%U'",
+				      format_unformat_error, line_input);
+    }
+
+    if (is_del)
+    {
+	vnet_mpls_tunnel_del(sw_if_index);
+    }
+    else
+    {
+	if (0 == vec_len(labels))
+	    return clib_error_return (0, "No Output Labels '%U'",
+				      format_unformat_error, line_input);
+
+	vec_add1(rpaths, rpath);
+	vnet_mpls_tunnel_add(rpaths, labels, l2_only, &sw_if_index);
+    }
+
+    vec_free(labels);
+    vec_free(rpaths);
+
+    return (NULL);
+}
+
+/*?
+ * This command create a uni-directional MPLS tunnel
+ *
+ * @cliexpar
+ * @cliexstart{create mpls tunnel}
+ *  create mpls tunnel via 10.0.0.1 GigEthernet0/8/0 out-label 33 out-label 34
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND (create_mpls_tunnel_command, static) = {
+  .path = "mpls tunnel",
+  .short_help = 
+  "mpls tunnel via [addr] [interface] [out-labels]",
+  .function = vnet_create_mpls_tunnel_command_fn,
+};
+
+static u8 *
+format_mpls_tunnel (u8 * s, va_list * args)
+{
+    mpls_tunnel_t *mt = va_arg (*args, mpls_tunnel_t *);
+    int ii;
+
+    s = format(s, "mpls_tunnel%d: sw_if_index:%d hw_if_index:%d",
+	       mt - mpls_tunnel_pool,
+	       mt->mt_sw_if_index,
+	       mt->mt_hw_if_index);
+    s = format(s, "\n label-stack:\n  ");
+    for (ii = 0; ii < vec_len(mt->mt_label_stack); ii++)
+    {
+	s = format(s, "%d, ", mt->mt_label_stack[ii]);
+    }
+    s = format(s, "\n via:\n");
+    s = fib_path_list_format(mt->mt_path_list, s);
+    s = format(s, "\n");
+
+    return (s);
+}
+
+static clib_error_t *
+show_mpls_tunnel_command_fn (vlib_main_t * vm,
+			     unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+    mpls_tunnel_t * mt;
+    u32 mti = ~0;
+
+    if (pool_elts (mpls_tunnel_pool) == 0)
+	vlib_cli_output (vm, "No MPLS tunnels configured...");
+
+    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+	if (unformat (input, "%d", &mti))
+	    ;
+	else
+	    break;
+    }
+
+    if (~0 == mti)
+    {
+	pool_foreach (mt, mpls_tunnel_pool,
+	({
+	    vlib_cli_output (vm, "[@%d] %U",
+			     mt - mpls_tunnel_pool,
+			     format_mpls_tunnel, mt);
+	}));
+    }
+    else
+    {
+	if (pool_is_free_index(mpls_tunnel_pool, mti))
+	    return clib_error_return (0, "Not atunnel index %d", mti);
+
+	mt = pool_elt_at_index(mpls_tunnel_pool, mti);
+
+	vlib_cli_output (vm, "[@%d] %U",
+			 mt - mpls_tunnel_pool,
+			 format_mpls_tunnel, mt);
+    }
+
+    return 0;
+}
+
+/*?
+ * This command to show MPLS tunnels
+ *
+ * @cliexpar
+ * @cliexstart{sh mpls tunnel 2}
+ * [@2] mpls_tunnel2: sw_if_index:5 hw_if_index:5
+ *  label-stack:
+ *    3, 
+ *  via:
+ *   index:26 locks:1 proto:ipv4 uPRF-list:26 len:1 itfs:[2, ]
+ *     index:26 pl-index:26 ipv4 weight=1 attached-nexthop:  oper-flags:resolved,
+ *      10.0.0.2 loop0
+ *         [@0]: ipv4 via 10.0.0.2 loop0: IP4: de:ad:00:00:00:00 -> 00:00:11:aa:bb:cc
+ * @cliexend
+ ?*/
+VLIB_CLI_COMMAND (show_mpls_tunnel_command, static) = {
+    .path = "show mpls tunnel",
+    .function = show_mpls_tunnel_command_fn,
+};
+
+static mpls_tunnel_t *
+mpls_tunnel_from_fib_node (fib_node_t *node)
+{
+#if (CLIB_DEBUG > 0)
+    ASSERT(FIB_NODE_TYPE_MPLS_TUNNEL == node->fn_type);
+#endif
+    return ((mpls_tunnel_t*) (((char*)node) -
+                             STRUCT_OFFSET_OF(mpls_tunnel_t, mt_node)));
+}
+
+/**
+ * Function definition to backwalk a FIB node
+ */
+static fib_node_back_walk_rc_t
+mpls_tunnel_back_walk (fib_node_t *node,
+		      fib_node_back_walk_ctx_t *ctx)
+{
+    mpls_tunnel_restack(mpls_tunnel_from_fib_node(node));
+
+    return (FIB_NODE_BACK_WALK_CONTINUE);
+}
+
+/**
+ * Function definition to get a FIB node from its index
+ */
+static fib_node_t*
+mpls_tunnel_fib_node_get (fib_node_index_t index)
+{
+    mpls_tunnel_t * mt;
+
+    mt = pool_elt_at_index(mpls_tunnel_pool, index);
+
+    return (&mt->mt_node);
+}
+
+/**
+ * Function definition to inform the FIB node that its last lock has gone.
+ */
+static void
+mpls_tunnel_last_lock_gone (fib_node_t *node)
+{
+    /*
+     * The MPLS MPLS tunnel is a root of the graph. As such
+     * it never has children and thus is never locked.
+     */
+    ASSERT(0);
+}
+
+/*
+ * Virtual function table registered by MPLS MPLS tunnels
+ * for participation in the FIB object graph.
+ */
+const static fib_node_vft_t mpls_vft = {
+    .fnv_get = mpls_tunnel_fib_node_get,
+    .fnv_last_lock = mpls_tunnel_last_lock_gone,
+    .fnv_back_walk = mpls_tunnel_back_walk,
+};
+
+static clib_error_t *
+mpls_tunnel_init (vlib_main_t *vm)
+{
+  fib_node_register_type(FIB_NODE_TYPE_MPLS_TUNNEL, &mpls_vft);
+
+  return 0;
+}
+VLIB_INIT_FUNCTION(mpls_tunnel_init);
diff --git a/src/vnet/mpls/mpls_tunnel.h b/src/vnet/mpls/mpls_tunnel.h
new file mode 100644
index 00000000..ee56c0fc
--- /dev/null
+++ b/src/vnet/mpls/mpls_tunnel.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPLS_TUNNEL_H__
+#define __MPLS_TUNNEL_H__
+
+#include <vnet/mpls/mpls.h>
+
+/**
+ * @brief A uni-directional MPLS tunnel
+ */
+typedef struct mpls_tunnel_t_
+{
+    /**
+     * @brief The tunnel hooks into the FIB control plane graph.
+     */
+    fib_node_t mt_node;
+
+    /**
+     * @brief If the tunnel is an L2 tunnel, this is the link type ETHERNET
+     * adjacency
+     */
+    adj_index_t mt_l2_adj;
+
+    /**
+     * @brief on a L2 tunnel this is the VLIB arc from the L2-tx to the l2-midchain
+     */
+    u32 mt_l2_tx_arc;
+
+    /**
+     * @brief The path-list over which the tunnel's destination is reachable
+     */
+    fib_node_index_t mt_path_list;
+
+    /**
+     * @brief sibling index on the path-list so notifications are received.
+     */
+    u32 mt_sibling_index;
+
+    /**
+     * @brief The Label stack to apply to egress packets
+     */
+    mpls_label_t *mt_label_stack;
+
+    /**
+     * @brief Flag to indicate the tunnel is only for L2 traffic, that is
+     * this tunnel belongs in a bridge domain.
+     */
+    u8 mt_l2_only;
+
+    /**
+     * @brief The HW interface index of the tunnel interfaces
+     */
+    u32 mt_hw_if_index;
+
+    /**
+     * @brief The SW interface index of the tunnel interfaces
+     */
+    u32 mt_sw_if_index;
+
+} mpls_tunnel_t;
+
+/**
+ * @brief Create a new MPLS tunnel
+ */
+extern void vnet_mpls_tunnel_add (fib_route_path_t *rpath,
+				  mpls_label_t *label_stack,
+				  u8 l2_only,
+				  u32 *sw_if_index);
+
+extern void vnet_mpls_tunnel_del (u32 sw_if_index);
+
+extern const mpls_tunnel_t *mpls_tunnel_get(u32 index);
+
+/**
+ * @brief Callback function invoked while walking MPLS tunnels
+ */
+typedef void (*mpls_tunnel_walk_cb_t)(u32 index, void *ctx);
+
+/**
+ * @brief Walk all the MPLS tunnels
+ */
+extern void mpls_tunnel_walk(mpls_tunnel_walk_cb_t cb,
+			     void *ctx);
+
+#endif
diff --git a/src/vnet/mpls/mpls_types.h b/src/vnet/mpls/mpls_types.h
new file mode 100644
index 00000000..d7c629df
--- /dev/null
+++ b/src/vnet/mpls/mpls_types.h
@@ -0,0 +1,39 @@
+#ifndef __MPLS_TYPES_H__
+#define __MPLS_TYPES_H__
+
+#define MPLS_IETF_MIN_LABEL                  0x00000
+#define MPLS_IETF_MAX_LABEL                  0xfffff
+
+#define MPLS_IETF_MIN_RESERVED_LABEL         0x00000
+#define MPLS_IETF_MAX_RESERVED_LABEL         0x0000f
+
+#define MPLS_IETF_MIN_UNRES_LABEL            0x00010
+#define MPLS_IETF_MAX_UNRES_LABEL            0xfffff
+
+#define MPLS_IETF_IPV4_EXPLICIT_NULL_LABEL   0x00000
+#define MPLS_IETF_ROUTER_ALERT_LABEL         0x00001
+#define MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL   0x00002
+#define MPLS_IETF_IMPLICIT_NULL_LABEL        0x00003
+#define MPLS_IETF_ELI_LABEL                  0x00007
+#define MPLS_IETF_GAL_LABEL                  0x0000D
+
+#define MPLS_IETF_IPV4_EXPLICIT_NULL_STRING          "ip4-explicit-null"
+#define MPLS_IETF_IPV4_EXPLICIT_NULL_BRIEF_STRING    "e-nul"
+#define MPLS_IETF_IMPLICIT_NULL_STRING               "implicit-null"
+#define MPLS_IETF_IMPLICIT_NULL_BRIEF_STRING         "i-nul"
+#define MPLS_IETF_ROUTER_ALERT_STRING                "router-alert"
+#define MPLS_IETF_ROUTER_ALERT_BRIEF_STRING          "r-alt"
+#define MPLS_IETF_IPV6_EXPLICIT_NULL_STRING          "ipv6-explicit-null"
+#define MPLS_IETF_IPV6_EXPLICIT_NULL_BRIEF_STRING    "v6enl"
+#define MPLS_IETF_ELI_STRING                         "entropy-label-indicator"
+#define MPLS_IETF_ELI_BRIEF_STRING                   "eli"
+#define MPLS_IETF_GAL_STRING                         "gal"
+#define MPLS_IETF_GAL_BRIEF_STRING                   "gal"
+
+#define MPLS_LABEL_INVALID (MPLS_IETF_MAX_LABEL+1)
+
+#define MPLS_LABEL_IS_REAL(_lbl) \
+    (((_lbl) > MPLS_IETF_MIN_UNRES_LABEL) &&	\
+     ((_lbl) <= MPLS_IETF_MAX_UNRES_LABEL))
+
+#endif
diff --git a/src/vnet/mpls/node.c b/src/vnet/mpls/node.c
new file mode 100644
index 00000000..18100912
--- /dev/null
+++ b/src/vnet/mpls/node.c
@@ -0,0 +1,303 @@
+/*
+ * node.c: MPLS input
+ *
+ * Copyright (c) 2012-2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/mpls/mpls.h>
+#include <vnet/feature/feature.h>
+
+typedef struct {
+  u32 next_index;
+  u32 label_host_byte_order;
+} mpls_input_trace_t;
+
+static u8 *
+format_mpls_input_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  mpls_input_trace_t * t = va_arg (*args, mpls_input_trace_t *);
+  char * next_name;
+
+  next_name = "BUG!";
+
+#define _(a,b) if (t->next_index == MPLS_INPUT_NEXT_##a) next_name = b;
+  foreach_mpls_input_next;
+#undef _
+  
+  s = format (s, "MPLS: next %s[%d]  label %d ttl %d", 
+              next_name, t->next_index,
+	      vnet_mpls_uc_get_label(t->label_host_byte_order),
+	      vnet_mpls_uc_get_ttl(t->label_host_byte_order));
+
+  return s;
+}
+
+vlib_node_registration_t mpls_input_node;
+
+typedef struct {
+  u32 last_label;
+  u32 last_inner_fib_index;
+  u32 last_outer_fib_index;
+  mpls_main_t * mpls_main;
+} mpls_input_runtime_t;
+
+static inline uword
+mpls_input_inline (vlib_main_t * vm,
+                   vlib_node_runtime_t * node,
+                   vlib_frame_t * from_frame)
+{
+  u32 n_left_from, next_index, * from, * to_next;
+  mpls_input_runtime_t * rt;
+  mpls_main_t * mm;
+  u32 cpu_index = os_get_cpu_number();
+  vlib_simple_counter_main_t * cm;
+  vnet_main_t * vnm = vnet_get_main();
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+  rt = vlib_node_get_runtime_data (vm, mpls_input_node.index);
+  mm = rt->mpls_main;
+  /* 
+   * Force an initial lookup every time, in case the control-plane
+   * changed the label->FIB mapping.
+   */
+  rt->last_label = ~0;
+
+  next_index = node->cached_next_index;
+
+  cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
+                         VNET_INTERFACE_COUNTER_MPLS);
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+        {
+          u32 label0, bi0, next0, sw_if_index0;
+          u32 label1, bi1, next1, sw_if_index1;
+          mpls_unicast_header_t *h0, *h1;
+          vlib_buffer_t *b0, *b1;
+
+          /* Prefetch next iteration. */
+          {
+            vlib_buffer_t * p2, * p3;
+
+            p2 = vlib_get_buffer (vm, from[2]);
+            p3 = vlib_get_buffer (vm, from[3]);
+
+            vlib_prefetch_buffer_header (p2, STORE);
+            vlib_prefetch_buffer_header (p3, STORE);
+
+            CLIB_PREFETCH (p2->data, sizeof (h0[0]), STORE);
+            CLIB_PREFETCH (p3->data, sizeof (h1[0]), STORE);
+          }
+
+
+          bi0 = to_next[0] = from[0];
+          bi1 = to_next[1] = from[1];
+
+          from += 2;
+          to_next += 2;
+          n_left_from -= 2;
+          n_left_to_next -= 2;
+
+          b0 = vlib_get_buffer (vm, bi0);
+          b1 = vlib_get_buffer (vm, bi1);
+
+          h0 = vlib_buffer_get_current (b0);
+          h1 = vlib_buffer_get_current (b1);
+
+          sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+          sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+
+          label0 = clib_net_to_host_u32 (h0->label_exp_s_ttl);
+          label1 = clib_net_to_host_u32 (h1->label_exp_s_ttl);
+
+          /* TTL expired? */
+          if (PREDICT_FALSE(vnet_mpls_uc_get_ttl (label0) == 0))
+           {
+              next0 = MPLS_INPUT_NEXT_DROP;
+              b0->error = node->errors[MPLS_ERROR_TTL_EXPIRED];
+            }
+          else
+            {
+              next0 = MPLS_INPUT_NEXT_LOOKUP;
+              vnet_feature_arc_start(mm->input_feature_arc_index, sw_if_index0, &next0, b0);
+              vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
+            }
+
+          if (PREDICT_FALSE(vnet_mpls_uc_get_ttl (label1) == 0))
+           {
+              next1 = MPLS_INPUT_NEXT_DROP;
+              b1->error = node->errors[MPLS_ERROR_TTL_EXPIRED];
+            }
+          else
+            {
+              next1 = MPLS_INPUT_NEXT_LOOKUP;
+              vnet_feature_arc_start(mm->input_feature_arc_index, sw_if_index1, &next1, b1);
+              vlib_increment_simple_counter (cm, cpu_index, sw_if_index1, 1);
+            }
+
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+            {
+              mpls_input_trace_t *tr = vlib_add_trace (vm, node,
+                                                       b0, sizeof (*tr));
+              tr->next_index = next0;
+              tr->label_host_byte_order = label0;
+            }
+          if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
+            {
+              mpls_input_trace_t *tr = vlib_add_trace (vm, node,
+                                                       b1, sizeof (*tr));
+              tr->next_index = next1;
+              tr->label_host_byte_order = label1;
+            }
+
+          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+                                           to_next, n_left_to_next,
+                                           bi0, bi1, next0, next1);
+        }
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t * b0;
+	  mpls_unicast_header_t * h0;
+          u32 label0;
+	  u32 next0 = 0;
+          u32 sw_if_index0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+          h0 = vlib_buffer_get_current (b0);
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+	  label0 = clib_net_to_host_u32 (h0->label_exp_s_ttl);
+	  /* TTL expired? */
+	  if (PREDICT_FALSE(vnet_mpls_uc_get_ttl (label0) == 0))
+           {
+              next0 = MPLS_INPUT_NEXT_DROP;
+              b0->error = node->errors[MPLS_ERROR_TTL_EXPIRED];
+            }
+	  else
+            {
+	      vnet_feature_arc_start(mm->input_feature_arc_index, sw_if_index0, &next0, b0);
+              vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
+            }
+
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
+            {
+              mpls_input_trace_t *tr = vlib_add_trace (vm, node, 
+						       b0, sizeof (*tr));
+              tr->next_index = next0;
+              tr->label_host_byte_order = label0;
+            }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, mpls_input_node.index,
+                               MPLS_ERROR_PKTS_DECAP, from_frame->n_vectors);
+  return from_frame->n_vectors;
+}
+
+static uword
+mpls_input (vlib_main_t * vm,
+            vlib_node_runtime_t * node,
+            vlib_frame_t * from_frame)
+{
+  return mpls_input_inline (vm, node, from_frame);
+}
+
+static char * mpls_error_strings[] = {
+#define mpls_error(n,s) s,
+#include "error.def"
+#undef mpls_error
+};
+
+VLIB_REGISTER_NODE (mpls_input_node) = {
+  .function = mpls_input,
+  .name = "mpls-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .runtime_data_bytes = sizeof(mpls_input_runtime_t),
+
+  .n_errors = MPLS_N_ERROR,
+  .error_strings = mpls_error_strings,
+
+  .n_next_nodes = MPLS_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [MPLS_INPUT_NEXT_##s] = n,
+    foreach_mpls_input_next
+#undef _
+  },
+
+  .format_buffer = format_mpls_unicast_header_net_byte_order,
+  .format_trace = format_mpls_input_trace,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (mpls_input_node, mpls_input)
+
+static void
+mpls_setup_nodes (vlib_main_t * vm)
+{
+  mpls_input_runtime_t * rt;
+  pg_node_t * pn;
+
+  pn = pg_get_node (mpls_input_node.index);
+  pn->unformat_edit = unformat_pg_mpls_header;
+
+  rt = vlib_node_get_runtime_data (vm, mpls_input_node.index);
+  rt->last_label = (u32) ~0;
+  rt->last_inner_fib_index = 0;
+  rt->last_outer_fib_index = 0;
+  rt->mpls_main = &mpls_main;
+
+  ethernet_register_input_type (vm, ETHERNET_TYPE_MPLS_UNICAST,
+                                mpls_input_node.index);
+}
+
+static clib_error_t * mpls_input_init (vlib_main_t * vm)
+{
+  clib_error_t * error; 
+
+  error = vlib_call_init_function (vm, mpls_init);
+  if (error)
+    clib_error_report (error);
+
+  mpls_setup_nodes (vm);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (mpls_input_init);
diff --git a/src/vnet/mpls/packet.h b/src/vnet/mpls/packet.h
new file mode 100644
index 00000000..bc67445b
--- /dev/null
+++ b/src/vnet/mpls/packet.h
@@ -0,0 +1,125 @@
+#ifndef included_vnet_mpls_packet_h
+#define included_vnet_mpls_packet_h
+
+/*
+ * MPLS packet format
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * A label value only, i.e. 20bits.
+ */
+typedef u32 mpls_label_t;
+
+typedef struct {
+    /* Label: top 20 bits [in network byte order] */
+    /* Experimental: 3 bits ... */
+    /* S (bottom of label stack): 1 bit */
+    /* TTL: 8 bits */
+    mpls_label_t label_exp_s_ttl;
+} mpls_unicast_header_t;
+
+typedef enum mpls_eos_bit_t_
+{
+    MPLS_NON_EOS = 0,
+    MPLS_EOS     = 1,
+} mpls_eos_bit_t;
+
+#define MPLS_EOS_BITS {				\
+    [MPLS_NON_EOS] = "neos",		      	\
+    [MPLS_EOS] = "eos",				\
+}
+
+#define FOR_EACH_MPLS_EOS_BIT(_eos) \
+    for (_eos = MPLS_NON_EOS; _eos <= MPLS_EOS; _eos++)
+
+#define MPLS_ENTRY_LABEL_OFFSET        0
+#define MPLS_ENTRY_LABEL_SHIFT 12
+#define MPLS_ENTRY_LABEL_MASK  0x000fffff
+#define MPLS_ENTRY_LABEL_BITS  \
+    (MPLS_ENTRY_LABEL_MASK << MPLS_ENTRY_LABEL_SHIFT)
+
+#define MPLS_ENTRY_EXP_OFFSET   2       /* byte offset to EXP bits */
+#define MPLS_ENTRY_EXP_SHIFT   9
+#define MPLS_ENTRY_EXP_MASK    0x07
+#define MPLS_ENTRY_EXP(mpls)   \
+    (((mpls)>>MPLS_ENTRY_EXP_SHIFT) & MPLS_ENTRY_EXP_MASK)
+#define MPLS_ENTRY_EXP_BITS    \
+    (MPLS_ENTRY_EXP_MASK << MPLS_ENTRY_EXP_SHIFT)
+
+#define MPLS_ENTRY_EOS_OFFSET   2       /* byte offset to EOS bit */
+#define MPLS_ENTRY_EOS_SHIFT   8
+#define MPLS_ENTRY_EOS_MASK    0x01    /* EOS bit in its byte */
+#define        MPLS_ENTRY_EOS(mpls)    \
+    (((mpls) >> MPLS_ENTRY_EOS_SHIFT) & MPLS_ENTRY_EOS_MASK)
+#define MPLS_ENTRY_EOS_BIT     (MPLS_ENTRY_EOS_MASK << MPLS_ENTRY_EOS_SHIFT)
+
+#define MPLS_ENTRY_TTL_OFFSET  3  /* byte offset to ttl field */
+#define MPLS_ENTRY_TTL_SHIFT   0
+#define MPLS_ENTRY_TTL_MASK    0xff
+#define MPLS_ENTRY_TTL(mpls)   \
+    (((mpls) >> MPLS_ENTRY_TTL_SHIFT) & MPLS_ENTRY_TTL_MASK)
+#define MPLS_ENTRY_TTL_BITS    \
+    (MPLS_ENTRY_TTL_MASK << MPLS_ENTRY_TTL_SHIFT)
+
+static inline u32 vnet_mpls_uc_get_label (mpls_label_t label_exp_s_ttl)
+{
+    return (label_exp_s_ttl>>MPLS_ENTRY_LABEL_SHIFT);
+}
+
+static inline u32 vnet_mpls_uc_get_exp (mpls_label_t label_exp_s_ttl)
+{
+    return (MPLS_ENTRY_EXP(label_exp_s_ttl));
+}
+
+static inline u32 vnet_mpls_uc_get_s (mpls_label_t label_exp_s_ttl)
+{
+    return (MPLS_ENTRY_EOS(label_exp_s_ttl));
+}
+
+static inline u32 vnet_mpls_uc_get_ttl (mpls_label_t label_exp_s_ttl)
+{
+    return (MPLS_ENTRY_TTL(label_exp_s_ttl));
+}
+
+static inline void vnet_mpls_uc_set_label (mpls_label_t *label_exp_s_ttl,
+                                           u32 value)
+{
+    *label_exp_s_ttl = (((*label_exp_s_ttl) & ~(MPLS_ENTRY_LABEL_BITS)) |
+                        ((value  & MPLS_ENTRY_LABEL_MASK) << MPLS_ENTRY_LABEL_SHIFT));
+}
+
+static inline void vnet_mpls_uc_set_exp (mpls_label_t *label_exp_s_ttl,
+                                         u32 exp)
+{
+    *label_exp_s_ttl = (((*label_exp_s_ttl) & ~(MPLS_ENTRY_EXP_BITS)) |
+                        ((exp & MPLS_ENTRY_EXP_MASK) << MPLS_ENTRY_EXP_SHIFT));
+}
+ 
+static inline void vnet_mpls_uc_set_s (mpls_label_t *label_exp_s_ttl,
+                                       u32 eos)
+{
+    *label_exp_s_ttl = (((*label_exp_s_ttl) & ~(MPLS_ENTRY_EOS_BIT)) |
+                        ((eos & MPLS_ENTRY_EOS_MASK) << MPLS_ENTRY_EOS_SHIFT));
+}
+ 
+static inline void vnet_mpls_uc_set_ttl (mpls_label_t *label_exp_s_ttl,
+                                         u32 ttl)
+{
+    *label_exp_s_ttl = (((*label_exp_s_ttl) & ~(MPLS_ENTRY_TTL_BITS)) |
+                        ((ttl & MPLS_ENTRY_TTL_MASK)));
+}
+
+#endif /* included_vnet_mpls_packet_h */
diff --git a/src/vnet/mpls/pg.c b/src/vnet/mpls/pg.c
new file mode 100644
index 00000000..6ff86e32
--- /dev/null
+++ b/src/vnet/mpls/pg.c
@@ -0,0 +1,71 @@
+/*
+ * pg.c: packet generator mpls interface
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/gre/gre.h>
+#include <vnet/mpls/mpls.h>
+
+typedef struct {
+  pg_edit_t label;
+} pg_mpls_header_t;
+
+static inline void
+pg_mpls_header_init (pg_mpls_header_t * e)
+{
+  pg_edit_init (&e->label, mpls_unicast_header_t, label_exp_s_ttl);
+}
+
+uword
+unformat_pg_mpls_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t * s = va_arg (*args, pg_stream_t *);
+  pg_mpls_header_t * h;
+  vlib_main_t * vm = vlib_get_main();
+  u32 group_index, error;
+  
+  h = pg_create_edit_group (s, sizeof (h[0]), sizeof (mpls_unicast_header_t),
+			    &group_index);
+  pg_mpls_header_init (h);
+
+  error = 1;
+  if (! unformat (input, "%U",
+		  unformat_pg_edit,
+                  unformat_mpls_label_net_byte_order, &h->label))
+    goto done;
+
+  {
+    pg_node_t * pg_node = 0;
+    vlib_node_t * ip_lookup_node;
+
+    ip_lookup_node = vlib_get_node_by_name (vm, (u8 *)"ip4-input");
+    ASSERT (ip_lookup_node);
+
+    pg_node = pg_get_node (ip_lookup_node->index);
+
+    if (pg_node && pg_node->unformat_edit
+	&& unformat_user (input, pg_node->unformat_edit, s))
+      ;
+  }
+
+  error = 0;
+ done:
+  if (error)
+    pg_free_edit_group (s);
+  return error == 0;
+}
+
diff --git a/src/vnet/osi/node.c b/src/vnet/osi/node.c
new file mode 100644
index 00000000..12075aa8
--- /dev/null
+++ b/src/vnet/osi/node.c
@@ -0,0 +1,326 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * osi_node.c: osi packet processing
+ *
+ * Copyright (c) 2010 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/osi/osi.h>
+#include <vnet/ppp/ppp.h>
+#include <vnet/hdlc/hdlc.h>
+#include <vnet/llc/llc.h>
+
+#define foreach_osi_input_next			\
+  _ (PUNT, "error-punt")			\
+  _ (DROP, "error-drop")
+
+typedef enum
+{
+#define _(s,n) OSI_INPUT_NEXT_##s,
+  foreach_osi_input_next
+#undef _
+    OSI_INPUT_N_NEXT,
+} osi_input_next_t;
+
+typedef struct
+{
+  u8 packet_data[32];
+} osi_input_trace_t;
+
+static u8 *
+format_osi_input_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  osi_input_trace_t *t = va_arg (*va, osi_input_trace_t *);
+
+  s = format (s, "%U", format_osi_header, t->packet_data);
+
+  return s;
+}
+
+static uword
+osi_input (vlib_main_t * vm,
+	   vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  osi_main_t *lm = &osi_main;
+  u32 n_left_from, next_index, *from, *to_next;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node,
+				   from,
+				   n_left_from,
+				   sizeof (from[0]),
+				   sizeof (osi_input_trace_t));
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  osi_header_t *h0, *h1;
+	  u8 next0, next1, enqueue_code;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *b2, *b3;
+
+	    b2 = vlib_get_buffer (vm, from[2]);
+	    b3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (b2, LOAD);
+	    vlib_prefetch_buffer_header (b3, LOAD);
+
+	    CLIB_PREFETCH (b2->data, sizeof (h0[0]), LOAD);
+	    CLIB_PREFETCH (b3->data, sizeof (h1[0]), LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  h0 = (void *) (b0->data + b0->current_data);
+	  h1 = (void *) (b1->data + b1->current_data);
+
+	  next0 = lm->input_next_by_protocol[h0->protocol];
+	  next1 = lm->input_next_by_protocol[h1->protocol];
+
+	  b0->error =
+	    node->errors[next0 ==
+			 OSI_INPUT_NEXT_DROP ? OSI_ERROR_UNKNOWN_PROTOCOL :
+			 OSI_ERROR_NONE];
+	  b1->error =
+	    node->errors[next1 ==
+			 OSI_INPUT_NEXT_DROP ? OSI_ERROR_UNKNOWN_PROTOCOL :
+			 OSI_ERROR_NONE];
+
+	  enqueue_code = (next0 != next_index) + 2 * (next1 != next_index);
+
+	  if (PREDICT_FALSE (enqueue_code != 0))
+	    {
+	      switch (enqueue_code)
+		{
+		case 1:
+		  /* A B A */
+		  to_next[-2] = bi1;
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node, next0, bi0);
+		  break;
+
+		case 2:
+		  /* A A B */
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node, next1, bi1);
+		  break;
+
+		case 3:
+		  /* A B B or A B C */
+		  to_next -= 2;
+		  n_left_to_next += 2;
+		  vlib_set_next_frame_buffer (vm, node, next0, bi0);
+		  vlib_set_next_frame_buffer (vm, node, next1, bi1);
+		  if (next0 == next1)
+		    {
+		      vlib_put_next_frame (vm, node, next_index,
+					   n_left_to_next);
+		      next_index = next1;
+		      vlib_get_next_frame (vm, node, next_index, to_next,
+					   n_left_to_next);
+		    }
+		}
+	    }
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  osi_header_t *h0;
+	  u8 next0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  h0 = (void *) (b0->data + b0->current_data);
+
+	  next0 = lm->input_next_by_protocol[h0->protocol];
+
+	  b0->error =
+	    node->errors[next0 ==
+			 OSI_INPUT_NEXT_DROP ? OSI_ERROR_UNKNOWN_PROTOCOL :
+			 OSI_ERROR_NONE];
+
+	  /* Sent packet to wrong next? */
+	  if (PREDICT_FALSE (next0 != next_index))
+	    {
+	      /* Return old frame; remove incorrectly enqueued packet. */
+	      vlib_put_next_frame (vm, node, next_index, n_left_to_next + 1);
+
+	      /* Send to correct next. */
+	      next_index = next0;
+	      vlib_get_next_frame (vm, node, next_index, to_next,
+				   n_left_to_next);
+
+	      to_next[0] = bi0;
+	      to_next += 1;
+	      n_left_to_next -= 1;
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+static char *osi_error_strings[] = {
+#define _(f,s) s,
+  foreach_osi_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (osi_input_node) = {
+  .function = osi_input,
+  .name = "osi-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .n_errors = OSI_N_ERROR,
+  .error_strings = osi_error_strings,
+
+  .n_next_nodes = OSI_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [OSI_INPUT_NEXT_##s] = n,
+    foreach_osi_input_next
+#undef _
+  },
+
+  .format_buffer = format_osi_header_with_length,
+  .format_trace = format_osi_input_trace,
+  .unformat_buffer = unformat_osi_header,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+osi_input_init (vlib_main_t * vm)
+{
+  clib_error_t *error = 0;
+  osi_main_t *lm = &osi_main;
+
+  if ((error = vlib_call_init_function (vm, osi_init)))
+    return error;
+
+  osi_setup_node (vm, osi_input_node.index);
+
+  {
+    int i;
+    for (i = 0; i < ARRAY_LEN (lm->input_next_by_protocol); i++)
+      lm->input_next_by_protocol[i] = OSI_INPUT_NEXT_DROP;
+  }
+
+  ppp_register_input_protocol (vm, PPP_PROTOCOL_osi, osi_input_node.index);
+  hdlc_register_input_protocol (vm, HDLC_PROTOCOL_osi, osi_input_node.index);
+  llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer1,
+			       osi_input_node.index);
+  llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer2,
+			       osi_input_node.index);
+  llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer3,
+			       osi_input_node.index);
+  llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer4,
+			       osi_input_node.index);
+  llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer5,
+			       osi_input_node.index);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (osi_input_init);
+
+void
+osi_register_input_protocol (osi_protocol_t protocol, u32 node_index)
+{
+  osi_main_t *lm = &osi_main;
+  vlib_main_t *vm = lm->vlib_main;
+  osi_protocol_info_t *pi;
+
+  {
+    clib_error_t *error = vlib_call_init_function (vm, osi_input_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  pi = osi_get_protocol_info (lm, protocol);
+  pi->node_index = node_index;
+  pi->next_index = vlib_node_add_next (vm, osi_input_node.index, node_index);
+
+  lm->input_next_by_protocol[protocol] = pi->next_index;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/osi/osi.c b/src/vnet/osi/osi.c
new file mode 100644
index 00000000..34c867f1
--- /dev/null
+++ b/src/vnet/osi/osi.c
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * osi.c: osi support
+ *
+ * Copyright (c) 2010 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/osi/osi.h>
+
+/* Global main structure. */
+osi_main_t osi_main;
+
+u8 *
+format_osi_protocol (u8 * s, va_list * args)
+{
+  osi_protocol_t p = va_arg (*args, u32);
+  osi_main_t *pm = &osi_main;
+  osi_protocol_info_t *pi = osi_get_protocol_info (pm, p);
+
+  if (pi)
+    s = format (s, "%s", pi->name);
+  else
+    s = format (s, "0x%02x", p);
+
+  return s;
+}
+
+u8 *
+format_osi_header_with_length (u8 * s, va_list * args)
+{
+  osi_main_t *pm = &osi_main;
+  osi_header_t *h = va_arg (*args, osi_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+  osi_protocol_t p = h->protocol;
+  uword indent, header_bytes;
+
+  header_bytes = sizeof (h[0]);
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    return format (s, "osi header truncated");
+
+  indent = format_get_indent (s);
+
+  s = format (s, "OSI %U", format_osi_protocol, p);
+
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    {
+      osi_protocol_info_t *pi = osi_get_protocol_info (pm, p);
+      vlib_node_t *node = vlib_get_node (pm->vlib_main, pi->node_index);
+      if (node->format_buffer)
+	s = format (s, "\n%U%U",
+		    format_white_space, indent,
+		    node->format_buffer, (void *) (h + 1),
+		    max_header_bytes - header_bytes);
+    }
+
+  return s;
+}
+
+u8 *
+format_osi_header (u8 * s, va_list * args)
+{
+  osi_header_t *h = va_arg (*args, osi_header_t *);
+  return format (s, "%U", format_osi_header_with_length, h, 0);
+}
+
+/* Returns osi protocol as an int in host byte order. */
+uword
+unformat_osi_protocol (unformat_input_t * input, va_list * args)
+{
+  u8 *result = va_arg (*args, u8 *);
+  osi_main_t *pm = &osi_main;
+  int p, i;
+
+  /* Numeric type. */
+  if (unformat (input, "0x%x", &p) || unformat (input, "%d", &p))
+    {
+      if (p >= (1 << 8))
+	return 0;
+      *result = p;
+      return 1;
+    }
+
+  /* Named type. */
+  if (unformat_user (input, unformat_vlib_number_by_name,
+		     pm->protocol_info_by_name, &i))
+    {
+      osi_protocol_info_t *pi = vec_elt_at_index (pm->protocol_infos, i);
+      *result = pi->protocol;
+      return 1;
+    }
+
+  return 0;
+}
+
+uword
+unformat_osi_header (unformat_input_t * input, va_list * args)
+{
+  u8 **result = va_arg (*args, u8 **);
+  osi_header_t _h, *h = &_h;
+  u8 p;
+
+  if (!unformat (input, "%U", unformat_osi_protocol, &p))
+    return 0;
+
+  h->protocol = p;
+
+  /* Add header to result. */
+  {
+    void *p;
+    u32 n_bytes = sizeof (h[0]);
+
+    vec_add2 (*result, p, n_bytes);
+    clib_memcpy (p, h, n_bytes);
+  }
+
+  return 1;
+}
+
+static void
+add_protocol (osi_main_t * pm, osi_protocol_t protocol, char *protocol_name)
+{
+  osi_protocol_info_t *pi;
+  u32 i;
+
+  vec_add2 (pm->protocol_infos, pi, 1);
+  i = pi - pm->protocol_infos;
+
+  pi->name = protocol_name;
+  pi->protocol = protocol;
+  pi->next_index = pi->node_index = ~0;
+
+  hash_set (pm->protocol_info_by_protocol, protocol, i);
+  hash_set_mem (pm->protocol_info_by_name, pi->name, i);
+}
+
+static clib_error_t *
+osi_init (vlib_main_t * vm)
+{
+  clib_error_t *error = 0;
+  osi_main_t *pm = &osi_main;
+
+  /* init order dependency: llc_init -> osi_init */
+  if ((error = vlib_call_init_function (vm, llc_init)))
+    return error;
+
+  memset (pm, 0, sizeof (pm[0]));
+  pm->vlib_main = vm;
+
+  pm->protocol_info_by_name = hash_create_string (0, sizeof (uword));
+  pm->protocol_info_by_protocol = hash_create (0, sizeof (uword));
+
+#define _(f,n) add_protocol (pm, OSI_PROTOCOL_##f, #f);
+  foreach_osi_protocol;
+#undef _
+
+  return vlib_call_init_function (vm, osi_input_init);
+}
+
+VLIB_INIT_FUNCTION (osi_init);
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/osi/osi.h b/src/vnet/osi/osi.h
new file mode 100644
index 00000000..ee21f0c3
--- /dev/null
+++ b/src/vnet/osi/osi.h
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * osi.h: OSI definitions
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_osi_h
+#define included_osi_h
+
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+
+#define foreach_osi_protocol			\
+  _ (null, 0x0)					\
+  _ (x_29, 0x01)				\
+  _ (x_633, 0x03)				\
+  _ (q_931, 0x08)				\
+  _ (q_933, 0x08)				\
+  _ (q_2931, 0x09)				\
+  _ (q_2119, 0x0c)				\
+  _ (snap, 0x80)				\
+  _ (clnp, 0x81)				\
+  _ (esis, 0x82)				\
+  _ (isis, 0x83)				\
+  _ (idrp, 0x85)				\
+  _ (x25_esis, 0x8a)				\
+  _ (iso10030, 0x8c)				\
+  _ (iso11577, 0x8d)				\
+  _ (ip6, 0x8e)					\
+  _ (compressed, 0xb0)				\
+  _ (sndcf, 0xc1)				\
+  _ (ip4, 0xcc)					\
+  _ (ppp, 0xcf)
+
+typedef enum
+{
+#define _(f,n) OSI_PROTOCOL_##f = n,
+  foreach_osi_protocol
+#undef _
+} osi_protocol_t;
+
+typedef struct
+{
+  u8 protocol;
+
+  u8 payload[0];
+} osi_header_t;
+
+typedef struct
+{
+  /* Name (a c string). */
+  char *name;
+
+  /* OSI protocol (SAP type). */
+  osi_protocol_t protocol;
+
+  /* Node which handles this type. */
+  u32 node_index;
+
+  /* Next index for this type. */
+  u32 next_index;
+} osi_protocol_info_t;
+
+#define foreach_osi_error			\
+  _ (NONE, "no error")				\
+  _ (UNKNOWN_PROTOCOL, "unknown osi protocol")
+
+typedef enum
+{
+#define _(f,s) OSI_ERROR_##f,
+  foreach_osi_error
+#undef _
+    OSI_N_ERROR,
+} osi_error_t;
+
+typedef struct
+{
+  vlib_main_t *vlib_main;
+
+  osi_protocol_info_t *protocol_infos;
+
+  /* Hash tables mapping name/protocol to protocol info index. */
+  uword *protocol_info_by_name, *protocol_info_by_protocol;
+
+  /* osi-input next index indexed by protocol. */
+  u8 input_next_by_protocol[256];
+} osi_main_t;
+
+always_inline osi_protocol_info_t *
+osi_get_protocol_info (osi_main_t * m, osi_protocol_t protocol)
+{
+  uword *p = hash_get (m->protocol_info_by_protocol, protocol);
+  return p ? vec_elt_at_index (m->protocol_infos, p[0]) : 0;
+}
+
+extern osi_main_t osi_main;
+
+/* Register given node index to take input for given osi type. */
+void osi_register_input_protocol (osi_protocol_t protocol, u32 node_index);
+
+void osi_set_adjacency (vnet_rewrite_header_t * rw,
+			uword max_data_bytes, osi_protocol_t protocol);
+
+format_function_t format_osi_protocol;
+format_function_t format_osi_header;
+format_function_t format_osi_header_with_length;
+
+/* Parse osi protocol as 0xXXXX or protocol name. */
+unformat_function_t unformat_osi_protocol;
+
+/* Parse osi header. */
+unformat_function_t unformat_osi_header;
+unformat_function_t unformat_pg_osi_header;
+
+always_inline void
+osi_setup_node (vlib_main_t * vm, u32 node_index)
+{
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  pg_node_t *pn = pg_get_node (node_index);
+
+  n->format_buffer = format_osi_header_with_length;
+  n->unformat_buffer = unformat_osi_header;
+  pn->unformat_edit = unformat_pg_osi_header;
+}
+
+void osi_register_input_protocol (osi_protocol_t protocol, u32 node_index);
+
+format_function_t format_osi_header;
+
+#endif /* included_osi_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/osi/pg.c b/src/vnet/osi/pg.c
new file mode 100644
index 00000000..c87a869b
--- /dev/null
+++ b/src/vnet/osi/pg.c
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * osi_pg.c: packet generator osi interface
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/osi/osi.h>
+
+typedef struct
+{
+  pg_edit_t protocol;
+} pg_osi_header_t;
+
+static inline void
+pg_osi_header_init (pg_osi_header_t * e)
+{
+  pg_edit_init (&e->protocol, osi_header_t, protocol);
+}
+
+uword
+unformat_pg_osi_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  pg_osi_header_t *h;
+  u32 group_index, error;
+
+  h = pg_create_edit_group (s, sizeof (h[0]), sizeof (osi_header_t),
+			    &group_index);
+  pg_osi_header_init (h);
+
+  error = 1;
+  if (!unformat (input, "%U",
+		 unformat_pg_edit, unformat_osi_protocol, &h->protocol))
+    goto done;
+
+  {
+    osi_main_t *pm = &osi_main;
+    osi_protocol_info_t *pi = 0;
+    pg_node_t *pg_node = 0;
+
+    if (h->protocol.type == PG_EDIT_FIXED)
+      {
+	u8 t = *h->protocol.values[PG_EDIT_LO];
+	pi = osi_get_protocol_info (pm, t);
+	if (pi && pi->node_index != ~0)
+	  pg_node = pg_get_node (pi->node_index);
+      }
+
+    if (pg_node && pg_node->unformat_edit
+	&& unformat_user (input, pg_node->unformat_edit, s))
+      ;
+
+    else if (!unformat_user (input, unformat_pg_payload, s))
+      goto done;
+  }
+
+  error = 0;
+done:
+  if (error)
+    pg_free_edit_group (s);
+  return error == 0;
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/pg/cli.c b/src/vnet/pg/cli.c
new file mode 100644
index 00000000..f5896b43
--- /dev/null
+++ b/src/vnet/pg/cli.c
@@ -0,0 +1,636 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pg_cli.c: packet generator cli
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <sys/stat.h>
+
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+
+#ifdef CLIB_UNIX
+#include <vnet/unix/pcap.h>
+#endif
+
+/* Root of all packet generator cli commands. */
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vlib_cli_pg_command, static) = {
+  .path = "packet-generator",
+  .short_help = "Packet generator commands",
+};
+/* *INDENT-ON* */
+
+void
+pg_enable_disable (u32 stream_index, int is_enable)
+{
+  pg_main_t *pg = &pg_main;
+  pg_stream_t *s;
+
+  if (stream_index == ~0)
+    {
+      /* No stream specified: enable/disable all streams. */
+      /* *INDENT-OFF* */
+        pool_foreach (s, pg->streams, ({
+            pg_stream_enable_disable (pg, s, is_enable);
+        }));
+	/* *INDENT-ON* */
+    }
+  else
+    {
+      /* enable/disable specified stream. */
+      s = pool_elt_at_index (pg->streams, stream_index);
+      pg_stream_enable_disable (pg, s, is_enable);
+    }
+}
+
+clib_error_t *
+pg_capture (pg_capture_args_t * a)
+{
+  pg_main_t *pg = &pg_main;
+  pg_interface_t *pi;
+
+  if (a->is_enabled == 1)
+    {
+      struct stat sb;
+      if (stat ((char *) a->pcap_file_name, &sb) != -1)
+	return clib_error_return (0, "Cannot create pcap file");
+    }
+
+  pi = pool_elt_at_index (pg->interfaces, a->dev_instance);
+  vec_free (pi->pcap_file_name);
+  memset (&pi->pcap_main, 0, sizeof (pi->pcap_main));
+
+  if (a->is_enabled == 0)
+    return 0;
+
+  pi->pcap_file_name = a->pcap_file_name;
+  pi->pcap_main.file_name = (char *) pi->pcap_file_name;
+  pi->pcap_main.n_packets_to_capture = a->count;
+  pi->pcap_main.packet_type = PCAP_PACKET_TYPE_ethernet;
+
+  return 0;
+}
+
+static clib_error_t *
+enable_disable_stream (vlib_main_t * vm,
+		       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  pg_main_t *pg = &pg_main;
+  int is_enable = cmd->function_arg != 0;
+  u32 stream_index = ~0;
+
+  if (unformat (input, "%U", unformat_eof))
+    ;
+  else if (unformat (input, "%U", unformat_hash_vec_string,
+		     pg->stream_index_by_name, &stream_index))
+    ;
+  else
+    return clib_error_create ("unknown input `%U'",
+			      format_unformat_error, input);
+
+  pg_enable_disable (stream_index, is_enable);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (enable_streams_cli, static) = {
+  .path = "packet-generator enable-stream",
+  .short_help = "Enable packet generator streams",
+  .function = enable_disable_stream,
+  .function_arg = 1,		/* is_enable */
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (disable_streams_cli, static) = {
+  .path = "packet-generator disable-stream",
+  .short_help = "Disable packet generator streams",
+  .function = enable_disable_stream,
+  .function_arg = 0,		/* is_enable */
+};
+/* *INDENT-ON* */
+
+static u8 *
+format_pg_stream (u8 * s, va_list * va)
+{
+  pg_stream_t *t = va_arg (*va, pg_stream_t *);
+  u8 *v;
+
+  if (!t)
+    return format (s, "%=16s%=12s%=16s%s",
+		   "Name", "Enabled", "Count", "Parameters");
+
+  s = format (s, "%-16v%=12s%16Ld",
+	      t->name,
+	      pg_stream_is_enabled (t) ? "Yes" : "No",
+	      t->n_packets_generated);
+
+  v = 0;
+
+  v = format (v, "limit %Ld, ", t->n_packets_limit);
+
+  v = format (v, "rate %.2e pps, ", t->rate_packets_per_second);
+
+  v = format (v, "size %d%c%d, ",
+	      t->min_packet_bytes,
+	      t->packet_size_edit_type == PG_EDIT_RANDOM ? '+' : '-',
+	      t->max_packet_bytes);
+
+  v = format (v, "buffer-size %d, ", t->buffer_bytes);
+
+  v = format (v, "worker %d, ", t->worker_index);
+
+  if (v)
+    {
+      s = format (s, "  %v", v);
+      vec_free (v);
+    }
+
+  return s;
+}
+
+static clib_error_t *
+show_streams (vlib_main_t * vm,
+	      unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  pg_main_t *pg = &pg_main;
+  pg_stream_t *s;
+
+  if (pool_elts (pg->streams) == 0)
+    {
+      vlib_cli_output (vm, "no streams currently defined");
+      goto done;
+    }
+
+  vlib_cli_output (vm, "%U", format_pg_stream, 0);
+  /* *INDENT-OFF* */
+  pool_foreach (s, pg->streams, ({
+      vlib_cli_output (vm, "%U", format_pg_stream, s);
+    }));
+  /* *INDENT-ON* */
+
+done:
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_streams_cli, static) = {
+  .path = "show packet-generator",
+  .short_help = "Show packet generator streams",
+  .function = show_streams,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+pg_pcap_read (pg_stream_t * s, char *file_name)
+{
+#ifndef CLIB_UNIX
+  return clib_error_return (0, "no pcap support");
+#else
+  pcap_main_t pm;
+  clib_error_t *error;
+  memset (&pm, 0, sizeof (pm));
+  pm.file_name = file_name;
+  error = pcap_read (&pm);
+  s->replay_packet_templates = pm.packets_read;
+  s->min_packet_bytes = pm.min_packet_bytes;
+  s->max_packet_bytes = pm.max_packet_bytes;
+  s->buffer_bytes = pm.max_packet_bytes;
+  /* For PCAP buffers we never re-use buffers. */
+  s->flags |= PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE;
+
+  if (s->n_packets_limit == 0)
+    s->n_packets_limit = vec_len (pm.packets_read);
+
+  return error;
+#endif /* CLIB_UNIX */
+}
+
+static uword
+unformat_pg_stream_parameter (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  f64 x;
+
+  if (unformat (input, "limit %f", &x))
+    s->n_packets_limit = x;
+
+  else if (unformat (input, "rate %f", &x))
+    s->rate_packets_per_second = x;
+
+  else if (unformat (input, "size %d-%d", &s->min_packet_bytes,
+		     &s->max_packet_bytes))
+    s->packet_size_edit_type = PG_EDIT_INCREMENT;
+
+  else if (unformat (input, "size %d+%d", &s->min_packet_bytes,
+		     &s->max_packet_bytes))
+    s->packet_size_edit_type = PG_EDIT_RANDOM;
+
+  else if (unformat (input, "buffer-size %d", &s->buffer_bytes))
+    ;
+
+  else
+    return 0;
+
+  return 1;
+}
+
+static clib_error_t *
+validate_stream (pg_stream_t * s)
+{
+  if (s->max_packet_bytes < s->min_packet_bytes)
+    return clib_error_create ("max-size < min-size");
+
+  if (s->buffer_bytes >= 4096 || s->buffer_bytes == 0)
+    return
+      clib_error_create ("buffer-size must be positive and < 4096, given %d",
+			 s->buffer_bytes);
+
+  if (s->rate_packets_per_second < 0)
+    return clib_error_create ("negative rate");
+
+  return 0;
+}
+
+static clib_error_t *
+new_stream (vlib_main_t * vm,
+	    unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  clib_error_t *error = 0;
+  u8 *tmp = 0;
+  u32 hw_if_index;
+  unformat_input_t sub_input = { 0 };
+  int sub_input_given = 0;
+  vnet_main_t *vnm = vnet_get_main ();
+  pg_main_t *pg = &pg_main;
+  pg_stream_t s = { 0 };
+  char *pcap_file_name;
+
+  s.sw_if_index[VLIB_RX] = s.sw_if_index[VLIB_TX] = ~0;
+  s.node_index = ~0;
+  s.max_packet_bytes = s.min_packet_bytes = 64;
+  s.buffer_bytes = VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES;
+  s.if_id = 0;
+  pcap_file_name = 0;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "name %v", &tmp))
+	{
+	  if (s.name)
+	    vec_free (s.name);
+	  s.name = tmp;
+	}
+
+      else if (unformat (input, "node %U",
+			 unformat_vnet_hw_interface, vnm, &hw_if_index))
+	{
+	  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
+
+	  s.node_index = hi->output_node_index;
+	  s.sw_if_index[VLIB_TX] = hi->sw_if_index;
+	}
+
+      else if (unformat (input, "source pg%u", &s.if_id))
+	;
+
+      else if (unformat (input, "node %U",
+			 unformat_vlib_node, vm, &s.node_index))
+	;
+
+      else if (unformat (input, "worker %u", &s.worker_index))
+	;
+
+      else if (unformat (input, "interface %U",
+			 unformat_vnet_sw_interface, vnm,
+			 &s.sw_if_index[VLIB_RX]))
+	;
+
+      else if (unformat (input, "pcap %s", &pcap_file_name))
+	;
+
+      else if (!sub_input_given
+	       && unformat (input, "data %U", unformat_input, &sub_input))
+	sub_input_given++;
+
+      else if (unformat_user (input, unformat_pg_stream_parameter, &s))
+	;
+
+      else if (unformat (input, "no-recycle"))
+	s.flags |= PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE;
+
+      else
+	{
+	  error = clib_error_create ("unknown input `%U'",
+				     format_unformat_error, input);
+	  goto done;
+	}
+    }
+
+  error = validate_stream (&s);
+  if (error)
+    return error;
+
+  if (!sub_input_given && !pcap_file_name)
+    {
+      error = clib_error_create ("no packet data given");
+      goto done;
+    }
+
+  if (s.node_index == ~0)
+    {
+      if (pcap_file_name != 0)
+	{
+	  vlib_node_t *n =
+	    vlib_get_node_by_name (vm, (u8 *) "ethernet-input");
+	  s.node_index = n->index;
+	}
+      else
+	{
+	  error = clib_error_create ("output interface or node not given");
+	  goto done;
+	}
+    }
+
+  {
+    pg_node_t *n;
+
+    if (s.node_index < vec_len (pg->nodes))
+      n = pg->nodes + s.node_index;
+    else
+      n = 0;
+
+    if (s.worker_index >= vlib_num_workers ())
+      s.worker_index = 0;
+
+    if (pcap_file_name != 0)
+      {
+	error = pg_pcap_read (&s, pcap_file_name);
+	if (error)
+	  goto done;
+	vec_free (pcap_file_name);
+      }
+
+    else if (n && n->unformat_edit
+	     && unformat_user (&sub_input, n->unformat_edit, &s))
+      ;
+
+    else if (!unformat_user (&sub_input, unformat_pg_payload, &s))
+      {
+	error = clib_error_create
+	  ("failed to parse packet data from `%U'",
+	   format_unformat_error, &sub_input);
+	goto done;
+      }
+  }
+
+  pg_stream_add (pg, &s);
+  return 0;
+
+done:
+  pg_stream_free (&s);
+  unformat_free (&sub_input);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (new_stream_cli, static) = {
+  .path = "packet-generator new",
+  .function = new_stream,
+  .short_help = "Create packet generator stream",
+  .long_help =
+  "Create packet generator stream\n"
+  "\n"
+  "Arguments:\n"
+  "\n"
+  "name STRING          sets stream name\n"
+  "interface STRING     interface for stream output \n"
+  "node NODE-NAME       node for stream output\n"
+  "data STRING          specifies packet data\n"
+  "pcap FILENAME        read packet data from pcap file\n",
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+del_stream (vlib_main_t * vm,
+	    unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  pg_main_t *pg = &pg_main;
+  u32 i;
+
+  if (!unformat (input, "%U",
+		 &unformat_hash_vec_string, pg->stream_index_by_name, &i))
+    return clib_error_create ("expected stream name `%U'",
+			      format_unformat_error, input);
+
+  pg_stream_del (pg, i);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (del_stream_cli, static) = {
+  .path = "packet-generator delete",
+  .function = del_stream,
+  .short_help = "Delete stream with given name",
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+change_stream_parameters (vlib_main_t * vm,
+			  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  pg_main_t *pg = &pg_main;
+  pg_stream_t *s, s_new;
+  u32 stream_index = ~0;
+  clib_error_t *error;
+
+  if (unformat (input, "%U", unformat_hash_vec_string,
+		pg->stream_index_by_name, &stream_index))
+    ;
+  else
+    return clib_error_create ("expecting stream name; got `%U'",
+			      format_unformat_error, input);
+
+  s = pool_elt_at_index (pg->streams, stream_index);
+  s_new = s[0];
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat_user (input, unformat_pg_stream_parameter, &s_new))
+	;
+
+      else
+	return clib_error_create ("unknown input `%U'",
+				  format_unformat_error, input);
+    }
+
+  error = validate_stream (&s_new);
+  if (!error)
+    s[0] = s_new;
+
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (change_stream_parameters_cli, static) = {
+  .path = "packet-generator configure",
+  .short_help = "Change packet generator stream parameters",
+  .function = change_stream_parameters,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+pg_capture_cmd_fn (vlib_main_t * vm,
+		   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  clib_error_t *error = 0;
+  vnet_main_t *vnm = vnet_get_main ();
+  unformat_input_t _line_input, *line_input = &_line_input;
+  vnet_hw_interface_t *hi = 0;
+  u8 *pcap_file_name = 0;
+  u32 hw_if_index;
+  u32 is_disable = 0;
+  u32 count = ~0;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "%U",
+		    unformat_vnet_hw_interface, vnm, &hw_if_index))
+	{
+	  hi = vnet_get_hw_interface (vnm, hw_if_index);
+	}
+
+      else if (unformat (line_input, "pcap %s", &pcap_file_name))
+	;
+      else if (unformat (line_input, "count %u", &count))
+	;
+      else if (unformat (line_input, "disable"))
+	is_disable = 1;
+
+      else
+	{
+	  error = clib_error_create ("unknown input `%U'",
+				     format_unformat_error, input);
+	  return error;
+	}
+    }
+
+  if (!hi)
+    return clib_error_return (0, "Please specify interface name");
+
+  if (hi->dev_class_index != pg_dev_class.index)
+    return clib_error_return (0, "Please specify packet-generator interface");
+
+  if (!pcap_file_name && is_disable == 0)
+    return clib_error_return (0, "Please specify pcap file name");
+
+  unformat_free (line_input);
+
+  pg_capture_args_t _a, *a = &_a;
+
+  a->hw_if_index = hw_if_index;
+  a->dev_instance = hi->dev_instance;
+  a->is_enabled = !is_disable;
+  a->pcap_file_name = pcap_file_name;
+  a->count = count;
+
+  error = pg_capture (a);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (pg_capture_cmd, static) = {
+  .path = "packet-generator capture",
+  .short_help = "packet-generator capture <interface name> pcap <filename> [count <n>]",
+  .function = pg_capture_cmd_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+create_pg_if_cmd_fn (vlib_main_t * vm,
+		     unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  pg_main_t *pg = &pg_main;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 if_id;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "interface pg%u", &if_id))
+	;
+
+      else
+	return clib_error_create ("unknown input `%U'",
+				  format_unformat_error, input);
+    }
+
+  unformat_free (line_input);
+
+  pg_interface_add_or_get (pg, if_id);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (create_pg_if_cmd, static) = {
+  .path = "create packet-generator",
+  .short_help = "create packet-generator interface <interface name>",
+  .function = create_pg_if_cmd_fn,
+};
+/* *INDENT-ON* */
+
+/* Dummy init function so that we can be linked in. */
+static clib_error_t *
+pg_cli_init (vlib_main_t * vm)
+{
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (pg_cli_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/pg/edit.c b/src/vnet/pg/edit.c
new file mode 100644
index 00000000..cb4d070f
--- /dev/null
+++ b/src/vnet/pg/edit.c
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pg_edit.c: packet generator edits
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+
+static void
+pg_edit_set_value_helper (pg_edit_t * e, u64 value, u8 * result)
+{
+  int i, j, n_bits_left;
+  u8 *v, tmp[8];
+
+  v = tmp;
+
+  n_bits_left = e->n_bits;
+  i = 0;
+  j = e->lsb_bit_offset % BITS (v[0]);
+
+  if (n_bits_left > 0 && j != 0)
+    {
+      v[i] = (value & 0xff) << j;
+      value >>= BITS (v[0]) - j;
+      n_bits_left -= BITS (v[0]) - j;
+      i += 1;
+    }
+
+  while (n_bits_left > 0)
+    {
+      v[i] = value & 0xff;
+      value >>= 8;
+      n_bits_left -= 8;
+      i += 1;
+    }
+
+  /* Convert to network byte order. */
+  for (j = 0; j < i; j++)
+    result[j] = v[i - 1 - j];
+}
+
+void
+pg_edit_set_value (pg_edit_t * e, int hi_or_lo, u64 value)
+{
+  pg_edit_alloc_value (e, hi_or_lo);
+  pg_edit_set_value_helper (e, value, e->values[hi_or_lo]);
+}
+
+/* Parse an int either %d or 0x%x into network byte order. */
+uword
+unformat_pg_number (unformat_input_t * input, va_list * args)
+{
+  u8 *result = va_arg (*args, u8 *);
+  pg_edit_t *e = va_arg (*args, pg_edit_t *);
+  u64 value;
+
+  ASSERT (BITS (value) >= e->n_bits);
+
+  if (!unformat (input, "0x%X", sizeof (value), &value)
+      && !unformat (input, "%D", sizeof (value), &value))
+    return 0;
+
+  /* Number given does not fit into bit field. */
+  if (e->n_bits < 64 && value >= (u64) 1 << (u64) e->n_bits)
+    return 0;
+
+  pg_edit_set_value_helper (e, value, result);
+  return 1;
+}
+
+uword
+unformat_pg_edit (unformat_input_t * input, va_list * args)
+{
+  unformat_function_t *f = va_arg (*args, unformat_function_t *);
+  pg_edit_t *e = va_arg (*args, pg_edit_t *);
+
+  pg_edit_alloc_value (e, PG_EDIT_LO);
+  if (!unformat_user (input, f, e->values[PG_EDIT_LO], e))
+    return 0;
+
+  pg_edit_alloc_value (e, PG_EDIT_HI);
+  if (unformat (input, "-%U", f, e->values[PG_EDIT_HI], e))
+    e->type = PG_EDIT_INCREMENT;
+  else if (unformat (input, "+%U", f, e->values[PG_EDIT_HI], e))
+    e->type = PG_EDIT_RANDOM;
+  else
+    e->type = PG_EDIT_FIXED;
+
+  return 1;
+}
+
+uword
+unformat_pg_payload (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  vlib_main_t *vm = vlib_get_main ();
+  pg_edit_t *e;
+  u32 i, node_index, len, max_len;
+  u8 *v;
+
+  v = 0;
+
+  if (unformat (input, "incrementing %d", &len))
+    {
+      vec_resize (v, len);
+      for (i = 0; i < len; i++)
+	v[i] = i;
+    }
+  else if (unformat (input, "hex 0x%U", unformat_hex_string, &v))
+    ;
+
+  else if (unformat (input, "%U", unformat_vlib_node, vm, &node_index))
+    {
+      pg_node_t *pn = pg_get_node (node_index);
+      if (!pn->unformat_edit)
+	return 0;
+      return unformat (input, "%U", pn->unformat_edit, s);
+    }
+
+  else
+    return 0;
+
+  /* Length not including this payload. */
+  max_len = pg_edit_group_n_bytes (s, 0);
+  if (max_len + vec_len (v) >= s->max_packet_bytes)
+    {
+      if (s->max_packet_bytes >= max_len)
+	_vec_len (v) = s->max_packet_bytes - max_len;
+      else
+	_vec_len (v) = 0;
+    }
+
+  e = pg_create_edit_group (s, sizeof (e[0]), vec_len (v), 0);
+
+  e->type = PG_EDIT_FIXED;
+  e->n_bits = vec_len (v) * BITS (v[0]);
+
+  /* Least significant bit is at end of bitstream, since everything is always bigendian. */
+  e->lsb_bit_offset = e->n_bits - BITS (v[0]);
+
+  e->values[PG_EDIT_LO] = v;
+
+  return 1;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/pg/edit.h b/src/vnet/pg/edit.h
new file mode 100644
index 00000000..3bfdad57
--- /dev/null
+++ b/src/vnet/pg/edit.h
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pg_edit.h: packet generator edits
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_packet_generator_pg_edit_h
+#define included_packet_generator_pg_edit_h
+
+#include <vppinfra/format.h>
+#include <vppinfra/vec.h>
+
+typedef enum
+{
+  /* Invalid type used to poison edits. */
+  PG_EDIT_INVALID_TYPE,
+
+  /* Value is fixed: does not change for all packets in sequence. */
+  PG_EDIT_FIXED,
+
+  /* Value v increments between low and high values v_low <= v <= v_high. */
+  PG_EDIT_INCREMENT,
+
+  /* Random value between low and high values v_low <= v <= v_high. */
+  PG_EDIT_RANDOM,
+
+  /* Unspecified value; will be specified by some edit function. */
+  PG_EDIT_UNSPECIFIED,
+} pg_edit_type_t;
+
+typedef struct
+{
+  pg_edit_type_t type;
+
+  /* Bit offset within packet where value is to be written.
+     Bits are written in network byte order: high bits first.
+     This is the bit offset of the least significant bit: i.e. the
+     highest numbered byte * 8 plus bit offset within that byte.
+     Negative offsets encode special edits. */
+  i32 lsb_bit_offset;
+
+  /* Special offset indicating this edit is for packet length. */
+#define PG_EDIT_PACKET_LENGTH (-1)
+
+  /* Number of bits in edit. */
+  u32 n_bits;
+
+  /* Low and high values for this edit.  Network byte order. */
+  u8 *values[2];
+#define PG_EDIT_LO 0
+#define PG_EDIT_HI 1
+
+  /* Last value used for increment edit type. */
+  u64 last_increment_value;
+} pg_edit_t;
+
+always_inline void
+pg_edit_free (pg_edit_t * e)
+{
+  int i;
+  for (i = 0; i < ARRAY_LEN (e->values); i++)
+    vec_free (e->values[i]);
+}
+
+#define pg_edit_init_bitfield(e,type,field,field_offset,field_n_bits)	\
+do {									\
+  u32 _bo;								\
+									\
+  ASSERT ((field_offset) < STRUCT_BITS_OF (type, field));		\
+									\
+  /* Start byte offset. */						\
+  _bo = STRUCT_OFFSET_OF (type, field);					\
+									\
+  /* Adjust for big endian byte order. */				\
+  _bo += ((STRUCT_BITS_OF (type, field)					\
+	   - (field_offset) - 1) / BITS (u8));				\
+									\
+  (e)->lsb_bit_offset = _bo * BITS (u8) + ((field_offset) % BITS (u8));	\
+  (e)->n_bits = (field_n_bits);						\
+} while (0)
+
+/* Initialize edit for byte aligned fields. */
+#define pg_edit_init(e,type,field) \
+   pg_edit_init_bitfield(e,type,field,0,STRUCT_BITS_OF(type,field))
+
+static inline uword
+pg_edit_n_alloc_bytes (pg_edit_t * e)
+{
+  int i0, i1, n_bytes, n_bits_left;
+
+  i0 = e->lsb_bit_offset;
+  i1 = i0 % BITS (u8);
+
+  n_bytes = 0;
+  n_bits_left = e->n_bits;
+
+  if (n_bits_left > 0 && i1 != 0)
+    {
+      n_bytes++;
+      n_bits_left -= i1;
+      if (n_bits_left < 0)
+	n_bits_left = 0;
+    }
+
+  n_bytes += (n_bits_left / BITS (u8));
+  n_bytes += (n_bits_left % BITS (u8)) != 0;
+
+  return n_bytes;
+}
+
+static inline void
+pg_edit_alloc_value (pg_edit_t * e, int i)
+{
+  vec_validate (e->values[i], e->lsb_bit_offset / BITS (u8));
+}
+
+extern void pg_edit_set_value (pg_edit_t * e, int hi_or_lo, u64 value);
+
+static inline void
+pg_edit_set_fixed (pg_edit_t * e, u64 value)
+{
+  e->type = PG_EDIT_FIXED;
+  pg_edit_set_value (e, PG_EDIT_LO, value);
+}
+
+static inline void
+pg_edit_copy_type_and_values (pg_edit_t * dst, pg_edit_t * src)
+{
+  int i;
+  dst->type = src->type;
+  src->type = PG_EDIT_INVALID_TYPE;
+  for (i = 0; i < ARRAY_LEN (dst->values); i++)
+    {
+      dst->values[i] = src->values[i];
+      src->values[i] = 0;
+    }
+}
+
+static inline u64
+pg_edit_get_value (pg_edit_t * e, int hi_or_lo)
+{
+  u64 r = 0;
+  int i, n;
+  u8 *v = e->values[hi_or_lo];
+
+  n = round_pow2 (e->n_bits, BITS (u8)) / BITS (u8);
+
+  ASSERT (n <= vec_len (v));
+  ASSERT (n <= sizeof (r));
+
+  for (i = 0; i < n; i++)
+    r = (r << BITS (v[i])) + v[i];
+
+  return r;
+}
+
+static inline uword
+pg_edit_is_fixed_with_value (pg_edit_t * e, u64 value)
+{
+  return (e->type == PG_EDIT_FIXED
+	  && value == pg_edit_get_value (e, PG_EDIT_LO));
+}
+
+uword unformat_pg_edit (unformat_input_t * input, va_list * args);
+uword unformat_pg_payload (unformat_input_t * input, va_list * args);
+uword unformat_pg_number (unformat_input_t * input, va_list * args);
+uword unformat_pg_interface (unformat_input_t * input, va_list * args);
+
+#endif /* included_packet_generator_pg_edit_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/pg/example.script b/src/vnet/pg/example.script
new file mode 100644
index 00000000..0e29b9ec
--- /dev/null
+++ b/src/vnet/pg/example.script
@@ -0,0 +1,6 @@
+packet-generator new {
+  name x
+  limit 1
+  node ethernet-input
+  data { IP: 1.2.3 -> 4.5.6 incrementing 100 }
+}
diff --git a/src/vnet/pg/init.c b/src/vnet/pg/init.c
new file mode 100644
index 00000000..631be25e
--- /dev/null
+++ b/src/vnet/pg/init.c
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pg_init.c: VLIB packet generator
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+
+/* Global main structure. */
+pg_main_t pg_main;
+
+static clib_error_t *
+pg_init (vlib_main_t * vm)
+{
+  clib_error_t *error;
+  pg_main_t *pg = &pg_main;
+
+  pg->if_index_by_if_id = hash_create (0, sizeof (uword));
+
+  if ((error = vlib_call_init_function (vm, vnet_main_init)))
+    goto done;
+
+  if ((error = vlib_call_init_function (vm, pg_cli_init)))
+    goto done;
+
+done:
+  return error;
+}
+
+VLIB_INIT_FUNCTION (pg_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/pg/input.c b/src/vnet/pg/input.c
new file mode 100644
index 00000000..e15faeb8
--- /dev/null
+++ b/src/vnet/pg/input.c
@@ -0,0 +1,1667 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pg_input.c: buffer generator input
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/vnet.h>
+#include <vnet/feature/feature.h>
+#include <vnet/devices/devices.h>
+
+static int
+validate_buffer_data2 (vlib_buffer_t * b, pg_stream_t * s,
+		       u32 data_offset, u32 n_bytes)
+{
+  u8 *bd, *pd, *pm;
+  u32 i;
+
+  bd = b->data;
+  pd = s->fixed_packet_data + data_offset;
+  pm = s->fixed_packet_data_mask + data_offset;
+
+  if (pd + n_bytes >= vec_end (s->fixed_packet_data))
+    n_bytes = (pd < vec_end (s->fixed_packet_data)
+	       ? vec_end (s->fixed_packet_data) - pd : 0);
+
+  for (i = 0; i < n_bytes; i++)
+    if ((bd[i] & pm[i]) != pd[i])
+      break;
+
+  if (i >= n_bytes)
+    return 1;
+
+  clib_warning ("buffer %U", format_vlib_buffer, b);
+  clib_warning ("differ at index %d", i);
+  clib_warning ("is     %U", format_hex_bytes, bd, n_bytes);
+  clib_warning ("mask   %U", format_hex_bytes, pm, n_bytes);
+  clib_warning ("expect %U", format_hex_bytes, pd, n_bytes);
+  return 0;
+}
+
+static int
+validate_buffer_data (vlib_buffer_t * b, pg_stream_t * s)
+{
+  return validate_buffer_data2 (b, s, 0, s->buffer_bytes);
+}
+
+always_inline void
+set_1 (void *a0,
+       u64 v0, u64 v_min, u64 v_max, u32 n_bits, u32 is_net_byte_order)
+{
+  ASSERT (v0 >= v_min && v0 <= v_max);
+  if (n_bits == BITS (u8))
+    {
+      ((u8 *) a0)[0] = v0;
+    }
+  else if (n_bits == BITS (u16))
+    {
+      if (is_net_byte_order)
+	v0 = clib_host_to_net_u16 (v0);
+      clib_mem_unaligned (a0, u16) = v0;
+    }
+  else if (n_bits == BITS (u32))
+    {
+      if (is_net_byte_order)
+	v0 = clib_host_to_net_u32 (v0);
+      clib_mem_unaligned (a0, u32) = v0;
+    }
+  else if (n_bits == BITS (u64))
+    {
+      if (is_net_byte_order)
+	v0 = clib_host_to_net_u64 (v0);
+      clib_mem_unaligned (a0, u64) = v0;
+    }
+}
+
+always_inline void
+set_2 (void *a0, void *a1,
+       u64 v0, u64 v1,
+       u64 v_min, u64 v_max,
+       u32 n_bits, u32 is_net_byte_order, u32 is_increment)
+{
+  ASSERT (v0 >= v_min && v0 <= v_max);
+  ASSERT (v1 >= v_min && v1 <= (v_max + is_increment));
+  if (n_bits == BITS (u8))
+    {
+      ((u8 *) a0)[0] = v0;
+      ((u8 *) a1)[0] = v1;
+    }
+  else if (n_bits == BITS (u16))
+    {
+      if (is_net_byte_order)
+	{
+	  v0 = clib_host_to_net_u16 (v0);
+	  v1 = clib_host_to_net_u16 (v1);
+	}
+      clib_mem_unaligned (a0, u16) = v0;
+      clib_mem_unaligned (a1, u16) = v1;
+    }
+  else if (n_bits == BITS (u32))
+    {
+      if (is_net_byte_order)
+	{
+	  v0 = clib_host_to_net_u32 (v0);
+	  v1 = clib_host_to_net_u32 (v1);
+	}
+      clib_mem_unaligned (a0, u32) = v0;
+      clib_mem_unaligned (a1, u32) = v1;
+    }
+  else if (n_bits == BITS (u64))
+    {
+      if (is_net_byte_order)
+	{
+	  v0 = clib_host_to_net_u64 (v0);
+	  v1 = clib_host_to_net_u64 (v1);
+	}
+      clib_mem_unaligned (a0, u64) = v0;
+      clib_mem_unaligned (a1, u64) = v1;
+    }
+}
+
+static_always_inline void
+do_set_fixed (pg_main_t * pg,
+	      pg_stream_t * s,
+	      u32 * buffers,
+	      u32 n_buffers,
+	      u32 n_bits,
+	      u32 byte_offset, u32 is_net_byte_order, u64 v_min, u64 v_max)
+{
+  vlib_main_t *vm = vlib_get_main ();
+
+  while (n_buffers >= 4)
+    {
+      vlib_buffer_t *b0, *b1, *b2, *b3;
+      void *a0, *a1;
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+      b1 = vlib_get_buffer (vm, buffers[1]);
+      b2 = vlib_get_buffer (vm, buffers[2]);
+      b3 = vlib_get_buffer (vm, buffers[3]);
+      buffers += 2;
+      n_buffers -= 2;
+
+      a0 = (void *) b0 + byte_offset;
+      a1 = (void *) b1 + byte_offset;
+      CLIB_PREFETCH ((void *) b2 + byte_offset, sizeof (v_min), WRITE);
+      CLIB_PREFETCH ((void *) b3 + byte_offset, sizeof (v_min), WRITE);
+
+      set_2 (a0, a1, v_min, v_min, v_min, v_max, n_bits, is_net_byte_order,
+	     /* is_increment */ 0);
+
+      ASSERT (validate_buffer_data (b0, s));
+      ASSERT (validate_buffer_data (b1, s));
+    }
+
+  while (n_buffers > 0)
+    {
+      vlib_buffer_t *b0;
+      void *a0;
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+      buffers += 1;
+      n_buffers -= 1;
+
+      a0 = (void *) b0 + byte_offset;
+
+      set_1 (a0, v_min, v_min, v_max, n_bits, is_net_byte_order);
+
+      ASSERT (validate_buffer_data (b0, s));
+    }
+}
+
+static_always_inline u64
+do_set_increment (pg_main_t * pg,
+		  pg_stream_t * s,
+		  u32 * buffers,
+		  u32 n_buffers,
+		  u32 n_bits,
+		  u32 byte_offset,
+		  u32 is_net_byte_order,
+		  u32 want_sum, u64 * sum_result, u64 v_min, u64 v_max, u64 v)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  u64 sum = 0;
+
+  ASSERT (v >= v_min && v <= v_max);
+
+  while (n_buffers >= 4)
+    {
+      vlib_buffer_t *b0, *b1, *b2, *b3;
+      void *a0, *a1;
+      u64 v_old;
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+      b1 = vlib_get_buffer (vm, buffers[1]);
+      b2 = vlib_get_buffer (vm, buffers[2]);
+      b3 = vlib_get_buffer (vm, buffers[3]);
+      buffers += 2;
+      n_buffers -= 2;
+
+      a0 = (void *) b0 + byte_offset;
+      a1 = (void *) b1 + byte_offset;
+      CLIB_PREFETCH ((void *) b2 + byte_offset, sizeof (v_min), WRITE);
+      CLIB_PREFETCH ((void *) b3 + byte_offset, sizeof (v_min), WRITE);
+
+      v_old = v;
+      v = v_old + 2;
+      v = v > v_max ? v_min : v;
+      set_2 (a0, a1,
+	     v_old + 0, v_old + 1, v_min, v_max, n_bits, is_net_byte_order,
+	     /* is_increment */ 1);
+
+      if (want_sum)
+	sum += 2 * v_old + 1;
+
+      if (PREDICT_FALSE (v_old + 1 > v_max))
+	{
+	  if (want_sum)
+	    sum -= 2 * v_old + 1;
+
+	  v = v_old;
+	  set_1 (a0, v + 0, v_min, v_max, n_bits, is_net_byte_order);
+	  if (want_sum)
+	    sum += v;
+	  v += 1;
+
+	  v = v > v_max ? v_min : v;
+	  set_1 (a1, v + 0, v_min, v_max, n_bits, is_net_byte_order);
+	  if (want_sum)
+	    sum += v;
+	  v += 1;
+	}
+
+      ASSERT (validate_buffer_data (b0, s));
+      ASSERT (validate_buffer_data (b1, s));
+    }
+
+  while (n_buffers > 0)
+    {
+      vlib_buffer_t *b0;
+      void *a0;
+      u64 v_old;
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+      buffers += 1;
+      n_buffers -= 1;
+
+      a0 = (void *) b0 + byte_offset;
+
+      v_old = v;
+      if (want_sum)
+	sum += v_old;
+      v += 1;
+      v = v > v_max ? v_min : v;
+
+      ASSERT (v_old >= v_min && v_old <= v_max);
+      set_1 (a0, v_old, v_min, v_max, n_bits, is_net_byte_order);
+
+      ASSERT (validate_buffer_data (b0, s));
+    }
+
+  if (want_sum)
+    *sum_result = sum;
+
+  return v;
+}
+
+static_always_inline void
+do_set_random (pg_main_t * pg,
+	       pg_stream_t * s,
+	       u32 * buffers,
+	       u32 n_buffers,
+	       u32 n_bits,
+	       u32 byte_offset,
+	       u32 is_net_byte_order,
+	       u32 want_sum, u64 * sum_result, u64 v_min, u64 v_max)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  u64 v_diff = v_max - v_min + 1;
+  u64 r_mask = max_pow2 (v_diff) - 1;
+  u64 v0, v1;
+  u64 sum = 0;
+  void *random_data;
+
+  random_data = clib_random_buffer_get_data
+    (&vm->random_buffer, n_buffers * n_bits / BITS (u8));
+
+  v0 = v1 = v_min;
+
+  while (n_buffers >= 4)
+    {
+      vlib_buffer_t *b0, *b1, *b2, *b3;
+      void *a0, *a1;
+      u64 r0 = 0, r1 = 0;	/* warnings be gone */
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+      b1 = vlib_get_buffer (vm, buffers[1]);
+      b2 = vlib_get_buffer (vm, buffers[2]);
+      b3 = vlib_get_buffer (vm, buffers[3]);
+      buffers += 2;
+      n_buffers -= 2;
+
+      a0 = (void *) b0 + byte_offset;
+      a1 = (void *) b1 + byte_offset;
+      CLIB_PREFETCH ((void *) b2 + byte_offset, sizeof (v_min), WRITE);
+      CLIB_PREFETCH ((void *) b3 + byte_offset, sizeof (v_min), WRITE);
+
+      switch (n_bits)
+	{
+#define _(n)					\
+	  case BITS (u##n):			\
+	    {					\
+	      u##n * r = random_data;		\
+	      r0 = r[0];			\
+	      r1 = r[1];			\
+	      random_data = r + 2;		\
+	    }					\
+	  break;
+
+	  _(8);
+	  _(16);
+	  _(32);
+	  _(64);
+
+#undef _
+	}
+
+      /* Add power of 2 sized random number which may be out of range. */
+      v0 += r0 & r_mask;
+      v1 += r1 & r_mask;
+
+      /* Twice should be enough to reduce to v_min .. v_max range. */
+      v0 = v0 > v_max ? v0 - v_diff : v0;
+      v1 = v1 > v_max ? v1 - v_diff : v1;
+      v0 = v0 > v_max ? v0 - v_diff : v0;
+      v1 = v1 > v_max ? v1 - v_diff : v1;
+
+      if (want_sum)
+	sum += v0 + v1;
+
+      set_2 (a0, a1, v0, v1, v_min, v_max, n_bits, is_net_byte_order,
+	     /* is_increment */ 0);
+
+      ASSERT (validate_buffer_data (b0, s));
+      ASSERT (validate_buffer_data (b1, s));
+    }
+
+  while (n_buffers > 0)
+    {
+      vlib_buffer_t *b0;
+      void *a0;
+      u64 r0 = 0;		/* warnings be gone */
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+      buffers += 1;
+      n_buffers -= 1;
+
+      a0 = (void *) b0 + byte_offset;
+
+      switch (n_bits)
+	{
+#define _(n)					\
+	  case BITS (u##n):			\
+	    {					\
+	      u##n * r = random_data;		\
+	      r0 = r[0];			\
+	      random_data = r + 1;		\
+	    }					\
+	  break;
+
+	  _(8);
+	  _(16);
+	  _(32);
+	  _(64);
+
+#undef _
+	}
+
+      /* Add power of 2 sized random number which may be out of range. */
+      v0 += r0 & r_mask;
+
+      /* Twice should be enough to reduce to v_min .. v_max range. */
+      v0 = v0 > v_max ? v0 - v_diff : v0;
+      v0 = v0 > v_max ? v0 - v_diff : v0;
+
+      if (want_sum)
+	sum += v0;
+
+      set_1 (a0, v0, v_min, v_max, n_bits, is_net_byte_order);
+
+      ASSERT (validate_buffer_data (b0, s));
+    }
+
+  if (want_sum)
+    *sum_result = sum;
+}
+
+#define _(i,t)							\
+  clib_mem_unaligned (a##i, t) =				\
+    clib_host_to_net_##t ((clib_net_to_host_mem_##t (a##i) &~ mask)	\
+			  | (v##i << shift))
+
+always_inline void
+setbits_1 (void *a0,
+	   u64 v0,
+	   u64 v_min, u64 v_max,
+	   u32 max_bits, u32 n_bits, u64 mask, u32 shift)
+{
+  ASSERT (v0 >= v_min && v0 <= v_max);
+  if (max_bits == BITS (u8))
+    ((u8 *) a0)[0] = (((u8 *) a0)[0] & ~mask) | (v0 << shift);
+
+  else if (max_bits == BITS (u16))
+    {
+      _(0, u16);
+    }
+  else if (max_bits == BITS (u32))
+    {
+      _(0, u32);
+    }
+  else if (max_bits == BITS (u64))
+    {
+      _(0, u64);
+    }
+}
+
+always_inline void
+setbits_2 (void *a0, void *a1,
+	   u64 v0, u64 v1,
+	   u64 v_min, u64 v_max,
+	   u32 max_bits, u32 n_bits, u64 mask, u32 shift, u32 is_increment)
+{
+  ASSERT (v0 >= v_min && v0 <= v_max);
+  ASSERT (v1 >= v_min && v1 <= v_max + is_increment);
+  if (max_bits == BITS (u8))
+    {
+      ((u8 *) a0)[0] = (((u8 *) a0)[0] & ~mask) | (v0 << shift);
+      ((u8 *) a1)[0] = (((u8 *) a1)[0] & ~mask) | (v1 << shift);
+    }
+
+  else if (max_bits == BITS (u16))
+    {
+      _(0, u16);
+      _(1, u16);
+    }
+  else if (max_bits == BITS (u32))
+    {
+      _(0, u32);
+      _(1, u32);
+    }
+  else if (max_bits == BITS (u64))
+    {
+      _(0, u64);
+      _(1, u64);
+    }
+}
+
+#undef _
+
+static_always_inline void
+do_setbits_fixed (pg_main_t * pg,
+		  pg_stream_t * s,
+		  u32 * buffers,
+		  u32 n_buffers,
+		  u32 max_bits,
+		  u32 n_bits,
+		  u32 byte_offset, u64 v_min, u64 v_max, u64 mask, u32 shift)
+{
+  vlib_main_t *vm = vlib_get_main ();
+
+  while (n_buffers >= 4)
+    {
+      vlib_buffer_t *b0, *b1, *b2, *b3;
+      void *a0, *a1;
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+      b1 = vlib_get_buffer (vm, buffers[1]);
+      b2 = vlib_get_buffer (vm, buffers[2]);
+      b3 = vlib_get_buffer (vm, buffers[3]);
+      buffers += 2;
+      n_buffers -= 2;
+
+      a0 = (void *) b0 + byte_offset;
+      a1 = (void *) b1 + byte_offset;
+      CLIB_PREFETCH ((void *) b2 + byte_offset, sizeof (v_min), WRITE);
+      CLIB_PREFETCH ((void *) b3 + byte_offset, sizeof (v_min), WRITE);
+
+      setbits_2 (a0, a1,
+		 v_min, v_min, v_min, v_max, max_bits, n_bits, mask, shift,
+		 /* is_increment */ 0);
+
+      ASSERT (validate_buffer_data (b0, s));
+      ASSERT (validate_buffer_data (b1, s));
+    }
+
+  while (n_buffers > 0)
+    {
+      vlib_buffer_t *b0;
+      void *a0;
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+      buffers += 1;
+      n_buffers -= 1;
+
+      a0 = (void *) b0 + byte_offset;
+
+      setbits_1 (a0, v_min, v_min, v_max, max_bits, n_bits, mask, shift);
+      ASSERT (validate_buffer_data (b0, s));
+    }
+}
+
+static_always_inline u64
+do_setbits_increment (pg_main_t * pg,
+		      pg_stream_t * s,
+		      u32 * buffers,
+		      u32 n_buffers,
+		      u32 max_bits,
+		      u32 n_bits,
+		      u32 byte_offset,
+		      u64 v_min, u64 v_max, u64 v, u64 mask, u32 shift)
+{
+  vlib_main_t *vm = vlib_get_main ();
+
+  ASSERT (v >= v_min && v <= v_max);
+
+  while (n_buffers >= 4)
+    {
+      vlib_buffer_t *b0, *b1, *b2, *b3;
+      void *a0, *a1;
+      u64 v_old;
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+      b1 = vlib_get_buffer (vm, buffers[1]);
+      b2 = vlib_get_buffer (vm, buffers[2]);
+      b3 = vlib_get_buffer (vm, buffers[3]);
+      buffers += 2;
+      n_buffers -= 2;
+
+      a0 = (void *) b0 + byte_offset;
+      a1 = (void *) b1 + byte_offset;
+      CLIB_PREFETCH ((void *) b2 + byte_offset, sizeof (v_min), WRITE);
+      CLIB_PREFETCH ((void *) b3 + byte_offset, sizeof (v_min), WRITE);
+
+      v_old = v;
+      v = v_old + 2;
+      v = v > v_max ? v_min : v;
+      setbits_2 (a0, a1,
+		 v_old + 0, v_old + 1,
+		 v_min, v_max, max_bits, n_bits, mask, shift,
+		 /* is_increment */ 1);
+
+      if (PREDICT_FALSE (v_old + 1 > v_max))
+	{
+	  v = v_old;
+	  setbits_1 (a0, v + 0, v_min, v_max, max_bits, n_bits, mask, shift);
+	  v += 1;
+
+	  v = v > v_max ? v_min : v;
+	  setbits_1 (a1, v + 0, v_min, v_max, max_bits, n_bits, mask, shift);
+	  v += 1;
+	}
+      ASSERT (validate_buffer_data (b0, s));
+      ASSERT (validate_buffer_data (b1, s));
+    }
+
+  while (n_buffers > 0)
+    {
+      vlib_buffer_t *b0;
+      void *a0;
+      u64 v_old;
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+      buffers += 1;
+      n_buffers -= 1;
+
+      a0 = (void *) b0 + byte_offset;
+
+      v_old = v;
+      v = v_old + 1;
+      v = v > v_max ? v_min : v;
+
+      ASSERT (v_old >= v_min && v_old <= v_max);
+      setbits_1 (a0, v_old, v_min, v_max, max_bits, n_bits, mask, shift);
+
+      ASSERT (validate_buffer_data (b0, s));
+    }
+
+  return v;
+}
+
+static_always_inline void
+do_setbits_random (pg_main_t * pg,
+		   pg_stream_t * s,
+		   u32 * buffers,
+		   u32 n_buffers,
+		   u32 max_bits,
+		   u32 n_bits,
+		   u32 byte_offset, u64 v_min, u64 v_max, u64 mask, u32 shift)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  u64 v_diff = v_max - v_min + 1;
+  u64 r_mask = max_pow2 (v_diff) - 1;
+  u64 v0, v1;
+  void *random_data;
+
+  random_data = clib_random_buffer_get_data
+    (&vm->random_buffer, n_buffers * max_bits / BITS (u8));
+  v0 = v1 = v_min;
+
+  while (n_buffers >= 4)
+    {
+      vlib_buffer_t *b0, *b1, *b2, *b3;
+      void *a0, *a1;
+      u64 r0 = 0, r1 = 0;	/* warnings be gone */
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+      b1 = vlib_get_buffer (vm, buffers[1]);
+      b2 = vlib_get_buffer (vm, buffers[2]);
+      b3 = vlib_get_buffer (vm, buffers[3]);
+      buffers += 2;
+      n_buffers -= 2;
+
+      a0 = (void *) b0 + byte_offset;
+      a1 = (void *) b1 + byte_offset;
+      CLIB_PREFETCH ((void *) b2 + byte_offset, sizeof (v_min), WRITE);
+      CLIB_PREFETCH ((void *) b3 + byte_offset, sizeof (v_min), WRITE);
+
+      switch (max_bits)
+	{
+#define _(n)					\
+	  case BITS (u##n):			\
+	    {					\
+	      u##n * r = random_data;		\
+	      r0 = r[0];			\
+	      r1 = r[1];			\
+	      random_data = r + 2;		\
+	    }					\
+	  break;
+
+	  _(8);
+	  _(16);
+	  _(32);
+	  _(64);
+
+#undef _
+	}
+
+      /* Add power of 2 sized random number which may be out of range. */
+      v0 += r0 & r_mask;
+      v1 += r1 & r_mask;
+
+      /* Twice should be enough to reduce to v_min .. v_max range. */
+      v0 = v0 > v_max ? v0 - v_diff : v0;
+      v1 = v1 > v_max ? v1 - v_diff : v1;
+      v0 = v0 > v_max ? v0 - v_diff : v0;
+      v1 = v1 > v_max ? v1 - v_diff : v1;
+
+      setbits_2 (a0, a1, v0, v1, v_min, v_max, max_bits, n_bits, mask, shift,
+		 /* is_increment */ 0);
+
+      ASSERT (validate_buffer_data (b0, s));
+      ASSERT (validate_buffer_data (b1, s));
+    }
+
+  while (n_buffers > 0)
+    {
+      vlib_buffer_t *b0;
+      void *a0;
+      u64 r0 = 0;		/* warnings be gone */
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+      buffers += 1;
+      n_buffers -= 1;
+
+      a0 = (void *) b0 + byte_offset;
+
+      switch (max_bits)
+	{
+#define _(n)					\
+	  case BITS (u##n):			\
+	    {					\
+	      u##n * r = random_data;		\
+	      r0 = r[0];			\
+	      random_data = r + 1;		\
+	    }					\
+	  break;
+
+	  _(8);
+	  _(16);
+	  _(32);
+	  _(64);
+
+#undef _
+	}
+
+      /* Add power of 2 sized random number which may be out of range. */
+      v0 += r0 & r_mask;
+
+      /* Twice should be enough to reduce to v_min .. v_max range. */
+      v0 = v0 > v_max ? v0 - v_diff : v0;
+      v0 = v0 > v_max ? v0 - v_diff : v0;
+
+      setbits_1 (a0, v0, v_min, v_max, max_bits, n_bits, mask, shift);
+
+      ASSERT (validate_buffer_data (b0, s));
+    }
+}
+
+static u64
+do_it (pg_main_t * pg,
+       pg_stream_t * s,
+       u32 * buffers,
+       u32 n_buffers,
+       u32 lo_bit, u32 hi_bit,
+       u64 v_min, u64 v_max, u64 v, pg_edit_type_t edit_type)
+{
+  u32 max_bits, l0, l1, h1, start_bit;
+
+  if (v_min == v_max)
+    edit_type = PG_EDIT_FIXED;
+
+  l0 = lo_bit / BITS (u8);
+  l1 = lo_bit % BITS (u8);
+  h1 = hi_bit % BITS (u8);
+
+  start_bit = l0 * BITS (u8);
+
+  max_bits = hi_bit - start_bit;
+  ASSERT (max_bits <= 64);
+
+#define _(n)						\
+  case (n):						\
+    if (edit_type == PG_EDIT_INCREMENT)			\
+      v = do_set_increment (pg, s, buffers, n_buffers,	\
+			    BITS (u##n),		\
+			    l0,				\
+			    /* is_net_byte_order */ 1,	\
+			    /* want sum */ 0, 0,	\
+			    v_min, v_max,		\
+			    v);				\
+    else if (edit_type == PG_EDIT_RANDOM)		\
+      do_set_random (pg, s, buffers, n_buffers,		\
+		     BITS (u##n),			\
+		     l0,				\
+		     /* is_net_byte_order */ 1,		\
+		     /* want sum */ 0, 0,		\
+		     v_min, v_max);			\
+    else /* edit_type == PG_EDIT_FIXED */		\
+      do_set_fixed (pg, s, buffers, n_buffers,		\
+		    BITS (u##n),			\
+		    l0,					\
+		    /* is_net_byte_order */ 1,		\
+		    v_min, v_max);			\
+  goto done;
+
+  if (l1 == 0 && h1 == 0)
+    {
+      switch (max_bits)
+	{
+	  _(8);
+	  _(16);
+	  _(32);
+	  _(64);
+	}
+    }
+
+#undef _
+
+  {
+    u64 mask;
+    u32 shift = l1;
+    u32 n_bits = max_bits;
+
+    max_bits = clib_max (max_pow2 (n_bits), 8);
+
+    mask = ((u64) 1 << (u64) n_bits) - 1;
+    mask &= ~(((u64) 1 << (u64) shift) - 1);
+
+    mask <<= max_bits - n_bits;
+    shift += max_bits - n_bits;
+
+    switch (max_bits)
+      {
+#define _(n)								\
+	case (n):							\
+	  if (edit_type == PG_EDIT_INCREMENT)				\
+	    v = do_setbits_increment (pg, s, buffers, n_buffers,	\
+				      BITS (u##n), n_bits,		\
+				      l0, v_min, v_max, v,		\
+				      mask, shift);			\
+	  else if (edit_type == PG_EDIT_RANDOM)				\
+	    do_setbits_random (pg, s, buffers, n_buffers,		\
+			       BITS (u##n), n_bits,			\
+			       l0, v_min, v_max,			\
+			       mask, shift);				\
+	  else /* edit_type == PG_EDIT_FIXED */				\
+	    do_setbits_fixed (pg, s, buffers, n_buffers,		\
+			      BITS (u##n), n_bits,			\
+			      l0, v_min, v_max,				\
+			      mask, shift);				\
+	goto done;
+
+	_(8);
+	_(16);
+	_(32);
+	_(64);
+
+#undef _
+      }
+  }
+
+done:
+  return v;
+}
+
+static void
+pg_generate_set_lengths (pg_main_t * pg,
+			 pg_stream_t * s, u32 * buffers, u32 n_buffers)
+{
+  u64 v_min, v_max, length_sum;
+  pg_edit_type_t edit_type;
+
+  v_min = s->min_packet_bytes;
+  v_max = s->max_packet_bytes;
+  edit_type = s->packet_size_edit_type;
+
+  if (edit_type == PG_EDIT_INCREMENT)
+    s->last_increment_packet_size
+      = do_set_increment (pg, s, buffers, n_buffers,
+			  8 * STRUCT_SIZE_OF (vlib_buffer_t, current_length),
+			  STRUCT_OFFSET_OF (vlib_buffer_t, current_length),
+			  /* is_net_byte_order */ 0,
+			  /* want sum */ 1, &length_sum,
+			  v_min, v_max, s->last_increment_packet_size);
+
+  else if (edit_type == PG_EDIT_RANDOM)
+    do_set_random (pg, s, buffers, n_buffers,
+		   8 * STRUCT_SIZE_OF (vlib_buffer_t, current_length),
+		   STRUCT_OFFSET_OF (vlib_buffer_t, current_length),
+		   /* is_net_byte_order */ 0,
+		   /* want sum */ 1, &length_sum,
+		   v_min, v_max);
+
+  else				/* edit_type == PG_EDIT_FIXED */
+    {
+      do_set_fixed (pg, s, buffers, n_buffers,
+		    8 * STRUCT_SIZE_OF (vlib_buffer_t, current_length),
+		    STRUCT_OFFSET_OF (vlib_buffer_t, current_length),
+		    /* is_net_byte_order */ 0,
+		    v_min, v_max);
+      length_sum = v_min * n_buffers;
+    }
+
+  {
+    vnet_main_t *vnm = vnet_get_main ();
+    vnet_interface_main_t *im = &vnm->interface_main;
+    vnet_sw_interface_t *si =
+      vnet_get_sw_interface (vnm, s->sw_if_index[VLIB_RX]);
+
+    vlib_increment_combined_counter (im->combined_sw_if_counters
+				     + VNET_INTERFACE_COUNTER_RX,
+				     os_get_cpu_number (),
+				     si->sw_if_index, n_buffers, length_sum);
+  }
+
+}
+
+static void
+pg_generate_fix_multi_buffer_lengths (pg_main_t * pg,
+				      pg_stream_t * s,
+				      u32 * buffers, u32 n_buffers)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  pg_buffer_index_t *pbi;
+  uword n_bytes_left;
+  static u32 *unused_buffers = 0;
+
+  while (n_buffers > 0)
+    {
+      vlib_buffer_t *b;
+      u32 bi;
+
+      bi = buffers[0];
+      b = vlib_get_buffer (vm, bi);
+
+      /* Current length here is length of whole packet. */
+      n_bytes_left = b->current_length;
+
+      pbi = s->buffer_indices;
+      while (1)
+	{
+	  uword n = clib_min (n_bytes_left, s->buffer_bytes);
+
+	  b->current_length = n;
+	  n_bytes_left -= n;
+	  if (n_bytes_left > 0)
+	    b->flags |= VLIB_BUFFER_NEXT_PRESENT;
+	  else
+	    b->flags &= ~VLIB_BUFFER_NEXT_PRESENT;
+
+	  /* Return unused buffers to fifos. */
+	  if (n == 0)
+	    vec_add1 (unused_buffers, bi);
+
+	  pbi++;
+	  if (pbi >= vec_end (s->buffer_indices))
+	    break;
+
+	  bi = b->next_buffer;
+	  b = vlib_get_buffer (vm, bi);
+	}
+      ASSERT (n_bytes_left == 0);
+
+      buffers += 1;
+      n_buffers -= 1;
+    }
+
+  if (vec_len (unused_buffers) > 0)
+    {
+      vlib_buffer_free_no_next (vm, unused_buffers, vec_len (unused_buffers));
+      _vec_len (unused_buffers) = 0;
+    }
+}
+
+static void
+pg_generate_edit (pg_main_t * pg,
+		  pg_stream_t * s, u32 * buffers, u32 n_buffers)
+{
+  pg_edit_t *e;
+
+  vec_foreach (e, s->non_fixed_edits)
+  {
+    switch (e->type)
+      {
+      case PG_EDIT_RANDOM:
+      case PG_EDIT_INCREMENT:
+	{
+	  u32 lo_bit, hi_bit;
+	  u64 v_min, v_max;
+
+	  v_min = pg_edit_get_value (e, PG_EDIT_LO);
+	  v_max = pg_edit_get_value (e, PG_EDIT_HI);
+
+	  hi_bit = (BITS (u8) * STRUCT_OFFSET_OF (vlib_buffer_t, data)
+		    + BITS (u8) + e->lsb_bit_offset);
+	  lo_bit = hi_bit - e->n_bits;
+
+	  e->last_increment_value
+	    = do_it (pg, s, buffers, n_buffers, lo_bit, hi_bit, v_min, v_max,
+		     e->last_increment_value, e->type);
+	}
+	break;
+
+      case PG_EDIT_UNSPECIFIED:
+	break;
+
+      default:
+	/* Should not be any fixed edits left. */
+	ASSERT (0);
+	break;
+      }
+  }
+
+  /* Call any edit functions to e.g. completely IP lengths, checksums, ... */
+  {
+    int i;
+    for (i = vec_len (s->edit_groups) - 1; i >= 0; i--)
+      {
+	pg_edit_group_t *g = s->edit_groups + i;
+	if (g->edit_function)
+	  g->edit_function (pg, s, g, buffers, n_buffers);
+      }
+  }
+}
+
+static void
+pg_set_next_buffer_pointers (pg_main_t * pg,
+			     pg_stream_t * s,
+			     u32 * buffers, u32 * next_buffers, u32 n_buffers)
+{
+  vlib_main_t *vm = vlib_get_main ();
+
+  while (n_buffers >= 4)
+    {
+      u32 ni0, ni1;
+      vlib_buffer_t *b0, *b1;
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+      b1 = vlib_get_buffer (vm, buffers[1]);
+      ni0 = next_buffers[0];
+      ni1 = next_buffers[1];
+
+      vlib_prefetch_buffer_with_index (vm, buffers[2], WRITE);
+      vlib_prefetch_buffer_with_index (vm, buffers[3], WRITE);
+
+      b0->flags |= VLIB_BUFFER_NEXT_PRESENT;
+      b1->flags |= VLIB_BUFFER_NEXT_PRESENT;
+      b0->next_buffer = ni0;
+      b1->next_buffer = ni1;
+
+      buffers += 2;
+      next_buffers += 2;
+      n_buffers -= 2;
+    }
+
+  while (n_buffers > 0)
+    {
+      u32 ni0;
+      vlib_buffer_t *b0;
+
+      b0 = vlib_get_buffer (vm, buffers[0]);
+      ni0 = next_buffers[0];
+      buffers += 1;
+      next_buffers += 1;
+      n_buffers -= 1;
+
+      b0->flags |= VLIB_BUFFER_NEXT_PRESENT;
+      b0->next_buffer = ni0;
+    }
+}
+
+static_always_inline void
+init_replay_buffers_inline (vlib_main_t * vm,
+			    pg_stream_t * s,
+			    u32 * buffers,
+			    u32 n_buffers, u32 data_offset, u32 n_data)
+{
+  u32 n_left, *b, i, l;
+
+  n_left = n_buffers;
+  b = buffers;
+  i = s->current_replay_packet_index;
+  l = vec_len (s->replay_packet_templates);
+
+  while (n_left >= 1)
+    {
+      u32 bi0, n0;
+      vlib_buffer_t *b0;
+      u8 *d0;
+
+      bi0 = b[0];
+      b += 1;
+      n_left -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      vnet_buffer (b0)->sw_if_index[VLIB_RX] = s->sw_if_index[VLIB_RX];
+      /* was s->sw_if_index[VLIB_TX]; */
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+
+      d0 = vec_elt (s->replay_packet_templates, i);
+
+      n0 = n_data;
+      if (data_offset + n_data >= vec_len (d0))
+	n0 = vec_len (d0) > data_offset ? vec_len (d0) - data_offset : 0;
+
+      b0->current_length = n0;
+
+      clib_memcpy (b0->data, d0 + data_offset, n0);
+      i = i + 1 == l ? 0 : i + 1;
+    }
+}
+
+static_always_inline void
+init_buffers_inline (vlib_main_t * vm,
+		     pg_stream_t * s,
+		     u32 * buffers,
+		     u32 n_buffers, u32 data_offset, u32 n_data, u32 set_data)
+{
+  u32 n_left, *b;
+  u8 *data, *mask;
+
+  if (vec_len (s->replay_packet_templates) > 0)
+    return init_replay_buffers_inline (vm, s, buffers, n_buffers, data_offset,
+				       n_data);
+
+  data = s->fixed_packet_data + data_offset;
+  mask = s->fixed_packet_data_mask + data_offset;
+  if (data + n_data >= vec_end (s->fixed_packet_data))
+    n_data = (data < vec_end (s->fixed_packet_data)
+	      ? vec_end (s->fixed_packet_data) - data : 0);
+  if (n_data > 0)
+    {
+      ASSERT (data + n_data <= vec_end (s->fixed_packet_data));
+      ASSERT (mask + n_data <= vec_end (s->fixed_packet_data_mask));
+    }
+
+  n_left = n_buffers;
+  b = buffers;
+
+  while (n_left >= 4)
+    {
+      u32 bi0, bi1;
+      vlib_buffer_t *b0, *b1;
+
+      /* Prefetch next iteration. */
+      vlib_prefetch_buffer_with_index (vm, b[2], STORE);
+      vlib_prefetch_buffer_with_index (vm, b[3], STORE);
+
+      bi0 = b[0];
+      bi1 = b[1];
+      b += 2;
+      n_left -= 2;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      vnet_buffer (b0)->sw_if_index[VLIB_RX] =
+	vnet_buffer (b1)->sw_if_index[VLIB_RX] = s->sw_if_index[VLIB_RX];
+
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] =
+	vnet_buffer (b1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+
+      if (set_data)
+	{
+	  clib_memcpy (b0->data, data, n_data);
+	  clib_memcpy (b1->data, data, n_data);
+	}
+      else
+	{
+	  ASSERT (validate_buffer_data2 (b0, s, data_offset, n_data));
+	  ASSERT (validate_buffer_data2 (b1, s, data_offset, n_data));
+	}
+    }
+
+  while (n_left >= 1)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+
+      bi0 = b[0];
+      b += 1;
+      n_left -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      vnet_buffer (b0)->sw_if_index[VLIB_RX] = s->sw_if_index[VLIB_RX];
+      /* s->sw_if_index[VLIB_TX]; */
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+
+      if (set_data)
+	clib_memcpy (b0->data, data, n_data);
+      else
+	ASSERT (validate_buffer_data2 (b0, s, data_offset, n_data));
+    }
+}
+
+static void
+pg_buffer_init (vlib_main_t * vm,
+		vlib_buffer_free_list_t * fl, u32 * buffers, u32 n_buffers)
+{
+  pg_main_t *pg = &pg_main;
+  pg_stream_t *s;
+  uword bi, si;
+
+  si = fl->buffer_init_function_opaque & pow2_mask (24);
+  bi = fl->buffer_init_function_opaque >> 24;
+
+  s = pool_elt_at_index (pg->streams, si);
+
+  init_buffers_inline (vm, s, buffers, n_buffers,
+		       /* data_offset */ bi * s->buffer_bytes,
+		       /* n_data */ s->buffer_bytes,
+		       /* set_data */ 1);
+}
+
+static u32
+pg_stream_fill_helper (pg_main_t * pg,
+		       pg_stream_t * s,
+		       pg_buffer_index_t * bi,
+		       u32 * buffers, u32 * next_buffers, u32 n_alloc)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vlib_buffer_free_list_t *f;
+  uword is_start_of_packet = bi == s->buffer_indices;
+  u32 n_allocated;
+
+  f = vlib_buffer_get_free_list (vm, bi->free_list_index);
+
+  /*
+   * Historically, the pg maintained its own free lists and
+   * device drivers tx paths would return pkts. With the DPDK,
+   * that doesn't happen.
+   */
+  if (DPDK == 0 && !(s->flags & PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE))
+    f->buffer_init_function = pg_buffer_init;
+  f->buffer_init_function_opaque =
+    (s - pg->streams) | ((bi - s->buffer_indices) << 24);
+
+  if (is_start_of_packet)
+    vnet_buffer (&f->buffer_init_template)->sw_if_index[VLIB_RX]
+      = vnet_main.local_interface_sw_if_index;
+
+  n_allocated = vlib_buffer_alloc_from_free_list (vm,
+						  buffers,
+						  n_alloc,
+						  bi->free_list_index);
+  if (n_allocated == 0)
+    return 0;
+
+  /*
+   * We can't assume we got all the buffers we asked for...
+   * This never worked until recently.
+   */
+  n_alloc = n_allocated;
+
+  /* Reinitialize buffers */
+  if (DPDK == 0 || CLIB_DEBUG > 0
+      || (s->flags & PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE))
+    init_buffers_inline
+      (vm, s,
+       buffers,
+       n_alloc, (bi - s->buffer_indices) * s->buffer_bytes /* data offset */ ,
+       s->buffer_bytes,
+       /* set_data */
+       DPDK == 1 || (s->flags & PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE) != 0);
+
+  if (next_buffers)
+    pg_set_next_buffer_pointers (pg, s, buffers, next_buffers, n_alloc);
+
+  if (is_start_of_packet)
+    {
+      if (vec_len (s->replay_packet_templates) > 0)
+	{
+	  vnet_main_t *vnm = vnet_get_main ();
+	  vnet_interface_main_t *im = &vnm->interface_main;
+	  vnet_sw_interface_t *si =
+	    vnet_get_sw_interface (vnm, s->sw_if_index[VLIB_RX]);
+	  u32 l = 0;
+	  u32 i;
+	  for (i = 0; i < n_alloc; i++)
+	    l += vlib_buffer_index_length_in_chain (vm, buffers[i]);
+	  vlib_increment_combined_counter (im->combined_sw_if_counters
+					   + VNET_INTERFACE_COUNTER_RX,
+					   os_get_cpu_number (),
+					   si->sw_if_index, n_alloc, l);
+	  s->current_replay_packet_index += n_alloc;
+	  s->current_replay_packet_index %=
+	    vec_len (s->replay_packet_templates);
+	}
+      else
+	{
+	  pg_generate_set_lengths (pg, s, buffers, n_alloc);
+	  if (vec_len (s->buffer_indices) > 1)
+	    pg_generate_fix_multi_buffer_lengths (pg, s, buffers, n_alloc);
+
+	  pg_generate_edit (pg, s, buffers, n_alloc);
+	}
+    }
+
+  return n_alloc;
+}
+
+static u32
+pg_stream_fill (pg_main_t * pg, pg_stream_t * s, u32 n_buffers)
+{
+  pg_buffer_index_t *bi;
+  word i, n_in_fifo, n_alloc, n_free, n_added;
+  u32 *tail, *start, *end, *last_tail, *last_start;
+
+  bi = s->buffer_indices;
+
+  n_in_fifo = clib_fifo_elts (bi->buffer_fifo);
+  if (n_in_fifo >= n_buffers)
+    return n_in_fifo;
+
+  n_alloc = n_buffers - n_in_fifo;
+
+  /* Round up, but never generate more than limit. */
+  n_alloc = clib_max (VLIB_FRAME_SIZE, n_alloc);
+
+  if (s->n_packets_limit > 0
+      && s->n_packets_generated + n_in_fifo + n_alloc >= s->n_packets_limit)
+    {
+      n_alloc = s->n_packets_limit - s->n_packets_generated - n_in_fifo;
+      if (n_alloc < 0)
+	n_alloc = 0;
+    }
+
+  /* All buffer fifos should have the same size. */
+  if (CLIB_DEBUG > 0)
+    {
+      uword l = ~0, e;
+      vec_foreach (bi, s->buffer_indices)
+      {
+	e = clib_fifo_elts (bi->buffer_fifo);
+	if (bi == s->buffer_indices)
+	  l = e;
+	ASSERT (l == e);
+      }
+    }
+
+  last_tail = last_start = 0;
+  n_added = n_alloc;
+
+  for (i = vec_len (s->buffer_indices) - 1; i >= 0; i--)
+    {
+      bi = vec_elt_at_index (s->buffer_indices, i);
+
+      n_free = clib_fifo_free_elts (bi->buffer_fifo);
+      if (n_free < n_alloc)
+	clib_fifo_resize (bi->buffer_fifo, n_alloc - n_free);
+
+      tail = clib_fifo_advance_tail (bi->buffer_fifo, n_alloc);
+      start = bi->buffer_fifo;
+      end = clib_fifo_end (bi->buffer_fifo);
+
+      if (tail + n_alloc <= end)
+	{
+	  n_added =
+	    pg_stream_fill_helper (pg, s, bi, tail, last_tail, n_alloc);
+	}
+      else
+	{
+	  u32 n = clib_min (end - tail, n_alloc);
+	  n_added = pg_stream_fill_helper (pg, s, bi, tail, last_tail, n);
+
+	  if (n_added == n && n_alloc > n_added)
+	    {
+	      n_added += pg_stream_fill_helper
+		(pg, s, bi, start, last_start, n_alloc - n_added);
+	    }
+	}
+
+      if (PREDICT_FALSE (n_added < n_alloc))
+	tail = clib_fifo_advance_tail (bi->buffer_fifo, n_added - n_alloc);
+
+      last_tail = tail;
+      last_start = start;
+
+      /* Verify that pkts in the fifo are properly allocated */
+    }
+
+  return n_in_fifo + n_added;
+}
+
+typedef struct
+{
+  u32 stream_index;
+
+  u32 packet_length;
+
+  /* Use pre data for packet data. */
+  vlib_buffer_t buffer;
+} pg_input_trace_t;
+
+static u8 *
+format_pg_input_trace (u8 * s, va_list * va)
+{
+  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  pg_input_trace_t *t = va_arg (*va, pg_input_trace_t *);
+  pg_main_t *pg = &pg_main;
+  pg_stream_t *stream;
+  vlib_node_t *n;
+  uword indent = format_get_indent (s);
+
+  stream = 0;
+  if (!pool_is_free_index (pg->streams, t->stream_index))
+    stream = pool_elt_at_index (pg->streams, t->stream_index);
+
+  if (stream)
+    s = format (s, "stream %v", pg->streams[t->stream_index].name);
+  else
+    s = format (s, "stream %d", t->stream_index);
+
+  s = format (s, ", %d bytes", t->packet_length);
+
+  s = format (s, "\n%U%U",
+	      format_white_space, indent, format_vlib_buffer, &t->buffer);
+
+  s = format (s, "\n%U", format_white_space, indent);
+
+  n = 0;
+  if (stream)
+    n = vlib_get_node (vm, stream->node_index);
+
+  if (n && n->format_buffer)
+    s = format (s, "%U", n->format_buffer,
+		t->buffer.pre_data, sizeof (t->buffer.pre_data));
+  else
+    s = format (s, "%U",
+		format_hex_bytes, t->buffer.pre_data,
+		ARRAY_LEN (t->buffer.pre_data));
+  return s;
+}
+
+static void
+pg_input_trace (pg_main_t * pg,
+		vlib_node_runtime_t * node,
+		pg_stream_t * s, u32 * buffers, u32 n_buffers)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  u32 *b, n_left, stream_index, next_index;
+
+  n_left = n_buffers;
+  b = buffers;
+  stream_index = s - pg->streams;
+  next_index = s->next_index;
+
+  while (n_left >= 2)
+    {
+      u32 bi0, bi1;
+      vlib_buffer_t *b0, *b1;
+      pg_input_trace_t *t0, *t1;
+
+      bi0 = b[0];
+      bi1 = b[1];
+      b += 2;
+      n_left -= 2;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      vlib_trace_buffer (vm, node, next_index, b0, /* follow_chain */ 1);
+      vlib_trace_buffer (vm, node, next_index, b1, /* follow_chain */ 1);
+
+      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+      t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
+
+      t0->stream_index = stream_index;
+      t1->stream_index = stream_index;
+
+      t0->packet_length = vlib_buffer_length_in_chain (vm, b0);
+      t1->packet_length = vlib_buffer_length_in_chain (vm, b1);
+
+      clib_memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
+      clib_memcpy (&t1->buffer, b1, sizeof (b1[0]) - sizeof (b1->pre_data));
+
+      clib_memcpy (t0->buffer.pre_data, b0->data,
+		   sizeof (t0->buffer.pre_data));
+      clib_memcpy (t1->buffer.pre_data, b1->data,
+		   sizeof (t1->buffer.pre_data));
+    }
+
+  while (n_left >= 1)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      pg_input_trace_t *t0;
+
+      bi0 = b[0];
+      b += 1;
+      n_left -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      vlib_trace_buffer (vm, node, next_index, b0, /* follow_chain */ 1);
+      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+
+      t0->stream_index = stream_index;
+      t0->packet_length = vlib_buffer_length_in_chain (vm, b0);
+      clib_memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
+      clib_memcpy (t0->buffer.pre_data, b0->data,
+		   sizeof (t0->buffer.pre_data));
+    }
+}
+
+static uword
+pg_generate_packets (vlib_node_runtime_t * node,
+		     pg_main_t * pg,
+		     pg_stream_t * s, uword n_packets_to_generate)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  u32 *to_next, n_this_frame, n_left, n_trace, n_packets_in_fifo;
+  uword n_packets_generated;
+  pg_buffer_index_t *bi, *bi0;
+  u32 next_index = s->next_index;
+  vnet_feature_main_t *fm = &feature_main;
+  vnet_feature_config_main_t *cm;
+  u8 feature_arc_index = fm->device_input_feature_arc_index;
+  cm = &fm->feature_config_mains[feature_arc_index];
+  u32 current_config_index = ~(u32) 0;
+  int i;
+
+  bi0 = s->buffer_indices;
+
+  n_packets_in_fifo = pg_stream_fill (pg, s, n_packets_to_generate);
+  n_packets_to_generate = clib_min (n_packets_in_fifo, n_packets_to_generate);
+  n_packets_generated = 0;
+
+  if (PREDICT_FALSE
+      (vnet_have_features (feature_arc_index, s->sw_if_index[VLIB_RX])))
+    {
+      current_config_index =
+	vec_elt (cm->config_index_by_sw_if_index, s->sw_if_index[VLIB_RX]);
+      vnet_get_config_data (&cm->config_main, &current_config_index,
+			    &next_index, 0);
+    }
+
+  while (n_packets_to_generate > 0)
+    {
+      u32 *head, *start, *end;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left);
+
+      n_this_frame = n_packets_to_generate;
+      if (n_this_frame > n_left)
+	n_this_frame = n_left;
+
+      start = bi0->buffer_fifo;
+      end = clib_fifo_end (bi0->buffer_fifo);
+      head = clib_fifo_head (bi0->buffer_fifo);
+
+      if (head + n_this_frame <= end)
+	vlib_copy_buffers (to_next, head, n_this_frame);
+      else
+	{
+	  u32 n = end - head;
+	  vlib_copy_buffers (to_next + 0, head, n);
+	  vlib_copy_buffers (to_next + n, start, n_this_frame - n);
+	}
+
+      vec_foreach (bi, s->buffer_indices)
+	clib_fifo_advance_head (bi->buffer_fifo, n_this_frame);
+
+      if (current_config_index != ~(u32) 0)
+	for (i = 0; i < n_this_frame; i++)
+	  {
+	    vlib_buffer_t *b;
+	    b = vlib_get_buffer (vm, to_next[i]);
+	    vnet_buffer (b)->device_input_feat.saved_next_index =
+	      s->next_index;
+	    vnet_buffer (b)->device_input_feat.buffer_advance = 0;
+	    b->current_config_index = current_config_index;
+	    b->feature_arc_index = feature_arc_index;
+	  }
+
+      n_trace = vlib_get_trace_count (vm, node);
+      if (n_trace > 0)
+	{
+	  u32 n = clib_min (n_trace, n_this_frame);
+	  pg_input_trace (pg, node, s, to_next, n);
+	  vlib_set_trace_count (vm, node, n_trace - n);
+	}
+      n_packets_to_generate -= n_this_frame;
+      n_packets_generated += n_this_frame;
+      n_left -= n_this_frame;
+      vlib_put_next_frame (vm, node, next_index, n_left);
+    }
+
+  return n_packets_generated;
+}
+
+static uword
+pg_input_stream (vlib_node_runtime_t * node, pg_main_t * pg, pg_stream_t * s)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  uword n_packets;
+  f64 time_now, dt;
+
+  if (s->n_packets_limit > 0 && s->n_packets_generated >= s->n_packets_limit)
+    {
+      pg_stream_enable_disable (pg, s, /* want_enabled */ 0);
+      return 0;
+    }
+
+  /* Apply rate limit. */
+  time_now = vlib_time_now (vm);
+  if (s->time_last_generate == 0)
+    s->time_last_generate = time_now;
+
+  dt = time_now - s->time_last_generate;
+  s->time_last_generate = time_now;
+
+  n_packets = VLIB_FRAME_SIZE;
+  if (s->rate_packets_per_second > 0)
+    {
+      s->packet_accumulator += dt * s->rate_packets_per_second;
+      n_packets = s->packet_accumulator;
+
+      /* Never allow accumulator to grow if we get behind. */
+      s->packet_accumulator -= n_packets;
+    }
+
+  /* Apply fixed limit. */
+  if (s->n_packets_limit > 0
+      && s->n_packets_generated + n_packets > s->n_packets_limit)
+    n_packets = s->n_packets_limit - s->n_packets_generated;
+
+  /* Generate up to one frame's worth of packets. */
+  if (n_packets > VLIB_FRAME_SIZE)
+    n_packets = VLIB_FRAME_SIZE;
+
+  if (n_packets > 0)
+    n_packets = pg_generate_packets (node, pg, s, n_packets);
+
+  s->n_packets_generated += n_packets;
+
+  return n_packets;
+}
+
+uword
+pg_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  uword i;
+  pg_main_t *pg = &pg_main;
+  uword n_packets = 0;
+  u32 worker_index = 0;
+
+  if (vlib_num_workers ())
+    worker_index = vlib_get_current_worker_index ();
+
+  /* *INDENT-OFF* */
+  clib_bitmap_foreach (i, pg->enabled_streams[worker_index], ({
+    pg_stream_t *s = vec_elt_at_index (pg->streams, i);
+    n_packets += pg_input_stream (node, pg, s);
+  }));
+  /* *INDENT-ON* */
+
+  return n_packets;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (pg_input_node) = {
+  .function = pg_input,
+  .name = "pg-input",
+  .sibling_of = "device-input",
+  .type = VLIB_NODE_TYPE_INPUT,
+
+  .format_trace = format_pg_input_trace,
+
+  /* Input node will be left disabled until a stream is active. */
+  .state = VLIB_NODE_STATE_DISABLED,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/pg/output.c b/src/vnet/pg/output.c
new file mode 100644
index 00000000..3d1f2660
--- /dev/null
+++ b/src/vnet/pg/output.c
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pg_output.c: packet generator output
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+
+uword
+pg_output (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  pg_main_t *pg = &pg_main;
+  u32 *buffers = vlib_frame_args (frame);
+  uword n_buffers = frame->n_vectors;
+  uword n_left = n_buffers;
+  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
+  pg_interface_t *pif = pool_elt_at_index (pg->interfaces, rd->dev_instance);
+
+  if (PREDICT_FALSE (pif->lockp != 0))
+    while (__sync_lock_test_and_set (pif->lockp, 1))
+      ;
+
+  if (pif->pcap_file_name != 0)
+    {
+      while (n_left > 0)
+	{
+	  n_left--;
+	  u32 bi0 = buffers[0];
+	  buffers++;
+
+	  pcap_add_buffer (&pif->pcap_main, vm, bi0,
+			   ETHERNET_MAX_PACKET_BYTES);
+	}
+      pcap_write (&pif->pcap_main);
+    }
+
+  vlib_buffer_free (vm, vlib_frame_args (frame), n_buffers);
+  if (PREDICT_FALSE (pif->lockp != 0))
+    *pif->lockp = 0;
+  return n_buffers;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/pg/pg.h b/src/vnet/pg/pg.h
new file mode 100644
index 00000000..a4027834
--- /dev/null
+++ b/src/vnet/pg/pg.h
@@ -0,0 +1,383 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pg.h: VLIB packet generator
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vlib_pg_h
+#define included_vlib_pg_h
+
+#include <vlib/vlib.h>		/* for VLIB_N_RX_TX */
+#include <vnet/pg/edit.h>
+#include <vppinfra/fifo.h>	/* for buffer_fifo */
+#include <vnet/unix/pcap.h>
+#include <vnet/interface.h>
+
+extern vnet_device_class_t pg_dev_class;
+
+struct pg_main_t;
+struct pg_stream_t;
+
+typedef struct pg_edit_group_t
+{
+  /* Edits in this group. */
+  pg_edit_t *edits;
+
+  /* Vector of non-fixed edits for this group. */
+  pg_edit_t *non_fixed_edits;
+
+  /* Fixed edits for this group. */
+  u8 *fixed_packet_data;
+  u8 *fixed_packet_data_mask;
+
+  /* Byte offset where packet data begins. */
+  u32 start_byte_offset;
+
+  /* Number of packet bytes for this edit group. */
+  u32 n_packet_bytes;
+
+  /* Function to perform miscellaneous edits (e.g. set IP checksum, ...). */
+  void (*edit_function) (struct pg_main_t * pg,
+			 struct pg_stream_t * s,
+			 struct pg_edit_group_t * g,
+			 u32 * buffers, u32 n_buffers);
+
+  /* Opaque data for edit function's use. */
+  uword edit_function_opaque;
+} pg_edit_group_t;
+
+/* Packets are made of multiple buffers chained together.
+   This struct keeps track of data per-chain index. */
+typedef struct
+{
+  /* Vector of buffer edits for this stream and buffer index. */
+  pg_edit_t *edits;
+
+  /* Buffers pre-initialized with fixed buffer data for this stream. */
+  u32 *buffer_fifo;
+
+  /* Buffer free list for this buffer index in stream. */
+  u32 free_list_index;
+} pg_buffer_index_t;
+
+typedef struct pg_stream_t
+{
+  /* Stream name. */
+  u8 *name;
+
+  u32 flags;
+
+  /* Stream is currently enabled. */
+#define PG_STREAM_FLAGS_IS_ENABLED (1 << 0)
+#define PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE (1 << 1)
+
+  /* Edit groups are created by each protocol level (e.g. ethernet,
+     ip4, tcp, ...). */
+  pg_edit_group_t *edit_groups;
+
+  pg_edit_type_t packet_size_edit_type;
+
+  /* Min/max packet size. */
+  u32 min_packet_bytes, max_packet_bytes;
+
+  /* Vector of non-fixed edits for this stream.
+     All fixed edits are performed and placed into fixed_packet_data. */
+  pg_edit_t *non_fixed_edits;
+
+  /* Packet data with all fixed edits performed.
+     All packets in stream are initialized according with this data.
+     Mask specifies which bits of packet data are covered by fixed edits. */
+  u8 *fixed_packet_data, *fixed_packet_data_mask;
+
+  /* Size to use for buffers.  0 means use buffers big enough
+     for max_packet_bytes. */
+  u32 buffer_bytes;
+
+  /* Last packet length if packet size edit type is increment. */
+  u32 last_increment_packet_size;
+
+  /* Index into main interface pool for this stream. */
+  u32 pg_if_index;
+
+  /* Interface used to mark packets for this stream.  May be different
+     than hw/sw index from pg main interface pool.  They will be
+     different if this stream is being used generate buffers as if
+     they were received on a non-pg interface.  For example, suppose you
+     are trying to test vlan code and you want to generate buffers that
+     appear to come from an ethernet interface. */
+  u32 sw_if_index[VLIB_N_RX_TX];
+
+  /* Node where stream's buffers get put. */
+  u32 node_index;
+
+  /* Worker thread index */
+  u32 worker_index;
+
+  /* Output next index to reach output node from stream input node. */
+  u32 next_index;
+
+  u32 if_id;
+
+  /* Number of packets currently generated. */
+  u64 n_packets_generated;
+
+  /* Stream is disabled when packet limit is reached.
+     Zero means no packet limit. */
+  u64 n_packets_limit;
+
+  /* Rate for this stream in packets/second.
+     Zero means unlimited rate. */
+  f64 rate_packets_per_second;
+
+  f64 time_last_generate;
+
+  f64 packet_accumulator;
+
+  pg_buffer_index_t *buffer_indices;
+
+  u8 **replay_packet_templates;
+  u32 current_replay_packet_index;
+} pg_stream_t;
+
+always_inline void
+pg_buffer_index_free (pg_buffer_index_t * bi)
+{
+  vec_free (bi->edits);
+  clib_fifo_free (bi->buffer_fifo);
+}
+
+always_inline void
+pg_edit_group_free (pg_edit_group_t * g)
+{
+  pg_edit_t *e;
+  vec_foreach (e, g->edits) pg_edit_free (e);
+  vec_free (g->edits);
+  vec_free (g->fixed_packet_data);
+  vec_free (g->fixed_packet_data_mask);
+}
+
+always_inline void
+pg_stream_free (pg_stream_t * s)
+{
+  pg_edit_group_t *g;
+  pg_edit_t *e;
+  vec_foreach (e, s->non_fixed_edits) pg_edit_free (e);
+  vec_free (s->non_fixed_edits);
+  vec_foreach (g, s->edit_groups) pg_edit_group_free (g);
+  vec_free (s->edit_groups);
+  vec_free (s->fixed_packet_data);
+  vec_free (s->fixed_packet_data_mask);
+  vec_free (s->name);
+
+  {
+    pg_buffer_index_t *bi;
+    vec_foreach (bi, s->buffer_indices) pg_buffer_index_free (bi);
+    vec_free (s->buffer_indices);
+  }
+}
+
+always_inline int
+pg_stream_is_enabled (pg_stream_t * s)
+{
+  return (s->flags & PG_STREAM_FLAGS_IS_ENABLED) != 0;
+}
+
+always_inline pg_edit_group_t *
+pg_stream_get_group (pg_stream_t * s, u32 group_index)
+{
+  return vec_elt_at_index (s->edit_groups, group_index);
+}
+
+always_inline void *
+pg_create_edit_group (pg_stream_t * s,
+		      int n_edit_bytes, int n_packet_bytes, u32 * group_index)
+{
+  pg_edit_group_t *g;
+  int n_edits;
+
+  vec_add2 (s->edit_groups, g, 1);
+  if (group_index)
+    *group_index = g - s->edit_groups;
+
+  ASSERT (n_edit_bytes % sizeof (pg_edit_t) == 0);
+  n_edits = n_edit_bytes / sizeof (pg_edit_t);
+  vec_resize (g->edits, n_edits);
+
+  g->n_packet_bytes = n_packet_bytes;
+
+  return g->edits;
+}
+
+always_inline void *
+pg_add_edits (pg_stream_t * s, int n_edit_bytes, int n_packet_bytes,
+	      u32 group_index)
+{
+  pg_edit_group_t *g = pg_stream_get_group (s, group_index);
+  pg_edit_t *e;
+  int n_edits;
+  ASSERT (n_edit_bytes % sizeof (pg_edit_t) == 0);
+  n_edits = n_edit_bytes / sizeof (pg_edit_t);
+  vec_add2 (g->edits, e, n_edits);
+  g->n_packet_bytes += n_packet_bytes;
+  return e;
+}
+
+always_inline void *
+pg_get_edit_group (pg_stream_t * s, u32 group_index)
+{
+  pg_edit_group_t *g = pg_stream_get_group (s, group_index);
+  return g->edits;
+}
+
+/* Number of bytes for all groups >= given group. */
+always_inline uword
+pg_edit_group_n_bytes (pg_stream_t * s, u32 group_index)
+{
+  pg_edit_group_t *g;
+  uword n_bytes = 0;
+
+  for (g = s->edit_groups + group_index; g < vec_end (s->edit_groups); g++)
+    n_bytes += g->n_packet_bytes;
+  return n_bytes;
+}
+
+always_inline void
+pg_free_edit_group (pg_stream_t * s)
+{
+  uword i = vec_len (s->edit_groups) - 1;
+  pg_edit_group_t *g = pg_stream_get_group (s, i);
+
+  pg_edit_group_free (g);
+  memset (g, 0, sizeof (g[0]));
+  _vec_len (s->edit_groups) = i;
+}
+
+typedef struct
+{
+  /* TX lock */
+  volatile u32 *lockp;
+
+  /* VLIB interface indices. */
+  u32 hw_if_index, sw_if_index;
+
+  /* Identifies stream for this interface. */
+  u32 id;
+
+  pcap_main_t pcap_main;
+  u8 *pcap_file_name;
+} pg_interface_t;
+
+/* Per VLIB node data. */
+typedef struct
+{
+  /* Parser function indexed by node index. */
+  unformat_function_t *unformat_edit;
+} pg_node_t;
+
+typedef struct pg_main_t
+{
+  /* Pool of streams. */
+  pg_stream_t *streams;
+
+  /* Bitmap indicating which streams are currently enabled. */
+  uword **enabled_streams;
+
+  /* Hash mapping name -> stream index. */
+  uword *stream_index_by_name;
+
+  /* Pool of interfaces. */
+  pg_interface_t *interfaces;
+  uword *if_index_by_if_id;
+
+  /* Per VLIB node information. */
+  pg_node_t *nodes;
+} pg_main_t;
+
+/* Global main structure. */
+extern pg_main_t pg_main;
+
+/* Global node. */
+extern vlib_node_registration_t pg_input_node;
+
+/* Buffer generator input, output node functions. */
+vlib_node_function_t pg_input, pg_output;
+
+/* Stream add/delete. */
+void pg_stream_del (pg_main_t * pg, uword index);
+void pg_stream_add (pg_main_t * pg, pg_stream_t * s_init);
+
+/* Enable/disable stream. */
+void pg_stream_enable_disable (pg_main_t * pg, pg_stream_t * s,
+			       int is_enable);
+
+/* Find/create free packet-generator interface index. */
+u32 pg_interface_add_or_get (pg_main_t * pg, uword stream_index);
+
+always_inline pg_node_t *
+pg_get_node (uword node_index)
+{
+  pg_main_t *pg = &pg_main;
+  vec_validate (pg->nodes, node_index);
+  return pg->nodes + node_index;
+}
+
+void pg_edit_group_get_fixed_packet_data (pg_stream_t * s,
+					  u32 group_index,
+					  void *fixed_packet_data,
+					  void *fixed_packet_data_mask);
+
+void pg_enable_disable (u32 stream_index, int is_enable);
+
+typedef struct
+{
+  u32 hw_if_index;
+  u32 dev_instance;
+  u8 is_enabled;
+  u8 *pcap_file_name;
+  u32 count;
+} pg_capture_args_t;
+
+clib_error_t *pg_capture (pg_capture_args_t * a);
+
+#endif /* included_vlib_pg_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/pg/stream.c b/src/vnet/pg/stream.c
new file mode 100644
index 00000000..1ed7189f
--- /dev/null
+++ b/src/vnet/pg/stream.c
@@ -0,0 +1,497 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pg_stream.c: packet generator streams
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/mpls/mpls.h>
+#include <vnet/devices/devices.h>
+
+/* Mark stream active or inactive. */
+void
+pg_stream_enable_disable (pg_main_t * pg, pg_stream_t * s, int want_enabled)
+{
+  vlib_main_t *vm;
+  vnet_main_t *vnm = vnet_get_main ();
+  pg_interface_t *pi = pool_elt_at_index (pg->interfaces, s->pg_if_index);
+
+  want_enabled = want_enabled != 0;
+
+  if (pg_stream_is_enabled (s) == want_enabled)
+    /* No change necessary. */
+    return;
+
+  if (want_enabled)
+    s->n_packets_generated = 0;
+
+  /* Toggle enabled flag. */
+  s->flags ^= PG_STREAM_FLAGS_IS_ENABLED;
+
+  ASSERT (!pool_is_free (pg->streams, s));
+
+  vec_validate (pg->enabled_streams, s->worker_index);
+  pg->enabled_streams[s->worker_index] =
+    clib_bitmap_set (pg->enabled_streams[s->worker_index], s - pg->streams,
+		     want_enabled);
+
+  if (want_enabled)
+    {
+      vnet_hw_interface_set_flags (vnm, pi->hw_if_index,
+				   VNET_HW_INTERFACE_FLAG_LINK_UP);
+
+      vnet_sw_interface_set_flags (vnm, pi->sw_if_index,
+				   VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+    }
+
+  if (vlib_num_workers ())
+    vm = vlib_get_worker_vlib_main (s->worker_index);
+  else
+    vm = vlib_get_main ();
+
+  vlib_node_set_state (vm, pg_input_node.index,
+		       (clib_bitmap_is_zero
+			(pg->enabled_streams[s->worker_index]) ?
+			VLIB_NODE_STATE_DISABLED : VLIB_NODE_STATE_POLLING));
+
+  s->packet_accumulator = 0;
+  s->time_last_generate = 0;
+}
+
+static u8 *
+format_pg_interface_name (u8 * s, va_list * args)
+{
+  pg_main_t *pg = &pg_main;
+  u32 if_index = va_arg (*args, u32);
+  pg_interface_t *pi;
+
+  pi = pool_elt_at_index (pg->interfaces, if_index);
+  s = format (s, "pg%d", pi->id);
+
+  return s;
+}
+
+static clib_error_t *
+pg_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+  u32 hw_flags = 0;
+
+  if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+    hw_flags = VNET_HW_INTERFACE_FLAG_LINK_UP;
+
+  vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (pg_dev_class) = {
+  .name = "pg",
+  .tx_function = pg_output,
+  .format_device_name = format_pg_interface_name,
+  .admin_up_down_function = pg_interface_admin_up_down,
+};
+/* *INDENT-ON* */
+
+static u8 *
+pg_build_rewrite (vnet_main_t * vnm,
+		  u32 sw_if_index,
+		  vnet_link_t link_type, const void *dst_address)
+{
+  u8 *rewrite = NULL;
+  u16 *h;
+
+  vec_validate (rewrite, sizeof (*h) - 1);
+  h = (u16 *) rewrite;
+  h[0] = clib_host_to_net_u16 (vnet_link_to_l3_proto (link_type));
+
+  return (rewrite);
+}
+
+/* *INDENT-OFF* */
+VNET_HW_INTERFACE_CLASS (pg_interface_class,static) = {
+  .name = "Packet generator",
+  .build_rewrite = pg_build_rewrite,
+};
+/* *INDENT-ON* */
+
+static u32
+pg_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, u32 flags)
+{
+  /* nothing for now */
+  return 0;
+}
+
+u32
+pg_interface_add_or_get (pg_main_t * pg, uword if_id)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vlib_main_t *vm = vlib_get_main ();
+  pg_interface_t *pi;
+  vnet_hw_interface_t *hi;
+  uword *p;
+  u32 i;
+
+  p = hash_get (pg->if_index_by_if_id, if_id);
+
+  if (p)
+    {
+      return p[0];
+    }
+  else
+    {
+      u8 hw_addr[6];
+      f64 now = vlib_time_now (vm);
+      u32 rnd;
+
+      pool_get (pg->interfaces, pi);
+      i = pi - pg->interfaces;
+
+      rnd = (u32) (now * 1e6);
+      rnd = random_u32 (&rnd);
+      clib_memcpy (hw_addr + 2, &rnd, sizeof (rnd));
+      hw_addr[0] = 2;
+      hw_addr[1] = 0xfe;
+
+      pi->id = if_id;
+      ethernet_register_interface (vnm, pg_dev_class.index, i, hw_addr,
+				   &pi->hw_if_index, pg_eth_flag_change);
+      hi = vnet_get_hw_interface (vnm, pi->hw_if_index);
+      pi->sw_if_index = hi->sw_if_index;
+
+      hash_set (pg->if_index_by_if_id, if_id, i);
+
+      if (vlib_num_workers ())
+	{
+	  pi->lockp = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
+					      CLIB_CACHE_LINE_BYTES);
+	  *pi->lockp = 0;
+	}
+
+      ip4_sw_interface_enable_disable (pi->hw_if_index, 1);
+      ip6_sw_interface_enable_disable (pi->hw_if_index, 1);
+      mpls_sw_interface_enable_disable (&mpls_main, pi->hw_if_index, 1);
+    }
+
+  return i;
+}
+
+static void
+do_edit (pg_stream_t * stream,
+	 pg_edit_group_t * g, pg_edit_t * e, uword want_commit)
+{
+  u32 i, i0, i1, mask, n_bits_left;
+  u8 *v, *s, *m;
+
+  i0 = e->lsb_bit_offset / BITS (u8);
+
+  /* Make space for edit in value and mask. */
+  vec_validate (g->fixed_packet_data, i0);
+  vec_validate (g->fixed_packet_data_mask, i0);
+
+  if (e->type != PG_EDIT_FIXED)
+    {
+      switch (e->type)
+	{
+	case PG_EDIT_RANDOM:
+	case PG_EDIT_INCREMENT:
+	  e->last_increment_value = pg_edit_get_value (e, PG_EDIT_LO);
+	  break;
+
+	default:
+	  break;
+	}
+
+      if (want_commit)
+	{
+	  ASSERT (e->type != PG_EDIT_INVALID_TYPE);
+	  vec_add1 (g->non_fixed_edits, e[0]);
+	}
+      return;
+    }
+
+  s = g->fixed_packet_data;
+  m = g->fixed_packet_data_mask;
+
+  n_bits_left = e->n_bits;
+  i0 = e->lsb_bit_offset / BITS (u8);
+  i1 = e->lsb_bit_offset % BITS (u8);
+
+  v = e->values[PG_EDIT_LO];
+  i = pg_edit_n_alloc_bytes (e) - 1;
+
+  /* Odd low order bits?. */
+  if (i1 != 0 && n_bits_left > 0)
+    {
+      u32 n = clib_min (n_bits_left, BITS (u8) - i1);
+
+      mask = pow2_mask (n) << i1;
+
+      ASSERT (i0 < vec_len (s));
+      ASSERT (i < vec_len (v));
+      ASSERT ((v[i] & ~mask) == 0);
+
+      s[i0] |= v[i] & mask;
+      m[i0] |= mask;
+
+      i0--;
+      i--;
+      n_bits_left -= n;
+    }
+
+  /* Even bytes. */
+  while (n_bits_left >= 8)
+    {
+      ASSERT (i0 < vec_len (s));
+      ASSERT (i < vec_len (v));
+
+      s[i0] = v[i];
+      m[i0] = ~0;
+
+      i0--;
+      i--;
+      n_bits_left -= 8;
+    }
+
+  /* Odd high order bits. */
+  if (n_bits_left > 0)
+    {
+      mask = pow2_mask (n_bits_left);
+
+      ASSERT (i0 < vec_len (s));
+      ASSERT (i < vec_len (v));
+      ASSERT ((v[i] & ~mask) == 0);
+
+      s[i0] |= v[i] & mask;
+      m[i0] |= mask;
+    }
+
+  if (want_commit)
+    pg_edit_free (e);
+}
+
+void
+pg_edit_group_get_fixed_packet_data (pg_stream_t * s,
+				     u32 group_index,
+				     void *packet_data,
+				     void *packet_data_mask)
+{
+  pg_edit_group_t *g = pg_stream_get_group (s, group_index);
+  pg_edit_t *e;
+
+  vec_foreach (e, g->edits) do_edit (s, g, e, /* want_commit */ 0);
+
+  clib_memcpy (packet_data, g->fixed_packet_data,
+	       vec_len (g->fixed_packet_data));
+  clib_memcpy (packet_data_mask, g->fixed_packet_data_mask,
+	       vec_len (g->fixed_packet_data_mask));
+}
+
+static void
+perform_fixed_edits (pg_stream_t * s)
+{
+  pg_edit_group_t *g;
+  pg_edit_t *e;
+  word i;
+
+  for (i = vec_len (s->edit_groups) - 1; i >= 0; i--)
+    {
+      g = vec_elt_at_index (s->edit_groups, i);
+      vec_foreach (e, g->edits) do_edit (s, g, e, /* want_commit */ 1);
+
+      /* All edits have either been performed or added to
+         g->non_fixed_edits.  So, we can delete the vector. */
+      vec_free (g->edits);
+    }
+
+  vec_free (s->fixed_packet_data_mask);
+  vec_free (s->fixed_packet_data);
+  vec_foreach (g, s->edit_groups)
+  {
+    int i;
+    g->start_byte_offset = vec_len (s->fixed_packet_data);
+
+    /* Relocate and copy non-fixed edits from group to stream. */
+    vec_foreach (e, g->non_fixed_edits)
+      e->lsb_bit_offset += g->start_byte_offset * BITS (u8);
+
+    for (i = 0; i < vec_len (g->non_fixed_edits); i++)
+      ASSERT (g->non_fixed_edits[i].type != PG_EDIT_INVALID_TYPE);
+
+    vec_add (s->non_fixed_edits,
+	     g->non_fixed_edits, vec_len (g->non_fixed_edits));
+    vec_free (g->non_fixed_edits);
+
+    vec_add (s->fixed_packet_data,
+	     g->fixed_packet_data, vec_len (g->fixed_packet_data));
+    vec_add (s->fixed_packet_data_mask,
+	     g->fixed_packet_data_mask, vec_len (g->fixed_packet_data_mask));
+  }
+}
+
+void
+pg_stream_add (pg_main_t * pg, pg_stream_t * s_init)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  pg_stream_t *s;
+  uword *p;
+
+  if (!pg->stream_index_by_name)
+    pg->stream_index_by_name
+      = hash_create_vec (0, sizeof (s->name[0]), sizeof (uword));
+
+  /* Delete any old stream with the same name. */
+  if (s_init->name
+      && (p = hash_get_mem (pg->stream_index_by_name, s_init->name)))
+    {
+      pg_stream_del (pg, p[0]);
+    }
+
+  pool_get (pg->streams, s);
+  s[0] = s_init[0];
+
+  /* Give it a name. */
+  if (!s->name)
+    s->name = format (0, "stream%d", s - pg->streams);
+  else
+    s->name = vec_dup (s->name);
+
+  hash_set_mem (pg->stream_index_by_name, s->name, s - pg->streams);
+
+  /* Get fixed part of buffer data. */
+  if (s->edit_groups)
+    perform_fixed_edits (s);
+
+  /* Determine packet size. */
+  switch (s->packet_size_edit_type)
+    {
+    case PG_EDIT_INCREMENT:
+    case PG_EDIT_RANDOM:
+      if (s->min_packet_bytes == s->max_packet_bytes)
+	s->packet_size_edit_type = PG_EDIT_FIXED;
+      break;
+
+    default:
+      /* Get packet size from fixed edits. */
+      s->packet_size_edit_type = PG_EDIT_FIXED;
+      if (!s->replay_packet_templates)
+	s->min_packet_bytes = s->max_packet_bytes =
+	  vec_len (s->fixed_packet_data);
+      break;
+    }
+
+  s->last_increment_packet_size = s->min_packet_bytes;
+
+  {
+    pg_buffer_index_t *bi;
+    int n;
+
+#if DPDK > 0
+    s->buffer_bytes = VLIB_BUFFER_DATA_SIZE;
+#endif
+
+    if (!s->buffer_bytes)
+      s->buffer_bytes = s->max_packet_bytes;
+
+    s->buffer_bytes = vlib_buffer_round_size (s->buffer_bytes);
+
+    n = s->max_packet_bytes / s->buffer_bytes;
+    n += (s->max_packet_bytes % s->buffer_bytes) != 0;
+
+    vec_resize (s->buffer_indices, n);
+
+    vec_foreach (bi, s->buffer_indices)
+    {
+      bi->free_list_index =
+	vlib_buffer_create_free_list (vm, s->buffer_bytes,
+				      "pg stream %d buffer #%d",
+				      s - pg->streams,
+				      1 + (bi - s->buffer_indices));
+    }
+  }
+
+  /* Find an interface to use. */
+  s->pg_if_index = pg_interface_add_or_get (pg, s->if_id);
+
+  {
+    pg_interface_t *pi = pool_elt_at_index (pg->interfaces, s->pg_if_index);
+    vlib_rx_or_tx_t rx_or_tx;
+
+    vlib_foreach_rx_tx (rx_or_tx)
+    {
+      if (s->sw_if_index[rx_or_tx] == ~0)
+	s->sw_if_index[rx_or_tx] = pi->sw_if_index;
+    }
+  }
+
+  /* Connect the graph. */
+  s->next_index = vlib_node_add_next (vm, device_input_node.index,
+				      s->node_index);
+}
+
+void
+pg_stream_del (pg_main_t * pg, uword index)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  pg_stream_t *s;
+  pg_buffer_index_t *bi;
+
+  s = pool_elt_at_index (pg->streams, index);
+
+  pg_stream_enable_disable (pg, s, /* want_enabled */ 0);
+  hash_unset_mem (pg->stream_index_by_name, s->name);
+
+  vec_foreach (bi, s->buffer_indices)
+  {
+    vlib_buffer_delete_free_list (vm, bi->free_list_index);
+    clib_fifo_free (bi->buffer_fifo);
+  }
+
+  pg_stream_free (s);
+  pool_put (pg->streams, s);
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/pipeline.h b/src/vnet/pipeline.h
new file mode 100644
index 00000000..a4aa5cf5
--- /dev/null
+++ b/src/vnet/pipeline.h
@@ -0,0 +1,456 @@
+/*
+ * vnet/pipeline.h: software pipeline
+ *
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Usage example.
+ *
+ * #define NSTAGES 3 or whatever
+ *
+ * <Define pipeline stages>
+ *
+ * #include <vnet/pipeline.h>
+ *
+ * static uword my_node_fn (vlib_main_t * vm,
+ *                               vlib_node_runtime_t * node,
+ *                               vlib_frame_t * frame)
+ * {
+ *     return dispatch_pipeline (vm, node, frame);
+ * }
+ *
+ */
+
+#ifndef NSTAGES
+#error files which #include <vnet/pipeline.h> must define NSTAGES
+#endif
+
+#ifndef STAGE_INLINE
+#define STAGE_INLINE inline
+#endif
+
+/*
+ * A prefetch stride of 2 is quasi-equivalent to doubling the number
+ * of stages with every other pipeline stage empty.
+ */
+
+/*
+ * This is a typical first pipeline stage, which prefetches
+ * buffer metadata and the first line of pkt data.
+ * To use it:
+ *  #define stage0 generic_stage0
+ */
+static STAGE_INLINE void
+generic_stage0 (vlib_main_t * vm,
+		vlib_node_runtime_t * node, u32 buffer_index)
+{
+  /* generic default stage 0 here */
+  vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
+  vlib_prefetch_buffer_header (b, STORE);
+  CLIB_PREFETCH (b->data, CLIB_CACHE_LINE_BYTES, STORE);
+}
+
+#if NSTAGES == 2
+
+static STAGE_INLINE uword
+dispatch_pipeline (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 *from = vlib_frame_vector_args (frame);
+  u32 n_left_from, n_left_to_next, *to_next, next_index, next0;
+  int pi, pi_limit;
+
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      pi_limit = clib_min (n_left_from, n_left_to_next);
+
+      for (pi = 0; pi < NSTAGES - 1; pi++)
+	{
+	  if (pi == pi_limit)
+	    break;
+	  stage0 (vm, node, from[pi]);
+	}
+
+      for (; pi < pi_limit; pi++)
+	{
+	  stage0 (vm, node, from[pi]);
+	  to_next[0] = from[pi - 1];
+	  to_next++;
+	  n_left_to_next--;
+	  next0 = last_stage (vm, node, from[pi - 1]);
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   from[pi - 1], next0);
+	  n_left_from--;
+	  if ((int) n_left_to_next < 0 && n_left_from > 0)
+	    vlib_get_next_frame (vm, node, next_index, to_next,
+				 n_left_to_next);
+	}
+
+      for (; pi < (pi_limit + (NSTAGES - 1)); pi++)
+	{
+	  if (((pi - 1) >= 0) && ((pi - 1) < pi_limit))
+	    {
+	      to_next[0] = from[pi - 1];
+	      to_next++;
+	      n_left_to_next--;
+	      next0 = last_stage (vm, node, from[pi - 1]);
+	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					       to_next, n_left_to_next,
+					       from[pi - 1], next0);
+	      n_left_from--;
+	      if ((int) n_left_to_next < 0 && n_left_from > 0)
+		vlib_get_next_frame (vm, node, next_index, to_next,
+				     n_left_to_next);
+	    }
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+      from += pi_limit;
+    }
+  return frame->n_vectors;
+}
+#endif
+
+#if NSTAGES == 3
+static STAGE_INLINE uword
+dispatch_pipeline (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 *from = vlib_frame_vector_args (frame);
+  u32 n_left_from, n_left_to_next, *to_next, next_index, next0;
+  int pi, pi_limit;
+
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      pi_limit = clib_min (n_left_from, n_left_to_next);
+
+      for (pi = 0; pi < NSTAGES - 1; pi++)
+	{
+	  if (pi == pi_limit)
+	    break;
+	  stage0 (vm, node, from[pi]);
+	  if (pi - 1 >= 0)
+	    stage1 (vm, node, from[pi - 1]);
+	}
+
+      for (; pi < pi_limit; pi++)
+	{
+	  stage0 (vm, node, from[pi]);
+	  stage1 (vm, node, from[pi - 1]);
+	  to_next[0] = from[pi - 2];
+	  to_next++;
+	  n_left_to_next--;
+	  next0 = last_stage (vm, node, from[pi - 2]);
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   from[pi - 2], next0);
+	  n_left_from--;
+	  if ((int) n_left_to_next < 0 && n_left_from > 0)
+	    vlib_get_next_frame (vm, node, next_index, to_next,
+				 n_left_to_next);
+	}
+
+
+      for (; pi < (pi_limit + (NSTAGES - 1)); pi++)
+	{
+	  if (((pi - 1) >= 0) && ((pi - 1) < pi_limit))
+	    stage1 (vm, node, from[pi - 1]);
+	  if (((pi - 2) >= 0) && ((pi - 2) < pi_limit))
+	    {
+	      to_next[0] = from[pi - 2];
+	      to_next++;
+	      n_left_to_next--;
+	      next0 = last_stage (vm, node, from[pi - 2]);
+	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					       to_next, n_left_to_next,
+					       from[pi - 2], next0);
+	      n_left_from--;
+	      if ((int) n_left_to_next < 0 && n_left_from > 0)
+		vlib_get_next_frame (vm, node, next_index, to_next,
+				     n_left_to_next);
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+      from += pi_limit;
+    }
+  return frame->n_vectors;
+}
+#endif
+
+#if NSTAGES == 4
+static STAGE_INLINE uword
+dispatch_pipeline (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 *from = vlib_frame_vector_args (frame);
+  u32 n_left_from, n_left_to_next, *to_next, next_index, next0;
+  int pi, pi_limit;
+
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      pi_limit = clib_min (n_left_from, n_left_to_next);
+
+      for (pi = 0; pi < NSTAGES - 1; pi++)
+	{
+	  if (pi == pi_limit)
+	    break;
+	  stage0 (vm, node, from[pi]);
+	  if (pi - 1 >= 0)
+	    stage1 (vm, node, from[pi - 1]);
+	  if (pi - 2 >= 0)
+	    stage2 (vm, node, from[pi - 2]);
+	}
+
+      for (; pi < pi_limit; pi++)
+	{
+	  stage0 (vm, node, from[pi]);
+	  stage1 (vm, node, from[pi - 1]);
+	  stage2 (vm, node, from[pi - 2]);
+	  to_next[0] = from[pi - 3];
+	  to_next++;
+	  n_left_to_next--;
+	  next0 = last_stage (vm, node, from[pi - 3]);
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   from[pi - 3], next0);
+	  n_left_from--;
+	  if ((int) n_left_to_next < 0 && n_left_from > 0)
+	    vlib_get_next_frame (vm, node, next_index, to_next,
+				 n_left_to_next);
+	}
+
+
+      for (; pi < (pi_limit + (NSTAGES - 1)); pi++)
+	{
+	  if (((pi - 1) >= 0) && ((pi - 1) < pi_limit))
+	    stage1 (vm, node, from[pi - 1]);
+	  if (((pi - 2) >= 0) && ((pi - 2) < pi_limit))
+	    stage2 (vm, node, from[pi - 2]);
+	  if (((pi - 3) >= 0) && ((pi - 3) < pi_limit))
+	    {
+	      to_next[0] = from[pi - 3];
+	      to_next++;
+	      n_left_to_next--;
+	      next0 = last_stage (vm, node, from[pi - 3]);
+	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					       to_next, n_left_to_next,
+					       from[pi - 3], next0);
+	      n_left_from--;
+	      if ((int) n_left_to_next < 0 && n_left_from > 0)
+		vlib_get_next_frame (vm, node, next_index, to_next,
+				     n_left_to_next);
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+      from += pi_limit;
+    }
+  return frame->n_vectors;
+}
+#endif
+
+
+#if NSTAGES == 5
+static STAGE_INLINE uword
+dispatch_pipeline (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 *from = vlib_frame_vector_args (frame);
+  u32 n_left_from, n_left_to_next, *to_next, next_index, next0;
+  int pi, pi_limit;
+
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      pi_limit = clib_min (n_left_from, n_left_to_next);
+
+      for (pi = 0; pi < NSTAGES - 1; pi++)
+	{
+	  if (pi == pi_limit)
+	    break;
+	  stage0 (vm, node, from[pi]);
+	  if (pi - 1 >= 0)
+	    stage1 (vm, node, from[pi - 1]);
+	  if (pi - 2 >= 0)
+	    stage2 (vm, node, from[pi - 2]);
+	  if (pi - 3 >= 0)
+	    stage3 (vm, node, from[pi - 3]);
+	}
+
+      for (; pi < pi_limit; pi++)
+	{
+	  stage0 (vm, node, from[pi]);
+	  stage1 (vm, node, from[pi - 1]);
+	  stage2 (vm, node, from[pi - 2]);
+	  stage3 (vm, node, from[pi - 3]);
+	  to_next[0] = from[pi - 4];
+	  to_next++;
+	  n_left_to_next--;
+	  next0 = last_stage (vm, node, from[pi - 4]);
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   from[pi - 4], next0);
+	  n_left_from--;
+	  if ((int) n_left_to_next < 0 && n_left_from > 0)
+	    vlib_get_next_frame (vm, node, next_index, to_next,
+				 n_left_to_next);
+	}
+
+
+      for (; pi < (pi_limit + (NSTAGES - 1)); pi++)
+	{
+	  if (((pi - 1) >= 0) && ((pi - 1) < pi_limit))
+	    stage1 (vm, node, from[pi - 1]);
+	  if (((pi - 2) >= 0) && ((pi - 2) < pi_limit))
+	    stage2 (vm, node, from[pi - 2]);
+	  if (((pi - 3) >= 0) && ((pi - 3) < pi_limit))
+	    stage3 (vm, node, from[pi - 3]);
+	  if (((pi - 4) >= 0) && ((pi - 4) < pi_limit))
+	    {
+	      to_next[0] = from[pi - 4];
+	      to_next++;
+	      n_left_to_next--;
+	      next0 = last_stage (vm, node, from[pi - 4]);
+	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					       to_next, n_left_to_next,
+					       from[pi - 4], next0);
+	      n_left_from--;
+	      if ((int) n_left_to_next < 0 && n_left_from > 0)
+		vlib_get_next_frame (vm, node, next_index, to_next,
+				     n_left_to_next);
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+      from += pi_limit;
+    }
+  return frame->n_vectors;
+}
+#endif
+
+#if NSTAGES == 6
+static STAGE_INLINE uword
+dispatch_pipeline (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 *from = vlib_frame_vector_args (frame);
+  u32 n_left_from, n_left_to_next, *to_next, next_index, next0;
+  int pi, pi_limit;
+
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      pi_limit = clib_min (n_left_from, n_left_to_next);
+
+      for (pi = 0; pi < NSTAGES - 1; pi++)
+	{
+	  if (pi == pi_limit)
+	    break;
+	  stage0 (vm, node, from[pi]);
+	  if (pi - 1 >= 0)
+	    stage1 (vm, node, from[pi - 1]);
+	  if (pi - 2 >= 0)
+	    stage2 (vm, node, from[pi - 2]);
+	  if (pi - 3 >= 0)
+	    stage3 (vm, node, from[pi - 3]);
+	  if (pi - 4 >= 0)
+	    stage4 (vm, node, from[pi - 4]);
+	}
+
+      for (; pi < pi_limit; pi++)
+	{
+	  stage0 (vm, node, from[pi]);
+	  stage1 (vm, node, from[pi - 1]);
+	  stage2 (vm, node, from[pi - 2]);
+	  stage3 (vm, node, from[pi - 3]);
+	  stage4 (vm, node, from[pi - 4]);
+	  to_next[0] = from[pi - 5];
+	  to_next++;
+	  n_left_to_next--;
+	  next0 = last_stage (vm, node, from[pi - 5]);
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   from[pi - 5], next0);
+	  n_left_from--;
+	  if ((int) n_left_to_next < 0 && n_left_from > 0)
+	    vlib_get_next_frame (vm, node, next_index, to_next,
+				 n_left_to_next);
+	}
+
+
+      for (; pi < (pi_limit + (NSTAGES - 1)); pi++)
+	{
+	  if (((pi - 1) >= 0) && ((pi - 1) < pi_limit))
+	    stage1 (vm, node, from[pi - 1]);
+	  if (((pi - 2) >= 0) && ((pi - 2) < pi_limit))
+	    stage2 (vm, node, from[pi - 2]);
+	  if (((pi - 3) >= 0) && ((pi - 3) < pi_limit))
+	    stage3 (vm, node, from[pi - 3]);
+	  if (((pi - 4) >= 0) && ((pi - 4) < pi_limit))
+	    stage4 (vm, node, from[pi - 4]);
+	  if (((pi - 5) >= 0) && ((pi - 5) < pi_limit))
+	    {
+	      to_next[0] = from[pi - 5];
+	      to_next++;
+	      n_left_to_next--;
+	      next0 = last_stage (vm, node, from[pi - 5]);
+	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					       to_next, n_left_to_next,
+					       from[pi - 5], next0);
+	      n_left_from--;
+	      if ((int) n_left_to_next < 0 && n_left_from > 0)
+		vlib_get_next_frame (vm, node, next_index, to_next,
+				     n_left_to_next);
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+      from += pi_limit;
+    }
+  return frame->n_vectors;
+}
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/plugin/p1.c b/src/vnet/plugin/p1.c
new file mode 100644
index 00000000..3102ecce
--- /dev/null
+++ b/src/vnet/plugin/p1.c
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* 
+ * This file and in fact the entire directory shouldn't even exist.
+ *
+ * Unfortunately, various things malfunction when we try to go there. 
+ * Plugin DLL's end up with their own copies of critical
+ * data structures. No one of these problems would be tough to fix, 
+ * but there are quite a number of them.
+ */
+
+/* 
+ * Make certain that plugin .dll's which reference the following functions
+ * can find them...
+ */
+
+#if DPDK > 0
+#define foreach_dpdk_plugin_reference		\
+_(rte_calloc)                                   \
+_(rte_free)                                     \
+_(rte_malloc)                                   \
+_(rte_zmalloc)                                  \
+_(rte_malloc_virt2phy)                          \
+_(rte_eal_get_configuration)
+#else
+#define foreach_dpdk_plugin_reference
+#endif
+
+#define _(a) void a (void);
+foreach_dpdk_plugin_reference
+#undef _
+
+void *vnet_library_plugin_references[] =
+  {
+#define _(a) &a,
+    foreach_dpdk_plugin_reference
+#undef _
+  };
+
+void vnet_library_plugin_reference(void) { }
diff --git a/src/vnet/plugin/plugin.h b/src/vnet/plugin/plugin.h
new file mode 100644
index 00000000..a14a5932
--- /dev/null
+++ b/src/vnet/plugin/plugin.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vnet_plugin_h
+#define included_vnet_plugin_h
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vppinfra/error.h>
+
+/* Pointers to Genuine Vnet data structures handed to plugin .dll's */
+typedef struct {
+  vnet_main_t * vnet_main;
+  ethernet_main_t * ethernet_main;
+} vnet_plugin_handoff_t;
+
+void * vnet_get_handoff_structure (void);
+
+#endif /* included_vnet_plugin_h */
diff --git a/src/vnet/policer/node_funcs.c b/src/vnet/policer/node_funcs.c
new file mode 100644
index 00000000..1f4997ff
--- /dev/null
+++ b/src/vnet/policer/node_funcs.c
@@ -0,0 +1,938 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdint.h>
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/policer/policer.h>
+#include <vnet/ip/ip.h>
+#include <vnet/classify/policer_classify.h>
+#include <vnet/classify/vnet_classify.h>
+
+#define IP4_NON_DSCP_BITS 0x03
+#define IP4_DSCP_SHIFT    2
+#define IP6_NON_DSCP_BITS 0xf03fffff
+#define IP6_DSCP_SHIFT    22
+
+/* Dispatch functions meant to be instantiated elsewhere */
+
+typedef struct
+{
+  u32 next_index;
+  u32 sw_if_index;
+  u32 policer_index;
+} vnet_policer_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_policer_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  vnet_policer_trace_t *t = va_arg (*args, vnet_policer_trace_t *);
+
+  s = format (s, "VNET_POLICER: sw_if_index %d policer_index %d next %d",
+	      t->sw_if_index, t->policer_index, t->next_index);
+  return s;
+}
+
+#define foreach_vnet_policer_error              \
+_(TRANSMIT, "Packets Transmitted")              \
+_(DROP, "Packets Dropped")
+
+typedef enum
+{
+#define _(sym,str) VNET_POLICER_ERROR_##sym,
+  foreach_vnet_policer_error
+#undef _
+    VNET_POLICER_N_ERROR,
+} vnet_policer_error_t;
+
+static char *vnet_policer_error_strings[] = {
+#define _(sym,string) string,
+  foreach_vnet_policer_error
+#undef _
+};
+
+static_always_inline void
+vnet_policer_mark (vlib_buffer_t * b, u8 dscp)
+{
+  ethernet_header_t *eh;
+  ip4_header_t *ip4h;
+  ip6_header_t *ip6h;
+  u16 type;
+
+  eh = (ethernet_header_t *) b->data;
+  type = clib_net_to_host_u16 (eh->type);
+
+  if (PREDICT_TRUE (type == ETHERNET_TYPE_IP4))
+    {
+      ip4h = (ip4_header_t *) & (b->data[sizeof (ethernet_header_t)]);;
+      ip4h->tos &= IP4_NON_DSCP_BITS;
+      ip4h->tos |= dscp << IP4_DSCP_SHIFT;
+      ip4h->checksum = ip4_header_checksum (ip4h);
+    }
+  else
+    {
+      if (PREDICT_TRUE (type == ETHERNET_TYPE_IP6))
+	{
+	  ip6h = (ip6_header_t *) & (b->data[sizeof (ethernet_header_t)]);
+	  ip6h->ip_version_traffic_class_and_flow_label &=
+	    clib_host_to_net_u32 (IP6_NON_DSCP_BITS);
+	  ip6h->ip_version_traffic_class_and_flow_label |=
+	    clib_host_to_net_u32 (dscp << IP6_DSCP_SHIFT);
+	}
+    }
+}
+
+static_always_inline
+  u8 vnet_policer_police (vlib_main_t * vm,
+			  vlib_buffer_t * b,
+			  u32 policer_index,
+			  u64 time_in_policer_periods,
+			  policer_result_e packet_color)
+{
+  u8 act;
+  u32 len;
+  u32 col;
+  policer_read_response_type_st *pol;
+  vnet_policer_main_t *pm = &vnet_policer_main;
+
+  len = vlib_buffer_length_in_chain (vm, b);
+  pol = &pm->policers[policer_index];
+  col = vnet_police_packet (pol, len, packet_color, time_in_policer_periods);
+  act = pol->action[col];
+  if (PREDICT_TRUE (act == SSE2_QOS_ACTION_MARK_AND_TRANSMIT))
+    vnet_policer_mark (b, pol->mark_dscp[col]);
+
+  return act;
+}
+
+static inline uword
+vnet_policer_inline (vlib_main_t * vm,
+		     vlib_node_runtime_t * node,
+		     vlib_frame_t * frame, vnet_policer_index_t which)
+{
+  u32 n_left_from, *from, *to_next;
+  vnet_policer_next_t next_index;
+  vnet_policer_main_t *pm = &vnet_policer_main;
+  u64 time_in_policer_periods;
+  u32 transmitted = 0;
+
+  time_in_policer_periods =
+    clib_cpu_time_now () >> POLICER_TICKS_PER_PERIOD_SHIFT;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+	  u32 sw_if_index0, sw_if_index1;
+	  u32 pi0 = 0, pi1 = 0;
+	  u8 act0, act1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *b2, *b3;
+
+	    b2 = vlib_get_buffer (vm, from[2]);
+	    b3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (b2, LOAD);
+	    vlib_prefetch_buffer_header (b3, LOAD);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  next0 = VNET_POLICER_NEXT_TRANSMIT;
+
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+	  next1 = VNET_POLICER_NEXT_TRANSMIT;
+
+
+	  if (which == VNET_POLICER_INDEX_BY_SW_IF_INDEX)
+	    {
+	      pi0 = pm->policer_index_by_sw_if_index[sw_if_index0];
+	      pi1 = pm->policer_index_by_sw_if_index[sw_if_index1];
+	    }
+
+	  if (which == VNET_POLICER_INDEX_BY_OPAQUE)
+	    {
+	      pi0 = vnet_buffer (b0)->policer.index;
+	      pi1 = vnet_buffer (b1)->policer.index;
+	    }
+
+	  if (which == VNET_POLICER_INDEX_BY_EITHER)
+	    {
+	      pi0 = vnet_buffer (b0)->policer.index;
+	      pi0 = (pi0 != ~0) ? pi0 :
+		pm->policer_index_by_sw_if_index[sw_if_index0];
+	      pi1 = vnet_buffer (b1)->policer.index;
+	      pi1 = (pi1 != ~0) ? pi1 :
+		pm->policer_index_by_sw_if_index[sw_if_index1];
+	    }
+
+	  act0 = vnet_policer_police (vm, b0, pi0, time_in_policer_periods,
+				      POLICE_CONFORM /* no chaining */ );
+
+	  act1 = vnet_policer_police (vm, b1, pi1, time_in_policer_periods,
+				      POLICE_CONFORM /* no chaining */ );
+
+	  if (PREDICT_FALSE (act0 == SSE2_QOS_ACTION_DROP))	/* drop action */
+	    {
+	      next0 = VNET_POLICER_NEXT_DROP;
+	      b0->error = node->errors[VNET_POLICER_ERROR_DROP];
+	    }
+	  else			/* transmit or mark-and-transmit action */
+	    {
+	      transmitted++;
+	    }
+
+	  if (PREDICT_FALSE (act1 == SSE2_QOS_ACTION_DROP))	/* drop action */
+	    {
+	      next1 = VNET_POLICER_NEXT_DROP;
+	      b1->error = node->errors[VNET_POLICER_ERROR_DROP];
+	    }
+	  else			/* transmit or mark-and-transmit action */
+	    {
+	      transmitted++;
+	    }
+
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  vnet_policer_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->sw_if_index = sw_if_index0;
+		  t->next_index = next0;
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  vnet_policer_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->sw_if_index = sw_if_index1;
+		  t->next_index = next1;
+		}
+	    }
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 sw_if_index0;
+	  u32 pi0 = 0;
+	  u8 act0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  next0 = VNET_POLICER_NEXT_TRANSMIT;
+
+	  if (which == VNET_POLICER_INDEX_BY_SW_IF_INDEX)
+	    pi0 = pm->policer_index_by_sw_if_index[sw_if_index0];
+
+	  if (which == VNET_POLICER_INDEX_BY_OPAQUE)
+	    pi0 = vnet_buffer (b0)->policer.index;
+
+	  if (which == VNET_POLICER_INDEX_BY_EITHER)
+	    {
+	      pi0 = vnet_buffer (b0)->policer.index;
+	      pi0 = (pi0 != ~0) ? pi0 :
+		pm->policer_index_by_sw_if_index[sw_if_index0];
+	    }
+
+	  act0 = vnet_policer_police (vm, b0, pi0, time_in_policer_periods,
+				      POLICE_CONFORM /* no chaining */ );
+
+	  if (PREDICT_FALSE (act0 == SSE2_QOS_ACTION_DROP))	/* drop action */
+	    {
+	      next0 = VNET_POLICER_NEXT_DROP;
+	      b0->error = node->errors[VNET_POLICER_ERROR_DROP];
+	    }
+	  else			/* transmit or mark-and-transmit action */
+	    {
+	      transmitted++;
+	    }
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      vnet_policer_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = sw_if_index0;
+	      t->next_index = next0;
+	      t->policer_index = pi0;
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, node->node_index,
+			       VNET_POLICER_ERROR_TRANSMIT, transmitted);
+  return frame->n_vectors;
+}
+
+uword
+vnet_policer_by_sw_if_index (vlib_main_t * vm,
+			     vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return vnet_policer_inline (vm, node, frame,
+			      VNET_POLICER_INDEX_BY_SW_IF_INDEX);
+}
+
+uword
+vnet_policer_by_opaque (vlib_main_t * vm,
+			vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return vnet_policer_inline (vm, node, frame, VNET_POLICER_INDEX_BY_OPAQUE);
+}
+
+uword
+vnet_policer_by_either (vlib_main_t * vm,
+			vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return vnet_policer_inline (vm, node, frame, VNET_POLICER_INDEX_BY_EITHER);
+}
+
+void
+vnet_policer_node_funcs_reference (void)
+{
+}
+
+
+#define TEST_CODE 1
+
+#ifdef TEST_CODE
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (policer_by_sw_if_index_node, static) = {
+  .function = vnet_policer_by_sw_if_index,
+  .name = "policer-by-sw-if-index",
+  .vector_size = sizeof (u32),
+  .format_trace = format_policer_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(vnet_policer_error_strings),
+  .error_strings = vnet_policer_error_strings,
+
+  .n_next_nodes = VNET_POLICER_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [VNET_POLICER_NEXT_TRANSMIT] = "ethernet-input",
+    [VNET_POLICER_NEXT_DROP] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (policer_by_sw_if_index_node,
+			      vnet_policer_by_sw_if_index);
+/* *INDENT-ON* */
+
+
+int
+test_policer_add_del (u32 rx_sw_if_index, u8 * config_name, int is_add)
+{
+  vnet_policer_main_t *pm = &vnet_policer_main;
+  policer_read_response_type_st *template;
+  policer_read_response_type_st *policer;
+  vnet_hw_interface_t *rxhi;
+  uword *p;
+
+  rxhi = vnet_get_sup_hw_interface (pm->vnet_main, rx_sw_if_index);
+
+  /* Make sure caller didn't pass a vlan subif, etc. */
+  if (rxhi->sw_if_index != rx_sw_if_index)
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+  if (is_add)
+    {
+
+      p = hash_get_mem (pm->policer_config_by_name, config_name);
+
+      if (p == 0)
+	return -2;
+
+      template = pool_elt_at_index (pm->policer_templates, p[0]);
+
+      vnet_hw_interface_rx_redirect_to_node
+	(pm->vnet_main, rxhi->hw_if_index, policer_by_sw_if_index_node.index);
+
+      pool_get_aligned (pm->policers, policer, CLIB_CACHE_LINE_BYTES);
+
+      policer[0] = template[0];
+
+      vec_validate (pm->policer_index_by_sw_if_index, rx_sw_if_index);
+      pm->policer_index_by_sw_if_index[rx_sw_if_index]
+	= policer - pm->policers;
+    }
+  else
+    {
+      u32 pi;
+      vnet_hw_interface_rx_redirect_to_node (pm->vnet_main,
+					     rxhi->hw_if_index,
+					     ~0 /* disable */ );
+
+      pi = pm->policer_index_by_sw_if_index[rx_sw_if_index];
+      pm->policer_index_by_sw_if_index[rx_sw_if_index] = ~0;
+      pool_put_index (pm->policers, pi);
+    }
+
+  return 0;
+}
+
+static clib_error_t *
+test_policer_command_fn (vlib_main_t * vm,
+			 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_policer_main_t *pm = &vnet_policer_main;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 rx_sw_if_index;
+  int rv;
+  u8 *config_name = 0;
+  int rx_set = 0;
+  int is_add = 1;
+  int is_show = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "intfc %U", unformat_vnet_sw_interface,
+		    pm->vnet_main, &rx_sw_if_index))
+	rx_set = 1;
+      else if (unformat (line_input, "show"))
+	is_show = 1;
+      else if (unformat (line_input, "policer %s", &config_name))
+	;
+      else if (unformat (line_input, "del"))
+	is_add = 0;
+      else
+	break;
+    }
+
+  if (rx_set == 0)
+    return clib_error_return (0, "interface not set");
+
+  if (is_show)
+    {
+      u32 pi = pm->policer_index_by_sw_if_index[rx_sw_if_index];
+      policer_read_response_type_st *policer;
+      policer = pool_elt_at_index (pm->policers, pi);
+
+      vlib_cli_output (vm, "%U", format_policer_instance, policer);
+      return 0;
+    }
+
+  if (is_add && config_name == 0)
+    {
+      return clib_error_return (0, "policer config name required");
+    }
+
+  rv = test_policer_add_del (rx_sw_if_index, config_name, is_add);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    default:
+      return clib_error_return
+	(0, "WARNING: vnet_vnet_policer_add_del returned %d", rv);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (test_patch_command, static) = {
+    .path = "test policer",
+    .short_help =
+    "intfc <intfc> policer <policer-config-name> [del]",
+    .function = test_policer_command_fn,
+};
+/* *INDENT-ON* */
+
+#endif /* TEST_CODE */
+
+
+typedef struct
+{
+  u32 sw_if_index;
+  u32 next_index;
+  u32 table_index;
+  u32 offset;
+  u32 policer_index;
+} policer_classify_trace_t;
+
+static u8 *
+format_policer_classify_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  policer_classify_trace_t *t = va_arg (*args, policer_classify_trace_t *);
+
+  s = format (s, "POLICER_CLASSIFY: sw_if_index %d next %d table %d offset %d"
+	      " policer_index %d",
+	      t->sw_if_index, t->next_index, t->table_index, t->offset,
+	      t->policer_index);
+  return s;
+}
+
+#define foreach_policer_classify_error                 \
+_(MISS, "Policer classify misses")                     \
+_(HIT, "Policer classify hits")                        \
+_(CHAIN_HIT, "Polcier classify hits after chain walk") \
+_(DROP, "Policer classify action drop")
+
+typedef enum
+{
+#define _(sym,str) POLICER_CLASSIFY_ERROR_##sym,
+  foreach_policer_classify_error
+#undef _
+    POLICER_CLASSIFY_N_ERROR,
+} policer_classify_error_t;
+
+static char *policer_classify_error_strings[] = {
+#define _(sym,string) string,
+  foreach_policer_classify_error
+#undef _
+};
+
+static inline uword
+policer_classify_inline (vlib_main_t * vm,
+			 vlib_node_runtime_t * node,
+			 vlib_frame_t * frame,
+			 policer_classify_table_id_t tid)
+{
+  u32 n_left_from, *from, *to_next;
+  policer_classify_next_index_t next_index;
+  policer_classify_main_t *pcm = &policer_classify_main;
+  vnet_classify_main_t *vcm = pcm->vnet_classify_main;
+  f64 now = vlib_time_now (vm);
+  u32 hits = 0;
+  u32 misses = 0;
+  u32 chain_hits = 0;
+  u32 drop = 0;
+  u32 n_next_nodes;
+  u64 time_in_policer_periods;
+
+  time_in_policer_periods =
+    clib_cpu_time_now () >> POLICER_TICKS_PER_PERIOD_SHIFT;
+
+  n_next_nodes = node->n_next_nodes;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  /* First pass: compute hashes */
+  while (n_left_from > 2)
+    {
+      vlib_buffer_t *b0, *b1;
+      u32 bi0, bi1;
+      u8 *h0, *h1;
+      u32 sw_if_index0, sw_if_index1;
+      u32 table_index0, table_index1;
+      vnet_classify_table_t *t0, *t1;
+
+      /* Prefetch next iteration */
+      {
+	vlib_buffer_t *p1, *p2;
+
+	p1 = vlib_get_buffer (vm, from[1]);
+	p2 = vlib_get_buffer (vm, from[2]);
+
+	vlib_prefetch_buffer_header (p1, STORE);
+	CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE);
+	vlib_prefetch_buffer_header (p2, STORE);
+	CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+      }
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      h0 = b0->data;
+
+      bi1 = from[1];
+      b1 = vlib_get_buffer (vm, bi1);
+      h1 = b1->data;
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      table_index0 =
+	pcm->classify_table_index_by_sw_if_index[tid][sw_if_index0];
+
+      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+      table_index1 =
+	pcm->classify_table_index_by_sw_if_index[tid][sw_if_index1];
+
+      t0 = pool_elt_at_index (vcm->tables, table_index0);
+
+      t1 = pool_elt_at_index (vcm->tables, table_index1);
+
+      vnet_buffer (b0)->l2_classify.hash =
+	vnet_classify_hash_packet (t0, (u8 *) h0);
+
+      vnet_classify_prefetch_bucket (t0, vnet_buffer (b0)->l2_classify.hash);
+
+      vnet_buffer (b1)->l2_classify.hash =
+	vnet_classify_hash_packet (t1, (u8 *) h1);
+
+      vnet_classify_prefetch_bucket (t1, vnet_buffer (b1)->l2_classify.hash);
+
+      vnet_buffer (b0)->l2_classify.table_index = table_index0;
+
+      vnet_buffer (b1)->l2_classify.table_index = table_index1;
+
+      from += 2;
+      n_left_from -= 2;
+    }
+
+  while (n_left_from > 0)
+    {
+      vlib_buffer_t *b0;
+      u32 bi0;
+      u8 *h0;
+      u32 sw_if_index0;
+      u32 table_index0;
+      vnet_classify_table_t *t0;
+
+      bi0 = from[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      h0 = b0->data;
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      table_index0 =
+	pcm->classify_table_index_by_sw_if_index[tid][sw_if_index0];
+
+      t0 = pool_elt_at_index (vcm->tables, table_index0);
+      vnet_buffer (b0)->l2_classify.hash =
+	vnet_classify_hash_packet (t0, (u8 *) h0);
+
+      vnet_buffer (b0)->l2_classify.table_index = table_index0;
+      vnet_classify_prefetch_bucket (t0, vnet_buffer (b0)->l2_classify.hash);
+
+      from++;
+      n_left_from--;
+    }
+
+  next_index = node->cached_next_index;
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /* Not enough load/store slots to dual loop... */
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0 = POLICER_CLASSIFY_NEXT_INDEX_DROP;
+	  u32 table_index0;
+	  vnet_classify_table_t *t0;
+	  vnet_classify_entry_t *e0;
+	  u64 hash0;
+	  u8 *h0;
+	  u8 act0;
+
+	  /* Stride 3 seems to work best */
+	  if (PREDICT_TRUE (n_left_from > 3))
+	    {
+	      vlib_buffer_t *p1 = vlib_get_buffer (vm, from[3]);
+	      vnet_classify_table_t *tp1;
+	      u32 table_index1;
+	      u64 phash1;
+
+	      table_index1 = vnet_buffer (p1)->l2_classify.table_index;
+
+	      if (PREDICT_TRUE (table_index1 != ~0))
+		{
+		  tp1 = pool_elt_at_index (vcm->tables, table_index1);
+		  phash1 = vnet_buffer (p1)->l2_classify.hash;
+		  vnet_classify_prefetch_entry (tp1, phash1);
+		}
+	    }
+
+	  /* Speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  h0 = b0->data;
+	  table_index0 = vnet_buffer (b0)->l2_classify.table_index;
+	  e0 = 0;
+	  t0 = 0;
+
+	  if (tid == POLICER_CLASSIFY_TABLE_L2)
+	    {
+	      /* Feature bitmap update */
+	      vnet_buffer (b0)->l2.feature_bitmap &=
+		~L2INPUT_FEAT_POLICER_CLAS;
+	      /* Determine the next node */
+	      next0 =
+		feat_bitmap_get_next_node_index (pcm->feat_next_node_index,
+						 vnet_buffer (b0)->
+						 l2.feature_bitmap);
+	    }
+	  else
+	    vnet_get_config_data (pcm->vnet_config_main[tid],
+				  &b0->current_config_index, &next0,
+				  /* # bytes of config data */ 0);
+
+	  vnet_buffer (b0)->l2_classify.opaque_index = ~0;
+
+	  if (PREDICT_TRUE (table_index0 != ~0))
+	    {
+	      hash0 = vnet_buffer (b0)->l2_classify.hash;
+	      t0 = pool_elt_at_index (vcm->tables, table_index0);
+	      e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
+
+	      if (e0)
+		{
+		  act0 = vnet_policer_police (vm,
+					      b0,
+					      e0->next_index,
+					      time_in_policer_periods,
+					      e0->opaque_index);
+		  if (PREDICT_FALSE (act0 == SSE2_QOS_ACTION_DROP))
+		    {
+		      next0 = POLICER_CLASSIFY_NEXT_INDEX_DROP;
+		      b0->error = node->errors[POLICER_CLASSIFY_ERROR_DROP];
+		      drop++;
+		    }
+		  hits++;
+		}
+	      else
+		{
+		  while (1)
+		    {
+		      if (PREDICT_TRUE (t0->next_table_index != ~0))
+			{
+			  t0 = pool_elt_at_index (vcm->tables,
+						  t0->next_table_index);
+			}
+		      else
+			{
+			  next0 = (t0->miss_next_index < n_next_nodes) ?
+			    t0->miss_next_index : next0;
+			  misses++;
+			  break;
+			}
+
+		      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
+		      e0 =
+			vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
+		      if (e0)
+			{
+			  act0 = vnet_policer_police (vm,
+						      b0,
+						      e0->next_index,
+						      time_in_policer_periods,
+						      e0->opaque_index);
+			  if (PREDICT_FALSE (act0 == SSE2_QOS_ACTION_DROP))
+			    {
+			      next0 = POLICER_CLASSIFY_NEXT_INDEX_DROP;
+			      b0->error =
+				node->errors[POLICER_CLASSIFY_ERROR_DROP];
+			      drop++;
+			    }
+			  hits++;
+			  chain_hits++;
+			  break;
+			}
+		    }
+		}
+	    }
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      policer_classify_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	      t->next_index = next0;
+	      t->table_index = t0 ? t0 - vcm->tables : ~0;
+	      t->offset = (e0 && t0) ? vnet_classify_get_offset (t0, e0) : ~0;
+	      t->policer_index = e0 ? e0->next_index : ~0;
+	    }
+
+	  /* Verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, node->node_index,
+			       POLICER_CLASSIFY_ERROR_MISS, misses);
+  vlib_node_increment_counter (vm, node->node_index,
+			       POLICER_CLASSIFY_ERROR_HIT, hits);
+  vlib_node_increment_counter (vm, node->node_index,
+			       POLICER_CLASSIFY_ERROR_CHAIN_HIT, chain_hits);
+  vlib_node_increment_counter (vm, node->node_index,
+			       POLICER_CLASSIFY_ERROR_DROP, drop);
+
+  return frame->n_vectors;
+}
+
+static uword
+ip4_policer_classify (vlib_main_t * vm,
+		      vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return policer_classify_inline (vm, node, frame,
+				  POLICER_CLASSIFY_TABLE_IP4);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_policer_classify_node) = {
+  .function = ip4_policer_classify,
+  .name = "ip4-policer-classify",
+  .vector_size = sizeof (u32),
+  .format_trace = format_policer_classify_trace,
+  .n_errors = ARRAY_LEN(policer_classify_error_strings),
+  .error_strings = policer_classify_error_strings,
+  .n_next_nodes = POLICER_CLASSIFY_NEXT_INDEX_N_NEXT,
+  .next_nodes = {
+    [POLICER_CLASSIFY_NEXT_INDEX_DROP] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_policer_classify_node, ip4_policer_classify);
+/* *INDENT-ON* */
+
+static uword
+ip6_policer_classify (vlib_main_t * vm,
+		      vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return policer_classify_inline (vm, node, frame,
+				  POLICER_CLASSIFY_TABLE_IP6);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_policer_classify_node) = {
+  .function = ip6_policer_classify,
+  .name = "ip6-policer-classify",
+  .vector_size = sizeof (u32),
+  .format_trace = format_policer_classify_trace,
+  .n_errors = ARRAY_LEN(policer_classify_error_strings),
+  .error_strings = policer_classify_error_strings,
+  .n_next_nodes = POLICER_CLASSIFY_NEXT_INDEX_N_NEXT,
+  .next_nodes = {
+    [POLICER_CLASSIFY_NEXT_INDEX_DROP] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_policer_classify_node, ip6_policer_classify);
+/* *INDENT-ON* */
+
+static uword
+l2_policer_classify (vlib_main_t * vm,
+		     vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return policer_classify_inline (vm, node, frame, POLICER_CLASSIFY_TABLE_L2);
+}
+
+VLIB_REGISTER_NODE (l2_policer_classify_node) =
+{
+  .function = l2_policer_classify,.name = "l2-policer-classify",.vector_size =
+    sizeof (u32),.format_trace = format_policer_classify_trace,.n_errors =
+    ARRAY_LEN (policer_classify_error_strings),.error_strings =
+    policer_classify_error_strings,.n_next_nodes =
+    POLICER_CLASSIFY_NEXT_INDEX_N_NEXT,.next_nodes =
+  {
+  [POLICER_CLASSIFY_NEXT_INDEX_DROP] = "error-drop",}
+,};
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2_policer_classify_node, l2_policer_classify);
+
+
+static clib_error_t *
+policer_classify_init (vlib_main_t * vm)
+{
+  policer_classify_main_t *pcm = &policer_classify_main;
+
+  pcm->vlib_main = vm;
+  pcm->vnet_main = vnet_get_main ();
+  pcm->vnet_classify_main = &vnet_classify_main;
+
+  /* Initialize L2 feature next-node indexes */
+  feat_bitmap_init_next_nodes (vm,
+			       l2_policer_classify_node.index,
+			       L2INPUT_N_FEAT,
+			       l2input_get_feat_names (),
+			       pcm->feat_next_node_index);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (policer_classify_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/policer/police.h b/src/vnet/policer/police.h
new file mode 100644
index 00000000..34bcf9ca
--- /dev/null
+++ b/src/vnet/policer/police.h
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __POLICE_H__
+#define __POLICE_H__
+
+typedef enum
+{
+  POLICE_CONFORM = 0,
+  POLICE_EXCEED = 1,
+  POLICE_VIOLATE = 2,
+} policer_result_e;
+
+// This is the hardware representation of the policer.
+// To be multithread-safe, the policer is accessed through a spin-lock
+// on the lock field. (For a policer update operation, 24B needs to be
+// modified and this would be a challenge to do with atomic instructions.)
+// The structure is padded so that no other data is put into the same
+// 64B cache-line. This reduces cache-thrashing between threads.
+//
+// A note on scale:
+// The HW TSC tick is roughly one CPU clock cycle.
+// This is shifted to create a larger period, with a goal to be around 50usec.
+// The period time will vary based on CPU clock speed.
+// CPU speeds of 1Ghz to 8Ghz are targetted.
+// The shift amount is a constant 17 bits, resulting in a period between
+// 16usec (8Ghz CPU) and 131usec (1Ghz CPU).
+// The token_per_period computation takes into account the clock speed.
+//
+// The 32-bit bucket/limit supports about 850ms of burst on a 40GE port,
+// or 340ms on a 100GE port. If a larger burst is configued, then the
+// programmed value is simply capped at 2^32-1. If we needed to support
+// more than that, the bucket and limit fields could be expanded.
+//
+// tokens_per_period should be > 1000 to support 0.1% granularity.
+// To support lower rates (which would not meet this requirement), the packet
+// length, bucket, and limit values can be scaled. The scale is a power of 2
+// so the multiplication can be implemented as a shift. The control plane
+// computes the shift amount be the largest possible that still supports the
+// burst size. This makes the rate accuracy as high as possible.
+//
+// The 64-bit last_update_time supports a 4Ghz CPU without rollover for 100 years
+//
+// The lock field should be used for a spin-lock on the struct.
+
+#define POLICER_TICKS_PER_PERIOD_SHIFT 17
+#define POLICER_TICKS_PER_PERIOD       (1 << POLICER_TICKS_PER_PERIOD_SHIFT)
+
+typedef struct
+{
+
+  u32 lock;			// for exclusive access to the struct
+
+  u32 single_rate;		// 1 = single rate policer, 0 = two rate policer
+  u32 color_aware;		// for hierarchical policing
+  u32 scale;			// power-of-2 shift amount for lower rates
+  u8 action[3];
+  u8 mark_dscp[3];
+  u8 pad[2];
+
+  // Fields are marked as 2R if they are only used for a 2-rate policer,
+  // and MOD if they are modified as part of the update operation.
+  // 1 token = 1 byte.
+
+  u32 cir_tokens_per_period;	// # of tokens for each period
+  u32 pir_tokens_per_period;	// 2R
+
+  u32 current_limit;
+  u32 current_bucket;		// MOD
+  u32 extended_limit;
+  u32 extended_bucket;		// MOD
+
+  u64 last_update_time;		// MOD
+  u64 pad64;
+
+} policer_read_response_type_st;
+
+static inline policer_result_e
+vnet_police_packet (policer_read_response_type_st * policer,
+		    u32 packet_length,
+		    policer_result_e packet_color, u64 time)
+{
+  u64 n_periods;
+  u64 current_tokens, extended_tokens;
+  policer_result_e result;
+
+  // Scale packet length to support a wide range of speeds
+  packet_length = packet_length << policer->scale;
+
+  // Compute the number of policer periods that have passed since the last
+  // operation.
+  n_periods = time - policer->last_update_time;
+  policer->last_update_time = time;
+
+  // Since there is no background last-update-time adjustment, n_periods
+  // could grow large if the policer is idle for a long time. This could
+  // cause a 64-bit overflow when computing tokens_per_period * num_periods.
+  // It will overflow if log2(n_periods) + log2(tokens_per_period) > 64.
+  //
+  // To mitigate this, the policer configuration algorithm insures that
+  // tokens_per_period is less than 2^22, i.e. this is a 22 bit value not
+  // a 32-bit value. Thus overflow will only occur if n_periods > 64-22 or
+  // 42. 2^42 min-sized periods is 16us * 2^42, or 2 years. So this can
+  // rarely occur. If overflow does happen, the only effect will be that
+  // fewer tokens than the max burst will be added to the bucket for this
+  // packet. This constraint on tokens_per_period lets the ucode omit
+  // code to dynamically check for or prevent the overflow.
+
+  if (policer->single_rate)
+    {
+
+      // Compute number of tokens for this time period
+      current_tokens =
+	policer->current_bucket + n_periods * policer->cir_tokens_per_period;
+      if (current_tokens > policer->current_limit)
+	{
+	  current_tokens = policer->current_limit;
+	}
+
+      extended_tokens =
+	policer->extended_bucket + n_periods * policer->cir_tokens_per_period;
+      if (extended_tokens > policer->extended_limit)
+	{
+	  extended_tokens = policer->extended_limit;
+	}
+
+      // Determine color
+
+      if ((!policer->color_aware || (packet_color == POLICE_CONFORM))
+	  && (current_tokens >= packet_length))
+	{
+	  policer->current_bucket = current_tokens - packet_length;
+	  policer->extended_bucket = extended_tokens - packet_length;
+	  result = POLICE_CONFORM;
+	}
+      else if ((!policer->color_aware || (packet_color != POLICE_VIOLATE))
+	       && (extended_tokens >= packet_length))
+	{
+	  policer->current_bucket = current_tokens;
+	  policer->extended_bucket = extended_tokens - packet_length;
+	  result = POLICE_EXCEED;
+	}
+      else
+	{
+	  policer->current_bucket = current_tokens;
+	  policer->extended_bucket = extended_tokens;
+	  result = POLICE_VIOLATE;
+	}
+
+    }
+  else
+    {
+      // Two-rate policer
+
+      // Compute number of tokens for this time period
+      current_tokens =
+	policer->current_bucket + n_periods * policer->cir_tokens_per_period;
+      extended_tokens =
+	policer->extended_bucket + n_periods * policer->pir_tokens_per_period;
+      if (current_tokens > policer->current_limit)
+	{
+	  current_tokens = policer->current_limit;
+	}
+      if (extended_tokens > policer->extended_limit)
+	{
+	  extended_tokens = policer->extended_limit;
+	}
+
+      // Determine color
+
+      if ((policer->color_aware && (packet_color == POLICE_VIOLATE))
+	  || (extended_tokens < packet_length))
+	{
+	  policer->current_bucket = current_tokens;
+	  policer->extended_bucket = extended_tokens;
+	  result = POLICE_VIOLATE;
+	}
+      else if ((policer->color_aware && (packet_color == POLICE_EXCEED))
+	       || (current_tokens < packet_length))
+	{
+	  policer->current_bucket = current_tokens;
+	  policer->extended_bucket = extended_tokens - packet_length;
+	  result = POLICE_EXCEED;
+	}
+      else
+	{
+	  policer->current_bucket = current_tokens - packet_length;
+	  policer->extended_bucket = extended_tokens - packet_length;
+	  result = POLICE_CONFORM;
+	}
+    }
+  return result;
+}
+
+#endif // __POLICE_H__
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/policer/policer.c b/src/vnet/policer/policer.c
new file mode 100644
index 00000000..290a6af5
--- /dev/null
+++ b/src/vnet/policer/policer.c
@@ -0,0 +1,528 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <stdint.h>
+#include <vnet/policer/policer.h>
+#include <vnet/classify/vnet_classify.h>
+
+clib_error_t *
+policer_add_del (vlib_main_t * vm,
+		 u8 * name,
+		 sse2_qos_pol_cfg_params_st * cfg,
+		 u32 * policer_index, u8 is_add)
+{
+  vnet_policer_main_t *pm = &vnet_policer_main;
+  policer_read_response_type_st test_policer;
+  policer_read_response_type_st *policer;
+  uword *p;
+  u32 pi;
+  int rv;
+
+  p = hash_get_mem (pm->policer_config_by_name, name);
+
+  if (is_add == 0)
+    {
+      if (p == 0)
+	{
+	  vec_free (name);
+	  return clib_error_return (0, "No such policer configuration");
+	}
+      hash_unset_mem (pm->policer_config_by_name, name);
+      hash_unset_mem (pm->policer_index_by_name, name);
+      vec_free (name);
+      return 0;
+    }
+
+  if (p != 0)
+    {
+      vec_free (name);
+      return clib_error_return (0, "Policer already exists");
+    }
+
+  /* Vet the configuration before adding it to the table */
+  rv = sse2_pol_logical_2_physical (cfg, &test_policer);
+
+  if (rv == 0)
+    {
+      policer_read_response_type_st *pp;
+      sse2_qos_pol_cfg_params_st *cp;
+
+      pool_get (pm->configs, cp);
+      pool_get (pm->policer_templates, pp);
+
+      ASSERT (cp - pm->configs == pp - pm->policer_templates);
+
+      clib_memcpy (cp, cfg, sizeof (*cp));
+      clib_memcpy (pp, &test_policer, sizeof (*pp));
+
+      hash_set_mem (pm->policer_config_by_name, name, cp - pm->configs);
+      pool_get_aligned (pm->policers, policer, CLIB_CACHE_LINE_BYTES);
+      policer[0] = pp[0];
+      pi = policer - pm->policers;
+      hash_set_mem (pm->policer_index_by_name, name, pi);
+      *policer_index = pi;
+    }
+  else
+    {
+      vec_free (name);
+      return clib_error_return (0, "Config failed sanity check");
+    }
+
+  return 0;
+}
+
+u8 *
+format_policer_instance (u8 * s, va_list * va)
+{
+  policer_read_response_type_st *i
+    = va_arg (*va, policer_read_response_type_st *);
+
+  s = format (s, "policer at %llx: %s rate, %s color-aware\n",
+	      i, i->single_rate ? "single" : "dual",
+	      i->color_aware ? "is" : "not");
+  s = format (s, "cir %u tok/period, pir %u tok/period, scale %u\n",
+	      i->cir_tokens_per_period, i->pir_tokens_per_period, i->scale);
+  s = format (s, "cur lim %u, cur bkt %u, ext lim %u, ext bkt %u\n",
+	      i->current_limit,
+	      i->current_bucket, i->extended_limit, i->extended_bucket);
+  s = format (s, "last update %llu\n", i->last_update_time);
+  return s;
+}
+
+static u8 *
+format_policer_round_type (u8 * s, va_list * va)
+{
+  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
+
+  if (c->rnd_type == SSE2_QOS_ROUND_TO_CLOSEST)
+    s = format (s, "closest");
+  else if (c->rnd_type == SSE2_QOS_ROUND_TO_UP)
+    s = format (s, "up");
+  else if (c->rnd_type == SSE2_QOS_ROUND_TO_DOWN)
+    s = format (s, "down");
+  else
+    s = format (s, "ILLEGAL");
+  return s;
+}
+
+
+static u8 *
+format_policer_rate_type (u8 * s, va_list * va)
+{
+  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
+
+  if (c->rate_type == SSE2_QOS_RATE_KBPS)
+    s = format (s, "kbps");
+  else if (c->rate_type == SSE2_QOS_RATE_PPS)
+    s = format (s, "pps");
+  else
+    s = format (s, "ILLEGAL");
+  return s;
+}
+
+static u8 *
+format_policer_type (u8 * s, va_list * va)
+{
+  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
+
+  if (c->rfc == SSE2_QOS_POLICER_TYPE_1R2C)
+    s = format (s, "1r2c");
+
+  else if (c->rfc == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
+    s = format (s, "1r3c");
+
+  else if (c->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698)
+    s = format (s, "2r3c-2698");
+
+  else if (c->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115)
+    s = format (s, "2r3c-4115");
+
+  else if (c->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1)
+    s = format (s, "2r3c-mef5cf1");
+  else
+    s = format (s, "ILLEGAL");
+  return s;
+}
+
+static u8 *
+format_dscp (u8 * s, va_list * va)
+{
+  u32 i = va_arg (*va, u32);
+  char *t = 0;
+
+  switch (i)
+    {
+#define _(v,f,str) case VNET_DSCP_##f: t = str; break;
+      foreach_vnet_dscp
+#undef _
+    default:
+      return format (s, "ILLEGAL");
+    }
+  s = format (s, "%s", t);
+  return s;
+}
+
+static u8 *
+format_policer_action_type (u8 * s, va_list * va)
+{
+  sse2_qos_pol_action_params_st *a
+    = va_arg (*va, sse2_qos_pol_action_params_st *);
+
+  if (a->action_type == SSE2_QOS_ACTION_DROP)
+    s = format (s, "drop");
+  else if (a->action_type == SSE2_QOS_ACTION_TRANSMIT)
+    s = format (s, "transmit");
+  else if (a->action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+    s = format (s, "mark-and-transmit %U", format_dscp, a->dscp);
+  else
+    s = format (s, "ILLEGAL");
+  return s;
+}
+
+u8 *
+format_policer_config (u8 * s, va_list * va)
+{
+  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
+
+  s = format (s, "type %U cir %u eir %u cb %u eb %u\n",
+	      format_policer_type, c,
+	      c->rb.kbps.cir_kbps,
+	      c->rb.kbps.eir_kbps, c->rb.kbps.cb_bytes, c->rb.kbps.eb_bytes);
+  s = format (s, "rate type %U, round type %U\n",
+	      format_policer_rate_type, c, format_policer_round_type, c);
+  s = format (s, "conform action %U, exceed action %U, violate action %U\n",
+	      format_policer_action_type, &c->conform_action,
+	      format_policer_action_type, &c->exceed_action,
+	      format_policer_action_type, &c->violate_action);
+  return s;
+}
+
+static uword
+unformat_policer_type (unformat_input_t * input, va_list * va)
+{
+  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
+
+  if (!unformat (input, "type"))
+    return 0;
+
+  if (unformat (input, "1r2c"))
+    c->rfc = SSE2_QOS_POLICER_TYPE_1R2C;
+  else if (unformat (input, "1r3c"))
+    c->rfc = SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697;
+  else if (unformat (input, "2r3c-2698"))
+    c->rfc = SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698;
+  else if (unformat (input, "2r3c-4115"))
+    c->rfc = SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115;
+  else if (unformat (input, "2r3c-mef5cf1"))
+    c->rfc = SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1;
+  else
+    return 0;
+  return 1;
+}
+
+static uword
+unformat_policer_round_type (unformat_input_t * input, va_list * va)
+{
+  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
+
+  if (!unformat (input, "round"))
+    return 0;
+
+  if (unformat (input, "closest"))
+    c->rnd_type = SSE2_QOS_ROUND_TO_CLOSEST;
+  else if (unformat (input, "up"))
+    c->rnd_type = SSE2_QOS_ROUND_TO_UP;
+  else if (unformat (input, "down"))
+    c->rnd_type = SSE2_QOS_ROUND_TO_DOWN;
+  else
+    return 0;
+  return 1;
+}
+
+static uword
+unformat_policer_rate_type (unformat_input_t * input, va_list * va)
+{
+  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
+
+  if (!unformat (input, "rate"))
+    return 0;
+
+  if (unformat (input, "kbps"))
+    c->rate_type = SSE2_QOS_RATE_KBPS;
+  else if (unformat (input, "pps"))
+    c->rate_type = SSE2_QOS_RATE_PPS;
+  else
+    return 0;
+  return 1;
+}
+
+static uword
+unformat_policer_cir (unformat_input_t * input, va_list * va)
+{
+  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
+
+  if (unformat (input, "cir %u", &c->rb.kbps.cir_kbps))
+    return 1;
+  return 0;
+}
+
+static uword
+unformat_policer_eir (unformat_input_t * input, va_list * va)
+{
+  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
+
+  if (unformat (input, "eir %u", &c->rb.kbps.eir_kbps))
+    return 1;
+  return 0;
+}
+
+static uword
+unformat_policer_cb (unformat_input_t * input, va_list * va)
+{
+  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
+
+  if (unformat (input, "cb %u", &c->rb.kbps.cb_bytes))
+    return 1;
+  return 0;
+}
+
+static uword
+unformat_policer_eb (unformat_input_t * input, va_list * va)
+{
+  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
+
+  if (unformat (input, "eb %u", &c->rb.kbps.eb_bytes))
+    return 1;
+  return 0;
+}
+
+static uword
+unformat_dscp (unformat_input_t * input, va_list * va)
+{
+  u8 *r = va_arg (*va, u8 *);
+
+  if (0);
+#define _(v,f,str) else if (unformat (input, str)) *r = VNET_DSCP_##f;
+  foreach_vnet_dscp
+#undef _
+    else
+    return 0;
+  return 1;
+}
+
+static uword
+unformat_policer_action_type (unformat_input_t * input, va_list * va)
+{
+  sse2_qos_pol_action_params_st *a
+    = va_arg (*va, sse2_qos_pol_action_params_st *);
+
+  if (unformat (input, "drop"))
+    a->action_type = SSE2_QOS_ACTION_DROP;
+  else if (unformat (input, "transmit"))
+    a->action_type = SSE2_QOS_ACTION_TRANSMIT;
+  else if (unformat (input, "mark-and-transmit %U", unformat_dscp, &a->dscp))
+    a->action_type = SSE2_QOS_ACTION_MARK_AND_TRANSMIT;
+  else
+    return 0;
+  return 1;
+}
+
+static uword
+unformat_policer_action (unformat_input_t * input, va_list * va)
+{
+  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
+
+  if (unformat (input, "conform-action %U", unformat_policer_action_type,
+		&c->conform_action))
+    return 1;
+  else if (unformat (input, "exceed-action %U", unformat_policer_action_type,
+		     &c->exceed_action))
+    return 1;
+  else if (unformat (input, "violate-action %U", unformat_policer_action_type,
+		     &c->violate_action))
+    return 1;
+  return 0;
+}
+
+static uword
+unformat_policer_classify_next_index (unformat_input_t * input, va_list * va)
+{
+  u32 *r = va_arg (*va, u32 *);
+  vnet_policer_main_t *pm = &vnet_policer_main;
+  uword *p;
+  u8 *match_name = 0;
+
+  if (unformat (input, "%s", &match_name))
+    ;
+  else
+    return 0;
+
+  p = hash_get_mem (pm->policer_index_by_name, match_name);
+
+  if (p == 0)
+    return 0;
+
+  *r = p[0];
+
+  return 1;
+}
+
+static uword
+unformat_policer_classify_precolor (unformat_input_t * input, va_list * va)
+{
+  u32 *r = va_arg (*va, u32 *);
+
+  if (unformat (input, "conform-color"))
+    *r = POLICE_CONFORM;
+  else if (unformat (input, "exceed-color"))
+    *r = POLICE_EXCEED;
+  else
+    return 0;
+
+  return 1;
+}
+
+#define foreach_config_param                    \
+_(eb)                                           \
+_(cb)                                           \
+_(eir)                                          \
+_(cir)                                          \
+_(rate_type)                                    \
+_(round_type)                                   \
+_(type)                                         \
+_(action)
+
+static clib_error_t *
+configure_policer_command_fn (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
+{
+  sse2_qos_pol_cfg_params_st c;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1;
+  u8 *name = 0;
+  u32 pi;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  memset (&c, 0, sizeof (c));
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "del"))
+	is_add = 0;
+      else if (unformat (line_input, "name %s", &name))
+	;
+      else if (unformat (line_input, "color-aware"))
+	c.color_aware = 1;
+
+#define _(a) else if (unformat (line_input, "%U", unformat_policer_##a, &c)) ;
+      foreach_config_param
+#undef _
+	else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  return policer_add_del (vm, name, &c, &pi, is_add);
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (configure_policer_command, static) = {
+    .path = "configure policer",
+    .short_help = "configure policer name <name> <params> ",
+    .function = configure_policer_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+show_policer_command_fn (vlib_main_t * vm,
+			 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_policer_main_t *pm = &vnet_policer_main;
+  hash_pair_t *p;
+  u32 pool_index;
+  u8 *match_name = 0;
+  u8 *name;
+  sse2_qos_pol_cfg_params_st *config;
+  policer_read_response_type_st *templ;
+
+  (void) unformat (input, "name %s", &match_name);
+
+  /* *INDENT-OFF* */
+  hash_foreach_pair (p, pm->policer_config_by_name,
+  ({
+    name = (u8 *) p->key;
+    if (match_name == 0 || !strcmp((char *) name, (char *) match_name))
+      {
+        pool_index = p->value[0];
+        config = pool_elt_at_index (pm->configs, pool_index);
+        templ = pool_elt_at_index (pm->policer_templates, pool_index);
+        vlib_cli_output (vm, "Name \"%s\" %U ",
+                         name, format_policer_config, config);
+        vlib_cli_output (vm, "Template %U",
+                         format_policer_instance, templ);
+        vlib_cli_output (vm, "-----------");
+      }
+  }));
+  /* *INDENT-ON* */
+  return 0;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_policer_command, static) = {
+    .path = "show policer",
+    .short_help = "show policer [name]",
+    .function = show_policer_command_fn,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+policer_init (vlib_main_t * vm)
+{
+  vnet_policer_main_t *pm = &vnet_policer_main;
+  void vnet_policer_node_funcs_reference (void);
+
+  vnet_policer_node_funcs_reference ();
+
+  pm->vlib_main = vm;
+  pm->vnet_main = vnet_get_main ();
+
+  pm->policer_config_by_name = hash_create_string (0, sizeof (uword));
+  pm->policer_index_by_name = hash_create_string (0, sizeof (uword));
+
+  vnet_classify_register_unformat_policer_next_index_fn
+    (unformat_policer_classify_next_index);
+  vnet_classify_register_unformat_opaque_index_fn
+    (unformat_policer_classify_precolor);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (policer_init);
+
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/policer/policer.h b/src/vnet/policer/policer.h
new file mode 100644
index 00000000..8e2d7c79
--- /dev/null
+++ b/src/vnet/policer/policer.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_policer_h__
+#define __included_policer_h__
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+
+#include <vnet/policer/xlate.h>
+#include <vnet/policer/police.h>
+
+typedef struct
+{
+  /* policer pool, aligned */
+  policer_read_response_type_st *policers;
+
+  /* config + template h/w policer instance parallel pools */
+  sse2_qos_pol_cfg_params_st *configs;
+  policer_read_response_type_st *policer_templates;
+
+  /* Config by name hash */
+  uword *policer_config_by_name;
+
+  /* Policer by name hash */
+  uword *policer_index_by_name;
+
+  /* Policer by sw_if_index vector */
+  u32 *policer_index_by_sw_if_index;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} vnet_policer_main_t;
+
+vnet_policer_main_t vnet_policer_main;
+
+typedef enum
+{
+  VNET_POLICER_INDEX_BY_SW_IF_INDEX,
+  VNET_POLICER_INDEX_BY_OPAQUE,
+  VNET_POLICER_INDEX_BY_EITHER,
+} vnet_policer_index_t;
+
+typedef enum
+{
+  VNET_POLICER_NEXT_TRANSMIT,
+  VNET_POLICER_NEXT_DROP,
+  VNET_POLICER_N_NEXT,
+} vnet_policer_next_t;
+
+#define foreach_vnet_dscp \
+  _(0 , CS0,  "CS0")  \
+  _(8 , CS1,  "CS1")  \
+  _(10, AF11, "AF11") \
+  _(12, AF12, "AF12") \
+  _(14, AF13, "AF13") \
+  _(16, CS2,  "CS2")  \
+  _(18, AF21, "AF21") \
+  _(20, AF22, "AF22") \
+  _(22, AF23, "AF23") \
+  _(24, CS3,  "CS3")  \
+  _(26, AF31, "AF31") \
+  _(28, AF32, "AF32") \
+  _(30, AF33, "AF33") \
+  _(32, CS4,  "CS4")  \
+  _(34, AF41, "AF41") \
+  _(36, AF42, "AF42") \
+  _(38, AF43, "AF43") \
+  _(40, CS5,  "CS5")  \
+  _(46, EF,   "EF")   \
+  _(48, CS6,  "CS6")  \
+  _(50, CS7,  "CS7")
+
+typedef enum
+{
+#define _(v,f,str) VNET_DSCP_##f = v,
+  foreach_vnet_dscp
+#undef _
+} vnet_dscp_t;
+
+u8 *format_policer_instance (u8 * s, va_list * va);
+clib_error_t *policer_add_del (vlib_main_t * vm,
+			       u8 * name,
+			       sse2_qos_pol_cfg_params_st * cfg,
+			       u32 * policer_index, u8 is_add);
+
+#endif /* __included_policer_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/policer/xlate.c b/src/vnet/policer/xlate.c
new file mode 100644
index 00000000..74a6eb23
--- /dev/null
+++ b/src/vnet/policer/xlate.c
@@ -0,0 +1,1505 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <string.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <assert.h>
+#include <math.h>
+#include <stdint.h>
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+
+#include <vnet/policer/xlate.h>
+#include <vnet/policer/police.h>
+
+#define INTERNAL_SS 1
+
+/* debugs */
+#define SSE2_QOS_DEBUG_ERROR(msg, args...) \
+    fformat(stderr, msg "\n", ##args);
+
+#define SSE2_QOS_DEBUG_INFO(msg, args...) \
+    fformat(stderr, msg "\n", ##args);
+
+
+#define SSE2_QOS_TR_ERR(TpParms...)
+// {
+// }
+
+#define SSE2_QOS_TR_INFO(TpParms...)
+
+#ifndef MIN
+#define MIN(x,y)            (((x)<(y))?(x):(y))
+#endif
+
+#ifndef MAX
+#define MAX(x,y)            (((x)>(y))?(x):(y))
+#endif
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_M40AH_OFFSET                   0
+#define IPE_POLICER_FULL_WRITE_REQUEST_M40AH_MASK                     8
+#define IPE_POLICER_FULL_WRITE_REQUEST_M40AH_SHIFT                   24
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_TYPE_OFFSET                    2
+#define IPE_POLICER_FULL_WRITE_REQUEST_TYPE_MASK                      2
+#define IPE_POLICER_FULL_WRITE_REQUEST_TYPE_SHIFT                    10
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_CMD_OFFSET                     3
+#define IPE_POLICER_FULL_WRITE_REQUEST_CMD_MASK                       2
+#define IPE_POLICER_FULL_WRITE_REQUEST_CMD_SHIFT                      0
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_M40AL_OFFSET                   4
+#define IPE_POLICER_FULL_WRITE_REQUEST_M40AL_MASK                    32
+#define IPE_POLICER_FULL_WRITE_REQUEST_M40AL_SHIFT                    0
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_RFC_OFFSET                     8
+#define IPE_POLICER_FULL_WRITE_REQUEST_RFC_MASK                       2
+#define IPE_POLICER_FULL_WRITE_REQUEST_RFC_SHIFT                     30
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_AN_OFFSET                      8
+#define IPE_POLICER_FULL_WRITE_REQUEST_AN_MASK                        1
+#define IPE_POLICER_FULL_WRITE_REQUEST_AN_SHIFT                      29
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_REXP_OFFSET                    8
+#define IPE_POLICER_FULL_WRITE_REQUEST_REXP_MASK                      4
+#define IPE_POLICER_FULL_WRITE_REQUEST_REXP_SHIFT                    22
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_ARM_OFFSET                     9
+#define IPE_POLICER_FULL_WRITE_REQUEST_ARM_MASK                      11
+#define IPE_POLICER_FULL_WRITE_REQUEST_ARM_SHIFT                     11
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_PRM_OFFSET                    10
+#define IPE_POLICER_FULL_WRITE_REQUEST_PRM_MASK                      11
+#define IPE_POLICER_FULL_WRITE_REQUEST_PRM_SHIFT                      0
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_CBLE_OFFSET                   12
+#define IPE_POLICER_FULL_WRITE_REQUEST_CBLE_MASK                      5
+#define IPE_POLICER_FULL_WRITE_REQUEST_CBLE_SHIFT                    27
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_CBLM_OFFSET                   12
+#define IPE_POLICER_FULL_WRITE_REQUEST_CBLM_MASK                      7
+#define IPE_POLICER_FULL_WRITE_REQUEST_CBLM_SHIFT                    20
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_EBLE_OFFSET                   13
+#define IPE_POLICER_FULL_WRITE_REQUEST_EBLE_MASK                      5
+#define IPE_POLICER_FULL_WRITE_REQUEST_EBLE_SHIFT                    15
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_EBLM_OFFSET                   14
+#define IPE_POLICER_FULL_WRITE_REQUEST_EBLM_MASK                      7
+#define IPE_POLICER_FULL_WRITE_REQUEST_EBLM_SHIFT                     8
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_CB_OFFSET                     16
+#define IPE_POLICER_FULL_WRITE_REQUEST_CB_MASK                       31
+#define IPE_POLICER_FULL_WRITE_REQUEST_CB_SHIFT                       0
+
+#define IPE_POLICER_FULL_WRITE_REQUEST_EB_OFFSET                     20
+#define IPE_POLICER_FULL_WRITE_REQUEST_EB_MASK                       31
+#define IPE_POLICER_FULL_WRITE_REQUEST_EB_SHIFT                       0
+
+#define IPE_RFC_RFC2697           0x00000000
+#define IPE_RFC_RFC2698           0x00000001
+#define IPE_RFC_RFC4115           0x00000002
+#define IPE_RFC_MEF5CF1           0x00000003
+
+/* End of constants copied from sse_ipe_desc_fmt.h */
+
+/* Misc Policer specific definitions */
+#define SSE2_QOS_POLICER_FIXED_PKT_SIZE    256
+
+// TODO check what can be provided by hw macro based on ASIC
+#define SSE2_QOS_POL_TICKS_PER_SEC     1000LL	/* 1 tick = 1 ms */
+
+/*
+ * Default burst, in ms (byte format)
+ */
+#define SSE2_QOS_POL_DEF_BURST_BYTE    100
+
+/*
+ * Minimum burst needs to be such that the largest packet size is accomodated
+ */
+// Do we need to get it from some lib?
+#define SSE2_QOS_POL_MIN_BURST_BYTE    9*1024
+
+
+/*
+ * Flag to indicate if AN is employed or not
+ * 1 - TRUE, 0 - FALSE
+ */
+#define SSE2_QOS_POL_ALLOW_NEGATIVE    1
+
+// Various Macros to take care of policer calculations
+
+#define SSE2_QOS_POL_COMM_BKT_MAX \
+                            (1<<IPE_POLICER_FULL_WRITE_REQUEST_CB_MASK)
+#define SSE2_QOS_POL_EXTD_BKT_MAX \
+                            (1<<IPE_POLICER_FULL_WRITE_REQUEST_EB_MASK)
+
+#define SSE2_QOS_POL_RATE_EXP_SIZE \
+                            (IPE_POLICER_FULL_WRITE_REQUEST_REXP_MASK)
+#define SSE2_QOS_POL_RATE_EXP_MAX  ((1<<SSE2_QOS_POL_RATE_EXP_SIZE) - 1)
+#define SSE2_QOS_POL_AVG_RATE_MANT_SIZE \
+                            (IPE_POLICER_FULL_WRITE_REQUEST_ARM_MASK)
+#define SSE2_QOS_POL_AVG_RATE_MANT_MAX    \
+                            ((1<< SSE2_QOS_POL_AVG_RATE_MANT_SIZE) - 1)
+#define SSE2_QOS_POL_AVG_RATE_MAX \
+                            (SSE2_QOS_POL_AVG_RATE_MANT_MAX << \
+                             SSE2_QOS_POL_RATE_EXP_MAX)
+
+#define SSE2_QOS_POL_PEAK_RATE_MANT_SIZE   \
+                            (IPE_POLICER_FULL_WRITE_REQUEST_PRM_MASK)
+#define SSE2_QOS_POL_PEAK_RATE_MANT_MAX    \
+                            ((1<<SSE2_QOS_POL_PEAK_RATE_MANT_SIZE) - 1)
+#define SSE2_QOS_POL_PEAK_RATE_MAX \
+                            (SSE2_QOS_POL_PEAK_RATE_MANT_MAX << \
+                             SSE2_QOS_POL_RATE_EXP_MAX)
+
+#define SSE2_QOS_POL_COMM_BKT_LIMIT_MANT_SIZE   \
+                        (IPE_POLICER_FULL_WRITE_REQUEST_CBLM_MASK)
+#define SSE2_QOS_POL_COMM_BKT_LIMIT_MANT_MAX   \
+                        ((1<<SSE2_QOS_POL_COMM_BKT_LIMIT_MANT_SIZE) - 1)
+#define SSE2_QOS_POL_COMM_BKT_LIMIT_EXP_SIZE   \
+                        (IPE_POLICER_FULL_WRITE_REQUEST_CBLE_MASK)
+#define SSE2_QOS_POL_COMM_BKT_LIMIT_EXP_MAX   \
+                        ((1<<SSE2_QOS_POL_COMM_BKT_LIMIT_EXP_SIZE) - 1)
+#define SSE2_QOS_POL_COMM_BKT_LIMIT_MAX \
+                        ((u64)SSE2_QOS_POL_COMM_BKT_LIMIT_MANT_MAX << \
+                         (u64)SSE2_QOS_POL_COMM_BKT_LIMIT_EXP_MAX)
+
+#define SSE2_QOS_POL_EXTD_BKT_LIMIT_MANT_SIZE   \
+                        (IPE_POLICER_FULL_WRITE_REQUEST_EBLM_MASK)
+#define SSE2_QOS_POL_EXTD_BKT_LIMIT_MANT_MAX   \
+                        ((1<<SSE2_QOS_POL_EXTD_BKT_LIMIT_MANT_SIZE) - 1)
+#define SSE2_QOS_POL_EXTD_BKT_LIMIT_EXP_SIZE   \
+                        (IPE_POLICER_FULL_WRITE_REQUEST_EBLE_MASK)
+#define SSE2_QOS_POL_EXTD_BKT_LIMIT_EXP_MAX   \
+                        ((1<<SSE2_QOS_POL_EXTD_BKT_LIMIT_EXP_SIZE) - 1)
+#define SSE2_QOS_POL_EXT_BKT_LIMIT_MAX \
+                        ((u64)SSE2_QOS_POL_EXTD_BKT_LIMIT_MANT_MAX << \
+                         (u64)SSE2_QOS_POL_EXTD_BKT_LIMIT_EXP_MAX)
+
+/*
+ * Rates determine the units of the bucket
+ *    256.114688 Gbps < Rate                      8 byte units
+ *    128.057344 Gbps < Rate <= 256.114688 Gbps   4 byte units
+ *     64.028672 Gbps < Rate <= 128.057344 Gbps   2 byte units
+ *                      Rate <=  64.028672 Gbps   1 byte units
+ *
+ * The code uses bytes per tick as oppose to Gigabits per second.
+ */
+#define RATE256 (256114688000LL / 8LL / SSE2_QOS_POL_TICKS_PER_SEC)
+#define RATE128 (128057344000LL / 8LL / SSE2_QOS_POL_TICKS_PER_SEC)
+#define RATE64  ( 64028672000LL / 8LL / SSE2_QOS_POL_TICKS_PER_SEC)
+
+#define RATE_OVER256_UNIT  8LL
+#define RATE_128TO256_UNIT 4LL
+#define RATE_64TO128_UNIT  2LL
+
+static int
+sse2_qos_pol_round (u64 numerator,
+		    u64 denominator,
+		    u64 * rounded_value, sse2_qos_round_type_en round_type)
+{
+  int rc = 0;
+
+  if (denominator == 0)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Illegal denominator");
+      SSE2_QOS_TR_ERR (SSE2_QOSRM_TP_ERR_59);
+      return (EINVAL);
+    }
+
+  switch (round_type)
+    {
+    case SSE2_QOS_ROUND_TO_CLOSEST:
+      *rounded_value = ((numerator + (denominator >> 1)) / denominator);
+      break;
+
+    case SSE2_QOS_ROUND_TO_UP:
+      *rounded_value = (numerator / denominator);
+      if ((*rounded_value * denominator) < numerator)
+	{
+	  *rounded_value += 1;
+	}
+      break;
+
+    case SSE2_QOS_ROUND_TO_DOWN:
+      *rounded_value = (numerator / denominator);
+      break;
+
+    case SSE2_QOS_ROUND_INVALID:
+    default:
+      SSE2_QOS_DEBUG_ERROR ("Illegal round type");
+      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_60, round_type);
+      rc = EINVAL;
+      break;
+    }
+  return (rc);
+}
+
+
+static int
+sse2_pol_validate_cfg_params (sse2_qos_pol_cfg_params_st * cfg)
+{
+  u64 numer, denom, rnd_value;
+  u32 cir_hw, eir_hw;
+  int rc = 0;
+
+  if ((cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698) &&
+      (cfg->rb.kbps.eir_kbps < cfg->rb.kbps.cir_kbps))
+    {
+      SSE2_QOS_DEBUG_ERROR ("CIR (%u kbps) is greater than PIR (%u kbps)",
+			    cfg->rb.kbps.cir_kbps, cfg->rb.kbps.eir_kbps);
+      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_39, cfg->rb.kbps.cir_kbps,
+		       cfg->rb.kbps.eir_kbps);
+      return (EINVAL);
+    }
+
+  /*
+   * convert rates to bytes-per-tick
+   */
+  numer = (u64) (cfg->rb.kbps.cir_kbps);
+  denom = (u64) (8 * SSE2_QOS_POL_TICKS_PER_SEC) / 1000;
+  rc = sse2_qos_pol_round (numer, denom, &rnd_value,
+			   (sse2_qos_round_type_en) cfg->rnd_type);
+  if (rc != 0)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Unable to convert CIR to bytes/tick format");
+      // Error traced
+      return (rc);
+    }
+  cir_hw = (u32) rnd_value;
+
+  numer = (u64) (cfg->rb.kbps.eir_kbps);
+  rc = sse2_qos_pol_round (numer, denom, &rnd_value,
+			   (sse2_qos_round_type_en) cfg->rnd_type);
+  if (rc != 0)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Unable to convert EIR to bytes/tick format");
+      // Error traced
+      return (rc);
+    }
+  eir_hw = (u32) rnd_value;
+
+  if (cir_hw > SSE2_QOS_POL_AVG_RATE_MAX)
+    {
+      SSE2_QOS_DEBUG_ERROR ("hw cir (%u bytes/tick) is greater than the "
+			    "max supported value (%u)", cir_hw,
+			    SSE2_QOS_POL_AVG_RATE_MAX);
+      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_84, cir_hw, SSE2_QOS_POL_AVG_RATE_MAX);
+      return (EINVAL);
+    }
+
+  if (eir_hw > SSE2_QOS_POL_PEAK_RATE_MAX)
+    {
+      SSE2_QOS_DEBUG_ERROR ("hw eir (%u bytes/tick) is greater than the "
+			    "max supported value (%u). Capping it to the max. "
+			    "supported value", eir_hw,
+			    SSE2_QOS_POL_PEAK_RATE_MAX);
+      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_85, eir_hw,
+		       SSE2_QOS_POL_PEAK_RATE_MAX);
+      return (EINVAL);
+    }
+  /*
+   * CIR = 0, with bc != 0 is not allowed
+   */
+  if ((cfg->rb.kbps.cir_kbps == 0) && cfg->rb.kbps.cb_bytes)
+    {
+      SSE2_QOS_DEBUG_ERROR ("CIR = 0 with bc != 0");
+      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_55);
+      return (EINVAL);
+    }
+
+  if ((cfg->rb.kbps.eir_kbps == 0) &&
+      (cfg->rfc > SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697))
+    {
+      SSE2_QOS_DEBUG_ERROR ("EIR = 0 for a 2R3C policer (rfc: %u)", cfg->rfc);
+      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_23, cfg->rb.kbps.eir_kbps, cfg->rfc);
+      return (EINVAL);
+    }
+
+  if (cfg->rb.kbps.eir_kbps &&
+      (cfg->rfc < SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698))
+    {
+      SSE2_QOS_DEBUG_ERROR ("EIR: %u kbps for a 1-rate policer (rfc: %u)",
+			    cfg->rb.kbps.eir_kbps, cfg->rfc);
+      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_23, cfg->rb.kbps.eir_kbps, cfg->rfc);
+      return (EINVAL);
+    }
+
+  if ((cfg->rfc == SSE2_QOS_POLICER_TYPE_1R2C) && cfg->rb.kbps.eb_bytes)
+    {
+      SSE2_QOS_DEBUG_ERROR ("For a 1R1B policer, EB burst cannot be > 0");
+      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_56);
+      return (EINVAL);
+    }
+
+  return (0);
+}
+
+static void
+sse2_qos_convert_value_to_exp_mant_fmt (u64 value,
+					u16 max_exp_value,
+					u16 max_mant_value,
+					sse2_qos_round_type_en type,
+					u8 * exp, u32 * mant)
+{
+  u64 rnd_value;
+  u64 temp_mant;
+  u8 temp_exp;
+
+  /*
+   * Select the lowest possible exp, and the largest possible mant
+   */
+  temp_exp = 0;
+  temp_mant = value;
+  while (temp_exp <= max_exp_value)
+    {
+      if (temp_mant <= max_mant_value)
+	{
+	  break;
+	}
+
+      temp_exp++;
+      rnd_value = 0;
+      (void) sse2_qos_pol_round ((u64) value, (u64) (1 << temp_exp),
+				 &rnd_value, type);
+      temp_mant = rnd_value;
+    }
+
+  if (temp_exp > max_exp_value)
+    {
+      /*
+       * CAP mant to its max value, and decrement exp
+       */
+      temp_exp--;
+      temp_mant = max_mant_value;
+    }
+
+  *exp = temp_exp;
+  *mant = (u32) temp_mant;
+
+  SSE2_QOS_DEBUG_INFO ("value: 0x%llx, mant: %u, exp: %u", value, *mant,
+		       *exp);
+  return;
+}
+
+static int
+sse2_pol_convert_cfg_rates_to_hw (sse2_qos_pol_cfg_params_st * cfg,
+				  sse2_qos_pol_hw_params_st * hw)
+{
+  int rc = 0;
+  u32 cir_hw, eir_hw, hi_mant, hi_rate, cir_rnded, eir_rnded, eir_kbps;
+  u64 numer, denom, rnd_value;
+  u8 exp;
+
+  /*
+   * convert rates to bytes-per-tick (tick is 1ms)
+   * For rate conversion, the denominator is gonna be the same
+   */
+  denom = (u64) ((SSE2_QOS_POL_TICKS_PER_SEC * 8) / 1000);
+  numer = (u64) (cfg->rb.kbps.cir_kbps);
+  rc = sse2_qos_pol_round (numer, denom, &rnd_value,
+			   (sse2_qos_round_type_en) cfg->rnd_type);
+  if (rc != 0)
+    {
+      SSE2_QOS_DEBUG_ERROR
+	("Rounding error, rate: %d kbps, rounding_type: %d",
+	 cfg->rb.kbps.cir_kbps, cfg->rnd_type);
+      // Error is traced
+      return (rc);
+    }
+  cir_hw = (u32) rnd_value;
+
+  if (cfg->rb.kbps.cir_kbps && (cir_hw == 0))
+    {
+      /*
+       * After rounding, cir_hw = 0. Bump it up
+       */
+      cir_hw = 1;
+    }
+
+  if (cfg->rfc == SSE2_QOS_POLICER_TYPE_1R2C)
+    {
+      eir_kbps = 0;
+    }
+  else if (cfg->rfc == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
+    {
+      eir_kbps = cfg->rb.kbps.cir_kbps;
+    }
+  else if (cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115)
+    {
+      eir_kbps = cfg->rb.kbps.eir_kbps - cfg->rb.kbps.cir_kbps;
+    }
+  else
+    {
+      eir_kbps = cfg->rb.kbps.eir_kbps;
+    }
+
+  numer = (u64) eir_kbps;
+  rc = sse2_qos_pol_round (numer, denom, &rnd_value,
+			   (sse2_qos_round_type_en) cfg->rnd_type);
+  if (rc != 0)
+    {
+      SSE2_QOS_DEBUG_ERROR
+	("Rounding error, rate: %d kbps, rounding_type: %d", eir_kbps,
+	 cfg->rnd_type);
+      // Error is traced
+      return (rc);
+    }
+  eir_hw = (u32) rnd_value;
+
+  if (eir_kbps && (eir_hw == 0))
+    {
+      /*
+       * After rounding, eir_hw = 0. Bump it up
+       */
+      eir_hw = 1;
+    }
+
+  SSE2_QOS_DEBUG_INFO ("cir_hw: %u bytes/tick, eir_hw: %u bytes/tick", cir_hw,
+		       eir_hw);
+
+  if (cir_hw > eir_hw)
+    {
+      hi_rate = cir_hw;
+    }
+  else
+    {
+      hi_rate = eir_hw;
+    }
+
+  if ((cir_hw == 0) && (eir_hw == 0))
+    {
+      /*
+       * Both the rates are 0. Use exp = 15, and set the RFC to 4115. Also
+       * set AN = 0
+       */
+      exp = (u8) SSE2_QOS_POL_RATE_EXP_MAX;
+      hi_mant = 0;
+      hw->rfc = IPE_RFC_RFC4115;
+      hw->allow_negative = 0;
+    }
+  else
+    {
+      sse2_qos_convert_value_to_exp_mant_fmt (hi_rate,
+					      (u16) SSE2_QOS_POL_RATE_EXP_MAX,
+					      (u16)
+					      SSE2_QOS_POL_AVG_RATE_MANT_MAX,
+					      (sse2_qos_round_type_en)
+					      cfg->rnd_type, &exp, &hi_mant);
+    }
+
+  denom = (1ULL << exp);
+  if (hi_rate == eir_hw)
+    {
+      hw->peak_rate_man = (u16) hi_mant;
+      rc = sse2_qos_pol_round ((u64) cir_hw, denom, &rnd_value,
+			       (sse2_qos_round_type_en) cfg->rnd_type);
+      hw->avg_rate_man = (u16) rnd_value;
+    }
+  else
+    {
+      hw->avg_rate_man = (u16) hi_mant;
+      rc = sse2_qos_pol_round ((u64) eir_hw, denom, &rnd_value,
+			       (sse2_qos_round_type_en) cfg->rnd_type);
+      hw->peak_rate_man = (u16) rnd_value;
+    }
+  if (rc != 0)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Rounding error");
+      // Error is traced
+      return (rc);
+    }
+  hw->rate_exp = exp;
+
+  if ((hw->avg_rate_man == 0) && (cfg->rb.kbps.cir_kbps))
+    {
+      /*
+       * cir was reduced to 0 during rounding. Bump it up
+       */
+      hw->avg_rate_man = 1;
+      SSE2_QOS_DEBUG_INFO ("CIR = 0 during rounding. Bump it up to %u "
+			   "bytes/tick", (hw->avg_rate_man << hw->rate_exp));
+    }
+
+  if ((hw->peak_rate_man == 0) && eir_kbps)
+    {
+      /*
+       * eir was reduced to 0 during rounding. Bump it up
+       */
+      hw->peak_rate_man = 1;
+      SSE2_QOS_DEBUG_INFO ("EIR = 0 during rounding. Bump it up to %u "
+			   "bytes/tick", (hw->peak_rate_man << hw->rate_exp));
+    }
+
+  cir_rnded = (hw->avg_rate_man << hw->rate_exp);
+  eir_rnded = (hw->peak_rate_man << hw->rate_exp);
+
+  SSE2_QOS_DEBUG_INFO ("Configured(rounded) values, cir: %u "
+		       "kbps (mant: %u, exp: %u, rate: %u bytes/tick)",
+		       cfg->rb.kbps.cir_kbps, hw->avg_rate_man,
+		       hw->rate_exp, cir_rnded);
+
+  SSE2_QOS_DEBUG_INFO ("Configured(rounded) values, eir: %u "
+		       "kbps (mant: %u, exp: %u, rate: %u bytes/tick)",
+		       cfg->rb.kbps.eir_kbps, hw->peak_rate_man,
+		       hw->rate_exp, eir_rnded);
+
+  return (rc);
+}
+
+/*****
+ * NAME
+ *   sse2_pol_get_bkt_max
+ *
+ * PARAMETERS
+ *  rate_hw    - either the averate rate or peak rate
+ *  bkt_max    - bit width in the current bucket or extended bucket
+ *
+ * RETURNS
+ *  u64   - maximum token bytes for the current or extended bucket
+ *
+ * DESCRIPTION
+ *  The current bucket or extended bucket fields are in units of either
+ *  1,2,4,8 bytes based on the average or peak rate respective to current
+ *  or extended bucket.
+ *
+ *  To get the actual maximum number of bytes that can be stored in the
+ *  field, the value must be multiplied by the units of either 1,2,4,8
+ *  bytes based on the rate.
+ *****/
+u64
+sse2_pol_get_bkt_max (u64 rate_hw, u64 bkt_max)
+{
+  if (rate_hw <= RATE64)
+    {
+      return (bkt_max - 1);
+    }
+  else if (rate_hw <= RATE128)
+    {
+      return ((bkt_max * RATE_64TO128_UNIT) - RATE_64TO128_UNIT);
+    }
+  else if (rate_hw <= RATE256)
+    {
+      return ((bkt_max * RATE_128TO256_UNIT) - RATE_128TO256_UNIT);
+    }
+  /* rate must be over 256 */
+  return ((bkt_max * RATE_OVER256_UNIT) - RATE_OVER256_UNIT);
+}
+
+/*****
+ * NAME
+ *   sse2_pol_get_bkt_value
+ *
+ * PARAMETERS
+ *  rate_hw    - either the averate rate or peak rate
+ *  byte_value - bytes for this token bucket
+ *
+ * RETURNS
+ *  u64   - unit value for the current or extended bucket field
+ *
+ * DESCRIPTION
+ *  The current bucket or extended bucket fields are in units of either
+ *  1,2,4,8 bytes based on the average or peak rate respective to current
+ *  or extended bucket.
+ *
+ *  To get the units that can be stored in the field, the byte value must
+ *  be divided by the units of either 1,2,4,8 bytes based on the rate.
+ *****/
+u64
+sse2_pol_get_bkt_value (u64 rate_hw, u64 byte_value)
+{
+  if (rate_hw <= RATE64)
+    {
+      return (byte_value);
+    }
+  else if (rate_hw <= RATE128)
+    {
+      return (byte_value / RATE_64TO128_UNIT);
+    }
+  else if (rate_hw <= RATE256)
+    {
+      return (byte_value / RATE_128TO256_UNIT);
+    }
+  /* rate must be over 256 */
+  return (byte_value / RATE_OVER256_UNIT);
+}
+
+static void
+sse2_pol_rnd_burst_byte_fmt (u64 cfg_burst,
+			     u16 max_exp_value,
+			     u16 max_mant_value,
+			     u32 max_bkt_value,
+			     u32 rate_hw,
+			     u8 * exp, u32 * mant, u32 * bkt_value)
+{
+  u64 bkt_max = max_bkt_value;
+  u64 bkt_limit_max;
+  u64 rnd_burst;
+  u64 temp_bkt_value;
+
+  bkt_limit_max = ((u64) max_mant_value << (u64) max_exp_value);
+  bkt_max = sse2_pol_get_bkt_max (rate_hw, bkt_max);
+  bkt_max = MIN (bkt_max, bkt_limit_max);
+  if (!cfg_burst)
+    {
+      /*
+       * If configured burst = 0, compute the burst to be 100ms at a given
+       * rate. Note that for rate_hw = 0, exp = mant = 0.
+       */
+      cfg_burst = (u64) rate_hw *(u64) SSE2_QOS_POL_DEF_BURST_BYTE;
+    }
+
+  if (cfg_burst > bkt_max)
+    {
+      SSE2_QOS_DEBUG_ERROR ("burst 0x%llx bytes is greater than the max. "
+			    "supported value 0x%llx bytes. Capping it to the "
+			    "max", cfg_burst, bkt_max);
+      SSE2_QOS_TR_INFO (SSE2_QOS_TP_INFO_38,
+			(uint) cfg_burst, (uint) bkt_max);
+      cfg_burst = bkt_max;
+    }
+
+  if (cfg_burst < SSE2_QOS_POL_MIN_BURST_BYTE)
+    {
+      /*
+       * Bump up the burst value ONLY if the cfg_burst is non-zero AND
+       * less than the min. supported value
+       */
+      SSE2_QOS_DEBUG_INFO ("burst 0x%llx bytes is less than the min "
+			   "supported value %u bytes. Rounding it up to "
+			   "the min", cfg_burst, SSE2_QOS_POL_MIN_BURST_BYTE);
+      SSE2_QOS_TR_INFO (SSE2_QOS_TP_INFO_39, (uint) cfg_burst,
+			SSE2_QOS_POL_MIN_BURST_BYTE);
+      cfg_burst = SSE2_QOS_POL_MIN_BURST_BYTE;
+    }
+
+  sse2_qos_convert_value_to_exp_mant_fmt (cfg_burst,
+					  max_exp_value,
+					  max_mant_value,
+					  SSE2_QOS_ROUND_TO_DOWN, exp, mant);
+
+  /* Bucket value is based on rate. */
+  rnd_burst = ((u64) (*mant) << (u64) (*exp));
+  temp_bkt_value = sse2_pol_get_bkt_value (rate_hw, rnd_burst);
+  *bkt_value = (u32) temp_bkt_value;
+}
+
+static int
+sse2_pol_convert_cfg_burst_to_hw (sse2_qos_pol_cfg_params_st * cfg,
+				  sse2_qos_pol_hw_params_st * hw)
+{
+  u8 temp_exp;
+  u32 temp_mant, rate_hw;
+  u64 eb_bytes;
+  u32 bkt_value;
+
+  /*
+   * compute Committed Burst
+   */
+  SSE2_QOS_DEBUG_INFO ("Compute commit burst ...");
+  rate_hw = (hw->avg_rate_man) << (hw->rate_exp);
+  sse2_pol_rnd_burst_byte_fmt (cfg->rb.kbps.cb_bytes,
+			       (u16) SSE2_QOS_POL_COMM_BKT_LIMIT_EXP_MAX,
+			       (u16) SSE2_QOS_POL_COMM_BKT_LIMIT_MANT_MAX,
+			       (u32) SSE2_QOS_POL_COMM_BKT_MAX,
+			       rate_hw, &temp_exp, &temp_mant, &bkt_value);
+  SSE2_QOS_DEBUG_INFO ("Committed burst, burst_limit: 0x%llx mant : %u, "
+		       "exp: %u, rnded: 0x%llx cb:%u bytes",
+		       cfg->rb.kbps.cb_bytes, temp_mant, temp_exp,
+		       ((u64) temp_mant << (u64) temp_exp), bkt_value);
+
+  hw->comm_bkt_limit_exp = temp_exp;
+  hw->comm_bkt_limit_man = (u8) temp_mant;
+  hw->comm_bkt = bkt_value;
+
+  /*
+   * compute Exceed Burst
+   */
+  SSE2_QOS_DEBUG_INFO ("Compute exceed burst ...");
+
+  if (cfg->rfc == SSE2_QOS_POLICER_TYPE_1R2C)
+    {
+      /*
+       * For 1R2C, hw uses 2R3C (RFC-4115). As such, the Exceed Bucket
+       * params are set to 0. Recommendation is to use EB_exp = max_exp (=15)
+       * and EB_mant = 0
+       */
+      hw->extd_bkt_limit_exp = (u8) SSE2_QOS_POL_EXTD_BKT_LIMIT_EXP_MAX;
+      hw->extd_bkt_limit_man = 0;
+      SSE2_QOS_DEBUG_INFO ("Excess burst, burst: 0x%llx mant: %u, "
+			   "exp: %u, rnded: 0x%llx bytes",
+			   cfg->rb.kbps.eb_bytes, hw->extd_bkt_limit_man,
+			   hw->extd_bkt_limit_exp,
+			   ((u64) hw->extd_bkt_limit_man <<
+			    (u64) hw->extd_bkt_limit_exp));
+      SSE2_QOS_TR_INFO (SSE2_QOS_TP_INFO_20, (uint) cfg->rb.kbps.eb_bytes,
+			hw->extd_bkt_limit_man, hw->extd_bkt_limit_exp);
+      return (0);
+    }
+
+  if (cfg->rfc == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
+    {
+      eb_bytes = cfg->rb.kbps.cb_bytes + cfg->rb.kbps.eb_bytes;
+    }
+  else if (cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115)
+    {
+      eb_bytes = cfg->rb.kbps.eb_bytes - cfg->rb.kbps.cb_bytes;
+    }
+  else
+    {
+      eb_bytes = cfg->rb.kbps.eb_bytes;
+    }
+
+  rate_hw = (hw->peak_rate_man) << (hw->rate_exp);
+  sse2_pol_rnd_burst_byte_fmt (eb_bytes,
+			       (u16) SSE2_QOS_POL_EXTD_BKT_LIMIT_EXP_MAX,
+			       (u16) SSE2_QOS_POL_EXTD_BKT_LIMIT_MANT_MAX,
+			       (u32) SSE2_QOS_POL_EXTD_BKT_MAX,
+			       rate_hw, &temp_exp, &temp_mant, &bkt_value);
+
+  SSE2_QOS_DEBUG_INFO ("Excess burst, burst_limit: 0x%llx mant: %u, "
+		       "exp: %u, rnded: 0x%llx eb:%u bytes",
+		       cfg->rb.kbps.eb_bytes, temp_mant, temp_exp,
+		       ((u64) temp_mant << (u64) temp_exp), bkt_value);
+
+  hw->extd_bkt_limit_exp = (u8) temp_exp;
+  hw->extd_bkt_limit_man = (u8) temp_mant;
+  hw->extd_bkt = bkt_value;
+
+  return (0);
+}
+
+
+/*
+ * Input: configured parameter values in 'cfg'.
+ * Output: h/w programmable parameter values in 'hw'.
+ * Return: success or failure code.
+ */
+static int
+sse2_pol_convert_cfg_to_hw_params (sse2_qos_pol_cfg_params_st * cfg,
+				   sse2_qos_pol_hw_params_st * hw)
+{
+  int rc = 0;
+
+  /*
+   * clear the hw_params
+   */
+  memset (hw, 0, sizeof (sse2_qos_pol_hw_params_st));
+
+  hw->allow_negative = SSE2_QOS_POL_ALLOW_NEGATIVE;
+
+  if ((cfg->rfc == SSE2_QOS_POLICER_TYPE_1R2C) ||
+      (cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115))
+    {
+      hw->rfc = IPE_RFC_RFC4115;
+    }
+  else if (cfg->rfc == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
+    {
+      hw->rfc = IPE_RFC_RFC2697;
+    }
+  else if (cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698)
+    {
+      hw->rfc = IPE_RFC_RFC2698;
+    }
+  else if (cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1)
+    {
+      hw->rfc = IPE_RFC_MEF5CF1;
+    }
+  else
+    {
+      SSE2_QOS_DEBUG_ERROR ("Invalid RFC type %d\n", cfg->rfc);
+      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_61, cfg->rfc);
+      return (EINVAL);
+    }
+
+  rc = sse2_pol_convert_cfg_rates_to_hw (cfg, hw);
+  if (rc != 0)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Unable to convert config rates to hw. Error: %d",
+			    rc);
+      // Error is traced
+      return (rc);
+    }
+
+  rc = sse2_pol_convert_cfg_burst_to_hw (cfg, hw);
+  if (rc != 0)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Unable to convert config burst to hw. Error: %d",
+			    rc);
+      // Error is traced
+      return (rc);
+    }
+
+  return 0;
+}
+
+
+u32
+sse2_qos_convert_pps_to_kbps (u32 rate_pps)
+{
+  // sse2_qos_ship_inc_counter(SSE2_QOS_SHIP_COUNTER_TYPE_API_CNT,
+  //                            SSE2_QOS_SHIP_CNT_POL_CONV_PPS_TO_KBPS);
+
+  u64 numer, rnd_value = 0;
+
+  numer = (u64) ((u64) rate_pps *
+		 (u64) SSE2_QOS_POLICER_FIXED_PKT_SIZE * 8LL);
+  (void) sse2_qos_pol_round (numer, 1000LL, &rnd_value,
+			     SSE2_QOS_ROUND_TO_CLOSEST);
+
+  return ((u32) rnd_value);
+}
+
+u32
+sse2_qos_convert_burst_ms_to_bytes (u32 burst_ms, u32 rate_kbps)
+{
+  u64 numer, rnd_value = 0;
+
+  //sse2_qos_ship_inc_counter(SSE2_QOS_SHIP_COUNTER_TYPE_API_CNT,
+  //                          SSE2_QOS_SHIP_CNT_POL_CONV_BURST_MS_TO_BYTES);
+
+  numer = (u64) ((u64) burst_ms * (u64) rate_kbps);
+
+  (void) sse2_qos_pol_round (numer, 8LL, &rnd_value,
+			     SSE2_QOS_ROUND_TO_CLOSEST);
+
+  return ((u32) rnd_value);
+}
+
+
+/*
+ * Input: configured parameters in 'cfg'.
+ * Output: h/w parameters are returned in 'hw',
+ * Return: Status, success or failure code.
+ */
+int
+sse2_pol_compute_hw_params (sse2_qos_pol_cfg_params_st * cfg,
+			    sse2_qos_pol_hw_params_st * hw)
+{
+  int rc = 0;
+
+  if (!cfg || !hw)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Illegal parameters");
+      return (-1);
+    }
+
+  /*
+   * Validate the police config params being presented to RM
+   */
+  rc = sse2_pol_validate_cfg_params (cfg);
+  if (rc != 0)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Config parameter validation failed. Error: %d",
+			    rc);
+      // Error is traced
+      return (-1);
+    }
+
+  /*
+   * first round configured values to h/w supported values. This func
+   * also determines whether 'tick' or 'byte' format
+   */
+  rc = sse2_pol_convert_cfg_to_hw_params (cfg, hw);
+  if (rc != 0)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Unable to convert config params to hw params. "
+			    "Error: %d", rc);
+      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_53, rc);
+      return (-1);
+    }
+
+  return 0;
+}
+
+
+#if defined (INTERNAL_SS) || defined (X86)
+
+// For initializing the x86 policer format
+
+/*
+ * Return the number of hardware TSC timer ticks per second for the dataplane.
+ * This is approximately, but not exactly, the clock speed.
+ */
+static u64
+get_tsc_hz (void)
+{
+  f64 cpu_freq;
+
+  cpu_freq = os_cpu_clock_frequency ();
+  return (u64) cpu_freq;
+}
+
+/*
+ * Convert rates into bytes_per_period and scale.
+ * Return 0 if ok or 1 if error.
+ */
+static int
+compute_policer_params (u64 hz,	// CPU speed in clocks per second
+			u64 cir_rate,	// in bytes per second
+			u64 pir_rate,	// in bytes per second
+			u32 * current_limit,	// in bytes, output may scale the input
+			u32 * extended_limit,	// in bytes, output may scale the input
+			u32 * cir_bytes_per_period,
+			u32 * pir_bytes_per_period, u32 * scale)
+{
+  double period;
+  double internal_cir_bytes_per_period;
+  double internal_pir_bytes_per_period;
+  u32 max;
+  u32 scale_shift;
+  u32 scale_amount;
+  u32 __attribute__ ((unused)) orig_current_limit = *current_limit;
+
+  // Compute period. For 1Ghz-to-8Ghz CPUs, the period will be in
+  // the range of 16 to 116 usec.
+  period = ((double) hz) / ((double) POLICER_TICKS_PER_PERIOD);
+
+  // Determine bytes per period for each rate
+  internal_cir_bytes_per_period = (double) cir_rate / period;
+  internal_pir_bytes_per_period = (double) pir_rate / period;
+
+  // Scale if possible. Scaling helps rate accuracy, but is contrained
+  // by the scaled rates and limits fitting in 32-bits.
+  // In addition, we need to insure the scaled rate is no larger than
+  // 2^22 tokens per period. This allows the dataplane to ignore overflow
+  // in the tokens-per-period multiplication since it could only
+  // happen if the policer were idle for more than a year.
+  // This is not really a constraint because 100Gbps at 1Ghz is only
+  // 1.6M tokens per period.
+#define MAX_RATE_SHIFT 10
+  max = MAX (*current_limit, *extended_limit);
+  max = MAX (max, (u32) internal_cir_bytes_per_period << MAX_RATE_SHIFT);
+  max = MAX (max, (u32) internal_pir_bytes_per_period << MAX_RATE_SHIFT);
+  scale_shift = __builtin_clz (max);
+
+  scale_amount = 1 << scale_shift;
+  *scale = scale_shift;
+
+  // Scale the limits
+  *current_limit = *current_limit << scale_shift;
+  *extended_limit = *extended_limit << scale_shift;
+
+  // Scale the rates
+  internal_cir_bytes_per_period =
+    internal_cir_bytes_per_period * ((double) scale_amount);
+  internal_pir_bytes_per_period =
+    internal_pir_bytes_per_period * ((double) scale_amount);
+
+  // Make sure the new rates are reasonable
+  // Only needed for very low rates with large bursts
+  if (internal_cir_bytes_per_period < 1.0)
+    {
+      internal_cir_bytes_per_period = 1.0;
+    }
+  if (internal_pir_bytes_per_period < 1.0)
+    {
+      internal_pir_bytes_per_period = 1.0;
+    }
+
+  *cir_bytes_per_period = (u32) internal_cir_bytes_per_period;
+  *pir_bytes_per_period = (u32) internal_pir_bytes_per_period;
+
+// #define PRINT_X86_POLICE_PARAMS
+#ifdef PRINT_X86_POLICE_PARAMS
+  {
+    u64 effective_BPS;
+
+    // This value actually slightly conservative because it doesn't take into account
+    // the partial period at the end of a second. This really matters only for very low
+    // rates.
+    effective_BPS =
+      (((u64) (*cir_bytes_per_period * (u64) period)) >> *scale);
+
+    printf ("hz=%llu, cir_rate=%llu, limit=%u => "
+	    "periods-per-sec=%d usec-per-period=%d => "
+	    "scale=%d cir_BPP=%u, scaled_limit=%u => "
+	    "effective BPS=%llu, accuracy=%f\n",
+	    // input values
+	    (unsigned long long) hz,
+	    (unsigned long long) cir_rate, orig_current_limit,
+	    // computed values
+	    (u32) (period),	// periods per second
+	    (u32) (1000.0 * 1000.0 / period),	// in usec
+	    *scale, *cir_bytes_per_period, *current_limit,
+	    // accuracy
+	    (unsigned long long) effective_BPS,
+	    (double) cir_rate / (double) effective_BPS);
+  }
+#endif
+
+  return 0;			// ok
+}
+
+
+/*
+ * Input: configured parameters in 'cfg'.
+ * Output: h/w parameters are returned in 'hw',
+ * Return: Status, success or failure code.
+ */
+int
+x86_pol_compute_hw_params (sse2_qos_pol_cfg_params_st * cfg,
+			   policer_read_response_type_st * hw)
+{
+  const int BYTES_PER_KBIT = (1000 / 8);
+  u64 hz;
+  u32 cap;
+
+  if (!cfg || !hw)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Illegal parameters");
+      return (-1);
+    }
+
+  hz = get_tsc_hz ();
+  hw->last_update_time = 0;
+
+  // Cap the bursts to 32-bits. This allows up to almost one second of
+  // burst on a 40GE interface, which should be fine for x86.
+  cap =
+    (cfg->rb.kbps.cb_bytes > 0xFFFFFFFF) ? 0xFFFFFFFF : cfg->rb.kbps.cb_bytes;
+  hw->current_limit = cap;
+  cap =
+    (cfg->rb.kbps.eb_bytes > 0xFFFFFFFF) ? 0xFFFFFFFF : cfg->rb.kbps.eb_bytes;
+  hw->extended_limit = cap;
+
+  if ((cfg->rb.kbps.cir_kbps == 0) && (cfg->rb.kbps.cb_bytes == 0)
+      && (cfg->rb.kbps.eb_bytes == 0))
+    {
+      // This is a uninitialized, always-violate policer
+      hw->single_rate = 1;
+      hw->cir_tokens_per_period = 0;
+      return 0;
+    }
+
+  if ((cfg->rfc == SSE2_QOS_POLICER_TYPE_1R2C) ||
+      (cfg->rfc == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697))
+    {
+      // Single-rate policer
+
+      hw->single_rate = 1;
+
+      if ((cfg->rfc == SSE2_QOS_POLICER_TYPE_1R2C) && cfg->rb.kbps.eb_bytes)
+	{
+	  SSE2_QOS_DEBUG_ERROR
+	    ("Policer parameter validation failed -- 1R2C.");
+	  return (-1);
+	}
+
+      if ((cfg->rb.kbps.cir_kbps == 0) ||
+	  (cfg->rb.kbps.eir_kbps != 0) ||
+	  ((cfg->rb.kbps.cb_bytes == 0) && (cfg->rb.kbps.eb_bytes == 0)))
+	{
+	  SSE2_QOS_DEBUG_ERROR ("Policer parameter validation failed -- 1R.");
+	  return (-1);
+	}
+
+      if (compute_policer_params (hz,
+				  (u64) cfg->rb.kbps.cir_kbps *
+				  BYTES_PER_KBIT, 0, &hw->current_limit,
+				  &hw->extended_limit,
+				  &hw->cir_tokens_per_period,
+				  &hw->pir_tokens_per_period, &hw->scale))
+	{
+	  SSE2_QOS_DEBUG_ERROR ("Policer parameter computation failed.");
+	  return (-1);
+	}
+
+    }
+  else if ((cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698) ||
+	   (cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115))
+    {
+      // Two-rate policer
+
+      if ((cfg->rb.kbps.cir_kbps == 0) || (cfg->rb.kbps.eir_kbps == 0)
+	  || (cfg->rb.kbps.eir_kbps < cfg->rb.kbps.cir_kbps)
+	  || (cfg->rb.kbps.cb_bytes == 0) || (cfg->rb.kbps.eb_bytes == 0))
+	{
+	  SSE2_QOS_DEBUG_ERROR ("Config parameter validation failed.");
+	  return (-1);
+	}
+
+      if (compute_policer_params (hz,
+				  (u64) cfg->rb.kbps.cir_kbps *
+				  BYTES_PER_KBIT,
+				  (u64) cfg->rb.kbps.eir_kbps *
+				  BYTES_PER_KBIT, &hw->current_limit,
+				  &hw->extended_limit,
+				  &hw->cir_tokens_per_period,
+				  &hw->pir_tokens_per_period, &hw->scale))
+	{
+	  SSE2_QOS_DEBUG_ERROR ("Policer parameter computation failed.");
+	  return (-1);
+	}
+
+    }
+  else
+    {
+      SSE2_QOS_DEBUG_ERROR
+	("Config parameter validation failed. RFC not supported");
+      return (-1);
+    }
+
+  hw->current_bucket = hw->current_limit;
+  hw->extended_bucket = hw->extended_limit;
+
+  return 0;
+}
+#endif
+
+
+/*
+ * Input: configured parameters in 'cfg'.
+ * Output: physical structure is returned in 'phys',
+ * Return: Status, success or failure code.
+ */
+int
+sse2_pol_logical_2_physical (sse2_qos_pol_cfg_params_st * cfg,
+			     policer_read_response_type_st * phys)
+{
+  int rc;
+  sse2_qos_pol_hw_params_st pol_hw;
+  sse2_qos_pol_cfg_params_st kbps_cfg;
+
+  memset (phys, 0, sizeof (policer_read_response_type_st));
+  memset (&kbps_cfg, 0, sizeof (sse2_qos_pol_cfg_params_st));
+
+  if (!cfg)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Illegal parameters");
+      return (-1);
+    }
+
+  switch (cfg->rate_type)
+    {
+    case SSE2_QOS_RATE_KBPS:
+      /* copy all the data into kbps_cfg */
+      kbps_cfg.rb.kbps.cir_kbps = cfg->rb.kbps.cir_kbps;
+      kbps_cfg.rb.kbps.eir_kbps = cfg->rb.kbps.eir_kbps;
+      kbps_cfg.rb.kbps.cb_bytes = cfg->rb.kbps.cb_bytes;
+      kbps_cfg.rb.kbps.eb_bytes = cfg->rb.kbps.eb_bytes;
+      break;
+    case SSE2_QOS_RATE_PPS:
+      kbps_cfg.rb.kbps.cir_kbps =
+	sse2_qos_convert_pps_to_kbps (cfg->rb.pps.cir_pps);
+      kbps_cfg.rb.kbps.eir_kbps =
+	sse2_qos_convert_pps_to_kbps (cfg->rb.pps.eir_pps);
+      kbps_cfg.rb.kbps.cb_bytes = sse2_qos_convert_burst_ms_to_bytes ((u32)
+								      cfg->
+								      rb.pps.cb_ms,
+								      kbps_cfg.rb.
+								      kbps.cir_kbps);
+      kbps_cfg.rb.kbps.eb_bytes =
+	sse2_qos_convert_burst_ms_to_bytes ((u32) cfg->rb.pps.eb_ms,
+					    kbps_cfg.rb.kbps.eir_kbps);
+      break;
+    default:
+      SSE2_QOS_DEBUG_ERROR ("Illegal rate type");
+      return (-1);
+    }
+
+  /* rate type is now converted to kbps */
+  kbps_cfg.rate_type = SSE2_QOS_RATE_KBPS;
+  kbps_cfg.rnd_type = cfg->rnd_type;
+  kbps_cfg.rfc = cfg->rfc;
+
+  phys->action[POLICE_CONFORM] = cfg->conform_action.action_type;
+  phys->mark_dscp[POLICE_CONFORM] = cfg->conform_action.dscp;
+  phys->action[POLICE_EXCEED] = cfg->exceed_action.action_type;
+  phys->mark_dscp[POLICE_EXCEED] = cfg->exceed_action.dscp;
+  phys->action[POLICE_VIOLATE] = cfg->violate_action.action_type;
+  phys->mark_dscp[POLICE_VIOLATE] = cfg->violate_action.dscp;
+
+  phys->color_aware = cfg->color_aware;
+
+#if !defined (INTERNAL_SS) && !defined (X86)
+  // convert logical into hw params which involves qos calculations
+  rc = sse2_pol_compute_hw_params (&kbps_cfg, &pol_hw);
+  if (rc == -1)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Unable to compute hw param. Error: %d", rc);
+      return (rc);
+    }
+
+  // convert hw params into the physical
+  phys->rfc = pol_hw.rfc;
+  phys->an = pol_hw.allow_negative;
+  phys->rexp = pol_hw.rate_exp;
+  phys->arm = pol_hw.avg_rate_man;
+  phys->prm = pol_hw.peak_rate_man;
+  phys->cble = pol_hw.comm_bkt_limit_exp;
+  phys->cblm = pol_hw.comm_bkt_limit_man;
+  phys->eble = pol_hw.extd_bkt_limit_exp;
+  phys->eblm = pol_hw.extd_bkt_limit_man;
+  phys->cb = pol_hw.comm_bkt;
+  phys->eb = pol_hw.extd_bkt;
+
+  /* for debugging purposes, the bucket token values can be overwritten */
+  if (cfg->overwrite_bucket)
+    {
+      phys->cb = cfg->current_bucket;
+      phys->eb = cfg->extended_bucket;
+    }
+#else
+  // convert logical into hw params which involves qos calculations
+  rc = x86_pol_compute_hw_params (&kbps_cfg, phys);
+  if (rc == -1)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Unable to compute hw param. Error: %d", rc);
+      return (rc);
+    }
+
+  /* for debugging purposes, the bucket token values can be overwritten */
+  if (cfg->overwrite_bucket)
+    {
+      phys->current_bucket = cfg->current_bucket;
+      phys->extended_bucket = cfg->extended_bucket;
+    }
+
+  // Touch to avoid compiler warning for X86
+  pol_hw.allow_negative = pol_hw.allow_negative;
+
+#endif // if !defined (INTERNAL_SS) && !defined (X86)
+
+  return 0;
+}
+
+
+static void
+sse2_qos_convert_pol_bucket_to_hw_fmt (policer_read_response_type_st * bkt,
+				       sse2_qos_pol_hw_params_st * hw_fmt)
+{
+  memset (hw_fmt, 0, sizeof (sse2_qos_pol_hw_params_st));
+#if !defined (INTERNAL_SS) && !defined (X86)
+  hw_fmt->rfc = (u8) bkt->rfc;
+  hw_fmt->allow_negative = (u8) bkt->an;
+  hw_fmt->rate_exp = (u8) bkt->rexp;
+  hw_fmt->avg_rate_man = (u16) bkt->arm;
+  hw_fmt->peak_rate_man = (u16) bkt->prm;
+  hw_fmt->comm_bkt_limit_man = (u8) bkt->cblm;
+  hw_fmt->comm_bkt_limit_exp = (u8) bkt->cble;
+  hw_fmt->extd_bkt_limit_man = (u8) bkt->eblm;
+  hw_fmt->extd_bkt_limit_exp = (u8) bkt->eble;
+  hw_fmt->extd_bkt = bkt->eb;
+  hw_fmt->comm_bkt = bkt->cb;
+#endif // if !defined (INTERNAL_SS) && !defined (X86)
+}
+
+/*
+ * Input: h/w programmable parameter values in 'hw'
+ * Output: configured parameter values in 'cfg'
+ * Return: Status, success or failure code.
+ */
+static int
+sse2_pol_convert_hw_to_cfg_params (sse2_qos_pol_hw_params_st * hw,
+				   sse2_qos_pol_cfg_params_st * cfg)
+{
+  u64 temp_rate;
+
+  if ((hw == NULL) || (cfg == NULL))
+    {
+      return EINVAL;
+    }
+
+  if ((hw->rfc == IPE_RFC_RFC4115) &&
+      !(hw->peak_rate_man << hw->rate_exp) && !(hw->extd_bkt_limit_man))
+    {
+      /*
+       * For a 1R2C, we set EIR = 0, EB = 0
+       */
+      cfg->rfc = SSE2_QOS_POLICER_TYPE_1R2C;
+    }
+  else if (hw->rfc == IPE_RFC_RFC2697)
+    {
+      cfg->rfc = SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697;
+    }
+  else if (hw->rfc == IPE_RFC_RFC2698)
+    {
+      cfg->rfc = SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698;
+    }
+  else if (hw->rfc == IPE_RFC_RFC4115)
+    {
+      cfg->rfc = SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115;
+    }
+  else if (hw->rfc == IPE_RFC_MEF5CF1)
+    {
+      cfg->rfc = SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1;
+    }
+  else
+    {
+      return EINVAL;
+    }
+
+  temp_rate = (((u64) hw->avg_rate_man << hw->rate_exp) * 8LL *
+	       SSE2_QOS_POL_TICKS_PER_SEC) / 1000;
+  cfg->rb.kbps.cir_kbps = (u32) temp_rate;
+
+  temp_rate = (((u64) hw->peak_rate_man << hw->rate_exp) * 8LL *
+	       SSE2_QOS_POL_TICKS_PER_SEC) / 1000;
+  cfg->rb.kbps.eir_kbps = (u32) temp_rate;
+
+  cfg->rb.kbps.cb_bytes = ((u64) hw->comm_bkt_limit_man <<
+			   (u64) hw->comm_bkt_limit_exp);
+  cfg->rb.kbps.eb_bytes = ((u64) hw->extd_bkt_limit_man <<
+			   (u64) hw->extd_bkt_limit_exp);
+
+  if (cfg->rfc == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
+    {
+      /*
+       * For 1R3C in the hardware, EB = sum(CB, EB). Also, EIR = CIR. Restore
+       * values such that the configured params don't reflect this adjustment
+       */
+      cfg->rb.kbps.eb_bytes = (cfg->rb.kbps.eb_bytes - cfg->rb.kbps.cb_bytes);
+      cfg->rb.kbps.eir_kbps = 0;
+    }
+  else if (cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115)
+    {
+      /*
+       * For 4115 in the hardware is excess rate and burst, but EA provides
+       * peak-rate, so adjust it to be eir
+       */
+      cfg->rb.kbps.eir_kbps += cfg->rb.kbps.cir_kbps;
+      cfg->rb.kbps.eb_bytes += cfg->rb.kbps.cb_bytes;
+    }
+  /* h/w conversion to cfg is in kbps */
+  cfg->rate_type = SSE2_QOS_RATE_KBPS;
+  cfg->overwrite_bucket = 0;
+  cfg->current_bucket = hw->comm_bkt;
+  cfg->extended_bucket = hw->extd_bkt;
+
+  SSE2_QOS_DEBUG_INFO ("configured params, cir: %u kbps, eir: %u kbps, cb "
+		       "burst: 0x%llx bytes, eb burst: 0x%llx bytes",
+		       cfg->rb.kbps.cir_kbps, cfg->rb.kbps.eir_kbps,
+		       cfg->rb.kbps.cb_bytes, cfg->rb.kbps.eb_bytes);
+  SSE2_QOS_TR_INFO (SSE2_QOS_TP_INFO_22, cfg->rb.kbps.cir_kbps,
+		    cfg->rb.kbps.eir_kbps,
+		    (uint) cfg->rb.kbps.cb_bytes,
+		    (uint) cfg->rb.kbps.eb_bytes);
+
+  return 0;
+}
+
+u32
+sse2_qos_convert_kbps_to_pps (u32 rate_kbps)
+{
+  u64 numer, denom, rnd_value = 0;
+
+  // sse_qosrm_ship_inc_counter(SSE2_QOS_SHIP_COUNTER_TYPE_API_CNT,
+  //                            SSE2_QOS_SHIP_CNT_POL_CONV_KBPS_TO_PPS);
+
+  numer = (u64) ((u64) rate_kbps * 1000LL);
+  denom = (u64) ((u64) SSE2_QOS_POLICER_FIXED_PKT_SIZE * 8LL);
+
+  (void) sse2_qos_pol_round (numer, denom, &rnd_value,
+			     SSE2_QOS_ROUND_TO_CLOSEST);
+
+  return ((u32) rnd_value);
+}
+
+u32
+sse2_qos_convert_burst_bytes_to_ms (u64 burst_bytes, u32 rate_kbps)
+{
+  u64 numer, denom, rnd_value = 0;
+
+  //sse_qosrm_ship_inc_counter(SSE2_QOS_SHIP_COUNTER_TYPE_API_CNT,
+  //                         SSE2_QOS_SHIP_CNT_POL_CONV_BYTES_TO_BURST_MS);
+
+  numer = burst_bytes * 8LL;
+  denom = (u64) rate_kbps;
+
+  (void) sse2_qos_pol_round (numer, denom, &rnd_value,
+			     SSE2_QOS_ROUND_TO_CLOSEST);
+
+  return ((u32) rnd_value);
+}
+
+/*
+ * Input: physical structure in 'phys', rate_type in cfg
+ * Output: configured parameters in 'cfg'.
+ * Return: Status, success or failure code.
+ */
+int
+sse2_pol_physical_2_logical (policer_read_response_type_st * phys,
+			     sse2_qos_pol_cfg_params_st * cfg)
+{
+  int rc;
+  sse2_qos_pol_hw_params_st pol_hw;
+  sse2_qos_pol_cfg_params_st kbps_cfg;
+
+  memset (&pol_hw, 0, sizeof (sse2_qos_pol_hw_params_st));
+  memset (&kbps_cfg, 0, sizeof (sse2_qos_pol_cfg_params_st));
+
+  if (!phys)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Illegal parameters");
+      return (-1);
+    }
+
+  sse2_qos_convert_pol_bucket_to_hw_fmt (phys, &pol_hw);
+
+  rc = sse2_pol_convert_hw_to_cfg_params (&pol_hw, &kbps_cfg);
+  if (rc != 0)
+    {
+      SSE2_QOS_DEBUG_ERROR ("Unable to convert hw params to config params. "
+			    "Error: %d", rc);
+      return (-1);
+    }
+
+  /* check what rate type is required */
+  switch (cfg->rate_type)
+    {
+    case SSE2_QOS_RATE_KBPS:
+      /* copy all the data into kbps_cfg */
+      cfg->rb.kbps.cir_kbps = kbps_cfg.rb.kbps.cir_kbps;
+      cfg->rb.kbps.eir_kbps = kbps_cfg.rb.kbps.eir_kbps;
+      cfg->rb.kbps.cb_bytes = kbps_cfg.rb.kbps.cb_bytes;
+      cfg->rb.kbps.eb_bytes = kbps_cfg.rb.kbps.eb_bytes;
+      break;
+    case SSE2_QOS_RATE_PPS:
+      cfg->rb.pps.cir_pps =
+	sse2_qos_convert_kbps_to_pps (kbps_cfg.rb.kbps.cir_kbps);
+      cfg->rb.pps.eir_pps =
+	sse2_qos_convert_kbps_to_pps (kbps_cfg.rb.kbps.eir_kbps);
+      cfg->rb.pps.cb_ms =
+	sse2_qos_convert_burst_bytes_to_ms (kbps_cfg.rb.kbps.cb_bytes,
+					    kbps_cfg.rb.kbps.cir_kbps);
+      cfg->rb.pps.eb_ms =
+	sse2_qos_convert_burst_bytes_to_ms (kbps_cfg.rb.kbps.eb_bytes,
+					    kbps_cfg.rb.kbps.eir_kbps);
+      break;
+    default:
+      SSE2_QOS_DEBUG_ERROR ("Illegal rate type");
+      return (-1);
+    }
+
+  /* cfg->rate_type remains what it was */
+  cfg->rnd_type = kbps_cfg.rnd_type;
+  cfg->rfc = kbps_cfg.rfc;
+  cfg->overwrite_bucket = kbps_cfg.overwrite_bucket;
+  cfg->current_bucket = kbps_cfg.current_bucket;
+  cfg->extended_bucket = kbps_cfg.extended_bucket;
+
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/policer/xlate.h b/src/vnet/policer/xlate.h
new file mode 100644
index 00000000..16742f80
--- /dev/null
+++ b/src/vnet/policer/xlate.h
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*---------------------------------------------------------------------------
+ * from gdp_logical_qos.h
+ *---------------------------------------------------------------------------
+ */
+
+#ifndef __included_xlate_h__
+#define __included_xlate_h__
+
+#include <vnet/policer/police.h>
+
+/*
+ * edt: * enum sse2_qos_policer_type_en
+ *  Defines type of policer to be allocated
+ */
+typedef enum sse2_qos_policer_type_en_
+{
+  SSE2_QOS_POLICER_TYPE_1R2C = 0,
+  SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697 = 1,
+  SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698 = 2,
+  SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115 = 3,
+  SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1 = 4,
+  SSE2_QOS_POLICER_TYPE_MAX
+} sse2_qos_policer_type_en;
+
+/*
+ * edt: * enum
+ *  Enum used to define type of rounding used when calculating policer values
+ */
+typedef enum
+{
+  SSE2_QOS_ROUND_TO_CLOSEST = 0,
+  SSE2_QOS_ROUND_TO_UP,
+  SSE2_QOS_ROUND_TO_DOWN,
+  SSE2_QOS_ROUND_INVALID
+} sse2_qos_round_type_en;
+
+/*
+ * edt: * enum
+ *  Enum used to define type of rate for configuration, either pps or kbps.
+ *  If kbps, then burst is in bytes, if pps, then burst is in ms.
+ *
+ *  Default of zero is kbps, which is inline with how it is programmed
+ *  in actual hardware.  However, the warning is that this is reverse logic
+ *  of units_in_bits field in sse2_static_policer_parameters_st, which is
+ *  inline with sse_punt_drop.h.
+ */
+typedef enum
+{
+  SSE2_QOS_RATE_KBPS = 0,
+  SSE2_QOS_RATE_PPS,
+  SSE2_QOS_RATE_INVALID
+} sse2_qos_rate_type_en;
+
+/*
+ * edt: * enum
+ * Defines type of policer actions.
+ */
+typedef enum
+{
+  SSE2_QOS_ACTION_DROP = 0,
+  SSE2_QOS_ACTION_TRANSMIT,
+  SSE2_QOS_ACTION_MARK_AND_TRANSMIT
+} sse2_qos_action_type_en;
+
+/*
+ * edt * struct sse2_qos_pol_action_params_st
+ * This structure is used to hold user configured police action parameters.
+ *
+ * element: action_type
+ *      Action type (see sse2_qos_action_type_en).
+ * elemtnt: dscp
+ *      DSCP value to set when action is SSE2_QOS_ACTION_MARK_AND_TRANSMIT.
+ */
+typedef struct sse2_qos_pol_action_params_st_
+{
+  u8 action_type;
+  u8 dscp;
+} sse2_qos_pol_action_params_st;
+
+/*
+ * edt: * struct sse2_qos_pol_cfg_params_st
+ *
+ * Description:
+ * This structure is used to hold user configured policing parameters.
+ *
+ * element: cir_kbps
+ *      CIR in kbps.
+ * element: eir_kbps
+ *      EIR or PIR in kbps.
+ * element: cb_bytes
+ *      Committed Burst in bytes.
+ * element: eb_bytes
+ *      Excess or Peak Burst in bytes.
+ * element: cir_pps
+ *      CIR in pps.
+ * element: eir_pps
+ *      EIR or PIR in pps.
+ * element: cb_ms
+ *      Committed Burst in milliseconds.
+ * element: eb_ms
+ *      Excess or Peak Burst in milliseconds.
+ * element: rate_type
+ *      Indicates the union if in kbps/bytes or pps/ms.
+ * element: rfc
+ *      Policer algorithm - 1R2C, 1R3C (2697), 2R3C (2698) or 2R3C (4115). See
+ *      sse_qos_policer_type_en
+ * element: rnd_type
+ *      Rounding type (see sse_qos_round_type_en). Needed when policer values
+ *      need to be rounded. Caller can decide on type of rounding used
+ */
+typedef struct sse2_qos_pol_cfg_params_st_
+{
+  union
+  {
+    struct
+    {
+      u32 cir_kbps;
+      u32 eir_kbps;
+      u64 cb_bytes;
+      u64 eb_bytes;
+    } kbps;
+    struct
+    {
+      u32 cir_pps;
+      u32 eir_pps;
+      u64 cb_ms;
+      u64 eb_ms;
+    } pps;
+  } rb;				/* rate burst config */
+  u8 rate_type;			/* sse2_qos_rate_type_en */
+  u8 rnd_type;			/* sse2_qos_round_type_en */
+  u8 rfc;			/* sse2_qos_policer_type_en */
+  u8 color_aware;
+  u8 overwrite_bucket;		/* for debugging purposes */
+  u32 current_bucket;		/* for debugging purposes */
+  u32 extended_bucket;		/* for debugging purposes */
+  sse2_qos_pol_action_params_st conform_action;
+  sse2_qos_pol_action_params_st exceed_action;
+  sse2_qos_pol_action_params_st violate_action;
+} sse2_qos_pol_cfg_params_st;
+
+
+typedef struct sse2_qos_pol_hw_params_st_
+{
+  u8 rfc;
+  u8 allow_negative;
+  u8 rate_exp;
+  u16 avg_rate_man;
+  u16 peak_rate_man;
+  u8 comm_bkt_limit_exp;
+  u8 comm_bkt_limit_man;
+  u8 extd_bkt_limit_exp;
+  u8 extd_bkt_limit_man;
+  u32 comm_bkt;
+  u32 extd_bkt;
+} sse2_qos_pol_hw_params_st;
+
+
+int
+sse2_pol_logical_2_physical (sse2_qos_pol_cfg_params_st * cfg,
+			     policer_read_response_type_st * phys);
+
+
+#endif /* __included_xlate_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ppp/error.def b/src/vnet/ppp/error.def
new file mode 100644
index 00000000..ba645408
--- /dev/null
+++ b/src/vnet/ppp/error.def
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ppp_error.def: ppp errors
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+ppp_error (NONE, "no error")
+ppp_error (UNKNOWN_PROTOCOL, "unknown ppp protocol")
+ppp_error (UNKNOWN_ADDRESS_CONTROL, "address, control != 0xff03")
diff --git a/src/vnet/ppp/node.c b/src/vnet/ppp/node.c
new file mode 100644
index 00000000..4f1f6a71
--- /dev/null
+++ b/src/vnet/ppp/node.c
@@ -0,0 +1,368 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ppp_node.c: ppp packet processing
+ *
+ * Copyright (c) 2010 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ppp/ppp.h>
+#include <vppinfra/sparse_vec.h>
+
+#define foreach_ppp_input_next			\
+  _ (PUNT, "error-punt")			\
+  _ (DROP, "error-drop")
+
+typedef enum
+{
+#define _(s,n) PPP_INPUT_NEXT_##s,
+  foreach_ppp_input_next
+#undef _
+    PPP_INPUT_N_NEXT,
+} ppp_input_next_t;
+
+typedef struct
+{
+  u8 packet_data[32];
+} ppp_input_trace_t;
+
+static u8 *
+format_ppp_input_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  ppp_input_trace_t *t = va_arg (*va, ppp_input_trace_t *);
+
+  s = format (s, "%U", format_ppp_header, t->packet_data);
+
+  return s;
+}
+
+typedef struct
+{
+  /* Sparse vector mapping ppp protocol in network byte order
+     to next index. */
+  u16 *next_by_protocol;
+
+  u32 *sparse_index_by_next_index;
+} ppp_input_runtime_t;
+
+static uword
+ppp_input (vlib_main_t * vm,
+	   vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  ppp_input_runtime_t *rt = (void *) node->runtime_data;
+  u32 n_left_from, next_index, i_next, *from, *to_next;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node,
+				   from,
+				   n_left_from,
+				   sizeof (from[0]),
+				   sizeof (ppp_input_trace_t));
+
+  next_index = node->cached_next_index;
+  i_next = vec_elt (rt->sparse_index_by_next_index, next_index);
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  ppp_header_t *h0, *h1;
+	  u32 i0, i1, protocol0, protocol1, enqueue_code;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, sizeof (h0[0]), LOAD);
+	    CLIB_PREFETCH (p3->data, sizeof (h1[0]), LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  h0 = (void *) (b0->data + b0->current_data);
+	  h1 = (void *) (b1->data + b1->current_data);
+
+	  b0->current_data += sizeof (h0[0]);
+	  b1->current_data += sizeof (h1[0]);
+
+	  b0->current_length -= sizeof (h0[0]);
+	  b1->current_length -= sizeof (h1[0]);
+
+	  /* Index sparse array with network byte order. */
+	  protocol0 = h0->protocol;
+	  protocol1 = h1->protocol;
+	  sparse_vec_index2 (rt->next_by_protocol, protocol0, protocol1, &i0,
+			     &i1);
+
+	  b0->error =
+	    node->errors[i0 ==
+			 SPARSE_VEC_INVALID_INDEX ? PPP_ERROR_UNKNOWN_PROTOCOL
+			 : PPP_ERROR_NONE];
+	  b1->error =
+	    node->errors[i1 ==
+			 SPARSE_VEC_INVALID_INDEX ? PPP_ERROR_UNKNOWN_PROTOCOL
+			 : PPP_ERROR_NONE];
+
+	  enqueue_code = (i0 != i_next) + 2 * (i1 != i_next);
+
+	  if (PREDICT_FALSE (enqueue_code != 0))
+	    {
+	      switch (enqueue_code)
+		{
+		case 1:
+		  /* A B A */
+		  to_next[-2] = bi1;
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node,
+					      vec_elt (rt->next_by_protocol,
+						       i0), bi0);
+		  break;
+
+		case 2:
+		  /* A A B */
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node,
+					      vec_elt (rt->next_by_protocol,
+						       i1), bi1);
+		  break;
+
+		case 3:
+		  /* A B B or A B C */
+		  to_next -= 2;
+		  n_left_to_next += 2;
+		  vlib_set_next_frame_buffer (vm, node,
+					      vec_elt (rt->next_by_protocol,
+						       i0), bi0);
+		  vlib_set_next_frame_buffer (vm, node,
+					      vec_elt (rt->next_by_protocol,
+						       i1), bi1);
+		  if (i0 == i1)
+		    {
+		      vlib_put_next_frame (vm, node, next_index,
+					   n_left_to_next);
+		      i_next = i1;
+		      next_index = vec_elt (rt->next_by_protocol, i_next);
+		      vlib_get_next_frame (vm, node, next_index, to_next,
+					   n_left_to_next);
+		    }
+		}
+	    }
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  ppp_header_t *h0;
+	  u32 i0, protocol0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  h0 = (void *) (b0->data + b0->current_data);
+
+	  b0->current_data += sizeof (h0[0]);
+	  b0->current_length -= sizeof (h0[0]);
+
+	  protocol0 = h0->protocol;
+	  i0 = sparse_vec_index (rt->next_by_protocol, protocol0);
+
+	  b0->error =
+	    node->errors[i0 ==
+			 SPARSE_VEC_INVALID_INDEX ? PPP_ERROR_UNKNOWN_PROTOCOL
+			 : PPP_ERROR_NONE];
+
+	  /* Sent packet to wrong next? */
+	  if (PREDICT_FALSE (i0 != i_next))
+	    {
+	      /* Return old frame; remove incorrectly enqueued packet. */
+	      vlib_put_next_frame (vm, node, next_index, n_left_to_next + 1);
+
+	      /* Send to correct next. */
+	      i_next = i0;
+	      next_index = vec_elt (rt->next_by_protocol, i_next);
+	      vlib_get_next_frame (vm, node, next_index,
+				   to_next, n_left_to_next);
+	      to_next[0] = bi0;
+	      to_next += 1;
+	      n_left_to_next -= 1;
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+static char *ppp_error_strings[] = {
+#define ppp_error(n,s) s,
+#include "error.def"
+#undef ppp_error
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ppp_input_node) = {
+  .function = ppp_input,
+  .name = "ppp-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .runtime_data_bytes = sizeof (ppp_input_runtime_t),
+
+  .n_errors = PPP_N_ERROR,
+  .error_strings = ppp_error_strings,
+
+  .n_next_nodes = PPP_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [PPP_INPUT_NEXT_##s] = n,
+    foreach_ppp_input_next
+#undef _
+  },
+
+  .format_buffer = format_ppp_header_with_length,
+  .format_trace = format_ppp_input_trace,
+  .unformat_buffer = unformat_ppp_header,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+ppp_input_init (vlib_main_t * vm)
+{
+  ppp_input_runtime_t *rt;
+
+  {
+    clib_error_t *error = vlib_call_init_function (vm, ppp_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  ppp_setup_node (vm, ppp_input_node.index);
+
+  rt = vlib_node_get_runtime_data (vm, ppp_input_node.index);
+
+  rt->next_by_protocol = sparse_vec_new
+    ( /* elt bytes */ sizeof (rt->next_by_protocol[0]),
+     /* bits in index */ BITS (((ppp_header_t *) 0)->protocol));
+
+  vec_validate (rt->sparse_index_by_next_index, PPP_INPUT_NEXT_DROP);
+  vec_validate (rt->sparse_index_by_next_index, PPP_INPUT_NEXT_PUNT);
+  rt->sparse_index_by_next_index[PPP_INPUT_NEXT_DROP]
+    = SPARSE_VEC_INVALID_INDEX;
+  rt->sparse_index_by_next_index[PPP_INPUT_NEXT_PUNT]
+    = SPARSE_VEC_INVALID_INDEX;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (ppp_input_init);
+
+void
+ppp_register_input_protocol (vlib_main_t * vm,
+			     ppp_protocol_t protocol, u32 node_index)
+{
+  ppp_main_t *em = &ppp_main;
+  ppp_protocol_info_t *pi;
+  ppp_input_runtime_t *rt;
+  u16 *n;
+  u32 i;
+
+  {
+    clib_error_t *error = vlib_call_init_function (vm, ppp_input_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  pi = ppp_get_protocol_info (em, protocol);
+  pi->node_index = node_index;
+  pi->next_index = vlib_node_add_next (vm, ppp_input_node.index, node_index);
+
+  /* Setup ppp protocol -> next index sparse vector mapping. */
+  rt = vlib_node_get_runtime_data (vm, ppp_input_node.index);
+  n =
+    sparse_vec_validate (rt->next_by_protocol,
+			 clib_host_to_net_u16 (protocol));
+  n[0] = pi->next_index;
+
+  /* Rebuild next index -> sparse index inverse mapping when sparse vector
+     is updated. */
+  vec_validate (rt->sparse_index_by_next_index, pi->next_index);
+  for (i = 1; i < vec_len (rt->next_by_protocol); i++)
+    rt->sparse_index_by_next_index[rt->next_by_protocol[i]] = i;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ppp/packet.h b/src/vnet/ppp/packet.h
new file mode 100644
index 00000000..cab9743d
--- /dev/null
+++ b/src/vnet/ppp/packet.h
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vnet_ppp_packet_h
+#define included_vnet_ppp_packet_h
+
+/*
+ * PPP packet format
+ *
+ * Copyright (c) 2009 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+See http://www.iana.org/assignments/ppp-numbers.
+
+The Point-to-Point Protocol (PPP) Data Link Layer [146,147,175]
+contains a 16 bit Protocol field to identify the the encapsulated
+protocol.  The Protocol field is consistent with the ISO 3309 (HDLC)
+extension mechanism for Address fields.  All Protocols MUST be
+assigned such that the least significant bit of the most significant
+octet equals "0", and the least significant bit of the least
+significant octet equals "1".
+*/
+
+#define foreach_ppp_protocol			\
+_ (0x0001, padding)				\
+_ (0x0003, rohc_small_cid)			\
+_ (0x0005, rohc_large_cid)			\
+_ (0x0021, ip4)					\
+_ (0x0023, osi)					\
+_ (0x0025, xerox_ns_idp)			\
+_ (0x0027, decnet)				\
+_ (0x0029, appletalk)				\
+_ (0x002b, ipx)					\
+_ (0x002d, vj_compressed_tcp)			\
+_ (0x002f, vj_uncompressed_tcp)			\
+_ (0x0031, bpdu)				\
+_ (0x0033, streams)				\
+_ (0x0035, vines)				\
+_ (0x0039, appletalk_eddp)			\
+_ (0x003b, appletalk_smart_buffered)		\
+_ (0x003d, multilink)				\
+_ (0x003f, netbios_framing)			\
+_ (0x0041, cisco)				\
+_ (0x0043, timeplex)				\
+_ (0x0045, fujitsu_lblb)			\
+_ (0x0047, dca_remote_lan)			\
+_ (0x0049, sdtp)				\
+_ (0x004b, sna_over_802_2)			\
+_ (0x004d, sna)					\
+_ (0x004f, ip6_header_compression)		\
+_ (0x0051, knx)					\
+_ (0x0053, encryption)				\
+_ (0x0055, link_encryption)			\
+_ (0x0057, ip6)					\
+_ (0x0059, ppp_mux)				\
+_ (0x005b, vendor_specific_a)			\
+_ (0x0061, rtp_iphc_full_header)		\
+_ (0x0063, rtp_iphc_compressed_tcp)		\
+_ (0x0065, rtp_iphc_compressed_non_tcp)		\
+_ (0x0067, rtp_iphc_compressed_udp_8)		\
+_ (0x0069, rtp_iphc_compressed_rtp_8)		\
+_ (0x006f, stampede)				\
+_ (0x0073, mp_plus)				\
+_ (0x007d, control)				\
+_ (0x00c1, ntcits_ipi)				\
+_ (0x00cf, ppp_nlpid)				\
+_ (0x00fb, multilink_compression)		\
+_ (0x00fd, compressed_datagram)			\
+_ (0x0201, 802_1d_hello)			\
+_ (0x0203, ibm_source_routing)			\
+_ (0x0205, dec_lanbridge)			\
+_ (0x0207, cdp)					\
+_ (0x0209, netcs)				\
+_ (0x020b, stp)					\
+_ (0x020d, edp)					\
+_ (0x0211, oscp_a)				\
+_ (0x0213, oscp_b)				\
+_ (0x0231, luxcom)				\
+_ (0x0233, sigma)				\
+_ (0x0235, apple_client_server)			\
+_ (0x0281, mpls_unicast)			\
+_ (0x0283, mpls_multicast)			\
+_ (0x0285, ieee_p1284_4)			\
+_ (0x0287, tetra)				\
+_ (0x0289, multichannel_flow_treatment)		\
+_ (0x2063, rtp_iphc_compressed_tcp_no_delta)	\
+_ (0x2065, rtp_iphc_context_state)		\
+_ (0x2067, rtp_iphc_compressed_udp_16)		\
+_ (0x2069, rtp_iphc_compressed_rtp_16)		\
+_ (0x4001, cray)				\
+_ (0x4003, cdpd)				\
+_ (0x4005, expand)				\
+_ (0x4007, odsicp)				\
+_ (0x4009, docsis_dll)				\
+_ (0x400B, cetacean)				\
+_ (0x4021, lzs)					\
+_ (0x4023, reftek)				\
+_ (0x4025, fibre_channel)			\
+_ (0x4027, emit)				\
+_ (0x405b, vendor_specific_b)			\
+_ (0xc021, lcp)					\
+_ (0xc023, pap)					\
+_ (0xc025, link_quality_report)			\
+_ (0xc027, shiva_password)			\
+_ (0xc029, cbcp)				\
+_ (0xc02b, bacp)				\
+_ (0xc02d, bap)					\
+_ (0xc05b, vendor_specific_password)		\
+_ (0xc081, container_control)			\
+_ (0xc223, chap)				\
+_ (0xc225, rsa)					\
+_ (0xc227, extensible_authentication)		\
+_ (0xc229, mitsubishi_security_info)		\
+_ (0xc26f, stampede_authorization)		\
+_ (0xc281, proprietary_authentication_a)	\
+_ (0xc283, proprietary_authentication_b)	\
+_ (0xc481, proprietary_node_id_authentication)
+
+typedef enum
+{
+#define _(n,f) PPP_PROTOCOL_##f = n,
+  foreach_ppp_protocol
+#undef _
+} ppp_protocol_t;
+
+/* PPP Link Control Protocol (LCP) and Internet Protocol Control Protocol (IPCP) Codes
+
+The Point-to-Point Protocol (PPP) Link Control Protocol (LCP),
+the Compression Control Protocol (CCP), Internet Protocol Control
+Protocol (IPCP), and other control protocols, contain an 8 bit
+Code field which identifies the type of packet. */
+
+#define foreach_ppp_lcp_code			\
+_ (0, vendor_specific)				\
+_ (1, configure_request)			\
+_ (2, configure_ack)				\
+_ (3, configure_nak)				\
+_ (4, configure_reject)				\
+_ (5, terminate_request)			\
+_ (6, terminate_ack)				\
+_ (7, code_reject)				\
+_ (8, protocol_reject)				\
+_ (9, echo_request)				\
+_ (10, echo_reply)				\
+_ (11, discard_request)				\
+_ (12, identification)				\
+_ (13, time_remaining)				\
+_ (14, reset_request)				\
+_ (15, reset_reply)
+
+typedef struct
+{
+  /* Set to 0xff 0x03 */
+  u8 address, control;
+
+  /* Layer 3 protocol for this packet. */
+  u16 protocol;
+} ppp_header_t;
+
+#endif /* included_vnet_ppp_packet_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ppp/pg.c b/src/vnet/ppp/pg.c
new file mode 100644
index 00000000..0b46ccb9
--- /dev/null
+++ b/src/vnet/ppp/pg.c
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ppp_pg.c: packet generator ppp interface
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ppp/ppp.h>
+
+typedef struct
+{
+  pg_edit_t address;
+  pg_edit_t control;
+  pg_edit_t protocol;
+} pg_ppp_header_t;
+
+static inline void
+pg_ppp_header_init (pg_ppp_header_t * e)
+{
+  pg_edit_init (&e->address, ppp_header_t, address);
+  pg_edit_init (&e->control, ppp_header_t, control);
+  pg_edit_init (&e->protocol, ppp_header_t, protocol);
+}
+
+uword
+unformat_pg_ppp_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  pg_ppp_header_t *h;
+  u32 group_index, error;
+
+  h = pg_create_edit_group (s, sizeof (h[0]), sizeof (ppp_header_t),
+			    &group_index);
+  pg_ppp_header_init (h);
+
+  pg_edit_set_fixed (&h->address, 0xff);
+  pg_edit_set_fixed (&h->control, 0x03);
+
+  error = 1;
+  if (!unformat (input, "%U",
+		 unformat_pg_edit,
+		 unformat_ppp_protocol_net_byte_order, &h->protocol))
+    goto done;
+
+  {
+    ppp_main_t *pm = &ppp_main;
+    ppp_protocol_info_t *pi = 0;
+    pg_node_t *pg_node = 0;
+
+    if (h->protocol.type == PG_EDIT_FIXED)
+      {
+	u16 t = *(u16 *) h->protocol.values[PG_EDIT_LO];
+	pi = ppp_get_protocol_info (pm, clib_net_to_host_u16 (t));
+	if (pi && pi->node_index != ~0)
+	  pg_node = pg_get_node (pi->node_index);
+      }
+
+    if (pg_node && pg_node->unformat_edit
+	&& unformat_user (input, pg_node->unformat_edit, s))
+      ;
+
+    else if (!unformat_user (input, unformat_pg_payload, s))
+      goto done;
+  }
+
+  error = 0;
+done:
+  if (error)
+    pg_free_edit_group (s);
+  return error == 0;
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ppp/ppp.c b/src/vnet/ppp/ppp.c
new file mode 100644
index 00000000..a0eefbad
--- /dev/null
+++ b/src/vnet/ppp/ppp.c
@@ -0,0 +1,261 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ppp.c: ppp support
+ *
+ * Copyright (c) 2010 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/ppp/ppp.h>
+
+/* Global main structure. */
+ppp_main_t ppp_main;
+
+u8 *
+format_ppp_protocol (u8 * s, va_list * args)
+{
+  ppp_protocol_t p = va_arg (*args, u32);
+  ppp_main_t *pm = &ppp_main;
+  ppp_protocol_info_t *pi = ppp_get_protocol_info (pm, p);
+
+  if (pi)
+    s = format (s, "%s", pi->name);
+  else
+    s = format (s, "0x%04x", p);
+
+  return s;
+}
+
+u8 *
+format_ppp_header_with_length (u8 * s, va_list * args)
+{
+  ppp_main_t *pm = &ppp_main;
+  ppp_header_t *h = va_arg (*args, ppp_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+  ppp_protocol_t p = clib_net_to_host_u16 (h->protocol);
+  uword indent, header_bytes;
+
+  header_bytes = sizeof (h[0]);
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    return format (s, "ppp header truncated");
+
+  indent = format_get_indent (s);
+
+  s = format (s, "PPP %U", format_ppp_protocol, p);
+
+  if (h->address != 0xff)
+    s = format (s, ", address 0x%02x", h->address);
+  if (h->control != 0x03)
+    s = format (s, ", control 0x%02x", h->control);
+
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    {
+      ppp_protocol_info_t *pi = ppp_get_protocol_info (pm, p);
+      vlib_node_t *node = vlib_get_node (pm->vlib_main, pi->node_index);
+      if (node->format_buffer)
+	s = format (s, "\n%U%U",
+		    format_white_space, indent,
+		    node->format_buffer, (void *) (h + 1),
+		    max_header_bytes - header_bytes);
+    }
+
+  return s;
+}
+
+u8 *
+format_ppp_header (u8 * s, va_list * args)
+{
+  ppp_header_t *h = va_arg (*args, ppp_header_t *);
+  return format (s, "%U", format_ppp_header_with_length, h, 0);
+}
+
+/* Returns ppp protocol as an int in host byte order. */
+uword
+unformat_ppp_protocol_host_byte_order (unformat_input_t * input,
+				       va_list * args)
+{
+  u16 *result = va_arg (*args, u16 *);
+  ppp_main_t *pm = &ppp_main;
+  int p, i;
+
+  /* Numeric type. */
+  if (unformat (input, "0x%x", &p) || unformat (input, "%d", &p))
+    {
+      if (p >= (1 << 16))
+	return 0;
+      *result = p;
+      return 1;
+    }
+
+  /* Named type. */
+  if (unformat_user (input, unformat_vlib_number_by_name,
+		     pm->protocol_info_by_name, &i))
+    {
+      ppp_protocol_info_t *pi = vec_elt_at_index (pm->protocol_infos, i);
+      *result = pi->protocol;
+      return 1;
+    }
+
+  return 0;
+}
+
+uword
+unformat_ppp_protocol_net_byte_order (unformat_input_t * input,
+				      va_list * args)
+{
+  u16 *result = va_arg (*args, u16 *);
+  if (!unformat_user (input, unformat_ppp_protocol_host_byte_order, result))
+    return 0;
+  *result = clib_host_to_net_u16 ((u16) * result);
+  return 1;
+}
+
+uword
+unformat_ppp_header (unformat_input_t * input, va_list * args)
+{
+  u8 **result = va_arg (*args, u8 **);
+  ppp_header_t _h, *h = &_h;
+  u16 p;
+
+  if (!unformat (input, "%U", unformat_ppp_protocol_host_byte_order, &p))
+    return 0;
+
+  h->address = 0xff;
+  h->control = 0x03;
+  h->protocol = clib_host_to_net_u16 (p);
+
+  /* Add header to result. */
+  {
+    void *p;
+    u32 n_bytes = sizeof (h[0]);
+
+    vec_add2 (*result, p, n_bytes);
+    clib_memcpy (p, h, n_bytes);
+  }
+
+  return 1;
+}
+
+static u8 *
+ppp_build_rewrite (vnet_main_t * vnm,
+		   u32 sw_if_index,
+		   vnet_link_t link_type, const void *dst_hw_address)
+{
+  ppp_header_t *h;
+  u8 *rewrite = NULL;
+  ppp_protocol_t protocol;
+
+  switch (link_type)
+    {
+#define _(a,b) case VNET_LINK_##a: protocol = PPP_PROTOCOL_##b; break
+      _(IP4, ip4);
+      _(IP6, ip6);
+      _(MPLS, mpls_unicast);
+#undef _
+    default:
+      return (NULL);
+    }
+
+  vec_validate (rewrite, sizeof (*h) - 1);
+  h = (ppp_header_t *) rewrite;
+  h->address = 0xff;
+  h->control = 0x03;
+  h->protocol = clib_host_to_net_u16 (protocol);
+
+  return (rewrite);
+}
+
+/* *INDENT-OFF* */
+VNET_HW_INTERFACE_CLASS (ppp_hw_interface_class) = {
+  .name = "PPP",
+  .format_header = format_ppp_header_with_length,
+  .unformat_header = unformat_ppp_header,
+  .build_rewrite = ppp_build_rewrite,
+  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
+};
+/* *INDENT-ON* */
+
+static void
+add_protocol (ppp_main_t * pm, ppp_protocol_t protocol, char *protocol_name)
+{
+  ppp_protocol_info_t *pi;
+  u32 i;
+
+  vec_add2 (pm->protocol_infos, pi, 1);
+  i = pi - pm->protocol_infos;
+
+  pi->name = protocol_name;
+  pi->protocol = protocol;
+  pi->next_index = pi->node_index = ~0;
+
+  hash_set (pm->protocol_info_by_protocol, protocol, i);
+  hash_set_mem (pm->protocol_info_by_name, pi->name, i);
+}
+
+static clib_error_t *
+ppp_init (vlib_main_t * vm)
+{
+  ppp_main_t *pm = &ppp_main;
+
+  memset (pm, 0, sizeof (pm[0]));
+  pm->vlib_main = vm;
+
+  pm->protocol_info_by_name = hash_create_string (0, sizeof (uword));
+  pm->protocol_info_by_protocol = hash_create (0, sizeof (uword));
+
+#define _(n,s) add_protocol (pm, PPP_PROTOCOL_##s, #s);
+  foreach_ppp_protocol;
+#undef _
+
+  return vlib_call_init_function (vm, ppp_input_init);
+}
+
+VLIB_INIT_FUNCTION (ppp_init);
+
+ppp_main_t *
+ppp_get_main (vlib_main_t * vm)
+{
+  vlib_call_init_function (vm, ppp_init);
+  return &ppp_main;
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ppp/ppp.h b/src/vnet/ppp/ppp.h
new file mode 100644
index 00000000..fdc205b6
--- /dev/null
+++ b/src/vnet/ppp/ppp.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ppp.h: types/functions for ppp.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_ppp_h
+#define included_ppp_h
+
+#include <vnet/vnet.h>
+#include <vnet/ppp/packet.h>
+#include <vnet/pg/pg.h>
+
+extern vnet_hw_interface_class_t ppp_hw_interface_class;
+
+typedef enum
+{
+#define ppp_error(n,s) PPP_ERROR_##n,
+#include <vnet/ppp/error.def>
+#undef ppp_error
+  PPP_N_ERROR,
+} ppp_error_t;
+
+typedef struct
+{
+  /* Name (a c string). */
+  char *name;
+
+  /* PPP protocol type in host byte order. */
+  ppp_protocol_t protocol;
+
+  /* Node which handles this type. */
+  u32 node_index;
+
+  /* Next index for this type. */
+  u32 next_index;
+} ppp_protocol_info_t;
+
+typedef struct
+{
+  vlib_main_t *vlib_main;
+
+  ppp_protocol_info_t *protocol_infos;
+
+  /* Hash tables mapping name/protocol to protocol info index. */
+  uword *protocol_info_by_name, *protocol_info_by_protocol;
+} ppp_main_t;
+
+always_inline ppp_protocol_info_t *
+ppp_get_protocol_info (ppp_main_t * em, ppp_protocol_t protocol)
+{
+  uword *p = hash_get (em->protocol_info_by_protocol, protocol);
+  return p ? vec_elt_at_index (em->protocol_infos, p[0]) : 0;
+}
+
+extern ppp_main_t ppp_main;
+
+/* Register given node index to take input for given ppp type. */
+void
+ppp_register_input_type (vlib_main_t * vm,
+			 ppp_protocol_t protocol, u32 node_index);
+
+void ppp_set_adjacency (vnet_rewrite_header_t * rw,
+			uword max_data_bytes, ppp_protocol_t protocol);
+
+format_function_t format_ppp_protocol;
+format_function_t format_ppp_header;
+format_function_t format_ppp_header_with_length;
+
+/* Parse ppp protocol as 0xXXXX or protocol name.
+   In either host or network byte order. */
+unformat_function_t unformat_ppp_protocol_host_byte_order;
+unformat_function_t unformat_ppp_protocol_net_byte_order;
+
+/* Parse ppp header. */
+unformat_function_t unformat_ppp_header;
+unformat_function_t unformat_pg_ppp_header;
+
+always_inline void
+ppp_setup_node (vlib_main_t * vm, u32 node_index)
+{
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  pg_node_t *pn = pg_get_node (node_index);
+
+  n->format_buffer = format_ppp_header_with_length;
+  n->unformat_buffer = unformat_ppp_header;
+  pn->unformat_edit = unformat_pg_ppp_header;
+}
+
+void
+ppp_register_input_protocol (vlib_main_t * vm,
+			     ppp_protocol_t protocol, u32 node_index);
+
+#endif /* included_ppp_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/replication.c b/src/vnet/replication.c
new file mode 100644
index 00000000..561c86cd
--- /dev/null
+++ b/src/vnet/replication.c
@@ -0,0 +1,293 @@
+/*
+ * replication.c : packet replication
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vppinfra/error.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/replication.h>
+
+
+replication_main_t replication_main;
+
+
+replication_context_t *
+replication_prep (vlib_main_t * vm,
+		  vlib_buffer_t * b0, u32 recycle_node_index, u32 l2_packet)
+{
+  replication_main_t *rm = &replication_main;
+  replication_context_t *ctx;
+  uword cpu_number = vm->cpu_index;
+  ip4_header_t *ip;
+  u32 ctx_id;
+
+  /* Allocate a context, reserve context 0 */
+  if (PREDICT_FALSE (rm->contexts[cpu_number] == 0))
+    pool_get_aligned (rm->contexts[cpu_number], ctx, CLIB_CACHE_LINE_BYTES);
+
+  pool_get_aligned (rm->contexts[cpu_number], ctx, CLIB_CACHE_LINE_BYTES);
+  ctx_id = ctx - rm->contexts[cpu_number];
+
+  /* Save state from vlib buffer */
+  ctx->saved_free_list_index = b0->free_list_index;
+  ctx->current_data = b0->current_data;
+
+  /* Set up vlib buffer hooks */
+  b0->recycle_count = ctx_id;
+  b0->free_list_index = rm->recycle_list_index;
+  b0->flags |= VLIB_BUFFER_RECYCLE;
+
+  /* Save feature state */
+  ctx->recycle_node_index = recycle_node_index;
+
+  /* Save vnet state */
+  clib_memcpy (ctx->vnet_buffer, vnet_buffer (b0),
+	       sizeof (vnet_buffer_opaque_t));
+
+  /* Save packet contents */
+  ctx->l2_packet = l2_packet;
+  ip = (ip4_header_t *) vlib_buffer_get_current (b0);
+  if (l2_packet)
+    {
+      /* Save ethernet header */
+      ctx->l2_header[0] = ((u64 *) ip)[0];
+      ctx->l2_header[1] = ((u64 *) ip)[1];
+      ctx->l2_header[2] = ((u64 *) ip)[2];
+      /* set ip to the true ip header */
+      ip = (ip4_header_t *) (((u8 *) ip) + vnet_buffer (b0)->l2.l2_len);
+    }
+
+  /*
+   * Copy L3 fields.
+   * We need to save TOS for ip4 and ip6 packets.
+   * Fortunately the TOS field is
+   * in the first two bytes of both the ip4 and ip6 headers.
+   */
+  ctx->ip_tos = *((u16 *) (ip));
+
+  /*
+   * Save the ip4 checksum as well. We just blindly save the corresponding two
+   * bytes even for ip6 packets.
+   */
+  ctx->ip4_checksum = ip->checksum;
+
+  return ctx;
+}
+
+
+replication_context_t *
+replication_recycle (vlib_main_t * vm, vlib_buffer_t * b0, u32 is_last)
+{
+  replication_main_t *rm = &replication_main;
+  replication_context_t *ctx;
+  uword cpu_number = vm->cpu_index;
+  ip4_header_t *ip;
+
+  /* Get access to the replication context */
+  ctx = pool_elt_at_index (rm->contexts[cpu_number], b0->recycle_count);
+
+  /* Restore vnet buffer state */
+  clib_memcpy (vnet_buffer (b0), ctx->vnet_buffer,
+	       sizeof (vnet_buffer_opaque_t));
+
+  /* Restore the packet start (current_data) and length */
+  vlib_buffer_advance (b0, ctx->current_data - b0->current_data);
+
+  /* Restore packet contents */
+  ip = (ip4_header_t *) vlib_buffer_get_current (b0);
+  if (ctx->l2_packet)
+    {
+      /* Restore ethernet header */
+      ((u64 *) ip)[0] = ctx->l2_header[0];
+      ((u64 *) ip)[1] = ctx->l2_header[1];
+      ((u64 *) ip)[2] = ctx->l2_header[2];
+      /* set ip to the true ip header */
+      ip = (ip4_header_t *) (((u8 *) ip) + vnet_buffer (b0)->l2.l2_len);
+    }
+
+  // Restore L3 fields
+  *((u16 *) (ip)) = ctx->ip_tos;
+  ip->checksum = ctx->ip4_checksum;
+
+  if (is_last)
+    {
+      /*
+       * This is the last replication in the list.
+       * Restore original buffer free functionality.
+       */
+      b0->free_list_index = ctx->saved_free_list_index;
+      b0->flags &= ~VLIB_BUFFER_RECYCLE;
+
+      /* Free context back to its pool */
+      pool_put (rm->contexts[cpu_number], ctx);
+    }
+
+  return ctx;
+}
+
+
+
+/*
+ * fish pkts back from the recycle queue/freelist
+ * un-flatten the context chains
+ */
+static void
+replication_recycle_callback (vlib_main_t * vm, vlib_buffer_free_list_t * fl)
+{
+  vlib_frame_t *f = 0;
+  u32 n_left_from;
+  u32 n_left_to_next = 0;
+  u32 n_this_frame = 0;
+  u32 *from;
+  u32 *to_next = 0;
+  u32 bi0, pi0;
+  vlib_buffer_t *b0;
+  int i;
+  replication_main_t *rm = &replication_main;
+  replication_context_t *ctx;
+  u32 feature_node_index = 0;
+  uword cpu_number = vm->cpu_index;
+
+  /*
+   * All buffers in the list are destined to the same recycle node.
+   * Pull the recycle node index from the first buffer.
+   * Note: this could be sped up if the node index were stuffed into
+   * the freelist itself.
+   */
+  if (vec_len (fl->aligned_buffers) > 0)
+    {
+      bi0 = fl->aligned_buffers[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      ctx = pool_elt_at_index (rm->contexts[cpu_number], b0->recycle_count);
+      feature_node_index = ctx->recycle_node_index;
+    }
+  else if (vec_len (fl->unaligned_buffers) > 0)
+    {
+      bi0 = fl->unaligned_buffers[0];
+      b0 = vlib_get_buffer (vm, bi0);
+      ctx = pool_elt_at_index (rm->contexts[cpu_number], b0->recycle_count);
+      feature_node_index = ctx->recycle_node_index;
+    }
+
+  /* aligned, unaligned buffers */
+  for (i = 0; i < 2; i++)
+    {
+      if (i == 0)
+	{
+	  from = fl->aligned_buffers;
+	  n_left_from = vec_len (from);
+	}
+      else
+	{
+	  from = fl->unaligned_buffers;
+	  n_left_from = vec_len (from);
+	}
+
+      while (n_left_from > 0)
+	{
+	  if (PREDICT_FALSE (n_left_to_next == 0))
+	    {
+	      if (f)
+		{
+		  f->n_vectors = n_this_frame;
+		  vlib_put_frame_to_node (vm, feature_node_index, f);
+		}
+
+	      f = vlib_get_frame_to_node (vm, feature_node_index);
+	      to_next = vlib_frame_vector_args (f);
+	      n_left_to_next = VLIB_FRAME_SIZE;
+	      n_this_frame = 0;
+	    }
+
+	  bi0 = from[0];
+	  if (PREDICT_TRUE (n_left_from > 1))
+	    {
+	      pi0 = from[1];
+	      vlib_prefetch_buffer_with_index (vm, pi0, LOAD);
+	    }
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  /* Mark that this buffer was just recycled */
+	  b0->flags |= VLIB_BUFFER_IS_RECYCLED;
+
+#if (CLIB_DEBUG > 0)
+#if DPDK == 0
+	  vlib_buffer_set_known_state (vm, bi0, VLIB_BUFFER_KNOWN_ALLOCATED);
+#endif
+#endif
+
+	  /* If buffer is traced, mark frame as traced */
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    f->flags |= VLIB_FRAME_TRACE;
+
+	  to_next[0] = bi0;
+
+	  from++;
+	  to_next++;
+	  n_this_frame++;
+	  n_left_to_next--;
+	  n_left_from--;
+	}
+    }
+
+  vec_reset_length (fl->aligned_buffers);
+  vec_reset_length (fl->unaligned_buffers);
+
+  if (f)
+    {
+      ASSERT (n_this_frame);
+      f->n_vectors = n_this_frame;
+      vlib_put_frame_to_node (vm, feature_node_index, f);
+    }
+}
+
+clib_error_t *
+replication_init (vlib_main_t * vm)
+{
+  replication_main_t *rm = &replication_main;
+  vlib_buffer_main_t *bm = vm->buffer_main;
+  vlib_buffer_free_list_t *fl;
+  __attribute__ ((unused)) replication_context_t *ctx;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+
+  rm->vlib_main = vm;
+  rm->vnet_main = vnet_get_main ();
+  rm->recycle_list_index =
+    vlib_buffer_create_free_list (vm, 1024 /* fictional */ ,
+				  "replication-recycle");
+
+  fl = pool_elt_at_index (bm->buffer_free_list_pool, rm->recycle_list_index);
+
+  fl->buffers_added_to_freelist_function = replication_recycle_callback;
+
+  /* Verify the replication context is the expected size */
+  ASSERT (sizeof (replication_context_t) == 128);	/* 2 cache lines */
+
+  vec_validate (rm->contexts, tm->n_vlib_mains - 1);
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (replication_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/replication.h b/src/vnet/replication.h
new file mode 100644
index 00000000..5dc554c9
--- /dev/null
+++ b/src/vnet/replication.h
@@ -0,0 +1,136 @@
+/*
+ * replication.h : packet replication
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_replication_h
+#define included_replication_h
+
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/replication.h>
+
+
+typedef struct
+{
+  /* The entire vnet buffer header restored for each replica */
+  u8 vnet_buffer[32];		/* 16B aligned to allow vector unit copy */
+  u8 reserved[32];		/* space for future expansion of vnet buffer header */
+
+  /* feature state used during this replication */
+  u64 feature_replicas;		/* feature's id for its set of replicas */
+  u32 feature_counter;		/* feature's current index into set of replicas */
+  u32 recycle_node_index;	/* feature's recycle node index */
+
+  /*
+   * data saved from the start of replication and restored
+   * at the end of replication
+   */
+  u32 saved_free_list_index;	/* from vlib buffer */
+
+  /* data saved from the original packet and restored for each replica */
+  u64 l2_header[3];		/*  24B (must be at least 22B for l2 packets) */
+  u16 ip_tos;			/* v4 and v6 */
+  u16 ip4_checksum;		/* needed for v4 only */
+
+  /* data saved from the vlib buffer header and restored for each replica */
+  i16 current_data;		/* offset of first byte of packet in packet data */
+  u8 pad[6];			/* to 64B */
+  u8 l2_packet;			/* flag for l2 vs l3 packet data */
+
+} replication_context_t;	/* 128B */
+
+
+typedef struct
+{
+
+  u32 recycle_list_index;
+
+  /* per-thread pools of replication contexts */
+  replication_context_t **contexts;
+
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+
+} replication_main_t;
+
+
+extern replication_main_t replication_main;
+
+
+/* Return 1 if this buffer just came from the replication recycle handler. */
+always_inline u32
+replication_is_recycled (vlib_buffer_t * b0)
+{
+  return b0->flags & VLIB_BUFFER_IS_RECYCLED;
+}
+
+/*
+ * Clear the recycle flag. If buffer came from the replication recycle
+ * handler, this flag must be cleared before the packet is transmitted again.
+ */
+always_inline void
+replication_clear_recycled (vlib_buffer_t * b0)
+{
+  b0->flags &= ~VLIB_BUFFER_IS_RECYCLED;
+}
+
+/*
+ * Return the active replication context if this buffer has
+ * been recycled, otherwise return 0. (Note that this essentially
+ * restricts access to the replication context to the replication
+ * feature's prep and recycle nodes.)
+ */
+always_inline replication_context_t *
+replication_get_ctx (vlib_buffer_t * b0)
+{
+  replication_main_t *rm = &replication_main;
+
+  return replication_is_recycled (b0) ?
+    pool_elt_at_index (rm->contexts[os_get_cpu_number ()],
+		       b0->recycle_count) : 0;
+}
+
+/* Prefetch the replication context for this buffer, if it exists */
+always_inline void
+replication_prefetch_ctx (vlib_buffer_t * b0)
+{
+  replication_context_t *ctx = replication_get_ctx (b0);
+
+  if (ctx)
+    {
+      CLIB_PREFETCH (ctx, (2 * CLIB_CACHE_LINE_BYTES), STORE);
+    }
+}
+
+replication_context_t *replication_prep (vlib_main_t * vm,
+					 vlib_buffer_t * b0,
+					 u32 recycle_node_index,
+					 u32 l2_packet);
+
+replication_context_t *replication_recycle (vlib_main_t * vm,
+					    vlib_buffer_t * b0, u32 is_last);
+
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/rewrite.c b/src/vnet/rewrite.c
new file mode 100644
index 00000000..53d548bc
--- /dev/null
+++ b/src/vnet/rewrite.c
@@ -0,0 +1,329 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * rewrite.c: packet rewrite
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/ip/lookup.h>
+
+void
+vnet_rewrite_copy_slow_path (vnet_rewrite_data_t * p0,
+			     vnet_rewrite_data_t * rw0,
+			     word n_left, uword most_likely_size)
+{
+  uword n_done =
+    round_pow2 (most_likely_size, sizeof (rw0[0])) / sizeof (rw0[0]);
+
+  p0 -= n_done;
+  rw0 -= n_done;
+
+  /* As we enter the cleanup loop, p0 and rw0 point to the last chunk written
+     by the fast path. Hence, the constant 1, which the
+     vnet_rewrite_copy_one macro renders as p0[-1] = rw0[-1]. */
+
+  while (n_left > 0)
+    {
+      vnet_rewrite_copy_one (p0, rw0, 1);
+      p0--;
+      rw0--;
+      n_left--;
+    }
+}
+
+u8 *
+format_vnet_rewrite (u8 * s, va_list * args)
+{
+  vlib_main_t *vm = va_arg (*args, vlib_main_t *);
+  vnet_rewrite_header_t *rw = va_arg (*args, vnet_rewrite_header_t *);
+  u32 max_data_bytes = va_arg (*args, u32);
+  CLIB_UNUSED (uword indent) = va_arg (*args, u32);
+  vnet_main_t *vnm = vnet_get_main ();
+  vlib_node_t *next;
+
+  next = vlib_get_next_node (vm, rw->node_index, rw->next_index);
+
+  if (rw->sw_if_index != ~0)
+    {
+      vnet_sw_interface_t *si;
+      si = vnet_get_sw_interface (vnm, rw->sw_if_index);
+      s = format (s, "%U: ", format_vnet_sw_interface_name, vnm, si);
+    }
+  else
+    s = format (s, "%v: ", next->name);
+
+  /* Format rewrite string. */
+  if (rw->data_bytes > 0)
+
+    s = format (s, "%U",
+		next->format_buffer ? next->format_buffer : format_hex_bytes,
+		rw->data + max_data_bytes - rw->data_bytes, rw->data_bytes);
+
+  return s;
+}
+
+u8 *
+format_vnet_rewrite_header (u8 * s, va_list * args)
+{
+  vlib_main_t *vm = va_arg (*args, vlib_main_t *);
+  vnet_rewrite_header_t *rw = va_arg (*args, vnet_rewrite_header_t *);
+  u8 *packet_data = va_arg (*args, u8 *);
+  u32 packet_data_bytes = va_arg (*args, u32);
+  vlib_node_t *next;
+
+  next = vlib_get_next_node (vm, rw->node_index, rw->next_index);
+
+  /* Format rewrite string. */
+  s = format (s, "%U",
+	      next->format_buffer ? next->format_buffer : format_hex_bytes,
+	      packet_data, packet_data_bytes);
+
+  return s;
+}
+
+uword
+unformat_vnet_rewrite (unformat_input_t * input, va_list * args)
+{
+  vlib_main_t *vm = va_arg (*args, vlib_main_t *);
+  vnet_rewrite_header_t *rw = va_arg (*args, vnet_rewrite_header_t *);
+  u32 max_data_bytes = va_arg (*args, u32);
+  vnet_main_t *vnm = vnet_get_main ();
+  vlib_node_t *next;
+  u32 next_index, sw_if_index, max_packet_bytes, error;
+  u8 *rw_data;
+
+  rw_data = 0;
+  sw_if_index = ~0;
+  max_packet_bytes = ~0;
+  error = 1;
+
+  /* Parse sw interface. */
+  if (unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
+    {
+      vnet_hw_interface_t *hi;
+
+      hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+
+      next_index = hi->output_node_index;
+      max_packet_bytes = hi->max_l3_packet_bytes[VLIB_RX];
+    }
+
+  else if (unformat (input, "%U", unformat_vlib_node, vm, &next_index))
+    ;
+
+  else
+    goto done;
+
+  next = vlib_get_node (vm, next_index);
+
+  if (next->unformat_buffer
+      && unformat_user (input, next->unformat_buffer, &rw_data))
+    ;
+
+  else if (unformat_user (input, unformat_hex_string, &rw_data)
+	   || unformat (input, "0x%U", unformat_hex_string, &rw_data))
+    ;
+
+  else
+    goto done;
+
+  /* Re-write does not fit. */
+  if (vec_len (rw_data) >= max_data_bytes)
+    goto done;
+
+  {
+    u32 tmp;
+
+    if (unformat (input, "mtu %d", &tmp)
+	&& tmp < (1 << BITS (rw->max_l3_packet_bytes)))
+      max_packet_bytes = tmp;
+  }
+
+  error = 0;
+  rw->sw_if_index = sw_if_index;
+  rw->max_l3_packet_bytes = max_packet_bytes;
+  rw->next_index = vlib_node_add_next (vm, rw->node_index, next_index);
+  vnet_rewrite_set_data_internal (rw, max_data_bytes, rw_data,
+				  vec_len (rw_data));
+
+done:
+  vec_free (rw_data);
+  return error == 0;
+}
+
+u32
+vnet_tx_node_index_for_sw_interface (vnet_main_t * vnm, u32 sw_if_index)
+{
+  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  return (hw->output_node_index);
+}
+
+void
+vnet_rewrite_init (vnet_main_t * vnm,
+		   u32 sw_if_index,
+		   u32 this_node, u32 next_node, vnet_rewrite_header_t * rw)
+{
+  rw->sw_if_index = sw_if_index;
+  rw->node_index = this_node;
+  rw->next_index = vlib_node_add_next (vnm->vlib_main, this_node, next_node);
+  rw->max_l3_packet_bytes =
+    vnet_sw_interface_get_mtu (vnm, sw_if_index, VLIB_TX);
+}
+
+void
+vnet_rewrite_for_sw_interface (vnet_main_t * vnm,
+			       vnet_link_t link_type,
+			       u32 sw_if_index,
+			       u32 node_index,
+			       void *dst_address,
+			       vnet_rewrite_header_t * rw,
+			       u32 max_rewrite_bytes)
+{
+
+  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  vnet_hw_interface_class_t *hc =
+    vnet_get_hw_interface_class (vnm, hw->hw_class_index);
+  u8 *rewrite = NULL;
+
+  vnet_rewrite_init (vnm, sw_if_index, node_index,
+		     vnet_tx_node_index_for_sw_interface (vnm, sw_if_index),
+		     rw);
+
+  ASSERT (hc->build_rewrite);
+  rewrite = hc->build_rewrite (vnm, sw_if_index, link_type, dst_address);
+
+  ASSERT (vec_len (rewrite) < max_rewrite_bytes);
+  vnet_rewrite_set_data_internal (rw, max_rewrite_bytes, rewrite,
+				  vec_len (rewrite));
+  vec_free (rewrite);
+}
+
+void
+vnet_rewrite_for_tunnel (vnet_main_t * vnm,
+			 u32 tx_sw_if_index,
+			 u32 rewrite_node_index,
+			 u32 post_rewrite_node_index,
+			 vnet_rewrite_header_t * rw,
+			 u8 * rewrite_data, u32 rewrite_length)
+{
+  ip_adjacency_t *adj = 0;
+  /*
+   * Installed into vnet_buffer(b)->sw_if_index[VLIB_TX] e.g.
+   * by ip4_rewrite_inline. If the post-rewrite node injects into
+   * ipX-forward, this will be interpreted as a FIB number.
+   */
+  rw->sw_if_index = tx_sw_if_index;
+  rw->node_index = rewrite_node_index;
+  rw->next_index = vlib_node_add_next (vnm->vlib_main, rewrite_node_index,
+				       post_rewrite_node_index);
+  rw->max_l3_packet_bytes = (u16) ~ 0;	/* we can't know at this point */
+
+  ASSERT (rewrite_length < sizeof (adj->rewrite_data));
+  /* Leave room for ethernet + VLAN tag */
+  vnet_rewrite_set_data_internal (rw, sizeof (adj->rewrite_data),
+				  rewrite_data, rewrite_length);
+}
+
+void
+serialize_vnet_rewrite (serialize_main_t * m, va_list * va)
+{
+  vnet_rewrite_header_t *rw = va_arg (*va, vnet_rewrite_header_t *);
+  u32 max_data_bytes = va_arg (*va, u32);
+  u8 *p;
+
+  serialize_integer (m, rw->sw_if_index, sizeof (rw->sw_if_index));
+  serialize_integer (m, rw->data_bytes, sizeof (rw->data_bytes));
+  serialize_integer (m, rw->max_l3_packet_bytes,
+		     sizeof (rw->max_l3_packet_bytes));
+  p = serialize_get (m, rw->data_bytes);
+  clib_memcpy (p, vnet_rewrite_get_data_internal (rw, max_data_bytes),
+	       rw->data_bytes);
+}
+
+void
+unserialize_vnet_rewrite (serialize_main_t * m, va_list * va)
+{
+  vnet_rewrite_header_t *rw = va_arg (*va, vnet_rewrite_header_t *);
+  u32 max_data_bytes = va_arg (*va, u32);
+  u8 *p;
+
+  /* It is up to user to fill these in. */
+  rw->node_index = ~0;
+  rw->next_index = ~0;
+
+  unserialize_integer (m, &rw->sw_if_index, sizeof (rw->sw_if_index));
+  unserialize_integer (m, &rw->data_bytes, sizeof (rw->data_bytes));
+  unserialize_integer (m, &rw->max_l3_packet_bytes,
+		       sizeof (rw->max_l3_packet_bytes));
+  p = unserialize_get (m, rw->data_bytes);
+  clib_memcpy (vnet_rewrite_get_data_internal (rw, max_data_bytes), p,
+	       rw->data_bytes);
+}
+
+u8 *
+vnet_build_rewrite_for_sw_interface (vnet_main_t * vnm,
+				     u32 sw_if_index,
+				     vnet_link_t link_type,
+				     const void *dst_address)
+{
+  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  vnet_hw_interface_class_t *hc =
+    vnet_get_hw_interface_class (vnm, hw->hw_class_index);
+
+  ASSERT (hc->build_rewrite);
+  return (hc->build_rewrite (vnm, sw_if_index, link_type, dst_address));
+}
+
+
+void
+vnet_update_adjacency_for_sw_interface (vnet_main_t * vnm,
+					u32 sw_if_index, u32 ai)
+{
+  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  vnet_hw_interface_class_t *hc =
+    vnet_get_hw_interface_class (vnm, hw->hw_class_index);
+
+  ASSERT (hc->update_adjacency);
+  hc->update_adjacency (vnm, sw_if_index, ai);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/rewrite.h b/src/vnet/rewrite.h
new file mode 100644
index 00000000..00c1efbd
--- /dev/null
+++ b/src/vnet/rewrite.h
@@ -0,0 +1,305 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * rewrite.h: packet rewrite
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vnet_rewrite_h
+#define included_vnet_rewrite_h
+
+#include <vlib/vlib.h>
+#include <vnet/l3_types.h>
+
+/* Consider using vector types for speed? */
+typedef uword vnet_rewrite_data_t;
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  /* Interface to mark re-written packets with. */
+  u32 sw_if_index;
+
+  /* Packet processing node where rewrite happens. */
+  u32 node_index;
+
+  /* Next node to feed after packet rewrite is done. */
+  u16 next_index;
+
+  /* Number of bytes in rewrite data. */
+  u16 data_bytes;
+
+  /* Max packet size layer 3 (MTU) for output interface.
+     Used for MTU check after packet rewrite. */
+  u16 max_l3_packet_bytes;
+
+  /* Rewrite string starting at end and going backwards. */
+  u8 data[0];
+}) vnet_rewrite_header_t;
+/* *INDENT-ON* */
+
+/*
+  Helper macro for declaring rewrite string w/ given max-size.
+
+  Typical usage:
+    typedef struct {
+      //
+      int a, b;
+
+      // Total adjacency is 64 bytes.
+      vnet_rewrite_declare(64 - 2*sizeof(int)) rw;
+    } my_adjacency_t;
+*/
+#define vnet_declare_rewrite(total_bytes)				\
+struct {								\
+  vnet_rewrite_header_t rewrite_header;  			        \
+									\
+  u8 rewrite_data[(total_bytes) - sizeof (vnet_rewrite_header_t)];	\
+}
+
+always_inline void
+vnet_rewrite_clear_data_internal (vnet_rewrite_header_t * rw, int max_size)
+{
+  /* Sanity check values carefully for this memset operation */
+  ASSERT ((max_size > 0) && (max_size < VLIB_BUFFER_PRE_DATA_SIZE));
+
+  rw->data_bytes = 0;
+  memset (rw->data, 0xfe, max_size);
+}
+
+always_inline void
+vnet_rewrite_set_data_internal (vnet_rewrite_header_t * rw,
+				int max_size, void *data, int data_bytes)
+{
+  /* Sanity check values carefully for this memset operation */
+  ASSERT ((max_size > 0) && (max_size < VLIB_BUFFER_PRE_DATA_SIZE));
+  ASSERT ((data_bytes >= 0) && (data_bytes < max_size));
+
+  rw->data_bytes = data_bytes;
+  clib_memcpy (rw->data + max_size - data_bytes, data, data_bytes);
+  memset (rw->data, 0xfe, max_size - data_bytes);
+}
+
+#define vnet_rewrite_set_data(rw,data,data_bytes)		\
+  vnet_rewrite_set_data_internal (&((rw).rewrite_header),	\
+				  sizeof ((rw).rewrite_data),	\
+				  (data),			\
+				  (data_bytes))
+
+always_inline void *
+vnet_rewrite_get_data_internal (vnet_rewrite_header_t * rw, int max_size)
+{
+  ASSERT (rw->data_bytes <= max_size);
+  return rw->data + max_size - rw->data_bytes;
+}
+
+#define vnet_rewrite_get_data(rw) \
+  vnet_rewrite_get_data_internal (&((rw).rewrite_header), sizeof ((rw).rewrite_data))
+
+always_inline void
+vnet_rewrite_copy_one (vnet_rewrite_data_t * p0, vnet_rewrite_data_t * rw0,
+		       int i)
+{
+  p0[-i] = rw0[-i];
+}
+
+void vnet_rewrite_copy_slow_path (vnet_rewrite_data_t * p0,
+				  vnet_rewrite_data_t * rw0,
+				  word n_left, uword most_likely_size);
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u64 a;
+  u32 b;
+  u16 c;
+}) eh_copy_t;
+/* *INDENT-ON* */
+
+always_inline void
+_vnet_rewrite_one_header (vnet_rewrite_header_t * h0,
+			  void *packet0, int max_size, int most_likely_size)
+{
+  vnet_rewrite_data_t *p0 = packet0;
+  vnet_rewrite_data_t *rw0 = (vnet_rewrite_data_t *) (h0->data + max_size);
+  word n_left0;
+
+  /* 0xfefe => poisoned adjacency => crash */
+  ASSERT (h0->data_bytes != 0xfefe);
+
+  if (PREDICT_TRUE (h0->data_bytes == sizeof (eh_copy_t)))
+    {
+      eh_copy_t *s, *d;
+      s = (eh_copy_t *) (h0->data + max_size - sizeof (eh_copy_t));
+      d = (eh_copy_t *) (((u8 *) packet0) - sizeof (eh_copy_t));
+      clib_memcpy (d, s, sizeof (eh_copy_t));
+      return;
+    }
+
+
+#define _(i)								\
+  do {									\
+    if (most_likely_size > ((i)-1)*sizeof (vnet_rewrite_data_t))	\
+      vnet_rewrite_copy_one (p0, rw0, (i));				\
+  } while (0)
+
+  _(4);
+  _(3);
+  _(2);
+  _(1);
+
+#undef _
+
+  n_left0 = (int)
+    (((int) h0->data_bytes - most_likely_size) + (sizeof (rw0[0]) - 1))
+    / (int) sizeof (rw0[0]);
+  if (PREDICT_FALSE (n_left0 > 0))
+    vnet_rewrite_copy_slow_path (p0, rw0, n_left0, most_likely_size);
+}
+
+always_inline void
+_vnet_rewrite_two_headers (vnet_rewrite_header_t * h0,
+			   vnet_rewrite_header_t * h1,
+			   void *packet0,
+			   void *packet1, int max_size, int most_likely_size)
+{
+  vnet_rewrite_data_t *p0 = packet0;
+  vnet_rewrite_data_t *p1 = packet1;
+  vnet_rewrite_data_t *rw0 = (vnet_rewrite_data_t *) (h0->data + max_size);
+  vnet_rewrite_data_t *rw1 = (vnet_rewrite_data_t *) (h1->data + max_size);
+  word n_left0, n_left1;
+  int slow_path;
+
+  /* 0xfefe => poisoned adjacency => crash */
+  ASSERT (h0->data_bytes != 0xfefe);
+  ASSERT (h1->data_bytes != 0xfefe);
+
+  /* Arithmetic calculation: bytes0 == bytes1 == 14 */
+  slow_path = h0->data_bytes ^ h1->data_bytes;
+  slow_path += h0->data_bytes ^ sizeof (eh_copy_t);
+
+  if (PREDICT_TRUE (slow_path == 0))
+    {
+      eh_copy_t *s0, *d0, *s1, *d1;
+      s0 = (eh_copy_t *) (h0->data + max_size - sizeof (eh_copy_t));
+      d0 = (eh_copy_t *) (((u8 *) packet0) - sizeof (eh_copy_t));
+      clib_memcpy (d0, s0, sizeof (eh_copy_t));
+      s1 = (eh_copy_t *) (h1->data + max_size - sizeof (eh_copy_t));
+      d1 = (eh_copy_t *) (((u8 *) packet1) - sizeof (eh_copy_t));
+      clib_memcpy (d1, s1, sizeof (eh_copy_t));
+      return;
+    }
+
+#define _(i)								\
+  do {									\
+    if (most_likely_size > ((i)-1)*sizeof (vnet_rewrite_data_t))	\
+      {									\
+	vnet_rewrite_copy_one (p0, rw0, (i));				\
+	vnet_rewrite_copy_one (p1, rw1, (i));				\
+      }									\
+  } while (0)
+
+  _(4);
+  _(3);
+  _(2);
+  _(1);
+
+#undef _
+
+  n_left0 = (int)
+    (((int) h0->data_bytes - most_likely_size) + (sizeof (rw0[0]) - 1))
+    / (int) sizeof (rw0[0]);
+  n_left1 = (int)
+    (((int) h1->data_bytes - most_likely_size) + (sizeof (rw1[0]) - 1))
+    / (int) sizeof (rw1[0]);
+
+  if (PREDICT_FALSE (n_left0 > 0 || n_left1 > 0))
+    {
+      vnet_rewrite_copy_slow_path (p0, rw0, n_left0, most_likely_size);
+      vnet_rewrite_copy_slow_path (p1, rw1, n_left1, most_likely_size);
+    }
+}
+
+#define vnet_rewrite_one_header(rw0,p0,most_likely_size)	\
+  _vnet_rewrite_one_header (&((rw0).rewrite_header), (p0),	\
+			    sizeof ((rw0).rewrite_data),	\
+			    (most_likely_size))
+
+#define vnet_rewrite_two_headers(rw0,rw1,p0,p1,most_likely_size)	\
+  _vnet_rewrite_two_headers (&((rw0).rewrite_header), &((rw1).rewrite_header), \
+			     (p0), (p1),				\
+			     sizeof ((rw0).rewrite_data),		\
+			     (most_likely_size))
+
+#define VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST ((void *) 0)
+/** Deprecated */
+void vnet_rewrite_for_sw_interface (struct vnet_main_t *vnm,
+				    vnet_link_t packet_type,
+				    u32 sw_if_index,
+				    u32 node_index,
+				    void *dst_address,
+				    vnet_rewrite_header_t * rw,
+				    u32 max_rewrite_bytes);
+
+u32 vnet_tx_node_index_for_sw_interface (struct vnet_main_t *vnm,
+					 u32 sw_if_index);
+
+void vnet_rewrite_init (struct vnet_main_t *vnm,
+			u32 sw_if_index,
+			u32 this_node,
+			u32 next_node, vnet_rewrite_header_t * rw);
+
+u8 *vnet_build_rewrite_for_sw_interface (struct vnet_main_t *vnm,
+					 u32 sw_if_index,
+					 vnet_link_t packet_type,
+					 const void *dst_address);
+void vnet_update_adjacency_for_sw_interface (struct vnet_main_t *vnm,
+					     u32 sw_if_index, u32 ai);
+
+/* Parser for unformat header & rewrite string. */
+unformat_function_t unformat_vnet_rewrite;
+
+format_function_t format_vnet_rewrite;
+format_function_t format_vnet_rewrite_header;
+
+serialize_function_t serialize_vnet_rewrite, unserialize_vnet_rewrite;
+
+#endif /* included_vnet_rewrite_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/snap/node.c b/src/vnet/snap/node.c
new file mode 100644
index 00000000..884ff324
--- /dev/null
+++ b/src/vnet/snap/node.c
@@ -0,0 +1,353 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * snap_node.c: snap packet processing
+ *
+ * Copyright (c) 2010 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/llc/llc.h>
+#include <vnet/snap/snap.h>
+
+typedef enum
+{
+  SNAP_INPUT_NEXT_DROP,
+  SNAP_INPUT_NEXT_PUNT,
+  SNAP_INPUT_NEXT_ETHERNET_TYPE,
+  SNAP_INPUT_N_NEXT,
+} snap_input_next_t;
+
+typedef struct
+{
+  u8 packet_data[32];
+} snap_input_trace_t;
+
+static u8 *
+format_snap_input_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  snap_input_trace_t *t = va_arg (*va, snap_input_trace_t *);
+
+  s = format (s, "%U", format_snap_header, t->packet_data);
+
+  return s;
+}
+
+static uword
+snap_input (vlib_main_t * vm,
+	    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  snap_main_t *sm = &snap_main;
+  u32 n_left_from, next_index, *from, *to_next;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node,
+				   from,
+				   n_left_from,
+				   sizeof (from[0]),
+				   sizeof (snap_input_trace_t));
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  snap_header_t *h0, *h1;
+	  snap_protocol_info_t *pi0, *pi1;
+	  u8 next0, next1, is_ethernet0, is_ethernet1, len0, len1,
+	    enqueue_code;
+	  u32 oui0, oui1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *b2, *b3;
+
+	    b2 = vlib_get_buffer (vm, from[2]);
+	    b3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (b2, LOAD);
+	    vlib_prefetch_buffer_header (b3, LOAD);
+
+	    CLIB_PREFETCH (b2->data, sizeof (h0[0]), LOAD);
+	    CLIB_PREFETCH (b3->data, sizeof (h1[0]), LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  h0 = (void *) (b0->data + b0->current_data);
+	  h1 = (void *) (b1->data + b1->current_data);
+
+	  oui0 = snap_header_get_oui (h0);
+	  oui1 = snap_header_get_oui (h1);
+
+	  is_ethernet0 = oui0 == IEEE_OUI_ethernet;
+	  is_ethernet1 = oui1 == IEEE_OUI_ethernet;
+
+	  len0 = sizeof (h0[0]) - (is_ethernet0 ? sizeof (h0->protocol) : 0);
+	  len1 = sizeof (h1[0]) - (is_ethernet1 ? sizeof (h1->protocol) : 0);
+
+	  b0->current_data += len0;
+	  b1->current_data += len1;
+
+	  b0->current_length -= len0;
+	  b1->current_length -= len1;
+
+	  pi0 = snap_get_protocol_info (sm, h0);
+	  pi1 = snap_get_protocol_info (sm, h1);
+
+	  next0 = pi0 ? pi0->next_index : SNAP_INPUT_NEXT_DROP;
+	  next1 = pi1 ? pi1->next_index : SNAP_INPUT_NEXT_DROP;
+
+	  next0 = is_ethernet0 ? SNAP_INPUT_NEXT_ETHERNET_TYPE : next0;
+	  next1 = is_ethernet1 ? SNAP_INPUT_NEXT_ETHERNET_TYPE : next1;
+
+	  /* In case of error. */
+	  b0->error = node->errors[SNAP_ERROR_UNKNOWN_PROTOCOL];
+	  b1->error = node->errors[SNAP_ERROR_UNKNOWN_PROTOCOL];
+
+	  enqueue_code = (next0 != next_index) + 2 * (next1 != next_index);
+
+	  if (PREDICT_FALSE (enqueue_code != 0))
+	    {
+	      switch (enqueue_code)
+		{
+		case 1:
+		  /* A B A */
+		  to_next[-2] = bi1;
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node, next0, bi0);
+		  break;
+
+		case 2:
+		  /* A A B */
+		  to_next -= 1;
+		  n_left_to_next += 1;
+		  vlib_set_next_frame_buffer (vm, node, next1, bi1);
+		  break;
+
+		case 3:
+		  /* A B B or A B C */
+		  to_next -= 2;
+		  n_left_to_next += 2;
+		  vlib_set_next_frame_buffer (vm, node, next0, bi0);
+		  vlib_set_next_frame_buffer (vm, node, next1, bi1);
+		  if (next0 == next1)
+		    {
+		      vlib_put_next_frame (vm, node, next_index,
+					   n_left_to_next);
+		      next_index = next1;
+		      vlib_get_next_frame (vm, node, next_index, to_next,
+					   n_left_to_next);
+		    }
+		}
+	    }
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  snap_header_t *h0;
+	  snap_protocol_info_t *pi0;
+	  u8 next0, is_ethernet0, len0;
+	  u32 oui0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  h0 = (void *) (b0->data + b0->current_data);
+
+	  oui0 = snap_header_get_oui (h0);
+
+	  is_ethernet0 = oui0 == IEEE_OUI_ethernet;
+
+	  len0 = sizeof (h0[0]) - (is_ethernet0 ? sizeof (h0->protocol) : 0);
+
+	  b0->current_data += len0;
+
+	  b0->current_length -= len0;
+
+	  pi0 = snap_get_protocol_info (sm, h0);
+
+	  next0 = pi0 ? pi0->next_index : SNAP_INPUT_NEXT_DROP;
+
+	  next0 = is_ethernet0 ? SNAP_INPUT_NEXT_ETHERNET_TYPE : next0;
+
+	  /* In case of error. */
+	  b0->error = node->errors[SNAP_ERROR_UNKNOWN_PROTOCOL];
+
+	  /* Sent packet to wrong next? */
+	  if (PREDICT_FALSE (next0 != next_index))
+	    {
+	      /* Return old frame; remove incorrectly enqueued packet. */
+	      vlib_put_next_frame (vm, node, next_index, n_left_to_next + 1);
+
+	      /* Send to correct next. */
+	      next_index = next0;
+	      vlib_get_next_frame (vm, node, next_index,
+				   to_next, n_left_to_next);
+
+	      to_next[0] = bi0;
+	      to_next += 1;
+	      n_left_to_next -= 1;
+	    }
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+static char *snap_error_strings[] = {
+#define _(f,s) s,
+  foreach_snap_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (snap_input_node) = {
+  .function = snap_input,
+  .name = "snap-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .n_errors = SNAP_N_ERROR,
+  .error_strings = snap_error_strings,
+
+  .n_next_nodes = SNAP_INPUT_N_NEXT,
+  .next_nodes = {
+    [SNAP_INPUT_NEXT_DROP] = "error-drop",
+    [SNAP_INPUT_NEXT_PUNT] = "error-punt",
+    [SNAP_INPUT_NEXT_ETHERNET_TYPE] = "ethernet-input-type",
+  },
+
+  .format_buffer = format_snap_header_with_length,
+  .format_trace = format_snap_input_trace,
+  .unformat_buffer = unformat_snap_header,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+snap_input_init (vlib_main_t * vm)
+{
+  {
+    clib_error_t *error = vlib_call_init_function (vm, snap_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  snap_setup_node (vm, snap_input_node.index);
+
+  llc_register_input_protocol (vm, LLC_PROTOCOL_snap, snap_input_node.index);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (snap_input_init);
+
+void
+snap_register_input_protocol (vlib_main_t * vm,
+			      char *name,
+			      u32 ieee_oui, u16 protocol, u32 node_index)
+{
+  snap_main_t *sm = &snap_main;
+  snap_protocol_info_t *pi;
+  snap_header_t h;
+  snap_oui_and_protocol_t key;
+
+  {
+    clib_error_t *error = vlib_call_init_function (vm, snap_input_init);
+    if (error)
+      clib_error_report (error);
+  }
+
+  h.protocol = clib_host_to_net_u16 (protocol);
+  h.oui[0] = (ieee_oui >> 16) & 0xff;
+  h.oui[1] = (ieee_oui >> 8) & 0xff;
+  h.oui[2] = (ieee_oui >> 0) & 0xff;
+  pi = snap_get_protocol_info (sm, &h);
+  if (pi)
+    return;
+
+  vec_add2 (sm->protocols, pi, 1);
+
+  pi->name = format (0, "%s", name);
+  pi->node_index = node_index;
+  pi->next_index = vlib_node_add_next (vm, snap_input_node.index, node_index);
+
+  key.oui = ieee_oui;
+  key.protocol = clib_host_to_net_u16 (protocol);
+
+  mhash_set (&sm->protocol_hash, &key, pi - sm->protocols, /* old_value */ 0);
+  hash_set_mem (sm->protocol_info_by_name, name, pi - sm->protocols);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/snap/pg.c b/src/vnet/snap/pg.c
new file mode 100644
index 00000000..aad125f3
--- /dev/null
+++ b/src/vnet/snap/pg.c
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * snap_pg.c: packet generator snap interface
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/snap/snap.h>
+
+typedef struct
+{
+  pg_edit_t oui;
+  pg_edit_t protocol;
+} pg_snap_header_t;
+
+static inline void
+pg_snap_header_init (pg_snap_header_t * e)
+{
+  pg_edit_init (&e->oui, snap_header_t, oui);
+  pg_edit_init (&e->protocol, snap_header_t, protocol);
+}
+
+uword
+unformat_pg_snap_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  pg_snap_header_t *h;
+  u32 group_index, error;
+
+  h = pg_create_edit_group (s, sizeof (h[0]), sizeof (snap_header_t),
+			    &group_index);
+  pg_snap_header_init (h);
+
+  error = 1;
+  if (!unformat (input, "%U -> %U",
+		 unformat_pg_edit,
+		 unformat_snap_protocol, &h->oui, &h->protocol))
+    goto done;
+
+  {
+    snap_main_t *pm = &snap_main;
+    snap_protocol_info_t *pi = 0;
+    pg_node_t *pg_node = 0;
+
+    if (h->oui.type == PG_EDIT_FIXED && h->protocol.type == PG_EDIT_FIXED)
+      {
+	u8 *o = h->oui.values[PG_EDIT_LO];
+	u8 *p = h->protocol.values[PG_EDIT_LO];
+	snap_header_t h;
+
+	h.oui[0] = o[0];
+	h.oui[1] = o[1];
+	h.oui[2] = o[2];
+	h.protocol = *(u16 *) p;
+	pi = snap_get_protocol_info (pm, &h);
+	if (pi && pi->node_index != ~0)
+	  pg_node = pg_get_node (pi->node_index);
+      }
+
+    if (pg_node && pg_node->unformat_edit
+	&& unformat_user (input, pg_node->unformat_edit, s))
+      ;
+
+    else if (!unformat_user (input, unformat_pg_payload, s))
+      goto done;
+  }
+
+  error = 0;
+done:
+  if (error)
+    pg_free_edit_group (s);
+  return error == 0;
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/snap/snap.c b/src/vnet/snap/snap.c
new file mode 100644
index 00000000..64482bfc
--- /dev/null
+++ b/src/vnet/snap/snap.c
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * snap.c: snap support
+ *
+ * Copyright (c) 2010 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/snap/snap.h>
+#include <vnet/ethernet/ethernet.h>
+
+/* Global main structure. */
+snap_main_t snap_main;
+
+static u8 *
+format_cisco_snap_protocol (u8 * s, va_list * args)
+{
+  snap_header_t *h = va_arg (*args, snap_header_t *);
+  u16 protocol = clib_net_to_host_u16 (h->protocol);
+  char *t = 0;
+  switch (protocol)
+    {
+#define _(n,f) case n: t = #f; break;
+      foreach_snap_cisco_protocol;
+#undef _
+    default:
+      break;
+    }
+  if (t)
+    return format (s, "%s", t);
+  else
+    return format (s, "unknown 0x%x", protocol);
+}
+
+u8 *
+format_snap_protocol (u8 * s, va_list * args)
+{
+  snap_header_t *h = va_arg (*args, snap_header_t *);
+  u32 oui = snap_header_get_oui (h);
+  u16 protocol = clib_net_to_host_u16 (h->protocol);
+
+  switch (oui)
+    {
+    case IEEE_OUI_ethernet:
+      return format (s, "ethernet %U", format_ethernet_type, h->protocol);
+
+    case IEEE_OUI_cisco:
+      return format (s, "cisco %U", format_cisco_snap_protocol, h);
+
+    default:
+      return format (s, "oui 0x%06x 0x%04x", oui, protocol);
+    }
+}
+
+u8 *
+format_snap_header_with_length (u8 * s, va_list * args)
+{
+  snap_main_t *sm = &snap_main;
+  snap_header_t *h = va_arg (*args, snap_header_t *);
+  snap_protocol_info_t *pi = snap_get_protocol_info (sm, h);
+  u32 max_header_bytes = va_arg (*args, u32);
+  uword indent, header_bytes;
+
+  header_bytes = sizeof (h[0]);
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    return format (s, "snap header truncated");
+
+  indent = format_get_indent (s);
+
+  s = format (s, "SNAP %U", format_snap_protocol, h);
+
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes && pi != 0)
+    {
+      vlib_node_t *node = vlib_get_node (sm->vlib_main, pi->node_index);
+      if (node->format_buffer)
+	s = format (s, "\n%U%U",
+		    format_white_space, indent,
+		    node->format_buffer, (void *) (h + 1),
+		    max_header_bytes - header_bytes);
+    }
+
+  return s;
+}
+
+u8 *
+format_snap_header (u8 * s, va_list * args)
+{
+  snap_header_t *h = va_arg (*args, snap_header_t *);
+  return format (s, "%U", format_snap_header_with_length, h, 0);
+}
+
+/* Returns snap protocol as an int in host byte order. */
+uword
+unformat_snap_protocol (unformat_input_t * input, va_list * args)
+{
+  snap_header_t *result = va_arg (*args, snap_header_t *);
+  snap_main_t *sm = &snap_main;
+  snap_oui_and_protocol_t p;
+  u32 i;
+
+  /* Numeric type. */
+  if (unformat (input, "0x%x 0x%x", &p.oui, &p.protocol))
+    {
+      if (p.oui >= (1 << 24))
+	return 0;
+      if (p.protocol >= (1 << 16))
+	return 0;
+    }
+
+  /* Named type. */
+  else if (unformat_user (input, unformat_vlib_number_by_name,
+			  sm->protocol_info_by_name, &i))
+    {
+      snap_protocol_info_t *pi = vec_elt_at_index (sm->protocols, i);
+      p = pi->oui_and_protocol;
+    }
+
+  else
+    return 0;
+
+  snap_header_set_protocol (result, &p);
+  return 1;
+}
+
+uword
+unformat_snap_header (unformat_input_t * input, va_list * args)
+{
+  u8 **result = va_arg (*args, u8 **);
+  snap_header_t _h, *h = &_h;
+
+  if (!unformat (input, "%U", unformat_snap_protocol, h))
+    return 0;
+
+  /* Add header to result. */
+  {
+    void *p;
+    u32 n_bytes = sizeof (h[0]);
+
+    vec_add2 (*result, p, n_bytes);
+    clib_memcpy (p, h, n_bytes);
+  }
+
+  return 1;
+}
+
+static clib_error_t *
+snap_init (vlib_main_t * vm)
+{
+  snap_main_t *sm = &snap_main;
+
+  memset (sm, 0, sizeof (sm[0]));
+  sm->vlib_main = vm;
+
+  mhash_init (&sm->protocol_hash, sizeof (uword),
+	      sizeof (snap_oui_and_protocol_t));
+
+  sm->protocol_info_by_name
+    = hash_create_string ( /* elts */ 0, sizeof (uword));
+
+  return vlib_call_init_function (vm, snap_input_init);
+}
+
+VLIB_INIT_FUNCTION (snap_init);
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/snap/snap.h b/src/vnet/snap/snap.h
new file mode 100644
index 00000000..dbba15bf
--- /dev/null
+++ b/src/vnet/snap/snap.h
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * snap.h: SNAP definitions
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_snap_h
+#define included_snap_h
+
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+
+#define foreach_ieee_oui			\
+  _ (0x000000, ethernet)			\
+  _ (0x00000c, cisco)
+
+typedef enum
+{
+#define _(n,f) IEEE_OUI_##f = n,
+  foreach_ieee_oui
+#undef _
+} ieee_oui_t;
+
+#define foreach_snap_cisco_protocol		\
+  _ (0x0102, drip)				\
+  _ (0x0104, port_aggregation_protocol)		\
+  _ (0x0105, mls_hello)				\
+  _ (0x010b, per_vlan_spanning_tree)		\
+  _ (0x010c, vlan_bridge)			\
+  _ (0x0111, unidirectional_link_detection)	\
+  _ (0x2000, cdp)				\
+  _ (0x2001, cgmp)				\
+  _ (0x2003, vtp)				\
+  _ (0x2004, dtp)				\
+  _ (0x200a, stp_uplink_fast)
+
+typedef enum
+{
+#define _(n,f) SNAP_cisco_##f = n,
+  foreach_snap_cisco_protocol
+#undef _
+} snap_cisco_protocol_t;
+
+typedef union
+{
+  /* *INDENT-OFF* */
+  CLIB_PACKED (struct {
+    /* OUI: organization unique identifier. */
+    u8 oui[3];
+
+    /* Per-OUI protocol. */
+    u16 protocol;
+  });
+  /* *INDENT-ON* */
+
+  u8 as_u8[5];
+} snap_header_t;
+
+typedef struct
+{
+  u32 oui;
+  u32 protocol;
+} snap_oui_and_protocol_t;
+
+typedef struct
+{
+  /* Name vector string. */
+  u8 *name;
+
+  snap_oui_and_protocol_t oui_and_protocol;
+
+  /* Node which handles this type. */
+  u32 node_index;
+
+  /* snap-input next index for this type. */
+  u32 next_index;
+} snap_protocol_info_t;
+
+always_inline void
+snap_header_set_protocol (snap_header_t * h, snap_oui_and_protocol_t * p)
+{
+  u16 protocol = p->protocol;
+  u32 oui = p->oui;
+  h->protocol = clib_host_to_net_u16 (protocol);
+  h->oui[0] = (oui >> 16) & 0xff;
+  h->oui[1] = (oui >> 8) & 0xff;
+  h->oui[2] = (oui >> 0) & 0xff;
+}
+
+#define foreach_snap_error			\
+  _ (NONE, "no error")				\
+  _ (UNKNOWN_PROTOCOL, "unknown oui/snap protocol")
+
+typedef enum
+{
+#define _(f,s) SNAP_ERROR_##f,
+  foreach_snap_error
+#undef _
+    SNAP_N_ERROR,
+} snap_error_t;
+
+typedef struct
+{
+  vlib_main_t *vlib_main;
+
+  /* Vector of known SNAP oui/protocol pairs. */
+  snap_protocol_info_t *protocols;
+
+  /* Hash table mapping oui/protocol to protocol index. */
+  mhash_t protocol_hash;
+
+  /* Hash table mapping protocol by name. */
+  uword *protocol_info_by_name;
+} snap_main_t;
+
+always_inline u32
+snap_header_get_oui (snap_header_t * h)
+{
+  return (h->oui[0] << 16) | (h->oui[1] << 8) | h->oui[2];
+}
+
+always_inline snap_protocol_info_t *
+snap_get_protocol_info (snap_main_t * sm, snap_header_t * h)
+{
+  snap_oui_and_protocol_t key;
+  uword *p;
+
+  key.oui = snap_header_get_oui (h);
+  key.protocol = h->protocol;
+
+  p = mhash_get (&sm->protocol_hash, &key);
+  return p ? vec_elt_at_index (sm->protocols, p[0]) : 0;
+}
+
+snap_main_t snap_main;
+
+/* Register given node index to take input for given snap type. */
+void
+snap_register_input_protocol (vlib_main_t * vm,
+			      char *name,
+			      u32 ieee_oui, u16 protocol, u32 node_index);
+
+void snap_set_adjacency (vnet_rewrite_header_t * rw,
+			 uword max_data_bytes, u32 ieee_oui, u16 protocol);
+
+format_function_t format_snap_protocol;
+format_function_t format_snap_header;
+format_function_t format_snap_header_with_length;
+
+/* Parse snap protocol as 0xXXXX or protocol name. */
+unformat_function_t unformat_snap_protocol;
+
+/* Parse snap header. */
+unformat_function_t unformat_snap_header;
+unformat_function_t unformat_pg_snap_header;
+
+always_inline void
+snap_setup_node (vlib_main_t * vm, u32 node_index)
+{
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  pg_node_t *pn = pg_get_node (node_index);
+
+  n->format_buffer = format_snap_header_with_length;
+  n->unformat_buffer = unformat_snap_header;
+  pn->unformat_edit = unformat_pg_snap_header;
+}
+
+#endif /* included_snap_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/span/node.c b/src/vnet/span/node.c
new file mode 100644
index 00000000..50d642c2
--- /dev/null
+++ b/src/vnet/span/node.c
@@ -0,0 +1,286 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vppinfra/error.h>
+
+#include <vnet/span/span.h>
+
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+
+vlib_node_registration_t span_node;
+
+/* packet trace format function */
+u8 *
+format_span_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  span_trace_t *t = va_arg (*args, span_trace_t *);
+
+  vnet_main_t *vnm = &vnet_main;
+  s = format (s, "SPAN: mirrored %U -> %U",
+	      format_vnet_sw_if_index_name, vnm, t->src_sw_if_index,
+	      format_vnet_sw_if_index_name, vnm, t->mirror_sw_if_index);
+
+  return s;
+}
+
+#define foreach_span_error                      \
+_(HITS, "SPAN incomming packets processed")
+
+typedef enum
+{
+#define _(sym,str) SPAN_ERROR_##sym,
+  foreach_span_error
+#undef _
+    SPAN_N_ERROR,
+} span_error_t;
+
+static char *span_error_strings[] = {
+#define _(sym,string) string,
+  foreach_span_error
+#undef _
+};
+
+static_always_inline void
+span_mirror (vlib_main_t * vm, span_interface_t * si0, vlib_buffer_t * b0,
+	     vlib_frame_t ** mirror_frames, int is_rx)
+{
+  vlib_buffer_t *c0;
+  vnet_main_t *vnm = &vnet_main;
+  u32 *to_mirror_next = 0;
+  u32 i;
+
+  if (is_rx != 0 && si0->num_rx_mirror_ports == 0)
+    return;
+
+  if (is_rx == 0 && si0->num_tx_mirror_ports == 0)
+    return;
+
+  /* Don't do it again */
+  if (PREDICT_FALSE (b0->flags & VNET_BUFFER_SPAN_CLONE))
+    return;
+
+  /* *INDENT-OFF* */
+  clib_bitmap_foreach (i, is_rx ? si0->rx_mirror_ports : si0->tx_mirror_ports, (
+    {
+      if (mirror_frames[i] == 0)
+	mirror_frames[i] = vnet_get_frame_to_sw_interface (vnm, i);
+      to_mirror_next = vlib_frame_vector_args (mirror_frames[i]);
+      to_mirror_next += mirror_frames[i]->n_vectors;
+      c0 = vlib_buffer_copy (vm, b0);
+      vnet_buffer (c0)->sw_if_index[VLIB_TX] = i;
+      c0->flags |= VNET_BUFFER_SPAN_CLONE;
+      to_mirror_next[0] = vlib_get_buffer_index (vm, c0);
+      mirror_frames[i]->n_vectors++;
+    }));
+  /* *INDENT-ON* */
+}
+
+static_always_inline uword
+span_node_inline_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+		     vlib_frame_t * frame, int is_rx)
+{
+  span_main_t *sm = &span_main;
+  vnet_main_t *vnm = &vnet_main;
+  u32 n_left_from, *from, *to_next;
+  u32 n_span_packets = 0;
+  u32 next_index;
+  u32 sw_if_index;
+  static __thread vlib_frame_t **mirror_frames = 0;
+  vlib_rx_or_tx_t rxtx = is_rx ? VLIB_RX : VLIB_TX;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  vec_validate_aligned (mirror_frames, sm->max_sw_if_index,
+			CLIB_CACHE_LINE_BYTES);
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0;
+	  u32 bi1;
+	  vlib_buffer_t *b0;
+	  vlib_buffer_t *b1;
+	  span_interface_t *si0, *si1;
+	  u32 sw_if_index0;
+	  u32 next0 = 0;
+	  u32 sw_if_index1;
+	  u32 next1 = 0;
+
+	  /* speculatively enqueue b0, b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  from += 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[rxtx];
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[rxtx];
+	  si0 = vec_elt_at_index (sm->interfaces, sw_if_index0);
+	  si1 = vec_elt_at_index (sm->interfaces, sw_if_index1);
+
+	  span_mirror (vm, si0, b0, mirror_frames, is_rx);
+	  span_mirror (vm, si1, b1, mirror_frames, is_rx);
+
+	  vnet_feature_next (sw_if_index0, &next0, b0);
+	  vnet_feature_next (sw_if_index1, &next1, b1);
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      span_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->src_sw_if_index = sw_if_index0;
+	      //t->mirror_sw_if_index = si0->mirror_sw_if_index;
+	    }
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      span_trace_t *t = vlib_add_trace (vm, node, b1, sizeof (*t));
+	      t->src_sw_if_index = sw_if_index1;
+	      //t->mirror_sw_if_index = si1->mirror_sw_if_index;
+	    }
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  span_interface_t *si0;
+	  u32 sw_if_index0;
+	  u32 next0 = 0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  from += 1;
+	  n_left_from -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[rxtx];
+	  si0 = vec_elt_at_index (sm->interfaces, sw_if_index0);
+	  span_mirror (vm, si0, b0, mirror_frames, is_rx);
+
+	  vnet_feature_next (sw_if_index0, &next0, b0);
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      span_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->src_sw_if_index = sw_if_index0;
+	    }
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+
+  for (sw_if_index = 0; sw_if_index < vec_len (mirror_frames); sw_if_index++)
+    {
+      if (mirror_frames[sw_if_index] == 0)
+	continue;
+
+      vnet_put_frame_to_sw_interface (vnm, sw_if_index,
+				      mirror_frames[sw_if_index]);
+      mirror_frames[sw_if_index] = 0;
+    }
+  vlib_node_increment_counter (vm, span_node.index, SPAN_ERROR_HITS,
+			       n_span_packets);
+
+  return frame->n_vectors;
+}
+
+static uword
+span_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+		    vlib_frame_t * frame)
+{
+  return span_node_inline_fn (vm, node, frame, 1);
+}
+
+static uword
+span_output_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
+		     vlib_frame_t * frame)
+{
+  return span_node_inline_fn (vm, node, frame, 0);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (span_input_node) = {
+  .function = span_input_node_fn,
+  .name = "span-input",
+  .vector_size = sizeof (u32),
+  .format_trace = format_span_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(span_error_strings),
+  .error_strings = span_error_strings,
+
+  .n_next_nodes = 0,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (span_input_node, span_input_node_fn)
+
+VLIB_REGISTER_NODE (span_output_node) = {
+  .function = span_output_node_fn,
+  .name = "span-output",
+  .vector_size = sizeof (u32),
+  .format_trace = format_span_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(span_error_strings),
+  .error_strings = span_error_strings,
+
+  .n_next_nodes = 0,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (span_output_node, span_output_node_fn)
+
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/span/span.api b/src/vnet/span/span.api
new file mode 100644
index 00000000..4babdd83
--- /dev/null
+++ b/src/vnet/span/span.api
@@ -0,0 +1,60 @@
+/* Hey Emacs use -*- mode: C -*- */
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ /** \brief Enable/Disable span to mirror traffic from one interface to another
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context which was passed in the request
+    @param sw_if_index_from - interface to be mirorred
+    @param sw_if_index_to - interface where the traffic is mirrored
+    @param state - 0 = disabled, 1 = rx enabled, 2 = tx enabled, 3 tx & rx enabled
+*/
+define sw_interface_span_enable_disable {
+    u32 client_index;
+    u32 context;
+    u32 sw_if_index_from;
+    u32 sw_if_index_to;
+    u8  state;
+};
+
+/** \brief Reply to SPAN enable/disable request
+    @param context - sender context which was passed in the request
+*/
+define sw_interface_span_enable_disable_reply {
+    u32 context;
+    i32 retval;
+};
+
+/** \brief SPAN dump request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define sw_interface_span_dump {
+    u32 client_index;
+    u32 context;
+};
+
+/** \brief Reply to SPAN dump request
+    @param context - sender context which was passed in the request
+    @param sw_if_index_from - mirorred interface
+    @param sw_if_index_to - interface where the traffic is mirrored
+    @param state - 0 = disabled, 1 = rx enabled, 2 = tx enabled, 3 tx & rx enabled
+*/
+define sw_interface_span_details {
+    u32 context;
+    u32 sw_if_index_from;
+    u32 sw_if_index_to;
+    u8 state;
+};
diff --git a/src/vnet/span/span.c b/src/vnet/span/span.c
new file mode 100644
index 00000000..7b5816c7
--- /dev/null
+++ b/src/vnet/span/span.c
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vppinfra/error.h>
+#include <vnet/feature/feature.h>
+
+#include <vnet/span/span.h>
+
+int
+span_add_delete_entry (vlib_main_t * vm,
+		       u32 src_sw_if_index, u32 dst_sw_if_index, u8 state)
+{
+  span_main_t *sm = &span_main;
+  span_interface_t *si;
+  u32 new_num_rx_mirror_ports, new_num_tx_mirror_ports;
+
+  if (state > 3)
+    return VNET_API_ERROR_UNIMPLEMENTED;
+
+  if ((src_sw_if_index == ~0) || (dst_sw_if_index == ~0 && state > 0)
+      || (src_sw_if_index == dst_sw_if_index))
+    return VNET_API_ERROR_INVALID_INTERFACE;
+
+  vnet_sw_interface_t *sw_if;
+
+  sw_if = vnet_get_sw_interface (vnet_get_main (), src_sw_if_index);
+  if (sw_if->type == VNET_SW_INTERFACE_TYPE_SUB)
+    return VNET_API_ERROR_UNIMPLEMENTED;
+
+  vec_validate_aligned (sm->interfaces, src_sw_if_index,
+			CLIB_CACHE_LINE_BYTES);
+  si = vec_elt_at_index (sm->interfaces, src_sw_if_index);
+
+  si->rx_mirror_ports = clib_bitmap_set (si->rx_mirror_ports, dst_sw_if_index,
+					 (state & 1) != 0);
+  si->tx_mirror_ports = clib_bitmap_set (si->tx_mirror_ports, dst_sw_if_index,
+					 (state & 2) != 0);
+
+  new_num_rx_mirror_ports = clib_bitmap_count_set_bits (si->rx_mirror_ports);
+  new_num_tx_mirror_ports = clib_bitmap_count_set_bits (si->tx_mirror_ports);
+
+  if (new_num_rx_mirror_ports == 1 && si->num_rx_mirror_ports == 0)
+    vnet_feature_enable_disable ("device-input", "span-input",
+				 src_sw_if_index, 1, 0, 0);
+
+  if (new_num_rx_mirror_ports == 0 && si->num_rx_mirror_ports == 1)
+    vnet_feature_enable_disable ("device-input", "span-input",
+				 src_sw_if_index, 0, 0, 0);
+
+  if (new_num_rx_mirror_ports == 1 && si->num_rx_mirror_ports == 0)
+    vnet_feature_enable_disable ("device-input", "span-output",
+				 src_sw_if_index, 1, 0, 0);
+
+  if (new_num_rx_mirror_ports == 0 && si->num_rx_mirror_ports == 1)
+    vnet_feature_enable_disable ("device-input", "span-output",
+				 src_sw_if_index, 0, 0, 0);
+
+  si->num_rx_mirror_ports = new_num_rx_mirror_ports;
+  si->num_tx_mirror_ports = new_num_tx_mirror_ports;
+
+  if (dst_sw_if_index > sm->max_sw_if_index)
+    sm->max_sw_if_index = dst_sw_if_index;
+
+  return 0;
+}
+
+static clib_error_t *
+set_interface_span_command_fn (vlib_main_t * vm,
+			       unformat_input_t * input,
+			       vlib_cli_command_t * cmd)
+{
+  span_main_t *sm = &span_main;
+  u32 src_sw_if_index = ~0;
+  u32 dst_sw_if_index = ~0;
+  u8 state = 3;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%U", unformat_vnet_sw_interface,
+		    sm->vnet_main, &src_sw_if_index))
+	;
+      else if (unformat (input, "destination %U", unformat_vnet_sw_interface,
+			 sm->vnet_main, &dst_sw_if_index))
+	;
+      else if (unformat (input, "disable"))
+	state = 0;
+      else if (unformat (input, "rx"))
+	state = 1;
+      else if (unformat (input, "tx"))
+	state = 2;
+      else if (unformat (input, "both"))
+	state = 3;
+      else
+	break;
+    }
+
+  int rv =
+    span_add_delete_entry (vm, src_sw_if_index, dst_sw_if_index, state);
+  if (rv == VNET_API_ERROR_INVALID_INTERFACE)
+    return clib_error_return (0, "Invalid interface");
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_span_command, static) = {
+  .path = "set interface span",
+  .short_help = "set interface span <if-name> [disable | destination <if-name> [both|rx|tx]]",
+  .function = set_interface_span_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+show_interfaces_span_command_fn (vlib_main_t * vm,
+				 unformat_input_t * input,
+				 vlib_cli_command_t * cmd)
+{
+  span_main_t *sm = &span_main;
+  span_interface_t *si;
+  vnet_main_t *vnm = &vnet_main;
+  u8 header = 1;
+  char *states[] = { "none", "rx", "tx", "both" };
+  u8 *s = 0;
+
+  /* *INDENT-OFF* */
+  vec_foreach (si, sm->interfaces)
+    if (si->num_rx_mirror_ports || si->num_tx_mirror_ports)
+      {
+	clib_bitmap_t *b;
+	u32 i;
+	b = clib_bitmap_dup_or (si->rx_mirror_ports, si->tx_mirror_ports);
+	if (header)
+	  {
+	    vlib_cli_output (vm, "%-40s %s", "Source interface",
+			     "Mirror interface (direction)");
+	    header = 0;
+	  }
+	s = format (s, "%U", format_vnet_sw_if_index_name, vnm,
+		    si - sm->interfaces);
+	clib_bitmap_foreach (i, b, (
+	  {
+	    int state;
+	    state = (clib_bitmap_get (si->rx_mirror_ports, i) +
+		     clib_bitmap_get (si->tx_mirror_ports, i) * 2);
+
+	    vlib_cli_output (vm, "%-40v %U (%s)", s,
+			     format_vnet_sw_if_index_name, vnm, i,
+			     states[state]);
+	    vec_reset_length (s);
+	  }));
+	clib_bitmap_free (b);
+      }
+  /* *INDENT-ON* */
+  vec_free (s);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_interfaces_span_command, static) = {
+  .path = "show interfaces span",
+  .short_help = "Shows SPAN mirror table",
+  .function = show_interfaces_span_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+span_init (vlib_main_t * vm)
+{
+  span_main_t *sm = &span_main;
+
+  sm->vlib_main = vm;
+  sm->vnet_main = vnet_get_main ();
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (span_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/span/span.h b/src/vnet/span/span.h
new file mode 100644
index 00000000..a98b010b
--- /dev/null
+++ b/src/vnet/span/span.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __span_h__
+#define __span_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+
+typedef struct
+{
+  clib_bitmap_t *rx_mirror_ports;
+  clib_bitmap_t *tx_mirror_ports;
+  u32 num_rx_mirror_ports;
+  u32 num_tx_mirror_ports;
+} span_interface_t;
+
+typedef struct
+{
+  /* per-interface vector of span instances */
+  span_interface_t *interfaces;
+
+  /* biggest sw_if_index used so far */
+  u32 max_sw_if_index;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} span_main_t;
+
+span_main_t span_main;
+
+typedef struct
+{
+  u32 src_sw_if_index;		/* mirrored interface index */
+  u32 mirror_sw_if_index;	/* output interface index */
+} span_trace_t;
+
+#endif /* __span_h__ */
+
+int
+span_add_delete_entry (vlib_main_t * vm, u32 src_sw_if_index,
+		       u32 dst_sw_if_index, u8 is_add);
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/span/span.md b/src/vnet/span/span.md
new file mode 100644
index 00000000..ee3f814f
--- /dev/null
+++ b/src/vnet/span/span.md
@@ -0,0 +1,65 @@
+# VPP SPAN implementation
+
+This is a memo intended to contain documentation of the VPP SPAN implementation.
+Everything that is not directly obvious should come here.
+
+
+## Switched Port Analyzer (SPAN)
+Port mirroring is used on a network switch to send a copy of network packets seen on one switch port to a network monitoring connection on another switch port.
+Can be used by network engineers or administrators to measure performnce, analyze and debug data or diagnose errors on a network.
+
+### RX traffic node
+There is one static node to mirror incomming packets.
+* span-input: Creates a copy of incomming buffer due to incomming buffers can be reused internally.
+
+Chaining: dpdk-input -> span-input ->
+* original buffer is sent to ethernet-input for processing
+* buffer copy is sent to interface-output
+
+### Configuration
+SPAN supports the following CLI configuration commands:
+
+#### Enable/Disable SPAN (CLI)
+	set interface span <if-name> [disable | destination <if-name>]
+
+<if-name>: mirrored interface name
+destination <if-name>: monitoring interface name
+disable: delete mirroring
+
+#### Enable/Disabl SPAN (API)
+SPAN supports the following API configuration command:
+	sw_interface_span_enable_disable src GigabitEthernet0/8/0 dst GigabitEthernet0/9/0
+	sw_interface_span_enable_disable src_sw_if_index 1 dst_sw_if_index 2
+
+src/src_sw_if_index: mirrored interface name
+dst/dst_sw_if_index: monitoring interface name
+
+#### Remove SPAN entry (API)
+SPAN supports the following API configuration command:
+	sw_interface_span_enable_disable src_sw_if_index 1 dst_sw_if_index 2 disable
+
+src_sw_if_index: mirrored interface name
+dst_sw_if_index: monitoring interface name
+
+### Configuration example
+
+Mirror all packets on interface GigabitEthernet0/10/0 to interface GigabitEthernet0/11/0.
+
+Configure IPv4 addresses on mirrored interface:
+set interface ip address GigabitEthernet0/10/0 192.168.1.13/24
+set interface state GigabitEthernet0/10/0 up
+
+Configure IPv4 addresses on monitoring interface:
+set interface ip address GigabitEthernet0/11/0 192.168.2.13/24
+set interface state GigabitEthernet0/11/0 up
+
+Configure SPAN
+set span src GigabitEthernet0/10/0 dst GigabitEthernet0/11/0
+
+### Operational data
+
+Active SPAN mirroring CLI show command:
+    show interfaces span
+
+Active SPAN mirroring API dump command:
+    sw_interface_span_dump
diff --git a/src/vnet/span/span_api.c b/src/vnet/span/span_api.c
new file mode 100644
index 00000000..b4565663
--- /dev/null
+++ b/src/vnet/span/span_api.c
@@ -0,0 +1,153 @@
+/*
+ *------------------------------------------------------------------
+ * span_api.c - span mirroring api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/span/span.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                             \
+_(SW_INTERFACE_SPAN_ENABLE_DISABLE, sw_interface_span_enable_disable)   \
+_(SW_INTERFACE_SPAN_DUMP, sw_interface_span_dump)                       \
+
+static void
+  vl_api_sw_interface_span_enable_disable_t_handler
+  (vl_api_sw_interface_span_enable_disable_t * mp)
+{
+  vl_api_sw_interface_span_enable_disable_reply_t *rmp;
+  int rv;
+
+  vlib_main_t *vm = vlib_get_main ();
+
+  rv = span_add_delete_entry (vm, ntohl (mp->sw_if_index_from),
+			      ntohl (mp->sw_if_index_to), mp->state);
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_SPAN_ENABLE_DISABLE_REPLY);
+}
+
+static void
+vl_api_sw_interface_span_dump_t_handler (vl_api_sw_interface_span_dump_t * mp)
+{
+
+  unix_shared_memory_queue_t *q;
+  span_interface_t *si;
+  vl_api_sw_interface_span_details_t *rmp;
+  span_main_t *sm = &span_main;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (!q)
+    return;
+
+  /* *INDENT-OFF* */
+  vec_foreach (si, sm->interfaces)
+    if (si->num_rx_mirror_ports || si->num_tx_mirror_ports)
+    {
+      clib_bitmap_t *b;
+      u32 i;
+      b = clib_bitmap_dup_or (si->rx_mirror_ports, si->tx_mirror_ports);
+      clib_bitmap_foreach (i, b, (
+        {
+          rmp = vl_msg_api_alloc (sizeof (*rmp));
+          memset (rmp, 0, sizeof (*rmp));
+          rmp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SPAN_DETAILS);
+          rmp->context = mp->context;
+
+          rmp->sw_if_index_from = htonl (si - sm->interfaces);
+          rmp->sw_if_index_to = htonl (i);
+          rmp->state = (u8) (clib_bitmap_get (si->rx_mirror_ports, i) +
+                             clib_bitmap_get (si->tx_mirror_ports, i) * 2);
+
+          vl_msg_api_send_shmem (q, (u8 *) & rmp);
+        }));
+      clib_bitmap_free (b);
+    }
+  /* *INDENT-ON* */
+}
+
+/*
+ * vpe_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_span;
+#undef _
+}
+
+static clib_error_t *
+span_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (span_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/sr/dir.dox b/src/vnet/sr/dir.dox
new file mode 100644
index 00000000..a98b202c
--- /dev/null
+++ b/src/vnet/sr/dir.dox
@@ -0,0 +1,25 @@
+/*
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ @dir
+ @brief Segment Routing code
+
+ An implementation of Segment Routing as per:
+ draft-previdi-6man-segment-routing-header-05
+
+ See file: rfc_draft_05.txt 
+ 
+*/
\ No newline at end of file
diff --git a/src/vnet/sr/examples/sr_multicastmap.script b/src/vnet/sr/examples/sr_multicastmap.script
new file mode 100644
index 00000000..20bf7dc0
--- /dev/null
+++ b/src/vnet/sr/examples/sr_multicastmap.script
@@ -0,0 +1,4 @@
+sr_tunnel_add_del name sr2 src ::a:1:1:0:6 dst ff15::2/128 next ::a:1:1:0:f next ::a:1:1:0:1a next ff15::1 tag ::a:1:1:0:7  clean 
+sr_tunnel_add_del name sr3 src ::b:1:1:0:6 dst ff16::2/128 next ::a:1:1:0:13 next ::a:1:1:0:1a next ff15::1 tag ::a:1:1:0:7  clean
+sr_policy_add_del name pol1 tunnel sr2 tunnel sr3
+sr_multicast_map_add_del address ff15::1 sr-policy pol1
diff --git a/src/vnet/sr/rfc_draft_05.txt b/src/vnet/sr/rfc_draft_05.txt
new file mode 100644
index 00000000..bc41c181
--- /dev/null
+++ b/src/vnet/sr/rfc_draft_05.txt
@@ -0,0 +1,1265 @@
+Network Working Group                                    S. Previdi, Ed.
+Internet-Draft                                               C. Filsfils
+Intended status: Standards Track                     Cisco Systems, Inc.
+Expires: June 12, 2015                                          B. Field
+                                                                 Comcast
+                                                                I. Leung
+                                                   Rogers Communications
+                                                        December 9, 2014
+
+
+                   IPv6 Segment Routing Header (SRH)
+              draft-previdi-6man-segment-routing-header-05
+
+Abstract
+
+   Segment Routing (SR) allows a node to steer a packet through a
+   controlled set of instructions, called segments, by prepending a SR
+   header to the packet.  A segment can represent any instruction,
+   topological or service-based.  SR allows to enforce a flow through
+   any path (topological, or application/service based) while
+   maintaining per-flow state only at the ingress node to the SR domain.
+
+   Segment Routing can be applied to the IPv6 data plane with the
+   addition of a new type of Routing Extension Header.  This draft
+   describes the Segment Routing Extension Header Type and how it is
+   used by SR capable nodes.
+
+Requirements Language
+
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+   document are to be interpreted as described in RFC 2119 [RFC2119].
+
+Status of This Memo
+
+   This Internet-Draft is submitted in full conformance with the
+   provisions of BCP 78 and BCP 79.
+
+   Internet-Drafts are working documents of the Internet Engineering
+   Task Force (IETF).  Note that other groups may also distribute
+   working documents as Internet-Drafts.  The list of current Internet-
+   Drafts is at http://datatracker.ietf.org/drafts/current/.
+
+   Internet-Drafts are draft documents valid for a maximum of six months
+   and may be updated, replaced, or obsoleted by other documents at any
+   time.  It is inappropriate to use Internet-Drafts as reference
+   material or to cite them other than as "work in progress."
+
+
+
+
+Previdi, et al.           Expires June 12, 2015                 [Page 1]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+   This Internet-Draft will expire on June 12, 2015.
+
+Copyright Notice
+
+   Copyright (c) 2014 IETF Trust and the persons identified as the
+   document authors.  All rights reserved.
+
+   This document is subject to BCP 78 and the IETF Trust's Legal
+   Provisions Relating to IETF Documents
+   (http://trustee.ietf.org/license-info) in effect on the date of
+   publication of this document.  Please review these documents
+   carefully, as they describe your rights and restrictions with respect
+   to this document.  Code Components extracted from this document must
+   include Simplified BSD License text as described in Section 4.e of
+   the Trust Legal Provisions and are provided without warranty as
+   described in the Simplified BSD License.
+
+Table of Contents
+
+   1.  Structure of this document  . . . . . . . . . . . . . . . . .   3
+   2.  Segment Routing Documents . . . . . . . . . . . . . . . . . .   3
+   3.  Introduction  . . . . . . . . . . . . . . . . . . . . . . . .   3
+     3.1.  Data Planes supporting Segment Routing  . . . . . . . . .   4
+     3.2.  Illustration  . . . . . . . . . . . . . . . . . . . . . .   4
+   4.  Abstract Routing Model  . . . . . . . . . . . . . . . . . . .   7
+     4.1.  Segment Routing Global Block (SRGB) . . . . . . . . . . .   8
+     4.2.  Traffic Engineering with SR . . . . . . . . . . . . . . .   9
+     4.3.  Segment Routing Database  . . . . . . . . . . . . . . . .  10
+   5.  IPv6 Instantiation of Segment Routing . . . . . . . . . . . .  10
+     5.1.  Segment Identifiers (SIDs) and SRGB . . . . . . . . . . .  10
+       5.1.1.  Node-SID  . . . . . . . . . . . . . . . . . . . . . .  11
+       5.1.2.  Adjacency-SID . . . . . . . . . . . . . . . . . . . .  11
+     5.2.  Segment Routing Extension Header (SRH)  . . . . . . . . .  11
+       5.2.1.  SRH and RFC2460 behavior  . . . . . . . . . . . . . .  15
+   6.  SRH Procedures  . . . . . . . . . . . . . . . . . . . . . . .  15
+     6.1.  Segment Routing Operations  . . . . . . . . . . . . . . .  15
+     6.2.  Segment Routing Node Functions  . . . . . . . . . . . . .  16
+       6.2.1.  Ingress SR Node . . . . . . . . . . . . . . . . . . .  16
+       6.2.2.  Transit Non-SR Capable Node . . . . . . . . . . . . .  18
+       6.2.3.  SR Intra Segment Transit Node . . . . . . . . . . . .  18
+       6.2.4.  SR Segment Endpoint Node  . . . . . . . . . . . . . .  18
+     6.3.  FRR Flag Settings . . . . . . . . . . . . . . . . . . . .  18
+   7.  SR and Tunneling  . . . . . . . . . . . . . . . . . . . . . .  18
+   8.  Example Use Case  . . . . . . . . . . . . . . . . . . . . . .  19
+   9.  IANA Considerations . . . . . . . . . . . . . . . . . . . . .  21
+   10. Manageability Considerations  . . . . . . . . . . . . . . . .  21
+   11. Security Considerations . . . . . . . . . . . . . . . . . . .  21
+   12. Contributors  . . . . . . . . . . . . . . . . . . . . . . . .  21
+
+
+
+Previdi, et al.           Expires June 12, 2015                 [Page 2]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+   13. Acknowledgements  . . . . . . . . . . . . . . . . . . . . . .  21
+   14. References  . . . . . . . . . . . . . . . . . . . . . . . . .  21
+     14.1.  Normative References . . . . . . . . . . . . . . . . . .  21
+     14.2.  Informative References . . . . . . . . . . . . . . . . .  21
+   Authors' Addresses  . . . . . . . . . . . . . . . . . . . . . . .  22
+
+1.  Structure of this document
+
+   Section 3 gives an introduction on SR for IPv6 networks.
+
+   Section 4 describes the Segment Routing abstract model.
+
+   Section 5 defines the Segment Routing Header (SRH) allowing
+   instantiation of SR over IPv6 dataplane.
+
+   Section 6 details the procedures of the Segment Routing Header.
+
+2.  Segment Routing Documents
+
+   Segment Routing terminology is defined in
+   [I-D.filsfils-spring-segment-routing].
+
+   Segment Routing use cases are described in
+   [I-D.filsfils-spring-segment-routing-use-cases].
+
+   Segment Routing IPv6 use cases are described in
+   [I-D.ietf-spring-ipv6-use-cases].
+
+   Segment Routing protocol extensions are defined in
+   [I-D.ietf-isis-segment-routing-extensions], and
+   [I-D.psenak-ospf-segment-routing-ospfv3-extension].
+
+   The security mechanisms of the Segment Routing Header (SRH) are
+   described in [I-D.vyncke-6man-segment-routing-security].
+
+3.  Introduction
+
+   Segment Routing (SR), defined in
+   [I-D.filsfils-spring-segment-routing], allows a node to steer a
+   packet through a controlled set of instructions, called segments, by
+   prepending a SR header to the packet.  A segment can represent any
+   instruction, topological or service-based.  SR allows to enforce a
+   flow through any path (topological or service/application based)
+   while maintaining per-flow state only at the ingress node to the SR
+   domain.  Segments can be derived from different components: IGP, BGP,
+   Services, Contexts, Locators, etc.  The list of segment forming the
+   path is called the Segment List and is encoded in the packet header.
+
+
+
+
+Previdi, et al.           Expires June 12, 2015                 [Page 3]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+   SR allows the use of strict and loose source based routing paradigms
+   without requiring any additional signaling protocols in the
+   infrastructure hence delivering an excellent scalability property.
+
+   The source based routing model described in
+   [I-D.filsfils-spring-segment-routing] is inherited from the ones
+   proposed by [RFC1940] and [RFC2460].  The source based routing model
+   offers the support for explicit routing capability.
+
+3.1.  Data Planes supporting Segment Routing
+
+   Segment Routing (SR), can be instantiated over MPLS
+   ([I-D.filsfils-spring-segment-routing-mpls]) and IPv6.  This document
+   defines its instantiation over the IPv6 data-plane based on the use-
+   cases defined in [I-D.ietf-spring-ipv6-use-cases].
+
+   Segment Routing for IPv6 (SR-IPv6) is required in networks where MPLS
+   data-plane is not used or, when combined with SR-MPLS, in networks
+   where MPLS is used in the core and IPv6 is used at the edge (home
+   networks, datacenters).
+
+   This document defines a new type of Routing Header (originally
+   defined in [RFC2460]) called the Segment Routing Header (SRH) in
+   order to convey the Segment List in the packet header as defined in
+   [I-D.filsfils-spring-segment-routing].  Mechanisms through which
+   segment are known and advertised are outside the scope of this
+   document.
+
+3.2.  Illustration
+
+   In the context of Figure 1 where all the links have the same IGP
+   cost, let us assume that a packet P enters the SR domain at an
+   ingress edge router I and that the operator requests the following
+   requirements for packet P:
+
+      The local service S offered by node B must be applied to packet P.
+
+      The links AB and CE cannot be used to transport the packet P.
+
+      Any node N along the journey of the packet should be able to
+      determine where the packet P entered the SR domain and where it
+      will exit.  The intermediate node should be able to determine the
+      paths from the ingress edge router to itself, and from itself to
+      the egress edge router.
+
+      Per-flow State for packet P should only be created at the ingress
+      edge router.
+
+
+
+
+Previdi, et al.           Expires June 12, 2015                 [Page 4]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+      The operator can forbid, for security reasons, anyone outside the
+      operator domain to exploit its intra-domain SR capabilities.
+
+   I---A---B---C---E
+        \  |  / \ /
+         \ | /   F
+          \|/
+           D
+
+                Figure 1: An illustration of SR properties
+
+   All these properties may be realized by instructing the ingress SR
+   edge router I to push the following abstract SR header on the packet
+   P.
+
+   +---------------------------------------------------------------+
+   |                                   |                           |
+   |      Abstract SR Header           |                           |
+   |                                   |                           |
+   | {SD, SB, SS, SF, SE}, Ptr, SI, SE |        Transported        |
+   |  ^                     |          |           Packet          |
+   |  |                     |          |             P             |
+   |  +---------------------+          |                           |
+   |                                   |                           |
+   +---------------------------------------------------------------+
+
+                       Figure 2: Packet P at node I
+
+   The abstract SR header contains a source route encoded as a list of
+   segments {SD, SB, SS, SF, SE}, a pointer (Ptr) and the identification
+   of the ingress and egress SR edge routers (segments SI and SE).
+
+   A segment identifies a topological instruction or a service
+   instruction.  A segment can either be global or local.  The
+   instruction associated with a global segment is recognized and
+   executed by any SR-capable node in the domain.  The instruction
+   associated with a local segment is only supported by the specific
+   node that originates it.
+
+   Let us assume some IGP (i.e.: ISIS and OSPF) extensions to define a
+   "Node Segment" as a global instruction within the IGP domain to
+   forward a packet along the shortest path to the specified node.  Let
+   us further assume that within the SR domain illustrated in Figure 1,
+   segments SI, SD, SB, SE and SF respectively identify IGP node
+   segments to I, D, B, E and F.
+
+   Let us assume that node B identifies its local service S with local
+   segment SS.
+
+
+
+Previdi, et al.           Expires June 12, 2015                 [Page 5]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+   With all of this in mind, let us describe the journey of the packet
+   P.
+
+   The packet P reaches the ingress SR edge router.  I pushes the SR
+   header illustrated in Figure 2 and sets the pointer to the first
+   segment of the list (SD).
+
+   SD is an instruction recognized by all the nodes in the SR domain
+   which causes the packet to be forwarded along the shortest path to D.
+
+   Once at D, the pointer is incremented and the next segment is
+   executed (SB).
+
+   SB is an instruction recognized by all the nodes in the SR domain
+   which causes the packet to be forwarded along the shortest path to B.
+
+   Once at B, the pointer is incremented and the next segment is
+   executed (SS).
+
+   SS is an instruction only recognized by node B which causes the
+   packet to receive service S.
+
+   Once the service applied, the next segment is executed (SF) which
+   causes the packet to be forwarded along the shortest path to F.
+
+   Once at F, the pointer is incremented and the next segment is
+   executed (SE).
+
+   SE is an instruction recognized by all the nodes in the SR domain
+   which causes the packet to be forwarded along the shortest path to E.
+
+   E then removes the SR header and the packet continues its journey
+   outside the SR domain.
+
+   All of the requirements are met.
+
+   First, the packet P has not used links AB and CE: the shortest-path
+   from I to D is I-A-D, the shortest-path from D to B is D-B, the
+   shortest-path from B to F is B-C-F and the shortest-path from F to E
+   is F-E, hence the packet path through the SR domain is I-A-D-B-C-F-E
+   and the links AB and CE have been avoided.
+
+   Second, the service S supported by B has been applied on packet P.
+
+   Third, any node along the packet path is able to identify the service
+   and topological journey of the packet within the SR domain.  For
+   example, node C receives the packet illustrated in Figure 3 and hence
+   is able to infer where the packet entered the SR domain (SI), how it
+
+
+
+Previdi, et al.           Expires June 12, 2015                 [Page 6]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+   got up to itself {SD, SB, SS, SE}, where it will exit the SR domain
+   (SE) and how it will do so {SF, SE}.
+
+   +---------------------------------------------------------------+
+   |                                   |                           |
+   |           SR Header               |                           |
+   |                                   |                           |
+   | {SD, SB, SS, SF, SE}, Ptr, SI, SE |        Transported        |
+   |               ^        |          |           Packet          |
+   |               |        |          |             P             |
+   |               +--------+          |                           |
+   |                                   |                           |
+   +---------------------------------------------------------------+
+
+                       Figure 3: Packet P at node C
+
+   Fourth, only node I maintains per-flow state for packet P.  The
+   entire program of topological and service instructions to be executed
+   by the SR domain on packet P is encoded by the ingress edge router I
+   in the SR header in the form of a list of segments where each segment
+   identifies a specific instruction.  No further per-flow state is
+   required along the packet path.  The per-flow state is in the SR
+   header and travels with the packet.  Intermediate nodes only hold
+   states related to the IGP global node segments and the local IGP
+   adjacency segments.  These segments are not per-flow specific and
+   hence scale very well.  Typically, an intermediate node would
+   maintain in the order of 100's to 1000's global node segments and in
+   the order of 10's to 100 of local adjacency segments.  Typically the
+   SR IGP forwarding table is expected to be much less than 10000
+   entries.
+
+   Fifth, the SR header is inserted at the entrance to the domain and
+   removed at the exit of the operator domain.  For security reasons,
+   the operator can forbid anyone outside its domain to use its intra-
+   domain SR capability.
+
+4.  Abstract Routing Model
+
+   At the entrance of the SR domain, the ingress SR edge router pushes
+   the SR header on top of the packet.  At the exit of the SR domain,
+   the egress SR edge router removes the SR header.
+
+   The abstract SR header contains an ordered list of segments, a
+   pointer identifying the next segment to process and the
+   identifications of the ingress and egress SR edge routers on the path
+   of this packet.  The pointer identifies the segment that MUST be used
+   by the receiving router to process the packet.  This segment is
+   called the active segment.
+
+
+
+Previdi, et al.           Expires June 12, 2015                 [Page 7]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+   A property of SR is that the entire source route of the packet,
+   including the identity of the ingress and egress edge routers is
+   always available with the packet.  This allows for interesting
+   accounting and service applications.
+
+   We define three SR-header operations:
+
+      "PUSH": an SR header is pushed on an IP packet, or additional
+      segments are added at the head of the segment list.  The pointer
+      is moved to the first entry of the added segments.
+
+      "NEXT": the active segment is completed, the pointer is moved to
+      the next segment in the list.
+
+      "CONTINUE": the active segment is not completed, the pointer is
+      left unchanged.
+
+   In the future, other SR-header management operations may be defined.
+
+   As the packet travels through the SR domain, the pointer is
+   incremented through the ordered list of segments and the source route
+   encoded by the SR ingress edge node is executed.
+
+   A node processes an incoming packet according to the instruction
+   associated with the active segment.
+
+   Any instruction might be associated with a segment: for example, an
+   intra-domain topological strict or loose forwarding instruction, a
+   service instruction, etc.
+
+   At minimum, a segment instruction must define two elements: the
+   identity of the next-hop to forward the packet to (this could be the
+   same node or a context within the node) and which SR-header
+   management operation to execute.
+
+   Each segment is known in the network through a Segment Identifier
+   (SID).  The terms "segment" and "SID" are interchangeable.
+
+4.1.  Segment Routing Global Block (SRGB)
+
+   In the SR abstract model, a segment is identified by a Segment
+   Routing Identifier (SID).  The SR abstract model doesn't mandate a
+   specific format for the SID (IPv6 address or other formats).
+
+   In Segment Routing IPv6 the SID is an IPv6 address.  Therefore, the
+   SRGB is materialized by the global IPv6 address space which
+   represents the set of IPv6 routable addresses in the SR domain.  The
+   following rules apply:
+
+
+
+Previdi, et al.           Expires June 12, 2015                 [Page 8]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+   o  Each node of the SR domain MUST be configured with the Segment
+      Routing Global Block (SRGB).
+
+   o  All global segments must be allocated from the SRGB.  Any SR
+      capable node MUST be able to process any global segment advertised
+      by any other node within the SR domain.
+
+   o  Any segment outside the SRGB has a local significance and is
+      called a "local segment".  An SR-capable node MUST be able to
+      process the local segments it originates.  An SR-capable node MUST
+      NOT support the instruction associated with a local segment
+      originated by a remote node.
+
+4.2.  Traffic Engineering with SR
+
+   An SR Traffic Engineering policy is composed of two elements: a flow
+   classification and a segment-list to prepend on the packets of the
+   flow.
+
+   In SR, this per-flow state only exists at the ingress edge node where
+   the policy is defined and the SR header is pushed.
+
+   It is outside the scope of the document to define the process that
+   leads to the instantiation at a node N of an SR Traffic Engineering
+   policy.
+
+   [I-D.filsfils-spring-segment-routing-use-cases] illustrates various
+   alternatives:
+
+      N is deriving this policy automatically (e.g.  FRR).
+
+      N is provisioned explicitly by the operator.
+
+      N is provisioned by a controller or server (e.g.: SDN Controller).
+
+      N is provisioned by the operator with a high-level policy which is
+      mapped into a path thanks to a local CSPF-based computation (e.g.
+      affinity/SRLG exclusion).
+
+      N could also be provisioned by other means.
+
+   [I-D.filsfils-spring-segment-routing-use-cases] explains why the
+   majority of use-cases require very short segment-lists, hence
+   minimizing the performance impact, if any, of inserting and
+   transporting the segment list.
+
+
+
+
+
+
+Previdi, et al.           Expires June 12, 2015                 [Page 9]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+   A SDN controller, which desires to instantiate at node N an SR
+   Traffic Engineering policy, collects the SR capability of node N such
+   as to ensure that the policy meets its capability.
+
+4.3.  Segment Routing Database
+
+   The Segment routing Database (SRDB) is a set of entries where each
+   entry is identified by a SID.  The instruction associated with each
+   entry at least defines the identity of the next-hop to which the
+   packet should be forwarded and what operation should be performed on
+   the SR header (PUSH, CONTINUE, NEXT).
+
+   +---------+-----------+---------------------------------+
+   | Segment |  Next-Hop |  SR Header operation            |
+   +---------+-----------+---------------------------------+
+   |   Sk    |     M     | CONTINUE                        |
+   |   Sj    |     N     | NEXT                            |
+   |   Sl    | NAT Srvc  | NEXT                            |
+   |   Sm    |  FW srvc  | NEXT                            |
+   |   Sn    |     Q     | NEXT                            |
+   |  etc.   |   etc.    | etc.                            |
+   +---------+-----------+---------------------------------+
+
+                           Figure 4: SR Database
+
+   Each SR-capable node maintains its local SRDB.  SRDB entries can
+   either derive from local policy or from protocol segment
+   advertisement.
+
+5.  IPv6 Instantiation of Segment Routing
+
+5.1.  Segment Identifiers (SIDs) and SRGB
+
+   Segment Routing, as described in
+   [I-D.filsfils-spring-segment-routing], defines Node-SID and
+   Adjacency-SID.  When SR is used over IPv6 data-plane the following
+   applies.
+
+   The SRGB is the global IPv6 address space which represents the set of
+   IPv6 routable addresses in the SR domain.
+
+   Node SIDs are IPv6 addresses part of the SRGB (i.e.: routable
+   addresses).  Adjacency-SIDs are IPv6 addresses which may not be part
+   of the global IPv6 address space.
+
+
+
+
+
+
+
+Previdi, et al.           Expires June 12, 2015                [Page 10]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+5.1.1.  Node-SID
+
+   The Node-SID identifies a node.  With SR-IPv6 the Node-SID is an IPv6
+   prefix that the operator configured on the node and that is used as
+   the node identifier.  Typically, in case of a router, this is the
+   IPv6 address of the node loopback interface.  Therefore, SR-IPv6 does
+   not require any additional SID advertisement for the Node Segment.
+   The Node-SID is in fact the IPv6 address of the node.
+
+5.1.2.  Adjacency-SID
+
+   In the SR architecture defined in
+   [I-D.filsfils-spring-segment-routing] the Adjacency-SID (or Adj-SID)
+   identifies a given interface and may be local or global (depending on
+   how it is advertised).  A node may advertise one (or more) Adj-SIDs
+   allocated to a given interface so to force the forwarding of the
+   packet (when received with that particular Adj-SID) into the
+   interface regardless the routing entry for the packet destination.
+   The semantic of the Adj-SID is:
+
+      Send out the packet to the interface this prefix is allocated to.
+
+   When SR is applied to IPv6, any SID is in a global IPv6 address and
+   therefore, an Adj-SID has a global significance (i.e.: the IPv6
+   address representing the SID is a global address).  In other words, a
+   node that advertises the Adj-SID in the form of a global IPv6 address
+   representing the link/adjacency the packet has to be forwarded to,
+   will apply to the Adj-SID a global significance.
+
+   Advertisement of Adj-SID may be done using multiple mechanisms among
+   which the ones described in ISIS and OSPF protocol extensions:
+   [I-D.ietf-isis-segment-routing-extensions] and
+   [I-D.psenak-ospf-segment-routing-ospfv3-extension].  The distinction
+   between local and global significance of the Adj-SID is given in the
+   encoding of the Adj-SID advertisement.
+
+5.2.  Segment Routing Extension Header (SRH)
+
+   A new type of the Routing Header (originally defined in [RFC2460]) is
+   defined: the Segment Routing Header (SRH) which has a new Routing
+   Type, (suggested value 4) to be assigned by IANA.
+
+   As an example, if an explicit path is to be constructed across a core
+   network running ISIS or OSPF, the segment list will contain SIDs
+   representing the nodes across the path (loose or strict) which,
+   usually, are the IPv6 loopback interface address of each node.  If
+   the path is across service or application entities, the segment list
+
+
+
+
+Previdi, et al.           Expires June 12, 2015                [Page 11]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+   contains the IPv6 addresses of these services or application
+   instances.
+
+   The Segment Routing Header (SRH) is defined as follows:
+
+
+     0                   1                   2                   3
+     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    | Next Header   |  Hdr Ext Len  | Routing Type  | Segments Left |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    | First Segment |             Flags             |  HMAC Key ID  |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    |                                                               |
+    |            Segment List[0] (128 bits ipv6 address)            |
+    |                                                               |
+    |                                                               |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    |                                                               |
+    |                                                               |
+                                  ...
+    |                                                               |
+    |                                                               |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    |                                                               |
+    |            Segment List[n] (128 bits ipv6 address)            |
+    |                                                               |
+    |                                                               |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    |                                                               |
+    |            Policy List[0] (optional)                          |
+    |                                                               |
+    |                                                               |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    |                                                               |
+    |            Policy List[1] (optional)                          |
+    |                                                               |
+    |                                                               |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    |                                                               |
+    |            Policy List[2] (optional)                          |
+    |                                                               |
+    |                                                               |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    |                                                               |
+    |                                                               |
+    |                                                               |
+    |                       HMAC (256 bits)                         |
+
+
+
+Previdi, et al.           Expires June 12, 2015                [Page 12]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+    |                        (optional)                             |
+    |                                                               |
+    |                                                               |
+    |                                                               |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+   where:
+
+   o  Next Header: 8-bit selector.  Identifies the type of header
+      immediately following the SRH.
+
+   o  Hdr Ext Len: 8-bit unsigned integer, is the length of the SRH
+      header in 8-octet units, not including the first 8 octets.
+
+   o  Routing Type: TBD, to be assigned by IANA (suggested value: 4).
+
+   o  Segments Left.  Defined in [RFC2460], it contains the index, in
+      the Segment List, of the next segment to inspect.  Segments Left
+      is decremented at each segment and it is used as an index in the
+      segment list.
+
+   o  First Segment: offset in the SRH, not including the first 8 octets
+      and expressed in 16-octet units, pointing to the last element of
+      the segment list, which is in fact the first segment of the
+      segment routing path.
+
+   o  Flags: 16 bits of flags.  Following flags are defined:
+
+                              1
+          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |C|P|R|R|    Policy Flags       |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+         C-flag: Clean-up flag.  Set when the SRH has to be removed from
+         the packet when packet reaches the last segment.
+
+         P-flag: Protected flag.  Set when the packet has been rerouted
+         through FRR mechanism by a SR endpoint node.  See Section 6.3
+         for more details.
+
+         R-flags.  Reserved and for future use.
+
+         Policy Flags.  Define the type of the IPv6 addresses encoded
+         into the Policy List (see below).  The following have been
+         defined:
+
+
+
+
+
+Previdi, et al.           Expires June 12, 2015                [Page 13]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+            Bits 4-6: determine the type of the first element after the
+            segment list.
+
+            Bits 7-9: determine the type of the second element.
+
+            Bits 10-12: determine the type of the third element.
+
+            Bits 13-15: determine the type of the fourth element.
+
+         The following values are used for the type:
+
+            0x0: Not present.  If value is set to 0x0, it means the
+            element represented by these bits is not present.
+
+            0x1: SR Ingress.
+
+            0x2: SR Egress.
+
+            0x3: Original Source Address.
+
+   o  HMAC Key ID and HMAC field, and their use are defined in
+      [I-D.vyncke-6man-segment-routing-security].
+
+   o  Segment List[n]: 128 bit IPv6 addresses representing the nth
+      segment in the Segment List.  The Segment List is encoded starting
+      from the last segment of the path.  I.e., the first element of the
+      segment list (Segment List [0]) contains the last segment of the
+      path while the last segment of the Segment List (Segment List[n])
+      contains the first segment of the path.  The index contained in
+      "Segments Left" identifies the current active segment.
+
+   o  Policy List.  Optional addresses representing specific nodes in
+      the SR path such as:
+
+         SR Ingress: a 128 bit generic identifier representing the
+         ingress in the SR domain (i.e.: it needs not to be a valid IPv6
+         address).
+
+         SR Egress: a 128 bit generic identifier representing the egress
+         in the SR domain (i.e.: it needs not to be a valid IPv6
+         address).
+
+         Original Source Address: IPv6 address originally present in the
+         SA field of the packet.
+
+      The segments in the Policy List are encoded after the segment list
+      and they are optional.  If none are in the SRH, all bits of the
+      Policy List Flags MUST be set to 0x0.
+
+
+
+Previdi, et al.           Expires June 12, 2015                [Page 14]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+5.2.1.  SRH and RFC2460 behavior
+
+   The SRH being a new type of the Routing Header, it also has the same
+   properties:
+
+      SHOULD only appear once in the packet.
+
+      Only the router whose address is in the DA field of the packet
+      header MUST inspect the SRH.
+
+   Therefore, Segment Routing in IPv6 networks implies that the segment
+   identifier (i.e.: the IPv6 address of the segment) is moved into the
+   DA of the packet.
+
+   The DA of the packet changes at each segment termination/completion
+   and therefore the original DA of the packet MUST be encoded as the
+   last segment of the path.
+
+   As illustrated in Section 3.2, nodes that are within the path of a
+   segment will forward packets based on the DA of the packet without
+   inspecting the SRH.  This ensures full interoperability between SR-
+   capable and non-SR-capable nodes.
+
+6.  SRH Procedures
+
+   In this section we describe the different procedures on the SRH.
+
+6.1.  Segment Routing Operations
+
+   When Segment Routing is instantiated over the IPv6 data plane the
+   following applies:
+
+   o  The segment list is encoded in the SRH.
+
+   o  The active segment is in the destination address of the packet.
+
+   o  The Segment Routing CONTINUE operation (as described in
+      [I-D.filsfils-spring-segment-routing]) is implemented as a
+      regular/plain IPv6 operation consisting of DA based forwarding.
+
+   o  The NEXT operation is implemented through the update of the DA
+      with the value represented by the Next Segment field in the SRH.
+
+   o  The PUSH operation is implemented through the insertion of the SRH
+      or the insertion of additional segments in the SRH segment list.
+
+
+
+
+
+
+Previdi, et al.           Expires June 12, 2015                [Page 15]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+6.2.  Segment Routing Node Functions
+
+   SR packets are forwarded to segments endpoints (i.e.: nodes whose
+   address is in the DA field of the packet).  The segment endpoint,
+   when receiving a SR packet destined to itself, does:
+
+   o  Inspect the SRH.
+
+   o  Determine the next active segment.
+
+   o  Update the Segments Left field (or, if requested, remove the SRH
+      from the packet).
+
+   o  Update the DA.
+
+   o  Send the packet to the next segment.
+
+   The procedures applied to the SRH are related to the node function.
+   Following nodes functions are defined:
+
+      Ingress SR Node.
+
+      Transit Non-SR Node.
+
+      Transit SR Intra Segment Node.
+
+      SR Endpoint Node.
+
+6.2.1.  Ingress SR Node
+
+   Ingress Node can be a router at the edge of the SR domain or a SR-
+   capable host.  The ingress SR node may obtain the segment list by
+   either:
+
+      Local path computation.
+
+      Local configuration.
+
+      Interaction with an SDN controller delivering the path as a
+      complete SRH.
+
+      Any other mechanism (mechanisms through which the path is acquired
+      are outside the scope of this document).
+
+   When creating the SRH (either at ingress node or in the SDN
+   controller) the following is done:
+
+      Next Header and Hdr Ext Len fields are set according to [RFC2460].
+
+
+
+Previdi, et al.           Expires June 12, 2015                [Page 16]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+      Routing Type field is set as TBD (SRH).
+
+      The Segment List is built with the FIRST segment of the path
+      encoded in the LAST element of the Segment List.  Subsequent
+      segments are encoded on top of the first segment.  Finally, the
+      LAST segment of the path is encoded in the FIRST element of the
+      Segment List.  In other words, the Segment List is encoded in the
+      reverse order of the path.
+
+      The original DA of the packet is encoded as the last segment of
+      the path (encoded in the first element of the Segment List).
+
+      the DA of the packet is set with the value of the first segment
+      (found in the last element of the segment list).
+
+      the Segments Left field is set to n-1 where n is the number of
+      elements in the Segment List.
+
+      The packet is sent out towards the first segment (i.e.:
+      represented in the packet DA).
+
+6.2.1.1.  Security at Ingress
+
+   The procedures related to the Segment Routing security are detailed
+   in [I-D.vyncke-6man-segment-routing-security].
+
+   In the case where the SR domain boundaries are not under control of
+   the network operator (e.g.: when the SR domain edge is in a home
+   network), it is important to authenticate and validate the content of
+   any SRH being received by the network operator.  In such case, the
+   security procedure described in
+   [I-D.vyncke-6man-segment-routing-security] is to be used.
+
+   The ingress node (e.g.: the host in the home network) requests the
+   SRH from a control system (e.g.: an SDN controller) which delivers
+   the SRH with its HMAC signature on it.
+
+   Then, the home network host can send out SR packets (with an SRH on
+   it) that will be validated at the ingress of the network operator
+   infrastructure.
+
+   The ingress node of the network operator infrastructure, is
+   configured in order to validate the incoming SRH HMACs in order to
+   allow only packets having correct SRH according to their SA/DA
+   addresses.
+
+
+
+
+
+
+Previdi, et al.           Expires June 12, 2015                [Page 17]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+6.2.2.  Transit Non-SR Capable Node
+
+   SR is interoperable with plain IPv6 forwarding.  Any non SR-capable
+   node will forward SR packets solely based on the DA.  There's no SRH
+   inspection.  This ensures full interoperability between SR and non-SR
+   nodes.
+
+6.2.3.  SR Intra Segment Transit Node
+
+   Only the node whose address is in DA inspects and processes the SRH
+   (according to [RFC2460]).  An intra segment transit node is not in
+   the DA and its forwarding is based on DA and its SR-IPv6 FIB.
+
+6.2.4.  SR Segment Endpoint Node
+
+   The SR segment endpoint node is the node whose address is in the DA.
+   The segment endpoint node inspects the SRH and does:
+
+   1.   IF DA = myself (segment endpoint)
+   2.      IF Segments Left > 0 THEN
+              decrement Segments Left
+              update DA with Segment List[Segments Left]
+   3.      ELSE IF Segments List[Segments Left] <> DA THEN
+              update DA with Segments List[Segments Left]
+              IF Clean-up bit is set THEN remove the SRH
+   4.      ELSE give the packet to next PID (application)
+                End of processing.
+   5.   Forward the packet out
+
+6.3.  FRR Flag Settings
+
+   A node supporting SR and doing Fast Reroute (as described in
+   [I-D.filsfils-spring-segment-routing-use-cases], when rerouting
+   packets through FRR mechanisms, SHOULD inspect the rerouted packet
+   header and look for the SRH.  If the SRH is present, the rerouting
+   node SHOULD set the Protected bit on all rerouted packets.
+
+7.  SR and Tunneling
+
+   Encapsulation can be realized in two different ways with SR-IPv6:
+
+      Outer encapsulation.
+
+      SRH with SA/DA original addresses.
+
+   Outer encapsulation tunneling is the traditional method where an
+   additional IPv6 header is prepended to the packet.  The original IPv6
+   header being encapsulated, everything is preserved and the packet is
+
+
+
+Previdi, et al.           Expires June 12, 2015                [Page 18]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+   switched/routed according to the outer header (that could contain a
+   SRH).
+
+   SRH allows encoding both original SA and DA, hence an operator may
+   decide to change the SA/DA at ingress and restore them at egress.
+   This can be achieved without outer encapsulation, by changing SA/DA
+   and encoding the original SA in the Policy List and in the original
+   DA in the Segment List.
+
+8.  Example Use Case
+
+   A more detailed description of use cases are available in
+   [I-D.ietf-spring-ipv6-use-cases].  In this section, a simple SR-IPv6
+   example is illustrated.
+
+   In the topology described in Figure 6 it is assumed an end-to-end SR
+   deployment.  Therefore SR is supported by all nodes from A to J.
+
+    Home Network |          Backbone         |    Datacenter
+                 |                           |
+                 |   +---+   +---+   +---+   |   +---+   |
+             +---|---| C |---| D |---| E |---|---| I |---|
+             |   |   +---+   +---+   +---+   |   +---+   |
+             |   |     |       |       |     |     |     |  +---+
+   +---+   +---+ |     |       |       |     |     |     |--| X |
+   | A |---| B | |   +---+   +---+   +---+   |   +---+   |  +---+
+   +---+   +---+ |   | F |---| G |---| H |---|---| J |---|
+                 |   +---+   +---+   +---+   |   +---+   |
+                 |                           |
+                 |        +-----------+
+                          |    SDN    |
+                          | Orch/Ctlr |
+                          +-----------+
+
+                       Figure 6: Sample SR topology
+
+   The following workflow applies to packets sent by host A and destined
+   to server X.
+
+
+
+
+
+
+
+
+
+
+
+
+
+Previdi, et al.           Expires June 12, 2015                [Page 19]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+   . Host A sends a request for a path to server X to the SDN
+     controller or orchestration system.
+
+   . The SDN controller/orchestrator builds a SRH with:
+      . Segment List: C, F, J, X
+      . HMAC
+     that satisfies the requirements expressed in the request
+     by host A and based on policies applicable to host A.
+
+   . Host A receives the SRH and insert it into the packet.
+     The packet has now:
+      . SA: A
+      . DA: C
+      . SRH with
+         . SL: X, J, F, C
+         . Segments Left: 3 (i.e.: Segment List size - 1)
+         . PL: C (ingress), J (egress)
+        Note that X is the last segment and C is the
+        first segment (i.e.: the SL is encoded in the reverse
+        path order).
+      . HMAC
+
+   . When packet arrives in C (first segment), C does:
+      . Validate the HMAC of the SRH.
+      . Decrement Segments Left by one: 2
+      . Update the DA with the next segment found in
+        Segment List[2]. DA is set to F.
+      . Forward the packet to F.
+
+   . When packet arrives in F (second segment), F does:
+      . Decrement Segments Left by one: 1
+      . Update the DA with the next segment found in
+        Segment List[1]. DA is set to J.
+      . Forward the packet to J.
+
+   . Packet travels across G and H nodes which do plain
+     IPv6 forwarding based on DA. No inspection of SRH needs
+     to be done in these nodes. However, any SR capable node
+     is allowed to set the Protected bit in case of FRR
+     protection.
+
+   . When packet arrives in J (third segment), J does:
+      . Decrement Segments Left by one: 0
+      . Update the DA with the next segment found in
+        Segment List[0]. DA is set to X.
+      . If the cleanup bit is set, then node J will strip out
+        the SRH from the packet.
+      . Forward the packet to X.
+
+
+
+Previdi, et al.           Expires June 12, 2015                [Page 20]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+   The packet arrives in the server that may or may not support SR.  The
+   return traffic, from server to host, may be sent using the same
+   procedures.
+
+9.  IANA Considerations
+
+   TBD
+
+10.  Manageability Considerations
+
+   TBD
+
+11.  Security Considerations
+
+   Security mechanisms applied to Segment Routing over IPv6 networks are
+   detailed in [I-D.vyncke-6man-segment-routing-security].
+
+12.  Contributors
+
+   The authors would like to thank Dave Barach, John Leddy, John
+   Brzozowski, Pierre Francois, Nagendra Kumar, Mark Townsley, Christian
+   Martin, Roberta Maglione, Eric Vyncke, James Connolly, David Lebrun
+   and Fred Baker for their contribution to this document.
+
+13.  Acknowledgements
+
+   TBD
+
+14.  References
+
+14.1.  Normative References
+
+   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
+              Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [RFC2460]  Deering, S. and R. Hinden, "Internet Protocol, Version 6
+              (IPv6) Specification", RFC 2460, December 1998.
+
+14.2.  Informative References
+
+   [I-D.filsfils-spring-segment-routing]
+              Filsfils, C., Previdi, S., Bashandy, A., Decraene, B.,
+              Litkowski, S., Horneffer, M., Milojevic, I., Shakir, R.,
+              Ytti, S., Henderickx, W., Tantsura, J., and E. Crabbe,
+              "Segment Routing Architecture", draft-filsfils-spring-
+              segment-routing-04 (work in progress), July 2014.
+
+
+
+
+
+Previdi, et al.           Expires June 12, 2015                [Page 21]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+   [I-D.filsfils-spring-segment-routing-mpls]
+              Filsfils, C., Previdi, S., Bashandy, A., Decraene, B.,
+              Litkowski, S., Horneffer, M., Milojevic, I., Shakir, R.,
+              Ytti, S., Henderickx, W., Tantsura, J., and E. Crabbe,
+              "Segment Routing with MPLS data plane", draft-filsfils-
+              spring-segment-routing-mpls-03 (work in progress), August
+              2014.
+
+   [I-D.filsfils-spring-segment-routing-use-cases]
+              Filsfils, C., Francois, P., Previdi, S., Decraene, B.,
+              Litkowski, S., Horneffer, M., Milojevic, I., Shakir, R.,
+              Ytti, S., Henderickx, W., Tantsura, J., Kini, S., and E.
+              Crabbe, "Segment Routing Use Cases", draft-filsfils-
+              spring-segment-routing-use-cases-01 (work in progress),
+              October 2014.
+
+   [I-D.ietf-isis-segment-routing-extensions]
+              Previdi, S., Filsfils, C., Bashandy, A., Gredler, H.,
+              Litkowski, S., Decraene, B., and J. Tantsura, "IS-IS
+              Extensions for Segment Routing", draft-ietf-isis-segment-
+              routing-extensions-03 (work in progress), October 2014.
+
+   [I-D.ietf-spring-ipv6-use-cases]
+              Brzozowski, J., Leddy, J., Leung, I., Previdi, S.,
+              Townsley, W., Martin, C., Filsfils, C., and R. Maglione,
+              "IPv6 SPRING Use Cases", draft-ietf-spring-ipv6-use-
+              cases-03 (work in progress), November 2014.
+
+   [I-D.psenak-ospf-segment-routing-ospfv3-extension]
+              Psenak, P., Previdi, S., Filsfils, C., Gredler, H.,
+              Shakir, R., Henderickx, W., and J. Tantsura, "OSPFv3
+              Extensions for Segment Routing", draft-psenak-ospf-
+              segment-routing-ospfv3-extension-02 (work in progress),
+              July 2014.
+
+   [I-D.vyncke-6man-segment-routing-security]
+              Vyncke, E. and S. Previdi, "IPv6 Segment Routing Header
+              (SRH) Security Considerations", July 2014.
+
+   [RFC1940]  Estrin, D., Li, T., Rekhter, Y., Varadhan, K., and D.
+              Zappala, "Source Demand Routing: Packet Format and
+              Forwarding Specification (Version 1)", RFC 1940, May 1996.
+
+Authors' Addresses
+
+
+
+
+
+
+
+Previdi, et al.           Expires June 12, 2015                [Page 22]
+
+Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
+
+
+   Stefano Previdi (editor)
+   Cisco Systems, Inc.
+   Via Del Serafico, 200
+   Rome  00142
+   Italy
+
+   Email: sprevidi@cisco.com
+
+
+   Clarence Filsfils
+   Cisco Systems, Inc.
+   Brussels
+   BE
+
+   Email: cfilsfil@cisco.com
+
+
+   Brian Field
+   Comcast
+   4100 East Dry Creek Road
+   Centennial, CO  80122
+   US
+
+   Email: Brian_Field@cable.comcast.com
+
+
+   Ida Leung
+   Rogers Communications
+   8200 Dixie Road
+   Brampton, ON  L6T 0C1
+   CA
+
+   Email: Ida.Leung@rci.rogers.com
diff --git a/src/vnet/sr/sr.c b/src/vnet/sr/sr.c
new file mode 100644
index 00000000..5d0275d9
--- /dev/null
+++ b/src/vnet/sr/sr.c
@@ -0,0 +1,3333 @@
+/*
+ * sr.c: ipv6 segment routing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file
+ * @brief Segment Routing main functions
+ *
+ */
+#include <vnet/vnet.h>
+#include <vnet/sr/sr.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/dpo/dpo.h>
+
+#include <openssl/hmac.h>
+
+ip6_sr_main_t sr_main;
+static vlib_node_registration_t sr_local_node;
+
+/**
+ * @brief Dynamically added SR DPO type
+ */
+static dpo_type_t sr_dpo_type;
+
+/**
+ * @brief Use passed HMAC key in ip6_sr_header_t in OpenSSL HMAC routines
+ *
+ * @param sm ip6_sr_main_t *
+ * @param ip ip6_header_t *
+ * @param sr ip6_sr_header_t *
+ */
+void
+sr_fix_hmac (ip6_sr_main_t * sm, ip6_header_t * ip, ip6_sr_header_t * sr)
+{
+  u32 key_index;
+  static u8 *keybuf;
+  u8 *copy_target;
+  int first_segment;
+  ip6_address_t *addrp;
+  int i;
+  ip6_sr_hmac_key_t *hmac_key;
+  u32 sig_len;
+
+  key_index = sr->hmac_key;
+
+  /* No signature? Pass... */
+  if (key_index == 0)
+    return;
+
+  /* We don't know about this key? Fail... */
+  if (key_index >= vec_len (sm->hmac_keys))
+    return;
+
+  hmac_key = sm->hmac_keys + key_index;
+
+  vec_reset_length (keybuf);
+
+  /* pkt ip6 src address */
+  vec_add2 (keybuf, copy_target, sizeof (ip6_address_t));
+  clib_memcpy (copy_target, ip->src_address.as_u8, sizeof (ip6_address_t));
+
+  /* first segment */
+  vec_add2 (keybuf, copy_target, 1);
+  copy_target[0] = sr->first_segment;
+
+  /* octet w/ bit 0 = "clean" flag */
+  vec_add2 (keybuf, copy_target, 1);
+  copy_target[0]
+    = (sr->flags & clib_host_to_net_u16 (IP6_SR_HEADER_FLAG_CLEANUP))
+    ? 0x80 : 0;
+
+  /* hmac key id */
+  vec_add2 (keybuf, copy_target, 1);
+  copy_target[0] = sr->hmac_key;
+
+  first_segment = sr->first_segment;
+
+  addrp = sr->segments;
+
+  /* segments */
+  for (i = 0; i <= first_segment; i++)
+    {
+      vec_add2 (keybuf, copy_target, sizeof (ip6_address_t));
+      clib_memcpy (copy_target, addrp->as_u8, sizeof (ip6_address_t));
+      addrp++;
+    }
+
+  addrp++;
+
+  HMAC_CTX_init (sm->hmac_ctx);
+  if (!HMAC_Init (sm->hmac_ctx, hmac_key->shared_secret,
+		  vec_len (hmac_key->shared_secret), sm->md))
+    clib_warning ("barf1");
+  if (!HMAC_Update (sm->hmac_ctx, keybuf, vec_len (keybuf)))
+    clib_warning ("barf2");
+  if (!HMAC_Final (sm->hmac_ctx, (unsigned char *) addrp, &sig_len))
+    clib_warning ("barf3");
+  HMAC_CTX_cleanup (sm->hmac_ctx);
+}
+
+/**
+ * @brief Format function for decoding various SR flags
+ *
+ * @param s u8 * - formatted string
+ * @param args va_list * - u16 flags
+ *
+ * @return formatted output string u8 *
+ */
+u8 *
+format_ip6_sr_header_flags (u8 * s, va_list * args)
+{
+  u16 flags = (u16) va_arg (*args, int);
+  u8 pl_flag;
+  int bswap_needed = va_arg (*args, int);
+  int i;
+
+  if (bswap_needed)
+    flags = clib_host_to_net_u16 (flags);
+
+  if (flags & IP6_SR_HEADER_FLAG_CLEANUP)
+    s = format (s, "cleanup ");
+
+  if (flags & IP6_SR_HEADER_FLAG_PROTECTED)
+    s = format (s, "reroute ");
+
+  s = format (s, "pl: ");
+  for (i = 1; i <= 4; i++)
+    {
+      pl_flag = ip6_sr_policy_list_flags (flags, i);
+      s = format (s, "[%d] ", i);
+
+      switch (pl_flag)
+	{
+	case IP6_SR_HEADER_FLAG_PL_ELT_NOT_PRESENT:
+	  s = format (s, "NotPr ");
+	  break;
+	case IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE:
+	  s = format (s, "InPE ");
+	  break;
+	case IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE:
+	  s = format (s, "EgPE ");
+	  break;
+
+	case IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR:
+	  s = format (s, "OrgSrc ");
+	  break;
+	}
+    }
+  return s;
+}
+
+/**
+ * @brief Format function for decoding ip6_sr_header_t
+ *
+ * @param s u8 * - formatted string
+ * @param args va_list * - ip6_sr_header_t
+ *
+ * @return formatted output string u8 *
+ */
+u8 *
+format_ip6_sr_header (u8 * s, va_list * args)
+{
+  ip6_sr_header_t *h = va_arg (*args, ip6_sr_header_t *);
+  ip6_address_t placeholder_addr =
+    { {254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254,
+       254, 254}
+  };
+  int print_hmac = va_arg (*args, int);
+  int i, pl_index, max_segs;
+  int flags_host_byte_order = clib_net_to_host_u16 (h->flags);
+
+  s = format (s, "next proto %d, len %d, type %d",
+	      h->protocol, (h->length << 3) + 8, h->type);
+  s = format (s, "\n      segs left %d, first_segment %d, hmac key %d",
+	      h->segments_left, h->first_segment, h->hmac_key);
+  s = format (s, "\n      flags %U", format_ip6_sr_header_flags,
+	      flags_host_byte_order, 0 /* bswap needed */ );
+
+  /*
+   * Header length is in 8-byte units (minus one), so
+   * divide by 2 to ascertain the number of ip6 addresses in the
+   * segment list
+   */
+  max_segs = (h->length >> 1);
+
+  if (!print_hmac && h->hmac_key)
+    max_segs -= 2;
+
+  s = format (s, "\n  Segments (in processing order):");
+
+  for (i = h->first_segment; i >= 1; i--)
+    s = format (s, "\n  %U", format_ip6_address, h->segments + i);
+  if (ip6_address_is_equal (&placeholder_addr, h->segments))
+    s = format (s, "\n  (empty placeholder)");
+  else
+    s = format (s, "\n  %U", format_ip6_address, h->segments);
+
+  s = format (s, "\n  Policy List:");
+
+  pl_index = 1;			/* to match the RFC text */
+  for (i = (h->first_segment + 1); i < max_segs; i++, pl_index++)
+    {
+      char *tag;
+      char *tags[] = { " ", "InPE: ", "EgPE: ", "OrgSrc: " };
+
+      tag = tags[0];
+      if (pl_index >= 1 && pl_index <= 4)
+	{
+	  int this_pl_flag = ip6_sr_policy_list_flags
+	    (flags_host_byte_order, pl_index);
+	  tag = tags[this_pl_flag];
+	}
+
+      s = format (s, "\n  %s%U", tag, format_ip6_address, h->segments + i);
+    }
+
+  return s;
+}
+
+/**
+ * @brief Format function for decoding ip6_sr_header_t with length
+ *
+ * @param s u8 * - formatted string
+ * @param args va_list * - ip6_header_t + ip6_sr_header_t
+ *
+ * @return formatted output string u8 *
+ */
+u8 *
+format_ip6_sr_header_with_length (u8 * s, va_list * args)
+{
+  ip6_header_t *h = va_arg (*args, ip6_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+  uword header_bytes;
+
+  header_bytes = sizeof (h[0]) + sizeof (ip6_sr_header_t);
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    return format (s, "ip6_sr header truncated");
+
+  s = format (s, "IP6: %U\n", format_ip6_header, h, max_header_bytes);
+  s =
+    format (s, "SR: %U\n", format_ip6_sr_header, (ip6_sr_header_t *) (h + 1),
+	    0 /* print_hmac */ , max_header_bytes);
+  return s;
+}
+
+/**
+ * @brief Defined valid next nodes
+ * @note Cannot call replicate yet without DPDK
+*/
+#if DPDK > 0
+#define foreach_sr_rewrite_next                 \
+_(ERROR, "error-drop")                          \
+_(IP6_LOOKUP, "ip6-lookup")                     \
+_(SR_LOCAL, "sr-local")                         \
+_(SR_REPLICATE,"sr-replicate")
+#else
+#define foreach_sr_rewrite_next                 \
+_(ERROR, "error-drop")                          \
+_(IP6_LOOKUP, "ip6-lookup")                     \
+_(SR_LOCAL, "sr-local")
+#endif /* DPDK */
+
+/**
+ * @brief Struct for defined valid next nodes
+*/
+typedef enum
+{
+#define _(s,n) SR_REWRITE_NEXT_##s,
+  foreach_sr_rewrite_next
+#undef _
+    SR_REWRITE_N_NEXT,
+} sr_rewrite_next_t;
+
+/**
+ * @brief Struct for data for SR rewrite packet trace
+ */
+typedef struct
+{
+  ip6_address_t src, dst;
+  u16 length;
+  u32 next_index;
+  u32 tunnel_index;
+  u8 sr[256];
+} sr_rewrite_trace_t;
+
+/**
+ * @brief Error strings for SR rewrite
+ */
+static char *sr_rewrite_error_strings[] = {
+#define sr_error(n,s) s,
+#include "sr_error.def"
+#undef sr_error
+};
+
+/**
+ * @brief Struct for SR rewrite error strings
+ */
+typedef enum
+{
+#define sr_error(n,s) SR_REWRITE_ERROR_##n,
+#include "sr_error.def"
+#undef sr_error
+  SR_REWRITE_N_ERROR,
+} sr_rewrite_error_t;
+
+
+/**
+ * @brief Format function for SR rewrite trace.
+ */
+u8 *
+format_sr_rewrite_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  sr_rewrite_trace_t *t = va_arg (*args, sr_rewrite_trace_t *);
+  ip6_sr_main_t *sm = &sr_main;
+  ip6_sr_tunnel_t *tun = pool_elt_at_index (sm->tunnels, t->tunnel_index);
+  ip6_fib_t *rx_fib, *tx_fib;
+
+  rx_fib = ip6_fib_get (tun->rx_fib_index);
+  tx_fib = ip6_fib_get (tun->tx_fib_index);
+
+  s = format
+    (s, "SR-REWRITE: next %s ip6 src %U dst %U len %u\n"
+     "           rx-fib-id %d tx-fib-id %d\n%U",
+     (t->next_index == SR_REWRITE_NEXT_SR_LOCAL)
+     ? "sr-local" : "ip6-lookup",
+     format_ip6_address, &t->src,
+     format_ip6_address, &t->dst, t->length,
+     rx_fib->table_id, tx_fib->table_id,
+     format_ip6_sr_header, t->sr, 0 /* print_hmac */ );
+  return s;
+}
+
+/**
+ * @brief Main processing dual-loop for Segment Routing Rewrite
+ * @node sr-rewrite
+ *
+ * @param vm vlib_main_t *
+ * @param node vlib_node_runtime_t *
+ * @param from_frame vlib_frame_t *
+ *
+ * @return from_frame->n_vectors uword
+ */
+static uword
+sr_rewrite (vlib_main_t * vm,
+	    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  u32 n_left_from, next_index, *from, *to_next;
+  ip6_sr_main_t *sm = &sr_main;
+  u32 (*sr_local_cb) (vlib_main_t *, vlib_node_runtime_t *,
+		      vlib_buffer_t *, ip6_header_t *, ip6_sr_header_t *);
+  sr_local_cb = sm->sr_local_cb;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /* Note 2x loop disabled */
+      while (0 && n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  ip6_header_t *ip0, *ip1;
+	  ip6_sr_header_t *sr0, *sr1;
+	  ip6_sr_tunnel_t *t0, *t1;
+	  u32 next0 = SR_REWRITE_NEXT_IP6_LOOKUP;
+	  u32 next1 = SR_REWRITE_NEXT_IP6_LOOKUP;
+	  u16 new_l0 = 0;
+	  u16 new_l1 = 0;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /*
+	   * $$$ parse through header(s) to pick the point
+	   * where we punch in the SR extention header
+	   */
+	  t0 =
+	    pool_elt_at_index (sm->tunnels,
+			       vnet_buffer (b0)->ip.adj_index[VLIB_TX]);
+	  t1 =
+	    pool_elt_at_index (sm->tunnels,
+			       vnet_buffer (b1)->ip.adj_index[VLIB_TX]);
+
+	  ASSERT (VLIB_BUFFER_PRE_DATA_SIZE
+		  >= ((word) vec_len (t0->rewrite)) + b0->current_data);
+	  ASSERT (VLIB_BUFFER_PRE_DATA_SIZE
+		  >= ((word) vec_len (t1->rewrite)) + b1->current_data);
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = t0->tx_fib_index;
+	  vnet_buffer (b1)->sw_if_index[VLIB_TX] = t1->tx_fib_index;
+
+	  ip0 = vlib_buffer_get_current (b0);
+	  ip1 = vlib_buffer_get_current (b1);
+#if DPDK > 0			/* Cannot call replication node yet without DPDK */
+	  /* add a replication node */
+	  if (PREDICT_FALSE (t0->policy_index != ~0))
+	    {
+	      vnet_buffer (b0)->ip.save_protocol = t0->policy_index;
+	      next0 = SR_REWRITE_NEXT_SR_REPLICATE;
+	      sr0 = (ip6_sr_header_t *) (t0->rewrite);
+	      goto processnext;
+	    }
+#endif /* DPDK */
+
+	  /*
+	   * SR-unaware service chaining case: pkt coming back from
+	   * service has the original dst address, and will already
+	   * have an SR header. If so, send it to sr-local
+	   */
+	  if (PREDICT_FALSE (ip0->protocol == IPPROTO_IPV6_ROUTE))
+	    {
+	      vlib_buffer_advance (b0, sizeof (ip0));
+	      sr0 = (ip6_sr_header_t *) (ip0 + 1);
+	      new_l0 = clib_net_to_host_u16 (ip0->payload_length);
+	      next0 = SR_REWRITE_NEXT_SR_LOCAL;
+	    }
+	  else
+	    {
+	      u32 len_bytes = sizeof (ip6_header_t);
+	      u8 next_hdr = ip0->protocol;
+
+	      /* HBH must immediately follow ipv6 header */
+	      if (PREDICT_FALSE
+		  (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+		{
+		  ip6_hop_by_hop_ext_t *ext_hdr =
+		    (ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
+		  len_bytes +=
+		    ip6_ext_header_len ((ip6_ext_header_t *) ext_hdr);
+		  /* Ignoring the sr_local for now, if RH follows HBH here */
+		  next_hdr = ext_hdr->next_hdr;
+		  ext_hdr->next_hdr = IPPROTO_IPV6_ROUTE;
+		}
+	      else
+		{
+		  ip0->protocol = IPPROTO_IPV6_ROUTE;	/* routing extension header */
+		}
+	      /*
+	       * Copy data before the punch-in point left by the
+	       * required amount. Assume (for the moment) that only
+	       * the main packet header needs to be copied.
+	       */
+	      clib_memcpy (((u8 *) ip0) - vec_len (t0->rewrite),
+			   ip0, len_bytes);
+	      vlib_buffer_advance (b0, -(word) vec_len (t0->rewrite));
+	      ip0 = vlib_buffer_get_current (b0);
+	      sr0 = (ip6_sr_header_t *) ((u8 *) ip0 + len_bytes);
+	      /* $$$ tune */
+	      clib_memcpy (sr0, t0->rewrite, vec_len (t0->rewrite));
+
+	      /* Fix the next header chain */
+	      sr0->protocol = next_hdr;
+
+	      new_l0 = clib_net_to_host_u16 (ip0->payload_length) +
+		vec_len (t0->rewrite);
+	      ip0->payload_length = clib_host_to_net_u16 (new_l0);
+
+	      /* Copy dst address into the DA slot in the segment list */
+	      clib_memcpy (sr0->segments, ip0->dst_address.as_u64,
+			   sizeof (ip6_address_t));
+	      /* Rewrite the ip6 dst address with the first hop */
+	      clib_memcpy (ip0->dst_address.as_u64, t0->first_hop.as_u64,
+			   sizeof (ip6_address_t));
+
+	      sr_fix_hmac (sm, ip0, sr0);
+
+	      next0 = sr_local_cb ? sr_local_cb (vm, node, b0, ip0, sr0) :
+		next0;
+
+	      /*
+	       * Ignore "do not rewrite" shtik in this path
+	       */
+	      if (PREDICT_FALSE (next0 & 0x80000000))
+		{
+		  next0 ^= 0xFFFFFFFF;
+		  if (PREDICT_FALSE (next0 == SR_REWRITE_NEXT_ERROR))
+		    b0->error = node->errors[SR_REWRITE_ERROR_APP_CALLBACK];
+		}
+	    }
+#if DPDK > 0			/* Cannot call replication node yet without DPDK */
+	processnext:
+	  /* add a replication node */
+	  if (PREDICT_FALSE (t1->policy_index != ~0))
+	    {
+	      vnet_buffer (b1)->ip.save_protocol = t1->policy_index;
+	      next1 = SR_REWRITE_NEXT_SR_REPLICATE;
+	      sr1 = (ip6_sr_header_t *) (t1->rewrite);
+	      goto trace00;
+	    }
+#endif /* DPDK */
+	  if (PREDICT_FALSE (ip1->protocol == IPPROTO_IPV6_ROUTE))
+	    {
+	      vlib_buffer_advance (b1, sizeof (ip1));
+	      sr1 = (ip6_sr_header_t *) (ip1 + 1);
+	      new_l1 = clib_net_to_host_u16 (ip1->payload_length);
+	      next1 = SR_REWRITE_NEXT_SR_LOCAL;
+	    }
+	  else
+	    {
+	      u32 len_bytes = sizeof (ip6_header_t);
+	      u8 next_hdr = ip1->protocol;
+
+	      /* HBH must immediately follow ipv6 header */
+	      if (PREDICT_FALSE
+		  (ip1->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+		{
+		  ip6_hop_by_hop_ext_t *ext_hdr =
+		    (ip6_hop_by_hop_ext_t *) ip6_next_header (ip1);
+		  len_bytes +=
+		    ip6_ext_header_len ((ip6_ext_header_t *) ext_hdr);
+		  /* Ignoring the sr_local for now, if RH follows HBH here */
+		  next_hdr = ext_hdr->next_hdr;
+		  ext_hdr->next_hdr = IPPROTO_IPV6_ROUTE;
+		}
+	      else
+		{
+		  ip1->protocol = IPPROTO_IPV6_ROUTE;
+		}
+	      /*
+	       * Copy data before the punch-in point left by the
+	       * required amount. Assume (for the moment) that only
+	       * the main packet header needs to be copied.
+	       */
+	      clib_memcpy (((u8 *) ip1) - vec_len (t1->rewrite),
+			   ip1, len_bytes);
+	      vlib_buffer_advance (b1, -(word) vec_len (t1->rewrite));
+	      ip1 = vlib_buffer_get_current (b1);
+	      sr1 = (ip6_sr_header_t *) ((u8 *) ip1 + len_bytes);
+	      clib_memcpy (sr1, t1->rewrite, vec_len (t1->rewrite));
+
+	      sr1->protocol = next_hdr;
+	      new_l1 = clib_net_to_host_u16 (ip1->payload_length) +
+		vec_len (t1->rewrite);
+	      ip1->payload_length = clib_host_to_net_u16 (new_l1);
+
+	      /* Copy dst address into the DA slot in the segment list */
+	      clib_memcpy (sr1->segments, ip1->dst_address.as_u64,
+			   sizeof (ip6_address_t));
+	      /* Rewrite the ip6 dst address with the first hop */
+	      clib_memcpy (ip1->dst_address.as_u64, t1->first_hop.as_u64,
+			   sizeof (ip6_address_t));
+
+	      sr_fix_hmac (sm, ip1, sr1);
+
+	      next1 = sr_local_cb ? sr_local_cb (vm, node, b1, ip1, sr1) :
+		next1;
+
+	      /*
+	       * Ignore "do not rewrite" shtik in this path
+	       */
+	      if (PREDICT_FALSE (next1 & 0x80000000))
+		{
+		  next1 ^= 0xFFFFFFFF;
+		  if (PREDICT_FALSE (next1 == SR_REWRITE_NEXT_ERROR))
+		    b1->error = node->errors[SR_REWRITE_ERROR_APP_CALLBACK];
+		}
+	    }
+#if DPDK > 0			/* Cannot run replicate without DPDK and only replicate uses this label */
+	trace00:
+#endif /* DPDK */
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      sr_rewrite_trace_t *tr = vlib_add_trace (vm, node,
+						       b0, sizeof (*tr));
+	      tr->tunnel_index = t0 - sm->tunnels;
+	      clib_memcpy (tr->src.as_u8, ip0->src_address.as_u8,
+			   sizeof (tr->src.as_u8));
+	      clib_memcpy (tr->dst.as_u8, ip0->dst_address.as_u8,
+			   sizeof (tr->dst.as_u8));
+	      tr->length = new_l0;
+	      tr->next_index = next0;
+	      if (sr0)
+		clib_memcpy (tr->sr, sr0, sizeof (tr->sr));
+	    }
+	  if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      sr_rewrite_trace_t *tr = vlib_add_trace (vm, node,
+						       b1, sizeof (*tr));
+	      tr->tunnel_index = t1 - sm->tunnels;
+	      clib_memcpy (tr->src.as_u8, ip1->src_address.as_u8,
+			   sizeof (tr->src.as_u8));
+	      clib_memcpy (tr->dst.as_u8, ip1->dst_address.as_u8,
+			   sizeof (tr->dst.as_u8));
+	      tr->length = new_l1;
+	      tr->next_index = next1;
+	      if (sr1)
+		clib_memcpy (tr->sr, sr1, sizeof (tr->sr));
+	    }
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  ip6_header_t *ip0 = 0;
+	  ip6_sr_header_t *sr0 = 0;
+	  ip6_sr_tunnel_t *t0;
+	  u32 next0 = SR_REWRITE_NEXT_IP6_LOOKUP;
+	  u16 new_l0 = 0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+
+	  /*
+	   * $$$ parse through header(s) to pick the point
+	   * where we punch in the SR extention header
+	   */
+	  t0 =
+	    pool_elt_at_index (sm->tunnels,
+			       vnet_buffer (b0)->ip.adj_index[VLIB_TX]);
+#if DPDK > 0			/* Cannot call replication node yet without DPDK */
+	  /* add a replication node */
+	  if (PREDICT_FALSE (t0->policy_index != ~0))
+	    {
+	      vnet_buffer (b0)->ip.save_protocol = t0->policy_index;
+	      next0 = SR_REWRITE_NEXT_SR_REPLICATE;
+	      sr0 = (ip6_sr_header_t *) (t0->rewrite);
+	      goto trace0;
+	    }
+#endif /* DPDK */
+
+	  ASSERT (VLIB_BUFFER_PRE_DATA_SIZE
+		  >= ((word) vec_len (t0->rewrite)) + b0->current_data);
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = t0->tx_fib_index;
+
+	  ip0 = vlib_buffer_get_current (b0);
+
+	  /*
+	   * SR-unaware service chaining case: pkt coming back from
+	   * service has the original dst address, and will already
+	   * have an SR header. If so, send it to sr-local
+	   */
+	  if (PREDICT_FALSE (ip0->protocol == IPPROTO_IPV6_ROUTE))
+	    {
+	      vlib_buffer_advance (b0, sizeof (ip0));
+	      sr0 = (ip6_sr_header_t *) (ip0 + 1);
+	      new_l0 = clib_net_to_host_u16 (ip0->payload_length);
+	      next0 = SR_REWRITE_NEXT_SR_LOCAL;
+	    }
+	  else
+	    {
+	      u32 len_bytes = sizeof (ip6_header_t);
+	      u8 next_hdr = ip0->protocol;
+
+	      /* HBH must immediately follow ipv6 header */
+	      if (PREDICT_FALSE
+		  (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+		{
+		  ip6_hop_by_hop_ext_t *ext_hdr =
+		    (ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
+		  len_bytes +=
+		    ip6_ext_header_len ((ip6_ext_header_t *) ext_hdr);
+		  next_hdr = ext_hdr->next_hdr;
+		  ext_hdr->next_hdr = IPPROTO_IPV6_ROUTE;
+		  /* Ignoring the sr_local for now, if RH follows HBH here */
+		}
+	      else
+		{
+		  ip0->protocol = IPPROTO_IPV6_ROUTE;	/* routing extension header */
+		}
+	      /*
+	       * Copy data before the punch-in point left by the
+	       * required amount. Assume (for the moment) that only
+	       * the main packet header needs to be copied.
+	       */
+	      clib_memcpy (((u8 *) ip0) - vec_len (t0->rewrite),
+			   ip0, len_bytes);
+	      vlib_buffer_advance (b0, -(word) vec_len (t0->rewrite));
+	      ip0 = vlib_buffer_get_current (b0);
+	      sr0 = (ip6_sr_header_t *) ((u8 *) ip0 + len_bytes);
+	      /* $$$ tune */
+	      clib_memcpy (sr0, t0->rewrite, vec_len (t0->rewrite));
+
+	      /* Fix the next header chain */
+	      sr0->protocol = next_hdr;
+	      new_l0 = clib_net_to_host_u16 (ip0->payload_length) +
+		vec_len (t0->rewrite);
+	      ip0->payload_length = clib_host_to_net_u16 (new_l0);
+
+	      /* Copy dst address into the DA slot in the segment list */
+	      clib_memcpy (sr0->segments, ip0->dst_address.as_u64,
+			   sizeof (ip6_address_t));
+	      /* Rewrite the ip6 dst address with the first hop */
+	      clib_memcpy (ip0->dst_address.as_u64, t0->first_hop.as_u64,
+			   sizeof (ip6_address_t));
+
+	      sr_fix_hmac (sm, ip0, sr0);
+
+	      next0 = sr_local_cb ? sr_local_cb (vm, node, b0, ip0, sr0) :
+		next0;
+
+	      /*
+	       * Ignore "do not rewrite" shtik in this path
+	       */
+	      if (PREDICT_FALSE (next0 & 0x80000000))
+		{
+		  next0 ^= 0xFFFFFFFF;
+		  if (PREDICT_FALSE (next0 == SR_REWRITE_NEXT_ERROR))
+		    b0->error = node->errors[SR_REWRITE_ERROR_APP_CALLBACK];
+		}
+	    }
+#if DPDK > 0			/* Cannot run replicate without DPDK and only replicate uses this label */
+	trace0:
+#endif /* DPDK */
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      sr_rewrite_trace_t *tr = vlib_add_trace (vm, node,
+						       b0, sizeof (*tr));
+	      tr->tunnel_index = t0 - sm->tunnels;
+	      if (ip0)
+		{
+		  memcpy (tr->src.as_u8, ip0->src_address.as_u8,
+			  sizeof (tr->src.as_u8));
+		  memcpy (tr->dst.as_u8, ip0->dst_address.as_u8,
+			  sizeof (tr->dst.as_u8));
+		}
+	      tr->length = new_l0;
+	      tr->next_index = next0;
+	      if (sr0)
+		clib_memcpy (tr->sr, sr0, sizeof (tr->sr));
+	    }
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return from_frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (sr_rewrite_node) = {
+  .function = sr_rewrite,
+  .name = "sr-rewrite",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+  .format_trace = format_sr_rewrite_trace,
+  .format_buffer = format_ip6_sr_header_with_length,
+
+  .n_errors = SR_REWRITE_N_ERROR,
+  .error_strings = sr_rewrite_error_strings,
+
+  .runtime_data_bytes = 0,
+
+  .n_next_nodes = SR_REWRITE_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [SR_REWRITE_NEXT_##s] = n,
+    foreach_sr_rewrite_next
+#undef _
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (sr_rewrite_node, sr_rewrite)
+/* *INDENT-ON* */
+
+static int
+ip6_delete_route_no_next_hop (ip6_address_t * dst_address_arg,
+			      u32 dst_address_length, u32 rx_table_id)
+{
+  fib_prefix_t pfx = {
+    .fp_len = dst_address_length,
+    .fp_proto = FIB_PROTOCOL_IP6,
+    .fp_addr = {
+		.ip6 = *dst_address_arg,
+		}
+  };
+
+  fib_table_entry_delete (fib_table_id_find_fib_index (FIB_PROTOCOL_IP6,
+						       rx_table_id),
+			  &pfx, FIB_SOURCE_SR);
+
+  return 0;
+}
+
+/**
+ * @brief Find or add if not found - HMAC shared secret
+ *
+ * @param sm ip6_sr_main_t *
+ * @param secret u8 *
+ * @param indexp u32 *
+ *
+ * @return ip6_sr_hmac_key_t *
+ */
+static ip6_sr_hmac_key_t *
+find_or_add_shared_secret (ip6_sr_main_t * sm, u8 * secret, u32 * indexp)
+{
+  uword *p;
+  ip6_sr_hmac_key_t *key = 0;
+  int i;
+
+  p = hash_get_mem (sm->hmac_key_by_shared_secret, secret);
+
+  if (p)
+    {
+      key = vec_elt_at_index (sm->hmac_keys, p[0]);
+      if (indexp)
+	*indexp = p[0];
+      return (key);
+    }
+
+  /* Specific key ID? */
+  if (indexp && *indexp)
+    {
+      vec_validate (sm->hmac_keys, *indexp);
+      key = sm->hmac_keys + *indexp;
+    }
+  else
+    {
+      for (i = 0; i < vec_len (sm->hmac_keys); i++)
+	{
+	  if (sm->hmac_keys[i].shared_secret == 0)
+	    {
+	      key = sm->hmac_keys + i;
+	      goto found;
+	    }
+	}
+      vec_validate (sm->hmac_keys, i);
+      key = sm->hmac_keys + i;
+    found:
+      ;
+    }
+
+  key->shared_secret = vec_dup (secret);
+
+  hash_set_mem (sm->hmac_key_by_shared_secret, key->shared_secret,
+		key - sm->hmac_keys);
+
+  if (indexp)
+    *indexp = key - sm->hmac_keys;
+  return (key);
+}
+
+/**
+ * @brief Add or Delete a Segment Routing tunnel.
+ *
+ * @param a ip6_sr_add_del_tunnel_args_t *
+ *
+ * @return retval int
+ */
+int
+ip6_sr_add_del_tunnel (ip6_sr_add_del_tunnel_args_t * a)
+{
+  ip6_main_t *im = &ip6_main;
+  ip6_sr_tunnel_key_t key;
+  ip6_sr_tunnel_t *t;
+  uword *p, *n;
+  ip6_sr_header_t *h = 0;
+  u32 header_length;
+  ip6_address_t *addrp, *this_address;
+  ip6_sr_main_t *sm = &sr_main;
+  u8 *key_copy;
+  u32 rx_fib_index, tx_fib_index;
+  u32 hmac_key_index_u32;
+  u8 hmac_key_index = 0;
+  ip6_sr_policy_t *pt;
+  int i;
+  dpo_id_t dpo = DPO_INVALID;
+
+  /* Make sure that the rx FIB exists */
+  p = hash_get (im->fib_index_by_table_id, a->rx_table_id);
+
+  if (p == 0)
+    return -3;
+
+  /* remember the FIB index */
+  rx_fib_index = p[0];
+
+  /* Make sure that the supplied FIB exists */
+  p = hash_get (im->fib_index_by_table_id, a->tx_table_id);
+
+  if (p == 0)
+    return -4;
+
+  /* remember the FIB index */
+  tx_fib_index = p[0];
+
+  clib_memcpy (key.src.as_u8, a->src_address->as_u8, sizeof (key.src));
+  clib_memcpy (key.dst.as_u8, a->dst_address->as_u8, sizeof (key.dst));
+
+  /* When adding a tunnel:
+   * - If a "name" is given, it must not exist.
+   * - The "key" is always checked, and must not exist.
+   * When deleting a tunnel:
+   * - If the "name" is given, and it exists, then use it.
+   * - If the "name" is not given, use the "key".
+   * - If the "name" and the "key" are given, then both must point to the same
+   *   thing.
+   */
+
+  /* Lookup the key */
+  p = hash_get_mem (sm->tunnel_index_by_key, &key);
+
+  /* If the name is given, look it up */
+  if (a->name)
+    n = hash_get_mem (sm->tunnel_index_by_name, a->name);
+  else
+    n = 0;
+
+  /* validate key/name parameters */
+  if (!a->is_del)		/* adding a tunnel */
+    {
+      if (a->name && n)		/* name given & exists already */
+	return -1;
+      if (p)			/* key exists already */
+	return -1;
+    }
+  else				/* deleting a tunnel */
+    {
+      if (!p)			/* key doesn't exist */
+	return -2;
+      if (a->name && !n)	/* name given & it doesn't exist */
+	return -2;
+
+      if (n)			/* name given & found */
+	{
+	  if (n[0] != p[0])	/* name and key do not point to the same thing */
+	    return -2;
+	}
+    }
+
+
+  if (a->is_del)		/* delete the tunnel */
+    {
+      hash_pair_t *hp;
+
+      /* Delete existing tunnel */
+      t = pool_elt_at_index (sm->tunnels, p[0]);
+
+      ip6_delete_route_no_next_hop (&t->key.dst, t->dst_mask_width,
+				    a->rx_table_id);
+      vec_free (t->rewrite);
+      /* Remove tunnel from any policy if associated */
+      if (t->policy_index != ~0)
+	{
+	  pt = pool_elt_at_index (sm->policies, t->policy_index);
+	  for (i = 0; i < vec_len (pt->tunnel_indices); i++)
+	    {
+	      if (pt->tunnel_indices[i] == t - sm->tunnels)
+		{
+		  vec_delete (pt->tunnel_indices, 1, i);
+		  goto found;
+		}
+	    }
+	  clib_warning ("Tunnel index %d not found in policy_index %d",
+			t - sm->tunnels, pt - sm->policies);
+	found:
+	  /* If this is last tunnel in the  policy, clean up the policy too */
+	  if (vec_len (pt->tunnel_indices) == 0)
+	    {
+	      hash_unset_mem (sm->policy_index_by_policy_name, pt->name);
+	      vec_free (pt->name);
+	      pool_put (sm->policies, pt);
+	    }
+	}
+
+      /* Clean up the tunnel by name */
+      if (t->name)
+	{
+	  hash_unset_mem (sm->tunnel_index_by_name, t->name);
+	  vec_free (t->name);
+	}
+      pool_put (sm->tunnels, t);
+      hp = hash_get_pair (sm->tunnel_index_by_key, &key);
+      key_copy = (void *) (hp->key);
+      hash_unset_mem (sm->tunnel_index_by_key, &key);
+      vec_free (key_copy);
+      return 0;
+    }
+
+  /* create a new tunnel */
+  pool_get (sm->tunnels, t);
+  memset (t, 0, sizeof (*t));
+  t->policy_index = ~0;
+
+  clib_memcpy (&t->key, &key, sizeof (t->key));
+  t->dst_mask_width = a->dst_mask_width;
+  t->rx_fib_index = rx_fib_index;
+  t->tx_fib_index = tx_fib_index;
+
+  if (!vec_len (a->segments))
+    /* there must be at least one segment... */
+    return -4;
+
+  /* The first specified hop goes right into the dst address */
+  clib_memcpy (&t->first_hop, &a->segments[0], sizeof (ip6_address_t));
+
+  /*
+   * Create the sr header rewrite string
+   * The list of segments needs an extra slot for the ultimate destination
+   * which is taken from the packet we add the SRH to.
+   */
+  header_length = sizeof (*h) +
+    sizeof (ip6_address_t) * (vec_len (a->segments) + 1 + vec_len (a->tags));
+
+  if (a->shared_secret)
+    {
+      /* Allocate a new key slot if we don't find the secret key */
+      hmac_key_index_u32 = 0;
+      (void) find_or_add_shared_secret (sm, a->shared_secret,
+					&hmac_key_index_u32);
+
+      /* Hey Vinz Clortho: Gozzer is pissed.. you're out of keys! */
+      if (hmac_key_index_u32 >= 256)
+	return -5;
+      hmac_key_index = hmac_key_index_u32;
+      header_length += SHA256_DIGEST_LENGTH;
+    }
+
+  vec_validate (t->rewrite, header_length - 1);
+
+  h = (ip6_sr_header_t *) t->rewrite;
+
+  h->protocol = 0xFF;		/* we don't know yet */
+
+  h->length = (header_length / 8) - 1;
+  h->type = ROUTING_HEADER_TYPE_SR;
+
+  /* first_segment and segments_left need to have the index of the last
+   * element in the list; a->segments has one element less than ends up
+   * in the header (it does not have the DA in it), so vec_len(a->segments)
+   * is the value we want.
+   */
+  h->first_segment = h->segments_left = vec_len (a->segments);
+
+  if (a->shared_secret)
+    h->hmac_key = hmac_key_index & 0xFF;
+
+  h->flags = a->flags_net_byte_order;
+
+  /* Paint on the segment list, in reverse.
+   * This is offset by one to leave room at the start for the ultimate
+   * destination.
+   */
+  addrp = h->segments + vec_len (a->segments);
+
+  vec_foreach (this_address, a->segments)
+  {
+    clib_memcpy (addrp->as_u8, this_address->as_u8, sizeof (ip6_address_t));
+    addrp--;
+  }
+
+  /*
+   * Since the ultimate destination address is not yet known, set that slot
+   * to a value we will instantly recognize as bogus.
+   */
+  memset (h->segments, 0xfe, sizeof (ip6_address_t));
+
+  /* Paint on the tag list, not reversed */
+  addrp = h->segments + vec_len (a->segments);
+
+  vec_foreach (this_address, a->tags)
+  {
+    clib_memcpy (addrp->as_u8, this_address->as_u8, sizeof (ip6_address_t));
+    addrp++;
+  }
+
+  key_copy = vec_new (ip6_sr_tunnel_key_t, 1);
+  clib_memcpy (key_copy, &key, sizeof (ip6_sr_tunnel_key_t));
+  hash_set_mem (sm->tunnel_index_by_key, key_copy, t - sm->tunnels);
+
+  /*
+   * Stick the tunnel index into the rewrite header.
+   *
+   * Unfortunately, inserting an SR header according to the various
+   * RFC's requires parsing through the ip6 header, perhaps consing a
+   * buffer onto the head of the vlib_buffer_t, etc. We don't use the
+   * normal reverse bcopy rewrite code.
+   *
+   * We don't handle ugly RFC-related cases yet, but I'm sure PL will complain
+   * at some point...
+   */
+  dpo_set (&dpo, sr_dpo_type, DPO_PROTO_IP6, t - sm->tunnels);
+
+  fib_prefix_t pfx = {
+    .fp_proto = FIB_PROTOCOL_IP6,
+    .fp_len = a->dst_mask_width,
+    .fp_addr = {
+		.ip6 = *a->dst_address,
+		}
+  };
+  fib_table_entry_special_dpo_add (rx_fib_index,
+				   &pfx,
+				   FIB_SOURCE_SR,
+				   FIB_ENTRY_FLAG_EXCLUSIVE, &dpo);
+  dpo_reset (&dpo);
+
+  if (a->policy_name)
+    {
+      p = hash_get_mem (sm->policy_index_by_policy_name, a->policy_name);
+      if (p)
+	{
+	  pt = pool_elt_at_index (sm->policies, p[0]);
+	}
+      else			/* no policy, lets create one */
+	{
+	  pool_get (sm->policies, pt);
+	  memset (pt, 0, sizeof (*pt));
+	  pt->name = format (0, "%s%c", a->policy_name, 0);
+	  hash_set_mem (sm->policy_index_by_policy_name, pt->name,
+			pt - sm->policies);
+	  p = hash_get_mem (sm->policy_index_by_policy_name, a->policy_name);
+	}
+      vec_add1 (pt->tunnel_indices, t - sm->tunnels);
+      if (p == 0)
+	clib_warning ("p is NULL!");
+      t->policy_index = p ? p[0] : ~0;	/* equiv. to (pt - sm->policies) */
+    }
+
+  if (a->name)
+    {
+      t->name = format (0, "%s%c", a->name, 0);
+      hash_set_mem (sm->tunnel_index_by_name, t->name, t - sm->tunnels);
+    }
+
+  return 0;
+}
+
+/**
+ * @brief no-op lock function.
+ * The lifetime of the SR entry is managed by the control plane
+ */
+static void
+sr_dpo_lock (dpo_id_t * dpo)
+{
+}
+
+/**
+ * @brief no-op unlock function.
+ * The lifetime of the SR entry is managed by the control plane
+ */
+static void
+sr_dpo_unlock (dpo_id_t * dpo)
+{
+}
+
+u8 *
+format_sr_dpo (u8 * s, va_list * args)
+{
+  index_t index = va_arg (*args, index_t);
+  CLIB_UNUSED (u32 indent) = va_arg (*args, u32);
+
+  return (format (s, "SR: tunnel:[%d]", index));
+}
+
+const static dpo_vft_t sr_vft = {
+  .dv_lock = sr_dpo_lock,
+  .dv_unlock = sr_dpo_unlock,
+  .dv_format = format_sr_dpo,
+};
+
+const static char *const sr_ip6_nodes[] = {
+  "sr-rewrite",
+  NULL,
+};
+
+const static char *const *const sr_nodes[DPO_PROTO_NUM] = {
+  [DPO_PROTO_IP6] = sr_ip6_nodes,
+};
+
+/**
+ * @brief CLI parser for Add or Delete a Segment Routing tunnel.
+ *
+ * @param vm vlib_main_t *
+ * @param input unformat_input_t *
+ * @param cmd vlib_cli_command_t *
+ *
+ * @return error clib_error_t *
+ */
+static clib_error_t *
+sr_add_del_tunnel_command_fn (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
+{
+  int is_del = 0;
+  ip6_address_t src_address;
+  int src_address_set = 0;
+  ip6_address_t dst_address;
+  u32 dst_mask_width;
+  int dst_address_set = 0;
+  u16 flags = 0;
+  u8 *shared_secret = 0;
+  u8 *name = 0;
+  u8 *policy_name = 0;
+  u32 rx_table_id = 0;
+  u32 tx_table_id = 0;
+  ip6_address_t *segments = 0;
+  ip6_address_t *this_seg;
+  ip6_address_t *tags = 0;
+  ip6_address_t *this_tag;
+  ip6_sr_add_del_tunnel_args_t _a, *a = &_a;
+  ip6_address_t next_address, tag;
+  int pl_index;
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	is_del = 1;
+      else if (unformat (input, "rx-fib-id %d", &rx_table_id))
+	;
+      else if (unformat (input, "tx-fib-id %d", &tx_table_id))
+	;
+      else if (unformat (input, "src %U", unformat_ip6_address, &src_address))
+	src_address_set = 1;
+      else if (unformat (input, "name %s", &name))
+	;
+      else if (unformat (input, "policy %s", &policy_name))
+	;
+      else if (unformat (input, "dst %U/%d",
+			 unformat_ip6_address, &dst_address, &dst_mask_width))
+	dst_address_set = 1;
+      else if (unformat (input, "next %U", unformat_ip6_address,
+			 &next_address))
+	{
+	  vec_add2 (segments, this_seg, 1);
+	  clib_memcpy (this_seg->as_u8, next_address.as_u8,
+		       sizeof (*this_seg));
+	}
+      else if (unformat (input, "tag %U", unformat_ip6_address, &tag))
+	{
+	  vec_add2 (tags, this_tag, 1);
+	  clib_memcpy (this_tag->as_u8, tag.as_u8, sizeof (*this_tag));
+	}
+      else if (unformat (input, "clean"))
+	flags |= IP6_SR_HEADER_FLAG_CLEANUP;
+      else if (unformat (input, "protected"))
+	flags |= IP6_SR_HEADER_FLAG_PROTECTED;
+      else if (unformat (input, "key %s", &shared_secret))
+	/* Do not include the trailing NULL byte. Guaranteed interop issue */
+	_vec_len (shared_secret) -= 1;
+      else if (unformat (input, "InPE %d", &pl_index))
+	{
+	  if (pl_index <= 0 || pl_index > 4)
+	    {
+	    pl_index_range_error:
+	      return clib_error_return
+		(0, "Policy List Element Index %d out of range (1-4)",
+		 pl_index);
+
+	    }
+	  flags |= IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE
+	    << ip6_sr_policy_list_shift_from_index (pl_index);
+	}
+      else if (unformat (input, "EgPE %d", &pl_index))
+	{
+	  if (pl_index <= 0 || pl_index > 4)
+	    goto pl_index_range_error;
+	  flags |= IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE
+	    << ip6_sr_policy_list_shift_from_index (pl_index);
+	}
+      else if (unformat (input, "OrgSrc %d", &pl_index))
+	{
+	  if (pl_index <= 0 || pl_index > 4)
+	    goto pl_index_range_error;
+	  flags |= IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR
+	    << ip6_sr_policy_list_shift_from_index (pl_index);
+	}
+      else
+	break;
+    }
+
+  if (!src_address_set)
+    return clib_error_return (0, "src address required");
+
+  if (!dst_address_set)
+    return clib_error_return (0, "dst address required");
+
+  if (!segments)
+    return clib_error_return (0, "at least one sr segment required");
+
+  memset (a, 0, sizeof (*a));
+  a->src_address = &src_address;
+  a->dst_address = &dst_address;
+  a->dst_mask_width = dst_mask_width;
+  a->segments = segments;
+  a->tags = tags;
+  a->flags_net_byte_order = clib_host_to_net_u16 (flags);
+  a->is_del = is_del;
+  a->rx_table_id = rx_table_id;
+  a->tx_table_id = tx_table_id;
+  a->shared_secret = shared_secret;
+
+  if (vec_len (name))
+    a->name = name;
+  else
+    a->name = 0;
+
+  if (vec_len (policy_name))
+    a->policy_name = policy_name;
+  else
+    a->policy_name = 0;
+
+  rv = ip6_sr_add_del_tunnel (a);
+
+  vec_free (segments);
+  vec_free (tags);
+  vec_free (shared_secret);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case -1:
+      return clib_error_return (0, "SR tunnel src %U dst %U already exists",
+				format_ip6_address, &src_address,
+				format_ip6_address, &dst_address);
+
+    case -2:
+      return clib_error_return (0, "SR tunnel src %U dst %U does not exist",
+				format_ip6_address, &src_address,
+				format_ip6_address, &dst_address);
+
+    case -3:
+      return clib_error_return (0, "FIB table %d does not exist",
+				rx_table_id);
+
+    case -4:
+      return clib_error_return (0, "At least one segment is required");
+
+    default:
+      return clib_error_return (0, "BUG: ip6_sr_add_del_tunnel returns %d",
+				rv);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (sr_tunnel_command, static) = {
+    .path = "sr tunnel",
+    .short_help =
+      "sr tunnel [del] [name <name>] src <addr> dst <addr> [next <addr>] "
+      "[clean] [reroute] [key <secret>] [policy <policy_name>]"
+      "[rx-fib-id <fib_id>] [tx-fib-id <fib_id>]",
+    .function = sr_add_del_tunnel_command_fn,
+};
+/* *INDENT-ON* */
+
+/**
+ * @brief Display Segment Routing tunnel
+ *
+ * @param vm vlib_main_t *
+ * @param t ip6_sr_tunnel_t *
+ *
+ */
+void
+ip6_sr_tunnel_display (vlib_main_t * vm, ip6_sr_tunnel_t * t)
+{
+  ip6_sr_main_t *sm = &sr_main;
+  ip6_fib_t *rx_fib, *tx_fib;
+  ip6_sr_policy_t *pt;
+
+  rx_fib = ip6_fib_get (t->rx_fib_index);
+  tx_fib = ip6_fib_get (t->tx_fib_index);
+
+  if (t->name)
+    vlib_cli_output (vm, "sr tunnel name: %s", (char *) t->name);
+
+  vlib_cli_output (vm, "src %U dst %U first hop %U",
+		   format_ip6_address, &t->key.src,
+		   format_ip6_address, &t->key.dst,
+		   format_ip6_address, &t->first_hop);
+  vlib_cli_output (vm, "    rx-fib-id %d tx-fib-id %d",
+		   rx_fib->table_id, tx_fib->table_id);
+  vlib_cli_output (vm, "  sr: %U", format_ip6_sr_header, t->rewrite,
+		   0 /* print_hmac */ );
+
+  if (t->policy_index != ~0)
+    {
+      pt = pool_elt_at_index (sm->policies, t->policy_index);
+      vlib_cli_output (vm, "sr policy: %s", (char *) pt->name);
+    }
+  vlib_cli_output (vm, "-------");
+
+  return;
+}
+
+/**
+ * @brief CLI Parser for Display Segment Routing tunnel
+ *
+ * @param vm vlib_main_t *
+ * @param input unformat_input_t *
+ * @param cmd vlib_cli_command_t *
+ *
+ * @return error clib_error_t *
+ */
+static clib_error_t *
+show_sr_tunnel_fn (vlib_main_t * vm,
+		   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  static ip6_sr_tunnel_t **tunnels;
+  ip6_sr_tunnel_t *t;
+  ip6_sr_main_t *sm = &sr_main;
+  int i;
+  uword *p = 0;
+  u8 *name = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "name %s", &name))
+	{
+	  p = hash_get_mem (sm->tunnel_index_by_name, name);
+	  if (!p)
+	    vlib_cli_output (vm, "No SR tunnel with name: %s. Showing all.",
+			     name);
+	}
+      else
+	break;
+    }
+
+  vec_reset_length (tunnels);
+
+  if (!p)			/* Either name parm not passed or no tunnel with that name found, show all */
+    {
+      /* *INDENT-OFF* */
+  pool_foreach (t, sm->tunnels,
+  ({
+    vec_add1 (tunnels, t);
+  }));
+  /* *INDENT-ON* */
+    }
+  else				/* Just show the one tunnel by name */
+    vec_add1 (tunnels, &sm->tunnels[p[0]]);
+
+  if (vec_len (tunnels) == 0)
+    vlib_cli_output (vm, "No SR tunnels configured");
+
+  for (i = 0; i < vec_len (tunnels); i++)
+    {
+      t = tunnels[i];
+      ip6_sr_tunnel_display (vm, t);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_sr_tunnel_command, static) = {
+    .path = "show sr tunnel",
+    .short_help = "show sr tunnel [name <sr-tunnel-name>]",
+    .function = show_sr_tunnel_fn,
+};
+/* *INDENT-ON* */
+
+/**
+ * @brief Add or Delete a Segment Routing policy
+ *
+ * @param a ip6_sr_add_del_policy_args_t *
+ *
+ * @return retval int
+ */
+int
+ip6_sr_add_del_policy (ip6_sr_add_del_policy_args_t * a)
+{
+  ip6_sr_main_t *sm = &sr_main;
+  uword *p;
+  ip6_sr_tunnel_t *t = 0;
+  ip6_sr_policy_t *policy;
+  u32 *tunnel_indices = 0;
+  int i;
+
+
+
+  if (a->is_del)
+    {
+      p = hash_get_mem (sm->policy_index_by_policy_name, a->name);
+      if (!p)
+	return -6;		/* policy name not found */
+
+      policy = pool_elt_at_index (sm->policies, p[0]);
+
+      vec_foreach_index (i, policy->tunnel_indices)
+      {
+	t = pool_elt_at_index (sm->tunnels, policy->tunnel_indices[i]);
+	t->policy_index = ~0;
+      }
+      hash_unset_mem (sm->policy_index_by_policy_name, a->name);
+      pool_put (sm->policies, policy);
+      return 0;
+    }
+
+
+  if (!vec_len (a->tunnel_names))
+    return -3;			/*tunnel name is required case */
+
+  vec_reset_length (tunnel_indices);
+  /* Check tunnel names, add tunnel_index to policy */
+  for (i = 0; i < vec_len (a->tunnel_names); i++)
+    {
+      p = hash_get_mem (sm->tunnel_index_by_name, a->tunnel_names[i]);
+      if (!p)
+	return -4;		/* tunnel name not found case */
+
+      t = pool_elt_at_index (sm->tunnels, p[0]);
+      /*
+         No need to check t==0. -3 condition above ensures name
+       */
+      if (t->policy_index != ~0)
+	return -5;		/* tunnel name already associated with a policy */
+
+      /* Add to tunnel indicies */
+      vec_add1 (tunnel_indices, p[0]);
+    }
+
+  /* Add policy to ip6_sr_main_t */
+  pool_get (sm->policies, policy);
+  policy->name = a->name;
+  policy->tunnel_indices = tunnel_indices;
+  hash_set_mem (sm->policy_index_by_policy_name, policy->name,
+		policy - sm->policies);
+
+  /* Yes, this could be construed as overkill but the last thing you should do is set
+     the policy_index on the tunnel after everything is set in ip6_sr_main_t.
+     If this is deemed overly cautious, could set this in the vec_len(tunnel_names) loop.
+   */
+  for (i = 0; i < vec_len (policy->tunnel_indices); i++)
+    {
+      t = pool_elt_at_index (sm->tunnels, policy->tunnel_indices[i]);
+      t->policy_index = policy - sm->policies;
+    }
+
+  return 0;
+}
+
+/**
+ * @brief CLI Parser for Add or Delete a Segment Routing policy
+ *
+ * @param vm vlib_main_t *
+ * @param input unformat_input_t *
+ * @param cmd vlib_cli_command_t *
+ *
+ * @return error clib_error_t *
+ */
+static clib_error_t *
+sr_add_del_policy_command_fn (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
+{
+  int is_del = 0;
+  u8 **tunnel_names = 0;
+  u8 *tunnel_name = 0;
+  u8 *name = 0;
+  ip6_sr_add_del_policy_args_t _a, *a = &_a;
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	is_del = 1;
+      else if (unformat (input, "name %s", &name))
+	;
+      else if (unformat (input, "tunnel %s", &tunnel_name))
+	{
+	  if (tunnel_name)
+	    {
+	      vec_add1 (tunnel_names, tunnel_name);
+	      tunnel_name = 0;
+	    }
+	}
+      else
+	break;
+    }
+
+  if (!name)
+    return clib_error_return (0, "name of SR policy required");
+
+
+  memset (a, 0, sizeof (*a));
+
+  a->is_del = is_del;
+  a->name = name;
+  a->tunnel_names = tunnel_names;
+
+  rv = ip6_sr_add_del_policy (a);
+
+  vec_free (tunnel_names);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    case -3:
+      return clib_error_return (0,
+				"tunnel name to associate to SR policy is required");
+
+    case -4:
+      return clib_error_return (0, "tunnel name not found");
+
+    case -5:
+      return clib_error_return (0, "tunnel already associated with policy");
+
+    case -6:
+      return clib_error_return (0, "policy name %s not found", name);
+
+    case -7:
+      return clib_error_return (0, "TODO: deleting policy name %s", name);
+
+    default:
+      return clib_error_return (0, "BUG: ip6_sr_add_del_policy returns %d",
+				rv);
+
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (sr_policy_command, static) = {
+    .path = "sr policy",
+    .short_help =
+    "sr policy [del] name <policy-name> tunnel <sr-tunnel-name> [tunnel <sr-tunnel-name>]*",
+    .function = sr_add_del_policy_command_fn,
+};
+/* *INDENT-ON* */
+
+/**
+ * @brief CLI Parser for Displaying Segment Routing policy
+ *
+ * @param vm vlib_main_t *
+ * @param input unformat_input_t *
+ * @param cmd vlib_cli_command_t *
+ *
+ * @return error clib_error_t *
+ */
+static clib_error_t *
+show_sr_policy_fn (vlib_main_t * vm,
+		   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  static ip6_sr_policy_t **policies;
+  ip6_sr_policy_t *policy;
+  ip6_sr_tunnel_t *t;
+  ip6_sr_main_t *sm = &sr_main;
+  int i, j;
+  uword *p = 0;
+  u8 *name = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "name %s", &name))
+	{
+	  p = hash_get_mem (sm->policy_index_by_policy_name, name);
+	  if (!p)
+	    vlib_cli_output (vm,
+			     "policy with name %s not found. Showing all.",
+			     name);
+	}
+      else
+	break;
+    }
+
+  vec_reset_length (policies);
+
+  if (!p)			/* Either name parm not passed or no policy with that name found, show all */
+    {
+      /* *INDENT-OFF* */
+  pool_foreach (policy, sm->policies,
+  ({
+    vec_add1 (policies, policy);
+  }));
+  /* *INDENT-ON* */
+    }
+  else				/* Just show the one policy by name and a summary of tunnel names */
+    {
+      policy = pool_elt_at_index (sm->policies, p[0]);
+      vec_add1 (policies, policy);
+    }
+
+  if (vec_len (policies) == 0)
+    vlib_cli_output (vm, "No SR policies configured");
+
+  for (i = 0; i < vec_len (policies); i++)
+    {
+      policy = policies[i];
+
+      if (policy->name)
+	vlib_cli_output (vm, "SR policy name: %s", (char *) policy->name);
+      for (j = 0; j < vec_len (policy->tunnel_indices); j++)
+	{
+	  t = pool_elt_at_index (sm->tunnels, policy->tunnel_indices[j]);
+	  ip6_sr_tunnel_display (vm, t);
+	}
+    }
+
+  return 0;
+
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_sr_policy_command, static) = {
+    .path = "show sr policy",
+    .short_help = "show sr policy [name <sr-policy-name>]",
+    .function = show_sr_policy_fn,
+};
+/* *INDENT-ON* */
+
+/**
+ * @brief Add or Delete a mapping of IP6 multicast address
+ * to Segment Routing policy.
+ *
+ * @param a ip6_sr_add_del_multicastmap_args_t *
+ *
+ * @return retval int
+ */
+int
+ip6_sr_add_del_multicastmap (ip6_sr_add_del_multicastmap_args_t * a)
+{
+  uword *p;
+  ip6_sr_tunnel_t *t;
+  ip6_sr_main_t *sm = &sr_main;
+  ip6_sr_policy_t *pt;
+
+  if (a->is_del)
+    {
+      /* clean up the adjacency */
+      p =
+	hash_get_mem (sm->policy_index_by_multicast_address,
+		      a->multicast_address);
+    }
+  else
+    {
+      /* Get our policy by policy_name */
+      p = hash_get_mem (sm->policy_index_by_policy_name, a->policy_name);
+
+    }
+  if (!p)
+    return -1;
+
+  pt = pool_elt_at_index (sm->policies, p[0]);
+
+  /*
+     Get the first tunnel associated with policy populate the fib adjacency.
+     From there, since this tunnel will have it's policy_index != ~0 it will
+     be the trigger in the dual_loop to pull up the policy and make a copy-rewrite
+     for each tunnel in the policy
+   */
+
+  t = pool_elt_at_index (sm->tunnels, pt->tunnel_indices[0]);
+
+  /*
+   * Stick the tunnel index into the rewrite header.
+   *
+   * Unfortunately, inserting an SR header according to the various
+   * RFC's requires parsing through the ip6 header, perhaps consing a
+   * buffer onto the head of the vlib_buffer_t, etc. We don't use the
+   * normal reverse bcopy rewrite code.
+   *
+   * We don't handle ugly RFC-related cases yet, but I'm sure PL will complain
+   * at some point...
+   */
+  dpo_id_t dpo = DPO_INVALID;
+
+  dpo_set (&dpo, sr_dpo_type, DPO_PROTO_IP6, t - sm->tunnels);
+
+  /* Construct a FIB entry for multicast using the rx/tx fib from the first tunnel */
+  fib_prefix_t pfx = {
+    .fp_proto = FIB_PROTOCOL_IP6,
+    .fp_len = 128,
+    .fp_addr = {
+		.ip6 = *a->multicast_address,
+		}
+  };
+  fib_table_entry_special_dpo_add (t->rx_fib_index,
+				   &pfx,
+				   FIB_SOURCE_SR,
+				   FIB_ENTRY_FLAG_EXCLUSIVE, &dpo);
+  dpo_reset (&dpo);
+
+  u8 *mcast_copy = 0;
+  mcast_copy = vec_new (ip6_address_t, 1);
+  memcpy (mcast_copy, a->multicast_address, sizeof (ip6_address_t));
+
+  if (a->is_del)
+    {
+      hash_unset_mem (sm->policy_index_by_multicast_address, mcast_copy);
+      vec_free (mcast_copy);
+      return 0;
+    }
+  /* else */
+
+  hash_set_mem (sm->policy_index_by_multicast_address, mcast_copy,
+		pt - sm->policies);
+
+
+  return 0;
+}
+
+/**
+ * @brief CLI Parser for Adding or Delete a mapping of IP6 multicast address
+ * to Segment Routing policy.
+ *
+ * @param vm vlib_main_t *
+ * @param input unformat_input_t *
+ * @param cmd vlib_cli_command_t *
+ *
+ * @return error clib_error_t *
+ */
+static clib_error_t *
+sr_add_del_multicast_map_command_fn (vlib_main_t * vm,
+				     unformat_input_t * input,
+				     vlib_cli_command_t * cmd)
+{
+  int is_del = 0;
+  ip6_address_t multicast_address;
+  u8 *policy_name = 0;
+  int multicast_address_set = 0;
+  ip6_sr_add_del_multicastmap_args_t _a, *a = &_a;
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	is_del = 1;
+      else
+	if (unformat
+	    (input, "address %U", unformat_ip6_address, &multicast_address))
+	multicast_address_set = 1;
+      else if (unformat (input, "sr-policy %s", &policy_name))
+	;
+      else
+	break;
+    }
+
+  if (!is_del && !policy_name)
+    return clib_error_return (0, "name of sr policy required");
+
+  if (!multicast_address_set)
+    return clib_error_return (0, "multicast address required");
+
+  memset (a, 0, sizeof (*a));
+
+  a->is_del = is_del;
+  a->multicast_address = &multicast_address;
+  a->policy_name = policy_name;
+
+#if DPDK > 0			/*Cannot call replicate or configure multicast map yet without DPDK */
+  rv = ip6_sr_add_del_multicastmap (a);
+#else
+  return clib_error_return (0,
+			    "cannot use multicast replicate spray case without DPDK installed");
+#endif /* DPDK */
+
+  switch (rv)
+    {
+    case 0:
+      break;
+    case -1:
+      return clib_error_return (0, "no policy with name: %s", policy_name);
+
+    case -2:
+      return clib_error_return (0, "multicast map someting ");
+
+    case -3:
+      return clib_error_return (0,
+				"tunnel name to associate to SR policy is required");
+
+    case -7:
+      return clib_error_return (0, "TODO: deleting policy name %s",
+				policy_name);
+
+    default:
+      return clib_error_return (0, "BUG: ip6_sr_add_del_policy returns %d",
+				rv);
+
+    }
+  return 0;
+
+}
+
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (sr_multicast_map_command, static) = {
+    .path = "sr multicast-map",
+    .short_help =
+    "sr multicast-map address <multicast-ip6-address> sr-policy <sr-policy-name> [del]",
+    .function = sr_add_del_multicast_map_command_fn,
+};
+/* *INDENT-ON* */
+
+/**
+ * @brief CLI Parser for Displaying a mapping of IP6 multicast address
+ * to Segment Routing policy.
+ *
+ * @param vm vlib_main_t *
+ * @param input unformat_input_t *
+ * @param cmd vlib_cli_command_t *
+ *
+ * @return error clib_error_t *
+ */
+static clib_error_t *
+show_sr_multicast_map_fn (vlib_main_t * vm,
+			  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  ip6_sr_main_t *sm = &sr_main;
+  u8 *key = 0;
+  u32 value;
+  ip6_address_t multicast_address;
+  ip6_sr_policy_t *pt;
+
+  /* pull all entries from the hash table into vector for display */
+
+  /* *INDENT-OFF* */
+  hash_foreach_mem (key, value, sm->policy_index_by_multicast_address,
+  ({
+    if (!key)
+	vlib_cli_output (vm, "no multicast maps configured");
+    else
+      {
+	multicast_address = *((ip6_address_t *)key);
+	pt = pool_elt_at_index (sm->policies, value);
+	if (pt)
+	  {
+	    vlib_cli_output (vm, "address: %U policy: %s",
+			     format_ip6_address, &multicast_address,
+			     pt->name);
+	  }
+	else
+	  vlib_cli_output (vm, "BUG: policy not found for address: %U with policy index %d",
+			     format_ip6_address, &multicast_address,
+			     value);
+
+      }
+
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_sr_multicast_map_command, static) = {
+    .path = "show sr multicast-map",
+    .short_help = "show sr multicast-map",
+    .function = show_sr_multicast_map_fn,
+};
+/* *INDENT-ON* */
+
+
+#define foreach_sr_fix_dst_addr_next            \
+_(DROP, "error-drop")
+
+/**
+ * @brief Struct for valid next-nodes for SR fix destination address node
+ */
+typedef enum
+{
+#define _(s,n) SR_FIX_DST_ADDR_NEXT_##s,
+  foreach_sr_fix_dst_addr_next
+#undef _
+    SR_FIX_DST_ADDR_N_NEXT,
+} sr_fix_dst_addr_next_t;
+
+/**
+ * @brief Error strings for SR Fix Destination rewrite
+ */
+static char *sr_fix_dst_error_strings[] = {
+#define sr_fix_dst_error(n,s) s,
+#include "sr_fix_dst_error.def"
+#undef sr_fix_dst_error
+};
+
+/**
+ * @brief Struct for errors for SR Fix Destination rewrite
+ */
+typedef enum
+{
+#define sr_fix_dst_error(n,s) SR_FIX_DST_ERROR_##n,
+#include "sr_fix_dst_error.def"
+#undef sr_fix_dst_error
+  SR_FIX_DST_N_ERROR,
+} sr_fix_dst_error_t;
+
+/**
+ * @brief Information for fix address trace
+ */
+typedef struct
+{
+  ip6_address_t src, dst;
+  u32 next_index;
+  u32 adj_index;
+  u8 sr[256];
+} sr_fix_addr_trace_t;
+
+/**
+ * @brief Formatter for fix address trace
+ */
+u8 *
+format_sr_fix_addr_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  sr_fix_addr_trace_t *t = va_arg (*args, sr_fix_addr_trace_t *);
+  vnet_hw_interface_t *hi = 0;
+  ip_adjacency_t *adj;
+  ip6_main_t *im = &ip6_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  vnet_main_t *vnm = vnet_get_main ();
+
+  if (t->adj_index != ~0)
+    {
+      adj = ip_get_adjacency (lm, t->adj_index);
+      hi = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index);
+    }
+
+  s = format (s, "SR-FIX_ADDR: next %s ip6 src %U dst %U\n",
+	      (t->next_index == SR_FIX_DST_ADDR_NEXT_DROP)
+	      ? "drop" : "output",
+	      format_ip6_address, &t->src, format_ip6_address, &t->dst);
+  if (t->next_index != SR_FIX_DST_ADDR_NEXT_DROP)
+    {
+      s =
+	format (s, "%U\n", format_ip6_sr_header, t->sr, 1 /* print_hmac */ );
+      s =
+	format (s, "   output via %s",
+		hi ? (char *) (hi->name) : "Invalid adj");
+    }
+  return s;
+}
+
+/**
+ * @brief Fix SR destination address - dual-loop
+ *
+ * @node sr-fix-dst-addr
+ * @param vm vlib_main_t *
+ * @param node vlib_node_runtime_t *
+ * @param from_frame vlib_frame_t *
+ *
+ * @return from_frame->n_vectors uword
+ */
+static uword
+sr_fix_dst_addr (vlib_main_t * vm,
+		 vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  u32 n_left_from, next_index, *from, *to_next;
+  ip6_main_t *im = &ip6_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+#if 0
+      while (0 && n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  __attribute__ ((unused)) vlib_buffer_t *b0, *b1;
+	  u32 next0 = SR_FIX_DST_ADDR_NEXT_DROP;
+	  u32 next1 = SR_FIX_DST_ADDR_NEXT_DROP;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+#endif
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  ip6_header_t *ip0;
+	  ip_adjacency_t *adj0;
+	  ip6_sr_header_t *sr0;
+	  u32 next0 = SR_FIX_DST_ADDR_NEXT_DROP;
+	  ip6_address_t *new_dst0;
+	  ethernet_header_t *eh0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  adj0 =
+	    ip_get_adjacency (lm, vnet_buffer (b0)->ip.adj_index[VLIB_TX]);
+	  next0 = adj0->mcast_group_index;
+
+	  /* We should be pointing at an Ethernet header... */
+	  eh0 = vlib_buffer_get_current (b0);
+	  ip0 = (ip6_header_t *) (eh0 + 1);
+	  sr0 = (ip6_sr_header_t *) (ip0 + 1);
+
+	  /* We'd better find an SR header... */
+	  if (PREDICT_FALSE (ip0->protocol != IPPROTO_IPV6_ROUTE))
+	    {
+	      b0->error = node->errors[SR_FIX_DST_ERROR_NO_SR_HEADER];
+	      goto do_trace0;
+	    }
+	  else
+	    {
+	      /*
+	       * We get here from sr_rewrite or sr_local, with
+	       * sr->segments_left pointing at the (copy of the original) dst
+	       * address. Use it, then increment sr0->segments_left.
+	       */
+
+	      /* Out of segments? Turf the packet */
+	      if (PREDICT_FALSE (sr0->segments_left == 0))
+		{
+		  b0->error = node->errors[SR_FIX_DST_ERROR_NO_MORE_SEGMENTS];
+		  goto do_trace0;
+		}
+
+	      /*
+	       * Rewrite the packet with the original dst address
+	       * We assume that the last segment (in processing order) contains
+	       * the original dst address. The list is reversed, so sr0->segments
+	       * contains the original dst address.
+	       */
+	      new_dst0 = sr0->segments;
+	      ip0->dst_address.as_u64[0] = new_dst0->as_u64[0];
+	      ip0->dst_address.as_u64[1] = new_dst0->as_u64[1];
+	    }
+
+	do_trace0:
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      sr_fix_addr_trace_t *t = vlib_add_trace (vm, node,
+						       b0, sizeof (*t));
+	      t->next_index = next0;
+	      t->adj_index = ~0;
+
+	      if (next0 != SR_FIX_DST_ADDR_NEXT_DROP)
+		{
+		  t->adj_index = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
+		  clib_memcpy (t->src.as_u8, ip0->src_address.as_u8,
+			       sizeof (t->src.as_u8));
+		  clib_memcpy (t->dst.as_u8, ip0->dst_address.as_u8,
+			       sizeof (t->dst.as_u8));
+		  clib_memcpy (t->sr, sr0, sizeof (t->sr));
+		}
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  return from_frame->n_vectors;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (sr_fix_dst_addr_node) = {
+  .function = sr_fix_dst_addr,
+  .name = "sr-fix-dst-addr",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+  .format_trace = format_sr_fix_addr_trace,
+  .format_buffer = format_ip6_sr_header_with_length,
+
+  .runtime_data_bytes = 0,
+
+  .n_errors = SR_FIX_DST_N_ERROR,
+  .error_strings = sr_fix_dst_error_strings,
+
+  .n_next_nodes = SR_FIX_DST_ADDR_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [SR_FIX_DST_ADDR_NEXT_##s] = n,
+    foreach_sr_fix_dst_addr_next
+#undef _
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (sr_fix_dst_addr_node, sr_fix_dst_addr)
+/* *INDENT-ON* */
+
+static clib_error_t *
+sr_init (vlib_main_t * vm)
+{
+  ip6_sr_main_t *sm = &sr_main;
+  clib_error_t *error = 0;
+  vlib_node_t *ip6_lookup_node, *ip6_rewrite_node;
+
+  if ((error = vlib_call_init_function (vm, ip_main_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ip6_lookup_init)))
+    return error;
+
+  sm->vlib_main = vm;
+  sm->vnet_main = vnet_get_main ();
+
+  vec_validate (sm->hmac_keys, 0);
+  sm->hmac_keys[0].shared_secret = (u8 *) 0xdeadbeef;
+
+  sm->tunnel_index_by_key =
+    hash_create_mem (0, sizeof (ip6_sr_tunnel_key_t), sizeof (uword));
+
+  sm->tunnel_index_by_name = hash_create_string (0, sizeof (uword));
+
+  sm->policy_index_by_policy_name = hash_create_string (0, sizeof (uword));
+
+  sm->policy_index_by_multicast_address =
+    hash_create_mem (0, sizeof (ip6_address_t), sizeof (uword));
+
+  sm->hmac_key_by_shared_secret = hash_create_string (0, sizeof (uword));
+
+  ip6_register_protocol (IPPROTO_IPV6_ROUTE, sr_local_node.index);
+
+  ip6_lookup_node = vlib_get_node_by_name (vm, (u8 *) "ip6-lookup");
+  ASSERT (ip6_lookup_node);
+
+  ip6_rewrite_node = vlib_get_node_by_name (vm, (u8 *) "ip6-rewrite");
+  ASSERT (ip6_rewrite_node);
+
+#if DPDK > 0			/* Cannot run replicate without DPDK */
+  /* Add a disposition to sr_replicate for the sr multicast replicate node */
+  sm->ip6_lookup_sr_replicate_index =
+    vlib_node_add_next (vm, ip6_lookup_node->index, sr_replicate_node.index);
+#endif /* DPDK */
+
+  /* Add a disposition to ip6_rewrite for the sr dst address hack node */
+  sm->ip6_rewrite_sr_next_index =
+    vlib_node_add_next (vm, ip6_rewrite_node->index,
+			sr_fix_dst_addr_node.index);
+
+  OpenSSL_add_all_digests ();
+
+  sm->md = (void *) EVP_get_digestbyname ("sha1");
+  sm->hmac_ctx = clib_mem_alloc (sizeof (HMAC_CTX));
+
+  sr_dpo_type = dpo_register_new_type (&sr_vft, sr_nodes);
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (sr_init);
+
+/**
+ * @brief Definition of next-nodes for SR local
+ */
+#define foreach_sr_local_next                   \
+  _ (ERROR, "error-drop")                       \
+  _ (IP6_LOOKUP, "ip6-lookup")
+
+/**
+ * @brief Struct for definition of next-nodes for SR local
+ */
+typedef enum
+{
+#define _(s,n) SR_LOCAL_NEXT_##s,
+  foreach_sr_local_next
+#undef _
+    SR_LOCAL_N_NEXT,
+} sr_local_next_t;
+
+/**
+ * @brief Struct for packet trace of SR local
+ */
+typedef struct
+{
+  u8 next_index;
+  u8 sr_valid;
+  ip6_address_t src, dst;
+  u16 length;
+  u8 sr[256];
+} sr_local_trace_t;
+
+/**
+ * @brief Definition of SR local error-strings
+ */
+static char *sr_local_error_strings[] = {
+#define sr_error(n,s) s,
+#include "sr_error.def"
+#undef sr_error
+};
+
+/**
+ * @brief Struct for definition of SR local error-strings
+ */
+typedef enum
+{
+#define sr_error(n,s) SR_LOCAL_ERROR_##n,
+#include "sr_error.def"
+#undef sr_error
+  SR_LOCAL_N_ERROR,
+} sr_local_error_t;
+
+/**
+ * @brief Format SR local trace
+ *
+ * @param s u8 *
+ * @param args va_list *
+ *
+ * @return s u8 *
+ */
+u8 *
+format_sr_local_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  sr_local_trace_t *t = va_arg (*args, sr_local_trace_t *);
+
+  s = format (s, "SR-LOCAL: src %U dst %U len %u next_index %d",
+	      format_ip6_address, &t->src,
+	      format_ip6_address, &t->dst, t->length, t->next_index);
+  if (t->sr_valid)
+    s =
+      format (s, "\n  %U", format_ip6_sr_header, t->sr, 1 /* print_hmac */ );
+  else
+    s = format (s, "\n  popped SR header");
+
+  return s;
+}
+
+
+/* $$$$ fixme: smp, don't copy data, cache input, output (maybe) */
+/**
+ * @brief Validate the SR HMAC
+ *
+ * @param sm ip6_sr_main_t *
+ * @param ip ip6_header_t *
+ * @param sr ip6_sr_header_t *
+ *
+ * @return retval int
+ */
+static int
+sr_validate_hmac (ip6_sr_main_t * sm, ip6_header_t * ip, ip6_sr_header_t * sr)
+{
+  u32 key_index;
+  static u8 *keybuf;
+  u8 *copy_target;
+  int first_segment;
+  ip6_address_t *addrp;
+  int i;
+  ip6_sr_hmac_key_t *hmac_key;
+  static u8 *signature;
+  u32 sig_len;
+
+  key_index = sr->hmac_key;
+
+  /* No signature? Pass... */
+  if (key_index == 0)
+    return 0;
+
+  /* We don't know about this key? Fail... */
+  if (key_index >= vec_len (sm->hmac_keys))
+    return 1;
+
+  vec_validate (signature, SHA256_DIGEST_LENGTH - 1);
+
+  hmac_key = sm->hmac_keys + key_index;
+
+  vec_reset_length (keybuf);
+
+  /* pkt ip6 src address */
+  vec_add2 (keybuf, copy_target, sizeof (ip6_address_t));
+  clib_memcpy (copy_target, ip->src_address.as_u8, sizeof (ip6_address_t));
+
+  /* last segment */
+  vec_add2 (keybuf, copy_target, 1);
+  copy_target[0] = sr->first_segment;
+
+  /* octet w/ bit 0 = "clean" flag */
+  vec_add2 (keybuf, copy_target, 1);
+  copy_target[0]
+    = (sr->flags & clib_host_to_net_u16 (IP6_SR_HEADER_FLAG_CLEANUP))
+    ? 0x80 : 0;
+
+  /* hmac key id */
+  vec_add2 (keybuf, copy_target, 1);
+  copy_target[0] = sr->hmac_key;
+
+  first_segment = sr->first_segment;
+
+  addrp = sr->segments;
+
+  /* segments */
+  for (i = 0; i <= first_segment; i++)
+    {
+      vec_add2 (keybuf, copy_target, sizeof (ip6_address_t));
+      clib_memcpy (copy_target, addrp->as_u8, sizeof (ip6_address_t));
+      addrp++;
+    }
+
+  if (sm->is_debug)
+    clib_warning ("verify key index %d keybuf: %U", key_index,
+		  format_hex_bytes, keybuf, vec_len (keybuf));
+
+  /* shared secret */
+
+  /* SHA1 is shorter than SHA-256 */
+  memset (signature, 0, vec_len (signature));
+
+  HMAC_CTX_init (sm->hmac_ctx);
+  if (!HMAC_Init (sm->hmac_ctx, hmac_key->shared_secret,
+		  vec_len (hmac_key->shared_secret), sm->md))
+    clib_warning ("barf1");
+  if (!HMAC_Update (sm->hmac_ctx, keybuf, vec_len (keybuf)))
+    clib_warning ("barf2");
+  if (!HMAC_Final (sm->hmac_ctx, signature, &sig_len))
+    clib_warning ("barf3");
+  HMAC_CTX_cleanup (sm->hmac_ctx);
+
+  if (sm->is_debug)
+    clib_warning ("computed signature len %d, value %U", sig_len,
+		  format_hex_bytes, signature, vec_len (signature));
+
+  /* Point at the SHA signature in the packet */
+  addrp++;
+  if (sm->is_debug)
+    clib_warning ("read signature %U", format_hex_bytes, addrp,
+		  SHA256_DIGEST_LENGTH);
+
+  return memcmp (signature, addrp, SHA256_DIGEST_LENGTH);
+}
+
+/**
+ * @brief SR local node
+ * @node sr-local
+ *
+ * @param vm vlib_main_t *
+ * @param node vlib_node_runtime_t *
+ * @param from_frame vlib_frame_t *
+ *
+ * @return from_frame->n_vectors uword
+ */
+static uword
+sr_local (vlib_main_t * vm,
+	  vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  u32 n_left_from, next_index, *from, *to_next;
+  ip6_sr_main_t *sm = &sr_main;
+  u32 (*sr_local_cb) (vlib_main_t *, vlib_node_runtime_t *,
+		      vlib_buffer_t *, ip6_header_t *, ip6_sr_header_t *);
+  sr_local_cb = sm->sr_local_cb;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  ip6_header_t *ip0, *ip1;
+	  ip6_sr_header_t *sr0, *sr1;
+	  ip6_address_t *new_dst0, *new_dst1;
+	  u32 next0 = SR_LOCAL_NEXT_IP6_LOOKUP;
+	  u32 next1 = SR_LOCAL_NEXT_IP6_LOOKUP;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
+	    CLIB_PREFETCH (p3->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  ip0 = vlib_buffer_get_current (b0);
+	  sr0 = (ip6_sr_header_t *) (ip0 + 1);
+	  if (PREDICT_FALSE
+	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+	    {
+	      ip6_hop_by_hop_ext_t *ext_hdr =
+		(ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
+	      sr0 =
+		(ip6_sr_header_t *) ip6_ext_next_header ((ip6_ext_header_t *)
+							 ext_hdr);
+	    }
+
+	  if (PREDICT_FALSE (sr0->type != ROUTING_HEADER_TYPE_SR))
+	    {
+	      next0 = SR_LOCAL_NEXT_ERROR;
+	      b0->error =
+		node->errors[SR_LOCAL_ERROR_BAD_ROUTING_HEADER_TYPE];
+	      goto do_trace0;
+	    }
+
+	  /* Out of segments? Turf the packet */
+	  if (PREDICT_FALSE (sr0->segments_left == 0))
+	    {
+	      next0 = SR_LOCAL_NEXT_ERROR;
+	      b0->error = node->errors[SR_LOCAL_ERROR_NO_MORE_SEGMENTS];
+	      goto do_trace0;
+	    }
+
+	  if (PREDICT_FALSE (sm->validate_hmac))
+	    {
+	      if (sr_validate_hmac (sm, ip0, sr0))
+		{
+		  next0 = SR_LOCAL_NEXT_ERROR;
+		  b0->error = node->errors[SR_LOCAL_ERROR_HMAC_INVALID];
+		  goto do_trace0;
+		}
+	    }
+
+	  next0 = sr_local_cb ? sr_local_cb (vm, node, b0, ip0, sr0) : next0;
+
+	  /*
+	   * To suppress rewrite, return ~SR_LOCAL_NEXT_xxx
+	   */
+	  if (PREDICT_FALSE (next0 & 0x80000000))
+	    {
+	      next0 ^= 0xFFFFFFFF;
+	      if (PREDICT_FALSE (next0 == SR_LOCAL_NEXT_ERROR))
+		b0->error = node->errors[SR_LOCAL_ERROR_APP_CALLBACK];
+	    }
+	  else
+	    {
+	      u32 segment_index0;
+
+	      segment_index0 = sr0->segments_left - 1;
+
+	      /* Rewrite the packet */
+	      new_dst0 = (ip6_address_t *) (sr0->segments + segment_index0);
+	      ip0->dst_address.as_u64[0] = new_dst0->as_u64[0];
+	      ip0->dst_address.as_u64[1] = new_dst0->as_u64[1];
+
+	      if (PREDICT_TRUE (sr0->segments_left > 0))
+		sr0->segments_left -= 1;
+	    }
+
+	  /* End of the path. Clean up the SR header, or not */
+	  if (PREDICT_FALSE
+	      (sr0->segments_left == 0 &&
+	       (sr0->flags &
+		clib_host_to_net_u16 (IP6_SR_HEADER_FLAG_CLEANUP))))
+	    {
+	      u64 *copy_dst0, *copy_src0;
+	      u16 new_l0;
+	      u32 copy_len_u64s0 = 0;
+	      int i;
+
+	      /*
+	       * Copy the ip6 header right by the (real) length of the
+	       * sr header.
+	       */
+	      if (PREDICT_FALSE
+		  (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+		{
+		  ip6_hop_by_hop_ext_t *ext_hdr =
+		    (ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
+		  copy_len_u64s0 =
+		    (((ip6_ext_header_t *) ext_hdr)->n_data_u64s) + 1;
+		  ext_hdr->next_hdr = sr0->protocol;
+		}
+	      else
+		{
+		  ip0->protocol = sr0->protocol;
+		}
+	      vlib_buffer_advance (b0, (sr0->length + 1) * 8);
+
+	      new_l0 = clib_net_to_host_u16 (ip0->payload_length) -
+		(sr0->length + 1) * 8;
+	      ip0->payload_length = clib_host_to_net_u16 (new_l0);
+
+	      copy_src0 = (u64 *) ip0;
+	      copy_dst0 = copy_src0 + (sr0->length + 1);
+
+	      copy_dst0[4 + copy_len_u64s0] = copy_src0[4 + copy_len_u64s0];
+	      copy_dst0[3 + copy_len_u64s0] = copy_src0[3 + copy_len_u64s0];
+	      copy_dst0[2 + copy_len_u64s0] = copy_src0[2 + copy_len_u64s0];
+	      copy_dst0[1 + copy_len_u64s0] = copy_src0[1 + copy_len_u64s0];
+	      copy_dst0[0 + copy_len_u64s0] = copy_src0[0 + copy_len_u64s0];
+
+	      for (i = copy_len_u64s0 - 1; i >= 0; i--)
+		{
+		  copy_dst0[i] = copy_src0[i];
+		}
+
+	      sr0 = 0;
+	    }
+
+	do_trace0:
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      sr_local_trace_t *tr = vlib_add_trace (vm, node,
+						     b0, sizeof (*tr));
+	      clib_memcpy (tr->src.as_u8, ip0->src_address.as_u8,
+			   sizeof (tr->src.as_u8));
+	      clib_memcpy (tr->dst.as_u8, ip0->dst_address.as_u8,
+			   sizeof (tr->dst.as_u8));
+	      tr->length = vlib_buffer_length_in_chain (vm, b0);
+	      tr->next_index = next0;
+	      tr->sr_valid = sr0 != 0;
+	      if (tr->sr_valid)
+		clib_memcpy (tr->sr, sr0, sizeof (tr->sr));
+	    }
+
+	  b1 = vlib_get_buffer (vm, bi1);
+	  ip1 = vlib_buffer_get_current (b1);
+	  sr1 = (ip6_sr_header_t *) (ip1 + 1);
+	  if (PREDICT_FALSE
+	      (ip1->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+	    {
+
+	      ip6_hop_by_hop_ext_t *ext_hdr =
+		(ip6_hop_by_hop_ext_t *) ip6_next_header (ip1);
+	      sr1 =
+		(ip6_sr_header_t *) ip6_ext_next_header ((ip6_ext_header_t *)
+							 ext_hdr);
+	    }
+
+	  if (PREDICT_FALSE (sr1->type != ROUTING_HEADER_TYPE_SR))
+	    {
+	      next1 = SR_LOCAL_NEXT_ERROR;
+	      b1->error =
+		node->errors[SR_LOCAL_ERROR_BAD_ROUTING_HEADER_TYPE];
+	      goto do_trace1;
+	    }
+
+	  /* Out of segments? Turf the packet */
+	  if (PREDICT_FALSE (sr1->segments_left == 0))
+	    {
+	      next1 = SR_LOCAL_NEXT_ERROR;
+	      b1->error = node->errors[SR_LOCAL_ERROR_NO_MORE_SEGMENTS];
+	      goto do_trace1;
+	    }
+
+	  if (PREDICT_FALSE (sm->validate_hmac))
+	    {
+	      if (sr_validate_hmac (sm, ip1, sr1))
+		{
+		  next1 = SR_LOCAL_NEXT_ERROR;
+		  b1->error = node->errors[SR_LOCAL_ERROR_HMAC_INVALID];
+		  goto do_trace1;
+		}
+	    }
+
+	  next1 = sr_local_cb ? sr_local_cb (vm, node, b1, ip1, sr1) : next1;
+
+	  /*
+	   * To suppress rewrite, return ~SR_LOCAL_NEXT_xxx
+	   */
+	  if (PREDICT_FALSE (next1 & 0x80000000))
+	    {
+	      next1 ^= 0xFFFFFFFF;
+	      if (PREDICT_FALSE (next1 == SR_LOCAL_NEXT_ERROR))
+		b1->error = node->errors[SR_LOCAL_ERROR_APP_CALLBACK];
+	    }
+	  else
+	    {
+	      u32 segment_index1;
+
+	      segment_index1 = sr1->segments_left - 1;
+
+	      /* Rewrite the packet */
+	      new_dst1 = (ip6_address_t *) (sr1->segments + segment_index1);
+	      ip1->dst_address.as_u64[0] = new_dst1->as_u64[0];
+	      ip1->dst_address.as_u64[1] = new_dst1->as_u64[1];
+
+	      if (PREDICT_TRUE (sr1->segments_left > 0))
+		sr1->segments_left -= 1;
+	    }
+
+	  /* End of the path. Clean up the SR header, or not */
+	  if (PREDICT_FALSE
+	      (sr1->segments_left == 0 &&
+	       (sr1->flags &
+		clib_host_to_net_u16 (IP6_SR_HEADER_FLAG_CLEANUP))))
+	    {
+	      u64 *copy_dst1, *copy_src1;
+	      u16 new_l1;
+	      u32 copy_len_u64s1 = 0;
+	      int i;
+
+	      /*
+	       * Copy the ip6 header right by the (real) length of the
+	       * sr header.
+	       */
+	      if (PREDICT_FALSE
+		  (ip1->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+		{
+		  ip6_hop_by_hop_ext_t *ext_hdr =
+		    (ip6_hop_by_hop_ext_t *) ip6_next_header (ip1);
+		  copy_len_u64s1 =
+		    (((ip6_ext_header_t *) ext_hdr)->n_data_u64s) + 1;
+		  ext_hdr->next_hdr = sr1->protocol;
+		}
+	      else
+		{
+		  ip1->protocol = sr1->protocol;
+		}
+	      vlib_buffer_advance (b1, (sr1->length + 1) * 8);
+
+	      new_l1 = clib_net_to_host_u16 (ip1->payload_length) -
+		(sr1->length + 1) * 8;
+	      ip1->payload_length = clib_host_to_net_u16 (new_l1);
+
+	      copy_src1 = (u64 *) ip1;
+	      copy_dst1 = copy_src1 + (sr1->length + 1);
+
+	      copy_dst1[4 + copy_len_u64s1] = copy_src1[4 + copy_len_u64s1];
+	      copy_dst1[3 + copy_len_u64s1] = copy_src1[3 + copy_len_u64s1];
+	      copy_dst1[2 + copy_len_u64s1] = copy_src1[2 + copy_len_u64s1];
+	      copy_dst1[1 + copy_len_u64s1] = copy_src1[1 + copy_len_u64s1];
+	      copy_dst1[0 + copy_len_u64s1] = copy_src1[0 + copy_len_u64s1];
+
+	      for (i = copy_len_u64s1 - 1; i >= 0; i--)
+		{
+		  copy_dst1[i] = copy_src1[i];
+		}
+
+	      sr1 = 0;
+	    }
+
+	do_trace1:
+	  if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      sr_local_trace_t *tr = vlib_add_trace (vm, node,
+						     b1, sizeof (*tr));
+	      clib_memcpy (tr->src.as_u8, ip1->src_address.as_u8,
+			   sizeof (tr->src.as_u8));
+	      clib_memcpy (tr->dst.as_u8, ip1->dst_address.as_u8,
+			   sizeof (tr->dst.as_u8));
+	      tr->length = vlib_buffer_length_in_chain (vm, b1);
+	      tr->next_index = next1;
+	      tr->sr_valid = sr1 != 0;
+	      if (tr->sr_valid)
+		clib_memcpy (tr->sr, sr1, sizeof (tr->sr));
+	    }
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  ip6_header_t *ip0 = 0;
+	  ip6_sr_header_t *sr0;
+	  ip6_address_t *new_dst0;
+	  u32 next0 = SR_LOCAL_NEXT_IP6_LOOKUP;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  ip0 = vlib_buffer_get_current (b0);
+	  sr0 = (ip6_sr_header_t *) (ip0 + 1);
+
+	  if (PREDICT_FALSE
+	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+	    {
+	      ip6_hop_by_hop_ext_t *ext_hdr =
+		(ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
+	      sr0 =
+		(ip6_sr_header_t *) ip6_ext_next_header ((ip6_ext_header_t *)
+							 ext_hdr);
+	    }
+	  if (PREDICT_FALSE (sr0->type != ROUTING_HEADER_TYPE_SR))
+	    {
+	      next0 = SR_LOCAL_NEXT_ERROR;
+	      b0->error =
+		node->errors[SR_LOCAL_ERROR_BAD_ROUTING_HEADER_TYPE];
+	      goto do_trace;
+	    }
+
+	  /* Out of segments? Turf the packet */
+	  if (PREDICT_FALSE (sr0->segments_left == 0))
+	    {
+	      next0 = SR_LOCAL_NEXT_ERROR;
+	      b0->error = node->errors[SR_LOCAL_ERROR_NO_MORE_SEGMENTS];
+	      goto do_trace;
+	    }
+
+	  if (PREDICT_FALSE (sm->validate_hmac))
+	    {
+	      if (sr_validate_hmac (sm, ip0, sr0))
+		{
+		  next0 = SR_LOCAL_NEXT_ERROR;
+		  b0->error = node->errors[SR_LOCAL_ERROR_HMAC_INVALID];
+		  goto do_trace;
+		}
+	    }
+
+	  next0 = sr_local_cb ? sr_local_cb (vm, node, b0, ip0, sr0) : next0;
+
+	  /*
+	   * To suppress rewrite, return ~SR_LOCAL_NEXT_xxx
+	   */
+	  if (PREDICT_FALSE (next0 & 0x80000000))
+	    {
+	      next0 ^= 0xFFFFFFFF;
+	      if (PREDICT_FALSE (next0 == SR_LOCAL_NEXT_ERROR))
+		b0->error = node->errors[SR_LOCAL_ERROR_APP_CALLBACK];
+	    }
+	  else
+	    {
+	      u32 segment_index0;
+
+	      segment_index0 = sr0->segments_left - 1;
+
+	      /* Rewrite the packet */
+	      new_dst0 = (ip6_address_t *) (sr0->segments + segment_index0);
+	      ip0->dst_address.as_u64[0] = new_dst0->as_u64[0];
+	      ip0->dst_address.as_u64[1] = new_dst0->as_u64[1];
+
+	      if (PREDICT_TRUE (sr0->segments_left > 0))
+		sr0->segments_left -= 1;
+	    }
+
+	  /* End of the path. Clean up the SR header, or not */
+	  if (PREDICT_FALSE
+	      (sr0->segments_left == 0 &&
+	       (sr0->flags &
+		clib_host_to_net_u16 (IP6_SR_HEADER_FLAG_CLEANUP))))
+	    {
+	      u64 *copy_dst0, *copy_src0;
+	      u16 new_l0;
+	      u32 copy_len_u64s0 = 0;
+	      int i;
+
+	      /*
+	       * Copy the ip6 header right by the (real) length of the
+	       * sr header.
+	       */
+	      if (PREDICT_FALSE
+		  (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+		{
+		  ip6_hop_by_hop_ext_t *ext_hdr =
+		    (ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
+		  copy_len_u64s0 =
+		    (((ip6_ext_header_t *) ext_hdr)->n_data_u64s) + 1;
+		  ext_hdr->next_hdr = sr0->protocol;
+		}
+	      else
+		{
+		  ip0->protocol = sr0->protocol;
+		}
+
+	      vlib_buffer_advance (b0, (sr0->length + 1) * 8);
+
+	      new_l0 = clib_net_to_host_u16 (ip0->payload_length) -
+		(sr0->length + 1) * 8;
+	      ip0->payload_length = clib_host_to_net_u16 (new_l0);
+
+	      copy_src0 = (u64 *) ip0;
+	      copy_dst0 = copy_src0 + (sr0->length + 1);
+	      copy_dst0[4 + copy_len_u64s0] = copy_src0[4 + copy_len_u64s0];
+	      copy_dst0[3 + copy_len_u64s0] = copy_src0[3 + copy_len_u64s0];
+	      copy_dst0[2 + copy_len_u64s0] = copy_src0[2 + copy_len_u64s0];
+	      copy_dst0[1 + copy_len_u64s0] = copy_src0[1 + copy_len_u64s0];
+	      copy_dst0[0 + copy_len_u64s0] = copy_src0[0 + copy_len_u64s0];
+
+	      for (i = copy_len_u64s0 - 1; i >= 0; i--)
+		{
+		  copy_dst0[i] = copy_src0[i];
+		}
+
+	      sr0 = 0;
+	    }
+
+	do_trace:
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      sr_local_trace_t *tr = vlib_add_trace (vm, node,
+						     b0, sizeof (*tr));
+	      clib_memcpy (tr->src.as_u8, ip0->src_address.as_u8,
+			   sizeof (tr->src.as_u8));
+	      clib_memcpy (tr->dst.as_u8, ip0->dst_address.as_u8,
+			   sizeof (tr->dst.as_u8));
+	      tr->length = vlib_buffer_length_in_chain (vm, b0);
+	      tr->next_index = next0;
+	      tr->sr_valid = sr0 != 0;
+	      if (tr->sr_valid)
+		clib_memcpy (tr->sr, sr0, sizeof (tr->sr));
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, sr_local_node.index,
+			       SR_LOCAL_ERROR_PKTS_PROCESSED,
+			       from_frame->n_vectors);
+  return from_frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (sr_local_node, static) = {
+  .function = sr_local,
+  .name = "sr-local",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+  .format_trace = format_sr_local_trace,
+
+  .runtime_data_bytes = 0,
+
+  .n_errors = SR_LOCAL_N_ERROR,
+  .error_strings = sr_local_error_strings,
+
+  .n_next_nodes = SR_LOCAL_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [SR_LOCAL_NEXT_##s] = n,
+    foreach_sr_local_next
+#undef _
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (sr_local_node, sr_local)
+/* *INDENT-ON* */
+
+ip6_sr_main_t *
+sr_get_main (vlib_main_t * vm)
+{
+  vlib_call_init_function (vm, sr_init);
+  ASSERT (sr_local_node.index);
+  return &sr_main;
+}
+
+/**
+ * @brief CLI parser for SR fix destination rewrite node
+ *
+ * @param vm vlib_main_t *
+ * @param input unformat_input_t *
+ * @param cmd vlib_cli_command_t *
+ *
+ * @return error clib_error_t *
+ */
+static clib_error_t *
+set_ip6_sr_rewrite_fn (vlib_main_t * vm,
+		       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  fib_prefix_t pfx = {
+    .fp_proto = FIB_PROTOCOL_IP6,
+    .fp_len = 128,
+  };
+  u32 fib_index = 0;
+  u32 fib_id = 0;
+  u32 adj_index;
+  ip_adjacency_t *adj;
+  vnet_hw_interface_t *hi;
+  u32 sw_if_index;
+  ip6_sr_main_t *sm = &sr_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  fib_node_index_t fei;
+
+  if (!unformat (input, "%U", unformat_ip6_address, &pfx.fp_addr.ip6))
+    return clib_error_return (0, "ip6 address missing in '%U'",
+			      format_unformat_error, input);
+
+  if (unformat (input, "rx-table-id %d", &fib_id))
+    {
+      fib_index = fib_table_id_find_fib_index (FIB_PROTOCOL_IP6, fib_id);
+      if (fib_index == ~0)
+	return clib_error_return (0, "fib-id %d not found", fib_id);
+    }
+
+  fei = fib_table_lookup_exact_match (fib_index, &pfx);
+
+  if (FIB_NODE_INDEX_INVALID == fei)
+    return clib_error_return (0, "no match for %U",
+			      format_ip6_address, &pfx.fp_addr.ip6);
+
+  adj_index = fib_entry_get_adj_for_source (fei, FIB_SOURCE_SR);
+
+  if (ADJ_INDEX_INVALID == adj_index)
+    return clib_error_return (0, "%U not SR sourced",
+			      format_ip6_address, &pfx.fp_addr.ip6);
+
+  adj = adj_get (adj_index);
+
+  if (adj->lookup_next_index != IP_LOOKUP_NEXT_REWRITE)
+    return clib_error_return (0, "%U unresolved (not a rewrite adj)",
+			      format_ip6_address, &pfx.fp_addr.ip6);
+
+  adj->rewrite_header.next_index = sm->ip6_rewrite_sr_next_index;
+
+  sw_if_index = adj->rewrite_header.sw_if_index;
+  hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  adj->rewrite_header.node_index = sr_fix_dst_addr_node.index;
+
+  /* $$$$$ hack... steal the mcast group index */
+  adj->mcast_group_index =
+    vlib_node_add_next (vm, sr_fix_dst_addr_node.index,
+			hi->output_node_index);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_ip6_sr_rewrite, static) = {
+    .path = "set ip6 sr rewrite",
+    .short_help = "set ip6 sr rewrite <ip6-address> [fib-id <id>]",
+    .function = set_ip6_sr_rewrite_fn,
+};
+/* *INDENT-ON* */
+
+/**
+ * @brief Register a callback routine to set next0 in sr_local
+ *
+ * @param cb void *
+ */
+void
+vnet_register_sr_app_callback (void *cb)
+{
+  ip6_sr_main_t *sm = &sr_main;
+
+  sm->sr_local_cb = cb;
+}
+
+/**
+ * @brief Test routine for validation of HMAC
+ */
+static clib_error_t *
+test_sr_hmac_validate_fn (vlib_main_t * vm,
+			  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  ip6_sr_main_t *sm = &sr_main;
+
+  if (unformat (input, "validate on"))
+    sm->validate_hmac = 1;
+  else if (unformat (input, "chunk-offset off"))
+    sm->validate_hmac = 0;
+  else
+    return clib_error_return (0, "expected validate on|off in '%U'",
+			      format_unformat_error, input);
+
+  vlib_cli_output (vm, "hmac signature validation %s",
+		   sm->validate_hmac ? "on" : "off");
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (test_sr_hmac_validate, static) = {
+    .path = "test sr hmac",
+    .short_help = "test sr hmac validate [on|off]",
+    .function = test_sr_hmac_validate_fn,
+};
+/* *INDENT-ON* */
+
+/**
+ * @brief Add or Delete HMAC key
+ *
+ * @param sm ip6_sr_main_t *
+ * @param key_id u32
+ * @param shared_secret u8 *
+ * @param is_del u8
+ *
+ * @return retval i32
+ */
+// $$$ fixme shouldn't return i32
+i32
+sr_hmac_add_del_key (ip6_sr_main_t * sm, u32 key_id, u8 * shared_secret,
+		     u8 is_del)
+{
+  u32 index;
+  ip6_sr_hmac_key_t *key;
+
+  if (is_del == 0)
+    {
+      /* Specific key in use? Fail. */
+      if (key_id && vec_len (sm->hmac_keys) > key_id
+	  && sm->hmac_keys[key_id].shared_secret)
+	return -2;
+
+      index = key_id;
+      key = find_or_add_shared_secret (sm, shared_secret, &index);
+      ASSERT (index == key_id);
+      return 0;
+    }
+
+  /* delete */
+
+  if (key_id)			/* delete by key ID */
+    {
+      if (vec_len (sm->hmac_keys) <= key_id)
+	return -3;
+
+      key = sm->hmac_keys + key_id;
+
+      hash_unset_mem (sm->hmac_key_by_shared_secret, key->shared_secret);
+      vec_free (key->shared_secret);
+      return 0;
+    }
+
+  index = 0;
+  key = find_or_add_shared_secret (sm, shared_secret, &index);
+  hash_unset_mem (sm->hmac_key_by_shared_secret, key->shared_secret);
+  vec_free (key->shared_secret);
+  return 0;
+}
+
+
+static clib_error_t *
+sr_hmac_add_del_key_fn (vlib_main_t * vm,
+			unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  ip6_sr_main_t *sm = &sr_main;
+  u8 is_del = 0;
+  u32 key_id = 0;
+  u8 key_id_set = 0;
+  u8 *shared_secret = 0;
+  i32 rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "del"))
+	is_del = 1;
+      else if (unformat (input, "id %d", &key_id))
+	key_id_set = 1;
+      else if (unformat (input, "key %s", &shared_secret))
+	{
+	  /* Do not include the trailing NULL byte. Guaranteed interop issue */
+	  _vec_len (shared_secret) -= 1;
+	}
+      else
+	break;
+    }
+
+  if (is_del == 0 && shared_secret == 0)
+    return clib_error_return (0, "shared secret must be set to add a key");
+
+  if (shared_secret == 0 && key_id_set == 0)
+    return clib_error_return (0, "shared secret and key id both unset");
+
+  rv = sr_hmac_add_del_key (sm, key_id, shared_secret, is_del);
+
+  vec_free (shared_secret);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    default:
+      return clib_error_return (0, "sr_hmac_add_del_key returned %d", rv);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (sr_hmac, static) = {
+    .path = "sr hmac",
+    .short_help = "sr hmac [del] id <nn> key <str>",
+    .function = sr_hmac_add_del_key_fn,
+};
+/* *INDENT-ON* */
+
+/**
+ * @brief CLI parser for show HMAC key shared secrets
+ *
+ * @param vm vlib_main_t *
+ * @param input unformat_input_t *
+ * @param cmd vlib_cli_command_t *
+ *
+ * @return error clib_error_t *
+ */
+static clib_error_t *
+show_sr_hmac_fn (vlib_main_t * vm,
+		 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  ip6_sr_main_t *sm = &sr_main;
+  int i;
+
+  for (i = 1; i < vec_len (sm->hmac_keys); i++)
+    {
+      if (sm->hmac_keys[i].shared_secret)
+	vlib_cli_output (vm, "[%d]: %v", i, sm->hmac_keys[i].shared_secret);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_sr_hmac, static) = {
+    .path = "show sr hmac",
+    .short_help = "show sr hmac",
+    .function = show_sr_hmac_fn,
+};
+/* *INDENT-ON* */
+
+/**
+ * @brief Test for SR debug flag
+ *
+ * @param vm vlib_main_t *
+ * @param input unformat_input_t *
+ * @param cmd vlib_cli_command_t *
+ *
+ * @return error clib_error_t *
+ */
+static clib_error_t *
+test_sr_debug_fn (vlib_main_t * vm,
+		  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  ip6_sr_main_t *sm = &sr_main;
+
+  if (unformat (input, "on"))
+    sm->is_debug = 1;
+  else if (unformat (input, "off"))
+    sm->is_debug = 0;
+  else
+    return clib_error_return (0, "expected on|off in '%U'",
+			      format_unformat_error, input);
+
+  vlib_cli_output (vm, "debug trace now %s", sm->is_debug ? "on" : "off");
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (test_sr_debug, static) = {
+    .path = "test sr debug",
+    .short_help = "test sr debug on|off",
+    .function = test_sr_debug_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/sr/sr.h b/src/vnet/sr/sr.h
new file mode 100644
index 00000000..610b3699
--- /dev/null
+++ b/src/vnet/sr/sr.h
@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief Segment Routing header
+ *
+ * @note sr_replicate only works using DPDK today
+ */
+#ifndef included_vnet_sr_h
+#define included_vnet_sr_h
+
+#include <vnet/vnet.h>
+#include <vnet/sr/sr_packet.h>
+#include <vnet/ip/ip6_packet.h>
+
+#include <openssl/opensslconf.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <openssl/crypto.h>
+#include <openssl/sha.h>
+#include <openssl/opensslv.h>
+#include <openssl/hmac.h>
+
+/**
+ *    @brief Segment Route tunnel key
+ */
+typedef struct
+{
+  ip6_address_t src;
+  ip6_address_t dst;
+} ip6_sr_tunnel_key_t;
+
+/**
+ * @brief Segment Route tunnel
+ */
+typedef struct
+{
+  /** src, dst address */
+  ip6_sr_tunnel_key_t key;
+
+  /** Pptional tunnel name */
+  u8 *name;
+
+  /** Mask width for FIB entry */
+  u32 dst_mask_width;
+
+  /** First hop, to save 1 elt in the segment list */
+  ip6_address_t first_hop;
+
+  /** RX Fib index */
+  u32 rx_fib_index;
+  /** TX Fib index */
+  u32 tx_fib_index;
+
+  /** The actual ip6 SR header */
+  u8 *rewrite;
+
+  /** Indicates that this tunnel is part of a policy comprising
+     of multiple tunnels. If == ~0 tunnel is not part of a policy */
+  u32 policy_index;
+} ip6_sr_tunnel_t;
+
+/**
+ * @brief Shared secret for keyed-hash message authentication code (HMAC).
+ */
+typedef struct
+{
+  u8 *shared_secret;
+} ip6_sr_hmac_key_t;
+
+/**
+ * @brief Args required for add/del tunnel.
+ *
+ * Else we end up passing a LOT of parameters around.
+ */
+typedef struct
+{
+  /** Key (header imposition case) */
+  ip6_address_t *src_address;
+  ip6_address_t *dst_address;
+  u32 dst_mask_width;
+  u32 rx_table_id;
+  u32 tx_table_id;
+
+  /** optional name argument - for referencing SR tunnel/policy by name */
+  u8 *name;
+
+  /** optional policy name */
+  u8 *policy_name;
+
+  /** segment list, when inserting an ip6 SR header */
+  ip6_address_t *segments;
+
+  /**
+   * "Tag" list, aka segments inserted at the end of the list,
+   * past last_seg
+   */
+  ip6_address_t *tags;
+
+  /** Shared secret => generate SHA-256 HMAC security fields */
+  u8 *shared_secret;
+
+  /** Flags, e.g. cleanup, policy-list flags */
+  u16 flags_net_byte_order;
+
+  /** Delete the tunnnel? */
+  u8 is_del;
+} ip6_sr_add_del_tunnel_args_t;
+
+/**
+ * @brief Args for creating a policy.
+ *
+ * Typically used for multicast replication.
+ * ie a multicast address can be associated with a policy,
+ * then replicated across a number of unicast SR tunnels.
+ */
+typedef struct
+{
+  /** policy name */
+  u8 *name;
+
+  /** tunnel names */
+  u8 **tunnel_names;
+
+  /** Delete the policy? */
+  u8 is_del;
+} ip6_sr_add_del_policy_args_t;
+
+/**
+ * @brief Segment Routing policy.
+ *
+ * Typically used for multicast replication.
+ * ie a multicast address can be associated with a policy,
+ * then replicated across a number of unicast SR tunnels.
+ */
+typedef struct
+{
+  /** name of policy */
+  u8 *name;
+
+  /** vector to SR tunnel index */
+  u32 *tunnel_indices;
+
+} ip6_sr_policy_t;
+
+/**
+ * @brief Args for mapping of multicast address to policy name.
+ *
+ * Typically used for multicast replication.
+ * ie a multicast address can be associated with a policy,
+ * then replicated across a number of unicast SR tunnels.
+ */
+typedef struct
+{
+  /** multicast IP6 address */
+  ip6_address_t *multicast_address;
+
+  /** name of policy to map to */
+  u8 *policy_name;
+
+  /** Delete the mapping */
+  u8 is_del;
+
+} ip6_sr_add_del_multicastmap_args_t;
+
+/**
+ * @brief Segment Routing state.
+ */
+typedef struct
+{
+  /** pool of tunnel instances, sr entry only */
+  ip6_sr_tunnel_t *tunnels;
+
+  /** find an sr "tunnel" by its outer-IP src/dst */
+  uword *tunnel_index_by_key;
+
+  /** find an sr "tunnel" by its name */
+  uword *tunnel_index_by_name;
+
+  /** policy pool */
+  ip6_sr_policy_t *policies;
+
+  /** find a policy by name */
+  uword *policy_index_by_policy_name;
+
+  /** multicast address to policy mapping */
+  uword *policy_index_by_multicast_address;
+
+  /** hmac key id by shared secret */
+  uword *hmac_key_by_shared_secret;
+
+  /** ip6-rewrite next index for reinstalling the original dst address */
+  u32 ip6_rewrite_sr_next_index;
+
+  /** ip6-replicate next index for multicast tunnel */
+  u32 ip6_lookup_sr_replicate_index;
+
+  /** application API callback */
+  void *sr_local_cb;
+
+  /** validate hmac keys */
+  u8 validate_hmac;
+
+  /** pool of hmac keys */
+  ip6_sr_hmac_key_t *hmac_keys;
+
+  /** Openssl var */
+  EVP_MD *md;
+  /** Openssl var */
+  HMAC_CTX *hmac_ctx;
+
+  /** enable debug spew */
+  u8 is_debug;
+
+  /** convenience */
+  vlib_main_t *vlib_main;
+  /** convenience */
+  vnet_main_t *vnet_main;
+} ip6_sr_main_t;
+
+ip6_sr_main_t sr_main;
+
+format_function_t format_ip6_sr_header;
+format_function_t format_ip6_sr_header_with_length;
+
+vlib_node_registration_t ip6_sr_input_node;
+
+#if DPDK > 0
+extern vlib_node_registration_t sr_replicate_node;
+#endif /* DPDK */
+
+int ip6_sr_add_del_tunnel (ip6_sr_add_del_tunnel_args_t * a);
+int ip6_sr_add_del_policy (ip6_sr_add_del_policy_args_t * a);
+int ip6_sr_add_del_multicastmap (ip6_sr_add_del_multicastmap_args_t * a);
+
+void vnet_register_sr_app_callback (void *cb);
+
+void sr_fix_hmac (ip6_sr_main_t * sm, ip6_header_t * ip,
+		  ip6_sr_header_t * sr);
+
+#endif /* included_vnet_sr_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/sr/sr_error.def b/src/vnet/sr/sr_error.def
new file mode 100644
index 00000000..62d021fd
--- /dev/null
+++ b/src/vnet/sr/sr_error.def
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+sr_error (NONE, "no error")
+sr_error (BAD_ROUTING_HEADER_TYPE, "bad routing header type (not 4)")
+sr_error (NO_MORE_SEGMENTS, "out of SR segment drops")
+sr_error (PKTS_PROCESSED, "SR packets processed")
+sr_error (APP_CALLBACK, "SR application callback errors")
+sr_error (HMAC_INVALID, "SR packets with invalid HMAC signatures")
diff --git a/src/vnet/sr/sr_fix_dst_error.def b/src/vnet/sr/sr_fix_dst_error.def
new file mode 100644
index 00000000..48fe7af6
--- /dev/null
+++ b/src/vnet/sr/sr_fix_dst_error.def
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+sr_fix_dst_error (NONE, "no error")
+sr_fix_dst_error (NO_SR_HEADER, "no SR header present")
+sr_fix_dst_error (NO_MORE_SEGMENTS, "no more SR segments")
diff --git a/src/vnet/sr/sr_packet.h b/src/vnet/sr/sr_packet.h
new file mode 100644
index 00000000..179b94c2
--- /dev/null
+++ b/src/vnet/sr/sr_packet.h
@@ -0,0 +1,251 @@
+#ifndef included_vnet_sr_packet_h
+#define included_vnet_sr_packet_h
+
+#include <vnet/ip/ip.h>
+
+/*
+ * ipv6 segment-routing header format
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ *  @file
+ *  @brief The Segment Routing Header (SRH).
+ *
+ *  The Segment Routing Header (SRH) is defined in the diagram below.
+ *
+ *
+ *     0                   1                   2                   3
+ *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    | Next Header   |  Hdr Ext Len  | Routing Type  | Segments Left |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    | First Segment |             Flags             |  HMAC Key ID  |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |                                                               |
+ *    |            Segment List[0] (128 bits ipv6 address)            |
+ *    |                                                               |
+ *    |                                                               |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |                                                               |
+ *    |                                                               |
+ *                                  ...
+ *    |                                                               |
+ *    |                                                               |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |                                                               |
+ *    |            Segment List[n] (128 bits ipv6 address)            |
+ *    |                                                               |
+ *    |                                                               |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |                                                               |
+ *    |            Policy List[0] (optional)                          |
+ *    |                                                               |
+ *    |                                                               |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |                                                               |
+ *    |            Policy List[1] (optional)                          |
+ *    |                                                               |
+ *    |                                                               |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |                                                               |
+ *    |            Policy List[2] (optional)                          |
+ *    |                                                               |
+ *    |                                                               |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *    |                                                               |
+ *    |                                                               |
+ *    |                                                               |
+ *    |                       HMAC (256 bits)                         |
+ *    |                        (optional)                             |
+ *    |                                                               |
+ *    |                                                               |
+ *    |                                                               |
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ *   where:
+ *
+ *   o  Next Header: 8-bit selector.  Identifies the type of header
+ *      immediately following the SRH.
+ *
+ *   o  Hdr Ext Len: 8-bit unsigned integer, is the length of the SRH
+ *      header in 8-octet units, not including the first 8 octets.
+ *
+ *   o  Routing Type: TBD, to be assigned by IANA (suggested value: 4).
+ *
+ *   o  Segments Left.  Defined in [RFC2460], it contains the index, in
+ *      the Segment List, of the next segment to inspect.  Segments Left
+ *      is decremented at each segment and it is used as an index in the
+ *      segment list.
+ *
+ *   o  First Segment: offset in the SRH, not including the first 8 octets
+ *      and expressed in 16-octet units, pointing to the last element of
+ *      the segment list, which is in fact the first segment of the
+ *      segment routing path.
+ *
+ *   o  Flags: 16 bits of flags.  Following flags are defined:
+ *
+ *                              1
+ *          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
+ *         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *         |C|P|R|R|    Policy Flags       |
+ *         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ *         C-flag: Clean-up flag.  Set when the SRH has to be removed from
+ *         the packet when packet reaches the last segment.
+ *
+ *         P-flag: Protected flag.  Set when the packet has been rerouted
+ *         through FRR mechanism by a SR endpoint node.  See Section 6.3
+ *         for more details.
+ *
+ *         R-flags.  Reserved and for future use.
+ *
+ *         Policy Flags.  Define the type of the IPv6 addresses encoded
+ *         into the Policy List (see below).  The following have been
+ *         defined:
+ *
+ *            Bits 4-6: determine the type of the first element after the
+ *            segment list.
+ *
+ *            Bits 7-9: determine the type of the second element.
+ *
+ *            Bits 10-12: determine the type of the third element.
+ *
+ *            Bits 13-15: determine the type of the fourth element.
+ *
+ *         The following values are used for the type:
+ *
+ *            0x0: Not present.  If value is set to 0x0, it means the
+ *            element represented by these bits is not present.
+ *
+ *            0x1: SR Ingress.
+ *
+ *            0x2: SR Egress.
+ *
+ *            0x3: Original Source Address.
+ *
+ *   o  HMAC Key ID and HMAC field, and their use are defined in
+ *      [I-D.vyncke-6man-segment-routing-security].
+ *
+ *   o  Segment List[n]: 128 bit IPv6 addresses representing the nth
+ *      segment in the Segment List.  The Segment List is encoded starting
+ *      from the last segment of the path.  I.e., the first element of the
+ *      segment list (Segment List [0]) contains the last segment of the
+ *      path while the last segment of the Segment List (Segment List[n])
+ *      contains the first segment of the path.  The index contained in
+ *      "Segments Left" identifies the current active segment.
+ *
+ *   o  Policy List.  Optional addresses representing specific nodes in
+ *      the SR path such as:
+ *
+ *         SR Ingress: a 128 bit generic identifier representing the
+ *         ingress in the SR domain (i.e.: it needs not to be a valid IPv6
+ *         address).
+ *
+ *         SR Egress: a 128 bit generic identifier representing the egress
+ *         in the SR domain (i.e.: it needs not to be a valid IPv6
+ *         address).
+ *
+ *         Original Source Address: IPv6 address originally present in the
+ *         SA field of the packet.
+ *
+ *      The segments in the Policy List are encoded after the segment list
+ *      and they are optional.  If none are in the SRH, all bits of the
+ *      Policy List Flags MUST be set to 0x0.
+ */
+
+#ifndef IPPROTO_IPV6_ROUTE
+#define IPPROTO_IPV6_ROUTE        43
+#endif
+
+#define ROUTING_HEADER_TYPE_SR    4
+/**
+    @brief SR header struct.
+*/
+typedef struct
+{
+  /** Protocol for next header. */
+  u8 protocol;
+
+  /**
+   * Length of routing header in 8 octet units,
+   * not including the first 8 octets
+   */
+  u8 length;
+
+  /** Type of routing header; type 4 = segement routing */
+  u8 type;
+
+  /** Next segment in the segment list */
+  u8 segments_left;
+
+  /**
+   * Policy list pointer: offset in the SRH of the policy
+   * list - in 16-octet units - not including the first 8 octets.
+   */
+  u8 first_segment;
+
+  /** Flag bits */
+#define IP6_SR_HEADER_FLAG_CLEANUP    (0x8000)
+  /** Flag bits */
+#define IP6_SR_HEADER_FLAG_PROTECTED  (0x4000)
+  /** Flag bits */
+#define IP6_SR_HEADER_FLAG_RESERVED   (0x3000)
+  /** Flag bits */
+#define IP6_SR_HEADER_FLAG_PL_ELT_NOT_PRESENT (0x0)
+    /** Flag bits */
+#define IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE (0x1)
+    /** Flag bits */
+#define IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE (0x2)
+    /** Flag bits */
+#define IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR (0x3)
+  /** values 0x4 - 0x7 are reserved */
+  u16 flags;
+  u8 hmac_key;
+
+  /** The segment + policy list elts */
+  ip6_address_t segments[0];
+} __attribute__ ((packed)) ip6_sr_header_t;
+
+static inline int
+ip6_sr_policy_list_shift_from_index (int pl_index)
+{
+  return (-3 * pl_index) + 12;
+}
+
+/** pl_index is one-origined */
+static inline int
+ip6_sr_policy_list_flags (u16 flags_host_byte_order, int pl_index)
+{
+  int shift;
+
+  if (pl_index <= 0 || pl_index > 4)
+    return 0;
+
+  shift = (-3 * pl_index) + 12;
+  flags_host_byte_order >>= shift;
+
+  return (flags_host_byte_order & 7);
+}
+
+#endif /* included_vnet_sr_packet_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/sr/sr_replicate.c b/src/vnet/sr/sr_replicate.c
new file mode 100644
index 00000000..5f9de504
--- /dev/null
+++ b/src/vnet/sr/sr_replicate.c
@@ -0,0 +1,490 @@
+/*
+ * sr_replicate.c: ipv6 segment routing replicator for multicast
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ *  @file
+ *  @brief Functions for replicating packets across SR tunnels.
+ *
+ *  Leverages rte_pktmbuf_clone() so there is no memcpy for
+ *  invariant parts of the packet.
+ *
+ *  @note Currently requires DPDK
+*/
+
+#if DPDK > 0			/* Cannot run replicate without DPDK */
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/sr/sr.h>
+#include <vnet/devices/dpdk/dpdk.h>
+#include <vnet/ip/ip.h>
+#include <vnet/fib/ip6_fib.h>
+
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+
+/**
+ *   @brief sr_replicate state.
+ *
+*/
+typedef struct
+{
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} sr_replicate_main_t;
+
+sr_replicate_main_t sr_replicate_main;
+
+/**
+ *    @brief Information to display in packet trace.
+ *
+*/
+typedef struct
+{
+  ip6_address_t src, dst;
+  u16 length;
+  u32 next_index;
+  u32 tunnel_index;
+  u8 sr[256];
+} sr_replicate_trace_t;
+
+/**
+ *  @brief packet trace format function.
+ *
+ *  @param *s u8 used for string output
+ *  @param *args va_list  structured input to va_arg to output @ref sr_replicate_trace_t
+ *  @return *s u8 - formatted trace output
+*/
+static u8 *
+format_sr_replicate_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  sr_replicate_trace_t *t = va_arg (*args, sr_replicate_trace_t *);
+  ip6_sr_main_t *sm = &sr_main;
+  ip6_sr_tunnel_t *tun = pool_elt_at_index (sm->tunnels, t->tunnel_index);
+  ip6_fib_t *rx_fib, *tx_fib;
+
+  rx_fib = ip6_fib_get (tun->rx_fib_index);
+  tx_fib = ip6_fib_get (tun->tx_fib_index);
+
+  s = format
+    (s, "SR-REPLICATE: next %s ip6 src %U dst %U len %u\n"
+     "           rx-fib-id %d tx-fib-id %d\n%U",
+     "ip6-lookup",
+     format_ip6_address, &t->src,
+     format_ip6_address, &t->dst, t->length,
+     rx_fib->table_id, tx_fib->table_id,
+     format_ip6_sr_header, t->sr, 0 /* print_hmac */ );
+  return s;
+
+}
+
+#define foreach_sr_replicate_error \
+_(REPLICATED, "sr packets replicated") \
+_(NO_BUFFERS, "error allocating buffers for replicas") \
+_(NO_REPLICAS, "no replicas were needed") \
+_(NO_BUFFER_DROPS, "sr no buffer drops")
+
+/**
+ * @brief Struct for SR replicate errors
+ */
+typedef enum
+{
+#define _(sym,str) SR_REPLICATE_ERROR_##sym,
+  foreach_sr_replicate_error
+#undef _
+    SR_REPLICATE_N_ERROR,
+} sr_replicate_error_t;
+
+/**
+ * @brief Error strings for SR replicate
+ */
+static char *sr_replicate_error_strings[] = {
+#define _(sym,string) string,
+  foreach_sr_replicate_error
+#undef _
+};
+
+/**
+ * @brief Defines next-nodes for packet processing.
+ *
+*/
+typedef enum
+{
+  SR_REPLICATE_NEXT_IP6_LOOKUP,
+  SR_REPLICATE_N_NEXT,
+} sr_replicate_next_t;
+
+/**
+ *   @brief Single loop packet replicator.
+ *
+ *   @node sr-replicate
+ *   @param vm vlib_main_t
+ *   @return frame->n_vectors uword
+*/
+static uword
+sr_replicate_node_fn (vlib_main_t * vm,
+		      vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  sr_replicate_next_t next_index;
+  int pkts_replicated = 0;
+  ip6_sr_main_t *sm = &sr_main;
+  int no_buffer_drops = 0;
+  vlib_buffer_free_list_t *fl;
+  unsigned socket_id = rte_socket_id ();
+  vlib_buffer_main_t *bm = vm->buffer_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  fl = vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, hdr_bi0;
+	  vlib_buffer_t *b0, *orig_b0;
+	  struct rte_mbuf *orig_mb0 = 0, *hdr_mb0 = 0, *clone0 = 0;
+	  struct rte_mbuf **hdr_vec = 0, **rte_mbuf_vec = 0;
+	  ip6_sr_policy_t *pol0 = 0;
+	  ip6_sr_tunnel_t *t0 = 0;
+	  ip6_sr_header_t *hdr_sr0 = 0;
+	  ip6_header_t *ip0 = 0, *hdr_ip0 = 0;
+	  int num_replicas = 0;
+	  int i;
+	  u32 len_bytes = sizeof (ip6_header_t);
+	  u8 next_hdr, ip_next_hdr = IPPROTO_IPV6_ROUTE;
+
+	  bi0 = from[0];
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  orig_b0 = b0;
+
+	  pol0 = pool_elt_at_index (sm->policies,
+				    vnet_buffer (b0)->ip.save_protocol);
+
+	  ip0 = vlib_buffer_get_current (b0);
+	  /* Skip forward to the punch-in point */
+	  vlib_buffer_advance (b0, sizeof (*ip0));
+	  next_hdr = ip0->protocol;
+
+	  /* HBH must immediately follow ipv6 header */
+	  if (PREDICT_FALSE
+	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+	    {
+	      ip6_hop_by_hop_ext_t *ext_hdr =
+		(ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
+	      u32 ext_hdr_len = 0;
+	      ext_hdr_len = ip6_ext_header_len ((ip6_ext_header_t *) ext_hdr);
+	      len_bytes += ext_hdr_len;
+	      next_hdr = ext_hdr->next_hdr;
+	      ext_hdr->next_hdr = IPPROTO_IPV6_ROUTE;
+	      ip_next_hdr = IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS;
+	      /* Skip forward to the punch-in point */
+	      vlib_buffer_advance (b0, ext_hdr_len);
+
+	    }
+
+	  orig_mb0 = rte_mbuf_from_vlib_buffer (b0);
+
+	  i16 delta0 = vlib_buffer_length_in_chain (vm, orig_b0)
+	    - (i16) orig_mb0->pkt_len;
+
+	  u16 new_data_len0 = (u16) ((i16) orig_mb0->data_len + delta0);
+	  u16 new_pkt_len0 = (u16) ((i16) orig_mb0->pkt_len + delta0);
+
+	  orig_mb0->data_len = new_data_len0;
+	  orig_mb0->pkt_len = new_pkt_len0;
+	  orig_mb0->data_off += (u16) (b0->current_data);
+
+	  /*
+	     Before entering loop determine if we can allocate:
+	     - all the new HEADER RTE_MBUFs and assign them to a vector
+	     - all the clones
+
+	     if successful, then iterate over vectors of resources
+
+	   */
+	  num_replicas = vec_len (pol0->tunnel_indices);
+
+	  if (PREDICT_FALSE (num_replicas == 0))
+	    {
+	      b0->error = node->errors[SR_REPLICATE_ERROR_NO_REPLICAS];
+	      goto do_trace0;
+	    }
+
+	  vec_reset_length (hdr_vec);
+	  vec_reset_length (rte_mbuf_vec);
+
+	  for (i = 0; i < num_replicas; i++)
+	    {
+	      uint8_t nb_seg;
+	      struct rte_mbuf *clone0i;
+	      vlib_buffer_t *clone0_c, *clone_b0;
+
+	      t0 = vec_elt_at_index (sm->tunnels, pol0->tunnel_indices[i]);
+	      hdr_mb0 = rte_pktmbuf_alloc (bm->pktmbuf_pools[socket_id]);
+
+	      if (i < (num_replicas - 1))
+		{
+		  /* Not the last tunnel to process */
+		  clone0 = rte_pktmbuf_clone
+		    (orig_mb0, bm->pktmbuf_pools[socket_id]);
+		  if (clone0 == 0)
+		    goto clone_fail;
+		  nb_seg = 0;
+		  clone0i = clone0;
+		  clone0_c = NULL;
+		  while ((clone0->nb_segs >= 1) && (nb_seg < clone0->nb_segs))
+		    {
+
+		      clone_b0 = vlib_buffer_from_rte_mbuf (clone0i);
+		      vlib_buffer_init_for_free_list (clone_b0, fl);
+
+		      ASSERT ((clone_b0->flags & VLIB_BUFFER_NEXT_PRESENT) ==
+			      0);
+		      ASSERT (clone_b0->current_data == 0);
+
+		      clone_b0->current_data =
+			(clone0i->buf_addr + clone0i->data_off) -
+			(void *) clone_b0->data;
+
+		      clone_b0->current_length = clone0i->data_len;
+		      if (PREDICT_FALSE (clone0_c != NULL))
+			{
+			  clone0_c->flags |= VLIB_BUFFER_NEXT_PRESENT;
+			  clone0_c->next_buffer =
+			    vlib_get_buffer_index (vm, clone_b0);
+			}
+		      clone0_c = clone_b0;
+		      clone0i = clone0i->next;
+		      nb_seg++;
+		    }
+		}
+	      else
+		/* First tunnel to process, use original MB */
+		clone0 = orig_mb0;
+
+
+	      if (PREDICT_FALSE (!clone0 || !hdr_mb0))
+		{
+		clone_fail:
+		  b0->error = node->errors[SR_REPLICATE_ERROR_NO_BUFFERS];
+
+		  vec_foreach_index (i, rte_mbuf_vec)
+		  {
+		    rte_pktmbuf_free (rte_mbuf_vec[i]);
+		  }
+		  vec_free (rte_mbuf_vec);
+
+		  vec_foreach_index (i, hdr_vec)
+		  {
+		    rte_pktmbuf_free (hdr_vec[i]);
+		  }
+		  vec_free (hdr_vec);
+
+		  goto do_trace0;
+		}
+
+	      vec_add1 (hdr_vec, hdr_mb0);
+	      vec_add1 (rte_mbuf_vec, clone0);
+
+	    }
+
+	  for (i = 0; i < num_replicas; i++)
+	    {
+	      vlib_buffer_t *hdr_b0;
+	      u16 new_l0 = 0;
+
+	      t0 = vec_elt_at_index (sm->tunnels, pol0->tunnel_indices[i]);
+	      /* Our replicas */
+	      hdr_mb0 = hdr_vec[i];
+	      clone0 = rte_mbuf_vec[i];
+
+	      hdr_mb0->data_len = len_bytes + vec_len (t0->rewrite);
+	      hdr_mb0->pkt_len = hdr_mb0->data_len +
+		vlib_buffer_length_in_chain (vm, orig_b0);
+
+	      hdr_b0 = vlib_buffer_from_rte_mbuf (hdr_mb0);
+
+	      vlib_buffer_init_for_free_list (hdr_b0, fl);
+
+	      memcpy (hdr_b0->data, ip0, len_bytes);
+	      memcpy (hdr_b0->data + len_bytes, t0->rewrite,
+		      vec_len (t0->rewrite));
+
+	      hdr_b0->current_data = 0;
+	      hdr_b0->current_length = len_bytes + vec_len (t0->rewrite);
+	      hdr_b0->flags = orig_b0->flags | VLIB_BUFFER_NEXT_PRESENT;
+	      hdr_b0->trace_index = orig_b0->trace_index;
+	      vnet_buffer (hdr_b0)->l2_classify.opaque_index = 0;
+
+	      hdr_b0->total_length_not_including_first_buffer =
+		hdr_mb0->pkt_len - hdr_b0->current_length;
+	      vnet_buffer (hdr_b0)->sw_if_index[VLIB_TX] = t0->tx_fib_index;
+
+	      hdr_ip0 = (ip6_header_t *) hdr_b0->data;
+	      new_l0 = clib_net_to_host_u16 (ip0->payload_length) +
+		vec_len (t0->rewrite);
+	      hdr_ip0->payload_length = clib_host_to_net_u16 (new_l0);
+	      hdr_sr0 = (ip6_sr_header_t *) ((u8 *) hdr_ip0 + len_bytes);
+	      /* $$$ tune */
+	      clib_memcpy (hdr_sr0, t0->rewrite, vec_len (t0->rewrite));
+	      hdr_sr0->protocol = next_hdr;
+	      hdr_ip0->protocol = ip_next_hdr;
+
+	      /* Copy dst address into the DA slot in the segment list */
+	      clib_memcpy (hdr_sr0->segments, ip0->dst_address.as_u64,
+			   sizeof (ip6_address_t));
+
+	      /* Rewrite the ip6 dst address */
+	      hdr_ip0->dst_address.as_u64[0] = t0->first_hop.as_u64[0];
+	      hdr_ip0->dst_address.as_u64[1] = t0->first_hop.as_u64[1];
+
+	      sr_fix_hmac (sm, hdr_ip0, hdr_sr0);
+
+	      /* prepend new header to invariant piece */
+	      hdr_mb0->next = clone0;
+	      hdr_b0->next_buffer =
+		vlib_get_buffer_index (vm,
+				       vlib_buffer_from_rte_mbuf (clone0));
+
+	      /* update header's fields */
+	      hdr_mb0->pkt_len =
+		(uint16_t) (hdr_mb0->data_len + clone0->pkt_len);
+	      hdr_mb0->nb_segs = (uint8_t) (clone0->nb_segs + 1);
+
+	      /* copy metadata from source packet */
+	      hdr_mb0->port = clone0->port;
+	      hdr_mb0->vlan_tci = clone0->vlan_tci;
+	      hdr_mb0->vlan_tci_outer = clone0->vlan_tci_outer;
+	      hdr_mb0->tx_offload = clone0->tx_offload;
+	      hdr_mb0->hash = clone0->hash;
+
+	      hdr_mb0->ol_flags = clone0->ol_flags & ~(IND_ATTACHED_MBUF);
+
+	      __rte_mbuf_sanity_check (hdr_mb0, 1);
+
+	      hdr_bi0 = vlib_get_buffer_index (vm, hdr_b0);
+
+	      to_next[0] = hdr_bi0;
+	      to_next += 1;
+	      n_left_to_next -= 1;
+
+	      if (n_left_to_next == 0)
+		{
+		  vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+		  vlib_get_next_frame (vm, node, next_index,
+				       to_next, n_left_to_next);
+
+		}
+	      pkts_replicated++;
+	    }
+
+	  from += 1;
+	  n_left_from -= 1;
+
+	do_trace0:
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      sr_replicate_trace_t *tr = vlib_add_trace (vm, node,
+							 b0, sizeof (*tr));
+	      tr->tunnel_index = t0 - sm->tunnels;
+	      tr->length = 0;
+	      if (hdr_ip0)
+		{
+		  memcpy (tr->src.as_u8, hdr_ip0->src_address.as_u8,
+			  sizeof (tr->src.as_u8));
+		  memcpy (tr->dst.as_u8, hdr_ip0->dst_address.as_u8,
+			  sizeof (tr->dst.as_u8));
+		  if (hdr_ip0->payload_length)
+		    tr->length = clib_net_to_host_u16
+		      (hdr_ip0->payload_length);
+		}
+	      tr->next_index = next_index;
+	      if (hdr_sr0)
+		memcpy (tr->sr, hdr_sr0, sizeof (tr->sr));
+	    }
+
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, sr_replicate_node.index,
+			       SR_REPLICATE_ERROR_REPLICATED,
+			       pkts_replicated);
+
+  vlib_node_increment_counter (vm, sr_replicate_node.index,
+			       SR_REPLICATE_ERROR_NO_BUFFER_DROPS,
+			       no_buffer_drops);
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (sr_replicate_node) = {
+  .function = sr_replicate_node_fn,
+  .name = "sr-replicate",
+  .vector_size = sizeof (u32),
+  .format_trace = format_sr_replicate_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(sr_replicate_error_strings),
+  .error_strings = sr_replicate_error_strings,
+
+  .n_next_nodes = SR_REPLICATE_N_NEXT,
+
+  .next_nodes = {
+        [SR_REPLICATE_NEXT_IP6_LOOKUP] = "ip6-lookup",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (sr_replicate_node, sr_replicate_node_fn)
+/* *INDENT-ON* */
+
+clib_error_t *
+sr_replicate_init (vlib_main_t * vm)
+{
+  sr_replicate_main_t *msm = &sr_replicate_main;
+
+  msm->vlib_main = vm;
+  msm->vnet_main = vnet_get_main ();
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (sr_replicate_init);
+
+#endif /* DPDK */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/srp/format.c b/src/vnet/srp/format.c
new file mode 100644
index 00000000..a0250cc9
--- /dev/null
+++ b/src/vnet/srp/format.c
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * srp_format.c: srp formatting/parsing.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/srp/srp.h>
+#include <vnet/ethernet/ethernet.h>
+
+static u8 * format_srp_mode (u8 * s, va_list * args)
+{
+  u32 mode = va_arg (*args, u32);
+  char * t = 0;
+  switch (mode)
+    {
+#define _(f) case SRP_MODE_##f: t = #f; break;
+  foreach_srp_mode
+#undef _
+    default: t = 0; break;
+    }
+  if (t)
+    s = format (s, "%s", t);
+  else
+    s = format (s, "unknown 0x%x", mode);
+
+  return s;
+}
+
+u8 * format_srp_header_with_length (u8 * s, va_list * args)
+{
+  srp_and_ethernet_header_t * h = va_arg (*args, srp_and_ethernet_header_t *);
+  u32 max_header_bytes = va_arg (*args, u32);
+  ethernet_main_t * em = &ethernet_main;
+  uword indent, header_bytes;
+
+  header_bytes = sizeof (h[0]);
+  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
+    return format (s, "srp header truncated");
+
+  indent = format_get_indent (s);
+
+  s = format (s, "mode %U, ring %s, priority %d, ttl %d",
+	      format_srp_mode, h->srp.mode,
+	      h->srp.is_inner_ring ? "inner" : "outer",
+	      h->srp.priority, h->srp.ttl);
+
+  s = format (s, "\n%U%U: %U -> %U",
+	      format_white_space, indent,
+	      format_ethernet_type, clib_net_to_host_u16 (h->ethernet.type),
+	      format_ethernet_address, h->ethernet.src_address,
+	      format_ethernet_address, h->ethernet.dst_address);
+
+  if (max_header_bytes != 0 && header_bytes < max_header_bytes)
+    {
+      ethernet_type_info_t * ti;
+      vlib_node_t * node;
+
+      ti = ethernet_get_type_info (em, h->ethernet.type);
+      node = ti ? vlib_get_node (em->vlib_main, ti->node_index) : 0;
+      if (node && node->format_buffer)
+	s = format (s, "\n%U%U",
+		    format_white_space, indent,
+		    node->format_buffer, (void *) h + header_bytes,
+		    max_header_bytes - header_bytes);
+    }
+
+  return s;
+}
+
+u8 * format_srp_header (u8 * s, va_list * args)
+{
+  srp_header_t * m = va_arg (*args, srp_header_t *);
+  return format (s, "%U", format_srp_header_with_length, m, 0);
+}
+
+uword
+unformat_srp_header (unformat_input_t * input, va_list * args)
+{
+  u8 ** result = va_arg (*args, u8 **);
+  srp_and_ethernet_header_t * h;
+
+  {
+    void * p;
+    vec_add2 (*result, p, sizeof (h[0]));
+    h = p;
+  }
+
+  if (! unformat (input, "%U: %U -> %U",
+		  unformat_ethernet_type_net_byte_order, &h->ethernet.type,
+		  unformat_ethernet_address, &h->ethernet.src_address,
+		  unformat_ethernet_address, &h->ethernet.dst_address))
+    return 0;
+
+  h->srp.mode = SRP_MODE_data;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      u32 x;
+
+      if (unformat (input, "control"))
+	h->srp.mode = SRP_MODE_control_pass_to_host;
+      
+      else if (unformat (input, "pri %d", &x))
+	h->srp.priority = x;
+
+      else if (unformat (input, "ttl %d", &x))
+	h->srp.ttl = x;
+
+      else
+	return 0;
+    }
+
+  return 1;
+}
diff --git a/src/vnet/srp/interface.c b/src/vnet/srp/interface.c
new file mode 100644
index 00000000..d427cc3c
--- /dev/null
+++ b/src/vnet/srp/interface.c
@@ -0,0 +1,458 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * srp_interface.c: srp interfaces
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/srp/srp.h>
+
+static u8*
+srp_build_rewrite (vnet_main_t * vnm,
+		   u32 sw_if_index,
+		   vnet_link_t link_type,
+		   const void * dst_address)
+{
+  vnet_hw_interface_t * hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  srp_main_t * sm = &srp_main;
+  srp_and_ethernet_header_t * h;
+  u8* rewrite = NULL;
+  u16 type;
+  uword n_bytes = sizeof (h[0]);
+
+  switch (link_type) {
+#define _(a,b) case VNET_LINK_##a: type = ETHERNET_TYPE_##b; break
+    _ (IP4, IP4);
+    _ (IP6, IP6);
+    _ (MPLS, MPLS_UNICAST);
+    _ (ARP, ARP);
+#undef _
+  default:
+      return (NULL);
+  }
+
+  vec_validate(rewrite, n_bytes-1);
+  h = (srp_and_ethernet_header_t *)rewrite;
+
+  clib_memcpy (h->ethernet.src_address, hw->hw_address, sizeof (h->ethernet.src_address));
+  if (dst_address)
+    clib_memcpy (h->ethernet.dst_address, dst_address, sizeof (h->ethernet.dst_address));
+  else
+    memset (h->ethernet.dst_address, ~0, sizeof (h->ethernet.dst_address)); /* broadcast */
+
+  h->ethernet.type = clib_host_to_net_u16 (type);
+
+  h->srp.as_u16 = 0;
+  h->srp.mode = SRP_MODE_data;
+  h->srp.ttl = sm->default_data_ttl;
+  srp_header_compute_parity (&h->srp);
+
+  return (rewrite);
+}
+
+static void srp_register_interface_helper (u32 * hw_if_indices_by_side, u32 redistribute);
+
+void serialize_srp_main (serialize_main_t * m, va_list * va)
+{
+  srp_main_t * sm = &srp_main;
+  srp_interface_t * si;
+
+  serialize_integer (m, pool_elts (sm->interface_pool), sizeof (u32));
+  pool_foreach (si, sm->interface_pool, ({
+    serialize_integer (m, si->rings[SRP_RING_OUTER].hw_if_index, sizeof (u32));
+    serialize_integer (m, si->rings[SRP_RING_INNER].hw_if_index, sizeof (u32));
+  }));
+}
+
+void unserialize_srp_main (serialize_main_t * m, va_list * va)
+{
+  u32 i, n_ifs, hw_if_indices[SRP_N_RING];
+
+  unserialize_integer (m, &n_ifs, sizeof (u32));
+  for (i = 0; i < n_ifs; i++)
+    {
+      unserialize_integer (m, &hw_if_indices[SRP_RING_OUTER], sizeof (u32));
+      unserialize_integer (m, &hw_if_indices[SRP_RING_INNER], sizeof (u32));
+      srp_register_interface_helper (hw_if_indices, /* redistribute */ 0);
+    }
+}
+
+static void serialize_srp_register_interface_msg (serialize_main_t * m, va_list * va)
+{
+  u32 * hw_if_indices = va_arg (*va, u32 *);
+  serialize_integer (m, hw_if_indices[SRP_SIDE_A], sizeof (hw_if_indices[SRP_SIDE_A]));
+  serialize_integer (m, hw_if_indices[SRP_SIDE_B], sizeof (hw_if_indices[SRP_SIDE_B]));
+}
+
+static void unserialize_srp_register_interface_msg (serialize_main_t * m, va_list * va)
+{
+  CLIB_UNUSED (mc_main_t * mcm) = va_arg (*va, mc_main_t *);
+  u32 hw_if_indices[SRP_N_SIDE];
+  srp_main_t * sm = &srp_main;
+  uword * p;
+
+  unserialize_integer (m, &hw_if_indices[SRP_SIDE_A], sizeof (hw_if_indices[SRP_SIDE_A]));
+  unserialize_integer (m, &hw_if_indices[SRP_SIDE_B], sizeof (hw_if_indices[SRP_SIDE_B]));
+
+  p = hash_get (sm->srp_register_interface_waiting_process_pool_index_by_hw_if_index,
+		hw_if_indices[0]);
+  if (p)
+    {
+      vlib_one_time_waiting_process_t * wp = pool_elt_at_index (sm->srp_register_interface_waiting_process_pool, p[0]);
+      vlib_signal_one_time_waiting_process (mcm->vlib_main, wp);
+      pool_put (sm->srp_register_interface_waiting_process_pool, wp);
+      hash_unset (sm->srp_register_interface_waiting_process_pool_index_by_hw_if_index,
+		  hw_if_indices[0]);
+    }
+  else
+    srp_register_interface_helper (hw_if_indices, /* redistribute */ 0);
+}
+
+MC_SERIALIZE_MSG (srp_register_interface_msg, static) = {
+  .name = "vnet_srp_register_interface",
+  .serialize = serialize_srp_register_interface_msg,
+  .unserialize = unserialize_srp_register_interface_msg,
+};
+
+static void srp_register_interface_helper (u32 * hw_if_indices_by_side, u32 redistribute)
+{
+  vnet_main_t * vnm = vnet_get_main();
+  srp_main_t * sm = &srp_main;
+  vlib_main_t * vm = sm->vlib_main;
+  srp_interface_t * si;
+  vnet_hw_interface_t * hws[SRP_N_RING];
+  uword s, * p;
+
+  if (vm->mc_main && redistribute)
+    {
+      vlib_one_time_waiting_process_t * wp;
+      mc_serialize (vm->mc_main, &srp_register_interface_msg, hw_if_indices_by_side);
+      pool_get (sm->srp_register_interface_waiting_process_pool, wp);
+      hash_set (sm->srp_register_interface_waiting_process_pool_index_by_hw_if_index,
+		hw_if_indices_by_side[0],
+		wp - sm->srp_register_interface_waiting_process_pool);
+      vlib_current_process_wait_for_one_time_event (vm, wp);
+    }
+
+  /* Check if interface has already been registered. */
+  p = hash_get (sm->interface_index_by_hw_if_index, hw_if_indices_by_side[0]);
+  if (p)
+    {
+      si = pool_elt_at_index (sm->interface_pool, p[0]);
+    }
+  else
+    {
+      pool_get (sm->interface_pool, si);
+      memset (si, 0, sizeof (si[0]));
+    }
+  for (s = 0; s < SRP_N_SIDE; s++)
+    {
+      hws[s] = vnet_get_hw_interface (vnm, hw_if_indices_by_side[s]);
+      si->rings[s].ring = s;
+      si->rings[s].hw_if_index = hw_if_indices_by_side[s];
+      si->rings[s].sw_if_index = hws[s]->sw_if_index;
+      hash_set (sm->interface_index_by_hw_if_index, hw_if_indices_by_side[s], si - sm->interface_pool);
+    }
+
+  /* Inherit MAC address from outer ring. */
+  clib_memcpy (si->my_address, hws[SRP_RING_OUTER]->hw_address,
+	  vec_len (hws[SRP_RING_OUTER]->hw_address));
+
+  /* Default time to wait to restore signal. */
+  si->config.wait_to_restore_idle_delay = 60;
+  si->config.ips_tx_interval = 1;
+}
+
+void srp_register_interface (u32 * hw_if_indices_by_side)
+{
+  srp_register_interface_helper (hw_if_indices_by_side, /* redistribute */ 1);
+}
+
+void srp_interface_set_hw_wrap_function (u32 hw_if_index, srp_hw_wrap_function_t * f)
+{
+  srp_interface_t * si = srp_get_interface_from_vnet_hw_interface (hw_if_index);
+  si->hw_wrap_function = f;
+}
+
+void srp_interface_set_hw_enable_function (u32 hw_if_index, srp_hw_enable_function_t * f)
+{
+  srp_interface_t * si = srp_get_interface_from_vnet_hw_interface (hw_if_index);
+  si->hw_enable_function = f;
+}
+
+void srp_interface_enable_ips (u32 hw_if_index)
+{
+  srp_main_t * sm = &srp_main;
+  srp_interface_t * si = srp_get_interface_from_vnet_hw_interface (hw_if_index);
+
+  si->ips_process_enable = 1;
+
+  vlib_node_set_state (sm->vlib_main, srp_ips_process_node.index, VLIB_NODE_STATE_POLLING);
+}
+
+static uword
+srp_is_valid_class_for_interface (vnet_main_t * vnm, u32 hw_if_index, u32 hw_class_index)
+{
+  srp_interface_t * si = srp_get_interface_from_vnet_hw_interface (hw_if_index);
+
+  if (! si)
+    return 0;
+
+  /* Both sides must be admin down. */
+  if (vnet_sw_interface_is_admin_up (vnm, si->rings[SRP_RING_OUTER].sw_if_index))
+    return 0;
+  if (vnet_sw_interface_is_admin_up (vnm, si->rings[SRP_RING_INNER].sw_if_index))
+    return 0;
+					 
+  return 1;
+}
+
+static void
+srp_interface_hw_class_change (vnet_main_t * vnm, u32 hw_if_index,
+			       u32 old_hw_class_index, u32 new_hw_class_index)
+{
+  srp_main_t * sm = &srp_main;
+  srp_interface_t * si = srp_get_interface_from_vnet_hw_interface (hw_if_index);
+  vnet_hw_interface_t * hi;
+  vnet_device_class_t * dc;
+  u32 r, to_srp;
+
+  if (!si) {
+      clib_warning ("srp interface no set si = 0");
+      return;
+  }
+
+  to_srp = new_hw_class_index == srp_hw_interface_class.index;
+
+  /* Changing class on either outer or inner rings implies changing the class
+     of the other. */
+  for (r = 0; r < SRP_N_RING; r++)
+    {
+      srp_interface_ring_t * ir = &si->rings[r];
+
+      hi = vnet_get_hw_interface (vnm, ir->hw_if_index);
+      dc = vnet_get_device_class (vnm, hi->dev_class_index);
+
+      /* hw_if_index itself will be handled by caller. */
+      if (ir->hw_if_index != hw_if_index)
+	{
+	  vnet_hw_interface_init_for_class (vnm, ir->hw_if_index,
+					    new_hw_class_index,
+					    to_srp ? si - sm->interface_pool : ~0);
+
+	  if (dc->hw_class_change)
+	    dc->hw_class_change (vnm, ir->hw_if_index, new_hw_class_index);
+	}
+      else
+	hi->hw_instance = to_srp ? si - sm->interface_pool : ~0;
+    }
+
+  if (si->hw_enable_function)
+    si->hw_enable_function (si, /* enable */ to_srp);
+}
+
+VNET_HW_INTERFACE_CLASS (srp_hw_interface_class) = {
+  .name = "SRP",
+  .format_address = format_ethernet_address,
+  .format_header = format_srp_header_with_length,
+  .format_device = format_srp_device,
+  .unformat_hw_address = unformat_ethernet_address,
+  .unformat_header = unformat_srp_header,
+  .build_rewrite = srp_build_rewrite,
+  .update_adjacency = ethernet_update_adjacency,
+  .is_valid_class_for_interface = srp_is_valid_class_for_interface,
+  .hw_class_change = srp_interface_hw_class_change,
+};
+
+static void serialize_srp_interface_config_msg (serialize_main_t * m, va_list * va)
+{
+  srp_interface_t * si = va_arg (*va, srp_interface_t *);
+  srp_main_t * sm = &srp_main;
+
+  ASSERT (! pool_is_free (sm->interface_pool, si));
+  serialize_integer (m, si - sm->interface_pool, sizeof (u32));
+  serialize (m, serialize_f64, si->config.wait_to_restore_idle_delay);
+  serialize (m, serialize_f64, si->config.ips_tx_interval);
+}
+
+static void unserialize_srp_interface_config_msg (serialize_main_t * m, va_list * va)
+{
+  CLIB_UNUSED (mc_main_t * mcm) = va_arg (*va, mc_main_t *);
+  srp_main_t * sm = &srp_main;
+  srp_interface_t * si;
+  u32 si_index;
+
+  unserialize_integer (m, &si_index, sizeof (u32));
+  si = pool_elt_at_index (sm->interface_pool, si_index);
+  unserialize (m, unserialize_f64, &si->config.wait_to_restore_idle_delay);
+  unserialize (m, unserialize_f64, &si->config.ips_tx_interval);
+}
+
+MC_SERIALIZE_MSG (srp_interface_config_msg, static) = {
+  .name = "vnet_srp_interface_config",
+  .serialize = serialize_srp_interface_config_msg,
+  .unserialize = unserialize_srp_interface_config_msg,
+};
+
+void srp_interface_get_interface_config (u32 hw_if_index, srp_interface_config_t * c)
+{
+  srp_interface_t * si = srp_get_interface_from_vnet_hw_interface (hw_if_index);
+  ASSERT (si != 0);
+  c[0] = si->config;
+}
+
+void srp_interface_set_interface_config (u32 hw_if_index, srp_interface_config_t * c)
+{
+  srp_main_t * sm = &srp_main;
+  vlib_main_t * vm = sm->vlib_main;
+  srp_interface_t * si = srp_get_interface_from_vnet_hw_interface (hw_if_index);
+  ASSERT (si != 0);
+  if (memcmp (&si->config, &c[0], sizeof (c[0])))
+    {
+      si->config = c[0];
+      if (vm->mc_main)
+	mc_serialize (vm->mc_main, &srp_interface_config_msg, si);
+    }
+}
+
+#if DEBUG > 0
+
+#define VNET_SIMULATED_SRP_TX_NEXT_SRP_INPUT VNET_INTERFACE_TX_N_NEXT
+
+/* Echo packets back to srp input. */
+static uword
+simulated_srp_interface_tx (vlib_main_t * vm,
+			    vlib_node_runtime_t * node,
+			    vlib_frame_t * frame)
+{
+  u32 n_left_from, n_left_to_next, n_copy, * from, * to_next;
+  u32 next_index = VNET_SIMULATED_SRP_TX_NEXT_SRP_INPUT;
+  u32 i;
+  vlib_buffer_t * b;
+
+  n_left_from = frame->n_vectors;
+  from = vlib_frame_args (frame);
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      n_copy = clib_min (n_left_from, n_left_to_next);
+
+      clib_memcpy (to_next, from, n_copy * sizeof (from[0]));
+      n_left_to_next -= n_copy;
+      n_left_from -= n_copy;
+      for (i = 0; i < n_copy; i++)
+	{
+	  b = vlib_get_buffer (vm, from[i]);
+	  /* TX interface will be fake eth; copy to RX for benefit of srp-input. */
+	  b->sw_if_index[VLIB_RX] = b->sw_if_index[VLIB_TX];
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return n_left_from;
+}
+
+static u8 * format_simulated_srp_name (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  return format (s, "fake-srp%d", dev_instance);
+}
+
+VNET_DEVICE_CLASS (srp_simulated_device_class,static) = {
+  .name = "Simulated srp",
+  .format_device_name = format_simulated_srp_name,
+  .tx_function = simulated_srp_interface_tx,
+};
+
+static clib_error_t *
+create_simulated_srp_interfaces (vlib_main_t * vm,
+				 unformat_input_t * input,
+				 vlib_cli_command_t * cmd)
+{
+  vnet_main_t * vnm = vnet_get_main();
+  u8 address[6];
+  u32 hw_if_index;
+  vnet_hw_interface_t * hi;
+  static u32 instance;
+
+  if (! unformat_user (input, unformat_ethernet_address, &address))
+    {
+      memset (address, 0, sizeof (address));
+      address[0] = 0xde;
+      address[1] = 0xad;
+      address[5] = instance;
+    }
+
+  hw_if_index = vnet_register_interface (vnm,
+					 srp_simulated_device_class.index,
+					 instance++,
+					 srp_hw_interface_class.index, 0);
+
+  hi = vnet_get_hw_interface (vnm, hw_if_index);
+
+  srp_setup_node (vm, hi->output_node_index);
+
+  hi->min_packet_bytes = 40 + 16;
+
+  /* Standard default ethernet MTU. */
+  hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] = 1500;
+
+  vec_free (hi->hw_address);
+  vec_add (hi->hw_address, address, sizeof (address));
+
+  {
+    uword slot;
+
+    slot = vlib_node_add_named_next_with_slot
+      (vm, hi->tx_node_index,
+       "srp-input",
+       VNET_SIMULATED_SRP_TX_NEXT_SRP_INPUT);
+    ASSERT (slot == VNET_SIMULATED_SRP_TX_NEXT_SRP_INPUT);
+  }
+
+  return /* no error */ 0;
+}
+
+static VLIB_CLI_COMMAND (create_simulated_srp_interface_command) = {
+  .path = "srp create-interfaces",
+  .short_help = "Create simulated srp interface",
+  .function = create_simulated_srp_interfaces,
+};
+#endif
diff --git a/src/vnet/srp/node.c b/src/vnet/srp/node.c
new file mode 100644
index 00000000..897be254
--- /dev/null
+++ b/src/vnet/srp/node.c
@@ -0,0 +1,932 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * node.c: srp packet processing
+ *
+ * Copyright (c) 2011 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/ip/ip_packet.h>	/* for ip_csum_fold */
+#include <vnet/srp/srp.h>
+
+typedef struct {
+  u8 packet_data[32];
+} srp_input_trace_t;
+
+static u8 * format_srp_input_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  srp_input_trace_t * t = va_arg (*va, srp_input_trace_t *);
+
+  s = format (s, "%U", format_srp_header, t->packet_data);
+
+  return s;
+}
+
+typedef enum {
+  SRP_INPUT_NEXT_ERROR,
+  SRP_INPUT_NEXT_ETHERNET_INPUT,
+  SRP_INPUT_NEXT_CONTROL,
+  SRP_INPUT_N_NEXT,
+} srp_input_next_t;
+
+typedef struct {
+  u8 next_index;
+  u8 buffer_advance;
+  u16 error;
+} srp_input_disposition_t;
+
+static srp_input_disposition_t srp_input_disposition_by_mode[8] = {
+  [SRP_MODE_reserved0] = {
+    .next_index = SRP_INPUT_NEXT_ERROR,
+    .error = SRP_ERROR_UNKNOWN_MODE,
+  },
+  [SRP_MODE_reserved1] = {
+    .next_index = SRP_INPUT_NEXT_ERROR,
+    .error = SRP_ERROR_UNKNOWN_MODE,
+  },
+  [SRP_MODE_reserved2] = {
+    .next_index = SRP_INPUT_NEXT_ERROR,
+    .error = SRP_ERROR_UNKNOWN_MODE,
+  },
+  [SRP_MODE_reserved3] = {
+    .next_index = SRP_INPUT_NEXT_ERROR,
+    .error = SRP_ERROR_UNKNOWN_MODE,
+  },
+  [SRP_MODE_keep_alive] = {
+    .next_index = SRP_INPUT_NEXT_ERROR,
+    .error = SRP_ERROR_KEEP_ALIVE_DROPPED,
+  },
+  [SRP_MODE_data] = {
+    .next_index = SRP_INPUT_NEXT_ETHERNET_INPUT,
+    .buffer_advance = sizeof (srp_header_t),
+  },
+  [SRP_MODE_control_pass_to_host] = {
+    .next_index = SRP_INPUT_NEXT_CONTROL,
+  },
+  [SRP_MODE_control_locally_buffered_for_host] = {
+    .next_index = SRP_INPUT_NEXT_CONTROL,
+  },
+};
+
+static uword
+srp_input (vlib_main_t * vm,
+	   vlib_node_runtime_t * node,
+	   vlib_frame_t * from_frame)
+{
+  vnet_main_t * vnm = vnet_get_main();
+  srp_main_t * sm = &srp_main;
+  u32 n_left_from, next_index, * from, * to_next;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node,
+				   from,
+				   n_left_from,
+				   sizeof (from[0]),
+				   sizeof (srp_input_trace_t));
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1, sw_if_index0, sw_if_index1;
+	  vlib_buffer_t * b0, * b1;
+	  u8 next0, next1, error0, error1;
+	  srp_header_t * s0, * s1;
+	  srp_input_disposition_t * d0, * d1;
+	  vnet_hw_interface_t * hi0, * hi1;
+	  srp_interface_t * si0, * si1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * b2, * b3;
+
+	    b2 = vlib_get_buffer (vm, from[2]);
+	    b3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (b2, LOAD);
+	    vlib_prefetch_buffer_header (b3, LOAD);
+
+	    CLIB_PREFETCH (b2->data, sizeof (srp_header_t), LOAD);
+	    CLIB_PREFETCH (b3->data, sizeof (srp_header_t), LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  s0 = (void *) (b0->data + b0->current_data);
+	  s1 = (void *) (b1->data + b1->current_data);
+
+	  /* Data packets are always assigned to side A (outer ring) interface. */
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+
+	  hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
+	  hi1 = vnet_get_sup_hw_interface (vnm, sw_if_index1);
+
+	  si0 = pool_elt_at_index (sm->interface_pool, hi0->hw_instance);
+	  si1 = pool_elt_at_index (sm->interface_pool, hi1->hw_instance);
+
+	  sw_if_index0 = (s0->mode == SRP_MODE_data
+			  ? si0->rings[SRP_RING_OUTER].sw_if_index
+			  : sw_if_index0);
+	  sw_if_index1 = (s1->mode == SRP_MODE_data
+			  ? si1->rings[SRP_RING_OUTER].sw_if_index
+			  : sw_if_index1);
+	    
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = sw_if_index0;
+	  vnet_buffer (b1)->sw_if_index[VLIB_RX] = sw_if_index1;
+
+	  d0 = srp_input_disposition_by_mode + s0->mode;
+	  d1 = srp_input_disposition_by_mode + s1->mode;
+
+	  next0 = d0->next_index;
+	  next1 = d1->next_index;
+
+	  error0 = d0->error;
+	  error1 = d1->error;
+
+	  vlib_buffer_advance (b0, d0->buffer_advance);
+	  vlib_buffer_advance (b1, d1->buffer_advance);
+
+	  b0->error = node->errors[error0];
+	  b1->error = node->errors[error1];
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+    
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, sw_if_index0;
+	  vlib_buffer_t * b0;
+	  u8 next0, error0;
+	  srp_header_t * s0;
+	  srp_input_disposition_t * d0;
+	  srp_interface_t * si0;
+	  vnet_hw_interface_t * hi0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  n_left_from -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  s0 = (void *) (b0->data + b0->current_data);
+
+	  /* Data packets are always assigned to side A (outer ring) interface. */
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+	  hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
+
+	  si0 = pool_elt_at_index (sm->interface_pool, hi0->hw_instance);
+
+	  sw_if_index0 = (s0->mode == SRP_MODE_data
+			  ? si0->rings[SRP_RING_OUTER].sw_if_index
+			  : sw_if_index0);
+	    
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = sw_if_index0;
+
+	  d0 = srp_input_disposition_by_mode + s0->mode;
+
+	  next0 = d0->next_index;
+
+	  error0 = d0->error;
+
+	  vlib_buffer_advance (b0, d0->buffer_advance);
+
+	  b0->error = node->errors[error0];
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+static char * srp_error_strings[] = {
+#define _(f,s) s,
+  foreach_srp_error
+#undef _
+};
+
+static vlib_node_registration_t srp_input_node = {
+  .function = srp_input,
+  .name = "srp-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .n_errors = SRP_N_ERROR,
+  .error_strings = srp_error_strings,
+
+  .n_next_nodes = SRP_INPUT_N_NEXT,
+  .next_nodes = {
+    [SRP_INPUT_NEXT_ERROR] = "error-drop",
+    [SRP_INPUT_NEXT_ETHERNET_INPUT] = "ethernet-input",
+    [SRP_INPUT_NEXT_CONTROL] = "srp-control",
+  },
+
+  .format_buffer = format_srp_header_with_length,
+  .format_trace = format_srp_input_trace,
+  .unformat_buffer = unformat_srp_header,
+};
+
+static uword
+srp_topology_packet (vlib_main_t * vm, u32 sw_if_index, u8 ** contents)
+{
+  vnet_main_t * vnm = vnet_get_main();
+  vnet_hw_interface_t * hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  srp_topology_header_t * t;
+  srp_topology_mac_binding_t * mb;
+  u32 nb, nmb;
+
+  t = (void *) *contents;
+
+  nb = clib_net_to_host_u16 (t->n_bytes_of_data_that_follows);
+  nmb = (nb - sizeof (t->originator_address)) / sizeof (mb[0]);
+  if (vec_len (*contents) < sizeof (t[0]) + nmb * sizeof (mb[0]))
+    return SRP_ERROR_TOPOLOGY_BAD_LENGTH;
+
+  /* Fill in our source MAC address. */
+  clib_memcpy (t->ethernet.src_address, hi->hw_address, vec_len (hi->hw_address));
+
+  /* Make space for our MAC binding. */
+  vec_resize (*contents, sizeof (srp_topology_mac_binding_t));
+  t = (void *) *contents;
+  t->n_bytes_of_data_that_follows = clib_host_to_net_u16 (nb + sizeof (mb[0]));
+
+  mb = t->bindings + nmb;
+
+  mb->flags =
+    ((t->srp.is_inner_ring ? SRP_TOPOLOGY_MAC_BINDING_FLAG_IS_INNER_RING : 0)
+     | (/* is wrapped FIXME */ 0));
+  clib_memcpy (mb->address, hi->hw_address, vec_len (hi->hw_address));
+
+  t->control.checksum
+    = ~ip_csum_fold (ip_incremental_checksum (0, &t->control,
+					      vec_len (*contents) - STRUCT_OFFSET_OF (srp_generic_control_header_t, control)));
+
+  {
+    vlib_frame_t * f = vlib_get_frame_to_node (vm, hi->output_node_index);
+    vlib_buffer_t * b;
+    u32 * to_next = vlib_frame_vector_args (f);
+    u32 bi;
+
+    bi = vlib_buffer_add_data (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX,
+			       /* buffer to append to */ 0,
+			       *contents, vec_len (*contents));
+    b = vlib_get_buffer (vm, bi);
+    vnet_buffer (b)->sw_if_index[VLIB_RX] = vnet_buffer (b)->sw_if_index[VLIB_TX] = sw_if_index;
+    to_next[0] = bi;
+    f->n_vectors = 1;
+    vlib_put_frame_to_node (vm, hi->output_node_index, f);
+  }
+
+  return SRP_ERROR_CONTROL_PACKETS_PROCESSED;
+}
+
+typedef uword (srp_control_handler_function_t) (vlib_main_t * vm,
+						u32 sw_if_index,
+						u8 ** contents);
+
+static uword
+srp_control_input (vlib_main_t * vm,
+		   vlib_node_runtime_t * node,
+		   vlib_frame_t * from_frame)
+{
+  u32 n_left_from, next_index, * from, * to_next;
+  vlib_node_runtime_t * error_node;
+  static u8 * contents;
+
+  error_node = vlib_node_get_runtime (vm, srp_input_node.index);
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node,
+				   from,
+				   n_left_from,
+				   sizeof (from[0]),
+				   sizeof (srp_input_trace_t));
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, l2_len0, l3_len0;
+	  vlib_buffer_t * b0;
+	  u8 next0, error0;
+	  srp_generic_control_header_t * s0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+	  n_left_from -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  s0 = (void *) (b0->data + b0->current_data);
+	  l2_len0 = vlib_buffer_length_in_chain (vm, b0);
+	  l3_len0 = l2_len0 - STRUCT_OFFSET_OF (srp_generic_control_header_t, control);
+
+	  error0 = SRP_ERROR_CONTROL_PACKETS_PROCESSED;
+
+	  error0 = s0->control.version != 0 ? SRP_ERROR_CONTROL_VERSION_NON_ZERO : error0;
+
+	  {
+	    u16 save0 = s0->control.checksum;
+	    u16 computed0;
+	    s0->control.checksum = 0;
+	    computed0 = ~ip_csum_fold (ip_incremental_checksum (0, &s0->control, l3_len0));
+	    error0 = save0 != computed0 ? SRP_ERROR_CONTROL_BAD_CHECKSUM : error0;
+	  }
+
+	  if (error0 == SRP_ERROR_CONTROL_PACKETS_PROCESSED)
+	    {
+	      static srp_control_handler_function_t * t[SRP_N_CONTROL_PACKET_TYPE] = {
+		[SRP_CONTROL_PACKET_TYPE_topology] = srp_topology_packet,
+	      };
+	      srp_control_handler_function_t * f;
+
+	      f = 0;
+	      if (s0->control.type < ARRAY_LEN (t))
+		f = t[s0->control.type];
+
+	      if (f)
+		{
+		  vec_validate (contents, l2_len0 - 1);
+		  vlib_buffer_contents (vm, bi0, contents);
+		  error0 = f (vm, vnet_buffer (b0)->sw_if_index[VLIB_RX], &contents);
+		}
+	      else
+		error0 = SRP_ERROR_UNKNOWN_CONTROL;
+	    }
+
+	  b0->error = error_node->errors[error0];
+	  next0 = 0;
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+static vlib_node_registration_t srp_control_input_node = {
+  .function = srp_control_input,
+  .name = "srp-control",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+
+  .format_buffer = format_srp_header_with_length,
+  .format_trace = format_srp_input_trace,
+  .unformat_buffer = unformat_srp_header,
+};
+
+static u8 * format_srp_ips_request_type (u8 * s, va_list * args)
+{
+  u32 x = va_arg (*args, u32);
+  char * t = 0;
+  switch (x)
+    {
+#define _(f,n) case SRP_IPS_REQUEST_##f: t = #f; break;
+      foreach_srp_ips_request_type
+#undef _
+    default:
+      return format (s, "unknown 0x%x", x);
+    }
+  return format (s, "%U", format_c_identifier, t);
+}
+
+static u8 * format_srp_ips_status (u8 * s, va_list * args)
+{
+  u32 x = va_arg (*args, u32);
+  char * t = 0;
+  switch (x)
+    {
+#define _(f,n) case SRP_IPS_STATUS_##f: t = #f; break;
+      foreach_srp_ips_status
+#undef _
+    default:
+      return format (s, "unknown 0x%x", x);
+    }
+  return format (s, "%U", format_c_identifier, t);
+}
+
+static u8 * format_srp_ips_state (u8 * s, va_list * args)
+{
+  u32 x = va_arg (*args, u32);
+  char * t = 0;
+  switch (x)
+    {
+#define _(f) case SRP_IPS_STATE_##f: t = #f; break;
+      foreach_srp_ips_state
+#undef _
+    default:
+      return format (s, "unknown 0x%x", x);
+    }
+  return format (s, "%U", format_c_identifier, t);
+}
+
+static u8 * format_srp_ring (u8 * s, va_list * args)
+{
+  u32 ring = va_arg (*args, u32);
+  return format (s, "%s", ring == SRP_RING_INNER ? "inner" : "outer");
+}
+
+static u8 * format_srp_ips_header (u8 * s, va_list * args)
+{
+  srp_ips_header_t * h = va_arg (*args, srp_ips_header_t *);
+
+  s = format (s, "%U, %U, %U, %s-path",
+	      format_srp_ips_request_type, h->request_type,
+	      format_ethernet_address, h->originator_address,
+	      format_srp_ips_status, h->status,
+	      h->is_long_path ? "long" : "short");
+
+  return s;
+}
+
+static u8 * format_srp_interface (u8 * s, va_list * args)
+{
+  srp_interface_t * si = va_arg (*args, srp_interface_t *);
+  srp_interface_ring_t * ir;
+
+  s = format (s, "address %U, IPS state %U",
+	      format_ethernet_address, si->my_address,
+	      format_srp_ips_state, si->current_ips_state);
+  for (ir = si->rings; ir < si->rings + SRP_N_RING; ir++)
+    if (ir->rx_neighbor_address_valid)
+      s = format (s, ", %U neighbor %U",
+		  format_srp_ring, ir->ring,
+		  format_ethernet_address, ir->rx_neighbor_address);
+
+  return s;
+}
+
+u8 * format_srp_device (u8 * s, va_list * args)
+{
+  u32 hw_if_index = va_arg (*args, u32);
+  CLIB_UNUSED (int verbose) = va_arg (*args, int);
+  vnet_main_t * vnm = vnet_get_main();
+  srp_main_t * sm = &srp_main;
+  vnet_hw_interface_t * hi = vnet_get_hw_interface (vnm, hw_if_index);
+  srp_interface_t * si = pool_elt_at_index (sm->interface_pool, hi->hw_instance);
+  return format (s, "%U", format_srp_interface, si);
+}
+
+always_inline srp_interface_t *
+srp_get_interface (u32 sw_if_index, srp_ring_type_t * ring)
+{
+  vnet_main_t * vnm = vnet_get_main();
+  srp_main_t * sm = &srp_main;
+  vnet_hw_interface_t * hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  srp_interface_t * si;
+
+  ASSERT (hi->hw_class_index == srp_hw_interface_class.index);
+  si = pool_elt_at_index (sm->interface_pool, hi->hw_instance);
+
+  ASSERT (si->rings[SRP_RING_INNER].hw_if_index == hi->hw_if_index
+	  || si->rings[SRP_RING_OUTER].hw_if_index == hi->hw_if_index);
+  if (ring)
+    *ring =
+      (hi->hw_if_index == si->rings[SRP_RING_INNER].hw_if_index
+       ? SRP_RING_INNER
+       : SRP_RING_OUTER);
+
+  return si;
+}
+
+static void init_ips_packet (srp_interface_t * si,
+			     srp_ring_type_t tx_ring,
+			     srp_ips_header_t * i)
+{
+  memset (i, 0, sizeof (i[0]));
+
+  i->srp.ttl = 1;
+  i->srp.is_inner_ring = tx_ring;
+  i->srp.priority = 7;
+  i->srp.mode = SRP_MODE_control_locally_buffered_for_host;
+  srp_header_compute_parity (&i->srp);
+
+  clib_memcpy (&i->ethernet.src_address, &si->my_address, sizeof (si->my_address));
+  i->ethernet.type = clib_host_to_net_u16 (ETHERNET_TYPE_SRP_CONTROL);
+
+  /* Checksum will be filled in later. */
+  i->control.version = 0;
+  i->control.type = SRP_CONTROL_PACKET_TYPE_ips;
+  i->control.ttl = 255;
+
+  clib_memcpy (&i->originator_address, &si->my_address, sizeof (si->my_address));
+}
+
+static void tx_ips_packet (srp_interface_t * si,
+			   srp_ring_type_t tx_ring,
+			   srp_ips_header_t * i)
+{
+  srp_main_t * sm = &srp_main;
+  vnet_main_t * vnm = vnet_get_main();
+  vlib_main_t * vm = sm->vlib_main;
+  vnet_hw_interface_t * hi = vnet_get_hw_interface (vnm, si->rings[tx_ring].hw_if_index);
+  vlib_frame_t * f;
+  vlib_buffer_t * b;
+  u32 * to_next, bi;
+
+  if (! vnet_sw_interface_is_admin_up (vnm, hi->sw_if_index))
+    return;
+  if (hi->hw_class_index != srp_hw_interface_class.index)
+    return;
+
+  i->control.checksum
+    = ~ip_csum_fold (ip_incremental_checksum (0, &i->control,
+					      sizeof (i[0]) - STRUCT_OFFSET_OF (srp_ips_header_t, control)));
+
+  bi = vlib_buffer_add_data (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX,
+			     /* buffer to append to */ 0,
+			     i, sizeof (i[0]));
+
+  /* FIXME trace. */
+  if (0)
+    clib_warning ("%U %U",
+		  format_vnet_sw_if_index_name, vnm, hi->sw_if_index,
+		  format_srp_ips_header, i);
+
+  b = vlib_get_buffer (vm, bi);
+  vnet_buffer (b)->sw_if_index[VLIB_RX] = vnet_buffer (b)->sw_if_index[VLIB_TX] = hi->sw_if_index;
+
+  f = vlib_get_frame_to_node (vm, hi->output_node_index);
+  to_next = vlib_frame_vector_args (f);
+  to_next[0] = bi;
+  f->n_vectors = 1;
+  vlib_put_frame_to_node (vm, hi->output_node_index, f);
+}
+
+static void serialize_srp_interface_state_msg (serialize_main_t * m, va_list * va)
+{
+  srp_interface_t * si = va_arg (*va, srp_interface_t *);
+  srp_main_t * sm = &srp_main;
+  int r;
+
+  ASSERT (! pool_is_free (sm->interface_pool, si));
+  serialize_integer (m, si - sm->interface_pool, sizeof (u32));
+  serialize_likely_small_unsigned_integer (m, si->current_ips_state);
+  for (r = 0; r < SRP_N_RING; r++)
+    {
+      srp_interface_ring_t * ir = &si->rings[r];
+      void * p;
+      serialize_likely_small_unsigned_integer (m, ir->rx_neighbor_address_valid);
+      if (ir->rx_neighbor_address_valid)
+	{
+	  p = serialize_get (m, sizeof (ir->rx_neighbor_address));
+	  clib_memcpy (p, ir->rx_neighbor_address, sizeof (ir->rx_neighbor_address));
+	}
+      serialize_likely_small_unsigned_integer (m, ir->waiting_to_restore);
+      if (ir->waiting_to_restore)
+	serialize (m, serialize_f64, ir->wait_to_restore_start_time);
+    }
+}
+
+static void unserialize_srp_interface_state_msg (serialize_main_t * m, va_list * va)
+{
+  CLIB_UNUSED (mc_main_t * mcm) = va_arg (*va, mc_main_t *);
+  srp_main_t * sm = &srp_main;
+  srp_interface_t * si;
+  u32 si_index, r;
+
+  unserialize_integer (m, &si_index, sizeof (u32));
+  si = pool_elt_at_index (sm->interface_pool, si_index);
+  si->current_ips_state = unserialize_likely_small_unsigned_integer (m);
+  for (r = 0; r < SRP_N_RING; r++)
+    {
+      srp_interface_ring_t * ir = &si->rings[r];
+      void * p;
+      ir->rx_neighbor_address_valid = unserialize_likely_small_unsigned_integer (m);
+      if (ir->rx_neighbor_address_valid)
+	{
+	  p = unserialize_get (m, sizeof (ir->rx_neighbor_address));
+	  clib_memcpy (ir->rx_neighbor_address, p, sizeof (ir->rx_neighbor_address));
+	}
+      ir->waiting_to_restore = unserialize_likely_small_unsigned_integer (m);
+      if (ir->waiting_to_restore)
+	unserialize (m, unserialize_f64, &ir->wait_to_restore_start_time);
+    }
+}
+
+MC_SERIALIZE_MSG (srp_interface_state_msg, static) = {
+  .name = "vnet_srp_interface_state",
+  .serialize = serialize_srp_interface_state_msg,
+  .unserialize = unserialize_srp_interface_state_msg,
+};
+
+static int requests_switch (srp_ips_request_type_t r)
+{
+  static u8 t[16] = {
+    [SRP_IPS_REQUEST_forced_switch] = 1,
+    [SRP_IPS_REQUEST_manual_switch] = 1,
+    [SRP_IPS_REQUEST_signal_fail] = 1,
+    [SRP_IPS_REQUEST_signal_degrade] = 1,
+  };
+  return (int) r < ARRAY_LEN (t) ? t[r] : 0;
+}
+
+/* Called when an IPS control packet is received on given interface. */
+void srp_ips_rx_packet (u32 sw_if_index, srp_ips_header_t * h)
+{
+  vnet_main_t * vnm = vnet_get_main();
+  vlib_main_t * vm = srp_main.vlib_main;
+  srp_ring_type_t rx_ring;
+  srp_interface_t * si = srp_get_interface (sw_if_index, &rx_ring);
+  srp_interface_ring_t * ir = &si->rings[rx_ring];
+  int si_needs_broadcast = 0;
+
+  /* FIXME trace. */
+  if (0)
+    clib_warning ("%U %U %U",
+		  format_time_interval, "h:m:s:u", vlib_time_now (vm),
+		  format_vnet_sw_if_index_name, vnm, sw_if_index,
+		  format_srp_ips_header, h);
+
+  /* Ignore self-generated IPS packets. */
+  if (! memcmp (h->originator_address, si->my_address, sizeof (h->originator_address)))
+    goto done;
+
+  /* Learn neighbor address from short path messages. */
+  if (! h->is_long_path)
+    {
+      if (ir->rx_neighbor_address_valid
+	  && memcmp (ir->rx_neighbor_address, h->originator_address, sizeof (ir->rx_neighbor_address)))
+	{
+	  ASSERT (0);
+	}
+      ir->rx_neighbor_address_valid = 1;
+      clib_memcpy (ir->rx_neighbor_address, h->originator_address, sizeof (ir->rx_neighbor_address));
+    }
+
+  switch (si->current_ips_state)
+    {
+    case SRP_IPS_STATE_idle:
+      /* Received {REQ,NEIGHBOR,W,S} in idle state: wrap. */
+      if (requests_switch (h->request_type)
+	  && ! h->is_long_path
+	  && h->status == SRP_IPS_STATUS_wrapped)
+	{
+	  srp_ips_header_t to_tx[2];
+
+	  si_needs_broadcast = 1;
+	  si->current_ips_state = SRP_IPS_STATE_wrapped;
+	  si->hw_wrap_function (si->rings[SRP_SIDE_A].hw_if_index, /* enable_wrap */ 1);
+	  si->hw_wrap_function (si->rings[SRP_SIDE_B].hw_if_index, /* enable_wrap */ 1);
+
+	  init_ips_packet (si, rx_ring ^ 0, &to_tx[0]);
+	  to_tx[0].request_type = SRP_IPS_REQUEST_idle;
+	  to_tx[0].status = SRP_IPS_STATUS_wrapped;
+	  to_tx[0].is_long_path = 0;
+	  tx_ips_packet (si, rx_ring ^ 0, &to_tx[0]);
+
+	  init_ips_packet (si, rx_ring ^ 1, &to_tx[1]);
+	  to_tx[1].request_type = h->request_type;
+	  to_tx[1].status = SRP_IPS_STATUS_wrapped;
+	  to_tx[1].is_long_path = 1;
+	  tx_ips_packet (si, rx_ring ^ 1, &to_tx[1]);
+	}
+      break;
+
+    case SRP_IPS_STATE_wrapped:
+      if (! h->is_long_path
+	  && h->request_type == SRP_IPS_REQUEST_idle
+	  && h->status == SRP_IPS_STATUS_idle)
+	{
+	  si_needs_broadcast = 1;
+	  si->current_ips_state = SRP_IPS_STATE_idle;
+	  si->hw_wrap_function (si->rings[SRP_SIDE_A].hw_if_index, /* enable_wrap */ 0);
+	  si->hw_wrap_function (si->rings[SRP_SIDE_B].hw_if_index, /* enable_wrap */ 0);
+	}
+      break;
+
+    case SRP_IPS_STATE_pass_thru:
+      /* FIXME */
+      break;
+
+    default:
+      abort ();
+      break;
+    }
+
+ done:
+  if (vm->mc_main && si_needs_broadcast)
+    mc_serialize (vm->mc_main, &srp_interface_state_msg, si);
+}
+
+/* Preform local IPS request on given interface. */
+void srp_ips_local_request (u32 sw_if_index, srp_ips_request_type_t request)
+{
+  vnet_main_t * vnm = vnet_get_main();
+  srp_main_t * sm = &srp_main;
+  vlib_main_t * vm = sm->vlib_main;
+  srp_ring_type_t rx_ring;
+  srp_interface_t * si = srp_get_interface (sw_if_index, &rx_ring);
+  srp_interface_ring_t * ir = &si->rings[rx_ring];
+  int si_needs_broadcast = 0;
+
+  if (request == SRP_IPS_REQUEST_wait_to_restore)
+    {
+      if (si->current_ips_state != SRP_IPS_STATE_wrapped)
+	return;
+      if (! ir->waiting_to_restore)
+	{
+	  ir->wait_to_restore_start_time = vlib_time_now (sm->vlib_main);
+	  ir->waiting_to_restore = 1;
+	  si_needs_broadcast = 1;
+	}
+    }
+  else
+    {
+      /* FIXME handle local signal fail. */
+      si_needs_broadcast = ir->waiting_to_restore;
+      ir->wait_to_restore_start_time = 0;
+      ir->waiting_to_restore = 0;
+    }
+
+  /* FIXME trace. */
+  if (0)
+    clib_warning ("%U %U",
+		  format_vnet_sw_if_index_name, vnm, sw_if_index,
+		  format_srp_ips_request_type, request);
+
+  if (vm->mc_main && si_needs_broadcast)
+    mc_serialize (vm->mc_main, &srp_interface_state_msg, si);
+}
+
+static void maybe_send_ips_message (srp_interface_t * si)
+{
+  srp_main_t * sm = &srp_main;
+  srp_ips_header_t to_tx[2];
+  srp_ring_type_t rx_ring = SRP_RING_OUTER;
+  srp_interface_ring_t * r0 = &si->rings[rx_ring ^ 0];
+  srp_interface_ring_t * r1 = &si->rings[rx_ring ^ 1];
+  f64 now = vlib_time_now (sm->vlib_main);
+
+  if (! si->ips_process_enable)
+    return;
+
+  if (si->current_ips_state == SRP_IPS_STATE_wrapped
+      && r0->waiting_to_restore
+      && r1->waiting_to_restore
+      && now >= r0->wait_to_restore_start_time + si->config.wait_to_restore_idle_delay
+      && now >= r1->wait_to_restore_start_time + si->config.wait_to_restore_idle_delay)
+    {
+      si->current_ips_state = SRP_IPS_STATE_idle;
+      r0->waiting_to_restore = r1->waiting_to_restore = 0;
+      r0->wait_to_restore_start_time = r1->wait_to_restore_start_time = 0;
+    }
+
+  if (si->current_ips_state != SRP_IPS_STATE_idle)
+    return;
+
+  init_ips_packet (si, rx_ring ^ 0, &to_tx[0]);
+  init_ips_packet (si, rx_ring ^ 1, &to_tx[1]);
+
+  if (si->current_ips_state == SRP_IPS_STATE_idle)
+    {
+      to_tx[0].request_type = to_tx[1].request_type = SRP_IPS_REQUEST_idle;
+      to_tx[0].status = to_tx[1].status = SRP_IPS_STATUS_idle;
+      to_tx[0].is_long_path = to_tx[1].is_long_path = 0;
+    }
+
+  else if (si->current_ips_state == SRP_IPS_STATE_wrapped)
+    {
+      to_tx[0].request_type =
+	(si->rings[rx_ring ^ 0].waiting_to_restore
+	 ? SRP_IPS_REQUEST_wait_to_restore
+	 : SRP_IPS_REQUEST_signal_fail);
+      to_tx[1].request_type =
+	(si->rings[rx_ring ^ 1].waiting_to_restore
+	 ? SRP_IPS_REQUEST_wait_to_restore
+	 : SRP_IPS_REQUEST_signal_fail);
+      to_tx[0].status = to_tx[1].status = SRP_IPS_STATUS_wrapped;
+      to_tx[0].is_long_path = 0;
+      to_tx[1].is_long_path = 1;
+    }
+
+  tx_ips_packet (si, rx_ring ^ 0, &to_tx[0]);
+  tx_ips_packet (si, rx_ring ^ 1, &to_tx[1]);
+}
+
+static uword
+srp_ips_process (vlib_main_t * vm,
+		 vlib_node_runtime_t * rt,
+		 vlib_frame_t * f)
+{
+  srp_main_t * sm = &srp_main;
+  srp_interface_t * si;
+
+  while (1)
+    {
+      pool_foreach (si, sm->interface_pool, ({
+	maybe_send_ips_message (si);
+      }));
+      vlib_process_suspend (vm, 1.0);
+    }
+
+  return 0;
+}
+
+vlib_node_registration_t srp_ips_process_node = {
+    .function = srp_ips_process,
+    .type = VLIB_NODE_TYPE_PROCESS,
+    .name = "srp-ips-process",
+    .state = VLIB_NODE_STATE_DISABLED,
+};
+
+static clib_error_t * srp_init (vlib_main_t * vm)
+{
+  srp_main_t * sm = &srp_main;
+
+  sm->default_data_ttl = 255;
+  sm->vlib_main = vm;
+  vlib_register_node (vm, &srp_ips_process_node);
+  vlib_register_node (vm, &srp_input_node);
+  vlib_register_node (vm, &srp_control_input_node);
+  srp_setup_node (vm, srp_input_node.index);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (srp_init);
diff --git a/src/vnet/srp/packet.h b/src/vnet/srp/packet.h
new file mode 100644
index 00000000..96dab648
--- /dev/null
+++ b/src/vnet/srp/packet.h
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * srp/packet.h: srp packet format.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_srp_packet_h
+#define included_srp_packet_h
+
+#include <vppinfra/byte_order.h>
+#include <vppinfra/bitops.h>
+#include <vnet/ethernet/packet.h>
+
+/* SRP version 2. */
+
+#define foreach_srp_mode			\
+  _ (reserved0)					\
+  _ (reserved1)					\
+  _ (reserved2)					\
+  _ (reserved3)					\
+  _ (control_pass_to_host)			\
+  _ (control_locally_buffered_for_host)		\
+  _ (keep_alive)				\
+  _ (data)
+
+typedef enum {
+#define _(f) SRP_MODE_##f,
+  foreach_srp_mode
+#undef _
+  SRP_N_MODE,
+} srp_mode_t;
+
+typedef union {
+  /* For computing parity bit. */
+  u16 as_u16;
+
+  struct {
+    u8 ttl;
+
+#if CLIB_ARCH_IS_BIG_ENDIAN
+    u8 is_inner_ring : 1;
+    u8 mode : 3;
+    u8 priority : 3;
+    u8 parity : 1;
+#endif
+#if CLIB_ARCH_IS_LITTLE_ENDIAN
+    u8 parity : 1;
+    u8 priority : 3;
+    u8 mode : 3;
+    u8 is_inner_ring : 1;
+#endif
+  };
+} srp_header_t;
+
+always_inline void
+srp_header_compute_parity (srp_header_t * h)
+{
+  h->parity = 0;
+  h->parity = count_set_bits (h->as_u16) ^ 1; /* odd parity */
+}
+
+typedef struct {
+  srp_header_t srp;
+  ethernet_header_t ethernet;
+} srp_and_ethernet_header_t;
+
+#define foreach_srp_control_packet_type		\
+  _ (reserved)					\
+  _ (topology)					\
+  _ (ips)
+
+typedef enum {
+#define _(f) SRP_CONTROL_PACKET_TYPE_##f,
+  foreach_srp_control_packet_type
+#undef _
+  SRP_N_CONTROL_PACKET_TYPE,
+} srp_control_packet_type_t;
+
+typedef CLIB_PACKED (struct {
+  /* Set to 0. */
+  u8 version;
+
+  srp_control_packet_type_t type : 8;
+
+  /* IP4-like checksum of packet starting with start of control header. */
+  u16 checksum;
+
+  u16 ttl;
+}) srp_control_header_t;
+
+typedef struct {
+  srp_header_t srp;
+  ethernet_header_t ethernet;
+  srp_control_header_t control;
+} srp_generic_control_header_t;
+
+typedef struct {
+  u8 flags;
+#define SRP_TOPOLOGY_MAC_BINDING_FLAG_IS_INNER_RING (1 << 6)
+#define SRP_TOPOLOGY_MAC_BINDING_FLAG_IS_WRAPPED (1 << 5)
+
+  /* MAC address. */
+  u8 address[6];
+} srp_topology_mac_binding_t;
+
+typedef CLIB_PACKED (struct {
+  srp_header_t srp;
+  ethernet_header_t ethernet;
+  srp_control_header_t control;
+
+  /* Length in bytes of data that follows. */
+  u16 n_bytes_of_data_that_follows;
+
+  /* MAC address of originator of this topology request. */
+  u8 originator_address[6];
+
+  /* Bindings follow. */
+  srp_topology_mac_binding_t bindings[0];
+}) srp_topology_header_t;
+
+#define foreach_srp_ips_request_type		\
+  _ (idle, 0x0)					\
+  _ (wait_to_restore, 0x5)			\
+  _ (manual_switch, 0x6)			\
+  _ (signal_degrade, 0x8)			\
+  _ (signal_fail, 0xb)				\
+  _ (forced_switch, 0xd)
+
+typedef enum {
+#define _(f,n) SRP_IPS_REQUEST_##f = n,
+  foreach_srp_ips_request_type
+#undef _
+} srp_ips_request_type_t;
+
+#define foreach_srp_ips_status			\
+  _ (idle, 0x0)					\
+  _ (wrapped, 0x2)
+
+typedef enum {
+#define _(f,n) SRP_IPS_STATUS_##f = n,
+  foreach_srp_ips_status
+#undef _
+} srp_ips_status_t;
+
+typedef struct {
+  srp_header_t srp;
+  ethernet_header_t ethernet;
+  srp_control_header_t control;
+  u8 originator_address[6];
+
+  union {
+    u8 ips_octet;
+
+    struct {
+#if CLIB_ARCH_IS_BIG_ENDIAN
+      u8 request_type : 4;
+      u8 is_long_path : 1;
+      u8 status : 3;
+#endif
+#if CLIB_ARCH_IS_LITTLE_ENDIAN
+      u8 status : 3;
+      u8 is_long_path : 1;
+      u8 request_type : 4;
+#endif
+    };
+  };
+
+  u8 reserved;
+} srp_ips_header_t;
+
+#endif /* included_srp_packet_h */
diff --git a/src/vnet/srp/pg.c b/src/vnet/srp/pg.c
new file mode 100644
index 00000000..54f1a3bb
--- /dev/null
+++ b/src/vnet/srp/pg.c
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * srp/pg.c: packet generator srp interface
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/srp/srp.h>
+#include <vnet/ethernet/ethernet.h>
+
+typedef struct {
+  pg_edit_t ttl;
+  pg_edit_t is_inner_ring;
+  pg_edit_t mode;
+  pg_edit_t priority;
+  pg_edit_t parity;
+  pg_edit_t type;
+  pg_edit_t src_address;
+  pg_edit_t dst_address;
+} pg_srp_header_t;
+
+static inline void
+pg_srp_header_init (pg_srp_header_t * e)
+{
+  pg_edit_init (&e->ttl, srp_and_ethernet_header_t, srp.ttl);
+  pg_edit_init_bitfield (&e->is_inner_ring, srp_and_ethernet_header_t,
+			 srp.as_u16,
+			 7, 1);
+  pg_edit_init_bitfield (&e->mode, srp_and_ethernet_header_t,
+			 srp.as_u16,
+			 4, 3);
+  pg_edit_init_bitfield (&e->priority, srp_and_ethernet_header_t,
+			 srp.as_u16,
+			 1, 3);
+  pg_edit_init_bitfield (&e->parity, srp_and_ethernet_header_t,
+			 srp.as_u16,
+			 0, 1);
+  pg_edit_init (&e->type, srp_and_ethernet_header_t, ethernet.type);
+  pg_edit_init (&e->src_address, srp_and_ethernet_header_t, ethernet.src_address);
+  pg_edit_init (&e->dst_address, srp_and_ethernet_header_t, ethernet.dst_address);
+}
+
+uword
+unformat_pg_srp_header (unformat_input_t * input, va_list * args)
+{
+  pg_stream_t * s = va_arg (*args, pg_stream_t *);
+  pg_srp_header_t * e;
+  u32 error, group_index;
+  
+  e = pg_create_edit_group (s, sizeof (e[0]), sizeof (srp_header_t),
+			    &group_index);
+  pg_srp_header_init (e);
+
+  error = 1;
+  if (! unformat (input, "%U: %U -> %U",
+		  unformat_pg_edit,
+		    unformat_ethernet_type_net_byte_order, &e->type,
+		  unformat_pg_edit,
+		    unformat_ethernet_address, &e->src_address,
+		  unformat_pg_edit,
+		    unformat_ethernet_address, &e->dst_address))
+    goto done;
+
+  {
+    srp_header_t h;
+
+    h.as_u16 = 0;
+    h.mode = SRP_MODE_data;
+    h.ttl = 255;
+    h.parity = count_set_bits (h.as_u16) ^ 1;
+  
+    pg_edit_set_fixed (&e->mode, h.mode);
+    pg_edit_set_fixed (&e->ttl, h.ttl);
+    pg_edit_set_fixed (&e->is_inner_ring, h.is_inner_ring);
+    pg_edit_set_fixed (&e->priority, h.priority);
+    pg_edit_set_fixed (&e->parity, h.parity);
+  }
+
+  error = 0;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "mode %U",
+		    unformat_pg_edit,
+		    unformat_pg_number, &e->mode))
+	;
+      else if (unformat (input, "ttl %U",
+			 unformat_pg_edit,
+			 unformat_pg_number, &e->ttl))
+	;
+      else if (unformat (input, "priority %U",
+			 unformat_pg_edit,
+			 unformat_pg_number, &e->priority))
+	;
+      else
+	break;
+    }
+      
+  {
+    ethernet_main_t * em = &ethernet_main;
+    ethernet_type_info_t * ti = 0;
+    pg_node_t * pg_node = 0;
+
+    if (e->type.type == PG_EDIT_FIXED)
+      {
+	u16 t = *(u16 *) e->type.values[PG_EDIT_LO];
+	ti = ethernet_get_type_info (em, clib_net_to_host_u16 (t));
+	if (ti && ti->node_index != ~0)
+	  pg_node = pg_get_node (ti->node_index);
+      }
+
+    if (pg_node && pg_node->unformat_edit
+	&& unformat_user (input, pg_node->unformat_edit, s))
+      ;
+    else if (! unformat_user (input, unformat_pg_payload, s))
+      goto done;
+  }
+
+ done:
+  if (error)
+    pg_free_edit_group (s);
+  return error == 0;
+}
+
diff --git a/src/vnet/srp/srp.h b/src/vnet/srp/srp.h
new file mode 100644
index 00000000..5288ebe4
--- /dev/null
+++ b/src/vnet/srp/srp.h
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * srp.h: types/functions for srp.
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_srp_h
+#define included_srp_h
+
+#include <vnet/vnet.h>
+#include <vnet/srp/packet.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/pg/pg.h>
+
+extern vnet_hw_interface_class_t srp_hw_interface_class;
+
+/* See RFC 2892. */
+#define foreach_srp_ips_state			\
+  _ (idle)					\
+  _ (pass_thru)					\
+  _ (wrapped)
+
+typedef enum {
+#define _(f) SRP_IPS_STATE_##f,
+  foreach_srp_ips_state
+#undef _
+  SRP_N_IPS_STATE,
+} srp_ips_state_t;
+
+typedef enum {
+  SRP_RING_OUTER,
+  SRP_RING_INNER,
+  SRP_N_RING = 2,
+  SRP_SIDE_A = SRP_RING_OUTER,	/* outer rx, inner tx */
+  SRP_SIDE_B = SRP_RING_INNER,	/* inner rx, outer tx */
+  SRP_N_SIDE = 2,
+} srp_ring_type_t;
+
+typedef struct {
+  srp_ring_type_t ring;
+
+  /* Hardware interface for this ring/side. */
+  u32 hw_if_index;
+
+  /* Software interface corresponding to hardware interface. */
+  u32 sw_if_index;
+
+  /* Mac address of neighbor on RX fiber. */
+  u8 rx_neighbor_address[6];
+
+  u8 rx_neighbor_address_valid;
+
+  /* True if we are waiting to restore signal. */
+  u8 waiting_to_restore;
+
+  /* Time stamp when signal became valid. */
+  f64 wait_to_restore_start_time;
+} srp_interface_ring_t;
+
+struct srp_interface_t;
+typedef void (srp_hw_wrap_function_t) (u32 hw_if_index, u32 wrap_enable);
+typedef void (srp_hw_enable_function_t) (struct srp_interface_t * si, u32 wrap_enable);
+
+typedef struct {
+  /* Delay between wait to restore event and entering idle state in seconds. */
+  f64 wait_to_restore_idle_delay;
+
+  /* Number of seconds between sending ips messages to neighbors. */
+  f64 ips_tx_interval;
+} srp_interface_config_t;
+
+typedef struct srp_interface_t {
+  /* Current IPS state. */
+  srp_ips_state_t current_ips_state;
+
+  /* Address for this interface. */
+  u8 my_address[6];
+
+  /* Enable IPS process handling for this interface. */
+  u8 ips_process_enable;
+
+  srp_interface_ring_t rings[SRP_N_RING];
+
+  /* Configurable parameters. */
+  srp_interface_config_t config;
+
+  srp_hw_wrap_function_t * hw_wrap_function;
+
+  srp_hw_enable_function_t * hw_enable_function;
+} srp_interface_t;
+
+typedef struct {
+  vlib_main_t * vlib_main;
+
+  /* Pool of SRP interfaces. */
+  srp_interface_t * interface_pool;
+
+  uword * interface_index_by_hw_if_index;
+
+  /* TTL to use for outgoing data packets. */
+  u32 default_data_ttl;
+
+  vlib_one_time_waiting_process_t * srp_register_interface_waiting_process_pool;
+
+  uword * srp_register_interface_waiting_process_pool_index_by_hw_if_index;
+} srp_main_t;
+
+/* Registers sides A/B hardware interface as being SRP capable. */
+void srp_register_interface (u32 * hw_if_indices);
+
+/* Enable sending IPS messages for interface implied by given vlib hardware interface. */
+void srp_interface_enable_ips (u32 hw_if_index);
+
+/* Set function to wrap hardware side of SRP interface. */
+void srp_interface_set_hw_wrap_function (u32 hw_if_index, srp_hw_wrap_function_t * f);
+
+void srp_interface_set_hw_enable_function (u32 hw_if_index, srp_hw_enable_function_t * f);
+
+extern vlib_node_registration_t srp_ips_process_node;
+
+/* Called when an IPS control packet is received on given interface. */
+void srp_ips_rx_packet (u32 sw_if_index, srp_ips_header_t * ips_packet);
+
+/* Preform local IPS request on given interface. */
+void srp_ips_local_request (u32 sw_if_index, srp_ips_request_type_t request);
+
+always_inline void
+srp_ips_link_change (u32 sw_if_index, u32 link_is_up)
+{
+  srp_ips_local_request (sw_if_index,
+			 link_is_up
+			 ? SRP_IPS_REQUEST_wait_to_restore
+			 : SRP_IPS_REQUEST_signal_fail);
+}
+
+void srp_interface_get_interface_config (u32 hw_if_index, srp_interface_config_t * c);
+void srp_interface_set_interface_config (u32 hw_if_index, srp_interface_config_t * c);
+
+srp_main_t srp_main;
+
+always_inline srp_interface_t *
+srp_get_interface_from_vnet_hw_interface (u32 hw_if_index)
+{
+  srp_main_t * sm = &srp_main;
+  uword * p = hash_get (sm->interface_index_by_hw_if_index, hw_if_index);
+  return p ? pool_elt_at_index (sm->interface_pool, p[0]) : 0;
+}
+
+u8 * format_srp_header (u8 * s, va_list * args);
+u8 * format_srp_header_with_length (u8 * s, va_list * args);
+u8 * format_srp_device (u8 * s, va_list * args);
+
+/* Parse srp header. */
+uword
+unformat_srp_header (unformat_input_t * input, va_list * args);
+
+uword unformat_pg_srp_header (unformat_input_t * input, va_list * args);
+
+always_inline void
+srp_setup_node (vlib_main_t * vm, u32 node_index)
+{
+  vlib_node_t * n = vlib_get_node (vm, node_index);
+  pg_node_t * pn = pg_get_node (node_index);
+  n->format_buffer = format_srp_header_with_length;
+  n->unformat_buffer = unformat_srp_header;
+  pn->unformat_edit = unformat_pg_srp_header;
+}
+
+#define foreach_srp_error						\
+  _ (NONE, "no error")							\
+  _ (UNKNOWN_MODE, "unknown mode in SRP header")			\
+  _ (KEEP_ALIVE_DROPPED, "v1 keep alive mode in SRP header")		\
+  _ (CONTROL_PACKETS_PROCESSED, "control packets processed")		\
+  _ (IPS_PACKETS_PROCESSED, "IPS packets processed")			\
+  _ (UNKNOWN_CONTROL, "unknown control packet")				\
+  _ (CONTROL_VERSION_NON_ZERO, "control packet with non-zero version")	\
+  _ (CONTROL_BAD_CHECKSUM, "control packet with bad checksum")		\
+  _ (TOPOLOGY_BAD_LENGTH, "topology packet with bad length")
+
+typedef enum {
+#define _(n,s) SRP_ERROR_##n,
+  foreach_srp_error
+#undef _
+  SRP_N_ERROR,
+} srp_error_t;
+
+serialize_function_t serialize_srp_main, unserialize_srp_main;
+
+#endif /* included_srp_h */
diff --git a/src/vnet/unix/gdb_funcs.c b/src/vnet/unix/gdb_funcs.c
new file mode 100644
index 00000000..cfb4b247
--- /dev/null
+++ b/src/vnet/unix/gdb_funcs.c
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief Host utility functions
+ */
+#include <vppinfra/format.h>
+#include <vlib/vlib.h>
+
+#include <vlib/threads.h>
+
+
+
+/**
+ * @brief GDB callable function: vl - Return vector length of vector
+ *
+ * @param *p - void - address of vector
+ *
+ * @return length - u32
+ *
+ */
+u32 vl(void *p)
+{
+  return vec_len (p);
+}
+
+/**
+ * @brief GDB callable function: pe - call pool_elts - number of elements in a pool
+ *
+ * @param *v - void - address of pool
+ *
+ * @return number - uword
+ *
+ */
+uword pe (void *v)
+{
+  return (pool_elts(v));
+}
+
+/**
+ * @brief GDB callable function: pifi - call pool_is_free_index - is passed index free?
+ *
+ * @param *p - void - address of pool
+ * @param *index - u32
+ *
+ * @return 0|1 - int
+ *
+ */
+int pifi (void *p, u32 index)
+{
+  return pool_is_free_index (p, index);
+}
+
+/**
+ * @brief GDB callable function: debug_hex_bytes - return formatted hex string
+ *
+ * @param *s - u8
+ * @param n - u32 - number of bytes to format
+ *
+ */
+void debug_hex_bytes (u8 *s, u32 n)
+{
+  fformat (stderr, "%U\n", format_hex_bytes, s, n);
+}
+
+/**
+ * @brief GDB callable function: vlib_dump_frame_ownership
+ *
+ */
+void vlib_dump_frame_ownership (void)
+{
+  vlib_main_t * vm = vlib_get_main();
+  vlib_node_main_t * nm = &vm->node_main;
+  vlib_node_runtime_t * this_node_runtime;
+  vlib_next_frame_t * nf;
+  u32 first_nf_index;
+  u32 index;
+
+  vec_foreach(this_node_runtime, nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL])
+    {
+      first_nf_index = this_node_runtime->next_frame_index;
+
+      for (index = first_nf_index; index < first_nf_index + 
+             this_node_runtime->n_next_nodes; index++) 
+        {
+          vlib_node_runtime_t * owned_runtime;
+          nf = vec_elt_at_index (vm->node_main.next_frames, index);
+          if (nf->flags & VLIB_FRAME_OWNER) 
+            {
+              owned_runtime = vec_elt_at_index (nm->nodes_by_type[0],
+                                                nf->node_runtime_index);
+              fformat(stderr, 
+                      "%s next index %d owns enqueue rights to %s\n",
+                      nm->nodes[this_node_runtime->node_index]->name, 
+                      index - first_nf_index, 
+                      nm->nodes[owned_runtime->node_index]->name);
+              fformat (stderr, "  nf index %d nf->frame_index %d\n",
+                       nf - vm->node_main.next_frames, 
+                       nf->frame_index);
+            }
+        }
+    }
+}
+
+/**
+ * @brief GDB callable function: vlib_runtime_index_to_node_name
+ *
+ * Takes node index and will return the node name.
+ *
+ * @param index - u32
+ */
+void vlib_runtime_index_to_node_name (u32 index)
+{
+  vlib_main_t * vm = vlib_get_main();
+  vlib_node_main_t * nm = &vm->node_main;
+
+  if (index > vec_len (nm->nodes))
+    {
+      fformat(stderr, "%d out of range, max %d\n", vec_len(nm->nodes));
+      return;
+    }
+
+  fformat(stderr, "node runtime index %d name %s\n", index, nm->nodes[index]->name);
+}
+
+
+/**
+ * @brief GDB callable function: show_gdb_command_fn - show gdb
+ *
+ * Shows list of functions for VPP available in GDB
+ *
+ * @return error - clib_error_t
+ */
+static clib_error_t *
+show_gdb_command_fn (vlib_main_t * vm,
+                     unformat_input_t * input,
+                     vlib_cli_command_t * cmd)
+{
+  vlib_cli_output (vm, "vl(p) returns vec_len(p)");
+  vlib_cli_output (vm, "pe(p) returns pool_elts(p)");
+  vlib_cli_output (vm, "pifi(p, i) returns pool_is_free_index(p, i)");
+  vlib_cli_output (vm, "debug_hex_bytes (ptr, n_bytes) dumps n_bytes in hex");
+  vlib_cli_output (vm, "vlib_dump_frame_ownership() does what it says");
+  vlib_cli_output (vm, "vlib_runtime_index_to_node_name (index) prints NN");
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (show_gdb_funcs_command, static) = {
+  .path = "show gdb",
+  .short_help = "Describe functions which can be called from gdb",
+  .function = show_gdb_command_fn,
+};
+
+/* Cafeteria plan, maybe you don't want these functions */
+clib_error_t * 
+gdb_func_init (vlib_main_t * vm) { return 0; } 
+
+VLIB_INIT_FUNCTION (gdb_func_init);
diff --git a/src/vnet/unix/pcap.c b/src/vnet/unix/pcap.c
new file mode 100644
index 00000000..bba225f7
--- /dev/null
+++ b/src/vnet/unix/pcap.c
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pcap.c: libpcap packet capture format
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <vnet/unix/pcap.h>
+#include <sys/fcntl.h>
+
+/**
+ * @file
+ * @brief PCAP function.
+ *
+ * Usage:
+ *
+ * <code><pre>
+ * \#include <vnet/unix/pcap.h>
+ *
+ * static pcap_main_t pcap = {
+ *  .file_name = "/tmp/ip4",
+ *  .n_packets_to_capture = 2,
+ *  .packet_type = PCAP_PACKET_TYPE_ip,
+ * };
+ * </pre></code>
+ *
+ * To add a buffer:
+ *
+ *  <code><pre>pcap_add_buffer (&pcap, vm, pi0, 128);</pre></code>
+ *
+ * File will be written after @c n_packets_to_capture or call to pcap_write (&amp;pcap).
+ *
+*/
+
+/**
+ * @brief Close PCAP file
+ *
+ * @return rc - clib_error_t
+ *
+ */
+clib_error_t *
+pcap_close (pcap_main_t * pm)
+{
+  close (pm->file_descriptor);
+  pm->flags &= ~PCAP_MAIN_INIT_DONE;
+  pm->file_descriptor = -1;
+  return 0;
+}
+
+/**
+ * @brief Write PCAP file
+ *
+ * @return rc - clib_error_t
+ *
+ */
+clib_error_t *
+pcap_write (pcap_main_t * pm)
+{
+  clib_error_t * error = 0;
+
+  if (! (pm->flags & PCAP_MAIN_INIT_DONE))
+    {
+      pcap_file_header_t fh;
+      int n;
+
+      if (! pm->file_name)
+	pm->file_name = "/tmp/vnet.pcap";
+
+      pm->file_descriptor = open (pm->file_name, O_CREAT | O_TRUNC | O_WRONLY, 0664);
+      if (pm->file_descriptor < 0)
+	{
+	  error = clib_error_return_unix (0, "failed to open `%s'", pm->file_name);
+	  goto done;
+	}
+
+      pm->flags |= PCAP_MAIN_INIT_DONE;
+      pm->n_packets_captured = 0;
+      pm->n_pcap_data_written = 0;
+
+      /* Write file header. */
+      memset (&fh, 0, sizeof (fh));
+      fh.magic = 0xa1b2c3d4;
+      fh.major_version = 2;
+      fh.minor_version = 4;
+      fh.time_zone = 0;
+      fh.max_packet_size_in_bytes = 1 << 16;
+      fh.packet_type = pm->packet_type;
+      n = write (pm->file_descriptor, &fh, sizeof (fh));
+      if (n != sizeof (fh))
+	{
+	  if (n < 0)
+	    error = clib_error_return_unix (0, "write file header `%s'", pm->file_name);
+	  else
+	    error = clib_error_return (0, "short write of file header `%s'", pm->file_name);
+	  goto done;
+	}
+    }
+
+  while (vec_len (pm->pcap_data) > pm->n_pcap_data_written)
+    {
+      int n = vec_len (pm->pcap_data) - pm->n_pcap_data_written;
+
+      n = write (pm->file_descriptor,
+		 vec_elt_at_index (pm->pcap_data, pm->n_pcap_data_written), n);
+
+      if (n < 0 && unix_error_is_fatal (errno))
+	{
+	  error = clib_error_return_unix (0, "write `%s'", pm->file_name);
+	  goto done;
+	}
+        pm->n_pcap_data_written += n;
+      }
+
+  if (pm->n_pcap_data_written >= vec_len (pm->pcap_data))
+    {
+      vec_reset_length (pm->pcap_data);
+      pm->n_pcap_data_written = 0;
+    }
+
+  if (pm->n_packets_captured >= pm->n_packets_to_capture)
+    pcap_close(pm);
+
+ done:
+  if (error)
+    {
+      if (pm->file_descriptor >= 0)
+	close (pm->file_descriptor);
+    }
+  return error;
+}
+
+/**
+ * @brief Read PCAP file
+ *
+ * @return rc - clib_error_t
+ *
+ */
+clib_error_t * pcap_read (pcap_main_t * pm)
+{
+  clib_error_t * error = 0;
+  int fd, need_swap, n;
+  pcap_file_header_t fh;
+  pcap_packet_header_t ph;
+
+  fd = open (pm->file_name, O_RDONLY);
+  if (fd < 0)
+    {
+      error = clib_error_return_unix (0, "open `%s'", pm->file_name);
+      goto done;
+    }
+
+  if (read (fd, &fh, sizeof (fh)) != sizeof (fh))
+    {
+      error = clib_error_return_unix (0, "read file header `%s'", pm->file_name);
+      goto done;
+    }
+
+  need_swap = 0;
+  if (fh.magic == 0xd4c3b2a1)
+    {
+      need_swap = 1;
+#define _(t,f) fh.f = clib_byte_swap_##t (fh.f);
+      foreach_pcap_file_header;
+#undef _
+    }    
+
+  if (fh.magic != 0xa1b2c3d4)
+    {
+      error = clib_error_return (0, "bad magic `%s'", pm->file_name);
+      goto done;
+    }
+
+  pm->min_packet_bytes = 0;
+  pm->max_packet_bytes = 0;
+  while ((n = read (fd, &ph, sizeof (ph))) != 0)
+    {
+      u8 * data;
+
+      if (need_swap)
+	{
+#define _(t,f) ph.f = clib_byte_swap_##t (ph.f);
+	  foreach_pcap_packet_header;
+#undef _
+	}
+
+      data = vec_new (u8, ph.n_bytes_in_packet);
+      if (read (fd, data, ph.n_packet_bytes_stored_in_file) != ph.n_packet_bytes_stored_in_file)
+	{
+	  error = clib_error_return (0, "short read `%s'", pm->file_name);
+	  goto done;
+	}
+
+      if (vec_len (pm->packets_read) == 0)
+	pm->min_packet_bytes = pm->max_packet_bytes = ph.n_bytes_in_packet;
+      else
+	{
+	  pm->min_packet_bytes = clib_min (pm->min_packet_bytes, ph.n_bytes_in_packet);
+	  pm->max_packet_bytes = clib_max (pm->max_packet_bytes, ph.n_bytes_in_packet);
+	}
+
+      vec_add1 (pm->packets_read, data);
+    }
+
+ done:
+  if (fd >= 0)
+    close (fd);
+  return error;
+
+}
diff --git a/src/vnet/unix/pcap.h b/src/vnet/unix/pcap.h
new file mode 100644
index 00000000..6aaf32be
--- /dev/null
+++ b/src/vnet/unix/pcap.h
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pcap.h: libpcap packet capture format
+ *
+ * Copyright (c) 2008 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/**
+ * @file
+ * @brief PCAP utility definitions
+ */
+#ifndef included_vnet_pcap_h
+#define included_vnet_pcap_h
+
+#include <vlib/vlib.h>
+
+/**
+ * @brief Packet types supported by PCAP
+ *
+ * null 0
+ * ethernet 1
+ * ppp 9
+ * ip 12
+ * hdlc 104
+ */
+#define foreach_vnet_pcap_packet_type           \
+  _ (null, 0)					\
+  _ (ethernet, 1)				\
+  _ (ppp, 9)					\
+  _ (ip, 12)					\
+  _ (hdlc, 104)
+
+typedef enum {
+#define _(f,n) PCAP_PACKET_TYPE_##f = (n),
+  foreach_vnet_pcap_packet_type
+#undef _
+} pcap_packet_type_t;
+
+#define foreach_pcap_file_header			\
+  /** 0xa1b2c3d4 host byte order.			\
+     0xd4c3b2a1 => need to byte swap everything. */	\
+  _ (u32, magic)					\
+							\
+  /** Currently major 2 minor 4. */			\
+  _ (u16, major_version)				\
+  _ (u16, minor_version)				\
+							\
+  /** 0 for GMT. */					\
+  _ (u32, time_zone)					\
+							\
+  /** Accuracy of timestamps.  Typically set to 0. */	\
+  _ (u32, sigfigs)					\
+							\
+  /** Size of largest packet in file. */                \
+  _ (u32, max_packet_size_in_bytes)			\
+							\
+  /** One of vnet_pcap_packet_type_t. */                \
+  _ (u32, packet_type)
+
+/** File header struct */
+typedef struct {
+#define _(t, f) t f;
+  foreach_pcap_file_header
+#undef _
+} pcap_file_header_t;
+
+#define foreach_pcap_packet_header					\
+  /** Time stamp in seconds  */                                         \
+  _ (u32, time_in_sec)							\
+  /** Time stamp in microseconds. */                                    \
+  _ (u32, time_in_usec)							\
+									\
+  /** Number of bytes stored in file. */                                \
+  _ (u32, n_packet_bytes_stored_in_file)				\
+  /** Number of bytes in actual packet. */                              \
+  _ (u32, n_bytes_in_packet)
+
+/** Packet header. */
+typedef struct {
+#define _(t, f) t f;
+  foreach_pcap_packet_header
+#undef _
+
+  /** Packet data follows. */
+  u8 data[0];
+} pcap_packet_header_t;
+
+/**
+ * @brief PCAP main state data structure
+ */
+typedef struct {
+  /** File name of pcap output. */
+  char * file_name;
+
+  /** Number of packets to capture. */
+  u32 n_packets_to_capture;
+
+  /** Packet type */
+  pcap_packet_type_t packet_type;
+
+  /** Number of packets currently captured. */
+  u32 n_packets_captured;
+
+  /** flags */
+  u32 flags;
+#define PCAP_MAIN_INIT_DONE (1 << 0)
+
+  /** File descriptor for reading/writing. */
+  int file_descriptor;
+
+  /** Bytes written */
+  u32 n_pcap_data_written;
+
+  /** Vector of pcap data. */
+  u8 * pcap_data;
+
+  /** Packets read from file. */
+  u8 ** packets_read;
+
+  /** Min/Max Packet bytes */
+  u32 min_packet_bytes, max_packet_bytes;
+} pcap_main_t;
+
+/** Write out data to output file. */
+clib_error_t * pcap_write (pcap_main_t * pm);
+
+/** Read data from file. */
+clib_error_t * pcap_read (pcap_main_t * pm);
+
+/**
+ * @brief Add packet
+ *
+ * @param *pm - pcap_main_t
+ * @param time_now - f64
+ * @param n_bytes_in_trace - u32
+ * @param n_bytes_in_packet - u32
+ *
+ * @return Packet Data
+ *
+ */
+static inline void *
+pcap_add_packet (pcap_main_t * pm,
+		 f64 time_now,
+		 u32 n_bytes_in_trace,
+		 u32 n_bytes_in_packet)
+{
+  pcap_packet_header_t * h;
+  u8 * d;
+
+  vec_add2 (pm->pcap_data, d, sizeof (h[0]) + n_bytes_in_trace);
+  h = (void *) (d);
+  h->time_in_sec = time_now;
+  h->time_in_usec = 1e6*(time_now - h->time_in_sec);
+  h->n_packet_bytes_stored_in_file = n_bytes_in_trace;
+  h->n_bytes_in_packet = n_bytes_in_packet;
+  pm->n_packets_captured++;
+  return h->data;
+}
+
+/**
+ * @brief Add buffer (vlib_buffer_t) to the trace
+ *
+ * @param *pm - pcap_main_t
+ * @param *vm - vlib_main_t
+ * @param buffer_index - u32
+ * @param n_bytes_in_trace - u32
+ *
+ */
+static inline void
+pcap_add_buffer (pcap_main_t * pm,
+		 vlib_main_t * vm, u32 buffer_index,
+		 u32 n_bytes_in_trace)
+{
+  vlib_buffer_t * b = vlib_get_buffer (vm, buffer_index);
+  u32 n = vlib_buffer_length_in_chain (vm, b);
+  i32 n_left = clib_min (n_bytes_in_trace, n);
+  f64 time_now = vlib_time_now (vm);
+  void * d;
+
+  d = pcap_add_packet (pm, time_now, n_left, n);
+  while (1)
+    {
+      u32 copy_length = clib_min ((u32) n_left, b->current_length);
+      clib_memcpy (d, b->data + b->current_data, copy_length);
+      n_left -= b->current_length;
+      if (n_left <= 0)
+	break;
+      d += b->current_length;
+      ASSERT (b->flags & VLIB_BUFFER_NEXT_PRESENT);
+      b = vlib_get_buffer (vm, b->next_buffer);
+    }
+
+  /** Flush output vector. */
+  if (vec_len (pm->pcap_data) >= 64*1024
+      || pm->n_packets_captured >= pm->n_packets_to_capture)
+    pcap_write (pm);
+}
+
+#endif /* included_vnet_pcap_h */
diff --git a/src/vnet/unix/pcap2pg.c b/src/vnet/unix/pcap2pg.c
new file mode 100644
index 00000000..217a61f4
--- /dev/null
+++ b/src/vnet/unix/pcap2pg.c
@@ -0,0 +1,182 @@
+/*
+ * pcap2pg.c: convert pcap input to pg input
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief Functions to convert PCAP file format to VPP PG (Packet Generator)
+ *
+ */
+#include <vnet/unix/pcap.h>
+#include <vnet/ethernet/packet.h>
+#include <stdio.h>
+
+pcap_main_t pcap_main;
+
+/**
+ * @brief char * to seed a PG file
+ */
+static char * pg_fmt =
+  "packet-generator new {\n"
+  "    name s%d\n"
+  "    limit 1\n"
+  "    size %d-%d\n"
+  "    node ethernet-input\n";
+
+
+/**
+ * @brief Packet Generator Stream boilerplate
+ *
+ * @param *ofp - FILE
+ * @param i - int
+ * @param *pkt - u8
+ */
+void stream_boilerplate (FILE *ofp, int i, u8 * pkt)
+{
+  fformat(ofp, pg_fmt, i, vec_len(pkt), vec_len(pkt));
+}
+
+/**
+ * @brief Conversion of PCAP file to PG file format
+ *
+ * @param *pm - pcap_main_t
+ * @param *ofp - FILE
+ *
+ * @return rc - int
+ *
+ */
+int pcap2pg (pcap_main_t * pm, FILE *ofp)
+{
+  int i, j;
+  u8 *pkt;
+
+  for (i = 0; i < vec_len (pm->packets_read); i++)
+    {
+      int offset;
+      ethernet_header_t * h;
+      u64 ethertype;
+
+      pkt = pm->packets_read[i];
+      h = (ethernet_header_t *)pkt;
+
+      stream_boilerplate (ofp, i, pkt);
+
+      fformat (ofp, "    data {\n");
+
+      ethertype = clib_net_to_host_u16 (h->type);
+
+      /**
+       * In vnet terms, packet generator interfaces are not ethernets.
+       * They don't have vlan tables.
+       * This transforms captured 802.1q VLAN packets into
+       * regular Ethernet packets.
+       */
+      if (ethertype == 0x8100 /* 802.1q vlan */)
+        {
+          u16 * vlan_ethertype = (u16 *)(h+1);
+          ethertype = clib_net_to_host_u16(vlan_ethertype[0]);
+          offset = 18;
+        }
+      else
+        offset = 14;
+
+      fformat (ofp,
+               "          0x%04x: %02x%02x.%02x%02x.%02x%02x"
+               " -> %02x%02x.%02x%02x.%02x%02x\n",
+               ethertype,
+               h->src_address[0],
+               h->src_address[1],
+               h->src_address[2],
+               h->src_address[3],
+               h->src_address[4],
+               h->src_address[5],
+               h->dst_address[0],
+               h->dst_address[1],
+               h->dst_address[2],
+               h->dst_address[3],
+               h->dst_address[4],
+               h->dst_address[5]);
+
+      fformat (ofp, "      hex 0x");
+
+      for (j = offset; j < vec_len (pkt); j++)
+          fformat (ofp, "%02x", pkt[j]);
+
+      fformat (ofp, " }\n");
+      fformat (ofp, "}\n\n");
+    }
+  return 0;
+}
+
+/**
+ * @brief pcap2pg.
+ * usage: pcap2pg -i <input-file> [-o <output-file>]
+ */
+int main (int argc, char **argv)
+{
+  unformat_input_t input;
+  pcap_main_t * pm = &pcap_main;
+  u8 * input_file = 0, * output_file = 0;
+  FILE * ofp;
+  clib_error_t * error;
+
+  unformat_init_command_line (&input, argv);
+
+  while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat(&input, "-i %s", &input_file)
+          || unformat (&input, "input %s", &input_file))
+        ;
+      else if (unformat (&input, "-o %s", &output_file)
+               || unformat (&input, "output %s", &output_file))
+        ;
+      else 
+        {
+        usage:
+          fformat(stderr, 
+                  "usage: pcap2pg -i <input-file> [-o <output-file>]\n");
+          exit (1);
+        }
+    }
+
+  if (input_file == 0)
+    goto usage;
+  
+  pm->file_name = (char *)input_file;
+  error = pcap_read (pm);
+
+  if (error)
+    {
+      clib_error_report (error);
+      exit (1);
+    }
+
+  if (output_file)
+    {
+      ofp = fopen ((char *)output_file, "rw");
+      if (ofp == NULL)
+        clib_unix_warning ("Couldn't create '%s'", output_file);
+      exit (1);
+    }
+  else
+    {
+      ofp = stdout;
+    }
+  
+  pcap2pg (pm, ofp);
+
+  fclose (ofp);
+  exit (0);
+}
diff --git a/src/vnet/unix/tap.api b/src/vnet/unix/tap.api
new file mode 100644
index 00000000..9b16eadb
--- /dev/null
+++ b/src/vnet/unix/tap.api
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \file
+
+    This file defines vpe control-plane API messages for
+    the Linux kernel TAP device driver
+*/
+
+/** \brief Initialize a new tap interface with the given paramters 
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param use_random_mac - let the system generate a unique mac address
+    @param tap_name - name to associate with the new interface
+    @param mac_address - mac addr to assign to the interface if use_radom not set
+*/
+define tap_connect
+{
+  u32 client_index;
+  u32 context;
+  u8 use_random_mac;
+  u8 tap_name[64];
+  u8 mac_address[6];
+  u8 renumber;
+  u32 custom_dev_instance;
+  u8 tag[64];
+};
+
+/** \brief Reply for tap connect request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+    @param sw_if_index - software index allocated for the new tap interface
+*/
+define tap_connect_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+};
+
+/** \brief Modify a tap interface with the given paramters 
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface index of existing tap interface
+    @param use_random_mac - let the system generate a unique mac address
+    @param tap_name - name to associate with the new interface
+    @param mac_address - mac addr to assign to the interface if use_radom not set
+*/
+define tap_modify
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 use_random_mac;
+  u8 tap_name[64];
+  u8 mac_address[6];
+  u8 renumber;
+  u32 custom_dev_instance;
+};
+
+/** \brief Reply for tap modify request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+    @param sw_if_index - software index if the modified tap interface
+*/
+define tap_modify_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+};
+
+/** \brief Delete tap interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface index of existing tap interface
+*/
+define tap_delete
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+};
+
+/** \brief Reply for tap delete request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define tap_delete_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Dump tap interfaces request */
+define sw_interface_tap_dump
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Reply for tap dump request
+    @param sw_if_index - software index of tap interface
+    @param dev_name - Linux tap device name
+*/
+define sw_interface_tap_details
+{
+  u32 context;
+  u32 sw_if_index;
+  u8 dev_name[64];
+};
diff --git a/src/vnet/unix/tap_api.c b/src/vnet/unix/tap_api.c
new file mode 100644
index 00000000..99b79ba2
--- /dev/null
+++ b/src/vnet/unix/tap_api.c
@@ -0,0 +1,257 @@
+/*
+ *------------------------------------------------------------------
+ * tap_api.c - vnet tap device driver API support
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/unix/tuntap.h>
+#include <vnet/unix/tapcli.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_tap_api_msg                     \
+_(TAP_CONNECT, tap_connect)                     \
+_(TAP_MODIFY, tap_modify)                       \
+_(TAP_DELETE, tap_delete)                       \
+_(SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump)
+
+#define vl_msg_name_crc_list
+#include <vnet/unix/tap.api.h>
+#undef vl_msg_name_crc_list
+
+/*
+ * WARNING: replicated pending api refactor completion
+ */
+static void
+send_sw_interface_flags_deleted (vpe_api_main_t * am,
+				 unix_shared_memory_queue_t * q,
+				 u32 sw_if_index)
+{
+  vl_api_sw_interface_set_flags_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_FLAGS);
+  mp->sw_if_index = ntohl (sw_if_index);
+
+  mp->admin_up_down = 0;
+  mp->link_up_down = 0;
+  mp->deleted = 1;
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_tap_connect_t_handler (vl_api_tap_connect_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  int rv;
+  vl_api_tap_connect_reply_t *rmp;
+  vnet_main_t *vnm = vnet_get_main ();
+  unix_shared_memory_queue_t *q;
+  u32 sw_if_index = (u32) ~ 0;
+  u8 *tag;
+
+  rv = vnet_tap_connect_renumber (vm, mp->tap_name,
+				  mp->use_random_mac ? 0 : mp->mac_address,
+				  &sw_if_index, mp->renumber,
+				  ntohl (mp->custom_dev_instance));
+
+  /* Add tag if supplied */
+  if (rv == 0 && mp->tag[0])
+    {
+      mp->tag[ARRAY_LEN (mp->tag) - 1] = 0;
+      tag = format (0, "%s%c", mp->tag, 0);
+      vnet_set_sw_interface_tag (vnm, tag, sw_if_index);
+    }
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (!q)
+    return;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_TAP_CONNECT_REPLY);
+  rmp->context = mp->context;
+  rmp->retval = ntohl (rv);
+  rmp->sw_if_index = ntohl (sw_if_index);
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_tap_modify_t_handler (vl_api_tap_modify_t * mp)
+{
+  int rv;
+  vl_api_tap_modify_reply_t *rmp;
+  unix_shared_memory_queue_t *q;
+  u32 sw_if_index = (u32) ~ 0;
+  vlib_main_t *vm = vlib_get_main ();
+
+  rv = vnet_tap_modify (vm, ntohl (mp->sw_if_index), mp->tap_name,
+			mp->use_random_mac ? 0 : mp->mac_address,
+			&sw_if_index, mp->renumber,
+			ntohl (mp->custom_dev_instance));
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (!q)
+    return;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_TAP_MODIFY_REPLY);
+  rmp->context = mp->context;
+  rmp->retval = ntohl (rv);
+  rmp->sw_if_index = ntohl (sw_if_index);
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_tap_delete_t_handler (vl_api_tap_delete_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  int rv;
+  vpe_api_main_t *vam = &vpe_api_main;
+  vl_api_tap_delete_reply_t *rmp;
+  unix_shared_memory_queue_t *q;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+
+  rv = vnet_tap_delete (vm, sw_if_index);
+  if (!rv)
+    {
+      vnet_main_t *vnm = vnet_get_main ();
+      vnet_clear_sw_interface_tag (vnm, sw_if_index);
+    }
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (!q)
+    return;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_TAP_DELETE_REPLY);
+  rmp->context = mp->context;
+  rmp->retval = ntohl (rv);
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+
+  if (!rv)
+    send_sw_interface_flags_deleted (vam, q, sw_if_index);
+}
+
+static void
+send_sw_interface_tap_details (vpe_api_main_t * am,
+			       unix_shared_memory_queue_t * q,
+			       tapcli_interface_details_t * tap_if,
+			       u32 context)
+{
+  vl_api_sw_interface_tap_details_t *mp;
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_TAP_DETAILS);
+  mp->sw_if_index = ntohl (tap_if->sw_if_index);
+  strncpy ((char *) mp->dev_name,
+	   (char *) tap_if->dev_name, ARRAY_LEN (mp->dev_name) - 1);
+  mp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_sw_interface_tap_dump_t_handler (vl_api_sw_interface_tap_dump_t * mp)
+{
+  int rv = 0;
+  vpe_api_main_t *am = &vpe_api_main;
+  unix_shared_memory_queue_t *q;
+  tapcli_interface_details_t *tapifs = NULL;
+  tapcli_interface_details_t *tap_if = NULL;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  rv = vnet_tap_dump_ifs (&tapifs);
+  if (rv)
+    return;
+
+  vec_foreach (tap_if, tapifs)
+  {
+    send_sw_interface_tap_details (am, q, tap_if, mp->context);
+  }
+
+  vec_free (tapifs);
+}
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_tap;
+#undef _
+}
+
+static clib_error_t *
+tap_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_tap_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (tap_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/unix/tapcli.c b/src/vnet/unix/tapcli.c
new file mode 100644
index 00000000..9862a2bd
--- /dev/null
+++ b/src/vnet/unix/tapcli.c
@@ -0,0 +1,1328 @@
+/*
+ *------------------------------------------------------------------
+ * tapcli.c - dynamic tap interface hookup
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+/**
+ * @file
+ * @brief  dynamic tap interface hookup
+ */
+
+#include <fcntl.h>		/* for open */
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/uio.h>		/* for iovec */
+#include <netinet/in.h>
+
+#include <linux/if_arp.h>
+#include <linux/if_tun.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+
+#include <vnet/ip/ip.h>
+
+#include <vnet/ethernet/ethernet.h>
+
+#include <vnet/feature/feature.h>
+#include <vnet/devices/devices.h>
+#include <vnet/unix/tapcli.h>
+
+static vnet_device_class_t tapcli_dev_class;
+static vnet_hw_interface_class_t tapcli_interface_class;
+static vlib_node_registration_t tapcli_rx_node;
+
+static void tapcli_nopunt_frame (vlib_main_t * vm,
+                                 vlib_node_runtime_t * node,
+                                 vlib_frame_t * frame);
+/**
+ * @brief Struct for the tapcli interface
+ */
+typedef struct {
+  u32 unix_fd;
+  u32 unix_file_index;
+  u32 provision_fd;
+  /** For counters */
+  u32 sw_if_index;
+  u32 hw_if_index;
+  u32 is_promisc;
+  struct ifreq ifr;
+  u32 per_interface_next_index;
+  /** for delete */
+  u8 active;
+} tapcli_interface_t;
+
+/**
+ * @brief Struct for RX trace
+ */
+typedef struct {
+  u16 sw_if_index;
+} tapcli_rx_trace_t;
+
+/**
+ * @brief Function to format TAP CLI trace
+ *
+ * @param *s - u8 - formatting string
+ * @param *va - va_list
+ *
+ * @return *s - u8 - formatted string
+ *
+ */
+u8 * format_tapcli_rx_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  vnet_main_t * vnm = vnet_get_main();
+  tapcli_rx_trace_t * t = va_arg (*va, tapcli_rx_trace_t *);
+  s = format (s, "%U", format_vnet_sw_if_index_name,
+                vnm, t->sw_if_index);
+  return s;
+}
+
+/**
+ * @brief TAPCLI main state struct
+ */
+typedef struct {
+  /** Vector of iovecs for readv/writev calls. */
+  struct iovec * iovecs;
+
+  /** Vector of VLIB rx buffers to use.  We allocate them in blocks
+     of VLIB_FRAME_SIZE (256). */
+  u32 * rx_buffers;
+
+  /** tap device destination MAC address. Required, or Linux drops pkts */
+  u8 ether_dst_mac[6];
+
+  /** Interface MTU in bytes and # of default sized buffers. */
+  u32 mtu_bytes, mtu_buffers;
+
+  /** Vector of tap interfaces */
+  tapcli_interface_t * tapcli_interfaces;
+
+  /** Vector of deleted tap interfaces */
+  u32 * tapcli_inactive_interfaces;
+
+  /** Bitmap of tap interfaces with pending reads */
+  uword * pending_read_bitmap;
+
+  /** Hash table to find tapcli interface given hw_if_index */
+  uword * tapcli_interface_index_by_sw_if_index;
+
+  /** Hash table to find tapcli interface given unix fd */
+  uword * tapcli_interface_index_by_unix_fd;
+
+  /** renumbering table */
+  u32 * show_dev_instance_by_real_dev_instance;
+
+  /** 1 => disable CLI */
+  int is_disabled;
+
+  /** convenience - vlib_main_t */
+  vlib_main_t * vlib_main;
+  /** convenience - vnet_main_t */
+  vnet_main_t * vnet_main;
+  /** convenience - unix_main_t */
+  unix_main_t * unix_main;
+} tapcli_main_t;
+
+static tapcli_main_t tapcli_main;
+
+/**
+ * @brief tapcli TX node function
+ * @node tap-cli-tx
+ *
+ * Output node, writes the buffers comprising the incoming frame
+ * to the tun/tap device, aka hands them to the Linux kernel stack.
+ *
+ * @param *vm - vlib_main_t
+ * @param *node - vlib_node_runtime_t
+ * @param *frame - vlib_frame_t
+ *
+ * @return n_packets - uword
+ *
+ */
+static uword
+tapcli_tx (vlib_main_t * vm,
+	   vlib_node_runtime_t * node,
+	   vlib_frame_t * frame)
+{
+  u32 * buffers = vlib_frame_args (frame);
+  uword n_packets = frame->n_vectors;
+  tapcli_main_t * tm = &tapcli_main;
+  tapcli_interface_t * ti;
+  int i;
+
+  for (i = 0; i < n_packets; i++)
+    {
+      struct iovec * iov;
+      vlib_buffer_t * b;
+      uword l;
+      vnet_hw_interface_t * hw;
+      uword * p;
+      u32 tx_sw_if_index;
+
+      b = vlib_get_buffer (vm, buffers[i]);
+
+      tx_sw_if_index = vnet_buffer(b)->sw_if_index[VLIB_TX];
+      if (tx_sw_if_index == (u32)~0)
+        tx_sw_if_index = vnet_buffer(b)->sw_if_index[VLIB_RX];
+        
+      ASSERT(tx_sw_if_index != (u32)~0);
+
+      /* Use the sup intfc to finesse vlan subifs */
+      hw = vnet_get_sup_hw_interface (tm->vnet_main, tx_sw_if_index);
+      tx_sw_if_index = hw->sw_if_index;
+
+      p = hash_get (tm->tapcli_interface_index_by_sw_if_index, 
+                    tx_sw_if_index);
+      if (p == 0)
+        {
+          clib_warning ("sw_if_index %d unknown", tx_sw_if_index);
+          /* $$$ leak, but this should never happen... */
+          continue;
+        }
+      else
+        ti = vec_elt_at_index (tm->tapcli_interfaces, p[0]);
+
+      /* Re-set iovecs if present. */
+      if (tm->iovecs)
+	_vec_len (tm->iovecs) = 0;
+
+      /* VLIB buffer chain -> Unix iovec(s). */
+      vec_add2 (tm->iovecs, iov, 1);
+      iov->iov_base = b->data + b->current_data;
+      iov->iov_len = l = b->current_length;
+
+      if (PREDICT_FALSE (b->flags & VLIB_BUFFER_NEXT_PRESENT))
+	{
+	  do {
+	    b = vlib_get_buffer (vm, b->next_buffer);
+
+	    vec_add2 (tm->iovecs, iov, 1);
+
+	    iov->iov_base = b->data + b->current_data;
+	    iov->iov_len = b->current_length;
+	    l += b->current_length;
+	  } while (b->flags & VLIB_BUFFER_NEXT_PRESENT);
+	}
+
+      if (writev (ti->unix_fd, tm->iovecs, vec_len (tm->iovecs)) < l)
+	clib_unix_warning ("writev");
+    }
+
+  vlib_buffer_free(vm, vlib_frame_vector_args(frame), frame->n_vectors);
+
+  return n_packets;
+}
+
+VLIB_REGISTER_NODE (tapcli_tx_node,static) = {
+  .function = tapcli_tx,
+  .name = "tapcli-tx",
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .vector_size = 4,
+};
+
+/**
+ * @brief Dispatch tapcli RX node function for node tap_cli_rx
+ *
+ *
+ * @param *vm - vlib_main_t
+ * @param *node - vlib_node_runtime_t
+ * @param *ti - tapcli_interface_t
+ *
+ * @return n_packets - uword
+ *
+ */
+static uword tapcli_rx_iface(vlib_main_t * vm,
+                            vlib_node_runtime_t * node,
+                            tapcli_interface_t * ti)
+{
+  tapcli_main_t * tm = &tapcli_main;
+  const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
+  u32 n_trace = vlib_get_trace_count (vm, node);
+  u8 set_trace = 0;
+
+  vnet_main_t *vnm;
+  vnet_sw_interface_t * si;
+  u8 admin_down;
+  u32 next = node->cached_next_index;
+  u32 n_left_to_next, next_index;
+  u32 *to_next;
+
+  vnm = vnet_get_main();
+  si = vnet_get_sw_interface (vnm, ti->sw_if_index);
+  admin_down = !(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+
+  vlib_get_next_frame(vm, node, next, to_next, n_left_to_next);
+
+  while (n_left_to_next) { // Fill at most one vector
+    vlib_buffer_t *b_first, *b, *prev;
+    u32 bi_first, bi;
+    word n_bytes_in_packet;
+    int j, n_bytes_left;
+
+    if (PREDICT_FALSE(vec_len(tm->rx_buffers) < tm->mtu_buffers)) {
+      uword len = vec_len(tm->rx_buffers);
+      _vec_len(tm->rx_buffers) +=
+          vlib_buffer_alloc_from_free_list(vm, &tm->rx_buffers[len],
+                            VLIB_FRAME_SIZE - len, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+      if (PREDICT_FALSE(vec_len(tm->rx_buffers) < tm->mtu_buffers)) {
+          vlib_node_increment_counter(vm, tapcli_rx_node.index,
+                                      TAPCLI_ERROR_BUFFER_ALLOC,
+                                      tm->mtu_buffers - vec_len(tm->rx_buffers));
+        break;
+      }
+    }
+
+    uword i_rx = vec_len (tm->rx_buffers) - 1;
+
+    /* Allocate RX buffers from end of rx_buffers.
+           Turn them into iovecs to pass to readv. */
+    vec_validate (tm->iovecs, tm->mtu_buffers - 1);
+    for (j = 0; j < tm->mtu_buffers; j++) {
+      b = vlib_get_buffer (vm, tm->rx_buffers[i_rx - j]);
+      tm->iovecs[j].iov_base = b->data;
+      tm->iovecs[j].iov_len = buffer_size;
+    }
+
+    n_bytes_left = readv (ti->unix_fd, tm->iovecs, tm->mtu_buffers);
+    n_bytes_in_packet = n_bytes_left;
+    if (n_bytes_left <= 0) {
+      if (errno != EAGAIN) {
+        vlib_node_increment_counter(vm, tapcli_rx_node.index,
+                                    TAPCLI_ERROR_READ, 1);
+      }
+      break;
+    }
+
+    bi_first = tm->rx_buffers[i_rx];
+    b = b_first = vlib_get_buffer (vm, tm->rx_buffers[i_rx]);
+    prev = NULL;
+
+    while (1) {
+      b->current_length = n_bytes_left < buffer_size ? n_bytes_left : buffer_size;
+      n_bytes_left -= buffer_size;
+
+      if (prev) {
+        prev->next_buffer = bi;
+        prev->flags |= VLIB_BUFFER_NEXT_PRESENT;
+      }
+      prev = b;
+
+      /* last segment */
+      if (n_bytes_left <= 0)
+        break;
+
+      i_rx--;
+      bi = tm->rx_buffers[i_rx];
+      b = vlib_get_buffer (vm, bi);
+    }
+
+    _vec_len (tm->rx_buffers) = i_rx;
+
+    b_first->total_length_not_including_first_buffer =
+        (n_bytes_in_packet > buffer_size) ? n_bytes_in_packet - buffer_size : 0;
+    b_first->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
+
+    VLIB_BUFFER_TRACE_TRAJECTORY_INIT(b_first);
+
+    vnet_buffer (b_first)->sw_if_index[VLIB_RX] = ti->sw_if_index;
+    vnet_buffer (b_first)->sw_if_index[VLIB_TX] = (u32)~0;
+
+    b_first->error = node->errors[TAPCLI_ERROR_NONE];
+    next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
+    next_index = (ti->per_interface_next_index != ~0) ?
+        ti->per_interface_next_index : next_index;
+    next_index = admin_down ? VNET_DEVICE_INPUT_NEXT_DROP : next_index;
+
+    to_next[0] = bi_first;
+    to_next++;
+    n_left_to_next--;
+
+    vnet_feature_start_device_input_x1 (ti->sw_if_index, &next_index, 
+                                        b_first, 0);
+
+    vlib_validate_buffer_enqueue_x1 (vm, node, next,
+                                     to_next, n_left_to_next,
+                                     bi_first, next_index);
+
+    /* Interface counters for tapcli interface. */
+    if (PREDICT_TRUE(!admin_down)) {
+      vlib_increment_combined_counter (
+          vnet_main.interface_main.combined_sw_if_counters
+          + VNET_INTERFACE_COUNTER_RX,
+          os_get_cpu_number(), ti->sw_if_index,
+          1, n_bytes_in_packet);
+
+      if (PREDICT_FALSE(n_trace > 0)) {
+        vlib_trace_buffer (vm, node, next_index,
+                           b_first, /* follow_chain */ 1);
+        n_trace--;
+        set_trace = 1;
+        tapcli_rx_trace_t *t0 = vlib_add_trace (vm, node, b_first, sizeof (*t0));
+        t0->sw_if_index = si->sw_if_index;
+      }
+    }
+  }
+  vlib_put_next_frame (vm, node, next, n_left_to_next);
+  if (set_trace)
+    vlib_set_trace_count (vm, node, n_trace);
+  return VLIB_FRAME_SIZE - n_left_to_next;
+}
+
+/**
+ * @brief tapcli RX node function
+ * @node tap-cli-rx
+ *
+ * Input node from the Kernel tun/tap device
+ *
+ * @param *vm - vlib_main_t
+ * @param *node - vlib_node_runtime_t
+ * @param *frame - vlib_frame_t
+ *
+ * @return n_packets - uword
+ *
+ */
+static uword
+tapcli_rx (vlib_main_t * vm,
+	   vlib_node_runtime_t * node,
+	   vlib_frame_t * frame)
+{
+  tapcli_main_t * tm = &tapcli_main;
+  static u32 * ready_interface_indices;
+  tapcli_interface_t * ti;
+  int i;
+  u32 total_count = 0;
+
+  vec_reset_length (ready_interface_indices);
+  clib_bitmap_foreach (i, tm->pending_read_bitmap,
+  ({
+    vec_add1 (ready_interface_indices, i);
+  }));
+
+  if (vec_len (ready_interface_indices) == 0)
+    return 0;
+
+  for (i = 0; i < vec_len(ready_interface_indices); i++)
+  {
+    tm->pending_read_bitmap =
+        clib_bitmap_set (tm->pending_read_bitmap,
+                         ready_interface_indices[i], 0);
+
+    ti = vec_elt_at_index (tm->tapcli_interfaces, ready_interface_indices[i]);
+    total_count += tapcli_rx_iface(vm, node, ti);
+  }
+  return total_count; //This might return more than 256.
+}
+
+/** TAPCLI error strings */
+static char * tapcli_rx_error_strings[] = {
+#define _(sym,string) string,
+  foreach_tapcli_error
+#undef _
+};
+
+VLIB_REGISTER_NODE (tapcli_rx_node, static) = {
+  .function = tapcli_rx,
+  .name = "tapcli-rx",
+  .sibling_of = "device-input",
+  .type = VLIB_NODE_TYPE_INPUT,
+  .state = VLIB_NODE_STATE_INTERRUPT,
+  .vector_size = 4,
+  .n_errors = TAPCLI_N_ERROR,
+  .error_strings = tapcli_rx_error_strings,
+  .format_trace = format_tapcli_rx_trace,
+};
+
+
+/**
+ * @brief Gets called when file descriptor is ready from epoll.
+ *
+ * @param *uf - unix_file_t
+ *
+ * @return error - clib_error_t
+ *
+ */
+static clib_error_t * tapcli_read_ready (unix_file_t * uf)
+{
+  vlib_main_t * vm = vlib_get_main();
+  tapcli_main_t * tm = &tapcli_main;
+  uword * p;
+
+  /** Schedule the rx node */
+  vlib_node_set_interrupt_pending (vm, tapcli_rx_node.index);
+
+  p = hash_get (tm->tapcli_interface_index_by_unix_fd, uf->file_descriptor);
+
+  /** Mark the specific tap interface ready-to-read */
+  if (p)
+    tm->pending_read_bitmap = clib_bitmap_set (tm->pending_read_bitmap,
+                                               p[0], 1);
+  else
+    clib_warning ("fd %d not in hash table", uf->file_descriptor);
+
+  return 0;
+}
+
+/**
+ * @brief CLI function for TAPCLI configuration
+ *
+ * @param *vm - vlib_main_t
+ * @param *input - unformat_input_t
+ *
+ * @return error - clib_error_t
+ *
+ */
+static clib_error_t *
+tapcli_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  tapcli_main_t *tm = &tapcli_main;
+  const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "mtu %d", &tm->mtu_bytes))
+	;
+      else if (unformat (input, "disable"))
+        tm->is_disabled = 1;
+      else
+          return clib_error_return (0, "unknown input `%U'",
+                                    format_unformat_error, input);
+    }
+
+  if (tm->is_disabled)
+    return 0;
+
+  if (geteuid())
+    {
+      clib_warning ("tapcli disabled: must be superuser");
+      tm->is_disabled = 1;
+      return 0;
+    }
+
+  tm->mtu_buffers = (tm->mtu_bytes + (buffer_size - 1)) / buffer_size;
+
+  return 0;
+}
+
+/**
+ * @brief Renumber TAPCLI interface
+ *
+ * @param *hi - vnet_hw_interface_t
+ * @param new_dev_instance - u32
+ *
+ * @return rc - int
+ *
+ */
+static int tap_name_renumber (vnet_hw_interface_t * hi,
+                              u32 new_dev_instance)
+{
+  tapcli_main_t *tm = &tapcli_main;
+
+  vec_validate_init_empty (tm->show_dev_instance_by_real_dev_instance,
+                           hi->dev_instance, ~0);
+
+  tm->show_dev_instance_by_real_dev_instance [hi->dev_instance] =
+    new_dev_instance;
+
+  return 0;
+}
+
+VLIB_CONFIG_FUNCTION (tapcli_config, "tapcli");
+
+/**
+ * @brief Free "no punt" frame
+ *
+ * @param *vm - vlib_main_t
+ * @param *node - vlib_node_runtime_t
+ * @param *frame - vlib_frame_t
+ *
+ */
+static void
+tapcli_nopunt_frame (vlib_main_t * vm,
+                   vlib_node_runtime_t * node,
+                   vlib_frame_t * frame)
+{
+  u32 * buffers = vlib_frame_args (frame);
+  uword n_packets = frame->n_vectors;
+  vlib_buffer_free (vm, buffers, n_packets);
+  vlib_frame_free (vm, node, frame);
+}
+
+VNET_HW_INTERFACE_CLASS (tapcli_interface_class,static) = {
+  .name = "tapcli",
+  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
+};
+
+/**
+ * @brief Formatter for TAPCLI interface name
+ *
+ * @param *s - formatter string
+ * @param *args - va_list
+ *
+ * @return *s - formatted string
+ *
+ */
+static u8 * format_tapcli_interface_name (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+  u32 show_dev_instance = ~0;
+  tapcli_main_t * tm = &tapcli_main;
+
+  if (i < vec_len (tm->show_dev_instance_by_real_dev_instance))
+    show_dev_instance = tm->show_dev_instance_by_real_dev_instance[i];
+
+  if (show_dev_instance != ~0)
+    i = show_dev_instance;
+
+  s = format (s, "tap-%d", i);
+  return s;
+}
+
+/**
+ * @brief Modify interface flags for TAPCLI interface
+ *
+ * @param *vnm - vnet_main_t
+ * @param *hw - vnet_hw_interface_t
+ * @param flags - u32
+ *
+ * @return rc - u32
+ *
+ */
+static u32 tapcli_flag_change (vnet_main_t * vnm,
+                               vnet_hw_interface_t * hw,
+                               u32 flags)
+{
+  tapcli_main_t *tm = &tapcli_main;
+  tapcli_interface_t *ti;
+
+   ti = vec_elt_at_index (tm->tapcli_interfaces, hw->dev_instance);
+
+  if (flags & ETHERNET_INTERFACE_FLAG_MTU)
+    {
+      const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
+      tm->mtu_bytes = hw->max_packet_bytes;
+      tm->mtu_buffers = (tm->mtu_bytes + (buffer_size - 1)) / buffer_size;
+    }
+   else
+    {
+      struct ifreq ifr;
+      u32 want_promisc;
+
+      memcpy (&ifr, &ti->ifr, sizeof (ifr));
+
+      /* get flags, modify to bring up interface... */
+      if (ioctl (ti->provision_fd, SIOCGIFFLAGS, &ifr) < 0)
+        {
+          clib_unix_warning ("Couldn't get interface flags for %s", hw->name);
+          return 0;
+        }
+
+      want_promisc = (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL) != 0;
+
+      if (want_promisc == ti->is_promisc)
+        return 0;
+
+      if (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL)
+        ifr.ifr_flags |= IFF_PROMISC;
+      else
+        ifr.ifr_flags &= ~(IFF_PROMISC);
+
+      /* get flags, modify to bring up interface... */
+      if (ioctl (ti->provision_fd, SIOCSIFFLAGS, &ifr) < 0)
+        {
+          clib_unix_warning ("Couldn't set interface flags for %s", hw->name);
+          return 0;
+        }
+
+      ti->is_promisc = want_promisc;
+    }
+
+  return 0;
+}
+
+/**
+ * @brief Setting the TAP interface's next processing node
+ *
+ * @param *vnm - vnet_main_t
+ * @param hw_if_index - u32
+ * @param node_index - u32
+ *
+ */
+static void tapcli_set_interface_next_node (vnet_main_t *vnm,
+                                            u32 hw_if_index,
+                                            u32 node_index)
+{
+  tapcli_main_t *tm = &tapcli_main;
+  tapcli_interface_t *ti;
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+
+  ti = vec_elt_at_index (tm->tapcli_interfaces, hw->dev_instance);
+
+  /** Shut off redirection */
+  if (node_index == ~0)
+    {
+      ti->per_interface_next_index = node_index;
+      return;
+    }
+
+  ti->per_interface_next_index =
+    vlib_node_add_next (tm->vlib_main, tapcli_rx_node.index, node_index);
+}
+
+/**
+ * @brief Set link_state == admin_state otherwise things like ip6 neighbor discovery breaks
+ *
+ * @param *vnm - vnet_main_t
+ * @param hw_if_index - u32
+ * @param flags - u32
+ *
+ * @return error - clib_error_t
+ */
+static clib_error_t *
+tapcli_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+  uword is_admin_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
+  u32 hw_flags;
+  u32 speed_duplex = VNET_HW_INTERFACE_FLAG_FULL_DUPLEX
+    | VNET_HW_INTERFACE_FLAG_SPEED_1G;
+
+  if (is_admin_up)
+    hw_flags = VNET_HW_INTERFACE_FLAG_LINK_UP | speed_duplex;
+  else
+    hw_flags = speed_duplex;
+
+  vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
+  return 0;
+}
+
+VNET_DEVICE_CLASS (tapcli_dev_class,static) = {
+  .name = "tapcli",
+  .tx_function = tapcli_tx,
+  .format_device_name = format_tapcli_interface_name,
+  .rx_redirect_to_node = tapcli_set_interface_next_node,
+  .name_renumber = tap_name_renumber,
+  .admin_up_down_function = tapcli_interface_admin_up_down,
+};
+
+/**
+ * @brief Dump TAP interfaces
+ *
+ * @param **out_tapids - tapcli_interface_details_t
+ *
+ * @return rc - int
+ *
+ */
+int vnet_tap_dump_ifs (tapcli_interface_details_t **out_tapids)
+{
+  tapcli_main_t * tm = &tapcli_main;
+  tapcli_interface_t * ti;
+
+  tapcli_interface_details_t * r_tapids = NULL;
+  tapcli_interface_details_t * tapid = NULL;
+
+  vec_foreach (ti, tm->tapcli_interfaces) {
+    if (!ti->active)
+        continue;
+    vec_add2(r_tapids, tapid, 1);
+    tapid->sw_if_index = ti->sw_if_index;
+    strncpy((char *)tapid->dev_name, ti->ifr.ifr_name, sizeof (ti->ifr.ifr_name)-1);
+  }
+
+  *out_tapids = r_tapids;
+
+  return 0;
+}
+
+/**
+ * @brief Get tap interface from inactive interfaces or create new
+ *
+ * @return interface - tapcli_interface_t
+ *
+ */
+static tapcli_interface_t *tapcli_get_new_tapif()
+{
+  tapcli_main_t * tm = &tapcli_main;
+  tapcli_interface_t *ti = NULL;
+
+  int inactive_cnt = vec_len(tm->tapcli_inactive_interfaces);
+  // if there are any inactive ifaces
+  if (inactive_cnt > 0) {
+    // take last
+    u32 ti_idx = tm->tapcli_inactive_interfaces[inactive_cnt - 1];
+    if (vec_len(tm->tapcli_interfaces) > ti_idx) {
+      ti = vec_elt_at_index (tm->tapcli_interfaces, ti_idx);
+      clib_warning("reusing tap interface");
+    }
+    // "remove" from inactive list
+    _vec_len(tm->tapcli_inactive_interfaces) -= 1;
+  }
+
+  // ti was not retrieved from inactive ifaces - create new
+  if (!ti)
+    vec_add2 (tm->tapcli_interfaces, ti, 1);
+
+  return ti;
+}
+
+/**
+ * @brief Connect a TAP interface
+ *
+ * @param vm - vlib_main_t
+ * @param intfc_name - u8
+ * @param hwaddr_arg - u8
+ * @param sw_if_indexp - u32
+ *
+ * @return rc - int
+ *
+ */
+int vnet_tap_connect (vlib_main_t * vm, u8 * intfc_name, u8 *hwaddr_arg,
+                      u32 * sw_if_indexp)
+{
+  tapcli_main_t * tm = &tapcli_main;
+  tapcli_interface_t * ti = NULL;
+  struct ifreq ifr;
+  int flags;
+  int dev_net_tun_fd;
+  int dev_tap_fd = -1;
+  clib_error_t * error;
+  u8 hwaddr [6];
+  int rv = 0;
+
+  if (tm->is_disabled)
+    {
+      return VNET_API_ERROR_FEATURE_DISABLED;
+    }
+
+  flags = IFF_TAP | IFF_NO_PI;
+
+  if ((dev_net_tun_fd = open ("/dev/net/tun", O_RDWR)) < 0)
+    return VNET_API_ERROR_SYSCALL_ERROR_1;
+
+  memset (&ifr, 0, sizeof (ifr));
+  strncpy(ifr.ifr_name, (char *) intfc_name, sizeof (ifr.ifr_name)-1);
+  ifr.ifr_flags = flags;
+  if (ioctl (dev_net_tun_fd, TUNSETIFF, (void *)&ifr) < 0)
+    {
+      rv = VNET_API_ERROR_SYSCALL_ERROR_2;
+      goto error;
+    }
+    
+  /* Open a provisioning socket */
+  if ((dev_tap_fd = socket(PF_PACKET, SOCK_RAW,
+                           htons(ETH_P_ALL))) < 0 )
+    {
+      rv = VNET_API_ERROR_SYSCALL_ERROR_3;
+      goto error;
+    }
+
+  /* Find the interface index. */
+  {
+    struct ifreq ifr;
+    struct sockaddr_ll sll;
+
+    memset (&ifr, 0, sizeof(ifr));
+    strncpy (ifr.ifr_name, (char *) intfc_name, sizeof (ifr.ifr_name)-1);
+    if (ioctl (dev_tap_fd, SIOCGIFINDEX, &ifr) < 0 )
+      {
+        rv = VNET_API_ERROR_SYSCALL_ERROR_4;
+        goto error;
+      }
+
+    /* Bind the provisioning socket to the interface. */
+    memset(&sll, 0, sizeof(sll));
+    sll.sll_family   = AF_PACKET;
+    sll.sll_ifindex  = ifr.ifr_ifindex;
+    sll.sll_protocol = htons(ETH_P_ALL);
+
+    if (bind(dev_tap_fd, (struct sockaddr*) &sll, sizeof(sll)) < 0)
+      {
+        rv = VNET_API_ERROR_SYSCALL_ERROR_5;
+        goto error;
+      }
+  }
+
+  /* non-blocking I/O on /dev/tapX */
+  {
+    int one = 1;
+    if (ioctl (dev_net_tun_fd, FIONBIO, &one) < 0)
+      {
+        rv = VNET_API_ERROR_SYSCALL_ERROR_6;
+	goto error;
+      }
+  }
+  ifr.ifr_mtu = tm->mtu_bytes;
+  if (ioctl (dev_tap_fd, SIOCSIFMTU, &ifr) < 0)
+    {
+      rv = VNET_API_ERROR_SYSCALL_ERROR_7;
+      goto error;
+    }
+
+  /* get flags, modify to bring up interface... */
+  if (ioctl (dev_tap_fd, SIOCGIFFLAGS, &ifr) < 0)
+    {
+      rv = VNET_API_ERROR_SYSCALL_ERROR_8;
+      goto error;
+    }
+
+  ifr.ifr_flags |= (IFF_UP | IFF_RUNNING);
+
+  if (ioctl (dev_tap_fd, SIOCSIFFLAGS, &ifr) < 0)
+    {
+      rv = VNET_API_ERROR_SYSCALL_ERROR_9;
+      goto error;
+    }
+
+  ti = tapcli_get_new_tapif();
+  ti->per_interface_next_index = ~0;
+
+  if (hwaddr_arg != 0)
+    clib_memcpy(hwaddr, hwaddr_arg, 6);
+  else
+    {
+      f64 now = vlib_time_now(vm);
+      u32 rnd;
+      rnd = (u32) (now * 1e6);
+      rnd = random_u32 (&rnd);
+
+      memcpy (hwaddr+2, &rnd, sizeof(rnd));
+      hwaddr[0] = 2;
+      hwaddr[1] = 0xfe;
+    }
+
+  error = ethernet_register_interface
+        (tm->vnet_main,
+         tapcli_dev_class.index,
+         ti - tm->tapcli_interfaces /* device instance */,
+         hwaddr /* ethernet address */,
+         &ti->hw_if_index, 
+         tapcli_flag_change);
+
+  if (error)
+    {
+      clib_error_report (error);
+      rv = VNET_API_ERROR_INVALID_REGISTRATION;
+      goto error;
+    }
+
+  {
+    unix_file_t template = {0};
+    template.read_function = tapcli_read_ready;
+    template.file_descriptor = dev_net_tun_fd;
+    ti->unix_file_index = unix_file_add (&unix_main, &template);
+    ti->unix_fd = dev_net_tun_fd;
+    ti->provision_fd = dev_tap_fd;
+    clib_memcpy (&ti->ifr, &ifr, sizeof (ifr));
+  }
+  
+  {
+    vnet_hw_interface_t * hw;
+    hw = vnet_get_hw_interface (tm->vnet_main, ti->hw_if_index);
+    hw->min_supported_packet_bytes = TAP_MTU_MIN;
+    hw->max_supported_packet_bytes = TAP_MTU_MAX;
+    hw->max_l3_packet_bytes[VLIB_RX] = hw->max_l3_packet_bytes[VLIB_TX] = hw->max_supported_packet_bytes - sizeof(ethernet_header_t);
+    ti->sw_if_index = hw->sw_if_index;
+    if (sw_if_indexp)
+      *sw_if_indexp = hw->sw_if_index;
+  }
+
+  ti->active = 1;
+  
+  hash_set (tm->tapcli_interface_index_by_sw_if_index, ti->sw_if_index,
+            ti - tm->tapcli_interfaces);
+  
+  hash_set (tm->tapcli_interface_index_by_unix_fd, ti->unix_fd,
+            ti - tm->tapcli_interfaces);
+  
+  return rv;
+
+ error:
+  close (dev_net_tun_fd);
+  if (dev_tap_fd >= 0)
+      close (dev_tap_fd);
+
+  return rv;
+}
+
+/**
+ * @brief Renumber a TAP interface
+ *
+ * @param *vm - vlib_main_t
+ * @param *intfc_name - u8
+ * @param *hwaddr_arg - u8
+ * @param *sw_if_indexp - u32
+ * @param renumber - u8
+ * @param custom_dev_instance - u32
+ *
+ * @return rc - int
+ *
+ */
+int vnet_tap_connect_renumber (vlib_main_t * vm, u8 * intfc_name,
+                               u8 *hwaddr_arg, u32 * sw_if_indexp,
+                               u8 renumber, u32 custom_dev_instance)
+{
+    int rv = vnet_tap_connect(vm, intfc_name, hwaddr_arg, sw_if_indexp);
+
+    if (!rv && renumber)
+        vnet_interface_name_renumber (*sw_if_indexp, custom_dev_instance);
+
+    return rv;
+}
+
+/**
+ * @brief Disconnect TAP CLI interface
+ *
+ * @param *ti - tapcli_interface_t
+ *
+ * @return rc - int
+ *
+ */
+static int tapcli_tap_disconnect (tapcli_interface_t *ti)
+{
+  int rv = 0;
+  vnet_main_t * vnm = vnet_get_main();
+  tapcli_main_t * tm = &tapcli_main;
+  u32 sw_if_index = ti->sw_if_index;
+
+  // bring interface down
+  vnet_sw_interface_set_flags (vnm, sw_if_index, 0);
+
+  if (ti->unix_file_index != ~0) {
+    unix_file_del (&unix_main, unix_main.file_pool + ti->unix_file_index);
+    ti->unix_file_index = ~0;
+  }
+  else
+    close(ti->unix_fd);
+
+  hash_unset (tm->tapcli_interface_index_by_unix_fd, ti->unix_fd);
+  hash_unset (tm->tapcli_interface_index_by_sw_if_index, ti->sw_if_index);
+  close(ti->provision_fd);
+  ti->unix_fd = -1;
+  ti->provision_fd = -1;
+
+  return rv;
+}
+
+/**
+ * @brief Delete TAP interface
+ *
+ * @param *vm - vlib_main_t
+ * @param sw_if_index - u32
+ *
+ * @return rc - int
+ *
+ */
+int vnet_tap_delete(vlib_main_t *vm, u32 sw_if_index)
+{
+  int rv = 0;
+  tapcli_main_t * tm = &tapcli_main;
+  tapcli_interface_t *ti;
+  uword *p = NULL;
+
+  p = hash_get (tm->tapcli_interface_index_by_sw_if_index,
+                sw_if_index);
+  if (p == 0) {
+    clib_warning ("sw_if_index %d unknown", sw_if_index);
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+  }
+  ti = vec_elt_at_index (tm->tapcli_interfaces, p[0]);
+
+  // inactive
+  ti->active = 0;
+  tapcli_tap_disconnect(ti);
+  // add to inactive list
+  vec_add1(tm->tapcli_inactive_interfaces, ti - tm->tapcli_interfaces);
+
+  // reset renumbered iface
+  if (p[0] < vec_len (tm->show_dev_instance_by_real_dev_instance))
+    tm->show_dev_instance_by_real_dev_instance[p[0]] = ~0;
+
+  ethernet_delete_interface (tm->vnet_main, ti->hw_if_index);
+  return rv;
+}
+
+/**
+ * @brief CLI function to delete TAP interface
+ *
+ * @param *vm - vlib_main_t
+ * @param *input - unformat_input_t
+ * @param *cmd - vlib_cli_command_t
+ *
+ * @return error - clib_error_t
+ *
+ */
+static clib_error_t *
+tap_delete_command_fn (vlib_main_t * vm,
+		 unformat_input_t * input,
+		 vlib_cli_command_t * cmd)
+{
+  tapcli_main_t * tm = &tapcli_main;
+  u32 sw_if_index = ~0;
+
+  if (tm->is_disabled)
+    {
+      return clib_error_return (0, "device disabled...");
+    }
+
+  if (unformat (input, "%U", unformat_vnet_sw_interface, tm->vnet_main,
+                &sw_if_index))
+      ;
+  else
+    return clib_error_return (0, "unknown input `%U'",
+                              format_unformat_error, input);
+
+
+  int rc = vnet_tap_delete (vm, sw_if_index);
+
+  if (!rc) {
+    vlib_cli_output (vm, "Deleted.");
+  } else {
+    vlib_cli_output (vm, "Error during deletion of tap interface. (rc: %d)", rc);
+  }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (tap_delete_command, static) = {
+    .path = "tap delete",
+    .short_help = "tap delete <vpp-tap-intfc-name>",
+    .function = tap_delete_command_fn,
+};
+
+/**
+ * @brief Modifies tap interface - can result in new interface being created
+ *
+ * @param *vm - vlib_main_t
+ * @param orig_sw_if_index - u32
+ * @param *intfc_name - u8
+ * @param *hwaddr_arg - u8
+ * @param *sw_if_indexp - u32
+ * @param renumber - u8
+ * @param custom_dev_instance - u32
+ *
+ * @return rc - int
+ *
+ */
+int vnet_tap_modify (vlib_main_t * vm, u32 orig_sw_if_index,
+                     u8 * intfc_name, u8 *hwaddr_arg, 
+                     u32 * sw_if_indexp,
+                     u8 renumber, u32 custom_dev_instance)
+{
+    int rv = vnet_tap_delete (vm, orig_sw_if_index);
+
+    if (rv)
+        return rv;
+
+    rv = vnet_tap_connect_renumber(vm, intfc_name, hwaddr_arg, sw_if_indexp,
+            renumber, custom_dev_instance);
+
+    return rv;
+}
+
+/**
+ * @brief CLI function to modify TAP interface
+ *
+ * @param *vm - vlib_main_t
+ * @param *input - unformat_input_t
+ * @param *cmd - vlib_cli_command_t
+ *
+ * @return error - clib_error_t
+ *
+ */
+static clib_error_t *
+tap_modify_command_fn (vlib_main_t * vm,
+		 unformat_input_t * input,
+		 vlib_cli_command_t * cmd)
+{
+  u8 * intfc_name;
+  tapcli_main_t * tm = &tapcli_main;
+  u32 sw_if_index = ~0;
+  u32 new_sw_if_index = ~0;
+  int user_hwaddr = 0;
+  u8 hwaddr[6];
+
+  if (tm->is_disabled)
+    {
+      return clib_error_return (0, "device disabled...");
+    }
+
+  if (unformat (input, "%U", unformat_vnet_sw_interface, tm->vnet_main,
+                &sw_if_index))
+      ;
+  else
+    return clib_error_return (0, "unknown input `%U'",
+                              format_unformat_error, input);
+
+  if (unformat (input, "%s", &intfc_name))
+    ;
+  else
+    return clib_error_return (0, "unknown input `%U'",
+                              format_unformat_error, input);
+
+  if (unformat(input, "hwaddr %U", unformat_ethernet_address,
+               &hwaddr))
+    user_hwaddr = 1;
+
+
+  int rc = vnet_tap_modify (vm, sw_if_index, intfc_name,
+                            (user_hwaddr == 1 ? hwaddr : 0),
+                            &new_sw_if_index, 0, 0);
+
+  if (!rc) {
+    vlib_cli_output (vm, "Modified %U for Linux tap '%s'",
+                   format_vnet_sw_if_index_name, tm->vnet_main, 
+                   new_sw_if_index, intfc_name);
+  } else {
+    vlib_cli_output (vm, "Error during modification of tap interface. (rc: %d)", rc);
+  }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (tap_modify_command, static) = {
+    .path = "tap modify",
+    .short_help = "tap modify <vpp-tap-intfc-name> <linux-intfc-name> [hwaddr <addr>]",
+    .function = tap_modify_command_fn,
+};
+
+/**
+ * @brief CLI function to connect TAP interface
+ *
+ * @param *vm - vlib_main_t
+ * @param *input - unformat_input_t
+ * @param *cmd - vlib_cli_command_t
+ *
+ * @return error - clib_error_t
+ *
+ */
+static clib_error_t *
+tap_connect_command_fn (vlib_main_t * vm,
+		 unformat_input_t * input,
+		 vlib_cli_command_t * cmd)
+{
+  u8 * intfc_name;
+  tapcli_main_t * tm = &tapcli_main;
+  u8 hwaddr[6];
+  u8 *hwaddr_arg = 0;
+  u32 sw_if_index;
+
+  if (tm->is_disabled)
+    {
+      return clib_error_return (0, "device disabled...");
+    }
+
+  if (unformat (input, "%s", &intfc_name))
+    ;
+  else
+    return clib_error_return (0, "unknown input `%U'",
+                              format_unformat_error, input);
+  
+  if (unformat(input, "hwaddr %U", unformat_ethernet_address,
+               &hwaddr))
+    hwaddr_arg = hwaddr;
+
+  /* It is here for backward compatibility */
+  if (unformat(input, "hwaddr random"))
+    ;
+
+  int rv = vnet_tap_connect(vm, intfc_name, hwaddr_arg, &sw_if_index);
+  if (rv) {
+    switch (rv) {
+    case VNET_API_ERROR_SYSCALL_ERROR_1:
+      vlib_cli_output (vm, "Couldn't open /dev/net/tun");
+      break;
+
+    case VNET_API_ERROR_SYSCALL_ERROR_2:
+      vlib_cli_output (vm, "Error setting flags on '%s'", intfc_name);
+      break;
+  
+    case VNET_API_ERROR_SYSCALL_ERROR_3:
+      vlib_cli_output (vm, "Couldn't open provisioning socket");
+      break;
+
+    case VNET_API_ERROR_SYSCALL_ERROR_4:
+      vlib_cli_output (vm, "Couldn't get if_index");
+      break;
+    
+    case VNET_API_ERROR_SYSCALL_ERROR_5:
+      vlib_cli_output (vm, "Couldn't bind provisioning socket");
+      break;
+
+    case VNET_API_ERROR_SYSCALL_ERROR_6:
+      vlib_cli_output (0, "Couldn't set device non-blocking flag");
+      break;
+
+    case VNET_API_ERROR_SYSCALL_ERROR_7:
+      vlib_cli_output (0, "Couldn't set device MTU");
+      break;
+
+    case VNET_API_ERROR_SYSCALL_ERROR_8:
+      vlib_cli_output (0, "Couldn't get interface flags");
+      break;
+
+    case VNET_API_ERROR_SYSCALL_ERROR_9:
+      vlib_cli_output (0, "Couldn't set intfc admin state up");
+      break;
+
+    case VNET_API_ERROR_INVALID_REGISTRATION:
+      vlib_cli_output (0, "Invalid registration");
+      break;
+    default:
+      vlib_cli_output (0, "Unknown error: %d", rv);
+      break;
+    }
+    return 0;
+  }
+
+  vlib_cli_output(vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main(), sw_if_index);
+  return 0;
+  }
+
+VLIB_CLI_COMMAND (tap_connect_command, static) = {
+    .path = "tap connect",
+    .short_help = "tap connect <intfc-name> [hwaddr <addr>]",
+    .function = tap_connect_command_fn,
+};
+
+/**
+ * @brief TAPCLI main init
+ *
+ * @param *vm - vlib_main_t
+ *
+ * @return error - clib_error_t
+ *
+ */
+clib_error_t *
+tapcli_init (vlib_main_t * vm)
+{
+  tapcli_main_t * tm = &tapcli_main;
+
+  tm->vlib_main = vm;
+  tm->vnet_main = vnet_get_main();
+  tm->unix_main = &unix_main;
+  tm->mtu_bytes = TAP_MTU_DEFAULT;
+  tm->tapcli_interface_index_by_sw_if_index = hash_create (0, sizeof(uword));
+  tm->tapcli_interface_index_by_unix_fd = hash_create (0, sizeof (uword));
+  tm->rx_buffers = 0;
+  vec_alloc(tm->rx_buffers, VLIB_FRAME_SIZE);
+  vec_reset_length(tm->rx_buffers);
+  vm->os_punt_frame = tapcli_nopunt_frame;
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (tapcli_init);
diff --git a/src/vnet/unix/tapcli.h b/src/vnet/unix/tapcli.h
new file mode 100644
index 00000000..fcd82dbf
--- /dev/null
+++ b/src/vnet/unix/tapcli.h
@@ -0,0 +1,52 @@
+/*
+ * tapcli.h : tap support
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file
+ * @brief TAPCLI definitions
+ */
+
+#ifndef __included_tapcli_h__
+#define __included_tapcli_h__
+
+/** TAP CLI errors */
+#define foreach_tapcli_error				\
+  /* Must be first. */                                  \
+ _(NONE, "no error")                                    \
+ _(READ, "read error")                                  \
+ _(BUFFER_ALLOC, "buffer allocation error")             \
+ _(UNKNOWN, "unknown error")
+
+typedef enum {
+#define _(sym,str) TAPCLI_ERROR_##sym,
+  foreach_tapcli_error
+#undef _
+   TAPCLI_N_ERROR,
+ } tapcli_error_t;
+
+/** TAP CLI interface details struct */
+typedef struct {
+  u32 sw_if_index;
+  u8 dev_name[64];
+} tapcli_interface_details_t;
+
+int vnet_tap_dump_ifs (tapcli_interface_details_t **out_tapids);
+
+#define TAP_MTU_MIN 68
+#define TAP_MTU_MAX 65535
+#define TAP_MTU_DEFAULT 1500
+
+#endif /* __included_tapcli_h__ */
diff --git a/src/vnet/unix/tuntap.c b/src/vnet/unix/tuntap.c
new file mode 100644
index 00000000..4a5dd676
--- /dev/null
+++ b/src/vnet/unix/tuntap.c
@@ -0,0 +1,1000 @@
+/* 
+ *------------------------------------------------------------------
+ * tuntap.c - kernel stack (reverse) punt/inject path
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+/**
+ * @file
+ * @brief  TunTap Kernel stack (reverse) punt/inject path.
+ *
+ * This driver runs in one of two distinct modes:
+ * - "punt/inject" mode, where we send pkts not otherwise processed
+ * by the forwarding to the Linux kernel stack, and
+ *
+ * - "normal interface" mode, where we treat the Linux kernel stack
+ * as a peer.
+ *
+ * By default, we select punt/inject mode.
+ */
+
+#include <fcntl.h>		/* for open */
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/uio.h>		/* for iovec */
+#include <netinet/in.h>
+
+#include <linux/if_arp.h>
+#include <linux/if_tun.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+
+#include <vnet/ip/ip.h>
+
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/devices/devices.h>
+#include <vnet/feature/feature.h>
+
+static vnet_device_class_t tuntap_dev_class;
+static vnet_hw_interface_class_t tuntap_interface_class;
+
+static void tuntap_punt_frame (vlib_main_t * vm,
+                               vlib_node_runtime_t * node,
+                               vlib_frame_t * frame);
+static void tuntap_nopunt_frame (vlib_main_t * vm,
+                                 vlib_node_runtime_t * node,
+                                 vlib_frame_t * frame);
+
+typedef struct {
+  u32 sw_if_index;
+  u8 is_v6;
+  u8 addr[16];
+} subif_address_t;
+
+/**
+ * @brief TUNTAP node main state
+ */
+typedef struct {
+  /** Vector of iovecs for readv/writev calls. */
+  struct iovec * iovecs;
+
+  /** Vector of VLIB rx buffers to use.  We allocate them in blocks
+     of VLIB_FRAME_SIZE (256). */
+  u32 * rx_buffers;
+
+  /** File descriptors for /dev/net/tun and provisioning socket. */
+  int dev_net_tun_fd, dev_tap_fd;
+
+  /** Create a "tap" [ethernet] encaps device */
+  int is_ether;
+
+  /** 1 if a "normal" routed intfc, 0 if a punt/inject interface */
+
+  int have_normal_interface;
+
+  /** tap device destination MAC address. Required, or Linux drops pkts */
+  u8 ether_dst_mac[6];
+
+  /** Interface MTU in bytes and # of default sized buffers. */
+  u32 mtu_bytes, mtu_buffers;
+
+  /** Linux interface name for tun device. */
+  char * tun_name;
+
+  /** Pool of subinterface addresses */
+  subif_address_t *subifs;
+
+  /** Hash for subif addresses */
+  mhash_t subif_mhash;
+
+  /** Unix file index */
+  u32 unix_file_index;
+
+  /** For the "normal" interface, if configured */
+  u32 hw_if_index, sw_if_index;
+
+} tuntap_main_t;
+
+static tuntap_main_t tuntap_main = {
+  .tun_name = "vnet",
+
+  /** Suitable defaults for an Ethernet-like tun/tap device */
+  .mtu_bytes = 4096 + 256,
+};
+
+/**
+ * @brief tuntap_tx
+ * @node tuntap-tx
+ *
+ * Output node, writes the buffers comprising the incoming frame
+ * to the tun/tap device, aka hands them to the Linux kernel stack.
+ *
+ * @param *vm - vlib_main_t
+ * @param *node - vlib_node_runtime_t
+ * @param *frame - vlib_frame_t
+ *
+ * @return rc - uword
+ *
+ */
+static uword
+tuntap_tx (vlib_main_t * vm,
+	   vlib_node_runtime_t * node,
+	   vlib_frame_t * frame)
+{
+  u32 * buffers = vlib_frame_args (frame);
+  uword n_packets = frame->n_vectors;
+  tuntap_main_t * tm = &tuntap_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  u32 n_bytes = 0;
+  int i;
+
+  for (i = 0; i < n_packets; i++)
+    {
+      struct iovec * iov;
+      vlib_buffer_t * b;
+      uword l;
+
+      b = vlib_get_buffer (vm, buffers[i]);
+
+      if (tm->is_ether && (!tm->have_normal_interface))
+        {
+          vlib_buffer_reset(b);
+          clib_memcpy (vlib_buffer_get_current (b), tm->ether_dst_mac, 6);
+        }
+
+      /* Re-set iovecs if present. */
+      if (tm->iovecs)
+	_vec_len (tm->iovecs) = 0;
+
+      /** VLIB buffer chain -> Unix iovec(s). */
+      vec_add2 (tm->iovecs, iov, 1);
+      iov->iov_base = b->data + b->current_data;
+      iov->iov_len = l = b->current_length;
+
+      if (PREDICT_FALSE (b->flags & VLIB_BUFFER_NEXT_PRESENT))
+	{
+	  do {
+	    b = vlib_get_buffer (vm, b->next_buffer);
+
+	    vec_add2 (tm->iovecs, iov, 1);
+
+	    iov->iov_base = b->data + b->current_data;
+	    iov->iov_len = b->current_length;
+	    l += b->current_length;
+	  } while (b->flags & VLIB_BUFFER_NEXT_PRESENT);
+	}
+
+      if (writev (tm->dev_net_tun_fd, tm->iovecs, vec_len (tm->iovecs)) < l)
+	clib_unix_warning ("writev");
+
+      n_bytes += l;
+    }
+
+  /* Update tuntap interface output stats. */
+  vlib_increment_combined_counter (im->combined_sw_if_counters
+				   + VNET_INTERFACE_COUNTER_TX,
+				   vm->cpu_index,
+				   tm->sw_if_index, n_packets, n_bytes);
+
+
+  /** The normal interface path flattens the buffer chain */
+  if (tm->have_normal_interface)
+    vlib_buffer_free_no_next (vm, buffers, n_packets);
+  else
+    vlib_buffer_free (vm, buffers, n_packets);
+
+  return n_packets;
+}
+
+VLIB_REGISTER_NODE (tuntap_tx_node,static) = {
+  .function = tuntap_tx,
+  .name = "tuntap-tx",
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .vector_size = 4,
+};
+
+/**
+ * @brief TUNTAP receive node
+ * @node tuntap-rx
+ *
+ * @param *vm - vlib_main_t
+ * @param *node - vlib_node_runtime_t
+ * @param *frame - vlib_frame_t
+ *
+ * @return rc - uword
+ *
+ */
+static uword
+tuntap_rx (vlib_main_t * vm,
+	   vlib_node_runtime_t * node,
+	   vlib_frame_t * frame)
+{
+  tuntap_main_t * tm = &tuntap_main;
+  vlib_buffer_t * b;
+  u32 bi;
+  const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
+
+  /** Make sure we have some RX buffers. */
+  {
+    uword n_left = vec_len (tm->rx_buffers);
+    uword n_alloc;
+
+    if (n_left < VLIB_FRAME_SIZE / 2)
+      {
+	if (! tm->rx_buffers)
+	  vec_alloc (tm->rx_buffers, VLIB_FRAME_SIZE);
+
+	n_alloc = vlib_buffer_alloc (vm, tm->rx_buffers + n_left, VLIB_FRAME_SIZE - n_left);
+	_vec_len (tm->rx_buffers) = n_left + n_alloc;
+      }
+  }
+
+  /** Allocate RX buffers from end of rx_buffers.
+     Turn them into iovecs to pass to readv. */
+  {
+    uword i_rx = vec_len (tm->rx_buffers) - 1;
+    vlib_buffer_t * b;
+    word i, n_bytes_left, n_bytes_in_packet;
+
+    /** We should have enough buffers left for an MTU sized packet. */
+    ASSERT (vec_len (tm->rx_buffers) >= tm->mtu_buffers);
+
+    vec_validate (tm->iovecs, tm->mtu_buffers - 1);
+    for (i = 0; i < tm->mtu_buffers; i++)
+      {
+	b = vlib_get_buffer (vm, tm->rx_buffers[i_rx - i]);
+	tm->iovecs[i].iov_base = b->data;
+	tm->iovecs[i].iov_len = buffer_size;
+      }
+
+    n_bytes_left = readv (tm->dev_net_tun_fd, tm->iovecs, tm->mtu_buffers);
+    n_bytes_in_packet = n_bytes_left;
+    if (n_bytes_left <= 0)
+      {
+        if (errno != EAGAIN)
+          clib_unix_warning ("readv %d", n_bytes_left);
+	return 0;
+      }
+
+    bi = tm->rx_buffers[i_rx];
+
+    while (1)
+      {
+	b = vlib_get_buffer (vm, tm->rx_buffers[i_rx]);
+	b->flags = 0;
+	b->current_data = 0;
+	b->current_length = n_bytes_left < buffer_size ? n_bytes_left : buffer_size;
+
+	n_bytes_left -= buffer_size;
+
+	if (n_bytes_left <= 0)
+          {
+            break;
+          }
+
+	i_rx--;
+	b->flags |= VLIB_BUFFER_NEXT_PRESENT;
+	b->next_buffer = tm->rx_buffers[i_rx];
+      }
+
+    /** Interface counters for tuntap interface. */
+    vlib_increment_combined_counter
+        (vnet_main.interface_main.combined_sw_if_counters
+         + VNET_INTERFACE_COUNTER_RX,
+         os_get_cpu_number(),
+         tm->sw_if_index,
+         1, n_bytes_in_packet);
+
+    _vec_len (tm->rx_buffers) = i_rx;
+  }
+
+  b = vlib_get_buffer (vm, bi);
+
+  {
+    u32 next_index;
+    uword n_trace = vlib_get_trace_count (vm, node);
+
+    vnet_buffer (b)->sw_if_index[VLIB_RX] = tm->sw_if_index;
+    vnet_buffer (b)->sw_if_index[VLIB_TX] = (u32)~0;
+
+    /*
+     * Turn this on if you run into
+     * "bad monkey" contexts, and you want to know exactly
+     * which nodes they've visited...
+     */
+    if (VLIB_BUFFER_TRACE_TRAJECTORY)
+        b->pre_data[0] = 0;
+
+    b->error = node->errors[0];
+
+    if (tm->is_ether)
+      {
+	next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
+      }
+    else
+      switch (b->data[0] & 0xf0)
+        {
+        case 0x40:
+          next_index = VNET_DEVICE_INPUT_NEXT_IP4_INPUT;
+          break;
+        case 0x60:
+          next_index = VNET_DEVICE_INPUT_NEXT_IP6_INPUT;
+          break;
+        default:
+          next_index = VNET_DEVICE_INPUT_NEXT_DROP;
+          break;
+        }
+
+    /* The linux kernel couldn't care less if our interface is up */
+    if (tm->have_normal_interface)
+      {
+        vnet_main_t *vnm = vnet_get_main();
+        vnet_sw_interface_t * si;
+        si = vnet_get_sw_interface (vnm, tm->sw_if_index);
+        if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
+          next_index = VNET_DEVICE_INPUT_NEXT_DROP;
+      }
+
+    vnet_feature_start_device_input_x1 (tm->sw_if_index, &next_index, b, 0);
+
+    vlib_set_next_frame_buffer (vm, node, next_index, bi);
+
+    if (n_trace > 0)
+      {
+        vlib_trace_buffer (vm, node, next_index,
+                           b, /* follow_chain */ 1);
+        vlib_set_trace_count (vm, node, n_trace - 1);
+      }
+  }
+
+  return 1;
+}
+
+/**
+ * @brief TUNTAP_RX error strings
+ */
+static char * tuntap_rx_error_strings[] = {
+  "unknown packet type",
+};
+
+VLIB_REGISTER_NODE (tuntap_rx_node,static) = {
+  .function = tuntap_rx,
+  .name = "tuntap-rx",
+  .sibling_of = "device-input",
+  .type = VLIB_NODE_TYPE_INPUT,
+  .state = VLIB_NODE_STATE_INTERRUPT,
+  .vector_size = 4,
+  .n_errors = 1,
+  .error_strings = tuntap_rx_error_strings,
+};
+
+/**
+ * @brief Gets called when file descriptor is ready from epoll.
+ *
+ * @param *uf - unix_file_t
+ *
+ * @return error - clib_error_t
+ */
+static clib_error_t * tuntap_read_ready (unix_file_t * uf)
+{
+  vlib_main_t * vm = vlib_get_main();
+  vlib_node_set_interrupt_pending (vm, tuntap_rx_node.index);
+  return 0;
+}
+
+/**
+ * @brief Clean up the tun/tap device
+ *
+ * @param *vm - vlib_main_t
+ *
+ * @return error - clib_error_t
+ *
+ */
+static clib_error_t *
+tuntap_exit (vlib_main_t * vm)
+{
+  tuntap_main_t *tm = &tuntap_main;
+  struct ifreq ifr;
+  int sfd;
+
+  /* Not present. */
+  if (! tm->dev_net_tun_fd || tm->dev_net_tun_fd < 0)
+    return 0;
+
+  sfd = socket (AF_INET, SOCK_STREAM, 0);
+  if (sfd < 0)
+    clib_unix_warning("provisioning socket");
+
+  memset(&ifr, 0, sizeof (ifr));
+  strncpy (ifr.ifr_name, tm->tun_name, sizeof (ifr.ifr_name)-1);
+
+  /* get flags, modify to bring down interface... */
+  if (ioctl (sfd, SIOCGIFFLAGS, &ifr) < 0)
+    clib_unix_warning ("SIOCGIFFLAGS");
+
+  ifr.ifr_flags &= ~(IFF_UP | IFF_RUNNING);
+
+  if (ioctl (sfd, SIOCSIFFLAGS, &ifr) < 0)
+    clib_unix_warning ("SIOCSIFFLAGS");
+
+  /* Turn off persistence */
+  if (ioctl (tm->dev_net_tun_fd, TUNSETPERSIST, 0) < 0)
+    clib_unix_warning ("TUNSETPERSIST");
+  close(tm->dev_tap_fd);
+  if (tm->dev_net_tun_fd >= 0)
+    close(tm->dev_net_tun_fd);
+  if (sfd >= 0)
+    close (sfd);
+
+  return 0;
+}
+
+VLIB_MAIN_LOOP_EXIT_FUNCTION (tuntap_exit);
+
+/**
+ * @brief CLI function for tun/tap config
+ *
+ * @param *vm - vlib_main_t
+ * @param *input - unformat_input_t
+ *
+ * @return error - clib_error_t
+ *
+ */
+static clib_error_t *
+tuntap_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  tuntap_main_t *tm = &tuntap_main;
+  clib_error_t * error = 0;
+  struct ifreq ifr;
+  u8 * name;
+  int flags = IFF_TUN | IFF_NO_PI;
+  int is_enabled = 0, is_ether = 0, have_normal_interface = 0;
+  const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "mtu %d", &tm->mtu_bytes))
+	;
+      else if (unformat (input, "enable"))
+        is_enabled = 1;
+      else if (unformat (input, "disable"))
+        is_enabled = 0;
+      else if (unformat (input, "ethernet") ||
+               unformat (input, "ether"))
+        is_ether = 1;
+      else if (unformat (input, "have-normal-interface") ||
+               unformat (input, "have-normal"))
+        have_normal_interface = 1;
+      else if (unformat (input, "name %s", &name))
+	tm->tun_name = (char *) name;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+
+  tm->dev_net_tun_fd = -1;
+  tm->dev_tap_fd = -1;
+
+  if (is_enabled == 0)
+    return 0;
+
+  if (geteuid()) 
+    {
+      clib_warning ("tuntap disabled: must be superuser");
+      return 0;
+    }    
+
+  tm->is_ether = is_ether;
+  tm->have_normal_interface = have_normal_interface;
+
+  if (is_ether)
+    flags = IFF_TAP | IFF_NO_PI;
+
+  if ((tm->dev_net_tun_fd = open ("/dev/net/tun", O_RDWR)) < 0)
+    {
+      error = clib_error_return_unix (0, "open /dev/net/tun");
+      goto done;
+    }
+
+  memset (&ifr, 0, sizeof (ifr));
+  strncpy(ifr.ifr_name, tm->tun_name, sizeof(ifr.ifr_name)-1);
+  ifr.ifr_flags = flags;
+  if (ioctl (tm->dev_net_tun_fd, TUNSETIFF, (void *)&ifr) < 0)
+    {
+      error = clib_error_return_unix (0, "ioctl TUNSETIFF");
+      goto done;
+    }
+    
+  /* Make it persistent, at least until we split. */
+  if (ioctl (tm->dev_net_tun_fd, TUNSETPERSIST, 1) < 0)
+    {
+      error = clib_error_return_unix (0, "TUNSETPERSIST");
+      goto done;
+    }
+
+  /* Open a provisioning socket */
+  if ((tm->dev_tap_fd = socket(PF_PACKET, SOCK_RAW,
+			       htons(ETH_P_ALL))) < 0 )
+    {
+      error = clib_error_return_unix (0, "socket");
+      goto done;
+    }
+
+  /* Find the interface index. */
+  {
+    struct ifreq ifr;
+    struct sockaddr_ll sll;
+
+    memset (&ifr, 0, sizeof(ifr));
+    strncpy (ifr.ifr_name, tm->tun_name, sizeof(ifr.ifr_name)-1);
+    if (ioctl (tm->dev_tap_fd, SIOCGIFINDEX, &ifr) < 0 )
+      {
+	error = clib_error_return_unix (0, "ioctl SIOCGIFINDEX");
+	goto done;
+      }
+
+    /* Bind the provisioning socket to the interface. */
+    memset(&sll, 0, sizeof(sll));
+    sll.sll_family   = AF_PACKET;
+    sll.sll_ifindex  = ifr.ifr_ifindex;
+    sll.sll_protocol = htons(ETH_P_ALL);
+
+    if (bind(tm->dev_tap_fd, (struct sockaddr*) &sll, sizeof(sll)) < 0)
+      {
+	error = clib_error_return_unix (0, "bind");
+	goto done;
+      }
+  }
+
+  /* non-blocking I/O on /dev/tapX */
+  {
+    int one = 1;
+    if (ioctl (tm->dev_net_tun_fd, FIONBIO, &one) < 0)
+      {
+	error = clib_error_return_unix (0, "ioctl FIONBIO");
+	goto done;
+      }
+  }
+
+  tm->mtu_buffers = (tm->mtu_bytes + (buffer_size - 1)) / buffer_size;
+
+  ifr.ifr_mtu = tm->mtu_bytes;
+  if (ioctl (tm->dev_tap_fd, SIOCSIFMTU, &ifr) < 0)
+    {
+      error = clib_error_return_unix (0, "ioctl SIOCSIFMTU");
+      goto done;
+    }
+
+  /* get flags, modify to bring up interface... */
+  if (ioctl (tm->dev_tap_fd, SIOCGIFFLAGS, &ifr) < 0)
+    {
+      error = clib_error_return_unix (0, "ioctl SIOCGIFFLAGS");
+      goto done;
+    }
+
+  ifr.ifr_flags |= (IFF_UP | IFF_RUNNING);
+
+  if (ioctl (tm->dev_tap_fd, SIOCSIFFLAGS, &ifr) < 0)
+    {
+      error = clib_error_return_unix (0, "ioctl SIOCSIFFLAGS");
+      goto done;
+    }
+
+  if (is_ether)
+    {
+      if (ioctl (tm->dev_tap_fd, SIOCGIFHWADDR, &ifr) < 0)
+        {
+          error = clib_error_return_unix (0, "ioctl SIOCGIFHWADDR");
+          goto done;
+        }
+      else
+        clib_memcpy (tm->ether_dst_mac, ifr.ifr_hwaddr.sa_data, 6);
+    }
+
+  if (have_normal_interface)
+    {
+      vnet_main_t *vnm = vnet_get_main();
+      error = ethernet_register_interface
+        (vnm,
+         tuntap_dev_class.index,
+         0 /* device instance */,
+         tm->ether_dst_mac /* ethernet address */,
+         &tm->hw_if_index, 
+         0 /* flag change */);
+      if (error)
+        clib_error_report (error);
+      tm->sw_if_index = tm->hw_if_index;
+      vm->os_punt_frame = tuntap_nopunt_frame;
+    }
+  else
+    {
+      vnet_main_t *vnm = vnet_get_main();
+      vnet_hw_interface_t * hi;
+      
+      vm->os_punt_frame = tuntap_punt_frame;
+      
+      tm->hw_if_index = vnet_register_interface
+        (vnm,
+         tuntap_dev_class.index, 0 /* device instance */,
+         tuntap_interface_class.index, 0);
+      hi = vnet_get_hw_interface (vnm, tm->hw_if_index);
+      tm->sw_if_index = hi->sw_if_index;
+      
+      /* Interface is always up. */
+      vnet_hw_interface_set_flags (vnm, tm->hw_if_index, 
+                                   VNET_HW_INTERFACE_FLAG_LINK_UP);
+      vnet_sw_interface_set_flags (vnm, tm->sw_if_index, 
+                                   VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+    }
+
+  {
+    unix_file_t template = {0};
+    template.read_function = tuntap_read_ready;
+    template.file_descriptor = tm->dev_net_tun_fd;
+    tm->unix_file_index = unix_file_add (&unix_main, &template);
+  }
+
+ done:
+  if (error)
+    {
+      if (tm->dev_net_tun_fd >= 0)
+	close (tm->dev_net_tun_fd);
+      if (tm->dev_tap_fd >= 0)
+	close (tm->dev_tap_fd);
+    }
+
+  return error;
+}
+
+VLIB_CONFIG_FUNCTION (tuntap_config, "tuntap");
+
+/**
+ * @brief Add or Del IP4 address to tun/tap interface
+ *
+ * @param *im - ip4_main_t
+ * @param opaque - uword
+ * @param sw_if_index - u32
+ * @param *address - ip4_address_t
+ * @param is_delete - u32
+ *
+ */
+void
+tuntap_ip4_add_del_interface_address (ip4_main_t * im,
+				      uword opaque,
+				      u32 sw_if_index,
+				      ip4_address_t * address,
+				      u32 address_length,
+				      u32 if_address_index,
+				      u32 is_delete)
+{
+  tuntap_main_t * tm = &tuntap_main;
+  struct ifreq ifr;
+  subif_address_t subif_addr, * ap;
+  uword * p;
+
+  /** Tuntap disabled, or using a "normal" interface. */
+  if (tm->have_normal_interface ||  tm->dev_tap_fd < 0)
+    return;
+
+  /** See if we already know about this subif */
+  memset (&subif_addr, 0, sizeof (subif_addr));
+  subif_addr.sw_if_index = sw_if_index;
+  clib_memcpy (&subif_addr.addr, address, sizeof (*address));
+
+  p = mhash_get (&tm->subif_mhash, &subif_addr);
+
+  if (p)
+    ap = pool_elt_at_index (tm->subifs, p[0]);
+  else
+    {
+      pool_get (tm->subifs, ap);
+      *ap = subif_addr;
+      mhash_set (&tm->subif_mhash, ap, ap - tm->subifs, 0);
+    }
+
+  /* Use subif pool index to select alias device. */
+  memset (&ifr, 0, sizeof (ifr));
+  snprintf (ifr.ifr_name, sizeof(ifr.ifr_name), 
+            "%s:%d", tm->tun_name, (int)(ap - tm->subifs));
+
+  /* the tuntap punt/inject is enabled for IPv4 RX so long as
+   * any vpp interface has an IPv4 address.
+   * this is also ref counted.
+   */
+  ip4_sw_interface_enable_disable (tm->sw_if_index, !is_delete);
+
+  if (! is_delete)
+    {
+      struct sockaddr_in * sin;
+
+      sin = (struct sockaddr_in *)&ifr.ifr_addr;
+
+      /* Set ipv4 address, netmask. */
+      sin->sin_family = AF_INET;
+      clib_memcpy (&sin->sin_addr.s_addr, address, 4);
+      if (ioctl (tm->dev_tap_fd, SIOCSIFADDR, &ifr) < 0)
+	clib_unix_warning ("ioctl SIOCSIFADDR");
+    
+      sin->sin_addr.s_addr = im->fib_masks[address_length];
+      if (ioctl (tm->dev_tap_fd, SIOCSIFNETMASK, &ifr) < 0)
+	clib_unix_warning ("ioctl SIOCSIFNETMASK");
+    }
+  else
+    {
+      mhash_unset (&tm->subif_mhash, &subif_addr, 0 /* old value ptr */);
+      pool_put (tm->subifs, ap);
+    }
+
+  /* get flags, modify to bring up interface... */
+  if (ioctl (tm->dev_tap_fd, SIOCGIFFLAGS, &ifr) < 0)
+    clib_unix_warning ("ioctl SIOCGIFFLAGS");
+
+  if (is_delete)
+    ifr.ifr_flags &= ~(IFF_UP | IFF_RUNNING);
+  else
+    ifr.ifr_flags |= (IFF_UP | IFF_RUNNING);
+
+  if (ioctl (tm->dev_tap_fd, SIOCSIFFLAGS, &ifr) < 0)
+    clib_unix_warning ("ioctl SIOCSIFFLAGS");
+}
+
+/**
+ * @brief workaround for a known include file bug.
+ * including @c <linux/ipv6.h> causes multiple definitions if
+ * @c <netinet/in.h is also included.
+ */
+struct in6_ifreq {
+	struct in6_addr	ifr6_addr;
+        u32		ifr6_prefixlen;
+        int		ifr6_ifindex;
+};
+
+/**
+ * @brief Add or Del tun/tap interface address.
+ *
+ * Both the v6 interface address API and the way ifconfig
+ * displays subinterfaces differ from their v4 couterparts.
+ * The code given here seems to work but YMMV.
+ *
+ * @param *im - ip6_main_t
+ * @param opaque - uword
+ * @param sw_if_index - u32
+ * @param *address - ip6_address_t
+ * @param address_length - u32
+ * @param if_address_index - u32
+ * @param is_delete - u32
+ */
+void
+tuntap_ip6_add_del_interface_address (ip6_main_t * im,
+				      uword opaque,
+				      u32 sw_if_index,
+				      ip6_address_t * address,
+				      u32 address_length,
+				      u32 if_address_index,
+				      u32 is_delete)
+{
+  tuntap_main_t * tm = &tuntap_main;
+  struct ifreq ifr;
+  struct in6_ifreq ifr6;
+  subif_address_t subif_addr, * ap;
+  uword * p;
+
+  /* Tuntap disabled, or using a "normal" interface. */
+  if (tm->have_normal_interface ||  tm->dev_tap_fd < 0)
+    return;
+
+  /* See if we already know about this subif */
+  memset (&subif_addr, 0, sizeof (subif_addr));
+  subif_addr.sw_if_index = sw_if_index;
+  subif_addr.is_v6 = 1;
+  clib_memcpy (&subif_addr.addr, address, sizeof (*address));
+
+  p = mhash_get (&tm->subif_mhash, &subif_addr);
+
+  if (p)
+    ap = pool_elt_at_index (tm->subifs, p[0]);
+  else
+    {
+      pool_get (tm->subifs, ap);
+      *ap = subif_addr;
+      mhash_set (&tm->subif_mhash, ap, ap - tm->subifs, 0);
+    }
+
+  /* Use subif pool index to select alias device. */
+  memset (&ifr, 0, sizeof (ifr));
+  memset (&ifr6, 0, sizeof (ifr6));
+  snprintf (ifr.ifr_name, sizeof(ifr.ifr_name), 
+            "%s:%d", tm->tun_name, (int)(ap - tm->subifs));
+
+  /* the tuntap punt/inject is enabled for IPv6 RX so long as
+   * any vpp interface has an IPv6 address.
+   * this is also ref counted.
+   */
+  ip6_sw_interface_enable_disable (tm->sw_if_index, !is_delete);
+
+  if (! is_delete)
+    {
+      int sockfd = socket (AF_INET6, SOCK_STREAM, 0);
+      if (sockfd < 0)
+        clib_unix_warning ("get ifindex socket");
+
+      if (ioctl (sockfd, SIOGIFINDEX, &ifr) < 0)
+        clib_unix_warning ("get ifindex");
+
+      ifr6.ifr6_ifindex = ifr.ifr_ifindex;
+      ifr6.ifr6_prefixlen = address_length;
+      clib_memcpy (&ifr6.ifr6_addr, address, 16);
+
+      if (ioctl (sockfd, SIOCSIFADDR, &ifr6) < 0)
+        clib_unix_warning ("set address");
+
+      if (sockfd >= 0)
+        close (sockfd);
+    }
+  else
+    {
+      int sockfd = socket (AF_INET6, SOCK_STREAM, 0);
+      if (sockfd < 0)
+        clib_unix_warning ("get ifindex socket");
+
+      if (ioctl (sockfd, SIOGIFINDEX, &ifr) < 0)
+        clib_unix_warning ("get ifindex");
+
+      ifr6.ifr6_ifindex = ifr.ifr_ifindex;
+      ifr6.ifr6_prefixlen = address_length;
+      clib_memcpy (&ifr6.ifr6_addr, address, 16);
+
+      if (ioctl (sockfd, SIOCDIFADDR, &ifr6) < 0)
+        clib_unix_warning ("del address");
+
+      if (sockfd >= 0)
+        close (sockfd);
+
+      mhash_unset (&tm->subif_mhash, &subif_addr, 0 /* old value ptr */);
+      pool_put (tm->subifs, ap);
+    }
+}
+
+/**
+ * @brief TX the tun/tap frame
+ *
+ * @param *vm - vlib_main_t
+ * @param *node - vlib_node_runtime_t
+ * @param *frame - vlib_frame_t
+ *
+ */
+static void
+tuntap_punt_frame (vlib_main_t * vm,
+                   vlib_node_runtime_t * node,
+                   vlib_frame_t * frame)
+{
+  tuntap_tx (vm, node, frame);
+  vlib_frame_free (vm, node, frame);
+}
+
+/**
+ * @brief Free the tun/tap frame
+ *
+ * @param *vm - vlib_main_t
+ * @param *node - vlib_node_runtime_t
+ * @param *frame - vlib_frame_t
+ *
+ */
+static void
+tuntap_nopunt_frame (vlib_main_t * vm,
+                   vlib_node_runtime_t * node,
+                   vlib_frame_t * frame)
+{
+  u32 * buffers = vlib_frame_args (frame);
+  uword n_packets = frame->n_vectors;
+  vlib_buffer_free (vm, buffers, n_packets);
+  vlib_frame_free (vm, node, frame);
+}
+
+VNET_HW_INTERFACE_CLASS (tuntap_interface_class,static) = {
+  .name = "tuntap",
+  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
+};
+
+/**
+ * @brief Format tun/tap interface name
+ *
+ * @param *s - u8 - formatter string
+ * @param *args - va_list
+ *
+ * @return *s - u8 - formatted string
+ *
+ */
+static u8 * format_tuntap_interface_name (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+
+  s = format (s, "tuntap-%d", i);
+  return s;
+}
+
+/**
+ * @brief TX packet out tun/tap
+ *
+ * @param *vm - vlib_main_t
+ * @param *node - vlib_node_runtime_t
+ * @param *frame - vlib_frame_t
+ *
+ * @return n_buffers - uword - Packets transmitted
+ *
+ */
+static uword
+tuntap_intfc_tx (vlib_main_t * vm,
+		 vlib_node_runtime_t * node,
+		 vlib_frame_t * frame)
+{
+  tuntap_main_t * tm = &tuntap_main;
+  u32 * buffers = vlib_frame_args (frame);
+  uword n_buffers = frame->n_vectors;
+
+  /* Normal interface transmit happens only on the normal interface... */
+  if (tm->have_normal_interface)
+    return tuntap_tx (vm, node, frame);
+
+  vlib_buffer_free (vm, buffers, n_buffers);
+  return n_buffers;
+}
+
+VNET_DEVICE_CLASS (tuntap_dev_class,static) = {
+  .name = "tuntap",
+  .tx_function = tuntap_intfc_tx,
+  .format_device_name = format_tuntap_interface_name,
+};
+
+/**
+ * @brief tun/tap node init
+ *
+ * @param *vm - vlib_main_t
+ *
+ * @return error - clib_error_t
+ *
+ */
+static clib_error_t *
+tuntap_init (vlib_main_t * vm)
+{
+  clib_error_t * error;
+  ip4_main_t * im4 = &ip4_main;
+  ip6_main_t * im6 = &ip6_main;
+  ip4_add_del_interface_address_callback_t cb4;
+  ip6_add_del_interface_address_callback_t cb6;
+  tuntap_main_t * tm = &tuntap_main;
+
+  error = vlib_call_init_function (vm, ip4_init);
+  if (error)
+    return error;
+
+  mhash_init (&tm->subif_mhash, sizeof (u32), sizeof(subif_address_t));
+
+  cb4.function = tuntap_ip4_add_del_interface_address;
+  cb4.function_opaque = 0;
+  vec_add1 (im4->add_del_interface_address_callbacks, cb4);
+
+  cb6.function = tuntap_ip6_add_del_interface_address;
+  cb6.function_opaque = 0;
+  vec_add1 (im6->add_del_interface_address_callbacks, cb6);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (tuntap_init);
diff --git a/src/vnet/unix/tuntap.h b/src/vnet/unix/tuntap.h
new file mode 100644
index 00000000..d7f96cae
--- /dev/null
+++ b/src/vnet/unix/tuntap.h
@@ -0,0 +1,36 @@
+/*
+ *------------------------------------------------------------------
+ * tuntap.h - kernel stack (reverse) punt/inject path
+ *
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+/**
+ * @file
+ * @brief Call from VLIB_INIT_FUNCTION to set the Linux kernel inject node name.
+ */
+void register_tuntap_inject_node_name (char *name);
+
+int vnet_tap_connect (vlib_main_t * vm, u8 * intfc_name,
+                      u8 *hwaddr_arg, u32 * sw_if_indexp);
+int vnet_tap_connect_renumber (vlib_main_t * vm, u8 * intfc_name,
+                      u8 *hwaddr_arg, u32 * sw_if_indexp,
+                      u8 renumber, u32 custom_dev_instance);
+
+int vnet_tap_delete(vlib_main_t *vm, u32 sw_if_index);
+
+int vnet_tap_modify (vlib_main_t * vm, u32 orig_sw_if_index,
+                     u8 * intfc_name, u8 *hwaddr_arg,
+                     u32 * sw_if_indexp,
+                     u8 renumber, u32 custom_dev_instance);
diff --git a/src/vnet/vnet.h b/src/vnet/vnet.h
new file mode 100644
index 00000000..5a8ae858
--- /dev/null
+++ b/src/vnet/vnet.h
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * vnet.h: general networking definitions
+ *
+ * Copyright (c) 2011 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_vnet_vnet_h
+#define included_vnet_vnet_h
+
+#include <vppinfra/types.h>
+
+#include <vnet/unix/pcap.h>
+#include <vnet/buffer.h>
+#include <vnet/config.h>
+#include <vnet/interface.h>
+#include <vnet/rewrite.h>
+#include <vnet/api_errno.h>
+
+typedef struct vnet_main_t
+{
+  u32 local_interface_hw_if_index;
+  u32 local_interface_sw_if_index;
+
+  vnet_interface_main_t interface_main;
+
+  /* set up by constructors */
+  vnet_device_class_t *device_class_registrations;
+  vnet_hw_interface_class_t *hw_interface_class_registrations;
+    _vnet_interface_function_list_elt_t
+    * hw_interface_add_del_functions[VNET_ITF_FUNC_N_PRIO];
+    _vnet_interface_function_list_elt_t
+    * hw_interface_link_up_down_functions[VNET_ITF_FUNC_N_PRIO];
+    _vnet_interface_function_list_elt_t
+    * sw_interface_add_del_functions[VNET_ITF_FUNC_N_PRIO];
+    _vnet_interface_function_list_elt_t
+    * sw_interface_admin_up_down_functions[VNET_ITF_FUNC_N_PRIO];
+
+  uword *interface_tag_by_sw_if_index;
+
+  /*
+   * Last "api" error, preserved so we can issue reasonable diagnostics
+   * at or near the top of the food chain
+   */
+  vnet_api_error_t api_errno;
+
+  vlib_main_t *vlib_main;
+} vnet_main_t;
+
+vnet_main_t vnet_main;
+vnet_main_t **vnet_mains;
+
+#include <vnet/interface_funcs.h>
+#include <vnet/global_funcs.h>
+
+#endif /* included_vnet_vnet_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/vnet_all_api_h.h b/src/vnet/vnet_all_api_h.h
new file mode 100644
index 00000000..1b4d6c45
--- /dev/null
+++ b/src/vnet/vnet_all_api_h.h
@@ -0,0 +1,57 @@
+/*
+ *------------------------------------------------------------------
+ * vl_memory_api_h.h - memory API headers, in a specific order.
+ *
+ * Copyright (c) 2009-2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+/*
+ * Add to the bottom of the #include list, or elves will steal your
+ * keyboard in the middle of the night!
+ *
+ * Include current layer (2) last, or an artistic disagreement
+ * about message numbering will occur
+ */
+
+#ifndef included_from_layer_3
+#include <vlibmemory/vl_memory_api_h.h>
+#endif /* included_from_layer_3 */
+
+#include <vnet/devices/af_packet/af_packet.api.h>
+#include <vnet/devices/netmap/netmap.api.h>
+#include <vnet/devices/virtio/vhost_user.api.h>
+#include <vnet/gre/gre.api.h>
+#include <vnet/interface.api.h>
+#include <vnet/map/map.api.h>
+#include <vnet/l2/l2.api.h>
+#include <vnet/l2tp/l2tp.api.h>
+#include <vnet/span/span.api.h>
+#include <vnet/ip/ip.api.h>
+#include <vnet/unix/tap.api.h>
+#include <vnet/vxlan/vxlan.api.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.api.h>
+#include <vnet/bfd/bfd.api.h>
+#include <vnet/ipsec/ipsec.api.h>
+#include <vnet/ipsec-gre/ipsec_gre.api.h>
+#include <vnet/lisp-cp/lisp.api.h>
+#include <vnet/lisp-gpe/lisp_gpe.api.h>
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/vnet_msg_enum.h b/src/vnet/vnet_msg_enum.h
new file mode 100644
index 00000000..9899471e
--- /dev/null
+++ b/src/vnet/vnet_msg_enum.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vnet_msg_enum_h
+#define included_vnet_msg_enum_h
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum
+{
+  VL_ILLEGAL_MESSAGE_ID = 0,
+#include <vnet/vnet_all_api_h.h>
+  VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif /* included_vnet_msg_enum_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/vxlan-gpe/decap.c b/src/vnet/vxlan-gpe/decap.c
new file mode 100644
index 00000000..22ab4b62
--- /dev/null
+++ b/src/vnet/vxlan-gpe/decap.c
@@ -0,0 +1,733 @@
+/*
+ * decap.c - decapsulate VXLAN GPE
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ *  @file
+ *  @brief Functions for decapsulating VXLAN GPE tunnels
+ *
+*/
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+
+vlib_node_registration_t vxlan_gpe_input_node;
+
+/**
+ * @brief Struct for VXLAN GPE decap packet tracing
+ *
+ */
+typedef struct {
+  u32 next_index;
+  u32 tunnel_index;
+  u32 error;
+} vxlan_gpe_rx_trace_t;
+
+/**
+ * @brief Tracing function for VXLAN GPE packet decapsulation
+ *
+ * @param *s
+ * @param *args
+ *
+ * @return *s
+ *
+ */
+static u8 * format_vxlan_gpe_rx_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  vxlan_gpe_rx_trace_t * t = va_arg (*args, vxlan_gpe_rx_trace_t *);
+
+  if (t->tunnel_index != ~0)
+  {
+    s = format (s, "VXLAN-GPE: tunnel %d next %d error %d", t->tunnel_index,
+        t->next_index, t->error);
+  }
+  else
+  {
+    s = format (s, "VXLAN-GPE: no tunnel next %d error %d\n", t->next_index,
+        t->error);
+  }
+  return s;
+}
+
+/**
+ * @brief Tracing function for VXLAN GPE packet decapsulation including length
+ *
+ * @param *s
+ * @param *args
+ *
+ * @return *s
+ *
+ */
+static u8 * format_vxlan_gpe_with_length (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+
+
+  return s;
+}
+
+/**
+ * @brief Common processing for IPv4 and IPv6 VXLAN GPE decap dispatch functions
+ *
+ * It is worth noting that other than trivial UDP forwarding (transit), VXLAN GPE
+ * tunnels are "terminate local". This means that there is no "TX" interface for this
+ * decap case, so that field in the buffer_metadata can be "used for something else".
+ * The something else in this case is, for the IPv4/IPv6 inner-packet type case, the
+ * FIB index used to look up the inner-packet's adjacency.
+ *
+ *      vnet_buffer(b0)->sw_if_index[VLIB_TX] = t0->decap_fib_index;
+ *
+ * @param *vm
+ * @param *node
+ * @param *from_frame
+ * @param is_ip4
+ *
+ * @return from_frame->n_vectors
+ *
+ */
+always_inline uword
+vxlan_gpe_input (vlib_main_t * vm,
+                     vlib_node_runtime_t * node,
+                     vlib_frame_t * from_frame,
+					 u8 is_ip4)
+{
+  u32 n_left_from, next_index, *from, *to_next;
+  vxlan_gpe_main_t * ngm = &vxlan_gpe_main;
+  vnet_main_t * vnm = ngm->vnet_main;
+  vnet_interface_main_t * im = &vnm->interface_main;
+  u32 last_tunnel_index = ~0;
+  vxlan4_gpe_tunnel_key_t last_key4;
+  vxlan6_gpe_tunnel_key_t last_key6;
+  u32 pkts_decapsulated = 0;
+  u32 cpu_index = os_get_cpu_number ();
+  u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
+
+  if (is_ip4)
+      memset (&last_key4, 0xff, sizeof(last_key4));
+  else
+      memset (&last_key6, 0xff, sizeof(last_key6));
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+  stats_sw_if_index = node->runtime_data[0];
+  stats_n_packets = stats_n_bytes = 0;
+
+  while (n_left_from > 0)
+  {
+    u32 n_left_to_next;
+
+    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
+
+    while (n_left_from >= 4 && n_left_to_next >= 2)
+    {
+      u32 bi0, bi1;
+      vlib_buffer_t * b0, *b1;
+      u32 next0, next1;
+      ip4_vxlan_gpe_header_t * iuvn4_0, *iuvn4_1;
+      ip6_vxlan_gpe_header_t * iuvn6_0, *iuvn6_1;
+      uword * p0, *p1;
+      u32 tunnel_index0, tunnel_index1;
+      vxlan_gpe_tunnel_t * t0, *t1;
+      vxlan4_gpe_tunnel_key_t key4_0, key4_1;
+      vxlan6_gpe_tunnel_key_t key6_0, key6_1;
+      u32 error0, error1;
+      u32 sw_if_index0, sw_if_index1, len0, len1;
+
+      /* Prefetch next iteration. */
+      {
+        vlib_buffer_t * p2, *p3;
+
+        p2 = vlib_get_buffer (vm, from[2]);
+        p3 = vlib_get_buffer (vm, from[3]);
+
+        vlib_prefetch_buffer_header(p2, LOAD);
+        vlib_prefetch_buffer_header(p3, LOAD);
+
+        CLIB_PREFETCH(p2->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+        CLIB_PREFETCH(p3->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+      }
+
+      bi0 = from[0];
+      bi1 = from[1];
+      to_next[0] = bi0;
+      to_next[1] = bi1;
+      from += 2;
+      to_next += 2;
+      n_left_to_next -= 2;
+      n_left_from -= 2;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      if (is_ip4)
+      {
+        /* udp leaves current_data pointing at the vxlan-gpe header */
+        vlib_buffer_advance (b0, -(word) (sizeof(udp_header_t) + sizeof(ip4_header_t)));
+        vlib_buffer_advance (b1, -(word) (sizeof(udp_header_t) + sizeof(ip4_header_t)));
+
+        iuvn4_0 = vlib_buffer_get_current (b0);
+        iuvn4_1 = vlib_buffer_get_current (b1);
+
+        /* pop (ip, udp, vxlan) */
+        vlib_buffer_advance (b0, sizeof(*iuvn4_0));
+        vlib_buffer_advance (b1, sizeof(*iuvn4_1));
+      }
+      else
+      {
+        /* udp leaves current_data pointing at the vxlan-gpe header */
+        vlib_buffer_advance (b0, -(word) (sizeof(udp_header_t) + sizeof(ip6_header_t)));
+        vlib_buffer_advance (b1, -(word) (sizeof(udp_header_t) + sizeof(ip6_header_t)));
+
+        iuvn6_0 = vlib_buffer_get_current (b0);
+        iuvn6_1 = vlib_buffer_get_current (b1);
+
+        /* pop (ip, udp, vxlan) */
+        vlib_buffer_advance (b0, sizeof(*iuvn6_0));
+        vlib_buffer_advance (b1, sizeof(*iuvn6_1));
+      }
+
+      tunnel_index0 = ~0;
+      tunnel_index1 = ~0;
+      error0 = 0;
+      error1 = 0;
+
+      if (is_ip4)
+      {
+        next0 =
+            (iuvn4_0->vxlan.protocol < VXLAN_GPE_PROTOCOL_MAX)?
+            ngm->decap_next_node_list[iuvn4_0->vxlan.protocol]: \
+            VXLAN_GPE_INPUT_NEXT_DROP;
+        next1 =
+            (iuvn4_1->vxlan.protocol < VXLAN_GPE_PROTOCOL_MAX)?
+            ngm->decap_next_node_list[iuvn4_1->vxlan.protocol]: \
+            VXLAN_GPE_INPUT_NEXT_DROP;
+
+        key4_0.local = iuvn4_0->ip4.dst_address.as_u32;
+        key4_1.local = iuvn4_1->ip4.dst_address.as_u32;
+
+        key4_0.remote = iuvn4_0->ip4.src_address.as_u32;
+        key4_1.remote = iuvn4_1->ip4.src_address.as_u32;
+
+        key4_0.vni = iuvn4_0->vxlan.vni_res;
+        key4_1.vni = iuvn4_1->vxlan.vni_res;
+
+        key4_0.pad = 0;
+        key4_1.pad = 0;
+      }
+      else /* is_ip6 */
+      {
+        next0 = (iuvn6_0->vxlan.protocol < node->n_next_nodes) ?
+                iuvn6_0->vxlan.protocol : VXLAN_GPE_INPUT_NEXT_DROP;
+        next1 = (iuvn6_1->vxlan.protocol < node->n_next_nodes) ?
+                iuvn6_1->vxlan.protocol : VXLAN_GPE_INPUT_NEXT_DROP;
+
+        key6_0.local.as_u64[0] = iuvn6_0->ip6.dst_address.as_u64[0];
+        key6_0.local.as_u64[1] = iuvn6_0->ip6.dst_address.as_u64[1];
+        key6_1.local.as_u64[0] = iuvn6_1->ip6.dst_address.as_u64[0];
+        key6_1.local.as_u64[1] = iuvn6_1->ip6.dst_address.as_u64[1];
+
+        key6_0.remote.as_u64[0] = iuvn6_0->ip6.src_address.as_u64[0];
+        key6_0.remote.as_u64[1] = iuvn6_0->ip6.src_address.as_u64[1];
+        key6_1.remote.as_u64[0] = iuvn6_1->ip6.src_address.as_u64[0];
+        key6_1.remote.as_u64[1] = iuvn6_1->ip6.src_address.as_u64[1];
+
+        key6_0.vni = iuvn6_0->vxlan.vni_res;
+        key6_1.vni = iuvn6_1->vxlan.vni_res;
+      }
+
+      /* Processing packet 0*/
+      if (is_ip4)
+      {
+        /* Processing for key4_0 */
+        if (PREDICT_FALSE((key4_0.as_u64[0] != last_key4.as_u64[0])
+                || (key4_0.as_u64[1] != last_key4.as_u64[1])))
+        {
+          p0 = hash_get_mem(ngm->vxlan4_gpe_tunnel_by_key, &key4_0);
+
+          if (p0 == 0)
+          {
+            error0 = VXLAN_GPE_ERROR_NO_SUCH_TUNNEL;
+            goto trace0;
+          }
+
+          last_key4.as_u64[0] = key4_0.as_u64[0];
+          last_key4.as_u64[1] = key4_0.as_u64[1];
+          tunnel_index0 = last_tunnel_index = p0[0];
+        }
+        else
+          tunnel_index0 = last_tunnel_index;
+      }
+      else /* is_ip6 */
+      {
+        next0 =
+            (iuvn6_0->vxlan.protocol < VXLAN_GPE_PROTOCOL_MAX)?
+            ngm->decap_next_node_list[iuvn6_0->vxlan.protocol]: \
+            VXLAN_GPE_INPUT_NEXT_DROP;
+        next1 =
+            (iuvn6_1->vxlan.protocol < VXLAN_GPE_PROTOCOL_MAX)?
+            ngm->decap_next_node_list[iuvn6_1->vxlan.protocol]: \
+            VXLAN_GPE_INPUT_NEXT_DROP;
+
+        key6_0.local.as_u64[0] = iuvn6_0->ip6.dst_address.as_u64[0];
+        key6_0.local.as_u64[1] = iuvn6_0->ip6.dst_address.as_u64[1];
+        key6_1.local.as_u64[0] = iuvn6_1->ip6.dst_address.as_u64[0];
+        key6_1.local.as_u64[1] = iuvn6_1->ip6.dst_address.as_u64[1];
+
+        key6_0.remote.as_u64[0] = iuvn6_0->ip6.src_address.as_u64[0];
+        key6_0.remote.as_u64[1] = iuvn6_0->ip6.src_address.as_u64[1];
+        key6_1.remote.as_u64[0] = iuvn6_1->ip6.src_address.as_u64[0];
+        key6_1.remote.as_u64[1] = iuvn6_1->ip6.src_address.as_u64[1];
+
+        key6_0.vni = iuvn6_0->vxlan.vni_res;
+        key6_1.vni = iuvn6_1->vxlan.vni_res;
+
+        /* Processing for key6_0 */
+        if (PREDICT_FALSE(memcmp (&key6_0, &last_key6, sizeof(last_key6)) != 0))
+        {
+          p0 = hash_get_mem(ngm->vxlan6_gpe_tunnel_by_key, &key6_0);
+
+          if (p0 == 0)
+          {
+            error0 = VXLAN_GPE_ERROR_NO_SUCH_TUNNEL;
+            goto trace0;
+          }
+
+          memcpy (&last_key6, &key6_0, sizeof(key6_0));
+          tunnel_index0 = last_tunnel_index = p0[0];
+        }
+        else
+          tunnel_index0 = last_tunnel_index;
+      }
+
+      t0 = pool_elt_at_index(ngm->tunnels, tunnel_index0);
+
+
+      sw_if_index0 = t0->sw_if_index;
+      len0 = vlib_buffer_length_in_chain (vm, b0);
+
+      /* Required to make the l2 tag push / pop code work on l2 subifs */
+      vnet_update_l2_len (b0);
+
+      /**
+       * ip[46] lookup in the configured FIB
+       */
+      vnet_buffer(b0)->sw_if_index[VLIB_TX] = t0->decap_fib_index;
+
+      pkts_decapsulated++;
+      stats_n_packets += 1;
+      stats_n_bytes += len0;
+
+      if (PREDICT_FALSE(sw_if_index0 != stats_sw_if_index))
+      {
+        stats_n_packets -= 1;
+        stats_n_bytes -= len0;
+        if (stats_n_packets)
+          vlib_increment_combined_counter (
+              im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
+              cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
+        stats_n_packets = 1;
+        stats_n_bytes = len0;
+        stats_sw_if_index = sw_if_index0;
+      }
+
+      trace0: b0->error = error0 ? node->errors[error0] : 0;
+
+      if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+      {
+        vxlan_gpe_rx_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof(*tr));
+        tr->next_index = next0;
+        tr->error = error0;
+        tr->tunnel_index = tunnel_index0;
+      }
+
+      /* Process packet 1 */
+      if (is_ip4)
+      {
+        /* Processing for key4_1 */
+        if (PREDICT_FALSE(
+            (key4_1.as_u64[0] != last_key4.as_u64[0])
+                || (key4_1.as_u64[1] != last_key4.as_u64[1])))
+        {
+          p1 = hash_get_mem(ngm->vxlan4_gpe_tunnel_by_key, &key4_1);
+
+          if (p1 == 0)
+          {
+            error1 = VXLAN_GPE_ERROR_NO_SUCH_TUNNEL;
+            goto trace1;
+          }
+
+          last_key4.as_u64[0] = key4_1.as_u64[0];
+          last_key4.as_u64[1] = key4_1.as_u64[1];
+          tunnel_index1 = last_tunnel_index = p1[0];
+        }
+        else
+          tunnel_index1 = last_tunnel_index;
+      }
+      else /* is_ip6 */
+      {
+        /* Processing for key6_1 */
+        if (PREDICT_FALSE(memcmp (&key6_1, &last_key6, sizeof(last_key6)) != 0))
+        {
+          p1 = hash_get_mem(ngm->vxlan6_gpe_tunnel_by_key, &key6_1);
+
+          if (p1 == 0)
+          {
+            error1 = VXLAN_GPE_ERROR_NO_SUCH_TUNNEL;
+            goto trace1;
+          }
+
+          memcpy (&last_key6, &key6_1, sizeof(key6_1));
+          tunnel_index1 = last_tunnel_index = p1[0];
+        }
+        else
+          tunnel_index1 = last_tunnel_index;
+      }
+
+      t1 = pool_elt_at_index(ngm->tunnels, tunnel_index1);
+
+      sw_if_index1 = t1->sw_if_index;
+      len1 = vlib_buffer_length_in_chain (vm, b1);
+
+      /* Required to make the l2 tag push / pop code work on l2 subifs */
+      vnet_update_l2_len (b1);
+
+      /*
+       * ip[46] lookup in the configured FIB
+       */
+      vnet_buffer(b1)->sw_if_index[VLIB_TX] = t1->decap_fib_index;
+
+      pkts_decapsulated++;
+      stats_n_packets += 1;
+      stats_n_bytes += len1;
+
+      /* Batch stats increment on the same vxlan tunnel so counter
+       is not incremented per packet */
+      if (PREDICT_FALSE(sw_if_index1 != stats_sw_if_index))
+      {
+        stats_n_packets -= 1;
+        stats_n_bytes -= len1;
+        if (stats_n_packets)
+          vlib_increment_combined_counter (
+              im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
+              cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
+        stats_n_packets = 1;
+        stats_n_bytes = len1;
+        stats_sw_if_index = sw_if_index1;
+      }
+      vnet_buffer(b1)->sw_if_index[VLIB_TX] = t1->decap_fib_index;
+
+      trace1: b1->error = error1 ? node->errors[error1] : 0;
+
+      if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
+      {
+        vxlan_gpe_rx_trace_t *tr = vlib_add_trace (vm, node, b1, sizeof(*tr));
+        tr->next_index = next1;
+        tr->error = error1;
+        tr->tunnel_index = tunnel_index1;
+      }
+
+      vlib_validate_buffer_enqueue_x2(vm, node, next_index, to_next,
+                                      n_left_to_next, bi0, bi1, next0, next1);
+    }
+
+    while (n_left_from > 0 && n_left_to_next > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t * b0;
+      u32 next0;
+      ip4_vxlan_gpe_header_t * iuvn4_0;
+      ip6_vxlan_gpe_header_t * iuvn6_0;
+      uword * p0;
+      u32 tunnel_index0;
+      vxlan_gpe_tunnel_t * t0;
+      vxlan4_gpe_tunnel_key_t key4_0;
+      vxlan6_gpe_tunnel_key_t key6_0;
+      u32 error0;
+      u32 sw_if_index0, len0;
+
+      bi0 = from[0];
+      to_next[0] = bi0;
+      from += 1;
+      to_next += 1;
+      n_left_from -= 1;
+      n_left_to_next -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      if (is_ip4)
+      {
+        /* udp leaves current_data pointing at the vxlan-gpe header */
+        vlib_buffer_advance (
+            b0, -(word) (sizeof(udp_header_t) + sizeof(ip4_header_t)));
+
+        iuvn4_0 = vlib_buffer_get_current (b0);
+
+        /* pop (ip, udp, vxlan) */
+        vlib_buffer_advance (b0, sizeof(*iuvn4_0));
+      }
+      else
+      {
+        /* udp leaves current_data pointing at the vxlan-gpe header */
+        vlib_buffer_advance (
+            b0, -(word) (sizeof(udp_header_t) + sizeof(ip6_header_t)));
+
+        iuvn6_0 = vlib_buffer_get_current (b0);
+
+        /* pop (ip, udp, vxlan) */
+        vlib_buffer_advance (b0, sizeof(*iuvn6_0));
+      }
+
+      tunnel_index0 = ~0;
+      error0 = 0;
+
+      if (is_ip4)
+      {
+        next0 =
+            (iuvn4_0->vxlan.protocol < VXLAN_GPE_PROTOCOL_MAX)?
+            ngm->decap_next_node_list[iuvn4_0->vxlan.protocol]: \
+            VXLAN_GPE_INPUT_NEXT_DROP;
+
+        key4_0.local = iuvn4_0->ip4.dst_address.as_u32;
+        key4_0.remote = iuvn4_0->ip4.src_address.as_u32;
+        key4_0.vni = iuvn4_0->vxlan.vni_res;
+        key4_0.pad = 0;
+
+        /* Processing for key4_0 */
+        if (PREDICT_FALSE(
+            (key4_0.as_u64[0] != last_key4.as_u64[0])
+                || (key4_0.as_u64[1] != last_key4.as_u64[1])))
+        {
+          p0 = hash_get_mem(ngm->vxlan4_gpe_tunnel_by_key, &key4_0);
+
+          if (p0 == 0)
+          {
+            error0 = VXLAN_GPE_ERROR_NO_SUCH_TUNNEL;
+            goto trace00;
+          }
+
+          last_key4.as_u64[0] = key4_0.as_u64[0];
+          last_key4.as_u64[1] = key4_0.as_u64[1];
+          tunnel_index0 = last_tunnel_index = p0[0];
+        }
+        else
+          tunnel_index0 = last_tunnel_index;
+      }
+      else /* is_ip6 */
+      {
+        next0 =
+            (iuvn6_0->vxlan.protocol < VXLAN_GPE_PROTOCOL_MAX)?
+            ngm->decap_next_node_list[iuvn6_0->vxlan.protocol]: \
+            VXLAN_GPE_INPUT_NEXT_DROP;
+
+        key6_0.local.as_u64[0] = iuvn6_0->ip6.dst_address.as_u64[0];
+        key6_0.local.as_u64[1] = iuvn6_0->ip6.dst_address.as_u64[1];
+        key6_0.remote.as_u64[0] = iuvn6_0->ip6.src_address.as_u64[0];
+        key6_0.remote.as_u64[1] = iuvn6_0->ip6.src_address.as_u64[1];
+        key6_0.vni = iuvn6_0->vxlan.vni_res;
+
+        /* Processing for key6_0 */
+        if (PREDICT_FALSE(memcmp (&key6_0, &last_key6, sizeof(last_key6)) != 0))
+        {
+          p0 = hash_get_mem(ngm->vxlan6_gpe_tunnel_by_key, &key6_0);
+
+          if (p0 == 0)
+          {
+            error0 = VXLAN_GPE_ERROR_NO_SUCH_TUNNEL;
+            goto trace00;
+          }
+
+          memcpy (&last_key6, &key6_0, sizeof(key6_0));
+          tunnel_index0 = last_tunnel_index = p0[0];
+        }
+        else
+          tunnel_index0 = last_tunnel_index;
+      }
+
+      t0 = pool_elt_at_index(ngm->tunnels, tunnel_index0);
+
+
+      sw_if_index0 = t0->sw_if_index;
+      len0 = vlib_buffer_length_in_chain (vm, b0);
+
+      /* Required to make the l2 tag push / pop code work on l2 subifs */
+      vnet_update_l2_len (b0);
+
+      /*
+       * ip[46] lookup in the configured FIB
+       */
+      vnet_buffer(b0)->sw_if_index[VLIB_TX] = t0->decap_fib_index;
+
+      pkts_decapsulated++;
+      stats_n_packets += 1;
+      stats_n_bytes += len0;
+
+      /* Batch stats increment on the same vxlan-gpe tunnel so counter
+       is not incremented per packet */
+      if (PREDICT_FALSE(sw_if_index0 != stats_sw_if_index))
+      {
+        stats_n_packets -= 1;
+        stats_n_bytes -= len0;
+        if (stats_n_packets)
+          vlib_increment_combined_counter (
+              im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
+              cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
+        stats_n_packets = 1;
+        stats_n_bytes = len0;
+        stats_sw_if_index = sw_if_index0;
+      }
+
+      trace00: b0->error = error0 ? node->errors[error0] : 0;
+
+      if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+      {
+        vxlan_gpe_rx_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof(*tr));
+        tr->next_index = next0;
+        tr->error = error0;
+        tr->tunnel_index = tunnel_index0;
+      }
+      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
+                                      n_left_to_next, bi0, next0);
+    }
+
+    vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+  }
+  vlib_node_increment_counter (vm, vxlan_gpe_input_node.index,
+                               VXLAN_GPE_ERROR_DECAPSULATED, pkts_decapsulated);
+  /* Increment any remaining batch stats */
+  if (stats_n_packets)
+  {
+    vlib_increment_combined_counter (
+        im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX, cpu_index,
+        stats_sw_if_index, stats_n_packets, stats_n_bytes);
+    node->runtime_data[0] = stats_sw_if_index;
+  }
+  return from_frame->n_vectors;
+}
+
+/**
+ * @brief Graph processing dispatch function for IPv4 VXLAN GPE
+ *
+ * @node vxlan4-gpe-input
+ * @param *vm
+ * @param *node
+ * @param *from_frame
+ *
+ * @return from_frame->n_vectors
+ *
+ */
+static uword
+vxlan4_gpe_input (vlib_main_t * vm, vlib_node_runtime_t * node,
+                  vlib_frame_t * from_frame)
+{
+  return vxlan_gpe_input (vm, node, from_frame, /* is_ip4 */1);
+}
+
+
+void
+vxlan_gpe_register_decap_protocol (u8 protocol_id, uword next_node_index)
+{
+  vxlan_gpe_main_t *hm = &vxlan_gpe_main;
+  hm->decap_next_node_list[protocol_id] = next_node_index;
+  return;
+}
+
+void
+vxlan_gpe_unregister_decap_protocol (u8 protocol_id, uword next_node_index)
+{
+  vxlan_gpe_main_t *hm = &vxlan_gpe_main;
+  hm->decap_next_node_list[protocol_id] = VXLAN_GPE_INPUT_NEXT_DROP;
+  return;
+}
+
+
+/**
+ * @brief Graph processing dispatch function for IPv6 VXLAN GPE
+ *
+ * @node vxlan6-gpe-input
+ * @param *vm
+ * @param *node
+ * @param *from_frame
+ *
+ * @return from_frame->n_vectors - uword
+ *
+ */
+static uword
+vxlan6_gpe_input (vlib_main_t * vm, vlib_node_runtime_t * node,
+                  vlib_frame_t * from_frame)
+{
+  return vxlan_gpe_input (vm, node, from_frame, /* is_ip4 */0);
+}
+
+/**
+ * @brief VXLAN GPE error strings
+ */
+static char * vxlan_gpe_error_strings[] = {
+#define vxlan_gpe_error(n,s) s,
+#include <vnet/vxlan-gpe/vxlan_gpe_error.def>
+#undef vxlan_gpe_error
+#undef _
+};
+
+VLIB_REGISTER_NODE (vxlan4_gpe_input_node) = {
+  .function = vxlan4_gpe_input,
+  .name = "vxlan4-gpe-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN(vxlan_gpe_error_strings),
+  .error_strings = vxlan_gpe_error_strings,
+
+  .n_next_nodes = VXLAN_GPE_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [VXLAN_GPE_INPUT_NEXT_##s] = n,
+    foreach_vxlan_gpe_input_next
+#undef _
+  },
+
+  .format_buffer = format_vxlan_gpe_with_length,
+  .format_trace = format_vxlan_gpe_rx_trace,
+  // $$$$ .unformat_buffer = unformat_vxlan_gpe_header,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (vxlan4_gpe_input_node, vxlan4_gpe_input);
+
+VLIB_REGISTER_NODE (vxlan6_gpe_input_node) = {
+  .function = vxlan6_gpe_input,
+  .name = "vxlan6-gpe-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN(vxlan_gpe_error_strings),
+  .error_strings = vxlan_gpe_error_strings,
+
+  .n_next_nodes = VXLAN_GPE_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [VXLAN_GPE_INPUT_NEXT_##s] = n,
+    foreach_vxlan_gpe_input_next
+#undef _
+  },
+
+  .format_buffer = format_vxlan_gpe_with_length,
+  .format_trace = format_vxlan_gpe_rx_trace,
+  // $$$$ .unformat_buffer = unformat_vxlan_gpe_header,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (vxlan6_gpe_input_node, vxlan6_gpe_input);
diff --git a/src/vnet/vxlan-gpe/dir.dox b/src/vnet/vxlan-gpe/dir.dox
new file mode 100644
index 00000000..c154733b
--- /dev/null
+++ b/src/vnet/vxlan-gpe/dir.dox
@@ -0,0 +1,32 @@
+/*
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ @dir
+ @brief VXLAN GPE 
+
+ Based on IETF: draft-quinn-vxlan-gpe-03.txt
+
+Abstract
+
+   This draft describes extending Virtual eXtensible Local Area Network
+   (VXLAN), via changes to the VXLAN header, with three new
+   capabilities: support for multi-protocol encapsulation, operations,
+   administration and management (OAM) signaling and explicit
+   versioning.
+
+ See file: vxlan-gpe-rfc.txt 
+ 
+*/
\ No newline at end of file
diff --git a/src/vnet/vxlan-gpe/encap.c b/src/vnet/vxlan-gpe/encap.c
new file mode 100644
index 00000000..3a486e56
--- /dev/null
+++ b/src/vnet/vxlan-gpe/encap.c
@@ -0,0 +1,388 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ *  @file
+ *  @brief Functions for encapsulating VXLAN GPE tunnels
+ *
+*/
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+
+/** Statistics (not really errors) */
+#define foreach_vxlan_gpe_encap_error    \
+_(ENCAPSULATED, "good packets encapsulated")
+
+/**
+ * @brief VXLAN GPE encap error strings
+ */
+static char * vxlan_gpe_encap_error_strings[] = {
+#define _(sym,string) string,
+  foreach_vxlan_gpe_encap_error
+#undef _
+};
+
+/**
+ * @brief Struct for VXLAN GPE errors/counters
+ */
+typedef enum {
+#define _(sym,str) VXLAN_GPE_ENCAP_ERROR_##sym,
+    foreach_vxlan_gpe_encap_error
+#undef _
+    VXLAN_GPE_ENCAP_N_ERROR,
+} vxlan_gpe_encap_error_t;
+
+/**
+ * @brief Struct for tracing VXLAN GPE encapsulated packets
+ */
+typedef struct {
+  u32 tunnel_index;
+} vxlan_gpe_encap_trace_t;
+
+/**
+ * @brief Trace of packets encapsulated in VXLAN GPE
+ *
+ * @param *s
+ * @param *args
+ *
+ * @return *s
+ *
+ */
+u8 * format_vxlan_gpe_encap_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  vxlan_gpe_encap_trace_t * t
+      = va_arg (*args, vxlan_gpe_encap_trace_t *);
+
+  s = format (s, "VXLAN-GPE-ENCAP: tunnel %d", t->tunnel_index);
+  return s;
+}
+
+/**
+ * @brief Instantiates UDP + VXLAN-GPE header then set next node to IP4|6 lookup
+ *
+ * @param *ngm
+ * @param *b0
+ * @param *t0 contains rewrite header
+ * @param *next0 relative index of next dispatch function (next node)
+ * @param is_v4 Is this IPv4? (or IPv6)
+ *
+ */
+always_inline void
+vxlan_gpe_encap_one_inline (vxlan_gpe_main_t * ngm, vlib_buffer_t * b0,
+                            vxlan_gpe_tunnel_t * t0, u32 * next0,
+                            u8 is_v4)
+{
+  ASSERT(sizeof(ip4_vxlan_gpe_header_t) == 36);
+  ASSERT(sizeof(ip6_vxlan_gpe_header_t) == 56);
+
+  ip_udp_encap_one (ngm->vlib_main, b0, t0->rewrite, t0->rewrite_size, is_v4);
+  next0[0] = t0->encap_next_node;
+}
+
+/**
+ * @brief Instantiates UDP + VXLAN-GPE header then set next node to IP4|6 lookup for two packets
+ *
+ * @param *ngm
+ * @param *b0 Packet0
+ * @param *b1 Packet1
+ * @param *t0 contains rewrite header for Packet0
+ * @param *t1 contains rewrite header for Packet1
+ * @param *next0 relative index of next dispatch function (next node) for Packet0
+ * @param *next1 relative index of next dispatch function (next node) for Packet1
+ * @param is_v4 Is this IPv4? (or IPv6)
+ *
+ */
+always_inline void
+vxlan_gpe_encap_two_inline (vxlan_gpe_main_t * ngm, vlib_buffer_t * b0,
+                            vlib_buffer_t * b1, vxlan_gpe_tunnel_t * t0,
+                            vxlan_gpe_tunnel_t * t1, u32 * next0,
+                            u32 * next1, u8 is_v4)
+{
+  ASSERT(sizeof(ip4_vxlan_gpe_header_t) == 36);
+  ASSERT(sizeof(ip6_vxlan_gpe_header_t) == 56);
+
+  ip_udp_encap_one (ngm->vlib_main, b0, t0->rewrite, t0->rewrite_size, is_v4);
+  ip_udp_encap_one (ngm->vlib_main, b1, t1->rewrite, t1->rewrite_size, is_v4);
+  next0[0] = next1[0] = t0->encap_next_node;
+}
+
+/**
+ * @brief Common processing for IPv4 and IPv6 VXLAN GPE encap dispatch functions
+ *
+ * It is worth noting that other than trivial UDP forwarding (transit), VXLAN GPE
+ * tunnels are "establish local". This means that we don't have a TX interface as yet
+ * as we need to look up where the outer-header dest is. By setting the TX index in the
+ * buffer metadata to the encap FIB, we can do a lookup to get the adjacency and real TX.
+ *
+ *      vnet_buffer(b0)->sw_if_index[VLIB_TX] = t0->encap_fib_index;
+ *
+ * @node vxlan-gpe-input
+ * @param *vm
+ * @param *node
+ * @param *from_frame
+ *
+ * @return from_frame->n_vectors
+ *
+ */
+static uword
+vxlan_gpe_encap (vlib_main_t * vm,
+               vlib_node_runtime_t * node,
+               vlib_frame_t * from_frame)
+{
+  u32 n_left_from, next_index, *from, *to_next;
+  vxlan_gpe_main_t * ngm = &vxlan_gpe_main;
+  vnet_main_t * vnm = ngm->vnet_main;
+  vnet_interface_main_t * im = &vnm->interface_main;
+  u32 pkts_encapsulated = 0;
+  u32 cpu_index = os_get_cpu_number ();
+  u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+  stats_sw_if_index = node->runtime_data[0];
+  stats_n_packets = stats_n_bytes = 0;
+
+  while (n_left_from > 0)
+  {
+    u32 n_left_to_next;
+
+    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
+
+    while (n_left_from >= 4 && n_left_to_next >= 2)
+    {
+      u32 bi0, bi1;
+      vlib_buffer_t * b0, *b1;
+      u32 next0, next1;
+      u32 sw_if_index0, sw_if_index1, len0, len1;
+      vnet_hw_interface_t * hi0, *hi1;
+      vxlan_gpe_tunnel_t * t0, *t1;
+      u8 is_ip4_0, is_ip4_1;
+
+      next0 = next1 = VXLAN_GPE_ENCAP_NEXT_IP4_LOOKUP;
+
+      /* Prefetch next iteration. */
+      {
+        vlib_buffer_t * p2, *p3;
+
+        p2 = vlib_get_buffer (vm, from[2]);
+        p3 = vlib_get_buffer (vm, from[3]);
+
+        vlib_prefetch_buffer_header(p2, LOAD);
+        vlib_prefetch_buffer_header(p3, LOAD);
+
+        CLIB_PREFETCH(p2->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+        CLIB_PREFETCH(p3->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+      }
+
+      bi0 = from[0];
+      bi1 = from[1];
+      to_next[0] = bi0;
+      to_next[1] = bi1;
+      from += 2;
+      to_next += 2;
+      n_left_to_next -= 2;
+      n_left_from -= 2;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      /* 1-wide cache? */
+      sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_TX];
+      sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_TX];
+      hi0 = vnet_get_sup_hw_interface (vnm, vnet_buffer(b0)->sw_if_index[VLIB_TX]);
+      hi1 = vnet_get_sup_hw_interface (vnm, vnet_buffer(b1)->sw_if_index[VLIB_TX]);
+
+      t0 = pool_elt_at_index(ngm->tunnels, hi0->dev_instance);
+      t1 = pool_elt_at_index(ngm->tunnels, hi1->dev_instance);
+
+      is_ip4_0 = (t0->flags & VXLAN_GPE_TUNNEL_IS_IPV4);
+      is_ip4_1 = (t1->flags & VXLAN_GPE_TUNNEL_IS_IPV4);
+
+      if (PREDICT_TRUE(is_ip4_0 == is_ip4_1))
+      {
+        vxlan_gpe_encap_two_inline (ngm, b0, b1, t0, t1, &next0, &next1,is_ip4_0);
+      }
+      else
+      {
+        vxlan_gpe_encap_one_inline (ngm, b0, t0, &next0, is_ip4_0);
+        vxlan_gpe_encap_one_inline (ngm, b1, t1, &next1, is_ip4_1);
+      }
+
+      /* Reset to look up tunnel partner in the configured FIB */
+      vnet_buffer(b0)->sw_if_index[VLIB_TX] = t0->encap_fib_index;
+      vnet_buffer(b1)->sw_if_index[VLIB_TX] = t1->encap_fib_index;
+      vnet_buffer(b0)->sw_if_index[VLIB_RX] = sw_if_index0;
+      vnet_buffer(b1)->sw_if_index[VLIB_RX] = sw_if_index1;
+      pkts_encapsulated += 2;
+
+      len0 = vlib_buffer_length_in_chain (vm, b0);
+      len1 = vlib_buffer_length_in_chain (vm, b0);
+      stats_n_packets += 2;
+      stats_n_bytes += len0 + len1;
+
+      /* Batch stats increment on the same vxlan tunnel so counter is not
+       incremented per packet. Note stats are still incremented for deleted
+       and admin-down tunnel where packets are dropped. It is not worthwhile
+       to check for this rare case and affect normal path performance. */
+      if (PREDICT_FALSE((sw_if_index0 != stats_sw_if_index)
+              || (sw_if_index1 != stats_sw_if_index)))
+      {
+        stats_n_packets -= 2;
+        stats_n_bytes -= len0 + len1;
+        if (sw_if_index0 == sw_if_index1)
+        {
+          if (stats_n_packets)
+            vlib_increment_combined_counter (
+                im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
+                cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
+          stats_sw_if_index = sw_if_index0;
+          stats_n_packets = 2;
+          stats_n_bytes = len0 + len1;
+        }
+        else
+        {
+          vlib_increment_combined_counter (
+              im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
+              cpu_index, sw_if_index0, 1, len0);
+          vlib_increment_combined_counter (
+              im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
+              cpu_index, sw_if_index1, 1, len1);
+        }
+      }
+
+      if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+      {
+        vxlan_gpe_encap_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof(*tr));
+        tr->tunnel_index = t0 - ngm->tunnels;
+      }
+
+      if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
+      {
+        vxlan_gpe_encap_trace_t *tr = vlib_add_trace (vm, node, b1,
+                                                      sizeof(*tr));
+        tr->tunnel_index = t1 - ngm->tunnels;
+      }
+
+      vlib_validate_buffer_enqueue_x2(vm, node, next_index, to_next,
+                                      n_left_to_next, bi0, bi1, next0, next1);
+    }
+
+    while (n_left_from > 0 && n_left_to_next > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t * b0;
+      u32 next0 = VXLAN_GPE_ENCAP_NEXT_IP4_LOOKUP;
+      u32 sw_if_index0, len0;
+      vnet_hw_interface_t * hi0;
+      vxlan_gpe_tunnel_t * t0;
+      u8 is_ip4_0;
+
+      bi0 = from[0];
+      to_next[0] = bi0;
+      from += 1;
+      to_next += 1;
+      n_left_from -= 1;
+      n_left_to_next -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      /* 1-wide cache? */
+      sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_TX];
+      hi0 = vnet_get_sup_hw_interface (vnm, vnet_buffer(b0)->sw_if_index[VLIB_TX]);
+
+      t0 = pool_elt_at_index(ngm->tunnels, hi0->dev_instance);
+
+      is_ip4_0 = (t0->flags & VXLAN_GPE_TUNNEL_IS_IPV4);
+
+      vxlan_gpe_encap_one_inline (ngm, b0, t0, &next0, is_ip4_0);
+
+      /* Reset to look up tunnel partner in the configured FIB */
+      vnet_buffer(b0)->sw_if_index[VLIB_TX] = t0->encap_fib_index;
+      vnet_buffer(b0)->sw_if_index[VLIB_RX] = sw_if_index0;
+      pkts_encapsulated++;
+
+      len0 = vlib_buffer_length_in_chain (vm, b0);
+      stats_n_packets += 1;
+      stats_n_bytes += len0;
+
+      /* Batch stats increment on the same vxlan tunnel so counter is not
+       *  incremented per packet. Note stats are still incremented for deleted
+       *  and admin-down tunnel where packets are dropped. It is not worthwhile
+       *  to check for this rare case and affect normal path performance. */
+      if (PREDICT_FALSE(sw_if_index0 != stats_sw_if_index))
+      {
+        stats_n_packets -= 1;
+        stats_n_bytes -= len0;
+        if (stats_n_packets)
+          vlib_increment_combined_counter (
+              im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
+              cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
+        stats_n_packets = 1;
+        stats_n_bytes = len0;
+        stats_sw_if_index = sw_if_index0;
+      }
+      if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+      {
+        vxlan_gpe_encap_trace_t *tr = vlib_add_trace (vm, node, b0,
+                                                      sizeof(*tr));
+        tr->tunnel_index = t0 - ngm->tunnels;
+      }
+      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
+                                      n_left_to_next, bi0, next0);
+    }
+
+    vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+  }
+  vlib_node_increment_counter (vm, node->node_index,
+                               VXLAN_GPE_ENCAP_ERROR_ENCAPSULATED,
+                               pkts_encapsulated);
+  /* Increment any remaining batch stats */
+  if (stats_n_packets)
+  {
+    vlib_increment_combined_counter (
+        im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX, cpu_index,
+        stats_sw_if_index, stats_n_packets, stats_n_bytes);
+    node->runtime_data[0] = stats_sw_if_index;
+  }
+
+  return from_frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (vxlan_gpe_encap_node) = {
+  .function = vxlan_gpe_encap,
+  .name = "vxlan-gpe-encap",
+  .vector_size = sizeof (u32),
+  .format_trace = format_vxlan_gpe_encap_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(vxlan_gpe_encap_error_strings),
+  .error_strings = vxlan_gpe_encap_error_strings,
+
+  .n_next_nodes = VXLAN_GPE_ENCAP_N_NEXT,
+
+  .next_nodes = {
+    [VXLAN_GPE_ENCAP_NEXT_IP4_LOOKUP] = "ip4-lookup",
+    [VXLAN_GPE_ENCAP_NEXT_IP6_LOOKUP] = "ip6-lookup",
+    [VXLAN_GPE_ENCAP_NEXT_DROP] = "error-drop",
+  },
+};
+
diff --git a/src/vnet/vxlan-gpe/vxlan-gpe-rfc.txt b/src/vnet/vxlan-gpe/vxlan-gpe-rfc.txt
new file mode 100644
index 00000000..35cee50f
--- /dev/null
+++ b/src/vnet/vxlan-gpe/vxlan-gpe-rfc.txt
@@ -0,0 +1,868 @@
+Network Working Group                                           P. Quinn
+Internet-Draft                                       Cisco Systems, Inc.
+Intended status: Experimental                                 P. Agarwal
+Expires: January 4, 2015                                        Broadcom
+                                                             R. Fernando
+                                                              L. Kreeger
+                                                                D. Lewis
+                                                                F. Maino
+                                                                M. Smith
+                                                                N. Yadav
+                                                     Cisco Systems, Inc.
+                                                                 L. Yong
+                                                              Huawei USA
+                                                                   X. Xu
+                                                     Huawei Technologies
+                                                                U. Elzur
+                                                                   Intel
+                                                                 P. Garg
+                                                               Microsoft
+                                                            July 3, 2014
+
+
+                  Generic Protocol Extension for VXLAN
+                      draft-quinn-vxlan-gpe-03.txt
+
+Abstract
+
+   This draft describes extending Virtual eXtensible Local Area Network
+   (VXLAN), via changes to the VXLAN header, with three new
+   capabilities: support for multi-protocol encapsulation, operations,
+   administration and management (OAM) signaling and explicit
+   versioning.
+
+Status of this Memo
+
+   This Internet-Draft is submitted in full conformance with the
+   provisions of BCP 78 and BCP 79.
+
+   Internet-Drafts are working documents of the Internet Engineering
+   Task Force (IETF).  Note that other groups may also distribute
+   working documents as Internet-Drafts.  The list of current Internet-
+   Drafts is at http://datatracker.ietf.org/drafts/current/.
+
+   Internet-Drafts are draft documents valid for a maximum of six months
+   and may be updated, replaced, or obsoleted by other documents at any
+   time.  It is inappropriate to use Internet-Drafts as reference
+   material or to cite them other than as "work in progress."
+
+
+
+
+Quinn, et al.            Expires January 4, 2015                [Page 1]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+   This Internet-Draft will expire on January 4, 2015.
+
+Copyright Notice
+
+   Copyright (c) 2014 IETF Trust and the persons identified as the
+   document authors.  All rights reserved.
+
+   This document is subject to BCP 78 and the IETF Trust's Legal
+   Provisions Relating to IETF Documents
+   (http://trustee.ietf.org/license-info) in effect on the date of
+   publication of this document.  Please review these documents
+   carefully, as they describe your rights and restrictions with respect
+   to this document.  Code Components extracted from this document must
+   include Simplified BSD License text as described in Section 4.e of
+   the Trust Legal Provisions and are provided without warranty as
+   described in the Simplified BSD License.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Quinn, et al.            Expires January 4, 2015                [Page 2]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+Table of Contents
+
+   1.  Introduction . . . . . . . . . . . . . . . . . . . . . . . . .  4
+   2.  VXLAN Without Protocol Extension . . . . . . . . . . . . . . .  5
+   3.  Generic Protocol Extension VXLAN (VXLAN-gpe) . . . . . . . . .  6
+     3.1.  Multi Protocol Support . . . . . . . . . . . . . . . . . .  6
+     3.2.  OAM Support  . . . . . . . . . . . . . . . . . . . . . . .  7
+     3.3.  Version Bits . . . . . . . . . . . . . . . . . . . . . . .  7
+   4.  Backward Compatibility . . . . . . . . . . . . . . . . . . . .  8
+     4.1.  VXLAN VTEP to VXLAN-gpe VTEP . . . . . . . . . . . . . . .  8
+     4.2.  VXLAN-gpe VTEP to VXLAN VTEP . . . . . . . . . . . . . . .  8
+     4.3.  VXLAN-gpe UDP Ports  . . . . . . . . . . . . . . . . . . .  8
+     4.4.  VXLAN-gpe and Encapsulated IP Header Fields  . . . . . . .  8
+   5.  VXLAN-gpe Examples . . . . . . . . . . . . . . . . . . . . . .  9
+   6.  Security Considerations  . . . . . . . . . . . . . . . . . . . 11
+   7.  Acknowledgments  . . . . . . . . . . . . . . . . . . . . . . . 12
+   8.  IANA Considerations  . . . . . . . . . . . . . . . . . . . . . 13
+     8.1.  UDP Port . . . . . . . . . . . . . . . . . . . . . . . . . 13
+     8.2.  VXLAN-gpe Next Protocol  . . . . . . . . . . . . . . . . . 13
+     8.3.  VXLAN-gpe Reserved Bits  . . . . . . . . . . . . . . . . . 13
+   9.  References . . . . . . . . . . . . . . . . . . . . . . . . . . 14
+     9.1.  Normative References . . . . . . . . . . . . . . . . . . . 14
+     9.2.  Informative References . . . . . . . . . . . . . . . . . . 14
+   Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . . 15
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Quinn, et al.            Expires January 4, 2015                [Page 3]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+1.  Introduction
+
+   Virtual eXtensible Local Area Network [VXLAN] defines an
+   encapsulation format that encapsulates Ethernet frames in an outer
+   UDP/IP transport.  As data centers evolve, the need to carry other
+   protocols encapsulated in an IP packet is required, as well as the
+   need to provide increased visibility and diagnostic capabilities
+   within the overlay.  The VXLAN header does not specify the protocol
+   being encapsulated and therefore is currently limited to
+   encapsulating only Ethernet frame payload, nor does it provide the
+   ability to define OAM protocols.  Rather than defining yet another
+   encapsulation, VXLAN is extended to provide protocol typing and OAM
+   capabilities.
+
+   This document describes extending VXLAN via the following changes:
+
+   Next Protocol Bit (P bit):  A reserved flag bit is allocated, and set
+      in the VXLAN-gpe header to indicate that a next protocol field is
+      present.
+
+   OAM Flag Bit (O bit):  A reserved flag bit is allocated, and set in
+      the VXLAN-gpe header, to indicate that the packet is an OAM
+      packet.
+
+   Version:  Two reserved bits are allocated, and set in the VXLAN-gpe
+      header, to indicate VXLAN-gpe protocol version.
+
+   Next Protocol:  A 8 bit next protocol field is present in the VXLAN-
+      gpe header.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Quinn, et al.            Expires January 4, 2015                [Page 4]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+2.  VXLAN Without Protocol Extension
+
+   As described in the introduction, the VXLAN header has no protocol
+   identifier that indicates the type of payload being carried by VXLAN.
+   Because of this, VXLAN is limited to an Ethernet payload.
+   Furthermore, the VXLAN header has no mechanism to signal OAM packets.
+
+   The VXLAN header defines bits 0-7 as flags (some defined, some
+   reserved), the VXLAN network identifier (VNI) field and several
+   reserved bits.  The flags provide flexibility to define how the
+   reserved bits can be used to change the definition of the VXLAN
+   header.
+
+
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |R|R|R|R|I|R|R|R|            Reserved                           |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                VXLAN Network Identifier (VNI) |   Reserved    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+                          Figure 1: VXLAN Header
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Quinn, et al.            Expires January 4, 2015                [Page 5]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+3.  Generic Protocol Extension VXLAN (VXLAN-gpe)
+
+3.1.  Multi Protocol Support
+
+   This draft defines the following two changes to the VXLAN header in
+   order to support multi-protocol encapsulation:
+
+   P Bit:  Flag bit 5 is defined as the Next Protocol bit.  The P bit
+      MUST be set to 1 to indicate the presence of the 8 bit next
+      protocol field.
+
+      P = 0 indicates that the payload MUST conform to VXLAN as defined
+      in [VXLAN].
+
+      Flag bit 5 was chosen as the P bit because this flag bit is
+      currently reserved in VXLAN.
+
+   Next Protocol Field:  The lower 8 bits of the first word are used to
+      carry a next protocol.  This next protocol field contains the
+      protocol of the encapsulated payload packet.  A new protocol
+      registry will be requested from IANA.
+
+      This draft defines the following Next Protocol values:
+
+      0x1 : IPv4
+      0x2 : IPv6
+      0x3 : Ethernet
+      0x4 : Network Service Header [NSH]
+
+
+
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |R|R|R|R|I|P|R|R|   Reserved                    |Next Protocol  |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                VXLAN Network Identifier (VNI) |   Reserved    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+
+                     Figure 2: VXLAN-gpe Next Protocol
+
+
+
+
+
+
+
+
+Quinn, et al.            Expires January 4, 2015                [Page 6]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+3.2.  OAM Support
+
+   Flag bit 7 is defined as the O bit.  When the O bit is set to 1, the
+   packet is an OAM packet and OAM processing MUST occur.  The OAM
+   protocol details are out of scope for this document.  As with the
+   P-bit, bit 7 is currently a reserved flag in VXLAN.
+
+
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |R|R|R|R|I|P|R|O|   Reserved                    |Next Protocol  |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                VXLAN Network Identifier (VNI) |   Reserved    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+
+                        Figure 3: VXLAN-gpe OAM Bit
+
+3.3.  Version Bits
+
+   VXLAN-gpe bits 8 and 9 are defined as version bits.  These bits are
+   reserved in VXLAN.  The version field is used to ensure backward
+   compatibility going forward with future VXLAN-gpe updates.
+
+   The initial version for VXLAN-gpe is 0.
+
+
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |R|R|R|R|I|P|R|O|Ver|   Reserved                |Next Protocol  |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                VXLAN Network Identifier (VNI) |   Reserved    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+
+
+
+                     Figure 4: VXLAN-gpe Version Bits
+
+
+
+
+
+
+
+Quinn, et al.            Expires January 4, 2015                [Page 7]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+4.  Backward Compatibility
+
+4.1.  VXLAN VTEP to VXLAN-gpe VTEP
+
+   As per VXLAN, reserved bits 5 and 7, VXLAN-gpe P and O-bits
+   respectively must be set to zero.  The remaining reserved bits must
+   be zero, including the VXLAN-gpe version field, bits 8 and 9.  The
+   encapsulated payload MUST be Ethernet.
+
+4.2.  VXLAN-gpe VTEP to VXLAN VTEP
+
+   A VXLAN-gpe VTEP MUST NOT encapsulate non-Ethernet frames to a VXLAN
+   VTEP.  When encapsulating Ethernet frames to a VXLAN VTEP, the VXLAN-
+   gpe VTEP will set the P bit to 0, the Next Protocol to 0 and use UDP
+   destination port 4789.  A VXLAN-gpe VTEP MUST also set O = 0 and Ver
+   = 0 when encapsulating Ethernet frames to VXLAN VTEP.  The receiving
+   VXLAN VTEP will threat this packet as a VXLAN packet.
+
+   A method for determining the capabilities of a VXLAN VTEP (gpe or
+   non-gpe) is out of the scope of this draft.
+
+4.3.  VXLAN-gpe UDP Ports
+
+   VXLAN-gpe uses a new UDP destination port (to be assigned by IANA)
+   when sending traffic to VXLAN-gpe VTEPs.
+
+4.4.  VXLAN-gpe and Encapsulated IP Header Fields
+
+   When encapsulating and decapsulating IPv4 and IPv6 packets, certain
+   fields, such as IPv4 Time to Live (TTL) from the inner IP header need
+   to be considered.  VXLAN-gpe IP encapsulation and decapsulation
+   utilizes the techniques described in [RFC6830], section 5.3.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Quinn, et al.            Expires January 4, 2015                [Page 8]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+5.  VXLAN-gpe Examples
+
+   This section provides three examples of protocols encapsulated using
+   the Generic Protocol Extension for VXLAN described in this document.
+
+
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |R|R|R|R|I|1|R|0|0|0|   Reserved                |    NP = IPv4  |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                VXLAN Network Identifier (VNI) |   Reserved    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |               Original IPv4 Packet                            |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+
+                       Figure 5: IPv4 and VXLAN-gpe
+
+
+
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |R|R|R|R|I|1|R|0|0|0|   Reserved                |  NP = IPv6    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                VXLAN Network Identifier (VNI) |   Reserved    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |               Original IPv6 Packet                            |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+
+                       Figure 6: IPv6 and VXLAN-gpe
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Quinn, et al.            Expires January 4, 2015                [Page 9]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |R|R|R|R|I|1|R|0|0|0|   Reserved                |NP = Ethernet  |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |                VXLAN Network Identifier (VNI) |   Reserved    |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |               Original Ethernet Frame                         |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+
+                     Figure 7: Ethernet and VXLAN-gpe
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Quinn, et al.            Expires January 4, 2015               [Page 10]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+6.  Security Considerations
+
+   VXLAN's security is focused on issues around L2 encapsulation into
+   L3.  With VXLAN-gpe, issues such as spoofing, flooding, and traffic
+   redirection are dependent on the particular protocol payload
+   encapsulated.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Quinn, et al.            Expires January 4, 2015               [Page 11]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+7.  Acknowledgments
+
+   A special thank you goes to Dino Farinacci for his guidance and
+   detailed review.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Quinn, et al.            Expires January 4, 2015               [Page 12]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+8.  IANA Considerations
+
+8.1.  UDP Port
+
+   A new UDP port will be requested from IANA.
+
+8.2.  VXLAN-gpe Next Protocol
+
+   IANA is requested to set up a registry of "Next Protocol".  These are
+   8-bit values.  Next Protocol values 0, 1, 2, 3 and 4 are defined in
+   this draft.  New values are assigned via Standards Action [RFC5226].
+
+              +---------------+-------------+---------------+
+              | Next Protocol | Description | Reference     |
+              +---------------+-------------+---------------+
+              | 0             | Reserved    | This document |
+              |               |             |               |
+              | 1             | IPv4        | This document |
+              |               |             |               |
+              | 2             | IPv6        | This document |
+              |               |             |               |
+              | 3             | Ethernet    | This document |
+              |               |             |               |
+              | 4             | NSH         | This document |
+              |               |             |               |
+              | 5..253        | Unassigned  |               |
+              +---------------+-------------+---------------+
+
+                                  Table 1
+
+8.3.  VXLAN-gpe Reserved Bits
+
+   There are ten bits at the beginning of the VXLAN-gpe header.  New
+   bits are assigned via Standards Action [RFC5226].
+
+   Bits 0-3 - Reserved
+   Bit 4 - Instance ID (I bit)
+   Bit 5 - Next Protocol (P bit)
+   Bit 6 - Reserved
+   Bit 7 - OAM (O bit)
+   Bits 8-9 - Version
+
+
+
+
+
+
+
+
+
+
+Quinn, et al.            Expires January 4, 2015               [Page 13]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+9.  References
+
+9.1.  Normative References
+
+   [RFC0768]  Postel, J., "User Datagram Protocol", STD 6, RFC 768,
+              August 1980.
+
+   [RFC0791]  Postel, J., "Internet Protocol", STD 5, RFC 791,
+              September 1981.
+
+   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
+              Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [RFC5226]  Narten, T. and H. Alvestrand, "Guidelines for Writing an
+              IANA Considerations Section in RFCs", BCP 26, RFC 5226,
+              May 2008.
+
+9.2.  Informative References
+
+   [NSH]      Quinn, P. and et al. , "Network Service Header", 2014.
+
+   [RFC1700]  Reynolds, J. and J. Postel, "Assigned Numbers", RFC 1700,
+              October 1994.
+
+   [RFC6830]  Farinacci, D., Fuller, V., Meyer, D., and D. Lewis, "The
+              Locator/ID Separation Protocol (LISP)", RFC 6830,
+              January 2013.
+
+   [VXLAN]    Dutt, D., Mahalingam, M., Duda, K., Agarwal, P., Kreeger,
+              L., Sridhar, T., Bursell, M., and C. Wright, "VXLAN: A
+              Framework for Overlaying Virtualized Layer 2 Networks over
+              Layer 3 Networks", 2013.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Quinn, et al.            Expires January 4, 2015               [Page 14]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+Authors' Addresses
+
+   Paul Quinn
+   Cisco Systems, Inc.
+
+   Email: paulq@cisco.com
+
+
+   Puneet Agarwal
+   Broadcom
+
+   Email: pagarwal@broadcom.com
+
+
+   Rex Fernando
+   Cisco Systems, Inc.
+
+   Email: rex@cisco.com
+
+
+   Larry Kreeger
+   Cisco Systems, Inc.
+
+   Email: kreeger@cisco.com
+
+
+   Darrel Lewis
+   Cisco Systems, Inc.
+
+   Email: darlewis@cisco.com
+
+
+   Fabio Maino
+   Cisco Systems, Inc.
+
+   Email: kreeger@cisco.com
+
+
+   Michael Smith
+   Cisco Systems, Inc.
+
+   Email: michsmit@cisco.com
+
+
+
+
+
+
+
+
+
+Quinn, et al.            Expires January 4, 2015               [Page 15]
+
+Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
+
+
+   Navindra Yadav
+   Cisco Systems, Inc.
+
+   Email: nyadav@cisco.com
+
+
+   Lucy Yong
+   Huawei USA
+
+   Email: lucy.yong@huawei.com
+
+
+   Xiaohu Xu
+   Huawei Technologies
+
+   Email: xuxiaohu@huawei.com
+
+
+   Uri Elzur
+   Intel
+
+   Email: uri.elzur@intel.com
+
+
+   Pankaj Garg
+   Microsoft
+
+   Email: Garg.Pankaj@microsoft.com
diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.api b/src/vnet/vxlan-gpe/vxlan_gpe.api
new file mode 100644
index 00000000..6c6973f8
--- /dev/null
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.api
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+define vxlan_gpe_add_del_tunnel
+{
+  u32 client_index;
+  u32 context;
+  u8 is_ipv6;
+  u8 local[16];
+  u8 remote[16];
+  u32 encap_vrf_id;
+  u32 decap_vrf_id;
+  u8 protocol;
+  u32 vni;
+  u8 is_add;
+};
+
+define vxlan_gpe_add_del_tunnel_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+};
+
+define vxlan_gpe_tunnel_dump
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+};
+
+define vxlan_gpe_tunnel_details
+{
+  u32 context;
+  u32 sw_if_index;
+  u8 local[16];
+  u8 remote[16];
+  u32 vni;
+  u8 protocol;
+  u32 encap_vrf_id;
+  u32 decap_vrf_id;
+  u8 is_ipv6;
+};
+
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
\ No newline at end of file
diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.c b/src/vnet/vxlan-gpe/vxlan_gpe.c
new file mode 100644
index 00000000..b97510c4
--- /dev/null
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.c
@@ -0,0 +1,659 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ *  @file
+ *  @brief Common utility functions for IPv4 and IPv6 VXLAN GPE tunnels
+ *
+*/
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <vnet/fib/fib.h>
+#include <vnet/ip/format.h>
+
+vxlan_gpe_main_t vxlan_gpe_main;
+
+/**
+ * @brief Tracing function for VXLAN GPE tunnel packets
+ *
+ * @param *s formatting string
+ * @param *args
+ *
+ * @return *s formatted string
+ *
+ */
+u8 * format_vxlan_gpe_tunnel (u8 * s, va_list * args)
+{
+  vxlan_gpe_tunnel_t * t = va_arg (*args, vxlan_gpe_tunnel_t *);
+  vxlan_gpe_main_t * gm = &vxlan_gpe_main;
+
+  s = format (s, "[%d] local: %U remote: %U ",
+              t - gm->tunnels,
+              format_ip46_address, &t->local, IP46_TYPE_ANY,
+              format_ip46_address, &t->remote, IP46_TYPE_ANY);
+
+  s = format (s, "  vxlan VNI %d ", t->vni);
+
+  switch (t->protocol)
+    {
+    case VXLAN_GPE_PROTOCOL_IP4:
+      s = format (s, "next-protocol ip4");
+      break;
+    case VXLAN_GPE_PROTOCOL_IP6:
+      s = format (s, "next-protocol ip6");
+      break;
+    case VXLAN_GPE_PROTOCOL_ETHERNET:
+      s = format (s, "next-protocol ethernet");
+      break;
+    case VXLAN_GPE_PROTOCOL_NSH:
+      s = format (s, "next-protocol nsh");
+      break;
+    default:
+      s = format (s, "next-protocol unknown %d", t->protocol);
+    }
+
+  s = format (s, " fibs: (encap %d, decap %d)",
+              t->encap_fib_index,
+              t->decap_fib_index);
+
+  return s;
+}
+
+/**
+ * @brief Naming for VXLAN GPE tunnel
+ *
+ * @param *s formatting string
+ * @param *args
+ *
+ * @return *s formatted string
+ *
+ */
+static u8 * format_vxlan_gpe_name (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  return format (s, "vxlan_gpe_tunnel%d", dev_instance);
+}
+
+static uword dummy_interface_tx (vlib_main_t * vm,
+                                 vlib_node_runtime_t * node,
+                                 vlib_frame_t * frame)
+{
+  clib_warning ("you shouldn't be here, leaking buffers...");
+  return frame->n_vectors;
+}
+
+/**
+ * @brief CLI function for VXLAN GPE admin up/down
+ *
+ * @param *vnm
+ * @param hw_if_index
+ * @param flag
+ *
+ * @return *rc
+ *
+ */
+static clib_error_t *
+vxlan_gpe_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+  if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+    vnet_hw_interface_set_flags (vnm, hw_if_index, VNET_HW_INTERFACE_FLAG_LINK_UP);
+  else
+    vnet_hw_interface_set_flags (vnm, hw_if_index, 0);
+
+  return 0;
+}
+
+VNET_DEVICE_CLASS (vxlan_gpe_device_class,static) = {
+  .name = "VXLAN_GPE",
+  .format_device_name = format_vxlan_gpe_name,
+  .format_tx_trace = format_vxlan_gpe_encap_trace,
+  .tx_function = dummy_interface_tx,
+  .admin_up_down_function = vxlan_gpe_interface_admin_up_down,
+};
+
+
+/**
+ * @brief Formatting function for tracing VXLAN GPE with length
+ *
+ * @param *s
+ * @param *args
+ *
+ * @return *s
+ *
+ */
+static u8 * format_vxlan_gpe_header_with_length (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  s = format (s, "unimplemented dev %u", dev_instance);
+  return s;
+}
+
+VNET_HW_INTERFACE_CLASS (vxlan_gpe_hw_class) = {
+  .name = "VXLAN_GPE",
+  .format_header = format_vxlan_gpe_header_with_length,
+  .build_rewrite = default_build_rewrite,
+  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
+};
+
+
+#define foreach_gpe_copy_field                  \
+_(vni)                                          \
+_(protocol)                                \
+_(encap_fib_index)                              \
+_(decap_fib_index)
+
+#define foreach_copy_ipv4 {                     \
+  _(local.ip4.as_u32)                           \
+  _(remote.ip4.as_u32)                          \
+}
+
+#define foreach_copy_ipv6 {                     \
+  _(local.ip6.as_u64[0])                        \
+  _(local.ip6.as_u64[1])                        \
+  _(remote.ip6.as_u64[0])                       \
+  _(remote.ip6.as_u64[1])                       \
+}
+
+
+/**
+ * @brief Calculate IPv4 VXLAN GPE rewrite header
+ *
+ * @param *t
+ *
+ * @return rc
+ *
+ */
+int vxlan4_gpe_rewrite (vxlan_gpe_tunnel_t * t, u32 extension_size, 
+                        u8 protocol_override, uword encap_next_node)
+{
+  u8 *rw = 0;
+  ip4_header_t * ip0;
+  ip4_vxlan_gpe_header_t * h0;
+  int len;
+
+  len = sizeof (*h0) + extension_size;
+
+  vec_free(t->rewrite);
+  vec_validate_aligned (rw, len-1, CLIB_CACHE_LINE_BYTES);
+
+  h0 = (ip4_vxlan_gpe_header_t *) rw;
+
+  /* Fixed portion of the (outer) ip4 header */
+  ip0 = &h0->ip4;
+  ip0->ip_version_and_header_length = 0x45;
+  ip0->ttl = 254;
+  ip0->protocol = IP_PROTOCOL_UDP;
+
+  /* we fix up the ip4 header length and checksum after-the-fact */
+  ip0->src_address.as_u32 = t->local.ip4.as_u32;
+  ip0->dst_address.as_u32 = t->remote.ip4.as_u32;
+  ip0->checksum = ip4_header_checksum (ip0);
+
+  /* UDP header, randomize src port on something, maybe? */
+  h0->udp.src_port = clib_host_to_net_u16 (4790);
+  h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_vxlan_gpe);
+
+  /* VXLAN header. Are we having fun yet? */
+  h0->vxlan.flags = VXLAN_GPE_FLAGS_I | VXLAN_GPE_FLAGS_P;
+  h0->vxlan.ver_res = VXLAN_GPE_VERSION;
+  if (protocol_override)
+  {
+      h0->vxlan.protocol = protocol_override;
+  }
+  else
+  {
+      h0->vxlan.protocol = t->protocol;
+  }
+  t->rewrite_size = sizeof(ip4_vxlan_gpe_header_t) +  extension_size;
+  h0->vxlan.vni_res = clib_host_to_net_u32 (t->vni<<8);
+
+  t->rewrite = rw;
+  t->encap_next_node = encap_next_node;
+  return (0);
+}
+
+/**
+ * @brief Calculate IPv6 VXLAN GPE rewrite header
+ *
+ * @param *t
+ *
+ * @return rc
+ *
+ */
+int vxlan6_gpe_rewrite (vxlan_gpe_tunnel_t * t, u32 extension_size, 
+                        u8 protocol_override, uword encap_next_node)
+{
+  u8 *rw = 0;
+  ip6_header_t * ip0;
+  ip6_vxlan_gpe_header_t * h0;
+  int len;
+
+  len = sizeof (*h0) + extension_size;
+
+  vec_free(t->rewrite);
+  vec_validate_aligned (rw, len-1, CLIB_CACHE_LINE_BYTES);
+
+  h0 = (ip6_vxlan_gpe_header_t *) rw;
+
+  /* Fixed portion of the (outer) ip4 header */
+  ip0 = &h0->ip6;
+  ip0->ip_version_traffic_class_and_flow_label = clib_host_to_net_u32(6 << 28);
+  ip0->hop_limit = 255;
+  ip0->protocol = IP_PROTOCOL_UDP;
+
+  ip0->src_address.as_u64[0] = t->local.ip6.as_u64[0];
+  ip0->src_address.as_u64[1] = t->local.ip6.as_u64[1];
+  ip0->dst_address.as_u64[0] = t->remote.ip6.as_u64[0];
+  ip0->dst_address.as_u64[1] = t->remote.ip6.as_u64[1];
+
+  /* UDP header, randomize src port on something, maybe? */
+  h0->udp.src_port = clib_host_to_net_u16 (4790);
+  h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_vxlan_gpe);
+
+  /* VXLAN header. Are we having fun yet? */
+  h0->vxlan.flags = VXLAN_GPE_FLAGS_I | VXLAN_GPE_FLAGS_P;
+  h0->vxlan.ver_res = VXLAN_GPE_VERSION;
+  if (protocol_override)
+  {
+      h0->vxlan.protocol = t->protocol;
+  }
+  else
+  {
+      h0->vxlan.protocol = protocol_override;
+  }
+  t->rewrite_size = sizeof(ip4_vxlan_gpe_header_t) +  extension_size;
+  h0->vxlan.vni_res = clib_host_to_net_u32 (t->vni<<8);
+
+  t->rewrite = rw;
+  t->encap_next_node = encap_next_node;
+  return (0);
+}
+
+/**
+ * @brief Add or Del a VXLAN GPE tunnel
+ *
+ * @param *a
+ * @param *sw_if_index
+ *
+ * @return rc
+ *
+ */
+int vnet_vxlan_gpe_add_del_tunnel
+(vnet_vxlan_gpe_add_del_tunnel_args_t *a, u32 * sw_if_indexp)
+{
+  vxlan_gpe_main_t * gm = &vxlan_gpe_main;
+  vxlan_gpe_tunnel_t *t = 0;
+  vnet_main_t * vnm = gm->vnet_main;
+  vnet_hw_interface_t * hi;
+  uword * p;
+  u32 hw_if_index = ~0;
+  u32 sw_if_index = ~0;
+  int rv;
+  vxlan4_gpe_tunnel_key_t key4, *key4_copy;
+  vxlan6_gpe_tunnel_key_t key6, *key6_copy;
+  hash_pair_t *hp;
+
+  if (!a->is_ip6)
+  {
+    key4.local = a->local.ip4.as_u32;
+    key4.remote = a->remote.ip4.as_u32;
+    key4.vni = clib_host_to_net_u32 (a->vni << 8);
+    key4.pad = 0;
+
+    p = hash_get_mem(gm->vxlan4_gpe_tunnel_by_key, &key4);
+  }
+  else
+  {
+    key6.local.as_u64[0] = a->local.ip6.as_u64[0];
+    key6.local.as_u64[1] = a->local.ip6.as_u64[1];
+    key6.remote.as_u64[0] = a->remote.ip6.as_u64[0];
+    key6.remote.as_u64[1] = a->remote.ip6.as_u64[1];
+    key6.vni = clib_host_to_net_u32 (a->vni << 8);
+
+    p = hash_get_mem(gm->vxlan6_gpe_tunnel_by_key, &key6);
+  }
+
+  if (a->is_add)
+    {
+      /* adding a tunnel: tunnel must not already exist */
+      if (p)
+        return VNET_API_ERROR_INVALID_VALUE;
+
+      pool_get_aligned (gm->tunnels, t, CLIB_CACHE_LINE_BYTES);
+      memset (t, 0, sizeof (*t));
+
+      /* copy from arg structure */
+#define _(x) t->x = a->x;
+      foreach_gpe_copy_field;
+      if (!a->is_ip6) foreach_copy_ipv4
+      else            foreach_copy_ipv6
+#undef _
+
+      if (!a->is_ip6) t->flags |= VXLAN_GPE_TUNNEL_IS_IPV4;
+
+      if (!a->is_ip6) {
+        rv = vxlan4_gpe_rewrite (t, 0, 0, VXLAN_GPE_ENCAP_NEXT_IP4_LOOKUP);
+      } else {
+        rv = vxlan6_gpe_rewrite (t, 0, 0, VXLAN_GPE_ENCAP_NEXT_IP6_LOOKUP);
+      }
+
+      if (rv)
+      {
+          pool_put (gm->tunnels, t);
+          return rv;
+      }
+
+      if (!a->is_ip6)
+      {
+        key4_copy = clib_mem_alloc (sizeof (*key4_copy));
+        clib_memcpy (key4_copy, &key4, sizeof (*key4_copy));
+        hash_set_mem (gm->vxlan4_gpe_tunnel_by_key, key4_copy,
+                      t - gm->tunnels);
+      }
+      else
+      {
+          key6_copy = clib_mem_alloc (sizeof (*key6_copy));
+          clib_memcpy (key6_copy, &key6, sizeof (*key6_copy));
+          hash_set_mem (gm->vxlan6_gpe_tunnel_by_key, key6_copy,
+                        t - gm->tunnels);
+      }
+
+      if (vec_len (gm->free_vxlan_gpe_tunnel_hw_if_indices) > 0)
+        {
+          hw_if_index = gm->free_vxlan_gpe_tunnel_hw_if_indices
+            [vec_len (gm->free_vxlan_gpe_tunnel_hw_if_indices)-1];
+          _vec_len (gm->free_vxlan_gpe_tunnel_hw_if_indices) -= 1;
+
+          hi = vnet_get_hw_interface (vnm, hw_if_index);
+          hi->dev_instance = t - gm->tunnels;
+          hi->hw_instance = hi->dev_instance;
+        }
+      else
+        {
+          hw_if_index = vnet_register_interface
+            (vnm, vxlan_gpe_device_class.index, t - gm->tunnels,
+             vxlan_gpe_hw_class.index, t - gm->tunnels);
+          hi = vnet_get_hw_interface (vnm, hw_if_index);
+          hi->output_node_index = vxlan_gpe_encap_node.index;
+        }
+
+      t->hw_if_index = hw_if_index;
+      t->sw_if_index = sw_if_index = hi->sw_if_index;
+      vec_validate_init_empty (gm->tunnel_index_by_sw_if_index, sw_if_index, ~0);
+      gm->tunnel_index_by_sw_if_index[sw_if_index] = t - gm->tunnels;
+
+      vnet_sw_interface_set_flags (vnm, hi->sw_if_index,
+                                   VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+    }
+  else
+    {
+      /* deleting a tunnel: tunnel must exist */
+      if (!p)
+        return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+      t = pool_elt_at_index (gm->tunnels, p[0]);
+
+      vnet_sw_interface_set_flags (vnm, t->sw_if_index, 0 /* down */);
+      vec_add1 (gm->free_vxlan_gpe_tunnel_hw_if_indices, t->hw_if_index);
+
+      gm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
+
+      if (!a->is_ip6)
+      {
+        hp = hash_get_pair (gm->vxlan4_gpe_tunnel_by_key, &key4);
+        key4_copy = (void *)(hp->key);
+        hash_unset_mem (gm->vxlan4_gpe_tunnel_by_key, &key4);
+        clib_mem_free (key4_copy);
+      }
+      else
+      {
+        hp = hash_get_pair (gm->vxlan6_gpe_tunnel_by_key, &key6);
+        key6_copy = (void *)(hp->key);
+        hash_unset_mem (gm->vxlan4_gpe_tunnel_by_key, &key6);
+        clib_mem_free (key6_copy);
+      }
+
+      vec_free (t->rewrite);
+      pool_put (gm->tunnels, t);
+    }
+
+  if (sw_if_indexp)
+      *sw_if_indexp = sw_if_index;
+
+  return 0;
+}
+
+static clib_error_t *
+vxlan_gpe_add_del_tunnel_command_fn (vlib_main_t * vm,
+                                   unformat_input_t * input,
+                                   vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, * line_input = &_line_input;
+  u8 is_add = 1;
+  ip46_address_t local, remote;
+  u8 local_set = 0;
+  u8 remote_set = 0;
+  u8 ipv4_set = 0;
+  u8 ipv6_set = 0;
+  u32 encap_fib_index = 0;
+  u32 decap_fib_index = 0;
+  u8 protocol = VXLAN_GPE_PROTOCOL_IP4;
+  u32 vni;
+  u8 vni_set = 0;
+  int rv;
+  u32 tmp;
+  vnet_vxlan_gpe_add_del_tunnel_args_t _a, * a = &_a;
+  u32 sw_if_index;
+
+  /* Get a line of input. */
+  if (! unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (line_input, "del"))
+      is_add = 0;
+    else if (unformat (line_input, "local %U",
+                       unformat_ip4_address, &local.ip4))
+    {
+      local_set = 1;
+      ipv4_set = 1;
+    }
+    else if (unformat (line_input, "remote %U",
+                       unformat_ip4_address, &remote.ip4))
+    {
+      remote_set = 1;
+      ipv4_set = 1;
+    }
+    else if (unformat (line_input, "local %U",
+                       unformat_ip6_address, &local.ip6))
+    {
+      local_set = 1;
+      ipv6_set = 1;
+    }
+    else if (unformat (line_input, "remote %U",
+                       unformat_ip6_address, &remote.ip6))
+    {
+      remote_set = 1;
+      ipv6_set = 1;
+    }
+    else if (unformat (line_input, "encap-vrf-id %d", &tmp))
+      {
+        if (ipv6_set)
+          encap_fib_index = ip6_fib_index_from_table_id (tmp);
+        else
+          encap_fib_index =  ip4_fib_index_from_table_id (tmp);
+
+        if (encap_fib_index == ~0)
+          return clib_error_return (0, "nonexistent encap fib id %d", tmp);
+      }
+    else if (unformat (line_input, "decap-vrf-id %d", &tmp))
+      {
+        if (ipv6_set)
+          decap_fib_index = ip6_fib_index_from_table_id (tmp);
+        else
+          decap_fib_index = ip4_fib_index_from_table_id (tmp);
+
+        if (decap_fib_index == ~0)
+          return clib_error_return (0, "nonexistent decap fib id %d", tmp);
+      }
+    else if (unformat (line_input, "vni %d", &vni))
+      vni_set = 1;
+    else if (unformat(line_input, "next-ip4"))
+      protocol = VXLAN_GPE_PROTOCOL_IP4;
+    else if (unformat(line_input, "next-ip6"))
+      protocol = VXLAN_GPE_PROTOCOL_IP6;
+    else if (unformat(line_input, "next-ethernet"))
+      protocol = VXLAN_GPE_PROTOCOL_ETHERNET;
+    else if (unformat(line_input, "next-nsh"))
+      protocol = VXLAN_GPE_PROTOCOL_NSH;
+    else
+      return clib_error_return (0, "parse error: '%U'",
+                                format_unformat_error, line_input);
+  }
+
+  unformat_free (line_input);
+
+  if (local_set == 0)
+    return clib_error_return (0, "tunnel local address not specified");
+
+  if (remote_set == 0)
+    return clib_error_return (0, "tunnel remote address not specified");
+
+  if (ipv4_set && ipv6_set)
+    return clib_error_return (0, "both IPv4 and IPv6 addresses specified");
+
+  if ((ipv4_set && memcmp(&local.ip4, &remote.ip4, sizeof(local.ip4)) == 0) ||
+      (ipv6_set && memcmp(&local.ip6, &remote.ip6, sizeof(local.ip6)) == 0))
+    return clib_error_return (0, "src and dst addresses are identical");
+
+  if (vni_set == 0)
+    return clib_error_return (0, "vni not specified");
+
+  memset (a, 0, sizeof (*a));
+
+  a->is_add = is_add;
+  a->is_ip6 = ipv6_set;
+
+#define _(x) a->x = x;
+  foreach_gpe_copy_field;
+  if (ipv4_set) foreach_copy_ipv4
+  else          foreach_copy_ipv6
+#undef _
+
+  rv = vnet_vxlan_gpe_add_del_tunnel (a, &sw_if_index);
+
+  switch(rv)
+    {
+    case 0:
+      vlib_cli_output(vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main(), sw_if_index);
+      break;
+    case VNET_API_ERROR_INVALID_DECAP_NEXT:
+      return clib_error_return (0, "invalid decap-next...");
+
+    case VNET_API_ERROR_TUNNEL_EXIST:
+      return clib_error_return (0, "tunnel already exists...");
+
+    case VNET_API_ERROR_NO_SUCH_ENTRY:
+      return clib_error_return (0, "tunnel does not exist...");
+
+    default:
+      return clib_error_return
+        (0, "vnet_vxlan_gpe_add_del_tunnel returned %d", rv);
+    }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (create_vxlan_gpe_tunnel_command, static) = {
+  .path = "create vxlan-gpe tunnel",
+  .short_help =
+  "create vxlan-gpe tunnel local <local-addr> remote <remote-addr>"
+  " vni <nn> [next-ip4][next-ip6][next-ethernet][next-nsh]"
+  " [encap-vrf-id <nn>] [decap-vrf-id <nn>]"
+  " [del]\n",
+  .function = vxlan_gpe_add_del_tunnel_command_fn,
+};
+
+/**
+ * @brief CLI function for showing VXLAN GPE tunnels
+ *
+ * @param *vm
+ * @param *input
+ * @param *cmd
+ *
+ * @return error
+ *
+ */
+static clib_error_t *
+show_vxlan_gpe_tunnel_command_fn (vlib_main_t * vm,
+                                unformat_input_t * input,
+                                vlib_cli_command_t * cmd)
+{
+  vxlan_gpe_main_t * gm = &vxlan_gpe_main;
+  vxlan_gpe_tunnel_t * t;
+
+  if (pool_elts (gm->tunnels) == 0)
+    vlib_cli_output (vm, "No vxlan-gpe tunnels configured.");
+
+  pool_foreach (t, gm->tunnels,
+  ({
+    vlib_cli_output (vm, "%U", format_vxlan_gpe_tunnel, t);
+  }));
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (show_vxlan_gpe_tunnel_command, static) = {
+    .path = "show vxlan-gpe",
+    .function = show_vxlan_gpe_tunnel_command_fn,
+};
+
+/**
+ * @brief Feature init function for VXLAN GPE
+ *
+ * @param *vm
+ *
+ * @return error
+ *
+ */
+clib_error_t *vxlan_gpe_init (vlib_main_t *vm)
+{
+  vxlan_gpe_main_t *gm = &vxlan_gpe_main;
+
+  gm->vnet_main = vnet_get_main();
+  gm->vlib_main = vm;
+
+  gm->vxlan4_gpe_tunnel_by_key
+    = hash_create_mem (0, sizeof(vxlan4_gpe_tunnel_key_t), sizeof (uword));
+
+  gm->vxlan6_gpe_tunnel_by_key
+    = hash_create_mem (0, sizeof(vxlan6_gpe_tunnel_key_t), sizeof (uword));
+
+
+  udp_register_dst_port (vm, UDP_DST_PORT_vxlan_gpe,
+                         vxlan4_gpe_input_node.index, 1 /* is_ip4 */);
+  udp_register_dst_port (vm, UDP_DST_PORT_vxlan6_gpe,
+                         vxlan6_gpe_input_node.index, 0 /* is_ip4 */);
+
+  /* Register the list of standard decap protocols supported */
+  vxlan_gpe_register_decap_protocol (VXLAN_GPE_PROTOCOL_IP4,
+                                     VXLAN_GPE_INPUT_NEXT_IP4_INPUT);
+  vxlan_gpe_register_decap_protocol (VXLAN_GPE_PROTOCOL_IP6,
+                                     VXLAN_GPE_INPUT_NEXT_IP6_INPUT);
+  vxlan_gpe_register_decap_protocol (VXLAN_GPE_PROTOCOL_ETHERNET,
+                                     VXLAN_GPE_INPUT_NEXT_ETHERNET_INPUT);
+  return 0;
+}
+
+VLIB_INIT_FUNCTION(vxlan_gpe_init);
+
diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.h b/src/vnet/vxlan-gpe/vxlan_gpe.h
new file mode 100644
index 00000000..1b4bc44e
--- /dev/null
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.h
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ *  @file
+ *  @brief VXLAN GPE definitions
+ *
+*/
+#ifndef included_vnet_vxlan_gpe_h
+#define included_vnet_vxlan_gpe_h
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/ip/udp.h>
+
+/**
+ * @brief VXLAN GPE header struct
+ *
+ */
+typedef CLIB_PACKED (struct {
+  /** 20 bytes */
+  ip4_header_t ip4;
+  /** 8 bytes */
+  udp_header_t udp;
+  /** 8 bytes */
+  vxlan_gpe_header_t vxlan;
+}) ip4_vxlan_gpe_header_t;
+
+typedef CLIB_PACKED (struct {
+  /** 40 bytes */
+  ip6_header_t ip6;
+  /** 8 bytes */
+  udp_header_t udp;
+  /** 8 bytes */
+  vxlan_gpe_header_t vxlan;
+}) ip6_vxlan_gpe_header_t;
+
+/**
+ * @brief Key struct for IPv4 VXLAN GPE tunnel.
+ * Key fields: local remote, vni
+ * all fields in NET byte order
+ * VNI shifted 8 bits
+ */
+typedef CLIB_PACKED(struct {
+  union {
+    struct {
+      u32 local;
+      u32 remote;
+
+      u32 vni;
+      u32 pad;
+    };
+    u64 as_u64[2];
+  };
+}) vxlan4_gpe_tunnel_key_t;
+
+/**
+ * @brief Key struct for IPv6 VXLAN GPE tunnel.
+ * Key fields: local remote, vni
+ * all fields in NET byte order
+ * VNI shifted 8 bits
+ */
+typedef CLIB_PACKED(struct {
+  ip6_address_t local;
+  ip6_address_t remote;
+  u32 vni;
+}) vxlan6_gpe_tunnel_key_t;
+
+/**
+ * @brief Struct for VXLAN GPE tunnel
+ */
+typedef struct {
+  /** Rewrite string. $$$$ embed vnet_rewrite header */
+  u8 * rewrite;
+
+  /** encapsulated protocol */
+  u8 protocol;
+
+  /** tunnel local address */
+  ip46_address_t local;
+  /** tunnel remote address */
+  ip46_address_t remote;
+
+  /** FIB indices - tunnel partner lookup here */
+  u32 encap_fib_index;
+  /** FIB indices - inner IP packet lookup here */
+  u32 decap_fib_index;
+
+  /** VXLAN GPE VNI in HOST byte order, shifted left 8 bits */
+  u32 vni;
+
+  /** vnet intfc hw_if_index */
+  u32 hw_if_index;
+  /** vnet intfc sw_if_index */
+  u32 sw_if_index;
+
+  /** flags */
+  u32 flags;
+
+  /** rewrite size for dynamic plugins like iOAM */
+  u8  rewrite_size;
+
+  /** Next node after VxLAN-GPE encap */
+  uword encap_next_node;
+} vxlan_gpe_tunnel_t;
+
+/** Flags for vxlan_gpe_tunnel_t */
+#define VXLAN_GPE_TUNNEL_IS_IPV4	1
+
+/** next nodes for VXLAN GPE input */
+#define foreach_vxlan_gpe_input_next        \
+_(DROP, "error-drop")                           \
+_(IP4_INPUT, "ip4-input")                       \
+_(IP6_INPUT, "ip6-input")                       \
+_(ETHERNET_INPUT, "ethernet-input")
+
+/** struct for next nodes for VXLAN GPE input */
+typedef enum {
+#define _(s,n) VXLAN_GPE_INPUT_NEXT_##s,
+  foreach_vxlan_gpe_input_next
+#undef _
+  VXLAN_GPE_INPUT_N_NEXT,
+} vxlan_gpe_input_next_t;
+
+/** struct for VXLAN GPE errors */
+typedef enum {
+#define vxlan_gpe_error(n,s) VXLAN_GPE_ERROR_##n,
+#include <vnet/vxlan-gpe/vxlan_gpe_error.def>
+#undef vxlan_gpe_error
+  VXLAN_GPE_N_ERROR,
+} vxlan_gpe_input_error_t;
+
+/** Struct for VXLAN GPE node state */
+typedef struct {
+  /** vector of encap tunnel instances */
+  vxlan_gpe_tunnel_t *tunnels;
+
+  /** lookup IPv4 VXLAN GPE tunnel by key */
+  uword * vxlan4_gpe_tunnel_by_key;
+  /** lookup IPv6 VXLAN GPE tunnel by key */
+  uword * vxlan6_gpe_tunnel_by_key;
+
+  /** Free vlib hw_if_indices */
+  u32 * free_vxlan_gpe_tunnel_hw_if_indices;
+
+  /** Mapping from sw_if_index to tunnel index */
+  u32 * tunnel_index_by_sw_if_index;
+
+  /** State convenience vlib_main_t */
+  vlib_main_t * vlib_main;
+  /** State convenience vnet_main_t */
+  vnet_main_t * vnet_main;
+
+  /** List of next nodes for the decap indexed on protocol */
+  uword decap_next_node_list[VXLAN_GPE_PROTOCOL_MAX];
+} vxlan_gpe_main_t;
+
+vxlan_gpe_main_t vxlan_gpe_main;
+
+extern vlib_node_registration_t vxlan_gpe_encap_node;
+extern vlib_node_registration_t vxlan4_gpe_input_node;
+extern vlib_node_registration_t vxlan6_gpe_input_node;
+
+u8 * format_vxlan_gpe_encap_trace (u8 * s, va_list * args);
+
+/** Struct for VXLAN GPE add/del args */
+typedef struct {
+  u8 is_add;
+  u8 is_ip6;
+  ip46_address_t local, remote;
+  u8 protocol;
+  u32 encap_fib_index;
+  u32 decap_fib_index;
+  u32 vni;
+} vnet_vxlan_gpe_add_del_tunnel_args_t;
+
+
+int vnet_vxlan_gpe_add_del_tunnel
+(vnet_vxlan_gpe_add_del_tunnel_args_t *a, u32 * sw_if_indexp);
+
+
+int vxlan4_gpe_rewrite (vxlan_gpe_tunnel_t * t, u32 extension_size,
+                        u8 protocol_override, uword encap_next_node);
+int vxlan6_gpe_rewrite (vxlan_gpe_tunnel_t * t, u32 extension_size,
+                       u8 protocol_override, uword encap_next_node);
+
+/**
+ * @brief Struct for defining VXLAN GPE next nodes
+ */
+typedef enum {
+  VXLAN_GPE_ENCAP_NEXT_IP4_LOOKUP,
+  VXLAN_GPE_ENCAP_NEXT_IP6_LOOKUP,
+  VXLAN_GPE_ENCAP_NEXT_DROP,
+  VXLAN_GPE_ENCAP_N_NEXT
+} vxlan_gpe_encap_next_t;
+
+
+void vxlan_gpe_unregister_decap_protocol (u8 protocol_id, uword next_node_index);
+
+void vxlan_gpe_register_decap_protocol (u8 protocol_id, uword next_node_index);
+
+
+#endif /* included_vnet_vxlan_gpe_h */
diff --git a/src/vnet/vxlan-gpe/vxlan_gpe_api.c b/src/vnet/vxlan-gpe/vxlan_gpe_api.c
new file mode 100644
index 00000000..012a41da
--- /dev/null
+++ b/src/vnet/vxlan-gpe/vxlan_gpe_api.c
@@ -0,0 +1,249 @@
+/*
+ *------------------------------------------------------------------
+ * vxlan_gpe_api.c - vxlan_gpe api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <vnet/fib/fib_table.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                             \
+_(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel)                   \
+_(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump)                         \
+
+static void
+  vl_api_vxlan_gpe_add_del_tunnel_t_handler
+  (vl_api_vxlan_gpe_add_del_tunnel_t * mp)
+{
+  vl_api_vxlan_gpe_add_del_tunnel_reply_t *rmp;
+  int rv = 0;
+  vnet_vxlan_gpe_add_del_tunnel_args_t _a, *a = &_a;
+  u32 encap_fib_index, decap_fib_index;
+  u8 protocol;
+  uword *p;
+  ip4_main_t *im = &ip4_main;
+  u32 sw_if_index = ~0;
+
+
+  p = hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id));
+  if (!p)
+    {
+      rv = VNET_API_ERROR_NO_SUCH_FIB;
+      goto out;
+    }
+  encap_fib_index = p[0];
+
+  protocol = mp->protocol;
+
+  /* Interpret decap_vrf_id as an opaque if sending to other-than-ip4-input */
+  if (protocol == VXLAN_GPE_INPUT_NEXT_IP4_INPUT)
+    {
+      p = hash_get (im->fib_index_by_table_id, ntohl (mp->decap_vrf_id));
+      if (!p)
+	{
+	  rv = VNET_API_ERROR_NO_SUCH_INNER_FIB;
+	  goto out;
+	}
+      decap_fib_index = p[0];
+    }
+  else
+    {
+      decap_fib_index = ntohl (mp->decap_vrf_id);
+    }
+
+  /* Check src & dst are different */
+  if ((mp->is_ipv6 && memcmp (mp->local, mp->remote, 16) == 0) ||
+      (!mp->is_ipv6 && memcmp (mp->local, mp->remote, 4) == 0))
+    {
+      rv = VNET_API_ERROR_SAME_SRC_DST;
+      goto out;
+    }
+  memset (a, 0, sizeof (*a));
+
+  a->is_add = mp->is_add;
+  a->is_ip6 = mp->is_ipv6;
+  /* ip addresses sent in network byte order */
+  if (a->is_ip6)
+    {
+      clib_memcpy (&(a->local.ip6), mp->local, 16);
+      clib_memcpy (&(a->remote.ip6), mp->remote, 16);
+    }
+  else
+    {
+      clib_memcpy (&(a->local.ip4), mp->local, 4);
+      clib_memcpy (&(a->remote.ip4), mp->remote, 4);
+    }
+  a->encap_fib_index = encap_fib_index;
+  a->decap_fib_index = decap_fib_index;
+  a->protocol = protocol;
+  a->vni = ntohl (mp->vni);
+  rv = vnet_vxlan_gpe_add_del_tunnel (a, &sw_if_index);
+
+out:
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_VXLAN_GPE_ADD_DEL_TUNNEL_REPLY,
+  ({
+    rmp->sw_if_index = ntohl (sw_if_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void send_vxlan_gpe_tunnel_details
+  (vxlan_gpe_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_vxlan_gpe_tunnel_details_t *rmp;
+  ip4_main_t *im4 = &ip4_main;
+  ip6_main_t *im6 = &ip6_main;
+  u8 is_ipv6 = !(t->flags & VXLAN_GPE_TUNNEL_IS_IPV4);
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_VXLAN_GPE_TUNNEL_DETAILS);
+  if (is_ipv6)
+    {
+      memcpy (rmp->local, &(t->local.ip6), 16);
+      memcpy (rmp->remote, &(t->remote.ip6), 16);
+      rmp->encap_vrf_id = htonl (im6->fibs[t->encap_fib_index].ft_table_id);
+      rmp->decap_vrf_id = htonl (im6->fibs[t->decap_fib_index].ft_table_id);
+    }
+  else
+    {
+      memcpy (rmp->local, &(t->local.ip4), 4);
+      memcpy (rmp->remote, &(t->remote.ip4), 4);
+      rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id);
+      rmp->decap_vrf_id = htonl (im4->fibs[t->decap_fib_index].ft_table_id);
+    }
+  rmp->vni = htonl (t->vni);
+  rmp->protocol = t->protocol;
+  rmp->sw_if_index = htonl (t->sw_if_index);
+  rmp->is_ipv6 = is_ipv6;
+  rmp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void vl_api_vxlan_gpe_tunnel_dump_t_handler
+  (vl_api_vxlan_gpe_tunnel_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  vxlan_gpe_main_t *vgm = &vxlan_gpe_main;
+  vxlan_gpe_tunnel_t *t;
+  u32 sw_if_index;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  if (~0 == sw_if_index)
+    {
+      /* *INDENT-OFF* */
+      pool_foreach (t, vgm->tunnels,
+      ({
+        send_vxlan_gpe_tunnel_details(t, q, mp->context);
+      }));
+      /* *INDENT-ON* */
+    }
+  else
+    {
+      if ((sw_if_index >= vec_len (vgm->tunnel_index_by_sw_if_index)) ||
+	  (~0 == vgm->tunnel_index_by_sw_if_index[sw_if_index]))
+	{
+	  return;
+	}
+      t = &vgm->tunnels[vgm->tunnel_index_by_sw_if_index[sw_if_index]];
+      send_vxlan_gpe_tunnel_details (t, q, mp->context);
+    }
+}
+
+
+/*
+ * vpe_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_span;
+#undef _
+}
+
+static clib_error_t *
+vxlan_gpe_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (vxlan_gpe_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/vxlan-gpe/vxlan_gpe_error.def b/src/vnet/vxlan-gpe/vxlan_gpe_error.def
new file mode 100644
index 00000000..9cf1b1cb
--- /dev/null
+++ b/src/vnet/vxlan-gpe/vxlan_gpe_error.def
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+vxlan_gpe_error (DECAPSULATED, "good packets decapsulated")
+vxlan_gpe_error (NO_SUCH_TUNNEL, "no such tunnel packets")
diff --git a/src/vnet/vxlan-gpe/vxlan_gpe_packet.h b/src/vnet/vxlan-gpe/vxlan_gpe_packet.h
new file mode 100644
index 00000000..ec3c2e58
--- /dev/null
+++ b/src/vnet/vxlan-gpe/vxlan_gpe_packet.h
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ *  @file
+ *  @brief VXLAN GPE packet header structure
+ *
+*/
+#ifndef included_vxlan_gpe_packet_h
+#define included_vxlan_gpe_packet_h
+
+/**
+ *   From draft-quinn-vxlan-gpe-03.txt
+ *
+ *    0                   1                   2                   3
+ *    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   |R|R|R|R|I|P|R|O|Ver|   Reserved                |Next Protocol  |
+ *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   |                VXLAN Network Identifier (VNI) |   Reserved    |
+ *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ *   I Bit: Flag bit 4 indicates that the VNI is valid. 
+ *
+ *   P Bit:  Flag bit 5 is defined as the Next Protocol bit.  The P bit
+ *      MUST be set to 1 to indicate the presence of the 8 bit next
+ *      protocol field.
+ *
+ *   O Bit: Flag bit 7 is defined as the O bit. When the O bit is set to 1, 
+ *
+ *      the packet is an OAM packet and OAM processing MUST occur.  The OAM
+ *      protocol details are out of scope for this document.  As with the
+ *      P-bit, bit 7 is currently a reserved flag in VXLAN.
+ *
+ *   VXLAN-gpe bits 8 and 9 are defined as version bits.  These bits are
+ *   reserved in VXLAN.  The version field is used to ensure backward
+ *   compatibility going forward with future VXLAN-gpe updates.
+ *
+ *   The initial version for VXLAN-gpe is 0.
+ *
+ *   This draft defines the following Next Protocol values:
+ *
+ *      0x1 : IPv4
+ *      0x2 : IPv6
+ *      0x3 : Ethernet
+ *      0x4 : Network Service Header [NSH]
+ */
+
+/**
+ * @brief VXLAN GPE support inner protocol definition.
+ * 1 - IP4
+ * 2 - IP6
+ * 3 - ETHERNET
+ * 4 - NSH
+ */
+#define foreach_vxlan_gpe_protocol \
+_ (0x01, IP4)                         \
+_ (0x02, IP6)                         \
+_ (0x03, ETHERNET)		     \
+_ (0x04, NSH)		     \
+_ (0x05, IOAM)
+
+
+/**
+ * @brief Struct for VXLAN GPE support inner protocol definition.
+ * 1 - IP4
+ * 2 - IP6
+ * 3 - ETHERNET
+ * 4 - NSH
+ * 5 - IOAM
+ */
+typedef enum {
+#define _(n,f) VXLAN_GPE_PROTOCOL_##f = n,
+  foreach_vxlan_gpe_protocol
+#undef _
+  VXLAN_GPE_PROTOCOL_MAX,
+} vxlan_gpe_protocol_t;
+
+/**
+ * @brief VXLAN GPE Header definition
+ */
+typedef struct {
+  u8 flags;
+  /** Version and Reserved */
+  u8 ver_res;
+  /** Reserved */
+  u8 res;
+  /** see vxlan_gpe_protocol_t */
+  u8 protocol;
+  /** VNI and Reserved */
+  u32 vni_res;
+} vxlan_gpe_header_t;
+
+#define VXLAN_GPE_FLAGS_I 0x08
+#define VXLAN_GPE_FLAGS_P 0x04
+#define VXLAN_GPE_FLAGS_O 0x01
+#define VXLAN_GPE_VERSION 0x0
+
+#endif /* included_vxlan_gpe_packet_h */
diff --git a/src/vnet/vxlan/decap.c b/src/vnet/vxlan/decap.c
new file mode 100644
index 00000000..73e50ffe
--- /dev/null
+++ b/src/vnet/vxlan/decap.c
@@ -0,0 +1,1130 @@
+/*
+ * decap.c: vxlan tunnel decap packet processing
+ *
+ * Copyright (c) 2013 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/vxlan/vxlan.h>
+
+vlib_node_registration_t vxlan4_input_node;
+vlib_node_registration_t vxlan6_input_node;
+
+typedef struct {
+  u32 next_index;
+  u32 tunnel_index;
+  u32 error;
+  u32 vni;
+} vxlan_rx_trace_t;
+
+static u8 * format_vxlan_rx_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  vxlan_rx_trace_t * t = va_arg (*args, vxlan_rx_trace_t *);
+
+  if (t->tunnel_index != ~0)
+    {
+      s = format (s, "VXLAN decap from vxlan_tunnel%d vni %d next %d error %d",
+                  t->tunnel_index, t->vni, t->next_index, t->error);
+    }
+  else
+    {
+      s = format (s, "VXLAN decap error - tunnel for vni %d does not exist", 
+		  t->vni);
+    }
+  return s;
+}
+
+always_inline uword
+vxlan_input (vlib_main_t * vm,
+             vlib_node_runtime_t * node,
+             vlib_frame_t * from_frame,
+             u32 is_ip4)
+{
+  u32 n_left_from, next_index, * from, * to_next;
+  vxlan_main_t * vxm = &vxlan_main;
+  vnet_main_t * vnm = vxm->vnet_main;
+  vnet_interface_main_t * im = &vnm->interface_main;
+  u32 last_tunnel_index = ~0;
+  vxlan4_tunnel_key_t last_key4;
+  vxlan6_tunnel_key_t last_key6;
+  u32 pkts_decapsulated = 0;
+  u32 cpu_index = os_get_cpu_number();
+  u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
+
+  if (is_ip4)
+    last_key4.as_u64 = ~0;
+  else
+    memset (&last_key6, 0xff, sizeof (last_key6));
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+  stats_sw_if_index = node->runtime_data[0];
+  stats_n_packets = stats_n_bytes = 0;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+          u32 bi0, bi1;
+	  vlib_buffer_t * b0, * b1;
+	  u32 next0, next1;
+          ip4_header_t * ip4_0, * ip4_1;
+          ip6_header_t * ip6_0, * ip6_1;
+          vxlan_header_t * vxlan0, * vxlan1;
+	  uword * p0, * p1;
+          u32 tunnel_index0, tunnel_index1;
+          vxlan_tunnel_t * t0, * t1, * mt0 = NULL, * mt1 = NULL;
+          vxlan4_tunnel_key_t key4_0, key4_1;
+          vxlan6_tunnel_key_t key6_0, key6_1;
+          u32 error0, error1;
+	  u32 sw_if_index0, sw_if_index1, len0, len1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * p2, * p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+	    CLIB_PREFETCH (p3->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+          /* udp leaves current_data pointing at the vxlan header */
+          vxlan0 = vlib_buffer_get_current (b0);
+          vxlan1 = vlib_buffer_get_current (b1);
+          if (is_ip4) {
+	    vlib_buffer_advance
+	      (b0, -(word)(sizeof(udp_header_t)+sizeof(ip4_header_t)));
+	    vlib_buffer_advance
+	      (b1, -(word)(sizeof(udp_header_t)+sizeof(ip4_header_t)));
+            ip4_0 = vlib_buffer_get_current (b0);
+            ip4_1 = vlib_buffer_get_current (b1);
+	  } else {
+            vlib_buffer_advance
+              (b0, -(word)(sizeof(udp_header_t)+sizeof(ip6_header_t)));
+            vlib_buffer_advance
+              (b1, -(word)(sizeof(udp_header_t)+sizeof(ip6_header_t)));
+            ip6_0 = vlib_buffer_get_current (b0);
+            ip6_1 = vlib_buffer_get_current (b1);
+	  }
+
+          /* pop (ip, udp, vxlan) */
+          if (is_ip4) {
+            vlib_buffer_advance
+              (b0, sizeof(*ip4_0)+sizeof(udp_header_t)+sizeof(*vxlan0));
+	    vlib_buffer_advance
+              (b1, sizeof(*ip4_1)+sizeof(udp_header_t)+sizeof(*vxlan1));
+          } else {
+	    vlib_buffer_advance
+              (b0, sizeof(*ip6_0)+sizeof(udp_header_t)+sizeof(*vxlan0));
+            vlib_buffer_advance
+              (b1, sizeof(*ip6_1)+sizeof(udp_header_t)+sizeof(*vxlan1));
+          }
+
+          tunnel_index0 = ~0;
+          error0 = 0;
+
+          tunnel_index1 = ~0;
+          error1 = 0;
+
+	  if (PREDICT_FALSE (vxlan0->flags != VXLAN_FLAGS_I))
+	    {
+	      error0 = VXLAN_ERROR_BAD_FLAGS;
+	      next0 = VXLAN_INPUT_NEXT_DROP;
+	      goto trace0;
+	    }
+
+          if (is_ip4) {
+            key4_0.src = ip4_0->src_address.as_u32;
+            key4_0.vni = vxlan0->vni_reserved;
+
+ 	    /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
+           if (PREDICT_FALSE (key4_0.as_u64 != last_key4.as_u64))
+              {
+                p0 = hash_get (vxm->vxlan4_tunnel_by_key, key4_0.as_u64);
+                if (PREDICT_FALSE (p0 == NULL))
+                  {
+                    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+                    next0 = VXLAN_INPUT_NEXT_DROP;
+                    goto trace0;
+                  }
+                last_key4.as_u64 = key4_0.as_u64;
+                tunnel_index0 = last_tunnel_index = p0[0];
+              }
+            else
+              tunnel_index0 = last_tunnel_index;
+	    t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
+
+ 	    /* Validate VXLAN tunnel SIP against packet DIP */
+	    if (PREDICT_TRUE (ip4_0->dst_address.as_u32 == t0->src.ip4.as_u32))
+	      goto next0; /* valid packet */
+	    if (PREDICT_FALSE (ip4_address_is_multicast (&ip4_0->dst_address)))
+	      {
+		key4_0.src = ip4_0->dst_address.as_u32;
+		key4_0.vni = vxlan0->vni_reserved;
+		/* Make sure mcast VXLAN tunnel exist by packet DIP and VNI */
+		p0 = hash_get (vxm->vxlan4_tunnel_by_key, key4_0.as_u64);
+		if (PREDICT_TRUE (p0 != NULL))
+		  {
+		    mt0 = pool_elt_at_index (vxm->tunnels, p0[0]);
+		    goto next0; /* valid packet */
+		  }
+	      }
+	    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+	    next0 = VXLAN_INPUT_NEXT_DROP;
+	    goto trace0;
+
+         } else /* !is_ip4 */ {
+            key6_0.src.as_u64[0] = ip6_0->src_address.as_u64[0];
+            key6_0.src.as_u64[1] = ip6_0->src_address.as_u64[1];
+            key6_0.vni = vxlan0->vni_reserved;
+
+ 	    /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
+           if (PREDICT_FALSE (memcmp(&key6_0, &last_key6, sizeof(last_key6)) != 0))
+              {
+                p0 = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6_0);
+                if (PREDICT_FALSE (p0 == NULL))
+                  {
+                    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+                    next0 = VXLAN_INPUT_NEXT_DROP;
+                    goto trace0;
+                  }
+                clib_memcpy (&last_key6, &key6_0, sizeof(key6_0));
+                tunnel_index0 = last_tunnel_index = p0[0];
+              }
+            else
+              tunnel_index0 = last_tunnel_index;
+	    t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
+
+	    /* Validate VXLAN tunnel SIP against packet DIP */
+	    if (PREDICT_TRUE (ip6_address_is_equal (&ip6_0->dst_address,
+						    &t0->src.ip6)))
+		goto next0; /* valid packet */
+	    if (PREDICT_FALSE (ip6_address_is_multicast (&ip6_0->dst_address)))
+	      {
+		key6_0.src.as_u64[0] = ip6_0->dst_address.as_u64[0];
+		key6_0.src.as_u64[1] = ip6_0->dst_address.as_u64[1];
+		key6_0.vni = vxlan0->vni_reserved;
+		p0 = hash_get (vxm->vxlan6_tunnel_by_key, &key6_0);
+		if (PREDICT_TRUE (p0 != NULL)) 
+		  {
+		    mt0 = pool_elt_at_index (vxm->tunnels, p0[0]);
+		    goto next0; /* valid packet */
+		  }
+	      }
+	    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+	    next0 = VXLAN_INPUT_NEXT_DROP;
+	    goto trace0;
+          }
+
+	next0:
+          next0 = t0->decap_next_index;
+          sw_if_index0 = t0->sw_if_index;
+          len0 = vlib_buffer_length_in_chain (vm, b0);
+
+          /* Required to make the l2 tag push / pop code work on l2 subifs */
+          if (PREDICT_TRUE(next0 == VXLAN_INPUT_NEXT_L2_INPUT))
+            vnet_update_l2_len (b0);
+
+          /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
+          vnet_buffer(b0)->sw_if_index[VLIB_RX] = sw_if_index0;
+	  sw_if_index0 = (mt0) ? mt0->sw_if_index : sw_if_index0;
+
+          pkts_decapsulated ++;
+          stats_n_packets += 1;
+          stats_n_bytes += len0;
+
+	  /* Batch stats increment on the same vxlan tunnel so counter
+	     is not incremented per packet */
+	  if (PREDICT_FALSE (sw_if_index0 != stats_sw_if_index)) 
+	    {
+	      stats_n_packets -= 1;
+	      stats_n_bytes -= len0;
+	      if (stats_n_packets)
+		vlib_increment_combined_counter 
+		  (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
+		   cpu_index, stats_sw_if_index, 
+		   stats_n_packets, stats_n_bytes);
+	      stats_n_packets = 1;
+	      stats_n_bytes = len0;
+	      stats_sw_if_index = sw_if_index0;
+	    }
+
+        trace0:
+          b0->error = error0 ? node->errors[error0] : 0;
+
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
+            {
+              vxlan_rx_trace_t *tr 
+                = vlib_add_trace (vm, node, b0, sizeof (*tr));
+              tr->next_index = next0;
+              tr->error = error0;
+              tr->tunnel_index = tunnel_index0;
+              tr->vni = vnet_get_vni (vxlan0);
+            }
+
+	  if (PREDICT_FALSE (vxlan1->flags != VXLAN_FLAGS_I))
+	    {
+	      error1 = VXLAN_ERROR_BAD_FLAGS;
+	      next1 = VXLAN_INPUT_NEXT_DROP;
+	      goto trace1;
+	    }
+
+          if (is_ip4) {
+            key4_1.src = ip4_1->src_address.as_u32;
+            key4_1.vni = vxlan1->vni_reserved;
+
+	    /* Make sure unicast VXLAN tunnel exist by packet SIP and VNI */
+	    if (PREDICT_FALSE (key4_1.as_u64 != last_key4.as_u64))
+              {
+                p1 = hash_get (vxm->vxlan4_tunnel_by_key, key4_1.as_u64);
+                if (PREDICT_FALSE (p1 == NULL))
+                  {
+                    error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+                    next1 = VXLAN_INPUT_NEXT_DROP;
+                    goto trace1;
+                  }
+                last_key4.as_u64 = key4_1.as_u64;
+                tunnel_index1 = last_tunnel_index = p1[0];
+              }
+            else
+              tunnel_index1 = last_tunnel_index;
+ 	    t1 = pool_elt_at_index (vxm->tunnels, tunnel_index1);
+
+	    /* Validate VXLAN tunnel SIP against packet DIP */
+	    if (PREDICT_TRUE (ip4_1->dst_address.as_u32 == t1->src.ip4.as_u32))
+	      goto next1; /* valid packet */
+	    if (PREDICT_FALSE (ip4_address_is_multicast (&ip4_1->dst_address)))
+	      {
+		key4_1.src = ip4_1->dst_address.as_u32;
+		key4_1.vni = vxlan1->vni_reserved;
+		/* Make sure mcast VXLAN tunnel exist by packet DIP and VNI */
+		p1 = hash_get (vxm->vxlan4_tunnel_by_key, key4_1.as_u64);
+		if (PREDICT_TRUE (p1 != NULL))
+		  {
+		    mt1 = pool_elt_at_index (vxm->tunnels, p1[0]);
+		    goto next1; /* valid packet */
+		  }
+	      }
+	    error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+	    next1 = VXLAN_INPUT_NEXT_DROP;
+	    goto trace1;
+
+         } else /* !is_ip4 */ {
+            key6_1.src.as_u64[0] = ip6_1->src_address.as_u64[0];
+            key6_1.src.as_u64[1] = ip6_1->src_address.as_u64[1];
+            key6_1.vni = vxlan1->vni_reserved;
+
+	    /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
+            if (PREDICT_FALSE (memcmp(&key6_1, &last_key6, sizeof(last_key6)) != 0))
+              {
+                p1 = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6_1);
+
+                if (PREDICT_FALSE (p1 == NULL))
+                  {
+                    error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+                    next1 = VXLAN_INPUT_NEXT_DROP;
+                    goto trace1;
+                  }
+
+                clib_memcpy (&last_key6, &key6_1, sizeof(key6_1));
+                tunnel_index1 = last_tunnel_index = p1[0];
+              }
+            else
+              tunnel_index1 = last_tunnel_index;
+ 	    t1 = pool_elt_at_index (vxm->tunnels, tunnel_index1);
+
+	    /* Validate VXLAN tunnel SIP against packet DIP */
+	    if (PREDICT_TRUE (ip6_address_is_equal (&ip6_1->dst_address,
+						    &t1->src.ip6)))
+		goto next1; /* valid packet */
+	    if (PREDICT_FALSE (ip6_address_is_multicast (&ip6_1->dst_address)))
+	      {
+		key6_1.src.as_u64[0] = ip6_1->dst_address.as_u64[0];
+		key6_1.src.as_u64[1] = ip6_1->dst_address.as_u64[1];
+		key6_1.vni = vxlan1->vni_reserved;
+		p1 = hash_get (vxm->vxlan6_tunnel_by_key, &key6_1);
+		if (PREDICT_TRUE (p1 != NULL)) 
+		  {
+		    mt1 = pool_elt_at_index (vxm->tunnels, p1[0]);
+		    goto next1; /* valid packet */
+		  }
+	      }
+	    error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+	    next1 = VXLAN_INPUT_NEXT_DROP;
+	    goto trace1;
+	  }
+
+	next1:
+          next1 = t1->decap_next_index;
+          sw_if_index1 = t1->sw_if_index;
+          len1 = vlib_buffer_length_in_chain (vm, b1);
+
+          /* Required to make the l2 tag push / pop code work on l2 subifs */
+          if (PREDICT_TRUE(next1 == VXLAN_INPUT_NEXT_L2_INPUT))
+            vnet_update_l2_len (b1);
+
+          /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
+          vnet_buffer(b1)->sw_if_index[VLIB_RX] = sw_if_index1;
+	  sw_if_index1 = (mt1) ? mt1->sw_if_index : sw_if_index1;
+
+          pkts_decapsulated ++;
+          stats_n_packets += 1;
+          stats_n_bytes += len1;
+
+	  /* Batch stats increment on the same vxlan tunnel so counter
+	     is not incremented per packet */
+	  if (PREDICT_FALSE (sw_if_index1 != stats_sw_if_index)) 
+	    {
+	      stats_n_packets -= 1;
+	      stats_n_bytes -= len1;
+	      if (stats_n_packets)
+		vlib_increment_combined_counter 
+		  (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
+		   cpu_index, stats_sw_if_index, 
+		   stats_n_packets, stats_n_bytes);
+	      stats_n_packets = 1;
+	      stats_n_bytes = len1;
+	      stats_sw_if_index = sw_if_index1;
+	    }
+
+        trace1:
+          b1->error = error1 ? node->errors[error1] : 0;
+
+          if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED)) 
+            {
+              vxlan_rx_trace_t *tr 
+                = vlib_add_trace (vm, node, b1, sizeof (*tr));
+              tr->next_index = next1;
+              tr->error = error1;
+              tr->tunnel_index = tunnel_index1;
+              tr->vni = vnet_get_vni (vxlan1);
+            }
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t * b0;
+	  u32 next0;
+          ip4_header_t * ip4_0;
+          ip6_header_t * ip6_0;
+          vxlan_header_t * vxlan0;
+	  uword * p0;
+          u32 tunnel_index0;
+          vxlan_tunnel_t * t0, * mt0 = NULL;
+          vxlan4_tunnel_key_t key4_0;
+          vxlan6_tunnel_key_t key6_0;
+          u32 error0;
+	  u32 sw_if_index0, len0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+          /* udp leaves current_data pointing at the vxlan header */
+          vxlan0 = vlib_buffer_get_current (b0);
+          if (is_ip4) {
+	    vlib_buffer_advance
+	      (b0, -(word)(sizeof(udp_header_t)+sizeof(ip4_header_t)));
+            ip4_0 = vlib_buffer_get_current (b0);
+          } else {
+            vlib_buffer_advance
+              (b0, -(word)(sizeof(udp_header_t)+sizeof(ip6_header_t)));
+            ip6_0 = vlib_buffer_get_current (b0);
+          }
+
+          /* pop (ip, udp, vxlan) */
+          if (is_ip4) {
+            vlib_buffer_advance
+              (b0, sizeof(*ip4_0)+sizeof(udp_header_t)+sizeof(*vxlan0));
+          } else {
+	    vlib_buffer_advance
+              (b0, sizeof(*ip6_0)+sizeof(udp_header_t)+sizeof(*vxlan0));
+          }
+
+          tunnel_index0 = ~0;
+          error0 = 0;
+
+	  if (PREDICT_FALSE (vxlan0->flags != VXLAN_FLAGS_I))
+	    {
+	      error0 = VXLAN_ERROR_BAD_FLAGS;
+	      next0 = VXLAN_INPUT_NEXT_DROP;
+	      goto trace00;
+	    }
+
+          if (is_ip4) {
+            key4_0.src = ip4_0->src_address.as_u32;
+            key4_0.vni = vxlan0->vni_reserved;
+
+	    /* Make sure unicast VXLAN tunnel exist by packet SIP and VNI */
+            if (PREDICT_FALSE (key4_0.as_u64 != last_key4.as_u64))
+              {
+                p0 = hash_get (vxm->vxlan4_tunnel_by_key, key4_0.as_u64);
+                if (PREDICT_FALSE (p0 == NULL))
+                  {
+                    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+                    next0 = VXLAN_INPUT_NEXT_DROP;
+                    goto trace00;
+                  }
+                last_key4.as_u64 = key4_0.as_u64;
+                tunnel_index0 = last_tunnel_index = p0[0];
+              }
+            else
+              tunnel_index0 = last_tunnel_index;
+	    t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
+
+	    /* Validate VXLAN tunnel SIP against packet DIP */
+	    if (PREDICT_TRUE (ip4_0->dst_address.as_u32 == t0->src.ip4.as_u32))
+	      goto next00; /* valid packet */
+	    if (PREDICT_FALSE (ip4_address_is_multicast (&ip4_0->dst_address)))
+	      {
+		key4_0.src = ip4_0->dst_address.as_u32;
+		key4_0.vni = vxlan0->vni_reserved;
+		/* Make sure mcast VXLAN tunnel exist by packet DIP and VNI */
+		p0 = hash_get (vxm->vxlan4_tunnel_by_key, key4_0.as_u64);
+		if (PREDICT_TRUE (p0 != NULL))
+		  {
+		    mt0 = pool_elt_at_index (vxm->tunnels, p0[0]);
+		    goto next00; /* valid packet */
+		  }
+	      }
+	    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+	    next0 = VXLAN_INPUT_NEXT_DROP;
+	    goto trace00;
+
+          } else /* !is_ip4 */ {
+            key6_0.src.as_u64[0] = ip6_0->src_address.as_u64[0];
+            key6_0.src.as_u64[1] = ip6_0->src_address.as_u64[1];
+            key6_0.vni = vxlan0->vni_reserved;
+
+	    /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
+            if (PREDICT_FALSE (memcmp(&key6_0, &last_key6, sizeof(last_key6)) != 0))
+              {
+                p0 = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6_0);
+                if (PREDICT_FALSE (p0 == NULL))
+                  {
+                    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+                    next0 = VXLAN_INPUT_NEXT_DROP;
+                    goto trace00;
+                  }
+                clib_memcpy (&last_key6, &key6_0, sizeof(key6_0));
+                tunnel_index0 = last_tunnel_index = p0[0];
+              }
+            else
+              tunnel_index0 = last_tunnel_index;
+	    t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
+
+	    /* Validate VXLAN tunnel SIP against packet DIP */
+	    if (PREDICT_TRUE (ip6_address_is_equal (&ip6_0->dst_address,
+						    &t0->src.ip6)))
+		goto next00; /* valid packet */
+	    if (PREDICT_FALSE (ip6_address_is_multicast (&ip6_0->dst_address)))
+	      {
+		key6_0.src.as_u64[0] = ip6_0->dst_address.as_u64[0];
+		key6_0.src.as_u64[1] = ip6_0->dst_address.as_u64[1];
+		key6_0.vni = vxlan0->vni_reserved;
+		p0 = hash_get (vxm->vxlan6_tunnel_by_key, &key6_0);
+		if (PREDICT_TRUE (p0 != NULL)) 
+		  {
+		    mt0 = pool_elt_at_index (vxm->tunnels, p0[0]);
+		    goto next00; /* valid packet */
+		  }
+	      }
+	    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+	    next0 = VXLAN_INPUT_NEXT_DROP;
+	    goto trace00;
+          }
+
+	next00:
+          next0 = t0->decap_next_index;
+          sw_if_index0 = t0->sw_if_index;
+          len0 = vlib_buffer_length_in_chain (vm, b0);
+
+          /* Required to make the l2 tag push / pop code work on l2 subifs */
+          if (PREDICT_TRUE(next0 == VXLAN_INPUT_NEXT_L2_INPUT))
+            vnet_update_l2_len (b0);
+
+          /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
+          vnet_buffer(b0)->sw_if_index[VLIB_RX] = sw_if_index0;
+	  sw_if_index0 = (mt0) ? mt0->sw_if_index : sw_if_index0;
+
+          pkts_decapsulated ++;
+          stats_n_packets += 1;
+          stats_n_bytes += len0;
+
+	  /* Batch stats increment on the same vxlan tunnel so counter
+	     is not incremented per packet */
+	  if (PREDICT_FALSE (sw_if_index0 != stats_sw_if_index)) 
+	    {
+	      stats_n_packets -= 1;
+	      stats_n_bytes -= len0;
+	      if (stats_n_packets)
+		vlib_increment_combined_counter 
+		  (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
+		   cpu_index, stats_sw_if_index, 
+		   stats_n_packets, stats_n_bytes);
+	      stats_n_packets = 1;
+	      stats_n_bytes = len0;
+	      stats_sw_if_index = sw_if_index0;
+	    }
+
+        trace00:
+          b0->error = error0 ? node->errors[error0] : 0;
+
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
+            {
+              vxlan_rx_trace_t *tr 
+                = vlib_add_trace (vm, node, b0, sizeof (*tr));
+              tr->next_index = next0;
+              tr->error = error0;
+              tr->tunnel_index = tunnel_index0;
+              tr->vni = vnet_get_vni (vxlan0);
+            }
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  /* Do we still need this now that tunnel tx stats is kept? */
+  vlib_node_increment_counter (vm, is_ip4? 
+			       vxlan4_input_node.index:vxlan6_input_node.index,
+                               VXLAN_ERROR_DECAPSULATED, 
+                               pkts_decapsulated);
+
+  /* Increment any remaining batch stats */
+  if (stats_n_packets)
+    {
+      vlib_increment_combined_counter 
+	(im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
+	 cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
+      node->runtime_data[0] = stats_sw_if_index;
+    }
+
+  return from_frame->n_vectors;
+}
+
+static uword
+vxlan4_input (vlib_main_t * vm,
+             vlib_node_runtime_t * node,
+             vlib_frame_t * from_frame)
+{
+	return vxlan_input(vm, node, from_frame, /* is_ip4 */ 1);
+}
+
+static uword
+vxlan6_input (vlib_main_t * vm,
+             vlib_node_runtime_t * node,
+             vlib_frame_t * from_frame)
+{
+	return vxlan_input(vm, node, from_frame, /* is_ip4 */ 0);
+}
+
+static char * vxlan_error_strings[] = {
+#define vxlan_error(n,s) s,
+#include <vnet/vxlan/vxlan_error.def>
+#undef vxlan_error
+#undef _
+};
+
+VLIB_REGISTER_NODE (vxlan4_input_node) = {
+  .function = vxlan4_input,
+  .name = "vxlan4-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .n_errors = VXLAN_N_ERROR,
+  .error_strings = vxlan_error_strings,
+
+  .n_next_nodes = VXLAN_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [VXLAN_INPUT_NEXT_##s] = n,
+    foreach_vxlan_input_next
+#undef _
+  },
+
+//temp  .format_buffer = format_vxlan_header,
+  .format_trace = format_vxlan_rx_trace,
+  // $$$$ .unformat_buffer = unformat_vxlan_header,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (vxlan4_input_node, vxlan4_input)
+
+VLIB_REGISTER_NODE (vxlan6_input_node) = {
+  .function = vxlan6_input,
+  .name = "vxlan6-input",
+  /* Takes a vector of packets. */
+  .vector_size = sizeof (u32),
+
+  .n_errors = VXLAN_N_ERROR,
+  .error_strings = vxlan_error_strings,
+
+  .n_next_nodes = VXLAN_INPUT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [VXLAN_INPUT_NEXT_##s] = n,
+    foreach_vxlan_input_next
+#undef _
+  },
+
+//temp  .format_buffer = format_vxlan_header,
+  .format_trace = format_vxlan_rx_trace,
+  // $$$$ .unformat_buffer = unformat_vxlan_header,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (vxlan6_input_node, vxlan6_input)
+
+
+typedef enum {
+  IP_VXLAN_BYPASS_NEXT_DROP,
+  IP_VXLAN_BYPASS_NEXT_VXLAN,
+  IP_VXLAN_BYPASS_N_NEXT,
+} ip_vxan_bypass_next_t;
+
+always_inline uword
+ip_vxlan_bypass_inline (vlib_main_t * vm,
+			 vlib_node_runtime_t * node,
+			 vlib_frame_t * frame,
+			 u32 is_ip4)
+{
+  vxlan_main_t * vxm = &vxlan_main;
+  u32 * from, * to_next, n_left_from, n_left_to_next, next_index;
+  vlib_node_runtime_t * error_node = vlib_node_get_runtime (vm, ip4_input_node.index);
+  ip4_address_t addr4; /* last IPv4 address matching a local VTEP address */
+  ip6_address_t addr6; /* last IPv6 address matching a local VTEP address */
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  if (is_ip4) addr4.data_u32 = ~0;
+  else ip6_address_set_zero (&addr6);
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+      	{
+      	  vlib_buffer_t * b0, * b1;
+      	  ip4_header_t * ip0, * ip1;
+      	  udp_header_t * udp0, * udp1;
+      	  u32 bi0, ip_len0, udp_len0, flags0, next0;
+      	  u32 bi1, ip_len1, udp_len1, flags1, next1;
+      	  i32 len_diff0, len_diff1;
+      	  u8 error0, good_udp0, proto0;
+      	  u8 error1, good_udp1, proto1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * p2, * p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+	    CLIB_PREFETCH (p3->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+	  }
+
+      	  bi0 = to_next[0] = from[0];
+      	  bi1 = to_next[1] = from[1];
+      	  from += 2;
+      	  n_left_from -= 2;
+      	  to_next += 2;
+      	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+	  ip0 = vlib_buffer_get_current (b0);
+	  ip1 = vlib_buffer_get_current (b1);
+
+	  /* Setup packet for next IP feature */
+	  vnet_feature_next(vnet_buffer(b0)->sw_if_index[VLIB_RX], &next0, b0);
+	  vnet_feature_next(vnet_buffer(b1)->sw_if_index[VLIB_RX], &next1, b1);
+
+	  /* Treat IP frag packets as "experimental" protocol for now
+	     until support of IP frag reassembly is implemented */
+	  proto0 = ip4_is_fragment(ip0) ? 0xfe : ip0->protocol;
+	  proto1 = ip4_is_fragment(ip1) ? 0xfe : ip1->protocol;
+
+	  /* Process packet 0 */
+	  if (proto0 != IP_PROTOCOL_UDP)
+	    goto exit0; /* not UDP packet */
+
+	  udp0 = ip4_next_header (ip0);
+	  if (udp0->dst_port != clib_host_to_net_u16 (UDP_DST_PORT_vxlan))
+	    goto exit0; /* not VXLAN packet */
+
+	  if (is_ip4) 
+	    {
+	      if (addr4.as_u32 != ip0->dst_address.as_u32)
+	        {
+		  if (!hash_get (vxm->vtep4, ip0->dst_address.as_u32))
+		    goto exit0; /* no local VTEP for VXLAN packet */
+		  addr4 = ip0->dst_address;
+	        }
+	    }
+	  else goto exit0; /* IP6 VXLAN bypass not yet supported */
+
+	  /* vxlan-input node expect current at VXLAN header */
+	  vlib_buffer_advance (b0, sizeof(ip4_header_t)+sizeof(udp_header_t));
+
+	  flags0 = b0->flags;
+	  good_udp0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+
+	  /* Don't verify UDP checksum for packets with explicit zero checksum. */
+	  good_udp0 |= udp0->checksum == 0;
+
+	  /* Verify UDP length */
+	  ip_len0 = clib_net_to_host_u16 (ip0->length);
+	  udp_len0 = clib_net_to_host_u16 (udp0->length);
+
+	  len_diff0 = ip_len0 - udp_len0;
+
+	  /* Verify UDP checksum */
+	  if (PREDICT_FALSE (!good_udp0))
+	    {
+	      if (!(flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
+		  flags0 = ip4_tcp_udp_validate_checksum (vm, b0);
+	      good_udp0 =
+		  (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	    }
+
+	  error0 = good_udp0 ? 0 : IP4_ERROR_UDP_CHECKSUM;
+	  error0 = (len_diff0 >= 0) ? error0 : IP4_ERROR_UDP_LENGTH;
+
+	  next0 = error0 ? 
+	    IP_VXLAN_BYPASS_NEXT_DROP : IP_VXLAN_BYPASS_NEXT_VXLAN;
+	  b0->error = error0 ? error_node->errors[error0] : 0;
+
+	exit0:
+	  /* Process packet 1 */
+	  if (proto1 != IP_PROTOCOL_UDP)
+	    goto exit1; /* not UDP packet */
+
+	  udp1 = ip4_next_header (ip1);
+	  if (udp1->dst_port != clib_host_to_net_u16 (UDP_DST_PORT_vxlan))
+	    goto exit1; /* not VXLAN packet */
+
+	  if (is_ip4) 
+	    {
+	      if (addr4.as_u32 != ip1->dst_address.as_u32)
+	        {
+		  if (!hash_get (vxm->vtep4, ip1->dst_address.as_u32))
+		    goto exit1; /* no local VTEP for VXLAN packet */
+		  addr4 = ip1->dst_address;
+	        }
+	    }
+	  else goto exit1; /* IP6 VXLAN bypass not yet supported */
+
+	  /* vxlan-input node expect current at VXLAN header */
+	  vlib_buffer_advance (b1, sizeof(ip4_header_t)+sizeof(udp_header_t));
+
+	  flags1 = b1->flags;
+	  good_udp1 = (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+
+	  /* Don't verify UDP checksum for packets with explicit zero checksum. */
+	  good_udp1 |= udp1->checksum == 0;
+
+	  /* Verify UDP length */
+	  ip_len1 = clib_net_to_host_u16 (ip1->length);
+	  udp_len1 = clib_net_to_host_u16 (udp1->length);
+
+	  len_diff1 = ip_len1 - udp_len1;
+
+	  /* Verify UDP checksum */
+	  if (PREDICT_FALSE (!good_udp1))
+	    {
+	      if (!(flags1 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
+		  flags1 = ip4_tcp_udp_validate_checksum (vm, b1);
+	      good_udp1 =
+		  (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	    }
+
+	  error1 = good_udp1 ? 0 : IP4_ERROR_UDP_CHECKSUM;
+	  error1 = (len_diff1 >= 0) ? error1 : IP4_ERROR_UDP_LENGTH;
+
+	  next1 = error1 ? 
+	    IP_VXLAN_BYPASS_NEXT_DROP : IP_VXLAN_BYPASS_NEXT_VXLAN;
+	  b1->error = error1 ? error_node->errors[error1] : 0;
+ 
+	exit1:
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t * b0;
+	  ip4_header_t * ip0;
+	  udp_header_t * udp0;
+      	  u32 bi0, ip_len0, udp_len0, flags0, next0;
+	  i32 len_diff0;
+	  u8 error0, good_udp0, proto0;
+
+	  bi0 = to_next[0] = from[0];
+	  from += 1;
+	  n_left_from -= 1;
+	  to_next += 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  ip0 = vlib_buffer_get_current (b0);
+
+	  /* Setup packet for next IP feature */
+	  vnet_feature_next(vnet_buffer(b0)->sw_if_index[VLIB_RX], &next0, b0);
+
+	  /* Treat IP frag packets as "experimental" protocol for now
+	     until support of IP frag reassembly is implemented */
+	  proto0 = ip4_is_fragment(ip0) ? 0xfe : ip0->protocol;
+
+	  if (proto0 != IP_PROTOCOL_UDP)
+	    goto exit; /* not UDP packet */
+
+	  udp0 = ip4_next_header (ip0);
+	  if (udp0->dst_port != clib_host_to_net_u16 (UDP_DST_PORT_vxlan))
+	    goto exit; /* not VXLAN packet */
+
+	  if (is_ip4) 
+	    {
+	      if (addr4.as_u32 != ip0->dst_address.as_u32)
+	        {
+		  if (!hash_get (vxm->vtep4, ip0->dst_address.as_u32))
+		    goto exit; /* no local VTEP for VXLAN packet */
+		  addr4 = ip0->dst_address;
+	        }
+	    }
+	  else goto exit; /* IP6 VXLAN bypass not yet supported */
+
+	  /* vxlan-input node expect current at VXLAN header */
+	  vlib_buffer_advance (b0, sizeof(ip4_header_t)+sizeof(udp_header_t));
+
+	  flags0 = b0->flags;
+	  good_udp0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+
+	  /* Don't verify UDP checksum for packets with explicit zero checksum. */
+	  good_udp0 |= udp0->checksum == 0;
+
+	  /* Verify UDP length */
+	  ip_len0 = clib_net_to_host_u16 (ip0->length);
+	  udp_len0 = clib_net_to_host_u16 (udp0->length);
+
+	  len_diff0 = ip_len0 - udp_len0;
+
+	  /* Verify UDP checksum */
+	  if (PREDICT_FALSE (!good_udp0))
+	    {
+	      if (!(flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
+		  flags0 = ip4_tcp_udp_validate_checksum (vm, b0);
+	      good_udp0 =
+		  (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	    }
+
+	  error0 = good_udp0 ? 0 : IP4_ERROR_UDP_CHECKSUM;
+	  error0 = (len_diff0 >= 0) ? error0 : IP4_ERROR_UDP_LENGTH;
+
+	  next0 = error0 ? 
+	    IP_VXLAN_BYPASS_NEXT_DROP : IP_VXLAN_BYPASS_NEXT_VXLAN;
+	  b0->error = error0 ? error_node->errors[error0] : 0;
+
+	exit:
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+static uword
+ip4_vxlan_bypass (vlib_main_t * vm,
+		  vlib_node_runtime_t * node,
+		  vlib_frame_t * frame)
+{
+  return ip_vxlan_bypass_inline (vm, node, frame, /* is_ip4 */ 1);
+}
+
+VLIB_REGISTER_NODE (ip4_vxlan_bypass_node) = {
+  .function = ip4_vxlan_bypass,
+  .name = "ip4-vxlan-bypass",
+  .vector_size = sizeof (u32),
+
+  .n_next_nodes = IP_VXLAN_BYPASS_N_NEXT,
+  .next_nodes = {
+    [IP_VXLAN_BYPASS_NEXT_DROP] = "error-drop",
+    [IP_VXLAN_BYPASS_NEXT_VXLAN] = "vxlan4-input",
+  },
+
+  .format_buffer = format_ip4_header,
+  .format_trace = format_ip4_forward_next_trace,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_vxlan_bypass_node,ip4_vxlan_bypass)
+
+
+static clib_error_t *
+set_ip_vxlan_bypass (vlib_main_t * vm,
+		     unformat_input_t * input,
+		     vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, * line_input = &_line_input;
+  vnet_main_t * vnm = vnet_get_main();
+  clib_error_t * error = 0;
+  u32 sw_if_index, is_del;
+
+  sw_if_index = ~0;
+  is_del = 0;
+
+  if (! unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat_user (line_input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+	  ;
+      else if (unformat (line_input, "del"))
+        is_del = 1;
+      else
+        {
+	  error = unformat_parse_error (line_input);
+	  goto done;
+	}
+    }
+
+  if (~0 == sw_if_index)
+    {
+      error = clib_error_return (0, "unknown interface `%U'",
+				 format_unformat_error, line_input);
+      goto done;
+    }
+
+  vnet_feature_enable_disable ("ip4-unicast", "ip4-vxlan-bypass", sw_if_index,
+			       is_del == 0, 0, 0);
+ done:
+  return error;
+}
+
+/*?
+ * This command adds the 'ip4-vxlan-bypass' graph node for a given interface. 
+ * By adding the IPv4 vxlan-bypass graph node to an interface, the node checks
+ *  for and validate input vxlan packet and bypass ip4-lookup, ip4-local, 
+ * ip4-udp-lookup nodes to speedup vxlan packet forwarding. This node will 
+ * cause extra overhead to for non-vxlan packets which is kept at a minimum.
+ *
+ * @cliexpar
+ * @parblock
+ * Example of graph node before ip4-vxlan-bypass is enabled:
+ * @cliexstart{show vlib graph ip4-vxlan-bypass}
+ *            Name                      Next                    Previous
+ * ip4-vxlan-bypass                error-drop [0]
+ *                                vxlan4-input [1]
+ *                                 ip4-lookup [2]      
+ * @cliexend
+ *
+ * Example of how to enable ip4-vxlan-bypass on an interface:
+ * @cliexcmd{set interface ip vxlan-bypass GigabitEthernet2/0/0}
+ *
+ * Example of graph node after ip4-vxlan-bypass is enabled:
+ * @cliexstart{show vlib graph ip4-vxlan-bypass}
+ *            Name                      Next                    Previous         
+ * ip4-vxlan-bypass                error-drop [0]               ip4-input        
+ *                                vxlan4-input [1]        ip4-input-no-checksum  
+ *                                 ip4-lookup [2]      
+ * @cliexend
+ *
+ * Example of how to display the feature enabed on an interface:
+ * @cliexstart{show ip interface features GigabitEthernet2/0/0}
+ * IP feature paths configured on GigabitEthernet2/0/0...
+ *
+ * ipv4 unicast:
+ *   ip4-vxlan-bypass
+ *   ip4-lookup
+ *
+ * ipv4 multicast:
+ *   ip4-lookup-multicast
+ *
+ * ipv4 multicast:
+ *   interface-output
+ *
+ * ipv6 unicast:
+ *   ip6-lookup
+ *
+ * ipv6 multicast:
+ *   ip6-lookup
+ *
+ * ipv6 multicast:
+ *   interface-output
+ * @cliexend
+ *
+ * Example of how to disable unicast source checking on an interface:
+ * @cliexcmd{set interface ip vxlan-bypass GigabitEthernet2/0/0 del}
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_interface_ip_vxlan_bypass_command, static) = {
+  .path = "set interface ip vxlan-bypass",
+  .function = set_ip_vxlan_bypass,
+  .short_help = "set interface ip vxlan-bypass <interface> [del]",
+};
+
+/* Dummy init function to get us linked in. */
+clib_error_t * ip4_vxlan_bypass_init (vlib_main_t * vm)
+{ return 0; }
+
+VLIB_INIT_FUNCTION (ip4_vxlan_bypass_init);
diff --git a/src/vnet/vxlan/dir.dox b/src/vnet/vxlan/dir.dox
new file mode 100644
index 00000000..31a9e2b6
--- /dev/null
+++ b/src/vnet/vxlan/dir.dox
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+@dir
+@brief VXLAN Code.
+
+This directory contains source code to support VXLAN.
+
+*/
+/*? %%clicmd:group_label VXLAN CLI %% ?*/
diff --git a/src/vnet/vxlan/encap.c b/src/vnet/vxlan/encap.c
new file mode 100644
index 00000000..5b63064a
--- /dev/null
+++ b/src/vnet/vxlan/encap.c
@@ -0,0 +1,553 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/vxlan/vxlan.h>
+
+/* Statistics (not all errors) */
+#define foreach_vxlan_encap_error    \
+_(ENCAPSULATED, "good packets encapsulated")
+
+static char * vxlan_encap_error_strings[] = {
+#define _(sym,string) string,
+  foreach_vxlan_encap_error
+#undef _
+};
+
+typedef enum {
+#define _(sym,str) VXLAN_ENCAP_ERROR_##sym,
+    foreach_vxlan_encap_error
+#undef _
+    VXLAN_ENCAP_N_ERROR,
+} vxlan_encap_error_t;
+
+typedef enum {
+    VXLAN_ENCAP_NEXT_DROP,
+    VXLAN_ENCAP_N_NEXT,
+} vxlan_encap_next_t;
+
+typedef struct {
+  u32 tunnel_index;
+  u32 vni;
+} vxlan_encap_trace_t;
+
+u8 * format_vxlan_encap_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  vxlan_encap_trace_t * t 
+      = va_arg (*args, vxlan_encap_trace_t *);
+
+  s = format (s, "VXLAN encap to vxlan_tunnel%d vni %d", 
+	      t->tunnel_index, t->vni);
+  return s;
+}
+
+
+#define foreach_fixed_header4_offset            \
+    _(0) _(1) _(2) _(3)
+
+#define foreach_fixed_header6_offset            \
+    _(0) _(1) _(2) _(3) _(4) _(5) _(6)
+
+always_inline uword
+vxlan_encap_inline (vlib_main_t * vm,
+		    vlib_node_runtime_t * node,
+		    vlib_frame_t * from_frame,
+		    u32 is_ip4)
+{
+  u32 n_left_from, next_index, * from, * to_next;
+  vxlan_main_t * vxm = &vxlan_main;
+  vnet_main_t * vnm = vxm->vnet_main;
+  vnet_interface_main_t * im = &vnm->interface_main;
+  u32 pkts_encapsulated = 0;
+  u16 old_l0 = 0, old_l1 = 0;
+  u32 cpu_index = os_get_cpu_number();
+  u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
+  u32 sw_if_index0 = 0, sw_if_index1 = 0;
+  u32 next0 = 0, next1 = 0;
+  vnet_hw_interface_t * hi0, * hi1;
+  vxlan_tunnel_t * t0 = NULL, * t1 = NULL;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+  stats_sw_if_index = node->runtime_data[0];
+  stats_n_packets = stats_n_bytes = 0;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+          u32 bi0, bi1;
+	  vlib_buffer_t * b0, * b1;
+          u32 flow_hash0, flow_hash1;
+	  u32 len0, len1;
+          ip4_header_t * ip4_0, * ip4_1;
+          ip6_header_t * ip6_0, * ip6_1;
+          udp_header_t * udp0, * udp1;
+          u64 * copy_src0, * copy_dst0;
+          u64 * copy_src1, * copy_dst1;
+          u32 * copy_src_last0, * copy_dst_last0;
+          u32 * copy_src_last1, * copy_dst_last1;
+          u16 new_l0, new_l1;
+          ip_csum_t sum0, sum1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * p2, * p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+	    CLIB_PREFETCH (p3->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+          flow_hash0 = vnet_l2_compute_flow_hash (b0);
+          flow_hash1 = vnet_l2_compute_flow_hash (b1);
+
+	  /* Get next node index and adj index from tunnel next_dpo */
+	  if (sw_if_index0 != vnet_buffer(b0)->sw_if_index[VLIB_TX])
+	    {
+	      sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_TX];
+	      hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
+	      t0 = &vxm->tunnels[hi0->dev_instance];
+	      /* Note: change to always set next0 if it may be set to drop */
+	      next0 = t0->next_dpo.dpoi_next_node;
+	    }
+          vnet_buffer(b0)->ip.adj_index[VLIB_TX] = t0->next_dpo.dpoi_index;
+
+	  /* Get next node index and adj index from tunnel next_dpo */
+	  if (sw_if_index1 != vnet_buffer(b1)->sw_if_index[VLIB_TX])
+	    {
+	      sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_TX];
+	      hi1 = vnet_get_sup_hw_interface (vnm, sw_if_index1); 
+	      t1 = &vxm->tunnels[hi1->dev_instance];
+	      /* Note: change to always set next1 if it may be set to drop */
+	      next1 = t1->next_dpo.dpoi_next_node;
+	    }
+          vnet_buffer(b1)->ip.adj_index[VLIB_TX] = t1->next_dpo.dpoi_index;
+
+          /* Apply the rewrite string. $$$$ vnet_rewrite? */
+          vlib_buffer_advance (b0, -(word)_vec_len(t0->rewrite));
+          vlib_buffer_advance (b1, -(word)_vec_len(t1->rewrite));
+
+	  if (is_ip4)
+	    {
+	      /* IP4 VXLAN header should be 36 octects */
+              ASSERT(sizeof(ip4_vxlan_header_t) == 36);
+              ASSERT(vec_len(t0->rewrite) == sizeof(ip4_vxlan_header_t));
+	      ASSERT(vec_len(t1->rewrite) == sizeof(ip4_vxlan_header_t));
+
+	      ip4_0 = vlib_buffer_get_current(b0);
+	      ip4_1 = vlib_buffer_get_current(b1);
+
+	      /* Copy the fixed header */
+	      copy_dst0 = (u64 *) ip4_0;
+	      copy_src0 = (u64 *) t0->rewrite;
+	      copy_dst1 = (u64 *) ip4_1;
+	      copy_src1 = (u64 *) t1->rewrite;
+	      /* Copy first 32 octets 8-bytes at a time */
+#define _(offs) copy_dst0[offs] = copy_src0[offs];
+	      foreach_fixed_header4_offset;
+#undef _
+#define _(offs) copy_dst1[offs] = copy_src1[offs];
+	      foreach_fixed_header4_offset;
+#undef _
+	      /* Last 4 octets. Hopefully gcc will be our friend */
+              copy_dst_last0 = (u32 *)(&copy_dst0[4]);
+              copy_src_last0 = (u32 *)(&copy_src0[4]);
+              copy_dst_last0[0] = copy_src_last0[0];
+              copy_dst_last1 = (u32 *)(&copy_dst1[4]);
+              copy_src_last1 = (u32 *)(&copy_src1[4]);
+              copy_dst_last1[0] = copy_src_last1[0];
+
+	      /* Fix the IP4 checksum and length */
+	      sum0 = ip4_0->checksum;
+	      new_l0 = /* old_l0 always 0, see the rewrite setup */ 
+                clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
+              sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
+				     length /* changed member */);
+	      ip4_0->checksum = ip_csum_fold (sum0);
+	      ip4_0->length = new_l0;
+	      sum1 = ip4_1->checksum;
+	      new_l1 = /* old_l1 always 0, see the rewrite setup */
+                clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1));
+              sum1 = ip_csum_update (sum1, old_l1, new_l1, ip4_header_t,
+				     length /* changed member */);
+	      ip4_1->checksum = ip_csum_fold (sum1);
+	      ip4_1->length = new_l1;
+
+	      /* Fix UDP length and set source port */
+	      udp0 = (udp_header_t *)(ip4_0+1);
+	      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain(vm, b0)
+					     - sizeof (*ip4_0));
+	      udp0->length = new_l0;
+	      udp0->src_port = flow_hash0;
+	      udp1 = (udp_header_t *)(ip4_1+1);
+	      new_l1 = clib_host_to_net_u16 (vlib_buffer_length_in_chain(vm, b1)
+					     - sizeof (*ip4_1));
+	      udp1->length = new_l1;
+	      udp1->src_port = flow_hash1;
+	    }
+	  else /* ipv6 */
+	    {
+              int bogus = 0;
+
+	      /* IP6 VXLAN header should be 56 octects */
+              ASSERT(sizeof(ip6_vxlan_header_t) == 56);
+              ASSERT(vec_len(t0->rewrite) == sizeof(ip6_vxlan_header_t));
+	      ASSERT(vec_len(t1->rewrite) == sizeof(ip6_vxlan_header_t));
+	      ip6_0 = vlib_buffer_get_current(b0);
+	      ip6_1 = vlib_buffer_get_current(b1);
+
+	      /* Copy the fixed header */
+	      copy_dst0 = (u64 *) ip6_0;
+	      copy_src0 = (u64 *) t0->rewrite;
+	      copy_dst1 = (u64 *) ip6_1;
+	      copy_src1 = (u64 *) t1->rewrite;
+	      /* Copy first 56 (ip6) octets 8-bytes at a time */
+#define _(offs) copy_dst0[offs] = copy_src0[offs];
+	      foreach_fixed_header6_offset;
+#undef _
+#define _(offs) copy_dst1[offs] = copy_src1[offs];
+	      foreach_fixed_header6_offset;
+#undef _
+	      /* Fix IP6 payload length */
+	      new_l0 =
+                clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
+				      - sizeof(*ip6_0));
+	      ip6_0->payload_length = new_l0;
+	      new_l1 =
+                clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1)
+				      - sizeof(*ip6_1));
+	      ip6_1->payload_length = new_l1;
+
+	      /* Fix UDP length  and set source port */
+	      udp0 = (udp_header_t *)(ip6_0+1);
+	      udp0->length = new_l0;
+	      udp0->src_port = flow_hash0;
+	      udp1 = (udp_header_t *)(ip6_1+1);
+	      udp1->length = new_l1;
+	      udp1->src_port = flow_hash1;
+
+	      /* IPv6 UDP checksum is mandatory */
+	      udp0->checksum = ip6_tcp_udp_icmp_compute_checksum(vm, b0,
+								 ip6_0, &bogus);
+	      ASSERT(bogus == 0);
+	      if (udp0->checksum == 0)
+		udp0->checksum = 0xffff;
+	      udp1->checksum = ip6_tcp_udp_icmp_compute_checksum(vm, b1,
+                                                        ip6_1, &bogus);
+	      ASSERT(bogus == 0);
+	      if (udp1->checksum == 0)
+		udp1->checksum = 0xffff;
+	    }
+
+          pkts_encapsulated += 2;
+ 	  len0 = vlib_buffer_length_in_chain (vm, b0);
+ 	  len1 = vlib_buffer_length_in_chain (vm, b1);
+	  stats_n_packets += 2;
+	  stats_n_bytes += len0 + len1;
+
+	  /* Batch stats increment on the same vxlan tunnel so counter is not
+	     incremented per packet. Note stats are still incremented for deleted
+	     and admin-down tunnel where packets are dropped. It is not worthwhile
+	     to check for this rare case and affect normal path performance. */
+	  if (PREDICT_FALSE ((sw_if_index0 != stats_sw_if_index) ||
+			     (sw_if_index1 != stats_sw_if_index))) 
+	    {
+	      stats_n_packets -= 2;
+	      stats_n_bytes -= len0 + len1;
+	      if (sw_if_index0 == sw_if_index1) 
+	        {
+		  if (stats_n_packets) 
+		    vlib_increment_combined_counter 
+		      (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
+		       cpu_index, stats_sw_if_index, 
+		       stats_n_packets, stats_n_bytes);
+		  stats_sw_if_index = sw_if_index0;
+		  stats_n_packets = 2;
+		  stats_n_bytes = len0 + len1;
+	        }
+	      else 
+	        {
+		  vlib_increment_combined_counter 
+		      (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
+		       cpu_index, sw_if_index0, 1, len0);
+		  vlib_increment_combined_counter 
+		      (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
+		       cpu_index, sw_if_index1, 1, len1);
+		}
+	    }
+
+	  if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
+            {
+              vxlan_encap_trace_t *tr = 
+                vlib_add_trace (vm, node, b0, sizeof (*tr));
+              tr->tunnel_index = t0 - vxm->tunnels;
+              tr->vni = t0->vni;
+           }
+
+          if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED)) 
+            {
+              vxlan_encap_trace_t *tr = 
+                vlib_add_trace (vm, node, b1, sizeof (*tr));
+              tr->tunnel_index = t1 - vxm->tunnels;
+              tr->vni = t1->vni;
+            }
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t * b0;
+          u32 flow_hash0;
+	  u32 len0;
+          ip4_header_t * ip4_0;
+          ip6_header_t * ip6_0;
+          udp_header_t * udp0;
+          u64 * copy_src0, * copy_dst0;
+          u32 * copy_src_last0, * copy_dst_last0;
+          u16 new_l0;
+          ip_csum_t sum0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+          flow_hash0 = vnet_l2_compute_flow_hash(b0);
+
+	  /* Get next node index and adj index from tunnel next_dpo */
+	  if (sw_if_index0 != vnet_buffer(b0)->sw_if_index[VLIB_TX])
+	    {
+	      sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_TX];
+	      hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
+	      t0 = &vxm->tunnels[hi0->dev_instance];
+	      /* Note: change to always set next0 if it may be set to drop */
+	      next0 = t0->next_dpo.dpoi_next_node;
+	    }
+	  vnet_buffer(b0)->ip.adj_index[VLIB_TX] = t0->next_dpo.dpoi_index;
+
+          /* Apply the rewrite string. $$$$ vnet_rewrite? */
+          vlib_buffer_advance (b0, -(word)_vec_len(t0->rewrite));
+
+	  if (is_ip4)
+	    {
+	      /* IP4 VXLAN header should be 36 octects */
+              ASSERT(sizeof(ip4_vxlan_header_t) == 36);
+              ASSERT(vec_len(t0->rewrite) == sizeof(ip4_vxlan_header_t));
+	      ip4_0 = vlib_buffer_get_current(b0);
+
+	      /* Copy the fixed header */
+	      copy_dst0 = (u64 *) ip4_0;
+	      copy_src0 = (u64 *) t0->rewrite;
+	      /* Copy first 32 octets 8-bytes at a time */
+#define _(offs) copy_dst0[offs] = copy_src0[offs];
+	      foreach_fixed_header4_offset;
+#undef _
+	      /* Last 4 octets. Hopefully gcc will be our friend */
+              copy_dst_last0 = (u32 *)(&copy_dst0[4]);
+              copy_src_last0 = (u32 *)(&copy_src0[4]);
+              copy_dst_last0[0] = copy_src_last0[0];
+
+	      /* Fix the IP4 checksum and length */
+	      sum0 = ip4_0->checksum;
+	      new_l0 = /* old_l0 always 0, see the rewrite setup */ 
+                clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
+              sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
+				     length /* changed member */);
+	      ip4_0->checksum = ip_csum_fold (sum0);
+	      ip4_0->length = new_l0;
+
+	      /* Fix UDP length and set source port */
+	      udp0 = (udp_header_t *)(ip4_0+1);
+	      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain(vm, b0)
+					     - sizeof (*ip4_0));
+	      udp0->length = new_l0;
+	      udp0->src_port = flow_hash0;
+	    }
+
+	  else /* ip6 path */
+	    {
+              int bogus = 0;
+
+	      /* IP6 VXLAN header should be 56 octects */
+              ASSERT(sizeof(ip6_vxlan_header_t) == 56);
+              ASSERT(vec_len(t0->rewrite) == sizeof(ip6_vxlan_header_t));
+	      ip6_0 = vlib_buffer_get_current(b0);
+	      /* Copy the fixed header */
+	      copy_dst0 = (u64 *) ip6_0;
+	      copy_src0 = (u64 *) t0->rewrite;
+	      /* Copy first 56 (ip6) octets 8-bytes at a time */
+#define _(offs) copy_dst0[offs] = copy_src0[offs];
+	      foreach_fixed_header6_offset;
+#undef _
+	      /* Fix IP6 payload length */
+	      new_l0 =
+                clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
+				      - sizeof(*ip6_0));
+	      ip6_0->payload_length = new_l0;
+
+	      /* Fix UDP length  and set source port */
+	      udp0 = (udp_header_t *)(ip6_0+1);
+	      udp0->length = new_l0;
+	      udp0->src_port = flow_hash0;
+
+	      /* IPv6 UDP checksum is mandatory */
+	      udp0->checksum = ip6_tcp_udp_icmp_compute_checksum(vm, b0,
+								 ip6_0, &bogus);
+	      ASSERT(bogus == 0);
+	      if (udp0->checksum == 0)
+		udp0->checksum = 0xffff;
+	    }
+
+          pkts_encapsulated ++;
+	  len0 = vlib_buffer_length_in_chain (vm, b0);
+	  stats_n_packets += 1;
+	  stats_n_bytes += len0;
+
+	  /* Batch stats increment on the same vxlan tunnel so counter is not
+	     incremented per packet. Note stats are still incremented for deleted
+	     and admin-down tunnel where packets are dropped. It is not worthwhile
+	     to check for this rare case and affect normal path performance. */
+	  if (PREDICT_FALSE (sw_if_index0 != stats_sw_if_index)) 
+	    {
+	      stats_n_packets -= 1;
+	      stats_n_bytes -= len0;
+	      if (stats_n_packets)
+		vlib_increment_combined_counter 
+		  (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
+		   cpu_index, stats_sw_if_index, 
+		   stats_n_packets, stats_n_bytes);
+	      stats_n_packets = 1;
+	      stats_n_bytes = len0;
+	      stats_sw_if_index = sw_if_index0;
+	    }
+
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
+            {
+              vxlan_encap_trace_t *tr = 
+                vlib_add_trace (vm, node, b0, sizeof (*tr));
+              tr->tunnel_index = t0 - vxm->tunnels;
+              tr->vni = t0->vni;
+            }
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  /* Do we still need this now that tunnel tx stats is kept? */
+  vlib_node_increment_counter (vm, node->node_index, 
+                               VXLAN_ENCAP_ERROR_ENCAPSULATED, 
+                               pkts_encapsulated);
+
+  /* Increment any remaining batch stats */
+  if (stats_n_packets)
+    {
+      vlib_increment_combined_counter 
+	(im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
+	 cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
+      node->runtime_data[0] = stats_sw_if_index;
+    }
+
+  return from_frame->n_vectors;
+}
+
+static uword
+vxlan4_encap (vlib_main_t * vm,
+	      vlib_node_runtime_t * node,
+	      vlib_frame_t * from_frame)
+{
+  return vxlan_encap_inline (vm, node, from_frame, /* is_ip4 */ 1);
+}
+
+static uword
+vxlan6_encap (vlib_main_t * vm,
+	      vlib_node_runtime_t * node,
+	      vlib_frame_t * from_frame)
+{
+  return vxlan_encap_inline (vm, node, from_frame, /* is_ip4 */ 0);
+}
+
+VLIB_REGISTER_NODE (vxlan4_encap_node) = {
+  .function = vxlan4_encap,
+  .name = "vxlan4-encap",
+  .vector_size = sizeof (u32),
+  .format_trace = format_vxlan_encap_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN(vxlan_encap_error_strings),
+  .error_strings = vxlan_encap_error_strings,
+  .n_next_nodes = VXLAN_ENCAP_N_NEXT,
+  .next_nodes = {
+        [VXLAN_ENCAP_NEXT_DROP] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (vxlan4_encap_node, vxlan4_encap)
+
+VLIB_REGISTER_NODE (vxlan6_encap_node) = {
+  .function = vxlan6_encap,
+  .name = "vxlan6-encap",
+  .vector_size = sizeof (u32),
+  .format_trace = format_vxlan_encap_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN(vxlan_encap_error_strings),
+  .error_strings = vxlan_encap_error_strings,
+  .n_next_nodes = VXLAN_ENCAP_N_NEXT,
+  .next_nodes = {
+        [VXLAN_ENCAP_NEXT_DROP] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (vxlan6_encap_node, vxlan6_encap)
+
diff --git a/src/vnet/vxlan/vxlan.api b/src/vnet/vxlan/vxlan.api
new file mode 100644
index 00000000..048220fb
--- /dev/null
+++ b/src/vnet/vxlan/vxlan.api
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ define vxlan_add_del_tunnel
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 is_ipv6;
+  u8 src_address[16];
+  u8 dst_address[16];
+  u32 mcast_sw_if_index;
+  u32 encap_vrf_id;
+  u32 decap_next_index;
+  u32 vni;
+};
+
+define vxlan_add_del_tunnel_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+};
+
+define vxlan_tunnel_dump
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+};
+
+define vxlan_tunnel_details
+{
+  u32 context;
+  u32 sw_if_index;
+  u8 src_address[16];
+  u8 dst_address[16];
+  u32 mcast_sw_if_index;
+  u32 encap_vrf_id;
+  u32 decap_next_index;
+  u32 vni;
+  u8 is_ipv6;
+};
+
+/** \brief Interface set vxlan-bypass request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface used to reach neighbor
+    @param is_ipv6 - if non-zero, enable ipv6-vxlan-bypass, else ipv4-vxlan-bypass
+    @param enable - if non-zero enable, else disable
+*/
+define sw_interface_set_vxlan_bypass
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 is_ipv6;
+  u8 enable;
+};
+
+/** \brief Interface set vxlan-bypass response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define sw_interface_set_vxlan_bypass_reply
+{
+  u32 context;
+  i32 retval;
+};
\ No newline at end of file
diff --git a/src/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c
new file mode 100644
index 00000000..abf0182f
--- /dev/null
+++ b/src/vnet/vxlan/vxlan.c
@@ -0,0 +1,899 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/vxlan/vxlan.h>
+#include <vnet/ip/format.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/dpo/receive_dpo.h>
+#include <vlib/vlib.h>
+
+/**
+ * @file
+ * @brief VXLAN.
+ *
+ * VXLAN provides the features needed to allow L2 bridge domains (BDs)
+ * to span multiple servers. This is done by building an L2 overlay on
+ * top of an L3 network underlay using VXLAN tunnels.
+ *
+ * This makes it possible for servers to be co-located in the same data
+ * center or be separated geographically as long as they are reachable
+ * through the underlay L3 network.
+ *
+ * You can refer to this kind of L2 overlay bridge domain as a VXLAN
+ * (Virtual eXtensible VLAN) segment.
+ */
+
+
+vxlan_main_t vxlan_main;
+
+static u8 * format_decap_next (u8 * s, va_list * args)
+{
+  u32 next_index = va_arg (*args, u32);
+
+  switch (next_index)
+    {
+    case VXLAN_INPUT_NEXT_DROP:
+      return format (s, "drop");
+    case VXLAN_INPUT_NEXT_L2_INPUT:
+      return format (s, "l2");
+    default:
+      return format (s, "index %d", next_index);
+    }
+  return s;
+}
+
+u8 * format_vxlan_tunnel (u8 * s, va_list * args)
+{
+  vxlan_tunnel_t * t = va_arg (*args, vxlan_tunnel_t *);
+  vxlan_main_t * ngm = &vxlan_main;
+
+  s = format (s, "[%d] src %U dst %U vni %d sw_if_index %d ",
+              t - ngm->tunnels,
+              format_ip46_address, &t->src, IP46_TYPE_ANY,
+              format_ip46_address, &t->dst, IP46_TYPE_ANY,
+              t->vni, t->sw_if_index);
+
+  if (ip46_address_is_multicast (&t->dst))
+    s = format (s, "mcast_sw_if_index %d ", t->mcast_sw_if_index);
+
+  s = format (s, "encap_fib_index %d fib_entry_index %d decap_next %U\n", 
+	      t->encap_fib_index, t->fib_entry_index,
+	      format_decap_next, t->decap_next_index);
+  return s;
+}
+
+static u8 * format_vxlan_name (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  return format (s, "vxlan_tunnel%d", dev_instance);
+}
+
+static uword dummy_interface_tx (vlib_main_t * vm,
+                                 vlib_node_runtime_t * node,
+                                 vlib_frame_t * frame)
+{
+  clib_warning ("you shouldn't be here, leaking buffers...");
+  return frame->n_vectors;
+}
+
+static clib_error_t *
+vxlan_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+  if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+    vnet_hw_interface_set_flags (vnm, hw_if_index, VNET_HW_INTERFACE_FLAG_LINK_UP);
+  else
+    vnet_hw_interface_set_flags (vnm, hw_if_index, 0);
+
+  return /* no error */ 0;
+}
+
+VNET_DEVICE_CLASS (vxlan_device_class,static) = {
+  .name = "VXLAN",
+  .format_device_name = format_vxlan_name,
+  .format_tx_trace = format_vxlan_encap_trace,
+  .tx_function = dummy_interface_tx,
+  .admin_up_down_function = vxlan_interface_admin_up_down,
+};
+
+static u8 * format_vxlan_header_with_length (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  s = format (s, "unimplemented dev %u", dev_instance);
+  return s;
+}
+
+VNET_HW_INTERFACE_CLASS (vxlan_hw_class) = {
+  .name = "VXLAN",
+  .format_header = format_vxlan_header_with_length,
+  .build_rewrite = default_build_rewrite,
+};
+
+static void
+vxlan_tunnel_restack_dpo(vxlan_tunnel_t * t)
+{
+    dpo_id_t dpo = DPO_INVALID;
+    u32 encap_index = ip46_address_is_ip4(&t->dst) ?
+        vxlan4_encap_node.index : vxlan6_encap_node.index;
+    fib_forward_chain_type_t forw_type = ip46_address_is_ip4(&t->dst) ?
+        FIB_FORW_CHAIN_TYPE_UNICAST_IP4 : FIB_FORW_CHAIN_TYPE_UNICAST_IP6;
+
+    fib_entry_contribute_forwarding (t->fib_entry_index, forw_type, &dpo);
+    dpo_stack_from_node (encap_index, &t->next_dpo, &dpo);
+    dpo_reset(&dpo);
+}
+
+static vxlan_tunnel_t *
+vxlan_tunnel_from_fib_node (fib_node_t *node)
+{
+#if (CLIB_DEBUG > 0)
+    ASSERT(FIB_NODE_TYPE_VXLAN_TUNNEL == node->fn_type);
+#endif
+    return ((vxlan_tunnel_t*) (((char*)node) -
+			       STRUCT_OFFSET_OF(vxlan_tunnel_t, node)));
+}
+
+/**
+ * Function definition to backwalk a FIB node -
+ * Here we will restack the new dpo of VXLAN DIP to encap node.
+ */
+static fib_node_back_walk_rc_t
+vxlan_tunnel_back_walk (fib_node_t *node,
+			fib_node_back_walk_ctx_t *ctx)
+{
+    vxlan_tunnel_restack_dpo(vxlan_tunnel_from_fib_node(node));
+    return (FIB_NODE_BACK_WALK_CONTINUE);
+}
+
+/**
+ * Function definition to get a FIB node from its index
+ */
+static fib_node_t*
+vxlan_tunnel_fib_node_get (fib_node_index_t index)
+{
+    vxlan_tunnel_t * t;
+    vxlan_main_t * vxm = &vxlan_main;
+
+    t = pool_elt_at_index(vxm->tunnels, index);
+
+    return (&t->node);
+}
+
+/**
+ * Function definition to inform the FIB node that its last lock has gone.
+ */
+static void
+vxlan_tunnel_last_lock_gone (fib_node_t *node)
+{
+    /*
+     * The VXLAN tunnel is a root of the graph. As such
+     * it never has children and thus is never locked.
+     */
+    ASSERT(0);
+}
+
+/*
+ * Virtual function table registered by VXLAN tunnels
+ * for participation in the FIB object graph.
+ */
+const static fib_node_vft_t vxlan_vft = {
+    .fnv_get = vxlan_tunnel_fib_node_get,
+    .fnv_last_lock = vxlan_tunnel_last_lock_gone,
+    .fnv_back_walk = vxlan_tunnel_back_walk,
+};
+
+
+#define foreach_copy_field                      \
+_(vni)                                          \
+_(mcast_sw_if_index)                            \
+_(encap_fib_index)                              \
+_(decap_next_index)                             \
+_(src)                                          \
+_(dst)
+
+static int vxlan4_rewrite (vxlan_tunnel_t * t)
+{
+  u8 *rw = 0;
+  ip4_header_t * ip0;
+  ip4_vxlan_header_t * h0;
+  int len = sizeof (*h0);
+
+  vec_validate_aligned (rw, len-1, CLIB_CACHE_LINE_BYTES);
+
+  h0 = (ip4_vxlan_header_t *) rw;
+
+  /* Fixed portion of the (outer) ip4 header */
+  ip0 = &h0->ip4;
+  ip0->ip_version_and_header_length = 0x45;
+  ip0->ttl = 254;
+  ip0->protocol = IP_PROTOCOL_UDP;
+
+  /* we fix up the ip4 header length and checksum after-the-fact */
+  ip0->src_address.as_u32 = t->src.ip4.as_u32;
+  ip0->dst_address.as_u32 = t->dst.ip4.as_u32;
+  ip0->checksum = ip4_header_checksum (ip0);
+
+  /* UDP header, randomize src port on something, maybe? */
+  h0->udp.src_port = clib_host_to_net_u16 (4789);
+  h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_vxlan);
+
+  /* VXLAN header */
+  vnet_set_vni_and_flags(&h0->vxlan, t->vni);
+
+  t->rewrite = rw;
+  return (0);
+}
+
+static int vxlan6_rewrite (vxlan_tunnel_t * t)
+{
+  u8 *rw = 0;
+  ip6_header_t * ip0;
+  ip6_vxlan_header_t * h0;
+  int len = sizeof (*h0);
+
+  vec_validate_aligned (rw, len-1, CLIB_CACHE_LINE_BYTES);
+
+  h0 = (ip6_vxlan_header_t *) rw;
+
+  /* Fixed portion of the (outer) ip6 header */
+  ip0 = &h0->ip6;
+  ip0->ip_version_traffic_class_and_flow_label = clib_host_to_net_u32(6 << 28);
+  ip0->hop_limit = 255;
+  ip0->protocol = IP_PROTOCOL_UDP;
+
+  ip0->src_address.as_u64[0] = t->src.ip6.as_u64[0];
+  ip0->src_address.as_u64[1] = t->src.ip6.as_u64[1];
+  ip0->dst_address.as_u64[0] = t->dst.ip6.as_u64[0];
+  ip0->dst_address.as_u64[1] = t->dst.ip6.as_u64[1];
+
+  /* UDP header, randomize src port on something, maybe? */
+  h0->udp.src_port = clib_host_to_net_u16 (4789);
+  h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_vxlan);
+
+  /* VXLAN header */
+  vnet_set_vni_and_flags(&h0->vxlan, t->vni);
+
+  t->rewrite = rw;
+  return (0);
+}
+
+static int vxlan_check_decap_next(vxlan_main_t * vxm, u32 is_ip6, u32 decap_next_index)
+{
+  vlib_main_t * vm = vxm->vlib_main;
+  vlib_node_runtime_t *r;
+
+  if(!is_ip6)
+    {
+      r = vlib_node_get_runtime (vm, vxlan4_input_node.index);
+      if(decap_next_index >= r->n_next_nodes)
+	return 1;
+    }
+  else
+    {
+      r = vlib_node_get_runtime (vm, vxlan6_input_node.index);
+      if(decap_next_index >= r->n_next_nodes)
+	return 1;
+    }
+
+  return 0;
+}
+
+static uword
+vtep_addr_ref(ip46_address_t *ip)
+{
+	if (!ip46_address_is_ip4(ip))
+		return 1; /* always create */
+	uword *pvtep = hash_get (vxlan_main.vtep4, ip->ip4.as_u32);
+	if (pvtep) 
+		return ++pvtep[0];
+	hash_set (vxlan_main.vtep4, ip->ip4.as_u32, 1);
+	return 1;
+}
+
+static uword
+vtep_addr_unref(ip46_address_t *ip)
+{
+	if (!ip46_address_is_ip4(ip))
+		return 0; /* alwways destroy */
+	uword *pvtep = hash_get (vxlan_main.vtep4, ip->ip4.as_u32);
+        ASSERT(pvtep);
+	if (!(--pvtep[0]))
+		hash_unset (vxlan_main.vtep4, ip->ip4.as_u32);
+	return pvtep[0];
+}
+
+static
+mcast_remote_t *
+mcast_ep_get(ip46_address_t * ip)
+{
+        ASSERT(ip46_address_is_multicast(ip));
+	uword * ep_idx = hash_get_mem (vxlan_main.mcast_ep_by_ip, ip);
+        ASSERT(ep_idx);
+	return pool_elt_at_index(vxlan_main.mcast_eps, *ep_idx);
+}
+
+static void
+mcast_ep_add(mcast_remote_t * new_ep)
+{
+	mcast_remote_t * ep;
+
+	pool_get_aligned (vxlan_main.mcast_eps, ep, CLIB_CACHE_LINE_BYTES);
+	*ep = *new_ep;
+	hash_set_mem (vxlan_main.mcast_ep_by_ip, &ep->ip, ep - vxlan_main.mcast_eps);
+}
+
+static void
+mcast_ep_remove(mcast_remote_t * ep)
+{
+	hash_unset_mem (vxlan_main.mcast_ep_by_ip, &ep->ip);
+	pool_put (vxlan_main.mcast_eps, ep);
+}
+
+static void
+ip46_multicast_ethernet_address(u8 * ethernet_address, ip46_address_t * ip) {
+          if (ip46_address_is_ip4(ip))
+              ip4_multicast_ethernet_address(ethernet_address, &ip->ip4);
+          else
+              ip6_multicast_ethernet_address(ethernet_address, ip->ip6.as_u32[0]);
+}
+
+int vnet_vxlan_add_del_tunnel 
+(vnet_vxlan_add_del_tunnel_args_t *a, u32 * sw_if_indexp)
+{
+  vxlan_main_t * vxm = &vxlan_main;
+  vxlan_tunnel_t *t = 0;
+  vnet_main_t * vnm = vxm->vnet_main;
+  uword * p;
+  u32 hw_if_index = ~0;
+  u32 sw_if_index = ~0;
+  int rv;
+  vxlan4_tunnel_key_t key4;
+  vxlan6_tunnel_key_t key6;
+  u32 is_ip6 = a->is_ip6;
+
+  if (!is_ip6)
+    {
+      key4.src = a->dst.ip4.as_u32; /* decap src in key is encap dst in config */
+      key4.vni = clib_host_to_net_u32 (a->vni << 8);
+      p = hash_get (vxm->vxlan4_tunnel_by_key, key4.as_u64);
+    } 
+  else 
+    {
+      key6.src.as_u64[0] = a->dst.ip6.as_u64[0];
+      key6.src.as_u64[1] = a->dst.ip6.as_u64[1];
+      key6.vni = clib_host_to_net_u32 (a->vni << 8);
+      p = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6);
+    }
+  
+  if (a->is_add)
+    {
+      l2input_main_t * l2im = &l2input_main;
+
+      /* adding a tunnel: tunnel must not already exist */
+      if (p)
+        return VNET_API_ERROR_TUNNEL_EXIST;
+
+      /*if not set explicitly, default to l2 */
+      if(a->decap_next_index == ~0)
+	a->decap_next_index = VXLAN_INPUT_NEXT_L2_INPUT;
+      if (vxlan_check_decap_next(vxm, is_ip6, a->decap_next_index))
+	  return VNET_API_ERROR_INVALID_DECAP_NEXT;
+
+      pool_get_aligned (vxm->tunnels, t, CLIB_CACHE_LINE_BYTES);
+      memset (t, 0, sizeof (*t));
+      
+      /* copy from arg structure */
+#define _(x) t->x = a->x;
+      foreach_copy_field;
+#undef _
+      
+      /* copy the key */
+      if (is_ip6)
+        {
+          t->key6 = clib_mem_alloc (sizeof(vxlan6_tunnel_key_t));
+          clib_memcpy (t->key6, &key6, sizeof(key6));
+        }
+      else
+        {
+          t->key4 = 0; /* not yet used */
+        }
+
+      if (!is_ip6) 
+        rv = vxlan4_rewrite (t);
+      else
+	rv = vxlan6_rewrite (t);
+
+      if (rv)
+        {
+          pool_put (vxm->tunnels, t);
+          return rv;
+        }
+
+      if (!is_ip6)
+	hash_set (vxm->vxlan4_tunnel_by_key, key4.as_u64, t - vxm->tunnels);
+      else
+        hash_set_mem (vxm->vxlan6_tunnel_by_key, t->key6, t - vxm->tunnels);
+
+      vnet_hw_interface_t * hi;
+      if (vec_len (vxm->free_vxlan_tunnel_hw_if_indices) > 0)
+        {
+	  vnet_interface_main_t * im = &vnm->interface_main;
+          hw_if_index = vxm->free_vxlan_tunnel_hw_if_indices
+            [vec_len (vxm->free_vxlan_tunnel_hw_if_indices)-1];
+          _vec_len (vxm->free_vxlan_tunnel_hw_if_indices) -= 1;
+          
+          hi = vnet_get_hw_interface (vnm, hw_if_index);
+          hi->dev_instance = t - vxm->tunnels;
+          hi->hw_instance = hi->dev_instance;
+
+	  /* clear old stats of freed tunnel before reuse */
+	  sw_if_index = hi->sw_if_index;
+	  vnet_interface_counter_lock(im);
+	  vlib_zero_combined_counter 
+	    (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_TX], sw_if_index);
+	  vlib_zero_combined_counter 
+	    (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_RX], sw_if_index);
+	  vlib_zero_simple_counter 
+	    (&im->sw_if_counters[VNET_INTERFACE_COUNTER_DROP], sw_if_index);
+	  vnet_interface_counter_unlock(im);
+        }
+      else 
+        {
+          hw_if_index = vnet_register_interface
+            (vnm, vxlan_device_class.index, t - vxm->tunnels,
+             vxlan_hw_class.index, t - vxm->tunnels);
+          hi = vnet_get_hw_interface (vnm, hw_if_index);
+        }
+      
+      t->hw_if_index = hw_if_index;
+      t->sw_if_index = sw_if_index = hi->sw_if_index;
+      
+      vec_validate_init_empty (vxm->tunnel_index_by_sw_if_index, sw_if_index, ~0);
+      vxm->tunnel_index_by_sw_if_index[sw_if_index] = t - vxm->tunnels;
+
+      /* setup l2 input config with l2 feature and bd 0 to drop packet */
+      vec_validate (l2im->configs, sw_if_index);
+      l2im->configs[sw_if_index].feature_bitmap = L2INPUT_FEAT_DROP;
+      l2im->configs[sw_if_index].bd_index = 0;
+      
+      vnet_sw_interface_set_flags (vnm, sw_if_index, 
+                                   VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+      fib_node_init(&t->node, FIB_NODE_TYPE_VXLAN_TUNNEL);
+      fib_prefix_t tun_dst_pfx;
+      u32 encap_index = !is_ip6 ?
+          vxlan4_encap_node.index : vxlan6_encap_node.index;
+      vnet_flood_class_t flood_class = VNET_FLOOD_CLASS_TUNNEL_NORMAL;
+
+      fib_prefix_from_ip46_addr(&t->dst, &tun_dst_pfx);
+      if (!ip46_address_is_multicast(&t->dst))
+        {
+          /* Unicast tunnel -
+           * source the FIB entry for the tunnel's destination
+           * and become a child thereof. The tunnel will then get poked
+           * when the forwarding for the entry updates, and the tunnel can
+           * re-stack accordingly
+           */
+	  vtep_addr_ref(&t->src);
+          t->fib_entry_index = fib_table_entry_special_add
+            (t->encap_fib_index, &tun_dst_pfx, FIB_SOURCE_RR,
+	     FIB_ENTRY_FLAG_NONE, ADJ_INDEX_INVALID);
+          t->sibling_index = fib_entry_child_add
+            (t->fib_entry_index, FIB_NODE_TYPE_VXLAN_TUNNEL, t - vxm->tunnels);
+          vxlan_tunnel_restack_dpo(t);
+	} 
+      else
+        {
+ 	  /* Multicast tunnel -
+	   * as the same mcast group can be used for mutiple mcast tunnels
+	   * with different VNIs, create the output fib adjecency only if
+	   * it does not already exist
+	   */
+          fib_protocol_t fp = (is_ip6) ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4;
+          dpo_id_t dpo = DPO_INVALID;
+	  dpo_proto_t dproto = fib_proto_to_dpo(fp);
+
+	  if (vtep_addr_ref(&t->dst) == 1)
+	    {
+               u8 mcast_mac[6];
+
+               ip46_multicast_ethernet_address(mcast_mac, &t->dst);
+               receive_dpo_add_or_lock(dproto, ~0, NULL, &dpo);
+	       mcast_remote_t new_ep = {
+	         .ip = t->dst,
+		 .mcast_adj_index = adj_rewrite_add_and_lock
+                   (fp, fib_proto_to_link(fp), a->mcast_sw_if_index, mcast_mac),
+                 /* Add VRF local mcast adj. */
+                 .fib_entry_index = fib_table_entry_special_dpo_add
+                   (t->encap_fib_index, &tun_dst_pfx,
+                    FIB_SOURCE_SPECIAL, FIB_ENTRY_FLAG_NONE, &dpo)
+		   };
+	       mcast_ep_add(&new_ep);
+	       dpo_reset(&dpo);
+	    }
+          /* Stack shared mcast dst mac addr rewrite on encap */
+          dpo_set (&dpo, DPO_ADJACENCY, dproto,
+	    mcast_ep_get(&t->dst)->mcast_adj_index);
+          dpo_stack_from_node (encap_index, &t->next_dpo, &dpo);
+          dpo_reset (&dpo);
+	  flood_class = VNET_FLOOD_CLASS_TUNNEL_MASTER;
+	}
+
+      /* Set vxlan tunnel output node */
+      hi->output_node_index = encap_index;
+
+      vnet_get_sw_interface (vnet_get_main(), sw_if_index)->flood_class = flood_class;
+    }
+  else
+    {
+      /* deleting a tunnel: tunnel must exist */
+      if (!p)
+        return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+      t = pool_elt_at_index (vxm->tunnels, p[0]);
+
+      vnet_sw_interface_set_flags (vnm, t->sw_if_index, 0 /* down */);
+      /* make sure tunnel is removed from l2 bd or xconnect */
+      set_int_l2_mode(vxm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0, 0, 0, 0);
+      vec_add1 (vxm->free_vxlan_tunnel_hw_if_indices, t->hw_if_index);
+
+      vxm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
+
+      if (!is_ip6)
+        hash_unset (vxm->vxlan4_tunnel_by_key, key4.as_u64);
+      else
+        {
+	  hash_unset_mem (vxm->vxlan6_tunnel_by_key, t->key6);
+	  clib_mem_free (t->key6);
+	}
+
+      if (!ip46_address_is_multicast(&t->dst))
+        {
+	  vtep_addr_unref(&a->src);
+	  fib_entry_child_remove(t->fib_entry_index, t->sibling_index);
+	  fib_table_entry_delete_index(t->fib_entry_index, FIB_SOURCE_RR);
+        }
+      else if (vtep_addr_unref(&t->dst) == 0)
+        {
+	  mcast_remote_t* ep = mcast_ep_get(&t->dst);
+	  adj_unlock(ep->mcast_adj_index);
+	  fib_table_entry_delete_index(ep->fib_entry_index, FIB_SOURCE_SPECIAL);
+	  mcast_ep_remove(ep);
+        }
+
+      fib_node_deinit(&t->node);
+      vec_free (t->rewrite);
+      pool_put (vxm->tunnels, t);
+    }
+
+  if (sw_if_indexp)
+      *sw_if_indexp = sw_if_index;
+
+  return 0;
+}
+
+static u32 fib4_index_from_fib_id (u32 fib_id)
+{
+  ip4_main_t * im = &ip4_main;
+  uword * p;
+
+  p = hash_get (im->fib_index_by_table_id, fib_id);
+  if (!p)
+    return ~0;
+
+  return p[0];
+}
+
+static u32 fib6_index_from_fib_id (u32 fib_id)
+{
+  ip6_main_t * im = &ip6_main;
+  uword * p;
+
+  p = hash_get (im->fib_index_by_table_id, fib_id);
+  if (!p)
+    return ~0;
+
+  return p[0];
+}
+
+static uword get_decap_next_for_node(u32 node_index, u32 ipv4_set)
+{
+  vxlan_main_t * vxm = &vxlan_main;
+  vlib_main_t * vm = vxm->vlib_main;
+  uword next_index = ~0;
+
+  if (ipv4_set)
+    {
+      next_index = vlib_node_add_next (vm, vxlan4_input_node.index, node_index);
+    }
+  else
+    {
+      next_index = vlib_node_add_next (vm, vxlan6_input_node.index, node_index);
+    }
+
+  return next_index;
+}
+
+static uword unformat_decap_next (unformat_input_t * input, va_list * args)
+{
+  u32 * result = va_arg (*args, u32 *);
+  u32 ipv4_set = va_arg (*args, int);
+  vxlan_main_t * vxm = &vxlan_main;
+  vlib_main_t * vm = vxm->vlib_main;
+  u32 node_index;
+  u32 tmp;
+
+  if (unformat (input, "l2"))
+    *result = VXLAN_INPUT_NEXT_L2_INPUT;
+  else if (unformat (input, "node %U", unformat_vlib_node, vm, &node_index))
+    *result = get_decap_next_for_node(node_index, ipv4_set);
+  else if (unformat (input, "%d", &tmp))
+    *result = tmp;
+  else
+    return 0;
+  return 1;
+}
+
+static clib_error_t *
+vxlan_add_del_tunnel_command_fn (vlib_main_t * vm,
+                                   unformat_input_t * input,
+                                   vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, * line_input = &_line_input;
+  ip46_address_t src , dst;
+  u8 is_add = 1;
+  u8 src_set = 0;
+  u8 dst_set = 0;
+  u8 grp_set = 0;
+  u8 ipv4_set = 0;
+  u8 ipv6_set = 0;
+  u32 encap_fib_index = 0;
+  u32 mcast_sw_if_index = ~0;
+  u32 decap_next_index = VXLAN_INPUT_NEXT_L2_INPUT;
+  u32 vni = 0;
+  u32 tmp;
+  int rv;
+  vnet_vxlan_add_del_tunnel_args_t _a, * a = &_a;
+  u32 tunnel_sw_if_index;
+
+  /* Cant "universally zero init" (={0}) due to GCC bug 53119 */
+  memset(&src, 0, sizeof src);
+  memset(&dst, 0, sizeof dst);
+
+  /* Get a line of input. */
+  if (! unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (line_input, "del"))
+      {
+        is_add = 0;
+      }
+    else if (unformat (line_input, "src %U",
+                       unformat_ip4_address, &src.ip4))
+      {
+        src_set = 1;
+        ipv4_set = 1;
+      }
+    else if (unformat (line_input, "dst %U",
+                       unformat_ip4_address, &dst.ip4))
+      {
+        dst_set = 1;
+        ipv4_set = 1;
+      }
+    else if (unformat (line_input, "src %U", 
+                       unformat_ip6_address, &src.ip6))
+      {
+        src_set = 1;
+        ipv6_set = 1;
+      }
+    else if (unformat (line_input, "dst %U",
+                       unformat_ip6_address, &dst.ip6))
+      {
+        dst_set = 1;
+        ipv6_set = 1;
+      }
+    else if (unformat (line_input, "group %U %U",
+                       unformat_ip4_address, &dst.ip4,
+		       unformat_vnet_sw_interface,
+		       vnet_get_main(), &mcast_sw_if_index))
+      {
+        grp_set = dst_set = 1;
+        ipv4_set = 1;
+      }
+    else if (unformat (line_input, "group %U %U",
+                       unformat_ip6_address, &dst.ip6,
+		       unformat_vnet_sw_interface,
+		       vnet_get_main(), &mcast_sw_if_index))
+      {
+        grp_set = dst_set = 1;
+        ipv6_set = 1;
+      }
+    else if (unformat (line_input, "encap-vrf-id %d", &tmp))
+      {
+        if (ipv6_set)
+          encap_fib_index = fib6_index_from_fib_id (tmp);
+        else
+          encap_fib_index = fib4_index_from_fib_id (tmp);
+        if (encap_fib_index == ~0)
+          return clib_error_return (0, "nonexistent encap-vrf-id %d", tmp);
+      }
+    else if (unformat (line_input, "decap-next %U", unformat_decap_next, 
+                       &decap_next_index, ipv4_set))
+      ;
+    else if (unformat (line_input, "vni %d", &vni))
+      {
+        if (vni >> 24)  
+          return clib_error_return (0, "vni %d out of range", vni);
+      }
+    else 
+      return clib_error_return (0, "parse error: '%U'", 
+                                format_unformat_error, line_input);
+  }
+
+  unformat_free (line_input);
+
+  if (src_set == 0)
+    return clib_error_return (0, "tunnel src address not specified");
+
+  if (dst_set == 0)
+    return clib_error_return (0, "tunnel dst address not specified");
+
+  if (grp_set && !ip46_address_is_multicast(&dst))
+    return clib_error_return (0, "tunnel group address not multicast");
+
+  if (grp_set == 0 && ip46_address_is_multicast(&dst))
+    return clib_error_return (0, "dst address must be unicast");
+
+  if (grp_set && mcast_sw_if_index == ~0)
+    return clib_error_return (0, "tunnel nonexistent multicast device");
+
+  if (ipv4_set && ipv6_set)
+    return clib_error_return (0, "both IPv4 and IPv6 addresses specified");
+
+  if (ip46_address_cmp(&src, &dst) == 0)
+    return clib_error_return (0, "src and dst addresses are identical");
+
+  if (decap_next_index == ~0)
+    return clib_error_return (0, "next node not found");
+
+  if (vni == 0)
+    return clib_error_return (0, "vni not specified");
+
+  memset (a, 0, sizeof (*a));
+
+  a->is_add = is_add;
+  a->is_ip6 = ipv6_set;
+
+#define _(x) a->x = x;
+  foreach_copy_field;
+#undef _
+  
+  rv = vnet_vxlan_add_del_tunnel (a, &tunnel_sw_if_index);
+
+  switch(rv)
+    {
+    case 0:
+      if (is_add)
+        vlib_cli_output(vm, "%U\n", format_vnet_sw_if_index_name, 
+			vnet_get_main(), tunnel_sw_if_index);
+      break;
+
+    case VNET_API_ERROR_TUNNEL_EXIST:
+      return clib_error_return (0, "tunnel already exists...");
+
+    case VNET_API_ERROR_NO_SUCH_ENTRY:
+      return clib_error_return (0, "tunnel does not exist...");
+
+    default:
+      return clib_error_return 
+        (0, "vnet_vxlan_add_del_tunnel returned %d", rv);
+    }
+
+  return 0;
+}
+
+/*?
+ * Add or delete a VXLAN Tunnel.
+ *
+ * VXLAN provides the features needed to allow L2 bridge domains (BDs)
+ * to span multiple servers. This is done by building an L2 overlay on
+ * top of an L3 network underlay using VXLAN tunnels.
+ *
+ * This makes it possible for servers to be co-located in the same data
+ * center or be separated geographically as long as they are reachable
+ * through the underlay L3 network.
+ *
+ * You can refer to this kind of L2 overlay bridge domain as a VXLAN
+ * (Virtual eXtensible VLAN) segment.
+ *
+ * @cliexpar
+ * Example of how to create a VXLAN Tunnel:
+ * @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 vni 13 encap-vrf-id 7}
+ * Example of how to delete a VXLAN Tunnel:
+ * @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 vni 13 del}
+ ?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (create_vxlan_tunnel_command, static) = {
+  .path = "create vxlan tunnel",
+  .short_help = 
+  "create vxlan tunnel src <local-vtep-addr>"
+  " {dst <remote-vtep-addr>|group <mcast-vtep-addr> <intf-name>} vni <nn>"
+  " [encap-vrf-id <nn>] [decap-next [l2|node <name>]] [del]",
+  .function = vxlan_add_del_tunnel_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+show_vxlan_tunnel_command_fn (vlib_main_t * vm,
+                                unformat_input_t * input,
+                                vlib_cli_command_t * cmd)
+{
+  vxlan_main_t * vxm = &vxlan_main;
+  vxlan_tunnel_t * t;
+  
+  if (pool_elts (vxm->tunnels) == 0)
+    vlib_cli_output (vm, "No vxlan tunnels configured...");
+
+  pool_foreach (t, vxm->tunnels,
+  ({
+    vlib_cli_output (vm, "%U", format_vxlan_tunnel, t);
+  }));
+  
+  return 0;
+}
+
+/*?
+ * Display all the VXLAN Tunnel entries.
+ *
+ * @cliexpar
+ * Example of how to display the VXLAN Tunnel entries:
+ * @cliexstart{show vxlan tunnel}
+ * [0] src 10.0.3.1 dst 10.0.3.3 vni 13 encap_fib_index 0 sw_if_index 5 decap_next l2
+ * @cliexend
+ ?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_vxlan_tunnel_command, static) = {
+    .path = "show vxlan tunnel",
+    .short_help = "show vxlan tunnel",
+    .function = show_vxlan_tunnel_command_fn,
+};
+/* *INDENT-ON* */
+
+
+clib_error_t *vxlan_init (vlib_main_t *vm)
+{
+  vxlan_main_t * vxm = &vxlan_main;
+  
+  vxm->vnet_main = vnet_get_main();
+  vxm->vlib_main = vm;
+
+  /* initialize the ip6 hash */
+  vxm->vxlan6_tunnel_by_key = hash_create_mem(0,
+        sizeof(vxlan6_tunnel_key_t),
+        sizeof(uword));
+  vxm->mcast_ep_by_ip = hash_create_mem(0,
+        sizeof(ip46_address_t),
+	sizeof(uword));
+
+  udp_register_dst_port (vm, UDP_DST_PORT_vxlan, 
+                         vxlan4_input_node.index, /* is_ip4 */ 1);
+  udp_register_dst_port (vm, UDP_DST_PORT_vxlan6,
+                         vxlan6_input_node.index, /* is_ip4 */ 0);
+
+  fib_node_register_type(FIB_NODE_TYPE_VXLAN_TUNNEL, &vxlan_vft);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION(vxlan_init);
diff --git a/src/vnet/vxlan/vxlan.h b/src/vnet/vxlan/vxlan.h
new file mode 100644
index 00000000..7605d94a
--- /dev/null
+++ b/src/vnet/vxlan/vxlan.h
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vnet_vxlan_h
+#define included_vnet_vxlan_h
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/l2_output.h>
+#include <vnet/l2/l2_bd.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/vxlan/vxlan_packet.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/ip/udp.h>
+#include <vnet/dpo/dpo.h>
+#include <vnet/adj/adj_types.h>
+
+typedef CLIB_PACKED (struct {
+  ip4_header_t ip4;            /* 20 bytes */
+  udp_header_t udp;            /* 8 bytes */
+  vxlan_header_t vxlan;        /* 8 bytes */
+}) ip4_vxlan_header_t;
+
+typedef CLIB_PACKED (struct {
+  ip6_header_t ip6;            /* 40 bytes */
+  udp_header_t udp;            /* 8 bytes */
+  vxlan_header_t vxlan;        /* 8 bytes */
+}) ip6_vxlan_header_t;
+
+typedef CLIB_PACKED(struct {
+  /* 
+   * Key fields: ip src and vxlan vni on incoming VXLAN packet
+   * all fields in NET byte order
+   */
+  union {
+    struct {
+      u32 src;
+      u32 vni;                 /* shifted left 8 bits */
+    };
+    u64 as_u64;
+  };
+}) vxlan4_tunnel_key_t;
+
+typedef CLIB_PACKED(struct {
+  /*
+   * Key fields: ip src and vxlan vni on incoming VXLAN packet
+   * all fields in NET byte order
+   */
+  ip6_address_t src;
+  u32 vni;                 /* shifted left 8 bits */
+}) vxlan6_tunnel_key_t;
+
+typedef struct {
+  /* Rewrite string. $$$$ embed vnet_rewrite header */
+  u8 * rewrite;
+
+  /* FIB DPO for IP forwarding of VXLAN encap packet */
+  dpo_id_t next_dpo;  
+
+  /* storage for the hash key */
+  union {
+    vxlan4_tunnel_key_t *key4; /* unused for now */
+    vxlan6_tunnel_key_t *key6;
+  };
+
+  /* vxlan VNI in HOST byte order */
+  u32 vni;
+
+  /* tunnel src and dst addresses */
+  ip46_address_t src;
+  ip46_address_t dst;
+
+  /* mcast packet output intfc index (used only if dst is mcast) */
+  u32 mcast_sw_if_index;
+
+  /* decap next index */
+  u32 decap_next_index;
+
+  /* The FIB index for src/dst addresses */
+  u32 encap_fib_index;
+
+  /* vnet intfc index */
+  u32 sw_if_index;
+  u32 hw_if_index;
+
+  /**
+   * Linkage into the FIB object graph
+   */
+  fib_node_t node;
+
+  /*
+   * The FIB entry for (depending on VXLAN tunnel is unicast or mcast)
+   * sending unicast VXLAN encap packets or receiving mcast VXLAN packets
+   */
+  fib_node_index_t fib_entry_index;
+  adj_index_t mcast_adj_index;
+
+  /**
+   * The tunnel is a child of the FIB entry for its desintion. This is
+   * so it receives updates when the forwarding information for that entry
+   * changes.
+   * The tunnels sibling index on the FIB entry's dependency list.
+   */
+  u32 sibling_index;
+} vxlan_tunnel_t;
+
+#define foreach_vxlan_input_next        \
+_(DROP, "error-drop")                   \
+_(L2_INPUT, "l2-input")
+
+typedef enum {
+#define _(s,n) VXLAN_INPUT_NEXT_##s,
+  foreach_vxlan_input_next
+#undef _
+  VXLAN_INPUT_N_NEXT,
+} vxlan_input_next_t;
+
+typedef enum {
+#define vxlan_error(n,s) VXLAN_ERROR_##n,
+#include <vnet/vxlan/vxlan_error.def>
+#undef vxlan_error
+  VXLAN_N_ERROR,
+} vxlan_input_error_t;
+
+typedef struct {
+  ip46_address_t ip;
+  fib_node_index_t fib_entry_index;
+  adj_index_t mcast_adj_index;
+} mcast_remote_t;
+
+typedef struct {
+  /* vector of encap tunnel instances */
+  vxlan_tunnel_t * tunnels;
+
+  /* lookup tunnel by key */
+  uword * vxlan4_tunnel_by_key; /* keyed on ipv4.dst + vni */
+  uword * vxlan6_tunnel_by_key; /* keyed on ipv6.dst + vni */
+
+  /* local VTEP IPs ref count used by vxlan-bypass node to check if
+     received VXLAN packet DIP matches any local VTEP address */
+  uword * vtep4;  /* local ip4 VTEPs keyed on their ip4 addr */
+  uword * vtep6;  /* local ip6 VTEPs keyed on their ip6 addr */
+
+  /* set of active remote mcast VTEP */
+  mcast_remote_t * mcast_eps;
+  uword * mcast_ep_by_ip; /* mcast VTEPs keyed on their ip46 addr */
+
+  /* Free vlib hw_if_indices */
+  u32 * free_vxlan_tunnel_hw_if_indices;
+
+  /* Mapping from sw_if_index to tunnel index */
+  u32 * tunnel_index_by_sw_if_index;
+
+  /* convenience */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+} vxlan_main_t;
+
+vxlan_main_t vxlan_main;
+
+extern vlib_node_registration_t vxlan4_input_node;
+extern vlib_node_registration_t vxlan6_input_node;
+extern vlib_node_registration_t vxlan4_encap_node;
+extern vlib_node_registration_t vxlan6_encap_node;
+
+u8 * format_vxlan_encap_trace (u8 * s, va_list * args);
+
+typedef struct {
+  u8 is_add;
+
+  /* we normally use is_ip4, but since this adds to the
+   * structure, this seems less of abreaking change */
+  u8 is_ip6;
+  ip46_address_t src, dst;
+  u32 mcast_sw_if_index;
+  u32 encap_fib_index;
+  u32 decap_next_index;
+  u32 vni;
+} vnet_vxlan_add_del_tunnel_args_t;
+
+int vnet_vxlan_add_del_tunnel 
+(vnet_vxlan_add_del_tunnel_args_t *a, u32 * sw_if_indexp);
+
+#endif /* included_vnet_vxlan_h */
diff --git a/src/vnet/vxlan/vxlan_api.c b/src/vnet/vxlan/vxlan_api.c
new file mode 100644
index 00000000..6c9cbd79
--- /dev/null
+++ b/src/vnet/vxlan/vxlan_api.c
@@ -0,0 +1,253 @@
+/*
+ *------------------------------------------------------------------
+ * vxlan_api.c - vxlan api
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vlibmemory/api.h>
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/feature/feature.h>
+#include <vnet/vxlan/vxlan.h>
+#include <vnet/fib/fib_table.h>
+
+#include <vnet/vnet_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vnet/vnet_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vnet/vnet_all_api_h.h>
+#undef vl_printfun
+
+#include <vlibapi/api_helper_macros.h>
+
+#define foreach_vpe_api_msg                             \
+_(SW_INTERFACE_SET_VXLAN_BYPASS, sw_interface_set_vxlan_bypass)         \
+_(VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel)                           \
+_(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump)
+
+static void
+  vl_api_sw_interface_set_vxlan_bypass_t_handler
+  (vl_api_sw_interface_set_vxlan_bypass_t * mp)
+{
+  vl_api_sw_interface_set_vxlan_bypass_reply_t *rmp;
+  int rv = 0;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  if (mp->is_ipv6)
+    {
+      /* not yet implemented */
+    }
+  else
+    vnet_feature_enable_disable ("ip4-unicast", "ip4-vxlan-bypass",
+				 sw_if_index, mp->enable, 0, 0);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_SET_VXLAN_BYPASS_REPLY);
+}
+
+static void vl_api_vxlan_add_del_tunnel_t_handler
+  (vl_api_vxlan_add_del_tunnel_t * mp)
+{
+  vl_api_vxlan_add_del_tunnel_reply_t *rmp;
+  int rv = 0;
+  vnet_vxlan_add_del_tunnel_args_t _a, *a = &_a;
+  u32 encap_fib_index;
+  uword *p;
+  ip4_main_t *im = &ip4_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index = ~0;
+
+  p = hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id));
+  if (!p)
+    {
+      rv = VNET_API_ERROR_NO_SUCH_FIB;
+      goto out;
+    }
+  encap_fib_index = p[0];
+  memset (a, 0, sizeof (*a));
+
+  a->is_add = mp->is_add;
+  a->is_ip6 = mp->is_ipv6;
+
+  /* ip addresses sent in network byte order */
+  ip46_from_addr_buf (mp->is_ipv6, mp->dst_address, &a->dst);
+  ip46_from_addr_buf (mp->is_ipv6, mp->src_address, &a->src);
+
+  /* Check src & dst are different */
+  if (ip46_address_cmp (&a->dst, &a->src) == 0)
+    {
+      rv = VNET_API_ERROR_SAME_SRC_DST;
+      goto out;
+    }
+  a->mcast_sw_if_index = ntohl (mp->mcast_sw_if_index);
+  if (ip46_address_is_multicast (&a->dst) &&
+      pool_is_free_index (vnm->interface_main.sw_interfaces,
+			  a->mcast_sw_if_index))
+    {
+      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
+      goto out;
+    }
+  a->encap_fib_index = encap_fib_index;
+  a->decap_next_index = ntohl (mp->decap_next_index);
+  a->vni = ntohl (mp->vni);
+  rv = vnet_vxlan_add_del_tunnel (a, &sw_if_index);
+
+out:
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_VXLAN_ADD_DEL_TUNNEL_REPLY,
+  ({
+    rmp->sw_if_index = ntohl (sw_if_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void send_vxlan_tunnel_details
+  (vxlan_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_vxlan_tunnel_details_t *rmp;
+  ip4_main_t *im4 = &ip4_main;
+  ip6_main_t *im6 = &ip6_main;
+  u8 is_ipv6 = !ip46_address_is_ip4 (&t->dst);
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_VXLAN_TUNNEL_DETAILS);
+  if (is_ipv6)
+    {
+      memcpy (rmp->src_address, t->src.ip6.as_u8, 16);
+      memcpy (rmp->dst_address, t->dst.ip6.as_u8, 16);
+      rmp->encap_vrf_id = htonl (im6->fibs[t->encap_fib_index].ft_table_id);
+    }
+  else
+    {
+      memcpy (rmp->src_address, t->src.ip4.as_u8, 4);
+      memcpy (rmp->dst_address, t->dst.ip4.as_u8, 4);
+      rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id);
+    }
+  rmp->mcast_sw_if_index = htonl (t->mcast_sw_if_index);
+  rmp->vni = htonl (t->vni);
+  rmp->decap_next_index = htonl (t->decap_next_index);
+  rmp->sw_if_index = htonl (t->sw_if_index);
+  rmp->is_ipv6 = is_ipv6;
+  rmp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void vl_api_vxlan_tunnel_dump_t_handler
+  (vl_api_vxlan_tunnel_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  vxlan_main_t *vxm = &vxlan_main;
+  vxlan_tunnel_t *t;
+  u32 sw_if_index;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  if (~0 == sw_if_index)
+    {
+      /* *INDENT-OFF* */
+      pool_foreach (t, vxm->tunnels,
+      ({
+        send_vxlan_tunnel_details(t, q, mp->context);
+      }));
+      /* *INDENT-ON* */
+    }
+  else
+    {
+      if ((sw_if_index >= vec_len (vxm->tunnel_index_by_sw_if_index)) ||
+	  (~0 == vxm->tunnel_index_by_sw_if_index[sw_if_index]))
+	{
+	  return;
+	}
+      t = &vxm->tunnels[vxm->tunnel_index_by_sw_if_index[sw_if_index]];
+      send_vxlan_tunnel_details (t, q, mp->context);
+    }
+}
+
+/*
+ * vpe_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
+ */
+#define vl_msg_name_crc_list
+#include <vnet/vnet_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_vxlan;
+#undef _
+}
+
+static clib_error_t *
+vxlan_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  am->api_trace_cfg[VL_API_VXLAN_ADD_DEL_TUNNEL].size += 16 * sizeof (u32);
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (vxlan_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/vxlan/vxlan_error.def b/src/vnet/vxlan/vxlan_error.def
new file mode 100644
index 00000000..17f90595
--- /dev/null
+++ b/src/vnet/vxlan/vxlan_error.def
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+vxlan_error (DECAPSULATED, "good packets decapsulated")
+vxlan_error (NO_SUCH_TUNNEL, "no such tunnel packets")
+vxlan_error (BAD_FLAGS, "packets with bad flags field in vxlan header")
diff --git a/src/vnet/vxlan/vxlan_packet.h b/src/vnet/vxlan/vxlan_packet.h
new file mode 100644
index 00000000..5f93a36f
--- /dev/null
+++ b/src/vnet/vxlan/vxlan_packet.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_vxlan_packet_h__
+#define __included_vxlan_packet_h__ 1
+
+/* 
+ * From RFC-7384
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |R|R|R|R|I|R|R|R|            Reserved                           |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |                VXLAN Network Identifier (VNI) |   Reserved    |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * 
+ * VXLAN Header:  This is an 8-byte field that has:
+ * 
+ * - Flags (8 bits): where the I flag MUST be set to 1 for a valid
+ * VXLAN Network ID (VNI).  The other 7 bits (designated "R") are
+ * reserved fields and MUST be set to zero on transmission and
+ * ignored on receipt.
+ * 
+ * - VXLAN Segment ID/VXLAN Network Identifier (VNI): this is a
+ * 24-bit value used to designate the individual VXLAN overlay
+ * network on which the communicating VMs are situated.  VMs in
+ * different VXLAN overlay networks cannot communicate with each
+ * other.
+ * 
+ * - Reserved fields (24 bits and 8 bits): MUST be set to zero on
+ * transmission and ignored on receipt.
+ * 
+ */
+
+typedef struct {
+  u8 flags;
+  u8 res1;
+  u8 res2;
+  u8 res3;
+  u32 vni_reserved;
+} vxlan_header_t;
+
+#define VXLAN_FLAGS_I 0x08
+
+static inline u32 vnet_get_vni (vxlan_header_t * h)
+{
+  u32 vni_reserved_host_byte_order;
+
+  vni_reserved_host_byte_order = clib_net_to_host_u32 (h->vni_reserved);
+  return vni_reserved_host_byte_order >> 8;
+}
+
+static inline void vnet_set_vni_and_flags (vxlan_header_t * h, u32 vni)
+{
+  h->vni_reserved = clib_host_to_net_u32 (vni<<8);
+  * (u32 *) h = 0;
+  h->flags = VXLAN_FLAGS_I;
+}
+
+#endif /* __included_vxlan_packet_h__ */
diff --git a/src/vpp-api-test.am b/src/vpp-api-test.am
new file mode 100644
index 00000000..fe25f6e1
--- /dev/null
+++ b/src/vpp-api-test.am
@@ -0,0 +1,64 @@
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+libvatplugin_la_SOURCES = \
+  vat/plugin_api.c
+
+lib_LTLIBRARIES += libvatplugin.la
+
+bin_PROGRAMS += vpp_api_test vpp_json_test vpp_restart
+
+vpp_api_test_SOURCES = \
+  vat/api_format.c 	\
+  vat/main.c		\
+  vat/plugin.c		\
+  vat/vat.h		\
+  vat/json_format.h	\
+  vat/json_format.c
+
+vpp_json_test_SOURCES = \
+  vat/json_format.h	\
+  vat/json_format.c	\
+  vat/json_test.c
+
+vpp_api_test_LDFLAGS = $(DPDK_LD_FLAGS)
+vpp_api_test_LDADD = \
+  libvlib.la \
+  libvlib_unix.la \
+  libvlibmemoryclient.la		\
+  libsvm.la				\
+  libvatplugin.la			\
+  libvppinfra.la 			\
+  libvlibapi.la				\
+  libvlibmemory.la			\
+  libvnet.la \
+  $(DPDK_LD_ADD)			\
+  -lpthread -lm -lrt -ldl -lcrypto
+
+vpp_json_test_LDADD = libvppinfra.la -lm
+
+nobase_include_HEADERS += \
+  vat/vat.h 		\
+  vat/json_format.h
+
+vpp_restart_SOURCES =  \
+  vat/restart.c
+vpp_restart_LDADD = \
+  libsvmdb.la				\
+  libsvm.la				\
+  libvppinfra.la			\
+  -lpthread -lrt
+
+dist_bin_SCRIPTS += scripts/vppctl
+
+# vi:syntax=automake
diff --git a/src/vpp-api/python/Makefile.am b/src/vpp-api/python/Makefile.am
new file mode 100644
index 00000000..b8ca1530
--- /dev/null
+++ b/src/vpp-api/python/Makefile.am
@@ -0,0 +1,60 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
+AM_CFLAGS = -Wall -I${top_srcdir} -I${top_builddir}
+
+BUILT_SOURCES =
+bin_PROGRAMS =
+CLEANFILES =
+lib_LTLIBRARIES =
+noinst_PROGRAMS =
+nobase_include_HEADERS = pneum/pneum.h
+
+#
+# Python / C extension
+#
+lib_LTLIBRARIES += libpneum.la
+libpneum_la_SOURCES = pneum/pneum.c
+libpneum_la_LIBADD = \
+  $(top_builddir)/libvppinfra.la \
+  $(top_builddir)/libvlibmemoryclient.la \
+  $(top_builddir)/libvlibapi.la \
+  $(top_builddir)/libsvm.la \
+  -lpthread -lm -lrt
+
+libpneum_la_LDFLAGS = -module
+libpneum_la_CPPFLAGS =
+
+# TODO: Support both Python 2 and 3.
+install-exec-local:
+	cd $(srcdir);							\
+	mkdir -p $(prefix)/lib/python2.7/site-packages; 		\
+	PYTHONUSERBASE=$(prefix)					\
+	python setup.py build_ext -L $(prefix)/lib64 \
+	-I $(prefix)/include/ install --user
+
+#
+# Test client
+#
+noinst_PROGRAMS += test_pneum
+test_pneum_SOURCES = pneum/pneum.c pneum/test_pneum.c
+test_pneum_LDADD = \
+  $(top_builddir)/libvppinfra.la \
+  $(top_builddir)/libvlibmemoryclient.la \
+  $(top_builddir)/libvlibapi.la \
+  $(top_builddir)/libsvm.la \
+  -lpthread -lm -lrt
+
+
diff --git a/src/vpp-api/python/README.rst b/src/vpp-api/python/README.rst
new file mode 100644
index 00000000..e69de29b
diff --git a/src/vpp-api/python/pneum/pneum.c b/src/vpp-api/python/pneum/pneum.c
new file mode 100644
index 00000000..b805f04b
--- /dev/null
+++ b/src/vpp-api/python/pneum/pneum.c
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <signal.h>
+#include <setjmp.h>
+#include <stdbool.h>
+
+#include <vnet/vnet.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#include <vpp/api/vpe_msg_enum.h>
+
+#include "pneum.h"
+
+#define vl_typedefs             /* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun             /* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_endianfun
+
+vlib_main_t vlib_global_main;
+vlib_main_t **vlib_mains;
+
+typedef struct {
+  u8 rx_thread_jmpbuf_valid;
+  u8 connected_to_vlib;
+  jmp_buf rx_thread_jmpbuf;
+  pthread_t rx_thread_handle;
+} pneum_main_t;
+
+pneum_main_t pneum_main;
+
+pneum_callback_t pneum_callback;
+
+/*
+ * Satisfy external references when -lvlib is not available.
+ */
+void vlib_cli_output (struct vlib_main_t * vm, char * fmt, ...)
+{
+  clib_warning ("vlib_cli_output called...");
+}
+
+void
+pneum_free (void * msg)
+{
+  vl_msg_api_free (msg);
+}
+
+static void
+pneum_api_handler (void *msg)
+{
+  u16 id = ntohs(*((u16 *)msg));
+  if (id == VL_API_RX_THREAD_EXIT) {
+    pneum_main_t *pm = &pneum_main;
+    vl_msg_api_free(msg);
+    longjmp(pm->rx_thread_jmpbuf, 1);
+  }
+  msgbuf_t *msgbuf = (msgbuf_t *)(((u8 *)msg) - offsetof(msgbuf_t, data));
+  int l = ntohl(msgbuf->data_len);
+  if (l == 0)
+    clib_warning("Message ID %d has wrong length: %d\n", id, l);
+
+  /* Call Python callback */
+  ASSERT(pneum_callback);
+  (pneum_callback)(msg, l);
+  pneum_free(msg);
+}
+
+static void *
+pneum_rx_thread_fn (void *arg)
+{
+  unix_shared_memory_queue_t *q;
+  pneum_main_t *pm = &pneum_main;
+  api_main_t *am = &api_main;
+  uword msg;
+
+  q = am->vl_input_queue;
+
+  /* So we can make the rx thread terminate cleanly */
+  if (setjmp(pm->rx_thread_jmpbuf) == 0) {
+    pm->rx_thread_jmpbuf_valid = 1;
+    while (1)
+      while (!unix_shared_memory_queue_sub(q, (u8 *)&msg, 0))
+        pneum_api_handler((void *)msg);
+  }
+  pthread_exit(0);
+}
+
+uword *
+pneum_msg_table_get_hash (void)
+{
+  api_main_t *am = &api_main;
+  return (am->msg_index_by_name_and_crc);
+}
+
+int
+pneum_msg_table_size(void)
+{
+  api_main_t *am = &api_main;
+  return hash_elts(am->msg_index_by_name_and_crc);
+}
+
+int
+pneum_connect (char * name, char * chroot_prefix, pneum_callback_t cb)
+{
+  int rv = 0;
+  pneum_main_t *pm = &pneum_main;
+
+  if (chroot_prefix != NULL)
+    vl_set_memory_root_path (chroot_prefix);
+
+  if ((rv = vl_client_api_map("/vpe-api"))) {
+    clib_warning ("vl_client_api map rv %d", rv);
+    return rv;
+  }
+
+  if (vl_client_connect(name, 0, 32) < 0) {
+    vl_client_api_unmap();
+    return (-1);
+  }
+
+  if (cb) {
+    /* Start the rx queue thread */
+    rv = pthread_create(&pm->rx_thread_handle, NULL, pneum_rx_thread_fn, 0);
+    if (rv) {
+      clib_warning("pthread_create returned %d", rv);
+      vl_client_api_unmap();
+      return (-1);
+    }
+    pneum_callback = cb;
+  }
+
+  pm->connected_to_vlib = 1;
+
+  return (0);
+}
+
+int
+pneum_disconnect (void)
+{
+  api_main_t *am = &api_main;
+  pneum_main_t *pm = &pneum_main;
+
+  if (pm->rx_thread_jmpbuf_valid) {
+    vl_api_rx_thread_exit_t *ep;
+    uword junk;
+    ep = vl_msg_api_alloc (sizeof (*ep));
+    ep->_vl_msg_id = ntohs(VL_API_RX_THREAD_EXIT);
+    vl_msg_api_send_shmem(am->vl_input_queue, (u8 *)&ep);
+    pthread_join(pm->rx_thread_handle, (void **) &junk);
+  }
+  if (pm->connected_to_vlib) {
+    vl_client_disconnect();
+    vl_client_api_unmap();
+    pneum_callback = 0;
+  }
+  memset (pm, 0, sizeof (*pm));
+
+  return (0);
+}
+
+int
+pneum_read (char **p, int *l)
+{
+  unix_shared_memory_queue_t *q;
+  api_main_t *am = &api_main;
+  pneum_main_t *pm = &pneum_main;
+  uword msg;
+
+  if (!pm->connected_to_vlib) return -1;
+
+  *l = 0;
+
+  if (am->our_pid == 0) return (-1);
+
+  q = am->vl_input_queue;
+  int rv = unix_shared_memory_queue_sub(q, (u8 *)&msg, 0);
+  if (rv == 0) {
+    u16 msg_id = ntohs(*((u16 *)msg));
+    msgbuf_t *msgbuf = (msgbuf_t *)(((u8 *)msg) - offsetof(msgbuf_t, data));
+    *l = ntohl(msgbuf->data_len);
+    if (*l == 0) {
+      printf("Unregistered API message: %d\n", msg_id);
+      return (-1);
+    }
+    *p = (char *)msg;
+  } else {
+    printf("Read failed with %d\n", rv);
+  }
+  return (rv);
+}
+
+/*
+ * XXX: Makes the assumption that client_index is the first member
+ */
+typedef VL_API_PACKED(struct _vl_api_header {
+  u16 _vl_msg_id;
+  u32 client_index;
+}) vl_api_header_t;
+
+static unsigned int
+pneum_client_index (void)
+{
+  return (api_main.my_client_index);
+}
+
+int
+pneum_write (char *p, int l)
+{
+  int rv = -1;
+  api_main_t *am = &api_main;
+  vl_api_header_t *mp = vl_msg_api_alloc(l);
+  unix_shared_memory_queue_t *q;
+  pneum_main_t *pm = &pneum_main;
+
+  if (!pm->connected_to_vlib) return -1;
+  if (!mp) return (-1);
+  memcpy(mp, p, l);
+  mp->client_index = pneum_client_index();
+  q = am->shmem_hdr->vl_input_queue;
+  rv = unix_shared_memory_queue_add(q, (u8 *)&mp, 0);
+  if (rv != 0) {
+    printf("vpe_api_write fails: %d\n", rv);
+    /* Clear message */
+    pneum_free(mp);
+  }
+  return (rv);
+}
+
+uint32_t
+pneum_get_msg_index (unsigned char * name)
+{
+  return vl_api_get_msg_index (name);
+}
diff --git a/src/vpp-api/python/pneum/pneum.h b/src/vpp-api/python/pneum/pneum.h
new file mode 100644
index 00000000..a347bd25
--- /dev/null
+++ b/src/vpp-api/python/pneum/pneum.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_pneum_h
+#define included_pneum_h
+
+#include <stdint.h>
+#include <vppinfra/types.h>
+
+typedef void (*pneum_callback_t)(unsigned char * data, int len);
+int pneum_connect(char * name, char * chroot_prefix, pneum_callback_t cb);
+int pneum_disconnect(void);
+int pneum_read(char **data, int *l);
+int pneum_write(char *data, int len);
+void pneum_free(void * msg);
+uword * pneum_msg_table_get_hash (void);
+int pneum_msg_table_size(void);
+uint32_t pneum_get_msg_index(unsigned char * name);
+
+#endif
diff --git a/src/vpp-api/python/pneum/test_pneum.c b/src/vpp-api/python/pneum/test_pneum.c
new file mode 100644
index 00000000..0d55b8a9
--- /dev/null
+++ b/src/vpp-api/python/pneum/test_pneum.c
@@ -0,0 +1,143 @@
+/*
+ *------------------------------------------------------------------
+ * test_pneum.c
+ * 
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. 
+ *------------------------------------------------------------------
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <netdb.h>
+
+#include <time.h>       /* time_t, time (for timestamp in second) */
+#include <sys/timeb.h>  /* ftime, timeb (for timestamp in millisecond) */
+#include <sys/time.h>   /* gettimeofday, timeval (for timestamp in microsecond) */
+
+#include <vnet/vnet.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vnet/ip/ip.h>
+
+#include <vpp/api/vpe_msg_enum.h>
+#include <signal.h>
+#include <setjmp.h>
+#include "pneum.h"
+
+#define vl_typedefs             /* define message structures */
+#include <vpp/api/vpe_all_api_h.h> 
+#undef vl_typedefs
+
+/* we are not linking with vlib */
+vlib_main_t vlib_global_main;
+vlib_main_t **vlib_mains;
+
+volatile int sigterm_received = 0;
+volatile u32 result_ready;
+volatile u16 result_msg_id;
+
+/* M_NOALLOC: construct, but don't yet send a message */
+
+#define M_NOALLOC(T,t)                          \
+  do {						\
+    result_ready = 0;                           \
+    memset (mp, 0, sizeof (*mp));		\
+    mp->_vl_msg_id = ntohs (VL_API_##T);	\
+    mp->client_index = am->my_client_index;	\
+  } while(0);
+
+
+
+int
+wrap_pneum_callback (char *data, int len)
+{
+  //printf("Callback %d\n", len);
+  result_ready = 1;
+  result_msg_id = ntohs(*((u16 *)data));
+  return (0);
+}
+
+int main (int argc, char ** argv)
+{
+  api_main_t * am = &api_main;
+  vl_api_show_version_t message;
+  vl_api_show_version_t *mp;
+  int async = 1;
+  int rv = pneum_connect("pneum_client", NULL, NULL);
+
+  if (rv != 0) {
+    printf("Connect failed: %d\n", rv);
+    exit(rv);
+  }
+ 
+ struct timeb timer_msec;
+  long long int timestamp_msec_start; /* timestamp in millisecond. */
+  if (!ftime(&timer_msec)) {
+    timestamp_msec_start = ((long long int) timer_msec.time) * 1000ll + 
+      (long long int) timer_msec.millitm;
+  }
+  else {
+    timestamp_msec_start = -1;
+  }
+
+ 
+  /*
+   * Test vpe_api_write and vpe_api_read to send and recv message for an
+   * API 
+   */
+  int i;
+  long int no_msgs = 10000;
+  mp = &message;
+
+  for (i = 0; i < no_msgs; i++) {
+    /* Construct the API message */
+    M_NOALLOC(SHOW_VERSION, show_version);
+    pneum_write((char *)mp, sizeof(*mp));
+#ifndef __COVERITY__
+    /* As given, async is always 1. Shut up Coverity about it */
+    if (!async)
+      while (result_ready == 0);
+#endif
+  }
+  if (async) {
+    vl_api_control_ping_t control;
+    vl_api_control_ping_t *mp;
+    mp = &control;
+    M_NOALLOC(CONTROL_PING, control_ping);
+    pneum_write((char *)mp, sizeof(*mp));
+
+    while (result_msg_id != VL_API_CONTROL_PING_REPLY);
+  }
+
+  long long int timestamp_msec_end; /* timestamp in millisecond. */
+  if (!ftime(&timer_msec)) {
+    timestamp_msec_end = ((long long int) timer_msec.time) * 1000ll + 
+      (long long int) timer_msec.millitm;
+  }
+  else {
+    timestamp_msec_end = -1;
+  }
+  
+  printf("Took %lld msec, %lld msgs/msec \n", (timestamp_msec_end - timestamp_msec_start),
+	 no_msgs/(timestamp_msec_end - timestamp_msec_start));
+  fformat(stdout, "Exiting...\n");
+  pneum_disconnect();
+  exit (0);
+}
diff --git a/src/vpp-api/python/setup.cfg b/src/vpp-api/python/setup.cfg
new file mode 100644
index 00000000..d645be77
--- /dev/null
+++ b/src/vpp-api/python/setup.cfg
@@ -0,0 +1,5 @@
+[bdist_wheel]
+# This flag says that the code is written to work on both Python 2 and Python
+# 3. If at all possible, it is good practice to do this. If you cannot, you
+# will need to generate wheels for each Python version that you support.
+universal=0
diff --git a/src/vpp-api/python/setup.py b/src/vpp-api/python/setup.py
new file mode 100644
index 00000000..99a0147a
--- /dev/null
+++ b/src/vpp-api/python/setup.py
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+try:
+    from setuptools import setup, Extension
+except ImportError:
+    from distutils.core import setup, Extension
+
+setup (name = 'vpp_papi',
+       version = '1.3',
+       description = 'VPP Python binding',
+       author = 'Ole Troan',
+       author_email = 'ot@cisco.com',
+       test_suite = 'tests',
+       packages=['vpp_papi'],
+       ext_modules = [
+           Extension(
+               'vpp_api',
+               sources = ['vpp_papi/pneum_wrap.c'],
+               libraries = ['pneum'],
+           )],
+       long_description = '''VPP Python language binding.''',
+)
diff --git a/src/vpp-api/python/tests/test_cli.py b/src/vpp-api/python/tests/test_cli.py
new file mode 100755
index 00000000..66fb6943
--- /dev/null
+++ b/src/vpp-api/python/tests/test_cli.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+import unittest, sys, time, threading, struct
+import test_base
+import vpp_papi
+from ipaddress import *
+
+import glob, subprocess
+class TestPAPI(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        #
+        # Start main VPP process
+        cls.vpp_bin = glob.glob(test_base.scriptdir+'/../../../build-root/install-vpp*-native/vpp/bin/vpp')[0]
+        print("VPP BIN:", cls.vpp_bin)
+        cls.vpp = subprocess.Popen([cls.vpp_bin, "unix", "nodaemon"], stderr=subprocess.PIPE)
+        print('Started VPP')
+        # For some reason unless we let VPP start up the API cannot connect.
+        time.sleep(0.3)
+    @classmethod
+    def tearDownClass(cls):
+        cls.vpp.terminate()
+
+    def setUp(self):
+        print("Connecting API")
+        r = vpp_papi.connect("test_papi")
+        self.assertEqual(r, 0)
+
+    def tearDown(self):
+        r = vpp_papi.disconnect()
+        self.assertEqual(r, 0)
+
+    #
+    # The tests themselves
+    #
+
+    #
+    # Basic request / reply
+    #
+    def test_cli_request(self):
+        print(vpp_papi.cli_exec('show version verbose'))
+        #t = vpp_papi.cli_inband_request(len(cmd), cmd)
+        #print('T:',t)
+        #reply = t.reply[0].decode().rstrip('\x00')
+        #print(reply)
+        #program = t.program.decode().rstrip('\x00')
+        #self.assertEqual('vpe', program)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/src/vpp-api/python/tests/test_modules.py b/src/vpp-api/python/tests/test_modules.py
new file mode 100755
index 00000000..fdcd092c
--- /dev/null
+++ b/src/vpp-api/python/tests/test_modules.py
@@ -0,0 +1,18 @@
+from __future__ import print_function
+import unittest
+import vpp_papi
+import pot, snat
+print('Plugins:')
+vpp_papi.plugin_show()
+r = vpp_papi.connect('ole')
+
+r = vpp_papi.show_version()
+print('R:', r)
+
+r = snat.snat_interface_add_del_feature(1, 1, 1)
+print('R:', r)
+
+list_name = 'foobar'
+r = pot.pot_profile_add(0, 1, 123, 123, 0, 12, 0, 23, len(list_name), list_name)
+print('R:', r)
+vpp_papi.disconnect()
diff --git a/src/vpp-api/python/tests/test_papi.py b/src/vpp-api/python/tests/test_papi.py
new file mode 100755
index 00000000..8cbbfc59
--- /dev/null
+++ b/src/vpp-api/python/tests/test_papi.py
@@ -0,0 +1,119 @@
+from __future__ import print_function
+import unittest, sys, time, threading, struct, logging, os
+import vpp_papi
+from ipaddress import *
+scriptdir = os.path.dirname(os.path.realpath(__file__))
+papi_event = threading.Event()
+print(vpp_papi.vpe.VL_API_SW_INTERFACE_SET_FLAGS)
+def papi_event_handler(result):
+    if result.vl_msg_id == vpp_papi.vpe.VL_API_SW_INTERFACE_SET_FLAGS:
+        return
+    if result.vl_msg_id == vpp_papi.vpe.VL_API_VNET_INTERFACE_COUNTERS:
+        print('Interface counters', result)
+        return
+    if result.vl_msg_id == vpp_papi.vpe.VL_API_VNET_IP6_FIB_COUNTERS:
+        print('IPv6 FIB counters', result)
+        papi_event.set()
+        return
+
+    print('Unknown message id:', result.vl_msg_id)
+
+import glob, subprocess
+class TestPAPI(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        #
+        # Start main VPP process
+        cls.vpp_bin = glob.glob(scriptdir+'/../../../build-root/install-vpp*-native/vpp/bin/vpp')[0]
+        print("VPP BIN:", cls.vpp_bin)
+        cls.vpp = subprocess.Popen([cls.vpp_bin, "unix", "nodaemon"], stderr=subprocess.PIPE)
+        print('Started VPP')
+        # For some reason unless we let VPP start up the API cannot connect.
+        time.sleep(0.3)
+    @classmethod
+    def tearDownClass(cls):
+        cls.vpp.terminate()
+
+    def setUp(self):
+        print("Connecting API")
+        r = vpp_papi.connect("test_papi")
+        self.assertEqual(r, 0)
+
+    def tearDown(self):
+        r = vpp_papi.disconnect()
+        self.assertEqual(r, 0)
+
+    #
+    # The tests themselves
+    #
+
+    #
+    # Basic request / reply
+    #
+    def test_show_version(self):
+        t = vpp_papi.show_version()
+        print('T', t);
+        program = t.program.decode().rstrip('\x00')
+        self.assertEqual('vpe', program)
+
+    #
+    # Details / Dump
+    #
+    def test_details_dump(self):
+        t = vpp_papi.sw_interface_dump(0, b'')
+        print('Dump/details T', t)
+
+    #
+    # Arrays
+    #
+    def test_arrays(self):
+        t = vpp_papi.vnet_get_summary_stats()
+        print('Summary stats', t)
+        print('Packets:', t.total_pkts[0])
+        print('Packets:', t.total_pkts[1])
+    #
+    # Variable sized arrays and counters
+    #
+    #@unittest.skip("stats")
+    def test_want_stats(self):
+        pid = 123
+        vpp_papi.register_event_callback(papi_event_handler)
+        papi_event.clear()
+
+        # Need to configure IPv6 to get som IPv6 FIB stats
+        t = vpp_papi.create_loopback('')
+        print(t)
+        self.assertEqual(t.retval, 0)
+
+        ifindex = t.sw_if_index
+        addr = str(IPv6Address(u'1::1').packed)
+        t = vpp_papi.sw_interface_add_del_address(ifindex, 1, 1, 0, 16, addr)
+        print(t)
+        self.assertEqual(t.retval, 0)
+
+        # Check if interface is up
+        # XXX: Add new API to query interface state based on ifindex, instead of dump all.
+        t = vpp_papi.sw_interface_set_flags(ifindex, 1, 1, 0)
+        self.assertEqual(t.retval, 0)
+
+        t = vpp_papi.want_stats(True, pid)
+
+        print (t)
+
+        #
+        # Wait for some stats
+        #
+        self.assertEqual(papi_event.wait(15), True)
+        t = vpp_papi.want_stats(False, pid)
+        print (t)
+
+
+    #
+    # Plugins?
+    #
+
+if __name__ == '__main__':
+    #logging.basicConfig(level=logging.DEBUG)
+    unittest.main()
+def test_papi():
+    print('test')
diff --git a/src/vpp-api/python/tests/test_version.py b/src/vpp-api/python/tests/test_version.py
new file mode 100755
index 00000000..de39cc24
--- /dev/null
+++ b/src/vpp-api/python/tests/test_version.py
@@ -0,0 +1,35 @@
+from __future__ import print_function
+import unittest, sys, time, threading, struct
+
+import vpp_papi
+from ipaddress import *
+import glob, subprocess
+class TestPAPI(unittest.TestCase):
+    def setUp(self):
+        print("Connecting API")
+        r = vpp_papi.connect("test_papi")
+        self.assertEqual(r, 0)
+
+    def tearDown(self):
+        r = vpp_papi.disconnect()
+        self.assertEqual(r, 0)
+
+    #
+    # The tests themselves
+    #
+
+    #
+    # Basic request / reply
+    #
+    def test_show_version(self):
+        print(vpp_papi.show_version())
+
+    #
+    # Details / Dump
+    #
+    def test_details_dump(self):
+        t = vpp_papi.sw_interface_dump(0, b'')
+        print('Dump/details T', t)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/src/vpp-api/python/tests/test_vpp_papi2.py b/src/vpp-api/python/tests/test_vpp_papi2.py
new file mode 100755
index 00000000..f45f791e
--- /dev/null
+++ b/src/vpp-api/python/tests/test_vpp_papi2.py
@@ -0,0 +1,487 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+import unittest, sys, threading, struct, logging, os
+from vpp_papi import VPP
+from ipaddress import *
+import glob, json
+
+papi_event = threading.Event()
+import glob
+
+import fnmatch
+import os
+
+jsonfiles = []
+for root, dirnames, filenames in os.walk('../../../build-root/'):
+    if root.find('install-') == -1: continue
+    for filename in fnmatch.filter(filenames, '*.api.json'):
+        jsonfiles.append(os.path.join(root, filename))
+
+class TestPAPI(unittest.TestCase):
+    show_version_msg = '''["show_version",
+              ["u16", "_vl_msg_id"],
+              ["u32", "client_index"],
+              ["u32", "context"],
+              {"crc" : "0xf18f9480"}
+        ]'''
+
+    ip_address_details_msg = '''["ip_address_details",
+            ["u16", "_vl_msg_id"],
+            ["u32", "client_index"],
+            ["u32", "context"],
+            ["u8", "ip", 16],
+            ["u8", "prefix_length"],
+            {"crc" : "0x87d522a1"}
+        ]'''
+
+    cli_inband_msg = '''["cli_inband",
+            ["u16", "_vl_msg_id"],
+            ["u32", "client_index"],
+            ["u32", "context"],
+            ["u32", "length"],
+            ["u8", "cmd", 0, "length"],
+            {"crc" : "0x22345937"}
+        ]'''
+
+    def test_adding_new_message_object(self):
+        p = json.loads(TestPAPI.show_version_msg)
+        msglist = VPP(testmode=json)
+        msgdef = msglist.add_message(p[0], p[1:])
+
+        # Verify that message can be retrieved
+        self.assertTrue(msglist['show_version'])
+        self.assertFalse(msglist['foobar'])
+
+        # Test duplicate
+        self.assertRaises(ValueError, msglist.add_message, p[0], p[1:])
+
+        # Look at return tuple
+        self.assertTrue(msglist.ret_tup('show_version'))
+
+    def test_adding_new_message_object_with_array(self):
+        p = json.loads(TestPAPI.ip_address_details_msg)
+        msglist = VPP(testmode=True)
+        msglist.add_message(p[0], p[1:])
+
+        self.assertTrue(msglist['ip_address_details'])
+
+    def test_message_to_bytes(self):
+        msglist = VPP(testmode=True)
+        p = json.loads(TestPAPI.show_version_msg)
+        msgdef = msglist.add_message(p[0], p[1:])
+
+        # Give me a byte string for given message and given arguments
+
+        b = msglist.encode(msgdef, {'_vl_msg_id' : 50, 'context' : 123 })
+        self.assertEqual(10, len(b))
+        rv = msglist.decode(msgdef, b)
+        self.assertEqual(rv._0, 50)
+        self.assertEqual(rv.context, 123)
+
+
+        p = json.loads(TestPAPI.ip_address_details_msg)
+        msgdef = msglist.add_message(p[0], p[1:])
+
+        # Give me a byte string for given message and given arguments
+        b = msglist.encode(msgdef, {'_vl_msg_id' : 50, 'context' : 123,
+                                    'ip' : b'\xf0\xf1\xf2',
+                                    'prefix_length' :  12})
+        self.assertEqual(27, len(b))
+        rv = msglist.decode(msgdef, b)
+
+        self.assertEqual(rv.context, 123)
+        self.assertEqual(rv.ip, b'\xf0\xf1\xf2\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+        self.assertEqual(rv.prefix_length, 12)
+
+        p = json.loads(TestPAPI.cli_inband_msg)
+        msgdef = msglist.add_message(p[0], p[1:])
+
+        # Give me a byte string for given message and given arguments
+        b = msglist.encode(msgdef, { '_vl_msg_id' : 50, 'context' : 123,
+                                     'length' : 20, 'cmd' : 'show version verbose'})
+        self.assertEqual(34, len(b))
+        rv = msglist.decode(msgdef, b)
+        self.assertEqual(rv._0, 50)
+        self.assertEqual(rv.context, 123)
+        self.assertEqual(rv.cmd.decode('ascii'), 'show version verbose')
+
+        variable_array_16_msg = '''["variable_array_16",
+            ["u32", "length"],
+            ["u16", "list", 0, "length"]
+        ]'''
+
+        p = json.loads(variable_array_16_msg)
+        msgdef = msglist.add_message(p[0], p[1:])
+
+        # Give me a byte string for given message and given arguments
+        b = msglist.encode(msgdef, { 'list' : [1, 2], 'length' :2})
+        self.assertEqual(8, len(b))
+        rv = msglist.decode(msgdef, b)
+        self.assertEqual(2, rv.length)
+        self.assertEqual([1,2], rv.list)
+
+    def test_add_new_types(self):
+        counter_type = '''["ip4_fib_counter",
+            ["u32", "address"],
+            ["u8", "address_length"],
+            ["u64", "packets"],
+            ["u64", "bytes"],
+            {"crc" : "0xb2739495"}
+        ]'''
+
+        with_type_msg = '''["with_type_msg",
+            ["u32", "length"],
+            ["u16", "list", 0, "length"],
+            ["vl_api_ip4_fib_counter_t", "counter"]
+        ]'''
+
+        # Add new type
+        msglist = VPP(testmode=True)
+        p = json.loads(counter_type)
+        msglist.add_type(p[0], p[1:])
+        p = json.loads(with_type_msg)
+        msgdef = msglist.add_message(p[0], p[1:])
+        b = msglist.encode(msgdef, {'length' : 2, 'list' : [1,2],
+                           'counter' : { 'address' : 4, 'address_length' : 12,
+                                       'packets': 1235, 'bytes' : 5678}})
+        self.assertEqual(29, len(b)) # feil
+        rv = msglist.decode(msgdef, b)
+        self.assertEqual(2, rv.length)
+        self.assertEqual(5678, rv.counter.bytes)
+
+    def test_add_new_compound_type_with_array(self):
+        counter_type = '''["ip4_fib_counter",
+            ["u32", "address"],
+            ["u8", "address_length"],
+            ["u64", "packets"],
+            ["u64", "bytes"],
+            {"crc" : "0xb2739495"}
+        ]'''
+
+        with_type_msg = '''["with_type_msg",
+            ["u32", "length"],
+            ["u16", "list", 0, "length"],
+            ["vl_api_ip4_fib_counter_t", "counter", 2]
+
+        ]'''
+
+        # Add new type
+        msglist = VPP(testmode=True)
+        p = json.loads(counter_type)
+        msglist.add_type(p[0], p[1:])
+        p = json.loads(with_type_msg)
+        msgdef = msglist.add_message(p[0], p[1:])
+        b = msglist.encode(msgdef, {'length' : 2, 'list' : [1,2],
+                           'counter' : [{ 'address' : 4, 'address_length' : 12,
+                                        'packets': 1235, 'bytes' : 5678},
+                                      { 'address' : 111, 'address_length' : 222,
+                                        'packets': 333, 'bytes' : 444}]})
+        self.assertEqual(50, len(b))
+        rv = msglist.decode(msgdef, b)
+        self.assertEqual([1,2], rv.list)
+        self.assertEqual(1235, rv.counter[0].packets)
+
+        with_type_variable_msg = '''["with_type_variable_msg",
+            ["u32", "length"],
+            ["vl_api_ip4_fib_counter_t", "counter", 0, "length"]
+
+        ]'''
+
+        p = json.loads(with_type_variable_msg)
+        msgdef = msglist.add_message(p[0], p[1:])
+        b = msglist.encode(msgdef, {'length' : 2,
+                           'counter' : [{ 'address' : 4, 'address_length' : 12,
+                                        'packets': 1235, 'bytes' : 5678},
+                                      { 'address' : 111, 'address_length' : 222,
+                                        'packets': 333, 'bytes' : 444}]})
+        self.assertEqual(46, len(b))
+        rv = msglist.decode(msgdef, b)
+        self.assertEqual(2, rv.length)
+        self.assertEqual(1235, rv.counter[0].packets)
+        self.assertEqual(333, rv.counter[1].packets)
+
+    def test_simple_array(self):
+        msglist = VPP(testmode=True)
+
+        simple_byte_array = '''["simple_byte_array",
+            ["u32", "length"],
+            ["u8", "namecommand", 64]
+
+        ]'''
+        p = json.loads(simple_byte_array)
+        msgdef = msglist.add_message(p[0], p[1:])
+        b = msglist.encode(msgdef, {'length': 2, 'namecommand': 'foobar'})
+        self.assertEqual(68, len(b))
+        rv = msglist.decode(msgdef, b)
+        self.assertEqual(2, rv.length)
+
+        simple_array = '''["simple_array",
+            ["u32", "length"],
+            ["u32", "list", 2]
+
+        ]'''
+        p = json.loads(simple_array)
+        msgdef = msglist.add_message(p[0], p[1:])
+        b = msglist.encode(msgdef, {'length': 2, 'list': [1,2]})
+        self.assertEqual(12, len(b))
+        rv = msglist.decode(msgdef, b)
+        self.assertEqual(2, rv.length)
+        self.assertEqual([1,2], rv.list)
+
+        simple_variable_array = '''["simple_variable_array",
+            ["u32", "length"],
+            ["u32", "list", 0, "length"]
+
+        ]'''
+        p = json.loads(simple_variable_array)
+        msgdef = msglist.add_message(p[0], p[1:])
+        b = msglist.encode(msgdef, {'length':2, 'list': [1,2]})
+        self.assertEqual(12, len(b))
+        rv = msglist.decode(msgdef, b)
+        self.assertEqual(2, rv.length)
+        self.assertEqual([1,2], rv.list)
+
+        simple_variable_byte_array = '''["simple_variable_byte_array",
+            ["u32", "length"],
+            ["u8", "list", 0, "length"]
+        ]'''
+        p = json.loads(simple_variable_byte_array)
+        msgdef =msglist.add_message(p[0], p[1:])
+        b = msglist.encode(msgdef, {'length': 6, 'list' : 'foobar'})
+        self.assertEqual(10, len(b))
+        rv = msglist.decode(msgdef, b)
+        self.assertEqual(6, rv.length)
+        self.assertEqual('foobar', rv.list)
+
+    def test_old_vla_array(self):
+        msglist = VPP(testmode = True)
+
+        # VLA
+        vla_byte_array = '''["vla_byte_array",
+            ["u32", "foobar"],
+            ["u32", "list", 2],
+            ["u32", "propercount"],
+            ["u8", "propermask", 0, "propercount"],
+            ["u8", "oldmask", 0],
+            {"crc" : "0xb2739495"}
+        ]'''
+        p = json.loads(vla_byte_array)
+        msgdef = msglist.add_message(p[0], p[1:])
+        b = msglist.encode(msgdef, {'list' : [123, 456], 'oldmask': b'foobar',
+                                    'propercount' : 2,
+                                    'propermask' : [8,9]})
+        self.assertEqual(24, len(b))
+        rv = msglist.decode(msgdef, b)
+        self.assertEqual(b'foobar', rv.oldmask)
+
+    def test_old_vla_array_not_last_member(self):
+        msglist = VPP(testmode = True)
+
+        # VLA
+        vla_byte_array = '''["vla_byte_array",
+            ["u8", "oldmask", 0],
+            ["u32", "foobar"],
+            {"crc" : "0xb2739495"}
+        ]'''
+        p = json.loads(vla_byte_array)
+        self.assertRaises(ValueError, msglist.add_message, p[0], p[1:])
+
+    def test_old_vla_array_u32(self):
+        msglist = VPP(testmode = True)
+
+        # VLA
+        vla_byte_array = '''["vla_byte_array",
+            ["u32", "foobar"],
+            ["u32", "oldmask", 0],
+            {"crc" : "0xb2739495"}
+        ]'''
+        p = json.loads(vla_byte_array)
+        msgdef = msglist.add_message(p[0], p[1:])
+        b = msglist.encode(msgdef, {'foobar' : 123, 'oldmask': [123, 456, 789]})
+        self.assertEqual(16, len(b))
+        rv = msglist.decode(msgdef, b)
+        self.assertEqual([123, 456, 789], rv.oldmask)
+
+    def test_old_vla_array_compound(self):
+        msglist = VPP(testmode = True)
+
+        # VLA
+        counter_type = '''["ip4_fib_counter",
+            ["u32", "address"],
+            ["u8", "address_length"],
+            ["u64", "packets"],
+            ["u64", "bytes"],
+            {"crc" : "0xb2739495"}
+        ]'''
+
+        vla_byte_array = '''["vla_byte_array",
+            ["vl_api_ip4_fib_counter_t", "counter", 0],
+            {"crc" : "0xb2739495"}
+        ]'''
+
+        p = json.loads(counter_type)
+        msglist.add_type(p[0], p[1:])
+
+        p = json.loads(vla_byte_array)
+        with self.assertRaises(NotImplementedError):
+            msgdef = msglist.add_message(p[0], p[1:])
+
+    def test_array_count_not_previous(self):
+        msglist = VPP(testmode = True)
+
+        # VLA
+        vla_byte_array = '''["vla_byte_array",
+            ["u32", "count"],
+            ["u32", "filler"],
+            ["u32", "lst", 0, "count"],
+            {"crc" : "0xb2739495"}
+        ]'''
+
+        p = json.loads(vla_byte_array)
+        msgdef = msglist.add_message(p[0], p[1:])
+        b = msglist.encode(msgdef, {'count': 3, 'lst': [1,2,3], 'filler' : 1 })
+        rv = msglist.decode(msgdef, b)
+        self.assertEqual(rv.lst, [1,2,3])
+
+    def test_argument_name(self):
+        msglist = VPP(testmode=True)
+
+
+        simple_name = '''["simple_name",
+            ["u32", "length"],
+            ["u8", "name"]
+        ]'''
+        p = json.loads(simple_name)
+        msgdef = msglist.add_message(p[0], p[1:])
+        b = msglist.encode(msgdef, {'length': 6, 'name': 1})
+        self.assertEqual(5, len(b))
+        rv = msglist.decode(msgdef, b)
+        self.assertEqual(6, rv.length)
+        self.assertEqual(1, rv.name)
+
+class TestConnectedPAPI(unittest.TestCase):
+    def test_request_reply_function(self):
+        vpp = VPP(jsonfiles)
+
+        vpp.connect('test_vpp_papi2')
+
+        rv = vpp.show_version()
+        self.assertEqual(0, rv.retval)
+        self.assertEqual('vpe', rv.program.decode().rstrip('\0x00'))
+        vpp.disconnect()
+
+
+    def test_dump_details_function(self):
+        vpp = VPP(jsonfiles)
+        vpp.connect('test_vpp_papi3')
+
+        rv = vpp.sw_interface_dump()
+        #self.assertEqual(0, rv.retval)
+        print('RV', rv)
+        vpp.disconnect()
+
+    def test_vla(self):
+        vpp = VPP(jsonfiles)
+
+        vpp.connect('test_vpp_papi3')
+
+        cmd = 'show version verbose'
+        rv = vpp.cli_inband(length=len(cmd), cmd=cmd)
+        self.assertEqual(0, rv.retval)
+        print('RV', rv.reply)
+
+        cmd = 'show vlib graph'
+        rv = vpp.cli_inband(length=len(cmd), cmd=cmd)
+        self.assertEqual(0, rv.retval)
+        print('RV', rv.reply)
+        vpp.disconnect()
+
+    def test_events(self):
+        vpp = VPP(jsonfiles)
+
+        vpp.connect('test_vpp_papi3')
+
+        vpp.register_event_callback(event_handler)
+
+        rv = vpp.want_interface_events(enable_disable = True)
+        self.assertEqual(0, rv.retval)
+        print('RV', rv)
+
+        rv = vpp.create_loopback()
+        print('RV', rv)
+        self.assertEqual(0, rv.retval)
+
+        rv = vpp.sw_interface_set_flags(sw_if_index = 1, admin_up_down = 1)
+        print('RV', rv)
+        self.assertEqual(0, rv.retval)
+        rv = vpp.sw_interface_set_flags(sw_if_index = 1, admin_up_down = 0)
+        print('RV', rv)
+        self.assertEqual(0, rv.retval)
+        self.assertEqual(papi_event.wait(10), True)
+
+        vpp.disconnect()
+
+def event_handler(msgname, result):
+    print('IN EVENT HANDLER:', msgname, result)
+    papi_event.set()
+
+class TestACL(unittest.TestCase):
+    def test_acl_create(self):
+        vpp = VPP(jsonfiles)
+
+        vpp.connect('acl-test')
+
+        rv = vpp.acl_plugin_get_version()
+        print('RV', rv)
+        self.assertEqual(rv.major, 1)
+        self.assertEqual(rv.minor, 1)
+
+        rv = vpp.acl_add_replace(acl_index = 0xFFFFFFFF,
+            r = [{
+                "is_permit" : 1,
+                "is_ipv6" : 0,
+                "proto" : 6,
+                "srcport_or_icmptype_first" : 80,
+                }],
+            count = 1)
+        print ('RV', rv)
+        rv = vpp.acl_add_replace(acl_index = 0xFFFFFFFF,
+            r = [{
+                "is_permit" : 1,
+                "is_ipv6" : 0,
+                "proto" : 6,
+                "srcport_or_icmptype_first" : 81,
+                }],
+            count = 1)
+        self.assertEqual(rv.retval, 0)
+        print ('RV', rv)
+        ai = rv.acl_index
+        rv = vpp.acl_dump()
+        print ('RV', rv)
+
+        #rv = vpp.acl_del(acl_index = ai)
+        #self.assertEqual(rv.retval, 0)
+
+        #rv = vpp.acl_dump()
+        #self.assertEqual([], vpp.acl_dump())
+
+        vpp.disconnect()
+
+    def test_status(self):
+        vpp = VPP(jsonfiles)
+        vpp.status()
+
+    def test_acl_interface_get(self):
+        vpp = VPP(jsonfiles)
+
+        vpp.connect('test_vpp_papi2')
+
+        rv = vpp.macip_acl_interface_get()
+
+        print('RV', rv)
+
+        vpp.disconnect()
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/src/vpp-api/python/vpp_papi/__init__.py b/src/vpp-api/python/vpp_papi/__init__.py
new file mode 100644
index 00000000..6688ffb8
--- /dev/null
+++ b/src/vpp-api/python/vpp_papi/__init__.py
@@ -0,0 +1,3 @@
+__import__('pkg_resources').declare_namespace(__name__)
+from . vpp_papi import *
+
diff --git a/src/vpp-api/python/vpp_papi/pneum_wrap.c b/src/vpp-api/python/vpp_papi/pneum_wrap.c
new file mode 100644
index 00000000..5763707b
--- /dev/null
+++ b/src/vpp-api/python/vpp_papi/pneum_wrap.c
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <Python.h>
+#include "../pneum/pneum.h"
+#include <vppinfra/hash.h>
+
+static PyObject *pneum_callback = NULL;
+
+static void
+wrap_pneum_callback (unsigned char * data, int len)
+{
+  PyGILState_STATE gstate;
+  PyObject *result;//, *arglist;
+
+  gstate = PyGILState_Ensure();
+
+  /* Time to call the callback */
+#if PY_VERSION_HEX >= 0x03000000
+  result = PyObject_CallFunction(pneum_callback, "y#", data, len);
+#else
+  result = PyObject_CallFunction(pneum_callback, "s#", data, len);
+#endif
+  if (result)
+    Py_DECREF(result);
+  else
+    PyErr_Print();
+
+  PyGILState_Release(gstate);
+}
+
+static PyObject *
+wrap_connect (PyObject *self, PyObject *args)
+{
+  char * name, * chroot_prefix = NULL;
+  int rv;
+  PyObject * temp = NULL;
+  pneum_callback_t cb = NULL;
+
+  if (!PyArg_ParseTuple(args, "s|Os:wrap_connect",
+			&name, &temp, &chroot_prefix))
+    return (NULL);
+
+  if (temp)
+    {
+      if (!PyCallable_Check(temp))
+	{
+	  PyErr_SetString(PyExc_TypeError, "parameter must be callable");
+	  return NULL;
+	}
+
+      Py_XINCREF(temp);         /* Add a reference to new callback */
+      Py_XDECREF(pneum_callback);  /* Dispose of previous callback */
+      pneum_callback = temp;       /* Remember new callback */
+      cb = wrap_pneum_callback;
+    }
+  Py_BEGIN_ALLOW_THREADS
+    rv = pneum_connect(name, chroot_prefix, cb);
+  Py_END_ALLOW_THREADS
+  return PyLong_FromLong(rv);
+}
+
+static PyObject *
+wrap_disconnect (PyObject *self, PyObject *args)
+{
+  int rv;
+  Py_BEGIN_ALLOW_THREADS
+  rv = pneum_disconnect();
+  Py_END_ALLOW_THREADS
+  return PyLong_FromLong(rv);
+}
+static PyObject *
+wrap_write (PyObject *self, PyObject *args)
+{
+  char *data;
+  int len, rv;
+
+  if (!PyArg_ParseTuple(args, "s#", &data, &len))
+    return NULL;
+  Py_BEGIN_ALLOW_THREADS
+  rv = pneum_write(data, len);
+  Py_END_ALLOW_THREADS
+
+  return PyLong_FromLong(rv);
+}
+
+static PyObject *
+wrap_read (PyObject *self, PyObject *args)
+{
+  char *data;
+  int len, rv;
+
+  Py_BEGIN_ALLOW_THREADS
+  rv = pneum_read(&data, &len);
+  Py_END_ALLOW_THREADS
+
+  if (rv != 0) { Py_RETURN_NONE; }
+#if PY_VERSION_HEX >= 0x03000000
+  PyObject *ret = Py_BuildValue("y#", data, len);
+#else
+  PyObject *ret = Py_BuildValue("s#", data, len);
+#endif
+  if (!ret) { Py_RETURN_NONE; }
+
+  pneum_free(data);
+  return ret;
+}
+
+static PyObject *
+wrap_msg_table (PyObject *self, PyObject *args)
+{
+  int i = 0, rv = 0;
+  hash_pair_t *hp;
+  uword *h = pneum_msg_table_get_hash();
+  PyObject *ret = PyList_New(pneum_msg_table_size());
+  if (!ret) goto error;
+  hash_foreach_pair (hp, h,
+  ({
+    PyObject *item = PyTuple_New(2);
+    if (!item) goto error;
+    rv = PyTuple_SetItem(item, 0, PyLong_FromLong((u32)hp->value[0]));
+    if (rv) goto error;
+    rv = PyTuple_SetItem(item, 1, PyString_FromString((char *)hp->key));
+    if (rv) goto error;
+    PyList_SetItem(ret, i, item);
+    i++;
+  }));
+
+  return ret;
+
+ error:
+  /* TODO: Raise exception */
+  printf("msg_table failed");
+  Py_RETURN_NONE;
+}
+
+static PyMethodDef vpp_api_Methods[] = {
+  {"connect", wrap_connect, METH_VARARGS, "Connect to the VPP API."},
+  {"disconnect", wrap_disconnect, METH_VARARGS, "Disconnect from the VPP API."},
+  {"write", wrap_write, METH_VARARGS, "Write data to the VPP API."},
+  {"read", wrap_read, METH_VARARGS, "Read data from the VPP API."},
+  {"msg_table", wrap_msg_table, METH_VARARGS, "Get API dictionary."},
+  {NULL, NULL, 0, NULL}        /* Sentinel */
+};
+
+#if PY_VERSION_HEX >= 0x03000000
+PyMODINIT_FUNC
+PyInit_vpp_api (void)
+#else
+void
+initvpp_api (void)
+#endif
+{
+#if PY_VERSION_HEX >= 0x03000000
+  static struct PyModuleDef vpp_api_module = {
+#if PY_VERSION_HEX >= 0x03020000
+    PyModuleDef_HEAD_INIT,
+#else
+    {
+      PyObject_HEAD_INIT(NULL)
+      NULL, /* m_init */
+      0,    /* m_index */
+      NULL, /* m_copy */
+    },
+#endif
+    (char *) "vpp_api",
+    NULL,
+    -1,
+    vpp_api_Methods,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  };
+#endif
+
+  /* Ensure threading is initialised */
+  if (!PyEval_ThreadsInitialized()) {
+    PyEval_InitThreads();
+  }
+
+#if PY_VERSION_HEX >= 0x03000000
+  return PyModule_Create(&vpp_api_module);
+#else
+  Py_InitModule((char *) "vpp_api", vpp_api_Methods);
+  return;
+#endif
+}
diff --git a/src/vpp-api/python/vpp_papi/vpp_papi.py b/src/vpp-api/python/vpp_papi/vpp_papi.py
new file mode 100644
index 00000000..6b6b79fd
--- /dev/null
+++ b/src/vpp-api/python/vpp_papi/vpp_papi.py
@@ -0,0 +1,450 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+from __future__ import print_function
+import sys, os, logging, collections, struct, json, threading, glob
+logging.basicConfig(level=logging.DEBUG)
+import vpp_api
+
+def eprint(*args, **kwargs):
+    print(*args, file=sys.stderr, **kwargs)
+
+class VPP():
+    def __init__(self, apifiles = None, testmode = False):
+        self.messages = {}
+        self.id_names = []
+        self.id_msgdef = []
+        self.buffersize = 10000
+        self.connected = False
+        self.header = struct.Struct('>HI')
+        self.results = {}
+        self.timeout = 5
+        self.apifile = []
+
+        if not apifiles:
+            # Pick up API definitions from default directory
+            apifiles = glob.glob('/usr/share/vpp/api/*.api.json')
+
+        for file in apifiles:
+            self.apifile.append(file)
+            with open(file) as apidef_file:
+                api = json.load(apidef_file)
+                for t in api['types']:
+                    self.add_type(t[0], t[1:])
+
+                for m in api['messages']:
+                    self.add_message(m[0], m[1:])
+
+        # Basic sanity check
+        if len(self.messages) == 0 and not testmode:
+            raise ValueError(1, 'Missing JSON message definitions')
+
+
+    class ContextId(object):
+        def __init__(self):
+            self.context = 0
+        def __call__(self):
+            self.context += 1
+            return self.context
+    get_context = ContextId()
+
+    def status(self):
+        print('Connected') if self.connected else print('Not Connected')
+        print('Read API definitions from', self.apifile)
+
+    def __struct (self, t, n = None, e = -1, vl = None):
+        base_types = { 'u8' : 'B',
+                       'u16' : 'H',
+                       'u32' : 'I',
+                       'i32' : 'i',
+                       'u64' : 'Q',
+                       'f64' : 'd',
+                       }
+        pack = None
+        if t in base_types:
+            pack = base_types[t]
+            if not vl:
+                if e > 0 and t == 'u8':
+                    # Fixed byte array
+                    return struct.Struct('>' + str(e) + 's')
+                if e > 0:
+                    # Fixed array of base type
+                    return [e, struct.Struct('>' + base_types[t])]
+                elif e == 0:
+                    # Old style variable array
+                    return [-1, struct.Struct('>' + base_types[t])]
+            else:
+                # Variable length array
+                return [vl, struct.Struct('>s')] if t == 'u8' else \
+                    [vl, struct.Struct('>' + base_types[t])]
+
+            return struct.Struct('>' + base_types[t])
+
+        if t in self.messages:
+            ### Return a list in case of array ###
+            if e > 0 and not vl:
+                return [e, lambda self, encode, buf, offset, args: (
+                    self.__struct_type(encode, self.messages[t], buf, offset,
+                                       args))]
+            if vl:
+                return [vl, lambda self, encode, buf, offset, args: (
+                    self.__struct_type(encode, self.messages[t], buf, offset,
+                                       args))]
+            elif e == 0:
+                # Old style VLA
+                raise NotImplementedError(1, 'No support for compound types ' + t)
+            return lambda self, encode, buf, offset, args: (
+                self.__struct_type(encode, self.messages[t], buf, offset, args)
+            )
+
+        raise ValueError(1, 'Invalid message type: ' + t)
+
+    def __struct_type(self, encode, msgdef, buf, offset, kwargs):
+        if encode:
+            return self.__struct_type_encode(msgdef, buf, offset, kwargs)
+        else:
+            return self.__struct_type_decode(msgdef, buf, offset)
+
+    def __struct_type_encode(self, msgdef, buf, offset, kwargs):
+        off = offset
+        size = 0
+
+        for k in kwargs:
+            if k not in msgdef['args']:
+                raise ValueError(1, 'Invalid field-name in message call ' + k)
+
+        for k,v in msgdef['args'].iteritems():
+            off += size
+            if k in kwargs:
+                if type(v) is list:
+                    if callable(v[1]):
+                        e = kwargs[v[0]] if v[0] in kwargs else v[0]
+                        size = 0
+                        for i in range(e):
+                            size += v[1](self, True, buf, off + size,
+                                         kwargs[k][i])
+                    else:
+                        if v[0] in kwargs:
+                            l = kwargs[v[0]]
+                        else:
+                            l = len(kwargs[k])
+                        if v[1].size == 1:
+                            buf[off:off + l] = bytearray(kwargs[k])
+                            size = l
+                        else:
+                            size = 0
+                            for i in kwargs[k]:
+                                v[1].pack_into(buf, off + size, i)
+                                size += v[1].size
+                else:
+                    if callable(v):
+                        size = v(self, True, buf, off, kwargs[k])
+                    else:
+                        v.pack_into(buf, off, kwargs[k])
+                        size = v.size
+            else:
+                size = v.size if not type(v) is list else 0
+
+        return off + size - offset
+
+
+    def __getitem__(self, name):
+        if name in self.messages:
+            return self.messages[name]
+        return None
+
+    def encode(self, msgdef, kwargs):
+        # Make suitably large buffer
+        buf = bytearray(self.buffersize)
+        offset = 0
+        size = self.__struct_type(True, msgdef, buf, offset, kwargs)
+        return buf[:offset + size]
+
+    def decode(self, msgdef, buf):
+        return self.__struct_type(False, msgdef, buf, 0, None)[1]
+
+    def __struct_type_decode(self, msgdef, buf, offset):
+        res = []
+        off = offset
+        size = 0
+        for k,v in msgdef['args'].iteritems():
+            off += size
+            if type(v) is list:
+                lst = []
+                if callable(v[1]): # compound type
+                    size = 0
+                    if v[0] in msgdef['args']: # vla
+                        e = res[v[2]]
+                    else: # fixed array
+                        e = v[0]
+                    res.append(lst)
+                    for i in range(e):
+                        (s,l) = v[1](self, False, buf, off + size, None)
+                        lst.append(l)
+                        size += s
+                    continue
+                if v[1].size == 1:
+                    if type(v[0]) is int:
+                        size = len(buf) - off
+                    else:
+                        size = res[v[2]]
+                    res.append(buf[off:off + size])
+                else:
+                    e = v[0] if type(v[0]) is int else res[v[2]]
+                    if e == -1:
+                        e = (len(buf) - off) / v[1].size
+                    lst = []
+                    res.append(lst)
+                    size = 0
+                    for i in range(e):
+                        lst.append(v[1].unpack_from(buf, off + size)[0])
+                        size += v[1].size
+            else:
+                if callable(v):
+                    (s,l) = v(self, False, buf, off, None)
+                    res.append(l)
+                    size += s
+                else:
+                    res.append(v.unpack_from(buf, off)[0])
+                    size = v.size
+
+        return off + size - offset, msgdef['return_tuple']._make(res)
+
+    def ret_tup(self, name):
+        if name in self.messages and 'return_tuple' in self.messages[name]:
+            return self.messages[name]['return_tuple']
+        return None
+
+    def add_message(self, name, msgdef):
+        if name in self.messages:
+            raise ValueError('Duplicate message name: ' + name)
+
+        args = collections.OrderedDict()
+        argtypes = collections.OrderedDict()
+        fields = []
+        msg = {}
+        for i, f in enumerate(msgdef):
+            if type(f) is dict and 'crc' in f:
+                msg['crc'] = f['crc']
+                continue
+            field_type = f[0]
+            field_name = f[1]
+            if len(f) == 3 and f[2] == 0 and i != len(msgdef) - 2:
+                raise ValueError('Variable Length Array must be last: ' + name)
+            args[field_name] = self.__struct(*f)
+            argtypes[field_name] = field_type
+            if len(f) == 4: # Find offset to # elements field
+                args[field_name].append(args.keys().index(f[3]) - i)
+            fields.append(field_name)
+        msg['return_tuple'] = collections.namedtuple(name, fields,
+                                                     rename = True)
+        self.messages[name] = msg
+        self.messages[name]['args'] = args
+        self.messages[name]['argtypes'] = argtypes
+        return self.messages[name]
+
+    def add_type(self, name, typedef):
+        return self.add_message('vl_api_' + name + '_t', typedef)
+
+    def make_function(self, name, i, msgdef, multipart, async):
+        if (async):
+            f = lambda **kwargs: (self._call_vpp_async(i, msgdef, multipart, **kwargs))
+        else:
+            f = lambda **kwargs: (self._call_vpp(i, msgdef, multipart, **kwargs))
+        args = self.messages[name]['args']
+        argtypes = self.messages[name]['argtypes']
+        f.__name__ = str(name)
+        f.__doc__ = ", ".join(["%s %s" % (argtypes[k], k) for k in args.keys()])
+        return f
+
+    def _register_functions(self, async=False):
+        self.id_names = [None] * (self.vpp_dictionary_maxid + 1)
+        self.id_msgdef = [None] * (self.vpp_dictionary_maxid + 1)
+        for name, msgdef in self.messages.iteritems():
+            if name in self.vpp_dictionary:
+                if self.messages[name]['crc'] != self.vpp_dictionary[name]['crc']:
+                    raise ValueError(3, 'Failed CRC checksum ' + name +
+                                     ' ' + self.messages[name]['crc'] +
+                                     ' ' + self.vpp_dictionary[name]['crc'])
+                i = self.vpp_dictionary[name]['id']
+                self.id_msgdef[i] = msgdef
+                self.id_names[i] = name
+                multipart = True if name.find('_dump') > 0 else False
+                setattr(self, name, self.make_function(name, i, msgdef, multipart, async))
+
+    def _write (self, buf):
+        if not self.connected:
+            raise IOError(1, 'Not connected')
+        return vpp_api.write(str(buf))
+
+    def _load_dictionary(self):
+        self.vpp_dictionary = {}
+        self.vpp_dictionary_maxid = 0
+        d = vpp_api.msg_table()
+
+        if not d:
+            raise IOError(3, 'Cannot get VPP API dictionary')
+        for i,n in d:
+            name, crc =  n.rsplit('_', 1)
+            crc = '0x' + crc
+            self.vpp_dictionary[name] = { 'id' : i, 'crc' : crc }
+            self.vpp_dictionary_maxid = max(self.vpp_dictionary_maxid, i)
+
+    def connect(self, name, chroot_prefix = None, async = False):
+        msg_handler = self.msg_handler if not async else self.msg_handler_async
+        if not chroot_prefix:
+            rv = vpp_api.connect(name, msg_handler)
+        else:
+            rv = vpp_api.connect(name, msg_handler, chroot_prefix)
+
+        if rv != 0:
+            raise IOError(2, 'Connect failed')
+        self.connected = True
+
+        self._load_dictionary()
+        self._register_functions(async=async)
+
+        # Initialise control ping
+        self.control_ping_index = self.vpp_dictionary['control_ping']['id']
+        self.control_ping_msgdef = self.messages['control_ping']
+
+    def disconnect(self):
+        rv = vpp_api.disconnect()
+        return rv
+
+    def results_wait(self, context):
+        return (self.results[context]['e'].wait(self.timeout))
+
+    def results_prepare(self, context):
+        self.results[context] = {}
+        self.results[context]['e'] = threading.Event()
+        self.results[context]['e'].clear()
+        self.results[context]['r'] = []
+
+    def results_clean(self, context):
+        del self.results[context]
+
+    def msg_handler(self, msg):
+        if not msg:
+            eprint('vpp_api.read failed')
+            return
+
+        i, ci = self.header.unpack_from(msg, 0)
+        if self.id_names[i] == 'rx_thread_exit':
+            return;
+
+        #
+        # Decode message and returns a tuple.
+        #
+        msgdef = self.id_msgdef[i]
+        if not msgdef:
+            raise IOError(2, 'Reply message undefined')
+
+        r = self.decode(msgdef, msg)
+        if 'context' in r._asdict():
+            if r.context > 0:
+                context = r.context
+
+        msgname = type(r).__name__
+
+        #
+        # XXX: Call provided callback for event
+        # Are we guaranteed to not get an event during processing of other messages?
+        # How to differentiate what's a callback message and what not? Context = 0?
+        #
+        #if not is_waiting_for_reply():
+        if r.context == 0 and self.event_callback:
+            self.event_callback(msgname, r)
+            return
+
+        #
+        # Collect results until control ping
+        #
+        if msgname == 'control_ping_reply':
+            self.results[context]['e'].set()
+            return
+
+        if not context in self.results:
+            eprint('Not expecting results for this context', context, r)
+            return
+
+        if 'm' in self.results[context]:
+            self.results[context]['r'].append(r)
+            return
+
+        self.results[context]['r'] = r
+        self.results[context]['e'].set()
+
+    def msg_handler_async(self, msg):
+        if not msg:
+            eprint('vpp_api.read failed')
+            return
+
+        i, ci = self.header.unpack_from(msg, 0)
+        if self.id_names[i] == 'rx_thread_exit':
+            return;
+
+        #
+        # Decode message and returns a tuple.
+        #
+        msgdef = self.id_msgdef[i]
+        if not msgdef:
+            raise IOError(2, 'Reply message undefined')
+
+        r = self.decode(msgdef, msg)
+        msgname = type(r).__name__
+
+        self.event_callback(msgname, r)
+
+    def _control_ping(self, context):
+        self._write(self.encode(self.control_ping_msgdef,
+                        { '_vl_msg_id' : self.control_ping_index,
+                          'context' : context}))
+
+    def _call_vpp(self, i, msgdef, multipart, **kwargs):
+        if not 'context' in kwargs:
+            context = self.get_context()
+            kwargs['context'] = context
+        else:
+            context = kwargs['context']
+        kwargs['_vl_msg_id'] = i
+        b = self.encode(msgdef, kwargs)
+
+        self.results_prepare(context)
+        self._write(b)
+
+        if multipart:
+            self.results[context]['m'] = True
+            self._control_ping(context)
+        self.results_wait(context)
+        r = self.results[context]['r']
+        self.results_clean(context)
+        return r
+
+    def _call_vpp_async(self, i, msgdef, multipart, **kwargs):
+        if not 'context' in kwargs:
+            context = self.get_context()
+            kwargs['context'] = context
+        else:
+            context = kwargs['context']
+        kwargs['_vl_msg_id'] = i
+        b = self.encode(msgdef, kwargs)
+
+        self._write(b)
+
+    def register_event_callback(self, callback):
+        self.event_callback = callback
+
diff --git a/src/vpp.am b/src/vpp.am
new file mode 100644
index 00000000..a02206f8
--- /dev/null
+++ b/src/vpp.am
@@ -0,0 +1,159 @@
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bin_PROGRAMS += bin/vpp
+
+bin_vpp_SOURCES =				\
+  vpp/vnet/main.c				\
+  vpp/app/vpe_cli.c				\
+  vpp/app/version.c				\
+  vpp/oam/oam.c					\
+  vpp/stats/stats.c
+
+bin_vpp_SOURCES +=				\
+  vpp/api/api.c					\
+  vpp/api/custom_dump.c				\
+  vpp/api/json_format.c
+
+if WITH_APICLI
+  bin_vpp_SOURCES +=				\
+  vpp/api/api_format.c				\
+  vpp/api/api_main.c
+endif
+
+# comment out to disable stats upload to gmond
+
+bin_vpp_CFLAGS = @APICLI@
+bin_vpp_SOURCES +=				\
+  vpp/api/gmon.c
+
+nobase_include_HEADERS +=			\
+  vpp/api/vpe_all_api_h.h			\
+  vpp/api/vpe_msg_enum.h			\
+  vpp/api/vpe.api.h
+
+API_FILES += vpp/api/vpe.api
+
+BUILT_SOURCES += vpp/app/version.h
+
+vpp/app/version.o:	vpp/app/version.h
+
+.PHONY:	vpp/app/version.h
+
+vpp/app/version.h:
+	@echo "  VERSION " $@
+	@echo "#define VPP_BUILD_DATE \"$$(date)\"" > $@
+	@echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $@
+	@echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $@
+	@echo "#define VPP_BUILD_TOPDIR \"$$(git rev-parse --show-toplevel)\"" 	>> $@
+	@echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@
+
+# Generate a plugin configuration script. Misconfiguring a
+# plugin can cause very subtle problems.
+
+bin_SCRIPTS = vpp_plugin_configure
+
+BUILT_SOURCES += vpp_plugin_configure
+
+.PHONY: vpp_plugin_configure
+
+if WITH_DPDK
+PLUGIN_DPDK_ARG="--with-dpdk"
+else
+PLUGIN_DPDK_ARG=""
+endif
+
+vpp_plugin_configure:
+	@echo "PLUGIN CONFIGURE " $@ 
+	@echo "#!/bin/bash" > $@
+	@echo " " >> $@
+	@echo "set +eu" >> $@
+	@echo " " >> $@
+	@echo "if [ -f ./configure ] ; then" >> $@
+	@echo "    CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ./configure --with-plugin-toolkit $(PLUGIN_DPDK_ARG)" >> $@
+	@echo "else" >> $@
+	@echo "    if [ -f ../configure ] ; then" >> $@
+	@echo "        CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ../configure --with-plugin-toolkit $(PLUGIN_DPDK_ARG)" >> $@
+	@echo "    else" >> $@
+	@echo "        echo Couldnt find ./configure or ../configure " >> $@
+	@echo "        exit 1" >> $@
+	@echo "    fi" >> $@
+	@echo "fi" >> $@
+
+bin_vpp_LDADD = \
+  libvlibapi.la \
+  libvlibmemory.la \
+  libvlib_unix.la \
+  libvlib.la \
+  libvnet.la \
+  libsvm.la \
+  libsvmdb.la \
+  libvnetplugin.la \
+  -lrt
+
+bin_vpp_LDFLAGS = $(DPDK_LD_FLAGS)
+bin_vpp_LDADD += libvppinfra.la -lm -lpthread -ldl $(DPDK_LD_ADD)
+
+if WITH_IPV6SR
+  bin_vpp_LDADD += -lcrypto
+endif
+
+noinst_PROGRAMS += bin/test_client
+
+bin_test_client_SOURCES = \
+  vpp/api/test_client.c
+
+bin_test_client_LDADD = \
+  libvlibmemoryclient.la \
+  libvlibapi.la \
+  libsvm.la \
+  libvppinfra.la \
+  -lpthread -lm -lrt
+
+noinst_PROGRAMS += bin/test_client bin/test_ha
+
+bin_test_ha_SOURCES = \
+  vpp/api/test_ha.c
+
+bin_test_ha_LDADD = \
+  libvlibmemoryclient.la \
+  libvlibapi.la \
+  libsvmdb.la \
+  libsvm.la \
+  libvppinfra.la \
+  -lpthread -lm -lrt
+
+noinst_PROGRAMS += bin/summary_stats_client
+
+bin_summary_stats_client_SOURCES = \
+  vpp/api/summary_stats_client.c
+
+bin_summary_stats_client_LDADD = \
+  libvlibmemoryclient.la \
+  libvlibapi.la \
+  libsvm.la \
+  libvppinfra.la \
+  -lpthread -lm -lrt
+
+bin_PROGRAMS += bin/vpp_get_metrics
+
+bin_vpp_get_metrics_SOURCES = \
+  vpp/api/vpp_get_metrics.c
+
+bin_vpp_get_metrics_LDADD = \
+  libsvmdb.la \
+  libsvm.la \
+  libvppinfra.la \
+  -lpthread -lm -lrt
+
+# vi:syntax=automake
diff --git a/src/vpp/api/api.c b/src/vpp/api/api.c
new file mode 100644
index 00000000..6289249c
--- /dev/null
+++ b/src/vpp/api/api.c
@@ -0,0 +1,4922 @@
+/*
+ *------------------------------------------------------------------
+ * api.c - message handler registration
+ *
+ * Copyright (c) 2010-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <time.h>
+#include <fcntl.h>
+#include <string.h>
+#include <pwd.h>
+#include <grp.h>
+
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/time.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/format.h>
+#include <vppinfra/error.h>
+
+#include <vnet/api_errno.h>
+#include <vnet/vnet.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/l2_bd.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ip/ip6.h>
+#include <vnet/ip/ip6_neighbor.h>
+#include <vnet/mpls/mpls.h>
+#include <vnet/mpls/mpls_tunnel.h>
+#include <vnet/dhcp/proxy.h>
+#include <vnet/dhcp/client.h>
+#if IPV6SR > 0
+#include <vnet/sr/sr.h>
+#endif
+#include <vnet/dhcpv6/proxy.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vnet/classify/vnet_classify.h>
+#include <vnet/classify/input_acl.h>
+#include <vnet/classify/policer_classify.h>
+#include <vnet/classify/flow_classify.h>
+#include <vnet/l2/l2_classify.h>
+#include <vnet/vxlan/vxlan.h>
+#include <vnet/l2/l2_vtr.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <vnet/map/map.h>
+#include <vnet/cop/cop.h>
+#include <vnet/ip/ip6_hop_by_hop.h>
+#include <vnet/ip/ip_source_and_port_range_check.h>
+#include <vnet/policer/policer.h>
+#include <vnet/flow/flow_report.h>
+#include <vnet/flow/flow_report_classify.h>
+#include <vnet/ip/punt.h>
+#include <vnet/feature/feature.h>
+
+#undef BIHASH_TYPE
+#undef __included_bihash_template_h__
+#include <vnet/l2/l2_fib.h>
+
+#if DPDK > 0
+#include <vnet/devices/dpdk/dpdk.h>
+#endif
+
+#include <vpp/stats/stats.h>
+#include <vpp/oam/oam.h>
+
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/arp_packet.h>
+#include <vnet/interface.h>
+#include <vnet/l2/l2_fib.h>
+#include <vnet/l2/l2_bd.h>
+#include <vpp/api/vpe_msg_enum.h>
+#include <vnet/span/span.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/fib_api.h>
+#include <vnet/dpo/drop_dpo.h>
+#include <vnet/dpo/receive_dpo.h>
+#include <vnet/dpo/lookup_dpo.h>
+#include <vnet/dpo/classify_dpo.h>
+#include <vnet/dpo/ip_null_dpo.h>
+#define vl_typedefs		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_typedefs
+#define vl_endianfun		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_endianfun
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_printfun
+#include <vlibapi/api_helper_macros.h>
+#define foreach_vpe_api_msg                                             \
+_(WANT_OAM_EVENTS, want_oam_events)                                     \
+_(OAM_ADD_DEL, oam_add_del)                                             \
+_(MPLS_ROUTE_ADD_DEL, mpls_route_add_del)                               \
+_(MPLS_IP_BIND_UNBIND, mpls_ip_bind_unbind)                             \
+_(IS_ADDRESS_REACHABLE, is_address_reachable)                           \
+_(SW_INTERFACE_SET_MPLS_ENABLE, sw_interface_set_mpls_enable)           \
+_(SW_INTERFACE_SET_VPATH, sw_interface_set_vpath)                       \
+_(SW_INTERFACE_SET_VXLAN_BYPASS, sw_interface_set_vxlan_bypass)         \
+_(SW_INTERFACE_SET_L2_XCONNECT, sw_interface_set_l2_xconnect)           \
+_(SW_INTERFACE_SET_L2_BRIDGE, sw_interface_set_l2_bridge)               \
+_(SW_INTERFACE_SET_DPDK_HQOS_PIPE, sw_interface_set_dpdk_hqos_pipe)     \
+_(SW_INTERFACE_SET_DPDK_HQOS_SUBPORT, sw_interface_set_dpdk_hqos_subport) \
+_(SW_INTERFACE_SET_DPDK_HQOS_TCTBL, sw_interface_set_dpdk_hqos_tctbl)   \
+_(BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del)                         \
+_(BRIDGE_DOMAIN_DUMP, bridge_domain_dump)                               \
+_(BRIDGE_DOMAIN_DETAILS, bridge_domain_details)                         \
+_(BRIDGE_DOMAIN_SW_IF_DETAILS, bridge_domain_sw_if_details)             \
+_(L2FIB_ADD_DEL, l2fib_add_del)                                         \
+_(L2_FLAGS, l2_flags)                                                   \
+_(BRIDGE_FLAGS, bridge_flags)                                           \
+_(CREATE_VLAN_SUBIF, create_vlan_subif)                                 \
+_(CREATE_SUBIF, create_subif)                                           \
+_(MPLS_TUNNEL_ADD_DEL, mpls_tunnel_add_del)				\
+_(PROXY_ARP_ADD_DEL, proxy_arp_add_del)                                 \
+_(PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable)       \
+_(VNET_GET_SUMMARY_STATS, vnet_get_summary_stats)			\
+_(RESET_FIB, reset_fib)							\
+_(DHCP_PROXY_CONFIG,dhcp_proxy_config)					\
+_(DHCP_PROXY_CONFIG_2,dhcp_proxy_config_2)				\
+_(DHCP_PROXY_SET_VSS,dhcp_proxy_set_vss)                                \
+_(DHCP_CLIENT_CONFIG, dhcp_client_config)				\
+_(CREATE_LOOPBACK, create_loopback)					\
+_(CONTROL_PING, control_ping)                                           \
+_(CLI_REQUEST, cli_request)                                             \
+_(CLI_INBAND, cli_inband)						\
+_(SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit)			\
+_(L2_PATCH_ADD_DEL, l2_patch_add_del)					\
+_(CLASSIFY_ADD_DEL_TABLE, classify_add_del_table)			\
+_(CLASSIFY_ADD_DEL_SESSION, classify_add_del_session)			\
+_(CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table)     \
+_(CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables)   \
+_(GET_NODE_INDEX, get_node_index)                                       \
+_(ADD_NODE_NEXT, add_node_next)						\
+_(VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel)                           \
+_(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump)                                 \
+_(L2_FIB_CLEAR_TABLE, l2_fib_clear_table)                               \
+_(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter)                     \
+_(L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)         \
+_(SHOW_VERSION, show_version)						\
+_(L2_FIB_TABLE_DUMP, l2_fib_table_dump)	                                \
+_(L2_FIB_TABLE_ENTRY, l2_fib_table_entry)                               \
+_(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel)                   \
+_(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump)                         \
+_(INTERFACE_NAME_RENUMBER, interface_name_renumber)			\
+_(WANT_IP4_ARP_EVENTS, want_ip4_arp_events)                             \
+_(WANT_IP6_ND_EVENTS, want_ip6_nd_events)                               \
+_(INPUT_ACL_SET_INTERFACE, input_acl_set_interface)                     \
+_(DELETE_LOOPBACK, delete_loopback)                                     \
+_(BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del)                                 \
+_(COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable)		\
+_(COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable)		\
+_(GET_NODE_GRAPH, get_node_graph)                                       \
+_(IOAM_ENABLE, ioam_enable)                                             \
+_(IOAM_DISABLE, ioam_disable)                                           \
+_(SR_MULTICAST_MAP_ADD_DEL, sr_multicast_map_add_del)                   \
+_(POLICER_ADD_DEL, policer_add_del)                                     \
+_(POLICER_DUMP, policer_dump)                                           \
+_(POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface)       \
+_(POLICER_CLASSIFY_DUMP, policer_classify_dump)                         \
+_(MPLS_TUNNEL_DUMP, mpls_tunnel_dump)                                   \
+_(MPLS_TUNNEL_DETAILS, mpls_tunnel_details)                             \
+_(MPLS_FIB_DUMP, mpls_fib_dump)                                         \
+_(MPLS_FIB_DETAILS, mpls_fib_details)                                   \
+_(CLASSIFY_TABLE_IDS,classify_table_ids)                                \
+_(CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface)             \
+_(CLASSIFY_TABLE_INFO,classify_table_info)                              \
+_(CLASSIFY_SESSION_DUMP,classify_session_dump)                          \
+_(CLASSIFY_SESSION_DETAILS,classify_session_details)                    \
+_(SET_IPFIX_EXPORTER, set_ipfix_exporter)                               \
+_(IPFIX_EXPORTER_DUMP, ipfix_exporter_dump)                             \
+_(SET_IPFIX_CLASSIFY_STREAM, set_ipfix_classify_stream)                 \
+_(IPFIX_CLASSIFY_STREAM_DUMP, ipfix_classify_stream_dump)               \
+_(IPFIX_CLASSIFY_TABLE_ADD_DEL, ipfix_classify_table_add_del)           \
+_(IPFIX_CLASSIFY_TABLE_DUMP, ipfix_classify_table_dump)                 \
+_(GET_NEXT_INDEX, get_next_index)                                       \
+_(PG_CREATE_INTERFACE, pg_create_interface)                             \
+_(PG_CAPTURE, pg_capture)                                               \
+_(PG_ENABLE_DISABLE, pg_enable_disable)                                 \
+_(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL,                               \
+  ip_source_and_port_range_check_add_del)                               \
+_(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL,                     \
+  ip_source_and_port_range_check_interface_add_del)                     \
+_(DELETE_SUBIF, delete_subif)                                           \
+_(L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite)           \
+_(PUNT, punt)                                                           \
+_(FLOW_CLASSIFY_SET_INTERFACE, flow_classify_set_interface)             \
+_(FLOW_CLASSIFY_DUMP, flow_classify_dump)                               \
+_(FEATURE_ENABLE_DISABLE, feature_enable_disable)
+
+#define QUOTE_(x) #x
+#define QUOTE(x) QUOTE_(x)
+typedef enum
+{
+  RESOLVE_IP4_ADD_DEL_ROUTE = 1,
+  RESOLVE_IP6_ADD_DEL_ROUTE,
+} resolve_t;
+
+static vlib_node_registration_t vpe_resolver_process_node;
+vpe_api_main_t vpe_api_main;
+
+static int arp_change_delete_callback (u32 pool_index, u8 * notused);
+static int nd_change_delete_callback (u32 pool_index, u8 * notused);
+
+/* Clean up all registrations belonging to the indicated client */
+int
+vl_api_memclnt_delete_callback (u32 client_index)
+{
+  vpe_api_main_t *vam = &vpe_api_main;
+  vpe_client_registration_t *rp;
+  uword *p;
+  int stats_memclnt_delete_callback (u32 client_index);
+
+  stats_memclnt_delete_callback (client_index);
+
+#define _(a)                                                    \
+    p = hash_get (vam->a##_registration_hash, client_index);    \
+    if (p) {                                                    \
+        rp = pool_elt_at_index (vam->a##_registrations, p[0]);  \
+        pool_put (vam->a##_registrations, rp);                  \
+        hash_unset (vam->a##_registration_hash, client_index);  \
+    }
+  foreach_registration_hash;
+#undef _
+  return 0;
+}
+
+pub_sub_handler (oam_events, OAM_EVENTS);
+
+#define RESOLUTION_EVENT 1
+#define RESOLUTION_PENDING_EVENT 2
+#define IP4_ARP_EVENT 3
+#define IP6_ND_EVENT 4
+
+int ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp);
+
+int ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp);
+
+void
+handle_ip4_arp_event (u32 pool_index)
+{
+  vpe_api_main_t *vam = &vpe_api_main;
+  vnet_main_t *vnm = vam->vnet_main;
+  vlib_main_t *vm = vam->vlib_main;
+  vl_api_ip4_arp_event_t *event;
+  vl_api_ip4_arp_event_t *mp;
+  unix_shared_memory_queue_t *q;
+
+  /* Client can cancel, die, etc. */
+  if (pool_is_free_index (vam->arp_events, pool_index))
+    return;
+
+  event = pool_elt_at_index (vam->arp_events, pool_index);
+
+  q = vl_api_client_index_to_input_queue (event->client_index);
+  if (!q)
+    {
+      (void) vnet_add_del_ip4_arp_change_event
+	(vnm, arp_change_delete_callback,
+	 event->pid, &event->address,
+	 vpe_resolver_process_node.index, IP4_ARP_EVENT,
+	 ~0 /* pool index, notused */ , 0 /* is_add */ );
+      return;
+    }
+
+  if (q->cursize < q->maxsize)
+    {
+      mp = vl_msg_api_alloc (sizeof (*mp));
+      clib_memcpy (mp, event, sizeof (*mp));
+      vl_msg_api_send_shmem (q, (u8 *) & mp);
+    }
+  else
+    {
+      static f64 last_time;
+      /*
+       * Throttle syslog msgs.
+       * It's pretty tempting to just revoke the registration...
+       */
+      if (vlib_time_now (vm) > last_time + 10.0)
+	{
+	  clib_warning ("arp event for %U to pid %d: queue stuffed!",
+			format_ip4_address, &event->address, event->pid);
+	  last_time = vlib_time_now (vm);
+	}
+    }
+}
+
+void
+handle_ip6_nd_event (u32 pool_index)
+{
+  vpe_api_main_t *vam = &vpe_api_main;
+  vnet_main_t *vnm = vam->vnet_main;
+  vlib_main_t *vm = vam->vlib_main;
+  vl_api_ip6_nd_event_t *event;
+  vl_api_ip6_nd_event_t *mp;
+  unix_shared_memory_queue_t *q;
+
+  /* Client can cancel, die, etc. */
+  if (pool_is_free_index (vam->nd_events, pool_index))
+    return;
+
+  event = pool_elt_at_index (vam->nd_events, pool_index);
+
+  q = vl_api_client_index_to_input_queue (event->client_index);
+  if (!q)
+    {
+      (void) vnet_add_del_ip6_nd_change_event
+	(vnm, nd_change_delete_callback,
+	 event->pid, &event->address,
+	 vpe_resolver_process_node.index, IP6_ND_EVENT,
+	 ~0 /* pool index, notused */ , 0 /* is_add */ );
+      return;
+    }
+
+  if (q->cursize < q->maxsize)
+    {
+      mp = vl_msg_api_alloc (sizeof (*mp));
+      clib_memcpy (mp, event, sizeof (*mp));
+      vl_msg_api_send_shmem (q, (u8 *) & mp);
+    }
+  else
+    {
+      static f64 last_time;
+      /*
+       * Throttle syslog msgs.
+       * It's pretty tempting to just revoke the registration...
+       */
+      if (vlib_time_now (vm) > last_time + 10.0)
+	{
+	  clib_warning ("ip6 nd event for %U to pid %d: queue stuffed!",
+			format_ip6_address, &event->address, event->pid);
+	  last_time = vlib_time_now (vm);
+	}
+    }
+}
+
+static uword
+resolver_process (vlib_main_t * vm,
+		  vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  uword event_type;
+  uword *event_data = 0;
+  f64 timeout = 100.0;
+  int i;
+
+  while (1)
+    {
+      vlib_process_wait_for_event_or_clock (vm, timeout);
+
+      event_type = vlib_process_get_events (vm, &event_data);
+
+      switch (event_type)
+	{
+	case RESOLUTION_PENDING_EVENT:
+	  timeout = 1.0;
+	  break;
+
+	case RESOLUTION_EVENT:
+	  clib_warning ("resolver: BOGUS TYPE");
+	  break;
+
+	case IP4_ARP_EVENT:
+	  for (i = 0; i < vec_len (event_data); i++)
+	    handle_ip4_arp_event (event_data[i]);
+	  break;
+
+	case IP6_ND_EVENT:
+	  for (i = 0; i < vec_len (event_data); i++)
+	    handle_ip6_nd_event (event_data[i]);
+	  break;
+
+	case ~0:		/* timeout */
+	  break;
+	}
+
+      vec_reset_length (event_data);
+    }
+  return 0;			/* or not */
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (vpe_resolver_process_node,static) = {
+  .function = resolver_process,
+  .type = VLIB_NODE_TYPE_PROCESS,
+  .name = "vpe-route-resolver-process",
+};
+/* *INDENT-ON* */
+
+static int
+mpls_route_add_del_t_handler (vnet_main_t * vnm,
+			      vl_api_mpls_route_add_del_t * mp)
+{
+  u32 fib_index, next_hop_fib_index;
+  mpls_label_t *label_stack = NULL;
+  int rv, ii, n_labels;;
+
+  fib_prefix_t pfx = {
+    .fp_len = 21,
+    .fp_proto = FIB_PROTOCOL_MPLS,
+    .fp_eos = mp->mr_eos,
+    .fp_label = ntohl (mp->mr_label),
+  };
+  if (pfx.fp_eos)
+    {
+      if (mp->mr_next_hop_proto_is_ip4)
+	{
+	  pfx.fp_payload_proto = DPO_PROTO_IP4;
+	}
+      else
+	{
+	  pfx.fp_payload_proto = DPO_PROTO_IP6;
+	}
+    }
+  else
+    {
+      pfx.fp_payload_proto = DPO_PROTO_MPLS;
+    }
+
+  rv = add_del_route_check (FIB_PROTOCOL_MPLS,
+			    mp->mr_table_id,
+			    mp->mr_next_hop_sw_if_index,
+			    dpo_proto_to_fib (pfx.fp_payload_proto),
+			    mp->mr_next_hop_table_id,
+			    mp->mr_create_table_if_needed,
+			    &fib_index, &next_hop_fib_index);
+
+  if (0 != rv)
+    return (rv);
+
+  ip46_address_t nh;
+  memset (&nh, 0, sizeof (nh));
+
+  if (mp->mr_next_hop_proto_is_ip4)
+    memcpy (&nh.ip4, mp->mr_next_hop, sizeof (nh.ip4));
+  else
+    memcpy (&nh.ip6, mp->mr_next_hop, sizeof (nh.ip6));
+
+  n_labels = mp->mr_next_hop_n_out_labels;
+  if (n_labels == 0)
+    ;
+  else if (1 == n_labels)
+    vec_add1 (label_stack, ntohl (mp->mr_next_hop_out_label_stack[0]));
+  else
+    {
+      vec_validate (label_stack, n_labels - 1);
+      for (ii = 0; ii < n_labels; ii++)
+	label_stack[ii] = ntohl (mp->mr_next_hop_out_label_stack[ii]);
+    }
+
+  return (add_del_route_t_handler (mp->mr_is_multipath, mp->mr_is_add, 0,	// mp->is_drop,
+				   0,	// mp->is_unreach,
+				   0,	// mp->is_prohibit,
+				   0,	// mp->is_local,
+				   mp->mr_is_classify,
+				   mp->mr_classify_table_index,
+				   mp->mr_is_resolve_host,
+				   mp->mr_is_resolve_attached,
+				   fib_index, &pfx,
+				   mp->mr_next_hop_proto_is_ip4,
+				   &nh, ntohl (mp->mr_next_hop_sw_if_index),
+				   next_hop_fib_index,
+				   mp->mr_next_hop_weight,
+				   ntohl (mp->mr_next_hop_via_label),
+				   label_stack));
+}
+
+void
+vl_api_mpls_route_add_del_t_handler (vl_api_mpls_route_add_del_t * mp)
+{
+  vl_api_mpls_route_add_del_reply_t *rmp;
+  vnet_main_t *vnm;
+  int rv;
+
+  vnm = vnet_get_main ();
+  vnm->api_errno = 0;
+
+  rv = mpls_route_add_del_t_handler (vnm, mp);
+
+  rv = (rv == 0) ? vnm->api_errno : rv;
+
+  REPLY_MACRO (VL_API_MPLS_ROUTE_ADD_DEL_REPLY);
+}
+
+static int
+mpls_ip_bind_unbind_handler (vnet_main_t * vnm,
+			     vl_api_mpls_ip_bind_unbind_t * mp)
+{
+  u32 mpls_fib_index, ip_fib_index;
+
+  mpls_fib_index =
+    fib_table_find (FIB_PROTOCOL_MPLS, ntohl (mp->mb_mpls_table_id));
+
+  if (~0 == mpls_fib_index)
+    {
+      if (mp->mb_create_table_if_needed)
+	{
+	  mpls_fib_index =
+	    fib_table_find_or_create_and_lock (FIB_PROTOCOL_MPLS,
+					       ntohl (mp->mb_mpls_table_id));
+	}
+      else
+	return VNET_API_ERROR_NO_SUCH_FIB;
+    }
+
+  ip_fib_index = fib_table_find ((mp->mb_is_ip4 ?
+				  FIB_PROTOCOL_IP4 :
+				  FIB_PROTOCOL_IP6),
+				 ntohl (mp->mb_ip_table_id));
+  if (~0 == ip_fib_index)
+    return VNET_API_ERROR_NO_SUCH_FIB;
+
+  fib_prefix_t pfx = {
+    .fp_len = mp->mb_address_length,
+  };
+
+  if (mp->mb_is_ip4)
+    {
+      pfx.fp_proto = FIB_PROTOCOL_IP4;
+      clib_memcpy (&pfx.fp_addr.ip4, mp->mb_address,
+		   sizeof (pfx.fp_addr.ip4));
+    }
+  else
+    {
+      pfx.fp_proto = FIB_PROTOCOL_IP6;
+      clib_memcpy (&pfx.fp_addr.ip6, mp->mb_address,
+		   sizeof (pfx.fp_addr.ip6));
+    }
+
+  if (mp->mb_is_bind)
+    fib_table_entry_local_label_add (ip_fib_index, &pfx,
+				     ntohl (mp->mb_label));
+  else
+    fib_table_entry_local_label_remove (ip_fib_index, &pfx,
+					ntohl (mp->mb_label));
+
+  return (0);
+}
+
+void
+vl_api_mpls_ip_bind_unbind_t_handler (vl_api_mpls_ip_bind_unbind_t * mp)
+{
+  vl_api_mpls_route_add_del_reply_t *rmp;
+  vnet_main_t *vnm;
+  int rv;
+
+  vnm = vnet_get_main ();
+  vnm->api_errno = 0;
+
+  rv = mpls_ip_bind_unbind_handler (vnm, mp);
+
+  rv = (rv == 0) ? vnm->api_errno : rv;
+
+  REPLY_MACRO (VL_API_MPLS_ROUTE_ADD_DEL_REPLY);
+}
+
+static void
+vl_api_sw_interface_set_vpath_t_handler (vl_api_sw_interface_set_vpath_t * mp)
+{
+  vl_api_sw_interface_set_vpath_reply_t *rmp;
+  int rv = 0;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_VPATH, mp->enable);
+  vnet_feature_enable_disable ("ip4-unicast", "vpath-input-ip4",
+			       sw_if_index, mp->enable, 0, 0);
+  vnet_feature_enable_disable ("ip4-multicast", "vpath-input-ip4",
+			       sw_if_index, mp->enable, 0, 0);
+  vnet_feature_enable_disable ("ip6-unicast", "vpath-input-ip6",
+			       sw_if_index, mp->enable, 0, 0);
+  vnet_feature_enable_disable ("ip6-multicast", "vpath-input-ip6",
+			       sw_if_index, mp->enable, 0, 0);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_SET_VPATH_REPLY);
+}
+
+static void
+  vl_api_sw_interface_set_vxlan_bypass_t_handler
+  (vl_api_sw_interface_set_vxlan_bypass_t * mp)
+{
+  vl_api_sw_interface_set_vxlan_bypass_reply_t *rmp;
+  int rv = 0;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  if (mp->is_ipv6)
+    {
+      /* not yet implemented */
+    }
+  else
+    vnet_feature_enable_disable ("ip4-unicast", "ip4-vxlan-bypass",
+				 sw_if_index, mp->enable, 0, 0);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_SET_VXLAN_BYPASS_REPLY);
+}
+
+static void
+  vl_api_sw_interface_set_l2_xconnect_t_handler
+  (vl_api_sw_interface_set_l2_xconnect_t * mp)
+{
+  vl_api_sw_interface_set_l2_xconnect_reply_t *rmp;
+  int rv = 0;
+  u32 rx_sw_if_index = ntohl (mp->rx_sw_if_index);
+  u32 tx_sw_if_index = ntohl (mp->tx_sw_if_index);
+  vlib_main_t *vm = vlib_get_main ();
+  vnet_main_t *vnm = vnet_get_main ();
+
+  VALIDATE_RX_SW_IF_INDEX (mp);
+
+  if (mp->enable)
+    {
+      VALIDATE_TX_SW_IF_INDEX (mp);
+      rv = set_int_l2_mode (vm, vnm, MODE_L2_XC,
+			    rx_sw_if_index, 0, 0, 0, tx_sw_if_index);
+    }
+  else
+    {
+      rv = set_int_l2_mode (vm, vnm, MODE_L3, rx_sw_if_index, 0, 0, 0, 0);
+    }
+
+  BAD_RX_SW_IF_INDEX_LABEL;
+  BAD_TX_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_SET_L2_XCONNECT_REPLY);
+}
+
+static void
+  vl_api_sw_interface_set_l2_bridge_t_handler
+  (vl_api_sw_interface_set_l2_bridge_t * mp)
+{
+  bd_main_t *bdm = &bd_main;
+  vl_api_sw_interface_set_l2_bridge_reply_t *rmp;
+  int rv = 0;
+  u32 rx_sw_if_index = ntohl (mp->rx_sw_if_index);
+  u32 bd_id = ntohl (mp->bd_id);
+  u32 bd_index;
+  u32 bvi = mp->bvi;
+  u8 shg = mp->shg;
+  vlib_main_t *vm = vlib_get_main ();
+  vnet_main_t *vnm = vnet_get_main ();
+
+  VALIDATE_RX_SW_IF_INDEX (mp);
+
+  bd_index = bd_find_or_add_bd_index (bdm, bd_id);
+
+  if (mp->enable)
+    {
+      //VALIDATE_TX_SW_IF_INDEX(mp);
+      rv = set_int_l2_mode (vm, vnm, MODE_L2_BRIDGE,
+			    rx_sw_if_index, bd_index, bvi, shg, 0);
+    }
+  else
+    {
+      rv = set_int_l2_mode (vm, vnm, MODE_L3, rx_sw_if_index, 0, 0, 0, 0);
+    }
+
+  BAD_RX_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_SET_L2_BRIDGE_REPLY);
+}
+
+static void
+  vl_api_sw_interface_set_dpdk_hqos_pipe_t_handler
+  (vl_api_sw_interface_set_dpdk_hqos_pipe_t * mp)
+{
+  vl_api_sw_interface_set_dpdk_hqos_pipe_reply_t *rmp;
+  int rv = 0;
+
+#if DPDK > 0
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_t *xd;
+
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  u32 subport = ntohl (mp->subport);
+  u32 pipe = ntohl (mp->pipe);
+  u32 profile = ntohl (mp->profile);
+  vnet_hw_interface_t *hw;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  /* hw_if & dpdk device */
+  hw = vnet_get_sup_hw_interface (dm->vnet_main, sw_if_index);
+
+  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
+
+  rv = rte_sched_pipe_config (xd->hqos_ht->hqos, subport, pipe, profile);
+
+  BAD_SW_IF_INDEX_LABEL;
+#else
+  clib_warning ("setting HQoS pipe parameters without DPDK not implemented");
+  rv = VNET_API_ERROR_UNIMPLEMENTED;
+#endif /* DPDK */
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_SET_DPDK_HQOS_PIPE_REPLY);
+}
+
+static void
+  vl_api_sw_interface_set_dpdk_hqos_subport_t_handler
+  (vl_api_sw_interface_set_dpdk_hqos_subport_t * mp)
+{
+  vl_api_sw_interface_set_dpdk_hqos_subport_reply_t *rmp;
+  int rv = 0;
+
+#if DPDK > 0
+  dpdk_main_t *dm = &dpdk_main;
+  dpdk_device_t *xd;
+  struct rte_sched_subport_params p;
+
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  u32 subport = ntohl (mp->subport);
+  p.tb_rate = ntohl (mp->tb_rate);
+  p.tb_size = ntohl (mp->tb_size);
+  p.tc_rate[0] = ntohl (mp->tc_rate[0]);
+  p.tc_rate[1] = ntohl (mp->tc_rate[1]);
+  p.tc_rate[2] = ntohl (mp->tc_rate[2]);
+  p.tc_rate[3] = ntohl (mp->tc_rate[3]);
+  p.tc_period = ntohl (mp->tc_period);
+
+  vnet_hw_interface_t *hw;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  /* hw_if & dpdk device */
+  hw = vnet_get_sup_hw_interface (dm->vnet_main, sw_if_index);
+
+  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
+
+  rv = rte_sched_subport_config (xd->hqos_ht->hqos, subport, &p);
+
+  BAD_SW_IF_INDEX_LABEL;
+#else
+  clib_warning
+    ("setting HQoS subport parameters without DPDK not implemented");
+  rv = VNET_API_ERROR_UNIMPLEMENTED;
+#endif /* DPDK */
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_SET_DPDK_HQOS_SUBPORT_REPLY);
+}
+
+static void
+  vl_api_sw_interface_set_dpdk_hqos_tctbl_t_handler
+  (vl_api_sw_interface_set_dpdk_hqos_tctbl_t * mp)
+{
+  vl_api_sw_interface_set_dpdk_hqos_tctbl_reply_t *rmp;
+  int rv = 0;
+
+#if DPDK > 0
+  dpdk_main_t *dm = &dpdk_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  dpdk_device_t *xd;
+
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  u32 entry = ntohl (mp->entry);
+  u32 tc = ntohl (mp->tc);
+  u32 queue = ntohl (mp->queue);
+  u32 val, i;
+
+  vnet_hw_interface_t *hw;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  /* hw_if & dpdk device */
+  hw = vnet_get_sup_hw_interface (dm->vnet_main, sw_if_index);
+
+  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
+
+  if (tc >= RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE)
+    {
+      clib_warning ("invalid traffic class !!");
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto done;
+    }
+  if (queue >= RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS)
+    {
+      clib_warning ("invalid queue !!");
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto done;
+    }
+
+  /* Detect the set of worker threads */
+  uword *p = hash_get_mem (tm->thread_registrations_by_name, "workers");
+
+  if (p == 0)
+    {
+      clib_warning ("worker thread registration AWOL !!");
+      rv = VNET_API_ERROR_INVALID_VALUE_2;
+      goto done;
+    }
+
+  vlib_thread_registration_t *tr = (vlib_thread_registration_t *) p[0];
+  int worker_thread_first = tr->first_index;
+  int worker_thread_count = tr->count;
+
+  val = tc * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + queue;
+  for (i = 0; i < worker_thread_count; i++)
+    xd->hqos_wt[worker_thread_first + i].hqos_tc_table[entry] = val;
+
+  BAD_SW_IF_INDEX_LABEL;
+done:
+#else
+  clib_warning ("setting HQoS DSCP table entry without DPDK not implemented");
+  rv = VNET_API_ERROR_UNIMPLEMENTED;
+#endif /* DPDK */
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_SET_DPDK_HQOS_TCTBL_REPLY);
+}
+
+static void
+vl_api_bridge_domain_add_del_t_handler (vl_api_bridge_domain_add_del_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  bd_main_t *bdm = &bd_main;
+  vl_api_bridge_domain_add_del_reply_t *rmp;
+  int rv = 0;
+  u32 enable_flags = 0, disable_flags = 0;
+  u32 bd_id = ntohl (mp->bd_id);
+  u32 bd_index;
+
+  if (mp->is_add)
+    {
+      bd_index = bd_find_or_add_bd_index (bdm, bd_id);
+
+      if (mp->flood)
+	enable_flags |= L2_FLOOD;
+      else
+	disable_flags |= L2_FLOOD;
+
+      if (mp->uu_flood)
+	enable_flags |= L2_UU_FLOOD;
+      else
+	disable_flags |= L2_UU_FLOOD;
+
+      if (mp->forward)
+	enable_flags |= L2_FWD;
+      else
+	disable_flags |= L2_FWD;
+
+      if (mp->arp_term)
+	enable_flags |= L2_ARP_TERM;
+      else
+	disable_flags |= L2_ARP_TERM;
+
+      if (mp->learn)
+	enable_flags |= L2_LEARN;
+      else
+	disable_flags |= L2_LEARN;
+
+      if (enable_flags)
+	bd_set_flags (vm, bd_index, enable_flags, 1 /* enable */ );
+
+      if (disable_flags)
+	bd_set_flags (vm, bd_index, disable_flags, 0 /* disable */ );
+
+      bd_set_mac_age (vm, bd_index, mp->mac_age);
+    }
+  else
+    rv = bd_delete_bd_index (bdm, bd_id);
+
+  REPLY_MACRO (VL_API_BRIDGE_DOMAIN_ADD_DEL_REPLY);
+}
+
+static void
+vl_api_bridge_domain_details_t_handler (vl_api_bridge_domain_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+  vl_api_bridge_domain_sw_if_details_t_handler
+  (vl_api_bridge_domain_sw_if_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+send_bridge_domain_details (unix_shared_memory_queue_t * q,
+			    l2_bridge_domain_t * bd_config,
+			    u32 n_sw_ifs, u32 context)
+{
+  vl_api_bridge_domain_details_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_BRIDGE_DOMAIN_DETAILS);
+  mp->bd_id = ntohl (bd_config->bd_id);
+  mp->flood = bd_feature_flood (bd_config);
+  mp->uu_flood = bd_feature_uu_flood (bd_config);
+  mp->forward = bd_feature_forward (bd_config);
+  mp->learn = bd_feature_learn (bd_config);
+  mp->arp_term = bd_feature_arp_term (bd_config);
+  mp->bvi_sw_if_index = ntohl (bd_config->bvi_sw_if_index);
+  mp->mac_age = bd_config->mac_age;
+  mp->n_sw_ifs = ntohl (n_sw_ifs);
+  mp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+send_bd_sw_if_details (l2input_main_t * l2im,
+		       unix_shared_memory_queue_t * q,
+		       l2_flood_member_t * member, u32 bd_id, u32 context)
+{
+  vl_api_bridge_domain_sw_if_details_t *mp;
+  l2_input_config_t *input_cfg;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_BRIDGE_DOMAIN_SW_IF_DETAILS);
+  mp->bd_id = ntohl (bd_id);
+  mp->sw_if_index = ntohl (member->sw_if_index);
+  input_cfg = vec_elt_at_index (l2im->configs, member->sw_if_index);
+  mp->shg = input_cfg->shg;
+  mp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_bridge_domain_dump_t_handler (vl_api_bridge_domain_dump_t * mp)
+{
+  bd_main_t *bdm = &bd_main;
+  l2input_main_t *l2im = &l2input_main;
+  unix_shared_memory_queue_t *q;
+  l2_bridge_domain_t *bd_config;
+  u32 bd_id, bd_index;
+  u32 end;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+
+  if (q == 0)
+    return;
+
+  bd_id = ntohl (mp->bd_id);
+
+  bd_index = (bd_id == ~0) ? 0 : bd_find_or_add_bd_index (bdm, bd_id);
+  end = (bd_id == ~0) ? vec_len (l2im->bd_configs) : bd_index + 1;
+  for (; bd_index < end; bd_index++)
+    {
+      bd_config = l2input_bd_config_from_index (l2im, bd_index);
+      /* skip dummy bd_id 0 */
+      if (bd_config && (bd_config->bd_id > 0))
+	{
+	  u32 n_sw_ifs;
+	  l2_flood_member_t *m;
+
+	  n_sw_ifs = vec_len (bd_config->members);
+	  send_bridge_domain_details (q, bd_config, n_sw_ifs, mp->context);
+
+	  vec_foreach (m, bd_config->members)
+	  {
+	    send_bd_sw_if_details (l2im, q, m, bd_config->bd_id, mp->context);
+	  }
+	}
+    }
+}
+
+static void
+vl_api_l2fib_add_del_t_handler (vl_api_l2fib_add_del_t * mp)
+{
+  bd_main_t *bdm = &bd_main;
+  l2input_main_t *l2im = &l2input_main;
+  vl_api_l2fib_add_del_reply_t *rmp;
+  int rv = 0;
+  u64 mac = 0;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  u32 bd_id = ntohl (mp->bd_id);
+  u32 bd_index;
+  u32 static_mac;
+  u32 filter_mac;
+  u32 bvi_mac;
+  uword *p;
+
+  mac = mp->mac;
+
+  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+  if (!p)
+    {
+      rv = VNET_API_ERROR_NO_SUCH_ENTRY;
+      goto bad_sw_if_index;
+    }
+  bd_index = p[0];
+
+  if (mp->is_add)
+    {
+      filter_mac = mp->filter_mac ? 1 : 0;
+      if (filter_mac == 0)
+	{
+	  VALIDATE_SW_IF_INDEX (mp);
+	  if (vec_len (l2im->configs) <= sw_if_index)
+	    {
+	      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
+	      goto bad_sw_if_index;
+	    }
+	  else
+	    {
+	      l2_input_config_t *config;
+	      config = vec_elt_at_index (l2im->configs, sw_if_index);
+	      if (config->bridge == 0)
+		{
+		  rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
+		  goto bad_sw_if_index;
+		}
+	    }
+	}
+      static_mac = mp->static_mac ? 1 : 0;
+      bvi_mac = mp->bvi_mac ? 1 : 0;
+      l2fib_add_entry (mac, bd_index, sw_if_index, static_mac, filter_mac,
+		       bvi_mac);
+    }
+  else
+    {
+      l2fib_del_entry (mac, bd_index);
+    }
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_L2FIB_ADD_DEL_REPLY);
+}
+
+static void
+vl_api_l2_flags_t_handler (vl_api_l2_flags_t * mp)
+{
+  vl_api_l2_flags_reply_t *rmp;
+  int rv = 0;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  u32 flags = ntohl (mp->feature_bitmap);
+  u32 rbm = 0;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+#define _(a,b) \
+    if (flags & L2INPUT_FEAT_ ## a) \
+        rbm = l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_ ## a, mp->is_set);
+  foreach_l2input_feat;
+#undef _
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_L2_FLAGS_REPLY,
+  ({
+    rmp->resulting_feature_bitmap = ntohl(rbm);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_bridge_flags_t_handler (vl_api_bridge_flags_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  bd_main_t *bdm = &bd_main;
+  vl_api_bridge_flags_reply_t *rmp;
+  int rv = 0;
+  u32 bd_id = ntohl (mp->bd_id);
+  u32 bd_index;
+  u32 flags = ntohl (mp->feature_bitmap);
+  uword *p;
+
+  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+  if (p == 0)
+    {
+      rv = VNET_API_ERROR_NO_SUCH_ENTRY;
+      goto out;
+    }
+
+  bd_index = p[0];
+
+  bd_set_flags (vm, bd_index, flags, mp->is_set);
+
+out:
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_BRIDGE_FLAGS_REPLY,
+  ({
+    rmp->resulting_feature_bitmap = ntohl(flags);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_bd_ip_mac_add_del_t_handler (vl_api_bd_ip_mac_add_del_t * mp)
+{
+  bd_main_t *bdm = &bd_main;
+  vl_api_bd_ip_mac_add_del_reply_t *rmp;
+  int rv = 0;
+  u32 bd_id = ntohl (mp->bd_id);
+  u32 bd_index;
+  uword *p;
+
+  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+  if (p == 0)
+    {
+      rv = VNET_API_ERROR_NO_SUCH_ENTRY;
+      goto out;
+    }
+
+  bd_index = p[0];
+  if (bd_add_del_ip_mac (bd_index, mp->ip_address,
+			 mp->mac_address, mp->is_ipv6, mp->is_add))
+    rv = VNET_API_ERROR_UNSPECIFIED;
+
+out:
+  REPLY_MACRO (VL_API_BD_IP_MAC_ADD_DEL_REPLY);
+}
+
+static void
+vl_api_create_vlan_subif_t_handler (vl_api_create_vlan_subif_t * mp)
+{
+  vl_api_create_vlan_subif_reply_t *rmp;
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 hw_if_index, sw_if_index = (u32) ~ 0;
+  vnet_hw_interface_t *hi;
+  int rv = 0;
+  u32 id;
+  vnet_sw_interface_t template;
+  uword *p;
+  vnet_interface_main_t *im = &vnm->interface_main;
+  u64 sup_and_sub_key;
+  u64 *kp;
+  unix_shared_memory_queue_t *q;
+  clib_error_t *error;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  hw_if_index = ntohl (mp->sw_if_index);
+  hi = vnet_get_hw_interface (vnm, hw_if_index);
+
+  id = ntohl (mp->vlan_id);
+  if (id == 0 || id > 4095)
+    {
+      rv = VNET_API_ERROR_INVALID_VLAN;
+      goto out;
+    }
+
+  sup_and_sub_key = ((u64) (hi->sw_if_index) << 32) | (u64) id;
+
+  p = hash_get_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key);
+  if (p)
+    {
+      rv = VNET_API_ERROR_VLAN_ALREADY_EXISTS;
+      goto out;
+    }
+
+  kp = clib_mem_alloc (sizeof (*kp));
+  *kp = sup_and_sub_key;
+
+  memset (&template, 0, sizeof (template));
+  template.type = VNET_SW_INTERFACE_TYPE_SUB;
+  template.sup_sw_if_index = hi->sw_if_index;
+  template.sub.id = id;
+  template.sub.eth.raw_flags = 0;
+  template.sub.eth.flags.one_tag = 1;
+  template.sub.eth.outer_vlan_id = id;
+  template.sub.eth.flags.exact_match = 1;
+
+  error = vnet_create_sw_interface (vnm, &template, &sw_if_index);
+  if (error)
+    {
+      clib_error_report (error);
+      rv = VNET_API_ERROR_INVALID_REGISTRATION;
+      goto out;
+    }
+  hash_set (hi->sub_interface_sw_if_index_by_id, id, sw_if_index);
+  hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, sw_if_index);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+out:
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (!q)
+    return;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_CREATE_VLAN_SUBIF_REPLY);
+  rmp->context = mp->context;
+  rmp->retval = ntohl (rv);
+  rmp->sw_if_index = ntohl (sw_if_index);
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_create_subif_t_handler (vl_api_create_subif_t * mp)
+{
+  vl_api_create_subif_reply_t *rmp;
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index = ~0;
+  int rv = 0;
+  u32 sub_id;
+  vnet_sw_interface_t *si;
+  vnet_hw_interface_t *hi;
+  vnet_sw_interface_t template;
+  uword *p;
+  vnet_interface_main_t *im = &vnm->interface_main;
+  u64 sup_and_sub_key;
+  u64 *kp;
+  clib_error_t *error;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  si = vnet_get_sup_sw_interface (vnm, ntohl (mp->sw_if_index));
+  hi = vnet_get_sup_hw_interface (vnm, ntohl (mp->sw_if_index));
+
+  if (hi->bond_info == VNET_HW_INTERFACE_BOND_INFO_SLAVE)
+    {
+      rv = VNET_API_ERROR_BOND_SLAVE_NOT_ALLOWED;
+      goto out;
+    }
+
+  sw_if_index = si->sw_if_index;
+  sub_id = ntohl (mp->sub_id);
+
+  sup_and_sub_key = ((u64) (sw_if_index) << 32) | (u64) sub_id;
+
+  p = hash_get_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key);
+  if (p)
+    {
+      if (CLIB_DEBUG > 0)
+	clib_warning ("sup sw_if_index %d, sub id %d already exists\n",
+		      sw_if_index, sub_id);
+      rv = VNET_API_ERROR_SUBIF_ALREADY_EXISTS;
+      goto out;
+    }
+
+  kp = clib_mem_alloc (sizeof (*kp));
+  *kp = sup_and_sub_key;
+
+  memset (&template, 0, sizeof (template));
+  template.type = VNET_SW_INTERFACE_TYPE_SUB;
+  template.sup_sw_if_index = sw_if_index;
+  template.sub.id = sub_id;
+  template.sub.eth.flags.no_tags = mp->no_tags;
+  template.sub.eth.flags.one_tag = mp->one_tag;
+  template.sub.eth.flags.two_tags = mp->two_tags;
+  template.sub.eth.flags.dot1ad = mp->dot1ad;
+  template.sub.eth.flags.exact_match = mp->exact_match;
+  template.sub.eth.flags.default_sub = mp->default_sub;
+  template.sub.eth.flags.outer_vlan_id_any = mp->outer_vlan_id_any;
+  template.sub.eth.flags.inner_vlan_id_any = mp->inner_vlan_id_any;
+  template.sub.eth.outer_vlan_id = ntohs (mp->outer_vlan_id);
+  template.sub.eth.inner_vlan_id = ntohs (mp->inner_vlan_id);
+
+  error = vnet_create_sw_interface (vnm, &template, &sw_if_index);
+  if (error)
+    {
+      clib_error_report (error);
+      rv = VNET_API_ERROR_SUBIF_CREATE_FAILED;
+      goto out;
+    }
+
+  hash_set (hi->sub_interface_sw_if_index_by_id, sub_id, sw_if_index);
+  hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, sw_if_index);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+out:
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_CREATE_SUBIF_REPLY,
+  ({
+    rmp->sw_if_index = ntohl(sw_if_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_mpls_tunnel_add_del_t_handler (vl_api_mpls_tunnel_add_del_t * mp)
+{
+  vl_api_mpls_tunnel_add_del_reply_t *rmp;
+  int rv = 0;
+  stats_main_t *sm = &stats_main;
+  u32 tunnel_sw_if_index;
+  int ii;
+
+  dslock (sm, 1 /* release hint */ , 5 /* tag */ );
+
+  if (mp->mt_is_add)
+    {
+      fib_route_path_t rpath, *rpaths = NULL;
+      mpls_label_t *label_stack = NULL;
+
+      memset (&rpath, 0, sizeof (rpath));
+
+      if (mp->mt_next_hop_proto_is_ip4)
+	{
+	  rpath.frp_proto = FIB_PROTOCOL_IP4;
+	  clib_memcpy (&rpath.frp_addr.ip4,
+		       mp->mt_next_hop, sizeof (rpath.frp_addr.ip4));
+	}
+      else
+	{
+	  rpath.frp_proto = FIB_PROTOCOL_IP6;
+	  clib_memcpy (&rpath.frp_addr.ip6,
+		       mp->mt_next_hop, sizeof (rpath.frp_addr.ip6));
+	}
+      rpath.frp_sw_if_index = ntohl (mp->mt_next_hop_sw_if_index);
+
+      for (ii = 0; ii < mp->mt_next_hop_n_out_labels; ii++)
+	vec_add1 (label_stack, ntohl (mp->mt_next_hop_out_label_stack[ii]));
+
+      vec_add1 (rpaths, rpath);
+
+      vnet_mpls_tunnel_add (rpaths, label_stack,
+			    mp->mt_l2_only, &tunnel_sw_if_index);
+      vec_free (rpaths);
+      vec_free (label_stack);
+    }
+  else
+    {
+      tunnel_sw_if_index = ntohl (mp->mt_sw_if_index);
+      vnet_mpls_tunnel_del (tunnel_sw_if_index);
+    }
+
+  dsunlock (sm);
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_MPLS_TUNNEL_ADD_DEL_REPLY,
+  ({
+    rmp->sw_if_index = ntohl(tunnel_sw_if_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_proxy_arp_add_del_t_handler (vl_api_proxy_arp_add_del_t * mp)
+{
+  vl_api_proxy_arp_add_del_reply_t *rmp;
+  u32 fib_index;
+  int rv;
+  ip4_main_t *im = &ip4_main;
+  stats_main_t *sm = &stats_main;
+  int vnet_proxy_arp_add_del (ip4_address_t * lo_addr,
+			      ip4_address_t * hi_addr,
+			      u32 fib_index, int is_del);
+  uword *p;
+
+  dslock (sm, 1 /* release hint */ , 6 /* tag */ );
+
+  p = hash_get (im->fib_index_by_table_id, ntohl (mp->vrf_id));
+
+  if (!p)
+    {
+      rv = VNET_API_ERROR_NO_SUCH_FIB;
+      goto out;
+    }
+
+  fib_index = p[0];
+
+  rv = vnet_proxy_arp_add_del ((ip4_address_t *) mp->low_address,
+			       (ip4_address_t *) mp->hi_address,
+			       fib_index, mp->is_add == 0);
+
+out:
+  dsunlock (sm);
+  REPLY_MACRO (VL_API_PROXY_ARP_ADD_DEL_REPLY);
+}
+
+static void
+  vl_api_proxy_arp_intfc_enable_disable_t_handler
+  (vl_api_proxy_arp_intfc_enable_disable_t * mp)
+{
+  int rv = 0;
+  vnet_main_t *vnm = vnet_get_main ();
+  vl_api_proxy_arp_intfc_enable_disable_reply_t *rmp;
+  vnet_sw_interface_t *si;
+  u32 sw_if_index;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
+    {
+      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
+      goto out;
+    }
+
+  si = vnet_get_sw_interface (vnm, sw_if_index);
+
+  ASSERT (si);
+
+  if (mp->enable_disable)
+    si->flags |= VNET_SW_INTERFACE_FLAG_PROXY_ARP;
+  else
+    si->flags &= ~VNET_SW_INTERFACE_FLAG_PROXY_ARP;
+
+  BAD_SW_IF_INDEX_LABEL;
+
+out:
+  REPLY_MACRO (VL_API_PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY);
+}
+
+static void
+vl_api_is_address_reachable_t_handler (vl_api_is_address_reachable_t * mp)
+{
+#if 0
+  vpe_main_t *rm = &vpe_main;
+  ip4_main_t *im4 = &ip4_main;
+  ip6_main_t *im6 = &ip6_main;
+  ip_lookup_main_t *lm;
+  union
+  {
+    ip4_address_t ip4;
+    ip6_address_t ip6;
+  } addr;
+  u32 adj_index, sw_if_index;
+  vl_api_is_address_reachable_t *rmp;
+  ip_adjacency_t *adj;
+  unix_shared_memory_queue_t *q;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (!q)
+    {
+      increment_missing_api_client_counter (rm->vlib_main);
+      return;
+    }
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  clib_memcpy (rmp, mp, sizeof (*rmp));
+
+  sw_if_index = mp->next_hop_sw_if_index;
+  clib_memcpy (&addr, mp->address, sizeof (addr));
+  if (mp->is_ipv6)
+    {
+      lm = &im6->lookup_main;
+      adj_index = ip6_fib_lookup (im6, sw_if_index, &addr.ip6);
+    }
+  else
+    {
+      lm = &im4->lookup_main;
+      // FIXME NOT an ADJ
+      adj_index = ip4_fib_lookup (im4, sw_if_index, &addr.ip4);
+    }
+  if (adj_index == ~0)
+    {
+      rmp->is_error = 1;
+      goto send;
+    }
+  adj = ip_get_adjacency (lm, adj_index);
+
+  if (adj->lookup_next_index == IP_LOOKUP_NEXT_REWRITE
+      && adj->rewrite_header.sw_if_index == sw_if_index)
+    {
+      rmp->is_known = 1;
+    }
+  else
+    {
+      if (adj->lookup_next_index == IP_LOOKUP_NEXT_ARP
+	  && adj->rewrite_header.sw_if_index == sw_if_index)
+	{
+	  if (mp->is_ipv6)
+	    ip6_probe_neighbor (rm->vlib_main, &addr.ip6, sw_if_index);
+	  else
+	    ip4_probe_neighbor (rm->vlib_main, &addr.ip4, sw_if_index);
+	}
+      else if (adj->lookup_next_index == IP_LOOKUP_NEXT_DROP)
+	{
+	  rmp->is_known = 1;
+	  goto send;
+	}
+      rmp->is_known = 0;
+    }
+
+send:
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+#endif
+}
+
+static void
+  vl_api_sw_interface_set_mpls_enable_t_handler
+  (vl_api_sw_interface_set_mpls_enable_t * mp)
+{
+  vl_api_sw_interface_set_mpls_enable_reply_t *rmp;
+  int rv = 0;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  mpls_sw_interface_enable_disable (&mpls_main,
+				    ntohl (mp->sw_if_index), mp->enable);
+
+  BAD_SW_IF_INDEX_LABEL;
+  REPLY_MACRO (VL_API_SW_INTERFACE_SET_MPLS_ENABLE_REPLY);
+}
+
+void
+send_oam_event (oam_target_t * t)
+{
+  vpe_api_main_t *vam = &vpe_api_main;
+  unix_shared_memory_queue_t *q;
+  vpe_client_registration_t *reg;
+  vl_api_oam_event_t *mp;
+
+  /* *INDENT-OFF* */
+  pool_foreach(reg, vam->oam_events_registrations,
+  ({
+    q = vl_api_client_index_to_input_queue (reg->client_index);
+    if (q)
+      {
+        mp = vl_msg_api_alloc (sizeof (*mp));
+        mp->_vl_msg_id = ntohs (VL_API_OAM_EVENT);
+        clib_memcpy (mp->dst_address, &t->dst_address,
+                     sizeof (mp->dst_address));
+        mp->state = t->state;
+        vl_msg_api_send_shmem (q, (u8 *)&mp);
+      }
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_oam_add_del_t_handler (vl_api_oam_add_del_t * mp)
+{
+  vl_api_oam_add_del_reply_t *rmp;
+  int rv;
+
+  rv = vpe_oam_add_del_target ((ip4_address_t *) mp->src_address,
+			       (ip4_address_t *) mp->dst_address,
+			       ntohl (mp->vrf_id), (int) (mp->is_add));
+
+  REPLY_MACRO (VL_API_OAM_ADD_DEL_REPLY);
+}
+
+static void
+vl_api_vnet_get_summary_stats_t_handler (vl_api_vnet_get_summary_stats_t * mp)
+{
+  stats_main_t *sm = &stats_main;
+  vnet_interface_main_t *im = sm->interface_main;
+  vl_api_vnet_summary_stats_reply_t *rmp;
+  vlib_combined_counter_main_t *cm;
+  vlib_counter_t v;
+  int i, which;
+  u64 total_pkts[VLIB_N_RX_TX];
+  u64 total_bytes[VLIB_N_RX_TX];
+
+  unix_shared_memory_queue_t *q =
+    vl_api_client_index_to_input_queue (mp->client_index);
+
+  if (!q)
+    return;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_VNET_SUMMARY_STATS_REPLY);
+  rmp->context = mp->context;
+  rmp->retval = 0;
+
+  memset (total_pkts, 0, sizeof (total_pkts));
+  memset (total_bytes, 0, sizeof (total_bytes));
+
+  vnet_interface_counter_lock (im);
+
+  vec_foreach (cm, im->combined_sw_if_counters)
+  {
+    which = cm - im->combined_sw_if_counters;
+
+    for (i = 0; i < vec_len (cm->maxi); i++)
+      {
+	vlib_get_combined_counter (cm, i, &v);
+	total_pkts[which] += v.packets;
+	total_bytes[which] += v.bytes;
+      }
+  }
+  vnet_interface_counter_unlock (im);
+
+  rmp->total_pkts[VLIB_RX] = clib_host_to_net_u64 (total_pkts[VLIB_RX]);
+  rmp->total_bytes[VLIB_RX] = clib_host_to_net_u64 (total_bytes[VLIB_RX]);
+  rmp->total_pkts[VLIB_TX] = clib_host_to_net_u64 (total_pkts[VLIB_TX]);
+  rmp->total_bytes[VLIB_TX] = clib_host_to_net_u64 (total_bytes[VLIB_TX]);
+  rmp->vector_rate =
+    clib_host_to_net_u64 (vlib_last_vector_length_per_node (sm->vlib_main));
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  ip4_address_t address;
+  u32 address_length: 6;
+  u32 index:26;
+}) ip4_route_t;
+/* *INDENT-ON* */
+
+static int
+ip4_reset_fib_t_handler (vl_api_reset_fib_t * mp)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  ip4_main_t *im4 = &ip4_main;
+  static u32 *sw_if_indices_to_shut;
+  stats_main_t *sm = &stats_main;
+  fib_table_t *fib_table;
+  ip4_fib_t *fib;
+  u32 sw_if_index;
+  int i;
+  int rv = VNET_API_ERROR_NO_SUCH_FIB;
+  u32 target_fib_id = ntohl (mp->vrf_id);
+
+  dslock (sm, 1 /* release hint */ , 8 /* tag */ );
+
+  /* *INDENT-OFF* */
+  pool_foreach (fib_table, im4->fibs,
+  ({
+    fib = &fib_table->v4;
+    vnet_sw_interface_t * si;
+
+    if (fib->table_id != target_fib_id)
+      continue;
+
+    /* remove any mpls encap/decap labels */
+    mpls_fib_reset_labels (fib->table_id);
+
+    /* remove any proxy arps in this fib */
+    vnet_proxy_arp_fib_reset (fib->table_id);
+
+    /* Set the flow hash for this fib to the default */
+    vnet_set_ip4_flow_hash (fib->table_id, IP_FLOW_HASH_DEFAULT);
+
+    vec_reset_length (sw_if_indices_to_shut);
+
+    /* Shut down interfaces in this FIB / clean out intfc routes */
+    pool_foreach (si, im->sw_interfaces,
+    ({
+      u32 sw_if_index = si->sw_if_index;
+
+      if (sw_if_index < vec_len (im4->fib_index_by_sw_if_index)
+          && (im4->fib_index_by_sw_if_index[si->sw_if_index] ==
+              fib->index))
+        vec_add1 (sw_if_indices_to_shut, si->sw_if_index);
+    }));
+
+    for (i = 0; i < vec_len (sw_if_indices_to_shut); i++) {
+      sw_if_index = sw_if_indices_to_shut[i];
+      // vec_foreach (sw_if_index, sw_if_indices_to_shut) {
+
+      u32 flags = vnet_sw_interface_get_flags (vnm, sw_if_index);
+      flags &= ~(VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+      vnet_sw_interface_set_flags (vnm, sw_if_index, flags);
+    }
+
+    fib_table_flush(fib->index, FIB_PROTOCOL_IP4, FIB_SOURCE_API);
+    fib_table_flush(fib->index, FIB_PROTOCOL_IP4, FIB_SOURCE_INTERFACE);
+
+    rv = 0;
+    break;
+    })); /* pool_foreach (fib) */
+    /* *INDENT-ON* */
+
+  dsunlock (sm);
+  return rv;
+}
+
+static int
+ip6_reset_fib_t_handler (vl_api_reset_fib_t * mp)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  ip6_main_t *im6 = &ip6_main;
+  stats_main_t *sm = &stats_main;
+  static u32 *sw_if_indices_to_shut;
+  fib_table_t *fib_table;
+  ip6_fib_t *fib;
+  u32 sw_if_index;
+  int i;
+  int rv = VNET_API_ERROR_NO_SUCH_FIB;
+  u32 target_fib_id = ntohl (mp->vrf_id);
+
+  dslock (sm, 1 /* release hint */ , 9 /* tag */ );
+
+  /* *INDENT-OFF* */
+  pool_foreach (fib_table, im6->fibs,
+  ({
+    vnet_sw_interface_t * si;
+    fib = &(fib_table->v6);
+
+    if (fib->table_id != target_fib_id)
+      continue;
+
+    vec_reset_length (sw_if_indices_to_shut);
+
+    /* Shut down interfaces in this FIB / clean out intfc routes */
+    pool_foreach (si, im->sw_interfaces,
+                  ({
+                    if (im6->fib_index_by_sw_if_index[si->sw_if_index] ==
+                        fib->index)
+                      vec_add1 (sw_if_indices_to_shut, si->sw_if_index);
+                  }));
+
+    for (i = 0; i < vec_len (sw_if_indices_to_shut); i++) {
+      sw_if_index = sw_if_indices_to_shut[i];
+      // vec_foreach (sw_if_index, sw_if_indices_to_shut) {
+
+      u32 flags = vnet_sw_interface_get_flags (vnm, sw_if_index);
+      flags &= ~(VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+      vnet_sw_interface_set_flags (vnm, sw_if_index, flags);
+    }
+
+    fib_table_flush(fib->index, FIB_PROTOCOL_IP6, FIB_SOURCE_API);
+    fib_table_flush(fib->index, FIB_PROTOCOL_IP6, FIB_SOURCE_INTERFACE);
+
+    rv = 0;
+    break;
+  })); /* pool_foreach (fib) */
+  /* *INDENT-ON* */
+
+  dsunlock (sm);
+  return rv;
+}
+
+static void
+vl_api_reset_fib_t_handler (vl_api_reset_fib_t * mp)
+{
+  int rv;
+  vl_api_reset_fib_reply_t *rmp;
+
+  if (mp->is_ipv6)
+    rv = ip6_reset_fib_t_handler (mp);
+  else
+    rv = ip4_reset_fib_t_handler (mp);
+
+  REPLY_MACRO (VL_API_RESET_FIB_REPLY);
+}
+
+
+static void
+dhcpv4_proxy_config (vl_api_dhcp_proxy_config_t * mp)
+{
+  vl_api_dhcp_proxy_config_reply_t *rmp;
+  int rv;
+
+  rv = dhcp_proxy_set_server ((ip4_address_t *) (&mp->dhcp_server),
+			      (ip4_address_t *) (&mp->dhcp_src_address),
+			      (u32) ntohl (mp->vrf_id),
+			      (int) mp->insert_circuit_id,
+			      (int) (mp->is_add == 0));
+
+  REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_REPLY);
+}
+
+
+static void
+dhcpv6_proxy_config (vl_api_dhcp_proxy_config_t * mp)
+{
+  vl_api_dhcp_proxy_config_reply_t *rmp;
+  int rv = -1;
+
+  rv = dhcpv6_proxy_set_server ((ip6_address_t *) (&mp->dhcp_server),
+				(ip6_address_t *) (&mp->dhcp_src_address),
+				(u32) ntohl (mp->vrf_id),
+				(int) mp->insert_circuit_id,
+				(int) (mp->is_add == 0));
+
+  REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_REPLY);
+}
+
+static void
+dhcpv4_proxy_config_2 (vl_api_dhcp_proxy_config_2_t * mp)
+{
+  vl_api_dhcp_proxy_config_reply_t *rmp;
+  int rv;
+
+  rv = dhcp_proxy_set_server_2 ((ip4_address_t *) (&mp->dhcp_server),
+				(ip4_address_t *) (&mp->dhcp_src_address),
+				(u32) ntohl (mp->rx_vrf_id),
+				(u32) ntohl (mp->server_vrf_id),
+				(int) mp->insert_circuit_id,
+				(int) (mp->is_add == 0));
+
+  REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_2_REPLY);
+}
+
+
+static void
+dhcpv6_proxy_config_2 (vl_api_dhcp_proxy_config_2_t * mp)
+{
+  vl_api_dhcp_proxy_config_reply_t *rmp;
+  int rv = -1;
+
+  rv = dhcpv6_proxy_set_server_2 ((ip6_address_t *) (&mp->dhcp_server),
+				  (ip6_address_t *) (&mp->dhcp_src_address),
+				  (u32) ntohl (mp->rx_vrf_id),
+				  (u32) ntohl (mp->server_vrf_id),
+				  (int) mp->insert_circuit_id,
+				  (int) (mp->is_add == 0));
+
+  REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_2_REPLY);
+}
+
+
+static void
+vl_api_dhcp_proxy_set_vss_t_handler (vl_api_dhcp_proxy_set_vss_t * mp)
+{
+  vl_api_dhcp_proxy_set_vss_reply_t *rmp;
+  int rv;
+  if (!mp->is_ipv6)
+    rv = dhcp_proxy_set_option82_vss (ntohl (mp->tbl_id),
+				      ntohl (mp->oui),
+				      ntohl (mp->fib_id),
+				      (int) mp->is_add == 0);
+  else
+    rv = dhcpv6_proxy_set_vss (ntohl (mp->tbl_id),
+			       ntohl (mp->oui),
+			       ntohl (mp->fib_id), (int) mp->is_add == 0);
+
+  REPLY_MACRO (VL_API_DHCP_PROXY_SET_VSS_REPLY);
+}
+
+
+static void vl_api_dhcp_proxy_config_t_handler
+  (vl_api_dhcp_proxy_config_t * mp)
+{
+  if (mp->is_ipv6 == 0)
+    dhcpv4_proxy_config (mp);
+  else
+    dhcpv6_proxy_config (mp);
+}
+
+static void vl_api_dhcp_proxy_config_2_t_handler
+  (vl_api_dhcp_proxy_config_2_t * mp)
+{
+  if (mp->is_ipv6 == 0)
+    dhcpv4_proxy_config_2 (mp);
+  else
+    dhcpv6_proxy_config_2 (mp);
+}
+
+void
+dhcp_compl_event_callback (u32 client_index, u32 pid, u8 * hostname,
+			   u8 is_ipv6, u8 * host_address, u8 * router_address,
+			   u8 * host_mac)
+{
+  unix_shared_memory_queue_t *q;
+  vl_api_dhcp_compl_event_t *mp;
+
+  q = vl_api_client_index_to_input_queue (client_index);
+  if (!q)
+    return;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  mp->client_index = client_index;
+  mp->pid = pid;
+  mp->is_ipv6 = is_ipv6;
+  clib_memcpy (&mp->hostname, hostname, vec_len (hostname));
+  mp->hostname[vec_len (hostname) + 1] = '\n';
+  clib_memcpy (&mp->host_address[0], host_address, 16);
+  clib_memcpy (&mp->router_address[0], router_address, 16);
+
+  if (NULL != host_mac)
+    clib_memcpy (&mp->host_mac[0], host_mac, 6);
+
+  mp->_vl_msg_id = ntohs (VL_API_DHCP_COMPL_EVENT);
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void vl_api_dhcp_client_config_t_handler
+  (vl_api_dhcp_client_config_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_dhcp_client_config_reply_t *rmp;
+  int rv = 0;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  rv = dhcp_client_config (vm, ntohl (mp->sw_if_index),
+			   mp->hostname, mp->is_add, mp->client_index,
+			   mp->want_dhcp_event ? dhcp_compl_event_callback :
+			   NULL, mp->pid);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_DHCP_CLIENT_CONFIG_REPLY);
+}
+
+static void
+vl_api_create_loopback_t_handler (vl_api_create_loopback_t * mp)
+{
+  vl_api_create_loopback_reply_t *rmp;
+  u32 sw_if_index;
+  int rv;
+
+  rv = vnet_create_loopback_interface (&sw_if_index, mp->mac_address);
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_CREATE_LOOPBACK_REPLY,
+  ({
+    rmp->sw_if_index = ntohl (sw_if_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_delete_loopback_t_handler (vl_api_delete_loopback_t * mp)
+{
+  vl_api_delete_loopback_reply_t *rmp;
+  u32 sw_if_index;
+  int rv;
+
+  sw_if_index = ntohl (mp->sw_if_index);
+  rv = vnet_delete_loopback_interface (sw_if_index);
+
+  REPLY_MACRO (VL_API_DELETE_LOOPBACK_REPLY);
+}
+
+static void
+vl_api_control_ping_t_handler (vl_api_control_ping_t * mp)
+{
+  vl_api_control_ping_reply_t *rmp;
+  int rv = 0;
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_CONTROL_PING_REPLY,
+  ({
+    rmp->vpe_pid = ntohl (getpid());
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+shmem_cli_output (uword arg, u8 * buffer, uword buffer_bytes)
+{
+  u8 **shmem_vecp = (u8 **) arg;
+  u8 *shmem_vec;
+  void *oldheap;
+  api_main_t *am = &api_main;
+  u32 offset;
+
+  shmem_vec = *shmem_vecp;
+
+  offset = vec_len (shmem_vec);
+
+  pthread_mutex_lock (&am->vlib_rp->mutex);
+  oldheap = svm_push_data_heap (am->vlib_rp);
+
+  vec_validate (shmem_vec, offset + buffer_bytes - 1);
+
+  clib_memcpy (shmem_vec + offset, buffer, buffer_bytes);
+
+  svm_pop_heap (oldheap);
+  pthread_mutex_unlock (&am->vlib_rp->mutex);
+
+  *shmem_vecp = shmem_vec;
+}
+
+
+static void
+vl_api_cli_request_t_handler (vl_api_cli_request_t * mp)
+{
+  vl_api_cli_reply_t *rp;
+  unix_shared_memory_queue_t *q;
+  vlib_main_t *vm = vlib_get_main ();
+  api_main_t *am = &api_main;
+  unformat_input_t input;
+  u8 *shmem_vec = 0;
+  void *oldheap;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (!q)
+    return;
+
+  rp = vl_msg_api_alloc (sizeof (*rp));
+  rp->_vl_msg_id = ntohs (VL_API_CLI_REPLY);
+  rp->context = mp->context;
+
+  unformat_init_vector (&input, (u8 *) (uword) mp->cmd_in_shmem);
+
+  vlib_cli_input (vm, &input, shmem_cli_output, (uword) & shmem_vec);
+
+  pthread_mutex_lock (&am->vlib_rp->mutex);
+  oldheap = svm_push_data_heap (am->vlib_rp);
+
+  vec_add1 (shmem_vec, 0);
+
+  svm_pop_heap (oldheap);
+  pthread_mutex_unlock (&am->vlib_rp->mutex);
+
+  rp->reply_in_shmem = (uword) shmem_vec;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rp);
+}
+
+static void
+inband_cli_output (uword arg, u8 * buffer, uword buffer_bytes)
+{
+  u8 **mem_vecp = (u8 **) arg;
+  u8 *mem_vec = *mem_vecp;
+  u32 offset = vec_len (mem_vec);
+
+  vec_validate (mem_vec, offset + buffer_bytes - 1);
+  clib_memcpy (mem_vec + offset, buffer, buffer_bytes);
+  *mem_vecp = mem_vec;
+}
+
+static void
+vl_api_cli_inband_t_handler (vl_api_cli_inband_t * mp)
+{
+  vl_api_cli_inband_reply_t *rmp;
+  int rv = 0;
+  unix_shared_memory_queue_t *q;
+  vlib_main_t *vm = vlib_get_main ();
+  unformat_input_t input;
+  u8 *out_vec = 0;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (!q)
+    return;
+
+  unformat_init_string (&input, (char *) mp->cmd, ntohl (mp->length));
+  vlib_cli_input (vm, &input, inband_cli_output, (uword) & out_vec);
+
+  u32 len = vec_len (out_vec);
+  /* *INDENT-OFF* */
+  REPLY_MACRO3(VL_API_CLI_INBAND_REPLY, len,
+  ({
+    rmp->length = htonl (len);
+    clib_memcpy (rmp->reply, out_vec, len);
+  }));
+  /* *INDENT-ON* */
+  vec_free (out_vec);
+}
+
+static void
+vl_api_set_arp_neighbor_limit_t_handler (vl_api_set_arp_neighbor_limit_t * mp)
+{
+  int rv;
+  vl_api_set_arp_neighbor_limit_reply_t *rmp;
+  vnet_main_t *vnm = vnet_get_main ();
+  clib_error_t *error;
+
+  vnm->api_errno = 0;
+
+  if (mp->is_ipv6)
+    error = ip6_set_neighbor_limit (ntohl (mp->arp_neighbor_limit));
+  else
+    error = ip4_set_arp_limit (ntohl (mp->arp_neighbor_limit));
+
+  if (error)
+    {
+      clib_error_report (error);
+      rv = VNET_API_ERROR_UNSPECIFIED;
+    }
+  else
+    {
+      rv = vnm->api_errno;
+    }
+
+  REPLY_MACRO (VL_API_SET_ARP_NEIGHBOR_LIMIT_REPLY);
+}
+
+static void vl_api_sr_tunnel_add_del_t_handler
+  (vl_api_sr_tunnel_add_del_t * mp)
+{
+#if IP6SR == 0
+  clib_warning ("unimplemented");
+#else
+  ip6_sr_add_del_tunnel_args_t _a, *a = &_a;
+  int rv = 0;
+  vl_api_sr_tunnel_add_del_reply_t *rmp;
+  ip6_address_t *segments = 0, *seg;
+  ip6_address_t *tags = 0, *tag;
+  ip6_address_t *this_address;
+  int i;
+
+  if (mp->n_segments == 0)
+    {
+      rv = -11;
+      goto out;
+    }
+
+  memset (a, 0, sizeof (*a));
+  a->src_address = (ip6_address_t *) & mp->src_address;
+  a->dst_address = (ip6_address_t *) & mp->dst_address;
+  a->dst_mask_width = mp->dst_mask_width;
+  a->flags_net_byte_order = mp->flags_net_byte_order;
+  a->is_del = (mp->is_add == 0);
+  a->rx_table_id = ntohl (mp->outer_vrf_id);
+  a->tx_table_id = ntohl (mp->inner_vrf_id);
+
+  a->name = format (0, "%s", mp->name);
+  if (!(vec_len (a->name)))
+    a->name = 0;
+
+  a->policy_name = format (0, "%s", mp->policy_name);
+  if (!(vec_len (a->policy_name)))
+    a->policy_name = 0;
+
+  /* Yank segments and tags out of the API message */
+  this_address = (ip6_address_t *) mp->segs_and_tags;
+  for (i = 0; i < mp->n_segments; i++)
+    {
+      vec_add2 (segments, seg, 1);
+      clib_memcpy (seg->as_u8, this_address->as_u8, sizeof (*this_address));
+      this_address++;
+    }
+  for (i = 0; i < mp->n_tags; i++)
+    {
+      vec_add2 (tags, tag, 1);
+      clib_memcpy (tag->as_u8, this_address->as_u8, sizeof (*this_address));
+      this_address++;
+    }
+
+  a->segments = segments;
+  a->tags = tags;
+
+  rv = ip6_sr_add_del_tunnel (a);
+
+out:
+
+  REPLY_MACRO (VL_API_SR_TUNNEL_ADD_DEL_REPLY);
+#endif
+}
+
+static void vl_api_sr_policy_add_del_t_handler
+  (vl_api_sr_policy_add_del_t * mp)
+{
+#if IP6SR == 0
+  clib_warning ("unimplemented");
+#else
+  ip6_sr_add_del_policy_args_t _a, *a = &_a;
+  int rv = 0;
+  vl_api_sr_policy_add_del_reply_t *rmp;
+  int i;
+
+  memset (a, 0, sizeof (*a));
+  a->is_del = (mp->is_add == 0);
+
+  a->name = format (0, "%s", mp->name);
+  if (!(vec_len (a->name)))
+    {
+      rv = VNET_API_ERROR_NO_SUCH_NODE2;
+      goto out;
+    }
+
+  if (!(mp->tunnel_names[0]))
+    {
+      rv = VNET_API_ERROR_NO_SUCH_NODE2;
+      goto out;
+    }
+
+  // start deserializing tunnel_names
+  int num_tunnels = mp->tunnel_names[0];	//number of tunnels
+  u8 *deser_tun_names = mp->tunnel_names;
+  deser_tun_names += 1;		//moving along
+
+  u8 *tun_name = 0;
+  int tun_name_len = 0;
+
+  for (i = 0; i < num_tunnels; i++)
+    {
+      tun_name_len = *deser_tun_names;
+      deser_tun_names += 1;
+      vec_resize (tun_name, tun_name_len);
+      memcpy (tun_name, deser_tun_names, tun_name_len);
+      vec_add1 (a->tunnel_names, tun_name);
+      deser_tun_names += tun_name_len;
+      tun_name = 0;
+    }
+
+  rv = ip6_sr_add_del_policy (a);
+
+out:
+
+  REPLY_MACRO (VL_API_SR_POLICY_ADD_DEL_REPLY);
+#endif
+}
+
+static void vl_api_sr_multicast_map_add_del_t_handler
+  (vl_api_sr_multicast_map_add_del_t * mp)
+{
+#if IP6SR == 0
+  clib_warning ("unimplemented");
+#else
+  ip6_sr_add_del_multicastmap_args_t _a, *a = &_a;
+  int rv = 0;
+  vl_api_sr_multicast_map_add_del_reply_t *rmp;
+
+  memset (a, 0, sizeof (*a));
+  a->is_del = (mp->is_add == 0);
+
+  a->multicast_address = (ip6_address_t *) & mp->multicast_address;
+  a->policy_name = format (0, "%s", mp->policy_name);
+
+  if (a->multicast_address == 0)
+    {
+      rv = -1;
+      goto out;
+    }
+
+  if (!(a->policy_name))
+    {
+      rv = -2;
+      goto out;
+    }
+
+#if DPDK > 0			/* Cannot call replicate without DPDK */
+  rv = ip6_sr_add_del_multicastmap (a);
+#else
+  clib_warning ("multicast replication without DPDK not implemented");
+  rv = VNET_API_ERROR_UNIMPLEMENTED;
+#endif /* DPDK */
+
+out:
+
+  REPLY_MACRO (VL_API_SR_MULTICAST_MAP_ADD_DEL_REPLY);
+#endif
+}
+
+#define foreach_classify_add_del_table_field    \
+_(table_index)                                  \
+_(nbuckets)                                     \
+_(memory_size)                                  \
+_(skip_n_vectors)                               \
+_(match_n_vectors)                              \
+_(next_table_index)                             \
+_(miss_next_index)                              \
+_(current_data_flag)                            \
+_(current_data_offset)
+
+static void vl_api_classify_add_del_table_t_handler
+  (vl_api_classify_add_del_table_t * mp)
+{
+  vl_api_classify_add_del_table_reply_t *rmp;
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  vnet_classify_table_t *t;
+  int rv;
+
+#define _(a) u32 a;
+  foreach_classify_add_del_table_field;
+#undef _
+
+#define _(a) a = ntohl(mp->a);
+  foreach_classify_add_del_table_field;
+#undef _
+
+  /* The underlying API fails silently, on purpose, so check here */
+  if (mp->is_add == 0)		/* delete */
+    {
+      if (pool_is_free_index (cm->tables, table_index))
+	{
+	  rv = VNET_API_ERROR_NO_SUCH_TABLE;
+	  goto out;
+	}
+    }
+  else				/* add or update */
+    {
+      if (table_index != ~0 && pool_is_free_index (cm->tables, table_index))
+	table_index = ~0;
+    }
+
+  rv = vnet_classify_add_del_table
+    (cm, mp->mask, nbuckets, memory_size,
+     skip_n_vectors, match_n_vectors,
+     next_table_index, miss_next_index, &table_index,
+     current_data_flag, current_data_offset, mp->is_add, mp->del_chain);
+
+out:
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_CLASSIFY_ADD_DEL_TABLE_REPLY,
+  ({
+    if (rv == 0 && mp->is_add)
+      {
+        t = pool_elt_at_index (cm->tables, table_index);
+        rmp->skip_n_vectors = ntohl(t->skip_n_vectors);
+        rmp->match_n_vectors = ntohl(t->match_n_vectors);
+        rmp->new_table_index = ntohl(table_index);
+      }
+    else
+      {
+        rmp->skip_n_vectors = ~0;
+        rmp->match_n_vectors = ~0;
+        rmp->new_table_index = ~0;
+      }
+  }));
+  /* *INDENT-ON* */
+}
+
+static void vl_api_classify_add_del_session_t_handler
+  (vl_api_classify_add_del_session_t * mp)
+{
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  vl_api_classify_add_del_session_reply_t *rmp;
+  int rv;
+  u32 table_index, hit_next_index, opaque_index, metadata;
+  i32 advance;
+  u8 action;
+
+  table_index = ntohl (mp->table_index);
+  hit_next_index = ntohl (mp->hit_next_index);
+  opaque_index = ntohl (mp->opaque_index);
+  advance = ntohl (mp->advance);
+  action = mp->action;
+  metadata = ntohl (mp->metadata);
+
+  rv = vnet_classify_add_del_session
+    (cm, table_index, mp->match, hit_next_index, opaque_index,
+     advance, action, metadata, mp->is_add);
+
+  REPLY_MACRO (VL_API_CLASSIFY_ADD_DEL_SESSION_REPLY);
+}
+
+static void vl_api_classify_set_interface_ip_table_t_handler
+  (vl_api_classify_set_interface_ip_table_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_classify_set_interface_ip_table_reply_t *rmp;
+  int rv;
+  u32 table_index, sw_if_index;
+
+  table_index = ntohl (mp->table_index);
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  if (mp->is_ipv6)
+    rv = vnet_set_ip6_classify_intfc (vm, sw_if_index, table_index);
+  else
+    rv = vnet_set_ip4_classify_intfc (vm, sw_if_index, table_index);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_CLASSIFY_SET_INTERFACE_IP_TABLE_REPLY);
+}
+
+static void vl_api_classify_set_interface_l2_tables_t_handler
+  (vl_api_classify_set_interface_l2_tables_t * mp)
+{
+  vl_api_classify_set_interface_l2_tables_reply_t *rmp;
+  int rv;
+  u32 sw_if_index, ip4_table_index, ip6_table_index, other_table_index;
+  int enable;
+
+  ip4_table_index = ntohl (mp->ip4_table_index);
+  ip6_table_index = ntohl (mp->ip6_table_index);
+  other_table_index = ntohl (mp->other_table_index);
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  if (mp->is_input)
+    rv = vnet_l2_input_classify_set_tables (sw_if_index, ip4_table_index,
+					    ip6_table_index,
+					    other_table_index);
+  else
+    rv = vnet_l2_output_classify_set_tables (sw_if_index, ip4_table_index,
+					     ip6_table_index,
+					     other_table_index);
+
+  if (rv == 0)
+    {
+      if (ip4_table_index != ~0 || ip6_table_index != ~0
+	  || other_table_index != ~0)
+	enable = 1;
+      else
+	enable = 0;
+
+      if (mp->is_input)
+	vnet_l2_input_classify_enable_disable (sw_if_index, enable);
+      else
+	vnet_l2_output_classify_enable_disable (sw_if_index, enable);
+    }
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_CLASSIFY_SET_INTERFACE_L2_TABLES_REPLY);
+}
+
+static void
+vl_api_l2_fib_clear_table_t_handler (vl_api_l2_fib_clear_table_t * mp)
+{
+  int rv = 0;
+  vl_api_l2_fib_clear_table_reply_t *rmp;
+
+  /* DAW-FIXME: This API should only clear non-static l2fib entries, but
+   *            that is not currently implemented.  When that TODO is fixed
+   *            this call should be changed to pass 1 instead of 0.
+   */
+  l2fib_clear_table (0);
+
+  REPLY_MACRO (VL_API_L2_FIB_CLEAR_TABLE_REPLY);
+}
+
+extern void l2_efp_filter_configure (vnet_main_t * vnet_main,
+				     u32 sw_if_index, u32 enable);
+
+static void
+vl_api_l2_interface_efp_filter_t_handler (vl_api_l2_interface_efp_filter_t *
+					  mp)
+{
+  int rv;
+  vl_api_l2_interface_efp_filter_reply_t *rmp;
+  vnet_main_t *vnm = vnet_get_main ();
+
+  // enable/disable the feature
+  l2_efp_filter_configure (vnm, mp->sw_if_index, mp->enable_disable);
+  rv = vnm->api_errno;
+
+  REPLY_MACRO (VL_API_L2_INTERFACE_EFP_FILTER_REPLY);
+}
+
+static void
+  vl_api_l2_interface_vlan_tag_rewrite_t_handler
+  (vl_api_l2_interface_vlan_tag_rewrite_t * mp)
+{
+  int rv = 0;
+  vl_api_l2_interface_vlan_tag_rewrite_reply_t *rmp;
+  vnet_main_t *vnm = vnet_get_main ();
+  vlib_main_t *vm = vlib_get_main ();
+  u32 vtr_op;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  vtr_op = ntohl (mp->vtr_op);
+
+  /* The L2 code is unsuspicious */
+  switch (vtr_op)
+    {
+    case L2_VTR_DISABLED:
+    case L2_VTR_PUSH_1:
+    case L2_VTR_PUSH_2:
+    case L2_VTR_POP_1:
+    case L2_VTR_POP_2:
+    case L2_VTR_TRANSLATE_1_1:
+    case L2_VTR_TRANSLATE_1_2:
+    case L2_VTR_TRANSLATE_2_1:
+    case L2_VTR_TRANSLATE_2_2:
+      break;
+
+    default:
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto bad_sw_if_index;
+    }
+
+  rv = l2vtr_configure (vm, vnm, ntohl (mp->sw_if_index), vtr_op,
+			ntohl (mp->push_dot1q), ntohl (mp->tag1),
+			ntohl (mp->tag2));
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_L2_INTERFACE_VLAN_TAG_REWRITE_REPLY);
+}
+
+static void
+vl_api_l2_fib_table_entry_t_handler (vl_api_l2_fib_table_entry_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+send_l2fib_table_entry (vpe_api_main_t * am,
+			unix_shared_memory_queue_t * q,
+			l2fib_entry_key_t * l2fe_key,
+			l2fib_entry_result_t * l2fe_res, u32 context)
+{
+  vl_api_l2_fib_table_entry_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_L2_FIB_TABLE_ENTRY);
+
+  mp->bd_id =
+    ntohl (l2input_main.bd_configs[l2fe_key->fields.bd_index].bd_id);
+
+  mp->mac = l2fib_make_key (l2fe_key->fields.mac, 0);
+  mp->sw_if_index = ntohl (l2fe_res->fields.sw_if_index);
+  mp->static_mac = l2fe_res->fields.static_mac;
+  mp->filter_mac = l2fe_res->fields.filter;
+  mp->bvi_mac = l2fe_res->fields.bvi;
+  mp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_l2_fib_table_dump_t_handler (vl_api_l2_fib_table_dump_t * mp)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+  bd_main_t *bdm = &bd_main;
+  l2fib_entry_key_t *l2fe_key = NULL;
+  l2fib_entry_result_t *l2fe_res = NULL;
+  u32 ni, bd_id = ntohl (mp->bd_id);
+  u32 bd_index;
+  unix_shared_memory_queue_t *q;
+  uword *p;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  /* see l2fib_table_dump: ~0 means "any" */
+  if (bd_id == ~0)
+    bd_index = ~0;
+  else
+    {
+      p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+      if (p == 0)
+	return;
+
+      bd_index = p[0];
+    }
+
+  l2fib_table_dump (bd_index, &l2fe_key, &l2fe_res);
+
+  vec_foreach_index (ni, l2fe_key)
+  {
+    send_l2fib_table_entry (am, q, vec_elt_at_index (l2fe_key, ni),
+			    vec_elt_at_index (l2fe_res, ni), mp->context);
+  }
+  vec_free (l2fe_key);
+  vec_free (l2fe_res);
+}
+
+static void
+vl_api_show_version_t_handler (vl_api_show_version_t * mp)
+{
+  vl_api_show_version_reply_t *rmp;
+  int rv = 0;
+  char *vpe_api_get_build_directory (void);
+  char *vpe_api_get_version (void);
+  char *vpe_api_get_build_date (void);
+
+  unix_shared_memory_queue_t *q =
+    vl_api_client_index_to_input_queue (mp->client_index);
+
+  if (!q)
+    return;
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_SHOW_VERSION_REPLY,
+  ({
+    strncpy ((char *) rmp->program, "vpe", ARRAY_LEN(rmp->program)-1);
+    strncpy ((char *) rmp->build_directory, vpe_api_get_build_directory(),
+             ARRAY_LEN(rmp->build_directory)-1);
+    strncpy ((char *) rmp->version, vpe_api_get_version(),
+             ARRAY_LEN(rmp->version)-1);
+    strncpy ((char *) rmp->build_date, vpe_api_get_build_date(),
+             ARRAY_LEN(rmp->build_date)-1);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_get_node_index_t_handler (vl_api_get_node_index_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_get_node_index_reply_t *rmp;
+  vlib_node_t *n;
+  int rv = 0;
+  u32 node_index = ~0;
+
+  n = vlib_get_node_by_name (vm, mp->node_name);
+
+  if (n == 0)
+    rv = VNET_API_ERROR_NO_SUCH_NODE;
+  else
+    node_index = n->index;
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_GET_NODE_INDEX_REPLY,
+  ({
+    rmp->node_index = ntohl(node_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_get_next_index_t_handler (vl_api_get_next_index_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_get_next_index_reply_t *rmp;
+  vlib_node_t *node, *next_node;
+  int rv = 0;
+  u32 next_node_index = ~0, next_index = ~0;
+  uword *p;
+
+  node = vlib_get_node_by_name (vm, mp->node_name);
+
+  if (node == 0)
+    {
+      rv = VNET_API_ERROR_NO_SUCH_NODE;
+      goto out;
+    }
+
+  next_node = vlib_get_node_by_name (vm, mp->next_name);
+
+  if (next_node == 0)
+    {
+      rv = VNET_API_ERROR_NO_SUCH_NODE2;
+      goto out;
+    }
+  else
+    next_node_index = next_node->index;
+
+  p = hash_get (node->next_slot_by_node, next_node_index);
+
+  if (p == 0)
+    {
+      rv = VNET_API_ERROR_NO_SUCH_ENTRY;
+      goto out;
+    }
+  else
+    next_index = p[0];
+
+out:
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_GET_NEXT_INDEX_REPLY,
+  ({
+    rmp->next_index = ntohl(next_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_add_node_next_t_handler (vl_api_add_node_next_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_add_node_next_reply_t *rmp;
+  vlib_node_t *n, *next;
+  int rv = 0;
+  u32 next_index = ~0;
+
+  n = vlib_get_node_by_name (vm, mp->node_name);
+
+  if (n == 0)
+    {
+      rv = VNET_API_ERROR_NO_SUCH_NODE;
+      goto out;
+    }
+
+  next = vlib_get_node_by_name (vm, mp->next_name);
+
+  if (next == 0)
+    rv = VNET_API_ERROR_NO_SUCH_NODE2;
+  else
+    next_index = vlib_node_add_next (vm, n->index, next->index);
+
+out:
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_GET_NODE_INDEX_REPLY,
+  ({
+    rmp->next_index = ntohl(next_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void vl_api_vxlan_add_del_tunnel_t_handler
+  (vl_api_vxlan_add_del_tunnel_t * mp)
+{
+  vl_api_vxlan_add_del_tunnel_reply_t *rmp;
+  int rv = 0;
+  vnet_vxlan_add_del_tunnel_args_t _a, *a = &_a;
+  u32 encap_fib_index;
+  uword *p;
+  ip4_main_t *im = &ip4_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index = ~0;
+
+  p = hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id));
+  if (!p)
+    {
+      rv = VNET_API_ERROR_NO_SUCH_FIB;
+      goto out;
+    }
+  encap_fib_index = p[0];
+  memset (a, 0, sizeof (*a));
+
+  a->is_add = mp->is_add;
+  a->is_ip6 = mp->is_ipv6;
+
+  /* ip addresses sent in network byte order */
+  ip46_from_addr_buf (mp->is_ipv6, mp->dst_address, &a->dst);
+  ip46_from_addr_buf (mp->is_ipv6, mp->src_address, &a->src);
+
+  /* Check src & dst are different */
+  if (ip46_address_cmp (&a->dst, &a->src) == 0)
+    {
+      rv = VNET_API_ERROR_SAME_SRC_DST;
+      goto out;
+    }
+  a->mcast_sw_if_index = ntohl (mp->mcast_sw_if_index);
+  if (ip46_address_is_multicast (&a->dst) &&
+      pool_is_free_index (vnm->interface_main.sw_interfaces,
+			  a->mcast_sw_if_index))
+    {
+      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
+      goto out;
+    }
+  a->encap_fib_index = encap_fib_index;
+  a->decap_next_index = ntohl (mp->decap_next_index);
+  a->vni = ntohl (mp->vni);
+  rv = vnet_vxlan_add_del_tunnel (a, &sw_if_index);
+
+out:
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_VXLAN_ADD_DEL_TUNNEL_REPLY,
+  ({
+    rmp->sw_if_index = ntohl (sw_if_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void send_vxlan_tunnel_details
+  (vxlan_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_vxlan_tunnel_details_t *rmp;
+  ip4_main_t *im4 = &ip4_main;
+  ip6_main_t *im6 = &ip6_main;
+  u8 is_ipv6 = !ip46_address_is_ip4 (&t->dst);
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_VXLAN_TUNNEL_DETAILS);
+  if (is_ipv6)
+    {
+      memcpy (rmp->src_address, t->src.ip6.as_u8, 16);
+      memcpy (rmp->dst_address, t->dst.ip6.as_u8, 16);
+      rmp->encap_vrf_id = htonl (im6->fibs[t->encap_fib_index].ft_table_id);
+    }
+  else
+    {
+      memcpy (rmp->src_address, t->src.ip4.as_u8, 4);
+      memcpy (rmp->dst_address, t->dst.ip4.as_u8, 4);
+      rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id);
+    }
+  rmp->mcast_sw_if_index = htonl (t->mcast_sw_if_index);
+  rmp->vni = htonl (t->vni);
+  rmp->decap_next_index = htonl (t->decap_next_index);
+  rmp->sw_if_index = htonl (t->sw_if_index);
+  rmp->is_ipv6 = is_ipv6;
+  rmp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void vl_api_vxlan_tunnel_dump_t_handler
+  (vl_api_vxlan_tunnel_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  vxlan_main_t *vxm = &vxlan_main;
+  vxlan_tunnel_t *t;
+  u32 sw_if_index;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  if (~0 == sw_if_index)
+    {
+      /* *INDENT-OFF* */
+      pool_foreach (t, vxm->tunnels,
+      ({
+        send_vxlan_tunnel_details(t, q, mp->context);
+      }));
+      /* *INDENT-ON* */
+    }
+  else
+    {
+      if ((sw_if_index >= vec_len (vxm->tunnel_index_by_sw_if_index)) ||
+	  (~0 == vxm->tunnel_index_by_sw_if_index[sw_if_index]))
+	{
+	  return;
+	}
+      t = &vxm->tunnels[vxm->tunnel_index_by_sw_if_index[sw_if_index]];
+      send_vxlan_tunnel_details (t, q, mp->context);
+    }
+}
+
+static void
+vl_api_l2_patch_add_del_t_handler (vl_api_l2_patch_add_del_t * mp)
+{
+  extern int vnet_l2_patch_add_del (u32 rx_sw_if_index, u32 tx_sw_if_index,
+				    int is_add);
+  vl_api_l2_patch_add_del_reply_t *rmp;
+  int vnet_l2_patch_add_del (u32 rx_sw_if_index, u32 tx_sw_if_index,
+			     int is_add);
+  int rv = 0;
+
+  VALIDATE_RX_SW_IF_INDEX (mp);
+  VALIDATE_TX_SW_IF_INDEX (mp);
+
+  rv = vnet_l2_patch_add_del (ntohl (mp->rx_sw_if_index),
+			      ntohl (mp->tx_sw_if_index),
+			      (int) (mp->is_add != 0));
+
+  BAD_RX_SW_IF_INDEX_LABEL;
+  BAD_TX_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_L2_PATCH_ADD_DEL_REPLY);
+}
+
+static void
+  vl_api_vxlan_gpe_add_del_tunnel_t_handler
+  (vl_api_vxlan_gpe_add_del_tunnel_t * mp)
+{
+  vl_api_vxlan_gpe_add_del_tunnel_reply_t *rmp;
+  int rv = 0;
+  vnet_vxlan_gpe_add_del_tunnel_args_t _a, *a = &_a;
+  u32 encap_fib_index, decap_fib_index;
+  u8 protocol;
+  uword *p;
+  ip4_main_t *im = &ip4_main;
+  u32 sw_if_index = ~0;
+
+
+  p = hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id));
+  if (!p)
+    {
+      rv = VNET_API_ERROR_NO_SUCH_FIB;
+      goto out;
+    }
+  encap_fib_index = p[0];
+
+  protocol = mp->protocol;
+
+  /* Interpret decap_vrf_id as an opaque if sending to other-than-ip4-input */
+  if (protocol == VXLAN_GPE_INPUT_NEXT_IP4_INPUT)
+    {
+      p = hash_get (im->fib_index_by_table_id, ntohl (mp->decap_vrf_id));
+      if (!p)
+	{
+	  rv = VNET_API_ERROR_NO_SUCH_INNER_FIB;
+	  goto out;
+	}
+      decap_fib_index = p[0];
+    }
+  else
+    {
+      decap_fib_index = ntohl (mp->decap_vrf_id);
+    }
+
+  /* Check src & dst are different */
+  if ((mp->is_ipv6 && memcmp (mp->local, mp->remote, 16) == 0) ||
+      (!mp->is_ipv6 && memcmp (mp->local, mp->remote, 4) == 0))
+    {
+      rv = VNET_API_ERROR_SAME_SRC_DST;
+      goto out;
+    }
+  memset (a, 0, sizeof (*a));
+
+  a->is_add = mp->is_add;
+  a->is_ip6 = mp->is_ipv6;
+  /* ip addresses sent in network byte order */
+  if (a->is_ip6)
+    {
+      clib_memcpy (&(a->local.ip6), mp->local, 16);
+      clib_memcpy (&(a->remote.ip6), mp->remote, 16);
+    }
+  else
+    {
+      clib_memcpy (&(a->local.ip4), mp->local, 4);
+      clib_memcpy (&(a->remote.ip4), mp->remote, 4);
+    }
+  a->encap_fib_index = encap_fib_index;
+  a->decap_fib_index = decap_fib_index;
+  a->protocol = protocol;
+  a->vni = ntohl (mp->vni);
+  rv = vnet_vxlan_gpe_add_del_tunnel (a, &sw_if_index);
+
+out:
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_VXLAN_GPE_ADD_DEL_TUNNEL_REPLY,
+  ({
+    rmp->sw_if_index = ntohl (sw_if_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void send_vxlan_gpe_tunnel_details
+  (vxlan_gpe_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_vxlan_gpe_tunnel_details_t *rmp;
+  ip4_main_t *im4 = &ip4_main;
+  ip6_main_t *im6 = &ip6_main;
+  u8 is_ipv6 = !(t->flags & VXLAN_GPE_TUNNEL_IS_IPV4);
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_VXLAN_GPE_TUNNEL_DETAILS);
+  if (is_ipv6)
+    {
+      memcpy (rmp->local, &(t->local.ip6), 16);
+      memcpy (rmp->remote, &(t->remote.ip6), 16);
+      rmp->encap_vrf_id = htonl (im6->fibs[t->encap_fib_index].ft_table_id);
+      rmp->decap_vrf_id = htonl (im6->fibs[t->decap_fib_index].ft_table_id);
+    }
+  else
+    {
+      memcpy (rmp->local, &(t->local.ip4), 4);
+      memcpy (rmp->remote, &(t->remote.ip4), 4);
+      rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id);
+      rmp->decap_vrf_id = htonl (im4->fibs[t->decap_fib_index].ft_table_id);
+    }
+  rmp->vni = htonl (t->vni);
+  rmp->protocol = t->protocol;
+  rmp->sw_if_index = htonl (t->sw_if_index);
+  rmp->is_ipv6 = is_ipv6;
+  rmp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void vl_api_vxlan_gpe_tunnel_dump_t_handler
+  (vl_api_vxlan_gpe_tunnel_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  vxlan_gpe_main_t *vgm = &vxlan_gpe_main;
+  vxlan_gpe_tunnel_t *t;
+  u32 sw_if_index;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  if (~0 == sw_if_index)
+    {
+      /* *INDENT-OFF* */
+      pool_foreach (t, vgm->tunnels,
+      ({
+        send_vxlan_gpe_tunnel_details(t, q, mp->context);
+      }));
+      /* *INDENT-ON* */
+    }
+  else
+    {
+      if ((sw_if_index >= vec_len (vgm->tunnel_index_by_sw_if_index)) ||
+	  (~0 == vgm->tunnel_index_by_sw_if_index[sw_if_index]))
+	{
+	  return;
+	}
+      t = &vgm->tunnels[vgm->tunnel_index_by_sw_if_index[sw_if_index]];
+      send_vxlan_gpe_tunnel_details (t, q, mp->context);
+    }
+}
+
+static void
+vl_api_interface_name_renumber_t_handler (vl_api_interface_name_renumber_t *
+					  mp)
+{
+  vl_api_interface_name_renumber_reply_t *rmp;
+  int rv = 0;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  rv = vnet_interface_name_renumber
+    (ntohl (mp->sw_if_index), ntohl (mp->new_show_dev_instance));
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_INTERFACE_NAME_RENUMBER_REPLY);
+}
+
+static int
+arp_change_data_callback (u32 pool_index, u8 * new_mac,
+			  u32 sw_if_index, u32 address)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+  vlib_main_t *vm = am->vlib_main;
+  vl_api_ip4_arp_event_t *event;
+  static f64 arp_event_last_time;
+  f64 now = vlib_time_now (vm);
+
+  if (pool_is_free_index (am->arp_events, pool_index))
+    return 1;
+
+  event = pool_elt_at_index (am->arp_events, pool_index);
+  /* *INDENT-OFF* */
+  if (memcmp (&event->new_mac, new_mac, sizeof (event->new_mac)))
+    {
+      clib_memcpy (event->new_mac, new_mac, sizeof (event->new_mac));
+    }
+  else
+    {				/* same mac */
+      if (sw_if_index == event->sw_if_index &&
+	  (!event->mac_ip ||
+	   /* for BD case, also check IP address with 10 sec timeout */
+	   (address == event->address &&
+	    (now - arp_event_last_time) < 10.0)))
+	return 1;
+    }
+  /* *INDENT-ON* */
+
+  arp_event_last_time = now;
+  event->sw_if_index = sw_if_index;
+  if (event->mac_ip)
+    event->address = address;
+  return 0;
+}
+
+static int
+nd_change_data_callback (u32 pool_index, u8 * new_mac,
+			 u32 sw_if_index, ip6_address_t * address)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+  vlib_main_t *vm = am->vlib_main;
+  vl_api_ip6_nd_event_t *event;
+  static f64 nd_event_last_time;
+  f64 now = vlib_time_now (vm);
+
+  if (pool_is_free_index (am->nd_events, pool_index))
+    return 1;
+
+  event = pool_elt_at_index (am->nd_events, pool_index);
+
+  /* *INDENT-OFF* */
+  if (memcmp (&event->new_mac, new_mac, sizeof (event->new_mac)))
+    {
+      clib_memcpy (event->new_mac, new_mac, sizeof (event->new_mac));
+    }
+  else
+    {				/* same mac */
+      if (sw_if_index == event->sw_if_index &&
+	  (!event->mac_ip ||
+	   /* for BD case, also check IP address with 10 sec timeout */
+	   (ip6_address_is_equal (address,
+				  (ip6_address_t *) event->address) &&
+	    (now - nd_event_last_time) < 10.0)))
+	return 1;
+    }
+  /* *INDENT-ON* */
+
+  nd_event_last_time = now;
+  event->sw_if_index = sw_if_index;
+  if (event->mac_ip)
+    clib_memcpy (event->address, address, sizeof (event->address));
+  return 0;
+}
+
+static int
+arp_change_delete_callback (u32 pool_index, u8 * notused)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+
+  if (pool_is_free_index (am->arp_events, pool_index))
+    return 1;
+
+  pool_put_index (am->arp_events, pool_index);
+  return 0;
+}
+
+static int
+nd_change_delete_callback (u32 pool_index, u8 * notused)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+
+  if (pool_is_free_index (am->nd_events, pool_index))
+    return 1;
+
+  pool_put_index (am->nd_events, pool_index);
+  return 0;
+}
+
+static void
+vl_api_want_ip4_arp_events_t_handler (vl_api_want_ip4_arp_events_t * mp)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  vl_api_want_ip4_arp_events_reply_t *rmp;
+  vl_api_ip4_arp_event_t *event;
+  int rv;
+
+  if (mp->enable_disable)
+    {
+      pool_get (am->arp_events, event);
+      memset (event, 0, sizeof (*event));
+
+      event->_vl_msg_id = ntohs (VL_API_IP4_ARP_EVENT);
+      event->client_index = mp->client_index;
+      event->context = mp->context;
+      event->address = mp->address;
+      event->pid = mp->pid;
+      if (mp->address == 0)
+	event->mac_ip = 1;
+
+      rv = vnet_add_del_ip4_arp_change_event
+	(vnm, arp_change_data_callback,
+	 mp->pid, &mp->address /* addr, in net byte order */ ,
+	 vpe_resolver_process_node.index,
+	 IP4_ARP_EVENT, event - am->arp_events, 1 /* is_add */ );
+    }
+  else
+    {
+      rv = vnet_add_del_ip4_arp_change_event
+	(vnm, arp_change_delete_callback,
+	 mp->pid, &mp->address /* addr, in net byte order */ ,
+	 vpe_resolver_process_node.index,
+	 IP4_ARP_EVENT, ~0 /* pool index */ , 0 /* is_add */ );
+    }
+  REPLY_MACRO (VL_API_WANT_IP4_ARP_EVENTS_REPLY);
+}
+
+static void
+vl_api_want_ip6_nd_events_t_handler (vl_api_want_ip6_nd_events_t * mp)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  vl_api_want_ip6_nd_events_reply_t *rmp;
+  vl_api_ip6_nd_event_t *event;
+  int rv;
+
+  if (mp->enable_disable)
+    {
+      pool_get (am->nd_events, event);
+      memset (event, 0, sizeof (*event));
+
+      event->_vl_msg_id = ntohs (VL_API_IP6_ND_EVENT);
+      event->client_index = mp->client_index;
+      event->context = mp->context;
+      clib_memcpy (event->address, mp->address, 16);
+      event->pid = mp->pid;
+      if (ip6_address_is_zero ((ip6_address_t *) mp->address))
+	event->mac_ip = 1;
+
+      rv = vnet_add_del_ip6_nd_change_event
+	(vnm, nd_change_data_callback,
+	 mp->pid, mp->address /* addr, in net byte order */ ,
+	 vpe_resolver_process_node.index,
+	 IP6_ND_EVENT, event - am->nd_events, 1 /* is_add */ );
+    }
+  else
+    {
+      rv = vnet_add_del_ip6_nd_change_event
+	(vnm, nd_change_delete_callback,
+	 mp->pid, mp->address /* addr, in net byte order */ ,
+	 vpe_resolver_process_node.index,
+	 IP6_ND_EVENT, ~0 /* pool index */ , 0 /* is_add */ );
+    }
+  REPLY_MACRO (VL_API_WANT_IP6_ND_EVENTS_REPLY);
+}
+
+static void vl_api_input_acl_set_interface_t_handler
+  (vl_api_input_acl_set_interface_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_input_acl_set_interface_reply_t *rmp;
+  int rv;
+  u32 sw_if_index, ip4_table_index, ip6_table_index, l2_table_index;
+
+  ip4_table_index = ntohl (mp->ip4_table_index);
+  ip6_table_index = ntohl (mp->ip6_table_index);
+  l2_table_index = ntohl (mp->l2_table_index);
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  rv = vnet_set_input_acl_intfc (vm, sw_if_index, ip4_table_index,
+				 ip6_table_index, l2_table_index, mp->is_add);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_INPUT_ACL_SET_INTERFACE_REPLY);
+}
+
+static void vl_api_cop_interface_enable_disable_t_handler
+  (vl_api_cop_interface_enable_disable_t * mp)
+{
+  vl_api_cop_interface_enable_disable_reply_t *rmp;
+  int rv;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  int enable_disable;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  enable_disable = (int) mp->enable_disable;
+
+  rv = cop_interface_enable_disable (sw_if_index, enable_disable);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_COP_INTERFACE_ENABLE_DISABLE_REPLY);
+}
+
+static void vl_api_cop_whitelist_enable_disable_t_handler
+  (vl_api_cop_whitelist_enable_disable_t * mp)
+{
+  vl_api_cop_whitelist_enable_disable_reply_t *rmp;
+  cop_whitelist_enable_disable_args_t _a, *a = &_a;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  int rv;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  a->sw_if_index = sw_if_index;
+  a->ip4 = mp->ip4;
+  a->ip6 = mp->ip6;
+  a->default_cop = mp->default_cop;
+  a->fib_id = ntohl (mp->fib_id);
+
+  rv = cop_whitelist_enable_disable (a);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_COP_WHITELIST_ENABLE_DISABLE_REPLY);
+}
+
+static void
+vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp)
+{
+  int rv = 0;
+  u8 *vector = 0;
+  api_main_t *am = &api_main;
+  vlib_main_t *vm = vlib_get_main ();
+  void *oldheap;
+  vl_api_get_node_graph_reply_t *rmp;
+
+  pthread_mutex_lock (&am->vlib_rp->mutex);
+  oldheap = svm_push_data_heap (am->vlib_rp);
+
+  /*
+   * Keep the number of memcpy ops to a minimum (e.g. 1).
+   */
+  vec_validate (vector, 16384);
+  vec_reset_length (vector);
+
+  /* $$$$ FIXME */
+  vector = vlib_node_serialize (&vm->node_main, vector,
+				(u32) ~ 0 /* all threads */ ,
+				1 /* include nexts */ ,
+				1 /* include stats */ );
+
+  svm_pop_heap (oldheap);
+  pthread_mutex_unlock (&am->vlib_rp->mutex);
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_GET_NODE_GRAPH_REPLY,
+  ({
+    rmp->reply_in_shmem = (uword) vector;
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_ioam_enable_t_handler (vl_api_ioam_enable_t * mp)
+{
+  int rv = 0;
+  vl_api_ioam_enable_reply_t *rmp;
+  clib_error_t *error;
+
+  /* Ignoring the profile id as currently a single profile
+   * is supported */
+  error = ip6_ioam_enable (mp->trace_enable, mp->pot_enable,
+			   mp->seqno, mp->analyse);
+  if (error)
+    {
+      clib_error_report (error);
+      rv = clib_error_get_code (error);
+    }
+
+  REPLY_MACRO (VL_API_IOAM_ENABLE_REPLY);
+}
+
+static void
+vl_api_ioam_disable_t_handler (vl_api_ioam_disable_t * mp)
+{
+  int rv = 0;
+  vl_api_ioam_disable_reply_t *rmp;
+  clib_error_t *error;
+
+  error = clear_ioam_rewrite_fn ();
+  if (error)
+    {
+      clib_error_report (error);
+      rv = clib_error_get_code (error);
+    }
+
+  REPLY_MACRO (VL_API_IOAM_DISABLE_REPLY);
+}
+
+static void
+vl_api_policer_add_del_t_handler (vl_api_policer_add_del_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_policer_add_del_reply_t *rmp;
+  int rv = 0;
+  u8 *name = NULL;
+  sse2_qos_pol_cfg_params_st cfg;
+  clib_error_t *error;
+  u32 policer_index;
+
+  name = format (0, "%s", mp->name);
+
+  memset (&cfg, 0, sizeof (cfg));
+  cfg.rfc = mp->type;
+  cfg.rnd_type = mp->round_type;
+  cfg.rate_type = mp->rate_type;
+  cfg.rb.kbps.cir_kbps = mp->cir;
+  cfg.rb.kbps.eir_kbps = mp->eir;
+  cfg.rb.kbps.cb_bytes = mp->cb;
+  cfg.rb.kbps.eb_bytes = mp->eb;
+  cfg.conform_action.action_type = mp->conform_action_type;
+  cfg.conform_action.dscp = mp->conform_dscp;
+  cfg.exceed_action.action_type = mp->exceed_action_type;
+  cfg.exceed_action.dscp = mp->exceed_dscp;
+  cfg.violate_action.action_type = mp->violate_action_type;
+  cfg.violate_action.dscp = mp->violate_dscp;
+  cfg.color_aware = mp->color_aware;
+
+  error = policer_add_del (vm, name, &cfg, &policer_index, mp->is_add);
+
+  if (error)
+    rv = VNET_API_ERROR_UNSPECIFIED;
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_POLICER_ADD_DEL_REPLY,
+  ({
+    if (rv == 0 &&  mp->is_add)
+      rmp->policer_index = ntohl(policer_index);
+    else
+      rmp->policer_index = ~0;
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+send_policer_details (u8 * name,
+		      sse2_qos_pol_cfg_params_st * config,
+		      policer_read_response_type_st * templ,
+		      unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_policer_details_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_POLICER_DETAILS);
+  mp->context = context;
+  mp->cir = htonl (config->rb.kbps.cir_kbps);
+  mp->eir = htonl (config->rb.kbps.eir_kbps);
+  mp->cb = htonl (config->rb.kbps.cb_bytes);
+  mp->eb = htonl (config->rb.kbps.eb_bytes);
+  mp->rate_type = config->rate_type;
+  mp->round_type = config->rnd_type;
+  mp->type = config->rfc;
+  mp->conform_action_type = config->conform_action.action_type;
+  mp->conform_dscp = config->conform_action.dscp;
+  mp->exceed_action_type = config->exceed_action.action_type;
+  mp->exceed_dscp = config->exceed_action.dscp;
+  mp->violate_action_type = config->violate_action.action_type;
+  mp->violate_dscp = config->violate_action.dscp;
+  mp->single_rate = templ->single_rate ? 1 : 0;
+  mp->color_aware = templ->color_aware ? 1 : 0;
+  mp->scale = htonl (templ->scale);
+  mp->cir_tokens_per_period = htonl (templ->cir_tokens_per_period);
+  mp->pir_tokens_per_period = htonl (templ->pir_tokens_per_period);
+  mp->current_limit = htonl (templ->current_limit);
+  mp->current_bucket = htonl (templ->current_bucket);
+  mp->extended_limit = htonl (templ->extended_limit);
+  mp->extended_bucket = htonl (templ->extended_bucket);
+  mp->last_update_time = clib_host_to_net_u64 (templ->last_update_time);
+
+  strncpy ((char *) mp->name, (char *) name, ARRAY_LEN (mp->name) - 1);
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_policer_dump_t_handler (vl_api_policer_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  vnet_policer_main_t *pm = &vnet_policer_main;
+  hash_pair_t *hp;
+  uword *p;
+  u32 pool_index;
+  u8 *match_name = 0;
+  u8 *name;
+  sse2_qos_pol_cfg_params_st *config;
+  policer_read_response_type_st *templ;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  if (mp->match_name_valid)
+    {
+      match_name = format (0, "%s%c", mp->match_name, 0);
+    }
+
+  if (mp->match_name_valid)
+    {
+      p = hash_get_mem (pm->policer_config_by_name, match_name);
+      if (p)
+	{
+	  pool_index = p[0];
+	  config = pool_elt_at_index (pm->configs, pool_index);
+	  templ = pool_elt_at_index (pm->policer_templates, pool_index);
+	  send_policer_details (match_name, config, templ, q, mp->context);
+	}
+    }
+  else
+    {
+      /* *INDENT-OFF* */
+      hash_foreach_pair (hp, pm->policer_config_by_name,
+      ({
+        name = (u8 *) hp->key;
+        pool_index = hp->value[0];
+        config = pool_elt_at_index (pm->configs, pool_index);
+        templ = pool_elt_at_index (pm->policer_templates, pool_index);
+        send_policer_details(name, config, templ, q, mp->context);
+      }));
+      /* *INDENT-ON* */
+    }
+}
+
+static void
+  vl_api_policer_classify_set_interface_t_handler
+  (vl_api_policer_classify_set_interface_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_policer_classify_set_interface_reply_t *rmp;
+  int rv;
+  u32 sw_if_index, ip4_table_index, ip6_table_index, l2_table_index;
+
+  ip4_table_index = ntohl (mp->ip4_table_index);
+  ip6_table_index = ntohl (mp->ip6_table_index);
+  l2_table_index = ntohl (mp->l2_table_index);
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  rv = vnet_set_policer_classify_intfc (vm, sw_if_index, ip4_table_index,
+					ip6_table_index, l2_table_index,
+					mp->is_add);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_POLICER_CLASSIFY_SET_INTERFACE_REPLY);
+}
+
+static void
+send_policer_classify_details (u32 sw_if_index,
+			       u32 table_index,
+			       unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_policer_classify_details_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_POLICER_CLASSIFY_DETAILS);
+  mp->context = context;
+  mp->sw_if_index = htonl (sw_if_index);
+  mp->table_index = htonl (table_index);
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_policer_classify_dump_t_handler (vl_api_policer_classify_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  policer_classify_main_t *pcm = &policer_classify_main;
+  u32 *vec_tbl;
+  int i;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  vec_tbl = pcm->classify_table_index_by_sw_if_index[mp->type];
+
+  if (vec_len (vec_tbl))
+    {
+      for (i = 0; i < vec_len (vec_tbl); i++)
+	{
+	  if (vec_elt (vec_tbl, i) == ~0)
+	    continue;
+
+	  send_policer_classify_details (i, vec_elt (vec_tbl, i), q,
+					 mp->context);
+	}
+    }
+}
+
+static void
+vl_api_mpls_tunnel_details_t_handler (vl_api_mpls_fib_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+typedef struct mpls_tunnel_send_walk_ctx_t_
+{
+  unix_shared_memory_queue_t *q;
+  u32 index;
+  u32 context;
+} mpls_tunnel_send_walk_ctx_t;
+
+static void
+send_mpls_tunnel_entry (u32 mti, void *arg)
+{
+  mpls_tunnel_send_walk_ctx_t *ctx;
+  vl_api_mpls_tunnel_details_t *mp;
+  const mpls_tunnel_t *mt;
+  u32 nlabels;
+
+  ctx = arg;
+
+  if (~0 != ctx->index && mti != ctx->index)
+    return;
+
+  mt = mpls_tunnel_get (mti);
+  nlabels = vec_len (mt->mt_label_stack);
+
+  mp = vl_msg_api_alloc (sizeof (*mp) + nlabels * sizeof (u32));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_MPLS_TUNNEL_DETAILS);
+  mp->context = ctx->context;
+
+  mp->tunnel_index = ntohl (mti);
+  memcpy (mp->mt_next_hop_out_labels,
+	  mt->mt_label_stack, nlabels * sizeof (u32));
+
+  // FIXME
+
+  vl_msg_api_send_shmem (ctx->q, (u8 *) & mp);
+}
+
+static void
+vl_api_mpls_tunnel_dump_t_handler (vl_api_mpls_tunnel_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  mpls_tunnel_send_walk_ctx_t ctx = {
+    .q = q,
+    .index = ntohl (mp->tunnel_index),
+    .context = mp->context,
+  };
+  mpls_tunnel_walk (send_mpls_tunnel_entry, &ctx);
+}
+
+static void
+vl_api_mpls_fib_details_t_handler (vl_api_mpls_fib_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+vl_api_mpls_fib_details_t_endian (vl_api_mpls_fib_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+vl_api_mpls_fib_details_t_print (vl_api_mpls_fib_details_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+send_mpls_fib_details (vpe_api_main_t * am,
+		       unix_shared_memory_queue_t * q,
+		       u32 table_id, u32 label, u32 eos,
+		       fib_route_path_encode_t * api_rpaths, u32 context)
+{
+  vl_api_mpls_fib_details_t *mp;
+  fib_route_path_encode_t *api_rpath;
+  vl_api_fib_path2_t *fp;
+  int path_count;
+
+  path_count = vec_len (api_rpaths);
+  mp = vl_msg_api_alloc (sizeof (*mp) + path_count * sizeof (*fp));
+  if (!mp)
+    return;
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_MPLS_FIB_DETAILS);
+  mp->context = context;
+
+  mp->table_id = htonl (table_id);
+  mp->eos_bit = eos;
+  mp->label = htonl (label);
+
+  mp->count = htonl (path_count);
+  fp = mp->path;
+  vec_foreach (api_rpath, api_rpaths)
+  {
+    memset (fp, 0, sizeof (*fp));
+    fp->weight = htonl (api_rpath->rpath.frp_weight);
+    fp->sw_if_index = htonl (api_rpath->rpath.frp_sw_if_index);
+    copy_fib_next_hop (api_rpath, fp);
+    fp++;
+  }
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_mpls_fib_dump_t_handler (vl_api_mpls_fib_dump_t * mp)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+  unix_shared_memory_queue_t *q;
+  mpls_main_t *mm = &mpls_main;
+  fib_table_t *fib_table;
+  fib_node_index_t lfei, *lfeip, *lfeis = NULL;
+  mpls_label_t key;
+  fib_prefix_t pfx;
+  u32 fib_index;
+  fib_route_path_encode_t *api_rpaths;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  /* *INDENT-OFF* */
+  pool_foreach (fib_table, mm->fibs,
+  ({
+    hash_foreach(key, lfei, fib_table->mpls.mf_entries,
+    ({
+	vec_add1(lfeis, lfei);
+    }));
+  }));
+  vec_sort_with_function(lfeis, fib_entry_cmp_for_sort);
+
+  vec_foreach(lfeip, lfeis)
+  {
+    fib_entry_get_prefix(*lfeip, &pfx);
+    fib_index = fib_entry_get_fib_index(*lfeip);
+    fib_table = fib_table_get(fib_index, pfx.fp_proto);
+    api_rpaths = NULL;
+    fib_entry_encode(*lfeip, &api_rpaths);
+    send_mpls_fib_details (am, q,
+			   fib_table->ft_table_id,
+			   pfx.fp_label,
+			   pfx.fp_eos,
+                           api_rpaths,
+			   mp->context);
+    vec_free(api_rpaths);
+  }
+
+  vec_free (lfeis);
+}
+
+static void
+vl_api_classify_table_ids_t_handler (vl_api_classify_table_ids_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  vnet_classify_table_t *t;
+  u32 *table_ids = 0;
+  u32 count;
+
+  /* *INDENT-OFF* */
+  pool_foreach (t, cm->tables,
+  ({
+    vec_add1 (table_ids, ntohl(t - cm->tables));
+  }));
+  /* *INDENT-ON* */
+  count = vec_len (table_ids);
+
+  vl_api_classify_table_ids_reply_t *rmp;
+  rmp = vl_msg_api_alloc_as_if_client (sizeof (*rmp) + count * sizeof (u32));
+  rmp->_vl_msg_id = ntohs (VL_API_CLASSIFY_TABLE_IDS_REPLY);
+  rmp->context = mp->context;
+  rmp->count = ntohl (count);
+  clib_memcpy (rmp->ids, table_ids, count * sizeof (u32));
+  rmp->retval = 0;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+
+  vec_free (table_ids);
+}
+
+static void
+  vl_api_classify_table_by_interface_t_handler
+  (vl_api_classify_table_by_interface_t * mp)
+{
+  vl_api_classify_table_by_interface_reply_t *rmp;
+  int rv = 0;
+
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  u32 *acl = 0;
+
+  vec_validate (acl, INPUT_ACL_N_TABLES - 1);
+  vec_set (acl, ~0);
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  input_acl_main_t *am = &input_acl_main;
+
+  int if_idx;
+  u32 type;
+
+  for (type = 0; type < INPUT_ACL_N_TABLES; type++)
+    {
+      u32 *vec_tbl = am->classify_table_index_by_sw_if_index[type];
+      if (vec_len (vec_tbl))
+	{
+	  for (if_idx = 0; if_idx < vec_len (vec_tbl); if_idx++)
+	    {
+	      if (vec_elt (vec_tbl, if_idx) == ~0 || sw_if_index != if_idx)
+		{
+		  continue;
+		}
+	      acl[type] = vec_elt (vec_tbl, if_idx);
+	    }
+	}
+    }
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_CLASSIFY_TABLE_BY_INTERFACE_REPLY,
+  ({
+    rmp->sw_if_index = ntohl(sw_if_index);
+    rmp->l2_table_id = ntohl(acl[INPUT_ACL_TABLE_L2]);
+    rmp->ip4_table_id = ntohl(acl[INPUT_ACL_TABLE_IP4]);
+    rmp->ip6_table_id = ntohl(acl[INPUT_ACL_TABLE_IP6]);
+  }));
+  /* *INDENT-ON* */
+  vec_free (acl);
+}
+
+static void
+vl_api_classify_table_info_t_handler (vl_api_classify_table_info_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  vl_api_classify_table_info_reply_t *rmp = 0;
+
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  u32 table_id = ntohl (mp->table_id);
+  vnet_classify_table_t *t;
+
+  /* *INDENT-OFF* */
+  pool_foreach (t, cm->tables,
+  ({
+    if (table_id == t - cm->tables)
+      {
+        rmp = vl_msg_api_alloc_as_if_client
+          (sizeof (*rmp) + t->match_n_vectors * sizeof (u32x4));
+        rmp->_vl_msg_id = ntohs (VL_API_CLASSIFY_TABLE_INFO_REPLY);
+        rmp->context = mp->context;
+        rmp->table_id = ntohl(table_id);
+        rmp->nbuckets = ntohl(t->nbuckets);
+        rmp->match_n_vectors = ntohl(t->match_n_vectors);
+        rmp->skip_n_vectors = ntohl(t->skip_n_vectors);
+        rmp->active_sessions = ntohl(t->active_elements);
+        rmp->next_table_index = ntohl(t->next_table_index);
+        rmp->miss_next_index = ntohl(t->miss_next_index);
+        rmp->mask_length = ntohl(t->match_n_vectors * sizeof (u32x4));
+        clib_memcpy(rmp->mask, t->mask, t->match_n_vectors * sizeof(u32x4));
+        rmp->retval = 0;
+        break;
+      }
+  }));
+  /* *INDENT-ON* */
+
+  if (rmp == 0)
+    {
+      rmp = vl_msg_api_alloc (sizeof (*rmp));
+      rmp->_vl_msg_id = ntohs ((VL_API_CLASSIFY_TABLE_INFO_REPLY));
+      rmp->context = mp->context;
+      rmp->retval = ntohl (VNET_API_ERROR_CLASSIFY_TABLE_NOT_FOUND);
+    }
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t *
+					   mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+send_classify_session_details (unix_shared_memory_queue_t * q,
+			       u32 table_id,
+			       u32 match_length,
+			       vnet_classify_entry_t * e, u32 context)
+{
+  vl_api_classify_session_details_t *rmp;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_CLASSIFY_SESSION_DETAILS);
+  rmp->context = context;
+  rmp->table_id = ntohl (table_id);
+  rmp->hit_next_index = ntohl (e->next_index);
+  rmp->advance = ntohl (e->advance);
+  rmp->opaque_index = ntohl (e->opaque_index);
+  rmp->match_length = ntohl (match_length);
+  clib_memcpy (rmp->match, e->key, match_length);
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_classify_session_dump_t_handler (vl_api_classify_session_dump_t * mp)
+{
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  unix_shared_memory_queue_t *q;
+
+  u32 table_id = ntohl (mp->table_id);
+  vnet_classify_table_t *t;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (!q)
+    return;
+
+  /* *INDENT-OFF* */
+  pool_foreach (t, cm->tables,
+  ({
+    if (table_id == t - cm->tables)
+      {
+        vnet_classify_bucket_t * b;
+        vnet_classify_entry_t * v, * save_v;
+        int i, j, k;
+
+        for (i = 0; i < t->nbuckets; i++)
+          {
+            b = &t->buckets [i];
+            if (b->offset == 0)
+              continue;
+
+            save_v = vnet_classify_get_entry (t, b->offset);
+            for (j = 0; j < (1<<b->log2_pages); j++)
+              {
+                for (k = 0; k < t->entries_per_page; k++)
+                  {
+                    v = vnet_classify_entry_at_index
+                      (t, save_v, j*t->entries_per_page + k);
+                    if (vnet_classify_entry_is_free (v))
+                      continue;
+
+                    send_classify_session_details
+                      (q, table_id, t->match_n_vectors * sizeof (u32x4),
+                       v, mp->context);
+                  }
+              }
+          }
+        break;
+      }
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_set_ipfix_exporter_t_handler (vl_api_set_ipfix_exporter_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  flow_report_main_t *frm = &flow_report_main;
+  vl_api_set_ipfix_exporter_reply_t *rmp;
+  ip4_address_t collector, src;
+  u16 collector_port = UDP_DST_PORT_ipfix;
+  u32 path_mtu;
+  u32 template_interval;
+  u8 udp_checksum;
+  u32 fib_id;
+  u32 fib_index = ~0;
+  int rv = 0;
+
+  memcpy (collector.data, mp->collector_address, sizeof (collector.data));
+  collector_port = ntohs (mp->collector_port);
+  if (collector_port == (u16) ~ 0)
+    collector_port = UDP_DST_PORT_ipfix;
+  memcpy (src.data, mp->src_address, sizeof (src.data));
+  fib_id = ntohl (mp->vrf_id);
+
+  ip4_main_t *im = &ip4_main;
+  if (fib_id == ~0)
+    {
+      fib_index = ~0;
+    }
+  else
+    {
+      uword *p = hash_get (im->fib_index_by_table_id, fib_id);
+      if (!p)
+	{
+	  rv = VNET_API_ERROR_NO_SUCH_FIB;
+	  goto out;
+	}
+      fib_index = p[0];
+    }
+
+  path_mtu = ntohl (mp->path_mtu);
+  if (path_mtu == ~0)
+    path_mtu = 512;		// RFC 7011 section 10.3.3.
+  template_interval = ntohl (mp->template_interval);
+  if (template_interval == ~0)
+    template_interval = 20;
+  udp_checksum = mp->udp_checksum;
+
+  if (collector.as_u32 == 0)
+    {
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto out;
+    }
+
+  if (src.as_u32 == 0)
+    {
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto out;
+    }
+
+  if (path_mtu > 1450 /* vpp does not support fragmentation */ )
+    {
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto out;
+    }
+
+  if (path_mtu < 68)
+    {
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto out;
+    }
+
+  /* Reset report streams if we are reconfiguring IP addresses */
+  if (frm->ipfix_collector.as_u32 != collector.as_u32 ||
+      frm->src_address.as_u32 != src.as_u32 ||
+      frm->collector_port != collector_port)
+    vnet_flow_reports_reset (frm);
+
+  frm->ipfix_collector.as_u32 = collector.as_u32;
+  frm->collector_port = collector_port;
+  frm->src_address.as_u32 = src.as_u32;
+  frm->fib_index = fib_index;
+  frm->path_mtu = path_mtu;
+  frm->template_interval = template_interval;
+  frm->udp_checksum = udp_checksum;
+
+  /* Turn on the flow reporting process */
+  vlib_process_signal_event (vm, flow_report_process_node.index, 1, 0);
+
+out:
+  REPLY_MACRO (VL_API_SET_IPFIX_EXPORTER_REPLY);
+}
+
+static void
+vl_api_ipfix_exporter_dump_t_handler (vl_api_ipfix_exporter_dump_t * mp)
+{
+  flow_report_main_t *frm = &flow_report_main;
+  unix_shared_memory_queue_t *q;
+  vl_api_ipfix_exporter_details_t *rmp;
+  ip4_main_t *im = &ip4_main;
+  u32 vrf_id;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (!q)
+    return;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_IPFIX_EXPORTER_DETAILS);
+  rmp->context = mp->context;
+  memcpy (rmp->collector_address, frm->ipfix_collector.data,
+	  sizeof (frm->ipfix_collector.data));
+  rmp->collector_port = htons (frm->collector_port);
+  memcpy (rmp->src_address, frm->src_address.data,
+	  sizeof (frm->src_address.data));
+  if (frm->fib_index == ~0)
+    vrf_id = ~0;
+  else
+    vrf_id = im->fibs[frm->fib_index].ft_table_id;
+  rmp->vrf_id = htonl (vrf_id);
+  rmp->path_mtu = htonl (frm->path_mtu);
+  rmp->template_interval = htonl (frm->template_interval);
+  rmp->udp_checksum = (frm->udp_checksum != 0);
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+  vl_api_set_ipfix_classify_stream_t_handler
+  (vl_api_set_ipfix_classify_stream_t * mp)
+{
+  vl_api_set_ipfix_classify_stream_reply_t *rmp;
+  flow_report_classify_main_t *fcm = &flow_report_classify_main;
+  flow_report_main_t *frm = &flow_report_main;
+  u32 domain_id = 0;
+  u32 src_port = UDP_DST_PORT_ipfix;
+  int rv = 0;
+
+  domain_id = ntohl (mp->domain_id);
+  src_port = ntohs (mp->src_port);
+
+  if (fcm->src_port != 0 &&
+      (fcm->domain_id != domain_id || fcm->src_port != (u16) src_port))
+    {
+      int rv = vnet_stream_change (frm, fcm->domain_id, fcm->src_port,
+				   domain_id, (u16) src_port);
+      ASSERT (rv == 0);
+    }
+
+  fcm->domain_id = domain_id;
+  fcm->src_port = (u16) src_port;
+
+  REPLY_MACRO (VL_API_SET_IPFIX_CLASSIFY_STREAM_REPLY);
+}
+
+static void
+  vl_api_ipfix_classify_stream_dump_t_handler
+  (vl_api_ipfix_classify_stream_dump_t * mp)
+{
+  flow_report_classify_main_t *fcm = &flow_report_classify_main;
+  unix_shared_memory_queue_t *q;
+  vl_api_ipfix_classify_stream_details_t *rmp;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (!q)
+    return;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_IPFIX_CLASSIFY_STREAM_DETAILS);
+  rmp->context = mp->context;
+  rmp->domain_id = htonl (fcm->domain_id);
+  rmp->src_port = htons (fcm->src_port);
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+  vl_api_ipfix_classify_table_add_del_t_handler
+  (vl_api_ipfix_classify_table_add_del_t * mp)
+{
+  vl_api_ipfix_classify_table_add_del_reply_t *rmp;
+  flow_report_classify_main_t *fcm = &flow_report_classify_main;
+  flow_report_main_t *frm = &flow_report_main;
+  vnet_flow_report_add_del_args_t args;
+  ipfix_classify_table_t *table;
+  int is_add;
+  u32 classify_table_index;
+  u8 ip_version;
+  u8 transport_protocol;
+  int rv = 0;
+
+  classify_table_index = ntohl (mp->table_id);
+  ip_version = mp->ip_version;
+  transport_protocol = mp->transport_protocol;
+  is_add = mp->is_add;
+
+  if (fcm->src_port == 0)
+    {
+      /* call set_ipfix_classify_stream first */
+      rv = VNET_API_ERROR_UNSPECIFIED;
+      goto out;
+    }
+
+  memset (&args, 0, sizeof (args));
+
+  table = 0;
+  int i;
+  for (i = 0; i < vec_len (fcm->tables); i++)
+    if (ipfix_classify_table_index_valid (i))
+      if (fcm->tables[i].classify_table_index == classify_table_index)
+	{
+	  table = &fcm->tables[i];
+	  break;
+	}
+
+  if (is_add)
+    {
+      if (table)
+	{
+	  rv = VNET_API_ERROR_VALUE_EXIST;
+	  goto out;
+	}
+      table = ipfix_classify_add_table ();
+      table->classify_table_index = classify_table_index;
+    }
+  else
+    {
+      if (!table)
+	{
+	  rv = VNET_API_ERROR_NO_SUCH_ENTRY;
+	  goto out;
+	}
+    }
+
+  table->ip_version = ip_version;
+  table->transport_protocol = transport_protocol;
+
+  args.opaque.as_uword = table - fcm->tables;
+  args.rewrite_callback = ipfix_classify_template_rewrite;
+  args.flow_data_callback = ipfix_classify_send_flows;
+  args.is_add = is_add;
+  args.domain_id = fcm->domain_id;
+  args.src_port = fcm->src_port;
+
+  rv = vnet_flow_report_add_del (frm, &args);
+
+  /* If deleting, or add failed */
+  if (is_add == 0 || (rv && is_add))
+    ipfix_classify_delete_table (table - fcm->tables);
+
+out:
+  REPLY_MACRO (VL_API_SET_IPFIX_CLASSIFY_STREAM_REPLY);
+}
+
+static void
+send_ipfix_classify_table_details (u32 table_index,
+				   unix_shared_memory_queue_t * q,
+				   u32 context)
+{
+  flow_report_classify_main_t *fcm = &flow_report_classify_main;
+  vl_api_ipfix_classify_table_details_t *mp;
+
+  ipfix_classify_table_t *table = &fcm->tables[table_index];
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_IPFIX_CLASSIFY_TABLE_DETAILS);
+  mp->context = context;
+  mp->table_id = htonl (table->classify_table_index);
+  mp->ip_version = table->ip_version;
+  mp->transport_protocol = table->transport_protocol;
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+  vl_api_ipfix_classify_table_dump_t_handler
+  (vl_api_ipfix_classify_table_dump_t * mp)
+{
+  flow_report_classify_main_t *fcm = &flow_report_classify_main;
+  unix_shared_memory_queue_t *q;
+  u32 i;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (!q)
+    return;
+
+  for (i = 0; i < vec_len (fcm->tables); i++)
+    if (ipfix_classify_table_index_valid (i))
+      send_ipfix_classify_table_details (i, q, mp->context);
+}
+
+static void
+vl_api_pg_create_interface_t_handler (vl_api_pg_create_interface_t * mp)
+{
+  vl_api_pg_create_interface_reply_t *rmp;
+  int rv = 0;
+
+  pg_main_t *pg = &pg_main;
+  u32 pg_if_id = pg_interface_add_or_get (pg, ntohl (mp->interface_id));
+  pg_interface_t *pi = pool_elt_at_index (pg->interfaces, pg_if_id);
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_PG_CREATE_INTERFACE_REPLY,
+  ({
+    rmp->sw_if_index = ntohl(pi->sw_if_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_pg_capture_t_handler (vl_api_pg_capture_t * mp)
+{
+  vl_api_pg_capture_reply_t *rmp;
+  int rv = 0;
+
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_hw_interface_t *hi = 0;
+
+  u8 *intf_name = format (0, "pg%d", ntohl (mp->interface_id), 0);
+  u32 hw_if_index = ~0;
+  uword *p = hash_get_mem (im->hw_interface_by_name, intf_name);
+  if (p)
+    hw_if_index = *p;
+  vec_free (intf_name);
+
+  if (hw_if_index != ~0)
+    {
+      pg_capture_args_t _a, *a = &_a;
+
+      u32 len = ntohl (mp->pcap_name_length);
+      u8 *pcap_file_name = vec_new (u8, len);
+      clib_memcpy (pcap_file_name, mp->pcap_file_name, len);
+
+      hi = vnet_get_sup_hw_interface (vnm, hw_if_index);
+      a->hw_if_index = hw_if_index;
+      a->dev_instance = hi->dev_instance;
+      a->is_enabled = mp->is_enabled;
+      a->pcap_file_name = pcap_file_name;
+      a->count = ntohl (mp->count);
+
+      clib_error_t *e = pg_capture (a);
+      if (e)
+	{
+	  clib_error_report (e);
+	  rv = VNET_API_ERROR_CANNOT_CREATE_PCAP_FILE;
+	}
+
+      vec_free (pcap_file_name);
+    }
+  REPLY_MACRO (VL_API_PG_CAPTURE_REPLY);
+}
+
+static void
+vl_api_pg_enable_disable_t_handler (vl_api_pg_enable_disable_t * mp)
+{
+  vl_api_pg_enable_disable_reply_t *rmp;
+  int rv = 0;
+
+  pg_main_t *pg = &pg_main;
+  u32 stream_index = ~0;
+
+  int is_enable = mp->is_enabled != 0;
+  u32 len = ntohl (mp->stream_name_length) - 1;
+
+  if (len > 0)
+    {
+      u8 *stream_name = vec_new (u8, len);
+      clib_memcpy (stream_name, mp->stream_name, len);
+      uword *p = hash_get_mem (pg->stream_index_by_name, stream_name);
+      if (p)
+	stream_index = *p;
+      vec_free (stream_name);
+    }
+
+  pg_enable_disable (stream_index, is_enable);
+
+  REPLY_MACRO (VL_API_PG_ENABLE_DISABLE_REPLY);
+}
+
+static void
+  vl_api_ip_source_and_port_range_check_add_del_t_handler
+  (vl_api_ip_source_and_port_range_check_add_del_t * mp)
+{
+  vl_api_ip_source_and_port_range_check_add_del_reply_t *rmp;
+  int rv = 0;
+
+  u8 is_ipv6 = mp->is_ipv6;
+  u8 is_add = mp->is_add;
+  u8 mask_length = mp->mask_length;
+  ip4_address_t ip4_addr;
+  ip6_address_t ip6_addr;
+  u16 *low_ports = 0;
+  u16 *high_ports = 0;
+  u32 vrf_id;
+  u16 tmp_low, tmp_high;
+  u8 num_ranges;
+  int i;
+
+  // Validate port range
+  num_ranges = mp->number_of_ranges;
+  if (num_ranges > 32)
+    {				// This is size of array in VPE.API
+      rv = VNET_API_ERROR_EXCEEDED_NUMBER_OF_RANGES_CAPACITY;
+      goto reply;
+    }
+
+  vec_reset_length (low_ports);
+  vec_reset_length (high_ports);
+
+  for (i = 0; i < num_ranges; i++)
+    {
+      tmp_low = mp->low_ports[i];
+      tmp_high = mp->high_ports[i];
+      // If tmp_low <= tmp_high then only need to check tmp_low = 0
+      // If tmp_low <= tmp_high then only need to check tmp_high > 65535
+      if (tmp_low > tmp_high || tmp_low == 0 || tmp_high > 65535)
+	{
+	  rv = VNET_API_ERROR_INVALID_VALUE;
+	  goto reply;
+	}
+      vec_add1 (low_ports, tmp_low);
+      vec_add1 (high_ports, tmp_high + 1);
+    }
+
+  // Validate mask_length
+  if ((is_ipv6 && mask_length > 128) || (!is_ipv6 && mask_length > 32))
+    {
+      rv = VNET_API_ERROR_ADDRESS_LENGTH_MISMATCH;
+      goto reply;
+    }
+
+  vrf_id = ntohl (mp->vrf_id);
+
+  if (vrf_id < 1)
+    {
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto reply;
+    }
+
+
+  if (is_ipv6)
+    {
+      clib_memcpy (ip6_addr.as_u8, mp->address, sizeof (ip6_addr.as_u8));
+      rv = ip6_source_and_port_range_check_add_del (&ip6_addr,
+						    mask_length,
+						    vrf_id,
+						    low_ports,
+						    high_ports, is_add);
+    }
+  else
+    {
+      clib_memcpy (ip4_addr.data, mp->address, sizeof (ip4_addr));
+      rv = ip4_source_and_port_range_check_add_del (&ip4_addr,
+						    mask_length,
+						    vrf_id,
+						    low_ports,
+						    high_ports, is_add);
+    }
+
+reply:
+  vec_free (low_ports);
+  vec_free (high_ports);
+  REPLY_MACRO (VL_API_IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL_REPLY);
+}
+
+static void
+  vl_api_ip_source_and_port_range_check_interface_add_del_t_handler
+  (vl_api_ip_source_and_port_range_check_interface_add_del_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_ip_source_and_port_range_check_interface_add_del_reply_t *rmp;
+  ip4_main_t *im = &ip4_main;
+  int rv;
+  u32 sw_if_index;
+  u32 fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS];
+  u32 vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS];
+  uword *p = 0;
+  int i;
+
+  vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT] =
+    ntohl (mp->tcp_out_vrf_id);
+  vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT] =
+    ntohl (mp->udp_out_vrf_id);
+  vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN] =
+    ntohl (mp->tcp_in_vrf_id);
+  vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN] =
+    ntohl (mp->udp_in_vrf_id);
+
+
+  for (i = 0; i < IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS; i++)
+    {
+      if (vrf_id[i] != 0 && vrf_id[i] != ~0)
+	{
+	  p = hash_get (im->fib_index_by_table_id, vrf_id[i]);
+
+	  if (p == 0)
+	    {
+	      rv = VNET_API_ERROR_INVALID_VALUE;
+	      goto reply;
+	    }
+
+	  fib_index[i] = p[0];
+	}
+      else
+	fib_index[i] = ~0;
+    }
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  rv =
+    set_ip_source_and_port_range_check (vm, fib_index, sw_if_index,
+					mp->is_add);
+
+  BAD_SW_IF_INDEX_LABEL;
+reply:
+
+  REPLY_MACRO (VL_API_IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL_REPLY);
+}
+
+static void
+vl_api_delete_subif_t_handler (vl_api_delete_subif_t * mp)
+{
+  vl_api_delete_subif_reply_t *rmp;
+  int rv;
+
+  rv = vnet_delete_sub_interface (ntohl (mp->sw_if_index));
+
+  REPLY_MACRO (VL_API_DELETE_SUBIF_REPLY);
+}
+
+static void
+  vl_api_l2_interface_pbb_tag_rewrite_t_handler
+  (vl_api_l2_interface_pbb_tag_rewrite_t * mp)
+{
+  vl_api_l2_interface_pbb_tag_rewrite_reply_t *rmp;
+  vnet_main_t *vnm = vnet_get_main ();
+  vlib_main_t *vm = vlib_get_main ();
+  u32 vtr_op;
+  int rv = 0;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  vtr_op = ntohl (mp->vtr_op);
+
+  switch (vtr_op)
+    {
+    case L2_VTR_DISABLED:
+    case L2_VTR_PUSH_2:
+    case L2_VTR_POP_2:
+    case L2_VTR_TRANSLATE_2_1:
+      break;
+
+    default:
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto bad_sw_if_index;
+    }
+
+  rv = l2pbb_configure (vm, vnm, ntohl (mp->sw_if_index), vtr_op,
+			mp->b_dmac, mp->b_smac, ntohs (mp->b_vlanid),
+			ntohl (mp->i_sid), ntohs (mp->outer_tag));
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_L2_INTERFACE_PBB_TAG_REWRITE_REPLY);
+
+}
+
+static void
+vl_api_punt_t_handler (vl_api_punt_t * mp)
+{
+  vl_api_punt_reply_t *rmp;
+  vlib_main_t *vm = vlib_get_main ();
+  int rv = 0;
+  clib_error_t *error;
+
+  error = vnet_punt_add_del (vm, mp->ipv, mp->l4_protocol,
+			     ntohs (mp->l4_port), mp->is_add);
+  if (error)
+    {
+      rv = -1;
+      clib_error_report (error);
+    }
+
+  REPLY_MACRO (VL_API_PUNT_REPLY);
+}
+
+static void
+  vl_api_flow_classify_set_interface_t_handler
+  (vl_api_flow_classify_set_interface_t * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_flow_classify_set_interface_reply_t *rmp;
+  int rv;
+  u32 sw_if_index, ip4_table_index, ip6_table_index;
+
+  ip4_table_index = ntohl (mp->ip4_table_index);
+  ip6_table_index = ntohl (mp->ip6_table_index);
+  sw_if_index = ntohl (mp->sw_if_index);
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  rv = vnet_set_flow_classify_intfc (vm, sw_if_index, ip4_table_index,
+				     ip6_table_index, mp->is_add);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_FLOW_CLASSIFY_SET_INTERFACE_REPLY);
+}
+
+static void
+send_flow_classify_details (u32 sw_if_index,
+			    u32 table_index,
+			    unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_flow_classify_details_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_FLOW_CLASSIFY_DETAILS);
+  mp->context = context;
+  mp->sw_if_index = htonl (sw_if_index);
+  mp->table_index = htonl (table_index);
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_flow_classify_dump_t_handler (vl_api_flow_classify_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  flow_classify_main_t *pcm = &flow_classify_main;
+  u32 *vec_tbl;
+  int i;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  vec_tbl = pcm->classify_table_index_by_sw_if_index[mp->type];
+
+  if (vec_len (vec_tbl))
+    {
+      for (i = 0; i < vec_len (vec_tbl); i++)
+	{
+	  if (vec_elt (vec_tbl, i) == ~0)
+	    continue;
+
+	  send_flow_classify_details (i, vec_elt (vec_tbl, i), q,
+				      mp->context);
+	}
+    }
+}
+
+static void
+vl_api_feature_enable_disable_t_handler (vl_api_feature_enable_disable_t * mp)
+{
+  vl_api_feature_enable_disable_reply_t *rmp;
+  int rv = 0;
+  u8 *arc_name, *feature_name;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  arc_name = format (0, "%s%c", mp->arc_name, 0);
+  feature_name = format (0, "%s%c", mp->feature_name, 0);
+
+  vnet_feature_registration_t *reg;
+  reg =
+    vnet_get_feature_reg ((const char *) arc_name,
+			  (const char *) feature_name);
+  if (reg == 0)
+    rv = VNET_API_ERROR_INVALID_VALUE;
+  else
+    {
+      u32 sw_if_index;
+      clib_error_t *error = 0;
+
+      sw_if_index = ntohl (mp->sw_if_index);
+      if (reg->enable_disable_cb)
+	error = reg->enable_disable_cb (sw_if_index, mp->enable);
+      if (!error)
+	vnet_feature_enable_disable ((const char *) arc_name,
+				     (const char *) feature_name,
+				     sw_if_index, mp->enable, 0, 0);
+      else
+	{
+	  clib_error_report (error);
+	  rv = VNET_API_ERROR_CANNOT_ENABLE_DISABLE_FEATURE;
+	}
+    }
+
+  vec_free (feature_name);
+  vec_free (arc_name);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_FEATURE_ENABLE_DISABLE_REPLY);
+}
+
+#define BOUNCE_HANDLER(nn)                                              \
+static void vl_api_##nn##_t_handler (                                   \
+    vl_api_##nn##_t *mp)                                                \
+{                                                                       \
+    vpe_client_registration_t *reg;                                     \
+    vpe_api_main_t * vam = &vpe_api_main;                               \
+    unix_shared_memory_queue_t * q;                                     \
+                                                                        \
+    /* One registration only... */                                      \
+    pool_foreach(reg, vam->nn##_registrations,                          \
+    ({                                                                  \
+        q = vl_api_client_index_to_input_queue (reg->client_index);     \
+        if (q) {                                                        \
+            /*                                                          \
+             * If the queue is stuffed, turf the msg and complain       \
+             * It's unlikely that the intended recipient is             \
+             * alive; avoid deadlock at all costs.                      \
+             */                                                         \
+            if (q->cursize == q->maxsize) {                             \
+                clib_warning ("ERROR: receiver queue full, drop msg");  \
+                vl_msg_api_free (mp);                                   \
+                return;                                                 \
+            }                                                           \
+            vl_msg_api_send_shmem (q, (u8 *)&mp);                       \
+            return;                                                     \
+        }                                                               \
+    }));                                                                \
+    vl_msg_api_free (mp);                                               \
+}
+
+static void setup_message_id_table (api_main_t * am);
+
+/*
+ * vpe_api_hookup
+ * Add vpe's API message handlers to the table.
+ * vlib has alread mapped shared memory and
+ * added the client registration handlers.
+ * See .../open-repo/vlib/memclnt_vlib.c:memclnt_process()
+ */
+static clib_error_t *
+vpe_api_hookup (vlib_main_t * vm)
+{
+  api_main_t *am = &api_main;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_msg;
+#undef _
+
+  /*
+   * Manually register the sr tunnel add del msg, so we trace
+   * enough bytes to capture a typical segment list
+   */
+  vl_msg_api_set_handlers (VL_API_SR_TUNNEL_ADD_DEL,
+			   "sr_tunnel_add_del",
+			   vl_api_sr_tunnel_add_del_t_handler,
+			   vl_noop_handler,
+			   vl_api_sr_tunnel_add_del_t_endian,
+			   vl_api_sr_tunnel_add_del_t_print, 256, 1);
+
+
+  /*
+   * Manually register the sr policy add del msg, so we trace
+   * enough bytes to capture a typical tunnel name list
+   */
+  vl_msg_api_set_handlers (VL_API_SR_POLICY_ADD_DEL,
+			   "sr_policy_add_del",
+			   vl_api_sr_policy_add_del_t_handler,
+			   vl_noop_handler,
+			   vl_api_sr_policy_add_del_t_endian,
+			   vl_api_sr_policy_add_del_t_print, 256, 1);
+
+  /*
+   * Trace space for 8 MPLS encap labels, classifier mask+match
+   */
+  am->api_trace_cfg[VL_API_MPLS_TUNNEL_ADD_DEL].size += 8 * sizeof (u32);
+  am->api_trace_cfg[VL_API_CLASSIFY_ADD_DEL_TABLE].size += 5 * sizeof (u32x4);
+  am->api_trace_cfg[VL_API_CLASSIFY_ADD_DEL_SESSION].size
+    += 5 * sizeof (u32x4);
+  am->api_trace_cfg[VL_API_VXLAN_ADD_DEL_TUNNEL].size += 16 * sizeof (u32);
+
+  /*
+   * Thread-safe API messages
+   */
+  am->is_mp_safe[VL_API_IP_ADD_DEL_ROUTE] = 1;
+  am->is_mp_safe[VL_API_GET_NODE_GRAPH] = 1;
+
+  /*
+   * Set up the (msg_name, crc, message-id) table
+   */
+  setup_message_id_table (am);
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (vpe_api_hookup);
+
+static clib_error_t *
+vpe_api_init (vlib_main_t * vm)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+
+  am->vlib_main = vm;
+  am->vnet_main = vnet_get_main ();
+  am->interface_events_registration_hash = hash_create (0, sizeof (uword));
+  am->to_netconf_server_registration_hash = hash_create (0, sizeof (uword));
+  am->from_netconf_server_registration_hash = hash_create (0, sizeof (uword));
+  am->to_netconf_client_registration_hash = hash_create (0, sizeof (uword));
+  am->from_netconf_client_registration_hash = hash_create (0, sizeof (uword));
+  am->oam_events_registration_hash = hash_create (0, sizeof (uword));
+  am->bfd_events_registration_hash = hash_create (0, sizeof (uword));
+
+  vl_api_init (vm);
+  vl_set_memory_region_name ("/vpe-api");
+  vl_enable_disable_memory_api (vm, 1 /* enable it */ );
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (vpe_api_init);
+
+
+static clib_error_t *
+api_segment_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  u8 *chroot_path;
+  u64 baseva, size, pvt_heap_size;
+  int uid, gid, rv;
+  const int max_buf_size = 4096;
+  char *s, *buf;
+  struct passwd _pw, *pw;
+  struct group _grp, *grp;
+  clib_error_t *e;
+  buf = vec_new (char, 128);
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "prefix %s", &chroot_path))
+	{
+	  vec_add1 (chroot_path, 0);
+	  vl_set_memory_root_path ((char *) chroot_path);
+	}
+      else if (unformat (input, "uid %d", &uid))
+	vl_set_memory_uid (uid);
+      else if (unformat (input, "gid %d", &gid))
+	vl_set_memory_gid (gid);
+      else if (unformat (input, "baseva %llx", &baseva))
+	vl_set_global_memory_baseva (baseva);
+      else if (unformat (input, "global-size %lldM", &size))
+	vl_set_global_memory_size (size * (1ULL << 20));
+      else if (unformat (input, "global-size %lldG", &size))
+	vl_set_global_memory_size (size * (1ULL << 30));
+      else if (unformat (input, "global-size %lld", &size))
+	vl_set_global_memory_size (size);
+      else if (unformat (input, "global-pvt-heap-size %lldM", &pvt_heap_size))
+	vl_set_global_pvt_heap_size (pvt_heap_size * (1ULL << 20));
+      else if (unformat (input, "global-pvt-heap-size size %lld",
+			 &pvt_heap_size))
+	vl_set_global_pvt_heap_size (pvt_heap_size);
+      else if (unformat (input, "api-pvt-heap-size %lldM", &pvt_heap_size))
+	vl_set_api_pvt_heap_size (pvt_heap_size * (1ULL << 20));
+      else if (unformat (input, "api-pvt-heap-size size %lld",
+			 &pvt_heap_size))
+	vl_set_api_pvt_heap_size (pvt_heap_size);
+      else if (unformat (input, "api-size %lldM", &size))
+	vl_set_api_memory_size (size * (1ULL << 20));
+      else if (unformat (input, "api-size %lldG", &size))
+	vl_set_api_memory_size (size * (1ULL << 30));
+      else if (unformat (input, "api-size %lld", &size))
+	vl_set_api_memory_size (size);
+      else if (unformat (input, "uid %s", &s))
+	{
+	  /* lookup the username */
+	  pw = NULL;
+	  while (((rv =
+		   getpwnam_r (s, &_pw, buf, vec_len (buf), &pw)) == ERANGE)
+		 && (vec_len (buf) <= max_buf_size))
+	    {
+	      vec_resize (buf, vec_len (buf) * 2);
+	    }
+	  if (rv < 0)
+	    {
+	      e = clib_error_return_code (0, rv,
+					  CLIB_ERROR_ERRNO_VALID |
+					  CLIB_ERROR_FATAL,
+					  "cannot fetch username %s", s);
+	      vec_free (s);
+	      vec_free (buf);
+	      return e;
+	    }
+	  if (pw == NULL)
+	    {
+	      e =
+		clib_error_return_fatal (0, "username %s does not exist", s);
+	      vec_free (s);
+	      vec_free (buf);
+	      return e;
+	    }
+	  vec_free (s);
+	  vl_set_memory_uid (pw->pw_uid);
+	}
+      else if (unformat (input, "gid %s", &s))
+	{
+	  /* lookup the group name */
+	  grp = NULL;
+	  while (((rv =
+		   getgrnam_r (s, &_grp, buf, vec_len (buf), &grp)) == ERANGE)
+		 && (vec_len (buf) <= max_buf_size))
+	    {
+	      vec_resize (buf, vec_len (buf) * 2);
+	    }
+	  if (rv != 0)
+	    {
+	      e = clib_error_return_code (0, rv,
+					  CLIB_ERROR_ERRNO_VALID |
+					  CLIB_ERROR_FATAL,
+					  "cannot fetch group %s", s);
+	      vec_free (s);
+	      vec_free (buf);
+	      return e;
+	    }
+	  if (grp == NULL)
+	    {
+	      e = clib_error_return_fatal (0, "group %s does not exist", s);
+	      vec_free (s);
+	      vec_free (buf);
+	      return e;
+	    }
+	  vec_free (s);
+	  vec_free (buf);
+	  vl_set_memory_gid (grp->gr_gid);
+	}
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  return 0;
+}
+
+VLIB_EARLY_CONFIG_FUNCTION (api_segment_config, "api-segment");
+
+void *
+get_unformat_vnet_sw_interface (void)
+{
+  return (void *) &unformat_vnet_sw_interface;
+}
+
+static u8 *
+format_arp_event (u8 * s, va_list * args)
+{
+  vl_api_ip4_arp_event_t *event = va_arg (*args, vl_api_ip4_arp_event_t *);
+
+  s = format (s, "pid %d: ", event->pid);
+  if (event->mac_ip)
+    s = format (s, "bd mac/ip4 binding events");
+  else
+    s = format (s, "resolution for %U", format_ip4_address, &event->address);
+  return s;
+}
+
+static u8 *
+format_nd_event (u8 * s, va_list * args)
+{
+  vl_api_ip6_nd_event_t *event = va_arg (*args, vl_api_ip6_nd_event_t *);
+
+  s = format (s, "pid %d: ", event->pid);
+  if (event->mac_ip)
+    s = format (s, "bd mac/ip6 binding events");
+  else
+    s = format (s, "resolution for %U", format_ip6_address, event->address);
+  return s;
+}
+
+static clib_error_t *
+show_ip_arp_nd_events_fn (vlib_main_t * vm,
+			  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vpe_api_main_t *am = &vpe_api_main;
+  vl_api_ip4_arp_event_t *arp_event;
+  vl_api_ip6_nd_event_t *nd_event;
+
+  if ((pool_elts (am->arp_events) == 0) && (pool_elts (am->nd_events) == 0))
+    {
+      vlib_cli_output (vm, "No active arp or nd event registrations");
+      return 0;
+    }
+
+  /* *INDENT-OFF* */
+  pool_foreach (arp_event, am->arp_events,
+  ({
+    vlib_cli_output (vm, "%U", format_arp_event, arp_event);
+  }));
+
+  pool_foreach (nd_event, am->nd_events,
+  ({
+    vlib_cli_output (vm, "%U", format_nd_event, nd_event);
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_ip_arp_nd_events, static) = {
+  .path = "show arp-nd-event registrations",
+  .function = show_ip_arp_nd_events_fn,
+  .short_help = "Show ip4 arp and ip6 nd event registrations",
+};
+/* *INDENT-ON* */
+
+#define vl_msg_name_crc_list
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (api_main_t * am)
+{
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+  foreach_vl_msg_name_crc_memclnt;
+  foreach_vl_msg_name_crc_vpe;
+#undef _
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/api/api_format.c b/src/vpp/api/api_format.c
new file mode 120000
index 00000000..cec72cc0
--- /dev/null
+++ b/src/vpp/api/api_format.c
@@ -0,0 +1 @@
+../../vat/api_format.c
\ No newline at end of file
diff --git a/src/vpp/api/api_main.c b/src/vpp/api/api_main.c
new file mode 100644
index 00000000..db532061
--- /dev/null
+++ b/src/vpp/api/api_main.c
@@ -0,0 +1,192 @@
+#include "vat.h"
+
+vat_main_t vat_main;
+
+void
+vat_suspend (vlib_main_t * vm, f64 interval)
+{
+  vlib_process_suspend (vm, interval);
+}
+
+static u8 *
+format_api_error (u8 * s, va_list * args)
+{
+  vat_main_t *vam = va_arg (*args, vat_main_t *);
+  i32 error = va_arg (*args, u32);
+  uword *p;
+
+  p = hash_get (vam->error_string_by_error_number, -error);
+
+  if (p)
+    s = format (s, "%s", p[0]);
+  else
+    s = format (s, "%d", error);
+  return s;
+}
+
+
+static void
+init_error_string_table (vat_main_t * vam)
+{
+
+  vam->error_string_by_error_number = hash_create (0, sizeof (uword));
+
+#define _(n,v,s) hash_set (vam->error_string_by_error_number, -v, s);
+  foreach_vnet_api_error;
+#undef _
+
+  hash_set (vam->error_string_by_error_number, 99, "Misc");
+}
+
+static clib_error_t *
+api_main_init (vlib_main_t * vm)
+{
+  vat_main_t *vam = &vat_main;
+
+  vam->vlib_main = vm;
+  vam->my_client_index = (u32) ~ 0;
+  init_error_string_table (vam);
+  vat_api_hookup (vam);
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (api_main_init);
+
+static clib_error_t *
+api_command_fn (vlib_main_t * vm,
+		unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vat_main_t *vam = &vat_main;
+  unformat_input_t _input;
+  uword c;
+  u8 *cmdp, *argsp, *this_cmd;
+  uword *p;
+  u32 arg_len;
+  int rv;
+  int (*fp) (vat_main_t *);
+  api_main_t *am = &api_main;
+
+  vam->vl_input_queue = am->shmem_hdr->vl_input_queue;
+
+  vec_reset_length (vam->inbuf);
+  vam->input = &_input;
+
+  while (((c = unformat_get_input (input)) != '\n') &&
+	 (c != UNFORMAT_END_OF_INPUT))
+    vec_add1 (vam->inbuf, c);
+
+  /* Add 1 octet's worth of extra space in case there are no args... */
+  vec_add1 (vam->inbuf, 0);
+
+  /*$$$$ reinstall macro evaluator */
+
+  /* Split input into cmd + args */
+  this_cmd = cmdp = vam->inbuf;
+
+  while (cmdp < (this_cmd + vec_len (this_cmd)))
+    {
+      if (*cmdp == ' ' || *cmdp == '\t' || *cmdp == '\n')
+	{
+	  cmdp++;
+	}
+      else
+	break;
+    }
+
+  argsp = cmdp;
+  while (argsp < (this_cmd + vec_len (this_cmd)))
+    {
+      if (*argsp != ' ' && *argsp != '\t' && *argsp != '\n')
+	{
+	  argsp++;
+	}
+      else
+	break;
+    }
+  *argsp++ = 0;
+
+  while (argsp < (this_cmd + vec_len (this_cmd)))
+    {
+      if (*argsp == ' ' || *argsp == '\t' || *argsp == '\n')
+	{
+	  argsp++;
+	}
+      else
+	break;
+    }
+
+  /* Blank input line? */
+  if (*cmdp == 0)
+    return 0;
+
+  p = hash_get_mem (vam->function_by_name, cmdp);
+  if (p == 0)
+    {
+      return clib_error_return (0, "'%s': function not found\n", cmdp);
+    }
+
+  arg_len = strlen ((char *) argsp);
+
+  unformat_init_string (vam->input, (char *) argsp, arg_len);
+  fp = (void *) p[0];
+
+  rv = (*fp) (vam);
+
+  if (rv < 0)
+    {
+      unformat_free (vam->input);
+      return clib_error_return (0,
+				"%s error: %U\n", cmdp,
+				format_api_error, vam, rv);
+
+      if (vam->regenerate_interface_table)
+	{
+	  vam->regenerate_interface_table = 0;
+	  api_sw_interface_dump (vam);
+	}
+    }
+  unformat_free (vam->input);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (api_command, static) =
+{
+  .path = "binary-api",
+  .short_help = "binary-api <name> [<args>]",
+  .function = api_command_fn,
+};
+/* *INDENT-ON* */
+
+void
+api_cli_output (void *notused, const char *fmt, ...)
+{
+  va_list va;
+  vat_main_t *vam = &vat_main;
+  vlib_main_t *vm = vam->vlib_main;
+  vlib_process_t *cp = vlib_get_current_process (vm);
+  u8 *s;
+
+  va_start (va, fmt);
+  s = va_format (0, fmt, &va);
+  va_end (va);
+
+  /* Terminate with \n if not present. */
+  if (vec_len (s) > 0 && s[vec_len (s) - 1] != '\n')
+    vec_add1 (s, '\n');
+
+  if ((!cp) || (!cp->output_function))
+    fformat (stdout, "%v", s);
+  else
+    cp->output_function (cp->output_function_arg, s, vec_len (s));
+
+  vec_free (s);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c
new file mode 100644
index 00000000..1964533e
--- /dev/null
+++ b/src/vpp/api/custom_dump.c
@@ -0,0 +1,3139 @@
+/*
+ *------------------------------------------------------------------
+ * custom_dump.c - pretty-print API messages for replay
+ *
+ * Copyright (c) 2014-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/unix/tuntap.h>
+#include <vnet/mpls/mpls.h>
+#include <vnet/dhcp/proxy.h>
+#include <vnet/dhcpv6/proxy.h>
+#include <vnet/l2tp/l2tp.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/sr/sr_packet.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <vnet/classify/policer_classify.h>
+#include <vnet/policer/xlate.h>
+#include <vnet/policer/policer.h>
+#include <vnet/classify/flow_classify.h>
+#include <vlib/vlib.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/ethernet/ethernet.h>
+#include <vnet/l2/l2_vtr.h>
+
+#include <vpp/api/vpe_msg_enum.h>
+
+#define vl_typedefs		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_endianfun
+
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+
+#define FINISH                                  \
+    vec_add1 (s, 0);                            \
+    vl_print (handle, (char *)s);               \
+    vec_free (s);                               \
+    return handle;
+
+
+static void *vl_api_create_loopback_t_print
+  (vl_api_create_loopback_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: create_loopback ");
+  s = format (s, "mac %U ", format_ethernet_address, &mp->mac_address);
+
+  FINISH;
+}
+
+static void *vl_api_delete_loopback_t_print
+  (vl_api_delete_loopback_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: delete_loopback ");
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_set_flags_t_print
+  (vl_api_sw_interface_set_flags_t * mp, void *handle)
+{
+  u8 *s;
+  s = format (0, "SCRIPT: sw_interface_set_flags ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  if (mp->admin_up_down)
+    s = format (s, "admin-up ");
+  else
+    s = format (s, "admin-down ");
+
+  if (mp->link_up_down)
+    s = format (s, "link-up");
+  else
+    s = format (s, "link-down");
+
+  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);
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+  if (mp->del_all)
+    s = format (s, "del-all ");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_set_table_t_print
+  (vl_api_sw_interface_set_table_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_set_table ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  if (mp->vrf_id)
+    s = format (s, "vrf %d ", ntohl (mp->vrf_id));
+
+  if (mp->is_ipv6)
+    s = format (s, "ipv6 ");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_set_mpls_enable_t_print
+  (vl_api_sw_interface_set_mpls_enable_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_set_mpls_enable ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  if (mp->enable == 0)
+    s = format (s, "disable");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_set_vpath_t_print
+  (vl_api_sw_interface_set_vpath_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_set_vpath ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  if (mp->enable)
+    s = format (s, "enable ");
+  else
+    s = format (s, "disable ");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_set_vxlan_bypass_t_print
+  (vl_api_sw_interface_set_vxlan_bypass_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_set_vxlan_bypass ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  if (mp->is_ipv6)
+    s = format (s, "ip6");
+
+  if (mp->enable)
+    s = format (s, "enable ");
+  else
+    s = format (s, "disable ");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_set_l2_xconnect_t_print
+  (vl_api_sw_interface_set_l2_xconnect_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_set_l2_xconnect ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->rx_sw_if_index));
+
+  if (mp->enable)
+    {
+      s = format (s, "tx_sw_if_index %d ", ntohl (mp->tx_sw_if_index));
+    }
+  else
+    s = format (s, "delete ");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_set_l2_bridge_t_print
+  (vl_api_sw_interface_set_l2_bridge_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_set_l2_bridge ");
+
+  s = format (s, "sw_if_index %d ", ntohl (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 " : " "));
+    }
+  else
+    s = format (s, "disable ");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_set_dpdk_hqos_pipe_t_print
+  (vl_api_sw_interface_set_dpdk_hqos_pipe_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_set_dpdk_hqos_pipe ");
+
+  s = format (s, "sw_if_index %u ", ntohl (mp->sw_if_index));
+
+  s = format (s, "subport %u  pipe %u  profile %u ",
+	      ntohl (mp->subport), ntohl (mp->pipe), ntohl (mp->profile));
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_set_dpdk_hqos_subport_t_print
+  (vl_api_sw_interface_set_dpdk_hqos_subport_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_set_dpdk_hqos_subport ");
+
+  s = format (s, "sw_if_index %u ", ntohl (mp->sw_if_index));
+
+  s =
+    format (s,
+	    "subport %u  rate %u  bkt_size %u  tc0 %u tc1 %u tc2 %u tc3 %u period %u",
+	    ntohl (mp->subport), ntohl (mp->tb_rate), ntohl (mp->tb_size),
+	    ntohl (mp->tc_rate[0]), ntohl (mp->tc_rate[1]),
+	    ntohl (mp->tc_rate[2]), ntohl (mp->tc_rate[3]),
+	    ntohl (mp->tc_period));
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_set_dpdk_hqos_tctbl_t_print
+  (vl_api_sw_interface_set_dpdk_hqos_tctbl_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_set_dpdk_hqos_tctbl ");
+
+  s = format (s, "sw_if_index %u ", ntohl (mp->sw_if_index));
+
+  s = format (s, "entry %u  tc %u  queue %u",
+	      ntohl (mp->entry), ntohl (mp->tc), ntohl (mp->queue));
+
+  FINISH;
+}
+
+static void *vl_api_bridge_domain_add_del_t_print
+  (vl_api_bridge_domain_add_del_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: bridge_domain_add_del ");
+
+  s = format (s, "bd_id %d ", ntohl (mp->bd_id));
+
+  if (mp->is_add)
+    {
+      s = format (s, "flood %d uu-flood %d forward %d learn %d arp-term %d",
+		  mp->flood, mp->uu_flood, mp->forward, mp->learn,
+		  mp->arp_term);
+    }
+  else
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+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);
+
+  s = format (0, "SCRIPT: bridge_domain_dump ");
+
+  if (bd_id != ~0)
+    s = format (s, "bd_id %d ", bd_id);
+
+  FINISH;
+}
+
+static void *vl_api_l2fib_add_del_t_print
+  (vl_api_l2fib_add_del_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: l2fib_add_del ");
+
+  s = format (s, "mac %U ", format_ethernet_address, &mp->mac);
+
+  s = format (s, "bd_id %d ", ntohl (mp->bd_id));
+
+
+  if (mp->is_add)
+    {
+      s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+      if (mp->static_mac)
+	s = format (s, "%s", "static ");
+      if (mp->filter_mac)
+	s = format (s, "%s", "filter ");
+      if (mp->bvi_mac)
+	s = format (s, "%s", "bvi ");
+    }
+  else
+    {
+      s = format (s, "del ");
+    }
+
+  FINISH;
+}
+
+static void *
+vl_api_l2_flags_t_print (vl_api_l2_flags_t * mp, void *handle)
+{
+  u8 *s;
+  u32 flags = ntohl (mp->feature_bitmap);
+
+  s = format (0, "SCRIPT: l2_flags ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+#define _(a,b) \
+    if (flags & L2INPUT_FEAT_ ## a) s = format (s, #a " ");
+  foreach_l2input_feat;
+#undef _
+
+  FINISH;
+}
+
+static void *vl_api_bridge_flags_t_print
+  (vl_api_bridge_flags_t * mp, void *handle)
+{
+  u8 *s;
+  u32 flags = ntohl (mp->feature_bitmap);
+
+  s = format (0, "SCRIPT: bridge_flags ");
+
+  s = format (s, "bd_id %d ", ntohl (mp->bd_id));
+
+  if (flags & L2_LEARN)
+    s = format (s, "learn ");
+  if (flags & L2_FWD)
+    s = format (s, "forward ");
+  if (flags & L2_FLOOD)
+    s = format (s, "flood ");
+  if (flags & L2_UU_FLOOD)
+    s = format (s, "uu-flood ");
+  if (flags & L2_ARP_TERM)
+    s = format (s, "arp-term ");
+
+  if (mp->is_set == 0)
+    s = format (s, "clear ");
+
+  FINISH;
+}
+
+static void *vl_api_bd_ip_mac_add_del_t_print
+  (vl_api_bd_ip_mac_add_del_t * mp, void *handle)
+{
+  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, "%U ", format_ethernet_address, mp->mac_address);
+  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)
+{
+  u8 *s;
+  u8 null_mac[6];
+
+  memset (null_mac, 0, sizeof (null_mac));
+
+  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);
+
+  FINISH;
+}
+
+static void *vl_api_tap_modify_t_print
+  (vl_api_tap_modify_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 ");
+
+  FINISH;
+}
+
+
+static void *vl_api_ip_add_del_route_t_print
+  (vl_api_ip_add_del_route_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ip_add_del_route ");
+  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));
+
+  if (mp->is_ipv6)
+    s = format (s, "%U/%d ", format_ip6_address, mp->dst_address,
+		mp->dst_address_length);
+  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));
+  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);
+    }
+
+  if (mp->table_id != 0)
+    s = format (s, "vrf %d ", ntohl (mp->table_id));
+
+  if (mp->create_vrf_if_needed)
+    s = format (s, "create-vrf ");
+
+  if (mp->next_hop_weight != 1)
+    s = format (s, "weight %d ", mp->next_hop_weight);
+
+  if (mp->not_last)
+    s = format (s, "not-last ");
+
+  if (mp->is_multipath)
+    s = format (s, "multipath ");
+
+  if (mp->is_multipath)
+    s = format (s, "multipath ");
+
+  if (mp->next_hop_table_id)
+    s = format (s, "lookup-in-vrf %d ", ntohl (mp->next_hop_table_id));
+
+  FINISH;
+}
+
+static void *vl_api_proxy_arp_add_del_t_print
+  (vl_api_proxy_arp_add_del_t * mp, void *handle)
+{
+  u8 *s;
+
+  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);
+
+  if (mp->vrf_id)
+    s = format (s, "vrf %d ", ntohl (mp->vrf_id));
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_proxy_arp_intfc_enable_disable_t_print
+  (vl_api_proxy_arp_intfc_enable_disable_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: proxy_arp_intfc_enable_disable ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  s = format (s, "enable %d ", mp->enable_disable);
+
+  FINISH;
+}
+
+static void *vl_api_mpls_tunnel_add_del_t_print
+  (vl_api_mpls_tunnel_add_del_t * mp, void *handle)
+{
+  u8 *s;
+
+  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);
+  else
+    s = format (s, "%U ", format_ip6_address, mp->mt_next_hop);
+
+  if (mp->mt_l2_only)
+    s = format (s, "l2-only ");
+
+  if (mp->mt_is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_set_unnumbered_t_print
+  (vl_api_sw_interface_set_unnumbered_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_set_unnumbered ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  s = format (s, "unnum_if_index %d ", ntohl (mp->unnumbered_sw_if_index));
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+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));
+
+  if (mp->is_static)
+    s = format (s, "is_static ");
+
+  s = format (s, "vrf_id %d ", ntohl (mp->vrf_id));
+
+  if (memcmp (mp->mac_address, null_mac, 6))
+    s = format (s, "mac %U ", format_ethernet_address, mp->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);
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *
+vl_api_reset_vrf_t_print (vl_api_reset_vrf_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: reset_vrf ");
+
+  if (mp->vrf_id)
+    s = format (s, "vrf %d ", ntohl (mp->vrf_id));
+
+  if (mp->is_ipv6 != 0)
+    s = format (s, "ipv6 ");
+
+  FINISH;
+}
+
+static void *vl_api_create_vlan_subif_t_print
+  (vl_api_create_vlan_subif_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: create_vlan_subif ");
+
+  if (mp->sw_if_index)
+    s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  if (mp->vlan_id)
+    s = format (s, "vlan_id %d ", ntohl (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)
+
+static void *vl_api_create_subif_t_print
+  (vl_api_create_subif_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: create_subif ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  s = format (s, "sub_id %d ", ntohl (mp->sub_id));
+
+  if (mp->outer_vlan_id)
+    s = format (s, "outer_vlan_id %d ", ntohs (mp->outer_vlan_id));
+
+  if (mp->inner_vlan_id)
+    s = format (s, "inner_vlan_id %d ", ntohs (mp->inner_vlan_id));
+
+#define _(a) if (mp->a) s = format (s, "%s ", #a);
+  foreach_create_subif_bit;
+#undef _
+
+  FINISH;
+}
+
+static void *vl_api_delete_subif_t_print
+  (vl_api_delete_subif_t * mp, void *handle)
+{
+  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 ");
+
+  FINISH;
+}
+
+static void *
+vl_api_reset_fib_t_print (vl_api_reset_fib_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: reset_fib ");
+
+  if (mp->vrf_id)
+    s = format (s, "vrf %d ", ntohl (mp->vrf_id));
+
+  if (mp->is_ipv6 != 0)
+    s = format (s, "ipv6 ");
+
+  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 ");
+
+  s = format (s, "vrf_id %d ", ntohl (mp->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 ");
+
+  s = format (s, "insert-cid %d ", mp->insert_circuit_id);
+
+  FINISH;
+}
+
+static void *vl_api_dhcp_proxy_config_2_t_print
+  (vl_api_dhcp_proxy_config_2_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 ");
+
+  s = format (s, "insert-cid %d ", mp->insert_circuit_id);
+
+  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));
+
+  s = format (s, "fib_id %d ", ntohl (mp->fib_id));
+
+  s = format (s, "oui %d ", ntohl (mp->oui));
+
+  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 ", 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)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: set_ip_flow_hash ");
+
+  s = format (s, "vrf_id %d ", ntohl (mp->vrf_id));
+
+  if (mp->src)
+    s = format (s, "src ");
+
+  if (mp->dst)
+    s = format (s, "dst ");
+
+  if (mp->sport)
+    s = format (s, "sport ");
+
+  if (mp->dport)
+    s = format (s, "dport ");
+
+  if (mp->proto)
+    s = format (s, "proto ");
+
+  if (mp->reverse)
+    s = format (s, "reverse ");
+
+  if (mp->is_ipv6 != 0)
+    s = format (s, "ipv6 ");
+
+  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/%d ", format_ip6_address, mp->address,
+	      mp->address_length);
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_ip6nd_ra_prefix_t_print
+  (vl_api_sw_interface_ip6nd_ra_prefix_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_ip6nd_ra_prefix ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  s = format (s, "%U/%d ", format_ip6_address, mp->address,
+	      mp->address_length);
+
+  s = format (s, "val_life %d ", ntohl (mp->val_lifetime));
+
+  s = format (s, "pref_life %d ", ntohl (mp->pref_lifetime));
+
+  if (mp->use_default)
+    s = format (s, "def ");
+
+  if (mp->no_advertise)
+    s = format (s, "noadv ");
+
+  if (mp->off_link)
+    s = format (s, "offl ");
+
+  if (mp->no_autoconfig)
+    s = format (s, "noauto ");
+
+  if (mp->no_onlink)
+    s = format (s, "nolink ");
+
+  if (mp->is_no)
+    s = format (s, "isno ");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_ip6nd_ra_config_t_print
+  (vl_api_sw_interface_ip6nd_ra_config_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_ip6nd_ra_config ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  s = format (s, "maxint %d ", ntohl (mp->max_interval));
+
+  s = format (s, "minint %d ", ntohl (mp->min_interval));
+
+  s = format (s, "life %d ", ntohl (mp->lifetime));
+
+  s = format (s, "count %d ", ntohl (mp->initial_count));
+
+  s = format (s, "interval %d ", ntohl (mp->initial_interval));
+
+  if (mp->suppress)
+    s = format (s, "suppress ");
+
+  if (mp->managed)
+    s = format (s, "managed ");
+
+  if (mp->other)
+    s = format (s, "other ");
+
+  if (mp->ll_option)
+    s = format (s, "ll ");
+
+  if (mp->send_unicast)
+    s = format (s, "send ");
+
+  if (mp->cease)
+    s = format (s, "cease ");
+
+  if (mp->is_no)
+    s = format (s, "isno ");
+
+  if (mp->default_router)
+    s = format (s, "def ");
+
+  FINISH;
+}
+
+static void *vl_api_set_arp_neighbor_limit_t_print
+  (vl_api_set_arp_neighbor_limit_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: set_arp_neighbor_limit ");
+
+  s = format (s, "arp_nbr_limit %d ", ntohl (mp->arp_neighbor_limit));
+
+  if (mp->is_ipv6 != 0)
+    s = format (s, "ipv6 ");
+
+  FINISH;
+}
+
+static void *vl_api_l2_patch_add_del_t_print
+  (vl_api_l2_patch_add_del_t * mp, void *handle)
+{
+  u8 *s;
+
+  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, "tx_sw_if_index %d ", ntohl (mp->tx_sw_if_index));
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_sr_tunnel_add_del_t_print
+  (vl_api_sr_tunnel_add_del_t * mp, void *handle)
+{
+  u8 *s;
+  ip6_address_t *this_address;
+  int i;
+  u16 flags_host_byte_order;
+  u8 pl_flag;
+
+  s = format (0, "SCRIPT: sr_tunnel_add_del ");
+
+  if (mp->name[0])
+    s = format (s, "name %s ", mp->name);
+
+  s = format (s, "src %U dst %U/%d ", format_ip6_address,
+	      (ip6_address_t *) mp->src_address,
+	      format_ip6_address,
+	      (ip6_address_t *) mp->dst_address, mp->dst_mask_width);
+
+  this_address = (ip6_address_t *) mp->segs_and_tags;
+  for (i = 0; i < mp->n_segments; i++)
+    {
+      s = format (s, "next %U ", format_ip6_address, this_address);
+      this_address++;
+    }
+  for (i = 0; i < mp->n_tags; i++)
+    {
+      s = format (s, "tag %U ", format_ip6_address, this_address);
+      this_address++;
+    }
+
+  flags_host_byte_order = clib_net_to_host_u16 (mp->flags_net_byte_order);
+
+  if (flags_host_byte_order & IP6_SR_HEADER_FLAG_CLEANUP)
+    s = format (s, " clean ");
+
+  if (flags_host_byte_order & IP6_SR_HEADER_FLAG_PROTECTED)
+    s = format (s, "protected ");
+
+  for (i = 1; i <= 4; i++)
+    {
+      pl_flag = ip6_sr_policy_list_flags (flags_host_byte_order, i);
+
+      switch (pl_flag)
+	{
+	case IP6_SR_HEADER_FLAG_PL_ELT_NOT_PRESENT:
+	  continue;
+
+	case IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE:
+	  s = format (s, "InPE %d ", i);
+	  break;
+
+	case IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE:
+	  s = format (s, "EgPE %d ", i);
+	  break;
+
+	case IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR:
+	  s = format (s, "OrgSrc %d ", i);
+	  break;
+
+	default:
+	  clib_warning ("BUG: pl elt %d value %d", i, pl_flag);
+	  break;
+	}
+    }
+
+  if (mp->policy_name[0])
+    s = format (s, "policy_name %s ", mp->policy_name);
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_sr_policy_add_del_t_print
+  (vl_api_sr_policy_add_del_t * mp, void *handle)
+{
+  u8 *s;
+  int i;
+
+  s = format (0, "SCRIPT: sr_policy_add_del ");
+
+  if (mp->name[0])
+    s = format (s, "name %s ", mp->name);
+
+
+  if (mp->tunnel_names[0])
+    {
+      // start deserializing tunnel_names
+      int num_tunnels = mp->tunnel_names[0];	//number of tunnels
+      u8 *deser_tun_names = mp->tunnel_names;
+      deser_tun_names += 1;	//moving along
+
+      u8 *tun_name = 0;
+      int tun_name_len = 0;
+
+      for (i = 0; i < num_tunnels; i++)
+	{
+	  tun_name_len = *deser_tun_names;
+	  deser_tun_names += 1;
+	  vec_resize (tun_name, tun_name_len);
+	  memcpy (tun_name, deser_tun_names, tun_name_len);
+	  s = format (s, "tunnel %s ", tun_name);
+	  deser_tun_names += tun_name_len;
+	  tun_name = 0;
+	}
+    }
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_sr_multicast_map_add_del_t_print
+  (vl_api_sr_multicast_map_add_del_t * mp, void *handle)
+{
+
+  u8 *s = 0;
+  /* int i; */
+
+  s = format (0, "SCRIPT: sr_multicast_map_add_del ");
+
+  if (mp->multicast_address[0])
+    s = format (s, "address %U ", format_ip6_address, &mp->multicast_address);
+
+  if (mp->policy_name[0])
+    s = format (s, "sr-policy %s ", &mp->policy_name);
+
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+
+static void *vl_api_classify_add_del_table_t_print
+  (vl_api_classify_add_del_table_t * mp, void *handle)
+{
+  u8 *s;
+  int i;
+
+  s = format (0, "SCRIPT: classify_add_del_table ");
+
+  if (mp->is_add == 0)
+    {
+      s = format (s, "table %d ", ntohl (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));
+      if (mp->current_data_flag)
+	s = format (s, "current-data-offset %d ",
+		    ntohl (mp->current_data_offset));
+      s = format (s, "mask hex ");
+      for (i = 0; i < ntohl (mp->match_n_vectors) * sizeof (u32x4); i++)
+	s = format (s, "%02x", mp->mask[i]);
+      vec_add1 (s, ' ');
+    }
+
+  FINISH;
+}
+
+static void *vl_api_classify_add_del_session_t_print
+  (vl_api_classify_add_del_session_t * mp, void *handle)
+{
+  u8 *s;
+  int i, limit = 0;
+
+  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, "action %d ", mp->action);
+  if (mp->action)
+    s = format (s, "metadata %d ", ntohl (mp->metadata));
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  s = format (s, "match hex ");
+  for (i = 5 * sizeof (u32x4) - 1; i > 0; i--)
+    {
+      if (mp->match[i] != 0)
+	{
+	  limit = i + 1;
+	  break;
+	}
+    }
+
+  for (i = 0; i < limit; i++)
+    s = format (s, "%02x", mp->match[i]);
+
+  FINISH;
+}
+
+static void *vl_api_classify_set_interface_ip_table_t_print
+  (vl_api_classify_set_interface_ip_table_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: classify_set_interface_ip_table ");
+
+  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));
+
+  FINISH;
+}
+
+static void *vl_api_classify_set_interface_l2_tables_t_print
+  (vl_api_classify_set_interface_l2_tables_t * mp, void *handle)
+{
+  u8 *s;
+
+  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, "is-input %d ", mp->is_input);
+
+  FINISH;
+}
+
+static void *vl_api_add_node_next_t_print
+  (vl_api_add_node_next_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: add_node_next ");
+
+  s = format (0, "node %s next %s ", mp->node_name, mp->next_name);
+
+  FINISH;
+}
+
+static void *vl_api_l2tpv3_create_tunnel_t_print
+  (vl_api_l2tpv3_create_tunnel_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: l2tpv3_create_tunnel ");
+
+  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_cookie %lld ",
+	      clib_net_to_host_u64 (mp->local_cookie));
+  s = format (s, "remote_cookie %lld ",
+	      clib_net_to_host_u64 (mp->remote_cookie));
+  if (mp->l2_sublayer_present)
+    s = format (s, "l2-sublayer-present ");
+
+  FINISH;
+}
+
+static void *vl_api_l2tpv3_set_tunnel_cookies_t_print
+  (vl_api_l2tpv3_set_tunnel_cookies_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: l2tpv3_set_tunnel_cookies ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  s = format (s, "new_local_cookie %llu ",
+	      clib_net_to_host_u64 (mp->new_local_cookie));
+
+  s = format (s, "new_remote_cookie %llu ",
+	      clib_net_to_host_u64 (mp->new_remote_cookie));
+
+  FINISH;
+}
+
+static void *vl_api_l2tpv3_interface_enable_disable_t_print
+  (vl_api_l2tpv3_interface_enable_disable_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: l2tpv3_interface_enable_disable ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  if (mp->enable_disable == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_l2tpv3_set_lookup_key_t_print
+  (vl_api_l2tpv3_set_lookup_key_t * mp, void *handle)
+{
+  u8 *s;
+  char *str = "unknown";
+
+  s = format (0, "SCRIPT: l2tpv3_set_lookup_key ");
+
+  switch (mp->key)
+    {
+    case L2T_LOOKUP_SRC_ADDRESS:
+      str = "lookup_v6_src";
+      break;
+    case L2T_LOOKUP_DST_ADDRESS:
+      str = "lookup_v6_dst";
+      break;
+    case L2T_LOOKUP_SESSION_ID:
+      str = "lookup_session_id";
+      break;
+    default:
+      break;
+    }
+
+  s = format (s, "%s ", str);
+
+  FINISH;
+}
+
+static void *vl_api_sw_if_l2tpv3_tunnel_dump_t_print
+  (vl_api_sw_if_l2tpv3_tunnel_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_if_l2tpv3_tunnel_dump ");
+
+  FINISH;
+}
+
+static void *vl_api_vxlan_add_del_tunnel_t_print
+  (vl_api_vxlan_add_del_tunnel_t * mp, void *handle)
+{
+  u8 *s;
+  s = format (0, "SCRIPT: vxlan_add_del_tunnel ");
+
+  ip46_address_t src, dst;
+
+  ip46_from_addr_buf (mp->is_ipv6, mp->dst_address, &dst);
+  ip46_from_addr_buf (mp->is_ipv6, mp->src_address, &src);
+
+  u8 is_grp = ip46_address_is_multicast (&dst);
+  char *dst_name = is_grp ? "group" : "dst";
+
+  s = format (s, "src %U ", format_ip46_address, &src, IP46_TYPE_ANY);
+  s = format (s, "%s %U ", dst_name, format_ip46_address,
+	      &dst, IP46_TYPE_ANY);
+
+  if (is_grp)
+    s = format (s, "mcast_sw_if_index %d ", ntohl (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, "decap-next %d ", ntohl (mp->decap_next_index));
+
+  s = format (s, "vni %d ", ntohl (mp->vni));
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_vxlan_tunnel_dump_t_print
+  (vl_api_vxlan_tunnel_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: vxlan_tunnel_dump ");
+
+  s = format (s, "sw_if_index %d ", ntohl (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)
+{
+  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 (s, "src %U ", format_ip46_address,
+	      (ip46_address_t *) & (mp->src_address),
+	      mp->is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4);
+
+  if (mp->teb)
+    s = format (s, "teb ");
+
+  if (mp->outer_fib_id)
+    s = format (s, "outer-fib-id %d ", ntohl (mp->outer_fib_id));
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_gre_tunnel_dump_t_print
+  (vl_api_gre_tunnel_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: gre_tunnel_dump ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  FINISH;
+}
+
+static void *vl_api_l2_fib_clear_table_t_print
+  (vl_api_l2_fib_clear_table_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: l2_fib_clear_table ");
+
+  FINISH;
+}
+
+static void *vl_api_l2_interface_efp_filter_t_print
+  (vl_api_l2_interface_efp_filter_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: l2_interface_efp_filter ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  if (mp->enable_disable)
+    s = format (s, "enable ");
+  else
+    s = format (s, "disable ");
+
+  FINISH;
+}
+
+static void *vl_api_l2_interface_vlan_tag_rewrite_t_print
+  (vl_api_l2_interface_vlan_tag_rewrite_t * mp, void *handle)
+{
+  u8 *s;
+
+  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));
+
+  FINISH;
+}
+
+static void *vl_api_create_vhost_user_if_t_print
+  (vl_api_create_vhost_user_if_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: create_vhost_user_if ");
+
+  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));
+  if (mp->tag[0])
+    s = format (s, "tag %s", mp->tag);
+
+  FINISH;
+}
+
+static void *vl_api_modify_vhost_user_if_t_print
+  (vl_api_modify_vhost_user_if_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: modify_vhost_user_if ");
+
+  s = format (s, "sw_if_index %d ", ntohl (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));
+
+  FINISH;
+}
+
+static void *vl_api_delete_vhost_user_if_t_print
+  (vl_api_delete_vhost_user_if_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: delete_vhost_user_if ");
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_vhost_user_dump_t_print
+  (vl_api_sw_interface_vhost_user_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_vhost_user_dump ");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_dump_t_print
+  (vl_api_sw_interface_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_dump ");
+
+  if (mp->name_filter_valid)
+    s = format (s, "name_filter %s ", mp->name_filter);
+  else
+    s = format (s, "all ");
+
+  FINISH;
+}
+
+static void *vl_api_l2_fib_table_dump_t_print
+  (vl_api_l2_fib_table_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: l2_fib_table_dump ");
+
+  s = format (s, "bd_id %d ", ntohl (mp->bd_id));
+
+  FINISH;
+}
+
+static void *vl_api_control_ping_t_print
+  (vl_api_control_ping_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: control_ping ");
+
+  FINISH;
+}
+
+static void *vl_api_want_interface_events_t_print
+  (vl_api_want_interface_events_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: want_interface_events pid %d enable %d ",
+	      ntohl (mp->pid), ntohl (mp->enable_disable));
+
+  FINISH;
+}
+
+static void *vl_api_cli_request_t_print
+  (vl_api_cli_request_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: cli_request ");
+
+  FINISH;
+}
+
+static void *vl_api_cli_inband_t_print
+  (vl_api_cli_inband_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: cli_inband ");
+
+  FINISH;
+}
+
+static void *vl_api_memclnt_create_t_print
+  (vl_api_memclnt_create_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: memclnt_create name %s ", mp->name);
+
+  FINISH;
+}
+
+static void *vl_api_show_version_t_print
+  (vl_api_show_version_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: show_version ");
+
+  FINISH;
+}
+
+static void *vl_api_vxlan_gpe_add_del_tunnel_t_print
+  (vl_api_vxlan_gpe_add_del_tunnel_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: vxlan_gpe_add_del_tunnel ");
+
+  s = format (s, "local %U ", format_ip46_address, &mp->local, mp->is_ipv6);
+
+  s = format (s, "remote %U ", format_ip46_address, &mp->remote, mp->is_ipv6);
+
+  s = format (s, "protocol %d ", ntohl (mp->protocol));
+
+  s = format (s, "vni %d ", ntohl (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));
+
+  if (mp->decap_vrf_id)
+    s = format (s, "decap-vrf-id %d ", ntohl (mp->decap_vrf_id));
+
+  FINISH;
+}
+
+static void *vl_api_vxlan_gpe_tunnel_dump_t_print
+  (vl_api_vxlan_gpe_tunnel_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: vxlan_gpe_tunnel_dump ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  FINISH;
+}
+
+static void *vl_api_interface_name_renumber_t_print
+  (vl_api_interface_name_renumber_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: interface_renumber ");
+
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  s = format (s, "new_show_dev_instance %d ",
+	      ntohl (mp->new_show_dev_instance));
+
+  FINISH;
+}
+
+static void *vl_api_want_ip4_arp_events_t_print
+  (vl_api_want_ip4_arp_events_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: want_ip4_arp_events ");
+  s = format (s, "pid %d address %U ", mp->pid,
+	      format_ip4_address, &mp->address);
+  if (mp->enable_disable == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_want_ip6_nd_events_t_print
+  (vl_api_want_ip6_nd_events_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: want_ip6_nd_events ");
+  s = format (s, "pid %d address %U ", mp->pid,
+	      format_ip6_address, mp->address);
+  if (mp->enable_disable == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_input_acl_set_interface_t_print
+  (vl_api_input_acl_set_interface_t * mp, void *handle)
+{
+  u8 *s;
+
+  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));
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_ip_address_dump_t_print
+  (vl_api_ip_address_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ip6_address_dump ");
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  s = format (s, "is_ipv6 %d ", mp->is_ipv6 != 0);
+
+  FINISH;
+}
+
+static void *
+vl_api_ip_dump_t_print (vl_api_ip_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ip_dump ");
+  s = format (s, "is_ipv6 %d ", mp->is_ipv6 != 0);
+
+  FINISH;
+}
+
+static void *vl_api_cop_interface_enable_disable_t_print
+  (vl_api_cop_interface_enable_disable_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: cop_interface_enable_disable ");
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  if (mp->enable_disable)
+    s = format (s, "enable ");
+  else
+    s = format (s, "disable ");
+
+  FINISH;
+}
+
+static void *vl_api_cop_whitelist_enable_disable_t_print
+  (vl_api_cop_whitelist_enable_disable_t * mp, void *handle)
+{
+  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));
+  if (mp->ip4)
+    s = format (s, "ip4 ");
+  if (mp->ip6)
+    s = format (s, "ip6 ");
+  if (mp->default_cop)
+    s = format (s, "default ");
+
+  FINISH;
+}
+
+static void *vl_api_af_packet_create_t_print
+  (vl_api_af_packet_create_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: af_packet_create ");
+  s = format (s, "host_if_name %s ", mp->host_if_name);
+  if (mp->use_random_hw_addr)
+    s = format (s, "hw_addr random ");
+  else
+    s = format (s, "hw_addr %U ", format_ethernet_address, mp->hw_addr);
+
+  FINISH;
+}
+
+static void *vl_api_af_packet_delete_t_print
+  (vl_api_af_packet_delete_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: af_packet_delete ");
+  s = format (s, "host_if_name %s ", mp->host_if_name);
+
+  FINISH;
+}
+
+static u8 *
+format_policer_action (u8 * s, va_list * va)
+{
+  u32 action = va_arg (*va, u32);
+  u32 dscp = va_arg (*va, u32);
+  char *t = 0;
+
+  if (action == SSE2_QOS_ACTION_DROP)
+    s = format (s, "drop");
+  else if (action == SSE2_QOS_ACTION_TRANSMIT)
+    s = format (s, "transmit");
+  else if (action == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+    {
+      s = format (s, "mark-and-transmit ");
+      switch (dscp)
+	{
+#define _(v,f,str) case VNET_DSCP_##f: t = str; break;
+	  foreach_vnet_dscp
+#undef _
+	default:
+	  break;
+	}
+      s = format (s, "%s", t);
+    }
+
+  return s;
+}
+
+static void *vl_api_policer_add_del_t_print
+  (vl_api_policer_add_del_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: policer_add_del ");
+  s = format (s, "name %s ", mp->name);
+  s = format (s, "cir %d ", mp->cir);
+  s = format (s, "eir %d ", mp->eir);
+  s = format (s, "cb %d ", mp->cb);
+  s = format (s, "eb %d ", mp->eb);
+
+  switch (mp->rate_type)
+    {
+    case SSE2_QOS_RATE_KBPS:
+      s = format (s, "rate_type kbps ");
+      break;
+    case SSE2_QOS_RATE_PPS:
+      s = format (s, "rate_type pps ");
+      break;
+    default:
+      break;
+    }
+
+  switch (mp->round_type)
+    {
+    case SSE2_QOS_ROUND_TO_CLOSEST:
+      s = format (s, "round_type closest ");
+      break;
+    case SSE2_QOS_ROUND_TO_UP:
+      s = format (s, "round_type up ");
+      break;
+    case SSE2_QOS_ROUND_TO_DOWN:
+      s = format (s, "round_type down ");
+      break;
+    default:
+      break;
+    }
+
+  switch (mp->type)
+    {
+    case SSE2_QOS_POLICER_TYPE_1R2C:
+      s = format (s, "type 1r2c ");
+      break;
+    case SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697:
+      s = format (s, "type 1r3c ");
+      break;
+    case SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698:
+      s = format (s, "type 2r3c-2698 ");
+      break;
+    case SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115:
+      s = format (s, "type 2r3c-4115 ");
+      break;
+    case SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1:
+      s = format (s, "type 2r3c-mef5cf1 ");
+      break;
+    default:
+      break;
+    }
+
+  s = format (s, "conform_action %U ", format_policer_action,
+	      mp->conform_action_type, mp->conform_dscp);
+  s = format (s, "exceed_action %U ", format_policer_action,
+	      mp->exceed_action_type, mp->exceed_dscp);
+  s = format (s, "violate_action %U ", format_policer_action,
+	      mp->violate_action_type, mp->violate_dscp);
+
+  if (mp->color_aware)
+    s = format (s, "color-aware ");
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_policer_dump_t_print
+  (vl_api_policer_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: policer_dump ");
+  if (mp->match_name_valid)
+    s = format (s, "name %s ", mp->match_name);
+
+  FINISH;
+}
+
+static void *vl_api_policer_classify_set_interface_t_print
+  (vl_api_policer_classify_set_interface_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: policer_classify_set_interface ");
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  if (mp->ip4_table_index != ~0)
+    s = format (s, "ip4-table %d ", ntohl (mp->ip4_table_index));
+  if (mp->ip6_table_index != ~0)
+    s = format (s, "ip6-table %d ", ntohl (mp->ip6_table_index));
+  if (mp->l2_table_index != ~0)
+    s = format (s, "l2-table %d ", ntohl (mp->l2_table_index));
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_policer_classify_dump_t_print
+  (vl_api_policer_classify_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: policer_classify_dump ");
+  switch (mp->type)
+    {
+    case POLICER_CLASSIFY_TABLE_IP4:
+      s = format (s, "type ip4 ");
+      break;
+    case POLICER_CLASSIFY_TABLE_IP6:
+      s = format (s, "type ip6 ");
+      break;
+    case POLICER_CLASSIFY_TABLE_L2:
+      s = format (s, "type l2 ");
+      break;
+    default:
+      break;
+    }
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_clear_stats_t_print
+  (vl_api_sw_interface_clear_stats_t * mp, void *handle)
+{
+  u8 *s;
+
+  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));
+
+  FINISH;
+}
+
+static void *vl_api_mpls_tunnel_dump_t_print
+  (vl_api_mpls_tunnel_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: mpls_tunnel_dump ");
+
+  s = format (s, "tunnel_index %d ", ntohl (mp->tunnel_index));
+
+  FINISH;
+}
+
+static void *vl_api_mpls_fib_dump_t_print
+  (vl_api_mpls_fib_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: mpls_fib_decap_dump ");
+
+  FINISH;
+}
+
+static void *vl_api_ip_fib_dump_t_print
+  (vl_api_ip_fib_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ip_fib_dump ");
+
+  FINISH;
+}
+
+static void *vl_api_ip6_fib_dump_t_print
+  (vl_api_ip6_fib_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ip6_fib_dump ");
+
+  FINISH;
+}
+
+static void *vl_api_classify_table_ids_t_print
+  (vl_api_classify_table_ids_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: classify_table_ids ");
+
+  FINISH;
+}
+
+static void *vl_api_classify_table_by_interface_t_print
+  (vl_api_classify_table_by_interface_t * mp, void *handle)
+{
+  u8 *s;
+
+  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));
+
+  FINISH;
+}
+
+static void *vl_api_classify_table_info_t_print
+  (vl_api_classify_table_info_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: classify_table_info ");
+  if (mp->table_id != ~0)
+    s = format (s, "table_id %d ", ntohl (mp->table_id));
+
+  FINISH;
+}
+
+static void *vl_api_classify_session_dump_t_print
+  (vl_api_classify_session_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: classify_session_dump ");
+  if (mp->table_id != ~0)
+    s = format (s, "table_id %d ", ntohl (mp->table_id));
+
+  FINISH;
+}
+
+static void *vl_api_set_ipfix_exporter_t_print
+  (vl_api_set_ipfix_exporter_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: set_ipfix_exporter ");
+
+  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, "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, "udp-checksum %d ", mp->udp_checksum);
+
+  FINISH;
+}
+
+static void *vl_api_ipfix_exporter_dump_t_print
+  (vl_api_ipfix_exporter_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ipfix_exporter_dump ");
+
+  FINISH;
+}
+
+static void *vl_api_set_ipfix_classify_stream_t_print
+  (vl_api_set_ipfix_classify_stream_t * mp, void *handle)
+{
+  u8 *s;
+
+  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));
+
+  FINISH;
+}
+
+static void *vl_api_ipfix_classify_stream_dump_t_print
+  (vl_api_ipfix_classify_stream_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ipfix_classify_stream_dump ");
+
+  FINISH;
+}
+
+static void *vl_api_ipfix_classify_table_add_del_t_print
+  (vl_api_ipfix_classify_table_add_del_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ipfix_classify_table_add_del ");
+
+  s = format (s, "table-id %d ", ntohl (mp->table_id));
+  s = format (s, "ip-version %d ", mp->ip_version);
+  s = format (s, "transport-protocol %d ", mp->transport_protocol);
+
+  FINISH;
+}
+
+static void *vl_api_ipfix_classify_table_dump_t_print
+  (vl_api_ipfix_classify_table_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ipfix_classify_table_dump ");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_span_enable_disable_t_print
+  (vl_api_sw_interface_span_enable_disable_t * mp, void *handle)
+{
+  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));
+
+  switch (mp->state)
+    {
+    case 0:
+      s = format (s, "disable ");
+      break;
+    case 1:
+      s = format (s, "rx ");
+      break;
+    case 2:
+      s = format (s, "tx ");
+      break;
+    case 3:
+    default:
+      s = format (s, "both ");
+      break;
+    }
+
+  FINISH;
+}
+
+static void *
+vl_api_sw_interface_span_dump_t_print (vl_api_sw_interface_span_dump_t * mp,
+				       void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_span_dump ");
+
+  FINISH;
+}
+
+static void *vl_api_get_next_index_t_print
+  (vl_api_get_next_index_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: get_next_index ");
+  s = format (s, "node-name %s ", mp->node_name);
+  s = format (s, "next-node-name %s ", mp->next_name);
+
+  FINISH;
+}
+
+static void *vl_api_pg_create_interface_t_print
+  (vl_api_pg_create_interface_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: pg_create_interface ");
+  s = format (0, "if_id %d", ntohl (mp->interface_id));
+
+  FINISH;
+}
+
+static void *vl_api_pg_capture_t_print
+  (vl_api_pg_capture_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: pg_capture ");
+  s = format (0, "if_id %d ", ntohl (mp->interface_id));
+  s = format (0, "pcap %s", mp->pcap_file_name);
+  if (mp->count != ~0)
+    s = format (s, "count %d ", ntohl (mp->count));
+  if (!mp->is_enabled)
+    s = format (s, "disable");
+
+  FINISH;
+}
+
+static void *vl_api_pg_enable_disable_t_print
+  (vl_api_pg_enable_disable_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: pg_enable_disable ");
+  if (ntohl (mp->stream_name_length) > 0)
+    s = format (s, "stream %s", mp->stream_name);
+  if (!mp->is_enabled)
+    s = format (s, "disable");
+
+  FINISH;
+}
+
+static void *vl_api_ip_source_and_port_range_check_add_del_t_print
+  (vl_api_ip_source_and_port_range_check_add_del_t * mp, void *handle)
+{
+  u8 *s;
+  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);
+
+  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));
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_ip_source_and_port_range_check_interface_add_del_t_print
+  (vl_api_ip_source_and_port_range_check_interface_add_del_t * mp,
+   void *handle)
+{
+  u8 *s;
+
+  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));
+
+  if (mp->tcp_out_vrf_id != ~0)
+    s = format (s, "tcp-out-vrf %d ", ntohl (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));
+
+  if (mp->tcp_in_vrf_id != ~0)
+    s = format (s, "tcp-in-vrf %d ", ntohl (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));
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_lisp_enable_disable_t_print
+  (vl_api_lisp_enable_disable_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_enable_disable %s",
+	      mp->is_en ? "enable" : "disable");
+
+  FINISH;
+}
+
+static void *vl_api_lisp_gpe_add_del_iface_t_print
+  (vl_api_lisp_gpe_add_del_iface_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_gpe_add_del_iface ");
+
+  s = format (s, "%s ", mp->is_add ? "up" : "down");
+  s = format (s, "vni %d ", mp->vni);
+  s = format (s, "%s %d ", mp->is_l2 ? "bd_id" : "table_id", mp->dp_table);
+
+  FINISH;
+}
+
+static void *vl_api_lisp_pitr_set_locator_set_t_print
+  (vl_api_lisp_pitr_set_locator_set_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_pitr_set_locator_set ");
+
+  if (mp->is_add)
+    s = format (s, "locator-set %s ", mp->ls_name);
+  else
+    s = format (s, "del");
+
+  FINISH;
+}
+
+static u8 *
+format_lisp_flat_eid (u8 * s, va_list * args)
+{
+  u32 type = va_arg (*args, u32);
+  u8 *eid = va_arg (*args, u8 *);
+  u32 eid_len = va_arg (*args, u32);
+
+  switch (type)
+    {
+    case 0:
+      return format (s, "%U/%d", format_ip4_address, eid, eid_len);
+    case 1:
+      return format (s, "%U/%d", format_ip6_address, eid, eid_len);
+    case 3:
+      return format (s, "%U", format_ethernet_address, eid);
+    }
+  return 0;
+}
+
+/** Used for transferring locators via VPP API */
+typedef CLIB_PACKED (struct
+		     {
+		     u8 is_ip4;
+	     /**< is locator an IPv4 address */
+		     u8 priority;
+	       /**< locator priority */
+		     u8 weight;
+	       /**< locator weight */
+		     u8 addr[16];
+	       /**< IPv4/IPv6 address */
+		     }) rloc_t;
+
+static u8 *
+format_rloc (u8 * s, va_list * args)
+{
+  rloc_t *rloc = va_arg (*args, rloc_t *);
+
+  if (rloc->is_ip4)
+    s = format (s, "%U ", format_ip4_address, rloc->addr);
+  else
+    s = format (s, "%U ", format_ip6_address, rloc->addr);
+
+  s = format (s, "p %d w %d", rloc->priority, rloc->weight);
+
+  return s;
+}
+
+static void *vl_api_lisp_add_del_remote_mapping_t_print
+  (vl_api_lisp_add_del_remote_mapping_t * mp, void *handle)
+{
+  u8 *s;
+  u32 i, rloc_num = 0;
+
+  s = format (0, "SCRIPT: lisp_add_del_remote_mapping ");
+
+  if (mp->del_all)
+    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, "eid %U ", format_lisp_flat_eid,
+	      mp->eid_type, mp->eid, mp->eid_len);
+
+  if (mp->is_src_dst)
+    {
+      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);
+
+  if (0 == rloc_num)
+    s = format (s, "action %d", mp->action);
+  else
+    {
+      rloc_t *rloc = (rloc_t *) mp->rlocs;
+      for (i = 0; i < rloc_num; i++)
+	s = format (s, "%U ", format_rloc, &rloc[i]);
+    }
+
+  FINISH;
+}
+
+static void *vl_api_lisp_add_del_adjacency_t_print
+  (vl_api_lisp_add_del_adjacency_t * mp, void *handle)
+{
+  u8 *s;
+
+  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, "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);
+
+  FINISH;
+}
+
+static void *vl_api_lisp_add_del_map_request_itr_rlocs_t_print
+  (vl_api_lisp_add_del_map_request_itr_rlocs_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_add_del_map_request_itr_rlocs ");
+
+  if (mp->is_add)
+    s = format (s, "%s", mp->locator_set_name);
+  else
+    s = format (s, "del");
+
+  FINISH;
+}
+
+static void *vl_api_lisp_eid_table_add_del_map_t_print
+  (vl_api_lisp_eid_table_add_del_map_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_eid_table_add_del_map ");
+
+  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));
+  FINISH;
+}
+
+static void *vl_api_lisp_add_del_local_eid_t_print
+  (vl_api_lisp_add_del_local_eid_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_add_del_local_eid ");
+
+  if (!mp->is_add)
+    s = format (s, "del ");
+
+  s = format (s, "vni %d ", clib_net_to_host_u32 (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);
+  if (*mp->key)
+    {
+      u32 key_id = mp->key_id;
+      s = format (s, "key-id %U", format_hmac_key_id, key_id);
+      s = format (s, "secret-key %s", mp->key);
+    }
+  FINISH;
+}
+
+static void *vl_api_lisp_gpe_add_del_fwd_entry_t_print
+  (vl_api_lisp_gpe_add_del_fwd_entry_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_gpe_add_del_fwd_entry TODO");
+
+  FINISH;
+}
+
+static void *vl_api_lisp_add_del_map_resolver_t_print
+  (vl_api_lisp_add_del_map_resolver_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_add_del_map_resolver ");
+
+  if (!mp->is_add)
+    s = format (s, "del ");
+
+  if (mp->is_ipv6)
+    s = format (s, "%U ", format_ip6_address, mp->ip_address);
+  else
+    s = format (s, "%U ", format_ip4_address, mp->ip_address);
+
+  FINISH;
+}
+
+static void *vl_api_lisp_gpe_enable_disable_t_print
+  (vl_api_lisp_gpe_enable_disable_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_gpe_enable_disable ");
+
+  s = format (s, "%s ", mp->is_en ? "enable" : "disable");
+
+  FINISH;
+}
+
+typedef CLIB_PACKED (struct
+		     {
+		     u32 sw_if_index;
+		   /**< locator sw_if_index */
+		     u8 priority;
+	       /**< locator priority */
+		     u8 weight;
+	       /**< locator weight */
+		     }) ls_locator_t;
+
+static u8 *
+format_locator (u8 * s, va_list * args)
+{
+  ls_locator_t *l = va_arg (*args, ls_locator_t *);
+
+  return format (s, "sw_if_index %d p %d w %d",
+		 l->sw_if_index, l->priority, l->weight);
+}
+
+static void *vl_api_lisp_add_del_locator_set_t_print
+  (vl_api_lisp_add_del_locator_set_t * mp, void *handle)
+{
+  u8 *s;
+  u32 loc_num = 0, i;
+  ls_locator_t *locs;
+
+  s = format (0, "SCRIPT: lisp_add_del_locator_set ");
+
+  if (!mp->is_add)
+    s = format (s, "del ");
+
+  s = format (s, "locator-set %s ", mp->locator_set_name);
+
+  loc_num = clib_net_to_host_u32 (mp->locator_num);
+  locs = (ls_locator_t *) mp->locators;
+
+  for (i = 0; i < loc_num; i++)
+    s = format (s, "%U ", format_locator, &locs[i]);
+
+  FINISH;
+}
+
+static void *vl_api_lisp_add_del_locator_t_print
+  (vl_api_lisp_add_del_locator_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_add_del_locator ");
+
+  if (!mp->is_add)
+    s = format (s, "del ");
+
+  s = format (s, "locator-set %s ", mp->locator_set_name);
+  s = format (s, "sw_if_index %d ", mp->sw_if_index);
+  s = format (s, "p %d w %d ", mp->priority, mp->weight);
+
+  FINISH;
+}
+
+static void *vl_api_lisp_locator_set_dump_t_print
+  (vl_api_lisp_locator_set_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_locator_set_dump ");
+  if (mp->filter == 1)
+    s = format (s, "local");
+  else if (mp->filter == 2)
+    s = format (s, "remote");
+
+  FINISH;
+}
+
+static void *vl_api_lisp_locator_dump_t_print
+  (vl_api_lisp_locator_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  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));
+  else
+    s = format (s, "ls_name %s", mp->ls_name);
+
+  FINISH;
+}
+
+static void *vl_api_lisp_map_request_mode_t_print
+  (vl_api_lisp_map_request_mode_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_map_request_mode ");
+
+  switch (mp->mode)
+    {
+    case 0:
+      s = format (s, "dst-only");
+      break;
+    case 1:
+      s = format (s, "src-dst");
+    default:
+      break;
+    }
+
+  FINISH;
+}
+
+static void *vl_api_lisp_eid_table_dump_t_print
+  (vl_api_lisp_eid_table_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_eid_table_dump ");
+
+  if (mp->eid_set)
+    {
+      s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni));
+      s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid_type,
+		  mp->eid, mp->prefix_length);
+      switch (mp->filter)
+	{
+	case 1:
+	  s = format (s, "local ");
+	  break;
+	case 2:
+	  s = format (s, "remote ");
+	  break;
+	}
+    }
+
+  FINISH;
+}
+
+static void *vl_api_lisp_rloc_probe_enable_disable_t_print
+  (vl_api_lisp_rloc_probe_enable_disable_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_rloc_probe_enable_disable ");
+  if (mp->is_enabled)
+    s = format (s, "enable");
+  else
+    s = format (s, "disable");
+
+  FINISH;
+}
+
+static void *vl_api_lisp_map_register_enable_disable_t_print
+  (vl_api_lisp_map_register_enable_disable_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_map_register_enable_disable ");
+  if (mp->is_enabled)
+    s = format (s, "enable");
+  else
+    s = format (s, "disable");
+
+  FINISH;
+}
+
+static void *vl_api_lisp_adjacencies_get_t_print
+  (vl_api_lisp_adjacencies_get_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_adjacencies_get ");
+  s = format (s, "vni %d", clib_net_to_host_u32 (mp->vni));
+
+  FINISH;
+}
+
+static void *vl_api_lisp_eid_table_map_dump_t_print
+  (vl_api_lisp_eid_table_map_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: lisp_eid_table_map_dump ");
+
+  if (mp->is_l2)
+    s = format (s, "l2");
+  else
+    s = format (s, "l3");
+
+  FINISH;
+}
+
+static void *vl_api_ipsec_gre_add_del_tunnel_t_print
+  (vl_api_ipsec_gre_add_del_tunnel_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ipsec_gre_add_del_tunnel ");
+
+  s = format (s, "dst %U ", format_ip4_address,
+	      (ip4_address_t *) & (mp->dst_address));
+
+  s = format (s, "src %U ", format_ip4_address,
+	      (ip4_address_t *) & (mp->src_address));
+
+  s = format (s, "local_sa %d ", ntohl (mp->local_sa_id));
+
+  s = format (s, "remote_sa %d ", ntohl (mp->remote_sa_id));
+
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_ipsec_gre_tunnel_dump_t_print
+  (vl_api_ipsec_gre_tunnel_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ipsec_gre_tunnel_dump ");
+
+  if (mp->sw_if_index != ~0)
+    s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+  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);
+
+  s = format (0, "SCRIPT: l2_interface_pbb_tag_rewrite ");
+
+  s = format (s, "sw_if_index %d ", ntohl (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, "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));
+    }
+
+  FINISH;
+}
+
+static void *vl_api_flow_classify_set_interface_t_print
+  (vl_api_flow_classify_set_interface_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: flow_classify_set_interface ");
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  if (mp->ip4_table_index != ~0)
+    s = format (s, "ip4-table %d ", ntohl (mp->ip4_table_index));
+  if (mp->ip6_table_index != ~0)
+    s = format (s, "ip6-table %d ", ntohl (mp->ip6_table_index));
+  if (mp->is_add == 0)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *
+vl_api_punt_t_print (vl_api_punt_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: punt ");
+
+  if (mp->ipv != (u8) ~ 0)
+    s = format (s, "ip %d ", mp->ipv);
+
+  s = format (s, "protocol %d ", mp->l4_protocol);
+
+  if (mp->l4_port != (u16) ~ 0)
+    s = format (s, "port %d ", ntohs (mp->l4_port));
+
+  if (!mp->is_add)
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_flow_classify_dump_t_print
+  (vl_api_flow_classify_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: flow_classify_dump ");
+  switch (mp->type)
+    {
+    case FLOW_CLASSIFY_TABLE_IP4:
+      s = format (s, "type ip4 ");
+      break;
+    case FLOW_CLASSIFY_TABLE_IP6:
+      s = format (s, "type ip6 ");
+      break;
+    default:
+      break;
+    }
+
+  FINISH;
+}
+
+static void *vl_api_get_first_msg_id_t_print
+  (vl_api_get_first_msg_id_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: get_first_msg_id %s ", mp->name);
+
+  FINISH;
+}
+
+static void *vl_api_ioam_enable_t_print
+  (vl_api_ioam_enable_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ioam_enable ");
+
+  if (mp->trace_enable)
+    s = format (s, "trace enabled");
+
+  if (mp->pot_enable)
+    s = format (s, "POT enabled");
+
+  if (mp->seqno)
+    s = format (s, "Seqno enabled");
+
+  if (mp->analyse)
+    s = format (s, "Analyse enabled");
+
+  FINISH;
+}
+
+static void *vl_api_ioam_disable_t_print
+  (vl_api_ioam_disable_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: ioam_disable ");
+  s = format (s, "trace disabled");
+  s = format (s, "POT disabled");
+  s = format (s, "Seqno disabled");
+  s = format (s, "Analyse disabled");
+
+  FINISH;
+}
+
+static void *vl_api_feature_enable_disable_t_print
+  (vl_api_feature_enable_disable_t * mp, void *handle)
+{
+  u8 *s;
+
+  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));
+  if (!mp->enable)
+    s = format (s, "disable");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_tag_add_del_t_print
+  (vl_api_sw_interface_tag_add_del_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: sw_interface_tag_add_del ");
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  if (mp->is_add)
+    s = format (s, "tag %s ", mp->tag);
+  else
+    s = format (s, "del ");
+
+  FINISH;
+}
+
+static void *vl_api_sw_interface_set_mtu_t_print
+  (vl_api_sw_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));
+
+  FINISH;
+}
+
+#define foreach_custom_print_no_arg_function                            \
+_(lisp_eid_table_vni_dump)                                              \
+_(lisp_map_resolver_dump)                                               \
+_(lisp_map_server_dump)                                                 \
+_(show_lisp_rloc_probe_state)                                           \
+_(show_lisp_map_register_state)                                         \
+_(show_lisp_map_request_mode)                                           \
+_(lisp_gpe_tunnel_dump)
+
+#define _(f)                                                            \
+static void * vl_api_ ## f ## _t_print                                  \
+  (vl_api_ ## f ## _t * mp, void * handle)                              \
+{                                                                       \
+  u8 * s;                                                               \
+  s = format (0, "SCRIPT: " #f );                                       \
+  FINISH;                                                               \
+}
+foreach_custom_print_no_arg_function
+#undef _
+#define foreach_custom_print_function                                   \
+_(CREATE_LOOPBACK, create_loopback)                                     \
+_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags)                       \
+_(SW_INTERFACE_ADD_DEL_ADDRESS, sw_interface_add_del_address)           \
+_(SW_INTERFACE_SET_TABLE, sw_interface_set_table)                       \
+_(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)         \
+_(TAP_CONNECT, tap_connect)                                             \
+_(TAP_MODIFY, tap_modify)                                               \
+_(TAP_DELETE, tap_delete)                                               \
+_(SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump)                         \
+_(IP_ADD_DEL_ROUTE, ip_add_del_route)                                   \
+_(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)		                \
+_(SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered)             \
+_(IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del)                             \
+_(RESET_VRF, reset_vrf)                                                 \
+_(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)                       \
+_(L2_PATCH_ADD_DEL, l2_patch_add_del)                                   \
+_(SR_TUNNEL_ADD_DEL, sr_tunnel_add_del)					\
+_(SR_POLICY_ADD_DEL, sr_policy_add_del)					\
+_(SR_MULTICAST_MAP_ADD_DEL, sr_multicast_map_add_del)                   \
+_(SW_INTERFACE_SET_L2_XCONNECT, sw_interface_set_l2_xconnect)           \
+_(L2FIB_ADD_DEL, l2fib_add_del)                                         \
+_(L2_FLAGS, l2_flags)                                                   \
+_(BRIDGE_FLAGS, bridge_flags)                                           \
+_(CLASSIFY_ADD_DEL_TABLE, classify_add_del_table)			\
+_(CLASSIFY_ADD_DEL_SESSION, classify_add_del_session)			\
+_(SW_INTERFACE_SET_L2_BRIDGE, sw_interface_set_l2_bridge)		\
+_(SW_INTERFACE_SET_DPDK_HQOS_PIPE, sw_interface_set_dpdk_hqos_pipe)     \
+_(SW_INTERFACE_SET_DPDK_HQOS_SUBPORT, sw_interface_set_dpdk_hqos_subport)\
+_(SW_INTERFACE_SET_DPDK_HQOS_TCTBL, sw_interface_set_dpdk_hqos_tctbl)   \
+_(BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del)                         \
+_(BRIDGE_DOMAIN_DUMP, bridge_domain_dump)                               \
+_(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_PROXY_CONFIG_2, dhcp_proxy_config_2)	                        \
+_(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)     \
+_(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)                                 \
+_(GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel)                               \
+_(GRE_TUNNEL_DUMP, gre_tunnel_dump)                                     \
+_(L2_FIB_CLEAR_TABLE, l2_fib_clear_table)                               \
+_(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter)                     \
+_(L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)         \
+_(CREATE_VHOST_USER_IF, create_vhost_user_if)				\
+_(MODIFY_VHOST_USER_IF, modify_vhost_user_if)				\
+_(DELETE_VHOST_USER_IF, delete_vhost_user_if)				\
+_(SW_INTERFACE_DUMP, sw_interface_dump)					\
+_(CONTROL_PING, control_ping)						\
+_(WANT_INTERFACE_EVENTS, want_interface_events)				\
+_(CLI_REQUEST, cli_request)						\
+_(CLI_INBAND, cli_inband)						\
+_(MEMCLNT_CREATE, memclnt_create)					\
+_(SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump)           \
+_(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)                         \
+_(INTERFACE_NAME_RENUMBER, interface_name_renumber)			\
+_(WANT_IP4_ARP_EVENTS, want_ip4_arp_events)                             \
+_(WANT_IP6_ND_EVENTS, want_ip6_nd_events)                               \
+_(INPUT_ACL_SET_INTERFACE, input_acl_set_interface)                     \
+_(IP_ADDRESS_DUMP, ip_address_dump)                                     \
+_(IP_DUMP, ip_dump)                                                     \
+_(DELETE_LOOPBACK, delete_loopback)                                     \
+_(BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del)					\
+_(COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable) 		\
+_(COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable)           \
+_(AF_PACKET_CREATE, af_packet_create)					\
+_(AF_PACKET_DELETE, af_packet_delete)					\
+_(SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats)                   \
+_(MPLS_FIB_DUMP, mpls_fib_dump)                                         \
+_(MPLS_TUNNEL_DUMP, mpls_tunnel_dump)                                   \
+_(CLASSIFY_TABLE_IDS,classify_table_ids)                                \
+_(CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface)             \
+_(CLASSIFY_TABLE_INFO,classify_table_info)                              \
+_(CLASSIFY_SESSION_DUMP,classify_session_dump)                          \
+_(SET_IPFIX_EXPORTER, set_ipfix_exporter)                               \
+_(IPFIX_EXPORTER_DUMP, ipfix_exporter_dump)                             \
+_(SET_IPFIX_CLASSIFY_STREAM, set_ipfix_classify_stream)                 \
+_(IPFIX_CLASSIFY_STREAM_DUMP, ipfix_classify_stream_dump)               \
+_(IPFIX_CLASSIFY_TABLE_ADD_DEL, ipfix_classify_table_add_del)           \
+_(IPFIX_CLASSIFY_TABLE_DUMP, ipfix_classify_table_dump)                 \
+_(SW_INTERFACE_SPAN_ENABLE_DISABLE, sw_interface_span_enable_disable)   \
+_(SW_INTERFACE_SPAN_DUMP, sw_interface_span_dump)                       \
+_(GET_NEXT_INDEX, get_next_index)                                       \
+_(PG_CREATE_INTERFACE,pg_create_interface)                              \
+_(PG_CAPTURE, pg_capture)                                               \
+_(PG_ENABLE_DISABLE, pg_enable_disable)                                 \
+_(POLICER_ADD_DEL, policer_add_del)                                     \
+_(POLICER_DUMP, policer_dump)                                           \
+_(POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface)       \
+_(POLICER_CLASSIFY_DUMP, policer_classify_dump)                         \
+_(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL,                               \
+  ip_source_and_port_range_check_add_del)                               \
+_(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL,                     \
+  ip_source_and_port_range_check_interface_add_del)                     \
+_(LISP_ENABLE_DISABLE, lisp_enable_disable)                             \
+_(LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable)                     \
+_(LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface)                       \
+_(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set)                 \
+_(LISP_MAP_REQUEST_MODE, lisp_map_request_mode)                         \
+_(SHOW_LISP_MAP_REQUEST_MODE, show_lisp_map_request_mode)               \
+_(LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping)             \
+_(LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency)                       \
+_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS,                                   \
+  lisp_add_del_map_request_itr_rlocs)                                   \
+_(LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map)               \
+_(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid)                       \
+_(LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry)               \
+_(LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set)                   \
+_(LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver)                 \
+_(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator)                           \
+_(LISP_EID_TABLE_DUMP, lisp_eid_table_dump)                             \
+_(LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump)                     \
+_(LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_dump)                     \
+_(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump)                           \
+_(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump)                       \
+_(LISP_MAP_SERVER_DUMP, lisp_map_server_dump)                           \
+_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump)                         \
+_(LISP_LOCATOR_DUMP, lisp_locator_dump)                                 \
+_(LISP_ADJACENCIES_GET, lisp_adjacencies_get)                           \
+_(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)                         \
+_(DELETE_SUBIF, delete_subif)                                           \
+_(L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite)           \
+_(PUNT, punt)                                                           \
+_(FLOW_CLASSIFY_SET_INTERFACE, flow_classify_set_interface)             \
+_(FLOW_CLASSIFY_DUMP, flow_classify_dump)				\
+_(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)                                           \
+_(FEATURE_ENABLE_DISABLE, feature_enable_disable)			\
+_(SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del)			\
+_(SW_INTERFACE_SET_MTU, sw_interface_set_mtu)
+  void
+vl_msg_api_custom_dump_configure (api_main_t * am)
+{
+#define _(n,f) am->msg_print_handlers[VL_API_##n]       \
+    = (void *) vl_api_##f##_t_print;
+  foreach_custom_print_function;
+#undef _
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/api/gmon.c b/src/vpp/api/gmon.c
new file mode 100644
index 00000000..20deb6a2
--- /dev/null
+++ b/src/vpp/api/gmon.c
@@ -0,0 +1,319 @@
+/*
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <time.h>
+#include <fcntl.h>
+#include <string.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/time.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/format.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vnet/api_errno.h>
+
+#include <svm/svmdb.h>
+
+typedef struct
+{
+  svmdb_client_t *svmdb_client;
+  f64 *vector_rate_ptr;
+  f64 *input_rate_ptr;
+  f64 *sig_error_rate_ptr;
+  pid_t *vpef_pid_ptr;
+  u64 last_sig_errors;
+  u64 current_sig_errors;
+  uword *sig_error_bitmap;
+  vlib_main_t *vlib_main;
+  vlib_main_t **my_vlib_mains;
+
+} gmon_main_t;
+
+#if DPDK == 0
+static inline u64
+vnet_get_aggregate_rx_packets (void)
+{
+  return 0;
+}
+#else
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/devices/dpdk/dpdk.h>
+#endif
+
+gmon_main_t gmon_main;
+
+static u64
+get_significant_errors (gmon_main_t * gm)
+{
+  vlib_main_t *this_vlib_main;
+  vlib_error_main_t *em;
+  uword code;
+  int vm_index;
+  u64 significant_errors = 0;
+
+  /* *INDENT-OFF* */
+  clib_bitmap_foreach (code, gm->sig_error_bitmap,
+  ({
+    for (vm_index = 0; vm_index < vec_len (gm->my_vlib_mains); vm_index++)
+      {
+        this_vlib_main = gm->my_vlib_mains[vm_index];
+        em = &this_vlib_main->error_main;
+        significant_errors += em->counters[code] -
+          ((vec_len(em->counters_last_clear) > code) ?
+           em->counters_last_clear[code] : 0);
+      }
+  }));
+  /* *INDENT-ON* */
+
+  return (significant_errors);
+}
+
+static clib_error_t *
+publish_pid (vlib_main_t * vm)
+{
+  gmon_main_t *gm = &gmon_main;
+
+  *gm->vpef_pid_ptr = getpid ();
+
+  return 0;
+}
+
+VLIB_API_INIT_FUNCTION (publish_pid);
+
+
+static uword
+gmon_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  f64 vector_rate;
+  u64 input_packets, last_input_packets, new_sig_errors;
+  f64 last_runtime, dt, now;
+  gmon_main_t *gm = &gmon_main;
+  int i;
+
+  last_runtime = 0.0;
+  last_input_packets = 0;
+
+  last_runtime = 0.0;
+  last_input_packets = 0;
+
+  /* Initial wait for the world to settle down */
+  vlib_process_suspend (vm, 5.0);
+
+  if (vec_len (vlib_mains) == 0)
+    vec_add1 (gm->my_vlib_mains, &vlib_global_main);
+  else
+    {
+      for (i = 0; i < vec_len (vlib_mains); i++)
+	vec_add1 (gm->my_vlib_mains, vlib_mains[i]);
+    }
+
+  while (1)
+    {
+      vlib_process_suspend (vm, 5.0);
+      vector_rate = vlib_last_vector_length_per_node (vm);
+      *gm->vector_rate_ptr = vector_rate;
+      now = vlib_time_now (vm);
+      dt = now - last_runtime;
+      input_packets = vnet_get_aggregate_rx_packets ();
+      *gm->input_rate_ptr = (f64) (input_packets - last_input_packets) / dt;
+      last_runtime = now;
+      last_input_packets = input_packets;
+
+      new_sig_errors = get_significant_errors (gm);
+      *gm->sig_error_rate_ptr =
+	((f64) (new_sig_errors - gm->last_sig_errors)) / dt;
+      gm->last_sig_errors = new_sig_errors;
+    }
+
+  return 0;			/* not so much */
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (gmon_process_node,static) = {
+  .function = gmon_process,
+  .type = VLIB_NODE_TYPE_PROCESS,
+  .name = "gmon-process",
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+gmon_init (vlib_main_t * vm)
+{
+  gmon_main_t *gm = &gmon_main;
+  api_main_t *am = &api_main;
+  pid_t *swp = 0;
+  f64 *v = 0;
+  clib_error_t *error;
+  svmdb_map_args_t _ma, *ma = &_ma;
+
+  if ((error = vlib_call_init_function (vm, vpe_api_init)))
+    return (error);
+
+  if ((error = vlib_call_init_function (vm, vlibmemory_init)))
+    return (error);
+
+  gm->vlib_main = vm;
+
+  memset (ma, 0, sizeof (*ma));
+  ma->root_path = am->root_path;
+  ma->uid = am->api_uid;
+  ma->gid = am->api_gid;
+
+  gm->svmdb_client = svmdb_map (ma);
+
+  /* Find or create, set to zero */
+  vec_add1 (v, 0.0);
+  svmdb_local_set_vec_variable (gm->svmdb_client,
+				"vpp_vector_rate", (char *) v, sizeof (*v));
+  vec_free (v);
+  vec_add1 (v, 0.0);
+  svmdb_local_set_vec_variable (gm->svmdb_client,
+				"vpp_input_rate", (char *) v, sizeof (*v));
+  vec_free (v);
+  vec_add1 (v, 0.0);
+  svmdb_local_set_vec_variable (gm->svmdb_client,
+				"vpp_sig_error_rate",
+				(char *) v, sizeof (*v));
+  vec_free (v);
+
+  vec_add1 (swp, 0.0);
+  svmdb_local_set_vec_variable (gm->svmdb_client,
+				"vpp_pid", (char *) swp, sizeof (*swp));
+  vec_free (swp);
+
+  /* the value cells will never move, so acquire references to them */
+  gm->vector_rate_ptr =
+    svmdb_local_get_variable_reference (gm->svmdb_client,
+					SVMDB_NAMESPACE_VEC,
+					"vpp_vector_rate");
+  gm->input_rate_ptr =
+    svmdb_local_get_variable_reference (gm->svmdb_client,
+					SVMDB_NAMESPACE_VEC,
+					"vpp_input_rate");
+  gm->sig_error_rate_ptr =
+    svmdb_local_get_variable_reference (gm->svmdb_client,
+					SVMDB_NAMESPACE_VEC,
+					"vpp_sig_error_rate");
+  gm->vpef_pid_ptr =
+    svmdb_local_get_variable_reference (gm->svmdb_client,
+					SVMDB_NAMESPACE_VEC, "vpp_pid");
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (gmon_init);
+
+static clib_error_t *
+gmon_exit (vlib_main_t * vm)
+{
+  gmon_main_t *gm = &gmon_main;
+
+  if (gm->vector_rate_ptr)
+    {
+      *gm->vector_rate_ptr = 0.0;
+      *gm->vpef_pid_ptr = 0;
+      *gm->input_rate_ptr = 0.0;
+      *gm->sig_error_rate_ptr = 0.0;
+      svm_region_unmap ((void *) gm->svmdb_client->db_rp);
+      vec_free (gm->svmdb_client);
+    }
+  return 0;
+}
+
+VLIB_MAIN_LOOP_EXIT_FUNCTION (gmon_exit);
+
+static int
+significant_error_enable_disable (gmon_main_t * gm, u32 index, int enable)
+{
+  vlib_main_t *vm = gm->vlib_main;
+  vlib_error_main_t *em = &vm->error_main;
+
+  if (index >= vec_len (em->counters))
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+  gm->sig_error_bitmap =
+    clib_bitmap_set (gm->sig_error_bitmap, index, enable);
+  return 0;
+}
+
+static clib_error_t *
+set_significant_error_command_fn (vlib_main_t * vm,
+				  unformat_input_t * input,
+				  vlib_cli_command_t * cmd)
+{
+  u32 index;
+  int enable = 1;
+  int rv;
+  gmon_main_t *gm = &gmon_main;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%d", &index))
+	;
+      else if (unformat (input, "disable"))
+	enable = 0;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+
+  rv = significant_error_enable_disable (gm, index, enable);
+
+  switch (rv)
+    {
+    case 0:
+      break;
+
+    default:
+      return clib_error_return
+	(0, "significant_error_enable_disable returned %d", rv);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_significant_error_command, static) = {
+  .path = "set significant error",
+  .short_help = "set significant error <counter-index-nnn> [disable]",
+  .function = set_significant_error_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/api/json_format.c b/src/vpp/api/json_format.c
new file mode 100644
index 00000000..63454b87
--- /dev/null
+++ b/src/vpp/api/json_format.c
@@ -0,0 +1,304 @@
+/*
+ *------------------------------------------------------------------
+ * json_format.c
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+
+*/
+#include <inttypes.h>
+#include "json_format.h"
+#include <vnet/ip/ip.h>
+#include <vppinfra/vec.h>
+
+#define VAT_TAB_WIDTH               2
+
+typedef struct vat_print_ctx_s
+{
+  FILE *ofp;
+  u32 indent;
+} vat_print_ctx_t;
+
+/* Format an IP4 address. */
+static u8 *
+vat_json_format_ip4_address (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
+}
+
+/* Format an IP6 address. */
+static u8 *
+vat_json_format_ip6_address (u8 * s, va_list * args)
+{
+  ip6_address_t *a = va_arg (*args, ip6_address_t *);
+  u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
+
+  i_max_n_zero = ARRAY_LEN (a->as_u16);
+  max_n_zeros = 0;
+  i_first_zero = i_max_n_zero;
+  n_zeros = 0;
+  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+    {
+      u32 is_zero = a->as_u16[i] == 0;
+      if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
+	{
+	  i_first_zero = i;
+	  n_zeros = 0;
+	}
+      n_zeros += is_zero;
+      if ((!is_zero && n_zeros > max_n_zeros)
+	  || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
+	{
+	  i_max_n_zero = i_first_zero;
+	  max_n_zeros = n_zeros;
+	  i_first_zero = ARRAY_LEN (a->as_u16);
+	  n_zeros = 0;
+	}
+    }
+
+  last_double_colon = 0;
+  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+    {
+      if (i == i_max_n_zero && max_n_zeros > 1)
+	{
+	  s = format (s, "::");
+	  i += max_n_zeros - 1;
+	  last_double_colon = 1;
+	}
+      else
+	{
+	  s = format (s, "%s%x",
+		      (last_double_colon || i == 0) ? "" : ":",
+		      clib_net_to_host_u16 (a->as_u16[i]));
+	  last_double_colon = 0;
+	}
+    }
+
+  return s;
+}
+
+static void
+vat_json_indent_print (vat_print_ctx_t * ctx)
+{
+  int i;
+  for (i = 0; i < ctx->indent * VAT_TAB_WIDTH; i++)
+    {
+      fformat (ctx->ofp, " ");
+    }
+}
+
+static void
+vat_json_indent_line (vat_print_ctx_t * ctx, char *fmt, ...)
+{
+  va_list va;
+
+  vat_json_indent_print (ctx);
+  va_start (va, fmt);
+  va_fformat (ctx->ofp, fmt, &va);
+  va_end (va);
+}
+
+static u8
+is_num_only (vat_json_node_t * p)
+{
+  vat_json_node_t *elem;
+  vec_foreach (elem, p)
+  {
+    if (VAT_JSON_INT != elem->type && VAT_JSON_UINT != elem->type)
+      {
+	return 0;
+      }
+  }
+  return 1;
+}
+
+static void
+vat_json_print_internal (vat_print_ctx_t * ctx, vat_json_node_t * node)
+{
+#define P(fmt,...) fformat(ctx->ofp, fmt, ##__VA_ARGS__)
+#define PL(fmt,...) fformat(ctx->ofp, fmt"\n", ##__VA_ARGS__)
+#define PPL(fmt,...) vat_json_indent_line(ctx, fmt"\n", ##__VA_ARGS__)
+#define PP(fmt,...) vat_json_indent_line(ctx, fmt, ##__VA_ARGS__)
+#define INCR (ctx->indent++)
+#define DECR (ctx->indent--)
+
+  vat_json_pair_t *pair;
+  u32 i, count;
+  vat_json_node_t *elem;
+  u8 num_only = 0;
+
+  if (!node)
+    {
+      return;
+    }
+
+  switch (node->type)
+    {
+    case VAT_JSON_OBJECT:
+      count = vec_len (node->pairs);
+      if (count >= 1)
+	{
+	  PL ("{");
+	  INCR;
+	  for (i = 0; i < count; i++)
+	    {
+	      pair = &node->pairs[i];
+	      PP ("\"%s\": ", pair->name);
+	      vat_json_print_internal (ctx, &pair->value);
+	      if (i < count - 1)
+		{
+		  P (",");
+		}
+	      PL ();
+	    }
+	  DECR;
+	  PP ("}");
+	}
+      else
+	{
+	  P ("{}");
+	}
+      break;
+    case VAT_JSON_ARRAY:
+      num_only = is_num_only (node->array);
+      count = vec_len (node->array);
+      if (count >= 1)
+	{
+	  if (num_only)
+	    P ("[");
+	  else
+	    PL ("[ ");
+	  INCR;
+	  for (i = 0; i < count; i++)
+	    {
+	      elem = &node->array[i];
+	      if (!num_only)
+		{
+		  vat_json_indent_print (ctx);
+		}
+	      vat_json_print_internal (ctx, elem);
+	      if (i < count - 1)
+		{
+		  if (num_only)
+		    {
+		      P (", ");
+		    }
+		  else
+		    {
+		      P (",");
+		    }
+		}
+	      if (!num_only)
+		PL ();
+	    }
+	  DECR;
+	  if (!num_only)
+	    PP ("]");
+	  else
+	    P ("]");
+	}
+      else
+	{
+	  P ("[]");
+	}
+      break;
+    case VAT_JSON_INT:
+      P ("%d", node->sint);
+      break;
+    case VAT_JSON_UINT:
+      P ("%" PRIu64, node->uint);
+      break;
+    case VAT_JSON_REAL:
+      P ("%f", node->real);
+      break;
+    case VAT_JSON_STRING:
+      P ("\"%s\"", node->string);
+      break;
+    case VAT_JSON_IPV4:
+      P ("\"%U\"", vat_json_format_ip4_address, &node->ip4);
+      break;
+    case VAT_JSON_IPV6:
+      P ("\"%U\"", vat_json_format_ip6_address, &node->ip6);
+      break;
+    default:
+      break;
+    }
+#undef PPL
+#undef PP
+#undef PL
+#undef P
+}
+
+void
+vat_json_print (FILE * ofp, vat_json_node_t * node)
+{
+  vat_print_ctx_t ctx;
+  memset (&ctx, 0, sizeof ctx);
+  ctx.indent = 0;
+  ctx.ofp = ofp;
+  fformat (ofp, "\n");
+  vat_json_print_internal (&ctx, node);
+  fformat (ofp, "\n");
+}
+
+void
+vat_json_free (vat_json_node_t * node)
+{
+  int i = 0;
+
+  if (NULL == node)
+    {
+      return;
+    }
+  switch (node->type)
+    {
+    case VAT_JSON_OBJECT:
+      for (i = 0; i < vec_len (node->pairs); i++)
+	{
+	  vat_json_free (&node->pairs[i].value);
+	}
+      if (NULL != node->pairs)
+	{
+	  vec_free (node->pairs);
+	}
+      break;
+    case VAT_JSON_ARRAY:
+      for (i = 0; i < vec_len (node->array); i++)
+	{
+	  vat_json_free (&node->array[i]);
+	}
+      if (NULL != node->array)
+	{
+	  vec_free (node->array);
+	}
+      break;
+    case VAT_JSON_STRING:
+      if (NULL != node->string)
+	{
+	  vec_free (node->string);
+	}
+      break;
+    default:
+      break;
+    }
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/api/json_format.h b/src/vpp/api/json_format.h
new file mode 100644
index 00000000..154fb3df
--- /dev/null
+++ b/src/vpp/api/json_format.h
@@ -0,0 +1,254 @@
+/*
+ *------------------------------------------------------------------
+ * json_format.h
+ *
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef __JSON_FORMAT_H__
+#define __JSON_FORMAT_H__
+
+#include <vppinfra/clib.h>
+#include <vppinfra/format.h>
+#include <netinet/ip.h>
+
+/* JSON value type */
+typedef enum
+{
+  VAT_JSON_NONE,
+  VAT_JSON_OBJECT,
+  VAT_JSON_ARRAY,
+  VAT_JSON_STRING,
+  VAT_JSON_REAL,
+  VAT_JSON_UINT,
+  VAT_JSON_INT,
+  VAT_JSON_IPV4,
+  VAT_JSON_IPV6,
+  VAT_JSON_MAX
+} vat_json_val_type_t;
+
+typedef struct vat_json_node_s vat_json_node_t;
+typedef struct vat_json_pair_s vat_json_pair_t;
+
+/* JSON object structure */
+struct vat_json_node_s
+{
+  vat_json_val_type_t type;
+  union
+  {
+    vat_json_pair_t *pairs;
+    vat_json_node_t *array;
+    u8 *string;
+    struct in_addr ip4;
+    struct in6_addr ip6;
+    u64 uint;
+    i64 sint;
+    f64 real;
+  };
+};
+
+struct vat_json_pair_s
+{
+  const char *name;
+  vat_json_node_t value;
+};
+
+void vat_json_print (FILE * ofp, vat_json_node_t * node);
+void vat_json_free (vat_json_node_t * node);
+
+static_always_inline void
+vat_json_init_object (vat_json_node_t * json)
+{
+  json->type = VAT_JSON_OBJECT;
+  json->pairs = NULL;
+}
+
+static_always_inline void
+vat_json_init_array (vat_json_node_t * json)
+{
+  json->type = VAT_JSON_ARRAY;
+  json->array = NULL;
+}
+
+static_always_inline void
+vat_json_set_string (vat_json_node_t * json, u8 * str)
+{
+  json->type = VAT_JSON_STRING;
+  json->string = str;
+}
+
+static_always_inline void
+vat_json_set_string_copy (vat_json_node_t * json, const u8 * str)
+{
+  u8 *ns = NULL;
+  vec_validate (ns, strlen ((const char *) str));
+  strcpy ((char *) ns, (const char *) str);
+  vec_add1 (ns, '\0');
+  vat_json_set_string (json, ns);
+}
+
+static_always_inline void
+vat_json_set_int (vat_json_node_t * json, i64 num)
+{
+  json->type = VAT_JSON_INT;
+  json->sint = num;
+}
+
+static_always_inline void
+vat_json_set_uint (vat_json_node_t * json, u64 num)
+{
+  json->type = VAT_JSON_UINT;
+  json->uint = num;
+}
+
+static_always_inline void
+vat_json_set_real (vat_json_node_t * json, f64 real)
+{
+  json->type = VAT_JSON_REAL;
+  json->real = real;
+}
+
+static_always_inline void
+vat_json_set_ip4 (vat_json_node_t * json, struct in_addr ip4)
+{
+  json->type = VAT_JSON_IPV4;
+  json->ip4 = ip4;
+}
+
+static_always_inline void
+vat_json_set_ip6 (vat_json_node_t * json, struct in6_addr ip6)
+{
+  json->type = VAT_JSON_IPV6;
+  json->ip6 = ip6;
+}
+
+static_always_inline vat_json_node_t *
+vat_json_object_add (vat_json_node_t * json, const char *name)
+{
+  ASSERT (VAT_JSON_OBJECT == json->type);
+  uword pos = vec_len (json->pairs);
+  vec_validate (json->pairs, pos);
+  json->pairs[pos].name = name;
+  return &json->pairs[pos].value;
+}
+
+static_always_inline vat_json_node_t *
+vat_json_array_add (vat_json_node_t * json)
+{
+  ASSERT (VAT_JSON_ARRAY == json->type);
+  uword pos = vec_len (json->array);
+  vec_validate (json->array, pos);
+  return &json->array[pos];
+}
+
+static_always_inline vat_json_node_t *
+vat_json_object_add_list (vat_json_node_t * json, const char *name)
+{
+  vat_json_node_t *array_node = vat_json_object_add (json, name);
+  vat_json_init_array (array_node);
+  return array_node;
+}
+
+static_always_inline void
+vat_json_object_add_string_copy (vat_json_node_t * json,
+				 const char *name, u8 * str)
+{
+  vat_json_set_string_copy (vat_json_object_add (json, name), str);
+}
+
+static_always_inline void
+vat_json_object_add_uint (vat_json_node_t * json,
+			  const char *name, u64 number)
+{
+  vat_json_set_uint (vat_json_object_add (json, name), number);
+}
+
+static_always_inline void
+vat_json_object_add_int (vat_json_node_t * json, const char *name, i64 number)
+{
+  vat_json_set_int (vat_json_object_add (json, name), number);
+}
+
+static_always_inline void
+vat_json_object_add_real (vat_json_node_t * json, const char *name, f64 real)
+{
+  vat_json_set_real (vat_json_object_add (json, name), real);
+}
+
+static_always_inline void
+vat_json_object_add_ip4 (vat_json_node_t * json,
+			 const char *name, struct in_addr ip4)
+{
+  vat_json_set_ip4 (vat_json_object_add (json, name), ip4);
+}
+
+static_always_inline void
+vat_json_object_add_ip6 (vat_json_node_t * json,
+			 const char *name, struct in6_addr ip6)
+{
+  vat_json_set_ip6 (vat_json_object_add (json, name), ip6);
+}
+
+static_always_inline void
+vat_json_array_add_int (vat_json_node_t * json, i64 number)
+{
+  vat_json_set_int (vat_json_array_add (json), number);
+}
+
+static_always_inline void
+vat_json_array_add_uint (vat_json_node_t * json, u64 number)
+{
+  vat_json_set_uint (vat_json_array_add (json), number);
+}
+
+static_always_inline void
+vat_json_object_add_bytes (vat_json_node_t * json,
+			   const char *name, u8 * array, uword size)
+{
+  ASSERT (VAT_JSON_OBJECT == json->type);
+  vat_json_node_t *json_array = vat_json_object_add (json, name);
+  vat_json_init_array (json_array);
+  int i;
+  for (i = 0; i < size; i++)
+    {
+      vat_json_array_add_uint (json_array, array[i]);
+    }
+}
+
+static_always_inline vat_json_node_t *
+vat_json_object_get_element (vat_json_node_t * json, const char *name)
+{
+  int i = 0;
+
+  ASSERT (VAT_JSON_OBJECT == json->type);
+  for (i = 0; i < vec_len (json->pairs); i++)
+    {
+      if (0 == strcmp (json->pairs[i].name, name))
+	{
+	  return &json->pairs[i].value;
+	}
+    }
+  return NULL;
+}
+
+#endif /* __JSON_FORMAT_H__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/api/summary_stats_client.c b/src/vpp/api/summary_stats_client.c
new file mode 100644
index 00000000..03999567
--- /dev/null
+++ b/src/vpp/api/summary_stats_client.c
@@ -0,0 +1,302 @@
+/*
+ *------------------------------------------------------------------
+ * summary_stats_client -
+ *
+ * Copyright (c) 2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <signal.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <time.h>
+#include <fcntl.h>
+#include <string.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/time.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/format.h>
+#include <vppinfra/error.h>
+
+#include <vnet/vnet.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#include <vpp/api/vpe_msg_enum.h>
+
+#include <vnet/ip/ip.h>
+
+#define f64_endian(a)
+#define f64_print(a,b)
+
+#define vl_typedefs		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_printfun
+
+vl_shmem_hdr_t *shmem_hdr;
+
+typedef struct
+{
+  volatile int sigterm_received;
+
+  struct sockaddr_in send_data_addr;
+  int send_data_socket;
+  u8 *display_name;
+
+  /* convenience */
+  unix_shared_memory_queue_t *vl_input_queue;
+  u32 my_client_index;
+} test_main_t;
+
+test_main_t test_main;
+
+/*
+ * Satisfy external references when -lvlib is not available.
+ */
+vlib_main_t vlib_global_main;
+vlib_main_t **vlib_mains;
+
+void
+vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...)
+{
+  clib_warning ("vlib_cli_output callled...");
+}
+
+
+static void
+vl_api_vnet_summary_stats_reply_t_handler (vl_api_vnet_summary_stats_reply_t *
+					   mp)
+{
+  test_main_t *tm = &test_main;
+  static u8 *sb;
+  int n;
+
+  printf ("total rx pkts %llu, total rx bytes %llu\n",
+	  (unsigned long long) mp->total_pkts[0],
+	  (unsigned long long) mp->total_bytes[0]);
+  printf ("total tx pkts %llu, total tx bytes %llu\n",
+	  (unsigned long long) mp->total_pkts[1],
+	  (unsigned long long) mp->total_bytes[1]);
+  printf ("vector rate %.2f\n", mp->vector_rate);
+
+  vec_reset_length (sb);
+  sb = format (sb, "%v,%.0f,%llu,%llu,%llu,%llu\n%c",
+	       tm->display_name, mp->vector_rate,
+	       (unsigned long long) mp->total_pkts[0],
+	       (unsigned long long) mp->total_bytes[0],
+	       (unsigned long long) mp->total_pkts[1],
+	       (unsigned long long) mp->total_bytes[1], 0);
+
+  n = sendto (tm->send_data_socket, sb, vec_len (sb),
+	      0, (struct sockaddr *) &tm->send_data_addr,
+	      sizeof (tm->send_data_addr));
+
+  if (n != vec_len (sb))
+    clib_unix_warning ("sendto");
+
+}
+
+#define foreach_api_msg                                                 \
+_(VNET_SUMMARY_STATS_REPLY, vnet_summary_stats_reply)
+
+int
+connect_to_vpe (char *name)
+{
+  int rv = 0;
+
+  rv = vl_client_connect_to_vlib ("/vpe-api", name, 32);
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_api_msg;
+#undef _
+
+  shmem_hdr = api_main.shmem_hdr;
+
+  return rv;
+}
+
+int
+disconnect_from_vpe (void)
+{
+  vl_client_disconnect_from_vlib ();
+  return 0;
+}
+
+static void
+sigterm_handler (int sig)
+{
+  test_main_t *tm = &test_main;
+  tm->sigterm_received = 1;
+}
+
+/* Parse an IP4 address %d.%d.%d.%d. */
+uword
+unformat_ip4_address (unformat_input_t * input, va_list * args)
+{
+  u8 *result = va_arg (*args, u8 *);
+  unsigned a[4];
+
+  if (!unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]))
+    return 0;
+
+  if (a[0] >= 256 || a[1] >= 256 || a[2] >= 256 || a[3] >= 256)
+    return 0;
+
+  result[0] = a[0];
+  result[1] = a[1];
+  result[2] = a[2];
+  result[3] = a[3];
+
+  return 1;
+}
+
+int
+main (int argc, char **argv)
+{
+  api_main_t *am = &api_main;
+  test_main_t *tm = &test_main;
+  vl_api_vnet_get_summary_stats_t *mp;
+  unformat_input_t _input, *input = &_input;
+  clib_error_t *error = 0;
+  ip4_address_t collector_ip;
+  u8 *display_name = 0;
+  u16 collector_port = 7654;
+
+  collector_ip.as_u32 = (u32) ~ 0;
+
+  unformat_init_command_line (input, argv);
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "collector-ip %U",
+		    unformat_ip4_address, &collector_ip))
+	;
+      else if (unformat (input, "display-name %v", &display_name))
+	;
+      else if (unformat (input, "collector-port %d", &collector_port))
+	;
+      else
+	{
+	  error =
+	    clib_error_return
+	    (0, "Usage: %s collector-ip <ip>\n"
+	     "    [display-name <string>] [collector-port <num>]\n"
+	     "    port defaults to 7654", argv[0]);
+	  break;
+	}
+    }
+
+  if (error == 0 && collector_ip.as_u32 == (u32) ~ 0)
+    error = clib_error_return (0, "collector-ip not set...\n");
+
+
+  if (error)
+    {
+      clib_error_report (error);
+      exit (1);
+    }
+
+  if (display_name == 0)
+    {
+      display_name = format (0, "vpe-to-%d.%d.%d.%d",
+			     collector_ip.as_u8[0],
+			     collector_ip.as_u8[1],
+			     collector_ip.as_u8[2], collector_ip.as_u8[3]);
+    }
+
+
+  connect_to_vpe ("test_client");
+
+  tm->vl_input_queue = shmem_hdr->vl_input_queue;
+  tm->my_client_index = am->my_client_index;
+  tm->display_name = display_name;
+
+  signal (SIGTERM, sigterm_handler);
+  signal (SIGINT, sigterm_handler);
+  signal (SIGQUIT, sigterm_handler);
+
+  /* data (multicast) RX socket */
+  tm->send_data_socket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+  if (tm->send_data_socket < 0)
+    {
+      clib_unix_warning (0, "data_rx_socket");
+      exit (1);
+    }
+
+  memset (&tm->send_data_addr, 0, sizeof (tm->send_data_addr));
+  tm->send_data_addr.sin_family = AF_INET;
+  tm->send_data_addr.sin_addr.s_addr = collector_ip.as_u32;
+  tm->send_data_addr.sin_port = htons (collector_port);
+
+  fformat (stdout, "Send SIGINT or SIGTERM to quit...\n");
+
+  while (1)
+    {
+      sleep (5);
+
+      if (tm->sigterm_received)
+	break;
+      /* Poll for stats */
+      mp = vl_msg_api_alloc (sizeof (*mp));
+      memset (mp, 0, sizeof (*mp));
+      mp->_vl_msg_id = ntohs (VL_API_VNET_GET_SUMMARY_STATS);
+      mp->client_index = tm->my_client_index;
+      vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+    }
+
+  fformat (stdout, "Exiting...\n");
+
+  disconnect_from_vpe ();
+  exit (0);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/api/test_client.c b/src/vpp/api/test_client.c
new file mode 100644
index 00000000..5c568950
--- /dev/null
+++ b/src/vpp/api/test_client.c
@@ -0,0 +1,1531 @@
+/*
+ *------------------------------------------------------------------
+ * api.c - message handler registration
+ *
+ * Copyright (c) 2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <time.h>
+#include <fcntl.h>
+#include <string.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/time.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/format.h>
+#include <vppinfra/error.h>
+
+#include <vnet/vnet.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#include <vpp/api/vpe_msg_enum.h>
+
+#include <vnet/ip/ip.h>
+#include <vnet/interface.h>
+
+#define f64_endian(a)
+#define f64_print(a,b)
+
+#define vl_typedefs		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_printfun
+
+vl_shmem_hdr_t *shmem_hdr;
+
+typedef struct
+{
+  int link_events_on;
+  int stats_on;
+  int oam_events_on;
+
+  /* convenience */
+  unix_shared_memory_queue_t *vl_input_queue;
+  u32 my_client_index;
+} test_main_t;
+
+test_main_t test_main;
+
+/*
+ * Satisfy external references when -lvlib is not available.
+ */
+vlib_main_t vlib_global_main;
+vlib_main_t **vlib_mains;
+
+void
+vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...)
+{
+  clib_warning ("vlib_cli_output callled...");
+}
+
+u8 *
+format_ethernet_address (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+
+  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+		 a[0], a[1], a[2], a[3], a[4], a[5]);
+}
+
+static void
+vl_api_sw_interface_details_t_handler (vl_api_sw_interface_details_t * mp)
+{
+  char *duplex, *speed;
+
+  switch (mp->link_duplex << VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT)
+    {
+    case VNET_HW_INTERFACE_FLAG_HALF_DUPLEX:
+      duplex = "half";
+      break;
+    case VNET_HW_INTERFACE_FLAG_FULL_DUPLEX:
+      duplex = "full";
+      break;
+    default:
+      duplex = "bogus";
+      break;
+    }
+  switch (mp->link_speed << VNET_HW_INTERFACE_FLAG_SPEED_SHIFT)
+    {
+    case VNET_HW_INTERFACE_FLAG_SPEED_10M:
+      speed = "10Mbps";
+      break;
+    case VNET_HW_INTERFACE_FLAG_SPEED_100M:
+      speed = "100Mbps";
+      break;
+    case VNET_HW_INTERFACE_FLAG_SPEED_1G:
+      speed = "1Gbps";
+      break;
+    case VNET_HW_INTERFACE_FLAG_SPEED_10G:
+      speed = "10Gbps";
+      break;
+    case VNET_HW_INTERFACE_FLAG_SPEED_40G:
+      speed = "40Gbps";
+      break;
+    case VNET_HW_INTERFACE_FLAG_SPEED_100G:
+      speed = "100Gbps";
+      break;
+    default:
+      speed = "bogus";
+      break;
+    }
+  fformat (stdout, "details: %s sw_if_index %d sup_sw_if_index %d "
+	   "link_duplex %s link_speed %s",
+	   mp->interface_name, ntohl (mp->sw_if_index),
+	   ntohl (mp->sup_sw_if_index), duplex, speed);
+
+  if (mp->l2_address_length)
+    fformat (stdout, "  l2 address: %U\n",
+	     format_ethernet_address, mp->l2_address);
+  else
+    fformat (stdout, "\n");
+}
+
+static void
+vl_api_sw_interface_set_flags_t_handler (vl_api_sw_interface_set_flags_t * mp)
+{
+  fformat (stdout, "set flags: sw_if_index %d, admin %s link %s\n",
+	   ntohl (mp->sw_if_index),
+	   mp->admin_up_down ? "up" : "down",
+	   mp->link_up_down ? "up" : "down");
+}
+
+static void
+  vl_api_sw_interface_set_flags_reply_t_handler
+  (vl_api_sw_interface_set_flags_reply_t * mp)
+{
+  fformat (stdout, "set flags reply: reply %d\n", ntohl (mp->retval));
+}
+
+static void
+  vl_api_want_interface_events_reply_t_handler
+  (vl_api_want_interface_events_reply_t * mp)
+{
+}
+
+static void
+vl_api_want_stats_reply_t_handler (vl_api_want_stats_reply_t * mp)
+{
+  fformat (stdout, "want stats reply %d\n", ntohl (mp->retval));
+}
+
+static void
+vl_api_want_oam_events_reply_t_handler (vl_api_want_oam_events_reply_t * mp)
+{
+  fformat (stdout, "want oam reply %d\n", ntohl (mp->retval));
+}
+
+static void
+vl_api_ip_add_del_route_reply_t_handler (vl_api_ip_add_del_route_reply_t * mp)
+{
+  fformat (stdout, "add_route reply %d\n", ntohl (mp->retval));
+}
+
+static void
+  vl_api_sw_interface_add_del_address_reply_t_handler
+  (vl_api_sw_interface_add_del_address_reply_t * mp)
+{
+  fformat (stdout, "add_del_address reply %d\n", ntohl (mp->retval));
+}
+
+static void
+  vl_api_sw_interface_set_table_reply_t_handler
+  (vl_api_sw_interface_set_table_reply_t * mp)
+{
+  fformat (stdout, "set_table reply %d\n", ntohl (mp->retval));
+}
+
+static void
+vl_api_tap_connect_reply_t_handler (vl_api_tap_connect_reply_t * mp)
+{
+  fformat (stdout, "tap connect reply %d, sw_if_index %d\n",
+	   ntohl (mp->retval), ntohl (mp->sw_if_index));
+}
+
+static void
+vl_api_create_vlan_subif_reply_t_handler (vl_api_create_vlan_subif_reply_t *
+					  mp)
+{
+  fformat (stdout, "create vlan subif reply %d, sw_if_index %d\n",
+	   ntohl (mp->retval), ntohl (mp->sw_if_index));
+}
+
+static void vl_api_proxy_arp_add_del_reply_t_handler
+  (vl_api_proxy_arp_add_del_reply_t * mp)
+{
+  fformat (stdout, "add del proxy arp reply %d\n", ntohl (mp->retval));
+}
+
+static void vl_api_proxy_arp_intfc_enable_disable_reply_t_handler
+  (vl_api_proxy_arp_intfc_enable_disable_reply_t * mp)
+{
+  fformat (stdout, "proxy arp intfc ena/dis reply %d\n", ntohl (mp->retval));
+}
+
+static void vl_api_ip_neighbor_add_del_reply_t_handler
+  (vl_api_ip_neighbor_add_del_reply_t * mp)
+{
+  fformat (stdout, "ip neighbor add del reply %d\n", ntohl (mp->retval));
+}
+
+static void
+vl_api_vnet_interface_counters_t_handler (vl_api_vnet_interface_counters_t *
+					  mp)
+{
+  char *counter_name;
+  u32 count, sw_if_index;
+  int i;
+
+  count = ntohl (mp->count);
+  sw_if_index = ntohl (mp->first_sw_if_index);
+  if (mp->is_combined == 0)
+    {
+      u64 *vp, v;
+      vp = (u64 *) mp->data;
+
+      switch (mp->vnet_counter_type)
+	{
+	case VNET_INTERFACE_COUNTER_DROP:
+	  counter_name = "drop";
+	  break;
+	case VNET_INTERFACE_COUNTER_PUNT:
+	  counter_name = "punt";
+	  break;
+	case VNET_INTERFACE_COUNTER_IP4:
+	  counter_name = "ip4";
+	  break;
+	case VNET_INTERFACE_COUNTER_IP6:
+	  counter_name = "ip6";
+	  break;
+	case VNET_INTERFACE_COUNTER_RX_NO_BUF:
+	  counter_name = "rx-no-buf";
+	  break;
+	case VNET_INTERFACE_COUNTER_RX_MISS:
+	  counter_name = "rx-miss";
+	  break;
+	case VNET_INTERFACE_COUNTER_RX_ERROR:
+	  counter_name = "rx-error";
+	  break;
+	case VNET_INTERFACE_COUNTER_TX_ERROR:
+	  counter_name = "tx-error (fifo-full)";
+	  break;
+	default:
+	  counter_name = "bogus";
+	  break;
+	}
+      for (i = 0; i < count; i++)
+	{
+	  v = clib_mem_unaligned (vp, u64);
+	  v = clib_net_to_host_u64 (v);
+	  vp++;
+	  fformat (stdout, "%d.%s %lld\n", sw_if_index, counter_name, v);
+	  sw_if_index++;
+	}
+    }
+  else
+    {
+      vlib_counter_t *vp;
+      u64 packets, bytes;
+      vp = (vlib_counter_t *) mp->data;
+
+      switch (mp->vnet_counter_type)
+	{
+	case VNET_INTERFACE_COUNTER_RX:
+	  counter_name = "rx";
+	  break;
+	case VNET_INTERFACE_COUNTER_TX:
+	  counter_name = "tx";
+	  break;
+	default:
+	  counter_name = "bogus";
+	  break;
+	}
+      for (i = 0; i < count; i++)
+	{
+	  packets = clib_mem_unaligned (&vp->packets, u64);
+	  packets = clib_net_to_host_u64 (packets);
+	  bytes = clib_mem_unaligned (&vp->bytes, u64);
+	  bytes = clib_net_to_host_u64 (bytes);
+	  vp++;
+	  fformat (stdout, "%d.%s.packets %lld\n",
+		   sw_if_index, counter_name, packets);
+	  fformat (stdout, "%d.%s.bytes %lld\n",
+		   sw_if_index, counter_name, bytes);
+	  sw_if_index++;
+	}
+    }
+}
+
+/* Format an IP4 address. */
+u8 *
+format_ip4_address (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
+}
+
+/* Format an IP4 route destination and length. */
+u8 *
+format_ip4_address_and_length (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  u8 l = va_arg (*args, u32);
+  return format (s, "%U/%d", format_ip4_address, a, l);
+}
+
+static void
+vl_api_vnet_ip4_fib_counters_t_handler (vl_api_vnet_ip4_fib_counters_t * mp)
+{
+  int i;
+  vl_api_ip4_fib_counter_t *ctrp;
+  u32 count;
+
+  count = ntohl (mp->count);
+
+  fformat (stdout, "fib id %d, count this msg %d\n",
+	   ntohl (mp->vrf_id), count);
+
+  ctrp = mp->c;
+  for (i = 0; i < count; i++)
+    {
+      fformat (stdout, "%U: %lld packets, %lld bytes\n",
+	       format_ip4_address_and_length, &ctrp->address,
+	       (u32) ctrp->address_length,
+	       clib_net_to_host_u64 (ctrp->packets),
+	       clib_net_to_host_u64 (ctrp->bytes));
+      ctrp++;
+    }
+}
+
+/* Format an IP6 address. */
+u8 *
+format_ip6_address (u8 * s, va_list * args)
+{
+  ip6_address_t *a = va_arg (*args, ip6_address_t *);
+  u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
+
+  i_max_n_zero = ARRAY_LEN (a->as_u16);
+  max_n_zeros = 0;
+  i_first_zero = i_max_n_zero;
+  n_zeros = 0;
+  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+    {
+      u32 is_zero = a->as_u16[i] == 0;
+      if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
+	{
+	  i_first_zero = i;
+	  n_zeros = 0;
+	}
+      n_zeros += is_zero;
+      if ((!is_zero && n_zeros > max_n_zeros)
+	  || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
+	{
+	  i_max_n_zero = i_first_zero;
+	  max_n_zeros = n_zeros;
+	  i_first_zero = ARRAY_LEN (a->as_u16);
+	  n_zeros = 0;
+	}
+    }
+
+  last_double_colon = 0;
+  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+    {
+      if (i == i_max_n_zero && max_n_zeros > 1)
+	{
+	  s = format (s, "::");
+	  i += max_n_zeros - 1;
+	  last_double_colon = 1;
+	}
+      else
+	{
+	  s = format (s, "%s%x",
+		      (last_double_colon || i == 0) ? "" : ":",
+		      clib_net_to_host_u16 (a->as_u16[i]));
+	  last_double_colon = 0;
+	}
+    }
+
+  return s;
+}
+
+/* Format an IP6 route destination and length. */
+u8 *
+format_ip6_address_and_length (u8 * s, va_list * args)
+{
+  ip6_address_t *a = va_arg (*args, ip6_address_t *);
+  u8 l = va_arg (*args, u32);
+  return format (s, "%U/%d", format_ip6_address, a, l);
+}
+
+static void
+vl_api_vnet_ip6_fib_counters_t_handler (vl_api_vnet_ip6_fib_counters_t * mp)
+{
+  int i;
+  vl_api_ip6_fib_counter_t *ctrp;
+  u32 count;
+
+  count = ntohl (mp->count);
+
+  fformat (stdout, "fib id %d, count this msg %d\n",
+	   ntohl (mp->vrf_id), count);
+
+  ctrp = mp->c;
+  for (i = 0; i < count; i++)
+    {
+      fformat (stdout, "%U: %lld packets, %lld bytes\n",
+	       format_ip6_address_and_length, &ctrp->address,
+	       (u32) ctrp->address_length,
+	       clib_net_to_host_u64 (ctrp->packets),
+	       clib_net_to_host_u64 (ctrp->bytes));
+      ctrp++;
+    }
+}
+
+static void
+vl_api_oam_event_t_handler (vl_api_oam_event_t * mp)
+{
+  fformat (stdout, "OAM: %U now %s\n",
+	   format_ip4_address, &mp->dst_address,
+	   mp->state == 1 ? "alive" : "dead");
+}
+
+static void
+vl_api_oam_add_del_reply_t_handler (vl_api_oam_add_del_reply_t * mp)
+{
+  fformat (stdout, "oam add del reply %d\n", ntohl (mp->retval));
+}
+
+static void
+vl_api_reset_fib_reply_t_handler (vl_api_reset_fib_reply_t * mp)
+{
+  fformat (stdout, "fib reset reply %d\n", ntohl (mp->retval));
+}
+
+static void
+vl_api_dhcp_proxy_set_vss_reply_t_handler (vl_api_dhcp_proxy_set_vss_reply_t *
+					   mp)
+{
+  fformat (stdout, "dhcp proxy set vss reply %d\n", ntohl (mp->retval));
+}
+
+static void
+vl_api_dhcp_proxy_config_reply_t_handler (vl_api_dhcp_proxy_config_reply_t *
+					  mp)
+{
+  fformat (stdout, "dhcp proxy config reply %d\n", ntohl (mp->retval));
+}
+
+static void
+vl_api_set_ip_flow_hash_reply_t_handler (vl_api_set_ip_flow_hash_reply_t * mp)
+{
+  fformat (stdout, "set ip flow hash reply %d\n", ntohl (mp->retval));
+}
+
+static void
+  vl_api_sw_interface_ip6nd_ra_config_reply_t_handler
+  (vl_api_sw_interface_ip6nd_ra_config_reply_t * mp)
+{
+  fformat (stdout, "ip6 nd ra-config  reply %d\n", ntohl (mp->retval));
+}
+
+static void
+  vl_api_sw_interface_ip6nd_ra_prefix_reply_t_handler
+  (vl_api_sw_interface_ip6nd_ra_prefix_reply_t * mp)
+{
+  fformat (stdout, "ip6 nd ra-prefix  reply %d\n", ntohl (mp->retval));
+}
+
+static void
+  vl_api_sw_interface_ip6_enable_disable_reply_t_handler
+  (vl_api_sw_interface_ip6_enable_disable_reply_t * mp)
+{
+  fformat (stdout, "ip6 enable/disable reply %d\n", ntohl (mp->retval));
+}
+
+static void
+  vl_api_sw_interface_ip6_set_link_local_address_reply_t_handler
+  (vl_api_sw_interface_ip6_set_link_local_address_reply_t * mp)
+{
+  fformat (stdout, "ip6 set link-local address reply %d\n",
+	   ntohl (mp->retval));
+}
+
+static void vl_api_create_loopback_reply_t_handler
+  (vl_api_create_loopback_reply_t * mp)
+{
+  fformat (stdout, "create loopback status %d, sw_if_index %d\n",
+	   ntohl (mp->retval), ntohl (mp->sw_if_index));
+}
+
+static void
+vl_api_sr_tunnel_add_del_reply_t_handler (vl_api_sr_tunnel_add_del_reply_t *
+					  mp)
+{
+  fformat (stdout, "sr tunnel add/del reply %d\n", ntohl (mp->retval));
+}
+
+static void vl_api_l2_patch_add_del_reply_t_handler
+  (vl_api_l2_patch_add_del_reply_t * mp)
+{
+  fformat (stdout, "l2 patch reply %d\n", ntohl (mp->retval));
+}
+
+static void vl_api_sw_interface_set_l2_xconnect_reply_t_handler
+  (vl_api_sw_interface_set_l2_xconnect_reply_t * mp)
+{
+  fformat (stdout, "l2_xconnect reply %d\n", ntohl (mp->retval));
+}
+
+static void vl_api_sw_interface_set_l2_bridge_reply_t_handler
+  (vl_api_sw_interface_set_l2_bridge_reply_t * mp)
+{
+  fformat (stdout, "l2_bridge reply %d\n", ntohl (mp->retval));
+}
+
+static void
+noop_handler (void *notused)
+{
+}
+
+#define vl_api_vnet_ip4_fib_counters_t_endian noop_handler
+#define vl_api_vnet_ip4_fib_counters_t_print noop_handler
+#define vl_api_vnet_ip6_fib_counters_t_endian noop_handler
+#define vl_api_vnet_ip6_fib_counters_t_print noop_handler
+
+#define foreach_api_msg                                                 \
+_(SW_INTERFACE_DETAILS, sw_interface_details)                           \
+_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags)                       \
+_(SW_INTERFACE_SET_FLAGS_REPLY, sw_interface_set_flags_reply)           \
+_(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply)             \
+_(WANT_STATS_REPLY, want_stats_reply)                                   \
+_(WANT_OAM_EVENTS_REPLY, want_oam_events_reply)                         \
+_(OAM_EVENT, oam_event)                                                 \
+_(OAM_ADD_DEL_REPLY, oam_add_del_reply)				        \
+_(VNET_INTERFACE_COUNTERS, vnet_interface_counters)                     \
+_(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters)                         \
+_(VNET_IP6_FIB_COUNTERS, vnet_ip6_fib_counters)                         \
+_(IP_ADD_DEL_ROUTE_REPLY, ip_add_del_route_reply)                       \
+_(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY, sw_interface_add_del_address_reply) \
+_(SW_INTERFACE_SET_TABLE_REPLY, sw_interface_set_table_reply)           \
+_(TAP_CONNECT_REPLY, tap_connect_reply)                                 \
+_(CREATE_VLAN_SUBIF_REPLY, create_vlan_subif_reply)                     \
+_(PROXY_ARP_ADD_DEL_REPLY, proxy_arp_add_del_reply)			\
+_(PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY, proxy_arp_intfc_enable_disable_reply) \
+_(IP_NEIGHBOR_ADD_DEL_REPLY, ip_neighbor_add_del_reply)                 \
+_(RESET_FIB_REPLY, reset_fib_reply)                                     \
+_(DHCP_PROXY_CONFIG_REPLY, dhcp_proxy_config_reply)                     \
+_(DHCP_PROXY_SET_VSS_REPLY, dhcp_proxy_set_vss_reply)                   \
+_(SET_IP_FLOW_HASH_REPLY, set_ip_flow_hash_reply)                       \
+_(SW_INTERFACE_IP6ND_RA_CONFIG_REPLY, sw_interface_ip6nd_ra_config_reply) \
+_(SW_INTERFACE_IP6ND_RA_PREFIX_REPLY, sw_interface_ip6nd_ra_prefix_reply) \
+_(SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY, sw_interface_ip6_enable_disable_reply) \
+_(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_REPLY, sw_interface_ip6_set_link_local_address_reply) \
+ _(CREATE_LOOPBACK_REPLY, create_loopback_reply)			\
+_(L2_PATCH_ADD_DEL_REPLY, l2_patch_add_del_reply)			\
+_(SR_TUNNEL_ADD_DEL_REPLY,sr_tunnel_add_del_reply)          \
+_(SW_INTERFACE_SET_L2_XCONNECT_REPLY, sw_interface_set_l2_xconnect_reply) \
+_(SW_INTERFACE_SET_L2_BRIDGE_REPLY, sw_interface_set_l2_bridge_reply)
+
+int
+connect_to_vpe (char *name)
+{
+  int rv = 0;
+
+  rv = vl_client_connect_to_vlib ("/vpe-api", name, 32);
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           noop_handler,                        \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_api_msg;
+#undef _
+
+  shmem_hdr = api_main.shmem_hdr;
+
+  return rv;
+}
+
+int
+disconnect_from_vpe (void)
+{
+  vl_client_disconnect_from_vlib ();
+  return 0;
+}
+
+void
+link_up_down_enable_disable (test_main_t * tm, int enable)
+{
+  vl_api_want_interface_events_t *mp;
+
+  /* Request admin / link up down messages */
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_WANT_INTERFACE_EVENTS);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->enable_disable = enable;
+  mp->pid = getpid ();
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+  tm->link_events_on = enable;
+}
+
+void
+stats_enable_disable (test_main_t * tm, int enable)
+{
+  vl_api_want_stats_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_WANT_STATS);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->enable_disable = enable;
+  mp->pid = getpid ();
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+  tm->stats_on = enable;
+}
+
+void
+oam_events_enable_disable (test_main_t * tm, int enable)
+{
+  vl_api_want_oam_events_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_WANT_OAM_EVENTS);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->enable_disable = enable;
+  mp->pid = getpid ();
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+  tm->oam_events_on = enable;
+}
+
+void
+oam_add_del (test_main_t * tm, int is_add)
+{
+  vl_api_oam_add_del_t *mp;
+  ip4_address_t tmp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_OAM_ADD_DEL);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->is_add = is_add;
+
+  tmp.as_u32 = ntohl (0xc0a80101);	/* 192.168.1.1 */
+  clib_memcpy (mp->src_address, tmp.as_u8, 4);
+
+  tmp.as_u32 = ntohl (0xc0a80103);	/* 192.168.1.3 */
+  clib_memcpy (mp->dst_address, tmp.as_u8, 4);
+
+  mp->vrf_id = 0;
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+dump (test_main_t * tm)
+{
+  vl_api_sw_interface_dump_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_DUMP);
+  mp->client_index = tm->my_client_index;
+  mp->name_filter_valid = 1;
+  strncpy ((char *) mp->name_filter, "eth", sizeof (mp->name_filter) - 1);
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+add_del_ip4_route (test_main_t * tm, int enable_disable)
+{
+  vl_api_ip_add_del_route_t *mp;
+  u32 tmp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_IP_ADD_DEL_ROUTE);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->table_id = ntohl (0);
+  mp->create_vrf_if_needed = 1;
+
+  mp->next_hop_sw_if_index = ntohl (5);
+  mp->is_add = enable_disable;
+  mp->next_hop_weight = 1;
+
+  /* Next hop: 6.0.0.1 */
+  tmp = ntohl (0x06000001);
+  clib_memcpy (mp->next_hop_address, &tmp, sizeof (tmp));
+
+  /* Destination: 10.0.0.1/32 */
+  tmp = ntohl (0x0);
+  clib_memcpy (mp->dst_address, &tmp, sizeof (tmp));
+  mp->dst_address_length = 0;
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+add_del_ip6_route (test_main_t * tm, int enable_disable)
+{
+  vl_api_ip_add_del_route_t *mp;
+  u64 tmp[2];
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_IP_ADD_DEL_ROUTE);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->next_hop_sw_if_index = ntohl (5);
+  mp->is_add = enable_disable;
+  mp->is_ipv6 = 1;
+  mp->next_hop_weight = 1;
+  mp->dst_address_length = 64;
+
+  /* add/del dabe::/64 via db01::11 */
+
+  tmp[0] = clib_host_to_net_u64 (0xdabe000000000000ULL);
+  tmp[1] = clib_host_to_net_u64 (0x0ULL);
+  clib_memcpy (mp->dst_address, &tmp[0], 8);
+  clib_memcpy (&mp->dst_address[8], &tmp[1], 8);
+
+  tmp[0] = clib_host_to_net_u64 (0xdb01000000000000ULL);
+  tmp[1] = clib_host_to_net_u64 (0x11ULL);
+  clib_memcpy (mp->next_hop_address, &tmp[0], 8);
+  clib_memcpy (&mp->next_hop_address[8], &tmp[1], 8);
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+add_del_interface_address (test_main_t * tm, int enable_disable)
+{
+  vl_api_sw_interface_add_del_address_t *mp;
+  u32 tmp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_ADD_DEL_ADDRESS);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->sw_if_index = ntohl (5);
+  mp->is_add = enable_disable;
+  mp->address_length = 8;
+
+  tmp = ntohl (0x01020304);
+  clib_memcpy (mp->address, &tmp, 4);
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+add_del_v6_interface_address (test_main_t * tm, int enable_disable)
+{
+  vl_api_sw_interface_add_del_address_t *mp;
+  u64 tmp[2];
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_ADD_DEL_ADDRESS);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->is_ipv6 = 1;
+  mp->sw_if_index = ntohl (5);
+  mp->is_add = enable_disable;
+  mp->address_length = 64;
+
+  tmp[0] = clib_host_to_net_u64 (0xdb01000000000000ULL);
+  tmp[1] = clib_host_to_net_u64 (0x11ULL);
+
+  clib_memcpy (mp->address, &tmp[0], 8);
+  clib_memcpy (&mp->address[8], &tmp[1], 8);
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+del_all_interface_addresses (test_main_t * tm)
+{
+  vl_api_sw_interface_add_del_address_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_ADD_DEL_ADDRESS);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->sw_if_index = ntohl (5);
+  mp->del_all = 1;
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+set_interface_table (test_main_t * tm, int is_ipv6, u32 vrf_id)
+{
+  vl_api_sw_interface_set_table_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_TABLE);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->sw_if_index = ntohl (5);
+  mp->is_ipv6 = is_ipv6;
+  mp->vrf_id = ntohl (vrf_id);
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+connect_unix_tap (test_main_t * tm, char *name)
+{
+  vl_api_tap_connect_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_TAP_CONNECT);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  strncpy ((char *) mp->tap_name, name, sizeof (mp->tap_name) - 1);
+  mp->use_random_mac = 1;
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+create_vlan_subif (test_main_t * tm, u32 vlan_id)
+{
+  vl_api_create_vlan_subif_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_CREATE_VLAN_SUBIF);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->sw_if_index = ntohl (5);
+  mp->vlan_id = ntohl (vlan_id);
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+add_del_proxy_arp (test_main_t * tm, int is_add)
+{
+  vl_api_proxy_arp_add_del_t *mp;
+  u32 tmp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_PROXY_ARP_ADD_DEL);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->vrf_id = ntohl (11);
+  mp->is_add = is_add;
+
+  /* proxy fib 11, 1.1.1.1 -> 1.1.1.10 */
+  tmp = ntohl (0x01010101);
+  clib_memcpy (mp->low_address, &tmp, 4);
+
+  tmp = ntohl (0x0101010a);
+  clib_memcpy (mp->hi_address, &tmp, 4);
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+proxy_arp_intfc_enable_disable (test_main_t * tm, int enable_disable)
+{
+  vl_api_proxy_arp_intfc_enable_disable_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_PROXY_ARP_INTFC_ENABLE_DISABLE);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->sw_if_index = ntohl (6);
+  mp->enable_disable = enable_disable;
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+add_ip4_neighbor (test_main_t * tm, int add_del)
+{
+  vl_api_ip_neighbor_add_del_t *mp;
+  u32 tmp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_IP_NEIGHBOR_ADD_DEL);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->vrf_id = ntohl (11);
+  mp->sw_if_index = ntohl (6);
+  mp->is_add = add_del;
+
+  memset (mp->mac_address, 0xbe, sizeof (mp->mac_address));
+
+  tmp = ntohl (0x0101010a);
+  clib_memcpy (mp->dst_address, &tmp, 4);
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+add_ip6_neighbor (test_main_t * tm, int add_del)
+{
+  vl_api_ip_neighbor_add_del_t *mp;
+  u64 tmp[2];
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_IP_NEIGHBOR_ADD_DEL);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->vrf_id = ntohl (11);
+  mp->sw_if_index = ntohl (6);
+  mp->is_add = add_del;
+  mp->is_ipv6 = 1;
+
+  memset (mp->mac_address, 0xbe, sizeof (mp->mac_address));
+
+  tmp[0] = clib_host_to_net_u64 (0xdb01000000000000ULL);
+  tmp[1] = clib_host_to_net_u64 (0x11ULL);
+
+  clib_memcpy (mp->dst_address, &tmp[0], 8);
+  clib_memcpy (&mp->dst_address[8], &tmp[1], 8);
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+reset_fib (test_main_t * tm, u8 is_ip6)
+{
+  vl_api_reset_fib_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_RESET_FIB);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->vrf_id = ntohl (11);
+  mp->is_ipv6 = is_ip6;
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+dhcpv6_set_vss (test_main_t * tm)
+{
+  vl_api_dhcp_proxy_set_vss_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_DHCP_PROXY_SET_VSS);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->oui = ntohl (6);
+  mp->fib_id = ntohl (60);
+  mp->is_add = 1;
+  mp->is_ipv6 = 1;
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+dhcpv4_set_vss (test_main_t * tm)
+{
+  vl_api_dhcp_proxy_set_vss_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_DHCP_PROXY_SET_VSS);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->oui = ntohl (4);
+  mp->fib_id = ntohl (40);
+  mp->is_add = 1;
+  mp->is_ipv6 = 0;
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+dhcp_set_vss (test_main_t * tm)
+{
+  dhcpv4_set_vss (tm);
+  dhcpv6_set_vss (tm);
+}
+
+void
+dhcp_set_proxy (test_main_t * tm, int ipv6)
+{
+  vl_api_dhcp_proxy_config_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_DHCP_PROXY_CONFIG);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->vrf_id = ntohl (0);
+  mp->is_ipv6 = ipv6;
+  mp->insert_circuit_id = 1;
+  mp->is_add = 1;
+  mp->dhcp_server[0] = 0x20;
+  mp->dhcp_server[1] = 0x01;
+  mp->dhcp_server[2] = 0xab;
+  mp->dhcp_server[3] = 0xcd;
+  mp->dhcp_server[4] = 0x12;
+  mp->dhcp_server[5] = 0x34;
+  mp->dhcp_server[6] = 0xfe;
+  mp->dhcp_server[7] = 0xdc;
+  mp->dhcp_server[14] = 0;
+  mp->dhcp_server[15] = 0x2;
+
+  mp->dhcp_src_address[0] = 0x20;
+  mp->dhcp_src_address[1] = 0x01;
+  mp->dhcp_src_address[2] = 0xab;
+  mp->dhcp_src_address[3] = 0xcd;
+  mp->dhcp_src_address[4] = 0x12;
+  mp->dhcp_src_address[5] = 0x34;
+  mp->dhcp_src_address[6] = 0x56;
+  mp->dhcp_src_address[7] = 0x78;
+  mp->dhcp_src_address[14] = 0;
+  mp->dhcp_src_address[15] = 0x2;
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+set_ip_flow_hash (test_main_t * tm, u8 is_ip6)
+{
+  vl_api_set_ip_flow_hash_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SET_IP_FLOW_HASH);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->vrf_id = 0;
+  mp->is_ipv6 = is_ip6;
+  mp->dst = 1;
+  mp->reverse = 1;
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+ip6nd_ra_config (test_main_t * tm, int is_no)
+{
+  vl_api_sw_interface_ip6nd_ra_config_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->sw_if_index = ntohl (5);
+  mp->is_no = is_no;
+
+  mp->suppress = 1;
+
+
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_IP6ND_RA_CONFIG);
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+ip6nd_ra_prefix (test_main_t * tm, int is_no)
+{
+  vl_api_sw_interface_ip6nd_ra_prefix_t *mp;
+  u64 tmp[2];
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->sw_if_index = ntohl (5);
+  mp->is_no = is_no;
+
+  mp->use_default = 1;
+
+
+  tmp[0] = clib_host_to_net_u64 (0xdb01000000000000ULL);
+  tmp[1] = clib_host_to_net_u64 (0x11ULL);
+
+
+  clib_memcpy (mp->address, &tmp[0], 8);
+  clib_memcpy (&mp->address[8], &tmp[1], 8);
+
+  mp->address_length = 64;
+
+
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_IP6ND_RA_PREFIX);
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+ip6_enable_disable (test_main_t * tm, int enable)
+{
+  vl_api_sw_interface_ip6_enable_disable_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->sw_if_index = ntohl (5);
+  mp->enable = (enable == 1);;
+
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_IP6_ENABLE_DISABLE);
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+loop_create (test_main_t * tm)
+{
+  vl_api_create_loopback_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+
+  mp->_vl_msg_id = ntohs (VL_API_CREATE_LOOPBACK);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+ip6_set_link_local_address (test_main_t * tm)
+{
+  vl_api_sw_interface_ip6_set_link_local_address_t *mp;
+  u64 tmp[2];
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->sw_if_index = ntohl (5);
+
+  tmp[0] = clib_host_to_net_u64 (0xfe80000000000000ULL);
+  tmp[1] = clib_host_to_net_u64 (0x11ULL);
+
+  clib_memcpy (mp->address, &tmp[0], 8);
+  clib_memcpy (&mp->address[8], &tmp[1], 8);
+
+  mp->address_length = 64;
+
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS);
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+
+void
+set_flags (test_main_t * tm, int up_down)
+{
+  vl_api_sw_interface_set_flags_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_FLAGS);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->sw_if_index = ntohl (5);
+  mp->admin_up_down = up_down;
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+
+}
+
+void
+l2_patch_add_del (test_main_t * tm, int is_add)
+{
+  vl_api_l2_patch_add_del_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_L2_PATCH_ADD_DEL);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->is_add = is_add;
+  mp->rx_sw_if_index = ntohl (1);
+  mp->tx_sw_if_index = ntohl (2);
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+l2_xconnect (test_main_t * tm)
+{
+  vl_api_sw_interface_set_l2_xconnect_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_L2_XCONNECT);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->rx_sw_if_index = ntohl (5);
+  mp->tx_sw_if_index = ntohl (6);
+  mp->enable = 1;
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+void
+l2_bridge (test_main_t * tm)
+{
+  vl_api_sw_interface_set_l2_bridge_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_L2_BRIDGE);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+  mp->rx_sw_if_index = ntohl (5);
+  mp->bd_id = ntohl (6);
+  mp->bvi = ntohl (1);
+  mp->shg = ntohl (0);
+  mp->enable = 1;
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+int
+main (int argc, char **argv)
+{
+  api_main_t *am = &api_main;
+  test_main_t *tm = &test_main;
+  int ch;
+
+  connect_to_vpe ("test_client");
+
+  tm->vl_input_queue = shmem_hdr->vl_input_queue;
+  tm->my_client_index = am->my_client_index;
+
+  fformat (stdout, "Type 'h' for help, 'q' to quit...\n");
+
+  while (1)
+    {
+      ch = getchar ();
+      switch (ch)
+	{
+	case 'q':
+	  goto done;
+	case 'd':
+	  dump (tm);
+	  break;
+	case 'L':
+	  link_up_down_enable_disable (tm, 1 /* enable_disable */ );
+	  break;
+	case 'l':
+	  link_up_down_enable_disable (tm, 0 /* enable_disable */ );
+	  break;
+	case 'S':
+	  stats_enable_disable (tm, 1 /* enable_disable */ );
+	  break;
+	case 's':
+	  stats_enable_disable (tm, 0 /* enable_disable */ );
+	  break;
+	case '3':
+	  add_del_ip4_route (tm, 0 /* add */ );
+	  break;
+	case '4':
+	  add_del_ip4_route (tm, 1 /* add */ );
+	  break;
+	case '5':
+	  add_del_ip6_route (tm, 0 /* add */ );
+	  break;
+	case '6':
+	  add_del_ip6_route (tm, 1 /* add */ );
+	  break;
+	case 'A':
+	  add_del_interface_address (tm, 1 /* add */ );
+	  break;
+	case 'a':
+	  add_del_interface_address (tm, 0 /* add */ );
+	  break;
+	case 'B':
+	  add_del_v6_interface_address (tm, 1 /* add */ );
+	  break;
+	case 'b':
+	  add_del_v6_interface_address (tm, 0 /* add */ );
+	  break;
+	case 'E':
+	  l2_patch_add_del (tm, 1 /* is_add */ );
+	  break;
+	case 'e':
+	  l2_patch_add_del (tm, 0 /* is_add */ );
+	  break;
+	case 'z':
+	  del_all_interface_addresses (tm);
+	  break;
+	case 't':
+	  set_interface_table (tm, 0 /* is_ipv6 */ ,
+			       11 /* my amp goes to 11 */ );
+	  break;
+	case 'T':
+	  set_interface_table (tm, 1 /* is_ipv6 */ ,
+			       12 /* my amp goes to 12 */ );
+	  break;
+
+	case 'u':
+	  create_vlan_subif (tm, 123);
+	  break;
+
+	case 'c':
+	  connect_unix_tap (tm, "foo");
+	  break;
+
+	case 'n':
+	  add_ip4_neighbor (tm, 1 /* is_add */ );
+	  add_ip6_neighbor (tm, 1 /* is_add */ );
+	  break;
+
+	case 'N':
+	  add_ip4_neighbor (tm, 0 /* is_add */ );
+	  add_ip6_neighbor (tm, 0 /* is_add */ );
+	  break;
+
+	case 'p':
+	  add_del_proxy_arp (tm, 1 /* add */ );
+	  break;
+
+	case 'i':
+	  proxy_arp_intfc_enable_disable (tm, 1 /* enable */ );
+	  break;
+
+	case 'O':
+	  oam_events_enable_disable (tm, 0 /* enable */ );
+	  break;
+
+	case 'o':
+	  oam_events_enable_disable (tm, 1 /* enable */ );
+	  break;
+
+	case '0':
+	  oam_add_del (tm, 0 /* is_add */ );
+	  break;
+
+	case '1':
+	  oam_add_del (tm, 1 /* is_add */ );
+	  break;
+
+	case 'r':
+	  reset_fib (tm, 0 /* is_ip6 */ );
+	  break;
+
+	case 'R':
+	  reset_fib (tm, 1 /* is_ip6 */ );
+	  break;
+
+	case 'j':
+	  dhcp_set_vss (tm);
+	  break;
+
+	case 'k':
+	  dhcp_set_proxy (tm, 0);
+	  break;
+
+	case 'K':
+	  dhcp_set_proxy (tm, 1 /*ipv6 */ );
+	  break;
+
+	case 'v':
+	  set_ip_flow_hash (tm, 0 /* is_ip6 */ );
+	  break;
+
+	case 'V':
+	  ip6_set_link_local_address (tm);
+	  break;
+
+	case 'w':
+	  ip6_enable_disable (tm, 1 /* enable */ );
+	  break;
+
+	case 'W':
+	  ip6_enable_disable (tm, 0 /* disable */ );
+	  break;
+
+	case 'x':
+	  ip6nd_ra_config (tm, 0 /* is_no */ );
+	  break;
+	case 'X':
+	  ip6nd_ra_config (tm, 1 /* is_no */ );
+	  break;
+	case 'y':
+	  ip6nd_ra_prefix (tm, 0 /* is_no */ );
+	  break;
+	case 'Y':
+	  ip6nd_ra_prefix (tm, 1 /* is_no */ );
+	  break;
+
+	case '7':
+	  loop_create (tm);
+	  break;
+
+	case 'F':
+	  set_flags (tm, 1 /* up_down */ );
+	  break;
+
+	case 'f':
+	  set_flags (tm, 0 /* up_down */ );
+	  break;
+
+	case '@':
+	  l2_xconnect (tm);
+	  break;
+
+	case '#':
+	  l2_bridge (tm);
+	  break;
+
+	case 'h':
+	  fformat (stdout, "q=quit,d=dump,L=link evts on,l=link evts off\n");
+	  fformat (stdout, "S=stats on,s=stats off\n");
+	  fformat (stdout, "4=add v4 route, 3=del v4 route\n");
+	  fformat (stdout, "6=add v6 route, 5=del v6 route\n");
+	  fformat (stdout, "A=add v4 intfc route, a=del v4 intfc route\n");
+	  fformat (stdout, "B=add v6 intfc route, b=del v6 intfc route\n");
+	  fformat (stdout, "z=del all intfc routes\n");
+	  fformat (stdout, "t=set v4 intfc table, T=set v6 intfc table\n");
+	  fformat (stdout, "c=connect unix tap\n");
+	  fformat (stdout,
+		   "j=set dhcpv4 and v6 link-address/option-82 params\n");
+	  fformat (stdout, "k=set dhcpv4 relay agent params\n");
+	  fformat (stdout, "K=set dhcpv6 relay agent params\n");
+	  fformat (stdout, "E=add l2 patch, e=del l2 patch\n");
+	  fformat (stdout, "V=ip6 set link-local address \n");
+	  fformat (stdout, "w=ip6 enable \n");
+	  fformat (stdout, "W=ip6 disable \n");
+	  fformat (stdout, "x=ip6 nd config \n");
+	  fformat (stdout, "X=no ip6 nd config\n");
+	  fformat (stdout, "y=ip6 nd prefix \n");
+	  fformat (stdout, "Y=no ip6 nd prefix\n");
+	  fformat (stdout, "@=l2 xconnect\n");
+	  fformat (stdout, "#=l2 bridge\n");
+
+	default:
+	  break;
+	}
+
+    }
+
+done:
+
+  if (tm->link_events_on)
+    link_up_down_enable_disable (tm, 0 /* enable */ );
+  if (tm->stats_on)
+    stats_enable_disable (tm, 0 /* enable */ );
+  if (tm->oam_events_on)
+    oam_events_enable_disable (tm, 0 /* enable */ );
+
+  disconnect_from_vpe ();
+  exit (0);
+}
+
+#undef vl_api_version
+#define vl_api_version(n,v) static u32 vpe_api_version = v;
+#include <vpp/api/vpe.api.h>
+#undef vl_api_version
+
+void
+vl_client_add_api_signatures (vl_api_memclnt_create_t * mp)
+{
+  /*
+   * Send the main API signature in slot 0. This bit of code must
+   * match the checks in ../vpe/api/api.c: vl_msg_api_version_check().
+   */
+  mp->api_versions[0] = clib_host_to_net_u32 (vpe_api_version);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/api/test_ha.c b/src/vpp/api/test_ha.c
new file mode 100644
index 00000000..3264d5f9
--- /dev/null
+++ b/src/vpp/api/test_ha.c
@@ -0,0 +1,249 @@
+/*
+ *------------------------------------------------------------------
+ * api.c - message handler registration
+ *
+ * Copyright (c) 2010 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <time.h>
+#include <fcntl.h>
+#include <string.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/time.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/format.h>
+#include <vppinfra/error.h>
+
+#include <vnet/vnet.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <svm/svm.h>
+#include <svm/svmdb.h>
+
+#include <vpp/api/vpe_msg_enum.h>
+
+#include <vnet/ip/ip.h>
+
+#define f64_endian(a)
+#define f64_print(a,b)
+
+#define vl_typedefs		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_printfun
+
+vl_shmem_hdr_t *shmem_hdr;
+
+typedef struct
+{
+  u32 pings_sent;
+  u32 pings_replied;
+  volatile u32 signal_received;
+
+  /* convenience */
+  unix_shared_memory_queue_t *vl_input_queue;
+  u32 my_client_index;
+  svmdb_client_t *svmdb_client;
+} test_main_t;
+
+test_main_t test_main;
+
+static void vl_api_control_ping_reply_t_handler
+  (vl_api_control_ping_reply_t * mp)
+{
+  test_main_t *tm = &test_main;
+
+  fformat (stdout, "control ping reply from pid %d\n", ntohl (mp->vpe_pid));
+  tm->pings_replied++;
+}
+
+vlib_main_t vlib_global_main;
+vlib_main_t **vlib_mains;
+
+void
+vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...)
+{
+  clib_warning ("BUG: vlib_cli_output callled...");
+}
+
+#define foreach_api_msg                         \
+_(CONTROL_PING_REPLY,control_ping_reply)
+
+void
+ping (test_main_t * tm)
+{
+  vl_api_control_ping_t *mp;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  memset (mp, 0, sizeof (*mp));
+  mp->_vl_msg_id = ntohs (VL_API_CONTROL_PING);
+  mp->client_index = tm->my_client_index;
+  mp->context = 0xdeadbeef;
+
+  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
+}
+
+static void
+noop_handler (void *notused)
+{
+}
+
+int
+connect_to_vpe (char *name)
+{
+  int rv = 0;
+  test_main_t *tm = &test_main;
+  api_main_t *am = &api_main;
+
+  rv = vl_client_connect_to_vlib ("/vpe-api", name, 32);
+  if (rv < 0)
+    return rv;
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           noop_handler,                        \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_api_msg;
+#undef _
+
+  shmem_hdr = api_main.shmem_hdr;
+  tm->vl_input_queue = shmem_hdr->vl_input_queue;
+  tm->my_client_index = am->my_client_index;
+  return 0;
+}
+
+int
+disconnect_from_vpe (void)
+{
+  vl_client_disconnect_from_vlib ();
+
+  return 0;
+}
+
+void
+signal_handler (int signo)
+{
+  test_main_t *tm = &test_main;
+
+  tm->signal_received = 1;
+}
+
+
+int
+main (int argc, char **argv)
+{
+  test_main_t *tm = &test_main;
+  api_main_t *am = &api_main;
+  u32 swt_pid = 0;
+  int connected = 0;
+
+  signal (SIGINT, signal_handler);
+
+  while (1)
+    {
+      if (tm->signal_received)
+	break;
+
+      if (am->shmem_hdr)
+	swt_pid = am->shmem_hdr->vl_pid;
+
+      /* If kill returns 0, the vpe-f process is alive */
+      if (kill (swt_pid, 0) == 0)
+	{
+	  /* Try to connect */
+	  if (connected == 0)
+	    {
+	      fformat (stdout, "Connect to VPE-f\n");
+	      if (connect_to_vpe ("test_ha_client") >= 0)
+		{
+		  tm->pings_sent = 0;
+		  tm->pings_replied = 0;
+		  connected = 1;
+		}
+	      else
+		{
+		  fformat (stdout, "Connect failed, sleep and retry...\n");
+		  sleep (1);
+		  continue;
+		}
+	    }
+	  tm->pings_sent++;
+	  ping (tm);
+
+	  sleep (1);
+
+	  /* havent heard back in 3 seconds, disco / reco */
+	  if ((tm->pings_replied + 3) <= tm->pings_sent)
+	    {
+	      fformat (stdout, "VPE-f pid %d not responding\n", swt_pid);
+	      swt_pid = 0;
+	      disconnect_from_vpe ();
+	      connected = 0;
+	    }
+	}
+      else
+	{
+	  if (connected)
+	    {
+	      fformat (stdout, "VPE-f pid %d died\n", swt_pid);
+	      swt_pid = 0;
+	      disconnect_from_vpe ();
+	      connected = 0;
+	    }
+	  sleep (1);
+	}
+    }
+
+  fformat (stdout, "Signal received, graceful exit\n");
+  disconnect_from_vpe ();
+  exit (0);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/api/vat.h b/src/vpp/api/vat.h
new file mode 120000
index 00000000..3adbdbae
--- /dev/null
+++ b/src/vpp/api/vat.h
@@ -0,0 +1 @@
+../../vat/vat.h
\ No newline at end of file
diff --git a/src/vpp/api/vpe.api b/src/vpp/api/vpe.api
new file mode 100644
index 00000000..abd0e8f1
--- /dev/null
+++ b/src/vpp/api/vpe.api
@@ -0,0 +1,2782 @@
+/*
+ * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \file
+
+    This file defines vpe control-plane API messages which are generally
+    called through a shared memory interface. 
+*/
+
+/* 
+ * Note: API placement cleanup in progress
+ * If you're looking for interface APIs, please
+ * see .../vnet/vnet/{interface.api,interface_api.c}
+ * IP APIs: see .../vnet/vnet/ip/{ip.api, ip_api.c}
+ * TAP APIs: see .../vnet/vnet/unix/{tap.api, tap_api.c}
+ * VXLAN APIs: see .../vnet/vnet/vxlan/{vxlan.api, vxlan_api.c}
+ * AF-PACKET APIs: ... see /vnet/devices/af_packet/{af_packet.api, af_packet_api.c}
+ * NETMAP APIs: see ... /vnet/vnet/devices/netmap/{netmap.api, netmap_api.c}
+ * VHOST-USER APIs: see .../vnet/devices/virtio/{vhost_user.api, vhost_user_api.c}
+ * VXLAN GPE APIs: see .../vnet/vnet/vxlan-gpe/{vxlan_gpe.api, vxlan_gpe_api.c}
+ * GRE APIs: see .../vnet/vnet/gre/{gre.api, gre_api.c}
+ * L2TP APIs: see .../vnet/vnet/l2tp/{l2tp.api, l2tp_api.c}
+ * BFD APIs: see .../vnet/vnet/bfd/{bfd.api, bfd_api.c}
+ * IPSEC APIs: see .../vnet/vnet/ipsec/{ipsec.api, ipsec_api.c}
+ * IPSEC-GRE APIs: see .../vnet/vnet/ipsec-gre/{ipsec_gre.api, ipsec_gre_api.c}
+ * LISP APIs: see .../vnet/vnet/lisp/{lisp.api, lisp_api.c}
+ * LISP-GPE APIs: see .../vnet/vnet/lisp-gpe/{lisp_gpe.api, lisp_gpe_api.c}
+ */
+
+/** \brief Create a new subinterface with the given vlan id
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - software index of the new vlan's parent interface
+    @param vlan_id - vlan tag of the new interface
+*/
+define create_vlan_subif
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u32 vlan_id;
+};
+
+/** \brief Reply for the vlan subinterface create request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+    @param sw_if_index - software index allocated for the new subinterface
+*/
+define create_vlan_subif_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+};
+
+/** \brief Enable or Disable MPLS on and interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - index of the interface
+    @param enable - if non-zero enable, else disable
+*/
+define sw_interface_set_mpls_enable
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 enable;
+};
+
+/** \brief Reply for MPLS state on an interface
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define sw_interface_set_mpls_enable_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief MPLS Route Add / del route
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param mr_label - The MPLS label value
+    @param mr_eos - The End of stack bit
+    @param mr_table_id - The MPLS table-id the route is added in
+    @param mr_classify_table_index - If this is a classify route, 
+                                     this is the classify table index
+    @param  mr_create_table_if_needed - If the MPLS or IP tables do not exist,
+                                        create them
+    @param mr_is_add - Is this a route add or delete
+    @param mr_is_classify - Is this route result a classify
+    @param mr_is_multipath - Is this route update a multipath - i.e. is this
+                             a path addition to an existing route
+    @param mr_is_resolve_host - Recurse resolution constraint via a host prefix
+    @param mr_is_resolve_attached - Recurse resolution constraint via attached prefix
+    @param mr_next_hop_proto_is_ip4 - The next-hop is IPV4
+    @param mr_next_hop_weight - The weight, for UCMP
+    @param mr_next_hop[16] - the nextop address
+    @param mr_next_hop_sw_if_index - the next-hop SW interface
+    @param mr_next_hop_table_id - the next-hop table-id (if appropriate)
+    @param mr_next_hop_n_out_labels - the number of labels in the label stack
+    @param mr_next_hop_out_label_stack - the next-hop output label stack, outer most first
+    @param next_hop_via_label - The next-hop is a resolved via a local label
+*/
+define mpls_route_add_del
+{
+  u32 client_index;
+  u32 context;
+  u32 mr_label;
+  u8 mr_eos;
+  u32 mr_table_id;
+  u32 mr_classify_table_index;
+  u8 mr_create_table_if_needed;
+  u8 mr_is_add;
+  u8 mr_is_classify;
+  u8 mr_is_multipath;
+  u8 mr_is_resolve_host;
+  u8 mr_is_resolve_attached;
+  u8 mr_next_hop_proto_is_ip4;
+  u8 mr_next_hop_weight;
+  u8 mr_next_hop[16];
+  u8 mr_next_hop_n_out_labels;
+  u32 mr_next_hop_sw_if_index;
+  u32 mr_next_hop_table_id;
+  u32 mr_next_hop_via_label;
+  u32 mr_next_hop_out_label_stack[mr_next_hop_n_out_labels];
+};
+
+/** \brief Reply for MPLS route add / del request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define mpls_route_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Dump MPLS fib table
+    @param client_index - opaque cookie to identify the sender
+*/
+define mpls_fib_dump
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief FIB path
+    @param sw_if_index - index of the interface
+    @param weight - The weight, for UCMP
+    @param is_local - local if non-zero, else remote
+    @param is_drop - Drop the packet
+    @param is_unreach - Drop the packet and rate limit send ICMP unreachable
+    @param is_prohibit - Drop the packet and rate limit send ICMP prohibited
+    @param afi - the afi of the next hop, IP46_TYPE_IP4=1, IP46_TYPE_IP6=2
+    @param next_hop[16] - the next hop address
+
+    WARNING: this type is replicated, pending cleanup completion
+
+*/
+typeonly manual_print manual_endian define fib_path2
+{
+  u32 sw_if_index;
+  u32 weight;
+  u8 is_local;
+  u8 is_drop;
+  u8 is_unreach;
+  u8 is_prohibit;
+  u8 afi;
+  u8 next_hop[16];
+};
+
+/** \brief mpls FIB table response
+    @param table_id - MPLS fib table id
+    @param s_bit - End-of-stack bit
+    @param label - MPLS label value
+    @param count - the number of fib_path in path
+    @param path  - array of of fib_path structures
+*/
+manual_endian manual_print define mpls_fib_details
+{
+  u32 context;
+  u32 table_id;
+  u8  eos_bit;
+  u32 label;
+  u32 count;
+  vl_api_fib_path2_t path[count];
+};
+
+/** \brief Bind/Unbind an MPLS local label to an IP prefix. i.e. create
+           a per-prefix label entry.
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param mb_mpls_table_id - The MPLS table-id the MPLS entry will be added in
+    @param mb_label - The MPLS label value to bind
+    @param mb_ip_table_id - The IP table-id of the IP prefix to bind to.
+    @param mb_create_table_if_needed - Create either/both tables if required.
+    @param mb_is_bind - Bind or unbind
+    @param mb_is_ip4 - The prefix to bind to is IPv4
+    @param mb_address_length - Length of IP prefix
+    @param mb_address[16] - IP prefix/
+*/
+define mpls_ip_bind_unbind
+{
+  u32 client_index;
+  u32 context;
+  u32 mb_mpls_table_id;
+  u32 mb_label;
+  u32 mb_ip_table_id;
+  u8 mb_create_table_if_needed;
+  u8 mb_is_bind;
+  u8 mb_is_ip4;
+  u8 mb_address_length;
+  u8 mb_address[16];
+};
+
+/** \brief Reply for MPLS IP bind/unbind request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define mpls_ip_bind_unbind_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief MPLS tunnel Add / del route
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param mt_is_add - Is this a route add or delete
+    @param mt_sw_if_index - The SW interface index of the tunnel to delete
+    @param mt_next_hop_proto_is_ip4 - The next-hop is IPV4
+    @param mt_next_hop_weight - The weight, for UCMP
+    @param mt_next_hop[16] - the nextop address
+    @param mt_next_hop_sw_if_index - the next-hop SW interface
+    @param mt_next_hop_table_id - the next-hop table-id (if appropriate)
+    @param mt_next_hop_n_out_labels - the number of next-hop output labels
+    @param mt_next_hop_out_label_stack - the next-hop output label stack,  outer most first
+*/
+define mpls_tunnel_add_del
+{
+  u32 client_index;
+  u32 context;
+  u32 mt_sw_if_index;
+  u8 mt_is_add;
+  u8 mt_l2_only;
+  u8 mt_next_hop_proto_is_ip4;
+  u8 mt_next_hop_weight;
+  u8 mt_next_hop[16];
+  u8 mt_next_hop_n_out_labels;
+  u32 mt_next_hop_sw_if_index;
+  u32 mt_next_hop_table_id;
+  u32 mt_next_hop_out_label_stack[mt_next_hop_n_out_labels];
+};
+
+/** \brief Reply for MPLS tunnel add / del request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+    @param sw_if_index - SW interface index of the tunnel created
+*/
+define mpls_tunnel_add_del_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+};
+
+/** \brief Dump mpls eth tunnel table
+    @param client_index - opaque cookie to identify the sender
+    @param tunnel_index - eth tunnel identifier or -1 in case of all tunnels
+*/
+define mpls_tunnel_dump
+{
+  u32 client_index;
+  u32 context;
+  i32 tunnel_index;
+};
+
+/** \brief mpls eth tunnel operational state response
+    @param tunnel_index - eth tunnel identifier
+    @param intfc_address - interface ipv4 addr
+    @param mask_width - interface ipv4 addr mask
+    @param hw_if_index - interface id
+    @param l2_only -
+    @param tunnel_dst_mac -
+    @param tx_sw_if_index -
+    @param encap_index - reference to mpls label table
+    @param nlabels - number of resolved labels
+    @param labels - resolved labels
+*/
+define mpls_tunnel_details
+{
+  u32 context;
+  u32 tunnel_index;
+  u8 mt_l2_only;
+  u8 mt_sw_if_index;
+  u8 mt_next_hop_proto_is_ip4;
+  u8 mt_next_hop[16];
+  u32 mt_next_hop_sw_if_index;
+  u32 mt_next_hop_table_id;
+  u32 mt_next_hop_n_labels;
+  u32 mt_next_hop_out_labels[mt_next_hop_n_labels];
+};
+
+/** \brief Proxy ARP add / del request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param vrf_id - VRF / Fib table ID
+    @param is_add - 1 if adding the Proxy ARP range, 0 if deleting
+    @param low_address[4] - Low address of the Proxy ARP range
+    @param hi_address[4] - High address of the Proxy ARP range
+*/
+define proxy_arp_add_del
+{
+  u32 client_index;
+  u32 context;
+  u32 vrf_id;
+  u8 is_add;
+  u8 low_address[4];
+  u8 hi_address[4];
+};
+
+/** \brief Reply for proxy arp add / del request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define proxy_arp_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Proxy ARP add / del request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - Which interface to enable / disable Proxy Arp on
+    @param enable_disable - 1 to enable Proxy ARP on interface, 0 to disable
+*/
+define proxy_arp_intfc_enable_disable
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  /* 1 = on, 0 = off */
+  u8 enable_disable;
+};
+
+/** \brief Reply for Proxy ARP interface enable / disable request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define proxy_arp_intfc_enable_disable_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Reset VRF (remove all routes etc) request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_ipv6 - 1 for IPv6 neighbor, 0 for IPv4
+    @param vrf_id - ID of th FIB table / VRF to reset
+*/
+define reset_vrf
+{
+  u32 client_index;
+  u32 context;
+  u8 is_ipv6;
+  u32 vrf_id;
+};
+
+/** \brief Reply for Reset VRF request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define reset_vrf_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Is Address Reachable request - DISABLED
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param next_hop_sw_if_index - index of interface used to get to next hop
+    @param is_ipv6 - 1 for IPv6, 0 for IPv4
+    @param is_error - address not found or does not match intf
+    @param address[] - Address in question 
+*/
+define is_address_reachable
+{
+  u32 client_index;		/* (api_main_t *) am->my_client_index */
+  u32 context;
+  u32 next_hop_sw_if_index;
+  u8 is_known;			/* on reply, this is the answer */
+  u8 is_ipv6;
+  u8 is_error;			/* address not found or does not match intf */
+  u8 address[16];
+};
+
+/** \brief Want Stats, register for stats updates
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param enable_disable - 1 = enable stats, 0 = disable
+    @param pid - pid of process requesting stats updates
+*/
+define want_stats
+{
+  u32 client_index;
+  u32 context;
+  u32 enable_disable;
+  u32 pid;
+};
+
+/** \brief Reply for Want Stats request
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define want_stats_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+typeonly manual_print manual_endian define ip4_fib_counter
+{
+  u32 address;
+  u8 address_length;
+  u64 packets;
+  u64 bytes;
+};
+
+manual_print manual_endian define vnet_ip4_fib_counters
+{
+  u32 vrf_id;
+  u32 count;
+  vl_api_ip4_fib_counter_t c[count];
+};
+
+typeonly manual_print manual_endian define ip6_fib_counter
+{
+  u64 address[2];
+  u8 address_length;
+  u64 packets;
+  u64 bytes;
+};
+
+manual_print manual_endian define vnet_ip6_fib_counters
+{
+  u32 vrf_id;
+  u32 count;
+  vl_api_ip6_fib_counter_t c[count];
+};
+
+/** \brief Request for a single block of summary stats
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define vnet_get_summary_stats
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Reply for vnet_get_summary_stats request
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for request
+    @param total_pkts -  
+    @param total_bytes -
+    @param vector_rate - 
+*/
+define vnet_summary_stats_reply
+{
+  u32 context;
+  i32 retval;
+  u64 total_pkts[2];
+  u64 total_bytes[2];
+  f64 vector_rate;
+};
+
+/** \brief OAM event structure
+    @param dst_address[] - 
+    @param state
+*/
+define oam_event
+{
+  u8 dst_address[4];
+  u8 state;
+};
+
+/** \brief Want OAM events request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param enable_disable- enable if non-zero, else disable
+    @param pid - pid of the requesting process
+*/
+define want_oam_events
+{
+  u32 client_index;
+  u32 context;
+  u32 enable_disable;
+  u32 pid;
+};
+
+/** \brief Want OAM events response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the want oam stats request
+*/
+define want_oam_events_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief OAM add / del target request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param vrf_id - vrf_id of the target
+    @param src_address[] - source address to use for the updates 
+    @param dst_address[] - destination address of the target
+    @param is_add - add target if non-zero, else delete
+*/
+define oam_add_del
+{
+  u32 client_index;
+  u32 context;
+  u32 vrf_id;
+  u8 src_address[4];
+  u8 dst_address[4];
+  u8 is_add;
+};
+
+/** \brief OAM add / del target response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code of the request
+*/
+define oam_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Reset fib table request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param vrf_id - vrf/table id of the fib table to reset
+    @param is_ipv6 - an ipv6 fib to reset if non-zero, else ipv4
+*/
+define reset_fib
+{
+  u32 client_index;
+  u32 context;
+  u32 vrf_id;
+  u8 is_ipv6;
+};
+
+/** \brief Reset fib response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the reset bfib request
+*/
+define reset_fib_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief DHCP Proxy config add / del request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param vrf_id - vrf id
+    @param if_ipv6 - ipv6 if non-zero, else ipv4
+    @param is_add - add the config if non-zero, else delete
+    @param insert_circuit_id - option82 suboption 1 fib number
+    @param dhcp_server[] - server address
+    @param dhcp_src_address[] - <fix this, need details>
+*/
+define dhcp_proxy_config
+{
+  u32 client_index;
+  u32 context;
+  u32 vrf_id;
+  u8 is_ipv6;
+  u8 is_add;
+  u8 insert_circuit_id;
+  u8 dhcp_server[16];
+  u8 dhcp_src_address[16];
+};
+
+/** \brief DHCP Proxy config response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define dhcp_proxy_config_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief DHCP Proxy set / unset vss request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param tbl_id - table id
+    @param oui - first part of vpn id
+    @param fib_id - second part of vpn id
+    @param is_ipv6 - ip6 if non-zero, else ip4
+    @param is_add - set vss if non-zero, else delete
+*/
+define dhcp_proxy_set_vss
+{
+  u32 client_index;
+  u32 context;
+  u32 tbl_id;
+  u32 oui;
+  u32 fib_id;
+  u8 is_ipv6;
+  u8 is_add;
+};
+
+/** \brief DHCP proxy set / unset vss response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define dhcp_proxy_set_vss_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Create loopback interface request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param mac_address - mac addr to assign to the interface if none-zero
+*/
+define create_loopback
+{
+  u32 client_index;
+  u32 context;
+  u8 mac_address[6];
+};
+
+/** \brief Create loopback interface response
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - sw index of the interface that was created
+    @param retval - return code for the request
+*/
+define create_loopback_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+};
+
+/** \brief Delete loopback interface request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - sw index of the interface that was created
+*/
+define delete_loopback
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+};
+
+/** \brief Delete loopback interface response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define delete_loopback_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Control ping from client to api server request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define control_ping
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Control ping from the client to the server response
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+    @param vpe_pid - the pid of the vpe, returned by the server
+*/
+define control_ping_reply
+{
+  u32 context;
+  i32 retval;
+  u32 client_index;
+  u32 vpe_pid;
+};
+
+/** \brief Process a vpe parser cli string request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param cmd_in_shmem - pointer to cli command string
+*/
+define cli_request
+{
+  u32 client_index;
+  u32 context;
+  u64 cmd_in_shmem;
+};
+define cli_inband
+{
+  u32 client_index;
+  u32 context;
+  u32 length;
+  u8 cmd[length];
+};
+
+/** \brief vpe parser cli string response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for request
+    @param reply_in_shmem - Reply string from cli processing if any
+*/
+define cli_reply
+{
+  u32 context;
+  i32 retval;
+  u64 reply_in_shmem;
+};
+define cli_inband_reply
+{
+  u32 context;
+  i32 retval;
+  u32 length;
+  u8 reply[length];
+};
+
+/** \brief Set max allowed ARP or ip6 neighbor entries request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_ipv6 - neighbor limit if non-zero, else ARP limit
+    @param arp_neighbor_limit - the new limit, defaults are ~ 50k
+*/
+define set_arp_neighbor_limit
+{
+  u32 client_index;
+  u32 context;
+  u8 is_ipv6;
+  u32 arp_neighbor_limit;
+};
+
+/** \brief Set max allowed ARP or ip6 neighbor entries response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for request
+*/
+define set_arp_neighbor_limit_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief L2 interface patch add / del request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param rx_sw_if_index - receive side interface 
+    @param tx_sw_if_index - transmit side interface
+    @param is_add - if non-zero set up the interface patch, else remove it
+*/
+define l2_patch_add_del
+{
+  u32 client_index;
+  u32 context;
+  u32 rx_sw_if_index;
+  u32 tx_sw_if_index;
+  u8 is_add;
+};
+
+/** \brief L2 interface patch add / del response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define l2_patch_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IPv6 segment routing tunnel add / del request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add the tunnel if non-zero, else delete it
+    @param name[] - tunnel name (len. 64)
+    @param src_address[] -
+    @param dst_address[] -
+    @param dst_mask_width -
+    @param inner_vrf_id -
+    @param outer_vrf_id -
+    @param flags_net_byte_order -
+    @param n_segments -
+    @param n_tags -
+    @param segs_and_tags[] -
+    @param policy_name[] - name of policy to associate this tunnel to (len. 64)
+*/
+define sr_tunnel_add_del
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 name[64];
+  u8 src_address[16];
+  u8 dst_address[16];
+  u8 dst_mask_width;
+  u32 inner_vrf_id;
+  u32 outer_vrf_id;
+  u16 flags_net_byte_order;
+  u8 n_segments;
+  u8 n_tags;
+  u8 policy_name[64];
+  u8 segs_and_tags[0];
+};
+
+/** \brief IPv6 segment routing tunnel add / del response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define sr_tunnel_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IPv6 segment routing policy add / del request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add the tunnel if non-zero, else delete it
+    @param name[] - policy name (len. 64)
+    @param tunnel_names[] -
+*/
+define sr_policy_add_del
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 name[64];
+  u8 tunnel_names[0];
+};
+
+/** \brief IPv6 segment routing policy add / del response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define sr_policy_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IPv6 segment routing multicast map to policy add / del request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add the tunnel if non-zero, else delete it
+    @param multicast_address[] - IP6 multicast address
+    @param policy_name[] = policy name (len.64)
+*/
+define sr_multicast_map_add_del
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 multicast_address[16];
+  u8 policy_name[64];
+};
+
+/** \brief IPv6 segment routing multicast map to policy add / del response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define sr_multicast_map_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Interface set vpath request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface used to reach neighbor
+    @param enable - if non-zero enable, else disable
+*/
+define sw_interface_set_vpath
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 enable;
+};
+
+/** \brief Interface set vpath response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define sw_interface_set_vpath_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Set L2 XConnect between two interfaces request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param rx_sw_if_index - Receive interface index
+    @param tx_sw_if_index - Transmit interface index
+    @param enable - enable xconnect if not 0, else set to L3 mode
+*/
+define sw_interface_set_l2_xconnect
+{
+  u32 client_index;
+  u32 context;
+  u32 rx_sw_if_index;
+  u32 tx_sw_if_index;
+  u8 enable;
+};
+
+/** \brief Set L2 XConnect response
+    @param context - sender context, to match reply w/ request
+    @param retval - L2 XConnect request return code
+*/
+define sw_interface_set_l2_xconnect_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Interface bridge mode request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param rx_sw_if_index - the interface
+    @param bd_id - bridge domain id
+    @param bvi - Setup interface as a bvi, bridge mode only
+    @param shg - Shared horizon group, for bridge mode only
+    @param enable - Enable beige mode if not 0, else set to L3 mode
+*/
+define sw_interface_set_l2_bridge
+{
+  u32 client_index;
+  u32 context;
+  u32 rx_sw_if_index;
+  u32 bd_id;
+  u8 shg;
+  u8 bvi;
+  u8 enable;
+};
+
+/** \brief Interface bridge mode response
+    @param context - sender context, to match reply w/ request
+    @param retval - Bridge mode request return code
+*/
+define sw_interface_set_l2_bridge_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief L2 FIB add entry request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param mac - the entry's mac address
+    @param bd_id - the entry's bridge domain id
+    @param sw_if_index - the interface
+    @param is_add - If non zero add the entry, else delete it
+    @param static_mac - 
+    @param filter_mac -
+*/
+define l2fib_add_del
+{
+  u32 client_index;
+  u32 context;
+  u64 mac;
+  u32 bd_id;
+  u32 sw_if_index;
+  u8 is_add;
+  u8 static_mac;
+  u8 filter_mac;
+  u8 bvi_mac;
+};
+
+/** \brief L2 FIB add entry response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the add l2fib entry request
+*/
+define l2fib_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Set L2 flags request !!! TODO - need more info, feature bits in l2_input.h
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface 
+    @param is_set - if non-zero, set the bits, else clear them
+    @param feature_bitmap - non-zero bits to set or clear
+*/
+define l2_flags
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 is_set;
+  u32 feature_bitmap;
+};
+
+/** \brief Set L2 bits response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the set l2 bits request
+*/
+define l2_flags_reply
+{
+  u32 context;
+  i32 retval;
+  u32 resulting_feature_bitmap;
+};
+
+/** \brief Set bridge flags (such as L2_LEARN, L2_FWD, L2_FLOOD, 
+    L2_UU_FLOOD, or L2_ARP_TERM) request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param bd_id - the bridge domain to set the flags for
+    @param is_set - if non-zero, set the flags, else clear them
+    @param feature_bitmap - bits that are non-zero to set or clear
+*/
+define bridge_flags
+{
+  u32 client_index;
+  u32 context;
+  u32 bd_id;
+  u8 is_set;
+  u32 feature_bitmap;
+};
+
+/** \brief Set bridge flags response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the set bridge flags request
+    @param resulting_feature_bitmap - the feature bitmap value after the request is implemented
+*/
+define bridge_flags_reply
+{
+  u32 context;
+  i32 retval;
+  u32 resulting_feature_bitmap;
+};
+
+/** \brief Set bridge domain ip to mac entry request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param bd_id - the bridge domain to set the flags for
+    @param is_add - if non-zero, add the entry, else clear it
+    @param is_ipv6 - if non-zero, ipv6 address, else ipv4 address
+    @param mac_address - MAC address
+    @param 
+*/
+define bd_ip_mac_add_del
+{
+  u32 client_index;
+  u32 context;
+  u32 bd_id;
+  u8 is_add;
+  u8 is_ipv6;
+  u8 ip_address[16];
+  u8 mac_address[6];
+};
+
+/** \brief Set bridge domain ip to mac entry response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the set bridge flags request
+*/
+define bd_ip_mac_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Add/Delete classification table request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add- if non-zero add the table, else delete it
+    @param del_chain - if non-zero delete the whole chain of tables
+    @param table_index - if add, reuturns index of the created table, else specifies the table to delete  
+    @param nbuckets - number of buckets when adding a table
+    @param memory_size - memory size when adding a table
+    @param match_n_vectors - number of match vectors
+    @param next_table_index - index of next table
+    @param miss_next_index - index of miss table
+    @param current_data_flag - option to use current node's packet payload
+            as the starting point from where packets are classified,
+            This option is only valid for L2/L3 input ACL for now.
+            0: by default, classify data from the buffer's start location
+            1: classify packets from VPP node’s current data pointer
+    @param current_data_offset - a signed value to shift the start location of
+            the packet to be classified
+            For example, if input IP ACL node is used, L2 header’s first byte
+            can be accessible by configuring current_data_offset to -14
+            if there is no vlan tag.
+            This is valid only if current_data_flag is set to 1.
+    @param mask[] - match mask
+*/
+define classify_add_del_table
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 del_chain;
+  u32 table_index;
+  u32 nbuckets;
+  u32 memory_size;
+  u32 skip_n_vectors;
+  u32 match_n_vectors;
+  u32 next_table_index;
+  u32 miss_next_index;
+  u32 current_data_flag;
+  i32 current_data_offset;
+  u8 mask[0];
+};
+
+/** \brief Add/Delete classification table response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the table add/del requst
+    @param new_table_index - for add, returned index of the new table
+    @param skip_n_vectors - for add, returned value of skip_n_vectors in table
+    @param match_n_vectors -for add, returned value of match_n_vectors in table
+*/
+define classify_add_del_table_reply
+{
+  u32 context;
+  i32 retval;
+  u32 new_table_index;
+  u32 skip_n_vectors;
+  u32 match_n_vectors;
+};
+
+/** \brief Classify add / del session request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add session if non-zero, else delete
+    @param table_index - index of the table to add/del the session, required
+    @param hit_next_index - for add, hit_next_index of new session, required
+    @param opaque_index - for add, opaque_index of new session
+    @param advance -for add, advance value for session
+    @param action -
+           0: no action (by default)
+              metadata is not used.
+           1: Classified IP packets will be looked up from the
+              specified ipv4 fib table (configured by metadata as VRF id).
+              Only valid for L3 input ACL node
+           2: Classified IP packets will be looked up from the
+              specified ipv6 fib table (configured by metadata as VRF id).
+              Only valid for L3 input ACL node
+    @param metadata - valid only if action != 0
+           VRF id if action is 1 or 2.
+    @param match[] - for add, match value for session, required
+*/
+define classify_add_del_session
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u32 table_index;
+  u32 hit_next_index;
+  u32 opaque_index;
+  i32 advance;
+  u8 action;
+  u32 metadata;
+  u8 match[0];
+};
+
+/** \brief Classify add / del session response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the add/del session request
+*/
+define classify_add_del_session_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Set/unset the classification table for an interface request 
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_ipv6 - ipv6 if non-zero, else ipv4
+    @param sw_if_index - interface to associate with the table
+    @param table_index - index of the table, if ~0 unset the table
+*/
+define classify_set_interface_ip_table
+{
+  u32 client_index;
+  u32 context;
+  u8 is_ipv6;
+  u32 sw_if_index;
+  u32 table_index;		/* ~0 => off */
+};
+
+/** \brief Set/unset interface classification table response 
+    @param context - sender context, to match reply w/ request
+    @param retval - return code
+*/
+define classify_set_interface_ip_table_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Set/unset l2 classification tables for an interface request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface to set/unset tables for
+    @param ip4_table_index - ip4 index, use ~0 for all 3 indexes to unset
+    @param ip6_table_index - ip6 index
+    @param other_table_index - other index
+*/
+define classify_set_interface_l2_tables
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  /* 3 x ~0 => off */
+  u32 ip4_table_index;
+  u32 ip6_table_index;
+  u32 other_table_index;
+  u8 is_input;
+};
+
+/** \brief Set/unset l2 classification tables for an interface response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define classify_set_interface_l2_tables_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Get node index using name request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param node_name[] - name of the node
+*/
+define get_node_index
+{
+  u32 client_index;
+  u32 context;
+  u8 node_name[64];
+};
+
+/** \brief Get node index using name request
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+    @param node_index - index of the desired node if found, else ~0
+*/
+define get_node_index_reply
+{
+  u32 context;
+  i32 retval;
+  u32 node_index;
+};
+
+/** \brief Set the next node for a given node request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param node_name[] - node to add the next node to
+    @param next_name[] - node to add as the next node
+*/
+define add_node_next
+{
+  u32 client_index;
+  u32 context;
+  u8 node_name[64];
+  u8 next_name[64];
+};
+
+/** \brief IP Set the next node for a given node response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the add next node request
+    @param next_index - the index of the next node if success, else ~0
+*/
+define add_node_next_reply
+{
+  u32 context;
+  i32 retval;
+  u32 next_index;
+};
+
+/** \brief DHCP Proxy config 2 add / del request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param rx_vrf_id - receive vrf id
+    @param server_vrf_id - server vrf id
+    @param if_ipv6 - ipv6 if non-zero, else ipv4
+    @param is_add - add the config if non-zero, else delete
+    @param insert_circuit_id - option82 suboption 1 fib number
+    @param dhcp_server[] - server address
+    @param dhcp_src_address[] - <fix this, need details>
+*/
+define dhcp_proxy_config_2
+{
+  u32 client_index;
+  u32 context;
+  u32 rx_vrf_id;
+  u32 server_vrf_id;
+  u8 is_ipv6;
+  u8 is_add;
+  u8 insert_circuit_id;
+  u8 dhcp_server[16];
+  u8 dhcp_src_address[16];
+};
+
+/** \brief DHCP Proxy config 2 add / del response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for request
+*/
+define dhcp_proxy_config_2_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief L2 fib clear table request, clear all mac entries in the l2 fib
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define l2_fib_clear_table
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief L2 fib clear table response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define l2_fib_clear_table_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief L2 interface ethernet flow point filtering enable/disable request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface to enable/disable filtering on
+    @param enable_disable - if non-zero enable filtering, else disable
+*/
+define l2_interface_efp_filter
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u32 enable_disable;
+};
+
+/** \brief L2 interface ethernet flow point filtering response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define l2_interface_efp_filter_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief L2 interface vlan tag rewrite configure request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface the operation is applied to
+    @param vtr_op - Choose from l2_vtr_op_t enum values
+    @param push_dot1q - first pushed flag dot1q id set, else dot1ad
+    @param tag1 - Needed for any push or translate vtr op
+    @param tag2 - Needed for any push 2 or translate x-2 vtr ops
+*/
+define l2_interface_vlan_tag_rewrite
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u32 vtr_op;
+  u32 push_dot1q;		// ethertype of first pushed tag is dot1q/dot1ad
+  u32 tag1;			// first pushed tag
+  u32 tag2;			// second pushed tag
+};
+
+/** \brief L2 interface vlan tag rewrite response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define l2_interface_vlan_tag_rewrite_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+define create_subif
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u32 sub_id;
+
+  /* These fields map directly onto the subif template */
+  u8 no_tags;
+  u8 one_tag;
+  u8 two_tags;
+  u8 dot1ad;			// 0 = dot1q, 1=dot1ad
+  u8 exact_match;
+  u8 default_sub;
+  u8 outer_vlan_id_any;
+  u8 inner_vlan_id_any;
+  u16 outer_vlan_id;
+  u16 inner_vlan_id;
+};
+
+define create_subif_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+};
+
+/** \brief show version
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define show_version
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief show version response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+    @param program - name of the program (vpe)
+    @param version  - version of the program
+    @param build_directory - root of the workspace where the program was built
+*/
+define show_version_reply
+{
+  u32 context;
+  i32 retval;
+  u8 program[32];
+  u8 version[32];
+  u8 build_date[32];
+  u8 build_directory[256];
+};
+
+/** \brief l2 fib table entry structure
+    @param bd_id - the l2 fib / bridge domain table id
+    @param mac - the entry's mac address
+    @param sw_if_index - index of the interface
+    @param static_mac - the entry is statically configured.
+    @param filter_mac - the entry is a mac filter entry.
+    @param bvi_mac - the mac address is a bridge virtual interface
+*/
+define l2_fib_table_entry
+{
+  u32 context;
+  u32 bd_id;
+  u64 mac;
+  u32 sw_if_index;
+  u8 static_mac;
+  u8 filter_mac;
+  u8 bvi_mac;
+};
+
+/** \brief Dump l2 fib (aka bridge domain) table
+    @param client_index - opaque cookie to identify the sender
+    @param bd_id - the l2 fib / bridge domain table identifier
+*/
+define l2_fib_table_dump
+{
+  u32 client_index;
+  u32 context;
+  u32 bd_id;
+};
+
+/* Gross kludge, DGMS */
+define interface_name_renumber
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u32 new_show_dev_instance;
+};
+
+define interface_name_renumber_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Register for ip4 arp resolution events
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param enable_disable - 1 => register for events, 0 => cancel registration
+    @param pid - sender's pid
+    @param address - the exact ip4 address of interest
+*/
+define want_ip4_arp_events
+{
+  u32 client_index;
+  u32 context;
+  u8 enable_disable;
+  u32 pid;
+  u32 address;
+};
+
+/** \brief Reply for interface events registration
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define want_ip4_arp_events_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Tell client about an ip4 arp resolution event
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param address - the exact ip4 address of interest
+    @param pid - client pid registered to receive notification
+    @param sw_if_index - interface which received ARP packet
+    @param new_mac - the new mac address 
+    @param mac_ip - 0: resolution event, 1: mac/ip binding in bd
+*/
+define ip4_arp_event
+{
+  u32 client_index;
+  u32 context;
+  u32 address;
+  u32 pid;
+  u32 sw_if_index;
+  u8 new_mac[6];
+  u8 mac_ip;
+};
+
+/** \brief Register for ip6 nd resolution events
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param enable_disable - 1 => register for events, 0 => cancel registration
+    @param pid - sender's pid
+    @param address - the exact ip6 address of interest
+*/
+define want_ip6_nd_events
+{
+  u32 client_index;
+  u32 context;
+  u8 enable_disable;
+  u32 pid;
+  u8 address[16];
+};
+
+/** \brief Reply for ip6 nd resolution events registration
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define want_ip6_nd_events_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Tell client about an ip6 nd resolution or mac/ip event
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param pid - client pid registered to receive notification
+    @param sw_if_index - interface which received ARP packet
+    @param address - the exact ip6 address of interest
+    @param new_mac - the new mac address 
+    @param mac_ip - 0: resolution event, 1: mac/ip binding in bd
+*/
+define ip6_nd_event
+{
+  u32 client_index;
+  u32 context;
+  u32 pid;
+  u32 sw_if_index;
+  u8 address[16];
+  u8 new_mac[6];
+  u8 mac_ip;
+};
+    
+/** \brief L2 bridge domain add or delete request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param bd_id - the bridge domain to create
+    @param flood - enable/disable bcast/mcast flooding in the bd
+    @param uu_flood - enable/disable uknown unicast flood in the bd
+    @param forward - enable/disable forwarding on all interfaces in the bd
+    @param learn - enable/disable learning on all interfaces in the bd
+    @param arp_term - enable/disable arp termination in the bd
+    @param mac_age - mac aging time in min, 0 for disabled
+    @param is_add - add or delete flag
+*/
+define bridge_domain_add_del
+{
+  u32 client_index;
+  u32 context;
+  u32 bd_id;
+  u8 flood;
+  u8 uu_flood;
+  u8 forward;
+  u8 learn;
+  u8 arp_term;
+  u8 mac_age;
+  u8 is_add;
+};
+
+/** \brief L2 bridge domain add or delete response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the set bridge flags request
+*/
+define bridge_domain_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief L2 bridge domain request operational state details
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param bd_id - the bridge domain id desired or ~0 to request all bds
+*/
+define bridge_domain_dump
+{
+  u32 client_index;
+  u32 context;
+  u32 bd_id;
+};
+
+/** \brief L2 bridge domain operational state response
+    @param bd_id - the bridge domain id
+    @param flood - bcast/mcast flooding state on all interfaces in the bd
+    @param uu_flood - uknown unicast flooding state on all interfaces in the bd
+    @param forward - forwarding state on all interfaces in the bd
+    @param learn - learning state on all interfaces in the bd
+    @param arp_term - arp termination state on all interfaces in the bd
+    @param mac_age - mac aging time in min, 0 for disabled
+    @param n_sw_ifs - number of sw_if_index's in the domain
+*/
+define bridge_domain_details
+{
+  u32 context;
+  u32 bd_id;
+  u8 flood;
+  u8 uu_flood;
+  u8 forward;
+  u8 learn;
+  u8 arp_term;
+  u8 mac_age;
+  u32 bvi_sw_if_index;
+  u32 n_sw_ifs;
+};
+
+/** \brief L2 bridge domain sw interface operational state response
+    @param bd_id - the bridge domain id
+    @param sw_if_index - sw_if_index in the domain
+    @param shg - split horizon group for the interface
+*/
+define bridge_domain_sw_if_details
+{
+  u32 context;
+  u32 bd_id;
+  u32 sw_if_index;
+  u8 shg;
+};
+
+/** \brief DHCP Client config add / del request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - index of the interface for DHCP client
+    @param hostname - hostname
+    @param is_add - add the config if non-zero, else delete
+    @param want_dhcp_event - DHCP event sent to the sender
+           via dhcp_compl_event API message if non-zero
+    @param pid - sender's pid
+*/
+define dhcp_client_config
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 hostname[64];
+  u8 is_add;
+  u8 want_dhcp_event;
+  u32 pid;
+};
+
+/** \brief DHCP Client config response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define dhcp_client_config_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Set/unset input ACL interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface to set/unset input ACL
+    @param ip4_table_index - ip4 classify table index (~0 for skip)
+    @param ip6_table_index - ip6 classify table index (~0 for skip)
+    @param l2_table_index  -  l2 classify table index (~0 for skip)
+    @param is_add - Set input ACL if non-zero, else unset
+    Note: User is recommeneded to use just one valid table_index per call.
+          (ip4_table_index, ip6_table_index, or l2_table_index)
+*/
+define input_acl_set_interface
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u32 ip4_table_index;
+  u32 ip6_table_index;
+  u32 l2_table_index;
+  u8 is_add;
+};
+
+/** \brief Set/unset input ACL interface response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define input_acl_set_interface_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Tell client about a DHCP completion event
+    @param client_index - opaque cookie to identify the sender
+    @param pid - client pid registered to receive notification
+    @param is_ipv6 - if non-zero the address is ipv6, else ipv4
+    @param host_address - Host IP address
+    @param router_address - Router IP address
+    @param host_mac - Host MAC address
+*/
+define dhcp_compl_event
+{
+  u32 client_index;
+  u32 pid;
+  u8 hostname[64];
+  u8 is_ipv6;
+  u8 host_address[16];
+  u8 router_address[16];
+  u8 host_mac[6];
+};
+
+/** \brief cop: enable/disable junk filtration features on an interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_inded - desired interface
+    @param enable_disable - 1 => enable, 0 => disable
+*/
+
+define cop_interface_enable_disable
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 enable_disable;
+};
+
+/** \brief cop: interface enable/disable junk filtration reply
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+
+define cop_interface_enable_disable_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief cop: enable/disable whitelist filtration features on an interface
+    Note: the supplied fib_id must match in order to remove the feature!
+    
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface handle, physical interfaces only
+    @param fib_id - fib identifier for the whitelist / blacklist fib
+    @param ip4 - 1 => enable ip4 filtration, 0=> disable ip4 filtration
+    @param ip6 - 1 => enable ip6 filtration, 0=> disable ip6 filtration
+    @param default_cop -  1 => enable non-ip4, non-ip6 filtration 0=> disable it
+*/
+
+define cop_whitelist_enable_disable
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u32 fib_id;
+  u8 ip4;
+  u8 ip6;
+  u8 default_cop;
+};
+
+/** \brief cop: interface enable/disable junk filtration reply
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+
+define cop_whitelist_enable_disable_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief get_node_graph - get a copy of the vpp node graph
+    including the current set of graph arcs.
+
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+
+define get_node_graph
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief get_node_graph_reply
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+    @param reply_in_shmem - result from vlib_node_serialize, in shared
+    memory. Process with vlib_node_unserialize, remember to switch
+    heaps and free the result.
+*/
+
+define get_node_graph_reply
+{
+  u32 context;
+  i32 retval;
+  u64 reply_in_shmem;
+};
+
+/** \brief IOAM enable : Enable in-band OAM
+    @param id - profile id
+    @param seqno - To enable Seqno Processing
+    @param analyse - Enabling analysis of iOAM at decap node 
+    @param pow_enable - Proof of Work enabled or not flag
+    @param trace_enable - iOAM Trace enabled or not flag
+*/
+define ioam_enable
+{
+  u32 client_index;
+  u32 context;
+  u16 id;
+  u8 seqno;
+  u8 analyse;
+  u8 pot_enable;
+  u8 trace_enable;
+  u32 node_id;
+};
+
+/** \brief iOAM Trace profile add / del response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define ioam_enable_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief iOAM disable
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param index - MAP Domain index
+*/
+define ioam_disable
+{
+  u32 client_index;
+  u32 context;
+  u16 id;
+};
+
+/** \brief iOAM disable response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define ioam_disable_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Add/del policer
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add policer if non-zero, else delete
+    @param name - policer name
+    @param cir - CIR
+    @param eir - EIR
+    @param cb - Committed Burst
+    @param eb - Excess or Peak Burst
+    @param rate_type - rate type
+    @param round_type - rounding type
+    @param type - policer algorithm
+    @param color_aware - 0=color-blind, 1=color-aware
+    @param conform_action_type - conform action type
+    @param conform_dscp - DSCP for conform mar-and-transmit action
+    @param exceed_action_type - exceed action type
+    @param exceed_dscp - DSCP for exceed mar-and-transmit action
+    @param violate_action_type - violate action type
+    @param violate_dscp - DSCP for violate mar-and-transmit action
+*/
+define policer_add_del
+{
+  u32 client_index;
+  u32 context;
+
+  u8 is_add;
+  u8 name[64];
+  u32 cir;
+  u32 eir;
+  u64 cb;
+  u64 eb;
+  u8 rate_type;
+  u8 round_type;
+  u8 type;
+  u8 color_aware;
+  u8 conform_action_type;
+  u8 conform_dscp;
+  u8 exceed_action_type;
+  u8 exceed_dscp;
+  u8 violate_action_type;
+  u8 violate_dscp;
+};
+
+/** \brief Add/del policer response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+    @param policer_index - for add, returned index of the new policer
+*/
+define policer_add_del_reply
+{
+  u32 context;
+  i32 retval;
+  u32 policer_index;
+};
+
+/** \brief Get list of policers
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param match_name_valid - if 0 request all policers otherwise use match_name
+    @param match_name - policer name
+*/
+define policer_dump
+{
+  u32 client_index;
+  u32 context;
+
+  u8 match_name_valid;
+  u8 match_name[64];
+};
+
+/** \brief Policer operational state response.
+    @param context - sender context, to match reply w/ request
+    @param name - policer name
+    @param cir - CIR
+    @param eir - EIR
+    @param cb - Committed Burst
+    @param eb - Excess or Peak Burst
+    @param rate_type - rate type
+    @param round_type - rounding type
+    @param type - policer algorithm
+    @param conform_action_type - conform action type
+    @param conform_dscp - DSCP for conform mar-and-transmit action
+    @param exceed_action_type - exceed action type
+    @param exceed_dscp - DSCP for exceed mar-and-transmit action
+    @param violate_action_type - violate action type
+    @param violate_dscp - DSCP for violate mar-and-transmit action
+    @param single_rate - 1 = single rate policer, 0 = two rate policer
+    @param color_aware - for hierarchical policing
+    @param scale - power-of-2 shift amount for lower rates
+    @param cir_tokens_per_period - number of tokens for each period
+    @param pir_tokens_per_period - number of tokens for each period for 2-rate policer
+    @param current_limit - current limit
+    @param current_bucket - current bucket
+    @param extended_limit - extended limit
+    @param extended_bucket - extended bucket
+    @param last_update_time - last update time
+*/
+define policer_details
+{
+  u32 context;
+
+  u8 name[64];
+  u32 cir;
+  u32 eir;
+  u64 cb;
+  u64 eb;
+  u8 rate_type;
+  u8 round_type;
+  u8 type;
+  u8 conform_action_type;
+  u8 conform_dscp;
+  u8 exceed_action_type;
+  u8 exceed_dscp;
+  u8 violate_action_type;
+  u8 violate_dscp;
+  u8 single_rate;
+  u8 color_aware;
+  u32 scale;
+  u32 cir_tokens_per_period;
+  u32 pir_tokens_per_period;
+  u32 current_limit;
+  u32 current_bucket;
+  u32 extended_limit;
+  u32 extended_bucket;
+  u64 last_update_time;
+};
+
+/** \brief Set/unset policer classify interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface to set/unset policer classify
+    @param ip4_table_index - ip4 classify table index (~0 for skip)
+    @param ip6_table_index - ip6 classify table index (~0 for skip)
+    @param l2_table_index  -  l2 classify table index (~0 for skip)
+    @param is_add - Set if non-zero, else unset
+    Note: User is recommeneded to use just one valid table_index per call.
+          (ip4_table_index, ip6_table_index, or l2_table_index)
+*/
+define policer_classify_set_interface
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u32 ip4_table_index;
+  u32 ip6_table_index;
+  u32 l2_table_index;
+  u8 is_add;
+};
+
+/** \brief Set/unset policer classify interface response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define policer_classify_set_interface_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Get list of policer classify interfaces and tables
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param type - classify table type
+*/
+define policer_classify_dump
+{
+  u32 client_index;
+  u32 context;
+  u8 type;
+};
+
+/** \brief Policer iclassify operational state response.
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - software interface index
+    @param table_index - classify table index
+*/
+define policer_classify_details
+{
+  u32 context;
+  u32 sw_if_index;
+  u32 table_index;
+};
+
+/** \brief Classify get table IDs request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define classify_table_ids
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Reply for classify get table IDs request
+    @param context - sender context which was passed in the request
+    @param count - number of ids returned in response
+    @param ids - array of classify table ids
+*/
+define classify_table_ids_reply
+{
+  u32 context;
+  i32 retval;
+  u32 count;
+  u32 ids[count];
+};
+
+/** \brief Classify table ids by interface index request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - index of the interface
+*/
+define classify_table_by_interface
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+};
+
+/** \brief Reply for classify table id by interface index request
+    @param context - sender context which was passed in the request
+    @param count - number of ids returned in response
+    @param sw_if_index - index of the interface
+    @param l2_table_id - l2 classify table index
+    @param ip4_table_id - ip4 classify table index
+    @param ip6_table_id - ip6 classify table index
+*/
+define classify_table_by_interface_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+  u32 l2_table_id;
+  u32 ip4_table_id;
+  u32 ip6_table_id;
+};
+
+/** \brief Classify table info
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param table_id - classify table index
+*/
+define classify_table_info
+{
+  u32 client_index;
+  u32 context;
+  u32 table_id;
+};
+
+/** \brief Reply for classify table info request
+    @param context - sender context which was passed in the request
+    @param count - number of ids returned in response
+    @param table_id - classify table index
+    @param nbuckets - number of buckets when adding a table
+    @param match_n_vectors - number of match vectors
+    @param skip_n_vectors - number of skip_n_vectors
+    @param active_sessions - number of sessions (active entries)
+    @param next_table_index - index of next table
+    @param miss_next_index - index of miss table
+    @param mask[] - match mask
+*/
+define classify_table_info_reply
+{
+  u32 context;
+  i32 retval;
+  u32 table_id;
+  u32 nbuckets;
+  u32 match_n_vectors;
+  u32 skip_n_vectors;
+  u32 active_sessions;
+  u32 next_table_index;
+  u32 miss_next_index;
+  u32 mask_length;
+  u8 mask[mask_length];
+};
+
+/** \brief Classify sessions dump request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param table_id - classify table index
+*/
+define classify_session_dump
+{
+  u32 client_index;
+  u32 context;
+  u32 table_id;
+};
+
+/** \brief Reply for classify table session dump request
+    @param context - sender context which was passed in the request
+    @param count - number of ids returned in response
+    @param table_id - classify table index
+    @param hit_next_index - hit_next_index of session
+    @param opaque_index - for add, opaque_index of session
+    @param advance - advance value of session
+    @param match[] - match value for session
+*/
+define classify_session_details
+{
+  u32 context;
+  i32 retval;
+  u32 table_id;
+  u32 hit_next_index;
+  i32 advance;
+  u32 opaque_index;
+  u32 match_length;
+  u8 match[match_length];
+};
+
+/** \brief Configure IPFIX exporter process request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param collector_address - address of IPFIX collector
+    @param collector_port - port of IPFIX collector
+    @param src_address - address of IPFIX exporter
+    @param vrf_id - VRF / fib table ID
+    @param path_mtu - Path MTU between exporter and collector
+    @param template_interval - number of seconds after which to resend template
+    @param udp_checksum - UDP checksum calculation enable flag
+*/
+define set_ipfix_exporter
+{
+  u32 client_index;
+  u32 context;
+  u8 collector_address[16];
+  u16 collector_port;
+  u8 src_address[16];
+  u32 vrf_id;
+  u32 path_mtu;
+  u32 template_interval;
+  u8 udp_checksum;
+};
+
+/** \brief Reply to IPFIX exporter configure request
+    @param context - sender context which was passed in the request
+*/
+define set_ipfix_exporter_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief IPFIX exporter dump request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define ipfix_exporter_dump
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Reply to IPFIX exporter dump request
+    @param context - sender context which was passed in the request
+    @param collector_address - address of IPFIX collector
+    @param collector_port - port of IPFIX collector
+    @param src_address - address of IPFIX exporter
+    @param fib_index - fib table index
+    @param path_mtu - Path MTU between exporter and collector
+    @param template_interval - number of seconds after which to resend template
+    @param udp_checksum - UDP checksum calculation enable flag
+*/
+define ipfix_exporter_details
+{
+  u32 context;
+  u8 collector_address[16];
+  u16 collector_port;
+  u8 src_address[16];
+  u32 vrf_id;
+  u32 path_mtu;
+  u32 template_interval;
+  u8 udp_checksum;
+};
+
+/** \brief IPFIX classify stream configure request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param domain_id - domain ID reported in IPFIX messages for classify stream
+    @param src_port - source port of UDP session for classify stream
+*/
+define set_ipfix_classify_stream {
+    u32 client_index;
+    u32 context;
+    u32 domain_id;
+    u16 src_port;
+};
+
+/** \brief IPFIX classify stream configure response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define set_ipfix_classify_stream_reply {
+    u32 context;
+    i32 retval;
+};
+
+/** \brief IPFIX classify stream dump request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define ipfix_classify_stream_dump {
+    u32 client_index;
+    u32 context;
+};
+
+/** \brief Reply to IPFIX classify stream dump request
+    @param context - sender context, to match reply w/ request
+    @param domain_id - domain ID reported in IPFIX messages for classify stream
+    @param src_port - source port of UDP session for classify stream
+*/
+define ipfix_classify_stream_details {
+    u32 context;
+    u32 domain_id;
+    u16 src_port;
+};
+
+/** \brief IPFIX add or delete classifier table request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param table_id - classifier table ID
+    @param ip_version - version of IP used in the classifier table
+    @param transport_protocol - transport protocol used in the classifier table or 255 for unspecified
+*/
+define ipfix_classify_table_add_del {
+    u32 client_index;
+    u32 context;
+    u32 table_id;
+    u8 ip_version;
+    u8 transport_protocol;
+    u8 is_add;
+};
+
+/** \brief IPFIX add classifier table response
+    @param context - sender context which was passed in the request
+*/
+define ipfix_classify_table_add_del_reply {
+    u32 context;
+    i32 retval;
+};
+
+/** \brief IPFIX classify tables dump request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define ipfix_classify_table_dump {
+    u32 client_index;
+    u32 context;
+};
+
+/** \brief Reply to IPFIX classify tables dump request
+    @param context - sender context, to match reply w/ request
+    @param table_id - classifier table ID
+    @param ip_version - version of IP used in the classifier table
+    @param transport_protocol - transport protocol used in the classifier table or 255 for unspecified
+*/
+define ipfix_classify_table_details {
+    u32 context;
+    u32 table_id;
+    u8 ip_version;
+    u8 transport_protocol;
+};
+
+/** \brief Set/unset flow classify interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface to set/unset flow classify
+    @param ip4_table_index - ip4 classify table index (~0 for skip)
+    @param ip6_table_index - ip6 classify table index (~0 for skip)
+    @param l2_table_index  -  l2 classify table index (~0 for skip)
+    @param is_add - Set if non-zero, else unset
+    Note: User is recommeneded to use just one valid table_index per call.
+          (ip4_table_index, ip6_table_index, or l2_table_index)
+*/
+define flow_classify_set_interface {
+    u32 client_index;
+    u32 context;
+    u32 sw_if_index;
+    u32 ip4_table_index;
+    u32 ip6_table_index;
+    u8  is_add;
+};
+
+/** \brief Set/unset flow classify interface response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define flow_classify_set_interface_reply {
+    u32 context;
+    i32 retval;
+};
+
+/** \brief Get list of flow classify interfaces and tables
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param type - classify table type
+*/
+define flow_classify_dump {
+    u32 client_index;
+    u32 context;
+    u8 type;
+};
+
+/** \brief Flow classify operational state response.
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - software interface index
+    @param table_index - classify table index
+*/
+define flow_classify_details {
+    u32 context;
+    u32 sw_if_index;
+    u32 table_index;
+};
+
+/** \brief Query relative index via node names
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param node_name - name of node to find relative index from
+    @param next_name - next node from node_name to find relative index of
+*/
+define get_next_index
+{
+  u32 client_index;
+  u32 context;
+  u8 node_name[64];
+  u8 next_name[64];
+};
+
+/** \brief Reply for get next node index
+    @param context - sender context which was passed in the request
+    @param retval - return value
+    @param next_index - index of the next_node
+*/
+define get_next_index_reply
+{
+  u32 context;
+  i32 retval;
+  u32 next_index;
+};
+
+/** \brief PacketGenerator create interface request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param interface_id - interface index
+*/
+define pg_create_interface
+{
+  u32 client_index;
+  u32 context;
+  u32 interface_id;
+};
+
+/** \brief PacketGenerator create interface response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define pg_create_interface_reply
+{
+  u32 context;
+  i32 retval;
+  u32 sw_if_index;
+};
+
+/** \brief PacketGenerator capture packets on given interface request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param interface_id - pg interface index
+    @param is_enabled - 1 if enabling streams, 0 if disabling
+    @param count - number of packets to be captured
+    @param pcap_file - pacp file name to store captured packets
+*/
+define pg_capture
+{
+  u32 client_index;
+  u32 context;
+  u32 interface_id;
+  u8 is_enabled;
+  u32 count;
+  u32 pcap_name_length;
+  u8 pcap_file_name[pcap_name_length];
+};
+
+/** \brief PacketGenerator capture packets response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define pg_capture_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Enable / disable packet generator request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_enabled - 1 if enabling streams, 0 if disabling
+    @param stream - stream name to be enable/disabled, if not specified handle all streams
+*/
+define pg_enable_disable
+{
+  u32 client_index;
+  u32 context;
+  u8 is_enabled;
+  u32 stream_name_length;
+  u8 stream_name[stream_name_length];
+};
+
+/** \brief Reply for enable / disable packet generator
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define pg_enable_disable_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Configure IP source and L4 port-range check
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_ip6 - 1 if source address type is IPv6
+    @param is_add - 1 if add, 0 if delete
+    @param mask_length - mask length for address entry
+    @param address - array of address bytes
+    @param number_of_ranges - length of low_port and high_port arrays (must match)
+    @param low_ports[32] - up to 32 low end of port range entries (must have corresponding high_ports entry)
+    @param high_ports[32] - up to 32 high end of port range entries (must have corresponding low_ports entry)
+    @param vrf_id - fib table/vrf id to associate the source and port-range check with
+    @note To specify a single port set low_port and high_port entry the same
+*/
+define ip_source_and_port_range_check_add_del
+{
+  u32 client_index;
+  u32 context;
+  u8 is_ipv6;
+  u8 is_add;
+  u8 mask_length;
+  u8 address[16];
+  u8 number_of_ranges;
+  u16 low_ports[32];
+  u16 high_ports[32];
+  u32 vrf_id;
+};
+
+/** \brief Configure IP source and L4 port-range check reply
+    @param context - returned sender context, to match reply w/ request
+    @param retval - return code
+*/
+define ip_source_and_port_range_check_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Set interface source and L4 port-range request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param interface_id - interface index
+    @param tcp_vrf_id - VRF associated with source and TCP port-range check
+    @param udp_vrf_id - VRF associated with source and TCP port-range check
+*/
+define ip_source_and_port_range_check_interface_add_del
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u32 sw_if_index;
+  u32 tcp_in_vrf_id;
+  u32 tcp_out_vrf_id;
+  u32 udp_in_vrf_id;
+  u32 udp_out_vrf_id;
+};
+
+/** \brief Set interface source and L4 port-range response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define ip_source_and_port_range_check_interface_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Delete sub interface request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - sw index of the interface that was created by create_subif
+*/
+define delete_subif {
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+};
+
+/** \brief Delete sub interface response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define delete_subif_reply {
+  u32 context;
+  i32 retval;
+};
+
+/** \brief DPDK interface HQoS pipe profile set request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - the interface
+    @param subport - subport ID
+    @param pipe - pipe ID within its subport
+    @param profile - pipe profile ID
+*/
+define sw_interface_set_dpdk_hqos_pipe {
+    u32 client_index;
+    u32 context;
+    u32 sw_if_index;
+    u32 subport;
+    u32 pipe;
+    u32 profile;
+};
+
+/** \brief DPDK interface HQoS pipe profile set reply
+    @param context - sender context, to match reply w/ request
+    @param retval - request return code
+*/
+define sw_interface_set_dpdk_hqos_pipe_reply {
+    u32 context;
+    i32 retval;
+};
+
+/** \brief DPDK interface HQoS subport parameters set request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - the interface
+    @param subport - subport ID
+    @param tb_rate - subport token bucket rate (measured in bytes/second)
+    @param tb_size - subport token bucket size (measured in credits)
+    @param tc_rate - subport traffic class 0 .. 3 rates (measured in bytes/second)
+    @param tc_period - enforcement period for rates (measured in milliseconds)
+*/
+define sw_interface_set_dpdk_hqos_subport {
+    u32 client_index;
+    u32 context;
+    u32 sw_if_index;
+    u32 subport;
+    u32 tb_rate;
+    u32 tb_size;
+    u32 tc_rate[4];
+    u32 tc_period;
+};
+
+/** \brief DPDK interface HQoS subport parameters set reply
+    @param context - sender context, to match reply w/ request
+    @param retval - request return code
+*/
+define sw_interface_set_dpdk_hqos_subport_reply {
+    u32 context;
+    i32 retval;
+};
+
+/** \brief DPDK interface HQoS tctbl entry set request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - the interface
+    @param entry - entry index ID
+    @param tc - traffic class (0 .. 3)
+    @param queue - traffic class queue (0 .. 3)
+*/
+define sw_interface_set_dpdk_hqos_tctbl {
+    u32 client_index;
+    u32 context;
+    u32 sw_if_index;
+    u32 entry;
+    u32 tc;
+    u32 queue;
+};
+
+/** \brief DPDK interface HQoS tctbl entry set reply
+    @param context - sender context, to match reply w/ request
+    @param retval - request return code
+*/
+define sw_interface_set_dpdk_hqos_tctbl_reply {
+    u32 context;
+    i32 retval;
+};
+
+/** \brief L2 interface pbb tag rewrite configure request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface the operation is applied to
+    @param vtr_op - Choose from l2_vtr_op_t enum values
+    @param inner_tag - needed for translate_qinq vtr op only
+    @param outer_tag - needed for translate_qinq vtr op only 
+    @param b_dmac - B-tag remote mac address, needed for any push or translate_qinq vtr op
+    @param b_smac - B-tag local mac address, needed for any push or translate qinq vtr op
+    @param b_vlanid - B-tag vlanid, needed for any push or translate qinq vtr op
+    @param i_sid - I-tag service id, needed for any push or translate qinq vtr op
+*/
+define l2_interface_pbb_tag_rewrite
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u32 vtr_op;
+  u16 outer_tag;
+  u8  b_dmac[6];
+  u8  b_smac[6];
+  u16 b_vlanid;
+  u32 i_sid;
+};
+
+/** \brief L2 interface pbb tag rewrite response
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+*/
+define l2_interface_pbb_tag_rewrite_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Punt traffic to the host
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add punt if non-zero, else delete
+    @param ipv - L3 protocol 4 - IPv4, 6 - IPv6, ~0 - All
+    @param l4_protocol - L4 protocol to be punted, only UDP (0x11) is supported
+    @param l4_port - TCP/UDP port to be punted
+*/
+define punt {
+    u32 client_index;
+    u32 context;
+    u8 is_add;
+    u8 ipv;
+    u8 l4_protocol;
+    u16 l4_port;
+};
+
+/** \brief Reply to the punt request
+    @param context - sender context which was passed in the request
+    @param retval - return code of punt request
+*/
+define punt_reply
+{
+    u32 context;
+    i32 retval;
+};
+
+/** \brief Feature path enable/disable request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - the interface
+    @param enable - 1 = on, 0 = off
+*/
+define feature_enable_disable {
+    u32 client_index;
+    u32 context;
+    u32 sw_if_index;
+    u8 enable;
+    u8 arc_name[64];
+    u8 feature_name[64];
+};
+
+/** \brief Reply to the eature path enable/disable request
+    @param context - sender context which was passed in the request
+    @param retval - return code for the request
+*/
+define feature_enable_disable_reply
+{
+    u32 context;
+    i32 retval;
+};
+
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/api/vpe_all_api_h.h b/src/vpp/api/vpe_all_api_h.h
new file mode 100644
index 00000000..397cd807
--- /dev/null
+++ b/src/vpp/api/vpe_all_api_h.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * Add to the bottom of the #include list, or elves will steal your
+ * keyboard in the middle of the night!
+ */
+
+/* Include the (first) vlib-api API definition layer */
+#include <vlibmemory/vl_memory_api_h.h>
+
+/* Include the (second) vnet API definition layer */
+#define included_from_layer_3
+#include <vnet/vnet_all_api_h.h>
+#undef included_from_layer_3
+
+/* Include the current layer (third) vpp API definition layer */
+#include <vpp/api/vpe.api.h>
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/api/vpe_msg_enum.h b/src/vpp/api/vpe_msg_enum.h
new file mode 100644
index 00000000..4fcc1c8c
--- /dev/null
+++ b/src/vpp/api/vpe_msg_enum.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vpe_msg_enum_h
+#define included_vpe_msg_enum_h
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum
+{
+  VL_ILLEGAL_MESSAGE_ID = 0,
+#include <vpp/api/vpe_all_api_h.h>
+  VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif /* included_vpe_msg_enum_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/api/vpp_get_metrics.c b/src/vpp/api/vpp_get_metrics.c
new file mode 100644
index 00000000..3474133d
--- /dev/null
+++ b/src/vpp/api/vpp_get_metrics.c
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <pwd.h>
+#include <grp.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <time.h>
+#include <fcntl.h>
+#include <string.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/bitmap.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/time.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/format.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vnet/api_errno.h>
+
+#include <svm/svmdb.h>
+
+svmdb_client_t *c;
+volatile int signal_received;
+
+static void
+unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc)
+{
+  static int once;
+
+  if (once)
+    exit (1);
+
+  once = 1;
+  signal_received = 1;
+}
+
+static void
+setup_signal_handlers (void)
+{
+  uword i;
+  struct sigaction sa;
+
+  for (i = 1; i < 32; i++)
+    {
+      memset (&sa, 0, sizeof (sa));
+      sa.sa_sigaction = (void *) unix_signal_handler;
+      sa.sa_flags = SA_SIGINFO;
+
+      switch (i)
+	{
+	  /* these signals take the default action */
+	case SIGABRT:
+	case SIGKILL:
+	case SIGSTOP:
+	case SIGUSR1:
+	case SIGUSR2:
+	  continue;
+
+	  /* ignore SIGPIPE, SIGCHLD */
+	case SIGPIPE:
+	case SIGCHLD:
+	  sa.sa_sigaction = (void *) SIG_IGN;
+	  break;
+
+	  /* catch and handle all other signals */
+	default:
+	  break;
+	}
+
+      if (sigaction (i, &sa, 0) < 0)
+	return clib_unix_warning (0, "sigaction %U", format_signal, i);
+    }
+}
+
+int
+main (int argc, char **argv)
+{
+  unformat_input_t input;
+  char *chroot_path = 0;
+  u8 *chroot_path_u8;
+  int interval = 0;
+  f64 *vector_ratep, *rx_ratep, *sig_error_ratep;
+  pid_t *vpp_pidp;
+  svmdb_map_args_t _ma, *ma = &_ma;
+  int uid, gid, rv;
+  struct passwd _pw, *pw;
+  struct group _grp, *grp;
+  char *s, buf[128];
+
+  unformat_init_command_line (&input, argv);
+
+  uid = geteuid ();
+  gid = getegid ();
+
+  while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (&input, "chroot %s", &chroot_path_u8))
+	{
+	  chroot_path = (char *) chroot_path_u8;
+	}
+      else if (unformat (&input, "interval %d", &interval))
+	;
+      else if (unformat (&input, "uid %d", &uid))
+	;
+      else if (unformat (&input, "gid %d", &gid))
+	;
+      else if (unformat (&input, "uid %s", &s))
+	{
+	  /* lookup the username */
+	  pw = NULL;
+	  rv = getpwnam_r (s, &_pw, buf, sizeof (buf), &pw);
+	  if (rv < 0)
+	    {
+	      fformat (stderr, "cannot fetch username %s", s);
+	      exit (1);
+	    }
+	  if (pw == NULL)
+	    {
+	      fformat (stderr, "username %s does not exist", s);
+	      exit (1);
+	    }
+	  vec_free (s);
+	  uid = pw->pw_uid;
+	}
+      else if (unformat (&input, "gid %s", &s))
+	{
+	  /* lookup the group name */
+	  grp = NULL;
+	  rv = getgrnam_r (s, &_grp, buf, sizeof (buf), &grp);
+	  if (rv != 0)
+	    {
+	      fformat (stderr, "cannot fetch group %s", s);
+	      exit (1);
+	    }
+	  if (grp == NULL)
+	    {
+	      fformat (stderr, "group %s does not exist", s);
+	      exit (1);
+	    }
+	  vec_free (s);
+	  gid = grp->gr_gid;
+	}
+      else
+	{
+	  fformat (stderr,
+		   "usage: vpp_get_metrics [chroot <path>] [interval <nn>]\n");
+	  exit (1);
+	}
+    }
+
+  setup_signal_handlers ();
+
+  memset (ma, 0, sizeof (*ma));
+  ma->root_path = chroot_path;
+  ma->uid = uid;
+  ma->gid = gid;
+
+  c = svmdb_map (ma);
+
+  vpp_pidp =
+    svmdb_local_get_variable_reference (c, SVMDB_NAMESPACE_VEC, "vpp_pid");
+  vector_ratep =
+    svmdb_local_get_variable_reference (c, SVMDB_NAMESPACE_VEC,
+					"vpp_vector_rate");
+  rx_ratep =
+    svmdb_local_get_variable_reference (c, SVMDB_NAMESPACE_VEC,
+					"vpp_input_rate");
+  sig_error_ratep =
+    svmdb_local_get_variable_reference (c, SVMDB_NAMESPACE_VEC,
+					"vpp_sig_error_rate");
+
+  /*
+   * Make sure vpp is actually running. Otherwise, there's every
+   * chance that the database region will be wiped out by the
+   * process monitor script
+   */
+
+  if (vpp_pidp == 0 || vector_ratep == 0 || rx_ratep == 0
+      || sig_error_ratep == 0)
+    {
+      fformat (stdout, "vpp not running\n");
+      exit (1);
+    }
+
+  do
+    {
+      /*
+       * Once vpp exits, the svm db region will be recreated...
+       * Can't use kill (*vpp_pidp, 0) if running as non-root /
+       * accessing the shared-VM database via group perms.
+       */
+      if (*vpp_pidp == 0)
+	{
+	  fformat (stdout, "vpp not running\n");
+	  exit (1);
+	}
+      fformat (stdout,
+	       "%d: vpp_vector_rate=%.2f, vpp_input_rate=%f, vpp_sig_error_rate=%f\n",
+	       *vpp_pidp, *vector_ratep, *rx_ratep, *sig_error_ratep);
+
+      if (interval)
+	sleep (interval);
+      if (signal_received)
+	break;
+    }
+  while (interval);
+
+  svmdb_unmap (c);
+  exit (0);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/app/l2t.c b/src/vpp/app/l2t.c
new file mode 100644
index 00000000..45dd2807
--- /dev/null
+++ b/src/vpp/app/l2t.c
@@ -0,0 +1,557 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+
+#if DPDK == 0
+#include <vnet/devices/pci/ixge.h>
+#else
+#include <vnet/devices/dpdk/dpdk.h>
+#endif
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <app/l2t.h>
+
+l2t_main_t l2t_main;
+
+/* $$$$ unused?
+ * get_interface_ethernet_address
+ * paints the ethernet address for a given interface
+ * into the supplied destination
+ */
+void
+get_interface_ethernet_address (l2t_main_t * lm, u8 * dst, u32 sw_if_index)
+{
+  ethernet_main_t *em = ethernet_get_main (lm->vlib_main);
+  ethernet_interface_t *ei;
+  vnet_hw_interface_t *hi;
+
+  hi = vnet_get_sup_hw_interface (lm->vnet_main, sw_if_index);
+  ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
+  clib_memcpy (dst, ei->address, sizeof (ei->address));
+}
+
+/* packet trace format function */
+u8 *
+format_l2t_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  l2t_trace_t *t = va_arg (*args, l2t_trace_t *);
+
+  if (t->is_user_to_network)
+    s = format (s, "L2T: %U (client) -> %U (our) session %d",
+		format_ip6_address, &t->client_address,
+		format_ip6_address, &t->our_address, t->session_index);
+  else
+    s = format (s, "L2T: %U (our) -> %U (client) session %d)",
+		format_ip6_address, &t->our_address,
+		format_ip6_address, &t->client_address, t->session_index);
+  return s;
+}
+
+u8 *
+format_l2t_session (u8 * s, va_list * args)
+{
+  l2t_session_t *session = va_arg (*args, l2t_session_t *);
+  l2t_main_t *lm = &l2t_main;
+  u32 counter_index;
+  vlib_counter_t v;
+
+  s = format (s, "[%d] %U (our) %U (client) vlan-id %d rx_sw_if_index %d\n",
+	      session - lm->sessions,
+	      format_ip6_address, &session->our_address,
+	      format_ip6_address, &session->client_address,
+	      clib_net_to_host_u16 (session->vlan_id), session->sw_if_index);
+
+  s = format (s, "   local cookie %llx remote cookie %llx\n",
+	      clib_net_to_host_u64 (session->local_cookie),
+	      clib_net_to_host_u64 (session->remote_cookie));
+
+  if (session->cookie_flags & L2TP_COOKIE_ROLLOVER_LOCAL)
+    {
+      s = format (s, "   local rollover cookie %llx\n",
+		  clib_net_to_host_u64 (session->lcl_ro_cookie));
+    }
+
+  s = format (s, "   local session-id %d remote session-id %d\n",
+	      clib_net_to_host_u32 (session->local_session_id),
+	      clib_net_to_host_u32 (session->remote_session_id));
+
+  s = format (s, "   l2 specific sublayer %s\n",
+	      session->l2_sublayer_present ? "preset" : "absent");
+
+  counter_index =
+    session_index_to_counter_index (session - lm->sessions,
+				    SESSION_COUNTER_USER_TO_NETWORK);
+
+  vlib_get_combined_counter (&lm->counter_main, counter_index, &v);
+  if (v.packets != 0)
+    s = format (s, "   user-to-net: %llu pkts %llu bytes\n",
+		v.packets, v.bytes);
+
+  vlib_get_combined_counter (&lm->counter_main, counter_index + 1, &v);
+
+  if (v.packets != 0)
+    s = format (s, "   net-to-user: %llu pkts %llu bytes\n",
+		v.packets, v.bytes);
+  return s;
+}
+
+static clib_error_t *
+show_session_summary_command_fn (vlib_main_t * vm,
+				 unformat_input_t * input,
+				 vlib_cli_command_t * cmd)
+{
+  l2t_main_t *lm = &l2t_main;
+
+  vlib_cli_output (vm, "%d active sessions\n", pool_elts (lm->sessions));
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+static VLIB_CLI_COMMAND (show_session_summary_command) = {
+  .path = "show session",
+  .short_help = "show session summary",
+  .function = show_session_summary_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+show_session_detail_command_fn (vlib_main_t * vm,
+				unformat_input_t * input,
+				vlib_cli_command_t * cmd)
+{
+  l2t_session_t *session;
+  l2t_main_t *lm = &l2t_main;
+
+  /* *INDENT-OFF* */
+  pool_foreach (session, lm->sessions,
+  ({
+    vlib_cli_output (vm, "%U", format_l2t_session, session);
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+static VLIB_CLI_COMMAND (show_session_detail_command) = {
+  .path = "show session detail",
+  .short_help = "show session table detail",
+  .function = show_session_detail_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+test_counters_command_fn (vlib_main_t * vm,
+			  unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  l2t_session_t *session;
+  l2t_main_t *lm = &l2t_main;
+  u32 session_index;
+  u32 counter_index;
+  u32 nincr = 0;
+
+  /* *INDENT-OFF* */
+  pool_foreach (session, lm->sessions,
+  ({
+    session_index = session - lm->sessions;
+    counter_index =
+      session_index_to_counter_index (session_index,
+                                      SESSION_COUNTER_USER_TO_NETWORK);
+    vlib_increment_combined_counter (&lm->counter_main,
+                                     counter_index,
+                                     1/*pkt*/, 1111 /*bytes*/);
+    vlib_increment_combined_counter (&lm->counter_main,
+                                     counter_index+1,
+                                     1/*pkt*/, 2222 /*bytes*/);
+    nincr++;
+  }));
+  /* *INDENT-ON* */
+  vlib_cli_output (vm, "Incremented %d active counters\n", nincr);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+static VLIB_CLI_COMMAND (test_counters_command) = {
+  .path = "test counters",
+  .short_help = "increment all active counters",
+  .function = test_counters_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+clear_counters_command_fn (vlib_main_t * vm,
+			   unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  l2t_session_t *session;
+  l2t_main_t *lm = &l2t_main;
+  u32 session_index;
+  u32 counter_index;
+  u32 nincr = 0;
+
+  /* *INDENT-OFF* */
+  pool_foreach (session, lm->sessions,
+  ({
+    session_index = session - lm->sessions;
+    counter_index =
+      session_index_to_counter_index (session_index,
+                                      SESSION_COUNTER_USER_TO_NETWORK);
+    vlib_zero_combined_counter (&lm->counter_main, counter_index);
+    vlib_zero_combined_counter (&lm->counter_main, counter_index+1);
+    nincr++;
+  }));
+  /* *INDENT-ON* */
+  vlib_cli_output (vm, "Cleared %d active counters\n", nincr);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+static VLIB_CLI_COMMAND (clear_counters_command) = {
+  .path = "clear counters",
+  .short_help = "clear all active counters",
+  .function = clear_counters_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+l2tp_session_add_command_fn (vlib_main_t * vm,
+			     unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  ip6_address_t client_address, our_address;
+  ip6_address_t *dst_address_copy, *src_address_copy;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 vlan_id;
+  u32 sw_if_index = (u32) ~ 0;
+  l2t_main_t *lm = &l2t_main;
+  l2t_session_t *s;
+  uword *p;
+  vnet_hw_interface_t *hi;
+  vnet_sw_interface_t *si;
+  u32 next_index;
+  uword vlan_and_sw_if_index_key;
+  u32 counter_index;
+  u64 local_cookie = (u64) ~ 0, remote_cookie = (u64) ~ 0;
+  u32 local_session_id = 1, remote_session_id = 1;
+  int our_address_set = 0, client_address_set = 0;
+  int l2_sublayer_present = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "client %U",
+		    unformat_ip6_address, &client_address))
+	client_address_set = 1;
+      else if (unformat (line_input, "our %U",
+			 unformat_ip6_address, &our_address))
+	our_address_set = 1;
+      else if (unformat (line_input, "vlan %d", &vlan_id))
+	;
+      else if (unformat (line_input, "l2-interface %U",
+			 unformat_vnet_sw_interface,
+			 vnet_get_main (), &sw_if_index))
+	;
+      else if (unformat (line_input, "interface %U",
+			 unformat_vnet_sw_interface,
+			 vnet_get_main (), &sw_if_index))
+	;
+      else if (unformat (line_input, "local-cookie %llx", &local_cookie))
+	;
+      else if (unformat (line_input, "remote-cookie %llx", &remote_cookie))
+	;
+      else if (unformat (line_input, "local-session-id %d",
+			 &local_session_id))
+	;
+      else if (unformat (line_input, "remote-session-id %d",
+			 &remote_session_id))
+	;
+      else if (unformat (line_input, "l2-sublayer-present"))
+	l2_sublayer_present = 1;
+      else
+	return clib_error_return (0, "parse error: '%U'",
+				  format_unformat_error, line_input);
+    }
+
+  unformat_free (line_input);
+
+  if (sw_if_index == (u32) ~ 0)
+    return clib_error_return (0, "l2-interface not specified");
+  if (our_address_set == 0)
+    return clib_error_return (0, "our address not specified");
+  if (client_address_set == 0)
+    return clib_error_return (0, "client address not specified");
+
+  remote_session_id = clib_host_to_net_u32 (remote_session_id);
+  local_session_id = clib_host_to_net_u32 (local_session_id);
+
+  switch (lm->lookup_type)
+    {
+    case L2T_LOOKUP_SRC_ADDRESS:
+      p = hash_get_mem (lm->session_by_src_address, &client_address);
+      if (p)
+	return clib_error_return
+	  (0, "Session w/ client address %U already exists",
+	   format_ip6_address, &client_address);
+      break;
+
+    case L2T_LOOKUP_DST_ADDRESS:
+      p = hash_get_mem (lm->session_by_dst_address, &our_address);
+      if (p)
+	return clib_error_return
+	  (0, "Session w/ our address %U already exists",
+	   format_ip6_address, &our_address);
+      break;
+
+    case L2T_LOOKUP_SESSION_ID:
+      p = hash_get (lm->session_by_session_id, local_session_id);
+      if (p)
+	return clib_error_return
+	  (0,
+	   "Session w/ local session id %d already exists",
+	   clib_net_to_host_u32 (local_session_id));
+      break;
+
+    default:
+      ASSERT (0);
+    }
+
+  pool_get (lm->sessions, s);
+  memset (s, 0, sizeof (*s));
+  clib_memcpy (&s->our_address, &our_address, sizeof (s->our_address));
+  clib_memcpy (&s->client_address, &client_address,
+	       sizeof (s->client_address));
+  s->sw_if_index = sw_if_index;
+  s->vlan_id = clib_host_to_net_u16 (vlan_id);
+  s->local_cookie = clib_host_to_net_u64 (local_cookie);
+  l2tp_session_set_remote_cookie (s, remote_cookie);
+  s->local_session_id = local_session_id;
+  s->remote_session_id = remote_session_id;
+  s->l2_sublayer_present = l2_sublayer_present;
+
+  hi = vnet_get_sup_hw_interface (lm->vnet_main, sw_if_index);
+  si = vnet_get_sup_sw_interface (lm->vnet_main, sw_if_index);
+
+  next_index = vlib_node_add_next (vm, l2t_ip6_node.index,
+				   hi->output_node_index);
+  s->l2_output_next_index = next_index;
+  s->l2_output_sw_if_index = si->sw_if_index;
+
+  /* Setup hash table entries */
+  switch (lm->lookup_type)
+    {
+    case L2T_LOOKUP_SRC_ADDRESS:
+      src_address_copy = clib_mem_alloc (sizeof (*src_address_copy));
+      clib_memcpy (src_address_copy, &client_address,
+		   sizeof (*src_address_copy));
+      hash_set_mem (lm->session_by_src_address, src_address_copy,
+		    s - lm->sessions);
+      break;
+    case L2T_LOOKUP_DST_ADDRESS:
+      dst_address_copy = clib_mem_alloc (sizeof (*dst_address_copy));
+      clib_memcpy (dst_address_copy, &our_address,
+		   sizeof (*dst_address_copy));
+      hash_set_mem (lm->session_by_dst_address, dst_address_copy,
+		    s - lm->sessions);
+      break;
+    case L2T_LOOKUP_SESSION_ID:
+      hash_set (lm->session_by_session_id, local_session_id,
+		s - lm->sessions);
+      break;
+
+    default:
+      ASSERT (0);
+    }
+
+  vlan_and_sw_if_index_key = ((uword) (s->vlan_id) << 32) | sw_if_index;
+  hash_set (lm->session_by_vlan_and_rx_sw_if_index,
+	    vlan_and_sw_if_index_key, s - lm->sessions);
+
+  /* validate counters */
+  counter_index =
+    session_index_to_counter_index (s - lm->sessions,
+				    SESSION_COUNTER_USER_TO_NETWORK);
+  vlib_validate_counter (&lm->counter_main, counter_index);
+  vlib_validate_counter (&lm->counter_main, counter_index + 1);
+
+  /* Set promiscuous mode on the l2 interface */
+  ethernet_set_flags (lm->vnet_main, hi->hw_if_index,
+		      ETHERNET_INTERFACE_FLAG_ACCEPT_ALL);
+  vnet_hw_interface_rx_redirect_to_node (lm->vnet_main, hi->hw_if_index,
+					 l2t_l2_node.index);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+static VLIB_CLI_COMMAND (l2tp_session_add_command) = {
+  .path = "l2tp session add",
+  .short_help =
+  "l2tp session add client <ip6> our <ip6> vlan <id> local-cookie <hex> remote-cookie <hex> local-session <dec> remote-session <dec> l2-interface <int>",
+  .function = l2tp_session_add_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+l2tp_session_del_command_fn (vlib_main_t * vm,
+			     unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  l2t_main_t *lm = &l2t_main;
+  u32 session_index;
+  l2t_session_t *s;
+  hash_pair_t *hp;
+  void *key;
+  uword vlan_and_sw_if_index_key;
+
+  if (!unformat (input, "%d", &session_index))
+    return clib_error_return (0, "missing session index: '%U'",
+			      format_unformat_error, input);
+
+  if (pool_is_free_index (lm->sessions, session_index))
+    return clib_error_return (0, "session %d not in use", session_index);
+
+  s = pool_elt_at_index (lm->sessions, session_index);
+
+  switch (lm->lookup_type)
+    {
+    case L2T_LOOKUP_SRC_ADDRESS:
+      hp = hash_get_pair_mem (lm->session_by_src_address, &s->client_address);
+      if (hp)
+	{
+	  key = (void *) (hp->key);
+	  hash_unset_mem (lm->session_by_src_address, &s->client_address);
+	  clib_mem_free (key);
+	}
+      else
+	clib_warning ("session %d src address key %U AWOL",
+		      s - lm->sessions,
+		      format_ip6_address, &s->client_address);
+      break;
+
+    case L2T_LOOKUP_DST_ADDRESS:
+      hp = hash_get_pair_mem (lm->session_by_dst_address, &s->our_address);
+      if (hp)
+	{
+	  key = (void *) (hp->key);
+	  hash_unset_mem (lm->session_by_dst_address, &s->our_address);
+	  clib_mem_free (key);
+	}
+      else
+	clib_warning ("session %d dst address key %U AWOL",
+		      s - lm->sessions, format_ip6_address, &s->our_address);
+      break;
+
+    case L2T_LOOKUP_SESSION_ID:
+      hash_unset (lm->session_by_session_id, s->local_session_id);
+      break;
+
+    default:
+      ASSERT (0);
+    }
+
+  vlan_and_sw_if_index_key = ((uword) (s->vlan_id) << 32) | s->sw_if_index;
+
+  hash_unset (lm->session_by_vlan_and_rx_sw_if_index,
+	      vlan_and_sw_if_index_key);
+
+  pool_put (lm->sessions, s);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+static VLIB_CLI_COMMAND (l2tp_session_del_command) = {
+  .path = "l2tp session delete",
+  .short_help =
+  "l2tp session delete <session-id>",
+  .function = l2tp_session_del_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+l2tp_session_cookie_command_fn (vlib_main_t * vm,
+				unformat_input_t * input,
+				vlib_cli_command_t * cmd)
+{
+  l2t_main_t *lm = &l2t_main;
+  u32 session_index;
+  l2t_session_t *s;
+  u64 lcl_ro_cookie = (u64) ~ 0, rem_ro_cookie = (u64) ~ 0;
+  u8 cookie_flags = 0;
+
+  if (!unformat (input, "%d", &session_index))
+    return clib_error_return (0, "missing session index: '%U'",
+			      format_unformat_error, input);
+
+  if (pool_is_free_index (lm->sessions, session_index))
+    return clib_error_return (0, "session %d not in use", session_index);
+
+  s = pool_elt_at_index (lm->sessions, session_index);
+
+  if (unformat (input, "commit"))
+    {
+      if (!s->cookie_flags)
+	{
+	  return clib_error_return (0, "no rollover cookie ready to commit");
+	}
+      else
+	{
+	  l2tp_session_cookie_commit (s);
+	  return 0;
+	}
+    }
+  if (!unformat (input, "rollover"))
+    return clib_error_return (0, "missing 'commit|rollover': '%U'",
+			      format_unformat_error, input);
+  if (unformat (input, "local %llx", &lcl_ro_cookie))
+    {
+      cookie_flags |= L2TP_COOKIE_ROLLOVER_LOCAL;
+      l2tp_session_set_local_rollover_cookie (s, lcl_ro_cookie);
+    }
+  if (unformat (input, "remote %llx", &rem_ro_cookie))
+    {
+      cookie_flags |= L2TP_COOKIE_ROLLOVER_REMOTE;
+      l2tp_session_set_remote_cookie (s, rem_ro_cookie);
+    }
+  if (!cookie_flags)
+    return clib_error_return (0, "no rollover cookie specified");
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+static VLIB_CLI_COMMAND (l2tp_session_cookie_command) = {
+  .path = "l2tp session cookie",
+  .short_help =
+  "l2tp session cookie <session id> commit|rollover [local <hex>] [remote <hex>]",
+  .function = l2tp_session_cookie_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/app/l2t_l2.c b/src/vpp/app/l2t_l2.c
new file mode 100644
index 00000000..07d30d9a
--- /dev/null
+++ b/src/vpp/app/l2t_l2.c
@@ -0,0 +1,267 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+
+#if DPDK == 0
+#include <vnet/devices/pci/ixgev.h>
+#include <vnet/devices/pci/ixge.h>
+#include <vnet/devices/pci/ige.h>
+#else
+#include <vnet/devices/dpdk/dpdk.h>
+#endif
+
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <app/l2t.h>
+
+l2t_main_t l2t_main;
+
+/* Statistics (not really errors) */
+#define foreach_l2t_l2_error                       \
+_(NETWORK_TO_USER, "L2 network to user (ip6) pkts")
+
+static char *l2t_l2_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2t_l2_error
+#undef _
+};
+
+typedef enum
+{
+#define _(sym,str) L2T_L2_ERROR_##sym,
+  foreach_l2t_l2_error
+#undef _
+    L2T_L2_N_ERROR,
+} l2t_l2_error_t;
+
+/*
+ * Packets go to ethernet-input when they don't match a mapping
+ */
+typedef enum
+{
+  L2T_L2_NEXT_DROP,
+  L2T_L2_NEXT_ETHERNET_INPUT,
+  L2T_L2_NEXT_IP6_LOOKUP,
+  L2T_L2_N_NEXT,
+} l2t_l2_next_t;
+
+vlib_node_registration_t l2t_l2_node;
+
+#define NSTAGES 3
+
+static inline void
+stage0 (vlib_main_t * vm, vlib_node_runtime_t * node, u32 buffer_index)
+{
+  vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
+  vlib_prefetch_buffer_header (b, STORE);
+  CLIB_PREFETCH (b->data, 2 * CLIB_CACHE_LINE_BYTES, STORE);
+}
+
+static inline void
+stage1 (vlib_main_t * vm, vlib_node_runtime_t * node, u32 bi)
+{
+  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+  l2t_main_t *lm = &l2t_main;
+  ethernet_header_t *eh;
+  ethernet_vlan_header_t *vh;
+  u32 session_index;
+  uword *p;
+  uword vlan_and_sw_if_index_key;
+
+  /* just in case, needed to test with the tun/tap device */
+  vlib_buffer_reset (b);
+
+  eh = vlib_buffer_get_current (b);
+
+  /* Not a VLAN pkt? send to ethernet-input... */
+  if (PREDICT_FALSE (eh->type != clib_host_to_net_u16 (0x8100)))
+    {
+      vnet_buffer (b)->l2t.next_index = L2T_L2_NEXT_ETHERNET_INPUT;
+      return;
+    }
+  vh = (ethernet_vlan_header_t *) (eh + 1);
+
+  /* look up session */
+  vlan_and_sw_if_index_key = ((uword) (vh->priority_cfi_and_id) << 32)
+    | vnet_buffer (b)->sw_if_index[VLIB_RX];
+
+  p = hash_get (lm->session_by_vlan_and_rx_sw_if_index,
+		vlan_and_sw_if_index_key);
+
+  if (PREDICT_FALSE (p == 0))
+    {
+      /* $$$ drop here if not for our MAC? */
+      vnet_buffer (b)->l2t.next_index = L2T_L2_NEXT_ETHERNET_INPUT;
+      return;
+    }
+  else
+    {
+      session_index = p[0];
+    }
+
+  /* Remember mapping index, prefetch the mini counter */
+  vnet_buffer (b)->l2t.next_index = L2T_L2_NEXT_IP6_LOOKUP;
+  vnet_buffer (b)->l2t.session_index = session_index;
+
+  /* Each mapping has 2 x (pkt, byte) counters, hence the shift */
+  CLIB_PREFETCH (lm->counter_main.mini + (p[0] << 1), CLIB_CACHE_LINE_BYTES,
+		 STORE);
+}
+
+static inline u32
+last_stage (vlib_main_t * vm, vlib_node_runtime_t * node, u32 bi)
+{
+  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
+  l2t_main_t *lm = &l2t_main;
+  ethernet_header_t *eh = vlib_buffer_get_current (b);
+  vlib_node_t *n = vlib_get_node (vm, l2t_l2_node.index);
+  u32 node_counter_base_index = n->error_heap_index;
+  vlib_error_main_t *em = &vm->error_main;
+  l2tpv3_header_t *l2t;		/* l2 header */
+  ethernet_vlan_header_t *vh;	/* 802.1q vlan header */
+  u32 counter_index;
+  l2t_session_t *s;
+  ip6_header_t *ip6;
+  u16 payload_ethertype;
+  u8 dst_mac_address[6];
+  u8 src_mac_address[6];
+  u16 payload_length;
+  i32 backup;
+
+  /* Other-than-output pkt? We're done... */
+  if (vnet_buffer (b)->l2t.next_index != L2T_L2_NEXT_IP6_LOOKUP)
+    return vnet_buffer (b)->l2t.next_index;
+
+  vh = (ethernet_vlan_header_t *) (eh + 1);
+
+  em->counters[node_counter_base_index + L2T_L2_ERROR_NETWORK_TO_USER] += 1;
+
+  counter_index =
+    session_index_to_counter_index (vnet_buffer (b)->l2t.session_index,
+				    SESSION_COUNTER_NETWORK_TO_USER);
+
+  /* per-mapping byte stats include the ethernet header */
+  vlib_increment_combined_counter (&lm->counter_main, counter_index,
+				   1 /* packet_increment */ ,
+				   vlib_buffer_length_in_chain (vm, b) +
+				   sizeof (ethernet_header_t));
+
+  s = pool_elt_at_index (lm->sessions, vnet_buffer (b)->l2t.session_index);
+
+  /* Save src/dst MAC addresses */
+#define _(i)  dst_mac_address[i] = eh->dst_address[i];
+  _(0) _(1) _(2) _(3) _(4) _(5);
+#undef _
+#define _(i)  src_mac_address[i] = eh->src_address[i];
+  _(0) _(1) _(2) _(3) _(4) _(5);
+#undef _
+
+  payload_ethertype = vh->type;
+
+  /* Splice out the 802.1q vlan tag */
+  vlib_buffer_advance (b, 4);
+  eh = vlib_buffer_get_current (b);
+
+  /* restore src/dst MAC addresses */
+#define _(i)   eh->dst_address[i] = dst_mac_address[i];
+  _(0) _(1) _(2) _(3) _(4) _(5);
+#undef _
+#define _(i)  eh->src_address[i] = src_mac_address[i];
+  _(0) _(1) _(2) _(3) _(4) _(5);
+#undef _
+  eh->type = payload_ethertype;
+
+  /* Paint on an l2tpv3 hdr */
+  backup = sizeof (*l2t);
+#if 0
+  /* back up 4 bytes less if no l2 sublayer */
+  backup -= s->l2_sublayer_present ? 0 : 4;
+#endif
+
+  vlib_buffer_advance (b, -backup);
+  l2t = vlib_buffer_get_current (b);
+
+  l2t->session_id = s->remote_session_id;
+  l2t->cookie = s->remote_cookie;
+
+#if 0
+  if (s->l2_sublayer_present)
+    l2t->l2_specific_sublayer = 0;
+#endif
+
+  /* Paint on an ip6 header */
+  vlib_buffer_advance (b, -(sizeof (*ip6)));
+  ip6 = vlib_buffer_get_current (b);
+
+  ip6->ip_version_traffic_class_and_flow_label =
+    clib_host_to_net_u32 (0x6 << 28);
+
+  /* calculate ip6 payload length */
+  payload_length = vlib_buffer_length_in_chain (vm, b);
+  payload_length -= sizeof (*ip6);
+
+  ip6->payload_length = clib_host_to_net_u16 (payload_length);
+  ip6->protocol = 0x73;		/* l2tpv3 */
+  ip6->hop_limit = 0xff;
+  ip6->src_address.as_u64[0] = s->our_address.as_u64[0];
+  ip6->src_address.as_u64[1] = s->our_address.as_u64[1];
+  ip6->dst_address.as_u64[0] = s->client_address.as_u64[0];
+  ip6->dst_address.as_u64[1] = s->client_address.as_u64[1];
+
+  return L2T_L2_NEXT_IP6_LOOKUP;
+}
+
+#include <vnet/pipeline.h>
+
+static uword
+l2t_l2_node_fn (vlib_main_t * vm,
+		vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return dispatch_pipeline (vm, node, frame);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (l2t_l2_node) = {
+  .function = l2t_l2_node_fn,
+  .name = "l2t-l2-input",
+  .vector_size = sizeof (u32),
+  .format_trace = format_l2t_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(l2t_l2_error_strings),
+  .error_strings = l2t_l2_error_strings,
+
+  .n_next_nodes = L2T_L2_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [L2T_L2_NEXT_IP6_LOOKUP] = "ip6-lookup",
+    [L2T_L2_NEXT_ETHERNET_INPUT] = "ethernet-input",
+    [L2T_L2_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+VLIB_NODE_FUNCTION_MULTIARCH (l2t_l2_node, l2t_l2_node_fn);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/app/sticky_hash.c b/src/vpp/app/sticky_hash.c
new file mode 100644
index 00000000..5569c677
--- /dev/null
+++ b/src/vpp/app/sticky_hash.c
@@ -0,0 +1,581 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/l2/l2_classify.h>
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ip/ip_packet.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vppinfra/error.h>
+
+typedef struct
+{
+  u32 fwd_entry_index;
+  u32 rev_entry_index;
+  /* Not strictly needed, for show command */
+  u32 fib_index;
+} sticky_hash_session_t;
+
+typedef struct
+{
+  u32 cached_next_index;
+
+  /* next index added to l2_classify */
+  u32 fwd_miss_next_index;
+
+  /* session pool */
+  sticky_hash_session_t *sessions;
+
+  /* Forward and reverse data session setup buffers */
+  u8 fdata[3 * sizeof (u32x4)];
+  u8 rdata[3 * sizeof (u32x4)];
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+  vnet_classify_main_t *vnet_classify_main;
+  l2_input_classify_main_t *l2_input_classify_main;
+}
+sticky_hash_main_t;
+
+typedef struct
+{
+  /* $$$$ fill in with per-pkt trace data */
+  u32 next_index;
+  u32 sw_if_index;
+} sticky_hash_miss_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_sticky_hash_miss_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  sticky_hash_miss_trace_t *t = va_arg (*args, sticky_hash_miss_trace_t *);
+
+  s = format (s, "STICKY_HASH_MISS: sw_if_index %d", t->sw_if_index);
+  return s;
+}
+
+typedef CLIB_PACKED (struct
+		     {
+		     ethernet_header_t eh; ip4_header_t ip;
+		     }) classify_data_or_mask_t;
+
+sticky_hash_main_t sticky_hash_main;
+
+vlib_node_registration_t sticky_hash_miss_node;
+
+#define foreach_sticky_hash_miss_error \
+_(MISSES, "forward flow classify misses")
+
+typedef enum
+{
+#define _(sym,str) STICKY_HASH_MISS_ERROR_##sym,
+  foreach_sticky_hash_miss_error
+#undef _
+    STICKY_HASH_MISS_N_ERROR,
+} sticky_hash_miss_error_t;
+
+static char *sticky_hash_miss_error_strings[] = {
+#define _(sym,string) string,
+  foreach_sticky_hash_miss_error
+#undef _
+};
+
+/*
+ * To drop a pkt and increment one of the previous counters:
+ *
+ * set b0->error = error_node->errors[STICKY_HASH_MISS_ERROR_EXAMPLE];
+ * set next0 to a disposition index bound to "error-drop".
+ *
+ * To manually increment the specific counter STICKY_HASH_MISS_ERROR_EXAMPLE:
+ *
+ *  vlib_node_t *n = vlib_get_node (vm, sticky_hash_miss.index);
+ *  u32 node_counter_base_index = n->error_heap_index;
+ *  vlib_error_main_t * em = &vm->error_main;
+ *  em->counters[node_counter_base_index + STICKY_HASH_MISS_ERROR_EXAMPLE] += 1;
+ *
+ */
+
+typedef enum
+{
+  STICKY_HASH_MISS_NEXT_IP4_INPUT,
+  STICKY_HASH_MISS_N_NEXT,
+} sticky_hash_miss_next_t;
+
+static uword
+sticky_hash_miss_node_fn (vlib_main_t * vm,
+			  vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  sticky_hash_miss_next_t next_index;
+  sticky_hash_main_t *mp = &sticky_hash_main;
+  vlib_node_t *n = vlib_get_node (vm, sticky_hash_miss_node.index);
+  u32 node_counter_base_index = n->error_heap_index;
+  vlib_error_main_t *em = &vm->error_main;
+  vnet_classify_main_t *cm = mp->vnet_classify_main;
+  ip4_main_t *im = &ip4_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 sw_if_index0;
+	  u32 fib_index0, ft_index0, rt_index0;
+	  vnet_classify_table_3_t *ft0, *rt0;
+	  vnet_classify_entry_3_t *fe0, *re0;
+	  classify_data_or_mask_t *h0;
+	  u8 was_found0;
+	  ip4_fib_t *fib0;
+	  sticky_hash_session_t *s;
+	  u32 tmp;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  next0 = mp->cached_next_index;
+
+	  h0 = vlib_buffer_get_current (b0);
+
+	  /* Add forward and reverse entries for this flow */
+	  clib_memcpy (mp->fdata, h0, sizeof (mp->fdata));
+	  clib_memcpy (mp->rdata, h0, sizeof (mp->rdata));
+
+	  h0 = (classify_data_or_mask_t *) (mp->rdata);
+
+	  /* swap src + dst addresses to form reverse data */
+	  tmp = h0->ip.src_address.as_u32;
+	  h0->ip.src_address.as_u32 = h0->ip.dst_address.as_u32;
+	  h0->ip.dst_address.as_u32 = tmp;
+
+	  /* dig up fwd + rev tables */
+	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index, sw_if_index0);
+	  fib0 = vec_elt_at_index (im->fibs, fib_index0);
+
+	  ft_index0 = fib0->fwd_classify_table_index;
+	  rt_index0 = fib0->rev_classify_table_index;
+
+	  ft0 = (vnet_classify_table_3_t *)
+	    pool_elt_at_index (cm->tables, ft_index0);
+	  rt0 = (vnet_classify_table_3_t *)
+	    pool_elt_at_index (cm->tables, rt_index0);
+
+	  fe0 =
+	    vnet_classify_find_or_add_entry_3 (ft0, mp->fdata, &was_found0);
+	  fe0->next_index = L2_INPUT_CLASSIFY_NEXT_IP4_INPUT;
+	  fe0->advance = sizeof (ethernet_header_t);
+
+	  re0 = vnet_classify_find_or_add_entry_3 (rt0, mp->rdata, 0);
+	  re0->next_index = L2_INPUT_CLASSIFY_NEXT_IP4_INPUT;	/* $$$ FIXME */
+	  re0->advance = sizeof (ethernet_header_t);
+
+	  /* Note: we could get a whole vector of misses for the same sess */
+	  if (was_found0 == 0)
+	    {
+	      pool_get (mp->sessions, s);
+
+	      fe0->opaque_index = s - mp->sessions;
+	      re0->opaque_index = s - mp->sessions;
+
+	      s->fwd_entry_index = fe0 - ft0->entries;
+	      s->rev_entry_index = re0 - rt0->entries;
+	      s->fib_index = fib_index0;
+	    }
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      sticky_hash_miss_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = sw_if_index0;
+	      t->next_index = next0;
+	    }
+
+	  em->counters[node_counter_base_index +
+		       STICKY_HASH_MISS_ERROR_MISSES] += 1;
+
+	  vlib_buffer_advance (b0, sizeof (ethernet_header_t));
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (sticky_hash_miss_node) = {
+  .function = sticky_hash_miss_node_fn,
+  .name = "sticky-hash-miss",
+  .vector_size = sizeof (u32),
+  .format_trace = format_sticky_hash_miss_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(sticky_hash_miss_error_strings),
+  .error_strings = sticky_hash_miss_error_strings,
+
+  .n_next_nodes = STICKY_HASH_MISS_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [STICKY_HASH_MISS_NEXT_IP4_INPUT] = "ip4-input",
+  },
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+sticky_hash_miss_init (vlib_main_t * vm)
+{
+  sticky_hash_main_t *mp = &sticky_hash_main;
+
+  mp->vlib_main = vm;
+  mp->vnet_main = vnet_get_main ();
+  mp->vnet_classify_main = &vnet_classify_main;
+  mp->l2_input_classify_main = &l2_input_classify_main;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (sticky_hash_miss_init);
+
+static int ip4_sticky_hash_enable_disable
+  (sticky_hash_main_t * mp,
+   u32 fwd_sw_if_index, u8 * fwd_mask,
+   u32 rev_sw_if_index, u8 * rev_mask, u32 nbuckets, int enable_disable)
+{
+  ip4_main_t *im = &ip4_main;
+  u32 fib_index;
+  ip4_fib_t *fib;
+  vnet_classify_main_t *cm = mp->vnet_classify_main;
+  l2_input_classify_main_t *l2cm = mp->l2_input_classify_main;
+  vnet_classify_table_3_t *ft, *rt;
+
+  fib_index = vec_elt (im->fib_index_by_sw_if_index, fwd_sw_if_index);
+  fib = vec_elt_at_index (im->fibs, fib_index);
+
+  if (fib->fwd_classify_table_index == ~0)
+    {
+      /* Set up forward table */
+      ft = (vnet_classify_table_3_t *)
+	vnet_classify_new_table (cm, fwd_mask, nbuckets,
+				 0 /* skip */ , 3 /* match */ );
+      fib->fwd_classify_table_index
+	= ft - (vnet_classify_table_3_t *) cm->tables;
+      mp->fwd_miss_next_index =
+	vlib_node_add_next (mp->vlib_main, l2_input_classify_node.index,
+			    sticky_hash_miss_node.index);
+      ft->miss_next_index = mp->fwd_miss_next_index;
+
+      /* Set up reverse table */
+      rt = (vnet_classify_table_3_t *)
+	vnet_classify_new_table (cm, rev_mask, nbuckets,
+				 0 /* skip */ , 3 /* match */ );
+      fib->rev_classify_table_index
+	= rt - (vnet_classify_table_3_t *) cm->tables;
+    }
+
+  vec_validate
+    (l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP4],
+     fwd_sw_if_index);
+
+  vec_validate
+    (l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP6],
+     fwd_sw_if_index);
+
+  vec_validate
+    (l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_OTHER],
+     fwd_sw_if_index);
+
+  l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP4]
+    [fwd_sw_if_index] = fib->fwd_classify_table_index;
+
+  l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP6]
+    [fwd_sw_if_index] = ~0;
+
+  l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_OTHER]
+    [fwd_sw_if_index] = ~0;
+
+
+  vec_validate
+    (l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP4],
+     rev_sw_if_index);
+
+  vec_validate
+    (l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP6],
+     rev_sw_if_index);
+
+  vec_validate
+    (l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_OTHER],
+     rev_sw_if_index);
+
+
+  l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP4]
+    [rev_sw_if_index] = fib->rev_classify_table_index;
+
+  l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP6]
+    [rev_sw_if_index] = ~0;
+
+  l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_OTHER]
+    [rev_sw_if_index] = ~0;
+
+  vnet_l2_input_classify_enable_disable (fwd_sw_if_index, enable_disable);
+  vnet_l2_input_classify_enable_disable (rev_sw_if_index, enable_disable);
+  return 0;
+}
+
+static clib_error_t *
+ip4_sticky_hash_init_command_fn (vlib_main_t * vm,
+				 unformat_input_t * input,
+				 vlib_cli_command_t * cmd)
+{
+  u32 fwd_sw_if_index = ~0, rev_sw_if_index = ~0;
+  int enable_disable = 1;
+  u32 nbuckets = 2;
+  int rv;
+  sticky_hash_main_t *mp = &sticky_hash_main;
+  classify_data_or_mask_t fwd_mask, rev_mask;
+  u8 *fm = 0, *rm = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat
+	  (input, "fwd %U", unformat_vnet_sw_interface, mp->vnet_main,
+	   &fwd_sw_if_index))
+	;
+      if (unformat
+	  (input, "rev %U", unformat_vnet_sw_interface, mp->vnet_main,
+	   &rev_sw_if_index))
+	;
+      else if (unformat (input, "nbuckets %d", &nbuckets))
+	;
+      else if (unformat (input, "disable"))
+	enable_disable = 0;
+
+      else
+	break;
+    }
+
+  nbuckets = 1 << max_log2 (nbuckets);
+
+  if (fwd_sw_if_index == ~0)
+    return clib_error_return (0, "fwd interface not set");
+
+  if (rev_sw_if_index == ~0)
+    return clib_error_return (0, "rev interface not set");
+
+  if (!is_pow2 (nbuckets))
+    return clib_error_return (0, "nbuckets %d not a power of 2", nbuckets);
+
+  ASSERT (sizeof (fwd_mask) <= 3 * sizeof (u32x4));
+
+  /* Mask on src/dst address, depending on direction */
+  memset (&fwd_mask, 0, sizeof (fwd_mask));
+  memset (&fwd_mask.ip.src_address, 0xff, 4);
+
+  memset (&rev_mask, 0, sizeof (rev_mask));
+  memset (&rev_mask.ip.dst_address, 0xff, 4);
+
+  vec_validate (fm, 3 * sizeof (u32x4) - 1);
+  vec_validate (rm, 3 * sizeof (u32x4) - 1);
+
+  clib_memcpy (fm, &fwd_mask, sizeof (fwd_mask));
+  clib_memcpy (rm, &rev_mask, sizeof (rev_mask));
+
+  rv = ip4_sticky_hash_enable_disable (mp, fwd_sw_if_index, fm,
+				       rev_sw_if_index, rm,
+				       nbuckets, enable_disable);
+
+  vec_free (fm);
+  vec_free (rm);
+  switch (rv)
+    {
+    case 0:
+      return 0;
+
+    default:
+      return clib_error_return (0,
+				"ip4_sticky_hash_enable_disable returned %d",
+				rv);
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (sticky_hash_init_command, static) = {
+  .path = "ip sticky classify",
+  .short_help = "ip sticky classify fwd <intfc> rev <intfc> "
+  "[nbuckets <nn>][disable]",
+  .function = ip4_sticky_hash_init_command_fn,
+};
+/* *INDENT-ON* */
+
+
+u8 *
+format_sticky_hash_session (u8 * s, va_list * args)
+{
+  sticky_hash_main_t *mp = va_arg (*args, sticky_hash_main_t *);
+  sticky_hash_session_t *session = va_arg (*args, sticky_hash_session_t *);
+  vnet_classify_table_3_t *t;
+  vnet_classify_entry_3_t *e;
+  ip4_main_t *im = &ip4_main;
+  vnet_classify_main_t *cm = mp->vnet_classify_main;
+  ip4_fib_t *fib;
+  classify_data_or_mask_t *match;
+
+  fib = vec_elt_at_index (im->fibs, session->fib_index);
+
+  t = (vnet_classify_table_3_t *)
+    pool_elt_at_index (cm->tables, fib->fwd_classify_table_index);
+  e = pool_elt_at_index (t->entries, session->fwd_entry_index);
+  match = (classify_data_or_mask_t *) (e->key);
+
+  s = format
+    (s,
+     "[%6d] fwd src %U next index %d session %d fib %d\n"
+     "         hits %lld last-heard %.6f\n",
+     e - t->entries,
+     format_ip4_address, &match->ip.src_address,
+     e->next_index, e->opaque_index, fib->table_id, e->hits, e->last_heard);
+
+  if (e->opaque_index != session - mp->sessions)
+    s = format (s, "WARNING: forward session index mismatch!\n");
+
+  t = (vnet_classify_table_3_t *)
+    pool_elt_at_index (cm->tables, fib->rev_classify_table_index);
+  e = pool_elt_at_index (t->entries, session->rev_entry_index);
+  match = (classify_data_or_mask_t *) (e->key);
+
+  s = format
+    (s,
+     "[%6d] rev dst %U next index %d session %d\n"
+     "         hits %lld last-heard %.6f\n",
+     e - t->entries,
+     format_ip4_address, &match->ip.dst_address,
+     e->next_index, e->opaque_index, e->hits, e->last_heard);
+
+  if (e->opaque_index != session - mp->sessions)
+    s = format (s, "WARNING: reverse session index mismatch!\n");
+  s = format (s, "---------\n");
+
+  return s;
+}
+
+static clib_error_t *
+show_ip4_sticky_hash_command_fn (vlib_main_t * vm,
+				 unformat_input_t * input,
+				 vlib_cli_command_t * cmd)
+{
+  sticky_hash_main_t *mp = &sticky_hash_main;
+  sticky_hash_session_t *s;
+  int verbose = 0;
+  int dump_classifier_tables = 0;
+  ip4_fib_t *fib;
+  ip4_main_t *im4 = &ip4_main;
+  vnet_classify_main_t *cm = mp->vnet_classify_main;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "verbose"))
+	verbose = 1;
+      else if (unformat (input, "dump-tables")
+	       || unformat (input, "dump-classifier-tables"))
+	dump_classifier_tables = 1;
+      else
+	break;
+    }
+
+  if (pool_elts (mp->sessions) == 0)
+    vlib_cli_output (vm, "No ip sticky hash sessions");
+
+
+  vlib_cli_output (vm, "%d active sessions\n", pool_elts (mp->sessions));
+
+  vec_foreach (fib, im4->fibs)
+  {
+    if (fib->fwd_classify_table_index != ~0)
+      vlib_cli_output (vm, "fib %d fwd table: \n%U",
+		       fib->table_id,
+		       format_classify_table,
+		       cm,
+		       pool_elt_at_index
+		       (cm->tables, fib->fwd_classify_table_index),
+		       dump_classifier_tables);
+    if (fib->rev_classify_table_index != ~0)
+      vlib_cli_output (vm, "fib %d rev table: \n%U",
+		       fib->table_id,
+		       format_classify_table,
+		       cm,
+		       pool_elt_at_index
+		       (cm->tables, fib->rev_classify_table_index),
+		       dump_classifier_tables);
+  }
+
+  if (verbose)
+    {
+      /* *INDENT-OFF* */
+      pool_foreach (s, mp->sessions,
+      ({
+        vlib_cli_output (vm, "%U", format_sticky_hash_session, mp, s);
+      }));
+      /* *INDENT-ON* */
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_sticky_hash_command, static) = {
+  .path = "show sticky classify",
+  .short_help = "Display sticky classifier tables",
+  .function = show_ip4_sticky_hash_command_fn,
+};
+/* *INDENT-ON* */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/app/version.c b/src/vpp/app/version.c
new file mode 100644
index 00000000..60844c98
--- /dev/null
+++ b/src/vpp/app/version.c
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vppinfra/cpu.h>
+#include <vpp/app/version.h>
+
+#if DPDK > 0
+#include <rte_version.h>
+#include <vnet/vnet.h>
+#include <vnet/devices/dpdk/dpdk.h>
+#endif /* DPDK */
+
+static char *vpe_version_string =
+  "vpp v" VPP_BUILD_VER
+  " built by " VPP_BUILD_USER " on " VPP_BUILD_HOST " at " VPP_BUILD_DATE;
+
+static char *vpe_compiler =
+#if defined(__INTEL_COMPILER)
+#define __(x) #x
+#define _(x) __(x)
+  "icc " _(__INTEL_COMPILER) " (" __VERSION__ ")";
+#undef _
+#undef __
+#elif defined(__clang__)
+  "Clang/LLVM " __clang_version__;
+#elif defined (__GNUC__)
+  "GCC " __VERSION__;
+#else
+  "unknown compiler";
+#endif
+
+static clib_error_t *
+show_vpe_version_command_fn (vlib_main_t * vm,
+			     unformat_input_t * input,
+			     vlib_cli_command_t * cmd)
+{
+  if (unformat (input, "verbose"))
+    {
+#define _(a,b,c) vlib_cli_output (vm, "%-25s " b, a ":", c);
+      _("Version", "%s", "v" VPP_BUILD_VER);
+      _("Compiled by", "%s", VPP_BUILD_USER);
+      _("Compile host", "%s", VPP_BUILD_HOST);
+      _("Compile date", "%s", VPP_BUILD_DATE);
+      _("Compile location", "%s", VPP_BUILD_TOPDIR);
+      _("Compiler", "%s", vpe_compiler);
+      _("Current PID", "%d", getpid ());
+#if DPDK > 0
+      _("DPDK Version", "%s", rte_version ());
+      _("DPDK EAL init args", "%s", dpdk_config_main.eal_init_args_str);
+#endif
+#undef _
+    }
+  else
+    vlib_cli_output (vm, "%s", vpe_version_string);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_vpe_version_command, static) = {
+  .path = "show version",
+  .short_help = "show version information",
+  .function = show_vpe_version_command_fn,
+};
+/* *INDENT-ON* */
+
+char *
+vpe_api_get_build_directory (void)
+{
+  return VPP_BUILD_TOPDIR;
+}
+
+char *
+vpe_api_get_version (void)
+{
+  return VPP_BUILD_VER;
+}
+
+char *
+vpe_api_get_build_date (void)
+{
+  return VPP_BUILD_DATE;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/app/vpe_cli.c b/src/vpp/app/vpe_cli.c
new file mode 100644
index 00000000..a26bf71f
--- /dev/null
+++ b/src/vpp/app/vpe_cli.c
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/adj/adj.h>
+#include <vnet/fib/fib_table.h>
+
+typedef struct
+{
+  u8 mac_addr[6];
+} mac_addr_t;
+
+static clib_error_t *
+virtual_ip_cmd_fn_command_fn (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  vnet_main_t *vnm = vnet_get_main ();
+  ip46_address_t next_hop, *next_hops;
+  fib_route_path_t *rpaths;
+  fib_prefix_t prefix;
+  u8 mac_addr[6];
+  mac_addr_t *mac_addrs = 0;
+  u32 sw_if_index;
+  u32 i;
+
+  next_hops = NULL;
+  rpaths = NULL;
+  prefix.fp_len = 32;
+  prefix.fp_proto = FIB_PROTOCOL_IP4;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  if (!unformat (line_input, "%U %U",
+		 unformat_ip4_address, &prefix.fp_addr.ip4,
+		 unformat_vnet_sw_interface, vnm, &sw_if_index))
+    goto barf;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "mac %U",
+		    unformat_ethernet_address, &mac_addr))
+	{
+	  mac_addr_t *ma;
+	  vec_add2 (mac_addrs, ma, 1);
+	  clib_memcpy (ma, mac_addr, sizeof (mac_addr));
+	}
+      else if (unformat (line_input, "next-hop %U",
+			 unformat_ip4_address, &next_hop.ip4))
+	{
+	  vec_add1 (next_hops, next_hop);
+	}
+      else
+	{
+	barf:
+	  return clib_error_return (0, "unknown input `%U'",
+				    format_unformat_error, input);
+	}
+    }
+  if (vec_len (mac_addrs) == 0 || vec_len (mac_addrs) != vec_len (next_hops))
+    goto barf;
+
+  /* Create / delete special interface route /32's */
+
+  for (i = 0; i < vec_len (mac_addrs); i++)
+    {
+      fib_route_path_t *rpath;
+
+      adj_nbr_add_or_lock_w_rewrite (FIB_PROTOCOL_IP4,
+				     VNET_LINK_IP4,
+				     &next_hops[i],
+				     sw_if_index, mac_addrs[i].mac_addr);
+
+      vec_add2 (rpaths, rpath, 1);
+
+      rpath->frp_proto = FIB_PROTOCOL_IP4;
+      rpath->frp_addr = next_hops[i];
+      rpath->frp_sw_if_index = sw_if_index;
+      rpath->frp_fib_index = ~0;
+      rpath->frp_weight = 1;
+      rpath->frp_label_stack = NULL;
+    }
+
+  fib_table_entry_path_add2 (0,	// default FIB table
+			     &prefix,
+			     FIB_SOURCE_CLI, FIB_ENTRY_FLAG_NONE, rpaths);
+
+  vec_free (mac_addrs);
+  vec_free (next_hops);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (virtual_ip_cmd_fn_command, static) = {
+  .path = "ip virtual",
+  .short_help = "ip virtual <addr> <interface> [mac <Mi>]+",
+  .function = virtual_ip_cmd_fn_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/conf/80-vpp.conf b/src/vpp/conf/80-vpp.conf
new file mode 100644
index 00000000..8fdf184c
--- /dev/null
+++ b/src/vpp/conf/80-vpp.conf
@@ -0,0 +1,15 @@
+# Number of 2MB hugepages desired
+vm.nr_hugepages=1024
+
+# Must be greater than or equal to (2 * vm.nr_hugepages).
+vm.max_map_count=3096
+
+# All groups allowed to access hugepages
+vm.hugetlb_shm_group=0
+
+# Shared Memory Max must be greator or equal to the total size of hugepages.
+# For 2MB pages, TotalHugepageSize = vm.nr_hugepages * 2 * 1024 * 1024
+# If the existing kernel.shmmax setting  (cat /sys/proc/kernel/shmmax)
+# is greater than the calculated TotalHugepageSize then set this parameter
+# to current shmmax value.
+kernel.shmmax=2147483648
diff --git a/src/vpp/conf/startup.conf b/src/vpp/conf/startup.conf
new file mode 100644
index 00000000..bce00202
--- /dev/null
+++ b/src/vpp/conf/startup.conf
@@ -0,0 +1,99 @@
+
+unix {
+  nodaemon
+  log /tmp/vpp.log
+  full-coredump
+}
+
+api-trace {
+  on
+}
+
+api-segment {
+  gid vpp
+}
+
+cpu {
+	## In the VPP there is one main thread and optionally the user can create worker(s)
+	## The main thread and worker thread(s) can be pinned to CPU core(s) manually or automatically
+
+	## Manual pinning of thread(s) to CPU core(s)
+
+	## Set logical CPU core where main thread runs
+	# main-core 1
+
+	## Set logical CPU core(s) where worker threads are running
+	# corelist-workers 2-3,18-19
+
+	## Automatic pinning of thread(s) to CPU core(s)
+
+	## Sets number of CPU core(s) to be skipped (1 ... N-1)
+	## Skipped CPU core(s) are not used for pinning main thread and working thread(s).
+	## The main thread is automatically pinned to the first available CPU core and worker(s)
+	## are pinned to next free CPU core(s) after core assigned to main thread
+	# skip-cores 4
+
+	## Specify a number of workers to be created
+	## Workers are pinned to N consecutive CPU cores while skipping "skip-cores" CPU core(s)
+	## and main thread's CPU core
+	# workers 2
+
+	## Set scheduling policy and priority of main and worker threads
+
+	## Scheduling policy options are: other (SCHED_OTHER), batch (SCHED_BATCH)
+	## idle (SCHED_IDLE), fifo (SCHED_FIFO), rr (SCHED_RR)
+	# scheduler-policy fifo
+
+	## Scheduling priority is used only for "real-time policies (fifo and rr),
+	## and has to be in the range of priorities supported for a particular policy
+	# scheduler-priority 50
+}
+
+dpdk {
+	## Change default settings for all intefaces
+	# dev default {
+		## Number of receive queues, enables RSS
+		## Default is 1
+		# num-rx-queues 3
+
+		## Number of transmit queues, Default is equal
+		## to number of worker threads or 1 if no workers treads
+		# num-tx-queues 3
+
+		## Number of descriptors in transmit and receive rings
+		## increasing or reducing number can impact performance
+		## Default is 1024 for both rx and tx
+		# num-rx-desc 512
+		# num-tx-desc 512
+
+		## VLAN strip offload mode for interface
+		## Default is off
+		# vlan-strip-offload on
+	# }
+
+	## Whitelist specific interface by specifying PCI address
+	# dev 0000:02:00.0
+
+	## Whitelist specific interface by specifying PCI address and in
+	## addition specify custom parameters for this interface
+	# dev 0000:02:00.1 {
+	#	num-rx-queues 2
+	# }
+
+	## Change UIO driver used by VPP, Options are: uio_pci_generic, vfio-pci
+	## and igb_uio (default)
+	# uio-driver uio_pci_generic
+
+	## Disable mutli-segment buffers, improves performance but
+	## disables Jumbo MTU support
+	# no-multi-seg
+
+	## Increase number of buffers allocated, needed only in scenarios with
+	## large number of interfaces and worker threads. Value is per CPU socket.
+	## Default is 32768
+	# num-mbufs 128000
+
+	## Change hugepages allocation per-socket, needed only if there is need for
+	## larger number of mbufs. Default is 256M on each detected CPU socket
+	# socket-mem 2048,2048
+}
diff --git a/src/vpp/conf/startup.uiopcigeneric.conf b/src/vpp/conf/startup.uiopcigeneric.conf
new file mode 100644
index 00000000..03a89dff
--- /dev/null
+++ b/src/vpp/conf/startup.uiopcigeneric.conf
@@ -0,0 +1,18 @@
+
+unix {
+  nodaemon
+  log /tmp/vpp.log
+  full-coredump
+}
+
+dpdk {
+    uio-driver uio_pci_generic
+}
+
+api-trace {
+  on
+}
+
+api-segment {
+  gid vpp
+}
diff --git a/src/vpp/oam/oam.c b/src/vpp/oam/oam.c
new file mode 100644
index 00000000..07e17b64
--- /dev/null
+++ b/src/vpp/oam/oam.c
@@ -0,0 +1,648 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vpp/oam/oam.h>
+
+#if DPDK > 0
+#include <vnet/devices/dpdk/dpdk.h>
+#endif
+
+oam_main_t oam_main;
+
+static vlib_node_registration_t oam_node;
+
+static void
+init_oam_packet_template (oam_main_t * om, oam_target_t * t)
+{
+  oam_template_t *h;
+  int i;
+  ip_csum_t sum;
+  u16 csum;
+
+  vec_validate_aligned (t->template, 0, CLIB_CACHE_LINE_BYTES);
+
+  h = t->template;
+  memset (h, 0, sizeof (*h));
+
+  h->ip4.src_address.as_u32 = t->src_address.as_u32;
+  h->ip4.dst_address.as_u32 = t->dst_address.as_u32;
+  h->ip4.ip_version_and_header_length = 0x45;
+  h->ip4.length = clib_host_to_net_u16 (sizeof (*h));
+  h->ip4.ttl = 64;		/* as in linux */
+  h->ip4.protocol = IP_PROTOCOL_ICMP;
+  h->ip4.checksum = ip4_header_checksum (&h->ip4);
+
+  /*
+   * Template has seq = 0. Each time we send one of these puppies,
+   * change the sequence number and fix the execrated checksum
+   */
+  h->icmp.type = ICMP4_echo_request;
+  h->id = clib_host_to_net_u16 (t->id);
+
+  for (i = 0; i < ARRAY_LEN (h->data); i++)
+    h->data[i] = 'A' + i;
+
+  sum = ip_incremental_checksum (0, &h->icmp,
+				 sizeof (h->icmp) + sizeof (h->id) +
+				 sizeof (h->seq) + sizeof (h->data));
+  csum = ~ip_csum_fold (sum);
+  h->icmp.checksum = csum;
+}
+
+int
+vpe_oam_add_del_target (ip4_address_t * src_address,
+			ip4_address_t * dst_address, u32 fib_id, int is_add)
+{
+  u64 key;
+  uword *p;
+  oam_main_t *om = &oam_main;
+  oam_target_t *t;
+  ip4_main_t *im = &ip4_main;
+  u32 fib_index;
+
+  /* Make sure the FIB actually exists */
+  p = hash_get (im->fib_index_by_table_id, fib_id);
+  if (!p)
+    return VNET_API_ERROR_NO_SUCH_FIB;
+
+  fib_index = p[0];
+
+  key = ((u64) fib_index << 32) | (dst_address->as_u32);
+  p = hash_get (om->target_by_address_and_fib_id, key);
+
+  if (is_add)
+    {
+      if (p)
+	return VNET_API_ERROR_INVALID_REGISTRATION;	/* already there... */
+
+      pool_get (om->targets, t);
+      memset (t, 0, sizeof (*t));
+      t->src_address.as_u32 = src_address->as_u32;
+      t->dst_address.as_u32 = dst_address->as_u32;
+      t->fib_id = fib_id;
+      t->fib_index = fib_index;
+      t->state = OAM_STATE_DEAD;
+      t->last_heard_time = vlib_time_now (om->vlib_main);
+      t->last_heard_seq = (u16) ~ om->misses_allowed;
+      t->id = (u16) random_u32 (&om->random_seed);
+      t->seq = 1;
+      init_oam_packet_template (om, t);
+      hash_set (om->target_by_address_and_fib_id, key, t - om->targets);
+    }
+  else
+    {
+      if (!p)
+	return VNET_API_ERROR_NO_SUCH_ENTRY;	/* no such oam target */
+      t = pool_elt_at_index (om->targets, p[0]);
+      vec_free (t->template);
+      hash_unset (om->target_by_address_and_fib_id, key);
+      pool_put (om->targets, t);
+    }
+  return 0;
+}
+
+static clib_error_t *
+oam_add_del_target_command_fn (vlib_main_t * vm,
+			       unformat_input_t * input,
+			       vlib_cli_command_t * cmd)
+{
+  int is_add = -1;
+  ip4_address_t src_address;
+  int src_set = 0;
+  ip4_address_t dst_address;
+  int dst_set = 0;
+  u32 fib_id = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "add"))
+	is_add = 1;
+      else if (unformat (input, "del"))
+	is_add = 0;
+      else if (unformat (input, "src %U", unformat_ip4_address, &src_address))
+	src_set = 1;
+      else if (unformat (input, "dst %U", unformat_ip4_address, &dst_address))
+	dst_set = 1;
+      else if (unformat (input, "fib %d", &fib_id))
+	;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+
+  if (is_add == -1)
+    return clib_error_return (0, "missing add / del qualifier");
+  if (src_set == 0)
+    return clib_error_return (0, "src address not set");
+  if (dst_set == 0)
+    return clib_error_return (0, "dst address not set");
+
+  (void) vpe_oam_add_del_target (&src_address, &dst_address, fib_id, is_add);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (oam_add_del_target_command, static) = {
+  .path = "oam",
+  .short_help = "oam [add|del] target <ip4-address> fib <fib-id>",
+  .function = oam_add_del_target_command_fn,
+};
+/* *INDENT-ON* */
+
+static uword
+oam_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f_arg)
+{
+  oam_main_t *om = &oam_main;
+  uword *event_data = 0;
+  oam_target_t *t;
+  oam_template_t *h0;
+  u32 bi0;
+  u16 new_seq;
+  ip_csum_t sum0;
+  vlib_frame_t *f;
+  u32 *to_next, *from;
+  u32 ip4_lookup_node_index;
+  vlib_node_t *ip4_lookup_node;
+  vlib_buffer_t *b0;
+  static u32 *buffers;
+  oam_template_copy_t *copy_src, *copy_dst;
+  void send_oam_event (oam_target_t * t);
+  u32 nalloc;
+
+  /* Enqueue pkts to ip4-lookup */
+  ip4_lookup_node = vlib_get_node_by_name (vm, (u8 *) "ip4-lookup");
+  ip4_lookup_node_index = ip4_lookup_node->index;
+
+  while (1)
+    {
+      /* Only timeout events at the moment */
+      vlib_process_wait_for_event_or_clock (vm, om->interval);
+      vec_reset_length (event_data);
+
+      if (pool_elts (om->targets) == 0)
+	continue;
+
+      if (vec_len (buffers) < pool_elts (om->targets))
+	vec_validate (buffers, pool_elts (om->targets) - 1);
+
+      nalloc = vlib_buffer_alloc (vm, buffers, pool_elts (om->targets));
+      if (nalloc < pool_elts (om->targets))
+	{
+	  vlib_buffer_free (vm, buffers, nalloc);
+	  continue;
+	}
+
+      f = vlib_get_frame_to_node (vm, ip4_lookup_node_index);
+      f->n_vectors = 0;
+      to_next = vlib_frame_vector_args (f);
+      from = buffers;
+
+      /* *INDENT-OFF* */
+      pool_foreach (t, om->targets,
+      ({
+        /* State transition announcement... */
+        if ((t->seq - t->last_heard_seq) >= om->misses_allowed)
+          {
+            if (t->state == OAM_STATE_ALIVE)
+              {
+                if (CLIB_DEBUG > 0)
+                  clib_warning ("oam target %U now DEAD",
+                                format_ip4_address, &t->dst_address);
+                t->state = OAM_STATE_DEAD;
+                send_oam_event (t);
+              }
+          }
+        else
+          {
+            if (t->state == OAM_STATE_DEAD)
+              {
+                if (CLIB_DEBUG > 0)
+                  clib_warning ("oam target %U now ALIVE",
+                                format_ip4_address, &t->dst_address);
+                t->state = OAM_STATE_ALIVE;
+                send_oam_event (t);
+              }
+          }
+
+        /* Send a new icmp */
+        t->seq++;
+        new_seq = clib_host_to_net_u16 (t->seq);
+
+        bi0 = from[0];
+        from++;
+
+        b0 = vlib_get_buffer (vm, bi0);
+        vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
+        vnet_buffer (b0)->sw_if_index [VLIB_TX] = t->fib_index;
+
+        /* Marginally faster than memcpy, probably */
+        copy_dst = (oam_template_copy_t *) b0->data;
+        copy_src = (oam_template_copy_t *) t->template;
+
+        copy_dst->v8[0] = copy_src->v8[0];
+        copy_dst->v8[1] = copy_src->v8[1];
+        copy_dst->v8[2] = copy_src->v8[2];
+        copy_dst->v8[3] = copy_src->v8[3];
+        copy_dst->v4 = copy_src->v4;
+
+        b0->current_data = 0;
+        b0->current_length = sizeof (*t->template);
+        h0 = vlib_buffer_get_current (b0);
+
+        sum0 = h0->icmp.checksum;
+        sum0 = ip_csum_update(sum0, 0 /* old seq */,
+                              new_seq, oam_template_t, seq);
+        h0->seq = new_seq;
+        h0->icmp.checksum = ip_csum_fold (sum0);
+
+        to_next[0] = bi0;
+        to_next++;
+        f->n_vectors++;
+        if (f->n_vectors == VLIB_FRAME_SIZE)
+          {
+            clib_warning ("Too many OAM clients...");
+            goto out;
+          }
+      }));
+      /* *INDENT-ON* */
+
+    out:
+      vlib_put_frame_to_node (vm, ip4_lookup_node_index, f);
+    }
+  return 0;			/* not so much */
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (oam_process_node,static) = {
+  .function = oam_process,
+  .type = VLIB_NODE_TYPE_PROCESS,
+  .name = "vpe-oam-process",
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+oam_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  oam_main_t *om = &oam_main;
+  f64 interval;
+  u32 misses_allowed;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "interval %f", &interval))
+	om->interval = interval;
+      else if (unformat (input, "misses-allowed %d", &misses_allowed))
+	om->interval = misses_allowed;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+  return 0;
+}
+
+VLIB_CONFIG_FUNCTION (oam_config, "oam");
+
+static clib_error_t *
+oam_init (vlib_main_t * vm)
+{
+  oam_main_t *om = &oam_main;
+
+  om->vlib_main = vm;
+  om->vnet_main = vnet_get_main ();
+  om->interval = 2.04;
+  om->misses_allowed = 3;
+  om->random_seed = (u32) (vlib_time_now (vm) * 1e6);
+  om->target_by_address_and_fib_id = hash_create (0, sizeof (uword));
+  om->icmp_id = random_u32 (&om->random_seed);
+
+  ip4_icmp_register_type (vm, ICMP4_echo_reply, oam_node.index);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (oam_init);
+
+static u8 *
+format_oam_target (u8 * s, va_list * args)
+{
+  oam_target_t *t = va_arg (*args, oam_target_t *);
+  int verbose = va_arg (*args, int);
+
+  if (t == 0)
+    return format (s, "%=6s%=14s%=14s%=12s%=10s",
+		   "Fib", "Src", "Dst", "Last Heard", "State");
+
+  s = format (s, "%=6d%=14U%=14U%=12.2f%=10s",
+	      t->fib_id,
+	      format_ip4_address, &t->src_address,
+	      format_ip4_address, &t->dst_address,
+	      t->last_heard_time,
+	      (t->state == OAM_STATE_ALIVE) ? "alive" : "dead");
+  if (verbose)
+    s = format (s, "   seq %d last_heard_seq %d", t->seq, t->last_heard_seq);
+
+  return s;
+}
+
+static clib_error_t *
+show_oam_command_fn (vlib_main_t * vm,
+		     unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  oam_main_t *om = &oam_main;
+  oam_target_t *t;
+  int verbose = 0;
+
+  if (unformat (input, "verbose") || unformat (input, "v"))
+    verbose = 1;
+
+  /* print header */
+  vlib_cli_output (vm, "%U", format_oam_target, 0, verbose);
+
+  /* *INDENT-OFF* */
+  pool_foreach (t, om->targets,
+  ({
+    vlib_cli_output (vm, "%U", format_oam_target, t, verbose);
+  }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_oam_command, static) = {
+  .path = "show oam",
+  .short_help = "show oam",
+  .function = show_oam_command_fn,
+};
+/* *INDENT-ON* */
+
+typedef struct
+{
+  u32 target_pool_index;
+  ip4_address_t address;
+} oam_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_swap_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  oam_trace_t *t = va_arg (*args, oam_trace_t *);
+
+  s = format (s, "OAM: rx from address %U, target index %d",
+	      format_ip4_address, &t->address, t->target_pool_index);
+  return s;
+}
+
+
+#define foreach_oam_error                               \
+_(PROCESSED, "vpe icmp4 oam replies processed")         \
+_(DROPPED, "icmp4 replies dropped (no registration)")
+
+typedef enum
+{
+#define _(sym,str) OAM_ERROR_##sym,
+  foreach_oam_error
+#undef _
+    OAM_N_ERROR,
+} oam_error_t;
+
+static char *oam_error_strings[] = {
+#define _(sym,string) string,
+  foreach_oam_error
+#undef _
+};
+
+/*
+ * To drop a pkt and increment one of the previous counters:
+ *
+ * set b0->error = error_node->errors[OAM_ERROR_EXAMPLE];
+ * set next0 to a disposition index bound to "error-drop".
+ *
+ * To manually increment the specific counter OAM_ERROR_EXAMPLE:
+ *
+ *  vlib_node_t *n = vlib_get_node (vm, oam.index);
+ *  u32 node_counter_base_index = n->error_heap_index;
+ *  vlib_error_main_t * em = &vm->error_main;
+ *  em->counters[node_counter_base_index + OAM_ERROR_EXAMPLE] += 1;
+ *
+ */
+
+typedef enum
+{
+  OAM_NEXT_DROP,
+  OAM_NEXT_PUNT,
+  OAM_N_NEXT,
+} oam_next_t;
+
+static uword
+oam_node_fn (vlib_main_t * vm,
+	     vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  oam_next_t next_index;
+  oam_main_t *om = &oam_main;
+  u32 next0 = OAM_NEXT_DROP;	/* all pkts go to the hopper... */
+  u32 next1 = OAM_NEXT_DROP;
+  uword *u0, *u1;
+  oam_template_t *oam0, *oam1;
+  u32 fib_index0, fib_index1;
+  u64 key0, key1;
+  oam_target_t *t0, *t1;
+  ip4_main_t *im = &ip4_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 sw_if_index0, sw_if_index1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+
+	  oam0 = vlib_buffer_get_current (b0);
+	  oam1 = vlib_buffer_get_current (b1);
+	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index, sw_if_index0);
+	  fib_index1 = vec_elt (im->fib_index_by_sw_if_index, sw_if_index1);
+
+	  key0 = ((u64) fib_index0 << 32) | oam0->ip4.src_address.as_u32;
+	  u0 = hash_get (om->target_by_address_and_fib_id, key0);
+	  if (u0)
+	    {
+	      t0 = pool_elt_at_index (om->targets, u0[0]);
+	      t0->last_heard_time = vlib_time_now (vm);
+	      t0->last_heard_seq = clib_net_to_host_u16 (oam0->seq);
+	      b0->error = node->errors[OAM_ERROR_PROCESSED];
+	    }
+	  else
+	    b0->error = node->errors[OAM_ERROR_DROPPED];
+
+	  key1 = ((u64) fib_index1 << 32) | oam1->ip4.src_address.as_u32;
+	  u1 = hash_get (om->target_by_address_and_fib_id, key1);
+	  if (u1)
+	    {
+	      t1 = pool_elt_at_index (om->targets, u1[0]);
+	      t1->last_heard_time = vlib_time_now (vm);
+	      t1->last_heard_seq = clib_net_to_host_u16 (oam1->seq);
+	      b1->error = node->errors[OAM_ERROR_PROCESSED];
+	    }
+	  else
+	    b1->error = node->errors[OAM_ERROR_DROPPED];
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  oam_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->target_pool_index = u0 ? u0[0] : (u32) ~ 0;
+		  t->address.as_u32 = oam0->ip4.src_address.as_u32;
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  oam_trace_t *t = vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->target_pool_index = u1 ? u1[0] : (u32) ~ 0;
+		  t->address.as_u32 = oam1->ip4.src_address.as_u32;
+
+		}
+	    }
+
+	  if (vm->os_punt_frame)
+	    next0 = next1 = OAM_NEXT_PUNT;
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0, sw_if_index0;
+	  vlib_buffer_t *b0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+	  oam0 = vlib_buffer_get_current (b0);
+	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index, sw_if_index0);
+
+	  key0 = ((u64) fib_index0 << 32) | oam0->ip4.src_address.as_u32;
+	  u0 = hash_get (om->target_by_address_and_fib_id, key0);
+	  if (u0)
+	    {
+	      t0 = pool_elt_at_index (om->targets, u0[0]);
+	      t0->last_heard_time = vlib_time_now (vm);
+	      t0->last_heard_seq = clib_net_to_host_u16 (oam0->seq);
+	      b0->error = node->errors[OAM_ERROR_PROCESSED];
+	    }
+	  else
+	    b0->error = node->errors[OAM_ERROR_DROPPED];
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      oam_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->target_pool_index = u0 ? u0[0] : (u32) ~ 0;
+	      t->address.as_u32 = oam0->ip4.src_address.as_u32;
+	    }
+
+	  if (vm->os_punt_frame)
+	    next0 = OAM_NEXT_PUNT;
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (oam_node,static) = {
+  .function = oam_node_fn,
+  .name = "vpe-icmp4-oam",
+  .vector_size = sizeof (u32),
+  .format_trace = format_swap_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(oam_error_strings),
+  .error_strings = oam_error_strings,
+
+  .n_next_nodes = OAM_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [OAM_NEXT_DROP] = "error-drop",
+    [OAM_NEXT_PUNT] = "error-punt",
+  },
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/oam/oam.h b/src/vpp/oam/oam.h
new file mode 100644
index 00000000..f6af9788
--- /dev/null
+++ b/src/vpp/oam/oam.h
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_oam_h__
+#define __included_oam_h__
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/interface.h>
+
+/* 36 octets, make a note of it... */
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  ip4_header_t ip4;
+  icmp46_header_t icmp;
+  u16 id;
+  u16 seq;
+  u8 data[8];
+}) oam_template_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct {
+  u64 v8[4];
+  u32 v4;
+}) oam_template_copy_t;
+/* *INDENT-ON* */
+
+typedef enum
+{
+  OAM_STATE_UNKNOWN = 0,
+  OAM_STATE_ALIVE,
+  OAM_STATE_DEAD,
+} oam_state_t;
+
+typedef struct
+{
+  ip4_address_t src_address;
+  ip4_address_t dst_address;
+  u32 fib_id;
+  u32 fib_index;
+  f64 last_heard_time;
+  u16 seq;
+  u16 last_heard_seq;
+  u16 id;
+  u8 state;
+  oam_template_t *template;
+} oam_target_t;
+
+typedef struct
+{
+  /* OAM targets */
+  oam_target_t *targets;
+  uword *target_by_address_and_fib_id;
+
+  /* Config parameters */
+  f64 interval;
+  u32 misses_allowed;
+
+  /* random number seed */
+  u32 random_seed;
+  u16 icmp_id;
+
+  /* oam packet template */
+  vlib_packet_template_t packet_template;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} oam_main_t;
+
+int vpe_oam_add_del_target (ip4_address_t * src_address,
+			    ip4_address_t * dst_address,
+			    u32 fib_id, int is_add);
+
+#endif /* __included_oam_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/stats/stats.c b/src/vpp/stats/stats.c
new file mode 100644
index 00000000..391e02f6
--- /dev/null
+++ b/src/vpp/stats/stats.c
@@ -0,0 +1,987 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vpp/stats/stats.h>
+#include <signal.h>
+#include <vlib/threads.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/dpo/load_balance.h>
+
+#define STATS_DEBUG 0
+
+stats_main_t stats_main;
+
+#include <vnet/ip/ip.h>
+
+#include <vpp/api/vpe_msg_enum.h>
+
+#define f64_endian(a)
+#define f64_print(a,b)
+
+#define vl_typedefs		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_printfun
+
+#define foreach_stats_msg                               \
+_(WANT_STATS, want_stats)                               \
+_(WANT_STATS_REPLY, want_stats_reply)                   \
+_(VNET_INTERFACE_COUNTERS, vnet_interface_counters)     \
+_(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters)         \
+_(VNET_IP6_FIB_COUNTERS, vnet_ip6_fib_counters)
+
+/* These constants ensure msg sizes <= 1024, aka ring allocation */
+#define SIMPLE_COUNTER_BATCH_SIZE	126
+#define COMBINED_COUNTER_BATCH_SIZE	63
+#define IP4_FIB_COUNTER_BATCH_SIZE	48
+#define IP6_FIB_COUNTER_BATCH_SIZE	30
+
+/* 5ms */
+#define STATS_RELEASE_DELAY_NS (1000 * 1000 * 5)
+/*                              ns/us  us/ms        */
+
+void
+dslock (stats_main_t * sm, int release_hint, int tag)
+{
+  u32 thread_id;
+  data_structure_lock_t *l = sm->data_structure_lock;
+
+  if (PREDICT_FALSE (l == 0))
+    return;
+
+  thread_id = os_get_cpu_number ();
+  if (l->lock && l->thread_id == thread_id)
+    {
+      l->count++;
+      return;
+    }
+
+  if (release_hint)
+    l->release_hint++;
+
+  while (__sync_lock_test_and_set (&l->lock, 1))
+    /* zzzz */ ;
+  l->tag = tag;
+  l->thread_id = thread_id;
+  l->count = 1;
+}
+
+void
+stats_dslock_with_hint (int hint, int tag)
+{
+  stats_main_t *sm = &stats_main;
+  dslock (sm, hint, tag);
+}
+
+void
+dsunlock (stats_main_t * sm)
+{
+  u32 thread_id;
+  data_structure_lock_t *l = sm->data_structure_lock;
+
+  if (PREDICT_FALSE (l == 0))
+    return;
+
+  thread_id = os_get_cpu_number ();
+  ASSERT (l->lock && l->thread_id == thread_id);
+  l->count--;
+  if (l->count == 0)
+    {
+      l->tag = -l->tag;
+      l->release_hint = 0;
+      CLIB_MEMORY_BARRIER ();
+      l->lock = 0;
+    }
+}
+
+void
+stats_dsunlock (int hint, int tag)
+{
+  stats_main_t *sm = &stats_main;
+  dsunlock (sm);
+}
+
+static void
+do_simple_interface_counters (stats_main_t * sm)
+{
+  vl_api_vnet_interface_counters_t *mp = 0;
+  vnet_interface_main_t *im = sm->interface_main;
+  api_main_t *am = sm->api_main;
+  vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
+  unix_shared_memory_queue_t *q = shmem_hdr->vl_input_queue;
+  vlib_simple_counter_main_t *cm;
+  u32 items_this_message = 0;
+  u64 v, *vp = 0;
+  int i;
+
+  /*
+   * Prevent interface registration from expanding / moving the vectors...
+   * That tends never to happen, so we can hold this lock for a while.
+   */
+  vnet_interface_counter_lock (im);
+
+  vec_foreach (cm, im->sw_if_counters)
+  {
+
+    for (i = 0; i < vec_len (cm->maxi); i++)
+      {
+	if (mp == 0)
+	  {
+	    items_this_message = clib_min (SIMPLE_COUNTER_BATCH_SIZE,
+					   vec_len (cm->maxi) - i);
+
+	    mp = vl_msg_api_alloc_as_if_client
+	      (sizeof (*mp) + items_this_message * sizeof (v));
+	    mp->_vl_msg_id = ntohs (VL_API_VNET_INTERFACE_COUNTERS);
+	    mp->vnet_counter_type = cm - im->sw_if_counters;
+	    mp->is_combined = 0;
+	    mp->first_sw_if_index = htonl (i);
+	    mp->count = 0;
+	    vp = (u64 *) mp->data;
+	  }
+	v = vlib_get_simple_counter (cm, i);
+	clib_mem_unaligned (vp, u64) = clib_host_to_net_u64 (v);
+	vp++;
+	mp->count++;
+	if (mp->count == items_this_message)
+	  {
+	    mp->count = htonl (items_this_message);
+	    /* Send to the main thread... */
+	    vl_msg_api_send_shmem (q, (u8 *) & mp);
+	    mp = 0;
+	  }
+      }
+    ASSERT (mp == 0);
+  }
+  vnet_interface_counter_unlock (im);
+}
+
+static void
+do_combined_interface_counters (stats_main_t * sm)
+{
+  vl_api_vnet_interface_counters_t *mp = 0;
+  vnet_interface_main_t *im = sm->interface_main;
+  api_main_t *am = sm->api_main;
+  vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
+  unix_shared_memory_queue_t *q = shmem_hdr->vl_input_queue;
+  vlib_combined_counter_main_t *cm;
+  u32 items_this_message = 0;
+  vlib_counter_t v, *vp = 0;
+  int i;
+
+  vnet_interface_counter_lock (im);
+
+  vec_foreach (cm, im->combined_sw_if_counters)
+  {
+
+    for (i = 0; i < vec_len (cm->maxi); i++)
+      {
+	if (mp == 0)
+	  {
+	    items_this_message = clib_min (COMBINED_COUNTER_BATCH_SIZE,
+					   vec_len (cm->maxi) - i);
+
+	    mp = vl_msg_api_alloc_as_if_client
+	      (sizeof (*mp) + items_this_message * sizeof (v));
+	    mp->_vl_msg_id = ntohs (VL_API_VNET_INTERFACE_COUNTERS);
+	    mp->vnet_counter_type = cm - im->combined_sw_if_counters;
+	    mp->is_combined = 1;
+	    mp->first_sw_if_index = htonl (i);
+	    mp->count = 0;
+	    vp = (vlib_counter_t *) mp->data;
+	  }
+	vlib_get_combined_counter (cm, i, &v);
+	clib_mem_unaligned (&vp->packets, u64)
+	  = clib_host_to_net_u64 (v.packets);
+	clib_mem_unaligned (&vp->bytes, u64) = clib_host_to_net_u64 (v.bytes);
+	vp++;
+	mp->count++;
+	if (mp->count == items_this_message)
+	  {
+	    mp->count = htonl (items_this_message);
+	    /* Send to the main thread... */
+	    vl_msg_api_send_shmem (q, (u8 *) & mp);
+	    mp = 0;
+	  }
+      }
+    ASSERT (mp == 0);
+  }
+  vnet_interface_counter_unlock (im);
+}
+
+/* from .../vnet/vnet/ip/lookup.c. Yuck */
+typedef CLIB_PACKED (struct
+		     {
+		     ip4_address_t address;
+u32 address_length: 6;
+u32 index:	     26;
+		     }) ip4_route_t;
+
+static void
+ip46_fib_stats_delay (stats_main_t * sm, u32 sec, u32 nsec)
+{
+  struct timespec _req, *req = &_req;
+  struct timespec _rem, *rem = &_rem;
+
+  req->tv_sec = sec;
+  req->tv_nsec = nsec;
+  while (1)
+    {
+      if (nanosleep (req, rem) == 0)
+	break;
+      *req = *rem;
+      if (errno == EINTR)
+	continue;
+      clib_unix_warning ("nanosleep");
+      break;
+    }
+}
+
+static void
+do_ip4_fibs (stats_main_t * sm)
+{
+  ip4_main_t *im4 = &ip4_main;
+  api_main_t *am = sm->api_main;
+  vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
+  unix_shared_memory_queue_t *q = shmem_hdr->vl_input_queue;
+  static ip4_route_t *routes;
+  ip4_route_t *r;
+  fib_table_t *fib;
+  ip_lookup_main_t *lm = &im4->lookup_main;
+  static uword *results;
+  vl_api_vnet_ip4_fib_counters_t *mp = 0;
+  u32 items_this_message;
+  vl_api_ip4_fib_counter_t *ctrp = 0;
+  u32 start_at_fib_index = 0;
+  int i;
+
+again:
+  /* *INDENT-OFF* */
+  pool_foreach (fib, im4->fibs,
+  ({
+    /* We may have bailed out due to control-plane activity */
+    while ((fib - im4->fibs) < start_at_fib_index)
+      continue;
+
+    if (mp == 0)
+      {
+	items_this_message = IP4_FIB_COUNTER_BATCH_SIZE;
+	mp = vl_msg_api_alloc_as_if_client
+	  (sizeof (*mp) +
+	   items_this_message * sizeof (vl_api_ip4_fib_counter_t));
+	mp->_vl_msg_id = ntohs (VL_API_VNET_IP4_FIB_COUNTERS);
+	mp->count = 0;
+	mp->vrf_id = ntohl (fib->ft_table_id);
+	ctrp = (vl_api_ip4_fib_counter_t *) mp->c;
+      }
+    else
+      {
+	/* happens if the last FIB was empty... */
+	ASSERT (mp->count == 0);
+	mp->vrf_id = ntohl (fib->ft_table_id);
+      }
+
+    dslock (sm, 0 /* release hint */ , 1 /* tag */ );
+
+    vec_reset_length (routes);
+    vec_reset_length (results);
+
+    for (i = 0; i < ARRAY_LEN (fib->v4.fib_entry_by_dst_address); i++)
+      {
+	uword *hash = fib->v4.fib_entry_by_dst_address[i];
+	hash_pair_t *p;
+	ip4_route_t x;
+
+	x.address_length = i;
+
+        hash_foreach_pair (p, hash,
+        ({
+          x.address.data_u32 = p->key;
+          if (lm->fib_result_n_words > 1)
+            {
+              x.index = vec_len (results);
+              vec_add (results, p->value, lm->fib_result_n_words);
+            }
+          else
+            x.index = p->value[0];
+
+          vec_add1 (routes, x);
+          if (sm->data_structure_lock->release_hint)
+            {
+              start_at_fib_index = fib - im4->fibs;
+              dsunlock (sm);
+              ip46_fib_stats_delay (sm, 0 /* sec */,
+                                    STATS_RELEASE_DELAY_NS);
+              mp->count = 0;
+              ctrp = (vl_api_ip4_fib_counter_t *)mp->c;
+              goto again;
+            }
+        }));
+      }
+
+    vec_foreach (r, routes)
+      {
+        vlib_counter_t c;
+
+        vlib_get_combined_counter (&load_balance_main.lbm_to_counters,
+                                   r->index, &c);
+        /*
+         * If it has actually
+         * seen at least one packet, send it.
+         */
+        if (c.packets > 0)
+          {
+
+            /* already in net byte order */
+            ctrp->address = r->address.as_u32;
+            ctrp->address_length = r->address_length;
+            ctrp->packets = clib_host_to_net_u64 (c.packets);
+            ctrp->bytes = clib_host_to_net_u64 (c.bytes);
+            mp->count++;
+            ctrp++;
+
+            if (mp->count == items_this_message)
+              {
+                mp->count = htonl (items_this_message);
+                /*
+                 * If the main thread's input queue is stuffed,
+                 * drop the data structure lock (which the main thread
+                 * may want), and take a pause.
+                 */
+                unix_shared_memory_queue_lock (q);
+                if (unix_shared_memory_queue_is_full (q))
+                  {
+                    dsunlock (sm);
+                    vl_msg_api_send_shmem_nolock (q, (u8 *) & mp);
+                    unix_shared_memory_queue_unlock (q);
+                    mp = 0;
+                    ip46_fib_stats_delay (sm, 0 /* sec */ ,
+                                          STATS_RELEASE_DELAY_NS);
+                    goto again;
+                  }
+                vl_msg_api_send_shmem_nolock (q, (u8 *) & mp);
+                unix_shared_memory_queue_unlock (q);
+
+                items_this_message = IP4_FIB_COUNTER_BATCH_SIZE;
+                mp = vl_msg_api_alloc_as_if_client
+                  (sizeof (*mp) +
+                   items_this_message * sizeof (vl_api_ip4_fib_counter_t));
+                mp->_vl_msg_id = ntohs (VL_API_VNET_IP4_FIB_COUNTERS);
+                mp->count = 0;
+                mp->vrf_id = ntohl (fib->ft_table_id);
+                ctrp = (vl_api_ip4_fib_counter_t *) mp->c;
+              }
+          }			/* for each (mp or single) adj */
+        if (sm->data_structure_lock->release_hint)
+          {
+            start_at_fib_index = fib - im4->fibs;
+            dsunlock (sm);
+            ip46_fib_stats_delay (sm, 0 /* sec */ , STATS_RELEASE_DELAY_NS);
+            mp->count = 0;
+            ctrp = (vl_api_ip4_fib_counter_t *) mp->c;
+            goto again;
+          }
+      }				/* vec_foreach (routes) */
+
+    dsunlock (sm);
+
+    /* Flush any data from this fib */
+    if (mp->count)
+      {
+	mp->count = htonl (mp->count);
+	vl_msg_api_send_shmem (q, (u8 *) & mp);
+	mp = 0;
+      }
+  }));
+  /* *INDENT-ON* */
+
+  /* If e.g. the last FIB had no reportable routes, free the buffer */
+  if (mp)
+    vl_msg_api_free (mp);
+}
+
+typedef struct
+{
+  ip6_address_t address;
+  u32 address_length;
+  u32 index;
+} ip6_route_t;
+
+typedef struct
+{
+  u32 fib_index;
+  ip6_route_t **routep;
+  stats_main_t *sm;
+} add_routes_in_fib_arg_t;
+
+static void
+add_routes_in_fib (BVT (clib_bihash_kv) * kvp, void *arg)
+{
+  add_routes_in_fib_arg_t *ap = arg;
+  stats_main_t *sm = ap->sm;
+
+  if (sm->data_structure_lock->release_hint)
+    clib_longjmp (&sm->jmp_buf, 1);
+
+  if (kvp->key[2] >> 32 == ap->fib_index)
+    {
+      ip6_address_t *addr;
+      ip6_route_t *r;
+      addr = (ip6_address_t *) kvp;
+      vec_add2 (*ap->routep, r, 1);
+      r->address = addr[0];
+      r->address_length = kvp->key[2] & 0xFF;
+      r->index = kvp->value;
+    }
+}
+
+static void
+do_ip6_fibs (stats_main_t * sm)
+{
+  ip6_main_t *im6 = &ip6_main;
+  api_main_t *am = sm->api_main;
+  vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
+  unix_shared_memory_queue_t *q = shmem_hdr->vl_input_queue;
+  static ip6_route_t *routes;
+  ip6_route_t *r;
+  fib_table_t *fib;
+  static uword *results;
+  vl_api_vnet_ip6_fib_counters_t *mp = 0;
+  u32 items_this_message;
+  vl_api_ip6_fib_counter_t *ctrp = 0;
+  u32 start_at_fib_index = 0;
+  BVT (clib_bihash) * h = &im6->ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash;
+  add_routes_in_fib_arg_t _a, *a = &_a;
+
+again:
+  /* *INDENT-OFF* */
+  pool_foreach (fib, im6->fibs,
+  ({
+    /* We may have bailed out due to control-plane activity */
+    while ((fib - im6->fibs) < start_at_fib_index)
+      continue;
+
+    if (mp == 0)
+      {
+	items_this_message = IP6_FIB_COUNTER_BATCH_SIZE;
+	mp = vl_msg_api_alloc_as_if_client
+	  (sizeof (*mp) +
+	   items_this_message * sizeof (vl_api_ip6_fib_counter_t));
+	mp->_vl_msg_id = ntohs (VL_API_VNET_IP6_FIB_COUNTERS);
+	mp->count = 0;
+	mp->vrf_id = ntohl (fib->ft_table_id);
+	ctrp = (vl_api_ip6_fib_counter_t *) mp->c;
+      }
+
+    dslock (sm, 0 /* release hint */ , 1 /* tag */ );
+
+    vec_reset_length (routes);
+    vec_reset_length (results);
+
+    a->fib_index = fib - im6->fibs;
+    a->routep = &routes;
+    a->sm = sm;
+
+    if (clib_setjmp (&sm->jmp_buf, 0) == 0)
+      {
+	start_at_fib_index = fib - im6->fibs;
+	BV (clib_bihash_foreach_key_value_pair) (h, add_routes_in_fib, a);
+      }
+    else
+      {
+	dsunlock (sm);
+	ip46_fib_stats_delay (sm, 0 /* sec */ ,
+			      STATS_RELEASE_DELAY_NS);
+	mp->count = 0;
+	ctrp = (vl_api_ip6_fib_counter_t *) mp->c;
+	goto again;
+      }
+
+    vec_foreach (r, routes)
+    {
+        vlib_counter_t c;
+
+        vlib_get_combined_counter (&load_balance_main.lbm_to_counters,
+                                   r->index, &c);
+        /*
+         * If it has actually
+         * seen at least one packet, send it.
+         */
+        if (c.packets > 0)
+          {
+            /* already in net byte order */
+            ctrp->address[0] = r->address.as_u64[0];
+            ctrp->address[1] = r->address.as_u64[1];
+            ctrp->address_length = (u8) r->address_length;
+            ctrp->packets = clib_host_to_net_u64 (c.packets);
+            ctrp->bytes = clib_host_to_net_u64 (c.bytes);
+            mp->count++;
+            ctrp++;
+
+            if (mp->count == items_this_message)
+              {
+                mp->count = htonl (items_this_message);
+                /*
+                 * If the main thread's input queue is stuffed,
+                 * drop the data structure lock (which the main thread
+                 * may want), and take a pause.
+                 */
+                unix_shared_memory_queue_lock (q);
+                if (unix_shared_memory_queue_is_full (q))
+                  {
+                    dsunlock (sm);
+                    vl_msg_api_send_shmem_nolock (q, (u8 *) & mp);
+                    unix_shared_memory_queue_unlock (q);
+                    mp = 0;
+                    ip46_fib_stats_delay (sm, 0 /* sec */ ,
+                                          STATS_RELEASE_DELAY_NS);
+                    goto again;
+                  }
+                vl_msg_api_send_shmem_nolock (q, (u8 *) & mp);
+                unix_shared_memory_queue_unlock (q);
+
+                items_this_message = IP6_FIB_COUNTER_BATCH_SIZE;
+                mp = vl_msg_api_alloc_as_if_client
+                  (sizeof (*mp) +
+                   items_this_message * sizeof (vl_api_ip6_fib_counter_t));
+                mp->_vl_msg_id = ntohs (VL_API_VNET_IP6_FIB_COUNTERS);
+                mp->count = 0;
+                mp->vrf_id = ntohl (fib->ft_table_id);
+                ctrp = (vl_api_ip6_fib_counter_t *) mp->c;
+              }
+          }
+
+        if (sm->data_structure_lock->release_hint)
+          {
+            start_at_fib_index = fib - im6->fibs;
+            dsunlock (sm);
+            ip46_fib_stats_delay (sm, 0 /* sec */ , STATS_RELEASE_DELAY_NS);
+            mp->count = 0;
+            ctrp = (vl_api_ip6_fib_counter_t *) mp->c;
+            goto again;
+          }
+    }				/* vec_foreach (routes) */
+
+    dsunlock (sm);
+
+    /* Flush any data from this fib */
+    if (mp->count)
+      {
+	mp->count = htonl (mp->count);
+	vl_msg_api_send_shmem (q, (u8 *) & mp);
+	mp = 0;
+      }
+  }));
+  /* *INDENT-ON* */
+
+  /* If e.g. the last FIB had no reportable routes, free the buffer */
+  if (mp)
+    vl_msg_api_free (mp);
+}
+
+static void
+stats_thread_fn (void *arg)
+{
+  stats_main_t *sm = &stats_main;
+  vlib_worker_thread_t *w = (vlib_worker_thread_t *) arg;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+
+  /* stats thread wants no signals. */
+  {
+    sigset_t s;
+    sigfillset (&s);
+    pthread_sigmask (SIG_SETMASK, &s, 0);
+  }
+
+  if (vec_len (tm->thread_prefix))
+    vlib_set_thread_name ((char *)
+			  format (0, "%v_stats%c", tm->thread_prefix, '\0'));
+
+  clib_mem_set_heap (w->thread_mheap);
+
+  while (1)
+    {
+      /* 10 second poll interval */
+      ip46_fib_stats_delay (sm, 10 /* secs */ , 0 /* nsec */ );
+
+      if (!(sm->enable_poller))
+	continue;
+      do_simple_interface_counters (sm);
+      do_combined_interface_counters (sm);
+      do_ip4_fibs (sm);
+      do_ip6_fibs (sm);
+    }
+}
+
+static void
+vl_api_vnet_interface_counters_t_handler (vl_api_vnet_interface_counters_t *
+					  mp)
+{
+  vpe_client_registration_t *reg;
+  stats_main_t *sm = &stats_main;
+  unix_shared_memory_queue_t *q, *q_prev = NULL;
+  vl_api_vnet_interface_counters_t *mp_copy = NULL;
+  u32 mp_size;
+
+#if STATS_DEBUG > 0
+  char *counter_name;
+  u32 count, sw_if_index;
+  int i;
+#endif
+
+  mp_size = sizeof (*mp) + (ntohl (mp->count) *
+			    (mp->is_combined ? sizeof (vlib_counter_t) :
+			     sizeof (u64)));
+
+  /* *INDENT-OFF* */
+  pool_foreach(reg, sm->stats_registrations,
+  ({
+    q = vl_api_client_index_to_input_queue (reg->client_index);
+    if (q)
+      {
+        if (q_prev && (q_prev->cursize < q_prev->maxsize))
+          {
+            mp_copy = vl_msg_api_alloc_as_if_client(mp_size);
+            clib_memcpy(mp_copy, mp, mp_size);
+            vl_msg_api_send_shmem (q_prev, (u8 *)&mp);
+            mp = mp_copy;
+          }
+        q_prev = q;
+      }
+  }));
+  /* *INDENT-ON* */
+
+#if STATS_DEBUG > 0
+  count = ntohl (mp->count);
+  sw_if_index = ntohl (mp->first_sw_if_index);
+  if (mp->is_combined == 0)
+    {
+      u64 *vp, v;
+      vp = (u64 *) mp->data;
+
+      switch (mp->vnet_counter_type)
+	{
+	case VNET_INTERFACE_COUNTER_DROP:
+	  counter_name = "drop";
+	  break;
+	case VNET_INTERFACE_COUNTER_PUNT:
+	  counter_name = "punt";
+	  break;
+	case VNET_INTERFACE_COUNTER_IP4:
+	  counter_name = "ip4";
+	  break;
+	case VNET_INTERFACE_COUNTER_IP6:
+	  counter_name = "ip6";
+	  break;
+	case VNET_INTERFACE_COUNTER_RX_NO_BUF:
+	  counter_name = "rx-no-buff";
+	  break;
+	case VNET_INTERFACE_COUNTER_RX_MISS:
+	  , counter_name = "rx-miss";
+	  break;
+	case VNET_INTERFACE_COUNTER_RX_ERROR:
+	  , counter_name = "rx-error (fifo-full)";
+	  break;
+	case VNET_INTERFACE_COUNTER_TX_ERROR:
+	  , counter_name = "tx-error (fifo-full)";
+	  break;
+	default:
+	  counter_name = "bogus";
+	  break;
+	}
+      for (i = 0; i < count; i++)
+	{
+	  v = clib_mem_unaligned (vp, u64);
+	  v = clib_net_to_host_u64 (v);
+	  vp++;
+	  fformat (stdout, "%U.%s %lld\n", format_vnet_sw_if_index_name,
+		   sm->vnet_main, sw_if_index, counter_name, v);
+	  sw_if_index++;
+	}
+    }
+  else
+    {
+      vlib_counter_t *vp;
+      u64 packets, bytes;
+      vp = (vlib_counter_t *) mp->data;
+
+      switch (mp->vnet_counter_type)
+	{
+	case VNET_INTERFACE_COUNTER_RX:
+	  counter_name = "rx";
+	  break;
+	case VNET_INTERFACE_COUNTER_TX:
+	  counter_name = "tx";
+	  break;
+	default:
+	  counter_name = "bogus";
+	  break;
+	}
+      for (i = 0; i < count; i++)
+	{
+	  packets = clib_mem_unaligned (&vp->packets, u64);
+	  packets = clib_net_to_host_u64 (packets);
+	  bytes = clib_mem_unaligned (&vp->bytes, u64);
+	  bytes = clib_net_to_host_u64 (bytes);
+	  vp++;
+	  fformat (stdout, "%U.%s.packets %lld\n",
+		   format_vnet_sw_if_index_name,
+		   sm->vnet_main, sw_if_index, counter_name, packets);
+	  fformat (stdout, "%U.%s.bytes %lld\n",
+		   format_vnet_sw_if_index_name,
+		   sm->vnet_main, sw_if_index, counter_name, bytes);
+	  sw_if_index++;
+	}
+    }
+#endif
+  if (q_prev && (q_prev->cursize < q_prev->maxsize))
+    {
+      vl_msg_api_send_shmem (q_prev, (u8 *) & mp);
+    }
+  else
+    {
+      vl_msg_api_free (mp);
+    }
+}
+
+static void
+vl_api_vnet_ip4_fib_counters_t_handler (vl_api_vnet_ip4_fib_counters_t * mp)
+{
+  vpe_client_registration_t *reg;
+  stats_main_t *sm = &stats_main;
+  unix_shared_memory_queue_t *q, *q_prev = NULL;
+  vl_api_vnet_ip4_fib_counters_t *mp_copy = NULL;
+  u32 mp_size;
+
+  mp_size = sizeof (*mp_copy) +
+    ntohl (mp->count) * sizeof (vl_api_ip4_fib_counter_t);
+
+  /* *INDENT-OFF* */
+  pool_foreach(reg, sm->stats_registrations,
+  ({
+    q = vl_api_client_index_to_input_queue (reg->client_index);
+    if (q)
+      {
+        if (q_prev && (q_prev->cursize < q_prev->maxsize))
+          {
+            mp_copy = vl_msg_api_alloc_as_if_client(mp_size);
+            clib_memcpy(mp_copy, mp, mp_size);
+            vl_msg_api_send_shmem (q_prev, (u8 *)&mp);
+            mp = mp_copy;
+          }
+        q_prev = q;
+      }
+  }));
+  /* *INDENT-ON* */
+  if (q_prev && (q_prev->cursize < q_prev->maxsize))
+    {
+      vl_msg_api_send_shmem (q_prev, (u8 *) & mp);
+    }
+  else
+    {
+      vl_msg_api_free (mp);
+    }
+}
+
+static void
+vl_api_vnet_ip6_fib_counters_t_handler (vl_api_vnet_ip6_fib_counters_t * mp)
+{
+  vpe_client_registration_t *reg;
+  stats_main_t *sm = &stats_main;
+  unix_shared_memory_queue_t *q, *q_prev = NULL;
+  vl_api_vnet_ip6_fib_counters_t *mp_copy = NULL;
+  u32 mp_size;
+
+  mp_size = sizeof (*mp_copy) +
+    ntohl (mp->count) * sizeof (vl_api_ip6_fib_counter_t);
+
+  /* *INDENT-OFF* */
+  pool_foreach(reg, sm->stats_registrations,
+  ({
+    q = vl_api_client_index_to_input_queue (reg->client_index);
+    if (q)
+      {
+        if (q_prev && (q_prev->cursize < q_prev->maxsize))
+          {
+            mp_copy = vl_msg_api_alloc_as_if_client(mp_size);
+            clib_memcpy(mp_copy, mp, mp_size);
+            vl_msg_api_send_shmem (q_prev, (u8 *)&mp);
+            mp = mp_copy;
+          }
+        q_prev = q;
+      }
+  }));
+  /* *INDENT-ON* */
+  if (q_prev && (q_prev->cursize < q_prev->maxsize))
+    {
+      vl_msg_api_send_shmem (q_prev, (u8 *) & mp);
+    }
+  else
+    {
+      vl_msg_api_free (mp);
+    }
+}
+
+static void
+vl_api_want_stats_reply_t_handler (vl_api_want_stats_reply_t * mp)
+{
+  clib_warning ("BUG");
+}
+
+static void
+vl_api_want_stats_t_handler (vl_api_want_stats_t * mp)
+{
+  stats_main_t *sm = &stats_main;
+  vpe_client_registration_t *rp;
+  vl_api_want_stats_reply_t *rmp;
+  uword *p;
+  i32 retval = 0;
+  unix_shared_memory_queue_t *q;
+
+  p = hash_get (sm->stats_registration_hash, mp->client_index);
+  if (p)
+    {
+      if (mp->enable_disable)
+	{
+	  clib_warning ("pid %d: already enabled...", mp->pid);
+	  retval = -2;
+	  goto reply;
+	}
+      else
+	{
+	  rp = pool_elt_at_index (sm->stats_registrations, p[0]);
+	  pool_put (sm->stats_registrations, rp);
+	  hash_unset (sm->stats_registration_hash, mp->client_index);
+	  goto reply;
+	}
+    }
+  if (mp->enable_disable == 0)
+    {
+      clib_warning ("pid %d: already disabled...", mp->pid);
+      retval = -3;
+      goto reply;
+    }
+  pool_get (sm->stats_registrations, rp);
+  rp->client_index = mp->client_index;
+  rp->client_pid = mp->pid;
+  hash_set (sm->stats_registration_hash, rp->client_index,
+	    rp - sm->stats_registrations);
+
+reply:
+  if (pool_elts (sm->stats_registrations))
+    sm->enable_poller = 1;
+  else
+    sm->enable_poller = 0;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+
+  if (!q)
+    return;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_WANT_STATS_REPLY);
+  rmp->context = mp->context;
+  rmp->retval = retval;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+int
+stats_memclnt_delete_callback (u32 client_index)
+{
+  vpe_client_registration_t *rp;
+  stats_main_t *sm = &stats_main;
+  uword *p;
+
+  p = hash_get (sm->stats_registration_hash, client_index);
+  if (p)
+    {
+      rp = pool_elt_at_index (sm->stats_registrations, p[0]);
+      pool_put (sm->stats_registrations, rp);
+      hash_unset (sm->stats_registration_hash, client_index);
+    }
+
+  return 0;
+}
+
+#define vl_api_vnet_ip4_fib_counters_t_endian vl_noop_handler
+#define vl_api_vnet_ip4_fib_counters_t_print vl_noop_handler
+#define vl_api_vnet_ip6_fib_counters_t_endian vl_noop_handler
+#define vl_api_vnet_ip6_fib_counters_t_print vl_noop_handler
+
+static clib_error_t *
+stats_init (vlib_main_t * vm)
+{
+  stats_main_t *sm = &stats_main;
+  api_main_t *am = &api_main;
+  void *vlib_worker_thread_bootstrap_fn (void *arg);
+
+  sm->vlib_main = vm;
+  sm->vnet_main = vnet_get_main ();
+  sm->interface_main = &vnet_get_main ()->interface_main;
+  sm->api_main = am;
+  sm->stats_poll_interval_in_seconds = 10;
+  sm->data_structure_lock =
+    clib_mem_alloc_aligned (sizeof (data_structure_lock_t),
+			    CLIB_CACHE_LINE_BYTES);
+  memset (sm->data_structure_lock, 0, sizeof (*sm->data_structure_lock));
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 0 /* do NOT trace! */);
+  foreach_stats_msg;
+#undef _
+
+  /* tell the msg infra not to free these messages... */
+  am->message_bounce[VL_API_VNET_INTERFACE_COUNTERS] = 1;
+  am->message_bounce[VL_API_VNET_IP4_FIB_COUNTERS] = 1;
+  am->message_bounce[VL_API_VNET_IP6_FIB_COUNTERS] = 1;
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (stats_init);
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_THREAD (stats_thread_reg, static) = {
+  .name = "stats",
+  .function = stats_thread_fn,
+  .fixed_count = 1,
+  .count = 1,
+  .no_data_structure_clone = 1,
+  .use_pthreads = 1,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/stats/stats.h b/src/vpp/stats/stats.h
new file mode 100644
index 00000000..118115be
--- /dev/null
+++ b/src/vpp/stats/stats.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_stats_h__
+#define __included_stats_h__
+
+#include <time.h>
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/interface.h>
+#include <pthread.h>
+#include <vlib/threads.h>
+#include <vlib/unix/unix.h>
+#include <vlibmemory/api.h>
+#include <vlibmemory/unix_shared_memory_queue.h>
+#include <vlibapi/api_helper_macros.h>
+
+typedef struct
+{
+  volatile u32 lock;
+  volatile u32 release_hint;
+  u32 thread_id;
+  u32 count;
+  int tag;
+} data_structure_lock_t;
+
+typedef struct
+{
+  void *mheap;
+  pthread_t thread_self;
+  pthread_t thread_handle;
+
+  u32 stats_poll_interval_in_seconds;
+  u32 enable_poller;
+
+  uword *stats_registration_hash;
+  vpe_client_registration_t *stats_registrations;
+
+  /* control-plane data structure lock */
+  data_structure_lock_t *data_structure_lock;
+
+  /* bail out of FIB walk if set */
+  clib_longjmp_t jmp_buf;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+  vnet_interface_main_t *interface_main;
+  api_main_t *api_main;
+} stats_main_t;
+
+stats_main_t stats_main;
+
+void dslock (stats_main_t * sm, int release_hint, int tag);
+void dsunlock (stats_main_t * sm);
+
+#endif /* __included_stats_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c
new file mode 100644
index 00000000..e4695e1e
--- /dev/null
+++ b/src/vpp/vnet/main.c
@@ -0,0 +1,415 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vppinfra/cpu.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vnet/plugin/plugin.h>
+#include <vnet/ethernet/ethernet.h>
+
+#include <vpp/api/vpe_msg_enum.h>
+
+#if DPDK
+#include <vnet/devices/dpdk/dpdk.h>
+
+/*
+ * Called by the dpdk driver's rte_delay_us() function.
+ * Return 0 to have the dpdk do a regular delay loop.
+ * Return 1 if to skip the delay loop because we are suspending
+ * the calling vlib process instead.
+ */
+int
+rte_delay_us_override (unsigned us)
+{
+  vlib_main_t *vm;
+
+  /* Don't bother intercepting for short delays */
+  if (us < 10)
+    return 0;
+
+  /*
+   * Only intercept if we are in a vlib process.
+   * If we are called from a vlib worker thread or the vlib main
+   * thread then do not intercept. (Must not be called from an
+   * independent pthread).
+   */
+  if (os_get_cpu_number () == 0)
+    {
+      /*
+       * We're in the vlib main thread or a vlib process. Make sure
+       * the process is running and we're not still initializing.
+       */
+      vm = vlib_get_main ();
+      if (vlib_in_process_context (vm))
+	{
+	  /* Only suspend for the admin_down_process */
+	  vlib_process_t *proc = vlib_get_current_process (vm);
+	  if (!(proc->flags & VLIB_PROCESS_IS_RUNNING) ||
+	      (proc->node_runtime.function != admin_up_down_process))
+	    return 0;
+
+	  f64 delay = 1e-6 * us;
+	  vlib_process_suspend (vm, delay);
+	  return 1;
+	}
+    }
+  return 0;			// no override
+}
+
+#if RTE_VERSION >= RTE_VERSION_NUM(16, 11, 0, 0)
+static void
+rte_delay_us_override_cb (unsigned us)
+{
+  if (rte_delay_us_override (us) == 0)
+    rte_delay_us_block (us);
+}
+#endif
+#endif
+
+static void
+vpe_main_init (vlib_main_t * vm)
+{
+  if (CLIB_DEBUG > 0)
+    vlib_unix_cli_set_prompt ("DBGvpp# ");
+  else
+    vlib_unix_cli_set_prompt ("vpp# ");
+
+  /* Turn off network stack components which we don't want */
+  vlib_mark_init_function_complete (vm, srp_init);
+
+#if DPDK
+#if RTE_VERSION >= RTE_VERSION_NUM(16, 11, 0, 0)
+  /* register custom delay function */
+  rte_delay_us_callback_register (rte_delay_us_override_cb);
+#endif
+#endif
+}
+
+/*
+ * Load plugins from /usr/lib/vpp_plugins by default
+ */
+char *vlib_plugin_path = "/usr/lib/vpp_plugins";
+
+void *
+vnet_get_handoff_structure (void)
+{
+  static vnet_plugin_handoff_t _rv, *rv = &_rv;
+
+  rv->vnet_main = vnet_get_main ();
+  rv->ethernet_main = &ethernet_main;
+  return (void *) rv;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int i;
+  vlib_main_t *vm = &vlib_global_main;
+  void vl_msg_api_set_first_available_msg_id (u16);
+  uword main_heap_size = (1ULL << 30);
+  u8 *sizep;
+  u32 size;
+  void vlib_set_get_handoff_structure_cb (void *cb);
+
+#if __x86_64__
+  CLIB_UNUSED (const char *msg)
+    = "ERROR: This binary requires CPU with %s extensions.\n";
+#define _(a,b)                                  \
+    if (!clib_cpu_supports_ ## a ())            \
+      {                                         \
+	fprintf(stderr, msg, b);                \
+	exit(1);                                \
+      }
+
+#if __AVX2__
+  _(avx2, "AVX2")
+#endif
+#if __AVX__
+    _(avx, "AVX")
+#endif
+#if __SSE4_2__
+    _(sse42, "SSE4.2")
+#endif
+#if __SSE4_1__
+    _(sse41, "SSE4.1")
+#endif
+#if __SSSE3__
+    _(ssse3, "SSSE3")
+#endif
+#if __SSE3__
+    _(sse3, "SSE3")
+#endif
+#undef _
+#endif
+    /*
+     * Load startup config from file.
+     * usage: vpp -c /etc/vpp/startup.conf
+     */
+    if ((argc == 3) && !strncmp (argv[1], "-c", 2))
+    {
+      FILE *fp;
+      char inbuf[4096];
+      int argc_ = 1;
+      char **argv_ = NULL;
+      char *arg = NULL;
+      char *p;
+
+      fp = fopen (argv[2], "r");
+      if (fp == NULL)
+	{
+	  fprintf (stderr, "open configuration file '%s' failed\n", argv[2]);
+	  return 1;
+	}
+      argv_ = calloc (1, sizeof (char *));
+      if (argv_ == NULL)
+	return 1;
+      arg = strndup (argv[0], 1024);
+      if (arg == NULL)
+	return 1;
+      argv_[0] = arg;
+
+      while (1)
+	{
+	  if (fgets (inbuf, 4096, fp) == 0)
+	    break;
+	  p = strtok (inbuf, " \t\n");
+	  while (p != NULL)
+	    {
+	      if (*p == '#')
+		break;
+	      argc_++;
+	      char **tmp = realloc (argv_, argc_ * sizeof (char *));
+	      if (tmp == NULL)
+		return 1;
+	      argv_ = tmp;
+	      arg = strndup (p, 1024);
+	      if (arg == NULL)
+		return 1;
+	      argv_[argc_ - 1] = arg;
+	      p = strtok (NULL, " \t\n");
+	    }
+	}
+
+      fclose (fp);
+
+      char **tmp = realloc (argv_, (argc_ + 1) * sizeof (char *));
+      if (tmp == NULL)
+	return 1;
+      argv_ = tmp;
+      argv_[argc_] = NULL;
+
+      argc = argc_;
+      argv = argv_;
+    }
+
+  /*
+   * Look for and parse the "heapsize" config parameter.
+   * Manual since none of the clib infra has been bootstrapped yet.
+   *
+   * Format: heapsize <nn>[mM][gG]
+   */
+
+  for (i = 1; i < (argc - 1); i++)
+    {
+      if (!strncmp (argv[i], "plugin_path", 11))
+	{
+	  if (i < (argc - 1))
+	    vlib_plugin_path = argv[++i];
+	}
+      else if (!strncmp (argv[i], "heapsize", 8))
+	{
+	  sizep = (u8 *) argv[i + 1];
+	  size = 0;
+	  while (*sizep >= '0' && *sizep <= '9')
+	    {
+	      size *= 10;
+	      size += *sizep++ - '0';
+	    }
+	  if (size == 0)
+	    {
+	      fprintf
+		(stderr,
+		 "warning: heapsize parse error '%s', use default %lld\n",
+		 argv[i], (long long int) main_heap_size);
+	      goto defaulted;
+	    }
+
+	  main_heap_size = size;
+
+	  if (*sizep == 'g' || *sizep == 'G')
+	    main_heap_size <<= 30;
+	  else if (*sizep == 'm' || *sizep == 'M')
+	    main_heap_size <<= 20;
+	}
+    }
+
+defaulted:
+
+  /* Set up the plugin message ID allocator right now... */
+  vl_msg_api_set_first_available_msg_id (VL_MSG_FIRST_AVAILABLE);
+
+  /* Allocate main heap */
+  if (clib_mem_init (0, main_heap_size))
+    {
+      vm->init_functions_called = hash_create (0, /* value bytes */ 0);
+      vpe_main_init (vm);
+#if DPDK == 0
+      unix_physmem_init (vm, 0 /* fail_if_physical_memory_not_present */ );
+#endif
+      vlib_set_get_handoff_structure_cb (&vnet_get_handoff_structure);
+      return vlib_unix_main (argc, argv);
+    }
+  else
+    {
+      {
+	int rv __attribute__ ((unused)) =
+	  write (2, "Main heap allocation failure!\r\n", 31);
+      }
+      return 1;
+    }
+}
+
+static clib_error_t *
+heapsize_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  u32 junk;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%dm", &junk)
+	  || unformat (input, "%dM", &junk)
+	  || unformat (input, "%dg", &junk) || unformat (input, "%dG", &junk))
+	return 0;
+      else
+	return clib_error_return (0, "unknown input '%U'",
+				  format_unformat_error, input);
+    }
+  return 0;
+}
+
+VLIB_CONFIG_FUNCTION (heapsize_config, "heapsize");
+
+static clib_error_t *
+plugin_path_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  u8 *junk;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "%s", &junk))
+	{
+	  vec_free (junk);
+	  return 0;
+	}
+      else
+	return clib_error_return (0, "unknown input '%U'",
+				  format_unformat_error, input);
+    }
+  return 0;
+}
+
+VLIB_CONFIG_FUNCTION (plugin_path_config, "plugin_path");
+
+void vl_msg_api_post_mortem_dump (void);
+
+void
+os_panic (void)
+{
+  vl_msg_api_post_mortem_dump ();
+  abort ();
+}
+
+void vhost_user_unmap_all (void) __attribute__ ((weak));
+void
+vhost_user_unmap_all (void)
+{
+}
+
+void
+os_exit (int code)
+{
+  static int recursion_block;
+
+  if (code)
+    {
+      if (recursion_block)
+	abort ();
+
+      recursion_block = 1;
+
+      vl_msg_api_post_mortem_dump ();
+      vhost_user_unmap_all ();
+      abort ();
+    }
+  exit (code);
+}
+
+void
+vl_msg_api_barrier_sync (void)
+{
+  vlib_worker_thread_barrier_sync (vlib_get_main ());
+}
+
+void
+vl_msg_api_barrier_release (void)
+{
+  vlib_worker_thread_barrier_release (vlib_get_main ());
+}
+
+/* This application needs 1 thread stack for the stats pthread */
+u32
+vlib_app_num_thread_stacks_needed (void)
+{
+  return 1;
+}
+
+/*
+ * Depending on the configuration selected above,
+ * it may be necessary to generate stub graph nodes.
+ * It is never OK to ignore "node 'x' refers to unknown node 'y'
+ * messages!
+ */
+
+#if CLIB_DEBUG > 0
+
+static clib_error_t *
+test_crash_command_fn (vlib_main_t * vm,
+		       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  u64 *p = (u64 *) 0xdefec8ed;
+
+  *p = 0xdeadbeef;
+
+  /* Not so much... */
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (test_crash_command, static) = {
+  .path = "test crash",
+  .short_help = "crash the bus!",
+  .function = test_crash_command_fn,
+};
+/* *INDENT-ON* */
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppapigen.am b/src/vppapigen.am
new file mode 100644
index 00000000..083ee537
--- /dev/null
+++ b/src/vppapigen.am
@@ -0,0 +1,27 @@
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bin_PROGRAMS += vppapigen
+
+BUILT_SOURCES += tools/vppapigen/gram.h
+
+tools/vppapigen/gram.h: tools/vppapigen/gram.y
+	$(YACC) -d @srcdir@/tools/vppapigen/gram.y
+	mv y.tab.h tools/vppapigen/gram.h
+	rm y.tab.c
+
+vppapigen_SOURCES = tools/vppapigen/gram.y tools/vppapigen/lex.c tools/vppapigen/node.c
+vppapigen_LDADD = libvppinfra.la
+vppapigen_LDFLAGS = -static
+
+# vi:syntax=automake
diff --git a/src/vppinfra.am b/src/vppinfra.am
new file mode 100644
index 00000000..836c7213
--- /dev/null
+++ b/src/vppinfra.am
@@ -0,0 +1,276 @@
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+libvppinfradir = ${libdir}
+
+if WITH_UNIX
+  libvppinfra_LTLIBRARIES = libvppinfra.la
+endif
+
+lib_LIBRARIES =
+
+TESTS =
+
+if ENABLE_TESTS
+TESTS  +=  test_bihash_template \
+	   test_dlist \
+	   test_elog \
+	   test_elf \
+	   test_fifo \
+	   test_format \
+	   test_hash \
+	   test_heap \
+	   test_longjmp \
+	   test_macros \
+	   test_md5 \
+	   test_mheap \
+	   test_pool_iterate \
+	   test_ptclosure \
+	   test_random \
+	   test_random_isaac \
+	   test_serialize \
+	   test_slist \
+	   test_socket \
+	   test_time \
+	   test_timing_wheel \
+	   test_vec \
+	   test_zvec 
+endif
+
+noinst_PROGRAMS = $(TESTS)
+check_PROGRAMS	= $(TESTS)
+
+test_bihash_template_SOURCES = vppinfra/test_bihash_template.c
+test_dlist_SOURCES = vppinfra/test_dlist.c
+test_elog_SOURCES = vppinfra/test_elog.c
+test_elf_SOURCES = vppinfra/test_elf.c
+test_fifo_SOURCES = vppinfra/test_fifo.c
+test_format_SOURCES = vppinfra/test_format.c
+test_hash_SOURCES = vppinfra/test_hash.c
+test_heap_SOURCES = vppinfra/test_heap.c
+test_longjmp_SOURCES = vppinfra/test_longjmp.c
+test_macros_SOURCES = vppinfra/test_macros.c
+test_md5_SOURCES = vppinfra/test_md5.c
+test_mheap_SOURCES = vppinfra/test_mheap.c
+test_pool_iterate_SOURCES = vppinfra/test_pool_iterate.c
+test_ptclosure_SOURCES = vppinfra/test_ptclosure.c
+test_random_SOURCES = vppinfra/test_random.c
+test_random_isaac_SOURCES = vppinfra/test_random_isaac.c
+test_serialize_SOURCES = vppinfra/test_serialize.c
+test_slist_SOURCES = vppinfra/test_slist.c
+test_socket_SOURCES = vppinfra/test_socket.c
+test_time_SOURCES = vppinfra/test_time.c
+test_timing_wheel_SOURCES = vppinfra/test_timing_wheel.c
+test_vec_SOURCES = vppinfra/test_vec.c
+test_zvec_SOURCES = vppinfra/test_zvec.c
+
+# All unit tests use ASSERT for failure
+# So we'll need -DDEBUG to enable ASSERTs
+test_bihash_template_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_dlist_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_elog_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_elf_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_fifo_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_format_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_hash_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_heap_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_longjmp_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_macros_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_md5_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_mheap_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_pool_iterate_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_ptclosure_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_random_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+test_random_isaac_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+test_socket_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_serialize_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+test_slist_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+test_time_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_timing_wheel_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+test_vec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_zvec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+
+test_bihash_template_LDADD =	libvppinfra.la
+test_dlist_LDADD =	libvppinfra.la
+test_elog_LDADD =	libvppinfra.la
+test_elf_LDADD =	libvppinfra.la
+test_fifo_LDADD =	libvppinfra.la
+test_format_LDADD =	libvppinfra.la
+test_hash_LDADD =	libvppinfra.la
+test_heap_LDADD =	libvppinfra.la
+test_longjmp_LDADD =	libvppinfra.la
+test_macros_LDADD =	libvppinfra.la
+test_md5_LDADD =	libvppinfra.la
+test_mheap_LDADD =	libvppinfra.la
+test_pool_iterate_LDADD =	libvppinfra.la
+test_ptclosure_LDADD =	libvppinfra.la
+test_random_LDADD =	libvppinfra.la
+test_random_isaac_LDADD =	libvppinfra.la
+test_serialize_LDADD =	libvppinfra.la
+test_slist_LDADD =	libvppinfra.la
+test_socket_LDADD =	libvppinfra.la
+test_time_LDADD =	libvppinfra.la -lm
+test_timing_wheel_LDADD =	libvppinfra.la -lm
+test_vec_LDADD =	libvppinfra.la
+test_zvec_LDADD =	libvppinfra.la
+
+test_bihash_template_LDFLAGS = -static
+test_dlist_LDFLAGS = -static
+test_elog_LDFLAGS = -static
+test_elf_LDFLAGS = -static
+test_fifo_LDFLAGS = -static
+test_format_LDFLAGS = -static
+test_hash_LDFLAGS = -static
+test_heap_LDFLAGS = -static
+test_longjmp_LDFLAGS = -static
+test_macros_LDFLAGS = -static
+test_md5_LDFLAGS = -static
+test_mheap_LDFLAGS = -static
+test_pool_iterate_LDFLAGS = -static
+test_ptclosure_LDFLAGS = -static
+test_random_LDFLAGS = -static
+test_random_isaac_LDFLAGS = -static
+test_serialize_LDFLAGS = -static
+test_slist_LDFLAGS = -static
+test_socket_LDFLAGS = -static
+test_time_LDFLAGS = -static
+test_timing_wheel_LDFLAGS = -static
+test_vec_LDFLAGS = -static
+test_zvec_LDFLAGS = -static
+
+# noinst_PROGRAMS += test_vhash
+# test_vhash_SOURCES = vppinfra/test_vhash.c vppinfra/vhash.c
+# test_vhash_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+# test_vhash_LDADD = libvppinfra.la
+# test_vhash_LDFLAGS = -static
+
+nobase_include_HEADERS = \
+  vppinfra/asm_mips.h \
+  vppinfra/asm_x86.h \
+  vppinfra/bihash_8_8.h \
+  vppinfra/bihash_24_8.h \
+  vppinfra/bihash_template.h \
+  vppinfra/bihash_template.c \
+  vppinfra/bitmap.h \
+  vppinfra/bitops.h \
+  vppinfra/byte_order.h \
+  vppinfra/cache.h \
+  vppinfra/clib.h \
+  vppinfra/cpu.h \
+  vppinfra/dlist.h \
+  vppinfra/elf.h \
+  vppinfra/elf_clib.h \
+  vppinfra/elog.h \
+  vppinfra/fheap.h \
+  vppinfra/error.h \
+  vppinfra/error_bootstrap.h \
+  vppinfra/fifo.h \
+  vppinfra/format.h \
+  vppinfra/graph.h \
+  vppinfra/hash.h \
+  vppinfra/heap.h \
+  vppinfra/longjmp.h \
+  vppinfra/macros.h \
+  vppinfra/math.h \
+  vppinfra/md5.h \
+  vppinfra/mem.h \
+  vppinfra/memcpy_sse3.h \
+  vppinfra/memcpy_avx.h \
+  vppinfra/mhash.h \
+  vppinfra/mheap.h \
+  vppinfra/mheap_bootstrap.h \
+  vppinfra/os.h \
+  vppinfra/pipeline.h \
+  vppinfra/pool.h \
+  vppinfra/ptclosure.h \
+  vppinfra/random.h \
+  vppinfra/random_buffer.h \
+  vppinfra/random_isaac.h \
+  vppinfra/serialize.h \
+  vppinfra/slist.h \
+  vppinfra/smp.h \
+  vppinfra/socket.h \
+  vppinfra/sparse_vec.h \
+  vppinfra/string.h \
+  vppinfra/time.h \
+  vppinfra/timing_wheel.h \
+  vppinfra/timer.h \
+  vppinfra/types.h \
+  vppinfra/unix.h \
+  vppinfra/vec.h \
+  vppinfra/vec_bootstrap.h \
+  vppinfra/vector.h \
+  vppinfra/vector_altivec.h \
+  vppinfra/vector_funcs.h \
+  vppinfra/vector_iwmmxt.h \
+  vppinfra/vector_neon.h \
+  vppinfra/vector_sse2.h \
+  vppinfra/valgrind.h \
+  vppinfra/vm_unix.h \
+  vppinfra/xxhash.h \
+  vppinfra/xy.h \
+  vppinfra/zvec.h
+
+CLIB_CORE = \
+  vppinfra/asm_x86.c \
+  vppinfra/backtrace.c \
+  vppinfra/bihash_8_8.h \
+  vppinfra/bihash_24_8.h \
+  vppinfra/bihash_template.h \
+  vppinfra/cpu.c \
+  vppinfra/elf.c \
+  vppinfra/elog.c \
+  vppinfra/error.c \
+  vppinfra/fifo.c \
+  vppinfra/fheap.c \
+  vppinfra/format.c \
+  vppinfra/graph.c \
+  vppinfra/hash.c \
+  vppinfra/heap.c \
+  vppinfra/longjmp.S \
+  vppinfra/macros.c \
+  vppinfra/mhash.c \
+  vppinfra/mheap.c \
+  vppinfra/md5.c \
+  vppinfra/mem_mheap.c \
+  vppinfra/ptclosure.c \
+  vppinfra/random.c \
+  vppinfra/random_buffer.c \
+  vppinfra/random_isaac.c \
+  vppinfra/serialize.c \
+  vppinfra/slist.c \
+  vppinfra/std-formats.c \
+  vppinfra/string.c \
+  vppinfra/time.c \
+  vppinfra/timing_wheel.c \
+  vppinfra/unformat.c \
+  vppinfra/vec.c \
+  vppinfra/vector.c \
+  vppinfra/zvec.c
+
+# Core plus Unix additions
+libvppinfra_la_SOURCES =			\
+  $(CLIB_CORE)					\
+  vppinfra/elf_clib.c				\
+  vppinfra/socket.c				\
+  vppinfra/timer.c				\
+  vppinfra/unix-formats.c			\
+  vppinfra/unix-misc.c
+
+bin_PROGRAMS = elftool
+
+elftool_SOURCES = tools/elftool/elftool.c
+elftool_CPPFLAGS = $(AM_CPPFLAGS)
+elftool_LDADD = libvppinfra.la -lpthread -lrt -lm
+
+# vi:syntax=automake
diff --git a/src/vppinfra/README b/src/vppinfra/README
new file mode 100644
index 00000000..579696b6
--- /dev/null
+++ b/src/vppinfra/README
@@ -0,0 +1,43 @@
+Welcome to vppinfra a programming library of basic data structures.
+
+vec.c		dynamic vectors
+bitmap.h	dynamic bitmaps
+heap.c		allocation heap of objects (sub-objects have variable size)
+pool.h		allocation pool (like heap with size always 1)
+hash.c		dynamic hash tables
+mheap.c		memory allocator (a la dlmalloc)
+
+format.c	extendable printf-like thing built on top of vectors
+std-formats.c	formats for unix data structures, networking stuff, ...
+timer.c		arrange for functions to be called at given times.
+
+
+Build, Test, Install, Use...
+----------------------------
+    If this package came from the distribution tar ball, skip to the
+    Build Section.  If this was a gentoo ebuild, after emerge/ebuild,
+    skip to the Use Section; otherwise, start with Pre-Build.
+
+Pre-Build
+-----------
+    1) svn checkout svn://teaktechnologies.com/fn/trunk/clib clib
+    2) autoreconf [-v][-f][-i]	# regenerate configuration files
+
+Build
+-----
+    1) cd BUILD			#  which may be different than this SRC dir
+    2) ${SRC}/configure [--host=CHOST]
+    3) make
+
+Test
+----
+    If not cross-compiling (i.e. CBUILD == CHOST), use "make check" to
+    run the validation programs.
+
+Install
+-------
+    With the root effective user ID (i.e. su or sudo), run "make install".
+
+Use
+---
+    We need to reference man pages and theory of operation.
diff --git a/src/vppinfra/anneal.c b/src/vppinfra/anneal.c
new file mode 100644
index 00000000..35d10946
--- /dev/null
+++ b/src/vppinfra/anneal.c
@@ -0,0 +1,172 @@
+/*
+  Copyright (c) 2011 Cisco and/or its affiliates.
+
+  * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#include <vppinfra/anneal.h>
+
+/*
+ * Optimize an objective function by simulated annealing
+ *
+ * Here are a couple of short, easily-understood
+ * descriptions of simulated annealing:
+ *
+ * http://www.cs.sandia.gov/opt/survey/sa.html
+ * Numerical Recipes in C, 2nd ed., 444ff
+ *
+ * The description in the Wikipedia is not helpful.
+ *
+ * The algorithm tries to produce a decent answer to combinatorially
+ * explosive optimization problems by analogy to slow cooling
+ * of hot metal, aka annealing.
+ *
+ * There are (at least) three problem-dependent annealing parameters
+ * to consider:
+ *
+ * t0, the initial "temperature. Should be set so that the probability
+ * of accepting a transition to a higher cost configuration is
+ * initially about 0.8.
+ *
+ * ntemps, the number of temperatures to use. Each successive temperature
+ * is some fraction of the previous temperature.
+ *
+ * nmoves_per_temp, the number of configurations to try at each temperature
+ *
+ * It is a black art to set ntemps, nmoves_per_temp, and the rate
+ * at which the temperature drops. Go too fast with too few iterations,
+ * and the computation falls into a local minimum instead of the
+ * (desired) global minimum.
+ */
+
+void
+clib_anneal (clib_anneal_param_t * p)
+{
+  f64 t;
+  f64 cost, prev_cost, delta_cost, initial_cost, best_cost;
+  f64 random_accept, delta_cost_over_t;
+  f64 total_increase = 0.0, average_increase;
+  u32 i, j;
+  u32 number_of_increases = 0;
+  u32 accepted_this_temperature;
+  u32 best_saves_this_temperature;
+  int accept;
+
+  t = p->initial_temperature;
+  best_cost = initial_cost = prev_cost = p->anneal_metric (p->opaque);
+  p->anneal_save_best_configuration (p->opaque);
+
+  if (p->flags & CLIB_ANNEAL_VERBOSE)
+    fformat (stdout, "Initial cost %.2f\n", initial_cost);
+
+  for (i = 0; i < p->number_of_temperatures; i++)
+    {
+      accepted_this_temperature = 0;
+      best_saves_this_temperature = 0;
+
+      p->anneal_restore_best_configuration (p->opaque);
+      cost = best_cost;
+
+      for (j = 0; j < p->number_of_configurations_per_temperature; j++)
+	{
+	  p->anneal_new_configuration (p->opaque);
+	  cost = p->anneal_metric (p->opaque);
+
+	  delta_cost = cost - prev_cost;
+
+	  /* cost function looks better, accept this move */
+	  if (p->flags & CLIB_ANNEAL_MINIMIZE)
+	    accept = delta_cost < 0.0;
+	  else
+	    accept = delta_cost > 0.0;
+
+	  if (accept)
+	    {
+	      if (p->flags & CLIB_ANNEAL_MINIMIZE)
+		if (cost < best_cost)
+		  {
+		    if (p->flags & CLIB_ANNEAL_VERBOSE)
+		      fformat (stdout, "New best cost %.2f\n", cost);
+		    best_cost = cost;
+		    p->anneal_save_best_configuration (p->opaque);
+		    best_saves_this_temperature++;
+		  }
+
+	      accepted_this_temperature++;
+	      prev_cost = cost;
+	      continue;
+	    }
+
+	  /* cost function worse, keep stats to suggest t0 */
+	  total_increase += (p->flags & CLIB_ANNEAL_MINIMIZE) ?
+	    delta_cost : -delta_cost;
+
+	  number_of_increases++;
+
+	  /*
+	   * Accept a higher cost with Pr { e^(-(delta_cost / T)) },
+	   * equivalent to rnd[0,1] < e^(-(delta_cost / T))
+	   *
+	   * AKA, the Boltzmann factor.
+	   */
+	  random_accept = random_f64 (&p->random_seed);
+
+	  delta_cost_over_t = delta_cost / t;
+
+	  if (random_accept < exp (-delta_cost_over_t))
+	    {
+	      accepted_this_temperature++;
+	      prev_cost = cost;
+	      continue;
+	    }
+	  p->anneal_restore_previous_configuration (p->opaque);
+	}
+
+      if (p->flags & CLIB_ANNEAL_VERBOSE)
+	{
+	  fformat (stdout, "Temp %.2f, cost %.2f, accepted %d, bests %d\n", t,
+		   prev_cost, accepted_this_temperature,
+		   best_saves_this_temperature);
+	  fformat (stdout, "Improvement %.2f\n", initial_cost - prev_cost);
+	  fformat (stdout, "-------------\n");
+	}
+
+      t = t * p->temperature_step;
+    }
+
+  /*
+   * Empirically, one wants the probability of accepting a move
+   * at the initial temperature to be about 0.8.
+   */
+  average_increase = total_increase / (f64) number_of_increases;
+  p->suggested_initial_temperature = average_increase / 0.22;	/* 0.22 = -ln (0.8) */
+
+  p->final_temperature = t;
+  p->final_metric = p->anneal_metric (p->opaque);
+
+  if (p->flags & CLIB_ANNEAL_VERBOSE)
+    {
+      fformat (stdout, "Average cost increase from a bad move: %.2f\n",
+	       average_increase);
+      fformat (stdout, "Suggested t0 = %.2f\n",
+	       p->suggested_initial_temperature);
+    }
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/anneal.h b/src/vppinfra/anneal.h
new file mode 100644
index 00000000..148d38ba
--- /dev/null
+++ b/src/vppinfra/anneal.h
@@ -0,0 +1,89 @@
+/*
+  Copyright (c) 2011 Cisco and/or its affiliates.
+
+  * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#ifndef __included_anneal_h__
+#define __included_anneal_h__
+
+#include <vppinfra/clib.h>
+#include <vppinfra/format.h>
+#include <vppinfra/random.h>
+#include <math.h>
+
+typedef struct
+{
+  /* Initial temperature */
+  f64 initial_temperature;
+
+  /* Temperature fraction at each step, 0.95 is reasonable */
+  f64 temperature_step;
+
+  /* Number of temperatures used */
+  u32 number_of_temperatures;
+
+  /* Number of configurations tried at each temperature */
+  u32 number_of_configurations_per_temperature;
+
+  u32 flags;
+#define CLIB_ANNEAL_VERBOSE (1<<0)
+#define CLIB_ANNEAL_MINIMIZE (1<<1)	/* mutually exclusive */
+#define CLIB_ANNEAL_MAXIMIZE (1<<2)	/* mutually exclusive */
+
+  /* Random number seed, set to ensure repeatable results */
+  u32 random_seed;
+
+  /* Opaque data passed to callbacks */
+  void *opaque;
+
+  /* Final temperature (output) */
+  f64 final_temperature;
+
+  /* Final metric (output) */
+  f64 final_metric;
+
+  /* Suggested initial temperature (output) */
+  f64 suggested_initial_temperature;
+
+
+  /*--- Callbacks ---*/
+
+  /* objective function to minimize */
+    f64 (*anneal_metric) (void *opaque);
+
+  /* Generate a new configuration */
+  void (*anneal_new_configuration) (void *opaque);
+
+  /* Restore the previous configuration */
+  void (*anneal_restore_previous_configuration) (void *opaque);
+
+  /* Save best configuration found e.g at a certain temperature */
+  void (*anneal_save_best_configuration) (void *opaque);
+
+  /* restore best configuration found e.g at a certain temperature */
+  void (*anneal_restore_best_configuration) (void *opaque);
+
+} clib_anneal_param_t;
+
+void clib_anneal (clib_anneal_param_t * p);
+
+#endif /* __included_anneal_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/asm_mips.h b/src/vppinfra/asm_mips.h
new file mode 100644
index 00000000..7c9e6958
--- /dev/null
+++ b/src/vppinfra/asm_mips.h
@@ -0,0 +1,351 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2004 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_asm_mips_h
+#define included_asm_mips_h
+
+/* Encoding of MIPS instructions. */
+/* Encoding of opcode field (op). */
+#define mips_foreach_opcode						\
+  _(SPECIAL) _(REGIMM) _(j) _(jal) _(beq) _(bne) _(blez) _(bgtz)	\
+  _(addi) _(addiu) _(slti) _(sltiu) _(andi) _(ori) _(xori) _(lui)	\
+  _(COP0) _(COP1) _(COP2) _(COP1X) _(beql) _(bnel) _(blezl) _(bgtzl)	\
+  _(daddi) _(daddiu) _(ldl) _(ldr) _(SPECIAL2) _(jalx) _(MDMX) _(O37)	\
+  _(lb) _(lh) _(lwl) _(lw) _(lbu) _(lhu) _(lwr) _(lwu)			\
+  _(sb) _(sh) _(swl) _(sw) _(sdl) _(sdr) _(swr) _(cache)		\
+  _(ll) _(lwc1) _(lwc2) _(pref) _(lld) _(ldc1) _(ldc2) _(ld)		\
+  _(sc) _(swc1) _(swc2) _(o73)  _(scd) _(sdc1) _(sdc2) _(sd)
+
+/* Encoding of funct field. */
+#define mips_foreach_special_funct					\
+  _(sll) _(MOVCI) _(srl) _(sra) _(sllv) _(o05) _(srlv) _(srav)		\
+  _(jr) _(jalr) _(movz) _(movn) _(syscall) _(break) _(o16) _(sync)	\
+  _(mfhi) _(mthi) _(mflo) _(mtlo) _(dsllv) _(o25) _(dsrlv) _(dsrav)	\
+  _(mult) _(multu) _(div) _(divu) _(dmult) _(dmultu) _(ddiv) _(ddivu)	\
+  _(add) _(addu) _(sub) _(subu) _(and) _(or) _(xor) _(nor)		\
+  _(o50) _(o51) _(slt) _(sltu) _(dadd) _(daddu) _(dsub) _(dsubu)	\
+  _(tge) _(tgeu) _(tlt) _(tltu) _(teq) _(o65) _(tne) _(o67)		\
+  _(dsll) _(o71) _(dsrl) _(dsra) _(dsll32) _(o75) _(dsrl32) _(dsra32)
+
+/* SPECIAL2 encoding of funct field. */
+#define mips_foreach_special2_funct				\
+  _(madd) _(maddu) _(mul) _(o03) _(msub) _(msubu) _(o06) _(o07)	\
+  _(o10) _(o11) _(o12) _(o13) _(o14) _(o15) _(o16) _(o17)	\
+  _(o20) _(o21) _(o22) _(o23) _(o24) _(o25) _(o26) _(o27)	\
+  _(o30) _(o31) _(o32) _(o33) _(o34) _(o35) _(o36) _(o37)	\
+  _(clz) _(clo) _(o42) _(o43) _(dclz) _(dclo) _(o46) _(o47)	\
+  _(o50) _(o51) _(o52) _(o53) _(o54) _(o55) _(o56) _(o57)	\
+  _(o60) _(o61) _(o62) _(o63) _(o64) _(o65) _(o66) _(o67)	\
+  _(o70) _(o71) _(o72) _(o73) _(o74) _(o75) _(o76) _(sdbbp)
+
+/* REGIMM encoding of rt field. */
+#define mips_foreach_regimm_rt						\
+  _(bltz) _(bgez) _(bltzl) _(bgezl) _(o04) _(o05) _(o06) _(o07)		\
+  _(tgei) _(tgeiu) _(tltiu) _(teqi) _(o14) _(tnei) _(o16) _(o17)	\
+  _(bltzal) _(bgezal) _(bltzall) _(bgezall) _(o24) _(o25) _(o26) _(o27)	\
+  _(o30) _(o31) _(o32) _(o33) _(o34) _(o35) _(o36) _(o37)
+
+/* COP0 encoding of rs field. */
+#define mips_foreach_cop0_rs					\
+  _(mfc0) _(dmfc0) _(o02) _(o03) _(mtc0) _(dmtc0) _(o06) _(o07)	\
+  _(o10) _(o11) _(o12) _(o13) _(o14) _(o15) _(o16) _(o17)	\
+  _(C0) _(o21) _(o22) _(o23) _(o24) _(o25) _(o26) _(o27)	\
+  _(o30) _(o31) _(o32) _(o33) _(o34) _(o35) _(o36) _(o37)
+
+/* COP0 encoding of funct when rs == RS_CO */
+#define mips_foreach_cop0_funct					\
+  _(o00) _(tlbr) _(tlbwi) _(o03) _(o04) _(o05) _(tlbwr) _(o07)	\
+  _(tlbp) _(o11) _(o12) _(o13) _(o14) _(o15) _(o16) _(o17)	\
+  _(o20) _(o21) _(o22) _(o23) _(o24) _(o25) _(o26) _(o27)	\
+  _(eret) _(o31) _(o32) _(o33) _(o34) _(o35) _(o36) _(deret)	\
+  _(wait) _(o41) _(o42) _(o43) _(o44) _(o45) _(o46) _(o47)	\
+  _(o50) _(o51) _(o52) _(o53) _(o54) _(o55) _(o56) _(o57)	\
+  _(o60) _(o61) _(o62) _(o63) _(o64) _(o65) _(o66) _(o67)	\
+  _(o70) _(o71) _(o72) _(o73) _(o74) _(o75) _(o76) _(o77)
+
+/* COP1 encoding of rs field. */
+#define mips_foreach_cop1_rs						\
+  _(mfc1) _(dmfc1) _(cfc1) _(o03) _(mtc1) _(dmtc1) _(ctc1) _(o07)	\
+  _(BC1) _(o11) _(o12) _(o13) _(o14) _(o15) _(o16) _(o17)		\
+  _(S) _(D) _(o22) _(o23) _(W) _(L) _(o26) _(o27)			\
+  _(o30) _(o31) _(o32) _(o33) _(o34) _(o35) _(o36) _(o37)
+
+/* COP1 encoding of funct for S and D */
+#define mips_foreach_cop1_funct								\
+  _(add) _(sub) _(mul) _(div) _(sqrt) _(abs) _(mov) _(neg)				\
+  _(roundl) _(truncl) _(ceill) _(floorl) _(roundw) _(truncw) _(ceilw) _(floorw) 	\
+  _(o20) _(MOVCF) _(movz) _(movn) _(o24) _(recip) _(rsqrt) _(o27)			\
+  _(o30) _(o31) _(o32) _(o33) _(o34) _(o35) _(o36) _(o37)				\
+  _(cvts) _(cvtd) _(o42) _(o43) _(cvtw) _(cvtl) _(o46) _(o47)				\
+  _(o50) _(o51) _(o52) _(o53) _(o54) _(o55) _(o56) _(o57)				\
+  _(cf) _(cun) _(ceq) _(cueq) _(colt) _(cult) _(cole) _(cule)				\
+  _(csf) _(cngle) _(cseq) _(cngl) _(clt) _(cnge) _(cle) _(cngt)
+
+/* COP1X encoding of funct */
+#define mips_foreach_cop1x_funct					\
+  _(lwxc1) _(ldxc1) _(o02) _(o03) _(o04) _(luxc1) _(o06) _(o07)		\
+  _(swxc1) _(sdxc1) _(o12) _(o13) _(o14) _(suxc1) _(o16) _(prefx)	\
+  _(o20) _(o21) _(o22) _(o23) _(o24) _(o25) _(o26) _(o27)		\
+  _(o30) _(o31) _(o32) _(o33) _(o34) _(o35) _(o36) _(o37)		\
+  _(madds) _(maddd) _(o42) _(o43) _(o44) _(o45) _(o46) _(o47)		\
+  _(msubs) _(msubd) _(o52) _(o53) _(o54) _(o55) _(o56) _(o57)		\
+  _(nmadds) _(nmaddd) _(o62) _(o63) _(o64) _(o65) _(o66) _(o67)		\
+  _(nmsubs) _(nmsubd) _(o72) _(o73) _(o74) _(o75) _(o76) _(o77)
+
+#define mips_foreach_mdmx_funct						\
+  _(msgn) _(ceq) _(pickf) _(pickt) _(clt) _(cle) _(min) _(max)		\
+  _(o10) _(o11) _(sub) _(add) _(and) _(xor) _(or) _(nor)		\
+  _(sll) _(o21) _(srl) _(sra) _(o24) _(o25) _(o26) _(o27)		\
+  _(alniob) _(alnvob) _(alniqh) _(alnvqh) _(o34) _(o35) _(o36) _(shfl)	\
+  _(rzu) _(rnau) _(rneu) _(o43) _(rzs) _(rnas) _(rnes) _(o47)		\
+  _(o50) _(o51) _(o52) _(o53) _(o54) _(o55) _(o56) _(o57)		\
+  _(mul) _(o61) _(muls) _(mula) _(o64) _(o65) _(suba) _(adda)		\
+  _(o70) _(o71) _(o72) _(o73) _(o74) _(o75) _(wac) _(rac)
+
+#define _(f) MIPS_OPCODE_##f,
+typedef enum
+{
+  mips_foreach_opcode
+} mips_insn_opcode_t;
+#undef _
+
+#define _(f) MIPS_SPECIAL_FUNCT_##f,
+typedef enum
+{
+  mips_foreach_special_funct
+} mips_insn_special_funct_t;
+#undef _
+
+#define _(f) MIPS_SPECIAL2_FUNCT_##f,
+typedef enum
+{
+  mips_foreach_special2_funct
+} mips_insn_special2_funct_t;
+#undef _
+
+#define _(f) MIPS_REGIMM_RT_##f,
+typedef enum
+{
+  mips_foreach_regimm_rt
+} mips_insn_regimm_rt_t;
+#undef _
+
+#define _(f) MIPS_COP0_RS_##f,
+typedef enum
+{
+  mips_foreach_cop0_rs
+} mips_insn_cop0_rs_t;
+#undef _
+
+#define _(f) MIPS_COP0_FUNCT_##f,
+typedef enum
+{
+  mips_foreach_cop0_funct
+} mips_insn_cop0_funct_t;
+#undef _
+
+#define _(f) MIPS_COP1_RS_##f,
+typedef enum
+{
+  mips_foreach_cop1_rs
+} mips_insn_cop1_rs_t;
+#undef _
+
+#define _(f) MIPS_COP1_FUNCT_##f,
+typedef enum
+{
+  mips_foreach_cop1_funct
+} mips_insn_cop1_funct_t;
+#undef _
+
+#define _(f) MIPS_COP1X_FUNCT_##f,
+typedef enum
+{
+  mips_foreach_cop1x_funct
+} mips_insn_cop1x_funct_t;
+#undef _
+
+#define _(f) MIPS_MDMX_FUNCT_##f,
+typedef enum
+{
+  mips_foreach_mdmx_funct
+} mips_insn_mdmx_funct_t;
+#undef _
+
+always_inline mips_insn_opcode_t
+mips_insn_get_op (u32 insn)
+{
+  return (insn >> 26) & 0x3f;
+}
+
+always_inline u32
+mips_insn_get_rs (u32 insn)
+{
+  return (insn >> 21) & 0x1f;
+}
+
+always_inline u32
+mips_insn_get_rt (u32 insn)
+{
+  return (insn >> 16) & 0x1f;
+}
+
+always_inline u32
+mips_insn_get_rd (u32 insn)
+{
+  return (insn >> 11) & 0x1f;
+}
+
+always_inline u32
+mips_insn_get_sa (u32 insn)
+{
+  return (insn >> 6) & 0x1f;
+}
+
+always_inline u32
+mips_insn_get_funct (u32 insn)
+{
+  return (insn >> 0) & 0x3f;
+}
+
+always_inline i32
+mips_insn_get_immediate (u32 insn)
+{
+  return (((i32) insn) << 16) >> 16;
+}
+
+always_inline u32
+mips_insn_encode_i_type (int op, int rs, int rt, int immediate)
+{
+  u32 insn;
+  insn = immediate;
+  insn |= rt << 16;
+  insn |= rs << 21;
+  insn |= op << 26;
+
+  ASSERT (mips_insn_get_immediate (insn) == immediate);
+  ASSERT (mips_insn_get_rt (insn) == rt);
+  ASSERT (mips_insn_get_rs (insn) == rt);
+  ASSERT (mips_insn_get_op (insn) == op);
+
+  return insn;
+}
+
+always_inline u32
+mips_insn_encode_j_type (int op, u32 addr)
+{
+  u32 insn;
+
+  insn = (addr & ((1 << 28) - 1)) / 4;
+  insn |= op << 26;
+
+  return insn;
+}
+
+always_inline u32
+mips_insn_encode_r_type (int op, int rs, int rt, int rd, int sa, int funct)
+{
+  u32 insn;
+  insn = funct;
+  insn |= sa << 6;
+  insn |= rd << 11;
+  insn |= rt << 16;
+  insn |= rs << 21;
+  insn |= op << 26;
+
+  ASSERT (mips_insn_get_funct (insn) == funct);
+  ASSERT (mips_insn_get_sa (insn) == sa);
+  ASSERT (mips_insn_get_rd (insn) == rd);
+  ASSERT (mips_insn_get_rt (insn) == rt);
+  ASSERT (mips_insn_get_rs (insn) == rt);
+  ASSERT (mips_insn_get_op (insn) == op);
+
+  return insn;
+}
+
+#define mips_insn_r(op,funct,rd,rs,rt,sa)		\
+  mips_insn_encode_r_type (MIPS_OPCODE_##op,		\
+			   (rs), (rt), (rd), (sa),	\
+			   MIPS_##op##_FUNCT_##funct)
+
+#define mips_insn_i(op,rs,rt,imm) \
+  mips_insn_encode_i_type (MIPS_OPCODE_##op, (rs), (rt), (imm))
+
+#define mips_insn_j(op,target) \
+  mips_insn_encode_i_type (MIPS_OPCODE_##op, (rs), (rt), (imm))
+
+/* Generate unsigned load instructions of data of various sizes. */
+always_inline u32
+mips_insn_load (u32 rd, i32 offset, u32 base, u32 log2_bytes)
+{
+  int op;
+
+  ASSERT (log2_bytes < 4);
+  switch (log2_bytes)
+    {
+    case 0:
+      op = MIPS_OPCODE_lbu;
+      break;
+    case 1:
+      op = MIPS_OPCODE_lhu;
+      break;
+    case 2:
+      op = MIPS_OPCODE_lwu;
+      break;
+    case 3:
+      op = MIPS_OPCODE_ld;
+      break;
+    }
+
+  return mips_insn_encode_i_type (op, base, rd, offset);
+}
+
+typedef enum
+{
+  MIPS_REG_SP = 29,
+  MIPS_REG_RA = 31,
+} mips_reg_t;
+
+#endif /* included_asm_mips_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/asm_x86.c b/src/vppinfra/asm_x86.c
new file mode 100644
index 00000000..16e41c24
--- /dev/null
+++ b/src/vppinfra/asm_x86.c
@@ -0,0 +1,1947 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* FIXME
+   opcode name remove to save table space; enum
+   x87
+   3dnow
+   cbw naming
+*/
+
+#include <vppinfra/error.h>
+#include <vppinfra/byte_order.h>
+#include <vppinfra/asm_x86.h>
+
+#define foreach_x86_gp_register			\
+  _  (AX)  _ (CX)  _ (DX)  _ (BX)		\
+  _  (SP)  _ (BP)  _ (SI)  _ (DI)
+
+typedef enum {
+#define _(r) X86_INSN_GP_REG_##r,
+  foreach_x86_gp_register
+#undef _
+} x86_insn_gp_register_t;
+
+typedef union {
+  struct {
+    u8 rm : 3;
+    u8 reg : 3;
+    u8 mode : 2;
+  };
+  u8 byte;
+} x86_insn_modrm_byte_t;
+
+typedef union {
+  struct {
+    u8 base : 3;
+    u8 index : 3;
+    u8 log2_scale : 2;
+  };
+  u8 byte;
+} x86_insn_sib_byte_t;
+
+always_inline uword
+x86_insn_has_modrm_byte (x86_insn_t * insn)
+{
+  int i;
+  for (i = 0; i < ARRAY_LEN (insn->operands); i++)
+    switch (insn->operands[i].code)
+      {
+      case 'G': case 'E': case 'M': case 'R':
+	return 1;
+      }
+  return 0;
+}
+
+always_inline uword
+x86_insn_immediate_type (x86_insn_t * insn)
+{
+  int i;
+  for (i = 0; i < ARRAY_LEN (insn->operands); i++)
+    switch (insn->operands[i].code)
+      {
+      case 'J':
+      case 'I':
+      case 'O':
+	return insn->operands[i].type;
+      }
+  return 0;
+}
+
+/* Opcode extension in modrm byte reg field. */
+#define foreach_x86_insn_modrm_reg_group		\
+  _ (1) _ (1a) _ (2) _ (3) _ (4) _ (5) _ (6) _ (7)	\
+  _ (8) _ (9) _ (10) _ (11) _ (12) _ (13) _ (14)	\
+  _ (15) _ (16) _ (p)
+
+#define foreach_x86_insn_sse_group				\
+  _ (10) _ (28) _ (50) _ (58) _ (60) _ (68) _ (70) _ (78)	\
+  _ (c0) _ (d0) _ (d8) _ (e0) _ (e8) _ (f0) _ (f8)
+
+enum {
+#define _(x) X86_INSN_MODRM_REG_GROUP_##x,
+  foreach_x86_insn_modrm_reg_group
+#undef _
+#define _(x) X86_INSN_SSE_GROUP_##x,
+  foreach_x86_insn_sse_group
+#undef _
+};
+
+enum {
+#define _(x)								\
+  X86_INSN_FLAG_MODRM_REG_GROUP_##x					\
+  = X86_INSN_FLAG_SET_MODRM_REG_GROUP (1 + X86_INSN_MODRM_REG_GROUP_##x),
+  foreach_x86_insn_modrm_reg_group
+#undef _
+
+#define _(x)							\
+  X86_INSN_FLAG_SSE_GROUP_##x					\
+  = X86_INSN_FLAG_SET_SSE_GROUP (1 + X86_INSN_SSE_GROUP_##x),
+  foreach_x86_insn_sse_group
+#undef _
+};
+
+#define foreach_x86_gp_reg			\
+  _ (AX) _ (CX) _ (DX) _ (BX)			\
+  _ (SP) _ (BP) _ (SI) _ (DI)
+
+#define foreach_x86_condition			\
+  _ (o) _ (no)  _ (b) _ (nb)			\
+  _ (z) _ (nz) _ (be) _ (nbe)			\
+  _ (s) _ (ns)  _ (p) _ (np)			\
+  _ (l) _ (nl) _ (le) _ (nle)
+
+#define _3f(x,f,o0,o1,o2)			\
+{						\
+  .name = #x,					\
+  .flags = (f),					\
+  .operands[0] = { .data = #o0 },		\
+  .operands[1] = { .data = #o1 },		\
+  .operands[2] = { .data = #o2 },		\
+}
+
+#define _2f(x,f,o0,o1)	_3f(x,f,o0,o1,__)
+#define _1f(x,f,o0)	_2f(x,f,o0,__)
+#define _0f(x,f)	_1f(x,f,__)
+
+#define _3(x,o0,o1,o2)	_3f(x,0,o0,o1,o2)
+#define _2(x,o0,o1)	_2f(x,0,o0,o1)
+#define _1(x,o0)	_1f(x,0,o0)
+#define _0(x)		_0f(x,0)
+
+static x86_insn_t x86_insns_one_byte[256] = {
+
+#define _(x)					\
+  _2 (x, Eb, Gb),				\
+  _2 (x, Ev, Gv),				\
+  _2 (x, Gb, Eb),				\
+  _2 (x, Gv, Ev),				\
+  _2 (x, AL, Ib),				\
+  _2 (x, AX, Iz)
+
+  /* 0x00 */
+  _ (add),
+  _0 (push_es),
+  _0 (pop_es),
+  _ (or),
+  _0 (push_cs),
+  _0 (escape_two_byte),
+
+  /* 0x10 */
+  _ (adc),
+  _0 (push_ss),
+  _0 (pop_ss),
+  _ (sbb),
+  _0 (push_ds),
+  _0 (pop_ds),
+
+  /* 0x20 */
+  _ (and),
+  _0 (segment_es),
+  _0 (daa),
+  _ (sub),
+  _0 (segment_cs),
+  _0 (das),
+
+  /* 0x30 */
+  _ (xor),
+  _0 (segment_ss),
+  _0 (aaa),
+  _ (cmp),
+  _0 (segment_ds),
+  _0 (aas),
+
+#undef _
+
+  /* 0x40 */
+#define _(r) _1 (inc, r),
+  foreach_x86_gp_reg
+#undef _
+#define _(r) _1 (dec, r),
+  foreach_x86_gp_reg
+#undef _
+
+  /* 0x50 */
+#define _(r) _1f (push, X86_INSN_FLAG_DEFAULT_64_BIT, r),
+  foreach_x86_gp_reg
+#undef _
+#define _(r) _1f (pop, X86_INSN_FLAG_DEFAULT_64_BIT, r),
+  foreach_x86_gp_reg
+#undef _
+
+  /* 0x60 */
+  _0 (pusha),
+  _0 (popa),
+  _2 (bound, Gv, Ma),
+  _2 (movsxd, Gv, Ed),
+  _0 (segment_fs),
+  _0 (segment_gs),
+  _0 (operand_type),
+  _0 (address_size),
+  _1f (push, X86_INSN_FLAG_DEFAULT_64_BIT, Iz),
+  _3 (imul, Gv, Ev, Iz),
+  _1f (push, X86_INSN_FLAG_DEFAULT_64_BIT, Ib),
+  _3 (imul, Gv, Ev, Ib),
+  _1 (insb, DX),
+  _1 (insw, DX),
+  _1 (outsb, DX),
+  _1 (outsw, DX),
+
+  /* 0x70 */
+#define _(x) _1 (j##x, Jb),
+  foreach_x86_condition
+#undef _
+
+  /* 0x80 */
+  _2f (modrm_group_1, X86_INSN_FLAG_MODRM_REG_GROUP_1, Eb, Ib),
+  _2f (modrm_group_1, X86_INSN_FLAG_MODRM_REG_GROUP_1, Ev, Iz),
+  _2f (modrm_group_1, X86_INSN_FLAG_MODRM_REG_GROUP_1, Eb, Ib),
+  _2f (modrm_group_1, X86_INSN_FLAG_MODRM_REG_GROUP_1, Ev, Ib),
+  _2 (test, Eb, Gb),
+  _2 (test, Ev, Gv),
+  _2 (xchg, Eb, Gb),
+  _2 (xchg, Ev, Gv),
+  _2 (mov, Eb, Gb),
+  _2 (mov, Ev, Gv),
+  _2 (mov, Gb, Eb),
+  _2 (mov, Gv, Ev),
+  _2 (mov, Ev, Sw),
+  _2 (lea, Gv, Ev),
+  _2 (mov, Sw, Ew),
+  _1f (modrm_group_1a, X86_INSN_FLAG_MODRM_REG_GROUP_1a, Ev),
+
+  /* 0x90 */
+  _0 (nop),
+  _1 (xchg, CX),
+  _1 (xchg, DX),
+  _1 (xchg, BX),
+  _1 (xchg, SP),
+  _1 (xchg, BP),
+  _1 (xchg, SI),
+  _1 (xchg, DI),
+  _0 (cbw),
+  _0 (cwd),
+  _1 (call, Ap),
+  _0 (wait),
+  _0 (pushf),
+  _0 (popf),
+  _0 (sahf),
+  _0 (lahf),
+
+  /* 0xa0 */
+  _2 (mov, AL, Ob),
+  _2 (mov, AX, Ov),
+  _2 (mov, Ob, AL),
+  _2 (mov, Ov, AX),
+  _0 (movsb),
+  _0 (movsw),
+  _0 (cmpsb),
+  _0 (cmpsw),
+  _2 (test, AL, Ib),
+  _2 (test, AX, Iz),
+  _1 (stosb, AL),
+  _1 (stosw, AX),
+  _1 (lodsb, AL),
+  _1 (lodsw, AX),
+  _1 (scasb, AL),
+  _1 (scasw, AX),
+
+  /* 0xb0 */
+  _2 (mov, AL, Ib),
+  _2 (mov, CL, Ib),
+  _2 (mov, DL, Ib),
+  _2 (mov, BL, Ib),
+  _2 (mov, AH, Ib),
+  _2 (mov, CH, Ib),
+  _2 (mov, DH, Ib),
+  _2 (mov, BH, Ib),
+#define _(r) _2 (mov, r, Iv),
+  foreach_x86_gp_reg
+#undef _
+
+  /* 0xc0 */
+  _2f (modrm_group_2, X86_INSN_FLAG_MODRM_REG_GROUP_2, Eb, Ib),
+  _2f (modrm_group_2, X86_INSN_FLAG_MODRM_REG_GROUP_2, Ev, Ib),
+  _1 (ret, Iw),
+  _0 (ret),
+  _2 (les, Gz, Mp),
+  _2 (lds, Gz, Mp),
+  _2f (modrm_group_11, X86_INSN_FLAG_MODRM_REG_GROUP_11, Eb, Ib),
+  _2f (modrm_group_11, X86_INSN_FLAG_MODRM_REG_GROUP_11, Ev, Iz),
+  _2 (enter, Iw, Ib),
+  _0 (leave),
+  _1 (ret, Iw),
+  _0 (ret),
+  _0 (int3),
+  _1 (int, Ib),
+  _0 (into),
+  _0 (iret),
+
+  /* 0xd0 */
+  _2f (modrm_group_2, X86_INSN_FLAG_MODRM_REG_GROUP_2, Eb, 1b),
+  _2f (modrm_group_2, X86_INSN_FLAG_MODRM_REG_GROUP_2, Ev, 1b),
+  _2f (modrm_group_2, X86_INSN_FLAG_MODRM_REG_GROUP_2, Eb, CL),
+  _2f (modrm_group_2, X86_INSN_FLAG_MODRM_REG_GROUP_2, Ev, CL),
+  _0 (aam),
+  _0 (aad),
+  _0 (salc),
+  _0 (xlat),
+  /* FIXME x87 */
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+
+  /* 0xe0 */
+  _1 (loopnz, Jb),
+  _1 (loopz, Jb),
+  _1 (loop, Jb),
+  _1 (jcxz, Jb),
+  _2 (in, AL, Ib),
+  _2 (in, AX, Ib),
+  _2 (out, Ib, AL),
+  _2 (out, Ib, AX),
+  _1f (call, X86_INSN_FLAG_DEFAULT_64_BIT, Jz),
+  _1f ( jmp, X86_INSN_FLAG_DEFAULT_64_BIT, Jz),
+  _1 (jmp, Ap),
+  _1 (jmp, Jb),
+  _2 (in, AL, DX),
+  _2 (in, AX, DX),
+  _2 (out, DX, AL),
+  _2 (out, DX, AX),
+
+  /* 0xf0 */
+  _0 (lock),
+  _0 (int1),
+  _0 (repne),
+  _0 (rep),
+  _0 (hlt),
+  _0 (cmc),
+  _0f (modrm_group_3, X86_INSN_FLAG_MODRM_REG_GROUP_3),
+  _0f (modrm_group_3, X86_INSN_FLAG_MODRM_REG_GROUP_3),
+  _0 (clc),
+  _0 (stc),
+  _0 (cli),
+  _0 (sti),
+  _0 (cld),
+  _0 (std),
+  _1f (modrm_group_4, X86_INSN_FLAG_MODRM_REG_GROUP_4, Eb),
+  _0f (modrm_group_5, X86_INSN_FLAG_MODRM_REG_GROUP_5),
+};
+
+static x86_insn_t x86_insns_two_byte[256] = {
+  /* 0x00 */
+  _0f (modrm_group_6, X86_INSN_FLAG_MODRM_REG_GROUP_6),
+  _0f (modrm_group_7, X86_INSN_FLAG_MODRM_REG_GROUP_7),
+  _2 (lar, Gv, Ew),
+  _2 (lsl, Gv, Ew),
+  _0 (bad),
+  _0 (syscall),
+  _0 (clts),
+  _0 (sysret),
+  _0 (invd),
+  _0 (wbinvd),
+  _0 (bad),
+  _0 (ud2),
+  _0 (bad),
+  _0f (modrm_group_p, X86_INSN_FLAG_MODRM_REG_GROUP_p),
+  _0 (femms),
+  _0 (escape_3dnow),
+
+  /* 0x10 */
+  _2f (movups, X86_INSN_FLAG_SSE_GROUP_10, Gx, Ex),
+  _2f (movups, X86_INSN_FLAG_SSE_GROUP_10, Ex, Gx),
+  _2f (movlps, X86_INSN_FLAG_SSE_GROUP_10, Ex, Gx),
+  _2f (movlps, X86_INSN_FLAG_SSE_GROUP_10, Gx, Ex),
+  _2f (unpcklps, X86_INSN_FLAG_SSE_GROUP_10, Gx, Ex),
+  _2f (unpckhps, X86_INSN_FLAG_SSE_GROUP_10, Gx, Ex),
+  _2f (movhps, X86_INSN_FLAG_SSE_GROUP_10, Ex, Gx),
+  _2f (movhps, X86_INSN_FLAG_SSE_GROUP_10, Gx, Ex),
+  _0f (modrm_group_16, X86_INSN_FLAG_MODRM_REG_GROUP_16),
+  _0 (nop),
+  _0 (nop),
+  _0 (nop),
+  _0 (nop),
+  _0 (nop),
+  _0 (nop),
+  _0 (nop),
+
+  /* 0x20 */
+  _2 (mov, Rv, Cv),
+  _2 (mov, Rv, Dv),
+  _2 (mov, Cv, Rv),
+  _2 (mov, Dv, Rv),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+  _2f (movaps, X86_INSN_FLAG_SSE_GROUP_28, Gx, Ex),
+  _2f (movaps, X86_INSN_FLAG_SSE_GROUP_28, Ex, Gx),
+  _2f (cvtpi2ps, X86_INSN_FLAG_SSE_GROUP_28, Gx, Ex),
+  _2f (movntps, X86_INSN_FLAG_SSE_GROUP_28, Mx, Gx),
+  _2f (cvttps2pi, X86_INSN_FLAG_SSE_GROUP_28, Gx, Ex),
+  _2f (cvtps2pi, X86_INSN_FLAG_SSE_GROUP_28, Gx, Ex),
+  _2f (ucomiss, X86_INSN_FLAG_SSE_GROUP_28, Gx, Ex),
+  _2f (comiss, X86_INSN_FLAG_SSE_GROUP_28, Gx, Ex),
+
+  /* 0x30 */
+  _0 (wrmsr),
+  _0 (rdtsc),
+  _0 (rdmsr),
+  _0 (rdpmc),
+  _0 (sysenter),
+  _0 (sysexit),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+  _0 (bad),
+
+  /* 0x40 */
+#define _(x) _2 (cmov##x, Gv, Ev),
+  foreach_x86_condition
+#undef _
+
+  /* 0x50 */
+  _2f (movmskps, X86_INSN_FLAG_SSE_GROUP_50, Gd, Rx),
+  _2f (sqrtps, X86_INSN_FLAG_SSE_GROUP_50, Gx, Ex),
+  _2f (rsqrtps, X86_INSN_FLAG_SSE_GROUP_50, Gx, Ex),
+  _2f (rcpps, X86_INSN_FLAG_SSE_GROUP_50, Gx, Ex),
+  _2f (andps, X86_INSN_FLAG_SSE_GROUP_50, Gx, Ex),
+  _2f (andnps, X86_INSN_FLAG_SSE_GROUP_50, Gx, Ex),
+  _2f (orps, X86_INSN_FLAG_SSE_GROUP_50, Gx, Ex),
+  _2f (xorps, X86_INSN_FLAG_SSE_GROUP_50, Gx, Ex),
+  _2f (addps, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
+  _2f (mulps, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
+  _2f (cvtps2pd, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
+  _2f (cvtdq2ps, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
+  _2f (subps, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
+  _2f (minps, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
+  _2f (divps, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
+  _2f (maxps, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
+
+  /* 0x60 */
+  _2f (punpcklbw, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
+  _2f (punpcklwd, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
+  _2f (punpckldq, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
+  _2f (packsswb, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
+  _2f (pcmpgtb, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
+  _2f (pcmpgtw, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
+  _2f (pcmpgtd, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
+  _2f (packuswb, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
+  _2f (punpckhbw, X86_INSN_FLAG_SSE_GROUP_68, Gm, Em),
+  _2f (punpckhwd, X86_INSN_FLAG_SSE_GROUP_68, Gm, Em),
+  _2f (punpckhdq, X86_INSN_FLAG_SSE_GROUP_68, Gm, Em),
+  _2f (packssdw, X86_INSN_FLAG_SSE_GROUP_68, Gm, Em),
+  _0f (bad, X86_INSN_FLAG_SSE_GROUP_68),
+  _0f (bad, X86_INSN_FLAG_SSE_GROUP_68),
+  _2f (movd, X86_INSN_FLAG_SSE_GROUP_68, Gm, Em),
+  _2f (movq, X86_INSN_FLAG_SSE_GROUP_68, Gm, Em),
+
+  /* 0x70 */
+  _3f (pshufw, X86_INSN_FLAG_SSE_GROUP_70, Gm, Em, Ib),
+  _0f (modrm_group_12, X86_INSN_FLAG_MODRM_REG_GROUP_12),
+  _0f (modrm_group_13, X86_INSN_FLAG_MODRM_REG_GROUP_13),
+  _0f (modrm_group_14, X86_INSN_FLAG_MODRM_REG_GROUP_14),
+  _2f (pcmpeqb, X86_INSN_FLAG_SSE_GROUP_70, Gm, Em),
+  _2f (pcmpeqw, X86_INSN_FLAG_SSE_GROUP_70, Gm, Em),
+  _2f (pcmpeqd, X86_INSN_FLAG_SSE_GROUP_70, Gm, Em),
+  _0f (emms, X86_INSN_FLAG_SSE_GROUP_70),
+  _0f (bad, X86_INSN_FLAG_SSE_GROUP_78),
+  _0f (bad, X86_INSN_FLAG_SSE_GROUP_78),
+  _0f (bad, X86_INSN_FLAG_SSE_GROUP_78),
+  _0f (bad, X86_INSN_FLAG_SSE_GROUP_78),
+  _0f (bad, X86_INSN_FLAG_SSE_GROUP_78),
+  _0f (bad, X86_INSN_FLAG_SSE_GROUP_78),
+  _2f (movd, X86_INSN_FLAG_SSE_GROUP_78, Em, Gm),
+  _2f (movq, X86_INSN_FLAG_SSE_GROUP_78, Em, Gm),
+
+  /* 0x80 */
+#define _(x) _1 (jmp##x, Jz),
+  foreach_x86_condition
+#undef _
+
+  /* 0x90 */
+#define _(x) _1 (set##x, Eb),
+  foreach_x86_condition
+#undef _
+
+  /* 0xa0 */
+  _0 (push_fs),
+  _0 (pop_fs),
+  _0 (cpuid),
+  _2 (bt, Ev, Gv),
+  _3 (shld, Ev, Gv, Ib),
+  _3 (shld, Ev, Gv, CL),
+  _0 (bad),
+  _0 (bad),
+  _0 (push_gs),
+  _0 (pop_gs),
+  _0 (rsm),
+  _2 (bts, Ev, Gv),
+  _3 (shrd, Ev, Gv, Ib),
+  _3 (shrd, Ev, Gv, CL),
+  _0f (modrm_group_15, X86_INSN_FLAG_MODRM_REG_GROUP_15),
+  _2 (imul, Gv, Ev),
+
+  /* 0xb0 */
+  _2 (cmpxchg, Eb, Gb),
+  _2 (cmpxchg, Ev, Gv),
+  _2 (lss, Gz, Mp),
+  _2 (btr, Ev, Gv),
+  _2 (lfs, Gz, Mp),
+  _2 (lgs, Gz, Mp),
+  _2 (movzbl, Gv, Eb),
+  _2 (movzwl, Gv, Ew),
+  _0 (bad),
+  _0f (modrm_group_10, X86_INSN_FLAG_MODRM_REG_GROUP_10),
+  _2f (modrm_group_8, X86_INSN_FLAG_MODRM_REG_GROUP_8, Ev, Ib),
+  _2 (btc, Ev, Gv),
+  _2 (bsf, Gv, Ev),
+  _2 (bsr, Gv, Ev),
+  _2 (movsx, Gv, Eb),
+  _2 (movsx, Gv, Ew),
+
+  /* 0xc0 */
+  _2 (xadd, Eb, Gb),
+  _2 (xadd, Ev, Gv),
+  _3f (cmpps, X86_INSN_FLAG_SSE_GROUP_c0, Gx, Ex, Ib),
+  _2 (movnti, Mv, Gv),
+  _3f (pinsrw, X86_INSN_FLAG_SSE_GROUP_c0, Gm, Ew, Ib),
+  _3f (pextrw, X86_INSN_FLAG_SSE_GROUP_c0, Gd, Rm, Ib),
+  _3f (shufps, X86_INSN_FLAG_SSE_GROUP_c0, Gx, Ex, Ib),
+  _1f (modrm_group_9, X86_INSN_FLAG_MODRM_REG_GROUP_9, Mx),
+#define _(r) _1 (bswap, r),
+  foreach_x86_gp_reg
+#undef _
+
+  /* 0xd0 */
+  _0f (bad, X86_INSN_FLAG_SSE_GROUP_d0),
+  _2f (psrlw, X86_INSN_FLAG_SSE_GROUP_d0, Gm, Em),
+  _2f (psrld, X86_INSN_FLAG_SSE_GROUP_d0, Gm, Em),
+  _2f (psrlq, X86_INSN_FLAG_SSE_GROUP_d0, Gm, Em),
+  _2f (paddq, X86_INSN_FLAG_SSE_GROUP_d0, Gm, Em),
+  _2f (pmullw, X86_INSN_FLAG_SSE_GROUP_d0, Gm, Em),
+  _0f (bad, X86_INSN_FLAG_SSE_GROUP_d0),
+  _2f (pmovmskb, X86_INSN_FLAG_SSE_GROUP_d0, Gd, Rm),
+  _2f (psubusb, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
+  _2f (psubusw, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
+  _2f (pminub, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
+  _2f (pand, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
+  _2f (paddusb, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
+  _2f (paddusw, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
+  _2f (pmaxub, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
+  _2f (pandn, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
+
+  /* 0xe0 */
+  _2f (pavgb, X86_INSN_FLAG_SSE_GROUP_e0, Gm, Em),
+  _2f (psraw, X86_INSN_FLAG_SSE_GROUP_e0, Gm, Em),
+  _2f (psrad, X86_INSN_FLAG_SSE_GROUP_e0, Gm, Em),
+  _2f (pavgw, X86_INSN_FLAG_SSE_GROUP_e0, Gm, Em),
+  _2f (pmulhuw, X86_INSN_FLAG_SSE_GROUP_e0, Gm, Em),
+  _2f (pmulhw, X86_INSN_FLAG_SSE_GROUP_e0, Gm, Em),
+  _2f (bad, X86_INSN_FLAG_SSE_GROUP_e0, Gm, Em),
+  _2f (movntq, X86_INSN_FLAG_SSE_GROUP_e0, Mm, Gm),
+  _2f (psubsb, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
+  _2f (psubsw, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
+  _2f (pminsw, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
+  _2f (por, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
+  _2f (paddsb, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
+  _2f (paddsw, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
+  _2f (pmaxsw, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
+  _2f (pxor, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
+
+  /* 0xf0 */
+  _0f (bad, X86_INSN_FLAG_SSE_GROUP_f0),
+  _2f (psllw, X86_INSN_FLAG_SSE_GROUP_f0, Gm, Em),
+  _2f (pslld, X86_INSN_FLAG_SSE_GROUP_f0, Gm, Em),
+  _2f (psllq, X86_INSN_FLAG_SSE_GROUP_f0, Gm, Em),
+  _2f (pmuludq, X86_INSN_FLAG_SSE_GROUP_f0, Gm, Em),
+  _2f (pmaddwd, X86_INSN_FLAG_SSE_GROUP_f0, Gm, Em),
+  _2f (psadbw, X86_INSN_FLAG_SSE_GROUP_f0, Gm, Em),
+  _2f (maskmovq, X86_INSN_FLAG_SSE_GROUP_f0, Gm, Em),
+  _2f (psubb, X86_INSN_FLAG_SSE_GROUP_f8, Gm, Em),
+  _2f (psubw, X86_INSN_FLAG_SSE_GROUP_f8, Gm, Em),
+  _2f (psubd, X86_INSN_FLAG_SSE_GROUP_f8, Gm, Em),
+  _2f (psubq, X86_INSN_FLAG_SSE_GROUP_f8, Gm, Em),
+  _2f (paddb, X86_INSN_FLAG_SSE_GROUP_f8, Gm, Em),
+  _2f (paddw, X86_INSN_FLAG_SSE_GROUP_f8, Gm, Em),
+  _2f (paddd, X86_INSN_FLAG_SSE_GROUP_f8, Gm, Em),
+  _0f (bad, X86_INSN_FLAG_SSE_GROUP_f8),
+};
+
+typedef struct {
+  x86_insn_t insns[8];
+} x86_insn_group8_t;
+
+/* Escape groups are indexed by modrm reg field. */
+static x86_insn_group8_t x86_insn_modrm_reg_groups[] = {
+  [X86_INSN_MODRM_REG_GROUP_1].insns = {
+    _0 (add), _0 ( or), _0 (adc), _0 (sbb),
+    _0 (and), _0 (sub), _0 (xor), _0 (cmp),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_1a].insns = {
+    _0f (pop, X86_INSN_FLAG_DEFAULT_64_BIT),
+    _0 (bad), _0 (bad), _0 (bad),
+    _0 (bad), _0 (bad), _0 (bad), _0 (bad),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_2].insns = {
+    _0 (rol), _0 (ror), _0 (rcl), _0 (rcr),
+    _0 (shl), _0 (shr), _0 (sal), _0 (sar),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_3].insns = {
+    _0 (test), _0 (test), _0 (not), _0 (neg),
+    _0 (mul), _0 (imul), _0 (div), _0 (idiv),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_4].insns = {
+    _0 (inc), _0 (dec), _0 (bad), _0 (bad),
+    _0 (bad), _0 (bad), _0 (bad), _0 (bad),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_5].insns = {
+    _1 (inc, Ev),
+    _1 (dec, Ev),
+    _1f (call, X86_INSN_FLAG_DEFAULT_64_BIT, Ev),
+    _1 (call, Mp),
+    _1f (jmp, X86_INSN_FLAG_DEFAULT_64_BIT, Ev),
+    _1 (jmp, Mp),
+    _1f (push, X86_INSN_FLAG_DEFAULT_64_BIT, Ev),
+    _0 (bad),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_6].insns = {
+    _1 (sldt, Ev),
+    _1 (str, Ev),
+    _1 (lldt, Ev),
+    _1 (ltr, Ev),
+    _1 (verr, Ev),
+    _1 (verw, Ev),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_7].insns = {
+    _1 (sgdt, Mv),
+    _1 (sidt, Mv),
+    _1 (lgdt, Mv),
+    _1 (lidt, Mv),
+    _1 (smsw, Ev),
+    _0 (bad),
+    _1 (lmsw, Ew),
+    _1 (invlpg, Mv),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_8].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _2 (bt, Ev, Ib),
+    _2 (bts, Ev, Ib),
+    _2 (btr, Ev, Ib),
+    _2 (btc, Ev, Ib),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_9].insns = {
+    _0 (bad),
+    _1 (cmpxchg, Mx),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_10].insns = {
+    _0 (bad), _0 (bad), _0 (bad), _0 (bad),
+    _0 (bad), _0 (bad), _0 (bad), _0 (bad),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_11].insns = {
+    _0 (mov), _0 (bad), _0 (bad), _0 (bad),
+    _0 (bad), _0 (bad), _0 (bad), _0 (bad),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_12].insns = {
+    _0 (bad),
+    _0 (bad),
+    _2 (psrlw, Rm, Ib),
+    _0 (bad),
+    _2 (psraw, Rm, Ib),
+    _0 (bad),
+    _2 (psllw, Rm, Ib),
+    _0 (bad),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_13].insns = {
+    _0 (bad),
+    _0 (bad),
+    _2 (psrld, Rm, Ib),
+    _0 (bad),
+    _2 (psrad, Rm, Ib),
+    _0 (bad),
+    _2 (pslld, Rm, Ib),
+    _0 (bad),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_14].insns = {
+    _0 (bad),
+    _0 (bad),
+    _2 (psrlq, Rm, Ib),
+    _0f (bad, 0),
+    _0 (bad),
+    _0 (bad),
+    _2 (psllq, Rm, Ib),
+    _0f (bad, 0),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_15].insns = {
+    _1 (fxsave, Mv),
+    _1 (fxrstor, Mv),
+    _1 (ldmxcsr, Mv),
+    _1 (stmxcsr, Mv),
+    _0 (bad),
+    _1 (lfence, Mv),
+    _1 (mfence, Mv),
+    _1 (sfence, Mv),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_16].insns = {
+    _1 (prefetch_nta, Mv),
+    _1 (prefetch_t0, Mv),
+    _1 (prefetch_t1, Mv),
+    _1 (prefetch_t2, Mv),
+    _1 (prefetch_nop, Mv),
+    _1 (prefetch_nop, Mv),
+    _1 (prefetch_nop, Mv),
+    _1 (prefetch_nop, Mv),
+  },
+
+  [X86_INSN_MODRM_REG_GROUP_p].insns = {
+    _1 (prefetch_exclusive, Mv),
+    _1 (prefetch_modified, Mv),
+    _1 (prefetch_nop, Mv),
+    _1 (prefetch_modified, Mv),
+    _1 (prefetch_nop, Mv),
+    _1 (prefetch_nop, Mv),
+    _1 (prefetch_nop, Mv),
+    _1 (prefetch_nop, Mv),
+  },
+};
+
+static x86_insn_group8_t x86_insn_sse_groups_repz[] = {
+  [X86_INSN_SSE_GROUP_10].insns = {
+    _2 (movss, Gx, Ex),
+    _2 (movss, Ex, Gx),
+    _2 (movsldup, Gx, Ex),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _2 (movshdup, Gx, Ex),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_28].insns = {
+    _0 (bad),
+    _0 (bad),
+    _2 (cvtsi2ss, Gx, Ev),
+    _0 (bad),
+    _2 (cvttss2si, Gv, Ex),
+    _2 (cvtss2si, Gv, Ex),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_50].insns = {
+    _0 (bad),
+    _2 (sqrtss, Gx, Ex),
+    _2 (rsqrtps, Gx, Ex),
+    _2 (rcpss, Gx, Ex),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_58].insns = {
+    _2 (addss, Gx, Ex),
+    _2 (mulss, Gx, Ex),
+    _2 (cvtss2sd, Gx, Ex),
+    _2 (cvttps2dq, Gx, Ex),
+    _2 (subss, Gx, Ex),
+    _2 (minss, Gx, Ex),
+    _2 (divss, Gx, Ex),
+    _2 (maxss, Gx, Ex),
+  },
+
+  [X86_INSN_SSE_GROUP_60].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_68].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _2 (movdqu, Gx, Ex),
+  },
+
+  [X86_INSN_SSE_GROUP_70].insns = {
+    _3 (pshufhw, Gx, Ex, Ib),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_78].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _2 (movq, Gx, Ex),
+    _2 (movdqu, Ex, Gx),
+  },
+
+  [X86_INSN_SSE_GROUP_c0].insns = {
+    _0 (bad),
+    _0 (bad),
+    _3 (cmpss, Gx, Ex, Ib),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_d0].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _2 (movq2dq, Gx, Em),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_d8].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_e0].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _2 (cvtdq2pd, Gx, Ex),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_e8].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_f0].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_f8].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+};
+
+static x86_insn_group8_t x86_insn_sse_groups_operand_size[] = {
+  [X86_INSN_SSE_GROUP_10].insns = {
+    _2 (movupd, Gx, Ex),
+    _2 (movupd, Ex, Gx),
+    _2 (movlpd, Gx, Ex),
+    _2 (movlpd, Ex, Gx),
+    _2 (unpcklpd, Gx, Ex),
+    _2 (unpckhpd, Gx, Ex),
+    _2 (movhpd, Gx, Mx),
+    _2 (movhpd, Mx, Gx),
+  },
+
+  [X86_INSN_SSE_GROUP_28].insns = {
+    _2 (movapd, Gx, Ex),
+    _2 (movapd, Ex, Gx),
+    _2 (cvtpi2pd, Gx, Ex),
+    _2 (movntpd, Mx, Gx),
+    _2 (cvttpd2pi, Gx, Mx),
+    _2 (cvtpd2pi, Gx, Mx),
+    _2 (ucomisd, Gx, Ex),
+    _2 (comisd, Gx, Ex),
+  },
+
+  [X86_INSN_SSE_GROUP_50].insns = {
+    _2 (movmskpd, Gd, Rx),
+    _2 (sqrtpd, Gx, Ex),
+    _0 (bad),
+    _0 (bad),
+    _2 (andpd, Gx, Ex),
+    _2 (andnpd, Gx, Ex),
+    _2 (orpd, Gx, Ex),
+    _2 (xorpd, Gx, Ex),
+  },
+
+  [X86_INSN_SSE_GROUP_58].insns = {
+    _2 (addpd, Gx, Ex),
+    _2 (mulpd, Gx, Ex),
+    _2 (cvtpd2ps, Gx, Ex),
+    _2 (cvtps2dq, Gx, Ex),
+    _2 (subpd, Gx, Ex),
+    _2 (minpd, Gx, Ex),
+    _2 (divpd, Gx, Ex),
+    _2 (maxpd, Gx, Ex),
+  },
+
+  [X86_INSN_SSE_GROUP_60].insns = {
+    _2 (punpcklbw, Gx, Ex),
+    _2 (punpcklwd, Gx, Ex),
+    _2 (punpckldq, Gx, Ex),
+    _2 (packsswb, Gx, Ex),
+    _2 (pcmpgtb, Gx, Ex),
+    _2 (pcmpgtw, Gx, Ex),
+    _2 (pcmpgtd, Gx, Ex),
+    _2 (packuswb, Gx, Ex),
+  },
+
+  [X86_INSN_SSE_GROUP_68].insns = {
+    _2 (punpckhbw, Gx, Ex),
+    _2 (punpckhwd, Gx, Ex),
+    _2 (punpckhdq, Gx, Ex),
+    _2 (packssdw, Gx, Ex),
+    _2 (punpcklqdq, Gx, Ex),
+    _2 (punpckhqdq, Gx, Ex),
+    _2 (movd, Gx, Ev),
+    _2 (movdqa, Gx, Ex),
+  },
+
+  [X86_INSN_SSE_GROUP_70].insns = {
+    _3 (pshufd, Gx, Ex, Ib),
+    _0f (modrm_group_12, X86_INSN_FLAG_MODRM_REG_GROUP_12),
+    _0f (modrm_group_13, X86_INSN_FLAG_MODRM_REG_GROUP_13),
+    _0f (modrm_group_14, X86_INSN_FLAG_MODRM_REG_GROUP_14),
+    _2 (pcmpeqb, Gx, Ex),
+    _2 (pcmpeqw, Gx, Ex),
+    _2 (pcmpeqd, Gx, Ex),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_78].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _2 (haddpd, Gx, Ex),
+    _2 (hsubpd, Gx, Ex),
+    _2 (movd, Ev, Gx),
+    _2 (movdqa, Ex, Gx),
+  },
+
+  [X86_INSN_SSE_GROUP_c0].insns = {
+    _0 (bad),
+    _0 (bad),
+    _3 (cmppd, Gx, Ex, Ib),
+    _0 (bad),
+    _3 (pinsrw, Gx, Ew, Ib),
+    _3 (pextrw, Gd, Gx, Ib),
+    _3 (shufpd, Gx, Ex, Ib),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_d0].insns = {
+    _2 (addsubpd, Gx, Ex),
+    _2 (psrlw, Gx, Ex),
+    _2 (psrld, Gx, Ex),
+    _2 (psrlq, Gx, Ex),
+    _2 (paddq, Gx, Ex),
+    _2 (pmullw, Gx, Ex),
+    _2 (movq, Ex, Gx),
+    _2 (pmovmskb, Gd, Rx),
+  },
+
+  [X86_INSN_SSE_GROUP_d8].insns = {
+    _2 (psubusb, Gx, Ex),
+    _2 (psubusw, Gx, Ex),
+    _2 (pminub, Gx, Ex),
+    _2 (pand, Gx, Ex),
+    _2 (paddusb, Gx, Ex),
+    _2 (paddusw, Gx, Ex),
+    _2 (pmaxub, Gx, Ex),
+    _2 (pandn, Gx, Ex),
+  },
+
+  [X86_INSN_SSE_GROUP_e0].insns = {
+    _2 (pavgb, Gx, Ex),
+    _2 (psraw, Gx, Ex),
+    _2 (psrad, Gx, Ex),
+    _2 (pavgw, Gx, Ex),
+    _2 (pmulhuw, Gx, Ex),
+    _2 (pmulhw, Gx, Ex),
+    _2 (cvttpd2dq, Gx, Ex),
+    _2 (movntdq, Mx, Gx),
+  },
+
+  [X86_INSN_SSE_GROUP_e8].insns = {
+    _2 (psubsb, Gx, Ex),
+    _2 (psubsw, Gx, Ex),
+    _2 (pminsw, Gx, Ex),
+    _2 (por, Gx, Ex),
+    _2 (paddsb, Gx, Ex),
+    _2 (paddsw, Gx, Ex),
+    _2 (pmaxsw, Gx, Ex),
+    _2 (pxor, Gx, Ex),
+  },
+
+  [X86_INSN_SSE_GROUP_f0].insns = {
+    _0 (bad),
+    _2 (psllw, Gx, Ex),
+    _2 (pslld, Gx, Ex),
+    _2 (psllq, Gx, Ex),
+    _2 (pmuludq, Gx, Ex),
+    _2 (pmaddwd, Gx, Ex),
+    _2 (psadbw, Gx, Ex),
+    _2 (maskmovdqu, Gx, Ex),
+  },
+
+  [X86_INSN_SSE_GROUP_f8].insns = {
+    _2 (psubb, Gx, Ex),
+    _2 (psubw, Gx, Ex),
+    _2 (psubd, Gx, Ex),
+    _2 (psubq, Gx, Ex),
+    _2 (paddb, Gx, Ex),
+    _2 (paddw, Gx, Ex),
+    _2 (paddd, Gx, Ex),
+    _0 (bad),
+  },
+};
+
+static x86_insn_group8_t x86_insn_sse_groups_repnz[] = {
+  [X86_INSN_SSE_GROUP_10].insns = {
+    _2 (movsd, Gx, Ex),
+    _2 (movsd, Ex, Gx),
+    _2 (movddup, Gx, Ex),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_28].insns = {
+    _0 (bad),
+    _0 (bad),
+    _2 (cvtsi2sd, Gx, Ev),
+    _0 (bad),
+    _2 (cvttsd2si, Gv, Ex),
+    _2 (cvtsd2si, Gv, Ex),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_50].insns = {
+    _0 (bad),
+    _2 (sqrtsd, Gx, Ex),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_58].insns = {
+    _2 (addsd, Gx, Ex),
+    _2 (mulsd, Gx, Ex),
+    _2 (cvtsd2ss, Gx, Ex),
+    _0 (bad),
+    _2 (subsd, Gx, Ex),
+    _2 (minsd, Gx, Ex),
+    _2 (divsd, Gx, Ex),
+    _2 (maxsd, Gx, Ex),
+  },
+
+  [X86_INSN_SSE_GROUP_60].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_68].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_70].insns = {
+    _3 (pshuflw, Gx, Ex, Ib),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_78].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _2 (haddps, Gx, Ex),
+    _2 (hsubps, Gx, Ex),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_c0].insns = {
+    _0 (bad),
+    _0 (bad),
+    _3 (cmpsd, Gx, Ex, Ib),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_d0].insns = {
+    _2 (addsubps, Gx, Ex),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _2 (movdq2q, Gm, Ex),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_d8].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_e0].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _2 (cvtpd2dq, Gx, Ex),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_e8].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_f0].insns = {
+    _2 (lddqu, Gx, Mx),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+
+  [X86_INSN_SSE_GROUP_f8].insns = {
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+    _0 (bad),
+  },
+};
+
+#undef _
+
+/* Parses memory displacements and immediates. */
+static u8 * x86_insn_parse_number (u32 log2_n_bytes,
+				   u8 * code, u8 * code_end,
+				   i64 * result)
+{
+  i64 x = 0;
+
+  if (code + (1 << log2_n_bytes) > code_end)
+    return 0;
+
+  switch (log2_n_bytes)
+    {
+    case 3:
+      x = clib_little_to_host_unaligned_mem_u64 ((u64 *) code);
+      break;
+
+    case 2:
+      x = (i32) clib_little_to_host_unaligned_mem_u32 ((u32 *) code);
+      break;
+
+    case 1:
+      x = (i16) clib_little_to_host_unaligned_mem_u16 ((u16 *) code);
+      break;
+
+    case 0:
+      x = (i8) code[0];
+      break;
+
+    default:
+      ASSERT (0);
+    }
+
+  *result = x;
+  return code + (1 << log2_n_bytes);
+}
+
+static u32
+x86_insn_log2_immediate_bytes (x86_insn_parse_t * p, x86_insn_t * insn)
+{
+  u32 i = ~0;
+  switch (x86_insn_immediate_type (insn))
+    {
+    case 'b': i = 0; break;
+    case 'w': i = 1; break;
+    case 'd': i = 2; break;
+    case 'q': i = 3; break;
+
+    case 'z':
+      i = p->log2_effective_operand_bytes;
+      if (i > 2) i = 2;
+      break;
+
+    case 'v':
+      i = p->log2_effective_operand_bytes;
+      break;
+
+    default:
+      i = ~0;
+      break;
+    }
+
+  return i;
+}
+
+static u8 *
+x86_insn_parse_modrm_byte (x86_insn_parse_t * x,
+			   x86_insn_modrm_byte_t modrm,
+			   u32 parse_flags,
+			   u8 * code,
+			   u8 * code_end)
+{
+  u8 effective_address_bits;
+
+  if (parse_flags & X86_INSN_PARSE_64_BIT)
+    effective_address_bits = (x->flags & X86_INSN_ADDRESS_SIZE) ? 32 : 64;
+  else if (parse_flags & X86_INSN_PARSE_32_BIT)
+    effective_address_bits = (x->flags & X86_INSN_ADDRESS_SIZE) ? 16 : 32;
+  else
+    effective_address_bits = (x->flags & X86_INSN_ADDRESS_SIZE) ? 32 : 16;
+
+  x->log2_effective_address_bytes = 1;
+  x->log2_effective_address_bytes += effective_address_bits > 16;
+  x->log2_effective_address_bytes += effective_address_bits > 32;
+
+  x->regs[0] |= modrm.reg;
+  if (modrm.mode == 3)
+    x->regs[1] |= modrm.rm;
+  else
+    {
+      u32 log2_disp_bytes = ~0;
+
+      x->flags |= X86_INSN_IS_ADDRESS;
+
+      if (effective_address_bits != 16)
+	{
+	  u8 has_sib_byte = 0;
+
+	  switch (modrm.mode)
+	    {
+	    case 0:
+	      /* When base is bp displacement is present for mode 0. */
+	      if (modrm.rm == X86_INSN_GP_REG_BP)
+		{
+		  log2_disp_bytes = x->log2_effective_address_bytes;
+		  break;
+		}
+	      else if (modrm.rm == X86_INSN_GP_REG_SP
+		       && effective_address_bits != 16)
+		{
+		  has_sib_byte = 1;
+		  break;
+		}
+	      /* fall through */
+	    case 1:
+	    case 2:
+	      x->regs[1] |= modrm.rm;
+	      x->flags |= X86_INSN_HAS_BASE;
+	      if (modrm.mode != 0)
+		{
+		  log2_disp_bytes = (modrm.mode == 1
+				     ? 0
+				     : x->log2_effective_address_bytes);
+		  if (log2_disp_bytes > 2)
+		    log2_disp_bytes = 2;
+		}
+	      break;
+	    }
+
+	  if (has_sib_byte)
+	    {
+	      x86_insn_sib_byte_t sib;
+
+	      if (code >= code_end)
+		return 0;
+	      sib.byte = *code++;
+
+	      x->log2_index_scale = 1 << sib.log2_scale;
+	      x->regs[1] |= sib.base;
+	      x->flags |= X86_INSN_HAS_BASE;
+
+	      if (sib.index != X86_INSN_GP_REG_SP)
+		{
+		  x->regs[2] |= sib.index;
+		  x->flags |= X86_INSN_HAS_INDEX;
+		}
+	    }
+	}
+      else
+	{
+	  /* effective_address_bits == 16 */
+	  switch (modrm.mode)
+	    {
+	    case 0:
+	      if (modrm.rm == 6)
+		{
+		  /* [disp16] */
+		  log2_disp_bytes = 1;
+		  break;
+		}
+	      /* fall through */
+	    case 1:
+	    case 2:
+	      switch (modrm.rm)
+		{
+		case 0:		/* [bx + si/di] */
+		case 1:
+		  x->regs[1] = X86_INSN_GP_REG_BX;
+		  x->regs[2] = X86_INSN_GP_REG_SI + (modrm.rm & 1);
+		  x->flags |= X86_INSN_HAS_BASE | X86_INSN_HAS_INDEX;
+		  break;
+
+		case 2:		/* [bp + si/di] */
+		case 3:
+		  x->regs[1] = X86_INSN_GP_REG_BP;
+		  x->regs[2] = X86_INSN_GP_REG_SI + (modrm.rm & 1);
+		  x->flags |= X86_INSN_HAS_BASE | X86_INSN_HAS_INDEX;
+		  break;
+
+		case 4:		/* [si/di] */
+		case 5:
+		  x->regs[1] = X86_INSN_GP_REG_SI + (modrm.rm & 1);
+		  x->flags |= X86_INSN_HAS_BASE;
+		  break;
+
+		case 6:		/* [bp + disp] */
+		  x->regs[1] = X86_INSN_GP_REG_BP;
+		  x->flags |= X86_INSN_HAS_BASE;
+		  break;
+
+		case 7:		/* [bx + disp] */
+		  x->regs[1] = X86_INSN_GP_REG_BX;
+		  x->flags |= X86_INSN_HAS_BASE;
+		  break;
+		}
+
+	      if (modrm.mode != 0)
+		log2_disp_bytes = modrm.mode == 1 ? 0 : 1;
+	      break;
+	    }
+	}
+      
+      if (log2_disp_bytes != ~0)
+	{
+	  i64 disp;
+	  code = x86_insn_parse_number (log2_disp_bytes, code, code_end,
+					&disp);
+	  if (code)
+	    x->displacement = disp;
+	}
+    }
+
+  return code;
+}
+
+u8 * x86_insn_parse (x86_insn_parse_t * p, u8 * code_start)
+{
+  u8 i, * code, * code_end;
+  x86_insn_t * insn, * group_insn;
+  u8 default_operand_bits, effective_operand_bits;
+  u32 opcode, parse_flags;
+
+  /* Preserve global parse flags. */
+  parse_flags = p->flags & (X86_INSN_PARSE_32_BIT | X86_INSN_PARSE_64_BIT);
+  memset (p, 0, sizeof (p[0]));
+  p->flags = parse_flags;
+
+  /* 64 implies 32 bit parsing. */
+  if (parse_flags & X86_INSN_PARSE_64_BIT)
+    parse_flags |= X86_INSN_PARSE_32_BIT;
+
+  /* Instruction must be <= 15 bytes. */
+  code = code_start;
+  code_end = code + 15;
+
+  /* Parse legacy prefixes. */
+  while (1)
+    {
+      if (code >= code_end)
+	goto insn_too_long;
+      i = code[0];
+      code++;
+      switch (i)
+	{
+	default: goto prefix_done;
+
+	  /* Set flags based on prefix. */
+#define _(x,o) case o: p->flags |= X86_INSN_##x; break;
+	  foreach_x86_legacy_prefix;
+#undef _
+	}
+    }
+ prefix_done:
+
+  /* REX prefix. */
+  if ((parse_flags & X86_INSN_PARSE_64_BIT) && i >= 0x40 && i <= 0x4f)
+    {
+      p->regs[0] |= ((i & (1 << 2)) != 0) << 3;	/* r bit */
+      p->regs[1] |= ((i & (1 << 0)) != 0) << 3;	/* b bit */
+      p->regs[2] |= ((i & (1 << 1)) != 0) << 3;	/* x bit */
+      p->flags |= ((i & (1 << 3))		/* w bit */
+		   ? X86_INSN_OPERAND_SIZE_64 : 0);
+      if (code >= code_end)
+	goto insn_too_long;
+      i = *code++;
+    }
+
+  opcode = i;
+  if (opcode == 0x0f)
+    {
+      /* two byte opcode. */;
+      if (code >= code_end)
+	goto insn_too_long;
+      i = *code++;
+      opcode = (opcode << 8) | i;
+      insn = x86_insns_two_byte + i;
+    }
+  else
+    {
+      static x86_insn_t arpl = {
+	.name = "arpl",
+	.operands[0].data = "Ew",
+	.operands[1].data = "Gw",
+      };
+
+      if (PREDICT_FALSE (i == 0x63
+			 && ! (parse_flags & X86_INSN_PARSE_64_BIT)))
+	insn = &arpl;
+      else
+	insn = x86_insns_one_byte + i;
+    }
+
+  if ((i = X86_INSN_FLAG_GET_SSE_GROUP (insn->flags)) != 0)
+    {
+      x86_insn_group8_t * g8;
+
+      if (p->flags & X86_INSN_OPERAND_SIZE)
+	g8 = x86_insn_sse_groups_operand_size;
+      else if (p->flags & X86_INSN_REPZ)
+	g8 = x86_insn_sse_groups_repz;
+      else if (p->flags & X86_INSN_REPNZ)
+	g8 = x86_insn_sse_groups_repnz;
+      else
+	g8 = 0;
+
+      /* insn flags have 1 + group so != 0 test above can work. */
+      ASSERT ((i - 1) < ARRAY_LEN (x86_insn_sse_groups_operand_size));
+      if (g8)
+	insn = g8[i - 1].insns + (opcode & 7);
+    }
+
+  /* Parse modrm and displacement if present. */
+  if (x86_insn_has_modrm_byte (insn))
+    {
+      x86_insn_modrm_byte_t modrm;
+
+      if (code >= code_end)
+	goto insn_too_long;
+      modrm.byte = *code++;
+
+      /* Handle special 0x0f01 and 0x0fae encodings. */
+      if (PREDICT_FALSE (modrm.mode == 3
+			 && (opcode == 0x0f01
+			     || opcode == 0x0fae)))
+	{
+	  static x86_insn_t x86_insns_0f01_special[] = {
+	    _0 (swapgs), _0 (rdtscp), _0 (bad), _0 (bad),
+	    _0 (bad), _0 (bad), _0 (bad), _0 (bad),
+	  };
+	  static x86_insn_t x86_insns_0fae_special[] = {
+	    _0 (vmrun), _0 (vmmcall), _0 (vmload), _0 (vmsave),
+	    _0 (stgi), _0 (clgi), _0 (skinit), _0 (invlpga),
+	  };
+
+	  if (opcode == 0x0f01)
+	    insn = x86_insns_0f01_special;
+	  else
+	    insn = x86_insns_0fae_special;
+	  insn += modrm.rm;
+	  opcode = (opcode << 8) | modrm.byte;
+	}
+      else
+	{
+	  code = x86_insn_parse_modrm_byte (p, modrm, parse_flags,
+					    code, code_end);
+	  if (! code)
+	    goto insn_too_long;
+	}
+    }
+
+  group_insn = 0;
+  if ((i = X86_INSN_FLAG_GET_MODRM_REG_GROUP (insn->flags)) != 0)
+    {
+      u32 g = i - 1;
+      ASSERT (g < ARRAY_LEN (x86_insn_modrm_reg_groups));
+      group_insn = x86_insn_modrm_reg_groups[g].insns + (p->regs[0] & 7);
+    }
+
+  p->insn = insn[0];
+  if (group_insn)
+    {
+      u32 k;
+      p->insn.name = group_insn->name;
+      p->insn.flags |= group_insn->flags;
+      for (k = 0; k < ARRAY_LEN (group_insn->operands); k++)
+	if (x86_insn_operand_is_valid (group_insn, k))
+	  p->insn.operands[k] = group_insn->operands[k];
+    }
+
+  default_operand_bits
+    = ((((parse_flags & X86_INSN_PARSE_32_BIT) != 0)
+	^ ((p->flags & X86_INSN_OPERAND_SIZE) != 0))
+       ? BITS (u32) : BITS (u16));
+
+  if ((parse_flags & X86_INSN_PARSE_64_BIT)
+      && (p->insn.flags & X86_INSN_FLAG_DEFAULT_64_BIT))
+    default_operand_bits = BITS (u64);
+
+  effective_operand_bits = default_operand_bits;
+  if (p->flags & X86_INSN_OPERAND_SIZE_64)
+    effective_operand_bits = BITS (u64);
+
+  p->log2_effective_operand_bytes = 1;
+  p->log2_effective_operand_bytes += effective_operand_bits > 16;
+  p->log2_effective_operand_bytes += effective_operand_bits > 32;
+
+  /* Parse immediate if present. */
+  {
+    u32 l = x86_insn_log2_immediate_bytes (p, insn);
+    if (l <= 3)
+      {
+	code = x86_insn_parse_number (l, code, code_end, &p->immediate);
+	if (! code)
+	  goto insn_too_long;
+      }
+  }
+
+  return code;
+
+ insn_too_long:
+  return 0;
+}
+
+static u8 * format_x86_gp_reg_operand (u8 * s, va_list * va)
+{
+  u32 r = va_arg (*va, u32);
+  u32 log2_n_bytes = va_arg (*va, u32);
+
+  const char names8[8] = "acdbsbsd";
+  const char names16[8] = "xxxxppii";
+
+  ASSERT (r < 16);
+
+  /* Add % register prefix. */
+  vec_add1 (s, '%');
+
+  switch (log2_n_bytes)
+    {
+    case 0:
+      {
+
+	if (r < 8)
+	  s = format (s, "%c%c", names8[r & 3], (r >> 2) ? 'l' : 'h');
+	else
+	  s = format (s, "r%db", r);
+      }
+      break;
+      
+      case 2:
+      case 3:
+	s = format (s, "%c", log2_n_bytes == 2 ? 'e' : 'r');
+	/* fall through */
+      case 1:
+	if (r < 8)
+	  s = format (s, "%c%c", names8[r], names16[r]);
+	else
+	  {
+	    s = format (s, "%d", r);
+	    if (log2_n_bytes != 3)
+	      s = format (s, "%c", log2_n_bytes == 1 ? 'w' : 'd');
+	  }
+	break;
+
+    default:
+      ASSERT (0);
+    }
+
+  return s;
+}
+
+static u8 * format_x86_reg_operand (u8 * s, va_list * va)
+{
+  u32 reg = va_arg (*va, u32);
+  u32 log2_n_bytes = va_arg (*va, u32);
+  u32 type = va_arg (*va, u32);
+
+  switch (type)
+    {
+    default:
+      ASSERT (0);
+      break;
+
+    case 'x':
+      ASSERT (reg < 16);
+      return format (s, "%%xmm%d", reg);
+
+    case 'm':
+      ASSERT (reg < 8);
+      return format (s, "%%mm%d", reg);
+
+      /* Explicit byte/word/double-word/quad-word */
+    case 'b': log2_n_bytes = 0; break;
+    case 'w': log2_n_bytes = 1; break;
+    case 'd': log2_n_bytes = 2; break;
+    case 'q': log2_n_bytes = 3; break;
+
+      /* Use effective operand size. */
+    case 'v': break;
+
+      /* word or double-word depending on effective operand size. */
+    case 'z':
+      log2_n_bytes = clib_min (log2_n_bytes, 2);
+      break;
+    }
+
+  s = format (s, "%U", format_x86_gp_reg_operand, reg, log2_n_bytes);
+  return s;
+}
+
+static u8 * format_x86_mem_operand (u8 * s, va_list * va)
+{
+  x86_insn_parse_t * p = va_arg (*va, x86_insn_parse_t *);
+
+  if (p->displacement != 0)
+    s = format (s, "0x%x", p->displacement);
+
+  if (p->flags & X86_INSN_HAS_BASE)
+    {
+      s = format (s, "(%U",
+		  format_x86_gp_reg_operand, p->regs[1],
+		    p->log2_effective_address_bytes);
+      if (p->flags & X86_INSN_HAS_INDEX)
+	{
+	  s = format (s, ",%U",
+		      format_x86_gp_reg_operand, p->regs[2],
+		        p->log2_effective_address_bytes);
+	  if (p->log2_index_scale != 0)
+	    s = format (s, ",%d", 1 << p->log2_index_scale);
+	}
+      s = format (s, ")");
+    }
+
+  /* [RIP+disp] PC relative addressing in 64 bit mode. */
+  else if (p->flags & X86_INSN_PARSE_64_BIT)
+    s = format (s, "(%%rip)");
+
+  return s;
+}
+
+static u8 * format_x86_insn_operand (u8 * s, va_list * va)
+{
+  x86_insn_parse_t * p = va_arg (*va, x86_insn_parse_t *);
+  x86_insn_t * insn = &p->insn;
+  u32 o = va_arg (*va, u32);
+  u8 c, t;
+
+  ASSERT (o < ARRAY_LEN (insn->operands));
+  c = insn->operands[o].code;
+  t = insn->operands[o].type;
+
+  /* Register encoded in instruction. */
+  if (c < 8)
+    return format (s, "%U",
+		   format_x86_gp_reg_operand, c,
+		   p->log2_effective_operand_bytes);
+
+  switch (c)
+    {
+    /* Memory or reg field from modrm byte. */
+    case 'M':
+      ASSERT (p->flags & X86_INSN_IS_ADDRESS);
+      /* FALLTHROUGH */
+    case 'E':
+      if (p->flags & X86_INSN_IS_ADDRESS)
+	s = format (s, "%U", format_x86_mem_operand, p);
+      else
+	s = format (s, "%U",
+		    format_x86_reg_operand, p->regs[1],
+		    p->log2_effective_operand_bytes, t);
+      break;
+
+    /* reg field from modrm byte. */
+    case 'R':
+    case 'G':
+      s = format (s, "%U",
+		  format_x86_reg_operand, p->regs[0],
+		  p->log2_effective_operand_bytes, t);
+      break;
+
+    case 'I':
+      {
+	u32 l = x86_insn_log2_immediate_bytes (p, insn);
+	i64 mask = pow2_mask (8ULL << l);
+	s = format (s, "$0x%Lx", p->immediate & mask);
+      }
+      break;
+
+    case 'J':
+      if (p->immediate < 0)
+	s = format (s, "- 0x%Lx", -p->immediate);
+      else
+	s = format (s, "+ 0x%Lx", p->immediate);
+      break;
+
+    case 'O':
+      s = format (s, "0x%Lx", p->immediate);
+      break;
+
+    case 'A':
+      /* AX/AL */
+      s = format (s, "%U",
+		  format_x86_gp_reg_operand, X86_INSN_GP_REG_AX,
+		  t == 'L' ? 0 : p->log2_effective_operand_bytes);
+      break;
+
+    case 'B':
+      /* BX/BL/BP */
+      s = format (s, "%U",
+		  format_x86_gp_reg_operand,
+		  t == 'P' ? X86_INSN_GP_REG_BP : X86_INSN_GP_REG_BX,
+		  t == 'L' ? 0 : p->log2_effective_operand_bytes);
+      break;
+
+    case 'C':
+      /* CX/CL */
+      s = format (s, "%U",
+		  format_x86_gp_reg_operand, X86_INSN_GP_REG_CX,
+		  t == 'L' ? 0 : p->log2_effective_operand_bytes);
+      break;
+
+    case 'D':
+      /* DX/DL/DI */
+      s = format (s, "%U",
+		  format_x86_gp_reg_operand,
+		  t == 'I' ? X86_INSN_GP_REG_DI : X86_INSN_GP_REG_DX,
+		  t == 'L' ? 0 : p->log2_effective_operand_bytes);
+      break;
+
+    case 'S':
+      /* SI/SP */
+      s = format (s, "%U",
+		  format_x86_gp_reg_operand,
+		  t == 'I' ? X86_INSN_GP_REG_SI : X86_INSN_GP_REG_SP,
+		  p->log2_effective_operand_bytes);
+      break;
+
+    case '1':
+      s = format (s, "1");
+      break;
+
+    default:
+      ASSERT (0);
+    }
+
+  return s;
+}
+
+u8 * format_x86_insn_parse (u8 * s, va_list * va)
+{
+  x86_insn_parse_t * p = va_arg (*va, x86_insn_parse_t *);
+  x86_insn_t * insn = &p->insn;
+  u32 o, i, is_src_dst;
+
+  s = format (s, "%s", insn->name);
+
+  if (! x86_insn_operand_is_valid (insn, 0))
+    goto done;
+
+  is_src_dst = x86_insn_operand_is_valid (insn, 1);
+
+  /* If instruction has immediate add suffix to opcode to
+     indicate operand size. */
+  if (is_src_dst)
+    {
+      u32 b;
+
+      b = x86_insn_log2_immediate_bytes (p, insn);
+      if (b < p->log2_effective_operand_bytes
+	  && (p->flags & X86_INSN_IS_ADDRESS))
+	s = format (s, "%c", "bwlq"[b]);
+    }
+
+  for (i = 0; i < ARRAY_LEN (insn->operands); i++)
+    {
+      o = is_src_dst + i;
+      if (! x86_insn_operand_is_valid (insn, o))
+	break;
+      s = format (s, "%s%U",
+		  i == 0 ? " " : ", ",
+		  format_x86_insn_operand, p, o);
+    }
+
+  if (is_src_dst)
+    s = format (s, ", %U",
+		format_x86_insn_operand, p, 0);
+
+ done:
+  return s;
+}
diff --git a/src/vppinfra/asm_x86.h b/src/vppinfra/asm_x86.h
new file mode 100644
index 00000000..dacef617
--- /dev/null
+++ b/src/vppinfra/asm_x86.h
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_asm_x86_h
+#define included_asm_x86_h
+
+#include <vppinfra/format.h>
+
+typedef union
+{
+  struct
+  {
+    u8 code;
+    u8 type;
+  };
+  u8 data[2];
+} x86_insn_operand_t;
+
+typedef struct
+{
+  /* Instruction name. */
+  char *name;
+
+  /* X86 instructions may have up to 3 operands. */
+  x86_insn_operand_t operands[3];
+
+  u16 flags;
+#define X86_INSN_FLAG_DEFAULT_64_BIT		(1 << 0)
+#define X86_INSN_FLAG_SET_SSE_GROUP(n)		((n) << 5)
+#define X86_INSN_FLAG_GET_SSE_GROUP(f)		(((f) >> 5) & 0x1f)
+#define X86_INSN_FLAG_SET_MODRM_REG_GROUP(n)	(((n) & 0x3f) << 10)
+#define X86_INSN_FLAG_GET_MODRM_REG_GROUP(f)	(((f) >> 10) & 0x3f)
+} x86_insn_t;
+
+always_inline uword
+x86_insn_operand_is_valid (x86_insn_t * i, uword o)
+{
+  ASSERT (o < ARRAY_LEN (i->operands));
+  return i->operands[o].code != '_';
+}
+
+#define foreach_x86_legacy_prefix		\
+  _ (OPERAND_SIZE, 0x66)			\
+  _ (ADDRESS_SIZE, 0x67)			\
+  _ (SEGMENT_CS, 0x2e)				\
+  _ (SEGMENT_DS, 0x3e)				\
+  _ (SEGMENT_ES, 0x26)				\
+  _ (SEGMENT_FS, 0x64)				\
+  _ (SEGMENT_GS, 0x65)				\
+  _ (SEGMENT_SS, 0x36)				\
+  _ (LOCK, 0xf0)				\
+  _ (REPZ, 0xf3)				\
+  _ (REPNZ, 0xf2)
+
+#define foreach_x86_insn_parse_flag		\
+  /* Parse in 32/64-bit mode. */		\
+  _ (PARSE_32_BIT, 0)				\
+  _ (PARSE_64_BIT, 0)				\
+  _ (IS_ADDRESS, 0)				\
+ /* regs[1/2] is a valid base/index register */	\
+  _ (HAS_BASE, 0)				\
+  _ (HAS_INDEX, 0)				\
+ /* rex w bit */				\
+ _ (OPERAND_SIZE_64, 0)
+
+typedef enum
+{
+#define _(f,o) X86_INSN_FLAG_BIT_##f,
+  foreach_x86_insn_parse_flag foreach_x86_legacy_prefix
+#undef _
+} x86_insn_parse_flag_bit_t;
+
+typedef enum
+{
+#define _(f,o) X86_INSN_##f = 1 << X86_INSN_FLAG_BIT_##f,
+  foreach_x86_insn_parse_flag foreach_x86_legacy_prefix
+#undef _
+} x86_insn_parse_flag_t;
+
+typedef struct
+{
+  /* Registers in instruction.
+     [0] is modrm reg field
+     [1] is base reg
+     [2] is index reg. */
+  u8 regs[3];
+
+  /* Scale for index register. */
+  u8 log2_index_scale:2;
+  u8 log2_effective_operand_bytes:3;
+  u8 log2_effective_address_bytes:3;
+
+  i32 displacement;
+
+  /* Parser flags: set of x86_insn_parse_flag_t enums. */
+  u32 flags;
+
+  i64 immediate;
+
+  x86_insn_t insn;
+} x86_insn_parse_t;
+
+u8 *x86_insn_parse (x86_insn_parse_t * p, u8 * code_start);
+format_function_t format_x86_insn_parse;
+
+#endif /* included_asm_x86_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/backtrace.c b/src/vppinfra/backtrace.c
new file mode 100644
index 00000000..bbfb792c
--- /dev/null
+++ b/src/vppinfra/backtrace.c
@@ -0,0 +1,267 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2004 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/clib.h>
+#include <vppinfra/error.h>
+
+#ifdef __mips__
+
+/* Let code below know we've defined _clib_backtrace */
+#define clib_backtrace_defined
+
+#include <vppinfra/asm_mips.h>
+
+uword
+clib_backtrace (uword * callers, uword max_callers, uword n_frames_to_skip)
+{
+  u32 *pc;
+  void *sp;
+  uword i, saved_pc;
+
+  /* Figure current PC, saved PC and stack pointer. */
+  asm volatile (".set push\n"
+		".set noat\n" "move %[saved_pc], $31\n" "move %[sp], $29\n"
+		/* Fetches current PC. */
+		"la $at, 1f\n"
+		"jalr %[pc], $at\n"
+		"nop\n"
+		"1:\n"
+		".set pop\n":[pc] "=r" (pc),
+		[saved_pc] "=r" (saved_pc),[sp] "=r" (sp));
+
+  /* Also skip current frame. */
+  n_frames_to_skip += 1;
+
+  for (i = 0; i < max_callers + n_frames_to_skip; i++)
+    {
+      mips_insn_opcode_t op;
+      mips_insn_special_funct_t funct;
+      i32 insn, rs, rt, rd, immediate, found_saved_pc;
+      u32 *start_pc;
+
+      /* Parse instructions until we reach prologue for this
+         stack frame.  We'll need to figure out where saved
+         PC is and where previous stack frame lives. */
+      start_pc = pc;
+      found_saved_pc = 0;
+      while (1)
+	{
+	  insn = *--pc;
+	  op = mips_insn_get_op (insn);
+	  funct = mips_insn_get_funct (insn);
+	  rs = mips_insn_get_rs (insn);
+	  rt = mips_insn_get_rt (insn);
+	  rd = mips_insn_get_rd (insn);
+	  immediate = mips_insn_get_immediate (insn);
+
+	  switch (op)
+	    {
+	    default:
+	      break;
+
+	    case MIPS_OPCODE_sd:
+	    case MIPS_OPCODE_sw:
+	      /* Trace stores of return address. */
+	      if (rt == MIPS_REG_RA)
+		{
+		  void *addr = sp + immediate;
+
+		  /* If RA is stored somewhere other than in the
+		     stack frame, give up. */
+		  if (rs != MIPS_REG_SP)
+		    goto backtrace_done;
+
+		  ASSERT (immediate % 4 == 0);
+		  if (op == MIPS_OPCODE_sw)
+		    saved_pc = ((u32 *) addr)[0];
+		  else
+		    saved_pc = ((u64 *) addr)[0];
+		  found_saved_pc = 1;
+		}
+	      break;
+
+	    case MIPS_OPCODE_addiu:
+	    case MIPS_OPCODE_daddiu:
+	    case MIPS_OPCODE_addi:
+	    case MIPS_OPCODE_daddi:
+	      if (rt == MIPS_REG_SP)
+		{
+		  if (rs != MIPS_REG_SP)
+		    goto backtrace_done;
+
+		  ASSERT (immediate % 4 == 0);
+
+		  /* Assume positive offset is part of the epilogue.
+		     E.g.
+		     jr ra
+		     add sp,sp,100
+		   */
+		  if (immediate > 0)
+		    continue;
+
+		  /* Negative offset means allocate stack space.
+		     This could either be the prologue or could be due to
+		     alloca. */
+		  sp -= immediate;
+
+		  /* This frame will not save RA. */
+		  if (i == 0)
+		    goto found_prologue;
+
+		  /* Assume that addiu sp,sp,-N without store of ra means
+		     that we have not found the prologue yet. */
+		  if (found_saved_pc)
+		    goto found_prologue;
+		}
+	      break;
+
+	    case MIPS_OPCODE_slti:
+	    case MIPS_OPCODE_sltiu:
+	    case MIPS_OPCODE_andi:
+	    case MIPS_OPCODE_ori:
+	    case MIPS_OPCODE_xori:
+	    case MIPS_OPCODE_lui:
+	    case MIPS_OPCODE_ldl:
+	    case MIPS_OPCODE_ldr:
+	    case MIPS_OPCODE_lb:
+	    case MIPS_OPCODE_lh:
+	    case MIPS_OPCODE_lwl:
+	    case MIPS_OPCODE_lw:
+	    case MIPS_OPCODE_lbu:
+	    case MIPS_OPCODE_lhu:
+	    case MIPS_OPCODE_lwr:
+	    case MIPS_OPCODE_lwu:
+	    case MIPS_OPCODE_ld:
+	      /* Give up when we find anyone setting the stack pointer. */
+	      if (rt == MIPS_REG_SP)
+		goto backtrace_done;
+	      break;
+
+	    case MIPS_OPCODE_SPECIAL:
+	      if (rd == MIPS_REG_SP)
+		switch (funct)
+		  {
+		  default:
+		    /* Give up when we find anyone setting the stack pointer. */
+		    goto backtrace_done;
+
+		  case MIPS_SPECIAL_FUNCT_break:
+		  case MIPS_SPECIAL_FUNCT_jr:
+		  case MIPS_SPECIAL_FUNCT_sync:
+		  case MIPS_SPECIAL_FUNCT_syscall:
+		  case MIPS_SPECIAL_FUNCT_tge:
+		  case MIPS_SPECIAL_FUNCT_tgeu:
+		  case MIPS_SPECIAL_FUNCT_tlt:
+		  case MIPS_SPECIAL_FUNCT_tltu:
+		  case MIPS_SPECIAL_FUNCT_teq:
+		  case MIPS_SPECIAL_FUNCT_tne:
+		    /* These instructions can validly have rd == MIPS_REG_SP */
+		    break;
+		  }
+	      break;
+	    }
+	}
+
+    found_prologue:
+      /* Check sanity of saved pc. */
+      if (saved_pc & 3)
+	goto backtrace_done;
+      if (saved_pc == 0)
+	goto backtrace_done;
+
+      if (i >= n_frames_to_skip)
+	callers[i - n_frames_to_skip] = saved_pc;
+      pc = uword_to_pointer (saved_pc, u32 *);
+    }
+
+backtrace_done:
+  if (i < n_frames_to_skip)
+    return 0;
+  else
+    return i - n_frames_to_skip;
+}
+#endif /* __mips__ */
+
+#ifndef clib_backtrace_defined
+#define clib_backtrace_defined
+
+typedef struct clib_generic_stack_frame_t
+{
+  struct clib_generic_stack_frame_t *prev;
+  void *return_address;
+} clib_generic_stack_frame_t;
+
+/* This will only work if we have a frame pointer.
+   Without a frame pointer we have to parse the machine code to
+   parse the stack frames. */
+uword
+clib_backtrace (uword * callers, uword max_callers, uword n_frames_to_skip)
+{
+  clib_generic_stack_frame_t *f;
+  uword i;
+
+  f = __builtin_frame_address (0);
+
+  /* Also skip current frame. */
+  n_frames_to_skip += 1;
+
+  for (i = 0; i < max_callers + n_frames_to_skip; i++)
+    {
+      f = f->prev;
+      if (!f)
+	goto backtrace_done;
+      if (clib_abs ((void *) f - (void *) f->prev) > (64 * 1024))
+	goto backtrace_done;
+      if (i >= n_frames_to_skip)
+	callers[i - n_frames_to_skip] = pointer_to_uword (f->return_address);
+    }
+
+backtrace_done:
+  if (i < n_frames_to_skip)
+    return 0;
+  else
+    return i - n_frames_to_skip;
+}
+#endif /* clib_backtrace_defined */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/bihash_24_8.h b/src/vppinfra/bihash_24_8.h
new file mode 100644
index 00000000..353f06bf
--- /dev/null
+++ b/src/vppinfra/bihash_24_8.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#undef BIHASH_TYPE
+
+#define BIHASH_TYPE _24_8
+#define BIHASH_KVP_PER_PAGE 4
+
+#ifndef __included_bihash_24_8_h__
+#define __included_bihash_24_8_h__
+
+#include <vppinfra/heap.h>
+#include <vppinfra/format.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/xxhash.h>
+
+typedef struct
+{
+  u64 key[3];
+  u64 value;
+} clib_bihash_kv_24_8_t;
+
+static inline int
+clib_bihash_is_free_24_8 (const clib_bihash_kv_24_8_t * v)
+{
+  /* Free values are memset to 0xff, check a bit... */
+  if (v->key[0] == ~0ULL && v->value == ~0ULL)
+    return 1;
+  return 0;
+}
+
+static inline u64
+clib_bihash_hash_24_8 (const clib_bihash_kv_24_8_t * v)
+{
+#if __SSE4_2__
+  u32 value = 0;
+  value = _mm_crc32_u64 (value, v->key[0]);
+  value = _mm_crc32_u64 (value, v->key[1]);
+  value = _mm_crc32_u64 (value, v->key[2]);
+  return value;
+#else
+  u64 tmp = v->key[0] ^ v->key[1] ^ v->key[2];
+  return clib_xxhash (tmp);
+#endif
+}
+
+static inline u8 *
+format_bihash_kvp_24_8 (u8 * s, va_list * args)
+{
+  clib_bihash_kv_24_8_t *v = va_arg (*args, clib_bihash_kv_24_8_t *);
+
+  s = format (s, "key %llu %llu %llu value %llu",
+	      v->key[0], v->key[1], v->key[2], v->value);
+  return s;
+}
+
+static inline int
+clib_bihash_key_compare_24_8 (const u64 * a, const u64 * b)
+{
+  return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) == 0;
+}
+
+#undef __included_bihash_template_h__
+#include <vppinfra/bihash_template.h>
+
+#endif /* __included_bihash_24_8_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/bihash_8_8.h b/src/vppinfra/bihash_8_8.h
new file mode 100644
index 00000000..a0d6df2e
--- /dev/null
+++ b/src/vppinfra/bihash_8_8.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#undef BIHASH_TYPE
+
+#define BIHASH_TYPE _8_8
+#define BIHASH_KVP_PER_PAGE 4
+
+#ifndef __included_bihash_8_8_h__
+#define __included_bihash_8_8_h__
+
+#include <vppinfra/heap.h>
+#include <vppinfra/format.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/xxhash.h>
+
+#if __SSE4_2__
+#include <x86intrin.h>
+#endif
+
+/** 8 octet key, 8 octet key value pair */
+typedef struct
+{
+  u64 key;			/**< the key */
+  u64 value;			/**< the value */
+} clib_bihash_kv_8_8_t;
+
+/** Decide if a clib_bihash_kv_8_8_t instance is free
+    @param v- pointer to the (key,value) pair
+*/
+static inline int
+clib_bihash_is_free_8_8 (clib_bihash_kv_8_8_t * v)
+{
+  if (v->key == ~0ULL && v->value == ~0ULL)
+    return 1;
+  return 0;
+}
+
+/** Hash a clib_bihash_kv_8_8_t instance
+    @param v - pointer to the (key,value) pair, hash the key (only)
+*/
+static inline u64
+clib_bihash_hash_8_8 (clib_bihash_kv_8_8_t * v)
+{
+#if __SSE4_2__
+  return _mm_crc32_u64 (0, v->key);
+#else
+  return clib_xxhash (v->key);
+#endif
+}
+
+/** Format a clib_bihash_kv_8_8_t instance
+    @param s - u8 * vector under construction
+    @param args (vararg) - the (key,value) pair to format
+    @return s - the u8 * vector under construction
+*/
+static inline u8 *
+format_bihash_kvp_8_8 (u8 * s, va_list * args)
+{
+  clib_bihash_kv_8_8_t *v = va_arg (*args, clib_bihash_kv_8_8_t *);
+
+  s = format (s, "key %llu value %llu", v->key, v->value);
+  return s;
+}
+
+/** Compare two clib_bihash_kv_8_8_t instances
+    @param a - first key
+    @param b - second key
+*/
+static inline int
+clib_bihash_key_compare_8_8 (u64 a, u64 b)
+{
+  return a == b;
+}
+
+#undef __included_bihash_template_h__
+#include <vppinfra/bihash_template.h>
+
+#endif /* __included_bihash_8_8_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/bihash_doc.h b/src/vppinfra/bihash_doc.h
new file mode 100644
index 00000000..e6ab9db6
--- /dev/null
+++ b/src/vppinfra/bihash_doc.h
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#error do not #include this file!
+
+/** \file
+
+    Bounded-index extensible hashing. The basic algorithm performs
+    thread-safe constant-time lookups in the face of a rational number
+    of hash collisions. The computed hash code h(k) must have
+    reasonable statistics with respect to the key space. It won't do
+    to have h(k) = 0 or 1, for all values of k.
+
+    Each bucket in the power-of-two bucket array contains the index
+    (in a private vppinfra memory heap) of the "backing store" for the
+    bucket, as well as a size field. The size field (log2_pages)
+    corresponds to 1, 2, 4, ... contiguous "pages" containing the
+    (key,value) pairs in the bucket.
+
+    When a single page fills, we allocate two contiguous pages.  We
+    recompute h(k) for each (key,value) pair, using an additional bit
+    to deal the (key, value) pairs into the "top" and "bottom" pages.
+
+    At lookup time, we compute h(k), using lg(bucket-array-size) to
+    pick the bucket. We read the bucket to find the base of the
+    backing pages.  We use an additional log2_pages' worth of bits
+    from h(k) to compute the offset of the page which will contain the
+    (key,value) pair we're trying to find.
+*/
+
+/** template key/value backing page structure */
+typedef struct clib_bihash_value
+{
+  union
+  {
+
+    clib_bihash_kv kvp[BIHASH_KVP_PER_PAGE]; /**< the actual key/value pairs */
+    clib_bihash_value *next_free;  /**< used when a KVP page (or block thereof) is on a freelist */
+  };
+} clib_bihash_value_t
+/** bihash bucket structure */
+  typedef struct
+{
+  union
+  {
+    struct
+    {
+      u32 offset;  /**< backing page offset in the clib memory heap */
+      u8 pad[3];   /**< log2 (size of the packing page block) */
+      u8 log2_pages;
+    };
+    u64 as_u64;
+  };
+} clib_bihash_bucket_t;
+
+/** A bounded index extensible hash table */
+typedef struct
+{
+  clib_bihash_bucket_t *buckets;  /**< Hash bucket vector, power-of-two in size */
+  volatile u32 *writer_lock;  /**< Writer lock, in its own cache line */
+    BVT (clib_bihash_value) ** working_copies;
+					    /**< Working copies (various sizes), to avoid locking against readers */
+  clib_bihash_bucket_t saved_bucket; /**< Saved bucket pointer */
+  u32 nbuckets;			     /**< Number of hash buckets */
+  u32 log2_nbuckets;		     /**< lg(nbuckets) */
+  u8 *name;			     /**< hash table name */
+    BVT (clib_bihash_value) ** freelists;
+				      /**< power of two freelist vector */
+  void *mheap;	/**< clib memory heap */
+} clib_bihash_t;
+
+/** Get pointer to value page given its clib mheap offset */
+static inline void *clib_bihash_get_value (clib_bihash * h, uword offset);
+
+/** Get clib mheap offset given a pointer */
+static inline uword clib_bihash_get_offset (clib_bihash * h, void *v);
+
+/** initialize a bounded index extensible hash table
+
+    @param h - the bi-hash table to initialize
+    @param name - name of the hash table
+    @param nbuckets - the number of buckets, will be rounded up to
+a power of two
+    @param memory_size - clib mheap size, in bytes
+*/
+
+void clib_bihash_init
+  (clib_bihash * h, char *name, u32 nbuckets, uword memory_size);
+
+/** Destroy a bounded index extensible hash table
+    @param h - the bi-hash table to free
+*/
+
+void clib_bihash_free (clib_bihash * h);
+
+/** Add or delete a (key,value) pair from a bi-hash table
+
+    @param h - the bi-hash table to search
+    @param add_v - the (key,value) pair to add
+    @param is_add - add=1, delete=0
+    @returns 0 on success, < 0 on error
+    @note This function will replace an existing (key,value) pair if the
+    new key matches an existing key
+*/
+int clib_bihash_add_del (clib_bihash * h, clib_bihash_kv * add_v, int is_add);
+
+
+/** Search a bi-hash table
+
+    @param h - the bi-hash table to search
+    @param search_v - (key,value) pair containing the search key
+    @param return_v - (key,value) pair which matches search_v.key
+    @returns 0 on success (with return_v set), < 0 on error
+*/
+int clib_bihash_search (clib_bihash * h,
+			clib_bihash_kv * search_v, clib_bihash_kv * return_v);
+
+
+/** Visit active (key,value) pairs in a bi-hash table
+
+    @param h - the bi-hash table to search
+    @param callback - function to call with each active (key,value) pair
+    @param arg - arbitrary second argument passed to the callback function
+    First argument is the (key,value) pair to visit
+    @note Trying to supply a proper function prototype for the
+    callback function appears to be a fool's errand.
+*/
+void clib_bihash_foreach_key_value_pair (clib_bihash * h,
+					 void *callback, void *arg);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/bihash_template.c b/src/vppinfra/bihash_template.c
new file mode 100644
index 00000000..4b0b4257
--- /dev/null
+++ b/src/vppinfra/bihash_template.c
@@ -0,0 +1,455 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @cond DOCUMENTATION_IS_IN_BIHASH_DOC_H */
+
+void BV (clib_bihash_init)
+  (BVT (clib_bihash) * h, char *name, u32 nbuckets, uword memory_size)
+{
+  void *oldheap;
+
+  nbuckets = 1 << (max_log2 (nbuckets));
+
+  h->name = (u8 *) name;
+  h->nbuckets = nbuckets;
+  h->log2_nbuckets = max_log2 (nbuckets);
+
+  h->mheap = mheap_alloc (0 /* use VM */ , memory_size);
+
+  oldheap = clib_mem_set_heap (h->mheap);
+  vec_validate_aligned (h->buckets, nbuckets - 1, CLIB_CACHE_LINE_BYTES);
+  h->writer_lock = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
+					   CLIB_CACHE_LINE_BYTES);
+
+  clib_mem_set_heap (oldheap);
+}
+
+void BV (clib_bihash_free) (BVT (clib_bihash) * h)
+{
+  mheap_free (h->mheap);
+  memset (h, 0, sizeof (*h));
+}
+
+static
+BVT (clib_bihash_value) *
+BV (value_alloc) (BVT (clib_bihash) * h, u32 log2_pages)
+{
+  BVT (clib_bihash_value) * rv = 0;
+  void *oldheap;
+
+  ASSERT (h->writer_lock[0]);
+  if (log2_pages >= vec_len (h->freelists) || h->freelists[log2_pages] == 0)
+    {
+      oldheap = clib_mem_set_heap (h->mheap);
+
+      vec_validate (h->freelists, log2_pages);
+      vec_validate_aligned (rv, (1 << log2_pages) - 1, CLIB_CACHE_LINE_BYTES);
+      clib_mem_set_heap (oldheap);
+      goto initialize;
+    }
+  rv = h->freelists[log2_pages];
+  h->freelists[log2_pages] = rv->next_free;
+
+initialize:
+  ASSERT (rv);
+  ASSERT (vec_len (rv) == (1 << log2_pages));
+  /*
+   * Latest gcc complains that the length arg is zero
+   * if we replace (1<<log2_pages) with vec_len(rv).
+   * No clue.
+   */
+  memset (rv, 0xff, sizeof (*rv) * (1 << log2_pages));
+  return rv;
+}
+
+static void
+BV (value_free) (BVT (clib_bihash) * h, BVT (clib_bihash_value) * v)
+{
+  u32 log2_pages;
+
+  ASSERT (h->writer_lock[0]);
+
+  log2_pages = min_log2 (vec_len (v));
+
+  ASSERT (vec_len (h->freelists) > log2_pages);
+
+  v->next_free = h->freelists[log2_pages];
+  h->freelists[log2_pages] = v;
+}
+
+static inline void
+BV (make_working_copy) (BVT (clib_bihash) * h, clib_bihash_bucket_t * b)
+{
+  BVT (clib_bihash_value) * v;
+  clib_bihash_bucket_t working_bucket __attribute__ ((aligned (8)));
+  void *oldheap;
+  BVT (clib_bihash_value) * working_copy;
+  u32 cpu_number = os_get_cpu_number ();
+
+  if (cpu_number >= vec_len (h->working_copies))
+    {
+      oldheap = clib_mem_set_heap (h->mheap);
+      vec_validate (h->working_copies, cpu_number);
+      clib_mem_set_heap (oldheap);
+    }
+
+  /*
+   * working_copies are per-cpu so that near-simultaneous
+   * updates from multiple threads will not result in sporadic, spurious
+   * lookup failures.
+   */
+  working_copy = h->working_copies[cpu_number];
+
+  h->saved_bucket.as_u64 = b->as_u64;
+  oldheap = clib_mem_set_heap (h->mheap);
+
+  if ((1 << b->log2_pages) > vec_len (working_copy))
+    {
+      vec_validate_aligned (working_copy, (1 << b->log2_pages) - 1,
+			    sizeof (u64));
+      h->working_copies[cpu_number] = working_copy;
+    }
+
+  _vec_len (working_copy) = 1 << b->log2_pages;
+  clib_mem_set_heap (oldheap);
+
+  v = BV (clib_bihash_get_value) (h, b->offset);
+
+  clib_memcpy (working_copy, v, sizeof (*v) * (1 << b->log2_pages));
+  working_bucket.as_u64 = b->as_u64;
+  working_bucket.offset = BV (clib_bihash_get_offset) (h, working_copy);
+  CLIB_MEMORY_BARRIER ();
+  b->as_u64 = working_bucket.as_u64;
+  h->working_copies[cpu_number] = working_copy;
+}
+
+static
+BVT (clib_bihash_value) *
+BV (split_and_rehash)
+  (BVT (clib_bihash) * h,
+   BVT (clib_bihash_value) * old_values, u32 new_log2_pages)
+{
+  BVT (clib_bihash_value) * new_values, *v, *new_v;
+  int i, j, k;
+
+  new_values = BV (value_alloc) (h, new_log2_pages);
+
+  v = old_values;
+  for (i = 0; i < vec_len (old_values); i++)
+    {
+      u64 new_hash;
+
+      for (j = 0; j < BIHASH_KVP_PER_PAGE; j++)
+	{
+	  if (BV (clib_bihash_is_free) (&(v->kvp[j])) == 0)
+	    {
+	      new_hash = BV (clib_bihash_hash) (&(v->kvp[j]));
+	      new_hash >>= h->log2_nbuckets;
+	      new_hash &= (1 << new_log2_pages) - 1;
+
+	      new_v = &new_values[new_hash];
+
+	      for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
+		{
+		  if (BV (clib_bihash_is_free) (&(new_v->kvp[k])))
+		    {
+		      clib_memcpy (&(new_v->kvp[k]), &(v->kvp[j]),
+				   sizeof (new_v->kvp[k]));
+		      goto doublebreak;
+		    }
+		}
+	      /* Crap. Tell caller to try again */
+	      BV (value_free) (h, new_values);
+	      return 0;
+	    }
+	doublebreak:
+	  ;
+	}
+      v++;
+    }
+  return new_values;
+}
+
+int BV (clib_bihash_add_del)
+  (BVT (clib_bihash) * h, BVT (clib_bihash_kv) * add_v, int is_add)
+{
+  u32 bucket_index;
+  clib_bihash_bucket_t *b, tmp_b;
+  BVT (clib_bihash_value) * v, *new_v, *save_new_v, *working_copy;
+  u32 value_index;
+  int rv = 0;
+  int i;
+  u64 hash, new_hash;
+  u32 new_log2_pages;
+  u32 cpu_number = os_get_cpu_number ();
+
+  hash = BV (clib_bihash_hash) (add_v);
+
+  bucket_index = hash & (h->nbuckets - 1);
+  b = &h->buckets[bucket_index];
+
+  hash >>= h->log2_nbuckets;
+
+  while (__sync_lock_test_and_set (h->writer_lock, 1))
+    ;
+
+  /* First elt in the bucket? */
+  if (b->offset == 0)
+    {
+      if (is_add == 0)
+	{
+	  rv = -1;
+	  goto unlock;
+	}
+
+      v = BV (value_alloc) (h, 0);
+      *v->kvp = *add_v;
+      tmp_b.as_u64 = 0;
+      tmp_b.offset = BV (clib_bihash_get_offset) (h, v);
+
+      b->as_u64 = tmp_b.as_u64;
+      goto unlock;
+    }
+
+  BV (make_working_copy) (h, b);
+
+  v = BV (clib_bihash_get_value) (h, h->saved_bucket.offset);
+  value_index = hash & ((1 << h->saved_bucket.log2_pages) - 1);
+  v += value_index;
+
+  if (is_add)
+    {
+      /*
+       * For obvious (in hindsight) reasons, see if we're supposed to
+       * replace an existing key, then look for an empty slot.
+       */
+      for (i = 0; i < BIHASH_KVP_PER_PAGE; i++)
+	{
+	  if (!memcmp (&(v->kvp[i]), &add_v->key, sizeof (add_v->key)))
+	    {
+	      clib_memcpy (&(v->kvp[i]), add_v, sizeof (*add_v));
+	      CLIB_MEMORY_BARRIER ();
+	      /* Restore the previous (k,v) pairs */
+	      b->as_u64 = h->saved_bucket.as_u64;
+	      goto unlock;
+	    }
+	}
+      for (i = 0; i < BIHASH_KVP_PER_PAGE; i++)
+	{
+	  if (BV (clib_bihash_is_free) (&(v->kvp[i])))
+	    {
+	      clib_memcpy (&(v->kvp[i]), add_v, sizeof (*add_v));
+	      CLIB_MEMORY_BARRIER ();
+	      b->as_u64 = h->saved_bucket.as_u64;
+	      goto unlock;
+	    }
+	}
+      /* no room at the inn... split case... */
+    }
+  else
+    {
+      for (i = 0; i < BIHASH_KVP_PER_PAGE; i++)
+	{
+	  if (!memcmp (&(v->kvp[i]), &add_v->key, sizeof (add_v->key)))
+	    {
+	      memset (&(v->kvp[i]), 0xff, sizeof (*(add_v)));
+	      CLIB_MEMORY_BARRIER ();
+	      b->as_u64 = h->saved_bucket.as_u64;
+	      goto unlock;
+	    }
+	}
+      rv = -3;
+      b->as_u64 = h->saved_bucket.as_u64;
+      goto unlock;
+    }
+
+  new_log2_pages = h->saved_bucket.log2_pages + 1;
+
+expand_again:
+  working_copy = h->working_copies[cpu_number];
+  new_v = BV (split_and_rehash) (h, working_copy, new_log2_pages);
+  if (new_v == 0)
+    {
+      new_log2_pages++;
+      goto expand_again;
+    }
+
+  /* Try to add the new entry */
+  save_new_v = new_v;
+  new_hash = BV (clib_bihash_hash) (add_v);
+  new_hash >>= h->log2_nbuckets;
+  new_hash &= (1 << min_log2 (vec_len (new_v))) - 1;
+  new_v += new_hash;
+
+  for (i = 0; i < BIHASH_KVP_PER_PAGE; i++)
+    {
+      if (BV (clib_bihash_is_free) (&(new_v->kvp[i])))
+	{
+	  clib_memcpy (&(new_v->kvp[i]), add_v, sizeof (*add_v));
+	  goto expand_ok;
+	}
+    }
+  /* Crap. Try again */
+  new_log2_pages++;
+  BV (value_free) (h, save_new_v);
+  goto expand_again;
+
+expand_ok:
+  tmp_b.log2_pages = min_log2 (vec_len (save_new_v));
+  tmp_b.offset = BV (clib_bihash_get_offset) (h, save_new_v);
+  CLIB_MEMORY_BARRIER ();
+  b->as_u64 = tmp_b.as_u64;
+  v = BV (clib_bihash_get_value) (h, h->saved_bucket.offset);
+  BV (value_free) (h, v);
+
+unlock:
+  CLIB_MEMORY_BARRIER ();
+  h->writer_lock[0] = 0;
+  return rv;
+}
+
+int BV (clib_bihash_search)
+  (const BVT (clib_bihash) * h,
+   BVT (clib_bihash_kv) * search_key, BVT (clib_bihash_kv) * valuep)
+{
+  u64 hash;
+  u32 bucket_index;
+  uword value_index;
+  BVT (clib_bihash_value) * v;
+  clib_bihash_bucket_t *b;
+  int i;
+
+  ASSERT (valuep);
+
+  hash = BV (clib_bihash_hash) (search_key);
+
+  bucket_index = hash & (h->nbuckets - 1);
+  b = &h->buckets[bucket_index];
+
+  if (b->offset == 0)
+    return -1;
+
+  hash >>= h->log2_nbuckets;
+
+  v = BV (clib_bihash_get_value) (h, b->offset);
+  value_index = hash & ((1 << b->log2_pages) - 1);
+  v += value_index;
+
+  for (i = 0; i < BIHASH_KVP_PER_PAGE; i++)
+    {
+      if (BV (clib_bihash_key_compare) (v->kvp[i].key, search_key->key))
+	{
+	  *valuep = v->kvp[i];
+	  return 0;
+	}
+    }
+  return -1;
+}
+
+u8 *BV (format_bihash) (u8 * s, va_list * args)
+{
+  BVT (clib_bihash) * h = va_arg (*args, BVT (clib_bihash) *);
+  int verbose = va_arg (*args, int);
+  clib_bihash_bucket_t *b;
+  BVT (clib_bihash_value) * v;
+  int i, j, k;
+  u64 active_elements = 0;
+
+  s = format (s, "Hash table %s\n", h->name ? h->name : (u8 *) "(unnamed)");
+
+  for (i = 0; i < h->nbuckets; i++)
+    {
+      b = &h->buckets[i];
+      if (b->offset == 0)
+	{
+	  if (verbose > 1)
+	    s = format (s, "[%d]: empty\n", i);
+	  continue;
+	}
+
+      if (verbose)
+	{
+	  s = format (s, "[%d]: heap offset %d, len %d\n", i,
+		      b->offset, (1 << b->log2_pages));
+	}
+
+      v = BV (clib_bihash_get_value) (h, b->offset);
+      for (j = 0; j < (1 << b->log2_pages); j++)
+	{
+	  for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
+	    {
+	      if (BV (clib_bihash_is_free) (&v->kvp[k]))
+		{
+		  if (verbose > 1)
+		    s = format (s, "    %d: empty\n",
+				j * BIHASH_KVP_PER_PAGE + k);
+		  continue;
+		}
+	      if (verbose)
+		{
+		  s = format (s, "    %d: %U\n",
+			      j * BIHASH_KVP_PER_PAGE + k,
+			      BV (format_bihash_kvp), &(v->kvp[k]));
+		}
+	      active_elements++;
+	    }
+	  v++;
+	}
+    }
+
+  s = format (s, "    %lld active elements\n", active_elements);
+  s = format (s, "    %d free lists\n", vec_len (h->freelists));
+
+  return s;
+}
+
+void BV (clib_bihash_foreach_key_value_pair)
+  (BVT (clib_bihash) * h, void *callback, void *arg)
+{
+  int i, j, k;
+  clib_bihash_bucket_t *b;
+  BVT (clib_bihash_value) * v;
+  void (*fp) (BVT (clib_bihash_kv) *, void *) = callback;
+
+  for (i = 0; i < h->nbuckets; i++)
+    {
+      b = &h->buckets[i];
+      if (b->offset == 0)
+	continue;
+
+      v = BV (clib_bihash_get_value) (h, b->offset);
+      for (j = 0; j < (1 << b->log2_pages); j++)
+	{
+	  for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
+	    {
+	      if (BV (clib_bihash_is_free) (&v->kvp[k]))
+		continue;
+
+	      (*fp) (&v->kvp[k], arg);
+	    }
+	  v++;
+	}
+    }
+}
+
+/** @endcond */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/bihash_template.h b/src/vppinfra/bihash_template.h
new file mode 100644
index 00000000..f70190c6
--- /dev/null
+++ b/src/vppinfra/bihash_template.h
@@ -0,0 +1,214 @@
+/*
+  Copyright (c) 2014 Cisco and/or its affiliates.
+
+  * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+/** @cond DOCUMENTATION_IS_IN_BIHASH_DOC_H */
+
+/*
+ * Note: to instantiate the template multiple times in a single file,
+ * #undef __included_bihash_template_h__...
+ */
+#ifndef __included_bihash_template_h__
+#define __included_bihash_template_h__
+
+#include <vppinfra/heap.h>
+#include <vppinfra/format.h>
+#include <vppinfra/pool.h>
+
+#ifndef BIHASH_TYPE
+#error BIHASH_TYPE not defined
+#endif
+
+#define _bv(a,b) a##b
+#define __bv(a,b) _bv(a,b)
+#define BV(a) __bv(a,BIHASH_TYPE)
+
+#define _bvt(a,b) a##b##_t
+#define __bvt(a,b) _bvt(a,b)
+#define BVT(a) __bvt(a,BIHASH_TYPE)
+
+typedef struct BV (clib_bihash_value)
+{
+  union
+  {
+    BVT (clib_bihash_kv) kvp[BIHASH_KVP_PER_PAGE];
+    struct BV (clib_bihash_value) * next_free;
+  };
+} BVT (clib_bihash_value);
+
+/*
+ * This is shared across all uses of the template, so it needs
+ * a "personal" #include recursion block
+ */
+#ifndef __defined_clib_bihash_bucket_t__
+#define __defined_clib_bihash_bucket_t__
+typedef struct
+{
+  union
+  {
+    struct
+    {
+      u32 offset;
+      u8 pad[3];
+      u8 log2_pages;
+    };
+    u64 as_u64;
+  };
+} clib_bihash_bucket_t;
+#endif /* __defined_clib_bihash_bucket_t__ */
+
+typedef struct
+{
+  BVT (clib_bihash_value) * values;
+  clib_bihash_bucket_t *buckets;
+  volatile u32 *writer_lock;
+
+    BVT (clib_bihash_value) ** working_copies;
+  clib_bihash_bucket_t saved_bucket;
+
+  u32 nbuckets;
+  u32 log2_nbuckets;
+  u8 *name;
+
+    BVT (clib_bihash_value) ** freelists;
+  void *mheap;
+
+} BVT (clib_bihash);
+
+
+static inline void *BV (clib_bihash_get_value) (const BVT (clib_bihash) * h,
+						uword offset)
+{
+  u8 *hp = h->mheap;
+  u8 *vp = hp + offset;
+
+  return (void *) vp;
+}
+
+static inline uword BV (clib_bihash_get_offset) (const BVT (clib_bihash) * h,
+						 void *v)
+{
+  u8 *hp, *vp;
+
+  hp = (u8 *) h->mheap;
+  vp = (u8 *) v;
+
+  ASSERT ((vp - hp) < 0x100000000ULL);
+  return vp - hp;
+}
+
+void BV (clib_bihash_init)
+  (BVT (clib_bihash) * h, char *name, u32 nbuckets, uword memory_size);
+
+void BV (clib_bihash_free) (BVT (clib_bihash) * h);
+
+int BV (clib_bihash_add_del) (BVT (clib_bihash) * h,
+			      BVT (clib_bihash_kv) * add_v, int is_add);
+int BV (clib_bihash_search) (const BVT (clib_bihash) * h,
+			     BVT (clib_bihash_kv) * search_v,
+			     BVT (clib_bihash_kv) * return_v);
+
+void BV (clib_bihash_foreach_key_value_pair) (BVT (clib_bihash) * h,
+					      void *callback, void *arg);
+
+format_function_t BV (format_bihash);
+format_function_t BV (format_bihash_kvp);
+
+
+static inline int BV (clib_bihash_search_inline)
+  (const BVT (clib_bihash) * h, BVT (clib_bihash_kv) * kvp)
+{
+  u64 hash;
+  u32 bucket_index;
+  uword value_index;
+  BVT (clib_bihash_value) * v;
+  clib_bihash_bucket_t *b;
+  int i;
+
+  hash = BV (clib_bihash_hash) (kvp);
+
+  bucket_index = hash & (h->nbuckets - 1);
+  b = &h->buckets[bucket_index];
+
+  if (b->offset == 0)
+    return -1;
+
+  hash >>= h->log2_nbuckets;
+
+  v = BV (clib_bihash_get_value) (h, b->offset);
+  value_index = hash & ((1 << b->log2_pages) - 1);
+  v += value_index;
+
+  for (i = 0; i < BIHASH_KVP_PER_PAGE; i++)
+    {
+      if (BV (clib_bihash_key_compare) (v->kvp[i].key, kvp->key))
+	{
+	  *kvp = v->kvp[i];
+	  return 0;
+	}
+    }
+  return -1;
+}
+
+static inline int BV (clib_bihash_search_inline_2)
+  (const BVT (clib_bihash) * h,
+   BVT (clib_bihash_kv) * search_key, BVT (clib_bihash_kv) * valuep)
+{
+  u64 hash;
+  u32 bucket_index;
+  uword value_index;
+  BVT (clib_bihash_value) * v;
+  clib_bihash_bucket_t *b;
+  int i;
+
+  ASSERT (valuep);
+
+  hash = BV (clib_bihash_hash) (search_key);
+
+  bucket_index = hash & (h->nbuckets - 1);
+  b = &h->buckets[bucket_index];
+
+  if (b->offset == 0)
+    return -1;
+
+  hash >>= h->log2_nbuckets;
+
+  v = BV (clib_bihash_get_value) (h, b->offset);
+  value_index = hash & ((1 << b->log2_pages) - 1);
+  v += value_index;
+
+  for (i = 0; i < BIHASH_KVP_PER_PAGE; i++)
+    {
+      if (BV (clib_bihash_key_compare) (v->kvp[i].key, search_key->key))
+	{
+	  *valuep = v->kvp[i];
+	  return 0;
+	}
+    }
+  return -1;
+}
+
+
+#endif /* __included_bihash_template_h__ */
+
+/** @endcond */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/bitmap.h b/src/vppinfra/bitmap.h
new file mode 100644
index 00000000..9e1ae493
--- /dev/null
+++ b/src/vppinfra/bitmap.h
@@ -0,0 +1,774 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003, 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_bitmap_h
+#define included_clib_bitmap_h
+
+/** \file
+    Bitmaps built as vectors of machine words
+*/
+
+#include <vppinfra/vec.h>
+#include <vppinfra/random.h>
+#include <vppinfra/error.h>
+#include <vppinfra/bitops.h>	/* for count_set_bits */
+
+typedef uword clib_bitmap_t;
+
+/** predicate function; is an entire bitmap empty?
+    @param ai - pointer to a bitmap
+    @returns 1 if the entire bitmap is zero, 0 otherwise
+*/
+always_inline uword
+clib_bitmap_is_zero (uword * ai)
+{
+  uword i;
+  for (i = 0; i < vec_len (ai); i++)
+    if (ai[i] != 0)
+      return 0;
+  return 1;
+}
+
+/** predicate function; are two bitmaps equal?
+    @param a - pointer to a bitmap
+    @param b - pointer to a bitmap
+    @returns 1 if the bitmaps are equal, 0 otherwise
+*/
+always_inline uword
+clib_bitmap_is_equal (uword * a, uword * b)
+{
+  uword i;
+  if (vec_len (a) != vec_len (b))
+    return 0;
+  for (i = 0; i < vec_len (a); i++)
+    if (a[i] != b[i])
+      return 0;
+  return 1;
+}
+
+/** Duplicate a bitmap
+    @param v - pointer to a bitmap
+    @returns a duplicate of the bitmap
+*/
+#define clib_bitmap_dup(v) vec_dup(v)
+
+/** Free a bitmap
+    @param v - pointer to the bitmap to free
+*/
+#define clib_bitmap_free(v) vec_free(v)
+
+/** Number of bytes in a bitmap
+    @param v - pointer to the bitmap
+*/
+#define clib_bitmap_bytes(v) vec_bytes(v)
+
+/** Clear a bitmap
+    @param v - pointer to the bitmap to clear
+*/
+#define clib_bitmap_zero(v) vec_zero(v)
+
+/** Allocate a bitmap with the supplied number of bits
+    @param [out] v - the resulting bitmap
+    @param n_bits - the required number of bits
+*/
+
+#define clib_bitmap_alloc(v,n_bits) \
+  v = vec_new (uword, ((n_bits) + BITS (uword) - 1) / BITS (uword))
+
+#define clib_bitmap_vec_validate(v,i) vec_validate_aligned((v),(i),sizeof(uword))
+
+/* Make sure that a bitmap is at least n_bits in size */
+#define clib_bitmap_validate(v,n_bits) \
+  clib_bitmap_vec_validate ((v), ((n_bits) - 1) / BITS (uword))
+
+/* low-level routine to remove trailing zeros from a bitmap */
+always_inline uword *
+_clib_bitmap_remove_trailing_zeros (uword * a)
+{
+  word i;
+  if (a)
+    {
+      for (i = _vec_len (a) - 1; i >= 0; i--)
+	if (a[i] != 0)
+	  break;
+      _vec_len (a) = i + 1;
+    }
+  return a;
+}
+
+/** Sets the ith bit of a bitmap to new_value.
+    No sanity checking. Be careful.
+    @param a - pointer to the bitmap
+    @param i - the bit position to interrogate
+    @param new_value - new value for the bit
+    @returns the old value of the bit
+*/
+always_inline uword
+clib_bitmap_set_no_check (uword * a, uword i, uword new_value)
+{
+  uword i0 = i / BITS (a[0]);
+  uword i1 = i % BITS (a[0]);
+  uword bit = (uword) 1 << i1;
+  uword ai, old_value;
+
+  /* Removed ASSERT since uword * a may not be a vector. */
+  /* ASSERT (i0 < vec_len (a)); */
+
+  ai = a[i0];
+  old_value = (ai & bit) != 0;
+  ai &= ~bit;
+  ai |= ((uword) (new_value != 0)) << i1;
+  a[i0] = ai;
+  return old_value;
+}
+
+/** Sets the ith bit of a bitmap to new_value
+    Removes trailing zeros from the bitmap
+    @param ai - pointer to the bitmap
+    @param i - the bit position to interrogate
+    @param value - new value for the bit
+    @returns the old value of the bit
+*/
+always_inline uword *
+clib_bitmap_set (uword * ai, uword i, uword value)
+{
+  uword i0 = i / BITS (ai[0]);
+  uword i1 = i % BITS (ai[0]);
+  uword a;
+
+  /* Check for writing a zero to beyond end of bitmap. */
+  if (value == 0 && i0 >= vec_len (ai))
+    return ai;			/* Implied trailing zeros. */
+
+  clib_bitmap_vec_validate (ai, i0);
+
+  a = ai[i0];
+  a &= ~((uword) 1 << i1);
+  a |= ((uword) (value != 0)) << i1;
+  ai[i0] = a;
+
+  /* If bits have been cleared, test for zero. */
+  if (a == 0)
+    ai = _clib_bitmap_remove_trailing_zeros (ai);
+
+  return ai;
+}
+
+/** Gets the ith bit value from a bitmap
+    @param ai - pointer to the bitmap
+    @param i - the bit position to interrogate
+    @returns the indicated bit value
+*/
+always_inline uword
+clib_bitmap_get (uword * ai, uword i)
+{
+  uword i0 = i / BITS (ai[0]);
+  uword i1 = i % BITS (ai[0]);
+  return i0 < vec_len (ai) && 0 != ((ai[i0] >> i1) & 1);
+}
+
+/** Gets the ith bit value from a bitmap
+    Does not sanity-check the bit position. Be careful.
+    @param ai - pointer to the bitmap
+    @param i - the bit position to interrogate
+    @returns the indicated bit value, or garbage if the bit position is
+    out of range.
+*/
+always_inline uword
+clib_bitmap_get_no_check (uword * ai, uword i)
+{
+  uword i0 = i / BITS (ai[0]);
+  uword i1 = i % BITS (ai[0]);
+  return 0 != ((ai[i0] >> i1) & 1);
+}
+
+always_inline uword
+clib_bitmap_get_multiple_no_check (uword * ai, uword i, uword n_bits)
+{
+  uword i0 = i / BITS (ai[0]);
+  uword i1 = i % BITS (ai[0]);
+  ASSERT (i1 + n_bits <= BITS (uword));
+  return 0 != ((ai[i0] >> i1) & pow2_mask (n_bits));
+}
+
+/** Gets the ith through ith + n_bits bit values from a bitmap
+    @param bitmap - pointer to the bitmap
+    @param i - the first bit position to retrieve
+    @param n_bits - the number of bit positions to retrieve
+    @returns the indicated range of bits
+*/
+always_inline uword
+clib_bitmap_get_multiple (uword * bitmap, uword i, uword n_bits)
+{
+  uword i0, i1, result;
+  uword l = vec_len (bitmap);
+
+  ASSERT (n_bits <= BITS (result));
+
+  i0 = i / BITS (bitmap[0]);
+  i1 = i % BITS (bitmap[0]);
+
+  /* Check first word. */
+  result = 0;
+  if (i0 < l)
+    {
+      result |= (bitmap[i0] >> i1);
+      if (n_bits < BITS (bitmap[0]))
+	result &= (((uword) 1 << n_bits) - 1);
+    }
+
+  /* Check for overlap into next word. */
+  i0++;
+  if (i1 + n_bits > BITS (bitmap[0]) && i0 < l)
+    {
+      n_bits -= BITS (bitmap[0]) - i1;
+      result |=
+	(bitmap[i0] & (((uword) 1 << n_bits) - 1)) << (BITS (bitmap[0]) - i1);
+    }
+
+  return result;
+}
+
+/** sets the ith through ith + n_bits bits in a bitmap
+    @param bitmap - pointer to the bitmap
+    @param i - the first bit position to retrieve
+    @param value - the values to set
+    @param n_bits - the number of bit positions to set
+    @returns a pointer to the updated bitmap, which may expand and move
+*/
+
+always_inline uword *
+clib_bitmap_set_multiple (uword * bitmap, uword i, uword value, uword n_bits)
+{
+  uword i0, i1, l, t, m;
+
+  ASSERT (n_bits <= BITS (value));
+
+  i0 = i / BITS (bitmap[0]);
+  i1 = i % BITS (bitmap[0]);
+
+  /* Allocate bitmap. */
+  clib_bitmap_vec_validate (bitmap, (i + n_bits) / BITS (bitmap[0]));
+  l = vec_len (bitmap);
+
+  m = ~0;
+  if (n_bits < BITS (value))
+    m = (((uword) 1 << n_bits) - 1);
+  value &= m;
+
+  /* Insert into first word. */
+  t = bitmap[i0];
+  t &= ~(m << i1);
+  t |= value << i1;
+  bitmap[i0] = t;
+
+  /* Insert into second word. */
+  i0++;
+  if (i1 + n_bits > BITS (bitmap[0]) && i0 < l)
+    {
+      t = BITS (bitmap[0]) - i1;
+      value >>= t;
+      n_bits -= t;
+      t = bitmap[i0];
+      m = ((uword) 1 << n_bits) - 1;
+      t &= ~m;
+      t |= value;
+      bitmap[i0] = t;
+    }
+
+  return bitmap;
+}
+
+always_inline uword *
+clfib_bitmap_set_region (uword * bitmap, uword i, uword value, uword n_bits)
+{
+  uword a0, a1, b0;
+  uword i_end, mask;
+
+  a0 = i / BITS (bitmap[0]);
+  a1 = i % BITS (bitmap[0]);
+
+  i_end = i + n_bits;
+  b0 = i_end / BITS (bitmap[0]);
+
+  clib_bitmap_vec_validate (bitmap, b0);
+
+  /* First word. */
+  mask = n_bits < BITS (bitmap[0]) ? pow2_mask (n_bits) : ~0;
+  mask <<= a1;
+
+  if (value)
+    bitmap[a0] |= mask;
+  else
+    bitmap[a0] &= ~mask;
+
+  for (a0++; a0 < b0; a0++)
+    bitmap[a0] = value ? ~0 : 0;
+
+  if (a0 == b0)
+    {
+      word n_bits_left = n_bits - (BITS (bitmap[0]) - a1);
+      mask = pow2_mask (n_bits_left);
+      if (value)
+	bitmap[a0] |= mask;
+      else
+	bitmap[a0] &= ~mask;
+    }
+
+  return bitmap;
+}
+
+/** Macro to iterate across set bits in a bitmap
+
+    @param i - the current set bit
+    @param ai - the bitmap
+    @param body - the expression to evaluate for each set bit
+*/
+#define clib_bitmap_foreach(i,ai,body)					\
+do {									\
+  uword __bitmap_i, __bitmap_ai, __bitmap_len, __bitmap_first_set;	\
+  __bitmap_len = vec_len ((ai));					\
+  for (__bitmap_i = 0; __bitmap_i < __bitmap_len; __bitmap_i++)		\
+    {									\
+      __bitmap_ai = (ai)[__bitmap_i];					\
+      while (__bitmap_ai != 0)						\
+	{								\
+	  __bitmap_first_set = first_set (__bitmap_ai);			\
+	  (i) = (__bitmap_i * BITS ((ai)[0])				\
+		 + min_log2 (__bitmap_first_set));			\
+	  do { body; } while (0);					\
+	  __bitmap_ai ^= __bitmap_first_set;				\
+	}								\
+    }									\
+} while (0)
+
+
+/** Return the lowest numbered set bit in a bitmap
+    @param ai - pointer to the bitmap
+    @returns lowest numbered set bit, or ~0 if the entire bitmap is zero
+*/
+always_inline uword
+clib_bitmap_first_set (uword * ai)
+{
+  uword i;
+  for (i = 0; i < vec_len (ai); i++)
+    {
+      uword x = ai[i];
+      if (x != 0)
+	return i * BITS (ai[0]) + log2_first_set (x);
+    }
+  return ~0;
+}
+
+/** Return the higest numbered set bit in a bitmap
+    @param ai - pointer to the bitmap
+    @returns lowest numbered set bit, or ~0 if the entire bitmap is zero
+*/
+always_inline uword
+clib_bitmap_last_set (uword * ai)
+{
+  uword i;
+
+  for (i = vec_len (ai); i > 0; i--)
+    {
+      uword x = ai[i - 1];
+      if (x != 0)
+	{
+	  uword first_bit;
+	  count_leading_zeros (first_bit, x);
+	  return (i) * BITS (ai[0]) - first_bit - 1;
+	}
+    }
+  return ~0;
+}
+
+/** Return the lowest numbered clear bit in a bitmap
+    @param ai - pointer to the bitmap
+    @returns lowest numbered clear bit
+*/
+always_inline uword
+clib_bitmap_first_clear (uword * ai)
+{
+  uword i;
+  for (i = 0; i < vec_len (ai); i++)
+    {
+      uword x = ~ai[i];
+      if (x != 0)
+	return i * BITS (ai[0]) + log2_first_set (x);
+    }
+  return i * BITS (ai[0]);
+}
+
+/** Return the number of set bits in a bitmap
+    @param ai - pointer to the bitmap
+    @returns the number of set bits in the bitmap
+*/
+always_inline uword
+clib_bitmap_count_set_bits (uword * ai)
+{
+  uword i;
+  uword n_set = 0;
+  for (i = 0; i < vec_len (ai); i++)
+    n_set += count_set_bits (ai[i]);
+  return n_set;
+}
+
+/** Logical operator across two bitmaps
+
+    @param ai - pointer to the destination bitmap
+    @param bi - pointer to the source bitmap
+    @returns ai = ai and bi. ai is modified, bi is not modified
+*/
+always_inline uword *clib_bitmap_and (uword * ai, uword * bi);
+
+/** Logical operator across two bitmaps
+
+    @param ai - pointer to the destination bitmap
+    @param bi - pointer to the source bitmap
+    @returns ai = ai & ~bi. ai is modified, bi is not modified
+*/
+always_inline uword *clib_bitmap_andnot (uword * ai, uword * bi);
+
+/** Logical operator across two bitmaps
+
+    @param ai - pointer to the destination bitmap
+    @param bi - pointer to the source bitmap
+    @returns ai = ai & ~bi. ai is modified, bi is not modified
+*/
+always_inline uword *clib_bitmap_or (uword * ai, uword * bi);
+/** Logical operator across two bitmaps
+
+    @param ai - pointer to the destination bitmap
+    @param bi - pointer to the source bitmap
+    @returns ai = ai or bi. ai is modified, bi is not modified
+*/
+always_inline uword *clib_bitmap_or (uword * ai, uword * bi);
+
+/** Logical operator across two bitmaps
+
+    @param ai - pointer to the destination bitmap
+    @param bi - pointer to the source bitmap
+    @returns ai = ai xor bi. ai is modified, bi is not modified
+*/
+always_inline uword *clib_bitmap_xor (uword * ai, uword * bi);
+
+/* ALU function definition macro for functions taking two bitmaps. */
+#define _(name, body, check_zero)				\
+always_inline uword *						\
+clib_bitmap_##name (uword * ai, uword * bi)			\
+{								\
+  uword i, a, b, bi_len, n_trailing_zeros;			\
+								\
+  n_trailing_zeros = 0;						\
+  bi_len = vec_len (bi);					\
+  if (bi_len > 0)						\
+    clib_bitmap_vec_validate (ai, bi_len - 1);			\
+  for (i = 0; i < vec_len (ai); i++)				\
+    {								\
+      a = ai[i];						\
+      b = i < bi_len ? bi[i] : 0;				\
+      do { body; } while (0);					\
+      ai[i] = a;						\
+      if (check_zero)						\
+	n_trailing_zeros = a ? 0 : (n_trailing_zeros + 1);	\
+    }								\
+  if (check_zero)						\
+    _vec_len (ai) -= n_trailing_zeros;				\
+  return ai;							\
+}
+
+/* ALU functions: */
+_(and, a = a & b, 1)
+_(andnot, a = a & ~b, 1) _(or, a = a | b, 0) _(xor, a = a ^ b, 1)
+#undef _
+/** Logical operator across two bitmaps which duplicates the first bitmap
+
+    @param ai - pointer to the destination bitmap
+    @param bi - pointer to the source bitmap
+    @returns aiDup = ai and bi. Neither ai nor bi are modified
+*/
+     always_inline uword *
+     clib_bitmap_dup_and (uword * ai, uword * bi);
+
+/** Logical operator across two bitmaps which duplicates the first bitmap
+
+    @param ai - pointer to the destination bitmap
+    @param bi - pointer to the source bitmap
+    @returns aiDup = ai & ~bi. Neither ai nor bi are modified
+*/
+     always_inline uword *
+     clib_bitmap_dup_andnot (uword * ai, uword * bi);
+
+/** Logical operator across two bitmaps which duplicates the first bitmap
+
+    @param ai - pointer to the destination bitmap
+    @param bi - pointer to the source bitmap
+    @returns aiDup = ai or bi. Neither ai nor bi are modified
+*/
+     always_inline uword *
+     clib_bitmap_dup_or (uword * ai, uword * bi);
+
+/** Logical operator across two bitmaps which duplicates the first bitmap
+
+    @param ai - pointer to the destination bitmap
+    @param bi - pointer to the source bitmap
+    @returns aiDup = ai xor bi. Neither ai nor bi are modified
+*/
+     always_inline uword *
+     clib_bitmap_dup_xor (uword * ai, uword * bi);
+
+#define _(name)						\
+  always_inline uword *					\
+  clib_bitmap_dup_##name (uword * ai, uword * bi)	\
+{ return clib_bitmap_##name (clib_bitmap_dup (ai), bi); }
+
+_(and);
+_(andnot);
+_(or);
+_(xor);
+
+#undef _
+
+/* ALU function definition macro for functions taking one bitmap and an immediate. */
+#define _(name, body, check_zero)			\
+always_inline uword *					\
+clib_bitmap_##name (uword * ai, uword i)		\
+{							\
+  uword i0 = i / BITS (ai[0]);				\
+  uword i1 = i % BITS (ai[0]);				\
+  uword a, b;						\
+  clib_bitmap_vec_validate (ai, i0);			\
+  a = ai[i0];						\
+  b = (uword) 1 << i1;					\
+  do { body; } while (0);				\
+  ai[i0] = a;						\
+  if (check_zero && a == 0)				\
+    ai = _clib_bitmap_remove_trailing_zeros (ai);	\
+  return ai;						\
+}
+
+/* ALU functions immediate: */
+_(andi, a = a & b, 1)
+_(andnoti, a = a & ~b, 1) _(ori, a = a | b, 0) _(xori, a = a ^ b, 1)
+#undef _
+/** Return a random bitmap of the requested length
+    @param ai - pointer to the destination bitmap
+    @param n_bits - number of bits to allocate
+    @param [in,out] seed - pointer to the random number seed
+    @returns a reasonably random bitmap based. See random.h.
+*/
+     always_inline uword *
+     clib_bitmap_random (uword * ai, uword n_bits, u32 * seed)
+{
+  vec_reset_length (ai);
+
+  if (n_bits > 0)
+    {
+      uword i = n_bits - 1;
+      uword i0, i1;
+      uword log2_rand_max;
+
+      log2_rand_max = min_log2 (random_u32_max ());
+
+      i0 = i / BITS (ai[0]);
+      i1 = i % BITS (ai[0]);
+
+      clib_bitmap_vec_validate (ai, i0);
+      for (i = 0; i <= i0; i++)
+	{
+	  uword n;
+	  for (n = 0; n < BITS (ai[i]); n += log2_rand_max)
+	    ai[i] |= random_u32 (seed) << n;
+	}
+      if (i1 + 1 < BITS (ai[0]))
+	ai[i0] &= (((uword) 1 << (i1 + 1)) - 1);
+    }
+  return ai;
+}
+
+/** Return the next set bit in a bitmap starting at bit i
+    @param ai - pointer to the bitmap
+    @param i - first bit position to test
+    @returns first set bit position at or after i,
+    ~0 if no further set bits are found
+*/
+always_inline uword
+clib_bitmap_next_set (uword * ai, uword i)
+{
+  uword i0 = i / BITS (ai[0]);
+  uword i1 = i % BITS (ai[0]);
+  uword t;
+
+  if (i0 < vec_len (ai))
+    {
+      t = (ai[i0] >> i1) << i1;
+      if (t)
+	return log2_first_set (t) + i0 * BITS (ai[0]);
+
+      for (i0++; i0 < vec_len (ai); i0++)
+	{
+	  t = ai[i0];
+	  if (t)
+	    return log2_first_set (t) + i0 * BITS (ai[0]);
+	}
+    }
+
+  return ~0;
+}
+
+/** Return the next clear bit in a bitmap starting at bit i
+    @param ai - pointer to the bitmap
+    @param i - first bit position to test
+    @returns first clear bit position at or after i
+*/
+always_inline uword
+clib_bitmap_next_clear (uword * ai, uword i)
+{
+  uword i0 = i / BITS (ai[0]);
+  uword i1 = i % BITS (ai[0]);
+  uword t;
+
+  if (i0 < vec_len (ai))
+    {
+      t = (~ai[i0] >> i1) << i1;
+      if (t)
+	return log2_first_set (t) + i0 * BITS (ai[0]);
+
+      for (i0++; i0 < vec_len (ai); i0++)
+	{
+	  t = ~ai[i0];
+	  if (t)
+	    return log2_first_set (t) + i0 * BITS (ai[0]);
+	}
+    }
+  return i;
+}
+
+/** unformat a list of bit ranges into a bitmap (eg "0-3,5-7,11" )
+
+    uword * bitmap;
+    rv = unformat ("%U", unformat_bitmap_list, &bitmap);
+
+    Standard unformat_function_t arguments
+
+    @param input - pointer an unformat_input_t
+    @param va - varargs list comprising a single uword **
+    @returns 1 on success, 0 on failure
+*/
+static inline uword
+unformat_bitmap_list (unformat_input_t * input, va_list * va)
+{
+  uword **bitmap_return = va_arg (*va, uword **);
+  uword *bitmap = 0;
+
+  u32 a, b;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      int i;
+      if (unformat (input, "%u-%u,", &a, &b))
+	;
+      else if (unformat (input, "%u,", &a))
+	b = a;
+      else if (unformat (input, "%u-%u", &a, &b))
+	;
+      else if (unformat (input, "%u", &a))
+	b = a;
+      else if (bitmap)
+	{
+	  unformat_put_input (input);
+	  break;
+	}
+      else
+	goto error;
+
+      if (b < a)
+	goto error;
+
+      for (i = a; i <= b; i++)
+	bitmap = clib_bitmap_set (bitmap, i, 1);
+    }
+  *bitmap_return = bitmap;
+  return 1;
+error:
+  clib_bitmap_free (bitmap);
+  return 0;
+}
+
+/** Format a bitmap as a string of hex bytes
+
+    uword * bitmap;
+    s = format ("%U", format_bitmap_hex, bitmap);
+
+    Standard format_function_t arguments
+
+    @param s - string under construction
+    @param args - varargs list comprising a single uword *
+    @returns string under construction
+*/
+static inline u8 *
+format_bitmap_hex (u8 * s, va_list * args)
+{
+  uword *bitmap = va_arg (*args, uword *);
+  int i, is_trailing_zero = 1;
+
+  if (!bitmap)
+    return format (s, "0");
+
+  i = vec_bytes (bitmap) * 2;
+
+  while (i > 0)
+    {
+      u8 x = clib_bitmap_get_multiple (bitmap, --i * 4, 4);
+
+      if (x && is_trailing_zero)
+	is_trailing_zero = 0;
+
+      if (x || !is_trailing_zero)
+	s = format (s, "%x", x);
+    }
+  return s;
+}
+#endif /* included_clib_bitmap_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/bitops.h b/src/vppinfra/bitops.h
new file mode 100644
index 00000000..ab91b8ae
--- /dev/null
+++ b/src/vppinfra/bitops.h
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_bitops_h
+#define included_clib_bitops_h
+
+#include <vppinfra/clib.h>
+
+/* Population count from Hacker's Delight. */
+always_inline uword
+count_set_bits (uword x)
+{
+#if uword_bits == 64
+  const uword c1 = 0x5555555555555555;
+  const uword c2 = 0x3333333333333333;
+  const uword c3 = 0x0f0f0f0f0f0f0f0f;
+#else
+  const uword c1 = 0x55555555;
+  const uword c2 = 0x33333333;
+  const uword c3 = 0x0f0f0f0f;
+#endif
+
+  /* Sum 1 bit at a time. */
+  x = x - ((x >> (uword) 1) & c1);
+
+  /* 2 bits at a time. */
+  x = (x & c2) + ((x >> (uword) 2) & c2);
+
+  /* 4 bits at a time. */
+  x = (x + (x >> (uword) 4)) & c3;
+
+  /* 8, 16, 32 bits at a time. */
+  x = x + (x >> (uword) 8);
+  x = x + (x >> (uword) 16);
+#if uword_bits == 64
+  x = x + (x >> (uword) 32);
+#endif
+
+  return x & (2 * BITS (uword) - 1);
+}
+
+/* Based on "Hacker's Delight" code from GLS. */
+typedef struct
+{
+  uword masks[1 + log2_uword_bits];
+} compress_main_t;
+
+always_inline void
+compress_init (compress_main_t * cm, uword mask)
+{
+  uword q, m, zm, n, i;
+
+  m = ~mask;
+  zm = mask;
+
+  cm->masks[0] = mask;
+  for (i = 0; i < log2_uword_bits; i++)
+    {
+      q = m;
+      m ^= m << 1;
+      m ^= m << 2;
+      m ^= m << 4;
+      m ^= m << 8;
+      m ^= m << 16;
+#if uword_bits > 32
+      m ^= m << (uword) 32;
+#endif
+      cm->masks[1 + i] = n = (m << 1) & zm;
+      m = q & ~m;
+      q = zm & n;
+      zm = zm ^ q ^ (q >> (1 << i));
+    }
+}
+
+always_inline uword
+compress_bits (compress_main_t * cm, uword x)
+{
+  uword q, r;
+
+  r = x & cm->masks[0];
+  q = r & cm->masks[1];
+  r ^= q ^ (q >> 1);
+  q = r & cm->masks[2];
+  r ^= q ^ (q >> 2);
+  q = r & cm->masks[3];
+  r ^= q ^ (q >> 4);
+  q = r & cm->masks[4];
+  r ^= q ^ (q >> 8);
+  q = r & cm->masks[5];
+  r ^= q ^ (q >> 16);
+#if uword_bits > 32
+  q = r & cm->masks[6];
+  r ^= q ^ (q >> (uword) 32);
+#endif
+
+  return r;
+}
+
+always_inline uword
+rotate_left (uword x, uword i)
+{
+  return (x << i) | (x >> (BITS (i) - i));
+}
+
+always_inline uword
+rotate_right (uword x, uword i)
+{
+  return (x >> i) | (x << (BITS (i) - i));
+}
+
+/* Returns snoob from Hacker's Delight.  Next highest number
+   with same number of set bits. */
+always_inline uword
+next_with_same_number_of_set_bits (uword x)
+{
+  uword smallest, ripple, ones;
+  smallest = x & -x;
+  ripple = x + smallest;
+  ones = x ^ ripple;
+  ones = ones >> (2 + log2_first_set (x));
+  return ripple | ones;
+}
+
+#define foreach_set_bit(var,mask,body)					\
+do {									\
+  uword _foreach_set_bit_m_##var = (mask);				\
+  uword _foreach_set_bit_f_##var;					\
+  while (_foreach_set_bit_m_##var != 0)					\
+    {									\
+      _foreach_set_bit_f_##var = first_set (_foreach_set_bit_m_##var);	\
+      _foreach_set_bit_m_##var ^= _foreach_set_bit_f_##var;		\
+      (var) = min_log2 (_foreach_set_bit_f_##var);			\
+      do { body; } while (0);						\
+    }									\
+} while (0)
+
+#endif /* included_clib_bitops_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/byte_order.h b/src/vppinfra/byte_order.h
new file mode 100644
index 00000000..b263538c
--- /dev/null
+++ b/src/vppinfra/byte_order.h
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2004 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_byte_order_h
+#define included_clib_byte_order_h
+
+#include <vppinfra/clib.h>
+
+#if (__BYTE_ORDER__)==( __ORDER_LITTLE_ENDIAN__)
+#define CLIB_ARCH_IS_BIG_ENDIAN (0)
+#define CLIB_ARCH_IS_LITTLE_ENDIAN (1)
+#else
+/* Default is big endian. */
+#define CLIB_ARCH_IS_BIG_ENDIAN (1)
+#define CLIB_ARCH_IS_LITTLE_ENDIAN (0)
+#endif
+
+/* Big/little endian. */
+#define clib_arch_is_big_endian    CLIB_ARCH_IS_BIG_ENDIAN
+#define clib_arch_is_little_endian CLIB_ARCH_IS_LITTLE_ENDIAN
+
+always_inline u16
+clib_byte_swap_u16 (u16 x)
+{
+  return (x >> 8) | (x << 8);
+}
+
+always_inline i16
+clib_byte_swap_i16 (i16 x)
+{
+  return clib_byte_swap_u16 (x);
+}
+
+always_inline u32
+clib_byte_swap_u32 (u32 x)
+{
+#if defined (i386) || defined (__x86_64__)
+  if (!__builtin_constant_p (x))
+    {
+      asm volatile ("bswap %0":"=r" (x):"0" (x));
+      return x;
+    }
+#endif
+  return ((x << 24) | ((x & 0xff00) << 8) | ((x >> 8) & 0xff00) | (x >> 24));
+}
+
+always_inline i32
+clib_byte_swap_i32 (i32 x)
+{
+  return clib_byte_swap_u32 (x);
+}
+
+always_inline u64
+clib_byte_swap_u64 (u64 x)
+{
+#if defined (__x86_64__)
+  if (!__builtin_constant_p (x))
+    {
+      asm volatile ("bswapq %0":"=r" (x):"0" (x));
+      return x;
+    }
+#endif
+#define _(x,n,i) \
+  ((((x) >> (8*(i))) & 0xff) << (8*((n)-(i)-1)))
+  return (_(x, 8, 0) | _(x, 8, 1)
+	  | _(x, 8, 2) | _(x, 8, 3)
+	  | _(x, 8, 4) | _(x, 8, 5) | _(x, 8, 6) | _(x, 8, 7));
+#undef _
+}
+
+always_inline i64
+clib_byte_swap_i64 (i64 x)
+{
+  return clib_byte_swap_u64 (x);
+}
+
+#define _(sex,type)						\
+/* HOST -> SEX */						\
+always_inline type						\
+clib_host_to_##sex##_##type (type x)				\
+{								\
+  if (! clib_arch_is_##sex##_endian)				\
+    x = clib_byte_swap_##type (x);				\
+  return x;							\
+}								\
+								\
+always_inline type						\
+clib_host_to_##sex##_mem_##type (type * x)			\
+{								\
+  type v = x[0];						\
+  return clib_host_to_##sex##_##type (v);			\
+}								\
+								\
+always_inline type						\
+clib_host_to_##sex##_unaligned_mem_##type (type * x)		\
+{								\
+  type v = clib_mem_unaligned (x, type);			\
+  return clib_host_to_##sex##_##type (v);			\
+}								\
+								\
+/* SEX -> HOST */						\
+always_inline type						\
+clib_##sex##_to_host_##type (type x)				\
+{ return clib_host_to_##sex##_##type (x); }			\
+								\
+always_inline type						\
+clib_##sex##_to_host_mem_##type (type * x)			\
+{ return clib_host_to_##sex##_mem_##type (x); }			\
+								\
+always_inline type						\
+clib_##sex##_to_host_unaligned_mem_##type (type * x)		\
+{ return clib_host_to_##sex##_unaligned_mem_##type (x); }
+
+#ifndef __cplusplus
+_(little, u16)
+_(little, u32)
+_(little, u64)
+_(little, i16)
+_(little, i32)
+_(little, i64)
+_(big, u16) _(big, u32) _(big, u64) _(big, i16) _(big, i32) _(big, i64)
+#endif
+#undef _
+/* Network "net" alias for "big". */
+#define _(type)						\
+always_inline type					\
+clib_net_to_host_##type (type x)			\
+{ return clib_big_to_host_##type (x); }			\
+							\
+always_inline type					\
+clib_net_to_host_mem_##type (type * x)			\
+{ return clib_big_to_host_mem_##type (x); }		\
+							\
+always_inline type					\
+clib_net_to_host_unaligned_mem_##type (type * x)	\
+{ return clib_big_to_host_unaligned_mem_##type (x); }	\
+							\
+always_inline type					\
+clib_host_to_net_##type (type x)			\
+{ return clib_host_to_big_##type (x); }			\
+							\
+always_inline type					\
+clib_host_to_net_mem_##type (type * x)			\
+{ return clib_host_to_big_mem_##type (x); }		\
+							\
+always_inline type					\
+clib_host_to_net_unaligned_mem_##type (type * x)	\
+{ return clib_host_to_big_unaligned_mem_##type (x); }
+#ifndef __cplusplus
+  _(u16);
+_(i16);
+_(u32);
+_(i32);
+_(u64);
+_(i64);
+#endif
+
+#undef _
+
+#endif /* included_clib_byte_order_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/cache.h b/src/vppinfra/cache.h
new file mode 100644
index 00000000..8e1f9483
--- /dev/null
+++ b/src/vppinfra/cache.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_cache_h
+#define included_clib_cache_h
+
+#include <vppinfra/error_bootstrap.h>
+
+/*
+ * Allow CFLAGS to override the arch-specific cache line size
+ */
+#ifndef CLIB_LOG2_CACHE_LINE_BYTES
+
+#if defined(__x86_64__) || defined(__ARM_ARCH_7A__)
+#define CLIB_LOG2_CACHE_LINE_BYTES 6
+#endif
+
+#ifdef __aarch64__
+#define CLIB_LOG2_CACHE_LINE_BYTES 7
+#endif
+
+/* Default cache line size of 32 bytes. */
+#ifndef CLIB_LOG2_CACHE_LINE_BYTES
+#define CLIB_LOG2_CACHE_LINE_BYTES 5
+#endif
+
+#endif /* CLIB_LOG2_CACHE_LINE_BYTES defined */
+
+#if (CLIB_LOG2_CACHE_LINE_BYTES >= 9)
+#error Cache line size 512 bytes or greater
+#endif
+
+#define CLIB_CACHE_LINE_BYTES (1 << CLIB_LOG2_CACHE_LINE_BYTES)
+#define CLIB_CACHE_LINE_ALIGN_MARK(mark) u8 mark[0] __attribute__((aligned(CLIB_CACHE_LINE_BYTES)))
+
+/* Read/write arguments to __builtin_prefetch. */
+#define CLIB_PREFETCH_READ 0
+#define CLIB_PREFETCH_LOAD 0	/* alias for read */
+#define CLIB_PREFETCH_WRITE 1
+#define CLIB_PREFETCH_STORE 1	/* alias for write */
+
+#define _CLIB_PREFETCH(n,size,type)				\
+  if ((size) > (n)*CLIB_CACHE_LINE_BYTES)			\
+    __builtin_prefetch (_addr + (n)*CLIB_CACHE_LINE_BYTES,	\
+			CLIB_PREFETCH_##type,			\
+			/* locality */ 3);
+
+#define CLIB_PREFETCH(addr,size,type)		\
+do {						\
+  void * _addr = (addr);			\
+						\
+  ASSERT ((size) <= 4*CLIB_CACHE_LINE_BYTES);	\
+  _CLIB_PREFETCH (0, size, type);		\
+  _CLIB_PREFETCH (1, size, type);		\
+  _CLIB_PREFETCH (2, size, type);		\
+  _CLIB_PREFETCH (3, size, type);		\
+} while (0)
+
+#undef _
+
+#endif /* included_clib_cache_h */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/clib.h b/src/vppinfra/clib.h
new file mode 100644
index 00000000..0386c756
--- /dev/null
+++ b/src/vppinfra/clib.h
@@ -0,0 +1,359 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_h
+#define included_clib_h
+
+/* Standalone means to not assume we are running on a Unix box. */
+#if ! defined (CLIB_STANDALONE) && ! defined (CLIB_LINUX_KERNEL)
+#define CLIB_UNIX
+#endif
+
+#include <vppinfra/types.h>
+
+/* Global DEBUG flag.  Setting this to 1 or 0 turns off
+   ASSERT (see vppinfra/error.h) & other debugging code. */
+#ifndef CLIB_DEBUG
+#define CLIB_DEBUG 0
+#endif
+
+#ifndef NULL
+#define NULL ((void *) 0)
+#endif
+
+#define BITS(x)		(8*sizeof(x))
+#define ARRAY_LEN(x)	(sizeof (x)/sizeof (x[0]))
+
+#define _STRUCT_FIELD(t,f) (((t *) 0)->f)
+#define STRUCT_OFFSET_OF(t,f) ((uword) & _STRUCT_FIELD (t, f))
+#define STRUCT_BIT_OFFSET_OF(t,f) (BITS(u8) * (uword) & _STRUCT_FIELD (t, f))
+#define STRUCT_SIZE_OF(t,f)   (sizeof (_STRUCT_FIELD (t, f)))
+#define STRUCT_BITS_OF(t,f)   (BITS (_STRUCT_FIELD (t, f)))
+#define STRUCT_ARRAY_LEN(t,f) ARRAY_LEN (_STRUCT_FIELD (t, f))
+#define STRUCT_MARK(mark)     u8 mark[0]
+#define STRUCT_MARK_PTR(v, f) &(v)->f
+
+/* Stride in bytes between struct array elements. */
+#define STRUCT_STRIDE_OF(t,f)			\
+  (  ((uword) & (((t *) 0)[1].f))		\
+   - ((uword) & (((t *) 0)[0].f)))
+
+#define STRUCT_OFFSET_OF_VAR(v,f) ((uword) (&(v)->f) - (uword) (v))
+
+/* Used to pack structure elements. */
+#define CLIB_PACKED(x)	x __attribute__ ((packed))
+#define CLIB_UNUSED(x)	x __attribute__ ((unused))
+
+#define never_inline __attribute__ ((__noinline__))
+
+#if CLIB_DEBUG > 0
+#define always_inline static inline
+#define static_always_inline static inline
+#else
+#define always_inline static inline __attribute__ ((__always_inline__))
+#define static_always_inline static inline __attribute__ ((__always_inline__))
+#endif
+
+
+/* Reserved (unused) structure element with address offset between
+   from and to. */
+#define CLIB_PAD_FROM_TO(from,to) u8 pad_##from[(to) - (from)]
+
+/* Hints to compiler about hot/cold code. */
+#define PREDICT_FALSE(x) __builtin_expect((x),0)
+#define PREDICT_TRUE(x) __builtin_expect((x),1)
+
+/* Full memory barrier (read and write). */
+#define CLIB_MEMORY_BARRIER() __sync_synchronize ()
+
+/* Arranges for function to be called before main. */
+#define INIT_FUNCTION(decl)			\
+  decl __attribute ((constructor));		\
+  decl
+
+/* Arranges for function to be called before exit. */
+#define EXIT_FUNCTION(decl)			\
+  decl __attribute ((destructor));		\
+  decl
+
+/* Use __builtin_clz if available. */
+#ifdef __GNUC__
+#include <features.h>
+#if __GNUC_PREREQ(3, 4)
+#if uword_bits == 64
+#define count_leading_zeros(count,x) count = __builtin_clzll (x)
+#define count_trailing_zeros(count,x) count = __builtin_ctzll (x)
+#else
+#define count_leading_zeros(count,x) count = __builtin_clzl (x)
+#define count_trailing_zeros(count,x) count = __builtin_ctzl (x)
+#endif
+#endif
+#endif
+
+#ifndef count_leading_zeros
+
+/* Misc. integer arithmetic functions. */
+#if defined (i386)
+#define count_leading_zeros(count, x)		\
+  do {						\
+    word _clz;					\
+    __asm__ ("bsrl %1,%0"			\
+	     : "=r" (_clz) : "rm" ((word) (x)));\
+    (count) = _clz ^ 31;			\
+  } while (0)
+
+#define count_trailing_zeros(count, x)			\
+  __asm__ ("bsfl %1,%0" : "=r" (count) : "rm" ((word)(x)))
+#endif /* i386 */
+
+#if defined (__alpha__) && defined (HAVE_CIX)
+#define count_leading_zeros(count, x)		\
+  __asm__ ("ctlz %1,%0"				\
+	   : "=r" ((word) (count))		\
+	   : "r" ((word) (x)))
+#define count_trailing_zeros(count, x)		\
+  __asm__ ("cttz %1,%0"				\
+	   : "=r" ((word) (count))		\
+	   : "r" ((word) (x)))
+#endif /* alpha && HAVE_CIX */
+
+#if __mips >= 4
+
+/* Select between 32/64 opcodes. */
+#if uword_bits == 32
+#define count_leading_zeros(_count, _x)		\
+  __asm__ ("clz %[count],%[x]"			\
+	   : [count] "=r" ((word) (_count))	\
+	   : [x] "r" ((word) (_x)))
+#else
+#define count_leading_zeros(_count, _x)		\
+  __asm__ ("dclz %[count],%[x]"			\
+	   : [count] "=r" ((word) (_count))	\
+	   : [x] "r" ((word) (_x)))
+#endif
+
+#endif /* __mips >= 4 */
+
+#endif /* count_leading_zeros */
+
+#if defined (count_leading_zeros)
+always_inline uword
+min_log2 (uword x)
+{
+  uword n;
+  count_leading_zeros (n, x);
+  return BITS (uword) - n - 1;
+}
+#else
+always_inline uword
+min_log2 (uword x)
+{
+  uword a = x, b = BITS (uword) / 2, c = 0, r = 0;
+
+  /* Reduce x to 4 bit result. */
+#define _					\
+{						\
+  c = a >> b;					\
+  if (c) a = c;					\
+  if (c) r += b;				\
+  b /= 2;					\
+}
+
+  if (BITS (uword) > 32)
+    _;
+  _;
+  _;
+  _;
+#undef _
+
+  /* Do table lookup on 4 bit partial. */
+  if (BITS (uword) > 32)
+    {
+      const u64 table = 0x3333333322221104LL;
+      uword t = (table >> (4 * a)) & 0xf;
+      r = t < 4 ? r + t : ~0;
+    }
+  else
+    {
+      const u32 table = 0x22221104;
+      uword t = (a & 8) ? 3 : ((table >> (4 * a)) & 0xf);
+      r = t < 4 ? r + t : ~0;
+    }
+
+  return r;
+}
+#endif
+
+always_inline uword
+max_log2 (uword x)
+{
+  uword l = min_log2 (x);
+  if (x > ((uword) 1 << l))
+    l++;
+  return l;
+}
+
+always_inline u64
+min_log2_u64 (u64 x)
+{
+  if (BITS (uword) == 64)
+    return min_log2 (x);
+  else
+    {
+      uword l, y;
+      y = x;
+      l = 0;
+      if (y == 0)
+	{
+	  l += 32;
+	  x >>= 32;
+	}
+      l += min_log2 (x);
+      return l;
+    }
+}
+
+always_inline uword
+pow2_mask (uword x)
+{
+  return ((uword) 1 << x) - (uword) 1;
+}
+
+always_inline uword
+max_pow2 (uword x)
+{
+  word y = (word) 1 << min_log2 (x);
+  if (x > y)
+    y *= 2;
+  return y;
+}
+
+always_inline uword
+is_pow2 (uword x)
+{
+  return 0 == (x & (x - 1));
+}
+
+always_inline uword
+round_pow2 (uword x, uword pow2)
+{
+  return (x + pow2 - 1) & ~(pow2 - 1);
+}
+
+always_inline u64
+round_pow2_u64 (u64 x, u64 pow2)
+{
+  return (x + pow2 - 1) & ~(pow2 - 1);
+}
+
+always_inline uword
+first_set (uword x)
+{
+  return x & -x;
+}
+
+always_inline uword
+log2_first_set (uword x)
+{
+  uword result;
+#ifdef count_trailing_zeros
+  count_trailing_zeros (result, x);
+#else
+  result = min_log2 (first_set (x));
+#endif
+  return result;
+}
+
+always_inline f64
+flt_round_down (f64 x)
+{
+  return (int) x;
+}
+
+always_inline word
+flt_round_nearest (f64 x)
+{
+  return (word) (x + .5);
+}
+
+always_inline f64
+flt_round_to_multiple (f64 x, f64 f)
+{
+  return f * flt_round_nearest (x / f);
+}
+
+#define clib_max(x,y)				\
+({						\
+  __typeof__ (x) _x = (x);			\
+  __typeof__ (y) _y = (y);			\
+  _x > _y ? _x : _y;				\
+})
+
+#define clib_min(x,y)				\
+({						\
+  __typeof__ (x) _x = (x);			\
+  __typeof__ (y) _y = (y);			\
+  _x < _y ? _x : _y;				\
+})
+
+#define clib_abs(x)				\
+({						\
+  __typeof__ (x) _x = (x);			\
+  _x < 0 ? -_x : _x;				\
+})
+
+/* Standard standalone-only function declarations. */
+#ifndef CLIB_UNIX
+void clib_standalone_init (void *memory, uword memory_bytes);
+
+void qsort (void *base, uword n, uword size,
+	    int (*)(const void *, const void *));
+#endif
+
+/* Stack backtrace. */
+uword
+clib_backtrace (uword * callers, uword max_callers, uword n_frames_to_skip);
+
+#endif /* included_clib_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/cpu.c b/src/vppinfra/cpu.c
new file mode 100644
index 00000000..a26d5c9a
--- /dev/null
+++ b/src/vppinfra/cpu.c
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/clib.h>
+#include <vppinfra/format.h>
+#include <vppinfra/cpu.h>
+
+#define foreach_x86_cpu_uarch \
+ _(0x06, 0x4f, "Broadwell", "Broadwell-EP/EX") \
+ _(0x06, 0x3d, "Broadwell", "Broadwell") \
+ _(0x06, 0x3f, "Haswell", "Haswell-E") \
+ _(0x06, 0x3c, "Haswell", "Haswell") \
+ _(0x06, 0x3e, "IvyBridge", "IvyBridge-E/EN/EP") \
+ _(0x06, 0x3a, "IvyBridge", "IvyBridge") \
+ _(0x06, 0x2a, "SandyBridge", "SandyBridge") \
+ _(0x06, 0x2d, "SandyBridge", "SandyBridge-E/EN/EP") \
+ _(0x06, 0x25, "Westmere", "Arrandale,Clarksdale") \
+ _(0x06, 0x2c, "Westmere", "Westmere-EP/EX,Gulftown") \
+ _(0x06, 0x2f, "Westmere", "Westmere-EX") \
+ _(0x06, 0x1e, "Nehalem", "Clarksfield,Lynnfield,Jasper Forest") \
+ _(0x06, 0x1a, "Nehalem", "Nehalem-EP,Bloomfield)") \
+ _(0x06, 0x2e, "Nehalem", "Nehalem-EX") \
+ _(0x06, 0x17, "Penryn", "Yorkfield,Wolfdale,Penryn,Harpertown (DP)") \
+ _(0x06, 0x1d, "Penryn", "Dunnington (MP)") \
+ _(0x06, 0x37, "Atom", "Bay Trail") \
+ _(0x06, 0x36, "Atom", "Cedarview") \
+ _(0x06, 0x26, "Atom", "Lincroft") \
+ _(0x06, 0x1c, "Atom", "Pineview/Silverthorne")
+
+u8 *
+format_cpu_uarch (u8 * s, va_list * args)
+{
+#if __x86_64__
+  u32 __attribute__ ((unused)) eax, ebx, ecx, edx;
+  u8 model, family;
+
+  if (__get_cpuid (1, &eax, &ebx, &ecx, &edx) == 0)
+    return format (s, "unknown (missing cpuid)");
+
+  model = ((eax >> 4) & 0x0f) | ((eax >> 12) & 0xf0);
+  family = (eax >> 8) & 0x0f;
+
+#define _(f,m,a,c) if ((model == m) && (family == f)) return format(s, "%s (%s)", a, c);
+  foreach_x86_cpu_uarch
+#undef _
+    return format (s, "unknown (family 0x%02x model 0x%02x)", family, model);
+
+#else /* ! __x86_64__ */
+  return format (s, "unknown");
+#endif
+}
+
+u8 *
+format_cpu_model_name (u8 * s, va_list * args)
+{
+#if __x86_64__
+  u32 __attribute__ ((unused)) eax, ebx, ecx, edx;
+  u8 *name = 0;
+  u32 *name_u32;
+
+  if (__get_cpuid (1, &eax, &ebx, &ecx, &edx) == 0)
+    return format (s, "unknown (missing cpuid)");
+
+  __get_cpuid (0x80000000, &eax, &ebx, &ecx, &edx);
+  if (eax < 0x80000004)
+    return format (s, "unknown (missing ext feature)");
+
+  vec_validate (name, 48);
+  name_u32 = (u32 *) name;
+
+  __get_cpuid (0x80000002, &eax, &ebx, &ecx, &edx);
+  name_u32[0] = eax;
+  name_u32[1] = ebx;
+  name_u32[2] = ecx;
+  name_u32[3] = edx;
+
+  __get_cpuid (0x80000003, &eax, &ebx, &ecx, &edx);
+  name_u32[4] = eax;
+  name_u32[5] = ebx;
+  name_u32[6] = ecx;
+  name_u32[7] = edx;
+
+  __get_cpuid (0x80000004, &eax, &ebx, &ecx, &edx);
+  name_u32[8] = eax;
+  name_u32[9] = ebx;
+  name_u32[10] = ecx;
+  name_u32[11] = edx;
+
+  s = format (s, "%s", name);
+  vec_free (name);
+  return s;
+
+#elif defined(__aarch64__)
+  return format (s, "armv8");
+#else /* ! __x86_64__ */
+  return format (s, "unknown");
+#endif
+}
+
+u8 *
+format_cpu_flags (u8 * s, va_list * args)
+{
+#if defined(__x86_64__)
+#define _(flag, func, reg, bit) \
+  if (clib_cpu_supports_ ## flag()) \
+    s = format (s, #flag " ");
+  foreach_x86_64_flags return s;
+#undef _
+#else /* ! __x86_64__ */
+  return format (s, "unknown");
+#endif
+}
+
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/cpu.h b/src/vppinfra/cpu.h
new file mode 100644
index 00000000..9c149f3f
--- /dev/null
+++ b/src/vppinfra/cpu.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_clib_cpu_h
+#define included_clib_cpu_h
+
+#include <vppinfra/format.h>
+
+/*
+ * multiarchitecture support. Adding new entry will produce
+ * new graph node function variant optimized for specific cpu
+ * microarchitecture.
+ * Order is important for runtime selection, as 1st match wins...
+ */
+
+#if __x86_64__ && CLIB_DEBUG == 0
+#define foreach_march_variant(macro, x) \
+  macro(avx2,  x, "arch=core-avx2")
+#else
+#define foreach_march_variant(macro, x)
+#endif
+
+
+#if __GNUC__ > 4  && !__clang__
+#define CLIB_CPU_OPTIMIZED __attribute__ ((optimize ("tree-vectorize")))
+#else
+#define CLIB_CPU_OPTIMIZED
+#endif
+
+
+#define CLIB_MULTIARCH_ARCH_CHECK(arch, fn, tgt)			\
+  if (clib_cpu_supports_ ## arch())					\
+    return & fn ## _ ##arch;
+
+#define CLIB_MULTIARCH_SELECT_FN(fn,...)                               \
+  __VA_ARGS__ void * fn ## _multiarch_select(void)                     \
+{                                                                      \
+  foreach_march_variant(CLIB_MULTIARCH_ARCH_CHECK, fn)                 \
+  return & fn;                                                         \
+}
+
+
+#define foreach_x86_64_flags \
+_ (sse3,     1, ecx, 0)   \
+_ (ssse3,    1, ecx, 9)   \
+_ (sse41,    1, ecx, 19)  \
+_ (sse42,    1, ecx, 20)  \
+_ (avx,      1, ecx, 28)  \
+_ (avx2,     7, ebx, 5)   \
+_ (avx512f,  7, ebx, 16)  \
+_ (aes,      1, ecx, 25)  \
+_ (sha,      7, ebx, 29)  \
+_ (invariant_tsc, 0x80000007, edx, 8)
+
+#if defined(__x86_64__)
+#include "cpuid.h"
+
+static inline int
+clib_get_cpuid (const u32 lev, u32 * eax, u32 * ebx, u32 * ecx, u32 * edx)
+{
+  if ((u32) __get_cpuid_max (0x80000000 & lev, 0) < lev)
+    return 0;
+  if (lev == 7)
+    __cpuid_count (lev, 0, *eax, *ebx, *ecx, *edx);
+  else
+    __cpuid (lev, *eax, *ebx, *ecx, *edx);
+  return 1;
+}
+
+
+#define _(flag, func, reg, bit) \
+static inline int							\
+clib_cpu_supports_ ## flag()						\
+{									\
+  u32 __attribute__((unused)) eax, ebx = 0, ecx = 0, edx  = 0;		\
+  clib_get_cpuid (func, &eax, &ebx, &ecx, &edx);			\
+									\
+  return ((reg & (1 << bit)) != 0);					\
+}
+foreach_x86_64_flags
+#undef _
+#else
+
+#define _(flag, func, reg, bit) \
+static inline int clib_cpu_supports_ ## flag() { return 0; }
+foreach_x86_64_flags
+#undef _
+#endif
+#endif
+  format_function_t format_cpu_uarch;
+format_function_t format_cpu_model_name;
+format_function_t format_cpu_flags;
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/dir.dox b/src/vppinfra/dir.dox
new file mode 100644
index 00000000..440c44e8
--- /dev/null
+++ b/src/vppinfra/dir.dox
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/** @dir
+ * @brief VPP infrastructure library source.
+ */
diff --git a/src/vppinfra/dlist.h b/src/vppinfra/dlist.h
new file mode 100644
index 00000000..7d09b2bb
--- /dev/null
+++ b/src/vppinfra/dlist.h
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#ifndef included_dlist_h
+#define included_dlist_h
+
+#include <stdarg.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/error.h>
+#include <vppinfra/format.h>
+#include <vppinfra/cache.h>
+
+typedef struct
+{
+  u32 next;
+  u32 prev;
+  u32 value;
+} dlist_elt_t;
+
+static inline void
+clib_dlist_init (dlist_elt_t * pool, u32 index)
+{
+  dlist_elt_t *head = pool_elt_at_index (pool, index);
+  memset (head, 0xFF, sizeof (*head));
+}
+
+static inline void
+clib_dlist_addtail (dlist_elt_t * pool, u32 head_index, u32 new_index)
+{
+  dlist_elt_t *head = pool_elt_at_index (pool, head_index);
+  u32 old_last_index;
+  dlist_elt_t *old_last;
+  dlist_elt_t *new;
+
+  ASSERT (head->value == ~0);
+
+  new = pool_elt_at_index (pool, new_index);
+
+  if (PREDICT_FALSE (head->next == ~0))
+    {
+      head->next = head->prev = new_index;
+      new->next = new->prev = head_index;
+      return;
+    }
+
+  old_last_index = head->prev;
+  old_last = pool_elt_at_index (pool, old_last_index);
+
+  new->next = old_last->next;
+  new->prev = old_last_index;
+  old_last->next = new_index;
+  head->prev = new_index;
+}
+
+static inline void
+clib_dlist_addhead (dlist_elt_t * pool, u32 head_index, u32 new_index)
+{
+  dlist_elt_t *head = pool_elt_at_index (pool, head_index);
+  dlist_elt_t *old_first;
+  u32 old_first_index;
+  dlist_elt_t *new;
+
+  ASSERT (head->value == ~0);
+
+  new = pool_elt_at_index (pool, new_index);
+
+  if (PREDICT_FALSE (head->next == ~0))
+    {
+      head->next = head->prev = new_index;
+      new->next = new->prev = head_index;
+      return;
+    }
+
+  old_first_index = head->next;
+  old_first = pool_elt_at_index (pool, old_first_index);
+
+  new->next = old_first_index;
+  new->prev = old_first->prev;
+  old_first->prev = new_index;
+  head->next = new_index;
+}
+
+static inline void
+clib_dlist_remove (dlist_elt_t * pool, u32 index)
+{
+  dlist_elt_t *elt = pool_elt_at_index (pool, index);
+  dlist_elt_t *next_elt, *prev_elt;
+
+  /* listhead, not so much */
+  ASSERT (elt->value != ~0);
+
+  next_elt = pool_elt_at_index (pool, elt->next);
+  prev_elt = pool_elt_at_index (pool, elt->prev);
+
+  next_elt->prev = elt->prev;
+  prev_elt->next = elt->next;
+
+  elt->prev = elt->next = ~0;
+}
+
+static inline u32
+clib_dlist_remove_head (dlist_elt_t * pool, u32 head_index)
+{
+  dlist_elt_t *head = pool_elt_at_index (pool, head_index);
+  u32 rv;
+
+  ASSERT (head->value == ~0);
+
+  if (head->next == ~0)
+    return ~0;
+
+  rv = head->next;
+  clib_dlist_remove (pool, rv);
+  return rv;
+}
+
+static inline u32
+clib_dlist_remove_tail (dlist_elt_t * pool, u32 head_index)
+{
+  dlist_elt_t *head = pool_elt_at_index (pool, head_index);
+  u32 rv;
+
+  ASSERT (head->value == ~0);
+
+  if (head->prev == ~0)
+    return ~0;
+
+  rv = head->prev;
+  clib_dlist_remove (pool, rv);
+  return rv;
+}
+
+#endif /* included_dlist_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/elf.c b/src/vppinfra/elf.c
new file mode 100644
index 00000000..931fbccc
--- /dev/null
+++ b/src/vppinfra/elf.c
@@ -0,0 +1,2040 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/bitmap.h>
+#include <vppinfra/byte_order.h>
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/elf.h>
+
+always_inline void
+elf_swap_first_header (elf_main_t * em, elf_first_header_t * h)
+{
+  h->architecture = elf_swap_u16 (em, h->architecture);
+  h->file_type = elf_swap_u16 (em, h->file_type);
+  h->file_version = elf_swap_u32 (em, h->file_version);
+}
+
+always_inline void
+elf_swap_verneed (elf_dynamic_version_need_t * n)
+{
+#define _(t,f) n->f = clib_byte_swap_##t (n->f);
+  foreach_elf_dynamic_version_need_field
+#undef _
+}
+
+always_inline void
+elf_swap_verneed_aux (elf_dynamic_version_need_aux_t * n)
+{
+#define _(t,f) n->f = clib_byte_swap_##t (n->f);
+  foreach_elf_dynamic_version_need_aux_field
+#undef _
+}
+
+clib_error_t *
+elf_get_section_by_name (elf_main_t * em, char *section_name,
+			 elf_section_t ** result)
+{
+  uword *p;
+
+  p = hash_get_mem (em->section_by_name, section_name);
+  if (!p)
+    return clib_error_return (0, "no such section `%s'", section_name);
+
+  *result = vec_elt_at_index (em->sections, p[0]);
+  return 0;
+}
+
+elf_section_t *
+elf_get_section_by_start_address_no_check (elf_main_t * em,
+					   uword start_address)
+{
+  uword *p = hash_get (em->section_by_start_address, start_address);
+  return p ? vec_elt_at_index (em->sections, p[0]) : 0;
+}
+
+clib_error_t *
+elf_get_section_by_start_address (elf_main_t * em, uword start_address,
+				  elf_section_t ** result)
+{
+  elf_section_t *s =
+    elf_get_section_by_start_address_no_check (em, start_address);
+  if (!s)
+    return clib_error_return (0, "no section with address 0x%wx",
+			      start_address);
+  *result = s;
+  return 0;
+}
+
+static u8 *
+format_elf_section_type (u8 * s, va_list * args)
+{
+  elf_section_type_t type = va_arg (*args, elf_section_type_t);
+  char *t = 0;
+
+  switch (type)
+    {
+#define _(f,i) case ELF_SECTION_##f: t = #f; break;
+      foreach_elf_section_type
+#undef _
+    }
+
+  if (!t)
+    s = format (s, "unknown 0x%x", type);
+  else
+    s = format (s, "%s", t);
+  return s;
+}
+
+static u8 *
+format_elf_section (u8 * s, va_list * args)
+{
+  elf_main_t *em = va_arg (*args, elf_main_t *);
+  elf_section_t *es = va_arg (*args, elf_section_t *);
+  elf64_section_header_t *h = &es->header;
+
+  if (!h)
+    return format (s, "%=40s%=10s%=20s%=8s%=16s%=16s%=16s",
+		   "Name", "Index", "Type", "Size", "Align", "Address",
+		   "File offset");
+
+  s = format (s, "%-40s%10d%=20U%8Lx%16d%16Lx %Lx-%Lx",
+	      elf_section_name (em, es),
+	      es->index,
+	      format_elf_section_type, h->type,
+	      h->file_size,
+	      h->align,
+	      h->exec_address, h->file_offset, h->file_offset + h->file_size);
+
+  if (h->flags != 0)
+    {
+#define _(f,i) \
+  if (h->flags & ELF_SECTION_FLAG_##f) s = format (s, " %s", #f);
+      foreach_elf_section_flag;
+#undef _
+    }
+
+  return s;
+}
+
+static u8 *
+format_elf_segment_type (u8 * s, va_list * args)
+{
+  elf_segment_type_t type = va_arg (*args, elf_segment_type_t);
+  char *t = 0;
+
+  switch (type)
+    {
+#define _(f,i) case ELF_SEGMENT_##f: t = #f; break;
+      foreach_elf_segment_type
+#undef _
+    }
+
+  if (!t)
+    s = format (s, "unknown 0x%x", type);
+  else
+    s = format (s, "%s", t);
+  return s;
+}
+
+static u8 *
+format_elf_segment (u8 * s, va_list * args)
+{
+  elf_segment_t *es = va_arg (*args, elf_segment_t *);
+  elf64_segment_header_t *h = &es->header;
+
+  if (!h)
+    return format (s, "%=16s%=16s%=16s%=16s",
+		   "Type", "Virt. Address", "Phys. Address", "Size");
+
+  s = format (s, "%=16U%16Lx%16Lx%16Lx%16Lx",
+	      format_elf_segment_type, h->type,
+	      h->virtual_address,
+	      h->physical_address, h->memory_size, h->file_offset);
+
+  if (h->flags != 0)
+    {
+#define _(f,i) \
+  if (h->flags & ELF_SEGMENT_FLAG_##f) s = format (s, " %s", #f);
+      foreach_elf_segment_flag;
+#undef _
+    }
+
+  return s;
+}
+
+static u8 *
+format_elf_symbol_binding_and_type (u8 * s, va_list * args)
+{
+  int bt = va_arg (*args, int);
+  int b, t;
+  char *type_string = 0;
+  char *binding_string = 0;
+
+  switch ((b = ((bt >> 4) & 0xf)))
+    {
+#define _(f,n) case n: binding_string = #f; break;
+      foreach_elf_symbol_binding;
+#undef _
+    default:
+      break;
+    }
+
+  switch ((t = ((bt >> 0) & 0xf)))
+    {
+#define _(f,n) case n: type_string = #f; break;
+      foreach_elf_symbol_type;
+#undef _
+    default:
+      break;
+    }
+
+  if (binding_string)
+    s = format (s, "%s", binding_string);
+  else
+    s = format (s, "binding 0x%x", b);
+
+  if (type_string)
+    s = format (s, " %s", type_string);
+  else
+    s = format (s, " type 0x%x", t);
+
+  return s;
+}
+
+static u8 *
+format_elf_symbol_visibility (u8 * s, va_list * args)
+{
+  int visibility = va_arg (*args, int);
+  char *t = 0;
+
+  switch (visibility)
+    {
+#define _(f,n) case n: t = #f; break;
+      foreach_elf_symbol_visibility
+#undef _
+    }
+
+  if (t)
+    return format (s, "%s", t);
+  else
+    return format (s, "unknown 0x%x", visibility);
+}
+
+static u8 *
+format_elf_symbol_section_name (u8 * s, va_list * args)
+{
+  elf_main_t *em = va_arg (*args, elf_main_t *);
+  int si = va_arg (*args, int);
+  char *t = 0;
+
+  if (si < vec_len (em->sections))
+    {
+      elf_section_t *es = vec_elt_at_index (em->sections, si);
+      return format (s, "%s", elf_section_name (em, es));
+    }
+
+  if (si >= ELF_SYMBOL_SECTION_RESERVED_LO
+      && si <= ELF_SYMBOL_SECTION_RESERVED_HI)
+    {
+      switch (si)
+	{
+#define _(f,n) case n: t = #f; break;
+	  foreach_elf_symbol_reserved_section_index
+#undef _
+	default:
+	  break;
+	}
+    }
+
+  if (t)
+    return format (s, "%s", t);
+  else
+    return format (s, "unknown 0x%x", si);
+}
+
+u8 *
+format_elf_symbol (u8 * s, va_list * args)
+{
+  elf_main_t *em = va_arg (*args, elf_main_t *);
+  elf_symbol_table_t *t = va_arg (*args, elf_symbol_table_t *);
+  elf64_symbol_t *sym = va_arg (*args, elf64_symbol_t *);
+
+  if (!sym)
+    return format (s, "%=32s%=16s%=16s%=16s%=16s%=16s",
+		   "Symbol", "Size", "Value", "Type", "Visibility",
+		   "Section");
+
+  s = format (s, "%-32s%16Ld%16Lx%=16U%=16U%U",
+	      elf_symbol_name (t, sym),
+	      sym->size, sym->value,
+	      format_elf_symbol_binding_and_type, sym->binding_and_type,
+	      format_elf_symbol_visibility, sym->visibility,
+	      format_elf_symbol_section_name, em, sym->section_index);
+
+  return s;
+}
+
+static u8 *
+format_elf_relocation_type (u8 * s, va_list * args)
+{
+  elf_main_t *em = va_arg (*args, elf_main_t *);
+  int type = va_arg (*args, int);
+  char *t = 0;
+
+  switch (em->first_header.architecture)
+    {
+#define _(f,i) [i] = #f,
+
+    case ELF_ARCH_X86_64:
+      {
+	static char *tab[] = {
+	  foreach_elf_x86_64_relocation_type
+	};
+
+#undef _
+	if (type < ARRAY_LEN (tab))
+	  t = tab[type];
+	break;
+      }
+
+    default:
+      break;
+    }
+
+  if (!t)
+    s = format (s, "0x%02x", type);
+  else
+    s = format (s, "%s", t);
+
+  return s;
+}
+
+static u8 *
+format_elf_relocation (u8 * s, va_list * args)
+{
+  elf_main_t *em = va_arg (*args, elf_main_t *);
+  elf_relocation_with_addend_t *r =
+    va_arg (*args, elf_relocation_with_addend_t *);
+  elf_symbol_table_t *t;
+  elf64_symbol_t *sym;
+
+  if (!r)
+    return format (s, "%=16s%=16s%=16s", "Address", "Type", "Symbol");
+
+  t = vec_elt_at_index (em->symbol_tables, 0);
+  sym = vec_elt_at_index (t->symbols, r->symbol_and_type >> 32);
+
+  s = format (s, "%16Lx%16U",
+	      r->address,
+	      format_elf_relocation_type, em, r->symbol_and_type & 0xff);
+
+  if (sym->section_index != 0)
+    {
+      elf_section_t *es;
+      es = vec_elt_at_index (em->sections, sym->section_index);
+      s = format (s, " (section %s)", elf_section_name (em, es));
+    }
+
+  if (sym->name != 0)
+    s = format (s, " %s", elf_symbol_name (t, sym));
+
+  {
+    i64 a = r->addend;
+    if (a != 0)
+      s = format (s, " %c 0x%Lx", a > 0 ? '+' : '-', a > 0 ? a : -a);
+  }
+
+  return s;
+}
+
+static u8 *
+format_elf_dynamic_entry_type (u8 * s, va_list * args)
+{
+  u32 type = va_arg (*args, u32);
+  char *t = 0;
+  switch (type)
+    {
+#define _(f,n) case n: t = #f; break;
+      foreach_elf_dynamic_entry_type;
+#undef _
+    default:
+      break;
+    }
+  if (t)
+    return format (s, "%s", t);
+  else
+    return format (s, "unknown 0x%x", type);
+}
+
+static u8 *
+format_elf_dynamic_entry (u8 * s, va_list * args)
+{
+  elf_main_t *em = va_arg (*args, elf_main_t *);
+  elf64_dynamic_entry_t *e = va_arg (*args, elf64_dynamic_entry_t *);
+
+  if (!e)
+    return format (s, "%=40s%=16s", "Type", "Data");
+
+  s = format (s, "%=40U", format_elf_dynamic_entry_type, (u32) e->type);
+  switch (e->type)
+    {
+    case ELF_DYNAMIC_ENTRY_NEEDED_LIBRARY:
+    case ELF_DYNAMIC_ENTRY_RPATH:
+    case ELF_DYNAMIC_ENTRY_RUN_PATH:
+      s = format (s, "%s", em->dynamic_string_table + e->data);
+      break;
+
+    case ELF_DYNAMIC_ENTRY_INIT_FUNCTION:
+    case ELF_DYNAMIC_ENTRY_FINI_FUNCTION:
+    case ELF_DYNAMIC_ENTRY_SYMBOL_HASH:
+    case ELF_DYNAMIC_ENTRY_GNU_HASH:
+    case ELF_DYNAMIC_ENTRY_STRING_TABLE:
+    case ELF_DYNAMIC_ENTRY_SYMBOL_TABLE:
+    case ELF_DYNAMIC_ENTRY_PLT_GOT:
+    case ELF_DYNAMIC_ENTRY_PLT_RELOCATION_ADDRESS:
+    case ELF_DYNAMIC_ENTRY_RELA_ADDRESS:
+    case ELF_DYNAMIC_ENTRY_VERSION_NEED:
+    case ELF_DYNAMIC_ENTRY_VERSYM:
+      {
+	elf_section_t *es =
+	  elf_get_section_by_start_address_no_check (em, e->data);
+	if (es)
+	  s = format (s, "section %s", elf_section_name (em, es));
+	else
+	  s = format (s, "0x%Lx", e->data);
+	break;
+      }
+
+    default:
+      s = format (s, "0x%Lx", e->data);
+      break;
+    }
+
+  return s;
+}
+
+static u8 *
+format_elf_architecture (u8 * s, va_list * args)
+{
+  int a = va_arg (*args, int);
+  char *t;
+
+  switch (a)
+    {
+#define _(f,n) case n: t = #f; break;
+      foreach_elf_architecture;
+#undef _
+    default:
+      return format (s, "unknown 0x%x", a);
+    }
+
+  return format (s, "%s", t);
+}
+
+static u8 *
+format_elf_abi (u8 * s, va_list * args)
+{
+  int a = va_arg (*args, int);
+  char *t;
+
+  switch (a)
+    {
+#define _(f,n) case n: t = #f; break;
+      foreach_elf_abi;
+#undef _
+    default:
+      return format (s, "unknown 0x%x", a);
+    }
+
+  return format (s, "%s", t);
+}
+
+static u8 *
+format_elf_file_class (u8 * s, va_list * args)
+{
+  int a = va_arg (*args, int);
+  char *t;
+
+  switch (a)
+    {
+#define _(f) case ELF_##f: t = #f; break;
+      foreach_elf_file_class;
+#undef _
+    default:
+      return format (s, "unknown 0x%x", a);
+    }
+
+  return format (s, "%s", t);
+}
+
+static u8 *
+format_elf_file_type (u8 * s, va_list * args)
+{
+  int a = va_arg (*args, int);
+  char *t;
+
+  if (a >= ELF_ARCH_SPECIFIC_LO && a <= ELF_ARCH_SPECIFIC_HI)
+    return format (s, "arch-specific 0x%x", a - ELF_ARCH_SPECIFIC_LO);
+
+  if (a >= ELF_OS_SPECIFIC_LO && a <= ELF_OS_SPECIFIC_HI)
+    return format (s, "os-specific 0x%x", a - ELF_OS_SPECIFIC_LO);
+
+  switch (a)
+    {
+#define _(f,n) case n: t = #f; break;
+      foreach_elf_file_type;
+#undef _
+    default:
+      return format (s, "unknown 0x%x", a);
+    }
+
+  return format (s, "%s", t);
+}
+
+static u8 *
+format_elf_data_encoding (u8 * s, va_list * args)
+{
+  int a = va_arg (*args, int);
+  char *t;
+
+  switch (a)
+    {
+#define _(f) case ELF_##f: t = #f; break;
+      foreach_elf_data_encoding;
+#undef _
+    default:
+      return format (s, "unknown 0x%x", a);
+    }
+
+  return format (s, "%s", t);
+}
+
+static int
+elf_section_offset_compare (void *a1, void *a2)
+{
+  elf_section_t *s1 = a1;
+  elf_section_t *s2 = a2;
+
+  return ((i64) s1->header.file_offset - (i64) s2->header.file_offset);
+}
+
+static int
+elf_segment_va_compare (void *a1, void *a2)
+{
+  elf_segment_t *s1 = a1;
+  elf_segment_t *s2 = a2;
+
+  return ((i64) s1->header.virtual_address -
+	  (i64) s2->header.virtual_address);
+}
+
+u8 *
+format_elf_main (u8 * s, va_list * args)
+{
+  elf_main_t *em = va_arg (*args, elf_main_t *);
+  u32 verbose = va_arg (*args, u32);
+  elf64_file_header_t *fh = &em->file_header;
+
+  s =
+    format (s,
+	    "File header: machine: %U, file type/class %U/%U, data-encoding: %U, abi: %U version %d\n",
+	    format_elf_architecture, em->first_header.architecture,
+	    format_elf_file_type, em->first_header.file_type,
+	    format_elf_file_class, em->first_header.file_class,
+	    format_elf_data_encoding, em->first_header.data_encoding,
+	    format_elf_abi, em->first_header.abi,
+	    em->first_header.abi_version);
+
+  s = format (s, "  entry 0x%Lx, arch-flags 0x%x",
+	      em->file_header.entry_point, em->file_header.flags);
+
+  if (em->interpreter)
+    s = format (s, "\n  interpreter: %s", em->interpreter);
+
+  {
+    elf_section_t *h, *copy;
+
+    copy = 0;
+    vec_foreach (h, em->sections) if (h->header.type != ~0)
+      vec_add1 (copy, h[0]);
+
+    vec_sort_with_function (copy, elf_section_offset_compare);
+
+    s = format (s, "\nSections %d at file offset 0x%Lx-0x%Lx:\n",
+		fh->section_header_count,
+		fh->section_header_file_offset,
+		fh->section_header_file_offset +
+		(u64) fh->section_header_count * fh->section_header_size);
+    s = format (s, "%U\n", format_elf_section, em, 0);
+    vec_foreach (h, copy) s = format (s, "%U\n", format_elf_section, em, h);
+
+    vec_free (copy);
+  }
+
+  {
+    elf_segment_t *h, *copy;
+
+    copy = 0;
+    vec_foreach (h, em->segments)
+      if (h->header.type != ELF_SEGMENT_UNUSED && h->header.type != ~0)
+      vec_add1 (copy, h[0]);
+
+    /* Sort segments by address. */
+    vec_sort_with_function (copy, elf_segment_va_compare);
+
+    s = format (s, "\nSegments: %d at file offset 0x%Lx-0x%Lx:\n",
+		fh->segment_header_count,
+		fh->segment_header_file_offset,
+		(u64) fh->segment_header_file_offset +
+		(u64) fh->segment_header_count *
+		(u64) fh->segment_header_size);
+
+    s = format (s, "%U\n", format_elf_segment, 0);
+    vec_foreach (h, copy) s = format (s, "%U\n", format_elf_segment, h);
+
+    vec_free (copy);
+  }
+
+  if ((verbose & FORMAT_ELF_MAIN_SYMBOLS) && vec_len (em->symbol_tables) > 0)
+    {
+      elf_symbol_table_t *t;
+      elf64_symbol_t *sym;
+      elf_section_t *es;
+
+      vec_foreach (t, em->symbol_tables)
+      {
+	es = vec_elt_at_index (em->sections, t->section_index);
+	s =
+	  format (s, "\nSymbols for section %s:\n",
+		  elf_section_name (em, es));
+
+	s = format (s, "%U\n", format_elf_symbol, em, 0, 0);
+	vec_foreach (sym, t->symbols)
+	  s = format (s, "%U\n", format_elf_symbol, em, t, sym);
+      }
+    }
+
+  if ((verbose & FORMAT_ELF_MAIN_RELOCATIONS)
+      && vec_len (em->relocation_tables) > 0)
+    {
+      elf_relocation_table_t *t;
+      elf_relocation_with_addend_t *r;
+      elf_section_t *es;
+
+      vec_foreach (t, em->relocation_tables)
+      {
+	es = vec_elt_at_index (em->sections, t->section_index);
+	r = t->relocations;
+	s = format (s, "\nRelocations for section %s:\n",
+		    elf_section_name (em, es));
+
+	s = format (s, "%U\n", format_elf_relocation, em, 0);
+	vec_foreach (r, t->relocations)
+	{
+	  s = format (s, "%U\n", format_elf_relocation, em, r);
+	}
+      }
+    }
+
+  if ((verbose & FORMAT_ELF_MAIN_DYNAMIC)
+      && vec_len (em->dynamic_entries) > 0)
+    {
+      elf64_dynamic_entry_t *es, *e;
+      s = format (s, "\nDynamic linker information:\n");
+      es = vec_dup (em->dynamic_entries);
+      s = format (s, "%U\n", format_elf_dynamic_entry, em, 0);
+      vec_foreach (e, es)
+	s = format (s, "%U\n", format_elf_dynamic_entry, em, e);
+    }
+
+  return s;
+}
+
+static void
+elf_parse_segments (elf_main_t * em, void *data)
+{
+  void *d = data + em->file_header.segment_header_file_offset;
+  uword n = em->file_header.segment_header_count;
+  uword i;
+
+  vec_resize (em->segments, n);
+
+  for (i = 0; i < n; i++)
+    {
+      em->segments[i].index = i;
+
+      if (em->first_header.file_class == ELF_64BIT)
+	{
+	  elf64_segment_header_t *h = d;
+#define _(t,f) em->segments[i].header.f = elf_swap_##t (em, h->f);
+	  foreach_elf64_segment_header
+#undef _
+	    d = (h + 1);
+	}
+      else
+	{
+	  elf32_segment_header_t *h = d;
+#define _(t,f) em->segments[i].header.f = elf_swap_##t (em, h->f);
+	  foreach_elf32_segment_header
+#undef _
+	    d = (h + 1);
+	}
+    }
+}
+
+static void
+elf_parse_sections (elf_main_t * em, void *data)
+{
+  elf64_file_header_t *fh = &em->file_header;
+  elf_section_t *s;
+  void *d = data + fh->section_header_file_offset;
+  uword n = fh->section_header_count;
+  uword i;
+
+  vec_resize (em->sections, n);
+
+  for (i = 0; i < n; i++)
+    {
+      s = em->sections + i;
+
+      s->index = i;
+
+      if (em->first_header.file_class == ELF_64BIT)
+	{
+	  elf64_section_header_t *h = d;
+#define _(t,f) em->sections[i].header.f = elf_swap_##t (em, h->f);
+	  foreach_elf64_section_header
+#undef _
+	    d = (h + 1);
+	}
+      else
+	{
+	  elf32_section_header_t *h = d;
+#define _(t,f) em->sections[i].header.f = elf_swap_##t (em, h->f);
+	  foreach_elf32_section_header
+#undef _
+	    d = (h + 1);
+	}
+
+      if (s->header.type != ELF_SECTION_NO_BITS)
+	vec_add (s->contents, data + s->header.file_offset,
+		 s->header.file_size);
+    }
+
+  s = vec_elt_at_index (em->sections, fh->section_header_string_table_index);
+
+  em->section_by_name
+    = hash_create_string ( /* # elts */ vec_len (em->sections),
+			  /* sizeof of value */ sizeof (uword));
+
+  vec_foreach (s, em->sections)
+  {
+    hash_set_mem (em->section_by_name,
+		  elf_section_name (em, s), s - em->sections);
+    hash_set (em->section_by_start_address,
+	      s->header.exec_address, s - em->sections);
+  }
+}
+
+static void
+add_symbol_table (elf_main_t * em, elf_section_t * s)
+{
+  elf_symbol_table_t *tab;
+  elf32_symbol_t *sym32;
+  elf64_symbol_t *sym64;
+  uword i;
+
+  if (s->header.type == ELF_SECTION_DYNAMIC_SYMBOL_TABLE)
+    em->dynamic_symbol_table_index = vec_len (em->symbol_tables);
+
+  vec_add2 (em->symbol_tables, tab, 1);
+
+  tab->section_index = s->index;
+
+  if (em->first_header.file_class == ELF_64BIT)
+    {
+      tab->symbols =
+	elf_get_section_contents (em, s - em->sections,
+				  sizeof (tab->symbols[0]));
+      for (i = 0; i < vec_len (tab->symbols); i++)
+	{
+#define _(t,f) tab->symbols[i].f = elf_swap_##t (em, tab->symbols[i].f);
+	  foreach_elf64_symbol_header;
+#undef _
+	}
+    }
+  else
+    {
+      sym32 =
+	elf_get_section_contents (em, s - em->sections, sizeof (sym32[0]));
+      vec_clone (tab->symbols, sym32);
+      for (i = 0; i < vec_len (tab->symbols); i++)
+	{
+#define _(t,f) tab->symbols[i].f = elf_swap_##t (em, sym32[i].f);
+	  foreach_elf32_symbol_header;
+#undef _
+	}
+    }
+
+  if (s->header.link == 0)
+    return;
+
+  tab->string_table =
+    elf_get_section_contents (em, s->header.link,
+			      sizeof (tab->string_table[0]));
+  tab->symbol_by_name =
+    hash_create_string ( /* # elts */ vec_len (tab->symbols),
+			/* sizeof of value */ sizeof (uword));
+
+  vec_foreach (sym64, tab->symbols)
+  {
+    if (sym64->name != 0)
+      hash_set_mem (tab->symbol_by_name,
+		    tab->string_table + sym64->name, sym64 - tab->symbols);
+  }
+}
+
+static void
+add_relocation_table (elf_main_t * em, elf_section_t * s)
+{
+  uword has_addend = s->header.type == ELF_SECTION_RELOCATION_ADD;
+  elf_relocation_table_t *t;
+  uword i;
+
+  vec_add2 (em->relocation_tables, t, 1);
+  t->section_index = s - em->sections;
+
+  if (em->first_header.file_class == ELF_64BIT)
+    {
+      elf64_relocation_t *r, *rs;
+
+      rs = elf_get_section_contents (em, t->section_index,
+				     sizeof (rs[0]) +
+				     has_addend * sizeof (rs->addend[0]));
+
+      if (em->need_byte_swap)
+	{
+	  r = rs;
+	  for (i = 0; i < vec_len (r); i++)
+	    {
+	      r->address = elf_swap_u64 (em, r->address);
+	      r->symbol_and_type = elf_swap_u32 (em, r->symbol_and_type);
+	      if (has_addend)
+		r->addend[0] = elf_swap_u64 (em, r->addend[0]);
+	      r = elf_relocation_next (r, s->header.type);
+	    }
+	}
+
+      vec_resize (t->relocations, vec_len (rs));
+      clib_memcpy (t->relocations, rs, vec_bytes (t->relocations));
+      vec_free (rs);
+    }
+  else
+    {
+      elf_relocation_with_addend_t *r;
+      elf32_relocation_t *r32, *r32s;
+
+      r32s = elf_get_section_contents (em, t->section_index,
+				       sizeof (r32s[0]) +
+				       has_addend * sizeof (r32s->addend[0]));
+      vec_resize (t->relocations, vec_len (r32s));
+
+      r32 = r32s;
+      vec_foreach (r, t->relocations)
+      {
+	r->address = elf_swap_u32 (em, r32->address);
+	r->symbol_and_type = elf_swap_u32 (em, r->symbol_and_type);
+	r->addend = has_addend ? elf_swap_u32 (em, r32->addend[0]) : 0;
+	r32 = elf_relocation_next (r32, s->header.type);
+      }
+
+      vec_free (r32s);
+    }
+}
+
+void
+elf_parse_symbols (elf_main_t * em)
+{
+  elf_section_t *s;
+
+  /* No need to parse symbols twice. */
+  if (em->parsed_symbols)
+    return;
+  em->parsed_symbols = 1;
+
+  vec_foreach (s, em->sections)
+  {
+    switch (s->header.type)
+      {
+      case ELF_SECTION_SYMBOL_TABLE:
+      case ELF_SECTION_DYNAMIC_SYMBOL_TABLE:
+	add_symbol_table (em, s);
+	break;
+
+      case ELF_SECTION_RELOCATION_ADD:
+      case ELF_SECTION_RELOCATION:
+	add_relocation_table (em, s);
+	break;
+
+      default:
+	break;
+      }
+  }
+}
+
+void
+elf_set_dynamic_entries (elf_main_t * em)
+{
+  uword i;
+
+  /* Start address for sections may have changed. */
+  {
+    elf64_dynamic_entry_t *e;
+
+    vec_foreach (e, em->dynamic_entries)
+    {
+      switch (e->type)
+	{
+	case ELF_DYNAMIC_ENTRY_INIT_FUNCTION:
+	case ELF_DYNAMIC_ENTRY_FINI_FUNCTION:
+	case ELF_DYNAMIC_ENTRY_SYMBOL_HASH:
+	case ELF_DYNAMIC_ENTRY_GNU_HASH:
+	case ELF_DYNAMIC_ENTRY_STRING_TABLE:
+	case ELF_DYNAMIC_ENTRY_SYMBOL_TABLE:
+	case ELF_DYNAMIC_ENTRY_PLT_GOT:
+	case ELF_DYNAMIC_ENTRY_PLT_RELOCATION_ADDRESS:
+	case ELF_DYNAMIC_ENTRY_RELA_ADDRESS:
+	case ELF_DYNAMIC_ENTRY_VERSION_NEED:
+	case ELF_DYNAMIC_ENTRY_VERSYM:
+	  {
+	    elf_section_t *es =
+	      elf_get_section_by_start_address_no_check (em, e->data);
+	    /* If section is not found just leave e->data alone. */
+	    if (es)
+	      e->data = es->header.exec_address;
+	    break;
+	  }
+
+	default:
+	  break;
+	}
+    }
+  }
+
+  if (em->first_header.file_class == ELF_64BIT)
+    {
+      elf64_dynamic_entry_t *e, *es;
+
+      es = em->dynamic_entries;
+      if (em->need_byte_swap)
+	{
+	  es = vec_dup (es);
+	  vec_foreach (e, es)
+	  {
+	    e->type = elf_swap_u64 (em, e->type);
+	    e->data = elf_swap_u64 (em, e->data);
+	  }
+	}
+
+      elf_set_section_contents (em, em->dynamic_section_index, es,
+				vec_bytes (es));
+      if (es != em->dynamic_entries)
+	vec_free (es);
+    }
+  else
+    {
+      elf32_dynamic_entry_t *es;
+
+      vec_clone (es, em->dynamic_entries);
+      if (em->need_byte_swap)
+	{
+	  for (i = 0; i < vec_len (es); i++)
+	    {
+	      es[i].type = elf_swap_u32 (em, em->dynamic_entries[i].type);
+	      es[i].data = elf_swap_u32 (em, em->dynamic_entries[i].data);
+	    }
+	}
+
+      elf_set_section_contents (em, em->dynamic_section_index, es,
+				vec_bytes (es));
+      vec_free (es);
+    }
+}
+
+clib_error_t *
+elf_parse (elf_main_t * em, void *data, uword data_bytes)
+{
+  elf_first_header_t *h = data;
+  elf64_file_header_t *fh = &em->file_header;
+  clib_error_t *error = 0;
+
+  {
+    char *save = em->file_name;
+    memset (em, 0, sizeof (em[0]));
+    em->file_name = save;
+  }
+
+  em->first_header = h[0];
+  em->need_byte_swap =
+    CLIB_ARCH_IS_BIG_ENDIAN != (h->data_encoding ==
+				ELF_TWOS_COMPLEMENT_BIG_ENDIAN);
+  elf_swap_first_header (em, &em->first_header);
+
+  if (!(h->magic[0] == 0x7f
+	&& h->magic[1] == 'E' && h->magic[2] == 'L' && h->magic[3] == 'F'))
+    return clib_error_return (0, "`%s': bad magic", em->file_name);
+
+  if (h->file_class == ELF_64BIT)
+    {
+      elf64_file_header_t *h64 = (void *) (h + 1);
+#define _(t,f) fh->f = elf_swap_##t (em, h64->f);
+      foreach_elf64_file_header
+#undef _
+    }
+  else
+    {
+      elf32_file_header_t *h32 = (void *) (h + 1);
+
+#define _(t,f) fh->f = elf_swap_##t (em, h32->f);
+      foreach_elf32_file_header
+#undef _
+    }
+
+  elf_parse_segments (em, data);
+  elf_parse_sections (em, data);
+
+  /* Figure which sections are contained in each segment. */
+  {
+    elf_segment_t *g;
+    elf_section_t *s;
+    vec_foreach (g, em->segments)
+    {
+      u64 g_lo, g_hi;
+      u64 s_lo, s_hi;
+
+      if (g->header.memory_size == 0)
+	continue;
+
+      g_lo = g->header.virtual_address;
+      g_hi = g_lo + g->header.memory_size;
+
+      vec_foreach (s, em->sections)
+      {
+	s_lo = s->header.exec_address;
+	s_hi = s_lo + s->header.file_size;
+
+	if (s_lo >= g_lo && s_hi <= g_hi)
+	  {
+	    g->section_index_bitmap =
+	      clib_bitmap_ori (g->section_index_bitmap, s->index);
+	    s->segment_index_bitmap =
+	      clib_bitmap_ori (s->segment_index_bitmap, g->index);
+	  }
+      }
+    }
+  }
+
+  return error;
+}
+
+#ifdef CLIB_UNIX
+
+static void
+add_dynamic_entries (elf_main_t * em, elf_section_t * s)
+{
+  uword i;
+
+  /* Can't have more than one dynamic section. */
+  ASSERT (em->dynamic_section_index == 0);
+  em->dynamic_section_index = s->index;
+
+  if (em->first_header.file_class == ELF_64BIT)
+    {
+      elf64_dynamic_entry_t *e;
+
+      e = elf_get_section_contents (em, s - em->sections, sizeof (e[0]));
+      if (em->need_byte_swap)
+	for (i = 0; i < vec_len (e); i++)
+	  {
+	    e[i].type = elf_swap_u64 (em, e[i].type);
+	    e[i].data = elf_swap_u64 (em, e[i].data);
+	  }
+
+      em->dynamic_entries = e;
+    }
+  else
+    {
+      elf32_dynamic_entry_t *e;
+
+      e = elf_get_section_contents (em, s - em->sections, sizeof (e[0]));
+      vec_clone (em->dynamic_entries, e);
+      if (em->need_byte_swap)
+	for (i = 0; i < vec_len (e); i++)
+	  {
+	    em->dynamic_entries[i].type = elf_swap_u32 (em, e[i].type);
+	    em->dynamic_entries[i].data = elf_swap_u32 (em, e[i].data);
+	  }
+
+      vec_free (e);
+    }
+}
+
+static void
+byte_swap_verneed (elf_main_t * em, elf_dynamic_version_need_union_t * vus)
+{
+  uword *entries_swapped = 0;
+  uword i, j;
+
+  for (i = 0; i < vec_len (vus); i++)
+    {
+      elf_dynamic_version_need_union_t *n = vec_elt_at_index (vus, i);
+      elf_dynamic_version_need_union_t *a;
+
+      if (clib_bitmap_get (entries_swapped, i))
+	continue;
+
+      elf_swap_verneed (&n->need);
+      entries_swapped = clib_bitmap_set (entries_swapped, i, 1);
+
+      if (n->need.first_aux_offset != 0)
+	{
+	  ASSERT (n->need.first_aux_offset % sizeof (n[0]) == 0);
+	  j = i + (n->need.first_aux_offset / sizeof (n[0]));
+	  while (1)
+	    {
+	      a = vec_elt_at_index (vus, j);
+	      if (!clib_bitmap_get (entries_swapped, j))
+		{
+		  entries_swapped = clib_bitmap_set (entries_swapped, j, 1);
+		  elf_swap_verneed_aux (&a->aux);
+		}
+	      if (a->aux.next_offset == 0)
+		break;
+	      ASSERT (a->aux.next_offset % sizeof (a->aux) == 0);
+	      j += (a->aux.next_offset / sizeof (a->aux));
+	    }
+	}
+    }
+
+  clib_bitmap_free (entries_swapped);
+}
+
+static void set_dynamic_verneed (elf_main_t * em) __attribute__ ((unused));
+static void
+set_dynamic_verneed (elf_main_t * em)
+{
+  elf_dynamic_version_need_union_t *vus = em->verneed;
+
+  if (em->need_byte_swap)
+    {
+      vus = vec_dup (vus);
+      byte_swap_verneed (em, vus);
+    }
+
+  elf_set_section_contents (em, em->verneed_section_index, vus,
+			    vec_bytes (vus));
+  if (vus != em->verneed)
+    vec_free (vus);
+}
+
+static void
+set_symbol_table (elf_main_t * em, u32 table_index) __attribute__ ((unused));
+static void
+set_symbol_table (elf_main_t * em, u32 table_index)
+{
+  elf_symbol_table_t *tab = vec_elt_at_index (em->symbol_tables, table_index);
+
+  if (em->first_header.file_class == ELF_64BIT)
+    {
+      elf64_symbol_t *s, *syms;
+
+      syms = vec_dup (tab->symbols);
+      vec_foreach (s, syms)
+      {
+#define _(t,f) s->f = elf_swap_##t (em, s->f);
+	foreach_elf64_symbol_header;
+#undef _
+      }
+
+      elf_set_section_contents (em, tab->section_index,
+				syms, vec_bytes (syms));
+    }
+  else
+    {
+      elf32_symbol_t *syms;
+      uword i;
+      vec_clone (syms, tab->symbols);
+      for (i = 0; i < vec_len (tab->symbols); i++)
+	{
+#define _(t,f) syms[i].f = elf_swap_##t (em, tab->symbols[i].f);
+	  foreach_elf32_symbol_header;
+#undef _
+	}
+
+      elf_set_section_contents (em, tab->section_index,
+				syms, vec_bytes (syms));
+    }
+}
+
+static char *
+elf_find_interpreter (elf_main_t * em, void *data)
+{
+  elf_segment_t *g;
+  elf_section_t *s;
+  uword *p;
+
+  vec_foreach (g, em->segments)
+  {
+    if (g->header.type == ELF_SEGMENT_INTERP)
+      break;
+  }
+
+  if (g >= vec_end (em->segments))
+    return 0;
+
+  p = hash_get (em->section_by_start_address, g->header.virtual_address);
+  if (!p)
+    return 0;
+
+  s = vec_elt_at_index (em->sections, p[0]);
+  return (char *) vec_dup (s->contents);
+}
+
+static void *
+elf_get_section_contents_with_starting_address (elf_main_t * em,
+						uword start_address,
+						uword elt_size,
+						u32 * section_index_result)
+{
+  elf_section_t *s = 0;
+  clib_error_t *error;
+
+  error = elf_get_section_by_start_address (em, start_address, &s);
+  if (error)
+    {
+      clib_error_report (error);
+      return 0;
+    }
+
+  if (section_index_result)
+    *section_index_result = s->index;
+
+  return elf_get_section_contents (em, s->index, elt_size);
+}
+
+static void
+elf_parse_dynamic (elf_main_t * em)
+{
+  elf_section_t *s;
+  elf64_dynamic_entry_t *e;
+
+  vec_foreach (s, em->sections)
+  {
+    switch (s->header.type)
+      {
+      case ELF_SECTION_DYNAMIC:
+	add_dynamic_entries (em, s);
+	break;
+
+      default:
+	break;
+      }
+  }
+
+  em->dynamic_string_table_section_index = ~0;
+  em->dynamic_string_table = 0;
+
+  vec_foreach (e, em->dynamic_entries)
+  {
+    switch (e->type)
+      {
+      case ELF_DYNAMIC_ENTRY_STRING_TABLE:
+	ASSERT (vec_len (em->dynamic_string_table) == 0);
+	em->dynamic_string_table
+	  =
+	  elf_get_section_contents_with_starting_address (em, e->data,
+							  sizeof (u8),
+							  &em->
+							  dynamic_string_table_section_index);
+	break;
+
+      case ELF_DYNAMIC_ENTRY_SYMBOL_TABLE:
+	{
+	  elf_section_t *s = 0;
+	  clib_error_t *error;
+
+	  error = elf_get_section_by_start_address (em, e->data, &s);
+	  if (error)
+	    {
+	      clib_error_report (error);
+	      return;
+	    }
+
+	  em->dynamic_symbol_table_section_index = s - em->sections;
+	}
+	break;
+
+      case ELF_DYNAMIC_ENTRY_VERSYM:
+	em->versym
+	  =
+	  elf_get_section_contents_with_starting_address (em, e->data,
+							  sizeof (em->versym
+								  [0]),
+							  &em->
+							  versym_section_index);
+	if (em->need_byte_swap)
+	  {
+	    uword i;
+	    for (i = 0; i < vec_len (em->versym); i++)
+	      em->versym[i] = clib_byte_swap_u16 (em->versym[i]);
+	  }
+	break;
+
+      case ELF_DYNAMIC_ENTRY_VERSION_NEED:
+	em->verneed
+	  =
+	  elf_get_section_contents_with_starting_address (em, e->data,
+							  sizeof (em->verneed
+								  [0]),
+							  &em->
+							  verneed_section_index);
+	if (em->need_byte_swap)
+	  byte_swap_verneed (em, em->verneed);
+	break;
+
+      default:
+	break;
+      }
+  }
+}
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+clib_error_t *
+elf_read_file (elf_main_t * em, char *file_name)
+{
+  int fd;
+  struct stat fd_stat;
+  uword mmap_length = 0;
+  void *data = 0;
+  clib_error_t *error = 0;
+
+  elf_main_init (em);
+
+  fd = open (file_name, 0);
+  if (fd < 0)
+    {
+      error = clib_error_return_unix (0, "open `%s'", file_name);
+      goto done;
+    }
+
+  if (fstat (fd, &fd_stat) < 0)
+    {
+      error = clib_error_return_unix (0, "fstat `%s'", file_name);
+      goto done;
+    }
+  mmap_length = fd_stat.st_size;
+
+  data = mmap (0, mmap_length, PROT_READ, MAP_SHARED, fd, /* offset */ 0);
+  if (~pointer_to_uword (data) == 0)
+    {
+      error = clib_error_return_unix (0, "mmap `%s'", file_name);
+      goto done;
+    }
+
+  em->file_name = file_name;
+
+  error = elf_parse (em, data, mmap_length);
+  if (error)
+    goto done;
+
+  elf_parse_symbols (em);
+  elf_parse_dynamic (em);
+
+  em->interpreter = elf_find_interpreter (em, data);
+
+  munmap (data, mmap_length);
+  close (fd);
+
+  return /* no error */ 0;
+
+done:
+  elf_main_free (em);
+  if (fd >= 0)
+    close (fd);
+  if (data)
+    munmap (data, mmap_length);
+  return error;
+}
+
+typedef struct
+{
+  u8 *new_table;
+
+  u8 *old_table;
+
+  uword *hash;
+} string_table_builder_t;
+
+static u32
+string_table_add_name (string_table_builder_t * b, u8 * n)
+{
+  uword *p, i, j, l;
+
+  p = hash_get_mem (b->hash, n);
+  if (p)
+    return p[0];
+
+  l = strlen ((char *) n);
+  i = vec_len (b->new_table);
+  vec_add (b->new_table, n, l + 1);
+
+  for (j = 0; j <= l; j++)
+    {
+      if (j > 0)
+	{
+	  p = hash_get_mem (b->hash, n + j);
+
+	  /* Sub-string already in table? */
+	  if (p)
+	    continue;
+	}
+
+      hash_set_mem (b->hash, n + j, i + j);
+    }
+
+  return i;
+}
+
+static u32 string_table_add_name_index (string_table_builder_t * b, u32 index)
+  __attribute__ ((unused));
+static u32
+string_table_add_name_index (string_table_builder_t * b, u32 index)
+{
+  u8 *n = b->old_table + index;
+  return string_table_add_name (b, n);
+}
+
+static void string_table_init (string_table_builder_t * b, u8 * old_table)
+  __attribute__ ((unused));
+static void
+string_table_init (string_table_builder_t * b, u8 * old_table)
+{
+  memset (b, 0, sizeof (b[0]));
+  b->old_table = old_table;
+  b->hash = hash_create_string (0, sizeof (uword));
+}
+
+static u8 *string_table_done (string_table_builder_t * b)
+  __attribute__ ((unused));
+static u8 *
+string_table_done (string_table_builder_t * b)
+{
+  hash_free (b->hash);
+  return b->new_table;
+}
+
+static void
+layout_sections (elf_main_t * em)
+{
+  elf_section_t *s;
+  u32 n_sections_with_changed_exec_address = 0;
+  u32 *deferred_symbol_and_string_sections = 0;
+  u32 n_deleted_sections = 0;
+  /* note: rebuild is always zero. Intent lost in the sands of time */
+#if 0
+  int rebuild = 0;
+
+  /* Re-build section string table (sections may have been deleted). */
+  if (rebuild)
+    {
+      u8 *st = 0;
+
+      vec_foreach (s, em->sections)
+      {
+	u8 *name;
+	if (s->header.type == ~0)
+	  continue;
+	name = elf_section_name (em, s);
+	s->header.name = vec_len (st);
+	vec_add (st, name, strlen ((char *) name) + 1);
+      }
+
+      s =
+	vec_elt_at_index (em->sections,
+			  em->file_header.section_header_string_table_index);
+
+      vec_free (s->contents);
+      s->contents = st;
+    }
+
+  /* Re-build dynamic string table. */
+  if (rebuild && em->dynamic_string_table_section_index != ~0)
+    {
+      string_table_builder_t b;
+
+      string_table_init (&b, em->dynamic_string_table);
+
+      /* Add all dynamic symbols. */
+      {
+	elf_symbol_table_t *symtab;
+	elf64_symbol_t *sym;
+
+	symtab =
+	  vec_elt_at_index (em->symbol_tables,
+			    em->dynamic_symbol_table_index);
+	vec_foreach (sym, symtab->symbols)
+	{
+	  u8 *name = elf_symbol_name (symtab, sym);
+	  sym->name = string_table_add_name (&b, name);
+	}
+
+	set_symbol_table (em, em->dynamic_symbol_table_index);
+      }
+
+      /* Add all dynamic entries. */
+      {
+	elf64_dynamic_entry_t *e;
+
+	vec_foreach (e, em->dynamic_entries)
+	{
+	  switch (e->type)
+	    {
+	    case ELF_DYNAMIC_ENTRY_NEEDED_LIBRARY:
+	    case ELF_DYNAMIC_ENTRY_RPATH:
+	    case ELF_DYNAMIC_ENTRY_RUN_PATH:
+	      e->data = string_table_add_name_index (&b, e->data);
+	      break;
+	    }
+	}
+      }
+
+      /* Add all version needs. */
+      if (vec_len (em->verneed) > 0)
+	{
+	  elf_dynamic_version_need_union_t *n, *a;
+
+	  n = em->verneed;
+	  while (1)
+	    {
+	      n->need.file_name_offset =
+		string_table_add_name_index (&b, n->need.file_name_offset);
+
+	      if (n->need.first_aux_offset != 0)
+		{
+		  a = n + n->need.first_aux_offset / sizeof (n[0]);
+		  while (1)
+		    {
+		      a->aux.name =
+			string_table_add_name_index (&b, a->aux.name);
+		      if (a->aux.next_offset == 0)
+			break;
+		      a += a->aux.next_offset / sizeof (a[0]);
+		    }
+		}
+
+	      if (n->need.next_offset == 0)
+		break;
+
+	      n += n->need.next_offset / sizeof (n[0]);
+	    }
+
+	  set_dynamic_verneed (em);
+	}
+
+      s =
+	vec_elt_at_index (em->sections,
+			  em->dynamic_string_table_section_index);
+
+      vec_free (s->contents);
+      s->contents = string_table_done (&b);
+    }
+#endif /* dead code */
+
+  /* Figure file offsets and exec addresses for sections. */
+  {
+    u64 exec_address = 0, file_offset = 0;
+    u64 file_size, align_size;
+
+    vec_foreach (s, em->sections)
+    {
+      /* Ignore deleted and unused sections. */
+      switch (s->header.type)
+	{
+	case ~0:
+	  n_deleted_sections++;
+	case ELF_SECTION_UNUSED:
+	  continue;
+
+	case ELF_SECTION_STRING_TABLE:
+	case ELF_SECTION_SYMBOL_TABLE:
+	  if (!(s->index == em->dynamic_string_table_section_index
+		|| s->index ==
+		em->file_header.section_header_string_table_index))
+	    {
+	      vec_add1 (deferred_symbol_and_string_sections, s->index);
+	      continue;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+
+      exec_address = round_pow2_u64 (exec_address, s->header.align);
+
+      /* Put sections we added at end of file. */
+      if (s->header.file_offset == ~0)
+	s->header.file_offset = file_offset;
+
+      /* Follow gaps in original file. */
+      if (s->header.exec_address > exec_address)
+	{
+	  exec_address = s->header.exec_address;
+	  file_offset = s->header.file_offset;
+	}
+
+      if (s->header.flags & ELF_SECTION_FLAG_ALLOC)
+	{
+	  s->exec_address_change = exec_address - s->header.exec_address;
+	  n_sections_with_changed_exec_address += s->exec_address_change != 0;
+	  s->header.exec_address = exec_address;
+	}
+
+      if (s->header.type == ELF_SECTION_NO_BITS)
+	file_size = s->header.file_size;
+      else
+	file_size = vec_len (s->contents);
+
+      {
+	u64 align;
+
+	if (s + 1 >= vec_end (em->sections))
+	  align = 16;
+	else if (s[1].header.type == ELF_SECTION_NO_BITS)
+	  align = 8;
+	else
+	  align = s[1].header.align;
+
+	if (s->header.flags & ELF_SECTION_FLAG_ALLOC)
+	  {
+	    u64 v = round_pow2_u64 (exec_address + file_size, align);
+	    align_size = v - exec_address;
+	  }
+	else
+	  {
+	    u64 v = round_pow2_u64 (file_offset + file_size, align);
+	    align_size = v - file_offset;
+	  }
+      }
+
+      s->header.file_offset = file_offset;
+      s->header.file_size = file_size;
+      s->align_size = align_size;
+
+      if (s->header.type != ELF_SECTION_NO_BITS)
+	file_offset += align_size;
+      exec_address += align_size;
+    }
+
+    /* Section headers go after last section but before symbol/string
+       tables. */
+    {
+      elf64_file_header_t *fh = &em->file_header;
+
+      fh->section_header_file_offset = file_offset;
+      fh->section_header_count = vec_len (em->sections) - n_deleted_sections;
+      file_offset += (u64) fh->section_header_count * fh->section_header_size;
+    }
+
+    {
+      int i;
+      for (i = 0; i < vec_len (deferred_symbol_and_string_sections); i++)
+	{
+	  s =
+	    vec_elt_at_index (em->sections,
+			      deferred_symbol_and_string_sections[i]);
+
+	  s->header.file_offset = file_offset;
+	  s->header.file_size = vec_len (s->contents);
+
+	  align_size = round_pow2 (vec_len (s->contents), 16);
+	  s->align_size = align_size;
+	  file_offset += align_size;
+	}
+      vec_free (deferred_symbol_and_string_sections);
+    }
+  }
+
+  /* Update dynamic entries now that sections have been assigned
+     possibly new addresses. */
+#if 0
+  if (rebuild)
+    elf_set_dynamic_entries (em);
+#endif
+
+  /* Update segments for changed section addresses. */
+  {
+    elf_segment_t *g;
+    uword si;
+
+    vec_foreach (g, em->segments)
+    {
+      u64 s_lo, s_hi, f_lo = 0;
+      u32 n_sections = 0;
+
+      if (g->header.memory_size == 0)
+	continue;
+
+      s_lo = s_hi = 0;
+	/* *INDENT-OFF* */
+	clib_bitmap_foreach (si, g->section_index_bitmap, ({
+	  u64 lo, hi;
+
+	  s = vec_elt_at_index (em->sections, si);
+	  lo = s->header.exec_address;
+	  hi = lo + s->align_size;
+	  if (n_sections == 0)
+	    {
+	      s_lo = lo;
+	      s_hi = hi;
+	      f_lo = s->header.file_offset;
+	      n_sections++;
+	    }
+	  else
+	    {
+	      if (lo < s_lo)
+		{
+		  s_lo = lo;
+		  f_lo = s->header.file_offset;
+		}
+	      if (hi > s_hi)
+		s_hi = hi;
+	    }
+	}));
+	/* *INDENT-ON* */
+
+      if (n_sections == 0)
+	continue;
+
+      /* File offset zero includes ELF headers/segment headers.
+         Don't change that. */
+      if (g->header.file_offset == 0 && g->header.type == ELF_SEGMENT_LOAD)
+	{
+	  s_lo = g->header.virtual_address;
+	  f_lo = g->header.file_offset;
+	}
+
+      g->header.virtual_address = s_lo;
+      g->header.physical_address = s_lo;
+      g->header.file_offset = f_lo;
+      g->header.memory_size = s_hi - s_lo;
+    }
+  }
+}
+
+clib_error_t *
+elf_write_file (elf_main_t * em, char *file_name)
+{
+  int fd;
+  FILE *f;
+  clib_error_t *error = 0;
+
+  fd = open (file_name, O_CREAT | O_RDWR | O_TRUNC, 0755);
+  if (fd < 0)
+    return clib_error_return_unix (0, "open `%s'", file_name);
+
+  f = fdopen (fd, "w");
+
+  /* Section contents may have changed.  So, we need to update
+     stuff to reflect this. */
+  layout_sections (em);
+
+  /* Write first header. */
+  {
+    elf_first_header_t h = em->first_header;
+
+    elf_swap_first_header (em, &h);
+    if (fwrite (&h, sizeof (h), 1, f) != 1)
+      {
+	error = clib_error_return_unix (0, "write first header");
+	goto error;
+      }
+  }
+
+  /* Write file header. */
+  {
+    elf64_file_header_t h = em->file_header;
+
+    /* Segment headers are after first header. */
+    h.segment_header_file_offset = sizeof (elf_first_header_t);
+    if (em->first_header.file_class == ELF_64BIT)
+      h.segment_header_file_offset += sizeof (elf64_file_header_t);
+    else
+      h.segment_header_file_offset += sizeof (elf32_file_header_t);
+
+    if (em->first_header.file_class == ELF_64BIT)
+      {
+#define _(t,field) h.field = elf_swap_##t (em, h.field);
+	foreach_elf64_file_header;
+#undef _
+
+	if (fwrite (&h, sizeof (h), 1, f) != 1)
+	  {
+	    error = clib_error_return_unix (0, "write file header");
+	    goto error;
+	  }
+      }
+    else
+      {
+	elf32_file_header_t h32;
+
+#define _(t,field) h32.field = elf_swap_##t (em, h.field);
+	foreach_elf32_file_header;
+#undef _
+
+	if (fwrite (&h32, sizeof (h32), 1, f) != 1)
+	  {
+	    error = clib_error_return_unix (0, "write file header");
+	    goto error;
+	  }
+      }
+  }
+
+  /* Write segment headers. */
+  {
+    elf_segment_t *s;
+
+    vec_foreach (s, em->segments)
+    {
+      elf64_segment_header_t h;
+
+      if (s->header.type == ~0)
+	continue;
+
+      h = s->header;
+
+      if (em->first_header.file_class == ELF_64BIT)
+	{
+#define _(t,field) h.field = elf_swap_##t (em, h.field);
+	  foreach_elf64_segment_header;
+#undef _
+
+	  if (fwrite (&h, sizeof (h), 1, f) != 1)
+	    {
+	      error =
+		clib_error_return_unix (0, "write segment header %U",
+					format_elf_segment, em, s);
+	      goto error;
+	    }
+	}
+      else
+	{
+	  elf32_segment_header_t h32;
+
+#define _(t,field) h32.field = elf_swap_##t (em, h.field);
+	  foreach_elf32_segment_header;
+#undef _
+
+	  if (fwrite (&h32, sizeof (h32), 1, f) != 1)
+	    {
+	      error =
+		clib_error_return_unix (0, "write segment header %U",
+					format_elf_segment, em, s);
+	      goto error;
+	    }
+	}
+    }
+  }
+
+  /* Write contents for all sections. */
+  {
+    elf_section_t *s;
+
+    vec_foreach (s, em->sections)
+    {
+      if (s->header.file_size == 0)
+	continue;
+
+      if (fseek (f, s->header.file_offset, SEEK_SET) < 0)
+	{
+	  fclose (f);
+	  return clib_error_return_unix (0, "fseek 0x%Lx",
+					 s->header.file_offset);
+	}
+
+      if (s->header.type == ELF_SECTION_NO_BITS)
+	/* don't write for .bss sections */ ;
+      else if (fwrite (s->contents, vec_len (s->contents), 1, f) != 1)
+	{
+	  error =
+	    clib_error_return_unix (0, "write %s section contents",
+				    elf_section_name (em, s));
+	  goto error;
+	}
+    }
+
+    /* Finally write section headers. */
+    if (fseek (f, em->file_header.section_header_file_offset, SEEK_SET) < 0)
+      {
+	fclose (f);
+	return clib_error_return_unix
+	  (0, "fseek 0x%Lx", em->file_header.section_header_file_offset);
+      }
+
+    vec_foreach (s, em->sections)
+    {
+      elf64_section_header_t h;
+
+      if (s->header.type == ~0)
+	continue;
+
+      h = s->header;
+
+      if (em->first_header.file_class == ELF_64BIT)
+	{
+#define _(t,field) h.field = elf_swap_##t (em, h.field);
+	  foreach_elf64_section_header;
+#undef _
+
+	  if (fwrite (&h, sizeof (h), 1, f) != 1)
+	    {
+	      error =
+		clib_error_return_unix (0, "write %s section header",
+					elf_section_name (em, s));
+	      goto error;
+	    }
+	}
+      else
+	{
+	  elf32_section_header_t h32;
+
+#define _(t,field) h32.field = elf_swap_##t (em, h.field);
+	  foreach_elf32_section_header;
+#undef _
+
+	  if (fwrite (&h32, sizeof (h32), 1, f) != 1)
+	    {
+	      error =
+		clib_error_return_unix (0, "write %s section header",
+					elf_section_name (em, s));
+	      goto error;
+	    }
+	}
+    }
+  }
+
+error:
+  fclose (f);
+  return error;
+}
+
+clib_error_t *
+elf_delete_named_section (elf_main_t * em, char *section_name)
+{
+  elf_section_t *s = 0;
+  clib_error_t *error;
+
+  error = elf_get_section_by_name (em, section_name, &s);
+  if (error)
+    return error;
+
+  s->header.type = ~0;
+
+  return 0;
+}
+
+void
+elf_create_section_with_contents (elf_main_t * em,
+				  char *section_name,
+				  elf64_section_header_t * header,
+				  void *contents, uword n_content_bytes)
+{
+  elf_section_t *s, *sts;
+  u8 *st, *c;
+  uword *p, is_new_section;
+
+  /* See if section already exists with given name.
+     If so, just replace contents. */
+  is_new_section = 0;
+  if ((p = hash_get_mem (em->section_by_name, section_name)))
+    {
+      s = vec_elt_at_index (em->sections, p[0]);
+      _vec_len (s->contents) = 0;
+      c = s->contents;
+    }
+  else
+    {
+      vec_add2 (em->sections, s, 1);
+      is_new_section = 1;
+      c = 0;
+    }
+
+  sts =
+    vec_elt_at_index (em->sections,
+		      em->file_header.section_header_string_table_index);
+  st = sts->contents;
+
+  s->header = header[0];
+
+  s->header.file_offset = ~0;
+  s->header.file_size = n_content_bytes;
+  s->index = s - em->sections;
+
+  /* Add name to string table. */
+  s->header.name = vec_len (st);
+  vec_add (st, section_name, strlen (section_name));
+  vec_add1 (st, 0);
+  sts->contents = st;
+
+  vec_resize (c, n_content_bytes);
+  clib_memcpy (c, contents, n_content_bytes);
+  s->contents = c;
+
+  em->file_header.section_header_count += is_new_section
+    && s->header.type != ~0;
+}
+
+uword
+elf_delete_segment_with_type (elf_main_t * em,
+			      elf_segment_type_t segment_type)
+{
+  uword n_deleted = 0;
+  elf_segment_t *s;
+
+  vec_foreach (s, em->segments) if (s->header.type == segment_type)
+    {
+      s->header.type = ~0;
+      n_deleted += 1;
+    }
+
+  ASSERT (em->file_header.segment_header_count >= n_deleted);
+  em->file_header.segment_header_count -= n_deleted;
+
+  return n_deleted;
+}
+
+#endif /* CLIB_UNIX */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/elf.h b/src/vppinfra/elf.h
new file mode 100644
index 00000000..008ea284
--- /dev/null
+++ b/src/vppinfra/elf.h
@@ -0,0 +1,1062 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_elf_h
+#define included_clib_elf_h
+
+#include <vppinfra/format.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/byte_order.h>
+
+#define foreach_elf_file_class \
+  _ (CLASS_NONE) _ (32BIT) _ (64BIT)
+
+#define foreach_elf_data_encoding		\
+  _ (ENCODING_NONE)				\
+  _ (TWOS_COMPLEMENT_LITTLE_ENDIAN)		\
+  _ (TWOS_COMPLEMENT_BIG_ENDIAN)
+
+#define ELF_VERSION_NONE (0)
+#define ELF_VERSION_CURRENT (1)
+
+#define foreach_elf_abi				\
+  _ (SYSV, 0)					\
+  _ (HPUX, 1)					\
+  _ (NETBSD, 2)					\
+  _ (LINUX, 3)					\
+  _ (SOLARIS, 6)				\
+  _ (AIX, 7)					\
+  _ (IRIX, 8)					\
+  _ (FREEBSD, 9)				\
+  _ (COMPAQ_TRU64, 10)				\
+  _ (MODESTO, 11)				\
+  _ (OPENBSD, 12)				\
+  _ (ARM, 97)					\
+  _ (STANDALONE, 255)
+
+/* Legal values for type (object file type).  */
+#define foreach_elf_file_type			\
+  _ (NONE, 0)					\
+  _ (RELOC, 1)					\
+  _ (EXEC, 2)					\
+  _ (SHARED, 3)					\
+  _ (CORE, 4)					\
+  _ (OS_SPECIFIC_LO, 0xfe00)			\
+  _ (OS_SPECIFIC_HI, 0xfeff)			\
+  _ (ARCH_SPECIFIC_LO, 0xff00)			\
+  _ (ARCH_SPECIFIC_HI, 0xffff)
+
+/* Legal values for architecture.  */
+#define foreach_elf_architecture					\
+  _ (NONE, 0)			/* No machine */			\
+  _ (M32, 1)			/* AT&T WE 32100 */			\
+  _ (SPARC, 2)			/* SUN SPARC */				\
+  _ (386, 3)			/* Intel 80386 */			\
+  _ (68K, 4)			/* Motorola m68k family */		\
+  _ (88K, 5)			/* Motorola m88k family */		\
+  _ (860, 7)			/* Intel 80860 */			\
+  _ (MIPS, 8)			/* MIPS R3000 big-endian */		\
+  _ (S370, 9)			/* IBM System/370 */			\
+  _ (MIPS_RS3_LE, 10)		/* MIPS R3000 little-endian */		\
+  _ (PARISC, 15)		/* HPPA */				\
+  _ (VPP500, 17)		/* Fujitsu VPP500 */			\
+  _ (SPARC32PLUS, 18)		/* Sun's "v8plus" */			\
+  _ (960, 19)			/* Intel 80960 */			\
+  _ (PPC, 20)			/* PowerPC */				\
+  _ (PPC64, 21)			/* PowerPC 64-bit */			\
+  _ (S390, 22)			/* IBM S390 */				\
+  _ (V800, 36)			/* NEC V800 series */			\
+  _ (FR20, 37)			/* Fujitsu FR20 */			\
+  _ (RH32, 38)			/* TRW RH-32 */				\
+  _ (RCE, 39)			/* Motorola RCE */			\
+  _ (ARM, 40)			/* ARM */				\
+  _ (FAKE_ALPHA, 41)		/* Digital Alpha */			\
+  _ (SH, 42)			/* Hitachi SH */			\
+  _ (SPARCV9, 43)		/* SPARC v9 64-bit */			\
+  _ (TRICORE, 44)		/* Siemens Tricore */			\
+  _ (ARC, 45)			/* Argonaut RISC Core */		\
+  _ (H8_300, 46)		/* Hitachi H8/300 */			\
+  _ (H8_300H, 47)		/* Hitachi H8/300H */			\
+  _ (H8S, 48)			/* Hitachi H8S */			\
+  _ (H8_500, 49)		/* Hitachi H8/500 */			\
+  _ (IA_64, 50)			/* Intel Merced */			\
+  _ (MIPS_X, 51)		/* Stanford MIPS-X */			\
+  _ (COLDFIRE, 52)		/* Motorola Coldfire */			\
+  _ (68HC12, 53)		/* Motorola M68HC12 */			\
+  _ (MMA, 54)			/* Fujitsu MMA Multimedia Accel. */	\
+  _ (PCP, 55)			/* Siemens PCP */			\
+  _ (NCPU, 56)			/* Sony nCPU embeeded RISC */		\
+  _ (NDR1, 57)			/* Denso NDR1 microprocessor */		\
+  _ (STARCORE, 58)		/* Motorola Start*Core processor */	\
+  _ (ME16, 59)			/* Toyota ME16 processor */		\
+  _ (ST100, 60)			/* STMicroelectronic ST100  */		\
+  _ (TINYJ, 61)			/* Advanced Logic Corp. Tinyj */	\
+  _ (X86_64, 62)		/* AMD x86-64 architecture */		\
+  _ (PDSP, 63)			/* Sony DSP Processor */		\
+  _ (FX66, 66)			/* Siemens FX66 microcontroller */	\
+  _ (ST9PLUS, 67)		/* STMicroelectronics ST9+ 8/16 mc */	\
+  _ (ST7, 68)			/* STmicroelectronics ST7 8 bit mc */	\
+  _ (68HC16, 69)		/* Motorola MC68HC16 */			\
+  _ (68HC11, 70)		/* Motorola MC68HC11 */			\
+  _ (68HC08, 71)		/* Motorola MC68HC08 */			\
+  _ (68HC05, 72)		/* Motorola MC68HC05 */			\
+  _ (SVX, 73)			/* Silicon Graphics SVx */		\
+  _ (ST19, 74)			/* STMicroelectronics ST19 8 bit mc */	\
+  _ (VAX, 75)			/* Digital VAX */			\
+  _ (CRIS, 76)			/* Axis 32-bit embedded proc. */	\
+  _ (JAVELIN, 77)		/* Infineon 32-bit embedded proc. */	\
+  _ (FIREPATH, 78)		/* Element 14 64-bit DSP Processor */	\
+  _ (ZSP, 79)			/* LSI Logic 16-bit DSP Processor */	\
+  _ (MMIX, 80)			/* Knuth's 64-bit processor */		\
+  _ (HUANY, 81)			/* Harvard machine-independent */	\
+  _ (PRISM, 82)			/* SiTera Prism */			\
+  _ (AVR, 83)			/* Atmel AVR 8-bit microcontroller */	\
+  _ (FR30, 84)			/* Fujitsu FR30 */			\
+  _ (D10V, 85)			/* Mitsubishi D10V */			\
+  _ (D30V, 86)			/* Mitsubishi D30V */			\
+  _ (V850, 87)			/* NEC v850 */				\
+  _ (M32R, 88)			/* Mitsubishi M32R */			\
+  _ (MN10300, 89)		/* Matsushita MN10300 */		\
+  _ (MN10200, 90)		/* Matsushita MN10200 */		\
+  _ (PJ, 91)			/* picoJava */				\
+  _ (OPENRISC, 92)		/* OpenRISC 32-bit processor */		\
+  _ (ARC_A5, 93)		/* ARC Cores Tangent-A5 */		\
+  _ (XTENSA, 94)		/* Tensilica Xtensa Architecture */	\
+  _ (ALPHA, 0x9026)
+
+#define _(f) ELF_##f,
+
+typedef enum
+{
+  foreach_elf_file_class ELF_N_FILE_CLASS,
+} elf_file_class_t;
+
+typedef enum
+{
+  foreach_elf_data_encoding ELF_N_DATA_ENCODING,
+} elf_data_encoding_t;
+
+#undef _
+
+#define _(f,i) ELF_##f = i,
+
+typedef enum
+{
+  foreach_elf_abi
+} elf_abi_t;
+
+typedef enum
+{
+  foreach_elf_file_type
+} elf_file_type_t;
+
+#undef _
+
+typedef enum
+{
+#define _(f,i) ELF_ARCH_##f = i,
+  foreach_elf_architecture
+#undef _
+} elf_architecture_t;
+
+typedef struct
+{
+  /* 0x7f ELF */
+  u8 magic[4];
+
+  elf_file_class_t file_class:8;
+  elf_data_encoding_t data_encoding:8;
+  u8 file_version_ident;
+  elf_abi_t abi:8;
+  u8 abi_version;
+
+  u8 pad[7];
+
+  elf_file_type_t file_type:16;
+  elf_architecture_t architecture:16;
+
+  u32 file_version;
+} elf_first_header_t;
+
+/* 32/64 bit file header following basic file header. */
+#define foreach_elf32_file_header		\
+  _ (u32, entry_point)				\
+  _ (u32, segment_header_file_offset)		\
+  _ (u32, section_header_file_offset)		\
+  _ (u32, flags)				\
+  _ (u16, n_bytes_this_header)			\
+  _ (u16, segment_header_size)			\
+  _ (u16, segment_header_count)			\
+  _ (u16, section_header_size)			\
+  _ (u16, section_header_count)			\
+  _ (u16, section_header_string_table_index)
+
+#define foreach_elf64_file_header		\
+  _ (u64, entry_point)				\
+  _ (u64, segment_header_file_offset)		\
+  _ (u64, section_header_file_offset)		\
+  _ (u32, flags)				\
+  _ (u16, n_bytes_this_header)			\
+  _ (u16, segment_header_size)			\
+  _ (u16, segment_header_count)			\
+  _ (u16, section_header_size)			\
+  _ (u16, section_header_count)			\
+  _ (u16, section_header_string_table_index)
+
+/* Section header.  */
+#define foreach_elf32_section_header		\
+  _ (u32, name)					\
+  _ (u32, type)					\
+  _ (u32, flags)				\
+  _ (u32, exec_address)				\
+  _ (u32, file_offset)				\
+  _ (u32, file_size)				\
+  _ (u32, link)					\
+  _ (u32, additional_info)			\
+  _ (u32, align)				\
+  _ (u32, entry_size)
+
+#define foreach_elf64_section_header		\
+  _ (u32, name)					\
+  _ (u32, type)					\
+  _ (u64, flags)				\
+  _ (u64, exec_address)				\
+  _ (u64, file_offset)				\
+  _ (u64, file_size)				\
+  _ (u32, link)					\
+  _ (u32, additional_info)			\
+  _ (u64, align)				\
+  _ (u64, entry_size)
+
+/* Program segment header.  */
+#define foreach_elf32_segment_header		\
+  _ (u32, type)					\
+  _ (u32, file_offset)				\
+  _ (u32, virtual_address)			\
+  _ (u32, physical_address)			\
+  _ (u32, file_size)				\
+  _ (u32, memory_size)				\
+  _ (u32, flags)				\
+  _ (u32, align)
+
+#define foreach_elf64_segment_header		\
+  _ (u32, type)					\
+  _ (u32, flags)				\
+  _ (u64, file_offset)				\
+  _ (u64, virtual_address)			\
+  _ (u64, physical_address)			\
+  _ (u64, file_size)				\
+  _ (u64, memory_size)				\
+  _ (u64, align)
+
+/* Symbol table.  */
+#define foreach_elf32_symbol_header		\
+  _ (u32, name)					\
+  _ (u32, value)				\
+  _ (u32, size)					\
+  /* binding upper 4 bits; type lower 4 bits */	\
+  _ (u8, binding_and_type)			\
+  _ (u8, visibility)				\
+  _ (u16, section_index)
+
+#define foreach_elf64_symbol_header		\
+  _ (u32, name)					\
+  _ (u8, binding_and_type)			\
+  _ (u8, visibility)				\
+  _ (u16, section_index)			\
+  _ (u64, value)				\
+  _ (u64, size)
+
+#define _(t,f) t f;
+
+typedef struct
+{
+foreach_elf32_file_header} elf32_file_header_t;
+
+typedef struct
+{
+foreach_elf64_file_header} elf64_file_header_t;
+
+typedef struct
+{
+foreach_elf32_section_header} elf32_section_header_t;
+
+typedef struct
+{
+foreach_elf64_section_header} elf64_section_header_t;
+
+typedef struct
+{
+foreach_elf32_segment_header} elf32_segment_header_t;
+
+typedef struct
+{
+foreach_elf64_segment_header} elf64_segment_header_t;
+
+typedef struct
+{
+foreach_elf32_symbol_header} elf32_symbol_t;
+
+typedef struct
+{
+foreach_elf64_symbol_header} elf64_symbol_t;
+#undef _
+
+/* Special section names.  */
+#define foreach_elf_symbol_reserved_section_index			\
+  _ (ABSOLUTE, 0xfff1)		/* Associated symbol is absolute */	\
+  _ (COMMON, 0xfff2)		/* Associated symbol is common */	\
+  _ (XINDEX, 0xffff)		/* Index is in extra table.  */
+
+#define ELF_SYMBOL_SECTION_RESERVED_LO 0xff00
+#define ELF_SYMBOL_SECTION_RESERVED_HI 0xffff
+#define ELF_SYMBOL_SECTION_ARCH_SPECIFIC_LO 0xff00
+#define ELF_SYMBOL_SECTION_ARCH_SPECIFIC_HI 0xff1f
+#define ELF_SYMBOL_SECTION_OS_SPECIFIC_LO 0xff20
+#define ELF_SYMBOL_SECTION_OS_SPECIFIC_HI 0xff3f
+
+/* Section types. */
+#define foreach_elf_section_type					\
+  _ (UNUSED, 0)								\
+  _ (PROGRAM_DATA, 1)							\
+  _ (SYMBOL_TABLE, 2)							\
+  _ (STRING_TABLE, 3)							\
+  _ (RELOCATION_ADD, 4)							\
+  _ (SYMBOL_TABLE_HASH, 5)						\
+  _ (DYNAMIC, 6)		/* Dynamic linking information */	\
+  _ (NOTE, 7)			/* Notes */				\
+  _ (NO_BITS, 8)		/* Program space with no data (bss) */	\
+  _ (RELOCATION, 9)		/* Relocation entries, no addends */	\
+  _ (DYNAMIC_SYMBOL_TABLE, 11)	/* Dynamic linker symbol table */	\
+  _ (INIT_ARRAY, 14)		/* Array of constructors */		\
+  _ (FINI_ARRAY, 15)		/* Array of destructors */		\
+  _ (PREINIT_ARRAY, 16)		/* Array of pre-constructors */		\
+  _ (GROUP, 17)			/* Section group */			\
+  _ (SYMTAB_SHNDX, 18)		/* Extended section indices */		\
+  _ (OS_SPECIFIC_LO, 0x60000000) /* Start OS-specific */		\
+  _ (GNU_LIBLIST, 0x6ffffff7)	/* Prelink library list */		\
+  _ (CHECKSUM, 0x6ffffff8)	/* Checksum for DSO content.  */	\
+  _ (SUNW_MOVE, 0x6ffffffa)						\
+  _ (SUNW_COMDAT, 0x6ffffffb)						\
+  _ (SUNW_SYMINFO, 0x6ffffffc)						\
+  _ (GNU_VERDEF, 0x6ffffffd)	/* Version definition section.  */	\
+  _ (GNU_VERNEED, 0x6ffffffe) /* Version needs section.  */		\
+  _ (GNU_VERSYM, 0x6fffffff)	/* Version symbol table.  */		\
+  _ (ARCH_SPECIFIC_LO, 0x70000000) /* Start of processor-specific */	\
+  _ (ARCH_SPECIFIC_HI, 0x7fffffff) /* End of processor-specific */	\
+  _ (APP_SPECIFIC_LO, 0x80000000) /* Start of application-specific */	\
+  _ (APP_SPECIFIC_HI, 0x8fffffff)	/* End of application-specific */
+
+/* Section flags. */
+#define foreach_elf_section_flag		\
+  _ (WRITE, 0)					\
+  _ (ALLOC, 1)					\
+  _ (EXEC, 2)					\
+  _ (MERGE, 3)					\
+  _ (STRING_TABLE, 5)				\
+  _ (INFO_LINK, 6)				\
+  _ (PRESERVE_LINK_ORDER, 7)			\
+  _ (OS_NON_CONFORMING, 8)			\
+  _ (GROUP, 9)					\
+  _ (TLS, 10)					\
+  _ (OS_SPECIFIC_LO, 20)			\
+  _ (OS_SPECIFIC_HI, 27)			\
+  _ (ARCH_SPECIFIC_LO, 28)			\
+  _ (ARCH_SPECIFIC_HI, 31)
+
+typedef enum
+{
+#define _(f,i) ELF_SECTION_##f = i,
+  foreach_elf_section_type
+#undef _
+    ELF_SECTION_OS_SPECIFIC_HI = 0x6fffffff,
+} elf_section_type_t;
+
+typedef enum
+{
+#define _(f,i) ELF_SECTION_FLAG_BIT_##f = i,
+  foreach_elf_section_flag
+#undef _
+} elf_section_flag_bit_t;
+
+typedef enum
+{
+#define _(f,i) ELF_SECTION_FLAG_##f = 1 << ELF_SECTION_FLAG_BIT_##f,
+  foreach_elf_section_flag
+#undef _
+} elf_section_flag_t;
+
+/* Symbol bindings (upper 4 bits of binding_and_type). */
+#define foreach_elf_symbol_binding					\
+  _ (LOCAL, 0)			/* Local symbol */			\
+  _ (GLOBAL, 1)			/* Global symbol */			\
+  _ (WEAK, 2)			/* Weak symbol */			\
+  _ (OS_SPECIFIC_LO, 10)	/* Start of OS-specific */		\
+  _ (OS_SPECIFIC_HI, 12)	/* End of OS-specific */		\
+  _ (ARCH_SPECIFIC_LO, 13)	/* Start of processor-specific */	\
+  _ (ARCH_SPECIFIC_HI, 15)	/* End of processor-specific */
+
+/* Symbol types (lower 4 bits of binding_and_type). */
+#define foreach_elf_symbol_type						\
+  _ (NONE, 0)								\
+  _ (DATA, 1)			/* Symbol is a data object */		\
+  _ (CODE, 2)			/* Symbol is a code object */		\
+  _ (SECTION, 3)		/* Symbol associated with a section */	\
+  _ (FILE, 4)			/* Symbol's name is file name */	\
+  _ (COMMON, 5)			/* Symbol is a common data object */	\
+  _ (TLS, 6)			/* Symbol is thread-local data */	\
+  _ (OS_SPECIFIC_LO, 10)	/* Start of OS-specific */		\
+  _ (OS_SPECIFIC_HI, 12)	/* End of OS-specific */		\
+  _ (ARCH_SPECIFIC_LO, 13)	/* Start of processor-specific */	\
+  _ (ARCH_SPECIFIC_HI, 15)	/* End of processor-specific */
+
+/* Symbol visibility. */
+#define foreach_elf_symbol_visibility					\
+  _ (DEFAULT, 0)		/* Default symbol visibility rules */	\
+  _ (INTERNAL, 1)		/* Processor specific hidden class */	\
+  _ (HIDDEN, 2)			/* Unavailable in other modules */	\
+  _ (PROTECTED, 3)		/* Not preemptible, not exported */
+
+/* The syminfo section if available contains additional
+   information about every dynamic symbol.  */
+typedef struct
+{
+  u16 bound_to;
+  u16 flags;
+} elf_symbol_info_t;
+
+/* Possible values for bound_to.  */
+#define foreach_elf_symbol_info_bound_to			\
+  _ (SELF, 0xffff)		/* Symbol bound to self */	\
+  _ (PARENT, 0xfffe)		/* Symbol bound to parent */	\
+  _ (RESERVED_LO, 0xff00)					\
+  _ (RESERVED_HI, 0xffff)
+
+/* Symbol info flags. */
+#define foreach_elf_symbol_info_flags					\
+  _ (DIRECT)			/* Direct bound symbol */		\
+  _ (PASS_THRU)			/* Pass-thru symbol for translator */	\
+  _ (COPY)			/* Symbol is a copy-reloc */		\
+  _ (LAZY_LOAD)			/* Symbol bound to object to be lazy loaded */
+
+/* Relocation table entry with/without addend. */
+typedef struct
+{
+  u32 address;
+  u32 symbol_and_type;		/* high 24 symbol, low 8 type. */
+  i32 addend[0];
+} elf32_relocation_t;
+
+typedef struct
+{
+  u64 address;
+  u64 symbol_and_type;		/* high 32 symbol, low 32 type. */
+  i64 addend[0];
+} elf64_relocation_t;
+
+typedef struct
+{
+  u64 address;
+  u64 symbol_and_type;
+  u64 addend;
+} elf_relocation_with_addend_t;
+
+#define elf_relocation_next(r,type)					\
+  ((void *) ((r) + 1)							\
+   + ((type) == ELF_SECTION_RELOCATION_ADD ? sizeof ((r)->addend[0]) : 0))
+
+/* Segment type. */
+#define foreach_elf_segment_type					\
+  _ (UNUSED, 0)								\
+  _ (LOAD, 1)			/* Loadable program segment */		\
+  _ (DYNAMIC, 2)		/* Dynamic linking information */	\
+  _ (INTERP, 3)			/* Program interpreter */		\
+  _ (NOTE, 4)			/* Auxiliary information */		\
+  _ (SEGMENT_TABLE, 6)		/* Entry for header table itself */	\
+  _ (TLS, 7)			/* Thread-local storage segment */	\
+  _ (OS_SPECIFIC_LO, 0x60000000) /* Start of OS-specific */		\
+  _ (GNU_EH_FRAME, 0x6474e550)	/* GCC .eh_frame_hdr segment */		\
+  _ (GNU_STACK, 0x6474e551)	/* Indicates stack executability */	\
+  _ (GNU_RELRO, 0x6474e552)	/* Read-only after relocation */	\
+  _ (SUNW_BSS, 0x6ffffffa)	/* Sun specific BSS */			\
+  _ (SUNW_STACK, 0x6ffffffb)	/* Sun specific stack */		\
+  _ (OS_SPECIFIC_HI, 0x6fffffff) /* End of OS-specific */		\
+  _ (ARCH_SPECIFIC_LO, 0x70000000) /* Start of processor-specific */	\
+  _ (ARCH_SPECIFIC_HI, 0x7fffffff)	/* End of processor-specific */
+
+/* Segment flags. */
+#define foreach_elf_segment_flag		\
+  _ (EXEC, 0)					\
+  _ (WRITE, 1)					\
+  _ (READ, 2)					\
+  _ (OS_SPECIFIC_LO, 20)			\
+  _ (OS_SPECIFIC_HI, 27)			\
+  _ (ARCH_SPECIFIC_LO, 28)			\
+  _ (ARCH_SPECIFIC_HI, 31)
+
+typedef enum
+{
+#define _(f,i) ELF_SEGMENT_##f = i,
+  foreach_elf_segment_type
+#undef _
+} elf_segment_type_t;
+
+typedef enum
+{
+#define _(f,i) ELF_SEGMENT_FLAG_BIT_##f = i,
+  foreach_elf_segment_flag
+#undef _
+} elf_segment_flag_bit_t;
+
+typedef enum
+{
+#define _(f,i) ELF_SEGMENT_FLAG_##f = 1 << ELF_SEGMENT_FLAG_BIT_##f,
+  foreach_elf_segment_flag
+#undef _
+} elf_segment_flag_t;
+
+#define foreach_elf32_dynamic_entry_header	\
+  _ (u32, type)					\
+  _ (u32, data)
+
+#define foreach_elf64_dynamic_entry_header	\
+  _ (u64, type)					\
+  _ (u64, data)
+
+#define _(t,f) t f;
+
+typedef struct
+{
+foreach_elf32_dynamic_entry_header} elf32_dynamic_entry_t;
+
+typedef struct
+{
+foreach_elf64_dynamic_entry_header} elf64_dynamic_entry_t;
+
+#undef _
+
+#define foreach_elf_dynamic_entry_type					\
+  _ (END, 0)			/* Marks end of dynamic section */	\
+  _ (NEEDED_LIBRARY, 1)		/* Name of needed library */		\
+  _ (PLT_RELOCATION_SIZE, 2)	/* Size in bytes of PLT relocs */	\
+  _ (PLT_GOT, 3)		/* Processor defined value */		\
+  _ (SYMBOL_HASH, 4)		/* Address of symbol hash table */	\
+  _ (STRING_TABLE, 5)		/* Address of string table */		\
+  _ (SYMBOL_TABLE, 6)		/* Address of symbol table */		\
+  _ (RELA_ADDRESS, 7)		/* Address of Rela relocs */		\
+  _ (RELA_SIZE, 8)		/* Total size of Rela relocs */		\
+  _ (RELA_ENTRY_SIZE, 9)	/* Size of one Rela reloc */		\
+  _ (STRING_TABLE_SIZE, 10)	/* Size of string table */		\
+  _ (SYMBOL_TABLE_ENTRY_SIZE, 11) /* Size of one symbol table entry */	\
+  _ (INIT_FUNCTION, 12)		/* Address of init function */		\
+  _ (FINI_FUNCTION, 13)		/* Address of termination function */	\
+  _ (SONAME, 14)		/* Name of shared object */		\
+  _ (RPATH, 15)			/* Library search path (deprecated) */	\
+  _ (SYMBOLIC, 16)		/* Start symbol search here */		\
+  _ (REL, 17)			/* Address of Rel relocs */		\
+  _ (RELSZ, 18)			/* Total size of Rel relocs */		\
+  _ (RELENT, 19)		/* Size of one Rel reloc */		\
+  _ (PLT_RELOCATION_TYPE, 20)	/* Type of reloc in PLT */		\
+  _ (DEBUG, 21)			/* For debugging; unspecified */	\
+  _ (TEXTREL, 22)		/* Reloc might modify .text */		\
+  _ (PLT_RELOCATION_ADDRESS, 23) /* Address of PLT relocs */		\
+  _ (BIND_NOW, 24)		/* Process relocations of object */	\
+  _ (INIT_ARRAY, 25)		/* Array with addresses of init fct */	\
+  _ (FINI_ARRAY, 26)		/* Array with addresses of fini fct */	\
+  _ (INIT_ARRAYSZ, 27)		/* Size in bytes of DT_INIT_ARRAY */	\
+  _ (FINI_ARRAYSZ, 28)		/* Size in bytes of DT_FINI_ARRAY */	\
+  _ (RUN_PATH, 29)		/* Library search path */		\
+  _ (FLAGS, 30)			/* Flags for object being loaded */	\
+  _ (ENCODING, 31)		/* Start of encoded range */		\
+  _ (PREINIT_ARRAY, 32)		/* Array with addresses of fns */	\
+  _ (PREINIT_ARRAY_SIZE, 33)	/* Size of PREINIT_ARRAY in bytes. */	\
+  _ (GNU_PRELINKED, 0x6ffffdf5)	/* Prelinking timestamp */		\
+  _ (GNU_CONFLICTSZ, 0x6ffffdf6)	/* Size of conflict section */	\
+  _ (GNU_LIBLISTSZ, 0x6ffffdf7)	/* Size of library list */		\
+  _ (CHECKSUM, 0x6ffffdf8)						\
+  _ (PLTPADSZ, 0x6ffffdf9)						\
+  _ (MOVEENT, 0x6ffffdfa)						\
+  _ (MOVESZ, 0x6ffffdfb)						\
+  _ (FEATURE_1,	0x6ffffdfc)	/* Feature selection (DTF_*).  */	\
+  _ (POSFLAG_1,	0x6ffffdfd)	/* Flags for following entries.  */	\
+  _ (SYMINSZ, 0x6ffffdfe)	/* Size of syminfo table (in bytes) */	\
+  _ (SYMINENT, 0x6ffffdff)	/* Entry size of syminfo */		\
+  _ (GNU_HASH, 0x6ffffef5)						\
+  _ (GNU_CONFLICT, 0x6ffffef8)	/* Start of conflict section */		\
+  _ (GNU_LIBLIST, 0x6ffffef9)	/* Library list */			\
+  _ (CONFIG, 0x6ffffefa)	/* Configuration information.  */	\
+  _ (DEPAUDIT, 0x6ffffefb)	/* Dependency auditing.  */		\
+  _ (AUDIT, 0x6ffffefc)	/* Object auditing.  */				\
+  _ (PLTPAD, 0x6ffffefd)	/* PLT padding.  */			\
+  _ (MOVETAB, 0x6ffffefe)	/* Move table.  */			\
+  _ (SYMINFO, 0x6ffffeff)	/* Syminfo table.  */			\
+  _ (VERSYM, 0x6ffffff0)						\
+  _ (RELACOUNT, 0x6ffffff9)						\
+  _ (RELCOUNT, 0x6ffffffa)						\
+  _ (FLAGS_1, 0x6ffffffb)	/* State flags, see DF_1_* below.  */	\
+  _ (VERSION_DEF, 0x6ffffffc)	/* Address of version definition table */ \
+  _ (VERSION_DEF_COUNT, 0x6ffffffd)	/* Number of version definitions */ \
+  _ (VERSION_NEED, 0x6ffffffe)	/* Address of table with needed versions */ \
+  _ (VERSION_NEED_COUNT, 0x6fffffff)	/* Number of needed versions */	\
+  _ (AUXILIARY, 0x7ffffffd)      /* Shared object to load before self */ \
+  _ (FILTER, 0x7fffffff)	/* Shared object to get values from */
+
+typedef enum
+{
+#define _(f,n) ELF_DYNAMIC_ENTRY_##f = (n),
+  foreach_elf_dynamic_entry_type
+#undef _
+} elf_dynamic_entry_type_t;
+
+/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
+#define ELF_DYNAMIC_FLAGS_ORIGIN	(1 << 0)	/* Object may use DF_ORIGIN */
+#define ELF_DYNAMIC_FLAGS_SYMBOLIC	(1 << 1)	/* Symbol resolutions starts here */
+#define ELF_DYNAMIC_FLAGS_TEXT_RELOCATIONS (1 << 2)	/* Object contains text relocations */
+#define ELF_DYNAMIC_FLAGS_BIND_NOW	(1 << 3)	/* No lazy binding for this object */
+#define ELF_DYNAMIC_FLAGS_STATIC_TLS	(1 << 4)	/* Module uses the static TLS model */
+
+/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
+   entry in the dynamic section.  */
+#define DF_1_NOW	0x00000001	/* Set RTLD_NOW for this object.  */
+#define DF_1_GLOBAL	0x00000002	/* Set RTLD_GLOBAL for this object.  */
+#define DF_1_GROUP	0x00000004	/* Set RTLD_GROUP for this object.  */
+#define DF_1_NODELETE	0x00000008	/* Set RTLD_NODELETE for this object. */
+#define DF_1_LOADFLTR	0x00000010	/* Trigger filtee loading at runtime. */
+#define DF_1_INITFIRST	0x00000020	/* Set RTLD_INITFIRST for this object */
+#define DF_1_NOOPEN	0x00000040	/* Set RTLD_NOOPEN for this object.  */
+#define DF_1_ORIGIN	0x00000080	/* $ORIGIN must be handled.  */
+#define DF_1_DIRECT	0x00000100	/* Direct binding enabled.  */
+#define DF_1_TRANS	0x00000200
+#define DF_1_INTERPOSE	0x00000400	/* Object is used to interpose.  */
+#define DF_1_NODEFLIB	0x00000800	/* Ignore default lib search path.  */
+#define DF_1_NODUMP	0x00001000	/* Object can't be dldump'ed.  */
+#define DF_1_CONFALT	0x00002000	/* Configuration alternative created. */
+#define DF_1_ENDFILTEE	0x00004000	/* Filtee terminates filters search. */
+#define	DF_1_DISPRELDNE	0x00008000	/* Disp reloc applied at build time. */
+#define	DF_1_DISPRELPND	0x00010000	/* Disp reloc applied at run-time.  */
+
+/* Flags for the feature selection in DT_FEATURE_1.  */
+#define DTF_1_PARINIT	0x00000001
+#define DTF_1_CONFEXP	0x00000002
+
+/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
+#define DF_P1_LAZYLOAD	0x00000001	/* Lazyload following object.  */
+#define DF_P1_GROUPPERM	0x00000002	/* Symbols from next object are not
+					   generally available.  */
+
+/* Version definition sections.  */
+typedef struct
+{
+  u16 version;
+  u16 flags;
+  u16 index;
+  u16 aux_count;
+  u32 name_hash;
+  u32 aux_byte_offset;
+  u32 byte_offset_next_version_definition;
+} elf_dynamic_version_definition_t;
+
+typedef struct
+{
+  u32 name;
+  u32 next_offset;		/* byte offset of ver def aux next entry */
+} elf_dynamic_version_definition_aux_t;
+
+/* Version definition flags. */
+#define ELF_DYNAMIC_VERSION_FILE (1 << 0)	/* Version definition of file itself */
+#define ELF_DYNAMIC_VERSION_WEAK (1 << 1)	/* Weak version identifier */
+
+/* Version symbol index. */
+#define	ELF_DYNAMIC_VERSYM_LOCAL 0	/* Symbol is local.  */
+#define	ELF_DYNAMIC_VERSYM_GLOBAL 1	/* Symbol is global.  */
+#define	ELF_DYNAMIC_VERSYM_RESERVED_LO	0xff00	/* Beginning of reserved entries.  */
+#define	ELF_DYNAMIC_VERSYM_ELIMINATE	0xff01	/* Symbol is to be eliminated.  */
+
+/* Version dependency section.  */
+#define foreach_elf_dynamic_version_need_field	\
+  _ (u16, version)				\
+  _ (u16, aux_count)				\
+  _ (u32, file_name_offset)			\
+  _ (u32, first_aux_offset)			\
+  _ (u32, next_offset)
+
+#define foreach_elf_dynamic_version_need_aux_field	\
+  _ (u32, hash)						\
+  _ (u16, flags)					\
+  _ (u16, versym_index)					\
+  _ (u32, name)						\
+  _ (u32, next_offset)
+
+typedef struct
+{
+#define _(t,f) t f;
+  foreach_elf_dynamic_version_need_field
+#undef _
+} elf_dynamic_version_need_t;
+
+typedef struct
+{
+#define _(t,f) t f;
+  foreach_elf_dynamic_version_need_aux_field
+#undef _
+} elf_dynamic_version_need_aux_t;
+
+typedef union
+{
+  elf_dynamic_version_need_t need;
+  elf_dynamic_version_need_aux_t aux;
+} elf_dynamic_version_need_union_t;
+
+/* Note section contents.  Each entry in the note section begins with
+   a header of a fixed form.  */
+
+typedef struct
+{
+  u32 name_size;
+  u32 descriptor_size;
+  u32 type;
+} elf_note_t;
+
+/* Known names of notes.  */
+
+/* Solaris entries in the note section have this name.  */
+#define ELF_NOTE_SOLARIS	"SUNW Solaris"
+
+/* Note entries for GNU systems have this name.  */
+#define ELF_NOTE_GNU		"GNU"
+
+
+/* Defined types of notes for Solaris.  */
+
+/* Value of descriptor (one word) is desired pagesize for the binary.  */
+#define ELF_NOTE_PAGESIZE_HINT	1
+
+
+/* Defined note types for GNU systems.  */
+
+/* ABI information.  The descriptor consists of words:
+   word 0: OS descriptor
+   word 1: major version of the ABI
+   word 2: minor version of the ABI
+   word 3: subminor version of the ABI
+*/
+#ifndef ELF_NOTE_ABI
+#define ELF_NOTE_ABI		1
+#endif
+
+/* Known OSes.  These value can appear in word 0 of an ELF_NOTE_ABI
+   note section entry.  */
+#define ELF_NOTE_OS_LINUX	0
+#define ELF_NOTE_OS_GNU		1
+#define ELF_NOTE_OS_SOLARIS2	2
+#define ELF_NOTE_OS_FREEBSD	3
+
+/* AMD x86-64 relocations.  */
+#define foreach_elf_x86_64_relocation_type				\
+  _ (NONE, 0)			/* No reloc */				\
+  _ (DIRECT_64, 1)		/* Direct 64 bit  */			\
+  _ (PC_REL_I32, 2)	        /* PC relative 32 bit signed */		\
+  _ (GOT_REL_32, 3)		/* 32 bit GOT entry */			\
+  _ (PLT_REL_32, 4)		/* 32 bit PLT address */		\
+  _ (COPY, 5)			/* Copy symbol at runtime */		\
+  _ (CREATE_GOT, 6)		/* Create GOT entry */			\
+  _ (CREATE_PLT, 7)		/* Create PLT entry */			\
+  _ (RELATIVE, 8)		/* Adjust by program base */		\
+  _ (PC_REL_I32_GOT, 9)	/* 32 bit PC relative offset to GOT */		\
+  _ (DIRECT_U32, 10)		/* Direct 32 bit zero extended */	\
+  _ (DIRECT_I32, 11)		/* Direct 32 bit sign extended */	\
+  _ (DIRECT_U16, 12)		/* Direct 16 bit zero extended */	\
+  _ (PC_REL_I16, 13)	/* 16 bit sign extended pc relative */		\
+  _ (DIRECT_I8, 14)		/* Direct 8 bit sign extended  */	\
+  _ (PC_REL_I8, 15)	/* 8 bit sign extended pc relative */		\
+  _ (DTPMOD64, 16)		/* ID of module containing symbol */	\
+  _ (DTPOFF64, 17)		/* Offset in module's TLS block */	\
+  _ (TPOFF64, 18)		/* Offset in initial TLS block */	\
+  _ (TLSGD, 19)	/* 32 bit signed PC relative offset to two GOT entries for GD symbol */	\
+  _ (TLSLD, 20) /* 32 bit signed PC relative offset to two GOT entries for LD symbol */	\
+  _ (DTPOFF32, 21)		/* Offset in TLS block */		\
+  _ (GOTTPOFF, 22) /* 32 bit signed PC relative offset to GOT entry for IE symbol */ \
+  _ (TPOFF32, 23)		/* Offset in initial TLS, block) */
+
+typedef struct
+{
+  elf64_symbol_t *symbols;
+
+  u32 section_index;
+
+  u8 *string_table;
+
+  uword *symbol_by_name;
+} elf_symbol_table_t;
+
+always_inline void
+elf_symbol_table_free (elf_symbol_table_t * s)
+{
+  vec_free (s->symbols);
+  hash_free (s->symbol_by_name);
+}
+
+always_inline u8 *
+elf_symbol_name (elf_symbol_table_t * t, elf64_symbol_t * sym)
+{
+  return vec_elt_at_index (t->string_table, sym->name);
+}
+
+typedef struct
+{
+  elf_relocation_with_addend_t *relocations;
+
+  u32 section_index;
+} elf_relocation_table_t;
+
+always_inline void
+elf_relocation_table_free (elf_relocation_table_t * r)
+{
+  vec_free (r->relocations);
+}
+
+typedef struct
+{
+  elf64_section_header_t header;
+
+  u32 index;
+
+  /* Index of segments containing this section. */
+  uword *segment_index_bitmap;
+
+  /* Aligned size (included padding not included in
+     header.file_size). */
+  u64 align_size;
+
+  i64 exec_address_change;
+
+  u8 *contents;
+} elf_section_t;
+
+typedef struct
+{
+  elf64_segment_header_t header;
+
+  /* Sections contained in this segment. */
+  uword *section_index_bitmap;
+
+  u32 index;
+
+  u8 *contents;
+} elf_segment_t;
+
+typedef struct
+{
+  u8 need_byte_swap;
+
+  u8 parsed_symbols;
+
+  char *file_name;
+
+  elf_first_header_t first_header;
+
+  elf64_file_header_t file_header;
+
+  elf_segment_t *segments;
+
+  elf_section_t *sections;
+
+  uword *section_by_name;
+  uword *section_by_start_address;
+
+  elf_symbol_table_t *symbol_tables;
+  elf_relocation_table_t *relocation_tables;
+
+  char *interpreter;
+
+  elf64_dynamic_entry_t *dynamic_entries;
+  u8 *dynamic_string_table;
+  u32 dynamic_string_table_section_index;
+  u32 dynamic_symbol_table_section_index;
+  u32 dynamic_symbol_table_index;
+  u32 dynamic_section_index;
+  u16 *versym;
+  u32 versym_section_index;
+  elf_dynamic_version_need_union_t *verneed;
+  u32 verneed_section_index;
+} elf_main_t;
+
+always_inline void
+elf_main_init (elf_main_t * em)
+{
+  memset (em, 0, sizeof (em[0]));
+}
+
+always_inline void
+elf_main_free (elf_main_t * em)
+{
+  uword i;
+
+  for (i = 0; i < vec_len (em->segments); i++)
+    vec_free (em->segments[i].contents);
+  vec_free (em->segments);
+
+  for (i = 0; i < vec_len (em->sections); i++)
+    vec_free (em->sections[i].contents);
+  vec_free (em->sections);
+
+  hash_free (em->section_by_name);
+  for (i = 0; i < vec_len (em->symbol_tables); i++)
+    elf_symbol_table_free (em->symbol_tables + i);
+  for (i = 0; i < vec_len (em->relocation_tables); i++)
+    elf_relocation_table_free (em->relocation_tables + i);
+
+  vec_free (em->dynamic_entries);
+  vec_free (em->interpreter);
+}
+
+always_inline void
+elf_get_segment_contents (elf_main_t * em, void *data, uword segment_index)
+{
+  elf_segment_t *g = vec_elt_at_index (em->segments, segment_index);
+  if (!g->contents)
+    vec_add (g->contents, data + g->header.file_offset,
+	     g->header.memory_size);
+}
+
+always_inline void *
+elf_get_section_contents (elf_main_t * em,
+			  uword section_index, uword elt_size)
+{
+  elf_section_t *s;
+  void *result;
+
+  s = vec_elt_at_index (em->sections, section_index);
+
+  result = 0;
+  if (vec_len (s->contents) > 0)
+    {
+      /* Make vector copy of contents with given element size. */
+      result = _vec_resize (result,
+			    vec_len (s->contents) / elt_size,
+			    vec_len (s->contents),
+			    /* header_bytes */ 0,
+			    /* align */ 0);
+      clib_memcpy (result, s->contents, vec_len (s->contents));
+    }
+
+  return result;
+}
+
+always_inline void
+elf_set_section_contents (elf_main_t * em,
+			  uword section_index,
+			  void *new_contents, uword n_content_bytes)
+{
+  elf_section_t *s;
+
+  s = vec_elt_at_index (em->sections, section_index);
+  vec_free (s->contents);
+  vec_add (s->contents, new_contents, n_content_bytes);
+}
+
+always_inline u8 *
+elf_section_name (elf_main_t * em, elf_section_t * s)
+{
+  elf_section_t *es = vec_elt_at_index (em->sections,
+					em->
+					file_header.section_header_string_table_index);
+  return vec_elt_at_index (es->contents, s->header.name);
+}
+
+always_inline u8
+elf_swap_u8 (elf_main_t * em, u8 x)
+{
+  return x;
+}
+
+always_inline u16
+elf_swap_u16 (elf_main_t * em, u16 x)
+{
+  return em->need_byte_swap ? clib_byte_swap_u16 (x) : x;
+}
+
+always_inline u32
+elf_swap_u32 (elf_main_t * em, u32 x)
+{
+  return em->need_byte_swap ? clib_byte_swap_u32 (x) : x;
+}
+
+always_inline u64
+elf_swap_u64 (elf_main_t * em, u64 x)
+{
+  return em->need_byte_swap ? clib_byte_swap_u64 (x) : x;
+}
+
+#define FORMAT_ELF_MAIN_SYMBOLS (1 << 0)
+#define FORMAT_ELF_MAIN_RELOCATIONS (1 << 1)
+#define FORMAT_ELF_MAIN_DYNAMIC (1 << 2)
+
+format_function_t format_elf_main;
+format_function_t format_elf_symbol;
+
+clib_error_t *elf_read_file (elf_main_t * em, char *file_name);
+clib_error_t *elf_write_file (elf_main_t * em, char *file_name);
+clib_error_t *elf_delete_named_section (elf_main_t * em, char *section_name);
+clib_error_t *elf_parse (elf_main_t * em, void *data, uword data_bytes);
+void elf_parse_symbols (elf_main_t * em);
+
+clib_error_t *elf_get_section_by_name (elf_main_t * em, char *section_name,
+				       elf_section_t ** result);
+clib_error_t *elf_get_section_by_start_address (elf_main_t * em,
+						uword start_address,
+						elf_section_t ** result);
+
+void
+elf_create_section_with_contents (elf_main_t * em,
+				  char *section_name,
+				  elf64_section_header_t * header,
+				  void *contents, uword n_content_bytes);
+uword elf_delete_segment_with_type (elf_main_t * em,
+				    elf_segment_type_t segment_type);
+void elf_set_dynamic_entries (elf_main_t * em);
+
+#endif /* included_clib_elf_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/elf_clib.c b/src/vppinfra/elf_clib.c
new file mode 100644
index 00000000..7bb72ee3
--- /dev/null
+++ b/src/vppinfra/elf_clib.c
@@ -0,0 +1,377 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/elf_clib.h>
+
+#include <stdlib.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+typedef struct
+{
+  char **path;
+} path_search_t;
+
+always_inline void
+path_search_free (path_search_t * p)
+{
+  uword i;
+  for (i = 0; i < vec_len (p->path); i++)
+    vec_free (p->path[i]);
+  vec_free (p->path);
+}
+
+static char **
+split_string (char *string, u8 delimiter)
+{
+  char **result = 0;
+  char *p, *start, *s;
+
+  p = string;
+  while (1)
+    {
+      start = p;
+      while (*p != 0 && *p != delimiter)
+	p++;
+      s = 0;
+      vec_add (s, start, p - start);
+      vec_add1 (s, 0);
+      vec_add1 (result, s);
+      if (*p == 0)
+	break;
+      p++;
+    }
+
+  return result;
+}
+
+static int
+file_exists_and_is_executable (char *dir, char *file)
+{
+  char *path = (char *) format (0, "%s/%s%c", dir, file, 0);
+  struct stat s;
+  uword yes;
+
+  yes = (stat (path, &s) >= 0
+	 && S_ISREG (s.st_mode)
+	 && 0 != (s.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)));
+
+  vec_free (path);
+
+  return yes;
+}
+
+static char *
+path_search (char *file)
+{
+  path_search_t ps;
+  uword i;
+  char *result;
+
+  /* Relative or absolute path. */
+  if (file[0] == '.' || file[0] == '/')
+    return file;
+
+  if (getenv ("PATH") == 0)
+    return file;
+
+  ps.path = split_string (getenv ("PATH"), ':');
+
+  for (i = 0; i < vec_len (ps.path); i++)
+    if (file_exists_and_is_executable (ps.path[i], file))
+      break;
+
+  result = 0;
+  if (i < vec_len (ps.path))
+    result = (char *) format (0, "%s/%s%c", ps.path[i], file);
+
+  path_search_free (&ps);
+
+  return result;
+}
+
+static clib_error_t *
+clib_elf_parse_file (clib_elf_main_t * cem,
+		     char *file_name, void *link_address)
+{
+  elf_main_t *em;
+  elf_section_t *s;
+  int fd;
+  struct stat fd_stat;
+  uword mmap_length = 0;
+  void *data = 0;
+  clib_error_t *error = 0;
+
+  vec_add2 (cem->elf_mains, em, 1);
+
+  fd = open (file_name, 0);
+  if (fd < 0)
+    {
+      error = clib_error_return_unix (0, "open `%s'", file_name);
+      goto done;
+    }
+
+  if (fstat (fd, &fd_stat) < 0)
+    {
+      error = clib_error_return_unix (0, "fstat `%s'", file_name);
+      goto done;
+    }
+  mmap_length = fd_stat.st_size;
+
+  data = mmap (0, mmap_length, PROT_READ, MAP_SHARED, fd, /* offset */ 0);
+  if (~pointer_to_uword (data) == 0)
+    {
+      error = clib_error_return_unix (0, "mmap `%s'", file_name);
+      goto done;
+    }
+
+  error = elf_parse (em, data, mmap_length);
+  if (error)
+    goto done;
+
+  /* Look for CLIB special sections. */
+  {
+    char *section_name_start = CLIB_ELF_SECTION_ADD_PREFIX ();
+    uword section_name_start_len = strlen (section_name_start);
+
+    vec_foreach (s, em->sections)
+    {
+      u8 *name = elf_section_name (em, s);
+      uword *p;
+      clib_elf_section_t *vs;
+      clib_elf_section_bounds_t *b;
+
+      /* Section name must begin with CLIB_ELF_SECTION key. */
+      if (memcmp (name, section_name_start, section_name_start_len))
+	continue;
+
+      name += section_name_start_len;
+      p = hash_get_mem (cem->section_by_name, name);
+      if (p)
+	vs = vec_elt_at_index (cem->sections, p[0]);
+      else
+	{
+	  name = format (0, "%s%c", name, 0);
+	  if (!cem->section_by_name)
+	    cem->section_by_name = hash_create_string (0, sizeof (uword));
+	  hash_set_mem (cem->section_by_name, name, vec_len (cem->sections));
+	  vec_add2 (cem->sections, vs, 1);
+	  vs->name = name;
+	}
+
+      vec_add2 (vs->bounds, b, 1);
+      b->lo = link_address + s->header.exec_address;
+      b->hi = b->lo + s->header.file_size;
+    }
+  }
+
+  /* Parse symbols for this file. */
+  {
+    elf_symbol_table_t *t;
+    elf64_symbol_t *s;
+
+    elf_parse_symbols (em);
+    vec_foreach (t, em->symbol_tables)
+    {
+      vec_foreach (s, t->symbols)
+      {
+	s->value += pointer_to_uword (link_address);
+      }
+    }
+  }
+
+  /* No need to keep section contents around. */
+  {
+    elf_section_t *s;
+    vec_foreach (s, em->sections)
+    {
+      if (s->header.type != ELF_SECTION_STRING_TABLE)
+	vec_free (s->contents);
+    }
+  }
+
+done:
+  if (error)
+    elf_main_free (em);
+  if (fd >= 0)
+    close (fd);
+  if (data)
+    munmap (data, mmap_length);
+  return error;
+}
+
+#define __USE_GNU
+#include <link.h>
+
+static int
+add_section (struct dl_phdr_info *info, size_t size, void *opaque)
+{
+  clib_elf_main_t *cem = opaque;
+  clib_error_t *error;
+  char *name = (char *) info->dlpi_name;
+  void *addr = (void *) info->dlpi_addr;
+  uword is_main;
+
+  is_main = strlen (name) == 0;
+  if (is_main)
+    {
+      static int done;
+
+      /* Only do main program once. */
+      if (done++)
+	return 0;
+
+      name = path_search (cem->exec_path);
+      if (!name)
+	{
+	  clib_error ("failed to find %s on PATH", cem->exec_path);
+	  return 0;
+	}
+      addr = 0;
+    }
+
+  error = clib_elf_parse_file (cem, name, addr);
+  if (error)
+    clib_error_report (error);
+
+  if (is_main && name != cem->exec_path)
+    vec_free (name);
+
+  return 0;
+}
+
+static clib_elf_main_t clib_elf_main;
+
+void
+clib_elf_main_init (char *exec_path)
+{
+  clib_elf_main_t *cem = &clib_elf_main;
+
+  cem->exec_path = exec_path;
+
+  dl_iterate_phdr (add_section, cem);
+}
+
+clib_elf_section_bounds_t *
+clib_elf_get_section_bounds (char *name)
+{
+  clib_elf_main_t *em = &clib_elf_main;
+  uword *p = hash_get (em->section_by_name, name);
+  return p ? vec_elt_at_index (em->sections, p[0])->bounds : 0;
+}
+
+static uword
+symbol_by_address_or_name (char *by_name,
+			   uword by_address, clib_elf_symbol_t * s)
+{
+  clib_elf_main_t *cem = &clib_elf_main;
+  elf_main_t *em;
+
+  vec_foreach (em, cem->elf_mains)
+  {
+    elf_symbol_table_t *t;
+    s->elf_main_index = em - cem->elf_mains;
+    vec_foreach (t, em->symbol_tables)
+    {
+      s->symbol_table_index = t - em->symbol_tables;
+      if (by_name)
+	{
+	  uword *p = hash_get (t->symbol_by_name, by_name);
+	  if (p)
+	    {
+	      s->symbol = vec_elt (t->symbols, p[0]);
+	      return 1;
+	    }
+	}
+      else
+	{
+	  elf64_symbol_t *x;
+	  /* FIXME linear search. */
+	  vec_foreach (x, t->symbols)
+	  {
+	    if (by_address >= x->value && by_address < x->value + x->size)
+	      {
+		s->symbol = x[0];
+		return 1;
+	      }
+	  }
+	}
+    }
+  }
+
+  return 0;
+}
+
+uword
+clib_elf_symbol_by_name (char *by_name, clib_elf_symbol_t * s)
+{
+  return symbol_by_address_or_name (by_name, /* by_address */ 0, s);
+}
+
+uword
+clib_elf_symbol_by_address (uword by_address, clib_elf_symbol_t * s)
+{
+  return symbol_by_address_or_name ( /* by_name */ 0, by_address, s);
+}
+
+u8 *
+format_clib_elf_symbol (u8 * s, va_list * args)
+{
+  clib_elf_main_t *cem = &clib_elf_main;
+  clib_elf_symbol_t *sym = va_arg (*args, clib_elf_symbol_t *);
+  elf_main_t *em;
+  elf_symbol_table_t *t;
+
+  if (!sym)
+    /* Just print table headings. */
+    return format (s, "%U", format_elf_symbol, 0, 0, 0);
+
+  else
+    {
+      em = vec_elt_at_index (cem->elf_mains, sym->elf_main_index);
+      t = vec_elt_at_index (em->symbol_tables, sym->symbol_table_index);
+      return format (s, "%U", format_elf_symbol, em, t, &sym->symbol);
+    }
+}
+
+u8 *
+format_clib_elf_symbol_with_address (u8 * s, va_list * args)
+{
+  uword address = va_arg (*args, uword);
+  clib_elf_main_t *cem = &clib_elf_main;
+  clib_elf_symbol_t sym;
+  elf_main_t *em;
+  elf_symbol_table_t *t;
+
+  if (clib_elf_symbol_by_address (address, &sym))
+    {
+      em = vec_elt_at_index (cem->elf_mains, sym.elf_main_index);
+      t = vec_elt_at_index (em->symbol_tables, sym.symbol_table_index);
+      s = format (s, "%s + 0x%wx",
+		  elf_symbol_name (t, &sym.symbol),
+		  address - sym.symbol.value);
+    }
+  else
+    s = format (s, "0x%wx", address);
+
+  return s;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/elf_clib.h b/src/vppinfra/elf_clib.h
new file mode 100644
index 00000000..25b928c2
--- /dev/null
+++ b/src/vppinfra/elf_clib.h
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2012 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_elf_self_h
+#define included_clib_elf_self_h
+
+#include <vppinfra/elf.h>
+#include <vppinfra/hash.h>
+
+#define CLIB_ELF_SECTION_DATA_ALIGN 32
+
+#define CLIB_ELF_SECTION_ADD_PREFIX(n) "clib_elf_section_" n
+
+/* Attribute used is so that static registrations work even if
+   variable is not referenced. */
+#define CLIB_ELF_SECTION(SECTION)					\
+   __attribute__ ((used,						\
+		   aligned (CLIB_ELF_SECTION_DATA_ALIGN),		\
+		   section (CLIB_ELF_SECTION_ADD_PREFIX (SECTION))))
+
+/* Given pointer to previous data A get next pointer.  EXTRA gives extra
+   space beyond A + 1 used in object. */
+#define clib_elf_section_data_next(a,extra)				\
+  uword_to_pointer (round_pow2 (pointer_to_uword (a + 1) + (extra),	\
+				CLIB_ELF_SECTION_DATA_ALIGN),		\
+		    void *)
+
+typedef struct
+{
+  void *lo, *hi;
+} clib_elf_section_bounds_t;
+
+typedef struct
+{
+  /* Vector of bounds for this section.  Multiple shared objects may have instances
+     of the same sections. */
+  clib_elf_section_bounds_t *bounds;
+
+  /* Name of ELF section (e.g. .text). */
+  u8 *name;
+} clib_elf_section_t;
+
+typedef struct
+{
+  /* Vector of sections. */
+  clib_elf_section_t *sections;
+
+  /* Hash map of name to section index. */
+  uword *section_by_name;
+
+  /* Unix path that we were exec()ed with. */
+  char *exec_path;
+
+  elf_main_t *elf_mains;
+} clib_elf_main_t;
+
+always_inline void
+clib_elf_main_free (clib_elf_main_t * m)
+{
+  clib_elf_section_t *s;
+  vec_foreach (s, m->sections)
+  {
+    vec_free (s->bounds);
+    vec_free (s->name);
+  }
+  vec_free (m->sections);
+  hash_free (m->section_by_name);
+
+  {
+    elf_main_t *em;
+    vec_foreach (em, m->elf_mains)
+    {
+      elf_main_free (em);
+    }
+    vec_free (m->elf_mains);
+  }
+}
+
+/* Call with exec_path equal to argv[0] from C main. */
+void clib_elf_main_init (char *exec_path);
+
+clib_elf_section_bounds_t *clib_elf_get_section_bounds (char *name);
+
+typedef struct
+{
+  /* The symbol. */
+  elf64_symbol_t symbol;
+
+  /* elf_main_t where symbol came from. */
+  u32 elf_main_index;
+
+  /* Symbol table in elf_main_t where this symbol came from. */
+  u32 symbol_table_index;
+} clib_elf_symbol_t;
+
+/* Returns 1 if found; otherwise zero. */
+uword clib_elf_symbol_by_name (char *name, clib_elf_symbol_t * result);
+uword clib_elf_symbol_by_address (uword address, clib_elf_symbol_t * result);
+
+format_function_t format_clib_elf_symbol, format_clib_elf_symbol_with_address;
+
+#endif /* included_clib_elf_self_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/elog.c b/src/vppinfra/elog.c
new file mode 100644
index 00000000..e9f06d09
--- /dev/null
+++ b/src/vppinfra/elog.c
@@ -0,0 +1,1061 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005,2009 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/elog.h>
+#include <vppinfra/cache.h>
+#include <vppinfra/error.h>
+#include <vppinfra/format.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/math.h>
+
+static inline void
+elog_lock (elog_main_t * em)
+{
+  if (PREDICT_FALSE (em->lock != 0))
+    while (__sync_lock_test_and_set (em->lock, 1))
+      ;
+}
+
+static inline void
+elog_unlock (elog_main_t * em)
+{
+  if (PREDICT_FALSE (em->lock != 0))
+    {
+      CLIB_MEMORY_BARRIER ();
+      *em->lock = 0;
+    }
+}
+
+/* Non-inline version. */
+void *
+elog_event_data (elog_main_t * em,
+		 elog_event_type_t * type, elog_track_t * track, u64 cpu_time)
+{
+  return elog_event_data_inline (em, type, track, cpu_time);
+}
+
+static void
+new_event_type (elog_main_t * em, uword i)
+{
+  elog_event_type_t *t = vec_elt_at_index (em->event_types, i);
+
+  if (!em->event_type_by_format)
+    em->event_type_by_format =
+      hash_create_vec ( /* size */ 0, sizeof (u8), sizeof (uword));
+
+  hash_set_mem (em->event_type_by_format, t->format, i);
+}
+
+static uword
+find_or_create_type (elog_main_t * em, elog_event_type_t * t)
+{
+  uword *p = hash_get_mem (em->event_type_by_format, t->format);
+  uword i;
+
+  if (p)
+    i = p[0];
+  else
+    {
+      i = vec_len (em->event_types);
+      vec_add1 (em->event_types, t[0]);
+      new_event_type (em, i);
+    }
+
+  return i;
+}
+
+/* External function to register types. */
+word
+elog_event_type_register (elog_main_t * em, elog_event_type_t * t)
+{
+  elog_event_type_t *static_type = t;
+  word l;
+
+  elog_lock (em);
+
+  l = vec_len (em->event_types);
+
+  t->type_index_plus_one = 1 + l;
+
+  ASSERT (t->format);
+
+  /* If format args are not specified try to be smart about providing defaults
+     so most of the time user does not have to specify them. */
+  if (!t->format_args)
+    {
+      uword i, l;
+      char *this_arg;
+
+      l = strlen (t->format);
+      for (i = 0; i < l; i++)
+	{
+	  if (t->format[i] != '%')
+	    continue;
+	  if (i + 1 >= l)
+	    continue;
+	  if (t->format[i + 1] == '%')	/* %% */
+	    continue;
+
+	  switch (t->format[i + 1])
+	    {
+	    default:
+	    case 'd':
+	    case 'x':
+	    case 'u':
+	      this_arg = "i4";	/* size of u32 */
+	      break;
+	    case 'f':
+	      this_arg = "f8";	/* defaults to f64 */
+	      break;
+	    case 's':
+	      this_arg = "s0";	/* defaults to null terminated string. */
+	      break;
+	    }
+
+	  t->format_args =
+	    (char *) format ((u8 *) t->format_args, "%s", this_arg);
+	}
+
+      /* Null terminate. */
+      vec_add1 (t->format_args, 0);
+    }
+
+  vec_add1 (em->event_types, t[0]);
+
+  t = em->event_types + l;
+
+  /* Make copies of strings for hashing etc. */
+  if (t->function)
+    t->format = (char *) format (0, "%s %s%c", t->function, t->format, 0);
+  else
+    t->format = (char *) format (0, "%s%c", t->format, 0);
+
+  t->format_args = (char *) format (0, "%s%c", t->format_args, 0);
+
+  /* Construct string table. */
+  {
+    uword i;
+    t->n_enum_strings = static_type->n_enum_strings;
+    for (i = 0; i < t->n_enum_strings; i++)
+      {
+	if (!static_type->enum_strings[i])
+	  static_type->enum_strings[i] = "MISSING";
+	vec_add1 (t->enum_strings_vector,
+		  (char *) format (0, "%s%c", static_type->enum_strings[i],
+				   0));
+      }
+  }
+
+  new_event_type (em, l);
+  elog_unlock (em);
+
+  return l;
+}
+
+word
+elog_track_register (elog_main_t * em, elog_track_t * t)
+{
+  word l;
+
+  elog_lock (em);
+
+  l = vec_len (em->tracks);
+
+  t->track_index_plus_one = 1 + l;
+
+  ASSERT (t->name);
+
+  vec_add1 (em->tracks, t[0]);
+
+  t = em->tracks + l;
+
+  t->name = (char *) format (0, "%s%c", t->name, 0);
+
+  elog_unlock (em);
+
+  return l;
+}
+
+static uword
+parse_2digit_decimal (char *p, uword * number)
+{
+  uword i = 0;
+  u8 digits[2];
+
+  digits[0] = digits[1] = 0;
+  while (p[i] >= '0' && p[i] <= '9')
+    {
+      if (i >= 2)
+	break;
+      digits[i] = p[i] - '0';
+      i++;
+    }
+
+  if (i >= 1 && i <= 2)
+    {
+      if (i == 1)
+	*number = digits[0];
+      else
+	*number = 10 * digits[0] + digits[1];
+      return i;
+    }
+  else
+    return 0;
+}
+
+static u8 *
+fixed_format (u8 * s, char *fmt, char *result, uword * result_len)
+{
+  char *f = fmt;
+  char *percent;
+  uword l = 0;
+
+  while (1)
+    {
+      if (f[0] == 0)
+	break;
+      if (f[0] == '%' && f[1] != '%')
+	break;
+      f++;
+    }
+  if (f > fmt)
+    vec_add (s, fmt, f - fmt);
+
+  if (f[0] != '%')
+    goto done;
+
+  /* Skip percent. */
+  percent = f++;
+
+  /* Skip possible +-= justification. */
+  f += f[0] == '+' || f[0] == '-' || f[0] == '=';
+
+  /* Skip possible X.Y width. */
+  while ((f[0] >= '0' && f[0] <= '9') || f[0] == '.')
+    f++;
+
+  /* Skip wlL as in e.g. %Ld. */
+  f += f[0] == 'w' || f[0] == 'l' || f[0] == 'L';
+
+  /* Finally skip format letter. */
+  f += f[0] != 0;
+
+  ASSERT (*result_len > f - percent);
+  l = clib_min (f - percent, *result_len - 1);
+  clib_memcpy (result, percent, l);
+  result[l] = 0;
+
+done:
+  *result_len = f - fmt;
+  return s;
+}
+
+u8 *
+format_elog_event (u8 * s, va_list * va)
+{
+  elog_main_t *em = va_arg (*va, elog_main_t *);
+  elog_event_t *e = va_arg (*va, elog_event_t *);
+  elog_event_type_t *t;
+  char *a, *f;
+  void *d = (u8 *) e->data;
+  char arg_format[64];
+
+  t = vec_elt_at_index (em->event_types, e->type);
+
+  f = t->format;
+  a = t->format_args;
+  while (1)
+    {
+      uword n_bytes = 0, n_digits, f_bytes = 0;
+
+      f_bytes = sizeof (arg_format);
+      s = fixed_format (s, f, arg_format, &f_bytes);
+      f += f_bytes;
+
+      if (a == 0 || a[0] == 0)
+	{
+	  /* Format must also be at end. */
+	  ASSERT (f[0] == 0);
+	  break;
+	}
+
+      /* Don't go past end of event data. */
+      ASSERT (d < (void *) (e->data + sizeof (e->data)));
+
+      n_digits = parse_2digit_decimal (a + 1, &n_bytes);
+      switch (a[0])
+	{
+	case 'i':
+	case 't':
+	case 'T':
+	  {
+	    u32 i = 0;
+	    u64 l = 0;
+
+	    if (n_bytes == 1)
+	      i = ((u8 *) d)[0];
+	    else if (n_bytes == 2)
+	      i = clib_mem_unaligned (d, u16);
+	    else if (n_bytes == 4)
+	      i = clib_mem_unaligned (d, u32);
+	    else if (n_bytes == 8)
+	      l = clib_mem_unaligned (d, u64);
+	    else
+	      ASSERT (0);
+	    if (a[0] == 't')
+	      {
+		char *e =
+		  vec_elt (t->enum_strings_vector, n_bytes == 8 ? l : i);
+		s = format (s, arg_format, e);
+	      }
+	    else if (a[0] == 'T')
+	      {
+		char *e =
+		  vec_elt_at_index (em->string_table, n_bytes == 8 ? l : i);
+		s = format (s, arg_format, e);
+	      }
+	    else if (n_bytes == 8)
+	      s = format (s, arg_format, l);
+	    else
+	      s = format (s, arg_format, i);
+	  }
+	  break;
+
+	case 'f':
+	  {
+	    f64 x = 0;
+	    if (n_bytes == 4)
+	      x = clib_mem_unaligned (d, f32);
+	    else if (n_bytes == 8)
+	      x = clib_mem_unaligned (d, f64);
+	    else
+	      ASSERT (0);
+	    s = format (s, arg_format, x);
+	  }
+	  break;
+
+	case 's':
+	  s = format (s, arg_format, d);
+	  if (n_bytes == 0)
+	    n_bytes = strlen (d) + 1;
+	  break;
+
+	default:
+	  ASSERT (0);
+	  break;
+	}
+
+      ASSERT (n_digits > 0 && n_digits <= 2);
+      a += 1 + n_digits;
+      d += n_bytes;
+    }
+
+  return s;
+}
+
+u8 *
+format_elog_track (u8 * s, va_list * va)
+{
+  elog_main_t *em = va_arg (*va, elog_main_t *);
+  elog_event_t *e = va_arg (*va, elog_event_t *);
+  elog_track_t *t = vec_elt_at_index (em->tracks, e->track);
+  return format (s, "%s", t->name);
+}
+
+void
+elog_time_now (elog_time_stamp_t * et)
+{
+  u64 cpu_time_now, os_time_now_nsec;
+
+#ifdef CLIB_UNIX
+  {
+#include <sys/syscall.h>
+    struct timespec ts;
+    syscall (SYS_clock_gettime, CLOCK_REALTIME, &ts);
+    cpu_time_now = clib_cpu_time_now ();
+    os_time_now_nsec = 1e9 * ts.tv_sec + ts.tv_nsec;
+  }
+#else
+  cpu_time_now = clib_cpu_time_now ();
+  os_time_now_nsec = 0;
+#endif
+
+  et->cpu = cpu_time_now;
+  et->os_nsec = os_time_now_nsec;
+}
+
+always_inline i64
+elog_time_stamp_diff_os_nsec (elog_time_stamp_t * t1, elog_time_stamp_t * t2)
+{
+  return (i64) t1->os_nsec - (i64) t2->os_nsec;
+}
+
+always_inline i64
+elog_time_stamp_diff_cpu (elog_time_stamp_t * t1, elog_time_stamp_t * t2)
+{
+  return (i64) t1->cpu - (i64) t2->cpu;
+}
+
+always_inline f64
+elog_nsec_per_clock (elog_main_t * em)
+{
+  return ((f64) elog_time_stamp_diff_os_nsec (&em->serialize_time,
+					      &em->init_time)
+	  / (f64) elog_time_stamp_diff_cpu (&em->serialize_time,
+					    &em->init_time));
+}
+
+void
+elog_alloc (elog_main_t * em, u32 n_events)
+{
+  if (em->event_ring)
+    vec_free (em->event_ring);
+
+  /* Ring size must be a power of 2. */
+  em->event_ring_size = n_events = max_pow2 (n_events);
+
+  /* Leave an empty ievent at end so we can always speculatively write
+     and event there (possibly a long form event). */
+  vec_resize_aligned (em->event_ring, n_events, CLIB_CACHE_LINE_BYTES);
+}
+
+void
+elog_init (elog_main_t * em, u32 n_events)
+{
+  memset (em, 0, sizeof (em[0]));
+
+  em->lock = 0;
+
+  if (n_events > 0)
+    elog_alloc (em, n_events);
+
+  clib_time_init (&em->cpu_timer);
+
+  em->n_total_events_disable_limit = ~0;
+
+  /* Make track 0. */
+  em->default_track.name = "default";
+  elog_track_register (em, &em->default_track);
+
+  elog_time_now (&em->init_time);
+}
+
+/* Returns number of events in ring and start index. */
+static uword
+elog_event_range (elog_main_t * em, uword * lo)
+{
+  uword l = em->event_ring_size;
+  u64 i = em->n_total_events;
+
+  /* Ring never wrapped? */
+  if (i <= (u64) l)
+    {
+      if (lo)
+	*lo = 0;
+      return i;
+    }
+  else
+    {
+      if (lo)
+	*lo = i & (l - 1);
+      return l;
+    }
+}
+
+elog_event_t *
+elog_peek_events (elog_main_t * em)
+{
+  elog_event_t *e, *f, *es = 0;
+  uword i, j, n;
+
+  n = elog_event_range (em, &j);
+  for (i = 0; i < n; i++)
+    {
+      vec_add2 (es, e, 1);
+      f = vec_elt_at_index (em->event_ring, j);
+      e[0] = f[0];
+
+      /* Convert absolute time from cycles to seconds from start. */
+      e->time =
+	(e->time_cycles -
+	 em->init_time.cpu) * em->cpu_timer.seconds_per_clock;
+
+      j = (j + 1) & (em->event_ring_size - 1);
+    }
+
+  return es;
+}
+
+/* Add a formatted string to the string table. */
+u32
+elog_string (elog_main_t * em, char *fmt, ...)
+{
+  u32 offset;
+  va_list va;
+
+  va_start (va, fmt);
+  offset = vec_len (em->string_table);
+  em->string_table = (char *) va_format ((u8 *) em->string_table, fmt, &va);
+  va_end (va);
+
+  /* Null terminate string if it is not already. */
+  if (vec_end (em->string_table)[-1] != 0)
+    vec_add1 (em->string_table, 0);
+
+  return offset;
+}
+
+elog_event_t *
+elog_get_events (elog_main_t * em)
+{
+  if (!em->events)
+    em->events = elog_peek_events (em);
+  return em->events;
+}
+
+static void
+maybe_fix_string_table_offset (elog_event_t * e,
+			       elog_event_type_t * t, u32 offset)
+{
+  void *d = (u8 *) e->data;
+  char *a;
+
+  if (offset == 0)
+    return;
+
+  a = t->format_args;
+
+  while (1)
+    {
+      uword n_bytes = 0, n_digits;
+
+      if (a[0] == 0)
+	break;
+
+      /* Don't go past end of event data. */
+      ASSERT (d < (void *) (e->data + sizeof (e->data)));
+
+      n_digits = parse_2digit_decimal (a + 1, &n_bytes);
+      switch (a[0])
+	{
+	case 'T':
+	  ASSERT (n_bytes == 4);
+	  clib_mem_unaligned (d, u32) += offset;
+	  break;
+
+	case 'i':
+	case 't':
+	case 'f':
+	case 's':
+	  break;
+
+	default:
+	  ASSERT (0);
+	  break;
+	}
+
+      ASSERT (n_digits > 0 && n_digits <= 2);
+      a += 1 + n_digits;
+      d += n_bytes;
+    }
+}
+
+static int
+elog_cmp (void *a1, void *a2)
+{
+  elog_event_t *e1 = a1;
+  elog_event_t *e2 = a2;
+
+  return e1->time - e2->time;
+}
+
+void
+elog_merge (elog_main_t * dst, u8 * dst_tag, elog_main_t * src, u8 * src_tag)
+{
+  elog_event_t *e;
+  uword l;
+  u32 string_table_offset_for_src_events;
+  u32 track_offset_for_src_tracks;
+  elog_track_t newt;
+  int i;
+
+  memset (&newt, 0, sizeof (newt));
+
+  elog_get_events (src);
+  elog_get_events (dst);
+
+  string_table_offset_for_src_events = vec_len (dst->string_table);
+  vec_append (dst->string_table, src->string_table);
+
+  l = vec_len (dst->events);
+  vec_add (dst->events, src->events, vec_len (src->events));
+
+  /* Prepend the supplied tag (if any) to all dst track names */
+  if (dst_tag)
+    {
+      for (i = 0; i < vec_len (dst->tracks); i++)
+	{
+	  elog_track_t *t = vec_elt_at_index (dst->tracks, i);
+	  char *new_name;
+
+	  new_name = (char *) format (0, "%s:%s%c", dst_tag, t->name, 0);
+	  vec_free (t->name);
+	  t->name = new_name;
+	}
+    }
+
+  track_offset_for_src_tracks = vec_len (dst->tracks);
+
+  /* Copy / tag source tracks */
+  for (i = 0; i < vec_len (src->tracks); i++)
+    {
+      elog_track_t *t = vec_elt_at_index (src->tracks, i);
+      if (src_tag)
+	newt.name = (char *) format (0, "%s:%s%c", src_tag, t->name, 0);
+      else
+	newt.name = (char *) format (0, "%s%c", t->name, 0);
+      (void) elog_track_register (dst, &newt);
+      vec_free (newt.name);
+    }
+
+  /* Across all (copied) src events... */
+  for (e = dst->events + l; e < vec_end (dst->events); e++)
+    {
+      elog_event_type_t *t = vec_elt_at_index (src->event_types, e->type);
+
+      /* Remap type from src -> dst. */
+      e->type = find_or_create_type (dst, t);
+
+      /* Remap string table offsets for 'T' format args */
+      maybe_fix_string_table_offset (e, t,
+				     string_table_offset_for_src_events);
+
+      /* Remap track */
+      e->track += track_offset_for_src_tracks;
+    }
+
+  /* Adjust event times for relative starting times of event streams. */
+  {
+    f64 dt_event, dt_os_nsec, dt_clock_nsec;
+
+    /* Set clock parameters if dst was not generated by unserialize. */
+    if (dst->serialize_time.cpu == 0)
+      {
+	dst->init_time = src->init_time;
+	dst->serialize_time = src->serialize_time;
+	dst->nsec_per_cpu_clock = src->nsec_per_cpu_clock;
+      }
+
+    dt_os_nsec =
+      elog_time_stamp_diff_os_nsec (&src->init_time, &dst->init_time);
+
+    dt_event = dt_os_nsec;
+    dt_clock_nsec =
+      (elog_time_stamp_diff_cpu (&src->init_time, &dst->init_time) * .5 *
+       (dst->nsec_per_cpu_clock + src->nsec_per_cpu_clock));
+
+    /* Heuristic to see if src/dst came from same time source.
+       If frequencies are "the same" and os clock and cpu clock agree
+       to within 100e-9 secs about time difference between src/dst
+       init_time, then we use cpu clock.  Otherwise we use OS clock. */
+    if (fabs (src->nsec_per_cpu_clock - dst->nsec_per_cpu_clock) < 1e-2
+	&& fabs (dt_os_nsec - dt_clock_nsec) < 100)
+      dt_event = dt_clock_nsec;
+
+    /* Convert to seconds. */
+    dt_event *= 1e-9;
+
+    if (dt_event > 0)
+      {
+	/* Src started after dst. */
+	for (e = dst->events + l; e < vec_end (dst->events); e++)
+	  e->time += dt_event;
+      }
+    else
+      {
+	/* Dst started after src. */
+	for (e = dst->events + 0; e < dst->events + l; e++)
+	  e->time += dt_event;
+      }
+  }
+
+  /* Sort events by increasing time. */
+  vec_sort_with_function (dst->events, elog_cmp);
+
+  /* Recreate the event ring or the results won't serialize */
+  {
+    int i;
+
+    ASSERT (dst->cpu_timer.seconds_per_clock);
+
+    elog_alloc (dst, vec_len (dst->events));
+    for (i = 0; i < vec_len (dst->events); i++)
+      {
+	elog_event_t *es, *ed;
+
+	es = dst->events + i;
+	ed = dst->event_ring + i;
+
+	ed[0] = es[0];
+
+	/* Invert elog_peek_events calculation */
+	ed->time_cycles =
+	  (es->time / dst->cpu_timer.seconds_per_clock) + dst->init_time.cpu;
+      }
+    dst->n_total_events = vec_len (dst->events);
+  }
+}
+
+static void
+serialize_elog_event (serialize_main_t * m, va_list * va)
+{
+  elog_main_t *em = va_arg (*va, elog_main_t *);
+  elog_event_t *e = va_arg (*va, elog_event_t *);
+  elog_event_type_t *t = vec_elt_at_index (em->event_types, e->type);
+  u8 *d = e->data;
+  u8 *p = (u8 *) t->format_args;
+
+  serialize_integer (m, e->type, sizeof (e->type));
+  serialize_integer (m, e->track, sizeof (e->track));
+  serialize (m, serialize_f64, e->time);
+
+  while (*p)
+    {
+      uword n_digits, n_bytes = 0;
+
+      n_digits = parse_2digit_decimal ((char *) p + 1, &n_bytes);
+
+      switch (p[0])
+	{
+	case 'i':
+	case 't':
+	case 'T':
+	  if (n_bytes == 1)
+	    serialize_integer (m, d[0], sizeof (u8));
+	  else if (n_bytes == 2)
+	    serialize_integer (m, clib_mem_unaligned (d, u16), sizeof (u16));
+	  else if (n_bytes == 4)
+	    serialize_integer (m, clib_mem_unaligned (d, u32), sizeof (u32));
+	  else if (n_bytes == 8)
+	    serialize (m, serialize_64, clib_mem_unaligned (d, u64));
+	  else
+	    ASSERT (0);
+	  break;
+
+	case 's':
+	  serialize_cstring (m, (char *) d);
+	  if (n_bytes == 0)
+	    n_bytes = strlen ((char *) d) + 1;
+	  break;
+
+	case 'f':
+	  if (n_bytes == 4)
+	    serialize (m, serialize_f32, clib_mem_unaligned (d, f32));
+	  else if (n_bytes == 8)
+	    serialize (m, serialize_f64, clib_mem_unaligned (d, f64));
+	  else
+	    ASSERT (0);
+	  break;
+
+	default:
+	  ASSERT (0);
+	  break;
+	}
+
+      p += 1 + n_digits;
+      d += n_bytes;
+    }
+}
+
+static void
+unserialize_elog_event (serialize_main_t * m, va_list * va)
+{
+  elog_main_t *em = va_arg (*va, elog_main_t *);
+  elog_event_t *e = va_arg (*va, elog_event_t *);
+  elog_event_type_t *t;
+  u8 *p, *d;
+
+  {
+    u16 tmp[2];
+
+    unserialize_integer (m, &tmp[0], sizeof (e->type));
+    unserialize_integer (m, &tmp[1], sizeof (e->track));
+
+    e->type = tmp[0];
+    e->track = tmp[1];
+
+    /* Make sure it fits. */
+    ASSERT (e->type == tmp[0]);
+    ASSERT (e->track == tmp[1]);
+  }
+
+  t = vec_elt_at_index (em->event_types, e->type);
+
+  unserialize (m, unserialize_f64, &e->time);
+
+  d = e->data;
+  p = (u8 *) t->format_args;
+
+  while (p && *p)
+    {
+      uword n_digits, n_bytes = 0;
+      u32 tmp;
+
+      n_digits = parse_2digit_decimal ((char *) p + 1, &n_bytes);
+
+      switch (p[0])
+	{
+	case 'i':
+	case 't':
+	case 'T':
+	  if (n_bytes == 1)
+	    {
+	      unserialize_integer (m, &tmp, sizeof (u8));
+	      d[0] = tmp;
+	    }
+	  else if (n_bytes == 2)
+	    {
+	      unserialize_integer (m, &tmp, sizeof (u16));
+	      clib_mem_unaligned (d, u16) = tmp;
+	    }
+	  else if (n_bytes == 4)
+	    {
+	      unserialize_integer (m, &tmp, sizeof (u32));
+	      clib_mem_unaligned (d, u32) = tmp;
+	    }
+	  else if (n_bytes == 8)
+	    {
+	      u64 x;
+	      unserialize (m, unserialize_64, &x);
+	      clib_mem_unaligned (d, u64) = x;
+	    }
+	  else
+	    ASSERT (0);
+	  break;
+
+	case 's':
+	  {
+	    char *t;
+	    unserialize_cstring (m, &t);
+	    if (n_bytes == 0)
+	      n_bytes = strlen (t) + 1;
+	    clib_memcpy (d, t, clib_min (n_bytes, vec_len (t)));
+	    vec_free (t);
+	    break;
+	  }
+
+	case 'f':
+	  if (n_bytes == 4)
+	    {
+	      f32 x;
+	      unserialize (m, unserialize_f32, &x);
+	      clib_mem_unaligned (d, f32) = x;
+	    }
+	  else if (n_bytes == 8)
+	    {
+	      f64 x;
+	      unserialize (m, unserialize_f64, &x);
+	      clib_mem_unaligned (d, f64) = x;
+	    }
+	  else
+	    ASSERT (0);
+	  break;
+
+	default:
+	  ASSERT (0);
+	  break;
+	}
+
+      p += 1 + n_digits;
+      d += n_bytes;
+    }
+}
+
+static void
+serialize_elog_event_type (serialize_main_t * m, va_list * va)
+{
+  elog_event_type_t *t = va_arg (*va, elog_event_type_t *);
+  int n = va_arg (*va, int);
+  int i, j;
+  for (i = 0; i < n; i++)
+    {
+      serialize_cstring (m, t[i].format);
+      serialize_cstring (m, t[i].format_args);
+      serialize_integer (m, t[i].type_index_plus_one,
+			 sizeof (t->type_index_plus_one));
+      serialize_integer (m, t[i].n_enum_strings,
+			 sizeof (t[i].n_enum_strings));
+      for (j = 0; j < t[i].n_enum_strings; j++)
+	serialize_cstring (m, t[i].enum_strings_vector[j]);
+    }
+}
+
+static void
+unserialize_elog_event_type (serialize_main_t * m, va_list * va)
+{
+  elog_event_type_t *t = va_arg (*va, elog_event_type_t *);
+  int n = va_arg (*va, int);
+  int i, j;
+  for (i = 0; i < n; i++)
+    {
+      unserialize_cstring (m, &t[i].format);
+      unserialize_cstring (m, &t[i].format_args);
+      unserialize_integer (m, &t[i].type_index_plus_one,
+			   sizeof (t->type_index_plus_one));
+      unserialize_integer (m, &t[i].n_enum_strings,
+			   sizeof (t[i].n_enum_strings));
+      vec_resize (t[i].enum_strings_vector, t[i].n_enum_strings);
+      for (j = 0; j < t[i].n_enum_strings; j++)
+	unserialize_cstring (m, &t[i].enum_strings_vector[j]);
+    }
+}
+
+static void
+serialize_elog_track (serialize_main_t * m, va_list * va)
+{
+  elog_track_t *t = va_arg (*va, elog_track_t *);
+  int n = va_arg (*va, int);
+  int i;
+  for (i = 0; i < n; i++)
+    {
+      serialize_cstring (m, t[i].name);
+    }
+}
+
+static void
+unserialize_elog_track (serialize_main_t * m, va_list * va)
+{
+  elog_track_t *t = va_arg (*va, elog_track_t *);
+  int n = va_arg (*va, int);
+  int i;
+  for (i = 0; i < n; i++)
+    {
+      unserialize_cstring (m, &t[i].name);
+    }
+}
+
+static void
+serialize_elog_time_stamp (serialize_main_t * m, va_list * va)
+{
+  elog_time_stamp_t *st = va_arg (*va, elog_time_stamp_t *);
+  serialize (m, serialize_64, st->os_nsec);
+  serialize (m, serialize_64, st->cpu);
+}
+
+static void
+unserialize_elog_time_stamp (serialize_main_t * m, va_list * va)
+{
+  elog_time_stamp_t *st = va_arg (*va, elog_time_stamp_t *);
+  unserialize (m, unserialize_64, &st->os_nsec);
+  unserialize (m, unserialize_64, &st->cpu);
+}
+
+static char *elog_serialize_magic = "elog v0";
+
+void
+serialize_elog_main (serialize_main_t * m, va_list * va)
+{
+  elog_main_t *em = va_arg (*va, elog_main_t *);
+  elog_event_t *e;
+
+  serialize_magic (m, elog_serialize_magic, strlen (elog_serialize_magic));
+
+  serialize_integer (m, em->event_ring_size, sizeof (u32));
+
+  elog_time_now (&em->serialize_time);
+  serialize (m, serialize_elog_time_stamp, &em->serialize_time);
+  serialize (m, serialize_elog_time_stamp, &em->init_time);
+
+  vec_serialize (m, em->event_types, serialize_elog_event_type);
+  vec_serialize (m, em->tracks, serialize_elog_track);
+  vec_serialize (m, em->string_table, serialize_vec_8);
+
+  /* Free old events (cached) in case they have changed. */
+  vec_free (em->events);
+  elog_get_events (em);
+
+  serialize_integer (m, vec_len (em->events), sizeof (u32));
+
+  /* SMP logs can easily have local time paradoxes... */
+  vec_sort_with_function (em->events, elog_cmp);
+
+  vec_foreach (e, em->events) serialize (m, serialize_elog_event, em, e);
+}
+
+void
+unserialize_elog_main (serialize_main_t * m, va_list * va)
+{
+  elog_main_t *em = va_arg (*va, elog_main_t *);
+  uword i;
+  u32 rs;
+
+  unserialize_check_magic (m, elog_serialize_magic,
+			   strlen (elog_serialize_magic));
+
+  unserialize_integer (m, &rs, sizeof (u32));
+  em->event_ring_size = rs;
+  elog_init (em, em->event_ring_size);
+
+  unserialize (m, unserialize_elog_time_stamp, &em->serialize_time);
+  unserialize (m, unserialize_elog_time_stamp, &em->init_time);
+  em->nsec_per_cpu_clock = elog_nsec_per_clock (em);
+
+  vec_unserialize (m, &em->event_types, unserialize_elog_event_type);
+  for (i = 0; i < vec_len (em->event_types); i++)
+    new_event_type (em, i);
+
+  vec_unserialize (m, &em->tracks, unserialize_elog_track);
+  vec_unserialize (m, &em->string_table, unserialize_vec_8);
+
+  {
+    u32 ne;
+    elog_event_t *e;
+
+    unserialize_integer (m, &ne, sizeof (u32));
+    vec_resize (em->events, ne);
+    vec_foreach (e, em->events)
+      unserialize (m, unserialize_elog_event, em, e);
+  }
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/elog.h b/src/vppinfra/elog.h
new file mode 100644
index 00000000..9756fb83
--- /dev/null
+++ b/src/vppinfra/elog.h
@@ -0,0 +1,460 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005,2009 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+/* High speed event logging with much thanks to Dave Barach. */
+
+#ifndef included_clib_elog_h
+#define included_clib_elog_h
+
+#include <vppinfra/cache.h>
+#include <vppinfra/error.h>	/* for ASSERT */
+#include <vppinfra/serialize.h>
+#include <vppinfra/time.h>	/* for clib_cpu_time_now */
+#include <vppinfra/mhash.h>
+
+typedef struct
+{
+  union
+  {
+    /* Absolute time stamp in CPU clock cycles. */
+    u64 time_cycles;
+
+    /* Absolute time as floating point number in seconds. */
+    f64 time;
+  };
+
+  /* Event type index. */
+  u16 type;
+
+  /* Track for this event.  Tracks allow events to be sorted and
+     displayed by track.  Think of 2 dimensional display with time and
+     track being the x and y axes. */
+  u16 track;
+
+  /* 20-bytes of data follows and pads to 32 bytes. */
+  u8 data[20];
+} elog_event_t;
+
+typedef struct
+{
+  /* Type index plus one assigned to this type.
+     This is used to mark type as seen. */
+  u32 type_index_plus_one;
+
+  /* String table as a vector constructed when type is registered. */
+  char **enum_strings_vector;
+
+  /* Format string. (example: "my-event (%d,%d)"). */
+  char *format;
+
+  /* Specifies how arguments to format are parsed from event data.
+     String of characters '0' '1' or '2' '3' to specify log2 size of data
+     (e.g. for u8, u16, u32 or u64),
+     's' means a null-terminated C string
+     't' means argument is an index into enum string table for this type.
+     'e' is a float,
+     'f' is a double. */
+  char *format_args;
+
+  /* Function name generating event. */
+  char *function;
+
+  /* Number of elements in string enum table. */
+  u32 n_enum_strings;
+
+  /* String table for enum/number to string formatting. */
+  char *enum_strings[];
+} elog_event_type_t;
+
+typedef struct
+{
+  /* Track name vector. */
+  char *name;
+
+  /* Set to one when track has been added to
+     main structure. */
+  u32 track_index_plus_one;
+} elog_track_t;
+
+typedef struct
+{
+  /* CPU cycle counter. */
+  u64 cpu;
+
+  /* OS timer in nano secs since epoch Jan 1 1970. */
+  u64 os_nsec;
+} elog_time_stamp_t;
+
+typedef struct
+{
+  /* Total number of events in buffer. */
+  u32 n_total_events;
+
+  /* When count reaches limit logging is disabled.  This is
+     used for event triggers. */
+  u32 n_total_events_disable_limit;
+
+  /* Dummy event to use when logger is disabled. */
+  elog_event_t dummy_event;
+
+  /* Power of 2 number of elements in ring. */
+  uword event_ring_size;
+
+  /* Vector of events (circular buffer).  Power of 2 size.
+     Used when events are being collected. */
+  elog_event_t *event_ring;
+
+  /* Vector of event types. */
+  elog_event_type_t *event_types;
+
+  /* Hash table mapping type format to type index. */
+  uword *event_type_by_format;
+
+  /* Events may refer to strings in string table. */
+  char *string_table;
+
+  /* Vector of tracks. */
+  elog_track_t *tracks;
+
+  /* Default track. */
+  elog_track_t default_track;
+
+  /* Place holder for CPU clock frequency. */
+  clib_time_t cpu_timer;
+
+  elog_time_stamp_t init_time, serialize_time;
+
+  /* SMP lock, non-zero means locking required */
+  uword *lock;
+
+  /* Use serialize_time and init_time to give estimate for
+     cpu clock frequency. */
+  f64 nsec_per_cpu_clock;
+
+  /* Vector of events converted to generic form after collection. */
+  elog_event_t *events;
+} elog_main_t;
+
+always_inline uword
+elog_n_events_in_buffer (elog_main_t * em)
+{
+  return clib_min (em->n_total_events, em->event_ring_size);
+}
+
+always_inline uword
+elog_buffer_capacity (elog_main_t * em)
+{
+  return em->event_ring_size;
+}
+
+always_inline void
+elog_reset_buffer (elog_main_t * em)
+{
+  em->n_total_events = 0;
+  em->n_total_events_disable_limit = ~0;
+}
+
+always_inline void
+elog_enable_disable (elog_main_t * em, int is_enabled)
+{
+  em->n_total_events = 0;
+  em->n_total_events_disable_limit = is_enabled ? ~0 : 0;
+}
+
+/* Disable logging after specified number of ievents have been logged.
+   This is used as a "debug trigger" when a certain event has occurred.
+   Events will be logged both before and after the "event" but the
+   event will not be lost as long as N < RING_SIZE. */
+always_inline void
+elog_disable_after_events (elog_main_t * em, uword n)
+{
+  em->n_total_events_disable_limit = em->n_total_events + n;
+}
+
+/* Signal a trigger.  We do this when we encounter an event that we want to save
+   context around (before and after). */
+always_inline void
+elog_disable_trigger (elog_main_t * em)
+{
+  em->n_total_events_disable_limit =
+    em->n_total_events + vec_len (em->event_ring) / 2;
+}
+
+/* External function to register types/tracks. */
+word elog_event_type_register (elog_main_t * em, elog_event_type_t * t);
+word elog_track_register (elog_main_t * em, elog_track_t * t);
+
+always_inline uword
+elog_is_enabled (elog_main_t * em)
+{
+  return em->n_total_events < em->n_total_events_disable_limit;
+}
+
+/* Add an event to the log.  Returns a pointer to the
+   data for caller to write into. */
+always_inline void *
+elog_event_data_inline (elog_main_t * em,
+			elog_event_type_t * type,
+			elog_track_t * track, u64 cpu_time)
+{
+  elog_event_t *e;
+  uword ei;
+  word type_index, track_index;
+
+  /* Return the user dummy memory to scribble data into. */
+  if (PREDICT_FALSE (!elog_is_enabled (em)))
+    return em->dummy_event.data;
+
+  type_index = (word) type->type_index_plus_one - 1;
+  track_index = (word) track->track_index_plus_one - 1;
+  if (PREDICT_FALSE ((type_index | track_index) < 0))
+    {
+      if (type_index < 0)
+	type_index = elog_event_type_register (em, type);
+      if (track_index < 0)
+	track_index = elog_track_register (em, track);
+    }
+
+  ASSERT (type_index < vec_len (em->event_types));
+  ASSERT (track_index < vec_len (em->tracks));
+  ASSERT (is_pow2 (vec_len (em->event_ring)));
+
+  if (em->lock)
+    ei = clib_smp_atomic_add (&em->n_total_events, 1);
+  else
+    ei = em->n_total_events++;
+
+  ei &= em->event_ring_size - 1;
+  e = vec_elt_at_index (em->event_ring, ei);
+
+  e->time_cycles = cpu_time;
+  e->type = type_index;
+  e->track = track_index;
+
+  /* Return user data for caller to fill in. */
+  return e->data;
+}
+
+/* External version of inline. */
+void *elog_event_data (elog_main_t * em,
+		       elog_event_type_t * type,
+		       elog_track_t * track, u64 cpu_time);
+
+/* Non-inline version. */
+always_inline void *
+elog_event_data_not_inline (elog_main_t * em,
+			    elog_event_type_t * type,
+			    elog_track_t * track, u64 cpu_time)
+{
+  /* Return the user dummy memory to scribble data into. */
+  if (PREDICT_FALSE (!elog_is_enabled (em)))
+    return em->dummy_event.data;
+  return elog_event_data (em, type, track, cpu_time);
+}
+
+/* Most common forms: log a single 32 bit datum, w / w-out track */
+always_inline void
+elog (elog_main_t * em, elog_event_type_t * type, u32 data)
+{
+  u32 *d = elog_event_data_not_inline (em,
+				       type,
+				       &em->default_track,
+				       clib_cpu_time_now ());
+  d[0] = data;
+}
+
+/* Inline version of above. */
+always_inline void
+elog_inline (elog_main_t * em, elog_event_type_t * type, u32 data)
+{
+  u32 *d = elog_event_data_inline (em,
+				   type,
+				   &em->default_track,
+				   clib_cpu_time_now ());
+  d[0] = data;
+}
+
+always_inline void
+elog_track (elog_main_t * em, elog_event_type_t * type, elog_track_t * track,
+	    u32 data)
+{
+  u32 *d = elog_event_data_not_inline (em,
+				       type,
+				       track,
+				       clib_cpu_time_now ());
+  d[0] = data;
+}
+
+always_inline void
+elog_track_inline (elog_main_t * em, elog_event_type_t * type,
+		   elog_track_t * track, u32 data)
+{
+  u32 *d = elog_event_data_inline (em,
+				   type,
+				   track,
+				   clib_cpu_time_now ());
+  d[0] = data;
+}
+
+always_inline void *
+elog_data (elog_main_t * em, elog_event_type_t * type, elog_track_t * track)
+{
+  return elog_event_data_not_inline (em, type, track, clib_cpu_time_now ());
+}
+
+always_inline void *
+elog_data_inline (elog_main_t * em, elog_event_type_t * type,
+		  elog_track_t * track)
+{
+  return elog_event_data_inline (em, type, track, clib_cpu_time_now ());
+}
+
+/* Macro shorthands for generating/declaring events. */
+#define __ELOG_TYPE_VAR(f) f
+#define __ELOG_TRACK_VAR(f) f
+
+#define ELOG_TYPE_DECLARE(f) static elog_event_type_t __ELOG_TYPE_VAR(f)
+
+#define ELOG_TYPE_INIT_FORMAT_AND_FUNCTION(fmt,func) \
+  { .format = fmt, .function = func, }
+
+#define ELOG_TYPE_INIT(fmt) \
+  ELOG_TYPE_INIT_FORMAT_AND_FUNCTION(fmt,(char *) __FUNCTION__)
+
+#define ELOG_TYPE_DECLARE_HELPER(f,fmt,func)		\
+  static elog_event_type_t __ELOG_TYPE_VAR(f) =		\
+    ELOG_TYPE_INIT_FORMAT_AND_FUNCTION (fmt, func)
+
+#define ELOG_TYPE_DECLARE_FORMAT_AND_FUNCTION(f,fmt)		\
+  ELOG_TYPE_DECLARE_HELPER (f, fmt, (char *) __FUNCTION__)
+
+#define ELOG_TYPE_DECLARE_FORMAT(f,fmt)		\
+  ELOG_TYPE_DECLARE_HELPER (f, fmt, 0)
+
+/* Shorthands with and without __FUNCTION__.
+   D for decimal; X for hex.  F for __FUNCTION__. */
+#define ELOG_TYPE(f,fmt) ELOG_TYPE_DECLARE_FORMAT_AND_FUNCTION(f,fmt)
+#define ELOG_TYPE_D(f)  ELOG_TYPE_DECLARE_FORMAT (f, #f " %d")
+#define ELOG_TYPE_X(f)  ELOG_TYPE_DECLARE_FORMAT (f, #f " 0x%x")
+#define ELOG_TYPE_DF(f) ELOG_TYPE_DECLARE_FORMAT_AND_FUNCTION (f, #f " %d")
+#define ELOG_TYPE_XF(f) ELOG_TYPE_DECLARE_FORMAT_AND_FUNCTION (f, #f " 0x%x")
+#define ELOG_TYPE_FD(f) ELOG_TYPE_DECLARE_FORMAT_AND_FUNCTION (f, #f " %d")
+#define ELOG_TYPE_FX(f) ELOG_TYPE_DECLARE_FORMAT_AND_FUNCTION (f, #f " 0x%x")
+
+#define ELOG_TRACK_DECLARE(f) static elog_track_t __ELOG_TRACK_VAR(f)
+#define ELOG_TRACK(f) ELOG_TRACK_DECLARE(f) = { .name = #f, }
+
+/* Log 32 bits of data. */
+#define ELOG(em,f,data) elog ((em), &__ELOG_TYPE_VAR(f), data)
+#define ELOG_INLINE(em,f,data) elog_inline ((em), &__ELOG_TYPE_VAR(f), data)
+
+/* Return data pointer to fill in. */
+#define ELOG_TRACK_DATA(em,f,track) \
+  elog_data ((em), &__ELOG_TYPE_VAR(f), &__ELOG_TRACK_VAR(track))
+#define ELOG_TRACK_DATA_INLINE(em,f,track) \
+  elog_data_inline ((em), &__ELOG_TYPE_VAR(f), &__ELOG_TRACK_VAR(track))
+
+/* Shorthand with default track. */
+#define ELOG_DATA(em,f) elog_data ((em), &__ELOG_TYPE_VAR (f), &(em)->default_track)
+#define ELOG_DATA_INLINE(em,f) elog_data_inline ((em), &__ELOG_TYPE_VAR (f), &(em)->default_track)
+
+u32 elog_string (elog_main_t * em, char *format, ...);
+void elog_time_now (elog_time_stamp_t * et);
+
+/* Convert ievents to events and return them as a vector.
+   Sets em->events to resulting vector. */
+elog_event_t *elog_get_events (elog_main_t * em);
+
+/* Convert ievents to events and return them as a vector with no side effects. */
+elog_event_t *elog_peek_events (elog_main_t * em);
+
+/* Merge two logs, add supplied track tags. */
+void elog_merge (elog_main_t * dst, u8 * dst_tag,
+		 elog_main_t * src, u8 * src_tag);
+
+/* 2 arguments elog_main_t and elog_event_t to format event or track name. */
+u8 *format_elog_event (u8 * s, va_list * va);
+u8 *format_elog_track (u8 * s, va_list * va);
+
+void serialize_elog_main (serialize_main_t * m, va_list * va);
+void unserialize_elog_main (serialize_main_t * m, va_list * va);
+
+void elog_init (elog_main_t * em, u32 n_events);
+void elog_alloc (elog_main_t * em, u32 n_events);
+
+#ifdef CLIB_UNIX
+always_inline clib_error_t *
+elog_write_file (elog_main_t * em, char *unix_file)
+{
+  serialize_main_t m;
+  clib_error_t *error;
+
+  error = serialize_open_unix_file (&m, unix_file);
+  if (error)
+    return error;
+  error = serialize (&m, serialize_elog_main, em);
+  if (!error)
+    serialize_close (&m);
+  return error;
+}
+
+always_inline clib_error_t *
+elog_read_file (elog_main_t * em, char *unix_file)
+{
+  serialize_main_t m;
+  clib_error_t *error;
+
+  error = unserialize_open_unix_file (&m, unix_file);
+  if (error)
+    return error;
+  error = unserialize (&m, unserialize_elog_main, em);
+  if (!error)
+    unserialize_close (&m);
+  return error;
+}
+
+#endif /* CLIB_UNIX */
+
+#endif /* included_clib_elog_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/error.c b/src/vppinfra/error.c
new file mode 100644
index 00000000..2722fb7b
--- /dev/null
+++ b/src/vppinfra/error.c
@@ -0,0 +1,292 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+/* Error reporting. */
+#include <stdarg.h>
+
+#include <vppinfra/clib.h>	/* for HAVE_ERRNO */
+
+#ifdef CLIB_LINUX_KERNEL
+#include <linux/unistd.h>	/* for write */
+#include <linux/kernel.h>	/* for printk */
+#endif
+
+#ifdef CLIB_UNIX
+#include <unistd.h>		/* for write */
+#include <stdio.h>		/* for printf */
+#define HAVE_ERRNO
+#endif
+
+#ifdef CLIB_STANDALONE
+#include <vppinfra/standalone_stdio.h>	/* for printf */
+#endif
+
+#include <vppinfra/string.h>
+#include <vppinfra/mem.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/format.h>
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/os.h>	/* for os_panic/os_exit/os_puts */
+
+typedef struct
+{
+  clib_error_handler_func_t *func;
+  void *arg;
+} clib_error_handler_t;
+
+static clib_error_handler_t *handlers = 0;
+
+void
+clib_error_register_handler (clib_error_handler_func_t func, void *arg)
+{
+  clib_error_handler_t h = {.func = func,.arg = arg, };
+  vec_add1 (handlers, h);
+}
+
+static void
+debugger (void)
+{
+  os_panic ();
+}
+
+static void
+error_exit (int code)
+{
+  os_exit (code);
+}
+
+static u8 *
+dispatch_message (u8 * msg)
+{
+  word i;
+
+  if (!msg)
+    return msg;
+
+  for (i = 0; i < vec_len (handlers); i++)
+    handlers[i].func (handlers[i].arg, msg, vec_len (msg));
+
+  /* If no message handler is specified provide a default one. */
+  if (vec_len (handlers) == 0)
+    os_puts (msg, vec_len (msg), /* is_error */ 1);
+
+  return msg;
+}
+
+void
+_clib_error (int how_to_die,
+	     char *function_name, uword line_number, char *fmt, ...)
+{
+  u8 *msg = 0;
+  va_list va;
+
+  if (function_name)
+    {
+      msg = format (msg, "%s:", function_name);
+      if (line_number > 0)
+	msg = format (msg, "%wd:", line_number);
+      msg = format (msg, " ");
+    }
+
+  va_start (va, fmt);
+  msg = va_format (msg, fmt, &va);
+  va_end (va);
+
+#ifdef HAVE_ERRNO
+  if (how_to_die & CLIB_ERROR_ERRNO_VALID)
+    msg = format (msg, ": %s (errno %d)", strerror (errno), errno);
+#endif
+
+  if (vec_end (msg)[-1] != '\n')
+    vec_add1 (msg, '\n');
+
+  msg = dispatch_message (msg);
+
+  vec_free (msg);
+
+  if (how_to_die & CLIB_ERROR_ABORT)
+    debugger ();
+  if (how_to_die & CLIB_ERROR_FATAL)
+    error_exit (1);
+}
+
+clib_error_t *
+_clib_error_return (clib_error_t * errors,
+		    any code, uword flags, char *where, char *fmt, ...)
+{
+  clib_error_t *e;
+  va_list va;
+
+#ifdef HAVE_ERRNO
+  /* Save errno since it may be re-set before we'll need it. */
+  word errno_save = errno;
+#endif
+
+  va_start (va, fmt);
+  vec_add2 (errors, e, 1);
+  if (fmt)
+    e->what = va_format (0, fmt, &va);
+
+#ifdef HAVE_ERRNO
+  if (flags & CLIB_ERROR_ERRNO_VALID)
+    {
+      if (e->what)
+	e->what = format (e->what, ": ");
+      e->what = format (e->what, "%s", strerror (errno_save));
+    }
+#endif
+
+  e->where = (u8 *) where;
+  e->code = code;
+  e->flags = flags;
+  va_end (va);
+  return errors;
+}
+
+void *
+clib_error_free_vector (clib_error_t * errors)
+{
+  clib_error_t *e;
+  vec_foreach (e, errors) vec_free (e->what);
+  vec_free (errors);
+  return 0;
+}
+
+u8 *
+format_clib_error (u8 * s, va_list * va)
+{
+  clib_error_t *errors = va_arg (*va, clib_error_t *);
+  clib_error_t *e;
+
+  vec_foreach (e, errors)
+  {
+    if (!e->what)
+      continue;
+
+    if (e->where)
+      {
+	u8 *where = 0;
+
+	if (e > errors)
+	  where = format (where, "from ");
+	where = format (where, "%s", e->where);
+
+	s = format (s, "%v: ", where);
+	vec_free (where);
+      }
+
+    s = format (s, "%v\n", e->what);
+  }
+
+  return s;
+}
+
+clib_error_t *
+_clib_error_report (clib_error_t * errors)
+{
+  if (errors)
+    {
+      u8 *msg = format (0, "%U", format_clib_error, errors);
+
+      msg = dispatch_message (msg);
+      vec_free (msg);
+
+      if (errors->flags & CLIB_ERROR_ABORT)
+	debugger ();
+      if (errors->flags & CLIB_ERROR_FATAL)
+	error_exit (1);
+
+      clib_error_free (errors);
+    }
+  return 0;
+}
+
+#ifdef TEST
+
+static error_t *
+foo1 (int x)
+{
+  return error_return (0, "x is odd %d", x);
+}
+
+static error_t *
+foo2 (int x)
+{
+  return error_return (0, "x is even %d", x);
+}
+
+static error_t *
+foo (int x)
+{
+  error_t *e;
+  if (x & 1)
+    e = foo1 (x);
+  else
+    e = foo2 (x);
+  if (e)
+    return error_return (e, 0);
+}
+
+static void
+error_handler (void *arg, char *msg, int msg_len)
+{
+  write (2, msg, msg_len);
+}
+
+int
+main (int argc, char *argv[])
+{
+  error_t *e;
+
+  register_error_handler (error_handler, 0);
+
+  e = foo (getpid ());
+  if (e)
+    error_report (e);
+  return 0;
+}
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/error.h b/src/vppinfra/error.h
new file mode 100644
index 00000000..63d73af3
--- /dev/null
+++ b/src/vppinfra/error.h
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_error_h
+#define included_error_h
+
+#include <vppinfra/clib.h>	/* for CLIB_LINUX_KERNEL */
+#include <vppinfra/error_bootstrap.h>
+
+#ifdef CLIB_UNIX
+#include <errno.h>
+#endif
+
+#ifdef CLIB_LINUX_KERNEL
+#include <linux/errno.h>
+#endif
+
+#include <stdarg.h>
+#include <vppinfra/vec.h>
+
+/* Callback functions for error reporting. */
+typedef void clib_error_handler_func_t (void *arg, u8 * msg, int msg_len);
+void clib_error_register_handler (clib_error_handler_func_t func, void *arg);
+
+#define clib_warning(format,args...) \
+  _clib_error (CLIB_ERROR_WARNING, clib_error_function, __LINE__, format, ## args)
+
+#define clib_error(format,args...) \
+  _clib_error (CLIB_ERROR_FATAL, clib_error_function, __LINE__, format, ## args)
+
+#define clib_unix_error(format,args...) \
+  _clib_error (CLIB_ERROR_FATAL | CLIB_ERROR_ERRNO_VALID, clib_error_function, __LINE__, format, ## args)
+
+#define clib_unix_warning(format,args...) \
+  _clib_error (CLIB_ERROR_WARNING | CLIB_ERROR_ERRNO_VALID, clib_error_function, __LINE__, format, ## args)
+
+/* For programming errors and assert. */
+#define clib_panic(format,args...) \
+  _clib_error (CLIB_ERROR_ABORT, (char *) clib_error_function, __LINE__, format, ## args)
+
+typedef struct
+{
+  /* Error message. */
+  u8 *what;
+
+  /* Where error occurred (e.g. __FUNCTION__ __LINE__) */
+  const u8 *where;
+
+  uword flags;
+
+  /* Error code (e.g. errno for Unix errors). */
+  any code;
+} clib_error_t;
+
+#define clib_error_get_code(err) ((err) ? (err)->code : 0)
+#define clib_error_set_code(err, c)		\
+do {						\
+  if (err)					\
+    (err)->code = (c);				\
+} while (0)
+
+extern void *clib_error_free_vector (clib_error_t * errors);
+
+#define clib_error_free(e) e = clib_error_free_vector(e)
+
+extern clib_error_t *_clib_error_return (clib_error_t * errors,
+					 any code,
+					 uword flags,
+					 char *where, char *fmt, ...);
+
+#define clib_error_return_code(e,code,flags,args...) \
+  _clib_error_return((e),(code),(flags),(char *)clib_error_function,args)
+
+#define clib_error_create(args...) \
+  clib_error_return_code(0,0,0,args)
+
+#define clib_error_return(e,args...) \
+  clib_error_return_code(e,0,0,args)
+
+#define clib_error_return_unix(e,args...) \
+  clib_error_return_code(e,errno,CLIB_ERROR_ERRNO_VALID,args)
+
+#define clib_error_return_fatal(e,args...) \
+  clib_error_return_code(e,0,CLIB_ERROR_FATAL,args)
+
+#define clib_error_return_unix_fatal(e,args...) \
+  clib_error_return_code(e,errno,CLIB_ERROR_ERRNO_VALID|CLIB_ERROR_FATAL,args)
+
+extern clib_error_t *_clib_error_report (clib_error_t * errors);
+
+#define clib_error_report(e) do { (e) = _clib_error_report (e); } while (0)
+
+u8 *format_clib_error (u8 * s, va_list * va);
+
+always_inline word
+unix_error_is_fatal (word error)
+{
+#ifdef CLIB_UNIX
+  switch (error)
+    {
+    case EWOULDBLOCK:
+    case EINTR:
+      return 0;
+    }
+#endif
+  return 1;
+}
+
+#define IF_ERROR_IS_FATAL_RETURN_ELSE_FREE(e)			\
+do {								\
+  if (e)							\
+    {								\
+      if (unix_error_is_fatal (clib_error_get_code (e)))	\
+	return (e);						\
+      else							\
+	clib_error_free (e);					\
+    }								\
+} while (0)
+
+#define ERROR_RETURN_IF(x)				\
+do {							\
+  clib_error_t * _error_return_if = (x);		\
+  if (_error_return_if)					\
+    return clib_error_return (_error_return_if, 0);	\
+} while (0)
+
+#define ERROR_ASSERT(truth)			\
+({						\
+  clib_error_t * _error_assert = 0;		\
+  if (CLIB_DEBUG > 0 && ! (truth))		\
+    {						\
+      _error_assert = clib_error_return_fatal	\
+        (0, "%s:%d (%s) assertion `%s' fails",	\
+	 __FILE__,				\
+	 (uword) __LINE__,			\
+	 clib_error_function,			\
+	 # truth);				\
+    }						\
+  _error_assert;				\
+})
+
+/* Assert to remain even if CLIB_DEBUG is set to 0. */
+#define CLIB_ERROR_ASSERT(truth)		\
+({						\
+  clib_error_t * _error_assert = 0;		\
+  if (! (truth))				\
+    {						\
+      _error_assert =				\
+        clib_error_return_fatal			\
+        (0, "%s:%d (%s) assertion `%s' fails",	\
+         __FILE__,				\
+	 (uword) __LINE__,			\
+	 clib_error_function,			\
+	 # truth);				\
+    }						\
+  _error_assert;				\
+})
+
+#endif /* included_error_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/error_bootstrap.h b/src/vppinfra/error_bootstrap.h
new file mode 100644
index 00000000..3416c2f9
--- /dev/null
+++ b/src/vppinfra/error_bootstrap.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_error_bootstrap_h
+#define included_error_bootstrap_h
+
+/* Bootstrap include so that #include <vppinfra/mem.h> can include e.g.
+   <vppinfra/mheap.h> which depends on <vppinfra/vec.h>. */
+
+#include <vppinfra/clib.h>	/* for uword */
+
+enum
+{
+  CLIB_ERROR_FATAL = 1 << 0,
+  CLIB_ERROR_ABORT = 1 << 1,
+  CLIB_ERROR_WARNING = 1 << 2,
+  CLIB_ERROR_ERRNO_VALID = 1 << 16,
+  CLIB_ERROR_NO_RATE_LIMIT = 1 << 17,
+};
+
+/* Current function name.  Need (char *) cast to silence gcc4 pointer signedness warning. */
+#define clib_error_function ((char *) __FUNCTION__)
+
+#ifndef CLIB_ASSERT_ENABLE
+#define CLIB_ASSERT_ENABLE (CLIB_DEBUG > 0)
+#endif
+
+/* Low level error reporting function.
+   Code specifies whether to call exit, abort or nothing at
+   all (for non-fatal warnings). */
+extern void _clib_error (int code,
+			 char *function_name,
+			 uword line_number, char *format, ...);
+
+#define ASSERT(truth)					\
+do {							\
+  if (CLIB_ASSERT_ENABLE && ! (truth))			\
+    {							\
+      _clib_error (CLIB_ERROR_ABORT, 0, 0,		\
+		   "%s:%d (%s) assertion `%s' fails",	\
+		   __FILE__,				\
+		   (uword) __LINE__,			\
+		   clib_error_function,			\
+		   # truth);				\
+    }							\
+} while (0)
+
+#if defined(__clang__)
+#define STATIC_ASSERT(truth,...)
+#else
+#define STATIC_ASSERT(truth,...) _Static_assert(truth, __VA_ARGS__)
+#endif
+
+#define STATIC_ASSERT_SIZEOF(d, s) \
+  STATIC_ASSERT (sizeof (d) == s, "Size of " #d " must be " # s " bytes")
+
+/* Assert without allocating memory. */
+#define ASSERT_AND_PANIC(truth)			\
+do {						\
+  if (CLIB_ASSERT_ENABLE && ! (truth))		\
+    os_panic ();				\
+} while (0)
+
+#endif /* included_error_bootstrap_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/fheap.c b/src/vppinfra/fheap.c
new file mode 100644
index 00000000..13692456
--- /dev/null
+++ b/src/vppinfra/fheap.c
@@ -0,0 +1,473 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/fheap.h>
+
+/* Fibonacci heaps. */
+always_inline fheap_node_t *
+fheap_get_node (fheap_t * f, u32 i)
+{
+  return i != ~0 ? vec_elt_at_index (f->nodes, i) : 0;
+}
+
+always_inline fheap_node_t *
+fheap_get_root (fheap_t * f)
+{
+  return fheap_get_node (f, f->min_root);
+}
+
+static void
+fheap_validate (fheap_t * f)
+{
+  fheap_node_t *n, *m;
+  uword ni, si;
+
+  if (!CLIB_DEBUG || !f->enable_validate)
+    return;
+
+  vec_foreach_index (ni, f->nodes)
+  {
+    n = vec_elt_at_index (f->nodes, ni);
+
+    if (!n->is_valid)
+      continue;
+
+    /* Min root must have minimal key. */
+    m = vec_elt_at_index (f->nodes, f->min_root);
+    ASSERT (n->key >= m->key);
+
+    /* Min root must have no parent. */
+    if (ni == f->min_root)
+      ASSERT (n->parent == ~0);
+
+    /* Check sibling linkages. */
+    if (n->next_sibling == ~0)
+      ASSERT (n->prev_sibling == ~0);
+    else if (n->prev_sibling == ~0)
+      ASSERT (n->next_sibling == ~0);
+    else
+      {
+	fheap_node_t *prev, *next;
+	u32 si = n->next_sibling, si_start = si;
+	do
+	  {
+	    m = vec_elt_at_index (f->nodes, si);
+	    prev = vec_elt_at_index (f->nodes, m->prev_sibling);
+	    next = vec_elt_at_index (f->nodes, m->next_sibling);
+	    ASSERT (prev->next_sibling == si);
+	    ASSERT (next->prev_sibling == si);
+	    si = m->next_sibling;
+	  }
+	while (si != si_start);
+      }
+
+    /* Loop through all siblings. */
+    {
+      u32 n_siblings = 0;
+
+      foreach_fheap_node_sibling (f, si, n->next_sibling, (
+							    {
+							    m =
+							    vec_elt_at_index
+							    (f->nodes, si);
+							    /* All siblings must have same parent. */
+							    ASSERT (m->parent
+								    ==
+								    n->
+								    parent);
+							    n_siblings += 1;}
+				  ));
+
+      /* Either parent is non-empty or there are siblings present. */
+      if (n->parent == ~0 && ni != f->min_root)
+	ASSERT (n_siblings > 0);
+    }
+
+    /* Loop through all children. */
+    {
+      u32 found_first_child = n->first_child == ~0;
+      u32 n_children = 0;
+
+      foreach_fheap_node_sibling (f, si, n->first_child, (
+							   {
+							   m =
+							   vec_elt_at_index
+							   (f->nodes, si);
+							   /* Children must have larger keys than their parent. */
+							   ASSERT (m->key >=
+								   n->key);
+							   if
+							   (!found_first_child)
+							   found_first_child =
+							   si ==
+							   n->first_child;
+							   n_children += 1;}
+				  ));
+
+      /* Check that first child is present on list. */
+      ASSERT (found_first_child);
+
+      /* Make sure rank is correct. */
+      ASSERT (n->rank == n_children);
+    }
+  }
+
+  /* Increment serial number for each successful validate.
+     Failure can be used as condition for gdb breakpoints. */
+  f->validate_serial++;
+}
+
+always_inline void
+fheap_node_add_sibling (fheap_t * f, u32 ni, u32 ni_to_add)
+{
+  fheap_node_t *n = vec_elt_at_index (f->nodes, ni);
+  fheap_node_t *n_to_add = vec_elt_at_index (f->nodes, ni_to_add);
+  fheap_node_t *n_next = fheap_get_node (f, n->next_sibling);
+  fheap_node_t *parent;
+
+  /* Empty list? */
+  if (n->next_sibling == ~0)
+    {
+      ASSERT (n->prev_sibling == ~0);
+      n->next_sibling = n->prev_sibling = ni_to_add;
+      n_to_add->next_sibling = n_to_add->prev_sibling = ni;
+    }
+  else
+    {
+      /* Add node after existing node. */
+      n_to_add->prev_sibling = ni;
+      n_to_add->next_sibling = n->next_sibling;
+
+      n->next_sibling = ni_to_add;
+      n_next->prev_sibling = ni_to_add;
+    }
+
+  n_to_add->parent = n->parent;
+  parent = fheap_get_node (f, n->parent);
+  if (parent)
+    parent->rank += 1;
+}
+
+void
+fheap_add (fheap_t * f, u32 ni, u32 key)
+{
+  fheap_node_t *r, *n;
+  u32 ri;
+
+  n = vec_elt_at_index (f->nodes, ni);
+
+  memset (n, 0, sizeof (n[0]));
+  n->parent = n->first_child = n->next_sibling = n->prev_sibling = ~0;
+  n->key = key;
+
+  r = fheap_get_root (f);
+  ri = f->min_root;
+  if (!r)
+    {
+      /* No root?  Add node as new root. */
+      f->min_root = ni;
+    }
+  else
+    {
+      /* Add node as sibling of current root. */
+      fheap_node_add_sibling (f, ri, ni);
+
+      /* New node may become new root. */
+      if (r->key > n->key)
+	f->min_root = ni;
+    }
+
+  fheap_validate (f);
+}
+
+always_inline u32
+fheap_node_remove_internal (fheap_t * f, u32 ni, u32 invalidate)
+{
+  fheap_node_t *n = vec_elt_at_index (f->nodes, ni);
+  u32 prev_ni = n->prev_sibling;
+  u32 next_ni = n->next_sibling;
+  u32 list_has_single_element = prev_ni == ni;
+  fheap_node_t *prev = fheap_get_node (f, prev_ni);
+  fheap_node_t *next = fheap_get_node (f, next_ni);
+  fheap_node_t *p = fheap_get_node (f, n->parent);
+
+  if (p)
+    {
+      ASSERT (p->rank > 0);
+      p->rank -= 1;
+      p->first_child = list_has_single_element ? ~0 : next_ni;
+    }
+
+  if (prev)
+    {
+      ASSERT (prev->next_sibling == ni);
+      prev->next_sibling = next_ni;
+    }
+  if (next)
+    {
+      ASSERT (next->prev_sibling == ni);
+      next->prev_sibling = prev_ni;
+    }
+
+  n->prev_sibling = n->next_sibling = ni;
+  n->parent = ~0;
+  n->is_valid = invalidate == 0;
+
+  return list_has_single_element ? ~0 : next_ni;
+}
+
+always_inline u32
+fheap_node_remove (fheap_t * f, u32 ni)
+{
+  return fheap_node_remove_internal (f, ni, /* invalidate */ 0);
+}
+
+always_inline u32
+fheap_node_remove_and_invalidate (fheap_t * f, u32 ni)
+{
+  return fheap_node_remove_internal (f, ni, /* invalidate */ 1);
+}
+
+static void
+fheap_link_root (fheap_t * f, u32 ni)
+{
+  fheap_node_t *n = vec_elt_at_index (f->nodes, ni);
+  fheap_node_t *r, *lo, *hi;
+  u32 ri, lo_i, hi_i, k;
+
+  while (1)
+    {
+      k = n->rank;
+      vec_validate_init_empty (f->root_list_by_rank, k, ~0);
+      ri = f->root_list_by_rank[k];
+      r = fheap_get_node (f, ri);
+      if (!r)
+	{
+	  f->root_list_by_rank[k] = ni;
+	  return;
+	}
+
+      f->root_list_by_rank[k] = ~0;
+
+      /* Sort n/r into lo/hi by their keys. */
+      lo = r, lo_i = ri;
+      hi = n, hi_i = ni;
+      if (hi->key < lo->key)
+	{
+	  u32 ti;
+	  fheap_node_t *tn;
+	  ti = lo_i, tn = lo;
+	  lo = hi, lo_i = hi_i;
+	  hi = tn, hi_i = ti;
+	}
+
+      /* Remove larger key. */
+      fheap_node_remove (f, hi_i);
+
+      /* Add larger key as child of smaller one. */
+      if (lo->first_child == ~0)
+	{
+	  hi->parent = lo_i;
+	  lo->first_child = hi_i;
+	  lo->rank = 1;
+	}
+      else
+	fheap_node_add_sibling (f, lo->first_child, hi_i);
+
+      /* Following Fredman & Trajan: "When making a root node X a child of another node in a linking step,
+         we unmark X". */
+      hi->is_marked = 0;
+
+      ni = lo_i;
+      n = lo;
+    }
+}
+
+u32
+fheap_del_min (fheap_t * f, u32 * min_key)
+{
+  fheap_node_t *r = fheap_get_root (f);
+  u32 to_delete_min_ri = f->min_root;
+  u32 ri, ni;
+
+  /* Empty heap? */
+  if (!r)
+    return ~0;
+
+  /* Root's children become siblings.  Call this step a; see below. */
+  if (r->first_child != ~0)
+    {
+      u32 ci, cni, rni;
+      fheap_node_t *c, *cn, *rn;
+
+      /* Splice child & root circular lists together. */
+      ci = r->first_child;
+      c = vec_elt_at_index (f->nodes, ci);
+
+      cni = c->next_sibling;
+      rni = r->next_sibling;
+      cn = vec_elt_at_index (f->nodes, cni);
+      rn = vec_elt_at_index (f->nodes, rni);
+
+      r->next_sibling = cni;
+      c->next_sibling = rni;
+      cn->prev_sibling = to_delete_min_ri;
+      rn->prev_sibling = ci;
+    }
+
+  /* Remove min root. */
+  ri = fheap_node_remove_and_invalidate (f, to_delete_min_ri);
+
+  /* Find new min root from among siblings including the ones we've just added. */
+  f->min_root = ~0;
+  if (ri != ~0)
+    {
+      u32 ri_last, ri_next, i, min_ds;
+
+      r = fheap_get_node (f, ri);
+      ri_last = r->prev_sibling;
+      while (1)
+	{
+	  /* Step a above can put children (with r->parent != ~0) on root list. */
+	  r->parent = ~0;
+
+	  ri_next = r->next_sibling;
+	  fheap_link_root (f, ri);
+	  if (ri == ri_last)
+	    break;
+	  ri = ri_next;
+	  r = fheap_get_node (f, ri);
+	}
+
+      min_ds = ~0;
+      vec_foreach_index (i, f->root_list_by_rank)
+      {
+	ni = f->root_list_by_rank[i];
+	if (ni == ~0)
+	  continue;
+	f->root_list_by_rank[i] = ~0;
+	r = fheap_get_node (f, ni);
+	if (r->key < min_ds)
+	  {
+	    f->min_root = ni;
+	    min_ds = r->key;
+	    ASSERT (r->parent == ~0);
+	  }
+      }
+    }
+
+  /* Return deleted min root. */
+  r = vec_elt_at_index (f->nodes, to_delete_min_ri);
+  if (min_key)
+    *min_key = r->key;
+
+  fheap_validate (f);
+
+  return to_delete_min_ri;
+}
+
+static void
+fheap_mark_parent (fheap_t * f, u32 pi)
+{
+  fheap_node_t *p = vec_elt_at_index (f->nodes, pi);
+
+  /* Parent is a root: do nothing. */
+  if (p->parent == ~0)
+    return;
+
+  /* If not marked, mark it. */
+  if (!p->is_marked)
+    {
+      p->is_marked = 1;
+      return;
+    }
+
+  /* Its a previously marked, non-root parent.
+     Cut edge to its parent and add to root list. */
+  fheap_node_remove (f, pi);
+  fheap_node_add_sibling (f, f->min_root, pi);
+
+  /* Unmark it since its now a root node. */
+  p->is_marked = 0;
+
+  /* "Cascading cuts": check parent. */
+  if (p->parent != ~0)
+    fheap_mark_parent (f, p->parent);
+}
+
+/* Set key to new smaller value. */
+void
+fheap_decrease_key (fheap_t * f, u32 ni, u32 new_key)
+{
+  fheap_node_t *n = vec_elt_at_index (f->nodes, ni);
+  fheap_node_t *r = fheap_get_root (f);
+
+  n->key = new_key;
+
+  if (n->parent != ~0)
+    {
+      fheap_mark_parent (f, n->parent);
+
+      /* Remove node and add to root list. */
+      fheap_node_remove (f, ni);
+      fheap_node_add_sibling (f, f->min_root, ni);
+    }
+
+  if (n->key < r->key)
+    f->min_root = ni;
+
+  fheap_validate (f);
+}
+
+void
+fheap_del (fheap_t * f, u32 ni)
+{
+  fheap_node_t *n;
+
+  n = vec_elt_at_index (f->nodes, ni);
+
+  if (n->parent == ~0)
+    {
+      ASSERT (ni == f->min_root);
+      fheap_del_min (f, 0);
+    }
+  else
+    {
+      u32 ci;
+
+      fheap_mark_parent (f, n->parent);
+
+      /* Add children to root list. */
+      foreach_fheap_node_sibling (f, ci, n->first_child, (
+							   {
+							   fheap_node_remove
+							   (f, ci);
+							   fheap_node_add_sibling
+							   (f, f->min_root,
+							    ci);}
+				  ));
+
+      fheap_node_remove_and_invalidate (f, ni);
+    }
+
+  fheap_validate (f);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/fheap.h b/src/vppinfra/fheap.h
new file mode 100644
index 00000000..6d4965f1
--- /dev/null
+++ b/src/vppinfra/fheap.h
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_clib_fheap_h
+#define included_clib_fheap_h
+
+/* Fibonacci Heaps Fredman, M. L.; Tarjan (1987).
+   "Fibonacci heaps and their uses in improved network optimization algorithms" */
+
+#include <vppinfra/vec.h>
+
+typedef struct
+{
+  /* Node index of parent. */
+  u32 parent;
+
+  /* Node index of first child. */
+  u32 first_child;
+
+  /* Next and previous nodes in doubly linked list of siblings. */
+  u32 next_sibling, prev_sibling;
+
+  /* Key (distance) for this node.  Parent always has key
+     <= than keys of children. */
+  u32 key;
+
+  /* Number of children (as opposed to descendents). */
+  u32 rank;
+
+  u32 is_marked;
+
+  /* Set to one when node is inserted; zero when deleted. */
+  u32 is_valid;
+} fheap_node_t;
+
+#define foreach_fheap_node_sibling(f,ni,first_ni,body)			\
+do {									\
+  u32 __fheap_foreach_first_ni = (first_ni);				\
+  u32 __fheap_foreach_ni = __fheap_foreach_first_ni;			\
+  u32 __fheap_foreach_next_ni;						\
+  fheap_node_t * __fheap_foreach_n;					\
+  if (__fheap_foreach_ni != ~0)						\
+    while (1)								\
+      {									\
+	__fheap_foreach_n = fheap_get_node ((f), __fheap_foreach_ni);	\
+	__fheap_foreach_next_ni = __fheap_foreach_n -> next_sibling;	\
+	(ni) = __fheap_foreach_ni;					\
+									\
+	body;								\
+									\
+	/* End of circular list? */					\
+	if (__fheap_foreach_next_ni == __fheap_foreach_first_ni)	\
+	  break;							\
+									\
+	__fheap_foreach_ni = __fheap_foreach_next_ni;			\
+									\
+      }									\
+} while (0)
+
+typedef struct
+{
+  u32 min_root;
+
+  /* Vector of nodes. */
+  fheap_node_t *nodes;
+
+  u32 *root_list_by_rank;
+
+  u32 enable_validate;
+
+  u32 validate_serial;
+} fheap_t;
+
+/* Initialize empty heap. */
+always_inline void
+fheap_init (fheap_t * f, u32 n_nodes)
+{
+  fheap_node_t *save_nodes = f->nodes;
+  u32 *save_root_list = f->root_list_by_rank;
+
+  memset (f, 0, sizeof (f[0]));
+
+  f->nodes = save_nodes;
+  f->root_list_by_rank = save_root_list;
+
+  vec_validate (f->nodes, n_nodes - 1);
+  vec_reset_length (f->root_list_by_rank);
+
+  f->min_root = ~0;
+}
+
+always_inline void
+fheap_free (fheap_t * f)
+{
+  vec_free (f->nodes);
+  vec_free (f->root_list_by_rank);
+}
+
+always_inline u32
+fheap_find_min (fheap_t * f)
+{
+  return f->min_root;
+}
+
+always_inline u32
+fheap_is_empty (fheap_t * f)
+{
+  return f->min_root == ~0;
+}
+
+/* Add/delete nodes. */
+void fheap_add (fheap_t * f, u32 ni, u32 key);
+void fheap_del (fheap_t * f, u32 ni);
+
+/* Delete and return minimum. */
+u32 fheap_del_min (fheap_t * f, u32 * min_key);
+
+/* Change key value. */
+void fheap_decrease_key (fheap_t * f, u32 ni, u32 new_key);
+
+#endif /* included_clib_fheap_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/fifo.c b/src/vppinfra/fifo.c
new file mode 100644
index 00000000..5b4c76d1
--- /dev/null
+++ b/src/vppinfra/fifo.c
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/cache.h>
+#include <vppinfra/fifo.h>
+#include <vppinfra/error.h>
+#include <vppinfra/string.h>
+
+/*
+  General first in/first out queues.
+  FIFOs can have arbitrary size and type.
+  Let T be any type (i.e. char, int, struct foo, etc.).
+
+  A null fifo is initialized:
+
+    T * f = 0;
+
+  For example, typedef struct { int a, b; } T;
+
+  Elements can be added in 3 ways.
+
+    #1 1 element is added:
+       T x;
+       x.a = 10; x.b = 20;
+       fifo_add1 (f, x);
+
+    #2 n elements are added
+       T buf[10];
+       initialize buf[0] .. buf[9];
+       fifo_add (f, buf, 10);
+
+    #3 1 element is added, pointer is returned
+       T * x;
+       fifo_add2 (f, x);
+       x->a = 10;
+       x->b = 20;
+
+   Elements are removed 1 at a time:
+       T x;
+       fifo_sub1 (f, x);
+
+   fifo_free (f) frees fifo.
+*/
+
+void *
+_clib_fifo_resize (void *v_old, uword n_new_elts, uword elt_bytes)
+{
+  void *v_new, *end, *head;
+  uword n_old_elts, header_bytes;
+  uword n_copy_bytes, n_zero_bytes;
+  clib_fifo_header_t *f_new, *f_old;
+
+  n_old_elts = clib_fifo_elts (v_old);
+  n_new_elts += n_old_elts;
+  if (n_new_elts < 32)
+    n_new_elts = 32;
+  else
+    n_new_elts = max_pow2 (n_new_elts);
+
+  header_bytes = vec_header_bytes (sizeof (clib_fifo_header_t));
+
+  v_new = clib_mem_alloc_no_fail (n_new_elts * elt_bytes + header_bytes);
+  v_new += header_bytes;
+
+  f_new = clib_fifo_header (v_new);
+  f_new->head_index = 0;
+  f_new->tail_index = n_old_elts;
+  _vec_len (v_new) = n_new_elts;
+
+  /* Copy old -> new. */
+  n_copy_bytes = n_old_elts * elt_bytes;
+  if (n_copy_bytes > 0)
+    {
+      f_old = clib_fifo_header (v_old);
+      end = v_old + _vec_len (v_old) * elt_bytes;
+      head = v_old + f_old->head_index * elt_bytes;
+
+      if (head + n_copy_bytes >= end)
+	{
+	  uword n = end - head;
+	  clib_memcpy (v_new, head, n);
+	  clib_memcpy (v_new + n, v_old, n_copy_bytes - n);
+	}
+      else
+	clib_memcpy (v_new, head, n_copy_bytes);
+    }
+
+  /* Zero empty space. */
+  n_zero_bytes = (n_new_elts - n_old_elts) * elt_bytes;
+  memset (v_new + n_copy_bytes, 0, n_zero_bytes);
+
+  clib_fifo_free (v_old);
+
+  return v_new;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/fifo.h b/src/vppinfra/fifo.h
new file mode 100644
index 00000000..b0b35e25
--- /dev/null
+++ b/src/vppinfra/fifo.h
@@ -0,0 +1,304 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_fifo_h
+#define included_fifo_h
+
+#include <vppinfra/cache.h>
+#include <vppinfra/error.h>	/* for ASSERT */
+#include <vppinfra/vec.h>
+
+typedef struct
+{
+  /* First index of valid data in fifo. */
+  u32 head_index;
+
+  /* One beyond last index in fifo. */
+  u32 tail_index;
+} clib_fifo_header_t;
+
+always_inline clib_fifo_header_t *
+clib_fifo_header (void *f)
+{
+  return vec_header (f, sizeof (clib_fifo_header_t));
+}
+
+/* Aliases. */
+#define clib_fifo_len(v) vec_len(v)
+#define _clib_fifo_len(v) _vec_len(v)
+#define clib_fifo_end(v) vec_end(v)
+
+always_inline uword
+clib_fifo_elts (void *v)
+{
+  word l, r;
+  clib_fifo_header_t *f = clib_fifo_header (v);
+
+  if (!v)
+    return 0;
+
+  l = _clib_fifo_len (v);
+  r = (word) f->tail_index - (word) f->head_index;
+  r = r < 0 ? r + l : r;
+  ASSERT (r >= 0 && r <= l);
+  return r;
+}
+
+always_inline uword
+clib_fifo_free_elts (void *v)
+{
+  return clib_fifo_len (v) - clib_fifo_elts (v);
+}
+
+always_inline void
+clib_fifo_reset (void *v)
+{
+  clib_fifo_header_t *f = clib_fifo_header (v);
+  if (v)
+    {
+      f->head_index = f->tail_index = 0;
+      _vec_len (v) = 0;
+    }
+}
+
+/* External resize function. */
+void *_clib_fifo_resize (void *v, uword n_elts, uword elt_bytes);
+
+#define clib_fifo_resize(f,n_elts) \
+  f = _clib_fifo_resize ((f), (n_elts), sizeof ((f)[0]))
+
+always_inline void *
+_clib_fifo_validate (void *v, uword n_elts, uword elt_bytes)
+{
+  if (clib_fifo_free_elts (v) < n_elts)
+    v = _clib_fifo_resize (v, n_elts, elt_bytes);
+  return v;
+}
+
+#define clib_fifo_validate(f,n_elts) \
+  f = _clib_fifo_validate ((f), (n_elts), sizeof (f[0]))
+
+/* Advance tail pointer by N_ELTS which can be either positive or negative. */
+always_inline void *
+_clib_fifo_advance_tail (void *v, word n_elts, uword elt_bytes,
+			 uword * tail_return)
+{
+  word i, l, n_free;
+  clib_fifo_header_t *f;
+
+  n_free = clib_fifo_free_elts (v);
+  if (n_free < n_elts)
+    {
+      v = _clib_fifo_resize (v, n_elts, elt_bytes);
+      n_free = clib_fifo_free_elts (v);
+    }
+
+  ASSERT (n_free >= n_elts);
+  n_free -= n_elts;
+
+  f = clib_fifo_header (v);
+  l = _clib_fifo_len (v);
+  i = f->tail_index;
+
+  if (n_free == 0)
+    {
+      /* Mark fifo full. */
+      f->tail_index = f->head_index + l;
+    }
+  else
+    {
+      word n = f->tail_index + n_elts;
+      if (n >= l)
+	n -= l;
+      else if (n < 0)
+	n += l;
+      ASSERT (n >= 0 && n < l);
+      f->tail_index = n;
+    }
+
+  ASSERT (clib_fifo_free_elts (v) == n_free);
+
+  if (tail_return)
+    *tail_return = n_elts > 0 ? i : f->tail_index;
+
+  return v;
+}
+
+#define clib_fifo_advance_tail(f,n_elts)				\
+({									\
+  uword _i;								\
+  (f) = _clib_fifo_advance_tail ((f), (n_elts), sizeof ((f)[0]), &_i);	\
+  (f) + _i;								\
+})
+
+always_inline uword
+clib_fifo_advance_head (void *v, uword n_elts)
+{
+  clib_fifo_header_t *f;
+  uword l, i, n;
+
+  ASSERT (clib_fifo_elts (v) >= n_elts);
+  f = clib_fifo_header (v);
+  l = _clib_fifo_len (v);
+
+  /* If fifo was full, restore tail pointer. */
+  if (f->tail_index == f->head_index + l)
+    f->tail_index = f->head_index;
+
+  n = i = f->head_index;
+  n += n_elts;
+  n = n >= l ? n - l : n;
+  ASSERT (n < l);
+  f->head_index = n;
+
+  return i;
+}
+
+/* Add given element to fifo. */
+#define clib_fifo_add1(f,e)					\
+do {								\
+  uword _i;							\
+  (f) = _clib_fifo_advance_tail ((f), 1, sizeof ((f)[0]), &_i);	\
+  (f)[_i] = (e);						\
+} while (0)
+
+/* Add element to fifo; return pointer to new element. */
+#define clib_fifo_add2(f,p)					\
+do {								\
+  uword _i;							\
+  (f) = _clib_fifo_advance_tail ((f), 1, sizeof ((f)[0]), &_i);	\
+  (p) = (f) + _i;						\
+} while (0)
+
+/* Add several elements to fifo. */
+#define clib_fifo_add(f,e,n)						\
+do {									\
+  uword _i, _l; word _n0, _n1;						\
+									\
+  _n0 = (n);								\
+  (f) = _clib_fifo_advance_tail ((f), _n0, sizeof ((f)[0]), &_i);	\
+  _l = clib_fifo_len (f);						\
+  _n1 = _i + _n0 - _l;							\
+  _n1 = _n1 < 0 ? 0 : _n1;						\
+  _n0 -= _n1;								\
+  clib_memcpy ((f) + _i, (e), _n0 * sizeof ((f)[0]));			\
+  if (_n1)								\
+    clib_memcpy ((f) + 0, (e) + _n0, _n1 * sizeof ((f)[0]));		\
+} while (0)
+
+/* Subtract element from fifo. */
+#define clib_fifo_sub1(f,e)			\
+do {						\
+  uword _i;					\
+  ASSERT (clib_fifo_elts (f) >= 1);		\
+  _i = clib_fifo_advance_head ((f), 1);		\
+  (e) = (f)[_i];				\
+} while (0)
+
+#define clib_fifo_sub2(f,p)			\
+do {						\
+  uword _i;					\
+  ASSERT (clib_fifo_elts (f) >= 1);		\
+  _i = clib_fifo_advance_head ((f), 1);		\
+  (p) = (f) + _i;				\
+} while (0)
+
+always_inline uword
+clib_fifo_head_index (void *v)
+{
+  clib_fifo_header_t *f = clib_fifo_header (v);
+  return v ? f->head_index : 0;
+}
+
+always_inline uword
+clib_fifo_tail_index (void *v)
+{
+  clib_fifo_header_t *f = clib_fifo_header (v);
+  return v ? f->tail_index : 0;
+}
+
+#define clib_fifo_head(v) ((v) + clib_fifo_head_index (v))
+#define clib_fifo_tail(v) ((v) + clib_fifo_tail_index (v))
+
+#define clib_fifo_free(f) vec_free_h((f),sizeof(clib_fifo_header_t))
+
+always_inline uword
+clib_fifo_elt_index (void *v, uword i)
+{
+  clib_fifo_header_t *f = clib_fifo_header (v);
+  uword result = 0;
+
+  ASSERT (i < clib_fifo_elts (v));
+
+  if (v)
+    {
+      result = f->head_index + i;
+      if (result >= _vec_len (v))
+	result -= _vec_len (v);
+    }
+
+  return result;
+}
+
+#define clib_fifo_elt_at_index(v,i) ((v) + clib_fifo_elt_index (v, (i)))
+
+#define clib_fifo_foreach(v,f,body)		\
+do {						\
+  uword _i, _l, _n;				\
+						\
+  _i = clib_fifo_head_index (f);		\
+  _l = clib_fifo_len (f);			\
+  _n = clib_fifo_elts (f);			\
+  while (_n > 0)				\
+    {						\
+      (v) = (f) + _i;				\
+      do { body; } while (0);			\
+      _n--;					\
+      _i++;					\
+      _i = _i >= _l ? 0 : _i;			\
+    }						\
+} while (0)
+
+#endif /* included_fifo_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/format.c b/src/vppinfra/format.c
new file mode 100644
index 00000000..78e52e9a
--- /dev/null
+++ b/src/vppinfra/format.c
@@ -0,0 +1,814 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*------------------------------------------------------------------
+ * format.c -- see notice below
+ *
+ * October 2003, Eliot Dresselhaus
+ *
+ * Modifications to this file Copyright (c) 2003 by cisco Systems, Inc.
+ * All rights reserved.
+ *------------------------------------------------------------------
+ */
+
+/*
+  Copyright (c) 2001, 2002, 2003, 2006 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <stdarg.h>		/* va_start, etc */
+
+#ifdef CLIB_UNIX
+#include <unistd.h>
+#include <stdio.h>
+#endif
+
+#ifdef CLIB_STANDALONE
+#include <vppinfra/standalone_stdio.h>
+#endif
+
+#include <vppinfra/mem.h>
+#include <vppinfra/format.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/error.h>
+#include <vppinfra/string.h>
+#include <vppinfra/os.h>	/* os_puts */
+
+typedef struct
+{
+  /* Output number in this base. */
+  u8 base;
+
+  /* Number of show of 64 bit number. */
+  u8 n_bits;
+
+  /* Signed or unsigned. */
+  u8 is_signed;
+
+  /* Output digits uppercase (not lowercase) %X versus %x. */
+  u8 uppercase_digits;
+} format_integer_options_t;
+
+static u8 *format_integer (u8 * s, u64 number,
+			   format_integer_options_t * options);
+static u8 *format_float (u8 * s, f64 x, uword n_digits_to_print,
+			 uword output_style);
+
+typedef struct
+{
+  /* String justification: + => right, - => left, = => center. */
+  uword justify;
+
+  /* Width of string (before and after decimal point for numbers).
+     0 => natural width. */
+  uword width[2];
+
+  /* Long => 'l', long long 'L', int 0. */
+  uword how_long;
+
+  /* Pad character.  Defaults to space. */
+  uword pad_char;
+} format_info_t;
+
+static u8 *
+justify (u8 * s, format_info_t * fi, uword s_len_orig)
+{
+  uword i0, l0, l1;
+
+  i0 = s_len_orig;
+  l0 = i0 + fi->width[0];
+  l1 = vec_len (s);
+
+  /* If width is zero user returned width. */
+  if (l0 == i0)
+    l0 = l1;
+
+  if (l1 > l0)
+    _vec_len (s) = l0;
+  else if (l0 > l1)
+    {
+      uword n = l0 - l1;
+      uword n_left = 0, n_right = 0;
+
+      switch (fi->justify)
+	{
+	case '-':
+	  n_right = n;
+	  break;
+
+	case '+':
+	  n_left = n;
+	  break;
+
+	case '=':
+	  n_right = n_left = n / 2;
+	  if (n % 2)
+	    n_left++;
+	  break;
+	}
+      if (n_left > 0)
+	{
+	  vec_insert (s, n_left, i0);
+	  memset (s + i0, fi->pad_char, n_left);
+	  l1 = vec_len (s);
+	}
+      if (n_right > 0)
+	{
+	  vec_resize (s, n_right);
+	  memset (s + l1, fi->pad_char, n_right);
+	}
+    }
+  return s;
+}
+
+static u8 *
+do_percent (u8 ** _s, u8 * fmt, va_list * va)
+{
+  u8 *s = *_s;
+  uword c;
+
+  u8 *f = fmt;
+
+  format_info_t fi = {
+    .justify = '+',
+    .width = {0},
+    .pad_char = ' ',
+    .how_long = 0,
+  };
+
+  uword i;
+
+  ASSERT (f[0] == '%');
+
+  switch (c = *++f)
+    {
+    case '%':
+      /* %% => % */
+      vec_add1 (s, c);
+      f++;
+      goto done;
+
+    case '-':
+    case '+':
+    case '=':
+      fi.justify = c;
+      c = *++f;
+      break;
+    }
+
+  /* Parse width0 . width1. */
+  {
+    uword is_first_digit = 1;
+
+    fi.width[0] = fi.width[1] = 0;
+    for (i = 0; i < 2; i++)
+      {
+	if (c == '0' && i == 0 && is_first_digit)
+	  fi.pad_char = '0';
+	is_first_digit = 0;
+	if (c == '*')
+	  {
+	    fi.width[i] = va_arg (*va, int);
+	    c = *++f;
+	  }
+	else
+	  {
+	    while (c >= '0' && c <= '9')
+	      {
+		fi.width[i] = 10 * fi.width[i] + (c - '0');
+		c = *++f;
+	      }
+	  }
+	if (c != '.')
+	  break;
+	c = *++f;
+      }
+  }
+
+  /* Parse %l* and %L* */
+  switch (c)
+    {
+    case 'w':
+      /* word format. */
+      fi.how_long = 'w';
+      c = *++f;
+      break;
+
+    case 'L':
+    case 'l':
+      fi.how_long = c;
+      c = *++f;
+      if (c == 'l' && *f == 'l')
+	{
+	  fi.how_long = 'L';
+	  c = *++f;
+	}
+      break;
+    }
+
+  /* Finally we are ready for format letter. */
+  if (c != 0)
+    {
+      uword s_initial_len = vec_len (s);
+      format_integer_options_t o = {
+	.is_signed = 0,
+	.base = 10,
+	.n_bits = BITS (uword),
+	.uppercase_digits = 0,
+      };
+
+      f++;
+
+      switch (c)
+	{
+	default:
+	  {
+	    /* Try to give a helpful error message. */
+	    vec_free (s);
+	    s = format (s, "**** CLIB unknown format `%%%c' ****", c);
+	    goto done;
+	  }
+
+	case 'c':
+	  vec_add1 (s, va_arg (*va, int));
+	  break;
+
+	case 'p':
+	  vec_add1 (s, '0');
+	  vec_add1 (s, 'x');
+
+	  o.is_signed = 0;
+	  o.n_bits = BITS (uword *);
+	  o.base = 16;
+	  o.uppercase_digits = 0;
+
+	  s = format_integer (s, pointer_to_uword (va_arg (*va, void *)), &o);
+	  break;
+
+	case 'x':
+	case 'X':
+	case 'u':
+	case 'd':
+	  {
+	    u64 number;
+
+	    o.base = 10;
+	    if (c == 'x' || c == 'X')
+	      o.base = 16;
+	    o.is_signed = c == 'd';
+	    o.uppercase_digits = c == 'X';
+
+	    switch (fi.how_long)
+	      {
+	      case 'L':
+		number = va_arg (*va, unsigned long long);
+		o.n_bits = BITS (unsigned long long);
+		break;
+
+	      case 'l':
+		number = va_arg (*va, long);
+		o.n_bits = BITS (long);
+		break;
+
+	      case 'w':
+		number = va_arg (*va, word);
+		o.n_bits = BITS (uword);
+		break;
+
+	      default:
+		number = va_arg (*va, int);
+		o.n_bits = BITS (int);
+		break;
+	      }
+
+	    s = format_integer (s, number, &o);
+	  }
+	  break;
+
+	case 's':
+	case 'S':
+	  {
+	    char *cstring = va_arg (*va, char *);
+	    uword len;
+
+	    if (!cstring)
+	      {
+		cstring = "(nil)";
+		len = 5;
+	      }
+	    else if (fi.width[1] != 0)
+	      len = clib_min (strlen (cstring), fi.width[1]);
+	    else
+	      len = strlen (cstring);
+
+	    /* %S => format string as C identifier (replace _ with space). */
+	    if (c == 'S')
+	      {
+		for (i = 0; i < len; i++)
+		  vec_add1 (s, cstring[i] == '_' ? ' ' : cstring[i]);
+	      }
+	    else
+	      vec_add (s, cstring, len);
+	  }
+	  break;
+
+	case 'v':
+	  {
+	    u8 *v = va_arg (*va, u8 *);
+	    uword len;
+
+	    if (fi.width[1] != 0)
+	      len = clib_min (vec_len (v), fi.width[1]);
+	    else
+	      len = vec_len (v);
+
+	    vec_add (s, v, len);
+	  }
+	  break;
+
+	case 'f':
+	case 'g':
+	case 'e':
+	  /* Floating point. */
+	  ASSERT (fi.how_long == 0 || fi.how_long == 'l');
+	  s = format_float (s, va_arg (*va, double), fi.width[1], c);
+	  break;
+
+	case 'U':
+	  /* User defined function. */
+	  {
+	    typedef u8 *(user_func_t) (u8 * s, va_list * args);
+	    user_func_t *u = va_arg (*va, user_func_t *);
+
+	    s = (*u) (s, va);
+	  }
+	  break;
+	}
+
+      s = justify (s, &fi, s_initial_len);
+    }
+
+done:
+  *_s = s;
+  return f;
+}
+
+u8 *
+va_format (u8 * s, const char *fmt, va_list * va)
+{
+  u8 *f = (u8 *) fmt, *g;
+  u8 c;
+
+  g = f;
+  while (1)
+    {
+      c = *f;
+
+      if (!c)
+	break;
+
+      if (c == '%')
+	{
+	  if (f > g)
+	    vec_add (s, g, f - g);
+	  f = g = do_percent (&s, f, va);
+	}
+      else
+	{
+	  f++;
+	}
+    }
+
+  if (f > g)
+    vec_add (s, g, f - g);
+
+  return s;
+}
+
+u8 *
+format (u8 * s, const char *fmt, ...)
+{
+  va_list va;
+  va_start (va, fmt);
+  s = va_format (s, fmt, &va);
+  va_end (va);
+  return s;
+}
+
+word
+va_fformat (FILE * f, char *fmt, va_list * va)
+{
+  word ret;
+  u8 *s;
+
+  s = va_format (0, fmt, va);
+
+#ifdef CLIB_UNIX
+  if (f)
+    {
+      ret = fwrite (s, vec_len (s), 1, f);
+    }
+  else
+#endif /* CLIB_UNIX */
+    {
+      ret = 0;
+      os_puts (s, vec_len (s), /* is_error */ 0);
+    }
+
+  vec_free (s);
+  return ret;
+}
+
+word
+fformat (FILE * f, char *fmt, ...)
+{
+  va_list va;
+  word ret;
+
+  va_start (va, fmt);
+  ret = va_fformat (f, fmt, &va);
+  va_end (va);
+
+  return (ret);
+}
+
+#ifdef CLIB_UNIX
+word
+fdformat (int fd, char *fmt, ...)
+{
+  word ret;
+  u8 *s;
+  va_list va;
+
+  va_start (va, fmt);
+  s = va_format (0, fmt, &va);
+  va_end (va);
+
+  ret = write (fd, s, vec_len (s));
+  vec_free (s);
+  return ret;
+}
+#endif
+
+/* Format integral type. */
+static u8 *
+format_integer (u8 * s, u64 number, format_integer_options_t * options)
+{
+  u64 q;
+  u32 r;
+  u8 digit_buffer[128];
+  u8 *d = digit_buffer + sizeof (digit_buffer);
+  word c, base;
+
+  if (options->is_signed && (i64) number < 0)
+    {
+      number = -number;
+      vec_add1 (s, '-');
+    }
+
+  if (options->n_bits < BITS (number))
+    number &= ((u64) 1 << options->n_bits) - 1;
+
+  base = options->base;
+
+  while (1)
+    {
+      q = number / base;
+      r = number % base;
+
+      if (r < 10 + 26 + 26)
+	{
+	  if (r < 10)
+	    c = '0' + r;
+	  else if (r < 10 + 26)
+	    c = 'a' + (r - 10);
+	  else
+	    c = 'A' + (r - 10 - 26);
+
+	  if (options->uppercase_digits
+	      && base <= 10 + 26 && c >= 'a' && c <= 'z')
+	    c += 'A' - 'a';
+
+	  *--d = c;
+	}
+      else			/* will never happen, warning be gone */
+	{
+	  *--d = '?';
+	}
+
+      if (q == 0)
+	break;
+
+      number = q;
+    }
+
+  vec_add (s, d, digit_buffer + sizeof (digit_buffer) - d);
+  return s;
+}
+
+/* Floating point formatting. */
+/* Deconstruct IEEE 64 bit number into sign exponent and fraction. */
+#define f64_down(f,sign,expon,fraction)				\
+do {								\
+  union { u64 u; f64 f; } _f64_down_tmp;			\
+  _f64_down_tmp.f = (f);					\
+  (sign) = (_f64_down_tmp.u >> 63);				\
+  (expon) = ((_f64_down_tmp.u >> 52) & 0x7ff) - 1023;		\
+  (fraction) = ((_f64_down_tmp.u << 12) >> 12) | ((u64) 1 << 52); \
+} while (0)
+
+/* Construct IEEE 64 bit number. */
+static f64
+f64_up (uword sign, word expon, u64 fraction)
+{
+  union
+  {
+    u64 u;
+    f64 f;
+  } tmp;
+
+  tmp.u = (u64) ((sign) != 0) << 63;
+
+  expon += 1023;
+  if (expon > 1023)
+    expon = 1023;
+  if (expon < 0)
+    expon = 0;
+  tmp.u |= (u64) expon << 52;
+
+  tmp.u |= fraction & (((u64) 1 << 52) - 1);
+
+  return tmp.f;
+}
+
+/* Returns approximate precision of number given its exponent. */
+static f64
+f64_precision (int base2_expon)
+{
+  static int n_bits = 0;
+
+  if (!n_bits)
+    {
+      /* Compute number of significant bits in floating point representation. */
+      f64 one = 0;
+      f64 small = 1;
+
+      while (one != 1)
+	{
+	  small *= .5;
+	  n_bits++;
+	  one = 1 + small;
+	}
+    }
+
+  return f64_up (0, base2_expon - n_bits, 0);
+}
+
+/* Return x 10^n */
+static f64
+times_power_of_ten (f64 x, int n)
+{
+  if (n >= 0)
+    {
+      static f64 t[8] = { 1e+0, 1e+1, 1e+2, 1e+3, 1e+4, 1e+5, 1e+6, 1e+7, };
+      while (n >= 8)
+	{
+	  x *= 1e+8;
+	  n -= 8;
+	}
+      return x * t[n];
+    }
+  else
+    {
+      static f64 t[8] = { 1e-0, 1e-1, 1e-2, 1e-3, 1e-4, 1e-5, 1e-6, 1e-7, };
+      while (n <= -8)
+	{
+	  x *= 1e-8;
+	  n += 8;
+	}
+      return x * t[-n];
+    }
+
+}
+
+/* Write x = y * 10^expon with 1 < y < 10. */
+static f64
+normalize (f64 x, word * expon_return, f64 * prec_return)
+{
+  word expon2, expon10;
+  CLIB_UNUSED (u64 fraction);
+  CLIB_UNUSED (word sign);
+  f64 prec;
+
+  f64_down (x, sign, expon2, fraction);
+
+  expon10 =
+    .5 +
+    expon2 * .301029995663981195213738894724493 /* Log (2) / Log (10) */ ;
+
+  prec = f64_precision (expon2);
+  x = times_power_of_ten (x, -expon10);
+  prec = times_power_of_ten (prec, -expon10);
+
+  while (x < 1)
+    {
+      x *= 10;
+      prec *= 10;
+      expon10--;
+    }
+
+  while (x > 10)
+    {
+      x *= .1;
+      prec *= .1;
+      expon10++;
+    }
+
+  if (x + prec >= 10)
+    {
+      x = 1;
+      expon10++;
+    }
+
+  *expon_return = expon10;
+  *prec_return = prec;
+
+  return x;
+}
+
+static u8 *
+add_some_zeros (u8 * s, uword n_zeros)
+{
+  while (n_zeros > 0)
+    {
+      vec_add1 (s, '0');
+      n_zeros--;
+    }
+  return s;
+}
+
+/* Format a floating point number with the given number of fractional
+   digits (e.g. 1.2345 with 2 fraction digits yields "1.23") and output style. */
+static u8 *
+format_float (u8 * s, f64 x, uword n_fraction_digits, uword output_style)
+{
+  f64 prec;
+  word sign, expon, n_fraction_done, added_decimal_point;
+  /* Position of decimal point relative to where we are. */
+  word decimal_point;
+
+  /* Default number of digits to print when its not specified. */
+  if (n_fraction_digits == ~0)
+    n_fraction_digits = 7;
+  n_fraction_done = 0;
+  decimal_point = 0;
+  added_decimal_point = 0;
+  sign = expon = 0;
+
+  /* Special case: zero. */
+  if (x == 0)
+    {
+    do_zero:
+      vec_add1 (s, '0');
+      goto done;
+    }
+
+  if (x < 0)
+    {
+      x = -x;
+      sign = 1;
+    }
+
+  /* Check for infinity. */
+  if (x == x / 2)
+    return format (s, "%cinfinity", sign ? '-' : '+');
+
+  x = normalize (x, &expon, &prec);
+
+  /* Not enough digits to print anything: so just print 0 */
+  if ((word) - expon > (word) n_fraction_digits
+      && (output_style == 'f' || (output_style == 'g')))
+    goto do_zero;
+
+  if (sign)
+    vec_add1 (s, '-');
+
+  if (output_style == 'f'
+      || (output_style == 'g' && expon > -10 && expon < 10))
+    {
+      if (expon < 0)
+	{
+	  /* Add decimal point and leading zeros. */
+	  vec_add1 (s, '.');
+	  n_fraction_done = clib_min (-(expon + 1), n_fraction_digits);
+	  s = add_some_zeros (s, n_fraction_done);
+	  decimal_point = -n_fraction_done;
+	  added_decimal_point = 1;
+	}
+      else
+	decimal_point = expon + 1;
+    }
+  else
+    {
+      /* Exponential output style. */
+      decimal_point = 1;
+      output_style = 'e';
+    }
+
+  while (1)
+    {
+      uword digit;
+
+      /* Number is smaller than precision: call it zero. */
+      if (x < prec)
+	break;
+
+      digit = x;
+      x -= digit;
+      if (x + prec >= 1)
+	{
+	  digit++;
+	  x -= 1;
+	}
+
+      /* Round last printed digit. */
+      if (decimal_point <= 0
+	  && n_fraction_done + 1 == n_fraction_digits && digit < 9)
+	digit += x >= .5;
+
+      vec_add1 (s, '0' + digit);
+
+      /* Move rightwards towards/away from decimal point. */
+      decimal_point--;
+
+      n_fraction_done += decimal_point < 0;
+      if (decimal_point <= 0 && n_fraction_done >= n_fraction_digits)
+	break;
+
+      if (decimal_point == 0 && x != 0)
+	{
+	  vec_add1 (s, '.');
+	  added_decimal_point = 1;
+	}
+
+      x *= 10;
+      prec *= 10;
+    }
+
+done:
+  if (decimal_point > 0)
+    {
+      s = add_some_zeros (s, decimal_point);
+      decimal_point = 0;
+    }
+
+  if (n_fraction_done < n_fraction_digits)
+    {
+      if (!added_decimal_point)
+	vec_add1 (s, '.');
+      s = add_some_zeros (s, n_fraction_digits - n_fraction_done);
+    }
+
+  if (output_style == 'e')
+    s = format (s, "e%wd", expon);
+
+  return s;
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/format.h b/src/vppinfra/format.h
new file mode 100644
index 00000000..bc0d6d15
--- /dev/null
+++ b/src/vppinfra/format.h
@@ -0,0 +1,331 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_format_h
+#define included_format_h
+
+#include <stdarg.h>
+
+#include <vppinfra/clib.h>	/* for CLIB_UNIX, etc. */
+#include <vppinfra/vec.h>
+#include <vppinfra/error.h>	/* for ASSERT */
+#include <vppinfra/string.h>
+
+typedef u8 *(format_function_t) (u8 * s, va_list * args);
+
+u8 *va_format (u8 * s, const char *format, va_list * args);
+u8 *format (u8 * s, const char *format, ...);
+
+#ifdef CLIB_UNIX
+
+#include <stdio.h>
+
+#else /* ! CLIB_UNIX */
+
+/* We're not Unix and have not stdio.h */
+#define FILE void
+#define stdin ((FILE *) 0)
+#define stdout ((FILE *) 1)
+#define stderr ((FILE *) 2)
+
+#endif
+
+word va_fformat (FILE * f, char *fmt, va_list * va);
+word fformat (FILE * f, char *fmt, ...);
+word fdformat (int fd, char *fmt, ...);
+
+always_inline uword
+format_get_indent (u8 * s)
+{
+  uword indent = 0;
+  u8 *nl;
+
+  if (!s)
+    return indent;
+
+  nl = vec_end (s) - 1;
+  while (nl >= s)
+    {
+      if (*nl-- == '\n')
+	break;
+      indent++;
+    }
+  return indent;
+}
+
+#define _(f) u8 * f (u8 * s, va_list * va)
+
+/* Standard user-defined formats. */
+_(format_vec32);
+_(format_vec_uword);
+_(format_ascii_bytes);
+_(format_hex_bytes);
+_(format_white_space);
+_(format_f64);
+_(format_time_interval);
+
+#ifdef CLIB_UNIX
+/* Unix specific formats. */
+_(format_address_family);
+_(format_unix_arphrd);
+_(format_unix_interface_flags);
+_(format_network_address);
+_(format_network_protocol);
+_(format_network_port);
+_(format_sockaddr);
+_(format_ip4_tos_byte);
+_(format_ip4_packet);
+_(format_icmp4_type_and_code);
+_(format_ethernet_packet);
+_(format_hostname);
+_(format_timeval);
+_(format_time_float);
+_(format_signal);
+_(format_ucontext_pc);
+#endif
+
+#undef _
+
+/* Unformat. */
+
+typedef struct _unformat_input_t
+{
+  /* Input buffer (vector). */
+  u8 *buffer;
+
+  /* Current index in input buffer. */
+  uword index;
+
+  /* Vector of buffer marks.  Used to delineate pieces of the buffer
+     for error reporting and for parse recovery. */
+  uword *buffer_marks;
+
+  /* User's function to fill the buffer when its empty
+     (and argument). */
+    uword (*fill_buffer) (struct _unformat_input_t * i);
+
+  /* Return values for fill buffer function which indicate whether not
+     input has been exhausted. */
+#define UNFORMAT_END_OF_INPUT (~0)
+#define UNFORMAT_MORE_INPUT   0
+
+  /* User controlled argument to fill buffer function. */
+  void *fill_buffer_arg;
+} unformat_input_t;
+
+always_inline void
+unformat_init (unformat_input_t * i,
+	       uword (*fill_buffer) (unformat_input_t *),
+	       void *fill_buffer_arg)
+{
+  memset (i, 0, sizeof (i[0]));
+  i->fill_buffer = fill_buffer;
+  i->fill_buffer_arg = fill_buffer_arg;
+}
+
+always_inline void
+unformat_free (unformat_input_t * i)
+{
+  vec_free (i->buffer);
+  vec_free (i->buffer_marks);
+  memset (i, 0, sizeof (i[0]));
+}
+
+always_inline uword
+unformat_check_input (unformat_input_t * i)
+{
+  /* Low level fill input function. */
+  extern uword _unformat_fill_input (unformat_input_t * i);
+
+  if (i->index >= vec_len (i->buffer) && i->index != UNFORMAT_END_OF_INPUT)
+    _unformat_fill_input (i);
+
+  return i->index;
+}
+
+/* Return true if input is exhausted */
+always_inline uword
+unformat_is_eof (unformat_input_t * input)
+{
+  return unformat_check_input (input) == UNFORMAT_END_OF_INPUT;
+}
+
+/* Return next element in input vector,
+   possibly calling fill input to get more. */
+always_inline uword
+unformat_get_input (unformat_input_t * input)
+{
+  uword i = unformat_check_input (input);
+  if (i < vec_len (input->buffer))
+    {
+      input->index = i + 1;
+      i = input->buffer[i];
+    }
+  return i;
+}
+
+/* Back up input pointer by one. */
+always_inline void
+unformat_put_input (unformat_input_t * input)
+{
+  input->index -= 1;
+}
+
+/* Peek current input character without advancing. */
+always_inline uword
+unformat_peek_input (unformat_input_t * input)
+{
+  uword c = unformat_get_input (input);
+  if (c != UNFORMAT_END_OF_INPUT)
+    unformat_put_input (input);
+  return c;
+}
+
+/* Skip current input line. */
+always_inline void
+unformat_skip_line (unformat_input_t * i)
+{
+  uword c;
+
+  while ((c = unformat_get_input (i)) != UNFORMAT_END_OF_INPUT && c != '\n')
+    ;
+}
+
+uword unformat_skip_white_space (unformat_input_t * input);
+
+/* Unformat function. */
+typedef uword (unformat_function_t) (unformat_input_t * input,
+				     va_list * args);
+
+/* External functions. */
+
+/* General unformatting function with programmable input stream. */
+uword unformat (unformat_input_t * i, char *fmt, ...);
+
+/* Call user defined parse function.
+   unformat_user (i, f, ...) is equivalent to unformat (i, "%U", f, ...) */
+uword unformat_user (unformat_input_t * input, unformat_function_t * func,
+		     ...);
+
+/* Alternate version which allows for extensions. */
+uword va_unformat (unformat_input_t * i, char *fmt, va_list * args);
+
+/* Setup for unformat of Unix style command line. */
+void unformat_init_command_line (unformat_input_t * input, char *argv[]);
+
+/* Setup for unformat of given string. */
+void unformat_init_string (unformat_input_t * input,
+			   char *string, int string_len);
+
+always_inline void
+unformat_init_cstring (unformat_input_t * input, char *string)
+{
+  unformat_init_string (input, string, strlen (string));
+}
+
+/* Setup for unformat of given vector string; vector will be freed by unformat_string. */
+void unformat_init_vector (unformat_input_t * input, u8 * vector_string);
+
+/* Format function for unformat input usable when an unformat error
+   has occurred. */
+u8 *format_unformat_error (u8 * s, va_list * va);
+
+#define unformat_parse_error(input)						\
+  clib_error_return (0, "parse error `%U'", format_unformat_error, input)
+
+/* Print all input: not just error context. */
+u8 *format_unformat_input (u8 * s, va_list * va);
+
+/* Unformat (parse) function which reads a %s string and converts it
+   to and unformat_input_t. */
+unformat_function_t unformat_input;
+
+/* Parse a line ending with \n and return it. */
+unformat_function_t unformat_line;
+
+/* Parse a line ending with \n and return it as an unformat_input_t. */
+unformat_function_t unformat_line_input;
+
+/* Parse a token containing given set of characters. */
+unformat_function_t unformat_token;
+
+/* Parses a hexstring into a vector of bytes. */
+unformat_function_t unformat_hex_string;
+
+/* Returns non-zero match if input is exhausted.
+   Useful to ensure that the entire input matches with no trailing junk. */
+unformat_function_t unformat_eof;
+
+/* Parse memory size e.g. 100, 100k, 100m, 100g. */
+unformat_function_t unformat_memory_size;
+
+/* Unparse memory size e.g. 100, 100k, 100m, 100g. */
+u8 *format_memory_size (u8 * s, va_list * va);
+
+/* Format c identifier: e.g. a_name -> "a name". */
+u8 *format_c_identifier (u8 * s, va_list * va);
+
+/* Format hexdump with both hex and printable chars - compatible with text2pcap */
+u8 *format_hexdump (u8 * s, va_list * va);
+
+/* Unix specific formats. */
+#ifdef CLIB_UNIX
+/* Setup input from Unix file. */
+void unformat_init_unix_file (unformat_input_t * input, int file_descriptor);
+
+/* Take input from Unix environment variable; returns
+   1 if variable exists zero otherwise. */
+uword unformat_init_unix_env (unformat_input_t * input, char *var);
+#endif /* CLIB_UNIX */
+
+/* Test code. */
+int test_format_main (unformat_input_t * input);
+int test_unformat_main (unformat_input_t * input);
+
+/* This is not the right place for this, but putting it in vec.h
+created circular dependency problems. */
+int test_vec_main (unformat_input_t * input);
+
+#endif /* included_format_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/graph.c b/src/vppinfra/graph.c
new file mode 100644
index 00000000..98a29046
--- /dev/null
+++ b/src/vppinfra/graph.c
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/graph.h>
+
+/* Set link distance, creating link if not found. */
+u32
+graph_set_link (graph_t * g, u32 src, u32 dst, u32 distance)
+{
+  graph_node_t *src_node, *dst_node;
+  graph_link_t *l;
+  u32 old_distance;
+
+  /* The following validate will not work if src or dst are on the
+     pool free list. */
+  if (src < vec_len (g->nodes))
+    ASSERT (!pool_is_free_index (g->nodes, src));
+  if (dst < vec_len (g->nodes))
+    ASSERT (!pool_is_free_index (g->nodes, dst));
+
+  /* Make new (empty) nodes to make src and dst valid. */
+  pool_validate_index (g->nodes, clib_max (src, dst));
+
+  src_node = pool_elt_at_index (g->nodes, src);
+  dst_node = pool_elt_at_index (g->nodes, dst);
+
+  l = graph_dir_get_link_to_node (&src_node->next, dst);
+  if (l)
+    {
+      old_distance = l->distance;
+      l->distance = distance;
+
+      l = graph_dir_get_link_to_node (&dst_node->prev, src);
+      l->distance = distance;
+    }
+  else
+    {
+      uword li_next, li_prev;
+
+      old_distance = ~0;
+
+      li_next = graph_dir_add_link (&src_node->next, dst, distance);
+      li_prev = graph_dir_add_link (&dst_node->prev, src, distance);
+
+      l = vec_elt_at_index (src_node->next.links, li_next);
+      l->link_to_self_index = li_prev;
+
+      l = vec_elt_at_index (dst_node->prev.links, li_prev);
+      l->link_to_self_index = li_next;
+    }
+
+  return old_distance;
+}
+
+void
+graph_del_link (graph_t * g, u32 src, u32 dst)
+{
+  graph_node_t *src_node, *dst_node;
+
+  src_node = pool_elt_at_index (g->nodes, src);
+  dst_node = pool_elt_at_index (g->nodes, dst);
+
+  graph_dir_del_link (&src_node->next, dst);
+  graph_dir_del_link (&dst_node->next, src);
+}
+
+/* Delete source node and all links from other nodes from/to source. */
+uword
+graph_del_node (graph_t * g, u32 src)
+{
+  graph_node_t *src_node, *n;
+  uword index;
+  graph_link_t *l;
+
+  src_node = pool_elt_at_index (g->nodes, src);
+
+  vec_foreach (l, src_node->next.links)
+  {
+    n = pool_elt_at_index (g->nodes, l->node_index);
+    graph_dir_del_link (&n->prev, src);
+  }
+
+  vec_foreach (l, src_node->prev.links)
+  {
+    n = pool_elt_at_index (g->nodes, l->node_index);
+    graph_dir_del_link (&n->next, src);
+  }
+
+  graph_dir_free (&src_node->next);
+  graph_dir_free (&src_node->prev);
+
+  index = src_node - g->nodes;
+  pool_put (g->nodes, src_node);
+  memset (src_node, ~0, sizeof (src_node[0]));
+
+  return index;
+}
+
+uword
+unformat_graph (unformat_input_t * input, va_list * args)
+{
+  graph_t *g = va_arg (*args, graph_t *);
+  typedef struct
+  {
+    u32 src, dst, distance;
+  } T;
+  T *links = 0, *l;
+  uword result;
+
+  while (1)
+    {
+      vec_add2 (links, l, 1);
+      if (!unformat (input, "%d%d%d", &l->src, &l->dst, &l->distance))
+	break;
+    }
+  _vec_len (links) -= 1;
+  result = vec_len (links) > 0;
+  vec_foreach (l, links)
+  {
+    graph_set_link (g, l->src, l->dst, l->distance);
+    graph_set_link (g, l->dst, l->src, l->distance);
+  }
+
+  vec_free (links);
+  return result;
+}
+
+u8 *
+format_graph_node (u8 * s, va_list * args)
+{
+  graph_t *g = va_arg (*args, graph_t *);
+  u32 node_index = va_arg (*args, u32);
+
+  if (g->format_node)
+    s = format (s, "%U", g->format_node, g, node_index);
+  else
+    s = format (s, "%d", node_index);
+
+  return s;
+}
+
+u8 *
+format_graph (u8 * s, va_list * args)
+{
+  graph_t *g = va_arg (*args, graph_t *);
+  graph_node_t *n;
+  graph_link_t *l;
+  uword indent = format_get_indent (s);
+
+  s = format (s, "graph %d nodes", pool_elts (g->nodes));
+  /* *INDENT-OFF* */
+  pool_foreach (n, g->nodes, ({
+    s = format (s, "\n%U", format_white_space, indent + 2);
+    s = format (s, "%U -> ", format_graph_node, g, n - g->nodes);
+    vec_foreach (l, n->next.links)
+      s = format (s, "%U (%d), ",
+		  format_graph_node, g, l->node_index,
+		  l->distance);
+  }));
+  /* *INDENT-ON* */
+
+  return s;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/graph.h b/src/vppinfra/graph.h
new file mode 100644
index 00000000..1c26118f
--- /dev/null
+++ b/src/vppinfra/graph.h
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_clib_graph_h
+#define included_clib_graph_h
+
+#include <vppinfra/format.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/pool.h>
+
+/* Generic graphs. */
+typedef struct
+{
+  /* Next node along this link. */
+  u32 node_index;
+
+  /* Other direction link index to reach back to current node. */
+  u32 link_to_self_index;
+
+  /* Distance to next node. */
+  u32 distance;
+} graph_link_t;
+
+/* Direction on graph: either next or previous. */
+typedef struct
+{
+  /* Vector of links. */
+  graph_link_t *links;
+
+  /* Hash mapping node index to link which visits this node. */
+  uword *link_index_by_node_index;
+} graph_dir_t;
+
+always_inline void
+graph_dir_free (graph_dir_t * d)
+{
+  vec_free (d->links);
+  hash_free (d->link_index_by_node_index);
+}
+
+always_inline graph_link_t *
+graph_dir_get_link_to_node (graph_dir_t * d, u32 node_index)
+{
+  uword *p = hash_get (d->link_index_by_node_index, node_index);
+  return p ? vec_elt_at_index (d->links, p[0]) : 0;
+}
+
+always_inline uword
+graph_dir_add_link (graph_dir_t * d, u32 node_index, u32 distance)
+{
+  graph_link_t *l;
+  ASSERT (!graph_dir_get_link_to_node (d, node_index));
+  vec_add2 (d->links, l, 1);
+  l->node_index = node_index;
+  l->distance = distance;
+  hash_set (d->link_index_by_node_index, node_index, l - d->links);
+  return l - d->links;
+}
+
+always_inline void
+graph_dir_del_link (graph_dir_t * d, u32 node_index)
+{
+  graph_link_t *l = graph_dir_get_link_to_node (d, node_index);
+  uword li = l - d->links;
+  uword n_links = vec_len (d->links);
+
+  ASSERT (l != 0);
+  hash_unset (d->link_index_by_node_index, node_index);
+  n_links -= 1;
+  if (li < n_links)
+    d->links[li] = d->links[n_links];
+  _vec_len (d->links) = n_links;
+}
+
+typedef struct
+{
+  /* Nodes we are connected to plus distances. */
+  graph_dir_t next, prev;
+} graph_node_t;
+
+typedef struct
+{
+  /* Pool of nodes. */
+  graph_node_t *nodes;
+
+  void *opaque;
+
+  format_function_t *format_node;
+} graph_t;
+
+/* Set link distance, creating link if not found. */
+u32 graph_set_link (graph_t * g, u32 src, u32 dst, u32 distance);
+
+always_inline void
+graph_set_bidirectional_link (graph_t * g, u32 src, u32 dst, u32 distance)
+{
+  graph_set_link (g, src, dst, distance);
+  graph_set_link (g, dst, src, distance);
+}
+
+void graph_del_link (graph_t * g, u32 src, u32 dst);
+uword graph_del_node (graph_t * g, u32 src);
+
+unformat_function_t unformat_graph;
+format_function_t format_graph;
+format_function_t format_graph_node;
+
+#endif /* included_clib_graph_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/hash.c b/src/vppinfra/hash.c
new file mode 100644
index 00000000..062ad882
--- /dev/null
+++ b/src/vppinfra/hash.c
@@ -0,0 +1,1095 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001-2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/mem.h>
+#include <vppinfra/byte_order.h>	/* for clib_arch_is_big_endian */
+
+always_inline void
+zero_pair (hash_t * h, hash_pair_t * p)
+{
+  memset (p, 0, hash_pair_bytes (h));
+}
+
+always_inline void
+init_pair (hash_t * h, hash_pair_t * p)
+{
+  memset (p->value, ~0, hash_value_bytes (h));
+}
+
+always_inline hash_pair_union_t *
+get_pair (void *v, uword i)
+{
+  hash_t *h = hash_header (v);
+  hash_pair_t *p;
+  ASSERT (i < vec_len (v));
+  p = v;
+  p += i << h->log2_pair_size;
+  return (hash_pair_union_t *) p;
+}
+
+always_inline void
+set_is_user (void *v, uword i, uword is_user)
+{
+  hash_t *h = hash_header (v);
+  uword i0 = i / BITS (h->is_user[0]);
+  uword i1 = (uword) 1 << (i % BITS (h->is_user[0]));
+  if (is_user)
+    h->is_user[i0] |= i1;
+  else
+    h->is_user[i0] &= ~i1;
+}
+
+static u8 *hash_format_pair_default (u8 * s, va_list * args);
+
+#if uword_bits == 64
+
+static inline u64
+zap64 (u64 x, word n)
+{
+#define _(n) (((u64) 1 << (u64) (8*(n))) - (u64) 1)
+  static u64 masks_little_endian[] = {
+    0, _(1), _(2), _(3), _(4), _(5), _(6), _(7),
+  };
+  static u64 masks_big_endian[] = {
+    0, ~_(7), ~_(6), ~_(5), ~_(4), ~_(3), ~_(2), ~_(1),
+  };
+#undef _
+  if (clib_arch_is_big_endian)
+    return x & masks_big_endian[n];
+  else
+    return x & masks_little_endian[n];
+}
+
+static inline u64
+hash_memory64 (void *p, word n_bytes, u64 state)
+{
+  u64 *q = p;
+  u64 a, b, c, n;
+
+  a = b = 0x9e3779b97f4a7c13LL;
+  c = state;
+  n = n_bytes;
+
+  while (n >= 3 * sizeof (u64))
+    {
+      a += clib_mem_unaligned (q + 0, u64);
+      b += clib_mem_unaligned (q + 1, u64);
+      c += clib_mem_unaligned (q + 2, u64);
+      hash_mix64 (a, b, c);
+      n -= 3 * sizeof (u64);
+      q += 3;
+    }
+
+  c += n_bytes;
+  switch (n / sizeof (u64))
+    {
+    case 2:
+      a += clib_mem_unaligned (q + 0, u64);
+      b += clib_mem_unaligned (q + 1, u64);
+      if (n % sizeof (u64))
+	c += zap64 (clib_mem_unaligned (q + 2, u64), n % sizeof (u64)) << 8;
+      break;
+
+    case 1:
+      a += clib_mem_unaligned (q + 0, u64);
+      if (n % sizeof (u64))
+	b += zap64 (clib_mem_unaligned (q + 1, u64), n % sizeof (u64));
+      break;
+
+    case 0:
+      if (n % sizeof (u64))
+	a += zap64 (clib_mem_unaligned (q + 0, u64), n % sizeof (u64));
+      break;
+    }
+
+  hash_mix64 (a, b, c);
+
+  return c;
+}
+
+#else /* if uword_bits == 64 */
+
+static inline u32
+zap32 (u32 x, word n)
+{
+#define _(n) (((u32) 1 << (u32) (8*(n))) - (u32) 1)
+  static u32 masks_little_endian[] = {
+    0, _(1), _(2), _(3),
+  };
+  static u32 masks_big_endian[] = {
+    0, ~_(3), ~_(2), ~_(1),
+  };
+#undef _
+  if (clib_arch_is_big_endian)
+    return x & masks_big_endian[n];
+  else
+    return x & masks_little_endian[n];
+}
+
+static inline u32
+hash_memory32 (void *p, word n_bytes, u32 state)
+{
+  u32 *q = p;
+  u32 a, b, c, n;
+
+  a = b = 0x9e3779b9;
+  c = state;
+  n = n_bytes;
+
+  while (n >= 3 * sizeof (u32))
+    {
+      a += clib_mem_unaligned (q + 0, u32);
+      b += clib_mem_unaligned (q + 1, u32);
+      c += clib_mem_unaligned (q + 2, u32);
+      hash_mix32 (a, b, c);
+      n -= 3 * sizeof (u32);
+      q += 3;
+    }
+
+  c += n_bytes;
+  switch (n / sizeof (u32))
+    {
+    case 2:
+      a += clib_mem_unaligned (q + 0, u32);
+      b += clib_mem_unaligned (q + 1, u32);
+      if (n % sizeof (u32))
+	c += zap32 (clib_mem_unaligned (q + 2, u32), n % sizeof (u32)) << 8;
+      break;
+
+    case 1:
+      a += clib_mem_unaligned (q + 0, u32);
+      if (n % sizeof (u32))
+	b += zap32 (clib_mem_unaligned (q + 1, u32), n % sizeof (u32));
+      break;
+
+    case 0:
+      if (n % sizeof (u32))
+	a += zap32 (clib_mem_unaligned (q + 0, u32), n % sizeof (u32));
+      break;
+    }
+
+  hash_mix32 (a, b, c);
+
+  return c;
+}
+#endif
+
+uword
+hash_memory (void *p, word n_bytes, uword state)
+{
+  uword *q = p;
+
+#if uword_bits == 64
+  return hash_memory64 (q, n_bytes, state);
+#else
+  return hash_memory32 (q, n_bytes, state);
+#endif
+}
+
+#if uword_bits == 64
+always_inline uword
+hash_uword (uword x)
+{
+  u64 a, b, c;
+
+  a = b = 0x9e3779b97f4a7c13LL;
+  c = 0;
+  a += x;
+  hash_mix64 (a, b, c);
+  return c;
+}
+#else
+always_inline uword
+hash_uword (uword x)
+{
+  u32 a, b, c;
+
+  a = b = 0x9e3779b9;
+  c = 0;
+  a += x;
+  hash_mix32 (a, b, c);
+  return c;
+}
+#endif
+
+/* Call sum function.  Hash code will be sum function value
+   modulo the prime length of the hash table. */
+always_inline uword
+key_sum (hash_t * h, uword key)
+{
+  uword sum;
+  switch (pointer_to_uword ((void *) h->key_sum))
+    {
+    case KEY_FUNC_NONE:
+      sum = hash_uword (key);
+      break;
+
+    case KEY_FUNC_POINTER_UWORD:
+      sum = hash_uword (*uword_to_pointer (key, uword *));
+      break;
+
+    case KEY_FUNC_POINTER_U32:
+      sum = hash_uword (*uword_to_pointer (key, u32 *));
+      break;
+
+    case KEY_FUNC_STRING:
+      sum = string_key_sum (h, key);
+      break;
+
+    default:
+      sum = h->key_sum (h, key);
+      break;
+    }
+
+  return sum;
+}
+
+always_inline uword
+key_equal1 (hash_t * h, uword key1, uword key2, uword e)
+{
+  switch (pointer_to_uword ((void *) h->key_equal))
+    {
+    case KEY_FUNC_NONE:
+      break;
+
+    case KEY_FUNC_POINTER_UWORD:
+      e =
+	*uword_to_pointer (key1, uword *) == *uword_to_pointer (key2,
+								uword *);
+      break;
+
+    case KEY_FUNC_POINTER_U32:
+      e = *uword_to_pointer (key1, u32 *) == *uword_to_pointer (key2, u32 *);
+      break;
+
+    case KEY_FUNC_STRING:
+      e = string_key_equal (h, key1, key2);
+      break;
+
+    default:
+      e = h->key_equal (h, key1, key2);
+      break;
+    }
+  return e;
+}
+
+/* Compares two keys: returns 1 if equal, 0 if not. */
+always_inline uword
+key_equal (hash_t * h, uword key1, uword key2)
+{
+  uword e = key1 == key2;
+  if (CLIB_DEBUG > 0 && key1 == key2)
+    ASSERT (key_equal1 (h, key1, key2, e));
+  if (!e)
+    e = key_equal1 (h, key1, key2, e);
+  return e;
+}
+
+static hash_pair_union_t *
+get_indirect (void *v, hash_pair_indirect_t * pi, uword key)
+{
+  hash_t *h = hash_header (v);
+  hash_pair_t *p0, *p1;
+
+  p0 = p1 = pi->pairs;
+  if (h->log2_pair_size > 0)
+    p1 = hash_forward (h, p0, indirect_pair_get_len (pi));
+  else
+    p1 += vec_len (p0);
+
+  while (p0 < p1)
+    {
+      if (key_equal (h, p0->key, key))
+	return (hash_pair_union_t *) p0;
+      p0 = hash_forward1 (h, p0);
+    }
+
+  return (hash_pair_union_t *) 0;
+}
+
+static hash_pair_union_t *
+set_indirect_is_user (void *v, uword i, hash_pair_union_t * p, uword key)
+{
+  hash_t *h = hash_header (v);
+  hash_pair_t *q;
+  hash_pair_indirect_t *pi = &p->indirect;
+  uword log2_bytes = 0;
+
+  if (h->log2_pair_size == 0)
+    q = vec_new (hash_pair_t, 2);
+  else
+    {
+      log2_bytes = 1 + hash_pair_log2_bytes (h);
+      q = clib_mem_alloc (1ULL << log2_bytes);
+    }
+  clib_memcpy (q, &p->direct, hash_pair_bytes (h));
+
+  pi->pairs = q;
+  if (h->log2_pair_size > 0)
+    indirect_pair_set (pi, log2_bytes, 2);
+
+  set_is_user (v, i, 0);
+
+  /* First element is used by existing pair, second will be used by caller. */
+  q = hash_forward1 (h, q);
+  q->key = key;
+  init_pair (h, q);
+  return (hash_pair_union_t *) q;
+}
+
+static hash_pair_union_t *
+set_indirect (void *v, hash_pair_indirect_t * pi, uword key,
+	      uword * found_key)
+{
+  hash_t *h = hash_header (v);
+  hash_pair_t *new_pair;
+  hash_pair_union_t *q;
+
+  q = get_indirect (v, pi, key);
+  if (q)
+    {
+      *found_key = 1;
+      return q;
+    }
+
+  if (h->log2_pair_size == 0)
+    vec_add2 (pi->pairs, new_pair, 1);
+  else
+    {
+      uword len, new_len, log2_bytes;
+
+      len = indirect_pair_get_len (pi);
+      log2_bytes = indirect_pair_get_log2_bytes (pi);
+
+      new_len = len + 1;
+      if (new_len * hash_pair_bytes (h) > (1ULL << log2_bytes))
+	{
+	  pi->pairs = clib_mem_realloc (pi->pairs,
+					1ULL << (log2_bytes + 1),
+					1ULL << log2_bytes);
+	  log2_bytes++;
+	}
+
+      indirect_pair_set (pi, log2_bytes, new_len);
+      new_pair = pi->pairs + (len << h->log2_pair_size);
+    }
+  new_pair->key = key;
+  init_pair (h, new_pair);
+  *found_key = 0;
+  return (hash_pair_union_t *) new_pair;
+}
+
+static void
+unset_indirect (void *v, uword i, hash_pair_t * q)
+{
+  hash_t *h = hash_header (v);
+  hash_pair_union_t *p = get_pair (v, i);
+  hash_pair_t *e;
+  hash_pair_indirect_t *pi = &p->indirect;
+  uword len, is_vec;
+
+  is_vec = h->log2_pair_size == 0;
+
+  ASSERT (!hash_is_user (v, i));
+  len = is_vec ? vec_len (pi->pairs) : indirect_pair_get_len (pi);
+  e = hash_forward (h, pi->pairs, len - 1);
+  ASSERT (q >= pi->pairs && q <= e);
+
+  /* We have two or fewer pairs and we are delete one pair.
+     Make indirect pointer direct and free indirect memory. */
+  if (len <= 2)
+    {
+      hash_pair_t *r = pi->pairs;
+
+      if (len == 2)
+	{
+	  clib_memcpy (p, q == r ? hash_forward1 (h, r) : r,
+		       hash_pair_bytes (h));
+	  set_is_user (v, i, 1);
+	}
+      else
+	zero_pair (h, &p->direct);
+
+      if (is_vec)
+	vec_free (r);
+      else if (r)
+	clib_mem_free (r);
+    }
+  else
+    {
+      /* If deleting a pair we need to keep non-null pairs together. */
+      if (q < e)
+	clib_memcpy (q, e, hash_pair_bytes (h));
+      else
+	zero_pair (h, q);
+      if (is_vec)
+	_vec_len (pi->pairs) -= 1;
+      else
+	indirect_pair_set (pi, indirect_pair_get_log2_bytes (pi), len - 1);
+    }
+}
+
+enum lookup_opcode
+{
+  GET = 1,
+  SET = 2,
+  UNSET = 3,
+};
+
+static hash_pair_t *
+lookup (void *v, uword key, enum lookup_opcode op,
+	void *new_value, void *old_value)
+{
+  hash_t *h = hash_header (v);
+  hash_pair_union_t *p = 0;
+  uword found_key = 0;
+  uword i;
+
+  if (!v)
+    return 0;
+
+  i = key_sum (h, key) & (_vec_len (v) - 1);
+  p = get_pair (v, i);
+
+  if (hash_is_user (v, i))
+    {
+      found_key = key_equal (h, p->direct.key, key);
+      if (found_key)
+	{
+	  if (op == UNSET)
+	    {
+	      set_is_user (v, i, 0);
+	      if (old_value)
+		clib_memcpy (old_value, p->direct.value,
+			     hash_value_bytes (h));
+	      zero_pair (h, &p->direct);
+	    }
+	}
+      else
+	{
+	  if (op == SET)
+	    p = set_indirect_is_user (v, i, p, key);
+	  else
+	    p = 0;
+	}
+    }
+  else
+    {
+      hash_pair_indirect_t *pi = &p->indirect;
+
+      if (op == SET)
+	{
+	  if (!pi->pairs)
+	    {
+	      p->direct.key = key;
+	      set_is_user (v, i, 1);
+	    }
+	  else
+	    p = set_indirect (v, pi, key, &found_key);
+	}
+      else
+	{
+	  p = get_indirect (v, pi, key);
+	  found_key = p != 0;
+	  if (found_key && op == UNSET)
+	    {
+	      if (old_value)
+		clib_memcpy (old_value, &p->direct.value,
+			     hash_value_bytes (h));
+
+	      unset_indirect (v, i, &p->direct);
+
+	      /* Nullify p (since it's just been deleted).
+	         Otherwise we might be tempted to play with it. */
+	      p = 0;
+	    }
+	}
+    }
+
+  if (op == SET && p != 0)
+    {
+      /* Save away old value for caller. */
+      if (old_value && found_key)
+	clib_memcpy (old_value, &p->direct.value, hash_value_bytes (h));
+      clib_memcpy (&p->direct.value, new_value, hash_value_bytes (h));
+    }
+
+  if (op == SET)
+    h->elts += !found_key;
+  if (op == UNSET)
+    h->elts -= found_key;
+
+  return &p->direct;
+}
+
+/* Fetch value of key. */
+uword *
+_hash_get (void *v, uword key)
+{
+  hash_t *h = hash_header (v);
+  hash_pair_t *p;
+
+  /* Don't even search table if its empty. */
+  if (!v || h->elts == 0)
+    return 0;
+
+  p = lookup (v, key, GET, 0, 0);
+  if (!p)
+    return 0;
+  if (h->log2_pair_size == 0)
+    return &p->key;
+  else
+    return &p->value[0];
+}
+
+hash_pair_t *
+_hash_get_pair (void *v, uword key)
+{
+  return lookup (v, key, GET, 0, 0);
+}
+
+hash_pair_t *
+hash_next (void *v, hash_next_t * hn)
+{
+  hash_t *h = hash_header (v);
+  hash_pair_t *p;
+
+  while (1)
+    {
+      if (hn->i == 0 && hn->j == 0)
+	{
+	  /* Save flags. */
+	  hn->f = h->flags;
+
+	  /* Prevent others from re-sizing hash table. */
+	  h->flags |=
+	    (HASH_FLAG_NO_AUTO_GROW
+	     | HASH_FLAG_NO_AUTO_SHRINK | HASH_FLAG_HASH_NEXT_IN_PROGRESS);
+	}
+      else if (hn->i >= hash_capacity (v))
+	{
+	  /* Restore flags. */
+	  h->flags = hn->f;
+	  memset (hn, 0, sizeof (hn[0]));
+	  return 0;
+	}
+
+      p = hash_forward (h, v, hn->i);
+      if (hash_is_user (v, hn->i))
+	{
+	  hn->i++;
+	  return p;
+	}
+      else
+	{
+	  hash_pair_indirect_t *pi = (void *) p;
+	  uword n;
+
+	  if (h->log2_pair_size > 0)
+	    n = indirect_pair_get_len (pi);
+	  else
+	    n = vec_len (pi->pairs);
+
+	  if (hn->j >= n)
+	    {
+	      hn->i++;
+	      hn->j = 0;
+	    }
+	  else
+	    return hash_forward (h, pi->pairs, hn->j++);
+	}
+    }
+}
+
+/* Remove key from table. */
+void *
+_hash_unset (void *v, uword key, void *old_value)
+{
+  hash_t *h;
+
+  if (!v)
+    return v;
+
+  (void) lookup (v, key, UNSET, 0, old_value);
+
+  h = hash_header (v);
+  if (!(h->flags & HASH_FLAG_NO_AUTO_SHRINK))
+    {
+      /* Resize when 1/4 full. */
+      if (h->elts > 32 && 4 * (h->elts + 1) < vec_len (v))
+	v = hash_resize (v, vec_len (v) / 2);
+    }
+
+  return v;
+}
+
+void *
+_hash_create (uword elts, hash_t * h_user)
+{
+  hash_t *h;
+  uword log2_pair_size;
+  void *v;
+
+  /* Size of hash is power of 2 >= ELTS and larger than
+     number of bits in is_user bitmap elements. */
+  elts = clib_max (elts, BITS (h->is_user[0]));
+  elts = 1ULL << max_log2 (elts);
+
+  log2_pair_size = 1;
+  if (h_user)
+    log2_pair_size = h_user->log2_pair_size;
+
+  v = _vec_resize (0,
+		   /* vec len: */ elts,
+		   /* data bytes: */
+		   (elts << log2_pair_size) * sizeof (hash_pair_t),
+		   /* header bytes: */
+		   sizeof (h[0]) +
+		   (elts / BITS (h->is_user[0])) * sizeof (h->is_user[0]),
+		   /* alignment */ sizeof (hash_pair_t));
+  h = hash_header (v);
+
+  if (h_user)
+    h[0] = h_user[0];
+
+  h->log2_pair_size = log2_pair_size;
+  h->elts = 0;
+
+  /* Default flags to never shrinking hash tables.
+     Shrinking tables can cause "jackpot" cases. */
+  if (!h_user)
+    h->flags = HASH_FLAG_NO_AUTO_SHRINK;
+
+  if (!h->format_pair)
+    {
+      h->format_pair = hash_format_pair_default;
+      h->format_pair_arg = 0;
+    }
+
+  return v;
+}
+
+void *
+_hash_free (void *v)
+{
+  hash_t *h = hash_header (v);
+  hash_pair_union_t *p;
+  uword i;
+
+  if (!v)
+    return v;
+
+  /* We zero all freed memory in case user would be tempted to use it. */
+  for (i = 0; i < hash_capacity (v); i++)
+    {
+      if (hash_is_user (v, i))
+	continue;
+      p = get_pair (v, i);
+      if (h->log2_pair_size == 0)
+	vec_free (p->indirect.pairs);
+      else if (p->indirect.pairs)
+	clib_mem_free (p->indirect.pairs);
+    }
+
+  vec_free_header (h);
+
+  return 0;
+}
+
+static void *
+hash_resize_internal (void *old, uword new_size, uword free_old)
+{
+  void *new;
+  hash_pair_t *p;
+
+  new = 0;
+  if (new_size > 0)
+    {
+      hash_t *h = old ? hash_header (old) : 0;
+      new = _hash_create (new_size, h);
+      /* *INDENT-OFF* */
+      hash_foreach_pair (p, old, {
+	new = _hash_set3 (new, p->key, &p->value[0], 0);
+      });
+      /* *INDENT-ON* */
+    }
+
+  if (free_old)
+    hash_free (old);
+  return new;
+}
+
+void *
+hash_resize (void *old, uword new_size)
+{
+  return hash_resize_internal (old, new_size, 1);
+}
+
+void *
+hash_dup (void *old)
+{
+  return hash_resize_internal (old, vec_len (old), 0);
+}
+
+void *
+_hash_set3 (void *v, uword key, void *value, void *old_value)
+{
+  hash_t *h;
+
+  if (!v)
+    v = hash_create (0, sizeof (uword));
+
+  h = hash_header (v);
+  (void) lookup (v, key, SET, value, old_value);
+
+  if (!(h->flags & HASH_FLAG_NO_AUTO_GROW))
+    {
+      /* Resize when 3/4 full. */
+      if (4 * (h->elts + 1) > 3 * vec_len (v))
+	v = hash_resize (v, 2 * vec_len (v));
+    }
+
+  return v;
+}
+
+uword
+vec_key_sum (hash_t * h, uword key)
+{
+  void *v = uword_to_pointer (key, void *);
+  return hash_memory (v, vec_len (v) * h->user, 0);
+}
+
+uword
+vec_key_equal (hash_t * h, uword key1, uword key2)
+{
+  void *v1 = uword_to_pointer (key1, void *);
+  void *v2 = uword_to_pointer (key2, void *);
+  uword l1 = vec_len (v1);
+  uword l2 = vec_len (v2);
+  return l1 == l2 && 0 == memcmp (v1, v2, l1 * h->user);
+}
+
+u8 *
+vec_key_format_pair (u8 * s, va_list * args)
+{
+  void *CLIB_UNUSED (user_arg) = va_arg (*args, void *);
+  void *v = va_arg (*args, void *);
+  hash_pair_t *p = va_arg (*args, hash_pair_t *);
+  hash_t *h = hash_header (v);
+  void *u = uword_to_pointer (p->key, void *);
+  int i;
+
+  switch (h->user)
+    {
+    case 1:
+      s = format (s, "%v", u);
+      break;
+
+    case 2:
+      {
+	u16 *w = u;
+	for (i = 0; i < vec_len (w); i++)
+	  s = format (s, "0x%x, ", w[i]);
+	break;
+      }
+
+    case 4:
+      {
+	u32 *w = u;
+	for (i = 0; i < vec_len (w); i++)
+	  s = format (s, "0x%x, ", w[i]);
+	break;
+      }
+
+    case 8:
+      {
+	u64 *w = u;
+	for (i = 0; i < vec_len (w); i++)
+	  s = format (s, "0x%Lx, ", w[i]);
+	break;
+      }
+
+    default:
+      s = format (s, "0x%U", format_hex_bytes, u, vec_len (u) * h->user);
+      break;
+    }
+
+  if (hash_value_bytes (h) > 0)
+    s = format (s, " -> 0x%wx", p->value[0]);
+
+  return s;
+}
+
+uword
+mem_key_sum (hash_t * h, uword key)
+{
+  uword *v = uword_to_pointer (key, void *);
+  return hash_memory (v, h->user, 0);
+}
+
+uword
+mem_key_equal (hash_t * h, uword key1, uword key2)
+{
+  void *v1 = uword_to_pointer (key1, void *);
+  void *v2 = uword_to_pointer (key2, void *);
+  return v1 && v2 && 0 == memcmp (v1, v2, h->user);
+}
+
+uword
+string_key_sum (hash_t * h, uword key)
+{
+  char *v = uword_to_pointer (key, char *);
+  return hash_memory (v, strlen (v), 0);
+}
+
+uword
+string_key_equal (hash_t * h, uword key1, uword key2)
+{
+  void *v1 = uword_to_pointer (key1, void *);
+  void *v2 = uword_to_pointer (key2, void *);
+  return v1 && v2 && 0 == strcmp (v1, v2);
+}
+
+u8 *
+string_key_format_pair (u8 * s, va_list * args)
+{
+  void *CLIB_UNUSED (user_arg) = va_arg (*args, void *);
+  void *v = va_arg (*args, void *);
+  hash_pair_t *p = va_arg (*args, hash_pair_t *);
+  hash_t *h = hash_header (v);
+  void *u = uword_to_pointer (p->key, void *);
+
+  s = format (s, "%s", u);
+
+  if (hash_value_bytes (h) > 0)
+    s =
+      format (s, " -> 0x%8U", format_hex_bytes, &p->value[0],
+	      hash_value_bytes (h));
+
+  return s;
+}
+
+static u8 *
+hash_format_pair_default (u8 * s, va_list * args)
+{
+  void *CLIB_UNUSED (user_arg) = va_arg (*args, void *);
+  void *v = va_arg (*args, void *);
+  hash_pair_t *p = va_arg (*args, hash_pair_t *);
+  hash_t *h = hash_header (v);
+
+  s = format (s, "0x%08x", p->key);
+  if (hash_value_bytes (h) > 0)
+    s =
+      format (s, " -> 0x%8U", format_hex_bytes, &p->value[0],
+	      hash_value_bytes (h));
+  return s;
+}
+
+uword
+hash_bytes (void *v)
+{
+  uword i, bytes;
+  hash_t *h = hash_header (v);
+
+  if (!v)
+    return 0;
+
+  bytes = vec_capacity (v, hash_header_bytes (v));
+
+  for (i = 0; i < hash_capacity (v); i++)
+    {
+      if (!hash_is_user (v, i))
+	{
+	  hash_pair_union_t *p = get_pair (v, i);
+	  if (h->log2_pair_size > 0)
+	    bytes += 1 << indirect_pair_get_log2_bytes (&p->indirect);
+	  else
+	    bytes += vec_capacity (p->indirect.pairs, 0);
+	}
+    }
+  return bytes;
+}
+
+u8 *
+format_hash (u8 * s, va_list * va)
+{
+  void *v = va_arg (*va, void *);
+  int verbose = va_arg (*va, int);
+  hash_pair_t *p;
+  hash_t *h = hash_header (v);
+  uword i;
+
+  s = format (s, "hash %p, %wd elts, capacity %wd, %wd bytes used,\n",
+	      v, hash_elts (v), hash_capacity (v), hash_bytes (v));
+
+  {
+    uword *occupancy = 0;
+
+    /* Count number of buckets with each occupancy. */
+    for (i = 0; i < hash_capacity (v); i++)
+      {
+	uword j;
+
+	if (hash_is_user (v, i))
+	  {
+	    j = 1;
+	  }
+	else
+	  {
+	    hash_pair_union_t *p = get_pair (v, i);
+	    if (h->log2_pair_size > 0)
+	      j = indirect_pair_get_len (&p->indirect);
+	    else
+	      j = vec_len (p->indirect.pairs);
+	  }
+
+	vec_validate (occupancy, j);
+	occupancy[j]++;
+      }
+
+    s = format (s, "  profile ");
+    for (i = 0; i < vec_len (occupancy); i++)
+      s = format (s, "%wd%c", occupancy[i],
+		  i + 1 == vec_len (occupancy) ? '\n' : ' ');
+
+    s = format (s, "  lookup # of compares: ");
+    for (i = 1; i < vec_len (occupancy); i++)
+      s = format (s, "%wd: .%03d%c", i,
+		  (1000 * i * occupancy[i]) / hash_elts (v),
+		  i + 1 == vec_len (occupancy) ? '\n' : ' ');
+
+    vec_free (occupancy);
+  }
+
+  if (verbose)
+    {
+      /* *INDENT-OFF* */
+      hash_foreach_pair (p, v, {
+	s = format (s, "  %U\n", h->format_pair, h->format_pair_arg, v, p);
+      });
+      /* *INDENT-ON* */
+    }
+
+  return s;
+}
+
+static uword
+unformat_hash_string_internal (unformat_input_t * input,
+			       va_list * va, int is_vec)
+{
+  uword *hash = va_arg (*va, uword *);
+  int *result = va_arg (*va, int *);
+  u8 *string = 0;
+  uword *p;
+
+  if (!unformat (input, is_vec ? "%v%_" : "%s%_", &string))
+    return 0;
+
+  p = hash_get_mem (hash, string);
+  if (p)
+    *result = *p;
+
+  vec_free (string);
+  return p ? 1 : 0;
+}
+
+uword
+unformat_hash_vec_string (unformat_input_t * input, va_list * va)
+{
+  return unformat_hash_string_internal (input, va, /* is_vec */ 1);
+}
+
+uword
+unformat_hash_string (unformat_input_t * input, va_list * va)
+{
+  return unformat_hash_string_internal (input, va, /* is_vec */ 0);
+}
+
+clib_error_t *
+hash_validate (void *v)
+{
+  hash_t *h = hash_header (v);
+  uword i, j;
+  uword *keys = 0;
+  clib_error_t *error = 0;
+
+#define CHECK(x) if ((error = ERROR_ASSERT (x))) goto done;
+
+  for (i = 0; i < hash_capacity (v); i++)
+    {
+      hash_pair_union_t *pu = get_pair (v, i);
+
+      if (hash_is_user (v, i))
+	{
+	  CHECK (pu->direct.key != 0);
+	  vec_add1 (keys, pu->direct.key);
+	}
+      else
+	{
+	  hash_pair_t *p;
+	  hash_pair_indirect_t *pi = &pu->indirect;
+	  uword n;
+
+	  n = h->log2_pair_size > 0
+	    ? indirect_pair_get_len (pi) : vec_len (pi->pairs);
+
+	  for (p = pi->pairs; n-- > 0; p = hash_forward1 (h, p))
+	    {
+	      /* Assert key uniqueness. */
+	      for (j = 0; j < vec_len (keys); j++)
+		CHECK (keys[j] != p->key);
+	      vec_add1 (keys, p->key);
+	    }
+	}
+    }
+
+  CHECK (vec_len (keys) == h->elts);
+
+  vec_free (keys);
+done:
+  return error;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/hash.h b/src/vppinfra/hash.h
new file mode 100644
index 00000000..3f0efaa7
--- /dev/null
+++ b/src/vppinfra/hash.h
@@ -0,0 +1,699 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001-2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_hash_h
+#define included_hash_h
+
+#include <vppinfra/error.h>
+#include <vppinfra/format.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/vector.h>
+
+struct hash_header;
+
+typedef uword (hash_key_sum_function_t) (struct hash_header *, uword key);
+typedef uword (hash_key_equal_function_t)
+  (struct hash_header *, uword key1, uword key2);
+
+/* Vector header for hash tables. */
+typedef struct hash_header
+{
+  /* Number of elements in hash table. */
+  uword elts;
+
+  /* Flags as follows. */
+  u32 flags;
+
+  /* Set if user does not want table to auto-resize when sufficiently full. */
+#define HASH_FLAG_NO_AUTO_GROW		(1 << 0)
+  /* Set if user does not want table to auto-resize when sufficiently empty. */
+#define HASH_FLAG_NO_AUTO_SHRINK	(1 << 1)
+  /* Set when hash_next is in the process of iterating through this hash table. */
+#define HASH_FLAG_HASH_NEXT_IN_PROGRESS (1 << 2)
+
+  u32 log2_pair_size;
+
+  /* Function to compute the "sum" of a hash key.
+     Hash function is this sum modulo the prime size of
+     the hash table (vec_len (v)). */
+  hash_key_sum_function_t *key_sum;
+
+  /* Special values for key_sum "function". */
+#define KEY_FUNC_NONE		(0)	/*< sum = key */
+#define KEY_FUNC_POINTER_UWORD	(1)	/*< sum = *(uword *) key */
+#define KEY_FUNC_POINTER_U32	(2)	/*< sum = *(u32 *) key */
+#define KEY_FUNC_STRING         (3)	/*< sum = string_key_sum, etc. */
+
+  /* key comparison function */
+  hash_key_equal_function_t *key_equal;
+
+  /* Hook for user's data.  Used to parameterize sum/equal functions. */
+  any user;
+
+  /* Format a (k,v) pair */
+  format_function_t *format_pair;
+
+  /* Format function arg */
+  void *format_pair_arg;
+
+  /* Bit i is set if pair i is a user object (as opposed to being
+     either zero or an indirect array of pairs). */
+  uword is_user[0];
+} hash_t;
+
+/* Hash header size in bytes */
+always_inline uword
+hash_header_bytes (void *v)
+{
+  hash_t *h;
+  uword is_user_bytes =
+    (sizeof (h->is_user[0]) * vec_len (v)) / BITS (h->is_user[0]);
+  return sizeof (h[0]) + is_user_bytes;
+}
+
+/* Returns a pointer to the hash header given the vector pointer */
+always_inline hash_t *
+hash_header (void *v)
+{
+  return vec_header (v, hash_header_bytes (v));
+}
+
+/* Number of elements in the hash table */
+always_inline uword
+hash_elts (void *v)
+{
+  hash_t *h = hash_header (v);
+  return v ? h->elts : 0;
+}
+
+/* Number of elements the hash table can hold */
+always_inline uword
+hash_capacity (void *v)
+{
+  return vec_len (v);
+}
+
+/* Returns 1 if the hash pair contains user data */
+always_inline uword
+hash_is_user (void *v, uword i)
+{
+  hash_t *h = hash_header (v);
+  uword i0 = i / BITS (h->is_user[0]);
+  uword i1 = i % BITS (h->is_user[0]);
+  return (h->is_user[i0] & ((uword) 1 << i1)) != 0;
+}
+
+/* Set the format function and format argument for a hash table */
+always_inline void
+hash_set_pair_format (void *v,
+		      format_function_t * format_pair, void *format_pair_arg)
+{
+  hash_t *h = hash_header (v);
+  h->format_pair = format_pair;
+  h->format_pair_arg = format_pair_arg;
+}
+
+/* Set hash table flags */
+always_inline void
+hash_set_flags (void *v, uword flags)
+{
+  hash_header (v)->flags |= flags;
+}
+
+/* Key value pairs. */
+typedef struct
+{
+  /* The Key */
+  uword key;
+
+  /* The Value. Length is 2^log2_pair_size - 1. */
+  uword value[0];
+} hash_pair_t;
+
+/* The indirect pair structure
+
+    If log2_pair_size > 0 we overload hash pairs
+    with indirect pairs for buckets with more than one
+    pair. */
+typedef struct
+{
+  /* pair vector */
+  hash_pair_t *pairs;
+  /* padding */
+  u8 pad[sizeof (uword) - sizeof (hash_pair_t *)];
+  /* allocated length */
+  uword alloc_len;
+}
+hash_pair_indirect_t;
+
+/* Direct / Indirect pair union */
+typedef union
+{
+  hash_pair_t direct;
+  hash_pair_indirect_t indirect;
+} hash_pair_union_t;
+
+#define LOG2_ALLOC_BITS (5)
+#define PAIR_BITS	(BITS (uword) - LOG2_ALLOC_BITS)
+
+/* Log2 number of bytes allocated in pairs array. */
+always_inline uword
+indirect_pair_get_log2_bytes (hash_pair_indirect_t * p)
+{
+  return p->alloc_len >> PAIR_BITS;
+}
+
+/* Get the length of an indirect pair */
+always_inline uword
+indirect_pair_get_len (hash_pair_indirect_t * p)
+{
+  if (!p->pairs)
+    return 0;
+  else
+    return p->alloc_len & (((uword) 1 << PAIR_BITS) - 1);
+}
+
+/* Set the length of an indirect pair */
+always_inline void
+indirect_pair_set (hash_pair_indirect_t * p, uword log2_alloc, uword len)
+{
+  ASSERT (len < ((uword) 1 << PAIR_BITS));
+  ASSERT (log2_alloc < ((uword) 1 << LOG2_ALLOC_BITS));
+  p->alloc_len = (log2_alloc << PAIR_BITS) | len;
+}
+
+/* internal routine to fetch value for given key */
+uword *_hash_get (void *v, uword key);
+
+/* internal routine to fetch value (key, value) pair for given key */
+hash_pair_t *_hash_get_pair (void *v, uword key);
+
+/* internal routine to unset a (key, value) pair */
+void *_hash_unset (void *v, uword key, void *old_value);
+
+/* internal routine to set a (key, value) pair, return the old value */
+void *_hash_set3 (void *v, uword key, void *value, void *old_value);
+
+/* Resize a hash table */
+void *hash_resize (void *old, uword new_size);
+
+/* duplicate a hash table */
+void *hash_dup (void *old);
+
+/* Returns the number of bytes used by a hash table */
+uword hash_bytes (void *v);
+
+/* Public macro to set a (key, value) pair, return the old value */
+#define hash_set3(h,key,value,old_value)				\
+({									\
+  uword _v = (uword) (value);						\
+  (h) = _hash_set3 ((h), (uword) (key), (void *) &_v, (old_value));	\
+})
+
+/* Public macro to fetch value for given key */
+#define hash_get(h,key)		_hash_get ((h), (uword) (key))
+
+/* Public macro to fetch value (key, value) pair for given key */
+#define hash_get_pair(h,key)	_hash_get_pair ((h), (uword) (key))
+
+/* Public macro to set a (key, value) pair */
+#define hash_set(h,key,value)	hash_set3(h,key,value,0)
+
+/* Public macro to set (key, 0) pair */
+#define hash_set1(h,key)	(h) = _hash_set3(h,(uword) (key),0,0)
+
+/* Public macro to unset a (key, value) pair */
+#define hash_unset(h,key)	((h) = _hash_unset ((h), (uword) (key),0))
+
+/* Public macro to unset a (key, value) pair, return the old value */
+#define hash_unset3(h,key,old_value) ((h) = _hash_unset ((h), (uword) (key), (void *) (old_value)))
+
+/* get/set/unset for pointer keys. */
+
+/* Public macro to fetch value for given pointer key */
+#define hash_get_mem(h,key)	_hash_get ((h), pointer_to_uword (key))
+
+/* Public macro to fetch (key, value) for given pointer key */
+#define hash_get_pair_mem(h,key) _hash_get_pair ((h), pointer_to_uword (key))
+
+/* Public macro to set (key, value) for pointer key */
+#define hash_set_mem(h,key,value) hash_set3 (h, pointer_to_uword (key), (value), 0)
+
+/* Public macro to set (key, 0) for pointer key */
+#define hash_set1_mem(h,key)     hash_set3 ((h), pointer_to_uword (key), 0, 0)
+
+/* Public macro to unset (key, value) for pointer key */
+#define hash_unset_mem(h,key)    ((h) = _hash_unset ((h), pointer_to_uword (key),0))
+
+/* internal routine to free a hash table */
+extern void *_hash_free (void *v);
+
+/* Public macro to free a hash table */
+#define hash_free(h) (h) = _hash_free ((h))
+
+clib_error_t *hash_validate (void *v);
+
+/* Public inline funcion to get the number of value bytes for a hash table */
+always_inline uword
+hash_value_bytes (hash_t * h)
+{
+  hash_pair_t *p;
+  return (sizeof (p->value[0]) << h->log2_pair_size) - sizeof (p->key);
+}
+
+/* Public inline funcion to get log2(size of a (key,value) pair) */
+always_inline uword
+hash_pair_log2_bytes (hash_t * h)
+{
+  uword log2_bytes = h->log2_pair_size;
+  ASSERT (BITS (hash_pair_t) == 32 || BITS (hash_pair_t) == 64);
+  if (BITS (hash_pair_t) == 32)
+    log2_bytes += 2;
+  else if (BITS (hash_pair_t) == 64)
+    log2_bytes += 3;
+  return log2_bytes;
+}
+
+/* Public inline funcion to get size of a (key,value) pair */
+always_inline uword
+hash_pair_bytes (hash_t * h)
+{
+  return (uword) 1 << hash_pair_log2_bytes (h);
+}
+
+/* Public inline funcion to advance a pointer past one (key,value) pair */
+always_inline void *
+hash_forward1 (hash_t * h, void *v)
+{
+  return (u8 *) v + hash_pair_bytes (h);
+}
+
+/* Public inline funcion to advance a pointer past N (key,value) pairs */
+always_inline void *
+hash_forward (hash_t * h, void *v, uword n)
+{
+  return (u8 *) v + ((n * sizeof (hash_pair_t)) << h->log2_pair_size);
+}
+
+/** Iterate over hash pairs.
+
+    @param p    The current (key,value) pair. This should be of type
+                <code>(hash_pair_t *)</code>.
+    @param v    The hash table to iterate.
+    @param body The operation to perform on each (key,value) pair.
+
+    Executes the expression or code block @c body with each active hash pair.
+*/
+/* A previous version of this macro made use of the hash_pair_union_t
+ * structure; this version does not since that approach mightily upset
+ * the static analysis tool. In the rare chance someone is reading this
+ * code, pretend that _p below is of type hash_pair_union_t and that when
+ * used as an rvalue it's really using one of the union members as the
+ * rvalue. If you were confused before you might be marginally less
+ * confused after.
+ */
+#define hash_foreach_pair(p,v,body)                                         \
+do {                                                                        \
+ __label__ _hash_foreach_done;                                              \
+  hash_t * _h = hash_header (v);                                            \
+  void * _p;                                                                \
+  hash_pair_t * _q, * _q_end;                                               \
+  uword _i, _i1, _id, _pair_increment;                                      \
+                                                                            \
+  _p = (v);                                                                 \
+  _i = 0;                                                                   \
+  _pair_increment = 1;                                                      \
+  if ((v))                                                                  \
+      _pair_increment = 1 << _h->log2_pair_size;                            \
+  while (_i < hash_capacity (v))                                            \
+    {                                                                       \
+      _id = _h->is_user[_i / BITS (_h->is_user[0])];                        \
+      _i1 = _i + BITS (_h->is_user[0]);                                     \
+                                                                            \
+      do {                                                                  \
+        if (_id & 1)                                                        \
+          {                                                                 \
+            _q = _p;                                                        \
+            _q_end = _q + _pair_increment;                                  \
+          }                                                                 \
+        else                                                                \
+          {                                                                 \
+            hash_pair_indirect_t * _pi = _p;                                \
+            _q = _pi->pairs;                                                \
+            if (_h->log2_pair_size > 0)                                     \
+              _q_end = hash_forward (_h, _q, indirect_pair_get_len (_pi));  \
+            else                                                            \
+              _q_end = vec_end (_q);                                        \
+          }                                                                 \
+                                                                            \
+        /* Loop through all elements in bucket.                             \
+           Bucket may have 0 1 or more (indirect case) pairs. */            \
+        while (_q < _q_end)                                                 \
+          {                                                                 \
+            uword _break_in_body = 1;                                       \
+            (p) = _q;                                                       \
+            do {                                                            \
+              body;                                                         \
+              _break_in_body = 0;                                           \
+            } while (0);                                                    \
+            if (_break_in_body)                                             \
+              goto _hash_foreach_done;                                      \
+            _q += _pair_increment;                                          \
+          }                                                                 \
+                                                                            \
+        _p = (hash_pair_t *)_p + _pair_increment;                           \
+        _id = _id / 2;                                                      \
+        _i++;                                                               \
+      } while (_i < _i1);                                                   \
+    }                                                                       \
+  _hash_foreach_done:                                                       \
+  /* Be silent Mr. Compiler-Warning. */                                     \
+  ;                                                                         \
+ } while (0)
+
+/* Iterate over key/value pairs
+
+    @param key_var the current key
+    @param value_var the current value
+    @param h the hash table to iterate across
+    @param body the operation to perform on each (key_var,value_var) pair.
+
+    calls body with each active hash pair
+*/
+/* Iteratate over key/value pairs. */
+#define hash_foreach(key_var,value_var,h,body)			\
+do {								\
+  hash_pair_t * _r;						\
+  hash_foreach_pair (_r, (h), {					\
+    (key_var) = (__typeof__ (key_var)) _r->key;			\
+    (value_var) = (__typeof__ (value_var)) _r->value[0];	\
+    do { body; } while (0);					\
+  });								\
+} while (0)
+
+/* Iterate over key/value pairs for pointer key hash tables
+
+    @param key_var the current key
+    @param value_var the current value
+    @param h the hash table to iterate across
+    @param body the operation to perform on each (key_var,value_var) pair.
+
+    calls body with each active hash pair
+*/
+#define hash_foreach_mem(key_var,value_var,h,body)			\
+do {									\
+  hash_pair_t * _r;							\
+  hash_foreach_pair (_r, (h), {						\
+    (key_var) = (__typeof__ (key_var)) uword_to_pointer (_r->key, void *); \
+    (value_var) = (__typeof__ (value_var)) _r->value[0];		\
+    do { body; } while (0);						\
+  });									\
+} while (0)
+
+/* Support for iteration through hash table. */
+
+/* This struct saves iteration state for hash_next.
+   None of these fields are meant to be visible to the user.
+   Hence, the cryptic short-hand names. */
+typedef struct
+{
+  uword i, j, f;
+} hash_next_t;
+
+hash_pair_t *hash_next (void *v, hash_next_t * hn);
+
+void *_hash_create (uword elts, hash_t * h);
+
+always_inline void
+hash_set_value_bytes (hash_t * h, uword value_bytes)
+{
+  hash_pair_t *p;
+  h->log2_pair_size =
+    max_log2 ((sizeof (p->key) + value_bytes + sizeof (p->key) -
+	       1) / sizeof (p->key));
+}
+
+#define hash_create2(_elts,_user,_value_bytes,               \
+                     _key_sum,_key_equal,                    \
+                     _format_pair,_format_pair_arg)          \
+({							     \
+  hash_t _h;						     \
+  memset (&_h, 0, sizeof (_h));				     \
+  _h.user = (_user);				             \
+  _h.key_sum   = (hash_key_sum_function_t *) (_key_sum);     \
+  _h.key_equal = (_key_equal);				     \
+  hash_set_value_bytes (&_h, (_value_bytes));		     \
+  _h.format_pair = (format_function_t *) (_format_pair);     \
+  _h.format_pair_arg = (_format_pair_arg);                   \
+  _hash_create ((_elts), &_h);				     \
+})
+
+/* Hash function based on that of Bob Jenkins (bob_jenkins@compuserve.com).
+   Public domain per: http://www.burtleburtle.net/bob/hash/doobs.html
+   Thanks, Bob. */
+
+#define hash_mix_step(a,b,c,s0,s1,s2)		\
+do {						\
+  (a) -= (b) + (c); (a) ^= (c) >> (s0);		\
+  (b) -= (c) + (a); (b) ^= (a) << (s1);		\
+  (c) -= (a) + (b); (c) ^= (b) >> (s2);		\
+} while (0)
+
+#define hash_mix32_step_1(a,b,c) hash_mix_step(a,b,c,13,8,13)
+#define hash_mix32_step_2(a,b,c) hash_mix_step(a,b,c,12,16,5)
+#define hash_mix32_step_3(a,b,c) hash_mix_step(a,b,c,3,10,15)
+
+#define hash_mix64_step_1(a,b,c) hash_mix_step(a,b,c,43,9,8)
+#define hash_mix64_step_2(a,b,c) hash_mix_step(a,b,c,38,23,5)
+#define hash_mix64_step_3(a,b,c) hash_mix_step(a,b,c,35,49,11)
+#define hash_mix64_step_4(a,b,c) hash_mix_step(a,b,c,12,18,22)
+
+/* Hash function based on that of Bob Jenkins (bob_jenkins@compuserve.com).
+   Thanks, Bob. */
+#define hash_mix64(a0,b0,c0)			\
+do {						\
+  hash_mix64_step_1 (a0, b0, c0);		\
+  hash_mix64_step_2 (a0, b0, c0);		\
+  hash_mix64_step_3 (a0, b0, c0);		\
+  hash_mix64_step_4 (a0, b0, c0);		\
+} while (0)					\
+
+#define hash_mix32(a0,b0,c0)			\
+do {						\
+  hash_mix32_step_1 (a0, b0, c0);		\
+  hash_mix32_step_2 (a0, b0, c0);		\
+  hash_mix32_step_3 (a0, b0, c0);		\
+} while (0)					\
+
+/* Finalize from Bob Jenkins lookup3.c */
+
+always_inline uword
+hash32_rotate_left (u32 x, u32 i)
+{
+  return (x << i) | (x >> (BITS (i) - i));
+}
+
+#define hash_v3_mix32(a,b,c)					\
+do {								\
+  (a) -= (c); (a) ^= hash32_rotate_left ((c), 4); (c) += (b);	\
+  (b) -= (a); (b) ^= hash32_rotate_left ((a), 6); (a) += (c);	\
+  (c) -= (b); (c) ^= hash32_rotate_left ((b), 8); (b) += (a);	\
+  (a) -= (c); (a) ^= hash32_rotate_left ((c),16); (c) += (b);	\
+  (b) -= (a); (b) ^= hash32_rotate_left ((a),19); (a) += (c);	\
+  (c) -= (b); (c) ^= hash32_rotate_left ((b), 4); (b) += (a);	\
+} while (0)
+
+#define hash_v3_finalize32(a,b,c)			\
+do {							\
+  (c) ^= (b); (c) -= hash32_rotate_left ((b), 14);	\
+  (a) ^= (c); (a) -= hash32_rotate_left ((c), 11);	\
+  (b) ^= (a); (b) -= hash32_rotate_left ((a), 25);	\
+  (c) ^= (b); (c) -= hash32_rotate_left ((b), 16);	\
+  (a) ^= (c); (a) -= hash32_rotate_left ((c),  4);	\
+  (b) ^= (a); (b) -= hash32_rotate_left ((a), 14);	\
+  (c) ^= (b); (c) -= hash32_rotate_left ((b), 24);	\
+} while (0)
+
+/* 32 bit mixing/finalize in steps. */
+
+#define hash_v3_mix32_step1(a,b,c)				\
+do {								\
+  (a) -= (c); (a) ^= hash32_rotate_left ((c), 4); (c) += (b);	\
+  (b) -= (a); (b) ^= hash32_rotate_left ((a), 6); (a) += (c);	\
+} while (0)
+
+#define hash_v3_mix32_step2(a,b,c)				\
+do {								\
+  (c) -= (b); (c) ^= hash32_rotate_left ((b), 8); (b) += (a);	\
+  (a) -= (c); (a) ^= hash32_rotate_left ((c),16); (c) += (b);	\
+} while (0)
+
+#define hash_v3_mix32_step3(a,b,c)				\
+do {								\
+  (b) -= (a); (b) ^= hash32_rotate_left ((a),19); (a) += (c);	\
+  (c) -= (b); (c) ^= hash32_rotate_left ((b), 4); (b) += (a);	\
+} while (0)
+
+#define hash_v3_finalize32_step1(a,b,c)			\
+do {							\
+  (c) ^= (b); (c) -= hash32_rotate_left ((b), 14);	\
+  (a) ^= (c); (a) -= hash32_rotate_left ((c), 11);	\
+} while (0)
+
+#define hash_v3_finalize32_step2(a,b,c)			\
+do {							\
+  (b) ^= (a); (b) -= hash32_rotate_left ((a), 25);	\
+  (c) ^= (b); (c) -= hash32_rotate_left ((b), 16);	\
+} while (0)
+
+#define hash_v3_finalize32_step3(a,b,c)			\
+do {							\
+  (a) ^= (c); (a) -= hash32_rotate_left ((c),  4);	\
+  (b) ^= (a); (b) -= hash32_rotate_left ((a), 14);	\
+  (c) ^= (b); (c) -= hash32_rotate_left ((b), 24);	\
+} while (0)
+
+/* Vector v3 mixing/finalize. */
+#define hash_v3_mix_step_1_u32x(a,b,c)				\
+do {								\
+  (a) -= (c); (a) ^= u32x_irotate_left ((c), 4); (c) += (b);	\
+  (b) -= (a); (b) ^= u32x_irotate_left ((a), 6); (a) += (c);	\
+  (c) -= (b); (c) ^= u32x_irotate_left ((b), 8); (b) += (a);	\
+} while (0)
+
+#define hash_v3_mix_step_2_u32x(a,b,c)				\
+do {								\
+  (a) -= (c); (a) ^= u32x_irotate_left ((c),16); (c) += (b);	\
+  (b) -= (a); (b) ^= u32x_irotate_left ((a),19); (a) += (c);	\
+  (c) -= (b); (c) ^= u32x_irotate_left ((b), 4); (b) += (a);	\
+} while (0)
+
+#define hash_v3_finalize_step_1_u32x(a,b,c)		\
+do {							\
+  (c) ^= (b); (c) -= u32x_irotate_left ((b), 14);	\
+  (a) ^= (c); (a) -= u32x_irotate_left ((c), 11);	\
+  (b) ^= (a); (b) -= u32x_irotate_left ((a), 25);	\
+} while (0)
+
+#define hash_v3_finalize_step_2_u32x(a,b,c)		\
+do {							\
+  (c) ^= (b); (c) -= u32x_irotate_left ((b), 16);	\
+  (a) ^= (c); (a) -= u32x_irotate_left ((c),  4);	\
+  (b) ^= (a); (b) -= u32x_irotate_left ((a), 14);	\
+  (c) ^= (b); (c) -= u32x_irotate_left ((b), 24);	\
+} while (0)
+
+#define hash_v3_mix_u32x(a,b,c)			\
+do {						\
+  hash_v3_mix_step_1_u32x(a,b,c);		\
+  hash_v3_mix_step_2_u32x(a,b,c);		\
+} while (0)
+
+#define hash_v3_finalize_u32x(a,b,c)		\
+do {						\
+  hash_v3_finalize_step_1_u32x(a,b,c);		\
+  hash_v3_finalize_step_2_u32x(a,b,c);		\
+} while (0)
+
+extern uword hash_memory (void *p, word n_bytes, uword state);
+
+extern uword mem_key_sum (hash_t * h, uword key);
+extern uword mem_key_equal (hash_t * h, uword key1, uword key2);
+
+#define hash_create_mem(elts,key_bytes,value_bytes)	\
+  hash_create2((elts),(key_bytes),(value_bytes),mem_key_sum,mem_key_equal,0,0)
+
+extern uword vec_key_sum (hash_t * h, uword key);
+extern uword vec_key_equal (hash_t * h, uword key1, uword key2);
+extern u8 *vec_key_format_pair (u8 * s, va_list * args);
+
+#define hash_create_vec(elts,key_bytes,value_bytes)	\
+  hash_create2((elts),(key_bytes),(value_bytes),\
+               vec_key_sum,vec_key_equal,vec_key_format_pair,0)
+
+extern uword string_key_sum (hash_t * h, uword key);
+extern uword string_key_equal (hash_t * h, uword key1, uword key2);
+extern u8 *string_key_format_pair (u8 * s, va_list * args);
+
+#define hash_create_string(elts,value_bytes)                    \
+  hash_create2((elts),0,(value_bytes),                          \
+               (hash_key_sum_function_t *) KEY_FUNC_STRING,     \
+               (hash_key_equal_function_t *)KEY_FUNC_STRING,    \
+               0, 0)
+
+#define hash_create(elts,value_bytes)				\
+  hash_create2((elts),0,(value_bytes),				\
+               (hash_key_sum_function_t *) KEY_FUNC_NONE,	\
+               (hash_key_equal_function_t *) KEY_FUNC_NONE,	\
+               0,0)
+
+#define hash_create_uword(elts,value_bytes)				\
+  hash_create2((elts),0,(value_bytes),					\
+               (hash_key_sum_function_t *) KEY_FUNC_POINTER_UWORD,	\
+               (hash_key_equal_function_t *) KEY_FUNC_POINTER_UWORD,	\
+               0,0)
+
+#define hash_create_u32(elts,value_bytes)				\
+  hash_create2((elts),0,(value_bytes),					\
+               (hash_key_sum_function_t *) KEY_FUNC_POINTER_U32,	\
+               (hash_key_equal_function_t *) KEY_FUNC_POINTER_U32,	\
+               0,0)
+
+u8 *format_hash (u8 * s, va_list * va);
+
+/* Looks up input in hash table indexed by either vec string or
+   c string (null terminated). */
+unformat_function_t unformat_hash_vec_string;
+unformat_function_t unformat_hash_string;
+
+/* Main test routine. */
+int test_hash_main (unformat_input_t * input);
+
+static inline void
+hash_delete (void *bob)
+{
+}
+
+#endif /* included_hash_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/heap.c b/src/vppinfra/heap.c
new file mode 100644
index 00000000..2a5fb5c8
--- /dev/null
+++ b/src/vppinfra/heap.c
@@ -0,0 +1,828 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/cache.h>	/* for CLIB_CACHE_LINE_BYTES */
+#include <vppinfra/mem.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/error.h>
+
+always_inline heap_elt_t *
+elt_at (heap_header_t * h, uword i)
+{
+  ASSERT (i < vec_len (h->elts));
+  return h->elts + i;
+}
+
+always_inline heap_elt_t *
+last (heap_header_t * h)
+{
+  return elt_at (h, h->tail);
+}
+
+always_inline heap_elt_t *
+first (heap_header_t * h)
+{
+  return elt_at (h, h->head);
+}
+
+/* Objects sizes are binned into N_BINS bins.
+   Objects with size <= SMALL_BINS have their own bins.
+   Larger objects are grouped together in power or 2 sized
+   bins.
+
+   Sizes are in units of elt_bytes bytes. */
+
+/* Convert size to bin. */
+always_inline uword
+size_to_bin (uword size)
+{
+  uword bin;
+
+  ASSERT (size > 0);
+
+  if (size <= HEAP_SMALL_BINS)
+    {
+      bin = size - 1;
+      if (size == 0)
+	bin = 0;
+    }
+  else
+    {
+      bin = HEAP_SMALL_BINS + max_log2 (size) - (HEAP_LOG2_SMALL_BINS + 1);
+      if (bin >= HEAP_N_BINS)
+	bin = HEAP_N_BINS - 1;
+    }
+
+  return bin;
+}
+
+/* Convert bin to size. */
+always_inline __attribute__ ((unused))
+     uword bin_to_size (uword bin)
+{
+  uword size;
+
+  if (bin <= HEAP_SMALL_BINS - 1)
+    size = bin + 1;
+  else
+    size = (uword) 1 << ((bin - HEAP_SMALL_BINS) + HEAP_LOG2_SMALL_BINS + 1);
+
+  return size;
+}
+
+static void
+elt_delete (heap_header_t * h, heap_elt_t * e)
+{
+  heap_elt_t *l = vec_end (h->elts) - 1;
+
+  ASSERT (e >= h->elts && e <= l);
+
+  /* Update doubly linked pointers. */
+  {
+    heap_elt_t *p = heap_prev (e);
+    heap_elt_t *n = heap_next (e);
+
+    if (p == e)
+      {
+	n->prev = 0;
+	h->head = n - h->elts;
+      }
+    else if (n == e)
+      {
+	p->next = 0;
+	h->tail = p - h->elts;
+      }
+    else
+      {
+	p->next = n - p;
+	n->prev = p - n;
+      }
+  }
+
+  /* Add to index free list or delete from end. */
+  if (e < l)
+    vec_add1 (h->free_elts, e - h->elts);
+  else
+    _vec_len (h->elts)--;
+}
+
+/*
+  Before: P ... E
+  After : P ... NEW ... E
+*/
+always_inline void
+elt_insert_before (heap_header_t * h, heap_elt_t * e, heap_elt_t * new)
+{
+  heap_elt_t *p = heap_prev (e);
+
+  if (p == e)
+    {
+      new->prev = 0;
+      new->next = e - new;
+      p->prev = new - p;
+      h->head = new - h->elts;
+    }
+  else
+    {
+      new->prev = p - new;
+      new->next = e - new;
+      e->prev = new - e;
+      p->next = new - p;
+    }
+}
+
+/*
+  Before: E ... N
+  After : E ... NEW ... N
+*/
+always_inline void
+elt_insert_after (heap_header_t * h, heap_elt_t * e, heap_elt_t * new)
+{
+  heap_elt_t *n = heap_next (e);
+
+  if (n == e)
+    {
+      new->next = 0;
+      new->prev = e - new;
+      e->next = new - e;
+      h->tail = new - h->elts;
+    }
+  else
+    {
+      new->prev = e - new;
+      new->next = n - new;
+      e->next = new - e;
+      n->prev = new - n;
+    }
+}
+
+always_inline heap_elt_t *
+elt_new (heap_header_t * h)
+{
+  heap_elt_t *e;
+  uword l;
+  if ((l = vec_len (h->free_elts)) > 0)
+    {
+      e = elt_at (h, h->free_elts[l - 1]);
+      _vec_len (h->free_elts) -= 1;
+    }
+  else
+    vec_add2 (h->elts, e, 1);
+  return e;
+}
+
+/* Return pointer to object at given offset.
+   Used to write free list index of free objects. */
+always_inline u32 *
+elt_data (void *v, heap_elt_t * e)
+{
+  heap_header_t *h = heap_header (v);
+  return v + heap_offset (e) * h->elt_bytes;
+}
+
+always_inline void
+set_free_elt (void *v, heap_elt_t * e, uword fi)
+{
+  heap_header_t *h = heap_header (v);
+
+  e->offset |= HEAP_ELT_FREE_BIT;
+  if (h->elt_bytes >= sizeof (u32))
+    {
+      *elt_data (v, e) = fi;
+    }
+  else
+    {
+      /* For elt_bytes < 4 we must store free index in separate
+         vector. */
+      uword elt_index = e - h->elts;
+      vec_validate (h->small_free_elt_free_index, elt_index);
+      h->small_free_elt_free_index[elt_index] = fi;
+    }
+}
+
+always_inline uword
+get_free_elt (void *v, heap_elt_t * e, uword * bin_result)
+{
+  heap_header_t *h = heap_header (v);
+  uword fb, fi;
+
+  ASSERT (heap_is_free (e));
+  fb = size_to_bin (heap_elt_size (v, e));
+
+  if (h->elt_bytes >= sizeof (u32))
+    {
+      fi = *elt_data (v, e);
+    }
+  else
+    {
+      uword elt_index = e - h->elts;
+      fi = vec_elt (h->small_free_elt_free_index, elt_index);
+    }
+
+  *bin_result = fb;
+  return fi;
+}
+
+always_inline void
+remove_free_block (void *v, uword b, uword i)
+{
+  heap_header_t *h = heap_header (v);
+  uword l;
+
+  ASSERT (b < vec_len (h->free_lists));
+  ASSERT (i < vec_len (h->free_lists[b]));
+
+  l = vec_len (h->free_lists[b]);
+
+  if (i < l - 1)
+    {
+      uword t = h->free_lists[b][l - 1];
+      h->free_lists[b][i] = t;
+      set_free_elt (v, elt_at (h, t), i);
+    }
+  _vec_len (h->free_lists[b]) = l - 1;
+}
+
+static heap_elt_t *
+search_free_list (void *v, uword size)
+{
+  heap_header_t *h = heap_header (v);
+  heap_elt_t *f, *u;
+  uword b, fb, f_size, f_index;
+  word s, l;
+
+  if (!v)
+    return 0;
+
+  /* Search free lists for bins >= given size. */
+  for (b = size_to_bin (size); b < vec_len (h->free_lists); b++)
+    if ((l = vec_len (h->free_lists[b])) > 0)
+      {
+	/* Find an object that is large enough.
+	   Search list in reverse so that more recently freed objects will be
+	   allocated again sooner. */
+	do
+	  {
+	    l--;
+	    f_index = h->free_lists[b][l];
+	    f = elt_at (h, f_index);
+	    f_size = heap_elt_size (v, f);
+	    if ((s = f_size - size) >= 0)
+	      break;
+	  }
+	while (l >= 0);
+
+	/* If we fail to find a large enough object, try the next larger size. */
+	if (l < 0)
+	  continue;
+
+	ASSERT (heap_is_free (f));
+
+	/* Link in used object (u) after free object (f). */
+	if (s == 0)
+	  {
+	    u = f;
+	    fb = HEAP_N_BINS;
+	  }
+	else
+	  {
+	    u = elt_new (h);
+	    f = elt_at (h, f_index);
+	    elt_insert_after (h, f, u);
+	    fb = size_to_bin (s);
+	  }
+
+	u->offset = heap_offset (f) + s;
+
+	if (fb != b)
+	  {
+	    if (fb < HEAP_N_BINS)
+	      {
+		uword i;
+		vec_validate (h->free_lists, fb);
+		i = vec_len (h->free_lists[fb]);
+		vec_add1 (h->free_lists[fb], f - h->elts);
+		set_free_elt (v, f, i);
+	      }
+
+	    remove_free_block (v, b, l);
+	  }
+
+	return u;
+      }
+
+  return 0;
+}
+
+static void combine_free_blocks (void *v, heap_elt_t * e0, heap_elt_t * e1);
+
+static inline void
+dealloc_elt (void *v, heap_elt_t * e)
+{
+  heap_header_t *h = heap_header (v);
+  uword b, l;
+  heap_elt_t *n, *p;
+
+  b = size_to_bin (heap_elt_size (v, e));
+  vec_validate (h->free_lists, b);
+  l = vec_len (h->free_lists[b]);
+  vec_add1 (h->free_lists[b], e - h->elts);
+  set_free_elt (v, e, l);
+
+  /* See if we can combine the block we just freed with neighboring free blocks. */
+  p = heap_prev (e);
+  if (!heap_is_free (p))
+    p = e;
+
+  n = heap_next (e);
+  if (!heap_is_free (n))
+    n = e;
+
+  if (p != n)
+    combine_free_blocks (v, p, n);
+}
+
+void *
+_heap_alloc (void *v,
+	     uword size,
+	     uword align,
+	     uword elt_bytes, uword * offset_return, uword * handle_return)
+{
+  uword offset = 0, align_size;
+  heap_header_t *h;
+  heap_elt_t *e;
+
+  if (size == 0)
+    goto error;
+
+  /* Round up alignment to power of 2. */
+  if (align <= 1)
+    {
+      align = 0;
+      align_size = size;
+    }
+  else
+    {
+      align = max_pow2 (align);
+      align_size = size + align - 1;
+    }
+
+  e = search_free_list (v, align_size);
+
+  /* If nothing found on free list, allocate object from end of vector. */
+  if (!e)
+    {
+      uword max_len;
+
+      offset = vec_len (v);
+      max_len = heap_get_max_len (v);
+
+      if (max_len && offset + align_size > max_len)
+	goto error;
+
+      h = heap_header (v);
+      if (!v || !(h->flags & HEAP_IS_STATIC))
+	v = _vec_resize (v,
+			 align_size,
+			 (offset + align_size) * elt_bytes,
+			 sizeof (h[0]), HEAP_DATA_ALIGN);
+      else
+	_vec_len (v) += align_size;
+
+      if (offset == 0)
+	{
+	  h = heap_header (v);
+	  h->elt_bytes = elt_bytes;
+	}
+    }
+
+  h = heap_header (v);
+
+  /* Add new element to doubly linked chain of elements. */
+  if (!e)
+    {
+      e = elt_new (h);
+      e->offset = offset;
+      elt_insert_after (h, last (h), e);
+    }
+
+  if (align > 0)
+    {
+      uword e_index;
+      uword new_offset, old_offset;
+
+      old_offset = e->offset;
+      new_offset = (old_offset + align - 1) & ~(align - 1);
+      e->offset = new_offset;
+      e_index = e - h->elts;
+
+      /* Free fragments before and after aligned object. */
+      if (new_offset > old_offset)
+	{
+	  heap_elt_t *before_e = elt_new (h);
+	  before_e->offset = old_offset;
+	  elt_insert_before (h, h->elts + e_index, before_e);
+	  dealloc_elt (v, before_e);
+	}
+
+      if (new_offset + size < old_offset + align_size)
+	{
+	  heap_elt_t *after_e = elt_new (h);
+	  after_e->offset = new_offset + size;
+	  elt_insert_after (h, h->elts + e_index, after_e);
+	  dealloc_elt (v, after_e);
+	}
+
+      e = h->elts + e_index;
+    }
+
+  h->used_count++;
+
+  /* Keep track of used elements when debugging.
+     This allows deallocation to check that passed objects are valid. */
+  if (CLIB_DEBUG > 0)
+    {
+      uword handle = e - h->elts;
+      ASSERT (!clib_bitmap_get (h->used_elt_bitmap, handle));
+      h->used_elt_bitmap = clib_bitmap_ori (h->used_elt_bitmap, handle);
+    }
+
+  *offset_return = e->offset;
+  *handle_return = e - h->elts;
+  return v;
+
+error:
+  *offset_return = *handle_return = ~0;
+  return v;
+}
+
+void
+heap_dealloc (void *v, uword handle)
+{
+  heap_header_t *h = heap_header (v);
+  heap_elt_t *e;
+
+  ASSERT (handle < vec_len (h->elts));
+
+  /* For debugging we keep track of indices for valid objects.
+     We make sure user is not trying to free object with an invalid index. */
+  if (CLIB_DEBUG > 0)
+    {
+      ASSERT (clib_bitmap_get (h->used_elt_bitmap, handle));
+      h->used_elt_bitmap = clib_bitmap_andnoti (h->used_elt_bitmap, handle);
+    }
+
+  h->used_count--;
+
+  e = h->elts + handle;
+  ASSERT (!heap_is_free (e));
+
+  dealloc_elt (v, e);
+}
+
+/* While freeing objects at INDEX we noticed free blocks i0 <= index and
+   i1 >= index.  We combine these two or three blocks into one big free block. */
+static void
+combine_free_blocks (void *v, heap_elt_t * e0, heap_elt_t * e1)
+{
+  heap_header_t *h = heap_header (v);
+  uword total_size, i, b, tb, ti, i_last, g_offset;
+  heap_elt_t *e;
+
+  struct
+  {
+    u32 index;
+    u32 bin;
+    u32 bin_index;
+  } f[3], g;
+
+  /* Compute total size of free objects i0 through i1. */
+  total_size = 0;
+  for (i = 0, e = e0; 1; e = heap_next (e), i++)
+    {
+      ASSERT (i < ARRAY_LEN (f));
+
+      ti = get_free_elt (v, e, &tb);
+
+      ASSERT (tb < vec_len (h->free_lists));
+      ASSERT (ti < vec_len (h->free_lists[tb]));
+
+      f[i].index = h->free_lists[tb][ti];
+      f[i].bin = tb;
+      f[i].bin_index = ti;
+
+      total_size += heap_elt_size (v, elt_at (h, f[i].index));
+
+      if (e == e1)
+	{
+	  i_last = i;
+	  break;
+	}
+    }
+
+  /* Compute combined bin.  See if all objects can be
+     combined into existing bin. */
+  b = size_to_bin (total_size);
+  g.index = g.bin_index = 0;
+  for (i = 0; i <= i_last; i++)
+    if (b == f[i].bin)
+      {
+	g = f[i];
+	break;
+      }
+
+  /* Make sure we found a bin. */
+  if (i > i_last)
+    {
+      g.index = elt_new (h) - h->elts;
+      vec_validate (h->free_lists, b);
+      g.bin_index = vec_len (h->free_lists[b]);
+      vec_add1 (h->free_lists[b], g.index);
+      elt_insert_before (h, elt_at (h, f[0].index), elt_at (h, g.index));
+    }
+
+  g_offset = elt_at (h, f[0].index)->offset;
+
+  /* Delete unused bins. */
+  for (i = 0; i <= i_last; i++)
+    if (g.index != f[i].index)
+      {
+	ti = get_free_elt (v, elt_at (h, f[i].index), &tb);
+	remove_free_block (v, tb, ti);
+	elt_delete (h, elt_at (h, f[i].index));
+      }
+
+  /* Initialize new element. */
+  elt_at (h, g.index)->offset = g_offset;
+  set_free_elt (v, elt_at (h, g.index), g.bin_index);
+}
+
+uword
+heap_len (void *v, word handle)
+{
+  heap_header_t *h = heap_header (v);
+
+  if (CLIB_DEBUG > 0)
+    ASSERT (clib_bitmap_get (h->used_elt_bitmap, handle));
+  return heap_elt_size (v, elt_at (h, handle));
+}
+
+void *
+_heap_free (void *v)
+{
+  heap_header_t *h = heap_header (v);
+  uword b;
+
+  if (!v)
+    return v;
+
+  clib_bitmap_free (h->used_elt_bitmap);
+  for (b = 0; b < vec_len (h->free_lists); b++)
+    vec_free (h->free_lists[b]);
+  vec_free (h->free_lists);
+  vec_free (h->elts);
+  vec_free (h->free_elts);
+  vec_free (h->small_free_elt_free_index);
+  if (!(h->flags & HEAP_IS_STATIC))
+    vec_free_h (v, sizeof (h[0]));
+  return v;
+}
+
+uword
+heap_bytes (void *v)
+{
+  heap_header_t *h = heap_header (v);
+  uword bytes, b;
+
+  if (!v)
+    return 0;
+
+  bytes = sizeof (h[0]);
+  bytes += vec_len (v) * sizeof (h->elt_bytes);
+  for (b = 0; b < vec_len (h->free_lists); b++)
+    bytes += vec_capacity (h->free_lists[b], 0);
+  bytes += vec_bytes (h->free_lists);
+  bytes += vec_capacity (h->elts, 0);
+  bytes += vec_capacity (h->free_elts, 0);
+  bytes += vec_bytes (h->used_elt_bitmap);
+
+  return bytes;
+}
+
+static u8 *
+debug_elt (u8 * s, void *v, word i, word n)
+{
+  heap_elt_t *e, *e0, *e1;
+  heap_header_t *h = heap_header (v);
+  word j;
+
+  if (vec_len (h->elts) == 0)
+    return s;
+
+  if (i < 0)
+    e0 = first (h);
+  else
+    {
+      e0 = h->elts + i;
+      for (j = 0; j < n / 2; j++)
+	e0 = heap_prev (e0);
+    }
+
+  if (n < 0)
+    e1 = h->elts + h->tail;
+  else
+    {
+      e1 = h->elts + i;
+      for (j = 0; j < n / 2; j++)
+	e1 = heap_next (e1);
+    }
+
+  i = -n / 2;
+  for (e = e0; 1; e = heap_next (e))
+    {
+      if (heap_is_free (e))
+	s = format (s, "index %4d, free\n", e - h->elts);
+      else if (h->format_elt)
+	s = format (s, "%U", h->format_elt, v, elt_data (v, e));
+      else
+	s = format (s, "index %4d, used\n", e - h->elts);
+      i++;
+      if (e == e1)
+	break;
+    }
+
+  return s;
+}
+
+u8 *
+format_heap (u8 * s, va_list * va)
+{
+  void *v = va_arg (*va, void *);
+  uword verbose = va_arg (*va, uword);
+  heap_header_t *h = heap_header (v);
+  heap_header_t zero;
+
+  memset (&zero, 0, sizeof (zero));
+
+  if (!v)
+    h = &zero;
+
+  {
+    f64 elt_bytes = vec_len (v) * h->elt_bytes;
+    f64 overhead_bytes = heap_bytes (v);
+
+    s = format (s, "heap %p, %6d objects, size %.1fk + overhead %.1fk\n",
+		v, h->used_count, elt_bytes / 1024,
+		(overhead_bytes - elt_bytes) / 1024);
+  }
+
+  if (v && verbose)
+    s = debug_elt (s, v, -1, -1);
+
+  return s;
+}
+
+void
+heap_validate (void *v)
+{
+  heap_header_t *h = heap_header (v);
+  uword i, o, s;
+  u8 *free_map;
+  heap_elt_t *e, *n;
+
+  uword used_count, total_size;
+  uword free_count, free_size;
+
+  ASSERT (h->used_count == clib_bitmap_count_set_bits (h->used_elt_bitmap));
+
+  ASSERT (first (h)->prev == 0);
+  ASSERT (last (h)->next == 0);
+
+  /* Validate number of elements and size. */
+  free_size = free_count = 0;
+  for (i = 0; i < vec_len (h->free_lists); i++)
+    {
+      free_count += vec_len (h->free_lists[i]);
+      for (o = 0; o < vec_len (h->free_lists[i]); o++)
+	{
+	  e = h->elts + h->free_lists[i][o];
+	  s = heap_elt_size (v, e);
+	  ASSERT (size_to_bin (s) == i);
+	  ASSERT (heap_is_free (e));
+	  free_size += s;
+	}
+    }
+
+  {
+    uword elt_free_size, elt_free_count;
+
+    used_count = total_size = elt_free_size = elt_free_count = 0;
+    for (e = first (h); 1; e = n)
+      {
+	int is_free = heap_is_free (e);
+	used_count++;
+	s = heap_elt_size (v, e);
+	total_size += s;
+	ASSERT (is_free ==
+		!clib_bitmap_get (h->used_elt_bitmap, e - h->elts));
+	if (is_free)
+	  {
+	    elt_free_count++;
+	    elt_free_size += s;
+	  }
+	n = heap_next (e);
+	if (e == n)
+	  {
+	    ASSERT (last (h) == n);
+	    break;
+	  }
+
+	/* We should never have two free adjacent elements. */
+	ASSERT (!(heap_is_free (e) && heap_is_free (n)));
+      }
+
+    ASSERT (free_count == elt_free_count);
+    ASSERT (free_size == elt_free_size);
+    ASSERT (used_count == h->used_count + free_count);
+    ASSERT (total_size == vec_len (v));
+  }
+
+  free_map = vec_new (u8, used_count);
+
+  e = first (h);
+  for (i = o = 0; 1; i++)
+    {
+      ASSERT (heap_offset (e) == o);
+      s = heap_elt_size (v, e);
+
+      if (heap_is_free (e))
+	{
+	  uword fb, fi;
+
+	  fi = get_free_elt (v, e, &fb);
+
+	  ASSERT (fb < vec_len (h->free_lists));
+	  ASSERT (fi < vec_len (h->free_lists[fb]));
+	  ASSERT (h->free_lists[fb][fi] == e - h->elts);
+
+	  ASSERT (!free_map[i]);
+	  free_map[i] = 1;
+	}
+
+      n = heap_next (e);
+
+      if (e == n)
+	break;
+
+      ASSERT (heap_prev (n) == e);
+
+      o += s;
+      e = n;
+    }
+
+  vec_free (free_map);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/heap.h b/src/vppinfra/heap.h
new file mode 100644
index 00000000..8c1aae46
--- /dev/null
+++ b/src/vppinfra/heap.h
@@ -0,0 +1,357 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+/* Heaps of objects of type T (e.g. int, struct foo, ...).
+
+   Usage.  To declare a null heap:
+
+     T * heap = 0;
+
+   To allocate:
+
+     offset = heap_alloc (heap, size, handle);
+
+   New object is heap[offset] ... heap[offset + size]
+   Handle is used to free/query object.
+
+   To free object:
+
+     heap_dealloc (heap, handle);
+
+   To query the size of an object:
+
+     heap_size (heap, handle)
+
+*/
+
+#ifndef included_heap_h
+#define included_heap_h
+
+#include <vppinfra/clib.h>
+#include <vppinfra/cache.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/format.h>
+#include <vppinfra/bitmap.h>
+
+/* Doubly linked list of elements. */
+typedef struct
+{
+  /* Offset of this element (plus free bit).
+     If element is free, data at offset contains pointer to free list. */
+  u32 offset;
+
+  /* Index of next and previous elements relative to current element. */
+  i32 next, prev;
+} heap_elt_t;
+
+/* Use high bit of offset as free bit. */
+#define HEAP_ELT_FREE_BIT	(1 << 31)
+
+always_inline uword
+heap_is_free (heap_elt_t * e)
+{
+  return (e->offset & HEAP_ELT_FREE_BIT) != 0;
+}
+
+always_inline uword
+heap_offset (heap_elt_t * e)
+{
+  return e->offset & ~HEAP_ELT_FREE_BIT;
+}
+
+always_inline heap_elt_t *
+heap_next (heap_elt_t * e)
+{
+  return e + e->next;
+}
+
+always_inline heap_elt_t *
+heap_prev (heap_elt_t * e)
+{
+  return e + e->prev;
+}
+
+always_inline uword
+heap_elt_size (void *v, heap_elt_t * e)
+{
+  heap_elt_t *n = heap_next (e);
+  uword next_offset = n != e ? heap_offset (n) : vec_len (v);
+  return next_offset - heap_offset (e);
+}
+
+/* Sizes are binned.  Sizes 1 to 2^log2_small_bins have their
+   own free lists.  Larger sizes are grouped in powers of two. */
+#define HEAP_LOG2_SMALL_BINS	(5)
+#define HEAP_SMALL_BINS		(1 << HEAP_LOG2_SMALL_BINS)
+#define HEAP_N_BINS		(2 * HEAP_SMALL_BINS)
+
+/* Header for heaps. */
+typedef struct
+{
+  /* Vector of used and free elements. */
+  heap_elt_t *elts;
+
+  /* For elt_bytes < sizeof (u32) we need some extra space
+     per elt to store free list index. */
+  u32 *small_free_elt_free_index;
+
+  /* Vector of free indices of elts array. */
+  u32 *free_elts;
+
+  /* Indices of free elts indexed by size bin. */
+  u32 **free_lists;
+
+  format_function_t *format_elt;
+
+  /* Used for validattion/debugging. */
+  uword *used_elt_bitmap;
+
+  /* First and last element of doubly linked chain of elements. */
+  u32 head, tail;
+
+  u32 used_count, max_len;
+
+  /* Number of bytes in a help element. */
+  u32 elt_bytes;
+
+  u32 flags;
+  /* Static heaps are made from external memory given to
+     us by user and are not re-sizeable vectors. */
+#define HEAP_IS_STATIC (1)
+} heap_header_t;
+
+/* Start of heap elements is always cache aligned. */
+#define HEAP_DATA_ALIGN (CLIB_CACHE_LINE_BYTES)
+
+always_inline heap_header_t *
+heap_header (void *v)
+{
+  return vec_header (v, sizeof (heap_header_t));
+}
+
+always_inline uword
+heap_header_bytes ()
+{
+  return vec_header_bytes (sizeof (heap_header_t));
+}
+
+always_inline void
+heap_dup_header (heap_header_t * old, heap_header_t * new)
+{
+  uword i;
+
+  new[0] = old[0];
+  new->elts = vec_dup (new->elts);
+  new->free_elts = vec_dup (new->free_elts);
+  new->free_lists = vec_dup (new->free_lists);
+  for (i = 0; i < vec_len (new->free_lists); i++)
+    new->free_lists[i] = vec_dup (new->free_lists[i]);
+  new->used_elt_bitmap = clib_bitmap_dup (new->used_elt_bitmap);
+  new->small_free_elt_free_index = vec_dup (new->small_free_elt_free_index);
+}
+
+/* Make a duplicate copy of a heap. */
+#define heap_dup(v) _heap_dup(v, vec_len (v) * sizeof (v[0]))
+
+always_inline void *
+_heap_dup (void *v_old, uword v_bytes)
+{
+  heap_header_t *h_old, *h_new;
+  void *v_new;
+
+  h_old = heap_header (v_old);
+
+  if (!v_old)
+    return v_old;
+
+  v_new = 0;
+  v_new =
+    _vec_resize (v_new, _vec_len (v_old), v_bytes, sizeof (heap_header_t),
+		 HEAP_DATA_ALIGN);
+  h_new = heap_header (v_new);
+  heap_dup_header (h_old, h_new);
+  clib_memcpy (v_new, v_old, v_bytes);
+  return v_new;
+}
+
+always_inline uword
+heap_elts (void *v)
+{
+  heap_header_t *h = heap_header (v);
+  return h->used_count;
+}
+
+uword heap_bytes (void *v);
+
+always_inline void *
+_heap_new (u32 len, u32 n_elt_bytes)
+{
+  void *v = _vec_resize (0, len, (uword) len * n_elt_bytes,
+			 sizeof (heap_header_t),
+			 HEAP_DATA_ALIGN);
+  heap_header (v)->elt_bytes = n_elt_bytes;
+  return v;
+}
+
+#define heap_new(v) (v) = _heap_new (0, sizeof ((v)[0]))
+
+always_inline void
+heap_set_format (void *v, format_function_t * format_elt)
+{
+  ASSERT (v);
+  heap_header (v)->format_elt = format_elt;
+}
+
+always_inline void
+heap_set_max_len (void *v, uword max_len)
+{
+  ASSERT (v);
+  heap_header (v)->max_len = max_len;
+}
+
+always_inline uword
+heap_get_max_len (void *v)
+{
+  return v ? heap_header (v)->max_len : 0;
+}
+
+/* Create fixed size heap with given block of memory. */
+always_inline void *
+heap_create_from_memory (void *memory, uword max_len, uword elt_bytes)
+{
+  heap_header_t *h;
+  void *v;
+
+  if (max_len * elt_bytes < sizeof (h[0]))
+    return 0;
+
+  h = memory;
+  memset (h, 0, sizeof (h[0]));
+  h->max_len = max_len;
+  h->elt_bytes = elt_bytes;
+  h->flags = HEAP_IS_STATIC;
+
+  v = (void *) (memory + heap_header_bytes ());
+  _vec_len (v) = 0;
+  return v;
+}
+
+/* Execute BODY for each allocated heap element. */
+#define heap_foreach(var,len,heap,body)			\
+do {							\
+  if (vec_len (heap) > 0)				\
+    {							\
+      heap_header_t * _h = heap_header (heap);		\
+      heap_elt_t * _e   = _h->elts + _h->head;		\
+      heap_elt_t * _end = _h->elts + _h->tail;		\
+      while (1)						\
+	{						\
+	  if (! heap_is_free (_e))			\
+	    {						\
+	      (var) = (heap) + heap_offset (_e);	\
+	      (len) = heap_elt_size ((heap), _e);	\
+	      do { body; } while (0);			\
+	    }						\
+	  if (_e == _end)				\
+	    break;					\
+	  _e = heap_next (_e);				\
+	}						\
+    }							\
+} while (0)
+
+#define heap_elt_at_index(v,index) vec_elt_at_index(v,index)
+
+always_inline heap_elt_t *
+heap_get_elt (void *v, uword handle)
+{
+  heap_header_t *h = heap_header (v);
+  heap_elt_t *e = vec_elt_at_index (h->elts, handle);
+  ASSERT (!heap_is_free (e));
+  return e;
+}
+
+#define heap_elt_with_handle(v,handle)			\
+({							\
+  heap_elt_t * _e = heap_get_elt ((v), (handle));	\
+  (v) + heap_offset (_e);				\
+})
+
+always_inline uword
+heap_is_free_handle (void *v, uword heap_handle)
+{
+  heap_header_t *h = heap_header (v);
+  heap_elt_t *e = vec_elt_at_index (h->elts, heap_handle);
+  return heap_is_free (e);
+}
+
+extern uword heap_len (void *v, word handle);
+
+/* Low level allocation call. */
+extern void *_heap_alloc (void *v, uword size, uword alignment,
+			  uword elt_bytes, uword * offset, uword * handle);
+
+#define heap_alloc_aligned(v,size,align,handle)			\
+({								\
+  uword _o, _h;							\
+  uword _a = (align);						\
+  uword _s = (size);						\
+  (v) = _heap_alloc ((v), _s, _a, sizeof ((v)[0]), &_o, &_h);	\
+  (handle) = _h;						\
+  _o;								\
+})
+
+#define heap_alloc(v,size,handle) heap_alloc_aligned((v),(size),0,(handle))
+
+extern void heap_dealloc (void *v, uword handle);
+extern void heap_validate (void *v);
+
+/* Format heap internal data structures as string. */
+extern u8 *format_heap (u8 * s, va_list * va);
+
+void *_heap_free (void *v);
+
+#define heap_free(v) (v)=_heap_free(v)
+
+#endif /* included_heap_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/longjmp.S b/src/vppinfra/longjmp.S
new file mode 100644
index 00000000..d4dd4c7d
--- /dev/null
+++ b/src/vppinfra/longjmp.S
@@ -0,0 +1,690 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+	
+#if defined(__x86_64__)
+	.global clib_setjmp
+	.align 4
+	.type clib_setjmp, @function
+clib_setjmp:
+	movq %rbx, 8*0(%rdi)
+	movq %rbp, 8*1(%rdi)
+	movq %r12, 8*2(%rdi)
+	movq %r13, 8*3(%rdi)
+	movq %r14, 8*4(%rdi)
+	movq %r15, 8*5(%rdi)
+
+	/* Save SP after return. */
+	leaq 8(%rsp), %rdx
+	movq %rdx, 8*6(%rdi)
+	
+	/* Save PC we are returning to from stack frame. */
+	movq 0(%rsp), %rax
+	movq %rax, 8*7(%rdi)
+	
+	/* Give back user's return value. */
+	movq %rsi, %rax
+	ret
+	
+	.global clib_longjmp
+	.align 4
+	.type clib_longjmp, @function
+clib_longjmp:	
+        /* Restore regs. */
+	movq 8*0(%rdi), %rbx
+	movq 8*1(%rdi), %rbp
+	movq 8*2(%rdi), %r12
+	movq 8*3(%rdi), %r13
+	movq 8*4(%rdi), %r14
+	movq 8*5(%rdi), %r15
+	movq 8*6(%rdi), %rsp
+	movq 8*7(%rdi), %rdx
+	
+	/* Give back user's return value. */
+	movq %rsi, %rax
+	
+	/* Away we go. */
+	jmpq *%rdx	
+	
+	.global clib_calljmp
+	.align 4
+	.type clib_calljmp, @function
+clib_calljmp:
+	/* Make sure stack is 16-byte aligned. */
+	movq %rdx, %rax
+	andq $0xf, %rax
+	subq %rax, %rdx
+	
+	/* Get return address. */
+	pop %rax
+	
+	/* Switch to new stack. */
+	xchgq %rsp, %rdx
+	
+	/* Save return address on new stack. */
+	push %rax
+	
+	/* Save old stack pointer on new stack. */
+	push %rdx
+	
+	/* Get function. */
+	movq %rdi, %rdx
+	
+	/* Move argument into place. */
+	movq %rsi, %rdi
+	
+	/* Away we go. */
+	callq *%rdx
+	
+	/* Switch back to old stack. */
+	movq 8(%rsp), %rdx
+	movq 0(%rsp), %rcx
+	xchgq %rcx, %rsp
+	
+	/* Return to caller. */
+	jmpq *%rdx
+
+#elif defined(i386)
+	.global clib_setjmp
+	.align 4
+	.type clib_setjmp, @function
+clib_setjmp:
+	movl 4(%esp), %ecx
+	
+	movl %ebp, 4*0(%ecx)
+	movl %ebx, 4*1(%ecx)
+	movl %edi, 4*2(%ecx)
+	movl %esi, 4*3(%ecx)
+
+	/* Save SP after return. */
+	leal 4(%esp), %edx
+	movl %edx, 4*4(%ecx)
+	
+	/* Save PC we are returning to from stack frame. */
+	movl 0(%esp), %eax
+	movl %eax, 4*5(%ecx)
+	
+	/* Give back user's return value. */
+	movl 8(%esp), %eax
+	ret
+	
+	.global clib_longjmp
+	.align 4
+	.type clib_longjmp, @function
+clib_longjmp:	
+	movl 4(%esp), %ecx
+	
+	/* Give back user's return value. */
+	movl 8(%esp), %eax
+	
+        /* Restore regs. */
+	movl 4*0(%ecx), %ebp
+	movl 4*1(%ecx), %ebx
+	movl 4*2(%ecx), %edi
+	movl 4*3(%ecx), %esi
+	movl 4*4(%ecx), %esp
+	movl 4*5(%ecx), %edx
+	
+	/* Away we go. */
+	jmp *%edx	
+	
+	.global clib_calljmp
+	.align 4
+	.type clib_calljmp, @function
+clib_calljmp:	
+	/* Get new stack pointer. */
+	movl 12(%esp), %edx
+	
+	/* Switch stacks. */
+	xchgl %esp, %edx
+	
+	/* Save old stack pointer on new stack. */
+	sub $8, %esp
+	movl %edx, 4(%esp)
+	
+	/* Put function argument in stack frame. */
+	movl 8(%edx), %eax
+	movl %eax, 0(%esp)
+	
+	/* Get function. */
+	movl 4(%edx), %eax
+	
+	/* Away we go. */
+	call *%eax
+	
+	/* Switch back to old stack. */
+	movl 4(%esp), %edx
+	xchgl %edx, %esp
+	
+	/* Return to caller. */
+	ret
+	
+#elif defined(__SPU__)
+	
+#elif defined(__powerpc64__)
+	
+	.text
+
+#define _prologue(n)				\
+    .align 2 ;					\
+    .globl n, .##n ;				\
+    .section ".opd", "aw" ;			\
+    .align 3 ;					\
+n:  .quad .##n, .TOC.@tocbase, 0 ;		\
+    .previous ;					\
+    .size n, 24 ;				\
+    .type .##n, @function ;			\
+.##n:
+
+#define _foreach_14_31							\
+_ (14, 0)  _ (15, 1)  _ (16, 2)  _ (17, 3)  _ (18, 4)  _ (19, 5)	\
+_ (20, 6)  _ (21, 7)  _ (22, 8)  _ (23, 9)  _ (24, 10) _ (25, 11)	\
+_ (26, 12) _ (27, 13) _ (28, 14) _ (29, 15) _ (30, 16) _ (31, 17)
+
+#define _foreach_20_31						\
+_ (20, 0) _ (21, 1) _ (22, 2) _ (23, 3) _ (24, 4)  _ (25, 5)	\
+_ (26, 6) _ (27, 7) _ (28, 8) _ (29, 9) _ (30, 10) _ (31, 11)
+	
+#ifdef __ALTIVEC__
+#define CLIB_POWERPC_ALTIVEC_N_REGS 12
+#else
+#define CLIB_POWERPC_ALTIVEC_N_REGS 0
+#endif
+
+_prologue (clib_setjmp)
+	mflr 0
+	std 0, 8*0(3)
+	std 1, 8*1(3)
+	std 2, 8*2(3)
+	mfcr 0
+	std 0, 8*3(3)
+	mfspr 0, 256
+	stw 0, 8*4(3)
+	
+	/* gprs 14 - 31 */
+#define _(a,b) std a, 8*((b) + 4 + 18*0)(3) ; 
+	_foreach_14_31
+#undef _
+	
+	/* fprs 14 - 31 */
+#define _(a,b) stfd a, 8*((b) + 4 + 18*1)(3) ; 
+	_foreach_14_31
+#undef _
+
+#if CLIB_POWERPC_ALTIVEC_N_REGS > 0
+	/* vrs 20 - 31 */
+	li 5, 8*(4 + 18*2)
+#define _(a,b) stvx a, 5, 3 ; addi 5, 5, 16 ;
+	_foreach_20_31
+#undef _
+#endif /* CLIB_POWERPC_ALTIVEC_N_REGS > 0 */
+	
+	/* Return value. */
+	mr 3, 4
+	
+	blr
+	
+_prologue (clib_longjmp)
+	ld 0, 8*0(3)
+	mtlr 0
+	ld 1, 8*1(3)
+	ld 2, 8*2(3)
+	ld 0, 8*3(3)
+	mtcrf 0xff, 0
+	lwz 0, 8*3(3)
+	mtspr 256, 0
+	
+	/* gprs 14 - 31 */
+#define _(a,b) ld a, 8*((b) + 4 + 18*0)(3) ; 
+	_foreach_14_31
+#undef _
+	
+	/* fprs 14 - 31 */
+#define _(a,b) lfd a, 8*((b) + 4 + 18*1)(3) ; 
+	_foreach_14_31
+#undef _
+	
+#if CLIB_POWERPC_ALTIVEC_N_REGS > 0
+	/* vrs 20 - 31 */
+	li 5, 8*(4 + 18*2)
+#define _(a,b) lvx a, 5, 3 ; addi 5, 5, 16 ;
+	_foreach_20_31
+#undef _
+#endif /* CLIB_POWERPC_ALTIVEC_N_REGS > 0 */
+	
+	/* Return value. */
+	mr 3, 4
+	
+	blr
+
+	.globl clib_calljmp
+	.section	".opd","aw"
+	.align 3
+clib_calljmp:
+	.quad	.L.clib_calljmp,.TOC.@tocbase,0
+	.previous
+	.type	clib_calljmp, @function
+.L.clib_calljmp:
+	mflr 0
+	mr 9,3
+	std 0,16(1)
+	stdu 1,-112(1)
+#APP
+	std 1,-8(5)
+	addi 5,5,-256
+	mr 1,5
+#NO_APP
+	ld 10,0(9)
+	std 2,40(1)
+	mr 3,4
+	mtctr 10
+	ld 11,16(9)
+	ld 2,8(9)
+	bctrl
+	ld 2,40(1)
+#APP
+	addi 1,1,256
+	ld 1,-8(1)
+#NO_APP
+	addi 1,1,112
+	ld 0,16(1)
+	mtlr 0
+	blr
+	.long 0
+	.byte 0,0,0,1,128,0,0,0
+	.size	clib_calljmp,.-.L.clib_calljmp
+	
+#elif defined(__powerpc__)
+	
+#define _foreach_14_31							\
+_ (14, 0)  _ (15, 1)  _ (16, 2)  _ (17, 3)  _ (18, 4)  _ (19, 5)	\
+_ (20, 6)  _ (21, 7)  _ (22, 8)  _ (23, 9)  _ (24, 10) _ (25, 11)	\
+_ (26, 12) _ (27, 13) _ (28, 14) _ (29, 15) _ (30, 16) _ (31, 17)
+
+#define _foreach_20_31						\
+_ (20, 0) _ (21, 1) _ (22, 2) _ (23, 3) _ (24, 4)  _ (25, 5)	\
+_ (26, 6) _ (27, 7) _ (28, 8) _ (29, 9) _ (30, 10) _ (31, 11)
+	
+#ifdef __ALTIVEC__
+#define CLIB_POWERPC_ALTIVEC_N_REGS 12
+#else
+#define CLIB_POWERPC_ALTIVEC_N_REGS 0
+#endif
+
+	.global clib_setjmp
+	.align 4
+	.type clib_setjmp, @function
+clib_setjmp:
+	mflr 0
+	stw 0, 4*0(3)
+	stw 1, 4*1(3)
+	mfcr 0
+	stw 0, 4*2(3)
+#if CLIB_POWERPC_ALTIVEC_N_REGS > 0
+	mfspr 0, 256
+#endif
+	stw 0, 4*3(3)
+	
+#if CLIB_POWERPC_ALTIVEC_N_REGS > 0
+	li 5, 4*4
+#define _(a,b) stvx a, 3, 5 ; addi 5, 5, 16 ;
+	_foreach_20_31
+#undef _
+#endif /* CLIB_POWERPC_ALTIVEC_N_REGS > 0 */
+	
+	/* gp 14 - 31 */
+#define _(a,b) stw a,  4*(1*(b) + 4 + 4*CLIB_POWERPC_ALTIVEC_N_REGS + 0*18)(3) ; 
+	_foreach_14_31
+#undef _
+	
+	/* fp 14 - 31 */
+#define _(a,b) stfd a, 4*(2*(b) + 4 + 4*CLIB_POWERPC_ALTIVEC_N_REGS + 1*18)(3) ;
+	_foreach_14_31
+#undef _
+
+	/* Return value. */
+	mr 3, 4
+	
+	blr
+	
+	.global clib_longjmp
+	.align 4
+	.type clib_longjmp, @function
+clib_longjmp:	
+	
+	lwz 0, 4*0(3)
+	mtlr 0
+	lwz 1, 4*1(3)
+	lwz 0, 4*2(3)
+	mtcr 0
+	lwz 0, 4*3(3)
+#if CLIB_POWERPC_ALTIVEC_N_REGS > 0
+	mtspr 256, 0
+#endif
+	
+#if CLIB_POWERPC_ALTIVEC_N_REGS > 0
+	li 5, 4*4
+#define _(a,b) lvx a, 3, 5 ; addi 5, 5, 16 ;
+	_foreach_20_31
+#undef _
+#endif /* CLIB_POWERPC_ALTIVEC_N_REGS > 0 */
+	
+	/* gp 14 - 31 */
+#define _(a,b) lwz a, 4*(1*(b) + 4 + 4*CLIB_POWERPC_ALTIVEC_N_REGS + 0*18)(3) ;
+	_foreach_14_31
+#undef _
+	
+	/* fp 14 - 31 */
+#define _(a,b) lfd a, 4*(2*(b) + 4 + 4*CLIB_POWERPC_ALTIVEC_N_REGS + 1*18)(3) ;
+	_foreach_14_31
+#undef _
+
+	/* Return value. */
+	mr 3, 4
+	
+	blr
+
+	.global clib_calljmp
+	.align 4
+	.type clib_calljmp, @function
+clib_calljmp:	
+	/* Make sure stack is 16 byte aligned. */
+	andi. 0, 5, 0xf
+	sub  5, 5, 0
+	addi 5, 5, -16
+	
+	/* Save old stack/link pointer on new stack. */
+	stw 1, 0(5)
+	mflr 0
+	stw 0, 4(5)
+	
+	/* account for (sp, lr) tuple, and keep aligned */
+	addi 5, 5, -16
+	
+	/* Switch stacks. */
+	mr 1, 5
+	
+	/* Move argument into place. */
+	mtctr 3
+	mr 3, 4
+	
+	/* Away we go. */
+	bctrl
+	
+	/* back to our synthetic frame */
+	addi 1,1,16
+	
+	/* Switch back to old stack. */
+	lwz 0, 4(1)
+	mtlr 0
+	lwz 0, 0(1)
+	mr 1, 0
+	
+	/* Return to caller. */
+	blr
+	
+#elif defined(__arm__)
+	
+	.global clib_setjmp
+	.align 4
+	.type clib_setjmp, %function
+clib_setjmp:
+	mov ip, r0		/* jmp buffer */
+
+	/* Save integer registers */
+	stmia ip!, {v1-v6, sl, fp, sp, lr}
+	
+#ifdef __IWMMXT__
+	/* Save the call-preserved iWMMXt registers.  */
+	wstrd wr10, [ip], #8
+	wstrd wr11, [ip], #8
+	wstrd wr12, [ip], #8
+	wstrd wr13, [ip], #8
+	wstrd wr14, [ip], #8
+	wstrd wr15, [ip], #8
+#endif
+
+	/* Give back user's return value. */
+	mov r0, r1
+	bx lr
+	
+	.global clib_longjmp
+	.align 4
+	.type clib_longjmp, %function
+clib_longjmp:	
+	mov ip, r0		/* jmp buffer */
+
+	/* Restore integer registers. */
+	ldmia     ip!,  {v1-v6, sl, fp, sp, lr}
+	
+#ifdef __IWMMXT__
+	/* Save the call-preserved iWMMXt registers.  */
+	wldrd wr10, [ip], #8
+	wldrd wr11, [ip], #8
+	wldrd wr12, [ip], #8
+	wldrd wr13, [ip], #8
+	wldrd wr14, [ip], #8
+	wldrd wr15, [ip], #8
+#endif
+	
+	/* Give back user's return value. */
+	mov r0, r1
+	bx lr
+
+	.global clib_calljmp
+	.align 4
+	.type clib_calljmp, %function
+clib_calljmp:	
+	/* Make sure stack is 8 byte aligned. */
+	bic r2, r2, #7
+	
+	/* Allocate space for stack/link pointer on new stack. */
+	sub r2, r2, #8	
+	
+	/* Save old stack/link pointer on new stack. */
+	str sp, [r2, #0]
+	str lr, [r2, #4]
+	
+	/* Switch stacks. */
+	mov sp, r2
+	
+	/* Save function to call. */
+	mov ip, r0
+	
+	/* Move argument into place. */
+	mov r0, r1
+	
+	/* Away we go. */
+	bx ip
+	
+	/* Switch back to old stack. */
+	ldr lr, [sp, #4]
+	ldr ip, [sp, #0]
+	mov sp, ip
+	
+	/* Return to caller. */
+	bx lr
+	
+#elif defined(__xtensa__)
+	
+	/* FIXME implement if needed. */
+	.global clib_setjmp
+	.align 4
+	.type clib_setjmp, %function
+clib_setjmp:
+1:	j 1b
+
+	.global clib_longjmp
+	.align 4
+	.type clib_longjmp, @function
+clib_longjmp:	
+1:	j 1b
+	
+	.global clib_calljmp
+	.align 4
+	.type clib_calljmp, %function
+clib_calljmp:	
+1:	j 1b
+	
+#elif defined(__TMS320C6X__)
+	
+	/* FIXME implement if needed. */
+	.global clib_setjmp
+	.align 4
+	.type clib_setjmp, %function
+clib_setjmp:
+1:	B	.S1     1b
+
+	.global clib_longjmp
+	.align 4
+	.type clib_longjmp, @function
+clib_longjmp:	
+1:	B	.S1     1b
+	
+	.global clib_calljmp
+	.align 4
+	.type clib_calljmp, %function
+clib_calljmp:	
+1:	B	.S1     1b
+	
+#elif defined (__aarch64__)
+/*
+   Copyright (c) 2011, 2012 ARM Ltd
+   All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+   3. The name of the company may not be used to endorse or promote
+      products derived from this software without specific prior written
+      permission.
+   THIS SOFTWARE IS PROVIDED BY ARM LTD ``AS IS'' AND ANY EXPRESS OR IMPLIED
+   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+   IN NO EVENT SHALL ARM LTD BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+   TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#define GPR_LAYOUT			\
+	REG_PAIR (x19, x20,  0);	\
+	REG_PAIR (x21, x22, 16);	\
+	REG_PAIR (x23, x24, 32);	\
+	REG_PAIR (x25, x26, 48);	\
+	REG_PAIR (x27, x28, 64);	\
+	REG_PAIR (x29, x30, 80);	\
+	REG_ONE (x16,      96)
+#define FPR_LAYOUT			\
+	REG_PAIR ( d8,  d9, 112);	\
+	REG_PAIR (d10, d11, 128);	\
+	REG_PAIR (d12, d13, 144);	\
+	REG_PAIR (d14, d15, 160);
+// int clib_setjmp (jmp_buf)
+	.global	clib_setjmp
+	.type	clib_setjmp, %function
+clib_setjmp:
+	mov	x16, sp
+#define REG_PAIR(REG1, REG2, OFFS)	stp REG1, REG2, [x0, OFFS]
+#define REG_ONE(REG1, OFFS)		str REG1, [x0, OFFS]
+	GPR_LAYOUT
+	FPR_LAYOUT
+#undef REG_PAIR
+#undef REG_ONE
+	mov	x0, x1
+	ret
+	.size	clib_setjmp, .-clib_setjmp
+// void clib_longjmp (jmp_buf, int) __attribute__ ((noreturn))
+	.global	clib_longjmp
+	.type	clib_longjmp, %function
+clib_longjmp:
+#define REG_PAIR(REG1, REG2, OFFS)	ldp REG1, REG2, [x0, OFFS]
+#define REG_ONE(REG1, OFFS)		ldr REG1, [x0, OFFS]
+	GPR_LAYOUT
+	FPR_LAYOUT
+#undef REG_PAIR
+#undef REG_ONE
+	mov	sp, x16
+	mov     x0, x1
+	// cmp	w1, #0
+	// cinc	w0, w1, eq
+	// use br not ret, as ret is guaranteed to mispredict
+	br	x30
+	.size	clib_longjmp, .-clib_longjmp
+
+
+// void clib_calljmp (x0=function, x1=arg, x2=new_stack)
+	.global	clib_calljmp
+	.type	clib_calljmp, %function
+clib_calljmp:
+	// save fn ptr
+	mov     x3, x0
+	// set up fn arg
+	mov     x0, x1
+	// switch stacks
+	mov     x4, sp
+	
+	// space for saved sp, lr on new stack
+	sub     x2, x2, #16
+	mov     sp, x2
+	
+	// save old sp and link register on new stack
+        str     x4, [sp]
+	str     x30,[sp,#8]
+        mov     x4, sp
+
+	// go there
+        blr     x3
+	
+	// restore old sp and link register
+	mov     x4, sp
+        
+	ldr     x3, [x4]
+	ldr     x30,[x4, #8]
+        mov     sp, x3
+	ret
+	.size	clib_calljmp, .-clib_calljmp
+#else
+#error "unknown machine"
+#endif	
+
+.section .note.GNU-stack,"",%progbits
diff --git a/src/vppinfra/longjmp.h b/src/vppinfra/longjmp.h
new file mode 100644
index 00000000..8d83203e
--- /dev/null
+++ b/src/vppinfra/longjmp.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_longjmp_h
+#define included_clib_longjmp_h
+
+#include <vppinfra/types.h>
+
+#if defined(__x86_64__)
+/* rbx, rbp, r12, r13, r14, r15, eip, rsp */
+#define CLIB_ARCH_LONGJMP_REGS 8
+
+#elif defined(i386)
+/* ebx, ebp, esi, edi, eip, rsp */
+#define CLIB_ARCH_LONGJMP_REGS 6
+
+#elif (defined(__powerpc64__) || defined(__powerpc__))
+
+#ifdef __ALTIVEC__
+#define CLIB_POWERPC_ALTIVEC_N_REGS 12
+#else
+#define CLIB_POWERPC_ALTIVEC_N_REGS 0
+#endif
+
+/* r1 r2 link condition+vsave regs 14-31 fp regs 14-31 vector regs 20-31 */
+#define CLIB_ARCH_LONGJMP_REGS				\
+  (/* r1 lr cr vrsave */				\
+   4							\
+   /* gp */						\
+   + (31 - 14 + 1)					\
+   /* fp */						\
+   + (sizeof (f64) / sizeof (uword)) * (31 - 14 + 1)	\
+   /* vector regs */					\
+   + (16 / sizeof (uword)) * CLIB_POWERPC_ALTIVEC_N_REGS)
+
+#elif defined(__SPU__)
+/* FIXME */
+#define CLIB_ARCH_LONGJMP_REGS (10)
+
+#elif defined(__arm__)
+
+#ifndef __IWMMXT__
+/* v1-v6 sl fp sp lr */
+#define CLIB_ARCH_LONGJMP_REGS (10)
+#else
+/* For iwmmxt we save 6 extra 8 byte registers. */
+#define CLIB_ARCH_LONGJMP_REGS (10 + (6*2))
+#endif
+
+#elif defined(__xtensa__)
+
+/* setjmp/longjmp not supported for the moment. */
+#define CLIB_ARCH_LONGJMP_REGS 0
+
+#elif defined(__TMS320C6X__)
+
+/* setjmp/longjmp not supported for the moment. */
+#define CLIB_ARCH_LONGJMP_REGS 0
+
+#elif defined(__aarch64__)
+#define CLIB_ARCH_LONGJMP_REGS (22)
+#else
+#error "unknown machine"
+#endif
+
+typedef struct
+{
+  uword regs[CLIB_ARCH_LONGJMP_REGS];
+} clib_longjmp_t __attribute__ ((aligned (16)));
+
+/* Return given value to saved context. */
+void clib_longjmp (clib_longjmp_t * save, uword return_value);
+
+/* Save context.  Returns given value if jump is not taken;
+   otherwise returns value from clib_longjmp if long jump is taken. */
+uword clib_setjmp (clib_longjmp_t * save, uword return_value_not_taken);
+
+/* Call function on given stack. */
+uword clib_calljmp (uword (*func) (uword func_arg),
+		    uword func_arg, void *stack);
+
+#endif /* included_clib_longjmp_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/macros.c b/src/vppinfra/macros.c
new file mode 100644
index 00000000..ce4cc9bc
--- /dev/null
+++ b/src/vppinfra/macros.c
@@ -0,0 +1,266 @@
+/*
+  macros.c - a simple macro expander
+
+  Copyright (c) 2010, 2014 Cisco and/or its affiliates.
+
+  * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#include <vppinfra/macros.h>
+
+static inline int
+macro_isalnum (i8 c)
+{
+  if ((c >= 'A' && c <= 'Z')
+      || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || (c == '_'))
+    return 1;
+  return 0;
+}
+
+static i8 *
+builtin_eval (macro_main_t * mm, i8 * varname, i32 complain)
+{
+  uword *p;
+  i8 *(*fp) (macro_main_t *, i32);
+
+  p = hash_get_mem (mm->the_builtin_eval_hash, varname);
+  if (p == 0)
+    return 0;
+  fp = (void *) (p[0]);
+  return (*fp) (mm, complain);
+}
+
+int
+clib_macro_unset (macro_main_t * mm, char *name)
+{
+  hash_pair_t *p;
+  u8 *key, *value;
+
+  p = hash_get_pair (mm->the_value_table_hash, name);
+
+  if (p == 0)
+    return 1;
+
+  key = (u8 *) (p->key);
+  value = (u8 *) (p->value[0]);
+  hash_unset_mem (mm->the_value_table_hash, name);
+
+  vec_free (value);
+  vec_free (key);
+  return 0;
+}
+
+int
+clib_macro_set_value (macro_main_t * mm, char *name, char *value)
+{
+  u8 *key_copy, *value_copy;
+  int rv;
+
+  rv = clib_macro_unset (mm, name);
+
+  key_copy = format (0, "%s%c", name, 0);
+  value_copy = format (0, "%s%c", value, 0);
+
+  hash_set_mem (mm->the_value_table_hash, key_copy, value_copy);
+  return rv;
+}
+
+i8 *
+clib_macro_get_value (macro_main_t * mm, char *name)
+{
+  uword *p;
+
+  p = hash_get_mem (mm->the_value_table_hash, name);
+  if (p)
+    return (i8 *) (p[0]);
+  else
+    return 0;
+}
+
+/*
+ * eval: takes a string, returns a vector.
+ * looks up $foobar in the variable table.
+ */
+i8 *
+clib_macro_eval (macro_main_t * mm, i8 * s, i32 complain)
+{
+  i8 *rv = 0;
+  i8 *varname, *varvalue;
+  i8 *ts;
+
+  while (*s)
+    {
+      switch (*s)
+	{
+	case '\\':
+	  s++;
+	  /* fallthrough */
+
+	default:
+	  vec_add1 (rv, *s);
+	  s++;
+	  break;
+
+	case '$':
+	  s++;
+	  varname = 0;
+	  /*
+	   * Make vector with variable name in it.
+	   */
+	  while (*s && (macro_isalnum (*s) || (*s == '_') || (*s == '(')))
+	    {
+
+	      /* handle $(foo) */
+	      if (*s == '(')
+		{
+		  s++;		/* skip '(' */
+		  while (*s && *s != ')')
+		    {
+		      vec_add1 (varname, *s);
+		      s++;
+		    }
+		  if (*s)
+		    s++;	/* skip ')' */
+		  break;
+		}
+	      vec_add1 (varname, *s);
+	      s++;
+	    }
+	  /* null terminate */
+	  vec_add1 (varname, 0);
+	  /* Look for a builtin, e.g. $my_hostname */
+	  if (!(varvalue = builtin_eval (mm, varname, complain)))
+	    {
+	      /* Look in value table */
+	      if (!varvalue)
+		{
+		  char *tmp = clib_macro_get_value (mm, varname);
+		  if (tmp)
+		    varvalue = (i8 *) format (0, "%s%c", tmp, 0);
+		}
+#ifdef CLIB_UNIX
+	      /* Look in environment. */
+	      if (!varvalue)
+		{
+		  char *tmp = getenv (varname);
+		  if (tmp)
+		    varvalue = (i8 *) format (0, "%s%c", tmp, 0);
+		}
+#endif /* CLIB_UNIX */
+	    }
+	  if (varvalue)
+	    {
+	      /* recursively evaluate */
+	      ts = clib_macro_eval (mm, varvalue, complain);
+	      vec_free (varvalue);
+	      /* add results to answer */
+	      vec_append (rv, ts);
+	      /* Remove NULL termination or the results are sad */
+	      _vec_len (rv) = vec_len (rv) - 1;
+	      vec_free (ts);
+	    }
+	  else
+	    {
+	      if (complain)
+		clib_warning ("Undefined Variable Reference: %s\n", varname);
+	      vec_append (rv, format (0, "UNSET "));
+	      _vec_len (rv) = vec_len (rv) - 1;
+
+	    }
+	  vec_free (varname);
+	}
+    }
+  vec_add1 (rv, 0);
+  return (rv);
+}
+
+/*
+ * eval: takes a string, returns a vector.
+ * looks up $foobar in the variable table.
+ */
+i8 *
+clib_macro_eval_dollar (macro_main_t * mm, i8 * s, i32 complain)
+{
+  i8 *s2;
+  i8 *rv;
+
+  s2 = (i8 *) format (0, "$(%s)%c", s, 0);
+  rv = clib_macro_eval (mm, s2, complain);
+  vec_free (s2);
+  return (rv);
+}
+
+void
+clib_macro_add_builtin (macro_main_t * mm, char *name, void *eval_fn)
+{
+  hash_set_mem (mm->the_builtin_eval_hash, name, (uword) eval_fn);
+}
+
+#ifdef CLIB_UNIX
+static i8 *
+eval_hostname (macro_main_t * mm, i32 complain)
+{
+  char tmp[128];
+  if (gethostname (tmp, sizeof (tmp)))
+    return ((i8 *) format (0, "gethostname-error%c", 0));
+  return ((i8 *) format (0, "%s%c", tmp, 0));
+}
+#endif
+
+void
+clib_macro_init (macro_main_t * mm)
+{
+  if (mm->the_builtin_eval_hash != 0)
+    {
+      clib_warning ("mm %p already initialized", mm);
+      return;
+    }
+
+  mm->the_builtin_eval_hash = hash_create_string (0, sizeof (uword));
+  mm->the_value_table_hash = hash_create_string (0, sizeof (uword));
+
+#ifdef CLIB_UNIX
+  hash_set_mem (mm->the_builtin_eval_hash, "hostname", (uword) eval_hostname);
+#endif
+}
+
+void
+clib_macro_free (macro_main_t * mm)
+{
+  hash_pair_t *p;
+  u8 **strings_to_free = 0;
+  int i;
+
+  hash_free (mm->the_builtin_eval_hash);
+
+  /* *INDENT-OFF* */
+  hash_foreach_pair (p, mm->the_value_table_hash,
+  ({
+    vec_add1 (strings_to_free, (u8 *) (p->key));
+    vec_add1 (strings_to_free, (u8 *) (p->value[0]));
+  }));
+  /* *INDENT-ON* */
+
+  for (i = 0; i < vec_len (strings_to_free); i++)
+    vec_free (strings_to_free[i]);
+  vec_free (strings_to_free);
+  hash_free (mm->the_value_table_hash);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/macros.h b/src/vppinfra/macros.h
new file mode 100644
index 00000000..5c2e7033
--- /dev/null
+++ b/src/vppinfra/macros.h
@@ -0,0 +1,54 @@
+/*
+  macros.h - definitions for a simple macro expander
+
+  Copyright (c) 2010, 2014 Cisco and/or its affiliates.
+
+  * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#ifndef included_macros_h
+#define included_macros_h
+
+#include <vppinfra/vec.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/format.h>
+
+#ifdef CLIB_UNIX
+#include <stdlib.h>
+#include <unistd.h>
+#endif
+
+typedef struct
+{
+  uword *the_builtin_eval_hash;
+  uword *the_value_table_hash;
+} macro_main_t;
+
+int clib_macro_unset (macro_main_t * mm, char *name);
+int clib_macro_set_value (macro_main_t * mm, char *name, char *value);
+void clib_macro_add_builtin (macro_main_t * mm, char *name, void *eval_fn);
+i8 *clib_macro_get_value (macro_main_t * mm, char *name);
+i8 *clib_macro_eval (macro_main_t * mm, i8 * s, i32 complain);
+i8 *clib_macro_eval_dollar (macro_main_t * mm, i8 * s, i32 complain);
+void clib_macro_init (macro_main_t * mm);
+void clib_macro_free (macro_main_t * mm);
+
+#endif /* included_macros_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/math.h b/src/vppinfra/math.h
new file mode 100644
index 00000000..48f8c0f4
--- /dev/null
+++ b/src/vppinfra/math.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_math_h
+#define included_math_h
+
+#include <vppinfra/clib.h>
+
+always_inline f64
+sqrt (f64 x)
+{
+  return __builtin_sqrt (x);
+}
+
+always_inline f64
+fabs (f64 x)
+{
+  return __builtin_fabs (x);
+}
+
+#endif /* included_math_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/md5.c b/src/vppinfra/md5.c
new file mode 100644
index 00000000..9ac1efc7
--- /dev/null
+++ b/src/vppinfra/md5.c
@@ -0,0 +1,317 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+ */
+
+#include <vppinfra/string.h>	/* for memset */
+#include <vppinfra/byte_order.h>
+#include <vppinfra/md5.h>
+
+/* F, G, H and I are basic MD5 functions. */
+#define F(b, c, d) (d ^ (b & (c ^ d)))
+#define G(b, c, d) F (d, b, c)
+#define H(b, c, d) (b ^ c ^ d)
+#define I(b, c, d) (c ^ (b | ~d))
+
+/* ROTATE_LEFT rotates x left n bits. */
+#define ROTATE_LEFT(x,n) \
+  (((x) << (n)) | ((x) >> (32 - (n))))
+
+/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
+   Rotation is separate from addition to prevent recomputation. */
+#define FF(a,b,c,d,x,s,ac)			\
+do {						\
+  a += F (b, c, d) + x + ac;			\
+  a = ROTATE_LEFT (a, s);			\
+  a += b;					\
+} while (0)
+
+#define GG(a,b,c,d,x,s,ac)			\
+do {						\
+  a += G (b, c, d) + x + ac;			\
+  a = ROTATE_LEFT (a, s);			\
+  a += b;					\
+} while (0)
+
+#define HH(a,b,c,d,x,s,ac)			\
+do {						\
+  a += H (b, c, d) + x + ac;			\
+  a = ROTATE_LEFT (a, s);			\
+  a += b;					\
+} while (0)
+
+#define II(a,b,c,d,x,s,ac)			\
+do {						\
+  a += I (b, c, d) + x + ac;			\
+  a = ROTATE_LEFT (a, s);			\
+  a += b;					\
+} while (0)
+
+#undef _
+
+/* MD5 basic transformation. Transforms state based on block. */
+static void
+md5_transform (md5_context_t * m, u32 * data, u32 * result, int zero_buffer)
+{
+  u32 a = m->state[0], b = m->state[1], c = m->state[2], d = m->state[3];
+  u32 *x = data;
+
+/* Constants for MD5Transform routine. */
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+
+  /* Round 1 */
+  FF (a, b, c, d, clib_host_to_little_u32 (x[0]), S11, 0xd76aa478);	/* 1 */
+  FF (d, a, b, c, clib_host_to_little_u32 (x[1]), S12, 0xe8c7b756);	/* 2 */
+  FF (c, d, a, b, clib_host_to_little_u32 (x[2]), S13, 0x242070db);	/* 3 */
+  FF (b, c, d, a, clib_host_to_little_u32 (x[3]), S14, 0xc1bdceee);	/* 4 */
+  FF (a, b, c, d, clib_host_to_little_u32 (x[4]), S11, 0xf57c0faf);	/* 5 */
+  FF (d, a, b, c, clib_host_to_little_u32 (x[5]), S12, 0x4787c62a);	/* 6 */
+  FF (c, d, a, b, clib_host_to_little_u32 (x[6]), S13, 0xa8304613);	/* 7 */
+  FF (b, c, d, a, clib_host_to_little_u32 (x[7]), S14, 0xfd469501);	/* 8 */
+  FF (a, b, c, d, clib_host_to_little_u32 (x[8]), S11, 0x698098d8);	/* 9 */
+  FF (d, a, b, c, clib_host_to_little_u32 (x[9]), S12, 0x8b44f7af);	/* 10 */
+  FF (c, d, a, b, clib_host_to_little_u32 (x[10]), S13, 0xffff5bb1);	/* 11 */
+  FF (b, c, d, a, clib_host_to_little_u32 (x[11]), S14, 0x895cd7be);	/* 12 */
+  FF (a, b, c, d, clib_host_to_little_u32 (x[12]), S11, 0x6b901122);	/* 13 */
+  FF (d, a, b, c, clib_host_to_little_u32 (x[13]), S12, 0xfd987193);	/* 14 */
+  FF (c, d, a, b, clib_host_to_little_u32 (x[14]), S13, 0xa679438e);	/* 15 */
+  FF (b, c, d, a, clib_host_to_little_u32 (x[15]), S14, 0x49b40821);	/* 16 */
+
+  /* Round 2 */
+  GG (a, b, c, d, x[1], S21, 0xf61e2562);	/* 17 */
+  GG (d, a, b, c, x[6], S22, 0xc040b340);	/* 18 */
+  GG (c, d, a, b, x[11], S23, 0x265e5a51);	/* 19 */
+  GG (b, c, d, a, x[0], S24, 0xe9b6c7aa);	/* 20 */
+  GG (a, b, c, d, x[5], S21, 0xd62f105d);	/* 21 */
+  GG (d, a, b, c, x[10], S22, 0x02441453);	/* 22 */
+  GG (c, d, a, b, x[15], S23, 0xd8a1e681);	/* 23 */
+  GG (b, c, d, a, x[4], S24, 0xe7d3fbc8);	/* 24 */
+  GG (a, b, c, d, x[9], S21, 0x21e1cde6);	/* 25 */
+  GG (d, a, b, c, x[14], S22, 0xc33707d6);	/* 26 */
+  GG (c, d, a, b, x[3], S23, 0xf4d50d87);	/* 27 */
+  GG (b, c, d, a, x[8], S24, 0x455a14ed);	/* 28 */
+  GG (a, b, c, d, x[13], S21, 0xa9e3e905);	/* 29 */
+  GG (d, a, b, c, x[2], S22, 0xfcefa3f8);	/* 30 */
+  GG (c, d, a, b, x[7], S23, 0x676f02d9);	/* 31 */
+  GG (b, c, d, a, x[12], S24, 0x8d2a4c8a);	/* 32 */
+
+  /* Round 3 */
+  HH (a, b, c, d, x[5], S31, 0xfffa3942);	/* 33 */
+  HH (d, a, b, c, x[8], S32, 0x8771f681);	/* 34 */
+  HH (c, d, a, b, x[11], S33, 0x6d9d6122);	/* 35 */
+  HH (b, c, d, a, x[14], S34, 0xfde5380c);	/* 36 */
+  HH (a, b, c, d, x[1], S31, 0xa4beea44);	/* 37 */
+  HH (d, a, b, c, x[4], S32, 0x4bdecfa9);	/* 38 */
+  HH (c, d, a, b, x[7], S33, 0xf6bb4b60);	/* 39 */
+  HH (b, c, d, a, x[10], S34, 0xbebfbc70);	/* 40 */
+  HH (a, b, c, d, x[13], S31, 0x289b7ec6);	/* 41 */
+  HH (d, a, b, c, x[0], S32, 0xeaa127fa);	/* 42 */
+  HH (c, d, a, b, x[3], S33, 0xd4ef3085);	/* 43 */
+  HH (b, c, d, a, x[6], S34, 0x04881d05);	/* 44 */
+  HH (a, b, c, d, x[9], S31, 0xd9d4d039);	/* 45 */
+  HH (d, a, b, c, x[12], S32, 0xe6db99e5);	/* 46 */
+  HH (c, d, a, b, x[15], S33, 0x1fa27cf8);	/* 47 */
+  HH (b, c, d, a, x[2], S34, 0xc4ac5665);	/* 48 */
+
+  /* Round 4 */
+  II (a, b, c, d, x[0], S41, 0xf4292244);	/* 49 */
+  II (d, a, b, c, x[7], S42, 0x432aff97);	/* 50 */
+  II (c, d, a, b, x[14], S43, 0xab9423a7);	/* 51 */
+  II (b, c, d, a, x[5], S44, 0xfc93a039);	/* 52 */
+  II (a, b, c, d, x[12], S41, 0x655b59c3);	/* 53 */
+  II (d, a, b, c, x[3], S42, 0x8f0ccc92);	/* 54 */
+  II (c, d, a, b, x[10], S43, 0xffeff47d);	/* 55 */
+  II (b, c, d, a, x[1], S44, 0x85845dd1);	/* 56 */
+  II (a, b, c, d, x[8], S41, 0x6fa87e4f);	/* 57 */
+  II (d, a, b, c, x[15], S42, 0xfe2ce6e0);	/* 58 */
+  II (c, d, a, b, x[6], S43, 0xa3014314);	/* 59 */
+  II (b, c, d, a, x[13], S44, 0x4e0811a1);	/* 60 */
+  II (a, b, c, d, x[4], S41, 0xf7537e82);	/* 61 */
+  II (d, a, b, c, x[11], S42, 0xbd3af235);	/* 62 */
+  II (c, d, a, b, x[2], S43, 0x2ad7d2bb);	/* 63 */
+  II (b, c, d, a, x[9], S44, 0xeb86d391);	/* 64 */
+
+  a += m->state[0];
+  b += m->state[1];
+  c += m->state[2];
+  d += m->state[3];
+
+  if (result)
+    {
+      result[0] = clib_host_to_little_u32 (a);
+      result[1] = clib_host_to_little_u32 (b);
+      result[2] = clib_host_to_little_u32 (c);
+      result[3] = clib_host_to_little_u32 (d);
+    }
+  else
+    {
+      m->state[0] = a;
+      m->state[1] = b;
+      m->state[2] = c;
+      m->state[3] = d;
+    }
+
+  /* Zero sensitive information. */
+  if (result)
+    memset (m, ~0, sizeof (m[0]));
+  else if (zero_buffer)
+    memset (m->input_buffer.b8, 0, sizeof (m->input_buffer));
+}
+
+/* MD5 initialization. Begins an MD5 operation, writing a new context. */
+void
+md5_init (md5_context_t * c)
+{
+  memset (c, 0, sizeof (c[0]));
+
+  /* Load magic initialization constants. */
+  c->state[0] = 0x67452301;
+  c->state[1] = 0xefcdab89;
+  c->state[2] = 0x98badcfe;
+  c->state[3] = 0x10325476;
+}
+
+always_inline void __attribute__ ((unused))
+md5_fill_buffer_aligned (md5_context_t * c, u32 * d32)
+{
+  int i;
+  for (i = 0; i < ARRAY_LEN (c->input_buffer.b32); i++)
+    c->input_buffer.b32[i] = d32[i];
+}
+
+/* MD5 block update operation. Continues an MD5 message-digest
+  operation, processing another message block, and updating the
+  context.
+ */
+void
+md5_add (md5_context_t * c, void *data, int data_bytes)
+{
+  u32 data_bytes_left;
+  void *d;
+
+  if (data_bytes == 0)
+    return;
+
+  d = data;
+  data_bytes_left = data_bytes;
+
+  if ((pointer_to_uword (d) % sizeof (u32)) == 0
+      && (c->n_bits % BITS (c->input_buffer)) == 0
+      && data_bytes >= sizeof (c->input_buffer))
+    {
+      int is_last_iteration;
+      /* Fast aligned version. */
+      do
+	{
+	  data_bytes_left -= sizeof (c->input_buffer);
+	  is_last_iteration = data_bytes_left < sizeof (c->input_buffer);
+	  md5_transform (c, d, /* result */ 0,	/* zero_buffer */
+			 is_last_iteration);
+	  d += sizeof (c->input_buffer);
+	}
+      while (!is_last_iteration);
+    }
+
+  /* Slow unaligned version. */
+  {
+    int bi;
+    u8 *d8 = d;
+
+    bi = (c->n_bits / BITS (u8)) % ARRAY_LEN (c->input_buffer.b8);
+
+    while (data_bytes_left > 0)
+      {
+	c->input_buffer.b8[bi] = d8[0];
+	data_bytes_left -= 1;
+	d8++;
+	bi++;
+	if (bi == ARRAY_LEN (c->input_buffer.b8))
+	  {
+	    bi = 0;
+	    md5_transform (c, c->input_buffer.b32,
+			   /* result */ 0,
+			   /* zero_buffer */ 1);
+	  }
+      }
+  }
+
+  c->n_bits += data_bytes * BITS (u8);
+}
+
+void
+md5_finish (md5_context_t * c, u8 * digest)
+{
+  u64 n_bits_save;
+  int bi, n_pad;
+  static u8 padding[sizeof (c->input_buffer)] = { 0x80, 0, };
+
+  n_bits_save = c->n_bits;
+  bi = (n_bits_save / BITS (u8)) % ARRAY_LEN (c->input_buffer.b8);
+
+  n_pad = sizeof (c->input_buffer) - (bi + sizeof (u64));
+  if (n_pad <= 0)
+    n_pad += sizeof (c->input_buffer);
+  md5_add (c, padding, n_pad);
+
+  c->input_buffer.b64[ARRAY_LEN (c->input_buffer.b64) - 1]
+    = clib_host_to_little_u64 (n_bits_save);
+
+  md5_transform (c, c->input_buffer.b32, (u32 *) digest,
+		 /* zero_buffer */ 1);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/md5.h b/src/vppinfra/md5.h
new file mode 100644
index 00000000..52123886
--- /dev/null
+++ b/src/vppinfra/md5.h
@@ -0,0 +1,57 @@
+/*
+  Copyright (c) 2004 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_md5_h
+#define included_md5_h
+
+#include <vppinfra/clib.h>
+
+typedef struct
+{
+  u64 n_bits;
+
+  u32 state[4];
+
+  union
+  {
+    u64 b64[8];
+    u32 b32[16];
+    u8 b8[16 * 4];
+  } input_buffer;
+
+  /* Resulting message digest filled in by md5_finish. */
+} md5_context_t;
+
+void md5_init (md5_context_t * c);
+void md5_add (md5_context_t * c, void *data, int data_bytes);
+void md5_finish (md5_context_t * c, u8 digest[16]);
+
+#endif /* included_md5_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/mem.h b/src/vppinfra/mem.h
new file mode 100644
index 00000000..1260eab2
--- /dev/null
+++ b/src/vppinfra/mem.h
@@ -0,0 +1,291 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef _included_clib_mem_h
+#define _included_clib_mem_h
+
+#include <stdarg.h>
+
+#include <vppinfra/clib.h>	/* uword, etc */
+#include <vppinfra/mheap_bootstrap.h>
+#include <vppinfra/os.h>
+#include <vppinfra/string.h>	/* memcpy, memset */
+#include <vppinfra/valgrind.h>
+
+#define CLIB_MAX_MHEAPS 256
+
+/* Per CPU heaps. */
+extern void *clib_per_cpu_mheaps[CLIB_MAX_MHEAPS];
+
+always_inline void *
+clib_mem_get_per_cpu_heap (void)
+{
+  int cpu = os_get_cpu_number ();
+  return clib_per_cpu_mheaps[cpu];
+}
+
+always_inline void *
+clib_mem_set_per_cpu_heap (u8 * new_heap)
+{
+  int cpu = os_get_cpu_number ();
+  void *old = clib_per_cpu_mheaps[cpu];
+  clib_per_cpu_mheaps[cpu] = new_heap;
+  return old;
+}
+
+/* Memory allocator which may call os_out_of_memory() if it fails */
+always_inline void *
+clib_mem_alloc_aligned_at_offset (uword size, uword align, uword align_offset,
+				  int os_out_of_memory_on_failure)
+{
+  void *heap, *p;
+  uword offset, cpu;
+
+  if (align_offset > align)
+    {
+      if (align > 0)
+	align_offset %= align;
+      else
+	align_offset = align;
+    }
+
+  cpu = os_get_cpu_number ();
+  heap = clib_per_cpu_mheaps[cpu];
+  heap = mheap_get_aligned (heap, size, align, align_offset, &offset);
+  clib_per_cpu_mheaps[cpu] = heap;
+
+  if (offset != ~0)
+    {
+      p = heap + offset;
+#if CLIB_DEBUG > 0
+      VALGRIND_MALLOCLIKE_BLOCK (p, mheap_data_bytes (heap, offset), 0, 0);
+#endif
+      return p;
+    }
+  else
+    {
+      if (os_out_of_memory_on_failure)
+	os_out_of_memory ();
+      return 0;
+    }
+}
+
+/* Memory allocator which calls os_out_of_memory() when it fails */
+always_inline void *
+clib_mem_alloc (uword size)
+{
+  return clib_mem_alloc_aligned_at_offset (size, /* align */ 1,
+					   /* align_offset */ 0,
+					   /* os_out_of_memory */ 1);
+}
+
+always_inline void *
+clib_mem_alloc_aligned (uword size, uword align)
+{
+  return clib_mem_alloc_aligned_at_offset (size, align, /* align_offset */ 0,
+					   /* os_out_of_memory */ 1);
+}
+
+/* Memory allocator which calls os_out_of_memory() when it fails */
+always_inline void *
+clib_mem_alloc_or_null (uword size)
+{
+  return clib_mem_alloc_aligned_at_offset (size, /* align */ 1,
+					   /* align_offset */ 0,
+					   /* os_out_of_memory */ 0);
+}
+
+always_inline void *
+clib_mem_alloc_aligned_or_null (uword size, uword align)
+{
+  return clib_mem_alloc_aligned_at_offset (size, align, /* align_offset */ 0,
+					   /* os_out_of_memory */ 0);
+}
+
+
+
+/* Memory allocator which panics when it fails.
+   Use macro so that clib_panic macro can expand __FUNCTION__ and __LINE__. */
+#define clib_mem_alloc_aligned_no_fail(size,align)				\
+({										\
+  uword _clib_mem_alloc_size = (size);						\
+  void * _clib_mem_alloc_p;							\
+  _clib_mem_alloc_p = clib_mem_alloc_aligned (_clib_mem_alloc_size, (align));	\
+  if (! _clib_mem_alloc_p)							\
+    clib_panic ("failed to allocate %d bytes", _clib_mem_alloc_size);		\
+  _clib_mem_alloc_p;								\
+})
+
+#define clib_mem_alloc_no_fail(size) clib_mem_alloc_aligned_no_fail(size,1)
+
+/* Alias to stack allocator for naming consistency. */
+#define clib_mem_alloc_stack(bytes) __builtin_alloca(bytes)
+
+always_inline uword
+clib_mem_is_heap_object (void *p)
+{
+  void *heap = clib_mem_get_per_cpu_heap ();
+  uword offset = (uword) p - (uword) heap;
+  mheap_elt_t *e, *n;
+
+  if (offset >= vec_len (heap))
+    return 0;
+
+  e = mheap_elt_at_uoffset (heap, offset);
+  n = mheap_next_elt (e);
+
+  /* Check that heap forward and reverse pointers agree. */
+  return e->n_user_data == n->prev_n_user_data;
+}
+
+always_inline void
+clib_mem_free (void *p)
+{
+  u8 *heap = clib_mem_get_per_cpu_heap ();
+
+  /* Make sure object is in the correct heap. */
+  ASSERT (clib_mem_is_heap_object (p));
+
+  mheap_put (heap, (u8 *) p - heap);
+
+#if CLIB_DEBUG > 0
+  VALGRIND_FREELIKE_BLOCK (p, 0);
+#endif
+}
+
+always_inline void *
+clib_mem_realloc (void *p, uword new_size, uword old_size)
+{
+  /* By default use alloc, copy and free to emulate realloc. */
+  void *q = clib_mem_alloc (new_size);
+  if (q)
+    {
+      uword copy_size;
+      if (old_size < new_size)
+	copy_size = old_size;
+      else
+	copy_size = new_size;
+      clib_memcpy (q, p, copy_size);
+      clib_mem_free (p);
+    }
+  return q;
+}
+
+always_inline uword
+clib_mem_size (void *p)
+{
+  ASSERT (clib_mem_is_heap_object (p));
+  mheap_elt_t *e = mheap_user_pointer_to_elt (p);
+  return mheap_elt_data_bytes (e);
+}
+
+always_inline void *
+clib_mem_get_heap (void)
+{
+  return clib_mem_get_per_cpu_heap ();
+}
+
+always_inline void *
+clib_mem_set_heap (void *heap)
+{
+  return clib_mem_set_per_cpu_heap (heap);
+}
+
+void *clib_mem_init (void *heap, uword size);
+
+void clib_mem_exit (void);
+
+uword clib_mem_get_page_size (void);
+
+void clib_mem_validate (void);
+
+void clib_mem_trace (int enable);
+
+typedef struct
+{
+  /* Total number of objects allocated. */
+  uword object_count;
+
+  /* Total allocated bytes.  Bytes used and free.
+     used + free = total */
+  uword bytes_total, bytes_used, bytes_free;
+
+  /* Number of bytes used by mheap data structure overhead
+     (e.g. free lists, mheap header). */
+  uword bytes_overhead;
+
+  /* Amount of free space returned to operating system. */
+  uword bytes_free_reclaimed;
+
+  /* For malloc which puts small objects in sbrk region and
+     large objects in mmap'ed regions. */
+  uword bytes_used_sbrk;
+  uword bytes_used_mmap;
+
+  /* Max. number of bytes in this heap. */
+  uword bytes_max;
+} clib_mem_usage_t;
+
+void clib_mem_usage (clib_mem_usage_t * usage);
+
+u8 *format_clib_mem_usage (u8 * s, va_list * args);
+
+/* Include appropriate VM functions depending on whether
+   we are compiling for linux kernel, for Unix or standalone. */
+#ifdef CLIB_LINUX_KERNEL
+#include <vppinfra/vm_linux_kernel.h>
+#endif
+
+#ifdef CLIB_UNIX
+#include <vppinfra/vm_unix.h>
+#endif
+
+#ifdef CLIB_STANDALONE
+#include <vppinfra/vm_standalone.h>
+#endif
+
+#include <vppinfra/error.h>	/* clib_panic */
+
+#endif /* _included_clib_mem_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/mem_mheap.c b/src/vppinfra/mem_mheap.c
new file mode 100644
index 00000000..9b2af520
--- /dev/null
+++ b/src/vppinfra/mem_mheap.c
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/format.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/os.h>
+
+/* Valgrind stuff. */
+#include <vppinfra/memcheck.h>
+#include <vppinfra/valgrind.h>
+
+void *clib_per_cpu_mheaps[CLIB_MAX_MHEAPS];
+
+void
+clib_mem_exit (void)
+{
+  u8 *heap = clib_mem_get_per_cpu_heap ();
+  if (heap)
+    mheap_free (heap);
+  clib_mem_set_per_cpu_heap (0);
+}
+
+/* Initialize CLIB heap based on memory/size given by user.
+   Set memory to 0 and CLIB will try to allocate its own heap. */
+void *
+clib_mem_init (void *memory, uword memory_size)
+{
+  u8 *heap;
+
+  if (memory || memory_size)
+    heap = mheap_alloc (memory, memory_size);
+  else
+    {
+      /* Allocate lots of address space since this will limit
+         the amount of memory the program can allocate.
+         In the kernel we're more conservative since some architectures
+         (e.g. mips) have pretty small kernel virtual address spaces. */
+#ifdef __KERNEL__
+#define MAX_VM_MEG 64
+#else
+#define MAX_VM_MEG 1024
+#endif
+
+      uword alloc_size = MAX_VM_MEG << 20;
+      uword tries = 16;
+
+      while (1)
+	{
+	  heap = mheap_alloc (0, alloc_size);
+	  if (heap)
+	    break;
+	  alloc_size = (alloc_size * 3) / 4;
+	  tries--;
+	  if (tries == 0)
+	    break;
+	}
+    }
+
+  clib_mem_set_heap (heap);
+
+  return heap;
+}
+
+#ifdef CLIB_LINUX_KERNEL
+#include <asm/page.h>
+
+uword
+clib_mem_get_page_size (void)
+{
+  return PAGE_SIZE;
+}
+#endif
+
+#ifdef CLIB_UNIX
+uword
+clib_mem_get_page_size (void)
+{
+  return getpagesize ();
+}
+#endif
+
+/* Make a guess for standalone. */
+#ifdef CLIB_STANDALONE
+uword
+clib_mem_get_page_size (void)
+{
+  return 4096;
+}
+#endif
+
+u8 *
+format_clib_mem_usage (u8 * s, va_list * va)
+{
+  int verbose = va_arg (*va, int);
+  return format (s, "%U", format_mheap, clib_mem_get_heap (), verbose);
+}
+
+void
+clib_mem_usage (clib_mem_usage_t * u)
+{
+  mheap_usage (clib_mem_get_heap (), u);
+}
+
+/* Call serial number for debugger breakpoints. */
+uword clib_mem_validate_serial = 0;
+
+void
+clib_mem_validate (void)
+{
+  if (MHEAP_HAVE_SMALL_OBJECT_CACHE)
+    clib_warning ("clib_mem_validate disabled (small object cache is ON)");
+  else
+    {
+      mheap_validate (clib_mem_get_heap ());
+      clib_mem_validate_serial++;
+    }
+}
+
+void
+clib_mem_trace (int enable)
+{
+  mheap_trace (clib_mem_get_heap (), enable);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/memcheck.h b/src/vppinfra/memcheck.h
new file mode 100644
index 00000000..44db3a8a
--- /dev/null
+++ b/src/vppinfra/memcheck.h
@@ -0,0 +1,317 @@
+
+/*
+   ----------------------------------------------------------------
+
+   Notice that the following BSD-style license applies to this one
+   file (memcheck.h) only.  The rest of Valgrind is licensed under the
+   terms of the GNU General Public License, version 2, unless
+   otherwise indicated.  See the COPYING file in the source
+   distribution for details.
+
+   ----------------------------------------------------------------
+
+   This file is part of MemCheck, a heavyweight Valgrind tool for
+   detecting memory errors.
+
+   Copyright (C) 2000-2009 Julian Seward.  All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. The origin of this software must not be misrepresented; you must
+      not claim that you wrote the original software.  If you use this
+      software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   3. Altered source versions must be plainly marked as such, and must
+      not be misrepresented as being the original software.
+
+   4. The name of the author may not be used to endorse or promote
+      products derived from this software without specific prior written
+      permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+   ----------------------------------------------------------------
+
+   Notice that the above BSD-style license applies to this one file
+   (memcheck.h) only.  The entire rest of Valgrind is licensed under
+   the terms of the GNU General Public License, version 2.  See the
+   COPYING file in the source distribution for details.
+
+   ----------------------------------------------------------------
+*/
+
+
+#ifndef __MEMCHECK_H
+#define __MEMCHECK_H
+
+
+/* This file is for inclusion into client (your!) code.
+
+   You can use these macros to manipulate and query memory permissions
+   inside your own programs.
+
+   See comment near the top of valgrind.h on how to use them.
+*/
+
+#include "valgrind.h"
+
+/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !!
+   This enum comprises an ABI exported by Valgrind to programs
+   which use client requests.  DO NOT CHANGE THE ORDER OF THESE
+   ENTRIES, NOR DELETE ANY -- add new ones at the end. */
+typedef enum
+{
+  VG_USERREQ__MAKE_MEM_NOACCESS = VG_USERREQ_TOOL_BASE ('M', 'C'),
+  VG_USERREQ__MAKE_MEM_UNDEFINED,
+  VG_USERREQ__MAKE_MEM_DEFINED,
+  VG_USERREQ__DISCARD,
+  VG_USERREQ__CHECK_MEM_IS_ADDRESSABLE,
+  VG_USERREQ__CHECK_MEM_IS_DEFINED,
+  VG_USERREQ__DO_LEAK_CHECK,
+  VG_USERREQ__COUNT_LEAKS,
+
+  VG_USERREQ__GET_VBITS,
+  VG_USERREQ__SET_VBITS,
+
+  VG_USERREQ__CREATE_BLOCK,
+
+  VG_USERREQ__MAKE_MEM_DEFINED_IF_ADDRESSABLE,
+
+  /* Not next to VG_USERREQ__COUNT_LEAKS because it was added later. */
+  VG_USERREQ__COUNT_LEAK_BLOCKS,
+
+  /* This is just for memcheck's internal use - don't use it */
+  _VG_USERREQ__MEMCHECK_RECORD_OVERLAP_ERROR
+    = VG_USERREQ_TOOL_BASE ('M', 'C') + 256
+} Vg_MemCheckClientRequest;
+
+
+
+/* Client-code macros to manipulate the state of memory. */
+
+/* Mark memory at _qzz_addr as unaddressable for _qzz_len bytes. */
+#define VALGRIND_MAKE_MEM_NOACCESS(_qzz_addr,_qzz_len)           \
+   (__extension__({unsigned long _qzz_res;                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
+                            VG_USERREQ__MAKE_MEM_NOACCESS,       \
+                            _qzz_addr, _qzz_len, 0, 0, 0);       \
+    _qzz_res;                                                    \
+   }))
+
+/* Similarly, mark memory at _qzz_addr as addressable but undefined
+   for _qzz_len bytes. */
+#define VALGRIND_MAKE_MEM_UNDEFINED(_qzz_addr,_qzz_len)          \
+   (__extension__({unsigned long _qzz_res;                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
+                            VG_USERREQ__MAKE_MEM_UNDEFINED,      \
+                            _qzz_addr, _qzz_len, 0, 0, 0);       \
+    _qzz_res;                                                    \
+   }))
+
+/* Similarly, mark memory at _qzz_addr as addressable and defined
+   for _qzz_len bytes. */
+#define VALGRIND_MAKE_MEM_DEFINED(_qzz_addr,_qzz_len)            \
+   (__extension__({unsigned long _qzz_res;                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
+                            VG_USERREQ__MAKE_MEM_DEFINED,        \
+                            _qzz_addr, _qzz_len, 0, 0, 0);       \
+    _qzz_res;                                                    \
+   }))
+
+/* Similar to VALGRIND_MAKE_MEM_DEFINED except that addressability is
+   not altered: bytes which are addressable are marked as defined,
+   but those which are not addressable are left unchanged. */
+#define VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(_qzz_addr,_qzz_len) \
+   (__extension__({unsigned long _qzz_res;                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
+                            VG_USERREQ__MAKE_MEM_DEFINED_IF_ADDRESSABLE, \
+                            _qzz_addr, _qzz_len, 0, 0, 0);       \
+    _qzz_res;                                                    \
+   }))
+
+/* Create a block-description handle.  The description is an ascii
+   string which is included in any messages pertaining to addresses
+   within the specified memory range.  Has no other effect on the
+   properties of the memory range. */
+#define VALGRIND_CREATE_BLOCK(_qzz_addr,_qzz_len, _qzz_desc)	 \
+	(__extension__({unsigned long _qzz_res;			 \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
+                            VG_USERREQ__CREATE_BLOCK,            \
+                            _qzz_addr, _qzz_len, _qzz_desc,      \
+                            0, 0);                               \
+    _qzz_res;							 \
+   }))
+
+/* Discard a block-description-handle. Returns 1 for an
+   invalid handle, 0 for a valid handle. */
+#define VALGRIND_DISCARD(_qzz_blkindex)                          \
+   (__extension__ ({unsigned long _qzz_res;                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
+                            VG_USERREQ__DISCARD,                 \
+                            0, _qzz_blkindex, 0, 0, 0);          \
+    _qzz_res;                                                    \
+   }))
+
+
+/* Client-code macros to check the state of memory. */
+
+/* Check that memory at _qzz_addr is addressable for _qzz_len bytes.
+   If suitable addressibility is not established, Valgrind prints an
+   error message and returns the address of the first offending byte.
+   Otherwise it returns zero. */
+#define VALGRIND_CHECK_MEM_IS_ADDRESSABLE(_qzz_addr,_qzz_len)    \
+   (__extension__({unsigned long _qzz_res;                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
+                            VG_USERREQ__CHECK_MEM_IS_ADDRESSABLE,\
+                            _qzz_addr, _qzz_len, 0, 0, 0);       \
+    _qzz_res;                                                    \
+   }))
+
+/* Check that memory at _qzz_addr is addressable and defined for
+   _qzz_len bytes.  If suitable addressibility and definedness are not
+   established, Valgrind prints an error message and returns the
+   address of the first offending byte.  Otherwise it returns zero. */
+#define VALGRIND_CHECK_MEM_IS_DEFINED(_qzz_addr,_qzz_len)        \
+   (__extension__({unsigned long _qzz_res;                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
+                            VG_USERREQ__CHECK_MEM_IS_DEFINED,    \
+                            _qzz_addr, _qzz_len, 0, 0, 0);       \
+    _qzz_res;                                                    \
+   }))
+
+/* Use this macro to force the definedness and addressibility of an
+   lvalue to be checked.  If suitable addressibility and definedness
+   are not established, Valgrind prints an error message and returns
+   the address of the first offending byte.  Otherwise it returns
+   zero. */
+#define VALGRIND_CHECK_VALUE_IS_DEFINED(__lvalue)                \
+   VALGRIND_CHECK_MEM_IS_DEFINED(                                \
+      (volatile unsigned char *)&(__lvalue),                     \
+                      (unsigned long)(sizeof (__lvalue)))
+
+
+/* Do a full memory leak check (like --leak-check=full) mid-execution. */
+#define VALGRIND_DO_LEAK_CHECK                                   \
+   {unsigned long _qzz_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
+                            VG_USERREQ__DO_LEAK_CHECK,           \
+                            0, 0, 0, 0, 0);                      \
+   }
+
+/* Do a summary memory leak check (like --leak-check=summary) mid-execution. */
+#define VALGRIND_DO_QUICK_LEAK_CHECK				 \
+   {unsigned long _qzz_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
+                            VG_USERREQ__DO_LEAK_CHECK,           \
+                            1, 0, 0, 0, 0);                      \
+   }
+
+/* Return number of leaked, dubious, reachable and suppressed bytes found by
+   all previous leak checks.  They must be lvalues.  */
+#define VALGRIND_COUNT_LEAKS(leaked, dubious, reachable, suppressed)     \
+   /* For safety on 64-bit platforms we assign the results to private
+      unsigned long variables, then assign these to the lvalues the user
+      specified, which works no matter what type 'leaked', 'dubious', etc
+      are.  We also initialise '_qzz_leaked', etc because
+      VG_USERREQ__COUNT_LEAKS doesn't mark the values returned as
+      defined. */                                                        \
+   {unsigned long _qzz_res;                                              \
+    unsigned long _qzz_leaked    = 0, _qzz_dubious    = 0;               \
+    unsigned long _qzz_reachable = 0, _qzz_suppressed = 0;               \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                              \
+                               VG_USERREQ__COUNT_LEAKS,                  \
+                               &_qzz_leaked, &_qzz_dubious,              \
+                               &_qzz_reachable, &_qzz_suppressed, 0);    \
+    leaked     = _qzz_leaked;                                            \
+    dubious    = _qzz_dubious;                                           \
+    reachable  = _qzz_reachable;                                         \
+    suppressed = _qzz_suppressed;                                        \
+   }
+
+/* Return number of leaked, dubious, reachable and suppressed bytes found by
+   all previous leak checks.  They must be lvalues.  */
+#define VALGRIND_COUNT_LEAK_BLOCKS(leaked, dubious, reachable, suppressed) \
+   /* For safety on 64-bit platforms we assign the results to private
+      unsigned long variables, then assign these to the lvalues the user
+      specified, which works no matter what type 'leaked', 'dubious', etc
+      are.  We also initialise '_qzz_leaked', etc because
+      VG_USERREQ__COUNT_LEAKS doesn't mark the values returned as
+      defined. */                                                        \
+   {unsigned long _qzz_res;                                              \
+    unsigned long _qzz_leaked    = 0, _qzz_dubious    = 0;               \
+    unsigned long _qzz_reachable = 0, _qzz_suppressed = 0;               \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                              \
+                               VG_USERREQ__COUNT_LEAK_BLOCKS,            \
+                               &_qzz_leaked, &_qzz_dubious,              \
+                               &_qzz_reachable, &_qzz_suppressed, 0);    \
+    leaked     = _qzz_leaked;                                            \
+    dubious    = _qzz_dubious;                                           \
+    reachable  = _qzz_reachable;                                         \
+    suppressed = _qzz_suppressed;                                        \
+   }
+
+
+/* Get the validity data for addresses [zza..zza+zznbytes-1] and copy it
+   into the provided zzvbits array.  Return values:
+      0   if not running on valgrind
+      1   success
+      2   [previously indicated unaligned arrays;  these are now allowed]
+      3   if any parts of zzsrc/zzvbits are not addressable.
+   The metadata is not copied in cases 0, 2 or 3 so it should be
+   impossible to segfault your system by using this call.
+*/
+#define VALGRIND_GET_VBITS(zza,zzvbits,zznbytes)                 \
+   (__extension__({unsigned long _qzz_res;                       \
+    char* czza     = (char*)zza;                                 \
+    char* czzvbits = (char*)zzvbits;                             \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
+                            VG_USERREQ__GET_VBITS,               \
+                            czza, czzvbits, zznbytes, 0, 0 );    \
+    _qzz_res;                                                    \
+   }))
+
+/* Set the validity data for addresses [zza..zza+zznbytes-1], copying it
+   from the provided zzvbits array.  Return values:
+      0   if not running on valgrind
+      1   success
+      2   [previously indicated unaligned arrays;  these are now allowed]
+      3   if any parts of zza/zzvbits are not addressable.
+   The metadata is not copied in cases 0, 2 or 3 so it should be
+   impossible to segfault your system by using this call.
+*/
+#define VALGRIND_SET_VBITS(zza,zzvbits,zznbytes)                 \
+   (__extension__({unsigned int _qzz_res;                        \
+    char* czza     = (char*)zza;                                 \
+    char* czzvbits = (char*)zzvbits;                             \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
+                            VG_USERREQ__SET_VBITS,               \
+                            czza, czzvbits, zznbytes, 0, 0 );    \
+    _qzz_res;                                                    \
+   }))
+
+#endif
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/memcpy_avx.h b/src/vppinfra/memcpy_avx.h
new file mode 100644
index 00000000..e3feb76b
--- /dev/null
+++ b/src/vppinfra/memcpy_avx.h
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*-
+ *   BSD LICENSE
+ *
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   All rights reserved.
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
+ *   are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *     * Neither the name of Intel Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef included_clib_memcpy_avx_h
+#define included_clib_memcpy_avx_h
+
+#include <stdint.h>
+#include <x86intrin.h>
+
+typedef u8 u8x16u __attribute__ ((vector_size (16), aligned (1)));
+typedef u8 u8x32u __attribute__ ((vector_size (32), aligned (1)));
+
+static inline void
+clib_mov16 (u8 * dst, const u8 * src)
+{
+  *(u8x16u *) dst = *(u8x16u *) src;
+}
+
+static inline void
+clib_mov32 (u8 * dst, const u8 * src)
+{
+  *(u8x32u *) dst = *(u8x32u *) src;
+}
+
+static inline void
+clib_mov64 (u8 * dst, const u8 * src)
+{
+  clib_mov32 ((u8 *) dst + 0 * 32, (const u8 *) src + 0 * 32);
+  clib_mov32 ((u8 *) dst + 1 * 32, (const u8 *) src + 1 * 32);
+}
+
+static inline void
+clib_mov128 (u8 * dst, const u8 * src)
+{
+  clib_mov64 ((u8 *) dst + 0 * 64, (const u8 *) src + 0 * 64);
+  clib_mov64 ((u8 *) dst + 1 * 64, (const u8 *) src + 1 * 64);
+}
+
+static inline void
+clib_mov256 (u8 * dst, const u8 * src)
+{
+  clib_mov128 ((u8 *) dst + 0 * 128, (const u8 *) src + 0 * 128);
+  clib_mov128 ((u8 *) dst + 1 * 128, (const u8 *) src + 1 * 128);
+}
+
+static inline void
+clib_mov64blocks (u8 * dst, const u8 * src, size_t n)
+{
+  __m256i ymm0, ymm1;
+
+  while (n >= 64)
+    {
+      ymm0 =
+	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 0 * 32));
+      n -= 64;
+      ymm1 =
+	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 1 * 32));
+      src = (const u8 *) src + 64;
+      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 0 * 32), ymm0);
+      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 1 * 32), ymm1);
+      dst = (u8 *) dst + 64;
+    }
+}
+
+static inline void
+clib_mov256blocks (u8 * dst, const u8 * src, size_t n)
+{
+  __m256i ymm0, ymm1, ymm2, ymm3, ymm4, ymm5, ymm6, ymm7;
+
+  while (n >= 256)
+    {
+      ymm0 =
+	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 0 * 32));
+      n -= 256;
+      ymm1 =
+	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 1 * 32));
+      ymm2 =
+	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 2 * 32));
+      ymm3 =
+	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 3 * 32));
+      ymm4 =
+	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 4 * 32));
+      ymm5 =
+	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 5 * 32));
+      ymm6 =
+	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 6 * 32));
+      ymm7 =
+	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 7 * 32));
+      src = (const u8 *) src + 256;
+      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 0 * 32), ymm0);
+      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 1 * 32), ymm1);
+      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 2 * 32), ymm2);
+      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 3 * 32), ymm3);
+      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 4 * 32), ymm4);
+      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 5 * 32), ymm5);
+      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 6 * 32), ymm6);
+      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 7 * 32), ymm7);
+      dst = (u8 *) dst + 256;
+    }
+}
+
+static inline void *
+clib_memcpy (void *dst, const void *src, size_t n)
+{
+  uword dstu = (uword) dst;
+  uword srcu = (uword) src;
+  void *ret = dst;
+  size_t dstofss;
+  size_t bits;
+
+	/**
+         * Copy less than 16 bytes
+         */
+  if (n < 16)
+    {
+      if (n & 0x01)
+	{
+	  *(u8 *) dstu = *(const u8 *) srcu;
+	  srcu = (uword) ((const u8 *) srcu + 1);
+	  dstu = (uword) ((u8 *) dstu + 1);
+	}
+      if (n & 0x02)
+	{
+	  *(uint16_t *) dstu = *(const uint16_t *) srcu;
+	  srcu = (uword) ((const uint16_t *) srcu + 1);
+	  dstu = (uword) ((uint16_t *) dstu + 1);
+	}
+      if (n & 0x04)
+	{
+	  *(uint32_t *) dstu = *(const uint32_t *) srcu;
+	  srcu = (uword) ((const uint32_t *) srcu + 1);
+	  dstu = (uword) ((uint32_t *) dstu + 1);
+	}
+      if (n & 0x08)
+	{
+	  *(uint64_t *) dstu = *(const uint64_t *) srcu;
+	}
+      return ret;
+    }
+
+	/**
+         * Fast way when copy size doesn't exceed 512 bytes
+         */
+  if (n <= 32)
+    {
+      clib_mov16 ((u8 *) dst, (const u8 *) src);
+      clib_mov16 ((u8 *) dst - 16 + n, (const u8 *) src - 16 + n);
+      return ret;
+    }
+  if (n <= 64)
+    {
+      clib_mov32 ((u8 *) dst, (const u8 *) src);
+      clib_mov32 ((u8 *) dst - 32 + n, (const u8 *) src - 32 + n);
+      return ret;
+    }
+  if (n <= 512)
+    {
+      if (n >= 256)
+	{
+	  n -= 256;
+	  clib_mov256 ((u8 *) dst, (const u8 *) src);
+	  src = (const u8 *) src + 256;
+	  dst = (u8 *) dst + 256;
+	}
+      if (n >= 128)
+	{
+	  n -= 128;
+	  clib_mov128 ((u8 *) dst, (const u8 *) src);
+	  src = (const u8 *) src + 128;
+	  dst = (u8 *) dst + 128;
+	}
+      if (n >= 64)
+	{
+	  n -= 64;
+	  clib_mov64 ((u8 *) dst, (const u8 *) src);
+	  src = (const u8 *) src + 64;
+	  dst = (u8 *) dst + 64;
+	}
+    COPY_BLOCK_64_BACK31:
+      if (n > 32)
+	{
+	  clib_mov32 ((u8 *) dst, (const u8 *) src);
+	  clib_mov32 ((u8 *) dst - 32 + n, (const u8 *) src - 32 + n);
+	  return ret;
+	}
+      if (n > 0)
+	{
+	  clib_mov32 ((u8 *) dst - 32 + n, (const u8 *) src - 32 + n);
+	}
+      return ret;
+    }
+
+	/**
+         * Make store aligned when copy size exceeds 512 bytes
+         */
+  dstofss = (uword) dst & 0x1F;
+  if (dstofss > 0)
+    {
+      dstofss = 32 - dstofss;
+      n -= dstofss;
+      clib_mov32 ((u8 *) dst, (const u8 *) src);
+      src = (const u8 *) src + dstofss;
+      dst = (u8 *) dst + dstofss;
+    }
+
+	/**
+         * Copy 256-byte blocks.
+         * Use copy block function for better instruction order control,
+         * which is important when load is unaligned.
+         */
+  clib_mov256blocks ((u8 *) dst, (const u8 *) src, n);
+  bits = n;
+  n = n & 255;
+  bits -= n;
+  src = (const u8 *) src + bits;
+  dst = (u8 *) dst + bits;
+
+	/**
+         * Copy 64-byte blocks.
+         * Use copy block function for better instruction order control,
+         * which is important when load is unaligned.
+         */
+  if (n >= 64)
+    {
+      clib_mov64blocks ((u8 *) dst, (const u8 *) src, n);
+      bits = n;
+      n = n & 63;
+      bits -= n;
+      src = (const u8 *) src + bits;
+      dst = (u8 *) dst + bits;
+    }
+
+	/**
+         * Copy whatever left
+         */
+  goto COPY_BLOCK_64_BACK31;
+}
+
+
+#endif /* included_clib_mamcpy_avx_h */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/memcpy_sse3.h b/src/vppinfra/memcpy_sse3.h
new file mode 100644
index 00000000..4fc48c86
--- /dev/null
+++ b/src/vppinfra/memcpy_sse3.h
@@ -0,0 +1,355 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*-
+ *   BSD LICENSE
+ *
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   All rights reserved.
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
+ *   are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *     * Neither the name of Intel Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef included_clib_memcpy_sse3_h
+#define included_clib_memcpy_sse3_h
+
+#include <stdint.h>
+#include <x86intrin.h>
+
+typedef u8 u8x16u __attribute__ ((vector_size (16), aligned (1)));
+typedef u8 u8x32u __attribute__ ((vector_size (32), aligned (1)));
+
+static inline void
+clib_mov16 (u8 * dst, const u8 * src)
+{
+  *(u8x16u *) dst = *(u8x16u *) src;
+}
+
+static inline void
+clib_mov32 (u8 * dst, const u8 * src)
+{
+  *(u8x32u *) dst = *(u8x32u *) src;
+}
+
+static inline void
+clib_mov64 (u8 * dst, const u8 * src)
+{
+  clib_mov32 ((u8 *) dst + 0 * 32, (const u8 *) src + 0 * 32);
+  clib_mov32 ((u8 *) dst + 1 * 32, (const u8 *) src + 1 * 32);
+}
+
+static inline void
+clib_mov128 (u8 * dst, const u8 * src)
+{
+  clib_mov64 ((u8 *) dst + 0 * 64, (const u8 *) src + 0 * 64);
+  clib_mov64 ((u8 *) dst + 1 * 64, (const u8 *) src + 1 * 64);
+}
+
+static inline void
+clib_mov256 (u8 * dst, const u8 * src)
+{
+  clib_mov128 ((u8 *) dst + 0 * 128, (const u8 *) src + 0 * 128);
+  clib_mov128 ((u8 *) dst + 1 * 128, (const u8 *) src + 1 * 128);
+}
+
+/**
+ * Macro for copying unaligned block from one location to another with constant load offset,
+ * 47 bytes leftover maximum,
+ * locations should not overlap.
+ * Requirements:
+ * - Store is aligned
+ * - Load offset is <offset>, which must be immediate value within [1, 15]
+ * - For <src>, make sure <offset> bit backwards & <16 - offset> bit forwards are available for loading
+ * - <dst>, <src>, <len> must be variables
+ * - __m128i <xmm0> ~ <xmm8> must be pre-defined
+ */
+#define CLIB_MVUNALIGN_LEFT47_IMM(dst, src, len, offset)                                                    \
+({                                                                                                          \
+    int tmp;                                                                                                \
+    while (len >= 128 + 16 - offset) {                                                                      \
+        xmm0 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 0 * 16));                       \
+        len -= 128;                                                                                         \
+        xmm1 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 1 * 16));                       \
+        xmm2 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 2 * 16));                       \
+        xmm3 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 3 * 16));                       \
+        xmm4 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 4 * 16));                       \
+        xmm5 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 5 * 16));                       \
+        xmm6 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 6 * 16));                       \
+        xmm7 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 7 * 16));                       \
+        xmm8 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 8 * 16));                       \
+        src = (const u8 *)src + 128;                                                                        \
+        _mm_storeu_si128((__m128i *)((u8 *)dst + 0 * 16), _mm_alignr_epi8(xmm1, xmm0, offset));             \
+        _mm_storeu_si128((__m128i *)((u8 *)dst + 1 * 16), _mm_alignr_epi8(xmm2, xmm1, offset));             \
+        _mm_storeu_si128((__m128i *)((u8 *)dst + 2 * 16), _mm_alignr_epi8(xmm3, xmm2, offset));             \
+        _mm_storeu_si128((__m128i *)((u8 *)dst + 3 * 16), _mm_alignr_epi8(xmm4, xmm3, offset));             \
+        _mm_storeu_si128((__m128i *)((u8 *)dst + 4 * 16), _mm_alignr_epi8(xmm5, xmm4, offset));             \
+        _mm_storeu_si128((__m128i *)((u8 *)dst + 5 * 16), _mm_alignr_epi8(xmm6, xmm5, offset));             \
+        _mm_storeu_si128((__m128i *)((u8 *)dst + 6 * 16), _mm_alignr_epi8(xmm7, xmm6, offset));             \
+        _mm_storeu_si128((__m128i *)((u8 *)dst + 7 * 16), _mm_alignr_epi8(xmm8, xmm7, offset));             \
+        dst = (u8 *)dst + 128;                                                                              \
+    }                                                                                                       \
+    tmp = len;                                                                                              \
+    len = ((len - 16 + offset) & 127) + 16 - offset;                                                        \
+    tmp -= len;                                                                                             \
+    src = (const u8 *)src + tmp;                                                                            \
+    dst = (u8 *)dst + tmp;                                                                                  \
+    if (len >= 32 + 16 - offset) {                                                                          \
+        while (len >= 32 + 16 - offset) {                                                                   \
+            xmm0 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 0 * 16));                   \
+            len -= 32;                                                                                      \
+            xmm1 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 1 * 16));                   \
+            xmm2 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 2 * 16));                   \
+            src = (const u8 *)src + 32;                                                                     \
+            _mm_storeu_si128((__m128i *)((u8 *)dst + 0 * 16), _mm_alignr_epi8(xmm1, xmm0, offset));         \
+            _mm_storeu_si128((__m128i *)((u8 *)dst + 1 * 16), _mm_alignr_epi8(xmm2, xmm1, offset));         \
+            dst = (u8 *)dst + 32;                                                                           \
+        }                                                                                                   \
+        tmp = len;                                                                                          \
+        len = ((len - 16 + offset) & 31) + 16 - offset;                                                     \
+        tmp -= len;                                                                                         \
+        src = (const u8 *)src + tmp;                                                                        \
+        dst = (u8 *)dst + tmp;                                                                              \
+    }                                                                                                       \
+})
+
+/**
+ * Macro for copying unaligned block from one location to another,
+ * 47 bytes leftover maximum,
+ * locations should not overlap.
+ * Use switch here because the aligning instruction requires immediate value for shift count.
+ * Requirements:
+ * - Store is aligned
+ * - Load offset is <offset>, which must be within [1, 15]
+ * - For <src>, make sure <offset> bit backwards & <16 - offset> bit forwards are available for loading
+ * - <dst>, <src>, <len> must be variables
+ * - __m128i <xmm0> ~ <xmm8> used in CLIB_MVUNALIGN_LEFT47_IMM must be pre-defined
+ */
+#define CLIB_MVUNALIGN_LEFT47(dst, src, len, offset)                  \
+({                                                                    \
+    switch (offset) {                                                 \
+    case 0x01: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x01); break;   \
+    case 0x02: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x02); break;   \
+    case 0x03: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x03); break;   \
+    case 0x04: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x04); break;   \
+    case 0x05: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x05); break;   \
+    case 0x06: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x06); break;   \
+    case 0x07: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x07); break;   \
+    case 0x08: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x08); break;   \
+    case 0x09: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x09); break;   \
+    case 0x0A: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x0A); break;   \
+    case 0x0B: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x0B); break;   \
+    case 0x0C: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x0C); break;   \
+    case 0x0D: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x0D); break;   \
+    case 0x0E: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x0E); break;   \
+    case 0x0F: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x0F); break;   \
+    default:;                                                         \
+    }                                                                 \
+})
+
+static inline void *
+clib_memcpy (void *dst, const void *src, size_t n)
+{
+  __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8;
+  uword dstu = (uword) dst;
+  uword srcu = (uword) src;
+  void *ret = dst;
+  size_t dstofss;
+  size_t srcofs;
+
+	/**
+	 * Copy less than 16 bytes
+	 */
+  if (n < 16)
+    {
+      if (n & 0x01)
+	{
+	  *(u8 *) dstu = *(const u8 *) srcu;
+	  srcu = (uword) ((const u8 *) srcu + 1);
+	  dstu = (uword) ((u8 *) dstu + 1);
+	}
+      if (n & 0x02)
+	{
+	  *(u16 *) dstu = *(const u16 *) srcu;
+	  srcu = (uword) ((const u16 *) srcu + 1);
+	  dstu = (uword) ((u16 *) dstu + 1);
+	}
+      if (n & 0x04)
+	{
+	  *(u32 *) dstu = *(const u32 *) srcu;
+	  srcu = (uword) ((const u32 *) srcu + 1);
+	  dstu = (uword) ((u32 *) dstu + 1);
+	}
+      if (n & 0x08)
+	{
+	  *(u64 *) dstu = *(const u64 *) srcu;
+	}
+      return ret;
+    }
+
+	/**
+	 * Fast way when copy size doesn't exceed 512 bytes
+	 */
+  if (n <= 32)
+    {
+      clib_mov16 ((u8 *) dst, (const u8 *) src);
+      clib_mov16 ((u8 *) dst - 16 + n, (const u8 *) src - 16 + n);
+      return ret;
+    }
+  if (n <= 48)
+    {
+      clib_mov32 ((u8 *) dst, (const u8 *) src);
+      clib_mov16 ((u8 *) dst - 16 + n, (const u8 *) src - 16 + n);
+      return ret;
+    }
+  if (n <= 64)
+    {
+      clib_mov32 ((u8 *) dst, (const u8 *) src);
+      clib_mov16 ((u8 *) dst + 32, (const u8 *) src + 32);
+      clib_mov16 ((u8 *) dst - 16 + n, (const u8 *) src - 16 + n);
+      return ret;
+    }
+  if (n <= 128)
+    {
+      goto COPY_BLOCK_128_BACK15;
+    }
+  if (n <= 512)
+    {
+      if (n >= 256)
+	{
+	  n -= 256;
+	  clib_mov128 ((u8 *) dst, (const u8 *) src);
+	  clib_mov128 ((u8 *) dst + 128, (const u8 *) src + 128);
+	  src = (const u8 *) src + 256;
+	  dst = (u8 *) dst + 256;
+	}
+    COPY_BLOCK_255_BACK15:
+      if (n >= 128)
+	{
+	  n -= 128;
+	  clib_mov128 ((u8 *) dst, (const u8 *) src);
+	  src = (const u8 *) src + 128;
+	  dst = (u8 *) dst + 128;
+	}
+    COPY_BLOCK_128_BACK15:
+      if (n >= 64)
+	{
+	  n -= 64;
+	  clib_mov64 ((u8 *) dst, (const u8 *) src);
+	  src = (const u8 *) src + 64;
+	  dst = (u8 *) dst + 64;
+	}
+    COPY_BLOCK_64_BACK15:
+      if (n >= 32)
+	{
+	  n -= 32;
+	  clib_mov32 ((u8 *) dst, (const u8 *) src);
+	  src = (const u8 *) src + 32;
+	  dst = (u8 *) dst + 32;
+	}
+      if (n > 16)
+	{
+	  clib_mov16 ((u8 *) dst, (const u8 *) src);
+	  clib_mov16 ((u8 *) dst - 16 + n, (const u8 *) src - 16 + n);
+	  return ret;
+	}
+      if (n > 0)
+	{
+	  clib_mov16 ((u8 *) dst - 16 + n, (const u8 *) src - 16 + n);
+	}
+      return ret;
+    }
+
+	/**
+	 * Make store aligned when copy size exceeds 512 bytes,
+	 * and make sure the first 15 bytes are copied, because
+	 * unaligned copy functions require up to 15 bytes
+	 * backwards access.
+	 */
+  dstofss = 16 - ((uword) dst & 0x0F) + 16;
+  n -= dstofss;
+  clib_mov32 ((u8 *) dst, (const u8 *) src);
+  src = (const u8 *) src + dstofss;
+  dst = (u8 *) dst + dstofss;
+  srcofs = ((uword) src & 0x0F);
+
+	/**
+	 * For aligned copy
+	 */
+  if (srcofs == 0)
+    {
+		/**
+		 * Copy 256-byte blocks
+		 */
+      for (; n >= 256; n -= 256)
+	{
+	  clib_mov256 ((u8 *) dst, (const u8 *) src);
+	  dst = (u8 *) dst + 256;
+	  src = (const u8 *) src + 256;
+	}
+
+		/**
+		 * Copy whatever left
+		 */
+      goto COPY_BLOCK_255_BACK15;
+    }
+
+	/**
+	 * For copy with unaligned load
+	 */
+  CLIB_MVUNALIGN_LEFT47 (dst, src, n, srcofs);
+
+	/**
+	 * Copy whatever left
+	 */
+  goto COPY_BLOCK_64_BACK15;
+}
+
+
+#undef CLIB_MVUNALIGN_LEFT47_IMM
+#undef CLIB_MVUNALIGN_LEFT47
+
+#endif /* included_clib_memcpy_sse3_h */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/mhash.c b/src/vppinfra/mhash.c
new file mode 100644
index 00000000..c917e164
--- /dev/null
+++ b/src/vppinfra/mhash.c
@@ -0,0 +1,408 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2010 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/mhash.h>
+
+always_inline u32
+load_partial_u32 (void *d, uword n)
+{
+  if (n == 4)
+    return ((u32 *) d)[0];
+  if (n == 3)
+    return ((u16 *) d)[0] | (((u8 *) d)[2] << 16);
+  if (n == 2)
+    return ((u16 *) d)[0];
+  if (n == 1)
+    return ((u8 *) d)[0];
+  ASSERT (0);
+  return 0;
+}
+
+always_inline u32
+mhash_key_sum_inline (void *data, uword n_data_bytes, u32 seed)
+{
+  u32 *d32 = data;
+  u32 a, b, c, n_left;
+
+  a = b = c = seed;
+  n_left = n_data_bytes;
+  a ^= n_data_bytes;
+
+  while (n_left > 12)
+    {
+      a += d32[0];
+      b += d32[1];
+      c += d32[2];
+      hash_v3_mix32 (a, b, c);
+      n_left -= 12;
+      d32 += 3;
+    }
+
+  if (n_left > 8)
+    {
+      c += load_partial_u32 (d32 + 2, n_left - 8);
+      n_left = 8;
+    }
+  if (n_left > 4)
+    {
+      b += load_partial_u32 (d32 + 1, n_left - 4);
+      n_left = 4;
+    }
+  if (n_left > 0)
+    a += load_partial_u32 (d32 + 0, n_left - 0);
+
+  hash_v3_finalize32 (a, b, c);
+
+  return c;
+}
+
+#define foreach_mhash_key_size			\
+  _ (2) _ (3) _ (4) _ (5) _ (6) _ (7)		\
+  _ (8) _ (12) _ (16) _ (20)			\
+  _ (24) _ (28) _ (32) _ (36)			\
+  _ (40) _ (44) _ (48) _ (52)			\
+  _ (56) _ (60) _ (64)
+
+#define _(N_KEY_BYTES)							\
+  static uword								\
+  mhash_key_sum_##N_KEY_BYTES (hash_t * h, uword key)			\
+  {									\
+    mhash_t * hv = uword_to_pointer (h->user, mhash_t *);		\
+    return mhash_key_sum_inline (mhash_key_to_mem (hv, key),		\
+				 (N_KEY_BYTES),				\
+				 hv->hash_seed);			\
+  }									\
+									\
+  static uword								\
+  mhash_key_equal_##N_KEY_BYTES (hash_t * h, uword key1, uword key2)	\
+  {									\
+    mhash_t * hv = uword_to_pointer (h->user, mhash_t *);		\
+    void * k1 = mhash_key_to_mem (hv, key1);				\
+    void * k2 = mhash_key_to_mem (hv, key2);				\
+    return ! memcmp (k1, k2, (N_KEY_BYTES));				\
+  }
+
+foreach_mhash_key_size
+#undef _
+static uword
+mhash_key_sum_c_string (hash_t * h, uword key)
+{
+  mhash_t *hv = uword_to_pointer (h->user, mhash_t *);
+  void *k = mhash_key_to_mem (hv, key);
+  return mhash_key_sum_inline (k, strlen (k), hv->hash_seed);
+}
+
+static uword
+mhash_key_equal_c_string (hash_t * h, uword key1, uword key2)
+{
+  mhash_t *hv = uword_to_pointer (h->user, mhash_t *);
+  void *k1 = mhash_key_to_mem (hv, key1);
+  void *k2 = mhash_key_to_mem (hv, key2);
+  return strcmp (k1, k2) == 0;
+}
+
+static uword
+mhash_key_sum_vec_string (hash_t * h, uword key)
+{
+  mhash_t *hv = uword_to_pointer (h->user, mhash_t *);
+  void *k = mhash_key_to_mem (hv, key);
+  return mhash_key_sum_inline (k, vec_len (k), hv->hash_seed);
+}
+
+static uword
+mhash_key_equal_vec_string (hash_t * h, uword key1, uword key2)
+{
+  mhash_t *hv = uword_to_pointer (h->user, mhash_t *);
+  void *k1 = mhash_key_to_mem (hv, key1);
+  void *k2 = mhash_key_to_mem (hv, key2);
+  return vec_len (k1) == vec_len (k2) && memcmp (k1, k2, vec_len (k1)) == 0;
+}
+
+/* The CLIB hash user pointer must always point to a valid mhash_t.
+   Now, the address of mhash_t can change (think vec_resize).
+   So we must always be careful that it points to the correct
+   address. */
+always_inline void
+mhash_sanitize_hash_user (mhash_t * mh)
+{
+  uword *hash = mh->hash;
+  hash_t *h = hash_header (hash);
+  h->user = pointer_to_uword (mh);
+}
+
+void
+mhash_init (mhash_t * h, uword n_value_bytes, uword n_key_bytes)
+{
+  static struct
+  {
+    hash_key_sum_function_t *key_sum;
+    hash_key_equal_function_t *key_equal;
+  } t[] =
+  {
+#define _(N_KEY_BYTES)					\
+    [N_KEY_BYTES] = {					\
+      .key_sum = mhash_key_sum_##N_KEY_BYTES,		\
+      .key_equal = mhash_key_equal_##N_KEY_BYTES,	\
+    },
+
+    foreach_mhash_key_size
+#undef _
+      [MHASH_C_STRING_KEY] =
+    {
+    .key_sum = mhash_key_sum_c_string,.key_equal = mhash_key_equal_c_string,},
+      [MHASH_VEC_STRING_KEY] =
+    {
+  .key_sum = mhash_key_sum_vec_string,.key_equal =
+	mhash_key_equal_vec_string,},};
+
+  if (mhash_key_vector_is_heap (h))
+    heap_free (h->key_vector_or_heap);
+  else
+    vec_free (h->key_vector_or_heap);
+  vec_free (h->key_vector_free_indices);
+  {
+    int i;
+    for (i = 0; i < vec_len (h->key_tmps); i++)
+      vec_free (h->key_tmps[i]);
+  }
+  vec_free (h->key_tmps);
+  hash_free (h->hash);
+
+  memset (h, 0, sizeof (h[0]));
+  h->n_key_bytes = n_key_bytes;
+
+#if 0
+  if (h->n_key_bytes > 0)
+    {
+      vec_validate (h->key_tmp, h->n_key_bytes - 1);
+      _vec_len (h->key_tmp) = 0;
+    }
+#endif
+
+  ASSERT (n_key_bytes < ARRAY_LEN (t));
+  h->hash = hash_create2 ( /* elts */ 0,
+			  /* user */ pointer_to_uword (h),
+			  /* value_bytes */ n_value_bytes,
+			  t[n_key_bytes].key_sum, t[n_key_bytes].key_equal,
+			  /* format pair/arg */
+			  0, 0);
+}
+
+static uword
+mhash_set_tmp_key (mhash_t * h, const void *key)
+{
+  u8 *key_tmp;
+  int my_cpu = os_get_cpu_number ();
+
+  vec_validate (h->key_tmps, my_cpu);
+  key_tmp = h->key_tmps[my_cpu];
+
+  vec_reset_length (key_tmp);
+
+  if (mhash_key_vector_is_heap (h))
+    {
+      uword is_c_string = h->n_key_bytes == MHASH_C_STRING_KEY;
+
+      if (is_c_string)
+	vec_add (key_tmp, key, strlen (key) + 1);
+      else
+	vec_add (key_tmp, key, vec_len (key));
+    }
+  else
+    vec_add (key_tmp, key, h->n_key_bytes);
+
+  h->key_tmps[my_cpu] = key_tmp;
+
+  return ~0;
+}
+
+hash_pair_t *
+mhash_get_pair (mhash_t * h, const void *key)
+{
+  uword ikey;
+  mhash_sanitize_hash_user (h);
+  ikey = mhash_set_tmp_key (h, key);
+  return hash_get_pair (h->hash, ikey);
+}
+
+typedef struct
+{
+  u32 heap_handle;
+
+  /* Must conincide with vec_header. */
+  vec_header_t vec;
+} mhash_string_key_t;
+
+uword
+mhash_set_mem (mhash_t * h, void *key, uword * new_value, uword * old_value)
+{
+  u8 *k;
+  uword ikey, i, l = 0, n_key_bytes, old_n_elts, key_alloc_from_free_list = 0;
+
+  mhash_sanitize_hash_user (h);
+
+  if (mhash_key_vector_is_heap (h))
+    {
+      mhash_string_key_t *sk;
+      uword is_c_string = h->n_key_bytes == MHASH_C_STRING_KEY;
+      uword handle;
+
+      n_key_bytes = is_c_string ? (strlen (key) + 1) : vec_len (key);
+      i =
+	heap_alloc (h->key_vector_or_heap, n_key_bytes + sizeof (sk[0]),
+		    handle);
+
+      sk = (void *) (h->key_vector_or_heap + i);
+      sk->heap_handle = handle;
+      sk->vec.len = n_key_bytes;
+      clib_memcpy (sk->vec.vector_data, key, n_key_bytes);
+
+      /* Advance key past vector header. */
+      i += sizeof (sk[0]);
+    }
+  else
+    {
+      key_alloc_from_free_list = (l =
+				  vec_len (h->key_vector_free_indices)) > 0;
+      if (key_alloc_from_free_list)
+	{
+	  i = h->key_vector_free_indices[l - 1];
+	  k = vec_elt_at_index (h->key_vector_or_heap, i);
+	  _vec_len (h->key_vector_free_indices) = l - 1;
+	}
+      else
+	{
+	  vec_add2 (h->key_vector_or_heap, k, h->n_key_bytes);
+	  i = k - h->key_vector_or_heap;
+	}
+
+      n_key_bytes = h->n_key_bytes;
+      clib_memcpy (k, key, n_key_bytes);
+    }
+  ikey = i;
+
+  old_n_elts = hash_elts (h->hash);
+  h->hash = _hash_set3 (h->hash, ikey, new_value, old_value);
+
+  /* If element already existed remove duplicate key. */
+  if (hash_elts (h->hash) == old_n_elts)
+    {
+      hash_pair_t *p;
+
+      /* Fetch old key for return value. */
+      p = hash_get_pair (h->hash, ikey);
+      ikey = p->key;
+
+      /* Remove duplicate key. */
+      if (mhash_key_vector_is_heap (h))
+	{
+	  mhash_string_key_t *sk;
+	  sk = (void *) (h->key_vector_or_heap + i - sizeof (sk[0]));
+	  heap_dealloc (h->key_vector_or_heap, sk->heap_handle);
+	}
+      else
+	{
+	  if (key_alloc_from_free_list)
+	    {
+	      h->key_vector_free_indices[l] = i;
+	      _vec_len (h->key_vector_free_indices) = l + 1;
+	    }
+	  else
+	    _vec_len (h->key_vector_or_heap) -= h->n_key_bytes;
+	}
+    }
+
+  return ikey;
+}
+
+uword
+mhash_unset (mhash_t * h, void *key, uword * old_value)
+{
+  hash_pair_t *p;
+  uword i;
+
+  mhash_sanitize_hash_user (h);
+  i = mhash_set_tmp_key (h, key);
+
+  p = hash_get_pair (h->hash, i);
+  if (!p)
+    return 0;
+
+  ASSERT (p->key != ~0);
+  i = p->key;
+
+  if (mhash_key_vector_is_heap (h))
+    {
+      mhash_string_key_t *sk;
+      sk = (void *) (h->key_vector_or_heap + i) - sizeof (sk[0]);
+      heap_dealloc (h->key_vector_or_heap, sk->heap_handle);
+    }
+  else
+    vec_add1 (h->key_vector_free_indices, i);
+
+  hash_unset3 (h->hash, i, old_value);
+  return 1;
+}
+
+u8 *
+format_mhash_key (u8 * s, va_list * va)
+{
+  mhash_t *h = va_arg (*va, mhash_t *);
+  u32 ki = va_arg (*va, u32);
+  void *k = mhash_key_to_mem (h, ki);
+
+  if (mhash_key_vector_is_heap (h))
+    {
+      uword is_c_string = h->n_key_bytes == MHASH_C_STRING_KEY;
+      u32 l = is_c_string ? strlen (k) : vec_len (k);
+      vec_add (s, k, l);
+    }
+  else if (h->format_key)
+    s = format (s, "%U", h->format_key, k);
+  else
+    s = format (s, "%U", format_hex_bytes, k, h->n_key_bytes);
+
+  return s;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/mhash.h b/src/vppinfra/mhash.h
new file mode 100644
index 00000000..102adf4e
--- /dev/null
+++ b/src/vppinfra/mhash.h
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_clib_mhash_h
+#define included_clib_mhash_h
+
+/*
+  Copyright (c) 2010 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/format.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/heap.h>
+
+/* Hash table plus vector of keys. */
+typedef struct
+{
+  /* Vector or heap used to store keys.  Hash table stores keys as byte
+     offsets into this vector. */
+  u8 *key_vector_or_heap;
+
+  /* Byte offsets of free keys in vector (used to store free keys when
+     n_key_bytes > 1). */
+  u32 *key_vector_free_indices;
+
+  u8 **key_tmps;
+
+  /* Possibly fixed size of key.
+     0 means keys are vectors of u8's.
+     1 means keys are null terminated c strings. */
+#define MHASH_VEC_STRING_KEY 0
+#define MHASH_C_STRING_KEY 1
+  u32 n_key_bytes;
+
+  /* Seed value for Jenkins hash. */
+  u32 hash_seed;
+
+  /* Hash table mapping key -> value. */
+  uword *hash;
+
+  /* Format function for keys. */
+  format_function_t *format_key;
+} mhash_t;
+
+void mhash_init (mhash_t * h, uword n_value_bytes, uword n_key_bytes);
+
+always_inline void
+mhash_init_c_string (mhash_t * h, uword n_value_bytes)
+{
+  mhash_init (h, n_value_bytes, MHASH_C_STRING_KEY);
+}
+
+always_inline void
+mhash_init_vec_string (mhash_t * h, uword n_value_bytes)
+{
+  mhash_init (h, n_value_bytes, MHASH_VEC_STRING_KEY);
+}
+
+always_inline void *
+mhash_key_to_mem (mhash_t * h, uword key)
+{
+  if (key == ~0)
+    {
+      u8 *key_tmp;
+
+      int my_cpu = os_get_cpu_number ();
+      vec_validate (h->key_tmps, my_cpu);
+      key_tmp = h->key_tmps[my_cpu];
+      return key_tmp;
+    }
+  return vec_elt_at_index (h->key_vector_or_heap, key);
+}
+
+hash_pair_t *mhash_get_pair (mhash_t * h, const void *key);
+uword mhash_set_mem (mhash_t * h, void *key, uword * new_value,
+		     uword * old_value);
+uword mhash_unset (mhash_t * h, void *key, uword * old_value);
+
+always_inline uword *
+mhash_get (mhash_t * h, const void *key)
+{
+  hash_pair_t *p = mhash_get_pair (h, key);
+  return p ? &p->value[0] : 0;
+}
+
+always_inline uword
+mhash_set (mhash_t * h, void *key, uword new_value, uword * old_value)
+{
+  return mhash_set_mem (h, key, &new_value, old_value);
+}
+
+always_inline uword
+mhash_unset_key (mhash_t * h, uword key, uword * old_value)
+{
+  void *k = mhash_key_to_mem (h, key);
+  return mhash_unset (h, k, old_value);
+}
+
+always_inline uword
+mhash_value_bytes (mhash_t * m)
+{
+  hash_t *h = hash_header (m->hash);
+  return hash_value_bytes (h);
+}
+
+always_inline uword
+mhash_elts (mhash_t * m)
+{
+  return hash_elts (m->hash);
+}
+
+always_inline uword
+mhash_key_vector_is_heap (mhash_t * h)
+{
+  return h->n_key_bytes <= 1;
+}
+
+always_inline void
+mhash_free (mhash_t * h)
+{
+  if (mhash_key_vector_is_heap (h))
+    heap_free (h->key_vector_or_heap);
+  else
+    vec_free (h->key_vector_or_heap);
+  vec_free (h->key_vector_free_indices);
+  hash_free (h->hash);
+}
+
+#define mhash_foreach(k,v,mh,body)				\
+do {								\
+  hash_pair_t * _mhash_foreach_p;				\
+  hash_foreach_pair (_mhash_foreach_p, (mh)->hash, ({		\
+    (k) = mhash_key_to_mem ((mh), _mhash_foreach_p->key);	\
+    (v) = &_mhash_foreach_p->value[0];				\
+    body;							\
+  }));								\
+} while (0)
+
+format_function_t format_mhash_key;
+
+#endif /* included_clib_mhash_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/mheap.c b/src/vppinfra/mheap.c
new file mode 100644
index 00000000..b8828f9e
--- /dev/null
+++ b/src/vppinfra/mheap.c
@@ -0,0 +1,1649 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/bitops.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/format.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/os.h>
+#include <vppinfra/time.h>
+
+#ifdef CLIB_UNIX
+#include <vppinfra/elf_clib.h>
+#endif
+
+static void mheap_get_trace (void *v, uword offset, uword size);
+static void mheap_put_trace (void *v, uword offset, uword size);
+static int mheap_trace_sort (const void *t1, const void *t2);
+
+always_inline void
+mheap_maybe_lock (void *v)
+{
+  mheap_t *h = mheap_header (v);
+  if (v && (h->flags & MHEAP_FLAG_THREAD_SAFE))
+    {
+      u32 my_cpu = os_get_cpu_number ();
+      if (h->owner_cpu == my_cpu)
+	{
+	  h->recursion_count++;
+	  return;
+	}
+
+      while (__sync_lock_test_and_set (&h->lock, 1))
+	;
+
+      h->owner_cpu = my_cpu;
+      h->recursion_count = 1;
+    }
+}
+
+always_inline void
+mheap_maybe_unlock (void *v)
+{
+  mheap_t *h = mheap_header (v);
+  if (v && h->flags & MHEAP_FLAG_THREAD_SAFE)
+    {
+      ASSERT (os_get_cpu_number () == h->owner_cpu);
+      if (--h->recursion_count == 0)
+	{
+	  h->owner_cpu = ~0;
+	  CLIB_MEMORY_BARRIER ();
+	  h->lock = 0;
+	}
+    }
+}
+
+/* Find bin for objects with size at least n_user_data_bytes. */
+always_inline uword
+user_data_size_to_bin_index (uword n_user_data_bytes)
+{
+  uword n_user_data_words;
+  word small_bin, large_bin;
+
+  /* User size must be at least big enough to hold free elt. */
+  n_user_data_bytes = clib_max (n_user_data_bytes, MHEAP_MIN_USER_DATA_BYTES);
+
+  /* Round to words. */
+  n_user_data_words =
+    (round_pow2 (n_user_data_bytes, MHEAP_USER_DATA_WORD_BYTES) /
+     MHEAP_USER_DATA_WORD_BYTES);
+
+  ASSERT (n_user_data_words > 0);
+  small_bin =
+    n_user_data_words -
+    (MHEAP_MIN_USER_DATA_BYTES / MHEAP_USER_DATA_WORD_BYTES);
+  ASSERT (small_bin >= 0);
+
+  large_bin =
+    MHEAP_N_SMALL_OBJECT_BINS + max_log2 (n_user_data_bytes) -
+    MHEAP_LOG2_N_SMALL_OBJECT_BINS;
+
+  return small_bin < MHEAP_N_SMALL_OBJECT_BINS ? small_bin : large_bin;
+}
+
+always_inline uword
+mheap_elt_size_to_user_n_bytes (uword n_bytes)
+{
+  ASSERT (n_bytes >= sizeof (mheap_elt_t));
+  return (n_bytes - STRUCT_OFFSET_OF (mheap_elt_t, user_data));
+}
+
+always_inline uword __attribute__ ((unused))
+mheap_elt_size_to_user_n_words (uword n_bytes)
+{
+  ASSERT (n_bytes % MHEAP_USER_DATA_WORD_BYTES == 0);
+  return mheap_elt_size_to_user_n_bytes (n_bytes) /
+    MHEAP_USER_DATA_WORD_BYTES;
+}
+
+always_inline void
+mheap_elt_set_size (void *v,
+		    uword uoffset, uword n_user_data_bytes, uword is_free)
+{
+  mheap_elt_t *e, *n;
+
+  e = mheap_elt_at_uoffset (v, uoffset);
+
+  ASSERT (n_user_data_bytes % MHEAP_USER_DATA_WORD_BYTES == 0);
+
+  e->n_user_data = n_user_data_bytes / MHEAP_USER_DATA_WORD_BYTES;
+  e->is_free = is_free;
+  ASSERT (e->prev_n_user_data * sizeof (e->user_data[0]) >=
+	  MHEAP_MIN_USER_DATA_BYTES);
+
+  n = mheap_next_elt (e);
+  n->prev_n_user_data = e->n_user_data;
+  n->prev_is_free = is_free;
+}
+
+always_inline void
+set_first_free_elt_offset (mheap_t * h, uword bin, uword uoffset)
+{
+  uword i0, i1;
+
+  h->first_free_elt_uoffset_by_bin[bin] = uoffset;
+
+  i0 = bin / BITS (h->non_empty_free_elt_heads[0]);
+  i1 = (uword) 1 << (uword) (bin % BITS (h->non_empty_free_elt_heads[0]));
+
+  ASSERT (i0 < ARRAY_LEN (h->non_empty_free_elt_heads));
+  if (h->first_free_elt_uoffset_by_bin[bin] == MHEAP_GROUNDED)
+    h->non_empty_free_elt_heads[i0] &= ~i1;
+  else
+    h->non_empty_free_elt_heads[i0] |= i1;
+}
+
+always_inline void
+set_free_elt (void *v, uword uoffset, uword n_user_data_bytes)
+{
+  mheap_t *h = mheap_header (v);
+  mheap_elt_t *e = mheap_elt_at_uoffset (v, uoffset);
+  mheap_elt_t *n = mheap_next_elt (e);
+  uword bin = user_data_size_to_bin_index (n_user_data_bytes);
+
+  ASSERT (n->prev_is_free);
+  ASSERT (e->is_free);
+
+  e->free_elt.prev_uoffset = MHEAP_GROUNDED;
+  e->free_elt.next_uoffset = h->first_free_elt_uoffset_by_bin[bin];
+
+  /* Fill in next free elt's previous pointer. */
+  if (e->free_elt.next_uoffset != MHEAP_GROUNDED)
+    {
+      mheap_elt_t *nf = mheap_elt_at_uoffset (v, e->free_elt.next_uoffset);
+      ASSERT (nf->is_free);
+      nf->free_elt.prev_uoffset = uoffset;
+    }
+
+  set_first_free_elt_offset (h, bin, uoffset);
+}
+
+always_inline void
+new_free_elt (void *v, uword uoffset, uword n_user_data_bytes)
+{
+  mheap_elt_set_size (v, uoffset, n_user_data_bytes, /* is_free */ 1);
+  set_free_elt (v, uoffset, n_user_data_bytes);
+}
+
+always_inline void
+remove_free_elt (void *v, mheap_elt_t * e, uword bin)
+{
+  mheap_t *h = mheap_header (v);
+  mheap_elt_t *p, *n;
+#if CLIB_VEC64 > 0
+  u64 no, po;
+#else
+  u32 no, po;
+#endif
+
+  no = e->free_elt.next_uoffset;
+
+  n = no != MHEAP_GROUNDED ? mheap_elt_at_uoffset (v, no) : 0;
+  po = e->free_elt.prev_uoffset;
+  p = po != MHEAP_GROUNDED ? mheap_elt_at_uoffset (v, po) : 0;
+
+  if (!p)
+    set_first_free_elt_offset (h, bin, no);
+  else
+    p->free_elt.next_uoffset = no;
+
+  if (n)
+    n->free_elt.prev_uoffset = po;
+}
+
+always_inline void
+remove_free_elt2 (void *v, mheap_elt_t * e)
+{
+  uword bin;
+  bin = user_data_size_to_bin_index (mheap_elt_data_bytes (e));
+  remove_free_elt (v, e, bin);
+}
+
+#define MHEAP_VM_MAP		(1 << 0)
+#define MHEAP_VM_UNMAP		(1 << 1)
+#define MHEAP_VM_NOMAP		(0 << 1)
+#define MHEAP_VM_ROUND		(1 << 2)
+#define MHEAP_VM_ROUND_UP	MHEAP_VM_ROUND
+#define MHEAP_VM_ROUND_DOWN	(0 << 2)
+
+static uword mheap_page_size;
+
+static_always_inline uword
+mheap_page_round (uword addr)
+{
+  return (addr + mheap_page_size - 1) & ~(mheap_page_size - 1);
+}
+
+static_always_inline uword
+mheap_page_truncate (uword addr)
+{
+  return addr & ~(mheap_page_size - 1);
+}
+
+static_always_inline uword
+mheap_vm (void *v, uword flags, clib_address_t start_addr, uword size)
+{
+  mheap_t *h = mheap_header (v);
+  clib_address_t start_page, end_page, end_addr;
+  uword mapped_bytes;
+
+  ASSERT (!(h->flags & MHEAP_FLAG_DISABLE_VM));
+
+  end_addr = start_addr + size;
+
+  /* Round start/end address up to page boundary. */
+  start_page = mheap_page_round (start_addr);
+
+  if ((flags & MHEAP_VM_ROUND) == MHEAP_VM_ROUND_UP)
+    end_page = mheap_page_round (end_addr);
+  else
+    end_page = mheap_page_truncate (end_addr);
+
+  mapped_bytes = 0;
+  if (end_page > start_page)
+    {
+      mapped_bytes = end_page - start_page;
+      if (flags & MHEAP_VM_MAP)
+	clib_mem_vm_map ((void *) start_page, end_page - start_page);
+      else if (flags & MHEAP_VM_UNMAP)
+	clib_mem_vm_unmap ((void *) start_page, end_page - start_page);
+    }
+
+  return mapped_bytes;
+}
+
+static_always_inline uword
+mheap_vm_elt (void *v, uword flags, uword offset)
+{
+  mheap_elt_t *e;
+  clib_address_t start_addr, end_addr;
+
+  e = mheap_elt_at_uoffset (v, offset);
+  start_addr = (clib_address_t) ((void *) e->user_data);
+  end_addr = (clib_address_t) mheap_next_elt (e);
+  return mheap_vm (v, flags, start_addr, end_addr - start_addr);
+}
+
+always_inline uword
+mheap_small_object_cache_mask (mheap_small_object_cache_t * c, uword bin)
+{
+  uword mask;
+
+/* $$$$ ELIOT FIXME: add Altivec version of this routine */
+#if !defined (CLIB_HAVE_VEC128) || defined (__ALTIVEC__)
+  mask = 0;
+#else
+  u8x16 b = u8x16_splat (bin);
+
+  ASSERT (bin < 256);
+
+#define _(i) ((uword) u8x16_compare_byte_mask (u8x16_is_equal (b, c->bins.as_u8x16[i])) << (uword) ((i)*16))
+  mask = _(0) | _(1);
+  if (BITS (uword) > 32)
+    mask |= _(2) | _(3);
+#undef _
+
+#endif
+  return mask;
+}
+
+always_inline uword
+mheap_get_small_object (mheap_t * h, uword bin)
+{
+  mheap_small_object_cache_t *c = &h->small_object_cache;
+  uword mask = mheap_small_object_cache_mask (c, bin + 1);
+  uword offset = MHEAP_GROUNDED;
+
+  if (mask)
+    {
+      uword i = min_log2 (mask);
+      uword o = c->offsets[i];
+      ASSERT (o != MHEAP_GROUNDED);
+      c->bins.as_u8[i] = 0;
+      offset = o;
+    }
+
+  return offset;
+}
+
+always_inline uword
+mheap_put_small_object (mheap_t * h, uword bin, uword offset)
+{
+  mheap_small_object_cache_t *c = &h->small_object_cache;
+  uword free_mask = mheap_small_object_cache_mask (c, 0);
+  uword b = bin + 1;
+  uword i;
+
+  if (free_mask != 0)
+    {
+      i = min_log2 (free_mask);
+      c->bins.as_u8[i] = b;
+      c->offsets[i] = offset;
+      return 0;
+    }
+  else
+    /* Nothing free with right size: cyclic replacement. */
+    {
+      uword old_offset;
+
+      i = c->replacement_index++;
+      i %= BITS (uword);
+      c->bins.as_u8[i] = b;
+      old_offset = c->offsets[i];
+      c->offsets[i] = offset;
+
+      /* Return old offset so it can be freed. */
+      return old_offset;
+    }
+}
+
+static uword
+mheap_get_search_free_bin (void *v,
+			   uword bin,
+			   uword * n_user_data_bytes_arg,
+			   uword align, uword align_offset)
+{
+  mheap_t *h = mheap_header (v);
+  mheap_elt_t *e;
+
+  /* Free object is at offset f0 ... f1;
+     Allocatted object is at offset o0 ... o1. */
+  word o0, o1, f0, f1, search_n_user_data_bytes;
+  word lo_free_usize, hi_free_usize;
+
+  ASSERT (h->first_free_elt_uoffset_by_bin[bin] != MHEAP_GROUNDED);
+  e = mheap_elt_at_uoffset (v, h->first_free_elt_uoffset_by_bin[bin]);
+
+  search_n_user_data_bytes = *n_user_data_bytes_arg;
+
+  /* Silence compiler warning. */
+  o0 = o1 = f0 = f1 = 0;
+
+  h->stats.free_list.n_search_attempts += 1;
+
+  /* Find an object that is large enough with correct alignment at given alignment offset. */
+  while (1)
+    {
+      uword this_object_n_user_data_bytes = mheap_elt_data_bytes (e);
+
+      ASSERT (e->is_free);
+      if (bin < MHEAP_N_SMALL_OBJECT_BINS)
+	ASSERT (this_object_n_user_data_bytes >= search_n_user_data_bytes);
+
+      h->stats.free_list.n_objects_searched += 1;
+
+      if (this_object_n_user_data_bytes < search_n_user_data_bytes)
+	goto next;
+
+      /* Bounds of free object: from f0 to f1. */
+      f0 = ((void *) e->user_data - v);
+      f1 = f0 + this_object_n_user_data_bytes;
+
+      /* Place candidate object at end of free block and align as requested. */
+      o0 = ((f1 - search_n_user_data_bytes) & ~(align - 1)) - align_offset;
+      while (o0 < f0)
+	o0 += align;
+
+      /* Make sure that first free fragment is either empty or
+         large enough to be valid. */
+      while (1)
+	{
+	  lo_free_usize = o0 != f0 ? o0 - f0 - MHEAP_ELT_OVERHEAD_BYTES : 0;
+	  if (o0 <= f0 || lo_free_usize >= (word) MHEAP_MIN_USER_DATA_BYTES)
+	    break;
+	  o0 -= align;
+	}
+
+      o1 = o0 + search_n_user_data_bytes;
+
+      /* Does it fit? */
+      if (o0 >= f0 && o1 <= f1)
+	goto found;
+
+    next:
+      /* Reached end of free list without finding large enough object. */
+      if (e->free_elt.next_uoffset == MHEAP_GROUNDED)
+	return MHEAP_GROUNDED;
+
+      /* Otherwise keep searching for large enough object. */
+      e = mheap_elt_at_uoffset (v, e->free_elt.next_uoffset);
+    }
+
+found:
+  /* Free fragment at end. */
+  hi_free_usize = f1 != o1 ? f1 - o1 - MHEAP_ELT_OVERHEAD_BYTES : 0;
+
+  /* If fragment at end is too small to be a new object,
+     give user's object a bit more space than requested. */
+  if (hi_free_usize < (word) MHEAP_MIN_USER_DATA_BYTES)
+    {
+      search_n_user_data_bytes += f1 - o1;
+      o1 = f1;
+      hi_free_usize = 0;
+    }
+
+  /* Need to make sure that relevant memory areas are mapped. */
+  if (!(h->flags & MHEAP_FLAG_DISABLE_VM))
+    {
+      mheap_elt_t *f0_elt = mheap_elt_at_uoffset (v, f0);
+      mheap_elt_t *f1_elt = mheap_elt_at_uoffset (v, f1);
+      mheap_elt_t *o0_elt = mheap_elt_at_uoffset (v, o0);
+      mheap_elt_t *o1_elt = mheap_elt_at_uoffset (v, o1);
+
+      uword f0_page_start, f0_page_end;
+      uword o0_page_start, o0_page_end;
+
+      /* Free elt is mapped.  Addresses after that may not be mapped. */
+      f0_page_start = mheap_page_round (pointer_to_uword (f0_elt->user_data));
+      f0_page_end = mheap_page_truncate (pointer_to_uword (f1_elt));
+
+      o0_page_start = mheap_page_truncate (pointer_to_uword (o0_elt));
+      o0_page_end = mheap_page_round (pointer_to_uword (o1_elt->user_data));
+
+      if (o0_page_start < f0_page_start)
+	o0_page_start = f0_page_start;
+      if (o0_page_end > f0_page_end)
+	o0_page_end = f0_page_end;
+
+      if (o0_page_end > o0_page_start)
+	clib_mem_vm_map (uword_to_pointer (o0_page_start, void *),
+			 o0_page_end - o0_page_start);
+    }
+
+  /* Remove free object from free list. */
+  remove_free_elt (v, e, bin);
+
+  /* Free fragment at begining. */
+  if (lo_free_usize > 0)
+    {
+      ASSERT (lo_free_usize >= (word) MHEAP_MIN_USER_DATA_BYTES);
+      mheap_elt_set_size (v, f0, lo_free_usize, /* is_free */ 1);
+      new_free_elt (v, f0, lo_free_usize);
+    }
+
+  mheap_elt_set_size (v, o0, search_n_user_data_bytes, /* is_free */ 0);
+
+  if (hi_free_usize > 0)
+    {
+      uword uo = o1 + MHEAP_ELT_OVERHEAD_BYTES;
+      mheap_elt_set_size (v, uo, hi_free_usize, /* is_free */ 1);
+      new_free_elt (v, uo, hi_free_usize);
+    }
+
+  /* Return actual size of block. */
+  *n_user_data_bytes_arg = search_n_user_data_bytes;
+
+  h->stats.free_list.n_objects_found += 1;
+
+  return o0;
+}
+
+/* Search free lists for object with given size and alignment. */
+static uword
+mheap_get_search_free_list (void *v,
+			    uword * n_user_bytes_arg,
+			    uword align, uword align_offset)
+{
+  mheap_t *h = mheap_header (v);
+  uword bin, n_user_bytes, i, bi;
+
+  n_user_bytes = *n_user_bytes_arg;
+  bin = user_data_size_to_bin_index (n_user_bytes);
+
+  if (MHEAP_HAVE_SMALL_OBJECT_CACHE
+      && (h->flags & MHEAP_FLAG_SMALL_OBJECT_CACHE)
+      && bin < 255
+      && align == STRUCT_SIZE_OF (mheap_elt_t, user_data[0])
+      && align_offset == 0)
+    {
+      uword r = mheap_get_small_object (h, bin);
+      h->stats.n_small_object_cache_attempts += 1;
+      if (r != MHEAP_GROUNDED)
+	{
+	  h->stats.n_small_object_cache_hits += 1;
+	  return r;
+	}
+    }
+
+  for (i = bin / BITS (uword); i < ARRAY_LEN (h->non_empty_free_elt_heads);
+       i++)
+    {
+      uword non_empty_bin_mask = h->non_empty_free_elt_heads[i];
+
+      /* No need to search smaller bins. */
+      if (i == bin / BITS (uword))
+	non_empty_bin_mask &= ~pow2_mask (bin % BITS (uword));
+
+      /* Search each occupied free bin which is large enough. */
+      foreach_set_bit (bi, non_empty_bin_mask, (
+						 {
+						 uword r =
+						 mheap_get_search_free_bin (v,
+									    bi
+									    +
+									    i
+									    *
+									    BITS
+									    (uword),
+									    n_user_bytes_arg,
+									    align,
+									    align_offset);
+						 if (r !=
+						     MHEAP_GROUNDED) return
+						 r;}
+		       ));
+    }
+
+  return MHEAP_GROUNDED;
+}
+
+static never_inline void *
+mheap_get_extend_vector (void *v,
+			 uword n_user_data_bytes,
+			 uword align,
+			 uword align_offset, uword * offset_return)
+{
+  /* Bounds of free and allocated objects (as above). */
+  uword f0, f1, o0, o1;
+  word free_size;
+  mheap_t *h = mheap_header (v);
+  mheap_elt_t *e;
+
+  if (_vec_len (v) == 0)
+    {
+      _vec_len (v) = MHEAP_ELT_OVERHEAD_BYTES;
+
+      /* Create first element of heap. */
+      e = mheap_elt_at_uoffset (v, _vec_len (v));
+      e->prev_n_user_data = MHEAP_N_USER_DATA_INVALID;
+    }
+
+  f0 = _vec_len (v);
+
+  o0 = round_pow2 (f0, align) - align_offset;
+  while (1)
+    {
+      free_size = o0 - f0 - MHEAP_ELT_OVERHEAD_BYTES;
+      if (o0 == f0 || free_size >= (word) sizeof (mheap_elt_t))
+	break;
+
+      o0 += align;
+    }
+
+  o1 = o0 + n_user_data_bytes;
+  f1 = o1 + MHEAP_ELT_OVERHEAD_BYTES;
+
+  ASSERT (v != 0);
+  h = mheap_header (v);
+
+  /* Make sure we have space for object plus overhead. */
+  if (f1 > h->max_size)
+    {
+      *offset_return = MHEAP_GROUNDED;
+      return v;
+    }
+
+  _vec_len (v) = f1;
+
+  if (!(h->flags & MHEAP_FLAG_DISABLE_VM))
+    {
+      mheap_elt_t *f0_elt = mheap_elt_at_uoffset (v, f0);
+      mheap_elt_t *f1_elt = mheap_elt_at_uoffset (v, f1);
+
+      uword f0_page = mheap_page_round (pointer_to_uword (f0_elt->user_data));
+      uword f1_page = mheap_page_round (pointer_to_uword (f1_elt->user_data));
+
+      if (f1_page > f0_page)
+	mheap_vm (v, MHEAP_VM_MAP, f0_page, f1_page - f0_page);
+    }
+
+  if (free_size > 0)
+    new_free_elt (v, f0, free_size);
+
+  mheap_elt_set_size (v, o0, n_user_data_bytes, /* is_free */ 0);
+
+  /* Mark last element. */
+  e = mheap_elt_at_uoffset (v, f1);
+  e->n_user_data = MHEAP_N_USER_DATA_INVALID;
+
+  *offset_return = o0;
+
+  return v;
+}
+
+void *
+mheap_get_aligned (void *v,
+		   uword n_user_data_bytes,
+		   uword align, uword align_offset, uword * offset_return)
+{
+  mheap_t *h;
+  uword offset;
+  u64 cpu_times[2];
+
+  cpu_times[0] = clib_cpu_time_now ();
+
+  align = clib_max (align, STRUCT_SIZE_OF (mheap_elt_t, user_data[0]));
+  align = max_pow2 (align);
+
+  /* Correct align offset to be smaller than alignment. */
+  align_offset &= (align - 1);
+
+  /* Align offset must be multiple of minimum object size. */
+  if (align_offset % STRUCT_SIZE_OF (mheap_elt_t, user_data[0]) != 0)
+    {
+      *offset_return = MHEAP_GROUNDED;
+      return v;
+    }
+
+  /* Round requested size. */
+  n_user_data_bytes = clib_max (n_user_data_bytes, MHEAP_MIN_USER_DATA_BYTES);
+  n_user_data_bytes =
+    round_pow2 (n_user_data_bytes,
+		STRUCT_SIZE_OF (mheap_elt_t, user_data[0]));
+
+  if (!v)
+    v = mheap_alloc (0, 64 << 20);
+
+  mheap_maybe_lock (v);
+
+  h = mheap_header (v);
+
+  if (h->flags & MHEAP_FLAG_VALIDATE)
+    mheap_validate (v);
+
+  /* First search free lists for object. */
+  offset =
+    mheap_get_search_free_list (v, &n_user_data_bytes, align, align_offset);
+
+  h = mheap_header (v);
+
+  /* If that fails allocate object at end of heap by extending vector. */
+  if (offset == MHEAP_GROUNDED && _vec_len (v) < h->max_size)
+    {
+      v =
+	mheap_get_extend_vector (v, n_user_data_bytes, align, align_offset,
+				 &offset);
+      h = mheap_header (v);
+      h->stats.n_vector_expands += offset != MHEAP_GROUNDED;
+    }
+
+  *offset_return = offset;
+  if (offset != MHEAP_GROUNDED)
+    {
+      h->n_elts += 1;
+
+      if (h->flags & MHEAP_FLAG_TRACE)
+	{
+	  /* Recursion block for case when we are traceing main clib heap. */
+	  h->flags &= ~MHEAP_FLAG_TRACE;
+
+	  mheap_get_trace (v, offset, n_user_data_bytes);
+
+	  h->flags |= MHEAP_FLAG_TRACE;
+	}
+    }
+
+  if (h->flags & MHEAP_FLAG_VALIDATE)
+    mheap_validate (v);
+
+  mheap_maybe_unlock (v);
+
+  cpu_times[1] = clib_cpu_time_now ();
+  h->stats.n_clocks_get += cpu_times[1] - cpu_times[0];
+  h->stats.n_gets += 1;
+
+  return v;
+}
+
+static void
+free_last_elt (void *v, mheap_elt_t * e)
+{
+  mheap_t *h = mheap_header (v);
+
+  /* Possibly delete preceeding free element also. */
+  if (e->prev_is_free)
+    {
+      e = mheap_prev_elt (e);
+      remove_free_elt2 (v, e);
+    }
+
+  if (e->prev_n_user_data == MHEAP_N_USER_DATA_INVALID)
+    {
+      if (!(h->flags & MHEAP_FLAG_DISABLE_VM))
+	mheap_vm_elt (v, MHEAP_VM_UNMAP, mheap_elt_uoffset (v, e));
+      _vec_len (v) = 0;
+    }
+  else
+    {
+      uword uo = mheap_elt_uoffset (v, e);
+      if (!(h->flags & MHEAP_FLAG_DISABLE_VM))
+	mheap_vm_elt (v, MHEAP_VM_UNMAP, uo);
+      e->n_user_data = MHEAP_N_USER_DATA_INVALID;
+      _vec_len (v) = uo;
+    }
+}
+
+void
+mheap_put (void *v, uword uoffset)
+{
+  mheap_t *h;
+  uword n_user_data_bytes, bin;
+  mheap_elt_t *e, *n;
+  uword trace_uoffset, trace_n_user_data_bytes;
+  u64 cpu_times[2];
+
+  cpu_times[0] = clib_cpu_time_now ();
+
+  h = mheap_header (v);
+
+  mheap_maybe_lock (v);
+
+  if (h->flags & MHEAP_FLAG_VALIDATE)
+    mheap_validate (v);
+
+  ASSERT (h->n_elts > 0);
+  h->n_elts--;
+  h->stats.n_puts += 1;
+
+  e = mheap_elt_at_uoffset (v, uoffset);
+  n = mheap_next_elt (e);
+  n_user_data_bytes = mheap_elt_data_bytes (e);
+
+  trace_uoffset = uoffset;
+  trace_n_user_data_bytes = n_user_data_bytes;
+
+  bin = user_data_size_to_bin_index (n_user_data_bytes);
+  if (MHEAP_HAVE_SMALL_OBJECT_CACHE
+      && bin < 255 && (h->flags & MHEAP_FLAG_SMALL_OBJECT_CACHE))
+    {
+      uoffset = mheap_put_small_object (h, bin, uoffset);
+      if (uoffset == 0)
+	goto done;
+
+      e = mheap_elt_at_uoffset (v, uoffset);
+      n = mheap_next_elt (e);
+      n_user_data_bytes = mheap_elt_data_bytes (e);
+    }
+
+  /* Assert that forward and back pointers are equal. */
+  if (e->n_user_data != n->prev_n_user_data)
+    os_panic ();
+
+  /* Forward and backwards is_free must agree. */
+  if (e->is_free != n->prev_is_free)
+    os_panic ();
+
+  /* Object was already freed. */
+  if (e->is_free)
+    os_panic ();
+
+  /* Special case: delete last element in heap. */
+  if (n->n_user_data == MHEAP_N_USER_DATA_INVALID)
+    free_last_elt (v, e);
+
+  else
+    {
+      uword f0, f1, n_combine;
+
+      f0 = uoffset;
+      f1 = f0 + n_user_data_bytes;
+      n_combine = 0;
+
+      if (e->prev_is_free)
+	{
+	  mheap_elt_t *p = mheap_prev_elt (e);
+	  f0 = mheap_elt_uoffset (v, p);
+	  remove_free_elt2 (v, p);
+	  n_combine++;
+	}
+
+      if (n->is_free)
+	{
+	  mheap_elt_t *m = mheap_next_elt (n);
+	  f1 = (void *) m - v;
+	  remove_free_elt2 (v, n);
+	  n_combine++;
+	}
+
+      if (n_combine)
+	mheap_elt_set_size (v, f0, f1 - f0, /* is_free */ 1);
+      else
+	e->is_free = n->prev_is_free = 1;
+      set_free_elt (v, f0, f1 - f0);
+
+      if (!(h->flags & MHEAP_FLAG_DISABLE_VM))
+	mheap_vm_elt (v, MHEAP_VM_UNMAP, f0);
+    }
+
+done:
+  h = mheap_header (v);
+
+  if (h->flags & MHEAP_FLAG_TRACE)
+    {
+      /* Recursion block for case when we are traceing main clib heap. */
+      h->flags &= ~MHEAP_FLAG_TRACE;
+
+      mheap_put_trace (v, trace_uoffset, trace_n_user_data_bytes);
+
+      h->flags |= MHEAP_FLAG_TRACE;
+    }
+
+  if (h->flags & MHEAP_FLAG_VALIDATE)
+    mheap_validate (v);
+
+  mheap_maybe_unlock (v);
+
+  cpu_times[1] = clib_cpu_time_now ();
+  h->stats.n_clocks_put += cpu_times[1] - cpu_times[0];
+}
+
+void *
+mheap_alloc_with_flags (void *memory, uword memory_size, uword flags)
+{
+  mheap_t *h;
+  void *v;
+  uword size;
+
+  if (!mheap_page_size)
+    mheap_page_size = clib_mem_get_page_size ();
+
+  if (!memory)
+    {
+      /* No memory given, try to VM allocate some. */
+      memory = clib_mem_vm_alloc (memory_size);
+      if (!memory)
+	return 0;
+
+      /* No memory region implies we have virtual memory. */
+      flags &= ~MHEAP_FLAG_DISABLE_VM;
+    }
+
+  /* Make sure that given memory is page aligned. */
+  {
+    uword am, av, ah;
+
+    am = pointer_to_uword (memory);
+    av = mheap_page_round (am);
+    v = uword_to_pointer (av, void *);
+    h = mheap_header (v);
+    ah = pointer_to_uword (h);
+    while (ah < am)
+      ah += mheap_page_size;
+
+    h = uword_to_pointer (ah, void *);
+    v = mheap_vector (h);
+
+    if (PREDICT_FALSE (memory + memory_size < v))
+      {
+	/*
+	 * This will happen when the requested memory_size is too
+	 * small to cope with the heap header and/or memory alignment.
+	 */
+	clib_mem_vm_free (memory, memory_size);
+	return 0;
+      }
+
+    size = memory + memory_size - v;
+  }
+
+  /* VM map header so we can use memory. */
+  if (!(flags & MHEAP_FLAG_DISABLE_VM))
+    clib_mem_vm_map (h, sizeof (h[0]));
+
+  /* Zero vector header: both heap header and vector length. */
+  memset (h, 0, sizeof (h[0]));
+  _vec_len (v) = 0;
+
+  h->vm_alloc_offset_from_header = (void *) h - memory;
+  h->vm_alloc_size = memory_size;
+
+  h->max_size = size;
+  h->owner_cpu = ~0;
+
+  /* Set flags based on those given less builtin-flags. */
+  h->flags |= (flags & ~MHEAP_FLAG_TRACE);
+
+  /* Unmap remainder of heap until we will be ready to use it. */
+  if (!(h->flags & MHEAP_FLAG_DISABLE_VM))
+    mheap_vm (v, MHEAP_VM_UNMAP | MHEAP_VM_ROUND_UP,
+	      (clib_address_t) v, h->max_size);
+
+  /* Initialize free list heads to empty. */
+  memset (h->first_free_elt_uoffset_by_bin, 0xFF,
+	  sizeof (h->first_free_elt_uoffset_by_bin));
+
+  return v;
+}
+
+void *
+mheap_alloc (void *memory, uword size)
+{
+  uword flags = 0;
+
+  if (memory != 0)
+    flags |= MHEAP_FLAG_DISABLE_VM;
+
+#ifdef CLIB_HAVE_VEC128
+  flags |= MHEAP_FLAG_SMALL_OBJECT_CACHE;
+#endif
+
+  return mheap_alloc_with_flags (memory, size, flags);
+}
+
+void *
+_mheap_free (void *v)
+{
+  mheap_t *h = mheap_header (v);
+
+  if (v)
+    clib_mem_vm_free ((void *) h - h->vm_alloc_offset_from_header,
+		      h->vm_alloc_size);
+
+  return 0;
+}
+
+/* Call user's function with each object in heap. */
+void
+mheap_foreach (void *v,
+	       uword (*func) (void *arg, void *v, void *elt_data,
+			      uword elt_size), void *arg)
+{
+  mheap_elt_t *e;
+  u8 *stack_heap, *clib_mem_mheap_save;
+  u8 tmp_heap_memory[16 * 1024];
+
+  mheap_maybe_lock (v);
+
+  if (vec_len (v) == 0)
+    goto done;
+
+  clib_mem_mheap_save = 0;
+  stack_heap = 0;
+
+  /* Allocate a new temporary heap on the stack.
+     This is so that our hash table & user's callback function can
+     themselves allocate memory somewhere without getting in the way
+     of the heap we are looking at. */
+  if (v == clib_mem_get_heap ())
+    {
+      stack_heap = mheap_alloc (tmp_heap_memory, sizeof (tmp_heap_memory));
+      clib_mem_mheap_save = v;
+      clib_mem_set_heap (stack_heap);
+    }
+
+  for (e = v;
+       e->n_user_data != MHEAP_N_USER_DATA_INVALID; e = mheap_next_elt (e))
+    {
+      void *p = mheap_elt_data (v, e);
+      if (e->is_free)
+	continue;
+      if ((*func) (arg, v, p, mheap_elt_data_bytes (e)))
+	break;
+    }
+
+  /* Restore main CLIB heap. */
+  if (clib_mem_mheap_save)
+    clib_mem_set_heap (clib_mem_mheap_save);
+
+done:
+  mheap_maybe_unlock (v);
+}
+
+/* Bytes in mheap header overhead not including data bytes. */
+always_inline uword
+mheap_bytes_overhead (void *v)
+{
+  mheap_t *h = mheap_header (v);
+  return v ? sizeof (h[0]) + h->n_elts * sizeof (mheap_elt_t) : 0;
+}
+
+/* Total number of bytes including both data and overhead. */
+uword
+mheap_bytes (void *v)
+{
+  return mheap_bytes_overhead (v) + vec_bytes (v);
+}
+
+static void
+mheap_usage_no_lock (void *v, clib_mem_usage_t * usage)
+{
+  mheap_t *h = mheap_header (v);
+  uword used = 0, free = 0, free_vm_unmapped = 0;
+
+  if (vec_len (v) > 0)
+    {
+      mheap_elt_t *e;
+
+      for (e = v;
+	   e->n_user_data != MHEAP_N_USER_DATA_INVALID;
+	   e = mheap_next_elt (e))
+	{
+	  uword size = mheap_elt_data_bytes (e);
+	  if (e->is_free)
+	    {
+	      free += size;
+	      if (!(h->flags & MHEAP_FLAG_DISABLE_VM))
+		free_vm_unmapped +=
+		  mheap_vm_elt (v, MHEAP_VM_NOMAP, mheap_elt_uoffset (v, e));
+	    }
+	  else
+	    used += size;
+	}
+    }
+
+  usage->object_count = mheap_elts (v);
+  usage->bytes_total = mheap_bytes (v);
+  usage->bytes_overhead = mheap_bytes_overhead (v);
+  usage->bytes_max = mheap_max_size (v);
+  usage->bytes_used = used;
+  usage->bytes_free = free;
+  usage->bytes_free_reclaimed = free_vm_unmapped;
+}
+
+void
+mheap_usage (void *v, clib_mem_usage_t * usage)
+{
+  mheap_maybe_lock (v);
+  mheap_usage_no_lock (v, usage);
+  mheap_maybe_unlock (v);
+}
+
+static u8 *
+format_mheap_byte_count (u8 * s, va_list * va)
+{
+  uword n_bytes = va_arg (*va, uword);
+  if (n_bytes < 1024)
+    return format (s, "%wd", n_bytes);
+  else
+    return format (s, "%wdk", n_bytes / 1024);
+}
+
+/* Returns first corrupt heap element. */
+static mheap_elt_t *
+mheap_first_corrupt (void *v)
+{
+  mheap_elt_t *e, *n;
+
+  if (vec_len (v) == 0)
+    return 0;
+
+  e = v;
+  while (1)
+    {
+      if (e->n_user_data == MHEAP_N_USER_DATA_INVALID)
+	break;
+
+      n = mheap_next_elt (e);
+
+      if (e->n_user_data != n->prev_n_user_data)
+	return e;
+
+      if (e->is_free != n->prev_is_free)
+	return e;
+
+      e = n;
+    }
+
+  return 0;
+}
+
+static u8 *
+format_mheap_stats (u8 * s, va_list * va)
+{
+  mheap_t *h = va_arg (*va, mheap_t *);
+  mheap_stats_t *st = &h->stats;
+  uword indent = format_get_indent (s);
+
+  s =
+    format (s,
+	    "alloc. from small object cache: %Ld hits %Ld attempts (%.2f%%) replacements %d",
+	    st->n_small_object_cache_hits, st->n_small_object_cache_attempts,
+	    (st->n_small_object_cache_attempts !=
+	     0 ? 100. * (f64) st->n_small_object_cache_hits /
+	     (f64) st->n_small_object_cache_attempts : 0.),
+	    h->small_object_cache.replacement_index);
+
+  s =
+    format (s,
+	    "\n%Ualloc. from free-list: %Ld attempts, %Ld hits (%.2f%%), %Ld considered (per-attempt %.2f)",
+	    format_white_space, indent, st->free_list.n_search_attempts,
+	    st->free_list.n_objects_found,
+	    (st->free_list.n_search_attempts !=
+	     0 ? 100. * (f64) st->free_list.n_objects_found /
+	     (f64) st->free_list.n_search_attempts : 0.),
+	    st->free_list.n_objects_searched,
+	    (st->free_list.n_search_attempts !=
+	     0 ? (f64) st->free_list.n_objects_searched /
+	     (f64) st->free_list.n_search_attempts : 0.));
+
+  s = format (s, "\n%Ualloc. from vector-expand: %Ld",
+	      format_white_space, indent, st->n_vector_expands);
+
+  s = format (s, "\n%Uallocs: %Ld %.2f clocks/call",
+	      format_white_space, indent,
+	      st->n_gets, (f64) st->n_clocks_get / (f64) st->n_gets);
+
+  s = format (s, "\n%Ufrees: %Ld %.2f clocks/call",
+	      format_white_space, indent,
+	      st->n_puts, (f64) st->n_clocks_put / (f64) st->n_puts);
+
+  return s;
+}
+
+u8 *
+format_mheap (u8 * s, va_list * va)
+{
+  void *v = va_arg (*va, u8 *);
+  int verbose = va_arg (*va, int);
+
+  mheap_t *h;
+  uword i, size, indent;
+  clib_mem_usage_t usage;
+  mheap_elt_t *first_corrupt;
+
+  mheap_maybe_lock (v);
+
+  h = mheap_header (v);
+
+  mheap_usage_no_lock (v, &usage);
+
+  indent = format_get_indent (s);
+
+  s =
+    format (s,
+	    "%d objects, %U of %U used, %U free, %U reclaimed, %U overhead",
+	    usage.object_count, format_mheap_byte_count, usage.bytes_used,
+	    format_mheap_byte_count, usage.bytes_total,
+	    format_mheap_byte_count, usage.bytes_free,
+	    format_mheap_byte_count, usage.bytes_free_reclaimed,
+	    format_mheap_byte_count, usage.bytes_overhead);
+
+  if (usage.bytes_max != ~0)
+    s = format (s, ", %U capacity", format_mheap_byte_count, usage.bytes_max);
+
+  /* Show histogram of sizes. */
+  if (verbose > 1)
+    {
+      uword hist[MHEAP_N_BINS];
+      mheap_elt_t *e;
+      uword i, n_hist;
+
+      memset (hist, 0, sizeof (hist));
+
+      n_hist = 0;
+      for (e = v;
+	   e->n_user_data != MHEAP_N_USER_DATA_INVALID;
+	   e = mheap_next_elt (e))
+	{
+	  uword n_user_data_bytes = mheap_elt_data_bytes (e);
+	  uword bin = user_data_size_to_bin_index (n_user_data_bytes);
+	  if (!e->is_free)
+	    {
+	      hist[bin] += 1;
+	      n_hist += 1;
+	    }
+	}
+
+      s = format (s, "\n%U%=12s%=12s%=16s",
+		  format_white_space, indent + 2,
+		  "Size", "Count", "Fraction");
+
+      for (i = 0; i < ARRAY_LEN (hist); i++)
+	{
+	  if (hist[i] == 0)
+	    continue;
+	  s = format (s, "\n%U%12d%12wd%16.4f",
+		      format_white_space, indent + 2,
+		      MHEAP_MIN_USER_DATA_BYTES +
+		      i * MHEAP_USER_DATA_WORD_BYTES, hist[i],
+		      (f64) hist[i] / (f64) n_hist);
+	}
+    }
+
+  if (verbose)
+    s = format (s, "\n%U%U",
+		format_white_space, indent + 2, format_mheap_stats, h);
+
+  if ((h->flags & MHEAP_FLAG_TRACE) && vec_len (h->trace_main.traces) > 0)
+    {
+      /* Make a copy of traces since we'll be sorting them. */
+      mheap_trace_t *t, *traces_copy;
+      uword indent, total_objects_traced;
+
+      traces_copy = vec_dup (h->trace_main.traces);
+      qsort (traces_copy, vec_len (traces_copy), sizeof (traces_copy[0]),
+	     mheap_trace_sort);
+
+      total_objects_traced = 0;
+      s = format (s, "\n");
+      vec_foreach (t, traces_copy)
+      {
+	/* Skip over free elements. */
+	if (t->n_allocations == 0)
+	  continue;
+
+	total_objects_traced += t->n_allocations;
+
+	/* When not verbose only report allocations of more than 1k. */
+	if (!verbose && t->n_bytes < 1024)
+	  continue;
+
+	if (t == traces_copy)
+	  s = format (s, "%=9s%=9s %=10s Traceback\n", "Bytes", "Count",
+		      "Sample");
+	s = format (s, "%9d%9d %p", t->n_bytes, t->n_allocations,
+		    t->offset + v);
+	indent = format_get_indent (s);
+	for (i = 0; i < ARRAY_LEN (t->callers) && t->callers[i]; i++)
+	  {
+	    if (i > 0)
+	      s = format (s, "%U", format_white_space, indent);
+#ifdef CLIB_UNIX
+	    s =
+	      format (s, " %U\n", format_clib_elf_symbol_with_address,
+		      t->callers[i]);
+#else
+	    s = format (s, " %p\n", t->callers[i]);
+#endif
+	  }
+      }
+
+      s = format (s, "%d total traced objects\n", total_objects_traced);
+
+      vec_free (traces_copy);
+    }
+
+  first_corrupt = mheap_first_corrupt (v);
+  if (first_corrupt)
+    {
+      size = mheap_elt_data_bytes (first_corrupt);
+      s = format (s, "\n  first corrupt object: %p, size %wd\n  %U",
+		  first_corrupt, size, format_hex_bytes, first_corrupt, size);
+    }
+
+  /* FIXME.  This output could be wrong in the unlikely case that format
+     uses the same mheap as we are currently inspecting. */
+  if (verbose > 1)
+    {
+      mheap_elt_t *e;
+      uword i, o;
+
+      s = format (s, "\n");
+
+      e = mheap_elt_at_uoffset (v, 0);
+      i = 0;
+      while (1)
+	{
+	  if ((i % 8) == 0)
+	    s = format (s, "%8d: ", i);
+
+	  o = mheap_elt_uoffset (v, e);
+
+	  if (e->is_free)
+	    s = format (s, "(%8d) ", o);
+	  else
+	    s = format (s, " %8d  ", o);
+
+	  if ((i % 8) == 7 || (i + 1) >= h->n_elts)
+	    s = format (s, "\n");
+	}
+    }
+
+  mheap_maybe_unlock (v);
+
+  return s;
+}
+
+void
+dmh (void *v)
+{
+  fformat (stderr, "%U", format_mheap, v, 1);
+}
+
+static void
+mheap_validate_breakpoint ()
+{
+  os_panic ();
+}
+
+void
+mheap_validate (void *v)
+{
+  mheap_t *h = mheap_header (v);
+  uword i, s;
+
+  uword elt_count, elt_size;
+  uword free_count_from_free_lists, free_size_from_free_lists;
+  uword small_elt_free_count, small_elt_free_size;
+
+#define CHECK(x) if (! (x)) { mheap_validate_breakpoint (); os_panic (); }
+
+  if (vec_len (v) == 0)
+    return;
+
+  mheap_maybe_lock (v);
+
+  /* Validate number of elements and size. */
+  free_size_from_free_lists = free_count_from_free_lists = 0;
+  for (i = 0; i < ARRAY_LEN (h->first_free_elt_uoffset_by_bin); i++)
+    {
+      mheap_elt_t *e, *n;
+      uword is_first;
+
+      CHECK ((h->first_free_elt_uoffset_by_bin[i] != MHEAP_GROUNDED)
+	     ==
+	     ((h->non_empty_free_elt_heads[i /
+					   BITS (uword)] & ((uword) 1 <<
+							    (uword) (i %
+								     BITS
+								     (uword))))
+	      != 0));
+
+      if (h->first_free_elt_uoffset_by_bin[i] == MHEAP_GROUNDED)
+	continue;
+
+      e = mheap_elt_at_uoffset (v, h->first_free_elt_uoffset_by_bin[i]);
+      is_first = 1;
+      while (1)
+	{
+	  uword s;
+
+	  n = mheap_next_elt (e);
+
+	  /* Object must be marked free. */
+	  CHECK (e->is_free);
+
+	  /* Next object's previous free bit must also be set. */
+	  CHECK (n->prev_is_free);
+
+	  if (is_first)
+	    CHECK (e->free_elt.prev_uoffset == MHEAP_GROUNDED);
+	  is_first = 0;
+
+	  s = mheap_elt_data_bytes (e);
+	  CHECK (user_data_size_to_bin_index (s) == i);
+
+	  free_count_from_free_lists += 1;
+	  free_size_from_free_lists += s;
+
+	  if (e->free_elt.next_uoffset == MHEAP_GROUNDED)
+	    break;
+
+	  n = mheap_elt_at_uoffset (v, e->free_elt.next_uoffset);
+
+	  /* Check free element linkages. */
+	  CHECK (n->free_elt.prev_uoffset == mheap_elt_uoffset (v, e));
+
+	  e = n;
+	}
+    }
+
+  /* Go through small object cache. */
+  small_elt_free_count = small_elt_free_size = 0;
+  for (i = 0; i < ARRAY_LEN (h->small_object_cache.bins.as_u8); i++)
+    {
+      if (h->small_object_cache.bins.as_u8[i] != 0)
+	{
+	  mheap_elt_t *e;
+	  uword b = h->small_object_cache.bins.as_u8[i] - 1;
+	  uword o = h->small_object_cache.offsets[i];
+	  uword s;
+
+	  e = mheap_elt_at_uoffset (v, o);
+
+	  /* Object must be allocated. */
+	  CHECK (!e->is_free);
+
+	  s = mheap_elt_data_bytes (e);
+	  CHECK (user_data_size_to_bin_index (s) == b);
+
+	  small_elt_free_count += 1;
+	  small_elt_free_size += s;
+	}
+    }
+
+  {
+    mheap_elt_t *e, *n;
+    uword elt_free_size, elt_free_count;
+
+    elt_count = elt_size = elt_free_size = elt_free_count = 0;
+    for (e = v; e->n_user_data != MHEAP_N_USER_DATA_INVALID; e = n)
+      {
+	if (e->prev_n_user_data != MHEAP_N_USER_DATA_INVALID)
+	  CHECK (e->prev_n_user_data * sizeof (e->user_data[0]) >=
+		 MHEAP_MIN_USER_DATA_BYTES);
+
+	CHECK (e->n_user_data * sizeof (e->user_data[0]) >=
+	       MHEAP_MIN_USER_DATA_BYTES);
+
+	n = mheap_next_elt (e);
+
+	CHECK (e->is_free == n->prev_is_free);
+
+	elt_count++;
+	s = mheap_elt_data_bytes (e);
+	elt_size += s;
+
+	if (e->is_free)
+	  {
+	    elt_free_count++;
+	    elt_free_size += s;
+	  }
+
+	/* Consecutive free objects should have been combined. */
+	CHECK (!(e->prev_is_free && n->prev_is_free));
+      }
+
+    CHECK (free_count_from_free_lists == elt_free_count);
+    CHECK (free_size_from_free_lists == elt_free_size);
+    CHECK (elt_count == h->n_elts + elt_free_count + small_elt_free_count);
+    CHECK (elt_size + (elt_count + 1) * MHEAP_ELT_OVERHEAD_BYTES ==
+	   vec_len (v));
+  }
+
+  {
+    mheap_elt_t *e, *n;
+
+    for (e = v; e->n_user_data == MHEAP_N_USER_DATA_INVALID; e = n)
+      {
+	n = mheap_next_elt (e);
+	CHECK (e->n_user_data == n->prev_n_user_data);
+      }
+  }
+
+#undef CHECK
+
+  mheap_maybe_unlock (v);
+
+  h->validate_serial += 1;
+}
+
+static void
+mheap_get_trace (void *v, uword offset, uword size)
+{
+  mheap_t *h;
+  mheap_trace_main_t *tm;
+  mheap_trace_t *t;
+  uword i, n_callers, trace_index, *p;
+  mheap_trace_t trace;
+
+  /* Spurious Coverity warnings be gone. */
+  memset (&trace, 0, sizeof (trace));
+
+  n_callers = clib_backtrace (trace.callers, ARRAY_LEN (trace.callers),
+			      /* Skip mheap_get_aligned's frame */ 1);
+  if (n_callers == 0)
+    return;
+
+  for (i = n_callers; i < ARRAY_LEN (trace.callers); i++)
+    trace.callers[i] = 0;
+
+  h = mheap_header (v);
+  tm = &h->trace_main;
+
+  if (!tm->trace_by_callers)
+    tm->trace_by_callers =
+      hash_create_mem (0, sizeof (trace.callers), sizeof (uword));
+
+  p = hash_get_mem (tm->trace_by_callers, &trace.callers);
+  if (p)
+    {
+      trace_index = p[0];
+      t = tm->traces + trace_index;
+    }
+  else
+    {
+      i = vec_len (tm->trace_free_list);
+      if (i > 0)
+	{
+	  trace_index = tm->trace_free_list[i - 1];
+	  _vec_len (tm->trace_free_list) = i - 1;
+	}
+      else
+	{
+	  mheap_trace_t *old_start = tm->traces;
+	  mheap_trace_t *old_end = vec_end (tm->traces);
+
+	  vec_add2 (tm->traces, t, 1);
+
+	  if (tm->traces != old_start)
+	    {
+	      hash_pair_t *p;
+	      mheap_trace_t *q;
+            /* *INDENT-OFF* */
+	    hash_foreach_pair (p, tm->trace_by_callers,
+            ({
+              q = uword_to_pointer (p->key, mheap_trace_t *);
+              ASSERT (q >= old_start && q < old_end);
+	      p->key = pointer_to_uword (tm->traces + (q - old_start));
+	    }));
+            /* *INDENT-ON* */
+	    }
+	  trace_index = t - tm->traces;
+	}
+
+      t = tm->traces + trace_index;
+      t[0] = trace;
+      t->n_allocations = 0;
+      t->n_bytes = 0;
+      hash_set_mem (tm->trace_by_callers, t->callers, trace_index);
+    }
+
+  t->n_allocations += 1;
+  t->n_bytes += size;
+  t->offset = offset;		/* keep a sample to autopsy */
+  hash_set (tm->trace_index_by_offset, offset, t - tm->traces);
+}
+
+static void
+mheap_put_trace (void *v, uword offset, uword size)
+{
+  mheap_t *h;
+  mheap_trace_main_t *tm;
+  mheap_trace_t *t;
+  uword trace_index, *p;
+
+  h = mheap_header (v);
+  tm = &h->trace_main;
+  p = hash_get (tm->trace_index_by_offset, offset);
+  if (!p)
+    return;
+
+  trace_index = p[0];
+  hash_unset (tm->trace_index_by_offset, offset);
+  ASSERT (trace_index < vec_len (tm->traces));
+
+  t = tm->traces + trace_index;
+  ASSERT (t->n_allocations > 0);
+  ASSERT (t->n_bytes >= size);
+  t->n_allocations -= 1;
+  t->n_bytes -= size;
+  if (t->n_allocations == 0)
+    {
+      hash_unset_mem (tm->trace_by_callers, t->callers);
+      vec_add1 (tm->trace_free_list, trace_index);
+      memset (t, 0, sizeof (t[0]));
+    }
+}
+
+static int
+mheap_trace_sort (const void *_t1, const void *_t2)
+{
+  const mheap_trace_t *t1 = _t1;
+  const mheap_trace_t *t2 = _t2;
+  word cmp;
+
+  cmp = (word) t2->n_bytes - (word) t1->n_bytes;
+  if (!cmp)
+    cmp = (word) t2->n_allocations - (word) t1->n_allocations;
+  return cmp;
+}
+
+always_inline void
+mheap_trace_main_free (mheap_trace_main_t * tm)
+{
+  vec_free (tm->traces);
+  vec_free (tm->trace_free_list);
+  hash_free (tm->trace_by_callers);
+  hash_free (tm->trace_index_by_offset);
+}
+
+void
+mheap_trace (void *v, int enable)
+{
+  mheap_t *h;
+
+  h = mheap_header (v);
+
+  if (enable)
+    {
+      h->flags |= MHEAP_FLAG_TRACE;
+    }
+  else
+    {
+      mheap_trace_main_free (&h->trace_main);
+      h->flags &= ~MHEAP_FLAG_TRACE;
+    }
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/mheap.h b/src/vppinfra/mheap.h
new file mode 100644
index 00000000..5b7cdfba
--- /dev/null
+++ b/src/vppinfra/mheap.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_mheap_h
+#define included_mheap_h
+
+#include <vppinfra/vec.h>
+#include <vppinfra/error.h>	/* clib_error_t */
+#include <vppinfra/mem.h>	/* clib_mem_usage_t */
+#include <vppinfra/format.h>	/* for unformat_input_t */
+
+/* Allocate size bytes.  New heap and offset are returned.
+   offset == ~0 means allocation failed. */
+always_inline void *
+mheap_get (void *v, uword size, uword * offset_return)
+{
+  return mheap_get_aligned (v, size, 0, 0, offset_return);
+}
+
+/* Create allocation heap of given size.
+ * The actual usable size is smaller than the requested size.
+ * memory_bytes must be greater than mheap_page_size + sizeof (mheap_t) + 16.
+ * Otherwise, allocation may fail and return 0.
+ */
+void *mheap_alloc (void *memory, uword memory_bytes);
+void *mheap_alloc_with_flags (void *memory, uword memory_bytes, uword flags);
+
+#define mheap_free(v) (v) = _mheap_free(v)
+void *_mheap_free (void *v);
+
+void mheap_foreach (void *v,
+		    uword (*func) (void *arg, void *v, void *elt_data,
+				   uword elt_size), void *arg);
+
+/* Format mheap data structures as string. */
+u8 *format_mheap (u8 * s, va_list * va);
+
+/* Validate internal consistency. */
+void mheap_validate (void *h);
+
+/* Query bytes used. */
+uword mheap_bytes (void *v);
+
+void mheap_usage (void *v, clib_mem_usage_t * usage);
+
+/* Enable disable traceing. */
+void mheap_trace (void *v, int enable);
+
+/* Test routine. */
+int test_mheap_main (unformat_input_t * input);
+
+#endif /* included_mheap_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/mheap_bootstrap.h b/src/vppinfra/mheap_bootstrap.h
new file mode 100644
index 00000000..4b21051b
--- /dev/null
+++ b/src/vppinfra/mheap_bootstrap.h
@@ -0,0 +1,374 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_mem_mheap_h
+#define included_mem_mheap_h
+
+/* Bootstrap include so that #include <vppinfra/mem.h> can include e.g.
+   <vppinfra/mheap.h> which depends on <vppinfra/vec.h>. */
+
+#include <vppinfra/vec_bootstrap.h>
+#include <vppinfra/error_bootstrap.h>
+#include <vppinfra/os.h>
+#include <vppinfra/vector.h>
+
+/* Each element in heap is immediately followed by this struct. */
+typedef struct
+{
+  /* Number of mheap_size_t words of user data in previous object.
+     Used to find mheap_elt_t for previous object. */
+#if CLIB_VEC64 > 0
+  u64 prev_n_user_data:63;
+
+  /* Used to mark end/start of of doubly-linked list of mheap_elt_t's. */
+#define MHEAP_N_USER_DATA_INVALID (0x7fffffffffffffffULL)
+#define MHEAP_GROUNDED (~0ULL)
+
+  /* Set if previous object is free. */
+  u64 prev_is_free:1;
+
+  /* Number of mheap_size_t words of user data that follow this object. */
+  u64 n_user_data:63;
+
+  /* Set if this object is on free list (and therefore following free_elt
+     is valid). */
+  u64 is_free:1;
+
+#else
+  u32 prev_n_user_data:31;
+
+  /* Used to mark end/start of of doubly-linked list of mheap_elt_t's. */
+#define MHEAP_N_USER_DATA_INVALID (0x7fffffff)
+#define MHEAP_GROUNDED (~0)
+
+  /* Set if previous object is free. */
+  u32 prev_is_free:1;
+
+  /* Number of mheap_size_t words of user data that follow this object. */
+  u32 n_user_data:31;
+
+  /* Set if this object is on free list (and therefore following free_elt
+     is valid). */
+  u32 is_free:1;
+#endif
+
+  union
+  {
+#if CLIB_VEC64 > 0
+    /* For allocated objects: user data follows.
+       User data is allocated in units of typeof (user_data[0]). */
+    u64 user_data[0];
+
+    /* For free objects, offsets of next and previous free objects of this size;
+       ~0 means end of doubly-linked list.
+       This is stored in user data (guaranteed to be at least 8 bytes)
+       but only for *free* objects. */
+    struct
+    {
+      u64 next_uoffset, prev_uoffset;
+    } free_elt;
+#else
+    /* For allocated objects: user data follows.
+       User data is allocated in units of typeof (user_data[0]). */
+    u32 user_data[0];
+
+    /* For free objects, offsets of next and previous free objects of this size;
+       ~0 means end of doubly-linked list.
+       This is stored in user data (guaranteed to be at least 8 bytes)
+       but only for *free* objects. */
+    struct
+    {
+      u32 next_uoffset, prev_uoffset;
+    } free_elt;
+#endif
+  };
+} mheap_elt_t;
+
+/* Number of bytes of "overhead": e.g. not user data. */
+#define MHEAP_ELT_OVERHEAD_BYTES (sizeof (mheap_elt_t) - STRUCT_OFFSET_OF (mheap_elt_t, user_data))
+
+/* User objects must be large enough to hold 2 x u32 free offsets in free elt. */
+#define MHEAP_MIN_USER_DATA_BYTES MHEAP_ELT_OVERHEAD_BYTES
+
+/* Number of byte in user data "words". */
+#define MHEAP_USER_DATA_WORD_BYTES STRUCT_SIZE_OF (mheap_elt_t, user_data[0])
+
+typedef struct
+{
+  /* Address of callers: outer first, inner last. */
+  uword callers[12];
+
+  /* Count of allocations with this traceback. */
+#if CLIB_VEC64 > 0
+  u64 n_allocations;
+#else
+  u32 n_allocations;
+#endif
+
+  /* Count of bytes allocated with this traceback. */
+  u32 n_bytes;
+
+  /* Offset of this item */
+  uword offset;
+} mheap_trace_t;
+
+typedef struct
+{
+  mheap_trace_t *traces;
+
+  /* Indices of free traces. */
+  u32 *trace_free_list;
+
+  /* Hash table mapping callers to trace index. */
+  uword *trace_by_callers;
+
+  /* Hash table mapping mheap offset to trace index. */
+  uword *trace_index_by_offset;
+} mheap_trace_main_t;
+
+  /* Small object bin i is for objects with
+     user_size >  sizeof (mheap_elt_t) + sizeof (mheap_elt_t) * (i - 1)
+     user_size <= sizeof (mheap_elt_t) + sizeof (mheap_size_t) * i. */
+#define MHEAP_LOG2_N_SMALL_OBJECT_BINS 8
+#define MHEAP_N_SMALL_OBJECT_BINS (1 << MHEAP_LOG2_N_SMALL_OBJECT_BINS)
+
+#define MHEAP_N_BINS							\
+  (MHEAP_N_SMALL_OBJECT_BINS						\
+   + (STRUCT_BITS_OF (mheap_elt_t, user_data[0]) - MHEAP_LOG2_N_SMALL_OBJECT_BINS))
+
+typedef struct
+{
+  struct
+  {
+    u64 n_search_attempts;
+    u64 n_objects_searched;
+    u64 n_objects_found;
+  } free_list;
+
+  u64 n_vector_expands;
+
+  u64 n_small_object_cache_hits;
+  u64 n_small_object_cache_attempts;
+
+  u64 n_gets, n_puts;
+  u64 n_clocks_get, n_clocks_put;
+} mheap_stats_t;
+
+/* Without vector instructions don't bother with small object cache. */
+#ifdef CLIB_HAVE_VEC128
+#define MHEAP_HAVE_SMALL_OBJECT_CACHE 1
+#else
+#define MHEAP_HAVE_SMALL_OBJECT_CACHE 0
+#endif
+
+#if CLIB_VEC64 > 0
+#undef MHEAP_HAVE_SMALL_OBJECT_CACHE
+#define MHEAP_HAVE_SMALL_OBJECT_CACHE 0
+#endif
+
+/* For objects with align == 4 and align_offset == 0 (e.g. vector strings). */
+typedef struct
+{
+  union
+  {
+#ifdef CLIB_HAVE_VEC128
+    u8x16 as_u8x16[BITS (uword) / 16];
+#endif
+
+    /* Store bin + 1; zero means unused. */
+    u8 as_u8[BITS (uword)];
+  } bins;
+
+  uword offsets[BITS (uword)];
+
+  u32 replacement_index;
+} mheap_small_object_cache_t;
+
+/* Vec header for heaps. */
+typedef struct
+{
+  /* User offsets for head of doubly-linked list of free objects of this size. */
+#if CLIB_VEC64 > 0
+  u64 first_free_elt_uoffset_by_bin[MHEAP_N_BINS];
+#else
+  u32 first_free_elt_uoffset_by_bin[MHEAP_N_BINS];
+#endif
+
+  /* Bitmap of non-empty free list bins. */
+  uword non_empty_free_elt_heads[(MHEAP_N_BINS + BITS (uword) - 1) /
+				 BITS (uword)];
+
+  mheap_small_object_cache_t small_object_cache;
+
+  u32 flags;
+#define MHEAP_FLAG_TRACE			(1 << 0)
+#define MHEAP_FLAG_DISABLE_VM			(1 << 1)
+#define MHEAP_FLAG_THREAD_SAFE			(1 << 2)
+#define MHEAP_FLAG_SMALL_OBJECT_CACHE		(1 << 3)
+#define MHEAP_FLAG_VALIDATE			(1 << 4)
+
+  /* Lock use when MHEAP_FLAG_THREAD_SAFE is set. */
+  volatile u32 lock;
+  volatile u32 owner_cpu;
+  int recursion_count;
+
+  /* Number of allocated objects. */
+  u64 n_elts;
+
+  /* Maximum size (in bytes) this heap is allowed to grow to.
+     Set to ~0 to grow heap (via vec_resize) arbitrarily. */
+  u64 max_size;
+
+  uword vm_alloc_offset_from_header;
+  uword vm_alloc_size;
+
+  /* Each successful mheap_validate call increments this serial number.
+     Used to debug heap corruption problems.  GDB breakpoints can be
+     made conditional on validate_serial. */
+  u64 validate_serial;
+
+  mheap_trace_main_t trace_main;
+
+  mheap_stats_t stats;
+} mheap_t;
+
+always_inline mheap_t *
+mheap_header (u8 * v)
+{
+  return vec_aligned_header (v, sizeof (mheap_t), 16);
+}
+
+always_inline u8 *
+mheap_vector (mheap_t * h)
+{
+  return vec_aligned_header_end (h, sizeof (mheap_t), 16);
+}
+
+always_inline uword
+mheap_elt_uoffset (void *v, mheap_elt_t * e)
+{
+  return (uword) e->user_data - (uword) v;
+}
+
+always_inline mheap_elt_t *
+mheap_user_pointer_to_elt (void *v)
+{
+  return v - STRUCT_OFFSET_OF (mheap_elt_t, user_data);
+}
+
+/* For debugging we keep track of offsets for valid objects.
+   We make sure user is not trying to free object with invalid offset. */
+always_inline uword
+mheap_offset_is_valid (void *v, uword uo)
+{
+  return uo >= MHEAP_ELT_OVERHEAD_BYTES && uo <= vec_len (v);
+}
+
+always_inline mheap_elt_t *
+mheap_elt_at_uoffset (void *v, uword uo)
+{
+  ASSERT (mheap_offset_is_valid (v, uo));
+  return (mheap_elt_t *) (v + uo - STRUCT_OFFSET_OF (mheap_elt_t, user_data));
+}
+
+always_inline void *
+mheap_elt_data (void *v, mheap_elt_t * e)
+{
+  return v + mheap_elt_uoffset (v, e);
+}
+
+always_inline uword
+mheap_elt_data_bytes (mheap_elt_t * e)
+{
+  return e->n_user_data * sizeof (e->user_data[0]);
+}
+
+always_inline uword
+mheap_data_bytes (void *v, uword uo)
+{
+  mheap_elt_t *e = mheap_elt_at_uoffset (v, uo);
+  return mheap_elt_data_bytes (e);
+}
+
+#define mheap_len(v,d) (mheap_data_bytes((v),(void *) (d) - (void *) (v)) / sizeof ((d)[0]))
+
+always_inline mheap_elt_t *
+mheap_next_elt (mheap_elt_t * e)
+{
+  ASSERT (e->n_user_data < MHEAP_N_USER_DATA_INVALID);
+  return (mheap_elt_t *) (e->user_data + e->n_user_data);
+}
+
+always_inline mheap_elt_t *
+mheap_prev_elt (mheap_elt_t * e)
+{
+  ASSERT (e->prev_n_user_data < MHEAP_N_USER_DATA_INVALID);
+  return ((void *) e
+	  - e->prev_n_user_data * sizeof (e->user_data[0])
+	  - MHEAP_ELT_OVERHEAD_BYTES);
+}
+
+/* Exported operations. */
+
+always_inline uword
+mheap_elts (void *v)
+{
+  return v ? mheap_header (v)->n_elts : 0;
+}
+
+always_inline uword
+mheap_max_size (void *v)
+{
+  return v ? mheap_header (v)->max_size : ~0;
+}
+
+/* Free previously allocated offset. */
+void mheap_put (void *v, uword offset);
+
+/* Allocate object from mheap. */
+void *mheap_get_aligned (void *v, uword size, uword align, uword align_offset,
+			 uword * offset_return);
+
+#endif /* included_mem_mheap_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/mod_test_hash.c b/src/vppinfra/mod_test_hash.c
new file mode 100644
index 00000000..b3fa676d
--- /dev/null
+++ b/src/vppinfra/mod_test_hash.c
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/linux_kernel_init.h>
+#include <vppinfra/hash.h>
+
+CLIB_LINUX_KERNEL_MODULE ("test_hash", test_hash_main,
+			  /* kernel-thread flags */ 0 & CLONE_KERNEL);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/os.h b/src/vppinfra/os.h
new file mode 100644
index 00000000..a5c74f8c
--- /dev/null
+++ b/src/vppinfra/os.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001-2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_os_h
+#define included_os_h
+
+#include <vppinfra/clib.h>
+#include <vppinfra/types.h>
+
+/* External panic function. */
+void os_panic (void);
+
+/* External exit function analagous to unix exit. */
+void os_exit (int code);
+
+/* External function to print a line. */
+void os_puts (u8 * string, uword length, uword is_error);
+
+/* External function to handle out of memory. */
+void os_out_of_memory (void);
+
+/* Estimate, measure or divine CPU timestamp clock frequency. */
+f64 os_cpu_clock_frequency (void);
+
+uword os_get_cpu_number (void);
+uword os_get_ncpus (void);
+
+#include <vppinfra/smp.h>
+
+#endif /* included_os_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/pfhash.c b/src/vppinfra/pfhash.c
new file mode 100644
index 00000000..3b9fa8f3
--- /dev/null
+++ b/src/vppinfra/pfhash.c
@@ -0,0 +1,689 @@
+/*
+  Copyright (c) 2013 Cisco and/or its affiliates.
+
+  * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#include <vppinfra/pfhash.h>
+#include <vppinfra/format.h>
+
+/* This is incredibly handy when debugging */
+u32 vl (void *v) __attribute__ ((weak));
+u32
+vl (void *v)
+{
+  return vec_len (v);
+}
+
+#if defined(CLIB_HAVE_VEC128) && ! defined (__ALTIVEC__)
+
+typedef struct
+{
+  u8 *key[16];
+  u64 value;
+} pfhash_show_t;
+
+static int
+sh_compare (pfhash_show_t * sh0, pfhash_show_t * sh1)
+{
+  return ((i32) (sh0->value) - ((i32) sh1->value));
+}
+
+u8 *
+format_pfhash (u8 * s, va_list * args)
+{
+  pfhash_t *p = va_arg (*args, pfhash_t *);
+  int verbose = va_arg (*args, int);
+
+  if (p == 0 || p->overflow_hash == 0 || p->buckets == 0)
+    {
+      s = format (s, "*** uninitialized ***");
+      return s;
+    }
+
+  s = format (s, "Prefetch hash '%s'\n", p->name);
+  s =
+    format (s, " %d buckets, %u bucket overflows, %.1f%% bucket overflow \n",
+	    vec_len (p->buckets), p->overflow_count,
+	    100.0 * ((f64) p->overflow_count) / ((f64) vec_len (p->buckets)));
+  if (p->nitems)
+    s =
+      format (s,
+	      "  %u items, %u items in overflow, %.1f%% items in overflow\n",
+	      p->nitems, p->nitems_in_overflow,
+	      100.0 * ((f64) p->nitems_in_overflow) / ((f64) p->nitems));
+
+  if (verbose)
+    {
+      pfhash_show_t *shs = 0, *sh;
+      hash_pair_t *hp;
+      int i, j;
+
+      for (i = 0; i < vec_len (p->buckets); i++)
+	{
+	  pfhash_kv_t *kv;
+	  pfhash_kv_16_t *kv16;
+	  pfhash_kv_8_t *kv8;
+	  pfhash_kv_8v8_t *kv8v8;
+	  pfhash_kv_4_t *kv4;
+
+	  if (p->buckets[i] == 0 || p->buckets[i] == PFHASH_BUCKET_OVERFLOW)
+	    continue;
+
+	  kv = pool_elt_at_index (p->kvp, p->buckets[i]);
+
+	  switch (p->key_size)
+	    {
+	    case 16:
+	      kv16 = &kv->kv16;
+	      for (j = 0; j < 3; j++)
+		{
+		  if (kv16->values[j] != (u32) ~ 0)
+		    {
+		      vec_add2 (shs, sh, 1);
+		      clib_memcpy (sh->key, &kv16->kb.k_u32x4[j],
+				   p->key_size);
+		      sh->value = kv16->values[j];
+		    }
+		}
+	      break;
+	    case 8:
+	      if (p->value_size == 4)
+		{
+		  kv8 = &kv->kv8;
+		  for (j = 0; j < 5; j++)
+		    {
+		      if (kv8->values[j] != (u32) ~ 0)
+			{
+			  vec_add2 (shs, sh, 1);
+			  clib_memcpy (sh->key, &kv8->kb.k_u64[j],
+				       p->key_size);
+			  sh->value = kv8->values[j];
+			}
+		    }
+		}
+	      else
+		{
+		  kv8v8 = &kv->kv8v8;
+		  for (j = 0; j < 4; j++)
+		    {
+		      if (kv8v8->values[j] != (u64) ~ 0)
+			{
+			  vec_add2 (shs, sh, 1);
+			  clib_memcpy (sh->key, &kv8v8->kb.k_u64[j],
+				       p->key_size);
+			  sh->value = kv8v8->values[j];
+			}
+		    }
+
+		}
+	      break;
+	    case 4:
+	      kv4 = &kv->kv4;
+	      for (j = 0; j < 8; j++)
+		{
+		  if (kv4->values[j] != (u32) ~ 0)
+		    {
+		      vec_add2 (shs, sh, 1);
+		      clib_memcpy (sh->key, &kv4->kb.kb[j], p->key_size);
+		      sh->value = kv4->values[j];
+		    }
+		}
+	      break;
+	    }
+	}
+
+      /* *INDENT-OFF* */
+      hash_foreach_pair (hp, p->overflow_hash,
+      ({
+        vec_add2 (shs, sh, 1);
+        clib_memcpy (sh->key, (u8 *)hp->key, p->key_size);
+        sh->value = hp->value[0];
+      }));
+      /* *INDENT-ON* */
+
+      vec_sort_with_function (shs, sh_compare);
+
+      for (i = 0; i < vec_len (shs); i++)
+	{
+	  sh = vec_elt_at_index (shs, i);
+	  s = format (s, " %U value %u\n", format_hex_bytes, sh->key,
+		      p->key_size, sh->value);
+	}
+      vec_free (shs);
+    }
+  return s;
+}
+
+
+void abort (void);
+
+void
+pfhash_init (pfhash_t * p, char *name, u32 key_size, u32 value_size,
+	     u32 nbuckets)
+{
+  pfhash_kv_t *kv;
+  memset (p, 0, sizeof (*p));
+  u32 key_bytes;
+
+  switch (key_size)
+    {
+    case 4:
+      key_bytes = 4;
+      break;
+    case 8:
+      key_bytes = 8;
+      break;
+    case 16:
+      key_bytes = 16;
+      break;
+    default:
+      ASSERT (0);
+      abort ();
+    }
+
+  switch (value_size)
+    {
+    case 4:
+    case 8:
+      break;
+    default:
+      ASSERT (0);
+      abort ();
+    }
+
+
+  p->name = format (0, "%s", name);
+  vec_add1 (p->name, 0);
+  p->overflow_hash = hash_create_mem (0, key_bytes, sizeof (uword));
+
+  nbuckets = 1 << (max_log2 (nbuckets));
+
+  /* This sets the entire bucket array to zero */
+  vec_validate (p->buckets, nbuckets - 1);
+  p->key_size = key_size;
+  p->value_size = value_size;
+
+  /*
+   * Unset buckets implicitly point at the 0th pool elt.
+   * All search routines will return ~0 if they go there.
+   */
+  pool_get_aligned (p->kvp, kv, 16);
+  memset (kv, 0xff, sizeof (*kv));
+}
+
+static pfhash_kv_16_t *
+pfhash_get_kv_16 (pfhash_t * p, u32 bucket_contents,
+		  u32x4 * key, u32 * match_index)
+{
+  u32x4 diff[3];
+  u32 is_equal[3];
+  pfhash_kv_16_t *kv = 0;
+
+  *match_index = (u32) ~ 0;
+
+  kv = &p->kvp[bucket_contents].kv16;
+
+  diff[0] = u32x4_sub (kv->kb.k_u32x4[0], key[0]);
+  diff[1] = u32x4_sub (kv->kb.k_u32x4[1], key[0]);
+  diff[2] = u32x4_sub (kv->kb.k_u32x4[2], key[0]);
+
+  is_equal[0] = u32x4_zero_byte_mask (diff[0]) == 0xffff;
+  is_equal[1] = u32x4_zero_byte_mask (diff[1]) == 0xffff;
+  is_equal[2] = u32x4_zero_byte_mask (diff[2]) == 0xffff;
+
+  if (is_equal[0])
+    *match_index = 0;
+  if (is_equal[1])
+    *match_index = 1;
+  if (is_equal[2])
+    *match_index = 2;
+
+  return kv;
+}
+
+static pfhash_kv_8_t *
+pfhash_get_kv_8 (pfhash_t * p, u32 bucket_contents,
+		 u64 * key, u32 * match_index)
+{
+  pfhash_kv_8_t *kv;
+
+  *match_index = (u32) ~ 0;
+
+  kv = &p->kvp[bucket_contents].kv8;
+
+  if (kv->kb.k_u64[0] == key[0])
+    *match_index = 0;
+  if (kv->kb.k_u64[1] == key[0])
+    *match_index = 1;
+  if (kv->kb.k_u64[2] == key[0])
+    *match_index = 2;
+  if (kv->kb.k_u64[3] == key[0])
+    *match_index = 3;
+  if (kv->kb.k_u64[4] == key[0])
+    *match_index = 4;
+
+  return kv;
+}
+
+static pfhash_kv_8v8_t *
+pfhash_get_kv_8v8 (pfhash_t * p,
+		   u32 bucket_contents, u64 * key, u32 * match_index)
+{
+  pfhash_kv_8v8_t *kv;
+
+  *match_index = (u32) ~ 0;
+
+  kv = &p->kvp[bucket_contents].kv8v8;
+
+  if (kv->kb.k_u64[0] == key[0])
+    *match_index = 0;
+  if (kv->kb.k_u64[1] == key[0])
+    *match_index = 1;
+  if (kv->kb.k_u64[2] == key[0])
+    *match_index = 2;
+  if (kv->kb.k_u64[3] == key[0])
+    *match_index = 3;
+
+  return kv;
+}
+
+static pfhash_kv_4_t *
+pfhash_get_kv_4 (pfhash_t * p, u32 bucket_contents,
+		 u32 * key, u32 * match_index)
+{
+  u32x4 vector_key;
+  u32x4 is_equal[2];
+  u32 zbm[2], winner_index;
+  pfhash_kv_4_t *kv;
+
+  *match_index = (u32) ~ 0;
+
+  kv = &p->kvp[bucket_contents].kv4;
+
+  vector_key = u32x4_splat (key[0]);
+
+  is_equal[0] = u32x4_is_equal (kv->kb.k_u32x4[0], vector_key);
+  is_equal[1] = u32x4_is_equal (kv->kb.k_u32x4[1], vector_key);
+  zbm[0] = ~u32x4_zero_byte_mask (is_equal[0]) & 0xFFFF;
+  zbm[1] = ~u32x4_zero_byte_mask (is_equal[1]) & 0xFFFF;
+
+  if (PREDICT_FALSE ((zbm[0] == 0) && (zbm[1] == 0)))
+    return kv;
+
+  winner_index = min_log2 (zbm[0]) >> 2;
+  winner_index = zbm[1] ? (4 + (min_log2 (zbm[1]) >> 2)) : winner_index;
+
+  *match_index = winner_index;
+  return kv;
+}
+
+static pfhash_kv_t *
+pfhash_get_internal (pfhash_t * p, u32 bucket_contents,
+		     void *key, u32 * match_index)
+{
+  pfhash_kv_t *kv = 0;
+
+  switch (p->key_size)
+    {
+    case 16:
+      kv =
+	(pfhash_kv_t *) pfhash_get_kv_16 (p, bucket_contents, key,
+					  match_index);
+      break;
+    case 8:
+      if (p->value_size == 4)
+	kv = (pfhash_kv_t *) pfhash_get_kv_8 (p, bucket_contents,
+					      key, match_index);
+      else
+	kv = (pfhash_kv_t *) pfhash_get_kv_8v8 (p, bucket_contents,
+						key, match_index);
+      break;
+    case 4:
+      kv =
+	(pfhash_kv_t *) pfhash_get_kv_4 (p, bucket_contents, key,
+					 match_index);
+      break;
+    default:
+      ASSERT (0);
+    }
+  return kv;
+}
+
+u64
+pfhash_get (pfhash_t * p, u32 bucket, void *key)
+{
+  pfhash_kv_t *kv;
+  u32 match_index = ~0;
+  pfhash_kv_16_t *kv16;
+  pfhash_kv_8_t *kv8;
+  pfhash_kv_8v8_t *kv8v8;
+  pfhash_kv_4_t *kv4;
+
+  u32 bucket_contents = pfhash_read_bucket_prefetch_kv (p, bucket);
+
+  if (bucket_contents == PFHASH_BUCKET_OVERFLOW)
+    {
+      uword *hp;
+
+      hp = hash_get_mem (p->overflow_hash, key);
+      if (hp)
+	return hp[0];
+      return (u64) ~ 0;
+    }
+
+  kv = pfhash_get_internal (p, bucket_contents, key, &match_index);
+  if (match_index == (u32) ~ 0)
+    return (u64) ~ 0;
+
+  kv16 = (void *) kv;
+  kv8 = (void *) kv;
+  kv4 = (void *) kv;
+  kv8v8 = (void *) kv;
+
+  switch (p->key_size)
+    {
+    case 16:
+      return (kv16->values[match_index] == (u32) ~ 0)
+	? (u64) ~ 0 : (u64) kv16->values[match_index];
+    case 8:
+      if (p->value_size == 4)
+	return (kv8->values[match_index] == (u32) ~ 0)
+	  ? (u64) ~ 0 : (u64) kv8->values[match_index];
+      else
+	return kv8v8->values[match_index];
+    case 4:
+      return (kv4->values[match_index] == (u32) ~ 0)
+	? (u64) ~ 0 : (u64) kv4->values[match_index];
+    default:
+      ASSERT (0);
+    }
+  return (u64) ~ 0;
+}
+
+void
+pfhash_set (pfhash_t * p, u32 bucket, void *key, void *value)
+{
+  u32 bucket_contents = pfhash_read_bucket_prefetch_kv (p, bucket);
+  u32 match_index = (u32) ~ 0;
+  pfhash_kv_t *kv;
+  pfhash_kv_16_t *kv16;
+  pfhash_kv_8_t *kv8;
+  pfhash_kv_8v8_t *kv8v8;
+  pfhash_kv_4_t *kv4;
+  int i;
+  u8 *kcopy;
+
+  if (bucket_contents == PFHASH_BUCKET_OVERFLOW)
+    {
+      hash_pair_t *hp;
+      hp = hash_get_pair_mem (p->overflow_hash, key);
+      if (hp)
+	{
+	  clib_warning ("replace value 0x%08x with value 0x%08x",
+			hp->value[0], (u64) value);
+	  hp->value[0] = (u64) value;
+	  return;
+	}
+      kcopy = clib_mem_alloc (p->key_size);
+      clib_memcpy (kcopy, key, p->key_size);
+      hash_set_mem (p->overflow_hash, kcopy, value);
+      p->nitems++;
+      p->nitems_in_overflow++;
+      return;
+    }
+
+  if (bucket_contents == 0)
+    {
+      pool_get_aligned (p->kvp, kv, 16);
+      memset (kv, 0xff, sizeof (*kv));
+      p->buckets[bucket] = kv - p->kvp;
+    }
+  else
+    kv = pfhash_get_internal (p, bucket_contents, key, &match_index);
+
+  kv16 = (void *) kv;
+  kv8 = (void *) kv;
+  kv8v8 = (void *) kv;
+  kv4 = (void *) kv;
+
+  p->nitems++;
+
+  if (match_index != (u32) ~ 0)
+    {
+      switch (p->key_size)
+	{
+	case 16:
+	  kv16->values[match_index] = (u32) (u64) value;
+	  return;
+
+	case 8:
+	  if (p->value_size == 4)
+	    kv8->values[match_index] = (u32) (u64) value;
+	  else
+	    kv8v8->values[match_index] = (u64) value;
+	  return;
+
+	case 4:
+	  kv4->values[match_index] = (u64) value;
+	  return;
+
+	default:
+	  ASSERT (0);
+	}
+    }
+
+  switch (p->key_size)
+    {
+    case 16:
+      for (i = 0; i < 3; i++)
+	{
+	  if (kv16->values[i] == (u32) ~ 0)
+	    {
+	      clib_memcpy (&kv16->kb.k_u32x4[i], key, p->key_size);
+	      kv16->values[i] = (u32) (u64) value;
+	      return;
+	    }
+	}
+      /* copy bucket contents to overflow hash tbl */
+      for (i = 0; i < 3; i++)
+	{
+	  kcopy = clib_mem_alloc (p->key_size);
+	  clib_memcpy (kcopy, &kv16->kb.k_u32x4[i], p->key_size);
+	  hash_set_mem (p->overflow_hash, kcopy, kv16->values[i]);
+	  p->nitems_in_overflow++;
+	}
+      /* Add new key to overflow */
+      kcopy = clib_mem_alloc (p->key_size);
+      clib_memcpy (kcopy, key, p->key_size);
+      hash_set_mem (p->overflow_hash, kcopy, value);
+      p->buckets[bucket] = PFHASH_BUCKET_OVERFLOW;
+      p->overflow_count++;
+      p->nitems_in_overflow++;
+      return;
+
+    case 8:
+      if (p->value_size == 4)
+	{
+	  for (i = 0; i < 5; i++)
+	    {
+	      if (kv8->values[i] == (u32) ~ 0)
+		{
+		  clib_memcpy (&kv8->kb.k_u64[i], key, 8);
+		  kv8->values[i] = (u32) (u64) value;
+		  return;
+		}
+	    }
+	  /* copy bucket contents to overflow hash tbl */
+	  for (i = 0; i < 5; i++)
+	    {
+	      kcopy = clib_mem_alloc (p->key_size);
+	      clib_memcpy (kcopy, &kv8->kb.k_u64[i], 8);
+	      hash_set_mem (p->overflow_hash, kcopy, kv8->values[i]);
+	      p->nitems_in_overflow++;
+	    }
+	}
+      else
+	{
+	  for (i = 0; i < 4; i++)
+	    {
+	      if (kv8v8->values[i] == (u64) ~ 0)
+		{
+		  clib_memcpy (&kv8v8->kb.k_u64[i], key, 8);
+		  kv8v8->values[i] = (u64) value;
+		  return;
+		}
+	    }
+	  /* copy bucket contents to overflow hash tbl */
+	  for (i = 0; i < 4; i++)
+	    {
+	      kcopy = clib_mem_alloc (p->key_size);
+	      clib_memcpy (kcopy, &kv8v8->kb.k_u64[i], 8);
+	      hash_set_mem (p->overflow_hash, kcopy, kv8v8->values[i]);
+	      p->nitems_in_overflow++;
+	    }
+
+	}
+      /* Add new key to overflow */
+      kcopy = clib_mem_alloc (p->key_size);
+      clib_memcpy (kcopy, key, p->key_size);
+      hash_set_mem (p->overflow_hash, kcopy, value);
+      p->buckets[bucket] = PFHASH_BUCKET_OVERFLOW;
+      p->overflow_count++;
+      p->nitems_in_overflow++;
+      return;
+
+    case 4:
+      for (i = 0; i < 8; i++)
+	{
+	  if (kv4->values[i] == (u32) ~ 0)
+	    {
+	      clib_memcpy (&kv4->kb.kb[i], key, 4);
+	      kv4->values[i] = (u32) (u64) value;
+	      return;
+	    }
+	}
+      /* copy bucket contents to overflow hash tbl */
+      for (i = 0; i < 8; i++)
+	{
+	  kcopy = clib_mem_alloc (p->key_size);
+	  clib_memcpy (kcopy, &kv4->kb.kb[i], 4);
+	  hash_set_mem (p->overflow_hash, kcopy, kv4->values[i]);
+	  p->nitems_in_overflow++;
+	}
+      /* Add new key to overflow */
+      kcopy = clib_mem_alloc (p->key_size);
+      clib_memcpy (kcopy, key, p->key_size);
+      hash_set_mem (p->overflow_hash, kcopy, value);
+      p->buckets[bucket] = PFHASH_BUCKET_OVERFLOW;
+      p->overflow_count++;
+      p->nitems_in_overflow++;
+      return;
+
+    default:
+      ASSERT (0);
+    }
+}
+
+void
+pfhash_unset (pfhash_t * p, u32 bucket, void *key)
+{
+  u32 bucket_contents = pfhash_read_bucket_prefetch_kv (p, bucket);
+  u32 match_index = (u32) ~ 0;
+  pfhash_kv_t *kv;
+  pfhash_kv_16_t *kv16;
+  pfhash_kv_8_t *kv8;
+  pfhash_kv_8v8_t *kv8v8;
+  pfhash_kv_4_t *kv4;
+  void *oldkey;
+
+  if (bucket_contents == PFHASH_BUCKET_OVERFLOW)
+    {
+      hash_pair_t *hp;
+      hp = hash_get_pair_mem (p->overflow_hash, key);
+      if (hp)
+	{
+	  oldkey = (void *) hp->key;
+	  hash_unset_mem (p->overflow_hash, key);
+	  clib_mem_free (oldkey);
+	  p->nitems--;
+	  p->nitems_in_overflow--;
+	}
+      return;
+    }
+
+  kv = pfhash_get_internal (p, bucket_contents, key, &match_index);
+  if (match_index == (u32) ~ 0)
+    return;
+
+  p->nitems--;
+
+  kv16 = (void *) kv;
+  kv8 = (void *) kv;
+  kv8v8 = (void *) kv;
+  kv4 = (void *) kv;
+
+  switch (p->key_size)
+    {
+    case 16:
+      kv16->values[match_index] = (u32) ~ 0;
+      return;
+
+    case 8:
+      if (p->value_size == 4)
+	kv8->values[match_index] = (u32) ~ 0;
+      else
+	kv8v8->values[match_index] = (u64) ~ 0;
+      return;
+
+    case 4:
+      kv4->values[match_index] = (u32) ~ 0;
+      return;
+
+    default:
+      ASSERT (0);
+    }
+}
+
+void
+pfhash_free (pfhash_t * p)
+{
+  hash_pair_t *hp;
+  int i;
+  u8 **keys = 0;
+
+  vec_free (p->name);
+
+  pool_free (p->kvp);
+
+  /* *INDENT-OFF* */
+  hash_foreach_pair (hp, p->overflow_hash,
+  ({
+    vec_add1 (keys, (u8 *)hp->key);
+  }));
+  /* *INDENT-ON* */
+  hash_free (p->overflow_hash);
+  for (i = 0; i < vec_len (keys); i++)
+    vec_free (keys[i]);
+  vec_free (keys);
+}
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/pfhash.h b/src/vppinfra/pfhash.h
new file mode 100644
index 00000000..e054c668
--- /dev/null
+++ b/src/vppinfra/pfhash.h
@@ -0,0 +1,276 @@
+/*
+  Copyright (c) 2013 Cisco and/or its affiliates.
+
+  * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#ifndef included_clib_pfhash_h
+#define included_clib_pfhash_h
+
+
+#include <vppinfra/clib.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/pool.h>
+
+#if defined(CLIB_HAVE_VEC128) && ! defined (__ALTIVEC__)
+
+typedef struct
+{
+  /* 3 x 16 = 48 key bytes */
+  union
+  {
+    u32x4 k_u32x4[3];
+    u64 k_u64[6];
+  } kb;
+  /* 3 x 4 = 12 value bytes */
+  u32 values[3];
+  u32 pad;
+} pfhash_kv_16_t;
+
+typedef struct
+{
+  /* 5 x 8 = 40 key bytes */
+  union
+  {
+    u64 k_u64[5];
+  } kb;
+
+  /* 5 x 4 = 20 value bytes */
+  u32 values[5];
+  u32 pad;
+} pfhash_kv_8_t;
+
+typedef struct
+{
+  /* 4 x 8 = 32 key bytes */
+  union
+  {
+    u64 k_u64[4];
+  } kb;
+
+  /* 4 x 8 = 32 value bytes */
+  u64 values[4];
+} pfhash_kv_8v8_t;
+
+typedef struct
+{
+  /* 8 x 4 = 32 key bytes */
+  union
+  {
+    u32x4 k_u32x4[2];
+    u32 kb[8];
+  } kb;
+
+  /* 8 x 4 = 32 value bytes */
+  u32 values[8];
+} pfhash_kv_4_t;
+
+typedef union
+{
+  pfhash_kv_16_t kv16;
+  pfhash_kv_8_t kv8;
+  pfhash_kv_8v8_t kv8v8;
+  pfhash_kv_4_t kv4;
+} pfhash_kv_t;
+
+typedef struct
+{
+  /* Bucket vector */
+  u32 *buckets;
+#define PFHASH_BUCKET_OVERFLOW (u32)~0
+
+  /* Pool of key/value pairs */
+  pfhash_kv_t *kvp;
+
+  /* overflow plain-o-hash */
+  uword *overflow_hash;
+
+  /* Pretty-print name */
+  u8 *name;
+
+  u32 key_size;
+  u32 value_size;
+
+  u32 overflow_count;
+  u32 nitems;
+  u32 nitems_in_overflow;
+} pfhash_t;
+
+void pfhash_init (pfhash_t * p, char *name, u32 key_size, u32 value_size,
+		  u32 nbuckets);
+void pfhash_free (pfhash_t * p);
+u64 pfhash_get (pfhash_t * p, u32 bucket, void *key);
+void pfhash_set (pfhash_t * p, u32 bucket, void *key, void *value);
+void pfhash_unset (pfhash_t * p, u32 bucket, void *key);
+
+format_function_t format_pfhash;
+
+static inline void
+pfhash_prefetch_bucket (pfhash_t * p, u32 bucket)
+{
+  CLIB_PREFETCH (&p->buckets[bucket], CLIB_CACHE_LINE_BYTES, LOAD);
+}
+
+static inline u32
+pfhash_read_bucket_prefetch_kv (pfhash_t * p, u32 bucket)
+{
+  u32 bucket_contents = p->buckets[bucket];
+  if (PREDICT_TRUE ((bucket_contents & PFHASH_BUCKET_OVERFLOW) == 0))
+    CLIB_PREFETCH (&p->kvp[bucket_contents], CLIB_CACHE_LINE_BYTES, LOAD);
+  return bucket_contents;
+}
+
+/*
+ * pfhash_search_kv_16
+ * See if the supplied 16-byte key matches one of three 16-byte (key,value) pairs.
+ * Return the indicated value, or ~0 if no match
+ *
+ * Note: including the overflow test, the fast path is 35 instrs
+ * on x86_64. Elves will steal your keyboard in the middle of the night if
+ * you "improve" it without checking the generated code!
+ */
+static inline u32
+pfhash_search_kv_16 (pfhash_t * p, u32 bucket_contents, u32x4 * key)
+{
+  u32x4 diff0, diff1, diff2;
+  u32 is_equal0, is_equal1, is_equal2;
+  u32 no_match;
+  pfhash_kv_16_t *kv;
+  u32 rv;
+
+  if (PREDICT_FALSE (bucket_contents == PFHASH_BUCKET_OVERFLOW))
+    {
+      uword *hp;
+      hp = hash_get_mem (p->overflow_hash, key);
+      if (hp)
+	return hp[0];
+      return (u32) ~ 0;
+    }
+
+  kv = &p->kvp[bucket_contents].kv16;
+
+  diff0 = u32x4_sub (kv->kb.k_u32x4[0], key[0]);
+  diff1 = u32x4_sub (kv->kb.k_u32x4[1], key[0]);
+  diff2 = u32x4_sub (kv->kb.k_u32x4[2], key[0]);
+
+  no_match = is_equal0 = (i16) u32x4_zero_byte_mask (diff0);
+  is_equal1 = (i16) u32x4_zero_byte_mask (diff1);
+  no_match |= is_equal1;
+  is_equal2 = (i16) u32x4_zero_byte_mask (diff2);
+  no_match |= is_equal2;
+  /* If any of the three items matched, no_match will be zero after this line */
+  no_match = ~no_match;
+
+  rv = (is_equal0 & kv->values[0])
+    | (is_equal1 & kv->values[1]) | (is_equal2 & kv->values[2]) | no_match;
+
+  return rv;
+}
+
+static inline u32
+pfhash_search_kv_8 (pfhash_t * p, u32 bucket_contents, u64 * key)
+{
+  pfhash_kv_8_t *kv;
+  u32 rv = (u32) ~ 0;
+
+  if (PREDICT_FALSE (bucket_contents == PFHASH_BUCKET_OVERFLOW))
+    {
+      uword *hp;
+      hp = hash_get_mem (p->overflow_hash, key);
+      if (hp)
+	return hp[0];
+      return (u32) ~ 0;
+    }
+
+  kv = &p->kvp[bucket_contents].kv8;
+
+  rv = (kv->kb.k_u64[0] == key[0]) ? kv->values[0] : rv;
+  rv = (kv->kb.k_u64[1] == key[0]) ? kv->values[1] : rv;
+  rv = (kv->kb.k_u64[2] == key[0]) ? kv->values[2] : rv;
+  rv = (kv->kb.k_u64[3] == key[0]) ? kv->values[3] : rv;
+  rv = (kv->kb.k_u64[4] == key[0]) ? kv->values[4] : rv;
+
+  return rv;
+}
+
+static inline u64
+pfhash_search_kv_8v8 (pfhash_t * p, u32 bucket_contents, u64 * key)
+{
+  pfhash_kv_8v8_t *kv;
+  u64 rv = (u64) ~ 0;
+
+  if (PREDICT_FALSE (bucket_contents == PFHASH_BUCKET_OVERFLOW))
+    {
+      uword *hp;
+      hp = hash_get_mem (p->overflow_hash, key);
+      if (hp)
+	return hp[0];
+      return (u64) ~ 0;
+    }
+
+  kv = &p->kvp[bucket_contents].kv8v8;
+
+  rv = (kv->kb.k_u64[0] == key[0]) ? kv->values[0] : rv;
+  rv = (kv->kb.k_u64[1] == key[0]) ? kv->values[1] : rv;
+  rv = (kv->kb.k_u64[2] == key[0]) ? kv->values[2] : rv;
+  rv = (kv->kb.k_u64[3] == key[0]) ? kv->values[3] : rv;
+
+  return rv;
+}
+
+static inline u32
+pfhash_search_kv_4 (pfhash_t * p, u32 bucket_contents, u32 * key)
+{
+  u32x4 vector_key;
+  u32x4 is_equal[2];
+  u32 zbm[2], winner_index;
+  pfhash_kv_4_t *kv;
+
+  if (PREDICT_FALSE (bucket_contents == PFHASH_BUCKET_OVERFLOW))
+    {
+      uword *hp;
+      hp = hash_get_mem (p->overflow_hash, key);
+      if (hp)
+	return hp[0];
+      return (u32) ~ 0;
+    }
+
+  kv = &p->kvp[bucket_contents].kv4;
+
+  vector_key = u32x4_splat (key[0]);
+
+  is_equal[0] = u32x4_is_equal (kv->kb.k_u32x4[0], vector_key);
+  is_equal[1] = u32x4_is_equal (kv->kb.k_u32x4[1], vector_key);
+  zbm[0] = ~u32x4_zero_byte_mask (is_equal[0]) & 0xFFFF;
+  zbm[1] = ~u32x4_zero_byte_mask (is_equal[1]) & 0xFFFF;
+
+  if (PREDICT_FALSE ((zbm[0] == 0) && (zbm[1] == 0)))
+    return (u32) ~ 0;
+
+  winner_index = min_log2 (zbm[0]) >> 2;
+  winner_index = zbm[1] ? (4 + (min_log2 (zbm[1]) >> 2)) : winner_index;
+
+  return kv->values[winner_index];
+}
+
+#endif /* CLIB_HAVE_VEC128 */
+
+#endif /* included_clib_pfhash_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/phash.c b/src/vppinfra/phash.c
new file mode 100644
index 00000000..14da5225
--- /dev/null
+++ b/src/vppinfra/phash.c
@@ -0,0 +1,1017 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+/* This is all stolen from Bob Jenkins and reworked for clib.  Thanks
+   once again Bob for the great work. */
+
+/*
+------------------------------------------------------------------------------
+perfect.c: code to generate code for a hash for perfect hashing.
+(c) Bob Jenkins, September 1996, December 1999
+You may use this code in any way you wish, and it is free.  No warranty.
+I hereby place this in the public domain.
+Source is http://burtleburtle.net/bob/c/perfect.c
+
+This generates a minimal perfect hash function.  That means, given a
+set of n keys, this determines a hash function that maps each of
+those keys into a value in 0..n-1 with no collisions.
+
+The perfect hash function first uses a normal hash function on the key
+to determine (a,b) such that the pair (a,b) is distinct for all
+keys, then it computes a^scramble[tab[b]] to get the final perfect hash.
+tab[] is an array of 1-byte values and scramble[] is a 256-term array of
+2-byte or 4-byte values.  If there are n keys, the length of tab[] is a
+power of two between n/3 and n.
+
+I found the idea of computing distinct (a,b) values in "Practical minimal
+perfect hash functions for large databases", Fox, Heath, Chen, and Daoud,
+Communications of the ACM, January 1992.  They found the idea in Chichelli
+(CACM Jan 1980).  Beyond that, our methods differ.
+
+The key is hashed to a pair (a,b) where a in 0..*alen*-1 and b in
+0..*blen*-1.  A fast hash function determines both a and b
+simultaneously.  Any decent hash function is likely to produce
+hashes so that (a,b) is distinct for all pairs.  I try the hash
+using different values of *salt* until all pairs are distinct.
+
+The final hash is (a XOR scramble[tab[b]]).  *scramble* is a
+predetermined mapping of 0..255 into 0..smax-1.  *tab* is an
+array that we fill in in such a way as to make the hash perfect.
+
+First we fill in all values of *tab* that are used by more than one
+key.  We try all possible values for each position until one works.
+
+This leaves m unmapped keys and m values that something could hash to.
+If you treat unmapped keys as lefthand nodes and unused hash values
+as righthand nodes, and draw a line connecting each key to each hash
+value it could map to, you get a bipartite graph.  We attempt to
+find a perfect matching in this graph.  If we succeed, we have
+determined a perfect hash for the whole set of keys.
+
+*scramble* is used because (a^tab[i]) clusters keys around *a*.
+------------------------------------------------------------------------------
+*/
+
+#include <vppinfra/bitmap.h>
+#include <vppinfra/format.h>
+#include <vppinfra/phash.h>
+#include <vppinfra/random.h>
+
+static void
+init_keys_direct_u32 (phash_main_t * pm)
+{
+  int n_keys_left, b_mask, a_shift;
+  u32 seed;
+  phash_key_t *k;
+
+  seed = pm->hash_seed;
+  b_mask = (1 << pm->b_bits) - 1;
+  a_shift = BITS (seed) - pm->a_bits;
+
+  k = pm->keys;
+  n_keys_left = vec_len (pm->keys);
+
+  while (n_keys_left >= 2)
+    {
+      u32 x0, y0, z0;
+      u32 x1, y1, z1;
+
+      x0 = y0 = z0 = seed;
+      x1 = y1 = z1 = seed;
+      x0 += (u32) k[0].key;
+      x1 += (u32) k[1].key;
+
+      hash_mix32 (x0, y0, z0);
+      hash_mix32 (x1, y1, z1);
+
+      k[0].b = z0 & b_mask;
+      k[1].b = z1 & b_mask;
+      k[0].a = z0 >> a_shift;
+      k[1].a = z1 >> a_shift;
+      if (PREDICT_FALSE (a_shift >= BITS (z0)))
+	k[0].a = k[1].a = 0;
+
+      k += 2;
+      n_keys_left -= 2;
+    }
+
+  if (n_keys_left >= 1)
+    {
+      u32 x0, y0, z0;
+
+      x0 = y0 = z0 = seed;
+      x0 += k[0].key;
+
+      hash_mix32 (x0, y0, z0);
+
+      k[0].b = z0 & b_mask;
+      k[0].a = z0 >> a_shift;
+      if (PREDICT_FALSE (a_shift >= BITS (z0)))
+	k[0].a = 0;
+
+      k += 1;
+      n_keys_left -= 1;
+    }
+}
+
+static void
+init_keys_direct_u64 (phash_main_t * pm)
+{
+  int n_keys_left, b_mask, a_shift;
+  u64 seed;
+  phash_key_t *k;
+
+  seed = pm->hash_seed;
+  b_mask = (1 << pm->b_bits) - 1;
+  a_shift = BITS (seed) - pm->a_bits;
+
+  k = pm->keys;
+  n_keys_left = vec_len (pm->keys);
+
+  while (n_keys_left >= 2)
+    {
+      u64 x0, y0, z0;
+      u64 x1, y1, z1;
+
+      x0 = y0 = z0 = seed;
+      x1 = y1 = z1 = seed;
+      x0 += (u64) k[0].key;
+      x1 += (u64) k[1].key;
+
+      hash_mix64 (x0, y0, z0);
+      hash_mix64 (x1, y1, z1);
+
+      k[0].b = z0 & b_mask;
+      k[1].b = z1 & b_mask;
+      k[0].a = z0 >> a_shift;
+      k[1].a = z1 >> a_shift;
+      if (PREDICT_FALSE (a_shift >= BITS (z0)))
+	k[0].a = k[1].a = 0;
+
+      k += 2;
+      n_keys_left -= 2;
+    }
+
+  if (n_keys_left >= 1)
+    {
+      u64 x0, y0, z0;
+
+      x0 = y0 = z0 = seed;
+      x0 += k[0].key;
+
+      hash_mix64 (x0, y0, z0);
+
+      k[0].b = z0 & b_mask;
+      k[0].a = z0 >> a_shift;
+      if (PREDICT_FALSE (a_shift >= BITS (z0)))
+	k[0].a = 0;
+
+      k += 1;
+      n_keys_left -= 1;
+    }
+}
+
+static void
+init_keys_indirect_u32 (phash_main_t * pm)
+{
+  int n_keys_left, b_mask, a_shift;
+  u32 seed;
+  phash_key_t *k;
+
+  seed = pm->hash_seed;
+  b_mask = (1 << pm->b_bits) - 1;
+  a_shift = BITS (seed) - pm->a_bits;
+
+  k = pm->keys;
+  n_keys_left = vec_len (pm->keys);
+
+  while (n_keys_left >= 2)
+    {
+      u32 xyz[6];
+      u32 x0, y0, z0;
+      u32 x1, y1, z1;
+
+      pm->key_seed2 (pm->private, k[0].key, k[1].key, &xyz);
+
+      x0 = y0 = z0 = seed;
+      x1 = y1 = z1 = seed;
+      x0 += xyz[0];
+      y0 += xyz[1];
+      z0 += xyz[2];
+      x1 += xyz[3];
+      y1 += xyz[4];
+      z1 += xyz[5];
+
+      hash_mix32 (x0, y0, z0);
+      hash_mix32 (x1, y1, z1);
+
+      k[0].b = z0 & b_mask;
+      k[1].b = z1 & b_mask;
+      k[0].a = z0 >> a_shift;
+      k[1].a = z1 >> a_shift;
+      if (PREDICT_FALSE (a_shift >= BITS (z0)))
+	k[0].a = k[1].a = 0;
+
+      k += 2;
+      n_keys_left -= 2;
+    }
+
+  if (n_keys_left >= 1)
+    {
+      u32 xyz[3];
+      u32 x0, y0, z0;
+
+      pm->key_seed1 (pm->private, k[0].key, &xyz);
+
+      x0 = y0 = z0 = seed;
+      x0 += xyz[0];
+      y0 += xyz[1];
+      z0 += xyz[2];
+
+      hash_mix32 (x0, y0, z0);
+
+      k[0].b = z0 & b_mask;
+      k[0].a = z0 >> a_shift;
+      if (PREDICT_FALSE (a_shift >= BITS (z0)))
+	k[0].a = 0;
+
+      k += 1;
+      n_keys_left -= 1;
+    }
+}
+
+static void
+init_keys_indirect_u64 (phash_main_t * pm)
+{
+  int n_keys_left, b_mask, a_shift;
+  u64 seed;
+  phash_key_t *k;
+
+  seed = pm->hash_seed;
+  b_mask = (1 << pm->b_bits) - 1;
+  a_shift = BITS (seed) - pm->a_bits;
+
+  k = pm->keys;
+  n_keys_left = vec_len (pm->keys);
+
+  while (n_keys_left >= 2)
+    {
+      u64 xyz[6];
+      u64 x0, y0, z0;
+      u64 x1, y1, z1;
+
+      pm->key_seed2 (pm->private, k[0].key, k[1].key, &xyz);
+
+      x0 = y0 = z0 = seed;
+      x1 = y1 = z1 = seed;
+      x0 += xyz[0];
+      y0 += xyz[1];
+      z0 += xyz[2];
+      x1 += xyz[3];
+      y1 += xyz[4];
+      z1 += xyz[5];
+
+      hash_mix64 (x0, y0, z0);
+      hash_mix64 (x1, y1, z1);
+
+      k[0].b = z0 & b_mask;
+      k[1].b = z1 & b_mask;
+      k[0].a = z0 >> a_shift;
+      k[1].a = z1 >> a_shift;
+      if (PREDICT_FALSE (a_shift >= BITS (z0)))
+	k[0].a = k[1].a = 0;
+
+      k += 2;
+      n_keys_left -= 2;
+    }
+
+  if (n_keys_left >= 1)
+    {
+      u64 xyz[3];
+      u64 x0, y0, z0;
+
+      pm->key_seed1 (pm->private, k[0].key, &xyz);
+
+      x0 = y0 = z0 = seed;
+      x0 += xyz[0];
+      y0 += xyz[1];
+      z0 += xyz[2];
+
+      hash_mix64 (x0, y0, z0);
+
+      k[0].b = z0 & b_mask;
+      k[0].a = z0 >> a_shift;
+      if (PREDICT_FALSE (a_shift >= BITS (z0)))
+	k[0].a = 0;
+
+      k += 1;
+      n_keys_left -= 1;
+    }
+}
+
+/*
+ * insert keys into table according to key->b
+ * check if the initial hash might work
+ */
+static int
+init_tabb (phash_main_t * pm)
+{
+  int no_collisions;
+  phash_tabb_t *tb;
+  phash_key_t *k, *l;
+
+  if (pm->key_seed1)
+    {
+      if (pm->flags & PHASH_FLAG_MIX64)
+	init_keys_indirect_u64 (pm);
+      else
+	init_keys_indirect_u32 (pm);
+    }
+  else
+    {
+      if (pm->flags & PHASH_FLAG_MIX64)
+	init_keys_direct_u64 (pm);
+      else
+	init_keys_direct_u32 (pm);
+    }
+
+  if (!pm->tabb)
+    vec_resize (pm->tabb, 1 << pm->b_bits);
+  else
+    vec_foreach (tb, pm->tabb) phash_tabb_free (tb);
+
+  /* Two keys with the same (a,b) guarantees a collision */
+  no_collisions = 1;
+  vec_foreach (k, pm->keys)
+  {
+    u32 i, *ki;
+
+    tb = pm->tabb + k->b;
+    ki = tb->keys;
+    for (i = 0; i < vec_len (ki); i++)
+      {
+	l = pm->keys + ki[i];
+	if (k->a == l->a)
+	  {
+	    /* Given keys are supposed to be unique. */
+	    if (pm->key_is_equal
+		&& pm->key_is_equal (pm->private, l->key, k->key))
+	      clib_error ("duplicate keys");
+	    no_collisions = 0;
+	    goto done;
+	  }
+      }
+
+    vec_add1 (tb->keys, k - pm->keys);
+  }
+
+done:
+  return no_collisions;
+}
+
+/* Try to apply an augmenting list */
+static int
+apply (phash_main_t * pm, u32 tail, u32 rollback)
+{
+  phash_key_t *k;
+  phash_tabb_t *pb;
+  phash_tabq_t *q_child, *q_parent;
+  u32 ki, i, hash, child, parent;
+  u32 stabb;			/* scramble[tab[b]] */
+  int no_collision;
+
+  no_collision = 1;
+
+  /* Walk from child to parent until root is reached. */
+  for (child = tail - 1; child; child = parent)
+    {
+      q_child = &pm->tabq[child];
+      parent = q_child->parent_q;
+      q_parent = &pm->tabq[parent];
+
+      /* find parent's list of siblings */
+      ASSERT (q_parent->b_q < vec_len (pm->tabb));
+      pb = pm->tabb + q_parent->b_q;
+
+      /* erase old hash values */
+      stabb = pm->scramble[pb->val_b];
+      for (i = 0; i < vec_len (pb->keys); i++)
+	{
+	  ki = pb->keys[i];
+	  k = pm->keys + ki;
+	  hash = k->a ^ stabb;
+
+	  /* Erase hash for all of child's siblings. */
+	  if (ki == pm->tabh[hash])
+	    pm->tabh[hash] = ~0;
+	}
+
+      /* change pb->val_b, which will change the hashes of all parent siblings */
+      pb->val_b = rollback ? q_child->oldval_q : q_child->newval_q;
+
+      /* set new hash values */
+      stabb = pm->scramble[pb->val_b];
+      for (i = 0; i < vec_len (pb->keys); i++)
+	{
+	  ki = pb->keys[i];
+	  k = pm->keys + ki;
+
+	  hash = k->a ^ stabb;
+	  if (rollback)
+	    {
+	      if (parent == 0)
+		continue;	/* root never had a hash */
+	    }
+	  else if (pm->tabh[hash] != ~0)
+	    {
+	      /* Very rare case: roll back any changes. */
+	      apply (pm, tail, /* rollback changes */ 1);
+	      no_collision = 0;
+	      goto done;
+	    }
+	  pm->tabh[hash] = ki;
+	}
+    }
+
+done:
+  return no_collision;
+}
+
+
+/*
+-------------------------------------------------------------------------------
+augment(): Add item to the mapping.
+
+Construct a spanning tree of *b*s with *item* as root, where each
+parent can have all its hashes changed (by some new val_b) with
+at most one collision, and each child is the b of that collision.
+
+I got this from Tarjan's "Data Structures and Network Algorithms".  The
+path from *item* to a *b* that can be remapped with no collision is
+an "augmenting path".  Change values of tab[b] along the path so that
+the unmapped key gets mapped and the unused hash value gets used.
+
+Assuming 1 key per b, if m out of n hash values are still unused,
+you should expect the transitive closure to cover n/m nodes before
+an unused node is found.  Sum(i=1..n)(n/i) is about nlogn, so expect
+this approach to take about nlogn time to map all single-key b's.
+-------------------------------------------------------------------------------
+
+high_water: a value higher than any now in tabb[].water_b.
+*/
+static int
+augment (phash_main_t * pm, u32 b_root, u32 high_water)
+{
+  u32 q;			/* current position walking through the queue */
+  u32 tail;			/* tail of the queue.  0 is the head of the queue. */
+  phash_tabb_t *tb_parent, *tb_child, *tb_hit;
+  phash_key_t *k_parent, *k_child;
+  u32 v, v_limit;		/* possible value for myb->val_b */
+  u32 i, ki, hash;
+
+  v_limit =
+    1 << ((pm->flags & PHASH_FLAG_USE_SCRAMBLE) ? pm->s_bits : BITS (u8));
+
+  /* Initialize the root of the spanning tree. */
+  pm->tabq[0].b_q = b_root;
+  tail = 1;
+
+  /* construct the spanning tree by walking the queue, add children to tail */
+  for (q = 0; q < tail; q++)
+    {
+      if ((pm->flags & PHASH_FLAG_FAST_MODE)
+	  && !(pm->flags & PHASH_FLAG_MINIMAL) && q == 1)
+	break;			/* don't do transitive closure */
+
+      tb_parent = pm->tabb + pm->tabq[q].b_q;	/* the b for this node */
+
+      for (v = 0; v < v_limit; v++)
+	{
+	  tb_child = 0;
+
+	  for (i = 0; i < vec_len (tb_parent->keys); i++)
+	    {
+	      ki = tb_parent->keys[i];
+	      k_parent = pm->keys + ki;
+
+	      hash = k_parent->a ^ pm->scramble[v];
+	      if (hash >= pm->hash_max)
+		goto try_next_v;	/* hash code out of bounds => we can't use this v */
+
+	      ki = pm->tabh[hash];
+	      if (ki == ~0)
+		continue;
+
+	      k_child = pm->keys + ki;
+	      tb_hit = pm->tabb + k_child->b;
+
+	      if (tb_child)
+		{
+		  /* Hit at most one child b. */
+		  if (tb_child == tb_hit)
+		    goto try_next_v;
+		}
+	      else
+		{
+		  /* Remember this as child b. */
+		  tb_child = tb_hit;
+		  if (tb_hit->water_b == high_water)
+		    goto try_next_v;	/* already explored */
+		}
+	    }
+
+	  /* tb_parent with v has either one or zero collisions. */
+
+	  /* add childb to the queue of reachable things */
+	  if (tb_child)
+	    tb_child->water_b = high_water;
+	  pm->tabq[tail].b_q = tb_child ? tb_child - pm->tabb : ~0;
+	  pm->tabq[tail].newval_q = v;	/* how to make parent (myb) use this hash */
+	  pm->tabq[tail].oldval_q = tb_parent->val_b;	/* need this for rollback */
+	  pm->tabq[tail].parent_q = q;
+	  ++tail;
+
+	  /* Found a v with no collisions? */
+	  if (!tb_child)
+	    {
+	      /* Try to apply the augmenting path. */
+	      if (apply (pm, tail, /* rollback */ 0))
+		return 1;	/* success, item was added to the perfect hash */
+	      --tail;		/* don't know how to handle such a child! */
+	    }
+
+	try_next_v:
+	  ;
+	}
+    }
+  return 0;
+}
+
+
+static phash_tabb_t *sort_tabb;
+
+static int
+phash_tabb_compare (void *a1, void *a2)
+{
+  u32 *b1 = a1;
+  u32 *b2 = a2;
+  phash_tabb_t *tb1, *tb2;
+
+  tb1 = sort_tabb + b1[0];
+  tb2 = sort_tabb + b2[0];
+
+  return ((int) vec_len (tb2->keys) - (int) vec_len (tb1->keys));
+}
+
+/* find a mapping that makes this a perfect hash */
+static int
+perfect (phash_main_t * pm)
+{
+  u32 i;
+
+  /* clear any state from previous attempts */
+  if (vec_bytes (pm->tabh))
+    memset (pm->tabh, ~0, vec_bytes (pm->tabh));
+
+  vec_validate (pm->tabb_sort, vec_len (pm->tabb) - 1);
+  for (i = 0; i < vec_len (pm->tabb_sort); i++)
+    pm->tabb_sort[i] = i;
+
+  sort_tabb = pm->tabb;
+
+  vec_sort_with_function (pm->tabb_sort, phash_tabb_compare);
+
+  /* In descending order by number of keys, map all *b*s */
+  for (i = 0; i < vec_len (pm->tabb_sort); i++)
+    {
+      if (!augment (pm, pm->tabb_sort[i], i + 1))
+	return 0;
+    }
+
+  /* Success!  We found a perfect hash of all keys into 0..nkeys-1. */
+  return 1;
+}
+
+
+/*
+ * Find initial a_bits = log2 (a_max), b_bits = log2 (b_max).
+ * Initial a_max and b_max values were found empirically.  Some factors:
+ *
+ * If s_max<256 there is no scramble, so tab[b] needs to cover 0..s_max-1.
+ *
+ * a_max and b_max must be powers of 2 because the values in 0..a_max-1 and
+ * 0..b_max-1 are produced by applying a bitmask to the initial hash function.
+ *
+ * a_max must be less than s_max, in fact less than n_keys, because otherwise
+ * there would often be no i such that a^scramble[i] is in 0..n_keys-1 for
+ * all the *a*s associated with a given *b*, so there would be no legal
+ * value to assign to tab[b].  This only matters when we're doing a minimal
+ * perfect hash.
+ *
+ * It takes around 800 trials to find distinct (a,b) with nkey=s_max*(5/8)
+ * and a_max*b_max = s_max*s_max/32.
+ *
+ * Values of b_max less than s_max/4 never work, and s_max/2 always works.
+ *
+ * We want b_max as small as possible because it is the number of bytes in
+ * the huge array we must create for the perfect hash.
+ *
+ * When nkey <= s_max*(5/8), b_max=s_max/4 works much more often with
+ * a_max=s_max/8 than with a_max=s_max/4.  Above s_max*(5/8), b_max=s_max/4
+ * doesn't seem to care whether a_max=s_max/8 or a_max=s_max/4.  I think it
+ * has something to do with 5/8 = 1/8 * 5.  For example examine 80000,
+ * 85000, and 90000 keys with different values of a_max.  This only matters
+ * if we're doing a minimal perfect hash.
+ *
+ * When a_max*b_max <= 1<<U32BITS, the initial hash must produce one integer.
+ * Bigger than that it must produce two integers, which increases the
+ * cost of the hash per character hashed.
+ */
+static void
+guess_initial_parameters (phash_main_t * pm)
+{
+  u32 s_bits, s_max, a_max, b_max, n_keys;
+  int is_minimal, is_fast_mode;
+  const u32 b_max_use_scramble_threshold = 4096;
+
+  is_minimal = (pm->flags & PHASH_FLAG_MINIMAL) != 0;
+  is_fast_mode = (pm->flags & PHASH_FLAG_FAST_MODE) != 0;
+
+  n_keys = vec_len (pm->keys);
+  s_bits = max_log2 (n_keys);
+  s_max = 1 << s_bits;
+  a_max = 0;
+
+  if (is_minimal)
+    {
+      switch (s_bits)
+	{
+	case 0:
+	  a_max = 1;
+	  b_max = 1;
+	case 1:
+	case 2:
+	case 3:
+	case 4:
+	case 5:
+	case 6:
+	case 7:
+	case 8:
+	  /*
+	   * Was: a_max = is_minimal ? s_max / 2 : s_max;
+	   * However, we know that is_minimal must be true, so the
+	   * if-arm of the ternary expression is always executed.
+	   */
+	  a_max = s_max / 2;
+	  b_max = s_max / 2;
+	  break;
+	case 9:
+	case 10:
+	case 11:
+	case 12:
+	case 13:
+	case 14:
+	case 15:
+	case 16:
+	case 17:
+	  if (is_fast_mode)
+	    {
+	      a_max = s_max / 2;
+	      b_max = s_max / 4;
+	    }
+	  else if (s_max / 4 < b_max_use_scramble_threshold)
+	    {
+	      if (n_keys <= s_max * 0.52)
+		a_max = b_max = s_max / 8;
+	      else
+		a_max = b_max = s_max / 4;
+	    }
+	  else
+	    {
+	      a_max = ((n_keys <= s_max * (5.0 / 8.0)) ? s_max / 8 :
+		       (n_keys <=
+			s_max * (3.0 / 4.0)) ? s_max / 4 : s_max / 2);
+	      b_max = s_max / 4;	/* always give the small size a shot */
+	    }
+	  break;
+	case 18:
+	  if (is_fast_mode)
+	    a_max = b_max = s_max / 2;
+	  else
+	    {
+	      a_max = s_max / 8;	/* never require the multiword hash */
+	      b_max = (n_keys <= s_max * (5.0 / 8.0)) ? s_max / 4 : s_max / 2;
+	    }
+	  break;
+	case 19:
+	case 20:
+	  a_max = (n_keys <= s_max * (5.0 / 8.0)) ? s_max / 8 : s_max / 2;
+	  b_max = (n_keys <= s_max * (5.0 / 8.0)) ? s_max / 4 : s_max / 2;
+	  break;
+	default:
+	  /* Just find a hash as quick as possible.
+	     We'll be thrashing virtual memory at this size. */
+	  a_max = b_max = s_max / 2;
+	  break;
+	}
+    }
+  else
+    {
+      /* Non-minimal perfect hash. */
+      if (is_fast_mode && n_keys > s_max * 0.8)
+	{
+	  s_max *= 2;
+	  s_bits += 1;
+	}
+
+      if (s_max / 4 <= (1 << 14))
+	b_max = ((n_keys <= s_max * 0.56) ? s_max / 32 :
+		 (n_keys <= s_max * 0.74) ? s_max / 16 : s_max / 8);
+      else
+	b_max = ((n_keys <= s_max * 0.6) ? s_max / 16 :
+		 (n_keys <= s_max * 0.8) ? s_max / 8 : s_max / 4);
+
+      if (is_fast_mode && b_max < s_max / 8)
+	b_max = s_max / 8;
+
+      if (a_max < 1)
+	a_max = 1;
+      if (b_max < 1)
+	b_max = 1;
+    }
+
+  ASSERT (s_max == (1 << s_bits));
+  ASSERT (is_pow2 (a_max));
+  ASSERT (is_pow2 (b_max));
+  pm->s_bits = s_bits;
+  pm->a_bits = min_log2 (a_max);
+  pm->b_bits = min_log2 (b_max);
+  if (b_max >= b_max_use_scramble_threshold)
+    pm->flags |= PHASH_FLAG_USE_SCRAMBLE;
+}
+
+/* compute p(x), where p is a permutation of 0..(1<<nbits)-1 */
+/* permute(0)=0.  This is intended and useful. */
+always_inline u32
+scramble_permute (u32 x, u32 nbits)
+{
+  int i;
+  int mask = (1 << nbits) - 1;
+  int const2 = 1 + nbits / 2;
+  int const3 = 1 + nbits / 3;
+  int const4 = 1 + nbits / 4;
+  int const5 = 1 + nbits / 5;
+  for (i = 0; i < 20; i++)
+    {
+      x = (x + (x << const2)) & mask;
+      x = (x ^ (x >> const3));
+      x = (x + (x << const4)) & mask;
+      x = (x ^ (x >> const5));
+    }
+  return x;
+}
+
+/* initialize scramble[] with distinct random values in 0..smax-1 */
+static void
+scramble_init (phash_main_t * pm)
+{
+  u32 i;
+
+  /* fill scramble[] with distinct random integers in 0..smax-1 */
+  vec_validate (pm->scramble, (1 << (pm->s_bits < 8 ? 8 : pm->s_bits)) - 1);
+  for (i = 0; i < vec_len (pm->scramble); i++)
+    pm->scramble[i] = scramble_permute (i, pm->s_bits);
+}
+
+/* Try to find a perfect hash function. */
+clib_error_t *
+phash_find_perfect_hash (phash_main_t * pm)
+{
+  clib_error_t *error = 0;
+  u32 max_a_bits, n_tries_this_a_b, want_minimal;
+
+  /* guess initial values for s_max, a_max and b_max */
+  guess_initial_parameters (pm);
+
+  want_minimal = pm->flags & PHASH_FLAG_MINIMAL;
+
+new_s:
+  if (pm->b_bits == 0)
+    pm->a_bits = pm->s_bits;
+
+  max_a_bits = pm->s_bits - want_minimal;
+  if (max_a_bits < 1)
+    max_a_bits = 1;
+
+  pm->hash_max = want_minimal ? vec_len (pm->keys) : (1 << pm->s_bits);
+
+  scramble_init (pm);
+
+  /* Allocate working memory. */
+  vec_free (pm->tabh);
+  vec_validate_init_empty (pm->tabh, pm->hash_max - 1, ~0);
+  vec_free (pm->tabq);
+  vec_validate (pm->tabq, 1 << pm->b_bits);
+
+  /* Actually find the perfect hash */
+  n_tries_this_a_b = 0;
+  while (1)
+    {
+      /* Choose random hash seeds until keys become unique. */
+      pm->hash_seed = random_u64 (&pm->random_seed);
+      pm->n_seed_trials++;
+      if (init_tabb (pm))
+	{
+	  /* Found unique (A, B). */
+
+	  /* Hash may already be perfect. */
+	  if (pm->b_bits == 0)
+	    goto done;
+
+	  pm->n_perfect_calls++;
+	  if (perfect (pm))
+	    goto done;
+
+	  goto increase_b;
+	}
+
+      /* Keep trying with different seed value. */
+      n_tries_this_a_b++;
+      if (n_tries_this_a_b < 2048)
+	continue;
+
+      /* Try to put more bits in (A,B) to make distinct (A,B) more likely */
+      if (pm->a_bits < max_a_bits)
+	pm->a_bits++;
+      else if (pm->b_bits < pm->s_bits)
+	{
+	increase_b:
+	  vec_resize (pm->tabb, vec_len (pm->tabb));
+	  vec_resize (pm->tabq, vec_len (pm->tabq));
+	  pm->b_bits++;
+	}
+      else
+	{
+	  /* Can't increase (A, B) any more, so try increasing S. */
+	  goto new_s;
+	}
+    }
+
+done:
+  /* Construct mapping table for hash lookups. */
+  if (!error)
+    {
+      u32 b, v;
+
+      pm->a_shift = ((pm->flags & PHASH_FLAG_MIX64) ? 64 : 32) - pm->a_bits;
+      pm->b_mask = (1 << pm->b_bits) - 1;
+
+      vec_resize (pm->tab, vec_len (pm->tabb));
+      for (b = 0; b < vec_len (pm->tabb); b++)
+	{
+	  v = pm->tabb[b].val_b;
+
+	  /* Apply scramble now for small enough value of b_bits. */
+	  if (!(pm->flags & PHASH_FLAG_USE_SCRAMBLE))
+	    v = pm->scramble[v];
+
+	  pm->tab[b] = v;
+	}
+    }
+
+  /* Free working memory. */
+  phash_main_free_working_memory (pm);
+
+  return error;
+}
+
+/* Slow hash computation for general keys. */
+uword
+phash_hash_slow (phash_main_t * pm, uword key)
+{
+  u32 a, b, v;
+
+  if (pm->flags & PHASH_FLAG_MIX64)
+    {
+      u64 x0, y0, z0;
+
+      x0 = y0 = z0 = pm->hash_seed;
+
+      if (pm->key_seed1)
+	{
+	  u64 xyz[3];
+	  pm->key_seed1 (pm->private, key, &xyz);
+	  x0 += xyz[0];
+	  y0 += xyz[1];
+	  z0 += xyz[2];
+	}
+      else
+	x0 += key;
+
+      hash_mix64 (x0, y0, z0);
+
+      a = z0 >> pm->a_shift;
+      b = z0 & pm->b_mask;
+    }
+  else
+    {
+      u32 x0, y0, z0;
+
+      x0 = y0 = z0 = pm->hash_seed;
+
+      if (pm->key_seed1)
+	{
+	  u32 xyz[3];
+	  pm->key_seed1 (pm->private, key, &xyz);
+	  x0 += xyz[0];
+	  y0 += xyz[1];
+	  z0 += xyz[2];
+	}
+      else
+	x0 += key;
+
+      hash_mix32 (x0, y0, z0);
+
+      a = z0 >> pm->a_shift;
+      b = z0 & pm->b_mask;
+    }
+
+  v = pm->tab[b];
+  if (pm->flags & PHASH_FLAG_USE_SCRAMBLE)
+    v = pm->scramble[v];
+  return a ^ v;
+}
+
+/* Verify that perfect hash is perfect. */
+clib_error_t *
+phash_validate (phash_main_t * pm)
+{
+  phash_key_t *k;
+  uword *unique_bitmap = 0;
+  clib_error_t *error = 0;
+
+  vec_foreach (k, pm->keys)
+  {
+    uword h = phash_hash_slow (pm, k->key);
+
+    if (h >= pm->hash_max)
+      {
+	error = clib_error_return (0, "hash out of range %wd", h);
+	goto done;
+      }
+
+    if (clib_bitmap_get (unique_bitmap, h))
+      {
+	error = clib_error_return (0, "hash non-unique");
+	goto done;
+      }
+
+    unique_bitmap = clib_bitmap_ori (unique_bitmap, h);
+  }
+
+done:
+  clib_bitmap_free (unique_bitmap);
+  return error;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/phash.h b/src/vppinfra/phash.h
new file mode 100644
index 00000000..746a0fdd
--- /dev/null
+++ b/src/vppinfra/phash.h
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_phash_h
+#define included_phash_h
+
+#include <vppinfra/hash.h>	/* for Bob's mixing functions */
+
+typedef struct
+{
+  /* Maybe either pointer to vector or inline word. */
+  uword key;
+
+  /* Hash code (A, B). */
+  u32 a, b;
+} phash_key_t;
+
+/* Table indexed by B. */
+typedef struct
+{
+  /* Vector of key indices with this same value of B. */
+  u32 *keys;
+
+  /* hash=a^tabb[b].val_b */
+  u32 val_b;
+
+  /* High watermark of who has visited this map node. */
+  u32 water_b;
+} phash_tabb_t;
+
+always_inline void
+phash_tabb_free (phash_tabb_t * b)
+{
+  vec_free (b->keys);
+  b->val_b = b->water_b = 0;
+}
+
+typedef struct
+{
+  /* b that currently occupies this hash */
+  u32 b_q;
+
+  /* Queue position of parent that could use this hash. */
+  u32 parent_q;
+
+  /* What to change parent tab[b] to use this hash. */
+  u32 newval_q;
+
+  /* Original value of tab[b]. */
+  u32 oldval_q;
+} phash_tabq_t;
+
+typedef struct
+{
+  u8 a_bits, b_bits, s_bits, a_shift;
+  u32 b_mask;
+  u32 *tab;
+  u32 *scramble;
+
+  /* Seed value for hash mixer. */
+  u64 hash_seed;
+
+  u32 flags;
+
+  /* Key functions want 64 bit keys.
+     Use hash_mix64 rather than hash_mix32. */
+#define PHASH_FLAG_MIX64		(1 << 0)
+#define PHASH_FLAG_MIX32		(0 << 0)
+
+  /* When b_bits is large enough (>= 12) we scramble. */
+#define PHASH_FLAG_USE_SCRAMBLE		(1 << 1)
+
+  /* Slow mode gives smaller tables but at the expense of more run time. */
+#define PHASH_FLAG_SLOW_MODE		(0 << 2)
+#define PHASH_FLAG_FAST_MODE		(1 << 2)
+
+  /* Generate minimal perfect hash instead of perfect hash. */
+#define PHASH_FLAG_NON_MINIMAL		(0 << 3)
+#define PHASH_FLAG_MINIMAL		(1 << 3)
+
+  /* vec_len (keys) for minimal hash;
+     1 << s_bits for non-minimal hash. */
+  u32 hash_max;
+
+  /* Vector of keys. */
+  phash_key_t *keys;
+
+  /* Used by callbacks to identify keys. */
+  void *private;
+
+  /* Key comparison callback. */
+  int (*key_is_equal) (void *private, uword key1, uword key2);
+
+  /* Callback to reduce single key -> hash seeds. */
+  void (*key_seed1) (void *private, uword key, void *seed);
+
+  /* Callback to reduce two key2 -> hash seeds. */
+  void (*key_seed2) (void *private, uword key1, uword key2, void *seed);
+
+  /* Stuff used to compute perfect hash. */
+  u32 random_seed;
+
+  /* Stuff indexed by B. */
+  phash_tabb_t *tabb;
+
+  /* Table of B ordered by number of keys in tabb[b]. */
+  u32 *tabb_sort;
+
+  /* Unique key (or ~0 if none) for a given hash
+     H = A ^ scramble[tab[B].val_b]. */
+  u32 *tabh;
+
+  /* Stuff indexed by q. */
+  phash_tabq_t *tabq;
+
+  /* Stats. */
+  u32 n_seed_trials, n_perfect_calls;
+} phash_main_t;
+
+always_inline void
+phash_main_free_working_memory (phash_main_t * pm)
+{
+  vec_free (pm->tabb);
+  vec_free (pm->tabq);
+  vec_free (pm->tabh);
+  vec_free (pm->tabb_sort);
+  if (!(pm->flags & PHASH_FLAG_USE_SCRAMBLE))
+    vec_free (pm->scramble);
+}
+
+always_inline void
+phash_main_free (phash_main_t * pm)
+{
+  phash_main_free_working_memory (pm);
+  vec_free (pm->tab);
+  vec_free (pm->keys);
+  memset (pm, 0, sizeof (pm[0]));
+}
+
+/* Slow hash computation for general keys. */
+uword phash_hash_slow (phash_main_t * pm, uword key);
+
+/* Main routine to compute perfect hash. */
+clib_error_t *phash_find_perfect_hash (phash_main_t * pm);
+
+/* Validates that hash is indeed perfect. */
+clib_error_t *phash_validate (phash_main_t * pm);
+
+/* Unit test. */
+int phash_test_main (unformat_input_t * input);
+
+#endif /* included_phash_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/pipeline.h b/src/vppinfra/pipeline.h
new file mode 100644
index 00000000..5a9799b4
--- /dev/null
+++ b/src/vppinfra/pipeline.h
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * pipeline.h: software pipeline infrastructure
+ *
+ * Copyright (c) 2010 Eliot Dresselhaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef included_clib_pipeline_h
+#define included_clib_pipeline_h
+
+#define clib_pipeline_stage(F,TYPE,ARG,I,BODY)		\
+  always_inline void F##_inline (void * _, u32 I)	\
+  { TYPE ARG = _; { BODY; } }				\
+  never_inline  void F##_no_inline (TYPE ARG, u32 I)	\
+  { F##_inline (ARG, I); }
+
+#define clib_pipeline_stage_static(F,TYPE,ARG,I,BODY)		\
+  static_always_inline void F##_inline (void * _, u32 I)	\
+  { TYPE ARG = _; { BODY; } }					\
+  never_inline  void F##_no_inline (TYPE ARG, u32 I)		\
+  { F##_inline (ARG, I); }
+
+#define clib_pipeline_stage_no_inline(F,TYPE,ARG,I,BODY)	\
+  never_inline void F##_no_inline (void * _, u32 I)		\
+  { TYPE ARG = _; { BODY; } }					\
+  never_inline  void F##_inline (TYPE ARG, u32 I)		\
+  { F##_no_inline (ARG, I); }
+
+#define _clib_pipeline_var(v) _clib_pipeline_##v
+
+#define clib_pipeline_stage_execute(F,A,I,S) \
+  F##_##S (A, _clib_pipeline_var(i) - (I))
+
+#define clib_pipeline_main_stage(F,A,I) \
+  clib_pipeline_stage_execute (F, A, I, inline)
+#define clib_pipeline_init_stage(F,A,I) \
+  if (_clib_pipeline_var(i) >= (I)) clib_pipeline_stage_execute (F, A, I, no_inline)
+#define clib_pipeline_exit_stage(F,A,I)					\
+  if (_clib_pipeline_var(i) >= (I) && _clib_pipeline_var(i) - (I) < _clib_pipeline_var(n_vectors)) \
+    clib_pipeline_stage_execute (F, A, I, no_inline)
+
+#define clib_pipeline_init_loop				\
+  for (_clib_pipeline_var(i) = 0;			\
+       _clib_pipeline_var(i) <				\
+	 clib_min (_clib_pipeline_var(n_stages) - 1,	\
+		   _clib_pipeline_var(n_vectors));	\
+       _clib_pipeline_var(i)++)
+
+#define clib_pipeline_main_loop					\
+  for (; _clib_pipeline_var(i) < _clib_pipeline_var(n_vectors);	\
+       _clib_pipeline_var(i)++)
+
+#define clib_pipeline_exit_loop						\
+  for (; _clib_pipeline_var(i) < (_clib_pipeline_var(n_vectors)		\
+				  + _clib_pipeline_var(n_stages) - 1);	\
+       _clib_pipeline_var(i)++)
+
+#define clib_pipeline_run_2_stage(N,ARG,STAGE0,STAGE1)	\
+do {							\
+  uword _clib_pipeline_var(n_vectors) = (N);		\
+  uword _clib_pipeline_var(n_stages) = 2;		\
+  uword _clib_pipeline_var(i);				\
+							\
+  clib_pipeline_init_loop				\
+    {							\
+      clib_pipeline_init_stage (STAGE0, ARG, 0);	\
+    }							\
+							\
+  clib_pipeline_main_loop				\
+    {							\
+      clib_pipeline_main_stage (STAGE0, ARG, 0);	\
+      clib_pipeline_main_stage (STAGE1, ARG, 1);	\
+    }							\
+							\
+  clib_pipeline_exit_loop				\
+    {							\
+      clib_pipeline_exit_stage (STAGE1, ARG, 1);	\
+    }							\
+} while (0)
+
+#define clib_pipeline_run_3_stage(N,ARG,STAGE0,STAGE1,STAGE2)	\
+do {								\
+  uword _clib_pipeline_var(n_vectors) = (N);			\
+  uword _clib_pipeline_var(n_stages) = 3;			\
+  uword _clib_pipeline_var(i);					\
+								\
+  clib_pipeline_init_loop					\
+    {								\
+      clib_pipeline_init_stage (STAGE0, ARG, 0);		\
+      clib_pipeline_init_stage (STAGE1, ARG, 1);		\
+    }								\
+								\
+  clib_pipeline_main_loop					\
+    {								\
+      clib_pipeline_main_stage (STAGE0, ARG, 0);		\
+      clib_pipeline_main_stage (STAGE1, ARG, 1);		\
+      clib_pipeline_main_stage (STAGE2, ARG, 2);		\
+    }								\
+								\
+  clib_pipeline_exit_loop					\
+    {								\
+      clib_pipeline_exit_stage (STAGE1, ARG, 1);		\
+      clib_pipeline_exit_stage (STAGE2, ARG, 2);		\
+    }								\
+} while (0)
+
+#define clib_pipeline_run_4_stage(N,ARG,STAGE0,STAGE1,STAGE2,STAGE3)	\
+do {									\
+  uword _clib_pipeline_var(n_vectors) = (N);				\
+  uword _clib_pipeline_var(n_stages) = 4;				\
+  uword _clib_pipeline_var(i);						\
+									\
+  clib_pipeline_init_loop						\
+    {									\
+      clib_pipeline_init_stage (STAGE0, ARG, 0);			\
+      clib_pipeline_init_stage (STAGE1, ARG, 1);			\
+      clib_pipeline_init_stage (STAGE2, ARG, 2);			\
+    }									\
+									\
+  clib_pipeline_main_loop						\
+    {									\
+      clib_pipeline_main_stage (STAGE0, ARG, 0);			\
+      clib_pipeline_main_stage (STAGE1, ARG, 1);			\
+      clib_pipeline_main_stage (STAGE2, ARG, 2);			\
+      clib_pipeline_main_stage (STAGE3, ARG, 3);			\
+    }									\
+									\
+  clib_pipeline_exit_loop						\
+    {									\
+      clib_pipeline_exit_stage (STAGE1, ARG, 1);			\
+      clib_pipeline_exit_stage (STAGE2, ARG, 2);			\
+      clib_pipeline_exit_stage (STAGE3, ARG, 3);			\
+    }									\
+} while (0)
+
+#endif /* included_clib_pipeline_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/pool.h b/src/vppinfra/pool.h
new file mode 100644
index 00000000..e1c89e0a
--- /dev/null
+++ b/src/vppinfra/pool.h
@@ -0,0 +1,405 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003, 2004 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+/** @file
+ * @brief Fixed length block allocator.
+   Pools are built from clib vectors and bitmaps. Use pools when
+   repeatedly allocating and freeing fixed-size data. Pools are
+   fast, and avoid memory fragmentation.
+ */
+
+#ifndef included_pool_h
+#define included_pool_h
+
+#include <vppinfra/bitmap.h>
+#include <vppinfra/error.h>
+#include <vppinfra/mheap.h>
+
+
+typedef struct
+{
+  /** Bitmap of indices of free objects. */
+  uword *free_bitmap;
+
+  /** Vector of free indices.  One element for each set bit in bitmap. */
+  u32 *free_indices;
+} pool_header_t;
+
+/** Align pool header so that pointers are naturally aligned. */
+#define pool_aligned_header_bytes \
+  vec_aligned_header_bytes (sizeof (pool_header_t), sizeof (void *))
+
+/** Get pool header from user pool pointer */
+always_inline pool_header_t *
+pool_header (void *v)
+{
+  return vec_aligned_header (v, sizeof (pool_header_t), sizeof (void *));
+}
+
+/** Validate a pool */
+always_inline void
+pool_validate (void *v)
+{
+  pool_header_t *p = pool_header (v);
+  uword i, n_free_bitmap;
+
+  if (!v)
+    return;
+
+  n_free_bitmap = clib_bitmap_count_set_bits (p->free_bitmap);
+  ASSERT (n_free_bitmap == vec_len (p->free_indices));
+  for (i = 0; i < vec_len (p->free_indices); i++)
+    ASSERT (clib_bitmap_get (p->free_bitmap, p->free_indices[i]) == 1);
+}
+
+always_inline void
+pool_header_validate_index (void *v, uword index)
+{
+  pool_header_t *p = pool_header (v);
+
+  if (v)
+    vec_validate (p->free_bitmap, index / BITS (uword));
+}
+
+#define pool_validate_index(v,i)				\
+do {								\
+  uword __pool_validate_index = (i);				\
+  vec_validate_ha ((v), __pool_validate_index,			\
+		   pool_aligned_header_bytes, /* align */ 0);		\
+  pool_header_validate_index ((v), __pool_validate_index);	\
+} while (0)
+
+/** Number of active elements in a pool.
+ * @return Number of active elements in a pool
+ */
+always_inline uword
+pool_elts (void *v)
+{
+  uword ret = vec_len (v);
+  if (v)
+    ret -= vec_len (pool_header (v)->free_indices);
+  return ret;
+}
+
+/** Number of elements in pool vector.
+
+    @note You probably want to call pool_elts() instead.
+*/
+#define pool_len(p)	vec_len(p)
+
+/** Number of elements in pool vector (usable as an lvalue)
+
+    @note You probably don't want to use this macro.
+*/
+#define _pool_len(p)	_vec_len(p)
+
+/** Memory usage of pool header. */
+always_inline uword
+pool_header_bytes (void *v)
+{
+  pool_header_t *p = pool_header (v);
+
+  if (!v)
+    return 0;
+
+  return vec_bytes (p->free_bitmap) + vec_bytes (p->free_indices);
+}
+
+/** Memory usage of pool. */
+#define pool_bytes(P) (vec_bytes (P) + pool_header_bytes (P))
+
+/** Local variable naming macro. */
+#define _pool_var(v) _pool_##v
+
+/** Queries whether pool has at least N_FREE free elements. */
+always_inline uword
+pool_free_elts (void *v)
+{
+  pool_header_t *p = pool_header (v);
+  uword n_free = 0;
+
+  if (v)
+    {
+      n_free += vec_len (p->free_indices);
+
+      /* Space left at end of vector? */
+      n_free += vec_capacity (v, sizeof (p[0])) - vec_len (v);
+    }
+
+  return n_free;
+}
+
+/** Allocate an object E from a pool P (general version).
+
+   First search free list.  If nothing is free extend vector of objects.
+*/
+#define pool_get_aligned(P,E,A)						\
+do {									\
+  pool_header_t * _pool_var (p) = pool_header (P);			\
+  uword _pool_var (l);							\
+									\
+  _pool_var (l) = 0;							\
+  if (P)								\
+    _pool_var (l) = vec_len (_pool_var (p)->free_indices);		\
+									\
+  if (_pool_var (l) > 0)						\
+    {									\
+      /* Return free element from free list. */				\
+      uword _pool_var (i) = _pool_var (p)->free_indices[_pool_var (l) - 1]; \
+      (E) = (P) + _pool_var (i);					\
+      _pool_var (p)->free_bitmap =					\
+	clib_bitmap_andnoti (_pool_var (p)->free_bitmap, _pool_var (i)); \
+      _vec_len (_pool_var (p)->free_indices) = _pool_var (l) - 1;	\
+    }									\
+  else									\
+    {									\
+      /* Nothing on free list, make a new element and return it. */	\
+      P = _vec_resize (P,						\
+		       /* length_increment */ 1,			\
+		       /* new size */ (vec_len (P) + 1) * sizeof (P[0]), \
+		       pool_aligned_header_bytes,				\
+		       /* align */ (A));				\
+      E = vec_end (P) - 1;						\
+    }									\
+} while (0)
+
+/** Allocate an object E from a pool P (unspecified alignment). */
+#define pool_get(P,E) pool_get_aligned(P,E,0)
+
+/** Use free bitmap to query whether given element is free. */
+#define pool_is_free(P,E)						\
+({									\
+  pool_header_t * _pool_var (p) = pool_header (P);			\
+  uword _pool_var (i) = (E) - (P);					\
+  (_pool_var (i) < vec_len (P)) ? clib_bitmap_get (_pool_var (p)->free_bitmap, _pool_i) : 1; \
+})
+
+/** Use free bitmap to query whether given index is free */
+#define pool_is_free_index(P,I) pool_is_free((P),(P)+(I))
+
+/** Free an object E in pool P. */
+#define pool_put(P,E)							\
+do {									\
+  pool_header_t * _pool_var (p) = pool_header (P);			\
+  uword _pool_var (l) = (E) - (P);					\
+  ASSERT (vec_is_member (P, E));					\
+  ASSERT (! pool_is_free (P, E));					\
+									\
+  /* Add element to free bitmap and to free list. */			\
+  _pool_var (p)->free_bitmap =						\
+    clib_bitmap_ori (_pool_var (p)->free_bitmap, _pool_var (l));	\
+  vec_add1 (_pool_var (p)->free_indices, _pool_var (l));		\
+} while (0)
+
+/** Free pool element with given index. */
+#define pool_put_index(p,i)			\
+do {						\
+  typeof (p) _e = (p) + (i);			\
+  pool_put (p, _e);				\
+} while (0)
+
+/** Allocate N more free elements to pool (general version). */
+#define pool_alloc_aligned(P,N,A)					\
+do {									\
+  pool_header_t * _p;							\
+  (P) = _vec_resize ((P), 0, (vec_len (P) + (N)) * sizeof (P[0]),	\
+		     pool_aligned_header_bytes,				\
+		     (A));						\
+  _p = pool_header (P);							\
+  vec_resize (_p->free_indices, (N));					\
+  _vec_len (_p->free_indices) -= (N);					\
+} while (0)
+
+/** Allocate N more free elements to pool (unspecified alignment). */
+#define pool_alloc(P,N) pool_alloc_aligned(P,N,0)
+
+/** Low-level free pool operator (do not call directly). */
+always_inline void *
+_pool_free (void *v)
+{
+  pool_header_t *p = pool_header (v);
+  if (!v)
+    return v;
+  clib_bitmap_free (p->free_bitmap);
+  vec_free (p->free_indices);
+  vec_free_h (v, pool_aligned_header_bytes);
+  return 0;
+}
+
+/** Free a pool. */
+#define pool_free(p) (p) = _pool_free(p)
+
+/** Optimized iteration through pool.
+
+    @param LO pointer to first element in chunk
+    @param HI pointer to last element in chunk
+    @param POOL pool to iterate across
+    @param BODY operation to perform
+
+    Optimized version which assumes that BODY is smart enough to
+    process multiple (LOW,HI) chunks. See also pool_foreach().
+ */
+#define pool_foreach_region(LO,HI,POOL,BODY)				\
+do {									\
+  uword _pool_var (i), _pool_var (lo), _pool_var (hi), _pool_var (len);	\
+  uword _pool_var (bl), * _pool_var (b);				\
+  pool_header_t * _pool_var (p);					\
+									\
+  _pool_var (p) = pool_header (POOL);					\
+  _pool_var (b) = (POOL) ? _pool_var (p)->free_bitmap : 0;		\
+  _pool_var (bl) = vec_len (_pool_var (b));				\
+  _pool_var (len) = vec_len (POOL);					\
+  _pool_var (lo) = 0;							\
+									\
+  for (_pool_var (i) = 0;						\
+       _pool_var (i) <= _pool_var (bl);					\
+       _pool_var (i)++)							\
+    {									\
+      uword _pool_var (m), _pool_var (f);				\
+      _pool_var (m) = (_pool_var (i) < _pool_var (bl)			\
+		       ? _pool_var (b) [_pool_var (i)]			\
+		       : 1);						\
+      while (_pool_var (m) != 0)					\
+	{								\
+	  _pool_var (f) = first_set (_pool_var (m));			\
+	  _pool_var (hi) = (_pool_var (i) * BITS (_pool_var (b)[0])	\
+			    + min_log2 (_pool_var (f)));		\
+	  _pool_var (hi) = (_pool_var (i) < _pool_var (bl)		\
+			    ? _pool_var (hi) : _pool_var (len));	\
+	  _pool_var (m) ^= _pool_var (f);				\
+	  if (_pool_var (hi) > _pool_var (lo))				\
+	    {								\
+	      (LO) = _pool_var (lo);					\
+	      (HI) = _pool_var (hi);					\
+	      do { BODY; } while (0);					\
+	    }								\
+	  _pool_var (lo) = _pool_var (hi) + 1;				\
+	}								\
+    }									\
+} while (0)
+
+/** Iterate through pool.
+
+    @param VAR A variable of same type as pool vector to be used as an
+               iterator.
+    @param POOL The pool to iterate across.
+    @param BODY The operation to perform, typically a code block. See
+                the example below.
+
+    This macro will call @c BODY with each active pool element.
+
+    It is a bad idea to allocate or free pool element from within
+    @c pool_foreach. Build a vector of indices and dispose of them later.
+
+
+    @par Example
+    @code{.c}
+    proc_t *procs;   // a pool of processes.
+    proc_t *proc;    // pointer to one process; used as the iterator.
+
+    pool_foreach (proc, procs, ({
+        if (proc->state != PROC_STATE_RUNNING)
+            continue;
+
+        // check a running proc in some way
+        ...
+    }));
+    @endcode
+
+    @warning Because @c pool_foreach is a macro, syntax errors can be
+    difficult to find inside @c BODY, let alone actual code bugs. One
+    can temporarily split a complex @c pool_foreach into a trivial
+    @c pool_foreach which builds a vector of active indices, and a
+    vec_foreach() (or plain for-loop) to walk the active index vector.
+ */
+#define pool_foreach(VAR,POOL,BODY)					\
+do {									\
+  uword _pool_foreach_lo, _pool_foreach_hi;				\
+  pool_foreach_region (_pool_foreach_lo, _pool_foreach_hi, (POOL),	\
+    ({									\
+      for ((VAR) = (POOL) + _pool_foreach_lo;				\
+	   (VAR) < (POOL) + _pool_foreach_hi;				\
+	   (VAR)++)							\
+	do { BODY; } while (0);						\
+    }));								\
+} while (0)
+
+/** Returns pointer to element at given index.
+
+    ASSERTs that the supplied index is valid.
+    Even though one can write correct code of the form
+    @code
+        p = pool_base + index;
+    @endcode
+    use of @c pool_elt_at_index is strongly suggested.
+ */
+#define pool_elt_at_index(p,i)			\
+({						\
+  typeof (p) _e = (p) + (i);			\
+  ASSERT (! pool_is_free (p, _e));		\
+  _e;						\
+})
+
+/** Return next occupied pool index after @c i, useful for safe iteration. */
+#define pool_next_index(P,I)                                            \
+({                                                                      \
+  pool_header_t * _pool_var (p) = pool_header (P);                      \
+  uword _pool_var (rv) = (I) + 1;                                       \
+                                                                        \
+  _pool_var(rv) =                                                       \
+    (_pool_var (rv) < vec_len (P) ?                                     \
+     clib_bitmap_next_clear (_pool_var (p)->free_bitmap, _pool_var(rv)) \
+     : ~0);                                                             \
+  _pool_var(rv);                                                        \
+})
+
+/** Iterate pool by index. */
+#define pool_foreach_index(i,v,body)		\
+  for ((i) = 0; (i) < vec_len (v); (i)++)	\
+    {						\
+      if (! pool_is_free_index ((v), (i)))	\
+	do { body; } while (0);			\
+    }
+
+#endif /* included_pool_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/ptclosure.c b/src/vppinfra/ptclosure.c
new file mode 100644
index 00000000..cda873ef
--- /dev/null
+++ b/src/vppinfra/ptclosure.c
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vppinfra/ptclosure.h>
+
+u8 **
+clib_ptclosure_alloc (int n)
+{
+  u8 **rv = 0;
+  u8 *row;
+  int i;
+
+  ASSERT (n > 0);
+
+  vec_validate (rv, n - 1);
+  for (i = 0; i < n; i++)
+    {
+      row = 0;
+      vec_validate (row, n - 1);
+
+      rv[i] = row;
+    }
+  return rv;
+}
+
+void
+clib_ptclosure_free (u8 ** ptc)
+{
+  u8 *row;
+  int n = vec_len (ptc);
+  int i;
+
+  ASSERT (n > 0);
+
+  for (i = 0; i < n; i++)
+    {
+      row = ptc[i];
+      vec_free (row);
+    }
+  vec_free (ptc);
+}
+
+void
+clib_ptclosure_copy (u8 ** dst, u8 ** src)
+{
+  int i, n;
+  u8 *src_row, *dst_row;
+
+  n = vec_len (dst);
+
+  for (i = 0; i < vec_len (dst); i++)
+    {
+      src_row = src[i];
+      dst_row = dst[i];
+      clib_memcpy (dst_row, src_row, n);
+    }
+}
+
+/*
+ * compute the positive transitive closure
+ * of a relation via Warshall's algorithm.
+ *
+ * Ref:
+ * Warshall, Stephen (January 1962). "A theorem on Boolean matrices".
+ * Journal of the ACM 9 (1): 11–12.
+ *
+ * foo[i][j] = 1 means that item i
+ * "bears the relation" to item j.
+ *
+ * For example: "item i must be before item j"
+ *
+ * You could use a bitmap, but since the algorithm is
+ * O(n**3) in the first place, large N is inadvisable...
+ *
+ */
+
+u8 **
+clib_ptclosure (u8 ** orig)
+{
+  int i, j, k;
+  int n;
+  u8 **prev, **cur;
+
+  n = vec_len (orig);
+  prev = clib_ptclosure_alloc (n);
+  cur = clib_ptclosure_alloc (n);
+
+  clib_ptclosure_copy (prev, orig);
+
+  for (k = 0; k < n; k++)
+    {
+      for (i = 0; i < n; i++)
+	{
+	  for (j = 0; j < n; j++)
+	    {
+	      cur[i][j] = prev[i][j] || (prev[i][k] && prev[k][j]);
+	    }
+	}
+      clib_ptclosure_copy (prev, cur);
+    }
+  clib_ptclosure_free (prev);
+  return cur;
+}
+
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/ptclosure.h b/src/vppinfra/ptclosure.h
new file mode 100644
index 00000000..ee1609a1
--- /dev/null
+++ b/src/vppinfra/ptclosure.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_clib_ptclosure_h
+#define included_clib_ptclosure_h
+
+#include <vppinfra/vec.h>
+#include <vppinfra/format.h>
+#include <vppinfra/error.h>
+
+/*
+ * set r[i][j] if item i "bears the relation to" item j
+ *
+ */
+
+u8 **clib_ptclosure_alloc (int n);
+void clib_ptclosure_free (u8 ** ptc);
+void clib_ptclosure_copy (u8 ** dst, u8 ** src);
+u8 **clib_ptclosure (u8 ** orig);
+
+#endif /* included_clib_ptclosure_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/qhash.c b/src/vppinfra/qhash.c
new file mode 100644
index 00000000..f4e38c4a
--- /dev/null
+++ b/src/vppinfra/qhash.c
@@ -0,0 +1,858 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2006 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/qhash.h>
+
+#define QHASH_ALL_VALID ((1 << QHASH_KEYS_PER_BUCKET) - 1)
+
+void *
+_qhash_resize (void *v, uword length, uword elt_bytes)
+{
+  qhash_t *h;
+  uword l;
+
+  l = clib_max (max_log2 (length), 2 + QHASH_LOG2_KEYS_PER_BUCKET);
+
+  /* Round up if less than 1/2 full. */
+  l += ((f64) length / (f64) (1 << l)) < .5;
+
+  v = _vec_resize (0, 1 << l, elt_bytes << l, sizeof (h[0]),
+		   /* align */ sizeof (uword));
+
+  h = qhash_header (v);
+  h->n_elts = 0;
+  h->log2_hash_size = l;
+  h->hash_keys =
+    clib_mem_alloc_aligned_no_fail (sizeof (h->hash_keys[0]) << l,
+				    CLIB_CACHE_LINE_BYTES);
+  vec_resize (h->hash_key_valid_bitmap,
+	      1 << (l - QHASH_LOG2_KEYS_PER_BUCKET));
+  memset (v, ~0, elt_bytes << l);
+
+  return v;
+}
+
+static u8 min_log2_table[256];
+
+static inline uword
+qhash_min_log2 (uword x)
+{
+  ASSERT (is_pow2 (x));
+  ASSERT (x < 256);
+  return min_log2_table[x];
+}
+
+static void
+qhash_min_log2_init ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    min_log2_table[i] = min_log2 (i);
+}
+
+always_inline uword
+qhash_get_valid_elt_mask (qhash_t * h, uword i)
+{
+  return h->hash_key_valid_bitmap[i / QHASH_KEYS_PER_BUCKET];
+}
+
+always_inline void
+qhash_set_valid_elt_mask (qhash_t * h, uword i, uword mask)
+{
+  h->hash_key_valid_bitmap[i / QHASH_KEYS_PER_BUCKET] = mask;
+}
+
+always_inline uword
+qhash_search_bucket (uword * hash_keys, uword search_key, uword m)
+{
+  uword t;
+#define _(i) ((hash_keys[i] == search_key) << i)
+  t = (_(0) | _(1) | _(2) | _(3));
+  if (QHASH_KEYS_PER_BUCKET > 4)
+    t |= (_(4) | _(5) | _(6) | _(7));
+  if (QHASH_KEYS_PER_BUCKET > 8)
+    t |= (_(8) | _(9) | _(10) | _(11) | _(12) | _(13) | _(14) | _(15));
+#undef _
+  return m & t;
+}
+
+/* Lookup multiple keys in the same hash table. */
+void
+qhash_get_multiple (void *v,
+		    uword * search_keys,
+		    uword n_search_keys, u32 * result_indices)
+{
+  qhash_t *h = qhash_header (v);
+  uword *k, *hash_keys;
+  uword n_left, bucket_mask;
+  u32 *r;
+
+  if (!v)
+    {
+      memset (result_indices, ~0, sizeof (result_indices[0]) * n_search_keys);
+      return;
+    }
+
+  bucket_mask = pow2_mask (h->log2_hash_size) & ~(QHASH_KEYS_PER_BUCKET - 1);
+
+  k = search_keys;
+  n_left = n_search_keys;
+  hash_keys = h->hash_keys;
+  r = result_indices;
+
+  while (n_left >= 2)
+    {
+      u32 a0, b0, c0, bi0, valid0, match0;
+      u32 a1, b1, c1, bi1, valid1, match1;
+      uword k0, k1, *h0, *h1;
+
+      k0 = k[0];
+      k1 = k[1];
+      n_left -= 2;
+      k += 2;
+
+      a0 = a1 = h->hash_seeds[0];
+      b0 = b1 = h->hash_seeds[1];
+      c0 = c1 = h->hash_seeds[2];
+      a0 ^= k0;
+      a1 ^= k1;
+#if uword_bits == 64
+      b0 ^= k0 >> 32;
+      b1 ^= k1 >> 32;
+#endif
+
+      hash_mix32_step_1 (a0, b0, c0);
+      hash_mix32_step_1 (a1, b1, c1);
+      hash_mix32_step_2 (a0, b0, c0);
+      hash_mix32_step_2 (a1, b1, c1);
+      hash_mix32_step_3 (a0, b0, c0);
+      hash_mix32_step_3 (a1, b1, c1);
+
+      bi0 = c0 & bucket_mask;
+      bi1 = c1 & bucket_mask;
+
+      h0 = hash_keys + bi0;
+      h1 = hash_keys + bi1;
+
+      /* Search two buckets. */
+      valid0 = qhash_get_valid_elt_mask (h, bi0);
+      valid1 = qhash_get_valid_elt_mask (h, bi1);
+
+      match0 = qhash_search_bucket (h0, k0, valid0);
+      match1 = qhash_search_bucket (h1, k1, valid1);
+
+      bi0 += qhash_min_log2 (match0);
+      bi1 += qhash_min_log2 (match1);
+
+      r[0] = match0 ? bi0 : ~0;
+      r[1] = match1 ? bi1 : ~0;
+      r += 2;
+
+      /* Full buckets trigger search of overflow hash. */
+      if (PREDICT_FALSE (!match0 && valid0 == QHASH_ALL_VALID))
+	{
+	  uword *p = hash_get (h->overflow_hash, k0);
+	  r[-2] = p ? p[0] : ~0;
+	}
+
+      /* Full buckets trigger search of overflow hash. */
+      if (PREDICT_FALSE (!match1 && valid1 == QHASH_ALL_VALID))
+	{
+	  uword *p = hash_get (h->overflow_hash, k1);
+	  r[-1] = p ? p[0] : ~0;
+	}
+    }
+
+  while (n_left >= 1)
+    {
+      u32 a0, b0, c0, bi0, valid0, match0;
+      uword k0, *h0;
+
+      k0 = k[0];
+      n_left -= 1;
+      k += 1;
+
+      a0 = h->hash_seeds[0];
+      b0 = h->hash_seeds[1];
+      c0 = h->hash_seeds[2];
+      a0 ^= k0;
+#if uword_bits == 64
+      b0 ^= k0 >> 32;
+#endif
+
+      hash_mix32 (a0, b0, c0);
+
+      bi0 = c0 & bucket_mask;
+
+      h0 = hash_keys + bi0;
+
+      /* Search one bucket. */
+      valid0 = qhash_get_valid_elt_mask (h, bi0);
+      match0 = qhash_search_bucket (h0, k0, valid0);
+
+      bi0 += qhash_min_log2 (match0);
+
+      r[0] = match0 ? bi0 : ~0;
+      r += 1;
+
+      /* Full buckets trigger search of overflow hash. */
+      if (PREDICT_FALSE (!match0 && valid0 == QHASH_ALL_VALID))
+	{
+	  uword *p = hash_get (h->overflow_hash, k0);
+	  r[-1] = p ? p[0] : ~0;
+	}
+    }
+}
+
+/* Lookup multiple keys in the same hash table.
+   Returns index of first matching key. */
+u32
+qhash_get_first_match (void *v,
+		       uword * search_keys,
+		       uword n_search_keys, uword * matching_key)
+{
+  qhash_t *h = qhash_header (v);
+  uword *k, *hash_keys;
+  uword n_left, match_mask, bucket_mask;
+
+  if (!v)
+    return ~0;
+
+  match_mask = 0;
+  bucket_mask = pow2_mask (h->log2_hash_size) & ~(QHASH_KEYS_PER_BUCKET - 1);
+
+  k = search_keys;
+  n_left = n_search_keys;
+  hash_keys = h->hash_keys;
+  while (n_left >= 2)
+    {
+      u32 a0, b0, c0, bi0, valid0;
+      u32 a1, b1, c1, bi1, valid1;
+      uword k0, k1, *h0, *h1;
+
+      k0 = k[0];
+      k1 = k[1];
+      n_left -= 2;
+      k += 2;
+
+      a0 = a1 = h->hash_seeds[0];
+      b0 = b1 = h->hash_seeds[1];
+      c0 = c1 = h->hash_seeds[2];
+      a0 ^= k0;
+      a1 ^= k1;
+#if uword_bits == 64
+      b0 ^= k0 >> 32;
+      b1 ^= k1 >> 32;
+#endif
+
+      hash_mix32_step_1 (a0, b0, c0);
+      hash_mix32_step_1 (a1, b1, c1);
+      hash_mix32_step_2 (a0, b0, c0);
+      hash_mix32_step_2 (a1, b1, c1);
+      hash_mix32_step_3 (a0, b0, c0);
+      hash_mix32_step_3 (a1, b1, c1);
+
+      bi0 = c0 & bucket_mask;
+      bi1 = c1 & bucket_mask;
+
+      h0 = hash_keys + bi0;
+      h1 = hash_keys + bi1;
+
+      /* Search two buckets. */
+      valid0 = qhash_get_valid_elt_mask (h, bi0);
+      valid1 = qhash_get_valid_elt_mask (h, bi1);
+      match_mask = qhash_search_bucket (h0, k0, valid0);
+      match_mask |= (qhash_search_bucket (h1, k1, valid1)
+		     << QHASH_KEYS_PER_BUCKET);
+      if (match_mask)
+	{
+	  uword bi, is_match1;
+
+	  bi = qhash_min_log2 (match_mask);
+	  is_match1 = bi >= QHASH_KEYS_PER_BUCKET;
+
+	  bi += ((is_match1 ? bi1 : bi0)
+		 - (is_match1 << QHASH_LOG2_KEYS_PER_BUCKET));
+	  *matching_key = (k - 2 - search_keys) + is_match1;
+	  return bi;
+	}
+
+      /* Full buckets trigger search of overflow hash. */
+      if (PREDICT_FALSE (valid0 == QHASH_ALL_VALID
+			 || valid1 == QHASH_ALL_VALID))
+	{
+	  uword *p = 0;
+	  uword ki = k - 2 - search_keys;
+
+	  if (valid0 == QHASH_ALL_VALID)
+	    p = hash_get (h->overflow_hash, k0);
+
+	  if (!p && valid1 == QHASH_ALL_VALID)
+	    {
+	      p = hash_get (h->overflow_hash, k1);
+	      ki++;
+	    }
+
+	  if (p)
+	    {
+	      *matching_key = ki;
+	      return p[0];
+	    }
+	}
+    }
+
+  while (n_left >= 1)
+    {
+      u32 a0, b0, c0, bi0, valid0;
+      uword k0, *h0;
+
+      k0 = k[0];
+      n_left -= 1;
+      k += 1;
+
+      a0 = h->hash_seeds[0];
+      b0 = h->hash_seeds[1];
+      c0 = h->hash_seeds[2];
+      a0 ^= k0;
+#if uword_bits == 64
+      b0 ^= k0 >> 32;
+#endif
+
+      hash_mix32 (a0, b0, c0);
+
+      bi0 = c0 & bucket_mask;
+
+      h0 = hash_keys + bi0;
+
+      /* Search one bucket. */
+      valid0 = qhash_get_valid_elt_mask (h, bi0);
+      match_mask = qhash_search_bucket (h0, k0, valid0);
+      if (match_mask)
+	{
+	  uword bi;
+	  bi = bi0 + qhash_min_log2 (match_mask);
+	  *matching_key = (k - 1 - search_keys);
+	  return bi;
+	}
+
+      /* Full buckets trigger search of overflow hash. */
+      if (PREDICT_FALSE (valid0 == QHASH_ALL_VALID))
+	{
+	  uword *p = hash_get (h->overflow_hash, k0);
+	  if (p)
+	    {
+	      *matching_key = (k - 1 - search_keys);
+	      return p[0];
+	    }
+	}
+    }
+
+  return ~0;
+}
+
+static void *
+qhash_set_overflow (void *v, uword elt_bytes,
+		    uword key, uword bi, uword * n_elts, u32 * result)
+{
+  qhash_t *h = qhash_header (v);
+  uword *p = hash_get (h->overflow_hash, key);
+  uword i;
+
+  bi /= QHASH_KEYS_PER_BUCKET;
+
+  if (p)
+    i = p[0];
+  else
+    {
+      uword l = vec_len (h->overflow_free_indices);
+      if (l > 0)
+	{
+	  i = h->overflow_free_indices[l - 1];
+	  _vec_len (h->overflow_free_indices) = l - 1;
+	}
+      else
+	i = (1 << h->log2_hash_size) + hash_elts (h->overflow_hash);
+      hash_set (h->overflow_hash, key, i);
+      vec_validate (h->overflow_counts, bi);
+      h->overflow_counts[bi] += 1;
+      *n_elts += 1;
+
+      l = vec_len (v);
+      if (i >= l)
+	{
+	  uword dl = round_pow2 (1 + i - l, 8);
+	  v = _vec_resize (v, dl, (l + dl) * elt_bytes, sizeof (h[0]),
+			   /* align */ sizeof (uword));
+	  memset (v + l * elt_bytes, ~0, dl * elt_bytes);
+	}
+    }
+
+  *result = i;
+
+  return v;
+}
+
+static uword
+qhash_unset_overflow (void *v, uword key, uword bi, uword * n_elts)
+{
+  qhash_t *h = qhash_header (v);
+  uword *p = hash_get (h->overflow_hash, key);
+  uword result;
+
+  bi /= QHASH_KEYS_PER_BUCKET;
+
+  if (p)
+    {
+      result = p[0];
+      hash_unset (h->overflow_hash, key);
+      ASSERT (bi < vec_len (h->overflow_counts));
+      ASSERT (h->overflow_counts[bi] > 0);
+      ASSERT (*n_elts > 0);
+      vec_add1 (h->overflow_free_indices, result);
+      h->overflow_counts[bi] -= 1;
+      *n_elts -= 1;
+    }
+  else
+    result = ~0;
+
+  return result;
+}
+
+always_inline uword
+qhash_find_free (uword i, uword valid_mask)
+{
+  return first_set (~valid_mask & pow2_mask (QHASH_KEYS_PER_BUCKET));
+}
+
+void *
+_qhash_set_multiple (void *v,
+		     uword elt_bytes,
+		     uword * search_keys,
+		     uword n_search_keys, u32 * result_indices)
+{
+  qhash_t *h = qhash_header (v);
+  uword *k, *hash_keys;
+  uword n_left, n_elts, bucket_mask;
+  u32 *r;
+
+  if (vec_len (v) < n_search_keys)
+    v = _qhash_resize (v, n_search_keys, elt_bytes);
+
+  if (qhash_min_log2 (2) != 1)
+    {
+      qhash_min_log2_init ();
+      ASSERT (qhash_min_log2 (2) == 1);
+    }
+
+  ASSERT (v != 0);
+
+  bucket_mask = pow2_mask (h->log2_hash_size) & ~(QHASH_KEYS_PER_BUCKET - 1);
+
+  hash_keys = h->hash_keys;
+  k = search_keys;
+  r = result_indices;
+  n_left = n_search_keys;
+  n_elts = h->n_elts;
+
+  while (n_left >= 2)
+    {
+      u32 a0, b0, c0, bi0, match0, valid0, free0;
+      u32 a1, b1, c1, bi1, match1, valid1, free1;
+      uword k0, *h0;
+      uword k1, *h1;
+
+      k0 = k[0];
+      k1 = k[1];
+
+      /* Keys must be unique. */
+      ASSERT (k0 != k1);
+
+      n_left -= 2;
+      k += 2;
+
+      a0 = a1 = h->hash_seeds[0];
+      b0 = b1 = h->hash_seeds[1];
+      c0 = c1 = h->hash_seeds[2];
+      a0 ^= k0;
+      a1 ^= k1;
+#if uword_bits == 64
+      b0 ^= k0 >> 32;
+      b1 ^= k1 >> 32;
+#endif
+
+      hash_mix32_step_1 (a0, b0, c0);
+      hash_mix32_step_1 (a1, b1, c1);
+      hash_mix32_step_2 (a0, b0, c0);
+      hash_mix32_step_2 (a1, b1, c1);
+      hash_mix32_step_3 (a0, b0, c0);
+      hash_mix32_step_3 (a1, b1, c1);
+
+      bi0 = c0 & bucket_mask;
+      bi1 = c1 & bucket_mask;
+
+      h0 = hash_keys + bi0;
+      h1 = hash_keys + bi1;
+
+      /* Search two buckets. */
+      valid0 = qhash_get_valid_elt_mask (h, bi0);
+      valid1 = qhash_get_valid_elt_mask (h, bi1);
+
+      match0 = qhash_search_bucket (h0, k0, valid0);
+      match1 = qhash_search_bucket (h1, k1, valid1);
+
+      /* Find first free element starting at hash offset into bucket. */
+      free0 = qhash_find_free (c0 & (QHASH_KEYS_PER_BUCKET - 1), valid0);
+
+      valid1 = valid1 | (bi0 == bi1 ? free0 : 0);
+      free1 = qhash_find_free (c1 & (QHASH_KEYS_PER_BUCKET - 1), valid1);
+
+      n_elts += (match0 == 0) + (match1 == 0);
+
+      match0 = match0 ? match0 : free0;
+      match1 = match1 ? match1 : free1;
+
+      valid0 |= match0;
+      valid1 |= match1;
+
+      h0 += qhash_min_log2 (match0);
+      h1 += qhash_min_log2 (match1);
+
+      if (PREDICT_FALSE (!match0 || !match1))
+	goto slow_path2;
+
+      h0[0] = k0;
+      h1[0] = k1;
+      r[0] = h0 - hash_keys;
+      r[1] = h1 - hash_keys;
+      r += 2;
+      qhash_set_valid_elt_mask (h, bi0, valid0);
+      qhash_set_valid_elt_mask (h, bi1, valid1);
+      continue;
+
+    slow_path2:
+      if (!match0)
+	{
+	  n_elts -= 1;
+	  v = qhash_set_overflow (v, elt_bytes, k0, bi0, &n_elts, &r[0]);
+	}
+      else
+	{
+	  h0[0] = k0;
+	  r[0] = h0 - hash_keys;
+	  qhash_set_valid_elt_mask (h, bi0, valid0);
+	}
+      if (!match1)
+	{
+	  n_elts -= 1;
+	  v = qhash_set_overflow (v, elt_bytes, k1, bi1, &n_elts, &r[1]);
+	}
+      else
+	{
+	  h1[0] = k1;
+	  r[1] = h1 - hash_keys;
+	  qhash_set_valid_elt_mask (h, bi1, valid1);
+	}
+      r += 2;
+    }
+
+  while (n_left >= 1)
+    {
+      u32 a0, b0, c0, bi0, match0, valid0, free0;
+      uword k0, *h0;
+
+      k0 = k[0];
+      n_left -= 1;
+      k += 1;
+
+      a0 = h->hash_seeds[0];
+      b0 = h->hash_seeds[1];
+      c0 = h->hash_seeds[2];
+      a0 ^= k0;
+#if uword_bits == 64
+      b0 ^= k0 >> 32;
+#endif
+
+      hash_mix32 (a0, b0, c0);
+
+      bi0 = c0 & bucket_mask;
+
+      h0 = hash_keys + bi0;
+
+      valid0 = qhash_get_valid_elt_mask (h, bi0);
+
+      /* Find first free element starting at hash offset into bucket. */
+      free0 = qhash_find_free (c0 & (QHASH_KEYS_PER_BUCKET - 1), valid0);
+
+      match0 = qhash_search_bucket (h0, k0, valid0);
+
+      n_elts += (match0 == 0);
+
+      match0 = match0 ? match0 : free0;
+
+      valid0 |= match0;
+
+      h0 += qhash_min_log2 (match0);
+
+      if (PREDICT_FALSE (!match0))
+	goto slow_path1;
+
+      h0[0] = k0;
+      r[0] = h0 - hash_keys;
+      r += 1;
+      qhash_set_valid_elt_mask (h, bi0, valid0);
+      continue;
+
+    slow_path1:
+      n_elts -= 1;
+      v = qhash_set_overflow (v, elt_bytes, k0, bi0, &n_elts, &r[0]);
+      r += 1;
+    }
+
+  h = qhash_header (v);
+  h->n_elts = n_elts;
+
+  return v;
+}
+
+static uword
+unset_slow_path (void *v, uword elt_bytes,
+		 uword k0, uword bi0, uword valid0, uword match0,
+		 uword * n_elts)
+{
+  qhash_t *h = qhash_header (v);
+  uword i, j = 0, k, l, t = ~0;
+  hash_pair_t *p, *found;
+
+  if (!match0)
+    {
+      if (valid0 == QHASH_ALL_VALID)
+	t = qhash_unset_overflow (v, k0, bi0, n_elts);
+      return t;
+    }
+
+  i = bi0 / QHASH_KEYS_PER_BUCKET;
+  t = bi0 + qhash_min_log2 (match0);
+
+  if (valid0 == QHASH_ALL_VALID
+      && i < vec_len (h->overflow_counts) && h->overflow_counts[i] > 0)
+    {
+      found = 0;
+      /* *INDENT-OFF* */
+      hash_foreach_pair (p, h->overflow_hash, ({
+	j = qhash_hash_mix (h, p->key) / QHASH_KEYS_PER_BUCKET;
+	if (j == i)
+	  {
+	    found = p;
+	    break;
+	  }
+      }));
+      /* *INDENT-ON* */
+      ASSERT (found != 0);
+      ASSERT (j == i);
+
+      l = found->value[0];
+      k = found->key;
+      hash_unset3 (h->overflow_hash, k, &j);
+      vec_add1 (h->overflow_free_indices, j);
+      h->overflow_counts[i] -= 1;
+
+      qhash_set_valid_elt_mask (h, bi0, valid0);
+
+      h->hash_keys[t] = k;
+      clib_memswap (v + t * elt_bytes, v + l * elt_bytes, elt_bytes);
+      t = l;
+    }
+  else
+    qhash_set_valid_elt_mask (h, bi0, valid0 ^ match0);
+
+  return t;
+}
+
+void
+_qhash_unset_multiple (void *v,
+		       uword elt_bytes,
+		       uword * search_keys,
+		       uword n_search_keys, u32 * result_indices)
+{
+  qhash_t *h = qhash_header (v);
+  uword *k, *hash_keys;
+  uword n_left, n_elts, bucket_mask;
+  u32 *r;
+
+  if (!v)
+    {
+      uword i;
+      for (i = 0; i < n_search_keys; i++)
+	result_indices[i] = ~0;
+    }
+
+  bucket_mask = pow2_mask (h->log2_hash_size) & ~(QHASH_KEYS_PER_BUCKET - 1);
+
+  hash_keys = h->hash_keys;
+  k = search_keys;
+  r = result_indices;
+  n_left = n_search_keys;
+  n_elts = h->n_elts;
+
+  while (n_left >= 2)
+    {
+      u32 a0, b0, c0, bi0, match0, valid0;
+      u32 a1, b1, c1, bi1, match1, valid1;
+      uword k0, *h0;
+      uword k1, *h1;
+
+      k0 = k[0];
+      k1 = k[1];
+
+      /* Keys must be unique. */
+      ASSERT (k0 != k1);
+
+      n_left -= 2;
+      k += 2;
+
+      a0 = a1 = h->hash_seeds[0];
+      b0 = b1 = h->hash_seeds[1];
+      c0 = c1 = h->hash_seeds[2];
+      a0 ^= k0;
+      a1 ^= k1;
+#if uword_bits == 64
+      b0 ^= k0 >> 32;
+      b1 ^= k1 >> 32;
+#endif
+
+      hash_mix32_step_1 (a0, b0, c0);
+      hash_mix32_step_1 (a1, b1, c1);
+      hash_mix32_step_2 (a0, b0, c0);
+      hash_mix32_step_2 (a1, b1, c1);
+      hash_mix32_step_3 (a0, b0, c0);
+      hash_mix32_step_3 (a1, b1, c1);
+
+      bi0 = c0 & bucket_mask;
+      bi1 = c1 & bucket_mask;
+
+      h0 = hash_keys + bi0;
+      h1 = hash_keys + bi1;
+
+      /* Search two buckets. */
+      valid0 = qhash_get_valid_elt_mask (h, bi0);
+      valid1 = qhash_get_valid_elt_mask (h, bi1);
+
+      match0 = qhash_search_bucket (h0, k0, valid0);
+      match1 = qhash_search_bucket (h1, k1, valid1);
+
+      n_elts -= (match0 != 0) + (match1 != 0);
+
+      if (PREDICT_FALSE (valid0 == QHASH_ALL_VALID
+			 || valid1 == QHASH_ALL_VALID))
+	goto slow_path2;
+
+      valid0 ^= match0;
+      qhash_set_valid_elt_mask (h, bi0, valid0);
+
+      valid1 = bi0 == bi1 ? valid0 : valid1;
+      valid1 ^= match1;
+
+      qhash_set_valid_elt_mask (h, bi1, valid1);
+
+      r[0] = match0 ? bi0 + qhash_min_log2 (match0) : ~0;
+      r[1] = match1 ? bi1 + qhash_min_log2 (match1) : ~0;
+      r += 2;
+      continue;
+
+    slow_path2:
+      r[0] = unset_slow_path (v, elt_bytes, k0, bi0, valid0, match0, &n_elts);
+      if (bi0 == bi1)
+	{
+	  /* Search again in same bucket to test new overflow element. */
+	  valid1 = qhash_get_valid_elt_mask (h, bi0);
+	  if (!match1)
+	    {
+	      match1 = qhash_search_bucket (h1, k1, valid1);
+	      n_elts -= (match1 != 0);
+	    }
+	}
+      r[1] = unset_slow_path (v, elt_bytes, k1, bi1, valid1, match1, &n_elts);
+      r += 2;
+    }
+
+  while (n_left >= 1)
+    {
+      u32 a0, b0, c0, bi0, match0, valid0;
+      uword k0, *h0;
+
+      k0 = k[0];
+      n_left -= 1;
+      k += 1;
+
+      a0 = h->hash_seeds[0];
+      b0 = h->hash_seeds[1];
+      c0 = h->hash_seeds[2];
+      a0 ^= k0;
+#if uword_bits == 64
+      b0 ^= k0 >> 32;
+#endif
+
+      hash_mix32 (a0, b0, c0);
+
+      bi0 = c0 & bucket_mask;
+
+      h0 = hash_keys + bi0;
+
+      valid0 = qhash_get_valid_elt_mask (h, bi0);
+
+      match0 = qhash_search_bucket (h0, k0, valid0);
+      n_elts -= (match0 != 0);
+      qhash_set_valid_elt_mask (h, bi0, valid0 ^ match0);
+
+      r[0] = match0 ? bi0 + qhash_min_log2 (match0) : ~0;
+      r += 1;
+
+      if (PREDICT_FALSE (valid0 == QHASH_ALL_VALID))
+	r[-1] = unset_slow_path (v, elt_bytes, k0, bi0, valid0, match0,
+				 &n_elts);
+    }
+
+  h->n_elts = n_elts;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/qhash.h b/src/vppinfra/qhash.h
new file mode 100644
index 00000000..9dbbd971
--- /dev/null
+++ b/src/vppinfra/qhash.h
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2006 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_qhash_h
+#define included_qhash_h
+
+#include <vppinfra/cache.h>
+#include <vppinfra/hash.h>
+
+/* Word hash tables. */
+typedef struct
+{
+  /* Number of elements in hash. */
+  u32 n_elts;
+
+  u32 log2_hash_size;
+
+  /* Jenkins hash seeds. */
+  u32 hash_seeds[3];
+
+  /* Fall back CLIB hash for overflow in fixed sized buckets. */
+  uword *overflow_hash;
+
+  u32 *overflow_counts, *overflow_free_indices;
+
+  u8 *hash_key_valid_bitmap;
+
+  uword *hash_keys;
+} qhash_t;
+
+always_inline qhash_t *
+qhash_header (void *v)
+{
+  return vec_header (v, sizeof (qhash_t));
+}
+
+always_inline uword
+qhash_elts (void *v)
+{
+  return v ? qhash_header (v)->n_elts : 0;
+}
+
+always_inline uword
+qhash_n_overflow (void *v)
+{
+  return v ? hash_elts (qhash_header (v)->overflow_hash) : 0;
+}
+
+#define QHASH_LOG2_KEYS_PER_BUCKET 2
+#define QHASH_KEYS_PER_BUCKET (1 << QHASH_LOG2_KEYS_PER_BUCKET)
+
+always_inline uword
+qhash_hash_mix (qhash_t * h, uword key)
+{
+  u32 a, b, c;
+
+  a = h->hash_seeds[0];
+  b = h->hash_seeds[1];
+  c = h->hash_seeds[2];
+
+  a ^= key;
+#if uword_bits == 64
+  b ^= key >> 32;
+#endif
+
+  hash_mix32 (a, b, c);
+
+  return c & pow2_mask (h->log2_hash_size);
+}
+
+#define qhash_resize(v,n) (v) = _qhash_resize ((v), (n), sizeof ((v)[0]))
+
+#define qhash_foreach(var,v,body)
+
+#define qhash_set_multiple(v,keys,n,results) \
+  (v) = _qhash_set_multiple ((v), sizeof ((v)[0]), (keys), (n), (results))
+
+#define qhash_unset_multiple(v,keys,n,results) \
+  _qhash_unset_multiple ((v), sizeof ((v)[0]), (keys), (n), (results))
+
+#define qhash_get(v,key)					\
+({								\
+  uword _qhash_get_k = (key);					\
+  qhash_get_first_match ((v), &_qhash_get_k, 1, &_qhash_get_k);	\
+})
+
+#define qhash_set(v,k)						\
+({								\
+  uword _qhash_set_k = (k);					\
+  qhash_set_multiple ((v), &_qhash_set_k, 1, &_qhash_set_k);	\
+  _qhash_set_k;							\
+})
+
+#define qhash_unset(v,k)						\
+({									\
+  uword _qhash_unset_k = (k);						\
+  qhash_unset_multiple ((v), &_qhash_unset_k, 1, &_qhash_unset_k);	\
+  _qhash_unset_k;							\
+})
+
+void *_qhash_resize (void *v, uword length, uword elt_bytes);
+
+/* Lookup multiple keys in the same hash table. */
+void
+qhash_get_multiple (void *v,
+		    uword * search_keys,
+		    uword n_search_keys, u32 * result_indices);
+
+/* Lookup multiple keys in the same hash table.
+   Returns index of first matching key. */
+u32
+qhash_get_first_match (void *v,
+		       uword * search_keys,
+		       uword n_search_keys, uword * matching_key);
+
+/* Set/unset helper functions. */
+void *_qhash_set_multiple (void *v,
+			   uword elt_bytes,
+			   uword * search_keys,
+			   uword n_search_keys, u32 * result_indices);
+void
+_qhash_unset_multiple (void *v,
+		       uword elt_bytes,
+		       uword * search_keys,
+		       uword n_search_keys, u32 * result_indices);
+
+#endif /* included_qhash_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/qsort.c b/src/vppinfra/qsort.c
new file mode 100644
index 00000000..2faa5897
--- /dev/null
+++ b/src/vppinfra/qsort.c
@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * Imported into CLIB by Eliot Dresselhaus from:
+ *
+ *  This file is part of
+ *	MakeIndex - A formatter and format independent index processor
+ *
+ *  This file is public domain software donated by
+ *  Nelson Beebe (beebe@science.utah.edu).
+ *
+ *  modifications copyright (c) 2003 Cisco Systems, Inc.
+ */
+
+#include <vppinfra/clib.h>
+
+/*
+ * qsort.c: Our own version of the system qsort routine which is faster by an
+ * average of 25%, with lows and highs of 10% and 50%. The THRESHold below is
+ * the insertion sort threshold, and has been adjusted for records of size 48
+ * bytes. The MTHREShold is where we stop finding a better median.
+ */
+
+#define THRESH  4		/* threshold for insertion */
+#define MTHRESH 6		/* threshold for median */
+
+typedef struct
+{
+  word qsz;			/* size of each record */
+  word thresh;			/* THRESHold in chars */
+  word mthresh;			/* MTHRESHold in chars */
+  int (*qcmp) (const void *, const void *);	/* the comparison routine */
+} qst_t;
+
+static void qst (qst_t * q, char *base, char *max);
+
+/*
+ * qqsort: First, set up some global parameters for qst to share.
+ * Then, quicksort with qst(), and then a cleanup insertion sort ourselves.
+ * Sound simple?  It's not...
+ */
+
+void
+qsort (void *base, uword n, uword size,
+       int (*compar) (const void *, const void *))
+{
+  char *i;
+  char *j;
+  char *lo;
+  char *hi;
+  char *min;
+  char c;
+  char *max;
+  qst_t _q, *q = &_q;
+
+  if (n <= 1)
+    return;
+
+  q->qsz = size;
+  q->qcmp = compar;
+  q->thresh = q->qsz * THRESH;
+  q->mthresh = q->qsz * MTHRESH;
+  max = base + n * q->qsz;
+  if (n >= THRESH)
+    {
+      qst (q, base, max);
+      hi = base + q->thresh;
+    }
+  else
+    {
+      hi = max;
+    }
+  /*
+   * First put smallest element, which must be in the first THRESH, in the
+   * first position as a sentinel.  This is done just by searching the
+   * first THRESH elements (or the first n if n < THRESH), finding the min,
+   * and swapping it into the first position.
+   */
+  for (j = lo = base; (lo += q->qsz) < hi;)
+    {
+      if ((*compar) (j, lo) > 0)
+	j = lo;
+    }
+  if (j != base)
+    {				/* swap j into place */
+      for (i = base, hi = base + q->qsz; i < hi;)
+	{
+	  c = *j;
+	  *j++ = *i;
+	  *i++ = c;
+	}
+    }
+  /*
+   * With our sentinel in place, we now run the following hyper-fast
+   * insertion sort. For each remaining element, min, from [1] to [n-1],
+   * set hi to the index of the element AFTER which this one goes. Then, do
+   * the standard insertion sort shift on a character at a time basis for
+   * each element in the frob.
+   */
+  for (min = base; (hi = min += q->qsz) < max;)
+    {
+      while ((*q->qcmp) (hi -= q->qsz, min) > 0);
+      if ((hi += q->qsz) != min)
+	{
+	  for (lo = min + q->qsz; --lo >= min;)
+	    {
+	      c = *lo;
+	      for (i = j = lo; (j -= q->qsz) >= hi; i = j)
+		*i = *j;
+	      *i = c;
+	    }
+	}
+    }
+}
+
+
+
+/*
+ * qst: Do a quicksort.  First, find the median element, and put that one in
+ * the first place as the discriminator.  (This "median" is just the median
+ * of the first, last and middle elements).  (Using this median instead of
+ * the first element is a big win). Then, the usual partitioning/swapping,
+ * followed by moving the discriminator into the right place.  Then, figure
+ * out the sizes of the two partions, do the smaller one recursively and the
+ * larger one via a repeat of this code.  Stopping when there are less than
+ * THRESH elements in a partition and cleaning up with an insertion sort (in
+ * our caller) is a huge win. All data swaps are done in-line, which is
+ * space-losing but time-saving. (And there are only three places where this
+ * is done).
+ */
+
+static void
+qst (qst_t * q, char *base, char *max)
+{
+  char *i;
+  char *j;
+  char *jj;
+  char *mid;
+  int ii;
+  char c;
+  char *tmp;
+  int lo;
+  int hi;
+  int qsz = q->qsz;
+
+  lo = (int) (max - base);	/* number of elements as chars */
+  do
+    {
+      /*
+       * At the top here, lo is the number of characters of elements in the
+       * current partition.  (Which should be max - base). Find the median
+       * of the first, last, and middle element and make that the middle
+       * element.  Set j to largest of first and middle.  If max is larger
+       * than that guy, then it's that guy, else compare max with loser of
+       * first and take larger.  Things are set up to prefer the middle,
+       * then the first in case of ties.
+       */
+      mid = i = base + qsz * ((unsigned) (lo / qsz) >> 1);
+      if (lo >= q->mthresh)
+	{
+	  j = ((*q->qcmp) ((jj = base), i) > 0 ? jj : i);
+	  if ((*q->qcmp) (j, (tmp = max - qsz)) > 0)
+	    {
+	      /* switch to first loser */
+	      j = (j == jj ? i : jj);
+	      if ((*q->qcmp) (j, tmp) < 0)
+		j = tmp;
+	    }
+	  if (j != i)
+	    {
+	      ii = qsz;
+	      do
+		{
+		  c = *i;
+		  *i++ = *j;
+		  *j++ = c;
+		}
+	      while (--ii);
+	    }
+	}
+      /* Semi-standard quicksort partitioning/swapping */
+      for (i = base, j = max - qsz;;)
+	{
+	  while (i < mid && (*q->qcmp) (i, mid) <= 0)
+	    i += qsz;
+	  while (j > mid)
+	    {
+	      if ((*q->qcmp) (mid, j) <= 0)
+		{
+		  j -= qsz;
+		  continue;
+		}
+	      tmp = i + qsz;	/* value of i after swap */
+	      if (i == mid)
+		{		/* j <-> mid, new mid is j */
+		  mid = jj = j;
+		}
+	      else
+		{		/* i <-> j */
+		  jj = j;
+		  j -= qsz;
+		}
+	      goto swap;
+	    }
+	  if (i == mid)
+	    {
+	      break;
+	    }
+	  else
+	    {			/* i <-> mid, new mid is i */
+	      jj = mid;
+	      tmp = mid = i;	/* value of i after swap */
+	      j -= qsz;
+	    }
+	swap:
+	  ii = qsz;
+	  do
+	    {
+	      c = *i;
+	      *i++ = *jj;
+	      *jj++ = c;
+	    }
+	  while (--ii);
+	  i = tmp;
+	}
+      /*
+       * Look at sizes of the two partitions, do the smaller one first by
+       * recursion, then do the larger one by making sure lo is its size,
+       * base and max are update correctly, and branching back. But only
+       * repeat (recursively or by branching) if the partition is of at
+       * least size THRESH.
+       */
+      i = (j = mid) + qsz;
+      if ((lo = (int) (j - base)) <= (hi = (int) (max - i)))
+	{
+	  if (lo >= q->thresh)
+	    qst (q, base, j);
+	  base = i;
+	  lo = hi;
+	}
+      else
+	{
+	  if (hi >= q->thresh)
+	    qst (q, i, max);
+	  max = j;
+	}
+    }
+  while (lo >= q->thresh);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/random.c b/src/vppinfra/random.c
new file mode 100644
index 00000000..fa5bcc8c
--- /dev/null
+++ b/src/vppinfra/random.c
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/random.h>
+
+/* Default random seed for standalone version of library.
+   Value can be overridden by platform code from e.g.
+   machine's clock count register. */
+u32 standalone_random_default_seed = 1;
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/random.h b/src/vppinfra/random.h
new file mode 100644
index 00000000..5c139d05
--- /dev/null
+++ b/src/vppinfra/random.h
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_random_h
+#define included_random_h
+
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>	/* for vec_resize */
+#include <vppinfra/format.h>	/* for unformat_input_t */
+
+/** \file
+    Linear Congruential Random Number Generator
+
+    This specific random number generator is described in
+    "Numerical Recipes in C", 2nd edition, page 284. If you need
+    random numbers with really excellent statistics, take a look
+    at Chapter 7...
+
+    By definition, a linear congruential random number generator
+    is of the form: rand[i+1] = a*rand[i] + c (mod m) for specific
+    values of (a,c,m).
+
+    In this case, choose m = 2**32 and use the low-order 32-bits of
+    the 64-bit product a*N[i]. Knuth suggests the use of a=1664525,
+    H.W. Lewis has tested C=1013904223 extensively. This routine is
+    reputedly as good as any 32-bit LCRN, and costs only a single
+    multiply-add.
+
+    Several variants: 32/64-bit, machine word width,
+    f64 on the closed interval [0,1].
+*/
+
+/** \brief 32-bit random number generator */
+always_inline u32
+random_u32 (u32 * seed)
+{
+  *seed = (1664525 * *seed) + 1013904223;
+  return *seed;
+}
+
+/* External test routine. */
+int test_random_main (unformat_input_t * input);
+
+/** \brief Maximum value returned by random_u32() */
+always_inline u32
+random_u32_max (void)
+{
+  return 0xffffffff;
+}
+
+#ifdef CLIB_UNIX
+
+#include <unistd.h>		/* for getpid */
+
+/** \brief Default random seed (unix/linux user-mode) */
+always_inline uword
+random_default_seed (void)
+{
+  return getpid ();
+}
+
+#endif
+
+#ifdef CLIB_LINUX_KERNEL
+
+#include <linux/sched.h>	/* for jiffies */
+
+/** \brief Default random seed (Linux kernel) */
+always_inline uword
+random_default_seed (void)
+{
+  return jiffies;
+}
+
+#endif
+
+#ifdef CLIB_STANDALONE
+extern u32 standalone_random_default_seed;
+
+always_inline u32
+random_default_seed (void)
+{
+  return standalone_random_default_seed;
+}
+#endif
+
+/** \brief 64-bit random number generator
+ * Again, constants courtesy of Donald Knuth.
+ *
+ */
+always_inline u64
+random_u64 (u64 * seed)
+{
+  *seed = 6364136223846793005ULL * *seed + 1442695040888963407ULL;
+  return *seed;
+}
+
+/** \brief machine word size random number generator */
+
+always_inline uword
+random_uword (u32 * seed)
+{
+  if (sizeof (uword) == sizeof (u64))
+    return random_u64 ((u64 *) seed);
+  else
+    return random_u32 (seed);
+}
+
+/** \brief Generate f64 random number in the interval [0,1] */
+always_inline f64
+random_f64 (u32 * seed)
+{
+  return (f64) random_u32 (seed) / (f64) random_u32_max ();
+}
+
+/** \brief Generate random character vector
+
+    From the alphabet a-z, lower case.
+    Returns a vector of the supplied length which is NOT guaranteed to be
+    NULL-terminated. FIXME?
+*/
+always_inline u8 *
+random_string (u32 * seed, uword len)
+{
+  u8 *alphabet = (u8 *) "abcdefghijklmnopqrstuvwxyz";
+  u8 *s = 0;
+  word i;
+
+  vec_resize (s, len);
+  for (i = 0; i < len; i++)
+    s[i] = alphabet[random_u32 (seed) % 26];
+
+  return s;
+}
+
+#endif /* included_random_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/random_buffer.c b/src/vppinfra/random_buffer.c
new file mode 100644
index 00000000..df036980
--- /dev/null
+++ b/src/vppinfra/random_buffer.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/random_buffer.h>
+
+/* Fill random buffer. */
+void
+clib_random_buffer_fill (clib_random_buffer_t * b, uword n_words)
+{
+  uword *w, n = n_words;
+
+  if (n < 256)
+    n = 256;
+
+  n = round_pow2 (n, 2 << ISAAC_LOG2_SIZE);
+
+  vec_add2 (b->buffer, w, n);
+  do
+    {
+      isaac2 (b->ctx, w);
+      w += 2 * ISAAC_SIZE;
+      n -= 2 * ISAAC_SIZE;
+    }
+  while (n > 0);
+}
+
+void
+clib_random_buffer_init (clib_random_buffer_t * b, uword seed)
+{
+  uword i, j;
+
+  memset (b, 0, sizeof (b[0]));
+
+  /* Seed ISAAC. */
+  for (i = 0; i < ARRAY_LEN (b->ctx); i++)
+    {
+      uword s[ISAAC_SIZE];
+
+      for (j = 0; j < ARRAY_LEN (s); j++)
+	s[j] = ARRAY_LEN (b->ctx) * (seed + j) + i;
+
+      isaac_init (&b->ctx[i], s);
+    }
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/random_buffer.h b/src/vppinfra/random_buffer.h
new file mode 100644
index 00000000..eb318548
--- /dev/null
+++ b/src/vppinfra/random_buffer.h
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_random_buffer_h
+#define included_clib_random_buffer_h
+
+#include <vppinfra/clib.h>
+#include <vppinfra/random_isaac.h>
+
+typedef struct
+{
+  /* Two parallel ISAAC contexts for speed. */
+  isaac_t ctx[2];
+
+  /* Random buffer. */
+  uword *buffer;
+
+  /* Cache up to 1 word worth of bytes for random data
+     less than one word at a time. */
+  uword n_cached_bytes;
+
+  union
+  {
+    u8 cached_bytes[sizeof (uword)];
+    uword cached_word;
+  };
+}
+clib_random_buffer_t;
+
+always_inline void
+clib_random_buffer_free (clib_random_buffer_t * b)
+{
+  vec_free (b->buffer);
+}
+
+/* Fill random buffer. */
+void clib_random_buffer_fill (clib_random_buffer_t * b, uword n_words);
+
+/* Initialize random buffer. */
+void clib_random_buffer_init (clib_random_buffer_t * b, uword seed);
+
+/* Returns word aligned random data, possibly filling buffer. */
+always_inline void *
+clib_random_buffer_get_data (clib_random_buffer_t * b, uword n_bytes)
+{
+  uword n_words, i, l;
+
+  l = b->n_cached_bytes;
+  if (n_bytes <= l)
+    {
+      b->n_cached_bytes = l - n_bytes;
+      return &b->cached_bytes[l];
+    }
+
+  n_words = n_bytes / sizeof (uword);
+  if (n_bytes % sizeof (uword))
+    n_words++;
+
+  /* Enough random words left? */
+  if (PREDICT_FALSE (n_words > vec_len (b->buffer)))
+    clib_random_buffer_fill (b, n_words);
+
+  i = vec_len (b->buffer) - n_words;
+  _vec_len (b->buffer) = i;
+
+  if (n_bytes < sizeof (uword))
+    {
+      b->cached_word = b->buffer[i];
+      b->n_cached_bytes = sizeof (uword) - n_bytes;
+      return b->cached_bytes;
+    }
+  else
+    return b->buffer + i;
+}
+
+#endif /* included_clib_random_buffer_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/random_isaac.c b/src/vppinfra/random_isaac.c
new file mode 100644
index 00000000..6f00fc32
--- /dev/null
+++ b/src/vppinfra/random_isaac.c
@@ -0,0 +1,434 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  ------------------------------------------------------------------------------
+  By Bob Jenkins, 1996, Public Domain
+  MODIFIED:
+  960327: Creation (addition of randinit, really)
+  970719: use context, not global variables, for internal state
+  980324: renamed seed to flag
+  980605: recommend ISAAC_LOG2_SIZE=4 for noncryptography.
+  010626: note this is public domain
+  ------------------------------------------------------------------------------
+
+  Modified for CLIB by Eliot Dresselhaus.
+  Dear Bob, Thanks for all the great work. - Eliot
+
+  modifications copyright (c) 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+/* ISAAC is Bob Jenkins' random number generator.
+   http://burtleburtle.net/bob/rand/isaacafa.html */
+
+#include <vppinfra/random_isaac.h>
+
+#if uword_bits != 32 && uword_bits != 64
+#error "isaac only works for 32 or 64 bit words"
+#endif
+
+#if uword_bits == 32
+
+#define ind32(mm,x)  (*(u32 *)((u8 *)(mm) + ((x) & ((ISAAC_SIZE-1)<<2))))
+#define rngstep32(mix,a,b,mm,m,m2,r,x,y)		\
+{							\
+  x = *m;						\
+  a = (a^(mix)) + *(m2++);				\
+  *(m++) = y = ind32(mm,x) + a + b;			\
+  *(r++) = b = ind32(mm,y>>ISAAC_LOG2_SIZE) + x;	\
+}
+
+void
+isaac (isaac_t * ctx, uword * results)
+{
+  u32 a, b, c, x, y, *m, *mm, *m2, *r, *mend;
+
+  mm = ctx->memory;
+  r = results;
+  a = ctx->a;
+  b = ctx->b;
+  c = ctx->c;
+
+  b += ++c;
+  mend = m2 = mm + ARRAY_LEN (ctx->memory) / 2;
+  m = mm;
+  while (m < mend)
+    {
+      rngstep32 (a << 13, a, b, mm, m, m2, r, x, y);
+      rngstep32 (a >> 6, a, b, mm, m, m2, r, x, y);
+      rngstep32 (a << 2, a, b, mm, m, m2, r, x, y);
+      rngstep32 (a >> 16, a, b, mm, m, m2, r, x, y);
+    }
+
+  m2 = mm;
+  while (m2 < mend)
+    {
+      rngstep32 (a << 13, a, b, mm, m, m2, r, x, y);
+      rngstep32 (a >> 6, a, b, mm, m, m2, r, x, y);
+      rngstep32 (a << 2, a, b, mm, m, m2, r, x, y);
+      rngstep32 (a >> 16, a, b, mm, m, m2, r, x, y);
+    }
+
+  ctx->a = a;
+  ctx->b = b;
+  ctx->c = c;
+}
+
+/* Perform 2 isaac runs with different contexts simultaneously. */
+void
+isaac2 (isaac_t * ctx, uword * results)
+{
+#define _(n) \
+  u32 a##n, b##n, c##n, x##n, y##n, * m##n, * mm##n, * m2##n, * r##n, * mend##n
+
+  _(0);
+  _(1);
+  (void) mend1;			/* "set but unused variable" error on mend1 with gcc 4.9  */
+#undef _
+
+#define _(n)							\
+do {								\
+  mm##n = ctx[(n)].memory;					\
+  r##n = results + (n) * ISAAC_SIZE;				\
+  a##n = ctx[(n)].a;						\
+  b##n = ctx[(n)].b;						\
+  c##n = ctx[(n)].c;						\
+  b##n += ++c##n;						\
+  mend##n = m2##n = mm##n + ARRAY_LEN (ctx[(n)].memory) / 2;	\
+  m##n = mm##n;							\
+} while (0)
+
+  _(0);
+  _(1);
+
+#undef _
+
+  while (m0 < mend0)
+    {
+      rngstep32 (a0 << 13, a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep32 (a1 << 13, a1, b1, mm1, m1, m21, r1, x1, y1);
+      rngstep32 (a0 >> 6, a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep32 (a1 >> 6, a1, b1, mm1, m1, m21, r1, x1, y1);
+      rngstep32 (a0 << 2, a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep32 (a1 << 2, a1, b1, mm1, m1, m21, r1, x1, y1);
+      rngstep32 (a0 >> 16, a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep32 (a1 >> 16, a1, b1, mm1, m1, m21, r1, x1, y1);
+    }
+
+  m20 = mm0;
+  m21 = mm1;
+  while (m20 < mend0)
+    {
+      rngstep32 (a0 << 13, a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep32 (a1 << 13, a1, b1, mm1, m1, m21, r1, x1, y1);
+      rngstep32 (a0 >> 6, a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep32 (a1 >> 6, a1, b1, mm1, m1, m21, r1, x1, y1);
+      rngstep32 (a0 << 2, a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep32 (a1 << 2, a1, b1, mm1, m1, m21, r1, x1, y1);
+      rngstep32 (a0 >> 16, a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep32 (a1 >> 16, a1, b1, mm1, m1, m21, r1, x1, y1);
+    }
+
+  ctx[0].a = a0;
+  ctx[0].b = b0;
+  ctx[0].c = c0;
+  ctx[1].a = a1;
+  ctx[1].b = b1;
+  ctx[1].c = c1;
+}
+
+#define mix32(a,b,c,d,e,f,g,h)			\
+{						\
+   a^=b<<11; d+=a; b+=c;			\
+   b^=c>>2;  e+=b; c+=d;			\
+   c^=d<<8;  f+=c; d+=e;			\
+   d^=e>>16; g+=d; e+=f;			\
+   e^=f<<10; h+=e; f+=g;			\
+   f^=g>>4;  a+=f; g+=h;			\
+   g^=h<<8;  b+=g; h+=a;			\
+   h^=a>>9;  c+=h; a+=b;			\
+}
+
+void
+isaac_init (isaac_t * ctx, uword * seeds)
+{
+  word i;
+  u32 a, b, c, d, e, f, g, h, *m, *r;
+
+  ctx->a = ctx->b = ctx->c = 0;
+  m = ctx->memory;
+  r = seeds;
+
+  a = b = c = d = e = f = g = h = 0x9e3779b9;	/* the golden ratio */
+
+  for (i = 0; i < 4; ++i)	/* scramble it */
+    mix32 (a, b, c, d, e, f, g, h);
+
+  /* initialize using the contents of r[] as the seed */
+  for (i = 0; i < ISAAC_SIZE; i += 8)
+    {
+      a += r[i];
+      b += r[i + 1];
+      c += r[i + 2];
+      d += r[i + 3];
+      e += r[i + 4];
+      f += r[i + 5];
+      g += r[i + 6];
+      h += r[i + 7];
+      mix32 (a, b, c, d, e, f, g, h);
+      m[i] = a;
+      m[i + 1] = b;
+      m[i + 2] = c;
+      m[i + 3] = d;
+      m[i + 4] = e;
+      m[i + 5] = f;
+      m[i + 6] = g;
+      m[i + 7] = h;
+    }
+
+  /* do a second pass to make all of the seed affect all of m */
+  for (i = 0; i < ISAAC_SIZE; i += 8)
+    {
+      a += m[i];
+      b += m[i + 1];
+      c += m[i + 2];
+      d += m[i + 3];
+      e += m[i + 4];
+      f += m[i + 5];
+      g += m[i + 6];
+      h += m[i + 7];
+      mix32 (a, b, c, d, e, f, g, h);
+      m[i] = a;
+      m[i + 1] = b;
+      m[i + 2] = c;
+      m[i + 3] = d;
+      m[i + 4] = e;
+      m[i + 5] = f;
+      m[i + 6] = g;
+      m[i + 7] = h;
+    }
+}
+#endif /* uword_bits == 32 */
+
+#if uword_bits == 64
+
+#define ind64(mm,x)  (*(u64 *)((u8 *)(mm) + ((x) & ((ISAAC_SIZE-1)<<3))))
+#define rngstep64(mix,a,b,mm,m,m2,r,x,y)		\
+{							\
+  x = *m;						\
+  a = (mix) + *(m2++);					\
+  *(m++) = y = ind64(mm,x) + a + b;			\
+  *(r++) = b = ind64(mm,y>>ISAAC_LOG2_SIZE) + x;	\
+}
+
+void
+isaac (isaac_t * ctx, uword * results)
+{
+  u64 a, b, c, x, y, *m, *mm, *m2, *r, *mend;
+
+  mm = ctx->memory;
+  r = results;
+  a = ctx->a;
+  b = ctx->b;
+  c = ctx->c;
+
+  b += ++c;
+  mend = m2 = mm + ARRAY_LEN (ctx->memory) / 2;
+  m = mm;
+  while (m < mend)
+    {
+      rngstep64 (~(a ^ (a << 21)), a, b, mm, m, m2, r, x, y);
+      rngstep64 (a ^ (a >> 5), a, b, mm, m, m2, r, x, y);
+      rngstep64 (a ^ (a << 12), a, b, mm, m, m2, r, x, y);
+      rngstep64 (a ^ (a >> 33), a, b, mm, m, m2, r, x, y);
+    }
+
+  m2 = mm;
+  while (m2 < mend)
+    {
+      rngstep64 (~(a ^ (a << 21)), a, b, mm, m, m2, r, x, y);
+      rngstep64 (a ^ (a >> 5), a, b, mm, m, m2, r, x, y);
+      rngstep64 (a ^ (a << 12), a, b, mm, m, m2, r, x, y);
+      rngstep64 (a ^ (a >> 33), a, b, mm, m, m2, r, x, y);
+    }
+
+  ctx->a = a;
+  ctx->b = b;
+  ctx->c = c;
+}
+
+/* Perform 2 isaac runs with different contexts simultaneously. */
+void
+isaac2 (isaac_t * ctx, uword * results)
+{
+#define _(n) \
+  u64 a##n, b##n, c##n, x##n, y##n, * m##n, * mm##n, * m2##n, * r##n, * mend##n
+
+  _(0);
+  _(1);
+
+#undef _
+
+#define _(n)							\
+do {								\
+  mm##n = ctx[(n)].memory;					\
+  r##n = results + (n) * ISAAC_SIZE;				\
+  a##n = ctx[(n)].a;						\
+  b##n = ctx[(n)].b;						\
+  c##n = ctx[(n)].c;						\
+  b##n += ++c##n;						\
+  mend##n = m2##n = mm##n + ARRAY_LEN (ctx[(n)].memory) / 2;	\
+  m##n = mm##n;							\
+} while (0)
+
+  _(0);
+  _(1);
+
+#undef _
+
+  (void) mend1;			/* compiler warning */
+
+  while (m0 < mend0)
+    {
+      rngstep64 (~(a0 ^ (a0 << 21)), a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep64 (~(a1 ^ (a1 << 21)), a1, b1, mm1, m1, m21, r1, x1, y1);
+      rngstep64 (a0 ^ (a0 >> 5), a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep64 (a1 ^ (a1 >> 5), a1, b1, mm1, m1, m21, r1, x1, y1);
+      rngstep64 (a0 ^ (a0 << 12), a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep64 (a1 ^ (a1 << 12), a1, b1, mm1, m1, m21, r1, x1, y1);
+      rngstep64 (a0 ^ (a0 >> 33), a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep64 (a1 ^ (a1 >> 33), a1, b1, mm1, m1, m21, r1, x1, y1);
+    }
+
+  m20 = mm0;
+  m21 = mm1;
+  while (m20 < mend0)
+    {
+      rngstep64 (~(a0 ^ (a0 << 21)), a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep64 (~(a1 ^ (a1 << 21)), a1, b1, mm1, m1, m21, r1, x1, y1);
+      rngstep64 (a0 ^ (a0 >> 5), a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep64 (a1 ^ (a1 >> 5), a1, b1, mm1, m1, m21, r1, x1, y1);
+      rngstep64 (a0 ^ (a0 << 12), a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep64 (a1 ^ (a1 << 12), a1, b1, mm1, m1, m21, r1, x1, y1);
+      rngstep64 (a0 ^ (a0 >> 33), a0, b0, mm0, m0, m20, r0, x0, y0);
+      rngstep64 (a1 ^ (a1 >> 33), a1, b1, mm1, m1, m21, r1, x1, y1);
+    }
+
+  ctx[0].a = a0;
+  ctx[0].b = b0;
+  ctx[0].c = c0;
+  ctx[1].a = a1;
+  ctx[1].b = b1;
+  ctx[1].c = c1;
+}
+
+#define mix64(a,b,c,d,e,f,g,h)			\
+{						\
+   a-=e; f^=h>>9;  h+=a;			\
+   b-=f; g^=a<<9;  a+=b;			\
+   c-=g; h^=b>>23; b+=c;			\
+   d-=h; a^=c<<15; c+=d;			\
+   e-=a; b^=d>>14; d+=e;			\
+   f-=b; c^=e<<20; e+=f;			\
+   g-=c; d^=f>>17; f+=g;			\
+   h-=d; e^=g<<14; g+=h;			\
+}
+
+void
+isaac_init (isaac_t * ctx, uword * seeds)
+{
+  word i;
+  u64 a, b, c, d, e, f, g, h, *m, *r;
+
+  ctx->a = ctx->b = ctx->c = 0;
+  m = ctx->memory;
+  r = seeds;
+
+  a = b = c = d = e = f = g = h = 0x9e3779b97f4a7c13LL;	/* the golden ratio */
+
+  for (i = 0; i < 4; ++i)	/* scramble it */
+    mix64 (a, b, c, d, e, f, g, h);
+
+  for (i = 0; i < ISAAC_SIZE; i += 8)	/* fill in mm[] with messy stuff */
+    {
+      a += r[i];
+      b += r[i + 1];
+      c += r[i + 2];
+      d += r[i + 3];
+      e += r[i + 4];
+      f += r[i + 5];
+      g += r[i + 6];
+      h += r[i + 7];
+      mix64 (a, b, c, d, e, f, g, h);
+      m[i] = a;
+      m[i + 1] = b;
+      m[i + 2] = c;
+      m[i + 3] = d;
+      m[i + 4] = e;
+      m[i + 5] = f;
+      m[i + 6] = g;
+      m[i + 7] = h;
+    }
+
+  /* do a second pass to make all of the seed affect all of mm */
+  for (i = 0; i < ISAAC_SIZE; i += 8)
+    {
+      a += m[i];
+      b += m[i + 1];
+      c += m[i + 2];
+      d += m[i + 3];
+      e += m[i + 4];
+      f += m[i + 5];
+      g += m[i + 6];
+      h += m[i + 7];
+      mix64 (a, b, c, d, e, f, g, h);
+      m[i] = a;
+      m[i + 1] = b;
+      m[i + 2] = c;
+      m[i + 3] = d;
+      m[i + 4] = e;
+      m[i + 5] = f;
+      m[i + 6] = g;
+      m[i + 7] = h;
+    }
+}
+#endif /* uword_bits == 64 */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/random_isaac.h b/src/vppinfra/random_isaac.h
new file mode 100644
index 00000000..803fbd62
--- /dev/null
+++ b/src/vppinfra/random_isaac.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  ------------------------------------------------------------------------------
+  By Bob Jenkins, 1996, Public Domain
+  MODIFIED:
+  960327: Creation (addition of randinit, really)
+  970719: use context, not global variables, for internal state
+  980324: renamed seed to flag
+  980605: recommend ISAAC_LOG2_SIZE=4 for noncryptography.
+  010626: note this is public domain
+  ------------------------------------------------------------------------------
+
+  Modified for CLIB by Eliot Dresselhaus.
+  Dear Bob, Thanks for all the great work. - Eliot
+
+  modifications copyright (c) 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_random_isaac_h
+#define included_random_isaac_h
+
+#include <vppinfra/clib.h>	/* for u32/u64 */
+#include <vppinfra/format.h>	/* for unformat_input_t */
+
+/* Bob recommends 8 for crypto, 4 for simulations */
+#define ISAAC_LOG2_SIZE   (4)
+#define ISAAC_SIZE (1 << ISAAC_LOG2_SIZE)
+
+typedef struct
+{
+  uword memory[ISAAC_SIZE];
+  uword a, b, c;
+} isaac_t;
+
+void isaac (isaac_t * ctx, uword * results);
+void isaac2 (isaac_t * ctx, uword * results);
+void isaac_init (isaac_t * ctx, uword * results);
+
+int test_isaac_main (unformat_input_t * input);
+
+#endif /* included_random_isaac_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/serialize.c b/src/vppinfra/serialize.c
new file mode 100644
index 00000000..5d401a08
--- /dev/null
+++ b/src/vppinfra/serialize.c
@@ -0,0 +1,1254 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+/* Turn data structures into byte streams for saving or transport. */
+
+#include <vppinfra/heap.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/serialize.h>
+
+void
+serialize_64 (serialize_main_t * m, va_list * va)
+{
+  u64 x = va_arg (*va, u64);
+  u32 lo, hi;
+  lo = x;
+  hi = x >> 32;
+  serialize_integer (m, lo, sizeof (lo));
+  serialize_integer (m, hi, sizeof (hi));
+}
+
+void
+serialize_32 (serialize_main_t * m, va_list * va)
+{
+  u32 x = va_arg (*va, u32);
+  serialize_integer (m, x, sizeof (x));
+}
+
+void
+serialize_16 (serialize_main_t * m, va_list * va)
+{
+  u32 x = va_arg (*va, u32);
+  serialize_integer (m, x, sizeof (u16));
+}
+
+void
+serialize_8 (serialize_main_t * m, va_list * va)
+{
+  u32 x = va_arg (*va, u32);
+  serialize_integer (m, x, sizeof (u8));
+}
+
+void
+unserialize_64 (serialize_main_t * m, va_list * va)
+{
+  u64 *x = va_arg (*va, u64 *);
+  u32 lo, hi;
+  unserialize_integer (m, &lo, sizeof (lo));
+  unserialize_integer (m, &hi, sizeof (hi));
+  *x = ((u64) hi << 32) | (u64) lo;
+}
+
+void
+unserialize_32 (serialize_main_t * m, va_list * va)
+{
+  u32 *x = va_arg (*va, u32 *);
+  unserialize_integer (m, x, sizeof (x[0]));
+}
+
+void
+unserialize_16 (serialize_main_t * m, va_list * va)
+{
+  u16 *x = va_arg (*va, u16 *);
+  u32 t;
+  unserialize_integer (m, &t, sizeof (x[0]));
+  x[0] = t;
+}
+
+void
+unserialize_8 (serialize_main_t * m, va_list * va)
+{
+  u8 *x = va_arg (*va, u8 *);
+  u32 t;
+  unserialize_integer (m, &t, sizeof (x[0]));
+  x[0] = t;
+}
+
+void
+serialize_f64 (serialize_main_t * m, va_list * va)
+{
+  f64 x = va_arg (*va, f64);
+  union
+  {
+    f64 f;
+    u64 i;
+  } y;
+  y.f = x;
+  serialize (m, serialize_64, y.i);
+}
+
+void
+serialize_f32 (serialize_main_t * m, va_list * va)
+{
+  f32 x = va_arg (*va, f64);
+  union
+  {
+    f32 f;
+    u32 i;
+  } y;
+  y.f = x;
+  serialize_integer (m, y.i, sizeof (y.i));
+}
+
+void
+unserialize_f64 (serialize_main_t * m, va_list * va)
+{
+  f64 *x = va_arg (*va, f64 *);
+  union
+  {
+    f64 f;
+    u64 i;
+  } y;
+  unserialize (m, unserialize_64, &y.i);
+  *x = y.f;
+}
+
+void
+unserialize_f32 (serialize_main_t * m, va_list * va)
+{
+  f32 *x = va_arg (*va, f32 *);
+  union
+  {
+    f32 f;
+    u32 i;
+  } y;
+  unserialize_integer (m, &y.i, sizeof (y.i));
+  *x = y.f;
+}
+
+void
+serialize_cstring (serialize_main_t * m, char *s)
+{
+  u32 len = s ? strlen (s) : 0;
+  void *p;
+
+  serialize_likely_small_unsigned_integer (m, len);
+  if (len > 0)
+    {
+      p = serialize_get (m, len);
+      clib_memcpy (p, s, len);
+    }
+}
+
+void
+unserialize_cstring (serialize_main_t * m, char **s)
+{
+  char *p, *r = 0;
+  u32 len;
+
+  len = unserialize_likely_small_unsigned_integer (m);
+
+  /*
+   * Given broken enough data, we could get len = 0xFFFFFFFF.
+   * Add one, it overflows, we call vec_new (char, 0), then
+   * memcpy until we bus error.
+   */
+  if (len > 0 && len != 0xFFFFFFFF)
+    {
+      r = vec_new (char, len + 1);
+      p = unserialize_get (m, len);
+      clib_memcpy (r, p, len);
+
+      /* Null terminate. */
+      r[len] = 0;
+    }
+  *s = r;
+}
+
+/* vec_serialize/vec_unserialize helper functions for basic vector types. */
+void
+serialize_vec_8 (serialize_main_t * m, va_list * va)
+{
+  u8 *s = va_arg (*va, u8 *);
+  u32 n = va_arg (*va, u32);
+  u8 *p = serialize_get (m, n * sizeof (u8));
+  clib_memcpy (p, s, n * sizeof (u8));
+}
+
+void
+unserialize_vec_8 (serialize_main_t * m, va_list * va)
+{
+  u8 *s = va_arg (*va, u8 *);
+  u32 n = va_arg (*va, u32);
+  u8 *p = unserialize_get (m, n);
+  clib_memcpy (s, p, n);
+}
+
+#define _(n_bits)							\
+  void serialize_vec_##n_bits (serialize_main_t * m, va_list * va)	\
+  {									\
+    u##n_bits * s = va_arg (*va, u##n_bits *);				\
+    u32 n = va_arg (*va, u32);						\
+    u##n_bits * p = serialize_get (m, n * sizeof (s[0]));		\
+									\
+    while (n >= 4)							\
+      {									\
+	p[0] = clib_host_to_net_u##n_bits (s[0]);			\
+	p[1] = clib_host_to_net_u##n_bits (s[1]);			\
+	p[2] = clib_host_to_net_u##n_bits (s[2]);			\
+	p[3] = clib_host_to_net_u##n_bits (s[3]);			\
+	s += 4;								\
+	p += 4;								\
+	n -= 4;								\
+      }									\
+									\
+    while (n >= 1)							\
+      {									\
+	p[0] = clib_host_to_net_u##n_bits (s[0]);			\
+	s += 1;								\
+	p += 1;								\
+	n -= 1;								\
+      }									\
+  }									\
+									\
+  void unserialize_vec_##n_bits (serialize_main_t * m, va_list * va)	\
+  {									\
+    u##n_bits * s = va_arg (*va, u##n_bits *);				\
+    u32 n = va_arg (*va, u32);						\
+    u##n_bits * p = unserialize_get (m, n * sizeof (s[0]));		\
+									\
+    while (n >= 4)							\
+      {									\
+	s[0] = clib_net_to_host_mem_u##n_bits (&p[0]);			\
+	s[1] = clib_net_to_host_mem_u##n_bits (&p[1]);			\
+	s[2] = clib_net_to_host_mem_u##n_bits (&p[2]);			\
+	s[3] = clib_net_to_host_mem_u##n_bits (&p[3]);			\
+	s += 4;								\
+	p += 4;								\
+	n -= 4;								\
+      }									\
+									\
+    while (n >= 1)							\
+      {									\
+	s[0] = clib_net_to_host_mem_u##n_bits (&p[0]);			\
+	s += 1;								\
+	p += 1;								\
+	n -= 1;								\
+      }									\
+  }
+
+_(16);
+_(32);
+_(64);
+
+#undef _
+
+#define SERIALIZE_VECTOR_CHUNK_SIZE 64
+
+void
+serialize_vector (serialize_main_t * m, va_list * va)
+{
+  void *vec = va_arg (*va, void *);
+  u32 elt_bytes = va_arg (*va, u32);
+  serialize_function_t *f = va_arg (*va, serialize_function_t *);
+  u32 l = vec_len (vec);
+  void *p = vec;
+
+  serialize_integer (m, l, sizeof (l));
+
+  /* Serialize vector in chunks for cache locality. */
+  while (l != 0)
+    {
+      u32 n = clib_min (SERIALIZE_VECTOR_CHUNK_SIZE, l);
+      serialize (m, f, p, n);
+      l -= n;
+      p += SERIALIZE_VECTOR_CHUNK_SIZE * elt_bytes;
+    }
+}
+
+void *
+unserialize_vector_ha (serialize_main_t * m,
+		       u32 elt_bytes,
+		       u32 header_bytes,
+		       u32 align, u32 max_length, serialize_function_t * f)
+{
+  void *v, *p;
+  u32 l;
+
+  unserialize_integer (m, &l, sizeof (l));
+  if (l > max_length)
+    serialize_error (&m->header,
+		     clib_error_create ("bad vector length %d", l));
+  p = v = _vec_resize (0, l, (uword) l * elt_bytes, header_bytes,
+		       /* align */ align);
+
+  while (l != 0)
+    {
+      u32 n = clib_min (SERIALIZE_VECTOR_CHUNK_SIZE, l);
+      unserialize (m, f, p, n);
+      l -= n;
+      p += SERIALIZE_VECTOR_CHUNK_SIZE * elt_bytes;
+    }
+  return v;
+}
+
+void
+unserialize_aligned_vector (serialize_main_t * m, va_list * va)
+{
+  void **vec = va_arg (*va, void **);
+  u32 elt_bytes = va_arg (*va, u32);
+  serialize_function_t *f = va_arg (*va, serialize_function_t *);
+  u32 align = va_arg (*va, u32);
+
+  *vec = unserialize_vector_ha (m, elt_bytes,
+				/* header_bytes */ 0,
+				/* align */ align,
+				/* max_length */ ~0,
+				f);
+}
+
+void
+unserialize_vector (serialize_main_t * m, va_list * va)
+{
+  void **vec = va_arg (*va, void **);
+  u32 elt_bytes = va_arg (*va, u32);
+  serialize_function_t *f = va_arg (*va, serialize_function_t *);
+
+  *vec = unserialize_vector_ha (m, elt_bytes,
+				/* header_bytes */ 0,
+				/* align */ 0,
+				/* max_length */ ~0,
+				f);
+}
+
+void
+serialize_bitmap (serialize_main_t * m, uword * b)
+{
+  u32 l, i, n_u32s;
+
+  l = vec_len (b);
+  n_u32s = l * sizeof (b[0]) / sizeof (u32);
+  serialize_integer (m, n_u32s, sizeof (n_u32s));
+
+  /* Send 32 bit words, low-order word first on 64 bit. */
+  for (i = 0; i < l; i++)
+    {
+      serialize_integer (m, b[i], sizeof (u32));
+      if (BITS (uword) == 64)
+	serialize_integer (m, (u64) b[i] >> (u64) 32, sizeof (u32));
+    }
+}
+
+uword *
+unserialize_bitmap (serialize_main_t * m)
+{
+  uword *b = 0;
+  u32 i, n_u32s;
+
+  unserialize_integer (m, &n_u32s, sizeof (n_u32s));
+  if (n_u32s == 0)
+    return b;
+
+  i = (n_u32s * sizeof (u32) + sizeof (b[0]) - 1) / sizeof (b[0]);
+  vec_resize (b, i);
+  for (i = 0; i < n_u32s; i++)
+    {
+      u32 data;
+      unserialize_integer (m, &data, sizeof (u32));
+
+      /* Low-word is first on 64 bit. */
+      if (BITS (uword) == 64)
+	{
+	  if ((i % 2) == 0)
+	    b[i / 2] |= (u64) data << (u64) 0;
+	  else
+	    b[i / 2] |= (u64) data << (u64) 32;
+	}
+      else
+	{
+	  b[i] = data;
+	}
+    }
+
+  return b;
+}
+
+void
+serialize_pool (serialize_main_t * m, va_list * va)
+{
+  void *pool = va_arg (*va, void *);
+  u32 elt_bytes = va_arg (*va, u32);
+  serialize_function_t *f = va_arg (*va, serialize_function_t *);
+  u32 l, lo, hi;
+  pool_header_t *p;
+
+  l = vec_len (pool);
+  serialize_integer (m, l, sizeof (u32));
+  if (l == 0)
+    return;
+  p = pool_header (pool);
+
+  /* No need to send free bitmap.  Need to send index vector
+     to guarantee that unserialized pool will be identical. */
+  vec_serialize (m, p->free_indices, serialize_vec_32);
+
+  pool_foreach_region (lo, hi, pool,
+		       serialize (m, f, pool + lo * elt_bytes, hi - lo));
+}
+
+static void *
+unserialize_pool_helper (serialize_main_t * m,
+			 u32 elt_bytes, u32 align, serialize_function_t * f)
+{
+  void *v;
+  u32 i, l, lo, hi;
+  pool_header_t *p;
+
+  unserialize_integer (m, &l, sizeof (l));
+  if (l == 0)
+    {
+      return 0;
+    }
+
+  v = _vec_resize (0, l, (uword) l * elt_bytes, sizeof (p[0]), align);
+  p = pool_header (v);
+
+  vec_unserialize (m, &p->free_indices, unserialize_vec_32);
+
+  /* Construct free bitmap. */
+  p->free_bitmap = 0;
+  for (i = 0; i < vec_len (p->free_indices); i++)
+    p->free_bitmap = clib_bitmap_ori (p->free_bitmap, p->free_indices[i]);
+
+  pool_foreach_region (lo, hi, v,
+		       unserialize (m, f, v + lo * elt_bytes, hi - lo));
+
+  return v;
+}
+
+void
+unserialize_pool (serialize_main_t * m, va_list * va)
+{
+  void **result = va_arg (*va, void **);
+  u32 elt_bytes = va_arg (*va, u32);
+  serialize_function_t *f = va_arg (*va, serialize_function_t *);
+  *result = unserialize_pool_helper (m, elt_bytes, /* align */ 0, f);
+}
+
+void
+unserialize_aligned_pool (serialize_main_t * m, va_list * va)
+{
+  void **result = va_arg (*va, void **);
+  u32 elt_bytes = va_arg (*va, u32);
+  u32 align = va_arg (*va, u32);
+  serialize_function_t *f = va_arg (*va, serialize_function_t *);
+  *result = unserialize_pool_helper (m, elt_bytes, align, f);
+}
+
+static void
+serialize_vec_heap_elt (serialize_main_t * m, va_list * va)
+{
+  heap_elt_t *e = va_arg (*va, heap_elt_t *);
+  u32 i, n = va_arg (*va, u32);
+  for (i = 0; i < n; i++)
+    {
+      serialize_integer (m, e[i].offset, sizeof (e[i].offset));
+      serialize_integer (m, e[i].next, sizeof (e[i].next));
+      serialize_integer (m, e[i].prev, sizeof (e[i].prev));
+    }
+}
+
+static void
+unserialize_vec_heap_elt (serialize_main_t * m, va_list * va)
+{
+  heap_elt_t *e = va_arg (*va, heap_elt_t *);
+  u32 i, n = va_arg (*va, u32);
+  for (i = 0; i < n; i++)
+    {
+      unserialize_integer (m, &e[i].offset, sizeof (e[i].offset));
+      unserialize_integer (m, &e[i].next, sizeof (e[i].next));
+      unserialize_integer (m, &e[i].prev, sizeof (e[i].prev));
+    }
+}
+
+void
+serialize_heap (serialize_main_t * m, va_list * va)
+{
+  void *heap = va_arg (*va, void *);
+  serialize_function_t *f = va_arg (*va, serialize_function_t *);
+  u32 i, l;
+  heap_header_t *h;
+
+  l = vec_len (heap);
+  serialize_integer (m, l, sizeof (u32));
+  if (l == 0)
+    return;
+
+  h = heap_header (heap);
+
+#define foreach_serialize_heap_header_integer \
+  _ (head) _ (tail) _ (used_count) _ (max_len) _ (flags) _ (elt_bytes)
+
+#define _(f) serialize_integer (m, h->f, sizeof (h->f));
+  foreach_serialize_heap_header_integer;
+#undef _
+
+  serialize_integer (m, vec_len (h->free_lists), sizeof (u32));
+  for (i = 0; i < vec_len (h->free_lists); i++)
+    vec_serialize (m, h->free_lists[i], serialize_vec_32);
+
+  vec_serialize (m, h->elts, serialize_vec_heap_elt);
+  vec_serialize (m, h->small_free_elt_free_index, serialize_vec_32);
+  vec_serialize (m, h->free_elts, serialize_vec_32);
+
+  /* Serialize data in heap. */
+  {
+    heap_elt_t *e, *end;
+    e = h->elts + h->head;
+    end = h->elts + h->tail;
+    while (1)
+      {
+	if (!heap_is_free (e))
+	  {
+	    void *v = heap + heap_offset (e) * h->elt_bytes;
+	    u32 n = heap_elt_size (heap, e);
+	    serialize (m, f, v, n);
+	  }
+	if (e == end)
+	  break;
+	e = heap_next (e);
+      }
+  }
+}
+
+void
+unserialize_heap (serialize_main_t * m, va_list * va)
+{
+  void **result = va_arg (*va, void **);
+  serialize_function_t *f = va_arg (*va, serialize_function_t *);
+  u32 i, vl, fl;
+  heap_header_t h;
+  void *heap;
+
+  unserialize_integer (m, &vl, sizeof (u32));
+  if (vl == 0)
+    {
+      *result = 0;
+      return;
+    }
+
+  memset (&h, 0, sizeof (h));
+#define _(f) unserialize_integer (m, &h.f, sizeof (h.f));
+  foreach_serialize_heap_header_integer;
+#undef _
+
+  unserialize_integer (m, &fl, sizeof (u32));
+  vec_resize (h.free_lists, fl);
+
+  for (i = 0; i < vec_len (h.free_lists); i++)
+    vec_unserialize (m, &h.free_lists[i], unserialize_vec_32);
+
+  vec_unserialize (m, &h.elts, unserialize_vec_heap_elt);
+  vec_unserialize (m, &h.small_free_elt_free_index, unserialize_vec_32);
+  vec_unserialize (m, &h.free_elts, unserialize_vec_32);
+
+  /* Re-construct used elt bitmap. */
+  if (CLIB_DEBUG > 0)
+    {
+      heap_elt_t *e;
+      vec_foreach (e, h.elts)
+      {
+	if (!heap_is_free (e))
+	  h.used_elt_bitmap = clib_bitmap_ori (h.used_elt_bitmap, e - h.elts);
+      }
+    }
+
+  heap = *result = _heap_new (vl, h.elt_bytes);
+  heap_header (heap)[0] = h;
+
+  /* Unserialize data in heap. */
+  {
+    heap_elt_t *e, *end;
+    e = h.elts + h.head;
+    end = h.elts + h.tail;
+    while (1)
+      {
+	if (!heap_is_free (e))
+	  {
+	    void *v = heap + heap_offset (e) * h.elt_bytes;
+	    u32 n = heap_elt_size (heap, e);
+	    unserialize (m, f, v, n);
+	  }
+	if (e == end)
+	  break;
+	e = heap_next (e);
+      }
+  }
+}
+
+void
+serialize_magic (serialize_main_t * m, void *magic, u32 magic_bytes)
+{
+  void *p;
+  serialize_integer (m, magic_bytes, sizeof (magic_bytes));
+  p = serialize_get (m, magic_bytes);
+  clib_memcpy (p, magic, magic_bytes);
+}
+
+void
+unserialize_check_magic (serialize_main_t * m, void *magic, u32 magic_bytes)
+{
+  u32 l;
+  void *d;
+
+  unserialize_integer (m, &l, sizeof (l));
+  if (l != magic_bytes)
+    {
+    bad:
+      serialize_error_return (m, "bad magic number");
+    }
+  d = serialize_get (m, magic_bytes);
+  if (memcmp (magic, d, magic_bytes))
+    goto bad;
+}
+
+clib_error_t *
+va_serialize (serialize_main_t * sm, va_list * va)
+{
+  serialize_main_header_t *m = &sm->header;
+  serialize_function_t *f = va_arg (*va, serialize_function_t *);
+  clib_error_t *error = 0;
+
+  m->recursion_level += 1;
+  if (m->recursion_level == 1)
+    {
+      uword r = clib_setjmp (&m->error_longjmp, 0);
+      error = uword_to_pointer (r, clib_error_t *);
+    }
+
+  if (!error)
+    f (sm, va);
+
+  m->recursion_level -= 1;
+  return error;
+}
+
+clib_error_t *
+serialize (serialize_main_t * m, ...)
+{
+  clib_error_t *error;
+  va_list va;
+
+  va_start (va, m);
+  error = va_serialize (m, &va);
+  va_end (va);
+  return error;
+}
+
+clib_error_t *
+unserialize (serialize_main_t * m, ...)
+{
+  clib_error_t *error;
+  va_list va;
+
+  va_start (va, m);
+  error = va_serialize (m, &va);
+  va_end (va);
+  return error;
+}
+
+static void *
+serialize_write_not_inline (serialize_main_header_t * m,
+			    serialize_stream_t * s,
+			    uword n_bytes_to_write, uword flags)
+{
+  uword cur_bi, n_left_b, n_left_o;
+
+  ASSERT (s->current_buffer_index <= s->n_buffer_bytes);
+  cur_bi = s->current_buffer_index;
+  n_left_b = s->n_buffer_bytes - cur_bi;
+  n_left_o = vec_len (s->overflow_buffer);
+
+  /* Prepend overflow buffer if present. */
+  do
+    {
+      if (n_left_o > 0 && n_left_b > 0)
+	{
+	  uword n = clib_min (n_left_b, n_left_o);
+	  clib_memcpy (s->buffer + cur_bi, s->overflow_buffer, n);
+	  cur_bi += n;
+	  n_left_b -= n;
+	  n_left_o -= n;
+	  if (n_left_o == 0)
+	    _vec_len (s->overflow_buffer) = 0;
+	  else
+	    vec_delete (s->overflow_buffer, n, 0);
+	}
+
+      /* Call data function when buffer is complete.  Data function should
+         dispatch with current buffer and give us a new one to write more
+         data into. */
+      if (n_left_b == 0)
+	{
+	  s->current_buffer_index = cur_bi;
+	  m->data_function (m, s);
+	  cur_bi = s->current_buffer_index;
+	  n_left_b = s->n_buffer_bytes - cur_bi;
+	}
+    }
+  while (n_left_o > 0);
+
+  if (n_left_o > 0 || n_left_b < n_bytes_to_write)
+    {
+      u8 *r;
+      vec_add2 (s->overflow_buffer, r, n_bytes_to_write);
+      return r;
+    }
+  else
+    {
+      s->current_buffer_index = cur_bi + n_bytes_to_write;
+      return s->buffer + cur_bi;
+    }
+}
+
+static void *
+serialize_read_not_inline (serialize_main_header_t * m,
+			   serialize_stream_t * s,
+			   uword n_bytes_to_read, uword flags)
+{
+  uword cur_bi, cur_oi, n_left_b, n_left_o, n_left_to_read;
+
+  ASSERT (s->current_buffer_index <= s->n_buffer_bytes);
+
+  cur_bi = s->current_buffer_index;
+  cur_oi = s->current_overflow_index;
+
+  n_left_b = s->n_buffer_bytes - cur_bi;
+  n_left_o = vec_len (s->overflow_buffer) - cur_oi;
+
+  /* Read from overflow? */
+  if (n_left_o >= n_bytes_to_read)
+    {
+      s->current_overflow_index = cur_oi + n_bytes_to_read;
+      return vec_elt_at_index (s->overflow_buffer, cur_oi);
+    }
+
+  /* Reset overflow buffer. */
+  if (n_left_o == 0 && s->overflow_buffer)
+    {
+      s->current_overflow_index = 0;
+      _vec_len (s->overflow_buffer) = 0;
+    }
+
+  n_left_to_read = n_bytes_to_read;
+  while (n_left_to_read > 0)
+    {
+      uword n;
+
+      /* If we don't have enough data between overflow and normal buffer
+         call read function. */
+      if (n_left_o + n_left_b < n_bytes_to_read)
+	{
+	  /* Save any left over buffer in overflow vector. */
+	  if (n_left_b > 0)
+	    {
+	      vec_add (s->overflow_buffer, s->buffer + cur_bi, n_left_b);
+	      n_left_o += n_left_b;
+	      n_left_to_read -= n_left_b;
+	      /* Advance buffer to end --- even if
+	         SERIALIZE_FLAG_NO_ADVANCE_CURRENT_BUFFER_INDEX is set. */
+	      cur_bi = s->n_buffer_bytes;
+	      n_left_b = 0;
+	    }
+
+	  if (m->data_function)
+	    {
+	      m->data_function (m, s);
+	      cur_bi = s->current_buffer_index;
+	      n_left_b = s->n_buffer_bytes - cur_bi;
+	    }
+	}
+
+      /* For first time through loop return if we have enough data
+         in normal buffer and overflow vector is empty. */
+      if (n_left_o == 0
+	  && n_left_to_read == n_bytes_to_read && n_left_b >= n_left_to_read)
+	{
+	  s->current_buffer_index = cur_bi + n_bytes_to_read;
+	  return s->buffer + cur_bi;
+	}
+
+      if (!m->data_function || serialize_stream_is_end_of_stream (s))
+	{
+	  /* This can happen for a peek at end of file.
+	     Pad overflow buffer with 0s. */
+	  vec_resize (s->overflow_buffer, n_left_to_read);
+	  n_left_o += n_left_to_read;
+	  n_left_to_read = 0;
+	}
+      else
+	{
+	  /* Copy from buffer to overflow vector. */
+	  n = clib_min (n_left_to_read, n_left_b);
+	  vec_add (s->overflow_buffer, s->buffer + cur_bi, n);
+	  cur_bi += n;
+	  n_left_b -= n;
+	  n_left_o += n;
+	  n_left_to_read -= n;
+	}
+    }
+
+  s->current_buffer_index = cur_bi;
+  s->current_overflow_index = cur_oi + n_bytes_to_read;
+  return vec_elt_at_index (s->overflow_buffer, cur_oi);
+}
+
+void *
+serialize_read_write_not_inline (serialize_main_header_t * m,
+				 serialize_stream_t * s,
+				 uword n_bytes, uword flags)
+{
+  return (((flags & SERIALIZE_FLAG_IS_READ) ? serialize_read_not_inline :
+	   serialize_write_not_inline) (m, s, n_bytes, flags));
+}
+
+static void
+serialize_read_write_close (serialize_main_header_t * m,
+			    serialize_stream_t * s, uword flags)
+{
+  if (serialize_stream_is_end_of_stream (s))
+    return;
+
+  if (flags & SERIALIZE_FLAG_IS_WRITE)
+    /* "Write" 0 bytes to flush overflow vector. */
+    serialize_write_not_inline (m, s, /* n bytes */ 0, flags);
+
+  serialize_stream_set_end_of_stream (s);
+
+  /* Call it one last time to flush buffer and close. */
+  m->data_function (m, s);
+
+  vec_free (s->overflow_buffer);
+}
+
+void
+serialize_close (serialize_main_t * m)
+{
+  serialize_read_write_close (&m->header, &m->stream,
+			      SERIALIZE_FLAG_IS_WRITE);
+}
+
+void
+unserialize_close (serialize_main_t * m)
+{
+  serialize_read_write_close (&m->header, &m->stream, SERIALIZE_FLAG_IS_READ);
+}
+
+void
+serialize_open_data (serialize_main_t * m, u8 * data, uword n_data_bytes)
+{
+  memset (m, 0, sizeof (m[0]));
+  m->stream.buffer = data;
+  m->stream.n_buffer_bytes = n_data_bytes;
+}
+
+void
+unserialize_open_data (serialize_main_t * m, u8 * data, uword n_data_bytes)
+{
+  serialize_open_data (m, data, n_data_bytes);
+}
+
+static void
+serialize_vector_write (serialize_main_header_t * m, serialize_stream_t * s)
+{
+  if (!serialize_stream_is_end_of_stream (s))
+    {
+      /* Double buffer size. */
+      uword l = vec_len (s->buffer);
+      vec_resize (s->buffer, l > 0 ? l : 64);
+      s->n_buffer_bytes = vec_len (s->buffer);
+    }
+}
+
+void
+serialize_open_vector (serialize_main_t * m, u8 * vector)
+{
+  memset (m, 0, sizeof (m[0]));
+  m->header.data_function = serialize_vector_write;
+  m->stream.buffer = vector;
+  m->stream.current_buffer_index = 0;
+  m->stream.n_buffer_bytes = vec_len (vector);
+}
+
+void *
+serialize_close_vector (serialize_main_t * m)
+{
+  serialize_stream_t *s = &m->stream;
+  void *result;
+
+  serialize_close (m);		/* frees overflow buffer */
+
+  if (s->buffer)
+    _vec_len (s->buffer) = s->current_buffer_index;
+  result = s->buffer;
+  memset (m, 0, sizeof (m[0]));
+  return result;
+}
+
+void
+serialize_multiple_1 (serialize_main_t * m,
+		      void *data, uword data_stride, uword n_data)
+{
+  u8 *d = data;
+  u8 *p;
+  uword n_left = n_data;
+
+  while (n_left >= 4)
+    {
+      p = serialize_get (m, 4 * sizeof (d[0]));
+      p[0] = d[0 * data_stride];
+      p[1] = d[1 * data_stride];
+      p[2] = d[2 * data_stride];
+      p[3] = d[3 * data_stride];
+      n_left -= 4;
+      d += 4 * data_stride;
+    }
+
+  if (n_left > 0)
+    {
+      p = serialize_get (m, n_left * sizeof (p[0]));
+      while (n_left > 0)
+	{
+	  p[0] = d[0];
+	  p += 1;
+	  d += 1 * data_stride;
+	  n_left -= 1;
+	}
+    }
+}
+
+void
+serialize_multiple_2 (serialize_main_t * m,
+		      void *data, uword data_stride, uword n_data)
+{
+  void *d = data;
+  u16 *p;
+  uword n_left = n_data;
+
+  while (n_left >= 4)
+    {
+      p = serialize_get (m, 4 * sizeof (p[0]));
+      clib_mem_unaligned (p + 0, u16) =
+	clib_host_to_net_mem_u16 (d + 0 * data_stride);
+      clib_mem_unaligned (p + 1, u16) =
+	clib_host_to_net_mem_u16 (d + 1 * data_stride);
+      clib_mem_unaligned (p + 2, u16) =
+	clib_host_to_net_mem_u16 (d + 2 * data_stride);
+      clib_mem_unaligned (p + 3, u16) =
+	clib_host_to_net_mem_u16 (d + 3 * data_stride);
+      n_left -= 4;
+      d += 4 * data_stride;
+    }
+
+  if (n_left > 0)
+    {
+      p = serialize_get (m, n_left * sizeof (p[0]));
+      while (n_left > 0)
+	{
+	  clib_mem_unaligned (p + 0, u16) =
+	    clib_host_to_net_mem_u16 (d + 0 * data_stride);
+	  p += 1;
+	  d += 1 * data_stride;
+	  n_left -= 1;
+	}
+    }
+}
+
+void
+serialize_multiple_4 (serialize_main_t * m,
+		      void *data, uword data_stride, uword n_data)
+{
+  void *d = data;
+  u32 *p;
+  uword n_left = n_data;
+
+  while (n_left >= 4)
+    {
+      p = serialize_get (m, 4 * sizeof (p[0]));
+      clib_mem_unaligned (p + 0, u32) =
+	clib_host_to_net_mem_u32 (d + 0 * data_stride);
+      clib_mem_unaligned (p + 1, u32) =
+	clib_host_to_net_mem_u32 (d + 1 * data_stride);
+      clib_mem_unaligned (p + 2, u32) =
+	clib_host_to_net_mem_u32 (d + 2 * data_stride);
+      clib_mem_unaligned (p + 3, u32) =
+	clib_host_to_net_mem_u32 (d + 3 * data_stride);
+      n_left -= 4;
+      d += 4 * data_stride;
+    }
+
+  if (n_left > 0)
+    {
+      p = serialize_get (m, n_left * sizeof (p[0]));
+      while (n_left > 0)
+	{
+	  clib_mem_unaligned (p + 0, u32) =
+	    clib_host_to_net_mem_u32 (d + 0 * data_stride);
+	  p += 1;
+	  d += 1 * data_stride;
+	  n_left -= 1;
+	}
+    }
+}
+
+void
+unserialize_multiple_1 (serialize_main_t * m,
+			void *data, uword data_stride, uword n_data)
+{
+  u8 *d = data;
+  u8 *p;
+  uword n_left = n_data;
+
+  while (n_left >= 4)
+    {
+      p = unserialize_get (m, 4 * sizeof (d[0]));
+      d[0 * data_stride] = p[0];
+      d[1 * data_stride] = p[1];
+      d[2 * data_stride] = p[2];
+      d[3 * data_stride] = p[3];
+      n_left -= 4;
+      d += 4 * data_stride;
+    }
+
+  if (n_left > 0)
+    {
+      p = unserialize_get (m, n_left * sizeof (p[0]));
+      while (n_left > 0)
+	{
+	  d[0] = p[0];
+	  p += 1;
+	  d += 1 * data_stride;
+	  n_left -= 1;
+	}
+    }
+}
+
+void
+unserialize_multiple_2 (serialize_main_t * m,
+			void *data, uword data_stride, uword n_data)
+{
+  void *d = data;
+  u16 *p;
+  uword n_left = n_data;
+
+  while (n_left >= 4)
+    {
+      p = unserialize_get (m, 4 * sizeof (p[0]));
+      clib_mem_unaligned (d + 0 * data_stride, u16) =
+	clib_net_to_host_mem_u16 (p + 0);
+      clib_mem_unaligned (d + 1 * data_stride, u16) =
+	clib_net_to_host_mem_u16 (p + 1);
+      clib_mem_unaligned (d + 2 * data_stride, u16) =
+	clib_net_to_host_mem_u16 (p + 2);
+      clib_mem_unaligned (d + 3 * data_stride, u16) =
+	clib_net_to_host_mem_u16 (p + 3);
+      n_left -= 4;
+      d += 4 * data_stride;
+    }
+
+  if (n_left > 0)
+    {
+      p = unserialize_get (m, n_left * sizeof (p[0]));
+      while (n_left > 0)
+	{
+	  clib_mem_unaligned (d + 0 * data_stride, u16) =
+	    clib_net_to_host_mem_u16 (p + 0);
+	  p += 1;
+	  d += 1 * data_stride;
+	  n_left -= 1;
+	}
+    }
+}
+
+void
+unserialize_multiple_4 (serialize_main_t * m,
+			void *data, uword data_stride, uword n_data)
+{
+  void *d = data;
+  u32 *p;
+  uword n_left = n_data;
+
+  while (n_left >= 4)
+    {
+      p = unserialize_get (m, 4 * sizeof (p[0]));
+      clib_mem_unaligned (d + 0 * data_stride, u32) =
+	clib_net_to_host_mem_u32 (p + 0);
+      clib_mem_unaligned (d + 1 * data_stride, u32) =
+	clib_net_to_host_mem_u32 (p + 1);
+      clib_mem_unaligned (d + 2 * data_stride, u32) =
+	clib_net_to_host_mem_u32 (p + 2);
+      clib_mem_unaligned (d + 3 * data_stride, u32) =
+	clib_net_to_host_mem_u32 (p + 3);
+      n_left -= 4;
+      d += 4 * data_stride;
+    }
+
+  if (n_left > 0)
+    {
+      p = unserialize_get (m, n_left * sizeof (p[0]));
+      while (n_left > 0)
+	{
+	  clib_mem_unaligned (d + 0 * data_stride, u32) =
+	    clib_net_to_host_mem_u32 (p + 0);
+	  p += 1;
+	  d += 1 * data_stride;
+	  n_left -= 1;
+	}
+    }
+}
+
+#ifdef CLIB_UNIX
+
+#include <unistd.h>
+#include <fcntl.h>
+
+static void
+unix_file_write (serialize_main_header_t * m, serialize_stream_t * s)
+{
+  int fd, n;
+
+  fd = s->data_function_opaque;
+  n = write (fd, s->buffer, s->current_buffer_index);
+  if (n < 0)
+    {
+      if (!unix_error_is_fatal (errno))
+	n = 0;
+      else
+	serialize_error (m, clib_error_return_unix (0, "write"));
+    }
+  if (n == s->current_buffer_index)
+    _vec_len (s->buffer) = 0;
+  else
+    vec_delete (s->buffer, n, 0);
+  s->current_buffer_index = vec_len (s->buffer);
+}
+
+static void
+unix_file_read (serialize_main_header_t * m, serialize_stream_t * s)
+{
+  int fd, n;
+
+  fd = s->data_function_opaque;
+  n = read (fd, s->buffer, vec_len (s->buffer));
+  if (n < 0)
+    {
+      if (!unix_error_is_fatal (errno))
+	n = 0;
+      else
+	serialize_error (m, clib_error_return_unix (0, "read"));
+    }
+  else if (n == 0)
+    serialize_stream_set_end_of_stream (s);
+  s->current_buffer_index = 0;
+  s->n_buffer_bytes = n;
+}
+
+static void
+serialize_open_unix_file_descriptor_helper (serialize_main_t * m, int fd,
+					    uword is_read)
+{
+  memset (m, 0, sizeof (m[0]));
+  vec_resize (m->stream.buffer, 4096);
+
+  if (!is_read)
+    {
+      m->stream.n_buffer_bytes = vec_len (m->stream.buffer);
+      _vec_len (m->stream.buffer) = 0;
+    }
+
+  m->header.data_function = is_read ? unix_file_read : unix_file_write;
+  m->stream.data_function_opaque = fd;
+}
+
+void
+serialize_open_unix_file_descriptor (serialize_main_t * m, int fd)
+{
+  serialize_open_unix_file_descriptor_helper (m, fd, /* is_read */ 0);
+}
+
+void
+unserialize_open_unix_file_descriptor (serialize_main_t * m, int fd)
+{
+  serialize_open_unix_file_descriptor_helper (m, fd, /* is_read */ 1);
+}
+
+static clib_error_t *
+serialize_open_unix_file_helper (serialize_main_t * m, char *file,
+				 uword is_read)
+{
+  int fd, mode;
+
+  mode = is_read ? O_RDONLY : O_RDWR | O_CREAT | O_TRUNC;
+  fd = open (file, mode, 0666);
+  if (fd < 0)
+    return clib_error_return_unix (0, "open `%s'", file);
+
+  serialize_open_unix_file_descriptor_helper (m, fd, is_read);
+  return 0;
+}
+
+clib_error_t *
+serialize_open_unix_file (serialize_main_t * m, char *file)
+{
+  return serialize_open_unix_file_helper (m, file, /* is_read */ 0);
+}
+
+clib_error_t *
+unserialize_open_unix_file (serialize_main_t * m, char *file)
+{
+  return serialize_open_unix_file_helper (m, file, /* is_read */ 1);
+}
+
+#endif /* CLIB_UNIX */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/serialize.h b/src/vppinfra/serialize.h
new file mode 100644
index 00000000..6cc2372e
--- /dev/null
+++ b/src/vppinfra/serialize.h
@@ -0,0 +1,443 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_serialize_h
+#define included_clib_serialize_h
+
+#include <stdarg.h>
+#include <vppinfra/byte_order.h>
+#include <vppinfra/types.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/longjmp.h>
+
+struct serialize_main_header_t;
+struct serialize_stream_t;
+
+typedef void (serialize_data_function_t) (struct serialize_main_header_t * h,
+					  struct serialize_stream_t * s);
+
+typedef struct serialize_stream_t
+{
+  /* Current data buffer being serialized/unserialized. */
+  u8 *buffer;
+
+  /* Size of buffer in bytes. */
+  u32 n_buffer_bytes;
+
+  /* Current index into buffer. */
+  u32 current_buffer_index;
+
+  /* Overflow buffer for when there is not enough room at the end of
+     buffer to hold serialized/unserialized data. */
+  u8 *overflow_buffer;
+
+  /* Current index in overflow buffer for reads. */
+  u32 current_overflow_index;
+
+  u32 flags;
+#define SERIALIZE_END_OF_STREAM (1 << 0)
+
+  uword data_function_opaque;
+
+  u32 opaque[64 - 4 * sizeof (u32) - 1 * sizeof (uword) -
+	     2 * sizeof (void *)];
+} serialize_stream_t;
+
+always_inline void
+serialize_stream_set_end_of_stream (serialize_stream_t * s)
+{
+  s->flags |= SERIALIZE_END_OF_STREAM;
+}
+
+always_inline uword
+serialize_stream_is_end_of_stream (serialize_stream_t * s)
+{
+  return (s->flags & SERIALIZE_END_OF_STREAM) != 0;
+}
+
+typedef struct serialize_main_header_t
+{
+  u32 recursion_level;
+
+  /* Data callback function and opaque data. */
+  serialize_data_function_t *data_function;
+
+  /* Error if signaled by data function. */
+  clib_error_t *error;
+
+  /* Exit unwind point if error occurs. */
+  clib_longjmp_t error_longjmp;
+} serialize_main_header_t;
+
+always_inline void
+serialize_error (serialize_main_header_t * m, clib_error_t * error)
+{
+  clib_longjmp (&m->error_longjmp, pointer_to_uword (error));
+}
+
+#define serialize_error_return(m,args...)			\
+  serialize_error (&(m)->header, clib_error_return (0, args))
+
+void *serialize_read_write_not_inline (serialize_main_header_t * m,
+				       serialize_stream_t * s,
+				       uword n_bytes, uword flags);
+
+#define SERIALIZE_FLAG_IS_READ  (1 << 0)
+#define SERIALIZE_FLAG_IS_WRITE (1 << 1)
+
+always_inline void *
+serialize_stream_read_write (serialize_main_header_t * header,
+			     serialize_stream_t * s,
+			     uword n_bytes, uword flags)
+{
+  uword i, j, l;
+
+  l = vec_len (s->overflow_buffer);
+  i = s->current_buffer_index;
+  j = i + n_bytes;
+  s->current_buffer_index = j;
+  if (l == 0 && j <= s->n_buffer_bytes)
+    {
+      return s->buffer + i;
+    }
+  else
+    {
+      s->current_buffer_index = i;
+      return serialize_read_write_not_inline (header, s, n_bytes, flags);
+    }
+}
+
+typedef struct
+{
+  serialize_main_header_t header;
+  serialize_stream_t stream;
+} serialize_main_t;
+
+always_inline void
+serialize_set_end_of_stream (serialize_main_t * m)
+{
+  serialize_stream_set_end_of_stream (&m->stream);
+}
+
+always_inline uword
+serialize_is_end_of_stream (serialize_main_t * m)
+{
+  return serialize_stream_is_end_of_stream (&m->stream);
+}
+
+typedef struct
+{
+  serialize_main_header_t header;
+  serialize_stream_t *streams;
+} serialize_multiple_main_t;
+
+typedef void (serialize_function_t) (serialize_main_t * m, va_list * va);
+
+always_inline void *
+unserialize_get (serialize_main_t * m, uword n_bytes)
+{
+  return serialize_stream_read_write (&m->header, &m->stream, n_bytes,
+				      SERIALIZE_FLAG_IS_READ);
+}
+
+always_inline void *
+serialize_get (serialize_main_t * m, uword n_bytes)
+{
+  return serialize_stream_read_write (&m->header, &m->stream, n_bytes,
+				      SERIALIZE_FLAG_IS_WRITE);
+}
+
+always_inline void
+serialize_integer (serialize_main_t * m, u64 x, u32 n_bytes)
+{
+  u8 *p = serialize_get (m, n_bytes);
+  if (n_bytes == 1)
+    p[0] = x;
+  else if (n_bytes == 2)
+    clib_mem_unaligned (p, u16) = clib_host_to_net_u16 (x);
+  else if (n_bytes == 4)
+    clib_mem_unaligned (p, u32) = clib_host_to_net_u32 (x);
+  else if (n_bytes == 8)
+    clib_mem_unaligned (p, u64) = clib_host_to_net_u64 (x);
+  else
+    ASSERT (0);
+}
+
+always_inline void
+unserialize_integer (serialize_main_t * m, void *x, u32 n_bytes)
+{
+  u8 *p = unserialize_get (m, n_bytes);
+  if (n_bytes == 1)
+    *(u8 *) x = p[0];
+  else if (n_bytes == 2)
+    *(u16 *) x = clib_net_to_host_unaligned_mem_u16 ((u16 *) p);
+  else if (n_bytes == 4)
+    *(u32 *) x = clib_net_to_host_unaligned_mem_u32 ((u32 *) p);
+  else if (n_bytes == 8)
+    *(u64 *) x = clib_net_to_host_unaligned_mem_u64 ((u64 *) p);
+  else
+    ASSERT (0);
+}
+
+/* As above but tries to be more compact. */
+always_inline void
+serialize_likely_small_unsigned_integer (serialize_main_t * m, u64 x)
+{
+  u64 r = x;
+  u8 *p;
+
+  /* Low bit set means it fits into 1 byte. */
+  if (r < (1 << 7))
+    {
+      p = serialize_get (m, 1);
+      p[0] = 1 + 2 * r;
+      return;
+    }
+
+  /* Low 2 bits 1 0 means it fits into 2 bytes. */
+  r -= (1 << 7);
+  if (r < (1 << 14))
+    {
+      p = serialize_get (m, 2);
+      clib_mem_unaligned (p, u16) = clib_host_to_little_u16 (4 * r + 2);
+      return;
+    }
+
+  r -= (1 << 14);
+  if (r < (1 << 29))
+    {
+      p = serialize_get (m, 4);
+      clib_mem_unaligned (p, u32) = clib_host_to_little_u32 (8 * r + 4);
+      return;
+    }
+
+  p = serialize_get (m, 9);
+  p[0] = 0;			/* Only low 3 bits are used. */
+  clib_mem_unaligned (p + 1, u64) = clib_host_to_little_u64 (x);
+}
+
+always_inline u64
+unserialize_likely_small_unsigned_integer (serialize_main_t * m)
+{
+  u8 *p = unserialize_get (m, 1);
+  u64 r;
+  u32 y = p[0];
+
+  if (y & 1)
+    return y / 2;
+
+  r = 1 << 7;
+  if (y & 2)
+    {
+      p = unserialize_get (m, 1);
+      r += (y / 4) + (p[0] << 6);
+      return r;
+    }
+
+  r += 1 << 14;
+  if (y & 4)
+    {
+      p = unserialize_get (m, 3);
+      r += ((y / 8)
+	    + (p[0] << (5 + 8 * 0))
+	    + (p[1] << (5 + 8 * 1)) + (p[2] << (5 + 8 * 2)));
+      return r;
+    }
+
+  p = unserialize_get (m, 8);
+  r = clib_mem_unaligned (p, u64);
+  r = clib_little_to_host_u64 (r);
+
+  return r;
+}
+
+always_inline void
+serialize_likely_small_signed_integer (serialize_main_t * m, i64 s)
+{
+  u64 u = s < 0 ? -(2 * s + 1) : 2 * s;
+  serialize_likely_small_unsigned_integer (m, u);
+}
+
+always_inline i64
+unserialize_likely_small_signed_integer (serialize_main_t * m)
+{
+  u64 u = unserialize_likely_small_unsigned_integer (m);
+  i64 s = u / 2;
+  return (u & 1) ? -s : s;
+}
+
+void
+serialize_multiple_1 (serialize_main_t * m,
+		      void *data, uword data_stride, uword n_data);
+void
+serialize_multiple_2 (serialize_main_t * m,
+		      void *data, uword data_stride, uword n_data);
+void
+serialize_multiple_4 (serialize_main_t * m,
+		      void *data, uword data_stride, uword n_data);
+
+void
+unserialize_multiple_1 (serialize_main_t * m,
+			void *data, uword data_stride, uword n_data);
+void
+unserialize_multiple_2 (serialize_main_t * m,
+			void *data, uword data_stride, uword n_data);
+void
+unserialize_multiple_4 (serialize_main_t * m,
+			void *data, uword data_stride, uword n_data);
+
+always_inline void
+serialize_multiple (serialize_main_t * m,
+		    void *data,
+		    uword n_data_bytes, uword data_stride, uword n_data)
+{
+  if (n_data_bytes == 1)
+    serialize_multiple_1 (m, data, data_stride, n_data);
+  else if (n_data_bytes == 2)
+    serialize_multiple_2 (m, data, data_stride, n_data);
+  else if (n_data_bytes == 4)
+    serialize_multiple_4 (m, data, data_stride, n_data);
+  else
+    ASSERT (0);
+}
+
+always_inline void
+unserialize_multiple (serialize_main_t * m,
+		      void *data,
+		      uword n_data_bytes, uword data_stride, uword n_data)
+{
+  if (n_data_bytes == 1)
+    unserialize_multiple_1 (m, data, data_stride, n_data);
+  else if (n_data_bytes == 2)
+    unserialize_multiple_2 (m, data, data_stride, n_data);
+  else if (n_data_bytes == 4)
+    unserialize_multiple_4 (m, data, data_stride, n_data);
+  else
+    ASSERT (0);
+}
+
+/* Basic types. */
+serialize_function_t serialize_64, unserialize_64;
+serialize_function_t serialize_32, unserialize_32;
+serialize_function_t serialize_16, unserialize_16;
+serialize_function_t serialize_8, unserialize_8;
+serialize_function_t serialize_f64, unserialize_f64;
+serialize_function_t serialize_f32, unserialize_f32;
+
+/* Basic vector types. */
+serialize_function_t serialize_vec_8, unserialize_vec_8;
+serialize_function_t serialize_vec_16, unserialize_vec_16;
+serialize_function_t serialize_vec_32, unserialize_vec_32;
+serialize_function_t serialize_vec_64, unserialize_vec_64;
+
+/* Serialize generic vectors. */
+serialize_function_t serialize_vector, unserialize_vector,
+  unserialize_aligned_vector;
+
+#define vec_serialize(m,v,f) \
+  serialize ((m), serialize_vector, (v), sizeof ((v)[0]), (f))
+
+#define vec_unserialize(m,v,f) \
+  unserialize ((m), unserialize_vector, (v), sizeof ((*(v))[0]), (f))
+
+#define vec_unserialize_aligned(m,v,f) \
+  unserialize ((m), unserialize_aligned_vector, (v), sizeof ((*(v))[0]), (f))
+
+/* Serialize pools. */
+serialize_function_t serialize_pool, unserialize_pool,
+  unserialize_aligned_pool;
+
+#define pool_serialize(m,v,f) \
+  serialize ((m), serialize_pool, (v), sizeof ((v)[0]), (f))
+
+#define pool_unserialize(m,v,f) \
+  unserialize ((m), unserialize_pool, (v), sizeof ((*(v))[0]), (f))
+
+#define pool_unserialize_aligned(m,v,a,f)				\
+  unserialize ((m), unserialize_aligned_pool, (v), sizeof ((*(v))[0]), (a), (f))
+
+/* Serialize heaps. */
+serialize_function_t serialize_heap, unserialize_heap;
+
+void serialize_bitmap (serialize_main_t * m, uword * b);
+uword *unserialize_bitmap (serialize_main_t * m);
+
+void serialize_cstring (serialize_main_t * m, char *string);
+void unserialize_cstring (serialize_main_t * m, char **string);
+
+void serialize_close (serialize_main_t * m);
+void unserialize_close (serialize_main_t * m);
+
+void serialize_open_data (serialize_main_t * m, u8 * data,
+			  uword n_data_bytes);
+void unserialize_open_data (serialize_main_t * m, u8 * data,
+			    uword n_data_bytes);
+
+/* Starts serialization with expanding vector as buffer. */
+void serialize_open_vector (serialize_main_t * m, u8 * vector);
+
+/* Serialization is done: returns vector buffer to caller. */
+void *serialize_close_vector (serialize_main_t * m);
+
+void unserialize_open_vector (serialize_main_t * m, u8 * vector);
+
+#ifdef CLIB_UNIX
+clib_error_t *serialize_open_unix_file (serialize_main_t * m, char *file);
+clib_error_t *unserialize_open_unix_file (serialize_main_t * m, char *file);
+
+void serialize_open_unix_file_descriptor (serialize_main_t * m, int fd);
+void unserialize_open_unix_file_descriptor (serialize_main_t * m, int fd);
+#endif /* CLIB_UNIX */
+
+/* Main routines. */
+clib_error_t *serialize (serialize_main_t * m, ...);
+clib_error_t *unserialize (serialize_main_t * m, ...);
+clib_error_t *va_serialize (serialize_main_t * m, va_list * va);
+
+void serialize_magic (serialize_main_t * m, void *magic, u32 magic_bytes);
+void unserialize_check_magic (serialize_main_t * m, void *magic,
+			      u32 magic_bytes);
+
+#endif /* included_clib_serialize_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/slist.c b/src/vppinfra/slist.c
new file mode 100644
index 00000000..892517bb
--- /dev/null
+++ b/src/vppinfra/slist.c
@@ -0,0 +1,336 @@
+/*
+  Copyright (c) 2012 Cisco and/or its affiliates.
+
+  * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#include <vppinfra/slist.h>
+
+/*
+ * skip-list implementation
+ *
+ * Good news / bad news. As balanced binary tree schemes go,
+ * this one seems pretty fast and is reasonably simple. There's a very
+ * limited amount that can be done to mitigate sdram read latency.
+ *
+ * Each active clib_slist_elt_t is on from 1 to N lists. Each active element
+ * is always on the "level-0" list. Since most elements are *only* on
+ * level 0, we keep the level 0 (and level 1) in the element. For those
+ * elements on more than two lists, we switch to a vector. Hence, the
+ * "n" union in slib_slist_elt_t.
+ *
+ * The low-order bit of elt->n.next0[0] is 1 for inlined next indices,
+ * 0 for vector indices (since the allocator always aligns to at least
+ * a 4-byte boundary). We can only represent 2e9 items, but since the
+ * practical performance limit is O(1e7), it doesn't matter.
+ *
+ * We create a "head" element which (by construction) is always
+ * lexically lighter than any other element. This makes a large number
+ * of irritating special cases go away.
+ *
+ * User code is in charge of comparing a supplied key with
+ * the key component of a user pool element. The user tells this code
+ * to add or delete (opaque key, 32-bit integer) pairs to the skip-list.
+ *
+ * The algorithm adds new elements to one or more lists.
+ * For levels greater than zero, the probability of a new element landing on
+ * a list is branching_factor**N. Branching_factor = 0.2 seems to work
+ * OK, yielding about 50 compares per search at O(1e7) items.
+ */
+
+clib_error_t *
+clib_slist_init (clib_slist_t * sp, f64 branching_factor,
+		 clib_slist_key_compare_function_t compare,
+		 format_function_t format_user_element)
+{
+  clib_slist_elt_t *head;
+  memset (sp, 0, sizeof (sp[0]));
+  sp->branching_factor = branching_factor;
+  sp->format_user_element = format_user_element;
+  sp->compare = compare;
+  sp->seed = 0xdeaddabe;
+  pool_get (sp->elts, head);
+  vec_add1 (head->n.nexts, (u32) ~ 0);
+  head->user_pool_index = (u32) ~ 0;
+  vec_validate (sp->path, 1);
+  vec_validate (sp->occupancy, 0);
+
+  return 0;
+}
+
+/*
+ * slist_search_internal
+ */
+static inline clib_slist_search_result_t
+slist_search_internal (clib_slist_t * sp, void *key, int need_full_path)
+{
+  int level, comp_result;
+  clib_slist_elt_t *search_elt, *head_elt;
+
+  sp->ncompares = 0;
+  /*
+   * index 0 is the magic listhead element which is
+   * lexically lighter than / to the left of every element
+   */
+  search_elt = head_elt = pool_elt_at_index (sp->elts, 0);
+
+  /*
+   * Initial negotiating position, only the head_elt is
+   * lighter than the supplied key
+   */
+  memset (sp->path, 0, vec_len (head_elt->n.nexts) * sizeof (u32));
+
+  /* Walk the fastest lane first */
+  level = vec_len (head_elt->n.nexts) - 1;
+  _vec_len (sp->path) = level + 1;
+
+  while (1)
+    {
+      u32 next_index_this_level;
+      clib_slist_elt_t *prefetch_elt;
+
+      /*
+       * Prefetching the next element at this level makes a measurable
+       * difference, but doesn't fix the dependent read stall problem
+       */
+      prefetch_elt = sp->elts +
+	clib_slist_get_next_at_level (search_elt, level);
+
+      CLIB_PREFETCH (prefetch_elt, CLIB_CACHE_LINE_BYTES, READ);
+
+      /* Compare the key with the current element */
+      comp_result = (search_elt == head_elt) ? 1 :
+	sp->compare (key, search_elt->user_pool_index);
+
+      sp->ncompares++;
+      /* key "lighter" than this element */
+      if (comp_result < 0)
+	{
+	  /*
+	   * Back up to previous item on this list
+	   * and search the next finer-grained list
+	   * starting there.
+	   */
+	  search_elt = pool_elt_at_index (sp->elts, sp->path[level]);
+	next_list:
+	  if (level > 0)
+	    {
+	      level--;
+	      continue;
+	    }
+	  else
+	    {
+	      return CLIB_SLIST_NO_MATCH;
+	    }
+	}
+      /* Match */
+      if (comp_result == 0)
+	{
+	  /*
+	   * If we're trying to delete an element, we need to
+	   * track down all of the elements which point at it.
+	   * Otherwise, don't bother with it
+	   */
+	  if (need_full_path && level > 0)
+	    {
+	      search_elt = pool_elt_at_index (sp->elts, sp->path[level]);
+	      level--;
+	      continue;
+	    }
+	  level = vec_len (head_elt->n.nexts);
+	  sp->path[level] = search_elt - sp->elts;
+	  _vec_len (sp->path) = level + 1;
+	  return CLIB_SLIST_MATCH;
+	}
+      /*
+       * comp_result positive, key is to the right of
+       * this element
+       */
+      sp->path[level] = search_elt - sp->elts;
+
+      /* Out of list at this level? */
+      next_index_this_level =
+	clib_slist_get_next_at_level (search_elt, level);
+      if (next_index_this_level == (u32) ~ 0)
+	goto next_list;
+
+      /* No, try the next element */
+      search_elt = pool_elt_at_index (sp->elts, next_index_this_level);
+    }
+  return 0;			/* notreached */
+}
+
+u32
+clib_slist_search (clib_slist_t * sp, void *key, u32 * ncompares)
+{
+  clib_slist_search_result_t rv;
+
+  rv = slist_search_internal (sp, key, 0 /* dont need full path */ );
+  if (rv == CLIB_SLIST_MATCH)
+    {
+      clib_slist_elt_t *elt;
+      elt = pool_elt_at_index (sp->elts, sp->path[vec_len (sp->path) - 1]);
+      if (ncompares)
+	*ncompares = sp->ncompares;
+      return elt->user_pool_index;
+    }
+  return (u32) ~ 0;
+}
+
+void
+clib_slist_add (clib_slist_t * sp, void *key, u32 user_pool_index)
+{
+  clib_slist_elt_t *new_elt;
+  clib_slist_search_result_t search_result;
+  int level;
+
+  search_result = slist_search_internal (sp, key,
+					 0 /* don't need full path */ );
+
+  /* Special case: key exists, just replace user_pool_index */
+  if (PREDICT_FALSE (search_result == CLIB_SLIST_MATCH))
+    {
+      clib_slist_elt_t *elt;
+      elt = pool_elt_at_index (sp->elts, sp->path[0]);
+      elt->user_pool_index = user_pool_index;
+      return;
+    }
+
+  pool_get (sp->elts, new_elt);
+  new_elt->n.nexts = 0;
+  new_elt->user_pool_index = user_pool_index;
+
+  /* sp->path lists elements to the left of key, by level */
+  for (level = 0; level < vec_len (sp->path); level++)
+    {
+      clib_slist_elt_t *prev_elt_this_level;
+      u32 prev_elt_next_index_this_level;
+
+      /* Add to list at the current level */
+      prev_elt_this_level = pool_elt_at_index (sp->elts, sp->path[level]);
+      prev_elt_next_index_this_level = clib_slist_get_next_at_level
+	(prev_elt_this_level, level);
+
+      clib_slist_set_next_at_level (new_elt, prev_elt_next_index_this_level,
+				    level);
+
+      clib_slist_set_next_at_level (prev_elt_this_level, new_elt - sp->elts,
+				    level);
+      sp->occupancy[level]++;
+
+      /* Randomly add to the next-higher level */
+      if (random_f64 (&sp->seed) > sp->branching_factor)
+	break;
+    }
+  {
+    /* Time to add a new ply? */
+    clib_slist_elt_t *head_elt = pool_elt_at_index (sp->elts, 0);
+    int top_level = vec_len (head_elt->n.nexts) - 1;
+    if (((f64) sp->occupancy[top_level]) * sp->branching_factor > 1.0)
+      {
+	vec_add1 (sp->occupancy, 0);
+	vec_add1 (head_elt->n.nexts, (u32) ~ 0);
+	/* full match case returns n+1 items */
+	vec_validate (sp->path, vec_len (head_elt->n.nexts));
+      }
+  }
+}
+
+clib_slist_search_result_t
+clib_slist_del (clib_slist_t * sp, void *key)
+{
+  clib_slist_search_result_t search_result;
+  clib_slist_elt_t *del_elt;
+  int level;
+
+  search_result = slist_search_internal (sp, key, 1 /* need full path */ );
+
+  if (PREDICT_FALSE (search_result == CLIB_SLIST_NO_MATCH))
+    return search_result;
+
+  del_elt = pool_elt_at_index (sp->elts, sp->path[vec_len (sp->path) - 1]);
+  ASSERT (vec_len (sp->path) > 1);
+
+  for (level = 0; level < vec_len (sp->path) - 1; level++)
+    {
+      clib_slist_elt_t *path_elt;
+      u32 path_elt_next_index;
+
+      path_elt = pool_elt_at_index (sp->elts, sp->path[level]);
+      path_elt_next_index = clib_slist_get_next_at_level (path_elt, level);
+
+      /* Splice the item out of the list if it's adjacent to the victim */
+      if (path_elt_next_index == del_elt - sp->elts)
+	{
+	  sp->occupancy[level]--;
+	  path_elt_next_index = clib_slist_get_next_at_level (del_elt, level);
+	  clib_slist_set_next_at_level (path_elt, path_elt_next_index, level);
+	}
+    }
+
+  /* If this element is on more than two lists it has a vector of nexts */
+  if (!(del_elt->n.next0[0] & 1))
+    vec_free (del_elt->n.nexts);
+  pool_put (sp->elts, del_elt);
+  return CLIB_SLIST_MATCH;
+}
+
+u8 *
+format_slist (u8 * s, va_list * args)
+{
+  clib_slist_t *sl = va_arg (*args, clib_slist_t *);
+  int verbose = va_arg (*args, int);
+  int i;
+  clib_slist_elt_t *head_elt, *elt;
+
+  s = format (s, "slist 0x%x, %u items, branching_factor %.2f\n", sl,
+	      sl->occupancy ? sl->occupancy[0] : 0, sl->branching_factor);
+
+  if (pool_elts (sl->elts) == 0)
+    return s;
+
+  head_elt = pool_elt_at_index (sl->elts, 0);
+
+  for (i = 0; i < vec_len (head_elt->n.nexts); i++)
+    {
+      s = format (s, "level %d: %d elts\n", i,
+		  sl->occupancy ? sl->occupancy[i] : 0);
+
+      if (verbose && head_elt->n.nexts[i] != (u32) ~ 0)
+	{
+	  elt = pool_elt_at_index (sl->elts, head_elt->n.nexts[i]);
+	  while (elt)
+	    {
+	      u32 next_index;
+	      s = format (s, "%U(%d) ", sl->format_user_element,
+			  elt->user_pool_index, elt - sl->elts);
+	      next_index = clib_slist_get_next_at_level (elt, i);
+	      ASSERT (next_index != 0x7fffffff);
+	      if (next_index == (u32) ~ 0)
+		break;
+	      else
+		elt = pool_elt_at_index (sl->elts, next_index);
+	    }
+	}
+      s = format (s, "\n");
+    }
+  return s;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/slist.h b/src/vppinfra/slist.h
new file mode 100644
index 00000000..a7c77e27
--- /dev/null
+++ b/src/vppinfra/slist.h
@@ -0,0 +1,145 @@
+/*
+  Copyright (c) 2012 Cisco and/or its affiliates.
+
+  * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#ifndef included_slist_h
+#define included_slist_h
+
+#include <stdarg.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/error.h>
+#include <vppinfra/format.h>
+#include <vppinfra/cache.h>
+
+typedef word (clib_slist_key_compare_function_t)
+  (void *key, u32 elt_pool_index);
+
+typedef enum
+{
+  CLIB_SLIST_MATCH = 0,
+  CLIB_SLIST_NO_MATCH
+} clib_slist_search_result_t;
+
+typedef struct
+{
+  /* Vector of next elements. Every valid instance has at least one */
+  union
+  {
+    u32 next0[2];
+    u32 *nexts;
+  } n;
+
+  /* Index of item in user's pool */
+  u32 user_pool_index;
+  /* $$$ pad to even divisor of cache line */
+} clib_slist_elt_t;
+
+static inline u32
+clib_slist_get_next_at_level (clib_slist_elt_t * elt, int level)
+{
+  if (elt->n.next0[0] & 1)
+    {
+      ASSERT (level < 2);
+      if (level == 1)
+	return elt->n.next0[1];
+      /* preserve ~0 (end of list) */
+      return (elt->n.next0[0] == (u32) ~ 0) ? elt->n.next0[0] :
+	(elt->n.next0[0] >> 1);
+    }
+  else
+    {
+      ASSERT (level < vec_len (elt->n.nexts));
+      return elt->n.nexts[level];
+    }
+}
+
+static inline void
+clib_slist_set_next_at_level (clib_slist_elt_t * elt, u32 index, int level)
+{
+  u32 old_level0_value[2];
+  /* level0 and not a vector */
+  if (level < 2 && (elt->n.next0[0] == 0 || elt->n.next0[0] & 1))
+    {
+      if (level == 0)
+	{
+	  elt->n.next0[0] = (index << 1) | 1;
+	  return;
+	}
+      elt->n.next0[1] = index;
+      return;
+    }
+  /* have to save old level0 values? */
+  if (elt->n.next0[0] & 1)
+    {
+      old_level0_value[0] = (elt->n.next0[0] == (u32) ~ 0) ?
+	elt->n.next0[0] : elt->n.next0[0] >> 1;
+      old_level0_value[1] = elt->n.next0[1];
+      elt->n.nexts = 0;
+      vec_add1 (elt->n.nexts, old_level0_value[0]);
+      vec_add1 (elt->n.nexts, old_level0_value[1]);
+    }
+  vec_validate (elt->n.nexts, level);
+  elt->n.nexts[level] = index;
+}
+
+
+typedef struct
+{
+  /* pool of skip-list elements */
+  clib_slist_elt_t *elts;
+
+  /* last search path */
+  u32 *path;
+
+  /* last search number of compares */
+  u32 ncompares;
+
+  /* occupancy stats */
+  u32 *occupancy;
+
+  /* Comparison function */
+  clib_slist_key_compare_function_t *compare;
+
+  /* Format function */
+  format_function_t *format_user_element;
+
+  /* items appear in successive plies with Pr (1 / branching_factor) */
+  f64 branching_factor;
+
+  /* random seed */
+  u32 seed;
+} clib_slist_t;
+
+clib_error_t *clib_slist_init (clib_slist_t * sp, f64 branching_factor,
+			       clib_slist_key_compare_function_t compare,
+			       format_function_t format_user_element);
+
+format_function_t format_slist;
+
+void clib_slist_add (clib_slist_t * sp, void *key, u32 user_pool_index);
+clib_slist_search_result_t clib_slist_del (clib_slist_t * sp, void *key);
+u32 clib_slist_search (clib_slist_t * sp, void *key, u32 * ncompares);
+
+#endif /* included_slist_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/smp.c b/src/vppinfra/smp.c
new file mode 100644
index 00000000..8ac19960
--- /dev/null
+++ b/src/vppinfra/smp.c
@@ -0,0 +1,325 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/longjmp.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/os.h>
+
+void
+clib_smp_free (clib_smp_main_t * m)
+{
+  clib_mem_vm_free (m->vm_base,
+		    (uword) ((1 + m->n_cpus) << m->log2_n_per_cpu_vm_bytes));
+}
+
+static uword
+allocate_per_cpu_mheap (uword cpu)
+{
+  clib_smp_main_t *m = &clib_smp_main;
+  void *heap;
+  uword vm_size, stack_size, mheap_flags;
+
+  ASSERT (os_get_cpu_number () == cpu);
+
+  vm_size = (uword) 1 << m->log2_n_per_cpu_vm_bytes;
+  stack_size = (uword) 1 << m->log2_n_per_cpu_stack_bytes;
+
+  mheap_flags = MHEAP_FLAG_SMALL_OBJECT_CACHE;
+
+  /* Heap extends up to start of stack. */
+  heap = mheap_alloc_with_flags (clib_smp_vm_base_for_cpu (m, cpu),
+				 vm_size - stack_size, mheap_flags);
+  clib_mem_set_heap (heap);
+
+  if (cpu == 0)
+    {
+      /* Now that we have a heap, allocate main structure on cpu 0. */
+      vec_resize (m->per_cpu_mains, m->n_cpus);
+
+      /* Allocate shared global heap (thread safe). */
+      m->global_heap =
+	mheap_alloc_with_flags (clib_smp_vm_base_for_cpu (m, cpu + m->n_cpus),
+				vm_size,
+				mheap_flags | MHEAP_FLAG_THREAD_SAFE);
+    }
+
+  m->per_cpu_mains[cpu].heap = heap;
+  return 0;
+}
+
+void
+clib_smp_init (void)
+{
+  clib_smp_main_t *m = &clib_smp_main;
+  uword cpu;
+
+  m->vm_base =
+    clib_mem_vm_alloc ((uword) (m->n_cpus + 1) << m->log2_n_per_cpu_vm_bytes);
+  if (!m->vm_base)
+    clib_error ("error allocating virtual memory");
+
+  for (cpu = 0; cpu < m->n_cpus; cpu++)
+    clib_calljmp (allocate_per_cpu_mheap, cpu,
+		  clib_smp_stack_top_for_cpu (m, cpu));
+}
+
+void
+clib_smp_lock_init (clib_smp_lock_t ** pl)
+{
+  clib_smp_lock_t *l;
+  uword i, n_bytes, n_fifo_elts;
+
+  /* No locking necessary if n_cpus <= 1.
+     Null means no locking is necessary. */
+  if (clib_smp_main.n_cpus < 2)
+    {
+      *pl = 0;
+      return;
+    }
+
+  /* Need n_cpus - 1 elts in waiting fifo.  One CPU holds lock
+     and others could potentially be waiting. */
+  n_fifo_elts = clib_smp_main.n_cpus - 1;
+
+  n_bytes = sizeof (l[0]) + n_fifo_elts * sizeof (l->waiting_fifo[0]);
+  ASSERT_AND_PANIC (n_bytes % CLIB_CACHE_LINE_BYTES == 0);
+
+  l = clib_mem_alloc_aligned (n_bytes, CLIB_CACHE_LINE_BYTES);
+
+  memset (l, 0, n_bytes);
+  l->n_waiting_fifo_elts = n_fifo_elts;
+
+  for (i = 0; i < l->n_waiting_fifo_elts; i++)
+    l->waiting_fifo[i].wait_type = CLIB_SMP_LOCK_WAIT_EMPTY;
+
+  *pl = l;
+}
+
+void
+clib_smp_lock_free (clib_smp_lock_t ** pl)
+{
+  if (*pl)
+    clib_mem_free (*pl);
+  *pl = 0;
+}
+
+void
+clib_smp_lock_slow_path (clib_smp_lock_t * l,
+			 uword my_cpu,
+			 clib_smp_lock_header_t h0, clib_smp_lock_type_t type)
+{
+  clib_smp_lock_header_t h1, h2, h3;
+  uword is_reader = type == CLIB_SMP_LOCK_TYPE_READER;
+  uword n_fifo_elts = l->n_waiting_fifo_elts;
+  uword my_tail;
+
+  /* Atomically advance waiting FIFO tail pointer; my_tail will point
+     to entry where we can insert ourselves to wait for lock to be granted. */
+  while (1)
+    {
+      h1 = h0;
+      my_tail = h1.waiting_fifo.head_index + h1.waiting_fifo.n_elts;
+      my_tail = my_tail >= n_fifo_elts ? my_tail - n_fifo_elts : my_tail;
+      h1.waiting_fifo.n_elts += 1;
+      h1.request_cpu = my_cpu;
+
+      ASSERT_AND_PANIC (h1.waiting_fifo.n_elts <= n_fifo_elts);
+      ASSERT_AND_PANIC (my_tail >= 0 && my_tail < n_fifo_elts);
+
+      h2 = clib_smp_lock_set_header (l, h1, h0);
+
+      /* Tail successfully advanced? */
+      if (clib_smp_lock_header_is_equal (h0, h2))
+	break;
+
+      /* It is possible that if head and tail are both zero, CPU with lock would have unlocked lock. */
+      else if (type == CLIB_SMP_LOCK_TYPE_SPIN)
+	{
+	  while (!h2.writer_has_lock)
+	    {
+	      ASSERT_AND_PANIC (h2.waiting_fifo.n_elts == 0);
+	      h1 = h2;
+	      h1.request_cpu = my_cpu;
+	      h1.writer_has_lock = 1;
+
+	      h3 = clib_smp_lock_set_header (l, h1, h2);
+
+	      /* Got it? */
+	      if (clib_smp_lock_header_is_equal (h2, h3))
+		return;
+
+	      h2 = h3;
+	    }
+	}
+
+      /* Try to advance tail again. */
+      h0 = h2;
+    }
+
+  {
+    clib_smp_lock_waiting_fifo_elt_t *w;
+
+    w = l->waiting_fifo + my_tail;
+
+    while (w->wait_type != CLIB_SMP_LOCK_WAIT_EMPTY)
+      clib_smp_pause ();
+
+    w->wait_type = (is_reader
+		    ? CLIB_SMP_LOCK_WAIT_READER : CLIB_SMP_LOCK_WAIT_WRITER);
+
+    /* Wait until CPU holding the lock grants us the lock. */
+    while (w->wait_type != CLIB_SMP_LOCK_WAIT_DONE)
+      clib_smp_pause ();
+
+    w->wait_type = CLIB_SMP_LOCK_WAIT_EMPTY;
+  }
+}
+
+void
+clib_smp_unlock_slow_path (clib_smp_lock_t * l,
+			   uword my_cpu,
+			   clib_smp_lock_header_t h0,
+			   clib_smp_lock_type_t type)
+{
+  clib_smp_lock_header_t h1, h2;
+  clib_smp_lock_waiting_fifo_elt_t *head;
+  clib_smp_lock_wait_type_t head_wait_type;
+  uword is_reader = type == CLIB_SMP_LOCK_TYPE_READER;
+  uword n_fifo_elts = l->n_waiting_fifo_elts;
+  uword head_index, must_wait_for_readers;
+
+  while (1)
+    {
+      /* Advance waiting fifo giving lock to first waiter. */
+      while (1)
+	{
+	  ASSERT_AND_PANIC (h0.waiting_fifo.n_elts != 0);
+
+	  h1 = h0;
+
+	  head_index = h1.waiting_fifo.head_index;
+	  head = l->waiting_fifo + head_index;
+	  if (is_reader)
+	    {
+	      ASSERT_AND_PANIC (h1.n_readers_with_lock > 0);
+	      h1.n_readers_with_lock -= 1;
+	    }
+	  else
+	    {
+	      /* Writer will already have lock. */
+	      ASSERT_AND_PANIC (h1.writer_has_lock);
+	    }
+
+	  while ((head_wait_type =
+		  head->wait_type) == CLIB_SMP_LOCK_WAIT_EMPTY)
+	    clib_smp_pause ();
+
+	  /* Don't advance FIFO to writer unless all readers have unlocked. */
+	  must_wait_for_readers =
+	    (type != CLIB_SMP_LOCK_TYPE_SPIN
+	     && head_wait_type == CLIB_SMP_LOCK_WAIT_WRITER
+	     && h1.n_readers_with_lock != 0);
+
+	  if (!must_wait_for_readers)
+	    {
+	      head_index += 1;
+	      h1.waiting_fifo.n_elts -= 1;
+	      if (type != CLIB_SMP_LOCK_TYPE_SPIN)
+		{
+		  if (head_wait_type == CLIB_SMP_LOCK_WAIT_WRITER)
+		    h1.writer_has_lock = h1.n_readers_with_lock == 0;
+		  else
+		    {
+		      h1.writer_has_lock = 0;
+		      h1.n_readers_with_lock += 1;
+		    }
+		}
+	    }
+
+	  h1.waiting_fifo.head_index =
+	    head_index == n_fifo_elts ? 0 : head_index;
+	  h1.request_cpu = my_cpu;
+
+	  ASSERT_AND_PANIC (h1.waiting_fifo.head_index >= 0
+			    && h1.waiting_fifo.head_index < n_fifo_elts);
+	  ASSERT_AND_PANIC (h1.waiting_fifo.n_elts >= 0
+			    && h1.waiting_fifo.n_elts <= n_fifo_elts);
+
+	  h2 = clib_smp_lock_set_header (l, h1, h0);
+
+	  if (clib_smp_lock_header_is_equal (h2, h0))
+	    break;
+
+	  h0 = h2;
+
+	  if (h0.waiting_fifo.n_elts == 0)
+	    return clib_smp_unlock_inline (l, type);
+	}
+
+      if (must_wait_for_readers)
+	return;
+
+      /* Wake up head of waiting fifo. */
+      {
+	uword done_waking;
+
+	/* Shift lock to first thread waiting in fifo. */
+	head->wait_type = CLIB_SMP_LOCK_WAIT_DONE;
+
+	/* For read locks we may be able to wake multiple readers. */
+	done_waking = 1;
+	if (head_wait_type == CLIB_SMP_LOCK_WAIT_READER)
+	  {
+	    uword hi = h0.waiting_fifo.head_index;
+	    if (h0.waiting_fifo.n_elts != 0
+		&& l->waiting_fifo[hi].wait_type == CLIB_SMP_LOCK_WAIT_READER)
+	      done_waking = 0;
+	  }
+
+	if (done_waking)
+	  break;
+      }
+    }
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/smp.h b/src/vppinfra/smp.h
new file mode 100644
index 00000000..7e703b3d
--- /dev/null
+++ b/src/vppinfra/smp.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001-2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_smp_h
+#define included_clib_smp_h
+
+#include <vppinfra/cache.h>
+#include <vppinfra/os.h>	/* for os_panic */
+
+#define clib_smp_compare_and_swap(addr,new,old) __sync_val_compare_and_swap(addr,old,new)
+#define clib_smp_swap(addr,new) __sync_lock_test_and_set(addr,new)
+#define clib_smp_atomic_add(addr,increment) __sync_fetch_and_add(addr,increment)
+
+#if defined (i386) || defined (__x86_64__)
+#define clib_smp_pause() do { asm volatile ("pause"); } while (0)
+#endif
+
+#ifndef clib_smp_pause
+#define clib_smp_pause() do { } while (0)
+#endif
+
+#ifdef CLIB_UNIX
+#include <sched.h>
+
+always_inline void
+os_sched_yield (void)
+{
+  sched_yield ();
+}
+#else
+always_inline void
+os_sched_yield (void)
+{
+  clib_smp_pause ();
+}
+#endif
+
+
+#endif /* included_clib_smp_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/smp_fifo.c b/src/vppinfra/smp_fifo.c
new file mode 100644
index 00000000..bb74064d
--- /dev/null
+++ b/src/vppinfra/smp_fifo.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2012 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/smp_fifo.h>
+#include <vppinfra/mem.h>
+
+clib_smp_fifo_t *
+clib_smp_fifo_init (uword max_n_elts, uword n_bytes_per_elt)
+{
+  clib_smp_fifo_t *f;
+  uword n_bytes_per_elt_cache_aligned;
+
+  f = clib_mem_alloc_aligned (sizeof (f[0]), CLIB_CACHE_LINE_BYTES);
+
+  memset (f, 0, sizeof (f[0]));
+
+  max_n_elts = max_n_elts ? max_n_elts : 32;
+  f->log2_max_n_elts = max_log2 (max_n_elts);
+  f->max_n_elts_less_one = (1 << f->log2_max_n_elts) - 1;
+
+  n_bytes_per_elt_cache_aligned =
+    clib_smp_fifo_round_elt_bytes (n_bytes_per_elt);
+  clib_exec_on_global_heap (
+			     {
+			     f->data =
+			     clib_mem_alloc_aligned
+			     (n_bytes_per_elt_cache_aligned <<
+			      f->log2_max_n_elts, CLIB_CACHE_LINE_BYTES);}
+  );
+
+  /* Zero all data and mark all elements free. */
+  {
+    uword i;
+    for (i = 0; i <= f->max_n_elts_less_one; i++)
+      {
+	void *d = clib_smp_fifo_elt_at_index (f, n_bytes_per_elt, i);
+	clib_smp_fifo_data_footer_t *t;
+
+	memset (d, 0, n_bytes_per_elt_cache_aligned);
+
+	t = clib_smp_fifo_get_data_footer (d, n_bytes_per_elt);
+	clib_smp_fifo_data_footer_set_state (t,
+					     CLIB_SMP_FIFO_DATA_STATE_free);
+      }
+  }
+
+  return f;
+}
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/smp_fifo.h b/src/vppinfra/smp_fifo.h
new file mode 100644
index 00000000..c74a77c8
--- /dev/null
+++ b/src/vppinfra/smp_fifo.h
@@ -0,0 +1,313 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2012 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_smp_vec_h
+#define included_clib_smp_vec_h
+
+#include <vppinfra/smp.h>
+
+#define foreach_clib_smp_fifo_data_state	\
+  _ (free)					\
+  _ (write_alloc)				\
+  _ (write_done)				\
+  _ (read_fetch)
+
+typedef enum
+{
+#define _(f) CLIB_SMP_FIFO_DATA_STATE_##f,
+  foreach_clib_smp_fifo_data_state
+#undef _
+    CLIB_SMP_FIFO_N_DATA_STATE,
+} clib_smp_fifo_data_state_t;
+
+/* Footer at end of each data element. */
+typedef struct
+{
+  /* Magic number marking valid footer plus state encoded in low bits. */
+  u32 magic_state;
+} clib_smp_fifo_data_footer_t;
+
+#define CLIB_SMP_DATA_FOOTER_MAGIC 0xfafbfcf0
+
+always_inline clib_smp_fifo_data_state_t
+clib_smp_fifo_data_footer_get_state (clib_smp_fifo_data_footer_t * f)
+{
+  u32 s = f->magic_state - CLIB_SMP_DATA_FOOTER_MAGIC;
+
+  /* Check that magic number plus state is still valid. */
+  if (s >= CLIB_SMP_FIFO_N_DATA_STATE)
+    os_panic ();
+
+  return s;
+}
+
+always_inline void
+clib_smp_fifo_data_footer_set_state (clib_smp_fifo_data_footer_t * f,
+				     clib_smp_fifo_data_state_t s)
+{
+  f->magic_state = CLIB_SMP_DATA_FOOTER_MAGIC + s;
+}
+
+typedef struct
+{
+  /* Read/write indices each on their own cache line.
+     Atomic incremented for each read/write. */
+  u32 read_index, write_index;
+
+  /* Power of 2 number of elements in fifo less one. */
+  u32 max_n_elts_less_one;
+
+  /* Log2 of above. */
+  u32 log2_max_n_elts;
+
+  /* Cache aligned data. */
+  void *data;
+} clib_smp_fifo_t;
+
+/* External functions. */
+clib_smp_fifo_t *clib_smp_fifo_init (uword max_n_elts, uword n_bytes_per_elt);
+
+/* Elements are always cache-line sized; this is to avoid smp cache thrashing. */
+always_inline uword
+clib_smp_fifo_round_elt_bytes (uword n_bytes_per_elt)
+{
+  return round_pow2 (n_bytes_per_elt, CLIB_CACHE_LINE_BYTES);
+}
+
+always_inline uword
+clib_smp_fifo_n_elts (clib_smp_fifo_t * f)
+{
+  uword n = f->write_index - f->read_index;
+  ASSERT (n <= f->max_n_elts_less_one + 1);
+  return n;
+}
+
+always_inline clib_smp_fifo_data_footer_t *
+clib_smp_fifo_get_data_footer (void *d, uword n_bytes_per_elt)
+{
+  clib_smp_fifo_data_footer_t *f;
+  f = d + clib_smp_fifo_round_elt_bytes (n_bytes_per_elt) - sizeof (f[0]);
+  return f;
+}
+
+always_inline void *
+clib_smp_fifo_elt_at_index (clib_smp_fifo_t * f, uword n_bytes_per_elt,
+			    uword i)
+{
+  uword n_bytes_per_elt_cache_aligned;
+
+  ASSERT (i <= f->max_n_elts_less_one);
+
+  n_bytes_per_elt_cache_aligned =
+    clib_smp_fifo_round_elt_bytes (n_bytes_per_elt);
+
+  return f->data + i * n_bytes_per_elt_cache_aligned;
+}
+
+always_inline void *
+clib_smp_fifo_write_alloc (clib_smp_fifo_t * f, uword n_bytes_per_elt)
+{
+  void *d;
+  clib_smp_fifo_data_footer_t *t;
+  clib_smp_fifo_data_state_t s;
+  u32 wi0, wi1;
+
+  wi0 = f->write_index;
+
+  /* Fifo full? */
+  if (wi0 - f->read_index > f->max_n_elts_less_one)
+    return 0;
+
+  while (1)
+    {
+      wi1 = wi0 + 1;
+
+      d =
+	clib_smp_fifo_elt_at_index (f, n_bytes_per_elt,
+				    wi0 & f->max_n_elts_less_one);
+      t = clib_smp_fifo_get_data_footer (d, n_bytes_per_elt);
+
+      s = clib_smp_fifo_data_footer_get_state (t);
+      if (s != CLIB_SMP_FIFO_DATA_STATE_free)
+	{
+	  d = 0;
+	  break;
+	}
+
+      wi1 = clib_smp_compare_and_swap (&f->write_index, wi1, wi0);
+
+      if (wi1 == wi0)
+	{
+	  clib_smp_fifo_data_footer_set_state (t,
+					       CLIB_SMP_FIFO_DATA_STATE_write_alloc);
+	  break;
+	}
+
+      /* Other cpu wrote write index first: try again. */
+      wi0 = wi1;
+    }
+
+  return d;
+}
+
+always_inline void
+clib_smp_fifo_write_done (clib_smp_fifo_t * f, void *d, uword n_bytes_per_elt)
+{
+  clib_smp_fifo_data_footer_t *t;
+
+  /* Flush out pending writes before we change state to write_done.
+     This will hold off readers until data is flushed. */
+  CLIB_MEMORY_BARRIER ();
+
+  t = clib_smp_fifo_get_data_footer (d, n_bytes_per_elt);
+
+  ASSERT (clib_smp_fifo_data_footer_get_state (t) ==
+	  CLIB_SMP_FIFO_DATA_STATE_write_alloc);
+  clib_smp_fifo_data_footer_set_state (t,
+				       CLIB_SMP_FIFO_DATA_STATE_write_done);
+}
+
+always_inline void *
+clib_smp_fifo_read_fetch (clib_smp_fifo_t * f, uword n_bytes_per_elt)
+{
+  void *d;
+  clib_smp_fifo_data_footer_t *t;
+  clib_smp_fifo_data_state_t s;
+  u32 ri0, ri1;
+
+  ri0 = f->read_index;
+
+  /* Fifo empty? */
+  if (f->write_index - ri0 == 0)
+    return 0;
+
+  while (1)
+    {
+      ri1 = ri0 + 1;
+
+      d =
+	clib_smp_fifo_elt_at_index (f, n_bytes_per_elt,
+				    ri0 & f->max_n_elts_less_one);
+      t = clib_smp_fifo_get_data_footer (d, n_bytes_per_elt);
+
+      s = clib_smp_fifo_data_footer_get_state (t);
+      if (s != CLIB_SMP_FIFO_DATA_STATE_write_done)
+	{
+	  d = 0;
+	  break;
+	}
+
+      ri1 = clib_smp_compare_and_swap (&f->read_index, ri1, ri0);
+      if (ri1 == ri0)
+	{
+	  clib_smp_fifo_data_footer_set_state (t,
+					       CLIB_SMP_FIFO_DATA_STATE_read_fetch);
+	  break;
+	}
+
+      ri0 = ri1;
+    }
+
+  return d;
+}
+
+always_inline void
+clib_smp_fifo_read_done (clib_smp_fifo_t * f, void *d, uword n_bytes_per_elt)
+{
+  clib_smp_fifo_data_footer_t *t;
+
+  t = clib_smp_fifo_get_data_footer (d, n_bytes_per_elt);
+
+  ASSERT (clib_smp_fifo_data_footer_get_state (t) ==
+	  CLIB_SMP_FIFO_DATA_STATE_read_fetch);
+  clib_smp_fifo_data_footer_set_state (t, CLIB_SMP_FIFO_DATA_STATE_free);
+}
+
+always_inline void
+clib_smp_fifo_memcpy (uword * dst, uword * src, uword n_bytes)
+{
+  word n_bytes_left = n_bytes;
+
+  while (n_bytes_left >= 4 * sizeof (uword))
+    {
+      dst[0] = src[0];
+      dst[1] = src[1];
+      dst[2] = src[2];
+      dst[3] = src[3];
+      dst += 4;
+      src += 4;
+      n_bytes_left -= 4 * sizeof (dst[0]);
+    }
+
+  while (n_bytes_left > 0)
+    {
+      dst[0] = src[0];
+      dst += 1;
+      src += 1;
+      n_bytes_left -= 1 * sizeof (dst[0]);
+    }
+}
+
+always_inline void
+clib_smp_fifo_write_inline (clib_smp_fifo_t * f, void *elt_to_write,
+			    uword n_bytes_per_elt)
+{
+  uword *dst;
+  dst = clib_smp_fifo_write_alloc (f, n_bytes_per_elt);
+  clib_smp_fifo_memcpy (dst, elt_to_write, n_bytes_per_elt);
+  clib_smp_fifo_write_done (f, dst, n_bytes_per_elt);
+}
+
+always_inline void
+clib_smp_fifo_read_inline (clib_smp_fifo_t * f, void *elt_to_read,
+			   uword n_bytes_per_elt)
+{
+  uword *src;
+  src = clib_smp_fifo_read_fetch (f, n_bytes_per_elt);
+  clib_smp_fifo_memcpy (elt_to_read, src, n_bytes_per_elt);
+  clib_smp_fifo_read_done (f, src, n_bytes_per_elt);
+}
+
+#endif /* included_clib_smp_vec_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/socket.c b/src/vppinfra/socket.c
new file mode 100644
index 00000000..99b353fc
--- /dev/null
+++ b/src/vppinfra/socket.c
@@ -0,0 +1,422 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003, 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <sys/un.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <string.h>		/* strchr */
+
+#include <vppinfra/mem.h>
+#include <vppinfra/vec.h>
+#include <vppinfra/socket.h>
+#include <vppinfra/format.h>
+#include <vppinfra/error.h>
+
+void
+clib_socket_tx_add_formatted (clib_socket_t * s, char *fmt, ...)
+{
+  va_list va;
+  va_start (va, fmt);
+  clib_socket_tx_add_va_formatted (s, fmt, &va);
+  va_end (va);
+}
+
+/* Return and bind to an unused port. */
+static word
+find_free_port (word sock)
+{
+  word port;
+
+  for (port = IPPORT_USERRESERVED; port < 1 << 16; port++)
+    {
+      struct sockaddr_in a;
+
+      memset (&a, 0, sizeof (a));	/* Warnings be gone */
+
+      a.sin_family = PF_INET;
+      a.sin_addr.s_addr = INADDR_ANY;
+      a.sin_port = htons (port);
+
+      if (bind (sock, (struct sockaddr *) &a, sizeof (a)) >= 0)
+	break;
+    }
+
+  return port < 1 << 16 ? port : -1;
+}
+
+/* Convert a config string to a struct sockaddr and length for use
+   with bind or connect. */
+static clib_error_t *
+socket_config (char *config,
+	       void *addr, socklen_t * addr_len, u32 ip4_default_address)
+{
+  clib_error_t *error = 0;
+
+  if (!config)
+    config = "";
+
+  /* Anything that begins with a / is a local PF_LOCAL socket. */
+  if (config[0] == '/')
+    {
+      struct sockaddr_un *su = addr;
+      su->sun_family = PF_LOCAL;
+      clib_memcpy (&su->sun_path, config,
+		   clib_min (sizeof (su->sun_path), 1 + strlen (config)));
+      *addr_len = sizeof (su[0]);
+    }
+
+  /* Hostname or hostname:port or port. */
+  else
+    {
+      char *host_name;
+      int port = -1;
+      struct sockaddr_in *sa = addr;
+
+      host_name = 0;
+      port = -1;
+      if (config[0] != 0)
+	{
+	  unformat_input_t i;
+
+	  unformat_init_string (&i, config, strlen (config));
+	  if (unformat (&i, "%s:%d", &host_name, &port)
+	      || unformat (&i, "%s:0x%x", &host_name, &port))
+	    ;
+	  else if (unformat (&i, "%s", &host_name))
+	    ;
+	  else
+	    error = clib_error_return (0, "unknown input `%U'",
+				       format_unformat_error, &i);
+	  unformat_free (&i);
+
+	  if (error)
+	    goto done;
+	}
+
+      sa->sin_family = PF_INET;
+      *addr_len = sizeof (sa[0]);
+      if (port != -1)
+	sa->sin_port = htons (port);
+      else
+	sa->sin_port = 0;
+
+      if (host_name)
+	{
+	  struct in_addr host_addr;
+
+	  /* Recognize localhost to avoid host lookup in most common cast. */
+	  if (!strcmp (host_name, "localhost"))
+	    sa->sin_addr.s_addr = htonl (INADDR_LOOPBACK);
+
+	  else if (inet_aton (host_name, &host_addr))
+	    sa->sin_addr = host_addr;
+
+	  else if (host_name && strlen (host_name) > 0)
+	    {
+	      struct hostent *host = gethostbyname (host_name);
+	      if (!host)
+		error = clib_error_return (0, "unknown host `%s'", config);
+	      else
+		clib_memcpy (&sa->sin_addr.s_addr, host->h_addr_list[0],
+			     host->h_length);
+	    }
+
+	  else
+	    sa->sin_addr.s_addr = htonl (ip4_default_address);
+
+	  vec_free (host_name);
+	  if (error)
+	    goto done;
+	}
+    }
+
+done:
+  return error;
+}
+
+static clib_error_t *
+default_socket_write (clib_socket_t * s)
+{
+  clib_error_t *err = 0;
+  word written = 0;
+  word fd = 0;
+  word tx_len;
+
+  fd = s->fd;
+
+  /* Map standard input to standard output.
+     Typically, fd is a socket for which read/write both work. */
+  if (fd == 0)
+    fd = 1;
+
+  tx_len = vec_len (s->tx_buffer);
+  written = write (fd, s->tx_buffer, tx_len);
+
+  /* Ignore certain errors. */
+  if (written < 0 && !unix_error_is_fatal (errno))
+    written = 0;
+
+  /* A "real" error occurred. */
+  if (written < 0)
+    {
+      err = clib_error_return_unix (0, "write %wd bytes", tx_len);
+      vec_free (s->tx_buffer);
+      goto done;
+    }
+
+  /* Reclaim the transmitted part of the tx buffer on successful writes. */
+  else if (written > 0)
+    {
+      if (written == tx_len)
+	_vec_len (s->tx_buffer) = 0;
+      else
+	vec_delete (s->tx_buffer, written, 0);
+    }
+
+  /* If a non-fatal error occurred AND
+     the buffer is full, then we must free it. */
+  else if (written == 0 && tx_len > 64 * 1024)
+    {
+      vec_free (s->tx_buffer);
+    }
+
+done:
+  return err;
+}
+
+static clib_error_t *
+default_socket_read (clib_socket_t * sock, int n_bytes)
+{
+  word fd, n_read;
+  u8 *buf;
+
+  /* RX side of socket is down once end of file is reached. */
+  if (sock->flags & SOCKET_RX_END_OF_FILE)
+    return 0;
+
+  fd = sock->fd;
+
+  n_bytes = clib_max (n_bytes, 4096);
+  vec_add2 (sock->rx_buffer, buf, n_bytes);
+
+  if ((n_read = read (fd, buf, n_bytes)) < 0)
+    {
+      n_read = 0;
+
+      /* Ignore certain errors. */
+      if (!unix_error_is_fatal (errno))
+	goto non_fatal;
+
+      return clib_error_return_unix (0, "read %d bytes", n_bytes);
+    }
+
+  /* Other side closed the socket. */
+  if (n_read == 0)
+    sock->flags |= SOCKET_RX_END_OF_FILE;
+
+non_fatal:
+  _vec_len (sock->rx_buffer) += n_read - n_bytes;
+
+  return 0;
+}
+
+static clib_error_t *
+default_socket_close (clib_socket_t * s)
+{
+  if (close (s->fd) < 0)
+    return clib_error_return_unix (0, "close");
+  return 0;
+}
+
+static void
+socket_init_funcs (clib_socket_t * s)
+{
+  if (!s->write_func)
+    s->write_func = default_socket_write;
+  if (!s->read_func)
+    s->read_func = default_socket_read;
+  if (!s->close_func)
+    s->close_func = default_socket_close;
+}
+
+clib_error_t *
+clib_socket_init (clib_socket_t * s)
+{
+  union
+  {
+    struct sockaddr sa;
+    struct sockaddr_un su;
+  } addr;
+  socklen_t addr_len = 0;
+  clib_error_t *error = 0;
+  word port;
+
+  error = socket_config (s->config, &addr.sa, &addr_len,
+			 (s->flags & SOCKET_IS_SERVER
+			  ? INADDR_LOOPBACK : INADDR_ANY));
+  if (error)
+    goto done;
+
+  socket_init_funcs (s);
+
+  s->fd = socket (addr.sa.sa_family, SOCK_STREAM, 0);
+  if (s->fd < 0)
+    {
+      error = clib_error_return_unix (0, "socket");
+      goto done;
+    }
+
+  port = 0;
+  if (addr.sa.sa_family == PF_INET)
+    port = ((struct sockaddr_in *) &addr)->sin_port;
+
+  if (s->flags & SOCKET_IS_SERVER)
+    {
+      uword need_bind = 1;
+
+      if (addr.sa.sa_family == PF_INET)
+	{
+	  if (port == 0)
+	    {
+	      port = find_free_port (s->fd);
+	      if (port < 0)
+		{
+		  error = clib_error_return (0, "no free port");
+		  goto done;
+		}
+	      need_bind = 0;
+	    }
+	}
+      if (addr.sa.sa_family == PF_LOCAL)
+	unlink (((struct sockaddr_un *) &addr)->sun_path);
+
+      /* Make address available for multiple users. */
+      {
+	int v = 1;
+	if (setsockopt (s->fd, SOL_SOCKET, SO_REUSEADDR, &v, sizeof (v)) < 0)
+	  clib_unix_warning ("setsockopt SO_REUSEADDR fails");
+      }
+
+      if (need_bind && bind (s->fd, &addr.sa, addr_len) < 0)
+	{
+	  error = clib_error_return_unix (0, "bind");
+	  goto done;
+	}
+
+      if (listen (s->fd, 5) < 0)
+	{
+	  error = clib_error_return_unix (0, "listen");
+	  goto done;
+	}
+    }
+  else
+    {
+      if ((s->flags & SOCKET_NON_BLOCKING_CONNECT)
+	  && fcntl (s->fd, F_SETFL, O_NONBLOCK) < 0)
+	{
+	  error = clib_error_return_unix (0, "fcntl NONBLOCK");
+	  goto done;
+	}
+
+      if (connect (s->fd, &addr.sa, addr_len) < 0
+	  && !((s->flags & SOCKET_NON_BLOCKING_CONNECT) &&
+	       errno == EINPROGRESS))
+	{
+	  error = clib_error_return_unix (0, "connect");
+	  goto done;
+	}
+    }
+
+  return error;
+
+done:
+  if (s->fd > 0)
+    close (s->fd);
+  return error;
+}
+
+clib_error_t *
+clib_socket_accept (clib_socket_t * server, clib_socket_t * client)
+{
+  clib_error_t *err = 0;
+  socklen_t len = 0;
+
+  memset (client, 0, sizeof (client[0]));
+
+  /* Accept the new socket connection. */
+  client->fd = accept (server->fd, 0, 0);
+  if (client->fd < 0)
+    return clib_error_return_unix (0, "accept");
+
+  /* Set the new socket to be non-blocking. */
+  if (fcntl (client->fd, F_SETFL, O_NONBLOCK) < 0)
+    {
+      err = clib_error_return_unix (0, "fcntl O_NONBLOCK");
+      goto close_client;
+    }
+
+  /* Get peer info. */
+  len = sizeof (client->peer);
+  if (getpeername (client->fd, (struct sockaddr *) &client->peer, &len) < 0)
+    {
+      err = clib_error_return_unix (0, "getpeername");
+      goto close_client;
+    }
+
+  client->flags = SOCKET_IS_CLIENT;
+
+  socket_init_funcs (client);
+  return 0;
+
+close_client:
+  close (client->fd);
+  return err;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/socket.h b/src/vppinfra/socket.h
new file mode 100644
index 00000000..08e22e7e
--- /dev/null
+++ b/src/vppinfra/socket.h
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef _clib_included_socket_h
+#define _clib_included_socket_h
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+#include <vppinfra/clib.h>
+#include <vppinfra/error.h>
+#include <vppinfra/format.h>
+
+typedef struct _socket_t
+{
+  /* File descriptor. */
+  i32 fd;
+
+  /* Config string for socket HOST:PORT or just HOST. */
+  char *config;
+
+  u32 flags;
+#define SOCKET_IS_SERVER (1 << 0)
+#define SOCKET_IS_CLIENT (0 << 0)
+#define SOCKET_NON_BLOCKING_CONNECT (1 << 1)
+
+  /* Read returned end-of-file. */
+#define SOCKET_RX_END_OF_FILE (1 << 2)
+
+  /* Transmit buffer.  Holds data waiting to be written. */
+  u8 *tx_buffer;
+
+  /* Receive buffer.  Holds data read from socket. */
+  u8 *rx_buffer;
+
+  /* Peer socket we are connected to. */
+  struct sockaddr_in peer;
+
+  clib_error_t *(*write_func) (struct _socket_t * sock);
+  clib_error_t *(*read_func) (struct _socket_t * sock, int min_bytes);
+  clib_error_t *(*close_func) (struct _socket_t * sock);
+  void *private_data;
+} clib_socket_t;
+
+/* socket config format is host:port.
+   Unspecified port causes a free one to be chosen starting
+   from IPPORT_USERRESERVED (5000). */
+clib_error_t *clib_socket_init (clib_socket_t * socket);
+
+clib_error_t *clib_socket_accept (clib_socket_t * server,
+				  clib_socket_t * client);
+
+always_inline uword
+clib_socket_is_server (clib_socket_t * sock)
+{
+  return (sock->flags & SOCKET_IS_SERVER) != 0;
+}
+
+always_inline uword
+clib_socket_is_client (clib_socket_t * s)
+{
+  return !clib_socket_is_server (s);
+}
+
+always_inline int
+clib_socket_rx_end_of_file (clib_socket_t * s)
+{
+  return s->flags & SOCKET_RX_END_OF_FILE;
+}
+
+always_inline void *
+clib_socket_tx_add (clib_socket_t * s, int n_bytes)
+{
+  u8 *result;
+  vec_add2 (s->tx_buffer, result, n_bytes);
+  return result;
+}
+
+always_inline void
+clib_socket_tx_add_va_formatted (clib_socket_t * s, char *fmt, va_list * va)
+{
+  s->tx_buffer = va_format (s->tx_buffer, fmt, va);
+}
+
+always_inline clib_error_t *
+clib_socket_tx (clib_socket_t * s)
+{
+  return s->write_func (s);
+}
+
+always_inline clib_error_t *
+clib_socket_rx (clib_socket_t * s, int n_bytes)
+{
+  return s->read_func (s, n_bytes);
+}
+
+always_inline void
+clib_socket_free (clib_socket_t * s)
+{
+  vec_free (s->tx_buffer);
+  vec_free (s->rx_buffer);
+  if (clib_mem_is_heap_object (s->config))
+    vec_free (s->config);
+  memset (s, 0, sizeof (s[0]));
+}
+
+always_inline clib_error_t *
+clib_socket_close (clib_socket_t * sock)
+{
+  clib_error_t *err;
+  err = (*sock->close_func) (sock);
+  return err;
+}
+
+void clib_socket_tx_add_formatted (clib_socket_t * s, char *fmt, ...);
+
+#endif /* _clib_included_socket_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/sparse_vec.h b/src/vppinfra/sparse_vec.h
new file mode 100644
index 00000000..ec8f0a1c
--- /dev/null
+++ b/src/vppinfra/sparse_vec.h
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_sparse_vec_h
+#define included_sparse_vec_h
+
+#include <vppinfra/vec.h>
+#include <vppinfra/bitops.h>
+
+/* Sparsely indexed vectors.  Basic idea taken from Hacker's delight.
+   Eliot added ranges. */
+typedef struct
+{
+  /* Bitmap one for each sparse index. */
+  uword *is_member_bitmap;
+
+  /* member_counts[i] = total number of members with j < i. */
+  u16 *member_counts;
+
+#define SPARSE_VEC_IS_RANGE (1 << 0)
+#define SPARSE_VEC_IS_VALID_RANGE (1 << 1)
+  u8 *range_flags;
+} sparse_vec_header_t;
+
+always_inline sparse_vec_header_t *
+sparse_vec_header (void *v)
+{
+  return vec_header (v, sizeof (sparse_vec_header_t));
+}
+
+/* Index 0 is always used to mark indices that are not valid in
+   sparse vector.  For example, you look up V[0x1234] and 0x1234 is not
+   known you'll get 0 back as an index. */
+#define SPARSE_VEC_INVALID_INDEX (0)
+
+always_inline void *
+sparse_vec_new (uword elt_bytes, uword sparse_index_bits)
+{
+  void *v;
+  sparse_vec_header_t *h;
+  word n;
+
+  ASSERT (sparse_index_bits <= 16);
+
+  v = _vec_resize (0,
+		   /* length increment */ 8,
+		   /* data bytes */ 8 * elt_bytes,
+		   /* header bytes */ sizeof (h[0]),
+		   /* data align */ 0);
+
+  /* Make space for invalid entry (entry 0). */
+  _vec_len (v) = 1;
+
+  h = sparse_vec_header (v);
+
+  n = sparse_index_bits - min_log2 (BITS (uword));
+  if (n < 0)
+    n = 0;
+  n = 1ULL << n;
+  vec_resize (h->is_member_bitmap, n);
+  vec_resize (h->member_counts, n);
+
+  return v;
+}
+
+always_inline uword
+sparse_vec_index_internal (void *v,
+			   uword sparse_index,
+			   uword maybe_range, u32 * insert)
+{
+  sparse_vec_header_t *h;
+  uword i, b, d, w;
+  u8 is_member;
+
+  h = sparse_vec_header (v);
+  i = sparse_index / BITS (h->is_member_bitmap[0]);
+  b = (uword) 1 << (uword) (sparse_index % BITS (h->is_member_bitmap[0]));
+
+  ASSERT (i < vec_len (h->is_member_bitmap));
+  ASSERT (i < vec_len (h->member_counts));
+
+  w = h->is_member_bitmap[i];
+  d = h->member_counts[i] + count_set_bits (w & (b - 1));
+
+  is_member = (w & b) != 0;
+  if (maybe_range)
+    {
+      u8 r = h->range_flags[d];
+      u8 is_range, is_valid_range;
+
+      is_range = maybe_range & (r & SPARSE_VEC_IS_RANGE);
+      is_valid_range = (r & SPARSE_VEC_IS_VALID_RANGE) != 0;
+
+      is_member = is_range ? is_valid_range : is_member;
+    }
+
+  if (insert)
+    {
+      *insert = !is_member;
+      if (!is_member)
+	{
+	  uword j;
+	  w |= b;
+	  h->is_member_bitmap[i] = w;
+	  for (j = i + 1; j < vec_len (h->member_counts); j++)
+	    h->member_counts[j] += 1;
+	}
+
+      return 1 + d;
+    }
+
+  d = is_member ? d : 0;
+
+  return is_member + d;
+}
+
+always_inline uword
+sparse_vec_index (void *v, uword sparse_index)
+{
+  return sparse_vec_index_internal (v, sparse_index,
+				    /* maybe range */ 0,
+				    /* insert? */ 0);
+}
+
+always_inline void
+sparse_vec_index2 (void *v,
+		   u32 si0, u32 si1, u32 * i0_return, u32 * i1_return)
+{
+  sparse_vec_header_t *h;
+  uword b0, b1, w0, w1, v0, v1;
+  u32 i0, i1, d0, d1;
+  u8 is_member0, is_member1;
+
+  h = sparse_vec_header (v);
+
+  i0 = si0 / BITS (h->is_member_bitmap[0]);
+  i1 = si1 / BITS (h->is_member_bitmap[0]);
+
+  b0 = (uword) 1 << (uword) (si0 % BITS (h->is_member_bitmap[0]));
+  b1 = (uword) 1 << (uword) (si1 % BITS (h->is_member_bitmap[0]));
+
+  ASSERT (i0 < vec_len (h->is_member_bitmap));
+  ASSERT (i1 < vec_len (h->is_member_bitmap));
+
+  ASSERT (i0 < vec_len (h->member_counts));
+  ASSERT (i1 < vec_len (h->member_counts));
+
+  w0 = h->is_member_bitmap[i0];
+  w1 = h->is_member_bitmap[i1];
+
+  v0 = w0 & (b0 - 1);
+  v1 = w1 & (b1 - 1);
+
+  /* Speculate that masks will have zero or one bits set. */
+  d0 = h->member_counts[i0] + (v0 != 0);
+  d1 = h->member_counts[i1] + (v1 != 0);
+
+  /* Validate speculation. */
+  if (PREDICT_FALSE (!is_pow2 (v0) || !is_pow2 (v1)))
+    {
+      d0 += count_set_bits (v0) - (v0 != 0);
+      d1 += count_set_bits (v1) - (v1 != 0);
+    }
+
+  is_member0 = (w0 & b0) != 0;
+  is_member1 = (w1 & b1) != 0;
+
+  d0 = is_member0 ? d0 : 0;
+  d1 = is_member1 ? d1 : 0;
+
+  *i0_return = is_member0 + d0;
+  *i1_return = is_member1 + d1;
+}
+
+#define sparse_vec_free(v) vec_free(v)
+
+#define sparse_vec_elt_at_index(v,i) \
+  vec_elt_at_index ((v), sparse_vec_index ((v), (i)))
+
+#define sparse_vec_validate(v,i)					\
+({									\
+  uword _i;								\
+  u32 _insert;								\
+									\
+  if (! (v))								\
+    (v) = sparse_vec_new (sizeof ((v)[0]), BITS (u16));			\
+									\
+  _i = sparse_vec_index_internal ((v), (i),				\
+				  /* maybe range */ 0,			\
+				  /* insert? */ &_insert);		\
+  if (_insert)								\
+    vec_insert_ha ((v), 1, _i,						\
+		   /* header size */ sizeof (sparse_vec_header_t),	\
+		   /* align */ 0);					\
+									\
+  /* Invalid index is 0. */						\
+  ASSERT (_i > 0);							\
+									\
+  (v) + _i;								\
+})
+
+#endif /* included_sparse_vec_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/std-formats.c b/src/vppinfra/std-formats.c
new file mode 100644
index 00000000..ac98f999
--- /dev/null
+++ b/src/vppinfra/std-formats.c
@@ -0,0 +1,330 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/format.h>
+#include <ctype.h>
+
+/* Format vectors. */
+u8 *
+format_vec32 (u8 * s, va_list * va)
+{
+  u32 *v = va_arg (*va, u32 *);
+  char *fmt = va_arg (*va, char *);
+  uword i;
+  for (i = 0; i < vec_len (v); i++)
+    {
+      if (i > 0)
+	s = format (s, ", ");
+      s = format (s, fmt, v[i]);
+    }
+  return s;
+}
+
+u8 *
+format_vec_uword (u8 * s, va_list * va)
+{
+  uword *v = va_arg (*va, uword *);
+  char *fmt = va_arg (*va, char *);
+  uword i;
+  for (i = 0; i < vec_len (v); i++)
+    {
+      if (i > 0)
+	s = format (s, ", ");
+      s = format (s, fmt, v[i]);
+    }
+  return s;
+}
+
+/* Ascii buffer and length. */
+u8 *
+format_ascii_bytes (u8 * s, va_list * va)
+{
+  u8 *v = va_arg (*va, u8 *);
+  uword n_bytes = va_arg (*va, uword);
+  vec_add (s, v, n_bytes);
+  return s;
+}
+
+/* Format hex dump. */
+u8 *
+format_hex_bytes (u8 * s, va_list * va)
+{
+  u8 *bytes = va_arg (*va, u8 *);
+  int n_bytes = va_arg (*va, int);
+  uword i;
+
+  /* Print short or long form depending on byte count. */
+  uword short_form = n_bytes <= 32;
+  uword indent = format_get_indent (s);
+
+  if (n_bytes == 0)
+    return s;
+
+  for (i = 0; i < n_bytes; i++)
+    {
+      if (!short_form && (i % 32) == 0)
+	s = format (s, "%08x: ", i);
+
+      s = format (s, "%02x", bytes[i]);
+
+      if (!short_form && ((i + 1) % 32) == 0 && (i + 1) < n_bytes)
+	s = format (s, "\n%U", format_white_space, indent);
+    }
+
+  return s;
+}
+
+/* Add variable number of spaces. */
+u8 *
+format_white_space (u8 * s, va_list * va)
+{
+  uword n = va_arg (*va, uword);
+  while (n-- > 0)
+    vec_add1 (s, ' ');
+  return s;
+}
+
+u8 *
+format_time_interval (u8 * s, va_list * args)
+{
+  u8 *fmt = va_arg (*args, u8 *);
+  f64 t = va_arg (*args, f64);
+  u8 *f;
+
+  const f64 seconds_per_minute = 60;
+  const f64 seconds_per_hour = 60 * seconds_per_minute;
+  const f64 seconds_per_day = 24 * seconds_per_hour;
+  uword days, hours, minutes, secs, msecs, usecs;
+
+  days = t / seconds_per_day;
+  t -= days * seconds_per_day;
+
+  hours = t / seconds_per_hour;
+  t -= hours * seconds_per_hour;
+
+  minutes = t / seconds_per_minute;
+  t -= minutes * seconds_per_minute;
+
+  secs = t;
+  t -= secs;
+
+  msecs = 1e3 * t;
+  usecs = 1e6 * t;
+
+  for (f = fmt; *f; f++)
+    {
+      uword what, c;
+      char *what_fmt = "%d";
+
+      switch (c = *f)
+	{
+	default:
+	  vec_add1 (s, c);
+	  continue;
+
+	case 'd':
+	  what = days;
+	  what_fmt = "%d";
+	  break;
+	case 'h':
+	  what = hours;
+	  what_fmt = "%02d";
+	  break;
+	case 'm':
+	  what = minutes;
+	  what_fmt = "%02d";
+	  break;
+	case 's':
+	  what = secs;
+	  what_fmt = "%02d";
+	  break;
+	case 'f':
+	  what = msecs;
+	  what_fmt = "%03d";
+	  break;
+	case 'u':
+	  what = usecs;
+	  what_fmt = "%06d";
+	  break;
+	}
+
+      s = format (s, what_fmt, what);
+    }
+
+  return s;
+}
+
+/* Unparse memory size e.g. 100, 100k, 100m, 100g. */
+u8 *
+format_memory_size (u8 * s, va_list * va)
+{
+  uword size = va_arg (*va, uword);
+  uword l, u, log_u;
+
+  l = size > 0 ? min_log2 (size) : 0;
+  if (l < 10)
+    log_u = 0;
+  else if (l < 20)
+    log_u = 10;
+  else if (l < 30)
+    log_u = 20;
+  else
+    log_u = 30;
+
+  u = (uword) 1 << log_u;
+  if (size & (u - 1))
+    s = format (s, "%.2f", (f64) size / (f64) u);
+  else
+    s = format (s, "%d", size >> log_u);
+
+  if (log_u != 0)
+    s = format (s, "%c", " kmg"[log_u / 10]);
+
+  return s;
+}
+
+/* Parse memory size e.g. 100, 100k, 100m, 100g. */
+uword
+unformat_memory_size (unformat_input_t * input, va_list * va)
+{
+  uword amount, shift, c;
+  uword *result = va_arg (*va, uword *);
+
+  if (!unformat (input, "%wd%_", &amount))
+    return 0;
+
+  c = unformat_get_input (input);
+  switch (c)
+    {
+    case 'k':
+    case 'K':
+      shift = 10;
+      break;
+    case 'm':
+    case 'M':
+      shift = 20;
+      break;
+    case 'g':
+    case 'G':
+      shift = 30;
+      break;
+    default:
+      shift = 0;
+      unformat_put_input (input);
+      break;
+    }
+
+  *result = amount << shift;
+  return 1;
+}
+
+/* Format c identifier: e.g. a_name -> "a name".
+   Words for both vector names and null terminated c strings. */
+u8 *
+format_c_identifier (u8 * s, va_list * va)
+{
+  u8 *id = va_arg (*va, u8 *);
+  uword i, l;
+
+  l = ~0;
+  if (clib_mem_is_vec (id))
+    l = vec_len (id);
+
+  if (id)
+    for (i = 0; id[i] != 0 && i < l; i++)
+      {
+	u8 c = id[i];
+
+	if (c == '_')
+	  c = ' ';
+	vec_add1 (s, c);
+      }
+
+  return s;
+}
+
+u8 *
+format_hexdump (u8 * s, va_list * args)
+{
+  u8 *data = va_arg (*args, u8 *);
+  uword len = va_arg (*args, uword);
+  int i, index = 0;
+  const int line_len = 16;
+  u8 *line_hex = 0;
+  u8 *line_str = 0;
+  uword indent = format_get_indent (s);
+
+  if (!len)
+    return s;
+
+  for (i = 0; i < len; i++)
+    {
+      line_hex = format (line_hex, "%02x ", data[i]);
+      line_str = format (line_str, "%c", isprint (data[i]) ? data[i] : '.');
+      if (!((i + 1) % line_len))
+	{
+	  s = format (s, "%U%05x: %v[%v]",
+		      format_white_space, index ? indent : 0,
+		      index, line_hex, line_str);
+	  if (i < len - 1)
+	    s = format (s, "\n");
+	  index = i + 1;
+	  vec_reset_length (line_hex);
+	  vec_reset_length (line_str);
+	}
+    }
+
+  while (i++ % line_len)
+    line_hex = format (line_hex, "   ");
+
+  if (vec_len (line_hex))
+    s = format (s, "%U%05x: %v[%v]",
+		format_white_space, indent, index, line_hex, line_str);
+
+  vec_free (line_hex);
+  vec_free (line_str);
+
+  return s;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/string.c b/src/vppinfra/string.c
new file mode 100644
index 00000000..ba21e7b3
--- /dev/null
+++ b/src/vppinfra/string.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2006 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/string.h>
+#include <vppinfra/error.h>
+
+/* Exchanges source and destination. */
+void
+clib_memswap (void *_a, void *_b, uword bytes)
+{
+  uword pa = pointer_to_uword (_a);
+  uword pb = pointer_to_uword (_b);
+
+#define _(TYPE)					\
+  if (0 == ((pa | pb) & (sizeof (TYPE) - 1)))	\
+    {						\
+      TYPE * a = uword_to_pointer (pa, TYPE *);	\
+      TYPE * b = uword_to_pointer (pb, TYPE *);	\
+						\
+      while (bytes >= 2*sizeof (TYPE))		\
+	{					\
+	  TYPE a0, a1, b0, b1;			\
+	  bytes -= 2*sizeof (TYPE);		\
+	  a += 2;				\
+	  b += 2;				\
+	  a0 = a[-2]; a1 = a[-1];		\
+	  b0 = b[-2]; b1 = b[-1];		\
+	  a[-2] = b0; a[-1] = b1;		\
+	  b[-2] = a0; b[-1] = a1;		\
+	}					\
+      pa = pointer_to_uword (a);		\
+      pb = pointer_to_uword (b);		\
+    }
+
+  if (BITS (uword) == BITS (u64))
+    _(u64);
+  _(u32);
+  _(u16);
+  _(u8);
+
+#undef _
+
+  ASSERT (bytes < 2);
+  if (bytes)
+    {
+      u8 *a = uword_to_pointer (pa, u8 *);
+      u8 *b = uword_to_pointer (pb, u8 *);
+      u8 a0 = a[0], b0 = b[0];
+      a[0] = b0;
+      b[0] = a0;
+    }
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/string.h b/src/vppinfra/string.h
new file mode 100644
index 00000000..69a99a3f
--- /dev/null
+++ b/src/vppinfra/string.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_string_h
+#define included_clib_string_h
+
+#include <vppinfra/clib.h>	/* for CLIB_LINUX_KERNEL */
+#include <vppinfra/vector.h>
+
+#ifdef CLIB_LINUX_KERNEL
+#include <linux/string.h>
+#endif
+
+#ifdef CLIB_UNIX
+#include <string.h>
+#endif
+
+#ifdef CLIB_STANDALONE
+#include <vppinfra/standalone_string.h>
+#endif
+
+/* Exchanges source and destination. */
+void clib_memswap (void *_a, void *_b, uword bytes);
+
+/*
+ * the vector unit memcpy variants confuse coverity
+ * so don't let it anywhere near them.
+ */
+#ifndef __COVERITY__
+#if __AVX__
+#include <vppinfra/memcpy_avx.h>
+#elif __SSSE3__
+#include <vppinfra/memcpy_sse3.h>
+#else
+#define clib_memcpy(a,b,c) memcpy(a,b,c)
+#endif
+#else /* __COVERITY__ */
+#define clib_memcpy(a,b,c) memcpy(a,b,c)
+#endif
+
+#endif /* included_clib_string_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_bihash_template.c b/src/vppinfra/test_bihash_template.c
new file mode 100644
index 00000000..c505bd83
--- /dev/null
+++ b/src/vppinfra/test_bihash_template.c
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/time.h>
+#include <vppinfra/cache.h>
+#include <vppinfra/error.h>
+
+#include <vppinfra/bihash_8_8.h>
+#include <vppinfra/bihash_template.h>
+
+#include <vppinfra/bihash_template.c>
+
+typedef struct
+{
+  u64 seed;
+  u32 nbuckets;
+  u32 nitems;
+  u32 search_iter;
+  int careful_delete_tests;
+  int verbose;
+  int non_random_keys;
+  uword *key_hash;
+  u64 *keys;
+    BVT (clib_bihash) hash;
+  clib_time_t clib_time;
+
+  unformat_input_t *input;
+
+} test_main_t;
+
+test_main_t test_main;
+
+uword
+vl (void *v)
+{
+  return vec_len (v);
+}
+
+static clib_error_t *
+test_bihash (test_main_t * tm)
+{
+  int i, j;
+  uword *p;
+  uword total_searches;
+  f64 before, delta;
+  BVT (clib_bihash) * h;
+  BVT (clib_bihash_kv) kv;
+
+  h = &tm->hash;
+
+  BV (clib_bihash_init) (h, "test", tm->nbuckets, 3ULL << 30);
+
+  fformat (stdout, "Pick %lld unique %s keys...\n",
+	   tm->nitems, tm->non_random_keys ? "non-random" : "random");
+
+  for (i = 0; i < tm->nitems; i++)
+    {
+      u64 rndkey;
+
+      if (tm->non_random_keys == 0)
+	{
+
+	again:
+	  rndkey = random_u64 (&tm->seed);
+
+	  p = hash_get (tm->key_hash, rndkey);
+	  if (p)
+	    goto again;
+	}
+      else
+	rndkey = (u64) (i + 1) << 16;
+
+      hash_set (tm->key_hash, rndkey, i + 1);
+      vec_add1 (tm->keys, rndkey);
+    }
+
+  fformat (stdout, "Add items...\n");
+  for (i = 0; i < tm->nitems; i++)
+    {
+      kv.key = tm->keys[i];
+      kv.value = i + 1;
+
+      BV (clib_bihash_add_del) (h, &kv, 1 /* is_add */ );
+
+      if (tm->verbose > 1)
+	{
+	  fformat (stdout, "--------------------\n");
+	  fformat (stdout, "After adding key %llu value %lld...\n",
+		   tm->keys[i], (u64) (i + 1));
+	  fformat (stdout, "%U", BV (format_bihash), h,
+		   2 /* very verbose */ );
+	}
+    }
+
+  fformat (stdout, "%U", BV (format_bihash), h, 0 /* very verbose */ );
+
+  fformat (stdout, "Search for items %d times...\n", tm->search_iter);
+
+  before = clib_time_now (&tm->clib_time);
+
+  for (j = 0; j < tm->search_iter; j++)
+    {
+      u64 hash1 = clib_xxhash (tm->keys[0]);
+
+      for (i = 0; i < tm->nitems; i++)
+	{
+	  if (i < (tm->nitems - 3))
+	    {
+	      clib_bihash_bucket_t *b;
+	      BVT (clib_bihash_value) * v;
+	      u64 hash2 = clib_xxhash (tm->keys[i + 3]);
+	      u32 bucket_index = hash2 & (h->nbuckets - 1);
+	      b = &h->buckets[bucket_index];
+	      CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD);
+
+	      bucket_index = hash1 & (h->nbuckets - 1);
+	      b = &h->buckets[bucket_index];
+	      v = BV (clib_bihash_get_value) (h, b->offset);
+	      hash1 >>= h->log2_nbuckets;
+	      hash1 = hash1 & ((1 << b->log2_pages) - 1);
+	      v += hash1;
+	      CLIB_PREFETCH (v, CLIB_CACHE_LINE_BYTES, LOAD);
+
+	      hash1 = hash2;
+	    }
+
+	  kv.key = tm->keys[i];
+	  if (BV (clib_bihash_search) (h, &kv, &kv) < 0)
+	    clib_warning ("search for key %lld failed unexpectedly\n",
+			  tm->keys[i]);
+	  if (kv.value != (u64) (i + 1))
+	    clib_warning ("search for key %lld returned %lld, not %lld\n",
+			  tm->keys, kv.value, (u64) (i + 1));
+	}
+    }
+
+  delta = clib_time_now (&tm->clib_time) - before;
+  total_searches = (uword) tm->search_iter * (uword) tm->nitems;
+
+  if (delta > 0)
+    fformat (stdout, "%.f searches per second\n",
+	     ((f64) total_searches) / delta);
+
+  fformat (stdout, "%lld searches in %.6f seconds\n", total_searches, delta);
+
+  fformat (stdout, "Standard E-hash search for items %d times...\n",
+	   tm->search_iter);
+
+  before = clib_time_now (&tm->clib_time);
+
+  for (j = 0; j < tm->search_iter; j++)
+    {
+      for (i = 0; i < tm->nitems; i++)
+	{
+	  p = hash_get (tm->key_hash, tm->keys[i]);
+	  if (p == 0 || p[0] != (uword) (i + 1))
+	    clib_warning ("ugh, couldn't find %lld\n", tm->keys[i]);
+	}
+    }
+
+  delta = clib_time_now (&tm->clib_time) - before;
+  total_searches = (uword) tm->search_iter * (uword) tm->nitems;
+
+  fformat (stdout, "%lld searches in %.6f seconds\n", total_searches, delta);
+
+  if (delta > 0)
+    fformat (stdout, "%.f searches per second\n",
+	     ((f64) total_searches) / delta);
+
+  fformat (stdout, "Delete items...\n");
+
+  for (i = 0; i < tm->nitems; i++)
+    {
+      int j;
+      int rv;
+
+      kv.key = tm->keys[i];
+      kv.value = (u64) (i + 1);
+      rv = BV (clib_bihash_add_del) (h, &kv, 0 /* is_add */ );
+
+      if (rv < 0)
+	clib_warning ("delete key %lld not ok but should be", tm->keys[i]);
+
+      if (tm->careful_delete_tests)
+	{
+	  for (j = 0; j < tm->nitems; j++)
+	    {
+	      kv.key = tm->keys[j];
+	      rv = BV (clib_bihash_search) (h, &kv, &kv);
+	      if (j <= i && rv >= 0)
+		{
+		  clib_warning
+		    ("i %d j %d search ok but should not be, value %lld",
+		     i, j, kv.value);
+		}
+	      if (j > i && rv < 0)
+		{
+		  clib_warning ("i %d j %d search not ok but should be",
+				i, j);
+		}
+	    }
+	}
+    }
+
+  fformat (stdout, "After deletions, should be empty...\n");
+
+  fformat (stdout, "%U", BV (format_bihash), h, 0 /* very verbose */ );
+  return 0;
+}
+
+clib_error_t *
+test_bihash_main (test_main_t * tm)
+{
+  unformat_input_t *i = tm->input;
+  clib_error_t *error;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "seed %u", &tm->seed))
+	;
+
+      else if (unformat (i, "nbuckets %d", &tm->nbuckets))
+	;
+      else if (unformat (i, "non-random-keys"))
+	tm->non_random_keys = 1;
+      else if (unformat (i, "nitems %d", &tm->nitems))
+	;
+      else if (unformat (i, "careful %d", &tm->careful_delete_tests))
+	;
+      else if (unformat (i, "verbose %d", &tm->verbose))
+	;
+      else if (unformat (i, "search %d", &tm->search_iter))
+	;
+      else if (unformat (i, "verbose"))
+	tm->verbose = 1;
+      else
+	return clib_error_return (0, "unknown input '%U'",
+				  format_unformat_error, i);
+    }
+
+  error = test_bihash (tm);
+
+  return error;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  clib_error_t *error;
+  test_main_t *tm = &test_main;
+
+  clib_mem_init (0, 3ULL << 30);
+
+  tm->input = &i;
+  tm->seed = 0xdeaddabe;
+
+  tm->nbuckets = 2;
+  tm->nitems = 5;
+  tm->verbose = 1;
+  tm->search_iter = 1;
+  tm->careful_delete_tests = 0;
+  tm->key_hash = hash_create (0, sizeof (uword));
+  clib_time_init (&tm->clib_time);
+
+  unformat_init_command_line (&i, argv);
+  error = test_bihash_main (tm);
+  unformat_free (&i);
+
+  if (error)
+    {
+      clib_error_report (error);
+      return 1;
+    }
+  return 0;
+}
+#endif /* CLIB_UNIX */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_dlist.c b/src/vppinfra/test_dlist.c
new file mode 100644
index 00000000..c5535c85
--- /dev/null
+++ b/src/vppinfra/test_dlist.c
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vppinfra/dlist.h>
+
+typedef struct
+{
+  dlist_elt_t *test_pool;
+  u32 head_index;
+} test_main_t;
+
+test_main_t test_main;
+
+int
+test_dlist_main (unformat_input_t * input)
+{
+  test_main_t *tm = &test_main;
+  dlist_elt_t *head, *elt;
+  u32 elt_index, head_index;
+  u32 value;
+  int i;
+
+  pool_get (tm->test_pool, head);
+  head_index = head - tm->test_pool;
+  clib_dlist_init (tm->test_pool, head - tm->test_pool);
+
+  for (i = 1; i <= 3; i++)
+    {
+      pool_get (tm->test_pool, elt);
+      elt_index = elt - tm->test_pool;
+
+      clib_dlist_init (tm->test_pool, elt_index);
+      elt->value = i;
+      clib_dlist_addtail (tm->test_pool, head_index, elt_index);
+    }
+
+  head = pool_elt_at_index (tm->test_pool, head_index);
+
+  fformat (stdout, "Dump forward links\n");
+  elt_index = head->next;
+  i = 1;
+  value = 0;
+  while (value != ~0)
+    {
+      elt = pool_elt_at_index (tm->test_pool, elt_index);
+      fformat (stdout, "elt %d value %d\n", i++, elt->value);
+      elt_index = elt->next;
+      value = elt->value;
+    }
+
+  fformat (stdout, "Dump reverse links\n");
+  elt_index = head->prev;
+  i = 1;
+  value = 0;
+  while (value != ~0)
+    {
+      elt = pool_elt_at_index (tm->test_pool, elt_index);
+      fformat (stdout, "elt %d value %d\n", i++, elt->value);
+      elt_index = elt->prev;
+      value = elt->value;
+    }
+
+  fformat (stdout, "remove first element\n");
+
+  elt_index = clib_dlist_remove_head (tm->test_pool, head_index);
+  elt = pool_elt_at_index (tm->test_pool, elt_index);
+
+  fformat (stdout, "removed index %d value %d\n", elt_index, elt->value);
+
+  head = pool_elt_at_index (tm->test_pool, head_index);
+
+  fformat (stdout, "Dump forward links\n");
+  elt_index = head->next;
+  i = 1;
+  value = 0;
+  while (value != ~0)
+    {
+      elt = pool_elt_at_index (tm->test_pool, elt_index);
+      fformat (stdout, "elt %d value %d\n", i++, elt->value);
+      elt_index = elt->next;
+      value = elt->value;
+    }
+
+  fformat (stdout, "Dump reverse links\n");
+  elt_index = head->prev;
+  i = 1;
+  value = 0;
+  while (value != ~0)
+    {
+      elt = pool_elt_at_index (tm->test_pool, elt_index);
+      fformat (stdout, "elt %d value %d\n", i++, elt->value);
+      elt_index = elt->prev;
+      value = elt->value;
+    }
+
+  fformat (stdout, "re-insert index %d value %d at head\n", 1, 1);
+
+  clib_dlist_addhead (tm->test_pool, head_index, 1);
+
+  fformat (stdout, "Dump forward links\n");
+  elt_index = head->next;
+  i = 1;
+  value = 0;
+  while (value != ~0)
+    {
+      elt = pool_elt_at_index (tm->test_pool, elt_index);
+      fformat (stdout, "elt %d value %d\n", i++, elt->value);
+      elt_index = elt->next;
+      value = elt->value;
+    }
+
+  fformat (stdout, "Dump reverse links\n");
+  elt_index = head->prev;
+  i = 1;
+  value = 0;
+  while (value != ~0)
+    {
+      elt = pool_elt_at_index (tm->test_pool, elt_index);
+      fformat (stdout, "elt %d value %d\n", i++, elt->value);
+      elt_index = elt->prev;
+      value = elt->value;
+    }
+
+  fformat (stdout, "Remove middle element\n");
+
+  clib_dlist_remove (tm->test_pool, 2);
+  elt = pool_elt_at_index (tm->test_pool, 2);
+
+  fformat (stdout, "removed index %d value %d\n", elt_index, elt->value);
+
+  fformat (stdout, "Dump forward links\n");
+  elt_index = head->next;
+  i = 1;
+  value = 0;
+  while (value != ~0)
+    {
+      elt = pool_elt_at_index (tm->test_pool, elt_index);
+      fformat (stdout, "elt %d value %d\n", i++, elt->value);
+      elt_index = elt->next;
+      value = elt->value;
+    }
+
+  fformat (stdout, "Dump reverse links\n");
+  elt_index = head->prev;
+  i = 1;
+  value = 0;
+  while (value != ~0)
+    {
+      elt = pool_elt_at_index (tm->test_pool, elt_index);
+      fformat (stdout, "elt %d value %d\n", i++, elt->value);
+      elt_index = elt->prev;
+      value = elt->value;
+    }
+
+  return 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int ret;
+
+  clib_mem_init (0, 3ULL << 30);
+
+  unformat_init_command_line (&i, argv);
+  ret = test_dlist_main (&i);
+  unformat_free (&i);
+
+  return ret;
+}
+#endif /* CLIB_UNIX */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_elf.c b/src/vppinfra/test_elf.c
new file mode 100644
index 00000000..84fe0776
--- /dev/null
+++ b/src/vppinfra/test_elf.c
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2008 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/elf.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#ifndef CLIB_UNIX
+#error "unix only"
+#endif
+
+static clib_error_t *
+elf_set_interpreter (elf_main_t * em, char *interp)
+{
+  elf_segment_t *g;
+  elf_section_t *s;
+  clib_error_t *error;
+
+  vec_foreach (g, em->segments)
+  {
+    if (g->header.type == ELF_SEGMENT_INTERP)
+      break;
+  }
+
+  if (g >= vec_end (em->segments))
+    return clib_error_return (0, "interpreter not found");
+
+  if (g->header.memory_size < 1 + strlen (interp))
+    return clib_error_return (0,
+			      "given interpreter does not fit; must be less than %d bytes (`%s' given)",
+			      g->header.memory_size, interp);
+
+  error =
+    elf_get_section_by_start_address (em, g->header.virtual_address, &s);
+  if (error)
+    return error;
+
+  /* Put in new null terminated string. */
+  memset (s->contents, 0, vec_len (s->contents));
+  clib_memcpy (s->contents, interp, strlen (interp));
+
+  return 0;
+}
+
+static void
+delete_dynamic_rpath_entries_from_section (elf_main_t * em, elf_section_t * s)
+{
+  elf64_dynamic_entry_t *e;
+  elf64_dynamic_entry_t *new_es = 0;
+
+  vec_foreach (e, em->dynamic_entries)
+  {
+    switch (e->type)
+      {
+      case ELF_DYNAMIC_ENTRY_RPATH:
+      case ELF_DYNAMIC_ENTRY_RUN_PATH:
+	break;
+
+      default:
+	vec_add1 (new_es, e[0]);
+	break;
+      }
+  }
+
+  /* Pad so as to keep section size constant. */
+  {
+    elf64_dynamic_entry_t e_end;
+    e_end.type = ELF_DYNAMIC_ENTRY_END;
+    e_end.data = 0;
+    while (vec_len (new_es) < vec_len (em->dynamic_entries))
+      vec_add1 (new_es, e_end);
+  }
+
+  elf_set_dynamic_entries (em);
+}
+
+static void
+elf_delete_dynamic_rpath_entries (elf_main_t * em)
+{
+  elf_section_t *s;
+
+  vec_foreach (s, em->sections)
+  {
+    switch (s->header.type)
+      {
+      case ELF_SECTION_DYNAMIC:
+	delete_dynamic_rpath_entries_from_section (em, s);
+	break;
+
+      default:
+	break;
+      }
+  }
+}
+
+typedef struct
+{
+  elf_main_t elf_main;
+  char *input_file;
+  char *output_file;
+  char *set_interpreter;
+  int verbose;
+} elf_test_main_t;
+
+int
+main (int argc, char *argv[])
+{
+  elf_test_main_t _tm, *tm = &_tm;
+  elf_main_t *em = &tm->elf_main;
+  unformat_input_t i;
+  clib_error_t *error = 0;
+
+  memset (tm, 0, sizeof (tm[0]));
+
+  unformat_init_command_line (&i, argv);
+  while (unformat_check_input (&i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (&i, "in %s", &tm->input_file))
+	;
+      else if (unformat (&i, "out %s", &tm->output_file))
+	;
+      else if (unformat (&i, "set-interpreter %s", &tm->set_interpreter))
+	;
+      else if (unformat (&i, "verbose"))
+	tm->verbose = ~0;
+      else if (unformat (&i, "verbose-symbols"))
+	tm->verbose |= FORMAT_ELF_MAIN_SYMBOLS;
+      else if (unformat (&i, "verbose-relocations"))
+	tm->verbose |= FORMAT_ELF_MAIN_RELOCATIONS;
+      else if (unformat (&i, "verbose-dynamic"))
+	tm->verbose |= FORMAT_ELF_MAIN_DYNAMIC;
+      else
+	{
+	  error = unformat_parse_error (&i);
+	  goto done;
+	}
+    }
+
+  if (!tm->input_file)
+    {
+      clib_warning ("No input file! Using test_bihash_template");
+      tm->input_file = "test_bihash_template";
+    }
+
+  error = elf_read_file (em, tm->input_file);
+  if (error)
+    goto done;
+
+  if (tm->set_interpreter)
+    {
+      clib_error_t *error = elf_set_interpreter (em, tm->set_interpreter);
+      if (error)
+	goto done;
+      elf_delete_dynamic_rpath_entries (em);
+    }
+
+  if (tm->verbose)
+    fformat (stdout, "%U", format_elf_main, em, tm->verbose);
+
+  if (tm->output_file)
+    error = elf_write_file (em, tm->output_file);
+
+  elf_main_free (em);
+
+done:
+  if (error)
+    {
+      clib_error_report (error);
+      return 1;
+    }
+  else
+    return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_elog.c b/src/vppinfra/test_elog.c
new file mode 100644
index 00000000..89905adb
--- /dev/null
+++ b/src/vppinfra/test_elog.c
@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/elog.h>
+#include <vppinfra/error.h>
+#include <vppinfra/format.h>
+#include <vppinfra/random.h>
+#include <vppinfra/serialize.h>
+#include <vppinfra/unix.h>
+
+int
+test_elog_main (unformat_input_t * input)
+{
+  clib_error_t *error = 0;
+  u32 i, n_iter, seed, max_events;
+  elog_main_t _em, *em = &_em;
+  u32 verbose;
+  f64 min_sample_time;
+  char *dump_file, *load_file, *merge_file, **merge_files;
+  u8 *tag, **tags;
+
+  n_iter = 100;
+  max_events = 100000;
+  seed = 1;
+  verbose = 0;
+  dump_file = 0;
+  load_file = 0;
+  merge_files = 0;
+  tags = 0;
+  min_sample_time = 2;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "iter %d", &n_iter))
+	;
+      else if (unformat (input, "seed %d", &seed))
+	;
+      else if (unformat (input, "dump %s", &dump_file))
+	;
+      else if (unformat (input, "load %s", &load_file))
+	;
+      else if (unformat (input, "tag %s", &tag))
+	vec_add1 (tags, tag);
+      else if (unformat (input, "merge %s", &merge_file))
+	vec_add1 (merge_files, merge_file);
+
+      else if (unformat (input, "verbose %=", &verbose, 1))
+	;
+      else if (unformat (input, "max-events %d", &max_events))
+	;
+      else if (unformat (input, "sample-time %f", &min_sample_time))
+	;
+      else
+	{
+	  error = clib_error_create ("unknown input `%U'\n",
+				     format_unformat_error, input);
+	  goto done;
+	}
+    }
+
+#ifdef CLIB_UNIX
+  if (load_file)
+    {
+      if ((error = elog_read_file (em, load_file)))
+	goto done;
+    }
+
+  else if (merge_files)
+    {
+      uword i;
+      elog_main_t *ems;
+
+      vec_clone (ems, merge_files);
+
+      elog_init (em, max_events);
+      for (i = 0; i < vec_len (ems); i++)
+	{
+	  if ((error =
+	       elog_read_file (i == 0 ? em : &ems[i], merge_files[i])))
+	    goto done;
+	  if (i > 0)
+	    {
+	      elog_merge (em, tags[0], &ems[i], tags[i]);
+	      tags[0] = 0;
+	    }
+	}
+    }
+
+  else
+#endif /* CLIB_UNIX */
+    {
+      f64 t[2];
+
+      elog_init (em, max_events);
+      elog_enable_disable (em, 1);
+      t[0] = unix_time_now ();
+
+      for (i = 0; i < n_iter; i++)
+	{
+	  u32 j, n, sum;
+
+	  n = 1 + (random_u32 (&seed) % 128);
+	  sum = 0;
+	  for (j = 0; j < n; j++)
+	    sum += random_u32 (&seed);
+
+	  {
+	    ELOG_TYPE_XF (e);
+	    ELOG (em, e, sum);
+	  }
+
+	  {
+	    ELOG_TYPE_XF (e);
+	    ELOG (em, e, sum + 1);
+	  }
+
+	  {
+	    struct
+	    {
+	      u32 string_index;
+	      f32 f;
+	    } *d;
+	    ELOG_TYPE_DECLARE (e) =
+	    {
+	      .format = "fumble %s %.9f",.format_args =
+		"t4f4",.n_enum_strings = 4,.enum_strings =
+	      {
+	    "string0", "string1", "string2", "string3",},};
+
+	    d = ELOG_DATA (em, e);
+
+	    d->string_index = sum & 3;
+	    d->f = (sum & 0xff) / 128.;
+	  }
+
+	  {
+	    ELOG_TYPE_DECLARE (e) =
+	    {
+	    .format = "bar %d.%d.%d.%d",.format_args = "i1i1i1i1",};
+	    ELOG_TRACK (my_track);
+	    u8 *d = ELOG_TRACK_DATA (em, e, my_track);
+	    d[0] = i + 0;
+	    d[1] = i + 1;
+	    d[2] = i + 2;
+	    d[3] = i + 3;
+	  }
+
+	  {
+	    ELOG_TYPE_DECLARE (e) =
+	    {
+	    .format = "bar `%s'",.format_args = "s20",};
+	    struct
+	    {
+	      char s[20];
+	    } *d;
+	    u8 *v;
+
+	    d = ELOG_DATA (em, e);
+	    v = format (0, "foo %d%c", i, 0);
+	    clib_memcpy (d->s, v, clib_min (vec_len (v), sizeof (d->s)));
+	  }
+
+	  {
+	    ELOG_TYPE_DECLARE (e) =
+	    {
+	    .format = "bar `%s'",.format_args = "T4",};
+	    struct
+	    {
+	      u32 offset;
+	    } *d;
+
+	    d = ELOG_DATA (em, e);
+	    d->offset = elog_string (em, "string table %d", i);
+	  }
+	}
+
+      do
+	{
+	  t[1] = unix_time_now ();
+	}
+      while (t[1] - t[0] < min_sample_time);
+    }
+
+#ifdef CLIB_UNIX
+  if (dump_file)
+    {
+      if ((error = elog_write_file (em, dump_file)))
+	goto done;
+    }
+#endif
+
+  if (verbose)
+    {
+      elog_event_t *e, *es;
+      es = elog_get_events (em);
+      vec_foreach (e, es)
+      {
+	clib_warning ("%18.9f: %12U %U\n", e->time,
+		      format_elog_track, em, e, format_elog_event, em, e);
+      }
+    }
+
+done:
+  if (error)
+    clib_error_report (error);
+  return 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int r;
+
+  unformat_init_command_line (&i, argv);
+  r = test_elog_main (&i);
+  unformat_free (&i);
+  return r;
+}
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_fifo.c b/src/vppinfra/test_fifo.c
new file mode 100644
index 00000000..45392bc3
--- /dev/null
+++ b/src/vppinfra/test_fifo.c
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/fifo.h>
+#include <vppinfra/random.h>
+
+typedef struct
+{
+  int a, b, c;
+} A;
+
+always_inline void
+A_set (A * a, int k)
+{
+  a->a = 1 * k;
+  a->b = 2 * k;
+  a->c = 3 * k;
+}
+
+always_inline int
+A_is_valid (A * a, int k)
+{
+  return a->a == 1 * k && a->b == 2 * k && a->c == 3 * k;
+}
+
+int
+test_fifo_main (unformat_input_t * input)
+{
+  u32 n_added, n_removed, i, j, n_iter, seed, verbose;
+  A *as = 0, *a;
+
+  n_iter = 1000;
+  seed = random_default_seed ();
+  verbose = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "iter %d", &n_iter))
+	;
+      else if (unformat (input, "seed %d", &seed))
+	;
+      else if (unformat (input, "verbose %=", &verbose, 1))
+	;
+      else
+	{
+	  clib_warning ("unknown input `%U'\n", format_unformat_error, input);
+	  return 1;
+	}
+    }
+
+  if (verbose)
+    clib_warning ("iter %d seed %d\n", n_iter, seed);
+
+  n_added = n_removed = 0;
+  for (i = 0; i < n_iter; i++)
+    {
+      if (clib_fifo_elts (as) > 0 && (random_u32 (&seed) & 1))
+	{
+	  A tmp;
+	  clib_fifo_sub1 (as, tmp);
+	  ASSERT (A_is_valid (&tmp, n_removed));
+	  n_removed++;
+	}
+      else
+	{
+	  clib_fifo_add2 (as, a);
+	  A_set (a, n_added);
+	  n_added++;
+	}
+
+      ASSERT (clib_fifo_elts (as) == n_added - n_removed);
+
+      j = 0;
+      /* *INDENT-OFF* */
+      clib_fifo_foreach (a, as, {
+	ASSERT (A_is_valid (a, n_removed + j));
+	j++;
+      });
+      /* *INDENT-ON* */
+
+      ASSERT (j == clib_fifo_elts (as));
+    }
+
+  clib_fifo_free (as);
+
+  return 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int r;
+
+  unformat_init_command_line (&i, argv);
+  r = test_fifo_main (&i);
+  unformat_free (&i);
+
+  return r;
+}
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_format.c b/src/vppinfra/test_format.c
new file mode 100644
index 00000000..cc95a00e
--- /dev/null
+++ b/src/vppinfra/test_format.c
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/format.h>
+
+static int verbose;
+static u8 *test_vec;
+
+static u8 *
+format_test1 (u8 * s, va_list * va)
+{
+  uword x = va_arg (*va, uword);
+  f64 y = va_arg (*va, f64);
+  return format (s, "%12d %12f%12.4e", x, y, y);
+}
+
+static int
+expectation (const char *exp, char *fmt, ...)
+{
+  int ret = 0;
+
+  va_list va;
+  va_start (va, fmt);
+  test_vec = va_format (test_vec, fmt, &va);
+  va_end (va);
+
+  vec_add1 (test_vec, 0);
+  if (strcmp (exp, (char *) test_vec))
+    {
+      fformat (stdout, "FAIL: %s (expected vs. result)\n\"%s\"\n\"%v\"\n",
+	       fmt, exp, test_vec);
+      ret = 1;
+    }
+  else if (verbose)
+    fformat (stdout, "PASS: %s\n", fmt);
+  vec_delete (test_vec, vec_len (test_vec), 0);
+  return ret;
+}
+
+int
+test_format_main (unformat_input_t * input)
+{
+  int ret = 0;
+  u8 *food = format (0, "food");
+
+  ret |= expectation ("foo", "foo");
+  ret |= expectation ("foo", "%s", "foo");
+  ret |= expectation ("9876", "%d", 9876);
+  ret |= expectation ("-9876", "%wd", (word) - 9876);
+  ret |= expectation ("98765432", "%u", 98765432);
+  ret |= expectation ("1200ffee", "%x", 0x1200ffee);
+  ret |= expectation ("BABEBABE", "%X", 0xbabebabe);
+  ret |= expectation ("10%a", "%d%%%c", 10, 'a');
+  ret |= expectation ("123456789abcdef0", "%016Lx", 0x123456789abcdef0LL);
+  ret |= expectation ("00000123", "%08x", 0x123);
+  ret |= expectation ("             23           23    2.3037e1",
+		      "%40U", format_test1, 23, 23.0367);
+  ret |= expectation ("left      ", "%-10s", "left");
+  ret |= expectation ("  center  ", "%=10s", "center");
+  ret |= expectation ("     right", "%+10s", "right");
+  ret |= expectation ("123456", "%.0f", 123456.);
+  ret |= expectation ("1234567.0", "%.1f", 1234567.);
+  ret |= expectation ("foo", "%.*s", 3, "food");
+  ret |= expectation ("food      ", "%.*s", 10, "food          ");
+  ret |= expectation ("(nil)", "%.*s", 3, (void *) 0);
+  ret |= expectation ("foo", "%.*v", 3, food);
+  ret |= expectation ("foobar", "%.*v%s", 3, food, "bar");
+  ret |= expectation ("foo bar", "%S", "foo_bar");
+  vec_free (food);
+  vec_free (test_vec);
+  return ret;
+}
+
+typedef struct
+{
+  int a, b;
+} foo_t;
+
+static u8 *
+format_foo (u8 * s, va_list * va)
+{
+  foo_t *foo = va_arg (*va, foo_t *);
+  return format (s, "{a %d, b %d}", foo->a, foo->b);
+}
+
+static uword
+unformat_foo (unformat_input_t * i, va_list * va)
+{
+  foo_t *foo = va_arg (*va, foo_t *);
+  return unformat (i, "{%D,%D}",
+		   sizeof (foo->a), &foo->a, sizeof (foo->b), &foo->b);
+}
+
+int
+test_unformat_main (unformat_input_t * input)
+{
+  u32 v[8];
+  long l;
+  long long ll;
+  f64 f;
+  u8 *s;
+  foo_t foo = {.a = ~0,.b = ~0 };
+
+  v[0] = v[1] = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "01 %d %d", &v[0], &v[1]))
+	fformat (stdout, "got 01 %d %d\n", v[0], v[1]);
+      else if (unformat (input, "d %d", &v[0]))
+	fformat (stdout, "got it d %d\n", v[0]);
+      else if (unformat (input, "ld %ld", &l))
+	fformat (stdout, "got it ld %ld\n", l);
+      else if (unformat (input, "lld %lld", &ll))
+	fformat (stdout, "got it lld %lld\n", ll);
+      else if (unformat (input, "string %s", &s))
+	fformat (stdout, "got string `%s'\n", s);
+      else if (unformat (input, "float %f", &f))
+	fformat (stdout, "got float `%.4f'\n", f);
+      else if (unformat (input, "foo %U", unformat_foo, &foo))
+	fformat (stdout, "got a foo `%U'\n", format_foo, &foo);
+      else if (unformat (input, "ignore-me1"))
+	fformat (stdout, "got an `ignore-me1'\n");
+      else if (unformat (input, "ignore-me2"))
+	fformat (stdout, "got an `ignore-me2'\n");
+      else if (unformat (input, "gi%d_%d@-", &v[0], &v[1]))
+	fformat (stdout, "got `gi%d_%d@-'\n", v[0], v[1]);
+      else if (unformat (input, "%_%d.%d.%d.%d%_->%_%d.%d.%d.%d%_",
+			 &v[0], &v[1], &v[2], &v[3],
+			 &v[4], &v[5], &v[6], &v[7]))
+	fformat (stdout, "got %d.%d.%d.%d -> %d.%d.%d.%d",
+		 v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7]);
+      else
+	{
+	  clib_warning ("unknown input `%U'\n", format_unformat_error, input);
+	  return 1;
+	}
+    }
+
+  return 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+
+  verbose = (argc > 1);
+  unformat_init_command_line (&i, argv);
+
+  if (unformat (&i, "unformat"))
+    return test_unformat_main (&i);
+  else
+    return test_format_main (&i);
+}
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_hash.c b/src/vppinfra/test_hash.c
new file mode 100644
index 00000000..94110ab6
--- /dev/null
+++ b/src/vppinfra/test_hash.c
@@ -0,0 +1,458 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifdef CLIB_LINUX_KERNEL
+#include <linux/unistd.h>
+#endif
+
+#ifdef CLIB_UNIX
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <vppinfra/time.h>
+#endif
+
+#include <vppinfra/random.h>
+#include <vppinfra/mem.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/format.h>
+#include <vppinfra/bitmap.h>
+
+static int verbose;
+#define if_verbose(format,args...) \
+  if (verbose) { clib_warning(format, ## args); }
+
+typedef struct
+{
+  int n_iterations;
+
+  int n_iterations_per_print;
+
+  /* Number of pairs to insert into hash. */
+  int n_pairs;
+
+  /* True to validate correctness of hash functions. */
+  int n_iterations_per_validate;
+
+  /* Non-zero if hash table size is to be fixed. */
+  int fixed_hash_size;
+
+  /* Verbosity level for hash formats. */
+  int verbose;
+
+  /* Random number seed. */
+  u32 seed;
+} hash_test_t;
+
+static clib_error_t *
+hash_next_test (word * h)
+{
+  hash_next_t hn = { 0 };
+  hash_pair_t *p0, *p1;
+  clib_error_t *error = 0;
+
+  /* *INDENT-OFF* */
+  hash_foreach_pair (p0, h, {
+    p1 = hash_next (h, &hn);
+    error = CLIB_ERROR_ASSERT (p0 == p1);
+    if (error)
+      break;
+  });
+  /* *INDENT-ON* */
+
+  if (!error)
+    error = CLIB_ERROR_ASSERT (!hash_next (h, &hn));
+
+  return error;
+}
+
+static u8 *
+test1_format (u8 * s, va_list * args)
+{
+  void *CLIB_UNUSED (user_arg) = va_arg (*args, void *);
+  void *v = va_arg (*args, void *);
+  hash_pair_t *p = va_arg (*args, hash_pair_t *);
+  hash_t *h = hash_header (v);
+
+  return format (s, "0x%8U -> 0x%8U",
+		 format_hex_bytes, &p->key, sizeof (p->key),
+		 format_hex_bytes, &p->value[0], hash_value_bytes (h));
+}
+
+static clib_error_t *
+test_word_key (hash_test_t * ht)
+{
+  word *h = 0;
+  word i, j;
+
+  word *keys = 0, *vals = 0;
+  uword *is_inserted = 0;
+
+  clib_error_t *error = 0;
+
+  vec_resize (keys, ht->n_pairs);
+  vec_resize (vals, vec_len (keys));
+
+  h = hash_create (ht->fixed_hash_size, sizeof (vals[0]));
+
+  hash_set_pair_format (h, test1_format, 0);
+  if (ht->fixed_hash_size)
+    hash_set_flags (h, HASH_FLAG_NO_AUTO_GROW | HASH_FLAG_NO_AUTO_SHRINK);
+
+  {
+    uword *unique = 0;
+    u32 k;
+
+    for (i = 0; i < vec_len (keys); i++)
+      {
+	do
+	  {
+	    k = random_u32 (&ht->seed) & 0xfffff;
+	  }
+	while (clib_bitmap_get (unique, k));
+	unique = clib_bitmap_ori (unique, k);
+	keys[i] = k;
+	vals[i] = i;
+      }
+
+    clib_bitmap_free (unique);
+  }
+
+  for (i = 0; i < ht->n_iterations; i++)
+    {
+      u32 vi = random_u32 (&ht->seed) % vec_len (keys);
+
+      if (clib_bitmap_get (is_inserted, vi))
+	hash_unset (h, keys[vi]);
+      else
+	hash_set (h, keys[vi], vals[vi]);
+
+      is_inserted = clib_bitmap_xori (is_inserted, vi);
+
+      if (ht->n_iterations_per_print > 0
+	  && ((i + 1) % ht->n_iterations_per_print) == 0)
+	if_verbose ("iteration %d\n  %U", i + 1, format_hash, h, ht->verbose);
+
+      if (ht->n_iterations_per_validate == 0
+	  || (i + 1) % ht->n_iterations_per_validate)
+	continue;
+
+      {
+	hash_pair_t *p;
+	uword ki;
+
+	  /* *INDENT-OFF* */
+	  hash_foreach_pair (p, h, {
+	      ki = p->value[0];
+	      ASSERT (keys[ki] == p->key);
+	  });
+	  /* *INDENT-ON* */
+      }
+
+      clib_mem_validate ();
+
+      if ((error = hash_validate (h)))
+	goto done;
+
+      for (j = 0; j < vec_len (keys); j++)
+	{
+	  uword *v;
+	  v = hash_get (h, keys[j]);
+	  if ((error =
+	       CLIB_ERROR_ASSERT (clib_bitmap_get (is_inserted, j) ==
+				  (v != 0))))
+	    goto done;
+	  if (v)
+	    {
+	      if ((error = CLIB_ERROR_ASSERT (v[0] == vals[j])))
+		goto done;
+	    }
+	}
+    }
+
+  if ((error = hash_next_test (h)))
+    goto done;
+
+  if_verbose ("%U", format_hash, h, ht->verbose);
+
+  for (i = 0; i < vec_len (keys); i++)
+    {
+      if (!clib_bitmap_get (is_inserted, i))
+	continue;
+
+      hash_unset (h, keys[i]);
+      is_inserted = clib_bitmap_xori (is_inserted, i);
+
+      if (ht->n_iterations_per_validate == 0
+	  || (i + 1) % ht->n_iterations_per_validate)
+	continue;
+
+      clib_mem_validate ();
+
+      if ((error = hash_validate (h)))
+	goto done;
+
+      for (j = 0; j < vec_len (keys); j++)
+	{
+	  uword *v;
+	  v = hash_get (h, keys[j]);
+	  if ((error =
+	       CLIB_ERROR_ASSERT (clib_bitmap_get (is_inserted, j) ==
+				  (v != 0))))
+	    goto done;
+	  if (v)
+	    {
+	      if ((error = CLIB_ERROR_ASSERT (v[0] == vals[j])))
+		goto done;
+	    }
+	}
+    }
+
+done:
+  hash_free (h);
+  vec_free (keys);
+  vec_free (vals);
+  clib_bitmap_free (is_inserted);
+
+  if (verbose)
+    fformat (stderr, "%U\n", format_clib_mem_usage, /* verbose */ 0);
+
+  return error;
+}
+
+static u8 *
+test2_format (u8 * s, va_list * args)
+{
+  void *CLIB_UNUSED (user_arg) = va_arg (*args, void *);
+  void *v = va_arg (*args, void *);
+  hash_pair_t *p = va_arg (*args, hash_pair_t *);
+  hash_t *h = hash_header (v);
+
+  return format (s, "0x%8U <- %v",
+		 format_hex_bytes, &p->value[0], hash_value_bytes (h),
+		 p->key);
+}
+
+static clib_error_t *
+test_string_key (hash_test_t * ht)
+{
+  word i, j;
+
+  u8 **keys = 0;
+  word *vals = 0;
+  uword *is_inserted = 0;
+
+  word *h = 0;
+
+  clib_error_t *error = 0;
+
+  vec_resize (keys, ht->n_pairs);
+  vec_resize (vals, vec_len (keys));
+
+  h =
+    hash_create_vec (ht->fixed_hash_size, sizeof (keys[0][0]),
+		     sizeof (uword));
+  hash_set_pair_format (h, test2_format, 0);
+  if (ht->fixed_hash_size)
+    hash_set_flags (h, HASH_FLAG_NO_AUTO_SHRINK | HASH_FLAG_NO_AUTO_GROW);
+
+  for (i = 0; i < vec_len (keys); i++)
+    {
+      keys[i] = random_string (&ht->seed, 5 + (random_u32 (&ht->seed) & 0xf));
+      keys[i] = format (keys[i], "%x", i);
+      vals[i] = random_u32 (&ht->seed);
+    }
+
+  for (i = 0; i < ht->n_iterations; i++)
+    {
+      u32 vi = random_u32 (&ht->seed) % vec_len (keys);
+
+      if (clib_bitmap_get (is_inserted, vi))
+	hash_unset_mem (h, keys[vi]);
+      else
+	hash_set_mem (h, keys[vi], vals[vi]);
+
+      is_inserted = clib_bitmap_xori (is_inserted, vi);
+
+      if (ht->n_iterations_per_print > 0
+	  && ((i + 1) % ht->n_iterations_per_print) == 0)
+	if_verbose ("iteration %d\n  %U", i + 1, format_hash, h, ht->verbose);
+
+      if (ht->n_iterations_per_validate == 0
+	  || (i + 1) % ht->n_iterations_per_validate)
+	continue;
+
+      clib_mem_validate ();
+
+      if ((error = hash_validate (h)))
+	goto done;
+
+      for (j = 0; j < vec_len (keys); j++)
+	{
+	  uword *v;
+	  v = hash_get_mem (h, keys[j]);
+	  if ((error =
+	       CLIB_ERROR_ASSERT (clib_bitmap_get (is_inserted, j) ==
+				  (v != 0))))
+	    goto done;
+	  if (v)
+	    {
+	      if ((error = CLIB_ERROR_ASSERT (v[0] == vals[j])))
+		goto done;
+	    }
+	}
+    }
+
+  if ((error = hash_next_test (h)))
+    goto done;
+
+  if_verbose ("%U", format_hash, h, ht->verbose);
+
+  for (i = 0; i < vec_len (keys); i++)
+    {
+      if (!clib_bitmap_get (is_inserted, i))
+	continue;
+
+      hash_unset_mem (h, keys[i]);
+      is_inserted = clib_bitmap_xori (is_inserted, i);
+
+      if (ht->n_iterations_per_validate == 0
+	  || (i + 1) % ht->n_iterations_per_validate)
+	continue;
+
+      clib_mem_validate ();
+
+      if ((error = hash_validate (h)))
+	goto done;
+
+      for (j = 0; j < vec_len (keys); j++)
+	{
+	  uword *v;
+	  v = hash_get_mem (h, keys[j]);
+	  if ((error =
+	       CLIB_ERROR_ASSERT (clib_bitmap_get (is_inserted, j) ==
+				  (v != 0))))
+	    goto done;
+	  if (v)
+	    {
+	      if ((error = CLIB_ERROR_ASSERT (v[0] == vals[j])))
+		goto done;
+	    }
+	}
+    }
+
+done:
+  hash_free (h);
+  vec_free (vals);
+  clib_bitmap_free (is_inserted);
+
+  for (i = 0; i < vec_len (keys); i++)
+    vec_free (keys[i]);
+  vec_free (keys);
+
+  if (verbose)
+    fformat (stderr, "%U\n", format_clib_mem_usage, /* verbose */ 0);
+
+  return error;
+}
+
+int
+test_hash_main (unformat_input_t * input)
+{
+  hash_test_t _ht = { 0 }, *ht = &_ht;
+  clib_error_t *error;
+
+  ht->n_iterations = 100;
+  ht->n_pairs = 10;
+  ht->fixed_hash_size = 0;	/* zero means non-fixed size */
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (0 == unformat (input, "iter %d", &ht->n_iterations)
+	  && 0 == unformat (input, "print %d", &ht->n_iterations_per_print)
+	  && 0 == unformat (input, "elts %d", &ht->n_pairs)
+	  && 0 == unformat (input, "size %d", &ht->fixed_hash_size)
+	  && 0 == unformat (input, "seed %d", &ht->seed)
+	  && 0 == unformat (input, "verbose %=", &ht->verbose, 1)
+	  && 0 == unformat (input, "valid %d",
+			    &ht->n_iterations_per_validate))
+	{
+	  clib_warning ("unknown input `%U'", format_unformat_error, input);
+	  return 1;
+	}
+    }
+
+  if (!ht->seed)
+    ht->seed = random_default_seed ();
+
+  if_verbose ("testing %d iterations, seed %d", ht->n_iterations, ht->seed);
+
+  error = test_word_key (ht);
+  if (error)
+    clib_error_report (error);
+
+  error = test_string_key (ht);
+  if (error)
+    clib_error_report (error);
+
+  return 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int ret;
+
+  verbose = (argc > 1);
+  unformat_init_command_line (&i, argv);
+  ret = test_hash_main (&i);
+  unformat_free (&i);
+
+  return ret;
+}
+#endif /* CLIB_UNIX */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_heap.c b/src/vppinfra/test_heap.c
new file mode 100644
index 00000000..3d5171bf
--- /dev/null
+++ b/src/vppinfra/test_heap.c
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <unistd.h>
+#include <stdlib.h>
+
+#include <vppinfra/mem.h>
+#include <vppinfra/heap.h>
+#include <vppinfra/format.h>
+
+static int verbose;
+#define if_verbose(format,args...) \
+  if (verbose) { clib_warning(format, ## args); }
+
+int
+main (int argc, char *argv[])
+{
+  word i, j, k, n, check_mask;
+  u32 seed;
+  u32 *h = 0;
+  uword *objects = 0;
+  uword *handles = 0;
+  uword objects_used;
+  uword align, fixed_size;
+
+  n = 10;
+  seed = (u32) getpid ();
+  check_mask = 0;
+  fixed_size = 0;
+
+  if (argc > 1)
+    {
+      n = atoi (argv[1]);
+      verbose = 1;
+    }
+  if (argc > 2)
+    {
+      word i = atoi (argv[2]);
+      if (i)
+	seed = i;
+    }
+  if (argc > 3)
+    check_mask = atoi (argv[3]);
+
+  align = 0;
+  if (argc > 4)
+    align = 1 << atoi (argv[4]);
+
+  if_verbose ("testing %wd iterations seed %wd\n", n, seed);
+
+  if (verbose)
+    fformat (stderr, "%U\n", format_clib_mem_usage, /* verbose */ 0);
+
+  vec_resize (objects, 1000);
+  if (vec_bytes (objects))	/* stupid warning be gone */
+    memset (objects, ~0, vec_bytes (objects));
+  vec_resize (handles, vec_len (objects));
+
+  objects_used = 0;
+
+  if (fixed_size)
+    {
+      uword max_len = 1024 * 1024;
+      void *memory = clib_mem_alloc (max_len * sizeof (h[0]));
+      h = heap_create_from_memory (memory, max_len, sizeof (h[0]));
+    }
+
+  for (i = 0; i < n; i++)
+    {
+      while (1)
+	{
+	  j = random_u32 (&seed) % vec_len (objects);
+	  if (objects[j] != ~0 || i + objects_used < n)
+	    break;
+	}
+
+      if (objects[j] != ~0)
+	{
+	  heap_dealloc (h, handles[j]);
+	  objects_used--;
+	  objects[j] = ~0;
+	}
+      else
+	{
+	  u32 *data;
+	  uword size;
+
+	  size = 1 + (random_u32 (&seed) % 100);
+	  objects[j] = heap_alloc_aligned (h, size, align, handles[j]);
+	  objects_used++;
+
+	  if (align)
+	    ASSERT (0 == (objects[j] & (align - 1)));
+	  ASSERT (objects[j] < vec_len (h));
+	  ASSERT (size <= heap_len (h, handles[j]));
+
+	  /* Set newly allocated object with test data. */
+	  if (check_mask & 2)
+	    {
+	      data = h + objects[j];
+
+	      for (k = 0; k < size; k++)
+		data[k] = objects[j] + k;
+	    }
+	}
+
+      if (check_mask & 1)
+	heap_validate (h);
+
+      if (check_mask & 4)
+	{
+	  /* Duplicate heap at each iteration. */
+	  u32 *h1 = heap_dup (h);
+	  heap_free (h);
+	  h = h1;
+	}
+
+      /* Verify that all used objects have correct test data. */
+      if (check_mask & 2)
+	{
+	  for (j = 0; j < vec_len (objects); j++)
+	    if (objects[j] != ~0)
+	      {
+		u32 *data = h + objects[j];
+		for (k = 0; k < heap_len (h, handles[j]); k++)
+		  ASSERT (data[k] == objects[j] + k);
+	      }
+	}
+    }
+
+  if (verbose)
+    fformat (stderr, "%U\n", format_heap, h, 1);
+
+  {
+    u32 *h1 = heap_dup (h);
+    if (verbose)
+      fformat (stderr, "%U\n", format_heap, h1, 1);
+    heap_free (h1);
+  }
+
+  heap_free (h);
+  if (verbose)
+    fformat (stderr, "%U\n", format_heap, h, 1);
+  ASSERT (objects_used == 0);
+
+  vec_free (objects);
+  vec_free (handles);
+
+  if (fixed_size)
+    vec_free_h (h, sizeof (heap_header_t));
+
+  if (verbose)
+    fformat (stderr, "%U\n", format_clib_mem_usage, /* verbose */ 0);
+
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_longjmp.c b/src/vppinfra/test_longjmp.c
new file mode 100644
index 00000000..2415c4f0
--- /dev/null
+++ b/src/vppinfra/test_longjmp.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/clib.h>
+#include <vppinfra/longjmp.h>
+#include <vppinfra/format.h>
+
+static void test_calljmp (unformat_input_t * input);
+
+static int i;
+
+static int verbose;
+#define if_verbose(format,args...) \
+  if (verbose) { clib_warning(format, ## args); }
+
+static never_inline void
+f2 (clib_longjmp_t * env)
+{
+  i++;
+  clib_longjmp (env, 1);
+}
+
+static never_inline void
+f1 (clib_longjmp_t * env)
+{
+  i++;
+  f2 (env);
+}
+
+int
+test_longjmp_main (unformat_input_t * input)
+{
+  clib_longjmp_t env;
+
+  i = 0;
+  if (clib_setjmp (&env, 0) == 0)
+    {
+      if_verbose ("calling long jumper %d", i);
+      f1 (&env);
+    }
+  if_verbose ("back from long jump %d", i);
+
+  test_calljmp (input);
+
+  return 0;
+}
+
+static uword
+f3 (uword arg)
+{
+  uword i, j, array[10];
+
+  for (i = 0; i < ARRAY_LEN (array); i++)
+    array[i] = arg + i;
+
+  j = 0;
+  for (i = 0; i < ARRAY_LEN (array); i++)
+    j ^= array[i];
+
+  return j;
+}
+
+static void
+test_calljmp (unformat_input_t * input)
+{
+  static u8 stack[32 * 1024] __attribute__ ((aligned (16)));
+  uword v;
+
+  v = clib_calljmp (f3, 0, stack + sizeof (stack));
+  ASSERT (v == f3 (0));
+  if_verbose ("calljump ok");
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int res;
+
+  verbose = (argc > 1);
+  unformat_init_command_line (&i, argv);
+  res = test_longjmp_main (&i);
+  unformat_free (&i);
+  return res;
+}
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_macros.c b/src/vppinfra/test_macros.c
new file mode 100644
index 00000000..de8f2c49
--- /dev/null
+++ b/src/vppinfra/test_macros.c
@@ -0,0 +1,64 @@
+/*
+  Copyright (c) 2014 Cisco and/or its affiliates.
+
+  * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#include <vppinfra/macros.h>
+
+macro_main_t macro_main;
+
+int
+test_macros_main (unformat_input_t * input)
+{
+  macro_main_t *mm = &macro_main;
+
+  clib_macro_init (mm);
+
+  fformat (stdout, "hostname: %s\n",
+	   clib_macro_eval_dollar (mm, "hostname", 1 /* complain */ ));
+
+  clib_macro_set_value (mm, "foo", "this is foo which contains $(bar)");
+  clib_macro_set_value (mm, "bar", "bar");
+
+  fformat (stdout, "evaluate: %s\n",
+	   clib_macro_eval (mm, "returns '$(foo)'", 1 /* complain */ ));
+
+  clib_macro_free (mm);
+
+  return 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int ret;
+
+  unformat_init_command_line (&i, argv);
+  ret = test_macros_main (&i);
+  unformat_free (&i);
+
+  return ret;
+}
+#endif /* CLIB_UNIX */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_md5.c b/src/vppinfra/test_md5.c
new file mode 100644
index 00000000..4be6f964
--- /dev/null
+++ b/src/vppinfra/test_md5.c
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2004 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/vec.h>
+#include <vppinfra/format.h>
+#include <vppinfra/error.h>
+#include <vppinfra/md5.h>
+
+#include <fcntl.h>
+#include <unistd.h>
+
+static clib_error_t *md5_test_suite (void);
+
+int
+main (int argc, char *argv[])
+{
+  int i;
+
+  if (argc == 1)
+    {
+      clib_error_t *e;
+      e = md5_test_suite ();
+      if (e)
+	{
+	  clib_error_report (e);
+	  exit (1);
+	}
+    }
+
+  for (i = 1; i < argc; i++)
+    {
+      md5_context_t m;
+      u8 digest[16];
+      u8 buffer[64 * 1024];
+      int fd, n;
+
+      fd = open (argv[i], 0);
+      if (fd < 0)
+	clib_unix_error ("can't open %s", argv[i]);
+
+      md5_init (&m);
+      while ((n = read (fd, buffer, sizeof (buffer))) > 0)
+	md5_add (&m, buffer, n);
+      close (fd);
+      md5_finish (&m, digest);
+      fformat (stdout, "%U  %s\n",
+	       format_hex_bytes, digest, sizeof (digest), argv[i]);
+    }
+
+  return 0;
+}
+
+static clib_error_t *
+md5_test_suite (void)
+{
+  typedef struct
+  {
+    char *input;
+    char *output;
+  } md5_test_t;
+
+  static md5_test_t tests[] = {
+    {.input = "",
+     .output = "d41d8cd98f00b204e9800998ecf8427e",},
+    {.input = "a",
+     .output = "0cc175b9c0f1b6a831c399e269772661",},
+    {.input = "abc",
+     .output = "900150983cd24fb0d6963f7d28e17f72",},
+    {.input = "message digest",
+     .output = "f96b697d7cb7938d525a2f31aaf161d0",},
+    {.input = "abcdefghijklmnopqrstuvwxyz",
+     .output = "c3fcd3d76192e4007dfb496cca67e13b",},
+    {.input =
+     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+     .output = "d174ab98d277d9f5a5611c2c9f419d9f",},
+    {.input =
+     "12345678901234567890123456789012345678901234567890123456789012345678901234567890",
+     .output = "57edf4a22be3c955ac49da2e2107b67a",},
+  };
+
+  int i;
+  u8 *s;
+  md5_context_t m;
+  u8 digest[16];
+
+  for (i = 0; i < ARRAY_LEN (tests); i++)
+    {
+      md5_init (&m);
+      md5_add (&m, tests[i].input, strlen (tests[i].input));
+      md5_finish (&m, digest);
+      s = format (0, "%U", format_hex_bytes, digest, sizeof (digest));
+      if (memcmp (s, tests[i].output, 2 * sizeof (digest)))
+	return clib_error_return
+	  (0, "%s -> %v expected %s", tests[i].input, s, tests[i].output);
+      vec_free (s);
+    }
+
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_mheap.c b/src/vppinfra/test_mheap.c
new file mode 100644
index 00000000..6bc36b89
--- /dev/null
+++ b/src/vppinfra/test_mheap.c
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifdef CLIB_LINUX_KERNEL
+#include <linux/unistd.h>
+#endif
+
+#ifdef CLIB_UNIX
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>		/* scanf */
+#endif
+
+#include <vppinfra/mheap.h>
+#include <vppinfra/format.h>
+#include <vppinfra/random.h>
+
+static int verbose = 0;
+#define if_verbose(format,args...) \
+  if (verbose) { clib_warning(format, ## args); }
+
+int
+test_mheap_main (unformat_input_t * input)
+{
+  int i, j, k, n_iterations;
+  void *h, *h_mem;
+  uword *objects = 0;
+  u32 objects_used, really_verbose, n_objects, max_object_size;
+  u32 check_mask, seed, trace, use_vm;
+  u32 print_every = 0;
+  u32 *data;
+  mheap_t *mh;
+
+  /* Validation flags. */
+  check_mask = 0;
+#define CHECK_VALIDITY 1
+#define CHECK_DATA     2
+#define CHECK_ALIGN    4
+
+  n_iterations = 10;
+  seed = 0;
+  max_object_size = 100;
+  n_objects = 1000;
+  trace = 0;
+  really_verbose = 0;
+  use_vm = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (0 == unformat (input, "iter %d", &n_iterations)
+	  && 0 == unformat (input, "count %d", &n_objects)
+	  && 0 == unformat (input, "size %d", &max_object_size)
+	  && 0 == unformat (input, "seed %d", &seed)
+	  && 0 == unformat (input, "print %d", &print_every)
+	  && 0 == unformat (input, "validdata %|",
+			    &check_mask, CHECK_DATA | CHECK_VALIDITY)
+	  && 0 == unformat (input, "valid %|",
+			    &check_mask, CHECK_VALIDITY)
+	  && 0 == unformat (input, "verbose %=", &really_verbose, 1)
+	  && 0 == unformat (input, "trace %=", &trace, 1)
+	  && 0 == unformat (input, "vm %=", &use_vm, 1)
+	  && 0 == unformat (input, "align %|", &check_mask, CHECK_ALIGN))
+	{
+	  clib_warning ("unknown input `%U'", format_unformat_error, input);
+	  return 1;
+	}
+    }
+
+  /* Zero seed means use default. */
+  if (!seed)
+    seed = random_default_seed ();
+
+  if_verbose
+    ("testing %d iterations, %d %saligned objects, max. size %d, seed %d",
+     n_iterations, n_objects, (check_mask & CHECK_ALIGN) ? "randomly " : "un",
+     max_object_size, seed);
+
+  vec_resize (objects, n_objects);
+  if (vec_bytes (objects))	/* stupid warning be gone */
+    memset (objects, ~0, vec_bytes (objects));
+  objects_used = 0;
+
+  /* Allocate initial heap. */
+  {
+    uword size =
+      max_pow2 (2 * n_objects * max_object_size * sizeof (data[0]));
+
+    h_mem = clib_mem_alloc (size);
+    if (!h_mem)
+      return 0;
+
+    h = mheap_alloc (h_mem, size);
+  }
+
+  if (trace)
+    mheap_trace (h, trace);
+
+  mh = mheap_header (h);
+
+  if (use_vm)
+    mh->flags &= ~MHEAP_FLAG_DISABLE_VM;
+  else
+    mh->flags |= MHEAP_FLAG_DISABLE_VM;
+
+  if (check_mask & CHECK_VALIDITY)
+    mh->flags |= MHEAP_FLAG_VALIDATE;
+
+  for (i = 0; i < n_iterations; i++)
+    {
+      while (1)
+	{
+	  j = random_u32 (&seed) % vec_len (objects);
+	  if (objects[j] != ~0 || i + objects_used < n_iterations)
+	    break;
+	}
+
+      if (objects[j] != ~0)
+	{
+	  mheap_put (h, objects[j]);
+	  objects_used--;
+	  objects[j] = ~0;
+	}
+      else
+	{
+	  uword size, align, align_offset;
+
+	  size = (random_u32 (&seed) % max_object_size) * sizeof (data[0]);
+	  align = align_offset = 0;
+	  if (check_mask & CHECK_ALIGN)
+	    {
+	      align = 1 << (random_u32 (&seed) % 10);
+	      align_offset = round_pow2 (random_u32 (&seed) & (align - 1),
+					 sizeof (u32));
+	    }
+
+	  h = mheap_get_aligned (h, size, align, align_offset, &objects[j]);
+
+	  if (align > 0)
+	    ASSERT (0 == ((objects[j] + align_offset) & (align - 1)));
+
+	  ASSERT (objects[j] != ~0);
+	  objects_used++;
+
+	  /* Set newly allocated object with test data. */
+	  if (check_mask & CHECK_DATA)
+	    {
+	      uword len;
+
+	      data = (void *) h + objects[j];
+	      len = mheap_len (h, data);
+
+	      ASSERT (size <= mheap_data_bytes (h, objects[j]));
+
+	      data[0] = len;
+	      for (k = 1; k < len; k++)
+		data[k] = objects[j] + k;
+	    }
+	}
+
+      /* Verify that all used objects have correct test data. */
+      if (check_mask & 2)
+	{
+	  for (j = 0; j < vec_len (objects); j++)
+	    if (objects[j] != ~0)
+	      {
+		u32 *data = h + objects[j];
+		uword len = data[0];
+		for (k = 1; k < len; k++)
+		  ASSERT (data[k] == objects[j] + k);
+	      }
+	}
+      if (print_every != 0 && i > 0 && (i % print_every) == 0)
+	fformat (stderr, "iteration %d: %U\n", i, format_mheap, h,
+		 really_verbose);
+    }
+
+  if (verbose)
+    fformat (stderr, "%U\n", format_mheap, h, really_verbose);
+  mheap_free (h);
+  clib_mem_free (h_mem);
+  vec_free (objects);
+
+  return 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int ret;
+
+  verbose = (argc > 1);
+  unformat_init_command_line (&i, argv);
+  ret = test_mheap_main (&i);
+  unformat_free (&i);
+
+  return ret;
+}
+#endif /* CLIB_UNIX */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_pfhash.c b/src/vppinfra/test_pfhash.c
new file mode 100644
index 00000000..ddbdbb34
--- /dev/null
+++ b/src/vppinfra/test_pfhash.c
@@ -0,0 +1,322 @@
+/*
+  Copyright (c) 2013 Cisco and/or its affiliates.
+
+  * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#include <vppinfra/pfhash.h>
+#include <vppinfra/format.h>
+#include <vppinfra/random.h>
+
+#if defined(CLIB_HAVE_VEC128) && ! defined (__ALTIVEC__)
+
+int verbose = 0;
+
+always_inline u8 *
+random_aligned_string (u32 * seed, uword len)
+{
+  u8 *alphabet = (u8 *) "abcdefghijklmnopqrstuvwxyz";
+  u8 *s = 0;
+  word i;
+
+  vec_resize_aligned (s, len, 16);
+  for (i = 0; i < len; i++)
+    s[i] = alphabet[random_u32 (seed) % 26];
+
+  return s;
+}
+
+void exit (int);
+
+int
+test_pfhash_main (unformat_input_t * input)
+{
+  u32 seed = 0xdeaddabe;
+  int i, iter;
+  u32 nkeys = 4;
+  u32 niter = 1;
+  u32 nbuckets = 1;
+  u32 bucket;
+  u32 sizes[3] = { 16, 8, 4 }, this_size, size;
+  u8 **keys = 0;
+  pfhash_t _rec, *p = &_rec;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "seed %d", &seed))
+	;
+      else if (unformat (input, "niter %d", &niter))
+	;
+      else if (unformat (input, "nkeys %d", &nkeys))
+	;
+      else if (unformat (input, "nbuckets %d", &nbuckets))
+	;
+      else if (unformat (input, "verbose %d", &verbose))
+	;
+      else if (unformat (input, "verbose"))
+	verbose = 1;
+      else
+	clib_error ("unknown input `%U'", format_unformat_error, input);
+    }
+
+  vec_validate (keys, nkeys - 1);
+
+  for (i = 0; i < nkeys; i++)
+    {
+      int j, k;
+
+    again:
+      keys[i] = random_aligned_string (&seed, 16);
+      for (j = 0; j < (i - 1); j++)
+	{
+	  /* Make sure we don't have a dup key in the min key size */
+	  for (k = 0; k < 4; k++)
+	    {
+	      if (keys[i][k] != keys[j][k])
+		goto check_next_key;
+	    }
+	  vec_free (keys[i]);
+	  goto again;
+	check_next_key:
+	  ;
+	}
+    }
+
+  /* test 8 byte key, 8 byte value case separately */
+
+  for (size = 8; size < 9; size++)
+    {
+      this_size = 8;
+
+      fformat (stdout, "%d-byte key 8 byte value test\n", this_size);
+
+      pfhash_init (p, "test", 8 /* key size */ , 8 /* value size */ ,
+		   nbuckets + 1);
+
+      for (iter = 0; iter < niter; iter++)
+	{
+	  bucket = 0;
+	  for (i = 0; i < nkeys; i++)
+	    {
+	      bucket = (i % nbuckets) + 1;
+	      pfhash_set (p, bucket, keys[i],
+			  (void *) (u64) 0x100000000ULL + i + 1);
+	    }
+
+	  for (i = 0; i < nkeys; i++)
+	    {
+	      bucket = (i % nbuckets) + 1;
+	      if (pfhash_get (p, bucket, keys[i])
+		  != (u64) 0x100000000ULL + i + 1)
+		{
+		  clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
+		  (void) pfhash_get (p, bucket, keys[i]);
+		}
+	    }
+
+	  /* test inline functions */
+	  for (i = 0; i < nkeys; i++)
+	    {
+	      u32 bucket_contents;
+	      u64 value = 0xdeadbeef;
+	      bucket = (i % nbuckets) + 1;
+
+	      pfhash_prefetch_bucket (p, bucket);
+	      bucket_contents = pfhash_read_bucket_prefetch_kv (p, bucket);
+
+	      value = pfhash_search_kv_8v8 (p, bucket_contents,
+					    (u64 *) keys[i]);
+	      if (value != (u64) 0x100000000ULL + i + 1)
+		clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
+	    }
+
+	  if (verbose)
+	    fformat (stdout, "%U\n", format_pfhash, p, verbose > 1);
+
+	  for (i = 0; i < nkeys; i++)
+	    {
+	      bucket = (i % nbuckets) + 1;
+	      pfhash_unset (p, bucket, keys[i]);
+	    }
+
+	  for (i = 0; i < nkeys; i++)
+	    {
+	      bucket = (i % nbuckets) + 1;
+	      if (pfhash_get (p, bucket, keys[i]) != (u64) ~ 0)
+		{
+		  clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
+		  (void) pfhash_get (p, bucket, keys[i]);
+		}
+	    }
+	  /* test inline functions */
+	  for (i = 0; i < nkeys; i++)
+	    {
+	      u32 bucket_contents;
+	      u64 value = 0xdeadbeef;
+	      bucket = (i % nbuckets) + 1;
+
+	      pfhash_prefetch_bucket (p, bucket);
+	      bucket_contents = pfhash_read_bucket_prefetch_kv (p, bucket);
+
+	      value = pfhash_search_kv_8v8 (p, bucket_contents,
+					    (u64 *) keys[i]);
+
+	      if (value != (u64) ~ 0)
+		clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
+	    }
+	}
+      pfhash_free (p);
+    }
+
+  /* test other cases */
+
+  for (size = 0; size < ARRAY_LEN (sizes); size++)
+    {
+      this_size = sizes[size];
+
+      fformat (stdout, "%d-byte key test\n", this_size);
+
+      pfhash_init (p, "test", this_size, 4 /* value size */ , nbuckets + 1);
+
+      for (iter = 0; iter < niter; iter++)
+	{
+	  bucket = 0;
+	  for (i = 0; i < nkeys; i++)
+	    {
+	      bucket = (i % nbuckets) + 1;
+	      pfhash_set (p, bucket, keys[i], (void *) (u64) i + 1);
+	    }
+
+	  for (i = 0; i < nkeys; i++)
+	    {
+	      bucket = (i % nbuckets) + 1;
+	      if (pfhash_get (p, bucket, keys[i]) != i + 1)
+		{
+		  clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
+		  (void) pfhash_get (p, bucket, keys[i]);
+		}
+	    }
+
+	  /* test inline functions */
+	  for (i = 0; i < nkeys; i++)
+	    {
+	      u32 bucket_contents;
+	      u32 value = 0xdeadbeef;
+	      bucket = (i % nbuckets) + 1;
+
+	      pfhash_prefetch_bucket (p, bucket);
+	      bucket_contents = pfhash_read_bucket_prefetch_kv (p, bucket);
+	      switch (p->key_size)
+		{
+		case 16:
+		  value =
+		    pfhash_search_kv_16 (p, bucket_contents,
+					 (u32x4 *) keys[i]);
+		  break;
+		case 8:
+		  value =
+		    pfhash_search_kv_8 (p, bucket_contents, (u64 *) keys[i]);
+		  break;
+		case 4:
+		  value =
+		    pfhash_search_kv_4 (p, bucket_contents, (u32 *) keys[i]);
+		  break;
+		}
+
+	      if (value != (i + 1))
+		clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
+	    }
+
+	  if (verbose)
+	    fformat (stdout, "%U\n", format_pfhash, p, verbose > 1);
+
+	  for (i = 0; i < nkeys; i++)
+	    {
+	      bucket = (i % nbuckets) + 1;
+	      pfhash_unset (p, bucket, keys[i]);
+	    }
+
+	  for (i = 0; i < nkeys; i++)
+	    {
+	      bucket = (i % nbuckets) + 1;
+	      if (pfhash_get (p, bucket, keys[i]) != (u64) ~ 0)
+		{
+		  clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
+		  (void) pfhash_get (p, bucket, keys[i]);
+		}
+	    }
+	  /* test inline functions */
+	  for (i = 0; i < nkeys; i++)
+	    {
+	      u32 bucket_contents;
+	      u32 value = 0xdeadbeef;
+	      bucket = (i % nbuckets) + 1;
+
+	      pfhash_prefetch_bucket (p, bucket);
+	      bucket_contents = pfhash_read_bucket_prefetch_kv (p, bucket);
+	      switch (p->key_size)
+		{
+		case 16:
+		  value =
+		    pfhash_search_kv_16 (p, bucket_contents,
+					 (u32x4 *) keys[i]);
+		  break;
+		case 8:
+		  value =
+		    pfhash_search_kv_8 (p, bucket_contents, (u64 *) keys[i]);
+		  break;
+		case 4:
+		  value =
+		    pfhash_search_kv_4 (p, bucket_contents, (u32 *) keys[i]);
+		  break;
+		}
+	      if (value != (u32) ~ 0)
+		clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
+	    }
+	}
+      pfhash_free (p);
+    }
+
+  exit (0);
+}
+#else
+int
+test_pfhash_main (unformat_input_t * input)
+{
+  clib_warning ("MMX unit not available");
+  return 0;
+}
+#endif
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int ret;
+
+  unformat_init_command_line (&i, argv);
+  ret = test_pfhash_main (&i);
+  unformat_free (&i);
+
+  return ret;
+}
+#endif /* CLIB_UNIX */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_phash.c b/src/vppinfra/test_phash.c
new file mode 100644
index 00000000..9ed2ac7b
--- /dev/null
+++ b/src/vppinfra/test_phash.c
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/phash.h>
+#include <vppinfra/format.h>
+#include <vppinfra/random.h>
+
+static int verbose;
+#define if_verbose(format,args...) \
+  if (verbose) { clib_warning(format, ## args); }
+
+int
+test_phash_main (unformat_input_t * input)
+{
+  phash_main_t _pm = { 0 }, *pm = &_pm;
+  int n_keys, random_keys;
+  u32 seed;
+  clib_error_t *error;
+
+  random_keys = 1;
+  n_keys = 1000;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (0 == unformat (input, "keys %d", &n_keys)
+	  && 0 == unformat (input, "verbose %=", &verbose, 1)
+	  && 0 == unformat (input, "random-keys %=", &random_keys, 1)
+	  && 0 == unformat (input, "sequential-keys %=", &random_keys, 0)
+	  && 0 == unformat (input, "seed %d", &pm->random_seed)
+	  && 0 == unformat (input, "64-bit %|", &pm->flags, PHASH_FLAG_MIX64)
+	  && 0 == unformat (input, "32-bit %|", &pm->flags, PHASH_FLAG_MIX32)
+	  && 0 == unformat (input, "fast %|", &pm->flags,
+			    PHASH_FLAG_FAST_MODE)
+	  && 0 == unformat (input, "slow %|", &pm->flags,
+			    PHASH_FLAG_SLOW_MODE)
+	  && 0 == unformat (input, "minimal %|", &pm->flags,
+			    PHASH_FLAG_MINIMAL)
+	  && 0 == unformat (input, "non-minimal %|", &pm->flags,
+			    PHASH_FLAG_NON_MINIMAL))
+	clib_error ("unknown input `%U'", format_unformat_error, input);
+    }
+
+  if (!pm->random_seed)
+    pm->random_seed = random_default_seed ();
+
+  if_verbose
+    ("%d %d-bit keys, random seed %d, %s mode, looking for %sminimal hash",
+     n_keys, (pm->flags & PHASH_FLAG_MIX64) ? 64 : 32, pm->random_seed,
+     (pm->flags & PHASH_FLAG_FAST_MODE) ? "fast" : "slow",
+     (pm->flags & PHASH_FLAG_MINIMAL) ? "" : "non-");
+
+  seed = pm->random_seed;
+
+  /* Initialize random keys. */
+  {
+    phash_key_t *k;
+
+    vec_resize (pm->keys, n_keys);
+    vec_foreach (k, pm->keys)
+    {
+      k->key = k - pm->keys;
+      if (random_keys)
+	{
+	  if (pm->flags & PHASH_FLAG_MIX64)
+	    k->key = random_u64 (&seed);
+	  else
+	    k->key = random_u32 (&seed);
+	}
+    }
+  }
+
+  error = phash_find_perfect_hash (pm);
+  if (error)
+    {
+      clib_error_report (error);
+      return 1;
+    }
+  else
+    {
+      if_verbose ("(%d,%d) (a,b) bits, %d seeds tried, %d tree walks",
+		  pm->a_bits, pm->b_bits,
+		  pm->n_seed_trials, pm->n_perfect_calls);
+
+      error = phash_validate (pm);
+      if (error)
+	{
+	  clib_error_report (error);
+	  return 1;
+	}
+    }
+
+  return 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int res;
+
+  verbose = (argc > 1);
+  unformat_init_command_line (&i, argv);
+  res = test_phash_main (&i);
+  unformat_free (&i);
+  return res;
+}
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_pool.c b/src/vppinfra/test_pool.c
new file mode 100644
index 00000000..67a5e50a
--- /dev/null
+++ b/src/vppinfra/test_pool.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/mem.h>
+#include <vppinfra/pool.h>
+
+#ifdef __KERNEL__
+#include <linux/unistd.h>
+#else
+#include <unistd.h>
+#endif
+
+int
+main (int argc, char *argv[])
+{
+  int i, n, seed;
+
+  int *p = 0, *e, j, *o = 0;
+
+  n = atoi (argv[1]);
+  seed = getpid ();
+  srandom (1);
+
+  for (i = 0; i < n; i++)
+    {
+      if (vec_len (o) < 10 || (random () & 1))
+	{
+	  pool_get (p, e);
+	  j = e - p;
+	  *e = j;
+	  vec_add1 (o, j);
+	}
+      else
+	{
+	  j = random () % vec_len (o);
+	  e = p + j;
+	  pool_put (p, e);
+	  vec_delete (o, 1, j);
+	}
+    }
+  p = pool_free (p);
+  vec_free (o);
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_pool_iterate.c b/src/vppinfra/test_pool_iterate.c
new file mode 100644
index 00000000..27ce4bb3
--- /dev/null
+++ b/src/vppinfra/test_pool_iterate.c
@@ -0,0 +1,59 @@
+/*
+  Copyright (c) 2011 Cisco and/or its affiliates.
+
+  * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#include <vppinfra/mem.h>
+#include <vppinfra/pool.h>
+
+#ifdef __KERNEL__
+#include <linux/unistd.h>
+#else
+#include <unistd.h>
+#endif
+
+int
+main (int argc, char *argv[])
+{
+  int i;
+  uword next;
+  u32 *tp = 0;
+  u32 *junk;
+
+  for (i = 0; i < 70; i++)
+    pool_get (tp, junk);
+
+  (void) junk;			/* compiler warning */
+
+  pool_put_index (tp, 1);
+  pool_put_index (tp, 65);
+
+  next = ~0;
+  do
+    {
+      next = pool_next_index (tp, next);
+      fformat (stdout, "next index %d\n", next);
+    }
+  while (next != ~0);
+
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_ptclosure.c b/src/vppinfra/test_ptclosure.c
new file mode 100644
index 00000000..be7d51df
--- /dev/null
+++ b/src/vppinfra/test_ptclosure.c
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vppinfra/ptclosure.h>
+#include <vppinfra/hash.h>
+
+typedef struct
+{
+  uword *index_by_name;
+  u8 *items;
+} test_main_t;
+
+test_main_t test_main;
+
+static char *items[] = {
+  "d",
+  "a",
+  "b",
+  "c",
+};
+
+char *constraints[] = {
+  "a,b",
+  "b,c",
+  "d,b",
+  //    "c,a", /* no partial order possible */
+};
+
+u32
+vl (void *p)
+{
+  return vec_len (p);
+}
+
+static void
+dump_closure (test_main_t * tm, char *s, u8 ** orig)
+{
+  int i, j;
+
+  fformat (stdout, "--------- %s --------------\n", s);
+  for (i = 0; i < vec_len (orig); i++)
+    {
+      for (j = 0; j < vec_len (orig); j++)
+	if (orig[i][j])
+	  {
+	    fformat (stdout, "%s <before> %s\n", items[i], items[j]);
+	  }
+    }
+}
+
+int
+comma_split (u8 * s, u8 ** a, u8 ** b)
+{
+  *a = s;
+
+  while (*s && *s != ',')
+    s++;
+
+  if (*s == ',')
+    *s = 0;
+  else
+    return 1;
+
+  *b = (u8 *) (s + 1);
+  return 0;
+}
+
+int
+test_ptclosure_main (unformat_input_t * input)
+{
+  test_main_t *tm = &test_main;
+  u8 *item_name;
+  int i, j;
+  u8 **orig;
+  u8 **closure;
+  u8 *a_name, *b_name;
+  int a_index, b_index;
+  uword *p;
+  u8 *this_constraint;
+  int n;
+  u32 *result = 0;
+
+  tm->index_by_name = hash_create_string (0, sizeof (uword));
+
+  n = ARRAY_LEN (items);
+
+  for (i = 0; i < n; i++)
+    {
+      item_name = (u8 *) items[i];
+      hash_set_mem (tm->index_by_name, item_name, i);
+    }
+
+  orig = clib_ptclosure_alloc (n);
+
+  for (i = 0; i < ARRAY_LEN (constraints); i++)
+    {
+      this_constraint = format (0, "%s%c", constraints[i], 0);
+
+      if (comma_split (this_constraint, &a_name, &b_name))
+	{
+	  clib_warning ("couldn't split '%s'", constraints[i]);
+	  return 1;
+	}
+
+      p = hash_get_mem (tm->index_by_name, a_name);
+      if (p == 0)
+	{
+	  clib_warning ("couldn't find '%s'", a_name);
+	  return 1;
+	}
+      a_index = p[0];
+
+      p = hash_get_mem (tm->index_by_name, b_name);
+      if (p == 0)
+	{
+	  clib_warning ("couldn't find '%s'", b_name);
+	  return 1;
+	}
+      b_index = p[0];
+
+      orig[a_index][b_index] = 1;
+      vec_free (this_constraint);
+    }
+
+  dump_closure (tm, "original relation", orig);
+
+  closure = clib_ptclosure (orig);
+
+  dump_closure (tm, "closure", closure);
+
+  /*
+   * Output partial order
+   */
+
+again:
+  for (i = 0; i < n; i++)
+    {
+      for (j = 0; j < n; j++)
+	{
+	  if (closure[i][j])
+	    goto item_constrained;
+	}
+      /* Item i can be output */
+      vec_add1 (result, i);
+      {
+	int k;
+	for (k = 0; k < n; k++)
+	  closure[k][i] = 0;
+	/* "Magic" a before a, to keep from ever outputting it again */
+	closure[i][i] = 1;
+	goto again;
+      }
+    item_constrained:
+      ;
+    }
+
+  if (vec_len (result) != n)
+    {
+      clib_warning ("no partial order exists");
+      exit (1);
+    }
+
+  fformat (stdout, "Partial order:\n");
+
+  for (i = vec_len (result) - 1; i >= 0; i--)
+    {
+      fformat (stdout, "%s\n", items[result[i]]);
+    }
+
+  vec_free (result);
+  clib_ptclosure_free (orig);
+  clib_ptclosure_free (closure);
+
+  return 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int ret;
+
+  clib_mem_init (0, 3ULL << 30);
+
+  unformat_init_command_line (&i, argv);
+  ret = test_ptclosure_main (&i);
+  unformat_free (&i);
+
+  return ret;
+}
+#endif /* CLIB_UNIX */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_qhash.c b/src/vppinfra/test_qhash.c
new file mode 100644
index 00000000..fdbf0bbe
--- /dev/null
+++ b/src/vppinfra/test_qhash.c
@@ -0,0 +1,333 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/bitmap.h>
+#include <vppinfra/os.h>
+#include <vppinfra/qhash.h>
+#include <vppinfra/random.h>
+#include <vppinfra/time.h>
+
+typedef struct
+{
+  u32 n_iter, seed, n_keys, n_hash_keys, verbose;
+
+  u32 max_vector;
+
+  uword *hash;
+
+  uword *keys_in_hash_bitmap;
+
+  u32 *qhash;
+
+  uword *keys;
+
+  uword *lookup_keys;
+  uword *lookup_key_indices;
+  u32 *lookup_results;
+
+  u32 *get_multiple_results;
+
+  clib_time_t time;
+
+  f64 overflow_fraction, ave_elts;
+  f64 get_time, hash_get_time;
+  f64 set_time, set_count;
+  f64 unset_time, unset_count;
+  f64 hash_set_time, hash_unset_time;
+} test_qhash_main_t;
+
+clib_error_t *
+test_qhash_main (unformat_input_t * input)
+{
+  clib_error_t *error = 0;
+  test_qhash_main_t _tm, *tm = &_tm;
+  uword i, iter;
+
+  memset (tm, 0, sizeof (tm[0]));
+  tm->n_iter = 10;
+  tm->seed = 1;
+  tm->n_keys = 10;
+  tm->max_vector = 1;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "iter %d", &tm->n_iter))
+	;
+      else if (unformat (input, "seed %d", &tm->seed))
+	;
+      else if (unformat (input, "keys %d", &tm->n_keys))
+	;
+      else if (unformat (input, "size %d", &tm->n_hash_keys))
+	;
+      else if (unformat (input, "vector %d", &tm->max_vector))
+	;
+      else if (unformat (input, "verbose"))
+	tm->verbose = 1;
+      else
+	{
+	  error = clib_error_create ("unknown input `%U'\n",
+				     format_unformat_error, input);
+	  goto done;
+	}
+    }
+
+  if (!tm->seed)
+    tm->seed = random_default_seed ();
+
+  clib_time_init (&tm->time);
+
+  clib_warning ("iter %d, seed %u, keys %d, max vector %d, ",
+		tm->n_iter, tm->seed, tm->n_keys, tm->max_vector);
+
+  vec_resize (tm->keys, tm->n_keys);
+  vec_resize (tm->get_multiple_results, tm->n_keys);
+  for (i = 0; i < vec_len (tm->keys); i++)
+    tm->keys[i] = random_uword (&tm->seed);
+
+  if (!tm->n_hash_keys)
+    tm->n_hash_keys = 2 * max_pow2 (tm->n_keys);
+  tm->n_hash_keys = clib_max (tm->n_keys, tm->n_hash_keys);
+  qhash_resize (tm->qhash, tm->n_hash_keys);
+
+  {
+    qhash_t *h = qhash_header (tm->qhash);
+    int i;
+    for (i = 0; i < ARRAY_LEN (h->hash_seeds); i++)
+      h->hash_seeds[i] = random_uword (&tm->seed);
+  }
+
+  vec_resize (tm->lookup_keys, tm->max_vector);
+  vec_resize (tm->lookup_key_indices, tm->max_vector);
+  vec_resize (tm->lookup_results, tm->max_vector);
+
+  for (iter = 0; iter < tm->n_iter; iter++)
+    {
+      uword *p, j, n, is_set;
+
+      n = tm->max_vector;
+
+      is_set = random_u32 (&tm->seed) & 1;
+      is_set |= hash_elts (tm->hash) < (tm->n_keys / 4);
+      if (hash_elts (tm->hash) > (3 * tm->n_keys) / 4)
+	is_set = 0;
+
+      _vec_len (tm->lookup_keys) = n;
+      _vec_len (tm->lookup_key_indices) = n;
+      j = 0;
+      while (j < n)
+	{
+	  i = random_u32 (&tm->seed) % vec_len (tm->keys);
+	  if (clib_bitmap_get (tm->keys_in_hash_bitmap, i) != is_set)
+	    {
+	      f64 t[2];
+	      tm->lookup_key_indices[j] = i;
+	      tm->lookup_keys[j] = tm->keys[i];
+	      t[0] = clib_time_now (&tm->time);
+	      if (is_set)
+		hash_set (tm->hash, tm->keys[i], i);
+	      else
+		hash_unset (tm->hash, tm->keys[i]);
+	      t[1] = clib_time_now (&tm->time);
+	      if (is_set)
+		tm->hash_set_time += t[1] - t[0];
+	      else
+		tm->hash_unset_time += t[1] - t[0];
+	      tm->keys_in_hash_bitmap
+		= clib_bitmap_set (tm->keys_in_hash_bitmap, i, is_set);
+	      j++;
+	    }
+	}
+
+      {
+	f64 t[2];
+
+	if (is_set)
+	  {
+	    t[0] = clib_time_now (&tm->time);
+	    qhash_set_multiple (tm->qhash,
+				tm->lookup_keys,
+				vec_len (tm->lookup_keys),
+				tm->lookup_results);
+	    t[1] = clib_time_now (&tm->time);
+	    tm->set_time += t[1] - t[0];
+	    tm->set_count += vec_len (tm->lookup_keys);
+	    for (i = 0; i < vec_len (tm->lookup_keys); i++)
+	      {
+		uword r = tm->lookup_results[i];
+		*vec_elt_at_index (tm->qhash, r) = tm->lookup_key_indices[i];
+	      }
+	  }
+	else
+	  {
+	    t[0] = clib_time_now (&tm->time);
+	    qhash_unset_multiple (tm->qhash,
+				  tm->lookup_keys,
+				  vec_len (tm->lookup_keys),
+				  tm->lookup_results);
+	    t[1] = clib_time_now (&tm->time);
+	    tm->unset_time += t[1] - t[0];
+	    tm->unset_count += vec_len (tm->lookup_keys);
+
+	    for (i = 0; i < vec_len (tm->lookup_keys); i++)
+	      {
+		uword r = tm->lookup_results[i];
+		*vec_elt_at_index (tm->qhash, r) = ~0;
+	      }
+	  }
+      }
+
+      if (qhash_elts (tm->qhash) != hash_elts (tm->hash))
+	os_panic ();
+
+      {
+	qhash_t *h;
+	uword i, k, l, count;
+
+	h = qhash_header (tm->qhash);
+
+	for (i = k = 0; k < vec_len (h->hash_key_valid_bitmap); k++)
+	  i += count_set_bits (h->hash_key_valid_bitmap[k]);
+	k = hash_elts (h->overflow_hash);
+	l = qhash_elts (tm->qhash);
+	if (i + k != l)
+	  os_panic ();
+
+	count = hash_elts (h->overflow_hash);
+	for (i = 0; i < (1 << h->log2_hash_size); i++)
+	  count += tm->qhash[i] != ~0;
+	if (count != qhash_elts (tm->qhash))
+	  os_panic ();
+
+	{
+	  u32 *tmp = 0;
+
+	  /* *INDENT-OFF* */
+	  hash_foreach (k, l, h->overflow_hash, ({
+	    j = qhash_hash_mix (h, k) / QHASH_KEYS_PER_BUCKET;
+	    vec_validate (tmp, j);
+	    tmp[j] += 1;
+	  }));
+	  /* *INDENT-ON* */
+
+	  for (k = 0; k < vec_len (tmp); k++)
+	    {
+	      if (k >= vec_len (h->overflow_counts))
+		os_panic ();
+	      if (h->overflow_counts[k] != tmp[k])
+		os_panic ();
+	    }
+	  for (; k < vec_len (h->overflow_counts); k++)
+	    if (h->overflow_counts[k] != 0)
+	      os_panic ();
+
+	  vec_free (tmp);
+	}
+      }
+
+      {
+	f64 t[2];
+
+	t[0] = clib_time_now (&tm->time);
+	qhash_get_multiple (tm->qhash, tm->keys, vec_len (tm->keys),
+			    tm->get_multiple_results);
+	t[1] = clib_time_now (&tm->time);
+	tm->get_time += t[1] - t[0];
+
+	for (i = 0; i < vec_len (tm->keys); i++)
+	  {
+	    u32 r;
+
+	    t[0] = clib_time_now (&tm->time);
+	    p = hash_get (tm->hash, tm->keys[i]);
+	    t[1] = clib_time_now (&tm->time);
+	    tm->hash_get_time += t[1] - t[0];
+
+	    r = qhash_get (tm->qhash, tm->keys[i]);
+	    if (p)
+	      {
+		if (p[0] != i)
+		  os_panic ();
+		if (*vec_elt_at_index (tm->qhash, r) != i)
+		  os_panic ();
+	      }
+	    else
+	      {
+		if (r != ~0)
+		  os_panic ();
+	      }
+	    if (r != tm->get_multiple_results[i])
+	      os_panic ();
+	  }
+      }
+
+      tm->overflow_fraction +=
+	((f64) qhash_n_overflow (tm->qhash) / qhash_elts (tm->qhash));
+      tm->ave_elts += qhash_elts (tm->qhash);
+    }
+
+  fformat (stderr, "%d iter %.6e overflow, %.4f ave. elts\n",
+	   tm->n_iter,
+	   tm->overflow_fraction / tm->n_iter, tm->ave_elts / tm->n_iter);
+
+  tm->get_time /= tm->n_iter * vec_len (tm->keys);
+  tm->hash_get_time /= tm->n_iter * vec_len (tm->keys);
+
+  tm->set_time /= tm->set_count;
+  tm->unset_time /= tm->unset_count;
+  tm->hash_set_time /= tm->set_count;
+  tm->hash_unset_time /= tm->unset_count;
+
+  fformat (stderr,
+	   "get/set/unset clocks %.2e %.2e %.2e clib %.2e %.2e %.2e ratio %.2f %.2f %.2f\n",
+	   tm->get_time * tm->time.clocks_per_second,
+	   tm->set_time * tm->time.clocks_per_second,
+	   tm->unset_time * tm->time.clocks_per_second,
+	   tm->hash_get_time * tm->time.clocks_per_second,
+	   tm->hash_set_time * tm->time.clocks_per_second,
+	   tm->hash_unset_time * tm->time.clocks_per_second,
+	   tm->hash_get_time / tm->get_time, tm->hash_set_time / tm->set_time,
+	   tm->hash_unset_time / tm->unset_time);
+
+
+done:
+  return error;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  clib_error_t *error;
+
+  unformat_init_command_line (&i, argv);
+  error = test_qhash_main (&i);
+  unformat_free (&i);
+  if (error)
+    {
+      clib_error_report (error);
+      return 1;
+    }
+  else
+    return 0;
+}
+#endif /* CLIB_UNIX */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_random.c b/src/vppinfra/test_random.c
new file mode 100644
index 00000000..49759eac
--- /dev/null
+++ b/src/vppinfra/test_random.c
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/format.h>
+#include <vppinfra/bitmap.h>
+
+static u32 known_random_sequence[] = {
+  0x00000000, 0x3c6ef35f, 0x47502932, 0xd1ccf6e9,
+  0xaaf95334, 0x6252e503, 0x9f2ec686, 0x57fe6c2d,
+  0xa3d95fa8, 0x81fdbee7, 0x94f0af1a, 0xcbf633b1,
+};
+
+
+int
+test_random_main (unformat_input_t * input)
+{
+  uword n_iterations;
+  uword i, repeat_count;
+  uword *bitmap = 0;
+  uword print;
+  u32 seed;
+  u32 *seedp = &seed;
+
+  /* first, check known sequence from Numerical Recipes in C, 2nd ed.
+     page 284 */
+  seed = known_random_sequence[0];
+  for (i = 0; i < ARRAY_LEN (known_random_sequence) - 1; i++)
+    {
+      u32 rv;
+      rv = random_u32 (seedp);
+      if (rv != known_random_sequence[i + 1])
+	{
+	  fformat (stderr, "known sequence check FAILS at index %d", i + 1);
+	  break;
+	}
+    }
+
+  clib_warning ("known sequence check passes");
+
+  n_iterations = 1000;
+  seed = 0;
+  print = 1 << 24;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (0 == unformat (input, "iter %d", &n_iterations)
+	  && 0 == unformat (input, "print %d", &print)
+	  && 0 == unformat (input, "seed %d", &seed))
+	clib_error ("unknown input `%U'", format_unformat_error, input);
+    }
+
+  if (!seed)
+    seed = random_default_seed ();
+
+  if (n_iterations == 0)
+    n_iterations = random_u32_max ();
+
+  clib_warning ("%d iterations, seed %d\n", n_iterations, seed);
+
+  repeat_count = 0;
+  for (i = 0; i < n_iterations; i++)
+    {
+      uword r = random_u32 (&seed);
+      uword b, ri, rj;
+
+      ri = r / BITS (bitmap[0]);
+      rj = (uword) 1 << (r % BITS (bitmap[0]));
+
+      vec_validate (bitmap, ri);
+      b = bitmap[ri];
+
+      if (b & rj)
+	goto repeat;
+      b |= rj;
+      bitmap[ri] = b;
+
+      if (0 == (i & (print - 1)))
+	fformat (stderr, "0x%08x iterations %d repeats\n", i, repeat_count);
+      continue;
+
+    repeat:
+      fformat (stderr, "repeat found at iteration  %d/%d\n", i, n_iterations);
+      repeat_count++;
+      continue;
+    }
+
+  return 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int ret;
+
+  clib_mem_init (0, 3ULL << 30);
+
+  unformat_init_command_line (&i, argv);
+  ret = test_random_main (&i);
+  unformat_free (&i);
+
+  return ret;
+}
+#endif /* CLIB_UNIX */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_random_isaac.c b/src/vppinfra/test_random_isaac.c
new file mode 100644
index 00000000..337d30dd
--- /dev/null
+++ b/src/vppinfra/test_random_isaac.c
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/format.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/random.h>
+#include <vppinfra/random_isaac.h>
+
+static int verbose;
+#define if_verbose(format,args...) \
+  if (verbose) { clib_warning(format, ## args); }
+
+int
+test_isaac_main (unformat_input_t * input)
+{
+  uword n_iterations, seed;
+  uword i, repeat_count;
+  uword *hash = 0;
+  uword print;
+  isaac_t ctx;
+  uword results[ISAAC_SIZE] = { 0 };
+  uword n_results;
+
+  n_iterations = 1000;
+  seed = 0;
+  print = 1 << 24;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (0 == unformat (input, "iter %d", &n_iterations)
+	  && 0 == unformat (input, "print %d", &print)
+	  && 0 == unformat (input, "seed %d", &seed))
+	clib_error ("unknown input `%U'", format_unformat_error, input);
+    }
+
+  if (!seed)
+    seed = random_default_seed ();
+
+  results[0] = seed;
+
+  if (n_iterations == 0)
+    n_iterations = ~0;
+
+  if_verbose ("%d iterations, seed %d\n", n_iterations, seed);
+
+  repeat_count = 0;
+  isaac_init (&ctx, results);
+  isaac (&ctx, results);
+  n_results = 0;
+  for (i = 0; i < n_iterations; i++)
+    {
+      uword r = results[n_results++];
+
+      if (!hash)
+	hash = hash_create (0, /* value bytes */ 0);
+
+      if (hash_get (hash, r))
+	goto repeat;
+
+      hash_set1 (hash, r);
+
+      if (n_results >= ARRAY_LEN (results))
+	{
+	  isaac (&ctx, results);
+	  n_results = 0;
+	}
+
+      if (verbose && 0 == (i & (print - 1)))
+	fformat (stderr, "0x%08x iterations %d repeats\n", i, repeat_count);
+
+      if (hash_elts (hash) > 0x100000)
+	hash_free (hash);
+
+      continue;
+
+    repeat:
+      fformat (stderr, "repeat found at iteration  %d/%d\n", i, n_iterations);
+      repeat_count++;
+      continue;
+    }
+
+  return repeat_count > 0 ? 1 : 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int ret;
+
+  verbose = (argc > 1);
+  unformat_init_command_line (&i, argv);
+  ret = test_isaac_main (&i);
+  unformat_free (&i);
+
+  return ret;
+}
+#endif /* CLIB_UNIX */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_serialize.c b/src/vppinfra/test_serialize.c
new file mode 100644
index 00000000..e00eec32
--- /dev/null
+++ b/src/vppinfra/test_serialize.c
@@ -0,0 +1,274 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/format.h>
+#include <vppinfra/random.h>
+#include <vppinfra/serialize.h>
+#include <vppinfra/os.h>
+
+#define foreach_my_vector_type			\
+  _ (u8, a8)					\
+  _ (u16, a16)					\
+  _ (u32, a32)
+
+typedef struct
+{
+#define _(t,f) t f;
+  foreach_my_vector_type
+#undef _
+} my_vector_type_t;
+
+static void
+serialize_my_vector_type_single (serialize_main_t * m, va_list * va)
+{
+  my_vector_type_t *v = va_arg (*va, my_vector_type_t *);
+  u32 n = va_arg (*va, u32);
+  u32 i;
+
+  for (i = 0; i < n; i++)
+    {
+#define _(t,f) serialize_integer (m, v[i].f, sizeof (v[i].f));
+      foreach_my_vector_type;
+    }
+#undef _
+}
+
+static void
+unserialize_my_vector_type_single (serialize_main_t * m, va_list * va)
+{
+  my_vector_type_t *v = va_arg (*va, my_vector_type_t *);
+  u32 n = va_arg (*va, u32);
+  u32 i;
+
+  for (i = 0; i < n; i++)
+    {
+#define _(t,f) { u32 tmp; unserialize_integer (m, &tmp, sizeof (v[i].f)); v[i].f = tmp; }
+      foreach_my_vector_type;
+#undef _
+    }
+}
+
+static void
+serialize_my_vector_type_multiple (serialize_main_t * m, va_list * va)
+{
+  my_vector_type_t *v = va_arg (*va, my_vector_type_t *);
+  u32 n = va_arg (*va, u32);
+
+#define _(t,f)					\
+  serialize_multiple				\
+    (m,						\
+     &v[0].f,					\
+     STRUCT_SIZE_OF (my_vector_type_t, f),	\
+     STRUCT_STRIDE_OF (my_vector_type_t, f),	\
+     n);
+
+  foreach_my_vector_type;
+
+#undef _
+}
+
+static void
+unserialize_my_vector_type_multiple (serialize_main_t * m, va_list * va)
+{
+  my_vector_type_t *v = va_arg (*va, my_vector_type_t *);
+  u32 n = va_arg (*va, u32);
+
+#define _(t,f)					\
+  unserialize_multiple				\
+    (m,						\
+     &v[0].f,					\
+     STRUCT_SIZE_OF (my_vector_type_t, f),	\
+     STRUCT_STRIDE_OF (my_vector_type_t, f),	\
+     n);
+
+  foreach_my_vector_type;
+
+#undef _
+}
+
+typedef struct
+{
+  u32 n_iter;
+  u32 seed;
+  u32 verbose;
+  u32 multiple;
+  u32 max_len;
+
+  my_vector_type_t **test_vectors;
+
+  char *dump_file;
+
+  serialize_main_t serialize_main;
+  serialize_main_t unserialize_main;
+} test_serialize_main_t;
+
+int
+test_serialize_main (unformat_input_t * input)
+{
+  clib_error_t *error = 0;
+  test_serialize_main_t _tm, *tm = &_tm;
+  serialize_main_t *sm = &tm->serialize_main;
+  serialize_main_t *um = &tm->unserialize_main;
+  uword i;
+
+  memset (tm, 0, sizeof (tm[0]));
+  tm->n_iter = 100;
+  tm->seed = 1;
+  tm->max_len = 128;
+  tm->verbose = 0;
+  tm->multiple = 1;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "iter %d", &tm->n_iter))
+	;
+      else if (unformat (input, "seed %d", &tm->seed))
+	;
+      else if (unformat (input, "file %s", &tm->dump_file))
+	;
+      else if (unformat (input, "max-len %d", &tm->max_len))
+	;
+      else if (unformat (input, "multiple %=", &tm->multiple, 1))
+	;
+      else if (unformat (input, "single %=", &tm->multiple, 0))
+	;
+      else if (unformat (input, "verbose %=", &tm->verbose, 1))
+	;
+      else
+	{
+	  error = clib_error_create ("unknown input `%U'\n",
+				     format_unformat_error, input);
+	  goto done;
+	}
+    }
+
+  if (tm->seed == 0)
+    tm->seed = random_default_seed ();
+
+  clib_warning ("iter %d seed %d max-len %d", tm->n_iter, tm->seed,
+		tm->max_len);
+
+#ifdef CLIB_UNIX
+  if (tm->dump_file)
+    serialize_open_unix_file (sm, tm->dump_file);
+  else
+#endif
+    serialize_open_vector (sm, 0);
+
+  vec_resize (tm->test_vectors, tm->n_iter);
+  for (i = 0; i < tm->n_iter; i++)
+    {
+      uword l = 1 + (random_u32 (&tm->seed) % tm->max_len);
+      my_vector_type_t *mv;
+
+      vec_resize (tm->test_vectors[i], l);
+      vec_foreach (mv, tm->test_vectors[i])
+      {
+#define _(t,f) mv->f = random_u32 (&tm->seed) & pow2_mask (31);
+	foreach_my_vector_type;
+#undef _
+      }
+
+      vec_serialize (sm, tm->test_vectors[i],
+		     tm->multiple ? serialize_my_vector_type_multiple :
+		     serialize_my_vector_type_single);
+    }
+
+  if (tm->verbose)
+    clib_warning ("overflow vector max bytes %d",
+		  vec_max_len (sm->stream.overflow_buffer));
+
+  serialize_close (sm);
+
+#ifdef CLIB_UNIX
+  if (tm->dump_file)
+    {
+      if ((error = unserialize_open_unix_file (um, tm->dump_file)))
+	goto done;
+    }
+  else
+#endif
+    {
+      u8 *v = serialize_close_vector (sm);
+      unserialize_open_data (um, v, vec_len (v));
+    }
+
+  for (i = 0; i < tm->n_iter; i++)
+    {
+      my_vector_type_t *mv0;
+      my_vector_type_t *mv1;
+
+      vec_unserialize (um, &mv0,
+		       tm->multiple ? unserialize_my_vector_type_multiple :
+		       unserialize_my_vector_type_single);
+      mv1 = tm->test_vectors[i];
+
+      if (vec_len (mv0) != vec_len (mv1))
+	os_panic ();
+      if (memcmp (mv0, mv1, vec_len (mv0) * sizeof (mv0[0])))
+	os_panic ();
+
+      vec_free (mv0);
+    }
+
+done:
+  if (error)
+    clib_error_report (error);
+  return 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int r;
+
+  unformat_init_command_line (&i, argv);
+  r = test_serialize_main (&i);
+  unformat_free (&i);
+  return r;
+}
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_slist.c b/src/vppinfra/test_slist.c
new file mode 100644
index 00000000..3c3cbf73
--- /dev/null
+++ b/src/vppinfra/test_slist.c
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifdef CLIB_UNIX
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#endif
+
+#include <vppinfra/slist.h>
+
+typedef struct
+{
+  u32 *random_pool;
+  u32 seed;
+  u32 iter;
+  u32 verbose;
+  f64 branching_factor;
+  clib_slist_t slist;
+} test_main_t;
+
+test_main_t test_main;
+
+#define foreach_simple_test                     \
+_(2)                                            \
+_(4)                                            \
+_(3)                                            \
+_(1)
+
+
+void
+run_test (test_main_t * tm)
+{
+  int i;
+  u32 *tv;
+  u32 ncompares;
+  u64 total_compares = 0;
+
+  if (1)
+    {
+      /*
+       * Add a bunch of random numbers to the skip-list,
+       * sorting them.
+       */
+      for (i = 0; i < tm->iter; i++)
+	{
+	  pool_get (tm->random_pool, tv);
+	  *tv = random_u32 (&tm->seed);
+	  clib_slist_add (&tm->slist, tv, tv - tm->random_pool);
+	}
+      /* make sure we can find each one */
+      for (i = 0; i < tm->iter; i++)
+	{
+	  u32 search_result;
+	  tv = pool_elt_at_index (tm->random_pool, i);
+
+	  search_result = clib_slist_search (&tm->slist, tv, &ncompares);
+	  ASSERT (search_result == i);
+
+	  total_compares += ncompares;
+	}
+
+      fformat (stdout, "%.2f avg compares/search\n",
+	       (f64) total_compares / (f64) i);
+
+      fformat (stdout, "%U\n", format_slist, &tm->slist,
+	       tm->iter < 1000 /* verbose */ );
+
+      /* delete half of them */
+      for (i = tm->iter / 2; i < tm->iter; i++)
+	{
+	  tv = pool_elt_at_index (tm->random_pool, i);
+	  (void) clib_slist_del (&tm->slist, tv);
+	}
+
+      /* make sure we can find the set we should find, and no others */
+      for (i = 0; i < tm->iter; i++)
+	{
+	  u32 search_result;
+	  tv = pool_elt_at_index (tm->random_pool, i);
+
+	  search_result = clib_slist_search (&tm->slist, tv, &ncompares);
+	  if (i >= tm->iter / 2)
+	    ASSERT (search_result == (u32) ~ 0);
+	  else
+	    ASSERT (search_result == i);
+
+	}
+
+      fformat (stdout, "%U\n", format_slist, &tm->slist,
+	       tm->iter < 1000 /* verbose */ );
+
+      /* delete the rest */
+      for (i = 0; i < tm->iter; i++)
+	{
+	  tv = pool_elt_at_index (tm->random_pool, i);
+
+	  (void) clib_slist_del (&tm->slist, tv);
+	}
+
+      fformat (stdout, "%U\n", format_slist, &tm->slist,
+	       tm->iter < 1000 /* verbose */ );
+    }
+  else
+    {
+
+#define _(n)                                                            \
+    do {                                                                \
+      pool_get (tm->random_pool, tv);                                   \
+      *tv = n;                                                          \
+      clib_slist_add (&tm->slist, tv, tv - tm->random_pool);            \
+      fformat(stdout, "%U\n", format_slist, &tm->slist, 1 /* verbose */); \
+    } while (0);
+      foreach_simple_test;
+#undef _
+    }
+
+  return;
+}
+
+word
+test_compare (void *key, u32 elt_index)
+{
+  u32 *k = (u32 *) key;
+  u32 elt = test_main.random_pool[elt_index];
+
+  if (*k < elt)
+    return -1;
+  if (*k > elt)
+    return 1;
+  return 0;
+}
+
+u8 *
+test_format (u8 * s, va_list * args)
+{
+  u32 elt_index = va_arg (*args, u32);
+  u32 elt = test_main.random_pool[elt_index];
+
+  return format (s, "%u", elt);
+}
+
+void
+initialize_slist (test_main_t * tm)
+{
+  clib_slist_init (&tm->slist, tm->branching_factor,
+		   test_compare, test_format);
+}
+
+int
+test_slist_main (unformat_input_t * input)
+{
+  test_main_t *tm = &test_main;
+  u32 tmp;
+
+  tm->seed = 0xbabeb00b;
+  tm->iter = 100000;
+  tm->verbose = 1;
+  tm->branching_factor = 1.0 / 5.0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "seed %d", &tm->seed))
+	continue;
+      else if (unformat (input, "iter %d", &tm->iter))
+	continue;
+      else if (unformat (input, "verbose"))
+	tm->verbose = 1;
+      else if (unformat (input, "branch %d", &tmp))
+	{
+	  if (tmp > 0)
+	    tm->branching_factor = 1.0 / (f64) tmp;
+	  else
+	    fformat (stderr, "warning: branch = 0, ignored\n");
+	}
+      else
+	{
+	  clib_error ("unknown input `%U'", format_unformat_error, input);
+	  goto usage;
+	}
+    }
+  initialize_slist (tm);
+  run_test (tm);
+
+  return 0;
+
+usage:
+  fformat (stderr, "usage: test_slist seed <seed> iter <iter> [verbose]\n");
+  return 1;
+
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int ret;
+
+  clib_mem_init (0, (u64) 4 << 30);
+
+  unformat_init_command_line (&i, argv);
+  ret = test_slist_main (&i);
+  unformat_free (&i);
+
+  return ret;
+}
+#endif /* CLIB_UNIX */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_socket.c b/src/vppinfra/test_socket.c
new file mode 100644
index 00000000..0b05467a
--- /dev/null
+++ b/src/vppinfra/test_socket.c
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/format.h>
+#include <vppinfra/socket.h>
+
+static int verbose;
+#define if_verbose(format,args...) \
+  if (verbose) { clib_warning(format, ## args); }
+
+int
+test_socket_main (unformat_input_t * input)
+{
+  clib_socket_t _s = { 0 }, *s = &_s;
+  char *config;
+  clib_error_t *error;
+
+  s->config = "localhost:22";
+  s->flags = SOCKET_IS_CLIENT;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "server %s %=", &config,
+		    &s->flags, SOCKET_IS_SERVER))
+	;
+      else if (unformat (input, "client %s %=", &config,
+			 &s->flags, SOCKET_IS_CLIENT))
+	;
+      else
+	{
+	  error = clib_error_create ("unknown input `%U'\n",
+				     format_unformat_error, input);
+	  goto done;
+	}
+    }
+
+  error = clib_socket_init (s);
+  if (error)
+    goto done;
+
+  if (0)
+    {
+      struct
+      {
+	int a, b;
+      } *msg;
+      msg = clib_socket_tx_add (s, sizeof (msg[0]));
+      msg->a = 99;
+      msg->b = 100;
+    }
+  else
+    clib_socket_tx_add_formatted (s, "hello there mr server %d\n", 99);
+
+  error = clib_socket_tx (s);
+  if (error)
+    goto done;
+
+  while (1)
+    {
+      error = clib_socket_rx (s, 100);
+      if (error)
+	break;
+
+      if (clib_socket_rx_end_of_file (s))
+	break;
+
+      if_verbose ("%v", s->rx_buffer);
+      _vec_len (s->rx_buffer) = 0;
+    }
+
+  error = clib_socket_close (s);
+
+done:
+  if (error)
+    clib_error_report (error);
+  return 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int r;
+
+  verbose = (argc > 1);
+  unformat_init_command_line (&i, argv);
+  r = test_socket_main (&i);
+  unformat_free (&i);
+  return r;
+}
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_time.c b/src/vppinfra/test_time.c
new file mode 100644
index 00000000..63cfeac5
--- /dev/null
+++ b/src/vppinfra/test_time.c
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/format.h>
+#include <vppinfra/time.h>
+#include <vppinfra/math.h>	/* for sqrt */
+
+static int verbose;
+#define if_verbose(format,args...) \
+  if (verbose) { clib_warning(format, ## args); }
+
+static int
+test_time_main (unformat_input_t * input)
+{
+  f64 wait, error;
+  f64 t, tu[3], ave, rms;
+  clib_time_t c;
+  int i, n, j;
+
+  clib_time_init (&c);
+  wait = 1e-3;
+  n = 1000;
+  unformat (input, "%f %d", &wait, &n);
+  ave = rms = 0;
+  tu[0] = unix_time_now ();
+  tu[1] = unix_time_now ();
+  for (i = 0; i < n; i++)
+    {
+      j = 0;
+      t = clib_time_now (&c);
+      while (clib_time_now (&c) < t + wait)
+	j++;
+      t = j;
+      ave += t;
+      rms += t * t;
+    }
+  tu[2] = unix_time_now ();
+  ave /= n;
+  rms = sqrt (rms / n - ave * ave);
+
+  error = ((tu[2] - tu[1]) - 2 * (tu[1] - tu[0]) - n * wait) / n;
+  if_verbose ("tested %d x %.6e sec waits, error %.6e loops %.6e +- %.6e\n",
+	      n, wait, error, ave, rms);
+
+  return 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int ret;
+
+  verbose = (argc > 1);
+  unformat_init_command_line (&i, argv);
+  ret = test_time_main (&i);
+  unformat_free (&i);
+
+  return ret;
+}
+#endif /* CLIB_UNIX */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_timing_wheel.c b/src/vppinfra/test_timing_wheel.c
new file mode 100644
index 00000000..0ce15ad8
--- /dev/null
+++ b/src/vppinfra/test_timing_wheel.c
@@ -0,0 +1,389 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/bitmap.h>
+#include <vppinfra/error.h>
+#include <vppinfra/format.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/random.h>
+#include <vppinfra/time.h>
+#include <vppinfra/timing_wheel.h>
+#include <vppinfra/zvec.h>
+
+#include <vppinfra/math.h>
+
+#if __GNUC__ < 4
+#define SQRT(a) a
+#else
+#define SQRT(a) sqrt(a)
+#endif
+
+typedef struct
+{
+  uword n_iter;
+
+  u32 n_events;
+  u32 seed;
+  u32 verbose;
+
+  /* Time is "synthetic" e.g. not taken from CPU timer. */
+  u32 synthetic_time;
+
+  clib_time_t time;
+  timing_wheel_t timing_wheel;
+
+  u64 *events;
+
+  f64 max_time;
+  f64 wait_time;
+
+  f64 total_iterate_time;
+  f64 time_iterate_start;
+
+  f64 time_per_status_update;
+  f64 time_next_status_update;
+} test_timing_wheel_main_t;
+
+typedef struct
+{
+  f64 dt;
+  f64 fraction;
+  u64 count;
+} test_timing_wheel_tmp_t;
+
+static void
+set_event (test_timing_wheel_main_t * tm, uword i)
+{
+  timing_wheel_t *w = &tm->timing_wheel;
+  u64 cpu_time;
+
+  cpu_time = w->current_time_index << w->log2_clocks_per_bin;
+  if (tm->synthetic_time)
+    cpu_time += random_u32 (&tm->seed) % tm->n_iter;
+  else
+    cpu_time +=
+      random_f64 (&tm->seed) * tm->max_time * tm->time.clocks_per_second;
+
+  timing_wheel_insert (w, cpu_time, i);
+  timing_wheel_validate (w);
+  tm->events[i] = cpu_time;
+}
+
+static int
+test_timing_wheel_tmp_cmp (void *a1, void *a2)
+{
+  test_timing_wheel_tmp_t *f1 = a1;
+  test_timing_wheel_tmp_t *f2 = a2;
+
+  return f1->dt < f2->dt ? -1 : (f1->dt > f2->dt ? +1 : 0);
+}
+
+clib_error_t *
+test_timing_wheel_main (unformat_input_t * input)
+{
+  clib_error_t *error = 0;
+  test_timing_wheel_main_t _tm, *tm = &_tm;
+  timing_wheel_t *w = &tm->timing_wheel;
+  uword iter, i;
+
+  memset (tm, 0, sizeof (tm[0]));
+  tm->n_iter = 10;
+  tm->time_per_status_update = 0;
+  tm->n_events = 100;
+  tm->seed = 1;
+  tm->synthetic_time = 1;
+  tm->max_time = 1;
+  tm->wait_time = 1e-3;
+
+  w->validate = 0;
+  w->n_wheel_elt_time_bits = 32;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "iter %wd", &tm->n_iter))
+	;
+      else if (unformat (input, "events %d", &tm->n_events))
+	;
+      else
+	if (unformat (input, "elt-time-bits %d", &w->n_wheel_elt_time_bits))
+	;
+      else if (unformat (input, "seed %d", &tm->seed))
+	;
+      else if (unformat (input, "verbose"))
+	tm->verbose = 1;
+      else if (unformat (input, "validate"))
+	w->validate = 1;
+
+      else if (unformat (input, "real-time"))
+	tm->synthetic_time = 0;
+      else if (unformat (input, "synthetic-time"))
+	tm->synthetic_time = 1;
+      else if (unformat (input, "max-time %f", &tm->max_time))
+	;
+      else if (unformat (input, "wait-time %f", &tm->wait_time))
+	;
+      else if (unformat (input, "iter-time %f", &tm->total_iterate_time))
+	;
+      else if (unformat (input, "print %f", &tm->time_per_status_update))
+	;
+
+      else
+	{
+	  error = clib_error_create ("unknown input `%U'\n",
+				     format_unformat_error, input);
+	  goto done;
+	}
+    }
+
+  if (!tm->seed)
+    tm->seed = random_default_seed ();
+
+  clib_time_init (&tm->time);
+
+  if (tm->synthetic_time)
+    {
+      w->min_sched_time = tm->time.seconds_per_clock;
+      w->max_sched_time = w->min_sched_time * 256;
+      timing_wheel_init (w, 0, tm->time.clocks_per_second);
+    }
+  else
+    {
+      timing_wheel_init (w, clib_cpu_time_now (), tm->time.clocks_per_second);
+    }
+
+  clib_warning ("iter %wd, events %d, seed %u, %U",
+		tm->n_iter, tm->n_events, tm->seed,
+		format_timing_wheel, &tm->timing_wheel, /* verbose */ 0);
+
+  /* Make some events. */
+  vec_resize (tm->events, tm->n_events);
+  for (i = 0; i < vec_len (tm->events); i++)
+    set_event (tm, i);
+
+  {
+    u32 *expired = 0;
+    f64 ave_error = 0;
+    f64 rms_error = 0;
+    f64 max_error = 0, min_error = 1e30;
+    u32 *error_hist = 0;
+    uword n_expired = 0;
+    uword *expired_bitmap[2] = { 0 };
+    uword n_events_in_wheel = vec_len (tm->events);
+
+    vec_resize (expired, 32);
+    vec_resize (error_hist, 1024);
+
+    tm->time_iterate_start = clib_time_now (&tm->time);
+    tm->time_next_status_update =
+      tm->time_iterate_start + tm->time_per_status_update;
+
+    if (tm->total_iterate_time != 0)
+      tm->n_iter = ~0;
+
+    for (iter = 0; iter < tm->n_iter || n_events_in_wheel > 0; iter++)
+      {
+	u64 cpu_time, min_next_time[2];
+
+	if (tm->synthetic_time)
+	  cpu_time = iter << w->log2_clocks_per_bin;
+	else
+	  cpu_time = clib_cpu_time_now ();
+
+	_vec_len (expired) = 0;
+	expired =
+	  timing_wheel_advance (w, cpu_time, expired, &min_next_time[0]);
+	timing_wheel_validate (w);
+
+	/* Update bitmap of expired events. */
+	if (w->validate)
+	  {
+	    for (i = 0; i < vec_len (tm->events); i++)
+	      {
+		uword is_expired;
+
+		is_expired =
+		  (cpu_time >> w->log2_clocks_per_bin) >=
+		  (tm->events[i] >> w->log2_clocks_per_bin);
+		expired_bitmap[0] =
+		  clib_bitmap_set (expired_bitmap[0], i, is_expired);
+
+		/* Validate min next time. */
+		if (is_expired)
+		  ASSERT (min_next_time[0] > tm->events[i]);
+		else
+		  ASSERT (min_next_time[0] <= tm->events[i]);
+	      }
+	  }
+
+	n_expired += vec_len (expired);
+	for (i = 0; i < vec_len (expired); i++)
+	  {
+	    word j, idt;
+	    i64 dt_cpu;
+	    f64 fdt_cpu;
+
+	    j = expired[i];
+	    expired_bitmap[1] = clib_bitmap_ori (expired_bitmap[1], j);
+
+	    dt_cpu = cpu_time - tm->events[j];
+
+	    /* Event must be scheduled in correct bin. */
+	    if (tm->synthetic_time)
+	      ASSERT (dt_cpu >= 0 && dt_cpu <= (1 << w->log2_clocks_per_bin));
+
+	    fdt_cpu = dt_cpu * tm->time.seconds_per_clock;
+
+	    ave_error += fdt_cpu;
+	    rms_error += fdt_cpu * fdt_cpu;
+
+	    if (fdt_cpu > max_error)
+	      max_error = fdt_cpu;
+	    if (fdt_cpu < min_error)
+	      min_error = fdt_cpu;
+
+	    idt =
+	      (cpu_time >> w->log2_clocks_per_bin) -
+	      (tm->events[j] >> w->log2_clocks_per_bin);
+	    idt = zvec_signed_to_unsigned (idt);
+	    vec_validate (error_hist, idt);
+	    error_hist[idt] += 1;
+	  }
+
+	if (w->validate)
+	  for (i = 0; i < vec_len (tm->events); i++)
+	    {
+	      int is_expired = clib_bitmap_get (expired_bitmap[0], i);
+	      int is_expired_w = clib_bitmap_get (expired_bitmap[1], i);
+	      ASSERT (is_expired == is_expired_w);
+	    }
+
+	min_next_time[1] = ~0;
+	for (i = 0; i < vec_len (tm->events); i++)
+	  {
+	    if (!clib_bitmap_get (expired_bitmap[1], i))
+	      min_next_time[1] = clib_min (min_next_time[1], tm->events[i]);
+	  }
+	if (min_next_time[0] != min_next_time[1])
+	  clib_error ("min next time wrong 0x%Lx != 0x%Lx", min_next_time[0],
+		      min_next_time[1]);
+
+	if (tm->time_per_status_update != 0
+	    && clib_time_now (&tm->time) >= tm->time_next_status_update)
+	  {
+	    f64 ave = 0, rms = 0;
+
+	    tm->time_next_status_update += tm->time_per_status_update;
+	    if (n_expired > 0)
+	      {
+		ave = ave_error / n_expired;
+		rms = SQRT (rms_error / n_expired - ave * ave);
+	      }
+
+	    clib_warning
+	      ("%12wd iter done %10wd expired; ave. error %.4e +- %.4e, range %.4e %.4e",
+	       iter, n_expired, ave, rms, min_error, max_error);
+	  }
+
+	if (tm->total_iterate_time != 0
+	    && (clib_time_now (&tm->time) - tm->time_iterate_start
+		>= tm->total_iterate_time))
+	  tm->n_iter = iter;
+
+	/* Add new events to wheel to replace expired ones. */
+	n_events_in_wheel -= vec_len (expired);
+	if (iter < tm->n_iter)
+	  {
+	    for (i = 0; i < vec_len (expired); i++)
+	      {
+		uword j = expired[i];
+		set_event (tm, j);
+		expired_bitmap[1] =
+		  clib_bitmap_andnoti (expired_bitmap[1], j);
+	      }
+	    n_events_in_wheel += vec_len (expired);
+	  }
+      }
+
+    ave_error /= n_expired;
+    rms_error = SQRT (rms_error / n_expired - ave_error * ave_error);
+
+    clib_warning
+      ("%wd iter done %wd expired; ave. error %.4e +- %.4e, range %.4e %.4e",
+       1 + iter, n_expired, ave_error, rms_error, min_error, max_error);
+
+    {
+      test_timing_wheel_tmp_t *fs, *f;
+      f64 total_fraction;
+
+      fs = 0;
+      for (i = 0; i < vec_len (error_hist); i++)
+	{
+	  if (error_hist[i] == 0)
+	    continue;
+	  vec_add2 (fs, f, 1);
+	  f->dt =
+	    (((i64) zvec_unsigned_to_signed (i) << w->log2_clocks_per_bin) *
+	     tm->time.seconds_per_clock);
+	  f->fraction = (f64) error_hist[i] / (f64) n_expired;
+	  f->count = error_hist[i];
+	}
+
+      vec_sort_with_function (fs, test_timing_wheel_tmp_cmp);
+
+      total_fraction = 0;
+      vec_foreach (f, fs)
+      {
+	total_fraction += f->fraction;
+	if (f == fs)
+	  fformat (stdout, "%=12s %=16s %=16s %s\n", "Error max", "Fraction",
+		   "Total", "Count");
+	fformat (stdout, "%12.4e %16.4f%% %16.4f%% %Ld\n", f->dt,
+		 f->fraction * 100, total_fraction * 100, f->count);
+      }
+    }
+
+    clib_warning ("%U", format_timing_wheel, w, /* verbose */ 1);
+  }
+
+done:
+  return error;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  clib_error_t *error;
+
+  unformat_init_command_line (&i, argv);
+  error = test_timing_wheel_main (&i);
+  unformat_free (&i);
+  if (error)
+    {
+      clib_error_report (error);
+      return 1;
+    }
+  else
+    return 0;
+}
+#endif /* CLIB_UNIX */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_vec.c b/src/vppinfra/test_vec.c
new file mode 100644
index 00000000..f0497ac6
--- /dev/null
+++ b/src/vppinfra/test_vec.c
@@ -0,0 +1,1159 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+  Written by Fred Delley <fdelley@cisco.com> .
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifdef CLIB_LINUX_KERNEL
+#include <linux/unistd.h>
+#endif
+
+#ifdef CLIB_UNIX
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#endif
+
+#include <vppinfra/clib.h>
+#include <vppinfra/mheap.h>
+#include <vppinfra/format.h>
+#include <vppinfra/error.h>
+#include <vppinfra/random.h>
+#include <vppinfra/time.h>
+
+#include "test_vec.h"
+
+static int verbose;
+#define if_verbose(format,args...) \
+  if (verbose) { clib_warning(format, ## args); }
+
+#define MAX_CHANGE 100
+
+
+typedef enum
+{
+  /* Values have to be sequential and start with 0. */
+  OP_IS_VEC_RESIZE = 0,
+  OP_IS_VEC_ADD1,
+  OP_IS_VEC_ADD2,
+  OP_IS_VEC_ADD,
+  OP_IS_VEC_INSERT,
+  OP_IS_VEC_INSERT_ELTS,
+  OP_IS_VEC_DELETE,
+  OP_IS_VEC_DUP,
+  OP_IS_VEC_IS_EQUAL,
+  OP_IS_VEC_ZERO,
+  OP_IS_VEC_SET,
+  OP_IS_VEC_VALIDATE,
+  OP_IS_VEC_FREE,
+  OP_IS_VEC_INIT,
+  OP_IS_VEC_CLONE,
+  OP_IS_VEC_APPEND,
+  OP_IS_VEC_PREPEND,
+  /* Operations on vectors with custom headers. */
+  OP_IS_VEC_INIT_H,
+  OP_IS_VEC_RESIZE_H,
+  OP_IS_VEC_FREE_H,
+  OP_MAX,
+} op_t;
+
+#define FIRST_VEC_OP		OP_IS_VEC_RESIZE
+#define LAST_VEC_OP		OP_IS_VEC_PREPEND
+#define FIRST_VEC_HDR_OP	OP_IS_VEC_INIT_H
+#define LAST_VEC_HDR_OP		OP_IS_VEC_FREE_H
+
+uword g_prob_ratio[] = {
+  [OP_IS_VEC_RESIZE] = 5,
+  [OP_IS_VEC_ADD1] = 5,
+  [OP_IS_VEC_ADD2] = 5,
+  [OP_IS_VEC_ADD] = 5,
+  [OP_IS_VEC_INSERT] = 5,
+  [OP_IS_VEC_INSERT_ELTS] = 5,
+  [OP_IS_VEC_DELETE] = 30,
+  [OP_IS_VEC_DUP] = 5,
+  [OP_IS_VEC_IS_EQUAL] = 5,
+  [OP_IS_VEC_ZERO] = 2,
+  [OP_IS_VEC_SET] = 3,
+  [OP_IS_VEC_VALIDATE] = 5,
+  [OP_IS_VEC_FREE] = 5,
+  [OP_IS_VEC_INIT] = 5,
+  [OP_IS_VEC_CLONE] = 5,
+  [OP_IS_VEC_APPEND] = 5,
+  [OP_IS_VEC_PREPEND] = 5,
+  /* Operations on vectors with custom headers. */
+  [OP_IS_VEC_INIT_H] = 5,
+  [OP_IS_VEC_RESIZE_H] = 5,
+  [OP_IS_VEC_FREE_H] = 5,
+};
+
+op_t *g_prob;
+op_t *g_prob_wh;
+
+uword g_call_stats[OP_MAX];
+
+
+/* A structure for both vector headers and vector elements might be useful to
+   uncover potential alignement issues. */
+
+typedef struct
+{
+  u8 field1[4];
+    CLIB_PACKED (u32 field2);
+} hdr_t;
+
+typedef struct
+{
+  u8 field1[3];
+    CLIB_PACKED (u32 field2);
+} elt_t;
+
+#ifdef CLIB_UNIX
+u32 g_seed = 0xdeadbabe;
+uword g_verbose = 1;
+#endif
+
+op_t *g_op_prob;
+uword g_set_verbose_at = ~0;
+uword g_dump_period = ~0;
+
+
+static u8 *
+format_vec_op_type (u8 * s, va_list * args)
+{
+  op_t op = va_arg (*args, int);
+
+  switch (op)
+    {
+#define _(n)					\
+      case OP_IS_##n:				\
+	s = format (s, "OP_IS_" #n);		\
+	break;
+
+      _(VEC_RESIZE);
+      _(VEC_ADD1);
+      _(VEC_ADD2);
+      _(VEC_ADD);
+      _(VEC_INSERT);
+      _(VEC_INSERT_ELTS);
+      _(VEC_DELETE);
+      _(VEC_DUP);
+      _(VEC_IS_EQUAL);
+      _(VEC_ZERO);
+      _(VEC_SET);
+      _(VEC_VALIDATE);
+      _(VEC_FREE);
+      _(VEC_INIT);
+      _(VEC_CLONE);
+      _(VEC_APPEND);
+      _(VEC_PREPEND);
+      _(VEC_INIT_H);
+      _(VEC_RESIZE_H);
+      _(VEC_FREE_H);
+
+    default:
+      s = format (s, "Unknown vec op (%d)", op);
+      break;
+    }
+
+#undef _
+
+  return s;
+}
+
+static void
+dump_call_stats (uword * stats)
+{
+  uword i;
+
+  fformat (stdout, "Call Stats\n----------\n");
+
+  for (i = 0; i < OP_MAX; i++)
+    fformat (stdout, "%-8d %U\n", stats[i], format_vec_op_type, i);
+}
+
+
+/* XXX - Purposely low value for debugging the validator. Will be set it to a
+   more sensible value later. */
+#define MAX_VEC_LEN 10
+
+#define create_random_vec_wh(elt_type, len, hdr_bytes, seed)			\
+({										\
+  elt_type * _v(v) = NULL;							\
+  uword _v(l) = (len);								\
+  uword _v(h) = (hdr_bytes);							\
+  u8 * _v(hdr);									\
+										\
+  if (_v(l) == 0)								\
+    goto __done__;								\
+										\
+  /* ~0 means select random length between 0 and MAX_VEC_LEN. */		\
+  if (_v(l) == ~0)								\
+    _v(l) = bounded_random_u32 (&(seed), 0, MAX_VEC_LEN);			\
+										\
+  _v(v) = _vec_resize (NULL, _v(l), _v(l) * sizeof (elt_type), _v(h), 0);	\
+  fill_with_random_data (_v(v), vec_bytes (_v(v)), (seed));			\
+										\
+  /* Fill header with random data as well. */					\
+  if (_v(h) > 0)								\
+    {										\
+      _v(hdr) = vec_header (_v(v), _v(h));					\
+      fill_with_random_data (_v(hdr), _v(h), (seed));				\
+    }										\
+										\
+__done__:									\
+  _v(v);									\
+})
+
+#define create_random_vec(elt_type, len, seed) \
+create_random_vec_wh (elt_type, len, 0, seed)
+
+#define compute_vec_hash(hash, vec)			\
+({							\
+  u8 * _v(v) = (u8 *) (vec);				\
+  uword _v(n) = vec_len (vec) * sizeof ((vec)[0]);	\
+  u8 _v(hh) = (u8) (hash);				\
+							\
+  compute_mem_hash (_v(hh), _v(v), _v(n));		\
+})
+
+static elt_t *
+validate_vec_free (elt_t * vec)
+{
+  vec_free (vec);
+  ASSERT (vec == NULL);
+  return vec;
+}
+
+static elt_t *
+validate_vec_free_h (elt_t * vec, uword hdr_bytes)
+{
+  vec_free_h (vec, hdr_bytes);
+  ASSERT (vec == NULL);
+  return vec;
+}
+
+static void
+validate_vec_hdr (elt_t * vec, uword hdr_bytes)
+{
+  u8 *hdr;
+  u8 *hdr_end;
+  vec_header_t *vh;
+
+  if (!vec)
+    return;
+
+  vh = _vec_find (vec);
+  hdr = vec_header (vec, hdr_bytes);
+  hdr_end = vec_header_end (hdr, hdr_bytes);
+
+  ASSERT (hdr_end == (u8 *) vec);
+  ASSERT ((u8 *) vh - (u8 *) hdr >= hdr_bytes);
+}
+
+static void
+validate_vec_len (elt_t * vec)
+{
+  u8 *ptr;
+  u8 *end;
+  uword len;
+  uword bytes;
+  uword i;
+  elt_t *elt;
+
+  if (!vec)
+    return;
+
+  ptr = (u8 *) vec;
+  end = (u8 *) vec_end (vec);
+  len = vec_len (vec);
+  bytes = sizeof (vec[0]) * len;
+
+  ASSERT (bytes == vec_bytes (vec));
+  ASSERT ((ptr + bytes) == end);
+
+  i = 0;
+
+  /* XXX - TODO: confirm that auto-incrementing in vec_is_member() would not
+     have the expected result. */
+  while (vec_is_member (vec, (__typeof__ (vec[0]) *) ptr))
+    {
+      ptr++;
+      i++;
+    }
+
+  ASSERT (ptr == end);
+  ASSERT (i == bytes);
+
+  i = 0;
+
+  vec_foreach (elt, vec) i++;
+
+  ASSERT (i == len);
+}
+
+static void
+validate_vec (elt_t * vec, uword hdr_bytes)
+{
+  validate_vec_hdr (vec, hdr_bytes);
+  validate_vec_len (vec);
+
+  if (!vec || vec_len (vec) == 0)
+    {
+      VERBOSE3 ("Vector at %p has zero elements.\n\n", vec);
+    }
+  else
+    {
+      if (hdr_bytes > 0)
+	VERBOSE3 ("Header: %U\n",
+		  format_hex_bytes, vec_header (vec, sizeof (vec[0])),
+		  sizeof (vec[0]));
+
+      VERBOSE3 ("%U\n\n",
+		format_hex_bytes, vec, vec_len (vec) * sizeof (vec[0]));
+    }
+}
+
+static elt_t *
+validate_vec_resize (elt_t * vec, uword num_elts)
+{
+  uword len1 = vec_len (vec);
+  uword len2;
+  u8 hash = compute_vec_hash (0, vec);
+
+  vec_resize (vec, num_elts);
+  len2 = vec_len (vec);
+
+  ASSERT (len2 == len1 + num_elts);
+  ASSERT (compute_vec_hash (hash, vec) == 0);
+  validate_vec (vec, 0);
+  return vec;
+}
+
+static elt_t *
+validate_vec_resize_h (elt_t * vec, uword num_elts, uword hdr_bytes)
+{
+  uword len1, len2;
+  u8 *end1, *end2;
+  u8 *hdr = NULL;
+  u8 hash, hdr_hash;
+
+  len1 = vec_len (vec);
+
+  if (vec)
+    hdr = vec_header (vec, hdr_bytes);
+
+  hash = compute_vec_hash (0, vec);
+  hdr_hash = compute_mem_hash (0, hdr, hdr_bytes);
+
+  vec_resize_ha (vec, num_elts, hdr_bytes, 0);
+  len2 = vec_len (vec);
+
+  ASSERT (len2 == len1 + num_elts);
+
+  end1 = (u8 *) (vec + len1);
+  end2 = (u8 *) vec_end (vec);
+
+  while (end1 != end2)
+    {
+      ASSERT (*end1 == 0);
+      end1++;
+    }
+
+  if (vec)
+    hdr = vec_header (vec, hdr_bytes);
+
+  ASSERT (compute_vec_hash (hash, vec) == 0);
+  ASSERT (compute_mem_hash (hdr_hash, hdr, hdr_bytes) == 0);
+  validate_vec (vec, 1);
+  return vec;
+}
+
+static elt_t *
+generic_validate_vec_add (elt_t * vec, uword num_elts, uword is_add2)
+{
+  uword len1 = vec_len (vec);
+  uword len2;
+  u8 hash = compute_vec_hash (0, vec);
+  elt_t *new;
+
+  if (is_add2)
+    {
+      vec_add2 (vec, new, num_elts);
+    }
+  else
+    {
+      new = create_random_vec (elt_t, num_elts, g_seed);
+
+      VERBOSE3 ("%U\n", format_hex_bytes, new,
+		vec_len (new) * sizeof (new[0]));
+
+      /* Add the hash value of the new elements to that of the old vector. */
+      hash = compute_vec_hash (hash, new);
+
+      if (num_elts == 1)
+	vec_add1 (vec, new[0]);
+      else if (num_elts > 1)
+	vec_add (vec, new, num_elts);
+
+      vec_free (new);
+    }
+
+  len2 = vec_len (vec);
+  ASSERT (len2 == len1 + num_elts);
+
+  ASSERT (compute_vec_hash (hash, vec) == 0);
+  validate_vec (vec, 0);
+  return vec;
+}
+
+static elt_t *
+validate_vec_add1 (elt_t * vec)
+{
+  return generic_validate_vec_add (vec, 1, 0);
+}
+
+static elt_t *
+validate_vec_add2 (elt_t * vec, uword num_elts)
+{
+  return generic_validate_vec_add (vec, num_elts, 1);
+}
+
+static elt_t *
+validate_vec_add (elt_t * vec, uword num_elts)
+{
+  return generic_validate_vec_add (vec, num_elts, 0);
+}
+
+static elt_t *
+validate_vec_insert (elt_t * vec, uword num_elts, uword start_elt)
+{
+  uword len1 = vec_len (vec);
+  uword len2;
+  u8 hash;
+
+  /* vec_insert() would not handle it properly. */
+  if (start_elt > len1 || num_elts == 0)
+    return vec;
+
+  hash = compute_vec_hash (0, vec);
+  vec_insert (vec, num_elts, start_elt);
+  len2 = vec_len (vec);
+
+  ASSERT (len2 == len1 + num_elts);
+  ASSERT (compute_vec_hash (hash, vec) == 0);
+  validate_vec (vec, 0);
+  return vec;
+}
+
+static elt_t *
+validate_vec_insert_elts (elt_t * vec, uword num_elts, uword start_elt)
+{
+  uword len1 = vec_len (vec);
+  uword len2;
+  elt_t *new;
+  u8 hash;
+
+  /* vec_insert_elts() would not handle it properly. */
+  if (start_elt > len1 || num_elts == 0)
+    return vec;
+
+  new = create_random_vec (elt_t, num_elts, g_seed);
+
+  VERBOSE3 ("%U\n", format_hex_bytes, new, vec_len (new) * sizeof (new[0]));
+
+  /* Add the hash value of the new elements to that of the old vector. */
+  hash = compute_vec_hash (0, vec);
+  hash = compute_vec_hash (hash, new);
+
+  vec_insert_elts (vec, new, num_elts, start_elt);
+  len2 = vec_len (vec);
+
+  vec_free (new);
+
+  ASSERT (len2 == len1 + num_elts);
+  ASSERT (compute_vec_hash (hash, vec) == 0);
+  validate_vec (vec, 0);
+  return vec;
+}
+
+static elt_t *
+validate_vec_delete (elt_t * vec, uword num_elts, uword start_elt)
+{
+  uword len1 = vec_len (vec);
+  uword len2;
+  u8 *start;
+  u8 hash;
+  u8 hash_del;
+
+  /* vec_delete() would not handle it properly. */
+  if (start_elt + num_elts > len1)
+    return vec;
+
+  start = (u8 *) vec + (start_elt * sizeof (vec[0]));
+
+  hash = compute_vec_hash (0, vec);
+  hash_del = compute_mem_hash (0, start, num_elts * sizeof (vec[0]));
+  hash ^= hash_del;
+
+  vec_delete (vec, num_elts, start_elt);
+  len2 = vec_len (vec);
+
+  ASSERT (len2 == len1 - num_elts);
+  ASSERT (compute_vec_hash (hash, vec) == 0);
+  validate_vec (vec, 0);
+  return vec;
+}
+
+static elt_t *
+validate_vec_dup (elt_t * vec)
+{
+  elt_t *new;
+  u8 hash;
+
+  hash = compute_vec_hash (0, vec);
+  new = vec_dup (vec);
+
+  ASSERT (compute_vec_hash (hash, new) == 0);
+
+  validate_vec (new, 0);
+  return new;
+}
+
+static elt_t *
+validate_vec_zero (elt_t * vec)
+{
+  u8 *ptr;
+  u8 *end;
+
+  vec_zero (vec);
+
+  ptr = (u8 *) vec;
+  end = (u8 *) (vec + vec_len (vec));
+
+  while (ptr != end)
+    {
+      ASSERT (ptr < (u8 *) vec_end (vec));
+      ASSERT (ptr[0] == 0);
+      ptr++;
+    }
+
+  validate_vec (vec, 0);
+  return vec;
+}
+
+static void
+validate_vec_is_equal (elt_t * vec)
+{
+  elt_t *new = NULL;
+
+  if (vec_len (vec) <= 0)
+    return;
+
+  new = vec_dup (vec);
+  ASSERT (vec_is_equal (new, vec));
+  vec_free (new);
+}
+
+static elt_t *
+validate_vec_set (elt_t * vec)
+{
+  uword i;
+  uword len = vec_len (vec);
+  elt_t *new;
+
+  if (!vec)
+    return NULL;
+
+  new = create_random_vec (elt_t, 1, g_seed);
+
+  VERBOSE3 ("%U\n", format_hex_bytes, new, vec_len (new) * sizeof (new[0]));
+
+  vec_set (vec, new[0]);
+
+  for (i = 0; i < len; i++)
+    ASSERT (memcmp (&vec[i], &new[0], sizeof (vec[0])) == 0);
+
+  vec_free (new);
+  validate_vec (vec, 0);
+  return vec;
+}
+
+static elt_t *
+validate_vec_validate (elt_t * vec, uword index)
+{
+  uword len = vec_len (vec);
+  word num_new = index - len + 1;
+  u8 *ptr;
+  u8 *end;
+  u8 hash = compute_vec_hash (0, vec);
+
+  if (num_new < 0)
+    num_new = 0;
+
+  vec_validate (vec, index);
+
+  /* Old len but new vec pointer! */
+  ptr = (u8 *) (vec + len);
+  end = (u8 *) (vec + len + num_new);
+
+  ASSERT (len + num_new == vec_len (vec));
+  ASSERT (compute_vec_hash (hash, vec) == 0);
+
+  while (ptr != end)
+    {
+      ASSERT (ptr < (u8 *) vec_end (vec));
+      ASSERT (ptr[0] == 0);
+      ptr++;
+    }
+
+  validate_vec (vec, 0);
+  return vec;
+}
+
+static elt_t *
+validate_vec_init (uword num_elts)
+{
+  u8 *ptr;
+  u8 *end;
+  uword len;
+  elt_t *new;
+
+  new = vec_new (elt_t, num_elts);
+  len = vec_len (new);
+
+  ASSERT (len == num_elts);
+
+  ptr = (u8 *) new;
+  end = (u8 *) (new + len);
+
+  while (ptr != end)
+    {
+      ASSERT (ptr < (u8 *) vec_end (new));
+      ASSERT (ptr[0] == 0);
+      ptr++;
+    }
+
+  validate_vec (new, 0);
+  return new;
+}
+
+static elt_t *
+validate_vec_init_h (uword num_elts, uword hdr_bytes)
+{
+  uword i = 0;
+  u8 *ptr;
+  u8 *end;
+  uword len;
+  elt_t *new;
+
+  new = vec_new_ha (elt_t, num_elts, hdr_bytes, 0);
+  len = vec_len (new);
+
+  ASSERT (len == num_elts);
+
+  /* We have 2 zero-regions to check: header & vec data (skip _VEC struct). */
+  for (i = 0; i < 2; i++)
+    {
+      if (i == 0)
+	{
+	  ptr = (u8 *) vec_header (new, hdr_bytes);
+	  end = ptr + hdr_bytes;
+	}
+      else
+	{
+	  ptr = (u8 *) new;
+	  end = (u8 *) (new + len);
+	}
+
+      while (ptr != end)
+	{
+	  ASSERT (ptr < (u8 *) vec_end (new));
+	  ASSERT (ptr[0] == 0);
+	  ptr++;
+	}
+    }
+
+  validate_vec (new, 1);
+  return new;
+}
+
+/* XXX - I don't understand the purpose of the vec_clone() call. */
+static elt_t *
+validate_vec_clone (elt_t * vec)
+{
+  elt_t *new;
+
+  vec_clone (new, vec);
+
+  ASSERT (vec_len (new) == vec_len (vec));
+  ASSERT (compute_vec_hash (0, new) == 0);
+  validate_vec (new, 0);
+  return new;
+}
+
+static elt_t *
+validate_vec_append (elt_t * vec)
+{
+  elt_t *new;
+  uword num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
+  uword len;
+  u8 hash = 0;
+
+  new = create_random_vec (elt_t, num_elts, g_seed);
+
+  len = vec_len (vec) + vec_len (new);
+  hash = compute_vec_hash (0, vec);
+  hash = compute_vec_hash (hash, new);
+
+  vec_append (vec, new);
+  vec_free (new);
+
+  ASSERT (vec_len (vec) == len);
+  ASSERT (compute_vec_hash (hash, vec) == 0);
+  validate_vec (vec, 0);
+  return vec;
+}
+
+static elt_t *
+validate_vec_prepend (elt_t * vec)
+{
+  elt_t *new;
+  uword num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
+  uword len;
+  u8 hash = 0;
+
+  new = create_random_vec (elt_t, num_elts, g_seed);
+
+  len = vec_len (vec) + vec_len (new);
+  hash = compute_vec_hash (0, vec);
+  hash = compute_vec_hash (hash, new);
+
+  vec_prepend (vec, new);
+  vec_free (new);
+
+  ASSERT (vec_len (vec) == len);
+  ASSERT (compute_vec_hash (hash, vec) == 0);
+  validate_vec (vec, 0);
+  return vec;
+}
+
+static void
+run_validator_wh (uword iter)
+{
+  elt_t *vec;
+  uword i;
+  uword op;
+  uword num_elts;
+  uword len;
+  uword dump_time;
+  f64 time[3];			/* [0]: start, [1]: last, [2]: current */
+
+  vec = create_random_vec_wh (elt_t, ~0, sizeof (hdr_t), g_seed);
+  validate_vec (vec, 0);
+  VERBOSE2 ("Start with len %d\n", vec_len (vec));
+
+  time[0] = unix_time_now ();
+  time[1] = time[0];
+  dump_time = g_dump_period;
+
+  for (i = 1; i <= iter; i++)
+    {
+      if (i >= g_set_verbose_at)
+	g_verbose = 2;
+
+      op = bounded_random_u32 (&g_seed, 0, vec_len (g_prob_wh) - 1);
+      op = g_prob_wh[op];
+
+      switch (op)
+	{
+	case OP_IS_VEC_INIT_H:
+	  num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
+	  vec_free_h (vec, sizeof (hdr_t));
+	  VERBOSE2 ("vec_init_h(), new elts %d\n", num_elts);
+	  vec = validate_vec_init_h (num_elts, sizeof (hdr_t));
+	  break;
+
+	case OP_IS_VEC_RESIZE_H:
+	  len = vec_len (vec);
+	  num_elts = bounded_random_u32 (&g_seed, len, len + MAX_CHANGE);
+	  VERBOSE2 ("vec_resize_h(), %d new elts.\n", num_elts);
+	  vec = validate_vec_resize_h (vec, num_elts, sizeof (hdr_t));
+	  break;
+
+	case OP_IS_VEC_FREE_H:
+	  VERBOSE2 ("vec_free_h()\n");
+	  vec = validate_vec_free_h (vec, sizeof (hdr_t));
+	  break;
+
+	default:
+	  ASSERT (0);
+	  break;
+	}
+
+      g_call_stats[op]++;
+
+      if (i == dump_time)
+	{
+	  time[2] = unix_time_now ();
+	  VERBOSE1 ("%d vec ops in %f secs. (last %d in %f secs.).\n",
+		    i, time[2] - time[0], g_dump_period, time[2] - time[1]);
+	  time[1] = time[2];
+	  dump_time += g_dump_period;
+
+	  VERBOSE1 ("vec len %d\n", vec_len (vec));
+	  VERBOSE2 ("%U\n\n",
+		    format_hex_bytes, vec, vec_len (vec) * sizeof (vec[0]));
+	}
+
+      VERBOSE2 ("len %d\n", vec_len (vec));
+    }
+
+  validate_vec (vec, sizeof (hdr_t));
+  vec_free_h (vec, sizeof (hdr_t));
+}
+
+static void
+run_validator (uword iter)
+{
+  elt_t *vec;
+  elt_t *new;
+  uword i;
+  uword op;
+  uword num_elts;
+  uword index;
+  uword len;
+  uword dump_time;
+  f64 time[3];			/* [0]: start, [1]: last, [2]: current */
+
+  vec = create_random_vec (elt_t, ~0, g_seed);
+  validate_vec (vec, 0);
+  VERBOSE2 ("Start with len %d\n", vec_len (vec));
+
+  time[0] = unix_time_now ();
+  time[1] = time[0];
+  dump_time = g_dump_period;
+
+  for (i = 1; i <= iter; i++)
+    {
+      if (i >= g_set_verbose_at)
+	g_verbose = 2;
+
+      op = bounded_random_u32 (&g_seed, 0, vec_len (g_prob) - 1);
+      op = g_prob[op];
+
+      switch (op)
+	{
+	case OP_IS_VEC_RESIZE:
+	  len = vec_len (vec);
+	  num_elts = bounded_random_u32 (&g_seed, len, len + MAX_CHANGE);
+	  VERBOSE2 ("vec_resize(), %d new elts.\n", num_elts);
+	  vec = validate_vec_resize (vec, num_elts);
+	  break;
+
+	case OP_IS_VEC_ADD1:
+	  VERBOSE2 ("vec_add1()\n");
+	  vec = validate_vec_add1 (vec);
+	  break;
+
+	case OP_IS_VEC_ADD2:
+	  num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
+	  VERBOSE2 ("vec_add2(), %d new elts.\n", num_elts);
+	  vec = validate_vec_add2 (vec, num_elts);
+	  break;
+
+	case OP_IS_VEC_ADD:
+	  num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
+	  VERBOSE2 ("vec_add(), %d new elts.\n", num_elts);
+	  vec = validate_vec_add (vec, num_elts);
+	  break;
+
+	case OP_IS_VEC_INSERT:
+	  len = vec_len (vec);
+	  num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
+	  index = bounded_random_u32 (&g_seed, 0,
+				      (len > 0) ? (len - 1) : (0));
+	  VERBOSE2 ("vec_insert(), %d new elts, index %d.\n", num_elts,
+		    index);
+	  vec = validate_vec_insert (vec, num_elts, index);
+	  break;
+
+	case OP_IS_VEC_INSERT_ELTS:
+	  len = vec_len (vec);
+	  num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
+	  index = bounded_random_u32 (&g_seed, 0,
+				      (len > 0) ? (len - 1) : (0));
+	  VERBOSE2 ("vec_insert_elts(), %d new elts, index %d.\n",
+		    num_elts, index);
+	  vec = validate_vec_insert_elts (vec, num_elts, index);
+	  break;
+
+	case OP_IS_VEC_DELETE:
+	  len = vec_len (vec);
+	  index = bounded_random_u32 (&g_seed, 0, len - 1);
+	  num_elts = bounded_random_u32 (&g_seed, 0,
+					 (len > index) ? (len - index) : (0));
+	  VERBOSE2 ("vec_delete(), %d elts, index %d.\n", num_elts, index);
+	  vec = validate_vec_delete (vec, num_elts, index);
+	  break;
+
+	case OP_IS_VEC_DUP:
+	  VERBOSE2 ("vec_dup()\n");
+	  new = validate_vec_dup (vec);
+	  vec_free (new);
+	  break;
+
+	case OP_IS_VEC_IS_EQUAL:
+	  VERBOSE2 ("vec_is_equal()\n");
+	  validate_vec_is_equal (vec);
+	  break;
+
+	case OP_IS_VEC_ZERO:
+	  VERBOSE2 ("vec_zero()\n");
+	  vec = validate_vec_zero (vec);
+	  break;
+
+	case OP_IS_VEC_SET:
+	  VERBOSE2 ("vec_set()\n");
+	  vec = validate_vec_set (vec);
+	  break;
+
+	case OP_IS_VEC_VALIDATE:
+	  len = vec_len (vec);
+	  index = bounded_random_u32 (&g_seed, 0, len - 1 + MAX_CHANGE);
+	  VERBOSE2 ("vec_validate(), index %d\n", index);
+	  vec = validate_vec_validate (vec, index);
+	  break;
+
+	case OP_IS_VEC_FREE:
+	  VERBOSE2 ("vec_free()\n");
+	  vec = validate_vec_free (vec);
+	  break;
+
+	case OP_IS_VEC_INIT:
+	  num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
+	  vec_free (vec);
+	  VERBOSE2 ("vec_init(), new elts %d\n", num_elts);
+	  vec = validate_vec_init (num_elts);
+	  break;
+
+	case OP_IS_VEC_CLONE:
+	  VERBOSE2 ("vec_clone()\n");
+	  new = validate_vec_clone (vec);
+	  vec_free (new);
+	  break;
+
+	case OP_IS_VEC_APPEND:
+	  VERBOSE2 ("vec_append()\n");
+	  vec = validate_vec_append (vec);
+	  break;
+
+	case OP_IS_VEC_PREPEND:
+	  VERBOSE2 ("vec_prepend()\n");
+	  vec = validate_vec_prepend (vec);
+	  break;
+
+	default:
+	  ASSERT (0);
+	  break;
+	}
+
+      g_call_stats[op]++;
+
+      if (i == dump_time)
+	{
+	  time[2] = unix_time_now ();
+	  VERBOSE1 ("%d vec ops in %f secs. (last %d in %f secs.).\n",
+		    i, time[2] - time[0], g_dump_period, time[2] - time[1]);
+	  time[1] = time[2];
+	  dump_time += g_dump_period;
+
+	  VERBOSE1 ("vec len %d\n", vec_len (vec));
+	  VERBOSE2 ("%U\n\n",
+		    format_hex_bytes, vec, vec_len (vec) * sizeof (vec[0]));
+	}
+
+      VERBOSE2 ("len %d\n", vec_len (vec));
+    }
+
+  validate_vec (vec, 0);
+  vec_free (vec);
+}
+
+static void
+prob_init (void)
+{
+  uword i, j, ratio, len, index;
+
+  /* Create the vector to implement the statistical profile:
+     vec [ op1 op1 op1 op2 op3 op3 op3 op4 op4 .... ] */
+  for (i = FIRST_VEC_OP; i <= LAST_VEC_OP; i++)
+    {
+      ratio = g_prob_ratio[i];
+      if (ratio <= 0)
+	continue;
+
+      len = vec_len (g_prob);
+      index = len - 1 + ratio;
+      ASSERT (index >= 0);
+
+      /* Pre-allocate new elements. */
+      vec_validate (g_prob, index);
+
+      for (j = len; j <= index; j++)
+	g_prob[j] = i;
+    }
+
+  /* Operations on vectors with headers. */
+  for (i = FIRST_VEC_HDR_OP; i <= LAST_VEC_HDR_OP; i++)
+    {
+      ratio = g_prob_ratio[i];
+      if (ratio <= 0)
+	continue;
+
+      len = vec_len (g_prob_wh);
+      index = len - 1 + ratio;
+      ASSERT (index >= 0);
+
+      /* Pre-allocate new elements. */
+      vec_validate (g_prob_wh, index);
+
+      for (j = len; j <= index; j++)
+	g_prob_wh[j] = i;
+    }
+
+  VERBOSE3 ("prob_vec, len %d\n%U\n", vec_len (g_prob),
+	    format_hex_bytes, g_prob, vec_len (g_prob) * sizeof (g_prob[0]));
+  VERBOSE3 ("prob_vec_wh, len %d\n%U\n", vec_len (g_prob_wh),
+	    format_hex_bytes, g_prob_wh,
+	    vec_len (g_prob_wh) * sizeof (g_prob_wh[0]));
+}
+
+static void
+prob_free (void)
+{
+  vec_free (g_prob);
+  vec_free (g_prob_wh);
+}
+
+int
+test_vec_main (unformat_input_t * input)
+{
+  uword iter = 1000;
+  uword help = 0;
+  uword big = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (0 == unformat (input, "iter %d", &iter)
+	  && 0 == unformat (input, "seed %d", &g_seed)
+	  && 0 == unformat (input, "verbose %d", &g_verbose)
+	  && 0 == unformat (input, "set %d", &g_set_verbose_at)
+	  && 0 == unformat (input, "dump %d", &g_dump_period)
+	  && 0 == unformat (input, "help %=", &help, 1)
+	  && 0 == unformat (input, "big %=", &big, 1))
+	{
+	  clib_error ("unknown input `%U'", format_unformat_error, input);
+	  goto usage;
+	}
+    }
+
+  if (big)
+    {
+      u8 *bigboy = 0;
+      u64 one_gig = (1 << 30);
+      u64 size;
+      u64 index;
+
+      fformat (stdout, "giant vector test...");
+      size = 5ULL * one_gig;
+
+      vec_validate (bigboy, size);
+
+      for (index = size; index >= 0; index--)
+	bigboy[index] = index & 0xff;
+      return 0;
+    }
+
+
+  if (help)
+    goto usage;
+
+  prob_init ();
+  run_validator (iter);
+  run_validator_wh (iter);
+  if (verbose)
+    dump_call_stats (g_call_stats);
+  prob_free ();
+
+  if (verbose)
+    {
+      memory_snap ();
+    }
+  return 0;
+
+usage:
+  fformat (stdout, "Usage: test_vec iter <N> seed <N> verbose <N> "
+	   "set <N> dump <N>\n");
+  if (help)
+    return 0;
+
+  return -1;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int ret;
+
+  mheap_alloc (0, (uword) 10ULL << 30);
+
+  verbose = (argc > 1);
+  unformat_init_command_line (&i, argv);
+  ret = test_vec_main (&i);
+  unformat_free (&i);
+
+  return ret;
+}
+#endif /* CLIB_UNIX */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_vec.h b/src/vppinfra/test_vec.h
new file mode 100644
index 00000000..28e8e2a0
--- /dev/null
+++ b/src/vppinfra/test_vec.h
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_test_vec_h
+#define included_test_vec_h
+
+
+#include <vppinfra/clib.h>
+#include <vppinfra/mem.h>
+#include <vppinfra/format.h>
+#include <vppinfra/error.h>
+
+
+extern uword g_verbose;
+extern u32 g_seed;
+
+always_inline u8 *
+format_u32_binary (u8 * s, va_list * va)
+{
+  u32 val = va_arg (*va, u32);
+  word i = 0;
+
+  for (i = BITS (val) - 1; i >= 0; i--)
+    {
+      if (val & (1 << i))
+	s = format (s, "1");
+      else
+	s = format (s, "0");
+    }
+
+  return s;
+}
+
+#define VERBOSE1(fmt, args...)			\
+do {						\
+  if (g_verbose >= 1)				\
+    fformat (stdout, fmt, ## args);		\
+} while (0)
+
+#define VERBOSE2(fmt, args...)			\
+do {						\
+  if (g_verbose >= 2)				\
+    fformat (stdout, fmt, ## args);		\
+} while (0)
+
+#define VERBOSE3(fmt, args...)			\
+do {						\
+  if (g_verbose >= 3)				\
+    fformat (stdout, fmt, ## args);		\
+} while (0)
+
+#define clib_mem_free_safe(p)			\
+do {						\
+  if (p)					\
+    {						\
+      clib_mem_free (p);			\
+      (p) = NULL;				\
+    }						\
+} while (0)
+
+/* XXX - I get undefined symbol trying to call random_u32() <vppinfra/random.h> */
+/* Simple random number generator with period 2^31 - 1. */
+static u32
+my_random_u32 (u32 * seed_return)
+{
+  /* Unlikely mask value to XOR into seed.
+     Otherwise small seed values would give
+     non-random seeming smallish numbers. */
+  const u32 mask = 0x12345678;
+  u32 seed, a, b, result;
+
+  seed = *seed_return;
+  seed ^= mask;
+
+  a = seed / 127773;
+  b = seed % 127773;
+  seed = 16807 * b - 2836 * a;
+
+  if ((i32) seed < 0)
+    seed += ((u32) 1 << 31) - 1;
+
+  result = seed;
+
+  *seed_return = seed ^ mask;
+
+  return result;
+}
+
+static u32
+bounded_random_u32 (u32 * seed, uword lo, uword hi)
+{
+  if (lo == hi)
+    return lo;
+
+  ASSERT (lo < hi);
+
+  return ((my_random_u32 (seed) % (hi - lo + ((hi != ~0) ? (1) : (0)))) + lo);
+}
+
+#define fill_with_random_data(ptr, bytes, seed)			\
+do {								\
+  u8 * _v(p) = (u8 *) (ptr);					\
+  uword _v(b) = (bytes);					\
+  uword _v(i);							\
+								\
+  for (_v(i) = 0; _v(i) < _v(b); _v(i)++)			\
+    _v(p)[_v(i)] = (u8) bounded_random_u32 (&(seed), 0, 255);	\
+								\
+} while (0)
+
+#define compute_mem_hash(hash, ptr, bytes)	\
+({						\
+  u8 * _v(p) = (u8 *) (ptr);			\
+  uword _v(b) = (uword) (bytes);		\
+  uword _v(i);					\
+  uword _v(h) = (u8) (hash);			\
+						\
+  if (_v(p) && _v(b) > 0)			\
+    {						\
+      for (_v(i) = 0; _v(i) < _v(b); _v(i)++)	\
+	_v(h) ^= _v(p)[_v(i)];			\
+    }						\
+						\
+  _v(h);					\
+})
+
+#define log2_align_down(value, align)		\
+({						\
+  uword _v = (uword) (value);			\
+  uword _a = (uword) (align);			\
+  uword _m = (1 << _a) - 1;			\
+						\
+  _v = _v & ~_m;				\
+})
+
+#define log2_align_up(value, align)		\
+({						\
+  uword _v = (uword) (value);			\
+  uword _a = (uword) (align);			\
+  uword _m = (1 << _a) - 1;			\
+						\
+  _v = (_v + _m) & ~_m;				\
+})
+
+#define log2_align_ptr_down(ptr, align) \
+uword_to_pointer (log2_align_down (pointer_to_uword (ptr), align), void *)
+
+#define log2_align_ptr_up(ptr, align) \
+uword_to_pointer (log2_align_up (pointer_to_uword (ptr), align), void *)
+
+#define MAX_LOG2_ALIGN		6
+#define MAX_UNALIGN_OFFSET	((1 << MAX_LOG2_ALIGN) - 1)
+
+/* Allocates pointer to memory whose address is:
+   addr = <log2_align>-aligned address */
+always_inline void *
+alloc_aligned (uword size, uword log2_align, void **ptr_to_free)
+{
+  void *p;
+
+  if (size <= 0)
+    return NULL;
+
+  p = (void *) clib_mem_alloc (size + (1 << log2_align) - 1);
+
+  if (ptr_to_free)
+    *ptr_to_free = p;
+
+  return (p) ? log2_align_ptr_up (p, log2_align) : (NULL);
+}
+
+/* Allocates pointer to memory whose address is:
+   addr = MAX_LOG2_ALIGN-aligned address + <offset> */
+always_inline void *
+alloc_unaligned (uword size, uword offset, void **ptr_to_free)
+{
+  void *p;
+
+  if (size <= 0)
+    return NULL;
+
+  ASSERT (offset <= MAX_UNALIGN_OFFSET);
+
+  p =
+    alloc_aligned (size + (1 << MAX_LOG2_ALIGN), MAX_LOG2_ALIGN, ptr_to_free);
+
+  if (!p)
+    return NULL;
+
+  return (void *) ((u8 *) p + (offset % MAX_UNALIGN_OFFSET));
+}
+
+#define memory_snap()						\
+do {								\
+  clib_mem_usage_t _usage = { 0 };				\
+  clib_mem_usage (&_usage);					\
+  fformat (stdout, "%U\n", format_clib_mem_usage, _usage, 0);	\
+} while (0)
+
+
+#endif /* included_test_vec_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_vhash.c b/src/vppinfra/test_vhash.c
new file mode 100644
index 00000000..7293fdde
--- /dev/null
+++ b/src/vppinfra/test_vhash.c
@@ -0,0 +1,757 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2010 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#if 0
+#ifdef __OPTIMIZE__
+#undef CLIB_DEBUG
+#endif
+#endif
+
+#include <vppinfra/bitmap.h>
+#include <vppinfra/error.h>
+#include <vppinfra/os.h>
+#include <vppinfra/random.h>
+#include <vppinfra/time.h>
+#include <vppinfra/vhash.h>
+
+#ifdef CLIB_HAVE_VEC128
+
+typedef struct
+{
+  u32 n_iter;
+  u32 seed;
+  u32 verbose;
+  u32 n_keys;
+  u32 log2_size;
+  u32 n_key_u32;
+
+  u32 n_vectors_div_4;
+  u32 n_vectors_mod_4;
+
+  u32 *keys;
+  u32 *results;
+
+  u32 *vhash_get_key_indices;
+  u32 *vhash_get_results;
+
+  u32 *vhash_key_indices;
+  u32 *vhash_results;
+
+  vhash_t vhash;
+
+  uword **key_hash;
+
+  struct
+  {
+    u64 n_clocks;
+    u64 n_vectors;
+    u64 n_calls;
+  } get_stats, set_stats, unset_stats;
+} test_vhash_main_t;
+
+always_inline u32
+test_vhash_key_gather (void *_tm, u32 vi, u32 wi, u32 n_key_u32s)
+{
+  test_vhash_main_t *tm = _tm;
+  ASSERT (n_key_u32s == tm->n_key_u32);
+  ASSERT (wi < n_key_u32s);
+  vi = vec_elt (tm->vhash_key_indices, vi);
+  return vec_elt (tm->keys, vi * n_key_u32s + wi);
+}
+
+always_inline u32x4
+test_vhash_4key_gather (void *_tm, u32 vi, u32 wi, u32 n_key_u32s)
+{
+  test_vhash_main_t *tm = _tm;
+  u32 *p;
+  u32x4_union_t x;
+
+  ASSERT (n_key_u32s == tm->n_key_u32);
+  ASSERT (wi < n_key_u32s);
+
+  p = vec_elt_at_index (tm->vhash_key_indices, vi + 0);
+  x.as_u32[0] = tm->keys[p[0] * n_key_u32s + wi];
+  x.as_u32[1] = tm->keys[p[1] * n_key_u32s + wi];
+  x.as_u32[2] = tm->keys[p[2] * n_key_u32s + wi];
+  x.as_u32[3] = tm->keys[p[3] * n_key_u32s + wi];
+  return x.as_u32x4;
+}
+
+always_inline u32
+test_vhash_get_result (void *_tm,
+		       u32 vector_index, u32 result_index, u32 n_key_u32s)
+{
+  test_vhash_main_t *tm = _tm;
+  u32 *p = vec_elt_at_index (tm->vhash_results, vector_index);
+  p[0] = result_index;
+  return result_index;
+}
+
+always_inline u32x4
+test_vhash_get_4result (void *_tm,
+			u32 vector_index, u32x4 results, u32 n_key_u32s)
+{
+  test_vhash_main_t *tm = _tm;
+  u32 *p = vec_elt_at_index (tm->vhash_results, vector_index);
+  *(u32x4 *) p = results;
+  return results;
+}
+
+always_inline u32
+test_vhash_set_result (void *_tm,
+		       u32 vector_index, u32 old_result, u32 n_key_u32s)
+{
+  test_vhash_main_t *tm = _tm;
+  u32 *p = vec_elt_at_index (tm->vhash_results, vector_index);
+  u32 new_result = p[0];
+  p[0] = old_result;
+  return new_result;
+}
+
+always_inline u32
+test_vhash_unset_result (void *_tm, u32 i, u32 old_result, u32 n_key_u32s)
+{
+  test_vhash_main_t *tm = _tm;
+  u32 *p = vec_elt_at_index (tm->vhash_results, i);
+  p[0] = old_result;
+  return 0;
+}
+
+#define _(N_KEY_U32)							\
+  always_inline u32							\
+  test_vhash_key_gather_##N_KEY_U32 (void * _tm, u32 vi, u32 i)		\
+  { return test_vhash_key_gather (_tm, vi, i, N_KEY_U32); }		\
+									\
+  always_inline u32x4							\
+  test_vhash_key_gather_4_##N_KEY_U32 (void * _tm, u32 vi, u32 i)	\
+  {  return test_vhash_4key_gather (_tm, vi, i, N_KEY_U32); }		\
+									\
+  clib_pipeline_stage							\
+  (test_vhash_gather_keys_stage_##N_KEY_U32,				\
+   test_vhash_main_t *, tm, i,						\
+   {									\
+     vhash_gather_4key_stage						\
+       (&tm->vhash,							\
+	/* vector_index */ i,						\
+	test_vhash_key_gather_4_##N_KEY_U32,				\
+	tm,								\
+	N_KEY_U32);							\
+   })									\
+									\
+  clib_pipeline_stage_no_inline						\
+  (test_vhash_gather_keys_mod_stage_##N_KEY_U32,			\
+   test_vhash_main_t *, tm, i,						\
+   {									\
+     vhash_gather_key_stage						\
+       (&tm->vhash,							\
+	/* vector_index */ tm->n_vectors_div_4,				\
+	/* n_vectors */ tm->n_vectors_mod_4,				\
+	test_vhash_key_gather_##N_KEY_U32,				\
+	tm,								\
+	N_KEY_U32);							\
+   })									\
+									\
+  clib_pipeline_stage							\
+  (test_vhash_hash_finalize_stage_##N_KEY_U32,				\
+   test_vhash_main_t *, tm, i,						\
+   {									\
+     vhash_finalize_stage (&tm->vhash, i, N_KEY_U32);			\
+   })									\
+									\
+  clib_pipeline_stage_no_inline						\
+  (test_vhash_hash_finalize_mod_stage_##N_KEY_U32,			\
+   test_vhash_main_t *, tm, i,						\
+   {									\
+     vhash_finalize_stage (&tm->vhash, tm->n_vectors_div_4, N_KEY_U32);	\
+   })									\
+									\
+  clib_pipeline_stage							\
+  (test_vhash_get_stage_##N_KEY_U32,					\
+   test_vhash_main_t *, tm, i,						\
+   {									\
+     vhash_get_4_stage (&tm->vhash,					\
+			/* vector_index */ i,				\
+			test_vhash_get_4result,				\
+			tm, N_KEY_U32);					\
+   })									\
+									\
+  clib_pipeline_stage_no_inline						\
+  (test_vhash_get_mod_stage_##N_KEY_U32,				\
+   test_vhash_main_t *, tm, i,						\
+   {									\
+     vhash_get_stage (&tm->vhash,					\
+		      /* vector_index */ tm->n_vectors_div_4,		\
+		      /* n_vectors */ tm->n_vectors_mod_4,		\
+		      test_vhash_get_result,				\
+		      tm, N_KEY_U32);					\
+   })									\
+									\
+  clib_pipeline_stage							\
+  (test_vhash_set_stage_##N_KEY_U32,					\
+   test_vhash_main_t *, tm, i,						\
+   {									\
+     vhash_set_stage (&tm->vhash,					\
+		      /* vector_index */ i,				\
+		      /* n_vectors */ VECTOR_WORD_TYPE_LEN (u32),	\
+		      test_vhash_set_result,				\
+		      tm, N_KEY_U32);					\
+   })									\
+									\
+  clib_pipeline_stage_no_inline						\
+  (test_vhash_set_mod_stage_##N_KEY_U32,				\
+   test_vhash_main_t *, tm, i,						\
+   {									\
+     vhash_set_stage (&tm->vhash,					\
+		      /* vector_index */ tm->n_vectors_div_4,		\
+		      /* n_vectors */ tm->n_vectors_mod_4,		\
+		      test_vhash_set_result,				\
+		      tm, N_KEY_U32);					\
+   })									\
+									\
+  clib_pipeline_stage							\
+  (test_vhash_unset_stage_##N_KEY_U32,					\
+   test_vhash_main_t *, tm, i,						\
+   {									\
+     vhash_unset_stage (&tm->vhash,					\
+			/* vector_index */ i,				\
+			/* n_vectors */ VECTOR_WORD_TYPE_LEN (u32),	\
+			test_vhash_unset_result,			\
+			tm, N_KEY_U32);					\
+   })									\
+									\
+  clib_pipeline_stage_no_inline						\
+  (test_vhash_unset_mod_stage_##N_KEY_U32,				\
+   test_vhash_main_t *, tm, i,						\
+   {									\
+     vhash_unset_stage (&tm->vhash,					\
+			/* vector_index */ tm->n_vectors_div_4,		\
+			/* n_vectors */ tm->n_vectors_mod_4,		\
+			test_vhash_unset_result,			\
+			tm, N_KEY_U32);					\
+   })
+
+_(1);
+_(2);
+_(3);
+_(4);
+_(5);
+_(6);
+
+#undef _
+
+#define _(N_KEY_U32)							\
+  clib_pipeline_stage							\
+  (test_vhash_hash_mix_stage_##N_KEY_U32,				\
+   test_vhash_main_t *, tm, i,						\
+   {									\
+     vhash_mix_stage (&tm->vhash, i, N_KEY_U32);			\
+   })									\
+									\
+  clib_pipeline_stage_no_inline						\
+  (test_vhash_hash_mix_mod_stage_##N_KEY_U32,				\
+   test_vhash_main_t *, tm, i,						\
+   {									\
+     vhash_mix_stage (&tm->vhash, tm->n_vectors_div_4, N_KEY_U32);	\
+   })
+
+_(4);
+_(5);
+_(6);
+
+#undef _
+
+typedef enum
+{
+  GET, SET, UNSET,
+} test_vhash_op_t;
+
+static void
+test_vhash_op (test_vhash_main_t * tm,
+	       u32 * key_indices,
+	       u32 * results, uword n_keys, test_vhash_op_t op)
+{
+  vhash_validate_sizes (&tm->vhash, tm->n_key_u32, n_keys);
+
+  tm->vhash_results = results;
+  tm->vhash_key_indices = key_indices;
+  tm->n_vectors_div_4 = n_keys / 4;
+  tm->n_vectors_mod_4 = n_keys % 4;
+
+  if (tm->n_vectors_div_4 > 0)
+    {
+      switch (tm->n_key_u32)
+	{
+	default:
+	  ASSERT (0);
+	  break;
+
+#define _(N_KEY_U32)						\
+	case N_KEY_U32:						\
+	  if (op == GET)					\
+	    clib_pipeline_run_3_stage				\
+	      (tm->n_vectors_div_4,				\
+	       tm,						\
+	       test_vhash_gather_keys_stage_##N_KEY_U32,	\
+	       test_vhash_hash_finalize_stage_##N_KEY_U32,	\
+	       test_vhash_get_stage_##N_KEY_U32);		\
+	  else if (op == SET)					\
+	    clib_pipeline_run_3_stage				\
+	      (tm->n_vectors_div_4,				\
+	       tm,						\
+	       test_vhash_gather_keys_stage_##N_KEY_U32,	\
+	       test_vhash_hash_finalize_stage_##N_KEY_U32,	\
+	       test_vhash_set_stage_##N_KEY_U32);		\
+	  else							\
+	    clib_pipeline_run_3_stage				\
+	      (tm->n_vectors_div_4,				\
+	       tm,						\
+	       test_vhash_gather_keys_stage_##N_KEY_U32,	\
+	       test_vhash_hash_finalize_stage_##N_KEY_U32,	\
+	       test_vhash_unset_stage_##N_KEY_U32);		\
+	  break;
+
+	  _(1);
+	  _(2);
+	  _(3);
+
+#undef _
+
+#define _(N_KEY_U32)						\
+	case N_KEY_U32:						\
+	  if (op == GET)					\
+	    clib_pipeline_run_4_stage				\
+	      (tm->n_vectors_div_4,				\
+	       tm,						\
+	       test_vhash_gather_keys_stage_##N_KEY_U32,	\
+	       test_vhash_hash_mix_stage_##N_KEY_U32,		\
+	       test_vhash_hash_finalize_stage_##N_KEY_U32,	\
+	       test_vhash_get_stage_##N_KEY_U32);		\
+	  else if (op == SET)					\
+	    clib_pipeline_run_4_stage				\
+	      (tm->n_vectors_div_4,				\
+	       tm,						\
+	       test_vhash_gather_keys_stage_##N_KEY_U32,	\
+	       test_vhash_hash_mix_stage_##N_KEY_U32,		\
+	       test_vhash_hash_finalize_stage_##N_KEY_U32,	\
+	       test_vhash_set_stage_##N_KEY_U32);		\
+	  else							\
+	    clib_pipeline_run_4_stage				\
+	      (tm->n_vectors_div_4,				\
+	       tm,						\
+	       test_vhash_gather_keys_stage_##N_KEY_U32,	\
+	       test_vhash_hash_mix_stage_##N_KEY_U32,		\
+	       test_vhash_hash_finalize_stage_##N_KEY_U32,	\
+	       test_vhash_unset_stage_##N_KEY_U32);		\
+	  break;
+
+	  _(4);
+	  _(5);
+	  _(6);
+
+#undef _
+	}
+    }
+
+
+  if (tm->n_vectors_mod_4 > 0)
+    {
+      switch (tm->n_key_u32)
+	{
+	default:
+	  ASSERT (0);
+	  break;
+
+#define _(N_KEY_U32)						\
+	case N_KEY_U32:						\
+	  if (op == GET)					\
+	    clib_pipeline_run_3_stage				\
+	      (1,						\
+	       tm,						\
+	       test_vhash_gather_keys_mod_stage_##N_KEY_U32,	\
+	       test_vhash_hash_finalize_mod_stage_##N_KEY_U32,	\
+	       test_vhash_get_mod_stage_##N_KEY_U32);		\
+	  else if (op == SET)					\
+	    clib_pipeline_run_3_stage				\
+	      (1,						\
+	       tm,						\
+	       test_vhash_gather_keys_mod_stage_##N_KEY_U32,	\
+	       test_vhash_hash_finalize_mod_stage_##N_KEY_U32,	\
+	       test_vhash_set_mod_stage_##N_KEY_U32);		\
+	  else							\
+	    clib_pipeline_run_3_stage				\
+	      (1,						\
+	       tm,						\
+	       test_vhash_gather_keys_mod_stage_##N_KEY_U32,	\
+	       test_vhash_hash_finalize_mod_stage_##N_KEY_U32,	\
+	       test_vhash_unset_mod_stage_##N_KEY_U32);		\
+	break;
+
+	  _(1);
+	  _(2);
+	  _(3);
+
+#undef _
+
+#define _(N_KEY_U32)						\
+	case N_KEY_U32:						\
+	  if (op == GET)					\
+	    clib_pipeline_run_4_stage				\
+	      (1,						\
+	       tm,						\
+	       test_vhash_gather_keys_mod_stage_##N_KEY_U32,	\
+	       test_vhash_hash_mix_mod_stage_##N_KEY_U32,	\
+	       test_vhash_hash_finalize_mod_stage_##N_KEY_U32,	\
+	       test_vhash_get_mod_stage_##N_KEY_U32);		\
+	  else if (op == SET)					\
+	    clib_pipeline_run_4_stage				\
+	      (1,						\
+	       tm,						\
+	       test_vhash_gather_keys_mod_stage_##N_KEY_U32,	\
+	       test_vhash_hash_mix_mod_stage_##N_KEY_U32,	\
+	       test_vhash_hash_finalize_mod_stage_##N_KEY_U32,	\
+	       test_vhash_set_mod_stage_##N_KEY_U32);		\
+	  else							\
+	    clib_pipeline_run_4_stage				\
+	      (1,						\
+	       tm,						\
+	       test_vhash_gather_keys_mod_stage_##N_KEY_U32,	\
+	       test_vhash_hash_mix_mod_stage_##N_KEY_U32,	\
+	       test_vhash_hash_finalize_mod_stage_##N_KEY_U32,	\
+	       test_vhash_unset_mod_stage_##N_KEY_U32);		\
+	  break;
+
+	  _(4);
+	  _(5);
+	  _(6);
+
+#undef _
+	}
+    }
+}
+
+int
+test_vhash_main (unformat_input_t * input)
+{
+  clib_error_t *error = 0;
+  test_vhash_main_t _tm, *tm = &_tm;
+  vhash_t *vh = &tm->vhash;
+  uword i, j;
+
+  memset (tm, 0, sizeof (tm[0]));
+  tm->n_iter = 100;
+  tm->seed = 1;
+  tm->n_keys = 1;
+  tm->n_key_u32 = 1;
+  tm->log2_size = 8;
+  tm->verbose = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "iter %d", &tm->n_iter))
+	;
+      else if (unformat (input, "seed %d", &tm->seed))
+	;
+      else if (unformat (input, "n-keys %d", &tm->n_keys))
+	;
+      else if (unformat (input, "log2-size %d", &tm->log2_size))
+	;
+      else if (unformat (input, "key-words %d", &tm->n_key_u32))
+	;
+      else if (unformat (input, "verbose %=", &tm->verbose, 1))
+	;
+      else
+	{
+	  error = clib_error_create ("unknown input `%U'\n",
+				     format_unformat_error, input);
+	  goto done;
+	}
+    }
+
+  if (tm->seed == 0)
+    tm->seed = random_default_seed ();
+
+  clib_warning ("iter %d seed %d n-keys %d log2-size %d key-words %d",
+		tm->n_iter, tm->seed, tm->n_keys, tm->log2_size,
+		tm->n_key_u32);
+
+  {
+    u32 seeds[3];
+    seeds[0] = seeds[1] = seeds[2] = 0xdeadbeef;
+    vhash_init (vh, tm->log2_size, tm->n_key_u32, seeds);
+  }
+
+  /* Choose unique keys. */
+  vec_resize (tm->keys, tm->n_keys * tm->n_key_u32);
+  vec_resize (tm->key_hash, tm->n_key_u32);
+  for (i = j = 0; i < vec_len (tm->keys); i++, j++)
+    {
+      j = j == tm->n_key_u32 ? 0 : j;
+      do
+	{
+	  tm->keys[i] = random_u32 (&tm->seed);
+	}
+      while (hash_get (tm->key_hash[j], tm->keys[i]));
+      hash_set (tm->key_hash[j], tm->keys[i], 0);
+    }
+
+  vec_resize (tm->results, tm->n_keys);
+  for (i = 0; i < vec_len (tm->results); i++)
+    {
+      do
+	{
+	  tm->results[i] = random_u32 (&tm->seed);
+	}
+      while (tm->results[i] == ~0);
+    }
+
+  vec_resize_aligned (tm->vhash_get_results, tm->n_keys,
+		      CLIB_CACHE_LINE_BYTES);
+  vec_clone (tm->vhash_get_key_indices, tm->results);
+  for (i = 0; i < vec_len (tm->vhash_get_key_indices); i++)
+    tm->vhash_get_key_indices[i] = i;
+
+  {
+    uword *is_set_bitmap = 0;
+    uword *to_set_bitmap = 0;
+    uword *to_unset_bitmap = 0;
+    u32 *to_set = 0, *to_unset = 0;
+    u32 *to_set_results = 0, *to_unset_results = 0;
+    u64 t[2];
+
+    for (i = 0; i < tm->n_iter; i++)
+      {
+	vec_reset_length (to_set);
+	vec_reset_length (to_unset);
+	vec_reset_length (to_set_results);
+	vec_reset_length (to_unset_results);
+
+	do
+	  {
+	    to_set_bitmap = clib_bitmap_random (to_set_bitmap,
+						tm->n_keys, &tm->seed);
+	  }
+	while (clib_bitmap_is_zero (to_set_bitmap));
+	to_unset_bitmap = clib_bitmap_dup_and (to_set_bitmap, is_set_bitmap);
+	to_set_bitmap = clib_bitmap_andnot (to_set_bitmap, to_unset_bitmap);
+
+	/* *INDENT-OFF* */
+	clib_bitmap_foreach (j, to_set_bitmap, ({
+	      vec_add1 (to_set, j);
+	      vec_add1 (to_set_results, tm->results[j]);
+	}));
+	/* *INDENT-ON* */
+	/* *INDENT-OFF* */
+	clib_bitmap_foreach (j, to_unset_bitmap, ({
+	      vec_add1 (to_unset, j);
+	      vec_add1 (to_unset_results, 0xdeadbeef);
+	}));
+	/* *INDENT-ON* */
+
+	if (vec_len (to_set) > 0)
+	  {
+	    t[0] = clib_cpu_time_now ();
+	    test_vhash_op (tm, to_set, to_set_results, vec_len (to_set), SET);
+	    t[1] = clib_cpu_time_now ();
+	    tm->set_stats.n_clocks += t[1] - t[0];
+	    tm->set_stats.n_vectors += vec_len (to_set);
+	    tm->set_stats.n_calls += 1;
+	    is_set_bitmap = clib_bitmap_or (is_set_bitmap, to_set_bitmap);
+	  }
+
+	t[0] = clib_cpu_time_now ();
+	test_vhash_op (tm, tm->vhash_get_key_indices,
+		       tm->vhash_get_results,
+		       vec_len (tm->vhash_get_key_indices), GET);
+	t[1] = clib_cpu_time_now ();
+	tm->get_stats.n_clocks += t[1] - t[0];
+	tm->get_stats.n_vectors += vec_len (tm->vhash_get_key_indices);
+	tm->get_stats.n_calls += 1;
+
+	for (j = 0; j < vec_len (tm->vhash_get_results); j++)
+	  {
+	    u32 r0 = tm->vhash_get_results[j];
+	    u32 r1 = tm->results[j];
+	    if (clib_bitmap_get (is_set_bitmap, j))
+	      {
+		if (r0 != r1)
+		  os_panic ();
+	      }
+	    else
+	      {
+		if (r0 != ~0)
+		  os_panic ();
+	      }
+	  }
+
+	if (vh->n_elts != clib_bitmap_count_set_bits (is_set_bitmap))
+	  os_panic ();
+
+	if (vec_len (to_unset) > 0)
+	  {
+	    t[0] = clib_cpu_time_now ();
+	    test_vhash_op (tm, to_unset, to_unset_results,
+			   vec_len (to_unset), UNSET);
+	    t[1] = clib_cpu_time_now ();
+	    tm->unset_stats.n_clocks += t[1] - t[0];
+	    tm->unset_stats.n_vectors += vec_len (to_unset);
+	    tm->unset_stats.n_calls += 1;
+	    is_set_bitmap =
+	      clib_bitmap_andnot (is_set_bitmap, to_unset_bitmap);
+	  }
+
+	t[0] = clib_cpu_time_now ();
+	test_vhash_op (tm, tm->vhash_get_key_indices,
+		       tm->vhash_get_results,
+		       vec_len (tm->vhash_get_key_indices), GET);
+	t[1] = clib_cpu_time_now ();
+	tm->get_stats.n_clocks += t[1] - t[0];
+	tm->get_stats.n_vectors += vec_len (tm->vhash_get_key_indices);
+	tm->get_stats.n_calls += 1;
+
+	for (j = 0; j < vec_len (tm->vhash_get_results); j++)
+	  {
+	    u32 r0 = tm->vhash_get_results[j];
+	    u32 r1 = tm->results[j];
+	    if (clib_bitmap_get (is_set_bitmap, j))
+	      {
+		if (r0 != r1)
+		  os_panic ();
+	      }
+	    else
+	      {
+		if (r0 != ~0)
+		  os_panic ();
+	      }
+	  }
+
+	if (vh->n_elts != clib_bitmap_count_set_bits (is_set_bitmap))
+	  os_panic ();
+      }
+
+    vhash_resize (vh, tm->log2_size + 1);
+
+    test_vhash_op (tm, tm->vhash_get_key_indices,
+		   tm->vhash_get_results,
+		   vec_len (tm->vhash_get_key_indices), GET);
+
+    for (j = 0; j < vec_len (tm->vhash_get_results); j++)
+      {
+	u32 r0 = tm->vhash_get_results[j];
+	u32 r1 = tm->results[j];
+	if (clib_bitmap_get (is_set_bitmap, j))
+	  {
+	    if (r0 != r1)
+	      os_panic ();
+	  }
+	else
+	  {
+	    if (r0 != ~0)
+	      os_panic ();
+	  }
+      }
+
+    if (vh->n_elts != clib_bitmap_count_set_bits (is_set_bitmap))
+      os_panic ();
+  }
+
+  {
+    clib_time_t ct;
+
+    clib_time_init (&ct);
+
+    clib_warning ("%.4e clocks/get %.4e gets/call %.4e gets/sec",
+		  (f64) tm->get_stats.n_clocks /
+		  (f64) tm->get_stats.n_vectors,
+		  (f64) tm->get_stats.n_vectors / (f64) tm->get_stats.n_calls,
+		  (f64) tm->get_stats.n_vectors /
+		  (f64) (tm->get_stats.n_clocks * ct.seconds_per_clock));
+    if (tm->set_stats.n_calls > 0)
+      clib_warning ("%.4e clocks/set %.4e sets/call %.4e sets/sec",
+		    (f64) tm->set_stats.n_clocks /
+		    (f64) tm->set_stats.n_vectors,
+		    (f64) tm->set_stats.n_vectors /
+		    (f64) tm->set_stats.n_calls,
+		    (f64) tm->set_stats.n_vectors /
+		    (f64) (tm->set_stats.n_clocks * ct.seconds_per_clock));
+    if (tm->unset_stats.n_calls > 0)
+      clib_warning ("%.4e clocks/unset %.4e unsets/call %.4e unsets/sec",
+		    (f64) tm->unset_stats.n_clocks /
+		    (f64) tm->unset_stats.n_vectors,
+		    (f64) tm->unset_stats.n_vectors /
+		    (f64) tm->unset_stats.n_calls,
+		    (f64) tm->unset_stats.n_vectors /
+		    (f64) (tm->unset_stats.n_clocks * ct.seconds_per_clock));
+  }
+
+done:
+  if (error)
+    clib_error_report (error);
+  return 0;
+}
+
+#endif /* CLIB_HAVE_VEC128 */
+
+#ifndef CLIB_HAVE_VEC128
+int
+test_vhash_main (unformat_input_t * input)
+{
+  clib_error ("compiled without vector support");
+  return 0;
+}
+#endif
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int r;
+
+  unformat_init_command_line (&i, argv);
+  r = test_vhash_main (&i);
+  unformat_free (&i);
+  return r;
+}
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/test_zvec.c b/src/vppinfra/test_zvec.c
new file mode 100644
index 00000000..874fdefa
--- /dev/null
+++ b/src/vppinfra/test_zvec.c
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/zvec.h>
+#include <vppinfra/format.h>
+#include <vppinfra/random.h>
+
+static int verbose;
+#define if_verbose(format,args...) \
+  if (verbose) { clib_warning(format, ## args); }
+
+int
+test_zvec_main (unformat_input_t * input)
+{
+  uword n_iterations;
+  uword i;
+  u32 seed;
+
+  n_iterations = 1024;
+  seed = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (0 == unformat (input, "iter %d", &n_iterations)
+	  && 0 == unformat (input, "seed %d", &seed))
+	clib_error ("unknown input `%U'", format_unformat_error, input);
+    }
+
+  if_verbose ("%d iterations, seed %d\n", n_iterations, seed);
+
+  for (i = 0; i < n_iterations; i++)
+    {
+      uword coding, data, d[2], limit, n_zdata_bits[2];
+
+      if (seed)
+	coding = random_u32 (&seed);
+      else
+	coding = i;
+
+      limit = coding - 1;
+      if (limit > (1 << 16))
+	limit = 1 << 16;
+      for (data = 0; data <= limit; data++)
+	{
+	  d[0] = zvec_encode (coding, data, &n_zdata_bits[0]);
+
+	  if (coding != 0)
+	    ASSERT ((d[0] >> n_zdata_bits[0]) == 0);
+
+	  d[1] = zvec_decode (coding, d[0], &n_zdata_bits[1]);
+	  ASSERT (data == d[1]);
+
+	  ASSERT (n_zdata_bits[0] == n_zdata_bits[1]);
+	}
+    }
+
+  return 0;
+}
+
+#ifdef CLIB_UNIX
+int
+main (int argc, char *argv[])
+{
+  unformat_input_t i;
+  int ret;
+
+  verbose = (argc > 1);
+  unformat_init_command_line (&i, argv);
+  ret = test_zvec_main (&i);
+  unformat_free (&i);
+
+  return ret;
+}
+#endif /* CLIB_UNIX */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/time.c b/src/vppinfra/time.c
new file mode 100644
index 00000000..2bdb9da4
--- /dev/null
+++ b/src/vppinfra/time.c
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/os.h>
+#include <vppinfra/time.h>
+#include <vppinfra/format.h>
+#include <vppinfra/cpu.h>
+
+#ifdef CLIB_UNIX
+
+#include <math.h>
+#include <sys/time.h>
+#include <fcntl.h>
+
+/* Not very accurate way of determining cpu clock frequency
+   for unix.  Better to use /proc/cpuinfo on linux. */
+static f64
+estimate_clock_frequency (f64 sample_time)
+{
+  /* Round to nearest 100KHz. */
+  const f64 round_to_units = 100e5;
+
+  f64 time_now, time_start, time_limit, freq;
+  u64 ifreq, t[2];
+
+  time_start = time_now = unix_time_now ();
+  time_limit = time_now + sample_time;
+  t[0] = clib_cpu_time_now ();
+  while (time_now < time_limit)
+    time_now = unix_time_now ();
+  t[1] = clib_cpu_time_now ();
+
+  freq = (t[1] - t[0]) / (time_now - time_start);
+  ifreq = flt_round_nearest (freq / round_to_units);
+  freq = ifreq * round_to_units;
+
+  return freq;
+}
+
+/* Fetch cpu frequency via parseing /proc/cpuinfo.
+   Only works for Linux. */
+static f64
+clock_frequency_from_proc_filesystem (void)
+{
+  f64 cpu_freq = 1e9;		/* better than 40... */
+  f64 ppc_timebase = 0;		/* warnings be gone */
+  int fd;
+  unformat_input_t input;
+
+/* $$$$ aarch64 kernel doesn't report "cpu MHz" */
+#if defined(__aarch64__)
+  return 0.0;
+#endif
+
+  cpu_freq = 0;
+  fd = open ("/proc/cpuinfo", 0);
+  if (fd < 0)
+    return cpu_freq;
+
+  unformat_init_unix_file (&input, fd);
+
+  ppc_timebase = 0;
+  while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (&input, "cpu MHz : %f", &cpu_freq))
+	cpu_freq *= 1e6;
+      else if (unformat (&input, "timebase : %f", &ppc_timebase))
+	;
+      else
+	unformat_skip_line (&input);
+    }
+
+  unformat_free (&input);
+
+  close (fd);
+
+  /* Override CPU frequency with time base for PPC. */
+  if (ppc_timebase != 0)
+    cpu_freq = ppc_timebase;
+
+  return cpu_freq;
+}
+
+/* Fetch cpu frequency via reading /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq
+   Only works for Linux. */
+static f64
+clock_frequency_from_sys_filesystem (void)
+{
+  f64 cpu_freq;
+  int fd;
+  unformat_input_t input;
+
+  /* Time stamp always runs at max frequency. */
+  cpu_freq = 0;
+  fd = open ("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq", 0);
+  if (fd < 0)
+    goto done;
+
+  unformat_init_unix_file (&input, fd);
+  unformat (&input, "%f", &cpu_freq);
+  cpu_freq *= 1e3;		/* measured in kHz */
+  unformat_free (&input);
+  close (fd);
+done:
+  return cpu_freq;
+}
+
+f64
+os_cpu_clock_frequency (void)
+{
+  f64 cpu_freq;
+
+  if (clib_cpu_supports_invariant_tsc ())
+    return estimate_clock_frequency (1e-3);
+
+  /* First try /sys version. */
+  cpu_freq = clock_frequency_from_sys_filesystem ();
+  if (cpu_freq != 0)
+    return cpu_freq;
+
+  /* Next try /proc version. */
+  cpu_freq = clock_frequency_from_proc_filesystem ();
+  if (cpu_freq != 0)
+    return cpu_freq;
+
+  /* If /proc/cpuinfo fails (e.g. not running on Linux) fall back to
+     gettimeofday based estimated clock frequency. */
+  return estimate_clock_frequency (1e-3);
+}
+
+#endif /* CLIB_UNIX */
+
+/* Initialize time. */
+void
+clib_time_init (clib_time_t * c)
+{
+  memset (c, 0, sizeof (c[0]));
+  c->clocks_per_second = os_cpu_clock_frequency ();
+  c->seconds_per_clock = 1 / c->clocks_per_second;
+  c->log2_clocks_per_second = min_log2_u64 ((u64) c->clocks_per_second);
+
+  /* Initially verify frequency every sec */
+  c->log2_clocks_per_frequency_verify = c->log2_clocks_per_second;
+
+  c->last_verify_reference_time = unix_time_now ();
+  c->last_cpu_time = clib_cpu_time_now ();
+  c->init_cpu_time = c->last_verify_cpu_time = c->last_cpu_time;
+}
+
+void
+clib_time_verify_frequency (clib_time_t * c)
+{
+  f64 now_reference = unix_time_now ();
+  f64 dtr = now_reference - c->last_verify_reference_time;
+  f64 dtr_max;
+  u64 dtc = c->last_cpu_time - c->last_verify_cpu_time;
+  f64 round_units = 100e5;
+
+  c->last_verify_cpu_time = c->last_cpu_time;
+  c->last_verify_reference_time = now_reference;
+
+  /*
+   * Is the reported reference interval non-positive,
+   * or off by a factor of two - or 8 seconds - whichever is larger?
+   * Someone reset the clock behind our back.
+   */
+  dtr_max = (f64) (2ULL << c->log2_clocks_per_frequency_verify) /
+    (f64) (1ULL << c->log2_clocks_per_second);
+  dtr_max = dtr_max > 8.0 ? dtr_max : 8.0;
+
+  if (dtr <= 0.0 || dtr > dtr_max)
+    {
+      c->log2_clocks_per_frequency_verify = c->log2_clocks_per_second;
+      return;
+    }
+
+  c->clocks_per_second =
+    flt_round_nearest ((f64) dtc / (dtr * round_units)) * round_units;
+  c->seconds_per_clock = 1 / c->clocks_per_second;
+
+  /* Double time between verifies; max at 64 secs ~ 1 minute. */
+  if (c->log2_clocks_per_frequency_verify < c->log2_clocks_per_second + 6)
+    c->log2_clocks_per_frequency_verify += 1;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/time.h b/src/vppinfra/time.h
new file mode 100644
index 00000000..3b89cf78
--- /dev/null
+++ b/src/vppinfra/time.h
@@ -0,0 +1,298 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_time_h
+#define included_time_h
+
+#include <vppinfra/clib.h>
+
+typedef struct
+{
+  /* Total run time in clock cycles
+     since clib_time_init call. */
+  u64 total_cpu_time;
+
+  /* Last recorded time stamp. */
+  u64 last_cpu_time;
+
+  /* CPU clock frequency. */
+  f64 clocks_per_second;
+
+  /* 1 / cpu clock frequency: conversion factor
+     from clock cycles into seconds. */
+  f64 seconds_per_clock;
+
+  /* Time stamp of call to clib_time_init call. */
+  u64 init_cpu_time;
+
+  u64 last_verify_cpu_time;
+
+  /* Same but for reference time (if present). */
+  f64 last_verify_reference_time;
+
+  u32 log2_clocks_per_second, log2_clocks_per_frequency_verify;
+} clib_time_t;
+
+/* Return CPU time stamp as 64bit number. */
+#if defined(__x86_64__) || defined(i386)
+always_inline u64
+clib_cpu_time_now (void)
+{
+  u32 a, d;
+  asm volatile ("rdtsc":"=a" (a), "=d" (d));
+  return (u64) a + ((u64) d << (u64) 32);
+}
+
+#elif defined (__powerpc64__)
+
+always_inline u64
+clib_cpu_time_now (void)
+{
+  u64 t;
+  asm volatile ("mftb %0":"=r" (t));
+  return t;
+}
+
+#elif defined (__SPU__)
+
+always_inline u64
+clib_cpu_time_now (void)
+{
+#ifdef _XLC
+  return spu_rdch (0x8);
+#else
+  return 0 /* __builtin_si_rdch (0x8) FIXME */ ;
+#endif
+}
+
+#elif defined (__powerpc__)
+
+always_inline u64
+clib_cpu_time_now (void)
+{
+  u32 hi1, hi2, lo;
+  asm volatile ("1:\n"
+		"mftbu %[hi1]\n"
+		"mftb  %[lo]\n"
+		"mftbu %[hi2]\n"
+		"cmpw %[hi1],%[hi2]\n"
+		"bne 1b\n":[hi1] "=r" (hi1),[hi2] "=r" (hi2),[lo] "=r" (lo));
+  return (u64) lo + ((u64) hi2 << (u64) 32);
+}
+
+#elif defined (__arm__)
+#if defined(__ARM_ARCH_8A__)
+always_inline u64
+clib_cpu_time_now (void)	/* We may run arm64 in aarch32 mode, to leverage 64bit counter */
+{
+  u64 tsc;
+  asm volatile ("mrrc p15, 0, %Q0, %R0, c9":"=r" (tsc));
+  return tsc;
+}
+#elif defined(__ARM_ARCH_7A__)
+always_inline u64
+clib_cpu_time_now (void)
+{
+  u32 tsc;
+  asm volatile ("mrc p15, 0, %0, c9, c13, 0":"=r" (tsc));
+  return (u64) tsc;
+}
+#else
+always_inline u64
+clib_cpu_time_now (void)
+{
+  u32 lo;
+  asm volatile ("mrc p15, 0, %[lo], c15, c12, 1":[lo] "=r" (lo));
+  return (u64) lo;
+}
+#endif
+
+#elif defined (__xtensa__)
+
+/* Stub for now. */
+always_inline u64
+clib_cpu_time_now (void)
+{
+  return 0;
+}
+
+#elif defined (__TMS320C6X__)
+
+always_inline u64
+clib_cpu_time_now (void)
+{
+  u32 l, h;
+
+  asm volatile (" dint\n"
+		" mvc .s2 TSCL,%0\n"
+		" mvc .s2 TSCH,%1\n" " rint\n":"=b" (l), "=b" (h));
+
+  return ((u64) h << 32) | l;
+}
+
+#elif defined (__aarch64__)
+always_inline u64
+clib_cpu_time_now (void)
+{
+  u64 tsc;
+
+  /* Works on Cavium ThunderX. Other platforms: YMMV */
+  asm volatile ("mrs %0, cntvct_el0":"=r" (tsc));
+
+  return tsc;
+}
+
+#else
+#error "don't know how to read CPU time stamp"
+
+#endif
+
+void clib_time_verify_frequency (clib_time_t * c);
+
+always_inline f64
+clib_time_now_internal (clib_time_t * c, u64 n)
+{
+  u64 l = c->last_cpu_time;
+  u64 t = c->total_cpu_time;
+  t += n - l;
+  c->total_cpu_time = t;
+  c->last_cpu_time = n;
+  if (PREDICT_FALSE
+      ((c->last_cpu_time -
+	c->last_verify_cpu_time) >> c->log2_clocks_per_frequency_verify))
+    clib_time_verify_frequency (c);
+  return t * c->seconds_per_clock;
+}
+
+always_inline f64
+clib_time_now (clib_time_t * c)
+{
+  return clib_time_now_internal (c, clib_cpu_time_now ());
+}
+
+always_inline void
+clib_cpu_time_wait (u64 dt)
+{
+  u64 t_end = clib_cpu_time_now () + dt;
+  while (clib_cpu_time_now () < t_end)
+    ;
+}
+
+void clib_time_init (clib_time_t * c);
+
+#ifdef CLIB_UNIX
+
+#include <time.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+
+/* Use 64bit floating point to represent time offset from epoch. */
+always_inline f64
+unix_time_now (void)
+{
+  /* clock_gettime without indirect syscall uses GLIBC wrappers which
+     we don't want.  Just the bare metal, please. */
+  struct timespec ts;
+  syscall (SYS_clock_gettime, CLOCK_REALTIME, &ts);
+  return ts.tv_sec + 1e-9 * ts.tv_nsec;
+}
+
+/* As above but integer number of nano-seconds. */
+always_inline u64
+unix_time_now_nsec (void)
+{
+  struct timespec ts;
+  syscall (SYS_clock_gettime, CLOCK_REALTIME, &ts);
+  return 1e9 * ts.tv_sec + ts.tv_nsec;
+}
+
+always_inline f64
+unix_usage_now (void)
+{
+  struct rusage u;
+  getrusage (RUSAGE_SELF, &u);
+  return u.ru_utime.tv_sec + 1e-6 * u.ru_utime.tv_usec
+    + u.ru_stime.tv_sec + 1e-6 * u.ru_stime.tv_usec;
+}
+
+always_inline void
+unix_sleep (f64 dt)
+{
+  struct timespec t;
+  t.tv_sec = dt;
+  t.tv_nsec = 1e9 * dt;
+  nanosleep (&t, 0);
+}
+
+#else /* ! CLIB_UNIX */
+
+always_inline f64
+unix_time_now (void)
+{
+  return 0;
+}
+
+always_inline u64
+unix_time_now_nsec (void)
+{
+  return 0;
+}
+
+always_inline f64
+unix_usage_now (void)
+{
+  return 0;
+}
+
+always_inline void
+unix_sleep (f64 dt)
+{
+}
+
+#endif
+
+#endif /* included_time_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/timer.c b/src/vppinfra/timer.c
new file mode 100644
index 00000000..0221cb74
--- /dev/null
+++ b/src/vppinfra/timer.c
@@ -0,0 +1,322 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/param.h>
+
+#include <vppinfra/vec.h>
+#include <vppinfra/time.h>
+#include <vppinfra/timer.h>
+#include <vppinfra/error.h>
+
+typedef struct
+{
+  f64 time;
+  timer_func_t *func;
+  any arg;
+} timer_callback_t;
+
+/* Vector of currently unexpired timers. */
+static timer_callback_t *timers;
+
+/* Convert time from 64bit floating format to struct timeval. */
+always_inline void
+f64_to_tv (f64 t, struct timeval *tv)
+{
+  tv->tv_sec = t;
+  tv->tv_usec = 1e6 * (t - tv->tv_sec);
+  while (tv->tv_usec >= 1000000)
+    {
+      tv->tv_usec -= 1000000;
+      tv->tv_sec += 1;
+    }
+}
+
+/* Sort timers so that timer soonest to expire is at end. */
+static int
+timer_compare (const void *_a, const void *_b)
+{
+  const timer_callback_t *a = _a;
+  const timer_callback_t *b = _b;
+  f64 dt = b->time - a->time;
+  return dt < 0 ? -1 : (dt > 0 ? +1 : 0);
+}
+
+static inline void
+sort_timers (timer_callback_t * timers)
+{
+  qsort (timers, vec_len (timers), sizeof (timers[0]), timer_compare);
+}
+
+#define TIMER_SIGNAL SIGALRM
+
+/* Don't bother set timer if time different is less than this value. */
+/* We would like to initialize this to 0.75 / (f64) HZ,
+ * but HZ may not be a compile-time constant on some systems,
+ * so instead we do the initialization before first use.
+ */
+static f64 time_resolution;
+
+/* Interrupt handler.  Call functions for all expired timers.
+   Set time for next timer interrupt. */
+static void
+timer_interrupt (int signum)
+{
+  f64 now = unix_time_now ();
+  f64 dt;
+  timer_callback_t *t;
+
+  while (1)
+    {
+      if (vec_len (timers) <= 0)
+	return;
+
+      /* Consider last (earliest) timer in reverse sorted
+         vector of pending timers. */
+      t = vec_end (timers) - 1;
+
+      ASSERT (now >= 0 && finite (now));
+
+      /* Time difference between when timer goes off and now. */
+      dt = t->time - now;
+
+      /* If timer is within threshold of going off
+         call user's callback. */
+      if (dt <= time_resolution && finite (dt))
+	{
+	  _vec_len (timers) -= 1;
+	  (*t->func) (t->arg, -dt);
+	}
+      else
+	{
+	  /* Set timer for to go off in future. */
+	  struct itimerval itv;
+	  memset (&itv, 0, sizeof (itv));
+	  f64_to_tv (dt, &itv.it_value);
+	  if (setitimer (ITIMER_REAL, &itv, 0) < 0)
+	    clib_unix_error ("sititmer");
+	  return;
+	}
+    }
+}
+
+void
+timer_block (sigset_t * save)
+{
+  sigset_t block_timer;
+
+  memset (&block_timer, 0, sizeof (block_timer));
+  sigaddset (&block_timer, TIMER_SIGNAL);
+  sigprocmask (SIG_BLOCK, &block_timer, save);
+}
+
+void
+timer_unblock (sigset_t * save)
+{
+  sigprocmask (SIG_SETMASK, save, 0);
+}
+
+/* Arrange for function to be called some time,
+   roughly equal to dt seconds, in the future. */
+void
+timer_call (timer_func_t * func, any arg, f64 dt)
+{
+  timer_callback_t *t;
+  sigset_t save;
+
+  /* Install signal handler on first call. */
+  static word signal_installed = 0;
+
+  if (!signal_installed)
+    {
+      struct sigaction sa;
+
+      /* Initialize time_resolution before first call to timer_interrupt */
+      time_resolution = 0.75 / (f64) HZ;
+
+      memset (&sa, 0, sizeof (sa));
+      sa.sa_handler = timer_interrupt;
+
+      if (sigaction (TIMER_SIGNAL, &sa, 0) < 0)
+	clib_panic ("sigaction");
+
+      signal_installed = 1;
+    }
+
+  timer_block (&save);
+
+  /* Add new timer. */
+  vec_add2 (timers, t, 1);
+
+  t->time = unix_time_now () + dt;
+  t->func = func;
+  t->arg = arg;
+
+  {
+    word reset_timer = vec_len (timers) == 1;
+
+    if (_vec_len (timers) > 1)
+      {
+	reset_timer += t->time < (t - 1)->time;
+	sort_timers (timers);
+      }
+
+    if (reset_timer)
+      timer_interrupt (TIMER_SIGNAL);
+  }
+
+  timer_unblock (&save);
+}
+
+#ifdef TEST
+
+#include <vppinfra/random.h>
+
+/* Compute average delay of function calls to foo.
+   If this is a small number over a lot of iterations we know
+   the code is working. */
+
+static f64 ave_delay = 0;
+static word ave_delay_count = 0;
+
+always_inline
+update (f64 delay)
+{
+  ave_delay += delay;
+  ave_delay_count += 1;
+}
+
+typedef struct
+{
+  f64 time_requested, time_called;
+} foo_t;
+
+static f64 foo_base_time = 0;
+static foo_t *foos = 0;
+
+void
+foo (any arg, f64 delay)
+{
+  foos[arg].time_called = unix_time_now () - foo_base_time;
+  update (delay);
+}
+
+typedef struct
+{
+  word count;
+  word limit;
+} bar_t;
+
+void
+bar (any arg, f64 delay)
+{
+  bar_t *b = (bar_t *) arg;
+
+  fformat (stdout, "bar %d delay %g\n", b->count++, delay);
+
+  update (delay);
+  if (b->count < b->limit)
+    timer_call (bar, arg, random_f64 ());
+}
+
+int
+main (int argc, char *argv[])
+{
+  word i, n = atoi (argv[1]);
+  word run_foo = argc > 2;
+bar_t b = { limit:10 };
+
+  if (run_foo)
+    {
+      f64 time_limit;
+
+      time_limit = atof (argv[2]);
+
+      vec_resize (foos, n);
+      for (i = 0; i < n; i++)
+	{
+	  foos[i].time_requested = time_limit * random_f64 ();
+	  foos[i].time_called = 1e100;
+	}
+
+      foo_base_time = unix_time_now ();
+      for (i = 0; i < n; i++)
+	timer_call (foo, i, foos[i].time_requested);
+    }
+  else
+    timer_call (bar, (any) & b, random_f64 ());
+
+  while (vec_len (timers) > 0)
+    sched_yield ();
+
+  if (vec_len (foos) > 0)
+    {
+      f64 min = 1e100, max = -min;
+      f64 ave = 0, rms = 0;
+
+      for (i = 0; i < n; i++)
+	{
+	  f64 dt = foos[i].time_requested - foos[i].time_called;
+	  if (dt < min)
+	    min = dt;
+	  if (dt > max)
+	    max = dt;
+	  ave += dt;
+	  rms += dt * dt;
+	}
+      ave /= n;
+      rms = sqrt (rms / n - ave * ave);
+      fformat (stdout, "error min %g max %g ave %g +- %g\n", min, max, ave,
+	       rms);
+    }
+
+  fformat (stdout, "%d function calls, ave. timer delay %g secs\n",
+	   ave_delay_count, ave_delay / ave_delay_count);
+
+  return 0;
+}
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/timer.h b/src/vppinfra/timer.h
new file mode 100644
index 00000000..764103f7
--- /dev/null
+++ b/src/vppinfra/timer.h
@@ -0,0 +1,46 @@
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_timer_h
+#define included_timer_h
+
+#include <signal.h>
+
+typedef void (timer_func_t) (any arg, f64 delay);
+
+/* Arrange for function to be called after time interval (in seconds) has elapsed. */
+extern void timer_call (timer_func_t * func, any arg, f64 time_interval);
+
+/* Block/unblock timer interrupts. */
+extern void timer_block (sigset_t * save);
+extern void timer_unblock (sigset_t * save);
+
+#endif /* included_timer_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/timing_wheel.c b/src/vppinfra/timing_wheel.c
new file mode 100644
index 00000000..4c8a2c58
--- /dev/null
+++ b/src/vppinfra/timing_wheel.c
@@ -0,0 +1,750 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/bitmap.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/pool.h>
+#include <vppinfra/timing_wheel.h>
+
+void
+timing_wheel_init (timing_wheel_t * w, u64 current_cpu_time,
+		   f64 cpu_clocks_per_second)
+{
+  if (w->max_sched_time <= w->min_sched_time)
+    {
+      w->min_sched_time = 1e-6;
+      w->max_sched_time = 1e-3;
+    }
+
+  w->cpu_clocks_per_second = cpu_clocks_per_second;
+  w->log2_clocks_per_bin =
+    max_log2 (w->cpu_clocks_per_second * w->min_sched_time);
+  w->log2_bins_per_wheel =
+    max_log2 (w->cpu_clocks_per_second * w->max_sched_time);
+  w->log2_bins_per_wheel -= w->log2_clocks_per_bin;
+  w->log2_clocks_per_wheel = w->log2_bins_per_wheel + w->log2_clocks_per_bin;
+  w->bins_per_wheel = 1 << w->log2_bins_per_wheel;
+  w->bins_per_wheel_mask = w->bins_per_wheel - 1;
+
+  w->current_time_index = current_cpu_time >> w->log2_clocks_per_bin;
+
+  if (w->n_wheel_elt_time_bits <= 0 ||
+      w->n_wheel_elt_time_bits >= STRUCT_BITS_OF (timing_wheel_elt_t,
+						  cpu_time_relative_to_base))
+    w->n_wheel_elt_time_bits =
+      STRUCT_BITS_OF (timing_wheel_elt_t, cpu_time_relative_to_base) - 1;
+
+  w->cpu_time_base = current_cpu_time;
+  w->time_index_next_cpu_time_base_update
+    =
+    w->current_time_index +
+    ((u64) 1 << (w->n_wheel_elt_time_bits - w->log2_clocks_per_bin));
+}
+
+always_inline uword
+get_level_and_relative_time (timing_wheel_t * w, u64 cpu_time,
+			     uword * rtime_result)
+{
+  u64 dt, rtime;
+  uword level_index;
+
+  dt = (cpu_time >> w->log2_clocks_per_bin);
+
+  /* Time should always move forward. */
+  ASSERT (dt >= w->current_time_index);
+
+  dt -= w->current_time_index;
+
+  /* Find level and offset within level.  Level i has bins of size 2^((i+1)*M) */
+  rtime = dt;
+  for (level_index = 0; (rtime >> w->log2_bins_per_wheel) != 0; level_index++)
+    rtime = (rtime >> w->log2_bins_per_wheel) - 1;
+
+  /* Return offset within level and level index. */
+  ASSERT (rtime < w->bins_per_wheel);
+  *rtime_result = rtime;
+  return level_index;
+}
+
+always_inline uword
+time_index_to_wheel_index (timing_wheel_t * w, uword level_index, u64 ti)
+{
+  return (ti >> (level_index * w->log2_bins_per_wheel)) &
+    w->bins_per_wheel_mask;
+}
+
+/* Find current time on this level. */
+always_inline uword
+current_time_wheel_index (timing_wheel_t * w, uword level_index)
+{
+  return time_index_to_wheel_index (w, level_index, w->current_time_index);
+}
+
+/* Circular wheel indexing. */
+always_inline uword
+wheel_add (timing_wheel_t * w, word x)
+{
+  return x & w->bins_per_wheel_mask;
+}
+
+always_inline uword
+rtime_to_wheel_index (timing_wheel_t * w, uword level_index, uword rtime)
+{
+  uword t = current_time_wheel_index (w, level_index);
+  return wheel_add (w, t + rtime);
+}
+
+static clib_error_t *
+validate_level (timing_wheel_t * w, uword level_index, uword * n_elts)
+{
+  timing_wheel_level_t *level;
+  timing_wheel_elt_t *e;
+  uword wi;
+  clib_error_t *error = 0;
+
+#define _(x)					\
+  do {						\
+    error = CLIB_ERROR_ASSERT (x);		\
+    ASSERT (! error);				\
+    if (error) return error;			\
+  } while (0)
+
+  level = vec_elt_at_index (w->levels, level_index);
+  for (wi = 0; wi < vec_len (level->elts); wi++)
+    {
+      /* Validate occupancy bitmap. */
+      _(clib_bitmap_get_no_check (level->occupancy_bitmap, wi) ==
+	(vec_len (level->elts[wi]) > 0));
+
+      *n_elts += vec_len (level->elts[wi]);
+
+      vec_foreach (e, level->elts[wi])
+      {
+	/* Validate time bin and level. */
+	u64 e_time;
+	uword e_ti, e_li, e_wi;
+
+	e_time = e->cpu_time_relative_to_base + w->cpu_time_base;
+	e_li = get_level_and_relative_time (w, e_time, &e_ti);
+	e_wi = rtime_to_wheel_index (w, level_index, e_ti);
+
+	if (e_li == level_index - 1)
+	  /* If this element was scheduled on the previous level
+	     it must be wrapped. */
+	  _(e_ti + current_time_wheel_index (w, level_index - 1)
+	    >= w->bins_per_wheel);
+	else
+	  {
+	    _(e_li == level_index);
+	    if (e_li == 0)
+	      _(e_wi == wi);
+	    else
+	      _(e_wi == wi || e_wi + 1 == wi || e_wi - 1 == wi);
+	  }
+      }
+    }
+
+#undef _
+
+  return error;
+}
+
+void
+timing_wheel_validate (timing_wheel_t * w)
+{
+  uword l;
+  clib_error_t *error = 0;
+  uword n_elts;
+
+  if (!w->validate)
+    return;
+
+  n_elts = pool_elts (w->overflow_pool);
+  for (l = 0; l < vec_len (w->levels); l++)
+    {
+      error = validate_level (w, l, &n_elts);
+      if (error)
+	clib_error_report (error);
+    }
+}
+
+always_inline void
+free_elt_vector (timing_wheel_t * w, timing_wheel_elt_t * ev)
+{
+  /* Poison free elements so we never use them by mistake. */
+  if (CLIB_DEBUG > 0)
+    memset (ev, ~0, vec_len (ev) * sizeof (ev[0]));
+  _vec_len (ev) = 0;
+  vec_add1 (w->free_elt_vectors, ev);
+}
+
+static timing_wheel_elt_t *
+insert_helper (timing_wheel_t * w, uword level_index, uword rtime)
+{
+  timing_wheel_level_t *level;
+  timing_wheel_elt_t *e;
+  uword wheel_index;
+
+  /* Circular buffer. */
+  vec_validate (w->levels, level_index);
+  level = vec_elt_at_index (w->levels, level_index);
+
+  if (PREDICT_FALSE (!level->elts))
+    {
+      uword max = w->bins_per_wheel - 1;
+      clib_bitmap_validate (level->occupancy_bitmap, max);
+      vec_validate (level->elts, max);
+    }
+
+  wheel_index = rtime_to_wheel_index (w, level_index, rtime);
+
+  level->occupancy_bitmap =
+    clib_bitmap_ori (level->occupancy_bitmap, wheel_index);
+
+  /* Allocate an elt vector from free list if there is one. */
+  if (!level->elts[wheel_index] && vec_len (w->free_elt_vectors))
+    level->elts[wheel_index] = vec_pop (w->free_elt_vectors);
+
+  /* Add element to vector for this time bin. */
+  vec_add2 (level->elts[wheel_index], e, 1);
+
+  return e;
+}
+
+/* Insert user data on wheel at given CPU time stamp. */
+static void
+timing_wheel_insert_helper (timing_wheel_t * w, u64 insert_cpu_time,
+			    u32 user_data)
+{
+  timing_wheel_elt_t *e;
+  u64 dt;
+  uword rtime, level_index;
+
+  level_index = get_level_and_relative_time (w, insert_cpu_time, &rtime);
+
+  dt = insert_cpu_time - w->cpu_time_base;
+  if (PREDICT_TRUE (0 == (dt >> BITS (e->cpu_time_relative_to_base))))
+    {
+      e = insert_helper (w, level_index, rtime);
+      e->user_data = user_data;
+      e->cpu_time_relative_to_base = dt;
+    }
+  else
+    {
+      /* Time too far in the future: add to overflow vector. */
+      timing_wheel_overflow_elt_t *oe;
+      pool_get (w->overflow_pool, oe);
+      oe->user_data = user_data;
+      oe->cpu_time = insert_cpu_time;
+    }
+}
+
+always_inline uword
+elt_is_deleted (timing_wheel_t * w, u32 user_data)
+{
+  return (hash_elts (w->deleted_user_data_hash) > 0
+	  && hash_get (w->deleted_user_data_hash, user_data));
+}
+
+static timing_wheel_elt_t *
+delete_user_data (timing_wheel_elt_t * elts, u32 user_data)
+{
+  uword found_match;
+  timing_wheel_elt_t *e, *new_elts;
+
+  /* Quickly scan to see if there are any elements to delete
+     in this bucket. */
+  found_match = 0;
+  vec_foreach (e, elts)
+  {
+    found_match = e->user_data == user_data;
+    if (found_match)
+      break;
+  }
+  if (!found_match)
+    return elts;
+
+  /* Re-scan to build vector of new elts with matching user_data deleted. */
+  new_elts = 0;
+  vec_foreach (e, elts)
+  {
+    if (e->user_data != user_data)
+      vec_add1 (new_elts, e[0]);
+  }
+
+  vec_free (elts);
+  return new_elts;
+}
+
+/* Insert user data on wheel at given CPU time stamp. */
+void
+timing_wheel_insert (timing_wheel_t * w, u64 insert_cpu_time, u32 user_data)
+{
+  /* Remove previously deleted elements. */
+  if (elt_is_deleted (w, user_data))
+    {
+      timing_wheel_level_t *l;
+      uword wi;
+
+      /* Delete elts with given user data so that stale events don't expire. */
+      vec_foreach (l, w->levels)
+      {
+	  /* *INDENT-OFF* */
+	  clib_bitmap_foreach (wi, l->occupancy_bitmap, ({
+	    l->elts[wi] = delete_user_data (l->elts[wi], user_data);
+	    if (vec_len (l->elts[wi]) == 0)
+	      l->occupancy_bitmap = clib_bitmap_andnoti (l->occupancy_bitmap, wi);
+	  }));
+	  /* *INDENT-ON* */
+      }
+
+      {
+	timing_wheel_overflow_elt_t *oe;
+	/* *INDENT-OFF* */
+	pool_foreach (oe, w->overflow_pool, ({
+	  if (oe->user_data == user_data)
+	    pool_put (w->overflow_pool, oe);
+	}));
+	/* *INDENT-ON* */
+      }
+
+      hash_unset (w->deleted_user_data_hash, user_data);
+    }
+
+  timing_wheel_insert_helper (w, insert_cpu_time, user_data);
+}
+
+void
+timing_wheel_delete (timing_wheel_t * w, u32 user_data)
+{
+  if (!w->deleted_user_data_hash)
+    w->deleted_user_data_hash =
+      hash_create ( /* capacity */ 0, /* value bytes */ 0);
+
+  hash_set1 (w->deleted_user_data_hash, user_data);
+}
+
+/* Returns time of next expiring element. */
+u64
+timing_wheel_next_expiring_elt_time (timing_wheel_t * w)
+{
+  timing_wheel_level_t *l;
+  timing_wheel_elt_t *e;
+  uword li, wi, wi0;
+  u32 min_dt;
+  u64 min_t;
+  uword wrapped = 0;
+
+  min_dt = ~0;
+  min_t = ~0ULL;
+  vec_foreach (l, w->levels)
+  {
+    if (!l->occupancy_bitmap)
+      continue;
+
+    li = l - w->levels;
+    wi0 = wi = current_time_wheel_index (w, li);
+    wrapped = 0;
+    while (1)
+      {
+	if (clib_bitmap_get_no_check (l->occupancy_bitmap, wi))
+	  {
+	    vec_foreach (e, l->elts[wi])
+	      min_dt = clib_min (min_dt, e->cpu_time_relative_to_base);
+
+	    if (wrapped && li + 1 < vec_len (w->levels))
+	      {
+		uword wi1 = current_time_wheel_index (w, li + 1);
+		if (l[1].occupancy_bitmap
+		    && clib_bitmap_get_no_check (l[1].occupancy_bitmap, wi1))
+		  {
+		    vec_foreach (e, l[1].elts[wi1])
+		    {
+		      min_dt =
+			clib_min (min_dt, e->cpu_time_relative_to_base);
+		    }
+		  }
+	      }
+
+	    min_t = w->cpu_time_base + min_dt;
+	    goto done;
+	  }
+
+	wi = wheel_add (w, wi + 1);
+	if (wi == wi0)
+	  break;
+
+	wrapped = wi != wi + 1;
+      }
+  }
+
+  {
+    timing_wheel_overflow_elt_t *oe;
+
+    if (min_dt != ~0)
+      min_t = w->cpu_time_base + min_dt;
+
+    /* *INDENT-OFF* */
+    pool_foreach (oe, w->overflow_pool,
+		  ({ min_t = clib_min (min_t, oe->cpu_time); }));
+    /* *INDENT-ON* */
+
+  done:
+    return min_t;
+  }
+}
+
+static inline void
+insert_elt (timing_wheel_t * w, timing_wheel_elt_t * e)
+{
+  u64 t = w->cpu_time_base + e->cpu_time_relative_to_base;
+  timing_wheel_insert_helper (w, t, e->user_data);
+}
+
+always_inline u64
+elt_cpu_time (timing_wheel_t * w, timing_wheel_elt_t * e)
+{
+  return w->cpu_time_base + e->cpu_time_relative_to_base;
+}
+
+always_inline void
+validate_expired_elt (timing_wheel_t * w, timing_wheel_elt_t * e,
+		      u64 current_cpu_time)
+{
+  if (CLIB_DEBUG > 0)
+    {
+      u64 e_time = elt_cpu_time (w, e);
+
+      /* Verify that element is actually expired. */
+      ASSERT ((e_time >> w->log2_clocks_per_bin)
+	      <= (current_cpu_time >> w->log2_clocks_per_bin));
+    }
+}
+
+static u32 *
+expire_bin (timing_wheel_t * w,
+	    uword level_index,
+	    uword wheel_index, u64 advance_cpu_time, u32 * expired_user_data)
+{
+  timing_wheel_level_t *level = vec_elt_at_index (w->levels, level_index);
+  timing_wheel_elt_t *e;
+  u32 *x;
+  uword i, j, e_len;
+
+  e = vec_elt (level->elts, wheel_index);
+  e_len = vec_len (e);
+
+  vec_add2 (expired_user_data, x, e_len);
+  for (i = j = 0; i < e_len; i++)
+    {
+      validate_expired_elt (w, &e[i], advance_cpu_time);
+      x[j] = e[i].user_data;
+
+      /* Only advance if elt is not to be deleted. */
+      j += !elt_is_deleted (w, e[i].user_data);
+    }
+
+  /* Adjust for deleted elts. */
+  if (j < e_len)
+    _vec_len (expired_user_data) -= e_len - j;
+
+  free_elt_vector (w, e);
+
+  level->elts[wheel_index] = 0;
+  clib_bitmap_set_no_check (level->occupancy_bitmap, wheel_index, 0);
+
+  return expired_user_data;
+}
+
+/* Called rarely. 32 bit times should only overflow every 4 seconds or so on a fast machine. */
+static u32 *
+advance_cpu_time_base (timing_wheel_t * w, u32 * expired_user_data)
+{
+  timing_wheel_level_t *l;
+  timing_wheel_elt_t *e;
+  u64 delta;
+
+  w->stats.cpu_time_base_advances++;
+  delta = ((u64) 1 << w->n_wheel_elt_time_bits);
+  w->cpu_time_base += delta;
+  w->time_index_next_cpu_time_base_update += delta >> w->log2_clocks_per_bin;
+
+  vec_foreach (l, w->levels)
+  {
+    uword wi;
+      /* *INDENT-OFF* */
+      clib_bitmap_foreach (wi, l->occupancy_bitmap, ({
+	vec_foreach (e, l->elts[wi])
+	  {
+	    /* This should always be true since otherwise we would have already expired
+	       this element. */
+	    ASSERT (e->cpu_time_relative_to_base >= delta);
+	    e->cpu_time_relative_to_base -= delta;
+	  }
+      }));
+      /* *INDENT-ON* */
+  }
+
+  /* See which overflow elements fit now. */
+  {
+    timing_wheel_overflow_elt_t *oe;
+    /* *INDENT-OFF* */
+    pool_foreach (oe, w->overflow_pool, ({
+      /* It fits now into 32 bits. */
+      if (0 == ((oe->cpu_time - w->cpu_time_base) >> BITS (e->cpu_time_relative_to_base)))
+	{
+	  u64 ti = oe->cpu_time >> w->log2_clocks_per_bin;
+	  if (ti < w->current_time_index)
+	    {
+	      /* This can happen when timing wheel is not advanced for a long time
+		 (for example when at a gdb breakpoint for a while). */
+	      if (! elt_is_deleted (w, oe->user_data))
+		vec_add1 (expired_user_data, oe->user_data);
+	    }
+	  else
+	    timing_wheel_insert_helper (w, oe->cpu_time, oe->user_data);
+	  pool_put (w->overflow_pool, oe);
+	}
+    }));
+    /* *INDENT-ON* */
+  }
+  return expired_user_data;
+}
+
+static u32 *
+refill_level (timing_wheel_t * w,
+	      uword level_index,
+	      u64 advance_cpu_time,
+	      uword from_wheel_index,
+	      uword to_wheel_index, u32 * expired_user_data)
+{
+  timing_wheel_level_t *level;
+  timing_wheel_elt_t *to_insert = w->unexpired_elts_pending_insert;
+  u64 advance_time_index = advance_cpu_time >> w->log2_clocks_per_bin;
+
+  vec_validate (w->stats.refills, level_index);
+  w->stats.refills[level_index] += 1;
+
+  if (level_index + 1 >= vec_len (w->levels))
+    goto done;
+
+  level = vec_elt_at_index (w->levels, level_index + 1);
+  if (!level->occupancy_bitmap)
+    goto done;
+
+  while (1)
+    {
+      timing_wheel_elt_t *e, *es;
+
+      if (clib_bitmap_get_no_check
+	  (level->occupancy_bitmap, from_wheel_index))
+	{
+	  es = level->elts[from_wheel_index];
+	  level->elts[from_wheel_index] = 0;
+	  clib_bitmap_set_no_check (level->occupancy_bitmap, from_wheel_index,
+				    0);
+
+	  vec_foreach (e, es)
+	  {
+	    u64 e_time = elt_cpu_time (w, e);
+	    u64 ti = e_time >> w->log2_clocks_per_bin;
+	    if (ti <= advance_time_index)
+	      {
+		validate_expired_elt (w, e, advance_cpu_time);
+		if (!elt_is_deleted (w, e->user_data))
+		  vec_add1 (expired_user_data, e->user_data);
+	      }
+	    else
+	      vec_add1 (to_insert, e[0]);
+	  }
+	  free_elt_vector (w, es);
+	}
+
+      if (from_wheel_index == to_wheel_index)
+	break;
+
+      from_wheel_index = wheel_add (w, from_wheel_index + 1);
+    }
+
+  timing_wheel_validate (w);
+done:
+  w->unexpired_elts_pending_insert = to_insert;
+  return expired_user_data;
+}
+
+/* Advance wheel and return any expired user data in vector. */
+u32 *
+timing_wheel_advance (timing_wheel_t * w, u64 advance_cpu_time,
+		      u32 * expired_user_data,
+		      u64 * next_expiring_element_cpu_time)
+{
+  timing_wheel_level_t *level;
+  uword level_index, advance_rtime, advance_level_index, advance_wheel_index;
+  uword n_expired_user_data_before;
+  u64 current_time_index, advance_time_index;
+
+  n_expired_user_data_before = vec_len (expired_user_data);
+
+  /* Re-fill lower levels when time wraps. */
+  current_time_index = w->current_time_index;
+  advance_time_index = advance_cpu_time >> w->log2_clocks_per_bin;
+
+  {
+    u64 current_ti, advance_ti;
+
+    current_ti = current_time_index >> w->log2_bins_per_wheel;
+    advance_ti = advance_time_index >> w->log2_bins_per_wheel;
+
+    if (PREDICT_FALSE (current_ti != advance_ti))
+      {
+	if (w->unexpired_elts_pending_insert)
+	  _vec_len (w->unexpired_elts_pending_insert) = 0;
+
+	level_index = 0;
+	while (current_ti != advance_ti)
+	  {
+	    uword c, a;
+	    c = current_ti & (w->bins_per_wheel - 1);
+	    a = advance_ti & (w->bins_per_wheel - 1);
+	    if (c != a)
+	      expired_user_data = refill_level (w,
+						level_index,
+						advance_cpu_time,
+						c, a, expired_user_data);
+	    current_ti >>= w->log2_bins_per_wheel;
+	    advance_ti >>= w->log2_bins_per_wheel;
+	    level_index++;
+	  }
+      }
+  }
+
+  advance_level_index =
+    get_level_and_relative_time (w, advance_cpu_time, &advance_rtime);
+  advance_wheel_index =
+    rtime_to_wheel_index (w, advance_level_index, advance_rtime);
+
+  /* Empty all occupied bins for entire levels that we advance past. */
+  for (level_index = 0; level_index < advance_level_index; level_index++)
+    {
+      uword wi;
+
+      if (level_index >= vec_len (w->levels))
+	break;
+
+      level = vec_elt_at_index (w->levels, level_index);
+      /* *INDENT-OFF* */
+      clib_bitmap_foreach (wi, level->occupancy_bitmap, ({
+        expired_user_data = expire_bin (w, level_index, wi, advance_cpu_time,
+					expired_user_data);
+      }));
+      /* *INDENT-ON* */
+    }
+
+  if (PREDICT_TRUE (level_index < vec_len (w->levels)))
+    {
+      uword wi;
+      level = vec_elt_at_index (w->levels, level_index);
+      wi = current_time_wheel_index (w, level_index);
+      if (level->occupancy_bitmap)
+	while (1)
+	  {
+	    if (clib_bitmap_get_no_check (level->occupancy_bitmap, wi))
+	      expired_user_data =
+		expire_bin (w, advance_level_index, wi, advance_cpu_time,
+			    expired_user_data);
+
+	    if (wi == advance_wheel_index)
+	      break;
+
+	    wi = wheel_add (w, wi + 1);
+	  }
+    }
+
+  /* Advance current time index. */
+  w->current_time_index = advance_time_index;
+
+  if (vec_len (w->unexpired_elts_pending_insert) > 0)
+    {
+      timing_wheel_elt_t *e;
+      vec_foreach (e, w->unexpired_elts_pending_insert) insert_elt (w, e);
+      _vec_len (w->unexpired_elts_pending_insert) = 0;
+    }
+
+  /* Don't advance until necessary. */
+  while (PREDICT_FALSE
+	 (advance_time_index >= w->time_index_next_cpu_time_base_update))
+    expired_user_data = advance_cpu_time_base (w, expired_user_data);
+
+  if (next_expiring_element_cpu_time)
+    {
+      u64 min_t;
+
+      /* Anything expired?  If so we need to recompute next expiring elt time. */
+      if (vec_len (expired_user_data) == n_expired_user_data_before
+	  && w->cached_min_cpu_time_on_wheel != 0ULL)
+	min_t = w->cached_min_cpu_time_on_wheel;
+      else
+	{
+	  min_t = timing_wheel_next_expiring_elt_time (w);
+	  w->cached_min_cpu_time_on_wheel = min_t;
+	}
+
+      *next_expiring_element_cpu_time = min_t;
+    }
+
+  return expired_user_data;
+}
+
+u8 *
+format_timing_wheel (u8 * s, va_list * va)
+{
+  timing_wheel_t *w = va_arg (*va, timing_wheel_t *);
+  int verbose = va_arg (*va, int);
+  uword indent = format_get_indent (s);
+
+  s = format (s, "level 0: %.4e - %.4e secs, 2^%d - 2^%d clocks",
+	      (f64) (1 << w->log2_clocks_per_bin) / w->cpu_clocks_per_second,
+	      (f64) (1 << w->log2_clocks_per_wheel) /
+	      w->cpu_clocks_per_second, w->log2_clocks_per_bin,
+	      w->log2_clocks_per_wheel);
+
+  if (verbose)
+    {
+      int l;
+
+      s = format (s, "\n%Utime base advances %Ld, every %.4e secs",
+		  format_white_space, indent + 2,
+		  w->stats.cpu_time_base_advances,
+		  (f64) ((u64) 1 << w->n_wheel_elt_time_bits) /
+		  w->cpu_clocks_per_second);
+
+      for (l = 0; l < vec_len (w->levels); l++)
+	s = format (s, "\n%Ulevel %d: refills %Ld",
+		    format_white_space, indent + 2,
+		    l,
+		    l <
+		    vec_len (w->stats.refills) ? w->stats.
+		    refills[l] : (u64) 0);
+    }
+
+  return s;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/timing_wheel.h b/src/vppinfra/timing_wheel.h
new file mode 100644
index 00000000..7daea994
--- /dev/null
+++ b/src/vppinfra/timing_wheel.h
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_clib_timing_wheel_h
+#define included_clib_timing_wheel_h
+
+#include <vppinfra/format.h>
+
+typedef struct
+{
+  /* Time of this element in units cpu clock ticks relative to time
+     base. 32 bits should be large enough for serveral kilo-seconds
+     to elapse before we have to re-set time base. */
+  u32 cpu_time_relative_to_base;
+
+  /* User data to store in this bin. */
+  u32 user_data;
+} timing_wheel_elt_t;
+
+/* Overflow wheel elements where time does not fit into 32 bits. */
+typedef struct
+{
+  /* Absolute time of this element. */
+  u64 cpu_time;
+
+  /* User data to store in this bin. */
+  u32 user_data;
+
+  u32 pad;
+} timing_wheel_overflow_elt_t;
+
+typedef struct
+{
+  /* 2^M bits: 1 means vector is non-zero else zero. */
+  uword *occupancy_bitmap;
+
+  /* 2^M element table of element vectors, one for each time bin. */
+  timing_wheel_elt_t **elts;
+} timing_wheel_level_t;
+
+typedef struct
+{
+  /* Vector of refill counts per level. */
+  u64 *refills;
+
+  /* Number of times cpu time base was rescaled. */
+  u64 cpu_time_base_advances;
+} timing_wheel_stats_t;
+
+typedef struct
+{
+  /* Each bin is a power of two clock ticks (N)
+     chosen so that 2^N >= min_sched_time. */
+  u8 log2_clocks_per_bin;
+
+  /* Wheels are 2^M bins where 2^(N+M) >= max_sched_time. */
+  u8 log2_bins_per_wheel;
+
+  /* N + M. */
+  u8 log2_clocks_per_wheel;
+
+  /* Number of bits to use in cpu_time_relative_to_base field
+     of timing_wheel_elt_t. */
+  u8 n_wheel_elt_time_bits;
+
+  /* 2^M. */
+  u32 bins_per_wheel;
+
+  /* 2^M - 1. */
+  u32 bins_per_wheel_mask;
+
+  timing_wheel_level_t *levels;
+
+  timing_wheel_overflow_elt_t *overflow_pool;
+
+  /* Free list of element vector so we can recycle old allocated vectors. */
+  timing_wheel_elt_t **free_elt_vectors;
+
+  timing_wheel_elt_t *unexpired_elts_pending_insert;
+
+  /* Hash table of user data values which have been deleted but not yet re-inserted. */
+  uword *deleted_user_data_hash;
+
+  /* Enable validation for debugging. */
+  u32 validate;
+
+  /* Time index.  Measures time in units of 2^N clock ticks from
+     when wheel starts. */
+  u64 current_time_index;
+
+  /* All times are 32 bit numbers relative to cpu_time_base.
+     So, roughly every 2^(32 + N) clocks we'll need to subtract from
+     all timing_wheel_elt_t times to make sure they never overflow. */
+  u64 cpu_time_base;
+
+  /* When current_time_index is >= this we update cpu_time_base
+     to avoid overflowing 32 bit cpu_time_relative_to_base
+     in timing_wheel_elt_t. */
+  u64 time_index_next_cpu_time_base_update;
+
+  /* Cached earliest element on wheel; 0 if not valid. */
+  u64 cached_min_cpu_time_on_wheel;
+
+  f64 min_sched_time, max_sched_time, cpu_clocks_per_second;
+
+  timing_wheel_stats_t stats;
+} timing_wheel_t;
+
+/* Initialization function. */
+void timing_wheel_init (timing_wheel_t * w,
+			u64 current_cpu_time, f64 cpu_clocks_per_second);
+
+/* Insert user data on wheel at given CPU time stamp. */
+void timing_wheel_insert (timing_wheel_t * w, u64 insert_cpu_time,
+			  u32 user_data);
+
+/* Delete user data from wheel (until it is again inserted). */
+void timing_wheel_delete (timing_wheel_t * w, u32 user_data);
+
+/* Advance wheel and return any expired user data in vector.  If non-zero
+   min_next_expiring_element_cpu_time will return a cpu time stamp
+   before which there are guaranteed to be no elements in the current wheel. */
+u32 *timing_wheel_advance (timing_wheel_t * w, u64 advance_cpu_time,
+			   u32 * expired_user_data,
+			   u64 * min_next_expiring_element_cpu_time);
+
+/* Returns absolute time in clock cycles of next expiring element. */
+u64 timing_wheel_next_expiring_elt_time (timing_wheel_t * w);
+
+/* Format a timing wheel. */
+format_function_t format_timing_wheel;
+
+/* Testing function to validate wheel. */
+void timing_wheel_validate (timing_wheel_t * w);
+
+#endif /* included_clib_timing_wheel_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/types.h b/src/vppinfra/types.h
new file mode 100644
index 00000000..f87bb48c
--- /dev/null
+++ b/src/vppinfra/types.h
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001-2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_types_h
+#define included_clib_types_h
+
+/* Standard CLIB types. */
+
+/* Define signed and unsigned 8, 16, 32, and 64 bit types
+   and machine signed/unsigned word for all architectures. */
+typedef char i8;
+typedef short i16;
+
+/* Avoid conflicts with Linux asm/types.h when __KERNEL__ */
+#if defined(CLIB_LINUX_KERNEL)
+/* Linux also defines u8/u16/u32/u64 types. */
+#include <asm/types.h>
+#define CLIB_AVOID_CLASH_WITH_LINUX_TYPES
+
+#else /* ! CLIB_LINUX_KERNEL */
+
+typedef unsigned char u8;
+typedef unsigned short u16;
+#endif /* ! CLIB_LINUX_KERNEL */
+
+#if defined (__x86_64__)
+#ifndef __COVERITY__
+typedef int i128 __attribute__ ((mode (TI)));
+typedef unsigned int u128 __attribute__ ((mode (TI)));
+#endif
+#endif
+
+#if (defined(i386) || defined(_mips) || defined(powerpc) || defined (__SPU__) || defined(__sparc__) || defined(__arm__) || defined (__xtensa__) || defined(__TMS320C6X__))
+typedef int i32;
+typedef long long i64;
+
+#ifndef CLIB_AVOID_CLASH_WITH_LINUX_TYPES
+typedef unsigned int u32;
+typedef unsigned long long u64;
+#endif /* CLIB_AVOID_CLASH_WITH_LINUX_TYPES */
+
+#elif defined(_mips) && __mips == 64
+#define log2_uword_bits 6
+#define clib_address_bits _MIPS_SZPTR
+
+#elif defined(alpha) || defined(__x86_64__) || defined (__powerpc64__) || defined (__aarch64__)
+typedef int i32;
+typedef long i64;
+
+#define log2_uword_bits 6
+#define clib_address_bits 64
+
+#ifndef CLIB_AVOID_CLASH_WITH_LINUX_TYPES
+typedef unsigned int u32;
+typedef unsigned long u64;
+#endif /* CLIB_AVOID_CLASH_WITH_LINUX_TYPES */
+
+#else
+#error "can't define types"
+#endif
+
+/* Default to 32 bit machines with 32 bit addresses. */
+#ifndef log2_uword_bits
+#define log2_uword_bits 5
+#endif
+
+/* #ifdef's above define log2_uword_bits. */
+#define uword_bits (1 << log2_uword_bits)
+
+#ifndef clib_address_bits
+#define clib_address_bits 32
+#endif
+
+/* Word types. */
+#if uword_bits == 64
+/* 64 bit word machines. */
+typedef i64 word;
+typedef u64 uword;
+#else
+/* 32 bit word machines. */
+typedef i32 word;
+typedef u32 uword;
+#endif
+
+/* integral type of a pointer (used to cast pointers). */
+#if clib_address_bits == 64
+typedef u64 clib_address_t;
+#else
+typedef u32 clib_address_t;
+#endif
+
+/* These are needed to convert between pointers and machine words.
+   MIPS is currently the only machine that can have different sized
+   pointers and machine words (but only when compiling with 64 bit
+   registers and 32 bit pointers). */
+static inline __attribute__ ((always_inline)) uword
+pointer_to_uword (const void *p)
+{
+  return (uword) (clib_address_t) p;
+}
+
+#define uword_to_pointer(u,type) ((type) (clib_address_t) (u))
+
+/* Any type: can be either word or pointer. */
+typedef word any;
+
+/* Floating point types. */
+typedef double f64;
+typedef float f32;
+
+typedef __complex__ float cf32;
+typedef __complex__ double cf64;
+
+/* Floating point word size. */
+typedef f64 fword;
+
+/* Can be used as either {r,l}value, e.g. these both work
+     clib_mem_unaligned (p, u64) = 99
+     clib_mem_unaligned (p, u64) += 99 */
+
+#define clib_mem_unaligned(pointer,type) \
+  (((struct { CLIB_PACKED (type _data); } *) (pointer))->_data)
+
+/* Access memory with specified alignment depending on align argument.
+   As with clib_mem_unaligned, may be used as {r,l}value. */
+#define clib_mem_aligned(addr,type,align)		\
+  (((struct {						\
+       type _data					\
+       __attribute__ ((aligned (align), packed));	\
+    } *) (addr))->_data)
+
+#endif /* included_clib_types_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/unformat.c b/src/vppinfra/unformat.c
new file mode 100644
index 00000000..ac8b7ddc
--- /dev/null
+++ b/src/vppinfra/unformat.c
@@ -0,0 +1,1077 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/format.h>
+
+/* Call user's function to fill input buffer. */
+uword
+_unformat_fill_input (unformat_input_t * i)
+{
+  uword l, first_mark;
+
+  if (i->index == UNFORMAT_END_OF_INPUT)
+    return i->index;
+
+  first_mark = l = vec_len (i->buffer);
+  if (vec_len (i->buffer_marks) > 0)
+    first_mark = i->buffer_marks[0];
+
+  /* Re-use buffer when no marks. */
+  if (first_mark > 0)
+    vec_delete (i->buffer, first_mark, 0);
+
+  i->index = vec_len (i->buffer);
+  for (l = 0; l < vec_len (i->buffer_marks); l++)
+    i->buffer_marks[l] -= first_mark;
+
+  /* Call user's function to fill the buffer. */
+  if (i->fill_buffer)
+    i->index = i->fill_buffer (i);
+
+  /* If input pointer is still beyond end of buffer even after
+     fill then we've run out of input. */
+  if (i->index >= vec_len (i->buffer))
+    i->index = UNFORMAT_END_OF_INPUT;
+
+  return i->index;
+}
+
+always_inline uword
+is_white_space (uword c)
+{
+  switch (c)
+    {
+    case ' ':
+    case '\t':
+    case '\n':
+    case '\r':
+      return 1;
+
+    default:
+      return 0;
+    }
+}
+
+/* Format function for dumping input stream. */
+u8 *
+format_unformat_error (u8 * s, va_list * va)
+{
+  unformat_input_t *i = va_arg (*va, unformat_input_t *);
+  uword l = vec_len (i->buffer);
+
+  /* Only show so much of the input buffer (it could be really large). */
+  uword n_max = 30;
+
+  if (i->index < l)
+    {
+      uword n = l - i->index;
+      u8 *p, *p_end;
+
+      p = i->buffer + i->index;
+      p_end = p + (n > n_max ? n_max : n);
+
+      /* Skip white space at end. */
+      if (n <= n_max)
+	{
+	  while (p_end > p && is_white_space (p_end[-1]))
+	    p_end--;
+	}
+
+      while (p < p_end)
+	{
+	  switch (*p)
+	    {
+	    case '\r':
+	      vec_add (s, "\\r", 2);
+	      break;
+	    case '\n':
+	      vec_add (s, "\\n", 2);
+	      break;
+	    case '\t':
+	      vec_add (s, "\\t", 2);
+	      break;
+	    default:
+	      vec_add1 (s, *p);
+	      break;
+	    }
+	  p++;
+	}
+
+      if (n > n_max)
+	vec_add (s, "...", 3);
+    }
+
+  return s;
+}
+
+/* Print everything: not just error context. */
+u8 *
+format_unformat_input (u8 * s, va_list * va)
+{
+  unformat_input_t *i = va_arg (*va, unformat_input_t *);
+  uword l, n;
+
+  if (i->index == UNFORMAT_END_OF_INPUT)
+    s = format (s, "{END_OF_INPUT}");
+  else
+    {
+      l = vec_len (i->buffer);
+      n = l - i->index;
+      if (n > 0)
+	vec_add (s, i->buffer + i->index, n);
+    }
+
+  return s;
+}
+
+#if CLIB_DEBUG > 0
+void
+di (unformat_input_t * i)
+{
+  fformat (stderr, "%U\n", format_unformat_input, i);
+}
+#endif
+
+/* Parse delimited vector string.  If string starts with { then string
+   is delimited by balenced parenthesis.  Other string is delimited by
+   white space.  {} were chosen since they are special to the shell. */
+static uword
+unformat_string (unformat_input_t * input,
+		 uword delimiter_character,
+		 uword format_character, va_list * va)
+{
+  u8 **string_return = va_arg (*va, u8 **);
+  u8 *s = 0;
+  word paren = 0;
+  word is_paren_delimited = 0;
+  word backslash = 0;
+  uword c;
+
+  switch (delimiter_character)
+    {
+    case '%':
+    case ' ':
+    case '\t':
+      delimiter_character = 0;
+      break;
+    }
+
+  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
+    {
+      word add_to_vector;
+
+      /* Null return string means to skip over delimited input. */
+      add_to_vector = string_return != 0;
+
+      if (backslash)
+	backslash = 0;
+      else
+	switch (c)
+	  {
+	  case '\\':
+	    backslash = 1;
+	    add_to_vector = 0;
+	    break;
+
+	  case '{':
+	    if (paren == 0 && vec_len (s) == 0)
+	      {
+		is_paren_delimited = 1;
+		add_to_vector = 0;
+	      }
+	    paren++;
+	    break;
+
+	  case '}':
+	    paren--;
+	    if (is_paren_delimited && paren == 0)
+	      goto done;
+	    break;
+
+	  case ' ':
+	  case '\t':
+	  case '\n':
+	  case '\r':
+	    if (!is_paren_delimited)
+	      {
+		unformat_put_input (input);
+		goto done;
+	      }
+	    break;
+
+	  default:
+	    if (!is_paren_delimited && c == delimiter_character)
+	      {
+		unformat_put_input (input);
+		goto done;
+	      }
+	  }
+
+      if (add_to_vector)
+	vec_add1 (s, c);
+    }
+
+done:
+  if (string_return)
+    {
+      /* Match the string { END-OF-INPUT as a single brace. */
+      if (c == UNFORMAT_END_OF_INPUT && vec_len (s) == 0 && paren == 1)
+	vec_add1 (s, '{');
+
+      /* Don't match null string. */
+      if (c == UNFORMAT_END_OF_INPUT && vec_len (s) == 0)
+	return 0;
+
+      /* Null terminate C string. */
+      if (format_character == 's')
+	vec_add1 (s, 0);
+
+      *string_return = s;
+    }
+  else
+    vec_free (s);		/* just to make sure */
+
+  return 1;
+}
+
+uword
+unformat_hex_string (unformat_input_t * input, va_list * va)
+{
+  u8 **hexstring_return = va_arg (*va, u8 **);
+  u8 *s;
+  uword n, d, c;
+
+  n = 0;
+  d = 0;
+  s = 0;
+  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
+    {
+      if (c >= '0' && c <= '9')
+	d = 16 * d + c - '0';
+      else if (c >= 'a' && c <= 'f')
+	d = 16 * d + 10 + c - 'a';
+      else if (c >= 'A' && c <= 'F')
+	d = 16 * d + 10 + c - 'A';
+      else
+	{
+	  unformat_put_input (input);
+	  break;
+	}
+      n++;
+
+      if (n == 2)
+	{
+	  vec_add1 (s, d);
+	  n = d = 0;
+	}
+    }
+
+  /* Hex string must have even number of digits. */
+  if (n % 2)
+    {
+      vec_free (s);
+      return 0;
+    }
+
+  *hexstring_return = s;
+  return 1;
+}
+
+/* unformat (input "foo%U", unformat_eof) matches terminal foo only */
+uword
+unformat_eof (unformat_input_t * input, va_list * va)
+{
+  return unformat_check_input (input) == UNFORMAT_END_OF_INPUT;
+}
+
+/* Parse a token containing given set of characters. */
+uword
+unformat_token (unformat_input_t * input, va_list * va)
+{
+  u8 *token_chars = va_arg (*va, u8 *);
+  u8 **string_return = va_arg (*va, u8 **);
+  u8 *s, map[256];
+  uword i, c;
+
+  if (!token_chars)
+    token_chars = (u8 *) "a-zA-Z0-9_";
+
+  memset (map, 0, sizeof (map));
+  for (s = token_chars; *s;)
+    {
+      /* Parse range. */
+      if (s[0] < s[2] && s[1] == '-')
+	{
+	  for (i = s[0]; i <= s[2]; i++)
+	    map[i] = 1;
+	  s = s + 3;
+	}
+      else
+	{
+	  map[s[0]] = 1;
+	  s = s + 1;
+	}
+    }
+
+  s = 0;
+  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
+    {
+      if (!map[c])
+	{
+	  unformat_put_input (input);
+	  break;
+	}
+
+      vec_add1 (s, c);
+    }
+
+  if (vec_len (s) == 0)
+    return 0;
+
+  *string_return = s;
+  return 1;
+}
+
+/* Unformat (parse) function which reads a %s string and converts it
+   to and unformat_input_t. */
+uword
+unformat_input (unformat_input_t * i, va_list * args)
+{
+  unformat_input_t *sub_input = va_arg (*args, unformat_input_t *);
+  u8 *s;
+
+  if (unformat (i, "%v", &s))
+    {
+      unformat_init_vector (sub_input, s);
+      return 1;
+    }
+
+  return 0;
+}
+
+/* Parse a line ending with \n and return it. */
+uword
+unformat_line (unformat_input_t * i, va_list * va)
+{
+  u8 *line = 0, **result = va_arg (*va, u8 **);
+  uword c;
+
+  while ((c = unformat_get_input (i)) != '\n' && c != UNFORMAT_END_OF_INPUT)
+    {
+      vec_add1 (line, c);
+    }
+
+  *result = line;
+  return 1;
+}
+
+/* Parse a line ending with \n and return it as an unformat_input_t. */
+uword
+unformat_line_input (unformat_input_t * i, va_list * va)
+{
+  unformat_input_t *result = va_arg (*va, unformat_input_t *);
+  u8 *line;
+  unformat_user (i, unformat_line, &line);
+  unformat_init_vector (result, line);
+  return 1;
+}
+
+/* Values for is_signed. */
+#define UNFORMAT_INTEGER_SIGNED		1
+#define UNFORMAT_INTEGER_UNSIGNED	0
+
+static uword
+unformat_integer (unformat_input_t * input,
+		  va_list * va, uword base, uword is_signed, uword data_bytes)
+{
+  uword c, digit;
+  uword value = 0;
+  uword n_digits = 0;
+  uword n_input = 0;
+  uword sign = 0;
+
+  /* We only support bases <= 64. */
+  if (base < 2 || base > 64)
+    goto error;
+
+  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
+    {
+      switch (c)
+	{
+	case '-':
+	  if (n_input == 0)
+	    {
+	      if (is_signed)
+		{
+		  sign = 1;
+		  goto next_digit;
+		}
+	      else
+		/* Leading sign for unsigned number. */
+		goto error;
+	    }
+	  /* Sign after input (e.g. 100-200). */
+	  goto put_input_done;
+
+	case '+':
+	  if (n_input > 0)
+	    goto put_input_done;
+	  sign = 0;
+	  goto next_digit;
+
+	case '0' ... '9':
+	  digit = c - '0';
+	  break;
+
+	case 'a' ... 'z':
+	  digit = 10 + (c - 'a');
+	  break;
+
+	case 'A' ... 'Z':
+	  digit = 10 + (base >= 36 ? 26 : 0) + (c - 'A');
+	  break;
+
+	case '/':
+	  digit = 62;
+	  break;
+
+	case '?':
+	  digit = 63;
+	  break;
+
+	default:
+	  goto put_input_done;
+	}
+
+      if (digit >= base)
+	{
+	put_input_done:
+	  unformat_put_input (input);
+	  goto done;
+	}
+
+      {
+	uword new_value = base * value + digit;
+
+	/* Check for overflow. */
+	if (new_value < value)
+	  goto error;
+	value = new_value;
+      }
+      n_digits += 1;
+
+    next_digit:
+      n_input++;
+    }
+
+done:
+  if (sign)
+    value = -value;
+
+  if (n_digits > 0)
+    {
+      void *v = va_arg (*va, void *);
+
+      if (data_bytes == ~0)
+	data_bytes = sizeof (int);
+
+      switch (data_bytes)
+	{
+	case 1:
+	  *(u8 *) v = value;
+	  break;
+	case 2:
+	  *(u16 *) v = value;
+	  break;
+	case 4:
+	  *(u32 *) v = value;
+	  break;
+	case 8:
+	  *(u64 *) v = value;
+	  break;
+	default:
+	  goto error;
+	}
+
+      return 1;
+    }
+
+error:
+  return 0;
+}
+
+/* Return x 10^n */
+static f64
+times_power_of_ten (f64 x, int n)
+{
+  if (n >= 0)
+    {
+      static f64 t[8] = { 1e+0, 1e+1, 1e+2, 1e+3, 1e+4, 1e+5, 1e+6, 1e+7, };
+      while (n >= 8)
+	{
+	  x *= 1e+8;
+	  n -= 8;
+	}
+      return x * t[n];
+    }
+  else
+    {
+      static f64 t[8] = { 1e-0, 1e-1, 1e-2, 1e-3, 1e-4, 1e-5, 1e-6, 1e-7, };
+      while (n <= -8)
+	{
+	  x *= 1e-8;
+	  n += 8;
+	}
+      return x * t[-n];
+    }
+
+}
+
+static uword
+unformat_float (unformat_input_t * input, va_list * va)
+{
+  uword c;
+  u64 values[3];
+  uword n_digits[3], value_index = 0;
+  uword signs[2], sign_index = 0;
+  uword n_input = 0;
+
+  memset (values, 0, sizeof (values));
+  memset (n_digits, 0, sizeof (n_digits));
+  memset (signs, 0, sizeof (signs));
+
+  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
+    {
+      switch (c)
+	{
+	case '-':
+	  if (value_index == 2 && n_digits[2] == 0)
+	    /* sign of exponent: it's ok. */ ;
+
+	  else if (value_index < 2 && n_digits[0] > 0)
+	    {
+	      /* 123- */
+	      unformat_put_input (input);
+	      goto done;
+	    }
+
+	  else if (n_input > 0)
+	    goto error;
+
+	  signs[sign_index++] = 1;
+	  goto next_digit;
+
+	case '+':
+	  if (value_index == 2 && n_digits[2] == 0)
+	    /* sign of exponent: it's ok. */ ;
+
+	  else if (value_index < 2 && n_digits[0] > 0)
+	    {
+	      /* 123+ */
+	      unformat_put_input (input);
+	      goto done;
+	    }
+
+	  else if (n_input > 0)
+	    goto error;
+	  signs[sign_index++] = 0;
+	  goto next_digit;
+
+	case 'e':
+	case 'E':
+	  if (n_input == 0)
+	    goto error;
+	  value_index = 2;
+	  sign_index = 1;
+	  break;
+
+	case '.':
+	  if (value_index > 0)
+	    goto error;
+	  value_index = 1;
+	  break;
+
+	case '0' ... '9':
+	  {
+	    u64 tmp;
+
+	    tmp = values[value_index] * 10 + c - '0';
+
+	    /* Check for overflow. */
+	    if (tmp < values[value_index])
+	      goto error;
+	    values[value_index] = tmp;
+	    n_digits[value_index] += 1;
+	  }
+	  break;
+
+	default:
+	  unformat_put_input (input);
+	  goto done;
+	}
+
+    next_digit:
+      n_input++;
+    }
+
+done:
+  {
+    f64 f_values[2], *value_return;
+    word expon;
+
+    /* Must have either whole or fraction digits. */
+    if (n_digits[0] + n_digits[1] <= 0)
+      goto error;
+
+    f_values[0] = values[0];
+    if (signs[0])
+      f_values[0] = -f_values[0];
+
+    f_values[1] = values[1];
+    f_values[1] = times_power_of_ten (f_values[1], -n_digits[1]);
+
+    f_values[0] += f_values[1];
+
+    expon = values[2];
+    if (signs[1])
+      expon = -expon;
+
+    f_values[0] = times_power_of_ten (f_values[0], expon);
+
+    value_return = va_arg (*va, f64 *);
+    *value_return = f_values[0];
+    return 1;
+  }
+
+error:
+  return 0;
+}
+
+static char *
+match_input_with_format (unformat_input_t * input, char *f)
+{
+  uword cf, ci;
+
+  ASSERT (*f != 0);
+
+  while (1)
+    {
+      cf = *f;
+      if (cf == 0 || cf == '%' || cf == ' ')
+	break;
+      f++;
+
+      ci = unformat_get_input (input);
+
+      if (cf != ci)
+	return 0;
+    }
+  return f;
+}
+
+static char *
+do_percent (unformat_input_t * input, va_list * va, char *f)
+{
+  uword cf, n, data_bytes = ~0;
+
+  cf = *f++;
+
+  switch (cf)
+    {
+    default:
+      break;
+
+    case 'w':
+      /* Word types. */
+      cf = *f++;
+      data_bytes = sizeof (uword);
+      break;
+
+    case 'l':
+      cf = *f++;
+      if (cf == 'l')
+	{
+	  cf = *f++;
+	  data_bytes = sizeof (long long);
+	}
+      else
+	{
+	  data_bytes = sizeof (long);
+	}
+      break;
+
+    case 'L':
+      cf = *f++;
+      data_bytes = sizeof (long long);
+      break;
+    }
+
+  n = 0;
+  switch (cf)
+    {
+    case 'D':
+      data_bytes = va_arg (*va, int);
+    case 'd':
+      n = unformat_integer (input, va, 10,
+			    UNFORMAT_INTEGER_SIGNED, data_bytes);
+      break;
+
+    case 'u':
+      n = unformat_integer (input, va, 10,
+			    UNFORMAT_INTEGER_UNSIGNED, data_bytes);
+      break;
+
+    case 'b':
+      n = unformat_integer (input, va, 2,
+			    UNFORMAT_INTEGER_UNSIGNED, data_bytes);
+      break;
+
+    case 'o':
+      n = unformat_integer (input, va, 8,
+			    UNFORMAT_INTEGER_UNSIGNED, data_bytes);
+      break;
+
+    case 'X':
+      data_bytes = va_arg (*va, int);
+    case 'x':
+      n = unformat_integer (input, va, 16,
+			    UNFORMAT_INTEGER_UNSIGNED, data_bytes);
+      break;
+
+    case 'f':
+      n = unformat_float (input, va);
+      break;
+
+    case 's':
+    case 'v':
+      n = unformat_string (input, f[0], cf, va);
+      break;
+
+    case 'U':
+      {
+	unformat_function_t *f = va_arg (*va, unformat_function_t *);
+	n = f (input, va);
+      }
+      break;
+
+    case '=':
+    case '|':
+      {
+	int *var = va_arg (*va, int *);
+	uword val = va_arg (*va, int);
+
+	if (cf == '|')
+	  val |= *var;
+	*var = val;
+	n = 1;
+      }
+      break;
+    }
+
+  return n ? f : 0;
+}
+
+uword
+unformat_skip_white_space (unformat_input_t * input)
+{
+  uword n = 0;
+  uword c;
+
+  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
+    {
+      if (!is_white_space (c))
+	{
+	  unformat_put_input (input);
+	  break;
+	}
+      n++;
+    }
+  return n;
+}
+
+uword
+va_unformat (unformat_input_t * input, char *fmt, va_list * va)
+{
+  char *f;
+  uword input_matches_format;
+  uword default_skip_input_white_space;
+  uword n_input_white_space_skipped;
+  uword last_non_white_space_match_percent;
+  uword last_non_white_space_match_format;
+
+  vec_add1_aligned (input->buffer_marks, input->index,
+		    sizeof (input->buffer_marks[0]));
+
+  f = fmt;
+  default_skip_input_white_space = 1;
+  input_matches_format = 0;
+  last_non_white_space_match_percent = 0;
+  last_non_white_space_match_format = 0;
+
+  while (1)
+    {
+      char cf;
+      uword is_percent, skip_input_white_space;
+
+      cf = *f;
+      is_percent = 0;
+
+      /* Always skip input white space at start of format string.
+         Otherwise use default skip value which can be changed by %_
+         (see below). */
+      skip_input_white_space = f == fmt || default_skip_input_white_space;
+
+      /* Spaces in format request skipping input white space. */
+      if (is_white_space (cf))
+	{
+	  skip_input_white_space = 1;
+
+	  /* Multiple format spaces are equivalent to a single white
+	     space. */
+	  while (is_white_space (*++f))
+	    ;
+	}
+      else if (cf == '%')
+	{
+	  /* %_ toggles whether or not to skip input white space. */
+	  switch (*++f)
+	    {
+	    case '_':
+	      default_skip_input_white_space =
+		!default_skip_input_white_space;
+	      f++;
+	      /* For transition from skip to no-skip in middle of format
+	         string, skip input white space.  For example, the following matches:
+	         fmt = "%_%d.%d%_->%_%d.%d%_"
+	         input "1.2 -> 3.4"
+	         Without this the space after -> does not get skipped. */
+	      if (!default_skip_input_white_space
+		  && !(f == fmt + 2 || *f == 0))
+		unformat_skip_white_space (input);
+	      continue;
+
+	      /* %% means match % */
+	    case '%':
+	      break;
+
+	      /* % at end of format string. */
+	    case 0:
+	      goto parse_fail;
+
+	    default:
+	      is_percent = 1;
+	      break;
+	    }
+	}
+
+      n_input_white_space_skipped = 0;
+      if (skip_input_white_space)
+	n_input_white_space_skipped = unformat_skip_white_space (input);
+
+      /* End of format string. */
+      if (cf == 0)
+	{
+	  /* Force parse error when format string ends and input is
+	     not white or at end.  As an example, this is to prevent
+	     format "foo" from matching input "food".
+	     The last_non_white_space_match_percent is to make
+	     "foo %d" match input "foo 10,bletch" with %d matching 10. */
+	  if (skip_input_white_space
+	      && !last_non_white_space_match_percent
+	      && !last_non_white_space_match_format
+	      && n_input_white_space_skipped == 0
+	      && input->index != UNFORMAT_END_OF_INPUT)
+	    goto parse_fail;
+	  break;
+	}
+
+      last_non_white_space_match_percent = is_percent;
+      last_non_white_space_match_format = 0;
+
+      /* Explicit spaces in format must match input white space. */
+      if (cf == ' ' && !default_skip_input_white_space)
+	{
+	  if (n_input_white_space_skipped == 0)
+	    goto parse_fail;
+	}
+
+      else if (is_percent)
+	{
+	  if (!(f = do_percent (input, va, f)))
+	    goto parse_fail;
+	}
+
+      else
+	{
+	  char *g = match_input_with_format (input, f);
+	  if (!g)
+	    goto parse_fail;
+	  last_non_white_space_match_format = g > f;
+	  f = g;
+	}
+    }
+
+  input_matches_format = 1;
+parse_fail:
+
+  /* Rewind buffer marks. */
+  {
+    uword l = vec_len (input->buffer_marks);
+
+    /* If we did not match back up buffer to last mark. */
+    if (!input_matches_format)
+      input->index = input->buffer_marks[l - 1];
+
+    _vec_len (input->buffer_marks) = l - 1;
+  }
+
+  return input_matches_format;
+}
+
+uword
+unformat (unformat_input_t * input, char *fmt, ...)
+{
+  va_list va;
+  uword result;
+  va_start (va, fmt);
+  result = va_unformat (input, fmt, &va);
+  va_end (va);
+  return result;
+}
+
+uword
+unformat_user (unformat_input_t * input, unformat_function_t * func, ...)
+{
+  va_list va;
+  uword result, l;
+
+  /* Save place in input buffer in case parse fails. */
+  l = vec_len (input->buffer_marks);
+  vec_add1_aligned (input->buffer_marks, input->index,
+		    sizeof (input->buffer_marks[0]));
+
+  va_start (va, func);
+  result = func (input, &va);
+  va_end (va);
+
+  if (!result && input->index != UNFORMAT_END_OF_INPUT)
+    input->index = input->buffer_marks[l];
+
+  _vec_len (input->buffer_marks) = l;
+
+  return result;
+}
+
+/* Setup for unformat of Unix style command line. */
+void
+unformat_init_command_line (unformat_input_t * input, char *argv[])
+{
+  uword i;
+
+  unformat_init (input, 0, 0);
+
+  /* Concatenate argument strings with space in between. */
+  for (i = 1; argv[i]; i++)
+    {
+      vec_add (input->buffer, argv[i], strlen (argv[i]));
+      if (argv[i + 1])
+	vec_add1 (input->buffer, ' ');
+    }
+}
+
+void
+unformat_init_string (unformat_input_t * input, char *string, int string_len)
+{
+  unformat_init (input, 0, 0);
+  if (string_len > 0)
+    vec_add (input->buffer, string, string_len);
+}
+
+void
+unformat_init_vector (unformat_input_t * input, u8 * vector_string)
+{
+  unformat_init (input, 0, 0);
+  input->buffer = vector_string;
+}
+
+#ifdef CLIB_UNIX
+
+static uword
+unix_file_fill_buffer (unformat_input_t * input)
+{
+  int fd = pointer_to_uword (input->fill_buffer_arg);
+  uword l, n;
+
+  l = vec_len (input->buffer);
+  vec_resize (input->buffer, 4096);
+  n = read (fd, input->buffer + l, 4096);
+  if (n > 0)
+    _vec_len (input->buffer) = l + n;
+
+  if (n <= 0)
+    return UNFORMAT_END_OF_INPUT;
+  else
+    return input->index;
+}
+
+void
+unformat_init_unix_file (unformat_input_t * input, int file_descriptor)
+{
+  unformat_init (input, unix_file_fill_buffer,
+		 uword_to_pointer (file_descriptor, void *));
+}
+
+/* Take input from Unix environment variable. */
+uword
+unformat_init_unix_env (unformat_input_t * input, char *var)
+{
+  char *val = getenv (var);
+  if (val)
+    unformat_init_string (input, val, strlen (val));
+  return val != 0;
+}
+
+#endif /* CLIB_UNIX */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/unix-formats.c b/src/vppinfra/unix-formats.c
new file mode 100644
index 00000000..a4c81ca2
--- /dev/null
+++ b/src/vppinfra/unix-formats.c
@@ -0,0 +1,918 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifdef __KERNEL__
+
+# include <linux/unistd.h>
+# include <linux/signal.h>
+
+#else /* ! __KERNEL__ */
+
+#define _GNU_SOURCE		/* to get REG_* in ucontext.h */
+#include <ucontext.h>
+#undef _GNU_SOURCE
+#undef __USE_GNU
+
+#include <unistd.h>
+#include <signal.h>
+
+#include <time.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <math.h>
+
+#include <vppinfra/time.h>
+
+#ifdef AF_NETLINK
+#include <linux/types.h>
+#include <linux/netlink.h>
+#endif
+
+#endif /* ! __KERNEL__ */
+
+
+#ifdef __KERNEL__
+# include <linux/socket.h>
+# include <linux/in.h>
+# include <linux/ip.h>
+# include <linux/tcp.h>
+# include <linux/udp.h>
+# include <linux/icmp.h>
+# include <linux/if_ether.h>
+# include <linux/if_arp.h>
+#else
+# include <net/if.h>            /* struct ifnet may live here */
+# include <netinet/in.h>
+# include <netinet/ip.h>
+# include <netinet/tcp.h>
+# include <netinet/udp.h>
+# include <netinet/ip_icmp.h>
+# include <netinet/if_ether.h>
+#endif /* __KERNEL__ */
+
+#include <vppinfra/bitops.h> /* foreach_set_bit */
+#include <vppinfra/format.h>
+#include <vppinfra/error.h>
+
+/* Format unix network address family (e.g. AF_INET). */
+u8 * format_address_family (u8 * s, va_list * va)
+{
+  uword family = va_arg (*va, uword);
+  u8 * t = (u8 *) "UNKNOWN";
+  switch (family)
+    {
+#define _(x) case PF_##x: t = (u8 *) #x; break
+      _ (UNSPEC);
+      _ (UNIX);			/* Unix domain sockets 		*/
+      _ (INET);			/* Internet IP Protocol 	*/
+#ifdef PF_AX25
+      _ (AX25);			/* Amateur Radio AX.25 		*/
+#endif
+#ifdef PF_IPX
+      _ (IPX);			/* Novell IPX 			*/
+#endif
+#ifdef PF_APPLETALK
+      _ (APPLETALK);		/* AppleTalk DDP 		*/
+#endif
+#ifdef PF_NETROM
+      _ (NETROM);		/* Amateur Radio NET/ROM 	*/
+#endif
+#ifdef PF_BRIDGE
+      _ (BRIDGE);		/* Multiprotocol bridge 	*/
+#endif
+#ifdef PF_ATMPVC
+      _ (ATMPVC);		/* ATM PVCs			*/
+#endif
+#ifdef PF_X25
+      _ (X25);			/* Reserved for X.25 project 	*/
+#endif
+#ifdef PF_INET6
+      _ (INET6);		/* IP version 6			*/
+#endif
+#ifdef PF_ROSE
+      _ (ROSE);			/* Amateur Radio X.25 PLP	*/
+#endif
+#ifdef PF_DECnet
+      _ (DECnet);		/* Reserved for DECnet project	*/
+#endif
+#ifdef PF_NETBEUI
+      _ (NETBEUI);		/* Reserved for 802.2LLC project*/
+#endif
+#ifdef PF_SECURITY
+      _ (SECURITY);		/* Security callback pseudo AF */
+#endif
+#ifdef PF_KEY
+      _ (KEY);			/* PF_KEY key management API */
+#endif
+#ifdef PF_NETLINK
+      _ (NETLINK);
+#endif
+#ifdef PF_PACKET
+      _ (PACKET);		/* Packet family		*/
+#endif
+#ifdef PF_ASH
+      _ (ASH);			/* Ash				*/
+#endif
+#ifdef PF_ECONET
+      _ (ECONET);		/* Acorn Econet			*/
+#endif
+#ifdef PF_ATMSVC
+      _ (ATMSVC);		/* ATM SVCs			*/
+#endif
+#ifdef PF_SNA
+      _ (SNA);			/* Linux SNA Project */
+#endif
+#ifdef PF_IRDA
+      _ (IRDA);			/* IRDA sockets			*/
+#endif
+#undef _
+    }
+  vec_add (s, t, strlen ((char *) t));
+  return s;
+}
+
+u8 * format_network_protocol (u8 * s, va_list * args)
+{
+  uword family = va_arg (*args, uword);
+  uword protocol = va_arg (*args, uword);
+
+#ifndef __KERNEL__
+  struct protoent * p = getprotobynumber (protocol);
+
+  ASSERT (family == AF_INET);
+  if (p)
+    return format (s, "%s", p->p_name);
+  else
+    return format (s, "%d", protocol);
+#else
+  return format (s, "%d/%d", family, protocol);
+#endif
+}
+
+u8 * format_network_port (u8 * s, va_list * args)
+{
+  uword proto = va_arg (*args, uword);
+  uword port = va_arg (*args, uword);
+
+#ifndef __KERNEL__
+  struct servent * p = getservbyport (port, proto == IPPROTO_UDP ? "udp" : "tcp");
+
+  if (p)
+    return format (s, "%s", p->s_name);
+  else
+    return format (s, "%d", port);
+#else
+  return format (s, "%s/%d", proto == IPPROTO_UDP ? "udp" : "tcp", port);
+#endif
+}
+
+/* Format generic network address: takes two arguments family and address.
+   Assumes network byte order. */
+u8 * format_network_address (u8 * s, va_list * args)
+{
+  uword family = va_arg (*args, uword);
+  u8 * addr    = va_arg (*args, u8 *);
+
+  switch (family)
+    {
+    case AF_INET:
+      s = format (s, "%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
+      break;
+
+    case AF_UNSPEC:
+      /* We use AF_UNSPEC for ethernet addresses. */
+      s = format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+		  addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+      break;
+
+    default:
+      clib_error ("unsupported address family %d", family);
+    }
+
+  return s;
+}
+
+u8 * format_sockaddr (u8 * s, va_list * args)
+{
+  void * v = va_arg (*args, void *);
+  struct sockaddr * sa = v;
+
+  switch (sa->sa_family)
+    {
+    case AF_INET:
+      {
+	struct sockaddr_in * i = v;
+	s = format (s, "%U:%U",
+		    format_network_address, AF_INET, &i->sin_addr.s_addr,
+		    format_network_port, IPPROTO_TCP, ntohs (i->sin_port));
+      }
+      break;
+
+#ifndef __KERNEL__
+#ifdef AF_NETLINK
+    case AF_NETLINK:
+      {
+	struct sockaddr_nl * n = v;
+	s = format (s, "KERNEL-NETLINK");
+	if (n->nl_groups)
+	  s = format (s, " (groups 0x%x)", n->nl_groups);
+	break;
+      }
+#endif
+#endif
+
+    default:
+      s = format (s, "sockaddr family %d", sa->sa_family);
+      break;
+    }
+
+  return s;
+}
+
+u8 * format_tcp4_packet (u8 * s, va_list * args)
+{
+  u8 * p = va_arg (*args, u8 *);
+  struct iphdr * ip = (void *) p;
+  struct tcphdr * tcp = (void *) (ip + 1);
+
+  s = format (s, "tcp %U:%U -> %U:%U",
+	      format_network_address, AF_INET,  &ip->saddr,
+	      format_network_port, IPPROTO_TCP, ntohs (tcp->source),
+	      format_network_address, AF_INET,  &ip->daddr,
+	      format_network_port, IPPROTO_TCP, ntohs (tcp->dest));
+
+  s = format (s, ", seq 0x%08x -> 0x%08x", tcp->seq, tcp->ack_seq);
+#define _(f) if (tcp->f) s = format (s, ", " #f);
+  _ (syn); _ (ack); _ (fin); _ (rst); _ (psh); _ (urg);
+#undef _
+
+  if (tcp->window)
+    s = format (s, ", window 0x%04x", tcp->window);
+  if (tcp->urg)
+    s = format (s, ", urg 0x%04x", tcp->urg_ptr);
+
+  return s;
+}
+
+u8 * format_udp4_packet (u8 * s, va_list * args)
+{
+  u8 * p = va_arg (*args, u8 *);
+  struct iphdr * ip = (void *) p;
+  struct udphdr * udp = (void *) (ip + 1);
+
+  s = format (s, "udp %U:%U -> %U:%U",
+	      format_network_address, AF_INET,  &ip->saddr,
+	      format_network_port, IPPROTO_UDP, ntohs (udp->source),
+	      format_network_address, AF_INET,  &ip->daddr,
+	      format_network_port, IPPROTO_UDP, ntohs (udp->dest));
+
+  return s;
+}
+
+u8 * format_icmp4_type_and_code (u8 * s, va_list * args)
+{
+  uword icmp_type = va_arg (*args, uword);
+  uword icmp_code = va_arg (*args, uword);
+
+  switch (icmp_type)
+    {
+#define _(f,str) case ICMP_##f: s = format (s, str); break;
+      _ (ECHOREPLY, "echo reply");
+      _ (DEST_UNREACH, "unreachable");
+      _ (SOURCE_QUENCH, "source quench");
+      _ (REDIRECT, "redirect");
+      _ (ECHO, "echo request");
+      _ (TIME_EXCEEDED, "time exceeded");
+      _ (PARAMETERPROB, "parameter problem");
+      _ (TIMESTAMP, "timestamp request");
+      _ (TIMESTAMPREPLY, "timestamp reply");
+      _ (INFO_REQUEST, "information request");
+      _ (INFO_REPLY, "information reply");
+      _ (ADDRESS, "address mask request");
+      _ (ADDRESSREPLY, "address mask reply");
+#undef _
+    default:
+      s = format (s, "unknown type 0x%x", icmp_type);
+    }
+
+  if (icmp_type == ICMP_DEST_UNREACH)
+    {
+      switch (icmp_code)
+	{
+#define _(f,str) case ICMP_##f: s = format (s, " " # str); break;
+	  _ (NET_UNREACH, "network");
+	  _ (HOST_UNREACH, "host");
+	  _ (PROT_UNREACH, "protocol");
+	  _ (PORT_UNREACH, "port");
+	  _ (FRAG_NEEDED, ": fragmentation needed/DF set");
+	  _ (SR_FAILED, "source route failed");
+	  _ (NET_UNKNOWN, "network unknown");
+	  _ (HOST_UNKNOWN, "host unknown");
+	  _ (HOST_ISOLATED, "host isolated");
+	  _ (NET_ANO, "network: admin. prohibited");
+	  _ (HOST_ANO, "host: admin. prohibited");
+	  _ (NET_UNR_TOS, "network for type-of-service");
+	  _ (HOST_UNR_TOS, "host for type-of-service");
+	  _ (PKT_FILTERED, ": packet filtered");
+	  _ (PREC_VIOLATION, "precedence violation");
+	  _ (PREC_CUTOFF, "precedence cut off");
+#undef _
+	default:
+	  s = format (s, "unknown code 0x%x", icmp_code);
+	}
+    }
+  else if (icmp_type == ICMP_REDIRECT)
+    {
+      switch (icmp_code)
+	{
+#define _(f,str) case ICMP_##f: s = format (s, " " # str); break;
+	  _ (REDIR_NET, "network");
+	  _ (REDIR_HOST, "host");
+	  _ (REDIR_NETTOS, "network for type-of-service");
+	  _ (REDIR_HOSTTOS, "host for type-of-service");
+#undef _
+	default:
+	  s = format (s, "unknown code 0x%x", icmp_code);
+	}
+    }
+  else if (icmp_type == ICMP_TIME_EXCEEDED)
+    {
+      switch (icmp_code)
+	{
+#define _(f,str) case ICMP_##f: s = format (s, " " # str); break;
+	  _ (EXC_TTL, "time-to-live zero in transit");
+	  _ (EXC_FRAGTIME, "time-to-live zero during reassembly");
+#undef _
+	default:
+	  s = format (s, "unknown code 0x%x", icmp_code);
+	}
+    }
+
+  return s;
+}
+
+typedef struct {
+  u8 type;
+  u8 code;
+  u16 checksum;
+} icmp4_t;
+
+u8 * format_icmp4_packet (u8 * s, va_list * args)
+{
+  u8 * p = va_arg (*args, u8 *);
+  struct iphdr * ip = (void *) p;
+  icmp4_t * icmp = (void *) (ip + 1);
+  s = format (s, "icmp %U %U -> %U",
+	      format_icmp4_type_and_code, icmp->type, icmp->code,
+	      format_network_address, AF_INET,  &ip->saddr,
+	      format_network_address, AF_INET,  &ip->daddr);
+
+  return s;
+}
+
+u8 * format_ip4_tos_byte (u8 * s, va_list * args)
+{
+  uword tos = va_arg (*args, uword);
+
+  if (tos & IPTOS_LOWDELAY)
+    s = format (s, "minimize-delay, ");
+  if (tos & IPTOS_MINCOST)
+    s = format (s, "minimize-cost, ");
+  if (tos & IPTOS_THROUGHPUT)
+    s = format (s, "maximize-throughput, ");
+  if (tos & IPTOS_RELIABILITY)
+    s = format (s, "maximize-reliability, ");
+
+  switch (IPTOS_PREC (tos))
+    {
+#define _(x,y) case IPTOS_PREC_##x: s = format (s, y); break
+      _ (NETCONTROL, "network");
+      _ (INTERNETCONTROL, "internet");
+      _ (CRITIC_ECP, "critical");
+      _ (FLASH, "flash");
+      _ (FLASHOVERRIDE, "flash-override");
+      _ (IMMEDIATE, "immediate");
+      _ (PRIORITY, "priority");
+      _ (ROUTINE, "routine");
+#undef _
+    }
+
+  return s;
+}
+
+u8 * format_ip4_packet (u8 * s, va_list * args)
+{
+  u8 * p = va_arg (*args, u8 *);
+  struct iphdr * ip = (void *) p;
+
+  static format_function_t * f[256];
+
+  if (! f[IPPROTO_TCP])
+    {
+      f[IPPROTO_TCP] = format_tcp4_packet;
+      f[IPPROTO_UDP] = format_udp4_packet;
+      f[IPPROTO_ICMP] = format_icmp4_packet;
+    }
+
+  if (f[ip->protocol])
+    return format (s, "%U", f[ip->protocol], p);
+
+  s = format (s, "%U: %U -> %U",
+	      format_network_protocol, AF_INET, ip->protocol,
+	      format_network_address, AF_INET,  &ip->saddr,
+	      format_network_address, AF_INET,  &ip->daddr);
+
+  return s;
+}
+
+#define foreach_unix_arphrd_type		\
+  _ (NETROM, 0)					\
+  _ (ETHER, 1)					\
+  _ (EETHER, 2)					\
+  _ (AX25, 3)					\
+  _ (PRONET, 4)					\
+  _ (CHAOS, 5)					\
+  _ (IEEE802, 6)				\
+  _ (ARCNET, 7)					\
+  _ (APPLETLK, 8)				\
+  _ (DLCI, 15)					\
+  _ (ATM, 19)					\
+  _ (METRICOM, 23)				\
+  _ (IEEE1394, 24)				\
+  _ (EUI64, 27)					\
+  _ (INFINIBAND, 32)				\
+  _ (SLIP, 256)					\
+  _ (CSLIP, 257)				\
+  _ (SLIP6, 258)				\
+  _ (CSLIP6, 259)				\
+  _ (RSRVD, 260)				\
+  _ (ADAPT, 264)				\
+  _ (ROSE, 270)					\
+  _ (X25, 271)					\
+  _ (HWX25, 272)				\
+  _ (PPP, 512)					\
+  _ (HDLC, 513)					\
+  _ (LAPB, 516)					\
+  _ (DDCMP, 517)				\
+  _ (RAWHDLC, 518)				\
+  _ (TUNNEL, 768)				\
+  _ (TUNNEL6, 769)				\
+  _ (FRAD, 770)					\
+  _ (SKIP, 771)					\
+  _ (LOOPBACK, 772)				\
+  _ (LOCALTLK, 773)				\
+  _ (FDDI, 774)					\
+  _ (BIF, 775)					\
+  _ (SIT, 776)					\
+  _ (IPDDP, 777)				\
+  _ (IPGRE, 778)				\
+  _ (PIMREG, 779)				\
+  _ (HIPPI, 780)				\
+  _ (ASH, 781)					\
+  _ (ECONET, 782)				\
+  _ (IRDA, 783)					\
+  _ (FCPP, 784)					\
+  _ (FCAL, 785)					\
+  _ (FCPL, 786)					\
+  _ (FCFABRIC, 787)				\
+  _ (IEEE802_TR, 800)				\
+  _ (IEEE80211, 801)				\
+  _ (IEEE80211_PRISM, 802)			\
+  _ (IEEE80211_RADIOTAP, 803)			\
+  _ (VOID, 0xFFFF)				\
+  _ (NONE, 0xFFFE)
+
+u8 * format_unix_arphrd (u8 * s, va_list * args)
+{
+#ifndef __COVERITY__ /* doesn't understand this at all... */
+  u32 x = va_arg (*args, u32);
+  char * t;
+  switch (x)
+    {
+#define _(f,n) case ARPHRD_##f: t = #f; break;
+      foreach_unix_arphrd_type
+#undef _
+    default:
+      t = 0;
+      break;
+    }
+
+  if (t)
+    s = format (s, "%s", t);
+  else
+    s = format (s, "unknown 0x%x", x);
+#endif
+  return s;
+}
+
+#define foreach_unix_interface_flag		\
+  _ (up)					\
+  _ (broadcast)					\
+  _ (debug)					\
+  _ (loopback)					\
+  _ (pointopoint)				\
+  _ (notrailers)				\
+  _ (running)					\
+  _ (noarp)					\
+  _ (promisc)					\
+  _ (allmulti)					\
+  _ (master)					\
+  _ (slave)					\
+  _ (multicast)					\
+  _ (portsel)					\
+  _ (automedia)					\
+  _ (dynamic)					\
+  _ (lower_up)					\
+  _ (dormant)					\
+  _ (echo)
+
+static char * unix_interface_flag_names[] = {
+#define _(f) #f,
+  foreach_unix_interface_flag
+#undef _
+};
+
+u8 * format_unix_interface_flags (u8 * s, va_list * args)
+{
+  u32 x = va_arg (*args, u32);
+  u32 i;
+
+  if (x == 0)
+    s = format (s, "none");
+  else foreach_set_bit (i, x, ({
+    if (i < ARRAY_LEN (unix_interface_flag_names))
+      s = format (s, "%s", unix_interface_flag_names[i]);
+    else
+      s = format (s, "unknown %d", i);
+    if (x >> (i + 1))
+      s = format (s, ", ");
+  }));
+  return s;
+}
+
+typedef struct {
+  u16 ar_hrd;			/* format of hardware address	*/
+  u16 ar_pro;			/* format of protocol address	*/
+  u8  ar_hln;			/* length of hardware address	*/
+  u8  ar_pln;			/* length of protocol address	*/
+  u16 ar_op;			/* ARP opcode (command)		*/
+  u8  ar_sha[6];		/* sender hardware address	*/
+  u8  ar_spa[4];		/* sender IP address		*/
+  u8  ar_tha[6];		/* target hardware address	*/
+  u8  ar_tpa[4];		/* target IP address		*/
+} arp_ether_ip4_t;
+
+u8 * format_arp_packet (u8 * s, va_list * args)
+{
+  arp_ether_ip4_t * a = va_arg (*args, arp_ether_ip4_t *);
+  char * op = "unknown";
+
+  if (a->ar_pro != ETH_P_IP ||
+      a->ar_hrd != ARPHRD_ETHER)
+    return s;
+
+  switch (a->ar_op)
+    {
+#define _(f) case ARPOP_##f: op = #f; break;
+      _ (REQUEST);
+      _ (REPLY);
+      _ (RREQUEST);
+      _ (RREPLY);
+#undef _
+    }
+
+  s = format (s, "%s %U %U -> %U %U",
+	      op,
+	      format_network_address, AF_INET,   a->ar_spa,
+	      format_network_address, AF_UNSPEC, a->ar_sha,
+	      format_network_address, AF_INET,   a->ar_tpa,
+	      format_network_address, AF_UNSPEC, a->ar_tha);
+  return s;
+}
+
+u8 * format_ethernet_proto (u8 * s, va_list * args)
+{
+  uword type = va_arg (*args, uword);
+  char * t = 0;
+
+  switch (type)
+    {
+    case 0: t = "BPDU"; break;
+#define _(f) case ETH_P_##f: t = #f; break;
+      _ (LOOP);
+      _ (PUP);
+#ifdef ETH_P_PUPAT
+      _ (PUPAT);
+#endif
+      _ (IP);
+      _ (X25);
+      _ (ARP);
+      _ (BPQ);
+#ifdef ETH_P_PUPAT
+      _ (IEEEPUP);
+      _ (IEEEPUPAT);
+#endif
+      _ (DEC);
+      _ (DNA_DL);
+      _ (DNA_RC);
+      _ (DNA_RT);
+      _ (LAT);
+      _ (DIAG);
+      _ (CUST);
+      _ (SCA);
+      _ (RARP);
+      _ (ATALK);
+      _ (AARP);
+      _ (IPX);
+      _ (IPV6);
+#ifdef ETH_P_PPP_DISC
+      _ (PPP_DISC);
+      _ (PPP_SES);
+#endif
+#ifdef ETH_P_ATMMPOA
+      _ (ATMMPOA);
+      _ (ATMFATE);
+#endif
+      _ (802_3);
+      _ (AX25);
+      _ (ALL);
+      _ (802_2);
+      _ (SNAP);
+      _ (DDCMP);
+      _ (WAN_PPP);
+      _ (PPP_MP);
+      _ (LOCALTALK);
+      _ (PPPTALK);
+      _ (TR_802_2);
+      _ (MOBITEX);
+      _ (CONTROL);
+      _ (IRDA);
+#ifdef ETH_P_ECONET
+      _ (ECONET);
+#endif
+#undef _
+    }
+
+  if (t)
+    vec_add (s, t, strlen (t));
+  else
+    s = format (s, "ether-type 0x%x", type);
+  return s;
+}
+
+u8 * format_ethernet_packet (u8 * s, va_list * args)
+{
+  struct ethhdr * h = va_arg (*args, struct ethhdr *);
+  uword proto = h->h_proto;
+  u8 * payload = (void *) (h + 1);
+  uword indent;
+
+  /* Check for 802.2/802.3 encapsulation. */
+  if (proto < ETH_DATA_LEN)
+    {
+      typedef struct {
+	u8 dsap, ssap, control;
+	u8 orig_code[3];
+	u16 proto;
+      } ethhdr_802_t;
+      ethhdr_802_t * h1 = (void *) (h + 1);
+      proto = h1->proto;
+      payload = (void *) (h1 + 1);
+    }
+
+  indent = format_get_indent (s);
+
+  s = format (s, "%U: %U -> %U",
+	      format_ethernet_proto, proto,
+	      format_network_address, AF_UNSPEC, h->h_source,
+	      format_network_address, AF_UNSPEC, h->h_dest);
+
+  switch (proto)
+    {
+    case ETH_P_ARP:
+      s = format (s, "\n%U%U",
+		  format_white_space, indent,
+		  format_arp_packet, payload);
+      break;
+    }
+
+  return s;
+}
+
+#ifndef __KERNEL__
+u8 * format_hostname (u8 * s, va_list * args)
+{
+  char buffer[1024];
+  char * b = buffer;
+  if (gethostname (b, sizeof (buffer)) < 0)
+    b = "noname";
+  return format (s, "%s", b);
+}
+#endif
+
+#ifndef __KERNEL__
+u8 * format_timeval (u8 * s, va_list * args)
+{
+  char * fmt = va_arg (*args, char *);
+  struct timeval * tv = va_arg (*args, struct timeval *);
+  struct tm * tm;
+  word msec;
+  char * f, c;
+
+  if (! fmt)
+    fmt = "y/m/d H:M:S:F";
+
+  if (! tv)
+    {
+      static struct timeval now;
+      gettimeofday (&now, 0);
+      tv = &now;
+    }
+
+  msec = flt_round_nearest (1e-3 * tv->tv_usec);
+  if (msec >= 1000)
+    { msec = 0; tv->tv_sec++; }
+
+  {
+    time_t t = tv->tv_sec;
+    tm = localtime (&t);
+  }
+
+  for (f = fmt; *f; f++)
+    {
+      uword what;
+      char * what_fmt = "%d";
+
+      switch (c = *f)
+	{
+	default:
+	  vec_add1 (s, c);
+	  continue;
+
+	case 'y':
+	  what = 1900 + tm->tm_year;
+	  what_fmt = "%4d";
+	  break;
+	case 'm':
+	  what = tm->tm_mon + 1;
+	  what_fmt = "%2d";
+	  break;
+	case 'd':
+	  what = tm->tm_mday;
+	  what_fmt = "%2d";
+	  break;
+	case 'H':
+	  what = tm->tm_hour;
+	  what_fmt = "%02d";
+	  break;
+	case 'M':
+	  what = tm->tm_min;
+	  what_fmt = "%02d";
+	  break;
+	case 'S':
+	  what = tm->tm_sec;
+	  what_fmt = "%02d";
+	  break;
+	case 'F':
+	  what = msec;
+	  what_fmt = "%03d";
+	  break;
+	}
+
+      s = format (s, what_fmt, what);
+    }
+
+  return s;
+}
+
+u8 * format_time_float (u8 * s, va_list * args)
+{
+  u8 * fmt = va_arg (*args, u8 *);
+  f64 t = va_arg (*args, f64);
+  struct timeval tv;
+  if (t <= 0)
+    t = unix_time_now ();
+  tv.tv_sec = t;
+  tv.tv_usec = 1e6*(t - tv.tv_sec);
+  return format (s, "%U", format_timeval, fmt, &tv);
+}
+
+u8 * format_signal (u8 * s, va_list * args)
+{
+  uword signum = va_arg (*args, uword);
+  char * t = 0;
+  switch (signum)
+    {
+#define _(x) case x: t = #x; break;
+      _ (SIGHUP);
+      _ (SIGINT);
+      _ (SIGQUIT);
+      _ (SIGILL);
+      _ (SIGTRAP);
+      _ (SIGABRT);
+      _ (SIGBUS);
+      _ (SIGFPE);
+      _ (SIGKILL);
+      _ (SIGUSR1);
+      _ (SIGSEGV);
+      _ (SIGUSR2);
+      _ (SIGPIPE);
+      _ (SIGALRM);
+      _ (SIGTERM);
+#ifdef SIGSTKFLT
+      _ (SIGSTKFLT);
+#endif
+      _ (SIGCHLD);
+      _ (SIGCONT);
+      _ (SIGSTOP);
+      _ (SIGTSTP);
+      _ (SIGTTIN);
+      _ (SIGTTOU);
+      _ (SIGURG);
+      _ (SIGXCPU);
+      _ (SIGXFSZ);
+      _ (SIGVTALRM);
+      _ (SIGPROF);
+      _ (SIGWINCH);
+      _ (SIGIO);
+      _ (SIGPWR);
+#ifdef SIGSYS
+      _ (SIGSYS);
+#endif
+#undef _
+    default:
+      return format (s, "unknown %d", signum);
+    }
+
+  vec_add (s, t, strlen (t));
+  return s;
+}
+
+u8 * format_ucontext_pc (u8 * s, va_list * args)
+{
+  ucontext_t * uc __attribute__((unused));
+  unsigned long * regs = 0;
+  uword reg_no = 0;
+
+  uc = va_arg (*args, ucontext_t *);
+
+#if defined (powerpc)
+  regs = &uc->uc_mcontext.uc_regs->gregs[0];
+#elif defined (powerpc64)
+  regs = &uc->uc_mcontext.uc_regs->gp_regs[0];
+#elif defined (i386) || defined (__x86_64__)
+  regs = (void *) &uc->uc_mcontext.gregs[0];
+#endif
+
+#if defined (powerpc) || defined (powerpc64)
+  reg_no = PT_NIP;
+#elif defined (i386)
+  reg_no = REG_EIP;
+#elif defined (__x86_64__)
+  reg_no = REG_RIP;
+#else
+  reg_no = 0;
+  regs = 0;
+#endif
+
+  if (! regs)
+    return format (s, "unsupported");
+  else
+    return format (s, "%p", regs[reg_no]);
+}
+
+#endif /* __KERNEL__ */
diff --git a/src/vppinfra/unix-kelog.c b/src/vppinfra/unix-kelog.c
new file mode 100644
index 00000000..88428ee8
--- /dev/null
+++ b/src/vppinfra/unix-kelog.c
@@ -0,0 +1,415 @@
+/*
+  Copyright (c) 2010 Cisco and/or its affiliates.
+
+  * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#include <vppinfra/error.h>
+#include <vppinfra/unix.h>
+#include <vppinfra/elog.h>
+#include <vppinfra/format.h>
+#include <vppinfra/os.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <time.h>
+
+typedef enum
+{
+  RUNNING = 0,
+  WAKEUP,
+} sched_event_type_t;
+
+typedef struct
+{
+  u32 cpu;
+  u8 *task;
+  u32 pid;
+  f64 timestamp;
+  sched_event_type_t type;
+} sched_event_t;
+
+void
+kelog_init (elog_main_t * em, char *kernel_tracer, u32 n_events)
+{
+  int enable_fd, current_tracer_fd, data_fd;
+  int len;
+  struct timespec ts, ts2;
+  char *trace_enable = "/debug/tracing/tracing_enabled";
+  char *current_tracer = "/debug/tracing/current_tracer";
+  char *trace_data = "/debug/tracing/trace";
+  f64 realtime, monotonic;
+  f64 freq, secs_per_clock;
+
+  ASSERT (kernel_tracer);
+
+  /*$$$$ fixme */
+  n_events = 1 << 18;
+
+  /* init first so we won't hurt ourselves if we bail */
+  elog_init (em, n_events);
+
+  enable_fd = open (trace_enable, O_RDWR);
+  if (enable_fd < 0)
+    {
+      clib_warning ("Couldn't open %s", trace_enable);
+      return;
+    }
+  /* disable kernel tracing */
+  if (write (enable_fd, "0\n", 2) != 2)
+    {
+      clib_unix_warning ("disable tracing");
+      close (enable_fd);
+      return;
+    }
+
+  /*
+   * open + clear the data buffer.
+   * see .../linux/kernel/trace/trace.c:tracing_open()
+   */
+  data_fd = open (trace_data, O_RDWR | O_TRUNC);
+  if (data_fd < 0)
+    {
+      clib_warning ("Couldn't open+clear %s", trace_data);
+      return;
+    }
+  close (data_fd);
+
+  /* configure tracing */
+  current_tracer_fd = open (current_tracer, O_RDWR);
+
+  if (current_tracer_fd < 0)
+    {
+      clib_warning ("Couldn't open %s", current_tracer);
+      close (enable_fd);
+      return;
+    }
+
+  len = strlen (kernel_tracer);
+
+  if (write (current_tracer_fd, kernel_tracer, len) != len)
+    {
+      clib_unix_warning ("configure trace");
+      close (current_tracer_fd);
+      close (enable_fd);
+      return;
+    }
+
+  close (current_tracer_fd);
+
+  /*
+   * The kernel event log uses CLOCK_MONOTONIC timestamps,
+   * not CLOCK_REALTIME timestamps. These differ by a constant
+   * but the constant is not available in user mode.
+   * This estimate will be off by one syscall round-trip.
+   */
+  clib_time_init (&em->cpu_timer);
+  em->init_time.cpu = em->cpu_timer.init_cpu_time;
+  syscall (SYS_clock_gettime, CLOCK_MONOTONIC, &ts);
+
+  /* enable kernel tracing */
+  if (write (enable_fd, "1\n", 2) != 2)
+    {
+      clib_unix_warning ("enable tracing");
+      close (enable_fd);
+      return;
+    }
+
+  close (enable_fd);
+}
+
+
+u8 *
+format_sched_event (u8 * s, va_list * va)
+{
+  sched_event_t *e = va_arg (*va, sched_event_t *);
+
+  s = format (s, "cpu %d task %10s type %s timestamp %12.6f\n",
+	      e->cpu, e->task, e->type ? "WAKEUP " : "RUNNING", e->timestamp);
+
+  return s;
+}
+
+sched_event_t *
+parse_sched_switch_trace (u8 * tdata, u32 * index)
+{
+  u8 *cp = tdata + *index;
+  u8 *limit = tdata + vec_len (tdata);
+  int colons;
+  static sched_event_t event;
+  sched_event_t *e = &event;
+  static u8 *task_name;
+  u32 secs, usecs;
+  int i;
+
+again:
+  /* eat leading w/s */
+  while (cp < limit && (*cp == ' ' && *cp == '\t'))
+    cp++;
+  if (cp == limit)
+    return 0;
+
+  /* header line */
+  if (*cp == '#')
+    {
+      while (cp < limit && (*cp != '\n'))
+	cp++;
+      if (*cp == '\n')
+	{
+	  cp++;
+	  goto again;
+	}
+      clib_warning ("bugger 0");
+      return 0;
+    }
+
+  while (cp < limit && *cp != ']')
+    cp++;
+
+  if (*cp == 0)
+    return 0;
+
+  if (*cp != ']')
+    {
+      clib_warning ("bugger 0.1");
+      return 0;
+    }
+
+  cp++;
+  while (cp < limit && (*cp == ' ' && *cp == '\t'))
+    cp++;
+  if (cp == limit)
+    {
+      clib_warning ("bugger 0.2");
+      return 0;
+    }
+
+  secs = atoi (cp);
+
+  while (cp < limit && (*cp != '.'))
+    cp++;
+
+  if (cp == limit)
+    {
+      clib_warning ("bugger 0.3");
+      return 0;
+    }
+
+  cp++;
+
+  usecs = atoi (cp);
+
+  e->timestamp = ((f64) secs) + ((f64) usecs) * 1e-6;
+
+  /* eat up to third colon */
+  for (i = 0; i < 3; i++)
+    {
+      while (cp < limit && *cp != ':')
+	cp++;
+      cp++;
+    }
+  --cp;
+  if (*cp != ':')
+    {
+      clib_warning ("bugger 1");
+      return 0;
+    }
+  /* aim at '>' (switch-to) / '+' (wakeup) */
+  cp += 5;
+  if (cp >= limit)
+    {
+      clib_warning ("bugger 2");
+      return 0;
+    }
+  if (*cp == '>')
+    e->type = RUNNING;
+  else if (*cp == '+')
+    e->type = WAKEUP;
+  else
+    {
+      clib_warning ("bugger 3");
+      return 0;
+    }
+
+  cp += 3;
+  if (cp >= limit)
+    {
+      clib_warning ("bugger 4");
+      return 0;
+    }
+
+  e->cpu = atoi (cp);
+  cp += 4;
+
+  if (cp >= limit)
+    {
+      clib_warning ("bugger 4");
+      return 0;
+    }
+  while (cp < limit && (*cp == ' ' || *cp == '\t'))
+    cp++;
+
+  e->pid = atoi (cp);
+
+  for (i = 0; i < 2; i++)
+    {
+      while (cp < limit && *cp != ':')
+	cp++;
+      cp++;
+    }
+  --cp;
+  if (*cp != ':')
+    {
+      clib_warning ("bugger 5");
+      return 0;
+    }
+
+  cp += 3;
+  if (cp >= limit)
+    {
+      clib_warning ("bugger 6");
+      return 0;
+    }
+  while (cp < limit && (*cp != ' ' && *cp != '\n'))
+    {
+      vec_add1 (task_name, *cp);
+      cp++;
+    }
+  vec_add1 (task_name, 0);
+  /* _vec_len() = 0 in caller */
+  e->task = task_name;
+
+  if (cp < limit)
+    cp++;
+
+  *index = cp - tdata;
+  return e;
+}
+
+static u32
+elog_id_for_pid (elog_main_t * em, u8 * name, u32 pid)
+{
+  uword *p, r;
+  mhash_t *h = &em->string_table_hash;
+
+  if (!em->string_table_hash.hash)
+    mhash_init (h, sizeof (uword), sizeof (pid));
+
+  p = mhash_get (h, &pid);
+  if (p)
+    return p[0];
+  r = elog_string (em, "%s(%d)", name, pid);
+  mhash_set (h, &pid, r, /* old_value */ 0);
+  return r;
+}
+
+void
+kelog_collect_sched_switch_trace (elog_main_t * em)
+{
+  int enable_fd, data_fd;
+  char *trace_enable = "/debug/tracing/tracing_enabled";
+  char *trace_data = "/debug/tracing/trace";
+  u8 *data = 0;
+  u8 *dp;
+  int bytes, total_bytes;
+  u32 pos;
+  sched_event_t *evt;
+  u64 nsec_to_add;
+  u32 index;
+  f64 clocks_per_sec;
+
+  enable_fd = open (trace_enable, O_RDWR);
+  if (enable_fd < 0)
+    {
+      clib_warning ("Couldn't open %s", trace_enable);
+      return;
+    }
+  /* disable kernel tracing */
+  if (write (enable_fd, "0\n", 2) != 2)
+    {
+      clib_unix_warning ("disable tracing");
+      close (enable_fd);
+      return;
+    }
+  close (enable_fd);
+
+  /* Read the trace data */
+  data_fd = open (trace_data, O_RDWR);
+  if (data_fd < 0)
+    {
+      clib_warning ("Couldn't open %s", trace_data);
+      return;
+    }
+
+  /*
+   * Extract trace into a vector. Note that seq_printf() [kernel]
+   * is not guaranteed to produce 4096 bytes at a time.
+   */
+  vec_validate (data, 4095);
+  total_bytes = 0;
+  pos = 0;
+  while (1)
+    {
+      bytes = read (data_fd, data + pos, 4096);
+      if (bytes <= 0)
+	break;
+
+      total_bytes += bytes;
+      _vec_len (data) = total_bytes;
+
+      pos = vec_len (data);
+      vec_validate (data, vec_len (data) + 4095);
+    }
+  vec_add1 (data, 0);
+
+  /* Synthesize events */
+  em->is_enabled = 1;
+
+  index = 0;
+  while ((evt = parse_sched_switch_trace (data, &index)))
+    {
+      u64 fake_cpu_clock;
+
+      fake_cpu_clock = evt->timestamp * em->cpu_timer.clocks_per_second;
+      {
+	ELOG_TYPE_DECLARE (e) =
+	{
+	  .format = "%d: %s %s",.format_args = "i4T4t4",.n_enum_strings =
+	    2,.enum_strings =
+	  {
+	  "running", "wakeup",}
+	,};
+	struct
+	{
+	  u32 cpu, string_table_offset, which;
+	} *ed;
+
+	ed = elog_event_data_not_inline (em, &__ELOG_TYPE_VAR (e),
+					 &em->default_track, fake_cpu_clock);
+	ed->cpu = evt->cpu;
+	ed->string_table_offset = elog_id_for_pid (em, evt->task, evt->pid);
+	ed->which = evt->type;
+      }
+      _vec_len (evt->task) = 0;
+    }
+  em->is_enabled = 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/unix-misc.c b/src/vppinfra/unix-misc.c
new file mode 100644
index 00000000..2928369d
--- /dev/null
+++ b/src/vppinfra/unix-misc.c
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/error.h>
+#include <vppinfra/os.h>
+#include <vppinfra/unix.h>
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/uio.h>		/* writev */
+#include <fcntl.h>
+#include <stdio.h>		/* for sprintf */
+
+clib_error_t *
+unix_file_n_bytes (char *file, uword * result)
+{
+  struct stat s;
+
+  if (stat (file, &s) < 0)
+    return clib_error_return_unix (0, "stat `%s'", file);
+
+  if (S_ISREG (s.st_mode))
+    *result = s.st_size;
+  else
+    *result = 0;
+
+  return /* no error */ 0;
+}
+
+clib_error_t *
+unix_file_read_contents (char *file, u8 * result, uword n_bytes)
+{
+  int fd = -1;
+  uword n_done, n_left;
+  clib_error_t *error = 0;
+  u8 *v = result;
+
+  if ((fd = open (file, 0)) < 0)
+    return clib_error_return_unix (0, "open `%s'", file);
+
+  n_left = n_bytes;
+  n_done = 0;
+  while (n_left > 0)
+    {
+      int n_read;
+      if ((n_read = read (fd, v + n_done, n_left)) < 0)
+	{
+	  error = clib_error_return_unix (0, "open `%s'", file);
+	  goto done;
+	}
+
+      /* End of file. */
+      if (n_read == 0)
+	break;
+
+      n_left -= n_read;
+      n_done += n_read;
+    }
+
+  if (n_left > 0)
+    {
+      error =
+	clib_error_return (0,
+			   " `%s' expected to read %wd bytes; read only %wd",
+			   file, n_bytes, n_bytes - n_left);
+      goto done;
+    }
+
+done:
+  close (fd);
+  return error;
+}
+
+clib_error_t *
+unix_file_contents (char *file, u8 ** result)
+{
+  uword n_bytes;
+  clib_error_t *error = 0;
+  u8 *v;
+
+  if ((error = unix_file_n_bytes (file, &n_bytes)))
+    return error;
+
+  v = 0;
+  vec_resize (v, n_bytes);
+
+  error = unix_file_read_contents (file, v, n_bytes);
+
+  if (error)
+    vec_free (v);
+  else
+    *result = v;
+
+  return error;
+}
+
+clib_error_t *
+unix_proc_file_contents (char *file, u8 ** result)
+{
+  u8 *rv = 0;
+  uword pos;
+  int bytes, fd;
+
+  /* Unfortunately, stat(/proc/XXX) returns zero... */
+  fd = open (file, O_RDONLY);
+
+  if (fd < 0)
+    return clib_error_return_unix (0, "open `%s'", file);
+
+  vec_validate (rv, 4095);
+  pos = 0;
+  while (1)
+    {
+      bytes = read (fd, rv + pos, 4096);
+      if (bytes < 0)
+	{
+	  close (fd);
+	  vec_free (rv);
+	  return clib_error_return_unix (0, "read '%s'", file);
+	}
+
+      if (bytes == 0)
+	{
+	  _vec_len (rv) = pos;
+	  break;
+	}
+      pos += bytes;
+      vec_validate (rv, pos + 4095);
+    }
+  *result = rv;
+  close (fd);
+  return 0;
+}
+
+void os_panic (void) __attribute__ ((weak));
+
+void
+os_panic (void)
+{
+  abort ();
+}
+
+void os_exit (int) __attribute__ ((weak));
+
+void
+os_exit (int code)
+{
+  exit (code);
+}
+
+void os_puts (u8 * string, uword string_length, uword is_error)
+  __attribute__ ((weak));
+
+void
+os_puts (u8 * string, uword string_length, uword is_error)
+{
+  int cpu = os_get_cpu_number ();
+  int ncpus = os_get_ncpus ();
+  char buf[64];
+  int fd = is_error ? 2 : 1;
+  struct iovec iovs[2];
+  int n_iovs = 0;
+
+  if (ncpus > 1)
+    {
+      snprintf (buf, sizeof (buf), "%d: ", cpu);
+
+      iovs[n_iovs].iov_base = buf;
+      iovs[n_iovs].iov_len = strlen (buf);
+      n_iovs++;
+    }
+
+  iovs[n_iovs].iov_base = string;
+  iovs[n_iovs].iov_len = string_length;
+  n_iovs++;
+
+  if (writev (fd, iovs, n_iovs) < 0)
+    ;
+}
+
+void os_out_of_memory (void) __attribute__ ((weak));
+void
+os_out_of_memory (void)
+{
+  os_panic ();
+}
+
+uword os_get_cpu_number (void) __attribute__ ((weak));
+uword
+os_get_cpu_number (void)
+{
+  return 0;
+}
+
+uword os_get_ncpus (void) __attribute__ ((weak));
+uword
+os_get_ncpus (void)
+{
+  return 1;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/unix.h b/src/vppinfra/unix.h
new file mode 100644
index 00000000..29114cfe
--- /dev/null
+++ b/src/vppinfra/unix.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_unix_h
+#define included_clib_unix_h
+
+#include <vppinfra/error.h>
+
+/* Number of bytes in a Unix file. */
+clib_error_t *unix_file_n_bytes (char *file, uword * result);
+
+/* Read file contents into given buffer. */
+clib_error_t *unix_file_read_contents (char *file, u8 * result,
+				       uword n_bytes);
+
+/* Read and return contents of Unix file. */
+clib_error_t *unix_file_contents (char *file, u8 ** result);
+
+/* As above but for /proc file system on Linux. */
+clib_error_t *unix_proc_file_contents (char *file, u8 ** result);
+
+#endif /* included_clib_unix_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/unix_error.def b/src/vppinfra/unix_error.def
new file mode 100644
index 00000000..76633dbb
--- /dev/null
+++ b/src/vppinfra/unix_error.def
@@ -0,0 +1,145 @@
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+_ (EPERM, "Operation not permitted")
+_ (ENOENT, "No such file or directory")
+_ (ESRCH, "No such process")
+_ (EINTR, "Interrupted system call")
+_ (EIO, "I/O error")
+_ (ENXIO, "No such device or address")
+_ (E2BIG, "Arg list too long")
+_ (ENOEXEC, "Exec format error")
+_ (EBADF, "Bad file number")
+_ (ECHILD, "No child processes")
+_ (ENOMEM, "Out of memory")
+_ (EACCES, "Permission denied")
+_ (EFAULT, "Bad address")
+_ (ENOTBLK, "Block device required")
+_ (EBUSY, "Device or resource busy")
+_ (EEXIST, "File exists")
+_ (EXDEV, "Cross-device link")
+_ (ENODEV, "No such device")
+_ (ENOTDIR, "Not a directory")
+_ (EISDIR, "Is a directory")
+_ (EINVAL, "Invalid argument")
+_ (ENFILE, "File table overflow")
+_ (EMFILE, "Too many open files")
+_ (ENOTTY, "Not a typewriter")
+_ (ETXTBSY, "Text file busy")
+_ (EFBIG, "File too large")
+_ (ENOSPC, "No space left on device")
+_ (ESPIPE, "Illegal seek")
+_ (EROFS, "Read-only file system")
+_ (EMLINK, "Too many links")
+_ (EPIPE, "Broken pipe")
+_ (EDOM, "Math argument out of domain of func")
+_ (ERANGE, "Math result not representable")
+_ (EDEADLK, "Resource deadlock would occur")
+_ (ENAMETOOLONG, "File name too long")
+_ (ENOLCK, "No record locks available")
+_ (ENOSYS, "Function not implemented")
+_ (ENOTEMPTY, "Directory not empty")
+_ (ELOOP, "Too many symbolic links encountered")
+_ (EWOULDBLOCK, "Operation would block")
+_ (ENOMSG, "No message of desired type")
+_ (EIDRM, "Identifier removed")
+_ (ECHRNG, "Channel number out of range")
+_ (EL2NSYNC, "Level 2 not synchronized")
+_ (EL3HLT, "Level 3 halted")
+_ (EL3RST, "Level 3 reset")
+_ (ELNRNG, "Link number out of range")
+_ (EUNATCH, "Protocol driver not attached")
+_ (ENOCSI, "No CSI structure available")
+_ (EL2HLT, "Level 2 halted")
+_ (EBADE, "Invalid exchange")
+_ (EBADR, "Invalid request descriptor")
+_ (EXFULL, "Exchange full")
+_ (ENOANO, "No anode")
+_ (EBADRQC, "Invalid request code")
+_ (EBADSLT, "Invalid slot")
+_ (EBFONT, "Bad font file format")
+_ (ENOSTR, "Device not a stream")
+_ (ENODATA, "No data available")
+_ (ETIME, "Timer expired")
+_ (ENOSR, "Out of streams resources")
+_ (ENONET, "Machine is not on the network")
+_ (ENOPKG, "Package not installed")
+_ (EREMOTE, "Object is remote")
+_ (ENOLINK, "Link has been severed")
+_ (EADV, "Advertise error")
+_ (ESRMNT, "Srmount error")
+_ (ECOMM, "Communication error on send")
+_ (EPROTO, "Protocol error")
+_ (EMULTIHOP, "Multihop attempted")
+_ (EDOTDOT, "RFS specific error")
+_ (EBADMSG, "Not a data message")
+_ (EOVERFLOW, "Value too large for defined data type")
+_ (ENOTUNIQ, "Name not unique on network")
+_ (EBADFD, "File descriptor in bad state")
+_ (EREMCHG, "Remote address changed")
+_ (ELIBACC, "Can not access a needed shared library")
+_ (ELIBBAD, "Accessing a corrupted shared library")
+_ (ELIBSCN, "lib section in a.out corrupted")
+_ (ELIBMAX, "Attempting to link in too many shared libraries")
+_ (ELIBEXEC, "Cannot exec a shared library directly")
+_ (EILSEQ, "Illegal byte sequence")
+_ (ERESTART, "Interrupted system call should be restarted")
+_ (ESTRPIPE, "Streams pipe error")
+_ (EUSERS, "Too many users")
+_ (ENOTSOCK, "Socket operation on non-socket")
+_ (EDESTADDRREQ, "Destination address required")
+_ (EMSGSIZE, "Message too long")
+_ (EPROTOTYPE, "Protocol wrong type for socket")
+_ (ENOPROTOOPT, "Protocol not available")
+_ (EPROTONOSUPPORT, "Protocol not supported")
+_ (ESOCKTNOSUPPORT, "Socket type not supported")
+_ (EOPNOTSUPP, "Operation not supported on transport endpoint")
+_ (EPFNOSUPPORT, "Protocol family not supported")
+_ (EAFNOSUPPORT, "Address family not supported by protocol")
+_ (EADDRINUSE, "Address already in use")
+_ (EADDRNOTAVAIL, "Cannot assign requested address")
+_ (ENETDOWN, "Network is down")
+_ (ENETUNREACH, "Network is unreachable")
+_ (ENETRESET, "Network dropped connection because of reset")
+_ (ECONNABORTED, "Software caused connection abort")
+_ (ECONNRESET, "Connection reset by peer")
+_ (ENOBUFS, "No buffer space available")
+_ (EISCONN, "Transport endpoint is already connected")
+_ (ENOTCONN, "Transport endpoint is not connected")
+_ (ESHUTDOWN, "Cannot send after transport endpoint shutdown")
+_ (ETOOMANYREFS, "Too many references: cannot splice")
+_ (ETIMEDOUT, "Connection timed out")
+_ (ECONNREFUSED, "Connection refused")
+_ (EHOSTDOWN, "Host is down")
+_ (EHOSTUNREACH, "No route to host")
+_ (EALREADY, "Operation already in progress")
+_ (EINPROGRESS, "Operation now in progress")
+_ (ESTALE, "Stale NFS file handle")
+_ (EUCLEAN, "Structure needs cleaning")
+_ (ENOTNAM, "Not a XENIX named type file")
+_ (ENAVAIL, "No XENIX semaphores available")
+_ (EISNAM, "Is a named type file")
+_ (EREMOTEIO, "Remote I/O error")
+_ (EDQUOT, "Quota exceeded")
+_ (ENOMEDIUM, "No medium found")
+_ (EMEDIUMTYPE, "Wrong medium type")
diff --git a/src/vppinfra/valgrind.h b/src/vppinfra/valgrind.h
new file mode 100644
index 00000000..e74d7e82
--- /dev/null
+++ b/src/vppinfra/valgrind.h
@@ -0,0 +1,4030 @@
+/* -*- c -*-
+   ----------------------------------------------------------------
+
+   Notice that the following BSD-style license applies to this one
+   file (valgrind.h) only.  The rest of Valgrind is licensed under the
+   terms of the GNU General Public License, version 2, unless
+   otherwise indicated.  See the COPYING file in the source
+   distribution for details.
+
+   ----------------------------------------------------------------
+
+   This file is part of Valgrind, a dynamic binary instrumentation
+   framework.
+
+   Copyright (C) 2000-2009 Julian Seward.  All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. The origin of this software must not be misrepresented; you must
+      not claim that you wrote the original software.  If you use this
+      software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   3. Altered source versions must be plainly marked as such, and must
+      not be misrepresented as being the original software.
+
+   4. The name of the author may not be used to endorse or promote
+      products derived from this software without specific prior written
+      permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+   ----------------------------------------------------------------
+
+   Notice that the above BSD-style license applies to this one file
+   (valgrind.h) only.  The entire rest of Valgrind is licensed under
+   the terms of the GNU General Public License, version 2.  See the
+   COPYING file in the source distribution for details.
+
+   ----------------------------------------------------------------
+*/
+
+
+/* This file is for inclusion into client (your!) code.
+
+   You can use these macros to manipulate and query Valgrind's
+   execution inside your own programs.
+
+   The resulting executables will still run without Valgrind, just a
+   little bit more slowly than they otherwise would, but otherwise
+   unchanged.  When not running on valgrind, each client request
+   consumes very few (eg. 7) instructions, so the resulting performance
+   loss is negligible unless you plan to execute client requests
+   millions of times per second.  Nevertheless, if that is still a
+   problem, you can compile with the NVALGRIND symbol defined (gcc
+   -DNVALGRIND) so that client requests are not even compiled in.  */
+
+#ifndef __VALGRIND_H
+#define __VALGRIND_H
+
+#include <stdarg.h>
+
+/* Nb: this file might be included in a file compiled with -ansi.  So
+   we can't use C++ style "//" comments nor the "asm" keyword (instead
+   use "__asm__"). */
+
+/* Derive some tags indicating what the target platform is.  Note
+   that in this file we're using the compiler's CPP symbols for
+   identifying architectures, which are different to the ones we use
+   within the rest of Valgrind.  Note, __powerpc__ is active for both
+   32 and 64-bit PPC, whereas __powerpc64__ is only active for the
+   latter (on Linux, that is). */
+#undef PLAT_x86_linux
+#undef PLAT_amd64_linux
+#undef PLAT_ppc32_linux
+#undef PLAT_ppc64_linux
+#undef PLAT_ppc32_aix5
+#undef PLAT_ppc64_aix5
+
+
+#if defined(_AIX) && defined(__64BIT__)
+#define PLAT_ppc64_aix5 1
+#elif defined(_AIX) && !defined(__64BIT__)
+#define PLAT_ppc32_aix5 1
+#elif defined(__APPLE__) && defined(__i386__)
+#define PLAT_x86_darwin 1
+#elif defined(__APPLE__) && defined(__x86_64__)
+#define PLAT_amd64_darwin 1
+#elif defined(__i386__)
+#define PLAT_x86_linux 1
+#elif defined(__x86_64__)
+#define PLAT_amd64_linux 1
+#elif defined(__powerpc__) && !defined(__powerpc64__)
+#define PLAT_ppc32_linux 1
+#elif defined(__powerpc__) && defined(__powerpc64__)
+#define PLAT_ppc64_linux 1
+#else
+/* If we're not compiling for our target platform, don't generate
+   any inline asms.  */
+#if !defined(NVALGRIND)
+#define NVALGRIND 1
+#endif
+#endif
+
+
+/* ------------------------------------------------------------------ */
+/* ARCHITECTURE SPECIFICS for SPECIAL INSTRUCTIONS.  There is nothing */
+/* in here of use to end-users -- skip to the next section.           */
+/* ------------------------------------------------------------------ */
+
+#if defined(NVALGRIND)
+
+/* Define NVALGRIND to completely remove the Valgrind magic sequence
+   from the compiled code (analogous to NDEBUG's effects on
+   assert()) */
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+   {                                                              \
+      (_zzq_rlval) = (_zzq_default);                              \
+   }
+
+#else /* ! NVALGRIND */
+
+/* The following defines the magic code sequences which the JITter
+   spots and handles magically.  Don't look too closely at them as
+   they will rot your brain.
+
+   The assembly code sequences for all architectures is in this one
+   file.  This is because this file must be stand-alone, and we don't
+   want to have multiple files.
+
+   For VALGRIND_DO_CLIENT_REQUEST, we must ensure that the default
+   value gets put in the return slot, so that everything works when
+   this is executed not under Valgrind.  Args are passed in a memory
+   block, and so there's no intrinsic limit to the number that could
+   be passed, but it's currently five.
+
+   The macro args are:
+      _zzq_rlval    result lvalue
+      _zzq_default  default value (result returned when running on real CPU)
+      _zzq_request  request code
+      _zzq_arg1..5  request params
+
+   The other two macros are used to support function wrapping, and are
+   a lot simpler.  VALGRIND_GET_NR_CONTEXT returns the value of the
+   guest's NRADDR pseudo-register and whatever other information is
+   needed to safely run the call original from the wrapper: on
+   ppc64-linux, the R2 value at the divert point is also needed.  This
+   information is abstracted into a user-visible type, OrigFn.
+
+   VALGRIND_CALL_NOREDIR_* behaves the same as the following on the
+   guest, but guarantees that the branch instruction will not be
+   redirected: x86: call *%eax, amd64: call *%rax, ppc32/ppc64:
+   branch-and-link-to-r11.  VALGRIND_CALL_NOREDIR is just text, not a
+   complete inline asm, since it needs to be combined with more magic
+   inline asm stuff to be useful.
+*/
+
+/* ------------------------- x86-{linux,darwin} ---------------- */
+
+#if defined(PLAT_x86_linux)  ||  defined(PLAT_x86_darwin)
+
+typedef struct
+{
+  unsigned int nraddr;		/* where's the code? */
+}
+OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "roll $3,  %%edi ; roll $13, %%edi\n\t"      \
+                     "roll $29, %%edi ; roll $19, %%edi\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+  { volatile unsigned int _zzq_args[6];                           \
+    volatile unsigned int _zzq_result;                            \
+    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
+    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
+    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
+    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
+    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
+    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %EDX = client_request ( %EAX ) */         \
+                     "xchgl %%ebx,%%ebx"                          \
+                     : "=d" (_zzq_result)                         \
+                     : "a" (&_zzq_args[0]), "0" (_zzq_default)    \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    volatile unsigned int __addr;                                 \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %EAX = guest_NRADDR */                    \
+                     "xchgl %%ecx,%%ecx"                          \
+                     : "=a" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_CALL_NOREDIR_EAX                                 \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* call-noredir *%EAX */                     \
+                     "xchgl %%edx,%%edx\n\t"
+#endif /* PLAT_x86_linux || PLAT_x86_darwin */
+
+/* ------------------------ amd64-{linux,darwin} --------------- */
+
+#if defined(PLAT_amd64_linux)  ||  defined(PLAT_amd64_darwin)
+
+typedef struct
+{
+  unsigned long long int nraddr;	/* where's the code? */
+}
+OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rolq $3,  %%rdi ; rolq $13, %%rdi\n\t"      \
+                     "rolq $61, %%rdi ; rolq $51, %%rdi\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+  { volatile unsigned long long int _zzq_args[6];                 \
+    volatile unsigned long long int _zzq_result;                  \
+    _zzq_args[0] = (unsigned long long int)(_zzq_request);        \
+    _zzq_args[1] = (unsigned long long int)(_zzq_arg1);           \
+    _zzq_args[2] = (unsigned long long int)(_zzq_arg2);           \
+    _zzq_args[3] = (unsigned long long int)(_zzq_arg3);           \
+    _zzq_args[4] = (unsigned long long int)(_zzq_arg4);           \
+    _zzq_args[5] = (unsigned long long int)(_zzq_arg5);           \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %RDX = client_request ( %RAX ) */         \
+                     "xchgq %%rbx,%%rbx"                          \
+                     : "=d" (_zzq_result)                         \
+                     : "a" (&_zzq_args[0]), "0" (_zzq_default)    \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    volatile unsigned long long int __addr;                       \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %RAX = guest_NRADDR */                    \
+                     "xchgq %%rcx,%%rcx"                          \
+                     : "=a" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_CALL_NOREDIR_RAX                                 \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* call-noredir *%RAX */                     \
+                     "xchgq %%rdx,%%rdx\n\t"
+#endif /* PLAT_amd64_linux || PLAT_amd64_darwin */
+
+/* ------------------------ ppc32-linux ------------------------ */
+
+#if defined(PLAT_ppc32_linux)
+
+typedef struct
+{
+  unsigned int nraddr;		/* where's the code? */
+}
+OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rlwinm 0,0,3,0,0  ; rlwinm 0,0,13,0,0\n\t"  \
+                     "rlwinm 0,0,29,0,0 ; rlwinm 0,0,19,0,0\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  {          unsigned int  _zzq_args[6];                          \
+             unsigned int  _zzq_result;                           \
+             unsigned int* _zzq_ptr;                              \
+    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
+    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
+    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
+    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
+    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
+    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile("mr 3,%1\n\t" /*default*/                    \
+                     "mr 4,%2\n\t" /*ptr*/                        \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1\n\t"                               \
+                     "mr %0,3"     /*result*/                     \
+                     : "=b" (_zzq_result)                         \
+                     : "b" (_zzq_default), "b" (_zzq_ptr)         \
+                     : "cc", "memory", "r3", "r4");               \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    unsigned int __addr;                                          \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory", "r3"                       \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R11 */       \
+                     "or 3,3,3\n\t"
+#endif /* PLAT_ppc32_linux */
+
+/* ------------------------ ppc64-linux ------------------------ */
+
+#if defined(PLAT_ppc64_linux)
+
+typedef struct
+{
+  unsigned long long int nraddr;	/* where's the code? */
+  unsigned long long int r2;	/* what tocptr do we need? */
+}
+OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rotldi 0,0,3  ; rotldi 0,0,13\n\t"          \
+                     "rotldi 0,0,61 ; rotldi 0,0,51\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  {          unsigned long long int  _zzq_args[6];                \
+    register unsigned long long int  _zzq_result __asm__("r3");   \
+    register unsigned long long int* _zzq_ptr __asm__("r4");      \
+    _zzq_args[0] = (unsigned long long int)(_zzq_request);        \
+    _zzq_args[1] = (unsigned long long int)(_zzq_arg1);           \
+    _zzq_args[2] = (unsigned long long int)(_zzq_arg2);           \
+    _zzq_args[3] = (unsigned long long int)(_zzq_arg3);           \
+    _zzq_args[4] = (unsigned long long int)(_zzq_arg4);           \
+    _zzq_args[5] = (unsigned long long int)(_zzq_arg5);           \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1"                                   \
+                     : "=r" (_zzq_result)                         \
+                     : "0" (_zzq_default), "r" (_zzq_ptr)         \
+                     : "cc", "memory");                           \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    register unsigned long long int __addr __asm__("r3");         \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2"                                   \
+                     : "=r" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR_GPR2 */                \
+                     "or 4,4,4"                                   \
+                     : "=r" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_orig->r2 = __addr;                                       \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R11 */       \
+                     "or 3,3,3\n\t"
+
+#endif /* PLAT_ppc64_linux */
+
+/* ------------------------ ppc32-aix5 ------------------------- */
+
+#if defined(PLAT_ppc32_aix5)
+
+typedef struct
+{
+  unsigned int nraddr;		/* where's the code? */
+  unsigned int r2;		/* what tocptr do we need? */
+}
+OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rlwinm 0,0,3,0,0  ; rlwinm 0,0,13,0,0\n\t"  \
+                     "rlwinm 0,0,29,0,0 ; rlwinm 0,0,19,0,0\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  {          unsigned int  _zzq_args[7];                          \
+    register unsigned int  _zzq_result;                           \
+    register unsigned int* _zzq_ptr;                              \
+    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
+    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
+    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
+    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
+    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
+    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
+    _zzq_args[6] = (unsigned int)(_zzq_default);                  \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile("mr 4,%1\n\t"                                \
+                     "lwz 3, 24(4)\n\t"                           \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (_zzq_result)                         \
+                     : "b" (_zzq_ptr)                             \
+                     : "r3", "r4", "cc", "memory");               \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    register unsigned int __addr;                                 \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "r3", "cc", "memory"                       \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR_GPR2 */                \
+                     "or 4,4,4\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "r3", "cc", "memory"                       \
+                    );                                            \
+    _zzq_orig->r2 = __addr;                                       \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R11 */       \
+                     "or 3,3,3\n\t"
+
+#endif /* PLAT_ppc32_aix5 */
+
+/* ------------------------ ppc64-aix5 ------------------------- */
+
+#if defined(PLAT_ppc64_aix5)
+
+typedef struct
+{
+  unsigned long long int nraddr;	/* where's the code? */
+  unsigned long long int r2;	/* what tocptr do we need? */
+}
+OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rotldi 0,0,3  ; rotldi 0,0,13\n\t"          \
+                     "rotldi 0,0,61 ; rotldi 0,0,51\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  {          unsigned long long int  _zzq_args[7];                \
+    register unsigned long long int  _zzq_result;                 \
+    register unsigned long long int* _zzq_ptr;                    \
+    _zzq_args[0] = (unsigned int long long)(_zzq_request);        \
+    _zzq_args[1] = (unsigned int long long)(_zzq_arg1);           \
+    _zzq_args[2] = (unsigned int long long)(_zzq_arg2);           \
+    _zzq_args[3] = (unsigned int long long)(_zzq_arg3);           \
+    _zzq_args[4] = (unsigned int long long)(_zzq_arg4);           \
+    _zzq_args[5] = (unsigned int long long)(_zzq_arg5);           \
+    _zzq_args[6] = (unsigned int long long)(_zzq_default);        \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile("mr 4,%1\n\t"                                \
+                     "ld 3, 48(4)\n\t"                            \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (_zzq_result)                         \
+                     : "b" (_zzq_ptr)                             \
+                     : "r3", "r4", "cc", "memory");               \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    register unsigned long long int __addr;                       \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "r3", "cc", "memory"                       \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR_GPR2 */                \
+                     "or 4,4,4\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "r3", "cc", "memory"                       \
+                    );                                            \
+    _zzq_orig->r2 = __addr;                                       \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R11 */       \
+                     "or 3,3,3\n\t"
+
+#endif /* PLAT_ppc64_aix5 */
+
+/* Insert assembly code for other platforms here... */
+
+#endif /* NVALGRIND */
+
+
+/* ------------------------------------------------------------------ */
+/* PLATFORM SPECIFICS for FUNCTION WRAPPING.  This is all very        */
+/* ugly.  It's the least-worst tradeoff I can think of.               */
+/* ------------------------------------------------------------------ */
+
+/* This section defines magic (a.k.a appalling-hack) macros for doing
+   guaranteed-no-redirection macros, so as to get from function
+   wrappers to the functions they are wrapping.  The whole point is to
+   construct standard call sequences, but to do the call itself with a
+   special no-redirect call pseudo-instruction that the JIT
+   understands and handles specially.  This section is long and
+   repetitious, and I can't see a way to make it shorter.
+
+   The naming scheme is as follows:
+
+      CALL_FN_{W,v}_{v,W,WW,WWW,WWWW,5W,6W,7W,etc}
+
+   'W' stands for "word" and 'v' for "void".  Hence there are
+   different macros for calling arity 0, 1, 2, 3, 4, etc, functions,
+   and for each, the possibility of returning a word-typed result, or
+   no result.
+*/
+
+/* Use these to write the name of your wrapper.  NOTE: duplicates
+   VG_WRAP_FUNCTION_Z{U,Z} in pub_tool_redir.h. */
+
+/* Use an extra level of macroisation so as to ensure the soname/fnname
+   args are fully macro-expanded before pasting them together. */
+#define VG_CONCAT4(_aa,_bb,_cc,_dd) _aa##_bb##_cc##_dd
+
+#define I_WRAP_SONAME_FNNAME_ZU(soname,fnname)                    \
+   VG_CONCAT4(_vgwZU_,soname,_,fnname)
+
+#define I_WRAP_SONAME_FNNAME_ZZ(soname,fnname)                    \
+   VG_CONCAT4(_vgwZZ_,soname,_,fnname)
+
+/* Use this macro from within a wrapper function to collect the
+   context (address and possibly other info) of the original function.
+   Once you have that you can then use it in one of the CALL_FN_
+   macros.  The type of the argument _lval is OrigFn. */
+#define VALGRIND_GET_ORIG_FN(_lval)  VALGRIND_GET_NR_CONTEXT(_lval)
+
+/* Derivatives of the main macros below, for calling functions
+   returning void. */
+
+#define CALL_FN_v_v(fnptr)                                        \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_v(_junk,fnptr); } while (0)
+
+#define CALL_FN_v_W(fnptr, arg1)                                  \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_W(_junk,fnptr,arg1); } while (0)
+
+#define CALL_FN_v_WW(fnptr, arg1,arg2)                            \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_WW(_junk,fnptr,arg1,arg2); } while (0)
+
+#define CALL_FN_v_WWW(fnptr, arg1,arg2,arg3)                      \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_WWW(_junk,fnptr,arg1,arg2,arg3); } while (0)
+
+#define CALL_FN_v_WWWW(fnptr, arg1,arg2,arg3,arg4)                \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_WWWW(_junk,fnptr,arg1,arg2,arg3,arg4); } while (0)
+
+#define CALL_FN_v_5W(fnptr, arg1,arg2,arg3,arg4,arg5)             \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_5W(_junk,fnptr,arg1,arg2,arg3,arg4,arg5); } while (0)
+
+#define CALL_FN_v_6W(fnptr, arg1,arg2,arg3,arg4,arg5,arg6)        \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_6W(_junk,fnptr,arg1,arg2,arg3,arg4,arg5,arg6); } while (0)
+
+#define CALL_FN_v_7W(fnptr, arg1,arg2,arg3,arg4,arg5,arg6,arg7)   \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_7W(_junk,fnptr,arg1,arg2,arg3,arg4,arg5,arg6,arg7); } while (0)
+
+/* ------------------------- x86-{linux,darwin} ---------------- */
+
+#if defined(PLAT_x86_linux)  ||  defined(PLAT_x86_darwin)
+
+/* These regs are trashed by the hidden call.  No need to mention eax
+   as gcc can already see that, plus causes gcc to bomb. */
+#define __CALLER_SAVED_REGS /*"eax"*/ "ecx", "edx"
+
+/* These CALL_FN_ macros assume that on x86-linux, sizeof(unsigned
+   long) == 4. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[2];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      __asm__ volatile(                                           \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $4, %%esp\n"                                       \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      __asm__ volatile(                                           \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $8, %%esp\n"                                       \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      __asm__ volatile(                                           \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $12, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      __asm__ volatile(                                           \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $16, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      __asm__ volatile(                                           \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $20, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      __asm__ volatile(                                           \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $24, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      __asm__ volatile(                                           \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $28, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      __asm__ volatile(                                           \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $32, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      __asm__ volatile(                                           \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $36, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      __asm__ volatile(                                           \
+         "pushl 40(%%eax)\n\t"                                    \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $40, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11)                          \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      __asm__ volatile(                                           \
+         "pushl 44(%%eax)\n\t"                                    \
+         "pushl 40(%%eax)\n\t"                                    \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $44, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11,arg12)                    \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      _argvec[12] = (unsigned long)(arg12);                       \
+      __asm__ volatile(                                           \
+         "pushl 48(%%eax)\n\t"                                    \
+         "pushl 44(%%eax)\n\t"                                    \
+         "pushl 40(%%eax)\n\t"                                    \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $48, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_x86_linux || PLAT_x86_darwin */
+
+/* ------------------------ amd64-{linux,darwin} --------------- */
+
+#if defined(PLAT_amd64_linux)  ||  defined(PLAT_amd64_darwin)
+
+/* ARGREGS: rdi rsi rdx rcx r8 r9 (the rest on stack in R-to-L order) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS /*"rax",*/ "rcx", "rdx", "rsi",       \
+                            "rdi", "r8", "r9", "r10", "r11"
+
+/* These CALL_FN_ macros assume that on amd64-linux, sizeof(unsigned
+   long) == 8. */
+
+/* NB 9 Sept 07.  There is a nasty kludge here in all these CALL_FN_
+   macros.  In order not to trash the stack redzone, we need to drop
+   %rsp by 128 before the hidden call, and restore afterwards.  The
+   nastyness is that it is only by luck that the stack still appears
+   to be unwindable during the hidden call - since then the behaviour
+   of any routine using this macro does not match what the CFI data
+   says.  Sigh.
+
+   Why is this important?  Imagine that a wrapper has a stack
+   allocated local, and passes to the hidden call, a pointer to it.
+   Because gcc does not know about the hidden call, it may allocate
+   that local in the redzone.  Unfortunately the hidden call may then
+   trash it before it comes to use it.  So we must step clear of the
+   redzone, for the duration of the hidden call, to make it safe.
+
+   Probably the same problem afflicts the other redzone-style ABIs too
+   (ppc64-linux, ppc32-aix5, ppc64-aix5); but for those, the stack is
+   self describing (none of this CFI nonsense) so at least messing
+   with the stack pointer doesn't give a danger of non-unwindable
+   stack. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[2];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         "addq $128,%%rsp\n\t"                                    \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $8, %%rsp\n"                                       \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $16, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 72(%%rax)\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $24, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 80(%%rax)\n\t"                                    \
+         "pushq 72(%%rax)\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $32, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 88(%%rax)\n\t"                                    \
+         "pushq 80(%%rax)\n\t"                                    \
+         "pushq 72(%%rax)\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $40, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      _argvec[12] = (unsigned long)(arg12);                       \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 96(%%rax)\n\t"                                    \
+         "pushq 88(%%rax)\n\t"                                    \
+         "pushq 80(%%rax)\n\t"                                    \
+         "pushq 72(%%rax)\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $48, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_amd64_linux || PLAT_amd64_darwin */
+
+/* ------------------------ ppc32-linux ------------------------ */
+
+#if defined(PLAT_ppc32_linux)
+
+/* This is useful for finding out about the on-stack stuff:
+
+   extern int f9  ( int,int,int,int,int,int,int,int,int );
+   extern int f10 ( int,int,int,int,int,int,int,int,int,int );
+   extern int f11 ( int,int,int,int,int,int,int,int,int,int,int );
+   extern int f12 ( int,int,int,int,int,int,int,int,int,int,int,int );
+
+   int g9 ( void ) {
+      return f9(11,22,33,44,55,66,77,88,99);
+   }
+   int g10 ( void ) {
+      return f10(11,22,33,44,55,66,77,88,99,110);
+   }
+   int g11 ( void ) {
+      return f11(11,22,33,44,55,66,77,88,99,110,121);
+   }
+   int g12 ( void ) {
+      return f12(11,22,33,44,55,66,77,88,99,110,121,132);
+   }
+*/
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
+   "r11", "r12", "r13"
+
+/* These CALL_FN_ macros assume that on ppc32-linux,
+   sizeof(unsigned long) == 4. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[2];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-16\n\t"                                       \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "addi 1,1,16\n\t"                                        \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      _argvec[10] = (unsigned long)arg10;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-16\n\t"                                       \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,12(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "addi 1,1,16\n\t"                                        \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      _argvec[10] = (unsigned long)arg10;                         \
+      _argvec[11] = (unsigned long)arg11;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-32\n\t"                                       \
+         /* arg11 */                                              \
+         "lwz 3,44(11)\n\t"                                       \
+         "stw 3,16(1)\n\t"                                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,12(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "addi 1,1,32\n\t"                                        \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      _argvec[10] = (unsigned long)arg10;                         \
+      _argvec[11] = (unsigned long)arg11;                         \
+      _argvec[12] = (unsigned long)arg12;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-32\n\t"                                       \
+         /* arg12 */                                              \
+         "lwz 3,48(11)\n\t"                                       \
+         "stw 3,20(1)\n\t"                                        \
+         /* arg11 */                                              \
+         "lwz 3,44(11)\n\t"                                       \
+         "stw 3,16(1)\n\t"                                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,12(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "addi 1,1,32\n\t"                                        \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc32_linux */
+
+/* ------------------------ ppc64-linux ------------------------ */
+
+#if defined(PLAT_ppc64_linux)
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
+   "r11", "r12", "r13"
+
+/* These CALL_FN_ macros assume that on ppc64-linux, sizeof(unsigned
+   long) == 8. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+0];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1] = (unsigned long)_orig.r2;                       \
+      _argvec[2] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+1];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+2];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+3];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+4];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+5];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+6];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+7];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+8];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+9];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-128\n\t"  /* expand stack frame */            \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         "addi 1,1,128"     /* restore frame */                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+10];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-128\n\t"  /* expand stack frame */            \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         "addi 1,1,128"     /* restore frame */                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+11];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-144\n\t"  /* expand stack frame */            \
+         /* arg11 */                                              \
+         "ld  3,88(11)\n\t"                                       \
+         "std 3,128(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         "addi 1,1,144"     /* restore frame */                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+12];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      _argvec[2+12] = (unsigned long)arg12;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-144\n\t"  /* expand stack frame */            \
+         /* arg12 */                                              \
+         "ld  3,96(11)\n\t"                                       \
+         "std 3,136(1)\n\t"                                       \
+         /* arg11 */                                              \
+         "ld  3,88(11)\n\t"                                       \
+         "std 3,128(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         "addi 1,1,144"     /* restore frame */                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc64_linux */
+
+/* ------------------------ ppc32-aix5 ------------------------- */
+
+#if defined(PLAT_ppc32_aix5)
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
+   "r11", "r12", "r13"
+
+/* Expand the stack frame, copying enough info that unwinding
+   still works.  Trashes r3. */
+
+#define VG_EXPAND_FRAME_BY_trashes_r3(_n_fr)                      \
+         "addi 1,1,-" #_n_fr "\n\t"                               \
+         "lwz  3," #_n_fr "(1)\n\t"                               \
+         "stw  3,0(1)\n\t"
+
+#define VG_CONTRACT_FRAME_BY(_n_fr)                               \
+         "addi 1,1," #_n_fr "\n\t"
+
+/* These CALL_FN_ macros assume that on ppc32-aix5, sizeof(unsigned
+   long) == 4. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+0];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1] = (unsigned long)_orig.r2;                       \
+      _argvec[2] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+1];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+2];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+3];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+4];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+5];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t" /* arg2->r4 */                       \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+6];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+7];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+8];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+9];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(64)                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,56(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(64)                                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+10];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(64)                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,60(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,56(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(64)                                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+11];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(72)                        \
+         /* arg11 */                                              \
+         "lwz 3,44(11)\n\t"                                       \
+         "stw 3,64(1)\n\t"                                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,60(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,56(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(72)                                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+12];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      _argvec[2+12] = (unsigned long)arg12;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(72)                        \
+         /* arg12 */                                              \
+         "lwz 3,48(11)\n\t"                                       \
+         "stw 3,68(1)\n\t"                                        \
+         /* arg11 */                                              \
+         "lwz 3,44(11)\n\t"                                       \
+         "stw 3,64(1)\n\t"                                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,60(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,56(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(72)                                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc32_aix5 */
+
+/* ------------------------ ppc64-aix5 ------------------------- */
+
+#if defined(PLAT_ppc64_aix5)
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
+   "r11", "r12", "r13"
+
+/* Expand the stack frame, copying enough info that unwinding
+   still works.  Trashes r3. */
+
+#define VG_EXPAND_FRAME_BY_trashes_r3(_n_fr)                      \
+         "addi 1,1,-" #_n_fr "\n\t"                               \
+         "ld   3," #_n_fr "(1)\n\t"                               \
+         "std  3,0(1)\n\t"
+
+#define VG_CONTRACT_FRAME_BY(_n_fr)                               \
+         "addi 1,1," #_n_fr "\n\t"
+
+/* These CALL_FN_ macros assume that on ppc64-aix5, sizeof(unsigned
+   long) == 8. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+0];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1] = (unsigned long)_orig.r2;                       \
+      _argvec[2] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+1];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+2];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+3];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+4];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+5];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+6];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+7];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+8];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+9];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(128)                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(128)                                \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+10];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(128)                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(128)                                \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+11];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(144)                       \
+         /* arg11 */                                              \
+         "ld  3,88(11)\n\t"                                       \
+         "std 3,128(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(144)                                \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+12];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      _argvec[2+12] = (unsigned long)arg12;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(144)                       \
+         /* arg12 */                                              \
+         "ld  3,96(11)\n\t"                                       \
+         "std 3,136(1)\n\t"                                       \
+         /* arg11 */                                              \
+         "ld  3,88(11)\n\t"                                       \
+         "std 3,128(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(144)                                \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc64_aix5 */
+
+
+/* ------------------------------------------------------------------ */
+/* ARCHITECTURE INDEPENDENT MACROS for CLIENT REQUESTS.               */
+/*                                                                    */
+/* ------------------------------------------------------------------ */
+
+/* Some request codes.  There are many more of these, but most are not
+   exposed to end-user view.  These are the public ones, all of the
+   form 0x1000 + small_number.
+
+   Core ones are in the range 0x00000000--0x0000ffff.  The non-public
+   ones start at 0x2000.
+*/
+
+/* These macros are used by tools -- they must be public, but don't
+   embed them into other programs. */
+#define VG_USERREQ_TOOL_BASE(a,b) \
+   ((unsigned int)(((a)&0xff) << 24 | ((b)&0xff) << 16))
+#define VG_IS_TOOL_USERREQ(a, b, v) \
+   (VG_USERREQ_TOOL_BASE(a,b) == ((v) & 0xffff0000))
+
+/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !!
+   This enum comprises an ABI exported by Valgrind to programs
+   which use client requests.  DO NOT CHANGE THE ORDER OF THESE
+   ENTRIES, NOR DELETE ANY -- add new ones at the end. */
+typedef enum
+{ VG_USERREQ__RUNNING_ON_VALGRIND = 0x1001,
+  VG_USERREQ__DISCARD_TRANSLATIONS = 0x1002,
+
+  /* These allow any function to be called from the simulated
+     CPU but run on the real CPU.  Nb: the first arg passed to
+     the function is always the ThreadId of the running
+     thread!  So CLIENT_CALL0 actually requires a 1 arg
+     function, etc. */
+  VG_USERREQ__CLIENT_CALL0 = 0x1101,
+  VG_USERREQ__CLIENT_CALL1 = 0x1102,
+  VG_USERREQ__CLIENT_CALL2 = 0x1103,
+  VG_USERREQ__CLIENT_CALL3 = 0x1104,
+
+  /* Can be useful in regression testing suites -- eg. can
+     send Valgrind's output to /dev/null and still count
+     errors. */
+  VG_USERREQ__COUNT_ERRORS = 0x1201,
+
+  /* These are useful and can be interpreted by any tool that
+     tracks malloc() et al, by using vg_replace_malloc.c. */
+  VG_USERREQ__MALLOCLIKE_BLOCK = 0x1301,
+  VG_USERREQ__FREELIKE_BLOCK = 0x1302,
+  /* Memory pool support. */
+  VG_USERREQ__CREATE_MEMPOOL = 0x1303,
+  VG_USERREQ__DESTROY_MEMPOOL = 0x1304,
+  VG_USERREQ__MEMPOOL_ALLOC = 0x1305,
+  VG_USERREQ__MEMPOOL_FREE = 0x1306,
+  VG_USERREQ__MEMPOOL_TRIM = 0x1307,
+  VG_USERREQ__MOVE_MEMPOOL = 0x1308,
+  VG_USERREQ__MEMPOOL_CHANGE = 0x1309,
+  VG_USERREQ__MEMPOOL_EXISTS = 0x130a,
+
+  /* Allow printfs to valgrind log. */
+  VG_USERREQ__PRINTF = 0x1401,
+  VG_USERREQ__PRINTF_BACKTRACE = 0x1402,
+
+  /* Stack support. */
+  VG_USERREQ__STACK_REGISTER = 0x1501,
+  VG_USERREQ__STACK_DEREGISTER = 0x1502,
+  VG_USERREQ__STACK_CHANGE = 0x1503,
+
+  /* Wine support */
+  VG_USERREQ__LOAD_PDB_DEBUGINFO = 0x1601
+} Vg_ClientRequest;
+
+#if !defined(__GNUC__)
+#define __extension__		/* */
+#endif
+
+/* Returns the number of Valgrinds this code is running under.  That
+   is, 0 if running natively, 1 if running under Valgrind, 2 if
+   running under Valgrind which is running under another Valgrind,
+   etc. */
+#define RUNNING_ON_VALGRIND  __extension__                        \
+   ({unsigned int _qzz_res;                                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* if not */,          \
+                               VG_USERREQ__RUNNING_ON_VALGRIND,   \
+                               0, 0, 0, 0, 0);                    \
+    _qzz_res;                                                     \
+   })
+
+
+/* Discard translation of code in the range [_qzz_addr .. _qzz_addr +
+   _qzz_len - 1].  Useful if you are debugging a JITter or some such,
+   since it provides a way to make sure valgrind will retranslate the
+   invalidated area.  Returns no value. */
+#define VALGRIND_DISCARD_TRANSLATIONS(_qzz_addr,_qzz_len)         \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__DISCARD_TRANSLATIONS,  \
+                               _qzz_addr, _qzz_len, 0, 0, 0);     \
+   }
+
+
+/* These requests are for getting Valgrind itself to print something.
+   Possibly with a backtrace.  This is a really ugly hack.  The return value
+   is the number of characters printed, excluding the "**<pid>** " part at the
+   start and the backtrace (if present). */
+
+#if defined(NVALGRIND)
+
+#define VALGRIND_PRINTF(...)
+#define VALGRIND_PRINTF_BACKTRACE(...)
+
+#else /* NVALGRIND */
+
+/* Modern GCC will optimize the static routine out if unused,
+   and unused attribute will shut down warnings about it.  */
+static int VALGRIND_PRINTF (const char *format, ...)
+  __attribute__ ((format (__printf__, 1, 2), __unused__));
+static int
+VALGRIND_PRINTF (const char *format, ...)
+{
+  unsigned long _qzz_res;
+  va_list vargs;
+  va_start (vargs, format);
+  VALGRIND_DO_CLIENT_REQUEST (_qzz_res, 0, VG_USERREQ__PRINTF,
+			      (unsigned long) format, (unsigned long) vargs,
+			      0, 0, 0);
+  va_end (vargs);
+  return (int) _qzz_res;
+}
+
+static int VALGRIND_PRINTF_BACKTRACE (const char *format, ...)
+  __attribute__ ((format (__printf__, 1, 2), __unused__));
+static int
+VALGRIND_PRINTF_BACKTRACE (const char *format, ...)
+{
+  unsigned long _qzz_res;
+  va_list vargs;
+  va_start (vargs, format);
+  VALGRIND_DO_CLIENT_REQUEST (_qzz_res, 0, VG_USERREQ__PRINTF_BACKTRACE,
+			      (unsigned long) format, (unsigned long) vargs,
+			      0, 0, 0);
+  va_end (vargs);
+  return (int) _qzz_res;
+}
+
+#endif /* NVALGRIND */
+
+
+/* These requests allow control to move from the simulated CPU to the
+   real CPU, calling an arbitary function.
+
+   Note that the current ThreadId is inserted as the first argument.
+   So this call:
+
+     VALGRIND_NON_SIMD_CALL2(f, arg1, arg2)
+
+   requires f to have this signature:
+
+     Word f(Word tid, Word arg1, Word arg2)
+
+   where "Word" is a word-sized type.
+
+   Note that these client requests are not entirely reliable.  For example,
+   if you call a function with them that subsequently calls printf(),
+   there's a high chance Valgrind will crash.  Generally, your prospects of
+   these working are made higher if the called function does not refer to
+   any global variables, and does not refer to any libc or other functions
+   (printf et al).  Any kind of entanglement with libc or dynamic linking is
+   likely to have a bad outcome, for tricky reasons which we've grappled
+   with a lot in the past.
+*/
+#define VALGRIND_NON_SIMD_CALL0(_qyy_fn)                          \
+   __extension__                                                  \
+   ({unsigned long _qyy_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__CLIENT_CALL0,          \
+                               _qyy_fn,                           \
+                               0, 0, 0, 0);                       \
+    _qyy_res;                                                     \
+   })
+
+#define VALGRIND_NON_SIMD_CALL1(_qyy_fn, _qyy_arg1)               \
+   __extension__                                                  \
+   ({unsigned long _qyy_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__CLIENT_CALL1,          \
+                               _qyy_fn,                           \
+                               _qyy_arg1, 0, 0, 0);               \
+    _qyy_res;                                                     \
+   })
+
+#define VALGRIND_NON_SIMD_CALL2(_qyy_fn, _qyy_arg1, _qyy_arg2)    \
+   __extension__                                                  \
+   ({unsigned long _qyy_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__CLIENT_CALL2,          \
+                               _qyy_fn,                           \
+                               _qyy_arg1, _qyy_arg2, 0, 0);       \
+    _qyy_res;                                                     \
+   })
+
+#define VALGRIND_NON_SIMD_CALL3(_qyy_fn, _qyy_arg1, _qyy_arg2, _qyy_arg3) \
+   __extension__                                                  \
+   ({unsigned long _qyy_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__CLIENT_CALL3,          \
+                               _qyy_fn,                           \
+                               _qyy_arg1, _qyy_arg2,              \
+                               _qyy_arg3, 0);                     \
+    _qyy_res;                                                     \
+   })
+
+
+/* Counts the number of errors that have been recorded by a tool.  Nb:
+   the tool must record the errors with VG_(maybe_record_error)() or
+   VG_(unique_error)() for them to be counted. */
+#define VALGRIND_COUNT_ERRORS                                     \
+   __extension__                                                  \
+   ({unsigned int _qyy_res;                                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__COUNT_ERRORS,          \
+                               0, 0, 0, 0, 0);                    \
+    _qyy_res;                                                     \
+   })
+
+/* Several Valgrind tools (Memcheck, Massif, Helgrind, DRD) rely on knowing
+   when heap blocks are allocated in order to give accurate results.  This
+   happens automatically for the standard allocator functions such as
+   malloc(), calloc(), realloc(), memalign(), new, new[], free(), delete,
+   delete[], etc.
+
+   But if your program uses a custom allocator, this doesn't automatically
+   happen, and Valgrind will not do as well.  For example, if you allocate
+   superblocks with mmap() and then allocates chunks of the superblocks, all
+   Valgrind's observations will be at the mmap() level and it won't know that
+   the chunks should be considered separate entities.  In Memcheck's case,
+   that means you probably won't get heap block overrun detection (because
+   there won't be redzones marked as unaddressable) and you definitely won't
+   get any leak detection.
+
+   The following client requests allow a custom allocator to be annotated so
+   that it can be handled accurately by Valgrind.
+
+   VALGRIND_MALLOCLIKE_BLOCK marks a region of memory as having been allocated
+   by a malloc()-like function.  For Memcheck (an illustrative case), this
+   does two things:
+
+   - It records that the block has been allocated.  This means any addresses
+     within the block mentioned in error messages will be
+     identified as belonging to the block.  It also means that if the block
+     isn't freed it will be detected by the leak checker.
+
+   - It marks the block as being addressable and undefined (if 'is_zeroed' is
+     not set), or addressable and defined (if 'is_zeroed' is set).  This
+     controls how accesses to the block by the program are handled.
+
+   'addr' is the start of the usable block (ie. after any
+   redzone), 'sizeB' is its size.  'rzB' is the redzone size if the allocator
+   can apply redzones -- these are blocks of padding at the start and end of
+   each block.  Adding redzones is recommended as it makes it much more likely
+   Valgrind will spot block overruns.  `is_zeroed' indicates if the memory is
+   zeroed (or filled with another predictable value), as is the case for
+   calloc().
+
+   VALGRIND_MALLOCLIKE_BLOCK should be put immediately after the point where a
+   heap block -- that will be used by the client program -- is allocated.
+   It's best to put it at the outermost level of the allocator if possible;
+   for example, if you have a function my_alloc() which calls
+   internal_alloc(), and the client request is put inside internal_alloc(),
+   stack traces relating to the heap block will contain entries for both
+   my_alloc() and internal_alloc(), which is probably not what you want.
+
+   For Memcheck users: if you use VALGRIND_MALLOCLIKE_BLOCK to carve out
+   custom blocks from within a heap block, B, that has been allocated with
+   malloc/calloc/new/etc, then block B will be *ignored* during leak-checking
+   -- the custom blocks will take precedence.
+
+   VALGRIND_FREELIKE_BLOCK is the partner to VALGRIND_MALLOCLIKE_BLOCK.  For
+   Memcheck, it does two things:
+
+   - It records that the block has been deallocated.  This assumes that the
+     block was annotated as having been allocated via
+     VALGRIND_MALLOCLIKE_BLOCK.  Otherwise, an error will be issued.
+
+   - It marks the block as being unaddressable.
+
+   VALGRIND_FREELIKE_BLOCK should be put immediately after the point where a
+   heap block is deallocated.
+
+   In many cases, these two client requests will not be enough to get your
+   allocator working well with Memcheck.  More specifically, if your allocator
+   writes to freed blocks in any way then a VALGRIND_MAKE_MEM_UNDEFINED call
+   will be necessary to mark the memory as addressable just before the zeroing
+   occurs, otherwise you'll get a lot of invalid write errors.  For example,
+   you'll need to do this if your allocator recycles freed blocks, but it
+   zeroes them before handing them back out (via VALGRIND_MALLOCLIKE_BLOCK).
+   Alternatively, if your allocator reuses freed blocks for allocator-internal
+   data structures, VALGRIND_MAKE_MEM_UNDEFINED calls will also be necessary.
+
+   Really, what's happening is a blurring of the lines between the client
+   program and the allocator... after VALGRIND_FREELIKE_BLOCK is called, the
+   memory should be considered unaddressable to the client program, but the
+   allocator knows more than the rest of the client program and so may be able
+   to safely access it.  Extra client requests are necessary for Valgrind to
+   understand the distinction between the allocator and the rest of the
+   program.
+
+   Note: there is currently no VALGRIND_REALLOCLIKE_BLOCK client request;  it
+   has to be emulated with MALLOCLIKE/FREELIKE and memory copying.
+
+   Ignored if addr == 0.
+*/
+#define VALGRIND_MALLOCLIKE_BLOCK(addr, sizeB, rzB, is_zeroed)	\
+   {unsigned int _qzz_res;					\
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,			\
+                               VG_USERREQ__MALLOCLIKE_BLOCK,	\
+                               addr, sizeB, rzB, is_zeroed, 0);	\
+    (void) _qzz_res; /* compiler warning */			\
+   }
+
+/* See the comment for VALGRIND_MALLOCLIKE_BLOCK for details.
+   Ignored if addr == 0.
+*/
+#define VALGRIND_FREELIKE_BLOCK(addr, rzB)			\
+   {unsigned int _qzz_res;					\
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,			\
+                               VG_USERREQ__FREELIKE_BLOCK,	\
+                               addr, rzB, 0, 0, 0);		\
+    (void) _qzz_res; /* compiler warning */			\
+   }
+
+/* Create a memory pool. */
+#define VALGRIND_CREATE_MEMPOOL(pool, rzB, is_zeroed)             \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__CREATE_MEMPOOL,        \
+                               pool, rzB, is_zeroed, 0, 0);       \
+   }
+
+/* Destroy a memory pool. */
+#define VALGRIND_DESTROY_MEMPOOL(pool)                            \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__DESTROY_MEMPOOL,       \
+                               pool, 0, 0, 0, 0);                 \
+   }
+
+/* Associate a piece of memory with a memory pool. */
+#define VALGRIND_MEMPOOL_ALLOC(pool, addr, size)                  \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_ALLOC,         \
+                               pool, addr, size, 0, 0);           \
+   }
+
+/* Disassociate a piece of memory from a memory pool. */
+#define VALGRIND_MEMPOOL_FREE(pool, addr)                         \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_FREE,          \
+                               pool, addr, 0, 0, 0);              \
+   }
+
+/* Disassociate any pieces outside a particular range. */
+#define VALGRIND_MEMPOOL_TRIM(pool, addr, size)                   \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_TRIM,          \
+                               pool, addr, size, 0, 0);           \
+   }
+
+/* Resize and/or move a piece associated with a memory pool. */
+#define VALGRIND_MOVE_MEMPOOL(poolA, poolB)                       \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MOVE_MEMPOOL,          \
+                               poolA, poolB, 0, 0, 0);            \
+   }
+
+/* Resize and/or move a piece associated with a memory pool. */
+#define VALGRIND_MEMPOOL_CHANGE(pool, addrA, addrB, size)         \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_CHANGE,        \
+                               pool, addrA, addrB, size, 0);      \
+   }
+
+/* Return 1 if a mempool exists, else 0. */
+#define VALGRIND_MEMPOOL_EXISTS(pool)                             \
+   __extension__                                                  \
+   ({unsigned int _qzz_res;                                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_EXISTS,        \
+                               pool, 0, 0, 0, 0);                 \
+    _qzz_res;                                                     \
+   })
+
+/* Mark a piece of memory as being a stack. Returns a stack id. */
+#define VALGRIND_STACK_REGISTER(start, end)                       \
+   __extension__                                                  \
+   ({unsigned int _qzz_res;                                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__STACK_REGISTER,        \
+                               start, end, 0, 0, 0);              \
+    _qzz_res;                                                     \
+   })
+
+/* Unmark the piece of memory associated with a stack id as being a
+   stack. */
+#define VALGRIND_STACK_DEREGISTER(id)                             \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__STACK_DEREGISTER,      \
+                               id, 0, 0, 0, 0);                   \
+   }
+
+/* Change the start and end address of the stack id. */
+#define VALGRIND_STACK_CHANGE(id, start, end)                     \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__STACK_CHANGE,          \
+                               id, start, end, 0, 0);             \
+   }
+
+/* Load PDB debug info for Wine PE image_map. */
+#define VALGRIND_LOAD_PDB_DEBUGINFO(fd, ptr, total_size, delta)   \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__LOAD_PDB_DEBUGINFO,    \
+                               fd, ptr, total_size, delta, 0);    \
+   }
+
+
+#undef PLAT_x86_linux
+#undef PLAT_amd64_linux
+#undef PLAT_ppc32_linux
+#undef PLAT_ppc64_linux
+#undef PLAT_ppc32_aix5
+#undef PLAT_ppc64_aix5
+
+#endif /* __VALGRIND_H */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vec.c b/src/vppinfra/vec.c
new file mode 100644
index 00000000..2d7ae1d4
--- /dev/null
+++ b/src/vppinfra/vec.c
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/vec.h>
+#include <vppinfra/mem.h>
+
+/* Vector resize operator.  Called as needed by various macros such as
+   vec_add1() when we need to allocate memory. */
+void *
+vec_resize_allocate_memory (void *v,
+			    word length_increment,
+			    uword data_bytes,
+			    uword header_bytes, uword data_align)
+{
+  vec_header_t *vh = _vec_find (v);
+  uword old_alloc_bytes, new_alloc_bytes;
+  void *old, *new;
+
+  header_bytes = vec_header_bytes (header_bytes);
+
+  data_bytes += header_bytes;
+
+  if (!v)
+    {
+      new = clib_mem_alloc_aligned_at_offset (data_bytes, data_align, header_bytes, 1	/* yes, call os_out_of_memory */
+	);
+      data_bytes = clib_mem_size (new);
+      memset (new, 0, data_bytes);
+      v = new + header_bytes;
+      _vec_len (v) = length_increment;
+      return v;
+    }
+
+  vh->len += length_increment;
+  old = v - header_bytes;
+
+  /* Vector header must start heap object. */
+  ASSERT (clib_mem_is_heap_object (old));
+
+  old_alloc_bytes = clib_mem_size (old);
+
+  /* Need to resize? */
+  if (data_bytes <= old_alloc_bytes)
+    return v;
+
+  new_alloc_bytes = (old_alloc_bytes * 3) / 2;
+  if (new_alloc_bytes < data_bytes)
+    new_alloc_bytes = data_bytes;
+
+  new =
+    clib_mem_alloc_aligned_at_offset (new_alloc_bytes, data_align,
+				      header_bytes,
+				      1 /* yes, call os_out_of_memory */ );
+
+  /* FIXME fail gracefully. */
+  if (!new)
+    clib_panic
+      ("vec_resize fails, length increment %d, data bytes %d, alignment %d",
+       length_increment, data_bytes, data_align);
+
+  clib_memcpy (new, old, old_alloc_bytes);
+  clib_mem_free (old);
+  v = new;
+
+  /* Allocator may give a bit of extra room. */
+  new_alloc_bytes = clib_mem_size (v);
+
+  /* Zero new memory. */
+  memset (v + old_alloc_bytes, 0, new_alloc_bytes - old_alloc_bytes);
+
+  return v + header_bytes;
+}
+
+uword
+clib_mem_is_vec_h (void *v, uword header_bytes)
+{
+  return clib_mem_is_heap_object (vec_header (v, header_bytes));
+}
+
+/** \cond */
+
+#ifdef TEST
+
+#include <stdio.h>
+
+void
+main (int argc, char *argv[])
+{
+  word n = atoi (argv[1]);
+  word i, *x = 0;
+
+  typedef struct
+  {
+    word x, y, z;
+  } FOO;
+
+  FOO *foos = vec_init (FOO, 10), *f;
+
+  vec_validate (foos, 100);
+  foos[100].x = 99;
+
+  _vec_len (foos) = 0;
+  for (i = 0; i < n; i++)
+    {
+      vec_add1 (x, i);
+      vec_add2 (foos, f, 1);
+      f->x = 2 * i;
+      f->y = 3 * i;
+      f->z = 4 * i;
+    }
+
+  {
+    word n = 2;
+    word m = 42;
+    vec_delete (foos, n, m);
+  }
+
+  {
+    word n = 2;
+    word m = 42;
+    vec_insert (foos, n, m);
+  }
+
+  vec_free (x);
+  vec_free (foos);
+  exit (0);
+}
+#endif
+/** \endcond */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vec.h b/src/vppinfra/vec.h
new file mode 100644
index 00000000..eed96d6b
--- /dev/null
+++ b/src/vppinfra/vec.h
@@ -0,0 +1,973 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_vec_h
+#define included_vec_h
+
+#include <vppinfra/clib.h>	/* word, etc */
+#include <vppinfra/mem.h>	/* clib_mem_free */
+#include <vppinfra/string.h>	/* memcpy, memmove */
+#include <vppinfra/vec_bootstrap.h>
+
+/** \file
+
+   CLIB vectors are ubiquitous dynamically resized arrays with by user
+   defined "headers".  Many CLIB data structures (e.g. hash, heap,
+   pool) are vectors with various different headers.
+
+   The memory layout looks like this:
+
+~~~~~~~~
+                    user header (aligned to uword boundary)
+                    vector length: number of elements
+   user's pointer-> vector element #0
+                    vector element #1
+                    ...
+~~~~~~~~
+
+   The user pointer contains the address of vector element # 0.  Null
+   pointer vectors are valid and mean a zero length vector.
+
+   You can reset the length of an allocated vector to zero via the
+   vec_reset_length(v) macro, or by setting the vector length field to
+   zero (e.g. _vec_len (v) = 0). Vec_reset_length(v) preferred: it
+   understands Null pointers.
+
+   Typically, the header is not present.  Headers allow for other
+   data structures to be built atop CLIB vectors.
+
+   Users may specify the alignment for data elements via the
+   vec_*_aligned macros.
+
+   Vectors elements can be any C type e.g. (int, double, struct bar).
+   This is also true for data types built atop vectors (e.g. heap,
+   pool, etc.).
+
+   Many macros have _a variants supporting alignment of vector data
+   and _h variants supporting non zero length vector headers.
+   The _ha variants support both.
+
+   Standard programming error: memorize a pointer to the ith element
+   of a vector then expand it. Vectors expand by 3/2, so such code
+   may appear to work for a period of time. Memorize vector indices
+   which are invariant.
+ */
+
+/** \brief Low-level resize allocation function, usually not called directly
+
+    @param v pointer to a vector
+    @param length_increment length increment in elements
+    @param data_bytes requested size in bytes
+    @param header_bytes header size in bytes (may be zero)
+    @param data_align alignment (may be zero)
+    @return v_prime pointer to resized vector, may or may not equal v
+*/
+void *vec_resize_allocate_memory (void *v,
+				  word length_increment,
+				  uword data_bytes,
+				  uword header_bytes, uword data_align);
+
+/** \brief Low-level vector resize function, usually not called directly
+
+    @param v pointer to a vector
+    @param length_increment length increment in elements
+    @param data_bytes requested size in bytes
+    @param header_bytes header size in bytes (may be zero)
+    @param data_align alignment (may be zero)
+    @return v_prime pointer to resized vector, may or may not equal v
+*/
+
+always_inline void *
+_vec_resize (void *v,
+	     word length_increment,
+	     uword data_bytes, uword header_bytes, uword data_align)
+{
+  vec_header_t *vh = _vec_find (v);
+  uword new_data_bytes, aligned_header_bytes;
+
+  aligned_header_bytes = vec_header_bytes (header_bytes);
+
+  new_data_bytes = data_bytes + aligned_header_bytes;
+
+  if (PREDICT_TRUE (v != 0))
+    {
+      void *p = v - aligned_header_bytes;
+
+      /* Vector header must start heap object. */
+      ASSERT (clib_mem_is_heap_object (p));
+
+      /* Typically we'll not need to resize. */
+      if (new_data_bytes <= clib_mem_size (p))
+	{
+	  vh->len += length_increment;
+	  return v;
+	}
+    }
+
+  /* Slow path: call helper function. */
+  return vec_resize_allocate_memory (v, length_increment, data_bytes,
+				     header_bytes,
+				     clib_max (sizeof (vec_header_t),
+					       data_align));
+}
+
+/** \brief Predicate function, says whether the supplied vector is a clib heap
+    object (general version).
+
+    @param v pointer to a vector
+    @param header_bytes vector header size in bytes (may be zero)
+    @return 0 or 1
+*/
+uword clib_mem_is_vec_h (void *v, uword header_bytes);
+
+
+/** \brief Predicate function, says whether the supplied vector is a clib heap
+    object
+
+    @param v pointer to a vector
+    @return 0 or 1
+*/
+always_inline uword
+clib_mem_is_vec (void *v)
+{
+  return clib_mem_is_vec_h (v, 0);
+}
+
+/* Local variable naming macro (prevents collisions with other macro naming). */
+#define _v(var) _vec_##var
+
+/** \brief Resize a vector (general version).
+   Add N elements to end of given vector V, return pointer to start of vector.
+   Vector will have room for H header bytes and will have user's data aligned
+   at alignment A (rounded to next power of 2).
+
+    @param V pointer to a vector
+    @param N number of elements to add
+    @param H header size in bytes (may be zero)
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+
+#define vec_resize_ha(V,N,H,A)							\
+do {										\
+  word _v(n) = (N);								\
+  word _v(l) = vec_len (V);							\
+  V = _vec_resize ((V), _v(n), (_v(l) + _v(n)) * sizeof ((V)[0]), (H), (A));	\
+} while (0)
+
+/** \brief Resize a vector (no header, unspecified alignment)
+   Add N elements to end of given vector V, return pointer to start of vector.
+   Vector will have room for H header bytes and will have user's data aligned
+   at alignment A (rounded to next power of 2).
+
+    @param V pointer to a vector
+    @param N number of elements to add
+    @return V (value-result macro parameter)
+*/
+#define vec_resize(V,N)     vec_resize_ha(V,N,0,0)
+
+/** \brief Resize a vector (no header, alignment specified).
+   Add N elements to end of given vector V, return pointer to start of vector.
+   Vector will have room for H header bytes and will have user's data aligned
+   at alignment A (rounded to next power of 2).
+
+    @param V pointer to a vector
+    @param N number of elements to add
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+
+#define vec_resize_aligned(V,N,A) vec_resize_ha(V,N,0,A)
+
+/** \brief Allocate space for N more elements
+
+    @param V pointer to a vector
+    @param N number of elements to add
+    @param H header size in bytes (may be zero)
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+
+#define vec_alloc_ha(V,N,H,A)			\
+do {						\
+    uword _v(l) = vec_len (V);			\
+    vec_resize_ha (V, N, H, A);			\
+    _vec_len (V) = _v(l);			\
+} while (0)
+
+/** \brief Allocate space for N more elements
+    (no header, unspecified alignment)
+
+    @param V pointer to a vector
+    @param N number of elements to add
+    @return V (value-result macro parameter)
+*/
+#define vec_alloc(V,N) vec_alloc_ha(V,N,0,0)
+
+/** \brief Allocate space for N more elements (no header, given alignment)
+    @param V pointer to a vector
+    @param N number of elements to add
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+
+#define vec_alloc_aligned(V,N,A) vec_alloc_ha(V,N,0,A)
+
+/** \brief Create new vector of given type and length (general version).
+    @param T type of elements in new vector
+    @param N number of elements to add
+    @param H header size in bytes (may be zero)
+    @param A alignment (may be zero)
+    @return V new vector
+*/
+#define vec_new_ha(T,N,H,A)					\
+({								\
+  word _v(n) = (N);						\
+  _vec_resize ((T *) 0, _v(n), _v(n) * sizeof (T), (H), (A));	\
+})
+
+/** \brief Create new vector of given type and length
+    (unspecified alignment, no header).
+
+    @param T type of elements in new vector
+    @param N number of elements to add
+    @return V new vector
+*/
+#define vec_new(T,N)           vec_new_ha(T,N,0,0)
+/** \brief Create new vector of given type and length
+    (alignment specified, no header).
+
+    @param T type of elements in new vector
+    @param N number of elements to add
+    @param A alignment (may be zero)
+    @return V new vector
+*/
+#define vec_new_aligned(T,N,A) vec_new_ha(T,N,0,A)
+
+/** \brief Free vector's memory (general version)
+
+    @param V pointer to a vector
+    @param H size of header in bytes
+    @return V (value-result parameter, V=0)
+*/
+#define vec_free_h(V,H)				\
+do {						\
+  if (V)					\
+    {						\
+      clib_mem_free (vec_header ((V), (H)));	\
+      V = 0;					\
+    }						\
+} while (0)
+
+/** \brief Free vector's memory (no header).
+    @param V pointer to a vector
+    @return V (value-result parameter, V=0)
+*/
+#define vec_free(V) vec_free_h(V,0)
+
+/**\brief Free vector user header (syntactic sugar)
+   @param h vector header
+   @void
+*/
+#define vec_free_header(h) clib_mem_free (h)
+
+/** \brief Return copy of vector (general version).
+
+    @param V pointer to a vector
+    @param H size of header in bytes
+    @param A alignment (may be zero)
+
+    @return Vdup copy of vector
+*/
+
+#define vec_dup_ha(V,H,A)				\
+({							\
+  __typeof__ ((V)[0]) * _v(v) = 0;			\
+  uword _v(l) = vec_len (V);				\
+  if (_v(l) > 0)					\
+    {							\
+      vec_resize_ha (_v(v), _v(l), (H), (A));		\
+      clib_memcpy (_v(v), (V), _v(l) * sizeof ((V)[0]));\
+    }							\
+  _v(v);						\
+})
+
+/** \brief Return copy of vector (no header, no alignment)
+
+    @param V pointer to a vector
+    @return Vdup copy of vector
+*/
+#define vec_dup(V) vec_dup_ha(V,0,0)
+
+/** \brief Return copy of vector (no header, alignment specified).
+
+    @param V pointer to a vector
+    @param A alignment (may be zero)
+
+    @return Vdup copy of vector
+*/
+#define vec_dup_aligned(V,A) vec_dup_ha(V,0,A)
+
+/** \brief Copy a vector, memcpy wrapper. Assumes sizeof(SRC[0]) ==
+    sizeof(DST[0])
+
+    @param DST destination
+    @param SRC source
+*/
+#define vec_copy(DST,SRC) clib_memcpy (DST, SRC, vec_len (DST) * \
+				       sizeof ((DST)[0]))
+
+/** \brief Clone a vector. Make a new vector with the
+    same size as a given vector but possibly with a different type.
+
+    @param NEW_V pointer to new vector
+    @param OLD_V pointer to old vector
+*/
+#define vec_clone(NEW_V,OLD_V)							\
+do {										\
+  (NEW_V) = 0;									\
+  (NEW_V) = _vec_resize ((NEW_V), vec_len (OLD_V),				\
+			 vec_len (OLD_V) * sizeof ((NEW_V)[0]), (0), (0));	\
+} while (0)
+
+/** \brief Make sure vector is long enough for given index (general version).
+
+    @param V (possibly NULL) pointer to a vector.
+    @param I vector index which will be valid upon return
+    @param H header size in bytes (may be zero)
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+
+#define vec_validate_ha(V,I,H,A)					\
+do {									\
+  word _v(i) = (I);							\
+  word _v(l) = vec_len (V);						\
+  if (_v(i) >= _v(l))							\
+    {									\
+      vec_resize_ha ((V), 1 + (_v(i) - _v(l)), (H), (A));		\
+      /* Must zero new space since user may have previously		\
+	 used e.g. _vec_len (v) -= 10 */				\
+      memset ((V) + _v(l), 0, (1 + (_v(i) - _v(l))) * sizeof ((V)[0]));	\
+    }									\
+} while (0)
+
+/** \brief Make sure vector is long enough for given index
+    (no header, unspecified alignment)
+
+    @param V (possibly NULL) pointer to a vector.
+    @param I vector index which will be valid upon return
+    @return V (value-result macro parameter)
+*/
+#define vec_validate(V,I)           vec_validate_ha(V,I,0,0)
+
+/** \brief Make sure vector is long enough for given index
+    (no header, specified alignment)
+
+    @param V (possibly NULL) pointer to a vector.
+    @param I vector index which will be valid upon return
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+
+#define vec_validate_aligned(V,I,A) vec_validate_ha(V,I,0,A)
+
+/** \brief Make sure vector is long enough for given index
+    and initialize empty space (general version)
+
+    @param V (possibly NULL) pointer to a vector.
+    @param I vector index which will be valid upon return
+    @param INIT initial value (can be a complex expression!)
+    @param H header size in bytes (may be zero)
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+#define vec_validate_init_empty_ha(V,I,INIT,H,A)		\
+do {								\
+  word _v(i) = (I);						\
+  word _v(l) = vec_len (V);					\
+  if (_v(i) >= _v(l))						\
+    {								\
+      vec_resize_ha ((V), 1 + (_v(i) - _v(l)), (H), (A));	\
+      while (_v(l) <= _v(i))					\
+	{							\
+	  (V)[_v(l)] = (INIT);					\
+	  _v(l)++;						\
+	}							\
+    }								\
+} while (0)
+
+/** \brief Make sure vector is long enough for given index
+    and initialize empty space (no header, unspecified alignment)
+
+    @param V (possibly NULL) pointer to a vector.
+    @param I vector index which will be valid upon return
+    @param INIT initial value (can be a complex expression!)
+    @param H header size in bytes (may be zero)
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+
+#define vec_validate_init_empty(V,I,INIT) \
+  vec_validate_init_empty_ha(V,I,INIT,0,0)
+
+/** \brief Make sure vector is long enough for given index
+    and initialize empty space (no header, alignment alignment)
+
+    @param V (possibly NULL) pointer to a vector.
+    @param I vector index which will be valid upon return
+    @param INIT initial value (can be a complex expression!)
+    @param H header size in bytes (may be zero)
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+#define vec_validate_init_empty_aligned(V,I,A) \
+  vec_validate_init_empty_ha(V,I,INIT,0,A)
+
+/** \brief Add 1 element to end of vector (general version).
+
+    @param V pointer to a vector
+    @param E element to add
+    @param H header size in bytes (may be zero)
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+#define vec_add1_ha(V,E,H,A)						\
+do {									\
+  word _v(l) = vec_len (V);						\
+  V = _vec_resize ((V), 1, (_v(l) + 1) * sizeof ((V)[0]), (H), (A));	\
+  (V)[_v(l)] = (E);							\
+} while (0)
+
+/** \brief Add 1 element to end of vector (unspecified alignment).
+
+    @param V pointer to a vector
+    @param E element to add
+    @return V (value-result macro parameter)
+*/
+#define vec_add1(V,E)           vec_add1_ha(V,E,0,0)
+
+/** \brief Add 1 element to end of vector (alignment specified).
+
+    @param V pointer to a vector
+    @param E element to add
+    @param H header size in bytes (may be zero)
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+#define vec_add1_aligned(V,E,A) vec_add1_ha(V,E,0,A)
+
+/** \brief Add N elements to end of vector V,
+    return pointer to new elements in P. (general version)
+
+    @param V pointer to a vector
+    @param P pointer to new vector element(s)
+    @param N number of elements to add
+    @param H header size in bytes (may be zero)
+    @param A alignment (may be zero)
+    @return V and P (value-result macro parameters)
+*/
+#define vec_add2_ha(V,P,N,H,A)							\
+do {										\
+  word _v(n) = (N);								\
+  word _v(l) = vec_len (V);							\
+  V = _vec_resize ((V), _v(n), (_v(l) + _v(n)) * sizeof ((V)[0]), (H), (A));	\
+  P = (V) + _v(l);								\
+} while (0)
+
+/** \brief Add N elements to end of vector V,
+    return pointer to new elements in P. (no header, unspecified alignment)
+
+    @param V pointer to a vector
+    @param P pointer to new vector element(s)
+    @param N number of elements to add
+    @return V and P (value-result macro parameters)
+*/
+
+#define vec_add2(V,P,N)           vec_add2_ha(V,P,N,0,0)
+
+/** \brief Add N elements to end of vector V,
+    return pointer to new elements in P. (no header, alignment specified)
+
+    @param V pointer to a vector
+    @param P pointer to new vector element(s)
+    @param N number of elements to add
+    @param A alignment (may be zero)
+    @return V and P (value-result macro parameters)
+*/
+
+#define vec_add2_aligned(V,P,N,A) vec_add2_ha(V,P,N,0,A)
+
+/** \brief Add N elements to end of vector V (general version)
+
+    @param V pointer to a vector
+    @param E pointer to element(s) to add
+    @param N number of elements to add
+    @param H header size in bytes (may be zero)
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+#define vec_add_ha(V,E,N,H,A)							\
+do {										\
+  word _v(n) = (N);								\
+  word _v(l) = vec_len (V);							\
+  V = _vec_resize ((V), _v(n), (_v(l) + _v(n)) * sizeof ((V)[0]), (H), (A));	\
+  clib_memcpy ((V) + _v(l), (E), _v(n) * sizeof ((V)[0]));			\
+} while (0)
+
+/** \brief Add N elements to end of vector V (no header, unspecified alignment)
+
+    @param V pointer to a vector
+    @param E pointer to element(s) to add
+    @param N number of elements to add
+    @return V (value-result macro parameter)
+*/
+#define vec_add(V,E,N)           vec_add_ha(V,E,N,0,0)
+
+/** \brief Add N elements to end of vector V (no header, specified alignment)
+
+    @param V pointer to a vector
+    @param E pointer to element(s) to add
+    @param N number of elements to add
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+#define vec_add_aligned(V,E,N,A) vec_add_ha(V,E,N,0,A)
+
+/** \brief Returns last element of a vector and decrements its length
+
+    @param V pointer to a vector
+    @return E element removed from the end of the vector
+*/
+#define vec_pop(V)				\
+({						\
+  uword _v(l) = vec_len (V);			\
+  ASSERT (_v(l) > 0);				\
+  _v(l) -= 1;					\
+  _vec_len (V) = _v (l);			\
+  (V)[_v(l)];					\
+})
+
+/** \brief Set E to the last element of a vector, decrement vector length
+    @param V pointer to a vector
+    @param E pointer to the last vector element
+    @return E element removed from the end of the vector
+    (value-result macro parameter
+*/
+
+#define vec_pop2(V,E)				\
+({						\
+  uword _v(l) = vec_len (V);			\
+  if (_v(l) > 0) (E) = vec_pop (V);		\
+  _v(l) > 0;					\
+})
+
+/** \brief Insert N vector elements starting at element M,
+    initialize new elements (general version).
+
+    @param V (possibly NULL) pointer to a vector.
+    @param N number of elements to insert
+    @param M insertion point
+    @param INIT initial value (can be a complex expression!)
+    @param H header size in bytes (may be zero)
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+#define vec_insert_init_empty_ha(V,N,M,INIT,H,A)	\
+do {							\
+  word _v(l) = vec_len (V);				\
+  word _v(n) = (N);					\
+  word _v(m) = (M);					\
+  V = _vec_resize ((V),					\
+		   _v(n),				\
+		   (_v(l) + _v(n))*sizeof((V)[0]),	\
+		   (H), (A));				\
+  ASSERT (_v(m) <= _v(l));				\
+  memmove ((V) + _v(m) + _v(n),				\
+	   (V) + _v(m),					\
+	   (_v(l) - _v(m)) * sizeof ((V)[0]));		\
+  memset  ((V) + _v(m), INIT, _v(n) * sizeof ((V)[0]));	\
+} while (0)
+
+/** \brief Insert N vector elements starting at element M,
+    initialize new elements to zero (general version)
+
+    @param V (possibly NULL) pointer to a vector.
+    @param N number of elements to insert
+    @param M insertion point
+    @param H header size in bytes (may be zero)
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+#define vec_insert_ha(V,N,M,H,A)    vec_insert_init_empty_ha(V,N,M,0,H,A)
+
+/** \brief Insert N vector elements starting at element M,
+    initialize new elements to zero (no header, unspecified alignment)
+
+    @param V (possibly NULL) pointer to a vector.
+    @param N number of elements to insert
+    @param M insertion point
+    @return V (value-result macro parameter)
+*/
+#define vec_insert(V,N,M)           vec_insert_ha(V,N,M,0,0)
+
+/** \brief Insert N vector elements starting at element M,
+    initialize new elements to zero (no header, alignment specified)
+
+    @param V (possibly NULL) pointer to a vector.
+    @param N number of elements to insert
+    @param M insertion point
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+#define vec_insert_aligned(V,N,M,A) vec_insert_ha(V,N,M,0,A)
+
+/** \brief Insert N vector elements starting at element M,
+    initialize new elements (no header, unspecified alignment)
+
+    @param V (possibly NULL) pointer to a vector.
+    @param N number of elements to insert
+    @param M insertion point
+    @param INIT initial value (can be a complex expression!)
+    @return V (value-result macro parameter)
+*/
+
+#define vec_insert_init_empty(V,N,M,INIT) \
+  vec_insert_init_empty_ha(V,N,M,INIT,0,0)
+/* Resize vector by N elements starting from element M, initialize new elements to INIT (alignment specified, no header). */
+
+/** \brief Insert N vector elements starting at element M,
+    initialize new elements (no header, specified alignment)
+
+    @param V (possibly NULL) pointer to a vector.
+    @param N number of elements to insert
+    @param M insertion point
+    @param INIT initial value (can be a complex expression!)
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+#define vec_insert_init_empty_aligned(V,N,M,INIT,A) \
+  vec_insert_init_empty_ha(V,N,M,INIT,0,A)
+
+/** \brief Insert N vector elements starting at element M,
+    insert given elements (general version)
+
+    @param V (possibly NULL) pointer to a vector.
+    @param E element(s) to insert
+    @param N number of elements to insert
+    @param M insertion point
+    @param H header size in bytes (may be zero)
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+
+#define vec_insert_elts_ha(V,E,N,M,H,A)			\
+do {							\
+  word _v(l) = vec_len (V);				\
+  word _v(n) = (N);					\
+  word _v(m) = (M);					\
+  V = _vec_resize ((V),					\
+		   _v(n),				\
+		   (_v(l) + _v(n))*sizeof((V)[0]),	\
+		   (H), (A));				\
+  ASSERT (_v(m) <= _v(l));				\
+  memmove ((V) + _v(m) + _v(n),				\
+	   (V) + _v(m),					\
+	   (_v(l) - _v(m)) * sizeof ((V)[0]));		\
+  clib_memcpy ((V) + _v(m), (E),			\
+	       _v(n) * sizeof ((V)[0]));		\
+} while (0)
+
+/** \brief Insert N vector elements starting at element M,
+    insert given elements (no header, unspecified alignment)
+
+    @param V (possibly NULL) pointer to a vector.
+    @param E element(s) to insert
+    @param N number of elements to insert
+    @param M insertion point
+    @return V (value-result macro parameter)
+*/
+#define vec_insert_elts(V,E,N,M)           vec_insert_elts_ha(V,E,N,M,0,0)
+
+/** \brief Insert N vector elements starting at element M,
+    insert given elements (no header, specified alignment)
+
+    @param V (possibly NULL) pointer to a vector.
+    @param E element(s) to insert
+    @param N number of elements to insert
+    @param M insertion point
+    @param A alignment (may be zero)
+    @return V (value-result macro parameter)
+*/
+#define vec_insert_elts_aligned(V,E,N,M,A) vec_insert_elts_ha(V,E,N,M,0,A)
+
+/** \brief Delete N elements starting at element M
+
+    @param V pointer to a vector
+    @param N number of elements to delete
+    @param M first element to delete
+    @return V (value-result macro parameter)
+*/
+#define vec_delete(V,N,M)					\
+do {								\
+  word _v(l) = vec_len (V);					\
+  word _v(n) = (N);						\
+  word _v(m) = (M);						\
+  /* Copy over deleted elements. */				\
+  if (_v(l) - _v(n) - _v(m) > 0)				\
+    memmove ((V) + _v(m), (V) + _v(m) + _v(n),			\
+	     (_v(l) - _v(n) - _v(m)) * sizeof ((V)[0]));	\
+  /* Zero empty space at end (for future re-allocation). */	\
+  if (_v(n) > 0)						\
+    memset ((V) + _v(l) - _v(n), 0, _v(n) * sizeof ((V)[0]));	\
+  _vec_len (V) -= _v(n);					\
+} while (0)
+
+/** \brief Delete the element at index I
+
+    @param V pointer to a vector
+    @param I index to delete
+*/
+#define vec_del1(v,i)				\
+do {						\
+  uword _vec_del_l = _vec_len (v) - 1;		\
+  uword _vec_del_i = (i);			\
+  if (_vec_del_i < _vec_del_l)			\
+    (v)[_vec_del_i] = (v)[_vec_del_l];		\
+  _vec_len (v) = _vec_del_l;			\
+} while (0)
+
+/** \brief Append v2 after v1. Result in v1.
+    @param V1 target vector
+    @param V2 vector to append
+*/
+
+#define vec_append(v1,v2)						\
+do {									\
+  uword _v(l1) = vec_len (v1);						\
+  uword _v(l2) = vec_len (v2);						\
+									\
+  v1 = _vec_resize ((v1), _v(l2),					\
+		    (_v(l1) + _v(l2)) * sizeof ((v1)[0]), 0, 0);	\
+  clib_memcpy ((v1) + _v(l1), (v2), _v(l2) * sizeof ((v2)[0]));		\
+} while (0)
+
+/** \brief Append v2 after v1. Result in v1. Specified alignment.
+    @param V1 target vector
+    @param V2 vector to append
+    @param align required alignment
+*/
+
+#define vec_append_aligned(v1,v2,align)					\
+do {									\
+  uword _v(l1) = vec_len (v1);						\
+  uword _v(l2) = vec_len (v2);						\
+									\
+  v1 = _vec_resize ((v1), _v(l2),					\
+		    (_v(l1) + _v(l2)) * sizeof ((v1)[0]), 0, align);	\
+  clib_memcpy ((v1) + _v(l1), (v2), _v(l2) * sizeof ((v2)[0]));		\
+} while (0)
+
+/** \brief Prepend v2 before v1. Result in v1.
+    @param V1 target vector
+    @param V2 vector to prepend
+*/
+
+#define vec_prepend(v1,v2)                                              \
+do {                                                                    \
+  uword _v(l1) = vec_len (v1);                                          \
+  uword _v(l2) = vec_len (v2);                                          \
+                                                                        \
+  v1 = _vec_resize ((v1), _v(l2),                                       \
+		    (_v(l1) + _v(l2)) * sizeof ((v1)[0]), 0, 0);	\
+  memmove ((v1) + _v(l2), (v1), _v(l1) * sizeof ((v1)[0]));             \
+  clib_memcpy ((v1), (v2), _v(l2) * sizeof ((v2)[0]));                  \
+} while (0)
+
+/** \brief Prepend v2 before v1. Result in v1. Specified alignment
+    @param V1 target vector
+    @param V2 vector to prepend
+    @param align required alignment
+*/
+
+#define vec_prepend_aligned(v1,v2,align)                                \
+do {                                                                    \
+  uword _v(l1) = vec_len (v1);                                          \
+  uword _v(l2) = vec_len (v2);                                          \
+                                                                        \
+  v1 = _vec_resize ((v1), _v(l2),                                       \
+		    (_v(l1) + _v(l2)) * sizeof ((v1)[0]), 0, align);	\
+  memmove ((v1) + _v(l2), (v1), _v(l1) * sizeof ((v1)[0]));             \
+  clib_memcpy ((v1), (v2), _v(l2) * sizeof ((v2)[0]));                  \
+} while (0)
+
+
+/** \brief Zero all vector elements. Null-pointer tolerant.
+    @param var Vector to zero
+*/
+#define vec_zero(var)						\
+do {								\
+  if (var)							\
+    memset ((var), 0, vec_len (var) * sizeof ((var)[0]));	\
+} while (0)
+
+/** \brief Set all vector elements to given value. Null-pointer tolerant.
+    @param v vector to set
+    @param val value for each vector element
+*/
+#define vec_set(v,val)				\
+do {						\
+  word _v(i);					\
+  __typeof__ ((v)[0]) _val = (val);		\
+  for (_v(i) = 0; _v(i) < vec_len (v); _v(i)++)	\
+    (v)[_v(i)] = _val;				\
+} while (0)
+
+#ifdef CLIB_UNIX
+#include <stdlib.h>		/* for qsort */
+#endif
+
+/** \brief Compare two vectors, not NULL-pointer tolerant
+
+    @param v1 Pointer to a vector
+    @param v2 Pointer to a vector
+    @return 1 if equal, 0 if unequal
+*/
+#define vec_is_equal(v1,v2) \
+  (vec_len (v1) == vec_len (v2) && ! memcmp ((v1), (v2), vec_len (v1) * sizeof ((v1)[0])))
+
+/** \brief Compare two vectors (only applicable to vectors of signed numbers).
+   Used in qsort compare functions.
+
+    @param v1 Pointer to a vector
+    @param v2 Pointer to a vector
+    @return -1, 0, +1
+*/
+#define vec_cmp(v1,v2)					\
+({							\
+  word _v(i), _v(cmp), _v(l);				\
+  _v(l) = clib_min (vec_len (v1), vec_len (v2));	\
+  _v(cmp) = 0;						\
+  for (_v(i) = 0; _v(i) < _v(l); _v(i)++) {		\
+    _v(cmp) = (v1)[_v(i)] - (v2)[_v(i)];		\
+    if (_v(cmp))					\
+      break;						\
+  }							\
+  if (_v(cmp) == 0 && _v(l) > 0)			\
+    _v(cmp) = vec_len(v1) - vec_len(v2);		\
+  (_v(cmp) < 0 ? -1 : (_v(cmp) > 0 ? +1 : 0));		\
+})
+
+/** \brief Search a vector for the index of the entry that matches.
+
+    @param v1 Pointer to a vector
+    @param v2 Entry to match
+    @return index of match or ~0
+*/
+#define vec_search(v,E)					\
+({							\
+  word _v(i) = 0;					\
+  while (_v(i) < vec_len(v))				\
+  {							\
+    if (v[_v(i)] == E)				        \
+      break;						\
+    _v(i)++;						\
+  }							\
+  if (_v(i) == vec_len(v))				\
+    _v(i) = ~0;					        \
+  _v(i);						\
+})
+
+/** \brief Sort a vector using the supplied element comparison function
+
+    @param vec vector to sort
+    @param f comparison function
+*/
+#define vec_sort_with_function(vec,f)				\
+do {								\
+  qsort (vec, vec_len (vec), sizeof (vec[0]), (void *) (f));	\
+} while (0)
+
+/** \brief Make a vector containing a NULL terminated c-string.
+
+    @param V (possibly NULL) pointer to a vector.
+    @param S pointer to string buffer.
+    @param L string length (NOT including the terminating NULL; a la strlen())
+*/
+#define vec_validate_init_c_string(V, S, L)     \
+  do {                                          \
+    vec_reset_length (V);                       \
+    vec_validate ((V), (L));                    \
+    if ((S) && (L))                             \
+        clib_memcpy ((V), (S), (L));            \
+    (V)[(L)] = 0;                               \
+  } while (0)
+
+
+/** \brief Test whether a vector is a NULL terminated c-string.
+
+    @param V (possibly NULL) pointer to a vector.
+    @return BOOLEAN indicating if the vector c-string is null terminated.
+*/
+#define vec_c_string_is_terminated(V)                   \
+  (((V) != 0) && (vec_len (V) != 0) && ((V)[vec_len ((V)) - 1] == 0))
+
+/** \brief (If necessary) NULL terminate a vector containing a c-string.
+
+    @param V (possibly NULL) pointer to a vector.
+    @return V (value-result macro parameter)
+*/
+#define vec_terminate_c_string(V)               \
+  do {                                          \
+    u32 vl = vec_len ((V));                     \
+    if (!vec_c_string_is_terminated(V))         \
+      {                                         \
+        vec_validate ((V), vl);                 \
+        (V)[vl] = 0;                            \
+      }                                         \
+  } while (0)
+
+#endif /* included_vec_h */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vec_bootstrap.h b/src/vppinfra/vec_bootstrap.h
new file mode 100644
index 00000000..3b8c7707
--- /dev/null
+++ b/src/vppinfra/vec_bootstrap.h
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_vec_bootstrap_h
+#define included_clib_vec_bootstrap_h
+
+/** \file
+    Vector bootsrap header file
+*/
+
+/* Bootstrap include so that #include <vppinfra/mem.h> can include e.g.
+   <vppinfra/mheap.h> which depends on <vppinfra/vec.h>. */
+
+/** \brief vector header structure
+
+   Bookeeping header preceding vector elements in memory.
+   User header information may preceed standard vec header.
+   If you change u32 len -> u64 len, single vectors can
+   exceed 2**32 elements. Clib heaps are vectors. */
+
+typedef struct
+{
+#if CLIB_VEC64 > 0
+  u64 len;
+#else
+  u32 len; /**< Number of elements in vector (NOT its allocated length). */
+#endif
+  u8 vector_data[0];  /**< Vector data . */
+} vec_header_t;
+
+/** \brief Find the vector header
+
+    Given the user's pointer to a vector, find the corresponding
+    vector header
+
+    @param v pointer to a vector
+    @return pointer to the vector's vector_header_t
+*/
+#define _vec_find(v)	((vec_header_t *) (v) - 1)
+
+#define _vec_round_size(s) \
+  (((s) + sizeof (uword) - 1) &~ (sizeof (uword) - 1))
+
+always_inline uword
+vec_header_bytes (uword header_bytes)
+{
+  return round_pow2 (header_bytes + sizeof (vec_header_t),
+		     sizeof (vec_header_t));
+}
+
+/** \brief Find a user vector header
+
+    Finds the user header of a vector with unspecified alignment given
+    the user pointer to the vector.
+*/
+
+always_inline void *
+vec_header (void *v, uword header_bytes)
+{
+  return v - vec_header_bytes (header_bytes);
+}
+
+/** \brief Find the end of user vector header
+
+    Finds the end of the user header of a vector with unspecified
+    alignment given the user pointer to the vector.
+*/
+
+always_inline void *
+vec_header_end (void *v, uword header_bytes)
+{
+  return v + vec_header_bytes (header_bytes);
+}
+
+always_inline uword
+vec_aligned_header_bytes (uword header_bytes, uword align)
+{
+  return round_pow2 (header_bytes + sizeof (vec_header_t), align);
+}
+
+always_inline void *
+vec_aligned_header (void *v, uword header_bytes, uword align)
+{
+  return v - vec_aligned_header_bytes (header_bytes, align);
+}
+
+always_inline void *
+vec_aligned_header_end (void *v, uword header_bytes, uword align)
+{
+  return v + vec_aligned_header_bytes (header_bytes, align);
+}
+
+
+/** \brief Number of elements in vector (lvalue-capable)
+
+   _vec_len (v) does not check for null, but can be used as a lvalue
+   (e.g. _vec_len (v) = 99).
+*/
+
+#define _vec_len(v)	(_vec_find(v)->len)
+
+/** \brief Number of elements in vector (rvalue-only, NULL tolerant)
+
+    vec_len (v) checks for NULL, but cannot be used as an lvalue.
+    If in doubt, use vec_len...
+*/
+
+#define vec_len(v)	((v) ? _vec_len(v) : 0)
+
+/** \brief Reset vector length to zero
+    NULL-pointer tolerant
+*/
+
+#define vec_reset_length(v) do { if (v) _vec_len (v) = 0; } while (0)
+
+/** \brief Number of data bytes in vector. */
+
+#define vec_bytes(v) (vec_len (v) * sizeof (v[0]))
+
+/** \brief Total number of bytes that can fit in vector with current allocation. */
+
+#define vec_capacity(v,b)							\
+({										\
+  void * _vec_capacity_v = (void *) (v);					\
+  uword _vec_capacity_b = (b);							\
+  _vec_capacity_b = sizeof (vec_header_t) + _vec_round_size (_vec_capacity_b);	\
+  _vec_capacity_v ? clib_mem_size (_vec_capacity_v - _vec_capacity_b) : 0;	\
+})
+
+/** \brief Total number of elements that can fit into vector. */
+#define vec_max_len(v) (vec_capacity(v,0) / sizeof (v[0]))
+
+/** \brief End (last data address) of vector. */
+#define vec_end(v)	((v) + vec_len (v))
+
+/** \brief True if given pointer is within given vector. */
+#define vec_is_member(v,e) ((e) >= (v) && (e) < vec_end (v))
+
+/** \brief Get vector value at index i checking that i is in bounds. */
+#define vec_elt_at_index(v,i)			\
+({						\
+  ASSERT ((i) < vec_len (v));			\
+  (v) + (i);					\
+})
+
+/** \brief Get vector value at index i */
+#define vec_elt(v,i) (vec_elt_at_index(v,i))[0]
+
+/** \brief Vector iterator */
+#define vec_foreach(var,vec) for (var = (vec); var < vec_end (vec); var++)
+
+/** \brief Vector iterator (reverse) */
+#define vec_foreach_backwards(var,vec) \
+for (var = vec_end (vec) - 1; var >= (vec); var--)
+
+/** \brief Iterate over vector indices. */
+#define vec_foreach_index(var,v) for ((var) = 0; (var) < vec_len (v); (var)++)
+
+#endif /* included_clib_vec_bootstrap_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vector.c b/src/vppinfra/vector.c
new file mode 100644
index 00000000..68b4fdc2
--- /dev/null
+++ b/src/vppinfra/vector.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/types.h>
+
+#if defined (__SSE2__)
+u8 u32x4_compare_word_mask_table[256] = {
+  [0xf0] = (1 << 1),
+  [0x0f] = (1 << 0),
+  [0xff] = (1 << 0) | (1 << 1),
+};
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vector.h b/src/vppinfra/vector.h
new file mode 100644
index 00000000..491e7cfe
--- /dev/null
+++ b/src/vppinfra/vector.h
@@ -0,0 +1,268 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_vector_h
+#define included_clib_vector_h
+
+#include <vppinfra/clib.h>
+
+/* Vector types. */
+
+#if defined (__MMX__) || defined (__IWMMXT__) || defined (__aarch64__)
+#define CLIB_HAVE_VEC64
+#endif
+
+#if defined (__SSE2__) && __GNUC__ >= 4
+#define CLIB_HAVE_VEC128
+#endif
+
+#if defined (__ALTIVEC__)
+#define CLIB_HAVE_VEC128
+#endif
+
+/* 128 implies 64 */
+#ifdef CLIB_HAVE_VEC128
+#define CLIB_HAVE_VEC64
+#endif
+
+#define _vector_size(n) __attribute__ ((vector_size (n)))
+
+#if defined (__aarch64__) || defined (__arm__)
+typedef unsigned int u32x4 _vector_size (16);
+typedef u8 u8x16 _vector_size (16);
+typedef u16 u16x8 _vector_size (16);
+typedef u32 u32x4 _vector_size (16);
+typedef u64 u64x2 _vector_size (16);
+#endif
+
+#ifdef CLIB_HAVE_VEC64
+/* Signed 64 bit. */
+typedef char i8x8 _vector_size (8);
+typedef short i16x4 _vector_size (8);
+typedef int i32x2 _vector_size (8);
+
+/* Unsigned 64 bit. */
+typedef unsigned char u8x8 _vector_size (8);
+typedef unsigned short u16x4 _vector_size (8);
+typedef unsigned int u32x2 _vector_size (8);
+
+/* Floating point 64 bit. */
+typedef float f32x2 _vector_size (8);
+#endif /* CLIB_HAVE_VEC64 */
+
+#ifdef CLIB_HAVE_VEC128
+/* Signed 128 bit. */
+typedef i8 i8x16 _vector_size (16);
+typedef i16 i16x8 _vector_size (16);
+typedef i32 i32x4 _vector_size (16);
+typedef long long i64x2 _vector_size (16);
+
+/* Unsigned 128 bit. */
+typedef u8 u8x16 _vector_size (16);
+typedef u16 u16x8 _vector_size (16);
+typedef u32 u32x4 _vector_size (16);
+typedef u64 u64x2 _vector_size (16);
+
+typedef f32 f32x4 _vector_size (16);
+typedef f64 f64x2 _vector_size (16);
+
+/* Signed 256 bit. */
+typedef i8 i8x32 _vector_size (32);
+typedef i16 i16x16 _vector_size (32);
+typedef i32 i32x8 _vector_size (32);
+typedef long long i64x4 _vector_size (32);
+
+/* Unsigned 256 bit. */
+typedef u8 u8x32 _vector_size (32);
+typedef u16 u16x16 _vector_size (32);
+typedef u32 u32x8 _vector_size (32);
+typedef u64 u64x4 _vector_size (32);
+
+typedef f32 f32x8 _vector_size (32);
+typedef f64 f64x4 _vector_size (32);
+#endif /* CLIB_HAVE_VEC128 */
+
+/* Vector word sized types. */
+#ifndef CLIB_VECTOR_WORD_BITS
+#ifdef CLIB_HAVE_VEC128
+#define CLIB_VECTOR_WORD_BITS 128
+#else
+#define CLIB_VECTOR_WORD_BITS 64
+#endif
+#endif /* CLIB_VECTOR_WORD_BITS */
+
+/* Vector word sized types. */
+#if CLIB_VECTOR_WORD_BITS == 128
+typedef i8 i8x _vector_size (16);
+typedef i16 i16x _vector_size (16);
+typedef i32 i32x _vector_size (16);
+typedef i64 i64x _vector_size (16);
+typedef u8 u8x _vector_size (16);
+typedef u16 u16x _vector_size (16);
+typedef u32 u32x _vector_size (16);
+typedef u64 u64x _vector_size (16);
+#endif
+#if CLIB_VECTOR_WORD_BITS == 64
+typedef i8 i8x _vector_size (8);
+typedef i16 i16x _vector_size (8);
+typedef i32 i32x _vector_size (8);
+typedef i64 i64x _vector_size (8);
+typedef u8 u8x _vector_size (8);
+typedef u16 u16x _vector_size (8);
+typedef u32 u32x _vector_size (8);
+typedef u64 u64x _vector_size (8);
+#endif
+
+#undef _vector_size
+
+#define VECTOR_WORD_TYPE(t) t##x
+#define VECTOR_WORD_TYPE_LEN(t) (sizeof (VECTOR_WORD_TYPE(t)) / sizeof (t))
+
+/* Union types. */
+#if (defined(CLIB_HAVE_VEC128) || defined(CLIB_HAVE_VEC64))
+
+#define _(t)					\
+  typedef union {				\
+    t##x as_##t##x;				\
+    t as_##t[VECTOR_WORD_TYPE_LEN (t)];	\
+  } t##x##_union_t;
+
+_(u8);
+_(u16);
+_(u32);
+_(u64);
+_(i8);
+_(i16);
+_(i32);
+_(i64);
+
+#undef _
+
+#endif
+
+#ifdef CLIB_HAVE_VEC64
+
+#define _(t,n)					\
+  typedef union {				\
+    t##x##n as_##t##x##n;			\
+    t as_##t[n];				\
+  } t##x##n##_union_t;				\
+
+_(u8, 8);
+_(u16, 4);
+_(u32, 2);
+_(i8, 8);
+_(i16, 4);
+_(i32, 2);
+
+#undef _
+
+#endif
+
+#ifdef CLIB_HAVE_VEC128
+
+#define _(t,n)					\
+  typedef union {				\
+    t##x##n as_##t##x##n;			\
+    t as_##t[n];				\
+  } t##x##n##_union_t;				\
+
+_(u8, 16);
+_(u16, 8);
+_(u32, 4);
+_(u64, 2);
+_(i8, 16);
+_(i16, 8);
+_(i32, 4);
+_(i64, 2);
+_(f32, 4);
+_(f64, 2);
+
+#undef _
+
+#endif
+
+/* When we don't have vector types, still define e.g. u32x4_union_t but as an array. */
+#if !defined(CLIB_HAVE_VEC128) && !defined(CLIB_HAVE_VEC64)
+
+#define _(t,n)					\
+  typedef union {				\
+    t as_##t[n];				\
+  } t##x##n##_union_t;				\
+
+_(u8, 16);
+_(u16, 8);
+_(u32, 4);
+_(u64, 2);
+_(i8, 16);
+_(i16, 8);
+_(i32, 4);
+_(i64, 2);
+
+#undef _
+
+#endif
+
+#if defined (__SSE2__) && __GNUC__ >= 4
+#include <vppinfra/vector_sse2.h>
+#endif
+
+#if defined (__ALTIVEC__)
+#include <vppinfra/vector_altivec.h>
+#endif
+
+#if defined (__IWMMXT__)
+#include <vppinfra/vector_iwmmxt.h>
+#endif
+
+#if defined (__aarch64__)
+#include <vppinfra/vector_neon.h>
+#endif
+
+#if (defined(CLIB_HAVE_VEC128) || defined(CLIB_HAVE_VEC64))
+#include <vppinfra/vector_funcs.h>
+#endif
+
+#endif /* included_clib_vector_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vector_altivec.h b/src/vppinfra/vector_altivec.h
new file mode 100644
index 00000000..0e9de820
--- /dev/null
+++ b/src/vppinfra/vector_altivec.h
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2009 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_vector_altivec_h
+#define included_vector_altivec_h
+
+/* Splats. */
+#define _(t,n,ti,fi,tr,fr)						\
+  always_inline t##x##n t##x##n##_splat (t v)				\
+  { return (t##x##n) __builtin_altivec_##fi ((ti) v); }			\
+									\
+  always_inline t##x##n t##x##n##_splat_word (t##x##n x, int word_index) \
+  { return (t##x##n) __builtin_altivec_##fr ((tr) x, word_index); }
+
+#define u16x8_splat(i) ((u16x8) __builtin_altivec_vspltish (i))
+#define i16x8_splat(i) ((i16x8) __builtin_altivec_vspltish (i))
+#define u32x4_splat(i) ((u32x4) __builtin_altivec_vspltisw (i))
+#define i32x4_splat(i) ((i32x4) __builtin_altivec_vspltisw (i))
+
+#define u16x8_splat_word(x,i) ((u16x8) __builtin_altivec_vsplth ((i16x8) (x), (i)))
+#define i16x8_splat_word(x,i) ((i16x8) __builtin_altivec_vsplth ((i16x8) (x), (i)))
+#define u32x4_splat_word(x,i) ((u32x4) __builtin_altivec_vspltw ((i32x4) (x), (i)))
+#define i32x4_splat_word(x,i) ((i32x4) __builtin_altivec_vspltw ((i32x4) (x), (i)))
+
+#undef _
+
+/* 128 bit shifts. */
+#define _(t,ti,lr,f)						\
+  always_inline t t##_##lr (t x, t y)				\
+  { return (t) __builtin_altivec_##f ((ti) x, (ti) y); }	\
+								\
+  always_inline t t##_i##lr (t x, int i)			\
+  {								\
+    t j = {i,i,i,i}; \
+    return t##_##lr (x, j);					\
+  }
+
+_(u16x8, i16x8, shift_left, vslh);
+_(u32x4, i32x4, shift_left, vslw);
+_(u16x8, i16x8, shift_right, vsrh);
+_(u32x4, i32x4, shift_right, vsrw);
+_(i16x8, i16x8, shift_right, vsrah);
+_(i32x4, i32x4, shift_right, vsraw);
+_(u16x8, i16x8, rotate_left, vrlh);
+_(i16x8, i16x8, rotate_left, vrlh);
+_(u32x4, i32x4, rotate_left, vrlw);
+_(i32x4, i32x4, rotate_left, vrlw);
+
+#undef _
+
+#define _(t,it,lr,f)						\
+  always_inline t t##_word_shift_##lr (t x, int n_words)	\
+  {								\
+    i32x4 n_bits = {0,0,0,n_words * BITS (it)};			\
+    return (t) __builtin_altivec_##f ((i32x4) x, n_bits);	\
+  }
+
+_(u32x4, u32, left, vslo)
+_(i32x4, i32, left, vslo)
+_(u32x4, u32, right, vsro)
+_(i32x4, i32, right, vsro)
+_(u16x8, u16, left, vslo)
+_(i16x8, i16, left, vslo)
+_(u16x8, u16, right, vsro) _(i16x8, i16, right, vsro)
+#undef _
+     always_inline
+       u32
+     u32x4_get0 (u32x4 x)
+{
+  u32x4_union_t y;
+  y.as_u32x4 = x;
+  return y.as_u32[3];
+}
+
+/* Interleave. */
+#define _(t,it,lh,f)						\
+  always_inline t t##_interleave_##lh (t x, t y)		\
+  { return (t) __builtin_altivec_##f ((it) x, (it) y); }
+
+_(u32x4, i32x4, lo, vmrglw)
+_(i32x4, i32x4, lo, vmrglw)
+_(u16x8, i16x8, lo, vmrglh)
+_(i16x8, i16x8, lo, vmrglh)
+_(u32x4, i32x4, hi, vmrghw)
+_(i32x4, i32x4, hi, vmrghw)
+_(u16x8, i16x8, hi, vmrghh) _(i16x8, i16x8, hi, vmrghh)
+#undef _
+/* Unaligned loads/stores. */
+#ifndef __cplusplus
+#define _(t)						\
+  always_inline void t##_store_unaligned (t x, t * a)	\
+  { clib_mem_unaligned (a, t) = x; }			\
+  always_inline t t##_load_unaligned (t * a)		\
+  { return clib_mem_unaligned (a, t); }
+  _(u8x16) _(u16x8) _(u32x4) _(u64x2) _(i8x16) _(i16x8) _(i32x4) _(i64x2)
+#undef _
+#endif
+#define _signed_binop(n,m,f,g)						\
+  /* Unsigned */							\
+  always_inline u##n##x##m						\
+  u##n##x##m##_##f (u##n##x##m x, u##n##x##m y)				\
+  { return (u##n##x##m) __builtin_altivec_##g ((i##n##x##m) x, (i##n##x##m) y); } \
+									\
+  /* Signed */								\
+  always_inline i##n##x##m						\
+  i##n##x##m##_##f (i##n##x##m x, i##n##x##m y)				\
+  { return (i##n##x##m) __builtin_altivec_##g ((i##n##x##m) x, (i##n##x##m) y); }
+/* Compare operations. */
+  _signed_binop (16, 8, is_equal, vcmpequh)
+_signed_binop (32, 4, is_equal, vcmpequw)
+#undef _signed_binop
+     always_inline u16x8 u16x8_is_zero (u16x8 x)
+{
+  u16x8 zero = { 0 };
+  return u16x8_is_equal (x, zero);
+}
+
+always_inline u32x4
+u32x4_is_zero (u32x4 x)
+{
+  u32x4 zero = { 0 };
+  return u32x4_is_equal (x, zero);
+}
+
+always_inline u32
+u32x4_zero_byte_mask (u32x4 x)
+{
+  u32x4 cmp = u32x4_is_zero (x);
+  u32x4 tmp = { 0x000f, 0x00f0, 0x0f00, 0xf000, };
+  cmp &= tmp;
+  cmp |= u32x4_word_shift_right (cmp, 2);
+  cmp |= u32x4_word_shift_right (cmp, 1);
+  return u32x4_get0 (cmp);
+}
+
+#endif /* included_vector_altivec_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vector_funcs.h b/src/vppinfra/vector_funcs.h
new file mode 100644
index 00000000..db09de0f
--- /dev/null
+++ b/src/vppinfra/vector_funcs.h
@@ -0,0 +1,334 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2008 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_vector_funcs_h
+#define included_vector_funcs_h
+
+#include <vppinfra/byte_order.h>
+
+/* Addition/subtraction. */
+#if CLIB_VECTOR_WORD_BITS == 128
+#define u8x_add u8x16_add
+#define u16x_add u16x8_add
+#define u32x_add u32x4_add
+#define u64x_add u64x2_add
+#define i8x_add i8x16_add
+#define i16x_add i16x8_add
+#define i32x_add i32x4_add
+#define i64x_add i64x2_add
+#define u8x_sub u8x16_sub
+#define u16x_sub u16x8_sub
+#define u32x_sub u32x4_sub
+#define u64x_sub u64x2_sub
+#define i8x_sub i8x16_sub
+#define i16x_sub i16x8_sub
+#define i32x_sub i32x4_sub
+#define i64x_sub i64x2_sub
+#endif
+
+#if CLIB_VECTOR_WORD_BITS == 64
+#define u8x_add u8x8_add
+#define u16x_add u16x4_add
+#define u32x_add u32x2_add
+#define i8x_add i8x8_add
+#define i16x_add i16x4_add
+#define i32x_add i32x2_add
+#define u8x_sub u8x8_sub
+#define u16x_sub u16x4_sub
+#define u32x_sub u32x2_sub
+#define i8x_sub i8x8_sub
+#define i16x_sub i16x4_sub
+#define i32x_sub i32x2_sub
+#endif
+
+/* Saturating addition/subtraction. */
+#if CLIB_VECTOR_WORD_BITS == 128
+#define u8x_add_saturate u8x16_add_saturate
+#define u16x_add_saturate u16x8_add_saturate
+#define i8x_add_saturate i8x16_add_saturate
+#define i16x_add_saturate i16x8_add_saturate
+#define u8x_sub_saturate u8x16_sub_saturate
+#define u16x_sub_saturate u16x8_sub_saturate
+#define i8x_sub_saturate i8x16_sub_saturate
+#define i16x_sub_saturate i16x8_sub_saturate
+#endif
+
+#if CLIB_VECTOR_WORD_BITS == 64
+#define u8x_add_saturate u8x8_add_saturate
+#define u16x_add_saturate u16x4_add_saturate
+#define i8x_add_saturate i8x8_add_saturate
+#define i16x_add_saturate i16x4_add_saturate
+#define u8x_sub_saturate u8x8_sub_saturate
+#define u16x_sub_saturate u16x4_sub_saturate
+#define i8x_sub_saturate i8x8_sub_saturate
+#define i16x_sub_saturate i16x4_sub_saturate
+#endif
+
+#define _vector_interleave(a,b,t)		\
+do {						\
+  t _tmp_lo = t##_interleave_lo (a, b);		\
+  t _tmp_hi = t##_interleave_hi (a, b);		\
+  if (CLIB_ARCH_IS_LITTLE_ENDIAN)		\
+    (a) = _tmp_lo, (b) = _tmp_hi;		\
+  else						\
+    (a) = _tmp_hi, (b) = _tmp_lo;		\
+} while (0)
+
+/* 128 bit interleaves. */
+#define u8x16_interleave(a,b) _vector_interleave(a,b,u8x16)
+#define i8x16_interleave(a,b) _vector_interleave(a,b,i8x16)
+#define u16x8_interleave(a,b) _vector_interleave(a,b,u16x8)
+#define i16x8_interleave(a,b) _vector_interleave(a,b,i16x8)
+#define u32x4_interleave(a,b) _vector_interleave(a,b,u32x4)
+#define i32x4_interleave(a,b) _vector_interleave(a,b,i32x4)
+#define u64x2_interleave(a,b) _vector_interleave(a,b,u64x2)
+#define i64x2_interleave(a,b) _vector_interleave(a,b,i64x2)
+
+/* 64 bit interleaves. */
+#define u8x8_interleave(a,b) _vector_interleave(a,b,u8x8)
+#define i8x8_interleave(a,b) _vector_interleave(a,b,i8x8)
+#define u16x4_interleave(a,b) _vector_interleave(a,b,u16x4)
+#define i16x4_interleave(a,b) _vector_interleave(a,b,i16x4)
+#define u32x2_interleave(a,b) _vector_interleave(a,b,u32x2)
+#define i32x2_interleave(a,b) _vector_interleave(a,b,i32x2)
+
+/* Word sized interleaves. */
+#if CLIB_VECTOR_WORD_BITS == 128
+#define u8x_interleave u8x16_interleave
+#define u16x_interleave u16x8_interleave
+#define u32x_interleave u32x4_interleave
+#define u64x_interleave u64x2_interleave
+#endif
+
+#if CLIB_VECTOR_WORD_BITS == 64
+#define u8x_interleave u8x8_interleave
+#define u16x_interleave u16x4_interleave
+#define u32x_interleave u32x2_interleave
+#define u64x_interleave(a,b)	/* do nothing */
+#endif
+
+/* Vector word sized shifts. */
+#if CLIB_VECTOR_WORD_BITS == 128
+#define u8x_shift_left u8x16_shift_left
+#define i8x_shift_left i8x16_shift_left
+#define u16x_shift_left u16x8_shift_left
+#define i16x_shift_left i16x8_shift_left
+#define u32x_shift_left u32x4_shift_left
+#define i32x_shift_left i32x4_shift_left
+#define u64x_shift_left u64x2_shift_left
+#define i64x_shift_left i64x2_shift_left
+#define u8x_shift_right u8x16_shift_right
+#define i8x_shift_right i8x16_shift_right
+#define u16x_shift_right u16x8_shift_right
+#define i16x_shift_right i16x8_shift_right
+#define u32x_shift_right u32x4_shift_right
+#define i32x_shift_right i32x4_shift_right
+#define u64x_shift_right u64x2_shift_right
+#define i64x_shift_right i64x2_shift_right
+#define u8x_rotate_left u8x16_rotate_left
+#define i8x_rotate_left i8x16_rotate_left
+#define u16x_rotate_left u16x8_rotate_left
+#define i16x_rotate_left i16x8_rotate_left
+#define u32x_rotate_left u32x4_rotate_left
+#define i32x_rotate_left i32x4_rotate_left
+#define u64x_rotate_left u64x2_rotate_left
+#define i64x_rotate_left i64x2_rotate_left
+#define u8x_rotate_right u8x16_rotate_right
+#define i8x_rotate_right i8x16_rotate_right
+#define u16x_rotate_right u16x8_rotate_right
+#define i16x_rotate_right i16x8_rotate_right
+#define u32x_rotate_right u32x4_rotate_right
+#define i32x_rotate_right i32x4_rotate_right
+#define u64x_rotate_right u64x2_rotate_right
+#define i64x_rotate_right i64x2_rotate_right
+#define u8x_ishift_left u8x16_ishift_left
+#define i8x_ishift_left i8x16_ishift_left
+#define u16x_ishift_left u16x8_ishift_left
+#define i16x_ishift_left i16x8_ishift_left
+#define u32x_ishift_left u32x4_ishift_left
+#define i32x_ishift_left i32x4_ishift_left
+#define u64x_ishift_left u64x2_ishift_left
+#define i64x_ishift_left i64x2_ishift_left
+#define u8x_ishift_right u8x16_ishift_right
+#define i8x_ishift_right i8x16_ishift_right
+#define u16x_ishift_right u16x8_ishift_right
+#define i16x_ishift_right i16x8_ishift_right
+#define u32x_ishift_right u32x4_ishift_right
+#define i32x_ishift_right i32x4_ishift_right
+#define u64x_ishift_right u64x2_ishift_right
+#define i64x_ishift_right i64x2_ishift_right
+#define u8x_irotate_left u8x16_irotate_left
+#define i8x_irotate_left i8x16_irotate_left
+#define u16x_irotate_left u16x8_irotate_left
+#define i16x_irotate_left i16x8_irotate_left
+#define u32x_irotate_left u32x4_irotate_left
+#define i32x_irotate_left i32x4_irotate_left
+#define u64x_irotate_left u64x2_irotate_left
+#define i64x_irotate_left i64x2_irotate_left
+#define u8x_irotate_right u8x16_irotate_right
+#define i8x_irotate_right i8x16_irotate_right
+#define u16x_irotate_right u16x8_irotate_right
+#define i16x_irotate_right i16x8_irotate_right
+#define u32x_irotate_right u32x4_irotate_right
+#define i32x_irotate_right i32x4_irotate_right
+#define u64x_irotate_right u64x2_irotate_right
+#define i64x_irotate_right i64x2_irotate_right
+#endif
+
+#if CLIB_VECTOR_WORD_BITS == 64
+#define u8x_shift_left u8x8_shift_left
+#define i8x_shift_left i8x8_shift_left
+#define u16x_shift_left u16x4_shift_left
+#define i16x_shift_left i16x4_shift_left
+#define u32x_shift_left u32x2_shift_left
+#define i32x_shift_left i32x2_shift_left
+#define u8x_shift_right u8x8_shift_right
+#define i8x_shift_right i8x8_shift_right
+#define u16x_shift_right u16x4_shift_right
+#define i16x_shift_right i16x4_shift_right
+#define u32x_shift_right u32x2_shift_right
+#define i32x_shift_right i32x2_shift_right
+#define u8x_rotate_left u8x8_rotate_left
+#define i8x_rotate_left i8x8_rotate_left
+#define u16x_rotate_left u16x4_rotate_left
+#define i16x_rotate_left i16x4_rotate_left
+#define u32x_rotate_left u32x2_rotate_left
+#define i32x_rotate_left i32x2_rotate_left
+#define u8x_rotate_right u8x8_rotate_right
+#define i8x_rotate_right i8x8_rotate_right
+#define u16x_rotate_right u16x4_rotate_right
+#define i16x_rotate_right i16x4_rotate_right
+#define u32x_rotate_right u32x2_rotate_right
+#define i32x_rotate_right i32x2_rotate_right
+#define u8x_ishift_left u8x8_ishift_left
+#define i8x_ishift_left i8x8_ishift_left
+#define u16x_ishift_left u16x4_ishift_left
+#define i16x_ishift_left i16x4_ishift_left
+#define u32x_ishift_left u32x2_ishift_left
+#define i32x_ishift_left i32x2_ishift_left
+#define u8x_ishift_right u8x8_ishift_right
+#define i8x_ishift_right i8x8_ishift_right
+#define u16x_ishift_right u16x4_ishift_right
+#define i16x_ishift_right i16x4_ishift_right
+#define u32x_ishift_right u32x2_ishift_right
+#define i32x_ishift_right i32x2_ishift_right
+#define u8x_irotate_left u8x8_irotate_left
+#define i8x_irotate_left i8x8_irotate_left
+#define u16x_irotate_left u16x4_irotate_left
+#define i16x_irotate_left i16x4_irotate_left
+#define u32x_irotate_left u32x2_irotate_left
+#define i32x_irotate_left i32x2_irotate_left
+#define u8x_irotate_right u8x8_irotate_right
+#define i8x_irotate_right i8x8_irotate_right
+#define u16x_irotate_right u16x4_irotate_right
+#define i16x_irotate_right i16x4_irotate_right
+#define u32x_irotate_right u32x2_irotate_right
+#define i32x_irotate_right i32x2_irotate_right
+#endif
+
+#if CLIB_VECTOR_WORD_BITS == 128
+#define u8x_splat u8x16_splat
+#define i8x_splat i8x16_splat
+#define u16x_splat u16x8_splat
+#define i16x_splat i16x8_splat
+#define u32x_splat u32x4_splat
+#define i32x_splat i32x4_splat
+#define u64x_splat u64x2_splat
+#define i64x_splat i64x2_splat
+#endif
+
+#if CLIB_VECTOR_WORD_BITS == 64
+#define u8x_splat u8x8_splat
+#define i8x_splat i8x8_splat
+#define u16x_splat u16x4_splat
+#define i16x_splat i16x4_splat
+#define u32x_splat u32x2_splat
+#define i32x_splat i32x2_splat
+#endif
+
+#define u32x4_transpose_step(x,y)		\
+do {						\
+  u32x4 _x = (x);				\
+  u32x4 _y = (y);				\
+  (x) = u32x4_interleave_lo (_x, _y);		\
+  (y) = u32x4_interleave_hi (_x, _y);		\
+} while (0)
+
+/* 4x4 transpose: x_ij -> x_ji */
+#define u32x4_transpose(x0,x1,x2,x3)		\
+do {						\
+  u32x4 _x0 = (u32x4) (x0);			\
+  u32x4 _x1 = (u32x4) (x1);			\
+  u32x4 _x2 = (u32x4) (x2);			\
+  u32x4 _x3 = (u32x4) (x3);			\
+  u32x4_transpose_step (_x0, _x2);		\
+  u32x4_transpose_step (_x1, _x3);		\
+  u32x4_transpose_step (_x0, _x1);		\
+  u32x4_transpose_step (_x2, _x3);		\
+  (x0) = (u32x4) _x0;				\
+  (x1) = (u32x4) _x1;				\
+  (x2) = (u32x4) _x2;				\
+  (x3) = (u32x4) _x3;				\
+} while (0)
+
+#define i32x4_transpose(x0,x1,x2,x3)		\
+do {						\
+  u32x4 _x0 = (u32x4) (x0);			\
+  u32x4 _x1 = (u32x4) (x1);			\
+  u32x4 _x2 = (u32x4) (x2);			\
+  u32x4 _x3 = (u32x4) (x3);			\
+  u32x4_transpose_step (_x0, _x2);		\
+  u32x4_transpose_step (_x1, _x3);		\
+  u32x4_transpose_step (_x0, _x1);		\
+  u32x4_transpose_step (_x2, _x3);		\
+  (x0) = (i32x4) _x0;				\
+  (x1) = (i32x4) _x1;				\
+  (x2) = (i32x4) _x2;				\
+  (x3) = (i32x4) _x3;				\
+} while (0)
+
+#undef _
+
+#endif /* included_vector_funcs_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vector_iwmmxt.h b/src/vppinfra/vector_iwmmxt.h
new file mode 100644
index 00000000..8e662045
--- /dev/null
+++ b/src/vppinfra/vector_iwmmxt.h
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2008 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_vector_iwmmxt_h
+#define included_vector_iwmmxt_h
+
+#include <vppinfra/error.h>	/* for ASSERT */
+
+/* 64 bit interleaves. */
+always_inline u8x8
+u8x8_interleave_hi (u8x8 a, u8x8 b)
+{
+  return __builtin_arm_wunpckihb (a, b);
+}
+
+always_inline u8x8
+u8x8_interleave_lo (u8x8 a, u8x8 b)
+{
+  return __builtin_arm_wunpckilb (a, b);
+}
+
+always_inline u16x4
+u16x4_interleave_hi (u16x4 a, u16x4 b)
+{
+  return __builtin_arm_wunpckihh (a, b);
+}
+
+always_inline u16x4
+u16x4_interleave_lo (u16x4 a, u16x4 b)
+{
+  return __builtin_arm_wunpckilh (a, b);
+}
+
+always_inline u32x2
+u32x2_interleave_hi (u32x2 a, u32x2 b)
+{
+  return __builtin_arm_wunpckihw (a, b);
+}
+
+always_inline u32x2
+u32x2_interleave_lo (u32x2 a, u32x2 b)
+{
+  return __builtin_arm_wunpckilw (a, b);
+}
+
+always_inline u32x2
+u32x2_splat (u32 a)
+{
+  u32x2 x = { a };
+  x = u32x2_interleave_lo (x, x);
+  return x;
+}
+
+always_inline u16x4
+u16x4_splat (u16 a)
+{
+  u32 t = (u32) a | ((u32) a << 16);
+  return u32x2_splat (t);
+}
+
+always_inline u8x8
+u8x8_splat (u8 a)
+{
+  u32 t = (u32) a | ((u32) a << 8);
+  t |= t << 16;
+  return u32x2_splat (t);
+}
+
+#define i32x2_splat u32x2_splat
+#define i16x4_splat u16x4_splat
+#define i8x8_splat u8x8_splat
+
+/* 64 bit shifts. */
+
+/* As of July 2008 the __builtin_arm shifts cause gcc-4.3.1 to crash
+   so we use asm versions. */
+#define _(t,u,lr,f)				\
+  always_inline t				\
+  t##_##lr (t x, int i)				\
+  {						\
+    i16x4 y;					\
+    asm (#f " %[y], %[x], %[shift]"		\
+	 : [y] "=y" (y)				\
+	 : [x] "y" (x), [shift] "i" (i * u));	\
+    return y;					\
+  }
+
+_(u16x4, 1, shift_left, wsllhi)
+_(u32x2, 1, shift_left, wsllwi)
+_(u16x4, 1, shift_right, wsrlhi)
+_(u32x2, 1, shift_right, wsrlwi)
+_(i16x4, 1, shift_left, wsllhi)
+_(i32x2, 1, shift_left, wsllwi)
+_(i16x4, 1, shift_right, wsrahi) _(i32x2, 1, shift_right, wsrawi)
+/* Word shifts. */
+  _(u8x8, 8, word_shift_left, wslldi)
+_(u16x4, 16, word_shift_left, wslldi)
+_(u32x2, 32, word_shift_left, wslldi)
+_(u8x8, 8, word_shift_right, wsrldi)
+_(u16x4, 16, word_shift_right, wsrldi)
+_(u32x2, 32, word_shift_right, wsrldi)
+_(i8x8, 8, word_shift_left, wslldi)
+_(i16x4, 16, word_shift_left, wslldi)
+_(i32x2, 32, word_shift_left, wslldi)
+_(i8x8, 8, word_shift_right, wsrldi)
+_(i16x4, 16, word_shift_right, wsrldi) _(i32x2, 32, word_shift_right, wsrldi)
+#undef _
+#endif /* included_vector_iwmmxt_h */
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vector_neon.h b/src/vppinfra/vector_neon.h
new file mode 100644
index 00000000..cea52759
--- /dev/null
+++ b/src/vppinfra/vector_neon.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_vector_neon_h
+#define included_vector_neon_h
+#include <arm_neon.h>
+
+/* Splats. */
+
+#define u8x16_splat(i) vdupq_n_u8(i)
+#define u16x8_splat(i) vdupq_n_u16(i)
+#define i16x8_splat(i) vdupq_n_s16(i)
+#define u32x4_splat(i) vdupq_n_u32(i)
+#define i32x4_splat(i) vdupq_n_s32(i)
+
+/* Arithmetic */
+#define u16x8_add(a,b) vaddq_u16(a,b)
+#define i16x8_add(a,b) vaddq_s16(a,b)
+#define u16x8_sub_saturate(a,b) vsubq_u16(a,b)
+#define i16x8_sub_saturate(a,b) vsubq_s16(a,b)
+
+#define u16x8_is_equal(a,b) vceqq_u16(a,b)
+#define i16x8_is_equal(a,b) vceqq_i16(a,b)
+
+always_inline u32
+u16x8_zero_byte_mask (u16x8 input)
+{
+  u8x16 vall_one = vdupq_n_u8 (0x0);
+  u8x16 res_values = { 0x01, 0x02, 0x04, 0x08,
+    0x10, 0x20, 0x40, 0x80,
+    0x01, 0x02, 0x04, 0x08,
+    0x10, 0x20, 0x40, 0x80
+  };
+
+  /* input --> [0x80, 0x40, 0x01, 0xf0, ... ] */
+  u8x16 test_result =
+    vreinterpretq_u8_u16 (vceqq_u16 (input, vreinterpretq_u16_u8 (vall_one)));
+  u8x16 before_merge = vminq_u8 (test_result, res_values);
+  /*before_merge--> [0x80, 0x00, 0x00, 0x10, ... ] */
+  /* u8x16 --> [a,b,c,d, e,f,g,h, i,j,k,l, m,n,o,p] */
+  /* pair add until we have 2 uint64_t  */
+  u16x8 merge1 = vpaddlq_u8 (before_merge);
+  /* u16x8-->  [a+b,c+d, e+f,g+h, i+j,k+l, m+n,o+p] */
+  u32x4 merge2 = vpaddlq_u16 (merge1);
+  /* u32x4-->  [a+b+c+d, e+f+g+h, i+j+k+l, m+n+o+p] */
+  u64x2 merge3 = vpaddlq_u32 (merge2);
+  /* u64x2-->  [a+b+c+d+e+f+g+h,  i+j+k+l+m+n+o+p]  */
+  return (u32) (vgetq_lane_u64 (merge3, 1) << 8) + vgetq_lane_u64 (merge3, 0);
+}
+
+#endif /* included_vector_neon_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vector_sse2.h b/src/vppinfra/vector_sse2.h
new file mode 100644
index 00000000..f782e8fd
--- /dev/null
+++ b/src/vppinfra/vector_sse2.h
@@ -0,0 +1,711 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_vector_sse2_h
+#define included_vector_sse2_h
+
+#include <vppinfra/error_bootstrap.h>	/* for ASSERT */
+#include <x86intrin.h>
+
+/* 128 bit interleaves. */
+always_inline u8x16
+u8x16_interleave_hi (u8x16 a, u8x16 b)
+{
+  return (u8x16) _mm_unpackhi_epi8 ((__m128i) a, (__m128i) b);
+}
+
+always_inline u8x16
+u8x16_interleave_lo (u8x16 a, u8x16 b)
+{
+  return (u8x16) _mm_unpacklo_epi8 ((__m128i) a, (__m128i) b);
+}
+
+always_inline u16x8
+u16x8_interleave_hi (u16x8 a, u16x8 b)
+{
+  return (u16x8) _mm_unpackhi_epi16 ((__m128i) a, (__m128i) b);
+}
+
+always_inline u16x8
+u16x8_interleave_lo (u16x8 a, u16x8 b)
+{
+  return (u16x8) _mm_unpacklo_epi16 ((__m128i) a, (__m128i) b);
+}
+
+always_inline u32x4
+u32x4_interleave_hi (u32x4 a, u32x4 b)
+{
+  return (u32x4) _mm_unpackhi_epi32 ((__m128i) a, (__m128i) b);
+}
+
+always_inline u32x4
+u32x4_interleave_lo (u32x4 a, u32x4 b)
+{
+  return (u32x4) _mm_unpacklo_epi32 ((__m128i) a, (__m128i) b);
+}
+
+always_inline u64x2
+u64x2_interleave_hi (u64x2 a, u64x2 b)
+{
+  return (u64x2) _mm_unpackhi_epi64 ((__m128i) a, (__m128i) b);
+}
+
+always_inline u64x2
+u64x2_interleave_lo (u64x2 a, u64x2 b)
+{
+  return (u64x2) _mm_unpacklo_epi64 ((__m128i) a, (__m128i) b);
+}
+
+/* 64 bit interleaves. */
+always_inline u8x8
+u8x8_interleave_hi (u8x8 a, u8x8 b)
+{
+  return (u8x8) _m_punpckhbw ((__m64) a, (__m64) b);
+}
+
+always_inline u8x8
+u8x8_interleave_lo (u8x8 a, u8x8 b)
+{
+  return (u8x8) _m_punpcklbw ((__m64) a, (__m64) b);
+}
+
+always_inline u16x4
+u16x4_interleave_hi (u16x4 a, u16x4 b)
+{
+  return (u16x4) _m_punpckhwd ((__m64) a, (__m64) b);
+}
+
+always_inline u16x4
+u16x4_interleave_lo (u16x4 a, u16x4 b)
+{
+  return (u16x4) _m_punpcklwd ((__m64) a, (__m64) b);
+}
+
+always_inline u32x2
+u32x2_interleave_hi (u32x2 a, u32x2 b)
+{
+  return (u32x2) _m_punpckhdq ((__m64) a, (__m64) b);
+}
+
+always_inline u32x2
+u32x2_interleave_lo (u32x2 a, u32x2 b)
+{
+  return (u32x2) _m_punpckldq ((__m64) a, (__m64) b);
+}
+
+/* 128 bit packs. */
+always_inline u8x16
+u16x8_pack (u16x8 lo, u16x8 hi)
+{
+  return (u8x16) _mm_packus_epi16 ((__m128i) lo, (__m128i) hi);
+}
+
+always_inline i8x16
+i16x8_pack (i16x8 lo, i16x8 hi)
+{
+  return (i8x16) _mm_packs_epi16 ((__m128i) lo, (__m128i) hi);
+}
+
+always_inline u16x8
+u32x4_pack (u32x4 lo, u32x4 hi)
+{
+  return (u16x8) _mm_packs_epi32 ((__m128i) lo, (__m128i) hi);
+}
+
+/* 64 bit packs. */
+always_inline u8x8
+u16x4_pack (u16x4 lo, u16x4 hi)
+{
+  return (u8x8) _m_packuswb ((__m64) lo, (__m64) hi);
+}
+
+always_inline i8x8
+i16x4_pack (i16x4 lo, i16x4 hi)
+{
+  return (i8x8) _m_packsswb ((__m64) lo, (__m64) hi);
+}
+
+always_inline u16x4
+u32x2_pack (u32x2 lo, u32x2 hi)
+{
+  return (u16x4) _m_packssdw ((__m64) lo, (__m64) hi);
+}
+
+always_inline i16x4
+i32x2_pack (i32x2 lo, i32x2 hi)
+{
+  return (i16x4) _m_packssdw ((__m64) lo, (__m64) hi);
+}
+
+/* Splats: replicate scalar value into vector. */
+always_inline u64x2
+u64x2_splat (u64 a)
+{
+  u64x2 x = { a };
+  x = u64x2_interleave_lo (x, x);
+  return x;
+}
+
+always_inline u32x4
+u32x4_splat (u32 a)
+{
+  u32x4 x = { a };
+  x = u32x4_interleave_lo (x, x);
+  x = (u32x4) u64x2_interleave_lo ((u64x2) x, (u64x2) x);
+  return x;
+}
+
+always_inline u16x8
+u16x8_splat (u16 a)
+{
+  u32 t = (u32) a | ((u32) a << 16);
+  return (u16x8) u32x4_splat (t);
+}
+
+always_inline u8x16
+u8x16_splat (u8 a)
+{
+  u32 t = (u32) a | ((u32) a << 8);
+  t |= t << 16;
+  return (u8x16) u16x8_splat (t);
+}
+
+always_inline u32x2
+u32x2_splat (u32 a)
+{
+  u32x2 x = { a };
+  x = u32x2_interleave_lo (x, x);
+  return x;
+}
+
+always_inline u16x4
+u16x4_splat (u16 a)
+{
+  u32 t = (u32) a | ((u32) a << 16);
+  return (u16x4) u32x2_splat (t);
+}
+
+always_inline u8x8
+u8x8_splat (u8 a)
+{
+  u32 t = (u32) a | ((u32) a << 8);
+  t |= t << 16;
+  return (u8x8) u32x2_splat (t);
+}
+
+#define i64x2_splat u64x2_splat
+#define i32x4_splat u32x4_splat
+#define i16x8_splat u16x8_splat
+#define i8x16_splat u8x16_splat
+#define i32x2_splat u32x2_splat
+#define i16x4_splat u16x4_splat
+#define i8x8_splat u8x8_splat
+
+#ifndef __ICC
+always_inline u64x2
+u64x2_read_lo (u64x2 x, u64 * a)
+{
+  return (u64x2) _mm_loadl_pi ((__m128) x, (__m64 *) a);
+}
+
+always_inline u64x2
+u64x2_read_hi (u64x2 x, u64 * a)
+{
+  return (u64x2) _mm_loadh_pi ((__m128) x, (__m64 *) a);
+}
+
+always_inline void
+u64x2_write_lo (u64x2 x, u64 * a)
+{
+  _mm_storel_pi ((__m64 *) a, (__m128) x);
+}
+
+always_inline void
+u64x2_write_hi (u64x2 x, u64 * a)
+{
+  _mm_storeh_pi ((__m64 *) a, (__m128) x);
+}
+#endif
+
+/* Unaligned loads/stores. */
+
+#define _(t)						\
+  always_inline void t##_store_unaligned (t x, t * a)	\
+  { _mm_storeu_si128 ((__m128i *) a, (__m128i) x); }	\
+  always_inline t t##_load_unaligned (t * a)		\
+  { return (t) _mm_loadu_si128 ((__m128i *) a); }
+
+_(u8x16) _(u16x8) _(u32x4) _(u64x2) _(i8x16) _(i16x8) _(i32x4) _(i64x2)
+#undef _
+#define _signed_binop(n,m,f,g)                                         \
+  /* Unsigned */                                                       \
+  always_inline u##n##x##m                                             \
+  u##n##x##m##_##f (u##n##x##m x, u##n##x##m y)                        \
+  { return (u##n##x##m) _mm_##g##n ((__m128i) x, (__m128i) y); } \
+                                                                       \
+  /* Signed */                                                         \
+  always_inline i##n##x##m                                             \
+  i##n##x##m##_##f (i##n##x##m x, i##n##x##m y)                        \
+  { return (i##n##x##m) _mm_##g##n ((__m128i) x, (__m128i) y); }
+/* Addition/subtraction. */
+  _signed_binop (8, 16, add, add_epi)
+_signed_binop (16, 8, add, add_epi)
+_signed_binop (32, 4, add, add_epi)
+_signed_binop (64, 2, add, add_epi)
+_signed_binop (8, 16, sub, sub_epi)
+_signed_binop (16, 8, sub, sub_epi)
+_signed_binop (32, 4, sub, sub_epi) _signed_binop (64, 2, sub, sub_epi)
+/* Addition/subtraction with saturation. */
+  _signed_binop (8, 16, add_saturate, adds_epu)
+_signed_binop (16, 8, add_saturate, adds_epu)
+_signed_binop (8, 16, sub_saturate, subs_epu)
+_signed_binop (16, 8, sub_saturate, subs_epu)
+/* Multiplication. */
+     always_inline i16x8 i16x8_mul_lo (i16x8 x, i16x8 y)
+{
+  return (i16x8) _mm_mullo_epi16 ((__m128i) x, (__m128i) y);
+}
+
+always_inline u16x8
+u16x8_mul_lo (u16x8 x, u16x8 y)
+{
+  return (u16x8) _mm_mullo_epi16 ((__m128i) x, (__m128i) y);
+}
+
+always_inline i16x8
+i16x8_mul_hi (i16x8 x, i16x8 y)
+{
+  return (i16x8) _mm_mulhi_epu16 ((__m128i) x, (__m128i) y);
+}
+
+always_inline u16x8
+u16x8_mul_hi (u16x8 x, u16x8 y)
+{
+  return (u16x8) _mm_mulhi_epu16 ((__m128i) x, (__m128i) y);
+}
+
+/* 128 bit shifts. */
+
+#define _(p,a,b,c,f)           \
+  always_inline p##a##x##b p##a##x##b##_ishift_##c (p##a##x##b x, int i)       \
+  { return (p##a##x##b) _mm_##f##i_epi##a ((__m128i) x, i); }                  \
+                                                                               \
+  always_inline p##a##x##b p##a##x##b##_shift_##c (p##a##x##b x, p##a##x##b y) \
+  { return (p##a##x##b) _mm_##f##_epi##a ((__m128i) x, (__m128i) y); }
+
+_(u, 16, 8, left, sll)
+_(u, 32, 4, left, sll)
+_(u, 64, 2, left, sll)
+_(u, 16, 8, right, srl)
+_(u, 32, 4, right, srl)
+_(u, 64, 2, right, srl)
+_(i, 16, 8, left, sll)
+_(i, 32, 4, left, sll)
+_(i, 64, 2, left, sll) _(i, 16, 8, right, sra) _(i, 32, 4, right, sra)
+#undef _
+/* 64 bit shifts. */
+  always_inline u16x4
+u16x4_shift_left (u16x4 x, u16x4 i)
+{
+  return (u16x4) _m_psllw ((__m64) x, (__m64) i);
+};
+
+always_inline u32x2
+u32x2_shift_left (u32x2 x, u32x2 i)
+{
+  return (u32x2) _m_pslld ((__m64) x, (__m64) i);
+};
+
+always_inline u16x4
+u16x4_shift_right (u16x4 x, u16x4 i)
+{
+  return (u16x4) _m_psrlw ((__m64) x, (__m64) i);
+};
+
+always_inline u32x2
+u32x2_shift_right (u32x2 x, u32x2 i)
+{
+  return (u32x2) _m_psrld ((__m64) x, (__m64) i);
+};
+
+always_inline i16x4
+i16x4_shift_left (i16x4 x, i16x4 i)
+{
+  return (i16x4) _m_psllw ((__m64) x, (__m64) i);
+};
+
+always_inline i32x2
+i32x2_shift_left (i32x2 x, i32x2 i)
+{
+  return (i32x2) _m_pslld ((__m64) x, (__m64) i);
+};
+
+always_inline i16x4
+i16x4_shift_right (i16x4 x, i16x4 i)
+{
+  return (i16x4) _m_psraw ((__m64) x, (__m64) i);
+};
+
+always_inline i32x2
+i32x2_shift_right (i32x2 x, i32x2 i)
+{
+  return (i32x2) _m_psrad ((__m64) x, (__m64) i);
+};
+
+#define u8x16_word_shift_left(a,n)  (u8x16) _mm_slli_si128((__m128i) a, n)
+#define u8x16_word_shift_right(a,n) (u8x16) _mm_srli_si128((__m128i) a, n)
+
+#define i8x16_word_shift_left(a,n) \
+  ((i8x16) u8x16_word_shift_left((u8x16) (a), (n)))
+#define i8x16_word_shift_right(a,n) \
+  ((i8x16) u8x16_word_shift_right((u8x16) (a), (n)))
+
+#define u16x8_word_shift_left(a,n) \
+  ((u16x8) u8x16_word_shift_left((u8x16) (a), (n) * sizeof (u16)))
+#define i16x8_word_shift_left(a,n) \
+  ((u16x8) u8x16_word_shift_left((u8x16) (a), (n) * sizeof (u16)))
+#define u16x8_word_shift_right(a,n) \
+  ((u16x8) u8x16_word_shift_right((u8x16) (a), (n) * sizeof (u16)))
+#define i16x8_word_shift_right(a,n) \
+  ((i16x8) u8x16_word_shift_right((u8x16) (a), (n) * sizeof (u16)))
+
+#define u32x4_word_shift_left(a,n) \
+  ((u32x4) u8x16_word_shift_left((u8x16) (a), (n) * sizeof (u32)))
+#define i32x4_word_shift_left(a,n) \
+  ((u32x4) u8x16_word_shift_left((u8x16) (a), (n) * sizeof (u32)))
+#define u32x4_word_shift_right(a,n) \
+  ((u32x4) u8x16_word_shift_right((u8x16) (a), (n) * sizeof (u32)))
+#define i32x4_word_shift_right(a,n) \
+  ((i32x4) u8x16_word_shift_right((u8x16) (a), (n) * sizeof (u32)))
+
+#define u64x2_word_shift_left(a,n) \
+  ((u64x2) u8x16_word_shift_left((u8x16) (a), (n) * sizeof (u64)))
+#define i64x2_word_shift_left(a,n) \
+  ((u64x2) u8x16_word_shift_left((u8x16) (a), (n) * sizeof (u64)))
+#define u64x2_word_shift_right(a,n) \
+  ((u64x2) u8x16_word_shift_right((u8x16) (a), (n) * sizeof (u64)))
+#define i64x2_word_shift_right(a,n) \
+  ((i64x2) u8x16_word_shift_right((u8x16) (a), (n) * sizeof (u64)))
+
+/* SSE2 has no rotate instructions: use shifts to simulate them. */
+#define _(t,n,lr1,lr2)					\
+  always_inline t##x##n					\
+  t##x##n##_irotate_##lr1 (t##x##n w, int i)		\
+  {							\
+    ASSERT (i >= 0 && i <= BITS (t));			\
+    return (t##x##n##_ishift_##lr1 (w, i)		\
+	    | t##x##n##_ishift_##lr2 (w, BITS (t) - i)); \
+  }							\
+							\
+  always_inline t##x##n					\
+  t##x##n##_rotate_##lr1 (t##x##n w, t##x##n i)		\
+  {							\
+    t##x##n j = t##x##n##_splat (BITS (t));		\
+    return (t##x##n##_shift_##lr1 (w, i)		\
+	    | t##x##n##_shift_##lr2 (w, j - i));	\
+  }
+
+_(u16, 8, left, right);
+_(u16, 8, right, left);
+_(u32, 4, left, right);
+_(u32, 4, right, left);
+_(u64, 2, left, right);
+_(u64, 2, right, left);
+
+#undef _
+
+#ifndef __clang__
+#define _(t,n,lr1,lr2)						\
+  always_inline t##x##n						\
+  t##x##n##_word_rotate2_##lr1 (t##x##n w0, t##x##n w1, int i)	\
+  {								\
+    int m = sizeof (t##x##n) / sizeof (t);			\
+    ASSERT (i >= 0 && i < m);					\
+    return (t##x##n##_word_shift_##lr1 (w0, i)			\
+	    | t##x##n##_word_shift_##lr2 (w1, m - i));		\
+  }								\
+								\
+  always_inline t##x##n						\
+  t##x##n##_word_rotate_##lr1 (t##x##n w0, int i)		\
+  { return t##x##n##_word_rotate2_##lr1 (w0, w0, i); }
+
+_(u8, 16, left, right);
+_(u8, 16, right, left);
+_(u16, 8, left, right);
+_(u16, 8, right, left);
+_(u32, 4, left, right);
+_(u32, 4, right, left);
+_(u64, 2, left, right);
+_(u64, 2, right, left);
+
+#undef _
+#endif
+
+/* Compare operations. */
+always_inline u8x16
+u8x16_is_equal (u8x16 x, u8x16 y)
+{
+  return (u8x16) _mm_cmpeq_epi8 ((__m128i) x, (__m128i) y);
+}
+
+always_inline i8x16
+i8x16_is_equal (i8x16 x, i8x16 y)
+{
+  return (i8x16) _mm_cmpeq_epi8 ((__m128i) x, (__m128i) y);
+}
+
+always_inline u16x8
+u16x8_is_equal (u16x8 x, u16x8 y)
+{
+  return (u16x8) _mm_cmpeq_epi16 ((__m128i) x, (__m128i) y);
+}
+
+always_inline i16x8
+i16x8_is_equal (i16x8 x, i16x8 y)
+{
+  return (i16x8) _mm_cmpeq_epi16 ((__m128i) x, (__m128i) y);
+}
+
+always_inline u32x4
+u32x4_is_equal (u32x4 x, u32x4 y)
+{
+  return (u32x4) _mm_cmpeq_epi32 ((__m128i) x, (__m128i) y);
+}
+
+always_inline i32x4
+i32x4_is_equal (i32x4 x, i32x4 y)
+{
+  return (i32x4) _mm_cmpeq_epi32 ((__m128i) x, (__m128i) y);
+}
+
+always_inline u8x16
+i8x16_is_greater (i8x16 x, i8x16 y)
+{
+  return (u8x16) _mm_cmpgt_epi8 ((__m128i) x, (__m128i) y);
+}
+
+always_inline u16x8
+i16x8_is_greater (i16x8 x, i16x8 y)
+{
+  return (u16x8) _mm_cmpgt_epi16 ((__m128i) x, (__m128i) y);
+}
+
+always_inline u32x4
+i32x4_is_greater (i32x4 x, i32x4 y)
+{
+  return (u32x4) _mm_cmpgt_epi32 ((__m128i) x, (__m128i) y);
+}
+
+always_inline u8x16
+u8x16_is_zero (u8x16 x)
+{
+  u8x16 zero = { 0 };
+  return u8x16_is_equal (x, zero);
+}
+
+always_inline u16x8
+u16x8_is_zero (u16x8 x)
+{
+  u16x8 zero = { 0 };
+  return u16x8_is_equal (x, zero);
+}
+
+always_inline u32x4
+u32x4_is_zero (u32x4 x)
+{
+  u32x4 zero = { 0 };
+  return u32x4_is_equal (x, zero);
+}
+
+#define u32x4_select(A,MASK)						\
+({									\
+  u32x4 _x, _y;								\
+  _x = (A);								\
+  asm volatile ("pshufd %[mask], %[x], %[y]"				\
+		: /* outputs */ [y] "=x" (_y)				\
+		: /* inputs */  [x] "x" (_x), [mask] "i" (MASK));	\
+  _y;									\
+})
+
+#define u32x4_splat_word(x,i)			\
+  u32x4_select ((x), (((i) << (2*0))		\
+		      | ((i) << (2*1))		\
+		      | ((i) << (2*2))		\
+		      | ((i) << (2*3))))
+
+/* Extract low order 32 bit word. */
+always_inline u32
+u32x4_get0 (u32x4 x)
+{
+  u32 result;
+  asm volatile ("movd %[x], %[result]": /* outputs */ [result] "=r" (result)
+		: /* inputs */ [x] "x" (x));
+  return result;
+}
+
+always_inline u32x4
+u32x4_set0 (u32 x)
+{
+  u32x4 result;
+  asm volatile ("movd %[x], %[result]": /* outputs */ [result] "=x" (result)
+		: /* inputs */ [x] "r" (x));
+  return result;
+}
+
+always_inline i32x4
+i32x4_set0 (i32 x)
+{
+  return (i32x4) u32x4_set0 ((u32) x);
+}
+
+always_inline i32
+i32x4_get0 (i32x4 x)
+{
+  return (i32) u32x4_get0 ((u32x4) x);
+}
+
+/* Converts all ones/zeros compare mask to bitmap. */
+always_inline u32
+u8x16_compare_byte_mask (u8x16 x)
+{
+  return _mm_movemask_epi8 ((__m128i) x);
+}
+
+extern u8 u32x4_compare_word_mask_table[256];
+
+always_inline u32
+u32x4_compare_word_mask (u32x4 x)
+{
+  u32 m = u8x16_compare_byte_mask ((u8x16) x);
+  return (u32x4_compare_word_mask_table[(m >> 0) & 0xff]
+	  | (u32x4_compare_word_mask_table[(m >> 8) & 0xff] << 2));
+}
+
+always_inline u32
+u8x16_zero_byte_mask (u8x16 x)
+{
+  u8x16 zero = { 0 };
+  return u8x16_compare_byte_mask (u8x16_is_equal (x, zero));
+}
+
+always_inline u32
+u16x8_zero_byte_mask (u16x8 x)
+{
+  u16x8 zero = { 0 };
+  return u8x16_compare_byte_mask ((u8x16) u16x8_is_equal (x, zero));
+}
+
+always_inline u32
+u32x4_zero_byte_mask (u32x4 x)
+{
+  u32x4 zero = { 0 };
+  return u8x16_compare_byte_mask ((u8x16) u32x4_is_equal (x, zero));
+}
+
+always_inline u8x16
+u8x16_max (u8x16 x, u8x16 y)
+{
+  return (u8x16) _mm_max_epu8 ((__m128i) x, (__m128i) y);
+}
+
+always_inline u32
+u8x16_max_scalar (u8x16 x)
+{
+  x = u8x16_max (x, u8x16_word_shift_right (x, 8));
+  x = u8x16_max (x, u8x16_word_shift_right (x, 4));
+  x = u8x16_max (x, u8x16_word_shift_right (x, 2));
+  x = u8x16_max (x, u8x16_word_shift_right (x, 1));
+  return _mm_extract_epi16 ((__m128i) x, 0) & 0xff;
+}
+
+always_inline u8x16
+u8x16_min (u8x16 x, u8x16 y)
+{
+  return (u8x16) _mm_min_epu8 ((__m128i) x, (__m128i) y);
+}
+
+always_inline u8
+u8x16_min_scalar (u8x16 x)
+{
+  x = u8x16_min (x, u8x16_word_shift_right (x, 8));
+  x = u8x16_min (x, u8x16_word_shift_right (x, 4));
+  x = u8x16_min (x, u8x16_word_shift_right (x, 2));
+  x = u8x16_min (x, u8x16_word_shift_right (x, 1));
+  return _mm_extract_epi16 ((__m128i) x, 0) & 0xff;
+}
+
+always_inline i16x8
+i16x8_max (i16x8 x, i16x8 y)
+{
+  return (i16x8) _mm_max_epi16 ((__m128i) x, (__m128i) y);
+}
+
+always_inline i16
+i16x8_max_scalar (i16x8 x)
+{
+  x = i16x8_max (x, i16x8_word_shift_right (x, 4));
+  x = i16x8_max (x, i16x8_word_shift_right (x, 2));
+  x = i16x8_max (x, i16x8_word_shift_right (x, 1));
+  return _mm_extract_epi16 ((__m128i) x, 0);
+}
+
+always_inline i16x8
+i16x8_min (i16x8 x, i16x8 y)
+{
+  return (i16x8) _mm_min_epi16 ((__m128i) x, (__m128i) y);
+}
+
+always_inline i16
+i16x8_min_scalar (i16x8 x)
+{
+  x = i16x8_min (x, i16x8_word_shift_right (x, 4));
+  x = i16x8_min (x, i16x8_word_shift_right (x, 2));
+  x = i16x8_min (x, i16x8_word_shift_right (x, 1));
+  return _mm_extract_epi16 ((__m128i) x, 0);
+}
+
+#undef _signed_binop
+
+#endif /* included_vector_sse2_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vhash.c b/src/vppinfra/vhash.c
new file mode 100644
index 00000000..f9dac0d9
--- /dev/null
+++ b/src/vppinfra/vhash.c
@@ -0,0 +1,772 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2010 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/vhash.h>
+
+#ifdef CLIB_HAVE_VEC128
+
+/* Overflow search buckets have an extra u32x4 for saving key_hash data.
+   This makes it easier to refill main search bucket from overflow vector. */
+typedef struct
+{
+  /* 4 results for this bucket. */
+  u32x4_union_t result;
+
+  /* 4 hash codes for this bucket.  These are used to refill main
+     search buckets from overflow buckets when space becomes available. */
+  u32x4_union_t key_hash;
+
+  /* n_key_u32s u32x4s of key data follow. */
+  u32x4_union_t key[0];
+} vhash_overflow_search_bucket_t;
+
+always_inline void
+set_overflow_result (vhash_overflow_search_bucket_t * b,
+		     u32 i, u32 result, u32 key_hash)
+{
+  b->result.as_u32[i] = result;
+  b->key_hash.as_u32[i] = key_hash;
+}
+
+always_inline void
+free_overflow_bucket (vhash_overflow_buckets_t * ob,
+		      vhash_overflow_search_bucket_t * b, u32 i)
+{
+  u32 o = (u32x4_union_t *) b - ob->search_buckets;
+  ASSERT (o < vec_len (ob->search_buckets));
+  vec_add1 (ob->free_indices, 4 * o + i);
+}
+
+always_inline vhash_overflow_search_bucket_t *
+get_overflow_search_bucket (vhash_overflow_buckets_t * obs, u32 i,
+			    u32 n_key_u32s)
+{
+  return ((vhash_overflow_search_bucket_t *)
+	  vec_elt_at_index (obs->search_buckets, i));
+}
+
+always_inline vhash_overflow_search_bucket_t *
+next_overflow_bucket (vhash_overflow_search_bucket_t * b, u32 n_key_u32s)
+{
+  return (vhash_overflow_search_bucket_t *) & b->key[n_key_u32s];
+}
+
+#define foreach_vhash_overflow_bucket(b,ob,n_key_u32s)			\
+  for ((b) = (vhash_overflow_search_bucket_t *) ob->search_buckets;	\
+       (u32x4_union_t *) (b) < vec_end (ob->search_buckets);		\
+       b = next_overflow_bucket (b, n_key_u32s))
+
+u32
+vhash_get_overflow (vhash_t * h, u32 key_hash, u32 vi, u32 n_key_u32s)
+{
+  vhash_overflow_buckets_t *ob = vhash_get_overflow_buckets (h, key_hash);
+  vhash_overflow_search_bucket_t *b;
+  u32 i, result = 0;
+
+  foreach_vhash_overflow_bucket (b, ob, n_key_u32s)
+  {
+    u32x4 r = b->result.as_u32x4;
+
+    for (i = 0; i < n_key_u32s; i++)
+      r &= vhash_bucket_compare (h, &b->key[0], i, vi);
+
+    result = vhash_merge_results (r);
+    if (result)
+      break;
+  }
+
+  return result;
+}
+
+u32
+vhash_set_overflow (vhash_t * h,
+		    u32 key_hash, u32 vi, u32 new_result, u32 n_key_u32s)
+{
+  vhash_overflow_buckets_t *ob = vhash_get_overflow_buckets (h, key_hash);
+  vhash_overflow_search_bucket_t *b;
+  u32 i_set, i, old_result;
+
+  foreach_vhash_overflow_bucket (b, ob, n_key_u32s)
+  {
+    u32x4 r;
+
+    r = b->result.as_u32x4;
+    for (i = 0; i < n_key_u32s; i++)
+      r &= vhash_bucket_compare (h, &b->key[0], i, vi);
+
+    old_result = vhash_merge_results (r);
+    if (old_result)
+      {
+	i_set = vhash_non_empty_result_index (r);
+	set_overflow_result (b, i_set, new_result, key_hash);
+	return old_result;
+      }
+  }
+
+  /* Check free list. */
+  if (vec_len (ob->free_indices) == 0)
+    {
+      /* Out of free overflow buckets.  Resize. */
+      u32 j, *p;
+      i = vec_len (ob->search_buckets);
+      vec_resize_aligned (ob->search_buckets,
+			  sizeof (b[0]) / sizeof (u32x4) + n_key_u32s,
+			  CLIB_CACHE_LINE_BYTES);
+      vec_add2 (ob->free_indices, p, 4);
+      for (j = 0; j < 4; j++)
+	p[j] = 4 * i + j;
+    }
+
+  i = vec_pop (ob->free_indices);
+
+  i_set = i & 3;
+  b = ((vhash_overflow_search_bucket_t *)
+       vec_elt_at_index (ob->search_buckets, i / 4));
+
+  /* Insert result. */
+  set_overflow_result (b, i_set, new_result, key_hash);
+
+  /* Insert key. */
+  for (i = 0; i < n_key_u32s; i++)
+    b->key[i].as_u32[i_set] = vhash_get_key_word (h, i, vi);
+
+  ob->n_overflow++;
+  h->n_elts++;
+
+  return /* old result was invalid */ 0;
+}
+
+u32
+vhash_unset_overflow (vhash_t * h, u32 key_hash, u32 vi, u32 n_key_u32s)
+{
+  vhash_overflow_buckets_t *ob = vhash_get_overflow_buckets (h, key_hash);
+  vhash_overflow_search_bucket_t *b;
+  u32 i_set, i, old_result;
+
+  foreach_vhash_overflow_bucket (b, ob, n_key_u32s)
+  {
+    u32x4 r;
+
+    r = b->result.as_u32x4;
+    for (i = 0; i < n_key_u32s; i++)
+      r &= vhash_bucket_compare (h, &b->key[0], i, vi);
+
+    old_result = vhash_merge_results (r);
+    if (old_result)
+      {
+	i_set = vhash_non_empty_result_index (r);
+
+	/* Invalidate result and invert key hash so that this will
+	   never match since all keys in this overflow bucket have
+	   matching key hashs. */
+	set_overflow_result (b, i_set, 0, ~key_hash);
+
+	free_overflow_bucket (ob, b, i_set);
+
+	ASSERT (ob->n_overflow > 0);
+	ob->n_overflow--;
+	h->n_elts--;
+	return old_result;
+      }
+  }
+
+  /* Could not find key. */
+  return 0;
+}
+
+void
+vhash_unset_refill_from_overflow (vhash_t * h,
+				  vhash_search_bucket_t * sb,
+				  u32 key_hash, u32 n_key_u32s)
+{
+  vhash_overflow_buckets_t *obs = vhash_get_overflow_buckets (h, key_hash);
+  vhash_overflow_search_bucket_t *ob;
+  u32 i, j, i_refill, bucket_mask = h->bucket_mask.as_u32[0];
+
+  /* Find overflow element with matching key hash. */
+  foreach_vhash_overflow_bucket (ob, obs, n_key_u32s)
+  {
+    for (i = 0; i < 4; i++)
+      {
+	if (!ob->result.as_u32[i])
+	  continue;
+	if ((ob->key_hash.as_u32[i] & bucket_mask)
+	    != (key_hash & bucket_mask))
+	  continue;
+
+	i_refill = vhash_empty_result_index (sb->result.as_u32x4);
+	sb->result.as_u32[i_refill] = ob->result.as_u32[i];
+	for (j = 0; j < n_key_u32s; j++)
+	  sb->key[j].as_u32[i_refill] = ob->key[j].as_u32[i];
+	set_overflow_result (ob, i, 0, ~key_hash);
+	free_overflow_bucket (obs, ob, i);
+	return;
+      }
+  }
+}
+
+void
+vhash_init (vhash_t * h, u32 log2_n_keys, u32 n_key_u32, u32 * hash_seeds)
+{
+  uword i, j, m;
+  vhash_search_bucket_t *b;
+
+  memset (h, 0, sizeof (h[0]));
+
+  /* Must have at least 4 keys (e.g. one search bucket). */
+  log2_n_keys = clib_max (log2_n_keys, 2);
+
+  h->log2_n_keys = log2_n_keys;
+  h->n_key_u32 = n_key_u32;
+  m = pow2_mask (h->log2_n_keys) & ~3;
+  for (i = 0; i < VECTOR_WORD_TYPE_LEN (u32); i++)
+    h->bucket_mask.as_u32[i] = m;
+
+  /* Allocate and zero search buckets. */
+  i = (sizeof (b[0]) / sizeof (u32x4) + n_key_u32) << (log2_n_keys - 2);
+  vec_validate_aligned (h->search_buckets, i - 1, CLIB_CACHE_LINE_BYTES);
+
+  for (i = 0; i < ARRAY_LEN (h->find_first_zero_table); i++)
+    h->find_first_zero_table[i] = min_log2 (first_set (~i));
+
+  for (i = 0; i < ARRAY_LEN (h->hash_seeds); i++)
+    for (j = 0; j < VECTOR_WORD_TYPE_LEN (u32); j++)
+      h->hash_seeds[i].as_u32[j] = hash_seeds[i];
+}
+
+static_always_inline u32
+vhash_main_key_gather (void *_vm, u32 vi, u32 wi, u32 n_key_u32)
+{
+  vhash_main_t *vm = _vm;
+  return vec_elt (vm->keys, vi * n_key_u32 + wi);
+}
+
+static_always_inline u32x4
+vhash_main_4key_gather (void *_vm, u32 vi, u32 wi, u32 n_key_u32s)
+{
+  vhash_main_t *vm = _vm;
+  u32x4_union_t x;
+
+  ASSERT (n_key_u32s == vm->n_key_u32);
+  ASSERT (wi < n_key_u32s);
+
+  x.as_u32[0] = vec_elt (vm->keys, (vi + 0) * n_key_u32s + wi);
+  x.as_u32[1] = vec_elt (vm->keys, (vi + 1) * n_key_u32s + wi);
+  x.as_u32[2] = vec_elt (vm->keys, (vi + 2) * n_key_u32s + wi);
+  x.as_u32[3] = vec_elt (vm->keys, (vi + 3) * n_key_u32s + wi);
+  return x.as_u32x4;
+}
+
+static_always_inline u32
+vhash_main_set_result (void *_vm, u32 vi, u32 old_result, u32 n_key_u32)
+{
+  vhash_main_t *vm = _vm;
+  u32 *p = vec_elt_at_index (vm->results, vi);
+  u32 new_result = p[0];
+  p[0] = old_result;
+  return new_result;
+}
+
+static_always_inline u32
+vhash_main_get_result (void *_vm, u32 vi, u32 old_result, u32 n_key_u32)
+{
+  vhash_main_t *vm = _vm;
+  vec_elt (vm->results, vi) = old_result;
+  return old_result;
+}
+
+static_always_inline u32x4
+vhash_main_get_4result (void *_vm, u32 vi, u32x4 old_result, u32 n_key_u32)
+{
+  vhash_main_t *vm = _vm;
+  u32x4 *p = (u32x4 *) vec_elt_at_index (vm->results, vi);
+  p[0] = old_result;
+  return old_result;
+}
+
+#define _(N_KEY_U32)							\
+  static_always_inline u32						\
+  vhash_main_key_gather_##N_KEY_U32 (void * _vm, u32 vi, u32 i)		\
+  { return vhash_main_key_gather (_vm, vi, i, N_KEY_U32); }		\
+									\
+  static_always_inline u32x4						\
+  vhash_main_4key_gather_##N_KEY_U32 (void * _vm, u32 vi, u32 i)	\
+  { return vhash_main_4key_gather (_vm, vi, i, N_KEY_U32); }		\
+									\
+  clib_pipeline_stage_static						\
+  (vhash_main_gather_keys_stage_##N_KEY_U32,				\
+   vhash_main_t *, vm, i,						\
+   {									\
+     vhash_gather_4key_stage						\
+       (vm->vhash,							\
+	/* vector_index */ i,						\
+	vhash_main_4key_gather_##N_KEY_U32,				\
+	vm,								\
+	N_KEY_U32);							\
+   })									\
+									\
+  clib_pipeline_stage_no_inline						\
+  (vhash_main_gather_keys_mod_stage_##N_KEY_U32,			\
+   vhash_main_t *, vm, i,						\
+   {									\
+     vhash_gather_key_stage						\
+       (vm->vhash,							\
+	/* vector_index */ vm->n_vectors_div_4,				\
+	/* n_vectors */ vm->n_vectors_mod_4,				\
+	vhash_main_key_gather_##N_KEY_U32,				\
+	vm,								\
+	N_KEY_U32);							\
+   })									\
+									\
+  clib_pipeline_stage							\
+  (vhash_main_hash_finalize_stage_##N_KEY_U32,				\
+   vhash_main_t *, vm, i,						\
+   {									\
+     vhash_finalize_stage (vm->vhash, i, N_KEY_U32);			\
+   })									\
+									\
+  clib_pipeline_stage_no_inline						\
+  (vhash_main_hash_finalize_mod_stage_##N_KEY_U32,			\
+   vhash_main_t *, vm, i,						\
+   {									\
+     vhash_finalize_stage (vm->vhash, vm->n_vectors_div_4, N_KEY_U32);	\
+   })									\
+									\
+  clib_pipeline_stage_static						\
+  (vhash_main_get_stage_##N_KEY_U32,					\
+   vhash_main_t *, vm, i,						\
+   {									\
+     vhash_get_4_stage (vm->vhash,					\
+			/* vector_index */ i,				\
+			vhash_main_get_4result,				\
+			vm, N_KEY_U32);					\
+   })									\
+									\
+  clib_pipeline_stage_no_inline						\
+  (vhash_main_get_mod_stage_##N_KEY_U32,				\
+   vhash_main_t *, vm, i,						\
+   {									\
+     vhash_get_stage (vm->vhash,					\
+		      /* vector_index */ vm->n_vectors_div_4,		\
+		      /* n_vectors */ vm->n_vectors_mod_4,		\
+		      vhash_main_get_result,				\
+		      vm, N_KEY_U32);					\
+   })									\
+									\
+  clib_pipeline_stage_static						\
+  (vhash_main_set_stage_##N_KEY_U32,					\
+   vhash_main_t *, vm, i,						\
+   {									\
+     vhash_set_stage (vm->vhash,					\
+		      /* vector_index */ i,				\
+		      /* n_vectors */ VECTOR_WORD_TYPE_LEN (u32),	\
+		      vhash_main_set_result,				\
+		      vm, N_KEY_U32);					\
+   })									\
+									\
+  clib_pipeline_stage_no_inline						\
+  (vhash_main_set_mod_stage_##N_KEY_U32,				\
+   vhash_main_t *, vm, i,						\
+   {									\
+     vhash_set_stage (vm->vhash,					\
+		      /* vector_index */ vm->n_vectors_div_4,		\
+		      /* n_vectors */ vm->n_vectors_mod_4,		\
+		      vhash_main_set_result,				\
+		      vm, N_KEY_U32);					\
+   })									\
+									\
+  clib_pipeline_stage_static						\
+  (vhash_main_unset_stage_##N_KEY_U32,					\
+   vhash_main_t *, vm, i,						\
+   {									\
+     vhash_unset_stage (vm->vhash,					\
+		      /* vector_index */ i,				\
+		      /* n_vectors */ VECTOR_WORD_TYPE_LEN (u32),	\
+		      vhash_main_get_result,				\
+		      vm, N_KEY_U32);					\
+   })									\
+									\
+  clib_pipeline_stage_no_inline						\
+  (vhash_main_unset_mod_stage_##N_KEY_U32,				\
+   vhash_main_t *, vm, i,						\
+   {									\
+     vhash_unset_stage (vm->vhash,					\
+		      /* vector_index */ vm->n_vectors_div_4,		\
+		      /* n_vectors */ vm->n_vectors_mod_4,		\
+		      vhash_main_get_result,				\
+		      vm, N_KEY_U32);					\
+   })
+
+_(1);
+_(2);
+_(3);
+_(4);
+_(5);
+_(6);
+
+#undef _
+
+#define _(N_KEY_U32)							\
+  clib_pipeline_stage							\
+  (vhash_main_hash_mix_stage_##N_KEY_U32,				\
+   vhash_main_t *, vm, i,						\
+   {									\
+     vhash_mix_stage (vm->vhash, i, N_KEY_U32);				\
+   })									\
+									\
+  clib_pipeline_stage_no_inline						\
+  (vhash_main_hash_mix_mod_stage_##N_KEY_U32,				\
+   vhash_main_t *, vm, i,						\
+   {									\
+     vhash_mix_stage (vm->vhash, vm->n_vectors_div_4, N_KEY_U32);	\
+   })
+
+_(4);
+_(5);
+_(6);
+
+#undef _
+
+typedef enum
+{
+  GET, SET, UNSET,
+} vhash_main_op_t;
+
+static void
+vhash_main_op (vhash_main_t * vm, vhash_main_op_t op)
+{
+  u32 n_keys = vec_len (vm->results);
+
+  vm->n_key_u32 = vm->vhash->n_key_u32;
+
+  vhash_validate_sizes (vm->vhash, vm->n_key_u32, n_keys);
+
+  vm->n_vectors_div_4 = n_keys / 4;
+  vm->n_vectors_mod_4 = n_keys % 4;
+
+  if (vm->n_vectors_div_4 > 0)
+    {
+      switch (vm->n_key_u32)
+	{
+	default:
+	  ASSERT (0);
+	  break;
+
+#define _(N_KEY_U32)						\
+	case N_KEY_U32:						\
+	  if (op == GET)					\
+	    clib_pipeline_run_3_stage				\
+	      (vm->n_vectors_div_4,				\
+	       vm,						\
+	       vhash_main_gather_keys_stage_##N_KEY_U32,	\
+	       vhash_main_hash_finalize_stage_##N_KEY_U32,	\
+	       vhash_main_get_stage_##N_KEY_U32);		\
+	  else if (op == SET)					\
+	    clib_pipeline_run_3_stage				\
+	      (vm->n_vectors_div_4,				\
+	       vm,						\
+	       vhash_main_gather_keys_stage_##N_KEY_U32,	\
+	       vhash_main_hash_finalize_stage_##N_KEY_U32,	\
+	       vhash_main_set_stage_##N_KEY_U32);		\
+	  else							\
+	    clib_pipeline_run_3_stage				\
+	      (vm->n_vectors_div_4,				\
+	       vm,						\
+	       vhash_main_gather_keys_stage_##N_KEY_U32,	\
+	       vhash_main_hash_finalize_stage_##N_KEY_U32,	\
+	       vhash_main_unset_stage_##N_KEY_U32);		\
+	  break;
+
+	  _(1);
+	  _(2);
+	  _(3);
+
+#undef _
+
+#define _(N_KEY_U32)						\
+	case N_KEY_U32:						\
+	  if (op == GET)					\
+	    clib_pipeline_run_4_stage				\
+	      (vm->n_vectors_div_4,				\
+	       vm,						\
+	       vhash_main_gather_keys_stage_##N_KEY_U32,	\
+	       vhash_main_hash_mix_stage_##N_KEY_U32,		\
+	       vhash_main_hash_finalize_stage_##N_KEY_U32,	\
+	       vhash_main_get_stage_##N_KEY_U32);		\
+	  else if (op == SET)					\
+	    clib_pipeline_run_4_stage				\
+	      (vm->n_vectors_div_4,				\
+	       vm,						\
+	       vhash_main_gather_keys_stage_##N_KEY_U32,	\
+	       vhash_main_hash_mix_stage_##N_KEY_U32,		\
+	       vhash_main_hash_finalize_stage_##N_KEY_U32,	\
+	       vhash_main_set_stage_##N_KEY_U32);		\
+	  else							\
+	    clib_pipeline_run_4_stage				\
+	      (vm->n_vectors_div_4,				\
+	       vm,						\
+	       vhash_main_gather_keys_stage_##N_KEY_U32,	\
+	       vhash_main_hash_mix_stage_##N_KEY_U32,		\
+	       vhash_main_hash_finalize_stage_##N_KEY_U32,	\
+	       vhash_main_unset_stage_##N_KEY_U32);		\
+	  break;
+
+	  _(4);
+	  _(5);
+	  _(6);
+
+#undef _
+	}
+    }
+
+
+  if (vm->n_vectors_mod_4 > 0)
+    {
+      switch (vm->n_key_u32)
+	{
+	default:
+	  ASSERT (0);
+	  break;
+
+#define _(N_KEY_U32)						\
+	case N_KEY_U32:						\
+	  if (op == GET)					\
+	    clib_pipeline_run_3_stage				\
+	      (1,						\
+	       vm,						\
+	       vhash_main_gather_keys_mod_stage_##N_KEY_U32,	\
+	       vhash_main_hash_finalize_mod_stage_##N_KEY_U32,	\
+	       vhash_main_get_mod_stage_##N_KEY_U32);		\
+	  else if (op == SET)					\
+	    clib_pipeline_run_3_stage				\
+	      (1,						\
+	       vm,						\
+	       vhash_main_gather_keys_mod_stage_##N_KEY_U32,	\
+	       vhash_main_hash_finalize_mod_stage_##N_KEY_U32,	\
+	       vhash_main_set_mod_stage_##N_KEY_U32);		\
+	  else							\
+	    clib_pipeline_run_3_stage				\
+	      (1,						\
+	       vm,						\
+	       vhash_main_gather_keys_mod_stage_##N_KEY_U32,	\
+	       vhash_main_hash_finalize_mod_stage_##N_KEY_U32,	\
+	       vhash_main_unset_mod_stage_##N_KEY_U32);		\
+	break;
+
+	  _(1);
+	  _(2);
+	  _(3);
+
+#undef _
+
+#define _(N_KEY_U32)						\
+	case N_KEY_U32:						\
+	  if (op == GET)					\
+	    clib_pipeline_run_4_stage				\
+	      (1,						\
+	       vm,						\
+	       vhash_main_gather_keys_mod_stage_##N_KEY_U32,	\
+	       vhash_main_hash_mix_mod_stage_##N_KEY_U32,	\
+	       vhash_main_hash_finalize_mod_stage_##N_KEY_U32,	\
+	       vhash_main_get_mod_stage_##N_KEY_U32);		\
+	  else if (op == SET)					\
+	    clib_pipeline_run_4_stage				\
+	      (1,						\
+	       vm,						\
+	       vhash_main_gather_keys_mod_stage_##N_KEY_U32,	\
+	       vhash_main_hash_mix_mod_stage_##N_KEY_U32,	\
+	       vhash_main_hash_finalize_mod_stage_##N_KEY_U32,	\
+	       vhash_main_set_mod_stage_##N_KEY_U32);		\
+	  else							\
+	    clib_pipeline_run_4_stage				\
+	      (1,						\
+	       vm,						\
+	       vhash_main_gather_keys_mod_stage_##N_KEY_U32,	\
+	       vhash_main_hash_mix_mod_stage_##N_KEY_U32,	\
+	       vhash_main_hash_finalize_mod_stage_##N_KEY_U32,	\
+	       vhash_main_unset_mod_stage_##N_KEY_U32);		\
+	  break;
+
+	  _(4);
+	  _(5);
+	  _(6);
+
+#undef _
+	}
+    }
+}
+
+void
+vhash_main_get (vhash_main_t * vm)
+{
+  vhash_main_op (vm, GET);
+}
+
+void
+vhash_main_set (vhash_main_t * vm)
+{
+  vhash_main_op (vm, SET);
+}
+
+void
+vhash_main_unset (vhash_main_t * vm)
+{
+  vhash_main_op (vm, UNSET);
+}
+
+u32
+vhash_resize_incremental (vhash_resize_t * vr, u32 vector_index,
+			  u32 n_keys_this_call)
+{
+  vhash_t *old = vr->old;
+  vhash_main_t *vm = &vr->new;
+  vhash_t *new = vm->vhash;
+  uword i, j, n_key_u32;
+
+  n_key_u32 = old->n_key_u32;
+
+  if (vector_index == 0)
+    {
+      u32 hash_seeds[3];
+      hash_seeds[0] = old->hash_seeds[0].as_u32[0];
+      hash_seeds[1] = old->hash_seeds[1].as_u32[0];
+      hash_seeds[2] = old->hash_seeds[2].as_u32[0];
+      vhash_init (new, old->log2_n_keys + 1, n_key_u32, hash_seeds);
+    }
+
+  vec_reset_length (vm->keys);
+  vec_reset_length (vm->results);
+
+  if (0 == (vector_index >> old->log2_n_keys))
+    {
+      for (i = vector_index; 0 == (i >> (old->log2_n_keys - 2)); i++)
+	{
+	  vhash_search_bucket_t *b =
+	    vhash_get_search_bucket_with_index (old, 4 * i, n_key_u32);
+	  u32 r, *k;
+
+#define _(I)					\
+  if ((r = b->result.as_u32[I]) != 0)		\
+    {						\
+      vec_add1 (vm->results, r - 1);		\
+      vec_add2 (vm->keys, k, n_key_u32);	\
+      for (j = 0; j < n_key_u32; j++)		\
+	k[j] = b->key[j].as_u32[I];		\
+    }
+
+	  _(0);
+	  _(1);
+	  _(2);
+	  _(3);
+
+#undef _
+
+	  if (vec_len (vm->results) >= n_keys_this_call)
+	    {
+	      vhash_main_op (vm, SET);
+	      return i;
+	    }
+	}
+    }
+
+  /* Add overflow buckets. */
+  {
+    vhash_overflow_buckets_t *ob;
+    vhash_overflow_search_bucket_t *b;
+
+    for (ob = old->overflow_buckets;
+	 ob < old->overflow_buckets + ARRAY_LEN (old->overflow_buckets); ob++)
+      {
+	foreach_vhash_overflow_bucket (b, ob, old->n_key_u32)
+	{
+	  u32 r, *k;
+
+#define _(I)					\
+  if ((r = b->result.as_u32[I]) != 0)		\
+    {						\
+      vec_add1 (vm->results, r - 1);		\
+      vec_add2 (vm->keys, k, n_key_u32);	\
+      for (j = 0; j < n_key_u32; j++)		\
+	k[j] = b->key[j].as_u32[I];		\
+    }
+
+	  _(0);
+	  _(1);
+	  _(2);
+	  _(3);
+
+#undef _
+	}
+      }
+  }
+
+  vhash_main_op (vm, SET);
+
+  /* Let caller know we are done. */
+  return ~0;
+}
+
+void
+vhash_resize (vhash_t * old, u32 log2_n_keys)
+{
+  static vhash_resize_t vr;
+  vhash_t new;
+  u32 i = 0;
+
+  vr.old = old;
+  vr.new.vhash = &new;
+
+  while (1)
+    {
+      i = vhash_resize_incremental (&vr, i, 1024);
+      if (i == ~0)
+	break;
+    }
+
+  vhash_free (old);
+  *old = new;
+}
+
+#endif /* CLIB_HAVE_VEC128 */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vhash.h b/src/vppinfra/vhash.h
new file mode 100644
index 00000000..5ab42292
--- /dev/null
+++ b/src/vppinfra/vhash.h
@@ -0,0 +1,850 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2010 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_vhash_h
+#define included_clib_vhash_h
+
+#include <vppinfra/vector.h>
+
+#ifdef CLIB_HAVE_VEC128
+
+#include <vppinfra/cache.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/pipeline.h>
+
+/* Gathers 32 bits worth of key with given index. */
+typedef u32 (vhash_key_function_t) (void *state, u32 vector_index,
+				    u32 key_word_index);
+typedef u32x4 (vhash_4key_function_t) (void *state, u32 vector_index,
+				       u32 key_word_index);
+/* Sets/gets result of hash lookup. */
+typedef u32 (vhash_result_function_t) (void *state, u32 vector_index,
+				       u32 result, u32 n_key_u32);
+typedef u32x4 (vhash_4result_function_t) (void *state, u32 vector_index,
+					  u32x4 results, u32 n_key_u32);
+
+typedef struct
+{
+  u32x4_union_t hashed_key[3];
+} vhash_hashed_key_t;
+
+/* Search buckets are really this structure. */
+typedef struct
+{
+  /* 4 results for this bucket.
+     Zero is used to mark empty results.  This means user can't use the result ~0
+     since user results differ from internal results stored in buckets by 1.
+     e.g. internal result = user result + 1. */
+  u32x4_union_t result;
+
+  /* n_key_u32s u32x4s of key data follow. */
+  u32x4_union_t key[0];
+} vhash_search_bucket_t;
+
+typedef struct
+{
+  u32x4_union_t *search_buckets;
+
+  /* Vector of bucket free indices. */
+  u32 *free_indices;
+
+  /* Number of entries in this overflow bucket. */
+  u32 n_overflow;
+} vhash_overflow_buckets_t;
+
+typedef struct
+{
+  /* 2^log2_n_keys keys grouped in groups of 4.
+     Each bucket contains 4 results plus 4 keys for a
+     total of (1 + n_key_u32) u32x4s. */
+  u32x4_union_t *search_buckets;
+
+  /* When a bucket of 4 results/keys are full we search
+     the overflow.  hash_key is used to select which overflow
+     bucket. */
+  vhash_overflow_buckets_t overflow_buckets[16];
+
+  /* Total count of occupied elements in hash table. */
+  u32 n_elts;
+
+  u32 log2_n_keys;
+
+  /* Number of 32 bit words in a hash key. */
+  u32 n_key_u32;
+
+  u32x4_union_t bucket_mask;
+
+  /* table[i] = min_log2 (first_set (~i)). */
+  u8 find_first_zero_table[16];
+
+  /* Hash seeds for Jenkins hash. */
+  u32x4_union_t hash_seeds[3];
+
+  /* Key work space is a vector of length
+     n_key_u32s << log2_n_key_word_len_u32x. */
+  u32 log2_n_key_word_len_u32x;
+
+  /* Work space to store keys between pipeline stages. */
+  u32x4_union_t *key_work_space;
+
+  /* Hash work space to store Jenkins hash values between
+     pipeline stages. */
+  vhash_hashed_key_t *hash_work_space;
+} vhash_t;
+
+always_inline vhash_overflow_buckets_t *
+vhash_get_overflow_buckets (vhash_t * h, u32 key)
+{
+  u32 i = (((key & h->bucket_mask.as_u32[0]) >> 2) & 0xf);
+  ASSERT (i < ARRAY_LEN (h->overflow_buckets));
+  return h->overflow_buckets + i;
+}
+
+always_inline uword
+vhash_is_non_empty_overflow_bucket (vhash_t * h, u32 key)
+{
+  u32 i = (((key & h->bucket_mask.as_u32[0]) >> 2) & 0xf);
+  ASSERT (i < ARRAY_LEN (h->overflow_buckets));
+  return h->overflow_buckets[i].n_overflow > 0;
+}
+
+always_inline void
+vhash_free_overflow_buckets (vhash_overflow_buckets_t * obs)
+{
+  vec_free (obs->search_buckets);
+  vec_free (obs->free_indices);
+}
+
+always_inline void
+vhash_free (vhash_t * h)
+{
+  uword i;
+  for (i = 0; i < ARRAY_LEN (h->overflow_buckets); i++)
+    vhash_free_overflow_buckets (&h->overflow_buckets[i]);
+  vec_free (h->search_buckets);
+  vec_free (h->key_work_space);
+  vec_free (h->hash_work_space);
+}
+
+always_inline void
+vhash_set_key_word (vhash_t * h, u32 wi, u32 vi, u32 value)
+{
+  u32 i0 = (wi << h->log2_n_key_word_len_u32x) + (vi / 4);
+  u32 i1 = vi % 4;
+  vec_elt (h->key_work_space, i0).as_u32[i1] = value;
+}
+
+always_inline void
+vhash_set_key_word_u32x (vhash_t * h, u32 wi, u32 vi, u32x value)
+{
+  u32 i0 = (wi << h->log2_n_key_word_len_u32x) + (vi / 4);
+  vec_elt (h->key_work_space, i0).as_u32x4 = value;
+}
+
+always_inline u32
+vhash_get_key_word (vhash_t * h, u32 wi, u32 vi)
+{
+  u32 i0 = (wi << h->log2_n_key_word_len_u32x) + (vi / 4);
+  u32 i1 = vi % 4;
+  return vec_elt (h->key_work_space, i0).as_u32[i1];
+}
+
+always_inline u32x
+vhash_get_key_word_u32x (vhash_t * h, u32 wi, u32 vi)
+{
+  u32 i0 = (wi << h->log2_n_key_word_len_u32x) + vi;
+  return vec_elt (h->key_work_space, i0).as_u32x4;
+}
+
+always_inline void
+vhash_validate_sizes (vhash_t * h, u32 n_key_u32, u32 n_vectors)
+{
+  u32 n, l;
+
+  n = max_pow2 (n_vectors) / 4;
+  n = clib_max (n, 8);
+
+  h->log2_n_key_word_len_u32x = l = min_log2 (n);
+  vec_validate_aligned (h->key_work_space, (n_key_u32 << l) - 1,
+			CLIB_CACHE_LINE_BYTES);
+  vec_validate_aligned (h->hash_work_space, n - 1, CLIB_CACHE_LINE_BYTES);
+}
+
+always_inline void
+vhash_gather_key_stage (vhash_t * h,
+			u32 vector_index,
+			u32 n_vectors,
+			vhash_key_function_t key_function,
+			void *state, u32 n_key_u32s)
+{
+  u32 i, j, vi;
+
+  /* Gather keys for 4 packets (for 128 bit vector length e.g. u32x4). */
+  for (i = 0; i < n_vectors; i++)
+    {
+      vi = vector_index * 4 + i;
+      for (j = 0; j < n_key_u32s; j++)
+	vhash_set_key_word (h, j, vi, key_function (state, vi, j));
+    }
+}
+
+always_inline void
+vhash_gather_4key_stage (vhash_t * h,
+			 u32 vector_index,
+			 vhash_4key_function_t key_function,
+			 void *state, u32 n_key_u32s)
+{
+  u32 j, vi;
+  vi = vector_index * 4;
+  for (j = 0; j < n_key_u32s; j++)
+    vhash_set_key_word_u32x (h, j, vi, key_function (state, vi, j));
+}
+
+always_inline void
+vhash_mix_stage (vhash_t * h, u32 vector_index, u32 n_key_u32s)
+{
+  i32 i, n_left;
+  u32x a, b, c;
+
+  /* Only need to do this for keys longer than 12 bytes. */
+  ASSERT (n_key_u32s > 3);
+
+  a = h->hash_seeds[0].as_u32x4;
+  b = h->hash_seeds[1].as_u32x4;
+  c = h->hash_seeds[2].as_u32x4;
+  for (i = 0, n_left = n_key_u32s - 3; n_left > 0; n_left -= 3, i += 3)
+    {
+      a +=
+	vhash_get_key_word_u32x (h, n_key_u32s - 1 - (i + 0), vector_index);
+      if (n_left > 1)
+	b +=
+	  vhash_get_key_word_u32x (h, n_key_u32s - 1 - (i + 1), vector_index);
+      if (n_left > 2)
+	c +=
+	  vhash_get_key_word_u32x (h, n_key_u32s - 1 - (i + 2), vector_index);
+
+      hash_v3_mix_u32x (a, b, c);
+    }
+
+  /* Save away a, b, c for later finalize. */
+  {
+    vhash_hashed_key_t *hk =
+      vec_elt_at_index (h->hash_work_space, vector_index);
+    hk->hashed_key[0].as_u32x4 = a;
+    hk->hashed_key[1].as_u32x4 = b;
+    hk->hashed_key[2].as_u32x4 = c;
+  }
+}
+
+always_inline vhash_search_bucket_t *
+vhash_get_search_bucket_with_index (vhash_t * h, u32 i, u32 n_key_u32s)
+{
+  return ((vhash_search_bucket_t *)
+	  vec_elt_at_index (h->search_buckets,
+			    (i / 4) *
+			    ((sizeof (vhash_search_bucket_t) /
+			      sizeof (u32x4)) + n_key_u32s)));
+}
+
+always_inline vhash_search_bucket_t *
+vhash_get_search_bucket (vhash_t * h, u32 key_hash, u32 n_key_u32s)
+{
+  u32 i = key_hash & h->bucket_mask.as_u32[0];
+  return vhash_get_search_bucket_with_index (h, i, n_key_u32s);
+}
+
+always_inline u32x4
+vhash_get_4_search_bucket_byte_offsets (vhash_t * h, u32x4 key_hash,
+					u32 n_key_u32s)
+{
+  vhash_search_bucket_t *b;
+  u32 n_bytes_per_bucket = sizeof (b[0]) + n_key_u32s * sizeof (b->key[0]);
+  u32x4 r = key_hash & h->bucket_mask.as_u32x4;
+
+  /* Multiply with shifts and adds to get bucket byte offset. */
+#define _(x) u32x4_ishift_left (r, (x) - 2)
+  if (n_bytes_per_bucket == (1 << 5))
+    r = _(5);
+  else if (n_bytes_per_bucket == ((1 << 5) + (1 << 4)))
+    r = _(5) + _(4);
+  else if (n_bytes_per_bucket == (1 << 6))
+    r = _(6);
+  else if (n_bytes_per_bucket == ((1 << 6) + (1 << 4)))
+    r = _(6) + _(4);
+  else if (n_bytes_per_bucket == ((1 << 6) + (1 << 5)))
+    r = _(6) + _(5);
+  else if (n_bytes_per_bucket == ((1 << 6) + (1 << 5) + (1 << 4)))
+    r = _(6) + _(5) + _(4);
+  else
+    ASSERT (0);
+#undef _
+  return r;
+}
+
+always_inline void
+vhash_finalize_stage (vhash_t * h, u32 vector_index, u32 n_key_u32s)
+{
+  i32 n_left;
+  u32x a, b, c;
+  vhash_hashed_key_t *hk =
+    vec_elt_at_index (h->hash_work_space, vector_index);
+
+  if (n_key_u32s <= 3)
+    {
+      a = h->hash_seeds[0].as_u32x4;
+      b = h->hash_seeds[1].as_u32x4;
+      c = h->hash_seeds[2].as_u32x4;
+      n_left = n_key_u32s;
+    }
+  else
+    {
+      a = hk->hashed_key[0].as_u32x4;
+      b = hk->hashed_key[1].as_u32x4;
+      c = hk->hashed_key[2].as_u32x4;
+      n_left = 3;
+    }
+
+  if (n_left > 0)
+    a += vhash_get_key_word_u32x (h, 0, vector_index);
+  if (n_left > 1)
+    b += vhash_get_key_word_u32x (h, 1, vector_index);
+  if (n_left > 2)
+    c += vhash_get_key_word_u32x (h, 2, vector_index);
+
+  hash_v3_finalize_u32x (a, b, c);
+
+  /* Only save away last 32 bits of hash code. */
+  hk->hashed_key[2].as_u32x4 = c;
+
+  /* Prefetch buckets.  This costs a bit for small tables but saves
+     big for large ones. */
+  {
+    vhash_search_bucket_t *b0, *b1, *b2, *b3;
+    u32x4_union_t kh;
+
+    kh.as_u32x4 = vhash_get_4_search_bucket_byte_offsets (h, c, n_key_u32s);
+    hk->hashed_key[1].as_u32x4 = kh.as_u32x4;
+
+    b0 = (void *) h->search_buckets + kh.as_u32[0];
+    b1 = (void *) h->search_buckets + kh.as_u32[1];
+    b2 = (void *) h->search_buckets + kh.as_u32[2];
+    b3 = (void *) h->search_buckets + kh.as_u32[3];
+
+    CLIB_PREFETCH (b0, sizeof (b0[0]) + n_key_u32s * sizeof (b0->key[0]),
+		   READ);
+    CLIB_PREFETCH (b1, sizeof (b1[0]) + n_key_u32s * sizeof (b1->key[0]),
+		   READ);
+    CLIB_PREFETCH (b2, sizeof (b2[0]) + n_key_u32s * sizeof (b2->key[0]),
+		   READ);
+    CLIB_PREFETCH (b3, sizeof (b3[0]) + n_key_u32s * sizeof (b3->key[0]),
+		   READ);
+  }
+}
+
+always_inline u32
+vhash_merge_results (u32x4 r)
+{
+  r = r | u32x4_word_shift_right (r, 2);
+  r = r | u32x4_word_shift_right (r, 1);
+  return u32x4_get0 (r);
+}
+
+/* Bucket is full if none of its 4 results are 0. */
+always_inline u32
+vhash_search_bucket_is_full (u32x4 r)
+{
+  return u32x4_zero_byte_mask (r) == 0;
+}
+
+always_inline u32
+vhash_non_empty_result_index (u32x4 x)
+{
+  u32 empty_mask = u32x4_zero_byte_mask (x);
+  ASSERT (empty_mask != 0xffff);
+  return min_log2 (0xffff & ~empty_mask) / 4;
+}
+
+always_inline u32
+vhash_empty_result_index (u32x4 x)
+{
+  u32 empty_mask = u32x4_zero_byte_mask (x);
+  ASSERT (empty_mask != 0);
+  return min_log2 (0xffff & empty_mask) / 4;
+}
+
+always_inline u32x4
+vhash_bucket_compare (vhash_t * h,
+		      u32x4_union_t * bucket, u32 key_word_index, u32 vi)
+{
+  u32 k = vhash_get_key_word (h, key_word_index, vi);
+  u32x4 x = { k, k, k, k };
+  return u32x4_is_equal (bucket[key_word_index].as_u32x4, x);
+}
+
+#define vhash_bucket_compare_4(h,wi,vi,b0,b1,b2,b3,cmp0,cmp1,cmp2,cmp3)	\
+do {									\
+  u32x4 _k4 = vhash_get_key_word_u32x ((h), (wi), (vi));		\
+  u32x4 _k0 = u32x4_splat_word (_k4, 0);				\
+  u32x4 _k1 = u32x4_splat_word (_k4, 1);				\
+  u32x4 _k2 = u32x4_splat_word (_k4, 2);				\
+  u32x4 _k3 = u32x4_splat_word (_k4, 3);				\
+									\
+  cmp0 = u32x4_is_equal (b0->key[wi].as_u32x4, _k0);			\
+  cmp1 = u32x4_is_equal (b1->key[wi].as_u32x4, _k1);			\
+  cmp2 = u32x4_is_equal (b2->key[wi].as_u32x4, _k2);			\
+  cmp3 = u32x4_is_equal (b3->key[wi].as_u32x4, _k3);			\
+} while (0)
+
+u32 vhash_get_overflow (vhash_t * h, u32 key_hash, u32 vi, u32 n_key_u32s);
+
+always_inline void
+vhash_get_stage (vhash_t * h,
+		 u32 vector_index,
+		 u32 n_vectors,
+		 vhash_result_function_t result_function,
+		 void *state, u32 n_key_u32s)
+{
+  u32 i, j;
+  vhash_hashed_key_t *hk =
+    vec_elt_at_index (h->hash_work_space, vector_index);
+  vhash_search_bucket_t *b;
+
+  for (i = 0; i < n_vectors; i++)
+    {
+      u32 vi = vector_index * 4 + i;
+      u32 key_hash = hk->hashed_key[2].as_u32[i];
+      u32 result;
+      u32x4 r, r0;
+
+      b = vhash_get_search_bucket (h, key_hash, n_key_u32s);
+
+      r = r0 = b->result.as_u32x4;
+      for (j = 0; j < n_key_u32s; j++)
+	r &= vhash_bucket_compare (h, &b->key[0], j, vi);
+
+      /* At this point only one of 4 results should be non-zero.
+         So we can or all 4 together and get the valid result (if there is one). */
+      result = vhash_merge_results (r);
+
+      if (!result && vhash_search_bucket_is_full (r0))
+	result = vhash_get_overflow (h, key_hash, vi, n_key_u32s);
+
+      result_function (state, vi, result - 1, n_key_u32s);
+    }
+}
+
+always_inline void
+vhash_get_4_stage (vhash_t * h,
+		   u32 vector_index,
+		   vhash_4result_function_t result_function,
+		   void *state, u32 n_key_u32s)
+{
+  u32 i, vi;
+  vhash_hashed_key_t *hk =
+    vec_elt_at_index (h->hash_work_space, vector_index);
+  vhash_search_bucket_t *b0, *b1, *b2, *b3;
+  u32x4 r0, r1, r2, r3, r0_before, r1_before, r2_before, r3_before;
+  u32x4_union_t kh;
+
+  kh.as_u32x4 = hk->hashed_key[1].as_u32x4;
+
+  b0 = (void *) h->search_buckets + kh.as_u32[0];
+  b1 = (void *) h->search_buckets + kh.as_u32[1];
+  b2 = (void *) h->search_buckets + kh.as_u32[2];
+  b3 = (void *) h->search_buckets + kh.as_u32[3];
+
+  r0 = r0_before = b0->result.as_u32x4;
+  r1 = r1_before = b1->result.as_u32x4;
+  r2 = r2_before = b2->result.as_u32x4;
+  r3 = r3_before = b3->result.as_u32x4;
+
+  vi = vector_index * 4;
+
+  for (i = 0; i < n_key_u32s; i++)
+    {
+      u32x4 c0, c1, c2, c3;
+      vhash_bucket_compare_4 (h, i, vector_index,
+			      b0, b1, b2, b3, c0, c1, c2, c3);
+      r0 &= c0;
+      r1 &= c1;
+      r2 &= c2;
+      r3 &= c3;
+    }
+
+  u32x4_transpose (r0, r1, r2, r3);
+
+  /* Gather together 4 results. */
+  {
+    u32x4_union_t r;
+    u32x4 ones = { 1, 1, 1, 1 };
+    u32 not_found_mask;
+
+    r.as_u32x4 = r0 | r1 | r2 | r3;
+    not_found_mask = u32x4_zero_byte_mask (r.as_u32x4);
+    not_found_mask &= ((vhash_search_bucket_is_full (r0_before) << (4 * 0))
+		       | (vhash_search_bucket_is_full (r1_before) << (4 * 1))
+		       | (vhash_search_bucket_is_full (r2_before) << (4 * 2))
+		       | (vhash_search_bucket_is_full (r3_before) <<
+			  (4 * 3)));
+    if (not_found_mask)
+      {
+	u32x4_union_t key_hash;
+
+	key_hash.as_u32x4 =
+	  hk->hashed_key[2].as_u32x4 & h->bucket_mask.as_u32x4;
+
+	/* Slow path: one of the buckets may have been full and we need to search overflow. */
+	if (not_found_mask & (1 << (4 * 0)))
+	  r.as_u32[0] = vhash_get_overflow (h, key_hash.as_u32[0],
+					    vi + 0, n_key_u32s);
+	if (not_found_mask & (1 << (4 * 1)))
+	  r.as_u32[1] = vhash_get_overflow (h, key_hash.as_u32[1],
+					    vi + 1, n_key_u32s);
+	if (not_found_mask & (1 << (4 * 2)))
+	  r.as_u32[2] = vhash_get_overflow (h, key_hash.as_u32[2],
+					    vi + 2, n_key_u32s);
+	if (not_found_mask & (1 << (4 * 3)))
+	  r.as_u32[3] = vhash_get_overflow (h, key_hash.as_u32[3],
+					    vi + 3, n_key_u32s);
+      }
+
+    result_function (state, vi, r.as_u32x4 - ones, n_key_u32s);
+  }
+}
+
+u32
+vhash_set_overflow (vhash_t * h,
+		    u32 key_hash, u32 vi, u32 new_result, u32 n_key_u32s);
+
+always_inline void
+vhash_set_stage (vhash_t * h,
+		 u32 vector_index,
+		 u32 n_vectors,
+		 vhash_result_function_t result_function,
+		 void *state, u32 n_key_u32s)
+{
+  u32 i, j, n_new_elts = 0;
+  vhash_hashed_key_t *hk =
+    vec_elt_at_index (h->hash_work_space, vector_index);
+  vhash_search_bucket_t *b;
+
+  for (i = 0; i < n_vectors; i++)
+    {
+      u32 vi = vector_index * 4 + i;
+      u32 key_hash = hk->hashed_key[2].as_u32[i];
+      u32 old_result, new_result;
+      u32 i_set;
+      u32x4 r, r0, cmp;
+
+      b = vhash_get_search_bucket (h, key_hash, n_key_u32s);
+
+      cmp = vhash_bucket_compare (h, &b->key[0], 0, vi);
+      for (j = 1; j < n_key_u32s; j++)
+	cmp &= vhash_bucket_compare (h, &b->key[0], j, vi);
+
+      r0 = b->result.as_u32x4;
+      r = r0 & cmp;
+
+      /* At this point only one of 4 results should be non-zero.
+         So we can or all 4 together and get the valid result (if there is one). */
+      old_result = vhash_merge_results (r);
+
+      if (!old_result && vhash_search_bucket_is_full (r0))
+	old_result = vhash_get_overflow (h, key_hash, vi, n_key_u32s);
+
+      /* Get new result; possibly do something with old result. */
+      new_result = result_function (state, vi, old_result - 1, n_key_u32s);
+
+      /* User cannot use ~0 as a hash result since a result of 0 is
+         used to mark unused bucket entries. */
+      ASSERT (new_result + 1 != 0);
+      new_result += 1;
+
+      /* Set over-writes existing result. */
+      if (old_result)
+	{
+	  i_set = vhash_non_empty_result_index (r);
+	  b->result.as_u32[i_set] = new_result;
+	}
+      else
+	{
+	  /* Set allocates new result. */
+	  u32 valid_mask;
+
+	  valid_mask = (((b->result.as_u32[0] != 0) << 0)
+			| ((b->result.as_u32[1] != 0) << 1)
+			| ((b->result.as_u32[2] != 0) << 2)
+			| ((b->result.as_u32[3] != 0) << 3));
+
+	  /* Rotate 4 bit valid mask so that key_hash corresponds to bit 0. */
+	  i_set = key_hash & 3;
+	  valid_mask =
+	    ((valid_mask >> i_set) | (valid_mask << (4 - i_set))) & 0xf;
+
+	  /* Insert into first empty position in bucket after key_hash. */
+	  i_set = (i_set + h->find_first_zero_table[valid_mask]) & 3;
+
+	  if (valid_mask != 0xf)
+	    {
+	      n_new_elts += 1;
+
+	      b->result.as_u32[i_set] = new_result;
+
+	      /* Insert new key into search bucket. */
+	      for (j = 0; j < n_key_u32s; j++)
+		b->key[j].as_u32[i_set] = vhash_get_key_word (h, j, vi);
+	    }
+	  else
+	    vhash_set_overflow (h, key_hash, vi, new_result, n_key_u32s);
+	}
+    }
+
+  h->n_elts += n_new_elts;
+}
+
+u32 vhash_unset_overflow (vhash_t * h, u32 key_hash, u32 vi, u32 n_key_u32s);
+
+void
+vhash_unset_refill_from_overflow (vhash_t * h,
+				  vhash_search_bucket_t * b,
+				  u32 key_hash, u32 n_key_u32s);
+
+/* Note: Eliot tried doing 4 unsets at once and could not get a speed up
+   and abandoned vhash_unset_4_stage. */
+always_inline void
+vhash_unset_stage (vhash_t * h,
+		   u32 vector_index,
+		   u32 n_vectors,
+		   vhash_result_function_t result_function,
+		   void *state, u32 n_key_u32s)
+{
+  u32 i, j, n_elts_unset = 0;
+  vhash_hashed_key_t *hk =
+    vec_elt_at_index (h->hash_work_space, vector_index);
+  vhash_search_bucket_t *b;
+
+  for (i = 0; i < n_vectors; i++)
+    {
+      u32 vi = vector_index * 4 + i;
+      u32 key_hash = hk->hashed_key[2].as_u32[i];
+      u32 old_result;
+      u32x4 cmp, r0;
+
+      b = vhash_get_search_bucket (h, key_hash, n_key_u32s);
+
+      cmp = vhash_bucket_compare (h, &b->key[0], 0, vi);
+      for (j = 1; j < n_key_u32s; j++)
+	cmp &= vhash_bucket_compare (h, &b->key[0], j, vi);
+
+      r0 = b->result.as_u32x4;
+
+      /* At this point cmp is all ones where key matches and zero otherwise.
+         So, this will invalidate results for matching key and do nothing otherwise. */
+      b->result.as_u32x4 = r0 & ~cmp;
+
+      old_result = vhash_merge_results (r0 & cmp);
+
+      n_elts_unset += old_result != 0;
+
+      if (vhash_search_bucket_is_full (r0))
+	{
+	  if (old_result)
+	    vhash_unset_refill_from_overflow (h, b, key_hash, n_key_u32s);
+	  else
+	    old_result = vhash_unset_overflow (h, key_hash, vi, n_key_u32s);
+	}
+
+      result_function (state, vi, old_result - 1, n_key_u32s);
+    }
+  ASSERT (h->n_elts >= n_elts_unset);
+  h->n_elts -= n_elts_unset;
+}
+
+void vhash_init (vhash_t * h, u32 log2_n_keys, u32 n_key_u32,
+		 u32 * hash_seeds);
+
+void vhash_resize (vhash_t * old, u32 log2_n_keys);
+
+typedef struct
+{
+  vhash_t *vhash;
+
+  union
+  {
+    struct
+    {
+      u32 *keys;
+      u32 *results;
+    };
+
+    /* Vector layout for get keys. */
+    struct
+    {
+      u32x4_union_t *get_keys;
+      u32x4_union_t *get_results;
+    };
+  };
+
+  u32 n_vectors_div_4;
+  u32 n_vectors_mod_4;
+
+  u32 n_key_u32;
+
+  u32 n_keys;
+} vhash_main_t;
+
+always_inline u32
+vhash_get_alloc_keys (vhash_main_t * vm, u32 n_keys, u32 n_key_u32)
+{
+  u32 i, n;
+
+  i = vm->n_keys;
+  vm->n_keys = i + n_keys;
+
+  n = (round_pow2 (vm->n_keys, 4) / 4) * n_key_u32;
+
+  vec_validate_aligned (vm->get_keys, n - 1, sizeof (vm->get_keys[0]));
+  vec_validate_aligned (vm->get_results, n - 1, sizeof (vm->get_results[0]));
+
+  return i;
+}
+
+always_inline void
+vhash_get_set_key_word (vhash_main_t * vm, u32 vi, u32 wi, u32 n_key_u32,
+			u32 value)
+{
+  u32x4_union_t *k = vec_elt_at_index (vm->get_keys, (vi / 4) * n_key_u32);
+  ASSERT (wi < n_key_u32);
+  k[wi].as_u32[vi % 4] = value;
+}
+
+always_inline u32
+vhash_get_fetch_result (vhash_main_t * vm, u32 vi)
+{
+  u32x4_union_t *r = vec_elt_at_index (vm->get_results, vi / 4);
+  return r->as_u32[vi % 4];
+}
+
+void vhash_main_get (vhash_main_t * vm);
+
+always_inline u32
+vhash_set_alloc_keys (vhash_main_t * vm, u32 n_keys, u32 n_key_u32)
+{
+  u32 i;
+
+  i = vm->n_keys;
+  vm->n_keys = i + n_keys;
+
+  vec_resize (vm->keys, n_keys * n_key_u32);
+  vec_resize (vm->results, n_keys);
+
+  return i;
+}
+
+always_inline void
+vhash_set_set_key_word (vhash_main_t * vm, u32 vi, u32 wi, u32 n_key_u32,
+			u32 value)
+{
+  u32 *k = vec_elt_at_index (vm->keys, vi * n_key_u32);
+  ASSERT (wi < n_key_u32);
+  k[wi] = value;
+}
+
+always_inline void
+vhash_set_set_result (vhash_main_t * vm, u32 vi, u32 result)
+{
+  u32 *r = vec_elt_at_index (vm->results, vi);
+  r[0] = result;
+}
+
+always_inline u32
+vhash_set_fetch_old_result (vhash_main_t * vm, u32 vi)
+{
+  u32 *r = vec_elt_at_index (vm->results, vi);
+  return r[0];
+}
+
+void vhash_main_set (vhash_main_t * vm);
+
+always_inline u32
+vhash_unset_alloc_keys (vhash_main_t * vm, u32 n_keys, u32 n_key_u32)
+{
+  return vhash_set_alloc_keys (vm, n_keys, n_key_u32);
+}
+
+always_inline void
+vhash_unset_set_key_word (vhash_main_t * vm, u32 vi, u32 wi, u32 n_key_u32,
+			  u32 value)
+{
+  vhash_set_set_key_word (vm, vi, wi, n_key_u32, value);
+}
+
+always_inline void
+vhash_unset_set_result (vhash_main_t * vm, u32 vi, u32 result)
+{
+  vhash_set_set_result (vm, vi, result);
+}
+
+always_inline u32
+vhash_unset_fetch_old_result (vhash_main_t * vm, u32 vi)
+{
+  return vhash_set_fetch_old_result (vm, vi);
+}
+
+void vhash_main_unset (vhash_main_t * vm);
+
+typedef struct
+{
+  vhash_main_t new;
+
+  vhash_t *old;
+} vhash_resize_t;
+
+u32 vhash_resize_incremental (vhash_resize_t * vr, u32 vector_index,
+			      u32 n_vectors);
+
+#endif /* CLIB_HAVE_VEC128 */
+
+#endif /* included_clib_vhash_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vm_linux_kernel.h b/src/vppinfra/vm_linux_kernel.h
new file mode 100644
index 00000000..fd9e6148
--- /dev/null
+++ b/src/vppinfra/vm_linux_kernel.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_vm_linux_kernel_h
+#define included_vm_linux_kernel_h
+
+#include <linux/vmalloc.h>
+#include <linux/gfp.h>		/* for GFP_* */
+#include <asm/pgtable.h>	/* for PAGE_KERNEL */
+
+/* Allocate virtual address space. */
+always_inline void *
+clib_mem_vm_alloc (uword size)
+{
+  return vmalloc (size);
+}
+
+always_inline void
+clib_mem_vm_free (void *addr, uword size)
+{
+  vfree (addr);
+}
+
+always_inline void *
+clib_mem_vm_unmap (void *addr, uword size)
+{
+  return 0;
+}
+
+always_inline void *
+clib_mem_vm_map (void *addr, uword size)
+{
+  return addr;
+}
+
+#endif /* included_vm_linux_kernel_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vm_standalone.h b/src/vppinfra/vm_standalone.h
new file mode 100644
index 00000000..2cd431bc
--- /dev/null
+++ b/src/vppinfra/vm_standalone.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_vm_standalone_h
+#define included_vm_standalone_h
+
+/* Stubs for standalone "system" which has no VM support. */
+
+always_inline void *
+clib_mem_vm_alloc (uword size)
+{
+  return 0;
+}
+
+always_inline void
+clib_mem_vm_free (void *addr, uword size)
+{
+}
+
+always_inline void *
+clib_mem_vm_unmap (void *addr, uword size)
+{
+  return 0;
+}
+
+always_inline void *
+clib_mem_vm_map (void *addr, uword size)
+{
+  return addr;
+}
+
+#endif /* included_vm_standalone_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/vm_unix.h b/src/vppinfra/vm_unix.h
new file mode 100644
index 00000000..07e86516
--- /dev/null
+++ b/src/vppinfra/vm_unix.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_vm_unix_h
+#define included_vm_unix_h
+
+#include <unistd.h>
+#include <sys/mman.h>
+
+/* Allocate virtual address space. */
+always_inline void *
+clib_mem_vm_alloc (uword size)
+{
+  void *mmap_addr;
+  uword flags = MAP_PRIVATE;
+
+#ifdef MAP_ANONYMOUS
+  flags |= MAP_ANONYMOUS;
+#endif
+
+  mmap_addr = mmap (0, size, PROT_READ | PROT_WRITE, flags, -1, 0);
+  if (mmap_addr == (void *) -1)
+    mmap_addr = 0;
+
+  return mmap_addr;
+}
+
+always_inline void
+clib_mem_vm_free (void *addr, uword size)
+{
+  munmap (addr, size);
+}
+
+always_inline void *
+clib_mem_vm_unmap (void *addr, uword size)
+{
+  void *mmap_addr;
+  uword flags = MAP_PRIVATE | MAP_FIXED;
+
+  /* To unmap we "map" with no protection.  If we actually called
+     munmap then other callers could steal the address space.  By
+     changing to PROT_NONE the kernel can free up the pages which is
+     really what we want "unmap" to mean. */
+  mmap_addr = mmap (addr, size, PROT_NONE, flags, -1, 0);
+  if (mmap_addr == (void *) -1)
+    mmap_addr = 0;
+
+  return mmap_addr;
+}
+
+always_inline void *
+clib_mem_vm_map (void *addr, uword size)
+{
+  void *mmap_addr;
+  uword flags = MAP_PRIVATE | MAP_FIXED;
+
+  mmap_addr = mmap (addr, size, (PROT_READ | PROT_WRITE), flags, -1, 0);
+  if (mmap_addr == (void *) -1)
+    mmap_addr = 0;
+
+  return mmap_addr;
+}
+
+#endif /* included_vm_unix_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/xxhash.h b/src/vppinfra/xxhash.h
new file mode 100644
index 00000000..ea1e21bf
--- /dev/null
+++ b/src/vppinfra/xxhash.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Original license for the code used to construct
+  clib_xxhash(...).
+
+  xxHash - Fast Hash algorithm
+  Copyright (C) 2012-2014, Yann Collet.
+  BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the following disclaimer
+  in the documentation and/or other materials provided with the
+  distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef __included_xxhash_h__
+#define __included_xxhash_h__
+
+#define PRIME64_1 11400714785074694791ULL
+#define PRIME64_2 14029467366897019727ULL
+#define PRIME64_3  1609587929392839161ULL
+#define PRIME64_4  9650029242287828579ULL
+#define PRIME64_5  2870177450012600261ULL
+#define XXH_rotl64(x,r) ((x << r) | (x >> (64 - r)))
+
+static inline u64
+clib_xxhash (u64 key)
+{
+  u64 k1, h64;
+
+  k1 = key;
+  h64 = 0x9e3779b97f4a7c13LL + PRIME64_5 + 8;
+  k1 *= PRIME64_2;
+  k1 = XXH_rotl64 (k1, 31);
+  k1 *= PRIME64_1;
+  h64 ^= k1;
+  h64 = XXH_rotl64 (h64, 27) * PRIME64_1 + PRIME64_4;
+
+  h64 ^= h64 >> 33;
+  h64 *= PRIME64_2;
+  h64 ^= h64 >> 29;
+  h64 *= PRIME64_3;
+  h64 ^= h64 >> 32;
+  return h64;
+}
+
+#endif /* __included_xxhash_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/xy.h b/src/vppinfra/xy.h
new file mode 100644
index 00000000..fb562161
--- /dev/null
+++ b/src/vppinfra/xy.h
@@ -0,0 +1,56 @@
+/* (X,Y) coordinates. */
+
+/*
+  Copyright (c) 2008 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_clib_xy_h
+#define included_clib_xy_h
+
+#include <vppinfra/types.h>
+
+/* Basic definitions: coordinates and points. */
+typedef double xy_float_t;
+typedef __complex__ double xy_t;
+typedef __complex__ int ixy_t;
+
+typedef __complex__ char i8xy_t;
+typedef __complex__ short i16xy_t;
+typedef __complex__ int i32xy_t;
+
+/* X/Y components of a point: can be used as either rvalue/lvalue. */
+#define xy_x(x) __real__ (x)
+#define xy_y(x) __imag__ (x)
+
+/* Unit vectors in x/y directions. */
+#define xy_x_unit_vector (1)
+#define xy_y_unit_vector (1I)
+
+#endif /* included_clib_xy_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/zvec.c b/src/vppinfra/zvec.c
new file mode 100644
index 00000000..d062e5f7
--- /dev/null
+++ b/src/vppinfra/zvec.c
@@ -0,0 +1,442 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003, 2005 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <vppinfra/bitmap.h>
+#include <vppinfra/bitops.h>	/* for next_with_same_number_of_set_bits */
+#include <vppinfra/error.h>	/* for ASSERT */
+#include <vppinfra/mem.h>
+#include <vppinfra/os.h>	/* for os_panic */
+#include <vppinfra/vec.h>
+#include <vppinfra/zvec.h>
+
+/* Consider coding as bitmap, coding = 2^c_0 + 2^c_1 + ... + 2^c_n
+   With c_0 < c_1 < ... < c_n.  coding == 0 represents c_n = BITS (uword).
+
+   Unsigned integers i = 0 ... are represented as follows:
+
+       0 <= i < 2^c_0       	(i << 1) | (1 << 0) binary:   i 1
+   2^c_0 <= i < 2^c_0 + 2^c_1   (i << 2) | (1 << 1) binary: i 1 0
+   ...                                              binary: i 0 ... 0
+
+   Smaller numbers use less bits.  Coding is chosen so that encoding
+   of given histogram of typical values gives smallest number of bits.
+   The number and position of coding bits c_i are used to best fit the
+   histogram of typical values.
+*/
+
+/* Decode given compressed data.  Return number of compressed data
+   bits used. */
+uword
+zvec_decode (uword coding, uword zdata, uword * n_zdata_bits)
+{
+  uword c, d, result, n_bits;
+  uword explicit_end, implicit_end;
+
+  result = 0;
+  n_bits = 0;
+  while (1)
+    {
+      c = first_set (coding);
+      implicit_end = c == coding;
+      explicit_end = (zdata & 1) & ~implicit_end;
+      d = (zdata >> explicit_end) & (c - 1);
+      if (explicit_end | implicit_end)
+	{
+	  result += d;
+	  n_bits += min_log2 (c) + explicit_end;
+	  break;
+	}
+      n_bits += 1;
+      result += c;
+      coding ^= c;
+      zdata >>= 1;
+    }
+
+  if (coding == 0)
+    n_bits = BITS (uword);
+
+  *n_zdata_bits = n_bits;
+  return result;
+}
+
+uword
+zvec_encode (uword coding, uword data, uword * n_result_bits)
+{
+  uword c, shift, result;
+  uword explicit_end, implicit_end;
+
+  /* Data must be in range.  Note special coding == 0
+     would break for data - 1 <= coding. */
+  ASSERT (data <= coding - 1);
+
+  shift = 0;
+  while (1)
+    {
+      c = first_set (coding);
+      implicit_end = c == coding;
+      explicit_end = ((data & (c - 1)) == data);
+      if (explicit_end | implicit_end)
+	{
+	  uword t = explicit_end & ~implicit_end;
+	  result = ((data << t) | t) << shift;
+	  *n_result_bits =
+	    /* data bits */ (c == 0 ? BITS (uword) : min_log2 (c))
+	    /* shift bits */  + shift + t;
+	  return result;
+	}
+      data -= c;
+      coding ^= c;
+      shift++;
+    }
+
+  /* Never reached. */
+  ASSERT (0);
+  return ~0;
+}
+
+always_inline uword
+get_data (void *data, uword data_bytes, uword is_signed)
+{
+  if (data_bytes == 1)
+    return is_signed ? zvec_signed_to_unsigned (*(i8 *) data) : *(u8 *) data;
+  else if (data_bytes == 2)
+    return is_signed ? zvec_signed_to_unsigned (*(i16 *) data) : *(u16 *)
+      data;
+  else if (data_bytes == 4)
+    return is_signed ? zvec_signed_to_unsigned (*(i32 *) data) : *(u32 *)
+      data;
+  else if (data_bytes == 8)
+    return is_signed ? zvec_signed_to_unsigned (*(i64 *) data) : *(u64 *)
+      data;
+  else
+    {
+      os_panic ();
+      return ~0;
+    }
+}
+
+always_inline void
+put_data (void *data, uword data_bytes, uword is_signed, uword x)
+{
+  if (data_bytes == 1)
+    {
+      if (is_signed)
+	*(i8 *) data = zvec_unsigned_to_signed (x);
+      else
+	*(u8 *) data = x;
+    }
+  else if (data_bytes == 2)
+    {
+      if (is_signed)
+	*(i16 *) data = zvec_unsigned_to_signed (x);
+      else
+	*(u16 *) data = x;
+    }
+  else if (data_bytes == 4)
+    {
+      if (is_signed)
+	*(i32 *) data = zvec_unsigned_to_signed (x);
+      else
+	*(u32 *) data = x;
+    }
+  else if (data_bytes == 8)
+    {
+      if (is_signed)
+	*(i64 *) data = zvec_unsigned_to_signed (x);
+      else
+	*(u64 *) data = x;
+    }
+  else
+    {
+      os_panic ();
+    }
+}
+
+always_inline uword *
+zvec_encode_inline (uword * zvec,
+		    uword * zvec_n_bits,
+		    uword coding,
+		    void *data,
+		    uword data_stride,
+		    uword n_data, uword data_bytes, uword is_signed)
+{
+  uword i;
+
+  i = *zvec_n_bits;
+  while (n_data >= 1)
+    {
+      uword d0, z0, l0;
+
+      d0 = get_data (data + 0 * data_stride, data_bytes, is_signed);
+      data += 1 * data_stride;
+      n_data -= 1;
+
+      z0 = zvec_encode (coding, d0, &l0);
+      zvec = clib_bitmap_set_multiple (zvec, i, z0, l0);
+      i += l0;
+    }
+
+  *zvec_n_bits = i;
+  return zvec;
+}
+
+#define _(TYPE,IS_SIGNED)					\
+  uword * zvec_encode_##TYPE (uword * zvec,			\
+			      uword * zvec_n_bits,		\
+			      uword coding,			\
+			      void * data,			\
+			      uword data_stride,		\
+			      uword n_data)			\
+  {								\
+    return zvec_encode_inline (zvec, zvec_n_bits,		\
+			    coding,				\
+			    data, data_stride, n_data,		\
+			    /* data_bytes */ sizeof (TYPE),	\
+			    /* is_signed */ IS_SIGNED);		\
+  }
+
+_(u8, /* is_signed */ 0);
+_(u16, /* is_signed */ 0);
+_(u32, /* is_signed */ 0);
+_(u64, /* is_signed */ 0);
+_(i8, /* is_signed */ 1);
+_(i16, /* is_signed */ 1);
+_(i32, /* is_signed */ 1);
+_(i64, /* is_signed */ 1);
+
+#undef _
+
+always_inline uword
+coding_max_n_bits (uword coding)
+{
+  uword n_bits;
+  (void) zvec_decode (coding, 0, &n_bits);
+  return n_bits;
+}
+
+always_inline void
+zvec_decode_inline (uword * zvec,
+		    uword * zvec_n_bits,
+		    uword coding,
+		    void *data,
+		    uword data_stride,
+		    uword n_data, uword data_bytes, uword is_signed)
+{
+  uword i, n_max;
+
+  i = *zvec_n_bits;
+  n_max = coding_max_n_bits (coding);
+  while (n_data >= 1)
+    {
+      uword d0, z0, l0;
+
+      z0 = clib_bitmap_get_multiple (zvec, i, n_max);
+      d0 = zvec_decode (coding, z0, &l0);
+      i += l0;
+      put_data (data + 0 * data_stride, data_bytes, is_signed, d0);
+      data += 1 * data_stride;
+      n_data -= 1;
+    }
+  *zvec_n_bits = i;
+}
+
+#define _(TYPE,IS_SIGNED)					\
+  void zvec_decode_##TYPE (uword * zvec,			\
+			   uword * zvec_n_bits,			\
+			   uword coding,			\
+			   void * data,				\
+			   uword data_stride,			\
+			   uword n_data)			\
+  {								\
+    return zvec_decode_inline (zvec, zvec_n_bits,		\
+			       coding,				\
+			       data, data_stride, n_data,	\
+			       /* data_bytes */ sizeof (TYPE),	\
+			       /* is_signed */ IS_SIGNED);	\
+  }
+
+_(u8, /* is_signed */ 0);
+_(u16, /* is_signed */ 0);
+_(u32, /* is_signed */ 0);
+_(u64, /* is_signed */ 0);
+_(i8, /* is_signed */ 1);
+_(i16, /* is_signed */ 1);
+_(i32, /* is_signed */ 1);
+_(i64, /* is_signed */ 1);
+
+#undef _
+
+/* Compute number of bits needed to encode given histogram. */
+static uword
+zvec_coding_bits (uword coding, uword * histogram_counts, uword min_bits)
+{
+  uword n_type_bits, n_bits;
+  uword this_count, last_count, max_count_index;
+  uword i, b, l;
+
+  n_bits = 0;
+  n_type_bits = 1;
+  last_count = 0;
+  max_count_index = vec_len (histogram_counts) - 1;
+
+  /* Coding is not large enough to encode given data. */
+  if (coding <= max_count_index)
+    return ~0;
+
+  i = 0;
+  while (coding != 0)
+    {
+      b = first_set (coding);
+      l = min_log2 (b);
+      i += b;
+
+      this_count =
+	histogram_counts[i > max_count_index ? max_count_index : i - 1];
+
+      /* No more data to encode? */
+      if (this_count == last_count)
+	break;
+
+      /* Last coding is i 0 ... 0 so we don't need an extra type bit. */
+      if (coding == b)
+	n_type_bits--;
+
+      n_bits += (this_count - last_count) * (n_type_bits + l);
+
+      /* This coding cannot be minimal: so return. */
+      if (n_bits >= min_bits)
+	return ~0;
+
+      last_count = this_count;
+      coding ^= b;
+      n_type_bits++;
+    }
+
+  return n_bits;
+}
+
+uword
+_zvec_coding_from_histogram (void *histogram,
+			     uword histogram_len,
+			     uword histogram_elt_count_offset,
+			     uword histogram_elt_bytes,
+			     uword max_value_to_encode,
+			     zvec_coding_info_t * coding_return)
+{
+  uword coding, min_coding;
+  uword min_coding_bits, coding_bits;
+  uword i, n_bits_set, total_count;
+  uword *counts;
+  zvec_histogram_count_t *h_count = histogram + histogram_elt_count_offset;
+
+  if (histogram_len < 1)
+    {
+      coding_return->coding = 0;
+      coding_return->min_coding_bits = 0;
+      coding_return->n_data = 0;
+      coding_return->n_codes = 0;
+      coding_return->ave_coding_bits = 0;
+      return 0;
+    }
+
+  total_count = 0;
+  counts = vec_new (uword, histogram_len);
+  for (i = 0; i < histogram_len; i++)
+    {
+      zvec_histogram_count_t this_count = h_count[0];
+      total_count += this_count;
+      counts[i] = total_count;
+      h_count =
+	(zvec_histogram_count_t *) ((void *) h_count + histogram_elt_bytes);
+    }
+
+  min_coding = 0;
+  min_coding_bits = ~0;
+
+  {
+    uword base_coding =
+      max_value_to_encode !=
+      ~0 ? (1 + max_value_to_encode) : vec_len (counts);
+    uword max_coding = max_pow2 (2 * base_coding);
+
+    for (n_bits_set = 1; n_bits_set <= 8; n_bits_set++)
+      {
+	for (coding = pow2_mask (n_bits_set);
+	     coding < max_coding;
+	     coding = next_with_same_number_of_set_bits (coding))
+	  {
+	    coding_bits = zvec_coding_bits (coding, counts, min_coding_bits);
+	    if (coding_bits >= min_coding_bits)
+	      continue;
+	    min_coding_bits = coding_bits;
+	    min_coding = coding;
+	  }
+      }
+  }
+
+  if (coding_return)
+    {
+      coding_return->coding = min_coding;
+      coding_return->min_coding_bits = min_coding_bits;
+      coding_return->n_data = total_count;
+      coding_return->n_codes = vec_len (counts);
+      coding_return->ave_coding_bits =
+	(f64) min_coding_bits / (f64) total_count;
+    }
+
+  vec_free (counts);
+
+  return min_coding;
+}
+
+u8 *
+format_zvec_coding (u8 * s, va_list * args)
+{
+  zvec_coding_info_t *c = va_arg (*args, zvec_coding_info_t *);
+  return format (s,
+		 "zvec coding 0x%x, %d elts, %d codes, %d bits total, %.4f ave bits/code",
+		 c->coding, c->n_data, c->n_codes, c->min_coding_bits,
+		 c->ave_coding_bits);
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vppinfra/zvec.h b/src/vppinfra/zvec.h
new file mode 100644
index 00000000..7d35a3fe
--- /dev/null
+++ b/src/vppinfra/zvec.h
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef included_zvec_h
+#define included_zvec_h
+
+#include <vppinfra/clib.h>
+#include <vppinfra/error.h>	/* for ASSERT */
+#include <vppinfra/format.h>
+
+/* zvec: compressed vectors.
+
+   Data is entropy coded with 32 bit "codings".
+
+   Consider coding as bitmap, coding = 2^c_0 + 2^c_1 + ... + 2^c_n
+   With c_0 < c_1 < ... < c_n.  coding == 0 represents c_n = BITS (uword).
+
+   Unsigned integers i = 0 ... are represented as follows:
+
+       0 <= i < 2^c_0       	(i << 1) | (1 << 0) binary:   i 1
+   2^c_0 <= i < 2^c_0 + 2^c_1   (i << 2) | (1 << 1) binary: i 1 0
+   ...                                              binary: i 0 ... 0
+
+   Smaller numbers use less bits.  Coding is chosen so that encoding
+   of given histogram of typical values gives smallest number of bits.
+   The number and position of coding bits c_i are used to best fit the
+   histogram of typical values.
+*/
+
+typedef struct
+{
+  /* Smallest coding for given histogram of typical data. */
+  u32 coding;
+
+  /* Number of data in histogram. */
+  u32 n_data;
+
+  /* Number of codes (unique values) in histogram. */
+  u32 n_codes;
+
+  /* Number of bits in smallest coding of data. */
+  u32 min_coding_bits;
+
+  /* Average number of bits per code. */
+  f64 ave_coding_bits;
+} zvec_coding_info_t;
+
+/* Encode/decode data. */
+uword zvec_encode (uword coding, uword data, uword * n_result_bits);
+uword zvec_decode (uword coding, uword zdata, uword * n_zdata_bits);
+
+format_function_t format_zvec_coding;
+
+typedef u32 zvec_histogram_count_t;
+
+#define zvec_coding_from_histogram(h,count_field,len,max_value_to_encode,zc) \
+  _zvec_coding_from_histogram ((h), (len),				\
+			       STRUCT_OFFSET_OF_VAR (h, count_field),	\
+			       sizeof (h[0]),				\
+			       max_value_to_encode,			\
+			       (zc))
+
+uword
+_zvec_coding_from_histogram (void *_histogram,
+			     uword histogram_len,
+			     uword histogram_elt_count_offset,
+			     uword histogram_elt_bytes,
+			     uword max_value_to_encode,
+			     zvec_coding_info_t * coding_info_return);
+
+#define _(TYPE,IS_SIGNED)						\
+  uword * zvec_encode_##TYPE (uword * zvec, uword * zvec_n_bits, uword coding, \
+			   void * data, uword data_stride, uword n_data);
+
+_(u8, /* is_signed */ 0);
+_(u16, /* is_signed */ 0);
+_(u32, /* is_signed */ 0);
+_(u64, /* is_signed */ 0);
+_(i8, /* is_signed */ 1);
+_(i16, /* is_signed */ 1);
+_(i32, /* is_signed */ 1);
+_(i64, /* is_signed */ 1);
+
+#undef _
+
+#define _(TYPE,IS_SIGNED)			\
+  void zvec_decode_##TYPE (uword * zvec,	\
+			   uword * zvec_n_bits,	\
+			   uword coding,	\
+			   void * data,		\
+			   uword data_stride,	\
+			   uword n_data)
+
+_(u8, /* is_signed */ 0);
+_(u16, /* is_signed */ 0);
+_(u32, /* is_signed */ 0);
+_(u64, /* is_signed */ 0);
+_(i8, /* is_signed */ 1);
+_(i16, /* is_signed */ 1);
+_(i32, /* is_signed */ 1);
+_(i64, /* is_signed */ 1);
+
+#undef _
+
+/* Signed <=> unsigned conversion.
+      -1, -2, -3, ... =>    1, 3, 5, ... odds
+   0, +1, +2, +3, ... => 0, 2, 4, 6, ... evens */
+always_inline uword
+zvec_signed_to_unsigned (word s)
+{
+  uword a = s < 0;
+  s = 2 * s + a;
+  return a ? -s : s;
+}
+
+always_inline word
+zvec_unsigned_to_signed (uword u)
+{
+  uword a = u & 1;
+  u >>= 1;
+  return a ? -u : u;
+}
+
+#endif /* included_zvec_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/svm/Makefile.am b/svm/Makefile.am
deleted file mode 100644
index 490e27b3..00000000
--- a/svm/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign
-
-bin_PROGRAMS = svmtool svmdbtool
-
-AM_CFLAGS = -Wall
-
-nobase_include_HEADERS = svm.h ssvm.h svmdb.h
-
-lib_LTLIBRARIES = libsvm.la libsvmdb.la
-
-libsvm_la_SOURCES = svm.c ssvm.c
-
-svmtool_LDADD = libsvm.la -lvppinfra -lpthread -lrt
-
-libsvmdb_la_SOURCES = svmdb.c
-
-svmdbtool_LDADD = libsvmdb.la libsvm.la -lvppinfra -lpthread -lrt
diff --git a/svm/configure.ac b/svm/configure.ac
deleted file mode 100644
index 40b09606..00000000
--- a/svm/configure.ac
+++ /dev/null
@@ -1,7 +0,0 @@
-AC_INIT(svm, 1.0)
-LT_INIT
-AM_INIT_AUTOMAKE
-
-AM_SILENT_RULES([yes])
-
-AC_OUTPUT([Makefile])
diff --git a/svm/dir.dox b/svm/dir.dox
deleted file mode 100644
index 83246979..00000000
--- a/svm/dir.dox
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Doxygen directory documentation */
-/**
-@dir
-@brief Shared virtual memory allocation library.
-*/
diff --git a/svm/persist.c b/svm/persist.c
deleted file mode 100644
index 023c596b..00000000
--- a/svm/persist.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- *------------------------------------------------------------------
- * persist.c - persistent data structure storage test / demo code
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-#include <vppinfra/serialize.h>
-#include <svmdb.h>
-
-typedef struct
-{
-  svmdb_client_t *c;
-} persist_main_t;
-
-persist_main_t persist_main;
-
-typedef struct
-{
-  u8 *string1;
-  u8 *string2;
-} demo_struct2_t;
-
-typedef struct
-{
-  demo_struct2_t *demo2;
-  u8 *name;
-} demo_struct1_t;
-
-/*
- * Data structures in persistent shared memory, all the time
- */
-clib_error_t *
-persist_malloc (persist_main_t * pm)
-{
-  demo_struct2_t *demo2;
-  demo_struct1_t *demo1;
-  time_t starttime = time (0);
-  char *datestring = ctime (&starttime);
-  void *oldheap;
-
-  /* Get back the root pointer */
-  demo1 = svmdb_local_get_variable_reference
-    (pm->c, SVMDB_NAMESPACE_VEC, "demo1_location");
-
-  /* It doesnt exist create our data structures */
-  if (demo1 == 0)
-    {
-      /* If you want MP / thread safety, lock the region... */
-      pthread_mutex_lock (&pm->c->db_rp->mutex);
-
-      /* Switch to the shared memory region heap */
-      oldheap = svm_push_data_heap (pm->c->db_rp);
-
-      /* Allocate the top-level structure as a single element vector */
-      vec_validate (demo1, 0);
-
-      /* Allocate the next-level structure as a plain old memory obj */
-      demo2 = clib_mem_alloc (sizeof (*demo2));
-
-      demo1->demo2 = demo2;
-      demo1->name = format (0, "My name is Ishmael%c", 0);
-      demo2->string1 = format (0, "Here is string1%c", 0);
-      demo2->string2 = format (0, "Born at %s%c", datestring, 0);
-
-      /* Back to the process-private heap */
-      svm_pop_heap (oldheap);
-      pthread_mutex_unlock (&pm->c->db_rp->mutex);
-
-      /*
-       * Set the root pointer. Note: this guy switches heaps, locks, etc.
-       * We allocated demo1 as a vector to make this "just work..."
-       */
-      svmdb_local_set_vec_variable (pm->c, "demo1_location",
-				    demo1, sizeof (demo1));
-
-    }
-  else
-    {
-      /* retrieve and print data from shared memory */
-      demo2 = demo1->demo2;
-      fformat (stdout, "name: %s\n", demo1->name);
-      fformat (stdout, "demo2 location: %llx\n", demo2);
-      fformat (stdout, "string1: %s\n", demo2->string1);
-      fformat (stdout, "string2: %s\n", demo2->string2);
-    }
-  return 0;
-}
-
-void
-unserialize_demo1 (serialize_main_t * sm, va_list * args)
-{
-  demo_struct1_t **result = va_arg (*args, demo_struct1_t **);
-  demo_struct1_t *demo1;
-  demo_struct2_t *demo2;
-
-  /* Allocate data structures in process private memory */
-  demo1 = clib_mem_alloc (sizeof (*demo1));
-  demo2 = clib_mem_alloc (sizeof (*demo2));
-  demo1->demo2 = demo2;
-
-  /* retrieve data from shared memory checkpoint */
-  unserialize_cstring (sm, (char **) &demo1->name);
-  unserialize_cstring (sm, (char **) &demo2->string1);
-  unserialize_cstring (sm, (char **) &demo2->string2);
-  *result = demo1;
-}
-
-void
-serialize_demo1 (serialize_main_t * sm, va_list * args)
-{
-  demo_struct1_t *demo1 = va_arg (*args, demo_struct1_t *);
-  demo_struct2_t *demo2 = demo1->demo2;
-
-  serialize_cstring (sm, (char *) demo1->name);
-  serialize_cstring (sm, (char *) demo2->string1);
-  serialize_cstring (sm, (char *) demo2->string2);
-}
-
-/* Serialize / unserialize variant */
-clib_error_t *
-persist_serialize (persist_main_t * pm)
-{
-  u8 *checkpoint;
-  serialize_main_t sm;
-
-  demo_struct2_t *demo2;
-  demo_struct1_t *demo1;
-  time_t starttime = time (0);
-  char *datestring = ctime (&starttime);
-
-  /* Get back the root pointer */
-  checkpoint = svmdb_local_get_vec_variable (pm->c, "demo1_checkpoint",
-					     sizeof (u8));
-
-  /* It doesnt exist create our data structures */
-  if (checkpoint == 0)
-    {
-      /* Allocate data structures in process-private memory */
-      demo1 = clib_mem_alloc (sizeof (*demo2));
-      vec_validate (demo1, 0);
-      demo2 = clib_mem_alloc (sizeof (*demo2));
-
-      demo1->demo2 = demo2;
-      demo1->name = format (0, "My name is Ishmael%c", 0);
-      demo2->string1 = format (0, "Here is string1%c", 0);
-      demo2->string2 = format (0, "Born at %s%c", datestring, 0);
-
-      /* Create checkpoint */
-      serialize_open_vector (&sm, checkpoint);
-      serialize (&sm, serialize_demo1, demo1);
-      checkpoint = serialize_close_vector (&sm);
-
-      /* Copy checkpoint into shared memory */
-      svmdb_local_set_vec_variable (pm->c, "demo1_checkpoint",
-				    checkpoint, sizeof (u8));
-      /* Toss the process-private-memory original.. */
-      vec_free (checkpoint);
-    }
-  else
-    {
-      /* Open the checkpoint */
-      unserialize_open_data (&sm, checkpoint, vec_len (checkpoint));
-      unserialize (&sm, unserialize_demo1, &demo1);
-
-      /* Toss the process-private-memory checkpoint copy */
-      vec_free (checkpoint);
-
-      /* Off we go... */
-      demo2 = demo1->demo2;
-      fformat (stdout, "name: %s\n", demo1->name);
-      fformat (stdout, "demo2 location: %llx\n", demo2);
-      fformat (stdout, "string1: %s\n", demo2->string1);
-      fformat (stdout, "string2: %s\n", demo2->string2);
-    }
-  return 0;
-}
-
-
-int
-main (int argc, char **argv)
-{
-  unformat_input_t _input, *input = &_input;
-  persist_main_t *pm = &persist_main;
-  clib_error_t *error = 0;
-
-  /* Make a 4mb database arena, chroot so it's truly private */
-  pm->c = svmdb_map_chroot_size ("/ptest", 4 << 20);
-
-  ASSERT (pm->c);
-
-  unformat_init_command_line (input, argv);
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "malloc"))
-	error = persist_malloc (pm);
-      else if (unformat (input, "serialize"))
-	error = persist_serialize (pm);
-      else
-	{
-	  error = clib_error_return (0, "Unknown flavor '%U'",
-				     format_unformat_error, input);
-	  break;
-	}
-    }
-
-  svmdb_unmap (pm->c);
-
-  if (error)
-    {
-      clib_error_report (error);
-      exit (1);
-    }
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/svm/ssvm.c b/svm/ssvm.c
deleted file mode 100644
index 6f409eb6..00000000
--- a/svm/ssvm.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "ssvm.h"
-
-int
-ssvm_master_init (ssvm_private_t * ssvm, u32 master_index)
-{
-  int ssvm_fd;
-  u8 *ssvm_filename;
-  u8 junk = 0;
-  int flags;
-  ssvm_shared_header_t *sh;
-  u64 ticks = clib_cpu_time_now ();
-  u64 randomize_baseva;
-  void *oldheap;
-
-  if (ssvm->ssvm_size == 0)
-    return SSVM_API_ERROR_NO_SIZE;
-
-  ssvm_filename = format (0, "/dev/shm/%s%c", ssvm->name, 0);
-
-  unlink ((char *) ssvm_filename);
-
-  vec_free (ssvm_filename);
-
-  ssvm_fd = shm_open ((char *) ssvm->name, O_RDWR | O_CREAT | O_EXCL, 0777);
-
-  if (ssvm_fd < 0)
-    {
-      clib_unix_warning ("create segment '%s'", ssvm->name);
-      return SSVM_API_ERROR_CREATE_FAILURE;
-    }
-
-  if (lseek (ssvm_fd, ssvm->ssvm_size, SEEK_SET) < 0)
-    {
-      clib_unix_warning ("lseek");
-      close (ssvm_fd);
-      return SSVM_API_ERROR_SET_SIZE;
-    }
-
-  if (write (ssvm_fd, &junk, 1) != 1)
-    {
-      clib_unix_warning ("set ssvm size");
-      close (ssvm_fd);
-      return SSVM_API_ERROR_SET_SIZE;
-    }
-
-  flags = MAP_SHARED;
-  if (ssvm->requested_va)
-    flags |= MAP_FIXED;
-
-  randomize_baseva = (ticks & 15) * MMAP_PAGESIZE;
-
-  if (ssvm->requested_va)
-    ssvm->requested_va += randomize_baseva;
-
-  sh = ssvm->sh =
-    (ssvm_shared_header_t *) mmap ((void *) ssvm->requested_va,
-				   ssvm->ssvm_size, PROT_READ | PROT_WRITE,
-				   flags, ssvm_fd, 0);
-
-  if (ssvm->sh == MAP_FAILED)
-    {
-      clib_unix_warning ("mmap");
-      close (ssvm_fd);
-      return SSVM_API_ERROR_MMAP;
-    }
-
-  close (ssvm_fd);
-
-  ssvm->my_pid = getpid ();
-  sh->master_pid = ssvm->my_pid;
-  sh->ssvm_size = ssvm->ssvm_size;
-  sh->heap = mheap_alloc_with_flags
-    (((u8 *) sh) + MMAP_PAGESIZE, ssvm->ssvm_size - MMAP_PAGESIZE,
-     MHEAP_FLAG_DISABLE_VM | MHEAP_FLAG_THREAD_SAFE);
-
-  sh->ssvm_va = pointer_to_uword (sh);
-  sh->master_index = master_index;
-
-  oldheap = ssvm_push_heap (sh);
-  sh->name = format (0, "%s%c", ssvm->name, 0);
-  ssvm_pop_heap (oldheap);
-
-  ssvm->i_am_master = 1;
-
-  /* The application has to set set sh->ready... */
-  return 0;
-}
-
-int
-ssvm_slave_init (ssvm_private_t * ssvm, int timeout_in_seconds)
-{
-  struct stat stat;
-  int ssvm_fd = -1;
-  ssvm_shared_header_t *sh;
-
-  ssvm->i_am_master = 0;
-
-  while (timeout_in_seconds-- > 0)
-    {
-      if (ssvm_fd < 0)
-	ssvm_fd = shm_open ((char *) ssvm->name, O_RDWR, 0777);
-      if (ssvm_fd < 0)
-	{
-	  sleep (1);
-	  continue;
-	}
-      if (fstat (ssvm_fd, &stat) < 0)
-	{
-	  sleep (1);
-	  continue;
-	}
-
-      if (stat.st_size > 0)
-	goto map_it;
-    }
-  clib_warning ("slave timeout");
-  return SSVM_API_ERROR_SLAVE_TIMEOUT;
-
-map_it:
-  sh = (void *) mmap (0, MMAP_PAGESIZE, PROT_READ | PROT_WRITE, MAP_SHARED,
-		      ssvm_fd, 0);
-  if (sh == MAP_FAILED)
-    {
-      clib_unix_warning ("slave research mmap");
-      close (ssvm_fd);
-      return SSVM_API_ERROR_MMAP;
-    }
-
-  while (timeout_in_seconds-- > 0)
-    {
-      if (sh->ready)
-	goto re_map_it;
-    }
-  close (ssvm_fd);
-  munmap (sh, MMAP_PAGESIZE);
-  clib_warning ("slave timeout 2");
-  return SSVM_API_ERROR_SLAVE_TIMEOUT;
-
-re_map_it:
-  ssvm->requested_va = (u64) sh->ssvm_va;
-  ssvm->ssvm_size = sh->ssvm_size;
-  munmap (sh, MMAP_PAGESIZE);
-
-  sh = ssvm->sh = (void *) mmap ((void *) ssvm->requested_va, ssvm->ssvm_size,
-				 PROT_READ | PROT_WRITE,
-				 MAP_SHARED | MAP_FIXED, ssvm_fd, 0);
-
-  if (sh == MAP_FAILED)
-    {
-      clib_unix_warning ("slave final mmap");
-      close (ssvm_fd);
-      return SSVM_API_ERROR_MMAP;
-    }
-  sh->slave_pid = getpid ();
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/svm/ssvm.h b/svm/ssvm.h
deleted file mode 100644
index 9e61b9a0..00000000
--- a/svm/ssvm.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_ssvm_h__
-#define __included_ssvm_h__
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-
-#define MMAP_PAGESIZE (4<<10)
-#define SSVM_N_OPAQUE 7
-
-typedef struct
-{
-  /* Spin-lock */
-  volatile u32 lock;
-  volatile u32 owner_pid;
-  int recursion_count;
-  u32 tag;			/* for debugging */
-
-  /* The allocation arena */
-  void *heap;
-
-  /* Segment must be mapped at this address, or no supper */
-  u64 ssvm_va;
-  /* The actual mmap size */
-  u64 ssvm_size;
-  u32 master_pid;
-  u32 slave_pid;
-  u8 *name;
-  void *opaque[SSVM_N_OPAQUE];
-
-  /* Set when the master application thinks it's time to make the donuts */
-  volatile u32 ready;
-
-  /* Needed to make unique MAC addresses, etc. */
-  u32 master_index;
-} ssvm_shared_header_t;
-
-typedef struct
-{
-  ssvm_shared_header_t *sh;
-  u64 ssvm_size;
-  u32 my_pid;
-  u32 vlib_hw_if_index;
-  u8 *name;
-  uword requested_va;
-  int i_am_master;
-  u32 per_interface_next_index;
-  u32 *rx_queue;
-} ssvm_private_t;
-
-always_inline void
-ssvm_lock (ssvm_shared_header_t * h, u32 my_pid, u32 tag)
-{
-  if (h->owner_pid == my_pid)
-    {
-      h->recursion_count++;
-      return;
-    }
-
-  while (__sync_lock_test_and_set (&h->lock, 1))
-    ;
-
-  h->owner_pid = my_pid;
-  h->recursion_count = 1;
-  h->tag = tag;
-}
-
-always_inline void
-ssvm_unlock (ssvm_shared_header_t * h)
-{
-  if (--h->recursion_count == 0)
-    {
-      h->owner_pid = 0;
-      h->tag = 0;
-      CLIB_MEMORY_BARRIER ();
-      h->lock = 0;
-    }
-}
-
-static inline void *
-ssvm_push_heap (ssvm_shared_header_t * sh)
-{
-  u8 *oldheap;
-  oldheap = clib_mem_set_heap (sh->heap);
-  return ((void *) oldheap);
-}
-
-static inline void
-ssvm_pop_heap (void *oldheap)
-{
-  clib_mem_set_heap (oldheap);
-}
-
-#define foreach_ssvm_api_error                  \
-_(NO_NAME, "No shared segment name", -10)       \
-_(NO_SIZE, "Size not set (master)", -11)        \
-_(CREATE_FAILURE, "Create failed", -12)		\
-_(SET_SIZE, "Set size failed", -13)		\
-_(MMAP, "mmap failed", -14)			\
-_(SLAVE_TIMEOUT, "Slave map timeout", -15)
-
-typedef enum
-{
-#define _(n,s,c) SSVM_API_ERROR_##n = c,
-  foreach_ssvm_api_error
-#undef _
-} ssvm_api_error_enum_t;
-
-#define SSVM_API_ERROR_NO_NAME	(-10)
-
-int ssvm_master_init (ssvm_private_t * ssvm, u32 master_index);
-int ssvm_slave_init (ssvm_private_t * ssvm, int timeout_in_seconds);
-
-#endif /* __included_ssvm_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/svm/svm.c b/svm/svm.c
deleted file mode 100644
index e4ca98e1..00000000
--- a/svm/svm.c
+++ /dev/null
@@ -1,1237 +0,0 @@
-/*
- *------------------------------------------------------------------
- * svm.c - shared VM allocation, mmap(...MAP_FIXED...)
- * library
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-
-#include "svm.h"
-
-static svm_region_t *root_rp;
-static int root_rp_refcount;
-
-#define MAXLOCK 2
-static pthread_mutex_t *mutexes_held[MAXLOCK];
-static int nheld;
-
-svm_region_t *
-svm_get_root_rp (void)
-{
-  return root_rp;
-}
-
-#define MUTEX_DEBUG
-
-static void
-region_lock (svm_region_t * rp, int tag)
-{
-  pthread_mutex_lock (&rp->mutex);
-#ifdef MUTEX_DEBUG
-  rp->mutex_owner_pid = getpid ();
-  rp->mutex_owner_tag = tag;
-#endif
-  ASSERT (nheld < MAXLOCK);
-  /*
-   * Keep score of held mutexes so we can try to exit
-   * cleanly if the world comes to an end at the worst possible
-   * moment
-   */
-  mutexes_held[nheld++] = &rp->mutex;
-}
-
-static void
-region_unlock (svm_region_t * rp)
-{
-  int i, j;
-#ifdef MUTEX_DEBUG
-  rp->mutex_owner_pid = 0;
-  rp->mutex_owner_tag = 0;
-#endif
-
-  for (i = nheld - 1; i >= 0; i--)
-    {
-      if (mutexes_held[i] == &rp->mutex)
-	{
-	  for (j = i; j < MAXLOCK - 1; j++)
-	    mutexes_held[j] = mutexes_held[j + 1];
-	  nheld--;
-	  goto found;
-	}
-    }
-  ASSERT (0);
-
-found:
-  CLIB_MEMORY_BARRIER ();
-  pthread_mutex_unlock (&rp->mutex);
-}
-
-
-static u8 *
-format_svm_flags (u8 * s, va_list * args)
-{
-  uword f = va_arg (*args, uword);
-
-  if (f & SVM_FLAGS_MHEAP)
-    s = format (s, "MHEAP ");
-  if (f & SVM_FLAGS_FILE)
-    s = format (s, "FILE ");
-  if (f & SVM_FLAGS_NODATA)
-    s = format (s, "NODATA ");
-  if (f & SVM_FLAGS_NEED_DATA_INIT)
-    s = format (s, "INIT ");
-
-  return (s);
-}
-
-static u8 *
-format_svm_size (u8 * s, va_list * args)
-{
-  uword size = va_arg (*args, uword);
-
-  if (size >= (1 << 20))
-    {
-      s = format (s, "(%d mb)", size >> 20);
-    }
-  else if (size >= (1 << 10))
-    {
-      s = format (s, "(%d kb)", size >> 10);
-    }
-  else
-    {
-      s = format (s, "(%d bytes)", size);
-    }
-  return (s);
-}
-
-u8 *
-format_svm_region (u8 * s, va_list * args)
-{
-  svm_region_t *rp = va_arg (*args, svm_region_t *);
-  int verbose = va_arg (*args, int);
-  int i;
-  uword lo, hi;
-
-  s = format (s, "%s: base va 0x%x size 0x%x %U\n",
-	      rp->region_name, rp->virtual_base,
-	      rp->virtual_size, format_svm_size, rp->virtual_size);
-  s = format (s, "  user_ctx 0x%x, bitmap_size %d\n",
-	      rp->user_ctx, rp->bitmap_size);
-
-  if (verbose)
-    {
-      s = format (s, "  flags: 0x%x %U\n", rp->flags,
-		  format_svm_flags, rp->flags);
-      s = format (s,
-		  "  region_heap 0x%x data_base 0x%x data_heap 0x%x\n",
-		  rp->region_heap, rp->data_base, rp->data_heap);
-    }
-
-  s = format (s, "  %d clients, pids: ", vec_len (rp->client_pids));
-
-  for (i = 0; i < vec_len (rp->client_pids); i++)
-    s = format (s, "%d ", rp->client_pids[i]);
-
-  s = format (s, "\n");
-
-  if (verbose)
-    {
-      lo = hi = ~0;
-
-      s = format (s, "  VM in use: ");
-
-      for (i = 0; i < rp->bitmap_size; i++)
-	{
-	  if (clib_bitmap_get_no_check (rp->bitmap, i) != 0)
-	    {
-	      if (lo == ~0)
-		{
-		  hi = lo = rp->virtual_base + i * MMAP_PAGESIZE;
-		}
-	      else
-		{
-		  hi = rp->virtual_base + i * MMAP_PAGESIZE;
-		}
-	    }
-	  else
-	    {
-	      if (lo != ~0)
-		{
-		  hi = rp->virtual_base + i * MMAP_PAGESIZE - 1;
-		  s = format (s, "   0x%x - 0x%x (%dk)\n", lo, hi,
-			      (hi - lo) >> 10);
-		  lo = hi = ~0;
-		}
-	    }
-	}
-      s = format (s, "  rgn heap stats: %U", format_mheap,
-		  rp->region_heap, 0);
-      if ((rp->flags & SVM_FLAGS_MHEAP) && rp->data_heap)
-	{
-	  s = format (s, "\n  data heap stats: %U", format_mheap,
-		      rp->data_heap, 1);
-	}
-      s = format (s, "\n");
-    }
-
-  return (s);
-}
-
-/*
- * rnd_pagesize
- * Round to a pagesize multiple, presumably 4k works
- */
-static u64
-rnd_pagesize (u64 size)
-{
-  u64 rv;
-
-  rv = (size + (MMAP_PAGESIZE - 1)) & ~(MMAP_PAGESIZE - 1);
-  return (rv);
-}
-
-/*
- * svm_data_region_setup
- */
-static int
-svm_data_region_create (svm_map_region_args_t * a, svm_region_t * rp)
-{
-  int fd;
-  u8 junk = 0;
-  uword map_size;
-
-  map_size = rp->virtual_size - (MMAP_PAGESIZE +
-				 (a->pvt_heap_size ? a->pvt_heap_size :
-				  SVM_PVT_MHEAP_SIZE));
-
-  if (a->flags & SVM_FLAGS_FILE)
-    {
-      struct stat statb;
-
-      fd = open (a->backing_file, O_RDWR | O_CREAT, 0777);
-
-      if (fd < 0)
-	{
-	  clib_unix_warning ("open");
-	  return -1;
-	}
-
-      if (fstat (fd, &statb) < 0)
-	{
-	  clib_unix_warning ("fstat");
-	  close (fd);
-	  return -2;
-	}
-
-      if (statb.st_mode & S_IFREG)
-	{
-	  if (statb.st_size == 0)
-	    {
-	      if (lseek (fd, map_size, SEEK_SET) == (off_t) - 1)
-		{
-		  clib_unix_warning ("seek region size");
-		  close (fd);
-		  return -3;
-		}
-	      if (write (fd, &junk, 1) != 1)
-		{
-		  clib_unix_warning ("set region size");
-		  close (fd);
-		  return -3;
-		}
-	    }
-	  else
-	    {
-	      map_size = rnd_pagesize (statb.st_size);
-	    }
-	}
-      else
-	{
-	  map_size = a->backing_mmap_size;
-	}
-
-      ASSERT (map_size <= rp->virtual_size -
-	      (MMAP_PAGESIZE + SVM_PVT_MHEAP_SIZE));
-
-      if (mmap (rp->data_base, map_size, PROT_READ | PROT_WRITE,
-		MAP_SHARED | MAP_FIXED, fd, 0) == MAP_FAILED)
-	{
-	  clib_unix_warning ("mmap");
-	  close (fd);
-	  return -3;
-	}
-      close (fd);
-      rp->backing_file = (char *) format (0, "%s\0", a->backing_file);
-      rp->flags |= SVM_FLAGS_FILE;
-    }
-
-  if (a->flags & SVM_FLAGS_MHEAP)
-    {
-      rp->data_heap =
-	mheap_alloc_with_flags ((void *) (rp->data_base), map_size,
-				MHEAP_FLAG_DISABLE_VM);
-      rp->flags |= SVM_FLAGS_MHEAP;
-    }
-  return 0;
-}
-
-static int
-svm_data_region_map (svm_map_region_args_t * a, svm_region_t * rp)
-{
-  int fd;
-  u8 junk = 0;
-  uword map_size;
-  struct stat statb;
-
-  map_size = rp->virtual_size -
-    (MMAP_PAGESIZE
-     + (a->pvt_heap_size ? a->pvt_heap_size : SVM_PVT_MHEAP_SIZE));
-
-  if (a->flags & SVM_FLAGS_FILE)
-    {
-
-      fd = open (a->backing_file, O_RDWR, 0777);
-
-      if (fd < 0)
-	{
-	  clib_unix_warning ("open");
-	  return -1;
-	}
-
-      if (fstat (fd, &statb) < 0)
-	{
-	  clib_unix_warning ("fstat");
-	  close (fd);
-	  return -2;
-	}
-
-      if (statb.st_mode & S_IFREG)
-	{
-	  if (statb.st_size == 0)
-	    {
-	      if (lseek (fd, map_size, SEEK_SET) == (off_t) - 1)
-		{
-		  clib_unix_warning ("seek region size");
-		  close (fd);
-		  return -3;
-		}
-	      if (write (fd, &junk, 1) != 1)
-		{
-		  clib_unix_warning ("set region size");
-		  close (fd);
-		  return -3;
-		}
-	    }
-	  else
-	    {
-	      map_size = rnd_pagesize (statb.st_size);
-	    }
-	}
-      else
-	{
-	  map_size = a->backing_mmap_size;
-	}
-
-      ASSERT (map_size <= rp->virtual_size
-	      - (MMAP_PAGESIZE
-		 +
-		 (a->pvt_heap_size ? a->pvt_heap_size : SVM_PVT_MHEAP_SIZE)));
-
-      if (mmap (rp->data_base, map_size, PROT_READ | PROT_WRITE,
-		MAP_SHARED | MAP_FIXED, fd, 0) == MAP_FAILED)
-	{
-	  clib_unix_warning ("mmap");
-	  close (fd);
-	  return -3;
-	}
-      close (fd);
-    }
-  return 0;
-}
-
-u8 *
-shm_name_from_svm_map_region_args (svm_map_region_args_t * a)
-{
-  u8 *path;
-  u8 *shm_name;
-  u8 *split_point;
-  u8 *mkdir_arg = 0;
-  int root_path_offset = 0;
-  int name_offset = 0;
-
-  if (a->root_path)
-    {
-      /* Tolerate present or absent slashes */
-      if (a->root_path[0] == '/')
-	root_path_offset++;
-
-      /* create the root_path under /dev/shm
-         iterate through path creating directories */
-
-      path = format (0, "/dev/shm/%s%c", &a->root_path[root_path_offset], 0);
-      split_point = path + 1;
-      vec_add1 (mkdir_arg, '-');
-
-      while (*split_point)
-	{
-	  while (*split_point && *split_point != '/')
-	    {
-	      vec_add1 (mkdir_arg, *split_point);
-	      split_point++;
-	    }
-	  vec_add1 (mkdir_arg, 0);
-
-	  /* ready to descend another level */
-	  mkdir_arg[vec_len (mkdir_arg) - 1] = '-';
-	  split_point++;
-	}
-      vec_free (mkdir_arg);
-      vec_free (path);
-
-      if (a->name[0] == '/')
-	name_offset = 1;
-
-      shm_name = format (0, "/%s-%s%c", a->root_path,
-			 &a->name[name_offset], 0);
-    }
-  else
-    shm_name = format (0, "%s%c", a->name, 0);
-  return (shm_name);
-}
-
-/*
- * svm_map_region
- */
-void *
-svm_map_region (svm_map_region_args_t * a)
-{
-  int svm_fd;
-  svm_region_t *rp;
-  pthread_mutexattr_t attr;
-  pthread_condattr_t cattr;
-  int deadman = 0;
-  u8 junk = 0;
-  void *oldheap;
-  int overhead_space;
-  int rv;
-  uword data_base;
-  int nbits, words, bit;
-  int pid_holding_region_lock;
-  u8 *shm_name;
-  int dead_region_recovery = 0;
-  int time_left;
-  struct stat stat;
-  struct timespec ts, tsrem;
-
-  if (CLIB_DEBUG > 1)
-    clib_warning ("[%d] map region %s", getpid (), a->name);
-
-  ASSERT ((a->size & ~(MMAP_PAGESIZE - 1)) == a->size);
-  ASSERT (a->name);
-
-  shm_name = shm_name_from_svm_map_region_args (a);
-
-  svm_fd = shm_open ((char *) shm_name, O_RDWR | O_CREAT | O_EXCL, 0777);
-
-  if (svm_fd >= 0)
-    {
-      if (fchmod (svm_fd, 0770) < 0)
-	clib_unix_warning ("segment chmod");
-      /* This turns out to fail harmlessly if the client starts first */
-      if (fchown (svm_fd, a->uid, a->gid) < 0)
-	clib_unix_warning ("segment chown [ok if client starts first]");
-
-      vec_free (shm_name);
-
-      if (lseek (svm_fd, a->size, SEEK_SET) == (off_t) - 1)
-	{
-	  clib_warning ("seek region size");
-	  close (svm_fd);
-	  return (0);
-	}
-      if (write (svm_fd, &junk, 1) != 1)
-	{
-	  clib_warning ("set region size");
-	  close (svm_fd);
-	  return (0);
-	}
-
-      rp = mmap ((void *) a->baseva, a->size,
-		 PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, svm_fd, 0);
-
-      if (rp == (svm_region_t *) MAP_FAILED)
-	{
-	  clib_unix_warning ("mmap create");
-	  close (svm_fd);
-	  return (0);
-	}
-      close (svm_fd);
-      memset (rp, 0, sizeof (*rp));
-
-      if (pthread_mutexattr_init (&attr))
-	clib_unix_warning ("mutexattr_init");
-
-      if (pthread_mutexattr_setpshared (&attr, PTHREAD_PROCESS_SHARED))
-	clib_unix_warning ("mutexattr_setpshared");
-
-      if (pthread_mutex_init (&rp->mutex, &attr))
-	clib_unix_warning ("mutex_init");
-
-      if (pthread_mutexattr_destroy (&attr))
-	clib_unix_warning ("mutexattr_destroy");
-
-      if (pthread_condattr_init (&cattr))
-	clib_unix_warning ("condattr_init");
-
-      if (pthread_condattr_setpshared (&cattr, PTHREAD_PROCESS_SHARED))
-	clib_unix_warning ("condattr_setpshared");
-
-      if (pthread_cond_init (&rp->condvar, &cattr))
-	clib_unix_warning ("cond_init");
-
-      if (pthread_condattr_destroy (&cattr))
-	clib_unix_warning ("condattr_destroy");
-
-      region_lock (rp, 1);
-
-      rp->virtual_base = a->baseva;
-      rp->virtual_size = a->size;
-
-      rp->region_heap =
-	mheap_alloc_with_flags ((void *) (a->baseva + MMAP_PAGESIZE),
-				(a->pvt_heap_size != 0) ?
-				a->pvt_heap_size : SVM_PVT_MHEAP_SIZE,
-				MHEAP_FLAG_DISABLE_VM);
-      oldheap = svm_push_pvt_heap (rp);
-
-      rp->region_name = (char *) format (0, "%s%c", a->name, 0);
-      vec_add1 (rp->client_pids, getpid ());
-
-      nbits = rp->virtual_size / MMAP_PAGESIZE;
-
-      ASSERT (nbits > 0);
-      rp->bitmap_size = nbits;
-      words = (nbits + BITS (uword) - 1) / BITS (uword);
-      vec_validate (rp->bitmap, words - 1);
-
-      overhead_space = MMAP_PAGESIZE /* header */  +
-	((a->pvt_heap_size != 0) ? a->pvt_heap_size : SVM_PVT_MHEAP_SIZE);
-
-      bit = 0;
-      data_base = (uword) rp->virtual_base;
-
-      if (a->flags & SVM_FLAGS_NODATA)
-	rp->flags |= SVM_FLAGS_NEED_DATA_INIT;
-
-      do
-	{
-	  clib_bitmap_set_no_check (rp->bitmap, bit, 1);
-	  bit++;
-	  overhead_space -= MMAP_PAGESIZE;
-	  data_base += MMAP_PAGESIZE;
-	}
-      while (overhead_space > 0);
-
-      rp->data_base = (void *) data_base;
-
-      /*
-       * Note: although the POSIX spec guarantees that only one
-       * process enters this block, we have to play games
-       * to hold off clients until e.g. the mutex is ready
-       */
-      rp->version = SVM_VERSION;
-
-      /* setup the data portion of the region */
-
-      rv = svm_data_region_create (a, rp);
-      if (rv)
-	{
-	  clib_warning ("data_region_create: %d", rv);
-	}
-
-      region_unlock (rp);
-
-      svm_pop_heap (oldheap);
-
-      return ((void *) rp);
-    }
-  else
-    {
-      svm_fd = shm_open ((char *) shm_name, O_RDWR, 0777);
-
-      vec_free (shm_name);
-
-      if (svm_fd < 0)
-	{
-	  perror ("svm_region_map(mmap open)");
-	  return (0);
-	}
-
-      time_left = 20;
-      while (1)
-	{
-	  if (0 != fstat (svm_fd, &stat))
-	    {
-	      clib_warning ("fstat failed: %d", errno);
-	      close (svm_fd);
-	      return (0);
-	    }
-	  if (stat.st_size > 0)
-	    {
-	      break;
-	    }
-	  if (0 == time_left)
-	    {
-	      clib_warning ("waiting for resize of shm file timed out");
-	      close (svm_fd);
-	      return (0);
-	    }
-	  ts.tv_sec = 0;
-	  ts.tv_nsec = 100000000;
-	  while (nanosleep (&ts, &tsrem) < 0)
-	    ts = tsrem;
-	  time_left--;
-	}
-
-      rp = mmap (0, MMAP_PAGESIZE,
-		 PROT_READ | PROT_WRITE, MAP_SHARED, svm_fd, 0);
-
-      if (rp == (svm_region_t *) MAP_FAILED)
-	{
-	  close (svm_fd);
-	  clib_warning ("mmap");
-	  return (0);
-	}
-      /*
-       * We lost the footrace to create this region; make sure
-       * the winner has crossed the finish line.
-       */
-      while (rp->version == 0 && deadman++ < 5)
-	{
-	  sleep (1);
-	}
-
-      /*
-       * <bleep>-ed?
-       */
-      if (rp->version == 0)
-	{
-	  clib_warning ("rp->version %d not %d", rp->version, SVM_VERSION);
-	  close (svm_fd);
-	  munmap (rp, a->size);
-	  return (0);
-	}
-      /* Remap now that the region has been placed */
-      a->baseva = rp->virtual_base;
-      a->size = rp->virtual_size;
-      munmap (rp, MMAP_PAGESIZE);
-
-      rp = (void *) mmap ((void *) a->baseva, a->size,
-			  PROT_READ | PROT_WRITE,
-			  MAP_SHARED | MAP_FIXED, svm_fd, 0);
-      if ((uword) rp == (uword) MAP_FAILED)
-	{
-	  clib_unix_warning ("mmap");
-	  close (svm_fd);
-	  return (0);
-	}
-
-      if ((uword) rp != rp->virtual_base)
-	{
-	  clib_warning ("mmap botch");
-	}
-
-      /*
-       * Try to fix the region mutex if it is held by
-       * a dead process
-       */
-      pid_holding_region_lock = rp->mutex_owner_pid;
-      if (pid_holding_region_lock && kill (pid_holding_region_lock, 0) < 0)
-	{
-	  clib_warning
-	    ("region %s mutex held by dead pid %d, tag %d, force unlock",
-	     rp->region_name, pid_holding_region_lock, rp->mutex_owner_tag);
-	  /* owner pid is nonexistent */
-	  rp->mutex.__data.__owner = 0;
-	  rp->mutex.__data.__lock = 0;
-	  dead_region_recovery = 1;
-	}
-
-      if (dead_region_recovery)
-	clib_warning ("recovery: attempt to re-lock region");
-
-      region_lock (rp, 2);
-      oldheap = svm_push_pvt_heap (rp);
-      vec_add1 (rp->client_pids, getpid ());
-
-      if (dead_region_recovery)
-	clib_warning ("recovery: attempt svm_data_region_map");
-
-      rv = svm_data_region_map (a, rp);
-      if (rv)
-	{
-	  clib_warning ("data_region_map: %d", rv);
-	}
-
-      if (dead_region_recovery)
-	clib_warning ("unlock and continue");
-
-      region_unlock (rp);
-
-      svm_pop_heap (oldheap);
-
-      return ((void *) rp);
-
-    }
-  return 0;			/* NOTREACHED */
-}
-
-static void
-svm_mutex_cleanup (void)
-{
-  int i;
-  for (i = 0; i < nheld; i++)
-    {
-      pthread_mutex_unlock (mutexes_held[i]);
-    }
-}
-
-static void
-svm_region_init_internal (svm_map_region_args_t * a)
-{
-  svm_region_t *rp;
-  u64 ticks = clib_cpu_time_now ();
-  uword randomize_baseva;
-
-  /* guard against klutz calls */
-  if (root_rp)
-    return;
-
-  root_rp_refcount++;
-
-  atexit (svm_mutex_cleanup);
-
-  /* Randomize the shared-VM base at init time */
-  if (MMAP_PAGESIZE <= (4 << 10))
-    randomize_baseva = (ticks & 15) * MMAP_PAGESIZE;
-  else
-    randomize_baseva = (ticks & 3) * MMAP_PAGESIZE;
-
-  a->baseva += randomize_baseva;
-
-  rp = svm_map_region (a);
-  ASSERT (rp);
-
-  region_lock (rp, 3);
-
-  /* Set up the main region data structures */
-  if (rp->flags & SVM_FLAGS_NEED_DATA_INIT)
-    {
-      svm_main_region_t *mp = 0;
-      void *oldheap;
-
-      rp->flags &= ~(SVM_FLAGS_NEED_DATA_INIT);
-
-      oldheap = svm_push_pvt_heap (rp);
-      vec_validate (mp, 0);
-      mp->name_hash = hash_create_string (0, sizeof (uword));
-      mp->root_path = a->root_path ? format (0, "%s%c", a->root_path, 0) : 0;
-      rp->data_base = mp;
-      svm_pop_heap (oldheap);
-    }
-  region_unlock (rp);
-  root_rp = rp;
-}
-
-void
-svm_region_init (void)
-{
-  svm_map_region_args_t _a, *a = &_a;
-
-  memset (a, 0, sizeof (*a));
-  a->root_path = 0;
-  a->name = SVM_GLOBAL_REGION_NAME;
-  a->baseva = SVM_GLOBAL_REGION_BASEVA;
-  a->size = SVM_GLOBAL_REGION_SIZE;
-  a->flags = SVM_FLAGS_NODATA;
-  a->uid = 0;
-  a->gid = 0;
-
-  svm_region_init_internal (a);
-}
-
-void
-svm_region_init_chroot (char *root_path)
-{
-  svm_map_region_args_t _a, *a = &_a;
-
-  memset (a, 0, sizeof (*a));
-  a->root_path = root_path;
-  a->name = SVM_GLOBAL_REGION_NAME;
-  a->baseva = SVM_GLOBAL_REGION_BASEVA;
-  a->size = SVM_GLOBAL_REGION_SIZE;
-  a->flags = SVM_FLAGS_NODATA;
-  a->uid = 0;
-  a->gid = 0;
-
-  svm_region_init_internal (a);
-}
-
-void
-svm_region_init_chroot_uid_gid (char *root_path, int uid, int gid)
-{
-  svm_map_region_args_t _a, *a = &_a;
-
-  memset (a, 0, sizeof (*a));
-  a->root_path = root_path;
-  a->name = SVM_GLOBAL_REGION_NAME;
-  a->baseva = SVM_GLOBAL_REGION_BASEVA;
-  a->size = SVM_GLOBAL_REGION_SIZE;
-  a->flags = SVM_FLAGS_NODATA;
-  a->uid = uid;
-  a->gid = gid;
-
-  svm_region_init_internal (a);
-}
-
-void
-svm_region_init_args (svm_map_region_args_t * a)
-{
-  svm_region_init_internal (a);
-}
-
-void *
-svm_region_find_or_create (svm_map_region_args_t * a)
-{
-  svm_main_region_t *mp;
-  svm_region_t *rp;
-  uword need_nbits;
-  int index, i;
-  void *oldheap;
-  uword *p;
-  u8 *name;
-  svm_subregion_t *subp;
-
-  ASSERT (root_rp);
-
-  a->size += MMAP_PAGESIZE +
-    ((a->pvt_heap_size != 0) ? a->pvt_heap_size : SVM_PVT_MHEAP_SIZE);
-  a->size = rnd_pagesize (a->size);
-
-  region_lock (root_rp, 4);
-  oldheap = svm_push_pvt_heap (root_rp);
-  mp = root_rp->data_base;
-
-  ASSERT (mp);
-
-  /* Map the named region from the correct chroot environment */
-  a->root_path = (char *) mp->root_path;
-
-  /*
-   * See if this region is already known. If it is, we're
-   * almost done...
-   */
-  p = hash_get_mem (mp->name_hash, a->name);
-
-  if (p)
-    {
-      rp = svm_map_region (a);
-      region_unlock (root_rp);
-      svm_pop_heap (oldheap);
-      return rp;
-    }
-
-  /* Create the region. */
-  ASSERT ((a->size & ~(MMAP_PAGESIZE - 1)) == a->size);
-
-  need_nbits = a->size / MMAP_PAGESIZE;
-
-  index = 1;			/* $$$ fixme, figure out how many bit to really skip */
-
-  /*
-   * Scan the virtual space allocation bitmap, looking for a large
-   * enough chunk
-   */
-  do
-    {
-      if (clib_bitmap_get_no_check (root_rp->bitmap, index) == 0)
-	{
-	  for (i = 0; i < (need_nbits - 1); i++)
-	    {
-	      if (clib_bitmap_get_no_check (root_rp->bitmap, index + i) == 1)
-		{
-		  index = index + i;
-		  goto next;
-		}
-	    }
-	  break;
-	}
-      index++;
-    next:;
-    }
-  while (index < root_rp->bitmap_size);
-
-  /* Completely out of VM? */
-  if (index >= root_rp->bitmap_size)
-    {
-      clib_warning ("region %s: not enough VM to allocate 0x%llx (%lld)",
-		    root_rp->region_name, a->size, a->size);
-      svm_pop_heap (oldheap);
-      region_unlock (root_rp);
-      return 0;
-    }
-
-  /*
-   * Mark virtual space allocated
-   */
-#if CLIB_DEBUG > 1
-  clib_warning ("set %d bits at index %d", need_nbits, index);
-#endif
-
-  for (i = 0; i < need_nbits; i++)
-    {
-      clib_bitmap_set_no_check (root_rp->bitmap, index + i, 1);
-    }
-
-  /* Place this region where it goes... */
-  a->baseva = root_rp->virtual_base + index * MMAP_PAGESIZE;
-
-  rp = svm_map_region (a);
-
-  pool_get (mp->subregions, subp);
-  name = format (0, "%s%c", a->name, 0);
-  subp->subregion_name = name;
-
-  hash_set_mem (mp->name_hash, name, subp - mp->subregions);
-
-  svm_pop_heap (oldheap);
-
-  region_unlock (root_rp);
-
-  return (rp);
-}
-
-/*
- * svm_region_unmap
- *
- * Let go of the indicated region. If the calling process
- * is the last customer, throw it away completely.
- * The root region mutex guarantees atomicity with respect to
- * a new region client showing up at the wrong moment.
- */
-void
-svm_region_unmap (void *rp_arg)
-{
-  int i, mypid = getpid ();
-  int nclients_left;
-  void *oldheap;
-  uword virtual_base, virtual_size;
-  svm_region_t *rp = rp_arg;
-  char *name;
-
-  /*
-   * If we take a signal while holding one or more shared-memory
-   * mutexes, we may end up back here from an otherwise
-   * benign exit handler. Bail out to avoid a recursive
-   * mutex screw-up.
-   */
-  if (nheld)
-    return;
-
-  ASSERT (rp);
-  ASSERT (root_rp);
-
-  if (CLIB_DEBUG > 1)
-    clib_warning ("[%d] unmap region %s", getpid (), rp->region_name);
-
-  region_lock (root_rp, 5);
-  region_lock (rp, 6);
-
-  oldheap = svm_push_pvt_heap (rp);	/* nb vec_delete() in the loop */
-
-  /* Remove the caller from the list of mappers */
-  for (i = 0; i < vec_len (rp->client_pids); i++)
-    {
-      if (rp->client_pids[i] == mypid)
-	{
-	  vec_delete (rp->client_pids, 1, i);
-	  goto found;
-	}
-    }
-  clib_warning ("pid %d AWOL", mypid);
-
-found:
-
-  svm_pop_heap (oldheap);
-
-  nclients_left = vec_len (rp->client_pids);
-  virtual_base = rp->virtual_base;
-  virtual_size = rp->virtual_size;
-
-  if (nclients_left == 0)
-    {
-      int index, nbits, i;
-      svm_main_region_t *mp;
-      uword *p;
-      svm_subregion_t *subp;
-
-      /* Kill the region, last guy on his way out */
-
-      oldheap = svm_push_pvt_heap (root_rp);
-      name = vec_dup (rp->region_name);
-
-      virtual_base = rp->virtual_base;
-      virtual_size = rp->virtual_size;
-
-      /* Figure out which bits to clear in the root region bitmap */
-      index = (virtual_base - root_rp->virtual_base) / MMAP_PAGESIZE;
-
-      nbits = (virtual_size + MMAP_PAGESIZE - 1) / MMAP_PAGESIZE;
-
-#if CLIB_DEBUG > 1
-      clib_warning ("clear %d bits at index %d", nbits, index);
-#endif
-      /* Give back the allocated VM */
-      for (i = 0; i < nbits; i++)
-	{
-	  clib_bitmap_set_no_check (root_rp->bitmap, index + i, 0);
-	}
-
-      mp = root_rp->data_base;
-
-      p = hash_get_mem (mp->name_hash, name);
-
-      /* Better never happen ... */
-      if (p == NULL)
-	{
-	  region_unlock (rp);
-	  region_unlock (root_rp);
-	  svm_pop_heap (oldheap);
-	  clib_warning ("Region name '%s' not found?", name);
-	  return;
-	}
-
-      /* Remove from the root region subregion pool */
-      subp = mp->subregions + p[0];
-      pool_put (mp->subregions, subp);
-
-      hash_unset_mem (mp->name_hash, name);
-
-      vec_free (name);
-
-      region_unlock (rp);
-      shm_unlink (rp->region_name);
-      munmap ((void *) virtual_base, virtual_size);
-      region_unlock (root_rp);
-      svm_pop_heap (oldheap);
-      return;
-    }
-
-  region_unlock (rp);
-  region_unlock (root_rp);
-
-  munmap ((void *) virtual_base, virtual_size);
-}
-
-/*
- * svm_region_exit
- * There is no clean way to unlink the
- * root region when all clients go away,
- * so remove the pid entry and call it a day.
- */
-void
-svm_region_exit ()
-{
-  void *oldheap;
-  int i, mypid = getpid ();
-  uword virtual_base, virtual_size;
-
-  /* It felt so nice we did it twice... */
-  if (root_rp == 0)
-    return;
-
-  if (--root_rp_refcount > 0)
-    return;
-
-  /*
-   * If we take a signal while holding one or more shared-memory
-   * mutexes, we may end up back here from an otherwise
-   * benign exit handler. Bail out to avoid a recursive
-   * mutex screw-up.
-   */
-  if (nheld)
-    return;
-
-  region_lock (root_rp, 7);
-  oldheap = svm_push_pvt_heap (root_rp);
-
-  virtual_base = root_rp->virtual_base;
-  virtual_size = root_rp->virtual_size;
-
-  for (i = 0; i < vec_len (root_rp->client_pids); i++)
-    {
-      if (root_rp->client_pids[i] == mypid)
-	{
-	  vec_delete (root_rp->client_pids, 1, i);
-	  goto found;
-	}
-    }
-  clib_warning ("pid %d AWOL", mypid);
-
-found:
-
-  region_unlock (root_rp);
-  svm_pop_heap (oldheap);
-
-  root_rp = 0;
-  munmap ((void *) virtual_base, virtual_size);
-}
-
-void
-svm_client_scan_this_region_nolock (svm_region_t * rp)
-{
-  int j;
-  int mypid = getpid ();
-  void *oldheap;
-
-  for (j = 0; j < vec_len (rp->client_pids); j++)
-    {
-      if (mypid == rp->client_pids[j])
-	continue;
-      if (rp->client_pids[j] && (kill (rp->client_pids[j], 0) < 0))
-	{
-	  clib_warning ("%s: cleanup ghost pid %d",
-			rp->region_name, rp->client_pids[j]);
-	  /* nb: client vec in rp->region_heap */
-	  oldheap = svm_push_pvt_heap (rp);
-	  vec_delete (rp->client_pids, 1, j);
-	  j--;
-	  svm_pop_heap (oldheap);
-	}
-    }
-}
-
-
-/*
- * Scan svm regions for dead clients
- */
-void
-svm_client_scan (char *root_path)
-{
-  int i, j;
-  svm_main_region_t *mp;
-  svm_map_region_args_t *a = 0;
-  svm_region_t *root_rp;
-  svm_region_t *rp;
-  svm_subregion_t *subp;
-  u8 *name = 0;
-  u8 **svm_names = 0;
-  void *oldheap;
-  int mypid = getpid ();
-
-  vec_validate (a, 0);
-
-  svm_region_init_chroot (root_path);
-
-  root_rp = svm_get_root_rp ();
-
-  pthread_mutex_lock (&root_rp->mutex);
-
-  mp = root_rp->data_base;
-
-  for (j = 0; j < vec_len (root_rp->client_pids); j++)
-    {
-      if (mypid == root_rp->client_pids[j])
-	continue;
-      if (root_rp->client_pids[j] && (kill (root_rp->client_pids[j], 0) < 0))
-	{
-	  clib_warning ("%s: cleanup ghost pid %d",
-			root_rp->region_name, root_rp->client_pids[j]);
-	  /* nb: client vec in root_rp->region_heap */
-	  oldheap = svm_push_pvt_heap (root_rp);
-	  vec_delete (root_rp->client_pids, 1, j);
-	  j--;
-	  svm_pop_heap (oldheap);
-	}
-    }
-
-  /*
-   * Snapshoot names, can't hold root rp mutex across
-   * find_or_create.
-   */
-  /* *INDENT-OFF* */
-  pool_foreach (subp, mp->subregions, ({
-        name = vec_dup (subp->subregion_name);
-        vec_add1(svm_names, name);
-      }));
-  /* *INDENT-ON* */
-
-  pthread_mutex_unlock (&root_rp->mutex);
-
-  for (i = 0; i < vec_len (svm_names); i++)
-    {
-      vec_validate (a, 0);
-      a->root_path = root_path;
-      a->name = (char *) svm_names[i];
-      rp = svm_region_find_or_create (a);
-      if (rp)
-	{
-	  pthread_mutex_lock (&rp->mutex);
-
-	  svm_client_scan_this_region_nolock (rp);
-
-	  pthread_mutex_unlock (&rp->mutex);
-	  svm_region_unmap (rp);
-	  vec_free (svm_names[i]);
-	}
-      vec_free (a);
-    }
-  vec_free (svm_names);
-
-  svm_region_exit ();
-
-  vec_free (a);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/svm/svm.h b/svm/svm.h
deleted file mode 100644
index 0b87dbcb..00000000
--- a/svm/svm.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *------------------------------------------------------------------
- * svm.h - shared VM allocation, mmap(...MAP_FIXED...)
- * brain police
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#ifndef __included_svm_h__
-#define __included_svm_h__
-
-#include <pthread.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/mem.h>
-
-#define MMAP_PAGESIZE (clib_mem_get_page_size())
-
-#define SVM_VERSION ((1<<16) | 1)	/* set to declare region ready. */
-
-#define SVM_FLAGS_MHEAP (1<<0)	/* region contains an mheap */
-#define SVM_FLAGS_FILE  (1<<1)	/* region backed by one or more files */
-#define SVM_FLAGS_NODATA (1<<2)	/* region will be further subdivided */
-#define SVM_FLAGS_NEED_DATA_INIT (1<<3)
-
-#define SVM_PVT_MHEAP_SIZE (128<<10)	/* region's private mheap (128k) */
-
-typedef struct svm_region_
-{
-  volatile uword version;
-  pthread_mutex_t mutex;
-  pthread_cond_t condvar;
-  int mutex_owner_pid;		/* in case of trouble */
-  int mutex_owner_tag;
-  uword flags;
-  uword virtual_base;		/* base of the region object */
-  uword virtual_size;
-  void *region_heap;
-  void *data_base;		/* data portion base address */
-  void *data_heap;		/* data heap, if any */
-  volatile void *user_ctx;	/* user context pointer */
-  /* stuff allocated in the region's heap */
-  uword bitmap_size;		/* nbits in virtual alloc bitmap */
-  uword *bitmap;		/* the bitmap */
-  char *region_name;
-  char *backing_file;
-  char **filenames;
-  uword *client_pids;
-  /* pad */
-
-  /* next page:
-   * (64K) clib heap for the region itself
-   *
-   * data_base -> whatever is in this region
-   */
-
-} svm_region_t;
-
-typedef struct svm_map_region_args_
-{
-  char *root_path;		/* NULL means use the truly global arena */
-  char *name;
-  u64 baseva;
-  u64 size;
-  u64 pvt_heap_size;
-  uword flags;
-  char *backing_file;
-  uword backing_mmap_size;
-  /* uid, gid to own the svm region(s) */
-  int uid;
-  int gid;
-} svm_map_region_args_t;
-
-
-/*
- * Memory shared across all router instances. Packet buffers, etc
- * Base should be "out of the way," and size should be big enough to
- * cover everything we plan to put here.
- */
-#define SVM_GLOBAL_REGION_BASEVA  0x30000000
-#define SVM_GLOBAL_REGION_SIZE    (64<<20)
-#define SVM_GLOBAL_REGION_NAME "/global_vm"
-
-/*
- * Memory shared across individual router instances.
- */
-#define SVM_OVERLAY_REGION_BASEVA \
-               (SVM_GLOBAL_REGION_BASEVA + SVM_GLOBAL_REGION_SIZE)
-#define SVM_OVERLAY_REGION_SIZE   (1<<20)
-#define SVM_OVERLAY_REGION_BASENAME "/overlay_vm"
-
-typedef struct
-{
-  u8 *subregion_name;
-} svm_subregion_t;
-
-typedef struct
-{
-  svm_subregion_t *subregions;	/* subregion pool */
-  uword *name_hash;
-  u8 *root_path;
-} svm_main_region_t;
-
-
-void *svm_region_find_or_create (svm_map_region_args_t * a);
-void svm_region_init (void);
-void svm_region_init_chroot (char *root_path);
-void svm_region_init_chroot_uid_gid (char *root_path, int uid, int gid);
-void svm_region_init_args (svm_map_region_args_t * a);
-void svm_region_exit (void);
-void svm_region_unmap (void *rp_arg);
-void svm_client_scan (char *root_path);
-void svm_client_scan_this_region_nolock (svm_region_t * rp);
-u8 *shm_name_from_svm_map_region_args (svm_map_region_args_t * a);
-
-static inline void *
-svm_mem_alloc (svm_region_t * rp, uword size)
-{
-  u8 *oldheap;
-  ASSERT (rp->flags & SVM_FLAGS_MHEAP);
-  u8 *rv;
-
-  pthread_mutex_lock (&rp->mutex);
-  oldheap = clib_mem_set_heap (rp->data_heap);
-  rv = clib_mem_alloc (size);
-  clib_mem_set_heap (oldheap);
-  pthread_mutex_unlock (&rp->mutex);
-  return (rv);
-}
-
-static inline void *
-svm_mem_alloc_aligned_at_offset (svm_region_t * rp,
-				 uword size, uword align, uword offset)
-{
-  u8 *oldheap;
-  ASSERT (rp->flags & SVM_FLAGS_MHEAP);
-  u8 *rv;
-
-  pthread_mutex_lock (&rp->mutex);
-  oldheap = clib_mem_set_heap (rp->data_heap);
-  rv = clib_mem_alloc_aligned_at_offset (size, align, offset,
-					 1 /* yes, call os_out_of_memory */ );
-  clib_mem_set_heap (oldheap);
-  pthread_mutex_unlock (&rp->mutex);
-  return (rv);
-}
-
-static inline void
-svm_mem_free (svm_region_t * rp, void *ptr)
-{
-  u8 *oldheap;
-  ASSERT (rp->flags & SVM_FLAGS_MHEAP);
-
-  pthread_mutex_lock (&rp->mutex);
-  oldheap = clib_mem_set_heap (rp->data_heap);
-  clib_mem_free (ptr);
-  clib_mem_set_heap (oldheap);
-  pthread_mutex_unlock (&rp->mutex);
-
-}
-
-static inline void *
-svm_push_pvt_heap (svm_region_t * rp)
-{
-  u8 *oldheap;
-  oldheap = clib_mem_set_heap (rp->region_heap);
-  return ((void *) oldheap);
-}
-
-static inline void *
-svm_push_data_heap (svm_region_t * rp)
-{
-  u8 *oldheap;
-  oldheap = clib_mem_set_heap (rp->data_heap);
-  return ((void *) oldheap);
-}
-
-static inline void
-svm_pop_heap (void *oldheap)
-{
-  clib_mem_set_heap (oldheap);
-}
-
-u8 *format_svm_region (u8 * s, va_list * args);
-
-svm_region_t *svm_get_root_rp (void);
-
-#endif /* __included_svm_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/svm/svm_test.c b/svm/svm_test.c
deleted file mode 100644
index ab0b9e24..00000000
--- a/svm/svm_test.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * svm_test.c -- brain police
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-
-#include "svm.h"
-
-
-int
-main (int argc, char **argv)
-{
-  svm_region_t *root_rp, *rp;
-  svm_map_region_args_t *a = 0;
-
-  vec_validate (a, 0);
-
-  root_rp = svm_region_init ();
-
-  ASSERT (root_rp);
-
-  a->name = "/qvnet";
-  a->size = (4 << 10);
-
-  rp = svm_region_find_or_create (root_rp, a);
-
-  ASSERT (rp);
-
-  *((u32 *) rp->data_base) = 0xdeadbeef;
-  svm_region_unmap (root_rp, rp);
-
-  fformat (stdout, "exiting...\n");
-
-  exit (0);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/svm/svmdb.c b/svm/svmdb.c
deleted file mode 100644
index 03dfe7c3..00000000
--- a/svm/svmdb.c
+++ /dev/null
@@ -1,671 +0,0 @@
-/*
- *------------------------------------------------------------------
- * svmdb.c -- simple shared memory database
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-#include <vppinfra/serialize.h>
-
-#include "svmdb.h"
-
-static void local_set_variable_nolock (svmdb_client_t * client,
-				       svmdb_namespace_t namespace,
-				       u8 * var, u8 * val, u32 elsize);
-
-always_inline void
-region_lock (svm_region_t * rp, int tag)
-{
-  pthread_mutex_lock (&rp->mutex);
-#ifdef MUTEX_DEBUG
-  rp->mutex_owner_pid = getpid ();
-  rp->mutex_owner_tag = tag;
-#endif
-}
-
-always_inline void
-region_unlock (svm_region_t * rp)
-{
-#ifdef MUTEX_DEBUG
-  rp->mutex_owner_pid = 0;
-  rp->mutex_owner_tag = 0;
-#endif
-  pthread_mutex_unlock (&rp->mutex);
-}
-
-svmdb_client_t *
-svmdb_map (svmdb_map_args_t * dba)
-{
-  svmdb_client_t *client = 0;
-  svm_map_region_args_t *a = 0;
-  svm_region_t *db_rp;
-  void *oldheap;
-  svmdb_shm_hdr_t *hp = 0;
-
-  vec_validate (client, 0);
-  vec_validate (a, 0);
-
-  svm_region_init_chroot_uid_gid (dba->root_path, dba->uid, dba->gid);
-
-  a->root_path = dba->root_path;
-  a->name = "/db";
-  a->size = dba->size ? dba->size : SVMDB_DEFAULT_SIZE;
-  a->flags = SVM_FLAGS_MHEAP;
-  a->uid = dba->uid;
-  a->gid = dba->gid;
-
-  db_rp = client->db_rp = svm_region_find_or_create (a);
-
-  ASSERT (db_rp);
-
-  vec_free (a);
-
-  region_lock (client->db_rp, 10);
-  /* Has someone else set up the shared-memory variable table? */
-  if (db_rp->user_ctx)
-    {
-      client->shm = (void *) db_rp->user_ctx;
-      client->pid = getpid ();
-      region_unlock (client->db_rp);
-      ASSERT (client->shm->version == SVMDB_SHM_VERSION);
-      return (client);
-    }
-  /* Nope, it's our problem... */
-
-  /* Add a bogus client (pid=0) so the svm won't be deallocated */
-  oldheap = svm_push_pvt_heap (db_rp);
-  vec_add1 (client->db_rp->client_pids, 0);
-  svm_pop_heap (oldheap);
-
-  oldheap = svm_push_data_heap (db_rp);
-
-  vec_validate (hp, 0);
-  hp->version = SVMDB_SHM_VERSION;
-  hp->namespaces[SVMDB_NAMESPACE_STRING]
-    = hash_create_string (0, sizeof (uword));
-  hp->namespaces[SVMDB_NAMESPACE_VEC]
-    = hash_create_string (0, sizeof (uword));
-
-  db_rp->user_ctx = hp;
-  client->shm = hp;
-
-  svm_pop_heap (oldheap);
-  region_unlock (client->db_rp);
-  client->pid = getpid ();
-
-  return (client);
-}
-
-void
-svmdb_unmap (svmdb_client_t * client)
-{
-  ASSERT (client);
-
-  if (!svm_get_root_rp ())
-    return;
-
-  svm_region_unmap ((void *) client->db_rp);
-  svm_region_exit ();
-  vec_free (client);
-}
-
-static void
-notify_value (svmdb_value_t * v, svmdb_action_t a)
-{
-  int i;
-  int rv;
-  union sigval sv;
-  u32 value;
-  u32 *dead_registrations = 0;
-
-  svmdb_notify_t *np;
-
-  for (i = 0; i < vec_len (v->notifications); i++)
-    {
-      np = vec_elt_at_index (v->notifications, i);
-      if (np->action == a)
-	{
-	  value = (np->action << 28) | (np->opaque);
-	  sv.sival_ptr = (void *) (uword) value;
-	  do
-	    {
-	      rv = 0;
-	      if (sigqueue (np->pid, np->signum, sv) == 0)
-		break;
-	      rv = errno;
-	    }
-	  while (rv == EAGAIN);
-	  if (rv == 0)
-	    continue;
-	  vec_add1 (dead_registrations, i);
-	}
-    }
-
-  for (i = 0; i < vec_len (dead_registrations); i++)
-    {
-      np = vec_elt_at_index (v->notifications, dead_registrations[i]);
-      clib_warning ("dead reg pid %d sig %d action %d opaque %x",
-		    np->pid, np->signum, np->action, np->opaque);
-      vec_delete (v->notifications, 1, dead_registrations[i]);
-    }
-  vec_free (dead_registrations);
-}
-
-int
-svmdb_local_add_del_notification (svmdb_client_t * client,
-				  svmdb_notification_args_t * a)
-{
-  uword *h;
-  void *oldheap;
-  hash_pair_t *hp;
-  svmdb_shm_hdr_t *shm;
-  u8 *dummy_value = 0;
-  svmdb_value_t *value;
-  svmdb_notify_t *np;
-  int i;
-  int rv = 0;
-
-  ASSERT (a->elsize);
-
-  region_lock (client->db_rp, 18);
-  shm = client->shm;
-  oldheap = svm_push_data_heap (client->db_rp);
-
-  h = shm->namespaces[a->nspace];
-
-  hp = hash_get_pair_mem (h, a->var);
-  if (hp == 0)
-    {
-      local_set_variable_nolock (client, a->nspace, (u8 *) a->var,
-				 dummy_value, a->elsize);
-      /* might have moved */
-      h = shm->namespaces[a->nspace];
-      hp = hash_get_pair_mem (h, a->var);
-      ASSERT (hp);
-    }
-
-  value = pool_elt_at_index (shm->values, hp->value[0]);
-
-  for (i = 0; i < vec_len (value->notifications); i++)
-    {
-      np = vec_elt_at_index (value->notifications, i);
-      if ((np->pid == client->pid)
-	  && (np->signum == a->signum)
-	  && (np->action == a->action) && (np->opaque == a->opaque))
-	{
-	  if (a->add_del == 0 /* delete */ )
-	    {
-	      vec_delete (value->notifications, 1, i);
-	      goto out;
-	    }
-	  else
-	    {			/* add */
-	      clib_warning
-		("%s: ignore dup reg pid %d signum %d action %d opaque %x",
-		 a->var, client->pid, a->signum, a->action, a->opaque);
-	      rv = -2;
-	      goto out;
-	    }
-	}
-    }
-  if (a->add_del == 0)
-    {
-      rv = -3;
-      goto out;
-    }
-
-  vec_add2 (value->notifications, np, 1);
-  np->pid = client->pid;
-  np->signum = a->signum;
-  np->action = a->action;
-  np->opaque = a->opaque;
-
-out:
-  svm_pop_heap (oldheap);
-  region_unlock (client->db_rp);
-  return rv;
-}
-
-
-static void
-local_unset_variable_nolock (svmdb_client_t * client,
-			     svmdb_namespace_t namespace, char *var)
-{
-  uword *h;
-  svmdb_value_t *oldvalue;
-  hash_pair_t *hp;
-
-  h = client->shm->namespaces[namespace];
-  hp = hash_get_pair_mem (h, var);
-  if (hp)
-    {
-      oldvalue = pool_elt_at_index (client->shm->values, hp->value[0]);
-      if (vec_len (oldvalue->notifications))
-	notify_value (oldvalue, SVMDB_ACTION_UNSET);
-      /* zero length value means unset */
-      _vec_len (oldvalue->value) = 0;
-    }
-  client->shm->namespaces[namespace] = h;
-}
-
-void
-svmdb_local_unset_string_variable (svmdb_client_t * client, char *var)
-{
-  void *oldheap;
-
-  region_lock (client->db_rp, 11);
-  oldheap = svm_push_data_heap (client->db_rp);
-  local_unset_variable_nolock (client, SVMDB_NAMESPACE_STRING, var);
-  svm_pop_heap (oldheap);
-  region_unlock (client->db_rp);
-}
-
-static void
-local_set_variable_nolock (svmdb_client_t * client,
-			   svmdb_namespace_t namespace,
-			   u8 * var, u8 * val, u32 elsize)
-{
-  uword *h;
-  hash_pair_t *hp;
-  u8 *name;
-  svmdb_shm_hdr_t *shm;
-
-  shm = client->shm;
-  h = shm->namespaces[namespace];
-  hp = hash_get_pair_mem (h, var);
-  if (hp)
-    {
-      svmdb_value_t *oldvalue;
-      oldvalue = pool_elt_at_index (client->shm->values, hp->value[0]);
-      vec_alloc (oldvalue->value, vec_len (val) * elsize);
-      clib_memcpy (oldvalue->value, val, vec_len (val) * elsize);
-      _vec_len (oldvalue->value) = vec_len (val);
-      notify_value (oldvalue, SVMDB_ACTION_SET);
-    }
-  else
-    {
-      svmdb_value_t *newvalue;
-      pool_get (shm->values, newvalue);
-      memset (newvalue, 0, sizeof (*newvalue));
-      newvalue->elsize = elsize;
-      vec_alloc (newvalue->value, vec_len (val) * elsize);
-      clib_memcpy (newvalue->value, val, vec_len (val) * elsize);
-      _vec_len (newvalue->value) = vec_len (val);
-      name = format (0, "%s%c", var, 0);
-      hash_set_mem (h, name, newvalue - shm->values);
-    }
-  shm->namespaces[namespace] = h;
-}
-
-void
-svmdb_local_set_string_variable (svmdb_client_t * client,
-				 char *var, char *val)
-{
-  void *oldheap;
-
-  region_lock (client->db_rp, 12);
-  oldheap = svm_push_data_heap (client->db_rp);
-
-  local_unset_variable_nolock (client, SVMDB_NAMESPACE_STRING, var);
-
-  local_set_variable_nolock (client, SVMDB_NAMESPACE_STRING,
-			     (u8 *) var, (u8 *) val, 1 /* elsize */ );
-  svm_pop_heap (oldheap);
-  region_unlock (client->db_rp);
-}
-
-static u8 *
-local_get_variable_nolock (svmdb_client_t * client,
-			   svmdb_namespace_t namespace, u8 * var)
-{
-  uword *h;
-  uword *p;
-  svmdb_shm_hdr_t *shm;
-  svmdb_value_t *oldvalue;
-
-  shm = client->shm;
-  h = shm->namespaces[namespace];
-  p = hash_get_mem (h, var);
-  if (p)
-    {
-      oldvalue = pool_elt_at_index (shm->values, p[0]);
-      notify_value (oldvalue, SVMDB_ACTION_GET);
-      return (oldvalue->value);
-    }
-  return 0;
-}
-
-void *
-svmdb_local_get_variable_reference (svmdb_client_t * client,
-				    svmdb_namespace_t namespace, char *var)
-{
-  u8 *rv;
-
-  region_lock (client->db_rp, 19);
-  rv = local_get_variable_nolock (client, namespace, (u8 *) var);
-  region_unlock (client->db_rp);
-  return (void *) rv;
-}
-
-char *
-svmdb_local_get_string_variable (svmdb_client_t * client, char *var)
-{
-  u8 *rv = 0;
-
-  region_lock (client->db_rp, 13);
-  rv = local_get_variable_nolock (client, SVMDB_NAMESPACE_STRING, (u8 *) var);
-
-  if (rv && vec_len (rv))
-    {
-      rv = format (0, "%s", rv);
-      vec_add1 (rv, 0);
-    }
-  region_unlock (client->db_rp);
-  return ((char *) rv);
-}
-
-void
-svmdb_local_dump_strings (svmdb_client_t * client)
-{
-  uword *h;
-  u8 *key;
-  u32 value;
-  svmdb_shm_hdr_t *shm = client->shm;
-
-  region_lock (client->db_rp, 14);
-
-  h = client->shm->namespaces[SVMDB_NAMESPACE_STRING];
-
-  /* *INDENT-OFF* */
-  hash_foreach_mem(key, value, h,
-  ({
-    svmdb_value_t *v = pool_elt_at_index (shm->values, value);
-
-    fformat(stdout, "%s: %s\n", key,
-            vec_len(v->value) ? v->value : (u8 *)"(nil)");
-  }));
-  /* *INDENT-ON* */
-  region_unlock (client->db_rp);
-}
-
-int
-svmdb_local_serialize_strings (svmdb_client_t * client, char *filename)
-{
-  uword *h;
-  u8 *key;
-  u32 value;
-  svmdb_shm_hdr_t *shm = client->shm;
-  serialize_main_t _sm, *sm = &_sm;
-  clib_error_t *error = 0;
-  u8 *sanitized_name = 0;
-  int fd = 0;
-
-  if (strstr (filename, "..") || index (filename, '/'))
-    {
-      error = clib_error_return (0, "Illegal characters in filename '%s'",
-				 filename);
-      goto out;
-    }
-
-  sanitized_name = format (0, "/tmp/%s%c", filename, 0);
-
-  fd = creat ((char *) sanitized_name, 0644);
-
-  if (fd < 0)
-    {
-      error = clib_error_return_unix (0, "Create '%s'", sanitized_name);
-      goto out;
-    }
-
-  serialize_open_unix_file_descriptor (sm, fd);
-
-  region_lock (client->db_rp, 20);
-
-  h = client->shm->namespaces[SVMDB_NAMESPACE_STRING];
-
-  serialize_likely_small_unsigned_integer (sm, hash_elts (h));
-
-  /* *INDENT-OFF* */
-  hash_foreach_mem(key, value, h,
-  ({
-    svmdb_value_t *v = pool_elt_at_index (shm->values, value);
-
-    /* Omit names with nil values */
-    if (vec_len(v->value))
-      {
-        serialize_cstring (sm, (char *)key);
-        serialize_cstring (sm, (char *)v->value);
-      }
-  }));
-  /* *INDENT-ON* */
-  region_unlock (client->db_rp);
-
-  serialize_close (sm);
-
-out:
-  if (fd > 0 && close (fd) < 0)
-    error = clib_error_return_unix (0, "close fd %d", fd);
-
-  if (error)
-    {
-      clib_error_report (error);
-      return -1;
-    }
-  return 0;
-}
-
-int
-svmdb_local_unserialize_strings (svmdb_client_t * client, char *filename)
-{
-  serialize_main_t _sm, *sm = &_sm;
-  void *oldheap;
-  clib_error_t *error = 0;
-  u8 *key, *value;
-  int fd = 0;
-  u32 nelts;
-  int i;
-
-  fd = open (filename, O_RDONLY);
-
-  if (fd < 0)
-    {
-      error = clib_error_return_unix (0, "Failed to open '%s'", filename);
-      goto out;
-    }
-
-  unserialize_open_unix_file_descriptor (sm, fd);
-
-  region_lock (client->db_rp, 21);
-  oldheap = svm_push_data_heap (client->db_rp);
-
-  nelts = unserialize_likely_small_unsigned_integer (sm);
-
-  for (i = 0; i < nelts; i++)
-    {
-      unserialize_cstring (sm, (char **) &key);
-      unserialize_cstring (sm, (char **) &value);
-      local_set_variable_nolock (client, SVMDB_NAMESPACE_STRING,
-				 key, value, 1 /* elsize */ );
-      vec_free (key);
-      vec_free (value);
-    }
-  svm_pop_heap (oldheap);
-  region_unlock (client->db_rp);
-
-  serialize_close (sm);
-
-out:
-  if (fd > 0 && close (fd) < 0)
-    error = clib_error_return_unix (0, "close fd %d", fd);
-
-  if (error)
-    {
-      clib_error_report (error);
-      return -1;
-    }
-  return 0;
-}
-
-void
-svmdb_local_unset_vec_variable (svmdb_client_t * client, char *var)
-{
-  void *oldheap;
-
-  region_lock (client->db_rp, 15);
-  oldheap = svm_push_data_heap (client->db_rp);
-  local_unset_variable_nolock (client, SVMDB_NAMESPACE_VEC, var);
-  svm_pop_heap (oldheap);
-  region_unlock (client->db_rp);
-}
-
-void
-svmdb_local_set_vec_variable (svmdb_client_t * client,
-			      char *var, void *val_arg, u32 elsize)
-{
-  u8 *val = (u8 *) val_arg;
-  void *oldheap;
-
-  region_lock (client->db_rp, 16);
-  oldheap = svm_push_data_heap (client->db_rp);
-
-  local_unset_variable_nolock (client, SVMDB_NAMESPACE_VEC, var);
-  local_set_variable_nolock (client, SVMDB_NAMESPACE_VEC, (u8 *) var,
-			     val, elsize);
-
-  svm_pop_heap (oldheap);
-  region_unlock (client->db_rp);
-}
-
-void *
-svmdb_local_get_vec_variable (svmdb_client_t * client, char *var, u32 elsize)
-{
-  u8 *rv = 0;
-  u8 *copy = 0;
-
-  region_lock (client->db_rp, 17);
-
-  rv = local_get_variable_nolock (client, SVMDB_NAMESPACE_VEC, (u8 *) var);
-
-  if (rv && vec_len (rv))
-    {
-      /* Make a copy in process-local memory */
-      vec_alloc (copy, vec_len (rv) * elsize);
-      clib_memcpy (copy, rv, vec_len (rv) * elsize);
-      _vec_len (copy) = vec_len (rv);
-      region_unlock (client->db_rp);
-      return (copy);
-    }
-  region_unlock (client->db_rp);
-  return (0);
-}
-
-void
-svmdb_local_dump_vecs (svmdb_client_t * client)
-{
-  uword *h;
-  u8 *key;
-  u32 value;
-  svmdb_shm_hdr_t *shm;
-
-  region_lock (client->db_rp, 17);
-  shm = client->shm;
-
-  h = client->shm->namespaces[SVMDB_NAMESPACE_VEC];
-
-  /* *INDENT-OFF* */
-  hash_foreach_mem(key, value, h,
-  ({
-    svmdb_value_t *v = pool_elt_at_index (shm->values, value);
-    (void) fformat(stdout, "%s:\n %U (%.2f)\n", key,
-                   format_hex_bytes, v->value,
-                   vec_len(v->value)*v->elsize, ((f64 *)(v->value))[0]);
-  }));
-  /* *INDENT-ON* */
-
-  region_unlock (client->db_rp);
-}
-
-void *
-svmdb_local_find_or_add_vec_variable (svmdb_client_t * client,
-				      char *var, u32 nbytes)
-{
-  void *oldheap;
-  u8 *rv = 0;
-
-  region_lock (client->db_rp, 18);
-  oldheap = svm_push_data_heap (client->db_rp);
-
-  rv = local_get_variable_nolock (client, SVMDB_NAMESPACE_VEC, (u8 *) var);
-
-  if (rv)
-    {
-      goto out;
-    }
-  else
-    {
-      uword *h;
-      u8 *name;
-      svmdb_shm_hdr_t *shm;
-      svmdb_value_t *newvalue;
-
-      shm = client->shm;
-      h = shm->namespaces[SVMDB_NAMESPACE_VEC];
-
-      pool_get (shm->values, newvalue);
-      memset (newvalue, 0, sizeof (*newvalue));
-      newvalue->elsize = 1;
-      vec_alloc (newvalue->value, nbytes);
-      _vec_len (newvalue->value) = nbytes;
-      name = format (0, "%s%c", var, 0);
-      hash_set_mem (h, name, newvalue - shm->values);
-      shm->namespaces[SVMDB_NAMESPACE_VEC] = h;
-      rv = newvalue->value;
-    }
-
-out:
-  svm_pop_heap (oldheap);
-  region_unlock (client->db_rp);
-  return (rv);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/svm/svmdb.h b/svm/svmdb.h
deleted file mode 100644
index e02628a0..00000000
--- a/svm/svmdb.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *------------------------------------------------------------------
- * svmdb.h - shared VM database
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#ifndef __included_svmdb_h__
-#define __included_svmdb_h__
-
-#include "svm.h"
-
-typedef enum
-{
-  SVMDB_ACTION_ILLEGAL = 0,
-  SVMDB_ACTION_GET,		/* not clear why anyone would care */
-  SVMDB_ACTION_SET,
-  SVMDB_ACTION_UNSET,
-} svmdb_action_t;
-
-typedef struct
-{
-  int pid;
-  int signum;
-  u32 action:4;
-  u32 opaque:28;
-} svmdb_notify_t;
-
-typedef struct
-{
-  u8 *value;
-  svmdb_notify_t *notifications;
-  u32 elsize;
-} svmdb_value_t;
-
-typedef enum
-{
-  SVMDB_NAMESPACE_STRING = 0,
-  SVMDB_NAMESPACE_VEC,
-  SVMDB_N_NAMESPACES,
-} svmdb_namespace_t;
-
-typedef struct
-{
-  uword version;
-  /* pool of values */
-  svmdb_value_t *values;
-  uword *namespaces[SVMDB_N_NAMESPACES];
-} svmdb_shm_hdr_t;
-
-#define SVMDB_SHM_VERSION 2
-
-typedef struct
-{
-  int flags;
-  int pid;
-  svm_region_t *db_rp;
-  svmdb_shm_hdr_t *shm;
-} svmdb_client_t;
-
-typedef struct
-{
-  int add_del;
-  svmdb_namespace_t nspace;
-  char *var;
-  u32 elsize;
-  int signum;
-  u32 action:4;
-  u32 opaque:28;
-} svmdb_notification_args_t;
-
-typedef struct
-{
-  char *root_path;
-  uword size;
-  u32 uid;
-  u32 gid;
-} svmdb_map_args_t;
-
-/*
- * Must be a reasonable number, several mb smaller than
- * SVM_GLOBAL_REGION_SIZE, or no donut for you...
- */
-#define SVMDB_DEFAULT_SIZE (4<<20)
-
-svmdb_client_t *svmdb_map (svmdb_map_args_t *);
-
-void svmdb_unmap (svmdb_client_t * client);
-void svmdb_local_unset_string_variable (svmdb_client_t * client, char *var);
-void svmdb_local_set_string_variable (svmdb_client_t * client,
-				      char *var, char *val);
-char *svmdb_local_get_string_variable (svmdb_client_t * client, char *var);
-void *svmdb_local_get_variable_reference (svmdb_client_t * client,
-					  svmdb_namespace_t ns, char *var);
-
-void svmdb_local_dump_strings (svmdb_client_t * client);
-
-void svmdb_local_unset_vec_variable (svmdb_client_t * client, char *var);
-void svmdb_local_set_vec_variable (svmdb_client_t * client,
-				   char *var, void *val, u32 elsize);
-void *svmdb_local_get_vec_variable (svmdb_client_t * client, char *var,
-				    u32 elsize);
-void svmdb_local_dump_vecs (svmdb_client_t * client);
-
-int svmdb_local_add_del_notification (svmdb_client_t * client,
-				      svmdb_notification_args_t * args);
-
-void *svmdb_local_find_or_add_vec_variable (svmdb_client_t * client,
-					    char *var, u32 nbytes);
-
-int svmdb_local_serialize_strings (svmdb_client_t * client, char *filename);
-int svmdb_local_unserialize_strings (svmdb_client_t * client, char *filename);
-
-
-#endif /* __included_svmdb_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/svm/svmdbtool.c b/svm/svmdbtool.c
deleted file mode 100644
index a0af15fc..00000000
--- a/svm/svmdbtool.c
+++ /dev/null
@@ -1,537 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <pwd.h>
-#include <grp.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-#include <vppinfra/serialize.h>
-#include "svmdb.h"
-
-typedef struct
-{
-  svmdb_map_args_t map_args;
-  int uid, gid;
-  uword size;
-} svmdbtool_main_t;
-
-svmdbtool_main_t svmdbtool_main;
-
-static inline svmdb_map_args_t *
-map_arg_setup (char *chroot_path)
-{
-  svmdbtool_main_t *sm = &svmdbtool_main;
-  svmdb_map_args_t *ma = &sm->map_args;
-
-  memset (ma, 0, sizeof (*ma));
-  ma->root_path = chroot_path;
-  ma->size = sm->size;
-  ma->uid = sm->uid;
-  ma->gid = sm->gid;
-  return ma;
-}
-
-static void
-get_string (char *chroot_path, u8 * vbl)
-{
-  svmdb_client_t *c;
-  char *rv;
-  svmdb_map_args_t *ma;
-
-  ma = map_arg_setup (chroot_path);
-
-  c = svmdb_map (ma);
-
-  rv = svmdb_local_get_string_variable (c, (char *) vbl);
-
-  fformat (stdout, "%s\n", rv ? rv : "UNSET");
-  vec_free (rv);
-  svmdb_unmap (c);
-}
-
-static void
-set_string (char *chroot_path, u8 * vbl, u8 * value)
-{
-  svmdb_client_t *c;
-  svmdb_map_args_t *ma;
-
-  ma = map_arg_setup (chroot_path);
-
-  c = svmdb_map (ma);
-  svmdb_local_set_string_variable (c, (char *) vbl, (char *) value);
-  svmdb_unmap (c);
-}
-
-static void
-unset_string (char *chroot_path, u8 * vbl)
-{
-  svmdb_client_t *c;
-  svmdb_map_args_t *ma;
-
-  ma = map_arg_setup (chroot_path);
-
-  c = svmdb_map (ma);
-  svmdb_local_unset_string_variable (c, (char *) vbl);
-  svmdb_unmap (c);
-}
-
-static void
-dump_strings (char *chroot_path)
-{
-  svmdb_client_t *c;
-  svmdb_map_args_t *ma;
-
-  ma = map_arg_setup (chroot_path);
-
-  c = svmdb_map (ma);
-  svmdb_local_dump_strings (c);
-  svmdb_unmap (c);
-}
-
-static void
-serialize_strings (char *chroot_path, char *filename)
-{
-  svmdb_client_t *c;
-  svmdb_map_args_t *ma;
-
-  ma = map_arg_setup (chroot_path);
-
-  c = svmdb_map (ma);
-  (void) svmdb_local_serialize_strings (c, filename);
-  svmdb_unmap (c);
-}
-
-static void
-unserialize_strings (char *chroot_path, char *filename)
-{
-  svmdb_client_t *c;
-  svmdb_map_args_t *ma;
-
-  ma = map_arg_setup (chroot_path);
-
-  c = svmdb_map (ma);
-  (void) svmdb_local_unserialize_strings (c, filename);
-  svmdb_unmap (c);
-}
-
-static void
-test_vlib_vec_rate (char *chroot_path, f64 vr)
-{
-  svmdb_client_t *c;
-  f64 *tv = 0;
-  svmdb_map_args_t *ma;
-
-  ma = map_arg_setup (chroot_path);
-
-  c = svmdb_map (ma);
-
-  vec_add1 (tv, vr);
-
-  svmdb_local_set_vec_variable (c, "vlib_vector_rate", (char *) tv,
-				sizeof (*tv));
-  svmdb_unmap (c);
-
-  vec_free (tv);
-}
-
-
-
-static void
-test_vec (char *chroot_path, u8 * vbl)
-{
-  svmdb_client_t *c;
-  u64 *tv = 0;
-  int i;
-  svmdb_map_args_t *ma;
-
-  ma = map_arg_setup (chroot_path);
-
-  c = svmdb_map (ma);
-
-  /* my amp goes to 11 */
-  for (i = 0; i < 11; i++)
-    {
-      vec_add1 (tv, i);
-    }
-
-  svmdb_local_set_vec_variable (c, (char *) vbl, (char *) tv, sizeof (tv[0]));
-  svmdb_unmap (c);
-
-  vec_free (tv);
-}
-
-static void
-fake_install (char *chroot_path, u8 * add_value)
-{
-  svmdb_client_t *c;
-  u8 *v = 0;
-  u8 **values = 0;
-  u8 *oldvalue;
-  u8 *value;
-  int nitems = 0, i;
-  serialize_main_t m;
-  svmdb_map_args_t *ma;
-
-  ma = map_arg_setup (chroot_path);
-
-  c = svmdb_map (ma);
-
-  oldvalue = svmdb_local_get_vec_variable (c, "installed_sw", 1);
-  if (oldvalue)
-    {
-      unserialize_open_data (&m, oldvalue, vec_len (oldvalue));
-      nitems = unserialize_likely_small_unsigned_integer (&m);
-      for (i = 0; i < nitems; i++)
-	{
-	  unserialize_cstring (&m, (char **) &value);
-	  vec_add1 (values, value);
-	}
-      vec_free (v);
-    }
-  nitems++;
-  value = format (0, "%s%c", add_value, 0);
-
-  vec_add1 (values, value);
-
-  fformat (stdout, "Resulting installed_sw vector:\n");
-
-  serialize_open_vector (&m, v);
-  serialize_likely_small_unsigned_integer (&m, vec_len (values));
-  for (i = 0; i < vec_len (values); i++)
-    {
-      fformat (stdout, "%s\n", values[i]);
-      serialize_cstring (&m, (char *) values[i]);
-    }
-
-  v = serialize_close_vector (&m);
-
-  svmdb_local_set_vec_variable (c, "installed_sw", v, sizeof (v[0]));
-  svmdb_unmap (c);
-
-  for (i = 0; i < vec_len (values); i++)
-    vec_free (values[i]);
-  vec_free (values);
-}
-
-static void
-sigaction_handler (int signum, siginfo_t * i, void *notused)
-{
-  u32 action, opaque;
-
-  action = (u32) (uword) i->si_ptr;
-  action >>= 28;
-  opaque = (u32) (uword) i->si_ptr;
-  opaque &= ~(0xF0000000);
-
-  clib_warning ("signal %d, action %d, opaque %x", signum, action, opaque);
-}
-
-static void
-test_reg (char *chroot_path, u8 * vbl)
-{
-  svmdb_client_t *c;
-  svmdb_notification_args_t args;
-  svmdb_notification_args_t *a = &args;
-  struct sigaction sa;
-  svmdb_map_args_t *ma;
-
-  ma = map_arg_setup (chroot_path);
-
-  memset (&sa, 0, sizeof (sa));
-  sa.sa_sigaction = sigaction_handler;
-  sa.sa_flags = SA_SIGINFO;
-  if (sigaction (SIGUSR2, &sa, 0) < 0)
-    {
-      clib_unix_warning ("sigaction");
-      return;
-    }
-
-  memset (a, 0, sizeof (*a));
-
-  c = svmdb_map (ma);
-
-  a->add_del = 1 /* add */ ;
-  a->nspace = SVMDB_NAMESPACE_STRING;
-  a->var = (char *) vbl;
-  a->elsize = 1;
-  a->signum = SIGUSR2;
-  a->action = SVMDB_ACTION_GET;
-  a->opaque = 0x0eadbeef;
-
-  svmdb_local_add_del_notification (c, a);
-
-  (void) svmdb_local_get_string_variable (c, (char *) vbl);
-
-  a->add_del = 0;		/* del */
-  svmdb_local_add_del_notification (c, a);
-
-
-
-  svmdb_unmap (c);
-}
-
-static void
-unset_vec (char *chroot_path, u8 * vbl)
-{
-  svmdb_client_t *c;
-  svmdb_map_args_t *ma;
-
-  ma = map_arg_setup (chroot_path);
-
-  c = svmdb_map (ma);
-
-  svmdb_local_unset_vec_variable (c, (char *) vbl);
-  svmdb_unmap (c);
-}
-
-static void
-dump_vecs (char *chroot_path)
-{
-  svmdb_client_t *c;
-  svmdb_map_args_t *ma;
-
-  ma = map_arg_setup (chroot_path);
-
-  c = svmdb_map (ma);
-
-  svmdb_local_dump_vecs (c);
-  svmdb_unmap (c);
-}
-
-static void
-crash_test (char *chroot_path)
-{
-  svmdb_client_t *c;
-  svmdb_map_args_t *ma;
-
-  ma = map_arg_setup (chroot_path);
-
-  c = svmdb_map (ma);
-
-  clib_warning ("Grab region mutex and crash deliberately!");
-  c->db_rp->mutex_owner_pid = getpid ();
-  c->db_rp->mutex_owner_tag = -13;
-  pthread_mutex_lock (&c->db_rp->mutex);
-
-  abort ();
-}
-
-static void
-map_with_size (char *chroot_path, uword size)
-{
-  svmdb_client_t *c;
-  svmdb_map_args_t *ma;
-
-  svmdbtool_main.size = size;
-  ma = map_arg_setup (chroot_path);
-
-  c = svmdb_map (ma);
-
-  svmdb_unmap (c);
-}
-
-int
-main (int argc, char **argv)
-{
-  unformat_input_t input;
-  int parsed = 0;
-  u8 *vbl = 0, *value = 0;
-  char *chroot_path = 0;
-  u8 *chroot_path_u8;
-  u8 *filename;
-  uword size;
-  f64 vr;
-  int uid, gid, rv;
-  struct passwd _pw, *pw;
-  struct group _grp, *grp;
-  char *s, buf[128];
-
-  svmdbtool_main.uid = geteuid ();
-  svmdbtool_main.gid = getegid ();
-
-  unformat_init_command_line (&input, argv);
-
-  while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (&input, "get-string %s", &vbl))
-	{
-	  get_string (chroot_path, vbl);
-	  vec_free (vbl);
-	  parsed++;
-	}
-      else if (unformat (&input, "set-string %s %s", &vbl, &value))
-	{
-	  set_string (chroot_path, vbl, value);
-	  vec_free (vbl);
-	  vec_free (value);
-	  parsed++;
-	}
-      else if (unformat (&input, "unset-string %s", &vbl))
-	{
-	  unset_string (chroot_path, vbl);
-	  vec_free (vbl);
-	  parsed++;
-	}
-      else if (unformat (&input, "dump-strings"))
-	{
-	  dump_strings (chroot_path);
-	  parsed++;
-	}
-      else if (unformat (&input, "unset-vec %s", &vbl))
-	{
-	  unset_vec (chroot_path, vbl);
-	  vec_free (vbl);
-	  parsed++;
-	}
-      else if (unformat (&input, "dump-vecs"))
-	{
-	  dump_vecs (chroot_path);
-	  parsed++;
-	}
-      else if (unformat (&input, "test-vec %s", &vbl))
-	{
-	  test_vec (chroot_path, vbl);
-	  // vec_free(vbl);
-	  parsed++;
-	}
-      else if (unformat (&input, "vlib-vec-rate %f", &vr))
-	{
-	  test_vlib_vec_rate (chroot_path, vr);
-	  parsed++;
-	}
-      else if (unformat (&input, "test-reg %s", &vbl))
-	{
-	  test_reg (chroot_path, vbl);
-	  parsed++;
-	}
-      else if (unformat (&input, "crash-test"))
-	{
-	  crash_test (chroot_path);
-	}
-      else if (unformat (&input, "chroot %s", &chroot_path_u8))
-	{
-	  chroot_path = (char *) chroot_path_u8;
-	}
-      else if (unformat (&input, "fake-install %s", &value))
-	{
-	  fake_install (chroot_path, value);
-	  parsed++;
-	}
-      else if (unformat (&input, "size %d", &size))
-	{
-	  map_with_size (chroot_path, size);
-	  parsed++;
-	}
-      else if (unformat (&input, "uid %d", &uid))
-	svmdbtool_main.uid = uid;
-      else if (unformat (&input, "gid %d", &gid))
-	svmdbtool_main.gid = gid;
-      else if (unformat (&input, "uid %s", &s))
-	{
-	  /* lookup the username */
-	  pw = NULL;
-	  rv = getpwnam_r (s, &_pw, buf, sizeof (buf), &pw);
-	  if (rv < 0)
-	    {
-	      fformat (stderr, "cannot fetch username %s", s);
-	      exit (1);
-	    }
-	  if (pw == NULL)
-	    {
-	      fformat (stderr, "username %s does not exist", s);
-	      exit (1);
-	    }
-	  vec_free (s);
-	  svmdbtool_main.uid = pw->pw_uid;
-	}
-      else if (unformat (&input, "gid %s", &s))
-	{
-	  /* lookup the group name */
-	  grp = NULL;
-	  rv = getgrnam_r (s, &_grp, buf, sizeof (buf), &grp);
-	  if (rv != 0)
-	    {
-	      fformat (stderr, "cannot fetch group %s", s);
-	      exit (1);
-	    }
-	  if (grp == NULL)
-	    {
-	      fformat (stderr, "group %s does not exist", s);
-	      exit (1);
-	    }
-	  vec_free (s);
-	  svmdbtool_main.gid = grp->gr_gid;
-	}
-      else if (unformat (&input, "serialize-strings %s", &filename))
-	{
-	  vec_add1 (filename, 0);
-	  serialize_strings (chroot_path, (char *) filename);
-	  parsed++;
-	}
-      else if (unformat (&input, "unserialize-strings %s", &filename))
-	{
-	  vec_add1 (filename, 0);
-	  unserialize_strings (chroot_path, (char *) filename);
-	  parsed++;
-	}
-      else
-	{
-	  break;
-	}
-    }
-
-  unformat_free (&input);
-
-  if (!parsed)
-    {
-      fformat (stdout, "%s: get-string <name> | set-string <name> <value>\n",
-	       argv[0]);
-      fformat (stdout, "      unset-string <name> | dump-strings\n");
-      fformat (stdout, "      test-vec <name> |\n");
-      fformat (stdout, "      unset-vec <name> | dump-vecs\n");
-      fformat (stdout, "      chroot <prefix> [uid <nnn-or-userid>]\n");
-      fformat (stdout, "      [gid <nnn-or-group-name>]\n");
-    }
-
-  exit (0);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/svm/svmtool.c b/svm/svmtool.c
deleted file mode 100644
index b3195514..00000000
--- a/svm/svmtool.c
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- *------------------------------------------------------------------
- * svmtool.c
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-
-#include "svm.h"
-
-
-
-/*
- * format_all_svm_regions
- * Maps / unmaps regions. Do NOT call from client code!
- */
-u8 *
-format_all_svm_regions (u8 * s, va_list * args)
-{
-  int verbose = va_arg (*args, int);
-  svm_region_t *root_rp = svm_get_root_rp ();
-  svm_main_region_t *mp;
-  svm_subregion_t *subp;
-  svm_region_t *rp;
-  svm_map_region_args_t *a = 0;
-  u8 **svm_names = 0;
-  u8 *name = 0;
-  int i;
-
-  ASSERT (root_rp);
-
-  pthread_mutex_lock (&root_rp->mutex);
-
-  s = format (s, "%U", format_svm_region, root_rp, verbose);
-
-  mp = root_rp->data_base;
-
-  /*
-   * Snapshoot names, can't hold root rp mutex across
-   * find_or_create.
-   */
-  /* *INDENT-OFF* */
-  pool_foreach (subp, mp->subregions, ({
-        name = vec_dup (subp->subregion_name);
-        vec_add1(svm_names, name);
-      }));
-  /* *INDENT-ON* */
-
-  pthread_mutex_unlock (&root_rp->mutex);
-
-  for (i = 0; i < vec_len (svm_names); i++)
-    {
-      vec_validate (a, 0);
-      a->name = (char *) svm_names[i];
-      rp = svm_region_find_or_create (a);
-      if (rp)
-	{
-	  pthread_mutex_lock (&rp->mutex);
-	  s = format (s, "%U", format_svm_region, rp, verbose);
-	  pthread_mutex_unlock (&rp->mutex);
-	  svm_region_unmap (rp);
-	  vec_free (svm_names[i]);
-	}
-      vec_free (a);
-    }
-  vec_free (svm_names);
-  return (s);
-}
-
-void
-show (char *chroot_path, int verbose)
-{
-  svm_map_region_args_t *a = 0;
-
-  vec_validate (a, 0);
-
-  svm_region_init_chroot (chroot_path);
-
-  fformat (stdout, "My pid is %d\n", getpid ());
-
-  fformat (stdout, "%U", format_all_svm_regions, verbose);
-
-  svm_region_exit ();
-
-  vec_free (a);
-}
-
-
-static void *
-svm_map_region_nolock (svm_map_region_args_t * a)
-{
-  int svm_fd;
-  svm_region_t *rp;
-  int deadman = 0;
-  u8 *shm_name;
-
-  ASSERT ((a->size & ~(MMAP_PAGESIZE - 1)) == a->size);
-
-  shm_name = shm_name_from_svm_map_region_args (a);
-
-  svm_fd = shm_open ((char *) shm_name, O_RDWR, 0777);
-
-  if (svm_fd < 0)
-    {
-      perror ("svm_region_map(mmap open)");
-      return (0);
-    }
-  vec_free (shm_name);
-
-  rp = mmap (0, MMAP_PAGESIZE, PROT_READ | PROT_WRITE, MAP_SHARED, svm_fd, 0);
-
-  if (rp == (svm_region_t *) MAP_FAILED)
-    {
-      close (svm_fd);
-      clib_warning ("mmap");
-      return (0);
-    }
-  /*
-   * We lost the footrace to create this region; make sure
-   * the winner has crossed the finish line.
-   */
-  while (rp->version == 0 && deadman++ < 5)
-    {
-      sleep (1);
-    }
-
-  /*
-   * <bleep>-ed?
-   */
-  if (rp->version == 0)
-    {
-      clib_warning ("rp->version %d not %d", rp->version, SVM_VERSION);
-      munmap (rp, MMAP_PAGESIZE);
-      return (0);
-    }
-  /* Remap now that the region has been placed */
-  a->baseva = rp->virtual_base;
-  a->size = rp->virtual_size;
-  munmap (rp, MMAP_PAGESIZE);
-
-  rp = (void *) mmap ((void *) a->baseva, a->size,
-		      PROT_READ | PROT_WRITE,
-		      MAP_SHARED | MAP_FIXED, svm_fd, 0);
-  if ((uword) rp == (uword) MAP_FAILED)
-    {
-      clib_unix_warning ("mmap");
-      return (0);
-    }
-
-  if ((uword) rp != rp->virtual_base)
-    {
-      clib_warning ("mmap botch");
-    }
-
-  if (pthread_mutex_trylock (&rp->mutex))
-    {
-      clib_warning ("rp->mutex LOCKED by pid %d, tag %d, cleared...",
-		    rp->mutex_owner_pid, rp->mutex_owner_tag);
-      memset (&rp->mutex, 0, sizeof (rp->mutex));
-
-    }
-  else
-    {
-      clib_warning ("mutex OK...\n");
-      pthread_mutex_unlock (&rp->mutex);
-    }
-
-  return ((void *) rp);
-}
-
-/*
- * rnd_pagesize
- * Round to a pagesize multiple, presumably 4k works
- */
-static u64
-rnd_pagesize (u64 size)
-{
-  u64 rv;
-
-  rv = (size + (MMAP_PAGESIZE - 1)) & ~(MMAP_PAGESIZE - 1);
-  return (rv);
-}
-
-#define MUTEX_DEBUG
-
-always_inline void
-region_lock (svm_region_t * rp, int tag)
-{
-  pthread_mutex_lock (&rp->mutex);
-#ifdef MUTEX_DEBUG
-  rp->mutex_owner_pid = getpid ();
-  rp->mutex_owner_tag = tag;
-#endif
-}
-
-always_inline void
-region_unlock (svm_region_t * rp)
-{
-#ifdef MUTEX_DEBUG
-  rp->mutex_owner_pid = 0;
-  rp->mutex_owner_tag = 0;
-#endif
-  pthread_mutex_unlock (&rp->mutex);
-}
-
-
-static void *
-svm_existing_region_map_nolock (void *root_arg, svm_map_region_args_t * a)
-{
-  svm_region_t *root_rp = root_arg;
-  svm_main_region_t *mp;
-  svm_region_t *rp;
-  void *oldheap;
-  uword *p;
-
-  a->size += MMAP_PAGESIZE +
-    (a->pvt_heap_size ? a->pvt_heap_size : SVM_PVT_MHEAP_SIZE);
-  a->size = rnd_pagesize (a->size);
-
-  region_lock (root_rp, 4);
-  oldheap = svm_push_pvt_heap (root_rp);
-  mp = root_rp->data_base;
-
-  ASSERT (mp);
-
-  p = hash_get_mem (mp->name_hash, a->name);
-
-  if (p)
-    {
-      rp = svm_map_region_nolock (a);
-      region_unlock (root_rp);
-      svm_pop_heap (oldheap);
-      return rp;
-    }
-  return 0;
-
-}
-
-static void
-trace (char *chroot_path, char *name, int enable_disable)
-{
-  svm_map_region_args_t *a = 0;
-  svm_region_t *db_rp;
-  void *oldheap;
-
-  vec_validate (a, 0);
-
-  svm_region_init_chroot (chroot_path);
-
-  a->name = name;
-  a->size = 1 << 20;
-  a->flags = SVM_FLAGS_MHEAP;
-
-  db_rp = svm_region_find_or_create (a);
-
-  ASSERT (db_rp);
-
-  region_lock (db_rp, 20);
-
-  oldheap = svm_push_data_heap (db_rp);
-
-  mheap_trace (db_rp->data_heap, enable_disable);
-
-  svm_pop_heap (oldheap);
-  region_unlock (db_rp);
-
-  svm_region_unmap ((void *) db_rp);
-  svm_region_exit ();
-  vec_free (a);
-}
-
-
-
-static void
-subregion_repair (char *chroot_path)
-{
-  int i;
-  svm_main_region_t *mp;
-  svm_map_region_args_t a;
-  svm_region_t *root_rp;
-  svm_region_t *rp;
-  svm_subregion_t *subp;
-  u8 *name = 0;
-  u8 **svm_names = 0;
-
-  svm_region_init_chroot (chroot_path);
-  root_rp = svm_get_root_rp ();
-
-  pthread_mutex_lock (&root_rp->mutex);
-
-  mp = root_rp->data_base;
-
-  /*
-   * Snapshoot names, can't hold root rp mutex across
-   * find_or_create.
-   */
-  /* *INDENT-OFF* */
-  pool_foreach (subp, mp->subregions, ({
-        name = vec_dup (subp->subregion_name);
-        vec_add1(svm_names, name);
-      }));
-  /* *INDENT-ON* */
-
-  pthread_mutex_unlock (&root_rp->mutex);
-
-  for (i = 0; i < vec_len (svm_names); i++)
-    {
-      memset (&a, 0, sizeof (a));
-      a.root_path = chroot_path;
-      a.name = (char *) svm_names[i];
-      fformat (stdout, "Checking %s region...\n", a.name);
-      rp = svm_existing_region_map_nolock (root_rp, &a);
-      if (rp)
-	{
-	  svm_region_unmap (rp);
-	  vec_free (svm_names[i]);
-	}
-    }
-  vec_free (svm_names);
-}
-
-void
-repair (char *chroot_path, int crash_root_region)
-{
-  svm_region_t *root_rp = 0;
-  svm_map_region_args_t *a = 0;
-  void *svm_map_region (svm_map_region_args_t * a);
-  int svm_fd;
-  u8 *shm_name;
-
-  fformat (stdout, "our pid: %d\n", getpid ());
-
-  vec_validate (a, 0);
-
-  a->root_path = chroot_path;
-  a->name = SVM_GLOBAL_REGION_NAME;
-  a->baseva = SVM_GLOBAL_REGION_BASEVA;
-  a->size = SVM_GLOBAL_REGION_SIZE;
-  a->flags = SVM_FLAGS_NODATA;
-
-  shm_name = shm_name_from_svm_map_region_args (a);
-
-  svm_fd = shm_open ((char *) shm_name, O_RDWR, 0777);
-
-  if (svm_fd < 0)
-    {
-      perror ("svm_region_map(mmap open)");
-      goto out;
-    }
-
-  vec_free (shm_name);
-
-  root_rp = mmap (0, MMAP_PAGESIZE,
-		  PROT_READ | PROT_WRITE, MAP_SHARED, svm_fd, 0);
-
-  if (root_rp == (svm_region_t *) MAP_FAILED)
-    {
-      close (svm_fd);
-      clib_warning ("mmap");
-      goto out;
-    }
-
-  /* Remap now that the region has been placed */
-  clib_warning ("remap to 0x%x", root_rp->virtual_base);
-
-  a->baseva = root_rp->virtual_base;
-  a->size = root_rp->virtual_size;
-  munmap (root_rp, MMAP_PAGESIZE);
-
-  root_rp = (void *) mmap ((void *) a->baseva, a->size,
-			   PROT_READ | PROT_WRITE,
-			   MAP_SHARED | MAP_FIXED, svm_fd, 0);
-  if ((uword) root_rp == (uword) MAP_FAILED)
-    {
-      clib_unix_warning ("mmap");
-      goto out;
-    }
-
-  close (svm_fd);
-
-  if ((uword) root_rp != root_rp->virtual_base)
-    {
-      clib_warning ("mmap botch");
-      goto out;
-    }
-
-  if (pthread_mutex_trylock (&root_rp->mutex))
-    {
-      clib_warning ("root_rp->mutex LOCKED by pid %d, tag %d, cleared...",
-		    root_rp->mutex_owner_pid, root_rp->mutex_owner_tag);
-      memset (&root_rp->mutex, 0, sizeof (root_rp->mutex));
-      goto out;
-    }
-  else
-    {
-      clib_warning ("root_rp->mutex OK...\n");
-      pthread_mutex_unlock (&root_rp->mutex);
-    }
-
-out:
-  vec_free (a);
-  /*
-   * Now that the root region is known to be OK,
-   * fix broken subregions
-   */
-  subregion_repair (chroot_path);
-
-  if (crash_root_region)
-    {
-      clib_warning ("Leaving root region locked on purpose...");
-      pthread_mutex_lock (&root_rp->mutex);
-      root_rp->mutex_owner_pid = getpid ();
-      root_rp->mutex_owner_tag = 99;
-    }
-  svm_region_exit ();
-}
-
-int
-main (int argc, char **argv)
-{
-  unformat_input_t input;
-  int parsed = 0;
-  char *name;
-  char *chroot_path = 0;
-  u8 *chroot_u8;
-
-  unformat_init_command_line (&input, argv);
-
-  while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (&input, "show-verbose"))
-	{
-	  show (chroot_path, 1);
-	  parsed++;
-	}
-      else if (unformat (&input, "show"))
-	{
-	  show (chroot_path, 0);
-	  parsed++;
-	}
-      else if (unformat (&input, "client-scan"))
-	{
-	  svm_client_scan (chroot_path);
-	  parsed++;
-	}
-      else if (unformat (&input, "repair"))
-	{
-	  repair (chroot_path, 0 /* fix it */ );
-	  parsed++;
-	}
-      else if (unformat (&input, "crash"))
-	{
-	  repair (chroot_path, 1 /* crash it */ );
-	  parsed++;
-	}
-      else if (unformat (&input, "trace-on %s", &name))
-	{
-	  trace (chroot_path, name, 1);
-	  parsed++;
-	}
-      else if (unformat (&input, "trace-off %s", &name))
-	{
-	  trace (chroot_path, name, 0);
-	  parsed++;
-	}
-      else if (unformat (&input, "chroot %s", &chroot_u8))
-	{
-	  chroot_path = (char *) chroot_u8;
-	}
-      else
-	{
-	  break;
-	}
-    }
-
-  unformat_free (&input);
-
-  if (!parsed)
-    {
-      fformat (stdout,
-	       "%s: show | show-verbose | client-scan | trace-on <region-name>\n",
-	       argv[0]);
-      fformat (stdout, "      trace-off <region-name>\n");
-    }
-  exit (0);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/Makefile.am b/vlib-api/Makefile.am
deleted file mode 100644
index d9f4a27b..00000000
--- a/vlib-api/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall
-
-lib_LTLIBRARIES = libvlibapi.la libvlibmemory.la libvlibmemoryclient.la \
-	          libvlibsocket.la
-
-libvlibapi_la_SOURCES = 			\
-	vlibapi/api.h				\
-        vlibapi/api_helper_macros.h		\
-	vlibapi/api_shared.c			\
-	vlibapi/node_serialize.c
-
-nobase_include_HEADERS = vlibapi/api.h vlibapi/api_helper_macros.h
-
-libvlibmemory_la_SOURCES =			\
-	vlibmemory/api.h			\
-	vlibmemory/memclnt.api			\
-	vlibmemory/memory_shared.c		\
-	vlibmemory/memory_vlib.c		\
-	vlibmemory/vl_memory_api_h.h		\
-	vlibmemory/vl_memory_msg_enum.h		\
-	vlibmemory/unix_shared_memory_queue.c	\
-	vlibmemory/unix_shared_memory_queue.h 
-
-libvlibmemoryclient_la_SOURCES = 		\
-	vlibmemory/api.h			\
-	vlibmemory/memclnt.api			\
-	vlibmemory/memory_shared.c		\
-	vlibmemory/memory_client.c		\
-	vlibmemory/vl_memory_api_h.h		\
-	vlibmemory/vl_memory_msg_enum.h		\
-	vlibmemory/unix_shared_memory_queue.c	\
-	vlibmemory/unix_shared_memory_queue.h 
-
-nobase_include_HEADERS +=			\
-	vlibmemory/api.h			\
-	vlibmemory/vl_memory_api_h.h		\
-	vlibmemory/vl_memory_msg_enum.h		\
-	vlibmemory/unix_shared_memory_queue.h 	\
-	vlibmemory/memclnt.api.h
-
-libvlibsocket_la_SOURCES =			\
-	vlibsocket/api.h			\
-	vlibsocket/sockclnt.api			\
-	vlibsocket/sockclnt_vlib.c		\
-	vlibsocket/socksvr_vlib.c		\
-	vlibsocket/vl_socket_api_h.h		\
-	vlibsocket/vl_socket_msg_enum.h
-
-nobase_include_HEADERS +=			\
-	vlibsocket/api.h			\
-	vlibsocket/vl_socket_api_h.h		\
-	vlibsocket/vl_socket_msg_enum.h		\
-	vlibsocket/sockclnt.api.h
-
-BUILT_SOURCES =					\
-	vlibsocket/sockclnt.api.h		\
-	vlibmemory/memclnt.api.h		\
-	vlibmemory/memclnt.api.json
-
-SUFFIXES = .api.h .api .api.json
-
-# The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk
-# and requires a symbolic link at the top of the vnet source tree
-
-include $(top_srcdir)/suffix-rules.mk
-
-# install the API definition, so we can produce java bindings, etc.
-apidir = $(prefix)/vlibmemory
-api_DATA = vlibmemory/memclnt.api.json
diff --git a/vlib-api/configure.ac b/vlib-api/configure.ac
deleted file mode 100644
index f0aa3083..00000000
--- a/vlib-api/configure.ac
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(vlibapi, 1.0)
-LT_INIT
-AM_INIT_AUTOMAKE
-
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-AC_OUTPUT([Makefile])
diff --git a/vlib-api/suffix-rules.mk b/vlib-api/suffix-rules.mk
deleted file mode 120000
index f6098400..00000000
--- a/vlib-api/suffix-rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-../build-data/suffix-rules.mk
\ No newline at end of file
diff --git a/vlib-api/vlibapi/api.h b/vlib-api/vlibapi/api.h
deleted file mode 100644
index 62745335..00000000
--- a/vlib-api/vlibapi/api.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- *------------------------------------------------------------------
- * api.h
- *
- * Copyright (c) 2009-2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#ifndef included_api_h
-#define included_api_h
-
-#include <vppinfra/error.h>
-#include <svm.h>
-#include <vlib/vlib.h>
-#include <vlibmemory/unix_shared_memory_queue.h>
-#include <vlib/unix/unix.h>
-
-typedef enum
-{
-  REGISTRATION_TYPE_FREE = 0,
-  REGISTRATION_TYPE_SHMEM,
-  REGISTRATION_TYPE_SOCKET_LISTEN,
-  REGISTRATION_TYPE_SOCKET_SERVER,
-  REGISTRATION_TYPE_SOCKET_CLIENT,
-} vl_registration_type_t;
-
-typedef struct vl_api_registration_
-{
-  vl_registration_type_t registration_type;
-
-  /* Index in VLIB's brain (not shared memory). */
-  u32 vl_api_registration_pool_index;
-
-  u8 *name;
-
-  /*
-   * The following groups of data could be unioned, but my fingers are
-   * going to be sore enough.
-   */
-
-  /* shared memory only */
-  unix_shared_memory_queue_t *vl_input_queue;
-
-  /* socket server and client */
-  u32 unix_file_index;
-  i8 *unprocessed_input;
-  u32 unprocessed_msg_length;
-  u8 *output_vector;
-
-  /* socket client only */
-  u32 server_handle;
-  u32 server_index;
-
-} vl_api_registration_t;
-
-
-/* Trace configuration for a single message */
-typedef struct
-{
-  int size;
-  int trace_enable;
-  int replay_enable;
-} trace_cfg_t;
-
-/*
- * API recording
- */
-typedef struct
-{
-  u8 endian;
-  u8 enabled;
-  u8 wrapped;
-  u8 pad;
-  u32 nitems;
-  u32 curindex;
-  u8 **traces;
-} vl_api_trace_t;
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED
-(struct
- {
-   u8 endian; u8 wrapped;
-   u32 nitems;
-}) vl_api_trace_file_header_t;
-/* *INDENT-ON* */
-
-typedef enum
-{
-  VL_API_TRACE_TX,
-  VL_API_TRACE_RX,
-} vl_api_trace_which_t;
-
-#define VL_API_LITTLE_ENDIAN 0x00
-#define VL_API_BIG_ENDIAN 0x01
-
-typedef struct
-{
-  u8 *name;
-  u16 first_msg_id;
-  u16 last_msg_id;
-} vl_api_msg_range_t;
-
-typedef struct
-{
-  void (**msg_handlers) (void *);
-  int (**pd_msg_handlers) (void *, int);
-  void (**msg_cleanup_handlers) (void *);
-  void (**msg_endian_handlers) (void *);
-  void (**msg_print_handlers) (void *, void *);
-  char **msg_names;
-  u8 *message_bounce;
-  u8 *is_mp_safe;
-  struct ring_alloc_ *arings;
-  u32 ring_misses;
-  u32 missing_clients;
-  vl_api_trace_t *rx_trace;
-  vl_api_trace_t *tx_trace;
-  int msg_print_flag;
-  trace_cfg_t *api_trace_cfg;
-  int our_pid;
-  svm_region_t *vlib_rp;
-  svm_region_t **mapped_shmem_regions;
-  struct vl_shmem_hdr_ *shmem_hdr;
-  vl_api_registration_t **vl_clients;
-
-  u8 *serialized_message_table_in_shmem;
-
-  /* For plugin msg allocator */
-  u16 first_available_msg_id;
-
-  /* message range by name hash */
-  uword *msg_range_by_name;
-
-  /* vector of message ranges */
-  vl_api_msg_range_t *msg_ranges;
-
-  /* uid for the api shared memory region */
-  int api_uid;
-  /* gid for the api shared memory region */
-  int api_gid;
-
-  /* base virtual address for global VM region */
-  u64 global_baseva;
-
-  /* size of the global VM region */
-  u64 global_size;
-
-  /* size of the API region */
-  u64 api_size;
-
-  /* size of the global VM private mheap */
-  u64 global_pvt_heap_size;
-
-  /* size of the api private mheap */
-  u64 api_pvt_heap_size;
-
-  /* Client-only data structures */
-  unix_shared_memory_queue_t *vl_input_queue;
-
-  /*
-   * All VLIB-side message handlers use my_client_index to identify
-   * the queue / client. This works in sim replay.
-   */
-  int my_client_index;
-  /*
-   * This is the (shared VM) address of the registration,
-   * don't use it to id the connection since it can't possibly
-   * work in simulator replay.
-   */
-  vl_api_registration_t *my_registration;
-
-  i32 vlib_signal;
-
-  /* client side message index hash table */
-  uword *msg_index_by_name_and_crc;
-
-  char *region_name;
-  char *root_path;
-} api_main_t;
-
-extern api_main_t api_main;
-
-typedef struct
-{
-  int id;
-  char *name;
-  u32 crc;
-  void *handler;
-  void *cleanup;
-  void *endian;
-  void *print;
-  int size;
-  int traced;
-  int replay;
-  int message_bounce;
-  int is_mp_safe;
-} vl_msg_api_msg_config_t;
-
-typedef struct msgbuf_
-{
-  unix_shared_memory_queue_t *q;
-  u32 data_len;
-  u32 pad;
-  u8 data[0];
-} msgbuf_t;
-
-/* api_shared.c prototypes */
-int vl_msg_api_rx_trace_enabled (api_main_t * am);
-int vl_msg_api_tx_trace_enabled (api_main_t * am);
-void vl_msg_api_trace (api_main_t * am, vl_api_trace_t * tp, void *msg);
-int vl_msg_api_trace_onoff (api_main_t * am, vl_api_trace_which_t which,
-			    int onoff);
-int vl_msg_api_trace_free (api_main_t * am, vl_api_trace_which_t which);
-int vl_msg_api_trace_save (api_main_t * am,
-			   vl_api_trace_which_t which, FILE * fp);
-int vl_msg_api_trace_configure (api_main_t * am, vl_api_trace_which_t which,
-				u32 nitems);
-void vl_msg_api_handler_with_vm_node (api_main_t * am,
-				      void *the_msg, vlib_main_t * vm,
-				      vlib_node_runtime_t * node);
-void vl_msg_api_handler (void *the_msg);
-void vl_msg_api_handler_no_free (void *the_msg);
-void vl_msg_api_handler_no_trace_no_free (void *the_msg);
-void vl_msg_api_trace_only (void *the_msg);
-void vl_msg_api_cleanup_handler (void *the_msg);
-void vl_msg_api_replay_handler (void *the_msg);
-void vl_msg_api_socket_handler (void *the_msg);
-void vl_msg_api_set_handlers (int msg_id, char *msg_name,
-			      void *handler,
-			      void *cleanup,
-			      void *endian,
-			      void *print, int msg_size, int traced);
-void vl_msg_api_config (vl_msg_api_msg_config_t *);
-void vl_msg_api_set_cleanup_handler (int msg_id, void *fp);
-void vl_msg_api_queue_handler (unix_shared_memory_queue_t * q);
-vl_api_trace_t *vl_msg_api_trace_get (api_main_t * am,
-				      vl_api_trace_which_t which);
-
-void vl_msg_api_free (void *);
-void vl_noop_handler (void *mp);
-clib_error_t *vl_api_init (vlib_main_t * vm);
-void vl_msg_api_increment_missing_client_counter (void);
-void vl_msg_api_post_mortem_dump (void);
-void vl_msg_api_register_pd_handler (void *handler,
-				     u16 msg_id_host_byte_order);
-int vl_msg_api_pd_handler (void *mp, int rv);
-
-void vl_msg_api_set_first_available_msg_id (u16 first_avail);
-u16 vl_msg_api_get_msg_ids (char *name, int n);
-void vl_msg_api_add_msg_name_crc (api_main_t * am, char *string, u32 id);
-u32 vl_api_get_msg_index (u8 * name_and_crc);
-
-/* node_serialize.c prototypes */
-u8 *vlib_node_serialize (vlib_node_main_t * nm, u8 * vector,
-			 u32 max_threads, int include_nexts,
-			 int include_stats);
-vlib_node_t **vlib_node_unserialize (u8 * vector);
-
-#define VLIB_API_INIT_FUNCTION(x) VLIB_DECLARE_INIT_FUNCTION(x,api_init)
-
-#endif /* included_api_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibapi/api_helper_macros.h b/vlib-api/vlibapi/api_helper_macros.h
deleted file mode 100644
index 16f34cfc..00000000
--- a/vlib-api/vlibapi/api_helper_macros.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- *------------------------------------------------------------------
- * api_helper_macros.h - message handler helper macros
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-
-#ifndef __api_helper_macros_h__
-#define __api_helper_macros_h__
-
-#define f64_endian(a)
-#define f64_print(a,b)
-
-#define REPLY_MACRO(t)                                          \
-do {                                                            \
-    unix_shared_memory_queue_t * q;                             \
-    rv = vl_msg_api_pd_handler (mp, rv);                        \
-    q = vl_api_client_index_to_input_queue (mp->client_index);  \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t));                               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-                                                                \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-#define REPLY_MACRO2(t, body)                                   \
-do {                                                            \
-    unix_shared_memory_queue_t * q;                             \
-    rv = vl_msg_api_pd_handler (mp, rv);                        \
-    q = vl_api_client_index_to_input_queue (mp->client_index);  \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t));                               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-    do {body;} while (0);                                       \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-#define REPLY_MACRO3(t, n, body)				\
-do {                                                            \
-    unix_shared_memory_queue_t * q;                             \
-    rv = vl_msg_api_pd_handler (mp, rv);                        \
-    q = vl_api_client_index_to_input_queue (mp->client_index);  \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp) + n);                 \
-    rmp->_vl_msg_id = ntohs((t));                               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-    do {body;} while (0);                                       \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-#define REPLY_MACRO4(t, n, body)                                \
-do {                                                            \
-    unix_shared_memory_queue_t * q;                             \
-    u8 is_error = 0;                                            \
-    rv = vl_msg_api_pd_handler (mp, rv);                        \
-    q = vl_api_client_index_to_input_queue (mp->client_index);  \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc_or_null (sizeof (*rmp) + n);         \
-    if (!rmp)                                                   \
-      {                                                         \
-        /* if there isn't enough memory, try to allocate */     \
-        /* some at least for returning an error */              \
-        rmp = vl_msg_api_alloc (sizeof (*rmp));                 \
-        if (!rmp)                                               \
-          return;                                               \
-                                                                \
-        memset (rmp, 0, sizeof (*rmp));                         \
-        rv = VNET_API_ERROR_TABLE_TOO_BIG;                      \
-        is_error = 1;                                           \
-      }                                                         \
-    rmp->_vl_msg_id = ntohs((t));                               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-    if (!is_error)                                              \
-      do {body;} while (0);                                     \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-/* "trust, but verify" */
-
-#define VALIDATE_SW_IF_INDEX(mp)				\
- do { u32 __sw_if_index = ntohl(mp->sw_if_index);		\
-    vnet_main_t *__vnm = vnet_get_main();                       \
-    if (pool_is_free_index(__vnm->interface_main.sw_interfaces, \
-                           __sw_if_index)) {                    \
-        rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
-        goto bad_sw_if_index;                                   \
-    }                                                           \
-} while(0);
-
-#define BAD_SW_IF_INDEX_LABEL                   \
-do {                                            \
-bad_sw_if_index:                                \
-    ;                                           \
-} while (0);
-
-#define VALIDATE_RX_SW_IF_INDEX(mp)				\
- do { u32 __rx_sw_if_index = ntohl(mp->rx_sw_if_index);		\
-    vnet_main_t *__vnm = vnet_get_main();                       \
-    if (pool_is_free_index(__vnm->interface_main.sw_interfaces, \
-                           __rx_sw_if_index)) {			\
-        rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
-        goto bad_rx_sw_if_index;				\
-    }                                                           \
-} while(0);
-
-#define BAD_RX_SW_IF_INDEX_LABEL		\
-do {                                            \
-bad_rx_sw_if_index:				\
-    ;                                           \
-} while (0);
-
-#define VALIDATE_TX_SW_IF_INDEX(mp)				\
- do { u32 __tx_sw_if_index = ntohl(mp->tx_sw_if_index);		\
-    vnet_main_t *__vnm = vnet_get_main();                       \
-    if (pool_is_free_index(__vnm->interface_main.sw_interfaces, \
-                           __tx_sw_if_index)) {			\
-        rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
-        goto bad_tx_sw_if_index;				\
-    }                                                           \
-} while(0);
-
-#define BAD_TX_SW_IF_INDEX_LABEL		\
-do {                                            \
-bad_tx_sw_if_index:				\
-    ;                                           \
-} while (0);
-
-#define pub_sub_handler(lca,UCA)                                        \
-static void vl_api_want_##lca##_t_handler (                             \
-    vl_api_want_##lca##_t *mp)                                          \
-{                                                                       \
-    vpe_api_main_t *vam = &vpe_api_main;                                \
-    vpe_client_registration_t *rp;                                      \
-    vl_api_want_##lca##_reply_t *rmp;                                   \
-    uword *p;                                                           \
-    i32 rv = 0;                                                         \
-                                                                        \
-    p = hash_get (vam->lca##_registration_hash, mp->client_index);      \
-    if (p) {                                                            \
-        if (mp->enable_disable) {                                       \
-            clib_warning ("pid %d: already enabled...", mp->pid);       \
-            rv = VNET_API_ERROR_INVALID_REGISTRATION;                   \
-            goto reply;                                                 \
-        } else {                                                        \
-            rp = pool_elt_at_index (vam->lca##_registrations, p[0]);    \
-            pool_put (vam->lca##_registrations, rp);                    \
-            hash_unset (vam->lca##_registration_hash,                   \
-                mp->client_index);                                      \
-            goto reply;                                                 \
-        }                                                               \
-    }                                                                   \
-    if (mp->enable_disable == 0) {                                      \
-        clib_warning ("pid %d: already disabled...", mp->pid);          \
-        rv = VNET_API_ERROR_INVALID_REGISTRATION;                       \
-        goto reply;                                                     \
-    }                                                                   \
-    pool_get (vam->lca##_registrations, rp);                            \
-    rp->client_index = mp->client_index;                                \
-    rp->client_pid = mp->pid;                                           \
-    hash_set (vam->lca##_registration_hash, rp->client_index,           \
-              rp - vam->lca##_registrations);                           \
-                                                                        \
-reply:                                                                  \
-    REPLY_MACRO (VL_API_WANT_##UCA##_REPLY);                            \
-}
-
-#define foreach_registration_hash               \
-_(interface_events)                             \
-_(to_netconf_server)                            \
-_(from_netconf_server)                          \
-_(to_netconf_client)                            \
-_(from_netconf_client)                          \
-_(oam_events)                                   \
-_(bfd_events)
-
-/* WARNING: replicated in vpp/stats.h */
-typedef struct
-{
-  u32 client_index;		/* in memclnt registration pool */
-  u32 client_pid;
-} vpe_client_registration_t;
-
-struct _vl_api_ip4_arp_event;
-struct _vl_api_ip6_nd_event;
-
-typedef struct
-{
-#define _(a) uword *a##_registration_hash;              \
-    vpe_client_registration_t * a##_registrations;
-  foreach_registration_hash
-#undef _
-    /* notifications happen really early in the game */
-  u8 link_state_process_up;
-
-  /* ip4 arp event registration pool */
-  struct _vl_api_ip4_arp_event *arp_events;
-
-  /* ip6 nd event registration pool */
-  struct _vl_api_ip6_nd_event *nd_events;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} vpe_api_main_t;
-
-extern vpe_api_main_t vpe_api_main;
-
-#endif /* __api_helper_macros_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibapi/api_shared.c b/vlib-api/vlibapi/api_shared.c
deleted file mode 100644
index 6a04fac9..00000000
--- a/vlib-api/vlibapi/api_shared.c
+++ /dev/null
@@ -1,1375 +0,0 @@
-/*
- *------------------------------------------------------------------
- * api_shared.c - API message handling, common code for both clients
- * and the vlib process itself.
- *
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <vppinfra/format.h>
-#include <vppinfra/byte_order.h>
-#include <vppinfra/error.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibapi/api.h>
-#include <vppinfra/elog.h>
-
-api_main_t api_main;
-
-void vl_msg_api_barrier_sync (void) __attribute__ ((weak));
-void
-vl_msg_api_barrier_sync (void)
-{
-}
-
-void vl_msg_api_barrier_release (void) __attribute__ ((weak));
-void
-vl_msg_api_barrier_release (void)
-{
-}
-
-void
-vl_msg_api_increment_missing_client_counter (void)
-{
-  api_main_t *am = &api_main;
-  am->missing_clients++;
-}
-
-typedef enum
-{
-  DUMP,
-  CUSTOM_DUMP,
-  REPLAY,
-  INITIALIZERS,
-} vl_api_replay_t;
-
-int
-vl_msg_api_rx_trace_enabled (api_main_t * am)
-{
-  return (am->rx_trace && am->rx_trace->enabled);
-}
-
-int
-vl_msg_api_tx_trace_enabled (api_main_t * am)
-{
-  return (am->tx_trace && am->tx_trace->enabled);
-}
-
-/*
- * vl_msg_api_trace
- */
-void
-vl_msg_api_trace (api_main_t * am, vl_api_trace_t * tp, void *msg)
-{
-  u8 **this_trace;
-  u8 **old_trace;
-  u8 *msg_copy;
-  u32 length;
-  trace_cfg_t *cfgp;
-  u16 msg_id = ntohs (*((u16 *) msg));
-  msgbuf_t *header = (msgbuf_t *) (((u8 *) msg) - offsetof (msgbuf_t, data));
-
-  cfgp = am->api_trace_cfg + msg_id;
-
-  if (!cfgp || !cfgp->trace_enable)
-    return;
-
-  msg_copy = 0;
-
-  if (tp->nitems == 0)
-    {
-      clib_warning ("tp->nitems is 0");
-      return;
-    }
-
-  if (vec_len (tp->traces) < tp->nitems)
-    {
-      vec_add1 (tp->traces, 0);
-      this_trace = tp->traces + vec_len (tp->traces) - 1;
-    }
-  else
-    {
-      tp->wrapped = 1;
-      old_trace = tp->traces + tp->curindex++;
-      if (tp->curindex == tp->nitems)
-	tp->curindex = 0;
-      vec_free (*old_trace);
-      this_trace = old_trace;
-    }
-
-  length = clib_net_to_host_u32 (header->data_len);
-
-  vec_validate (msg_copy, length - 1);
-  clib_memcpy (msg_copy, msg, length);
-  *this_trace = msg_copy;
-}
-
-int
-vl_msg_api_trace_onoff (api_main_t * am, vl_api_trace_which_t which,
-			int onoff)
-{
-  vl_api_trace_t *tp;
-  int rv;
-
-  switch (which)
-    {
-    case VL_API_TRACE_TX:
-      tp = am->tx_trace;
-      if (tp == 0)
-	{
-	  vl_msg_api_trace_configure (am, which, 1024);
-	  tp = am->tx_trace;
-	}
-      break;
-
-    case VL_API_TRACE_RX:
-      tp = am->rx_trace;
-      if (tp == 0)
-	{
-	  vl_msg_api_trace_configure (am, which, 1024);
-	  tp = am->rx_trace;
-	}
-      break;
-
-    default:
-      /* duh? */
-      return -1;
-    }
-
-  /* Configured? */
-  if (tp == 0 || tp->nitems == 0)
-    return -1;
-
-  rv = tp->enabled;
-  tp->enabled = onoff;
-
-  return rv;
-}
-
-int
-vl_msg_api_trace_free (api_main_t * am, vl_api_trace_which_t which)
-{
-  vl_api_trace_t *tp;
-  int i;
-
-  switch (which)
-    {
-    case VL_API_TRACE_TX:
-      tp = am->tx_trace;
-      break;
-
-    case VL_API_TRACE_RX:
-      tp = am->rx_trace;
-      break;
-
-    default:
-      /* duh? */
-      return -1;
-    }
-
-  /* Configured? */
-  if (!tp || tp->nitems == 0)
-    return -1;
-
-  tp->curindex = 0;
-  tp->wrapped = 0;
-
-  for (i = 0; i < vec_len (tp->traces); i++)
-    {
-      vec_free (tp->traces[i]);
-    }
-  vec_free (tp->traces);
-
-  return 0;
-}
-
-int
-vl_msg_api_trace_save (api_main_t * am, vl_api_trace_which_t which, FILE * fp)
-{
-  vl_api_trace_t *tp;
-  vl_api_trace_file_header_t fh;
-  int i;
-  u8 *msg;
-
-  switch (which)
-    {
-    case VL_API_TRACE_TX:
-      tp = am->tx_trace;
-      break;
-
-    case VL_API_TRACE_RX:
-      tp = am->rx_trace;
-      break;
-
-    default:
-      /* duh? */
-      return -1;
-    }
-
-  /* Configured, data present? */
-  if (tp == 0 || tp->nitems == 0 || vec_len (tp->traces) == 0)
-    return -1;
-
-  /* "Dare to be stupid" check */
-  if (fp == 0)
-    {
-      return -2;
-    }
-
-  /* Write the file header */
-  fh.nitems = vec_len (tp->traces);
-  fh.endian = tp->endian;
-  fh.wrapped = tp->wrapped;
-
-  if (fwrite (&fh, sizeof (fh), 1, fp) != 1)
-    {
-      return (-10);
-    }
-
-  /* No-wrap case */
-  if (tp->wrapped == 0)
-    {
-      /*
-       * Note: vec_len return 0 when fed a NULL pointer.
-       * Unfortunately, the static analysis tool doesn't
-       * figure it out, hence the suppressed warnings.
-       * What a great use of my time.
-       */
-      for (i = 0; i < vec_len (tp->traces); i++)
-	{
-	  u32 msg_length;
-	  /*sa_ignore NO_NULL_CHK */
-	  msg = tp->traces[i];
-	  /*
-	   * This retarded check required to pass
-	   * [sic] SA-checking.
-	   */
-	  if (!msg)
-	    continue;
-
-	  msg_length = clib_host_to_net_u32 (vec_len (msg));
-	  if (fwrite (&msg_length, 1, sizeof (msg_length), fp)
-	      != sizeof (msg_length))
-	    {
-	      return (-14);
-	    }
-	  if (fwrite (msg, 1, vec_len (msg), fp) != vec_len (msg))
-	    {
-	      return (-11);
-	    }
-	}
-    }
-  else
-    {
-      /* Wrap case: write oldest -> end of buffer */
-      for (i = tp->curindex; i < vec_len (tp->traces); i++)
-	{
-	  u32 msg_length;
-	  msg = tp->traces[i];
-	  /*
-	   * This retarded check required to pass
-	   * [sic] SA-checking
-	   */
-	  if (!msg)
-	    continue;
-
-	  msg_length = clib_host_to_net_u32 (vec_len (msg));
-	  if (fwrite (&msg_length, 1, sizeof (msg_length), fp)
-	      != sizeof (msg_length))
-	    {
-	      return (-14);
-	    }
-
-	  if (fwrite (msg, 1, vec_len (msg), fp) != vec_len (msg))
-	    {
-	      return (-12);
-	    }
-	}
-      /* write beginning of buffer -> oldest-1 */
-      for (i = 0; i < tp->curindex; i++)
-	{
-	  u32 msg_length;
-	  /*sa_ignore NO_NULL_CHK */
-	  msg = tp->traces[i];
-	  /*
-	   * This retarded check required to pass
-	   * [sic] SA-checking
-	   */
-	  if (!msg)
-	    continue;
-
-	  msg_length = clib_host_to_net_u32 (vec_len (msg));
-	  if (fwrite (&msg_length, 1, sizeof (msg_length), fp)
-	      != sizeof (msg_length))
-	    {
-	      return (-14);
-	    }
-
-	  if (fwrite (msg, 1, vec_len (msg), fp) != vec_len (msg))
-	    {
-	      return (-13);
-	    }
-	}
-    }
-  return 0;
-}
-
-int
-vl_msg_api_trace_configure (api_main_t * am, vl_api_trace_which_t which,
-			    u32 nitems)
-{
-  vl_api_trace_t *tp;
-  int was_on = 0;
-
-  switch (which)
-    {
-    case VL_API_TRACE_TX:
-      tp = am->tx_trace;
-      if (tp == 0)
-	{
-	  vec_validate (am->tx_trace, 0);
-	  tp = am->tx_trace;
-	}
-      break;
-
-    case VL_API_TRACE_RX:
-      tp = am->rx_trace;
-      if (tp == 0)
-	{
-	  vec_validate (am->rx_trace, 0);
-	  tp = am->rx_trace;
-	}
-
-      break;
-
-    default:
-      return -1;
-
-    }
-
-  if (tp->enabled)
-    {
-      was_on = vl_msg_api_trace_onoff (am, which, 0);
-    }
-  if (tp->traces)
-    {
-      vl_msg_api_trace_free (am, which);
-    }
-
-  memset (tp, 0, sizeof (*tp));
-
-  if (clib_arch_is_big_endian)
-    {
-      tp->endian = VL_API_BIG_ENDIAN;
-    }
-  else
-    {
-      tp->endian = VL_API_LITTLE_ENDIAN;
-    }
-
-  tp->nitems = nitems;
-  if (was_on)
-    {
-      (void) vl_msg_api_trace_onoff (am, which, was_on);
-    }
-  return 0;
-}
-
-always_inline void
-msg_handler_internal (api_main_t * am,
-		      void *the_msg, int trace_it, int do_it, int free_it)
-{
-  u16 id = ntohs (*((u16 *) the_msg));
-  u8 *(*print_fp) (void *, void *);
-
-  if (id < vec_len (am->msg_handlers) && am->msg_handlers[id])
-    {
-      if (trace_it)
-	vl_msg_api_trace (am, am->rx_trace, the_msg);
-
-      if (am->msg_print_flag)
-	{
-	  fformat (stdout, "[%d]: %s\n", id, am->msg_names[id]);
-	  print_fp = (void *) am->msg_print_handlers[id];
-	  if (print_fp == 0)
-	    {
-	      fformat (stdout, "  [no registered print fn]\n");
-	    }
-	  else
-	    {
-	      (*print_fp) (the_msg, stdout);
-	    }
-	}
-
-      if (do_it)
-	{
-	  if (!am->is_mp_safe[id])
-	    vl_msg_api_barrier_sync ();
-	  (*am->msg_handlers[id]) (the_msg);
-	  if (!am->is_mp_safe[id])
-	    vl_msg_api_barrier_release ();
-	}
-    }
-  else
-    {
-      clib_warning ("no handler for msg id %d", id);
-    }
-
-  if (free_it)
-    vl_msg_api_free (the_msg);
-}
-
-/* set to 1 if you want before/after message handler event logging */
-#define ELOG_API_MESSAGE_HANDLERS 0
-
-#if ELOG_API_MESSAGE_HANDLERS > 0
-static u32
-elog_id_for_msg_name (vlib_main_t * vm, char *msg_name)
-{
-  uword *p, r;
-  static uword *h;
-  u8 *name_copy;
-
-  if (!h)
-    h = hash_create_string (0, sizeof (uword));
-
-  p = hash_get_mem (h, msg_name);
-  if (p)
-    return p[0];
-  r = elog_string (&vm->elog_main, "%s", msg_name);
-
-  name_copy = format (0, "%s%c", msg_name, 0);
-
-  hash_set_mem (h, name_copy, r);
-
-  return r;
-}
-#endif
-
-/* This is only to be called from a vlib/vnet app */
-void
-vl_msg_api_handler_with_vm_node (api_main_t * am,
-				 void *the_msg, vlib_main_t * vm,
-				 vlib_node_runtime_t * node)
-{
-  u16 id = ntohs (*((u16 *) the_msg));
-  u8 *(*handler) (void *, void *, void *);
-
-#if ELOG_API_MESSAGE_HANDLERS > 0
-  {
-    /* *INDENT-OFF* */
-    ELOG_TYPE_DECLARE (e) =
-      {
-        .format = "api-msg: %s",
-        .format_args = "T4",
-      };
-    /* *INDENT-ON* */
-    struct
-    {
-      u32 c;
-    } *ed;
-    ed = ELOG_DATA (&vm->elog_main, e);
-    if (id < vec_len (am->msg_names))
-      ed->c = elog_id_for_msg_name (vm, am->msg_names[id]);
-    else
-      ed->c = elog_id_for_msg_name (vm, "BOGUS");
-  }
-#endif
-
-  if (id < vec_len (am->msg_handlers) && am->msg_handlers[id])
-    {
-      handler = (void *) am->msg_handlers[id];
-
-      if (am->rx_trace && am->rx_trace->enabled)
-	vl_msg_api_trace (am, am->rx_trace, the_msg);
-
-      if (!am->is_mp_safe[id])
-	vl_msg_api_barrier_sync ();
-      (*handler) (the_msg, vm, node);
-      if (!am->is_mp_safe[id])
-	vl_msg_api_barrier_release ();
-    }
-  else
-    {
-      clib_warning ("no hander for msg id %d", id);
-    }
-
-  /*
-   * Special-case, so we can e.g. bounce messages off the vnet
-   * main thread without copying them...
-   */
-  if (!(am->message_bounce[id]))
-    vl_msg_api_free (the_msg);
-
-#if ELOG_API_MESSAGE_HANDLERS > 0
-  {
-  /* *INDENT-OFF* */
-  ELOG_TYPE_DECLARE (e) = {
-    .format = "api-msg-done: %s",
-    .format_args = "T4",
-  };
-  /* *INDENT-ON* */
-
-    struct
-    {
-      u32 c;
-    } *ed;
-    ed = ELOG_DATA (&vm->elog_main, e);
-    if (id < vec_len (am->msg_names))
-      ed->c = elog_id_for_msg_name (vm, am->msg_names[id]);
-    else
-      ed->c = elog_id_for_msg_name (vm, "BOGUS");
-  }
-#endif
-}
-
-void
-vl_msg_api_handler (void *the_msg)
-{
-  api_main_t *am = &api_main;
-
-  msg_handler_internal (am, the_msg,
-			(am->rx_trace
-			 && am->rx_trace->enabled) /* trace_it */ ,
-			1 /* do_it */ , 1 /* free_it */ );
-}
-
-void
-vl_msg_api_handler_no_free (void *the_msg)
-{
-  api_main_t *am = &api_main;
-  msg_handler_internal (am, the_msg,
-			(am->rx_trace
-			 && am->rx_trace->enabled) /* trace_it */ ,
-			1 /* do_it */ , 0 /* free_it */ );
-}
-
-void
-vl_msg_api_handler_no_trace_no_free (void *the_msg)
-{
-  api_main_t *am = &api_main;
-  msg_handler_internal (am, the_msg, 0 /* trace_it */ , 1 /* do_it */ ,
-			0 /* free_it */ );
-}
-
-/*
- * Add a trace record to the API message trace buffer, if
- * API message tracing is enabled. Handy for adding sufficient
- * data to the trace to reproduce autonomous state, as opposed to
- * state downloaded via control-plane API messages. Example: the NAT
- * application creates database entries based on packet traffic, not
- * control-plane messages.
- *
- */
-void
-vl_msg_api_trace_only (void *the_msg)
-{
-  api_main_t *am = &api_main;
-
-  msg_handler_internal (am, the_msg,
-			(am->rx_trace
-			 && am->rx_trace->enabled) /* trace_it */ ,
-			0 /* do_it */ , 0 /* free_it */ );
-}
-
-void
-vl_msg_api_cleanup_handler (void *the_msg)
-{
-  api_main_t *am = &api_main;
-  u16 id = ntohs (*((u16 *) the_msg));
-
-  if (PREDICT_FALSE (id >= vec_len (am->msg_cleanup_handlers)))
-    {
-      clib_warning ("_vl_msg_id too large: %d\n", id);
-      return;
-    }
-  if (am->msg_cleanup_handlers[id])
-    (*am->msg_cleanup_handlers[id]) (the_msg);
-
-  vl_msg_api_free (the_msg);
-}
-
-/*
- * vl_msg_api_replay_handler
- */
-void
-vl_msg_api_replay_handler (void *the_msg)
-{
-  api_main_t *am = &api_main;
-
-  u16 id = ntohs (*((u16 *) the_msg));
-
-  if (PREDICT_FALSE (id >= vec_len (am->msg_handlers)))
-    {
-      clib_warning ("_vl_msg_id too large: %d\n", id);
-      return;
-    }
-  /* do NOT trace the message... */
-  if (am->msg_handlers[id])
-    (*am->msg_handlers[id]) (the_msg);
-  /* do NOT free the message buffer... */
-}
-
-/*
- * vl_msg_api_socket_handler
- */
-void
-vl_msg_api_socket_handler (void *the_msg)
-{
-  api_main_t *am = &api_main;
-
-  msg_handler_internal (am, the_msg,
-			(am->rx_trace
-			 && am->rx_trace->enabled) /* trace_it */ ,
-			1 /* do_it */ , 0 /* free_it */ );
-}
-
-#define foreach_msg_api_vector                  \
-_(msg_names)                                    \
-_(msg_handlers)                                 \
-_(msg_cleanup_handlers)                         \
-_(msg_endian_handlers)                          \
-_(msg_print_handlers)                           \
-_(api_trace_cfg)				\
-_(message_bounce)				\
-_(is_mp_safe)
-
-void
-vl_msg_api_config (vl_msg_api_msg_config_t * c)
-{
-  api_main_t *am = &api_main;
-
-  ASSERT (c->id > 0);
-
-#define _(a) vec_validate (am->a, c->id);
-  foreach_msg_api_vector;
-#undef _
-
-  am->msg_names[c->id] = c->name;
-  am->msg_handlers[c->id] = c->handler;
-  am->msg_cleanup_handlers[c->id] = c->cleanup;
-  am->msg_endian_handlers[c->id] = c->endian;
-  am->msg_print_handlers[c->id] = c->print;
-  am->message_bounce[c->id] = c->message_bounce;
-  am->is_mp_safe[c->id] = c->is_mp_safe;
-
-  am->api_trace_cfg[c->id].size = c->size;
-  am->api_trace_cfg[c->id].trace_enable = c->traced;
-  am->api_trace_cfg[c->id].replay_enable = c->replay;
-}
-
-/*
- * vl_msg_api_set_handlers
- * preserve the old API for a while
- */
-void
-vl_msg_api_set_handlers (int id, char *name, void *handler, void *cleanup,
-			 void *endian, void *print, int size, int traced)
-{
-  vl_msg_api_msg_config_t cfg;
-  vl_msg_api_msg_config_t *c = &cfg;
-
-  c->id = id;
-  c->name = name;
-  c->handler = handler;
-  c->cleanup = cleanup;
-  c->endian = endian;
-  c->print = print;
-  c->traced = traced;
-  c->replay = 1;
-  c->message_bounce = 0;
-  c->is_mp_safe = 0;
-  vl_msg_api_config (c);
-}
-
-void
-vl_msg_api_set_cleanup_handler (int msg_id, void *fp)
-{
-  api_main_t *am = &api_main;
-  ASSERT (msg_id > 0);
-
-  vec_validate (am->msg_cleanup_handlers, msg_id);
-  am->msg_cleanup_handlers[msg_id] = fp;
-}
-
-void
-vl_msg_api_queue_handler (unix_shared_memory_queue_t * q)
-{
-  uword msg;
-
-  while (!unix_shared_memory_queue_sub (q, (u8 *) & msg, 0))
-    vl_msg_api_handler ((void *) msg);
-}
-
-vl_api_trace_t *
-vl_msg_api_trace_get (api_main_t * am, vl_api_trace_which_t which)
-{
-  switch (which)
-    {
-    case VL_API_TRACE_RX:
-      return am->rx_trace;
-    case VL_API_TRACE_TX:
-      return am->tx_trace;
-    default:
-      return 0;
-    }
-}
-
-void
-vl_noop_handler (void *mp)
-{
-}
-
-clib_error_t *
-vl_api_init (vlib_main_t * vm)
-{
-  static u8 once;
-  api_main_t *am = &api_main;
-
-  if (once)
-    return 0;
-
-  once = 1;
-
-  am->region_name = "/unset";
-  /*
-   * Eventually passed to fchown, -1 => "current user"
-   * instead of 0 => "root". A very fine disctinction at best.
-   */
-  if (am->api_uid == 0)
-    am->api_uid = -1;
-  if (am->api_gid == 0)
-    am->api_gid = -1;
-
-  return (0);
-}
-
-void vl_msg_api_custom_dump_configure (api_main_t * am)
-  __attribute__ ((weak));
-void
-vl_msg_api_custom_dump_configure (api_main_t * am)
-{
-}
-
-VLIB_INIT_FUNCTION (vl_api_init);
-
-static void
-vl_msg_api_process_file (vlib_main_t * vm, u8 * filename,
-			 u32 first_index, u32 last_index,
-			 vl_api_replay_t which)
-{
-  vl_api_trace_file_header_t *hp;
-  int i, fd;
-  struct stat statb;
-  size_t file_size;
-  u8 *msg;
-  u8 endian_swap_needed = 0;
-  api_main_t *am = &api_main;
-  u8 *tmpbuf = 0;
-  u32 nitems;
-  void **saved_print_handlers = 0;
-
-  fd = open ((char *) filename, O_RDONLY);
-
-  if (fd < 0)
-    {
-      vlib_cli_output (vm, "Couldn't open %s\n", filename);
-      return;
-    }
-
-  if (fstat (fd, &statb) < 0)
-    {
-      vlib_cli_output (vm, "Couldn't stat %s\n", filename);
-      close (fd);
-      return;
-    }
-
-  if (!(statb.st_mode & S_IFREG) || (statb.st_size < sizeof (*hp)))
-    {
-      vlib_cli_output (vm, "File not plausible: %s\n", filename);
-      close (fd);
-      return;
-    }
-
-  file_size = statb.st_size;
-  file_size = (file_size + 4095) & ~(4096);
-
-  hp = mmap (0, file_size, PROT_READ, MAP_PRIVATE, fd, 0);
-
-  if (hp == (vl_api_trace_file_header_t *) MAP_FAILED)
-    {
-      vlib_cli_output (vm, "mmap failed: %s\n", filename);
-      close (fd);
-      return;
-    }
-  close (fd);
-
-  if ((clib_arch_is_little_endian && hp->endian == VL_API_BIG_ENDIAN)
-      || (clib_arch_is_big_endian && hp->endian == VL_API_LITTLE_ENDIAN))
-    endian_swap_needed = 1;
-
-  if (endian_swap_needed)
-    nitems = ntohl (hp->nitems);
-  else
-    nitems = hp->nitems;
-
-  if (last_index == (u32) ~ 0)
-    {
-      last_index = nitems - 1;
-    }
-
-  if (first_index >= nitems || last_index >= nitems)
-    {
-      vlib_cli_output (vm, "Range (%d, %d) outside file range (0, %d)\n",
-		       first_index, last_index, nitems - 1);
-      munmap (hp, file_size);
-      return;
-    }
-  if (hp->wrapped)
-    vlib_cli_output (vm,
-		     "Note: wrapped/incomplete trace, results may vary\n");
-
-  if (which == CUSTOM_DUMP)
-    {
-      saved_print_handlers = (void **) vec_dup (am->msg_print_handlers);
-      vl_msg_api_custom_dump_configure (am);
-    }
-
-
-  msg = (u8 *) (hp + 1);
-
-  for (i = 0; i < first_index; i++)
-    {
-      trace_cfg_t *cfgp;
-      int size;
-      u16 msg_id;
-
-      size = clib_host_to_net_u32 (*(u32 *) msg);
-      msg += sizeof (u32);
-
-      if (clib_arch_is_little_endian)
-	msg_id = ntohs (*((u16 *) msg));
-      else
-	msg_id = *((u16 *) msg);
-
-      cfgp = am->api_trace_cfg + msg_id;
-      if (!cfgp)
-	{
-	  vlib_cli_output (vm, "Ugh: msg id %d no trace config\n", msg_id);
-	  munmap (hp, file_size);
-	  return;
-	}
-      msg += size;
-    }
-
-  for (; i <= last_index; i++)
-    {
-      trace_cfg_t *cfgp;
-      u16 *msg_idp;
-      u16 msg_id;
-      int size;
-
-      if (which == DUMP)
-	vlib_cli_output (vm, "---------- trace %d -----------\n", i);
-
-      size = clib_host_to_net_u32 (*(u32 *) msg);
-      msg += sizeof (u32);
-
-      if (clib_arch_is_little_endian)
-	msg_id = ntohs (*((u16 *) msg));
-      else
-	msg_id = *((u16 *) msg);
-
-      cfgp = am->api_trace_cfg + msg_id;
-      if (!cfgp)
-	{
-	  vlib_cli_output (vm, "Ugh: msg id %d no trace config\n", msg_id);
-	  munmap (hp, file_size);
-	  vec_free (tmpbuf);
-	  return;
-	}
-
-      /* Copy the buffer (from the read-only mmap'ed file) */
-      vec_validate (tmpbuf, size - 1 + sizeof (uword));
-      clib_memcpy (tmpbuf + sizeof (uword), msg, size);
-      memset (tmpbuf, 0xf, sizeof (uword));
-
-      /*
-       * Endian swap if needed. All msg data is supposed to be
-       * in network byte order. All msg handlers are supposed to
-       * know that. The generic message dumpers don't know that.
-       * One could fix apigen, I suppose.
-       */
-      if ((which == DUMP && clib_arch_is_little_endian) || endian_swap_needed)
-	{
-	  void (*endian_fp) (void *);
-	  if (msg_id >= vec_len (am->msg_endian_handlers)
-	      || (am->msg_endian_handlers[msg_id] == 0))
-	    {
-	      vlib_cli_output (vm, "Ugh: msg id %d no endian swap\n", msg_id);
-	      munmap (hp, file_size);
-	      vec_free (tmpbuf);
-	      return;
-	    }
-	  endian_fp = am->msg_endian_handlers[msg_id];
-	  (*endian_fp) (tmpbuf + sizeof (uword));
-	}
-
-      /* msg_id always in network byte order */
-      if (clib_arch_is_little_endian)
-	{
-	  msg_idp = (u16 *) (tmpbuf + sizeof (uword));
-	  *msg_idp = msg_id;
-	}
-
-      switch (which)
-	{
-	case CUSTOM_DUMP:
-	case DUMP:
-	  if (msg_id < vec_len (am->msg_print_handlers) &&
-	      am->msg_print_handlers[msg_id])
-	    {
-	      u8 *(*print_fp) (void *, void *);
-
-	      print_fp = (void *) am->msg_print_handlers[msg_id];
-	      (*print_fp) (tmpbuf + sizeof (uword), vm);
-	    }
-	  else
-	    {
-	      vlib_cli_output (vm, "Skipping msg id %d: no print fcn\n",
-			       msg_id);
-	      break;
-	    }
-	  break;
-
-	case INITIALIZERS:
-	  if (msg_id < vec_len (am->msg_print_handlers) &&
-	      am->msg_print_handlers[msg_id])
-	    {
-	      u8 *s;
-	      int j;
-	      u8 *(*print_fp) (void *, void *);
-
-	      print_fp = (void *) am->msg_print_handlers[msg_id];
-
-	      vlib_cli_output (vm, "/*");
-
-	      (*print_fp) (tmpbuf + sizeof (uword), vm);
-	      vlib_cli_output (vm, "*/\n");
-
-	      s = format (0, "static u8 * vl_api_%s_%d[%d] = {",
-			  am->msg_names[msg_id], i,
-			  am->api_trace_cfg[msg_id].size);
-
-	      for (j = 0; j < am->api_trace_cfg[msg_id].size; j++)
-		{
-		  if ((j & 7) == 0)
-		    s = format (s, "\n    ");
-		  s = format (s, "0x%02x,", tmpbuf[sizeof (uword) + j]);
-		}
-	      s = format (s, "\n};\n%c", 0);
-	      vlib_cli_output (vm, (char *) s);
-	      vec_free (s);
-	    }
-	  break;
-
-	case REPLAY:
-	  if (msg_id < vec_len (am->msg_print_handlers) &&
-	      am->msg_print_handlers[msg_id] && cfgp->replay_enable)
-	    {
-	      void (*handler) (void *);
-
-	      handler = (void *) am->msg_handlers[msg_id];
-
-	      if (!am->is_mp_safe[msg_id])
-		vl_msg_api_barrier_sync ();
-	      (*handler) (tmpbuf + sizeof (uword));
-	      if (!am->is_mp_safe[msg_id])
-		vl_msg_api_barrier_release ();
-	    }
-	  else
-	    {
-	      if (cfgp->replay_enable)
-		vlib_cli_output (vm, "Skipping msg id %d: no handler\n",
-				 msg_id);
-	      break;
-	    }
-	  break;
-	}
-
-      _vec_len (tmpbuf) = 0;
-      msg += size;
-    }
-
-  if (saved_print_handlers)
-    {
-      clib_memcpy (am->msg_print_handlers, saved_print_handlers,
-		   vec_len (am->msg_print_handlers) * sizeof (void *));
-      vec_free (saved_print_handlers);
-    }
-
-  munmap (hp, file_size);
-  vec_free (tmpbuf);
-}
-
-u8 *
-format_vl_msg_api_trace_status (u8 * s, va_list * args)
-{
-  api_main_t *am = va_arg (*args, api_main_t *);
-  vl_api_trace_which_t which = va_arg (*args, vl_api_trace_which_t);
-  vl_api_trace_t *tp;
-  char *trace_name;
-
-  switch (which)
-    {
-    case VL_API_TRACE_TX:
-      tp = am->tx_trace;
-      trace_name = "TX trace";
-      break;
-
-    case VL_API_TRACE_RX:
-      tp = am->rx_trace;
-      trace_name = "RX trace";
-      break;
-
-    default:
-      abort ();
-    }
-
-  if (tp == 0)
-    {
-      s = format (s, "%s: not yet configured.\n", trace_name);
-      return s;
-    }
-
-  s = format (s, "%s: used %d of %d items, %s enabled, %s wrapped\n",
-	      trace_name, vec_len (tp->traces), tp->nitems,
-	      tp->enabled ? "is" : "is not", tp->wrapped ? "has" : "has not");
-  return s;
-}
-
-static u8 post_mortem_dump_enabled;
-
-static clib_error_t *
-api_trace_command_fn (vlib_main_t * vm,
-		      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  u32 nitems = 256 << 10;
-  api_main_t *am = &api_main;
-  vl_api_trace_which_t which = VL_API_TRACE_RX;
-  u8 *filename;
-  u32 first = 0;
-  u32 last = (u32) ~ 0;
-  FILE *fp;
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "on") || unformat (input, "enable"))
-	{
-	  if (unformat (input, "nitems %d", &nitems))
-	    ;
-	  vl_msg_api_trace_configure (am, which, nitems);
-	  vl_msg_api_trace_onoff (am, which, 1 /* on */ );
-	}
-      else if (unformat (input, "off"))
-	{
-	  vl_msg_api_trace_onoff (am, which, 0);
-	}
-      else if (unformat (input, "save %s", &filename))
-	{
-	  u8 *chroot_filename;
-	  if (strstr ((char *) filename, "..")
-	      || index ((char *) filename, '/'))
-	    {
-	      vlib_cli_output (vm, "illegal characters in filename '%s'",
-			       filename);
-	      return 0;
-	    }
-
-	  chroot_filename = format (0, "/tmp/%s%c", filename, 0);
-
-	  vec_free (filename);
-
-	  fp = fopen ((char *) chroot_filename, "w");
-	  if (fp == NULL)
-	    {
-	      vlib_cli_output (vm, "Couldn't create %s\n", chroot_filename);
-	      return 0;
-	    }
-	  rv = vl_msg_api_trace_save (am, which, fp);
-	  fclose (fp);
-	  if (rv == -1)
-	    vlib_cli_output (vm, "API Trace data not present\n");
-	  else if (rv == -2)
-	    vlib_cli_output (vm, "File for writing is closed\n");
-	  else if (rv == -10)
-	    vlib_cli_output (vm, "Error while writing header to file\n");
-	  else if (rv == -11)
-	    vlib_cli_output (vm, "Error while writing trace to file\n");
-	  else if (rv == -12)
-	    vlib_cli_output (vm,
-			     "Error while writing end of buffer trace to file\n");
-	  else if (rv == -13)
-	    vlib_cli_output (vm,
-			     "Error while writing start of buffer trace to file\n");
-	  else if (rv < 0)
-	    vlib_cli_output (vm, "Unkown error while saving: %d", rv);
-	  else
-	    vlib_cli_output (vm, "API trace saved to %s\n", chroot_filename);
-	  vec_free (chroot_filename);
-	}
-      else if (unformat (input, "dump %s", &filename))
-	{
-	  vl_msg_api_process_file (vm, filename, first, last, DUMP);
-	}
-      else if (unformat (input, "custom-dump %s", &filename))
-	{
-	  vl_msg_api_process_file (vm, filename, first, last, CUSTOM_DUMP);
-	}
-      else if (unformat (input, "replay %s", &filename))
-	{
-	  vl_msg_api_process_file (vm, filename, first, last, REPLAY);
-	}
-      else if (unformat (input, "initializers %s", &filename))
-	{
-	  vl_msg_api_process_file (vm, filename, first, last, INITIALIZERS);
-	}
-      else if (unformat (input, "tx"))
-	{
-	  which = VL_API_TRACE_TX;
-	}
-      else if (unformat (input, "first %d", &first))
-	{
-	  ;
-	}
-      else if (unformat (input, "last %d", &last))
-	{
-	  ;
-	}
-      else if (unformat (input, "status"))
-	{
-	  vlib_cli_output (vm, "%U", format_vl_msg_api_trace_status,
-			   am, which);
-	}
-      else if (unformat (input, "free"))
-	{
-	  vl_msg_api_trace_onoff (am, which, 0);
-	  vl_msg_api_trace_free (am, which);
-	}
-      else if (unformat (input, "post-mortem-on"))
-	post_mortem_dump_enabled = 1;
-      else if (unformat (input, "post-mortem-off"))
-	post_mortem_dump_enabled = 0;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (api_trace_command, static) = {
-    .path = "api trace",
-    .short_help =
-    "api trace [on|off][dump|save|replay <file>][status][free][post-mortem-on]",
-    .function = api_trace_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-api_config_fn (vlib_main_t * vm, unformat_input_t * input)
-{
-  u32 nitems = 256 << 10;
-  vl_api_trace_which_t which = VL_API_TRACE_RX;
-  api_main_t *am = &api_main;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "on") || unformat (input, "enable"))
-	{
-	  if (unformat (input, "nitems %d", &nitems))
-	    ;
-	  vl_msg_api_trace_configure (am, which, nitems);
-	  vl_msg_api_trace_onoff (am, which, 1 /* on */ );
-	  post_mortem_dump_enabled = 1;
-	}
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  return 0;
-}
-
-VLIB_CONFIG_FUNCTION (api_config_fn, "api-trace");
-
-void
-vl_msg_api_post_mortem_dump (void)
-{
-  api_main_t *am = &api_main;
-  FILE *fp;
-  char filename[64];
-  int rv;
-
-  if (post_mortem_dump_enabled == 0)
-    return;
-
-  snprintf (filename, sizeof (filename), "/tmp/api_post_mortem.%d",
-	    getpid ());
-
-  fp = fopen (filename, "w");
-  if (fp == NULL)
-    {
-      rv = write (2, "Couldn't create ", 16);
-      rv = write (2, filename, strlen (filename));
-      rv = write (2, "\n", 1);
-      return;
-    }
-  rv = vl_msg_api_trace_save (am, VL_API_TRACE_RX, fp);
-  fclose (fp);
-  if (rv < 0)
-    {
-      rv = write (2, "Failed to save post-mortem API trace to ", 40);
-      rv = write (2, filename, strlen (filename));
-      rv = write (2, "\n", 1);
-    }
-
-}
-
-/* Layered message handling support */
-
-void
-vl_msg_api_register_pd_handler (void *fp, u16 msg_id_host_byte_order)
-{
-  api_main_t *am = &api_main;
-
-  /* Mild idiot proofing */
-  if (msg_id_host_byte_order > 10000)
-    clib_warning ("msg_id_host_byte_order endian issue? %d arg vs %d",
-		  msg_id_host_byte_order,
-		  clib_net_to_host_u16 (msg_id_host_byte_order));
-  vec_validate (am->pd_msg_handlers, msg_id_host_byte_order);
-  am->pd_msg_handlers[msg_id_host_byte_order] = fp;
-}
-
-int
-vl_msg_api_pd_handler (void *mp, int rv)
-{
-  api_main_t *am = &api_main;
-  int (*fp) (void *, int);
-  u16 msg_id;
-
-  if (clib_arch_is_little_endian)
-    msg_id = clib_net_to_host_u16 (*((u16 *) mp));
-  else
-    msg_id = *((u16 *) mp);
-
-  if (msg_id >= vec_len (am->pd_msg_handlers)
-      || am->pd_msg_handlers[msg_id] == 0)
-    return rv;
-
-  fp = am->pd_msg_handlers[msg_id];
-  rv = (*fp) (mp, rv);
-  return rv;
-}
-
-void
-vl_msg_api_set_first_available_msg_id (u16 first_avail)
-{
-  api_main_t *am = &api_main;
-
-  am->first_available_msg_id = first_avail;
-}
-
-u16
-vl_msg_api_get_msg_ids (char *name, int n)
-{
-  api_main_t *am = &api_main;
-  u8 *name_copy;
-  vl_api_msg_range_t *rp;
-  uword *p;
-  u16 rv;
-
-  if (am->msg_range_by_name == 0)
-    am->msg_range_by_name = hash_create_string (0, sizeof (uword));
-
-  name_copy = format (0, "%s%c", name, 0);
-
-  p = hash_get_mem (am->msg_range_by_name, name_copy);
-  if (p)
-    {
-      clib_warning ("WARNING: duplicate message range registration for '%s'",
-		    name_copy);
-      vec_free (name_copy);
-      return ((u16) ~ 0);
-    }
-
-  if (n < 0 || n > 1024)
-    {
-      clib_warning
-	("WARNING: bad number of message-IDs (%d) requested by '%s'",
-	 n, name_copy);
-      vec_free (name_copy);
-      return ((u16) ~ 0);
-    }
-
-  vec_add2 (am->msg_ranges, rp, 1);
-
-  rv = rp->first_msg_id = am->first_available_msg_id;
-  am->first_available_msg_id += n;
-  rp->last_msg_id = am->first_available_msg_id - 1;
-  rp->name = name_copy;
-
-  hash_set_mem (am->msg_range_by_name, name_copy, rp - am->msg_ranges);
-
-  return rv;
-}
-
-void
-vl_msg_api_add_msg_name_crc (api_main_t * am, char *string, u32 id)
-{
-  uword *p;
-
-  if (am->msg_index_by_name_and_crc == 0)
-    am->msg_index_by_name_and_crc = hash_create_string (0, sizeof (uword));
-
-  p = hash_get_mem (am->msg_index_by_name_and_crc, string);
-  if (p)
-    {
-      clib_warning ("attempt to redefine '%s' ignored...", string);
-      return;
-    }
-
-  hash_set_mem (am->msg_index_by_name_and_crc, string, id);
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibapi/node_serialize.c b/vlib-api/vlibapi/node_serialize.c
deleted file mode 100644
index 4dc1a7d2..00000000
--- a/vlib-api/vlibapi/node_serialize.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-
-#include <vppinfra/serialize.h>
-
-extern void vl_msg_api_barrier_sync (void);
-extern void vl_msg_api_barrier_release (void);
-
-/* serialized representation of state strings */
-
-#define foreach_state_string_code               \
-_(STATE_DONE, "done")                           \
-_(STATE_DISABLED, "disabled")                   \
-_(STATE_TIME_WAIT, "time wait")                 \
-_(STATE_EVENT_WAIT, "event wait")               \
-_(STATE_ANY_WAIT, "any wait")                   \
-_(STATE_POLLING, "polling")                     \
-_(STATE_INTERRUPT_WAIT, "interrupt wait")       \
-_(STATE_INTERNAL, "internal")
-
-typedef enum
-{
-#define _(a,b) a,
-  foreach_state_string_code
-#undef _
-} state_string_enum_t;
-
-static char *state_strings[] = {
-#define _(a,b) b,
-  foreach_state_string_code
-#undef _
-};
-
-/*
- * Serialize a vlib_node_main_t. Appends the result to vector.
- * Pass 0 to create a new vector, use vec_reset_length(vector)
- * to recycle a vector / avoid memory allocation, etc.
- * Switch heaps before/after to serialize into API client shared memory.
- */
-
-u8 *
-vlib_node_serialize (vlib_node_main_t * nm, u8 * vector,
-		     u32 max_threads, int include_nexts, int include_stats)
-{
-  serialize_main_t _sm, *sm = &_sm;
-  vlib_main_t *vm = vlib_get_main ();
-  vlib_node_t *n;
-  static vlib_node_t ***node_dups;
-  vlib_node_t **nodes;
-  static vlib_main_t **stat_vms;
-  vlib_main_t *stat_vm;
-  u8 *namep;
-  u32 name_bytes;
-  uword i, j, k;
-  u64 l, v, c, d;
-  state_string_enum_t state_code;
-  u32 threads_to_serialize;
-
-  vec_reset_length (node_dups);
-
-  if (vec_len (stat_vms) == 0)
-    {
-      if (vec_len (vlib_mains) == 0)
-	vec_add1 (stat_vms, vm);
-      else
-	{
-	  for (i = 0; i < vec_len (vlib_mains); i++)
-	    {
-	      stat_vm = vlib_mains[i];
-	      if (stat_vm)
-		vec_add1 (stat_vms, stat_vm);
-	    }
-	}
-    }
-
-  threads_to_serialize = clib_min (max_threads, vec_len (stat_vms));
-
-  /*
-   * Barrier sync across stats scraping.
-   * Otherwise, the counts will be grossly inaccurate.
-   */
-  vl_msg_api_barrier_sync ();
-
-  for (j = 0; j < threads_to_serialize; j++)
-    {
-      stat_vm = stat_vms[j];
-      nm = &stat_vm->node_main;
-
-      if (include_stats)
-	{
-	  for (i = 0; i < vec_len (nm->nodes); i++)
-	    {
-	      n = nm->nodes[i];
-	      vlib_node_sync_stats (stat_vm, n);
-	    }
-	}
-
-      nodes = vec_dup (nm->nodes);
-
-      vec_add1 (node_dups, nodes);
-    }
-  vl_msg_api_barrier_release ();
-
-  serialize_open_vector (sm, vector);
-
-  serialize_likely_small_unsigned_integer (sm, vec_len (stat_vms));
-
-  for (j = 0; j < vec_len (stat_vms); j++)
-    {
-      stat_vm = stat_vms[j];
-      nodes = node_dups[j];
-
-      serialize_likely_small_unsigned_integer (sm, vec_len (nodes));
-
-      for (i = 0; i < vec_len (nodes); i++)
-	{
-	  n = nodes[i];
-
-	  l = n->stats_total.clocks - n->stats_last_clear.clocks;
-	  v = n->stats_total.vectors - n->stats_last_clear.vectors;
-	  c = n->stats_total.calls - n->stats_last_clear.calls;
-	  d = n->stats_total.suspends - n->stats_last_clear.suspends;
-
-	  state_code = STATE_INTERNAL;
-
-	  if (n->type == VLIB_NODE_TYPE_PROCESS)
-	    {
-	      vlib_process_t *p = vlib_get_process_from_node (vm, n);
-
-	      switch (p->flags
-		      & (VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK
-			 | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT))
-		{
-		default:
-		  if (!(p->flags & VLIB_PROCESS_IS_RUNNING))
-		    state_code = STATE_DONE;
-		  break;
-
-		case VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK:
-		  state_code = STATE_TIME_WAIT;
-		  break;
-
-		case VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT:
-		  state_code = STATE_EVENT_WAIT;
-		  break;
-
-		case (VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK):
-		  state_code =
-		    STATE_ANY_WAIT;
-		  break;
-		}
-	    }
-	  else if (n->type != VLIB_NODE_TYPE_INTERNAL)
-	    {
-	      state_code = STATE_POLLING;
-	      if (n->state == VLIB_NODE_STATE_DISABLED)
-		state_code = STATE_DISABLED;
-	      else if (n->state == VLIB_NODE_STATE_INTERRUPT)
-		state_code = STATE_INTERRUPT_WAIT;
-	    }
-
-	  /* See unserialize_cstring */
-	  name_bytes = vec_len (n->name);
-	  serialize_likely_small_unsigned_integer (sm, name_bytes);
-	  namep = serialize_get (sm, name_bytes);
-	  memcpy (namep, n->name, name_bytes);
-
-	  serialize_likely_small_unsigned_integer (sm, (u64) state_code);
-	  serialize_likely_small_unsigned_integer (sm, n->type);
-
-	  if (include_nexts)
-	    {
-	      serialize_likely_small_unsigned_integer
-		(sm, vec_len (n->next_nodes));
-	      for (k = 0; k < vec_len (n->next_nodes); k++)
-		serialize_likely_small_unsigned_integer (sm,
-							 n->next_nodes[k]);
-	    }
-	  else
-	    serialize_likely_small_unsigned_integer (sm, 0);
-
-	  if (include_stats)
-	    {
-	      /* stats present */
-	      serialize_likely_small_unsigned_integer (sm, 1);
-	      /* total clocks */
-	      serialize_integer (sm, l, 8);
-	      /* Total calls */
-	      serialize_integer (sm, c, 8);
-	      /* Total vectors */
-	      serialize_integer (sm, v, 8);
-	      /* Total suspends */
-	      serialize_integer (sm, d, 8);
-	    }
-	  else			/* no stats */
-	    serialize_likely_small_unsigned_integer (sm, 0);
-	}
-      vec_free (nodes);
-    }
-  return (serialize_close_vector (sm));
-}
-
-vlib_node_t ***
-vlib_node_unserialize (u8 * vector)
-{
-  serialize_main_t _sm, *sm = &_sm;
-  u32 nnodes, nnexts;
-  u32 nstat_vms;
-  vlib_node_t *node;
-  vlib_node_t **nodes;
-  vlib_node_t ***nodes_by_thread = 0;
-  int i, j, k;
-  u64 l, v, c, d;
-  state_string_enum_t state_code;
-  int stats_present;
-
-  serialize_open_vector (sm, vector);
-
-  nstat_vms = unserialize_likely_small_unsigned_integer (sm);
-
-  vec_validate (nodes_by_thread, nstat_vms - 1);
-  _vec_len (nodes_by_thread) = 0;
-
-  for (i = 0; i < nstat_vms; i++)
-    {
-      nnodes = unserialize_likely_small_unsigned_integer (sm);
-
-      nodes = 0;
-      vec_validate (nodes, nnodes - 1);
-      vec_add1 (nodes_by_thread, nodes);
-
-      for (j = 0; j < nnodes; j++)
-	{
-	  node = 0;
-	  vec_validate (node, 0);
-	  nodes[j] = node;
-
-	  unserialize_cstring (sm, (char **) &(node->name));
-	  state_code = unserialize_likely_small_unsigned_integer (sm);
-	  node->state_string = (u8 *) state_strings[state_code];
-
-	  node->type = unserialize_likely_small_unsigned_integer (sm);
-	  nnexts = unserialize_likely_small_unsigned_integer (sm);
-	  if (nnexts > 0)
-	    vec_validate (node->next_nodes, nnexts - 1);
-	  for (k = 0; k < nnexts; k++)
-	    node->next_nodes[k] =
-	      unserialize_likely_small_unsigned_integer (sm);
-
-	  stats_present = unserialize_likely_small_unsigned_integer (sm);
-
-	  if (stats_present)
-	    {
-	      /* total clocks */
-	      unserialize_integer (sm, &l, 8);
-	      node->stats_total.clocks = l;
-	      node->stats_last_clear.clocks = 0;
-
-	      /* Total calls */
-	      unserialize_integer (sm, &c, 8);
-	      node->stats_total.calls = c;
-
-	      /* Total vectors */
-	      unserialize_integer (sm, &v, 8);
-	      node->stats_total.vectors = v;
-
-	      /* Total suspends */
-	      unserialize_integer (sm, &d, 8);
-	      node->stats_total.suspends = d;
-	    }
-	}
-    }
-  return nodes_by_thread;
-}
-
-#if CLIB_DEBUG > 0
-
-static clib_error_t *
-test_node_serialize_command_fn (vlib_main_t * vm,
-				unformat_input_t * input,
-				vlib_cli_command_t * cmd)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  u8 *vector = 0;
-  vlib_node_t ***nodes_by_thread;
-  vlib_node_t **nodes;
-  vlib_node_t *node;
-  vlib_node_t *next_node;
-  int i, j, k;
-  u32 max_threads = (u32) ~ 0;
-  int include_nexts = 0;
-  int include_stats = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "max-threads %d", &max_threads))
-	;
-      else if (unformat (input, "stats"))
-	include_stats = 1;
-      else if (unformat (input, "nexts"))
-	include_nexts = 1;
-      else
-	break;
-    }
-
-  /*
-   * Keep the number of memcpy ops to a minimum (e.g. 1).
-   * The current size of the serialized vector is
-   * slightly under 4K.
-   */
-  vec_validate (vector, 16383);
-  vec_reset_length (vector);
-
-  vector = vlib_node_serialize (nm, vector, max_threads,
-				include_nexts, include_stats);
-
-  vlib_cli_output (vm, "result vector %d bytes", vec_len (vector));
-
-  nodes_by_thread = vlib_node_unserialize (vector);
-
-  vec_free (vector);
-
-  for (i = 0; i < vec_len (nodes_by_thread); i++)
-    {
-      nodes = nodes_by_thread[i];
-
-      vlib_cli_output (vm, "thread %d", i);
-
-      for (j = 0; j < vec_len (nodes); j++)
-	{
-	  node = nodes[j];
-
-	  vlib_cli_output (vm, "[%d] %s state %s", j, node->name,
-			   node->state_string);
-
-	  vlib_cli_output
-	    (vm, "    clocks %lld calls %lld suspends"
-	     " %lld vectors %lld",
-	     node->stats_total.clocks,
-	     node->stats_total.calls,
-	     node->stats_total.suspends, node->stats_total.vectors);
-
-	  for (k = 0; k < vec_len (node->next_nodes); k++)
-	    {
-	      if (node->next_nodes[k] != ~0)
-		{
-		  next_node = nodes[node->next_nodes[k]];
-		  vlib_cli_output (vm, "  [%d] %s", k, next_node->name);
-		}
-	    }
-	}
-    }
-
-  for (j = 0; j < vec_len (nodes_by_thread); j++)
-    {
-      nodes = nodes_by_thread[j];
-
-      for (i = 0; i < vec_len (nodes); i++)
-	{
-	  vec_free (nodes[i]->name);
-	  vec_free (nodes[i]->next_nodes);
-	  vec_free (nodes[i]);
-	}
-      vec_free (nodes);
-    }
-  vec_free (nodes_by_thread);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (test_node_serialize_node, static) = {
-    .path = "test node serialize",
-    .short_help = "test node serialize [max-threads NN] nexts stats",
-    .function = test_node_serialize_command_fn,
-};
-/* *INDENT-ON* */
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibmemory/api.h b/vlib-api/vlibmemory/api.h
deleted file mode 100644
index f1f8bb73..00000000
--- a/vlib-api/vlibmemory/api.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- *------------------------------------------------------------------
- * api.h
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#ifndef included_vlibmemory_api_h
-#define included_vlibmemory_api_h
-
-#include <vppinfra/error.h>
-#include <svm.h>
-#include <vlib/vlib.h>
-#include <vlibmemory/unix_shared_memory_queue.h>
-#include <vlib/unix/unix.h>
-#include <vlibapi/api.h>
-
-/* Allocated in shared memory */
-
-/*
- * Ring-allocation scheme for client API messages
- *
- * Only one proc/thread has control of a given message buffer.
- * To free a buffer allocated from one of these rings, we clear
- * a field in the buffer (header), and leave.
- *
- * No locks, no hits, no errors...
- */
-typedef struct ring_alloc_
-{
-  unix_shared_memory_queue_t *rp;
-  u16 size;
-  u16 nitems;
-  u32 hits;
-  u32 misses;
-} ring_alloc_t;
-
-/*
- * Initializers for the (shared-memory) rings
- * _(size, n). Note: each msg has an 8 byte header.
- * Might want to change that to an index sometime.
- */
-#define foreach_vl_aring_size                   \
-_(64+8, 1024)                                   \
-_(256+8, 128)                                   \
-_(1024+8, 64)
-
-#define foreach_clnt_aring_size                 \
-_(1024+8, 1024)                                 \
-_(2048+8, 128)                                  \
-_(4096+8, 8)
-
-typedef struct vl_shmem_hdr_
-{
-  int version;
-
-  /* getpid () for the VLIB client process */
-  volatile int vl_pid;
-
-  /* Client sends VLIB msgs here. */
-  unix_shared_memory_queue_t *vl_input_queue;
-
-  /* Vector of rings; one for each size. */
-
-  /* VLIB allocates buffers to send msgs to clients here. */
-  ring_alloc_t *vl_rings;
-
-  /* Clients allocate buffer to send msgs to VLIB here. */
-  ring_alloc_t *client_rings;
-
-  /* Number of detected application restarts */
-  u32 application_restarts;
-
-  /* Number of messages reclaimed during application restart */
-  u32 restart_reclaims;
-
-} vl_shmem_hdr_t;
-
-#define VL_SHM_VERSION 2
-
-#define VL_API_EPOCH_MASK 0xFF
-#define VL_API_EPOCH_SHIFT 8
-
-static inline u32
-vl_msg_api_handle_get_epoch (u32 index)
-{
-  return (index & VL_API_EPOCH_MASK);
-}
-
-static inline u32
-vl_msg_api_handle_get_index (u32 index)
-{
-  return (index >> VL_API_EPOCH_SHIFT);
-}
-
-static inline u32
-vl_msg_api_handle_from_index_and_epoch (u32 index, u32 epoch)
-{
-  u32 handle;
-  ASSERT (index < 0x00FFFFFF);
-
-  handle = (index << VL_API_EPOCH_SHIFT) | (epoch & VL_API_EPOCH_MASK);
-  return handle;
-}
-
-void *vl_msg_api_alloc (int nbytes);
-void *vl_msg_api_alloc_or_null (int nbytes);
-void *vl_msg_api_alloc_as_if_client (int nbytes);
-void *vl_msg_api_alloc_as_if_client_or_null (int nbytes);
-void vl_msg_api_free (void *a);
-int vl_map_shmem (char *region_name, int is_vlib);
-void vl_register_mapped_shmem_region (svm_region_t * rp);
-void vl_unmap_shmem (void);
-void vl_msg_api_send_shmem (unix_shared_memory_queue_t * q, u8 * elem);
-void vl_msg_api_send_shmem_nolock (unix_shared_memory_queue_t * q, u8 * elem);
-void vl_msg_api_send (vl_api_registration_t * rp, u8 * elem);
-int vl_client_connect (char *name, int ctx_quota, int input_queue_size);
-void vl_client_disconnect (void);
-unix_shared_memory_queue_t *vl_api_client_index_to_input_queue (u32 index);
-vl_api_registration_t *vl_api_client_index_to_registration (u32 index);
-int vl_client_api_map (char *region_name);
-void vl_client_api_unmap (void);
-void vl_set_memory_region_name (char *name);
-void vl_set_memory_root_path (char *root_path);
-void vl_set_memory_uid (int uid);
-void vl_set_memory_gid (int gid);
-void vl_set_global_memory_baseva (u64 baseva);
-void vl_set_global_memory_size (u64 size);
-void vl_set_api_memory_size (u64 size);
-void vl_set_global_pvt_heap_size (u64 size);
-void vl_set_api_pvt_heap_size (u64 size);
-void vl_enable_disable_memory_api (vlib_main_t * vm, int yesno);
-void vl_client_disconnect_from_vlib (void);
-int vl_client_connect_to_vlib (char *svm_name, char *client_name,
-			       int rx_queue_size);
-int vl_client_connect_to_vlib_no_rx_pthread (char *svm_name,
-					     char *client_name,
-					     int rx_queue_size);
-u16 vl_client_get_first_plugin_msg_id (char *plugin_name);
-
-void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
-
-#endif /* included_vlibmemory_api_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibmemory/memclnt.api b/vlib-api/vlibmemory/memclnt.api
deleted file mode 100644
index 2f654caf..00000000
--- a/vlib-api/vlibmemory/memclnt.api
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Hey Emacs use -*- mode: C -*- */
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Create a client registration 
- */
-manual_print 
-define memclnt_create {
-    i32 ctx_quota;              /* requested punt context quota */
-    u32 context;                /* opaque value to be returned in the reply */
-    u64 input_queue;            /* client's queue */
-    u8 name[64];                /* for show, find by name, whatever */
-    u32 api_versions[8];        /* client-server pairs use as desired */
-};
-
-define memclnt_create_reply {
-    i32 response;               /* Non-negative = success */
-    u64 handle;                 /* handle by which vlib knows this client */
-    u32 index;                  /* index, used e.g. by API trace replay */
-    u32 context;                /* opaque value from the create request */
-    u64 message_table;          /* serialized message table in shmem */
-};
-
-/*
- * Delete a client registration 
- */
-manual_print
-define memclnt_delete {
-    u32 index;                  /* index, used e.g. by API trace replay */
-    u64 handle;               /* handle by which vlib knows this client */
-};
-
-define memclnt_delete_reply {
-    i32 response;               /* Non-negative = success */
-    u64 handle;               /* in case the client wonders */
-};
-
-/* 
- * Client RX thread exit
- */
-
-define rx_thread_exit {
-    u8 dummy;
-};
-
-/*
- * RPC
- */
-define rpc_call {
-    u32 client_index;
-    u32 context;
-    u64 function;
-    u8 multicast;
-    u8 need_barrier_sync;
-    u8 send_reply;
-    u8 data[0];
-};
-
-define rpc_reply {
-    i32 retval;
-    u32 context;
-};
-
-/*
- * Lookup message-ID base by name
- */
-define get_first_msg_id {
-    u32 client_index;
-    u32 context;
-    u8 name[64];
-};
-
-define get_first_msg_id_reply {
-    u32 client_index;
-    u32 context;
-    i32 retval;
-    u16 first_msg_id;
-};
diff --git a/vlib-api/vlibmemory/memory_client.c b/vlib-api/vlibmemory/memory_client.c
deleted file mode 100644
index 234a0a5a..00000000
--- a/vlib-api/vlibmemory/memory_client.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- *------------------------------------------------------------------
- * memory_client.c - API message handling, client code.
- *
- * Copyright (c) 2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <setjmp.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibmemory/api.h>
-
-#include <vlibmemory/vl_memory_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vlibmemory/vl_memory_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vlibmemory/vl_memory_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) clib_warning (__VA_ARGS__)
-#define vl_printfun
-#include <vlibmemory/vl_memory_api_h.h>
-#undef vl_printfun
-
-typedef struct
-{
-  u8 rx_thread_jmpbuf_valid;
-  u8 connected_to_vlib;
-  jmp_buf rx_thread_jmpbuf;
-  pthread_t rx_thread_handle;
-  /* Plugin message base lookup scheme */
-  volatile u8 first_msg_id_reply_ready;
-  u16 first_msg_id_reply;
-} memory_client_main_t;
-
-memory_client_main_t memory_client_main;
-
-static void *
-rx_thread_fn (void *arg)
-{
-  unix_shared_memory_queue_t *q;
-  memory_client_main_t *mm = &memory_client_main;
-  api_main_t *am = &api_main;
-
-  q = am->vl_input_queue;
-
-  /* So we can make the rx thread terminate cleanly */
-  if (setjmp (mm->rx_thread_jmpbuf) == 0)
-    {
-      mm->rx_thread_jmpbuf_valid = 1;
-      while (1)
-	{
-	  vl_msg_api_queue_handler (q);
-	}
-    }
-  pthread_exit (0);
-}
-
-static void
-vl_api_rx_thread_exit_t_handler (vl_api_rx_thread_exit_t * mp)
-{
-  memory_client_main_t *mm = &memory_client_main;
-  vl_msg_api_free (mp);
-  longjmp (mm->rx_thread_jmpbuf, 1);
-}
-
-static void
-noop_handler (void *notused)
-{
-}
-
-#define foreach_api_msg						\
-_(RX_THREAD_EXIT, rx_thread_exit)
-
-static int
-connect_to_vlib_internal (char *svm_name, char *client_name,
-			  int rx_queue_size, int want_pthread)
-{
-  int rv = 0;
-  memory_client_main_t *mm = &memory_client_main;
-
-  if ((rv = vl_client_api_map (svm_name)))
-    {
-      clib_warning ("vl_client_api map rv %d", rv);
-      return rv;
-    }
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                            vl_api_##n##_t_handler,             \
-                            noop_handler,                       \
-                            vl_api_##n##_t_endian,              \
-                            vl_api_##n##_t_print,               \
-                            sizeof(vl_api_##n##_t), 1);
-  foreach_api_msg;
-#undef _
-
-  if (vl_client_connect (client_name, 0 /* punt quota */ ,
-			 rx_queue_size /* input queue */ ) < 0)
-    {
-      vl_client_api_unmap ();
-      return -1;
-    }
-
-  /* Start the rx queue thread */
-
-  if (want_pthread)
-    {
-      rv = pthread_create (&mm->rx_thread_handle,
-			   NULL /*attr */ , rx_thread_fn, 0);
-      if (rv)
-	clib_warning ("pthread_create returned %d", rv);
-    }
-
-  mm->connected_to_vlib = 1;
-  return 0;
-}
-
-int
-vl_client_connect_to_vlib (char *svm_name, char *client_name,
-			   int rx_queue_size)
-{
-  return connect_to_vlib_internal (svm_name, client_name, rx_queue_size,
-				   1 /* want pthread */ );
-}
-
-int
-vl_client_connect_to_vlib_no_rx_pthread (char *svm_name, char *client_name,
-					 int rx_queue_size)
-{
-  return connect_to_vlib_internal (svm_name, client_name, rx_queue_size,
-				   0 /* want pthread */ );
-}
-
-void
-vl_client_disconnect_from_vlib (void)
-{
-  memory_client_main_t *mm = &memory_client_main;
-  api_main_t *am = &api_main;
-  uword junk;
-
-  if (mm->rx_thread_jmpbuf_valid)
-    {
-      vl_api_rx_thread_exit_t *ep;
-      ep = vl_msg_api_alloc (sizeof (*ep));
-      ep->_vl_msg_id = ntohs (VL_API_RX_THREAD_EXIT);
-      vl_msg_api_send_shmem (am->vl_input_queue, (u8 *) & ep);
-      pthread_join (mm->rx_thread_handle, (void **) &junk);
-    }
-  if (mm->connected_to_vlib)
-    {
-      vl_client_disconnect ();
-      vl_client_api_unmap ();
-    }
-  memset (mm, 0, sizeof (*mm));
-}
-
-static void vl_api_get_first_msg_id_reply_t_handler
-  (vl_api_get_first_msg_id_reply_t * mp)
-{
-  memory_client_main_t *mm = &memory_client_main;
-  i32 retval = ntohl (mp->retval);
-
-  mm->first_msg_id_reply = (retval >= 0) ? ntohs (mp->first_msg_id) : ~0;
-  mm->first_msg_id_reply_ready = 1;
-}
-
-u16
-vl_client_get_first_plugin_msg_id (char *plugin_name)
-{
-  vl_api_get_first_msg_id_t *mp;
-  api_main_t *am = &api_main;
-  memory_client_main_t *mm = &memory_client_main;
-  f64 timeout;
-  void *old_handler;
-  clib_time_t clib_time;
-  u16 rv = ~0;
-
-  if (strlen (plugin_name) + 1 > sizeof (mp->name))
-    return (rv);
-
-  memset (&clib_time, 0, sizeof (clib_time));
-  clib_time_init (&clib_time);
-
-  /* Push this plugin's first_msg_id_reply handler */
-  old_handler = am->msg_handlers[VL_API_GET_FIRST_MSG_ID_REPLY];
-  am->msg_handlers[VL_API_GET_FIRST_MSG_ID_REPLY] = (void *)
-    vl_api_get_first_msg_id_reply_t_handler;
-
-  /* Ask the data-plane for the message-ID base of the indicated plugin */
-  mm->first_msg_id_reply_ready = 0;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_GET_FIRST_MSG_ID);
-  mp->client_index = am->my_client_index;
-  strncpy ((char *) mp->name, plugin_name, sizeof (mp->name) - 1);
-
-  vl_msg_api_send_shmem (am->shmem_hdr->vl_input_queue, (u8 *) & mp);
-
-  /* Synchronously wait for the answer */
-  do
-    {
-      timeout = clib_time_now (&clib_time) + 1.0;
-
-      while (clib_time_now (&clib_time) < timeout)
-	{
-	  if (mm->first_msg_id_reply_ready == 1)
-	    {
-	      rv = mm->first_msg_id_reply;
-	      goto result;
-	    }
-	}
-      /* Restore old handler */
-      am->msg_handlers[VL_API_GET_FIRST_MSG_ID_REPLY] = old_handler;
-
-      return rv;
-    }
-  while (0);
-
-result:
-
-  /* Restore the old handler */
-  am->msg_handlers[VL_API_GET_FIRST_MSG_ID_REPLY] = old_handler;
-
-  if (rv == (u16) ~ 0)
-    clib_warning ("plugin '%s' not registered", plugin_name);
-
-  return rv;
-}
-
-void
-vlib_node_sync_stats (vlib_main_t * vm, vlib_node_t * n)
-{
-  clib_warning ("STUB called...");
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibmemory/memory_shared.c b/vlib-api/vlibmemory/memory_shared.c
deleted file mode 100644
index d8d32004..00000000
--- a/vlib-api/vlibmemory/memory_shared.c
+++ /dev/null
@@ -1,852 +0,0 @@
-/*
- *------------------------------------------------------------------
- * memclnt_shared.c - API message handling, common code for both clients
- * and the vlib process itself.
- *
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-#include <vppinfra/format.h>
-#include <vppinfra/byte_order.h>
-#include <vppinfra/error.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibmemory/api.h>
-#include <vlibmemory/unix_shared_memory_queue.h>
-
-#include <vlibmemory/vl_memory_msg_enum.h>
-
-#define vl_typedefs
-#include <vlibmemory/vl_memory_api_h.h>
-#undef vl_typedefs
-
-static inline void *
-vl_msg_api_alloc_internal (int nbytes, int pool, int may_return_null)
-{
-  int i;
-  msgbuf_t *rv;
-  ring_alloc_t *ap;
-  unix_shared_memory_queue_t *q;
-  void *oldheap;
-  vl_shmem_hdr_t *shmem_hdr;
-  api_main_t *am = &api_main;
-
-  shmem_hdr = am->shmem_hdr;
-
-  if (shmem_hdr == 0)
-    {
-      clib_warning ("shared memory header NULL");
-      return 0;
-    }
-
-  /* account for the msgbuf_t header */
-  nbytes += sizeof (msgbuf_t);
-
-  if (shmem_hdr->vl_rings == 0)
-    {
-      clib_warning ("vl_rings NULL");
-      ASSERT (0);
-      abort ();
-    }
-
-  if (shmem_hdr->client_rings == 0)
-    {
-      clib_warning ("client_rings NULL");
-      ASSERT (0);
-      abort ();
-    }
-
-  ap = pool ? shmem_hdr->vl_rings : shmem_hdr->client_rings;
-  for (i = 0; i < vec_len (ap); i++)
-    {
-      /* Too big? */
-      if (nbytes > ap[i].size)
-	{
-	  continue;
-	}
-
-      q = ap[i].rp;
-      if (pool == 0)
-	{
-	  pthread_mutex_lock (&q->mutex);
-	}
-      rv = (msgbuf_t *) (&q->data[0] + q->head * q->elsize);
-      /*
-       * Is this item still in use?
-       */
-      if (rv->q)
-	{
-	  /* yes, loser; try next larger pool */
-	  ap[i].misses++;
-	  if (pool == 0)
-	    pthread_mutex_unlock (&q->mutex);
-	  continue;
-	}
-      /* OK, we have a winner */
-      ap[i].hits++;
-      /*
-       * Remember the source queue, although we
-       * don't need to know the queue to free the item.
-       */
-      rv->q = q;
-      q->head++;
-      if (q->head == q->maxsize)
-	q->head = 0;
-
-      if (pool == 0)
-	pthread_mutex_unlock (&q->mutex);
-      goto out;
-    }
-
-  /*
-   * Request too big, or head element of all size-compatible rings
-   * still in use. Fall back to shared-memory malloc.
-   */
-  am->ring_misses++;
-
-  pthread_mutex_lock (&am->vlib_rp->mutex);
-  oldheap = svm_push_data_heap (am->vlib_rp);
-  if (may_return_null)
-    {
-      rv = clib_mem_alloc_or_null (nbytes);
-      if (PREDICT_FALSE (rv == 0))
-	{
-	  svm_pop_heap (oldheap);
-	  pthread_mutex_unlock (&am->vlib_rp->mutex);
-	  return 0;
-	}
-    }
-  else
-    rv = clib_mem_alloc (nbytes);
-
-  rv->q = 0;
-  svm_pop_heap (oldheap);
-  pthread_mutex_unlock (&am->vlib_rp->mutex);
-
-out:
-  rv->data_len = htonl (nbytes - sizeof (msgbuf_t));
-  return (rv->data);
-}
-
-void *
-vl_msg_api_alloc (int nbytes)
-{
-  int pool;
-  api_main_t *am = &api_main;
-  vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
-
-  /*
-   * Clients use pool-0, vlib proc uses pool 1
-   */
-  pool = (am->our_pid == shmem_hdr->vl_pid);
-  return vl_msg_api_alloc_internal (nbytes, pool, 0 /* may_return_null */ );
-}
-
-void *
-vl_msg_api_alloc_or_null (int nbytes)
-{
-  int pool;
-  api_main_t *am = &api_main;
-  vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
-
-  pool = (am->our_pid == shmem_hdr->vl_pid);
-  return vl_msg_api_alloc_internal (nbytes, pool, 1 /* may_return_null */ );
-}
-
-void *
-vl_msg_api_alloc_as_if_client (int nbytes)
-{
-  return vl_msg_api_alloc_internal (nbytes, 0, 0 /* may_return_null */ );
-}
-
-void *
-vl_msg_api_alloc_as_if_client_or_null (int nbytes)
-{
-  return vl_msg_api_alloc_internal (nbytes, 0, 1 /* may_return_null */ );
-}
-
-void
-vl_msg_api_free (void *a)
-{
-  msgbuf_t *rv;
-  void *oldheap;
-  api_main_t *am = &api_main;
-
-  rv = (msgbuf_t *) (((u8 *) a) - offsetof (msgbuf_t, data));
-
-  /*
-   * Here's the beauty of the scheme.  Only one proc/thread has
-   * control of a given message buffer. To free a buffer, we just clear the
-   * queue field, and leave. No locks, no hits, no errors...
-   */
-  if (rv->q)
-    {
-      rv->q = 0;
-      return;
-    }
-
-  pthread_mutex_lock (&am->vlib_rp->mutex);
-  oldheap = svm_push_data_heap (am->vlib_rp);
-  clib_mem_free (rv);
-  svm_pop_heap (oldheap);
-  pthread_mutex_unlock (&am->vlib_rp->mutex);
-}
-
-static void
-vl_msg_api_free_nolock (void *a)
-{
-  msgbuf_t *rv;
-  void *oldheap;
-  api_main_t *am = &api_main;
-
-  rv = (msgbuf_t *) (((u8 *) a) - offsetof (msgbuf_t, data));
-  /*
-   * Here's the beauty of the scheme.  Only one proc/thread has
-   * control of a given message buffer. To free a buffer, we just clear the
-   * queue field, and leave. No locks, no hits, no errors...
-   */
-  if (rv->q)
-    {
-      rv->q = 0;
-      return;
-    }
-
-  oldheap = svm_push_data_heap (am->vlib_rp);
-  clib_mem_free (rv);
-  svm_pop_heap (oldheap);
-}
-
-void
-vl_set_memory_root_path (char *name)
-{
-  api_main_t *am = &api_main;
-
-  am->root_path = name;
-}
-
-void
-vl_set_memory_uid (int uid)
-{
-  api_main_t *am = &api_main;
-
-  am->api_uid = uid;
-}
-
-void
-vl_set_memory_gid (int gid)
-{
-  api_main_t *am = &api_main;
-
-  am->api_gid = gid;
-}
-
-void
-vl_set_global_memory_baseva (u64 baseva)
-{
-  api_main_t *am = &api_main;
-
-  am->global_baseva = baseva;
-}
-
-void
-vl_set_global_memory_size (u64 size)
-{
-  api_main_t *am = &api_main;
-
-  am->global_size = size;
-}
-
-void
-vl_set_api_memory_size (u64 size)
-{
-  api_main_t *am = &api_main;
-
-  am->api_size = size;
-}
-
-void
-vl_set_global_pvt_heap_size (u64 size)
-{
-  api_main_t *am = &api_main;
-
-  am->global_pvt_heap_size = size;
-}
-
-void
-vl_set_api_pvt_heap_size (u64 size)
-{
-  api_main_t *am = &api_main;
-
-  am->api_pvt_heap_size = size;
-}
-
-int
-vl_map_shmem (char *region_name, int is_vlib)
-{
-  svm_map_region_args_t _a, *a = &_a;
-  svm_region_t *vlib_rp, *root_rp;
-  void *oldheap;
-  vl_shmem_hdr_t *shmem_hdr = 0;
-  api_main_t *am = &api_main;
-  int i;
-  struct timespec ts, tsrem;
-
-  if (is_vlib == 0)
-    svm_region_init_chroot (am->root_path);
-
-  memset (a, 0, sizeof (*a));
-
-  a->name = region_name;
-  a->size = am->api_size ? am->api_size : (16 << 20);
-  a->flags = SVM_FLAGS_MHEAP;
-  a->uid = am->api_uid;
-  a->gid = am->api_gid;
-  a->pvt_heap_size = am->api_pvt_heap_size;
-
-  vlib_rp = svm_region_find_or_create (a);
-
-  if (vlib_rp == 0)
-    return (-2);
-
-  pthread_mutex_lock (&vlib_rp->mutex);
-  /* Has someone else set up the shared-memory variable table? */
-  if (vlib_rp->user_ctx)
-    {
-      am->shmem_hdr = (void *) vlib_rp->user_ctx;
-      am->our_pid = getpid ();
-      if (is_vlib)
-	{
-	  unix_shared_memory_queue_t *q;
-	  uword old_msg;
-	  /*
-	   * application restart. Reset cached pids, API message
-	   * rings, list of clients; otherwise, various things
-	   * fail. (e.g. queue non-empty notification)
-	   */
-
-	  /* ghosts keep the region from disappearing properly */
-	  svm_client_scan_this_region_nolock (vlib_rp);
-	  am->shmem_hdr->application_restarts++;
-	  q = am->shmem_hdr->vl_input_queue;
-	  am->shmem_hdr->vl_pid = getpid ();
-	  q->consumer_pid = am->shmem_hdr->vl_pid;
-	  /* Drain the input queue, freeing msgs */
-	  for (i = 0; i < 10; i++)
-	    {
-	      if (pthread_mutex_trylock (&q->mutex) == 0)
-		{
-		  pthread_mutex_unlock (&q->mutex);
-		  goto mutex_ok;
-		}
-	      ts.tv_sec = 0;
-	      ts.tv_nsec = 10000 * 1000;	/* 10 ms */
-	      while (nanosleep (&ts, &tsrem) < 0)
-		ts = tsrem;
-	    }
-	  /* Mutex buggered, "fix" it */
-	  memset (&q->mutex, 0, sizeof (q->mutex));
-	  clib_warning ("forcibly release main input queue mutex");
-
-	mutex_ok:
-	  am->vlib_rp = vlib_rp;
-	  while (unix_shared_memory_queue_sub (q,
-					       (u8 *) & old_msg,
-					       1 /* nowait */ )
-		 != -2 /* queue underflow */ )
-	    {
-	      vl_msg_api_free_nolock ((void *) old_msg);
-	      am->shmem_hdr->restart_reclaims++;
-	    }
-	  pthread_mutex_unlock (&vlib_rp->mutex);
-	  root_rp = svm_get_root_rp ();
-	  ASSERT (root_rp);
-	  /* Clean up the root region client list */
-	  pthread_mutex_lock (&root_rp->mutex);
-	  svm_client_scan_this_region_nolock (root_rp);
-	  pthread_mutex_unlock (&root_rp->mutex);
-	}
-      else
-	{
-	  pthread_mutex_unlock (&vlib_rp->mutex);
-	}
-      am->vlib_rp = vlib_rp;
-      vec_add1 (am->mapped_shmem_regions, vlib_rp);
-      return 0;
-    }
-  /* Clients simply have to wait... */
-  if (!is_vlib)
-    {
-      pthread_mutex_unlock (&vlib_rp->mutex);
-
-      /* Wait up to 100 seconds... */
-      for (i = 0; i < 10000; i++)
-	{
-	  ts.tv_sec = 0;
-	  ts.tv_nsec = 10000 * 1000;	/* 10 ms */
-	  while (nanosleep (&ts, &tsrem) < 0)
-	    ts = tsrem;
-	  if (vlib_rp->user_ctx)
-	    goto ready;
-	}
-      /* Clean up and leave... */
-      svm_region_unmap (vlib_rp);
-      clib_warning ("region init fail");
-      return (-2);
-
-    ready:
-      am->shmem_hdr = (void *) vlib_rp->user_ctx;
-      am->our_pid = getpid ();
-      am->vlib_rp = vlib_rp;
-      vec_add1 (am->mapped_shmem_regions, vlib_rp);
-      return 0;
-    }
-
-  /* Nope, it's our problem... */
-
-  oldheap = svm_push_data_heap (vlib_rp);
-
-  vec_validate (shmem_hdr, 0);
-  shmem_hdr->version = VL_SHM_VERSION;
-
-  /* vlib main input queue */
-  shmem_hdr->vl_input_queue =
-    unix_shared_memory_queue_init (1024, sizeof (uword), getpid (),
-				   am->vlib_signal);
-
-  /* Set up the msg ring allocator */
-#define _(sz,n)                                                 \
-    do {                                                        \
-        ring_alloc_t _rp;                                       \
-        _rp.rp = unix_shared_memory_queue_init ((n), (sz), 0, 0); \
-        _rp.size = (sz);                                        \
-        _rp.nitems = n;                                         \
-        _rp.hits = 0;                                           \
-        _rp.misses = 0;                                         \
-        vec_add1(shmem_hdr->vl_rings, _rp);                     \
-    } while (0);
-
-  foreach_vl_aring_size;
-#undef _
-
-#define _(sz,n)                                                 \
-    do {                                                        \
-        ring_alloc_t _rp;                                       \
-        _rp.rp = unix_shared_memory_queue_init ((n), (sz), 0, 0); \
-        _rp.size = (sz);                                        \
-        _rp.nitems = n;                                         \
-        _rp.hits = 0;                                           \
-        _rp.misses = 0;                                         \
-        vec_add1(shmem_hdr->client_rings, _rp);                 \
-    } while (0);
-
-  foreach_clnt_aring_size;
-#undef _
-
-  am->shmem_hdr = shmem_hdr;
-  am->vlib_rp = vlib_rp;
-  am->our_pid = getpid ();
-  if (is_vlib)
-    am->shmem_hdr->vl_pid = am->our_pid;
-
-  svm_pop_heap (oldheap);
-
-  /*
-   * After absolutely everything that a client might see is set up,
-   * declare the shmem region valid
-   */
-  vlib_rp->user_ctx = shmem_hdr;
-
-  pthread_mutex_unlock (&vlib_rp->mutex);
-  vec_add1 (am->mapped_shmem_regions, vlib_rp);
-  return 0;
-}
-
-void
-vl_register_mapped_shmem_region (svm_region_t * rp)
-{
-  api_main_t *am = &api_main;
-
-  vec_add1 (am->mapped_shmem_regions, rp);
-}
-
-void
-vl_unmap_shmem (void)
-{
-  svm_region_t *rp;
-  int i;
-  api_main_t *am = &api_main;
-
-  if (!svm_get_root_rp ())
-    return;
-
-  for (i = 0; i < vec_len (am->mapped_shmem_regions); i++)
-    {
-      rp = am->mapped_shmem_regions[i];
-      svm_region_unmap (rp);
-    }
-
-  vec_free (am->mapped_shmem_regions);
-  am->shmem_hdr = 0;
-
-  svm_region_exit ();
-  /* $$$ more careful cleanup, valgrind run... */
-  vec_free (am->msg_handlers);
-  vec_free (am->msg_endian_handlers);
-  vec_free (am->msg_print_handlers);
-}
-
-void
-vl_msg_api_send_shmem (unix_shared_memory_queue_t * q, u8 * elem)
-{
-  api_main_t *am = &api_main;
-  uword *trace = (uword *) elem;
-
-  if (am->tx_trace && am->tx_trace->enabled)
-    vl_msg_api_trace (am, am->tx_trace, (void *) trace[0]);
-
-  (void) unix_shared_memory_queue_add (q, elem, 0 /* nowait */ );
-}
-
-void
-vl_msg_api_send_shmem_nolock (unix_shared_memory_queue_t * q, u8 * elem)
-{
-  api_main_t *am = &api_main;
-  uword *trace = (uword *) elem;
-
-  if (am->tx_trace && am->tx_trace->enabled)
-    vl_msg_api_trace (am, am->tx_trace, (void *) trace[0]);
-
-  (void) unix_shared_memory_queue_add_nolock (q, elem);
-}
-
-static void
-vl_api_memclnt_create_reply_t_handler (vl_api_memclnt_create_reply_t * mp)
-{
-  serialize_main_t _sm, *sm = &_sm;
-  api_main_t *am = &api_main;
-  u8 *tblv;
-  u32 nmsgs;
-  int i;
-  u8 *name_and_crc;
-  u32 msg_index;
-
-  am->my_client_index = mp->index;
-  am->my_registration = (vl_api_registration_t *) (uword) mp->handle;
-
-  /* Clean out any previous hash table (unlikely) */
-  if (am->msg_index_by_name_and_crc)
-    {
-      int i;
-      u8 **keys = 0;
-      hash_pair_t *hp;
-      /* *INDENT-OFF* */
-      hash_foreach_pair (hp, am->msg_index_by_name_and_crc,
-      ({
-        vec_add1 (keys, (u8 *) hp->key);
-      }));
-      /* *INDENT-ON* */
-      for (i = 0; i < vec_len (keys); i++)
-	vec_free (keys[i]);
-      vec_free (keys);
-    }
-
-  am->msg_index_by_name_and_crc = hash_create_string (0, sizeof (uword));
-
-  /* Recreate the vnet-side API message handler table */
-  tblv = (u8 *) mp->message_table;
-  serialize_open_vector (sm, tblv);
-  unserialize_integer (sm, &nmsgs, sizeof (u32));
-
-  for (i = 0; i < nmsgs; i++)
-    {
-      msg_index = unserialize_likely_small_unsigned_integer (sm);
-      unserialize_cstring (sm, (char **) &name_and_crc);
-      hash_set_mem (am->msg_index_by_name_and_crc, name_and_crc, msg_index);
-    }
-}
-
-u32
-vl_api_get_msg_index (u8 * name_and_crc)
-{
-  api_main_t *am = &api_main;
-  uword *p;
-
-  if (am->msg_index_by_name_and_crc)
-    {
-      p = hash_get_mem (am->msg_index_by_name_and_crc, name_and_crc);
-      if (p)
-	return p[0];
-    }
-  return ~0;
-}
-
-int
-vl_client_connect (char *name, int ctx_quota, int input_queue_size)
-{
-  svm_region_t *svm;
-  vl_api_memclnt_create_t *mp;
-  vl_api_memclnt_create_reply_t *rp;
-  unix_shared_memory_queue_t *vl_input_queue;
-  vl_shmem_hdr_t *shmem_hdr;
-  int rv = 0;
-  void *oldheap;
-  api_main_t *am = &api_main;
-
-  if (am->my_registration)
-    {
-      clib_warning ("client %s already connected...", name);
-      return -1;
-    }
-
-  if (am->vlib_rp == 0)
-    {
-      clib_warning ("am->vlib_rp NULL");
-      return -1;
-    }
-
-  svm = am->vlib_rp;
-  shmem_hdr = am->shmem_hdr;
-
-  if (shmem_hdr == 0 || shmem_hdr->vl_input_queue == 0)
-    {
-      clib_warning ("shmem_hdr / input queue NULL");
-      return -1;
-    }
-
-  pthread_mutex_lock (&svm->mutex);
-  oldheap = svm_push_data_heap (svm);
-  vl_input_queue =
-    unix_shared_memory_queue_init (input_queue_size, sizeof (uword),
-				   getpid (), 0);
-  pthread_mutex_unlock (&svm->mutex);
-  svm_pop_heap (oldheap);
-
-  am->my_client_index = ~0;
-  am->my_registration = 0;
-  am->vl_input_queue = vl_input_queue;
-
-  mp = vl_msg_api_alloc (sizeof (vl_api_memclnt_create_t));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_MEMCLNT_CREATE);
-  mp->ctx_quota = ctx_quota;
-  mp->input_queue = (uword) vl_input_queue;
-  strncpy ((char *) mp->name, name, sizeof (mp->name) - 1);
-
-  vl_msg_api_send_shmem (shmem_hdr->vl_input_queue, (u8 *) & mp);
-
-  while (1)
-    {
-      int qstatus;
-      struct timespec ts, tsrem;
-      int i;
-
-      /* Wait up to 10 seconds */
-      for (i = 0; i < 1000; i++)
-	{
-	  qstatus = unix_shared_memory_queue_sub (vl_input_queue, (u8 *) & rp,
-						  1 /* nowait */ );
-	  if (qstatus == 0)
-	    goto read_one_msg;
-	  ts.tv_sec = 0;
-	  ts.tv_nsec = 10000 * 1000;	/* 10 ms */
-	  while (nanosleep (&ts, &tsrem) < 0)
-	    ts = tsrem;
-	}
-      /* Timeout... */
-      clib_warning ("memclnt_create_reply timeout");
-      return -1;
-
-    read_one_msg:
-      if (ntohs (rp->_vl_msg_id) != VL_API_MEMCLNT_CREATE_REPLY)
-	{
-	  clib_warning ("unexpected reply: id %d", ntohs (rp->_vl_msg_id));
-	  continue;
-	}
-      rv = clib_net_to_host_u32 (rp->response);
-
-      vl_msg_api_handler ((void *) rp);
-      break;
-    }
-  return (rv);
-}
-
-static void
-vl_api_memclnt_delete_reply_t_handler (vl_api_memclnt_delete_reply_t * mp)
-{
-  void *oldheap;
-  api_main_t *am = &api_main;
-
-  pthread_mutex_lock (&am->vlib_rp->mutex);
-  oldheap = svm_push_data_heap (am->vlib_rp);
-  unix_shared_memory_queue_free (am->vl_input_queue);
-  pthread_mutex_unlock (&am->vlib_rp->mutex);
-  svm_pop_heap (oldheap);
-
-  am->my_client_index = ~0;
-  am->my_registration = 0;
-  am->vl_input_queue = 0;
-}
-
-void
-vl_client_disconnect (void)
-{
-  vl_api_memclnt_delete_t *mp;
-  vl_api_memclnt_delete_reply_t *rp;
-  unix_shared_memory_queue_t *vl_input_queue;
-  vl_shmem_hdr_t *shmem_hdr;
-  time_t begin;
-  api_main_t *am = &api_main;
-
-  ASSERT (am->vlib_rp);
-  shmem_hdr = am->shmem_hdr;
-  ASSERT (shmem_hdr && shmem_hdr->vl_input_queue);
-
-  vl_input_queue = am->vl_input_queue;
-
-  mp = vl_msg_api_alloc (sizeof (vl_api_memclnt_delete_t));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_MEMCLNT_DELETE);
-  mp->index = am->my_client_index;
-  mp->handle = (uword) am->my_registration;
-
-  vl_msg_api_send_shmem (shmem_hdr->vl_input_queue, (u8 *) & mp);
-
-  /*
-   * Have to be careful here, in case the client is disconnecting
-   * because e.g. the vlib process died, or is unresponsive.
-   */
-
-  begin = time (0);
-  while (1)
-    {
-      time_t now;
-
-      now = time (0);
-
-      if (now >= (begin + 2))
-	{
-	  clib_warning ("peer unresponsive, give up");
-	  am->my_client_index = ~0;
-	  am->my_registration = 0;
-	  am->shmem_hdr = 0;
-	  break;
-	}
-      if (unix_shared_memory_queue_sub (vl_input_queue, (u8 *) & rp, 1) < 0)
-	continue;
-
-      /* drain the queue */
-      if (ntohs (rp->_vl_msg_id) != VL_API_MEMCLNT_DELETE_REPLY)
-	{
-	  vl_msg_api_handler ((void *) rp);
-	  continue;
-	}
-      vl_msg_api_handler ((void *) rp);
-      break;
-    }
-}
-
-static inline vl_api_registration_t *
-vl_api_client_index_to_registration_internal (u32 handle)
-{
-  vl_api_registration_t **regpp;
-  vl_api_registration_t *regp;
-  api_main_t *am = &api_main;
-  u32 index;
-
-  index = vl_msg_api_handle_get_index (handle);
-  if ((am->shmem_hdr->application_restarts & VL_API_EPOCH_MASK)
-      != vl_msg_api_handle_get_epoch (handle))
-    {
-      vl_msg_api_increment_missing_client_counter ();
-      return 0;
-    }
-
-  regpp = am->vl_clients + index;
-
-  if (pool_is_free (am->vl_clients, regpp))
-    {
-      vl_msg_api_increment_missing_client_counter ();
-      return 0;
-    }
-  regp = *regpp;
-  return (regp);
-}
-
-vl_api_registration_t *
-vl_api_client_index_to_registration (u32 index)
-{
-  return (vl_api_client_index_to_registration_internal (index));
-}
-
-unix_shared_memory_queue_t *
-vl_api_client_index_to_input_queue (u32 index)
-{
-  vl_api_registration_t *regp;
-  api_main_t *am = &api_main;
-
-  /* Special case: vlib trying to send itself a message */
-  if (index == (u32) ~ 0)
-    return (am->shmem_hdr->vl_input_queue);
-
-  regp = vl_api_client_index_to_registration_internal (index);
-  if (!regp)
-    return 0;
-  return (regp->vl_input_queue);
-}
-
-#define foreach_api_client_msg                  \
-_(MEMCLNT_CREATE_REPLY, memclnt_create_reply)   \
-_(MEMCLNT_DELETE_REPLY, memclnt_delete_reply)
-
-int
-vl_client_api_map (char *region_name)
-{
-  int rv;
-
-  if ((rv = vl_map_shmem (region_name, 0 /* is_vlib */ )) < 0)
-    {
-      return rv;
-    }
-
-#define _(N,n)                                                          \
-    vl_msg_api_set_handlers(VL_API_##N, 0 /* name */,                   \
-                           vl_api_##n##_t_handler,                      \
-                           0/* cleanup */, 0/* endian */, 0/* print */, \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_api_client_msg;
-#undef _
-  return 0;
-}
-
-void
-vl_client_api_unmap (void)
-{
-  vl_unmap_shmem ();
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibmemory/memory_vlib.c b/vlib-api/vlibmemory/memory_vlib.c
deleted file mode 100644
index 1d40bcb7..00000000
--- a/vlib-api/vlibmemory/memory_vlib.c
+++ /dev/null
@@ -1,1346 +0,0 @@
-/*
- *------------------------------------------------------------------
- * memory_vlib.c
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <pthread.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-#include <vppinfra/byte_order.h>
-#include <vppinfra/elog.h>
-#include <stdarg.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-
-#define TRACE_VLIB_MEMORY_QUEUE 0
-
-#include <vlibmemory/vl_memory_msg_enum.h>	/* enumerate all vlib messages */
-
-#define vl_typedefs		/* define message structures */
-#include <vlibmemory/vl_memory_api_h.h>
-#undef vl_typedefs
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vlibmemory/vl_memory_api_h.h>
-#undef vl_printfun
-
-static inline void *
-vl_api_memclnt_create_t_print (vl_api_memclnt_create_t * a, void *handle)
-{
-  vl_print (handle, "vl_api_memclnt_create_t:\n");
-  vl_print (handle, "name: %s\n", a->name);
-  vl_print (handle, "input_queue: 0x%wx\n", a->input_queue);
-  vl_print (handle, "context: %u\n", (unsigned) a->context);
-  vl_print (handle, "ctx_quota: %ld\n", (long) a->ctx_quota);
-  return handle;
-}
-
-static inline void *
-vl_api_memclnt_delete_t_print (vl_api_memclnt_delete_t * a, void *handle)
-{
-  vl_print (handle, "vl_api_memclnt_delete_t:\n");
-  vl_print (handle, "index: %u\n", (unsigned) a->index);
-  vl_print (handle, "handle: 0x%wx\n", a->handle);
-  return handle;
-}
-
-/* instantiate all the endian swap functions we know about */
-#define vl_endianfun
-#include <vlibmemory/vl_memory_api_h.h>
-#undef vl_endianfun
-
-void vl_socket_api_send (vl_api_registration_t * rp, u8 * elem)
-  __attribute__ ((weak));
-
-void
-vl_socket_api_send (vl_api_registration_t * rp, u8 * elem)
-{
-  static int count;
-
-  if (count++ < 5)
-    clib_warning ("need to link against -lvlibsocket, msg not sent!");
-}
-
-void
-vl_msg_api_send (vl_api_registration_t * rp, u8 * elem)
-{
-  if (PREDICT_FALSE (rp->registration_type > REGISTRATION_TYPE_SHMEM))
-    {
-      vl_socket_api_send (rp, elem);
-    }
-  else
-    {
-      vl_msg_api_send_shmem (rp->vl_input_queue, elem);
-    }
-}
-
-u8 *
-vl_api_serialize_message_table (api_main_t * am, u8 * vector)
-{
-  serialize_main_t _sm, *sm = &_sm;
-  hash_pair_t *hp;
-  u32 nmsg = hash_elts (am->msg_index_by_name_and_crc);
-
-  serialize_open_vector (sm, vector);
-
-  /* serialize the count */
-  serialize_integer (sm, nmsg, sizeof (u32));
-
-  hash_foreach_pair (hp, am->msg_index_by_name_and_crc, (
-							  {
-							  serialize_likely_small_unsigned_integer
-							  (sm, hp->value[0]);
-							  serialize_cstring
-							  (sm,
-							   (char *) hp->key);
-							  }));
-
-  return serialize_close_vector (sm);
-}
-
-/*
- * vl_api_memclnt_create_t_handler
- */
-void
-vl_api_memclnt_create_t_handler (vl_api_memclnt_create_t * mp)
-{
-  vl_api_registration_t **regpp;
-  vl_api_registration_t *regp;
-  vl_api_memclnt_create_reply_t *rp;
-  svm_region_t *svm;
-  unix_shared_memory_queue_t *q;
-  int rv = 0;
-  void *oldheap;
-  api_main_t *am = &api_main;
-  u8 *serialized_message_table = 0;
-
-  /*
-   * This is tortured. Maintain a vlib-address-space private
-   * pool of client registrations. We use the shared-memory virtual
-   * address of client structure as a handle, to allow direct
-   * manipulation of context quota vbls from the client library.
-   *
-   * This scheme causes trouble w/ API message trace replay, since
-   * some random VA from clib_mem_alloc() certainly won't
-   * occur in the Linux sim. The (very) few places
-   * that care need to use the pool index.
-   *
-   * Putting the registration object(s) into a pool in shared memory and
-   * using the pool index as a handle seems like a great idea.
-   * Unfortunately, each and every reference to that pool would need
-   * to be protected by a mutex:
-   *
-   *     Client                      VLIB
-   *     ------                      ----
-   *     convert pool index to
-   *     pointer.
-   *     <deschedule>
-   *                                 expand pool
-   *                                 <deschedule>
-   *     kaboom!
-   */
-
-  pool_get (am->vl_clients, regpp);
-
-  svm = am->vlib_rp;
-
-  if (am->serialized_message_table_in_shmem == 0)
-    serialized_message_table = vl_api_serialize_message_table (am, 0);
-
-  pthread_mutex_lock (&svm->mutex);
-  oldheap = svm_push_data_heap (svm);
-  *regpp = clib_mem_alloc (sizeof (vl_api_registration_t));
-
-  regp = *regpp;
-  memset (regp, 0, sizeof (*regp));
-  regp->registration_type = REGISTRATION_TYPE_SHMEM;
-  regp->vl_api_registration_pool_index = regpp - am->vl_clients;
-
-  q = regp->vl_input_queue = (unix_shared_memory_queue_t *) (uword)
-    mp->input_queue;
-
-  regp->name = format (0, "%s", mp->name);
-  vec_add1 (regp->name, 0);
-  if (serialized_message_table)
-    am->serialized_message_table_in_shmem =
-      vec_dup (serialized_message_table);
-
-  pthread_mutex_unlock (&svm->mutex);
-  svm_pop_heap (oldheap);
-
-  vec_free (serialized_message_table);
-
-  rp = vl_msg_api_alloc (sizeof (*rp));
-  rp->_vl_msg_id = ntohs (VL_API_MEMCLNT_CREATE_REPLY);
-  rp->handle = (uword) regp;
-  rp->index = vl_msg_api_handle_from_index_and_epoch
-    (regp->vl_api_registration_pool_index,
-     am->shmem_hdr->application_restarts);
-  rp->context = mp->context;
-  rp->response = ntohl (rv);
-  rp->message_table = (u64) am->serialized_message_table_in_shmem;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rp);
-}
-
-/* Application callback to clean up leftover registrations from this client */
-int vl_api_memclnt_delete_callback (u32 client_index) __attribute__ ((weak));
-
-int
-vl_api_memclnt_delete_callback (u32 client_index)
-{
-  return 0;
-}
-
-/*
- * vl_api_memclnt_delete_t_handler
- */
-void
-vl_api_memclnt_delete_t_handler (vl_api_memclnt_delete_t * mp)
-{
-  vl_api_registration_t **regpp;
-  vl_api_registration_t *regp;
-  vl_api_memclnt_delete_reply_t *rp;
-  svm_region_t *svm;
-  void *oldheap;
-  api_main_t *am = &api_main;
-  u32 handle, client_index, epoch;
-
-  handle = mp->index;
-
-  if (vl_api_memclnt_delete_callback (handle))
-    return;
-
-  epoch = vl_msg_api_handle_get_epoch (handle);
-  client_index = vl_msg_api_handle_get_index (handle);
-
-  if (epoch != (am->shmem_hdr->application_restarts & VL_API_EPOCH_MASK))
-    {
-      clib_warning
-	("Stale clnt delete index %d old epoch %d cur epoch %d",
-	 client_index, epoch,
-	 (am->shmem_hdr->application_restarts & VL_API_EPOCH_MASK));
-      return;
-    }
-
-  regpp = am->vl_clients + client_index;
-
-  if (!pool_is_free (am->vl_clients, regpp))
-    {
-      regp = *regpp;
-      svm = am->vlib_rp;
-
-      /* $$$ check the input queue for e.g. punted sf's */
-
-      rp = vl_msg_api_alloc (sizeof (*rp));
-      rp->_vl_msg_id = ntohs (VL_API_MEMCLNT_DELETE_REPLY);
-      rp->handle = mp->handle;
-      rp->response = 1;
-
-      vl_msg_api_send_shmem (regp->vl_input_queue, (u8 *) & rp);
-
-      if (client_index != regp->vl_api_registration_pool_index)
-	{
-	  clib_warning ("mismatch client_index %d pool_index %d",
-			client_index, regp->vl_api_registration_pool_index);
-	  vl_msg_api_free (rp);
-	  return;
-	}
-
-      /* No dangling references, please */
-      *regpp = 0;
-
-      pool_put_index (am->vl_clients, regp->vl_api_registration_pool_index);
-
-      pthread_mutex_lock (&svm->mutex);
-      oldheap = svm_push_data_heap (svm);
-      /* Poison the old registration */
-      memset (regp, 0xF1, sizeof (*regp));
-      clib_mem_free (regp);
-      pthread_mutex_unlock (&svm->mutex);
-      svm_pop_heap (oldheap);
-    }
-  else
-    {
-      clib_warning ("unknown client ID %d", mp->index);
-    }
-}
-
-void
-vl_api_get_first_msg_id_t_handler (vl_api_get_first_msg_id_t * mp)
-{
-  vl_api_get_first_msg_id_reply_t *rmp;
-  unix_shared_memory_queue_t *q;
-  uword *p;
-  api_main_t *am = &api_main;
-  vl_api_msg_range_t *rp;
-  u8 name[64];
-  u16 first_msg_id = ~0;
-  int rv = -7;			/* VNET_API_ERROR_INVALID_VALUE */
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  if (am->msg_range_by_name == 0)
-    goto out;
-
-  strncpy ((char *) name, (char *) mp->name, ARRAY_LEN (name) - 1);
-
-  p = hash_get_mem (am->msg_range_by_name, name);
-  if (p == 0)
-    goto out;
-
-  rp = vec_elt_at_index (am->msg_ranges, p[0]);
-
-  first_msg_id = rp->first_msg_id;
-  rv = 0;
-
-out:
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_GET_FIRST_MSG_ID_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = ntohl (rv);
-  rmp->first_msg_id = ntohs (first_msg_id);
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-#define foreach_vlib_api_msg                    \
-_(MEMCLNT_CREATE, memclnt_create)               \
-_(MEMCLNT_DELETE, memclnt_delete)               \
-_(GET_FIRST_MSG_ID, get_first_msg_id)
-
-/*
- * vl_api_init
- */
-static int
-memory_api_init (char *region_name)
-{
-  int rv;
-  vl_msg_api_msg_config_t cfg;
-  vl_msg_api_msg_config_t *c = &cfg;
-
-  if ((rv = vl_map_shmem (region_name, 1 /* is_vlib */ )) < 0)
-    return rv;
-
-#define _(N,n) do {                                             \
-    c->id = VL_API_##N;                                         \
-    c->name = #n;                                               \
-    c->handler = vl_api_##n##_t_handler;                        \
-    c->cleanup = vl_noop_handler;                               \
-    c->endian = vl_api_##n##_t_endian;                          \
-    c->print = vl_api_##n##_t_print;                            \
-    c->size = sizeof(vl_api_##n##_t);                           \
-    c->traced = 1; /* trace, so these msgs print */             \
-    c->replay = 0; /* don't replay client create/delete msgs */ \
-    vl_msg_api_config(c);} while (0);
-
-  foreach_vlib_api_msg;
-#undef _
-
-  return 0;
-}
-
-#define foreach_histogram_bucket                \
-_(400)                                          \
-_(200)                                          \
-_(100)                                          \
-_(10)
-
-typedef enum
-{
-#define _(n) SLEEP_##n##_US,
-  foreach_histogram_bucket
-#undef _
-    SLEEP_N_BUCKETS,
-} histogram_index_t;
-
-static u64 vector_rate_histogram[SLEEP_N_BUCKETS];
-
-static void memclnt_queue_callback (vlib_main_t * vm);
-
-static uword
-memclnt_process (vlib_main_t * vm,
-		 vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  uword mp;
-  vl_shmem_hdr_t *shm;
-  unix_shared_memory_queue_t *q;
-  clib_error_t *e;
-  int rv;
-  api_main_t *am = &api_main;
-  f64 dead_client_scan_time;
-  f64 sleep_time, start_time;
-  f64 vector_rate;
-
-  vlib_set_queue_signal_callback (vm, memclnt_queue_callback);
-
-  if ((rv = memory_api_init (am->region_name)) < 0)
-    {
-      clib_warning ("memory_api_init returned %d, wait for godot...", rv);
-      vlib_process_suspend (vm, 1e70);
-    }
-
-  shm = am->shmem_hdr;
-  ASSERT (shm);
-  q = shm->vl_input_queue;
-  ASSERT (q);
-
-  e = vlib_call_init_exit_functions
-    (vm, vm->api_init_function_registrations, 1 /* call_once */ );
-  if (e)
-    clib_error_report (e);
-
-  sleep_time = 20.0;
-  dead_client_scan_time = vlib_time_now (vm) + 20.0;
-
-  /* $$$ pay attention to frame size, control CPU usage */
-  while (1)
-    {
-      uword event_type __attribute__ ((unused));
-      i8 *headp;
-      int need_broadcast;
-
-      /*
-       * There's a reason for checking the queue before
-       * sleeping. If the vlib application crashes, it's entirely
-       * possible for a client to enqueue a connect request
-       * during the process restart interval.
-       *
-       * Unless some force of physics causes the new incarnation
-       * of the application to process the request, the client will
-       * sit and wait for Godot...
-       */
-      vector_rate = vlib_last_vector_length_per_node (vm);
-      start_time = vlib_time_now (vm);
-      while (1)
-	{
-	  pthread_mutex_lock (&q->mutex);
-	  if (q->cursize == 0)
-	    {
-	      vm->api_queue_nonempty = 0;
-	      pthread_mutex_unlock (&q->mutex);
-
-	      if (TRACE_VLIB_MEMORY_QUEUE)
-		{
-                  /* *INDENT-OFF* */
-                  ELOG_TYPE_DECLARE (e) =
-                    {
-                      .format = "q-underflow: len %d",
-                      .format_args = "i4",
-                    };
-                  /* *INDENT-ON* */
-		  struct
-		  {
-		    u32 len;
-		  } *ed;
-		  ed = ELOG_DATA (&vm->elog_main, e);
-		  ed->len = 0;
-		}
-	      sleep_time = 20.0;
-	      break;
-	    }
-
-	  headp = (i8 *) (q->data + sizeof (uword) * q->head);
-	  clib_memcpy (&mp, headp, sizeof (uword));
-
-	  q->head++;
-	  need_broadcast = (q->cursize == q->maxsize / 2);
-	  q->cursize--;
-
-	  if (PREDICT_FALSE (q->head == q->maxsize))
-	    q->head = 0;
-	  pthread_mutex_unlock (&q->mutex);
-	  if (need_broadcast)
-	    (void) pthread_cond_broadcast (&q->condvar);
-
-	  vl_msg_api_handler_with_vm_node (am, (void *) mp, vm, node);
-
-	  /* Allow no more than 10us without a pause */
-	  if (vlib_time_now (vm) > start_time + 10e-6)
-	    {
-	      int index = SLEEP_400_US;
-	      if (vector_rate > 40.0)
-		sleep_time = 400e-6;
-	      else if (vector_rate > 20.0)
-		{
-		  index = SLEEP_200_US;
-		  sleep_time = 200e-6;
-		}
-	      else if (vector_rate >= 1.0)
-		{
-		  index = SLEEP_100_US;
-		  sleep_time = 100e-6;
-		}
-	      else
-		{
-		  index = SLEEP_10_US;
-		  sleep_time = 10e-6;
-		}
-	      vector_rate_histogram[index] += 1;
-	      break;
-	    }
-	}
-
-      event_type = vlib_process_wait_for_event_or_clock (vm, sleep_time);
-      vm->queue_signal_pending = 0;
-      vlib_process_get_events (vm, 0 /* event_data */ );
-
-      if (vlib_time_now (vm) > dead_client_scan_time)
-	{
-	  vl_api_registration_t **regpp;
-	  vl_api_registration_t *regp;
-	  unix_shared_memory_queue_t *q;
-	  static u32 *dead_indices;
-	  static u32 *confused_indices;
-
-	  vec_reset_length (dead_indices);
-	  vec_reset_length (confused_indices);
-
-          /* *INDENT-OFF* */
-          pool_foreach (regpp, am->vl_clients,
-          ({
-            regp = *regpp;
-            if (regp)
-              {
-                q = regp->vl_input_queue;
-                if (kill (q->consumer_pid, 0) < 0)
-                  {
-                    vec_add1(dead_indices, regpp - am->vl_clients);
-                  }
-              }
-            else
-              {
-                clib_warning ("NULL client registration index %d",
-                              regpp - am->vl_clients);
-                vec_add1 (confused_indices, regpp - am->vl_clients);
-              }
-          }));
-          /* *INDENT-ON* */
-	  /* This should "never happen," but if it does, fix it... */
-	  if (PREDICT_FALSE (vec_len (confused_indices) > 0))
-	    {
-	      int i;
-	      for (i = 0; i < vec_len (confused_indices); i++)
-		{
-		  pool_put_index (am->vl_clients, confused_indices[i]);
-		}
-	    }
-
-	  if (PREDICT_FALSE (vec_len (dead_indices) > 0))
-	    {
-	      int i;
-	      svm_region_t *svm;
-	      void *oldheap;
-
-	      /* Allow the application to clean up its registrations */
-	      for (i = 0; i < vec_len (dead_indices); i++)
-		{
-		  regpp = pool_elt_at_index (am->vl_clients, dead_indices[i]);
-		  if (regpp)
-		    {
-		      u32 handle;
-
-		      handle = vl_msg_api_handle_from_index_and_epoch
-			(dead_indices[i], shm->application_restarts);
-		      (void) vl_api_memclnt_delete_callback (handle);
-		    }
-		}
-
-	      svm = am->vlib_rp;
-	      pthread_mutex_lock (&svm->mutex);
-	      oldheap = svm_push_data_heap (svm);
-
-	      for (i = 0; i < vec_len (dead_indices); i++)
-		{
-		  regpp = pool_elt_at_index (am->vl_clients, dead_indices[i]);
-		  if (regpp)
-		    {
-		      /* Poison the old registration */
-		      memset (*regpp, 0xF3, sizeof (**regpp));
-		      clib_mem_free (*regpp);
-		      /* no dangling references, please */
-		      *regpp = 0;
-		    }
-		  else
-		    {
-		      svm_pop_heap (oldheap);
-		      clib_warning ("Duplicate free, client index %d",
-				    regpp - am->vl_clients);
-		      oldheap = svm_push_data_heap (svm);
-		    }
-		}
-
-	      svm_client_scan_this_region_nolock (am->vlib_rp);
-
-	      pthread_mutex_unlock (&svm->mutex);
-	      svm_pop_heap (oldheap);
-	      for (i = 0; i < vec_len (dead_indices); i++)
-		pool_put_index (am->vl_clients, dead_indices[i]);
-	    }
-
-	  dead_client_scan_time = vlib_time_now (vm) + 20.0;
-	}
-
-      if (TRACE_VLIB_MEMORY_QUEUE)
-	{
-          /* *INDENT-OFF* */
-          ELOG_TYPE_DECLARE (e) = {
-            .format = "q-awake: len %d",
-            .format_args = "i4",
-          };
-          /* *INDENT-ON* */
-	  struct
-	  {
-	    u32 len;
-	  } *ed;
-	  ed = ELOG_DATA (&vm->elog_main, e);
-	  ed->len = q->cursize;
-	}
-    }
-
-  return 0;
-}
-
-static clib_error_t *
-vl_api_show_histogram_command (vlib_main_t * vm,
-			       unformat_input_t * input,
-			       vlib_cli_command_t * cli_cmd)
-{
-  u64 total_counts = 0;
-  int i;
-
-  for (i = 0; i < SLEEP_N_BUCKETS; i++)
-    {
-      total_counts += vector_rate_histogram[i];
-    }
-
-  if (total_counts == 0)
-    {
-      vlib_cli_output (vm, "No control-plane activity.");
-      return 0;
-    }
-
-#define _(n)                                                    \
-    do {                                                        \
-        f64 percent;                                            \
-        percent = ((f64) vector_rate_histogram[SLEEP_##n##_US]) \
-            / (f64) total_counts;                               \
-        percent *= 100.0;                                       \
-        vlib_cli_output (vm, "Sleep %3d us: %llu, %.2f%%",n,    \
-                         vector_rate_histogram[SLEEP_##n##_US], \
-                         percent);                              \
-    } while (0);
-  foreach_histogram_bucket;
-#undef _
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_show_api_histogram_command, static) = {
-    .path = "show api histogram",
-    .short_help = "show api histogram",
-    .function = vl_api_show_histogram_command,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-vl_api_clear_histogram_command (vlib_main_t * vm,
-				unformat_input_t * input,
-				vlib_cli_command_t * cli_cmd)
-{
-  int i;
-
-  for (i = 0; i < SLEEP_N_BUCKETS; i++)
-    vector_rate_histogram[i] = 0;
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_clear_api_histogram_command, static) = {
-    .path = "clear api histogram",
-    .short_help = "clear api histogram",
-    .function = vl_api_clear_histogram_command,
-};
-/* *INDENT-ON* */
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (memclnt_node,static) = {
-    .function = memclnt_process,
-    .type = VLIB_NODE_TYPE_PROCESS,
-    .name = "api-rx-from-ring",
-    .state = VLIB_NODE_STATE_DISABLED,
-};
-/* *INDENT-ON* */
-
-static void
-memclnt_queue_callback (vlib_main_t * vm)
-{
-  static volatile int *cursizep;
-
-  if (PREDICT_FALSE (cursizep == 0))
-    {
-      api_main_t *am = &api_main;
-      vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
-      unix_shared_memory_queue_t *q;
-
-      if (shmem_hdr == 0)
-	return;
-
-      q = shmem_hdr->vl_input_queue;
-      if (q == 0)
-	return;
-      cursizep = &q->cursize;
-    }
-
-  if (*cursizep >= 1)
-    {
-      vm->queue_signal_pending = 1;
-      vm->api_queue_nonempty = 1;
-      vlib_process_signal_event (vm, memclnt_node.index,
-				 /* event_type */ 0, /* event_data */ 0);
-    }
-}
-
-void
-vl_enable_disable_memory_api (vlib_main_t * vm, int enable)
-{
-  vlib_node_set_state (vm, memclnt_node.index,
-		       (enable
-			? VLIB_NODE_STATE_POLLING
-			: VLIB_NODE_STATE_DISABLED));
-}
-
-static uword
-api_rx_from_node (vlib_main_t * vm,
-		  vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  uword n_packets = frame->n_vectors;
-  uword n_left_from;
-  u32 *from;
-  static u8 *long_msg;
-
-  vec_validate (long_msg, 4095);
-  n_left_from = frame->n_vectors;
-  from = vlib_frame_args (frame);
-
-  while (n_left_from > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      void *msg;
-      uword msg_len;
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      from += 1;
-      n_left_from -= 1;
-
-      msg = b0->data + b0->current_data;
-      msg_len = b0->current_length;
-      if (b0->flags & VLIB_BUFFER_NEXT_PRESENT)
-	{
-	  ASSERT (long_msg != 0);
-	  _vec_len (long_msg) = 0;
-	  vec_add (long_msg, msg, msg_len);
-	  while (b0->flags & VLIB_BUFFER_NEXT_PRESENT)
-	    {
-	      b0 = vlib_get_buffer (vm, b0->next_buffer);
-	      msg = b0->data + b0->current_data;
-	      msg_len = b0->current_length;
-	      vec_add (long_msg, msg, msg_len);
-	    }
-	  msg = long_msg;
-	}
-      vl_msg_api_handler_no_trace_no_free (msg);
-    }
-
-  /* Free what we've been given. */
-  vlib_buffer_free (vm, vlib_frame_args (frame), n_packets);
-
-  return n_packets;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (api_rx_from_node_node,static) = {
-    .function = api_rx_from_node,
-    .type = VLIB_NODE_TYPE_INTERNAL,
-    .vector_size = 4,
-    .name = "api-rx-from-node",
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-setup_memclnt_exit (vlib_main_t * vm)
-{
-  atexit (vl_unmap_shmem);
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (setup_memclnt_exit);
-
-
-static clib_error_t *
-vl_api_ring_command (vlib_main_t * vm,
-		     unformat_input_t * input, vlib_cli_command_t * cli_cmd)
-{
-  int i;
-  ring_alloc_t *ap;
-  vl_shmem_hdr_t *shmem_hdr;
-  api_main_t *am = &api_main;
-
-  shmem_hdr = am->shmem_hdr;
-
-  if (shmem_hdr == 0)
-    {
-      vlib_cli_output (vm, "Shared memory segment not initialized...\n");
-      return 0;
-    }
-
-  vlib_cli_output (vm, "%8s %8s %8s %8s %8s\n",
-		   "Owner", "Size", "Nitems", "Hits", "Misses");
-
-  ap = shmem_hdr->vl_rings;
-
-  for (i = 0; i < vec_len (shmem_hdr->vl_rings); i++)
-    {
-      vlib_cli_output (vm, "%8s %8d %8d %8d %8d\n",
-		       "vlib", ap->size, ap->nitems, ap->hits, ap->misses);
-      ap++;
-    }
-
-  ap = shmem_hdr->client_rings;
-
-  for (i = 0; i < vec_len (shmem_hdr->client_rings); i++)
-    {
-      vlib_cli_output (vm, "%8s %8d %8d %8d %8d\n",
-		       "clnt", ap->size, ap->nitems, ap->hits, ap->misses);
-      ap++;
-    }
-
-  vlib_cli_output (vm, "%d ring miss fallback allocations\n",
-		   am->ring_misses);
-
-  vlib_cli_output (vm, "%d application restarts, %d reclaimed msgs\n",
-		   shmem_hdr->application_restarts,
-		   shmem_hdr->restart_reclaims);
-  return 0;
-}
-
-void dump_socket_clients (vlib_main_t * vm, api_main_t * am)
-  __attribute__ ((weak));
-
-void
-dump_socket_clients (vlib_main_t * vm, api_main_t * am)
-{
-}
-
-static clib_error_t *
-vl_api_client_command (vlib_main_t * vm,
-		       unformat_input_t * input, vlib_cli_command_t * cli_cmd)
-{
-  vl_api_registration_t **regpp, *regp;
-  unix_shared_memory_queue_t *q;
-  char *health;
-  api_main_t *am = &api_main;
-  u32 *confused_indices = 0;
-
-  if (!pool_elts (am->vl_clients))
-    goto socket_clients;
-  vlib_cli_output (vm, "Shared memory clients");
-  vlib_cli_output (vm, "%16s %8s %14s %18s %s",
-		   "Name", "PID", "Queue Length", "Queue VA", "Health");
-
-  /* *INDENT-OFF* */
-  pool_foreach (regpp, am->vl_clients,
-  ({
-    regp = *regpp;
-
-    if (regp)
-      {
-        q = regp->vl_input_queue;
-        if (kill (q->consumer_pid, 0) < 0)
-          {
-            health = "DEAD";
-          }
-        else
-          {
-            health = "alive";
-          }
-        vlib_cli_output (vm, "%16s %8d %14d 0x%016llx %s\n",
-                         regp->name, q->consumer_pid, q->cursize,
-                         q, health);
-      }
-    else
-      {
-        clib_warning ("NULL client registration index %d",
-                      regpp - am->vl_clients);
-        vec_add1 (confused_indices, regpp - am->vl_clients);
-      }
-  }));
-  /* *INDENT-ON* */
-
-  /* This should "never happen," but if it does, fix it... */
-  if (PREDICT_FALSE (vec_len (confused_indices) > 0))
-    {
-      int i;
-      for (i = 0; i < vec_len (confused_indices); i++)
-	{
-	  pool_put_index (am->vl_clients, confused_indices[i]);
-	}
-    }
-  vec_free (confused_indices);
-
-  if (am->missing_clients)
-    vlib_cli_output (vm, "%u messages with missing clients",
-		     am->missing_clients);
-socket_clients:
-  dump_socket_clients (vm, am);
-
-  return 0;
-}
-
-static clib_error_t *
-vl_api_status_command (vlib_main_t * vm,
-		       unformat_input_t * input, vlib_cli_command_t * cli_cmd)
-{
-  api_main_t *am = &api_main;
-
-  // check if rx_trace and tx_trace are not null pointers
-
-  if (am->rx_trace == 0)
-    {
-      vlib_cli_output (vm, "RX Trace disabled\n");
-    }
-  else
-    {
-      if (am->rx_trace->enabled == 0)
-	vlib_cli_output (vm, "RX Trace disabled\n");
-      else
-	vlib_cli_output (vm, "RX Trace enabled\n");
-    }
-
-  if (am->tx_trace == 0)
-    {
-      vlib_cli_output (vm, "TX Trace disabled\n");
-    }
-  else
-    {
-      if (am->tx_trace->enabled == 0)
-	vlib_cli_output (vm, "TX Trace disabled\n");
-      else
-	vlib_cli_output (vm, "TX Trace enabled\n");
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_show_api_command, static) = {
-    .path = "show api",
-    .short_help = "Show API information",
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_show_api_ring_command, static) = {
-    .path = "show api ring-stats",
-    .short_help = "Message ring statistics",
-    .function = vl_api_ring_command,
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_show_api_clients_command, static) = {
-    .path = "show api clients",
-    .short_help = "Client information",
-    .function = vl_api_client_command,
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_show_api_status_command, static) = {
-    .path = "show api status",
-    .short_help = "Show API trace status",
-    .function = vl_api_status_command,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-vl_api_message_table_command (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cli_cmd)
-{
-  api_main_t *am = &api_main;
-  int i;
-  int verbose = 0;
-
-  if (unformat (input, "verbose"))
-    verbose = 1;
-
-
-  if (verbose == 0)
-    vlib_cli_output (vm, "%-4s %s", "ID", "Name");
-  else
-    vlib_cli_output (vm, "%-4s %-40s %6s %7s", "ID", "Name", "Bounce",
-		     "MP-safe");
-
-  for (i = 1; i < vec_len (am->msg_names); i++)
-    {
-      if (verbose == 0)
-	{
-	  vlib_cli_output (vm, "%-4d %s", i,
-			   am->msg_names[i] ? am->msg_names[i] :
-			   "  [no handler]");
-	}
-      else
-	{
-	  vlib_cli_output (vm, "%-4d %-40s %6d %7d", i,
-			   am->msg_names[i] ? am->msg_names[i] :
-			   "  [no handler]", am->message_bounce[i],
-			   am->is_mp_safe[i]);
-	}
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_show_api_message_table_command, static) = {
-    .path = "show api message-table",
-    .short_help = "Message Table",
-    .function = vl_api_message_table_command,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-vl_api_trace_command (vlib_main_t * vm,
-		      unformat_input_t * input, vlib_cli_command_t * cli_cmd)
-{
-  u32 nitems = 1024;
-  vl_api_trace_which_t which = VL_API_TRACE_RX;
-  api_main_t *am = &api_main;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "rx nitems %u", &nitems) || unformat (input, "rx"))
-	goto configure;
-      else if (unformat (input, "tx nitems %u", &nitems)
-	       || unformat (input, "tx"))
-	{
-	  which = VL_API_TRACE_RX;
-	  goto configure;
-	}
-      else if (unformat (input, "on rx"))
-	{
-	  vl_msg_api_trace_onoff (am, VL_API_TRACE_RX, 1);
-	}
-      else if (unformat (input, "on tx"))
-	{
-	  vl_msg_api_trace_onoff (am, VL_API_TRACE_TX, 1);
-	}
-      else if (unformat (input, "on"))
-	{
-	  vl_msg_api_trace_onoff (am, VL_API_TRACE_RX, 1);
-	}
-      else if (unformat (input, "off"))
-	{
-	  vl_msg_api_trace_onoff (am, VL_API_TRACE_RX, 0);
-	  vl_msg_api_trace_onoff (am, VL_API_TRACE_TX, 0);
-	}
-      else if (unformat (input, "free"))
-	{
-	  vl_msg_api_trace_onoff (am, VL_API_TRACE_RX, 0);
-	  vl_msg_api_trace_onoff (am, VL_API_TRACE_TX, 0);
-	  vl_msg_api_trace_free (am, VL_API_TRACE_RX);
-	  vl_msg_api_trace_free (am, VL_API_TRACE_TX);
-	}
-      else if (unformat (input, "debug on"))
-	{
-	  am->msg_print_flag = 1;
-	}
-      else if (unformat (input, "debug off"))
-	{
-	  am->msg_print_flag = 0;
-	}
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  return 0;
-
-configure:
-  if (vl_msg_api_trace_configure (am, which, nitems))
-    {
-      vlib_cli_output (vm, "warning: trace configure error (%d, %d)",
-		       which, nitems);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (trace, static) = {
-    .path = "set api-trace",
-    .short_help = "API trace",
-    .function = vl_api_trace_command,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-vlibmemory_init (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-  svm_map_region_args_t _a, *a = &_a;
-
-  memset (a, 0, sizeof (*a));
-  a->root_path = am->root_path;
-  a->name = SVM_GLOBAL_REGION_NAME;
-  a->baseva = (am->global_baseva != 0) ?
-    am->global_baseva : SVM_GLOBAL_REGION_BASEVA;
-  a->size = (am->global_size != 0) ? am->global_size : SVM_GLOBAL_REGION_SIZE;
-  a->flags = SVM_FLAGS_NODATA;
-  a->uid = am->api_uid;
-  a->gid = am->api_gid;
-  a->pvt_heap_size =
-    (am->global_pvt_heap_size !=
-     0) ? am->global_pvt_heap_size : SVM_PVT_MHEAP_SIZE;
-
-  svm_region_init_args (a);
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (vlibmemory_init);
-
-void
-vl_set_memory_region_name (char *name)
-{
-  api_main_t *am = &api_main;
-
-  am->region_name = name;
-}
-
-static int
-range_compare (vl_api_msg_range_t * a0, vl_api_msg_range_t * a1)
-{
-  int len0, len1, clen;
-
-  len0 = vec_len (a0->name);
-  len1 = vec_len (a1->name);
-  clen = len0 < len1 ? len0 : len1;
-  return (strncmp ((char *) a0->name, (char *) a1->name, clen));
-}
-
-static u8 *
-format_api_msg_range (u8 * s, va_list * args)
-{
-  vl_api_msg_range_t *rp = va_arg (*args, vl_api_msg_range_t *);
-
-  if (rp == 0)
-    s = format (s, "%-20s%9s%9s", "Name", "First-ID", "Last-ID");
-  else
-    s = format (s, "%-20s%9d%9d", rp->name, rp->first_msg_id,
-		rp->last_msg_id);
-
-  return s;
-}
-
-static clib_error_t *
-vl_api_show_plugin_command (vlib_main_t * vm,
-			    unformat_input_t * input,
-			    vlib_cli_command_t * cli_cmd)
-{
-  api_main_t *am = &api_main;
-  vl_api_msg_range_t *rp = 0;
-  int i;
-
-  if (vec_len (am->msg_ranges) == 0)
-    {
-      vlib_cli_output (vm, "No plugin API message ranges configured...");
-      return 0;
-    }
-
-  rp = vec_dup (am->msg_ranges);
-
-  vec_sort_with_function (rp, range_compare);
-
-  vlib_cli_output (vm, "Plugin API message ID ranges...\n");
-  vlib_cli_output (vm, "%U", format_api_msg_range, 0 /* header */ );
-
-  for (i = 0; i < vec_len (rp); i++)
-    vlib_cli_output (vm, "%U", format_api_msg_range, rp + i);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_show_api_plugin_command, static) = {
-    .path = "show api plugin",
-    .short_help = "show api plugin",
-    .function = vl_api_show_plugin_command,
-};
-/* *INDENT-ON* */
-
-static void
-vl_api_rpc_call_t_handler (vl_api_rpc_call_t * mp)
-{
-  vl_api_rpc_reply_t *rmp;
-  int (*fp) (void *);
-  i32 rv = 0;
-  vlib_main_t *vm = vlib_get_main ();
-
-  if (mp->function == 0)
-    {
-      rv = -1;
-      clib_warning ("rpc NULL function pointer");
-    }
-
-  else
-    {
-      if (mp->need_barrier_sync)
-	vlib_worker_thread_barrier_sync (vm);
-
-      fp = uword_to_pointer (mp->function, int (*)(void *));
-      rv = fp (mp->data);
-
-      if (mp->need_barrier_sync)
-	vlib_worker_thread_barrier_release (vm);
-    }
-
-  if (mp->send_reply)
-    {
-      unix_shared_memory_queue_t *q =
-	vl_api_client_index_to_input_queue (mp->client_index);
-      if (q)
-	{
-	  rmp = vl_msg_api_alloc_as_if_client (sizeof (*rmp));
-	  rmp->_vl_msg_id = ntohs (VL_API_RPC_REPLY);
-	  rmp->context = mp->context;
-	  rmp->retval = rv;
-	  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-	}
-    }
-  if (mp->multicast)
-    {
-      clib_warning ("multicast not yet implemented...");
-    }
-}
-
-static void
-vl_api_rpc_reply_t_handler (vl_api_rpc_reply_t * mp)
-{
-  clib_warning ("unimplemented");
-}
-
-void
-vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length)
-{
-  vl_api_rpc_call_t *mp;
-  api_main_t *am = &api_main;
-  vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
-  unix_shared_memory_queue_t *q;
-
-  /* Main thread: call the function directly */
-  if (os_get_cpu_number () == 0)
-    {
-      vlib_main_t *vm = vlib_get_main ();
-      void (*call_fp) (void *);
-
-      vlib_worker_thread_barrier_sync (vm);
-
-      call_fp = fp;
-      call_fp (data);
-
-      vlib_worker_thread_barrier_release (vm);
-      return;
-    }
-
-  /* Any other thread, actually do an RPC call... */
-  mp = vl_msg_api_alloc_as_if_client (sizeof (*mp) + data_length);
-
-  memset (mp, 0, sizeof (*mp));
-  clib_memcpy (mp->data, data, data_length);
-  mp->_vl_msg_id = ntohs (VL_API_RPC_CALL);
-  mp->function = pointer_to_uword (fp);
-  mp->need_barrier_sync = 1;
-
-  /*
-   * Use the "normal" control-plane mechanism for the main thread.
-   * Well, almost. if the main input queue is full, we cannot
-   * block. Otherwise, we can expect a barrier sync timeout.
-   */
-  q = shmem_hdr->vl_input_queue;
-
-  while (pthread_mutex_trylock (&q->mutex))
-    vlib_worker_thread_barrier_check ();
-
-  while (PREDICT_FALSE (unix_shared_memory_queue_is_full (q)))
-    {
-      pthread_mutex_unlock (&q->mutex);
-      vlib_worker_thread_barrier_check ();
-      while (pthread_mutex_trylock (&q->mutex))
-	vlib_worker_thread_barrier_check ();
-    }
-
-  vl_msg_api_send_shmem_nolock (q, (u8 *) & mp);
-
-  pthread_mutex_unlock (&q->mutex);
-}
-
-#define foreach_rpc_api_msg                     \
-_(RPC_CALL,rpc_call)                            \
-_(RPC_REPLY,rpc_reply)
-
-static clib_error_t *
-rpc_api_hookup (vlib_main_t * vm)
-{
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_noop_handler,			\
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 0 /* do not trace */);
-  foreach_rpc_api_msg;
-#undef _
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (rpc_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibmemory/unix_shared_memory_queue.c b/vlib-api/vlibmemory/unix_shared_memory_queue.c
deleted file mode 100644
index 25d28910..00000000
--- a/vlib-api/vlibmemory/unix_shared_memory_queue.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- *------------------------------------------------------------------
- * unix_shared_memory_queue.c - unidirectional shared-memory queues
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include <vppinfra/mem.h>
-#include <vppinfra/format.h>
-#include <vppinfra/cache.h>
-#include <vlibmemory/unix_shared_memory_queue.h>
-#include <signal.h>
-
-/*
- * unix_shared_memory_queue_init
- *
- * nels = number of elements on the queue
- * elsize = element size, presumably 4 and cacheline-size will
- *          be popular choices.
- * coid  = consumer coid, from ChannelCreate
- * pid   = consumer pid
- * pulse_code  = pulse code consumer expects
- * pulse_value = pulse value consumer expects
- * consumer_prio = consumer's priority, so pulses won't change
- *                 the consumer's priority.
- *
- * The idea is to call this function in the queue consumer,
- * and e-mail the queue pointer to the producer(s).
- *
- * The spp process / main thread allocates one of these
- * at startup; its main input queue. The spp main input queue
- * has a pointer to it in the shared memory segment header.
- *
- * You probably want to be on an svm data heap before calling this
- * function.
- */
-unix_shared_memory_queue_t *
-unix_shared_memory_queue_init (int nels,
-			       int elsize,
-			       int consumer_pid,
-			       int signal_when_queue_non_empty)
-{
-  unix_shared_memory_queue_t *q;
-  pthread_mutexattr_t attr;
-  pthread_condattr_t cattr;
-
-  q = clib_mem_alloc_aligned (sizeof (unix_shared_memory_queue_t)
-			      + nels * elsize, CLIB_CACHE_LINE_BYTES);
-  memset (q, 0, sizeof (*q));
-
-  q->elsize = elsize;
-  q->maxsize = nels;
-  q->consumer_pid = consumer_pid;
-  q->signal_when_queue_non_empty = signal_when_queue_non_empty;
-
-  memset (&attr, 0, sizeof (attr));
-  memset (&cattr, 0, sizeof (attr));
-
-  if (pthread_mutexattr_init (&attr))
-    clib_unix_warning ("mutexattr_init");
-  if (pthread_mutexattr_setpshared (&attr, PTHREAD_PROCESS_SHARED))
-    clib_unix_warning ("pthread_mutexattr_setpshared");
-  if (pthread_mutex_init (&q->mutex, &attr))
-    clib_unix_warning ("mutex_init");
-  if (pthread_mutexattr_destroy (&attr))
-    clib_unix_warning ("mutexattr_destroy");
-  if (pthread_condattr_init (&cattr))
-    clib_unix_warning ("condattr_init");
-  /* prints funny-looking messages in the Linux target */
-  if (pthread_condattr_setpshared (&cattr, PTHREAD_PROCESS_SHARED))
-    clib_unix_warning ("condattr_setpshared");
-  if (pthread_cond_init (&q->condvar, &cattr))
-    clib_unix_warning ("cond_init1");
-  if (pthread_condattr_destroy (&cattr))
-    clib_unix_warning ("cond_init2");
-
-  return (q);
-}
-
-/*
- * unix_shared_memory_queue_free
- */
-void
-unix_shared_memory_queue_free (unix_shared_memory_queue_t * q)
-{
-  (void) pthread_mutex_destroy (&q->mutex);
-  (void) pthread_cond_destroy (&q->condvar);
-  clib_mem_free (q);
-}
-
-void
-unix_shared_memory_queue_lock (unix_shared_memory_queue_t * q)
-{
-  pthread_mutex_lock (&q->mutex);
-}
-
-void
-unix_shared_memory_queue_unlock (unix_shared_memory_queue_t * q)
-{
-  pthread_mutex_unlock (&q->mutex);
-}
-
-int
-unix_shared_memory_queue_is_full (unix_shared_memory_queue_t * q)
-{
-  return q->cursize == q->maxsize;
-}
-
-/*
- * unix_shared_memory_queue_add_nolock
- */
-int
-unix_shared_memory_queue_add_nolock (unix_shared_memory_queue_t * q,
-				     u8 * elem)
-{
-  i8 *tailp;
-  int need_broadcast = 0;
-
-  if (PREDICT_FALSE (q->cursize == q->maxsize))
-    {
-      while (q->cursize == q->maxsize)
-	{
-	  (void) pthread_cond_wait (&q->condvar, &q->mutex);
-	}
-    }
-
-  tailp = (i8 *) (&q->data[0] + q->elsize * q->tail);
-  clib_memcpy (tailp, elem, q->elsize);
-
-  q->tail++;
-  q->cursize++;
-
-  need_broadcast = (q->cursize == 1);
-
-  if (q->tail == q->maxsize)
-    q->tail = 0;
-
-  if (need_broadcast)
-    {
-      (void) pthread_cond_broadcast (&q->condvar);
-      if (q->signal_when_queue_non_empty)
-	kill (q->consumer_pid, q->signal_when_queue_non_empty);
-    }
-  return 0;
-}
-
-int
-unix_shared_memory_queue_add_raw (unix_shared_memory_queue_t * q, u8 * elem)
-{
-  i8 *tailp;
-
-  if (PREDICT_FALSE (q->cursize == q->maxsize))
-    {
-      while (q->cursize == q->maxsize)
-	;
-    }
-
-  tailp = (i8 *) (&q->data[0] + q->elsize * q->tail);
-  clib_memcpy (tailp, elem, q->elsize);
-
-  q->tail++;
-  q->cursize++;
-
-  if (q->tail == q->maxsize)
-    q->tail = 0;
-  return 0;
-}
-
-
-/*
- * unix_shared_memory_queue_add
- */
-int
-unix_shared_memory_queue_add (unix_shared_memory_queue_t * q,
-			      u8 * elem, int nowait)
-{
-  i8 *tailp;
-  int need_broadcast = 0;
-
-  if (nowait)
-    {
-      /* zero on success */
-      if (pthread_mutex_trylock (&q->mutex))
-	{
-	  return (-1);
-	}
-    }
-  else
-    pthread_mutex_lock (&q->mutex);
-
-  if (PREDICT_FALSE (q->cursize == q->maxsize))
-    {
-      if (nowait)
-	{
-	  pthread_mutex_unlock (&q->mutex);
-	  return (-2);
-	}
-      while (q->cursize == q->maxsize)
-	{
-	  (void) pthread_cond_wait (&q->condvar, &q->mutex);
-	}
-    }
-
-  tailp = (i8 *) (&q->data[0] + q->elsize * q->tail);
-  clib_memcpy (tailp, elem, q->elsize);
-
-  q->tail++;
-  q->cursize++;
-
-  need_broadcast = (q->cursize == 1);
-
-  if (q->tail == q->maxsize)
-    q->tail = 0;
-
-  if (need_broadcast)
-    {
-      (void) pthread_cond_broadcast (&q->condvar);
-      if (q->signal_when_queue_non_empty)
-	kill (q->consumer_pid, q->signal_when_queue_non_empty);
-    }
-  pthread_mutex_unlock (&q->mutex);
-
-  return 0;
-}
-
-/*
- * unix_shared_memory_queue_sub
- */
-int
-unix_shared_memory_queue_sub (unix_shared_memory_queue_t * q,
-			      u8 * elem, int nowait)
-{
-  i8 *headp;
-  int need_broadcast = 0;
-
-  if (nowait)
-    {
-      /* zero on success */
-      if (pthread_mutex_trylock (&q->mutex))
-	{
-	  return (-1);
-	}
-    }
-  else
-    pthread_mutex_lock (&q->mutex);
-
-  if (PREDICT_FALSE (q->cursize == 0))
-    {
-      if (nowait)
-	{
-	  pthread_mutex_unlock (&q->mutex);
-	  return (-2);
-	}
-      while (q->cursize == 0)
-	{
-	  (void) pthread_cond_wait (&q->condvar, &q->mutex);
-	}
-    }
-
-  headp = (i8 *) (&q->data[0] + q->elsize * q->head);
-  clib_memcpy (elem, headp, q->elsize);
-
-  q->head++;
-  if (q->cursize == q->maxsize)
-    need_broadcast = 1;
-
-  q->cursize--;
-
-  if (q->head == q->maxsize)
-    q->head = 0;
-
-  if (need_broadcast)
-    (void) pthread_cond_broadcast (&q->condvar);
-
-  pthread_mutex_unlock (&q->mutex);
-
-  return 0;
-}
-
-int
-unix_shared_memory_queue_sub_raw (unix_shared_memory_queue_t * q, u8 * elem)
-{
-  i8 *headp;
-
-  if (PREDICT_FALSE (q->cursize == 0))
-    {
-      while (q->cursize == 0)
-	;
-    }
-
-  headp = (i8 *) (&q->data[0] + q->elsize * q->head);
-  clib_memcpy (elem, headp, q->elsize);
-
-  q->head++;
-  q->cursize--;
-
-  if (q->head == q->maxsize)
-    q->head = 0;
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibmemory/unix_shared_memory_queue.h b/vlib-api/vlibmemory/unix_shared_memory_queue.h
deleted file mode 100644
index f758f17c..00000000
--- a/vlib-api/vlibmemory/unix_shared_memory_queue.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *------------------------------------------------------------------
- * unix_shared_memory_queue.h - shared-memory queues
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#ifndef included_unix_shared_memory_queue_h
-#define included_unix_shared_memory_queue_h
-
-#include <pthread.h>
-#include <vppinfra/mem.h>
-
-typedef struct _unix_shared_memory_queue
-{
-  pthread_mutex_t mutex;	/* 8 bytes */
-  pthread_cond_t condvar;	/* 8 bytes */
-  int head;
-  int tail;
-  int cursize;
-  int maxsize;
-  int elsize;
-  int consumer_pid;
-  int signal_when_queue_non_empty;
-  char data[0];
-} unix_shared_memory_queue_t;
-
-unix_shared_memory_queue_t *unix_shared_memory_queue_init (int nels,
-							   int elsize,
-							   int consumer_pid,
-							   int
-							   signal_when_queue_non_empty);
-void unix_shared_memory_queue_free (unix_shared_memory_queue_t * q);
-int unix_shared_memory_queue_add (unix_shared_memory_queue_t * q,
-				  u8 * elem, int nowait);
-int unix_shared_memory_queue_sub (unix_shared_memory_queue_t * q,
-				  u8 * elem, int nowait);
-void unix_shared_memory_queue_lock (unix_shared_memory_queue_t * q);
-void unix_shared_memory_queue_unlock (unix_shared_memory_queue_t * q);
-int unix_shared_memory_queue_is_full (unix_shared_memory_queue_t * q);
-int unix_shared_memory_queue_add_nolock (unix_shared_memory_queue_t * q,
-					 u8 * elem);
-
-int unix_shared_memory_queue_sub_raw (unix_shared_memory_queue_t * q,
-				      u8 * elem);
-int unix_shared_memory_queue_add_raw (unix_shared_memory_queue_t * q,
-				      u8 * elem);
-
-#endif /* included_unix_shared_memory_queue_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibmemory/vl_memory_api_h.h b/vlib-api/vlibmemory/vl_memory_api_h.h
deleted file mode 100644
index c1ae79b1..00000000
--- a/vlib-api/vlibmemory/vl_memory_api_h.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *------------------------------------------------------------------
- * vl_memory_api_h.h - memory API headers, in a specific order.
- *
- * Copyright (c) 2009-2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-/*
- * Add to the bottom of the #include list, or elves will steal your
- * keyboard in the middle of the night!
- */
-#include <vlibmemory/memclnt.api.h>
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibmemory/vl_memory_msg_enum.h b/vlib-api/vlibmemory/vl_memory_msg_enum.h
deleted file mode 100644
index 974c0c21..00000000
--- a/vlib-api/vlibmemory/vl_memory_msg_enum.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *------------------------------------------------------------------
- * vl_memory_msg_enum.h - Our view of how to number API messages
- * Clients have their own view, which has to agree with ours.
- *
- * Copyright (c) 2009-2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#ifndef __VL_MSG_ENUM_H__
-#define __VL_MSG_ENUM_H__
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum
-{
-  VL_ILLEGAL_MESSAGE_ID = 0,
-#include <vlibmemory/vl_memory_api_h.h>
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* __VL_MSG_ENUM_H__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibsocket/api.h b/vlib-api/vlibsocket/api.h
deleted file mode 100644
index 79c0d08a..00000000
--- a/vlib-api/vlibsocket/api.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *------------------------------------------------------------------
- * api.h
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#ifndef included_vlibsocket_api_h
-#define included_vlibsocket_api_h
-
-#include <vlibapi/api.h>
-
-typedef struct
-{
-  /* Server port number */
-  int portno;
-
-  /* By default, localhost... */
-  u32 bind_address;
-
-  /*
-   * (listen, server, client) registrations. Shared memory
-   * registrations are in shared memory
-   */
-  vl_api_registration_t *registration_pool;
-  /*
-   * Chain-drag variables, so message API handlers
-   * (generally) don't know whether they're talking to a socket
-   * or to a shared-memory connection.
-   */
-  vl_api_registration_t *current_rp;
-  unix_file_t *current_uf;
-  /* One input buffer, shared across all sockets */
-  i8 *input_buffer;
-} socket_main_t;
-
-extern socket_main_t socket_main;
-
-void socksvr_add_pending_output (struct unix_file *uf,
-				 struct vl_api_registration_ *cf,
-				 u8 * buffer, uword buffer_bytes);
-
-#define SOCKSVR_DEFAULT_PORT 32741	/* whatever */
-
-void vl_free_socket_registration_index (u32 pool_index);
-void vl_socket_process_msg (struct unix_file *uf,
-			    struct vl_api_registration_ *rp, i8 * input_v);
-clib_error_t *vl_socket_read_ready (struct unix_file *uf);
-void vl_socket_add_pending_output (struct unix_file *uf,
-				   struct vl_api_registration_ *rp,
-				   u8 * buffer, uword buffer_bytes);
-clib_error_t *vl_socket_write_ready (struct unix_file *uf);
-void vl_socket_api_send (vl_api_registration_t * rp, u8 * elem);
-void vl_socket_api_send_with_data (vl_api_registration_t * rp,
-				   u8 * elem, u8 * data_vector);
-void vl_socket_api_send_with_length (vl_api_registration_t * rp,
-				     u8 * elem, u32 msg_length);
-void vl_socket_api_send_with_length_no_free (vl_api_registration_t * rp,
-					     u8 * elem, u32 msg_length);
-u32 sockclnt_open_index (char *client_name, char *hostname, int port);
-void sockclnt_close_index (u32 index);
-void vl_client_msg_api_send (vl_api_registration_t * cm, u8 * elem);
-vl_api_registration_t *sockclnt_get_registration (u32 index);
-void socksvr_set_port (u16 port);
-void socksvr_set_bind_address (u32 bind_address);
-
-#endif /* included_vlibsocket_api_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibsocket/sock_test.c b/vlib-api/vlibsocket/sock_test.c
deleted file mode 100644
index 3bded08f..00000000
--- a/vlib-api/vlibsocket/sock_test.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-
-#define SOCKCLNT_SERVER_PORT 32741	/* whatever */
-
-typedef signed char i8;
-typedef signed short i16;
-typedef signed int i32;
-typedef signed long long i64;
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-typedef unsigned long long u64;
-typedef unsigned long uword;
-
-#define VL_API_PACKED(x) x __attribute__ ((packed))
-
-typedef VL_API_PACKED (struct _vl_api_sockclnt_create
-		       {
-		       u16 _vl_msg_id; u8 name[64];
-		       u32 context;
-		       }) vl_api_sockclnt_create_t;
-
-typedef VL_API_PACKED (struct _vl_api_sockclnt_create_reply
-		       {
-		       u16 _vl_msg_id;
-		       i32 response; u64 handle; u32 index; u32 context;
-		       }) vl_api_sockclnt_create_reply_t;
-
-typedef VL_API_PACKED (struct _vl_api_sockclnt_delete
-		       {
-		       u16 _vl_msg_id; u32 index;
-		       u64 handle;
-		       }) vl_api_sockclnt_delete_t;
-
-typedef VL_API_PACKED (struct _vl_api_sockclnt_delete_reply
-		       {
-		       u16 _vl_msg_id; i32 response; u64 handle;
-		       }) vl_api_sockclnt_delete_reply_t;
-
-void
-error (char *msg)
-{
-  perror (msg);
-  exit (0);
-}
-
-int
-main (int argc, char *argv[])
-{
-  int sockfd, portno, n;
-  struct sockaddr_in serv_addr;
-  struct hostent *server;
-  char buffer[256];
-  int i;
-  u32 nbytes;
-  vl_api_sockclnt_create_t *mp;
-  vl_api_sockclnt_create_reply_t *rp;
-  char *rdptr;
-  int total_bytes;
-
-  for (i = 0; i < 1; i++)
-    {
-      portno = SOCKCLNT_SERVER_PORT;
-      sockfd = socket (AF_INET, SOCK_STREAM, 0);
-      if (sockfd < 0)
-	error ("ERROR opening socket");
-      server = gethostbyname ("localhost");
-      if (server == NULL)
-	{
-	  fprintf (stderr, "ERROR, no such host\n");
-	  exit (0);
-	}
-      bzero ((char *) &serv_addr, sizeof (serv_addr));
-      serv_addr.sin_family = AF_INET;
-      bcopy ((char *) server->h_addr,
-	     (char *) &serv_addr.sin_addr.s_addr, server->h_length);
-      serv_addr.sin_port = htons (portno);
-      if (connect (sockfd, (const void *) &serv_addr, sizeof (serv_addr)) < 0)
-	error ("ERROR connecting");
-
-      memset (buffer, 0, sizeof (buffer));
-
-      mp = (vl_api_sockclnt_create_t *) buffer;
-      mp->_vl_msg_id = ntohs (8);	/* VL_API_SOCKCLNT_CREATE */
-      strncpy ((char *) mp->name, "socket-test", sizeof (mp->name) - 1);
-      mp->name[sizeof (mp->name) - 1] = 0;
-      mp->context = 0xfeedface;
-      /* length of the message, including the length itself */
-      nbytes = sizeof (*mp) + sizeof (nbytes);
-      nbytes = ntohl (nbytes);
-      n = write (sockfd, &nbytes, sizeof (nbytes));
-      if (n < 0)
-	error ("ERROR writing len to socket");
-      n = write (sockfd, mp, sizeof (*mp));
-      if (n < 0)
-	error ("ERROR writing msg to socket");
-
-      memset (buffer, 0, sizeof (buffer));
-
-      total_bytes = 0;
-      rdptr = buffer;
-      do
-	{
-	  n = read (sockfd, rdptr, sizeof (buffer) - (rdptr - buffer));
-	  if (n < 0)
-	    error ("ERROR reading from socket");
-	  printf ("read %d bytes\n", n);
-	  total_bytes += n;
-	  rdptr += n;
-	}
-      while (total_bytes < sizeof (vl_api_sockclnt_create_reply_t) + 4);
-
-      rp = (vl_api_sockclnt_create_reply_t *) (buffer + 4);
-      /* VL_API_SOCKCLNT_CREATE_REPLY */
-      if (ntohs (rp->_vl_msg_id) != 9)
-	{
-	  printf ("WARNING: msg id %d\n", ntohs (rp->_vl_msg_id));
-	}
-
-      printf ("response %d, handle 0x%llx, index %d, context 0x%x\n",
-	      ntohl (rp->response), rp->handle, rp->index, rp->context);
-      close (sockfd);
-    }
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibsocket/sockclnt.api b/vlib-api/vlibsocket/sockclnt.api
deleted file mode 100644
index e0a7505f..00000000
--- a/vlib-api/vlibsocket/sockclnt.api
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Hey Emacs use -*- mode: C -*- */
-
-/* 
- *------------------------------------------------------------------
- * sockclnt.api - API message(s) to hook up clients, pass traffic
- * to client processes via TCP sockets
- * 
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-/*
- * Create a socket client registration 
- */
-define sockclnt_create {
-    u8 name[64];                /* for show, find by name, whatever */
-    u32 context;                /* opaque value to be returned in the reply */
-};
-
-define sockclnt_create_reply {
-    i32 response;               /* Non-negative = success */
-    u64 handle;           	/* handle by which vlib knows this client */
-    u32 index;                  /* index, used e.g. by API trace replay */
-    u32 context;                /* opaque value from the create request */
-};
-
-/*
- * Delete a client registration 
- */
-define sockclnt_delete {
-    u32 index;                  /* index, used e.g. by API trace replay */
-    u64 handle;               	/* handle by which vlib knows this client */
-};
-
-define sockclnt_delete_reply {
-    i32 response;               /* Non-negative = success */
-    u64 handle;               	/* in case the client wonders */
-};
-
diff --git a/vlib-api/vlibsocket/sockclnt_vlib.c b/vlib-api/vlibsocket/sockclnt_vlib.c
deleted file mode 100644
index e16adfeb..00000000
--- a/vlib-api/vlibsocket/sockclnt_vlib.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *------------------------------------------------------------------
- * sockclnt_vlib.c
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <sys/ioctl.h>
-#include <vppinfra/byte_order.h>
-#include <netdb.h>
-
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-
-#include <vlibsocket/vl_socket_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vlibsocket/vl_socket_api_h.h>
-#undef vl_typedefs
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vlibsocket/vl_socket_api_h.h>
-#undef vl_printfun
-
-/* instantiate all the endian swap functions we know about */
-#define vl_endianfun
-#include <vlibsocket/vl_socket_api_h.h>
-#undef vl_endianfun
-
-static void
-vl_api_sockclnt_create_reply_t_handler (vl_api_sockclnt_create_reply_t * mp)
-{
-  vl_api_registration_t *rp = socket_main.current_rp;
-
-  rp->server_handle = mp->handle;
-  rp->server_index = mp->index;
-}
-
-static void
-vl_api_sockclnt_delete_reply_t_handler (vl_api_sockclnt_delete_reply_t * mp)
-{
-  unix_main_t *um = &unix_main;
-  unix_file_t *uf = socket_main.current_uf;
-  vl_api_registration_t *rp = socket_main.current_rp;
-
-  unix_file_del (um, uf);
-  vl_free_socket_registration_index (rp->vl_api_registration_pool_index);
-}
-
-u32
-sockclnt_open_index (char *client_name, char *hostname, int port)
-{
-  vl_api_registration_t *rp;
-  unix_main_t *um = &unix_main;
-  unix_file_t template = { 0 };
-  int sockfd;
-  int one = 1;
-  int rv;
-  struct sockaddr_in serv_addr;
-  struct hostent *server;
-  vl_api_sockclnt_create_t *mp;
-  char my_hostname[64];
-
-  server = gethostbyname (hostname);
-  if (server == NULL)
-    {
-      clib_warning ("Couldn't translate server name %s", hostname);
-      return ~0;
-    }
-
-  /* Set up non-blocking server socket on CLIENT_API_SERVER_PORT */
-  sockfd = socket (AF_INET, SOCK_STREAM, 0);
-
-  if (sockfd < 0)
-    {
-      clib_unix_warning ("socket");
-      return ~0;
-    }
-
-  bzero ((char *) &serv_addr, sizeof (serv_addr));
-  serv_addr.sin_family = AF_INET;
-  bcopy ((char *) server->h_addr,
-	 (char *) &serv_addr.sin_addr.s_addr, server->h_length);
-  serv_addr.sin_port = htons (port);
-
-  if (connect (sockfd, (const void *) &serv_addr, sizeof (serv_addr)) < 0)
-    {
-      clib_unix_warning ("Connect failure to (%s, %d)", hostname, port);
-      close (sockfd);
-      return ~0;
-    }
-
-  rv = ioctl (sockfd, FIONBIO, &one);
-  if (rv < 0)
-    {
-      clib_unix_warning ("FIONBIO");
-      close (sockfd);
-      return ~0;
-    }
-
-  pool_get (socket_main.registration_pool, rp);
-  memset (rp, 0, sizeof (*rp));
-  rp->registration_type = REGISTRATION_TYPE_SOCKET_CLIENT;
-  rp->vl_api_registration_pool_index = rp - socket_main.registration_pool;
-
-  template.read_function = vl_socket_read_ready;
-  template.write_function = vl_socket_write_ready;
-  template.file_descriptor = sockfd;
-  template.private_data = rp - socket_main.registration_pool;
-
-  rp->unix_file_index = unix_file_add (um, &template);
-  rp->name = format (0, "%s:%d", hostname, port);
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SOCKCLNT_CREATE);
-  mp->context = rp - socket_main.registration_pool;
-
-  if (gethostname (my_hostname, sizeof (my_hostname)) < 0)
-    {
-      clib_unix_warning ("gethostname");
-      strncpy (my_hostname, "unknown!", sizeof (my_hostname) - 1);
-    }
-  strncpy ((char *) mp->name, my_hostname, sizeof (mp->name) - 1);
-
-  vl_msg_api_send (rp, (u8 *) mp);
-  return rp - socket_main.registration_pool;
-}
-
-void
-sockclnt_close_index (u32 index)
-{
-  vl_api_sockclnt_delete_t *mp;
-  vl_api_registration_t *rp;
-
-  /* Don't crash / assert if fed garbage */
-  if (pool_is_free_index (socket_main.registration_pool, index))
-    {
-      clib_warning ("registration_pool index %d already free", index);
-      return;
-    }
-  rp = pool_elt_at_index (socket_main.registration_pool, index);
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SOCKCLNT_DELETE);
-  mp->handle = rp->server_handle;
-  mp->index = rp->server_index;
-  vl_msg_api_send (rp, (u8 *) mp);
-}
-
-vl_api_registration_t *
-sockclnt_get_registration (u32 index)
-{
-  return pool_elt_at_index (socket_main.registration_pool, index);
-}
-
-/*
- * Both rx and tx msgs MUST be initialized, or we'll have
- * precisely no idea how many bytes to write into the API trace...
- */
-#define foreach_sockclnt_api_msg                        \
-_(SOCKCLNT_CREATE_REPLY, sockclnt_create_reply)         \
-_(SOCKCLNT_DELETE_REPLY, sockclnt_delete_reply)
-
-
-static clib_error_t *
-sockclnt_vlib_api_init (vlib_main_t * vm)
-{
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_sockclnt_api_msg;
-#undef _
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (sockclnt_vlib_api_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibsocket/socksvr_vlib.c b/vlib-api/vlibsocket/socksvr_vlib.c
deleted file mode 100644
index dc8c63eb..00000000
--- a/vlib-api/vlibsocket/socksvr_vlib.c
+++ /dev/null
@@ -1,706 +0,0 @@
-/*
- *------------------------------------------------------------------
- * socksvr_vlib.c
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/ioctl.h>
-#include <vppinfra/byte_order.h>
-
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#include <vlibsocket/api.h>
-#include <vlibmemory/api.h>
-
-#include <vlibsocket/vl_socket_msg_enum.h>	/* enumerate all vlib messages */
-
-#define vl_typedefs		/* define message structures */
-#include <vlibsocket/vl_socket_api_h.h>
-#undef vl_typedefs
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vlibsocket/vl_socket_api_h.h>
-#undef vl_printfun
-
-/* instantiate all the endian swap functions we know about */
-#define vl_endianfun
-#include <vlibsocket/vl_socket_api_h.h>
-#undef vl_endianfun
-
-socket_main_t socket_main;
-
-void
-dump_socket_clients (vlib_main_t * vm, api_main_t * am)
-{
-  vl_api_registration_t *reg;
-  socket_main_t *sm = &socket_main;
-  unix_main_t *um = &unix_main;
-  unix_file_t *f;
-
-  /*
-   * Must have at least one active client, not counting the
-   * REGISTRATION_TYPE_SOCKET_LISTEN bind/accept socket
-   */
-  if (pool_elts (sm->registration_pool) < 2)
-    return;
-
-  vlib_cli_output (vm, "TCP socket clients");
-  vlib_cli_output (vm, "%16s %8s", "Name", "Fildesc");
-    /* *INDENT-OFF* */
-    pool_foreach (reg, sm->registration_pool,
-    ({
-        if (reg->registration_type == REGISTRATION_TYPE_SOCKET_SERVER) {
-            f = pool_elt_at_index (um->file_pool, reg->unix_file_index);
-            vlib_cli_output (vm, "%16s %8d",
-                             reg->name, f->file_descriptor);
-        }
-    }));
-/* *INDENT-ON* */
-}
-
-void
-vl_socket_api_send (vl_api_registration_t * rp, u8 * elem)
-{
-  u32 nbytes = 4;		/* for the length... */
-  u16 msg_id = ntohs (*(u16 *) elem);
-  u32 msg_length;
-  u32 tmp;
-  api_main_t *am = &api_main;
-
-  ASSERT (rp->registration_type > REGISTRATION_TYPE_SHMEM);
-
-  if (msg_id >= vec_len (am->api_trace_cfg))
-    {
-      clib_warning ("id out of range: %d", msg_id);
-      vl_msg_api_free ((void *) elem);
-      return;
-    }
-
-  msg_length = am->api_trace_cfg[msg_id].size;
-  nbytes += msg_length;
-  tmp = clib_host_to_net_u32 (nbytes);
-
-  vl_socket_add_pending_output (rp->unix_file_index
-				+ unix_main.file_pool,
-				rp->vl_api_registration_pool_index
-				+ socket_main.registration_pool,
-				(u8 *) & tmp, sizeof (tmp));
-  vl_socket_add_pending_output (rp->unix_file_index
-				+ unix_main.file_pool,
-				rp->vl_api_registration_pool_index
-				+ socket_main.registration_pool,
-				elem, msg_length);
-  vl_msg_api_free ((void *) elem);
-}
-
-void
-vl_socket_api_send_with_data (vl_api_registration_t * rp,
-			      u8 * elem, u8 * data_vector)
-{
-  u32 nbytes = 4;		/* for the length... */
-  u16 msg_id = ntohs (*(u16 *) elem);
-  u32 msg_length;
-  u32 tmp;
-  api_main_t *am = &api_main;
-
-  ASSERT (rp->registration_type > REGISTRATION_TYPE_SHMEM);
-
-  if (msg_id >= vec_len (am->api_trace_cfg))
-    {
-      clib_warning ("id out of range: %d", msg_id);
-      vec_free (data_vector);
-      vl_msg_api_free ((void *) elem);
-      return;
-    }
-
-  msg_length = am->api_trace_cfg[msg_id].size;
-  nbytes += msg_length;
-  nbytes += vec_len (data_vector);
-
-  /* Length in network byte order */
-  tmp = clib_host_to_net_u32 (nbytes);
-
-  vl_socket_add_pending_output (rp->unix_file_index
-				+ unix_main.file_pool,
-				rp->vl_api_registration_pool_index
-				+ socket_main.registration_pool,
-				(u8 *) & tmp, sizeof (tmp));
-  vl_socket_add_pending_output (rp->unix_file_index
-				+ unix_main.file_pool,
-				rp->vl_api_registration_pool_index
-				+ socket_main.registration_pool,
-				elem, msg_length);
-  vl_socket_add_pending_output (rp->unix_file_index
-				+ unix_main.file_pool,
-				rp->vl_api_registration_pool_index
-				+ socket_main.registration_pool,
-				data_vector, vec_len (data_vector));
-  vl_msg_api_free ((void *) elem);
-}
-
-static inline void
-vl_socket_api_send_with_length_internal (vl_api_registration_t * rp,
-					 u8 * elem, u32 msg_length, int free)
-{
-  u32 nbytes = 4;		/* for the length... */
-  u16 msg_id = ntohs (*(u16 *) elem);
-  u32 tmp;
-  api_main_t *am = &api_main;
-
-  ASSERT (rp->registration_type > REGISTRATION_TYPE_SHMEM);
-
-  if (msg_id >= vec_len (am->api_trace_cfg))
-    {
-      clib_warning ("id out of range: %d", msg_id);
-      if (free)
-	vl_msg_api_free ((void *) elem);
-      return;
-    }
-
-  nbytes += msg_length;
-
-  /* Length in network byte order */
-  tmp = clib_host_to_net_u32 (nbytes);
-
-  vl_socket_add_pending_output (rp->unix_file_index
-				+ unix_main.file_pool,
-				rp->vl_api_registration_pool_index
-				+ socket_main.registration_pool,
-				(u8 *) & tmp, sizeof (tmp));
-  vl_socket_add_pending_output (rp->unix_file_index
-				+ unix_main.file_pool,
-				rp->vl_api_registration_pool_index
-				+ socket_main.registration_pool,
-				elem, msg_length);
-  if (free)
-    vl_msg_api_free ((void *) elem);
-}
-
-void
-vl_socket_api_send_with_length (vl_api_registration_t * rp,
-				u8 * elem, u32 msg_length)
-{
-  vl_socket_api_send_with_length_internal (rp, elem, msg_length,
-					   1 /* free */ );
-}
-
-void
-vl_socket_api_send_with_length_no_free (vl_api_registration_t * rp,
-					u8 * elem, u32 msg_length)
-{
-  vl_socket_api_send_with_length_internal (rp, elem, msg_length,
-					   0 /* free */ );
-}
-
-void
-vl_free_socket_registration_index (u32 pool_index)
-{
-  vl_api_registration_t *rp;
-  if (pool_is_free_index (socket_main.registration_pool, pool_index))
-    {
-      clib_warning ("main pool index %d already free", pool_index);
-      return;
-    }
-  rp = pool_elt_at_index (socket_main.registration_pool, pool_index);
-
-  ASSERT (rp->registration_type != REGISTRATION_TYPE_FREE);
-  vec_free (rp->name);
-  vec_free (rp->unprocessed_input);
-  vec_free (rp->output_vector);
-  rp->registration_type = REGISTRATION_TYPE_FREE;
-  pool_put (socket_main.registration_pool, rp);
-}
-
-static inline void
-socket_process_msg (unix_file_t * uf, vl_api_registration_t * rp,
-		    i8 * input_v)
-{
-  u8 *the_msg = (u8 *) (input_v + sizeof (u32));
-  socket_main.current_uf = uf;
-  socket_main.current_rp = rp;
-  vl_msg_api_socket_handler (the_msg);
-  socket_main.current_uf = 0;
-  socket_main.current_rp = 0;
-}
-
-clib_error_t *
-vl_socket_read_ready (unix_file_t * uf)
-{
-  unix_main_t *um = &unix_main;
-  vl_api_registration_t *rp;
-  int n;
-  i8 *msg_buffer = 0;
-  u32 msg_len;
-  u32 save_input_buffer_length = vec_len (socket_main.input_buffer);
-
-  rp = pool_elt_at_index (socket_main.registration_pool, uf->private_data);
-
-  n = read (uf->file_descriptor, socket_main.input_buffer,
-	    vec_len (socket_main.input_buffer));
-
-  if (n <= 0 && errno != EAGAIN)
-    {
-      unix_file_del (um, uf);
-
-      if (!pool_is_free (socket_main.registration_pool, rp))
-	{
-	  u32 index = rp - socket_main.registration_pool;
-	  vl_free_socket_registration_index (index);
-	}
-      else
-	{
-	  clib_warning ("client index %d already free?",
-			rp->vl_api_registration_pool_index);
-	}
-      return 0;
-    }
-
-  _vec_len (socket_main.input_buffer) = n;
-
-  /*
-   * Look for bugs here. This code is tricky because
-   * data read from a stream socket does honor message
-   * boundaries. In the case of a long message (>4K bytes)
-   * we have to do (at least) 2 reads, etc.
-   */
-  do
-    {
-      if (vec_len (rp->unprocessed_input))
-	{
-	  vec_append (rp->unprocessed_input, socket_main.input_buffer);
-	  msg_buffer = rp->unprocessed_input;
-	  msg_len = rp->unprocessed_msg_length;
-	}
-      else
-	{
-	  msg_buffer = socket_main.input_buffer;
-	  msg_len = 0;
-	}
-
-      if (msg_len == 0)
-	{
-	  /* Length may be split across two reads */
-	  if (vec_len (msg_buffer) < sizeof (u32))
-	    goto save_and_split;
-
-	  /* total length, including msg_len itself, in network byte order */
-	  msg_len = clib_net_to_host_u32 (*((u32 *) msg_buffer));
-	}
-
-      /* Happens if the client sent msg_len == 0 */
-      if (msg_len == 0)
-	{
-	  clib_warning ("msg_len == 0");
-	  goto turf_it;
-	}
-
-      /* We don't have the entire message yet. */
-      if (msg_len > vec_len (msg_buffer))
-	{
-	save_and_split:
-	  /*
-	   * if we were using the shared input buffer,
-	   * save the fragment.
-	   */
-	  if (msg_buffer == socket_main.input_buffer)
-	    {
-	      ASSERT (vec_len (rp->unprocessed_input) == 0);
-	      vec_validate (rp->unprocessed_input, vec_len (msg_buffer) - 1);
-	      clib_memcpy (rp->unprocessed_input, msg_buffer,
-			   vec_len (msg_buffer));
-	      _vec_len (rp->unprocessed_input) = vec_len (msg_buffer);
-	    }
-	  _vec_len (socket_main.input_buffer) = save_input_buffer_length;
-	  rp->unprocessed_msg_length = msg_len;
-	  return 0;
-	}
-
-      socket_process_msg (uf, rp, msg_buffer);
-      if (n > msg_len)
-	vec_delete (msg_buffer, msg_len, 0);
-      else
-	_vec_len (msg_buffer) = 0;
-      n -= msg_len;
-      msg_len = 0;
-      rp->unprocessed_msg_length = 0;
-    }
-  while (n > 0);
-
-turf_it:
-  _vec_len (socket_main.input_buffer) = save_input_buffer_length;
-
-  return 0;
-}
-
-void
-vl_socket_add_pending_output (unix_file_t * uf,
-			      vl_api_registration_t * rp,
-			      u8 * buffer, uword buffer_bytes)
-{
-  unix_main_t *um = &unix_main;
-
-  vec_add (rp->output_vector, buffer, buffer_bytes);
-  if (vec_len (rp->output_vector) > 0)
-    {
-      int skip_update = 0 != (uf->flags & UNIX_FILE_DATA_AVAILABLE_TO_WRITE);
-      uf->flags |= UNIX_FILE_DATA_AVAILABLE_TO_WRITE;
-      if (!skip_update)
-	um->file_update (uf, UNIX_FILE_UPDATE_MODIFY);
-    }
-}
-
-static void
-socket_del_pending_output (unix_file_t * uf,
-			   vl_api_registration_t * rp, uword n_bytes)
-{
-  unix_main_t *um = &unix_main;
-
-  vec_delete (rp->output_vector, n_bytes, 0);
-  if (vec_len (rp->output_vector) <= 0)
-    {
-      int skip_update = 0 == (uf->flags & UNIX_FILE_DATA_AVAILABLE_TO_WRITE);
-      uf->flags &= ~UNIX_FILE_DATA_AVAILABLE_TO_WRITE;
-      if (!skip_update)
-	um->file_update (uf, UNIX_FILE_UPDATE_MODIFY);
-    }
-}
-
-clib_error_t *
-vl_socket_write_ready (unix_file_t * uf)
-{
-  unix_main_t *um = &unix_main;
-  vl_api_registration_t *rp;
-  int n;
-
-  rp = pool_elt_at_index (socket_main.registration_pool, uf->private_data);
-
-  /* Flush output vector. */
-  n = write (uf->file_descriptor,
-	     rp->output_vector, vec_len (rp->output_vector));
-
-  if (n < 0)
-    {
-#if DEBUG > 2
-      clib_warning ("write error, close the file...\n");
-#endif
-      unix_file_del (um, uf);
-
-      vl_free_socket_registration_index (rp - socket_main.registration_pool);
-      return 0;
-    }
-
-  else if (n > 0)
-    socket_del_pending_output (uf, rp, n);
-
-  return 0;
-}
-
-clib_error_t *
-vl_socket_error_ready (unix_file_t * uf)
-{
-  vl_api_registration_t *rp;
-  unix_main_t *um = &unix_main;
-
-  rp = pool_elt_at_index (socket_main.registration_pool, uf->private_data);
-  unix_file_del (um, uf);
-  vl_free_socket_registration_index (rp - socket_main.registration_pool);
-
-  return 0;
-}
-
-void
-socksvr_file_add (unix_main_t * um, int fd)
-{
-  vl_api_registration_t *rp;
-  unix_file_t template = { 0 };
-
-  pool_get (socket_main.registration_pool, rp);
-  memset (rp, 0, sizeof (*rp));
-
-  template.read_function = vl_socket_read_ready;
-  template.write_function = vl_socket_write_ready;
-  template.error_function = vl_socket_error_ready;
-  template.file_descriptor = fd;
-  template.private_data = rp - socket_main.registration_pool;
-
-  rp->registration_type = REGISTRATION_TYPE_SOCKET_SERVER;
-  rp->vl_api_registration_pool_index = rp - socket_main.registration_pool;
-  rp->unix_file_index = unix_file_add (um, &template);
-}
-
-static clib_error_t *
-socksvr_accept_ready (unix_file_t * uf)
-{
-  unix_main_t *um = &unix_main;
-  struct sockaddr_in client_addr;
-  int client_fd;
-  int client_len;
-
-  client_len = sizeof (client_addr);
-
-  /*
-   * Supposedly acquires the non-blocking attrib from the
-   * server socket.
-   */
-  client_fd = accept (uf->file_descriptor,
-		      (struct sockaddr *) &client_addr,
-		      (socklen_t *) & client_len);
-
-  if (client_fd < 0)
-    return clib_error_return_unix (0, "socksvr_accept_ready: accept");
-
-  socksvr_file_add (um, client_fd);
-  return 0;
-}
-
-static clib_error_t *
-socksvr_bogus_write (unix_file_t * uf)
-{
-  clib_warning ("why am I here?");
-  return 0;
-}
-
-/*
- * vl_api_sockclnt_create_t_handler
- */
-void
-vl_api_sockclnt_create_t_handler (vl_api_sockclnt_create_t * mp)
-{
-  vl_api_registration_t *regp;
-  vl_api_sockclnt_create_reply_t *rp;
-  int rv = 1;
-
-  regp = socket_main.current_rp;
-
-  ASSERT (regp->registration_type == REGISTRATION_TYPE_SOCKET_SERVER);
-
-  regp->name = format (0, "%s%c", mp->name, 0);
-
-  rp = vl_msg_api_alloc (sizeof (*rp));
-  rp->_vl_msg_id = htons (VL_API_SOCKCLNT_CREATE_REPLY);
-  rp->handle = (uword) regp;
-  rp->index = (uword) regp->vl_api_registration_pool_index;
-  rp->context = mp->context;
-  rp->response = htonl (rv);
-
-  vl_msg_api_send (regp, (u8 *) rp);
-}
-
-/*
- * vl_api_sockclnt_delete_t_handler
- */
-void
-vl_api_sockclnt_delete_t_handler (vl_api_sockclnt_delete_t * mp)
-{
-  vl_api_registration_t *regp;
-  vl_api_sockclnt_delete_reply_t *rp;
-
-  if (!pool_is_free_index (socket_main.registration_pool, mp->index))
-    {
-      regp = pool_elt_at_index (socket_main.registration_pool, mp->index);
-
-      rp = vl_msg_api_alloc (sizeof (*rp));
-      rp->_vl_msg_id = htons (VL_API_SOCKCLNT_DELETE_REPLY);
-      rp->handle = mp->handle;
-      rp->response = htonl (1);
-
-      vl_msg_api_send (regp, (u8 *) rp);
-
-      unix_file_del (&unix_main, unix_main.file_pool + regp->unix_file_index);
-
-      vl_free_socket_registration_index (mp->index);
-    }
-  else
-    {
-      clib_warning ("unknown client ID %d", mp->index);
-    }
-}
-
-#define foreach_vlib_api_msg                    \
-_(SOCKCLNT_CREATE, sockclnt_create)             \
-_(SOCKCLNT_DELETE, sockclnt_delete)
-
-static clib_error_t *
-socksvr_api_init (vlib_main_t * vm)
-{
-  unix_main_t *um = &unix_main;
-  unix_file_t template = { 0 };
-  int sockfd;
-  int one = 1;
-  int rv;
-  struct sockaddr_in serv_addr;
-  vl_api_registration_t *rp;
-  u16 portno;
-  u32 bind_address;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vlib_api_msg;
-#undef _
-
-  vec_resize (socket_main.input_buffer, 4096);
-
-  /* Set up non-blocking server socket on CLIENT_API_SERVER_PORT */
-  sockfd = socket (AF_INET, SOCK_STREAM, 0);
-
-  if (sockfd < 0)
-    {
-      return clib_error_return_unix (0, "socket");
-    }
-
-  rv = ioctl (sockfd, FIONBIO, &one);
-  if (rv < 0)
-    {
-      close (sockfd);
-      return clib_error_return_unix (0, "FIONBIO");
-    }
-
-  rv = setsockopt (sockfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof (one));
-  if (rv < 0)
-    {
-      close (sockfd);
-      return clib_error_return_unix (0, "SO_REUSEADDR");
-    }
-
-  bzero ((char *) &serv_addr, sizeof (serv_addr));
-  serv_addr.sin_family = AF_INET;
-
-  if (socket_main.bind_address)
-    bind_address = socket_main.bind_address;
-  else
-    bind_address = INADDR_LOOPBACK;
-
-  if (socket_main.portno)
-    portno = socket_main.portno;
-  else
-    portno = SOCKSVR_DEFAULT_PORT;
-
-  serv_addr.sin_port = clib_host_to_net_u16 (portno);
-  serv_addr.sin_addr.s_addr = clib_host_to_net_u32 (bind_address);
-
-  if (bind (sockfd, (struct sockaddr *) &serv_addr, sizeof (serv_addr)) < 0)
-    {
-      close (sockfd);
-      return clib_error_return_unix (0, "bind");
-    }
-
-  rv = listen (sockfd, 5);
-  if (rv < 0)
-    {
-      close (sockfd);
-      return clib_error_return_unix (0, "listen");
-    }
-
-  pool_get (socket_main.registration_pool, rp);
-  memset (rp, 0, sizeof (*rp));
-
-  rp->registration_type = REGISTRATION_TYPE_SOCKET_LISTEN;
-
-  template.read_function = socksvr_accept_ready;
-  template.write_function = socksvr_bogus_write;
-  template.file_descriptor = sockfd;
-  template.private_data = rp - socket_main.registration_pool;
-
-  rp->unix_file_index = unix_file_add (um, &template);
-  return 0;
-}
-
-static clib_error_t *
-socket_exit (vlib_main_t * vm)
-{
-  unix_main_t *um = &unix_main;
-  vl_api_registration_t *rp;
-
-  /* Defensive driving in case something wipes out early */
-  if (socket_main.registration_pool)
-    {
-      u32 index;
-        /* *INDENT-OFF* */
-        pool_foreach (rp, socket_main.registration_pool, ({
-            unix_file_del (um, um->file_pool + rp->unix_file_index);
-            index = rp->vl_api_registration_pool_index;
-            vl_free_socket_registration_index (index);
-        }));
-/* *INDENT-ON* */
-    }
-
-  return 0;
-}
-
-VLIB_MAIN_LOOP_EXIT_FUNCTION (socket_exit);
-
-static clib_error_t *
-socksvr_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  int portno;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "port %d", &portno))
-	{
-	  socket_main.portno = portno;
-	}
-      else
-	{
-	  return clib_error_return (0, "unknown input '%U'",
-				    format_unformat_error, input);
-	}
-    }
-  return socksvr_api_init (vm);
-}
-
-VLIB_CONFIG_FUNCTION (socksvr_config, "socksvr");
-
-/* argument in host byte order */
-void
-socksvr_set_port (u16 port)
-{
-  socket_main.portno = port;
-}
-
-/* argument in host byte order */
-void
-socksvr_set_bind_address (u32 bind_address)
-{
-  socket_main.bind_address = bind_address;
-}
-
-clib_error_t *
-vlibsocket_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (vlibsocket_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibsocket/vl_socket_api_h.h b/vlib-api/vlibsocket/vl_socket_api_h.h
deleted file mode 100644
index 7fc53cef..00000000
--- a/vlib-api/vlibsocket/vl_socket_api_h.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *------------------------------------------------------------------
- * vl_socket_api_h.h - all API headers, in a specific order.
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-/*
- * Add to the bottom of the #include list, or elves will steal your
- * keyboard in the middle of the night!
- */
-#include <vlibmemory/vl_memory_api_h.h>
-#include <vlibsocket/sockclnt.api.h>
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib-api/vlibsocket/vl_socket_msg_enum.h b/vlib-api/vlibsocket/vl_socket_msg_enum.h
deleted file mode 100644
index cdc61a5b..00000000
--- a/vlib-api/vlibsocket/vl_socket_msg_enum.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *------------------------------------------------------------------
- * vl_msg_enum.h - Our view of how to number API messages
- * Clients have their own view, which has to agree with ours.
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#ifndef __VL_MSG_ENUM_H__
-#define __VL_MSG_ENUM_H__
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum
-{
-  VL_ILLEGAL_MESSAGE_ID = 0,
-#include <vlibsocket/vl_socket_api_h.h>
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* __VL_MSG_ENUM_H__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/.gitignore b/vlib/.gitignore
deleted file mode 100644
index b25c15b8..00000000
--- a/vlib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
diff --git a/vlib/Makefile.am b/vlib/Makefile.am
deleted file mode 100644
index 3da0a3ab..00000000
--- a/vlib/Makefile.am
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall @DPDK@
-
-PRE_DATA_SIZE=@PRE_DATA_SIZE@
-
-lib_LTLIBRARIES = libvlib.la
-
-BUILT_SOURCES = vlib/config.h
-
-vlib/config.h:
-	echo "#define __PRE_DATA_SIZE" $(PRE_DATA_SIZE) > $@
-
-libvlib_la_SOURCES =				\
-  vlib/buffer.c					\
-  vlib/cli.c					\
-  vlib/cli.h					\
-  vlib/config.h					\
-  vlib/counter.c				\
-  vlib/error.c					\
-  vlib/format.c					\
-  vlib/i2c.c					\
-  vlib/init.c					\
-  vlib/main.c					\
-  vlib/mc.c					\
-  vlib/node.c					\
-  vlib/node_cli.c				\
-  vlib/node_format.c				\
-  vlib/pci/pci.c				\
-  vlib/pci/linux_pci.c				\
-  vlib/threads.c				\
-  vlib/threads_cli.c				\
-  vlib/trace.c
-
-nobase_include_HEADERS =			\
-  vlib/buffer_funcs.h				\
-  vlib/buffer_node.h				\
-  vlib/buffer.h					\
-  vlib/cli.h					\
-  vlib/cli_funcs.h				\
-  vlib/config.h					\
-  vlib/counter.h				\
-  vlib/defs.h					\
-  vlib/error_funcs.h				\
-  vlib/error.h					\
-  vlib/format_funcs.h				\
-  vlib/global_funcs.h				\
-  vlib/i2c.h					\
-  vlib/init.h					\
-  vlib/main.h					\
-  vlib/mc.h					\
-  vlib/node_funcs.h				\
-  vlib/node.h					\
-  vlib/physmem.h				\
-  vlib/pci/pci.h				\
-  vlib/pci/pci_config.h				\
-  vlib/threads.h				\
-  vlib/trace_funcs.h				\
-  vlib/trace.h					\
-  vlib/vlib.h
-
-lib_LTLIBRARIES += libvlib_unix.la
-
-libvlib_unix_la_SOURCES =			\
-  vlib/unix/cj.c				\
-  vlib/unix/cli.c				\
-  vlib/unix/input.c				\
-  vlib/unix/main.c				\
-  vlib/unix/mc_socket.c				\
-  vlib/unix/plugin.c				\
-  vlib/unix/plugin.h				\
-  vlib/unix/physmem.c				\
-  vlib/unix/util.c
-
-nobase_include_HEADERS +=			\
-  vlib/unix/cj.h				\
-  vlib/unix/mc_socket.h				\
-  vlib/unix/physmem.h				\
-  vlib/unix/plugin.h				\
-  vlib/unix/unix.h
-    
-if !WITH_DPDK
-noinst_PROGRAMS = vlib_unix 
-
-vlib_unix_SOURCES =				\
-  example/main_stub.c				\
-  example/mc_test.c
-
-vlib_unix_LDADD = libvlib_unix.la libvlib.la \
-	          -lvppinfra -lpthread -lm -ldl -lrt
-endif
diff --git a/vlib/configure.ac b/vlib/configure.ac
deleted file mode 100644
index f7079e64..00000000
--- a/vlib/configure.ac
+++ /dev/null
@@ -1,25 +0,0 @@
-AC_INIT(vlib, 1.1)
-LT_INIT
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-AC_ARG_WITH(dpdk,
-            AC_HELP_STRING([--with-dpdk],[Use DPDK]),
-            [with_dpdk=1],
-            [with_dpdk=0])
-
-AC_ARG_WITH(pre-data,
-            AC_HELP_STRING([--with-pre-data],[Set buffer rewrite space]),
-	    [case $with_pre_data in
-	       128) ;;
-	       256) ;;
-               *) with_pre_data="pre-data-not-set" ;;
-	     esac], [with_pre_data=128])
-
-AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1")
-AC_SUBST(DPDK,[-DDPDK=${with_dpdk}])
-AC_SUBST(PRE_DATA_SIZE,[$with_pre_data])
-
-AC_OUTPUT([Makefile])
diff --git a/vlib/dir.dox b/vlib/dir.dox
deleted file mode 100644
index 99027f6c..00000000
--- a/vlib/dir.dox
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Doxygen directory documentation */
-/**
-@dir
-@brief VLIB application library.
-*/
diff --git a/vlib/example/dir.dox b/vlib/example/dir.dox
deleted file mode 100644
index d3ac0ee4..00000000
--- a/vlib/example/dir.dox
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Doxygen directory documentation */
-/**
-@dir
-@brief Someone please fix this description
-@todo This directory needs a description.
-*/
diff --git a/vlib/example/main_stub.c b/vlib/example/main_stub.c
deleted file mode 100644
index 4d74bd77..00000000
--- a/vlib/example/main_stub.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <math.h>
-
-int
-main (int argc, char *argv[])
-{
-  return vlib_unix_main (argc, argv);
-}
-
-static clib_error_t *
-main_stub_init (vlib_main_t * vm)
-{
-  clib_error_t *error;
-
-  if ((error =
-       unix_physmem_init (vm, /* fail_if_physical_memory_not_present */ 0)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, unix_cli_init)))
-    return error;
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (main_stub_init);
-
-#if 0
-/* Node test code. */
-typedef struct
-{
-  int scalar;
-  int vector[0];
-} my_frame_t;
-
-static u8 *
-format_my_node_frame (u8 * s, va_list * va)
-{
-  vlib_frame_t *f = va_arg (*va, vlib_frame_t *);
-  my_frame_t *g = vlib_frame_args (f);
-  int i;
-
-  s = format (s, "scalar %d, vector { ", g->scalar);
-  for (i = 0; i < f->n_vectors; i++)
-    s = format (s, "%d, ", g->vector[i]);
-  s = format (s, " }");
-
-  return s;
-}
-
-static uword
-my_func (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  vlib_node_t *node;
-  my_frame_t *y;
-  u32 i, n_left = 0;
-  static int serial;
-  int verbose;
-
-  node = vlib_get_node (vm, rt->node_index);
-
-  verbose = 0;
-
-  if (verbose && f)
-    vlib_cli_output (vm, "%v: call frame %p %U", node->name,
-		     f, format_my_node_frame, f);
-
-  if (rt->n_next_nodes > 0)
-    {
-      vlib_frame_t *next = vlib_get_next_frame (vm, rt, /* next index */ 0);
-      n_left = VLIB_FRAME_SIZE - next->n_vectors;
-      y = vlib_frame_args (next);
-      y->scalar = serial++;
-    }
-  else
-    y = 0;
-
-  for (i = 0; i < 5; i++)
-    {
-      if (y)
-	{
-	  ASSERT (n_left > 0);
-	  n_left--;
-	  y->vector[i] = y->scalar + i;
-	}
-    }
-  if (y)
-    vlib_put_next_frame (vm, rt, /* next index */ 0, n_left);
-
-  if (verbose)
-    vlib_cli_output (vm, "%v: return frame %p", node->name, f);
-
-  return i;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (my_node1,static) = {
-  .function = my_func,
-  .type = VLIB_NODE_TYPE_INPUT,
-  .name = "my-node1",
-  .scalar_size = sizeof (my_frame_t),
-  .vector_size = STRUCT_SIZE_OF (my_frame_t, vector[0]),
-  .n_next_nodes = 1,
-  .next_nodes = {
-    [0] = "my-node2",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (my_node2,static) = {
-  .function = my_func,
-  .name = "my-node2",
-  .scalar_size = sizeof (my_frame_t),
-  .vector_size = STRUCT_SIZE_OF (my_frame_t, vector[0]),
-};
-/* *INDENT-ON* */
-
-#endif
-
-#if 0
-
-typedef enum
-{
-  MY_EVENT_TYPE1,
-  MY_EVENT_TYPE2,
-} my_process_completion_type_t;
-
-typedef struct
-{
-  int a;
-  f64 b;
-} my_process_event_data_t;
-
-static u8 *
-format_my_process_event_data (u8 * s, va_list * va)
-{
-  my_process_event_data_t *d = va_arg (*va, my_process_event_data_t *);
-  return format (s, "{ a %d b %.6f}", d->a, d->b);
-}
-
-static uword
-my_proc (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  vlib_node_t *node;
-  u32 i;
-
-  node = vlib_get_node (vm, rt->node_index);
-
-  vlib_cli_output (vm, "%v: call frame %p", node->name, f);
-
-  for (i = 0; i < 5; i++)
-    {
-      vlib_cli_output (vm, "%v: %d", node->name, i);
-      vlib_process_suspend (vm, 1e0 /* secs */ );
-    }
-
-  vlib_cli_output (vm, "%v: return frame %p", node->name, f);
-
-  if (0)
-    {
-      uword n_events_seen, type, *data = 0;
-
-      for (n_events_seen = 0; n_events_seen < 2;)
-	{
-	  vlib_process_wait_for_event (vm);
-	  type = vlib_process_get_events (vm, &data);
-	  n_events_seen += vec_len (data);
-	  vlib_cli_output (vm, "%U %v: completion #%d type %d data 0x%wx",
-			   format_time_interval, "h:m:s:u",
-			   vlib_time_now (vm), node->name, i, type, data[0]);
-	  _vec_len (data) = 0;
-	}
-
-      vec_free (data);
-    }
-  else
-    {
-      uword n_events_seen, i, type;
-      my_process_event_data_t *data;
-      for (n_events_seen = 0; n_events_seen < 2;)
-	{
-	  vlib_process_wait_for_event (vm);
-	  data = vlib_process_get_event_data (vm, &type);
-	  vec_foreach_index (i, data)
-	  {
-	    vlib_cli_output (vm, "%U event type %d data %U",
-			     format_time_interval, "h:m:s:u",
-			     vlib_time_now (vm), type,
-			     format_my_process_event_data, data);
-	  }
-	  n_events_seen += vec_len (data);
-	  vlib_process_put_event_data (vm, data);
-	}
-    }
-
-  return i;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (my_proc_node,static) = {
-  .function = my_proc,
-  .type = VLIB_NODE_TYPE_PROCESS,
-  .name = "my-proc",
-};
-/* *INDENT-ON* */
-
-static uword
-my_proc_input (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  static int i;
-
-  if (i++ < 2)
-    {
-      if (0)
-	vlib_process_signal_event (vm, my_proc_node.index,
-				   i == 1 ? MY_EVENT_TYPE1 : MY_EVENT_TYPE2,
-				   0x12340000 + i);
-      else
-	{
-	  my_process_event_data_t *d;
-	  f64 dt = 5;
-	  d = vlib_process_signal_event_at_time (vm,
-						 i * dt,
-						 my_proc_node.index,
-						 i ==
-						 1 ? MY_EVENT_TYPE1 :
-						 MY_EVENT_TYPE2,
-						 1 /* elts */ ,
-						 sizeof (d[0]));
-	  d->a = i;
-	  d->b = vlib_time_now (vm);
-	}
-    }
-  else
-    vlib_node_set_state (vm, rt->node_index, VLIB_NODE_STATE_DISABLED);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (my_proc_input_node,static) = {
-  .function = my_proc_input,
-  .type = VLIB_NODE_TYPE_INPUT,
-  .name = "my-proc-input",
-};
-/* *INDENT-ON* */
-
-static uword
-_unformat_farith (unformat_input_t * i, va_list * args)
-{
-  u32 prec = va_arg (*args, u32);
-  f64 *result = va_arg (*args, f64 *);
-  f64 tmp[2];
-
-  /* Binary operations in from lowest to highest precedence. */
-  char *binops[] = {
-    "+%U", "-%U", "/%U", "*%U", "^%U",
-  };
-
-  if (prec <= ARRAY_LEN (binops) - 1
-      && unformat_user (i, _unformat_farith, prec + 1, &tmp[0]))
-    {
-      int p;
-      for (p = prec; p < ARRAY_LEN (binops); p++)
-	{
-	  if (unformat (i, binops[p], _unformat_farith, prec + 0, &tmp[1]))
-	    {
-	      switch (binops[p][0])
-		{
-		case '+':
-		  result[0] = tmp[0] + tmp[1];
-		  break;
-		case '-':
-		  result[0] = tmp[0] - tmp[1];
-		  break;
-		case '/':
-		  result[0] = tmp[0] / tmp[1];
-		  break;
-		case '*':
-		  result[0] = tmp[0] * tmp[1];
-		  break;
-		case '^':
-		  result[0] = pow (tmp[0], tmp[1]);
-		  break;
-		default:
-		  abort ();
-		}
-	      return 1;
-	    }
-	}
-      result[0] = tmp[0];
-      return 1;
-    }
-
-  else if (unformat (i, "-%U", _unformat_farith, prec + 0, &tmp[0]))
-    {
-      result[0] = -tmp[0];
-      return 1;
-    }
-
-  else if (unformat (i, "(%U)", _unformat_farith, 0, &tmp[0]))
-    {
-      result[0] = tmp[0];
-      return 1;
-    }
-
-  else if (unformat (i, "%f", result))
-    return 1;
-
-  else
-    return 0;
-}
-
-static uword
-unformat_farith (unformat_input_t * i, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  f64 *result = va_arg (*args, f64 *);
-  return unformat_user (i, _unformat_farith, 0, result);
-}
-
-static uword
-unformat_integer (unformat_input_t * i, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  u32 *data = va_arg (*args, u32 *);
-  return unformat (i, "%d", data);
-}
-
-static VLIB_CLI_PARSE_RULE (my_parse_rule1) =
-{
-.name = "decimal_integer",.short_help =
-    "a decimal integer",.unformat_function = unformat_integer,.data_size =
-    sizeof (u32),};
-
-static VLIB_CLI_PARSE_RULE (my_parse_rule2) =
-{
-.name = "float_expression",.short_help =
-    "floating point expression",.unformat_function =
-    unformat_farith,.data_size = sizeof (f64),};
-
-static clib_error_t *
-bar_command (vlib_main_t * vm,
-	     unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  switch (cmd->function_arg)
-    {
-    case 2:
-      {
-	u32 *d, *e;
-	d = vlib_cli_get_parse_rule_result (vm, 0);
-	e = vlib_cli_get_parse_rule_result (vm, 1);
-	vlib_cli_output (vm, "bar2 %d %d", d[0], e[0]);
-	break;
-      }
-
-    case 1:
-      {
-	u32 *d = vlib_cli_get_parse_rule_result (vm, 0);
-	vlib_cli_output (vm, "bar1 %d", d[0]);
-	break;
-      }
-
-    case 3:
-      {
-	f64 *d = vlib_cli_get_parse_rule_result (vm, 0);
-	vlib_cli_output (vm, "expr %.6f", d[0]);
-      }
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (bar_command2, static) = {
-  .path = "bar %decimal_integer",
-  .short_help = "bar1 command",
-  .function = bar_command,
-  .function_arg = 1,
-};
-VLIB_CLI_COMMAND (bar_command1, static) = {
-  .path = "bar %decimal_integer %decimal_integer",
-  .short_help = "bar2 command",
-  .function = bar_command,
-  .function_arg = 2,
-};
-VLIB_CLI_COMMAND (bar_command3, static) = {
-  .path = "zap %float_expression",
-  .short_help = "bar3 command",
-  .function = bar_command,
-  .function_arg = 3,
-};
-/* *INDENT-ON* */
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/example/mc_test.c b/vlib/example/mc_test.c
deleted file mode 100644
index e84a713c..00000000
--- a/vlib/example/mc_test.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * mc_test.c: test program for vlib mc
- *
- * Copyright (c) 2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vlib/unix/mc_socket.h>
-#include <vppinfra/random.h>
-
-typedef struct
-{
-  u32 min_n_msg_bytes;
-  u32 max_n_msg_bytes;
-  u32 tx_serial;
-  u32 rx_serial;
-  u32 seed;
-  u32 verbose;
-  u32 validate;
-  u32 window_size;
-  f64 min_delay, max_delay;
-  f64 n_packets_to_send;
-} mc_test_main_t;
-
-always_inline u32
-choose_msg_size (mc_test_main_t * tm)
-{
-  u32 r = tm->min_n_msg_bytes;
-  if (tm->max_n_msg_bytes > tm->min_n_msg_bytes)
-    r +=
-      random_u32 (&tm->seed) % (1 + tm->max_n_msg_bytes -
-				tm->min_n_msg_bytes);
-  return r;
-}
-
-static mc_test_main_t mc_test_main;
-
-static void
-serialize_test_msg (serialize_main_t * m, va_list * va)
-{
-  mc_test_main_t *tm = &mc_test_main;
-  u32 n_bytes = choose_msg_size (tm);
-  u8 *msg;
-  int i;
-  serialize_integer (m, n_bytes, sizeof (n_bytes));
-  msg = serialize_get (m, n_bytes);
-  for (i = 0; i < n_bytes; i++)
-    msg[i] = i + tm->tx_serial;
-  tm->tx_serial += n_bytes;
-}
-
-static void
-unserialize_test_msg (serialize_main_t * m, va_list * va)
-{
-  mc_test_main_t *tm = &mc_test_main;
-  u32 i, n_bytes, dump_msg = tm->verbose;
-  u8 *p;
-  unserialize_integer (m, &n_bytes, sizeof (n_bytes));
-  p = unserialize_get (m, n_bytes);
-  if (tm->validate)
-    for (i = 0; i < n_bytes; i++)
-      if (p[i] != ((tm->rx_serial + i) & 0xff))
-	{
-	  clib_warning ("corrupt msg at offset %d", i);
-	  dump_msg = 1;
-	  break;
-	}
-  if (dump_msg)
-    clib_warning ("got %d bytes, %U", n_bytes, format_hex_bytes, p, n_bytes);
-  tm->rx_serial += n_bytes;
-}
-
-MC_SERIALIZE_MSG (test_msg, static) =
-{
-.name = "test_msg",.serialize = serialize_test_msg,.unserialize =
-    unserialize_test_msg,};
-
-#define SERIALIZE 1
-
-#define EVENT_JOIN_STREAM 	10
-#define EVENT_SEND_DATA 	11
-
-static void
-test_rx_callback (mc_main_t * mcm,
-		  mc_stream_t * stream,
-		  mc_peer_id_t peer_id, u32 buffer_index)
-{
-  if (SERIALIZE)
-    {
-      return mc_unserialize (mcm, stream, buffer_index);
-    }
-  else
-    {
-#if DEBUG > 1
-      vlib_main_t *vm = mcm->vlib_main;
-      vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
-      u8 *dp = vlib_buffer_get_current (b);
-
-      fformat (stdout, "RX from %U %U\n",
-	       stream->transport->format_peer_id, peer_id,
-	       format_hex_bytes, dp, tm->n_msg_bytes);
-
-#endif
-    }
-}
-
-static u8 *
-test_snapshot_callback (mc_main_t * mcm,
-			u8 * data_vector, u32 last_global_sequence_processed)
-{
-  if (SERIALIZE)
-    {
-      serialize_main_t m;
-
-      /* Append serialized data to data vector. */
-      serialize_open_vector (&m, data_vector);
-      m.stream.current_buffer_index = vec_len (data_vector);
-
-      return serialize_close_vector (&m);
-    }
-  else
-    return format (data_vector,
-		   "snapshot, last global seq 0x%x",
-		   last_global_sequence_processed);
-}
-
-static void
-test_handle_snapshot_callback (mc_main_t * mcm, u8 * data, u32 n_data_bytes)
-{
-  if (SERIALIZE)
-    {
-      serialize_main_t s;
-      unserialize_open_data (&s, data, n_data_bytes);
-    }
-  else
-    clib_warning ("snapshot `%*s'", n_data_bytes, data);
-}
-
-static mc_socket_main_t mc_socket_main;
-
-static uword
-mc_test_process (vlib_main_t * vm,
-		 vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  mc_test_main_t *tm = &mc_test_main;
-  mc_socket_main_t *msm = &mc_socket_main;
-  mc_main_t *mcm = &msm->mc_main;
-  uword event_type, *event_data = 0;
-  u32 data_serial = 0, stream_index;
-  f64 delay;
-  mc_stream_config_t config;
-  clib_error_t *error;
-  int i;
-  char *intfcs[] = { "eth1", "eth0", "ce" };
-
-  memset (&config, 0, sizeof (config));
-  config.name = "test";
-  config.window_size = tm->window_size;
-  config.rx_buffer = test_rx_callback;
-  config.catchup_snapshot = test_snapshot_callback;
-  config.catchup = test_handle_snapshot_callback;
-  stream_index = ~0;
-
-  msm->multicast_tx_ip4_address_host_byte_order = 0xefff0100;
-  msm->base_multicast_udp_port_host_byte_order = 0xffab;
-
-  error = mc_socket_main_init (&mc_socket_main, intfcs, ARRAY_LEN (intfcs));
-  if (error)
-    {
-      clib_error_report (error);
-      exit (1);
-    }
-
-  mcm->we_can_be_relay_master = 1;
-
-  while (1)
-    {
-      vlib_process_wait_for_event (vm);
-      event_type = vlib_process_get_events (vm, &event_data);
-
-      switch (event_type)
-	{
-	case EVENT_JOIN_STREAM:
-	  stream_index = mc_stream_join (mcm, &config);
-	  break;
-
-	case EVENT_SEND_DATA:
-	  {
-	    f64 times[2];
-
-	    if (stream_index == ~0)
-	      stream_index = mc_stream_join (mcm, &config);
-
-	    times[0] = vlib_time_now (vm);
-	    for (i = 0; i < event_data[0]; i++)
-	      {
-		u32 bi;
-		if (SERIALIZE)
-		  {
-		    mc_serialize_stream (mcm, stream_index, &test_msg,
-					 data_serial);
-		  }
-		else
-		  {
-		    u8 *mp;
-		    mp = mc_get_vlib_buffer (vm, sizeof (mp[0]), &bi);
-		    mp[0] = data_serial;
-		    mc_stream_send (mcm, stream_index, bi);
-		  }
-		if (tm->min_delay > 0)
-		  {
-		    delay =
-		      tm->min_delay +
-		      random_f64 (&tm->seed) * (tm->max_delay -
-						tm->min_delay);
-		    vlib_process_suspend (vm, delay);
-		  }
-		data_serial++;
-	      }
-	    times[1] = vlib_time_now (vm);
-	    clib_warning ("done sending %d; %.4e per sec",
-			  event_data[0],
-			  (f64) event_data[0] / (times[1] - times[0]));
-	    break;
-	  }
-
-	default:
-	  clib_warning ("bug");
-	  break;
-	}
-
-      if (event_data)
-	_vec_len (event_data) = 0;
-    }
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (mc_test_process_node, static) =
-{
-.function = mc_test_process,.type = VLIB_NODE_TYPE_PROCESS,.name =
-    "mc-test-process",};
-/* *INDENT-ON* */
-
-static clib_error_t *
-mc_test_command (vlib_main_t * vm,
-		 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  f64 npkts = 10;
-
-  if (unformat (input, "join"))
-    {
-      vlib_cli_output (vm, "Join stream...\n");
-      vlib_process_signal_event (vm, mc_test_process_node.index,
-				 EVENT_JOIN_STREAM, 0);
-      return 0;
-    }
-  else if (unformat (input, "send %f", &npkts) || unformat (input, "send"))
-    {
-      vlib_process_signal_event (vm, mc_test_process_node.index,
-				 EVENT_SEND_DATA, (uword) npkts);
-      vlib_cli_output (vm, "Send %.0f pkts...\n", npkts);
-
-      return 0;
-    }
-  else
-    return unformat_parse_error (input);
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (test_mc_command, static) =
-{
-.path = "test mc",.short_help = "Test mc command",.function =
-    mc_test_command,};
-/* *INDENT-ON* */
-
-static clib_error_t *
-mc_show_command (vlib_main_t * vm,
-		 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  mc_main_t *mcm = &mc_socket_main.mc_main;
-  vlib_cli_output (vm, "%U", format_mc_main, mcm);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_mc_command, static) =
-{
-.path = "show mc",.short_help = "Show mc command",.function =
-    mc_show_command,};
-/* *INDENT-ON* */
-
-static clib_error_t *
-mc_clear_command (vlib_main_t * vm,
-		  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  mc_main_t *mcm = &mc_socket_main.mc_main;
-  mc_clear_stream_stats (mcm);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (clear_mc_command, static) =
-{
-.path = "clear mc",.short_help = "Clear mc command",.function =
-    mc_clear_command,};
-/* *INDENT-ON* */
-
-static clib_error_t *
-mc_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  mc_test_main_t *tm = &mc_test_main;
-  mc_socket_main_t *msm = &mc_socket_main;
-  clib_error_t *error = 0;
-
-  tm->min_n_msg_bytes = 4;
-  tm->max_n_msg_bytes = 4;
-  tm->window_size = 8;
-  tm->seed = getpid ();
-  tm->verbose = 0;
-  tm->validate = 1;
-  tm->min_delay = 10e-6;
-  tm->max_delay = 10e-3;
-  tm->n_packets_to_send = 0;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "interface %s", &msm->multicast_interface_name))
-	;
-
-      else if (unformat (input, "n-bytes %d", &tm->max_n_msg_bytes))
-	tm->min_n_msg_bytes = tm->max_n_msg_bytes;
-      else if (unformat (input, "max-n-bytes %d", &tm->max_n_msg_bytes))
-	;
-      else if (unformat (input, "min-n-bytes %d", &tm->min_n_msg_bytes))
-	;
-      else if (unformat (input, "seed %d", &tm->seed))
-	;
-      else if (unformat (input, "window %d", &tm->window_size))
-	;
-      else if (unformat (input, "verbose"))
-	tm->verbose = 1;
-      else if (unformat (input, "no-validate"))
-	tm->validate = 0;
-      else if (unformat (input, "min-delay %f", &tm->min_delay))
-	;
-      else if (unformat (input, "max-delay %f", &tm->max_delay))
-	;
-      else if (unformat (input, "no-delay"))
-	tm->min_delay = tm->max_delay = 0;
-      else if (unformat (input, "n-packets %f", &tm->n_packets_to_send))
-	;
-
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-
-  if (tm->n_packets_to_send > 0)
-    vlib_process_signal_event (vm, mc_test_process_node.index,
-			       EVENT_SEND_DATA,
-			       (uword) tm->n_packets_to_send);
-
-  return error;
-}
-
-VLIB_CONFIG_FUNCTION (mc_config, "mc");
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/example/plex_test.c b/vlib/example/plex_test.c
deleted file mode 100644
index ce0c8ef1..00000000
--- a/vlib/example/plex_test.c
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/parse.h>
-#include <vlib/unix/unix.h>
-
-static u8 *
-format_value_v4_address (u8 * s, va_list * args)
-{
-  vlib_parse_value_t *v = va_arg (*args, vlib_parse_value_t *);
-  u32 a = v->value.as_uword;
-
-  s = format (s, "%d.%d.%d.%d",
-	      (a >> 24) & 0xFF,
-	      (a >> 16) & 0xFF, (a >> 8) & 0xFF, (a >> 0) & 0xFF);
-
-  return s;
-}
-
-static vlib_parse_match_t
-v4_address_match (vlib_parse_main_t * pm, vlib_parse_type_t * type,
-		  vlib_lex_token_t * t, vlib_parse_value_t * valuep)
-{
-  u32 digit;
-  u32 value = 0;
-  int i;
-
-  if (vec_len (pm->tokens) - (t - pm->tokens) < 7)
-    return VLIB_PARSE_MATCH_FAIL;
-
-  /* NUMBER DOT NUMBER DOT NUMBER DOT NUMBER */
-
-  for (i = 0; i < 7; i++)
-    {
-      if ((i & 1) == 0)
-	{
-	  if (t[i].token != VLIB_LEX_number)
-	    return VLIB_PARSE_MATCH_FAIL;
-	  if (t[i].value.as_uword > 0xff)
-	    return VLIB_PARSE_MATCH_FAIL;
-	  digit = t[i].value.as_uword;
-	  value = (value << 8) | digit;
-	}
-      else
-	{
-	  if (t[i].token != VLIB_LEX_dot)
-	    return VLIB_PARSE_MATCH_FAIL;
-	}
-    }
-  /* note: caller advances by 1 */
-  pm->current_token_index += 6;
-  valuep->value.as_uword = value;
-  return VLIB_PARSE_MATCH_VALUE;
-}
-
-PARSE_TYPE_INIT (v4_address, v4_address_match, 0, format_value_v4_address)
-     static u8 *format_value_v4_address_and_mask (u8 * s, va_list * args)
-{
-  vlib_parse_value_t *v = va_arg (*args, vlib_parse_value_t *);
-  u32 *a = v->value.as_pointer;
-
-  s = format (s, "%d.%d.%d.%d",
-	      (a[0] >> 24) & 0xFF,
-	      (a[0] >> 16) & 0xFF, (a[0] >> 8) & 0xFF, (a[0] >> 0) & 0xFF);
-  s = format (s, "/%d", a[1]);
-
-  return s;
-}
-
-static vlib_parse_match_t
-v4_address_and_mask_match (vlib_parse_main_t * pm, vlib_parse_type_t * type,
-			   vlib_lex_token_t * t, vlib_parse_value_t * valuep)
-{
-  u32 digit;
-  u32 address = 0;
-  u32 *rv = 0;
-  int i;
-
-  if (vec_len (pm->tokens) - (t - pm->tokens) < 9)
-    return VLIB_PARSE_MATCH_FAIL;
-
-  /* NUMBER DOT NUMBER DOT NUMBER DOT NUMBER */
-
-  for (i = 0; i < 7; i++)
-    {
-      if ((i & 1) == 0)
-	{
-	  if (t[i].token != VLIB_LEX_number)
-	    return VLIB_PARSE_MATCH_FAIL;
-	  if (t[i].value.as_uword > 0xff)
-	    return VLIB_PARSE_MATCH_FAIL;
-	  digit = t[i].value.as_uword;
-	  address = (address << 8) | digit;
-	}
-      else
-	{
-	  if (t[i].token != VLIB_LEX_dot)
-	    return VLIB_PARSE_MATCH_FAIL;
-	}
-    }
-
-  if (t[7].token != VLIB_LEX_slash || t[8].token != VLIB_LEX_number)
-    return VLIB_PARSE_MATCH_FAIL;
-
-  vec_add1 (rv, address);
-  vec_add1 (rv, t[8].value.as_uword);
-
-  /* note: caller advances by 1 */
-  pm->current_token_index += 8;
-  valuep->value.as_pointer = rv;
-  return VLIB_PARSE_MATCH_VALUE;
-}
-
-void
-v4_address_and_mask_cleanup (vlib_parse_value_t * valuep)
-{
-  u32 *trash = valuep->value.as_pointer;
-  vec_free (trash);
-}
-
-PARSE_TYPE_INIT (v4_address_and_mask, v4_address_and_mask_match,
-		 v4_address_and_mask_cleanup,
-		 format_value_v4_address_and_mask)
-     vlib_lex_main_t vlib_lex_main;
-
-
-
-     vlib_parse_match_t eval_factor0 (vlib_parse_main_t * pm,
-				      vlib_parse_item_t * item,
-				      vlib_parse_value_t * value)
-{
-  clib_warning ("%U", format_vlib_parse_value, pm);
-  return VLIB_PARSE_MATCH_RULE;
-}
-
-vlib_parse_match_t
-eval_factor1 (vlib_parse_main_t * pm,
-	      vlib_parse_item_t * item, vlib_parse_value_t * value)
-{
-  clib_warning ("%U", format_vlib_parse_value, pm);
-  return VLIB_PARSE_MATCH_RULE;
-}
-
-vlib_parse_match_t
-eval_factor2 (vlib_parse_main_t * pm,
-	      vlib_parse_item_t * item, vlib_parse_value_t * value)
-{
-  word a;
-  int index = vec_len (pm->parse_value) - 1;
-
-  a = pm->parse_value[index].value.as_word;
-
-  pm->parse_value[index].value.as_word = -a;
-  return VLIB_PARSE_MATCH_RULE;
-}
-
-vlib_parse_match_t
-eval_term0 (vlib_parse_main_t * pm,
-	    vlib_parse_item_t * item, vlib_parse_value_t * value)
-{
-  clib_warning ("%U", format_vlib_parse_value, pm);
-  return VLIB_PARSE_MATCH_RULE;
-}
-
-vlib_parse_match_t
-eval_term1 (vlib_parse_main_t * pm,
-	    vlib_parse_item_t * item, vlib_parse_value_t * value)
-{
-  uword a, b;
-  int index = vec_len (pm->parse_value) - 2;
-
-  a = pm->parse_value[index].value.as_uword;
-  b = pm->parse_value[index + 1].value.as_uword;
-
-  pm->parse_value[index].value.as_uword = a * b;
-  _vec_len (pm->parse_value) -= 1;
-  clib_warning ("%U", format_vlib_parse_value, pm);
-
-  return VLIB_PARSE_MATCH_RULE;
-}
-
-vlib_parse_match_t
-eval_term2 (vlib_parse_main_t * pm,
-	    vlib_parse_item_t * item, vlib_parse_value_t * value)
-{
-  uword a, b;
-  int index = vec_len (pm->parse_value) - 2;
-
-  a = pm->parse_value[index].value.as_uword;
-  b = pm->parse_value[index + 1].value.as_uword;
-
-  pm->parse_value[index].value.as_uword = a / b;
-  _vec_len (pm->parse_value) -= 1;
-  clib_warning ("%U", format_vlib_parse_value, pm);
-
-  return VLIB_PARSE_MATCH_RULE;
-}
-
-vlib_parse_match_t
-eval_exp0 (vlib_parse_main_t * pm,
-	   vlib_parse_item_t * item, vlib_parse_value_t * value)
-{
-  return VLIB_PARSE_MATCH_RULE;
-}
-
-vlib_parse_match_t
-eval_exp1 (vlib_parse_main_t * pm,
-	   vlib_parse_item_t * item, vlib_parse_value_t * value)
-{
-  uword a, b;
-  int index = vec_len (pm->parse_value) - 2;
-
-  a = pm->parse_value[index].value.as_uword;
-  b = pm->parse_value[index + 1].value.as_uword;
-
-  pm->parse_value[index].value.as_uword = a + b;
-  _vec_len (pm->parse_value) -= 1;
-  clib_warning ("%U", format_vlib_parse_value, pm);
-
-  return VLIB_PARSE_MATCH_RULE;
-}
-
-vlib_parse_match_t
-eval_exp2 (vlib_parse_main_t * pm,
-	   vlib_parse_item_t * item, vlib_parse_value_t * value)
-{
-  uword a, b;
-  int index = vec_len (pm->parse_value) - 2;
-
-  a = pm->parse_value[index].value.as_uword;
-  b = pm->parse_value[index + 1].value.as_uword;
-
-  pm->parse_value[index].value.as_uword = a - b;
-  _vec_len (pm->parse_value) -= 1;
-  clib_warning ("%U", format_vlib_parse_value, pm);
-
-  return VLIB_PARSE_MATCH_RULE;
-}
-
-vlib_parse_match_t
-eval_result (vlib_parse_main_t * pm,
-	     vlib_parse_item_t * item, vlib_parse_value_t * value)
-{
-  clib_warning ("%U", format_vlib_parse_value, pm);
-  return VLIB_PARSE_MATCH_DONE;
-}
-
-vlib_parse_match_t
-noop_match_rule (vlib_parse_main_t * pm,
-		 vlib_parse_item_t * item, vlib_parse_value_t * value)
-{
-  clib_warning ("%U", format_vlib_parse_value, pm);
-  return VLIB_PARSE_MATCH_RULE;
-}
-
-#if 0
-PARSE_INIT (t1, "moo", eval0);
-PARSE_INIT (t2, "moo cow mumble", eval1);
-PARSE_INIT (t3, "moo cow", eval2);
-PARSE_INIT (t4, "moo cow mumble grunch", eval3);
-#endif
-
-#if 0
-PARSE_INIT (r1, "eval <exp>", eval_result);
-
-PARSE_INIT (r2, "<exp> = <term><exp2>", eval_exp0);
-PARSE_INIT (r3, "<exp2> = <plus> <exp>", eval_exp1);
-PARSE_INIT (r4, "<exp2> = <minus> <exp>", eval_exp2);
-PARSE_INIT (r5, "<exp2> = ", noop_match_rule);
-PARSE_TYPE_INIT (exp, rule_match, 0, 0);
-PARSE_TYPE_INIT (exp2, rule_match, 0, 0);
-
-PARSE_INIT (r6, "<term> = <factor><term2>", eval_term0);
-PARSE_INIT (r7, "<term2> = <star> <term>", eval_term1);
-PARSE_INIT (r8, "<term2> = <slash> <term>", eval_term2);
-PARSE_INIT (r9, "<term2> = ", noop_match_rule);
-PARSE_TYPE_INIT (term, rule_match, 0, 0);
-PARSE_TYPE_INIT (term2, rule_match, 0, 0);
-
-PARSE_INIT (r11, "<factor> = <lpar> <exp> <rpar>", eval_factor1);
-PARSE_INIT (r10, "<factor> = <number>", eval_factor0);
-PARSE_INIT (r12, "<factor> = <minus> <factor>", eval_factor2);
-
-PARSE_TYPE_INIT (factor, rule_match, 0, 0);
-#endif
-
-PARSE_INIT (r1, "eval <exp>", eval_result);
-
-#if 1
-PARSE_INIT (r2, "<exp> = <term><exp2>", eval_exp0);
-PARSE_INIT (r3, "<exp2> = <plus> <exp>", eval_exp1);
-PARSE_INIT (r4, "<exp2> = <minus> <exp>", eval_exp2);
-PARSE_INIT (r5, "<exp2> = ", noop_match_rule);
-PARSE_TYPE_INIT (exp, rule_match, 0, 0);
-PARSE_TYPE_INIT (exp2, rule_match, 0, 0);
-
-PARSE_INIT (r6, "<term> = <factor><term2>", eval_term0);
-PARSE_INIT (r7, "<term2> = <star> <term>", eval_term1);
-PARSE_INIT (r8, "<term2> = <slash> <term>", eval_term2);
-PARSE_INIT (r9, "<term2> = ", noop_match_rule);
-PARSE_TYPE_INIT (term, rule_match, 0, 0);
-PARSE_TYPE_INIT (term2, rule_match, 0, 0);
-
-PARSE_INIT (r11, "<factor> = <lpar> <exp> <rpar>", eval_factor1);
-PARSE_INIT (r10, "<factor> = <number>", eval_factor0);
-PARSE_INIT (r12, "<factor> = <minus> <factor>", eval_factor2);
-
-PARSE_TYPE_INIT (factor, rule_match, 0, 0);
-#endif
-
-#if 0
-PARSE_TYPE_INIT (exp, rule_match, 0, 0);
-PARSE_INIT (r6, "<exp> = a b", eval_term0);
-PARSE_INIT (r7, "<exp> = c d", eval_term1);
-PARSE_INIT (r9, "<exp> = ", noop_match_rule);
-#endif
-
-#if 0
-#define foreach_rule_evaluator                  \
-_(0)                                            \
-_(1)                                            \
-_(2)						\
-_(3)
-
-#define _(n)                                            \
-vlib_parse_match_t eval##n (vlib_parse_main_t *pm,      \
-                            vlib_parse_item_t *item,    \
-                            vlib_parse_value_t *value)  \
-{                                                       \
-  clib_warning ("%U", format_vlib_parse_value, pm);     \
-  return VLIB_PARSE_MATCH_DONE;                         \
-}
-foreach_rule_evaluator
-#undef _
-PARSE_INIT (r1, "eval <moo>", eval_result);
-
-PARSE_INIT (r2, "<moo> = cow", eval0);
-PARSE_INIT (r4, "<moo> = ", eval1);
-PARSE_TYPE_INIT (moo, rule_match, 0, 0);
-#endif
-
-
-clib_error_t *
-test_init (vlib_main_t * vm)
-{
-  clib_error_t *error;
-
-  if ((error = vlib_call_init_function (vm, parse_init)))
-    return error;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (test_init);
-
-clib_error_t *
-vlib_stdlex_init (vlib_main_t * vm)
-{
-  vlib_lex_main_t *lm = &vlib_lex_main;
-  u16 top_index;
-  u16 slash_index, slash_star_index, slash_slash_index, slash_star_star_index;
-  u16 slash_token;
-  u16 word_index;
-  u16 zero_index, octal_index, decimal_index, hex_index, binary_index;
-
-  top_index = vlib_lex_add_table ("top");
-
-#define foreach_top_level_single_character_token        \
-  _('(', lpar)                                          \
-  _(')', rpar)                                          \
-  _(';', semi)                                          \
-  _('[', lbrack)                                        \
-  _(']', rbrack)                                        \
-  _('{', lcurly)                                        \
-  _('}', rcurly)                                        \
-  _('+', plus)                                          \
-  _('-', minus)                                         \
-  _('*', star)                                          \
-  _('%', percent)                                       \
-  _('@', atsign)                                        \
-  _(',', comma)                                         \
-  _('.', dot)                                           \
-  _('?', qmark)
-
-#define _(c,t) \
-  vlib_lex_set_action_range(top_index,c,c,VLIB_LEX_RETURN,vlib_lex_add_token(lm, #t), top_index);
-  foreach_top_level_single_character_token;
-#undef _
-
-  /* Numbers */
-  zero_index = vlib_lex_add_table ("zero");
-  octal_index = vlib_lex_add_table ("octal");
-  decimal_index = vlib_lex_add_table ("decimal");
-  hex_index = vlib_lex_add_table ("hex");
-  binary_index = vlib_lex_add_table ("binary");
-
-  /* Support 0x 0b 0t and 0123 [octal] */
-  vlib_lex_set_action_range (top_index, '0', '0', VLIB_LEX_START_NUMBER, 10,
-			     zero_index);
-  vlib_lex_set_action_range (top_index, '1', '9', VLIB_LEX_START_NUMBER, 10,
-			     decimal_index);
-
-  vlib_lex_set_action_range (zero_index, 0, 0x7F, VLIB_LEX_RETURN_AND_RESCAN,
-			     VLIB_LEX_number, top_index);
-
-  vlib_lex_set_action_range (zero_index, 'x', 'x', VLIB_LEX_IGNORE, ~0,
-			     hex_index);
-  vlib_lex_set_action_range (zero_index, 'b', 'b', VLIB_LEX_IGNORE, ~0,
-			     binary_index);
-  vlib_lex_set_action_range (zero_index, 't', 't', VLIB_LEX_IGNORE, ~0,
-			     decimal_index);
-  vlib_lex_set_action_range (zero_index, '0', '7', VLIB_LEX_START_NUMBER, 8,
-			     octal_index);
-
-  /* Octal */
-  vlib_lex_set_action_range (octal_index, 0, 0x7f, VLIB_LEX_RETURN_AND_RESCAN,
-			     VLIB_LEX_number, top_index);
-  vlib_lex_set_action_range (octal_index, '0', '7', VLIB_LEX_ADD_TO_NUMBER, 8,
-			     octal_index);
-
-  /* Decimal */
-  vlib_lex_set_action_range (decimal_index, 0, 0x7f,
-			     VLIB_LEX_RETURN_AND_RESCAN, VLIB_LEX_number,
-			     top_index);
-  vlib_lex_set_action_range (decimal_index, '0', '9', VLIB_LEX_ADD_TO_NUMBER,
-			     10, decimal_index);
-
-  /* Hex */
-  vlib_lex_set_action_range (hex_index, 0, 0x7f, VLIB_LEX_RETURN_AND_RESCAN,
-			     VLIB_LEX_number, top_index);
-  vlib_lex_set_action_range (hex_index, '0', '9', VLIB_LEX_ADD_TO_NUMBER, 16,
-			     hex_index);
-  vlib_lex_set_action_range (hex_index, 'a', 'f', VLIB_LEX_ADD_TO_NUMBER, 16,
-			     hex_index);
-  vlib_lex_set_action_range (hex_index, 'A', 'F', VLIB_LEX_ADD_TO_NUMBER, 16,
-			     hex_index);
-
-  /* Binary */
-  vlib_lex_set_action_range (binary_index, 0, 0x7f,
-			     VLIB_LEX_RETURN_AND_RESCAN, VLIB_LEX_number,
-			     top_index);
-  vlib_lex_set_action_range (binary_index, '0', '1', VLIB_LEX_ADD_TO_NUMBER,
-			     2, binary_index);
-
-  /* c/c++ comment syntax is the worst... */
-
-  slash_index = vlib_lex_add_table ("slash");
-  slash_star_index = vlib_lex_add_table ("slash_star");
-  slash_star_star_index = vlib_lex_add_table ("slash_star_star");
-  slash_slash_index = vlib_lex_add_table ("slash_slash");
-  slash_token = vlib_lex_add_token (lm, "slash");
-
-  /* Top level: see a slash, ignore, go to slash table */
-  vlib_lex_set_action_range (top_index, '/', '/', VLIB_LEX_IGNORE, ~0,
-			     slash_index);
-
-  /* default for slash table: return SLASH, go to top table */
-  vlib_lex_set_action_range (slash_index, 1, 0x7F, VLIB_LEX_RETURN_AND_RESCAN,
-			     slash_token, top_index);
-  /* see slash-slash, go to s-s table */
-  vlib_lex_set_action_range (slash_index, '/', '/', VLIB_LEX_IGNORE, ~0,
-			     slash_slash_index);
-  /* see slash-star, go to s-* table */
-  vlib_lex_set_action_range (slash_index, '*', '*', VLIB_LEX_IGNORE, ~0,
-			     slash_star_index);
-
-  /* EOL in s-s table, ignore, go to top table */
-  vlib_lex_set_action_range (slash_slash_index, '\n', '\n', VLIB_LEX_IGNORE,
-			     ~0, top_index);
-
-  /* slash-star blah blah star */
-  vlib_lex_set_action_range (slash_star_index, '*', '*', VLIB_LEX_IGNORE, ~0,
-			     slash_star_star_index);
-
-  /* slash star blah blah star slash */
-  vlib_lex_set_action_range (slash_star_star_index, '/', '/', VLIB_LEX_IGNORE,
-			     ~0, top_index);
-
-  /* LT, =, GT */
-  vlib_lex_set_action_range (top_index, '<', '<', VLIB_LEX_RETURN,
-			     VLIB_LEX_lt, top_index);
-  vlib_lex_set_action_range (top_index, '=', '=', VLIB_LEX_RETURN,
-			     VLIB_LEX_equals, top_index);
-  vlib_lex_set_action_range (top_index, '>', '>', VLIB_LEX_RETURN,
-			     VLIB_LEX_gt, top_index);
-
-  /* words, key and otherwise */
-  word_index = vlib_lex_add_table ("word");
-
-  vlib_lex_set_action_range (top_index, 'a', 'z', VLIB_LEX_ADD_TO_TOKEN, ~0,
-			     word_index);
-  vlib_lex_set_action_range (top_index, 'A', 'Z', VLIB_LEX_ADD_TO_TOKEN, ~0,
-			     word_index);
-
-  vlib_lex_set_action_range (word_index, 0, 0x7f, VLIB_LEX_KEYWORD_CHECK, ~0,
-			     top_index);
-
-  vlib_lex_set_action_range (word_index, 'a', 'z', VLIB_LEX_ADD_TO_TOKEN, ~0,
-			     word_index);
-  vlib_lex_set_action_range (word_index, 'A', 'Z', VLIB_LEX_ADD_TO_TOKEN, ~0,
-			     word_index);
-  vlib_lex_set_action_range (word_index, '_', '_', VLIB_LEX_ADD_TO_TOKEN, ~0,
-			     word_index);
-  vlib_lex_set_action_range (word_index, '0', '9', VLIB_LEX_ADD_TO_TOKEN, ~0,
-			     word_index);
-
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/buffer.c b/vlib/vlib/buffer.c
deleted file mode 100644
index 4bf6d125..00000000
--- a/vlib/vlib/buffer.c
+++ /dev/null
@@ -1,1987 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * buffer.c: allocate/free network buffers.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @cond (!DPDK)
- * @file
- *
- * Allocate/free network buffers.
- */
-
-#if DPDK > 0
-#include <rte_config.h>
-
-#include <rte_common.h>
-#include <rte_log.h>
-#include <rte_memory.h>
-#include <rte_memzone.h>
-#include <rte_tailq.h>
-#include <rte_eal.h>
-#include <rte_per_lcore.h>
-#include <rte_launch.h>
-#include <rte_atomic.h>
-#include <rte_cycles.h>
-#include <rte_prefetch.h>
-#include <rte_lcore.h>
-#include <rte_per_lcore.h>
-#include <rte_branch_prediction.h>
-#include <rte_interrupts.h>
-#include <rte_pci.h>
-#include <rte_random.h>
-#include <rte_debug.h>
-#include <rte_ether.h>
-#include <rte_ethdev.h>
-#include <rte_ring.h>
-#include <rte_mempool.h>
-#include <rte_mbuf.h>
-#include <rte_version.h>
-#endif
-
-#include <vlib/vlib.h>
-
-#if DPDK > 0
-#pragma weak rte_mem_virt2phy
-#pragma weak rte_eal_has_hugepages
-#pragma weak rte_socket_id
-#pragma weak rte_pktmbuf_pool_create
-#endif
-
-uword
-vlib_buffer_length_in_chain_slow_path (vlib_main_t * vm,
-				       vlib_buffer_t * b_first)
-{
-  vlib_buffer_t *b = b_first;
-  uword l_first = b_first->current_length;
-  uword l = 0;
-  while (b->flags & VLIB_BUFFER_NEXT_PRESENT)
-    {
-      b = vlib_get_buffer (vm, b->next_buffer);
-      l += b->current_length;
-    }
-  b_first->total_length_not_including_first_buffer = l;
-  b_first->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
-  return l + l_first;
-}
-
-u8 *
-format_vlib_buffer (u8 * s, va_list * args)
-{
-  vlib_buffer_t *b = va_arg (*args, vlib_buffer_t *);
-#if DPDK > 0
-  uword indent = format_get_indent (s);
-
-  s = format (s, "current data %d, length %d, free-list %d",
-	      b->current_data, b->current_length, b->free_list_index);
-
-  if (b->flags & VLIB_BUFFER_TOTAL_LENGTH_VALID)
-    s = format (s, ", totlen-nifb %d",
-		b->total_length_not_including_first_buffer);
-
-  if (b->flags & VLIB_BUFFER_IS_TRACED)
-    s = format (s, ", trace 0x%x", b->trace_index);
-
-  while (b->flags & VLIB_BUFFER_NEXT_PRESENT)
-    {
-      vlib_main_t *vm = vlib_get_main ();
-      u32 next_buffer = b->next_buffer;
-      b = vlib_get_buffer (vm, next_buffer);
-
-      s = format (s, "\n%Unext-buffer 0x%x, segment length %d",
-		  format_white_space, indent, next_buffer, b->current_length);
-    }
-
-#else
-
-  s = format (s, "current data %d, length %d, free-list %d",
-	      b->current_data, b->current_length, b->free_list_index);
-
-  if (b->flags & VLIB_BUFFER_IS_TRACED)
-    s = format (s, ", trace 0x%x", b->trace_index);
-
-  if (b->flags & VLIB_BUFFER_NEXT_PRESENT)
-    s = format (s, ", next-buffer 0x%x", b->next_buffer);
-#endif
-
-  return s;
-}
-
-u8 *
-format_vlib_buffer_and_data (u8 * s, va_list * args)
-{
-  vlib_buffer_t *b = va_arg (*args, vlib_buffer_t *);
-
-  s = format (s, "%U, %U",
-	      format_vlib_buffer, b,
-	      format_hex_bytes, vlib_buffer_get_current (b), 64);
-
-  return s;
-}
-
-#if DPDK == 0
-static u8 *
-format_vlib_buffer_known_state (u8 * s, va_list * args)
-{
-  vlib_buffer_known_state_t state = va_arg (*args, vlib_buffer_known_state_t);
-  char *t;
-
-  switch (state)
-    {
-    case VLIB_BUFFER_UNKNOWN:
-      t = "unknown";
-      break;
-
-    case VLIB_BUFFER_KNOWN_ALLOCATED:
-      t = "known-allocated";
-      break;
-
-    case VLIB_BUFFER_KNOWN_FREE:
-      t = "known-free";
-      break;
-
-    default:
-      t = "invalid";
-      break;
-    }
-
-  return format (s, "%s", t);
-}
-#endif
-
-u8 *
-format_vlib_buffer_contents (u8 * s, va_list * va)
-{
-  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
-  vlib_buffer_t *b = va_arg (*va, vlib_buffer_t *);
-
-  while (1)
-    {
-      vec_add (s, vlib_buffer_get_current (b), b->current_length);
-      if (!(b->flags & VLIB_BUFFER_NEXT_PRESENT))
-	break;
-      b = vlib_get_buffer (vm, b->next_buffer);
-    }
-
-  return s;
-}
-
-#if DPDK == 0
-static u8 *
-vlib_validate_buffer_helper (vlib_main_t * vm,
-			     u32 bi,
-			     uword follow_buffer_next, uword ** unique_hash)
-{
-  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  vlib_buffer_free_list_t *fl;
-
-  if (pool_is_free_index (bm->buffer_free_list_pool, b->free_list_index))
-    return format (0, "unknown free list 0x%x", b->free_list_index);
-
-  fl = pool_elt_at_index (bm->buffer_free_list_pool, b->free_list_index);
-
-  if ((signed) b->current_data < (signed) -VLIB_BUFFER_PRE_DATA_SIZE)
-    return format (0, "current data %d before pre-data", b->current_data);
-#if DPDK == 0
-  if (b->current_data + b->current_length > fl->n_data_bytes)
-    return format (0, "%d-%d beyond end of buffer %d",
-		   b->current_data, b->current_length, fl->n_data_bytes);
-#endif
-
-  if (follow_buffer_next && (b->flags & VLIB_BUFFER_NEXT_PRESENT))
-    {
-      vlib_buffer_known_state_t k;
-      u8 *msg, *result;
-
-      k = vlib_buffer_is_known (vm, b->next_buffer);
-      if (k != VLIB_BUFFER_KNOWN_ALLOCATED)
-	return format (0, "next 0x%x: %U",
-		       b->next_buffer, format_vlib_buffer_known_state, k);
-
-      if (unique_hash)
-	{
-	  if (hash_get (*unique_hash, b->next_buffer))
-	    return format (0, "duplicate buffer 0x%x", b->next_buffer);
-
-	  hash_set1 (*unique_hash, b->next_buffer);
-	}
-
-      msg = vlib_validate_buffer (vm, b->next_buffer, follow_buffer_next);
-      if (msg)
-	{
-	  result = format (0, "next 0x%x: %v", b->next_buffer, msg);
-	  vec_free (msg);
-	  return result;
-	}
-    }
-
-  return 0;
-}
-
-u8 *
-vlib_validate_buffer (vlib_main_t * vm, u32 bi, uword follow_buffer_next)
-{
-  return vlib_validate_buffer_helper (vm, bi, follow_buffer_next,
-				      /* unique_hash */ 0);
-}
-
-u8 *
-vlib_validate_buffers (vlib_main_t * vm,
-		       u32 * buffers,
-		       uword next_buffer_stride,
-		       uword n_buffers,
-		       vlib_buffer_known_state_t known_state,
-		       uword follow_buffer_next)
-{
-  uword i, *hash;
-  u32 bi, *b = buffers;
-  vlib_buffer_known_state_t k;
-  u8 *msg = 0, *result = 0;
-
-  hash = hash_create (0, 0);
-  for (i = 0; i < n_buffers; i++)
-    {
-      bi = b[0];
-      b += next_buffer_stride;
-
-      /* Buffer is not unique. */
-      if (hash_get (hash, bi))
-	{
-	  msg = format (0, "not unique");
-	  goto done;
-	}
-
-      k = vlib_buffer_is_known (vm, bi);
-      if (k != known_state)
-	{
-	  msg = format (0, "is %U; expected %U",
-			format_vlib_buffer_known_state, k,
-			format_vlib_buffer_known_state, known_state);
-	  goto done;
-	}
-
-      msg = vlib_validate_buffer_helper (vm, bi, follow_buffer_next, &hash);
-      if (msg)
-	goto done;
-
-      hash_set1 (hash, bi);
-    }
-
-done:
-  if (msg)
-    {
-      result = format (0, "0x%x: %v", bi, msg);
-      vec_free (msg);
-    }
-  hash_free (hash);
-  return result;
-}
-#endif
-
-vlib_main_t **vlib_mains;
-
-#if DPDK == 0
-/* When dubugging validate that given buffers are either known allocated
-   or known free. */
-static void
-vlib_buffer_validate_alloc_free (vlib_main_t * vm,
-				 u32 * buffers,
-				 uword n_buffers,
-				 vlib_buffer_known_state_t expected_state)
-{
-  u32 *b;
-  uword i, bi, is_free;
-
-  if (CLIB_DEBUG == 0)
-    return;
-
-  ASSERT (os_get_cpu_number () == 0);
-
-  /* smp disaster check */
-  if (vlib_mains)
-    ASSERT (vm == vlib_mains[0]);
-
-  is_free = expected_state == VLIB_BUFFER_KNOWN_ALLOCATED;
-  b = buffers;
-  for (i = 0; i < n_buffers; i++)
-    {
-      vlib_buffer_known_state_t known;
-
-      bi = b[0];
-      b += 1;
-      known = vlib_buffer_is_known (vm, bi);
-      if (known != expected_state)
-	{
-	  ASSERT (0);
-	  vlib_panic_with_msg
-	    (vm, "%s %U buffer 0x%x",
-	     is_free ? "freeing" : "allocating",
-	     format_vlib_buffer_known_state, known, bi);
-	}
-
-      vlib_buffer_set_known_state
-	(vm, bi,
-	 is_free ? VLIB_BUFFER_KNOWN_FREE : VLIB_BUFFER_KNOWN_ALLOCATED);
-    }
-}
-#endif
-
-#define BUFFERS_PER_COPY (sizeof (vlib_copy_unit_t) / sizeof (u32))
-
-/* Make sure we have at least given number of unaligned buffers. */
-static void
-fill_unaligned (vlib_main_t * vm,
-		vlib_buffer_free_list_t * free_list,
-		uword n_unaligned_buffers)
-{
-  word la = vec_len (free_list->aligned_buffers);
-  word lu = vec_len (free_list->unaligned_buffers);
-
-  /* Aligned come in aligned copy-sized chunks. */
-  ASSERT (la % BUFFERS_PER_COPY == 0);
-
-  ASSERT (la >= n_unaligned_buffers);
-
-  while (lu < n_unaligned_buffers)
-    {
-      /* Copy 4 buffers from end of aligned vector to unaligned vector. */
-      vec_add (free_list->unaligned_buffers,
-	       free_list->aligned_buffers + la - BUFFERS_PER_COPY,
-	       BUFFERS_PER_COPY);
-      la -= BUFFERS_PER_COPY;
-      lu += BUFFERS_PER_COPY;
-    }
-  _vec_len (free_list->aligned_buffers) = la;
-}
-
-/* After free aligned buffers may not contain even sized chunks. */
-static void
-trim_aligned (vlib_buffer_free_list_t * f)
-{
-  uword l, n_trim;
-
-  /* Add unaligned to aligned before trim. */
-  l = vec_len (f->unaligned_buffers);
-  if (l > 0)
-    {
-      vec_add_aligned (f->aligned_buffers, f->unaligned_buffers, l,
-		       /* align */ sizeof (vlib_copy_unit_t));
-
-      _vec_len (f->unaligned_buffers) = 0;
-    }
-
-  /* Remove unaligned buffers from end of aligned vector and save for next trim. */
-  l = vec_len (f->aligned_buffers);
-  n_trim = l % BUFFERS_PER_COPY;
-  if (n_trim)
-    {
-      /* Trim aligned -> unaligned. */
-      vec_add (f->unaligned_buffers, f->aligned_buffers + l - n_trim, n_trim);
-
-      /* Remove from aligned. */
-      _vec_len (f->aligned_buffers) = l - n_trim;
-    }
-}
-
-static void
-merge_free_lists (vlib_buffer_free_list_t * dst,
-		  vlib_buffer_free_list_t * src)
-{
-  uword l;
-  u32 *d;
-
-  trim_aligned (src);
-  trim_aligned (dst);
-
-  l = vec_len (src->aligned_buffers);
-  if (l > 0)
-    {
-      vec_add2_aligned (dst->aligned_buffers, d, l,
-			/* align */ sizeof (vlib_copy_unit_t));
-      clib_memcpy (d, src->aligned_buffers, l * sizeof (d[0]));
-      vec_free (src->aligned_buffers);
-    }
-
-  l = vec_len (src->unaligned_buffers);
-  if (l > 0)
-    {
-      vec_add (dst->unaligned_buffers, src->unaligned_buffers, l);
-      vec_free (src->unaligned_buffers);
-    }
-}
-
-always_inline u32
-vlib_buffer_get_free_list_with_size (vlib_main_t * vm, u32 size)
-{
-  vlib_buffer_main_t *bm = vm->buffer_main;
-
-  size = vlib_buffer_round_size (size);
-  uword *p = hash_get (bm->free_list_by_size, size);
-  return p ? p[0] : ~0;
-}
-
-/* Add buffer free list. */
-static u32
-vlib_buffer_create_free_list_helper (vlib_main_t * vm,
-				     u32 n_data_bytes,
-				     u32 is_public, u32 is_default, u8 * name)
-{
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  vlib_buffer_free_list_t *f;
-#if DPDK > 0
-  int i;
-
-  ASSERT (os_get_cpu_number () == 0);
-
-  if (!is_default && pool_elts (bm->buffer_free_list_pool) == 0)
-    {
-      u32 default_free_free_list_index;
-
-      /* *INDENT-OFF* */
-      default_free_free_list_index =
-        vlib_buffer_create_free_list_helper
-        (vm,
-         /* default buffer size */ VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES,
-         /* is_public */ 1,
-         /* is_default */ 1,
-         (u8 *) "default");
-      /* *INDENT-ON* */
-      ASSERT (default_free_free_list_index ==
-	      VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-
-      if (n_data_bytes == VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES && is_public)
-	return default_free_free_list_index;
-    }
-
-  pool_get_aligned (bm->buffer_free_list_pool, f, CLIB_CACHE_LINE_BYTES);
-
-  memset (f, 0, sizeof (f[0]));
-  f->index = f - bm->buffer_free_list_pool;
-  f->n_data_bytes = vlib_buffer_round_size (n_data_bytes);
-  f->min_n_buffers_each_physmem_alloc = 16;
-  f->name = clib_mem_is_heap_object (name) ? name : format (0, "%s", name);
-
-  /* Setup free buffer template. */
-  f->buffer_init_template.free_list_index = f->index;
-
-  if (is_public)
-    {
-      uword *p = hash_get (bm->free_list_by_size, f->n_data_bytes);
-      if (!p)
-	hash_set (bm->free_list_by_size, f->n_data_bytes, f->index);
-    }
-
-  for (i = 1; i < vec_len (vlib_mains); i++)
-    {
-      vlib_buffer_main_t *wbm = vlib_mains[i]->buffer_main;
-      vlib_buffer_free_list_t *wf;
-      pool_get_aligned (wbm->buffer_free_list_pool,
-			wf, CLIB_CACHE_LINE_BYTES);
-      ASSERT (f - bm->buffer_free_list_pool ==
-	      wf - wbm->buffer_free_list_pool);
-      wf[0] = f[0];
-      wf->aligned_buffers = 0;
-      wf->unaligned_buffers = 0;
-      wf->n_alloc = 0;
-    }
-#else
-
-  if (!is_default && pool_elts (bm->buffer_free_list_pool) == 0)
-    {
-      u32 default_free_free_list_index;
-
-      default_free_free_list_index = vlib_buffer_create_free_list_helper (vm,
-									  /* default buffer size */
-									  VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES,
-									  /* is_public */
-									  1,
-									  /* is_default */
-									  1,
-									  (u8
-									   *)
-									  "default");
-      ASSERT (default_free_free_list_index ==
-	      VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-
-      if (n_data_bytes == VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES && is_public)
-	return default_free_free_list_index;
-    }
-
-  pool_get_aligned (bm->buffer_free_list_pool, f, CLIB_CACHE_LINE_BYTES);
-
-  memset (f, 0, sizeof (f[0]));
-  f->index = f - bm->buffer_free_list_pool;
-  f->n_data_bytes = vlib_buffer_round_size (n_data_bytes);
-  f->min_n_buffers_each_physmem_alloc = 256;
-  f->name = clib_mem_is_heap_object (name) ? name : format (0, "%s", name);
-
-  /* Setup free buffer template. */
-  f->buffer_init_template.free_list_index = f->index;
-
-  if (is_public)
-    {
-      uword *p = hash_get (bm->free_list_by_size, f->n_data_bytes);
-      if (!p)
-	hash_set (bm->free_list_by_size, f->n_data_bytes, f->index);
-    }
-#endif
-
-  return f->index;
-}
-
-u32
-vlib_buffer_create_free_list (vlib_main_t * vm, u32 n_data_bytes,
-			      char *fmt, ...)
-{
-  va_list va;
-  u8 *name;
-
-  va_start (va, fmt);
-  name = va_format (0, fmt, &va);
-  va_end (va);
-
-  return vlib_buffer_create_free_list_helper (vm, n_data_bytes,
-					      /* is_public */ 0,
-					      /* is_default */ 0,
-					      name);
-}
-
-u32
-vlib_buffer_get_or_create_free_list (vlib_main_t * vm, u32 n_data_bytes,
-				     char *fmt, ...)
-{
-  u32 i = vlib_buffer_get_free_list_with_size (vm, n_data_bytes);
-
-  if (i == ~0)
-    {
-      va_list va;
-      u8 *name;
-
-      va_start (va, fmt);
-      name = va_format (0, fmt, &va);
-      va_end (va);
-
-      i = vlib_buffer_create_free_list_helper (vm, n_data_bytes,
-					       /* is_public */ 1,
-					       /* is_default */ 0,
-					       name);
-    }
-
-  return i;
-}
-
-static void
-del_free_list (vlib_main_t * vm, vlib_buffer_free_list_t * f)
-{
-  u32 i;
-#if DPDK > 0
-  struct rte_mbuf *mb;
-  vlib_buffer_t *b;
-
-  for (i = 0; i < vec_len (f->unaligned_buffers); i++)
-    {
-      b = vlib_get_buffer (vm, f->unaligned_buffers[i]);
-      mb = rte_mbuf_from_vlib_buffer (b);
-      ASSERT (rte_mbuf_refcnt_read (mb) == 1);
-      rte_pktmbuf_free (mb);
-    }
-  for (i = 0; i < vec_len (f->aligned_buffers); i++)
-    {
-      b = vlib_get_buffer (vm, f->aligned_buffers[i]);
-      mb = rte_mbuf_from_vlib_buffer (b);
-      ASSERT (rte_mbuf_refcnt_read (mb) == 1);
-      rte_pktmbuf_free (mb);
-    }
-  vec_free (f->name);
-#else
-
-  for (i = 0; i < vec_len (f->buffer_memory_allocated); i++)
-    vm->os_physmem_free (f->buffer_memory_allocated[i]);
-  vec_free (f->name);
-  vec_free (f->buffer_memory_allocated);
-#endif
-  vec_free (f->unaligned_buffers);
-  vec_free (f->aligned_buffers);
-}
-
-/* Add buffer free list. */
-void
-vlib_buffer_delete_free_list (vlib_main_t * vm, u32 free_list_index)
-{
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  vlib_buffer_free_list_t *f;
-  u32 merge_index;
-#if DPDK > 0
-  int i;
-
-  ASSERT (os_get_cpu_number () == 0);
-
-  f = vlib_buffer_get_free_list (vm, free_list_index);
-
-  merge_index = vlib_buffer_get_free_list_with_size (vm, f->n_data_bytes);
-  if (merge_index != ~0 && merge_index != free_list_index)
-    {
-      merge_free_lists (pool_elt_at_index (bm->buffer_free_list_pool,
-					   merge_index), f);
-    }
-
-  del_free_list (vm, f);
-
-  /* Poison it. */
-  memset (f, 0xab, sizeof (f[0]));
-
-  pool_put (bm->buffer_free_list_pool, f);
-
-  for (i = 1; i < vec_len (vlib_mains); i++)
-    {
-      bm = vlib_mains[i]->buffer_main;
-      f = vlib_buffer_get_free_list (vlib_mains[i], free_list_index);;
-      memset (f, 0xab, sizeof (f[0]));
-      pool_put (bm->buffer_free_list_pool, f);
-    }
-#else
-
-  f = vlib_buffer_get_free_list (vm, free_list_index);
-
-  ASSERT (vec_len (f->unaligned_buffers) + vec_len (f->aligned_buffers) ==
-	  f->n_alloc);
-  merge_index = vlib_buffer_get_free_list_with_size (vm, f->n_data_bytes);
-  if (merge_index != ~0 && merge_index != free_list_index)
-    {
-      merge_free_lists (pool_elt_at_index (bm->buffer_free_list_pool,
-					   merge_index), f);
-    }
-
-  del_free_list (vm, f);
-
-  /* Poison it. */
-  memset (f, 0xab, sizeof (f[0]));
-
-  pool_put (bm->buffer_free_list_pool, f);
-#endif
-}
-
-/* Make sure free list has at least given number of free buffers. */
-static uword
-fill_free_list (vlib_main_t * vm,
-		vlib_buffer_free_list_t * fl, uword min_free_buffers)
-{
-#if DPDK > 0
-  vlib_buffer_t *b;
-  int n, i;
-  u32 bi;
-  u32 n_remaining = 0, n_alloc = 0;
-  unsigned socket_id = rte_socket_id ? rte_socket_id () : 0;
-  struct rte_mempool *rmp = vm->buffer_main->pktmbuf_pools[socket_id];
-  struct rte_mbuf *mb;
-
-  /* Too early? */
-  if (PREDICT_FALSE (rmp == 0))
-    return 0;
-
-  trim_aligned (fl);
-
-  /* Already have enough free buffers on free list? */
-  n = min_free_buffers - vec_len (fl->aligned_buffers);
-  if (n <= 0)
-    return min_free_buffers;
-
-  /* Always allocate round number of buffers. */
-  n = round_pow2 (n, BUFFERS_PER_COPY);
-
-  /* Always allocate new buffers in reasonably large sized chunks. */
-  n = clib_max (n, fl->min_n_buffers_each_physmem_alloc);
-
-  vec_validate (vm->mbuf_alloc_list, n - 1);
-
-  if (rte_mempool_get_bulk (rmp, vm->mbuf_alloc_list, n) < 0)
-    return 0;
-
-  _vec_len (vm->mbuf_alloc_list) = n;
-
-  for (i = 0; i < n; i++)
-    {
-      mb = vm->mbuf_alloc_list[i];
-
-      ASSERT (rte_mbuf_refcnt_read (mb) == 0);
-      rte_mbuf_refcnt_set (mb, 1);
-
-      b = vlib_buffer_from_rte_mbuf (mb);
-      bi = vlib_get_buffer_index (vm, b);
-
-      vec_add1_aligned (fl->aligned_buffers, bi, sizeof (vlib_copy_unit_t));
-      n_alloc++;
-      n_remaining--;
-
-      vlib_buffer_init_for_free_list (b, fl);
-
-      if (fl->buffer_init_function)
-	fl->buffer_init_function (vm, fl, &bi, 1);
-    }
-
-  fl->n_alloc += n;
-
-  return n;
-#else
-  vlib_buffer_t *buffers, *b;
-  int n, n_bytes, i;
-  u32 *bi;
-  u32 n_remaining, n_alloc, n_this_chunk;
-
-  trim_aligned (fl);
-
-  /* Already have enough free buffers on free list? */
-  n = min_free_buffers - vec_len (fl->aligned_buffers);
-  if (n <= 0)
-    return min_free_buffers;
-
-  /* Always allocate round number of buffers. */
-  n = round_pow2 (n, BUFFERS_PER_COPY);
-
-  /* Always allocate new buffers in reasonably large sized chunks. */
-  n = clib_max (n, fl->min_n_buffers_each_physmem_alloc);
-
-  n_remaining = n;
-  n_alloc = 0;
-  while (n_remaining > 0)
-    {
-      n_this_chunk = clib_min (n_remaining, 16);
-
-      n_bytes = n_this_chunk * (sizeof (b[0]) + fl->n_data_bytes);
-
-      /* drb: removed power-of-2 ASSERT */
-      buffers = vm->os_physmem_alloc_aligned (&vm->physmem_main,
-					      n_bytes,
-					      sizeof (vlib_buffer_t));
-      if (!buffers)
-	return n_alloc;
-
-      /* Record chunk as being allocated so we can free it later. */
-      vec_add1 (fl->buffer_memory_allocated, buffers);
-
-      fl->n_alloc += n_this_chunk;
-      n_alloc += n_this_chunk;
-      n_remaining -= n_this_chunk;
-
-      b = buffers;
-      vec_add2_aligned (fl->aligned_buffers, bi, n_this_chunk,
-			sizeof (vlib_copy_unit_t));
-      for (i = 0; i < n_this_chunk; i++)
-	{
-	  bi[i] = vlib_get_buffer_index (vm, b);
-
-	  if (CLIB_DEBUG > 0)
-	    vlib_buffer_set_known_state (vm, bi[i], VLIB_BUFFER_KNOWN_FREE);
-	  b = vlib_buffer_next_contiguous (b, fl->n_data_bytes);
-	}
-
-      memset (buffers, 0, n_bytes);
-
-      /* Initialize all new buffers. */
-      b = buffers;
-      for (i = 0; i < n_this_chunk; i++)
-	{
-	  vlib_buffer_init_for_free_list (b, fl);
-	  b = vlib_buffer_next_contiguous (b, fl->n_data_bytes);
-	}
-
-      if (fl->buffer_init_function)
-	fl->buffer_init_function (vm, fl, bi, n_this_chunk);
-    }
-  return n_alloc;
-#endif
-}
-
-always_inline uword
-copy_alignment (u32 * x)
-{
-  return (pointer_to_uword (x) / sizeof (x[0])) % BUFFERS_PER_COPY;
-}
-
-static u32
-alloc_from_free_list (vlib_main_t * vm,
-		      vlib_buffer_free_list_t * free_list,
-		      u32 * alloc_buffers, u32 n_alloc_buffers)
-{
-  u32 *dst, *u_src;
-  uword u_len, n_left;
-  uword n_unaligned_start, n_unaligned_end, n_filled;
-
-#if DPDK == 0
-  ASSERT (os_get_cpu_number () == 0);
-
-#endif
-  n_left = n_alloc_buffers;
-  dst = alloc_buffers;
-  n_unaligned_start = ((BUFFERS_PER_COPY - copy_alignment (dst))
-		       & (BUFFERS_PER_COPY - 1));
-
-  n_filled = fill_free_list (vm, free_list, n_alloc_buffers);
-  if (n_filled == 0)
-    return 0;
-
-  n_left = n_filled < n_left ? n_filled : n_left;
-  n_alloc_buffers = n_left;
-
-  if (n_unaligned_start >= n_left)
-    {
-      n_unaligned_start = n_left;
-      n_unaligned_end = 0;
-    }
-  else
-    n_unaligned_end = copy_alignment (dst + n_alloc_buffers);
-
-  fill_unaligned (vm, free_list, n_unaligned_start + n_unaligned_end);
-
-  u_len = vec_len (free_list->unaligned_buffers);
-  u_src = free_list->unaligned_buffers + u_len - 1;
-
-  if (n_unaligned_start)
-    {
-      uword n_copy = n_unaligned_start;
-      if (n_copy > n_left)
-	n_copy = n_left;
-      n_left -= n_copy;
-
-      while (n_copy > 0)
-	{
-	  *dst++ = *u_src--;
-	  n_copy--;
-	  u_len--;
-	}
-
-      /* Now dst should be aligned. */
-      if (n_left > 0)
-	ASSERT (pointer_to_uword (dst) % sizeof (vlib_copy_unit_t) == 0);
-    }
-
-  /* Aligned copy. */
-  {
-    vlib_copy_unit_t *d, *s;
-    uword n_copy;
-
-    if (vec_len (free_list->aligned_buffers) <
-	((n_left / BUFFERS_PER_COPY) * BUFFERS_PER_COPY))
-      abort ();
-
-    n_copy = n_left / BUFFERS_PER_COPY;
-    n_left = n_left % BUFFERS_PER_COPY;
-
-    /* Remove buffers from aligned free list. */
-    _vec_len (free_list->aligned_buffers) -= n_copy * BUFFERS_PER_COPY;
-
-    s = (vlib_copy_unit_t *) vec_end (free_list->aligned_buffers);
-    d = (vlib_copy_unit_t *) dst;
-
-    /* Fast path loop. */
-    while (n_copy >= 4)
-      {
-	d[0] = s[0];
-	d[1] = s[1];
-	d[2] = s[2];
-	d[3] = s[3];
-	n_copy -= 4;
-	s += 4;
-	d += 4;
-      }
-
-    while (n_copy >= 1)
-      {
-	d[0] = s[0];
-	n_copy -= 1;
-	s += 1;
-	d += 1;
-      }
-
-    dst = (void *) d;
-  }
-
-  /* Unaligned copy. */
-  ASSERT (n_unaligned_end == n_left);
-  while (n_left > 0)
-    {
-      *dst++ = *u_src--;
-      n_left--;
-      u_len--;
-    }
-
-  if (!free_list->unaligned_buffers)
-    ASSERT (u_len == 0);
-  else
-    _vec_len (free_list->unaligned_buffers) = u_len;
-
-#if DPDK == 0
-  /* Verify that buffers are known free. */
-  vlib_buffer_validate_alloc_free (vm, alloc_buffers,
-				   n_alloc_buffers, VLIB_BUFFER_KNOWN_FREE);
-#endif
-
-  return n_alloc_buffers;
-}
-
-/* Allocate a given number of buffers into given array.
-   Returns number actually allocated which will be either zero or
-   number requested. */
-u32
-vlib_buffer_alloc (vlib_main_t * vm, u32 * buffers, u32 n_buffers)
-{
-  vlib_buffer_main_t *bm = vm->buffer_main;
-#if DPDK == 0
-  ASSERT (os_get_cpu_number () == 0);
-#endif
-
-  return alloc_from_free_list
-    (vm,
-     pool_elt_at_index (bm->buffer_free_list_pool,
-			VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX),
-     buffers, n_buffers);
-}
-
-u32
-vlib_buffer_alloc_from_free_list (vlib_main_t * vm,
-				  u32 * buffers,
-				  u32 n_buffers, u32 free_list_index)
-{
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  vlib_buffer_free_list_t *f;
-  f = pool_elt_at_index (bm->buffer_free_list_pool, free_list_index);
-  return alloc_from_free_list (vm, f, buffers, n_buffers);
-}
-
-always_inline void
-add_buffer_to_free_list (vlib_main_t * vm,
-			 vlib_buffer_free_list_t * f,
-			 u32 buffer_index, u8 do_init)
-{
-  vlib_buffer_t *b;
-  b = vlib_get_buffer (vm, buffer_index);
-  if (PREDICT_TRUE (do_init))
-    vlib_buffer_init_for_free_list (b, f);
-  vec_add1_aligned (f->aligned_buffers, buffer_index,
-		    sizeof (vlib_copy_unit_t));
-}
-
-always_inline vlib_buffer_free_list_t *
-buffer_get_free_list (vlib_main_t * vm, vlib_buffer_t * b, u32 * index)
-{
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  u32 i;
-
-  *index = i = b->free_list_index;
-  return pool_elt_at_index (bm->buffer_free_list_pool, i);
-}
-
-void *
-vlib_set_buffer_free_callback (vlib_main_t * vm, void *fp)
-{
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  void *rv = bm->buffer_free_callback;
-
-  bm->buffer_free_callback = fp;
-  return rv;
-}
-
-#if DPDK == 0
-void vnet_buffer_free_dpdk_mb (vlib_buffer_t * b) __attribute__ ((weak));
-void
-vnet_buffer_free_dpdk_mb (vlib_buffer_t * b)
-{
-}
-
-#endif
-static_always_inline void
-vlib_buffer_free_inline (vlib_main_t * vm,
-			 u32 * buffers, u32 n_buffers, u32 follow_buffer_next)
-{
-#if DPDK > 0
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  vlib_buffer_free_list_t *fl;
-  u32 fi;
-  int i;
-  u32 (*cb) (vlib_main_t * vm, u32 * buffers, u32 n_buffers,
-	     u32 follow_buffer_next);
-
-  cb = bm->buffer_free_callback;
-
-  if (PREDICT_FALSE (cb != 0))
-    n_buffers = (*cb) (vm, buffers, n_buffers, follow_buffer_next);
-
-  if (!n_buffers)
-    return;
-
-  for (i = 0; i < n_buffers; i++)
-    {
-      vlib_buffer_t *b;
-      struct rte_mbuf *mb;
-
-      b = vlib_get_buffer (vm, buffers[i]);
-
-      fl = buffer_get_free_list (vm, b, &fi);
-
-      /* The only current use of this callback: multicast recycle */
-      if (PREDICT_FALSE (fl->buffers_added_to_freelist_function != 0))
-	{
-	  int j;
-
-	  add_buffer_to_free_list
-	    (vm, fl, buffers[i], (b->flags & VLIB_BUFFER_RECYCLE) == 0);
-
-	  for (j = 0; j < vec_len (bm->announce_list); j++)
-	    {
-	      if (fl == bm->announce_list[j])
-		goto already_announced;
-	    }
-	  vec_add1 (bm->announce_list, fl);
-	already_announced:
-	  ;
-	}
-      else
-	{
-	  if (PREDICT_TRUE ((b->flags & VLIB_BUFFER_RECYCLE) == 0))
-	    {
-	      mb = rte_mbuf_from_vlib_buffer (b);
-	      ASSERT (rte_mbuf_refcnt_read (mb) == 1);
-	      rte_pktmbuf_free (mb);
-	    }
-	}
-    }
-  if (vec_len (bm->announce_list))
-    {
-      vlib_buffer_free_list_t *fl;
-      for (i = 0; i < vec_len (bm->announce_list); i++)
-	{
-	  fl = bm->announce_list[i];
-	  fl->buffers_added_to_freelist_function (vm, fl);
-	}
-      _vec_len (bm->announce_list) = 0;
-    }
-#else
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  vlib_buffer_free_list_t *fl;
-  static u32 *next_to_free[2];	/* smp bad */
-  u32 i_next_to_free, *b, *n, *f, fi;
-  uword n_left;
-  int i;
-  static vlib_buffer_free_list_t **announce_list;
-  vlib_buffer_free_list_t *fl0 = 0, *fl1 = 0;
-  u32 bi0 = (u32) ~ 0, bi1 = (u32) ~ 0, fi0, fi1 = (u32) ~ 0;
-  u8 free0, free1 = 0, free_next0, free_next1;
-  u32 (*cb) (vlib_main_t * vm, u32 * buffers, u32 n_buffers,
-	     u32 follow_buffer_next);
-
-  ASSERT (os_get_cpu_number () == 0);
-
-  cb = bm->buffer_free_callback;
-
-  if (PREDICT_FALSE (cb != 0))
-    n_buffers = (*cb) (vm, buffers, n_buffers, follow_buffer_next);
-
-  if (!n_buffers)
-    return;
-
-  /* Use first buffer to get default free list. */
-  {
-    u32 bi0 = buffers[0];
-    vlib_buffer_t *b0;
-
-    b0 = vlib_get_buffer (vm, bi0);
-    fl = buffer_get_free_list (vm, b0, &fi);
-    if (fl->buffers_added_to_freelist_function)
-      vec_add1 (announce_list, fl);
-  }
-
-  vec_validate (next_to_free[0], n_buffers - 1);
-  vec_validate (next_to_free[1], n_buffers - 1);
-
-  i_next_to_free = 0;
-  n_left = n_buffers;
-  b = buffers;
-
-again:
-  /* Verify that buffers are known allocated. */
-  vlib_buffer_validate_alloc_free (vm, b,
-				   n_left, VLIB_BUFFER_KNOWN_ALLOCATED);
-
-  vec_add2_aligned (fl->aligned_buffers, f, n_left,
-		    /* align */ sizeof (vlib_copy_unit_t));
-
-  n = next_to_free[i_next_to_free];
-  while (n_left >= 4)
-    {
-      vlib_buffer_t *b0, *b1, *binit0, *binit1, dummy_buffers[2];
-
-      bi0 = b[0];
-      bi1 = b[1];
-
-      f[0] = bi0;
-      f[1] = bi1;
-      f += 2;
-      b += 2;
-      n_left -= 2;
-
-      /* Prefetch buffers for next iteration. */
-      vlib_prefetch_buffer_with_index (vm, b[0], WRITE);
-      vlib_prefetch_buffer_with_index (vm, b[1], WRITE);
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      free0 = (b0->flags & VLIB_BUFFER_RECYCLE) == 0;
-      free1 = (b1->flags & VLIB_BUFFER_RECYCLE) == 0;
-
-      /* Must be before init which will over-write buffer flags. */
-      if (follow_buffer_next)
-	{
-	  n[0] = b0->next_buffer;
-	  free_next0 = free0 && (b0->flags & VLIB_BUFFER_NEXT_PRESENT) != 0;
-	  n += free_next0;
-
-	  n[0] = b1->next_buffer;
-	  free_next1 = free1 && (b1->flags & VLIB_BUFFER_NEXT_PRESENT) != 0;
-	  n += free_next1;
-	}
-      else
-	free_next0 = free_next1 = 0;
-
-      /* Must be before init which will over-write buffer free list. */
-      fi0 = b0->free_list_index;
-      fi1 = b1->free_list_index;
-
-      if (PREDICT_FALSE (fi0 != fi || fi1 != fi))
-	goto slow_path_x2;
-
-      binit0 = free0 ? b0 : &dummy_buffers[0];
-      binit1 = free1 ? b1 : &dummy_buffers[1];
-
-      vlib_buffer_init_two_for_free_list (binit0, binit1, fl);
-      continue;
-
-    slow_path_x2:
-      /* Backup speculation. */
-      f -= 2;
-      n -= free_next0 + free_next1;
-
-      _vec_len (fl->aligned_buffers) = f - fl->aligned_buffers;
-
-      fl0 = pool_elt_at_index (bm->buffer_free_list_pool, fi0);
-      fl1 = pool_elt_at_index (bm->buffer_free_list_pool, fi1);
-
-      add_buffer_to_free_list (vm, fl0, bi0, free0);
-      if (PREDICT_FALSE (fl0->buffers_added_to_freelist_function != 0))
-	{
-	  int i;
-	  for (i = 0; i < vec_len (announce_list); i++)
-	    if (fl0 == announce_list[i])
-	      goto no_fl0;
-	  vec_add1 (announce_list, fl0);
-	}
-    no_fl0:
-      if (PREDICT_FALSE (fl1->buffers_added_to_freelist_function != 0))
-	{
-	  int i;
-	  for (i = 0; i < vec_len (announce_list); i++)
-	    if (fl1 == announce_list[i])
-	      goto no_fl1;
-	  vec_add1 (announce_list, fl1);
-	}
-
-    no_fl1:
-      add_buffer_to_free_list (vm, fl1, bi1, free1);
-
-      /* Possibly change current free list. */
-      if (fi0 != fi && fi1 != fi)
-	{
-	  fi = fi1;
-	  fl = pool_elt_at_index (bm->buffer_free_list_pool, fi);
-	}
-
-      vec_add2_aligned (fl->aligned_buffers, f, n_left,
-			/* align */ sizeof (vlib_copy_unit_t));
-    }
-
-  while (n_left >= 1)
-    {
-      vlib_buffer_t *b0, *binit0, dummy_buffers[1];
-
-      bi0 = b[0];
-      f[0] = bi0;
-      f += 1;
-      b += 1;
-      n_left -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      free0 = (b0->flags & VLIB_BUFFER_RECYCLE) == 0;
-
-      /* Must be before init which will over-write buffer flags. */
-      if (follow_buffer_next)
-	{
-	  n[0] = b0->next_buffer;
-	  free_next0 = free0 && (b0->flags & VLIB_BUFFER_NEXT_PRESENT) != 0;
-	  n += free_next0;
-	}
-      else
-	free_next0 = 0;
-
-      /* Must be before init which will over-write buffer free list. */
-      fi0 = b0->free_list_index;
-
-      if (PREDICT_FALSE (fi0 != fi))
-	goto slow_path_x1;
-
-      binit0 = free0 ? b0 : &dummy_buffers[0];
-
-      vlib_buffer_init_for_free_list (binit0, fl);
-      continue;
-
-    slow_path_x1:
-      /* Backup speculation. */
-      f -= 1;
-      n -= free_next0;
-
-      _vec_len (fl->aligned_buffers) = f - fl->aligned_buffers;
-
-      fl0 = pool_elt_at_index (bm->buffer_free_list_pool, fi0);
-
-      add_buffer_to_free_list (vm, fl0, bi0, free0);
-      if (PREDICT_FALSE (fl0->buffers_added_to_freelist_function != 0))
-	{
-	  int i;
-	  for (i = 0; i < vec_len (announce_list); i++)
-	    if (fl0 == announce_list[i])
-	      goto no_fl00;
-	  vec_add1 (announce_list, fl0);
-	}
-
-    no_fl00:
-      fi = fi0;
-      fl = pool_elt_at_index (bm->buffer_free_list_pool, fi);
-
-      vec_add2_aligned (fl->aligned_buffers, f, n_left,
-			/* align */ sizeof (vlib_copy_unit_t));
-    }
-
-  if (follow_buffer_next && ((n_left = n - next_to_free[i_next_to_free]) > 0))
-    {
-      b = next_to_free[i_next_to_free];
-      i_next_to_free ^= 1;
-      goto again;
-    }
-
-  _vec_len (fl->aligned_buffers) = f - fl->aligned_buffers;
-
-  if (vec_len (announce_list))
-    {
-      vlib_buffer_free_list_t *fl;
-      for (i = 0; i < vec_len (announce_list); i++)
-	{
-	  fl = announce_list[i];
-	  fl->buffers_added_to_freelist_function (vm, fl);
-	}
-      _vec_len (announce_list) = 0;
-    }
-#endif
-}
-
-void
-vlib_buffer_free (vlib_main_t * vm, u32 * buffers, u32 n_buffers)
-{
-  vlib_buffer_free_inline (vm, buffers, n_buffers,	/* follow_buffer_next */
-			   1);
-}
-
-void
-vlib_buffer_free_no_next (vlib_main_t * vm, u32 * buffers, u32 n_buffers)
-{
-  vlib_buffer_free_inline (vm, buffers, n_buffers,	/* follow_buffer_next */
-			   0);
-}
-
-#if DPDK == 0
-/* Copy template packet data into buffers as they are allocated. */
-static void
-vlib_packet_template_buffer_init (vlib_main_t * vm,
-				  vlib_buffer_free_list_t * fl,
-				  u32 * buffers, u32 n_buffers)
-{
-  vlib_packet_template_t *t =
-    uword_to_pointer (fl->buffer_init_function_opaque,
-		      vlib_packet_template_t *);
-  uword i;
-
-  for (i = 0; i < n_buffers; i++)
-    {
-      vlib_buffer_t *b = vlib_get_buffer (vm, buffers[i]);
-      ASSERT (b->current_length == vec_len (t->packet_data));
-      clib_memcpy (vlib_buffer_get_current (b), t->packet_data,
-		   b->current_length);
-    }
-}
-#endif
-
-void
-vlib_packet_template_init (vlib_main_t * vm,
-			   vlib_packet_template_t * t,
-			   void *packet_data,
-			   uword n_packet_data_bytes,
-			   uword min_n_buffers_each_physmem_alloc,
-			   char *fmt, ...)
-{
-#if DPDK > 0
-  va_list va;
-  __attribute__ ((unused)) u8 *name;
-
-  va_start (va, fmt);
-  name = va_format (0, fmt, &va);
-  va_end (va);
-
-  vlib_worker_thread_barrier_sync (vm);
-  memset (t, 0, sizeof (t[0]));
-
-  vec_add (t->packet_data, packet_data, n_packet_data_bytes);
-
-  vlib_worker_thread_barrier_release (vm);
-#else
-  vlib_buffer_free_list_t *fl;
-  va_list va;
-  u8 *name;
-
-  va_start (va, fmt);
-  name = va_format (0, fmt, &va);
-  va_end (va);
-
-  memset (t, 0, sizeof (t[0]));
-
-  vec_add (t->packet_data, packet_data, n_packet_data_bytes);
-  t->min_n_buffers_each_physmem_alloc = min_n_buffers_each_physmem_alloc;
-
-  t->free_list_index = vlib_buffer_create_free_list_helper
-    (vm, n_packet_data_bytes,
-     /* is_public */ 1,
-     /* is_default */ 0,
-     name);
-
-  ASSERT (t->free_list_index != 0);
-  fl = vlib_buffer_get_free_list (vm, t->free_list_index);
-  fl->min_n_buffers_each_physmem_alloc = t->min_n_buffers_each_physmem_alloc;
-
-  fl->buffer_init_function = vlib_packet_template_buffer_init;
-  fl->buffer_init_function_opaque = pointer_to_uword (t);
-
-  fl->buffer_init_template.current_data = 0;
-  fl->buffer_init_template.current_length = n_packet_data_bytes;
-  fl->buffer_init_template.flags = 0;
-#endif
-}
-
-void *
-vlib_packet_template_get_packet (vlib_main_t * vm,
-				 vlib_packet_template_t * t, u32 * bi_result)
-{
-  u32 bi;
-  vlib_buffer_t *b;
-
-  if (vlib_buffer_alloc (vm, &bi, 1) != 1)
-    return 0;
-
-  *bi_result = bi;
-
-  b = vlib_get_buffer (vm, bi);
-  clib_memcpy (vlib_buffer_get_current (b),
-	       t->packet_data, vec_len (t->packet_data));
-  b->current_length = vec_len (t->packet_data);
-
-  return b->data;
-}
-
-#if DPDK == 0
-void
-vlib_packet_template_get_packet_helper (vlib_main_t * vm,
-					vlib_packet_template_t * t)
-{
-  word n = t->min_n_buffers_each_physmem_alloc;
-  word l = vec_len (t->packet_data);
-  word n_alloc;
-
-  ASSERT (l > 0);
-  ASSERT (vec_len (t->free_buffers) == 0);
-
-  vec_validate (t->free_buffers, n - 1);
-  n_alloc = vlib_buffer_alloc_from_free_list (vm, t->free_buffers,
-					      n, t->free_list_index);
-  _vec_len (t->free_buffers) = n_alloc;
-}
-
-#endif
-/* Append given data to end of buffer, possibly allocating new buffers. */
-u32
-vlib_buffer_add_data (vlib_main_t * vm,
-		      u32 free_list_index,
-		      u32 buffer_index, void *data, u32 n_data_bytes)
-{
-  u32 n_buffer_bytes, n_left, n_left_this_buffer, bi;
-  vlib_buffer_t *b;
-  void *d;
-
-  bi = buffer_index;
-  if (bi == 0
-      && 1 != vlib_buffer_alloc_from_free_list (vm, &bi, 1, free_list_index))
-    goto out_of_buffers;
-
-  d = data;
-  n_left = n_data_bytes;
-  n_buffer_bytes = vlib_buffer_free_list_buffer_size (vm, free_list_index);
-
-  b = vlib_get_buffer (vm, bi);
-  b->flags &= ~VLIB_BUFFER_TOTAL_LENGTH_VALID;
-
-  /* Get to the end of the chain before we try to append data... */
-  while (b->flags & VLIB_BUFFER_NEXT_PRESENT)
-    b = vlib_get_buffer (vm, b->next_buffer);
-
-  while (1)
-    {
-      u32 n;
-
-      ASSERT (n_buffer_bytes >= b->current_length);
-      n_left_this_buffer =
-	n_buffer_bytes - (b->current_data + b->current_length);
-      n = clib_min (n_left_this_buffer, n_left);
-      clib_memcpy (vlib_buffer_get_current (b) + b->current_length, d, n);
-      b->current_length += n;
-      n_left -= n;
-      if (n_left == 0)
-	break;
-
-      d += n;
-      if (1 !=
-	  vlib_buffer_alloc_from_free_list (vm, &b->next_buffer, 1,
-					    free_list_index))
-	goto out_of_buffers;
-
-      b->flags |= VLIB_BUFFER_NEXT_PRESENT;
-
-      b = vlib_get_buffer (vm, b->next_buffer);
-    }
-
-  return bi;
-
-out_of_buffers:
-  clib_error ("out of buffers");
-  return bi;
-}
-
-u16
-vlib_buffer_chain_append_data_with_alloc (vlib_main_t * vm,
-					  u32 free_list_index,
-					  vlib_buffer_t * first,
-					  vlib_buffer_t ** last,
-					  void *data, u16 data_len)
-{
-  vlib_buffer_t *l = *last;
-  u32 n_buffer_bytes =
-    vlib_buffer_free_list_buffer_size (vm, free_list_index);
-  u16 copied = 0;
-  ASSERT (n_buffer_bytes >= l->current_length + l->current_data);
-  while (data_len)
-    {
-      u16 max = n_buffer_bytes - l->current_length - l->current_data;
-      if (max == 0)
-	{
-	  if (1 !=
-	      vlib_buffer_alloc_from_free_list (vm, &l->next_buffer, 1,
-						free_list_index))
-	    return copied;
-	  *last = l = vlib_buffer_chain_buffer (vm, first, l, l->next_buffer);
-	  max = n_buffer_bytes - l->current_length - l->current_data;
-	}
-
-      u16 len = (data_len > max) ? max : data_len;
-      clib_memcpy (vlib_buffer_get_current (l) + l->current_length,
-		   data + copied, len);
-      vlib_buffer_chain_increase_length (first, l, len);
-      data_len -= len;
-      copied += len;
-    }
-  return copied;
-}
-
-#if DPDK > 0
-clib_error_t *
-vlib_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs,
-			 unsigned socket_id)
-{
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  vlib_physmem_main_t *vpm = &vm->physmem_main;
-  struct rte_mempool *rmp;
-  int i;
-
-  if (!rte_pktmbuf_pool_create)
-    return clib_error_return (0, "not linked with DPDK");
-
-  vec_validate_aligned (bm->pktmbuf_pools, socket_id, CLIB_CACHE_LINE_BYTES);
-
-  /* pool already exists, nothing to do */
-  if (bm->pktmbuf_pools[socket_id])
-    return 0;
-
-  u8 *pool_name = format (0, "mbuf_pool_socket%u%c", socket_id, 0);
-
-  rmp = rte_pktmbuf_pool_create ((char *) pool_name,	/* pool name */
-				 num_mbufs,	/* number of mbufs */
-				 512,	/* cache size */
-				 VLIB_BUFFER_HDR_SIZE,	/* priv size */
-				 VLIB_BUFFER_PRE_DATA_SIZE + VLIB_BUFFER_DATA_SIZE,	/* dataroom size */
-				 socket_id);	/* cpu socket */
-
-  if (rmp)
-    {
-      {
-	uword this_pool_end;
-	uword this_pool_start;
-	uword this_pool_size;
-	uword save_vpm_start, save_vpm_end, save_vpm_size;
-	struct rte_mempool_memhdr *memhdr;
-
-	this_pool_start = ~0ULL;
-	this_pool_end = 0LL;
-
-	STAILQ_FOREACH (memhdr, &rmp->mem_list, next)
-	{
-	  if (((uword) (memhdr->addr + memhdr->len)) > this_pool_end)
-	    this_pool_end = (uword) (memhdr->addr + memhdr->len);
-	  if (((uword) memhdr->addr) < this_pool_start)
-	    this_pool_start = (uword) (memhdr->addr);
-	}
-	ASSERT (this_pool_start < ~0ULL && this_pool_end > 0);
-	this_pool_size = this_pool_end - this_pool_start;
-
-	if (CLIB_DEBUG > 1)
-	  {
-	    clib_warning ("%s: pool start %llx pool end %llx pool size %lld",
-			  pool_name, this_pool_start, this_pool_end,
-			  this_pool_size);
-	    clib_warning
-	      ("before: virtual.start %llx virtual.end %llx virtual.size %lld",
-	       vpm->virtual.start, vpm->virtual.end, vpm->virtual.size);
-	  }
-
-	save_vpm_start = vpm->virtual.start;
-	save_vpm_end = vpm->virtual.end;
-	save_vpm_size = vpm->virtual.size;
-
-	if ((this_pool_start < vpm->virtual.start) || vpm->virtual.start == 0)
-	  vpm->virtual.start = this_pool_start;
-	if (this_pool_end > vpm->virtual.end)
-	  vpm->virtual.end = this_pool_end;
-
-	vpm->virtual.size = vpm->virtual.end - vpm->virtual.start;
-
-	if (CLIB_DEBUG > 1)
-	  {
-	    clib_warning
-	      ("after: virtual.start %llx virtual.end %llx virtual.size %lld",
-	       vpm->virtual.start, vpm->virtual.end, vpm->virtual.size);
-	  }
-
-	/* check if fits into buffer index range */
-	if ((u64) vpm->virtual.size >
-	    ((u64) 1 << (32 + CLIB_LOG2_CACHE_LINE_BYTES)))
-	  {
-	    clib_warning ("physmem: virtual size out of range!");
-	    vpm->virtual.start = save_vpm_start;
-	    vpm->virtual.end = save_vpm_end;
-	    vpm->virtual.size = save_vpm_size;
-	    rmp = 0;
-	  }
-      }
-      if (rmp)
-	{
-	  bm->pktmbuf_pools[socket_id] = rmp;
-	  vec_free (pool_name);
-	  return 0;
-	}
-    }
-
-  vec_free (pool_name);
-
-  /* no usable pool for this socket, try to use pool from another one */
-  for (i = 0; i < vec_len (bm->pktmbuf_pools); i++)
-    {
-      if (bm->pktmbuf_pools[i])
-	{
-	  clib_warning
-	    ("WARNING: Failed to allocate mempool for CPU socket %u. "
-	     "Threads running on socket %u will use socket %u mempool.",
-	     socket_id, socket_id, i);
-	  bm->pktmbuf_pools[socket_id] = bm->pktmbuf_pools[i];
-	  return 0;
-	}
-    }
-
-  return clib_error_return (0, "failed to allocate mempool on socket %u",
-			    socket_id);
-}
-#endif
-
-static void
-vlib_serialize_tx (serialize_main_header_t * m, serialize_stream_t * s)
-{
-  vlib_main_t *vm;
-  vlib_serialize_buffer_main_t *sm;
-  uword n, n_bytes_to_write;
-  vlib_buffer_t *last;
-
-  n_bytes_to_write = s->current_buffer_index;
-  sm =
-    uword_to_pointer (s->data_function_opaque,
-		      vlib_serialize_buffer_main_t *);
-  vm = sm->vlib_main;
-
-  ASSERT (sm->tx.max_n_data_bytes_per_chain > 0);
-  if (serialize_stream_is_end_of_stream (s)
-      || sm->tx.n_total_data_bytes + n_bytes_to_write >
-      sm->tx.max_n_data_bytes_per_chain)
-    {
-      vlib_process_t *p = vlib_get_current_process (vm);
-
-      last = vlib_get_buffer (vm, sm->last_buffer);
-      last->current_length = n_bytes_to_write;
-
-      vlib_set_next_frame_buffer (vm, &p->node_runtime, sm->tx.next_index,
-				  sm->first_buffer);
-
-      sm->first_buffer = sm->last_buffer = ~0;
-      sm->tx.n_total_data_bytes = 0;
-    }
-
-  else if (n_bytes_to_write == 0 && s->n_buffer_bytes == 0)
-    {
-      ASSERT (sm->first_buffer == ~0);
-      ASSERT (sm->last_buffer == ~0);
-      n =
-	vlib_buffer_alloc_from_free_list (vm, &sm->first_buffer, 1,
-					  sm->tx.free_list_index);
-      if (n != 1)
-	serialize_error (m,
-			 clib_error_create
-			 ("vlib_buffer_alloc_from_free_list fails"));
-      sm->last_buffer = sm->first_buffer;
-      s->n_buffer_bytes =
-	vlib_buffer_free_list_buffer_size (vm, sm->tx.free_list_index);
-    }
-
-  if (n_bytes_to_write > 0)
-    {
-      vlib_buffer_t *prev = vlib_get_buffer (vm, sm->last_buffer);
-      n =
-	vlib_buffer_alloc_from_free_list (vm, &sm->last_buffer, 1,
-					  sm->tx.free_list_index);
-      if (n != 1)
-	serialize_error (m,
-			 clib_error_create
-			 ("vlib_buffer_alloc_from_free_list fails"));
-      sm->tx.n_total_data_bytes += n_bytes_to_write;
-      prev->current_length = n_bytes_to_write;
-      prev->next_buffer = sm->last_buffer;
-      prev->flags |= VLIB_BUFFER_NEXT_PRESENT;
-    }
-
-  if (sm->last_buffer != ~0)
-    {
-      last = vlib_get_buffer (vm, sm->last_buffer);
-      s->buffer = vlib_buffer_get_current (last);
-      s->current_buffer_index = 0;
-      ASSERT (last->current_data == s->current_buffer_index);
-    }
-}
-
-static void
-vlib_serialize_rx (serialize_main_header_t * m, serialize_stream_t * s)
-{
-  vlib_main_t *vm;
-  vlib_serialize_buffer_main_t *sm;
-  vlib_buffer_t *last;
-
-  sm =
-    uword_to_pointer (s->data_function_opaque,
-		      vlib_serialize_buffer_main_t *);
-  vm = sm->vlib_main;
-
-  if (serialize_stream_is_end_of_stream (s))
-    return;
-
-  if (sm->last_buffer != ~0)
-    {
-      last = vlib_get_buffer (vm, sm->last_buffer);
-
-      if (last->flags & VLIB_BUFFER_NEXT_PRESENT)
-	sm->last_buffer = last->next_buffer;
-      else
-	{
-	  vlib_buffer_free (vm, &sm->first_buffer, /* count */ 1);
-	  sm->first_buffer = sm->last_buffer = ~0;
-	}
-    }
-
-  if (sm->last_buffer == ~0)
-    {
-      while (clib_fifo_elts (sm->rx.buffer_fifo) == 0)
-	{
-	  sm->rx.ready_one_time_event =
-	    vlib_process_create_one_time_event (vm, vlib_current_process (vm),
-						~0);
-	  vlib_process_wait_for_one_time_event (vm, /* no event data */ 0,
-						sm->rx.ready_one_time_event);
-	}
-
-      clib_fifo_sub1 (sm->rx.buffer_fifo, sm->first_buffer);
-      sm->last_buffer = sm->first_buffer;
-    }
-
-  ASSERT (sm->last_buffer != ~0);
-
-  last = vlib_get_buffer (vm, sm->last_buffer);
-  s->current_buffer_index = 0;
-  s->buffer = vlib_buffer_get_current (last);
-  s->n_buffer_bytes = last->current_length;
-}
-
-static void
-serialize_open_vlib_helper (serialize_main_t * m,
-			    vlib_main_t * vm,
-			    vlib_serialize_buffer_main_t * sm, uword is_read)
-{
-  /* Initialize serialize main but save overflow buffer for re-use between calls. */
-  {
-    u8 *save = m->stream.overflow_buffer;
-    memset (m, 0, sizeof (m[0]));
-    m->stream.overflow_buffer = save;
-    if (save)
-      _vec_len (save) = 0;
-  }
-
-  sm->first_buffer = sm->last_buffer = ~0;
-  if (is_read)
-    clib_fifo_reset (sm->rx.buffer_fifo);
-  else
-    sm->tx.n_total_data_bytes = 0;
-  sm->vlib_main = vm;
-  m->header.data_function = is_read ? vlib_serialize_rx : vlib_serialize_tx;
-  m->stream.data_function_opaque = pointer_to_uword (sm);
-}
-
-void
-serialize_open_vlib_buffer (serialize_main_t * m, vlib_main_t * vm,
-			    vlib_serialize_buffer_main_t * sm)
-{
-  serialize_open_vlib_helper (m, vm, sm, /* is_read */ 0);
-}
-
-void
-unserialize_open_vlib_buffer (serialize_main_t * m, vlib_main_t * vm,
-			      vlib_serialize_buffer_main_t * sm)
-{
-  serialize_open_vlib_helper (m, vm, sm, /* is_read */ 1);
-}
-
-u32
-serialize_close_vlib_buffer (serialize_main_t * m)
-{
-  vlib_serialize_buffer_main_t *sm
-    = uword_to_pointer (m->stream.data_function_opaque,
-			vlib_serialize_buffer_main_t *);
-  vlib_buffer_t *last;
-  serialize_stream_t *s = &m->stream;
-
-  last = vlib_get_buffer (sm->vlib_main, sm->last_buffer);
-  last->current_length = s->current_buffer_index;
-
-  if (vec_len (s->overflow_buffer) > 0)
-    {
-      sm->last_buffer
-	= vlib_buffer_add_data (sm->vlib_main, sm->tx.free_list_index,
-				sm->last_buffer == ~0 ? 0 : sm->last_buffer,
-				s->overflow_buffer,
-				vec_len (s->overflow_buffer));
-      _vec_len (s->overflow_buffer) = 0;
-    }
-
-  return sm->first_buffer;
-}
-
-void
-unserialize_close_vlib_buffer (serialize_main_t * m)
-{
-  vlib_serialize_buffer_main_t *sm
-    = uword_to_pointer (m->stream.data_function_opaque,
-			vlib_serialize_buffer_main_t *);
-  if (sm->first_buffer != ~0)
-    vlib_buffer_free_one (sm->vlib_main, sm->first_buffer);
-  clib_fifo_reset (sm->rx.buffer_fifo);
-  if (m->stream.overflow_buffer)
-    _vec_len (m->stream.overflow_buffer) = 0;
-}
-
-static u8 *
-format_vlib_buffer_free_list (u8 * s, va_list * va)
-{
-  vlib_buffer_free_list_t *f = va_arg (*va, vlib_buffer_free_list_t *);
-#if DPDK > 0
-  u32 threadnum = va_arg (*va, u32);
-  uword bytes_alloc, bytes_free, n_free, size;
-
-  if (!f)
-    return format (s, "%=7s%=30s%=12s%=12s%=12s%=12s%=12s%=12s",
-		   "Thread", "Name", "Index", "Size", "Alloc", "Free",
-		   "#Alloc", "#Free");
-
-  size = sizeof (vlib_buffer_t) + f->n_data_bytes;
-  n_free = vec_len (f->aligned_buffers) + vec_len (f->unaligned_buffers);
-  bytes_alloc = size * f->n_alloc;
-  bytes_free = size * n_free;
-
-  s = format (s, "%7d%30s%12d%12d%=12U%=12U%=12d%=12d", threadnum,
-#else
-  uword bytes_alloc, bytes_free, n_free, size;
-
-  if (!f)
-    return format (s, "%=30s%=12s%=12s%=12s%=12s%=12s%=12s",
-		   "Name", "Index", "Size", "Alloc", "Free", "#Alloc",
-		   "#Free");
-
-  size = sizeof (vlib_buffer_t) + f->n_data_bytes;
-  n_free = vec_len (f->aligned_buffers) + vec_len (f->unaligned_buffers);
-  bytes_alloc = size * f->n_alloc;
-  bytes_free = size * n_free;
-
-  s = format (s, "%30s%12d%12d%=12U%=12U%=12d%=12d",
-#endif
-	      f->name, f->index, f->n_data_bytes,
-	      format_memory_size, bytes_alloc,
-	      format_memory_size, bytes_free, f->n_alloc, n_free);
-
-  return s;
-}
-
-static clib_error_t *
-show_buffers (vlib_main_t * vm,
-	      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-#if DPDK > 0
-  vlib_buffer_main_t *bm;
-  vlib_buffer_free_list_t *f;
-  vlib_main_t *curr_vm;
-  u32 vm_index = 0;
-
-  vlib_cli_output (vm, "%U", format_vlib_buffer_free_list, 0, 0);
-
-  do
-    {
-      curr_vm = vec_len (vlib_mains) ? vlib_mains[vm_index] : vm;
-      bm = curr_vm->buffer_main;
-
-    /* *INDENT-OFF* */
-    pool_foreach (f, bm->buffer_free_list_pool, ({
-      vlib_cli_output (vm, "%U", format_vlib_buffer_free_list, f, vm_index);
-    }));
-    /* *INDENT-ON* */
-
-      vm_index++;
-    }
-  while (vm_index < vec_len (vlib_mains));
-
-#else
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  vlib_buffer_free_list_t *f;
-
-  vlib_cli_output (vm, "%U", format_vlib_buffer_free_list, 0);
-  /* *INDENT-OFF* */
-  pool_foreach (f, bm->buffer_free_list_pool, ({
-    vlib_cli_output (vm, "%U", format_vlib_buffer_free_list, f);
-  }));
-/* *INDENT-ON* */
-
-#endif
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_buffers_command, static) = {
-  .path = "show buffers",
-  .short_help = "Show packet buffer allocation",
-  .function = show_buffers,
-};
-/* *INDENT-ON* */
-
-#if DPDK > 0
-#if CLIB_DEBUG > 0
-
-u32 *vlib_buffer_state_validation_lock;
-uword *vlib_buffer_state_validation_hash;
-void *vlib_buffer_state_heap;
-
-static clib_error_t *
-buffer_state_validation_init (vlib_main_t * vm)
-{
-  void *oldheap;
-
-  vlib_buffer_state_heap = mheap_alloc (0, 10 << 20);
-
-  oldheap = clib_mem_set_heap (vlib_buffer_state_heap);
-
-  vlib_buffer_state_validation_hash = hash_create (0, sizeof (uword));
-  vec_validate_aligned (vlib_buffer_state_validation_lock, 0,
-			CLIB_CACHE_LINE_BYTES);
-  clib_mem_set_heap (oldheap);
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (buffer_state_validation_init);
-#endif
-#endif
-
-
-/** @endcond */
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/buffer.h b/vlib/vlib/buffer.h
deleted file mode 100644
index 5f1e62f0..00000000
--- a/vlib/vlib/buffer.h
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * buffer.h: VLIB buffers
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_buffer_h
-#define included_vlib_buffer_h
-
-#include <vppinfra/types.h>
-#include <vppinfra/cache.h>
-#include <vppinfra/serialize.h>
-#include <vppinfra/vector.h>
-#include <vlib/error.h>		/* for vlib_error_t */
-
-#if DPDK > 0
-#include <rte_config.h>
-#define VLIB_BUFFER_DATA_SIZE		(2048)
-#define VLIB_BUFFER_PRE_DATA_SIZE	RTE_PKTMBUF_HEADROOM
-#else
-#include <vlib/config.h>	/* for __PRE_DATA_SIZE */
-#define VLIB_BUFFER_DATA_SIZE		(512)
-#define VLIB_BUFFER_PRE_DATA_SIZE	__PRE_DATA_SIZE
-#endif
-
-#if defined (CLIB_HAVE_VEC128) || defined (__aarch64__)
-typedef u8x16 vlib_copy_unit_t;
-#else
-typedef u64 vlib_copy_unit_t;
-#endif
-
-/** \file
-    vlib buffer structure definition and a few select
-    access methods. This structure and the buffer allocation
-    mechanism should perhaps live in vnet, but it would take a lot
-    of typing to make it so.
-*/
-
-/* VLIB buffer representation. */
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  /* Offset within data[] that we are currently processing.
-     If negative current header points into predata area. */
-  i16 current_data;  /**< signed offset in data[], pre_data[]
-                        that we are currently processing.
-                        If negative current header points into predata area.
-                     */
-  u16 current_length;  /**< Nbytes between current data and
-                          the end of this buffer.
-                       */
-  u32 flags; /**< buffer flags:
-                <br> VLIB_BUFFER_IS_TRACED: trace this buffer.
-                <br> VLIB_BUFFER_NEXT_PRESENT: this is a multi-chunk buffer.
-                <br> VLIB_BUFFER_TOTAL_LENGTH_VALID: as it says
-                <br> VLIB_BUFFER_REPL_FAIL: packet replication failure
-                <br> VLIB_BUFFER_RECYCLE: as it says
-                <br> VLIB_BUFFER_FLOW_REPORT: buffer is a flow report,
-                set to avoid adding it to a flow report
-                <br> VLIB_BUFFER_FLAG_USER(n): user-defined bit N
-             */
-#define VLIB_BUFFER_IS_TRACED (1 << 0)
-#define VLIB_BUFFER_LOG2_NEXT_PRESENT (1)
-#define VLIB_BUFFER_NEXT_PRESENT (1 << VLIB_BUFFER_LOG2_NEXT_PRESENT)
-#define VLIB_BUFFER_IS_RECYCLED (1 << 2)
-#define VLIB_BUFFER_TOTAL_LENGTH_VALID (1 << 3)
-#define VLIB_BUFFER_REPL_FAIL (1 << 4)
-#define VLIB_BUFFER_RECYCLE (1 << 5)
-#define VLIB_BUFFER_FLOW_REPORT (1 << 6)
-
-  /* User defined buffer flags. */
-#define LOG2_VLIB_BUFFER_FLAG_USER(n) (32 - (n))
-#define VLIB_BUFFER_FLAG_USER(n) (1 << LOG2_VLIB_BUFFER_FLAG_USER(n))
-
-  u32 free_list_index; /**< Buffer free list that this buffer was
-                          allocated from and will be freed to.
-                       */
-
-  u32 total_length_not_including_first_buffer;
-  /**< Only valid for first buffer in chain. Current length plus
-     total length given here give total number of bytes in buffer chain.
-  */
-
-  u32 next_buffer;   /**< Next buffer for this linked-list of buffers.
-                        Only valid if VLIB_BUFFER_NEXT_PRESENT flag is set.
-                     */
-
-  vlib_error_t error;	/**< Error code for buffers to be enqueued
-                           to error handler.
-                        */
-  u32 current_config_index; /**< Used by feature subgraph arcs to
-                               visit enabled feature nodes
-                            */
-
-  u8 feature_arc_index;	/**< Used to identify feature arcs by intermediate
-                           feature node
-                        */
-
-  u8 dont_waste_me[3]; /**< Available space in the (precious)
-                          first 32 octets of buffer metadata
-                          Before allocating any of it, discussion required!
-                       */
-
-  u32 opaque[8]; /**< Opaque data used by sub-graphs for their own purposes.
-                    See .../vnet/vnet/buffer.h
-                 */
-    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
-
-  u32 trace_index; /**< Specifies index into trace buffer
-                      if VLIB_PACKET_IS_TRACED flag is set.
-                   */
-  u32 recycle_count; /**< Used by L2 path recycle code */
-  u32 opaque2[14];  /**< More opaque data, currently unused */
-
-  /***** end of second cache line */
-    CLIB_CACHE_LINE_ALIGN_MARK (cacheline2);
-  u8 pre_data[VLIB_BUFFER_PRE_DATA_SIZE];  /**< Space for inserting data
-                                               before buffer start.
-                                               Packet rewrite string will be
-                                               rewritten backwards and may extend
-                                               back before buffer->data[0].
-                                               Must come directly before packet data.
-                                            */
-
-  u8 data[0]; /**< Packet data. Hardware DMA here */
-} vlib_buffer_t;		/* Must be a multiple of 64B. */
-
-#define VLIB_BUFFER_HDR_SIZE  (sizeof(vlib_buffer_t) - VLIB_BUFFER_PRE_DATA_SIZE)
-
-/** \brief Prefetch buffer metadata.
-    The first 64 bytes of buffer contains most header information
-
-    @param b - (vlib_buffer_t *) pointer to the buffer
-    @param type - LOAD, STORE. In most cases, STORE is the right answer
-*/
-
-#define vlib_prefetch_buffer_header(b,type) CLIB_PREFETCH (b, 64, type)
-
-always_inline vlib_buffer_t *
-vlib_buffer_next_contiguous (vlib_buffer_t * b, u32 buffer_bytes)
-{
-  return (void *) (b + 1) + buffer_bytes;
-}
-
-always_inline void
-vlib_buffer_struct_is_sane (vlib_buffer_t * b)
-{
-  ASSERT (sizeof (b[0]) % 64 == 0);
-
-  /* Rewrite data must be before and contiguous with packet data. */
-  ASSERT (b->pre_data + VLIB_BUFFER_PRE_DATA_SIZE == b->data);
-}
-
-/** \brief Get pointer to current data to process
-
-    @param b - (vlib_buffer_t *) pointer to the buffer
-    @return - (void *) (b->data + b->current_data)
-*/
-
-always_inline void *
-vlib_buffer_get_current (vlib_buffer_t * b)
-{
-  /* Check bounds. */
-  ASSERT ((signed) b->current_data >= (signed) -VLIB_BUFFER_PRE_DATA_SIZE);
-  return b->data + b->current_data;
-}
-
-/** \brief Advance current data pointer by the supplied (signed!) amount
-
-    @param b - (vlib_buffer_t *) pointer to the buffer
-    @param l - (word) signed increment
-*/
-always_inline void
-vlib_buffer_advance (vlib_buffer_t * b, word l)
-{
-  ASSERT (b->current_length >= l);
-  b->current_data += l;
-  b->current_length -= l;
-}
-
-/** \brief Reset current header & length to state they were in when
-    packet was received.
-
-    @param b - (vlib_buffer_t *) pointer to the buffer
-*/
-
-always_inline void
-vlib_buffer_reset (vlib_buffer_t * b)
-{
-  b->current_length += clib_max (b->current_data, 0);
-  b->current_data = 0;
-}
-
-/** \brief Get pointer to buffer's opaque data array
-
-    @param b - (vlib_buffer_t *) pointer to the buffer
-    @return - (void *) b->opaque
-*/
-always_inline void *
-vlib_get_buffer_opaque (vlib_buffer_t * b)
-{
-  return (void *) b->opaque;
-}
-
-/** \brief Get pointer to buffer's opaque2 data array
-
-    @param b - (vlib_buffer_t *) pointer to the buffer
-    @return - (void *) b->opaque2
-*/
-always_inline void *
-vlib_get_buffer_opaque2 (vlib_buffer_t * b)
-{
-  return (void *) b->opaque2;
-}
-
-/* Forward declaration. */
-struct vlib_main_t;
-
-typedef struct vlib_buffer_free_list_t
-{
-  /* Template buffer used to initialize first 16 bytes of buffers
-     allocated on this free list. */
-  vlib_buffer_t buffer_init_template;
-
-  /* Our index into vlib_main_t's buffer_free_list_pool. */
-  u32 index;
-
-  /* Number of data bytes for buffers in this free list. */
-  u32 n_data_bytes;
-
-  /* Number of buffers to allocate when we need to allocate new buffers
-     from physmem heap. */
-  u32 min_n_buffers_each_physmem_alloc;
-
-  /* Total number of buffers allocated from this free list. */
-  u32 n_alloc;
-
-  /* Vector of free buffers.  Each element is a byte offset into I/O heap.
-     Aligned vectors always has naturally aligned vlib_copy_unit_t sized chunks
-     of buffer indices.  Unaligned vector has any left over.  This is meant to
-     speed up copy routines. */
-  u32 *aligned_buffers, *unaligned_buffers;
-
-  /* Memory chunks allocated for this free list
-     recorded here so they can be freed when free list
-     is deleted. */
-  void **buffer_memory_allocated;
-
-  /* Free list name. */
-  u8 *name;
-
-  /* Callback functions to initialize newly allocated buffers.
-     If null buffers are zeroed. */
-  void (*buffer_init_function) (struct vlib_main_t * vm,
-				struct vlib_buffer_free_list_t * fl,
-				u32 * buffers, u32 n_buffers);
-
-  /* Callback function to announce that buffers have been
-     added to the freelist */
-  void (*buffers_added_to_freelist_function)
-    (struct vlib_main_t * vm, struct vlib_buffer_free_list_t * fl);
-
-  uword buffer_init_function_opaque;
-} __attribute__ ((aligned (16))) vlib_buffer_free_list_t;
-
-typedef struct
-{
-  /* Buffer free callback, for subversive activities */
-  u32 (*buffer_free_callback) (struct vlib_main_t * vm,
-			       u32 * buffers,
-			       u32 n_buffers, u32 follow_buffer_next);
-  /* Pool of buffer free lists.
-     Multiple free lists exist for packet generator which uses
-     separate free lists for each packet stream --- so as to avoid
-     initializing static data for each packet generated. */
-  vlib_buffer_free_list_t *buffer_free_list_pool;
-#define VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX (0)
-#define VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES VLIB_BUFFER_DATA_SIZE
-
-  /* Hash table mapping buffer size (rounded to next unit of
-     sizeof (vlib_buffer_t)) to free list index. */
-  uword *free_list_by_size;
-
-  /* Hash table mapping buffer index into number
-     0 => allocated but free, 1 => allocated and not-free.
-     If buffer index is not in hash table then this buffer
-     has never been allocated. */
-  uword *buffer_known_hash;
-
-  /* List of free-lists needing Blue Light Special announcements */
-  vlib_buffer_free_list_t **announce_list;
-
-  /*  Vector of rte_mempools per socket */
-#if DPDK == 1
-  struct rte_mempool **pktmbuf_pools;
-#endif
-} vlib_buffer_main_t;
-
-typedef struct
-{
-  struct vlib_main_t *vlib_main;
-
-  u32 first_buffer, last_buffer;
-
-  union
-  {
-    struct
-    {
-      /* Total accumulated bytes in chain starting with first_buffer. */
-      u32 n_total_data_bytes;
-
-      /* Max number of bytes to accumulate in chain starting with first_buffer.
-         As this limit is reached buffers are enqueued to next node. */
-      u32 max_n_data_bytes_per_chain;
-
-      /* Next node to enqueue buffers to relative to current process node. */
-      u32 next_index;
-
-      /* Free list to use to allocate new buffers. */
-      u32 free_list_index;
-    } tx;
-
-    struct
-    {
-      /* CLIB fifo of buffer indices waiting to be unserialized. */
-      u32 *buffer_fifo;
-
-      /* Event type used to signal that RX buffers have been added to fifo. */
-      uword ready_one_time_event;
-    } rx;
-  };
-} vlib_serialize_buffer_main_t;
-
-void serialize_open_vlib_buffer (serialize_main_t * m, struct vlib_main_t *vm,
-				 vlib_serialize_buffer_main_t * sm);
-void unserialize_open_vlib_buffer (serialize_main_t * m,
-				   struct vlib_main_t *vm,
-				   vlib_serialize_buffer_main_t * sm);
-
-u32 serialize_close_vlib_buffer (serialize_main_t * m);
-void unserialize_close_vlib_buffer (serialize_main_t * m);
-void *vlib_set_buffer_free_callback (struct vlib_main_t *vm, void *fp);
-
-always_inline u32
-serialize_vlib_buffer_n_bytes (serialize_main_t * m)
-{
-  serialize_stream_t *s = &m->stream;
-  vlib_serialize_buffer_main_t *sm
-    = uword_to_pointer (m->stream.data_function_opaque,
-			vlib_serialize_buffer_main_t *);
-  return sm->tx.n_total_data_bytes + s->current_buffer_index +
-    vec_len (s->overflow_buffer);
-}
-
-#if DPDK > 0
-#define rte_mbuf_from_vlib_buffer(x) (((struct rte_mbuf *)x) - 1)
-#define vlib_buffer_from_rte_mbuf(x) ((vlib_buffer_t *)(x+1))
-#endif
-
-/*
- */
-
-/** \brief Compile time buffer trajectory tracing option
-    Turn this on if you run into "bad monkey" contexts,
-    and you want to know exactly which nodes they've visited...
-    See vlib/main.c...
-*/
-#define VLIB_BUFFER_TRACE_TRAJECTORY 0
-
-#if VLIB_BUFFER_TRACE_TRAJECTORY > 0
-#define VLIB_BUFFER_TRACE_TRAJECTORY_INIT(b) (b)->pre_data[0]=0
-#else
-#define VLIB_BUFFER_TRACE_TRAJECTORY_INIT(b)
-#endif /* VLIB_BUFFER_TRACE_TRAJECTORY */
-
-#endif /* included_vlib_buffer_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/buffer_funcs.h b/vlib/vlib/buffer_funcs.h
deleted file mode 100644
index 75716eca..00000000
--- a/vlib/vlib/buffer_funcs.h
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * buffer_funcs.h: VLIB buffer related functions/inlines
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_buffer_funcs_h
-#define included_vlib_buffer_funcs_h
-
-#include <vppinfra/hash.h>
-
-/** \file
-    vlib buffer access methods.
-*/
-
-
-/** \brief Translate buffer index into buffer pointer
-
-    @param vm - (vlib_main_t *) vlib main data structure pointer
-    @param buffer_index - (u32) buffer index
-    @return - (vlib_buffer_t *) buffer pointer
-*/
-always_inline vlib_buffer_t *
-vlib_get_buffer (vlib_main_t * vm, u32 buffer_index)
-{
-  return vlib_physmem_at_offset (&vm->physmem_main, ((uword) buffer_index)
-				 << CLIB_LOG2_CACHE_LINE_BYTES);
-}
-
-/** \brief Translate buffer pointer into buffer index
-
-    @param vm - (vlib_main_t *) vlib main data structure pointer
-    @param p - (void *) buffer pointer
-    @return - (u32) buffer index
-*/
-always_inline u32
-vlib_get_buffer_index (vlib_main_t * vm, void *p)
-{
-  uword offset = vlib_physmem_offset_of (&vm->physmem_main, p);
-  ASSERT ((offset % (1 << CLIB_LOG2_CACHE_LINE_BYTES)) == 0);
-  return offset >> CLIB_LOG2_CACHE_LINE_BYTES;
-}
-
-/** \brief Get next buffer in buffer linklist, or zero for end of list.
-
-    @param vm - (vlib_main_t *) vlib main data structure pointer
-    @param b - (void *) buffer pointer
-    @return - (vlib_buffer_t *) next buffer, or NULL
-*/
-always_inline vlib_buffer_t *
-vlib_get_next_buffer (vlib_main_t * vm, vlib_buffer_t * b)
-{
-  return (b->flags & VLIB_BUFFER_NEXT_PRESENT
-	  ? vlib_get_buffer (vm, b->next_buffer) : 0);
-}
-
-uword vlib_buffer_length_in_chain_slow_path (vlib_main_t * vm,
-					     vlib_buffer_t * b_first);
-
-/** \brief Get length in bytes of the buffer chain
-
-    @param vm - (vlib_main_t *) vlib main data structure pointer
-    @param b - (void *) buffer pointer
-    @return - (uword) length of buffer chain
-*/
-always_inline uword
-vlib_buffer_length_in_chain (vlib_main_t * vm, vlib_buffer_t * b)
-{
-  uword l = b->current_length + b->total_length_not_including_first_buffer;
-  if (PREDICT_FALSE ((b->flags & (VLIB_BUFFER_NEXT_PRESENT
-				  | VLIB_BUFFER_TOTAL_LENGTH_VALID))
-		     == VLIB_BUFFER_NEXT_PRESENT))
-    return vlib_buffer_length_in_chain_slow_path (vm, b);
-  return l;
-}
-
-/** \brief Get length in bytes of the buffer index buffer chain
-
-    @param vm - (vlib_main_t *) vlib main data structure pointer
-    @param bi - (u32) buffer index
-    @return - (uword) length of buffer chain
-*/
-always_inline uword
-vlib_buffer_index_length_in_chain (vlib_main_t * vm, u32 bi)
-{
-  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
-  return vlib_buffer_length_in_chain (vm, b);
-}
-
-/** \brief Copy buffer contents to memory
-
-    @param vm - (vlib_main_t *) vlib main data structure pointer
-    @param buffer_index - (u32) buffer index
-    @param contents - (u8 *) memory, <strong>must be large enough</strong>
-    @return - (uword) length of buffer chain
-*/
-always_inline uword
-vlib_buffer_contents (vlib_main_t * vm, u32 buffer_index, u8 * contents)
-{
-  uword content_len = 0;
-  uword l;
-  vlib_buffer_t *b;
-
-  while (1)
-    {
-      b = vlib_get_buffer (vm, buffer_index);
-      l = b->current_length;
-      clib_memcpy (contents + content_len, b->data + b->current_data, l);
-      content_len += l;
-      if (!(b->flags & VLIB_BUFFER_NEXT_PRESENT))
-	break;
-      buffer_index = b->next_buffer;
-    }
-
-  return content_len;
-}
-
-/* Return physical address of buffer->data start. */
-always_inline u64
-vlib_get_buffer_data_physical_address (vlib_main_t * vm, u32 buffer_index)
-{
-  return vlib_physmem_offset_to_physical (&vm->physmem_main,
-					  (((uword) buffer_index) <<
-					   CLIB_LOG2_CACHE_LINE_BYTES) +
-					  STRUCT_OFFSET_OF (vlib_buffer_t,
-							    data));
-}
-
-/** \brief Prefetch buffer metadata by buffer index
-    The first 64 bytes of buffer contains most header information
-
-    @param vm - (vlib_main_t *) vlib main data structure pointer
-    @param bi - (u32) buffer index
-    @param type - LOAD, STORE. In most cases, STORE is the right answer
-*/
-/* Prefetch buffer header given index. */
-#define vlib_prefetch_buffer_with_index(vm,bi,type)	\
-  do {							\
-    vlib_buffer_t * _b = vlib_get_buffer (vm, bi);	\
-    vlib_prefetch_buffer_header (_b, type);		\
-  } while (0)
-
-#if 0
-/* Iterate over known allocated vlib bufs. You probably do not want
- * to do this!
- @param vm      the vlib_main_t
- @param bi      found allocated buffer index
- @param body    operation to perform on buffer index
- function executes body for each allocated buffer index
- */
-#define vlib_buffer_foreach_allocated(vm,bi,body)                \
-do {                                                             \
-  vlib_main_t * _vmain = (vm);                                   \
-  vlib_buffer_main_t * _bmain = &_vmain->buffer_main;            \
-  hash_pair_t * _vbpair;                                         \
-  hash_foreach_pair(_vbpair, _bmain->buffer_known_hash, ({       \
-    if (VLIB_BUFFER_KNOWN_ALLOCATED == _vbpair->value[0]) {      \
-      (bi) = _vbpair->key;                                       \
-      body;                                                      \
-    }                                                            \
-  }));                                                           \
-} while (0)
-#endif
-
-#if DPDK == 0
-
-typedef enum
-{
-  /* Index is unknown. */
-  VLIB_BUFFER_UNKNOWN,
-
-  /* Index is known and free/allocated. */
-  VLIB_BUFFER_KNOWN_FREE,
-  VLIB_BUFFER_KNOWN_ALLOCATED,
-} vlib_buffer_known_state_t;
-
-always_inline vlib_buffer_known_state_t
-vlib_buffer_is_known (vlib_main_t * vm, u32 buffer_index)
-{
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  ASSERT (os_get_cpu_number () == 0);
-
-  uword *p = hash_get (bm->buffer_known_hash, buffer_index);
-  return p ? p[0] : VLIB_BUFFER_UNKNOWN;
-}
-
-always_inline void
-vlib_buffer_set_known_state (vlib_main_t * vm,
-			     u32 buffer_index,
-			     vlib_buffer_known_state_t state)
-{
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  ASSERT (os_get_cpu_number () == 0);
-  hash_set (bm->buffer_known_hash, buffer_index, state);
-}
-
-/* Validates sanity of a single buffer.
-   Returns format'ed vector with error message if any. */
-u8 *vlib_validate_buffer (vlib_main_t * vm, u32 buffer_index,
-			  uword follow_chain);
-
-#endif /* DPDK == 0 */
-
-clib_error_t *vlib_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs,
-				       unsigned socket_id);
-
-/** \brief Allocate buffers into supplied array
-
-    @param vm - (vlib_main_t *) vlib main data structure pointer
-    @param buffers - (u32 * ) buffer index array
-    @param n_buffers - (u32) number of buffers requested
-    @return - (u32) number of buffers actually allocated, may be
-    less than the number requested or zero
-*/
-u32 vlib_buffer_alloc (vlib_main_t * vm, u32 * buffers, u32 n_buffers);
-
-always_inline u32
-vlib_buffer_round_size (u32 size)
-{
-  return round_pow2 (size, sizeof (vlib_buffer_t));
-}
-
-/** \brief Allocate buffers from specific freelist into supplied array
-
-    @param vm - (vlib_main_t *) vlib main data structure pointer
-    @param buffers - (u32 * ) buffer index array
-    @param n_buffers - (u32) number of buffers requested
-    @return - (u32) number of buffers actually allocated, may be
-    less than the number requested or zero
-*/
-u32 vlib_buffer_alloc_from_free_list (vlib_main_t * vm,
-				      u32 * buffers,
-				      u32 n_buffers, u32 free_list_index);
-
-/** \brief Free buffers
-    Frees the entire buffer chain for each buffer
-
-    @param vm - (vlib_main_t *) vlib main data structure pointer
-    @param buffers - (u32 * ) buffer index array
-    @param n_buffers - (u32) number of buffers to free
-
-*/
-void vlib_buffer_free (vlib_main_t * vm,
-		       /* pointer to first buffer */
-		       u32 * buffers,
-		       /* number of buffers to free */
-		       u32 n_buffers);
-
-/** \brief Free buffers, does not free the buffer chain for each buffer
-
-    @param vm - (vlib_main_t *) vlib main data structure pointer
-    @param buffers - (u32 * ) buffer index array
-    @param n_buffers - (u32) number of buffers to free
-
-*/
-void vlib_buffer_free_no_next (vlib_main_t * vm,
-			       /* pointer to first buffer */
-			       u32 * buffers,
-			       /* number of buffers to free */
-			       u32 n_buffers);
-
-/** \brief Free one buffer
-    Shorthand to free a single buffer chain.
-
-    @param vm - (vlib_main_t *) vlib main data structure pointer
-    @param buffer_index - (u32) buffer index to free
-*/
-always_inline void
-vlib_buffer_free_one (vlib_main_t * vm, u32 buffer_index)
-{
-  vlib_buffer_free (vm, &buffer_index, /* n_buffers */ 1);
-}
-
-/* Add/delete buffer free lists. */
-u32 vlib_buffer_create_free_list (vlib_main_t * vm, u32 n_data_bytes,
-				  char *fmt, ...);
-void vlib_buffer_delete_free_list (vlib_main_t * vm, u32 free_list_index);
-
-/* Find already existing public free list with given size or create one. */
-u32 vlib_buffer_get_or_create_free_list (vlib_main_t * vm, u32 n_data_bytes,
-					 char *fmt, ...);
-
-always_inline vlib_buffer_free_list_t *
-vlib_buffer_get_free_list (vlib_main_t * vm, u32 free_list_index)
-{
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  vlib_buffer_free_list_t *f;
-
-  f = pool_elt_at_index (bm->buffer_free_list_pool, free_list_index);
-
-  /* Sanity: indices must match. */
-  ASSERT (f->index == free_list_index);
-
-  return f;
-}
-
-always_inline u32
-vlib_buffer_free_list_buffer_size (vlib_main_t * vm, u32 free_list_index)
-{
-  vlib_buffer_free_list_t *f =
-    vlib_buffer_get_free_list (vm, free_list_index);
-  return f->n_data_bytes;
-}
-
-void vlib_aligned_memcpy (void *_dst, void *_src, int n_bytes);
-
-/* Reasonably fast buffer copy routine. */
-always_inline void
-vlib_copy_buffers (u32 * dst, u32 * src, u32 n)
-{
-  while (n >= 4)
-    {
-      dst[0] = src[0];
-      dst[1] = src[1];
-      dst[2] = src[2];
-      dst[3] = src[3];
-      dst += 4;
-      src += 4;
-      n -= 4;
-    }
-  while (n > 0)
-    {
-      dst[0] = src[0];
-      dst += 1;
-      src += 1;
-      n -= 1;
-    }
-}
-
-always_inline void *
-vlib_physmem_alloc_aligned (vlib_main_t * vm, clib_error_t ** error,
-			    uword n_bytes, uword alignment)
-{
-  void *r =
-    vm->os_physmem_alloc_aligned (&vm->physmem_main, n_bytes, alignment);
-  if (!r)
-    *error =
-      clib_error_return (0, "failed to allocate %wd bytes of I/O memory",
-			 n_bytes);
-  else
-    *error = 0;
-  return r;
-}
-
-/* By default allocate I/O memory with cache line alignment. */
-always_inline void *
-vlib_physmem_alloc (vlib_main_t * vm, clib_error_t ** error, uword n_bytes)
-{
-  return vlib_physmem_alloc_aligned (vm, error, n_bytes,
-				     CLIB_CACHE_LINE_BYTES);
-}
-
-always_inline void
-vlib_physmem_free (vlib_main_t * vm, void *mem)
-{
-  return vm->os_physmem_free (mem);
-}
-
-always_inline u64
-vlib_physmem_virtual_to_physical (vlib_main_t * vm, void *mem)
-{
-  vlib_physmem_main_t *pm = &vm->physmem_main;
-  uword o = pointer_to_uword (mem) - pm->virtual.start;
-  return vlib_physmem_offset_to_physical (pm, o);
-}
-
-/* Append given data to end of buffer, possibly allocating new buffers. */
-u32 vlib_buffer_add_data (vlib_main_t * vm,
-			  u32 free_list_index,
-			  u32 buffer_index, void *data, u32 n_data_bytes);
-
-/* duplicate all buffers in chain */
-always_inline vlib_buffer_t *
-vlib_buffer_copy (vlib_main_t * vm, vlib_buffer_t * b)
-{
-  vlib_buffer_t *s, *d, *fd;
-  uword n_alloc, n_buffers = 1;
-  u32 *new_buffers = 0;
-  u32 flag_mask = VLIB_BUFFER_NEXT_PRESENT | VLIB_BUFFER_TOTAL_LENGTH_VALID;
-  int i;
-
-  s = b;
-  while (s->flags & VLIB_BUFFER_NEXT_PRESENT)
-    {
-      n_buffers++;
-      s = vlib_get_buffer (vm, s->next_buffer);
-    }
-
-  vec_validate (new_buffers, n_buffers - 1);
-  n_alloc = vlib_buffer_alloc (vm, new_buffers, n_buffers);
-  ASSERT (n_alloc == n_buffers);
-
-  /* 1st segment */
-  s = b;
-  fd = d = vlib_get_buffer (vm, new_buffers[0]);
-  d->current_data = s->current_data;
-  d->current_length = s->current_length;
-  d->flags = s->flags & flag_mask;
-  d->total_length_not_including_first_buffer =
-    s->total_length_not_including_first_buffer;
-  clib_memcpy (d->opaque, s->opaque, sizeof (s->opaque));
-  clib_memcpy (vlib_buffer_get_current (d),
-	       vlib_buffer_get_current (s), s->current_length);
-
-  /* next segments */
-  for (i = 1; i < n_buffers; i++)
-    {
-      /* previous */
-      d->next_buffer = new_buffers[i];
-      /* current */
-      s = vlib_get_buffer (vm, s->next_buffer);
-      d = vlib_get_buffer (vm, new_buffers[i]);
-      d->current_data = s->current_data;
-      d->current_length = s->current_length;
-      clib_memcpy (vlib_buffer_get_current (d),
-		   vlib_buffer_get_current (s), s->current_length);
-      d->flags = s->flags & flag_mask;
-    }
-
-  return fd;
-}
-
-/*
- * vlib_buffer_chain_* functions provide a way to create long buffers.
- * When DPDK is enabled, the 'hidden' DPDK header is taken care of transparently.
- */
-
-/* Initializes the buffer as an empty packet with no chained buffers. */
-always_inline void
-vlib_buffer_chain_init (vlib_buffer_t * first)
-{
-  first->total_length_not_including_first_buffer = 0;
-  first->current_length = 0;
-  first->flags &= ~VLIB_BUFFER_NEXT_PRESENT;
-  first->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
-}
-
-/* The provided next_bi buffer index is appended to the end of the packet. */
-always_inline vlib_buffer_t *
-vlib_buffer_chain_buffer (vlib_main_t * vm,
-			  vlib_buffer_t * first,
-			  vlib_buffer_t * last, u32 next_bi)
-{
-  vlib_buffer_t *next_buffer = vlib_get_buffer (vm, next_bi);
-  last->next_buffer = next_bi;
-  last->flags |= VLIB_BUFFER_NEXT_PRESENT;
-  next_buffer->current_length = 0;
-  next_buffer->flags &= ~VLIB_BUFFER_NEXT_PRESENT;
-  return next_buffer;
-}
-
-/* Increases or decreases the packet length.
- * It does not allocate or deallocate new buffers.
- * Therefore, the added length must be compatible
- * with the last buffer. */
-always_inline void
-vlib_buffer_chain_increase_length (vlib_buffer_t * first,
-				   vlib_buffer_t * last, i32 len)
-{
-  last->current_length += len;
-  if (first != last)
-    first->total_length_not_including_first_buffer += len;
-}
-
-/* Copy data to the end of the packet and increases its length.
- * It does not allocate new buffers.
- * Returns the number of copied bytes. */
-always_inline u16
-vlib_buffer_chain_append_data (vlib_main_t * vm,
-			       u32 free_list_index,
-			       vlib_buffer_t * first,
-			       vlib_buffer_t * last, void *data, u16 data_len)
-{
-  u32 n_buffer_bytes =
-    vlib_buffer_free_list_buffer_size (vm, free_list_index);
-  ASSERT (n_buffer_bytes >= last->current_length + last->current_data);
-  u16 len = clib_min (data_len,
-		      n_buffer_bytes - last->current_length -
-		      last->current_data);
-  clib_memcpy (vlib_buffer_get_current (last) + last->current_length, data,
-	       len);
-  vlib_buffer_chain_increase_length (first, last, len);
-  return len;
-}
-
-/* Copy data to the end of the packet and increases its length.
- * Allocates additional buffers from the free list if necessary.
- * Returns the number of copied bytes.
- * 'last' value is modified whenever new buffers are allocated and
- * chained and points to the last buffer in the chain. */
-u16
-vlib_buffer_chain_append_data_with_alloc (vlib_main_t * vm,
-					  u32 free_list_index,
-					  vlib_buffer_t * first,
-					  vlib_buffer_t ** last,
-					  void *data, u16 data_len);
-void vlib_buffer_chain_validate (vlib_main_t * vm, vlib_buffer_t * first);
-
-format_function_t format_vlib_buffer, format_vlib_buffer_and_data,
-  format_vlib_buffer_contents;
-
-typedef struct
-{
-  /* Vector of packet data. */
-  u8 *packet_data;
-
-  /* Note: the next three fields are unused if DPDK == 1 */
-
-  /* Number of buffers to allocate in each call to physmem
-     allocator. */
-  u32 min_n_buffers_each_physmem_alloc;
-
-  /* Buffer free list for this template. */
-  u32 free_list_index;
-
-  u32 *free_buffers;
-} vlib_packet_template_t;
-
-void vlib_packet_template_get_packet_helper (vlib_main_t * vm,
-					     vlib_packet_template_t * t);
-
-void vlib_packet_template_init (vlib_main_t * vm,
-				vlib_packet_template_t * t,
-				void *packet_data,
-				uword n_packet_data_bytes,
-				uword min_n_buffers_each_physmem_alloc,
-				char *fmt, ...);
-
-void *vlib_packet_template_get_packet (vlib_main_t * vm,
-				       vlib_packet_template_t * t,
-				       u32 * bi_result);
-
-always_inline void
-vlib_packet_template_free (vlib_main_t * vm, vlib_packet_template_t * t)
-{
-  vec_free (t->packet_data);
-}
-
-always_inline u32
-unserialize_vlib_buffer_n_bytes (serialize_main_t * m)
-{
-  serialize_stream_t *s = &m->stream;
-  vlib_serialize_buffer_main_t *sm
-    = uword_to_pointer (m->stream.data_function_opaque,
-			vlib_serialize_buffer_main_t *);
-  vlib_main_t *vm = sm->vlib_main;
-  u32 n, *f;
-
-  n = s->n_buffer_bytes - s->current_buffer_index;
-  if (sm->last_buffer != ~0)
-    {
-      vlib_buffer_t *b = vlib_get_buffer (vm, sm->last_buffer);
-      while (b->flags & VLIB_BUFFER_NEXT_PRESENT)
-	{
-	  b = vlib_get_buffer (vm, b->next_buffer);
-	  n += b->current_length;
-	}
-    }
-
-  /* *INDENT-OFF* */
-  clib_fifo_foreach (f, sm->rx.buffer_fifo, ({
-    n += vlib_buffer_index_length_in_chain (vm, f[0]);
-  }));
-/* *INDENT-ON* */
-
-  return n;
-}
-
-typedef union
-{
-  vlib_buffer_t b;
-  vlib_copy_unit_t i[sizeof (vlib_buffer_t) / sizeof (vlib_copy_unit_t)];
-}
-vlib_buffer_union_t;
-
-/* Set a buffer quickly into "uninitialized" state.  We want this to
-   be extremely cheap and arrange for all fields that need to be
-   initialized to be in the first 128 bits of the buffer. */
-always_inline void
-vlib_buffer_init_for_free_list (vlib_buffer_t * _dst,
-				vlib_buffer_free_list_t * fl)
-{
-  vlib_buffer_union_t *dst = (vlib_buffer_union_t *) _dst;
-  vlib_buffer_union_t *src =
-    (vlib_buffer_union_t *) & fl->buffer_init_template;
-
-  /* Make sure vlib_buffer_t is cacheline aligned and sized */
-  ASSERT (STRUCT_OFFSET_OF (vlib_buffer_t, cacheline0) == 0);
-  ASSERT (STRUCT_OFFSET_OF (vlib_buffer_t, cacheline1) ==
-	  CLIB_CACHE_LINE_BYTES);
-  ASSERT (STRUCT_OFFSET_OF (vlib_buffer_t, cacheline2) ==
-	  CLIB_CACHE_LINE_BYTES * 2);
-
-  /* Make sure buffer template is sane. */
-  ASSERT (fl->index == fl->buffer_init_template.free_list_index);
-
-  /* Copy template from src->current_data thru src->free_list_index */
-  dst->i[0] = src->i[0];
-  if (1 * sizeof (dst->i[0]) < 16)
-    dst->i[1] = src->i[1];
-  if (2 * sizeof (dst->i[0]) < 16)
-    dst->i[2] = src->i[2];
-
-  /* Make sure it really worked. */
-#define _(f) ASSERT (dst->b.f == src->b.f)
-  _(current_data);
-  _(current_length);
-  _(flags);
-  _(free_list_index);
-#undef _
-  ASSERT (dst->b.total_length_not_including_first_buffer == 0);
-}
-
-always_inline void
-vlib_buffer_init_two_for_free_list (vlib_buffer_t * _dst0,
-				    vlib_buffer_t * _dst1,
-				    vlib_buffer_free_list_t * fl)
-{
-  vlib_buffer_union_t *dst0 = (vlib_buffer_union_t *) _dst0;
-  vlib_buffer_union_t *dst1 = (vlib_buffer_union_t *) _dst1;
-  vlib_buffer_union_t *src =
-    (vlib_buffer_union_t *) & fl->buffer_init_template;
-
-  /* Make sure buffer template is sane. */
-  ASSERT (fl->index == fl->buffer_init_template.free_list_index);
-
-  /* Copy template from src->current_data thru src->free_list_index */
-  dst0->i[0] = dst1->i[0] = src->i[0];
-  if (1 * sizeof (dst0->i[0]) < 16)
-    dst0->i[1] = dst1->i[1] = src->i[1];
-  if (2 * sizeof (dst0->i[0]) < 16)
-    dst0->i[2] = dst1->i[2] = src->i[2];
-
-  /* Make sure it really worked. */
-#define _(f) ASSERT (dst0->b.f == src->b.f && dst1->b.f == src->b.f)
-  _(current_data);
-  _(current_length);
-  _(flags);
-  _(free_list_index);
-#undef _
-  ASSERT (dst0->b.total_length_not_including_first_buffer == 0);
-  ASSERT (dst1->b.total_length_not_including_first_buffer == 0);
-}
-
-#if CLIB_DEBUG > 0
-extern u32 *vlib_buffer_state_validation_lock;
-extern uword *vlib_buffer_state_validation_hash;
-extern void *vlib_buffer_state_heap;
-#endif
-
-static inline void
-vlib_validate_buffer_in_use (vlib_buffer_t * b, u32 expected)
-{
-#if CLIB_DEBUG > 0
-  uword *p;
-  void *oldheap;
-
-  oldheap = clib_mem_set_heap (vlib_buffer_state_heap);
-
-  while (__sync_lock_test_and_set (vlib_buffer_state_validation_lock, 1))
-    ;
-
-  p = hash_get (vlib_buffer_state_validation_hash, b);
-
-  /* If we don't know about b, declare it to be in the expected state */
-  if (!p)
-    {
-      hash_set (vlib_buffer_state_validation_hash, b, expected);
-      goto out;
-    }
-
-  if (p[0] != expected)
-    {
-      void cj_stop (void);
-      u32 bi;
-      vlib_main_t *vm = &vlib_global_main;
-
-      cj_stop ();
-
-      bi = vlib_get_buffer_index (vm, b);
-
-      clib_mem_set_heap (oldheap);
-      clib_warning ("%.6f buffer %llx (%d): %s, not %s",
-		    vlib_time_now (vm), bi,
-		    p[0] ? "busy" : "free", expected ? "busy" : "free");
-      os_panic ();
-    }
-out:
-  CLIB_MEMORY_BARRIER ();
-  *vlib_buffer_state_validation_lock = 0;
-  clib_mem_set_heap (oldheap);
-#endif
-}
-
-static inline void
-vlib_validate_buffer_set_in_use (vlib_buffer_t * b, u32 expected)
-{
-#if CLIB_DEBUG > 0
-  void *oldheap;
-
-  oldheap = clib_mem_set_heap (vlib_buffer_state_heap);
-
-  while (__sync_lock_test_and_set (vlib_buffer_state_validation_lock, 1))
-    ;
-
-  hash_set (vlib_buffer_state_validation_hash, b, expected);
-
-  CLIB_MEMORY_BARRIER ();
-  *vlib_buffer_state_validation_lock = 0;
-  clib_mem_set_heap (oldheap);
-#endif
-}
-
-#endif /* included_vlib_buffer_funcs_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/buffer_node.h b/vlib/vlib/buffer_node.h
deleted file mode 100644
index 8a779049..00000000
--- a/vlib/vlib/buffer_node.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * buffer_node.h: VLIB buffer handling node helper macros/inlines
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_buffer_node_h
-#define included_vlib_buffer_node_h
-
-/** \file
-    vlib buffer/node functions
-*/
-
-/** \brief Finish enqueueing two buffers forward in the graph.
- Standard dual loop boilerplate element. This is a MACRO,
- with MULTIPLE SIDE EFFECTS. In the ideal case,
- <code>next_index == next0 == next1</code>,
- which means that the speculative enqueue at the top of the dual loop
- has correctly dealt with both packets. In that case, the macro does
- nothing at all.
-
- @param vm vlib_main_t pointer, varies by thread
- @param node current node vlib_node_runtime_t pointer
- @param next_index speculated next index used for both packets
- @param to_next speculated vector pointer used for both packets
- @param n_left_to_next number of slots left in speculated vector
- @param bi0 first buffer index
- @param bi1 second buffer index
- @param next0 actual next index to be used for the first packet
- @param next1 actual next index to be used for the second packet
-
- @return @c next_index -- speculative next index to be used for future packets
- @return @c to_next -- speculative frame to be used for future packets
- @return @c n_left_to_next -- number of slots left in speculative frame
-*/
-
-#define vlib_validate_buffer_enqueue_x2(vm,node,next_index,to_next,n_left_to_next,bi0,bi1,next0,next1) \
-do {									\
-  int enqueue_code = (next0 != next_index) + 2*(next1 != next_index);	\
-									\
-  if (PREDICT_FALSE (enqueue_code != 0))				\
-    {									\
-      switch (enqueue_code)						\
-	{								\
-	case 1:								\
-	  /* A B A */							\
-	  to_next[-2] = bi1;						\
-	  to_next -= 1;							\
-	  n_left_to_next += 1;						\
-	  vlib_set_next_frame_buffer (vm, node, next0, bi0);		\
-	  break;							\
-									\
-	case 2:								\
-	  /* A A B */							\
-	  to_next -= 1;							\
-	  n_left_to_next += 1;						\
-	  vlib_set_next_frame_buffer (vm, node, next1, bi1);		\
-	  break;							\
-									\
-	case 3:								\
-	  /* A B B or A B C */						\
-	  to_next -= 2;							\
-	  n_left_to_next += 2;						\
-	  vlib_set_next_frame_buffer (vm, node, next0, bi0);		\
-	  vlib_set_next_frame_buffer (vm, node, next1, bi1);		\
-	  if (next0 == next1)						\
-	    {								\
-	      vlib_put_next_frame (vm, node, next_index,		\
-				   n_left_to_next);			\
-	      next_index = next1;					\
-	      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); \
-	    }								\
-	}								\
-    }									\
-} while (0)
-
-
-/** \brief Finish enqueueing four buffers forward in the graph.
- Standard quad loop boilerplate element. This is a MACRO,
- with MULTIPLE SIDE EFFECTS. In the ideal case,
- <code>next_index == next0 == next1 == next2 == next3</code>,
- which means that the speculative enqueue at the top of the quad loop
- has correctly dealt with all four packets. In that case, the macro does
- nothing at all.
-
- @param vm vlib_main_t pointer, varies by thread
- @param node current node vlib_node_runtime_t pointer
- @param next_index speculated next index used for both packets
- @param to_next speculated vector pointer used for both packets
- @param n_left_to_next number of slots left in speculated vector
- @param bi0 first buffer index
- @param bi1 second buffer index
- @param bi2 third buffer index
- @param bi3 fourth buffer index
- @param next0 actual next index to be used for the first packet
- @param next1 actual next index to be used for the second packet
- @param next2 actual next index to be used for the third packet
- @param next3 actual next index to be used for the fourth packet
-
- @return @c next_index -- speculative next index to be used for future packets
- @return @c to_next -- speculative frame to be used for future packets
- @return @c n_left_to_next -- number of slots left in speculative frame
-*/
-
-#define vlib_validate_buffer_enqueue_x4(vm,node,next_index,to_next,n_left_to_next,bi0,bi1,bi2,bi3,next0,next1,next2,next3) \
-do {                                                                    \
-  /* After the fact: check the [speculative] enqueue to "next" */       \
-  u32 fix_speculation = next_index != next0 || next_index != next1      \
-    || next_index != next2 || next_index != next3;                      \
-  if (PREDICT_FALSE(fix_speculation))                                   \
-    {                                                                   \
-      /* rewind... */                                                   \
-      to_next -= 4;                                                     \
-      n_left_to_next += 4;                                              \
-                                                                        \
-      /* If bi0 belongs to "next", send it there */                     \
-      if (next_index == next0)                                          \
-        {                                                               \
-          to_next[0] = bi0;                                             \
-          to_next++;                                                    \
-          n_left_to_next --;                                            \
-        }                                                               \
-      else              /* send it where it needs to go */              \
-        vlib_set_next_frame_buffer (vm, node, next0, bi0);              \
-                                                                        \
-      if (next_index == next1)                                          \
-        {                                                               \
-          to_next[0] = bi1;                                             \
-          to_next++;                                                    \
-          n_left_to_next --;                                            \
-        }                                                               \
-      else                                                              \
-        vlib_set_next_frame_buffer (vm, node, next1, bi1);              \
-                                                                        \
-      if (next_index == next2)                                          \
-        {                                                               \
-          to_next[0] = bi2;                                             \
-          to_next++;                                                    \
-          n_left_to_next --;                                            \
-        }                                                               \
-      else                                                              \
-        vlib_set_next_frame_buffer (vm, node, next2, bi2);              \
-                                                                        \
-      if (next_index == next3)                                          \
-        {                                                               \
-          to_next[0] = bi3;                                             \
-          to_next++;                                                    \
-          n_left_to_next --;                                            \
-        }                                                               \
-      else                                                              \
-        vlib_set_next_frame_buffer (vm, node, next3, bi3);              \
-                                                                        \
-      /* Change speculation: last 2 packets went to the same node */    \
-      if (next2 == next3)                                               \
-        {                                                               \
-          vlib_put_next_frame (vm, node, next_index, n_left_to_next);   \
-          next_index = next3;                                           \
-          vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); \
-        }                                                               \
-    }                                                                   \
- } while(0);
-
-/** \brief Finish enqueueing one buffer forward in the graph.
- Standard single loop boilerplate element. This is a MACRO,
- with MULTIPLE SIDE EFFECTS. In the ideal case,
- <code>next_index == next0</code>,
- which means that the speculative enqueue at the top of the single loop
- has correctly dealt with the packet in hand. In that case, the macro does
- nothing at all.
-
- @param vm vlib_main_t pointer, varies by thread
- @param node current node vlib_node_runtime_t pointer
- @param next_index speculated next index used for both packets
- @param to_next speculated vector pointer used for both packets
- @param n_left_to_next number of slots left in speculated vector
- @param bi0 first buffer index
- @param next0 actual next index to be used for the first packet
-
- @return @c next_index -- speculative next index to be used for future packets
- @return @c to_next -- speculative frame to be used for future packets
- @return @c n_left_to_next -- number of slots left in speculative frame
-*/
-#define vlib_validate_buffer_enqueue_x1(vm,node,next_index,to_next,n_left_to_next,bi0,next0) \
-do {									\
-  if (PREDICT_FALSE (next0 != next_index))				\
-    {									\
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next + 1);	\
-      next_index = next0;						\
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); \
-									\
-      to_next[0] = bi0;							\
-      to_next += 1;							\
-      n_left_to_next -= 1;						\
-    }									\
-} while (0)
-
-always_inline uword
-generic_buffer_node_inline (vlib_main_t * vm,
-			    vlib_node_runtime_t * node,
-			    vlib_frame_t * frame,
-			    uword sizeof_trace,
-			    void *opaque1,
-			    uword opaque2,
-			    void (*two_buffers) (vlib_main_t * vm,
-						 void *opaque1,
-						 uword opaque2,
-						 vlib_buffer_t * b0,
-						 vlib_buffer_t * b1,
-						 u32 * next0, u32 * next1),
-			    void (*one_buffer) (vlib_main_t * vm,
-						void *opaque1, uword opaque2,
-						vlib_buffer_t * b0,
-						u32 * next0))
-{
-  u32 n_left_from, *from, *to_next;
-  u32 next_index;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-				   /* stride */ 1, sizeof_trace);
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  vlib_buffer_t *p0, *p1;
-	  u32 pi0, next0;
-	  u32 pi1, next1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, 64, LOAD);
-	    CLIB_PREFETCH (p3->data, 64, LOAD);
-	  }
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-
-	  two_buffers (vm, opaque1, opaque2, p0, p1, &next0, &next1);
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, pi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  u32 pi0, next0;
-
-	  pi0 = from[0];
-	  to_next[0] = pi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  one_buffer (vm, opaque1, opaque2, p0, &next0);
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-#endif /* included_vlib_buffer_node_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/cli.c b/vlib/vlib/cli.c
deleted file mode 100644
index 2d141115..00000000
--- a/vlib/vlib/cli.c
+++ /dev/null
@@ -1,1173 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * cli.c: command line interface
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vppinfra/cpu.h>
-
-/* Root of all show commands. */
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vlib_cli_show_command, static) = {
-  .path = "show",
-  .short_help = "Show commands",
-};
-/* *INDENT-ON* */
-
-/* Root of all clear commands. */
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vlib_cli_clear_command, static) = {
-  .path = "clear",
-  .short_help = "Clear commands",
-};
-/* *INDENT-ON* */
-
-/* Root of all set commands. */
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vlib_cli_set_command, static) = {
-  .path = "set",
-  .short_help = "Set commands",
-};
-/* *INDENT-ON* */
-
-/* Root of all test commands. */
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vlib_cli_test_command, static) = {
-  .path = "test",
-  .short_help = "Test commands",
-};
-/* *INDENT-ON* */
-
-/* Returns bitmap of commands which match key. */
-static uword *
-vlib_cli_sub_command_match (vlib_cli_command_t * c, unformat_input_t * input)
-{
-  int i, n;
-  uword *match = 0;
-  vlib_cli_parse_position_t *p;
-
-  unformat_skip_white_space (input);
-
-  for (i = 0;; i++)
-    {
-      uword k;
-
-      k = unformat_get_input (input);
-      switch (k)
-	{
-	case 'a' ... 'z':
-	case 'A' ... 'Z':
-	case '0' ... '9':
-	case '-':
-	case '_':
-	  break;
-
-	case ' ':
-	case '\t':
-	case '\r':
-	case '\n':
-	case UNFORMAT_END_OF_INPUT:
-	  /* White space or end of input removes any non-white
-	     matches that were before possible. */
-	  if (i < vec_len (c->sub_command_positions)
-	      && clib_bitmap_count_set_bits (match) > 1)
-	    {
-	      p = vec_elt_at_index (c->sub_command_positions, i);
-	      for (n = 0; n < vec_len (p->bitmaps); n++)
-		match = clib_bitmap_andnot (match, p->bitmaps[n]);
-	    }
-	  goto done;
-
-	default:
-	  unformat_put_input (input);
-	  goto done;
-	}
-
-      if (i >= vec_len (c->sub_command_positions))
-	{
-	no_match:
-	  clib_bitmap_free (match);
-	  return 0;
-	}
-
-      p = vec_elt_at_index (c->sub_command_positions, i);
-      if (vec_len (p->bitmaps) == 0)
-	goto no_match;
-
-      n = k - p->min_char;
-      if (n < 0 || n >= vec_len (p->bitmaps))
-	goto no_match;
-
-      if (i == 0)
-	match = clib_bitmap_dup (p->bitmaps[n]);
-      else
-	match = clib_bitmap_and (match, p->bitmaps[n]);
-
-      if (clib_bitmap_is_zero (match))
-	goto no_match;
-    }
-
-done:
-  return match;
-}
-
-/* Looks for string based sub-input formatted { SUB-INPUT }. */
-uword
-unformat_vlib_cli_sub_input (unformat_input_t * i, va_list * args)
-{
-  unformat_input_t *sub_input = va_arg (*args, unformat_input_t *);
-  u8 *s;
-  uword c;
-
-  while (1)
-    {
-      c = unformat_get_input (i);
-      switch (c)
-	{
-	case ' ':
-	case '\t':
-	case '\n':
-	case '\r':
-	case '\f':
-	  break;
-
-	case '{':
-	default:
-	  /* Put back paren. */
-	  if (c != UNFORMAT_END_OF_INPUT)
-	    unformat_put_input (i);
-
-	  if (c == '{' && unformat (i, "%v", &s))
-	    {
-	      unformat_init_vector (sub_input, s);
-	      return 1;
-	    }
-	  return 0;
-	}
-    }
-  return 0;
-}
-
-static vlib_cli_command_t *
-get_sub_command (vlib_cli_main_t * cm, vlib_cli_command_t * parent, u32 si)
-{
-  vlib_cli_sub_command_t *s = vec_elt_at_index (parent->sub_commands, si);
-  return vec_elt_at_index (cm->commands, s->index);
-}
-
-static uword
-unformat_vlib_cli_sub_command (unformat_input_t * i, va_list * args)
-{
-  vlib_main_t *vm = va_arg (*args, vlib_main_t *);
-  vlib_cli_command_t *c = va_arg (*args, vlib_cli_command_t *);
-  vlib_cli_command_t **result = va_arg (*args, vlib_cli_command_t **);
-  vlib_cli_main_t *cm = &vm->cli_main;
-  uword *match_bitmap, is_unique, index;
-
-  {
-    vlib_cli_sub_rule_t *sr;
-    vlib_cli_parse_rule_t *r;
-    vec_foreach (sr, c->sub_rules)
-    {
-      void **d;
-      r = vec_elt_at_index (cm->parse_rules, sr->rule_index);
-      vec_add2 (cm->parse_rule_data, d, 1);
-      vec_reset_length (d[0]);
-      if (r->data_size)
-	d[0] = _vec_resize (d[0],
-			    /* length increment */ 1,
-			    r->data_size,
-			    /* header_bytes */ 0,
-			    /* data align */ sizeof (uword));
-      if (unformat_user (i, r->unformat_function, vm, d[0]))
-	{
-	  *result = vec_elt_at_index (cm->commands, sr->command_index);
-	  return 1;
-	}
-    }
-  }
-
-  match_bitmap = vlib_cli_sub_command_match (c, i);
-  is_unique = clib_bitmap_count_set_bits (match_bitmap) == 1;
-  index = ~0;
-  if (is_unique)
-    {
-      index = clib_bitmap_first_set (match_bitmap);
-      *result = get_sub_command (cm, c, index);
-    }
-  clib_bitmap_free (match_bitmap);
-
-  return is_unique;
-}
-
-static u8 *
-format_vlib_cli_command_help (u8 * s, va_list * args)
-{
-  vlib_cli_command_t *c = va_arg (*args, vlib_cli_command_t *);
-  int is_long = va_arg (*args, int);
-  if (is_long && c->long_help)
-    s = format (s, "%s", c->long_help);
-  else if (c->short_help)
-    s = format (s, "%s", c->short_help);
-  else
-    s = format (s, "%v commands", c->path);
-  return s;
-}
-
-static u8 *
-format_vlib_cli_parse_rule_name (u8 * s, va_list * args)
-{
-  vlib_cli_parse_rule_t *r = va_arg (*args, vlib_cli_parse_rule_t *);
-  return format (s, "<%U>", format_c_identifier, r->name);
-}
-
-static u8 *
-format_vlib_cli_path (u8 * s, va_list * args)
-{
-  u8 *path = va_arg (*args, u8 *);
-  int i, in_rule;
-  in_rule = 0;
-  for (i = 0; i < vec_len (path); i++)
-    {
-      switch (path[i])
-	{
-	case '%':
-	  in_rule = 1;
-	  vec_add1 (s, '<');	/* start of <RULE> */
-	  break;
-
-	case '_':
-	  /* _ -> space in rules. */
-	  vec_add1 (s, in_rule ? ' ' : '_');
-	  break;
-
-	case ' ':
-	  if (in_rule)
-	    {
-	      vec_add1 (s, '>');	/* end of <RULE> */
-	      in_rule = 0;
-	    }
-	  vec_add1 (s, ' ');
-	  break;
-
-	default:
-	  vec_add1 (s, path[i]);
-	  break;
-	}
-    }
-
-  if (in_rule)
-    vec_add1 (s, '>');		/* terminate <RULE> */
-
-  return s;
-}
-
-static vlib_cli_command_t *
-all_subs (vlib_cli_main_t * cm, vlib_cli_command_t * subs, u32 command_index)
-{
-  vlib_cli_command_t *c = vec_elt_at_index (cm->commands, command_index);
-  vlib_cli_sub_command_t *sc;
-  vlib_cli_sub_rule_t *sr;
-
-  if (c->function)
-    vec_add1 (subs, c[0]);
-
-  vec_foreach (sr, c->sub_rules)
-    subs = all_subs (cm, subs, sr->command_index);
-  vec_foreach (sc, c->sub_commands) subs = all_subs (cm, subs, sc->index);
-
-  return subs;
-}
-
-static int
-vlib_cli_cmp_rule (void *a1, void *a2)
-{
-  vlib_cli_sub_rule_t *r1 = a1;
-  vlib_cli_sub_rule_t *r2 = a2;
-
-  return vec_cmp (r1->name, r2->name);
-}
-
-static int
-vlib_cli_cmp_command (void *a1, void *a2)
-{
-  vlib_cli_command_t *c1 = a1;
-  vlib_cli_command_t *c2 = a2;
-
-  return vec_cmp (c1->path, c2->path);
-}
-
-static clib_error_t *
-vlib_cli_dispatch_sub_commands (vlib_main_t * vm,
-				vlib_cli_main_t * cm,
-				unformat_input_t * input,
-				uword parent_command_index)
-{
-  vlib_cli_command_t *parent, *c;
-  clib_error_t *error = 0;
-  unformat_input_t sub_input;
-  u8 *string;
-  uword is_main_dispatch = cm == &vm->cli_main;
-
-  parent = vec_elt_at_index (cm->commands, parent_command_index);
-  if (is_main_dispatch && unformat (input, "help"))
-    {
-      uword help_at_end_of_line, i;
-
-      help_at_end_of_line =
-	unformat_check_input (input) == UNFORMAT_END_OF_INPUT;
-      while (1)
-	{
-	  c = parent;
-	  if (unformat_user
-	      (input, unformat_vlib_cli_sub_command, vm, c, &parent))
-	    ;
-
-	  else if (!(unformat_check_input (input) == UNFORMAT_END_OF_INPUT))
-	    goto unknown;
-
-	  else
-	    break;
-	}
-
-      /* help SUB-COMMAND => long format help.
-         "help" at end of line: show all commands. */
-      if (!help_at_end_of_line)
-	vlib_cli_output (vm, "%U", format_vlib_cli_command_help, c,
-			 /* is_long */ 1);
-
-      else if (vec_len (c->sub_commands) + vec_len (c->sub_rules) == 0)
-	vlib_cli_output (vm, "%v: no sub-commands", c->path);
-
-      else
-	{
-	  vlib_cli_sub_command_t *sc;
-	  vlib_cli_sub_rule_t *sr, *subs;
-
-	  subs = vec_dup (c->sub_rules);
-
-	  /* Add in rules if any. */
-	  vec_foreach (sc, c->sub_commands)
-	  {
-	    vec_add2 (subs, sr, 1);
-	    sr->name = sc->name;
-	    sr->command_index = sc->index;
-	    sr->rule_index = ~0;
-	  }
-
-	  vec_sort_with_function (subs, vlib_cli_cmp_rule);
-
-	  for (i = 0; i < vec_len (subs); i++)
-	    {
-	      vlib_cli_command_t *d;
-	      vlib_cli_parse_rule_t *r;
-
-	      d = vec_elt_at_index (cm->commands, subs[i].command_index);
-	      r =
-		subs[i].rule_index != ~0 ? vec_elt_at_index (cm->parse_rules,
-							     subs
-							     [i].rule_index) :
-		0;
-
-	      if (r)
-		vlib_cli_output
-		  (vm, "  %-30U %U",
-		   format_vlib_cli_parse_rule_name, r,
-		   format_vlib_cli_command_help, d, /* is_long */ 0);
-	      else
-		vlib_cli_output
-		  (vm, "  %-30v %U",
-		   subs[i].name,
-		   format_vlib_cli_command_help, d, /* is_long */ 0);
-	    }
-
-	  vec_free (subs);
-	}
-    }
-
-  else if (is_main_dispatch
-	   && (unformat (input, "choices") || unformat (input, "?")))
-    {
-      vlib_cli_command_t *sub, *subs;
-
-      subs = all_subs (cm, 0, parent_command_index);
-      vec_sort_with_function (subs, vlib_cli_cmp_command);
-      vec_foreach (sub, subs)
-	vlib_cli_output (vm, "  %-40U %U",
-			 format_vlib_cli_path, sub->path,
-			 format_vlib_cli_command_help, sub, /* is_long */ 0);
-      vec_free (subs);
-    }
-
-  else if (unformat (input, "comment %v", &string))
-    {
-      vec_free (string);
-    }
-
-  else if (unformat (input, "uncomment %U",
-		     unformat_vlib_cli_sub_input, &sub_input))
-    {
-      error =
-	vlib_cli_dispatch_sub_commands (vm, cm, &sub_input,
-					parent_command_index);
-      unformat_free (&sub_input);
-    }
-
-  else
-    if (unformat_user (input, unformat_vlib_cli_sub_command, vm, parent, &c))
-    {
-      unformat_input_t *si;
-      uword has_sub_commands =
-	vec_len (c->sub_commands) + vec_len (c->sub_rules) > 0;
-
-      si = input;
-      if (unformat_user (input, unformat_vlib_cli_sub_input, &sub_input))
-	si = &sub_input;
-
-      if (has_sub_commands)
-	error = vlib_cli_dispatch_sub_commands (vm, cm, si, c - cm->commands);
-
-      if (has_sub_commands && !error)
-	/* Found valid sub-command. */ ;
-
-      else if (c->function)
-	{
-	  clib_error_t *c_error;
-
-	  /* Skip white space for benefit of called function. */
-	  unformat_skip_white_space (si);
-
-	  if (unformat (si, "?"))
-	    {
-	      vlib_cli_output (vm, "  %-40U %U", format_vlib_cli_path, c->path, format_vlib_cli_command_help, c,	/* is_long */
-			       0);
-	    }
-	  else
-	    {
-	      if (!c->is_mp_safe)
-		vlib_worker_thread_barrier_sync (vm);
-
-	      c_error = c->function (vm, si, c);
-
-	      if (!c->is_mp_safe)
-		vlib_worker_thread_barrier_release (vm);
-
-	      if (c_error)
-		{
-		  error =
-		    clib_error_return (0, "%v: %v", c->path, c_error->what);
-		  clib_error_free (c_error);
-		  /* Free sub input. */
-		  if (si != input)
-		    unformat_free (si);
-
-		  return error;
-		}
-	    }
-
-	  /* Free any previous error. */
-	  clib_error_free (error);
-	}
-
-      else if (!error)
-	error = clib_error_return (0, "%v: no sub-commands", c->path);
-
-      /* Free sub input. */
-      if (si != input)
-	unformat_free (si);
-    }
-
-  else
-    goto unknown;
-
-  return error;
-
-unknown:
-  if (parent->path)
-    return clib_error_return (0, "%v: unknown input `%U'", parent->path,
-			      format_unformat_error, input);
-  else
-    return clib_error_return (0, "unknown input `%U'", format_unformat_error,
-			      input);
-}
-
-
-void vlib_unix_error_report (vlib_main_t *, clib_error_t *)
-  __attribute__ ((weak));
-
-void
-vlib_unix_error_report (vlib_main_t * vm, clib_error_t * error)
-{
-}
-
-/* Process CLI input. */
-void
-vlib_cli_input (vlib_main_t * vm,
-		unformat_input_t * input,
-		vlib_cli_output_function_t * function, uword function_arg)
-{
-  vlib_process_t *cp = vlib_get_current_process (vm);
-  vlib_cli_main_t *cm = &vm->cli_main;
-  clib_error_t *error;
-  vlib_cli_output_function_t *save_function;
-  uword save_function_arg;
-
-  save_function = cp->output_function;
-  save_function_arg = cp->output_function_arg;
-
-  cp->output_function = function;
-  cp->output_function_arg = function_arg;
-
-  do
-    {
-      vec_reset_length (cm->parse_rule_data);
-      error = vlib_cli_dispatch_sub_commands (vm, &vm->cli_main, input,	/* parent */
-					      0);
-    }
-  while (!error && !unformat (input, "%U", unformat_eof));
-
-  if (error)
-    {
-      vlib_cli_output (vm, "%v", error->what);
-      vlib_unix_error_report (vm, error);
-      clib_error_free (error);
-    }
-
-  cp->output_function = save_function;
-  cp->output_function_arg = save_function_arg;
-}
-
-/* Output to current CLI connection. */
-void
-vlib_cli_output (vlib_main_t * vm, char *fmt, ...)
-{
-  vlib_process_t *cp = vlib_get_current_process (vm);
-  va_list va;
-  u8 *s;
-
-  va_start (va, fmt);
-  s = va_format (0, fmt, &va);
-  va_end (va);
-
-  /* Terminate with \n if not present. */
-  if (vec_len (s) > 0 && s[vec_len (s) - 1] != '\n')
-    vec_add1 (s, '\n');
-
-  if ((!cp) || (!cp->output_function))
-    fformat (stdout, "%v", s);
-  else
-    cp->output_function (cp->output_function_arg, s, vec_len (s));
-
-  vec_free (s);
-}
-
-static clib_error_t *
-show_memory_usage (vlib_main_t * vm,
-		   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  int verbose = 0;
-  clib_error_t *error;
-  u32 index = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "verbose"))
-	verbose = 1;
-      else
-	{
-	  error = clib_error_return (0, "unknown input `%U'",
-				     format_unformat_error, input);
-	  return error;
-	}
-    }
-
-  /* *INDENT-OFF* */
-  foreach_vlib_main (
-  ({
-      vlib_cli_output (vm, "Thread %d %v\n", index, vlib_worker_threads[index].name);
-      vlib_cli_output (vm, "%U\n", format_mheap, clib_per_cpu_mheaps[index], verbose);
-      index++;
-  }));
-  /* *INDENT-ON* */
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_memory_usage_command, static) = {
-  .path = "show memory",
-  .short_help = "Show current memory usage",
-  .function = show_memory_usage,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-show_cpu (vlib_main_t * vm, unformat_input_t * input,
-	  vlib_cli_command_t * cmd)
-{
-#define _(a,b,c) vlib_cli_output (vm, "%-25s " b, a ":", c);
-  _("Model name", "%U", format_cpu_model_name);
-  _("Microarchitecture", "%U", format_cpu_uarch);
-  _("Flags", "%U", format_cpu_flags);
-  _("Base frequency", "%.2f GHz",
-    ((f64) vm->clib_time.clocks_per_second) * 1e-9);
-#undef _
-  return 0;
-}
-
-/*?
- * Displays various information about the CPU.
- *
- * @cliexpar
- * @cliexstart{show cpu}
- * Model name:               Intel(R) Xeon(R) CPU E5-2667 v4 @ 3.20GHz
- * Microarchitecture:        Broadwell (Broadwell-EP/EX)
- * Flags:                    sse3 ssse3 sse41 sse42 avx avx2 aes
- * Base Frequency:           3.20 GHz
- * @cliexend
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_cpu_command, static) = {
-  .path = "show cpu",
-  .short_help = "Show cpu information",
-  .function = show_cpu,
-};
-
-/* *INDENT-ON* */
-static clib_error_t *
-enable_disable_memory_trace (vlib_main_t * vm,
-			     unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  clib_error_t *error = 0;
-  int enable;
-
-  if (!unformat_user (input, unformat_vlib_enable_disable, &enable))
-    {
-      error = clib_error_return (0, "expecting enable/on or disable/off");
-      goto done;
-    }
-
-  clib_mem_trace (enable);
-
-done:
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (enable_disable_memory_trace_command, static) = {
-  .path = "memory-trace",
-  .short_help = "Enable/disable memory allocation trace",
-  .function = enable_disable_memory_trace,
-};
-/* *INDENT-ON* */
-
-
-static clib_error_t *
-test_heap_validate (vlib_main_t * vm, unformat_input_t * input,
-		    vlib_cli_command_t * cmd)
-{
-  clib_error_t *error = 0;
-  void *heap;
-  mheap_t *mheap;
-
-  if (unformat (input, "on"))
-    {
-        /* *INDENT-OFF* */
-        foreach_vlib_main({
-          heap = clib_per_cpu_mheaps[this_vlib_main->cpu_index];
-          mheap = mheap_header(heap);
-          mheap->flags |= MHEAP_FLAG_VALIDATE;
-          // Turn off small object cache because it delays detection of errors
-          mheap->flags &= ~MHEAP_FLAG_SMALL_OBJECT_CACHE;
-        });
-        /* *INDENT-ON* */
-
-    }
-  else if (unformat (input, "off"))
-    {
-        /* *INDENT-OFF* */
-        foreach_vlib_main({
-          heap = clib_per_cpu_mheaps[this_vlib_main->cpu_index];
-          mheap = mheap_header(heap);
-          mheap->flags &= ~MHEAP_FLAG_VALIDATE;
-          mheap->flags |= MHEAP_FLAG_SMALL_OBJECT_CACHE;
-        });
-        /* *INDENT-ON* */
-    }
-  else if (unformat (input, "now"))
-    {
-        /* *INDENT-OFF* */
-        foreach_vlib_main({
-          heap = clib_per_cpu_mheaps[this_vlib_main->cpu_index];
-          mheap = mheap_header(heap);
-          mheap_validate(heap);
-        });
-        /* *INDENT-ON* */
-      vlib_cli_output (vm, "heap validation complete");
-
-    }
-  else
-    {
-      return clib_error_return (0, "unknown input `%U'",
-				format_unformat_error, input);
-    }
-
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_test_heap_validate,static) = {
-    .path = "test heap-validate",
-    .short_help = "<on/off/now> validate heap on future allocs/frees or right now",
-    .function = test_heap_validate,
-};
-/* *INDENT-ON* */
-
-#ifdef TEST_CODE
-/*
- * A trivial test harness to verify the per-process output_function
- * is working correcty.
- */
-
-static clib_error_t *
-sleep_ten_seconds (vlib_main_t * vm,
-		   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  u16 i;
-  u16 my_id = rand ();
-
-  vlib_cli_output (vm, "Starting 10 seconds sleep with id %u\n", my_id);
-
-  for (i = 0; i < 10; i++)
-    {
-      vlib_process_wait_for_event_or_clock (vm, 1.0);
-      vlib_cli_output (vm, "Iteration number %u, my id: %u\n", i, my_id);
-    }
-  vlib_cli_output (vm, "Done with sleep with id %u\n", my_id);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ping_command, static) = {
-  .path = "test sleep",
-  .function = sleep_ten_seconds,
-  .short_help = "Sleep for 10 seconds",
-};
-/* *INDENT-ON* */
-#endif /* ifdef TEST_CODE */
-
-static uword
-vlib_cli_normalize_path (char *input, char **result)
-{
-  char *i = input;
-  char *s = 0;
-  uword l = 0;
-  uword index_of_last_space = ~0;
-
-  while (*i != 0)
-    {
-      u8 c = *i++;
-      /* Multiple white space -> single space. */
-      switch (c)
-	{
-	case ' ':
-	case '\t':
-	case '\n':
-	case '\r':
-	  if (l > 0 && s[l - 1] != ' ')
-	    {
-	      vec_add1 (s, ' ');
-	      l++;
-	    }
-	  break;
-
-	default:
-	  if (l > 0 && s[l - 1] == ' ')
-	    index_of_last_space = vec_len (s);
-	  vec_add1 (s, c);
-	  l++;
-	  break;
-	}
-    }
-
-  /* Remove any extra space at end. */
-  if (l > 0 && s[l - 1] == ' ')
-    _vec_len (s) -= 1;
-
-  *result = s;
-  return index_of_last_space;
-}
-
-always_inline uword
-parent_path_len (char *path)
-{
-  word i;
-  for (i = vec_len (path) - 1; i >= 0; i--)
-    {
-      if (path[i] == ' ')
-	return i;
-    }
-  return ~0;
-}
-
-static void
-add_sub_command (vlib_cli_main_t * cm, uword parent_index, uword child_index)
-{
-  vlib_cli_command_t *p, *c;
-  vlib_cli_sub_command_t *sub_c;
-  u8 *sub_name;
-  word i, l;
-
-  p = vec_elt_at_index (cm->commands, parent_index);
-  c = vec_elt_at_index (cm->commands, child_index);
-
-  l = parent_path_len (c->path);
-  if (l == ~0)
-    sub_name = vec_dup ((u8 *) c->path);
-  else
-    {
-      ASSERT (l + 1 < vec_len (c->path));
-      sub_name = 0;
-      vec_add (sub_name, c->path + l + 1, vec_len (c->path) - (l + 1));
-    }
-
-  if (sub_name[0] == '%')
-    {
-      uword *q;
-      vlib_cli_sub_rule_t *sr;
-
-      /* Remove %. */
-      vec_delete (sub_name, 1, 0);
-
-      if (!p->sub_rule_index_by_name)
-	p->sub_rule_index_by_name = hash_create_vec ( /* initial length */ 32,
-						     sizeof (sub_name[0]),
-						     sizeof (uword));
-      q = hash_get_mem (p->sub_rule_index_by_name, sub_name);
-      if (q)
-	{
-	  sr = vec_elt_at_index (p->sub_rules, q[0]);
-	  ASSERT (sr->command_index == child_index);
-	  return;
-	}
-
-      q = hash_get_mem (cm->parse_rule_index_by_name, sub_name);
-      if (!q)
-	{
-	  clib_error ("reference to unknown rule `%%%v' in path `%v'",
-		      sub_name, c->path);
-	  return;
-	}
-
-      hash_set_mem (p->sub_rule_index_by_name, sub_name,
-		    vec_len (p->sub_rules));
-      vec_add2 (p->sub_rules, sr, 1);
-      sr->name = sub_name;
-      sr->rule_index = q[0];
-      sr->command_index = child_index;
-      return;
-    }
-
-  if (!p->sub_command_index_by_name)
-    p->sub_command_index_by_name = hash_create_vec ( /* initial length */ 32,
-						    sizeof (c->path[0]),
-						    sizeof (uword));
-
-  /* Check if sub-command has already been created. */
-  if (hash_get_mem (p->sub_command_index_by_name, sub_name))
-    {
-      vec_free (sub_name);
-      return;
-    }
-
-  vec_add2 (p->sub_commands, sub_c, 1);
-  sub_c->index = child_index;
-  sub_c->name = sub_name;
-  hash_set_mem (p->sub_command_index_by_name, sub_c->name,
-		sub_c - p->sub_commands);
-
-  vec_validate (p->sub_command_positions, vec_len (sub_c->name) - 1);
-  for (i = 0; i < vec_len (sub_c->name); i++)
-    {
-      int n;
-      vlib_cli_parse_position_t *pos;
-
-      pos = vec_elt_at_index (p->sub_command_positions, i);
-
-      if (!pos->bitmaps)
-	pos->min_char = sub_c->name[i];
-
-      n = sub_c->name[i] - pos->min_char;
-      if (n < 0)
-	{
-	  pos->min_char = sub_c->name[i];
-	  vec_insert (pos->bitmaps, -n, 0);
-	  n = 0;
-	}
-
-      vec_validate (pos->bitmaps, n);
-      pos->bitmaps[n] =
-	clib_bitmap_ori (pos->bitmaps[n], sub_c - p->sub_commands);
-    }
-}
-
-static void
-vlib_cli_make_parent (vlib_cli_main_t * cm, uword ci)
-{
-  uword p_len, pi, *p;
-  char *p_path;
-  vlib_cli_command_t *c, *parent;
-
-  /* Root command (index 0) should have already been added. */
-  ASSERT (vec_len (cm->commands) > 0);
-
-  c = vec_elt_at_index (cm->commands, ci);
-  p_len = parent_path_len (c->path);
-
-  /* No space?  Parent is root command. */
-  if (p_len == ~0)
-    {
-      add_sub_command (cm, 0, ci);
-      return;
-    }
-
-  p_path = 0;
-  vec_add (p_path, c->path, p_len);
-
-  p = hash_get_mem (cm->command_index_by_path, p_path);
-
-  /* Parent exists? */
-  if (!p)
-    {
-      /* Parent does not exist; create it. */
-      vec_add2 (cm->commands, parent, 1);
-      parent->path = p_path;
-      hash_set_mem (cm->command_index_by_path, parent->path,
-		    parent - cm->commands);
-      pi = parent - cm->commands;
-    }
-  else
-    {
-      pi = p[0];
-      vec_free (p_path);
-    }
-
-  add_sub_command (cm, pi, ci);
-
-  /* Create parent's parent. */
-  if (!p)
-    vlib_cli_make_parent (cm, pi);
-}
-
-always_inline uword
-vlib_cli_command_is_empty (vlib_cli_command_t * c)
-{
-  return (c->long_help == 0 && c->short_help == 0 && c->function == 0);
-}
-
-clib_error_t *
-vlib_cli_register (vlib_main_t * vm, vlib_cli_command_t * c)
-{
-  vlib_cli_main_t *cm = &vm->cli_main;
-  clib_error_t *error = 0;
-  uword ci, *p;
-  char *normalized_path;
-
-  if ((error = vlib_call_init_function (vm, vlib_cli_init)))
-    return error;
-
-  (void) vlib_cli_normalize_path (c->path, &normalized_path);
-
-  if (!cm->command_index_by_path)
-    cm->command_index_by_path = hash_create_vec ( /* initial length */ 32,
-						 sizeof (c->path[0]),
-						 sizeof (uword));
-
-  /* See if command already exists with given path. */
-  p = hash_get_mem (cm->command_index_by_path, normalized_path);
-  if (p)
-    {
-      vlib_cli_command_t *d;
-
-      ci = p[0];
-      d = vec_elt_at_index (cm->commands, ci);
-
-      /* If existing command was created via vlib_cli_make_parent
-         replaced it with callers data. */
-      if (vlib_cli_command_is_empty (d))
-	{
-	  vlib_cli_command_t save = d[0];
-
-	  ASSERT (!vlib_cli_command_is_empty (c));
-
-	  /* Copy callers fields. */
-	  d[0] = c[0];
-
-	  /* Save internal fields. */
-	  d->path = save.path;
-	  d->sub_commands = save.sub_commands;
-	  d->sub_command_index_by_name = save.sub_command_index_by_name;
-	  d->sub_command_positions = save.sub_command_positions;
-	  d->sub_rules = save.sub_rules;
-	}
-      else
-	error =
-	  clib_error_return (0, "duplicate command name with path %v",
-			     normalized_path);
-
-      vec_free (normalized_path);
-      if (error)
-	return error;
-    }
-  else
-    {
-      /* Command does not exist: create it. */
-
-      /* Add root command (index 0). */
-      if (vec_len (cm->commands) == 0)
-	{
-	  /* Create command with index 0; path is empty string. */
-	  vec_resize (cm->commands, 1);
-	}
-
-      ci = vec_len (cm->commands);
-      hash_set_mem (cm->command_index_by_path, normalized_path, ci);
-      vec_add1 (cm->commands, c[0]);
-
-      c = vec_elt_at_index (cm->commands, ci);
-      c->path = normalized_path;
-
-      /* Don't inherit from registration. */
-      c->sub_commands = 0;
-      c->sub_command_index_by_name = 0;
-      c->sub_command_positions = 0;
-    }
-
-  vlib_cli_make_parent (cm, ci);
-  return 0;
-}
-
-clib_error_t *
-vlib_cli_register_parse_rule (vlib_main_t * vm, vlib_cli_parse_rule_t * r_reg)
-{
-  vlib_cli_main_t *cm = &vm->cli_main;
-  vlib_cli_parse_rule_t *r;
-  clib_error_t *error = 0;
-  u8 *r_name;
-  uword *p;
-
-  if (!cm->parse_rule_index_by_name)
-    cm->parse_rule_index_by_name = hash_create_vec ( /* initial length */ 32,
-						    sizeof (r->name[0]),
-						    sizeof (uword));
-
-  /* Make vector copy of name. */
-  r_name = format (0, "%s", r_reg->name);
-
-  if ((p = hash_get_mem (cm->parse_rule_index_by_name, r_name)))
-    {
-      vec_free (r_name);
-      return clib_error_return (0, "duplicate parse rule name `%s'",
-				r_reg->name);
-    }
-
-  vec_add2 (cm->parse_rules, r, 1);
-  r[0] = r_reg[0];
-  r->name = (char *) r_name;
-  hash_set_mem (cm->parse_rule_index_by_name, r->name, r - cm->parse_rules);
-
-  return error;
-}
-
-#if 0
-/* $$$ turn back on again someday, maybe */
-static clib_error_t *vlib_cli_register_parse_rules (vlib_main_t * vm,
-						    vlib_cli_parse_rule_t *
-						    lo,
-						    vlib_cli_parse_rule_t *
-						    hi)
-  __attribute__ ((unused))
-{
-  clib_error_t *error = 0;
-  vlib_cli_parse_rule_t *r;
-
-  for (r = lo; r < hi; r = clib_elf_section_data_next (r, 0))
-    {
-      if (!r->name || strlen (r->name) == 0)
-	{
-	  error = clib_error_return (0, "parse rule with no name");
-	  goto done;
-	}
-
-      error = vlib_cli_register_parse_rule (vm, r);
-      if (error)
-	goto done;
-    }
-
-done:
-  return error;
-}
-#endif
-
-static clib_error_t *
-vlib_cli_init (vlib_main_t * vm)
-{
-  vlib_cli_main_t *cm = &vm->cli_main;
-  clib_error_t *error = 0;
-  vlib_cli_command_t *cmd;
-
-  cmd = cm->cli_command_registrations;
-
-  while (cmd)
-    {
-      error = vlib_cli_register (vm, cmd);
-      if (error)
-	return error;
-      cmd = cmd->next_cli_command;
-    }
-  return error;
-}
-
-VLIB_INIT_FUNCTION (vlib_cli_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/cli.h b/vlib/vlib/cli.h
deleted file mode 100644
index 009c7e82..00000000
--- a/vlib/vlib/cli.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * cli.h: command line interface
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_cli_h
-#define included_vlib_cli_h
-
-#include <vppinfra/format.h>
-
-struct vlib_cli_command_t;
-
-typedef struct
-{
-  u32 min_char;
-
-  /* Indexed by name[position] - min_char. */
-  uword **bitmaps;
-} vlib_cli_parse_position_t;
-
-typedef struct
-{
-  u8 *name;
-
-  u32 index;
-} vlib_cli_sub_command_t;
-
-typedef struct
-{
-  u8 *name;
-
-  u32 rule_index;
-
-  u32 command_index;
-} vlib_cli_sub_rule_t;
-
-typedef struct
-{
-  char *name;
-  char *short_help;
-  char *long_help;
-
-  /* Number of bytes in parsed data.  Zero for vector. */
-  uword data_size;
-
-  unformat_function_t *unformat_function;
-
-  /* Opaque for unformat function. */
-  uword unformat_function_arg[2];
-} vlib_cli_parse_rule_t;
-
-/* CLI command callback function. */
-typedef clib_error_t *(vlib_cli_command_function_t)
-  (struct vlib_main_t * vm,
-   unformat_input_t * input, struct vlib_cli_command_t * cmd);
-
-typedef struct vlib_cli_command_t
-{
-  /* Command path (e.g. "show something").
-     Spaces delimit elements of path. */
-  char *path;
-
-  /* Short/long help strings. */
-  char *short_help;
-  char *long_help;
-
-  /* Callback function. */
-  vlib_cli_command_function_t *function;
-
-  /* Opaque. */
-  uword function_arg;
-
-  /* Known MP-safe? */
-  uword is_mp_safe;
-
-  /* Sub commands for this command. */
-  vlib_cli_sub_command_t *sub_commands;
-
-  /* Hash table mapping name (e.g. last path element) to sub command index. */
-  uword *sub_command_index_by_name;
-
-  /* bitmap[p][c][i] says whether sub-command i has character
-     c in position p. */
-  vlib_cli_parse_position_t *sub_command_positions;
-
-  /* Hash table mapping name (e.g. last path element) to sub rule index. */
-  uword *sub_rule_index_by_name;
-
-  /* Vector of possible parse rules for this path. */
-  vlib_cli_sub_rule_t *sub_rules;
-
-  /* List of CLI commands, built by constructors */
-  struct vlib_cli_command_t *next_cli_command;
-
-} vlib_cli_command_t;
-
-typedef void (vlib_cli_output_function_t) (uword arg,
-					   u8 * buffer, uword buffer_bytes);
-typedef struct
-{
-  /* Vector of all known commands. */
-  vlib_cli_command_t *commands;
-
-  /* Hash table mapping normalized path to index into all_commands. */
-  uword *command_index_by_path;
-
-  /* Vector of all known parse rules. */
-  vlib_cli_parse_rule_t *parse_rules;
-
-  /* Hash table mapping parse rule name to index into parse_rule vector. */
-  uword *parse_rule_index_by_name;
-
-  /* Data parsed for rules. */
-  void **parse_rule_data;
-
-  /* registration list added by constructors */
-  vlib_cli_command_t *cli_command_registrations;
-} vlib_cli_main_t;
-
-#define VLIB_CLI_COMMAND(x,...)                                         \
-    __VA_ARGS__ vlib_cli_command_t x;                                   \
-static void __vlib_cli_command_registration_##x (void)                  \
-    __attribute__((__constructor__)) ;                                  \
-static void __vlib_cli_command_registration_##x (void)                  \
-{                                                                       \
-    vlib_main_t * vm = vlib_get_main();                                 \
-    vlib_cli_main_t *cm = &vm->cli_main;                                \
-    x.next_cli_command = cm->cli_command_registrations;                 \
-    cm->cli_command_registrations = &x;                                 \
-}                                                                       \
-__VA_ARGS__ vlib_cli_command_t x
-#define VLIB_CLI_PARSE_RULE(x) \
-  vlib_cli_parse_rule_t x
-/* Output to current CLI connection. */
-void vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...);
-
-/* Process CLI input. */
-void vlib_cli_input (struct vlib_main_t *vm,
-		     unformat_input_t * input,
-		     vlib_cli_output_function_t * function,
-		     uword function_arg);
-
-clib_error_t *vlib_cli_register (struct vlib_main_t *vm,
-				 vlib_cli_command_t * c);
-clib_error_t *vlib_cli_register_parse_rule (struct vlib_main_t *vm,
-					    vlib_cli_parse_rule_t * c);
-
-uword unformat_vlib_cli_sub_input (unformat_input_t * i, va_list * args);
-
-#endif /* included_vlib_cli_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/cli_funcs.h b/vlib/vlib/cli_funcs.h
deleted file mode 100644
index 78aef73b..00000000
--- a/vlib/vlib/cli_funcs.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * cli_funcs.h: VLIB CLI related functions/inlines
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_cli_funcs_h
-#define included_vlib_cli_funcs_h
-
-always_inline void *
-vlib_cli_get_parse_rule_result (vlib_main_t * vm, uword index)
-{
-  vlib_cli_main_t *cm = &vm->cli_main;
-  return vec_elt (cm->parse_rule_data, index);
-}
-
-#endif /* included_vlib_cli_funcs_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/counter.c b/vlib/vlib/counter.c
deleted file mode 100644
index 9f66e04d..00000000
--- a/vlib/vlib/counter.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * counter.c: simple and packet/byte counters
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-
-void
-vlib_clear_simple_counters (vlib_simple_counter_main_t * cm)
-{
-  uword i, j;
-  u16 *my_minis;
-
-  for (i = 0; i < vec_len (cm->minis); i++)
-    {
-      my_minis = cm->minis[i];
-
-      for (j = 0; j < vec_len (my_minis); j++)
-	{
-	  cm->maxi[j] += my_minis[j];
-	  my_minis[j] = 0;
-	}
-    }
-
-  j = vec_len (cm->maxi);
-  if (j > 0)
-    vec_validate (cm->value_at_last_clear, j - 1);
-  for (i = 0; i < j; i++)
-    cm->value_at_last_clear[i] = cm->maxi[i];
-}
-
-void
-vlib_clear_combined_counters (vlib_combined_counter_main_t * cm)
-{
-  uword i, j;
-  vlib_mini_counter_t *my_minis;
-
-  for (i = 0; i < vec_len (cm->minis); i++)
-    {
-      my_minis = cm->minis[i];
-
-      for (j = 0; j < vec_len (my_minis); j++)
-	{
-	  cm->maxi[j].packets += my_minis[j].packets;
-	  cm->maxi[j].bytes += my_minis[j].bytes;
-	  my_minis[j].packets = 0;
-	  my_minis[j].bytes = 0;
-	}
-    }
-
-  j = vec_len (cm->maxi);
-  if (j > 0)
-    vec_validate (cm->value_at_last_clear, j - 1);
-
-  for (i = 0; i < j; i++)
-    {
-      vlib_counter_t *c = vec_elt_at_index (cm->value_at_last_clear, i);
-
-      c[0] = cm->maxi[i];
-    }
-}
-
-void
-vlib_validate_simple_counter (vlib_simple_counter_main_t * cm, u32 index)
-{
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  int i;
-
-  vec_validate (cm->minis, tm->n_vlib_mains - 1);
-  for (i = 0; i < tm->n_vlib_mains; i++)
-    vec_validate_aligned (cm->minis[i], index, CLIB_CACHE_LINE_BYTES);
-  vec_validate_aligned (cm->maxi, index, CLIB_CACHE_LINE_BYTES);
-}
-
-void
-vlib_validate_combined_counter (vlib_combined_counter_main_t * cm, u32 index)
-{
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  int i;
-
-  vec_validate (cm->minis, tm->n_vlib_mains - 1);
-  for (i = 0; i < tm->n_vlib_mains; i++)
-    vec_validate_aligned (cm->minis[i], index, CLIB_CACHE_LINE_BYTES);
-  vec_validate_aligned (cm->maxi, index, CLIB_CACHE_LINE_BYTES);
-}
-
-void
-serialize_vlib_simple_counter_main (serialize_main_t * m, va_list * va)
-{
-  clib_warning ("unimplemented");
-}
-
-void
-unserialize_vlib_simple_counter_main (serialize_main_t * m, va_list * va)
-{
-  clib_warning ("unimplemented");
-}
-
-void
-serialize_vlib_combined_counter_main (serialize_main_t * m, va_list * va)
-{
-  clib_warning ("unimplemented");
-}
-
-void
-unserialize_vlib_combined_counter_main (serialize_main_t * m, va_list * va)
-{
-  clib_warning ("unimplemented");
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/counter.h b/vlib/vlib/counter.h
deleted file mode 100644
index a7903206..00000000
--- a/vlib/vlib/counter.h
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * counter.h: simple and packet/byte counters
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_counter_h
-#define included_vlib_counter_h
-
-/** \file
-
-    Optimized thread-safe counters.
-
-    Each vlib_[simple|combined]_counter_main_t consists of a single
-    vector of thread-safe / atomically-updated u64 counters [the
-    "maxi" vector], and a (u16 **) per-thread vector [the "minis"
-    vector] of narrow, per-thread counters.
-
-    The idea is to drastically reduce the number of atomic operations.
-    In the case of packet counts, we divide the number of atomic ops
-    by 2**16, etc.
-*/
-
-/** A collection of simple counters */
-
-typedef struct
-{
-  u16 **minis;	 /**< Per-thread u16 non-atomic counters */
-  u64 *maxi;	 /**< Shared wide counters */
-  u64 *value_at_last_clear; /**< Counter values as of last clear. */
-  u64 *value_at_last_serialize;	/**< Values as of last serialize. */
-  u32 last_incremental_serialize_index;	/**< Last counter index
-                                           serialized incrementally. */
-
-  char *name;			/**< The counter collection's name. */
-} vlib_simple_counter_main_t;
-
-/** Increment a simple counter
-    @param cm - (vlib_simple_counter_main_t *) simple counter main pointer
-    @param cpu_index - (u32) the current cpu index
-    @param index - (u32) index of the counter to increment
-    @param increment - (u32) quantitiy to add to the counter
-*/
-always_inline void
-vlib_increment_simple_counter (vlib_simple_counter_main_t * cm,
-			       u32 cpu_index, u32 index, u32 increment)
-{
-  u16 *my_minis;
-  u16 *mini;
-  u32 old, new;
-
-  my_minis = cm->minis[cpu_index];
-  mini = vec_elt_at_index (my_minis, index);
-  old = mini[0];
-  new = old + increment;
-  mini[0] = new;
-
-  if (PREDICT_FALSE (mini[0] != new))
-    {
-      __sync_fetch_and_add (&cm->maxi[index], new);
-      my_minis[index] = 0;
-    }
-}
-
-/** Get the value of a simple counter
-    Scrapes the entire set of mini counters. Innacurate unless
-    worker threads which might increment the counter are
-    barrier-synchronized
-
-    @param cm - (vlib_simple_counter_main_t *) simple counter main pointer
-    @param index - (u32) index of the counter to fetch
-    @returns - (u64) current counter value
-*/
-always_inline u64
-vlib_get_simple_counter (vlib_simple_counter_main_t * cm, u32 index)
-{
-  u16 *my_minis, *mini;
-  u64 v;
-  int i;
-
-  ASSERT (index < vec_len (cm->maxi));
-
-  v = 0;
-
-  for (i = 0; i < vec_len (cm->minis); i++)
-    {
-      my_minis = cm->minis[i];
-      mini = vec_elt_at_index (my_minis, index);
-      v += mini[0];
-    }
-
-  v += cm->maxi[index];
-
-  if (index < vec_len (cm->value_at_last_clear))
-    {
-      ASSERT (v >= cm->value_at_last_clear[index]);
-      v -= cm->value_at_last_clear[index];
-    }
-
-  return v;
-}
-
-/** Clear a simple counter
-    Clears the set of per-thread u16 counters, and the u64 counter
-
-    @param cm - (vlib_simple_counter_main_t *) simple counter main pointer
-    @param index - (u32) index of the counter to clear
-*/
-always_inline void
-vlib_zero_simple_counter (vlib_simple_counter_main_t * cm, u32 index)
-{
-  u16 *my_minis;
-  int i;
-
-  ASSERT (index < vec_len (cm->maxi));
-
-  for (i = 0; i < vec_len (cm->minis); i++)
-    {
-      my_minis = cm->minis[i];
-      my_minis[index] = 0;
-    }
-
-  cm->maxi[index] = 0;
-
-  if (index < vec_len (cm->value_at_last_clear))
-    cm->value_at_last_clear[index] = 0;
-}
-
-/** Combined counter to hold both packets and byte differences.
- */
-typedef struct
-{
-  u64 packets;			/**< packet counter */
-  u64 bytes;			/**< byte counter  */
-} vlib_counter_t;
-
-/** Add two combined counters, results in the first counter
-    @param [in,out] a - (vlib_counter_t *) dst counter
-    @param b - (vlib_counter_t *) src counter
-*/
-
-always_inline void
-vlib_counter_add (vlib_counter_t * a, vlib_counter_t * b)
-{
-  a->packets += b->packets;
-  a->bytes += b->bytes;
-}
-
-/** Subtract combined counters, results in the first counter
-    @param [in,out] a - (vlib_counter_t *) dst counter
-    @param b - (vlib_counter_t *) src counter
-*/
-always_inline void
-vlib_counter_sub (vlib_counter_t * a, vlib_counter_t * b)
-{
-  ASSERT (a->packets >= b->packets);
-  ASSERT (a->bytes >= b->bytes);
-  a->packets -= b->packets;
-  a->bytes -= b->bytes;
-}
-
-/** Clear a combined counter
-    @param a - (vlib_counter_t *) counter to clear
-*/
-always_inline void
-vlib_counter_zero (vlib_counter_t * a)
-{
-  a->packets = a->bytes = 0;
-}
-
-/** Mini combined counter */
-typedef struct
-{
-  u16 packets;			/**< Packet count */
-  i16 bytes;			/**< Byte count */
-} vlib_mini_counter_t;
-
-/** A collection of combined counters */
-typedef struct
-{
-  vlib_mini_counter_t **minis;	/**< Per-thread u16 non-atomic counter pairs */
-  vlib_counter_t *maxi;		/**< Shared wide counter pairs */
-  vlib_counter_t *value_at_last_clear;	/**< Counter values as of last clear. */
-  vlib_counter_t *value_at_last_serialize; /**< Counter values as of last serialize. */
-  u32 last_incremental_serialize_index;	/**< Last counter index serialized incrementally. */
-  char *name; /**< The counter collection's name. */
-} vlib_combined_counter_main_t;
-
-/** Clear a collection of simple counters
-    @param cm - (vlib_simple_counter_main_t *) collection to clear
-*/
-void vlib_clear_simple_counters (vlib_simple_counter_main_t * cm);
-
-/** Clear a collection of combined counters
-    @param cm - (vlib_combined_counter_main_t *) collection to clear
-*/
-void vlib_clear_combined_counters (vlib_combined_counter_main_t * cm);
-
-/** Increment a combined counter
-    @param cm - (vlib_combined_counter_main_t *) comined counter main pointer
-    @param cpu_index - (u32) the current cpu index
-    @param index - (u32) index of the counter to increment
-    @param packet_increment - (u32) number of packets to add to the counter
-    @param byte_increment - (u32) number of bytes to add to the counter
-*/
-
-always_inline void
-vlib_increment_combined_counter (vlib_combined_counter_main_t * cm,
-				 u32 cpu_index,
-				 u32 index,
-				 u32 packet_increment, u32 byte_increment)
-{
-  vlib_mini_counter_t *my_minis, *mini;
-  u32 old_packets, new_packets;
-  i32 old_bytes, new_bytes;
-
-  /* Use this CPU's mini counter array */
-  my_minis = cm->minis[cpu_index];
-
-  mini = vec_elt_at_index (my_minis, index);
-  old_packets = mini->packets;
-  old_bytes = mini->bytes;
-
-  new_packets = old_packets + packet_increment;
-  new_bytes = old_bytes + byte_increment;
-
-  mini->packets = new_packets;
-  mini->bytes = new_bytes;
-
-  /* Bytes always overflow before packets.. */
-  if (PREDICT_FALSE (mini->bytes != new_bytes))
-    {
-      vlib_counter_t *maxi = vec_elt_at_index (cm->maxi, index);
-
-      __sync_fetch_and_add (&maxi->packets, new_packets);
-      __sync_fetch_and_add (&maxi->bytes, new_bytes);
-
-      mini->packets = 0;
-      mini->bytes = 0;
-    }
-}
-
-/** Get the value of a combined counter, never called in the speed path
-    Scrapes the entire set of mini counters. Innacurate unless
-    worker threads which might increment the counter are
-    barrier-synchronized
-
-    @param cm - (vlib_combined_counter_main_t *) combined counter main pointer
-    @param index - (u32) index of the combined counter to fetch
-    @param result [out] - (vlib_counter_t *) result stored here
-*/
-
-static inline void
-vlib_get_combined_counter (vlib_combined_counter_main_t * cm,
-			   u32 index, vlib_counter_t * result)
-{
-  vlib_mini_counter_t *my_minis, *mini;
-  vlib_counter_t *maxi;
-  int i;
-
-  result->packets = 0;
-  result->bytes = 0;
-
-  for (i = 0; i < vec_len (cm->minis); i++)
-    {
-      my_minis = cm->minis[i];
-
-      mini = vec_elt_at_index (my_minis, index);
-      result->packets += mini->packets;
-      result->bytes += mini->bytes;
-    }
-
-  maxi = vec_elt_at_index (cm->maxi, index);
-  result->packets += maxi->packets;
-  result->bytes += maxi->bytes;
-
-  if (index < vec_len (cm->value_at_last_clear))
-    vlib_counter_sub (result, &cm->value_at_last_clear[index]);
-}
-
-/** Clear a combined counter
-    Clears the set of per-thread u16 counters, and the shared vlib_counter_t
-
-    @param cm - (vlib_combined_counter_main_t *) combined counter main pointer
-    @param index - (u32) index of the counter to clear
-*/
-always_inline void
-vlib_zero_combined_counter (vlib_combined_counter_main_t * cm, u32 index)
-{
-  vlib_mini_counter_t *mini, *my_minis;
-  int i;
-
-  for (i = 0; i < vec_len (cm->minis); i++)
-    {
-      my_minis = cm->minis[i];
-
-      mini = vec_elt_at_index (my_minis, index);
-      mini->packets = 0;
-      mini->bytes = 0;
-    }
-
-  vlib_counter_zero (&cm->maxi[index]);
-  if (index < vec_len (cm->value_at_last_clear))
-    vlib_counter_zero (&cm->value_at_last_clear[index]);
-}
-
-/** validate a simple counter
-    @param cm - (vlib_simple_counter_main_t *) pointer to the counter collection
-    @param index - (u32) index of the counter to validate
-*/
-
-void vlib_validate_simple_counter (vlib_simple_counter_main_t * cm,
-				   u32 index);
-/** validate a combined counter
-    @param cm - (vlib_combined_counter_main_t *) pointer to the counter
-    collection
-    @param index - (u32) index of the counter to validate
-*/
-
-void vlib_validate_combined_counter (vlib_combined_counter_main_t * cm,
-				     u32 index);
-
-/** Obtain the number of simple or combined counters allocated.
-    A macro which reduces to to vec_len(cm->maxi), the answer in either
-    case.
-
-    @param cm - (vlib_simple_counter_main_t) or
-    (vlib_combined_counter_main_t) the counter collection to interrogate
-    @returns vec_len(cm->maxi)
-*/
-#define vlib_counter_len(cm) vec_len((cm)->maxi)
-
-serialize_function_t serialize_vlib_simple_counter_main,
-  unserialize_vlib_simple_counter_main;
-serialize_function_t serialize_vlib_combined_counter_main,
-  unserialize_vlib_combined_counter_main;
-
-#endif /* included_vlib_counter_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/defs.h b/vlib/vlib/defs.h
deleted file mode 100644
index ad58bc04..00000000
--- a/vlib/vlib/defs.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * defs.h: VLIB generic C definitions
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_defs_h
-#define included_vlib_defs_h
-
-/* Receive or transmit. */
-typedef enum
-{
-  VLIB_RX,
-  VLIB_TX,
-  VLIB_N_RX_TX = 2,		/* Used to size arrays. */
-} vlib_rx_or_tx_t;
-
-#define vlib_foreach_rx_tx(v) for (v = 0; v < VLIB_N_RX_TX; v++)
-
-/* Read/write. */
-typedef enum
-{
-  VLIB_READ,
-  VLIB_WRITE,
-} vlib_read_or_write_t;
-
-/* Up/down. */
-typedef enum
-{
-  VLIB_DOWN = 0,
-  VLIB_UP = 1,
-} vlib_up_or_down_t;
-
-/* Enable/disable. */
-typedef enum
-{
-  VLIB_DISABLE = 0,
-  VLIB_ENABLE = 1,
-} vlib_enable_or_disable_t;
-
-#endif /* included_vlib_defs_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/dir.dox b/vlib/vlib/dir.dox
deleted file mode 100644
index 4806e7a9..00000000
--- a/vlib/vlib/dir.dox
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Doxygen directory documentation */
-/**
-@dir
-@brief VLIB application library source.
-*/
-/*? %%clicmd:group_label VLIB application library%% ?*/
-
diff --git a/vlib/vlib/elog_samples.c b/vlib/vlib/elog_samples.c
deleted file mode 100644
index a8c800df..00000000
--- a/vlib/vlib/elog_samples.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vppinfra/elog.h>
-
-static inline void
-elog_four_int_sample (u32 * data)
-{
-  ELOG_TYPE_DECLARE (e) =
-  {
-  .format = "four int: first %d second %d third %d fourth %d",.format_args =
-      "i4i4i4i4",};
-  struct
-  {
-    u32 data[4];
-  } *ed;
-  ed = ELOG_DATA (&vlib_global_main.elog_main, e);
-  ed->data[0] = data[0];
-  ed->data[1] = data[1];
-  ed->data[2] = data[2];
-  ed->data[3] = data[3];
-}
-
-static inline void
-elog_four_int_track_sample (u32 * data)
-{
-  ELOG_TYPE_DECLARE (e) =
-  {
-  .format =
-      "four_int_track: first %d second %d third %d fourth %d",.format_args =
-      "i4i4i4i4",};
-  struct
-  {
-    u32 data[4];
-  } *ed;
-  ELOG_TRACK (sample_track);
-  ed = ELOG_TRACK_DATA (&vlib_global_main.elog_main, e, sample_track);
-  ed->data[0] = data[0];
-  ed->data[1] = data[1];
-  ed->data[2] = data[2];
-  ed->data[3] = data[3];
-}
-
-static inline void
-elog_enum_sample (u8 which)
-{
-  ELOG_TYPE_DECLARE (e) =
-  {
-    .format = "my enum: %s",.format_args = "t1",.n_enum_strings =
-      2,.enum_strings =
-    {
-  "string 1", "string 2",},};
-  struct
-  {
-    u8 which;
-  } *ed;
-  ed = ELOG_DATA (&vlib_global_main.elog_main, e);
-  ed->which = which;
-}
-
-static inline void
-elog_one_datum_sample (u32 data)
-{
-  ELOG_TYPE_DECLARE (e) =
-  {
-  .format = "one datum: %d",.format_args = "i4",};
-
-  elog (&vlib_global_main.elog_main, &e, data);
-}
-
-static clib_error_t *
-test_elog_command_fn (vlib_main_t * vm,
-		      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  int i;
-  u32 samples[4];
-
-  for (i = 0; i < 10; i++)
-    {
-      samples[0] = i;
-      samples[1] = i + 1;
-      samples[2] = i + 2;
-      samples[3] = i + 3;
-
-      elog_four_int_sample (samples);
-      elog_four_int_track_sample (samples);
-      elog_enum_sample (0);
-      elog_enum_sample (1);
-      elog_one_datum_sample (i);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (test_elog_command, static) = {
-  .path = "test elog sample",
-  .short_help = "test elog sample",
-  .function = test_elog_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/error.c b/vlib/vlib/error.c
deleted file mode 100644
index a2c23176..00000000
--- a/vlib/vlib/error.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * error.c: VLIB error handler
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vppinfra/heap.h>
-
-uword
-vlib_error_drop_buffers (vlib_main_t * vm,
-			 vlib_node_runtime_t * node,
-			 u32 * buffers,
-			 u32 next_buffer_stride,
-			 u32 n_buffers,
-			 u32 next_index,
-			 u32 drop_error_node, u32 drop_error_code)
-{
-  u32 n_left_this_frame, n_buffers_left, *args, n_args_left;
-  vlib_error_t drop_error;
-
-  drop_error = vlib_error_set (drop_error_node, drop_error_code);
-
-  n_buffers_left = n_buffers;
-  while (n_buffers_left > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, args, n_args_left);
-
-      n_left_this_frame = clib_min (n_buffers_left, n_args_left);
-      n_buffers_left -= n_left_this_frame;
-      n_args_left -= n_left_this_frame;
-
-      while (n_left_this_frame >= 4)
-	{
-	  u32 bi0, bi1, bi2, bi3;
-	  vlib_buffer_t *b0, *b1, *b2, *b3;
-
-	  args[0] = bi0 = buffers[0];
-	  args[1] = bi1 = buffers[1];
-	  args[2] = bi2 = buffers[2];
-	  args[3] = bi3 = buffers[3];
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-	  b2 = vlib_get_buffer (vm, bi2);
-	  b3 = vlib_get_buffer (vm, bi3);
-
-	  b0->error = drop_error;
-	  b1->error = drop_error;
-	  b2->error = drop_error;
-	  b3->error = drop_error;
-
-	  buffers += 4;
-	  args += 4;
-	  n_left_this_frame -= 4;
-	}
-
-      while (n_left_this_frame >= 1)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-
-	  args[0] = bi0 = buffers[0];
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b0->error = drop_error;
-
-	  buffers += 1;
-	  args += 1;
-	  n_left_this_frame -= 1;
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_args_left);
-    }
-
-  return n_buffers;
-}
-
-/* Convenience node to drop a vector of buffers with a "misc error". */
-static uword
-misc_drop_buffers (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return vlib_error_drop_buffers (vm, node, vlib_frame_args (frame),
-				  /* buffer stride */ 1,
-				  frame->n_vectors,
-				  /* next */ 0,
-				  node->node_index,
-				  /* error */ 0);
-}
-
-static char *misc_drop_buffers_error_strings[] = {
-  [0] = "misc. errors",
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (misc_drop_buffers_node,static) = {
-  .function = misc_drop_buffers,
-  .name = "misc-drop-buffers",
-  .vector_size = sizeof (u32),
-  .n_errors = 1,
-  .n_next_nodes = 1,
-  .next_nodes = {
-      "error-drop",
-  },
-  .error_strings = misc_drop_buffers_error_strings,
-};
-/* *INDENT-ON* */
-
-/* Reserves given number of error codes for given node. */
-void
-vlib_register_errors (vlib_main_t * vm,
-		      u32 node_index, u32 n_errors, char *error_strings[])
-{
-  vlib_error_main_t *em = &vm->error_main;
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  uword l;
-
-  ASSERT (os_get_cpu_number () == 0);
-
-  /* Free up any previous error strings. */
-  if (n->n_errors > 0)
-    heap_dealloc (em->error_strings_heap, n->error_heap_handle);
-
-  n->n_errors = n_errors;
-  n->error_strings = error_strings;
-
-  if (n_errors == 0)
-    return;
-
-  n->error_heap_index =
-    heap_alloc (em->error_strings_heap, n_errors, n->error_heap_handle);
-
-  l = vec_len (em->error_strings_heap);
-
-  clib_memcpy (vec_elt_at_index (em->error_strings_heap, n->error_heap_index),
-	       error_strings, n_errors * sizeof (error_strings[0]));
-
-  /* Allocate a counter/elog type for each error. */
-  vec_validate (em->counters, l - 1);
-  vec_validate (vm->error_elog_event_types, l - 1);
-
-  /* Zero counters for re-registrations of errors. */
-  if (n->error_heap_index + n_errors <= vec_len (em->counters_last_clear))
-    clib_memcpy (em->counters + n->error_heap_index,
-		 em->counters_last_clear + n->error_heap_index,
-		 n_errors * sizeof (em->counters[0]));
-  else
-    memset (em->counters + n->error_heap_index,
-	    0, n_errors * sizeof (em->counters[0]));
-
-  {
-    elog_event_type_t t;
-    uword i;
-
-    memset (&t, 0, sizeof (t));
-    for (i = 0; i < n_errors; i++)
-      {
-	t.format = (char *) format (0, "%v %s: %%d",
-				    n->name, error_strings[i]);
-	vm->error_elog_event_types[n->error_heap_index + i] = t;
-      }
-  }
-}
-
-static clib_error_t *
-show_errors (vlib_main_t * vm,
-	     unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vlib_error_main_t *em = &vm->error_main;
-  vlib_node_t *n;
-  u32 code, i, ni;
-  u64 c;
-  int index = 0;
-  int verbose = 0;
-  u64 *sums = 0;
-
-  if (unformat (input, "verbose %d", &verbose))
-    ;
-  else if (unformat (input, "verbose"))
-    verbose = 1;
-
-  vec_validate (sums, vec_len (em->counters));
-
-  if (verbose)
-    vlib_cli_output (vm, "%=10s%=40s%=20s%=6s", "Count", "Node", "Reason",
-		     "Index");
-  else
-    vlib_cli_output (vm, "%=10s%=40s%=6s", "Count", "Node", "Reason");
-
-
-  /* *INDENT-OFF* */
-  foreach_vlib_main(({
-    em = &this_vlib_main->error_main;
-
-    if (verbose)
-      vlib_cli_output(vm, "Thread %u (%v):", index,
-                      vlib_worker_threads[index].name);
-
-    for (ni = 0; ni < vec_len (this_vlib_main->node_main.nodes); ni++)
-      {
-	n = vlib_get_node (this_vlib_main, ni);
-	for (code = 0; code < n->n_errors; code++)
-	  {
-	    i = n->error_heap_index + code;
-	    c = em->counters[i];
-	    if (i < vec_len (em->counters_last_clear))
-	      c -= em->counters_last_clear[i];
-	    sums[i] += c;
-
-	    if (c == 0 && verbose < 2)
-	      continue;
-
-            if (verbose)
-              vlib_cli_output (vm, "%10Ld%=40v%=20s%=6d", c, n->name,
-                               em->error_strings_heap[i], i);
-            else
-              vlib_cli_output (vm, "%10d%=40v%s", c, n->name,
-                               em->error_strings_heap[i]);
-	  }
-      }
-    index++;
-  }));
-  /* *INDENT-ON* */
-
-  if (verbose)
-    vlib_cli_output (vm, "Total:");
-
-  for (ni = 0; ni < vec_len (vm->node_main.nodes); ni++)
-    {
-      n = vlib_get_node (vm, ni);
-      for (code = 0; code < n->n_errors; code++)
-	{
-	  i = n->error_heap_index + code;
-	  if (sums[i])
-	    {
-	      if (verbose)
-		vlib_cli_output (vm, "%10Ld%=40v%=20s%=10d", sums[i], n->name,
-				 em->error_strings_heap[i], i);
-	    }
-	}
-    }
-
-  vec_free (sums);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_show_errors, static) = {
-  .path = "show errors",
-  .short_help = "Show error counts",
-  .function = show_errors,
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_show_node_counters, static) = {
-  .path = "show node counters",
-  .short_help = "Show node counters",
-  .function = show_errors,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-clear_error_counters (vlib_main_t * vm,
-		      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vlib_error_main_t *em;
-  u32 i;
-
-  /* *INDENT-OFF* */
-  foreach_vlib_main(({
-    em = &this_vlib_main->error_main;
-    vec_validate (em->counters_last_clear, vec_len (em->counters) - 1);
-    for (i = 0; i < vec_len (em->counters); i++)
-      em->counters_last_clear[i] = em->counters[i];
-  }));
-  /* *INDENT-ON* */
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_clear_error_counters, static) = {
-  .path = "clear errors",
-  .short_help = "Clear error counters",
-  .function = clear_error_counters,
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_clear_node_counters, static) = {
-  .path = "clear node counters",
-  .short_help = "Clear node counters",
-  .function = clear_error_counters,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/error.h b/vlib/vlib/error.h
deleted file mode 100644
index df2075c3..00000000
--- a/vlib/vlib/error.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * error.h: drop/punt error packets
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_error_h
-#define included_vlib_error_h
-
-/* Combined 16 bit node & 16 bit code as 32 bit number. */
-typedef u32 vlib_error_t;
-
-always_inline u32
-vlib_error_get_node (vlib_error_t e)
-{
-  return e >> 12;
-}
-
-always_inline u32
-vlib_error_get_code (vlib_error_t e)
-{
-  return e & 0xfff;
-}
-
-always_inline vlib_error_t
-vlib_error_set (u32 node_index, u32 code)
-{
-  ASSERT (node_index < (1 << 20));
-  ASSERT (code < (1 << 12));
-  return (node_index << 12) | code;
-}
-
-always_inline vlib_error_t
-vlib_error_set_code (vlib_error_t e, u32 code)
-{
-  ASSERT (vlib_error_get_code (e) == 0);
-  ASSERT (code < (1 << 12));
-  e |= code;
-  return e;
-}
-
-typedef struct
-{
-  /* Error counters. */
-  u64 *counters;
-
-  /* Counter values as of last counter clear. */
-  u64 *counters_last_clear;
-
-  /* Error name strings in heap.  Heap index
-     indexes counter vector. */
-  char **error_strings_heap;
-} vlib_error_main_t;
-
-/* Per node error registration. */
-void vlib_register_errors (struct vlib_main_t *vm,
-			   u32 node_index,
-			   u32 n_errors, char *error_strings[]);
-
-#endif /* included_vlib_error_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/error_funcs.h b/vlib/vlib/error_funcs.h
deleted file mode 100644
index 1a3602e9..00000000
--- a/vlib/vlib/error_funcs.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * error_funcs.h: VLIB error handling
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_error_funcs_h
-#define included_vlib_error_funcs_h
-
-#include <vlib/node_funcs.h>
-
-always_inline void
-vlib_error_elog_count (vlib_main_t * vm, uword counter, uword increment)
-{
-  elog_main_t *em = &vm->elog_main;
-  if (VLIB_ELOG_MAIN_LOOP > 0 && increment > 0)
-    elog (em, vec_elt_at_index (vm->error_elog_event_types, counter),
-	  increment);
-}
-
-always_inline void
-vlib_error_count (vlib_main_t * vm, uword node_index,
-		  uword counter, uword increment)
-{
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  vlib_error_main_t *em = &vm->error_main;
-
-  ASSERT (counter < n->n_errors);
-  counter += n->error_heap_index;
-
-  ASSERT (counter < vec_len (em->counters));
-  em->counters[counter] += increment;
-
-  vlib_error_elog_count (vm, counter, increment);
-}
-
-/* Drop all buffers in frame with given error code. */
-uword
-vlib_error_drop_buffers (vlib_main_t * vm,
-			 vlib_node_runtime_t * node,
-			 u32 * buffers,
-			 u32 next_buffer_stride,
-			 u32 n_buffers,
-			 u32 error_next_index,
-			 u32 error_node, u32 error_code);
-
-#endif /* included_vlib_error_funcs_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/format.c b/vlib/vlib/format.c
deleted file mode 100644
index 79a4d686..00000000
--- a/vlib/vlib/format.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * format.c: generic network formatting/unformating
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-
-u8 *
-format_vlib_rx_tx (u8 * s, va_list * args)
-{
-  vlib_rx_or_tx_t r = va_arg (*args, vlib_rx_or_tx_t);
-  char *t;
-
-  switch (r)
-    {
-    case VLIB_RX:
-      t = "rx";
-      break;
-    case VLIB_TX:
-      t = "tx";
-      break;
-    default:
-      t = "INVALID";
-      break;
-    }
-
-  vec_add (s, t, strlen (t));
-  return s;
-}
-
-u8 *
-format_vlib_read_write (u8 * s, va_list * args)
-{
-  vlib_rx_or_tx_t r = va_arg (*args, vlib_rx_or_tx_t);
-  char *t;
-
-  switch (r)
-    {
-    case VLIB_READ:
-      t = "read";
-      break;
-    case VLIB_WRITE:
-      t = "write";
-      break;
-    default:
-      t = "INVALID";
-      break;
-    }
-
-  vec_add (s, t, strlen (t));
-  return s;
-}
-
-/* Formats buffer data as printable ascii or as hex. */
-u8 *
-format_vlib_buffer_data (u8 * s, va_list * args)
-{
-  u8 *data = va_arg (*args, u8 *);
-  u32 n_data_bytes = va_arg (*args, u32);
-  u32 i, is_printable;
-
-  is_printable = 1;
-  for (i = 0; i < n_data_bytes && is_printable; i++)
-    {
-      u8 c = data[i];
-      if (c < 0x20)
-	is_printable = 0;
-      else if (c >= 0x7f)
-	is_printable = 0;
-    }
-
-  if (is_printable)
-    vec_add (s, data, n_data_bytes);
-  else
-    s = format (s, "%U", format_hex_bytes, data, n_data_bytes);
-
-  return s;
-}
-
-/* Enable/on => 1; disable/off => 0. */
-uword
-unformat_vlib_enable_disable (unformat_input_t * input, va_list * args)
-{
-  int *result = va_arg (*args, int *);
-  int enable;
-
-  if (unformat (input, "enable") || unformat (input, "on"))
-    enable = 1;
-  else if (unformat (input, "disable") || unformat (input, "off"))
-    enable = 0;
-  else
-    return 0;
-
-  *result = enable;
-  return 1;
-}
-
-/* rx/tx => VLIB_RX/VLIB_TX. */
-uword
-unformat_vlib_rx_tx (unformat_input_t * input, va_list * args)
-{
-  int *result = va_arg (*args, int *);
-  if (unformat (input, "rx"))
-    *result = VLIB_RX;
-  else if (unformat (input, "tx"))
-    *result = VLIB_TX;
-  else
-    return 0;
-  return 1;
-}
-
-/* Parse an int either %d or 0x%x. */
-uword
-unformat_vlib_number (unformat_input_t * input, va_list * args)
-{
-  int *result = va_arg (*args, int *);
-
-  return (unformat (input, "0x%x", result) || unformat (input, "%d", result));
-}
-
-/* Parse a-zA-Z0-9_ token and hash to value. */
-uword
-unformat_vlib_number_by_name (unformat_input_t * input, va_list * args)
-{
-  uword *hash = va_arg (*args, uword *);
-  int *result = va_arg (*args, int *);
-  uword *p;
-  u8 *token;
-  int i;
-
-  if (!unformat_user (input, unformat_token, "a-zA-Z0-9_", &token))
-    return 0;
-
-  /* Null terminate. */
-  if (vec_len (token) > 0 && token[vec_len (token) - 1] != 0)
-    vec_add1 (token, 0);
-
-  /* Check for exact match. */
-  p = hash_get_mem (hash, token);
-  if (p)
-    goto done;
-
-  /* Convert to upper case & try match. */
-  for (i = 0; i < vec_len (token); i++)
-    if (token[i] >= 'a' && token[i] <= 'z')
-      token[i] = 'A' + token[i] - 'a';
-  p = hash_get_mem (hash, token);
-
-done:
-  vec_free (token);
-  if (p)
-    *result = p[0];
-  return p != 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/format_funcs.h b/vlib/vlib/format_funcs.h
deleted file mode 100644
index f60b8940..00000000
--- a/vlib/vlib/format_funcs.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * format_funcs.h: VLIB formatting/unformating
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_format_h
-#define included_vlib_format_h
-
-/* Format vlib_rx_or_tx_t/vlib_read_or_write_t enum as string. */
-u8 *format_vlib_rx_tx (u8 * s, va_list * args);
-u8 *format_vlib_read_write (u8 * s, va_list * args);
-
-/* Formats buffer data as printable ascii or as hex. */
-u8 *format_vlib_buffer_data (u8 * s, va_list * args);
-
-/* Enable/on => 1; disable/off => 0. */
-uword unformat_vlib_enable_disable (unformat_input_t * input, va_list * args);
-
-/* rx/tx => VLIB_RX/VLIB_TX. */
-uword unformat_vlib_rx_tx (unformat_input_t * input, va_list * args);
-
-/* Parse a-zA-Z0-9_ token and hash to value. */
-uword unformat_vlib_number_by_name (unformat_input_t * input, va_list * args);
-
-/* Parse an int either %d or 0x%x. */
-uword unformat_vlib_number (unformat_input_t * input, va_list * args);
-
-/* Flag to format_vlib_*_header functions to tell them not to recurse
-   into the next layer's header.  For example, tells format_vlib_ethernet_header
-   not to format ip header. */
-#define FORMAT_VLIB_HEADER_NO_RECURSION (~0)
-
-#endif /* included_vlib_format_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/global_funcs.h b/vlib/vlib/global_funcs.h
deleted file mode 100644
index bbdbdef5..00000000
--- a/vlib/vlib/global_funcs.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * global_funcs.h: global data structure access functions
- */
-
-#ifndef included_vlib_global_funcs_h_
-#define included_vlib_global_funcs_h_
-
-always_inline vlib_main_t *
-vlib_get_main (void)
-{
-  vlib_main_t *vm;
-  vm = vlib_mains ? vlib_mains[os_get_cpu_number ()] : &vlib_global_main;
-  ASSERT (vm);
-  return vm;
-}
-
-always_inline vlib_thread_main_t *
-vlib_get_thread_main ()
-{
-  return &vlib_thread_main;
-}
-
-#endif /* included_vlib_global_funcs_h_ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/i2c.c b/vlib/vlib/i2c.c
deleted file mode 100644
index 97f5bb21..00000000
--- a/vlib/vlib/i2c.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vlib/i2c.h>
-
-static inline void
-i2c_delay (i2c_bus_t * b, f64 timeout)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vlib_time_wait (vm, timeout);
-}
-
-static void
-i2c_wait_for_scl (i2c_bus_t * b)
-{
-  f64 t = 0;
-
-  while (t < b->hold_time)
-    {
-      int sda, scl;
-      i2c_delay (b, b->rise_fall_time);
-      b->get_bits (b, &scl, &sda);
-
-      if (scl)
-	return;
-
-      t += b->rise_fall_time;
-    }
-  b->timeout = 1;
-}
-
-static void
-i2c_start (i2c_bus_t * b)
-{
-  b->timeout = 0;
-
-  b->put_bits (b, 1, 1);
-  i2c_wait_for_scl (b);
-
-  if (vlib_i2c_bus_timed_out (b))
-    return;
-
-  b->put_bits (b, 1, 0);
-  i2c_delay (b, b->hold_time);
-  b->put_bits (b, 0, 0);
-  i2c_delay (b, b->hold_time);
-}
-
-static void
-i2c_stop (i2c_bus_t * b)
-{
-  b->put_bits (b, 0, 0);
-  i2c_delay (b, b->rise_fall_time);
-
-  b->put_bits (b, 1, 0);
-  i2c_delay (b, b->hold_time);
-
-  b->put_bits (b, 1, 1);
-  i2c_delay (b, b->hold_time);
-}
-
-static void
-i2c_write_bit (i2c_bus_t * b, int sda)
-{
-  b->put_bits (b, 0, sda);
-  i2c_delay (b, b->rise_fall_time);
-
-  b->put_bits (b, 1, sda);
-  i2c_wait_for_scl (b);
-  i2c_delay (b, b->hold_time);
-
-  b->put_bits (b, 0, sda);
-  i2c_delay (b, b->rise_fall_time);
-}
-
-static void
-i2c_read_bit (i2c_bus_t * b, int *sda)
-{
-  int scl;
-
-  b->put_bits (b, 1, 1);
-  i2c_wait_for_scl (b);
-  i2c_delay (b, b->hold_time);
-
-  b->get_bits (b, &scl, sda);
-
-  b->put_bits (b, 0, 1);
-  i2c_delay (b, b->rise_fall_time);
-}
-
-static void
-i2c_write_byte (i2c_bus_t * b, u8 data)
-{
-  int i, sda;
-
-  for (i = 7; i >= 0; i--)
-    {
-      i2c_write_bit (b, (data >> i) & 1);
-      if (b->timeout)
-	return;
-    }
-
-  b->put_bits (b, 0, 1);
-  i2c_delay (b, b->rise_fall_time);
-
-  i2c_read_bit (b, &sda);
-
-  if (sda)
-    b->timeout = 1;
-}
-
-
-static void
-i2c_read_byte (i2c_bus_t * b, u8 * data, int ack)
-{
-  int i, sda;
-
-  *data = 0;
-
-  b->put_bits (b, 0, 1);
-  i2c_delay (b, b->rise_fall_time);
-
-  for (i = 7; i >= 0; i--)
-    {
-      i2c_read_bit (b, &sda);
-      if (b->timeout)
-	return;
-
-      *data |= (sda != 0) << i;
-    }
-
-  i2c_write_bit (b, ack == 0);
-}
-
-
-void
-vlib_i2c_init (i2c_bus_t * b)
-{
-  f64 tick;
-  if (!b->clock)
-    b->clock = 400000;
-
-  tick = 1.0 / b->clock;
-
-  /* Spend 40% of time in low and high states */
-  if (!b->hold_time)
-    b->hold_time = 0.4 * tick;
-
-  /* Spend 10% of time waiting for rise and fall */
-  if (!b->rise_fall_time)
-    b->rise_fall_time = 0.1 * tick;
-}
-
-void
-vlib_i2c_xfer (i2c_bus_t * bus, i2c_msg_t * msgs)
-{
-  i2c_msg_t *msg;
-  int i;
-
-  vec_foreach (msg, msgs)
-  {
-    i2c_start (bus);
-    i2c_write_byte (bus,
-		    (msg->addr << 1) + (msg->flags == I2C_MSG_FLAG_READ));
-
-    if (msg->flags & I2C_MSG_FLAG_READ)
-      for (i = 0; i < msg->len; i++)
-	{
-	  i2c_read_byte (bus, &msg->buffer[i], /* ack */ i + 1 != msg->len);
-	  if (bus->timeout)
-	    goto done;
-	}
-
-    else
-      for (i = 0; i < msg->len; i++)
-	{
-	  i2c_write_byte (bus, msg->buffer[i]);
-	  if (bus->timeout)
-	    goto done;
-	}
-  }
-
-done:
-  i2c_stop (bus);
-}
-
-void
-vlib_i2c_read_eeprom (i2c_bus_t * bus, u8 i2c_addr, u16 start_addr,
-		      u16 length, u8 * data)
-{
-  i2c_msg_t *msg = 0;
-  u8 start_address[1];
-
-  vec_validate (msg, 1);
-
-  start_address[0] = start_addr;
-  msg[0].addr = i2c_addr;
-  msg[0].flags = I2C_MSG_FLAG_WRITE;
-  msg[0].buffer = (u8 *) & start_address;
-  msg[0].len = 1;
-
-  msg[1].addr = i2c_addr;
-  msg[1].flags = I2C_MSG_FLAG_READ;
-  msg[1].buffer = data;
-  msg[1].len = length;
-
-  vlib_i2c_xfer (bus, msg);
-
-  vec_free (msg);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/i2c.h b/vlib/vlib/i2c.h
deleted file mode 100644
index b79bdc75..00000000
--- a/vlib/vlib/i2c.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_vlib_i2c_h
-#define included_vlib_i2c_h
-
-#include <vppinfra/types.h>
-
-
-#define I2C_MSG_FLAG_WRITE  0
-#define I2C_MSG_FLAG_READ   1
-
-typedef struct
-{
-  u8 addr;
-  u8 flags;
-  u16 len;
-  u8 *buffer;
-} i2c_msg_t;
-
-typedef struct i2c_bus_t
-{
-  void (*put_bits) (struct i2c_bus_t * b, int scl, int sda);
-  void (*get_bits) (struct i2c_bus_t * b, int *scl, int *sda);
-
-  int timeout;
-  u32 clock;
-  f64 hold_time;
-  f64 rise_fall_time;
-
-  /* Private data */
-  uword private_data;
-
-} i2c_bus_t;
-
-void vlib_i2c_init (i2c_bus_t * bus);
-void vlib_i2c_xfer (i2c_bus_t * bus, i2c_msg_t * msgs);
-void vlib_i2c_read_eeprom (i2c_bus_t * bus, u8 i2c_addr, u16 start_addr,
-			   u16 length, u8 * data);
-
-static inline int
-vlib_i2c_bus_timed_out (i2c_bus_t * bus)
-{
-  return bus->timeout;
-}
-
-#endif /* included_vlib_i2c_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/init.c b/vlib/vlib/init.c
deleted file mode 100644
index 8d478451..00000000
--- a/vlib/vlib/init.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * init.c: mechanism for functions to be called at init/exit.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-
-clib_error_t *
-vlib_call_init_exit_functions (vlib_main_t * vm,
-			       _vlib_init_function_list_elt_t * head,
-			       int call_once)
-{
-  clib_error_t *error = 0;
-  _vlib_init_function_list_elt_t *i;
-
-  i = head;
-  while (i)
-    {
-      if (call_once && !hash_get (vm->init_functions_called, i->f))
-	{
-	  if (call_once)
-	    hash_set1 (vm->init_functions_called, i->f);
-	  error = i->f (vm);
-	  if (error)
-	    return error;
-	}
-      i = i->next_init_function;
-    }
-  return error;
-}
-
-clib_error_t *
-vlib_call_all_init_functions (vlib_main_t * vm)
-{
-  /* Call dummy functions to make sure purely static modules are
-     linked in. */
-#define _(f) vlib_##f##_reference ();
-  foreach_vlib_module_reference;
-#undef _
-
-  return vlib_call_init_exit_functions
-    (vm, vm->init_function_registrations, 1 /* call_once */ );
-}
-
-clib_error_t *
-vlib_call_all_main_loop_enter_functions (vlib_main_t * vm)
-{
-  return vlib_call_init_exit_functions
-    (vm, vm->main_loop_enter_function_registrations, 1 /* call_once */ );
-}
-
-clib_error_t *
-vlib_call_all_main_loop_exit_functions (vlib_main_t * vm)
-{
-  return vlib_call_init_exit_functions
-    (vm, vm->main_loop_exit_function_registrations, 1 /* call_once */ );
-}
-
-clib_error_t *
-vlib_call_all_config_functions (vlib_main_t * vm,
-				unformat_input_t * input, int is_early)
-{
-  clib_error_t *error = 0;
-  vlib_config_function_runtime_t *c, **all;
-  uword *hash = 0, *p;
-  uword i;
-
-  hash = hash_create_string (0, sizeof (uword));
-  all = 0;
-
-  c = vm->config_function_registrations;
-
-  while (c)
-    {
-      hash_set_mem (hash, c->name, vec_len (all));
-      vec_add1 (all, c);
-      unformat_init (&c->input, 0, 0);
-      c = c->next_registration;
-    }
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      u8 *s, *v;
-
-      if (!unformat (input, "%s %v", &s, &v) || !(p = hash_get_mem (hash, s)))
-	{
-	  error = clib_error_create ("unknown input `%s %v'", s, v);
-	  goto done;
-	}
-
-      c = all[p[0]];
-      if (vec_len (c->input.buffer) > 0)
-	vec_add1 (c->input.buffer, ' ');
-      vec_add (c->input.buffer, v, vec_len (v));
-      vec_free (v);
-      vec_free (s);
-    }
-
-  for (i = 0; i < vec_len (all); i++)
-    {
-      c = all[i];
-
-      /* Is this an early config? Are we doing early configs? */
-      if (is_early ^ c->is_early)
-	continue;
-
-      /* Already called? */
-      if (hash_get (vm->init_functions_called, c->function))
-	continue;
-      hash_set1 (vm->init_functions_called, c->function);
-
-      error = c->function (vm, &c->input);
-      if (error)
-	goto done;
-    }
-
-done:
-  for (i = 0; i < vec_len (all); i++)
-    {
-      c = all[i];
-      unformat_free (&c->input);
-    }
-  vec_free (all);
-  hash_free (hash);
-  return error;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/init.h b/vlib/vlib/init.h
deleted file mode 100644
index 4fa5b304..00000000
--- a/vlib/vlib/init.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * init.h: mechanism for functions to be called at init/exit.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_init_h
-#define included_vlib_init_h
-
-#include <vppinfra/error.h>
-#include <vppinfra/format.h>
-#include <vppinfra/hash.h>
-
-/* Init/exit functions: called at start/end of main routine.  Init
-   functions are typically used to register and setup packet
-   processing nodes.  */
-
-typedef clib_error_t *(vlib_init_function_t) (struct vlib_main_t * vm);
-
-typedef struct _vlib_init_function_list_elt
-{
-  struct _vlib_init_function_list_elt *next_init_function;
-  vlib_init_function_t *f;
-} _vlib_init_function_list_elt_t;
-
-/* Configuration functions: called with configuration input just before
-   main polling loop starts. */
-typedef clib_error_t *(vlib_config_function_t) (struct vlib_main_t * vm,
-						unformat_input_t * input);
-
-typedef struct vlib_config_function_runtime_t
-{
-  /* Function to call.  Set to null once function has already been called. */
-  vlib_config_function_t *function;
-
-  /* Input for function. */
-  unformat_input_t input;
-
-  /* next config function registration */
-  struct vlib_config_function_runtime_t *next_registration;
-
-  /* To be invoked as soon as the clib heap is available */
-  u8 is_early;
-
-  /* Name used to distinguish input on command line. */
-  char name[32];
-} vlib_config_function_runtime_t;
-
-#define _VLIB_INIT_FUNCTION_SYMBOL(x, type)	\
-  _vlib_##type##_function_##x
-
-#define VLIB_INIT_FUNCTION_SYMBOL(x)		\
-  _VLIB_INIT_FUNCTION_SYMBOL(x, init)
-#define VLIB_MAIN_LOOP_ENTER_FUNCTION_SYMBOL(x)		\
-  _VLIB_INIT_FUNCTION_SYMBOL(x, main_loop_enter)
-#define VLIB_MAIN_LOOP_EXIT_FUNCTION_SYMBOL(x)	\
-  _VLIB_INIT_FUNCTION_SYMBOL(x, main_loop_exit)
-#define VLIB_CONFIG_FUNCTION_SYMBOL(x)		\
-  _VLIB_INIT_FUNCTION_SYMBOL(x, config)
-
-/* Declaration is global (e.g. not static) so that init functions can
-   be called from other modules to resolve init function depend. */
-
-#define VLIB_DECLARE_INIT_FUNCTION(x, tag)                      \
-vlib_init_function_t * _VLIB_INIT_FUNCTION_SYMBOL (x, tag) = x; \
-static void __vlib_add_##tag##_function_##x (void)              \
-    __attribute__((__constructor__)) ;                          \
-static void __vlib_add_##tag##_function_##x (void)              \
-{                                                               \
- vlib_main_t * vm = vlib_get_main();                            \
- static _vlib_init_function_list_elt_t _vlib_init_function;     \
- _vlib_init_function.next_init_function                         \
-    = vm->tag##_function_registrations;                         \
-  vm->tag##_function_registrations = &_vlib_init_function;      \
- _vlib_init_function.f = &x;                                    \
-}
-
-#define VLIB_INIT_FUNCTION(x) VLIB_DECLARE_INIT_FUNCTION(x,init)
-
-#define VLIB_MAIN_LOOP_ENTER_FUNCTION(x) \
-  VLIB_DECLARE_INIT_FUNCTION(x,main_loop_enter)
-#define VLIB_MAIN_LOOP_EXIT_FUNCTION(x) \
-VLIB_DECLARE_INIT_FUNCTION(x,main_loop_exit)
-
-#define VLIB_CONFIG_FUNCTION(x,n,...)                           \
-    __VA_ARGS__ vlib_config_function_runtime_t                  \
-    VLIB_CONFIG_FUNCTION_SYMBOL(x);                             \
-static void __vlib_add_config_function_##x (void)               \
-    __attribute__((__constructor__)) ;                          \
-static void __vlib_add_config_function_##x (void)               \
-{                                                               \
-    vlib_main_t * vm = vlib_get_main();                         \
-    VLIB_CONFIG_FUNCTION_SYMBOL(x).next_registration            \
-       = vm->config_function_registrations;                     \
-    vm->config_function_registrations                           \
-       = &VLIB_CONFIG_FUNCTION_SYMBOL(x);                       \
-}                                                               \
-  vlib_config_function_runtime_t                                \
-    VLIB_CONFIG_FUNCTION_SYMBOL (x)                             \
-  = {                                                           \
-    .name = n,                                                  \
-    .function = x,                                              \
-    .is_early = 0,						\
-  }
-
-#define VLIB_EARLY_CONFIG_FUNCTION(x,n,...)                     \
-    __VA_ARGS__ vlib_config_function_runtime_t                  \
-    VLIB_CONFIG_FUNCTION_SYMBOL(x);                             \
-static void __vlib_add_config_function_##x (void)               \
-    __attribute__((__constructor__)) ;                          \
-static void __vlib_add_config_function_##x (void)               \
-{                                                               \
-    vlib_main_t * vm = vlib_get_main();                         \
-    VLIB_CONFIG_FUNCTION_SYMBOL(x).next_registration            \
-       = vm->config_function_registrations;                     \
-    vm->config_function_registrations                           \
-       = &VLIB_CONFIG_FUNCTION_SYMBOL(x);                       \
-}                                                               \
-  vlib_config_function_runtime_t                                \
-    VLIB_CONFIG_FUNCTION_SYMBOL (x)                             \
-  = {                                                           \
-    .name = n,                                                  \
-    .function = x,                                              \
-    .is_early = 1,						\
-  }
-
-/* Call given init function: used for init function dependencies. */
-#define vlib_call_init_function(vm, x)					\
-  ({									\
-    extern vlib_init_function_t * VLIB_INIT_FUNCTION_SYMBOL (x);	\
-    vlib_init_function_t * _f = VLIB_INIT_FUNCTION_SYMBOL (x);		\
-    clib_error_t * _error = 0;						\
-    if (! hash_get (vm->init_functions_called, _f))			\
-      {									\
-	hash_set1 (vm->init_functions_called, _f);			\
-	_error = _f (vm);						\
-      }									\
-    _error;								\
-  })
-
-/* Don't call given init function: used to suppress parts of the netstack */
-#define vlib_mark_init_function_complete(vm, x)				\
-  ({									\
-    extern vlib_init_function_t * VLIB_INIT_FUNCTION_SYMBOL (x);	\
-    vlib_init_function_t * _f = VLIB_INIT_FUNCTION_SYMBOL (x);		\
-    hash_set1 (vm->init_functions_called, _f);				\
-  })
-
-#define vlib_call_post_graph_init_function(vm, x)			\
-  ({									\
-    extern vlib_init_function_t * VLIB_POST_GRAPH_INIT_FUNCTION_SYMBOL (x); \
-    vlib_init_function_t * _f = VLIB_POST_GRAPH_INIT_FUNCTION_SYMBOL (x); \
-    clib_error_t * _error = 0;						\
-    if (! hash_get (vm->init_functions_called, _f))			\
-      {									\
-	hash_set1 (vm->init_functions_called, _f);			\
-	_error = _f (vm);						\
-      }									\
-    _error;								\
-  })
-
-#define vlib_call_config_function(vm, x)			\
-  ({								\
-    vlib_config_function_runtime_t * _r;			\
-    clib_error_t * _error = 0;					\
-    extern vlib_config_function_runtime_t			\
-      VLIB_CONFIG_FUNCTION_SYMBOL (x);				\
-								\
-    _r = &VLIB_CONFIG_FUNCTION_SYMBOL (x);			\
-    if (! hash_get (vm->init_functions_called, _r->function))	\
-      {								\
-        hash_set1 (vm->init_functions_called, _r->function);	\
-	_error = _r->function (vm, &_r->input);			\
-      }								\
-    _error;							\
-  })
-
-/* External functions. */
-clib_error_t *vlib_call_all_init_functions (struct vlib_main_t *vm);
-clib_error_t *vlib_call_all_config_functions (struct vlib_main_t *vm,
-					      unformat_input_t * input,
-					      int is_early);
-clib_error_t *vlib_call_all_main_loop_enter_functions (struct vlib_main_t
-						       *vm);
-clib_error_t *vlib_call_all_main_loop_exit_functions (struct vlib_main_t *vm);
-clib_error_t *vlib_call_init_exit_functions (struct vlib_main_t *vm,
-					     _vlib_init_function_list_elt_t *
-					     head, int call_once);
-
-#define foreach_vlib_module_reference		\
-  _ (node_cli)					\
-  _ (trace_cli)
-
-/* Dummy function to get node_cli.c linked in. */
-#define _(x) void vlib_##x##_reference (void);
-foreach_vlib_module_reference
-#undef _
-#endif /* included_vlib_init_h */
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/lex.c b/vlib/vlib/lex.c
deleted file mode 100644
index 1cc8f167..00000000
--- a/vlib/vlib/lex.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vlib/lex.h>
-
-vlib_lex_main_t vlib_lex_main;
-
-#define LEX_DEBUG 0
-
-u8 *
-format_vlib_lex_token (u8 * s, va_list * args)
-{
-  vlib_lex_main_t *lm = va_arg (*args, vlib_lex_main_t *);
-  vlib_lex_token_t *t = va_arg (*args, vlib_lex_token_t *);
-
-  if (t->token == VLIB_LEX_word)
-    s = format (s, "%s", t->value.as_pointer);
-  else
-    s = format (s, "%s", lm->lex_token_names[t->token]);
-  return s;
-}
-
-void
-vlib_lex_get_token (vlib_lex_main_t * lm, vlib_lex_token_t * rv)
-{
-  u8 c;
-  vlib_lex_table_t *t;
-  vlib_lex_table_entry_t *e;
-  uword tv;
-
-  if (PREDICT_FALSE (lm->pushback_sp >= 0))
-    {
-      rv[0] = lm->pushback_vector[lm->pushback_sp--];
-      return;
-    }
-
-  rv->value.as_uword = ~0;
-
-  while (1)
-    {
-      if (PREDICT_FALSE (lm->current_index >= vec_len (lm->input_vector)))
-	{
-	  rv->token = VLIB_LEX_eof;
-	  return;
-	}
-
-      t = vec_elt_at_index (lm->lex_tables, lm->current_table_index);
-      c = (lm->input_vector[lm->current_index++]) & 0x7f;
-      e = &t->entries[c];
-      lm->current_table_index = e->next_table_index;
-
-      switch (e->action)
-	{
-	case VLIB_LEX_IGNORE:
-	  continue;
-
-	case VLIB_LEX_START_NUMBER:
-	  lm->current_token_value = 0;
-	  /* fallthru */
-
-	case VLIB_LEX_ADD_TO_NUMBER:
-	  lm->current_number_base = e->token;
-	  lm->current_token_value *= lm->current_number_base;
-	  tv = c - '0';
-	  if (tv >= lm->current_number_base)
-	    {
-	      tv = 10 + c - 'A';
-	      if (tv >= lm->current_number_base)
-		tv = 10 + c - 'a';
-	    }
-	  lm->current_token_value += tv;
-	  continue;
-
-	case VLIB_LEX_ADD_TO_TOKEN:
-	  vec_add1 (lm->token_buffer, c);
-	  continue;
-
-	case VLIB_LEX_KEYWORD_CHECK:
-	  {
-	    uword *p;
-
-	    vec_add1 (lm->token_buffer, 0);
-
-	    /* It's either a keyword or just a word. */
-	    p = hash_get_mem (lm->lex_keywords, lm->token_buffer);
-	    if (p)
-	      {
-		rv->token = p[0];
-		if (LEX_DEBUG > 0)
-		  clib_warning ("keyword '%s' token %s",
-				lm->token_buffer,
-				lm->lex_token_names[rv->token]);
-	      }
-	    else
-	      {
-		/* it's a WORD */
-		rv->token = VLIB_LEX_word;
-		rv->value.as_pointer = vec_dup (lm->token_buffer);
-		if (LEX_DEBUG > 0)
-		  clib_warning ("%s, value '%s'",
-				lm->lex_token_names[VLIB_LEX_word],
-				rv->value.as_pointer);
-	      }
-	    _vec_len (lm->token_buffer) = 0;
-
-	    /* Rescan the character which terminated the keyword/word. */
-	    lm->current_index--;
-	    return;
-	  }
-
-	case VLIB_LEX_RETURN_AND_RESCAN:
-	  ASSERT (lm->current_index);
-	  lm->current_index--;
-	  /* note flow-through */
-
-	case VLIB_LEX_RETURN:
-	  rv->token = e->token;
-	  rv->value.as_uword = lm->current_token_value;
-	  lm->current_token_value = ~0;
-	  if (LEX_DEBUG > 0)
-	    {
-	      clib_warning
-		("table %s char '%c'(0x%02x) next table %s return %s",
-		 t->name, c, c, lm->lex_tables[e->next_table_index].name,
-		 lm->lex_token_names[e->token]);
-	      if (rv->token == VLIB_LEX_number)
-		clib_warning ("  numeric value 0x%x (%d)", rv->value,
-			      rv->value);
-	    }
-	  return;
-	}
-    }
-}
-
-u16
-vlib_lex_add_token (vlib_lex_main_t * lm, char *token_name)
-{
-  uword *p;
-  u16 rv;
-
-  p = hash_get_mem (lm->lex_tokens_by_name, token_name);
-
-  if (p)
-    return p[0];
-
-  rv = vec_len (lm->lex_token_names);
-  hash_set_mem (lm->lex_tokens_by_name, token_name, rv);
-  vec_add1 (lm->lex_token_names, token_name);
-
-  return rv;
-}
-
-static u16
-add_keyword (vlib_lex_main_t * lm, char *keyword, char *token_name)
-{
-  uword *p;
-  u16 token;
-
-  p = hash_get_mem (lm->lex_keywords, keyword);
-
-  ASSERT (p == 0);
-
-  token = vlib_lex_add_token (lm, token_name);
-
-  hash_set_mem (lm->lex_keywords, keyword, token);
-  return token;
-}
-
-u16
-vlib_lex_find_or_add_keyword (vlib_lex_main_t * lm, char *keyword,
-			      char *token_name)
-{
-  uword *p = hash_get_mem (lm->lex_keywords, keyword);
-  return p ? p[0] : add_keyword (lm, keyword, token_name);
-}
-
-void
-vlib_lex_set_action_range (u32 table_index, u8 lo, u8 hi, u16 action,
-			   u16 token, u32 next_table_index)
-{
-  int i;
-  vlib_lex_main_t *lm = &vlib_lex_main;
-  vlib_lex_table_t *t = pool_elt_at_index (lm->lex_tables, table_index);
-
-  for (i = lo; i <= hi; i++)
-    {
-      ASSERT (i < ARRAY_LEN (t->entries));
-      t->entries[i].action = action;
-      t->entries[i].token = token;
-      t->entries[i].next_table_index = next_table_index;
-    }
-}
-
-u16
-vlib_lex_add_table (char *name)
-{
-  vlib_lex_main_t *lm = &vlib_lex_main;
-  vlib_lex_table_t *t;
-  uword *p;
-
-  p = hash_get_mem (lm->lex_tables_by_name, name);
-
-  ASSERT (p == 0);
-
-  pool_get_aligned (lm->lex_tables, t, CLIB_CACHE_LINE_BYTES);
-
-  t->name = name;
-
-  hash_set_mem (lm->lex_tables_by_name, name, t - lm->lex_tables);
-
-  vlib_lex_set_action_range (t - lm->lex_tables, 1, 0x7F, VLIB_LEX_IGNORE, ~0,
-			     t - lm->lex_tables);
-
-  vlib_lex_set_action_range (t - lm->lex_tables, 0, 0, VLIB_LEX_RETURN,
-			     VLIB_LEX_eof, t - lm->lex_tables);
-
-  return t - lm->lex_tables;
-}
-
-void
-vlib_lex_reset (vlib_lex_main_t * lm, u8 * input_vector)
-{
-  if (lm->pushback_vector)
-    _vec_len (lm->pushback_vector) = 0;
-  lm->pushback_sp = -1;
-
-  lm->input_vector = input_vector;
-  lm->current_index = 0;
-}
-
-static clib_error_t *
-lex_onetime_init (vlib_main_t * vm)
-{
-  vlib_lex_main_t *lm = &vlib_lex_main;
-
-  lm->lex_tables_by_name = hash_create_string (0, sizeof (uword));
-  lm->lex_tokens_by_name = hash_create_string (0, sizeof (uword));
-  lm->lex_keywords = hash_create_string (0, sizeof (uword));
-  lm->pushback_sp = -1;
-
-#define _(f) { u16 tmp = vlib_lex_add_token (lm, #f); ASSERT (tmp == VLIB_LEX_##f); }
-  foreach_vlib_lex_global_token;
-#undef _
-
-  vec_validate (lm->token_buffer, 127);
-  _vec_len (lm->token_buffer) = 0;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (lex_onetime_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/lex.h b/vlib/vlib/lex.h
deleted file mode 100644
index 4ae58f46..00000000
--- a/vlib/vlib/lex.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vlib_lex_h
-#define included_vlib_lex_h
-
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/error.h>
-#include <vppinfra/pool.h>
-
-#define foreach_vlib_lex_global_token           \
-  _ (invalid)                                   \
-  _ (eof)                                       \
-  _ (word)                                      \
-  _ (number)                                    \
-  _ (lt)                                        \
-  _ (gt)                                        \
-  _ (dot)                                       \
-  _ (slash)                                     \
-  _ (qmark)                                     \
-  _ (equals)                                    \
-  _ (plus)                                      \
-  _ (minus)                                     \
-  _ (star)                                      \
-  _ (lpar)                                      \
-  _ (rpar)
-
-typedef enum
-{
-#define _(f) VLIB_LEX_##f,
-  foreach_vlib_lex_global_token
-#undef _
-} vlib_lex_global_token_t;
-
-typedef enum
-{
-  VLIB_LEX_IGNORE,
-  VLIB_LEX_ADD_TO_TOKEN,
-  VLIB_LEX_RETURN,
-  VLIB_LEX_RETURN_AND_RESCAN,
-  VLIB_LEX_KEYWORD_CHECK,
-  VLIB_LEX_START_NUMBER,
-  VLIB_LEX_ADD_TO_NUMBER,
-} vlib_lex_action_t;
-
-typedef struct
-{
-  u16 action;
-  u16 next_table_index;
-  u16 token;
-} vlib_lex_table_entry_t;
-
-typedef struct
-{
-  char *name;
-  vlib_lex_table_entry_t entries[128];
-} vlib_lex_table_t;
-
-typedef struct
-{
-  u32 token;
-
-  union
-  {
-    uword as_uword;
-    void *as_pointer;
-    char *as_string;
-  } value;
-} vlib_lex_token_t;
-
-typedef struct
-{
-  vlib_lex_table_t *lex_tables;
-  uword *lex_tables_by_name;
-
-  /* Vector of token strings. */
-  char **lex_token_names;
-
-  /* Hash mapping c string name to token index. */
-  uword *lex_tokens_by_name;
-
-  /* Hash mapping c string keyword name to token index. */
-  uword *lex_keywords;
-
-  vlib_lex_token_t *pushback_vector;
-
-  i32 pushback_sp;
-
-  u32 current_table_index;
-
-  uword current_token_value;
-
-  uword current_number_base;
-
-  /* Input string we are lex-ing. */
-  u8 *input_vector;
-
-  /* Current index into input vector. */
-  u32 current_index;
-
-  /* Re-used vector for forming token strings and hashing them. */
-  u8 *token_buffer;
-} vlib_lex_main_t;
-
-vlib_lex_main_t vlib_lex_main;
-
-always_inline void
-vlib_lex_cleanup_token (vlib_lex_token_t * t)
-{
-  if (t->token == VLIB_LEX_word)
-    {
-      u8 *tv = t->value.as_pointer;
-      vec_free (tv);
-    }
-}
-
-u16 vlib_lex_add_table (char *name);
-void vlib_lex_get_token (vlib_lex_main_t * lm, vlib_lex_token_t * result);
-u16 vlib_lex_add_token (vlib_lex_main_t * lm, char *token_name);
-void vlib_lex_set_action_range (u32 table_index, u8 lo, u8 hi, u16 action,
-				u16 token, u32 next_table_index);
-void vlib_lex_reset (vlib_lex_main_t * lm, u8 * input_vector);
-format_function_t format_vlib_lex_token;
-
-#endif /* included_vlib_lex_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/main.c b/vlib/vlib/main.c
deleted file mode 100644
index 6c6cad98..00000000
--- a/vlib/vlib/main.c
+++ /dev/null
@@ -1,1703 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * main.c: main vector processing loop
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <math.h>
-#include <vppinfra/format.h>
-#include <vlib/vlib.h>
-#include <vlib/threads.h>
-
-#include <vlib/unix/cj.h>
-
-CJ_GLOBAL_LOG_PROTOTYPE;
-
-/* Actually allocate a few extra slots of vector data to support
-   speculative vector enqueues which overflow vector data in next frame. */
-#define VLIB_FRAME_SIZE_ALLOC (VLIB_FRAME_SIZE + 4)
-
-u32 wraps;
-
-always_inline u32
-vlib_frame_bytes (u32 n_scalar_bytes, u32 n_vector_bytes)
-{
-  u32 n_bytes;
-
-  /* Make room for vlib_frame_t plus scalar arguments. */
-  n_bytes = vlib_frame_vector_byte_offset (n_scalar_bytes);
-
-  /* Make room for vector arguments.
-     Allocate a few extra slots of vector data to support
-     speculative vector enqueues which overflow vector data in next frame. */
-#define VLIB_FRAME_SIZE_EXTRA 4
-  n_bytes += (VLIB_FRAME_SIZE + VLIB_FRAME_SIZE_EXTRA) * n_vector_bytes;
-
-  /* Magic number is first 32bit number after vector data.
-     Used to make sure that vector data is never overrun. */
-#define VLIB_FRAME_MAGIC (0xabadc0ed)
-  n_bytes += sizeof (u32);
-
-  /* Pad to cache line. */
-  n_bytes = round_pow2 (n_bytes, CLIB_CACHE_LINE_BYTES);
-
-  return n_bytes;
-}
-
-always_inline u32 *
-vlib_frame_find_magic (vlib_frame_t * f, vlib_node_t * node)
-{
-  void *p = f;
-
-  p += vlib_frame_vector_byte_offset (node->scalar_size);
-
-  p += (VLIB_FRAME_SIZE + VLIB_FRAME_SIZE_EXTRA) * node->vector_size;
-
-  return p;
-}
-
-static vlib_frame_size_t *
-get_frame_size_info (vlib_node_main_t * nm,
-		     u32 n_scalar_bytes, u32 n_vector_bytes)
-{
-  uword key = (n_scalar_bytes << 16) | n_vector_bytes;
-  uword *p, i;
-
-  p = hash_get (nm->frame_size_hash, key);
-  if (p)
-    i = p[0];
-  else
-    {
-      i = vec_len (nm->frame_sizes);
-      vec_validate (nm->frame_sizes, i);
-      hash_set (nm->frame_size_hash, key, i);
-    }
-
-  return vec_elt_at_index (nm->frame_sizes, i);
-}
-
-static u32
-vlib_frame_alloc_to_node (vlib_main_t * vm, u32 to_node_index,
-			  u32 frame_flags)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_frame_size_t *fs;
-  vlib_node_t *to_node;
-  vlib_frame_t *f;
-  u32 fi, l, n, scalar_size, vector_size;
-
-  to_node = vlib_get_node (vm, to_node_index);
-
-  scalar_size = to_node->scalar_size;
-  vector_size = to_node->vector_size;
-
-  fs = get_frame_size_info (nm, scalar_size, vector_size);
-  n = vlib_frame_bytes (scalar_size, vector_size);
-  if ((l = vec_len (fs->free_frame_indices)) > 0)
-    {
-      /* Allocate from end of free list. */
-      fi = fs->free_frame_indices[l - 1];
-      f = vlib_get_frame_no_check (vm, fi);
-      _vec_len (fs->free_frame_indices) = l - 1;
-    }
-  else
-    {
-      f = clib_mem_alloc_aligned_no_fail (n, VLIB_FRAME_ALIGN);
-      f->cpu_index = vm->cpu_index;
-      fi = vlib_frame_index_no_check (vm, f);
-    }
-
-  /* Poison frame when debugging. */
-  if (CLIB_DEBUG > 0)
-    {
-      u32 save_cpu_index = f->cpu_index;
-
-      memset (f, 0xfe, n);
-
-      f->cpu_index = save_cpu_index;
-    }
-
-  /* Insert magic number. */
-  {
-    u32 *magic;
-
-    magic = vlib_frame_find_magic (f, to_node);
-    *magic = VLIB_FRAME_MAGIC;
-  }
-
-  f->flags = VLIB_FRAME_IS_ALLOCATED | frame_flags;
-  f->n_vectors = 0;
-  f->scalar_size = scalar_size;
-  f->vector_size = vector_size;
-
-  fs->n_alloc_frames += 1;
-
-  return fi;
-}
-
-/* Allocate a frame for from FROM_NODE to TO_NODE via TO_NEXT_INDEX.
-   Returns frame index. */
-static u32
-vlib_frame_alloc (vlib_main_t * vm, vlib_node_runtime_t * from_node_runtime,
-		  u32 to_next_index)
-{
-  vlib_node_t *from_node;
-
-  from_node = vlib_get_node (vm, from_node_runtime->node_index);
-  ASSERT (to_next_index < vec_len (from_node->next_nodes));
-
-  return vlib_frame_alloc_to_node (vm, from_node->next_nodes[to_next_index],
-				   /* frame_flags */ 0);
-}
-
-vlib_frame_t *
-vlib_get_frame_to_node (vlib_main_t * vm, u32 to_node_index)
-{
-  u32 fi = vlib_frame_alloc_to_node (vm, to_node_index,
-				     /* frame_flags */
-				     VLIB_FRAME_FREE_AFTER_DISPATCH);
-  return vlib_get_frame (vm, fi);
-}
-
-void
-vlib_put_frame_to_node (vlib_main_t * vm, u32 to_node_index, vlib_frame_t * f)
-{
-  vlib_pending_frame_t *p;
-  vlib_node_t *to_node;
-
-  if (f->n_vectors == 0)
-    return;
-
-  to_node = vlib_get_node (vm, to_node_index);
-
-  vec_add2 (vm->node_main.pending_frames, p, 1);
-
-  f->flags |= VLIB_FRAME_PENDING;
-  p->frame_index = vlib_frame_index (vm, f);
-  p->node_runtime_index = to_node->runtime_index;
-  p->next_frame_index = VLIB_PENDING_FRAME_NO_NEXT_FRAME;
-}
-
-/* Free given frame. */
-void
-vlib_frame_free (vlib_main_t * vm, vlib_node_runtime_t * r, vlib_frame_t * f)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *node;
-  vlib_frame_size_t *fs;
-  u32 frame_index;
-
-  ASSERT (f->flags & VLIB_FRAME_IS_ALLOCATED);
-
-  node = vlib_get_node (vm, r->node_index);
-  fs = get_frame_size_info (nm, node->scalar_size, node->vector_size);
-
-  frame_index = vlib_frame_index (vm, f);
-
-  ASSERT (f->flags & VLIB_FRAME_IS_ALLOCATED);
-
-  /* No next frames may point to freed frame. */
-  if (CLIB_DEBUG > 0)
-    {
-      vlib_next_frame_t *nf;
-      vec_foreach (nf, vm->node_main.next_frames)
-	ASSERT (nf->frame_index != frame_index);
-    }
-
-  f->flags &= ~VLIB_FRAME_IS_ALLOCATED;
-
-  vec_add1 (fs->free_frame_indices, frame_index);
-  ASSERT (fs->n_alloc_frames > 0);
-  fs->n_alloc_frames -= 1;
-}
-
-static clib_error_t *
-show_frame_stats (vlib_main_t * vm,
-		  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_frame_size_t *fs;
-
-  vlib_cli_output (vm, "%=6s%=12s%=12s", "Size", "# Alloc", "# Free");
-  vec_foreach (fs, nm->frame_sizes)
-  {
-    u32 n_alloc = fs->n_alloc_frames;
-    u32 n_free = vec_len (fs->free_frame_indices);
-
-    if (n_alloc + n_free > 0)
-      vlib_cli_output (vm, "%=6d%=12d%=12d",
-		       fs - nm->frame_sizes, n_alloc, n_free);
-  }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_frame_stats_cli, static) = {
-  .path = "show vlib frame-allocation",
-  .short_help = "Show node dispatch frame statistics",
-  .function = show_frame_stats,
-};
-/* *INDENT-ON* */
-
-/* Change ownership of enqueue rights to given next node. */
-static void
-vlib_next_frame_change_ownership (vlib_main_t * vm,
-				  vlib_node_runtime_t * node_runtime,
-				  u32 next_index)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_next_frame_t *next_frame;
-  vlib_node_t *node, *next_node;
-
-  node = vec_elt (nm->nodes, node_runtime->node_index);
-
-  /* Only internal & input nodes are allowed to call other nodes. */
-  ASSERT (node->type == VLIB_NODE_TYPE_INTERNAL
-	  || node->type == VLIB_NODE_TYPE_INPUT
-	  || node->type == VLIB_NODE_TYPE_PROCESS);
-
-  ASSERT (vec_len (node->next_nodes) == node_runtime->n_next_nodes);
-
-  next_frame =
-    vlib_node_runtime_get_next_frame (vm, node_runtime, next_index);
-  next_node = vec_elt (nm->nodes, node->next_nodes[next_index]);
-
-  if (next_node->owner_node_index != VLIB_INVALID_NODE_INDEX)
-    {
-      /* Get frame from previous owner. */
-      vlib_next_frame_t *owner_next_frame;
-      vlib_next_frame_t tmp;
-
-      owner_next_frame =
-	vlib_node_get_next_frame (vm,
-				  next_node->owner_node_index,
-				  next_node->owner_next_index);
-
-      /* Swap target next frame with owner's. */
-      tmp = owner_next_frame[0];
-      owner_next_frame[0] = next_frame[0];
-      next_frame[0] = tmp;
-
-      /*
-       * If next_frame is already pending, we have to track down
-       * all pending frames and fix their next_frame_index fields.
-       */
-      if (next_frame->flags & VLIB_FRAME_PENDING)
-	{
-	  vlib_pending_frame_t *p;
-	  if (next_frame->frame_index != ~0)
-	    {
-	      vec_foreach (p, nm->pending_frames)
-	      {
-		if (p->frame_index == next_frame->frame_index)
-		  {
-		    p->next_frame_index =
-		      next_frame - vm->node_main.next_frames;
-		  }
-	      }
-	    }
-	}
-    }
-  else
-    {
-      /* No previous owner. Take ownership. */
-      next_frame->flags |= VLIB_FRAME_OWNER;
-    }
-
-  /* Record new owner. */
-  next_node->owner_node_index = node->index;
-  next_node->owner_next_index = next_index;
-
-  /* Now we should be owner. */
-  ASSERT (next_frame->flags & VLIB_FRAME_OWNER);
-}
-
-/* Make sure that magic number is still there.
-   Otherwise, it is likely that caller has overrun frame arguments. */
-always_inline void
-validate_frame_magic (vlib_main_t * vm,
-		      vlib_frame_t * f, vlib_node_t * n, uword next_index)
-{
-  vlib_node_t *next_node = vlib_get_node (vm, n->next_nodes[next_index]);
-  u32 *magic = vlib_frame_find_magic (f, next_node);
-  ASSERT (VLIB_FRAME_MAGIC == magic[0]);
-}
-
-vlib_frame_t *
-vlib_get_next_frame_internal (vlib_main_t * vm,
-			      vlib_node_runtime_t * node,
-			      u32 next_index, u32 allocate_new_next_frame)
-{
-  vlib_frame_t *f;
-  vlib_next_frame_t *nf;
-  u32 n_used;
-
-  nf = vlib_node_runtime_get_next_frame (vm, node, next_index);
-
-  /* Make sure this next frame owns right to enqueue to destination frame. */
-  if (PREDICT_FALSE (!(nf->flags & VLIB_FRAME_OWNER)))
-    vlib_next_frame_change_ownership (vm, node, next_index);
-
-  /* ??? Don't need valid flag: can use frame_index == ~0 */
-  if (PREDICT_FALSE (!(nf->flags & VLIB_FRAME_IS_ALLOCATED)))
-    {
-      nf->frame_index = vlib_frame_alloc (vm, node, next_index);
-      nf->flags |= VLIB_FRAME_IS_ALLOCATED;
-    }
-
-  f = vlib_get_frame (vm, nf->frame_index);
-
-  /* Has frame been removed from pending vector (e.g. finished dispatching)?
-     If so we can reuse frame. */
-  if ((nf->flags & VLIB_FRAME_PENDING) && !(f->flags & VLIB_FRAME_PENDING))
-    {
-      nf->flags &= ~VLIB_FRAME_PENDING;
-      f->n_vectors = 0;
-    }
-
-  /* Allocate new frame if current one is already full. */
-  n_used = f->n_vectors;
-  if (n_used >= VLIB_FRAME_SIZE || (allocate_new_next_frame && n_used > 0))
-    {
-      /* Old frame may need to be freed after dispatch, since we'll have
-         two redundant frames from node -> next node. */
-      if (!(nf->flags & VLIB_FRAME_NO_FREE_AFTER_DISPATCH))
-	{
-	  vlib_frame_t *f_old = vlib_get_frame (vm, nf->frame_index);
-	  f_old->flags |= VLIB_FRAME_FREE_AFTER_DISPATCH;
-	}
-
-      /* Allocate new frame to replace full one. */
-      nf->frame_index = vlib_frame_alloc (vm, node, next_index);
-      f = vlib_get_frame (vm, nf->frame_index);
-      n_used = f->n_vectors;
-    }
-
-  /* Should have free vectors in frame now. */
-  ASSERT (n_used < VLIB_FRAME_SIZE);
-
-  if (CLIB_DEBUG > 0)
-    {
-      validate_frame_magic (vm, f,
-			    vlib_get_node (vm, node->node_index), next_index);
-    }
-
-  return f;
-}
-
-static void
-vlib_put_next_frame_validate (vlib_main_t * vm,
-			      vlib_node_runtime_t * rt,
-			      u32 next_index, u32 n_vectors_left)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_next_frame_t *nf;
-  vlib_frame_t *f;
-  vlib_node_runtime_t *next_rt;
-  vlib_node_t *next_node;
-  u32 n_before, n_after;
-
-  nf = vlib_node_runtime_get_next_frame (vm, rt, next_index);
-  f = vlib_get_frame (vm, nf->frame_index);
-
-  ASSERT (n_vectors_left <= VLIB_FRAME_SIZE);
-  n_after = VLIB_FRAME_SIZE - n_vectors_left;
-  n_before = f->n_vectors;
-
-  ASSERT (n_after >= n_before);
-
-  next_rt = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL],
-			      nf->node_runtime_index);
-  next_node = vlib_get_node (vm, next_rt->node_index);
-  if (n_after > 0 && next_node->validate_frame)
-    {
-      u8 *msg = next_node->validate_frame (vm, rt, f);
-      if (msg)
-	{
-	  clib_warning ("%v", msg);
-	  ASSERT (0);
-	}
-      vec_free (msg);
-    }
-}
-
-void
-vlib_put_next_frame (vlib_main_t * vm,
-		     vlib_node_runtime_t * r,
-		     u32 next_index, u32 n_vectors_left)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_next_frame_t *nf;
-  vlib_frame_t *f;
-  u32 n_vectors_in_frame;
-
-  if (DPDK == 0 && CLIB_DEBUG > 0)
-    vlib_put_next_frame_validate (vm, r, next_index, n_vectors_left);
-
-  nf = vlib_node_runtime_get_next_frame (vm, r, next_index);
-  f = vlib_get_frame (vm, nf->frame_index);
-
-  /* Make sure that magic number is still there.  Otherwise, caller
-     has overrun frame meta data. */
-  if (CLIB_DEBUG > 0)
-    {
-      vlib_node_t *node = vlib_get_node (vm, r->node_index);
-      validate_frame_magic (vm, f, node, next_index);
-    }
-
-  /* Convert # of vectors left -> number of vectors there. */
-  ASSERT (n_vectors_left <= VLIB_FRAME_SIZE);
-  n_vectors_in_frame = VLIB_FRAME_SIZE - n_vectors_left;
-
-  f->n_vectors = n_vectors_in_frame;
-
-  /* If vectors were added to frame, add to pending vector. */
-  if (PREDICT_TRUE (n_vectors_in_frame > 0))
-    {
-      vlib_pending_frame_t *p;
-      u32 v0, v1;
-
-      r->cached_next_index = next_index;
-
-      if (!(f->flags & VLIB_FRAME_PENDING))
-	{
-	  __attribute__ ((unused)) vlib_node_t *node;
-	  vlib_node_t *next_node;
-	  vlib_node_runtime_t *next_runtime;
-
-	  node = vlib_get_node (vm, r->node_index);
-	  next_node = vlib_get_next_node (vm, r->node_index, next_index);
-	  next_runtime = vlib_node_get_runtime (vm, next_node->index);
-
-	  vec_add2 (nm->pending_frames, p, 1);
-
-	  p->frame_index = nf->frame_index;
-	  p->node_runtime_index = nf->node_runtime_index;
-	  p->next_frame_index = nf - nm->next_frames;
-	  nf->flags |= VLIB_FRAME_PENDING;
-	  f->flags |= VLIB_FRAME_PENDING;
-
-	  /*
-	   * If we're going to dispatch this frame on another thread,
-	   * force allocation of a new frame. Otherwise, we create
-	   * a dangling frame reference. Each thread has its own copy of
-	   * the next_frames vector.
-	   */
-	  if (0 && r->cpu_index != next_runtime->cpu_index)
-	    {
-	      nf->frame_index = ~0;
-	      nf->flags &= ~(VLIB_FRAME_PENDING | VLIB_FRAME_IS_ALLOCATED);
-	    }
-	}
-
-      /* Copy trace flag from next_frame and from runtime. */
-      nf->flags |=
-	(nf->flags & VLIB_NODE_FLAG_TRACE) | (r->
-					      flags & VLIB_NODE_FLAG_TRACE);
-
-      v0 = nf->vectors_since_last_overflow;
-      v1 = v0 + n_vectors_in_frame;
-      nf->vectors_since_last_overflow = v1;
-      if (PREDICT_FALSE (v1 < v0))
-	{
-	  vlib_node_t *node = vlib_get_node (vm, r->node_index);
-	  vec_elt (node->n_vectors_by_next_node, next_index) += v0;
-	}
-    }
-}
-
-/* Sync up runtime (32 bit counters) and main node stats (64 bit counters). */
-never_inline void
-vlib_node_runtime_sync_stats (vlib_main_t * vm,
-			      vlib_node_runtime_t * r,
-			      uword n_calls, uword n_vectors, uword n_clocks)
-{
-  vlib_node_t *n = vlib_get_node (vm, r->node_index);
-
-  n->stats_total.calls += n_calls + r->calls_since_last_overflow;
-  n->stats_total.vectors += n_vectors + r->vectors_since_last_overflow;
-  n->stats_total.clocks += n_clocks + r->clocks_since_last_overflow;
-  n->stats_total.max_clock = r->max_clock;
-  n->stats_total.max_clock_n = r->max_clock_n;
-
-  r->calls_since_last_overflow = 0;
-  r->vectors_since_last_overflow = 0;
-  r->clocks_since_last_overflow = 0;
-}
-
-always_inline void __attribute__ ((unused))
-vlib_process_sync_stats (vlib_main_t * vm,
-			 vlib_process_t * p,
-			 uword n_calls, uword n_vectors, uword n_clocks)
-{
-  vlib_node_runtime_t *rt = &p->node_runtime;
-  vlib_node_t *n = vlib_get_node (vm, rt->node_index);
-  vlib_node_runtime_sync_stats (vm, rt, n_calls, n_vectors, n_clocks);
-  n->stats_total.suspends += p->n_suspends;
-  p->n_suspends = 0;
-}
-
-void
-vlib_node_sync_stats (vlib_main_t * vm, vlib_node_t * n)
-{
-  vlib_node_runtime_t *rt;
-
-  if (n->type == VLIB_NODE_TYPE_PROCESS)
-    {
-      /* Nothing to do for PROCESS nodes except in main thread */
-      if (vm != &vlib_global_main)
-	return;
-
-      vlib_process_t *p = vlib_get_process_from_node (vm, n);
-      n->stats_total.suspends += p->n_suspends;
-      p->n_suspends = 0;
-      rt = &p->node_runtime;
-    }
-  else
-    rt =
-      vec_elt_at_index (vm->node_main.nodes_by_type[n->type],
-			n->runtime_index);
-
-  vlib_node_runtime_sync_stats (vm, rt, 0, 0, 0);
-
-  /* Sync up runtime next frame vector counters with main node structure. */
-  {
-    vlib_next_frame_t *nf;
-    uword i;
-    for (i = 0; i < rt->n_next_nodes; i++)
-      {
-	nf = vlib_node_runtime_get_next_frame (vm, rt, i);
-	vec_elt (n->n_vectors_by_next_node, i) +=
-	  nf->vectors_since_last_overflow;
-	nf->vectors_since_last_overflow = 0;
-      }
-  }
-}
-
-always_inline u32
-vlib_node_runtime_update_stats (vlib_main_t * vm,
-				vlib_node_runtime_t * node,
-				uword n_calls,
-				uword n_vectors, uword n_clocks)
-{
-  u32 ca0, ca1, v0, v1, cl0, cl1, r;
-
-  cl0 = cl1 = node->clocks_since_last_overflow;
-  ca0 = ca1 = node->calls_since_last_overflow;
-  v0 = v1 = node->vectors_since_last_overflow;
-
-  ca1 = ca0 + n_calls;
-  v1 = v0 + n_vectors;
-  cl1 = cl0 + n_clocks;
-
-  node->calls_since_last_overflow = ca1;
-  node->clocks_since_last_overflow = cl1;
-  node->vectors_since_last_overflow = v1;
-  node->max_clock_n = node->max_clock > n_clocks ?
-    node->max_clock_n : n_vectors;
-  node->max_clock = node->max_clock > n_clocks ? node->max_clock : n_clocks;
-
-  r = vlib_node_runtime_update_main_loop_vector_stats (vm, node, n_vectors);
-
-  if (PREDICT_FALSE (ca1 < ca0 || v1 < v0 || cl1 < cl0))
-    {
-      node->calls_since_last_overflow = ca0;
-      node->clocks_since_last_overflow = cl0;
-      node->vectors_since_last_overflow = v0;
-      vlib_node_runtime_sync_stats (vm, node, n_calls, n_vectors, n_clocks);
-    }
-
-  return r;
-}
-
-always_inline void
-vlib_process_update_stats (vlib_main_t * vm,
-			   vlib_process_t * p,
-			   uword n_calls, uword n_vectors, uword n_clocks)
-{
-  vlib_node_runtime_update_stats (vm, &p->node_runtime,
-				  n_calls, n_vectors, n_clocks);
-}
-
-static clib_error_t *
-vlib_cli_elog_clear (vlib_main_t * vm,
-		     unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  elog_reset_buffer (&vm->elog_main);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (elog_clear_cli, static) = {
-  .path = "event-logger clear",
-  .short_help = "Clear the event log",
-  .function = vlib_cli_elog_clear,
-};
-/* *INDENT-ON* */
-
-#ifdef CLIB_UNIX
-static clib_error_t *
-elog_save_buffer (vlib_main_t * vm,
-		  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  elog_main_t *em = &vm->elog_main;
-  char *file, *chroot_file;
-  clib_error_t *error = 0;
-
-  if (!unformat (input, "%s", &file))
-    {
-      vlib_cli_output (vm, "expected file name, got `%U'",
-		       format_unformat_error, input);
-      return 0;
-    }
-
-  /* It's fairly hard to get "../oopsie" through unformat; just in case */
-  if (strstr (file, "..") || index (file, '/'))
-    {
-      vlib_cli_output (vm, "illegal characters in filename '%s'", file);
-      return 0;
-    }
-
-  chroot_file = (char *) format (0, "/tmp/%s%c", file, 0);
-
-  vec_free (file);
-
-  vlib_cli_output (vm, "Saving %wd of %wd events to %s",
-		   elog_n_events_in_buffer (em),
-		   elog_buffer_capacity (em), chroot_file);
-
-  vlib_worker_thread_barrier_sync (vm);
-  error = elog_write_file (em, chroot_file);
-  vlib_worker_thread_barrier_release (vm);
-  vec_free (chroot_file);
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (elog_save_cli, static) = {
-  .path = "event-logger save",
-  .short_help = "event-logger save <filename> (saves log in /tmp/<filename>)",
-  .function = elog_save_buffer,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-elog_stop (vlib_main_t * vm,
-	   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  elog_main_t *em = &vm->elog_main;
-
-  em->n_total_events_disable_limit = em->n_total_events;
-
-  vlib_cli_output (vm, "Stopped the event logger...");
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (elog_stop_cli, static) = {
-  .path = "event-logger stop",
-  .short_help = "Stop the event-logger",
-  .function = elog_stop,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-elog_restart (vlib_main_t * vm,
-	      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  elog_main_t *em = &vm->elog_main;
-
-  em->n_total_events_disable_limit = ~0;
-
-  vlib_cli_output (vm, "Restarted the event logger...");
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (elog_restart_cli, static) = {
-  .path = "event-logger restart",
-  .short_help = "Restart the event-logger",
-  .function = elog_restart,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-elog_resize (vlib_main_t * vm,
-	     unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  elog_main_t *em = &vm->elog_main;
-  u32 tmp;
-
-  /* Stop the parade */
-  elog_reset_buffer (&vm->elog_main);
-
-  if (unformat (input, "%d", &tmp))
-    {
-      elog_alloc (em, tmp);
-      em->n_total_events_disable_limit = ~0;
-    }
-  else
-    return clib_error_return (0, "Must specify how many events in the ring");
-
-  vlib_cli_output (vm, "Resized ring and restarted the event logger...");
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (elog_resize_cli, static) = {
-  .path = "event-logger resize",
-  .short_help = "event-logger resize <nnn>",
-  .function = elog_resize,
-};
-/* *INDENT-ON* */
-
-#endif /* CLIB_UNIX */
-
-static void
-elog_show_buffer_internal (vlib_main_t * vm, u32 n_events_to_show)
-{
-  elog_main_t *em = &vm->elog_main;
-  elog_event_t *e, *es;
-  f64 dt;
-
-  /* Show events in VLIB time since log clock starts after VLIB clock. */
-  dt = (em->init_time.cpu - vm->clib_time.init_cpu_time)
-    * vm->clib_time.seconds_per_clock;
-
-  es = elog_peek_events (em);
-  vlib_cli_output (vm, "%d of %d events in buffer, logger %s", vec_len (es),
-		   em->event_ring_size,
-		   em->n_total_events < em->n_total_events_disable_limit ?
-		   "running" : "stopped");
-  vec_foreach (e, es)
-  {
-    vlib_cli_output (vm, "%18.9f: %U",
-		     e->time + dt, format_elog_event, em, e);
-    n_events_to_show--;
-    if (n_events_to_show == 0)
-      break;
-  }
-  vec_free (es);
-
-}
-
-static clib_error_t *
-elog_show_buffer (vlib_main_t * vm,
-		  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  u32 n_events_to_show;
-  clib_error_t *error = 0;
-
-  n_events_to_show = 250;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%d", &n_events_to_show))
-	;
-      else if (unformat (input, "all"))
-	n_events_to_show = ~0;
-      else
-	return unformat_parse_error (input);
-    }
-  elog_show_buffer_internal (vm, n_events_to_show);
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (elog_show_cli, static) = {
-  .path = "show event-logger",
-  .short_help = "Show event logger info",
-  .function = elog_show_buffer,
-};
-/* *INDENT-ON* */
-
-void
-vlib_gdb_show_event_log (void)
-{
-  elog_show_buffer_internal (vlib_get_main (), (u32) ~ 0);
-}
-
-static inline void
-vlib_elog_main_loop_event (vlib_main_t * vm,
-			   u32 node_index,
-			   u64 time, u32 n_vectors, u32 is_return)
-{
-  vlib_main_t *evm = &vlib_global_main;
-  elog_main_t *em = &evm->elog_main;
-
-  if (VLIB_ELOG_MAIN_LOOP && n_vectors)
-    elog_track (em,
-		/* event type */
-		vec_elt_at_index (is_return
-				  ? evm->node_return_elog_event_types
-				  : evm->node_call_elog_event_types,
-				  node_index),
-		/* track */
-		(vm->cpu_index ? &vlib_worker_threads[vm->cpu_index].
-		 elog_track : &em->default_track),
-		/* data to log */ n_vectors);
-}
-
-void
-vlib_dump_context_trace (vlib_main_t * vm, u32 bi)
-{
-  vlib_node_main_t *vnm = &vm->node_main;
-  vlib_buffer_t *b;
-  u8 i, n;
-
-  if (VLIB_BUFFER_TRACE_TRAJECTORY)
-    {
-      b = vlib_get_buffer (vm, bi);
-      n = b->pre_data[0];
-
-      fformat (stderr, "Context trace for bi %d b 0x%llx, visited %d\n",
-	       bi, b, n);
-
-      if (n == 0 || n > 20)
-	{
-	  fformat (stderr, "n is unreasonable\n");
-	  return;
-	}
-
-
-      for (i = 0; i < n; i++)
-	{
-	  u32 node_index;
-
-	  node_index = b->pre_data[i + 1];
-
-	  if (node_index > vec_len (vnm->nodes))
-	    {
-	      fformat (stderr, "Skip bogus node index %d\n", node_index);
-	      continue;
-	    }
-
-	  fformat (stderr, "%v (%d)\n", vnm->nodes[node_index]->name,
-		   node_index);
-	}
-    }
-  else
-    {
-      fformat (stderr,
-	       "in vlib/buffers.h, #define VLIB_BUFFER_TRACE_TRAJECTORY 1\n");
-    }
-}
-
-
-/* static_always_inline */ u64
-dispatch_node (vlib_main_t * vm,
-	       vlib_node_runtime_t * node,
-	       vlib_node_type_t type,
-	       vlib_node_state_t dispatch_state,
-	       vlib_frame_t * frame, u64 last_time_stamp)
-{
-  uword n, v;
-  u64 t;
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_next_frame_t *nf;
-
-  if (CLIB_DEBUG > 0)
-    {
-      vlib_node_t *n = vlib_get_node (vm, node->node_index);
-      ASSERT (n->type == type);
-    }
-
-  /* Only non-internal nodes may be disabled. */
-  if (type != VLIB_NODE_TYPE_INTERNAL && node->state != dispatch_state)
-    {
-      ASSERT (type != VLIB_NODE_TYPE_INTERNAL);
-      return last_time_stamp;
-    }
-
-  if ((type == VLIB_NODE_TYPE_PRE_INPUT || type == VLIB_NODE_TYPE_INPUT)
-      && dispatch_state != VLIB_NODE_STATE_INTERRUPT)
-    {
-      u32 c = node->input_main_loops_per_call;
-      /* Only call node when count reaches zero. */
-      if (c)
-	{
-	  node->input_main_loops_per_call = c - 1;
-	  return last_time_stamp;
-	}
-    }
-
-  /* Speculatively prefetch next frames. */
-  if (node->n_next_nodes > 0)
-    {
-      nf = vec_elt_at_index (nm->next_frames, node->next_frame_index);
-      CLIB_PREFETCH (nf, 4 * sizeof (nf[0]), WRITE);
-    }
-
-  vm->cpu_time_last_node_dispatch = last_time_stamp;
-
-  if (1 /* || vm->cpu_index == node->cpu_index */ )
-    {
-      vlib_main_t *stat_vm;
-
-      stat_vm = /* vlib_mains ? vlib_mains[0] : */ vm;
-
-      vlib_elog_main_loop_event (vm, node->node_index,
-				 last_time_stamp,
-				 frame ? frame->n_vectors : 0,
-				 /* is_after */ 0);
-
-      /*
-       * Turn this on if you run into
-       * "bad monkey" contexts, and you want to know exactly
-       * which nodes they've visited... See ixge.c...
-       */
-      if (VLIB_BUFFER_TRACE_TRAJECTORY && frame)
-	{
-	  int i;
-	  int log_index;
-	  u32 *from;
-	  from = vlib_frame_vector_args (frame);
-	  for (i = 0; i < frame->n_vectors; i++)
-	    {
-	      vlib_buffer_t *b = vlib_get_buffer (vm, from[i]);
-	      ASSERT (b->pre_data[0] < 32);
-	      log_index = b->pre_data[0]++ + 1;
-	      b->pre_data[log_index] = node->node_index;
-	    }
-	  n = node->function (vm, node, frame);
-	}
-      else
-	n = node->function (vm, node, frame);
-
-      t = clib_cpu_time_now ();
-
-      vlib_elog_main_loop_event (vm, node->node_index, t, n,	/* is_after */
-				 1);
-
-      vm->main_loop_vectors_processed += n;
-      vm->main_loop_nodes_processed += n > 0;
-
-      v = vlib_node_runtime_update_stats (stat_vm, node,
-					  /* n_calls */ 1,
-					  /* n_vectors */ n,
-					  /* n_clocks */ t - last_time_stamp);
-
-      /* When in interrupt mode and vector rate crosses threshold switch to
-         polling mode. */
-      if ((DPDK == 0 && dispatch_state == VLIB_NODE_STATE_INTERRUPT)
-	  || (DPDK == 0 && dispatch_state == VLIB_NODE_STATE_POLLING
-	      && (node->flags
-		  & VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE)))
-	{
-	  ELOG_TYPE_DECLARE (e) =
-	  {
-	    .function = (char *) __FUNCTION__,.format =
-	      "%s vector length %d, switching to %s",.format_args =
-	      "T4i4t4",.n_enum_strings = 2,.enum_strings =
-	    {
-	  "interrupt", "polling",},};
-	  struct
-	  {
-	    u32 node_name, vector_length, is_polling;
-	  } *ed;
-
-	  if (dispatch_state == VLIB_NODE_STATE_INTERRUPT
-	      && v >= nm->polling_threshold_vector_length)
-	    {
-	      vlib_node_t *n = vlib_get_node (vm, node->node_index);
-	      n->state = VLIB_NODE_STATE_POLLING;
-	      node->state = VLIB_NODE_STATE_POLLING;
-	      ASSERT (!
-		      (node->flags &
-		       VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE));
-	      node->flags &=
-		~VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE;
-	      node->flags |=
-		VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE;
-	      nm->input_node_counts_by_state[VLIB_NODE_STATE_INTERRUPT] -= 1;
-	      nm->input_node_counts_by_state[VLIB_NODE_STATE_POLLING] += 1;
-
-	      ed = ELOG_DATA (&vm->elog_main, e);
-	      ed->node_name = n->name_elog_string;
-	      ed->vector_length = v;
-	      ed->is_polling = 1;
-	    }
-	  else if (dispatch_state == VLIB_NODE_STATE_POLLING
-		   && v <= nm->interrupt_threshold_vector_length)
-	    {
-	      vlib_node_t *n = vlib_get_node (vm, node->node_index);
-	      if (node->flags &
-		  VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE)
-		{
-		  /* Switch to interrupt mode after dispatch in polling one more time.
-		     This allows driver to re-enable interrupts. */
-		  n->state = VLIB_NODE_STATE_INTERRUPT;
-		  node->state = VLIB_NODE_STATE_INTERRUPT;
-		  node->flags &=
-		    ~VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE;
-		  nm->input_node_counts_by_state[VLIB_NODE_STATE_POLLING] -=
-		    1;
-		  nm->input_node_counts_by_state[VLIB_NODE_STATE_INTERRUPT] +=
-		    1;
-
-		}
-	      else
-		{
-		  node->flags |=
-		    VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE;
-		  ed = ELOG_DATA (&vm->elog_main, e);
-		  ed->node_name = n->name_elog_string;
-		  ed->vector_length = v;
-		  ed->is_polling = 0;
-		}
-	    }
-	}
-    }
-
-  return t;
-}
-
-/* static */ u64
-dispatch_pending_node (vlib_main_t * vm,
-		       vlib_pending_frame_t * p, u64 last_time_stamp)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_frame_t *f;
-  vlib_next_frame_t *nf, nf_dummy;
-  vlib_node_runtime_t *n;
-  u32 restore_frame_index;
-
-  n = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL],
-			p->node_runtime_index);
-
-  f = vlib_get_frame (vm, p->frame_index);
-  if (p->next_frame_index == VLIB_PENDING_FRAME_NO_NEXT_FRAME)
-    {
-      /* No next frame: so use dummy on stack. */
-      nf = &nf_dummy;
-      nf->flags = f->flags & VLIB_NODE_FLAG_TRACE;
-      nf->frame_index = ~p->frame_index;
-    }
-  else
-    nf = vec_elt_at_index (nm->next_frames, p->next_frame_index);
-
-  ASSERT (f->flags & VLIB_FRAME_IS_ALLOCATED);
-
-  /* Force allocation of new frame while current frame is being
-     dispatched. */
-  restore_frame_index = ~0;
-  if (nf->frame_index == p->frame_index)
-    {
-      nf->frame_index = ~0;
-      nf->flags &= ~VLIB_FRAME_IS_ALLOCATED;
-      if (!(n->flags & VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH))
-	restore_frame_index = p->frame_index;
-    }
-
-  /* Frame must be pending. */
-  ASSERT (f->flags & VLIB_FRAME_PENDING);
-  ASSERT (f->n_vectors > 0);
-
-  /* Copy trace flag from next frame to node.
-     Trace flag indicates that at least one vector in the dispatched
-     frame is traced. */
-  n->flags &= ~VLIB_NODE_FLAG_TRACE;
-  n->flags |= (nf->flags & VLIB_FRAME_TRACE) ? VLIB_NODE_FLAG_TRACE : 0;
-  nf->flags &= ~VLIB_FRAME_TRACE;
-
-  last_time_stamp = dispatch_node (vm, n,
-				   VLIB_NODE_TYPE_INTERNAL,
-				   VLIB_NODE_STATE_POLLING,
-				   f, last_time_stamp);
-
-  f->flags &= ~VLIB_FRAME_PENDING;
-
-  /* Frame is ready to be used again, so restore it. */
-  if (restore_frame_index != ~0)
-    {
-      /* we musn't restore a frame that is flagged to be freed. This shouldn't
-         happen since frames to be freed post dispatch are those used
-         when the to-node frame becomes full i.e. they form a sort of queue of
-         frames to a single node. If we get here then the to-node frame and the
-         pending frame *were* the same, and so we removed the to-node frame.
-         Therefore this frame is no longer part of the queue for that node
-         and hence it cannot be it's overspill.
-       */
-      ASSERT (!(f->flags & VLIB_FRAME_FREE_AFTER_DISPATCH));
-
-      /* p->next_frame_index can change during node dispatch if node
-         function decides to change graph hook up. */
-      nf = vec_elt_at_index (nm->next_frames, p->next_frame_index);
-      nf->flags |= VLIB_FRAME_IS_ALLOCATED;
-
-      if (~0 == nf->frame_index)
-	{
-	  /* no new frame has been assigned to this node, use the saved one */
-	  nf->frame_index = restore_frame_index;
-	  f->n_vectors = 0;
-	}
-      else
-	{
-	  /* The node has gained a frame, implying packets from the current frame
-	     were re-queued to this same node. we don't need the saved one
-	     anymore */
-	  vlib_frame_free (vm, n, f);
-	}
-    }
-  else
-    {
-      if (f->flags & VLIB_FRAME_FREE_AFTER_DISPATCH)
-	{
-	  ASSERT (!(n->flags & VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH));
-	  vlib_frame_free (vm, n, f);
-	}
-    }
-
-  return last_time_stamp;
-}
-
-always_inline uword
-vlib_process_stack_is_valid (vlib_process_t * p)
-{
-  return p->stack[0] == VLIB_PROCESS_STACK_MAGIC;
-}
-
-typedef struct
-{
-  vlib_main_t *vm;
-  vlib_process_t *process;
-  vlib_frame_t *frame;
-} vlib_process_bootstrap_args_t;
-
-/* Called in process stack. */
-static uword
-vlib_process_bootstrap (uword _a)
-{
-  vlib_process_bootstrap_args_t *a;
-  vlib_main_t *vm;
-  vlib_node_runtime_t *node;
-  vlib_frame_t *f;
-  vlib_process_t *p;
-  uword n;
-
-  a = uword_to_pointer (_a, vlib_process_bootstrap_args_t *);
-
-  vm = a->vm;
-  p = a->process;
-  f = a->frame;
-  node = &p->node_runtime;
-
-  n = node->function (vm, node, f);
-
-  ASSERT (vlib_process_stack_is_valid (p));
-
-  clib_longjmp (&p->return_longjmp, n);
-
-  return n;
-}
-
-/* Called in main stack. */
-static_always_inline uword
-vlib_process_startup (vlib_main_t * vm, vlib_process_t * p, vlib_frame_t * f)
-{
-  vlib_process_bootstrap_args_t a;
-  uword r;
-
-  a.vm = vm;
-  a.process = p;
-  a.frame = f;
-
-  r = clib_setjmp (&p->return_longjmp, VLIB_PROCESS_RETURN_LONGJMP_RETURN);
-  if (r == VLIB_PROCESS_RETURN_LONGJMP_RETURN)
-    r = clib_calljmp (vlib_process_bootstrap, pointer_to_uword (&a),
-		      (void *) p->stack + (1 << p->log2_n_stack_bytes));
-
-  return r;
-}
-
-static_always_inline uword
-vlib_process_resume (vlib_process_t * p)
-{
-  uword r;
-  p->flags &= ~(VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK
-		| VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT
-		| VLIB_PROCESS_RESUME_PENDING);
-  r = clib_setjmp (&p->return_longjmp, VLIB_PROCESS_RETURN_LONGJMP_RETURN);
-  if (r == VLIB_PROCESS_RETURN_LONGJMP_RETURN)
-    clib_longjmp (&p->resume_longjmp, VLIB_PROCESS_RESUME_LONGJMP_RESUME);
-  return r;
-}
-
-static u64
-dispatch_process (vlib_main_t * vm,
-		  vlib_process_t * p, vlib_frame_t * f, u64 last_time_stamp)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_runtime_t *node_runtime = &p->node_runtime;
-  vlib_node_t *node = vlib_get_node (vm, node_runtime->node_index);
-  u64 t;
-  uword n_vectors, is_suspend;
-
-  if (node->state != VLIB_NODE_STATE_POLLING
-      || (p->flags & (VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK
-		      | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT)))
-    return last_time_stamp;
-
-  p->flags |= VLIB_PROCESS_IS_RUNNING;
-
-  t = last_time_stamp;
-  vlib_elog_main_loop_event (vm, node_runtime->node_index, t,
-			     f ? f->n_vectors : 0, /* is_after */ 0);
-
-  /* Save away current process for suspend. */
-  nm->current_process_index = node->runtime_index;
-
-  n_vectors = vlib_process_startup (vm, p, f);
-
-  nm->current_process_index = ~0;
-
-  ASSERT (n_vectors != VLIB_PROCESS_RETURN_LONGJMP_RETURN);
-  is_suspend = n_vectors == VLIB_PROCESS_RETURN_LONGJMP_SUSPEND;
-  if (is_suspend)
-    {
-      vlib_pending_frame_t *pf;
-
-      n_vectors = 0;
-      pool_get (nm->suspended_process_frames, pf);
-      pf->node_runtime_index = node->runtime_index;
-      pf->frame_index = f ? vlib_frame_index (vm, f) : ~0;
-      pf->next_frame_index = ~0;
-
-      p->n_suspends += 1;
-      p->suspended_process_frame_index = pf - nm->suspended_process_frames;
-
-      if (p->flags & VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK)
-	timing_wheel_insert (&nm->timing_wheel, p->resume_cpu_time,
-			     vlib_timing_wheel_data_set_suspended_process
-			     (node->runtime_index));
-    }
-  else
-    p->flags &= ~VLIB_PROCESS_IS_RUNNING;
-
-  t = clib_cpu_time_now ();
-
-  vlib_elog_main_loop_event (vm, node_runtime->node_index, t, is_suspend,
-			     /* is_after */ 1);
-
-  vlib_process_update_stats (vm, p,
-			     /* n_calls */ !is_suspend,
-			     /* n_vectors */ n_vectors,
-			     /* n_clocks */ t - last_time_stamp);
-
-  return t;
-}
-
-void
-vlib_start_process (vlib_main_t * vm, uword process_index)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_process_t *p = vec_elt (nm->processes, process_index);
-  dispatch_process (vm, p, /* frame */ 0, /* cpu_time_now */ 0);
-}
-
-static u64
-dispatch_suspended_process (vlib_main_t * vm,
-			    uword process_index, u64 last_time_stamp)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_runtime_t *node_runtime;
-  vlib_node_t *node;
-  vlib_frame_t *f;
-  vlib_process_t *p;
-  vlib_pending_frame_t *pf;
-  u64 t, n_vectors, is_suspend;
-
-  t = last_time_stamp;
-
-  p = vec_elt (nm->processes, process_index);
-  if (PREDICT_FALSE (!(p->flags & VLIB_PROCESS_IS_RUNNING)))
-    return last_time_stamp;
-
-  ASSERT (p->flags & (VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK
-		      | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT));
-
-  pf =
-    pool_elt_at_index (nm->suspended_process_frames,
-		       p->suspended_process_frame_index);
-
-  node_runtime = &p->node_runtime;
-  node = vlib_get_node (vm, node_runtime->node_index);
-  f = pf->frame_index != ~0 ? vlib_get_frame (vm, pf->frame_index) : 0;
-
-  vlib_elog_main_loop_event (vm, node_runtime->node_index, t,
-			     f ? f->n_vectors : 0, /* is_after */ 0);
-
-  /* Save away current process for suspend. */
-  nm->current_process_index = node->runtime_index;
-
-  n_vectors = vlib_process_resume (p);
-  t = clib_cpu_time_now ();
-
-  nm->current_process_index = ~0;
-
-  is_suspend = n_vectors == VLIB_PROCESS_RETURN_LONGJMP_SUSPEND;
-  if (is_suspend)
-    {
-      /* Suspend it again. */
-      n_vectors = 0;
-      p->n_suspends += 1;
-      if (p->flags & VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK)
-	timing_wheel_insert (&nm->timing_wheel, p->resume_cpu_time,
-			     vlib_timing_wheel_data_set_suspended_process
-			     (node->runtime_index));
-    }
-  else
-    {
-      p->flags &= ~VLIB_PROCESS_IS_RUNNING;
-      p->suspended_process_frame_index = ~0;
-      pool_put (nm->suspended_process_frames, pf);
-    }
-
-  t = clib_cpu_time_now ();
-  vlib_elog_main_loop_event (vm, node_runtime->node_index, t, !is_suspend,
-			     /* is_after */ 1);
-
-  vlib_process_update_stats (vm, p,
-			     /* n_calls */ !is_suspend,
-			     /* n_vectors */ n_vectors,
-			     /* n_clocks */ t - last_time_stamp);
-
-  return t;
-}
-
-static void
-vlib_main_loop (vlib_main_t * vm)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  uword i;
-  u64 cpu_time_now;
-
-  /* Initialize pending node vector. */
-  vec_resize (nm->pending_frames, 32);
-  _vec_len (nm->pending_frames) = 0;
-
-  /* Mark time of main loop start. */
-  cpu_time_now = vm->clib_time.last_cpu_time;
-  vm->cpu_time_main_loop_start = cpu_time_now;
-
-  /* Arrange for first level of timing wheel to cover times we care
-     most about. */
-  nm->timing_wheel.min_sched_time = 10e-6;
-  nm->timing_wheel.max_sched_time = 10e-3;
-  timing_wheel_init (&nm->timing_wheel,
-		     cpu_time_now, vm->clib_time.clocks_per_second);
-
-  /* Pre-allocate expired nodes. */
-  vec_alloc (nm->data_from_advancing_timing_wheel, 32);
-  vec_alloc (nm->pending_interrupt_node_runtime_indices, 32);
-
-  if (!nm->polling_threshold_vector_length)
-    nm->polling_threshold_vector_length = 10;
-  if (!nm->interrupt_threshold_vector_length)
-    nm->interrupt_threshold_vector_length = 5;
-
-  nm->current_process_index = ~0;
-
-  /* Start all processes. */
-  {
-    uword i;
-    for (i = 0; i < vec_len (nm->processes); i++)
-      cpu_time_now =
-	dispatch_process (vm, nm->processes[i], /* frame */ 0, cpu_time_now);
-  }
-
-  while (1)
-    {
-      vlib_node_runtime_t *n;
-
-      /* Process pre-input nodes. */
-      vec_foreach (n, nm->nodes_by_type[VLIB_NODE_TYPE_PRE_INPUT])
-	cpu_time_now = dispatch_node (vm, n,
-				      VLIB_NODE_TYPE_PRE_INPUT,
-				      VLIB_NODE_STATE_POLLING,
-				      /* frame */ 0,
-				      cpu_time_now);
-
-      /* Next process input nodes. */
-      vec_foreach (n, nm->nodes_by_type[VLIB_NODE_TYPE_INPUT])
-	cpu_time_now = dispatch_node (vm, n,
-				      VLIB_NODE_TYPE_INPUT,
-				      VLIB_NODE_STATE_POLLING,
-				      /* frame */ 0,
-				      cpu_time_now);
-
-      if (PREDICT_TRUE (vm->queue_signal_pending == 0))
-	vm->queue_signal_callback (vm);
-
-      /* Next handle interrupts. */
-      {
-	uword l = _vec_len (nm->pending_interrupt_node_runtime_indices);
-	uword i;
-	if (l > 0)
-	  {
-	    _vec_len (nm->pending_interrupt_node_runtime_indices) = 0;
-	    for (i = 0; i < l; i++)
-	      {
-		n = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT],
-				      nm->
-				      pending_interrupt_node_runtime_indices
-				      [i]);
-		cpu_time_now =
-		  dispatch_node (vm, n, VLIB_NODE_TYPE_INPUT,
-				 VLIB_NODE_STATE_INTERRUPT,
-				 /* frame */ 0,
-				 cpu_time_now);
-	      }
-	  }
-      }
-
-      /* Check if process nodes have expired from timing wheel. */
-      nm->data_from_advancing_timing_wheel
-	= timing_wheel_advance (&nm->timing_wheel, cpu_time_now,
-				nm->data_from_advancing_timing_wheel,
-				&nm->cpu_time_next_process_ready);
-
-      ASSERT (nm->data_from_advancing_timing_wheel != 0);
-      if (PREDICT_FALSE (_vec_len (nm->data_from_advancing_timing_wheel) > 0))
-	{
-	  uword i;
-
-	processes_timing_wheel_data:
-	  for (i = 0; i < _vec_len (nm->data_from_advancing_timing_wheel);
-	       i++)
-	    {
-	      u32 d = nm->data_from_advancing_timing_wheel[i];
-	      u32 di = vlib_timing_wheel_data_get_index (d);
-
-	      if (vlib_timing_wheel_data_is_timed_event (d))
-		{
-		  vlib_signal_timed_event_data_t *te =
-		    pool_elt_at_index (nm->signal_timed_event_data_pool, di);
-		  vlib_node_t *n = vlib_get_node (vm, te->process_node_index);
-		  vlib_process_t *p =
-		    vec_elt (nm->processes, n->runtime_index);
-		  void *data;
-		  data =
-		    vlib_process_signal_event_helper (nm, n, p,
-						      te->event_type_index,
-						      te->n_data_elts,
-						      te->n_data_elt_bytes);
-		  if (te->n_data_bytes < sizeof (te->inline_event_data))
-		    clib_memcpy (data, te->inline_event_data,
-				 te->n_data_bytes);
-		  else
-		    {
-		      clib_memcpy (data, te->event_data_as_vector,
-				   te->n_data_bytes);
-		      vec_free (te->event_data_as_vector);
-		    }
-		  pool_put (nm->signal_timed_event_data_pool, te);
-		}
-	      else
-		{
-		  cpu_time_now = clib_cpu_time_now ();
-		  cpu_time_now =
-		    dispatch_suspended_process (vm, di, cpu_time_now);
-		}
-	    }
-
-	  /* Reset vector. */
-	  _vec_len (nm->data_from_advancing_timing_wheel) = 0;
-	}
-
-      /* Input nodes may have added work to the pending vector.
-         Process pending vector until there is nothing left.
-         All pending vectors will be processed from input -> output. */
-      for (i = 0; i < _vec_len (nm->pending_frames); i++)
-	cpu_time_now = dispatch_pending_node (vm, nm->pending_frames + i,
-					      cpu_time_now);
-      /* Reset pending vector for next iteration. */
-      _vec_len (nm->pending_frames) = 0;
-
-      /* Pending internal nodes may resume processes. */
-      if (_vec_len (nm->data_from_advancing_timing_wheel) > 0)
-	goto processes_timing_wheel_data;
-
-      vlib_increment_main_loop_counter (vm);
-
-      /* Record time stamp in case there are no enabled nodes and above
-         calls do not update time stamp. */
-      cpu_time_now = clib_cpu_time_now ();
-    }
-}
-
-vlib_main_t vlib_global_main;
-
-static clib_error_t *
-vlib_main_configure (vlib_main_t * vm, unformat_input_t * input)
-{
-  int turn_on_mem_trace = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "memory-trace"))
-	turn_on_mem_trace = 1;
-
-      else if (unformat (input, "elog-events %d",
-			 &vm->elog_main.event_ring_size))
-	;
-      else
-	return unformat_parse_error (input);
-    }
-
-  unformat_free (input);
-
-  /* Enable memory trace as early as possible. */
-  if (turn_on_mem_trace)
-    clib_mem_trace (1);
-
-  return 0;
-}
-
-VLIB_EARLY_CONFIG_FUNCTION (vlib_main_configure, "vlib");
-
-static void
-dummy_queue_signal_callback (vlib_main_t * vm)
-{
-}
-
-/* Main function. */
-int
-vlib_main (vlib_main_t * volatile vm, unformat_input_t * input)
-{
-  clib_error_t *volatile error;
-
-  vm->queue_signal_callback = dummy_queue_signal_callback;
-
-  clib_time_init (&vm->clib_time);
-
-  /* Turn on event log. */
-  if (!vm->elog_main.event_ring_size)
-    vm->elog_main.event_ring_size = 128 << 10;
-  elog_init (&vm->elog_main, vm->elog_main.event_ring_size);
-  elog_enable_disable (&vm->elog_main, 1);
-
-  /* Default name. */
-  if (!vm->name)
-    vm->name = "VLIB";
-
-  vec_validate (vm->buffer_main, 0);
-
-  if ((error = vlib_thread_init (vm)))
-    {
-      clib_error_report (error);
-      goto done;
-    }
-
-  /* Register static nodes so that init functions may use them. */
-  vlib_register_all_static_nodes (vm);
-
-  /* Set seed for random number generator.
-     Allow user to specify seed to make random sequence deterministic. */
-  if (!unformat (input, "seed %wd", &vm->random_seed))
-    vm->random_seed = clib_cpu_time_now ();
-  clib_random_buffer_init (&vm->random_buffer, vm->random_seed);
-
-  /* Initialize node graph. */
-  if ((error = vlib_node_main_init (vm)))
-    {
-      /* Arrange for graph hook up error to not be fatal when debugging. */
-      if (CLIB_DEBUG > 0)
-	clib_error_report (error);
-      else
-	goto done;
-    }
-
-  /* See unix/main.c; most likely already set up */
-  if (vm->init_functions_called == 0)
-    vm->init_functions_called = hash_create (0, /* value bytes */ 0);
-  if ((error = vlib_call_all_init_functions (vm)))
-    goto done;
-
-  /* Create default buffer free list. */
-  vlib_buffer_get_or_create_free_list (vm,
-				       VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES,
-				       "default");
-
-  switch (clib_setjmp (&vm->main_loop_exit, VLIB_MAIN_LOOP_EXIT_NONE))
-    {
-    case VLIB_MAIN_LOOP_EXIT_NONE:
-      vm->main_loop_exit_set = 1;
-      break;
-
-    case VLIB_MAIN_LOOP_EXIT_CLI:
-      goto done;
-
-    default:
-      error = vm->main_loop_error;
-      goto done;
-    }
-
-  if ((error = vlib_call_all_config_functions (vm, input, 0 /* is_early */ )))
-    goto done;
-
-  /* Call all main loop enter functions. */
-  {
-    clib_error_t *sub_error;
-    sub_error = vlib_call_all_main_loop_enter_functions (vm);
-    if (sub_error)
-      clib_error_report (sub_error);
-  }
-
-  vlib_main_loop (vm);
-
-done:
-  /* Call all exit functions. */
-  {
-    clib_error_t *sub_error;
-    sub_error = vlib_call_all_main_loop_exit_functions (vm);
-    if (sub_error)
-      clib_error_report (sub_error);
-  }
-
-  if (error)
-    clib_error_report (error);
-
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/main.h b/vlib/vlib/main.h
deleted file mode 100644
index d9ac1445..00000000
--- a/vlib/vlib/main.h
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * main.h: VLIB main data structure
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_main_h
-#define included_vlib_main_h
-
-#include <vppinfra/elog.h>
-#include <vppinfra/format.h>
-#include <vppinfra/longjmp.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/random_buffer.h>
-#include <vppinfra/time.h>
-
-#include <pthread.h>
-
-
-/* By default turn off node/error event logging.
-   Override with -DVLIB_ELOG_MAIN_LOOP */
-#ifndef VLIB_ELOG_MAIN_LOOP
-#define VLIB_ELOG_MAIN_LOOP 0
-#endif
-
-typedef struct vlib_main_t
-{
-  /* Instruction level timing state. */
-  clib_time_t clib_time;
-
-  /* Time stamp of last node dispatch. */
-  u64 cpu_time_last_node_dispatch;
-
-  /* Time stamp when main loop was entered (time 0). */
-  u64 cpu_time_main_loop_start;
-
-  /* Incremented once for each main loop. */
-  u32 main_loop_count;
-
-  /* Count of vectors processed this main loop. */
-  u32 main_loop_vectors_processed;
-  u32 main_loop_nodes_processed;
-
-  /* Circular buffer of input node vector counts.
-     Indexed by low bits of
-     (main_loop_count >> VLIB_LOG2_INPUT_VECTORS_PER_MAIN_LOOP). */
-  u32 vector_counts_per_main_loop[2];
-  u32 node_counts_per_main_loop[2];
-
-  /* Every so often we switch to the next counter. */
-#define VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE 7
-
-  /* Jump target to exit main loop with given code. */
-  u32 main_loop_exit_set;
-  clib_longjmp_t main_loop_exit;
-#define VLIB_MAIN_LOOP_EXIT_NONE 0
-#define VLIB_MAIN_LOOP_EXIT_PANIC 1
-  /* Exit via CLI. */
-#define VLIB_MAIN_LOOP_EXIT_CLI 2
-
-  /* Error marker to use when exiting main loop. */
-  clib_error_t *main_loop_error;
-
-  /* Name for e.g. syslog. */
-  char *name;
-
-  /* Start and size of CLIB heap. */
-  void *heap_base;
-  uword heap_size;
-
-  vlib_buffer_main_t *buffer_main;
-
-  vlib_physmem_main_t physmem_main;
-
-  /* Allocate/free buffer memory for DMA transfers, descriptor rings, etc.
-     buffer memory is guaranteed to be cache-aligned. */
-  void *(*os_physmem_alloc_aligned) (vlib_physmem_main_t * pm,
-				     uword n_bytes, uword alignment);
-  void (*os_physmem_free) (void *x);
-
-  /* Node graph main structure. */
-  vlib_node_main_t node_main;
-
-  /* Command line interface. */
-  vlib_cli_main_t cli_main;
-
-  /* Packet trace buffer. */
-  vlib_trace_main_t trace_main;
-
-  /* Error handling. */
-  vlib_error_main_t error_main;
-
-  /* Punt packets to underlying operating system for when fast switching
-     code does not know what to do. */
-  void (*os_punt_frame) (struct vlib_main_t * vm,
-			 struct vlib_node_runtime_t * node,
-			 vlib_frame_t * frame);
-
-  /* Multicast distribution.  Set to zero for MC disabled. */
-  mc_main_t *mc_main;
-
-  /* Stream index to use for distribution when MC is enabled. */
-  u32 mc_stream_index;
-
-  vlib_one_time_waiting_process_t *procs_waiting_for_mc_stream_join;
-
-  /* Event logger. */
-  elog_main_t elog_main;
-
-  /* Node call and return event types. */
-  elog_event_type_t *node_call_elog_event_types;
-  elog_event_type_t *node_return_elog_event_types;
-
-  elog_event_type_t *error_elog_event_types;
-
-  /* Seed for random number generator. */
-  uword random_seed;
-
-  /* Buffer of random data for various uses. */
-  clib_random_buffer_t random_buffer;
-
-  /* Hash table to record which init functions have been called. */
-  uword *init_functions_called;
-
-  /* to compare with node runtime */
-  u32 cpu_index;
-
-  void **mbuf_alloc_list;
-
-  /* List of init functions to call, setup by constructors */
-  _vlib_init_function_list_elt_t *init_function_registrations;
-  _vlib_init_function_list_elt_t *main_loop_enter_function_registrations;
-  _vlib_init_function_list_elt_t *main_loop_exit_function_registrations;
-  _vlib_init_function_list_elt_t *api_init_function_registrations;
-  vlib_config_function_runtime_t *config_function_registrations;
-  mc_serialize_msg_t *mc_msg_registrations;	/* mc_main is a pointer... */
-
-  /* control-plane API queue signal pending, length indication */
-  volatile u32 queue_signal_pending;
-  volatile u32 api_queue_nonempty;
-  void (*queue_signal_callback) (struct vlib_main_t *);
-  u8 **argv;
-} vlib_main_t;
-
-/* Global main structure. */
-extern vlib_main_t vlib_global_main;
-
-always_inline f64
-vlib_time_now (vlib_main_t * vm)
-{
-  return clib_time_now (&vm->clib_time);
-}
-
-always_inline f64
-vlib_time_now_ticks (vlib_main_t * vm, u64 n)
-{
-  return clib_time_now_internal (&vm->clib_time, n);
-}
-
-/* Busy wait for specified time. */
-always_inline void
-vlib_time_wait (vlib_main_t * vm, f64 wait)
-{
-  f64 t = vlib_time_now (vm);
-  f64 limit = t + wait;
-  while (t < limit)
-    t = vlib_time_now (vm);
-}
-
-/* Time a piece of code. */
-#define vlib_time_code(vm,body)			\
-do {						\
-    f64 _t[2];					\
-    _t[0] = vlib_time_now (vm);			\
-    do { body; } while (0);			\
-    _t[1] = vlib_time_now (vm);			\
-    clib_warning ("%.7e", _t[1] - _t[0]);	\
-} while (0)
-
-#define vlib_wait_with_timeout(vm,suspend_time,timeout_time,test)	\
-({									\
-    uword __vlib_wait_with_timeout = 0;					\
-    f64 __vlib_wait_time = 0;						\
-    while (! (__vlib_wait_with_timeout = (test))			\
-	   && __vlib_wait_time < (timeout_time))			\
-      {									\
-	vlib_process_suspend (vm, suspend_time);			\
-	__vlib_wait_time += suspend_time;				\
-      }									\
-    __vlib_wait_with_timeout;						\
-})
-
-always_inline void
-vlib_panic_with_error (vlib_main_t * vm, clib_error_t * error)
-{
-  vm->main_loop_error = error;
-  clib_longjmp (&vm->main_loop_exit, VLIB_MAIN_LOOP_EXIT_PANIC);
-}
-
-#define vlib_panic_with_msg(vm,args...) \
-  vlib_panic_with_error (vm, clib_error_return (0, args))
-
-always_inline void
-vlib_panic (vlib_main_t * vm)
-{
-  vlib_panic_with_error (vm, 0);
-}
-
-always_inline u32
-vlib_vector_input_stats_index (vlib_main_t * vm, word delta)
-{
-  u32 i;
-  i = vm->main_loop_count >> VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE;
-  ASSERT (is_pow2 (ARRAY_LEN (vm->vector_counts_per_main_loop)));
-  return (i + delta) & (ARRAY_LEN (vm->vector_counts_per_main_loop) - 1);
-}
-
-/* Estimate input rate based on previous
-   2^VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE
-   samples. */
-always_inline u32
-vlib_last_vectors_per_main_loop (vlib_main_t * vm)
-{
-  u32 i = vlib_vector_input_stats_index (vm, -1);
-  u32 n = vm->vector_counts_per_main_loop[i];
-  return n >> VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE;
-}
-
-/* Total ave vector count per iteration of main loop. */
-always_inline f64
-vlib_last_vectors_per_main_loop_as_f64 (vlib_main_t * vm)
-{
-  u32 i = vlib_vector_input_stats_index (vm, -1);
-  u32 v = vm->vector_counts_per_main_loop[i];
-  return (f64) v / (f64) (1 << VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE);
-}
-
-/* Total ave vectors/node count per iteration of main loop. */
-always_inline f64
-vlib_last_vector_length_per_node (vlib_main_t * vm)
-{
-  u32 i = vlib_vector_input_stats_index (vm, -1);
-  u32 v = vm->vector_counts_per_main_loop[i];
-  u32 n = vm->node_counts_per_main_loop[i];
-  return n == 0 ? 0 : (f64) v / (f64) n;
-}
-
-extern u32 wraps;
-
-always_inline void
-vlib_increment_main_loop_counter (vlib_main_t * vm)
-{
-  u32 i, c, n, v, is_wrap;
-
-  c = vm->main_loop_count++;
-
-  is_wrap = (c & pow2_mask (VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE)) == 0;
-
-  if (is_wrap)
-    wraps++;
-
-  i = vlib_vector_input_stats_index (vm, /* delta */ is_wrap);
-
-  v = is_wrap ? 0 : vm->vector_counts_per_main_loop[i];
-  n = is_wrap ? 0 : vm->node_counts_per_main_loop[i];
-
-  v += vm->main_loop_vectors_processed;
-  n += vm->main_loop_nodes_processed;
-  vm->main_loop_vectors_processed = 0;
-  vm->main_loop_nodes_processed = 0;
-  vm->vector_counts_per_main_loop[i] = v;
-  vm->node_counts_per_main_loop[i] = n;
-}
-
-always_inline void vlib_set_queue_signal_callback
-  (vlib_main_t * vm, void (*fp) (vlib_main_t *))
-{
-  vm->queue_signal_callback = fp;
-}
-
-/* Main routine. */
-int vlib_main (vlib_main_t * vm, unformat_input_t * input);
-
-/* Thread stacks, for os_get_cpu_number */
-extern u8 **vlib_thread_stacks;
-
-/* Number of thread stacks that the application needs */
-u32 vlib_app_num_thread_stacks_needed (void) __attribute__ ((weak));
-
-extern void vlib_node_sync_stats (vlib_main_t * vm, vlib_node_t * n);
-
-#endif /* included_vlib_main_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/mc.c b/vlib/vlib/mc.c
deleted file mode 100644
index 8fde0913..00000000
--- a/vlib/vlib/mc.c
+++ /dev/null
@@ -1,2609 +0,0 @@
-/*
- * mc.c: vlib reliable sequenced multicast distributed applications
- *
- * Copyright (c) 2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-
-/*
- * 1 to enable msg id training wheels, which are useful for tracking
- * down catchup and/or partitioned network problems
- */
-#define MSG_ID_DEBUG 0
-
-static format_function_t format_mc_stream_state;
-
-static u32
-elog_id_for_peer_id (mc_main_t * m, u64 peer_id)
-{
-  uword *p, r;
-  mhash_t *h = &m->elog_id_by_peer_id;
-
-  if (!m->elog_id_by_peer_id.hash)
-    mhash_init (h, sizeof (uword), sizeof (mc_peer_id_t));
-
-  p = mhash_get (h, &peer_id);
-  if (p)
-    return p[0];
-  r = elog_string (m->elog_main, "%U", m->transport.format_peer_id, peer_id);
-  mhash_set (h, &peer_id, r, /* old_value */ 0);
-  return r;
-}
-
-static u32
-elog_id_for_msg_name (mc_main_t * m, char *msg_name)
-{
-  uword *p, r;
-  uword *h = m->elog_id_by_msg_name;
-  u8 *name_copy;
-
-  if (!h)
-    h = m->elog_id_by_msg_name = hash_create_string (0, sizeof (uword));
-
-  p = hash_get_mem (h, msg_name);
-  if (p)
-    return p[0];
-  r = elog_string (m->elog_main, "%s", msg_name);
-
-  name_copy = format (0, "%s%c", msg_name, 0);
-
-  hash_set_mem (h, name_copy, r);
-  m->elog_id_by_msg_name = h;
-
-  return r;
-}
-
-static void
-elog_tx_msg (mc_main_t * m, u32 stream_id, u32 local_sequence,
-	     u32 retry_count)
-{
-  if (MC_EVENT_LOGGING > 0)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (e) =
-        {
-          .format = "tx-msg: stream %d local seq %d attempt %d",
-          .format_args = "i4i4i4",
-        };
-      /* *INDENT-ON* */
-      struct
-      {
-	u32 stream_id, local_sequence, retry_count;
-      } *ed;
-      ed = ELOG_DATA (m->elog_main, e);
-      ed->stream_id = stream_id;
-      ed->local_sequence = local_sequence;
-      ed->retry_count = retry_count;
-    }
-}
-
-/*
- * seq_cmp
- * correctly compare two unsigned sequence numbers.
- * This function works so long as x and y are within 2**(n-1) of each
- * other, where n = bits(x, y).
- *
- * Magic decoder ring:
- * seq_cmp == 0 => x and y are equal
- * seq_cmp < 0 => x is "in the past" with respect to y
- * seq_cmp > 0 => x is "in the future" with respect to y
- */
-always_inline i32
-mc_seq_cmp (u32 x, u32 y)
-{
-  return (i32) x - (i32) y;
-}
-
-void *
-mc_get_vlib_buffer (vlib_main_t * vm, u32 n_bytes, u32 * bi_return)
-{
-  u32 n_alloc, bi;
-  vlib_buffer_t *b;
-
-  n_alloc = vlib_buffer_alloc (vm, &bi, 1);
-  ASSERT (n_alloc == 1);
-
-  b = vlib_get_buffer (vm, bi);
-  b->current_length = n_bytes;
-  *bi_return = bi;
-  return (void *) b->data;
-}
-
-static void
-delete_peer_with_index (mc_main_t * mcm, mc_stream_t * s,
-			uword index, int notify_application)
-{
-  mc_stream_peer_t *p = pool_elt_at_index (s->peers, index);
-  ASSERT (p != 0);
-  if (s->config.peer_died && notify_application)
-    s->config.peer_died (mcm, s, p->id);
-
-  s->all_peer_bitmap = clib_bitmap_andnoti (s->all_peer_bitmap, p - s->peers);
-
-  if (MC_EVENT_LOGGING > 0)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (e) =
-        {
-          .format = "delete peer %s from all_peer_bitmap",
-          .format_args = "T4",
-        };
-      /* *INDENT-ON* */
-      struct
-      {
-	u32 peer;
-      } *ed = 0;
-
-      ed = ELOG_DATA (mcm->elog_main, e);
-      ed->peer = elog_id_for_peer_id (mcm, p->id.as_u64);
-    }
-  /* Do not delete the pool / hash table entries, or we lose sequence number state */
-}
-
-static mc_stream_peer_t *
-get_or_create_peer_with_id (mc_main_t * mcm,
-			    mc_stream_t * s, mc_peer_id_t id, int *created)
-{
-  uword *q = mhash_get (&s->peer_index_by_id, &id);
-  mc_stream_peer_t *p;
-
-  if (q)
-    {
-      p = pool_elt_at_index (s->peers, q[0]);
-      goto done;
-    }
-
-  pool_get (s->peers, p);
-  memset (p, 0, sizeof (p[0]));
-  p->id = id;
-  p->last_sequence_received = ~0;
-  mhash_set (&s->peer_index_by_id, &id, p - s->peers, /* old_value */ 0);
-  if (created)
-    *created = 1;
-
-done:
-  if (MC_EVENT_LOGGING > 0)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (e) =
-        {
-          .format = "get_or_create %s peer %s stream %d seq %d",
-          .format_args = "t4T4i4i4",
-          .n_enum_strings = 2,
-          .enum_strings = {
-            "old", "new",
-          },
-        };
-      /* *INDENT-ON* */
-      struct
-      {
-	u32 is_new, peer, stream_index, rx_sequence;
-      } *ed = 0;
-
-      ed = ELOG_DATA (mcm->elog_main, e);
-      ed->is_new = q ? 0 : 1;
-      ed->peer = elog_id_for_peer_id (mcm, p->id.as_u64);
-      ed->stream_index = s->index;
-      ed->rx_sequence = p->last_sequence_received;
-    }
-  /* $$$$ Enable or reenable this peer */
-  s->all_peer_bitmap = clib_bitmap_ori (s->all_peer_bitmap, p - s->peers);
-  return p;
-}
-
-static void
-maybe_send_window_open_event (vlib_main_t * vm, mc_stream_t * stream)
-{
-  vlib_one_time_waiting_process_t *p;
-
-  if (pool_elts (stream->retry_pool) >= stream->config.window_size)
-    return;
-
-  vec_foreach (p, stream->procs_waiting_for_open_window)
-    vlib_signal_one_time_waiting_process (vm, p);
-
-  if (stream->procs_waiting_for_open_window)
-    _vec_len (stream->procs_waiting_for_open_window) = 0;
-}
-
-static void
-mc_retry_free (mc_main_t * mcm, mc_stream_t * s, mc_retry_t * r)
-{
-  mc_retry_t record, *retp;
-
-  if (r->unacked_by_peer_bitmap)
-    _vec_len (r->unacked_by_peer_bitmap) = 0;
-
-  if (clib_fifo_elts (s->retired_fifo) >= 2 * s->config.window_size)
-    {
-      clib_fifo_sub1 (s->retired_fifo, record);
-      vlib_buffer_free_one (mcm->vlib_main, record.buffer_index);
-    }
-
-  clib_fifo_add2 (s->retired_fifo, retp);
-
-  retp->buffer_index = r->buffer_index;
-  retp->local_sequence = r->local_sequence;
-
-  r->buffer_index = ~0;		/* poison buffer index in this retry */
-}
-
-static void
-mc_resend_retired (mc_main_t * mcm, mc_stream_t * s, u32 local_sequence)
-{
-  mc_retry_t *retry;
-
-  if (MC_EVENT_LOGGING > 0)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (e) =
-        {
-          .format = "resend-retired: search for local seq %d",
-          .format_args = "i4",
-        };
-      /* *INDENT-ON* */
-      struct
-      {
-	u32 local_sequence;
-      } *ed;
-      ed = ELOG_DATA (mcm->elog_main, e);
-      ed->local_sequence = local_sequence;
-    }
-
-  /* *INDENT-OFF* */
-  clib_fifo_foreach (retry, s->retired_fifo,
-  ({
-    if (retry->local_sequence == local_sequence)
-      {
-        elog_tx_msg (mcm, s->index, retry-> local_sequence, -13);
-        mcm->transport.tx_buffer (mcm->transport.opaque,
-                                  MC_TRANSPORT_USER_REQUEST_TO_RELAY,
-                                  retry->buffer_index);
-        return;
-      }
-  }));
-  /* *INDENT-ON* */
-
-  if (MC_EVENT_LOGGING > 0)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (e) =
-        {
-          .format = "resend-retired: FAILED search for local seq %d",
-          .format_args = "i4",
-        };
-      /* *INDENT-ON* */
-      struct
-      {
-	u32 local_sequence;
-      } *ed;
-      ed = ELOG_DATA (mcm->elog_main, e);
-      ed->local_sequence = local_sequence;
-    }
-}
-
-static uword *
-delete_retry_fifo_elt (mc_main_t * mcm,
-		       mc_stream_t * stream,
-		       mc_retry_t * r, uword * dead_peer_bitmap)
-{
-  mc_stream_peer_t *p;
-
-  /* *INDENT-OFF* */
-  pool_foreach (p, stream->peers, ({
-    uword pi = p - stream->peers;
-    uword is_alive = 0 == clib_bitmap_get (r->unacked_by_peer_bitmap, pi);
-
-    if (! is_alive)
-      dead_peer_bitmap = clib_bitmap_ori (dead_peer_bitmap, pi);
-
-    if (MC_EVENT_LOGGING > 0)
-      {
-        ELOG_TYPE_DECLARE (e) = {
-          .format = "delete_retry_fifo_elt: peer %s is %s",
-          .format_args = "T4t4",
-          .n_enum_strings = 2,
-          .enum_strings = { "alive", "dead", },
-        };
-        struct { u32 peer, is_alive; } * ed;
-        ed = ELOG_DATA (mcm->elog_main, e);
-        ed->peer = elog_id_for_peer_id (mcm, p->id.as_u64);
-        ed->is_alive = is_alive;
-      }
-  }));
-  /* *INDENT-ON* */
-
-  hash_unset (stream->retry_index_by_local_sequence, r->local_sequence);
-  mc_retry_free (mcm, stream, r);
-
-  return dead_peer_bitmap;
-}
-
-always_inline mc_retry_t *
-prev_retry (mc_stream_t * s, mc_retry_t * r)
-{
-  return (r->prev_index != ~0
-	  ? pool_elt_at_index (s->retry_pool, r->prev_index) : 0);
-}
-
-always_inline mc_retry_t *
-next_retry (mc_stream_t * s, mc_retry_t * r)
-{
-  return (r->next_index != ~0
-	  ? pool_elt_at_index (s->retry_pool, r->next_index) : 0);
-}
-
-always_inline void
-remove_retry_from_pool (mc_stream_t * s, mc_retry_t * r)
-{
-  mc_retry_t *p = prev_retry (s, r);
-  mc_retry_t *n = next_retry (s, r);
-
-  if (p)
-    p->next_index = r->next_index;
-  else
-    s->retry_head_index = r->next_index;
-  if (n)
-    n->prev_index = r->prev_index;
-  else
-    s->retry_tail_index = r->prev_index;
-
-  pool_put_index (s->retry_pool, r - s->retry_pool);
-}
-
-static void
-check_retry (mc_main_t * mcm, mc_stream_t * s)
-{
-  mc_retry_t *r;
-  vlib_main_t *vm = mcm->vlib_main;
-  f64 now = vlib_time_now (vm);
-  uword *dead_peer_bitmap = 0;
-  u32 ri, ri_next;
-
-  for (ri = s->retry_head_index; ri != ~0; ri = ri_next)
-    {
-      r = pool_elt_at_index (s->retry_pool, ri);
-      ri_next = r->next_index;
-
-      if (now < r->sent_at + s->config.retry_interval)
-	continue;
-
-      r->n_retries += 1;
-      if (r->n_retries > s->config.retry_limit)
-	{
-	  dead_peer_bitmap =
-	    delete_retry_fifo_elt (mcm, s, r, dead_peer_bitmap);
-	  remove_retry_from_pool (s, r);
-	}
-      else
-	{
-	  if (MC_EVENT_LOGGING > 0)
-	    {
-	      mc_stream_peer_t *p;
-
-              /* *INDENT-OFF* */
-	      ELOG_TYPE_DECLARE (t) =
-                {
-                  .format = "resend local seq %d attempt %d",
-                  .format_args = "i4i4",
-                };
-              /* *INDENT-ON* */
-
-              /* *INDENT-OFF* */
-	      pool_foreach (p, s->peers, ({
-		if (clib_bitmap_get (r->unacked_by_peer_bitmap, p - s->peers))
-		  {
-		    ELOG_TYPE_DECLARE (ev) = {
-		      .format = "resend: needed by peer %s local seq %d",
-		      .format_args = "T4i4",
-		    };
-		    struct { u32 peer, rx_sequence; } * ed;
-		    ed = ELOG_DATA (mcm->elog_main, ev);
-		    ed->peer = elog_id_for_peer_id (mcm, p->id.as_u64);
-		    ed->rx_sequence = r->local_sequence;
-		  }
-	      }));
-              /* *INDENT-ON* */
-
-	      struct
-	      {
-		u32 sequence;
-		u32 trail;
-	      } *ed;
-	      ed = ELOG_DATA (mcm->elog_main, t);
-	      ed->sequence = r->local_sequence;
-	      ed->trail = r->n_retries;
-	    }
-
-	  r->sent_at = vlib_time_now (vm);
-	  s->stats.n_retries += 1;
-
-	  elog_tx_msg (mcm, s->index, r->local_sequence, r->n_retries);
-
-	  mcm->transport.tx_buffer
-	    (mcm->transport.opaque,
-	     MC_TRANSPORT_USER_REQUEST_TO_RELAY, r->buffer_index);
-	}
-    }
-
-  maybe_send_window_open_event (mcm->vlib_main, s);
-
-  /* Delete any dead peers we've found. */
-  if (!clib_bitmap_is_zero (dead_peer_bitmap))
-    {
-      uword i;
-
-      /* *INDENT-OFF* */
-      clib_bitmap_foreach (i, dead_peer_bitmap, ({
-	delete_peer_with_index (mcm, s, i, /* notify_application */ 1);
-
-	/* Delete any references to just deleted peer in retry pool. */
-	pool_foreach (r, s->retry_pool, ({
-	  r->unacked_by_peer_bitmap =
-	    clib_bitmap_andnoti (r->unacked_by_peer_bitmap, i);
-	}));
-      }));
-/* *INDENT-ON* */
-      clib_bitmap_free (dead_peer_bitmap);
-    }
-}
-
-always_inline mc_main_t *
-mc_node_get_main (vlib_node_runtime_t * node)
-{
-  mc_main_t **p = (void *) node->runtime_data;
-  return p[0];
-}
-
-static uword
-mc_retry_process (vlib_main_t * vm,
-		  vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  mc_main_t *mcm = mc_node_get_main (node);
-  mc_stream_t *s;
-
-  while (1)
-    {
-      vlib_process_suspend (vm, 1.0);
-      vec_foreach (s, mcm->stream_vector)
-      {
-	if (s->state != MC_STREAM_STATE_invalid)
-	  check_retry (mcm, s);
-      }
-    }
-  return 0;			/* not likely */
-}
-
-static void
-send_join_or_leave_request (mc_main_t * mcm, u32 stream_index, u32 is_join)
-{
-  vlib_main_t *vm = mcm->vlib_main;
-  mc_msg_join_or_leave_request_t *mp;
-  u32 bi;
-
-  mp = mc_get_vlib_buffer (vm, sizeof (mp[0]), &bi);
-  memset (mp, 0, sizeof (*mp));
-  mp->type = MC_MSG_TYPE_join_or_leave_request;
-  mp->peer_id = mcm->transport.our_ack_peer_id;
-  mp->stream_index = stream_index;
-  mp->is_join = is_join;
-
-  mc_byte_swap_msg_join_or_leave_request (mp);
-
-  /*
-   * These msgs are unnumbered, unordered so send on the from-relay
-   * channel.
-   */
-  mcm->transport.tx_buffer (mcm->transport.opaque, MC_TRANSPORT_JOIN, bi);
-}
-
-static uword
-mc_join_ager_process (vlib_main_t * vm,
-		      vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  mc_main_t *mcm = mc_node_get_main (node);
-
-  while (1)
-    {
-      if (mcm->joins_in_progress)
-	{
-	  mc_stream_t *s;
-	  vlib_one_time_waiting_process_t *p;
-	  f64 now = vlib_time_now (vm);
-
-	  vec_foreach (s, mcm->stream_vector)
-	  {
-	    if (s->state != MC_STREAM_STATE_join_in_progress)
-	      continue;
-
-	    if (now > s->join_timeout)
-	      {
-		s->state = MC_STREAM_STATE_ready;
-
-		if (MC_EVENT_LOGGING > 0)
-		  {
-                    /* *INDENT-OFF* */
-		    ELOG_TYPE_DECLARE (e) =
-                      {
-                        .format = "stream %d join timeout",
-                      };
-                    /* *INDENT-ON* */
-		    ELOG (mcm->elog_main, e, s->index);
-		  }
-		/* Make sure that this app instance exists as a stream peer,
-		   or we may answer a catchup request with a NULL
-		   all_peer_bitmap... */
-		(void) get_or_create_peer_with_id
-		  (mcm, s, mcm->transport.our_ack_peer_id, /* created */ 0);
-
-		vec_foreach (p, s->procs_waiting_for_join_done)
-		  vlib_signal_one_time_waiting_process (vm, p);
-		if (s->procs_waiting_for_join_done)
-		  _vec_len (s->procs_waiting_for_join_done) = 0;
-
-		mcm->joins_in_progress--;
-		ASSERT (mcm->joins_in_progress >= 0);
-	      }
-	    else
-	      {
-		/* Resent join request which may have been lost. */
-		send_join_or_leave_request (mcm, s->index, 1 /* is_join */ );
-
-		/* We're *not* alone, retry for as long as it takes */
-		if (mcm->relay_state == MC_RELAY_STATE_SLAVE)
-		  s->join_timeout = vlib_time_now (vm) + 2.0;
-
-
-		if (MC_EVENT_LOGGING > 0)
-		  {
-                    /* *INDENT-OFF* */
-		    ELOG_TYPE_DECLARE (e) =
-                      {
-                        .format = "stream %d resend join request",
-                      };
-                    /* *INDENT-ON* */
-		    ELOG (mcm->elog_main, e, s->index);
-		  }
-	      }
-	  }
-	}
-
-      vlib_process_suspend (vm, .5);
-    }
-
-  return 0;			/* not likely */
-}
-
-static void
-serialize_mc_register_stream_name (serialize_main_t * m, va_list * va)
-{
-  char *name = va_arg (*va, char *);
-  serialize_cstring (m, name);
-}
-
-static void
-elog_stream_name (char *buf, int n_buf_bytes, char *v)
-{
-  clib_memcpy (buf, v, clib_min (n_buf_bytes - 1, vec_len (v)));
-  buf[n_buf_bytes - 1] = 0;
-}
-
-static void
-unserialize_mc_register_stream_name (serialize_main_t * m, va_list * va)
-{
-  mc_main_t *mcm = va_arg (*va, mc_main_t *);
-  char *name;
-  mc_stream_t *s;
-  uword *p;
-
-  unserialize_cstring (m, &name);
-
-  if ((p = hash_get_mem (mcm->stream_index_by_name, name)))
-    {
-      if (MC_EVENT_LOGGING > 0)
-	{
-          /* *INDENT-OFF* */
-	  ELOG_TYPE_DECLARE (e) =
-            {
-              .format = "stream index %d already named %s",
-              .format_args = "i4s16",
-            };
-          /* *INDENT-ON* */
-	  struct
-	  {
-	    u32 stream_index;
-	    char name[16];
-	  } *ed;
-	  ed = ELOG_DATA (mcm->elog_main, e);
-	  ed->stream_index = p[0];
-	  elog_stream_name (ed->name, sizeof (ed->name), name);
-	}
-
-      vec_free (name);
-      return;
-    }
-
-  vec_add2 (mcm->stream_vector, s, 1);
-  mc_stream_init (s);
-  s->state = MC_STREAM_STATE_name_known;
-  s->index = s - mcm->stream_vector;
-  s->config.name = name;
-
-  if (MC_EVENT_LOGGING > 0)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (e) =
-        {
-          .format = "stream index %d named %s",
-          .format_args = "i4s16",
-        };
-      /* *INDENT-ON* */
-      struct
-      {
-	u32 stream_index;
-	char name[16];
-      } *ed;
-      ed = ELOG_DATA (mcm->elog_main, e);
-      ed->stream_index = s->index;
-      elog_stream_name (ed->name, sizeof (ed->name), name);
-    }
-
-  hash_set_mem (mcm->stream_index_by_name, name, s->index);
-
-  p = hash_get (mcm->procs_waiting_for_stream_name_by_name, name);
-  if (p)
-    {
-      vlib_one_time_waiting_process_t *wp, **w;
-      w = pool_elt_at_index (mcm->procs_waiting_for_stream_name_pool, p[0]);
-      vec_foreach (wp, w[0])
-	vlib_signal_one_time_waiting_process (mcm->vlib_main, wp);
-      pool_put (mcm->procs_waiting_for_stream_name_pool, w);
-      hash_unset_mem (mcm->procs_waiting_for_stream_name_by_name, name);
-    }
-}
-
-/* *INDENT-OFF* */
-MC_SERIALIZE_MSG (mc_register_stream_name_msg, static) =
-{
-  .name = "mc_register_stream_name",
-  .serialize = serialize_mc_register_stream_name,
-  .unserialize = unserialize_mc_register_stream_name,
-};
-/* *INDENT-ON* */
-
-void
-mc_rx_buffer_unserialize (mc_main_t * mcm,
-			  mc_stream_t * stream,
-			  mc_peer_id_t peer_id, u32 buffer_index)
-{
-  return mc_unserialize (mcm, stream, buffer_index);
-}
-
-static u8 *
-mc_internal_catchup_snapshot (mc_main_t * mcm,
-			      u8 * data_vector,
-			      u32 last_global_sequence_processed)
-{
-  serialize_main_t m;
-
-  /* Append serialized data to data vector. */
-  serialize_open_vector (&m, data_vector);
-  m.stream.current_buffer_index = vec_len (data_vector);
-
-  serialize (&m, serialize_mc_main, mcm);
-  return serialize_close_vector (&m);
-}
-
-static void
-mc_internal_catchup (mc_main_t * mcm, u8 * data, u32 n_data_bytes)
-{
-  serialize_main_t s;
-
-  unserialize_open_data (&s, data, n_data_bytes);
-
-  unserialize (&s, unserialize_mc_main, mcm);
-}
-
-/* Overridden from the application layer, not actually used here */
-void mc_stream_join_process_hold (void) __attribute__ ((weak));
-void
-mc_stream_join_process_hold (void)
-{
-}
-
-static u32
-mc_stream_join_helper (mc_main_t * mcm,
-		       mc_stream_config_t * config, u32 is_internal)
-{
-  mc_stream_t *s;
-  vlib_main_t *vm = mcm->vlib_main;
-
-  s = 0;
-  if (!is_internal)
-    {
-      uword *p;
-
-      /* Already have a stream with given name? */
-      if ((s = mc_stream_by_name (mcm, config->name)))
-	{
-	  /* Already joined and ready? */
-	  if (s->state == MC_STREAM_STATE_ready)
-	    return s->index;
-	}
-
-      /* First join MC internal stream. */
-      if (!mcm->stream_vector
-	  || (mcm->stream_vector[MC_STREAM_INDEX_INTERNAL].state
-	      == MC_STREAM_STATE_invalid))
-	{
-	  static mc_stream_config_t c = {
-	    .name = "mc-internal",
-	    .rx_buffer = mc_rx_buffer_unserialize,
-	    .catchup = mc_internal_catchup,
-	    .catchup_snapshot = mc_internal_catchup_snapshot,
-	  };
-
-	  c.save_snapshot = config->save_snapshot;
-
-	  mc_stream_join_helper (mcm, &c, /* is_internal */ 1);
-	}
-
-      /* If stream is still unknown register this name and wait for
-         sequenced message to name stream.  This way all peers agree
-         on stream name to index mappings. */
-      s = mc_stream_by_name (mcm, config->name);
-      if (!s)
-	{
-	  vlib_one_time_waiting_process_t *wp, **w;
-	  u8 *name_copy = format (0, "%s", config->name);
-
-	  mc_serialize_stream (mcm,
-			       MC_STREAM_INDEX_INTERNAL,
-			       &mc_register_stream_name_msg, config->name);
-
-	  /* Wait for this stream to be named. */
-	  p =
-	    hash_get_mem (mcm->procs_waiting_for_stream_name_by_name,
-			  name_copy);
-	  if (p)
-	    w =
-	      pool_elt_at_index (mcm->procs_waiting_for_stream_name_pool,
-				 p[0]);
-	  else
-	    {
-	      pool_get (mcm->procs_waiting_for_stream_name_pool, w);
-	      if (!mcm->procs_waiting_for_stream_name_by_name)
-		mcm->procs_waiting_for_stream_name_by_name = hash_create_string ( /* elts */ 0,	/* value size */
-										 sizeof
-										 (uword));
-	      hash_set_mem (mcm->procs_waiting_for_stream_name_by_name,
-			    name_copy,
-			    w - mcm->procs_waiting_for_stream_name_pool);
-	      w[0] = 0;
-	    }
-
-	  vec_add2 (w[0], wp, 1);
-	  vlib_current_process_wait_for_one_time_event (vm, wp);
-	  vec_free (name_copy);
-	}
-
-      /* Name should be known now. */
-      s = mc_stream_by_name (mcm, config->name);
-      ASSERT (s != 0);
-      ASSERT (s->state == MC_STREAM_STATE_name_known);
-    }
-
-  if (!s)
-    {
-      vec_add2 (mcm->stream_vector, s, 1);
-      mc_stream_init (s);
-      s->index = s - mcm->stream_vector;
-    }
-
-  {
-    /* Save name since we could have already used it as hash key. */
-    char *name_save = s->config.name;
-
-    s->config = config[0];
-
-    if (name_save)
-      s->config.name = name_save;
-  }
-
-  if (s->config.window_size == 0)
-    s->config.window_size = 8;
-
-  if (s->config.retry_interval == 0.0)
-    s->config.retry_interval = 1.0;
-
-  /* Sanity. */
-  ASSERT (s->config.retry_interval < 30);
-
-  if (s->config.retry_limit == 0)
-    s->config.retry_limit = 7;
-
-  s->state = MC_STREAM_STATE_join_in_progress;
-  if (!s->peer_index_by_id.hash)
-    mhash_init (&s->peer_index_by_id, sizeof (uword), sizeof (mc_peer_id_t));
-
-  /* If we don't hear from someone in 5 seconds, we're alone */
-  s->join_timeout = vlib_time_now (vm) + 5.0;
-  mcm->joins_in_progress++;
-
-  if (MC_EVENT_LOGGING > 0)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (e) =
-      {
-        .format = "stream index %d join request %s",
-        .format_args = "i4s16",
-      };
-      /* *INDENT-ON* */
-      struct
-      {
-	u32 stream_index;
-	char name[16];
-      } *ed;
-      ed = ELOG_DATA (mcm->elog_main, e);
-      ed->stream_index = s->index;
-      elog_stream_name (ed->name, sizeof (ed->name), s->config.name);
-    }
-
-  send_join_or_leave_request (mcm, s->index, 1 /* join */ );
-
-  vlib_current_process_wait_for_one_time_event_vector
-    (vm, &s->procs_waiting_for_join_done);
-
-  if (MC_EVENT_LOGGING)
-    {
-      ELOG_TYPE (e, "join complete stream %d");
-      ELOG (mcm->elog_main, e, s->index);
-    }
-
-  return s->index;
-}
-
-u32
-mc_stream_join (mc_main_t * mcm, mc_stream_config_t * config)
-{
-  return mc_stream_join_helper (mcm, config, /* is_internal */ 0);
-}
-
-void
-mc_stream_leave (mc_main_t * mcm, u32 stream_index)
-{
-  mc_stream_t *s = mc_stream_by_index (mcm, stream_index);
-
-  if (!s)
-    return;
-
-  if (MC_EVENT_LOGGING)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (t) =
-        {
-          .format = "leave-stream: %d",.format_args = "i4",
-        };
-      /* *INDENT-ON* */
-      struct
-      {
-	u32 index;
-      } *ed;
-      ed = ELOG_DATA (mcm->elog_main, t);
-      ed->index = stream_index;
-    }
-
-  send_join_or_leave_request (mcm, stream_index, 0 /* is_join */ );
-  mc_stream_free (s);
-  s->state = MC_STREAM_STATE_name_known;
-}
-
-void
-mc_msg_join_or_leave_request_handler (mc_main_t * mcm,
-				      mc_msg_join_or_leave_request_t * req,
-				      u32 buffer_index)
-{
-  mc_stream_t *s;
-  mc_msg_join_reply_t *rep;
-  u32 bi;
-
-  mc_byte_swap_msg_join_or_leave_request (req);
-
-  s = mc_stream_by_index (mcm, req->stream_index);
-  if (!s || s->state != MC_STREAM_STATE_ready)
-    return;
-
-  /* If the peer is joining, create it */
-  if (req->is_join)
-    {
-      mc_stream_t *this_s;
-
-      /* We're not in a position to catch up a peer until all
-         stream joins are complete. */
-      if (0)
-	{
-	  /* XXX This is hard to test so we've. */
-	  vec_foreach (this_s, mcm->stream_vector)
-	  {
-	    if (this_s->state != MC_STREAM_STATE_ready
-		&& this_s->state != MC_STREAM_STATE_name_known)
-	      return;
-	  }
-	}
-      else if (mcm->joins_in_progress > 0)
-	return;
-
-      (void) get_or_create_peer_with_id (mcm, s, req->peer_id,
-					 /* created */ 0);
-
-      rep = mc_get_vlib_buffer (mcm->vlib_main, sizeof (rep[0]), &bi);
-      memset (rep, 0, sizeof (rep[0]));
-      rep->type = MC_MSG_TYPE_join_reply;
-      rep->stream_index = req->stream_index;
-
-      mc_byte_swap_msg_join_reply (rep);
-      /* These two are already in network byte order... */
-      rep->peer_id = mcm->transport.our_ack_peer_id;
-      rep->catchup_peer_id = mcm->transport.our_catchup_peer_id;
-
-      mcm->transport.tx_buffer (mcm->transport.opaque, MC_TRANSPORT_JOIN, bi);
-    }
-  else
-    {
-      if (s->config.peer_died)
-	s->config.peer_died (mcm, s, req->peer_id);
-    }
-}
-
-void
-mc_msg_join_reply_handler (mc_main_t * mcm,
-			   mc_msg_join_reply_t * mp, u32 buffer_index)
-{
-  mc_stream_t *s;
-
-  mc_byte_swap_msg_join_reply (mp);
-
-  s = mc_stream_by_index (mcm, mp->stream_index);
-
-  if (!s || s->state != MC_STREAM_STATE_join_in_progress)
-    return;
-
-  /* Switch to catchup state; next join reply
-     for this stream will be ignored. */
-  s->state = MC_STREAM_STATE_catchup;
-
-  mcm->joins_in_progress--;
-  mcm->transport.catchup_request_fun (mcm->transport.opaque,
-				      mp->stream_index, mp->catchup_peer_id);
-}
-
-void
-mc_wait_for_stream_ready (mc_main_t * m, char *stream_name)
-{
-  mc_stream_t *s;
-
-  while (1)
-    {
-      s = mc_stream_by_name (m, stream_name);
-      if (s)
-	break;
-      vlib_process_suspend (m->vlib_main, .1);
-    }
-
-  /* It's OK to send a message in catchup and ready states. */
-  if (s->state == MC_STREAM_STATE_catchup
-      || s->state == MC_STREAM_STATE_ready)
-    return;
-
-  /* Otherwise we are waiting for a join to finish. */
-  vlib_current_process_wait_for_one_time_event_vector
-    (m->vlib_main, &s->procs_waiting_for_join_done);
-}
-
-u32
-mc_stream_send (mc_main_t * mcm, u32 stream_index, u32 buffer_index)
-{
-  mc_stream_t *s = mc_stream_by_index (mcm, stream_index);
-  vlib_main_t *vm = mcm->vlib_main;
-  mc_retry_t *r;
-  mc_msg_user_request_t *mp;
-  vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
-  u32 ri;
-
-  if (!s)
-    return 0;
-
-  if (s->state != MC_STREAM_STATE_ready)
-    vlib_current_process_wait_for_one_time_event_vector
-      (vm, &s->procs_waiting_for_join_done);
-
-  while (pool_elts (s->retry_pool) >= s->config.window_size)
-    {
-      vlib_current_process_wait_for_one_time_event_vector
-	(vm, &s->procs_waiting_for_open_window);
-    }
-
-  pool_get (s->retry_pool, r);
-  ri = r - s->retry_pool;
-
-  r->prev_index = s->retry_tail_index;
-  r->next_index = ~0;
-  s->retry_tail_index = ri;
-
-  if (r->prev_index == ~0)
-    s->retry_head_index = ri;
-  else
-    {
-      mc_retry_t *p = pool_elt_at_index (s->retry_pool, r->prev_index);
-      p->next_index = ri;
-    }
-
-  vlib_buffer_advance (b, -sizeof (mp[0]));
-  mp = vlib_buffer_get_current (b);
-
-  mp->peer_id = mcm->transport.our_ack_peer_id;
-  /* mp->transport.global_sequence set by relay agent. */
-  mp->global_sequence = 0xdeadbeef;
-  mp->stream_index = s->index;
-  mp->local_sequence = s->our_local_sequence++;
-  mp->n_data_bytes =
-    vlib_buffer_index_length_in_chain (vm, buffer_index) - sizeof (mp[0]);
-
-  r->buffer_index = buffer_index;
-  r->local_sequence = mp->local_sequence;
-  r->sent_at = vlib_time_now (vm);
-  r->n_retries = 0;
-
-  /* Retry will be freed when all currently known peers have acked. */
-  vec_validate (r->unacked_by_peer_bitmap, vec_len (s->all_peer_bitmap) - 1);
-  vec_copy (r->unacked_by_peer_bitmap, s->all_peer_bitmap);
-
-  hash_set (s->retry_index_by_local_sequence, r->local_sequence,
-	    r - s->retry_pool);
-
-  elog_tx_msg (mcm, s->index, mp->local_sequence, r->n_retries);
-
-  mc_byte_swap_msg_user_request (mp);
-
-  mcm->transport.tx_buffer (mcm->transport.opaque,
-			    MC_TRANSPORT_USER_REQUEST_TO_RELAY, buffer_index);
-
-  s->user_requests_sent++;
-
-  /* return amount of window remaining */
-  return s->config.window_size - pool_elts (s->retry_pool);
-}
-
-void
-mc_msg_user_request_handler (mc_main_t * mcm, mc_msg_user_request_t * mp,
-			     u32 buffer_index)
-{
-  vlib_main_t *vm = mcm->vlib_main;
-  mc_stream_t *s;
-  mc_stream_peer_t *peer;
-  i32 seq_cmp_result;
-  static int once = 0;
-
-  mc_byte_swap_msg_user_request (mp);
-
-  s = mc_stream_by_index (mcm, mp->stream_index);
-
-  /* Not signed up for this stream? Turf-o-matic */
-  if (!s || s->state != MC_STREAM_STATE_ready)
-    {
-      vlib_buffer_free_one (vm, buffer_index);
-      return;
-    }
-
-  /* Find peer, including ourselves. */
-  peer = get_or_create_peer_with_id (mcm, s, mp->peer_id,
-				     /* created */ 0);
-
-  seq_cmp_result = mc_seq_cmp (mp->local_sequence,
-			       peer->last_sequence_received + 1);
-
-  if (MC_EVENT_LOGGING > 0)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (e) =
-        {
-          .format = "rx-msg: peer %s stream %d rx seq %d seq_cmp %d",
-          .format_args = "T4i4i4i4",
-        };
-      /* *INDENT-ON* */
-      struct
-      {
-	u32 peer, stream_index, rx_sequence;
-	i32 seq_cmp_result;
-      } *ed;
-      ed = ELOG_DATA (mcm->elog_main, e);
-      ed->peer = elog_id_for_peer_id (mcm, peer->id.as_u64);
-      ed->stream_index = mp->stream_index;
-      ed->rx_sequence = mp->local_sequence;
-      ed->seq_cmp_result = seq_cmp_result;
-    }
-
-  if (0 && mp->stream_index == 1 && once == 0)
-    {
-      once = 1;
-      ELOG_TYPE (e, "FAKE lost msg on stream 1");
-      ELOG (mcm->elog_main, e, 0);
-      return;
-    }
-
-  peer->last_sequence_received += seq_cmp_result == 0;
-  s->user_requests_received++;
-
-  if (seq_cmp_result > 0)
-    peer->stats.n_msgs_from_future += 1;
-
-  /* Send ack even if msg from future */
-  if (1)
-    {
-      mc_msg_user_ack_t *rp;
-      u32 bi;
-
-      rp = mc_get_vlib_buffer (vm, sizeof (rp[0]), &bi);
-      rp->peer_id = mcm->transport.our_ack_peer_id;
-      rp->stream_index = s->index;
-      rp->local_sequence = mp->local_sequence;
-      rp->seq_cmp_result = seq_cmp_result;
-
-      if (MC_EVENT_LOGGING > 0)
-	{
-          /* *INDENT-OFF* */
-	  ELOG_TYPE_DECLARE (e) =
-            {
-              .format = "tx-ack: stream %d local seq %d",
-              .format_args = "i4i4",
-            };
-          /* *INDENT-ON* */
-	  struct
-	  {
-	    u32 stream_index;
-	    u32 local_sequence;
-	  } *ed;
-	  ed = ELOG_DATA (mcm->elog_main, e);
-	  ed->stream_index = rp->stream_index;
-	  ed->local_sequence = rp->local_sequence;
-	}
-
-      mc_byte_swap_msg_user_ack (rp);
-
-      mcm->transport.tx_ack (mcm->transport.opaque, mp->peer_id, bi);
-      /* Msg from past? If so, free the buffer... */
-      if (seq_cmp_result < 0)
-	{
-	  vlib_buffer_free_one (vm, buffer_index);
-	  peer->stats.n_msgs_from_past += 1;
-	}
-    }
-
-  if (seq_cmp_result == 0)
-    {
-      vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
-      switch (s->state)
-	{
-	case MC_STREAM_STATE_ready:
-	  vlib_buffer_advance (b, sizeof (mp[0]));
-	  s->config.rx_buffer (mcm, s, mp->peer_id, buffer_index);
-
-	  /* Stream vector can change address via rx callback for mc-internal
-	     stream. */
-	  s = mc_stream_by_index (mcm, mp->stream_index);
-	  ASSERT (s != 0);
-	  s->last_global_sequence_processed = mp->global_sequence;
-	  break;
-
-	case MC_STREAM_STATE_catchup:
-	  clib_fifo_add1 (s->catchup_fifo, buffer_index);
-	  break;
-
-	default:
-	  clib_warning ("stream in unknown state %U",
-			format_mc_stream_state, s->state);
-	  break;
-	}
-    }
-}
-
-void
-mc_msg_user_ack_handler (mc_main_t * mcm, mc_msg_user_ack_t * mp,
-			 u32 buffer_index)
-{
-  vlib_main_t *vm = mcm->vlib_main;
-  uword *p;
-  mc_stream_t *s;
-  mc_stream_peer_t *peer;
-  mc_retry_t *r;
-  int peer_created = 0;
-
-  mc_byte_swap_msg_user_ack (mp);
-
-  s = mc_stream_by_index (mcm, mp->stream_index);
-
-  if (MC_EVENT_LOGGING > 0)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (t) =
-        {
-          .format = "rx-ack: local seq %d peer %s seq_cmp_result %d",
-          .format_args = "i4T4i4",
-        };
-      /* *INDENT-ON* */
-
-      struct
-      {
-	u32 local_sequence;
-	u32 peer;
-	i32 seq_cmp_result;
-      } *ed;
-      ed = ELOG_DATA (mcm->elog_main, t);
-      ed->local_sequence = mp->local_sequence;
-      ed->peer = elog_id_for_peer_id (mcm, mp->peer_id.as_u64);
-      ed->seq_cmp_result = mp->seq_cmp_result;
-    }
-
-  /* Unknown stream? */
-  if (!s)
-    return;
-
-  /* Find the peer which just ack'ed. */
-  peer = get_or_create_peer_with_id (mcm, s, mp->peer_id,
-				     /* created */ &peer_created);
-
-  /*
-   * Peer reports message from the future. If it's not in the retry
-   * fifo, look for a retired message.
-   */
-  if (mp->seq_cmp_result > 0)
-    {
-      p = hash_get (s->retry_index_by_local_sequence, mp->local_sequence -
-		    mp->seq_cmp_result);
-      if (p == 0)
-	mc_resend_retired (mcm, s, mp->local_sequence - mp->seq_cmp_result);
-
-      /* Normal retry should fix it... */
-      return;
-    }
-
-  /*
-   * Pointer to the indicated retry fifo entry.
-   * Worth hashing because we could use a window size of 100 or 1000.
-   */
-  p = hash_get (s->retry_index_by_local_sequence, mp->local_sequence);
-
-  /*
-   * Is this a duplicate ACK, received after we've retired the
-   * fifo entry. This can happen when learning about new
-   * peers.
-   */
-  if (p == 0)
-    {
-      if (MC_EVENT_LOGGING > 0)
-	{
-          /* *INDENT-OFF* */
-	  ELOG_TYPE_DECLARE (t) =
-            {
-              .format = "ack: for seq %d from peer %s no fifo elt",
-              .format_args = "i4T4",
-            };
-          /* *INDENT-ON* */
-
-	  struct
-	  {
-	    u32 seq;
-	    u32 peer;
-	  } *ed;
-	  ed = ELOG_DATA (mcm->elog_main, t);
-	  ed->seq = mp->local_sequence;
-	  ed->peer = elog_id_for_peer_id (mcm, mp->peer_id.as_u64);
-	}
-
-      return;
-    }
-
-  r = pool_elt_at_index (s->retry_pool, p[0]);
-
-  /* Make sure that this new peer ACKs our msgs from now on */
-  if (peer_created)
-    {
-      mc_retry_t *later_retry = next_retry (s, r);
-
-      while (later_retry)
-	{
-	  later_retry->unacked_by_peer_bitmap =
-	    clib_bitmap_ori (later_retry->unacked_by_peer_bitmap,
-			     peer - s->peers);
-	  later_retry = next_retry (s, later_retry);
-	}
-    }
-
-  ASSERT (mp->local_sequence == r->local_sequence);
-
-  /* If we weren't expecting to hear from this peer */
-  if (!peer_created &&
-      !clib_bitmap_get (r->unacked_by_peer_bitmap, peer - s->peers))
-    {
-      if (MC_EVENT_LOGGING > 0)
-	{
-          /* *INDENT-OFF* */
-	  ELOG_TYPE_DECLARE (t) =
-            {
-              .format = "dup-ack: for seq %d from peer %s",
-              .format_args = "i4T4",
-            };
-          /* *INDENT-ON* */
-	  struct
-	  {
-	    u32 seq;
-	    u32 peer;
-	  } *ed;
-	  ed = ELOG_DATA (mcm->elog_main, t);
-	  ed->seq = r->local_sequence;
-	  ed->peer = elog_id_for_peer_id (mcm, peer->id.as_u64);
-	}
-      if (!clib_bitmap_is_zero (r->unacked_by_peer_bitmap))
-	return;
-    }
-
-  if (MC_EVENT_LOGGING > 0)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (t) =
-        {
-          .format = "ack: for seq %d from peer %s",
-          .format_args = "i4T4",
-        };
-      /* *INDENT-ON* */
-      struct
-      {
-	u32 seq;
-	u32 peer;
-      } *ed;
-      ed = ELOG_DATA (mcm->elog_main, t);
-      ed->seq = mp->local_sequence;
-      ed->peer = elog_id_for_peer_id (mcm, peer->id.as_u64);
-    }
-
-  r->unacked_by_peer_bitmap =
-    clib_bitmap_andnoti (r->unacked_by_peer_bitmap, peer - s->peers);
-
-  /* Not all clients have ack'ed */
-  if (!clib_bitmap_is_zero (r->unacked_by_peer_bitmap))
-    {
-      return;
-    }
-  if (MC_EVENT_LOGGING > 0)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (t) =
-        {
-          .format = "ack: retire fifo elt loc seq %d after %d acks",
-          .format_args = "i4i4",
-        };
-      /* *INDENT-ON* */
-      struct
-      {
-	u32 seq;
-	u32 npeers;
-      } *ed;
-      ed = ELOG_DATA (mcm->elog_main, t);
-      ed->seq = r->local_sequence;
-      ed->npeers = pool_elts (s->peers);
-    }
-
-  hash_unset (s->retry_index_by_local_sequence, mp->local_sequence);
-  mc_retry_free (mcm, s, r);
-  remove_retry_from_pool (s, r);
-  maybe_send_window_open_event (vm, s);
-}
-
-#define EVENT_MC_SEND_CATCHUP_DATA 0
-
-static uword
-mc_catchup_process (vlib_main_t * vm,
-		    vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  mc_main_t *mcm = mc_node_get_main (node);
-  uword *event_data = 0;
-  mc_catchup_process_arg_t *args;
-  int i;
-
-  while (1)
-    {
-      if (event_data)
-	_vec_len (event_data) = 0;
-      vlib_process_wait_for_event_with_type (vm, &event_data,
-					     EVENT_MC_SEND_CATCHUP_DATA);
-
-      for (i = 0; i < vec_len (event_data); i++)
-	{
-	  args = pool_elt_at_index (mcm->catchup_process_args, event_data[i]);
-
-	  mcm->transport.catchup_send_fun (mcm->transport.opaque,
-					   args->catchup_opaque,
-					   args->catchup_snapshot);
-
-	  /* Send function will free snapshot data vector. */
-	  pool_put (mcm->catchup_process_args, args);
-	}
-    }
-
-  return 0;			/* not likely */
-}
-
-static void
-serialize_mc_stream (serialize_main_t * m, va_list * va)
-{
-  mc_stream_t *s = va_arg (*va, mc_stream_t *);
-  mc_stream_peer_t *p;
-
-  serialize_integer (m, pool_elts (s->peers), sizeof (u32));
-  /* *INDENT-OFF* */
-  pool_foreach (p, s->peers, ({
-    u8 * x = serialize_get (m, sizeof (p->id));
-    clib_memcpy (x, p->id.as_u8, sizeof (p->id));
-    serialize_integer (m, p->last_sequence_received,
-                       sizeof (p->last_sequence_received));
-  }));
-/* *INDENT-ON* */
-  serialize_bitmap (m, s->all_peer_bitmap);
-}
-
-void
-unserialize_mc_stream (serialize_main_t * m, va_list * va)
-{
-  mc_stream_t *s = va_arg (*va, mc_stream_t *);
-  u32 i, n_peers;
-  mc_stream_peer_t *p;
-
-  unserialize_integer (m, &n_peers, sizeof (u32));
-  mhash_init (&s->peer_index_by_id, sizeof (uword), sizeof (mc_peer_id_t));
-  for (i = 0; i < n_peers; i++)
-    {
-      u8 *x;
-      pool_get (s->peers, p);
-      x = unserialize_get (m, sizeof (p->id));
-      clib_memcpy (p->id.as_u8, x, sizeof (p->id));
-      unserialize_integer (m, &p->last_sequence_received,
-			   sizeof (p->last_sequence_received));
-      mhash_set (&s->peer_index_by_id, &p->id, p - s->peers,	/* old_value */
-		 0);
-    }
-  s->all_peer_bitmap = unserialize_bitmap (m);
-
-  /* This is really bad. */
-  if (!s->all_peer_bitmap)
-    clib_warning ("BUG: stream %s all_peer_bitmap NULL", s->config.name);
-}
-
-void
-mc_msg_catchup_request_handler (mc_main_t * mcm,
-				mc_msg_catchup_request_t * req,
-				u32 catchup_opaque)
-{
-  vlib_main_t *vm = mcm->vlib_main;
-  mc_stream_t *s;
-  mc_catchup_process_arg_t *args;
-
-  mc_byte_swap_msg_catchup_request (req);
-
-  s = mc_stream_by_index (mcm, req->stream_index);
-  if (!s || s->state != MC_STREAM_STATE_ready)
-    return;
-
-  if (MC_EVENT_LOGGING > 0)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (t) =
-        {
-          .format = "catchup-request: from %s stream %d",
-          .format_args = "T4i4",
-        };
-      /* *INDENT-ON* */
-      struct
-      {
-	u32 peer, stream;
-      } *ed;
-      ed = ELOG_DATA (mcm->elog_main, t);
-      ed->peer = elog_id_for_peer_id (mcm, req->peer_id.as_u64);
-      ed->stream = req->stream_index;
-    }
-
-  /*
-   * The application has to snapshoot its data structures right
-   * here, right now. If we process any messages after
-   * noting the last global sequence we've processed, the client
-   * won't be able to accurately reconstruct our data structures.
-   *
-   * Once the data structures are e.g. vec_dup()'ed, we
-   * send the resulting messages from a separate process, to
-   * make sure that we don't cause a bunch of message retransmissions
-   */
-  pool_get (mcm->catchup_process_args, args);
-
-  args->stream_index = s - mcm->stream_vector;
-  args->catchup_opaque = catchup_opaque;
-  args->catchup_snapshot = 0;
-
-  /* Construct catchup reply and snapshot state for stream to send as
-     catchup reply payload. */
-  {
-    mc_msg_catchup_reply_t *rep;
-    serialize_main_t m;
-
-    vec_resize (args->catchup_snapshot, sizeof (rep[0]));
-
-    rep = (void *) args->catchup_snapshot;
-
-    rep->peer_id = req->peer_id;
-    rep->stream_index = req->stream_index;
-    rep->last_global_sequence_included = s->last_global_sequence_processed;
-
-    /* Setup for serialize to append to catchup snapshot. */
-    serialize_open_vector (&m, args->catchup_snapshot);
-    m.stream.current_buffer_index = vec_len (m.stream.buffer);
-
-    serialize (&m, serialize_mc_stream, s);
-
-    args->catchup_snapshot = serialize_close_vector (&m);
-
-    /* Actually copy internal state */
-    args->catchup_snapshot = s->config.catchup_snapshot
-      (mcm, args->catchup_snapshot, rep->last_global_sequence_included);
-
-    rep = (void *) args->catchup_snapshot;
-    rep->n_data_bytes = vec_len (args->catchup_snapshot) - sizeof (rep[0]);
-
-    mc_byte_swap_msg_catchup_reply (rep);
-  }
-
-  /* now go send it... */
-  vlib_process_signal_event (vm, mcm->catchup_process,
-			     EVENT_MC_SEND_CATCHUP_DATA,
-			     args - mcm->catchup_process_args);
-}
-
-#define EVENT_MC_UNSERIALIZE_BUFFER 0
-#define EVENT_MC_UNSERIALIZE_CATCHUP 1
-
-void
-mc_msg_catchup_reply_handler (mc_main_t * mcm, mc_msg_catchup_reply_t * mp,
-			      u32 catchup_opaque)
-{
-  vlib_process_signal_event (mcm->vlib_main,
-			     mcm->unserialize_process,
-			     EVENT_MC_UNSERIALIZE_CATCHUP,
-			     pointer_to_uword (mp));
-}
-
-static void
-perform_catchup (mc_main_t * mcm, mc_msg_catchup_reply_t * mp)
-{
-  mc_stream_t *s;
-  i32 seq_cmp_result;
-
-  mc_byte_swap_msg_catchup_reply (mp);
-
-  s = mc_stream_by_index (mcm, mp->stream_index);
-
-  /* Never heard of this stream or already caught up. */
-  if (!s || s->state == MC_STREAM_STATE_ready)
-    return;
-
-  {
-    serialize_main_t m;
-    mc_stream_peer_t *p;
-    u32 n_stream_bytes;
-
-    /* For offline sim replay: save the entire catchup snapshot... */
-    if (s->config.save_snapshot)
-      s->config.save_snapshot (mcm, /* is_catchup */ 1, mp->data,
-			       mp->n_data_bytes);
-
-    unserialize_open_data (&m, mp->data, mp->n_data_bytes);
-    unserialize (&m, unserialize_mc_stream, s);
-
-    /* Make sure we start numbering our messages as expected */
-    /* *INDENT-OFF* */
-    pool_foreach (p, s->peers, ({
-      if (p->id.as_u64 == mcm->transport.our_ack_peer_id.as_u64)
-        s->our_local_sequence = p->last_sequence_received + 1;
-    }));
-/* *INDENT-ON* */
-
-    n_stream_bytes = m.stream.current_buffer_index;
-
-    /* No need to unserialize close; nothing to free. */
-
-    /* After serialized stream is user's catchup data. */
-    s->config.catchup (mcm, mp->data + n_stream_bytes,
-		       mp->n_data_bytes - n_stream_bytes);
-  }
-
-  /* Vector could have been moved by catchup.
-     This can only happen for mc-internal stream. */
-  s = mc_stream_by_index (mcm, mp->stream_index);
-
-  s->last_global_sequence_processed = mp->last_global_sequence_included;
-
-  while (clib_fifo_elts (s->catchup_fifo))
-    {
-      mc_msg_user_request_t *gp;
-      u32 bi;
-      vlib_buffer_t *b;
-
-      clib_fifo_sub1 (s->catchup_fifo, bi);
-
-      b = vlib_get_buffer (mcm->vlib_main, bi);
-      gp = vlib_buffer_get_current (b);
-
-      /* Make sure we're replaying "new" news */
-      seq_cmp_result = mc_seq_cmp (gp->global_sequence,
-				   mp->last_global_sequence_included);
-
-      if (seq_cmp_result > 0)
-	{
-	  vlib_buffer_advance (b, sizeof (gp[0]));
-	  s->config.rx_buffer (mcm, s, gp->peer_id, bi);
-	  s->last_global_sequence_processed = gp->global_sequence;
-
-	  if (MC_EVENT_LOGGING)
-	    {
-              /* *INDENT-OFF* */
-	      ELOG_TYPE_DECLARE (t) =
-                {
-                  .format = "catchup replay local sequence 0x%x",
-                  .format_args = "i4",
-                };
-              /* *INDENT-ON* */
-	      struct
-	      {
-		u32 local_sequence;
-	      } *ed;
-	      ed = ELOG_DATA (mcm->elog_main, t);
-	      ed->local_sequence = gp->local_sequence;
-	    }
-	}
-      else
-	{
-	  if (MC_EVENT_LOGGING)
-	    {
-              /* *INDENT-OFF* */
-	      ELOG_TYPE_DECLARE (t) =
-                {
-                  .format = "catchup discard local sequence 0x%x",
-                  .format_args = "i4",
-                };
-              /* *INDENT-ON* */
-	      struct
-	      {
-		u32 local_sequence;
-	      } *ed;
-	      ed = ELOG_DATA (mcm->elog_main, t);
-	      ed->local_sequence = gp->local_sequence;
-	    }
-
-	  vlib_buffer_free_one (mcm->vlib_main, bi);
-	}
-    }
-
-  s->state = MC_STREAM_STATE_ready;
-
-  /* Now that we are caught up wake up joining process. */
-  {
-    vlib_one_time_waiting_process_t *wp;
-    vec_foreach (wp, s->procs_waiting_for_join_done)
-      vlib_signal_one_time_waiting_process (mcm->vlib_main, wp);
-    if (s->procs_waiting_for_join_done)
-      _vec_len (s->procs_waiting_for_join_done) = 0;
-  }
-}
-
-static void
-this_node_maybe_master (mc_main_t * mcm)
-{
-  vlib_main_t *vm = mcm->vlib_main;
-  mc_msg_master_assert_t *mp;
-  uword event_type;
-  int timeouts = 0;
-  int is_master = mcm->relay_state == MC_RELAY_STATE_MASTER;
-  clib_error_t *error;
-  f64 now, time_last_master_assert = -1;
-  u32 bi;
-
-  while (1)
-    {
-      if (!mcm->we_can_be_relay_master)
-	{
-	  mcm->relay_state = MC_RELAY_STATE_SLAVE;
-	  if (MC_EVENT_LOGGING)
-	    {
-	      ELOG_TYPE (e, "become slave (config)");
-	      ELOG (mcm->elog_main, e, 0);
-	    }
-	  return;
-	}
-
-      now = vlib_time_now (vm);
-      if (now >= time_last_master_assert + 1)
-	{
-	  time_last_master_assert = now;
-	  mp = mc_get_vlib_buffer (mcm->vlib_main, sizeof (mp[0]), &bi);
-
-	  mp->peer_id = mcm->transport.our_ack_peer_id;
-	  mp->global_sequence = mcm->relay_global_sequence;
-
-	  /*
-	   * these messages clog the event log, set MC_EVENT_LOGGING higher
-	   * if you want them
-	   */
-	  if (MC_EVENT_LOGGING > 1)
-	    {
-              /* *INDENT-OFF* */
-	      ELOG_TYPE_DECLARE (e) =
-                {
-                  .format = "tx-massert: peer %s global seq %u",
-                  .format_args = "T4i4",
-                };
-              /* *INDENT-ON* */
-	      struct
-	      {
-		u32 peer, global_sequence;
-	      } *ed;
-	      ed = ELOG_DATA (mcm->elog_main, e);
-	      ed->peer = elog_id_for_peer_id (mcm, mp->peer_id.as_u64);
-	      ed->global_sequence = mp->global_sequence;
-	    }
-
-	  mc_byte_swap_msg_master_assert (mp);
-
-	  error =
-	    mcm->transport.tx_buffer (mcm->transport.opaque,
-				      MC_TRANSPORT_MASTERSHIP, bi);
-	  if (error)
-	    clib_error_report (error);
-	}
-
-      vlib_process_wait_for_event_or_clock (vm, 1.0);
-      event_type = vlib_process_get_events (vm, /* no event data */ 0);
-
-      switch (event_type)
-	{
-	case ~0:
-	  if (!is_master && timeouts++ > 2)
-	    {
-	      mcm->relay_state = MC_RELAY_STATE_MASTER;
-	      mcm->relay_master_peer_id =
-		mcm->transport.our_ack_peer_id.as_u64;
-	      if (MC_EVENT_LOGGING)
-		{
-		  ELOG_TYPE (e, "become master (was maybe_master)");
-		  ELOG (mcm->elog_main, e, 0);
-		}
-	      return;
-	    }
-	  break;
-
-	case MC_RELAY_STATE_SLAVE:
-	  mcm->relay_state = MC_RELAY_STATE_SLAVE;
-	  if (MC_EVENT_LOGGING && mcm->relay_state != MC_RELAY_STATE_SLAVE)
-	    {
-	      ELOG_TYPE (e, "become slave (was maybe_master)");
-	      ELOG (mcm->elog_main, e, 0);
-	    }
-	  return;
-	}
-    }
-}
-
-static void
-this_node_slave (mc_main_t * mcm)
-{
-  vlib_main_t *vm = mcm->vlib_main;
-  uword event_type;
-  int timeouts = 0;
-
-  if (MC_EVENT_LOGGING)
-    {
-      ELOG_TYPE (e, "become slave");
-      ELOG (mcm->elog_main, e, 0);
-    }
-
-  while (1)
-    {
-      vlib_process_wait_for_event_or_clock (vm, 1.0);
-      event_type = vlib_process_get_events (vm, /* no event data */ 0);
-
-      switch (event_type)
-	{
-	case ~0:
-	  if (timeouts++ > 2)
-	    {
-	      mcm->relay_state = MC_RELAY_STATE_NEGOTIATE;
-	      mcm->relay_master_peer_id = ~0ULL;
-	      if (MC_EVENT_LOGGING)
-		{
-		  ELOG_TYPE (e, "timeouts; negoitate mastership");
-		  ELOG (mcm->elog_main, e, 0);
-		}
-	      return;
-	    }
-	  break;
-
-	case MC_RELAY_STATE_SLAVE:
-	  mcm->relay_state = MC_RELAY_STATE_SLAVE;
-	  timeouts = 0;
-	  break;
-	}
-    }
-}
-
-static uword
-mc_mastership_process (vlib_main_t * vm,
-		       vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  mc_main_t *mcm = mc_node_get_main (node);
-
-  while (1)
-    {
-      switch (mcm->relay_state)
-	{
-	case MC_RELAY_STATE_NEGOTIATE:
-	case MC_RELAY_STATE_MASTER:
-	  this_node_maybe_master (mcm);
-	  break;
-
-	case MC_RELAY_STATE_SLAVE:
-	  this_node_slave (mcm);
-	  break;
-	}
-    }
-  return 0;			/* not likely */
-}
-
-void
-mc_enable_disable_mastership (mc_main_t * mcm, int we_can_be_master)
-{
-  if (we_can_be_master != mcm->we_can_be_relay_master)
-    {
-      mcm->we_can_be_relay_master = we_can_be_master;
-      vlib_process_signal_event (mcm->vlib_main,
-				 mcm->mastership_process,
-				 MC_RELAY_STATE_NEGOTIATE, 0);
-    }
-}
-
-void
-mc_msg_master_assert_handler (mc_main_t * mcm, mc_msg_master_assert_t * mp,
-			      u32 buffer_index)
-{
-  mc_peer_id_t his_peer_id, our_peer_id;
-  i32 seq_cmp_result;
-  u8 signal_slave = 0;
-  u8 update_global_sequence = 0;
-
-  mc_byte_swap_msg_master_assert (mp);
-
-  his_peer_id = mp->peer_id;
-  our_peer_id = mcm->transport.our_ack_peer_id;
-
-  /* compare the incoming global sequence with ours */
-  seq_cmp_result = mc_seq_cmp (mp->global_sequence,
-			       mcm->relay_global_sequence);
-
-  /* If the sender has a lower peer id and the sender's sequence >=
-     our global sequence, we become a slave.  Otherwise we are master. */
-  if (mc_peer_id_compare (his_peer_id, our_peer_id) < 0
-      && seq_cmp_result >= 0)
-    {
-      vlib_process_signal_event (mcm->vlib_main,
-				 mcm->mastership_process,
-				 MC_RELAY_STATE_SLAVE, 0);
-      signal_slave = 1;
-    }
-
-  /* Update our global sequence. */
-  if (seq_cmp_result > 0)
-    {
-      mcm->relay_global_sequence = mp->global_sequence;
-      update_global_sequence = 1;
-    }
-
-  {
-    uword *q = mhash_get (&mcm->mastership_peer_index_by_id, &his_peer_id);
-    mc_mastership_peer_t *p;
-
-    if (q)
-      p = vec_elt_at_index (mcm->mastership_peers, q[0]);
-    else
-      {
-	vec_add2 (mcm->mastership_peers, p, 1);
-	p->peer_id = his_peer_id;
-	mhash_set (&mcm->mastership_peer_index_by_id, &p->peer_id,
-		   p - mcm->mastership_peers,
-		   /* old_value */ 0);
-      }
-    p->time_last_master_assert_received = vlib_time_now (mcm->vlib_main);
-  }
-
-  /*
-   * these messages clog the event log, set MC_EVENT_LOGGING higher
-   * if you want them.
-   */
-  if (MC_EVENT_LOGGING > 1)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (e) =
-        {
-          .format = "rx-massert: peer %s global seq %u upd %d slave %d",
-          .format_args = "T4i4i1i1",
-        };
-      /* *INDENT-ON* */
-
-      struct
-      {
-	u32 peer;
-	u32 global_sequence;
-	u8 update_sequence;
-	u8 slave;
-      } *ed;
-      ed = ELOG_DATA (mcm->elog_main, e);
-      ed->peer = elog_id_for_peer_id (mcm, his_peer_id.as_u64);
-      ed->global_sequence = mp->global_sequence;
-      ed->update_sequence = update_global_sequence;
-      ed->slave = signal_slave;
-    }
-}
-
-static void
-mc_serialize_init (mc_main_t * mcm)
-{
-  mc_serialize_msg_t *m;
-  vlib_main_t *vm = vlib_get_main ();
-
-  mcm->global_msg_index_by_name
-    = hash_create_string ( /* elts */ 0, sizeof (uword));
-
-  m = vm->mc_msg_registrations;
-
-  while (m)
-    {
-      m->global_index = vec_len (mcm->global_msgs);
-      hash_set_mem (mcm->global_msg_index_by_name, m->name, m->global_index);
-      vec_add1 (mcm->global_msgs, m);
-      m = m->next_registration;
-    }
-}
-
-clib_error_t *
-mc_serialize_va (mc_main_t * mc,
-		 u32 stream_index,
-		 u32 multiple_messages_per_vlib_buffer,
-		 mc_serialize_msg_t * msg, va_list * va)
-{
-  mc_stream_t *s;
-  clib_error_t *error;
-  serialize_main_t *m = &mc->serialize_mains[VLIB_TX];
-  vlib_serialize_buffer_main_t *sbm = &mc->serialize_buffer_mains[VLIB_TX];
-  u32 bi, n_before, n_after, n_total, n_this_msg;
-  u32 si, gi;
-
-  if (!sbm->vlib_main)
-    {
-      sbm->tx.max_n_data_bytes_per_chain = 4096;
-      sbm->tx.free_list_index = VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX;
-    }
-
-  if (sbm->first_buffer == 0)
-    serialize_open_vlib_buffer (m, mc->vlib_main, sbm);
-
-  n_before = serialize_vlib_buffer_n_bytes (m);
-
-  s = mc_stream_by_index (mc, stream_index);
-  gi = msg->global_index;
-  ASSERT (msg == vec_elt (mc->global_msgs, gi));
-
-  si = ~0;
-  if (gi < vec_len (s->stream_msg_index_by_global_index))
-    si = s->stream_msg_index_by_global_index[gi];
-
-  serialize_likely_small_unsigned_integer (m, si);
-
-  /* For first time message is sent, use name to identify message. */
-  if (si == ~0 || MSG_ID_DEBUG)
-    serialize_cstring (m, msg->name);
-
-  if (MSG_ID_DEBUG && MC_EVENT_LOGGING > 0)
-    {
-      /* *INDENT-OFF* */
-      ELOG_TYPE_DECLARE (e) =
-        {
-          .format = "serialize-msg: %s index %d",
-          .format_args = "T4i4",
-        };
-      /* *INDENT-ON* */
-      struct
-      {
-	u32 c[2];
-      } *ed;
-      ed = ELOG_DATA (mc->elog_main, e);
-      ed->c[0] = elog_id_for_msg_name (mc, msg->name);
-      ed->c[1] = si;
-    }
-
-  error = va_serialize (m, va);
-
-  n_after = serialize_vlib_buffer_n_bytes (m);
-  n_this_msg = n_after - n_before;
-  n_total = n_after + sizeof (mc_msg_user_request_t);
-
-  /* For max message size ignore first message where string name is sent. */
-  if (si != ~0)
-    msg->max_n_bytes_serialized =
-      clib_max (msg->max_n_bytes_serialized, n_this_msg);
-
-  if (!multiple_messages_per_vlib_buffer
-      || si == ~0
-      || n_total + msg->max_n_bytes_serialized >
-      mc->transport.max_packet_size)
-    {
-      bi = serialize_close_vlib_buffer (m);
-      sbm->first_buffer = 0;
-      if (!error)
-	mc_stream_send (mc, stream_index, bi);
-      else if (bi != ~0)
-	vlib_buffer_free_one (mc->vlib_main, bi);
-    }
-
-  return error;
-}
-
-clib_error_t *
-mc_serialize_internal (mc_main_t * mc,
-		       u32 stream_index,
-		       u32 multiple_messages_per_vlib_buffer,
-		       mc_serialize_msg_t * msg, ...)
-{
-  vlib_main_t *vm = mc->vlib_main;
-  va_list va;
-  clib_error_t *error;
-
-  if (stream_index == ~0)
-    {
-      if (vm->mc_main && vm->mc_stream_index == ~0)
-	vlib_current_process_wait_for_one_time_event_vector
-	  (vm, &vm->procs_waiting_for_mc_stream_join);
-      stream_index = vm->mc_stream_index;
-    }
-
-  va_start (va, msg);
-  error = mc_serialize_va (mc, stream_index,
-			   multiple_messages_per_vlib_buffer, msg, &va);
-  va_end (va);
-  return error;
-}
-
-uword
-mc_unserialize_message (mc_main_t * mcm,
-			mc_stream_t * s, serialize_main_t * m)
-{
-  mc_serialize_stream_msg_t *sm;
-  u32 gi, si;
-
-  si = unserialize_likely_small_unsigned_integer (m);
-
-  if (!(si == ~0 || MSG_ID_DEBUG))
-    {
-      sm = vec_elt_at_index (s->stream_msgs, si);
-      gi = sm->global_index;
-    }
-  else
-    {
-      char *name;
-
-      unserialize_cstring (m, &name);
-
-      if (MSG_ID_DEBUG && MC_EVENT_LOGGING > 0)
-	{
-          /* *INDENT-OFF* */
-	  ELOG_TYPE_DECLARE (e) =
-            {
-              .format = "unserialize-msg: %s rx index %d",
-              .format_args = "T4i4",
-            };
-          /* *INDENT-ON* */
-	  struct
-	  {
-	    u32 c[2];
-	  } *ed;
-	  ed = ELOG_DATA (mcm->elog_main, e);
-	  ed->c[0] = elog_id_for_msg_name (mcm, name);
-	  ed->c[1] = si;
-	}
-
-      {
-	uword *p = hash_get_mem (mcm->global_msg_index_by_name, name);
-	gi = p ? p[0] : ~0;
-      }
-
-      /* Unknown message? */
-      if (gi == ~0)
-	{
-	  vec_free (name);
-	  goto done;
-	}
-
-      vec_validate_init_empty (s->stream_msg_index_by_global_index, gi, ~0);
-      si = s->stream_msg_index_by_global_index[gi];
-
-      /* Stream local index unknown?  Create it. */
-      if (si == ~0)
-	{
-	  vec_add2 (s->stream_msgs, sm, 1);
-
-	  si = sm - s->stream_msgs;
-	  sm->global_index = gi;
-	  s->stream_msg_index_by_global_index[gi] = si;
-
-	  if (MC_EVENT_LOGGING > 0)
-	    {
-              /* *INDENT-OFF* */
-	      ELOG_TYPE_DECLARE (e) =
-                {
-                  .format = "msg-bind: stream %d %s to index %d",
-                  .format_args = "i4T4i4",
-                };
-              /* *INDENT-ON* */
-	      struct
-	      {
-		u32 c[3];
-	      } *ed;
-	      ed = ELOG_DATA (mcm->elog_main, e);
-	      ed->c[0] = s->index;
-	      ed->c[1] = elog_id_for_msg_name (mcm, name);
-	      ed->c[2] = si;
-	    }
-	}
-      else
-	{
-	  sm = vec_elt_at_index (s->stream_msgs, si);
-	  if (gi != sm->global_index && MC_EVENT_LOGGING > 0)
-	    {
-              /* *INDENT-OFF* */
-	      ELOG_TYPE_DECLARE (e) =
-                {
-                  .format = "msg-id-ERROR: %s index %d expected %d",
-                  .format_args = "T4i4i4",
-                };
-              /* *INDENT-ON* */
-	      struct
-	      {
-		u32 c[3];
-	      } *ed;
-	      ed = ELOG_DATA (mcm->elog_main, e);
-	      ed->c[0] = elog_id_for_msg_name (mcm, name);
-	      ed->c[1] = si;
-	      ed->c[2] = ~0;
-	      if (sm->global_index <
-		  vec_len (s->stream_msg_index_by_global_index))
-		ed->c[2] =
-		  s->stream_msg_index_by_global_index[sm->global_index];
-	    }
-	}
-
-      vec_free (name);
-    }
-
-  if (gi != ~0)
-    {
-      mc_serialize_msg_t *msg;
-      msg = vec_elt (mcm->global_msgs, gi);
-      unserialize (m, msg->unserialize, mcm);
-    }
-
-done:
-  return gi != ~0;
-}
-
-void
-mc_unserialize_internal (mc_main_t * mcm, u32 stream_and_buffer_index)
-{
-  vlib_main_t *vm = mcm->vlib_main;
-  serialize_main_t *m = &mcm->serialize_mains[VLIB_RX];
-  vlib_serialize_buffer_main_t *sbm = &mcm->serialize_buffer_mains[VLIB_RX];
-  mc_stream_and_buffer_t *sb;
-  mc_stream_t *stream;
-  u32 buffer_index;
-
-  sb =
-    pool_elt_at_index (mcm->mc_unserialize_stream_and_buffers,
-		       stream_and_buffer_index);
-  buffer_index = sb->buffer_index;
-  stream = vec_elt_at_index (mcm->stream_vector, sb->stream_index);
-  pool_put (mcm->mc_unserialize_stream_and_buffers, sb);
-
-  if (stream->config.save_snapshot)
-    {
-      u32 n_bytes = vlib_buffer_index_length_in_chain (vm, buffer_index);
-      static u8 *contents;
-      vec_reset_length (contents);
-      vec_validate (contents, n_bytes - 1);
-      vlib_buffer_contents (vm, buffer_index, contents);
-      stream->config.save_snapshot (mcm, /* is_catchup */ 0, contents,
-				    n_bytes);
-    }
-
-  ASSERT (vlib_in_process_context (vm));
-
-  unserialize_open_vlib_buffer (m, vm, sbm);
-
-  clib_fifo_add1 (sbm->rx.buffer_fifo, buffer_index);
-
-  while (unserialize_vlib_buffer_n_bytes (m) > 0)
-    mc_unserialize_message (mcm, stream, m);
-
-  /* Frees buffer. */
-  unserialize_close_vlib_buffer (m);
-}
-
-void
-mc_unserialize (mc_main_t * mcm, mc_stream_t * s, u32 buffer_index)
-{
-  vlib_main_t *vm = mcm->vlib_main;
-  mc_stream_and_buffer_t *sb;
-  pool_get (mcm->mc_unserialize_stream_and_buffers, sb);
-  sb->stream_index = s->index;
-  sb->buffer_index = buffer_index;
-  vlib_process_signal_event (vm, mcm->unserialize_process,
-			     EVENT_MC_UNSERIALIZE_BUFFER,
-			     sb - mcm->mc_unserialize_stream_and_buffers);
-}
-
-static uword
-mc_unserialize_process (vlib_main_t * vm,
-			vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  mc_main_t *mcm = mc_node_get_main (node);
-  uword event_type, *event_data = 0;
-  int i;
-
-  while (1)
-    {
-      if (event_data)
-	_vec_len (event_data) = 0;
-
-      vlib_process_wait_for_event (vm);
-      event_type = vlib_process_get_events (vm, &event_data);
-      switch (event_type)
-	{
-	case EVENT_MC_UNSERIALIZE_BUFFER:
-	  for (i = 0; i < vec_len (event_data); i++)
-	    mc_unserialize_internal (mcm, event_data[i]);
-	  break;
-
-	case EVENT_MC_UNSERIALIZE_CATCHUP:
-	  for (i = 0; i < vec_len (event_data); i++)
-	    {
-	      u8 *mp = uword_to_pointer (event_data[i], u8 *);
-	      perform_catchup (mcm, (void *) mp);
-	      vec_free (mp);
-	    }
-	  break;
-
-	default:
-	  break;
-	}
-    }
-
-  return 0;			/* not likely */
-}
-
-void
-serialize_mc_main (serialize_main_t * m, va_list * va)
-{
-  mc_main_t *mcm = va_arg (*va, mc_main_t *);
-  mc_stream_t *s;
-  mc_serialize_stream_msg_t *sm;
-  mc_serialize_msg_t *msg;
-
-  serialize_integer (m, vec_len (mcm->stream_vector), sizeof (u32));
-  vec_foreach (s, mcm->stream_vector)
-  {
-    /* Stream name. */
-    serialize_cstring (m, s->config.name);
-
-    /* Serialize global names for all sent messages. */
-    serialize_integer (m, vec_len (s->stream_msgs), sizeof (u32));
-    vec_foreach (sm, s->stream_msgs)
-    {
-      msg = vec_elt (mcm->global_msgs, sm->global_index);
-      serialize_cstring (m, msg->name);
-    }
-  }
-}
-
-void
-unserialize_mc_main (serialize_main_t * m, va_list * va)
-{
-  mc_main_t *mcm = va_arg (*va, mc_main_t *);
-  u32 i, n_streams, n_stream_msgs;
-  char *name;
-  mc_stream_t *s;
-  mc_serialize_stream_msg_t *sm;
-
-  unserialize_integer (m, &n_streams, sizeof (u32));
-  for (i = 0; i < n_streams; i++)
-    {
-      unserialize_cstring (m, &name);
-      if (i != MC_STREAM_INDEX_INTERNAL && !mc_stream_by_name (mcm, name))
-	{
-	  vec_validate (mcm->stream_vector, i);
-	  s = vec_elt_at_index (mcm->stream_vector, i);
-	  mc_stream_init (s);
-	  s->index = s - mcm->stream_vector;
-	  s->config.name = name;
-	  s->state = MC_STREAM_STATE_name_known;
-	  hash_set_mem (mcm->stream_index_by_name, s->config.name, s->index);
-	}
-      else
-	vec_free (name);
-
-      s = vec_elt_at_index (mcm->stream_vector, i);
-
-      vec_free (s->stream_msgs);
-      vec_free (s->stream_msg_index_by_global_index);
-
-      unserialize_integer (m, &n_stream_msgs, sizeof (u32));
-      vec_resize (s->stream_msgs, n_stream_msgs);
-      vec_foreach (sm, s->stream_msgs)
-      {
-	uword *p;
-	u32 si, gi;
-
-	unserialize_cstring (m, &name);
-	p = hash_get (mcm->global_msg_index_by_name, name);
-	gi = p ? p[0] : ~0;
-	si = sm - s->stream_msgs;
-
-	if (MC_EVENT_LOGGING > 0)
-	  {
-            /* *INDENT-OFF* */
-	    ELOG_TYPE_DECLARE (e) =
-              {
-                .format = "catchup-bind: %s to %d global index %d stream %d",
-                .format_args = "T4i4i4i4",
-              };
-            /* *INDENT-ON* */
-
-	    struct
-	    {
-	      u32 c[4];
-	    } *ed;
-	    ed = ELOG_DATA (mcm->elog_main, e);
-	    ed->c[0] = elog_id_for_msg_name (mcm, name);
-	    ed->c[1] = si;
-	    ed->c[2] = gi;
-	    ed->c[3] = s->index;
-	  }
-
-	vec_free (name);
-
-	sm->global_index = gi;
-	if (gi != ~0)
-	  {
-	    vec_validate_init_empty (s->stream_msg_index_by_global_index,
-				     gi, ~0);
-	    s->stream_msg_index_by_global_index[gi] = si;
-	  }
-      }
-    }
-}
-
-void
-mc_main_init (mc_main_t * mcm, char *tag)
-{
-  vlib_main_t *vm = vlib_get_main ();
-
-  mcm->vlib_main = vm;
-  mcm->elog_main = &vm->elog_main;
-
-  mcm->relay_master_peer_id = ~0ULL;
-  mcm->relay_state = MC_RELAY_STATE_NEGOTIATE;
-
-  mcm->stream_index_by_name
-    = hash_create_string ( /* elts */ 0, /* value size */ sizeof (uword));
-
-  {
-    vlib_node_registration_t r;
-
-    memset (&r, 0, sizeof (r));
-
-    r.type = VLIB_NODE_TYPE_PROCESS;
-
-    /* Point runtime data to main instance. */
-    r.runtime_data = &mcm;
-    r.runtime_data_bytes = sizeof (&mcm);
-
-    r.name = (char *) format (0, "mc-mastership-%s", tag);
-    r.function = mc_mastership_process;
-    mcm->mastership_process = vlib_register_node (vm, &r);
-
-    r.name = (char *) format (0, "mc-join-ager-%s", tag);
-    r.function = mc_join_ager_process;
-    mcm->join_ager_process = vlib_register_node (vm, &r);
-
-    r.name = (char *) format (0, "mc-retry-%s", tag);
-    r.function = mc_retry_process;
-    mcm->retry_process = vlib_register_node (vm, &r);
-
-    r.name = (char *) format (0, "mc-catchup-%s", tag);
-    r.function = mc_catchup_process;
-    mcm->catchup_process = vlib_register_node (vm, &r);
-
-    r.name = (char *) format (0, "mc-unserialize-%s", tag);
-    r.function = mc_unserialize_process;
-    mcm->unserialize_process = vlib_register_node (vm, &r);
-  }
-
-  if (MC_EVENT_LOGGING > 0)
-    mhash_init (&mcm->elog_id_by_peer_id, sizeof (uword),
-		sizeof (mc_peer_id_t));
-
-  mhash_init (&mcm->mastership_peer_index_by_id, sizeof (uword),
-	      sizeof (mc_peer_id_t));
-  mc_serialize_init (mcm);
-}
-
-static u8 *
-format_mc_relay_state (u8 * s, va_list * args)
-{
-  mc_relay_state_t state = va_arg (*args, mc_relay_state_t);
-  char *t = 0;
-  switch (state)
-    {
-    case MC_RELAY_STATE_NEGOTIATE:
-      t = "negotiate";
-      break;
-    case MC_RELAY_STATE_MASTER:
-      t = "master";
-      break;
-    case MC_RELAY_STATE_SLAVE:
-      t = "slave";
-      break;
-    default:
-      return format (s, "unknown 0x%x", state);
-    }
-
-  return format (s, "%s", t);
-}
-
-static u8 *
-format_mc_stream_state (u8 * s, va_list * args)
-{
-  mc_stream_state_t state = va_arg (*args, mc_stream_state_t);
-  char *t = 0;
-  switch (state)
-    {
-#define _(f) case MC_STREAM_STATE_##f: t = #f; break;
-      foreach_mc_stream_state
-#undef _
-    default:
-      return format (s, "unknown 0x%x", state);
-    }
-
-  return format (s, "%s", t);
-}
-
-static int
-mc_peer_comp (void *a1, void *a2)
-{
-  mc_stream_peer_t *p1 = a1;
-  mc_stream_peer_t *p2 = a2;
-
-  return mc_peer_id_compare (p1->id, p2->id);
-}
-
-u8 *
-format_mc_main (u8 * s, va_list * args)
-{
-  mc_main_t *mcm = va_arg (*args, mc_main_t *);
-  mc_stream_t *t;
-  mc_stream_peer_t *p, *ps;
-  uword indent = format_get_indent (s);
-
-  s = format (s, "MC state %U, %d streams joined, global sequence 0x%x",
-	      format_mc_relay_state, mcm->relay_state,
-	      vec_len (mcm->stream_vector), mcm->relay_global_sequence);
-
-  {
-    mc_mastership_peer_t *mp;
-    f64 now = vlib_time_now (mcm->vlib_main);
-    s = format (s, "\n%UMost recent mastership peers:",
-		format_white_space, indent + 2);
-    vec_foreach (mp, mcm->mastership_peers)
-    {
-      s = format (s, "\n%U%-30U%.4e",
-		  format_white_space, indent + 4,
-		  mcm->transport.format_peer_id, mp->peer_id,
-		  now - mp->time_last_master_assert_received);
-    }
-  }
-
-  vec_foreach (t, mcm->stream_vector)
-  {
-    s = format (s, "\n%Ustream `%s' index %d",
-		format_white_space, indent + 2, t->config.name, t->index);
-
-    s = format (s, "\n%Ustate %U",
-		format_white_space, indent + 4,
-		format_mc_stream_state, t->state);
-
-    s =
-      format (s,
-	      "\n%Uretries: interval %.0f sec, limit %d, pool elts %d, %Ld sent",
-	      format_white_space, indent + 4, t->config.retry_interval,
-	      t->config.retry_limit, pool_elts (t->retry_pool),
-	      t->stats.n_retries - t->stats_last_clear.n_retries);
-
-    s = format (s, "\n%U%Ld/%Ld user requests sent/received",
-		format_white_space, indent + 4,
-		t->user_requests_sent, t->user_requests_received);
-
-    s = format (s, "\n%U%d peers, local/global sequence 0x%x/0x%x",
-		format_white_space, indent + 4,
-		pool_elts (t->peers),
-		t->our_local_sequence, t->last_global_sequence_processed);
-
-    ps = 0;
-    /* *INDENT-OFF* */
-    pool_foreach (p, t->peers,
-    ({
-      if (clib_bitmap_get (t->all_peer_bitmap, p - t->peers))
-        vec_add1 (ps, p[0]);
-    }));
-    /* *INDENT-ON* */
-    vec_sort_with_function (ps, mc_peer_comp);
-    s = format (s, "\n%U%=30s%10s%16s%16s",
-		format_white_space, indent + 6,
-		"Peer", "Last seq", "Retries", "Future");
-
-    vec_foreach (p, ps)
-    {
-      s = format (s, "\n%U%-30U0x%08x%16Ld%16Ld%s",
-		  format_white_space, indent + 6,
-		  mcm->transport.format_peer_id, p->id.as_u64,
-		  p->last_sequence_received,
-		  p->stats.n_msgs_from_past -
-		  p->stats_last_clear.n_msgs_from_past,
-		  p->stats.n_msgs_from_future -
-		  p->stats_last_clear.n_msgs_from_future,
-		  (mcm->transport.our_ack_peer_id.as_u64 ==
-		   p->id.as_u64 ? " (self)" : ""));
-    }
-    vec_free (ps);
-  }
-
-  return s;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/mc.h b/vlib/vlib/mc.h
deleted file mode 100644
index dc95b0e9..00000000
--- a/vlib/vlib/mc.h
+++ /dev/null
@@ -1,687 +0,0 @@
-/*
- * mc.h: vlib reliable sequenced multicast distributed applications
- *
- * Copyright (c) 2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_vlib_mc_h
-#define included_vlib_mc_h
-
-#include <vppinfra/elog.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/mhash.h>
-#include <vlib/node.h>
-
-#ifndef MC_EVENT_LOGGING
-#define MC_EVENT_LOGGING 1
-#endif
-
-always_inline uword
-mc_need_byte_swap (void)
-{
-  return CLIB_ARCH_IS_LITTLE_ENDIAN;
-}
-
-/*
- * Used to uniquely identify hosts.
- * For IP4 this would be ip4_address plus tcp/udp port.
- */
-typedef union
-{
-  u8 as_u8[8];
-  u64 as_u64;
-} mc_peer_id_t;
-
-always_inline mc_peer_id_t
-mc_byte_swap_peer_id (mc_peer_id_t i)
-{
-  /* Peer id is already in network byte order. */
-  return i;
-}
-
-always_inline int
-mc_peer_id_compare (mc_peer_id_t a, mc_peer_id_t b)
-{
-  return memcmp (a.as_u8, b.as_u8, sizeof (a.as_u8));
-}
-
-/* Assert mastership.  Lowest peer_id amount all peers wins mastership.
-   Only sent/received over mastership channel (MC_TRANSPORT_MASTERSHIP).
-   So, we don't need a message opcode. */
-typedef CLIB_PACKED (struct
-		     {
-		     /* Peer id asserting mastership. */
-		     mc_peer_id_t peer_id;
-		     /* Global sequence number asserted. */
-		     u32 global_sequence;}) mc_msg_master_assert_t;
-
-always_inline void
-mc_byte_swap_msg_master_assert (mc_msg_master_assert_t * r)
-{
-  if (mc_need_byte_swap ())
-    {
-      r->peer_id = mc_byte_swap_peer_id (r->peer_id);
-      r->global_sequence = clib_byte_swap_u32 (r->global_sequence);
-    }
-}
-
-#define foreach_mc_msg_type			\
-  _ (master_assert)				\
-  _ (join_or_leave_request)			\
-  _ (join_reply)				\
-  _ (user_request)				\
-  _ (user_ack)					\
-  _ (catchup_request)				\
-  _ (catchup_reply)
-
-typedef enum
-{
-#define _(f) MC_MSG_TYPE_##f,
-  foreach_mc_msg_type
-#undef _
-} mc_relay_msg_type_t;
-
-/* Request to join a given stream.  Multicast over MC_TRANSPORT_JOIN. */
-typedef CLIB_PACKED (struct
-		     {
-mc_peer_id_t peer_id; mc_relay_msg_type_t type:32;
-		     /* MC_MSG_TYPE_join_or_leave_request */
-		     /* Stream to join or leave. */
-		     u32 stream_index;
-		     /* join = 1, leave = 0 */
-		     u8 is_join;}) mc_msg_join_or_leave_request_t;
-
-always_inline void
-mc_byte_swap_msg_join_or_leave_request (mc_msg_join_or_leave_request_t * r)
-{
-  if (mc_need_byte_swap ())
-    {
-      r->peer_id = mc_byte_swap_peer_id (r->peer_id);
-      r->type = clib_byte_swap_u32 (r->type);
-      r->stream_index = clib_byte_swap_u32 (r->stream_index);
-    }
-}
-
-/* Join reply.  Multicast over MC_TRANSPORT_JOIN. */
-typedef CLIB_PACKED (struct
-		     {
-mc_peer_id_t peer_id; mc_relay_msg_type_t type:32;
-		     /* MC_MSG_TYPE_join_reply */
-		     u32 stream_index;
-		     /* Peer ID to contact to catchup with this stream. */
-		     mc_peer_id_t catchup_peer_id;}) mc_msg_join_reply_t;
-
-always_inline void
-mc_byte_swap_msg_join_reply (mc_msg_join_reply_t * r)
-{
-  if (mc_need_byte_swap ())
-    {
-      r->peer_id = mc_byte_swap_peer_id (r->peer_id);
-      r->type = clib_byte_swap_u32 (r->type);
-      r->stream_index = clib_byte_swap_u32 (r->stream_index);
-      r->catchup_peer_id = mc_byte_swap_peer_id (r->catchup_peer_id);
-    }
-}
-
-/* Generic (application) request.  Multicast over MC_TRANSPORT_USER_REQUEST_TO_RELAY and then
-   relayed by relay master after filling in global sequence number. */
-typedef CLIB_PACKED (struct
-		     {
-		     mc_peer_id_t peer_id; u32 stream_index;
-		     /* Global sequence number as filled in by relay master. */
-		     u32 global_sequence;
-		     /* Local sequence number as filled in by peer sending message. */
-		     u32 local_sequence;
-		     /* Size of request data. */
-		     u32 n_data_bytes;
-		     /* Opaque request data. */
-		     u8 data[0];}) mc_msg_user_request_t;
-
-always_inline void
-mc_byte_swap_msg_user_request (mc_msg_user_request_t * r)
-{
-  if (mc_need_byte_swap ())
-    {
-      r->peer_id = mc_byte_swap_peer_id (r->peer_id);
-      r->stream_index = clib_byte_swap_u32 (r->stream_index);
-      r->global_sequence = clib_byte_swap_u32 (r->global_sequence);
-      r->local_sequence = clib_byte_swap_u32 (r->local_sequence);
-      r->n_data_bytes = clib_byte_swap_u32 (r->n_data_bytes);
-    }
-}
-
-/* Sent unicast over ACK channel. */
-typedef CLIB_PACKED (struct
-		     {
-		     mc_peer_id_t peer_id;
-		     u32 global_sequence; u32 stream_index;
-		     u32 local_sequence;
-		     i32 seq_cmp_result;}) mc_msg_user_ack_t;
-
-always_inline void
-mc_byte_swap_msg_user_ack (mc_msg_user_ack_t * r)
-{
-  if (mc_need_byte_swap ())
-    {
-      r->peer_id = mc_byte_swap_peer_id (r->peer_id);
-      r->stream_index = clib_byte_swap_u32 (r->stream_index);
-      r->global_sequence = clib_byte_swap_u32 (r->global_sequence);
-      r->local_sequence = clib_byte_swap_u32 (r->local_sequence);
-      r->seq_cmp_result = clib_byte_swap_i32 (r->seq_cmp_result);
-    }
-}
-
-/* Sent/received unicast over catchup channel (e.g. using TCP). */
-typedef CLIB_PACKED (struct
-		     {
-		     mc_peer_id_t peer_id;
-		     u32 stream_index;}) mc_msg_catchup_request_t;
-
-always_inline void
-mc_byte_swap_msg_catchup_request (mc_msg_catchup_request_t * r)
-{
-  if (mc_need_byte_swap ())
-    {
-      r->peer_id = mc_byte_swap_peer_id (r->peer_id);
-      r->stream_index = clib_byte_swap_u32 (r->stream_index);
-    }
-}
-
-/* Sent/received unicast over catchup channel. */
-typedef CLIB_PACKED (struct
-		     {
-		     mc_peer_id_t peer_id; u32 stream_index;
-		     /* Last global sequence number included in catchup data. */
-		     u32 last_global_sequence_included;
-		     /* Size of catchup data. */
-		     u32 n_data_bytes;
-		     /* Catchup data. */
-		     u8 data[0];}) mc_msg_catchup_reply_t;
-
-always_inline void
-mc_byte_swap_msg_catchup_reply (mc_msg_catchup_reply_t * r)
-{
-  if (mc_need_byte_swap ())
-    {
-      r->peer_id = mc_byte_swap_peer_id (r->peer_id);
-      r->stream_index = clib_byte_swap_u32 (r->stream_index);
-      r->last_global_sequence_included =
-	clib_byte_swap_u32 (r->last_global_sequence_included);
-      r->n_data_bytes = clib_byte_swap_u32 (r->n_data_bytes);
-    }
-}
-
-typedef struct _mc_serialize_msg
-{
-  /* Name for this type. */
-  char *name;
-
-  /* Functions to serialize/unserialize data. */
-  serialize_function_t *serialize;
-  serialize_function_t *unserialize;
-
-  /* Maximum message size in bytes when serialized.
-     If zero then this will be set to the largest sent message. */
-  u32 max_n_bytes_serialized;
-
-  /* Opaque to use for first argument to serialize/unserialize function. */
-  u32 opaque;
-
-  /* Index in global message vector. */
-  u32 global_index;
-
-  /* Registration list */
-  struct _mc_serialize_msg *next_registration;
-} mc_serialize_msg_t;
-
-typedef struct
-{
-  /* Index into global message vector. */
-  u32 global_index;
-} mc_serialize_stream_msg_t;
-
-#define MC_SERIALIZE_MSG(x,...)                                 \
-    __VA_ARGS__ mc_serialize_msg_t x;                           \
-static void __mc_serialize_msg_registration_##x (void)          \
-    __attribute__((__constructor__)) ;                          \
-static void __mc_serialize_msg_registration_##x (void)          \
-{                                                               \
-    vlib_main_t * vm = vlib_get_main();                         \
-    x.next_registration = vm->mc_msg_registrations;             \
-    vm->mc_msg_registrations = &x;                              \
-}                                                               \
-__VA_ARGS__ mc_serialize_msg_t x
-
-typedef enum
-{
-  MC_TRANSPORT_MASTERSHIP,
-  MC_TRANSPORT_JOIN,
-  MC_TRANSPORT_USER_REQUEST_TO_RELAY,
-  MC_TRANSPORT_USER_REQUEST_FROM_RELAY,
-  MC_N_TRANSPORT_TYPE,
-} mc_transport_type_t;
-
-typedef struct
-{
-  clib_error_t *(*tx_buffer) (void *opaque, mc_transport_type_t type,
-			      u32 buffer_index);
-
-  clib_error_t *(*tx_ack) (void *opaque, mc_peer_id_t peer_id,
-			   u32 buffer_index);
-
-  /* Returns catchup opaque. */
-    uword (*catchup_request_fun) (void *opaque, u32 stream_index,
-				  mc_peer_id_t catchup_peer_id);
-
-  void (*catchup_send_fun) (void *opaque, uword catchup_opaque,
-			    u8 * data_vector);
-
-  /* Opaque passed to callbacks. */
-  void *opaque;
-
-  mc_peer_id_t our_ack_peer_id;
-  mc_peer_id_t our_catchup_peer_id;
-
-  /* Max packet size (MTU) for this transport.
-     For IP this is interface MTU less IP + UDP header size. */
-  u32 max_packet_size;
-
-  format_function_t *format_peer_id;
-} mc_transport_t;
-
-typedef struct
-{
-  /* Count of messages received from this peer from the past/future
-     (with seq_cmp != 0). */
-  u64 n_msgs_from_past;
-  u64 n_msgs_from_future;
-} mc_stream_peer_stats_t;
-
-typedef struct
-{
-  /* ID of this peer. */
-  mc_peer_id_t id;
-
-  /* The last sequence we received from this peer. */
-  u32 last_sequence_received;
-
-  mc_stream_peer_stats_t stats, stats_last_clear;
-} mc_stream_peer_t;
-
-typedef struct
-{
-  u32 buffer_index;
-
-  /* Cached copy of local sequence number from buffer. */
-  u32 local_sequence;
-
-  /* Number of times this buffer has been sent (retried). */
-  u32 n_retries;
-
-  /* Previous/next retries in doubly-linked list. */
-  u32 prev_index, next_index;
-
-  /* Bitmap of all peers which have acked this msg */
-  uword *unacked_by_peer_bitmap;
-
-  /* Message send or resend time */
-  f64 sent_at;
-} mc_retry_t;
-
-typedef struct
-{
-  /* Number of retries sent for this stream. */
-  u64 n_retries;
-} mc_stream_stats_t;
-
-struct mc_main_t;
-struct mc_stream_t;
-
-typedef struct
-{
-  /* Stream name. */
-  char *name;
-
-  /* Number of outstanding messages. */
-  u32 window_size;
-
-  /* Retry interval, in seconds */
-  f64 retry_interval;
-
-  /* Retry limit */
-  u32 retry_limit;
-
-  /* User rx buffer callback */
-  void (*rx_buffer) (struct mc_main_t * mc_main,
-		     struct mc_stream_t * stream,
-		     mc_peer_id_t peer_id, u32 buffer_index);
-
-  /* User callback to create a snapshot */
-  u8 *(*catchup_snapshot) (struct mc_main_t * mc_main,
-			   u8 * snapshot_vector,
-			   u32 last_global_sequence_included);
-
-  /* User callback to replay a snapshot */
-  void (*catchup) (struct mc_main_t * mc_main,
-		   u8 * snapshot_data, u32 n_snapshot_data_bytes);
-
-  /* Callback to save a snapshot for offline replay */
-  void (*save_snapshot) (struct mc_main_t * mc_main,
-			 u32 is_catchup,
-			 u8 * snapshot_data, u32 n_snapshot_data_bytes);
-
-  /* Called when a peer dies */
-  void (*peer_died) (struct mc_main_t * mc_main,
-		     struct mc_stream_t * stream, mc_peer_id_t peer_id);
-} mc_stream_config_t;
-
-#define foreach_mc_stream_state			\
-  _ (invalid)					\
-  _ (name_known)				\
-  _ (join_in_progress)				\
-  _ (catchup)					\
-  _ (ready)
-
-typedef enum
-{
-#define _(f) MC_STREAM_STATE_##f,
-  foreach_mc_stream_state
-#undef _
-} mc_stream_state_t;
-
-typedef struct mc_stream_t
-{
-  mc_stream_config_t config;
-
-  mc_stream_state_t state;
-
-  /* Index in stream pool. */
-  u32 index;
-
-  /* Stream index 0 is always for MC internal use. */
-#define MC_STREAM_INDEX_INTERNAL 0
-
-  mc_retry_t *retry_pool;
-
-  /* Head and tail index of retry pool. */
-  u32 retry_head_index, retry_tail_index;
-
-  /*
-   * Country club for recently retired messages
-   * If the set of peers is expanding and a new peer
-   * misses a message, we can easily retire the FIFO
-   * element before we even know about the new peer
-   */
-  mc_retry_t *retired_fifo;
-
-  /* Hash mapping local sequence to retry pool index. */
-  uword *retry_index_by_local_sequence;
-
-  /* catch-up fifo of VLIB buffer indices.
-     start recording when catching up. */
-  u32 *catchup_fifo;
-
-  mc_stream_stats_t stats, stats_last_clear;
-
-  /* Peer pool. */
-  mc_stream_peer_t *peers;
-
-  /* Bitmap with ones for all peers in peer pool. */
-  uword *all_peer_bitmap;
-
-  /* Map of 64 bit id to index in stream pool. */
-  mhash_t peer_index_by_id;
-
-  /* Timeout, in case we're alone in the world */
-  f64 join_timeout;
-
-  vlib_one_time_waiting_process_t *procs_waiting_for_join_done;
-
-  vlib_one_time_waiting_process_t *procs_waiting_for_open_window;
-
-  /* Next sequence number to use */
-  u32 our_local_sequence;
-
-  /*
-   * Last global sequence we processed.
-   * When supplying catchup data, we need to tell
-   * the client precisely where to start replaying
-   */
-  u32 last_global_sequence_processed;
-
-  /* Vector of unique messages we've sent on this stream. */
-  mc_serialize_stream_msg_t *stream_msgs;
-
-  /* Vector global message index into per stream message index. */
-  u32 *stream_msg_index_by_global_index;
-
-  /* Hashed by message name. */
-  uword *stream_msg_index_by_name;
-
-  u64 user_requests_sent;
-  u64 user_requests_received;
-} mc_stream_t;
-
-always_inline void
-mc_stream_free (mc_stream_t * s)
-{
-  pool_free (s->retry_pool);
-  hash_free (s->retry_index_by_local_sequence);
-  clib_fifo_free (s->catchup_fifo);
-  pool_free (s->peers);
-  mhash_free (&s->peer_index_by_id);
-  vec_free (s->procs_waiting_for_join_done);
-  vec_free (s->procs_waiting_for_open_window);
-}
-
-always_inline void
-mc_stream_init (mc_stream_t * s)
-{
-  memset (s, 0, sizeof (s[0]));
-  s->retry_head_index = s->retry_tail_index = ~0;
-}
-
-typedef struct
-{
-  u32 stream_index;
-  u32 catchup_opaque;
-  u8 *catchup_snapshot;
-} mc_catchup_process_arg_t;
-
-typedef enum
-{
-  MC_RELAY_STATE_NEGOTIATE,
-  MC_RELAY_STATE_MASTER,
-  MC_RELAY_STATE_SLAVE,
-} mc_relay_state_t;
-
-typedef struct
-{
-  mc_peer_id_t peer_id;
-
-  f64 time_last_master_assert_received;
-} mc_mastership_peer_t;
-
-typedef struct
-{
-  u32 stream_index;
-  u32 buffer_index;
-} mc_stream_and_buffer_t;
-
-typedef struct mc_main_t
-{
-  mc_relay_state_t relay_state;
-
-  /* Mastership */
-  u32 we_can_be_relay_master;
-
-  u64 relay_master_peer_id;
-
-  mc_mastership_peer_t *mastership_peers;
-
-  /* Map of 64 bit id to index in stream pool. */
-  mhash_t mastership_peer_index_by_id;
-
-  /* The transport we're using. */
-  mc_transport_t transport;
-
-  /* Last-used global sequence number. */
-  u32 relay_global_sequence;
-
-  /* Vector of streams. */
-  mc_stream_t *stream_vector;
-
-  /* Hash table mapping stream name to pool index. */
-  uword *stream_index_by_name;
-
-  uword *procs_waiting_for_stream_name_by_name;
-
-  vlib_one_time_waiting_process_t **procs_waiting_for_stream_name_pool;
-
-  int joins_in_progress;
-
-  mc_catchup_process_arg_t *catchup_process_args;
-
-  /* Node indices for mastership, join ager,
-     retry and catchup processes. */
-  u32 mastership_process;
-  u32 join_ager_process;
-  u32 retry_process;
-  u32 catchup_process;
-  u32 unserialize_process;
-
-  /* Global vector of messages. */
-  mc_serialize_msg_t **global_msgs;
-
-  /* Hash table mapping message name to index. */
-  uword *global_msg_index_by_name;
-
-  /* Shared serialize/unserialize main. */
-  serialize_main_t serialize_mains[VLIB_N_RX_TX];
-
-  vlib_serialize_buffer_main_t serialize_buffer_mains[VLIB_N_RX_TX];
-
-  /* Convenience variables */
-  struct vlib_main_t *vlib_main;
-  elog_main_t *elog_main;
-
-  /* Maps 64 bit peer id to elog string table offset for this formatted peer id. */
-  mhash_t elog_id_by_peer_id;
-
-  uword *elog_id_by_msg_name;
-
-  /* For mc_unserialize. */
-  mc_stream_and_buffer_t *mc_unserialize_stream_and_buffers;
-} mc_main_t;
-
-always_inline mc_stream_t *
-mc_stream_by_name (mc_main_t * m, char *name)
-{
-  uword *p = hash_get (m->stream_index_by_name, name);
-  return p ? vec_elt_at_index (m->stream_vector, p[0]) : 0;
-}
-
-always_inline mc_stream_t *
-mc_stream_by_index (mc_main_t * m, u32 i)
-{
-  return i < vec_len (m->stream_vector) ? m->stream_vector + i : 0;
-}
-
-always_inline void
-mc_clear_stream_stats (mc_main_t * m)
-{
-  mc_stream_t *s;
-  mc_stream_peer_t *p;
-  vec_foreach (s, m->stream_vector)
-  {
-    s->stats_last_clear = s->stats;
-      /* *INDENT-OFF* */
-      pool_foreach (p, s->peers, ({
-	p->stats_last_clear = p->stats;
-      }));
-      /* *INDENT-ON* */
-  }
-}
-
-/* Declare all message handlers. */
-#define _(f) void mc_msg_##f##_handler (mc_main_t * mcm, mc_msg_##f##_t * msg, u32 buffer_index);
-foreach_mc_msg_type
-#undef _
-  u32 mc_stream_join (mc_main_t * mcm, mc_stream_config_t *);
-
-void mc_stream_leave (mc_main_t * mcm, u32 stream_index);
-
-void mc_wait_for_stream_ready (mc_main_t * m, char *stream_name);
-
-u32 mc_stream_send (mc_main_t * mcm, u32 stream_index, u32 buffer_index);
-
-void mc_main_init (mc_main_t * mcm, char *tag);
-
-void mc_enable_disable_mastership (mc_main_t * mcm, int we_can_be_master);
-
-void *mc_get_vlib_buffer (struct vlib_main_t *vm, u32 n_bytes,
-			  u32 * bi_return);
-
-format_function_t format_mc_main;
-
-clib_error_t *mc_serialize_internal (mc_main_t * mc,
-				     u32 stream_index,
-				     u32 multiple_messages_per_vlib_buffer,
-				     mc_serialize_msg_t * msg, ...);
-
-clib_error_t *mc_serialize_va (mc_main_t * mc,
-			       u32 stream_index,
-			       u32 multiple_messages_per_vlib_buffer,
-			       mc_serialize_msg_t * msg, va_list * va);
-
-#define mc_serialize_stream(mc,si,msg,args...)			\
-  mc_serialize_internal((mc),(si),(0),(msg),(msg)->serialize,args)
-
-#define mc_serialize(mc,msg,args...)				\
-  mc_serialize_internal((mc),(~0),(0),(msg),(msg)->serialize,args)
-
-#define mc_serialize2(mc,add,msg,args...)				\
-  mc_serialize_internal((mc),(~0),(add),(msg),(msg)->serialize,args)
-
-void mc_unserialize (mc_main_t * mcm, mc_stream_t * s, u32 buffer_index);
-uword mc_unserialize_message (mc_main_t * mcm, mc_stream_t * s,
-			      serialize_main_t * m);
-
-serialize_function_t serialize_mc_main, unserialize_mc_main;
-
-always_inline uword
-mc_max_message_size_in_bytes (mc_main_t * mcm)
-{
-  return mcm->transport.max_packet_size - sizeof (mc_msg_user_request_t);
-}
-
-always_inline word
-mc_serialize_n_bytes_left (mc_main_t * mcm, serialize_main_t * m)
-{
-  return mc_max_message_size_in_bytes (mcm) -
-    serialize_vlib_buffer_n_bytes (m);
-}
-
-void unserialize_mc_stream (serialize_main_t * m, va_list * va);
-void mc_stream_join_process_hold (void);
-
-#endif /* included_vlib_mc_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/node.c b/vlib/vlib/node.c
deleted file mode 100644
index c419a13a..00000000
--- a/vlib/vlib/node.c
+++ /dev/null
@@ -1,631 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * node.c: VLIB processing nodes
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vlib/threads.h>
-
-/* Query node given name. */
-vlib_node_t *
-vlib_get_node_by_name (vlib_main_t * vm, u8 * name)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  uword *p;
-  u8 *key = name;
-  if (!clib_mem_is_heap_object (key))
-    key = format (0, "%s", key);
-  p = hash_get (nm->node_by_name, key);
-  if (key != name)
-    vec_free (key);
-  return p ? vec_elt (nm->nodes, p[0]) : 0;
-}
-
-static void
-node_set_elog_name (vlib_main_t * vm, uword node_index)
-{
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  elog_event_type_t *t;
-
-  t = vec_elt_at_index (vm->node_call_elog_event_types, node_index);
-  vec_free (t->format);
-  t->format = (char *) format (0, "%v-call: %%d%c", n->name, 0);
-
-  t = vec_elt_at_index (vm->node_return_elog_event_types, node_index);
-  vec_free (t->format);
-  t->format = (char *) format (0, "%v-return: %%d%c", n->name, 0);
-
-  n->name_elog_string = elog_string (&vm->elog_main, "%v%c", n->name, 0);
-}
-
-void
-vlib_node_rename (vlib_main_t * vm, u32 node_index, char *fmt, ...)
-{
-  va_list va;
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-
-  va_start (va, fmt);
-  hash_unset (nm->node_by_name, n->name);
-  vec_free (n->name);
-  n->name = va_format (0, fmt, &va);
-  va_end (va);
-  hash_set (nm->node_by_name, n->name, n->index);
-
-  node_set_elog_name (vm, node_index);
-}
-
-static void
-vlib_node_runtime_update (vlib_main_t * vm, u32 node_index, u32 next_index)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_runtime_t *r, *s;
-  vlib_node_t *node, *next_node;
-  vlib_next_frame_t *nf;
-  vlib_pending_frame_t *pf;
-  i32 i, j, n_insert;
-
-  ASSERT (os_get_cpu_number () == 0);
-
-  vlib_worker_thread_barrier_sync (vm);
-
-  node = vec_elt (nm->nodes, node_index);
-  r = vlib_node_get_runtime (vm, node_index);
-
-  n_insert = vec_len (node->next_nodes) - r->n_next_nodes;
-  if (n_insert > 0)
-    {
-      i = r->next_frame_index + r->n_next_nodes;
-      vec_insert (nm->next_frames, n_insert, i);
-
-      /* Initialize newly inserted next frames. */
-      for (j = 0; j < n_insert; j++)
-	vlib_next_frame_init (nm->next_frames + i + j);
-
-      /* Relocate other next frames at higher indices. */
-      for (j = 0; j < vec_len (nm->nodes); j++)
-	{
-	  s = vlib_node_get_runtime (vm, j);
-	  if (j != node_index && s->next_frame_index >= i)
-	    s->next_frame_index += n_insert;
-	}
-
-      /* Pending frames may need to be relocated also. */
-      vec_foreach (pf, nm->pending_frames)
-      {
-	if (pf->next_frame_index != VLIB_PENDING_FRAME_NO_NEXT_FRAME
-	    && pf->next_frame_index >= i)
-	  pf->next_frame_index += n_insert;
-      }
-      /* *INDENT-OFF* */
-      pool_foreach (pf, nm->suspended_process_frames, ({
-	  if (pf->next_frame_index != ~0 && pf->next_frame_index >= i)
-	    pf->next_frame_index += n_insert;
-      }));
-      /* *INDENT-ON* */
-
-      r->n_next_nodes = vec_len (node->next_nodes);
-    }
-
-  /* Set frame's node runtime index. */
-  next_node = vlib_get_node (vm, node->next_nodes[next_index]);
-  nf = nm->next_frames + r->next_frame_index + next_index;
-  nf->node_runtime_index = next_node->runtime_index;
-
-  vlib_worker_thread_node_runtime_update ();
-
-  vlib_worker_thread_barrier_release (vm);
-}
-
-/* Add next node to given node in given slot. */
-uword
-vlib_node_add_next_with_slot (vlib_main_t * vm,
-			      uword node_index,
-			      uword next_node_index, uword slot)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *node, *next;
-  uword *p;
-
-  node = vec_elt (nm->nodes, node_index);
-  next = vec_elt (nm->nodes, next_node_index);
-
-  /* Runtime has to be initialized. */
-  ASSERT (nm->flags & VLIB_NODE_MAIN_RUNTIME_STARTED);
-
-  if ((p = hash_get (node->next_slot_by_node, next_node_index)))
-    {
-      /* Next already exists: slot must match. */
-      if (slot != ~0)
-	ASSERT (slot == p[0]);
-      return p[0];
-    }
-
-  if (slot == ~0)
-    slot = vec_len (node->next_nodes);
-
-  vec_validate_init_empty (node->next_nodes, slot, ~0);
-  vec_validate (node->n_vectors_by_next_node, slot);
-
-  node->next_nodes[slot] = next_node_index;
-  hash_set (node->next_slot_by_node, next_node_index, slot);
-
-  vlib_node_runtime_update (vm, node_index, slot);
-
-  next->prev_node_bitmap = clib_bitmap_ori (next->prev_node_bitmap,
-					    node_index);
-
-  /* Siblings all get same node structure. */
-  {
-    uword sib_node_index, sib_slot;
-    vlib_node_t *sib_node;
-    /* *INDENT-OFF* */
-    clib_bitmap_foreach (sib_node_index, node->sibling_bitmap, ({
-      sib_node = vec_elt (nm->nodes, sib_node_index);
-      if (sib_node != node)
-	{
-	  sib_slot = vlib_node_add_next_with_slot (vm, sib_node_index, next_node_index, slot);
-	  ASSERT (sib_slot == slot);
-	}
-    }));
-    /* *INDENT-ON* */
-  }
-
-  return slot;
-}
-
-/* Add named next node to given node in given slot. */
-uword
-vlib_node_add_named_next_with_slot (vlib_main_t * vm,
-				    uword node, char *name, uword slot)
-{
-  vlib_node_main_t *nm;
-  vlib_node_t *n, *n_next;
-
-  nm = &vm->node_main;
-  n = vlib_get_node (vm, node);
-
-  n_next = vlib_get_node_by_name (vm, (u8 *) name);
-  if (!n_next)
-    {
-      if (nm->flags & VLIB_NODE_MAIN_RUNTIME_STARTED)
-	return ~0;
-
-      if (slot == ~0)
-	slot = clib_max (vec_len (n->next_node_names),
-			 vec_len (n->next_nodes));
-      vec_validate (n->next_node_names, slot);
-      n->next_node_names[slot] = name;
-      return slot;
-    }
-
-  return vlib_node_add_next_with_slot (vm, node, n_next->index, slot);
-}
-
-static void
-node_elog_init (vlib_main_t * vm, uword ni)
-{
-  elog_event_type_t t;
-
-  memset (&t, 0, sizeof (t));
-
-  /* 2 event types for this node: one when node function is called.
-     One when it returns. */
-  vec_validate (vm->node_call_elog_event_types, ni);
-  vm->node_call_elog_event_types[ni] = t;
-
-  vec_validate (vm->node_return_elog_event_types, ni);
-  vm->node_return_elog_event_types[ni] = t;
-
-  node_set_elog_name (vm, ni);
-}
-
-#ifdef CLIB_UNIX
-#define STACK_ALIGN (clib_mem_get_page_size())
-#else
-#define STACK_ALIGN CLIB_CACHE_LINE_BYTES
-#endif
-
-static void
-register_node (vlib_main_t * vm, vlib_node_registration_t * r)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *n;
-  u32 page_size = clib_mem_get_page_size ();
-  int i;
-
-  if (CLIB_DEBUG > 0)
-    {
-      /* Default (0) type should match INTERNAL. */
-      vlib_node_t zero = { 0 };
-      ASSERT (VLIB_NODE_TYPE_INTERNAL == zero.type);
-    }
-
-  ASSERT (r->function != 0);
-
-  n = clib_mem_alloc_no_fail (sizeof (n[0]));
-  memset (n, 0, sizeof (n[0]));
-  n->index = vec_len (nm->nodes);
-
-  vec_add1 (nm->nodes, n);
-
-  /* Name is always a vector so it can be formatted with %v. */
-  if (clib_mem_is_heap_object (vec_header (r->name, 0)))
-    n->name = vec_dup ((u8 *) r->name);
-  else
-    n->name = format (0, "%s", r->name);
-
-  if (!nm->node_by_name)
-    nm->node_by_name = hash_create_vec ( /* size */ 32,
-					sizeof (n->name[0]), sizeof (uword));
-
-  /* Node names must be unique. */
-  {
-    vlib_node_t *o = vlib_get_node_by_name (vm, n->name);
-    if (o)
-      clib_error ("more than one node named `%v'", n->name);
-  }
-
-  hash_set (nm->node_by_name, n->name, n->index);
-
-  r->index = n->index;		/* save index in registration */
-  n->function = r->function;
-
-  /* Node index of next sibling will be filled in by vlib_node_main_init. */
-  n->sibling_of = r->sibling_of;
-  if (r->sibling_of && r->n_next_nodes > 0)
-    clib_error ("sibling node should not have any next nodes `%v'", n->name);
-
-  if (r->type == VLIB_NODE_TYPE_INTERNAL)
-    ASSERT (r->vector_size > 0);
-
-#define _(f) n->f = r->f
-
-  _(type);
-  _(flags);
-  _(state);
-  _(scalar_size);
-  _(vector_size);
-  _(format_buffer);
-  _(unformat_buffer);
-  _(format_trace);
-  _(validate_frame);
-
-  /* Register error counters. */
-  vlib_register_errors (vm, n->index, r->n_errors, r->error_strings);
-  node_elog_init (vm, n->index);
-
-  _(runtime_data_bytes);
-  if (r->runtime_data_bytes > 0)
-    {
-      vec_resize (n->runtime_data, r->runtime_data_bytes);
-      if (r->runtime_data)
-	clib_memcpy (n->runtime_data, r->runtime_data, r->runtime_data_bytes);
-    }
-
-  vec_resize (n->next_node_names, r->n_next_nodes);
-  for (i = 0; i < r->n_next_nodes; i++)
-    n->next_node_names[i] = r->next_nodes[i];
-
-  vec_validate_init_empty (n->next_nodes, r->n_next_nodes - 1, ~0);
-  vec_validate (n->n_vectors_by_next_node, r->n_next_nodes - 1);
-
-  n->owner_node_index = n->owner_next_index = ~0;
-
-  /* Initialize node runtime. */
-  {
-    vlib_node_runtime_t *rt;
-    u32 i;
-
-    if (n->type == VLIB_NODE_TYPE_PROCESS)
-      {
-	vlib_process_t *p;
-	uword log2_n_stack_bytes;
-
-	log2_n_stack_bytes = clib_max (r->process_log2_n_stack_bytes, 15);
-
-#ifdef CLIB_UNIX
-	/*
-	 * Bump the stack size if running over a kernel with a large page size,
-	 * and the stack isn't any too big to begin with. Otherwise, we'll
-	 * trip over the stack guard page for sure.
-	 */
-	if ((page_size > (4 << 10)) && log2_n_stack_bytes < 19)
-	  {
-	    if ((1 << log2_n_stack_bytes) <= page_size)
-	      log2_n_stack_bytes = min_log2 (page_size) + 1;
-	    else
-	      log2_n_stack_bytes++;
-	  }
-#endif
-
-	p = clib_mem_alloc_aligned_at_offset
-	  (sizeof (p[0]) + (1 << log2_n_stack_bytes),
-	   STACK_ALIGN, STRUCT_OFFSET_OF (vlib_process_t, stack),
-	   0 /* no, don't call os_out_of_memory */ );
-	if (p == 0)
-	  clib_panic ("failed to allocate process stack (%d bytes)",
-		      1 << log2_n_stack_bytes);
-
-	memset (p, 0, sizeof (p[0]));
-	p->log2_n_stack_bytes = log2_n_stack_bytes;
-
-	/* Process node's runtime index is really index into process
-	   pointer vector. */
-	n->runtime_index = vec_len (nm->processes);
-
-	vec_add1 (nm->processes, p);
-
-	/* Paint first stack word with magic number so we can at least
-	   detect process stack overruns. */
-	p->stack[0] = VLIB_PROCESS_STACK_MAGIC;
-
-	/* Node runtime is stored inside of process. */
-	rt = &p->node_runtime;
-
-#ifdef CLIB_UNIX
-	/*
-	 * Disallow writes to the bottom page of the stack, to
-	 * catch stack overflows.
-	 */
-	if (mprotect (p->stack, page_size, PROT_READ) < 0)
-	  clib_unix_warning ("process stack");
-#endif
-
-      }
-    else
-      {
-	vec_add2_aligned (nm->nodes_by_type[n->type], rt, 1,
-			  /* align */ CLIB_CACHE_LINE_BYTES);
-	n->runtime_index = rt - nm->nodes_by_type[n->type];
-      }
-
-    if (n->type == VLIB_NODE_TYPE_INPUT)
-      nm->input_node_counts_by_state[n->state] += 1;
-
-    rt->function = n->function;
-    rt->flags = n->flags;
-    rt->state = n->state;
-    rt->node_index = n->index;
-
-    rt->n_next_nodes = r->n_next_nodes;
-    rt->next_frame_index = vec_len (nm->next_frames);
-
-    vec_resize (nm->next_frames, rt->n_next_nodes);
-    for (i = 0; i < rt->n_next_nodes; i++)
-      vlib_next_frame_init (nm->next_frames + rt->next_frame_index + i);
-
-    vec_resize (rt->errors, r->n_errors);
-    for (i = 0; i < vec_len (rt->errors); i++)
-      rt->errors[i] = vlib_error_set (n->index, i);
-
-    STATIC_ASSERT_SIZEOF (vlib_node_runtime_t, 128);
-    ASSERT (vec_len (n->runtime_data) <=
-	    sizeof (vlib_node_runtime_t) -
-	    STRUCT_OFFSET_OF (vlib_node_runtime_t, runtime_data));
-
-    if (vec_len (n->runtime_data) > 0)
-      clib_memcpy (rt->runtime_data, n->runtime_data,
-		   vec_len (n->runtime_data));
-
-    vec_free (n->runtime_data);
-  }
-}
-
-/* Register new packet processing node. */
-u32
-vlib_register_node (vlib_main_t * vm, vlib_node_registration_t * r)
-{
-  register_node (vm, r);
-  return r->index;
-}
-
-static uword
-null_node_fn (vlib_main_t * vm,
-	      vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u16 n_vectors = frame->n_vectors;
-
-  vlib_node_increment_counter (vm, node->node_index, 0, n_vectors);
-  vlib_buffer_free (vm, vlib_frame_args (frame), n_vectors);
-  vlib_frame_free (vm, node, frame);
-
-  return n_vectors;
-}
-
-void
-vlib_register_all_static_nodes (vlib_main_t * vm)
-{
-  vlib_node_registration_t *r;
-
-  static char *null_node_error_strings[] = {
-    "blackholed packets",
-  };
-
-  static vlib_node_registration_t null_node_reg = {
-    .function = null_node_fn,
-    .vector_size = sizeof (u32),
-    .name = "null-node",
-    .n_errors = 1,
-    .error_strings = null_node_error_strings,
-  };
-
-  /* make sure that node index 0 is not used by
-     real node */
-  register_node (vm, &null_node_reg);
-
-  r = vm->node_main.node_registrations;
-  while (r)
-    {
-      register_node (vm, r);
-      r = r->next_registration;
-    }
-}
-
-clib_error_t *
-vlib_node_main_init (vlib_main_t * vm)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  clib_error_t *error = 0;
-  vlib_node_t *n;
-  uword ni;
-
-  nm->flags |= VLIB_NODE_MAIN_RUNTIME_STARTED;
-
-  /* Generate sibling relationships */
-  {
-    vlib_node_t *n, *sib;
-    uword si;
-
-    for (ni = 0; ni < vec_len (nm->nodes); ni++)
-      {
-	n = vec_elt (nm->nodes, ni);
-
-	if (!n->sibling_of)
-	  continue;
-
-	sib = vlib_get_node_by_name (vm, (u8 *) n->sibling_of);
-	if (!sib)
-	  {
-	    error = clib_error_create ("sibling `%s' not found for node `%v'",
-				       n->sibling_of, n->name);
-	    goto done;
-	  }
-
-        /* *INDENT-OFF* */
-	clib_bitmap_foreach (si, sib->sibling_bitmap, ({
-	      vlib_node_t * m = vec_elt (nm->nodes, si);
-
-	      /* Connect all of sibling's siblings to us. */
-	      m->sibling_bitmap = clib_bitmap_ori (m->sibling_bitmap, n->index);
-
-	      /* Connect us to all of sibling's siblings. */
-	      n->sibling_bitmap = clib_bitmap_ori (n->sibling_bitmap, si);
-	    }));
-        /* *INDENT-ON* */
-
-	/* Connect sibling to us. */
-	sib->sibling_bitmap = clib_bitmap_ori (sib->sibling_bitmap, n->index);
-
-	/* Connect us to sibling. */
-	n->sibling_bitmap = clib_bitmap_ori (n->sibling_bitmap, sib->index);
-      }
-  }
-
-  /* Resolve next names into next indices. */
-  for (ni = 0; ni < vec_len (nm->nodes); ni++)
-    {
-      uword i;
-
-      n = vec_elt (nm->nodes, ni);
-
-      for (i = 0; i < vec_len (n->next_node_names); i++)
-	{
-	  char *a = n->next_node_names[i];
-
-	  if (!a)
-	    continue;
-
-	  if (~0 == vlib_node_add_named_next_with_slot (vm, n->index, a, i))
-	    {
-	      error = clib_error_create
-		("node `%v' refers to unknown node `%s'", n->name, a);
-	      goto done;
-	    }
-	}
-
-      vec_free (n->next_node_names);
-    }
-
-  /* Set previous node pointers. */
-  for (ni = 0; ni < vec_len (nm->nodes); ni++)
-    {
-      vlib_node_t *n_next;
-      uword i;
-
-      n = vec_elt (nm->nodes, ni);
-
-      for (i = 0; i < vec_len (n->next_nodes); i++)
-	{
-	  if (n->next_nodes[i] >= vec_len (nm->nodes))
-	    continue;
-
-	  n_next = vec_elt (nm->nodes, n->next_nodes[i]);
-	  n_next->prev_node_bitmap =
-	    clib_bitmap_ori (n_next->prev_node_bitmap, n->index);
-	}
-    }
-
-  {
-    vlib_next_frame_t *nf;
-    vlib_node_runtime_t *r;
-    vlib_node_t *next;
-    uword i;
-
-    vec_foreach (r, nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL])
-    {
-      if (r->n_next_nodes == 0)
-	continue;
-
-      n = vlib_get_node (vm, r->node_index);
-      nf = vec_elt_at_index (nm->next_frames, r->next_frame_index);
-
-      for (i = 0; i < vec_len (n->next_nodes); i++)
-	{
-	  next = vlib_get_node (vm, n->next_nodes[i]);
-
-	  /* Validate node runtime indices are correctly initialized. */
-	  ASSERT (nf[i].node_runtime_index == next->runtime_index);
-
-	  nf[i].flags = 0;
-	  if (next->flags & VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH)
-	    nf[i].flags |= VLIB_FRAME_NO_FREE_AFTER_DISPATCH;
-	}
-    }
-  }
-
-done:
-  return error;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/node.h b/vlib/vlib/node.h
deleted file mode 100644
index b624e9d6..00000000
--- a/vlib/vlib/node.h
+++ /dev/null
@@ -1,725 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * node.h: VLIB processing nodes
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_node_h
-#define included_vlib_node_h
-
-#include <vppinfra/cpu.h>
-#include <vppinfra/longjmp.h>
-#include <vppinfra/timing_wheel.h>
-#include <vlib/trace.h>		/* for vlib_trace_filter_t */
-
-/* Forward declaration. */
-struct vlib_node_runtime_t;
-struct vlib_frame_t;
-
-/* Internal nodes (including output nodes) move data from node to
-   node (or out of the graph for output nodes). */
-typedef uword (vlib_node_function_t) (struct vlib_main_t * vm,
-				      struct vlib_node_runtime_t * node,
-				      struct vlib_frame_t * frame);
-
-typedef enum
-{
-  /* An internal node on the call graph (could be output). */
-  VLIB_NODE_TYPE_INTERNAL,
-
-  /* Nodes which input data into the processing graph.
-     Input nodes are called for each iteration of main loop. */
-  VLIB_NODE_TYPE_INPUT,
-
-  /* Nodes to be called before all input nodes.
-     Used, for example, to clean out driver TX rings before
-     processing input. */
-  VLIB_NODE_TYPE_PRE_INPUT,
-
-  /* "Process" nodes which can be suspended and later resumed. */
-  VLIB_NODE_TYPE_PROCESS,
-
-  VLIB_N_NODE_TYPE,
-} vlib_node_type_t;
-
-typedef struct _vlib_node_registration
-{
-  /* Vector processing function for this node. */
-  vlib_node_function_t *function;
-
-  /* Node name. */
-  char *name;
-
-  /* Name of sibling (if applicable). */
-  char *sibling_of;
-
-  /* Node index filled in by registration. */
-  u32 index;
-
-  /* Type of this node. */
-  vlib_node_type_t type;
-
-  /* Error strings indexed by error code for this node. */
-  char **error_strings;
-
-  /* Buffer format/unformat for this node. */
-  format_function_t *format_buffer;
-  unformat_function_t *unformat_buffer;
-
-  /* Trace format/unformat for this node. */
-  format_function_t *format_trace;
-  unformat_function_t *unformat_trace;
-
-  /* Function to validate incoming frames. */
-  u8 *(*validate_frame) (struct vlib_main_t * vm,
-			 struct vlib_node_runtime_t *,
-			 struct vlib_frame_t * f);
-
-  /* Per-node runtime data. */
-  void *runtime_data;
-
-  /* Process stack size. */
-  u16 process_log2_n_stack_bytes;
-
-  /* Number of bytes of per-node run time data. */
-  u8 runtime_data_bytes;
-
-  /* State for input nodes. */
-  u8 state;
-
-  /* Node flags. */
-  u16 flags;
-
-  /* Size of scalar and vector arguments in bytes. */
-  u16 scalar_size, vector_size;
-
-  /* Number of error codes used by this node. */
-  u16 n_errors;
-
-  /* Number of next node names that follow. */
-  u16 n_next_nodes;
-
-  /* Constructor link-list, don't ask... */
-  struct _vlib_node_registration *next_registration;
-
-  /* Names of next nodes which this node feeds into. */
-  char *next_nodes[];
-
-} vlib_node_registration_t;
-
-#define VLIB_REGISTER_NODE(x,...)                                       \
-    __VA_ARGS__ vlib_node_registration_t x;                             \
-static void __vlib_add_node_registration_##x (void)                     \
-    __attribute__((__constructor__)) ;                                  \
-static void __vlib_add_node_registration_##x (void)                     \
-{                                                                       \
-    vlib_main_t * vm = vlib_get_main();                                 \
-    x.next_registration = vm->node_main.node_registrations;             \
-    vm->node_main.node_registrations = &x;                              \
-}                                                                       \
-__VA_ARGS__ vlib_node_registration_t x
-
-#if CLIB_DEBUG > 0
-#define VLIB_NODE_FUNCTION_CLONE_TEMPLATE(arch, fn)
-#define VLIB_NODE_FUNCTION_MULTIARCH_CLONE(fn)
-#define VLIB_NODE_FUNCTION_MULTIARCH(node, fn)
-#else
-#define VLIB_NODE_FUNCTION_CLONE_TEMPLATE(arch, fn, tgt)		\
-  uword									\
-  __attribute__ ((flatten))						\
-  __attribute__ ((target (tgt)))					\
-  CLIB_CPU_OPTIMIZED							\
-  fn ## _ ## arch ( struct vlib_main_t * vm,				\
-                   struct vlib_node_runtime_t * node,			\
-                   struct vlib_frame_t * frame)				\
-  { return fn (vm, node, frame); }
-
-#define VLIB_NODE_FUNCTION_MULTIARCH_CLONE(fn)				\
-  foreach_march_variant(VLIB_NODE_FUNCTION_CLONE_TEMPLATE, fn)
-
-#define VLIB_NODE_FUNCTION_MULTIARCH(node, fn)				\
-  VLIB_NODE_FUNCTION_MULTIARCH_CLONE(fn)				\
-  CLIB_MULTIARCH_SELECT_FN(fn, static inline)				\
-  static void __attribute__((__constructor__))				\
-  __vlib_node_function_multiarch_select_##node (void)			\
-  { node.function = fn ## _multiarch_select(); }
-#endif
-
-always_inline vlib_node_registration_t *
-vlib_node_next_registered (vlib_node_registration_t * c)
-{
-  c =
-    clib_elf_section_data_next (c,
-				c->n_next_nodes * sizeof (c->next_nodes[0]));
-  return c;
-}
-
-typedef struct
-{
-  /* Total calls, clock ticks and vector elements processed for this node. */
-  u64 calls, vectors, clocks, suspends;
-  u64 max_clock;
-  u64 max_clock_n;
-} vlib_node_stats_t;
-
-#define foreach_vlib_node_state					\
-  /* Input node is called each iteration of main loop.		\
-     This is the default (zero). */				\
-  _ (POLLING)							\
-  /* Input node is called when device signals an interrupt. */	\
-  _ (INTERRUPT)							\
-  /* Input node is never called. */				\
-  _ (DISABLED)
-
-typedef enum
-{
-#define _(f) VLIB_NODE_STATE_##f,
-  foreach_vlib_node_state
-#undef _
-    VLIB_N_NODE_STATE,
-} vlib_node_state_t;
-
-typedef struct vlib_node_t
-{
-  /* Vector processing function for this node. */
-  vlib_node_function_t *function;
-
-  /* Node name. */
-  u8 *name;
-
-  /* Node name index in elog string table. */
-  u32 name_elog_string;
-
-  /* Total statistics for this node. */
-  vlib_node_stats_t stats_total;
-
-  /* Saved values as of last clear (or zero if never cleared).
-     Current values are always stats_total - stats_last_clear. */
-  vlib_node_stats_t stats_last_clear;
-
-  /* Type of this node. */
-  vlib_node_type_t type;
-
-  /* Node index. */
-  u32 index;
-
-  /* Index of corresponding node runtime. */
-  u32 runtime_index;
-
-  /* Runtime data for this node. */
-  void *runtime_data;
-
-  /* Node flags. */
-  u16 flags;
-
-  /* Processing function keeps frame.  Tells node dispatching code not
-     to free frame after dispatch is done.  */
-#define VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH (1 << 0)
-
-  /* Node counts as output/drop/punt node for stats purposes. */
-#define VLIB_NODE_FLAG_IS_OUTPUT (1 << 1)
-#define VLIB_NODE_FLAG_IS_DROP (1 << 2)
-#define VLIB_NODE_FLAG_IS_PUNT (1 << 3)
-#define VLIB_NODE_FLAG_IS_HANDOFF (1 << 4)
-
-  /* Set if current node runtime has traced vectors. */
-#define VLIB_NODE_FLAG_TRACE (1 << 5)
-
-#define VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE (1 << 6)
-#define VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE (1 << 7)
-
-  /* State for input nodes. */
-  u8 state;
-
-  /* Number of bytes of run time data. */
-  u8 runtime_data_bytes;
-
-  /* Number of error codes used by this node. */
-  u16 n_errors;
-
-  /* Size of scalar and vector arguments in bytes. */
-  u16 scalar_size, vector_size;
-
-  /* Handle/index in error heap for this node. */
-  u32 error_heap_handle;
-  u32 error_heap_index;
-
-  /* Error strings indexed by error code for this node. */
-  char **error_strings;
-
-  /* Vector of next node names.
-     Only used before next_nodes array is initialized. */
-  char **next_node_names;
-
-  /* Next node indices for this node. */
-  u32 *next_nodes;
-
-  /* Name of node that we are sibling of. */
-  char *sibling_of;
-
-  /* Bitmap of all of this node's siblings. */
-  uword *sibling_bitmap;
-
-  /* Total number of vectors sent to each next node. */
-  u64 *n_vectors_by_next_node;
-
-  /* Hash table mapping next node index into slot in
-     next_nodes vector.  Quickly determines whether this node
-     is connected to given next node and, if so, with which slot. */
-  uword *next_slot_by_node;
-
-  /* Bitmap of node indices which feed this node. */
-  uword *prev_node_bitmap;
-
-  /* Node/next-index which own enqueue rights with to this node. */
-  u32 owner_node_index, owner_next_index;
-
-  /* Buffer format/unformat for this node. */
-  format_function_t *format_buffer;
-  unformat_function_t *unformat_buffer;
-
-  /* Trace buffer format/unformat for this node. */
-  format_function_t *format_trace;
-
-  /* Function to validate incoming frames. */
-  u8 *(*validate_frame) (struct vlib_main_t * vm,
-			 struct vlib_node_runtime_t *,
-			 struct vlib_frame_t * f);
-  /* for pretty-printing, not typically valid */
-  u8 *state_string;
-} vlib_node_t;
-
-#define VLIB_INVALID_NODE_INDEX ((u32) ~0)
-
-/* Max number of vector elements to process at once per node. */
-#define VLIB_FRAME_SIZE 256
-#define VLIB_FRAME_ALIGN VLIB_MAX_CPUS
-
-/* Calling frame (think stack frame) for a node. */
-typedef struct vlib_frame_t
-{
-  /* Frame flags. */
-  u16 flags;
-
-  /* Number of scalar bytes in arguments. */
-  u8 scalar_size;
-
-  /* Number of bytes per vector argument. */
-  u8 vector_size;
-
-  /* Number of vector elements currently in frame. */
-  u16 n_vectors;
-
-  /* Owner cpuid / heap id */
-  u16 cpu_index;
-
-  /* Scalar and vector arguments to next node. */
-  u8 arguments[0];
-} vlib_frame_t;
-
-typedef struct
-{
-  /* Frame index. */
-  u32 frame_index;
-
-  /* Node runtime for this next. */
-  u32 node_runtime_index;
-
-  /* Next frame flags. */
-  u32 flags;
-
-  /* Reflects node frame-used flag for this next. */
-#define VLIB_FRAME_NO_FREE_AFTER_DISPATCH \
-  VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH
-
-  /* This next frame owns enqueue to node
-     corresponding to node_runtime_index. */
-#define VLIB_FRAME_OWNER (1 << 15)
-
-  /* Set when frame has been allocated for this next. */
-#define VLIB_FRAME_IS_ALLOCATED	VLIB_NODE_FLAG_IS_OUTPUT
-
-  /* Set when frame has been added to pending vector. */
-#define VLIB_FRAME_PENDING VLIB_NODE_FLAG_IS_DROP
-
-  /* Set when frame is to be freed after dispatch. */
-#define VLIB_FRAME_FREE_AFTER_DISPATCH VLIB_NODE_FLAG_IS_PUNT
-
-  /* Set when frame has traced packets. */
-#define VLIB_FRAME_TRACE VLIB_NODE_FLAG_TRACE
-
-  /* Number of vectors enqueue to this next since last overflow. */
-  u32 vectors_since_last_overflow;
-} vlib_next_frame_t;
-
-always_inline void
-vlib_next_frame_init (vlib_next_frame_t * nf)
-{
-  memset (nf, 0, sizeof (nf[0]));
-  nf->frame_index = ~0;
-  nf->node_runtime_index = ~0;
-}
-
-/* A frame pending dispatch by main loop. */
-typedef struct
-{
-  /* Node and runtime for this frame. */
-  u32 node_runtime_index;
-
-  /* Frame index (in the heap). */
-  u32 frame_index;
-
-  /* Start of next frames for this node. */
-  u32 next_frame_index;
-
-  /* Special value for next_frame_index when there is no next frame. */
-#define VLIB_PENDING_FRAME_NO_NEXT_FRAME ((u32) ~0)
-} vlib_pending_frame_t;
-
-typedef struct vlib_node_runtime_t
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  /* Node function to call. */
-  vlib_node_function_t *function;
-
-  /* Vector of errors for this node. */
-  vlib_error_t *errors;
-
-  /* Number of clock cycles. */
-  u32 clocks_since_last_overflow;
-
-  /* Maximum clock cycle for an invocation. */
-  u32 max_clock;
-
-  /* Number of vectors in the recorded max_clock. */
-  u32 max_clock_n;
-
-  /* Number of calls. */
-  u32 calls_since_last_overflow;
-
-  /* Number of vector elements processed by this node. */
-  u32 vectors_since_last_overflow;
-
-  /* Start of next frames for this node. */
-  u32 next_frame_index;
-
-  /* Node index. */
-  u32 node_index;
-
-  /* For input nodes: decremented on each main loop interation until it reaches zero
-     and function is called.  Allows some input nodes to be called
-     more than others. */
-  u32 input_main_loops_per_call;
-
-  /* Saved main loop counter of last dispatch of this node. */
-  u32 main_loop_count_last_dispatch;
-
-  u32 main_loop_vector_stats[2];
-
-  /* Copy of main node flags. */
-  u16 flags;
-
-  /* Input node state. */
-  u16 state;
-
-  u16 n_next_nodes;
-
-  /* Next frame index that vector arguments were last enqueued to
-     last time this node ran.  Set to zero before first run
-     of this node. */
-  u16 cached_next_index;
-
-  /* CPU this node runs on */
-  u16 cpu_index;
-
-  /* Function dependent node-runtime. */
-  u8 runtime_data[0];
-}
-vlib_node_runtime_t;
-
-typedef struct
-{
-  /* Number of allocated frames for this scalar/vector size. */
-  u32 n_alloc_frames;
-
-  /* Vector of free frame indices for this scalar/vector size. */
-  u32 *free_frame_indices;
-} vlib_frame_size_t;
-
-typedef struct
-{
-  /* Users opaque value for event type. */
-  uword opaque;
-} vlib_process_event_type_t;
-
-typedef struct
-{
-  /* Node runtime for this process. */
-  vlib_node_runtime_t node_runtime;
-
-  /* Where to longjmp when process is done. */
-  clib_longjmp_t return_longjmp;
-
-#define VLIB_PROCESS_RETURN_LONGJMP_RETURN ((uword) ~0 - 0)
-#define VLIB_PROCESS_RETURN_LONGJMP_SUSPEND ((uword) ~0 - 1)
-
-  /* Where to longjmp to resume node after suspend. */
-  clib_longjmp_t resume_longjmp;
-#define VLIB_PROCESS_RESUME_LONGJMP_SUSPEND 0
-#define VLIB_PROCESS_RESUME_LONGJMP_RESUME  1
-
-  u16 flags;
-#define VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK (1 << 0)
-#define VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT (1 << 1)
-  /* Set to indicate that this process has been added to resume vector. */
-#define VLIB_PROCESS_RESUME_PENDING (1 << 2)
-
-  /* Process function is currently running. */
-#define VLIB_PROCESS_IS_RUNNING (1 << 3)
-
-  /* Size of process stack. */
-  u16 log2_n_stack_bytes;
-
-  u32 suspended_process_frame_index;
-
-  /* Number of times this process was suspended. */
-  u32 n_suspends;
-
-  /* Vectors of pending event data indexed by event type index. */
-  void **pending_event_data_by_type_index;
-
-  /* Bitmap of event type-indices with non-empty vectors. */
-  uword *non_empty_event_type_bitmap;
-
-  /* Bitmap of event type-indices which are one time events. */
-  uword *one_time_event_type_bitmap;
-
-  /* Type is opaque pointer -- typically a pointer to an event handler
-     function.  Hash table to map opaque to a type index. */
-  uword *event_type_index_by_type_opaque;
-
-  /* Pool of currently valid event types. */
-  vlib_process_event_type_t *event_type_pool;
-
-  /* When suspending saves cpu cycle counter when process is to be resumed. */
-  u64 resume_cpu_time;
-
-  /* Default output function and its argument for any CLI outputs
-     within the process. */
-  vlib_cli_output_function_t *output_function;
-  uword output_function_arg;
-
-#ifdef CLIB_UNIX
-  /* Pad to a multiple of the page size so we can mprotect process stacks */
-#define PAGE_SIZE_MULTIPLE 0x1000
-#define ALIGN_ON_MULTIPLE_PAGE_BOUNDARY_FOR_MPROTECT  __attribute__ ((aligned (PAGE_SIZE_MULTIPLE)))
-#else
-#define ALIGN_ON_MULTIPLE_PAGE_BOUNDARY_FOR_MPROTECT
-#endif
-
-  /* Process stack.  Starts here and extends 2^log2_n_stack_bytes
-     bytes. */
-
-#define VLIB_PROCESS_STACK_MAGIC (0xdead7ead)
-  u32 stack[0] ALIGN_ON_MULTIPLE_PAGE_BOUNDARY_FOR_MPROTECT;
-} vlib_process_t __attribute__ ((aligned (CLIB_CACHE_LINE_BYTES)));
-
-#ifdef CLIB_UNIX
-  /* Ensure that the stack is aligned on the multiple of the page size */
-typedef char
-  assert_process_stack_must_be_aligned_exactly_to_page_size_multiple[(sizeof
-								      (vlib_process_t)
-								      -
-								      PAGE_SIZE_MULTIPLE)
-								     ==
-								     0 ? 0 :
-								     -1];
-#endif
-
-typedef struct
-{
-  u32 node_index;
-
-  u32 one_time_event;
-} vlib_one_time_waiting_process_t;
-
-typedef struct
-{
-  u16 n_data_elts;
-
-  u16 n_data_elt_bytes;
-
-  /* n_data_elts * n_data_elt_bytes */
-  u32 n_data_bytes;
-
-  /* Process node & event type to be used to signal event. */
-  u32 process_node_index;
-
-  u32 event_type_index;
-
-  union
-  {
-    u8 inline_event_data[64 - 3 * sizeof (u32) - 2 * sizeof (u16)];
-
-    /* Vector of event data used only when data does not fit inline. */
-    u8 *event_data_as_vector;
-  };
-}
-vlib_signal_timed_event_data_t;
-
-always_inline uword
-vlib_timing_wheel_data_is_timed_event (u32 d)
-{
-  return d & 1;
-}
-
-always_inline u32
-vlib_timing_wheel_data_set_suspended_process (u32 i)
-{
-  return 0 + 2 * i;
-}
-
-always_inline u32
-vlib_timing_wheel_data_set_timed_event (u32 i)
-{
-  return 1 + 2 * i;
-}
-
-always_inline uword
-vlib_timing_wheel_data_get_index (u32 d)
-{
-  return d / 2;
-}
-
-typedef struct
-{
-  /* Public nodes. */
-  vlib_node_t **nodes;
-
-  /* Node index hashed by node name. */
-  uword *node_by_name;
-
-  u32 flags;
-#define VLIB_NODE_MAIN_RUNTIME_STARTED (1 << 0)
-
-  /* Nodes segregated by type for cache locality.
-     Does not apply to nodes of type VLIB_NODE_TYPE_INTERNAL. */
-  vlib_node_runtime_t *nodes_by_type[VLIB_N_NODE_TYPE];
-
-  /* Node runtime indices for input nodes with pending interrupts. */
-  u32 *pending_interrupt_node_runtime_indices;
-
-  /* Input nodes are switched from/to interrupt to/from polling mode
-     when average vector length goes above/below polling/interrupt
-     thresholds. */
-  u32 polling_threshold_vector_length;
-  u32 interrupt_threshold_vector_length;
-
-  /* Vector of next frames. */
-  vlib_next_frame_t *next_frames;
-
-  /* Vector of internal node's frames waiting to be called. */
-  vlib_pending_frame_t *pending_frames;
-
-  /* Timing wheel for scheduling time-based node dispatch. */
-  timing_wheel_t timing_wheel;
-
-  vlib_signal_timed_event_data_t *signal_timed_event_data_pool;
-
-  /* Opaque data vector added via timing_wheel_advance. */
-  u32 *data_from_advancing_timing_wheel;
-
-  /* CPU time of next process to be ready on timing wheel. */
-  u64 cpu_time_next_process_ready;
-
-  /* Vector of process nodes.
-     One for each node of type VLIB_NODE_TYPE_PROCESS. */
-  vlib_process_t **processes;
-
-  /* Current running process or ~0 if no process running. */
-  u32 current_process_index;
-
-  /* Pool of pending process frames. */
-  vlib_pending_frame_t *suspended_process_frames;
-
-  /* Vector of event data vectors pending recycle. */
-  void **recycled_event_data_vectors;
-
-  /* Current counts of nodes in each state. */
-  u32 input_node_counts_by_state[VLIB_N_NODE_STATE];
-
-  /* Hash of (scalar_size,vector_size) to frame_sizes index. */
-  uword *frame_size_hash;
-
-  /* Per-size frame allocation information. */
-  vlib_frame_size_t *frame_sizes;
-
-  /* Time of last node runtime stats clear. */
-  f64 time_last_runtime_stats_clear;
-
-  /* Node registrations added by constructors */
-  vlib_node_registration_t *node_registrations;
-} vlib_node_main_t;
-
-
-#define FRAME_QUEUE_MAX_NELTS 32
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  u64 head;
-  u64 head_hint;
-  u64 tail;
-  u32 n_in_use;
-  u32 nelts;
-  u32 written;
-  u32 threshold;
-  i32 n_vectors[FRAME_QUEUE_MAX_NELTS];
-} frame_queue_trace_t;
-
-typedef struct
-{
-  u64 count[FRAME_QUEUE_MAX_NELTS];
-} frame_queue_nelt_counter_t;
-
-#endif /* included_vlib_node_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/node_cli.c b/vlib/vlib/node_cli.c
deleted file mode 100644
index 05d0f0b5..00000000
--- a/vlib/vlib/node_cli.c
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * node_cli.c: node CLI
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vlib/threads.h>
-
-static int
-node_cmp (void *a1, void *a2)
-{
-  vlib_node_t **n1 = a1;
-  vlib_node_t **n2 = a2;
-
-  return vec_cmp (n1[0]->name, n2[0]->name);
-}
-
-static clib_error_t *
-show_node_graph (vlib_main_t * vm,
-		 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *n;
-  u32 node_index;
-
-  vlib_cli_output (vm, "%U\n", format_vlib_node_graph, nm, 0);
-
-  if (unformat (input, "%U", unformat_vlib_node, vm, &node_index))
-    {
-      n = vlib_get_node (vm, node_index);
-      vlib_cli_output (vm, "%U\n", format_vlib_node_graph, nm, n);
-    }
-  else
-    {
-      vlib_node_t **nodes = vec_dup (nm->nodes);
-      uword i;
-
-      vec_sort_with_function (nodes, node_cmp);
-
-      for (i = 0; i < vec_len (nodes); i++)
-	vlib_cli_output (vm, "%U\n\n", format_vlib_node_graph, nm, nodes[i]);
-
-      vec_free (nodes);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_node_graph_command, static) = {
-  .path = "show vlib graph",
-  .short_help = "Show packet processing node graph",
-  .function = show_node_graph,
-};
-/* *INDENT-ON* */
-
-static u8 *
-format_vlib_node_stats (u8 * s, va_list * va)
-{
-  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
-  vlib_node_t *n = va_arg (*va, vlib_node_t *);
-  int max = va_arg (*va, int);
-  f64 v;
-  char *state;
-  u8 *ns;
-  u8 *misc_info = 0;
-  u64 c, p, l, d;
-  f64 x;
-  f64 maxc, maxcn;
-  u32 maxn;
-  uword indent;
-
-  if (!n)
-    {
-      if (max)
-	return format (s,
-		       "%=30s%=17s%=16s%=16s%=16s%=16s",
-		       "Name", "Max Node Clocks", "Vectors at Max",
-		       "Max Clocks", "Avg Clocks", "Avg Vectors/Call");
-      else
-	return format (s,
-		       "%=30s%=12s%=16s%=16s%=16s%=16s%=16s",
-		       "Name", "State", "Calls", "Vectors", "Suspends",
-		       "Clocks", "Vectors/Call");
-    }
-
-  indent = format_get_indent (s);
-
-  l = n->stats_total.clocks - n->stats_last_clear.clocks;
-  c = n->stats_total.calls - n->stats_last_clear.calls;
-  p = n->stats_total.vectors - n->stats_last_clear.vectors;
-  d = n->stats_total.suspends - n->stats_last_clear.suspends;
-  maxc = (f64) n->stats_total.max_clock;
-  maxn = n->stats_total.max_clock_n;
-  if (n->stats_total.max_clock_n)
-    maxcn = (f64) n->stats_total.max_clock / (f64) maxn;
-  else
-    maxcn = 0.0;
-
-  /* Clocks per packet, per call or per suspend. */
-  x = 0;
-  if (p > 0)
-    x = (f64) l / (f64) p;
-  else if (c > 0)
-    x = (f64) l / (f64) c;
-  else if (d > 0)
-    x = (f64) l / (f64) d;
-
-  if (c > 0)
-    v = (double) p / (double) c;
-  else
-    v = 0;
-
-  state = "active";
-  if (n->type == VLIB_NODE_TYPE_PROCESS)
-    {
-      vlib_process_t *p = vlib_get_process_from_node (vm, n);
-
-      /* Show processes with events pending.  This helps spot bugs where events are not
-         being handled. */
-      if (!clib_bitmap_is_zero (p->non_empty_event_type_bitmap))
-	misc_info = format (misc_info, "events pending, ");
-
-      switch (p->flags & (VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK
-			  | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT))
-	{
-	default:
-	  if (!(p->flags & VLIB_PROCESS_IS_RUNNING))
-	    state = "done";
-	  break;
-
-	case VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK:
-	  state = "time wait";
-	  break;
-
-	case VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT:
-	  state = "event wait";
-	  break;
-
-	case (VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK):
-	  state =
-	    "any wait";
-	  break;
-	}
-    }
-  else if (n->type != VLIB_NODE_TYPE_INTERNAL)
-    {
-      state = "polling";
-      if (n->state == VLIB_NODE_STATE_DISABLED)
-	state = "disabled";
-      else if (n->state == VLIB_NODE_STATE_INTERRUPT)
-	state = "interrupt wait";
-    }
-
-  ns = n->name;
-
-  if (max)
-    s = format (s, "%-30v%=17.2e%=16d%=16.2e%=16.2e%=16.2e",
-		ns, maxc, maxn, maxcn, x, v);
-  else
-    s = format (s, "%-30v%=12s%16Ld%16Ld%16Ld%16.2e%16.2f", ns, state,
-		c, p, d, x, v);
-
-  if (ns != n->name)
-    vec_free (ns);
-
-  if (misc_info)
-    {
-      s = format (s, "\n%U%v", format_white_space, indent + 4, misc_info);
-      vec_free (misc_info);
-    }
-
-  return s;
-}
-
-static clib_error_t *
-show_node_runtime (vlib_main_t * vm,
-		   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *n;
-  f64 time_now;
-  u32 node_index;
-  vlib_node_t ***node_dups = 0;
-  f64 *vectors_per_main_loop = 0;
-  f64 *last_vector_length_per_node = 0;
-
-  time_now = vlib_time_now (vm);
-
-  if (unformat (input, "%U", unformat_vlib_node, vm, &node_index))
-    {
-      n = vlib_get_node (vm, node_index);
-      vlib_node_sync_stats (vm, n);
-      vlib_cli_output (vm, "%U\n", format_vlib_node_stats, vm, 0, 0);
-      vlib_cli_output (vm, "%U\n", format_vlib_node_stats, vm, n, 0);
-    }
-  else
-    {
-      vlib_node_t **nodes;
-      uword i, j;
-      f64 dt;
-      u64 n_input, n_output, n_drop, n_punt;
-      u64 n_internal_vectors, n_internal_calls;
-      u64 n_clocks, l, v, c, d;
-      int brief = 1;
-      int max = 0;
-      vlib_main_t **stat_vms = 0, *stat_vm;
-
-      /* Suppress nodes with zero calls since last clear */
-      if (unformat (input, "brief") || unformat (input, "b"))
-	brief = 1;
-      if (unformat (input, "verbose") || unformat (input, "v"))
-	brief = 0;
-      if (unformat (input, "max") || unformat (input, "m"))
-	max = 1;
-
-      if (vec_len (vlib_mains) == 0)
-	vec_add1 (stat_vms, vm);
-      else
-	{
-	  for (i = 0; i < vec_len (vlib_mains); i++)
-	    {
-	      stat_vm = vlib_mains[i];
-	      if (stat_vm)
-		vec_add1 (stat_vms, stat_vm);
-	    }
-	}
-
-      /*
-       * Barrier sync across stats scraping.
-       * Otherwise, the counts will be grossly inaccurate.
-       */
-      vlib_worker_thread_barrier_sync (vm);
-
-      for (j = 0; j < vec_len (stat_vms); j++)
-	{
-	  stat_vm = stat_vms[j];
-	  nm = &stat_vm->node_main;
-
-	  for (i = 0; i < vec_len (nm->nodes); i++)
-	    {
-	      n = nm->nodes[i];
-	      vlib_node_sync_stats (stat_vm, n);
-	    }
-
-	  nodes = vec_dup (nm->nodes);
-
-	  vec_add1 (node_dups, nodes);
-	  vec_add1 (vectors_per_main_loop,
-		    vlib_last_vectors_per_main_loop_as_f64 (stat_vm));
-	  vec_add1 (last_vector_length_per_node,
-		    vlib_last_vector_length_per_node (stat_vm));
-	}
-      vlib_worker_thread_barrier_release (vm);
-
-
-      for (j = 0; j < vec_len (stat_vms); j++)
-	{
-	  stat_vm = stat_vms[j];
-	  nodes = node_dups[j];
-
-	  vec_sort_with_function (nodes, node_cmp);
-
-	  n_input = n_output = n_drop = n_punt = n_clocks = 0;
-	  n_internal_vectors = n_internal_calls = 0;
-	  for (i = 0; i < vec_len (nodes); i++)
-	    {
-	      n = nodes[i];
-
-	      l = n->stats_total.clocks - n->stats_last_clear.clocks;
-	      n_clocks += l;
-
-	      v = n->stats_total.vectors - n->stats_last_clear.vectors;
-	      c = n->stats_total.calls - n->stats_last_clear.calls;
-
-	      switch (n->type)
-		{
-		default:
-		  continue;
-
-		case VLIB_NODE_TYPE_INTERNAL:
-		  n_output += (n->flags & VLIB_NODE_FLAG_IS_OUTPUT) ? v : 0;
-		  n_drop += (n->flags & VLIB_NODE_FLAG_IS_DROP) ? v : 0;
-		  n_punt += (n->flags & VLIB_NODE_FLAG_IS_PUNT) ? v : 0;
-		  if (!(n->flags & VLIB_NODE_FLAG_IS_OUTPUT))
-		    {
-		      n_internal_vectors += v;
-		      n_internal_calls += c;
-		    }
-		  if (n->flags & VLIB_NODE_FLAG_IS_HANDOFF)
-		    n_input += v;
-		  break;
-
-		case VLIB_NODE_TYPE_INPUT:
-		  n_input += v;
-		  break;
-		}
-	    }
-
-	  if (vec_len (vlib_mains))
-	    {
-	      vlib_worker_thread_t *w = vlib_worker_threads + j;
-	      if (j > 0)
-		vlib_cli_output (vm, "---------------");
-
-	      if (w->lcore_id > -1)
-		vlib_cli_output (vm, "Thread %d %s (lcore %u)", j, w->name,
-				 w->lcore_id);
-	      else
-		vlib_cli_output (vm, "Thread %d %s", j, w->name);
-	    }
-
-	  dt = time_now - nm->time_last_runtime_stats_clear;
-	  vlib_cli_output
-	    (vm,
-	     "Time %.1f, average vectors/node %.2f, last %d main loops %.2f per node %.2f"
-	     "\n  vector rates in %.4e, out %.4e, drop %.4e, punt %.4e",
-	     dt,
-	     (n_internal_calls > 0
-	      ? (f64) n_internal_vectors / (f64) n_internal_calls
-	      : 0),
-	     1 << VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE,
-	     vectors_per_main_loop[j],
-	     last_vector_length_per_node[j],
-	     (f64) n_input / dt,
-	     (f64) n_output / dt, (f64) n_drop / dt, (f64) n_punt / dt);
-
-	  vlib_cli_output (vm, "%U", format_vlib_node_stats, stat_vm, 0, max);
-	  for (i = 0; i < vec_len (nodes); i++)
-	    {
-	      c =
-		nodes[i]->stats_total.calls -
-		nodes[i]->stats_last_clear.calls;
-	      d =
-		nodes[i]->stats_total.suspends -
-		nodes[i]->stats_last_clear.suspends;
-	      if (c || d || !brief)
-		{
-		  vlib_cli_output (vm, "%U", format_vlib_node_stats, stat_vm,
-				   nodes[i], max);
-		}
-	    }
-	  vec_free (nodes);
-	}
-      vec_free (stat_vms);
-      vec_free (node_dups);
-      vec_free (vectors_per_main_loop);
-      vec_free (last_vector_length_per_node);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_node_runtime_command, static) = {
-  .path = "show runtime",
-  .short_help = "Show packet processing runtime",
-  .function = show_node_runtime,
-  .is_mp_safe = 1,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-clear_node_runtime (vlib_main_t * vm,
-		    unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vlib_node_main_t *nm;
-  vlib_node_t *n;
-  int i, j;
-  vlib_main_t **stat_vms = 0, *stat_vm;
-  vlib_node_runtime_t *r;
-
-  if (vec_len (vlib_mains) == 0)
-    vec_add1 (stat_vms, vm);
-  else
-    {
-      for (i = 0; i < vec_len (vlib_mains); i++)
-	{
-	  stat_vm = vlib_mains[i];
-	  if (stat_vm)
-	    vec_add1 (stat_vms, stat_vm);
-	}
-    }
-
-  vlib_worker_thread_barrier_sync (vm);
-
-  for (j = 0; j < vec_len (stat_vms); j++)
-    {
-      stat_vm = stat_vms[j];
-      nm = &stat_vm->node_main;
-
-      for (i = 0; i < vec_len (nm->nodes); i++)
-	{
-	  n = nm->nodes[i];
-	  vlib_node_sync_stats (stat_vm, n);
-	  n->stats_last_clear = n->stats_total;
-
-	  r = vlib_node_get_runtime (stat_vm, n->index);
-	  r->max_clock = 0;
-	}
-      /* Note: input/output rates computed using vlib_global_main */
-      nm->time_last_runtime_stats_clear = vlib_time_now (vm);
-    }
-
-  vlib_worker_thread_barrier_release (vm);
-
-  vec_free (stat_vms);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (clear_node_runtime_command, static) = {
-  .path = "clear runtime",
-  .short_help = "Clear packet processing runtime statistics",
-  .function = clear_node_runtime,
-};
-/* *INDENT-ON* */
-
-/* Dummy function to get us linked in. */
-void
-vlib_node_cli_reference (void)
-{
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/node_format.c b/vlib/vlib/node_format.c
deleted file mode 100644
index e9dde40f..00000000
--- a/vlib/vlib/node_format.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * node_format.c: node formatting
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-
-u8 *
-format_vlib_node_graph (u8 * s, va_list * va)
-{
-  vlib_node_main_t *nm = va_arg (*va, vlib_node_main_t *);
-  vlib_node_t *n = va_arg (*va, vlib_node_t *);
-  int i, j;
-  uword indent;
-  typedef struct
-  {
-    u32 next_node;
-    u32 next_slot;
-    u32 prev_node;
-  } tmp_t;
-  tmp_t *tmps = 0;
-  tmp_t empty = {.next_node = ~0,.prev_node = ~0 };
-
-  if (!n)
-    return format (s, "%=26s%=26s%=26s", "Name", "Next", "Previous");
-
-  s = format (s, "%-26v", n->name);
-
-  indent = format_get_indent (s);
-
-  for (i = j = 0; i < vec_len (n->next_nodes); i++)
-    {
-      if (n->next_nodes[i] == VLIB_INVALID_NODE_INDEX)
-	continue;
-      vec_validate_init_empty (tmps, j, empty);
-      tmps[j].next_node = n->next_nodes[i];
-      tmps[j].next_slot = i;
-      j++;
-    }
-
-  j = 0;
-  /* *INDENT-OFF* */
-  clib_bitmap_foreach (i, n->prev_node_bitmap, ({
-	vec_validate_init_empty (tmps, j, empty);
-	tmps[j].prev_node = i;
-	j++;
-      }));
-  /* *INDENT-ON* */
-
-  for (i = 0; i < vec_len (tmps); i++)
-    {
-      if (i > 0)
-	s = format (s, "\n%U", format_white_space, indent);
-
-      if (tmps[i].next_node != ~0)
-	{
-	  vlib_node_t *x;
-	  u8 *t = 0;
-
-	  x = vec_elt (nm->nodes, tmps[i].next_node);
-	  t = format (t, "%v [%d]", x->name, tmps[i].next_slot);
-	  s = format (s, "%=26v", t);
-	  vec_free (t);
-	}
-      else
-	s = format (s, "%26s", "");
-
-      if (tmps[i].prev_node != ~0)
-	{
-	  vlib_node_t *x;
-	  x = vec_elt (nm->nodes, tmps[i].prev_node);
-	  s = format (s, "%=26v", x->name);
-	}
-    }
-
-  vec_free (tmps);
-
-  return s;
-}
-
-u8 *
-format_vlib_node_and_next (u8 * s, va_list * va)
-{
-  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
-  vlib_node_t *n = va_arg (*va, vlib_node_t *);
-  u32 next_index = va_arg (*va, u32);
-  vlib_node_t *n_next;
-  u32 *ni;
-
-  ni = vec_elt_at_index (n->next_nodes, next_index);
-  n_next = vlib_get_node (vm, ni[0]);
-  return format (s, "%v -> %v", n->name, n_next->name);
-}
-
-u8 *
-format_vlib_node_name (u8 * s, va_list * va)
-{
-  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
-  u32 node_index = va_arg (*va, u32);
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-
-  return format (s, "%v", n->name);
-}
-
-u8 *
-format_vlib_next_node_name (u8 * s, va_list * va)
-{
-  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
-  u32 node_index = va_arg (*va, u32);
-  u32 next_index = va_arg (*va, u32);
-  vlib_node_t *next = vlib_get_next_node (vm, node_index, next_index);
-  return format (s, "%v", next->name);
-}
-
-/* Parse node name -> node index. */
-uword
-unformat_vlib_node (unformat_input_t * input, va_list * args)
-{
-  vlib_main_t *vm = va_arg (*args, vlib_main_t *);
-  u32 *result = va_arg (*args, u32 *);
-
-  return unformat_user (input, unformat_hash_vec_string,
-			vm->node_main.node_by_name, result);
-}
-
-u8 *
-format_vlib_time (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  f64 time = va_arg (*va, f64);
-  return format (s, "%12.4f", time);
-}
-
-u8 *
-format_vlib_cpu_time (u8 * s, va_list * va)
-{
-  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
-  u64 cpu_time = va_arg (*va, u64);
-  f64 dt;
-
-  dt =
-    (cpu_time -
-     vm->clib_time.init_cpu_time) * vm->clib_time.seconds_per_clock;
-  return format (s, "%U", format_vlib_time, vm, dt);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/node_funcs.h b/vlib/vlib/node_funcs.h
deleted file mode 100644
index 21167396..00000000
--- a/vlib/vlib/node_funcs.h
+++ /dev/null
@@ -1,1130 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * node_funcs.h: processing nodes global functions/inlines
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/** \file
-    vlib node functions
-*/
-
-
-#ifndef included_vlib_node_funcs_h
-#define included_vlib_node_funcs_h
-
-#include <vppinfra/fifo.h>
-
-/** \brief Get vlib node by index.
- @warning This function will ASSERT if @c i is out of range.
- @param vm vlib_main_t pointer, varies by thread
- @param i node index.
- @return pointer to the requested vlib_node_t.
-*/
-
-always_inline vlib_node_t *
-vlib_get_node (vlib_main_t * vm, u32 i)
-{
-  return vec_elt (vm->node_main.nodes, i);
-}
-
-/** \brief Get vlib node by graph arc (next) index.
- @param vm vlib_main_t pointer, varies by thread
- @param node_index index of original node
- @param next_index graph arc index
- @return pointer to the vlib_node_t at the end of the indicated arc
-*/
-
-always_inline vlib_node_t *
-vlib_get_next_node (vlib_main_t * vm, u32 node_index, u32 next_index)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *n;
-
-  n = vec_elt (nm->nodes, node_index);
-  ASSERT (next_index < vec_len (n->next_nodes));
-  return vlib_get_node (vm, n->next_nodes[next_index]);
-}
-
-/** \brief Get node runtime by node index.
- @param vm vlib_main_t pointer, varies by thread
- @param node_index index of node
- @return pointer to the indicated vlib_node_runtime_t
-*/
-
-always_inline vlib_node_runtime_t *
-vlib_node_get_runtime (vlib_main_t * vm, u32 node_index)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *n = vec_elt (nm->nodes, node_index);
-  vlib_process_t *p;
-  if (n->type != VLIB_NODE_TYPE_PROCESS)
-    return vec_elt_at_index (nm->nodes_by_type[n->type], n->runtime_index);
-  else
-    {
-      p = vec_elt (nm->processes, n->runtime_index);
-      return &p->node_runtime;
-    }
-}
-
-/** \brief Get node runtime private data by node index.
- @param vm vlib_main_t pointer, varies by thread
- @param node_index index of the node
- @return pointer to the indicated vlib_node_runtime_t private data
-*/
-
-always_inline void *
-vlib_node_get_runtime_data (vlib_main_t * vm, u32 node_index)
-{
-  vlib_node_runtime_t *r = vlib_node_get_runtime (vm, node_index);
-  return r->runtime_data;
-}
-
-/** \brief Set node runtime private data.
- @param vm vlib_main_t pointer, varies by thread
- @param node_index index of the node
- @param runtime_data arbitrary runtime private data
- @param n_runtime_data_bytes size of runtime private data
-*/
-
-always_inline void
-vlib_node_set_runtime_data (vlib_main_t * vm, u32 node_index,
-			    void *runtime_data, u32 n_runtime_data_bytes)
-{
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  vlib_node_runtime_t *r = vlib_node_get_runtime (vm, node_index);
-
-  n->runtime_data_bytes = n_runtime_data_bytes;
-  vec_free (n->runtime_data);
-  vec_add (n->runtime_data, runtime_data, n_runtime_data_bytes);
-
-  ASSERT (vec_len (n->runtime_data) <= sizeof (vlib_node_runtime_t) -
-	  STRUCT_OFFSET_OF (vlib_node_runtime_t, runtime_data));
-
-  if (vec_len (n->runtime_data) > 0)
-    clib_memcpy (r->runtime_data, n->runtime_data, vec_len (n->runtime_data));
-}
-
-/** \brief Set node dispatch state.
- @param vm vlib_main_t pointer, varies by thread
- @param node_index index of the node
- @param new_state new state for node, see vlib_node_state_t
-*/
-always_inline void
-vlib_node_set_state (vlib_main_t * vm, u32 node_index,
-		     vlib_node_state_t new_state)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *n;
-  vlib_node_runtime_t *r;
-
-  n = vec_elt (nm->nodes, node_index);
-  if (n->type == VLIB_NODE_TYPE_PROCESS)
-    {
-      vlib_process_t *p = vec_elt (nm->processes, n->runtime_index);
-      r = &p->node_runtime;
-
-      /* When disabling make sure flags are cleared. */
-      p->flags &= ~(VLIB_PROCESS_RESUME_PENDING
-		    | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK
-		    | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT);
-    }
-  else
-    r = vec_elt_at_index (nm->nodes_by_type[n->type], n->runtime_index);
-
-  ASSERT (new_state < VLIB_N_NODE_STATE);
-
-  if (n->type == VLIB_NODE_TYPE_INPUT)
-    {
-      ASSERT (nm->input_node_counts_by_state[n->state] > 0);
-      nm->input_node_counts_by_state[n->state] -= 1;
-      nm->input_node_counts_by_state[new_state] += 1;
-    }
-
-  n->state = new_state;
-  r->state = new_state;
-}
-
-always_inline void
-vlib_node_set_interrupt_pending (vlib_main_t * vm, u32 node_index)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *n = vec_elt (nm->nodes, node_index);
-  ASSERT (n->type == VLIB_NODE_TYPE_INPUT);
-  vec_add1 (nm->pending_interrupt_node_runtime_indices, n->runtime_index);
-}
-
-always_inline vlib_process_t *
-vlib_get_process_from_node (vlib_main_t * vm, vlib_node_t * node)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  ASSERT (node->type == VLIB_NODE_TYPE_PROCESS);
-  return vec_elt (nm->processes, node->runtime_index);
-}
-
-/* Fetches frame with given handle. */
-always_inline vlib_frame_t *
-vlib_get_frame_no_check (vlib_main_t * vm, uword frame_index)
-{
-  vlib_frame_t *f;
-  u32 cpu_index = frame_index & VLIB_CPU_MASK;
-  u32 offset = frame_index & VLIB_OFFSET_MASK;
-  vm = vlib_mains ? vlib_mains[cpu_index] : vm;
-  f = vm->heap_base + offset;
-  return f;
-}
-
-always_inline u32
-vlib_frame_index_no_check (vlib_main_t * vm, vlib_frame_t * f)
-{
-  u32 i;
-
-  ASSERT (((uword) f & VLIB_CPU_MASK) == 0);
-
-  vm = vlib_mains ? vlib_mains[f->cpu_index] : vm;
-
-  i = ((u8 *) f - (u8 *) vm->heap_base);
-  return i | f->cpu_index;
-}
-
-always_inline vlib_frame_t *
-vlib_get_frame (vlib_main_t * vm, uword frame_index)
-{
-  vlib_frame_t *f = vlib_get_frame_no_check (vm, frame_index);
-  ASSERT (f->flags & VLIB_FRAME_IS_ALLOCATED);
-  return f;
-}
-
-always_inline u32
-vlib_frame_index (vlib_main_t * vm, vlib_frame_t * f)
-{
-  uword i = vlib_frame_index_no_check (vm, f);
-  ASSERT (vlib_get_frame (vm, i) == f);
-  return i;
-}
-
-/* Byte alignment for vector arguments. */
-#define VLIB_FRAME_VECTOR_ALIGN (1 << 4)
-
-always_inline u32
-vlib_frame_vector_byte_offset (u32 scalar_size)
-{
-  return round_pow2 (sizeof (vlib_frame_t) + scalar_size,
-		     VLIB_FRAME_VECTOR_ALIGN);
-}
-
-/** \brief Get pointer to frame vector data.
- @param f vlib_frame_t pointer
- @return pointer to first vector element in frame
-*/
-always_inline void *
-vlib_frame_vector_args (vlib_frame_t * f)
-{
-  return (void *) f + vlib_frame_vector_byte_offset (f->scalar_size);
-}
-
-/** \brief Get pointer to frame scalar data.
-
- @warning This is almost certainly not the function you wish to call.
- See @ref vlib_frame_vector_args instead.
-
- @param f vlib_frame_t pointer
-
- @return arbitrary node scalar data
-
- @sa vlib_frame_vector_args
-*/
-always_inline void *
-vlib_frame_args (vlib_frame_t * f)
-{
-  return vlib_frame_vector_args (f) - f->scalar_size;
-}
-
-always_inline vlib_next_frame_t *
-vlib_node_runtime_get_next_frame (vlib_main_t * vm,
-				  vlib_node_runtime_t * n, u32 next_index)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_next_frame_t *nf;
-
-  ASSERT (next_index < n->n_next_nodes);
-  nf = vec_elt_at_index (nm->next_frames, n->next_frame_index + next_index);
-
-  if (CLIB_DEBUG > 0)
-    {
-      vlib_node_t *node, *next;
-      node = vec_elt (nm->nodes, n->node_index);
-      next = vec_elt (nm->nodes, node->next_nodes[next_index]);
-      ASSERT (nf->node_runtime_index == next->runtime_index);
-    }
-
-  return nf;
-}
-
-/** \brief Get pointer to frame by (@c node_index, @c next_index).
-
- @warning This is not a function that you should call directly.
- See @ref vlib_get_next_frame instead.
-
- @param vm vlib_main_t pointer, varies by thread
- @param node_index index of the node
- @param next_index graph arc index
-
- @return pointer to the requested vlib_next_frame_t
-
- @sa vlib_get_next_frame
-*/
-
-always_inline vlib_next_frame_t *
-vlib_node_get_next_frame (vlib_main_t * vm, u32 node_index, u32 next_index)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *n;
-  vlib_node_runtime_t *r;
-
-  n = vec_elt (nm->nodes, node_index);
-  r = vec_elt_at_index (nm->nodes_by_type[n->type], n->runtime_index);
-  return vlib_node_runtime_get_next_frame (vm, r, next_index);
-}
-
-vlib_frame_t *vlib_get_next_frame_internal (vlib_main_t * vm,
-					    vlib_node_runtime_t * node,
-					    u32 next_index,
-					    u32 alloc_new_frame);
-
-#define vlib_get_next_frame_macro(vm,node,next_index,vectors,n_vectors_left,alloc_new_frame) \
-do {									\
-  vlib_frame_t * _f							\
-    = vlib_get_next_frame_internal ((vm), (node), (next_index),		\
-				    (alloc_new_frame));			\
-  u32 _n = _f->n_vectors;						\
-  (vectors) = vlib_frame_vector_args (_f) + _n * sizeof ((vectors)[0]); \
-  (n_vectors_left) = VLIB_FRAME_SIZE - _n;				\
-} while (0)
-
-
-/** \brief Get pointer to next frame vector data by
-    (@c vlib_node_runtime_t, @c next_index).
- Standard single/dual loop boilerplate element.
- @attention This is a MACRO, with SIDE EFFECTS.
-
- @param vm vlib_main_t pointer, varies by thread
- @param node current node vlib_node_runtime_t pointer
- @param next_index requested graph arc index
-
- @return @c vectors -- pointer to next available vector slot
- @return @c n_vectors_left -- number of vector slots available
-*/
-#define vlib_get_next_frame(vm,node,next_index,vectors,n_vectors_left)	\
-  vlib_get_next_frame_macro (vm, node, next_index,			\
-			     vectors, n_vectors_left,			\
-			     /* alloc new frame */ 0)
-
-#define vlib_get_new_next_frame(vm,node,next_index,vectors,n_vectors_left) \
-  vlib_get_next_frame_macro (vm, node, next_index,			\
-			     vectors, n_vectors_left,			\
-			     /* alloc new frame */ 1)
-
-/** \brief Release pointer to next frame vector data.
- Standard single/dual loop boilerplate element.
- @param vm vlib_main_t pointer, varies by thread
- @param r current node vlib_node_runtime_t pointer
- @param next_index graph arc index
- @param n_packets_left number of slots still available in vector
-*/
-void
-vlib_put_next_frame (vlib_main_t * vm,
-		     vlib_node_runtime_t * r,
-		     u32 next_index, u32 n_packets_left);
-
-/* Combination get plus put.  Returns vector argument just added. */
-#define vlib_set_next_frame(vm,node,next_index,v)			\
-({									\
-  uword _n_left;							\
-  vlib_get_next_frame ((vm), (node), (next_index), (v), _n_left);	\
-  ASSERT (_n_left > 0);							\
-  vlib_put_next_frame ((vm), (node), (next_index), _n_left - 1);	\
-  (v);									\
-})
-
-always_inline void
-vlib_set_next_frame_buffer (vlib_main_t * vm,
-			    vlib_node_runtime_t * node,
-			    u32 next_index, u32 buffer_index)
-{
-  u32 *p;
-  p = vlib_set_next_frame (vm, node, next_index, p);
-  p[0] = buffer_index;
-}
-
-vlib_frame_t *vlib_get_frame_to_node (vlib_main_t * vm, u32 to_node_index);
-void vlib_put_frame_to_node (vlib_main_t * vm, u32 to_node_index,
-			     vlib_frame_t * f);
-
-always_inline vlib_process_t *
-vlib_get_current_process (vlib_main_t * vm)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  return vec_elt (nm->processes, nm->current_process_index);
-}
-
-always_inline uword
-vlib_in_process_context (vlib_main_t * vm)
-{
-  return vm->node_main.current_process_index != ~0;
-}
-
-always_inline uword
-vlib_current_process (vlib_main_t * vm)
-{
-  return vlib_get_current_process (vm)->node_runtime.node_index;
-}
-
-/** Returns TRUE if a process suspend time is less than 1us
-    @param dt - remaining poll time in seconds
-    @returns 1 if dt < 1e-6, 0 otherwise
-*/
-always_inline uword
-vlib_process_suspend_time_is_zero (f64 dt)
-{
-  return dt < 1e-6;
-}
-
-/** Suspend a vlib cooperative multi-tasking thread for a period of time
-    @param vm - vlib_main_t *
-    @param dt - suspend interval in seconds
-    @returns VLIB_PROCESS_RESUME_LONGJMP_RESUME, routinely ignored
-*/
-
-always_inline uword
-vlib_process_suspend (vlib_main_t * vm, f64 dt)
-{
-  uword r;
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_process_t *p = vec_elt (nm->processes, nm->current_process_index);
-  u64 dt_cpu = dt * vm->clib_time.clocks_per_second;
-
-  if (vlib_process_suspend_time_is_zero (dt))
-    return VLIB_PROCESS_RESUME_LONGJMP_RESUME;
-
-  p->flags |= VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK;
-  r = clib_setjmp (&p->resume_longjmp, VLIB_PROCESS_RESUME_LONGJMP_SUSPEND);
-  if (r == VLIB_PROCESS_RESUME_LONGJMP_SUSPEND)
-    {
-      p->resume_cpu_time = clib_cpu_time_now () + dt_cpu;
-      clib_longjmp (&p->return_longjmp, VLIB_PROCESS_RETURN_LONGJMP_SUSPEND);
-    }
-
-  return r;
-}
-
-always_inline void
-vlib_process_free_event_type (vlib_process_t * p, uword t,
-			      uword is_one_time_event)
-{
-  ASSERT (!pool_is_free_index (p->event_type_pool, t));
-  pool_put_index (p->event_type_pool, t);
-  if (is_one_time_event)
-    p->one_time_event_type_bitmap =
-      clib_bitmap_andnoti (p->one_time_event_type_bitmap, t);
-}
-
-always_inline void
-vlib_process_maybe_free_event_type (vlib_process_t * p, uword t)
-{
-  ASSERT (!pool_is_free_index (p->event_type_pool, t));
-  if (clib_bitmap_get (p->one_time_event_type_bitmap, t))
-    vlib_process_free_event_type (p, t, /* is_one_time_event */ 1);
-}
-
-always_inline void *
-vlib_process_get_event_data (vlib_main_t * vm,
-			     uword * return_event_type_opaque)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_process_t *p;
-  vlib_process_event_type_t *et;
-  uword t, l;
-  void *event_data_vector;
-
-  p = vec_elt (nm->processes, nm->current_process_index);
-
-  /* Find first type with events ready.
-     Return invalid type when there's nothing there. */
-  t = clib_bitmap_first_set (p->non_empty_event_type_bitmap);
-  if (t == ~0)
-    return 0;
-
-  p->non_empty_event_type_bitmap =
-    clib_bitmap_andnoti (p->non_empty_event_type_bitmap, t);
-
-  l = _vec_len (p->pending_event_data_by_type_index[t]);
-  ASSERT (l > 0);
-  event_data_vector = p->pending_event_data_by_type_index[t];
-  p->pending_event_data_by_type_index[t] = 0;
-
-  et = pool_elt_at_index (p->event_type_pool, t);
-
-  /* Return user's opaque value and possibly index. */
-  *return_event_type_opaque = et->opaque;
-
-  vlib_process_maybe_free_event_type (p, t);
-
-  return event_data_vector;
-}
-
-/* Return event data vector for later reuse.  We reuse event data to avoid
-   repeatedly allocating event vectors in cases where we care about speed. */
-always_inline void
-vlib_process_put_event_data (vlib_main_t * vm, void *event_data)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vec_add1 (nm->recycled_event_data_vectors, event_data);
-}
-
-/** Return the first event type which has occurred and a vector of per-event
-    data of that type, or a timeout indication
-
-    @param vm - vlib_main_t pointer
-    @param data_vector - pointer to a (uword *) vector to receive event data
-    @returns either an event type and a vector of per-event instance data,
-    or ~0 to indicate a timeout.
-*/
-
-always_inline uword
-vlib_process_get_events (vlib_main_t * vm, uword ** data_vector)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_process_t *p;
-  vlib_process_event_type_t *et;
-  uword r, t, l;
-
-  p = vec_elt (nm->processes, nm->current_process_index);
-
-  /* Find first type with events ready.
-     Return invalid type when there's nothing there. */
-  t = clib_bitmap_first_set (p->non_empty_event_type_bitmap);
-  if (t == ~0)
-    return t;
-
-  p->non_empty_event_type_bitmap =
-    clib_bitmap_andnoti (p->non_empty_event_type_bitmap, t);
-
-  l = _vec_len (p->pending_event_data_by_type_index[t]);
-  if (data_vector)
-    vec_add (*data_vector, p->pending_event_data_by_type_index[t], l);
-  _vec_len (p->pending_event_data_by_type_index[t]) = 0;
-
-  et = pool_elt_at_index (p->event_type_pool, t);
-
-  /* Return user's opaque value. */
-  r = et->opaque;
-
-  vlib_process_maybe_free_event_type (p, t);
-
-  return r;
-}
-
-always_inline uword
-vlib_process_get_events_helper (vlib_process_t * p, uword t,
-				uword ** data_vector)
-{
-  uword l;
-
-  p->non_empty_event_type_bitmap =
-    clib_bitmap_andnoti (p->non_empty_event_type_bitmap, t);
-
-  l = _vec_len (p->pending_event_data_by_type_index[t]);
-  if (data_vector)
-    vec_add (*data_vector, p->pending_event_data_by_type_index[t], l);
-  _vec_len (p->pending_event_data_by_type_index[t]) = 0;
-
-  vlib_process_maybe_free_event_type (p, t);
-
-  return l;
-}
-
-/* As above but query as specified type of event.  Returns number of
-   events found. */
-always_inline uword
-vlib_process_get_events_with_type (vlib_main_t * vm, uword ** data_vector,
-				   uword with_type_opaque)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_process_t *p;
-  uword t, *h;
-
-  p = vec_elt (nm->processes, nm->current_process_index);
-  h = hash_get (p->event_type_index_by_type_opaque, with_type_opaque);
-  if (!h)
-    /* This can happen when an event has not yet been
-       signaled with given opaque type. */
-    return 0;
-
-  t = h[0];
-  if (!clib_bitmap_get (p->non_empty_event_type_bitmap, t))
-    return 0;
-
-  return vlib_process_get_events_helper (p, t, data_vector);
-}
-
-always_inline uword *
-vlib_process_wait_for_event (vlib_main_t * vm)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_process_t *p;
-  uword r;
-
-  p = vec_elt (nm->processes, nm->current_process_index);
-  if (clib_bitmap_is_zero (p->non_empty_event_type_bitmap))
-    {
-      p->flags |= VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT;
-      r =
-	clib_setjmp (&p->resume_longjmp, VLIB_PROCESS_RESUME_LONGJMP_SUSPEND);
-      if (r == VLIB_PROCESS_RESUME_LONGJMP_SUSPEND)
-	clib_longjmp (&p->return_longjmp,
-		      VLIB_PROCESS_RETURN_LONGJMP_SUSPEND);
-    }
-
-  return p->non_empty_event_type_bitmap;
-}
-
-always_inline uword
-vlib_process_wait_for_one_time_event (vlib_main_t * vm,
-				      uword ** data_vector,
-				      uword with_type_index)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_process_t *p;
-  uword r;
-
-  p = vec_elt (nm->processes, nm->current_process_index);
-  ASSERT (!pool_is_free_index (p->event_type_pool, with_type_index));
-  while (!clib_bitmap_get (p->non_empty_event_type_bitmap, with_type_index))
-    {
-      p->flags |= VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT;
-      r =
-	clib_setjmp (&p->resume_longjmp, VLIB_PROCESS_RESUME_LONGJMP_SUSPEND);
-      if (r == VLIB_PROCESS_RESUME_LONGJMP_SUSPEND)
-	clib_longjmp (&p->return_longjmp,
-		      VLIB_PROCESS_RETURN_LONGJMP_SUSPEND);
-    }
-
-  return vlib_process_get_events_helper (p, with_type_index, data_vector);
-}
-
-always_inline uword
-vlib_process_wait_for_event_with_type (vlib_main_t * vm,
-				       uword ** data_vector,
-				       uword with_type_opaque)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_process_t *p;
-  uword r, *h;
-
-  p = vec_elt (nm->processes, nm->current_process_index);
-  h = hash_get (p->event_type_index_by_type_opaque, with_type_opaque);
-  while (!h || !clib_bitmap_get (p->non_empty_event_type_bitmap, h[0]))
-    {
-      p->flags |= VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT;
-      r =
-	clib_setjmp (&p->resume_longjmp, VLIB_PROCESS_RESUME_LONGJMP_SUSPEND);
-      if (r == VLIB_PROCESS_RESUME_LONGJMP_SUSPEND)
-	clib_longjmp (&p->return_longjmp,
-		      VLIB_PROCESS_RETURN_LONGJMP_SUSPEND);
-
-      /* See if unknown event type has been signaled now. */
-      if (!h)
-	h = hash_get (p->event_type_index_by_type_opaque, with_type_opaque);
-    }
-
-  return vlib_process_get_events_helper (p, h[0], data_vector);
-}
-
-/** Suspend a cooperative multi-tasking thread
-    Waits for an event, or for the indicated number of seconds to elapse
-    @param vm - vlib_main_t pointer
-    @param dt - timeout, in seconds.
-    @returns the remaining time interval
-*/
-
-always_inline f64
-vlib_process_wait_for_event_or_clock (vlib_main_t * vm, f64 dt)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_process_t *p;
-  f64 wakeup_time;
-  uword r;
-
-  p = vec_elt (nm->processes, nm->current_process_index);
-
-  if (vlib_process_suspend_time_is_zero (dt)
-      || !clib_bitmap_is_zero (p->non_empty_event_type_bitmap))
-    return dt;
-
-  wakeup_time = vlib_time_now (vm) + dt;
-
-  /* Suspend waiting for both clock and event to occur. */
-  p->flags |= (VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT
-	       | VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK);
-
-  r = clib_setjmp (&p->resume_longjmp, VLIB_PROCESS_RESUME_LONGJMP_SUSPEND);
-  if (r == VLIB_PROCESS_RESUME_LONGJMP_SUSPEND)
-    {
-      p->resume_cpu_time = (clib_cpu_time_now ()
-			    + (dt * vm->clib_time.clocks_per_second));
-      clib_longjmp (&p->return_longjmp, VLIB_PROCESS_RETURN_LONGJMP_SUSPEND);
-    }
-
-  /* Return amount of time still left to sleep.
-     If <= 0 then we've been waken up by the clock (and not an event). */
-  return wakeup_time - vlib_time_now (vm);
-}
-
-always_inline vlib_process_event_type_t *
-vlib_process_new_event_type (vlib_process_t * p, uword with_type_opaque)
-{
-  vlib_process_event_type_t *et;
-  pool_get (p->event_type_pool, et);
-  et->opaque = with_type_opaque;
-  return et;
-}
-
-always_inline uword
-vlib_process_create_one_time_event (vlib_main_t * vm, uword node_index,
-				    uword with_type_opaque)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  vlib_process_t *p = vec_elt (nm->processes, n->runtime_index);
-  vlib_process_event_type_t *et;
-  uword t;
-
-  et = vlib_process_new_event_type (p, with_type_opaque);
-  t = et - p->event_type_pool;
-  p->one_time_event_type_bitmap =
-    clib_bitmap_ori (p->one_time_event_type_bitmap, t);
-  return t;
-}
-
-always_inline void
-vlib_process_delete_one_time_event (vlib_main_t * vm, uword node_index,
-				    uword t)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  vlib_process_t *p = vec_elt (nm->processes, n->runtime_index);
-
-  ASSERT (clib_bitmap_get (p->one_time_event_type_bitmap, t));
-  vlib_process_free_event_type (p, t, /* is_one_time_event */ 1);
-}
-
-always_inline void *
-vlib_process_signal_event_helper (vlib_node_main_t * nm,
-				  vlib_node_t * n,
-				  vlib_process_t * p,
-				  uword t,
-				  uword n_data_elts, uword n_data_elt_bytes)
-{
-  uword p_flags, add_to_pending, delete_from_wheel;
-  void *data_to_be_written_by_caller;
-
-  ASSERT (!pool_is_free_index (p->event_type_pool, t));
-
-  vec_validate (p->pending_event_data_by_type_index, t);
-
-  /* Resize data vector and return caller's data to be written. */
-  {
-    void *data_vec = p->pending_event_data_by_type_index[t];
-    uword l;
-
-    if (!data_vec && vec_len (nm->recycled_event_data_vectors))
-      {
-	data_vec = vec_pop (nm->recycled_event_data_vectors);
-	_vec_len (data_vec) = 0;
-      }
-
-    l = vec_len (data_vec);
-
-    data_vec = _vec_resize (data_vec,
-			    /* length_increment */ n_data_elts,
-			    /* total size after increment */
-			    (l + n_data_elts) * n_data_elt_bytes,
-			    /* header_bytes */ 0, /* data_align */ 0);
-
-    p->pending_event_data_by_type_index[t] = data_vec;
-    data_to_be_written_by_caller = data_vec + l * n_data_elt_bytes;
-  }
-
-  p->non_empty_event_type_bitmap =
-    clib_bitmap_ori (p->non_empty_event_type_bitmap, t);
-
-  p_flags = p->flags;
-
-  /* Event was already signalled? */
-  add_to_pending = (p_flags & VLIB_PROCESS_RESUME_PENDING) == 0;
-
-  /* Process will resume when suspend time elapses? */
-  delete_from_wheel = 0;
-  if (p_flags & VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK)
-    {
-      /* Waiting for both event and clock? */
-      if (p_flags & VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_EVENT)
-	delete_from_wheel = 1;
-      else
-	/* Waiting only for clock.  Event will be queue and may be
-	   handled when timer expires. */
-	add_to_pending = 0;
-    }
-
-  /* Never add current process to pending vector since current process is
-     already running. */
-  add_to_pending &= nm->current_process_index != n->runtime_index;
-
-  if (add_to_pending)
-    {
-      u32 x = vlib_timing_wheel_data_set_suspended_process (n->runtime_index);
-      p->flags = p_flags | VLIB_PROCESS_RESUME_PENDING;
-      vec_add1 (nm->data_from_advancing_timing_wheel, x);
-      if (delete_from_wheel)
-	timing_wheel_delete (&nm->timing_wheel, x);
-    }
-
-  return data_to_be_written_by_caller;
-}
-
-always_inline void *
-vlib_process_signal_event_data (vlib_main_t * vm,
-				uword node_index,
-				uword type_opaque,
-				uword n_data_elts, uword n_data_elt_bytes)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  vlib_process_t *p = vec_elt (nm->processes, n->runtime_index);
-  uword *h, t;
-
-  h = hash_get (p->event_type_index_by_type_opaque, type_opaque);
-  if (!h)
-    {
-      vlib_process_event_type_t *et =
-	vlib_process_new_event_type (p, type_opaque);
-      t = et - p->event_type_pool;
-      hash_set (p->event_type_index_by_type_opaque, type_opaque, t);
-    }
-  else
-    t = h[0];
-
-  return vlib_process_signal_event_helper (nm, n, p, t, n_data_elts,
-					   n_data_elt_bytes);
-}
-
-always_inline void *
-vlib_process_signal_event_at_time (vlib_main_t * vm,
-				   f64 dt,
-				   uword node_index,
-				   uword type_opaque,
-				   uword n_data_elts, uword n_data_elt_bytes)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  vlib_process_t *p = vec_elt (nm->processes, n->runtime_index);
-  uword *h, t;
-
-  h = hash_get (p->event_type_index_by_type_opaque, type_opaque);
-  if (!h)
-    {
-      vlib_process_event_type_t *et =
-	vlib_process_new_event_type (p, type_opaque);
-      t = et - p->event_type_pool;
-      hash_set (p->event_type_index_by_type_opaque, type_opaque, t);
-    }
-  else
-    t = h[0];
-
-  if (vlib_process_suspend_time_is_zero (dt))
-    return vlib_process_signal_event_helper (nm, n, p, t, n_data_elts,
-					     n_data_elt_bytes);
-  else
-    {
-      vlib_signal_timed_event_data_t *te;
-      u64 dt_cpu = dt * vm->clib_time.clocks_per_second;
-
-      pool_get_aligned (nm->signal_timed_event_data_pool, te, sizeof (te[0]));
-
-      te->n_data_elts = n_data_elts;
-      te->n_data_elt_bytes = n_data_elt_bytes;
-      te->n_data_bytes = n_data_elts * n_data_elt_bytes;
-
-      /* Assert that structure fields are big enough. */
-      ASSERT (te->n_data_elts == n_data_elts);
-      ASSERT (te->n_data_elt_bytes == n_data_elt_bytes);
-      ASSERT (te->n_data_bytes == n_data_elts * n_data_elt_bytes);
-
-      te->process_node_index = n->runtime_index;
-      te->event_type_index = t;
-
-      timing_wheel_insert (&nm->timing_wheel, clib_cpu_time_now () + dt_cpu,
-			   vlib_timing_wheel_data_set_timed_event (te -
-								   nm->
-								   signal_timed_event_data_pool));
-
-      /* Inline data big enough to hold event? */
-      if (te->n_data_bytes < sizeof (te->inline_event_data))
-	return te->inline_event_data;
-      else
-	{
-	  te->event_data_as_vector = 0;
-	  vec_resize (te->event_data_as_vector, te->n_data_bytes);
-	  return te->event_data_as_vector;
-	}
-    }
-}
-
-always_inline void *
-vlib_process_signal_one_time_event_data (vlib_main_t * vm,
-					 uword node_index,
-					 uword type_index,
-					 uword n_data_elts,
-					 uword n_data_elt_bytes)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  vlib_process_t *p = vec_elt (nm->processes, n->runtime_index);
-  return vlib_process_signal_event_helper (nm, n, p, type_index, n_data_elts,
-					   n_data_elt_bytes);
-}
-
-always_inline void
-vlib_process_signal_event (vlib_main_t * vm,
-			   uword node_index, uword type_opaque, uword data)
-{
-  uword *d = vlib_process_signal_event_data (vm, node_index, type_opaque,
-					     1 /* elts */ , sizeof (uword));
-  d[0] = data;
-}
-
-always_inline void
-vlib_process_signal_event_pointer (vlib_main_t * vm,
-				   uword node_index,
-				   uword type_opaque, void *data)
-{
-  void **d = vlib_process_signal_event_data (vm, node_index, type_opaque,
-					     1 /* elts */ , sizeof (data));
-  d[0] = data;
-}
-
-always_inline void
-vlib_process_signal_one_time_event (vlib_main_t * vm,
-				    uword node_index,
-				    uword type_index, uword data)
-{
-  uword *d =
-    vlib_process_signal_one_time_event_data (vm, node_index, type_index,
-					     1 /* elts */ , sizeof (uword));
-  d[0] = data;
-}
-
-always_inline void
-vlib_signal_one_time_waiting_process (vlib_main_t * vm,
-				      vlib_one_time_waiting_process_t * p)
-{
-  vlib_process_signal_one_time_event (vm, p->node_index, p->one_time_event,
-				      /* data */ ~0);
-  memset (p, ~0, sizeof (p[0]));
-}
-
-always_inline void
-vlib_signal_one_time_waiting_process_vector (vlib_main_t * vm,
-					     vlib_one_time_waiting_process_t
-					     ** wps)
-{
-  vlib_one_time_waiting_process_t *wp;
-  vec_foreach (wp, *wps) vlib_signal_one_time_waiting_process (vm, wp);
-  vec_free (*wps);
-}
-
-always_inline void
-vlib_current_process_wait_for_one_time_event (vlib_main_t * vm,
-					      vlib_one_time_waiting_process_t
-					      * p)
-{
-  p->node_index = vlib_current_process (vm);
-  p->one_time_event = vlib_process_create_one_time_event (vm, p->node_index,	/* type opaque */
-							  ~0);
-  vlib_process_wait_for_one_time_event (vm,
-					/* don't care about data */ 0,
-					p->one_time_event);
-}
-
-always_inline void
-vlib_current_process_wait_for_one_time_event_vector (vlib_main_t * vm,
-						     vlib_one_time_waiting_process_t
-						     ** wps)
-{
-  vlib_one_time_waiting_process_t *wp;
-  vec_add2 (*wps, wp, 1);
-  vlib_current_process_wait_for_one_time_event (vm, wp);
-}
-
-always_inline u32
-vlib_node_runtime_update_main_loop_vector_stats (vlib_main_t * vm,
-						 vlib_node_runtime_t * node,
-						 uword n_vectors)
-{
-  u32 i, d, vi0, vi1;
-  u32 i0, i1;
-
-  ASSERT (is_pow2 (ARRAY_LEN (node->main_loop_vector_stats)));
-  i = ((vm->main_loop_count >> VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE)
-       & (ARRAY_LEN (node->main_loop_vector_stats) - 1));
-  i0 = i ^ 0;
-  i1 = i ^ 1;
-  d = ((vm->main_loop_count >> VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE)
-       -
-       (node->main_loop_count_last_dispatch >>
-	VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE));
-  vi0 = node->main_loop_vector_stats[i0];
-  vi1 = node->main_loop_vector_stats[i1];
-  vi0 = d == 0 ? vi0 : 0;
-  vi1 = d <= 1 ? vi1 : 0;
-  vi0 += n_vectors;
-  node->main_loop_vector_stats[i0] = vi0;
-  node->main_loop_vector_stats[i1] = vi1;
-  node->main_loop_count_last_dispatch = vm->main_loop_count;
-  /* Return previous counter. */
-  return node->main_loop_vector_stats[i1];
-}
-
-always_inline f64
-vlib_node_vectors_per_main_loop_as_float (vlib_main_t * vm, u32 node_index)
-{
-  vlib_node_runtime_t *rt = vlib_node_get_runtime (vm, node_index);
-  u32 v;
-
-  v = vlib_node_runtime_update_main_loop_vector_stats (vm, rt,	/* n_vectors */
-						       0);
-  return (f64) v / (1 << VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE);
-}
-
-always_inline u32
-vlib_node_vectors_per_main_loop_as_integer (vlib_main_t * vm, u32 node_index)
-{
-  vlib_node_runtime_t *rt = vlib_node_get_runtime (vm, node_index);
-  u32 v;
-
-  v = vlib_node_runtime_update_main_loop_vector_stats (vm, rt,	/* n_vectors */
-						       0);
-  return v >> VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE;
-}
-
-void
-vlib_frame_free (vlib_main_t * vm, vlib_node_runtime_t * r, vlib_frame_t * f);
-
-/* Add next node to given node in given slot. */
-uword
-vlib_node_add_next_with_slot (vlib_main_t * vm,
-			      uword node, uword next_node, uword slot);
-
-/* As above but adds to end of node's next vector. */
-always_inline uword
-vlib_node_add_next (vlib_main_t * vm, uword node, uword next_node)
-{
-  return vlib_node_add_next_with_slot (vm, node, next_node, ~0);
-}
-
-/* Add next node to given node in given slot. */
-uword
-vlib_node_add_named_next_with_slot (vlib_main_t * vm,
-				    uword node, char *next_name, uword slot);
-
-/* As above but adds to end of node's next vector. */
-always_inline uword
-vlib_node_add_named_next (vlib_main_t * vm, uword node, char *name)
-{
-  return vlib_node_add_named_next_with_slot (vm, node, name, ~0);
-}
-
-/* Query node given name. */
-vlib_node_t *vlib_get_node_by_name (vlib_main_t * vm, u8 * name);
-
-/* Rename a node. */
-void vlib_node_rename (vlib_main_t * vm, u32 node_index, char *fmt, ...);
-
-/* Register new packet processing node.  Nodes can be registered
-   dynamically via this call or statically via the VLIB_REGISTER_NODE
-   macro. */
-u32 vlib_register_node (vlib_main_t * vm, vlib_node_registration_t * r);
-
-/* Register all static nodes registered via VLIB_REGISTER_NODE. */
-void vlib_register_all_static_nodes (vlib_main_t * vm);
-
-/* Start a process. */
-void vlib_start_process (vlib_main_t * vm, uword process_index);
-
-/* Sync up runtime and main node stats. */
-void vlib_node_sync_stats (vlib_main_t * vm, vlib_node_t * n);
-
-/* Node graph initialization function. */
-clib_error_t *vlib_node_main_init (vlib_main_t * vm);
-
-format_function_t format_vlib_node_graph;
-format_function_t format_vlib_node_name;
-format_function_t format_vlib_next_node_name;
-format_function_t format_vlib_node_and_next;
-format_function_t format_vlib_cpu_time;
-format_function_t format_vlib_time;
-/* Parse node name -> node index. */
-unformat_function_t unformat_vlib_node;
-
-always_inline void
-vlib_node_increment_counter (vlib_main_t * vm, u32 node_index,
-			     u32 counter_index, u64 increment)
-{
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  vlib_error_main_t *em = &vm->error_main;
-  u32 node_counter_base_index = n->error_heap_index;
-  em->counters[node_counter_base_index + counter_index] += increment;
-}
-
-#endif /* included_vlib_node_funcs_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/parse.c b/vlib/vlib/parse.c
deleted file mode 100644
index 1c4500ce..00000000
--- a/vlib/vlib/parse.c
+++ /dev/null
@@ -1,1007 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/parse.h>
-
-#define PARSE_DEBUG 0
-
-u16 word_type_index, number_type_index, eof_type_index, rule_eof_type_index,
-  plus_type_index, minus_type_index, star_type_index, slash_type_index,
-  lpar_type_index, rpar_type_index;
-
-u8 *
-format_vlib_parse_value (u8 * s, va_list * args)
-{
-  vlib_parse_main_t *pm = va_arg (*args, vlib_parse_main_t *);
-  vlib_parse_type_t *type;
-  vlib_parse_value_t *v;
-  u16 type_index;
-
-  s = format (s, "%d items:\n", vec_len (pm->parse_value));
-  vec_foreach (v, pm->parse_value)
-  {
-    type_index = v->type;
-    type = pool_elt_at_index (pm->parse_types, type_index);
-    if (type->format_value)
-      s = format (s, "[%d]: %U\n", v - pm->parse_value,
-		  type->format_value, v);
-    else
-      s = format (s, "[%d]: (nofun)\n", v - pm->parse_value);
-  }
-  return s;
-}
-
-static u8 *
-format_vlib_parse_match (u8 * s, va_list * args)
-{
-  vlib_parse_match_t m = va_arg (*args, vlib_parse_match_t);
-  char *t = 0;
-  switch (m)
-    {
-#define _(a) case VLIB_PARSE_##a: t = #a; break;
-      foreach_parse_match_type
-#undef _
-    default:
-      t = 0;
-      break;
-    }
-
-  if (t)
-    return format (s, "%s", t);
-  else
-    return format (s, "unknown 0x%x", m);
-}
-
-static u8 *
-format_vlib_parse_item (u8 * s, va_list * args)
-{
-  vlib_parse_main_t *pm = va_arg (*args, vlib_parse_main_t *);
-  vlib_parse_item_t *item = va_arg (*args, vlib_parse_item_t *);
-  vlib_parse_type_t *type = pool_elt_at_index (pm->parse_types, item->type);
-
-  if (item->type == word_type_index)
-    s = format (s, "%s", item->value.as_pointer);
-  else
-    s = format (s, "<%s>", type->name);
-  return s;
-}
-
-static u8 *
-format_vlib_parse_graph (u8 * s, va_list * args)
-{
-  vlib_parse_main_t *pm = va_arg (*args, vlib_parse_main_t *);
-  vlib_parse_graph_t *node = va_arg (*args, vlib_parse_graph_t *);
-  vlib_parse_item_t *item;
-  vlib_parse_type_t *type;
-
-  /* $$$ hash table */
-  /* *INDENT-OFF* */
-  pool_foreach (type, pm->parse_types,
-                ({
-                  if (type->rule_index == node - pm->parse_graph)
-                    s = format (s, "\n<%s>\n", type->name);
-                }));
-/* *INDENT-ON* */
-
-  if (pm->root_index == (node - pm->parse_graph))
-    s = format (s, "\n<root>\n");
-
-  item = pool_elt_at_index (pm->parse_items, node->item);
-
-  s = format (s, "[%d] %U ", node - pm->parse_graph,
-	      format_vlib_parse_item, pm, item);
-
-  if (node->peer == (u32) ~ 0)
-    s = format (s, "peer nil  ");
-  else
-    s = format (s, "peer %4u ", node->peer);
-
-  if (node->deeper == (u32) ~ 0)
-    s = format (s, "deeper nil  ");
-  else
-    s = format (s, "deeper %4u ", node->deeper);
-
-  return s;
-}
-
-void
-dump_parse_graph (void)
-{
-  vlib_parse_main_t *pm = &vlib_parse_main;
-  vlib_parse_graph_t *node;
-
-  /* *INDENT-OFF* */
-  pool_foreach (node, pm->parse_graph, ({
-    fformat(stdout, "%U\n", format_vlib_parse_graph, pm, node);
-  }));
-/* *INDENT-ON* */
-}
-
-always_inline void
-parse_cleanup_value (vlib_parse_main_t * pm, vlib_parse_value_t * pv)
-{
-  vlib_parse_type_t *type = pool_elt_at_index (pm->parse_types, pv->type);
-  if (type->value_cleanup_function)
-    type->value_cleanup_function (pv);
-}
-
-static void
-parse_reset (vlib_parse_main_t * pm, u8 * input)
-{
-  vlib_lex_token_t *t;
-  vlib_parse_value_t *pv;
-
-  vlib_lex_reset (pm->lex_main, input);
-
-  vec_foreach (t, pm->tokens) vlib_lex_cleanup_token (t);
-
-  vec_foreach (pv, pm->parse_value) parse_cleanup_value (pm, pv);
-
-  _vec_len (pm->parse_value) = 0;
-  _vec_len (pm->tokens) = 0;
-  pm->current_token_index = 0;
-}
-
-static void
-parse_help (vlib_parse_main_t * pm, u32 index)
-{
-  vlib_parse_graph_t *node;
-  vlib_parse_item_t *item;
-  vlib_parse_type_t *type;
-  vlib_main_t *vm = pm->vlib_main;
-  u8 *help_input;
-  int i;
-
-  help_input = vec_dup (pm->lex_main->input_vector);
-
-  for (i = vec_len (help_input) - 1; i >= 0; i--)
-    if (help_input[i] == '?')
-      {
-	help_input[i] = 0;
-	_vec_len (help_input) = i;
-	break;
-      }
-
-  for (i = vec_len (help_input) - 1; i >= 0; i--)
-    {
-      if (help_input[i] != ' ' && help_input[i] != '\t')
-	break;
-      help_input[i] = 0;
-      break;
-    }
-  _vec_len (help_input) = i + 1;
-
-  while (index != (u32) ~ 0)
-    {
-      node = pool_elt_at_index (pm->parse_graph, index);
-      item = pool_elt_at_index (pm->parse_items, node->item);
-      type = pool_elt_at_index (pm->parse_types, item->type);
-
-      if (item->type == eof_type_index && vec_len (pm->match_items) == 0)
-	/* do nothing */ ;
-      else if (item->type == word_type_index)
-	vlib_cli_output (vm, "%s %s\n", help_input, item->value.as_pointer);
-      else
-	vlib_cli_output (vm, "%s <%s>\n", help_input, type->name);
-      index = node->peer;
-    }
-  vec_free (help_input);
-}
-
-static vlib_parse_match_t
-parse_eval_internal (vlib_parse_main_t * pm, u32 index)
-{
-  vlib_parse_graph_t *node;
-  vlib_parse_item_t *item;
-  vlib_parse_type_t *type;
-  vlib_parse_value_t value, *pv;
-  vlib_parse_match_t rv;
-  u32 *partial_matches = 0;
-  vlib_lex_token_t *t;
-  u32 save_token_index = (u32) ~ 0, save_match_items = 0;
-  int had_value = 0;
-
-  if (pm->current_token_index >= vec_len (pm->tokens))
-    return VLIB_PARSE_MATCH_FAIL;
-
-  /* current token */
-  t = vec_elt_at_index (pm->tokens, pm->current_token_index);
-
-  /* Help ? */
-  if (PREDICT_FALSE (t->token == VLIB_LEX_qmark))
-    {
-      parse_help (pm, index);
-      _vec_len (pm->match_items) = 0;
-      return VLIB_PARSE_MATCH_DONE;
-    }
-
-  /* Across all peers at this level of the parse graph */
-  while (index != (u32) ~ 0)
-    {
-      node = pool_elt_at_index (pm->parse_graph, index);
-      item = pool_elt_at_index (pm->parse_items, node->item);
-      type = pool_elt_at_index (pm->parse_types, item->type);
-
-      /*
-       * Save the token index. We may have to back up several
-       * trie plies. Type-specific match functions can consume
-       * multiple tokens, and they may not be optimally careful
-       */
-      save_token_index = pm->current_token_index;
-      save_match_items = vec_len (pm->match_items);
-      vec_add1 (pm->match_items, node->item);
-
-      if (PARSE_DEBUG > 1)
-	clib_warning ("Try to match token %U against node %d",
-		      format_vlib_lex_token, pm->lex_main, t, index);
-
-      /* Call the type-specific match function */
-      rv = type->match_function (pm, type, t, &value);
-
-      if (PARSE_DEBUG > 1)
-	clib_warning ("returned %U", format_vlib_parse_match, rv);
-
-      switch (rv)
-	{
-	case VLIB_PARSE_MATCH_VALUE:
-	  /*
-	   * Matched, and returned a value to append to the
-	   * set of args passed to the action function
-	   */
-	  value.type = item->type;
-	  vec_add1 (pm->parse_value, value);
-	  had_value = 1;
-	  /* fallthrough */
-
-	case VLIB_PARSE_MATCH_FULL:
-	unambiguous_partial_match:
-	  /* Consume the matched token */
-	  pm->current_token_index++;
-
-	  /* continue matching along this path */
-	  rv = parse_eval_internal (pm, node->deeper);
-
-	  /* this is not the right path */
-	  if (rv == VLIB_PARSE_MATCH_FAIL)
-	    {
-	      if (had_value)
-		{
-		  /* Delete the value */
-		  value = pm->parse_value[vec_len (pm->parse_value) - 1];
-		  parse_cleanup_value (pm, &value);
-		  _vec_len (pm->parse_value) -= 1;
-		}
-	      /* Continue with the next sibling */
-	      pm->current_token_index = save_token_index;
-	      _vec_len (pm->match_items) = save_match_items;
-	      index = node->peer;
-	      break;
-	    }
-	  return rv;
-
-	case VLIB_PARSE_MATCH_PARTIAL:
-	  /* Partial (substring) match, remember it but keep going */
-	  vec_add1 (partial_matches, node - pm->parse_graph);
-	  index = node->peer;
-	  break;
-
-	case VLIB_PARSE_MATCH_FAIL:
-	  /* Continue with the next sibling */
-	  index = node->peer;
-	  _vec_len (pm->match_items) = save_match_items;
-	  break;
-
-	case VLIB_PARSE_MATCH_DONE:
-	  /* Parse complete, invoke the action function */
-	  if (PARSE_DEBUG > 0)
-	    clib_warning ("parse_value: %U", format_vlib_parse_value, pm);
-
-	  {
-	    vlib_parse_eval_function_t *f = item->value.as_pointer;
-	    if (f)
-	      rv = f (pm, item, pm->parse_value);
-	  }
-
-	  vec_foreach (pv, pm->parse_value) parse_cleanup_value (pm, pv);
-	  _vec_len (pm->parse_value) = 0;
-	  _vec_len (pm->match_items) = 0;
-	  return rv;
-
-	case VLIB_PARSE_MATCH_AMBIGUOUS:
-	case VLIB_PARSE_MATCH_EVAL_FAIL:
-	case VLIB_PARSE_MATCH_RULE:
-	  _vec_len (pm->match_items) = save_match_items;
-	  return rv;
-	}
-    }
-
-  /*
-   * Out of siblings. If we have exactly one partial match
-   * we win
-   */
-  if (vec_len (partial_matches) == 1)
-    {
-      index = partial_matches[0];
-      node = pool_elt_at_index (pm->parse_graph, index);
-      vec_free (partial_matches);
-      goto unambiguous_partial_match;
-    }
-
-  /* Ordinary loser */
-  rv = VLIB_PARSE_MATCH_FAIL;
-
-  /* Ambiguous loser */
-  if (vec_len (partial_matches) > 1)
-    {
-      vec_free (partial_matches);
-      rv = VLIB_PARSE_MATCH_AMBIGUOUS;
-    }
-
-  _vec_len (pm->match_items) = save_match_items;
-  return rv;
-}
-
-vlib_parse_match_t
-rule_match (vlib_parse_main_t * pm, vlib_parse_type_t * type,
-	    vlib_lex_token_t * t, vlib_parse_value_t * valuep)
-{
-  vlib_parse_match_t rv;
-  static int recursion_level;
-
-  if (PARSE_DEBUG > 1)
-    clib_warning ("[%d]: try to match type %s graph index %d",
-		  recursion_level, type->name, type->rule_index);
-  recursion_level++;
-  rv = parse_eval_internal (pm, type->rule_index);
-  recursion_level--;
-
-  /* Break the recusive unwind here... */
-  if (rv == VLIB_PARSE_MATCH_RULE)
-    {
-      if (PARSE_DEBUG > 1)
-	clib_warning ("[%d]: type %s matched", recursion_level, type->name);
-
-      return VLIB_PARSE_MATCH_FULL;
-    }
-  else
-    {
-      if (PARSE_DEBUG > 1)
-	clib_warning ("[%d]: type %s returns %U", recursion_level, type->name,
-		      format_vlib_parse_match, rv);
-    }
-  return rv;
-}
-
-static int
-parse_eval (vlib_parse_main_t * pm, u8 * input)
-{
-  vlib_lex_token_t *t;
-
-  parse_reset (pm, input);
-
-  /* Tokenize the entire input vector */
-  do
-    {
-      vec_add2 (pm->tokens, t, 1);
-      vlib_lex_get_token (pm->lex_main, t);
-    }
-  while (t->token != VLIB_LEX_eof);
-
-  /* Feed it to the parser */
-  return parse_eval_internal (pm, pm->root_index);
-}
-
-/* Temporary vlib stub */
-vlib_parse_match_t
-vlib_parse_eval (u8 * input)
-{
-  return parse_eval (&vlib_parse_main, input);
-}
-
-u16
-parse_type_find_or_create (vlib_parse_main_t * pm, vlib_parse_type_t * t)
-{
-  uword *p;
-  vlib_parse_type_t *n;
-  u8 *name_copy;
-
-  p = hash_get_mem (pm->parse_type_by_name_hash, t->name);
-  if (p)
-    return p[0];
-
-  pool_get (pm->parse_types, n);
-  *n = *t;
-  n->rule_index = (u32) ~ 0;
-
-  name_copy = format (0, "%s%c", n->name, 0);
-
-  hash_set_mem (pm->parse_type_by_name_hash, name_copy, n - pm->parse_types);
-  return n - pm->parse_types;
-}
-
-u16
-parse_type_find_by_name (vlib_parse_main_t * pm, char *name)
-{
-  uword *p;
-
-  p = hash_get_mem (pm->parse_type_by_name_hash, name);
-  if (p)
-    return p[0];
-
-  return (u16) ~ 0;
-}
-
-u32
-parse_item_find_or_create (vlib_parse_main_t * pm, vlib_parse_item_t * item)
-{
-  uword *p;
-  vlib_parse_item_t *i;
-
-  /* Exact match the entire item */
-  p = mhash_get (&pm->parse_item_hash, item);
-  if (p)
-    return p[0];
-
-  pool_get (pm->parse_items, i);
-  *i = *item;
-
-  mhash_set (&pm->parse_item_hash, i, i - pm->parse_items, 0);
-  return i - pm->parse_items;
-}
-
-static void
-parse_type_and_graph_init (vlib_parse_main_t * pm)
-{
-  u32 eof_index;
-  vlib_parse_type_t type;
-  vlib_parse_item_t item;
-
-  memset (&type, 0, sizeof (type));
-
-#define foreach_token_type                      \
-  _ (eof)                                       \
-  _ (rule_eof)                                  \
-  _ (word)                                      \
-  _ (number)                                    \
-  _ (plus)                                      \
-  _ (minus)                                     \
-  _ (star)                                      \
-  _ (slash)                                     \
-  _ (lpar)                                      \
-  _ (rpar)
-
-#define _(a) a##_type_index = parse_type_find_by_name (pm, #a);
-  foreach_token_type
-#undef _
-    memset (&item, 0, sizeof (item));
-  item.type = eof_type_index;
-
-  eof_index = parse_item_find_or_create (pm, &item);
-  pm->root_index = (u32) ~ 0;
-
-#if 0
-  pool_get (pm->parse_graph, g);
-  memset (g, 0xff, sizeof (*g));
-  g->item = eof_index;
-  pm->root_index = 0;
-#endif
-}
-
-
-
-static void
-tokenize (vlib_parse_main_t * pm, parse_registration_t * pr)
-{
-  vlib_lex_token_t *t;
-  pm->register_input = format (pm->register_input,
-			       "%s%c", pr->initializer, 0);
-
-  parse_reset (pm, pm->register_input);
-
-  do
-    {
-      vec_add2 (pm->tokens, t, 1);
-      vlib_lex_get_token (pm->lex_main, t);
-    }
-  while (t->token != VLIB_LEX_eof);
-  _vec_len (pm->register_input) = 0;
-}
-
-static int
-is_typed_rule (vlib_parse_main_t * pm)
-{
-  vlib_lex_token_t *t = vec_elt_at_index (pm->tokens, 0);
-
-  /* <mytype> = blah blah blah */
-  if (vec_len (pm->tokens) >= 4
-      && t[0].token == VLIB_LEX_lt
-      && t[1].token == VLIB_LEX_word
-      && t[2].token == VLIB_LEX_gt && t[3].token == VLIB_LEX_equals)
-    return 1;
-  return 0;
-}
-
-static int
-token_matches_graph_node (vlib_parse_main_t * pm,
-			  vlib_lex_token_t * t,
-			  vlib_parse_graph_t * node,
-			  vlib_parse_item_t * item,
-			  vlib_parse_type_t * type, u32 * token_increment)
-{
-  /* EOFs don't match */
-  if (t->token == VLIB_LEX_eof)
-    return 0;
-
-  /* New chain element is a word */
-  if (t->token == VLIB_LEX_word)
-    {
-      /* but the item in hand is not a word */
-      if (item->type != word_type_index)
-	return 0;
-
-      /* Or it's not this particular word */
-      if (strcmp (t->value.as_pointer, item->value.as_pointer))
-	return 0;
-      *token_increment = 1;
-      return 1;
-    }
-  /* New chain element is a type-name: < TYPE-NAME > */
-  if (t->token == VLIB_LEX_lt)
-    {
-      u16 token_type_index;
-
-      /* < TYPE > */
-      if (t[1].token != VLIB_LEX_word || t[2].token != VLIB_LEX_gt)
-	{
-	  clib_warning (0, "broken type name in '%s'", pm->register_input);
-	  return 0;
-	}
-
-      token_type_index = parse_type_find_by_name (pm, t[1].value.as_pointer);
-      if (token_type_index == (u16) ~ 0)
-	{
-	  clib_warning (0, "unknown type '%s'", t[1].value.as_pointer);
-	  return 0;
-	}
-
-      /* Its a known type but does not match. */
-      if (item->type != token_type_index)
-	return 0;
-
-      *token_increment = 3;
-      return 1;
-    }
-  clib_warning ("BUG: t->token = %d", t->token);
-  return 0;
-}
-
-u32
-generate_subgraph_from_tokens (vlib_parse_main_t * pm,
-			       vlib_lex_token_t * t,
-			       u32 * new_subgraph_depth,
-			       parse_registration_t * pr, int not_a_rule)
-{
-  vlib_parse_graph_t *g, *last_g;
-  vlib_parse_item_t new_item;
-  u32 rv = (u32) ~ 0, new_item_index, last_index = (u32) ~ 0;
-  u16 token_type_index;
-  u32 depth = 0;
-
-  while (t < pm->tokens + vec_len (pm->tokens))
-    {
-      memset (&new_item, 0, sizeof (new_item));
-
-      if (t->token == VLIB_LEX_word)
-	{
-	  new_item.type = word_type_index;
-	  new_item.value.as_pointer = vec_dup ((u8 *) t->value.as_pointer);
-	  new_item_index = parse_item_find_or_create (pm, &new_item);
-	  t++;
-	}
-      else if (t->token == VLIB_LEX_lt)
-	{
-	  if (t[1].token != VLIB_LEX_word || t[2].token != VLIB_LEX_gt)
-	    {
-	      clib_warning ("broken type name in '%s'", pm->register_input);
-	      goto screwed;
-	    }
-	  token_type_index = parse_type_find_by_name (pm,
-						      t[1].value.as_pointer);
-	  if (token_type_index == (u16) ~ 0)
-	    {
-	      clib_warning ("unknown type 2 '%s'", t[1].value.as_pointer);
-	      goto screwed;
-	    }
-
-	  new_item.type = token_type_index;
-	  new_item.value.as_pointer = 0;
-	  new_item_index = parse_item_find_or_create (pm, &new_item);
-	  t += 3;		/* skip < <type-name> and > */
-	}
-      else if (t->token == VLIB_LEX_eof)
-	{
-	screwed:
-	  new_item.type = not_a_rule ? eof_type_index : rule_eof_type_index;
-	  new_item.value.as_pointer = pr->eof_match;
-	  new_item_index = parse_item_find_or_create (pm, &new_item);
-	  t++;
-	}
-      else
-	{
-	  clib_warning ("unexpected token %U index %d in '%s'",
-			format_vlib_lex_token, pm->lex_main, t,
-			t - pm->tokens, pm->register_input);
-	  goto screwed;
-	}
-
-      pool_get (pm->parse_graph, g);
-      memset (g, 0xff, sizeof (*g));
-      g->item = new_item_index;
-      depth++;
-
-      if (rv == (u32) ~ 0)
-	{
-	  rv = g - pm->parse_graph;
-	  last_index = rv;
-	}
-      else
-	{
-	  last_g = pool_elt_at_index (pm->parse_graph, last_index);
-	  last_index = last_g->deeper = g - pm->parse_graph;
-	}
-    }
-  *new_subgraph_depth = depth;
-  return rv;
-}
-
-static u32
-measure_depth (vlib_parse_main_t * pm, u32 index)
-{
-  vlib_parse_graph_t *node;
-  vlib_parse_item_t *item;
-  u32 max = 0;
-  u32 depth;
-
-  if (index == (u32) ~ 0)
-    return 0;
-
-  node = pool_elt_at_index (pm->parse_graph, index);
-  item = pool_elt_at_index (pm->parse_items, node->item);
-
-  if (item->type == eof_type_index)
-    return 1;
-
-  while (index != (u32) ~ 0)
-    {
-      node = pool_elt_at_index (pm->parse_graph, index);
-      depth = measure_depth (pm, node->deeper);
-      if (max < depth)
-	max = depth;
-      index = node->peer;
-    }
-
-  return max + 1;
-}
-
-static void
-add_subgraph_to_graph (vlib_parse_main_t * pm,
-		       u32 last_matching_index,
-		       u32 graph_root_index,
-		       u32 new_subgraph_index, u32 new_subgraph_depth)
-{
-  vlib_parse_graph_t *parent_node;
-  int new_subgraph_longest = 1;
-  u32 current_peer_index;
-  u32 current_depth;
-  vlib_parse_graph_t *current_peer = 0;
-  vlib_parse_graph_t *new_subgraph_node =
-    pool_elt_at_index (pm->parse_graph, new_subgraph_index);
-
-  /*
-   * Case 1: top-level peer. Splice into the top-level
-   * peer chain according to rule depth
-   */
-  if (last_matching_index == (u32) ~ 0)
-    {
-      u32 index = graph_root_index;
-      while (1)
-	{
-	  current_peer = pool_elt_at_index (pm->parse_graph, index);
-	  current_depth = measure_depth (pm, index);
-	  if (current_depth < new_subgraph_depth
-	      || current_peer->peer == (u32) ~ 0)
-	    break;
-	  index = current_peer->peer;
-	}
-      new_subgraph_node->peer = current_peer->peer;
-      current_peer->peer = new_subgraph_index;
-      return;
-    }
-
-  parent_node = pool_elt_at_index (pm->parse_graph, last_matching_index);
-  current_peer_index = parent_node->deeper;
-
-  while (current_peer_index != (u32) ~ 0)
-    {
-      current_peer = pool_elt_at_index (pm->parse_graph, current_peer_index);
-      current_depth = measure_depth (pm, current_peer_index);
-      if (current_depth < new_subgraph_depth)
-	break;
-      new_subgraph_longest = 0;
-      current_peer_index = current_peer->peer;
-    }
-
-  ASSERT (current_peer);
-
-  if (new_subgraph_longest)
-    {
-      new_subgraph_node->peer = parent_node->deeper;
-      parent_node->deeper = new_subgraph_index;
-    }
-  else
-    {
-      new_subgraph_node->peer = current_peer->peer;
-      current_peer->peer = new_subgraph_index;
-    }
-}
-
-static clib_error_t *
-parse_register_one (vlib_parse_main_t * pm, parse_registration_t * pr)
-{
-  u32 graph_root_index;
-  u16 subgraph_type_index = (u16) ~ 0;
-  vlib_parse_type_t *subgraph_type = 0;
-  vlib_lex_token_t *t;
-  vlib_parse_graph_t *node;
-  u32 node_index, last_index, token_increment, new_subgraph_index;
-  u32 new_subgraph_depth, last_matching_index;
-  vlib_parse_item_t *item;
-  vlib_parse_type_t *type;
-
-  int use_main_graph = 1;
-
-  tokenize (pm, pr);
-
-  /* A typed rule? */
-  if (is_typed_rule (pm))
-    {
-      /* Get the type and its current subgraph root, if any */
-      t = vec_elt_at_index (pm->tokens, 1);
-      subgraph_type_index = parse_type_find_by_name (pm, t->value.as_pointer);
-      if (subgraph_type_index == (u16) ~ 0)
-	return clib_error_return (0, "undeclared type '%s'",
-				  t->value.as_pointer);
-      subgraph_type =
-	pool_elt_at_index (pm->parse_types, subgraph_type_index);
-      graph_root_index = subgraph_type->rule_index;
-      /* Skip "mytype> = */
-      t += 3;
-      use_main_graph = 0;
-    }
-  else
-    {
-      /* top-level graph */
-      graph_root_index = pm->root_index;
-      t = vec_elt_at_index (pm->tokens, 0);
-    }
-
-  last_matching_index = (u32) ~ 0;
-  last_index = node_index = graph_root_index;
-
-  /* Find the first token which isn't already being parsed */
-  while (t < pm->tokens + vec_len (pm->tokens) && node_index != (u32) ~ 0)
-    {
-      node = pool_elt_at_index (pm->parse_graph, node_index);
-      item = pool_elt_at_index (pm->parse_items, node->item);
-      type = pool_elt_at_index (pm->parse_types, item->type);
-      last_index = node_index;
-
-      if (token_matches_graph_node
-	  (pm, t, node, item, type, &token_increment))
-	{
-	  t += token_increment;
-	  last_matching_index = node_index;
-	  node_index = node->deeper;
-	}
-      else
-	node_index = node->peer;
-    }
-
-  new_subgraph_index =
-    generate_subgraph_from_tokens (pm, t, &new_subgraph_depth, pr,
-				   use_main_graph);
-
-  /* trivial cases: first graph node or first type rule */
-  if (graph_root_index == (u32) ~ 0)
-    {
-      if (use_main_graph)
-	pm->root_index = new_subgraph_index;
-      else
-	subgraph_type->rule_index = new_subgraph_index;
-      return 0;
-    }
-
-  add_subgraph_to_graph (pm, last_matching_index, graph_root_index,
-			 new_subgraph_index, new_subgraph_depth);
-  return 0;
-}
-
-static clib_error_t *
-parse_register (vlib_main_t * vm,
-		parse_registration_t * lo,
-		parse_registration_t * hi, vlib_parse_main_t * pm)
-{
-  parse_registration_t *pr;
-
-  for (pr = lo; pr < hi; pr = vlib_elf_section_data_next (pr, 0))
-    vec_add1 (pm->parse_registrations, pr);
-
-  return 0;
-}
-
-static clib_error_t *
-parse_register_one_type (vlib_parse_main_t * pm, vlib_parse_type_t * rp)
-{
-  (void) parse_type_find_or_create (pm, (vlib_parse_type_t *) rp);
-  return 0;
-}
-
-static clib_error_t *
-parse_type_register (vlib_main_t * vm,
-		     vlib_parse_type_t * lo,
-		     vlib_parse_type_t * hi, vlib_parse_main_t * pm)
-{
-  clib_error_t *error = 0;
-  vlib_parse_type_t *ptr;
-
-  for (ptr = lo; ptr < hi; ptr = vlib_elf_section_data_next (ptr, 0))
-    {
-      error = parse_register_one_type (pm, ptr);
-      if (error)
-	goto done;
-    }
-
-done:
-  return error;
-}
-
-clib_error_t *vlib_stdlex_init (vlib_main_t * vm) __attribute__ ((weak));
-clib_error_t *
-vlib_stdlex_init (vlib_main_t * vm)
-{
-  (void) vlib_lex_add_table ("ignore_everything");
-  return 0;
-}
-
-static int
-compute_rule_length (parse_registration_t * r)
-{
-  int length, i;
-  vlib_parse_main_t *pm = &vlib_parse_main;
-
-  if (r->rule_length)
-    return r->rule_length;
-
-  length = 0;
-
-  tokenize (pm, r);
-  length = vec_len (pm->tokens);
-
-  /* Account for "<foo> = " in "<foo> = bar" etc. */
-  if (is_typed_rule (pm))
-    length -= 2;
-
-  for (i = 0; i < vec_len (pm->tokens); i++)
-    {
-      switch (pm->tokens[i].token)
-	{
-	case VLIB_LEX_lt:
-	case VLIB_LEX_gt:
-	  length -= 1;
-
-	default:
-	  break;
-	}
-    }
-
-  ASSERT (length > 0);
-  r->rule_length = length;
-  return length;
-}
-
-static int
-rule_length_compare (parse_registration_t * r1, parse_registration_t * r2)
-{
-  compute_rule_length (r1);
-  compute_rule_length (r2);
-  /* Descending sort */
-  return r2->rule_length - r1->rule_length;
-}
-
-
-static clib_error_t *
-parse_init (vlib_main_t * vm)
-{
-  vlib_parse_main_t *pm = &vlib_parse_main;
-  vlib_lex_main_t *lm = &vlib_lex_main;
-  vlib_elf_section_bounds_t *b, *bounds;
-  clib_error_t *error = 0;
-  parse_registration_t *rule;
-  int i;
-
-  if ((error = vlib_call_init_function (vm, lex_onetime_init)))
-    return error;
-
-  if ((error = vlib_stdlex_init (vm)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, parse_builtin_init)))
-    return error;
-
-  pm->vlib_main = vm;
-  pm->lex_main = lm;
-
-  mhash_init (&pm->parse_item_hash, sizeof (u32), sizeof (vlib_parse_item_t));
-  pm->parse_type_by_name_hash = hash_create_string (0, sizeof (u32));
-
-  vec_validate (pm->parse_value, 16);
-  vec_validate (pm->tokens, 16);
-  vec_validate (pm->register_input, 32);
-  vec_validate (pm->match_items, 16);
-
-  _vec_len (pm->parse_value) = 0;
-  _vec_len (pm->tokens) = 0;
-  _vec_len (pm->register_input) = 0;
-  _vec_len (pm->match_items) = 0;
-
-  bounds = vlib_get_elf_section_bounds (vm, "parse_type_registrations");
-  vec_foreach (b, bounds)
-  {
-    error = parse_type_register (vm, b->lo, b->hi, pm);
-    if (error)
-      break;
-  }
-  vec_free (bounds);
-
-  parse_type_and_graph_init (pm);
-
-  bounds = vlib_get_elf_section_bounds (vm, "parse_registrations");
-  vec_foreach (b, bounds)
-  {
-    error = parse_register (vm, b->lo, b->hi, pm);
-    if (error)
-      break;
-  }
-  vec_free (bounds);
-
-  vec_sort_with_function (pm->parse_registrations, rule_length_compare);
-
-  for (i = 0; i < vec_len (pm->parse_registrations); i++)
-    {
-      rule = pm->parse_registrations[i];
-      parse_register_one (pm, rule);
-    }
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (parse_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/parse.h b/vlib/vlib/parse.h
deleted file mode 100644
index 036e7447..00000000
--- a/vlib/vlib/parse.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vlib_parse_h
-#define included_vlib_parse_h
-
-#include <vlib/vlib.h>
-#include <vlib/lex.h>
-#include <vppinfra/mhash.h>
-
-typedef struct
-{
-  /* Word aligned value. */
-  union
-  {
-    u8 as_u8[32 - 1 * sizeof (u16)];
-    void *as_pointer;
-    uword as_uword;
-    word as_word;
-    u64 as_u64;
-  } value;
-
-  /* 16 bit type at end so that 30 bytes of value are aligned. */
-  u16 type;
-} __attribute ((packed))
-  vlib_parse_value_t;
-
-/* Instance of a type. */
-     typedef struct
-     {
-       u32
-	 type;
-
-       u32
-	 origin;
-
-       u32
-	 help_index;
-
-       union
-       {
-	 void *
-	   as_pointer;
-	 uword
-	   as_uword;
-       } value;
-     } vlib_parse_item_t;
-
-     typedef struct
-     {
-       /* Index of item for this node. */
-       u32
-	 item;
-
-       /* Graph index of peer (sibling) node (linked list of peers). */
-       u32
-	 peer;
-
-       /* Graph index of deeper (child) node (linked list of children). */
-       u32
-	 deeper;
-     } vlib_parse_graph_t;
-
-#define foreach_parse_match_type                \
-  _(MATCH_DONE)					\
-  _(MATCH_RULE)					\
-  _(MATCH_FAIL)					\
-  _(MATCH_FULL)					\
-  _(MATCH_VALUE)				\
-  _(MATCH_PARTIAL)				\
-  _(MATCH_AMBIGUOUS)				\
-  _(MATCH_EVAL_FAIL)
-
-     typedef enum
-     {
-#define _(a) VLIB_PARSE_##a,
-       foreach_parse_match_type
-#undef _
-     } vlib_parse_match_t;
-
-     struct vlib_parse_type;
-     struct vlib_parse_main;
-
-     typedef
-     vlib_parse_match_t (vlib_parse_match_function_t)
-  (struct vlib_parse_main *,
-   struct vlib_parse_type *, vlib_lex_token_t *, vlib_parse_value_t *);
-     typedef void (vlib_parse_value_cleanup_function_t) (vlib_parse_value_t
-							 *);
-
-     typedef struct vlib_parse_type
-     {
-       /* Type name. */
-       char *
-	 name;
-
-       vlib_parse_match_function_t *
-	 match_function;
-
-       vlib_parse_value_cleanup_function_t *
-	 value_cleanup_function;
-
-       format_function_t *
-	 format_value;
-
-       u32
-	 rule_index;
-     } vlib_parse_type_t;
-
-     typedef struct
-     {
-       char *
-	 initializer;
-       void *
-	 eof_match;
-       int
-	 rule_length;
-     } parse_registration_t;
-
-     typedef struct vlib_parse_main
-     {
-       /* (type, origin, help, value) tuples */
-       vlib_parse_item_t *
-	 parse_items;
-       mhash_t
-	 parse_item_hash;
-
-       /* (item, peer, deeper) tuples */
-       vlib_parse_graph_t *
-	 parse_graph;
-       u32
-	 root_index;
-
-       u8 *
-	 register_input;
-
-       /* parser types */
-       vlib_parse_type_t *
-	 parse_types;
-       uword *
-	 parse_type_by_name_hash;
-
-       /* Vector of MATCH_VALUEs */
-       vlib_parse_value_t *
-	 parse_value;
-       u32 *
-	 match_items;
-
-       /* Parse registrations */
-       parse_registration_t **
-	 parse_registrations;
-
-       /* Token vector */
-       vlib_lex_token_t *
-	 tokens;
-       u32
-	 current_token_index;
-
-       vlib_lex_main_t *
-	 lex_main;
-       vlib_main_t *
-	 vlib_main;
-     } vlib_parse_main_t;
-
-     vlib_parse_main_t
-       vlib_parse_main;
-
-     typedef
-     vlib_parse_match_t (vlib_parse_eval_function_t)
-  (vlib_parse_main_t *, vlib_parse_item_t *, vlib_parse_value_t *);
-
-vlib_parse_match_t
-vlib_parse_eval (u8 * input);
-
-     format_function_t format_vlib_parse_value;
-
-/* FIXME need these to be global? */
-     vlib_parse_match_function_t rule_match, eof_match, word_match,
-       number_match;
-
-#define _PARSE_REGISTRATION_DATA(x) \
-VLIB_ELF_SECTION_DATA(x##_registration,parse_registration_t,parse_registrations)
-
-#define PARSE_INIT(x, s, e)                     \
-static _PARSE_REGISTRATION_DATA(x) = {          \
-    .initializer = s,                           \
-    .eof_match = e,                             \
-};
-
-#define _PARSE_TYPE_REGISTRATION_DATA(x) \
-VLIB_ELF_SECTION_DATA(x##_type_registration,vlib_parse_type_t, \
-parse_type_registrations)
-
-#define PARSE_TYPE_INIT(n, m, c, f)             \
-static _PARSE_TYPE_REGISTRATION_DATA(n) = {     \
-    .name = #n,                                 \
-    .match_function = m,			\
-    .value_cleanup_function = c,		\
-    .format_value = f,				\
-};
-
-#endif /* included_vlib_parse_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/parse_builtin.c b/vlib/vlib/parse_builtin.c
deleted file mode 100644
index 0ce716b5..00000000
--- a/vlib/vlib/parse_builtin.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/parse.h>
-
-always_inline void *
-parse_last_match_value (vlib_parse_main_t * pm)
-{
-  vlib_parse_item_t *i;
-  i = pool_elt_at_index (pm->parse_items,
-			 vec_elt (pm->match_items,
-				  vec_len (pm->match_items) - 1));
-  return i->value.as_pointer;
-}
-
-vlib_parse_match_t
-eof_match (vlib_parse_main_t * pm, vlib_parse_type_t * type,
-	   vlib_lex_token_t * t, vlib_parse_value_t * valuep)
-{
-  return t->token ==
-    VLIB_LEX_eof ? VLIB_PARSE_MATCH_DONE : VLIB_PARSE_MATCH_FAIL;
-}
-
-PARSE_TYPE_INIT (eof, eof_match, 0 /* cleanup value */ ,
-		 0 /* format value */ );
-
-vlib_parse_match_t
-rule_eof_match (vlib_parse_main_t * pm, vlib_parse_type_t * type,
-		vlib_lex_token_t * t, vlib_parse_value_t * valuep)
-{
-  vlib_parse_match_function_t *fp = parse_last_match_value (pm);
-  pm->current_token_index--;
-  return fp ? fp (pm, type, t, valuep) : VLIB_PARSE_MATCH_RULE;
-}
-
-PARSE_TYPE_INIT (rule_eof, rule_eof_match, 0, 0);
-
-vlib_parse_match_t
-word_match (vlib_parse_main_t * pm, vlib_parse_type_t * type,
-	    vlib_lex_token_t * t, vlib_parse_value_t * valuep)
-{
-  u8 *tv, *iv;
-  int i;
-
-  if (t->token != VLIB_LEX_word)
-    return VLIB_PARSE_MATCH_FAIL;
-
-  tv = t->value.as_pointer;
-  iv = parse_last_match_value (pm);
-
-  for (i = 0; tv[i]; i++)
-    {
-      if (tv[i] != iv[i])
-	return VLIB_PARSE_MATCH_FAIL;
-    }
-
-  return iv[i] == 0 ? VLIB_PARSE_MATCH_FULL : VLIB_PARSE_MATCH_PARTIAL;
-}
-
-PARSE_TYPE_INIT (word, word_match, 0 /* clnup value */ ,
-		 0 /* format value */ );
-
-vlib_parse_match_t
-number_match (vlib_parse_main_t * pm, vlib_parse_type_t * type,
-	      vlib_lex_token_t * t, vlib_parse_value_t * valuep)
-{
-  if (t->token == VLIB_LEX_number)
-    {
-      valuep->value.as_uword = t->value.as_uword;
-      return VLIB_PARSE_MATCH_VALUE;
-    }
-  return VLIB_PARSE_MATCH_FAIL;
-}
-
-static u8 *
-format_value_number (u8 * s, va_list * args)
-{
-  vlib_parse_value_t *v = va_arg (*args, vlib_parse_value_t *);
-  uword a = v->value.as_uword;
-
-  if (BITS (uword) == 64)
-    s = format (s, "%lld(0x%llx)", a, a);
-  else
-    s = format (s, "%ld(0x%lx)", a, a);
-  return s;
-}
-
-PARSE_TYPE_INIT (number, number_match, 0 /* cln value */ ,
-		 format_value_number /* fmt value */ );
-
-
-#define foreach_vanilla_lex_match_function      \
-    _(plus)                                     \
-    _(minus)                                    \
-    _(star)                                     \
-    _(slash)                                    \
-    _(lpar)                                     \
-    _(rpar)
-
-#define LEX_MATCH_DEBUG 0
-
-#define _(name)                                                 \
-vlib_parse_match_t name##_match (vlib_parse_main_t *pm,         \
-                                 vlib_parse_type_t *type,       \
-                                 vlib_lex_token_t *t,           \
-                                 vlib_parse_value_t *valuep)    \
-{                                                               \
-  if (LEX_MATCH_DEBUG > 0)                                      \
-    clib_warning ("against %U returns %s",                      \
-                  format_vlib_lex_token, pm->lex_main, t,       \
-                  (t->token == VLIB_LEX_##name)                 \
-                  ? "VLIB_PARSE_MATCH_FULL" :                   \
-                  "VLIB_PARSE_MATCH_FAIL");                     \
-  if (t->token == VLIB_LEX_##name)                              \
-    return VLIB_PARSE_MATCH_FULL;                               \
-  return VLIB_PARSE_MATCH_FAIL;                                 \
-}                                                               \
-                                                                \
-PARSE_TYPE_INIT (name, name##_match, 0 /* cln value */,         \
-                 0 /* fmt val */);
-
-foreach_vanilla_lex_match_function
-#undef _
-/* So we're linked in. */
-static clib_error_t *
-parse_builtin_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (parse_builtin_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/pci/linux_pci.c b/vlib/vlib/pci/linux_pci.c
deleted file mode 100644
index f9ee47ac..00000000
--- a/vlib/vlib/pci/linux_pci.c
+++ /dev/null
@@ -1,642 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pci.c: Linux user space PCI bus management.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vlib/pci/pci.h>
-#include <vlib/unix/unix.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <linux/ethtool.h>
-#include <linux/sockios.h>
-
-typedef struct
-{
-  /* /sys/bus/pci/devices/... directory name for this device. */
-  u8 *dev_dir_name;
-
-  /* Resource file descriptors. */
-  int *resource_fds;
-
-  /* File descriptor for config space read/write. */
-  int config_fd;
-
-  /* File descriptor for /dev/uio%d */
-  int uio_fd;
-
-  /* Minor device for uio device. */
-  u32 uio_minor;
-
-  /* Index given by unix_file_add. */
-  u32 unix_file_index;
-
-} linux_pci_device_t;
-
-/* Pool of PCI devices. */
-typedef struct
-{
-  vlib_main_t *vlib_main;
-  linux_pci_device_t *linux_pci_devices;
-} linux_pci_main_t;
-
-extern linux_pci_main_t linux_pci_main;
-
-/* Call to allocate/initialize the pci subsystem.
-   This is not an init function so that users can explicitly enable
-   pci only when it's needed. */
-clib_error_t *pci_bus_init (vlib_main_t * vm);
-
-clib_error_t *vlib_pci_bind_to_uio (vlib_pci_device_t * d,
-				    char *uio_driver_name);
-
-linux_pci_main_t linux_pci_main;
-
-clib_error_t *
-vlib_pci_bind_to_uio (vlib_pci_device_t * d, char *uio_driver_name)
-{
-  clib_error_t *error = 0;
-  u8 *s = 0;
-  DIR *dir = 0;
-  struct dirent *e;
-  int fd;
-  u8 *dev_dir_name = format (0, "/sys/bus/pci/devices/%U",
-			     format_vlib_pci_addr, &d->bus_address);
-
-  /* if uio sub-directory exists, we are fine, device is
-     already bound to UIO driver */
-  s = format (s, "%v/uio%c", dev_dir_name, 0);
-  if (access ((char *) s, F_OK) == 0)
-    goto done;
-  vec_reset_length (s);
-
-  /* walk trough all linux interfaces and if interface belonging to
-     this device is founf check if interface is admin up  */
-  dir = opendir ("/sys/class/net");
-  s = format (s, "%U%c", format_vlib_pci_addr, &d->bus_address, 0);
-
-  if (!dir)
-    {
-      error = clib_error_return (0, "Skipping PCI device %U: failed to "
-				 "read /sys/class/net",
-				 format_vlib_pci_addr, &d->bus_address);
-      goto done;
-    }
-
-  fd = socket (PF_INET, SOCK_DGRAM, 0);
-  if (fd < 0)
-    {
-      error = clib_error_return_unix (0, "socket");
-      goto done;
-    }
-
-  while ((e = readdir (dir)))
-    {
-      struct ifreq ifr;
-      struct ethtool_drvinfo drvinfo;
-
-      if (e->d_name[0] == '.')	/* skip . and .. */
-	continue;
-
-      memset (&ifr, 0, sizeof ifr);
-      memset (&drvinfo, 0, sizeof drvinfo);
-      ifr.ifr_data = (char *) &drvinfo;
-      strncpy (ifr.ifr_name, e->d_name, IFNAMSIZ - 1);
-      drvinfo.cmd = ETHTOOL_GDRVINFO;
-      if (ioctl (fd, SIOCETHTOOL, &ifr) < 0)
-	{
-	  /* Some interfaces (eg "lo") don't support this ioctl */
-	  if ((errno != ENOTSUP) && (errno != ENODEV))
-	    clib_unix_warning ("ioctl fetch intf %s bus info error",
-			       e->d_name);
-	  continue;
-	}
-
-      if (strcmp ((char *) s, drvinfo.bus_info))
-	continue;
-
-      memset (&ifr, 0, sizeof (ifr));
-      strncpy (ifr.ifr_name, e->d_name, IFNAMSIZ - 1);
-      if (ioctl (fd, SIOCGIFFLAGS, &ifr) < 0)
-	{
-	  error = clib_error_return_unix (0, "ioctl fetch intf %s flags",
-					  e->d_name);
-	  close (fd);
-	  goto done;
-	}
-
-      if (ifr.ifr_flags & IFF_UP)
-	{
-	  error = clib_error_return (0, "Skipping PCI device %U as host "
-				     "interface %s is up",
-				     format_vlib_pci_addr, &d->bus_address,
-				     e->d_name);
-	  close (fd);
-	  goto done;
-	}
-    }
-
-  close (fd);
-  vec_reset_length (s);
-
-  s = format (s, "%v/driver/unbind%c", dev_dir_name, 0);
-  vlib_sysfs_write ((char *) s, "%U", format_vlib_pci_addr, &d->bus_address);
-  vec_reset_length (s);
-
-  s = format (s, "/sys/bus/pci/drivers/%s/new_id%c", uio_driver_name, 0);
-  vlib_sysfs_write ((char *) s, "0x%04x 0x%04x", d->vendor_id, d->device_id);
-  vec_reset_length (s);
-
-  s = format (s, "/sys/bus/pci/drivers/%s/bind%c", uio_driver_name, 0);
-  vlib_sysfs_write ((char *) s, "%U", format_vlib_pci_addr, &d->bus_address);
-
-done:
-  closedir (dir);
-  vec_free (s);
-  vec_free (dev_dir_name);
-  return error;
-}
-
-
-static clib_error_t *
-scan_uio_dir (void *arg, u8 * path_name, u8 * file_name)
-{
-  linux_pci_device_t *l = arg;
-  unformat_input_t input;
-
-  unformat_init_string (&input, (char *) file_name, vec_len (file_name));
-
-  if (!unformat (&input, "uio%d", &l->uio_minor))
-    abort ();
-
-  unformat_free (&input);
-  return 0;
-}
-
-static clib_error_t *
-linux_pci_uio_read_ready (unix_file_t * uf)
-{
-  vlib_pci_main_t *pm = &pci_main;
-  vlib_pci_device_t *d;
-  int __attribute__ ((unused)) rv;
-
-  u32 icount;
-  rv = read (uf->file_descriptor, &icount, 4);
-
-  d = pool_elt_at_index (pm->pci_devs, uf->private_data);
-
-  if (d->interrupt_handler)
-    d->interrupt_handler (d);
-
-  vlib_pci_intr_enable (d);
-
-  return /* no error */ 0;
-}
-
-static clib_error_t *
-linux_pci_uio_error_ready (unix_file_t * uf)
-{
-  u32 error_index = (u32) uf->private_data;
-
-  return clib_error_return (0, "pci device %d: error", error_index);
-}
-
-static void
-add_device (vlib_pci_device_t * dev, linux_pci_device_t * pdev)
-{
-  vlib_pci_main_t *pm = &pci_main;
-  linux_pci_main_t *lpm = &linux_pci_main;
-  linux_pci_device_t *l;
-
-  pool_get (lpm->linux_pci_devices, l);
-  l[0] = pdev[0];
-
-  l->dev_dir_name = vec_dup (l->dev_dir_name);
-
-  dev->os_handle = l - lpm->linux_pci_devices;
-
-  {
-    u8 *uio_dir = format (0, "%s/uio", l->dev_dir_name);
-    foreach_directory_file ((char *) uio_dir, scan_uio_dir, l,	/* scan_dirs */
-			    1);
-    vec_free (uio_dir);
-  }
-
-  {
-    char *uio_name = (char *) format (0, "/dev/uio%d%c", l->uio_minor, 0);
-    l->uio_fd = open (uio_name, O_RDWR);
-    if (l->uio_fd < 0)
-      clib_unix_error ("open `%s'", uio_name);
-    vec_free (uio_name);
-  }
-
-  {
-    unix_file_t template = { 0 };
-    unix_main_t *um = &unix_main;
-
-    template.read_function = linux_pci_uio_read_ready;
-    template.file_descriptor = l->uio_fd;
-    template.error_function = linux_pci_uio_error_ready;
-    template.private_data = dev - pm->pci_devs;
-
-    l->unix_file_index = unix_file_add (um, &template);
-  }
-}
-
-static void
-linux_pci_device_free (linux_pci_device_t * l)
-{
-  int i;
-  for (i = 0; i < vec_len (l->resource_fds); i++)
-    if (l->resource_fds[i] > 0)
-      close (l->resource_fds[i]);
-  if (l->config_fd > 0)
-    close (l->config_fd);
-  if (l->uio_fd > 0)
-    close (l->uio_fd);
-  vec_free (l->resource_fds);
-  vec_free (l->dev_dir_name);
-}
-
-/* Configuration space read/write. */
-clib_error_t *
-vlib_pci_read_write_config (vlib_pci_device_t * dev,
-			    vlib_read_or_write_t read_or_write,
-			    uword address, void *data, u32 n_bytes)
-{
-  linux_pci_main_t *lpm = &linux_pci_main;
-  linux_pci_device_t *p;
-  int n;
-
-  p = pool_elt_at_index (lpm->linux_pci_devices, dev->os_handle);
-
-  if (read_or_write == VLIB_READ)
-    n = pread (p->config_fd, data, n_bytes, address);
-  else
-    n = pwrite (p->config_fd, data, n_bytes, address);
-
-  if (n != n_bytes)
-    return clib_error_return_unix (0, "%s",
-				   read_or_write == VLIB_READ
-				   ? "read" : "write");
-
-  return 0;
-}
-
-static clib_error_t *
-os_map_pci_resource_internal (uword os_handle,
-			      u32 resource, u8 * addr, void **result)
-{
-  linux_pci_main_t *pm = &linux_pci_main;
-  linux_pci_device_t *p;
-  struct stat stat_buf;
-  u8 *file_name;
-  int fd;
-  clib_error_t *error;
-  int flags = MAP_SHARED;
-
-  error = 0;
-  p = pool_elt_at_index (pm->linux_pci_devices, os_handle);
-
-  file_name = format (0, "%v/resource%d%c", p->dev_dir_name, resource, 0);
-  fd = open ((char *) file_name, O_RDWR);
-  if (fd < 0)
-    {
-      error = clib_error_return_unix (0, "open `%s'", file_name);
-      goto done;
-    }
-
-  if (fstat (fd, &stat_buf) < 0)
-    {
-      error = clib_error_return_unix (0, "fstat `%s'", file_name);
-      goto done;
-    }
-
-  vec_validate (p->resource_fds, resource);
-  p->resource_fds[resource] = fd;
-  if (addr != 0)
-    flags |= MAP_FIXED;
-
-  *result = mmap (addr,
-		  /* size */ stat_buf.st_size,
-		  PROT_READ | PROT_WRITE, flags,
-		  /* file */ fd,
-		  /* offset */ 0);
-  if (*result == (void *) -1)
-    {
-      error = clib_error_return_unix (0, "mmap `%s'", file_name);
-      goto done;
-    }
-
-done:
-  if (error)
-    {
-      if (fd >= 0)
-	close (fd);
-    }
-  vec_free (file_name);
-  return error;
-}
-
-clib_error_t *
-vlib_pci_map_resource (vlib_pci_device_t * dev, u32 resource, void **result)
-{
-  return (os_map_pci_resource_internal
-	  (dev->os_handle, resource, 0 /* addr */ ,
-	   result));
-}
-
-clib_error_t *
-vlib_pci_map_resource_fixed (vlib_pci_device_t * dev,
-			     u32 resource, u8 * addr, void **result)
-{
-  return (os_map_pci_resource_internal
-	  (dev->os_handle, resource, addr, result));
-}
-
-void
-vlib_pci_free_device (vlib_pci_device_t * dev)
-{
-  linux_pci_main_t *pm = &linux_pci_main;
-  linux_pci_device_t *l;
-
-  l = pool_elt_at_index (pm->linux_pci_devices, dev->os_handle);
-  linux_pci_device_free (l);
-  pool_put (pm->linux_pci_devices, l);
-}
-
-pci_device_registration_t * __attribute__ ((unused))
-pci_device_next_registered (pci_device_registration_t * r)
-{
-  uword i;
-
-  /* Null vendor id marks end of initialized list. */
-  for (i = 0; r->supported_devices[i].vendor_id != 0; i++)
-    ;
-
-  return clib_elf_section_data_next (r, i * sizeof (r->supported_devices[0]));
-}
-
-static clib_error_t *
-init_device_from_registered (vlib_main_t * vm,
-			     vlib_pci_device_t * dev,
-			     linux_pci_device_t * pdev)
-{
-  vlib_pci_main_t *pm = &pci_main;
-  pci_device_registration_t *r;
-  pci_device_id_t *i;
-  clib_error_t *error;
-
-  r = pm->pci_device_registrations;
-
-  while (r)
-    {
-      for (i = r->supported_devices; i->vendor_id != 0; i++)
-	if (i->vendor_id == dev->vendor_id && i->device_id == dev->device_id)
-	  {
-	    error = vlib_pci_bind_to_uio (dev, "uio_pci_generic");
-	    if (error)
-	      {
-		clib_error_report (error);
-		continue;
-	      }
-
-	    add_device (dev, pdev);
-	    dev->interrupt_handler = r->interrupt_handler;
-	    return r->init_function (vm, dev);
-	  }
-      r = r->next_registration;
-    }
-  /* No driver, close the PCI config-space FD */
-  close (pdev->config_fd);
-  return 0;
-}
-
-static clib_error_t *
-init_device (vlib_main_t * vm,
-	     vlib_pci_device_t * dev, linux_pci_device_t * pdev)
-{
-  return init_device_from_registered (vm, dev, pdev);
-}
-
-static clib_error_t *
-scan_device (void *arg, u8 * dev_dir_name, u8 * ignored)
-{
-  vlib_main_t *vm = arg;
-  vlib_pci_main_t *pm = &pci_main;
-  int fd;
-  u8 *f;
-  clib_error_t *error = 0;
-  vlib_pci_device_t *dev;
-  linux_pci_device_t pdev = { 0 };
-  u32 tmp;
-
-  f = format (0, "%v/config%c", dev_dir_name, 0);
-  fd = open ((char *) f, O_RDWR);
-
-  /* Try read-only access if write fails. */
-  if (fd < 0)
-    fd = open ((char *) f, O_RDONLY);
-
-  if (fd < 0)
-    {
-      error = clib_error_return_unix (0, "open `%s'", f);
-      goto done;
-    }
-
-  pool_get (pm->pci_devs, dev);
-
-  /* You can only read more that 64 bytes of config space as root; so we try to
-     read the full space but fall back to just the first 64 bytes. */
-  if (read (fd, &dev->config_data, sizeof (dev->config_data)) !=
-      sizeof (dev->config_data)
-      && read (fd, &dev->config0,
-	       sizeof (dev->config0)) != sizeof (dev->config0))
-    {
-      pool_put (pm->pci_devs, dev);
-      error = clib_error_return_unix (0, "read `%s'", f);
-      close (fd);
-      goto done;
-    }
-
-  {
-    static pci_config_header_t all_ones;
-    if (all_ones.vendor_id == 0)
-      memset (&all_ones, ~0, sizeof (all_ones));
-
-    if (!memcmp (&dev->config0.header, &all_ones, sizeof (all_ones)))
-      {
-	pool_put (pm->pci_devs, dev);
-	error = clib_error_return (0, "invalid PCI config for `%s'", f);
-	close (fd);
-	goto done;
-      }
-  }
-
-  if (dev->config0.header.header_type == 0)
-    pci_config_type0_little_to_host (&dev->config0);
-  else
-    pci_config_type1_little_to_host (&dev->config1);
-
-  /* Parse bus, dev, function from directory name. */
-  {
-    unformat_input_t input;
-
-    unformat_init_string (&input, (char *) dev_dir_name,
-			  vec_len (dev_dir_name));
-
-    if (!unformat (&input, "/sys/bus/pci/devices/%U",
-		   unformat_vlib_pci_addr, &dev->bus_address))
-      abort ();
-
-    unformat_free (&input);
-
-  }
-
-
-  pdev.config_fd = fd;
-  pdev.dev_dir_name = dev_dir_name;
-
-  hash_set (pm->pci_dev_index_by_pci_addr, dev->bus_address.as_u32,
-	    dev - pm->pci_devs);
-
-  error = init_device (vm, dev, &pdev);
-
-  vec_reset_length (f);
-  f = format (f, "%v/vpd%c", dev_dir_name, 0);
-  fd = open ((char *) f, O_RDONLY);
-  if (fd >= 0)
-    {
-      while (1)
-	{
-	  u8 tag[3];
-	  u8 *data = 0;
-	  int len;
-
-	  if (read (fd, &tag, 3) != 3)
-	    break;
-
-	  if (tag[0] != 0x82 && tag[0] != 0x90 && tag[0] != 0x91)
-	    break;
-
-	  len = (tag[2] << 8) | tag[1];
-	  vec_validate (data, len);
-
-	  if (read (fd, data, len) != len)
-	    {
-	      vec_free (data);
-	      break;
-	    }
-	  if (tag[0] == 0x82)
-	    dev->product_name = data;
-	  else if (tag[0] == 0x90)
-	    dev->vpd_r = data;
-	  else if (tag[0] == 0x91)
-	    dev->vpd_w = data;
-
-	  data = 0;
-	}
-      close (fd);
-    }
-
-  vec_reset_length (f);
-  f = format (f, "%v/driver%c", dev_dir_name, 0);
-  dev->driver_name = vlib_sysfs_link_to_name ((char *) f);
-
-  dev->numa_node = -1;
-  vec_reset_length (f);
-  f = format (f, "%v/numa_node%c", dev_dir_name, 0);
-  vlib_sysfs_read ((char *) f, "%u", &dev->numa_node);
-
-  vec_reset_length (f);
-  f = format (f, "%v/class%c", dev_dir_name, 0);
-  vlib_sysfs_read ((char *) f, "0x%x", &tmp);
-  dev->device_class = tmp >> 8;
-
-  vec_reset_length (f);
-  f = format (f, "%v/vendor%c", dev_dir_name, 0);
-  vlib_sysfs_read ((char *) f, "0x%x", &tmp);
-  dev->vendor_id = tmp;
-
-  vec_reset_length (f);
-  f = format (f, "%v/device%c", dev_dir_name, 0);
-  vlib_sysfs_read ((char *) f, "0x%x", &tmp);
-  dev->device_id = tmp;
-
-done:
-  vec_free (f);
-  return error;
-}
-
-clib_error_t *
-linux_pci_init (vlib_main_t * vm)
-{
-  vlib_pci_main_t *pm = &pci_main;
-  clib_error_t *error;
-
-  pm->vlib_main = vm;
-
-  if ((error = vlib_call_init_function (vm, unix_input_init)))
-    return error;
-
-  ASSERT (sizeof (vlib_pci_addr_t) == sizeof (u32));
-  pm->pci_dev_index_by_pci_addr = hash_create (0, sizeof (uword));
-
-  error = foreach_directory_file ("/sys/bus/pci/devices", scan_device, vm,
-				  /* scan_dirs */ 0);
-
-  /* Complain and continue. might not be root, etc. */
-  if (error)
-    clib_error_report (error);
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (linux_pci_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/pci/pci.c b/vlib/vlib/pci/pci.c
deleted file mode 100644
index 7100064d..00000000
--- a/vlib/vlib/pci/pci.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pci.c: Linux user space PCI bus management.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vlib/pci/pci.h>
-#include <vlib/unix/unix.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <linux/ethtool.h>
-#include <linux/sockios.h>
-
-vlib_pci_main_t pci_main;
-
-vlib_pci_device_t *
-vlib_get_pci_device (vlib_pci_addr_t * addr)
-{
-  vlib_pci_main_t *pm = &pci_main;
-  uword *p;
-  p = hash_get (pm->pci_dev_index_by_pci_addr, addr->as_u32);
-
-  if (p == 0)
-    return 0;
-
-  return vec_elt_at_index (pm->pci_devs, p[0]);
-}
-
-static clib_error_t *
-show_pci_fn (vlib_main_t * vm,
-	     unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vlib_pci_main_t *pm = &pci_main;
-  vlib_pci_device_t *d;
-  int show_all = 0;
-  u8 *s = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "all"))
-	show_all = 1;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-
-  vlib_cli_output (vm, "%-13s%-5s%-12s%-13s%-16s%-32s%s",
-		   "Address", "Sock", "VID:PID", "Link Speed", "Driver",
-		   "Product Name", "Vital Product Data");
-
-  /* *INDENT-OFF* */
-  pool_foreach (d, pm->pci_devs, ({
-
-    if (d->device_class != PCI_CLASS_NETWORK_ETHERNET && !show_all)
-      continue;
-
-    vec_reset_length (s);
-
-    if (d->numa_node >= 0)
-      s = format (s, "  %d", d->numa_node);
-
-    vlib_cli_output (vm, "%-13U%-5v%04x:%04x   %-13U%-16s%-32v%U",
-		     format_vlib_pci_addr, &d->bus_address, s,
-		     d->vendor_id, d->device_id,
-		     format_vlib_pci_link_speed, d,
-		     d->driver_name ? (char *) d->driver_name : "",
-		     d->product_name,
-		     format_vlib_pci_vpd, d->vpd_r, 0);
-  }));
-/* *INDENT-ON* */
-
-  vec_free (s);
-  return 0;
-}
-
-uword
-unformat_vlib_pci_addr (unformat_input_t * input, va_list * args)
-{
-  vlib_pci_addr_t *addr = va_arg (*args, vlib_pci_addr_t *);
-  u32 x[4];
-
-  if (!unformat (input, "%x:%x:%x.%x", &x[0], &x[1], &x[2], &x[3]))
-    return 0;
-
-  addr->domain = x[0];
-  addr->bus = x[1];
-  addr->slot = x[2];
-  addr->function = x[3];
-
-  return 1;
-}
-
-u8 *
-format_vlib_pci_addr (u8 * s, va_list * va)
-{
-  vlib_pci_addr_t *addr = va_arg (*va, vlib_pci_addr_t *);
-  return format (s, "%04x:%02x:%02x.%x", addr->domain, addr->bus,
-		 addr->slot, addr->function);
-}
-
-u8 *
-format_vlib_pci_handle (u8 * s, va_list * va)
-{
-  vlib_pci_addr_t *addr = va_arg (*va, vlib_pci_addr_t *);
-  return format (s, "%x/%x/%x", addr->bus, addr->slot, addr->function);
-}
-
-u8 *
-format_vlib_pci_link_speed (u8 * s, va_list * va)
-{
-  vlib_pci_device_t *d = va_arg (*va, vlib_pci_device_t *);
-  pcie_config_regs_t *r =
-    pci_config_find_capability (&d->config0, PCI_CAP_ID_PCIE);
-  int width;
-
-  if (!r)
-    return format (s, "unknown");
-
-  width = (r->link_status >> 4) & 0x3f;
-
-  if ((r->link_status & 0xf) == 1)
-    return format (s, "2.5 GT/s x%u", width);
-  if ((r->link_status & 0xf) == 2)
-    return format (s, "5.0 GT/s x%u", width);
-  if ((r->link_status & 0xf) == 3)
-    return format (s, "8.0 GT/s x%u", width);
-  return format (s, "unknown");
-}
-
-u8 *
-format_vlib_pci_vpd (u8 * s, va_list * args)
-{
-  u8 *data = va_arg (*args, u8 *);
-  u8 *id = va_arg (*args, u8 *);
-  uword indent = format_get_indent (s);
-  char *string_types[] = { "PN", "EC", "SN", "MN", 0 };
-  uword p = 0;
-  int first_line = 1;
-
-  if (vec_len (data) < 3)
-    return s;
-
-  while (p + 3 < vec_len (data))
-    {
-
-      if (data[p] == 0 && data[p + 1] == 0)
-	return s;
-
-      if (p + data[p + 2] > vec_len (data))
-	return s;
-
-      if (id == 0)
-	{
-	  int is_string = 0;
-	  char **c = string_types;
-
-	  while (c[0])
-	    {
-	      if (*(u16 *) & data[p] == *(u16 *) c[0])
-		is_string = 1;
-	      c++;
-	    }
-
-	  if (data[p + 2])
-	    {
-	      if (!first_line)
-		s = format (s, "\n%U", format_white_space, indent);
-	      else
-		{
-		  first_line = 0;
-		  s = format (s, " ");
-		}
-
-	      s = format (s, "%c%c: ", data[p], data[p + 1]);
-	      if (is_string)
-		vec_add (s, data + p + 3, data[p + 2]);
-	      else
-		{
-		  int i;
-		  const int max_bytes = 8;
-		  s = format (s, "0x");
-		  for (i = 0; i < clib_min (data[p + 2], max_bytes); i++)
-		    s = format (s, " %02x", data[p + 3 + i]);
-
-		  if (data[p + 2] > max_bytes)
-		    s = format (s, " ...");
-		}
-	    }
-	}
-      else if (*(u16 *) & data[p] == *(u16 *) id)
-	{
-	  vec_add (s, data + p + 3, data[p + 2]);
-	  return s;
-	}
-
-      p += 3 + data[p + 2];
-    }
-
-  return s;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_pci_command, static) = {
-  .path = "show pci",
-  .short_help = "show pci [all]",
-  .function = show_pci_fn,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-pci_bus_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (pci_bus_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/pci/pci.h b/vlib/vlib/pci/pci.h
deleted file mode 100644
index 811a6ff2..00000000
--- a/vlib/vlib/pci/pci.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pci.h: PCI definitions.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_pci_h
-#define included_vlib_pci_h
-
-#include <vlib/vlib.h>
-#include <vlib/pci/pci_config.h>
-
-typedef CLIB_PACKED (union
-		     {
-		     struct
-		     {
-u16 domain; u8 bus; u8 slot: 5; u8 function:3;};
-		     u32 as_u32;}) vlib_pci_addr_t;
-
-typedef struct vlib_pci_device
-{
-  /* Operating system handle for this device. */
-  uword os_handle;
-
-  vlib_pci_addr_t bus_address;
-
-  /* First 64 bytes of configuration space. */
-  union
-  {
-    pci_config_type0_regs_t config0;
-    pci_config_type1_regs_t config1;
-    u8 config_data[256];
-  };
-
-  /* Interrupt handler */
-  void (*interrupt_handler) (struct vlib_pci_device * dev);
-
-  /* Driver name */
-  u8 *driver_name;
-
-  /* Numa Node */
-  int numa_node;
-
-  /* Device data */
-  u16 device_class;
-  u16 vendor_id;
-  u16 device_id;
-
-  /* Vital Product Data */
-  u8 *product_name;
-  u8 *vpd_r;
-  u8 *vpd_w;
-
-  /* Private data */
-  uword private_data;
-
-} vlib_pci_device_t;
-
-typedef struct
-{
-  u16 vendor_id, device_id;
-} pci_device_id_t;
-
-typedef struct _pci_device_registration
-{
-  /* Driver init function. */
-  clib_error_t *(*init_function) (vlib_main_t * vm, vlib_pci_device_t * dev);
-
-  /* Interrupt handler */
-  void (*interrupt_handler) (vlib_pci_device_t * dev);
-
-  /* List of registrations */
-  struct _pci_device_registration *next_registration;
-
-  /* Vendor/device ids supported by this driver. */
-  pci_device_id_t supported_devices[];
-} pci_device_registration_t;
-
-/* Pool of PCI devices. */
-typedef struct
-{
-  vlib_main_t *vlib_main;
-  vlib_pci_device_t *pci_devs;
-  pci_device_registration_t *pci_device_registrations;
-  uword *pci_dev_index_by_pci_addr;
-} vlib_pci_main_t;
-
-extern vlib_pci_main_t pci_main;
-
-#define PCI_REGISTER_DEVICE(x,...)                              \
-    __VA_ARGS__ pci_device_registration_t x;                    \
-static void __vlib_add_pci_device_registration_##x (void)       \
-    __attribute__((__constructor__)) ;                          \
-static void __vlib_add_pci_device_registration_##x (void)       \
-{                                                               \
-    vlib_pci_main_t * pm = &pci_main;                           \
-    x.next_registration = pm->pci_device_registrations;         \
-    pm->pci_device_registrations = &x;                          \
-}                                                               \
-__VA_ARGS__ pci_device_registration_t x
-
-clib_error_t *vlib_pci_bind_to_uio (vlib_pci_device_t * d,
-				    char *uio_driver_name);
-
-/* Configuration space read/write. */
-clib_error_t *vlib_pci_read_write_config (vlib_pci_device_t * dev,
-					  vlib_read_or_write_t read_or_write,
-					  uword address,
-					  void *data, u32 n_bytes);
-
-#define _(t)								\
-static inline clib_error_t *						\
-vlib_pci_read_config_##t (vlib_pci_device_t * dev,			\
-			  uword address, t * data)			\
-{									\
-  return vlib_pci_read_write_config (dev, VLIB_READ,address, data,	\
-				     sizeof (data[0]));			\
-}
-
-_(u32);
-_(u16);
-_(u8);
-
-#undef _
-
-#define _(t)								\
-static inline clib_error_t *						\
-vlib_pci_write_config_##t (vlib_pci_device_t * dev, uword address,	\
-			   t * data)					\
-{									\
-  return vlib_pci_read_write_config (dev, VLIB_WRITE,			\
-				   address, data, sizeof (data[0]));	\
-}
-
-_(u32);
-_(u16);
-_(u8);
-
-#undef _
-
-static inline clib_error_t *
-vlib_pci_intr_enable (vlib_pci_device_t * dev)
-{
-  u16 command;
-  clib_error_t *err;
-
-  err = vlib_pci_read_config_u16 (dev, 4, &command);
-
-  if (err)
-    return err;
-
-  command &= ~PCI_COMMAND_INTX_DISABLE;
-
-  return vlib_pci_write_config_u16 (dev, 4, &command);
-}
-
-static inline clib_error_t *
-vlib_pci_intr_disable (vlib_pci_device_t * dev)
-{
-  u16 command;
-  clib_error_t *err;
-
-  err = vlib_pci_read_config_u16 (dev, 4, &command);
-
-  if (err)
-    return err;
-
-  command |= PCI_COMMAND_INTX_DISABLE;
-
-  return vlib_pci_write_config_u16 (dev, 4, &command);
-}
-
-static inline clib_error_t *
-vlib_pci_bus_master_enable (vlib_pci_device_t * dev)
-{
-  clib_error_t *err;
-  u16 command;
-
-  /* Set bus master enable (BME) */
-  err = vlib_pci_read_config_u16 (dev, 4, &command);
-
-  if (err)
-    return err;
-
-  if (!(command & PCI_COMMAND_BUS_MASTER))
-    return 0;
-
-  command |= PCI_COMMAND_BUS_MASTER;
-
-  return vlib_pci_write_config_u16 (dev, 4, &command);
-}
-
-clib_error_t *vlib_pci_map_resource (vlib_pci_device_t * dev, u32 resource,
-				     void **result);
-
-clib_error_t *vlib_pci_map_resource_fixed (vlib_pci_device_t * dev,
-					   u32 resource, u8 * addr,
-					   void **result);
-
-vlib_pci_device_t *vlib_get_pci_device (vlib_pci_addr_t * addr);
-/* Free's device. */
-void vlib_pci_free_device (vlib_pci_device_t * dev);
-
-unformat_function_t unformat_vlib_pci_addr;
-format_function_t format_vlib_pci_addr;
-format_function_t format_vlib_pci_handle;
-format_function_t format_vlib_pci_link_speed;
-format_function_t format_vlib_pci_vpd;
-
-#endif /* included_vlib_pci_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/pci/pci_config.h b/vlib/vlib/pci/pci_config.h
deleted file mode 100644
index 92e56af6..00000000
--- a/vlib/vlib/pci/pci_config.h
+++ /dev/null
@@ -1,731 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pci.h: PCI definitions.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_pci_config_h
-#define included_vlib_pci_config_h
-
-#include <vppinfra/byte_order.h>
-#include <vppinfra/error.h>
-
-typedef enum
-{
-  PCI_CLASS_NOT_DEFINED = 0x0000,
-  PCI_CLASS_NOT_DEFINED_VGA = 0x0001,
-
-  PCI_CLASS_STORAGE_SCSI = 0x0100,
-  PCI_CLASS_STORAGE_IDE = 0x0101,
-  PCI_CLASS_STORAGE_FLOPPY = 0x0102,
-  PCI_CLASS_STORAGE_IPI = 0x0103,
-  PCI_CLASS_STORAGE_RAID = 0x0104,
-  PCI_CLASS_STORAGE_OTHER = 0x0180,
-  PCI_CLASS_STORAGE = 0x0100,
-
-  PCI_CLASS_NETWORK_ETHERNET = 0x0200,
-  PCI_CLASS_NETWORK_TOKEN_RING = 0x0201,
-  PCI_CLASS_NETWORK_FDDI = 0x0202,
-  PCI_CLASS_NETWORK_ATM = 0x0203,
-  PCI_CLASS_NETWORK_OTHER = 0x0280,
-  PCI_CLASS_NETWORK = 0x0200,
-
-  PCI_CLASS_DISPLAY_VGA = 0x0300,
-  PCI_CLASS_DISPLAY_XGA = 0x0301,
-  PCI_CLASS_DISPLAY_3D = 0x0302,
-  PCI_CLASS_DISPLAY_OTHER = 0x0380,
-  PCI_CLASS_DISPLAY = 0x0300,
-
-  PCI_CLASS_MULTIMEDIA_VIDEO = 0x0400,
-  PCI_CLASS_MULTIMEDIA_AUDIO = 0x0401,
-  PCI_CLASS_MULTIMEDIA_PHONE = 0x0402,
-  PCI_CLASS_MULTIMEDIA_OTHER = 0x0480,
-  PCI_CLASS_MULTIMEDIA = 0x0400,
-
-  PCI_CLASS_MEMORY_RAM = 0x0500,
-  PCI_CLASS_MEMORY_FLASH = 0x0501,
-  PCI_CLASS_MEMORY_OTHER = 0x0580,
-  PCI_CLASS_MEMORY = 0x0500,
-
-  PCI_CLASS_BRIDGE_HOST = 0x0600,
-  PCI_CLASS_BRIDGE_ISA = 0x0601,
-  PCI_CLASS_BRIDGE_EISA = 0x0602,
-  PCI_CLASS_BRIDGE_MC = 0x0603,
-  PCI_CLASS_BRIDGE_PCI = 0x0604,
-  PCI_CLASS_BRIDGE_PCMCIA = 0x0605,
-  PCI_CLASS_BRIDGE_NUBUS = 0x0606,
-  PCI_CLASS_BRIDGE_CARDBUS = 0x0607,
-  PCI_CLASS_BRIDGE_RACEWAY = 0x0608,
-  PCI_CLASS_BRIDGE_OTHER = 0x0680,
-  PCI_CLASS_BRIDGE = 0x0600,
-
-  PCI_CLASS_COMMUNICATION_SERIAL = 0x0700,
-  PCI_CLASS_COMMUNICATION_PARALLEL = 0x0701,
-  PCI_CLASS_COMMUNICATION_MULTISERIAL = 0x0702,
-  PCI_CLASS_COMMUNICATION_MODEM = 0x0703,
-  PCI_CLASS_COMMUNICATION_OTHER = 0x0780,
-  PCI_CLASS_COMMUNICATION = 0x0700,
-
-  PCI_CLASS_SYSTEM_PIC = 0x0800,
-  PCI_CLASS_SYSTEM_DMA = 0x0801,
-  PCI_CLASS_SYSTEM_TIMER = 0x0802,
-  PCI_CLASS_SYSTEM_RTC = 0x0803,
-  PCI_CLASS_SYSTEM_PCI_HOTPLUG = 0x0804,
-  PCI_CLASS_SYSTEM_OTHER = 0x0880,
-  PCI_CLASS_SYSTEM = 0x0800,
-
-  PCI_CLASS_INPUT_KEYBOARD = 0x0900,
-  PCI_CLASS_INPUT_PEN = 0x0901,
-  PCI_CLASS_INPUT_MOUSE = 0x0902,
-  PCI_CLASS_INPUT_SCANNER = 0x0903,
-  PCI_CLASS_INPUT_GAMEPORT = 0x0904,
-  PCI_CLASS_INPUT_OTHER = 0x0980,
-  PCI_CLASS_INPUT = 0x0900,
-
-  PCI_CLASS_DOCKING_GENERIC = 0x0a00,
-  PCI_CLASS_DOCKING_OTHER = 0x0a80,
-  PCI_CLASS_DOCKING = 0x0a00,
-
-  PCI_CLASS_PROCESSOR_386 = 0x0b00,
-  PCI_CLASS_PROCESSOR_486 = 0x0b01,
-  PCI_CLASS_PROCESSOR_PENTIUM = 0x0b02,
-  PCI_CLASS_PROCESSOR_ALPHA = 0x0b10,
-  PCI_CLASS_PROCESSOR_POWERPC = 0x0b20,
-  PCI_CLASS_PROCESSOR_MIPS = 0x0b30,
-  PCI_CLASS_PROCESSOR_CO = 0x0b40,
-  PCI_CLASS_PROCESSOR = 0x0b00,
-
-  PCI_CLASS_SERIAL_FIREWIRE = 0x0c00,
-  PCI_CLASS_SERIAL_ACCESS = 0x0c01,
-  PCI_CLASS_SERIAL_SSA = 0x0c02,
-  PCI_CLASS_SERIAL_USB = 0x0c03,
-  PCI_CLASS_SERIAL_FIBER = 0x0c04,
-  PCI_CLASS_SERIAL_SMBUS = 0x0c05,
-  PCI_CLASS_SERIAL = 0x0c00,
-
-  PCI_CLASS_INTELLIGENT_I2O = 0x0e00,
-  PCI_CLASS_INTELLIGENT = 0x0e00,
-
-  PCI_CLASS_SATELLITE_TV = 0x0f00,
-  PCI_CLASS_SATELLITE_AUDIO = 0x0f01,
-  PCI_CLASS_SATELLITE_VOICE = 0x0f03,
-  PCI_CLASS_SATELLITE_DATA = 0x0f04,
-  PCI_CLASS_SATELLITE = 0x0f00,
-
-  PCI_CLASS_CRYPT_NETWORK = 0x1000,
-  PCI_CLASS_CRYPT_ENTERTAINMENT = 0x1001,
-  PCI_CLASS_CRYPT_OTHER = 0x1080,
-  PCI_CLASS_CRYPT = 0x1000,
-
-  PCI_CLASS_SP_DPIO = 0x1100,
-  PCI_CLASS_SP_OTHER = 0x1180,
-  PCI_CLASS_SP = 0x1100,
-} pci_device_class_t;
-
-static inline pci_device_class_t
-pci_device_class_base (pci_device_class_t c)
-{
-  return c & ~0xff;
-}
-
-/*
- * Under PCI, each device has 256 bytes of configuration address space,
- * of which the first 64 bytes are standardized as follows:
- */
-typedef struct
-{
-  u16 vendor_id;
-  u16 device_id;
-
-  u16 command;
-#define PCI_COMMAND_IO		(1 << 0)	/* Enable response in I/O space */
-#define PCI_COMMAND_MEMORY	(1 << 1)	/* Enable response in Memory space */
-#define PCI_COMMAND_BUS_MASTER	(1 << 2)	/* Enable bus mastering */
-#define PCI_COMMAND_SPECIAL	(1 << 3)	/* Enable response to special cycles */
-#define PCI_COMMAND_WRITE_INVALIDATE (1 << 4)	/* Use memory write and invalidate */
-#define PCI_COMMAND_VGA_PALETTE_SNOOP (1 << 5)
-#define PCI_COMMAND_PARITY	(1 << 6)
-#define PCI_COMMAND_WAIT 	(1 << 7)	/* Enable address/data stepping */
-#define PCI_COMMAND_SERR	(1 << 8)	/* Enable SERR */
-#define PCI_COMMAND_BACK_TO_BACK_WRITE (1 << 9)
-#define PCI_COMMAND_INTX_DISABLE (1 << 10)	/* INTx Emulation Disable */
-
-  u16 status;
-#define PCI_STATUS_INTX_PENDING (1 << 3)
-#define PCI_STATUS_CAPABILITY_LIST (1 << 4)
-#define PCI_STATUS_66MHZ	(1 << 5)	/* Support 66 Mhz PCI 2.1 bus */
-#define PCI_STATUS_UDF		(1 << 6)	/* Support User Definable Features (obsolete) */
-#define PCI_STATUS_BACK_TO_BACK_WRITE (1 << 7)	/* Accept fast-back to back */
-#define PCI_STATUS_PARITY_ERROR	(1 << 8)	/* Detected parity error */
-#define PCI_STATUS_DEVSEL_GET(x) ((x >> 9) & 3)	/* DEVSEL timing */
-#define PCI_STATUS_DEVSEL_FAST (0 << 9)
-#define PCI_STATUS_DEVSEL_MEDIUM (1 << 9)
-#define PCI_STATUS_DEVSEL_SLOW (2 << 9)
-#define PCI_STATUS_SIG_TARGET_ABORT (1 << 11)	/* Set on target abort */
-#define PCI_STATUS_REC_TARGET_ABORT (1 << 12)	/* Master ack of " */
-#define PCI_STATUS_REC_MASTER_ABORT (1 << 13)	/* Set on master abort */
-#define PCI_STATUS_SIG_SYSTEM_ERROR (1 << 14)	/* Set when we drive SERR */
-#define PCI_STATUS_DETECTED_PARITY_ERROR (1 << 15)
-
-  u8 revision_id;
-  u8 programming_interface_class;	/* Reg. Level Programming Interface */
-
-  pci_device_class_t device_class:16;
-
-  u8 cache_size;
-  u8 latency_timer;
-
-  u8 header_type;
-#define PCI_HEADER_TYPE_NORMAL	0
-#define PCI_HEADER_TYPE_BRIDGE 1
-#define PCI_HEADER_TYPE_CARDBUS 2
-
-  u8 bist;
-#define PCI_BIST_CODE_MASK	0x0f	/* Return result */
-#define PCI_BIST_START		0x40	/* 1 to start BIST, 2 secs or less */
-#define PCI_BIST_CAPABLE	0x80	/* 1 if BIST capable */
-} pci_config_header_t;
-
-/* Byte swap config header. */
-always_inline void
-pci_config_header_little_to_host (pci_config_header_t * r)
-{
-  if (!CLIB_ARCH_IS_BIG_ENDIAN)
-    return;
-#define _(f,t) r->f = clib_byte_swap_##t (r->f)
-  _(vendor_id, u16);
-  _(device_id, u16);
-  _(command, u16);
-  _(status, u16);
-  _(device_class, u16);
-#undef _
-}
-
-/* Header type 0 (normal devices) */
-typedef struct
-{
-  pci_config_header_t header;
-
-  /*
-   * Base addresses specify locations in memory or I/O space.
-   * Decoded size can be determined by writing a value of
-   * 0xffffffff to the register, and reading it back. Only
-   * 1 bits are decoded.
-   */
-  u32 base_address[6];
-
-  u16 cardbus_cis;
-
-  u16 subsystem_vendor_id;
-  u16 subsystem_id;
-
-  u32 rom_address;
-#define PCI_ROM_ADDRESS		0x30	/* Bits 31..11 are address, 10..1 reserved */
-#define PCI_ROM_ADDRESS_ENABLE	0x01
-#define PCI_ROM_ADDRESS_MASK	(~0x7ffUL)
-
-  u8 first_capability_offset;
-    CLIB_PAD_FROM_TO (0x35, 0x3c);
-
-  u8 interrupt_line;
-  u8 interrupt_pin;
-  u8 min_grant;
-  u8 max_latency;
-
-  u8 capability_data[0];
-} pci_config_type0_regs_t;
-
-always_inline void
-pci_config_type0_little_to_host (pci_config_type0_regs_t * r)
-{
-  int i;
-  if (!CLIB_ARCH_IS_BIG_ENDIAN)
-    return;
-  pci_config_header_little_to_host (&r->header);
-#define _(f,t) r->f = clib_byte_swap_##t (r->f)
-  for (i = 0; i < ARRAY_LEN (r->base_address); i++)
-    _(base_address[i], u32);
-  _(cardbus_cis, u16);
-  _(subsystem_vendor_id, u16);
-  _(subsystem_id, u16);
-  _(rom_address, u32);
-#undef _
-}
-
-/* Header type 1 (PCI-to-PCI bridges) */
-typedef struct
-{
-  pci_config_header_t header;
-
-  u32 base_address[2];
-
-  /* Primary/secondary bus number. */
-  u8 primary_bus;
-  u8 secondary_bus;
-
-  /* Highest bus number behind the bridge */
-  u8 subordinate_bus;
-
-  u8 secondary_bus_latency_timer;
-
-  /* I/O range behind bridge. */
-  u8 io_base, io_limit;
-
-  /* Secondary status register, only bit 14 used */
-  u16 secondary_status;
-
-  /* Memory range behind bridge in units of 64k bytes. */
-  u16 memory_base, memory_limit;
-#define PCI_MEMORY_RANGE_TYPE_MASK 0x0fUL
-#define PCI_MEMORY_RANGE_MASK	(~0x0fUL)
-
-  u16 prefetchable_memory_base, prefetchable_memory_limit;
-#define PCI_PREF_RANGE_TYPE_MASK 0x0fUL
-#define PCI_PREF_RANGE_TYPE_32	0x00
-#define PCI_PREF_RANGE_TYPE_64	0x01
-#define PCI_PREF_RANGE_MASK	(~0x0fUL)
-
-  u32 prefetchable_memory_base_upper_32bits;
-  u32 prefetchable_memory_limit_upper_32bits;
-  u16 io_base_upper_16bits;
-  u16 io_limit_upper_16bits;
-
-  /* Same as for type 0. */
-  u8 capability_list_offset;
-    CLIB_PAD_FROM_TO (0x35, 0x37);
-
-  u32 rom_address;
-    CLIB_PAD_FROM_TO (0x3c, 0x3e);
-
-  u16 bridge_control;
-#define PCI_BRIDGE_CTL_PARITY	0x01	/* Enable parity detection on secondary interface */
-#define PCI_BRIDGE_CTL_SERR	0x02	/* The same for SERR forwarding */
-#define PCI_BRIDGE_CTL_NO_ISA	0x04	/* Disable bridging of ISA ports */
-#define PCI_BRIDGE_CTL_VGA	0x08	/* Forward VGA addresses */
-#define PCI_BRIDGE_CTL_MASTER_ABORT 0x20	/* Report master aborts */
-#define PCI_BRIDGE_CTL_BUS_RESET 0x40	/* Secondary bus reset */
-#define PCI_BRIDGE_CTL_FAST_BACK 0x80	/* Fast Back2Back enabled on secondary interface */
-
-  u8 capability_data[0];
-} pci_config_type1_regs_t;
-
-always_inline void
-pci_config_type1_little_to_host (pci_config_type1_regs_t * r)
-{
-  int i;
-  if (!CLIB_ARCH_IS_BIG_ENDIAN)
-    return;
-  pci_config_header_little_to_host (&r->header);
-#define _(f,t) r->f = clib_byte_swap_##t (r->f)
-  for (i = 0; i < ARRAY_LEN (r->base_address); i++)
-    _(base_address[i], u32);
-  _(secondary_status, u16);
-  _(memory_base, u16);
-  _(memory_limit, u16);
-  _(prefetchable_memory_base, u16);
-  _(prefetchable_memory_limit, u16);
-  _(prefetchable_memory_base_upper_32bits, u32);
-  _(prefetchable_memory_limit_upper_32bits, u32);
-  _(io_base_upper_16bits, u16);
-  _(io_limit_upper_16bits, u16);
-  _(rom_address, u32);
-  _(bridge_control, u16);
-#undef _
-}
-
-/* Capabilities. */
-typedef enum pci_capability_type
-{
-  /* Power Management */
-  PCI_CAP_ID_PM = 1,
-
-  /* Accelerated Graphics Port */
-  PCI_CAP_ID_AGP = 2,
-
-  /* Vital Product Data */
-  PCI_CAP_ID_VPD = 3,
-
-  /* Slot Identification */
-  PCI_CAP_ID_SLOTID = 4,
-
-  /* Message Signalled Interrupts */
-  PCI_CAP_ID_MSI = 5,
-
-  /* CompactPCI HotSwap */
-  PCI_CAP_ID_CHSWP = 6,
-
-  /* PCI-X */
-  PCI_CAP_ID_PCIX = 7,
-
-  /* Hypertransport. */
-  PCI_CAP_ID_HYPERTRANSPORT = 8,
-
-  /* PCI Standard Hot-Plug Controller */
-  PCI_CAP_ID_SHPC = 0xc,
-
-  /* PCI Express */
-  PCI_CAP_ID_PCIE = 0x10,
-
-  /* MSI-X */
-  PCI_CAP_ID_MSIX = 0x11,
-} pci_capability_type_t;
-
-/* Common header for capabilities. */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     enum pci_capability_type type:8;
-		     u8 next_offset;}) pci_capability_regs_t;
-/* *INDENT-ON* */
-
-always_inline void *
-pci_config_find_capability (pci_config_type0_regs_t * t, int cap_type)
-{
-  pci_capability_regs_t *c;
-  u32 next_offset;
-  u32 ttl = 48;
-
-  if (!(t->header.status & PCI_STATUS_CAPABILITY_LIST))
-    return 0;
-
-  next_offset = t->first_capability_offset;
-  while (ttl-- && next_offset >= 0x40)
-    {
-      c = (void *) t + (next_offset & ~3);
-      if ((u8) c->type == 0xff)
-	break;
-      if (c->type == cap_type)
-	return c;
-      next_offset = c->next_offset;
-    }
-  return 0;
-}
-
-/* Power Management Registers */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     pci_capability_regs_t header; u16 capabilities;
-#define PCI_PM_CAP_VER_MASK	0x0007	/* Version */
-#define PCI_PM_CAP_PME_CLOCK	0x0008	/* PME clock required */
-#define PCI_PM_CAP_RESERVED  0x0010	/* Reserved field */
-#define PCI_PM_CAP_DSI		0x0020	/* Device specific initialization */
-#define PCI_PM_CAP_AUX_POWER	0x01C0	/* Auxilliary power support mask */
-#define PCI_PM_CAP_D1		0x0200	/* D1 power state support */
-#define PCI_PM_CAP_D2		0x0400	/* D2 power state support */
-#define PCI_PM_CAP_PME		0x0800	/* PME pin supported */
-#define PCI_PM_CAP_PME_MASK  0xF800	/* PME Mask of all supported states */
-#define PCI_PM_CAP_PME_D0   0x0800	/* PME# from D0 */
-#define PCI_PM_CAP_PME_D1   0x1000	/* PME# from D1 */
-#define PCI_PM_CAP_PME_D2   0x2000	/* PME# from D2 */
-#define PCI_PM_CAP_PME_D3   0x4000	/* PME# from D3 (hot) */
-#define PCI_PM_CAP_PME_D3cold 0x8000	/* PME# from D3 (cold) */
-		     u16 control;
-#define PCI_PM_CTRL_STATE_MASK	0x0003	/* Current power state (D0 to D3) */
-#define PCI_PM_CTRL_PME_ENABLE	0x0100	/* PME pin enable */
-#define PCI_PM_CTRL_DATA_SEL_MASK	0x1e00	/* Data select (??) */
-#define PCI_PM_CTRL_DATA_SCALE_MASK	0x6000	/* Data scale (??) */
-#define PCI_PM_CTRL_PME_STATUS	0x8000	/* PME pin status */
-		     u8 extensions;
-#define PCI_PM_PPB_B2_B3	0x40	/* Stop clock when in D3hot (??) */
-#define PCI_PM_BPCC_ENABLE	0x80	/* Bus power/clock control enable (??) */
-		     u8 data;}) pci_power_management_regs_t;
-/* *INDENT-ON* */
-
-/* AGP registers */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     pci_capability_regs_t header; u8 version;
-		     u8 rest_of_capability_flags; u32 status; u32 command;
-		     /* Command & status common bits. */
-#define PCI_AGP_RQ_MASK	0xff000000	/* Maximum number of requests - 1 */
-#define PCI_AGP_SBA	0x0200	/* Sideband addressing supported */
-#define PCI_AGP_64BIT	0x0020	/* 64-bit addressing supported */
-#define PCI_AGP_ALLOW_TRANSACTIONS 0x0100	/* Allow processing of AGP transactions */
-#define PCI_AGP_FW	0x0010	/* FW transfers supported/forced */
-#define PCI_AGP_RATE4	0x0004	/* 4x transfer rate supported */
-#define PCI_AGP_RATE2	0x0002	/* 2x transfer rate supported */
-#define PCI_AGP_RATE1	0x0001	/* 1x transfer rate supported */
-		     }) pci_agp_regs_t;
-/* *INDENT-ON* */
-
-/* Vital Product Data */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     pci_capability_regs_t header; u16 address;
-#define PCI_VPD_ADDR_MASK	0x7fff	/* Address mask */
-#define PCI_VPD_ADDR_F		0x8000	/* Write 0, 1 indicates completion */
-		     u32 data;}) pci_vpd_regs_t;
-/* *INDENT-ON* */
-
-/* Slot Identification */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     pci_capability_regs_t header; u8 esr;
-#define PCI_SID_ESR_NSLOTS	0x1f	/* Number of expansion slots available */
-#define PCI_SID_ESR_FIC	0x20	/* First In Chassis Flag */
-		     u8 chassis;}) pci_sid_regs_t;
-/* *INDENT-ON* */
-
-/* Message Signalled Interrupts registers */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     pci_capability_regs_t header; u16 flags;
-#define PCI_MSI_FLAGS_ENABLE	(1 << 0)	/* MSI feature enabled */
-#define PCI_MSI_FLAGS_GET_MAX_QUEUE_SIZE(x) ((x >> 1) & 0x7)
-#define PCI_MSI_FLAGS_MAX_QUEUE_SIZE(x)     (((x) & 0x7) << 1)
-#define PCI_MSI_FLAGS_GET_QUEUE_SIZE(x) ((x >> 4) & 0x7)
-#define PCI_MSI_FLAGS_QUEUE_SIZE(x)     (((x) & 0x7) << 4)
-#define PCI_MSI_FLAGS_64BIT	(1 << 7)	/* 64-bit addresses allowed */
-#define PCI_MSI_FLAGS_MASKBIT	(1 << 8)	/* 64-bit mask bits allowed */
-		     u32 address; u32 data; u32 mask_bits;}) pci_msi32_regs_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     pci_capability_regs_t header; u16 flags;
-		     u32 address[2];
-		     u32 data; u32 mask_bits;}) pci_msi64_regs_t;
-/* *INDENT-ON* */
-
-/* CompactPCI Hotswap Register */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     pci_capability_regs_t header; u16 control_status;
-#define PCI_CHSWP_DHA		0x01	/* Device Hiding Arm */
-#define PCI_CHSWP_EIM		0x02	/* ENUM# Signal Mask */
-#define PCI_CHSWP_PIE		0x04	/* Pending Insert or Extract */
-#define PCI_CHSWP_LOO		0x08	/* LED On / Off */
-#define PCI_CHSWP_PI		0x30	/* Programming Interface */
-#define PCI_CHSWP_EXT		0x40	/* ENUM# status - extraction */
-#define PCI_CHSWP_INS		0x80	/* ENUM# status - insertion */
-		     }) pci_chswp_regs_t;
-/* *INDENT-ON* */
-
-/* PCIX registers */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     pci_capability_regs_t header; u16 command;
-#define PCIX_CMD_DPERR_E	0x0001	/* Data Parity Error Recovery Enable */
-#define PCIX_CMD_ERO		0x0002	/* Enable Relaxed Ordering */
-#define PCIX_CMD_MAX_READ	0x000c	/* Max Memory Read Byte Count */
-#define PCIX_CMD_MAX_SPLIT	0x0070	/* Max Outstanding Split Transactions */
-#define PCIX_CMD_VERSION(x) 	(((x) >> 12) & 3)	/* Version */
-		     u32 status;
-#define PCIX_STATUS_DEVFN	0x000000ff	/* A copy of devfn */
-#define PCIX_STATUS_BUS	0x0000ff00	/* A copy of bus nr */
-#define PCIX_STATUS_64BIT	0x00010000	/* 64-bit device */
-#define PCIX_STATUS_133MHZ	0x00020000	/* 133 MHz capable */
-#define PCIX_STATUS_SPL_DISC	0x00040000	/* Split Completion Discarded */
-#define PCIX_STATUS_UNX_SPL	0x00080000	/* Unexpected Split Completion */
-#define PCIX_STATUS_COMPLEX	0x00100000	/* Device Complexity */
-#define PCIX_STATUS_MAX_READ	0x00600000	/* Designed Max Memory Read Count */
-#define PCIX_STATUS_MAX_SPLIT	0x03800000	/* Designed Max Outstanding Split Transactions */
-#define PCIX_STATUS_MAX_CUM	0x1c000000	/* Designed Max Cumulative Read Size */
-#define PCIX_STATUS_SPL_ERR	0x20000000	/* Rcvd Split Completion Error Msg */
-#define PCIX_STATUS_266MHZ	0x40000000	/* 266 MHz capable */
-#define PCIX_STATUS_533MHZ	0x80000000	/* 533 MHz capable */
-		     }) pcix_config_regs_t;
-/* *INDENT-ON* */
-
-static inline int
-pcie_size_to_code (int bytes)
-{
-  ASSERT (is_pow2 (bytes));
-  ASSERT (bytes <= 4096);
-  return min_log2 (bytes) - 7;
-}
-
-static inline int
-pcie_code_to_size (int code)
-{
-  int size = 1 << (code + 7);
-  ASSERT (size <= 4096);
-  return size;
-}
-
-/* PCI Express capability registers */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     pci_capability_regs_t header; u16 pcie_capabilities;
-#define PCIE_CAP_VERSION(x)	(((x) >> 0) & 0xf)
-#define PCIE_CAP_DEVICE_TYPE(x)	(((x) >> 4) & 0xf)
-#define PCIE_DEVICE_TYPE_ENDPOINT 0
-#define PCIE_DEVICE_TYPE_LEGACY_ENDPOINT 1
-#define PCIE_DEVICE_TYPE_ROOT_PORT 4
-		     /* Upstream/downstream port of PCI Express switch. */
-#define PCIE_DEVICE_TYPE_SWITCH_UPSTREAM 5
-#define PCIE_DEVICE_TYPE_SWITCH_DOWNSTREAM 6
-#define PCIE_DEVICE_TYPE_PCIE_TO_PCI_BRIDGE 7
-#define PCIE_DEVICE_TYPE_PCI_TO_PCIE_BRIDGE 8
-		     /* Root complex integrated endpoint. */
-#define PCIE_DEVICE_TYPE_ROOT_COMPLEX_ENDPOINT 9
-#define PCIE_DEVICE_TYPE_ROOT_COMPLEX_EVENT_COLLECTOR 10
-#define PCIE_CAP_SLOW_IMPLEMENTED (1 << 8)
-#define PCIE_CAP_MSI_IRQ(x) (((x) >> 9) & 0x1f)
-		     u32 dev_capabilities;
-#define PCIE_DEVCAP_MAX_PAYLOAD(x) (128 << (((x) >> 0) & 0x7))
-#define PCIE_DEVCAP_PHANTOM_BITS(x) (((x) >> 3) & 0x3)
-#define PCIE_DEVCAP_EXTENTED_TAG (1 << 5)
-#define PCIE_DEVCAP_L0S	0x1c0	/* L0s Acceptable Latency */
-#define PCIE_DEVCAP_L1	0xe00	/* L1 Acceptable Latency */
-#define PCIE_DEVCAP_ATN_BUT	0x1000	/* Attention Button Present */
-#define PCIE_DEVCAP_ATN_IND	0x2000	/* Attention Indicator Present */
-#define PCIE_DEVCAP_PWR_IND	0x4000	/* Power Indicator Present */
-#define PCIE_DEVCAP_PWR_VAL	0x3fc0000	/* Slot Power Limit Value */
-#define PCIE_DEVCAP_PWR_SCL	0xc000000	/* Slot Power Limit Scale */
-		     u16 dev_control;
-#define PCIE_CTRL_CERE	0x0001	/* Correctable Error Reporting En. */
-#define PCIE_CTRL_NFERE	0x0002	/* Non-Fatal Error Reporting Enable */
-#define PCIE_CTRL_FERE	0x0004	/* Fatal Error Reporting Enable */
-#define PCIE_CTRL_URRE	0x0008	/* Unsupported Request Reporting En. */
-#define PCIE_CTRL_RELAX_EN 0x0010	/* Enable relaxed ordering */
-#define PCIE_CTRL_MAX_PAYLOAD(n) (((n) & 7) << 5)
-#define PCIE_CTRL_EXT_TAG	0x0100	/* Extended Tag Field Enable */
-#define PCIE_CTRL_PHANTOM	0x0200	/* Phantom Functions Enable */
-#define PCIE_CTRL_AUX_PME	0x0400	/* Auxiliary Power PM Enable */
-#define PCIE_CTRL_NOSNOOP_EN	0x0800	/* Enable No Snoop */
-#define PCIE_CTRL_MAX_READ_REQUEST(n) (((n) & 7) << 12)
-		     u16 dev_status;
-#define PCIE_DEVSTA_AUXPD	0x10	/* AUX Power Detected */
-#define PCIE_DEVSTA_TRPND	0x20	/* Transactions Pending */
-		     u32 link_capabilities; u16 link_control; u16 link_status;
-		     u32 slot_capabilities;
-		     u16 slot_control; u16 slot_status; u16 root_control;
-#define PCIE_RTCTL_SECEE	0x01	/* System Error on Correctable Error */
-#define PCIE_RTCTL_SENFEE	0x02	/* System Error on Non-Fatal Error */
-#define PCIE_RTCTL_SEFEE	0x04	/* System Error on Fatal Error */
-#define PCIE_RTCTL_PMEIE	0x08	/* PME Interrupt Enable */
-#define PCIE_RTCTL_CRSSVE	0x10	/* CRS Software Visibility Enable */
-		     u16 root_capabilities;
-		     u32 root_status;
-		     u32 dev_capabilities2;
-		     u16 dev_control2;
-		     u16 dev_status2;
-		     u32 link_capabilities2;
-		     u16 link_control2;
-		     u16 link_status2;
-		     u32 slot_capabilities2; u16 slot_control2;
-		     u16 slot_status2;}) pcie_config_regs_t;
-/* *INDENT-ON* */
-
-/* PCI express extended capabilities. */
-typedef enum pcie_capability_type
-{
-  PCIE_CAP_ADVANCED_ERROR = 1,
-  PCIE_CAP_VC = 2,
-  PCIE_CAP_DSN = 3,
-  PCIE_CAP_PWR = 4,
-} pcie_capability_type_t;
-
-/* Common header for capabilities. */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-enum pcie_capability_type type:16; u16 version: 4; u16 next_capability:12;})
-  /* *INDENT-ON* */
-pcie_capability_regs_t;
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     pcie_capability_regs_t header; u32 uncorrectable_status;
-#define PCIE_ERROR_UNC_LINK_TRAINING 		(1 << 0)
-#define PCIE_ERROR_UNC_DATA_LINK_PROTOCOL 	(1 << 4)
-#define PCIE_ERROR_UNC_SURPRISE_DOWN		(1 << 5)
-#define PCIE_ERROR_UNC_POISONED_TLP		(1 << 12)
-#define PCIE_ERROR_UNC_FLOW_CONTROL		(1 << 13)
-#define PCIE_ERROR_UNC_COMPLETION_TIMEOUT	(1 << 14)
-#define PCIE_ERROR_UNC_COMPLETER_ABORT		(1 << 15)
-#define PCIE_ERROR_UNC_UNEXPECTED_COMPLETION	(1 << 16)
-#define PCIE_ERROR_UNC_RX_OVERFLOW		(1 << 17)
-#define PCIE_ERROR_UNC_MALFORMED_TLP		(1 << 18)
-#define PCIE_ERROR_UNC_CRC_ERROR		(1 << 19)
-#define PCIE_ERROR_UNC_UNSUPPORTED_REQUEST	(1 << 20)
-		     u32 uncorrectable_mask;
-		     u32 uncorrectable_severity; u32 correctable_status;
-#define PCIE_ERROR_COR_RX_ERROR		(1 << 0)
-#define PCIE_ERROR_COR_BAD_TLP		(1 << 6)
-#define PCIE_ERROR_COR_BAD_DLLP		(1 << 7)
-#define PCIE_ERROR_COR_REPLAY_ROLLOVER	(1 << 8)
-#define PCIE_ERROR_COR_REPLAY_TIMER	(1 << 12)
-#define PCIE_ERROR_COR_ADVISORY		(1 << 13)
-		     u32 correctable_mask;
-		     u32 control;
-		     u32 log[4];
-		     u32 root_command;
-		     u32 root_status; u16 correctable_error_source;
-		     u16 error_source;}) pcie_advanced_error_regs_t;
-/* *INDENT-ON* */
-
-/* Virtual Channel */
-#define PCI_VC_PORT_REG1	4
-#define PCI_VC_PORT_REG2	8
-#define PCI_VC_PORT_CTRL	12
-#define PCI_VC_PORT_STATUS	14
-#define PCI_VC_RES_CAP		16
-#define PCI_VC_RES_CTRL		20
-#define PCI_VC_RES_STATUS	26
-
-/* Power Budgeting */
-#define PCI_PWR_DSR		4	/* Data Select Register */
-#define PCI_PWR_DATA		8	/* Data Register */
-#define PCI_PWR_DATA_BASE(x)	((x) & 0xff)	/* Base Power */
-#define PCI_PWR_DATA_SCALE(x)	(((x) >> 8) & 3)	/* Data Scale */
-#define PCI_PWR_DATA_PM_SUB(x)	(((x) >> 10) & 7)	/* PM Sub State */
-#define PCI_PWR_DATA_PM_STATE(x) (((x) >> 13) & 3)	/* PM State */
-#define PCI_PWR_DATA_TYPE(x)	(((x) >> 15) & 7)	/* Type */
-#define PCI_PWR_DATA_RAIL(x)	(((x) >> 18) & 7)	/* Power Rail */
-#define PCI_PWR_CAP		12	/* Capability */
-#define PCI_PWR_CAP_BUDGET(x)	((x) & 1)	/* Included in system budget */
-
-#endif /* included_vlib_pci_config_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/physmem.h b/vlib/vlib/physmem.h
deleted file mode 100644
index 9e7d52a6..00000000
--- a/vlib/vlib/physmem.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * physmem.h: virtual <-> physical memory mapping for VLIB buffers
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_physmem_h
-#define included_vlib_physmem_h
-
-typedef struct
-{
-  uword start, end, size;
-} vlib_physmem_region_t;
-
-typedef struct
-{
-  vlib_physmem_region_t virtual;
-
-  uword log2_n_bytes_per_page;
-
-  /* 1 << log2_n_bytes_per_page - 1. */
-  uword page_mask;
-
-  u64 *page_table;
-
-  /* is fake physmem */
-  u8 is_fake;
-} vlib_physmem_main_t;
-
-always_inline u64
-vlib_physmem_offset_to_physical (vlib_physmem_main_t * pm, uword o)
-{
-  uword page_index = o >> pm->log2_n_bytes_per_page;
-  ASSERT (o < pm->virtual.size);
-  ASSERT (pm->page_table[page_index] != 0);
-  return (vec_elt (pm->page_table, page_index) + (o & pm->page_mask));
-}
-
-always_inline int
-vlib_physmem_is_virtual (vlib_physmem_main_t * pm, uword p)
-{
-  return p >= pm->virtual.start && p < pm->virtual.end;
-}
-
-always_inline uword
-vlib_physmem_offset_of (vlib_physmem_main_t * pm, void *p)
-{
-  uword a = pointer_to_uword (p);
-  uword o;
-
-  ASSERT (vlib_physmem_is_virtual (pm, a));
-  o = a - pm->virtual.start;
-
-  /* Offset must fit in 32 bits. */
-  ASSERT ((uword) o == a - pm->virtual.start);
-
-  return o;
-}
-
-always_inline void *
-vlib_physmem_at_offset (vlib_physmem_main_t * pm, uword offset)
-{
-  ASSERT (offset < pm->virtual.size);
-  return uword_to_pointer (pm->virtual.start + offset, void *);
-}
-
-#endif /* included_vlib_physmem_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/threads.c b/vlib/vlib/threads.c
deleted file mode 100644
index c5e58bc0..00000000
--- a/vlib/vlib/threads.c
+++ /dev/null
@@ -1,1492 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#define _GNU_SOURCE
-
-#include <signal.h>
-#include <math.h>
-#include <vppinfra/format.h>
-#include <vlib/vlib.h>
-
-#include <vlib/threads.h>
-#include <vlib/unix/cj.h>
-
-
-#if DPDK==1
-#include <rte_config.h>
-#include <rte_common.h>
-#include <rte_eal.h>
-#include <rte_launch.h>
-#include <rte_lcore.h>
-#endif
-DECLARE_CJ_GLOBAL_LOG;
-
-#define FRAME_QUEUE_NELTS 32
-
-
-#if DPDK==1
-/*
- *  Weak definitions of DPDK symbols used in this file.
- *  Needed for linking test programs without DPDK libs.
- */
-unsigned __thread __attribute__ ((weak)) RTE_PER_LCORE (_lcore_id);
-struct lcore_config __attribute__ ((weak)) lcore_config[];
-unsigned __attribute__ ((weak)) rte_socket_id ();
-int __attribute__ ((weak)) rte_eal_remote_launch ();
-#endif
-u32
-vl (void *p)
-{
-  return vec_len (p);
-}
-
-vlib_worker_thread_t *vlib_worker_threads;
-vlib_thread_main_t vlib_thread_main;
-
-uword
-os_get_cpu_number (void)
-{
-  void *sp;
-  uword n;
-  u32 len;
-
-  len = vec_len (vlib_thread_stacks);
-  if (len == 0)
-    return 0;
-
-  /* Get any old stack address. */
-  sp = &sp;
-
-  n = ((uword) sp - (uword) vlib_thread_stacks[0])
-    >> VLIB_LOG2_THREAD_STACK_SIZE;
-
-  /* "processes" have their own stacks, and they always run in thread 0 */
-  n = n >= len ? 0 : n;
-
-  return n;
-}
-
-uword
-os_get_ncpus (void)
-{
-  u32 len;
-
-  len = vec_len (vlib_thread_stacks);
-  if (len == 0)
-    return 1;
-  else
-    return len;
-}
-
-void
-vlib_set_thread_name (char *name)
-{
-  int pthread_setname_np (pthread_t __target_thread, const char *__name);
-  int rv;
-  pthread_t thread = pthread_self ();
-
-  if (thread)
-    {
-      rv = pthread_setname_np (thread, name);
-      if (rv)
-	clib_warning ("pthread_setname_np returned %d", rv);
-    }
-}
-
-static int
-sort_registrations_by_no_clone (void *a0, void *a1)
-{
-  vlib_thread_registration_t **tr0 = a0;
-  vlib_thread_registration_t **tr1 = a1;
-
-  return ((i32) ((*tr0)->no_data_structure_clone)
-	  - ((i32) ((*tr1)->no_data_structure_clone)));
-}
-
-static uword *
-vlib_sysfs_list_to_bitmap (char *filename)
-{
-  FILE *fp;
-  uword *r = 0;
-
-  fp = fopen (filename, "r");
-
-  if (fp != NULL)
-    {
-      u8 *buffer = 0;
-      vec_validate (buffer, 256 - 1);
-      if (fgets ((char *) buffer, 256, fp))
-	{
-	  unformat_input_t in;
-	  unformat_init_string (&in, (char *) buffer,
-				strlen ((char *) buffer));
-	  if (unformat (&in, "%U", unformat_bitmap_list, &r) != 1)
-	    clib_warning ("unformat_bitmap_list failed");
-	  unformat_free (&in);
-	}
-      vec_free (buffer);
-      fclose (fp);
-    }
-  return r;
-}
-
-
-/* Called early in the init sequence */
-
-clib_error_t *
-vlib_thread_init (vlib_main_t * vm)
-{
-  vlib_thread_main_t *tm = &vlib_thread_main;
-  vlib_worker_thread_t *w;
-  vlib_thread_registration_t *tr;
-  u32 n_vlib_mains = 1;
-  u32 first_index = 1;
-  u32 i;
-  uword *avail_cpu;
-
-  /* get bitmaps of active cpu cores and sockets */
-  tm->cpu_core_bitmap =
-    vlib_sysfs_list_to_bitmap ("/sys/devices/system/cpu/online");
-  tm->cpu_socket_bitmap =
-    vlib_sysfs_list_to_bitmap ("/sys/devices/system/node/online");
-
-  avail_cpu = clib_bitmap_dup (tm->cpu_core_bitmap);
-
-  /* skip cores */
-  for (i = 0; i < tm->skip_cores; i++)
-    {
-      uword c = clib_bitmap_first_set (avail_cpu);
-      if (c == ~0)
-	return clib_error_return (0, "no available cpus to skip");
-
-      avail_cpu = clib_bitmap_set (avail_cpu, c, 0);
-    }
-
-  /* grab cpu for main thread */
-  if (!tm->main_lcore)
-    {
-      tm->main_lcore = clib_bitmap_first_set (avail_cpu);
-      if (tm->main_lcore == (u8) ~ 0)
-	return clib_error_return (0, "no available cpus to be used for the"
-				  " main thread");
-    }
-  else
-    {
-      if (clib_bitmap_get (avail_cpu, tm->main_lcore) == 0)
-	return clib_error_return (0, "cpu %u is not available to be used"
-				  " for the main thread", tm->main_lcore);
-    }
-  avail_cpu = clib_bitmap_set (avail_cpu, tm->main_lcore, 0);
-
-  /* assume that there is socket 0 only if there is no data from sysfs */
-  if (!tm->cpu_socket_bitmap)
-    tm->cpu_socket_bitmap = clib_bitmap_set (0, 0, 1);
-
-  /* pin main thread to main_lcore  */
-#if DPDK==0
-  {
-    cpu_set_t cpuset;
-    CPU_ZERO (&cpuset);
-    CPU_SET (tm->main_lcore, &cpuset);
-    pthread_setaffinity_np (pthread_self (), sizeof (cpu_set_t), &cpuset);
-  }
-#endif
-
-  /* as many threads as stacks... */
-  vec_validate_aligned (vlib_worker_threads, vec_len (vlib_thread_stacks) - 1,
-			CLIB_CACHE_LINE_BYTES);
-
-  /* Preallocate thread 0 */
-  _vec_len (vlib_worker_threads) = 1;
-  w = vlib_worker_threads;
-  w->thread_mheap = clib_mem_get_heap ();
-  w->thread_stack = vlib_thread_stacks[0];
-  w->lcore_id = tm->main_lcore;
-  w->lwp = syscall (SYS_gettid);
-  w->thread_id = pthread_self ();
-  tm->n_vlib_mains = 1;
-
-  if (tm->sched_policy != ~0)
-    {
-      struct sched_param sched_param;
-      if (!sched_getparam (w->lwp, &sched_param))
-	{
-	  if (tm->sched_priority != ~0)
-	    sched_param.sched_priority = tm->sched_priority;
-	  sched_setscheduler (w->lwp, tm->sched_policy, &sched_param);
-	}
-    }
-
-  /* assign threads to cores and set n_vlib_mains */
-  tr = tm->next;
-
-  while (tr)
-    {
-      vec_add1 (tm->registrations, tr);
-      tr = tr->next;
-    }
-
-  vec_sort_with_function (tm->registrations, sort_registrations_by_no_clone);
-
-  for (i = 0; i < vec_len (tm->registrations); i++)
-    {
-      int j;
-      tr = tm->registrations[i];
-      tr->first_index = first_index;
-      first_index += tr->count;
-      n_vlib_mains += (tr->no_data_structure_clone == 0) ? tr->count : 0;
-
-      /* construct coremask */
-      if (tr->use_pthreads || !tr->count)
-	continue;
-
-      if (tr->coremask)
-	{
-	  uword c;
-          /* *INDENT-OFF* */
-          clib_bitmap_foreach (c, tr->coremask, ({
-            if (clib_bitmap_get(avail_cpu, c) == 0)
-              return clib_error_return (0, "cpu %u is not available to be used"
-                                        " for the '%s' thread",c, tr->name);
-
-            avail_cpu = clib_bitmap_set(avail_cpu, c, 0);
-          }));
-/* *INDENT-ON* */
-
-	}
-      else
-	{
-	  for (j = 0; j < tr->count; j++)
-	    {
-	      uword c = clib_bitmap_first_set (avail_cpu);
-	      if (c == ~0)
-		return clib_error_return (0,
-					  "no available cpus to be used for"
-					  " the '%s' thread", tr->name);
-
-	      avail_cpu = clib_bitmap_set (avail_cpu, c, 0);
-	      tr->coremask = clib_bitmap_set (tr->coremask, c, 1);
-	    }
-	}
-    }
-
-  clib_bitmap_free (avail_cpu);
-
-  tm->n_vlib_mains = n_vlib_mains;
-
-  vec_validate_aligned (vlib_worker_threads, first_index - 1,
-			CLIB_CACHE_LINE_BYTES);
-
-  return 0;
-}
-
-vlib_worker_thread_t *
-vlib_alloc_thread (vlib_main_t * vm)
-{
-  vlib_worker_thread_t *w;
-
-  if (vec_len (vlib_worker_threads) >= vec_len (vlib_thread_stacks))
-    {
-      clib_warning ("out of worker threads... Quitting...");
-      exit (1);
-    }
-  vec_add2 (vlib_worker_threads, w, 1);
-  w->thread_stack = vlib_thread_stacks[w - vlib_worker_threads];
-  return w;
-}
-
-vlib_frame_queue_t *
-vlib_frame_queue_alloc (int nelts)
-{
-  vlib_frame_queue_t *fq;
-
-  fq = clib_mem_alloc_aligned (sizeof (*fq), CLIB_CACHE_LINE_BYTES);
-  memset (fq, 0, sizeof (*fq));
-  fq->nelts = nelts;
-  fq->vector_threshold = 128;	// packets
-  vec_validate_aligned (fq->elts, nelts - 1, CLIB_CACHE_LINE_BYTES);
-
-  if (1)
-    {
-      if (((uword) & fq->tail) & (CLIB_CACHE_LINE_BYTES - 1))
-	fformat (stderr, "WARNING: fq->tail unaligned\n");
-      if (((uword) & fq->head) & (CLIB_CACHE_LINE_BYTES - 1))
-	fformat (stderr, "WARNING: fq->head unaligned\n");
-      if (((uword) fq->elts) & (CLIB_CACHE_LINE_BYTES - 1))
-	fformat (stderr, "WARNING: fq->elts unaligned\n");
-
-      if (sizeof (fq->elts[0]) % CLIB_CACHE_LINE_BYTES)
-	fformat (stderr, "WARNING: fq->elts[0] size %d\n",
-		 sizeof (fq->elts[0]));
-      if (nelts & (nelts - 1))
-	{
-	  fformat (stderr, "FATAL: nelts MUST be a power of 2\n");
-	  abort ();
-	}
-    }
-
-  return (fq);
-}
-
-void vl_msg_api_handler_no_free (void *) __attribute__ ((weak));
-void
-vl_msg_api_handler_no_free (void *v)
-{
-}
-
-/* Turned off, save as reference material... */
-#if 0
-static inline int
-vlib_frame_queue_dequeue_internal (int thread_id,
-				   vlib_main_t * vm, vlib_node_main_t * nm)
-{
-  vlib_frame_queue_t *fq = vlib_frame_queues[thread_id];
-  vlib_frame_queue_elt_t *elt;
-  vlib_frame_t *f;
-  vlib_pending_frame_t *p;
-  vlib_node_runtime_t *r;
-  u32 node_runtime_index;
-  int msg_type;
-  u64 before;
-  int processed = 0;
-
-  ASSERT (vm == vlib_mains[thread_id]);
-
-  while (1)
-    {
-      if (fq->head == fq->tail)
-	return processed;
-
-      elt = fq->elts + ((fq->head + 1) & (fq->nelts - 1));
-
-      if (!elt->valid)
-	return processed;
-
-      before = clib_cpu_time_now ();
-
-      f = elt->frame;
-      node_runtime_index = elt->node_runtime_index;
-      msg_type = elt->msg_type;
-
-      switch (msg_type)
-	{
-	case VLIB_FRAME_QUEUE_ELT_FREE_BUFFERS:
-	  vlib_buffer_free (vm, vlib_frame_vector_args (f), f->n_vectors);
-	  /* note fallthrough... */
-	case VLIB_FRAME_QUEUE_ELT_FREE_FRAME:
-	  r = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL],
-				node_runtime_index);
-	  vlib_frame_free (vm, r, f);
-	  break;
-	case VLIB_FRAME_QUEUE_ELT_DISPATCH_FRAME:
-	  vec_add2 (vm->node_main.pending_frames, p, 1);
-	  f->flags |= (VLIB_FRAME_PENDING | VLIB_FRAME_FREE_AFTER_DISPATCH);
-	  p->node_runtime_index = elt->node_runtime_index;
-	  p->frame_index = vlib_frame_index (vm, f);
-	  p->next_frame_index = VLIB_PENDING_FRAME_NO_NEXT_FRAME;
-	  fq->dequeue_vectors += (u64) f->n_vectors;
-	  break;
-	case VLIB_FRAME_QUEUE_ELT_API_MSG:
-	  vl_msg_api_handler_no_free (f);
-	  break;
-	default:
-	  clib_warning ("bogus frame queue message, type %d", msg_type);
-	  break;
-	}
-      elt->valid = 0;
-      fq->dequeues++;
-      fq->dequeue_ticks += clib_cpu_time_now () - before;
-      CLIB_MEMORY_BARRIER ();
-      fq->head++;
-      processed++;
-    }
-  ASSERT (0);
-  return processed;
-}
-
-int
-vlib_frame_queue_dequeue (int thread_id,
-			  vlib_main_t * vm, vlib_node_main_t * nm)
-{
-  return vlib_frame_queue_dequeue_internal (thread_id, vm, nm);
-}
-
-int
-vlib_frame_queue_enqueue (vlib_main_t * vm, u32 node_runtime_index,
-			  u32 frame_queue_index, vlib_frame_t * frame,
-			  vlib_frame_queue_msg_type_t type)
-{
-  vlib_frame_queue_t *fq = vlib_frame_queues[frame_queue_index];
-  vlib_frame_queue_elt_t *elt;
-  u32 save_count;
-  u64 new_tail;
-  u64 before = clib_cpu_time_now ();
-
-  ASSERT (fq);
-
-  new_tail = __sync_add_and_fetch (&fq->tail, 1);
-
-  /* Wait until a ring slot is available */
-  while (new_tail >= fq->head + fq->nelts)
-    {
-      f64 b4 = vlib_time_now_ticks (vm, before);
-      vlib_worker_thread_barrier_check (vm, b4);
-      /* Bad idea. Dequeue -> enqueue -> dequeue -> trouble */
-      // vlib_frame_queue_dequeue (vm->cpu_index, vm, nm);
-    }
-
-  elt = fq->elts + (new_tail & (fq->nelts - 1));
-
-  /* this would be very bad... */
-  while (elt->valid)
-    {
-    }
-
-  /* Once we enqueue the frame, frame->n_vectors is owned elsewhere... */
-  save_count = frame->n_vectors;
-
-  elt->frame = frame;
-  elt->node_runtime_index = node_runtime_index;
-  elt->msg_type = type;
-  CLIB_MEMORY_BARRIER ();
-  elt->valid = 1;
-
-  return save_count;
-}
-#endif /* 0 */
-
-/* To be called by vlib worker threads upon startup */
-void
-vlib_worker_thread_init (vlib_worker_thread_t * w)
-{
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-
-  /*
-   * Note: disabling signals in worker threads as follows
-   * prevents the api post-mortem dump scheme from working
-   * {
-   *    sigset_t s;
-   *    sigfillset (&s);
-   *    pthread_sigmask (SIG_SETMASK, &s, 0);
-   *  }
-   */
-
-  clib_mem_set_heap (w->thread_mheap);
-
-  if (vec_len (tm->thread_prefix) && w->registration->short_name)
-    {
-      w->name = format (0, "%v_%s_%d%c", tm->thread_prefix,
-			w->registration->short_name, w->instance_id, '\0');
-      vlib_set_thread_name ((char *) w->name);
-    }
-
-  if (!w->registration->use_pthreads)
-    {
-
-      /* Initial barrier sync, for both worker and i/o threads */
-      clib_smp_atomic_add (vlib_worker_threads->workers_at_barrier, 1);
-
-      while (*vlib_worker_threads->wait_at_barrier)
-	;
-
-      clib_smp_atomic_add (vlib_worker_threads->workers_at_barrier, -1);
-    }
-}
-
-void *
-vlib_worker_thread_bootstrap_fn (void *arg)
-{
-  void *rv;
-  vlib_worker_thread_t *w = arg;
-
-  w->lwp = syscall (SYS_gettid);
-  w->thread_id = pthread_self ();
-
-  rv = (void *) clib_calljmp
-    ((uword (*)(uword)) w->thread_function,
-     (uword) arg, w->thread_stack + VLIB_THREAD_STACK_SIZE);
-  /* NOTREACHED, we hope */
-  return rv;
-}
-
-static int
-vlib_launch_thread (void *fp, vlib_worker_thread_t * w, unsigned lcore_id)
-{
-  void *(*fp_arg) (void *) = fp;
-
-  w->lcore_id = lcore_id;
-#if DPDK==1
-  if (!w->registration->use_pthreads)
-    if (rte_eal_remote_launch)	/* do we have dpdk linked */
-      return rte_eal_remote_launch (fp, (void *) w, lcore_id);
-    else
-      return -1;
-  else
-#endif
-    {
-      int ret;
-      pthread_t worker;
-      cpu_set_t cpuset;
-      CPU_ZERO (&cpuset);
-      CPU_SET (lcore_id, &cpuset);
-
-      ret = pthread_create (&worker, NULL /* attr */ , fp_arg, (void *) w);
-      if (ret == 0)
-	return pthread_setaffinity_np (worker, sizeof (cpu_set_t), &cpuset);
-      else
-	return ret;
-    }
-}
-
-static clib_error_t *
-start_workers (vlib_main_t * vm)
-{
-  int i, j;
-  vlib_worker_thread_t *w;
-  vlib_main_t *vm_clone;
-  void *oldheap;
-  vlib_thread_main_t *tm = &vlib_thread_main;
-  vlib_thread_registration_t *tr;
-  vlib_node_runtime_t *rt;
-  u32 n_vlib_mains = tm->n_vlib_mains;
-  u32 worker_thread_index;
-  u8 *main_heap = clib_mem_get_per_cpu_heap ();
-  mheap_t *main_heap_header = mheap_header (main_heap);
-
-  vec_reset_length (vlib_worker_threads);
-
-  /* Set up the main thread */
-  vec_add2_aligned (vlib_worker_threads, w, 1, CLIB_CACHE_LINE_BYTES);
-  w->elog_track.name = "main thread";
-  elog_track_register (&vm->elog_main, &w->elog_track);
-
-  if (vec_len (tm->thread_prefix))
-    {
-      w->name = format (0, "%v_main%c", tm->thread_prefix, '\0');
-      vlib_set_thread_name ((char *) w->name);
-    }
-
-  /*
-   * Truth of the matter: we always use at least two
-   * threads. So, make the main heap thread-safe
-   * and make the event log thread-safe.
-   */
-  main_heap_header->flags |= MHEAP_FLAG_THREAD_SAFE;
-  vm->elog_main.lock =
-    clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
-  vm->elog_main.lock[0] = 0;
-
-  if (n_vlib_mains > 1)
-    {
-      vec_validate (vlib_mains, tm->n_vlib_mains - 1);
-      _vec_len (vlib_mains) = 0;
-      vec_add1 (vlib_mains, vm);
-
-      vlib_worker_threads->wait_at_barrier =
-	clib_mem_alloc_aligned (sizeof (u32), CLIB_CACHE_LINE_BYTES);
-      vlib_worker_threads->workers_at_barrier =
-	clib_mem_alloc_aligned (sizeof (u32), CLIB_CACHE_LINE_BYTES);
-
-      /* Ask for an initial barrier sync */
-      *vlib_worker_threads->workers_at_barrier = 0;
-      *vlib_worker_threads->wait_at_barrier = 1;
-
-      worker_thread_index = 1;
-
-      for (i = 0; i < vec_len (tm->registrations); i++)
-	{
-	  vlib_node_main_t *nm, *nm_clone;
-	  vlib_buffer_main_t *bm_clone;
-	  vlib_buffer_free_list_t *fl_clone, *fl_orig;
-	  vlib_buffer_free_list_t *orig_freelist_pool;
-	  int k;
-
-	  tr = tm->registrations[i];
-
-	  if (tr->count == 0)
-	    continue;
-
-	  for (k = 0; k < tr->count; k++)
-	    {
-	      vec_add2 (vlib_worker_threads, w, 1);
-	      if (tr->mheap_size)
-		w->thread_mheap =
-		  mheap_alloc (0 /* use VM */ , tr->mheap_size);
-	      else
-		w->thread_mheap = main_heap;
-	      w->thread_stack = vlib_thread_stacks[w - vlib_worker_threads];
-	      w->thread_function = tr->function;
-	      w->thread_function_arg = w;
-	      w->instance_id = k;
-	      w->registration = tr;
-
-	      w->elog_track.name =
-		(char *) format (0, "%s %d", tr->name, k + 1);
-	      vec_add1 (w->elog_track.name, 0);
-	      elog_track_register (&vm->elog_main, &w->elog_track);
-
-	      if (tr->no_data_structure_clone)
-		continue;
-
-	      /* Fork vlib_global_main et al. Look for bugs here */
-	      oldheap = clib_mem_set_heap (w->thread_mheap);
-
-	      vm_clone = clib_mem_alloc (sizeof (*vm_clone));
-	      clib_memcpy (vm_clone, vlib_mains[0], sizeof (*vm_clone));
-
-	      vm_clone->cpu_index = worker_thread_index;
-	      vm_clone->heap_base = w->thread_mheap;
-	      vm_clone->mbuf_alloc_list = 0;
-	      memset (&vm_clone->random_buffer, 0,
-		      sizeof (vm_clone->random_buffer));
-
-	      nm = &vlib_mains[0]->node_main;
-	      nm_clone = &vm_clone->node_main;
-	      /* fork next frames array, preserving node runtime indices */
-	      nm_clone->next_frames = vec_dup (nm->next_frames);
-	      for (j = 0; j < vec_len (nm_clone->next_frames); j++)
-		{
-		  vlib_next_frame_t *nf = &nm_clone->next_frames[j];
-		  u32 save_node_runtime_index;
-		  u32 save_flags;
-
-		  save_node_runtime_index = nf->node_runtime_index;
-		  save_flags = nf->flags & VLIB_FRAME_NO_FREE_AFTER_DISPATCH;
-		  vlib_next_frame_init (nf);
-		  nf->node_runtime_index = save_node_runtime_index;
-		  nf->flags = save_flags;
-		}
-
-	      /* fork the frame dispatch queue */
-	      nm_clone->pending_frames = 0;
-	      vec_validate (nm_clone->pending_frames, 10);	/* $$$$$?????? */
-	      _vec_len (nm_clone->pending_frames) = 0;
-
-	      /* fork nodes */
-	      nm_clone->nodes = 0;
-	      for (j = 0; j < vec_len (nm->nodes); j++)
-		{
-		  vlib_node_t *n;
-		  n = clib_mem_alloc_no_fail (sizeof (*n));
-		  clib_memcpy (n, nm->nodes[j], sizeof (*n));
-		  /* none of the copied nodes have enqueue rights given out */
-		  n->owner_node_index = VLIB_INVALID_NODE_INDEX;
-		  memset (&n->stats_total, 0, sizeof (n->stats_total));
-		  memset (&n->stats_last_clear, 0,
-			  sizeof (n->stats_last_clear));
-		  vec_add1 (nm_clone->nodes, n);
-		}
-	      nm_clone->nodes_by_type[VLIB_NODE_TYPE_INTERNAL] =
-		vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL]);
-
-	      nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT] =
-		vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT]);
-	      vec_foreach (rt, nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT])
-		rt->cpu_index = vm_clone->cpu_index;
-
-	      nm_clone->processes = vec_dup (nm->processes);
-
-	      /* zap the (per worker) frame freelists, etc */
-	      nm_clone->frame_sizes = 0;
-	      nm_clone->frame_size_hash = 0;
-
-	      /* Packet trace buffers are guaranteed to be empty, nothing to do here */
-
-	      clib_mem_set_heap (oldheap);
-	      vec_add1 (vlib_mains, vm_clone);
-
-	      vm_clone->error_main.counters =
-		vec_dup (vlib_mains[0]->error_main.counters);
-	      vm_clone->error_main.counters_last_clear =
-		vec_dup (vlib_mains[0]->error_main.counters_last_clear);
-
-	      /* Fork the vlib_buffer_main_t free lists, etc. */
-	      bm_clone = vec_dup (vm_clone->buffer_main);
-	      vm_clone->buffer_main = bm_clone;
-
-	      orig_freelist_pool = bm_clone->buffer_free_list_pool;
-	      bm_clone->buffer_free_list_pool = 0;
-
-            /* *INDENT-OFF* */
-            pool_foreach (fl_orig, orig_freelist_pool,
-                          ({
-                            pool_get_aligned (bm_clone->buffer_free_list_pool,
-                                              fl_clone, CLIB_CACHE_LINE_BYTES);
-                            ASSERT (fl_orig - orig_freelist_pool
-                                    == fl_clone - bm_clone->buffer_free_list_pool);
-
-                            fl_clone[0] = fl_orig[0];
-                            fl_clone->aligned_buffers = 0;
-                            fl_clone->unaligned_buffers = 0;
-                            fl_clone->n_alloc = 0;
-                          }));
-/* *INDENT-ON* */
-
-	      worker_thread_index++;
-	    }
-	}
-    }
-  else
-    {
-      /* only have non-data-structure copy threads to create... */
-      for (i = 0; i < vec_len (tm->registrations); i++)
-	{
-	  tr = tm->registrations[i];
-
-	  for (j = 0; j < tr->count; j++)
-	    {
-	      vec_add2 (vlib_worker_threads, w, 1);
-	      if (tr->mheap_size)
-		w->thread_mheap =
-		  mheap_alloc (0 /* use VM */ , tr->mheap_size);
-	      else
-		w->thread_mheap = main_heap;
-	      w->thread_stack = vlib_thread_stacks[w - vlib_worker_threads];
-	      w->thread_function = tr->function;
-	      w->thread_function_arg = w;
-	      w->instance_id = j;
-	      w->elog_track.name =
-		(char *) format (0, "%s %d", tr->name, j + 1);
-	      w->registration = tr;
-	      vec_add1 (w->elog_track.name, 0);
-	      elog_track_register (&vm->elog_main, &w->elog_track);
-	    }
-	}
-    }
-
-  worker_thread_index = 1;
-
-  for (i = 0; i < vec_len (tm->registrations); i++)
-    {
-      int j;
-
-      tr = tm->registrations[i];
-
-      if (tr->use_pthreads || tm->use_pthreads)
-	{
-	  for (j = 0; j < tr->count; j++)
-	    {
-	      w = vlib_worker_threads + worker_thread_index++;
-	      if (vlib_launch_thread (vlib_worker_thread_bootstrap_fn, w, 0) <
-		  0)
-		clib_warning ("Couldn't start '%s' pthread ", tr->name);
-	    }
-	}
-      else
-	{
-	  uword c;
-            /* *INDENT-OFF* */
-            clib_bitmap_foreach (c, tr->coremask, ({
-              w = vlib_worker_threads + worker_thread_index++;
-              if (vlib_launch_thread (vlib_worker_thread_bootstrap_fn, w, c) < 0)
-                clib_warning ("Couldn't start DPDK lcore %d", c);
-
-            }));
-/* *INDENT-ON* */
-	}
-    }
-  vlib_worker_thread_barrier_sync (vm);
-  vlib_worker_thread_barrier_release (vm);
-  return 0;
-}
-
-VLIB_MAIN_LOOP_ENTER_FUNCTION (start_workers);
-
-void
-vlib_worker_thread_node_runtime_update (void)
-{
-  int i, j;
-  vlib_worker_thread_t *w;
-  vlib_main_t *vm;
-  vlib_node_main_t *nm, *nm_clone;
-  vlib_node_t **old_nodes_clone;
-  vlib_main_t *vm_clone;
-  vlib_node_runtime_t *rt, *old_rt;
-  void *oldheap;
-  never_inline void
-    vlib_node_runtime_sync_stats (vlib_main_t * vm,
-				  vlib_node_runtime_t * r,
-				  uword n_calls,
-				  uword n_vectors, uword n_clocks);
-
-  ASSERT (os_get_cpu_number () == 0);
-
-  if (vec_len (vlib_mains) == 0)
-    return;
-
-  vm = vlib_mains[0];
-  nm = &vm->node_main;
-
-  ASSERT (os_get_cpu_number () == 0);
-  ASSERT (*vlib_worker_threads->wait_at_barrier == 1);
-
-  /*
-   * Scrape all runtime stats, so we don't lose node runtime(s) with
-   * pending counts, or throw away worker / io thread counts.
-   */
-  for (j = 0; j < vec_len (nm->nodes); j++)
-    {
-      vlib_node_t *n;
-      n = nm->nodes[j];
-      vlib_node_sync_stats (vm, n);
-    }
-
-  for (i = 1; i < vec_len (vlib_mains); i++)
-    {
-      vlib_node_t *n;
-
-      vm_clone = vlib_mains[i];
-      nm_clone = &vm_clone->node_main;
-
-      for (j = 0; j < vec_len (nm_clone->nodes); j++)
-	{
-	  n = nm_clone->nodes[j];
-
-	  rt = vlib_node_get_runtime (vm_clone, n->index);
-	  vlib_node_runtime_sync_stats (vm_clone, rt, 0, 0, 0);
-	}
-    }
-
-  for (i = 1; i < vec_len (vlib_mains); i++)
-    {
-      vlib_node_runtime_t *rt;
-      w = vlib_worker_threads + i;
-      oldheap = clib_mem_set_heap (w->thread_mheap);
-
-      vm_clone = vlib_mains[i];
-
-      /* Re-clone error heap */
-      u64 *old_counters = vm_clone->error_main.counters;
-      u64 *old_counters_all_clear = vm_clone->error_main.counters_last_clear;
-      clib_memcpy (&vm_clone->error_main, &vm->error_main,
-		   sizeof (vm->error_main));
-      j = vec_len (vm->error_main.counters) - 1;
-      vec_validate_aligned (old_counters, j, CLIB_CACHE_LINE_BYTES);
-      vec_validate_aligned (old_counters_all_clear, j, CLIB_CACHE_LINE_BYTES);
-      vm_clone->error_main.counters = old_counters;
-      vm_clone->error_main.counters_last_clear = old_counters_all_clear;
-
-      nm_clone = &vm_clone->node_main;
-      vec_free (nm_clone->next_frames);
-      nm_clone->next_frames = vec_dup (nm->next_frames);
-
-      for (j = 0; j < vec_len (nm_clone->next_frames); j++)
-	{
-	  vlib_next_frame_t *nf = &nm_clone->next_frames[j];
-	  u32 save_node_runtime_index;
-	  u32 save_flags;
-
-	  save_node_runtime_index = nf->node_runtime_index;
-	  save_flags = nf->flags & VLIB_FRAME_NO_FREE_AFTER_DISPATCH;
-	  vlib_next_frame_init (nf);
-	  nf->node_runtime_index = save_node_runtime_index;
-	  nf->flags = save_flags;
-	}
-
-      old_nodes_clone = nm_clone->nodes;
-      nm_clone->nodes = 0;
-
-      /* re-fork nodes */
-      for (j = 0; j < vec_len (nm->nodes); j++)
-	{
-	  vlib_node_t *old_n_clone;
-	  vlib_node_t *new_n, *new_n_clone;
-
-	  new_n = nm->nodes[j];
-	  old_n_clone = old_nodes_clone[j];
-
-	  new_n_clone = clib_mem_alloc_no_fail (sizeof (*new_n_clone));
-	  clib_memcpy (new_n_clone, new_n, sizeof (*new_n));
-	  /* none of the copied nodes have enqueue rights given out */
-	  new_n_clone->owner_node_index = VLIB_INVALID_NODE_INDEX;
-
-	  if (j >= vec_len (old_nodes_clone))
-	    {
-	      /* new node, set to zero */
-	      memset (&new_n_clone->stats_total, 0,
-		      sizeof (new_n_clone->stats_total));
-	      memset (&new_n_clone->stats_last_clear, 0,
-		      sizeof (new_n_clone->stats_last_clear));
-	    }
-	  else
-	    {
-	      /* Copy stats if the old data is valid */
-	      clib_memcpy (&new_n_clone->stats_total,
-			   &old_n_clone->stats_total,
-			   sizeof (new_n_clone->stats_total));
-	      clib_memcpy (&new_n_clone->stats_last_clear,
-			   &old_n_clone->stats_last_clear,
-			   sizeof (new_n_clone->stats_last_clear));
-
-	      /* keep previous node state */
-	      new_n_clone->state = old_n_clone->state;
-	    }
-	  vec_add1 (nm_clone->nodes, new_n_clone);
-	}
-      /* Free the old node clone */
-      for (j = 0; j < vec_len (old_nodes_clone); j++)
-	clib_mem_free (old_nodes_clone[j]);
-      vec_free (old_nodes_clone);
-
-      vec_free (nm_clone->nodes_by_type[VLIB_NODE_TYPE_INTERNAL]);
-
-      nm_clone->nodes_by_type[VLIB_NODE_TYPE_INTERNAL] =
-	vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL]);
-
-      /* clone input node runtime */
-      old_rt = nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT];
-
-      nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT] =
-	vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT]);
-
-      vec_foreach (rt, nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT])
-      {
-	rt->cpu_index = vm_clone->cpu_index;
-      }
-
-      for (j = 0; j < vec_len (old_rt); j++)
-	{
-	  rt = vlib_node_get_runtime (vm_clone, old_rt[j].node_index);
-	  rt->state = old_rt[j].state;
-	}
-
-      vec_free (old_rt);
-
-      nm_clone->processes = vec_dup (nm->processes);
-
-      clib_mem_set_heap (oldheap);
-
-      // vnet_main_fork_fixup (i);
-    }
-}
-
-u32
-unformat_sched_policy (unformat_input_t * input, va_list * args)
-{
-  u32 *r = va_arg (*args, u32 *);
-
-  if (0);
-#define _(v,f,s) else if (unformat (input, s)) *r = SCHED_POLICY_##f;
-  foreach_sched_policy
-#undef _
-    else
-    return 0;
-  return 1;
-}
-
-static clib_error_t *
-cpu_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  vlib_thread_registration_t *tr;
-  uword *p;
-  vlib_thread_main_t *tm = &vlib_thread_main;
-  u8 *name;
-  u64 coremask;
-  uword *bitmap;
-  u32 count;
-
-  tm->thread_registrations_by_name = hash_create_string (0, sizeof (uword));
-
-  tm->n_thread_stacks = 1;	/* account for main thread */
-  tm->sched_policy = ~0;
-  tm->sched_priority = ~0;
-
-  tr = tm->next;
-
-  while (tr)
-    {
-      hash_set_mem (tm->thread_registrations_by_name, tr->name, (uword) tr);
-      tr = tr->next;
-    }
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "use-pthreads"))
-	tm->use_pthreads = 1;
-      else if (unformat (input, "thread-prefix %v", &tm->thread_prefix))
-	;
-      else if (unformat (input, "main-core %u", &tm->main_lcore))
-	;
-      else if (unformat (input, "skip-cores %u", &tm->skip_cores))
-	;
-      else if (unformat (input, "coremask-%s %llx", &name, &coremask))
-	{
-	  p = hash_get_mem (tm->thread_registrations_by_name, name);
-	  if (p == 0)
-	    return clib_error_return (0, "no such thread type '%s'", name);
-
-	  tr = (vlib_thread_registration_t *) p[0];
-
-	  if (tr->use_pthreads)
-	    return clib_error_return (0,
-				      "coremask cannot be set for '%s' threads",
-				      name);
-
-	  tr->coremask = clib_bitmap_set_multiple
-	    (tr->coremask, 0, coremask, BITS (coremask));
-	  tr->count = clib_bitmap_count_set_bits (tr->coremask);
-	}
-      else if (unformat (input, "corelist-%s %U", &name, unformat_bitmap_list,
-			 &bitmap))
-	{
-	  p = hash_get_mem (tm->thread_registrations_by_name, name);
-	  if (p == 0)
-	    return clib_error_return (0, "no such thread type '%s'", name);
-
-	  tr = (vlib_thread_registration_t *) p[0];
-
-	  if (tr->use_pthreads)
-	    return clib_error_return (0,
-				      "corelist cannot be set for '%s' threads",
-				      name);
-
-	  tr->coremask = bitmap;
-	  tr->count = clib_bitmap_count_set_bits (tr->coremask);
-	}
-      else
-	if (unformat
-	    (input, "scheduler-policy %U", unformat_sched_policy,
-	     &tm->sched_policy))
-	;
-      else if (unformat (input, "scheduler-priority %u", &tm->sched_priority))
-	;
-      else if (unformat (input, "%s %u", &name, &count))
-	{
-	  p = hash_get_mem (tm->thread_registrations_by_name, name);
-	  if (p == 0)
-	    return clib_error_return (0, "no such thread type 3 '%s'", name);
-
-	  tr = (vlib_thread_registration_t *) p[0];
-	  if (tr->fixed_count)
-	    return clib_error_return
-	      (0, "number of %s threads not configurable", tr->name);
-	  tr->count = count;
-	}
-      else
-	break;
-    }
-
-  if (tm->sched_priority != ~0)
-    {
-      if (tm->sched_policy == SCHED_FIFO || tm->sched_policy == SCHED_RR)
-	{
-	  u32 prio_max = sched_get_priority_max (tm->sched_policy);
-	  u32 prio_min = sched_get_priority_min (tm->sched_policy);
-	  if (tm->sched_priority > prio_max)
-	    tm->sched_priority = prio_max;
-	  if (tm->sched_priority < prio_min)
-	    tm->sched_priority = prio_min;
-	}
-      else
-	{
-	  return clib_error_return
-	    (0,
-	     "scheduling priority (%d) is not allowed for `normal` scheduling policy",
-	     tm->sched_priority);
-	}
-    }
-  tr = tm->next;
-
-  if (!tm->thread_prefix)
-    tm->thread_prefix = format (0, "vpp");
-
-  while (tr)
-    {
-      tm->n_thread_stacks += tr->count;
-      tm->n_pthreads += tr->count * tr->use_pthreads;
-      tm->n_eal_threads += tr->count * (tr->use_pthreads == 0);
-      tr = tr->next;
-    }
-
-  return 0;
-}
-
-VLIB_EARLY_CONFIG_FUNCTION (cpu_config, "cpu");
-
-#if !defined (__x86_64__) && !defined (__aarch64__) && !defined (__powerpc64__) && !defined(__arm__)
-void
-__sync_fetch_and_add_8 (void)
-{
-  fformat (stderr, "%s called\n", __FUNCTION__);
-  abort ();
-}
-
-void
-__sync_add_and_fetch_8 (void)
-{
-  fformat (stderr, "%s called\n", __FUNCTION__);
-  abort ();
-}
-#endif
-
-void vnet_main_fixup (vlib_fork_fixup_t which) __attribute__ ((weak));
-void
-vnet_main_fixup (vlib_fork_fixup_t which)
-{
-}
-
-void
-vlib_worker_thread_fork_fixup (vlib_fork_fixup_t which)
-{
-  vlib_main_t *vm = vlib_get_main ();
-
-  if (vlib_mains == 0)
-    return;
-
-  ASSERT (os_get_cpu_number () == 0);
-  vlib_worker_thread_barrier_sync (vm);
-
-  switch (which)
-    {
-    case VLIB_WORKER_THREAD_FORK_FIXUP_NEW_SW_IF_INDEX:
-      vnet_main_fixup (VLIB_WORKER_THREAD_FORK_FIXUP_NEW_SW_IF_INDEX);
-      break;
-
-    default:
-      ASSERT (0);
-    }
-  vlib_worker_thread_barrier_release (vm);
-}
-
-void
-vlib_worker_thread_barrier_sync (vlib_main_t * vm)
-{
-  f64 deadline;
-  u32 count;
-
-  if (!vlib_mains)
-    return;
-
-  count = vec_len (vlib_mains) - 1;
-
-  /* Tolerate recursive calls */
-  if (++vlib_worker_threads[0].recursion_level > 1)
-    return;
-
-  vlib_worker_threads[0].barrier_sync_count++;
-
-  ASSERT (os_get_cpu_number () == 0);
-
-  deadline = vlib_time_now (vm) + BARRIER_SYNC_TIMEOUT;
-
-  *vlib_worker_threads->wait_at_barrier = 1;
-  while (*vlib_worker_threads->workers_at_barrier != count)
-    {
-      if (vlib_time_now (vm) > deadline)
-	{
-	  fformat (stderr, "%s: worker thread deadlock\n", __FUNCTION__);
-	  os_panic ();
-	}
-    }
-}
-
-void
-vlib_worker_thread_barrier_release (vlib_main_t * vm)
-{
-  f64 deadline;
-
-  if (!vlib_mains)
-    return;
-
-  if (--vlib_worker_threads[0].recursion_level > 0)
-    return;
-
-  deadline = vlib_time_now (vm) + BARRIER_SYNC_TIMEOUT;
-
-  *vlib_worker_threads->wait_at_barrier = 0;
-
-  while (*vlib_worker_threads->workers_at_barrier > 0)
-    {
-      if (vlib_time_now (vm) > deadline)
-	{
-	  fformat (stderr, "%s: worker thread deadlock\n", __FUNCTION__);
-	  os_panic ();
-	}
-    }
-}
-
-/*
- * Check the frame queue to see if any frames are available.
- * If so, pull the packets off the frames and put them to
- * the handoff node.
- */
-static inline int
-vlib_frame_queue_dequeue_internal (vlib_main_t * vm,
-				   vlib_frame_queue_main_t * fqm)
-{
-  u32 thread_id = vm->cpu_index;
-  vlib_frame_queue_t *fq = fqm->vlib_frame_queues[thread_id];
-  vlib_frame_queue_elt_t *elt;
-  u32 *from, *to;
-  vlib_frame_t *f;
-  int msg_type;
-  int processed = 0;
-  u32 n_left_to_node;
-  u32 vectors = 0;
-
-  ASSERT (fq);
-  ASSERT (vm == vlib_mains[thread_id]);
-
-  if (PREDICT_FALSE (fqm->node_index == ~0))
-    return 0;
-  /*
-   * Gather trace data for frame queues
-   */
-  if (PREDICT_FALSE (fq->trace))
-    {
-      frame_queue_trace_t *fqt;
-      frame_queue_nelt_counter_t *fqh;
-      u32 elix;
-
-      fqt = &fqm->frame_queue_traces[thread_id];
-
-      fqt->nelts = fq->nelts;
-      fqt->head = fq->head;
-      fqt->head_hint = fq->head_hint;
-      fqt->tail = fq->tail;
-      fqt->threshold = fq->vector_threshold;
-      fqt->n_in_use = fqt->tail - fqt->head;
-      if (fqt->n_in_use >= fqt->nelts)
-	{
-	  // if beyond max then use max
-	  fqt->n_in_use = fqt->nelts - 1;
-	}
-
-      /* Record the number of elements in use in the histogram */
-      fqh = &fqm->frame_queue_histogram[thread_id];
-      fqh->count[fqt->n_in_use]++;
-
-      /* Record a snapshot of the elements in use */
-      for (elix = 0; elix < fqt->nelts; elix++)
-	{
-	  elt = fq->elts + ((fq->head + 1 + elix) & (fq->nelts - 1));
-	  if (1 || elt->valid)
-	    {
-	      fqt->n_vectors[elix] = elt->n_vectors;
-	    }
-	}
-      fqt->written = 1;
-    }
-
-  while (1)
-    {
-      if (fq->head == fq->tail)
-	{
-	  fq->head_hint = fq->head;
-	  return processed;
-	}
-
-      elt = fq->elts + ((fq->head + 1) & (fq->nelts - 1));
-
-      if (!elt->valid)
-	{
-	  fq->head_hint = fq->head;
-	  return processed;
-	}
-
-      from = elt->buffer_index;
-      msg_type = elt->msg_type;
-
-      ASSERT (msg_type == VLIB_FRAME_QUEUE_ELT_DISPATCH_FRAME);
-      ASSERT (elt->n_vectors <= VLIB_FRAME_SIZE);
-
-      f = vlib_get_frame_to_node (vm, fqm->node_index);
-
-      to = vlib_frame_vector_args (f);
-
-      n_left_to_node = elt->n_vectors;
-
-      while (n_left_to_node >= 4)
-	{
-	  to[0] = from[0];
-	  to[1] = from[1];
-	  to[2] = from[2];
-	  to[3] = from[3];
-	  to += 4;
-	  from += 4;
-	  n_left_to_node -= 4;
-	}
-
-      while (n_left_to_node > 0)
-	{
-	  to[0] = from[0];
-	  to++;
-	  from++;
-	  n_left_to_node--;
-	}
-
-      vectors += elt->n_vectors;
-      f->n_vectors = elt->n_vectors;
-      vlib_put_frame_to_node (vm, fqm->node_index, f);
-
-      elt->valid = 0;
-      elt->n_vectors = 0;
-      elt->msg_type = 0xfefefefe;
-      CLIB_MEMORY_BARRIER ();
-      fq->head++;
-      processed++;
-
-      /*
-       * Limit the number of packets pushed into the graph
-       */
-      if (vectors >= fq->vector_threshold)
-	{
-	  fq->head_hint = fq->head;
-	  return processed;
-	}
-    }
-  ASSERT (0);
-  return processed;
-}
-
-static_always_inline void
-vlib_worker_thread_internal (vlib_main_t * vm)
-{
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  u64 cpu_time_now = clib_cpu_time_now ();
-  vlib_frame_queue_main_t *fqm;
-
-  vec_alloc (nm->pending_interrupt_node_runtime_indices, 32);
-
-  while (1)
-    {
-      vlib_worker_thread_barrier_check ();
-
-      vec_foreach (fqm, tm->frame_queue_mains)
-	vlib_frame_queue_dequeue_internal (vm, fqm);
-
-      vlib_node_runtime_t *n;
-      vec_foreach (n, nm->nodes_by_type[VLIB_NODE_TYPE_INPUT])
-      {
-	cpu_time_now = dispatch_node (vm, n, VLIB_NODE_TYPE_INPUT,
-				      VLIB_NODE_STATE_POLLING, /* frame */ 0,
-				      cpu_time_now);
-      }
-
-      /* Next handle interrupts. */
-      {
-	uword l = _vec_len (nm->pending_interrupt_node_runtime_indices);
-	uword i;
-	if (l > 0)
-	  {
-	    _vec_len (nm->pending_interrupt_node_runtime_indices) = 0;
-	    for (i = 0; i < l; i++)
-	      {
-		n = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT],
-				      nm->
-				      pending_interrupt_node_runtime_indices
-				      [i]);
-		cpu_time_now =
-		  dispatch_node (vm, n, VLIB_NODE_TYPE_INPUT,
-				 VLIB_NODE_STATE_INTERRUPT,
-				 /* frame */ 0,
-				 cpu_time_now);
-	      }
-	  }
-      }
-
-      if (_vec_len (nm->pending_frames))
-	{
-	  int i;
-	  cpu_time_now = clib_cpu_time_now ();
-	  for (i = 0; i < _vec_len (nm->pending_frames); i++)
-	    {
-	      vlib_pending_frame_t *p;
-
-	      p = nm->pending_frames + i;
-
-	      cpu_time_now = dispatch_pending_node (vm, p, cpu_time_now);
-	    }
-	  _vec_len (nm->pending_frames) = 0;
-	}
-      vlib_increment_main_loop_counter (vm);
-
-      /* Record time stamp in case there are no enabled nodes and above
-         calls do not update time stamp. */
-      cpu_time_now = clib_cpu_time_now ();
-    }
-}
-
-void
-vlib_worker_thread_fn (void *arg)
-{
-  vlib_worker_thread_t *w = (vlib_worker_thread_t *) arg;
-  vlib_main_t *vm = vlib_get_main ();
-
-  ASSERT (vm->cpu_index == os_get_cpu_number ());
-
-  vlib_worker_thread_init (w);
-  clib_time_init (&vm->clib_time);
-  clib_mem_set_heap (w->thread_mheap);
-
-#if DPDK > 0
-  /* Wait until the dpdk init sequence is complete */
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  while (tm->worker_thread_release == 0)
-    vlib_worker_thread_barrier_check ();
-#endif
-
-  vlib_worker_thread_internal (vm);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_THREAD (worker_thread_reg, static) = {
-  .name = "workers",
-  .short_name = "wk",
-  .function = vlib_worker_thread_fn,
-};
-/* *INDENT-ON* */
-
-u32
-vlib_frame_queue_main_init (u32 node_index, u32 frame_queue_nelts)
-{
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  vlib_frame_queue_main_t *fqm;
-  vlib_frame_queue_t *fq;
-  int i;
-
-  if (frame_queue_nelts == 0)
-    frame_queue_nelts = FRAME_QUEUE_NELTS;
-
-  vec_add2 (tm->frame_queue_mains, fqm, 1);
-
-  fqm->node_index = node_index;
-
-  vec_validate (fqm->vlib_frame_queues, tm->n_vlib_mains - 1);
-  _vec_len (fqm->vlib_frame_queues) = 0;
-  for (i = 0; i < tm->n_vlib_mains; i++)
-    {
-      fq = vlib_frame_queue_alloc (frame_queue_nelts);
-      vec_add1 (fqm->vlib_frame_queues, fq);
-    }
-
-  return (fqm - tm->frame_queue_mains);
-}
-
-clib_error_t *
-threads_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (threads_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/threads.h b/vlib/vlib/threads.h
deleted file mode 100644
index 34ab5be8..00000000
--- a/vlib/vlib/threads.h
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vlib_threads_h
-#define included_vlib_threads_h
-
-#include <vlib/main.h>
-#include <linux/sched.h>
-
-extern vlib_main_t **vlib_mains;
-
-void vlib_set_thread_name (char *name);
-
-/* arg is actually a vlib__thread_t * */
-typedef void (vlib_thread_function_t) (void *arg);
-
-typedef struct vlib_thread_registration_
-{
-  /* constructor generated list of thread registrations */
-  struct vlib_thread_registration_ *next;
-
-  /* config parameters */
-  char *name;
-  char *short_name;
-  vlib_thread_function_t *function;
-  uword mheap_size;
-  int fixed_count;
-  u32 count;
-  int no_data_structure_clone;
-  u32 frame_queue_nelts;
-
-  /* All threads of this type run on pthreads */
-  int use_pthreads;
-  u32 first_index;
-  uword *coremask;
-} vlib_thread_registration_t;
-
-/*
- * Frames have their cpu / vlib_main_t index in the low-order N bits
- * Make VLIB_MAX_CPUS a power-of-two, please...
- */
-
-#ifndef VLIB_MAX_CPUS
-#define VLIB_MAX_CPUS 256
-#endif
-
-#if VLIB_MAX_CPUS > CLIB_MAX_MHEAPS
-#error Please increase number of per-cpu mheaps
-#endif
-
-#define VLIB_CPU_MASK (VLIB_MAX_CPUS - 1)	/* 0x3f, max */
-#define VLIB_OFFSET_MASK (~VLIB_CPU_MASK)
-
-#define VLIB_LOG2_THREAD_STACK_SIZE (20)
-#define VLIB_THREAD_STACK_SIZE (1<<VLIB_LOG2_THREAD_STACK_SIZE)
-
-typedef enum
-{
-  VLIB_FRAME_QUEUE_ELT_DISPATCH_FRAME,
-} vlib_frame_queue_msg_type_t;
-
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  volatile u32 valid;
-  u32 msg_type;
-  u32 n_vectors;
-  u32 last_n_vectors;
-
-  /* 256 * 4 = 1024 bytes, even mult of cache line size */
-  u32 buffer_index[VLIB_FRAME_SIZE];
-}
-vlib_frame_queue_elt_t;
-
-typedef struct
-{
-  /* First cache line */
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  volatile u32 *wait_at_barrier;
-  volatile u32 *workers_at_barrier;
-
-  /* Second Cache Line */
-    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
-  void *thread_mheap;
-  u8 *thread_stack;
-  void (*thread_function) (void *);
-  void *thread_function_arg;
-  i64 recursion_level;
-  elog_track_t elog_track;
-  u32 instance_id;
-  vlib_thread_registration_t *registration;
-  u8 *name;
-  u64 barrier_sync_count;
-
-  long lwp;
-  int lcore_id;
-  pthread_t thread_id;
-} vlib_worker_thread_t;
-
-extern vlib_worker_thread_t *vlib_worker_threads;
-
-typedef struct
-{
-  /* enqueue side */
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  volatile u64 tail;
-  u64 enqueues;
-  u64 enqueue_ticks;
-  u64 enqueue_vectors;
-  u32 enqueue_full_events;
-
-  /* dequeue side */
-    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
-  volatile u64 head;
-  u64 dequeues;
-  u64 dequeue_ticks;
-  u64 dequeue_vectors;
-  u64 trace;
-  u64 vector_threshold;
-
-  /* dequeue hint to enqueue side */
-    CLIB_CACHE_LINE_ALIGN_MARK (cacheline2);
-  volatile u64 head_hint;
-
-  /* read-only, constant, shared */
-    CLIB_CACHE_LINE_ALIGN_MARK (cacheline3);
-  vlib_frame_queue_elt_t *elts;
-  u32 nelts;
-}
-vlib_frame_queue_t;
-
-typedef struct
-{
-  u32 node_index;
-  vlib_frame_queue_t **vlib_frame_queues;
-
-  /* for frame queue tracing */
-  frame_queue_trace_t *frame_queue_traces;
-  frame_queue_nelt_counter_t *frame_queue_histogram;
-} vlib_frame_queue_main_t;
-
-/* Called early, in thread 0's context */
-clib_error_t *vlib_thread_init (vlib_main_t * vm);
-
-vlib_worker_thread_t *vlib_alloc_thread (vlib_main_t * vm);
-
-int vlib_frame_queue_enqueue (vlib_main_t * vm, u32 node_runtime_index,
-			      u32 frame_queue_index, vlib_frame_t * frame,
-			      vlib_frame_queue_msg_type_t type);
-
-int vlib_frame_queue_dequeue (int thread_id,
-			      vlib_main_t * vm, vlib_node_main_t * nm);
-
-u64 dispatch_node (vlib_main_t * vm,
-		   vlib_node_runtime_t * node,
-		   vlib_node_type_t type,
-		   vlib_node_state_t dispatch_state,
-		   vlib_frame_t * frame, u64 last_time_stamp);
-
-u64 dispatch_pending_node (vlib_main_t * vm,
-			   vlib_pending_frame_t * p, u64 last_time_stamp);
-
-void vlib_worker_thread_node_runtime_update (void);
-
-void vlib_create_worker_threads (vlib_main_t * vm, int n,
-				 void (*thread_function) (void *));
-
-void vlib_worker_thread_init (vlib_worker_thread_t * w);
-u32 vlib_frame_queue_main_init (u32 node_index, u32 frame_queue_nelts);
-
-/* Check for a barrier sync request every 30ms */
-#define BARRIER_SYNC_DELAY (0.030000)
-
-#if CLIB_DEBUG > 0
-/* long barrier timeout, for gdb... */
-#define BARRIER_SYNC_TIMEOUT (600.1)
-#else
-#define BARRIER_SYNC_TIMEOUT (1.0)
-#endif
-
-void vlib_worker_thread_barrier_sync (vlib_main_t * vm);
-void vlib_worker_thread_barrier_release (vlib_main_t * vm);
-
-always_inline void
-vlib_smp_unsafe_warning (void)
-{
-  if (CLIB_DEBUG > 0)
-    {
-      if (os_get_cpu_number ())
-	fformat (stderr, "%s: SMP unsafe warning...\n", __FUNCTION__);
-    }
-}
-
-typedef enum
-{
-  VLIB_WORKER_THREAD_FORK_FIXUP_ILLEGAL = 0,
-  VLIB_WORKER_THREAD_FORK_FIXUP_NEW_SW_IF_INDEX,
-} vlib_fork_fixup_t;
-
-void vlib_worker_thread_fork_fixup (vlib_fork_fixup_t which);
-
-static inline void
-vlib_worker_thread_barrier_check (void)
-{
-  if (PREDICT_FALSE (*vlib_worker_threads->wait_at_barrier))
-    {
-      clib_smp_atomic_add (vlib_worker_threads->workers_at_barrier, 1);
-      while (*vlib_worker_threads->wait_at_barrier)
-	;
-      clib_smp_atomic_add (vlib_worker_threads->workers_at_barrier, -1);
-    }
-}
-
-#define foreach_vlib_main(body)			                        \
-do {                                                                    \
-    vlib_main_t ** __vlib_mains = 0, *this_vlib_main;                   \
-    int ii;                                                             \
-                                                                        \
-    if (vec_len (vlib_mains) == 0)                                      \
-        vec_add1 (__vlib_mains, &vlib_global_main);                     \
-    else                                                                \
-    {                                                                   \
-        for (ii = 0; ii < vec_len (vlib_mains); ii++)                   \
-        {                                                               \
-            this_vlib_main = vlib_mains[ii];                            \
-            if (this_vlib_main)                                         \
-                vec_add1 (__vlib_mains, this_vlib_main);                \
-        }                                                               \
-    }                                                                   \
-                                                                        \
-    for (ii = 0; ii < vec_len (__vlib_mains); ii++)                     \
-    {                                                                   \
-        this_vlib_main = __vlib_mains[ii];                              \
-        /* body uses this_vlib_main... */                               \
-        (body);                                                         \
-    }                                                                   \
-    vec_free (__vlib_mains);                                            \
-} while (0);
-
-#define foreach_sched_policy \
-  _(SCHED_OTHER, OTHER, "other") \
-  _(SCHED_BATCH, BATCH, "batch") \
-  _(SCHED_IDLE, IDLE, "idle")   \
-  _(SCHED_FIFO, FIFO, "fifo")   \
-  _(SCHED_RR, RR, "rr")
-
-typedef enum
-{
-#define _(v,f,s) SCHED_POLICY_##f = v,
-  foreach_sched_policy
-#undef _
-    SCHED_POLICY_N,
-} sched_policy_t;
-
-typedef struct
-{
-  /* Link list of registrations, built by constructors */
-  vlib_thread_registration_t *next;
-
-  /* Vector of registrations, w/ non-data-structure clones at the top */
-  vlib_thread_registration_t **registrations;
-
-  uword *thread_registrations_by_name;
-
-  vlib_worker_thread_t *worker_threads;
-
-  /*
-   * Launch all threads as pthreads,
-   * not eal_rte_launch (strict affinity) threads
-   */
-  int use_pthreads;
-
-  /* Number of vlib_main / vnet_main clones */
-  u32 n_vlib_mains;
-
-  /* Number of thread stacks to create */
-  u32 n_thread_stacks;
-
-  /* Number of pthreads */
-  u32 n_pthreads;
-
-  /* Number of DPDK eal threads */
-  u32 n_eal_threads;
-
-  /* Number of cores to skip, must match the core mask */
-  u32 skip_cores;
-
-  /* Thread prefix name */
-  u8 *thread_prefix;
-
-  /* main thread lcore */
-  u8 main_lcore;
-
-  /* Bitmap of available CPU cores */
-  uword *cpu_core_bitmap;
-
-  /* Bitmap of available CPU sockets (NUMA nodes) */
-  uword *cpu_socket_bitmap;
-
-  /* Worker handoff queues */
-  vlib_frame_queue_main_t *frame_queue_mains;
-
-  /* worker thread initialization barrier */
-  volatile u32 worker_thread_release;
-
-  /* scheduling policy */
-  u32 sched_policy;
-
-  /* scheduling policy priority */
-  u32 sched_priority;
-
-} vlib_thread_main_t;
-
-extern vlib_thread_main_t vlib_thread_main;
-
-#define VLIB_REGISTER_THREAD(x,...)                     \
-  __VA_ARGS__ vlib_thread_registration_t x;             \
-static void __vlib_add_thread_registration_##x (void)   \
-  __attribute__((__constructor__)) ;                    \
-static void __vlib_add_thread_registration_##x (void)   \
-{                                                       \
-  vlib_thread_main_t * tm = &vlib_thread_main;          \
-  x.next = tm->next;                                    \
-  tm->next = &x;                                        \
-}                                                       \
-__VA_ARGS__ vlib_thread_registration_t x
-
-always_inline u32
-vlib_num_workers ()
-{
-  return vlib_thread_main.n_vlib_mains - 1;
-}
-
-always_inline u32
-vlib_get_worker_cpu_index (u32 worker_index)
-{
-  return worker_index + 1;
-}
-
-always_inline u32
-vlib_get_worker_index (u32 cpu_index)
-{
-  return cpu_index - 1;
-}
-
-always_inline u32
-vlib_get_current_worker_index ()
-{
-  return os_get_cpu_number () - 1;
-}
-
-always_inline vlib_main_t *
-vlib_get_worker_vlib_main (u32 worker_index)
-{
-  vlib_main_t *vm;
-  vlib_thread_main_t *tm = &vlib_thread_main;
-  ASSERT (worker_index < tm->n_vlib_mains - 1);
-  vm = vlib_mains[worker_index + 1];
-  ASSERT (vm);
-  return vm;
-}
-
-static inline void
-vlib_put_frame_queue_elt (vlib_frame_queue_elt_t * hf)
-{
-  CLIB_MEMORY_BARRIER ();
-  hf->valid = 1;
-}
-
-static inline vlib_frame_queue_elt_t *
-vlib_get_frame_queue_elt (u32 frame_queue_index, u32 index)
-{
-  vlib_frame_queue_t *fq;
-  vlib_frame_queue_elt_t *elt;
-  vlib_thread_main_t *tm = &vlib_thread_main;
-  vlib_frame_queue_main_t *fqm =
-    vec_elt_at_index (tm->frame_queue_mains, frame_queue_index);
-  u64 new_tail;
-
-  fq = fqm->vlib_frame_queues[index];
-  ASSERT (fq);
-
-  new_tail = __sync_add_and_fetch (&fq->tail, 1);
-
-  /* Wait until a ring slot is available */
-  while (new_tail >= fq->head_hint + fq->nelts)
-    vlib_worker_thread_barrier_check ();
-
-  elt = fq->elts + (new_tail & (fq->nelts - 1));
-
-  /* this would be very bad... */
-  while (elt->valid)
-    ;
-
-  elt->msg_type = VLIB_FRAME_QUEUE_ELT_DISPATCH_FRAME;
-  elt->last_n_vectors = elt->n_vectors = 0;
-
-  return elt;
-}
-
-static inline vlib_frame_queue_t *
-is_vlib_frame_queue_congested (u32 frame_queue_index,
-			       u32 index,
-			       u32 queue_hi_thresh,
-			       vlib_frame_queue_t **
-			       handoff_queue_by_worker_index)
-{
-  vlib_frame_queue_t *fq;
-  vlib_thread_main_t *tm = &vlib_thread_main;
-  vlib_frame_queue_main_t *fqm =
-    vec_elt_at_index (tm->frame_queue_mains, frame_queue_index);
-
-  fq = handoff_queue_by_worker_index[index];
-  if (fq != (vlib_frame_queue_t *) (~0))
-    return fq;
-
-  fq = fqm->vlib_frame_queues[index];
-  ASSERT (fq);
-
-  if (PREDICT_FALSE (fq->tail >= (fq->head_hint + queue_hi_thresh)))
-    {
-      /* a valid entry in the array will indicate the queue has reached
-       * the specified threshold and is congested
-       */
-      handoff_queue_by_worker_index[index] = fq;
-      fq->enqueue_full_events++;
-      return fq;
-    }
-
-  return NULL;
-}
-
-static inline vlib_frame_queue_elt_t *
-vlib_get_worker_handoff_queue_elt (u32 frame_queue_index,
-				   u32 vlib_worker_index,
-				   vlib_frame_queue_elt_t **
-				   handoff_queue_elt_by_worker_index)
-{
-  vlib_frame_queue_elt_t *elt;
-
-  if (handoff_queue_elt_by_worker_index[vlib_worker_index])
-    return handoff_queue_elt_by_worker_index[vlib_worker_index];
-
-  elt = vlib_get_frame_queue_elt (frame_queue_index, vlib_worker_index);
-
-  handoff_queue_elt_by_worker_index[vlib_worker_index] = elt;
-
-  return elt;
-}
-
-#endif /* included_vlib_threads_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/threads_cli.c b/vlib/vlib/threads_cli.c
deleted file mode 100644
index ee632279..00000000
--- a/vlib/vlib/threads_cli.c
+++ /dev/null
@@ -1,579 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#define _GNU_SOURCE
-
-#include <vppinfra/format.h>
-#include <vlib/vlib.h>
-
-#include <vlib/threads.h>
-#include <vlib/unix/unix.h>
-
-#if DPDK==1
-#include <rte_config.h>
-#include <rte_common.h>
-#include <rte_eal.h>
-#include <rte_launch.h>
-#include <rte_lcore.h>
-#endif
-
-static u8 *
-format_sched_policy_and_priority (u8 * s, va_list * args)
-{
-  long i = va_arg (*args, long);
-  struct sched_param sched_param;
-  u8 *t = 0;
-
-  switch (sched_getscheduler (i))
-    {
-#define _(v,f,str) case SCHED_POLICY_##f: t = (u8 *) str; break;
-      foreach_sched_policy
-#undef _
-    }
-  if (sched_getparam (i, &sched_param) == 0)
-    return format (s, "%s (%d)", t, sched_param.sched_priority);
-  else
-    return format (s, "%s (n/a)", t);
-}
-
-static clib_error_t *
-show_threads_fn (vlib_main_t * vm,
-		 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vlib_worker_thread_t *w;
-  int i;
-
-  vlib_cli_output (vm, "%-7s%-20s%-12s%-8s%-25s%-7s%-7s%-7s%-10s",
-		   "ID", "Name", "Type", "LWP", "Sched Policy (Priority)",
-		   "lcore", "Core", "Socket", "State");
-
-#if !defined(__powerpc64__)
-  for (i = 0; i < vec_len (vlib_worker_threads); i++)
-    {
-      w = vlib_worker_threads + i;
-      u8 *line = NULL;
-
-      line = format (line, "%-7d%-20s%-12s%-8d",
-		     i,
-		     w->name ? w->name : (u8 *) "",
-		     w->registration ? w->registration->name : "", w->lwp);
-
-      line = format (line, "%-25U", format_sched_policy_and_priority, w->lwp);
-
-      int lcore = -1;
-      cpu_set_t cpuset;
-      CPU_ZERO (&cpuset);
-      int ret = -1;
-
-      ret =
-	pthread_getaffinity_np (w->thread_id, sizeof (cpu_set_t), &cpuset);
-      if (!ret)
-	{
-	  int c;
-	  for (c = 0; c < CPU_SETSIZE; c++)
-	    if (CPU_ISSET (c, &cpuset))
-	      {
-		if (lcore > -1)
-		  {
-		    lcore = -2;
-		    break;
-		  }
-		lcore = c;
-	      }
-	}
-      else
-	{
-	  lcore = w->lcore_id;
-	}
-
-      if (lcore > -1)
-	{
-	  const char *sys_cpu_path = "/sys/devices/system/cpu/cpu";
-	  int socket_id = -1;
-	  int core_id = -1;
-	  u8 *p = 0;
-
-	  p = format (p, "%s%u/topology/core_id%c", sys_cpu_path, lcore, 0);
-	  vlib_sysfs_read ((char *) p, "%d", &core_id);
-
-	  vec_reset_length (p);
-	  p =
-	    format (p,
-		    "%s%u/topology/physical_package_id%c",
-		    sys_cpu_path, lcore, 0);
-	  vlib_sysfs_read ((char *) p, "%d", &socket_id);
-	  vec_free (p);
-
-	  line = format (line, "%-7u%-7u%-7u%", lcore, core_id, socket_id);
-#if DPDK==1
-	  ASSERT (lcore <= RTE_MAX_LCORE);
-	  switch (lcore_config[lcore].state)
-	    {
-	    case WAIT:
-	      line = format (line, "wait");
-	      break;
-	    case RUNNING:
-	      line = format (line, "running");
-	      break;
-	    case FINISHED:
-	      line = format (line, "finished");
-	      break;
-	    default:
-	      line = format (line, "unknown");
-	    }
-#endif
-	}
-      else
-	{
-	  line =
-	    format (line, "%-7s%-7s%-7s%", (lcore == -2) ? "M" : "n/a", "n/a",
-		    "n/a");
-	}
-
-      vlib_cli_output (vm, "%v", line);
-      vec_free (line);
-    }
-#endif
-
-  return 0;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_threads_command, static) = {
-  .path = "show threads",
-  .short_help = "Show threads",
-  .function = show_threads_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * Trigger threads to grab frame queue trace data
- */
-static clib_error_t *
-trace_frame_queue (vlib_main_t * vm, unformat_input_t * input,
-		   vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  clib_error_t *error = NULL;
-  frame_queue_trace_t *fqt;
-  frame_queue_nelt_counter_t *fqh;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  vlib_frame_queue_main_t *fqm;
-  u32 num_fq;
-  u32 fqix;
-  u32 enable = 2;
-  u32 index = ~(u32) 0;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "on"))
-	enable = 1;
-      else if (unformat (line_input, "off"))
-	enable = 0;
-      else if (unformat (line_input, "index %u"), &index)
-	;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (enable > 1)
-    return clib_error_return (0, "expecting on or off");
-
-  if (vec_len (tm->frame_queue_mains) == 0)
-    return clib_error_return (0, "no worker handoffs exist");
-
-  if (index > vec_len (tm->frame_queue_mains) - 1)
-    return clib_error_return (0,
-			      "expecting valid worker handoff queue index");
-
-  fqm = vec_elt_at_index (tm->frame_queue_mains, index);
-
-  num_fq = vec_len (fqm->vlib_frame_queues);
-  if (num_fq == 0)
-    {
-      vlib_cli_output (vm, "No frame queues exist\n");
-      return error;
-    }
-
-  // Allocate storage for trace if necessary
-  vec_validate_aligned (fqm->frame_queue_traces, num_fq - 1,
-			CLIB_CACHE_LINE_BYTES);
-  vec_validate_aligned (fqm->frame_queue_histogram, num_fq - 1,
-			CLIB_CACHE_LINE_BYTES);
-
-  for (fqix = 0; fqix < num_fq; fqix++)
-    {
-      fqt = &fqm->frame_queue_traces[fqix];
-      fqh = &fqm->frame_queue_histogram[fqix];
-
-      memset (fqt->n_vectors, 0xff, sizeof (fqt->n_vectors));
-      fqt->written = 0;
-      memset (fqh, 0, sizeof (*fqh));
-      fqm->vlib_frame_queues[fqix]->trace = enable;
-    }
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_trace_frame_queue,static) = {
-    .path = "trace frame-queue",
-    .short_help = "trace frame-queue (on|off)",
-    .function = trace_frame_queue,
-    .is_mp_safe = 1,
-};
-/* *INDENT-ON* */
-
-
-/*
- * Adding two counters and compute percent of total
- * Round up, e.g. 0.000001 => 1%
- */
-static u32
-compute_percent (u64 * two_counters, u64 total)
-{
-  if (total == 0)
-    {
-      return 0;
-    }
-  else
-    {
-      return (((two_counters[0] + two_counters[1]) * 100) +
-	      (total - 1)) / total;
-    }
-}
-
-/*
- * Display frame queue trace data gathered by threads.
- */
-static clib_error_t *
-show_frame_queue_internal (vlib_main_t * vm,
-			   vlib_frame_queue_main_t * fqm, u32 histogram)
-{
-  clib_error_t *error = NULL;
-  frame_queue_trace_t *fqt;
-  frame_queue_nelt_counter_t *fqh;
-  u32 num_fq;
-  u32 fqix;
-
-  num_fq = vec_len (fqm->frame_queue_traces);
-  if (num_fq == 0)
-    {
-      vlib_cli_output (vm, "No trace data for frame queues\n");
-      return error;
-    }
-
-  if (histogram)
-    {
-      vlib_cli_output (vm, "0-1   2-3   4-5   6-7   8-9   10-11 12-13 14-15 "
-		       "16-17 18-19 20-21 22-23 24-25 26-27 28-29 30-31\n");
-    }
-
-  for (fqix = 0; fqix < num_fq; fqix++)
-    {
-      fqt = &(fqm->frame_queue_traces[fqix]);
-
-      vlib_cli_output (vm, "Thread %d %v\n", fqix,
-		       vlib_worker_threads[fqix].name);
-
-      if (fqt->written == 0)
-	{
-	  vlib_cli_output (vm, "  no trace data\n");
-	  continue;
-	}
-
-      if (histogram)
-	{
-	  fqh = &(fqm->frame_queue_histogram[fqix]);
-	  u32 nelt;
-	  u64 total = 0;
-
-	  for (nelt = 0; nelt < FRAME_QUEUE_MAX_NELTS; nelt++)
-	    {
-	      total += fqh->count[nelt];
-	    }
-
-	  /*
-	   * Print in pairs to condense the output.
-	   * Allow entries with 0 counts to be clearly identified, by rounding up.
-	   * Any non-zero value will be displayed as at least one percent. This
-	   * also means the sum of percentages can be > 100, but that is fine. The
-	   * histogram is counted from the last time "trace frame on" was issued.
-	   */
-	  vlib_cli_output (vm,
-			   "%3d%%  %3d%%  %3d%%  %3d%%  %3d%%  %3d%%  %3d%%  %3d%%  "
-			   "%3d%%  %3d%%  %3d%%  %3d%%  %3d%%  %3d%%  %3d%%  %3d%%\n",
-			   compute_percent (&fqh->count[0], total),
-			   compute_percent (&fqh->count[2], total),
-			   compute_percent (&fqh->count[4], total),
-			   compute_percent (&fqh->count[6], total),
-			   compute_percent (&fqh->count[8], total),
-			   compute_percent (&fqh->count[10], total),
-			   compute_percent (&fqh->count[12], total),
-			   compute_percent (&fqh->count[14], total),
-			   compute_percent (&fqh->count[16], total),
-			   compute_percent (&fqh->count[18], total),
-			   compute_percent (&fqh->count[20], total),
-			   compute_percent (&fqh->count[22], total),
-			   compute_percent (&fqh->count[24], total),
-			   compute_percent (&fqh->count[26], total),
-			   compute_percent (&fqh->count[28], total),
-			   compute_percent (&fqh->count[30], total));
-	}
-      else
-	{
-	  vlib_cli_output (vm,
-			   "  vector-threshold %d  ring size %d  in use %d\n",
-			   fqt->threshold, fqt->nelts, fqt->n_in_use);
-	  vlib_cli_output (vm, "  head %12d  head_hint %12d  tail %12d\n",
-			   fqt->head, fqt->head_hint, fqt->tail);
-	  vlib_cli_output (vm,
-			   "  %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d\n",
-			   fqt->n_vectors[0], fqt->n_vectors[1],
-			   fqt->n_vectors[2], fqt->n_vectors[3],
-			   fqt->n_vectors[4], fqt->n_vectors[5],
-			   fqt->n_vectors[6], fqt->n_vectors[7],
-			   fqt->n_vectors[8], fqt->n_vectors[9],
-			   fqt->n_vectors[10], fqt->n_vectors[11],
-			   fqt->n_vectors[12], fqt->n_vectors[13],
-			   fqt->n_vectors[14], fqt->n_vectors[15]);
-
-	  if (fqt->nelts > 16)
-	    {
-	      vlib_cli_output (vm,
-			       "  %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d\n",
-			       fqt->n_vectors[16], fqt->n_vectors[17],
-			       fqt->n_vectors[18], fqt->n_vectors[19],
-			       fqt->n_vectors[20], fqt->n_vectors[21],
-			       fqt->n_vectors[22], fqt->n_vectors[23],
-			       fqt->n_vectors[24], fqt->n_vectors[25],
-			       fqt->n_vectors[26], fqt->n_vectors[27],
-			       fqt->n_vectors[28], fqt->n_vectors[29],
-			       fqt->n_vectors[30], fqt->n_vectors[31]);
-	    }
-	}
-
-    }
-  return error;
-}
-
-static clib_error_t *
-show_frame_queue_trace (vlib_main_t * vm, unformat_input_t * input,
-			vlib_cli_command_t * cmd)
-{
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  vlib_frame_queue_main_t *fqm;
-  clib_error_t *error;
-
-  vec_foreach (fqm, tm->frame_queue_mains)
-  {
-    vlib_cli_output (vm, "Worker handoff queue index %u (next node '%U'):",
-		     fqm - tm->frame_queue_mains,
-		     format_vlib_node_name, vm, fqm->node_index);
-    error = show_frame_queue_internal (vm, fqm, 0);
-    if (error)
-      return error;
-  }
-  return 0;
-}
-
-static clib_error_t *
-show_frame_queue_histogram (vlib_main_t * vm, unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  vlib_frame_queue_main_t *fqm;
-  clib_error_t *error;
-
-  vec_foreach (fqm, tm->frame_queue_mains)
-  {
-    vlib_cli_output (vm, "Worker handoff queue index %u (next node '%U'):",
-		     fqm - tm->frame_queue_mains,
-		     format_vlib_node_name, vm, fqm->node_index);
-    error = show_frame_queue_internal (vm, fqm, 1);
-    if (error)
-      return error;
-  }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_show_frame_queue_trace,static) = {
-    .path = "show frame-queue",
-    .short_help = "show frame-queue trace",
-    .function = show_frame_queue_trace,
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_show_frame_queue_histogram,static) = {
-    .path = "show frame-queue histogram",
-    .short_help = "show frame-queue histogram",
-    .function = show_frame_queue_histogram,
-};
-/* *INDENT-ON* */
-
-
-/*
- * Modify the number of elements on the frame_queues
- */
-static clib_error_t *
-test_frame_queue_nelts (vlib_main_t * vm, unformat_input_t * input,
-			vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  vlib_frame_queue_main_t *fqm;
-  clib_error_t *error = NULL;
-  u32 num_fq;
-  u32 fqix;
-  u32 nelts = 0;
-  u32 index = ~(u32) 0;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "nelts %u", &nelts))
-	;
-      else if (unformat (line_input, "index %u", &index))
-	;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (index > vec_len (tm->frame_queue_mains) - 1)
-    return clib_error_return (0,
-			      "expecting valid worker handoff queue index");
-
-  fqm = vec_elt_at_index (tm->frame_queue_mains, index);
-
-  if ((nelts != 4) && (nelts != 8) && (nelts != 16) && (nelts != 32))
-    {
-      return clib_error_return (0, "expecting 4,8,16,32");
-    }
-
-  num_fq = vec_len (fqm->vlib_frame_queues);
-  if (num_fq == 0)
-    {
-      vlib_cli_output (vm, "No frame queues exist\n");
-      return error;
-    }
-
-  for (fqix = 0; fqix < num_fq; fqix++)
-    {
-      fqm->vlib_frame_queues[fqix]->nelts = nelts;
-    }
-
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_test_frame_queue_nelts,static) = {
-    .path = "test frame-queue nelts",
-    .short_help = "test frame-queue nelts (4,8,16,32)",
-    .function = test_frame_queue_nelts,
-};
-/* *INDENT-ON* */
-
-
-/*
- * Modify the max number of packets pulled off the frame queues
- */
-static clib_error_t *
-test_frame_queue_threshold (vlib_main_t * vm, unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  vlib_frame_queue_main_t *fqm;
-  clib_error_t *error = NULL;
-  u32 num_fq;
-  u32 fqix;
-  u32 threshold = ~(u32) 0;
-  u32 index = ~(u32) 0;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "threshold %u", &threshold))
-	;
-      else if (unformat (line_input, "index %u", &index))
-	;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (index > vec_len (tm->frame_queue_mains) - 1)
-    return clib_error_return (0,
-			      "expecting valid worker handoff queue index");
-
-  fqm = vec_elt_at_index (tm->frame_queue_mains, index);
-
-
-  if (threshold == ~(u32) 0)
-    {
-      vlib_cli_output (vm, "expecting threshold value\n");
-      return error;
-    }
-
-  if (threshold == 0)
-    threshold = ~0;
-
-  num_fq = vec_len (fqm->vlib_frame_queues);
-  if (num_fq == 0)
-    {
-      vlib_cli_output (vm, "No frame queues exist\n");
-      return error;
-    }
-
-  for (fqix = 0; fqix < num_fq; fqix++)
-    {
-      fqm->vlib_frame_queues[fqix]->vector_threshold = threshold;
-    }
-
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_test_frame_queue_threshold,static) = {
-    .path = "test frame-queue threshold",
-    .short_help = "test frame-queue threshold N (0=no limit)",
-    .function = test_frame_queue_threshold,
-};
-/* *INDENT-ON* */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/trace.c b/vlib/vlib/trace.c
deleted file mode 100644
index dcdb837f..00000000
--- a/vlib/vlib/trace.c
+++ /dev/null
@@ -1,545 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * trace.c: VLIB trace buffer.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vlib/threads.h>
-
-/* Helper function for nodes which only trace buffer data. */
-void
-vlib_trace_frame_buffers_only (vlib_main_t * vm,
-			       vlib_node_runtime_t * node,
-			       u32 * buffers,
-			       uword n_buffers,
-			       uword next_buffer_stride,
-			       uword n_buffer_data_bytes_in_trace)
-{
-  u32 n_left, *from;
-
-  n_left = n_buffers;
-  from = buffers;
-
-  while (n_left >= 4)
-    {
-      u32 bi0, bi1;
-      vlib_buffer_t *b0, *b1;
-      u8 *t0, *t1;
-
-      /* Prefetch next iteration. */
-      vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
-      vlib_prefetch_buffer_with_index (vm, from[3], LOAD);
-
-      bi0 = from[0];
-      bi1 = from[1];
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t0 = vlib_add_trace (vm, node, b0, n_buffer_data_bytes_in_trace);
-	  clib_memcpy (t0, b0->data + b0->current_data,
-		       n_buffer_data_bytes_in_trace);
-	}
-      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t1 = vlib_add_trace (vm, node, b1, n_buffer_data_bytes_in_trace);
-	  clib_memcpy (t1, b1->data + b1->current_data,
-		       n_buffer_data_bytes_in_trace);
-	}
-      from += 2;
-      n_left -= 2;
-    }
-
-  while (n_left >= 1)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      u8 *t0;
-
-      bi0 = from[0];
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t0 = vlib_add_trace (vm, node, b0, n_buffer_data_bytes_in_trace);
-	  clib_memcpy (t0, b0->data + b0->current_data,
-		       n_buffer_data_bytes_in_trace);
-	}
-      from += 1;
-      n_left -= 1;
-    }
-}
-
-/* Free up all trace buffer memory. */
-always_inline void
-clear_trace_buffer (void)
-{
-  int i;
-  vlib_trace_main_t *tm;
-
-  /* *INDENT-OFF* */
-  foreach_vlib_main (
-  ({
-    void *mainheap;
-
-    tm = &this_vlib_main->trace_main;
-    mainheap = clib_mem_set_heap (this_vlib_main->heap_base);
-
-    tm->trace_active_hint = 0;
-
-    for (i = 0; i < vec_len (tm->trace_buffer_pool); i++)
-      if (! pool_is_free_index (tm->trace_buffer_pool, i))
-        vec_free (tm->trace_buffer_pool[i]);
-    pool_free (tm->trace_buffer_pool);
-    clib_mem_set_heap (mainheap);
-  }));
-  /* *INDENT-ON* */
-}
-
-static u8 *
-format_vlib_trace (u8 * s, va_list * va)
-{
-  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
-  vlib_trace_header_t *h = va_arg (*va, vlib_trace_header_t *);
-  vlib_trace_header_t *e = vec_end (h);
-  vlib_node_t *node, *prev_node;
-  clib_time_t *ct = &vm->clib_time;
-  f64 t;
-
-  prev_node = 0;
-  while (h < e)
-    {
-      node = vlib_get_node (vm, h->node_index);
-
-      if (node != prev_node)
-	{
-	  t =
-	    (h->time - vm->cpu_time_main_loop_start) * ct->seconds_per_clock;
-	  s =
-	    format (s, "\n%U: %v", format_time_interval, "h:m:s:u", t,
-		    node->name);
-	}
-      prev_node = node;
-
-      if (node->format_trace)
-	s = format (s, "\n  %U", node->format_trace, vm, node, h->data);
-      else
-	s = format (s, "\n  %U", node->format_buffer, h->data);
-
-      h = vlib_trace_header_next (h);
-    }
-
-  return s;
-}
-
-/* Root of all trace cli commands. */
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (trace_cli_command,static) = {
-  .path = "trace",
-  .short_help = "Packet tracer commands",
-};
-/* *INDENT-ON* */
-
-static int
-trace_cmp (void *a1, void *a2)
-{
-  vlib_trace_header_t **t1 = a1;
-  vlib_trace_header_t **t2 = a2;
-  i64 dt = t1[0]->time - t2[0]->time;
-  return dt < 0 ? -1 : (dt > 0 ? +1 : 0);
-}
-
-/*
- * Return 1 if this packet passes the trace filter, or 0 otherwise
- */
-u32
-filter_accept (vlib_trace_main_t * tm, vlib_trace_header_t * h)
-{
-  vlib_trace_header_t *e = vec_end (h);
-
-  if (tm->filter_flag == 0)
-    return 1;
-
-  if (tm->filter_flag == FILTER_FLAG_INCLUDE)
-    {
-      while (h < e)
-	{
-	  if (h->node_index == tm->filter_node_index)
-	    return 1;
-	  h = vlib_trace_header_next (h);
-	}
-      return 0;
-    }
-  else				/* FILTER_FLAG_EXCLUDE */
-    {
-      while (h < e)
-	{
-	  if (h->node_index == tm->filter_node_index)
-	    return 0;
-	  h = vlib_trace_header_next (h);
-	}
-      return 1;
-    }
-
-  return 0;
-}
-
-/*
- * Remove traces from the trace buffer pool that don't pass the filter
- */
-void
-trace_apply_filter (vlib_main_t * vm)
-{
-  vlib_trace_main_t *tm = &vm->trace_main;
-  vlib_trace_header_t **h;
-  vlib_trace_header_t ***traces_to_remove = 0;
-  u32 index;
-  u32 trace_index;
-  u32 n_accepted;
-
-  u32 accept;
-
-  if (tm->filter_flag == FILTER_FLAG_NONE)
-    return;
-
-  /*
-   * Ideally we would retain the first N traces that pass the filter instead
-   * of any N traces.
-   */
-  n_accepted = 0;
-  /* *INDENT-OFF* */
-  pool_foreach (h, tm->trace_buffer_pool,
-   ({
-      accept = filter_accept(tm, h[0]);
-
-      if ((n_accepted == tm->filter_count) || !accept)
-          vec_add1 (traces_to_remove, h);
-      else
-          n_accepted++;
-  }));
-  /* *INDENT-ON* */
-
-  /* remove all traces that we don't want to keep */
-  for (index = 0; index < vec_len (traces_to_remove); index++)
-    {
-      trace_index = traces_to_remove[index] - tm->trace_buffer_pool;
-      _vec_len (tm->trace_buffer_pool[trace_index]) = 0;
-      pool_put_index (tm->trace_buffer_pool, trace_index);
-    }
-
-  vec_free (traces_to_remove);
-}
-
-static clib_error_t *
-cli_show_trace_buffer (vlib_main_t * vm,
-		       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vlib_trace_main_t *tm;
-  vlib_trace_header_t **h, **traces;
-  u32 i, index = 0;
-  char *fmt;
-  u8 *s = 0;
-  u32 max;
-
-  /*
-   * By default display only this many traces. To display more, explicitly
-   * specify a max. This prevents unexpectedly huge outputs.
-   */
-  max = 50;
-  while (unformat_check_input (input) != (uword) UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "max %d", &max))
-	;
-      else
-	return clib_error_create ("expected 'max COUNT', got `%U'",
-				  format_unformat_error, input);
-    }
-
-
-  /* Get active traces from pool. */
-
-  /* *INDENT-OFF* */
-  foreach_vlib_main (
-  ({
-    void *mainheap;
-
-    fmt = "------------------- Start of thread %d %s -------------------\n";
-    s = format (s, fmt, index, vlib_worker_threads[index].name);
-
-    tm = &this_vlib_main->trace_main;
-
-    mainheap = clib_mem_set_heap (this_vlib_main->heap_base);
-
-    trace_apply_filter(this_vlib_main);
-
-    traces = 0;
-    pool_foreach (h, tm->trace_buffer_pool,
-    ({
-      vec_add1 (traces, h[0]);
-    }));
-
-    if (vec_len (traces) == 0)
-      {
-        clib_mem_set_heap (mainheap);
-        s = format (s, "No packets in trace buffer\n");
-        goto done;
-      }
-
-    /* Sort them by increasing time. */
-    vec_sort_with_function (traces, trace_cmp);
-
-    for (i = 0; i < vec_len (traces); i++)
-      {
-        if (i == max)
-          {
-            vlib_cli_output (vm, "Limiting display to %d packets."
-                                 " To display more specify max.", max);
-            goto done;
-          }
-
-        clib_mem_set_heap (mainheap);
-
-        s = format (s, "Packet %d\n%U\n\n", i + 1,
-                         format_vlib_trace, vm, traces[i]);
-
-        mainheap = clib_mem_set_heap (this_vlib_main->heap_base);
-      }
-
-  done:
-    vec_free (traces);
-    clib_mem_set_heap (mainheap);
-
-    index++;
-  }));
-  /* *INDENT-ON* */
-
-  vlib_cli_output (vm, "%v", s);
-  vec_free (s);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_trace_cli,static) = {
-  .path = "show trace",
-  .short_help = "Show trace buffer [max COUNT]",
-  .function = cli_show_trace_buffer,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-cli_add_trace_buffer (vlib_main_t * vm,
-		      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  vlib_trace_main_t *tm;
-  vlib_trace_node_t *tn;
-  u32 node_index, add;
-  u8 verbose = 0;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != (uword) UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "%U %d",
-		    unformat_vlib_node, vm, &node_index, &add))
-	;
-      else if (unformat (line_input, "verbose"))
-	verbose = 1;
-      else
-	return clib_error_create ("expected NODE COUNT, got `%U'",
-				  format_unformat_error, line_input);
-    }
-
-  /* *INDENT-OFF* */
-  foreach_vlib_main ((
-    {
-      void *oldheap;
-      tm = &this_vlib_main->trace_main;
-      tm->trace_active_hint = 1;
-      tm->verbose = verbose;
-      oldheap =
-	clib_mem_set_heap (this_vlib_main->heap_base);
-      vec_validate (tm->nodes, node_index);
-      tn = tm->nodes + node_index;
-      tn->limit += add; clib_mem_set_heap (oldheap);
-    }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (add_trace_cli,static) = {
-  .path = "trace add",
-  .short_help = "Trace given number of packets",
-  .function = cli_add_trace_buffer,
-};
-/* *INDENT-ON* */
-
-
-/*
- * Configure a filter for packet traces.
- *
- * This supplements the packet trace feature so that only packets matching
- * the filter are included in the trace. Currently the only filter is to
- * keep packets that include a certain node in the trace or exclude a certain
- * node in the trace.
- *
- * The count of traced packets in the "trace add" command is still used to
- * create a certain number of traces. The "trace filter" command specifies
- * how many of those packets should be retained in the trace.
- *
- * For example, 1Mpps of traffic is arriving and one of those packets is being
- * dropped. To capture the trace for only that dropped packet, you can do:
- *     trace filter include error-drop 1
- *     trace add dpdk-input 1000000
- *     <wait one second>
- *     show trace
- *
- * Note that the filter could be implemented by capturing all traces and just
- * reducing traces displayed by the "show trace" function. But that would
- * require a lot of memory for storing the traces, making that infeasible.
- *
- * To remove traces from the trace pool that do not include a certain node
- * requires that the trace be "complete" before applying the filter. To
- * accomplish this, the trace pool is filtered upon each iteraction of the
- * main vlib loop. Doing so keeps the number of allocated traces down to a
- * reasonably low number. This requires that tracing for a buffer is not
- * performed after the vlib main loop interation completes. i.e. you can't
- * save away a buffer temporarily then inject it back into the graph and
- * expect that the trace_index is still valid (such as a traffic manager might
- * do). A new trace buffer should be allocated for those types of packets.
- *
- * The filter can be extended to support multiple nodes and other match
- * criteria (e.g. input sw_if_index, mac address) but for now just checks if
- * a specified node is in the trace or not in the trace.
- */
-static clib_error_t *
-cli_filter_trace (vlib_main_t * vm,
-		  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vlib_trace_main_t *tm = &vm->trace_main;
-  u32 filter_node_index;
-  u32 filter_flag;
-  u32 filter_count;
-  void *mainheap;
-
-  if (unformat (input, "include %U %d",
-		unformat_vlib_node, vm, &filter_node_index, &filter_count))
-    {
-      filter_flag = FILTER_FLAG_INCLUDE;
-    }
-  else if (unformat (input, "exclude %U %d",
-		     unformat_vlib_node, vm, &filter_node_index,
-		     &filter_count))
-    {
-      filter_flag = FILTER_FLAG_EXCLUDE;
-    }
-  else if (unformat (input, "none"))
-    {
-      filter_flag = FILTER_FLAG_NONE;
-      filter_node_index = 0;
-      filter_count = 0;
-    }
-  else
-    return
-      clib_error_create
-      ("expected 'include NODE COUNT' or 'exclude NODE COUNT' or 'none', got `%U'",
-       format_unformat_error, input);
-
-  /* *INDENT-OFF* */
-  foreach_vlib_main (
-    ({
-    tm = &this_vlib_main->trace_main;
-    tm->filter_node_index = filter_node_index;
-    tm->filter_flag = filter_flag;
-    tm->filter_count = filter_count;
-
-    /*
-     * Clear the trace limits to stop any in-progress tracing
-     * Prevents runaway trace allocations when the filter changes (or is removed)
-     */
-    mainheap = clib_mem_set_heap (this_vlib_main->heap_base);
-    vec_free (tm->nodes);
-    clib_mem_set_heap (mainheap);
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (filter_trace_cli,static) = {
-  .path = "trace filter",
-  .short_help = "filter trace output - include NODE COUNT | exclude NODE COUNT | none",
-  .function = cli_filter_trace,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-cli_clear_trace_buffer (vlib_main_t * vm,
-			unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  clear_trace_buffer ();
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (clear_trace_cli,static) = {
-  .path = "clear trace",
-  .short_help = "Clear trace buffer and free memory",
-  .function = cli_clear_trace_buffer,
-};
-/* *INDENT-ON* */
-
-/* Dummy function to get us linked in. */
-void
-vlib_trace_cli_reference (void)
-{
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/trace.h b/vlib/vlib/trace.h
deleted file mode 100644
index fc0fc5c8..00000000
--- a/vlib/vlib/trace.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * trace.h: VLIB trace buffer.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_trace_h
-#define included_vlib_trace_h
-
-#include <vppinfra/pool.h>
-
-typedef struct
-{
-  /* CPU time stamp trace was made. */
-  u64 time;
-
-  /* Node which generated this trace. */
-  u32 node_index;
-
-  /* Number of data words in this trace. */
-  u32 n_data;
-
-  /* Trace data follows. */
-  u8 data[0];
-} vlib_trace_header_t;
-
-typedef struct
-{
-  /* Current number of traces in buffer. */
-  u32 count;
-
-  /* Max. number of traces to be added to buffer. */
-  u32 limit;
-} vlib_trace_node_t;
-
-typedef struct
-{
-  /* Pool of trace buffers. */
-  vlib_trace_header_t **trace_buffer_pool;
-
-  u32 last_main_loop_count;
-  u32 filter_node_index;
-  u32 filter_flag;
-#define FILTER_FLAG_NONE    0
-#define FILTER_FLAG_INCLUDE 1
-#define FILTER_FLAG_EXCLUDE 2
-  u32 filter_count;
-
-  /* set on trace add, cleared on clear trace */
-  u32 trace_active_hint;
-
-  /* Per node trace counts. */
-  vlib_trace_node_t *nodes;
-
-  /* verbosity */
-  int verbose;
-} vlib_trace_main_t;
-
-#endif /* included_vlib_trace_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/trace_funcs.h b/vlib/vlib/trace_funcs.h
deleted file mode 100644
index 5280eae9..00000000
--- a/vlib/vlib/trace_funcs.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * trace_funcs.h: VLIB trace buffer.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_trace_funcs_h
-#define included_vlib_trace_funcs_h
-
-always_inline void
-vlib_validate_trace (vlib_trace_main_t * tm, vlib_buffer_t * b)
-{
-  /*
-   * this assert seems right, but goes off constantly.
-   * disabling it appears to make the pain go away
-   */
-  ASSERT (1 || b->flags & VLIB_BUFFER_IS_TRACED);
-  ASSERT (!pool_is_free_index (tm->trace_buffer_pool, b->trace_index));
-}
-
-always_inline void *
-vlib_add_trace (vlib_main_t * vm,
-		vlib_node_runtime_t * r, vlib_buffer_t * b, u32 n_data_bytes)
-{
-  vlib_trace_main_t *tm = &vm->trace_main;
-  vlib_trace_header_t *h;
-  u32 n_data_words;
-
-  vlib_validate_trace (tm, b);
-
-  n_data_bytes = round_pow2 (n_data_bytes, sizeof (h[0]));
-  n_data_words = n_data_bytes / sizeof (h[0]);
-  vec_add2_aligned (tm->trace_buffer_pool[b->trace_index], h,
-		    1 + n_data_words, sizeof (h[0]));
-
-  h->time = vm->cpu_time_last_node_dispatch;
-  h->n_data = n_data_words;
-  h->node_index = r->node_index;
-
-  return h->data;
-}
-
-always_inline vlib_trace_header_t *
-vlib_trace_header_next (vlib_trace_header_t * h)
-{
-  return h + 1 + h->n_data;
-}
-
-always_inline void
-vlib_free_trace (vlib_main_t * vm, vlib_buffer_t * b)
-{
-  vlib_trace_main_t *tm = &vm->trace_main;
-  vlib_validate_trace (tm, b);
-  _vec_len (tm->trace_buffer_pool[b->trace_index]) = 0;
-  pool_put_index (tm->trace_buffer_pool, b->trace_index);
-}
-
-always_inline void
-vlib_trace_next_frame (vlib_main_t * vm,
-		       vlib_node_runtime_t * r, u32 next_index)
-{
-  vlib_next_frame_t *nf;
-  nf = vlib_node_runtime_get_next_frame (vm, r, next_index);
-  nf->flags |= VLIB_FRAME_TRACE;
-}
-
-void trace_apply_filter (vlib_main_t * vm);
-
-/* Mark buffer as traced and allocate trace buffer. */
-always_inline void
-vlib_trace_buffer (vlib_main_t * vm,
-		   vlib_node_runtime_t * r,
-		   u32 next_index, vlib_buffer_t * b, int follow_chain)
-{
-  vlib_trace_main_t *tm = &vm->trace_main;
-  vlib_trace_header_t **h;
-
-  /*
-   * Apply filter to existing traces to keep number of allocated traces low.
-   * Performed each time around the main loop.
-   */
-  if (tm->last_main_loop_count != vm->main_loop_count)
-    {
-      tm->last_main_loop_count = vm->main_loop_count;
-      trace_apply_filter (vm);
-    }
-
-  vlib_trace_next_frame (vm, r, next_index);
-
-  pool_get (tm->trace_buffer_pool, h);
-
-  do
-    {
-      b->flags |= VLIB_BUFFER_IS_TRACED;
-      b->trace_index = h - tm->trace_buffer_pool;
-    }
-  while (follow_chain && (b = vlib_get_next_buffer (vm, b)));
-}
-
-always_inline void
-vlib_buffer_copy_trace_flag (vlib_main_t * vm, vlib_buffer_t * b,
-			     u32 bi_target)
-{
-  vlib_buffer_t *b_target = vlib_get_buffer (vm, bi_target);
-  b_target->flags |= b->flags & VLIB_BUFFER_IS_TRACED;
-  b_target->trace_index = b->trace_index;
-}
-
-always_inline u32
-vlib_get_trace_count (vlib_main_t * vm, vlib_node_runtime_t * rt)
-{
-  vlib_trace_main_t *tm = &vm->trace_main;
-  vlib_trace_node_t *tn;
-  int n;
-
-  if (rt->node_index >= vec_len (tm->nodes))
-    return 0;
-  tn = tm->nodes + rt->node_index;
-  n = tn->limit - tn->count;
-  ASSERT (n >= 0);
-
-  return n;
-}
-
-always_inline void
-vlib_set_trace_count (vlib_main_t * vm, vlib_node_runtime_t * rt, u32 count)
-{
-  vlib_trace_main_t *tm = &vm->trace_main;
-  vlib_trace_node_t *tn = vec_elt_at_index (tm->nodes, rt->node_index);
-
-  ASSERT (count <= tn->limit);
-  tn->count = tn->limit - count;
-}
-
-/* Helper function for nodes which only trace buffer data. */
-void
-vlib_trace_frame_buffers_only (vlib_main_t * vm,
-			       vlib_node_runtime_t * node,
-			       u32 * buffers,
-			       uword n_buffers,
-			       uword next_buffer_stride,
-			       uword n_buffer_data_bytes_in_trace);
-
-#endif /* included_vlib_trace_funcs_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/unix/cj.c b/vlib/vlib/unix/cj.c
deleted file mode 100644
index 33ba163a..00000000
--- a/vlib/vlib/unix/cj.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- *------------------------------------------------------------------
- * cj.c
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-/**
- * @file
- * Circular joournal diagnostic mechanism.
- *
- * The @c cj thread-safe circular log buffer scheme is occasionally useful
- * when chasing bugs. Calls to it should not be checked in.
- */
-/*? %%clicmd:group_label Circular Journal %% ?*/
-/*? %%syscfg:group_label Circular Journal %% ?*/
-
-#include <stdio.h>
-#include <vlib/vlib.h>
-
-#include <vlib/unix/cj.h>
-
-cj_main_t cj_main;
-
-void
-cj_log (u32 type, void *data0, void *data1)
-{
-  u64 new_tail;
-  cj_main_t *cjm = &cj_main;
-  cj_record_t *r;
-
-  if (cjm->enable == 0)
-    return;
-
-  new_tail = __sync_add_and_fetch (&cjm->tail, 1);
-
-  r = (cj_record_t *) & (cjm->records[new_tail & (cjm->num_records - 1)]);
-  r->time = vlib_time_now (cjm->vlib_main);
-  r->cpu = os_get_cpu_number ();
-  r->type = type;
-  r->data[0] = pointer_to_uword (data0);
-  r->data[1] = pointer_to_uword (data1);
-}
-
-void
-cj_stop (void)
-{
-  cj_main_t *cjm = &cj_main;
-
-  cjm->enable = 0;
-}
-
-
-clib_error_t *
-cj_init (vlib_main_t * vm)
-{
-  cj_main_t *cjm = &cj_main;
-
-  cjm->vlib_main = vm;
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (cj_init);
-
-static clib_error_t *
-cj_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  cj_main_t *cjm = &cj_main;
-  int matched = 0;
-  int enable = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "records %d", &cjm->num_records))
-	matched = 1;
-      else if (unformat (input, "on"))
-	enable = 1;
-      else
-	return clib_error_return (0, "cj_config: unknown input '%U'",
-				  format_unformat_error, input);
-    }
-
-  if (matched == 0)
-    return 0;
-
-  cjm->num_records = max_pow2 (cjm->num_records);
-  vec_validate (cjm->records, cjm->num_records - 1);
-  memset (cjm->records, 0xff, cjm->num_records * sizeof (cj_record_t));
-  cjm->tail = ~0;
-  cjm->enable = enable;
-
-  return 0;
-}
-
-/*?
- * Configure the circular journal diagnostic mechanism. This is only useful
- * if you, the deveoper, have written code to make use of the circular
- * journal.
- *
- * @cfgcmd{records, &lt;number&gt;}
- * Configure the number of records to allocate for the circular journal.
- *
- * @cfgcmd{on}
- * Enable the collection of records in the circular journal at the
- * earliest opportunity.
-?*/
-VLIB_CONFIG_FUNCTION (cj_config, "cj");
-
-void
-cj_enable_disable (int is_enable)
-{
-  cj_main_t *cjm = &cj_main;
-
-  if (cjm->num_records)
-    cjm->enable = is_enable;
-  else
-    vlib_cli_output (cjm->vlib_main, "CJ not configured...");
-}
-
-static inline void
-cj_dump_one_record (cj_record_t * r)
-{
-  fprintf (stderr, "[%d]: %10.6f T%02d %llx %llx\n",
-	   r->cpu, r->time, r->type, (long long unsigned int) r->data[0],
-	   (long long unsigned int) r->data[1]);
-}
-
-static void
-cj_dump_internal (u8 filter0_enable, u64 filter0,
-		  u8 filter1_enable, u64 filter1)
-{
-  cj_main_t *cjm = &cj_main;
-  cj_record_t *r;
-  u32 i, index;
-
-  if (cjm->num_records == 0)
-    {
-      fprintf (stderr, "CJ not configured...\n");
-      return;
-    }
-
-  if (cjm->tail == (u64) ~ 0)
-    {
-      fprintf (stderr, "No data collected...\n");
-      return;
-    }
-
-  /* Has the trace wrapped? */
-  index = (cjm->tail + 1) & (cjm->num_records - 1);
-  r = &(cjm->records[index]);
-
-  if (r->cpu != (u32) ~ 0)
-    {
-      /* Yes, dump from tail + 1 to the end */
-      for (i = index; i < cjm->num_records; i++)
-	{
-	  if (filter0_enable && (r->data[0] != filter0))
-	    goto skip;
-	  if (filter1_enable && (r->data[1] != filter1))
-	    goto skip;
-	  cj_dump_one_record (r);
-	skip:
-	  r++;
-	}
-    }
-  /* dump from the beginning through the final tail */
-  r = cjm->records;
-  for (i = 0; i <= cjm->tail; i++)
-    {
-      if (filter0_enable && (r->data[0] != filter0))
-	goto skip2;
-      if (filter1_enable && (r->data[1] != filter1))
-	goto skip2;
-      cj_dump_one_record (r);
-    skip2:
-      r++;
-    }
-}
-
-void
-cj_dump (void)
-{
-  cj_dump_internal (0, 0, 0, 0);
-}
-
-void
-cj_dump_filter_data0 (u64 filter0)
-{
-  cj_dump_internal (1 /* enable f0 */ , filter0, 0, 0);
-}
-
-void
-cj_dump_filter_data1 (u64 filter1)
-{
-  cj_dump_internal (0, 0, 1 /* enable f1 */ , filter1);
-}
-
-void
-cj_dump_filter_data12 (u64 filter0, u64 filter1)
-{
-  cj_dump_internal (1, filter0, 1, filter1);
-}
-
-static clib_error_t *
-cj_command_fn (vlib_main_t * vm,
-	       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  int is_enable = -1;
-  int is_dump = -1;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "enable") || unformat (input, "on"))
-	is_enable = 1;
-      else if (unformat (input, "disable") || unformat (input, "off"))
-	is_enable = 0;
-      else if (unformat (input, "dump"))
-	is_dump = 1;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-
-  if (is_enable >= 0)
-    cj_enable_disable (is_enable);
-
-  if (is_dump > 0)
-    cj_dump ();
-
-  return 0;
-}
-
-/*?
- * Enable, disable the collection of diagnostic data into a
- * circular journal or dump the circular journal diagnostic data.
- * This is only useful if you, the deveoper, have written code to make
- * use of the circular journal.
- *
- * When dumping the data it is formatted and sent to @c stderr of the
- * VPP process; when running VPP in <code>unix interactive</code> mode
- * this is typically the same place as the Debug CLI.
-?*/
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cj_command,static) = {
-  .path = "cj",
-  .short_help = "cj <enable | disable | dump>",
-  .function = cj_command_fn,
-};
-/* *INDENT-ON* */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/unix/cj.h b/vlib/vlib/unix/cj.h
deleted file mode 100644
index 67626afe..00000000
--- a/vlib/vlib/unix/cj.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *------------------------------------------------------------------
- * cj.h
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#ifndef __included_cj_h__
-#define __included_cj_h__
-
-typedef struct
-{
-  f64 time;
-  u32 cpu;
-  u32 type;
-  u64 data[2];
-} cj_record_t;
-
-typedef struct
-{
-  volatile u64 tail;
-  cj_record_t *records;
-  u32 num_records;
-  volatile u32 enable;
-
-  vlib_main_t *vlib_main;
-} cj_main_t;
-
-void cj_log (u32 type, void *data0, void *data1);
-
-/*
- * Supply in application main, so we can log from any library...
- * Declare a weak reference in the library, off you go.
- */
-
-#define DECLARE_CJ_GLOBAL_LOG                                   \
-void cj_global_log (unsigned type, void * data0, void * data1)  \
-  __attribute__ ((weak));                                       \
-                                                                \
-unsigned __cj_type;                                             \
-void * __cj_data0;                                              \
-void * __cj_data1;                                              \
-                                                                \
-void                                                            \
-cj_global_log (unsigned type, void * data0, void * data1)       \
-{                                                               \
-  __cj_type = type;                                             \
-  __cj_data0 = data0;                                           \
-  __cj_data1 = data1;                                           \
-}
-
-#define CJ_GLOBAL_LOG_PROTOTYPE
-void
-cj_global_log (unsigned type, void *data0, void *data1)
-__attribute__ ((weak));
-
-void cj_stop (void);
-
-#endif /* __included_cj_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/unix/cli.c b/vlib/vlib/unix/cli.c
deleted file mode 100644
index 69fca6ec..00000000
--- a/vlib/vlib/unix/cli.c
+++ /dev/null
@@ -1,2989 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * cli.c: Unix stdin/socket CLI.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-/**
- * @file
- * @brief Unix stdin/socket command line interface.
- * Provides a command line interface so humans can interact with VPP.
- * This is predominantly a debugging and testing mechanism.
- */
-/*? %%clicmd:group_label Command line session %% ?*/
-/*? %%syscfg:group_label Command line session %% ?*/
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vppinfra/timer.h>
-
-#include <ctype.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <termios.h>
-#include <signal.h>
-#include <unistd.h>
-#include <arpa/telnet.h>
-#include <sys/ioctl.h>
-
-/** ANSI escape code. */
-#define ESC "\x1b"
-
-/** ANSI Control Sequence Introducer. */
-#define CSI ESC "["
-
-/** ANSI clear screen. */
-#define ANSI_CLEAR      CSI "2J" CSI "1;1H"
-/** ANSI reset color settings. */
-#define ANSI_RESET      CSI "0m"
-/** ANSI Start bold text. */
-#define ANSI_BOLD       CSI "1m"
-/** ANSI Stop bold text. */
-#define ANSI_DIM        CSI "2m"
-/** ANSI Start dark red text. */
-#define ANSI_DRED       ANSI_DIM CSI "31m"
-/** ANSI Start bright red text. */
-#define ANSI_BRED       ANSI_BOLD CSI "31m"
-/** ANSI clear line cursor is on. */
-#define ANSI_CLEARLINE  CSI "2K"
-/** ANSI scroll screen down one line. */
-#define ANSI_SCROLLDN   CSI "1T"
-/** ANSI save cursor position. */
-#define ANSI_SAVECURSOR CSI "s"
-/** ANSI restore cursor position if previously saved. */
-#define ANSI_RESTCURSOR CSI "u"
-
-/** Maximum depth into a byte stream from which to compile a Telnet
- * protocol message. This is a saftey measure. */
-#define UNIX_CLI_MAX_DEPTH_TELNET 24
-
-/** Unix standard in */
-#define UNIX_CLI_STDIN_FD 0
-
-
-/** A CLI banner line. */
-typedef struct
-{
-  u8 *line;	/**< The line to print. */
-  u32 length;	/**< The length of the line without terminating NUL. */
-} unix_cli_banner_t;
-
-#define _(a) { .line = (u8 *)(a), .length = sizeof(a) - 1 }
-/** Plain welcome banner. */
-static unix_cli_banner_t unix_cli_banner[] = {
-  _("    _______    _        _   _____  ___ \n"),
-  _(" __/ __/ _ \\  (_)__    | | / / _ \\/ _ \\\n"),
-  _(" _/ _// // / / / _ \\   | |/ / ___/ ___/\n"),
-  _(" /_/ /____(_)_/\\___/   |___/_/  /_/    \n"),
-  _("\n")
-};
-
-/** ANSI color welcome banner. */
-static unix_cli_banner_t unix_cli_banner_color[] = {
-  _(ANSI_BRED "    _______    _     " ANSI_RESET "   _   _____  ___ \n"),
-  _(ANSI_BRED " __/ __/ _ \\  (_)__ " ANSI_RESET "   | | / / _ \\/ _ \\\n"),
-  _(ANSI_BRED " _/ _// // / / / _ \\" ANSI_RESET "   | |/ / ___/ ___/\n"),
-  _(ANSI_BRED " /_/ /____(_)_/\\___/" ANSI_RESET "   |___/_/  /_/    \n"),
-  _("\n")
-};
-
-#undef _
-
-/** Pager line index */
-typedef struct
-{
-  /** Index into pager_vector */
-  u32 line;
-
-  /** Offset of the string in the line */
-  u32 offset;
-
-  /** Length of the string in the line */
-  u32 length;
-} unix_cli_pager_index_t;
-
-
-/** Unix CLI session. */
-typedef struct
-{
-  /** The file index held by unix.c */
-  u32 unix_file_index;
-
-  /** Vector of output pending write to file descriptor. */
-  u8 *output_vector;
-
-  /** Vector of input saved by Unix input node to be processed by
-     CLI process. */
-  u8 *input_vector;
-
-  /** This session has command history. */
-  u8 has_history;
-  /** Array of vectors of commands in the history. */
-  u8 **command_history;
-  /** The command currently pointed at by the history cursor. */
-  u8 *current_command;
-  /** How far from the end of the history array the user has browsed. */
-  i32 excursion;
-
-  /** Maximum number of history entries this session will store. */
-  u32 history_limit;
-
-  /** Current command line counter */
-  u32 command_number;
-
-  /** The string being searched for in the history. */
-  u8 *search_key;
-  /** If non-zero then the CLI is searching in the history array.
-   * - @c -1 means search backwards.
-   * - @c 1 means search forwards.
-   */
-  int search_mode;
-
-  /** Position of the insert cursor on the current input line */
-  u32 cursor;
-
-  /** Line mode or char mode */
-  u8 line_mode;
-
-  /** Set if the CRLF mode wants CR + LF */
-  u8 crlf_mode;
-
-  /** Can we do ANSI output? */
-  u8 ansi_capable;
-
-  /** Has the session started? */
-  u8 started;
-
-  /** Disable the pager? */
-  u8 no_pager;
-
-  /** Pager buffer */
-  u8 **pager_vector;
-
-  /** Index of line fragments in the pager buffer */
-  unix_cli_pager_index_t *pager_index;
-
-  /** Line number of top of page */
-  u32 pager_start;
-
-  /** Terminal width */
-  u32 width;
-
-  /** Terminal height */
-  u32 height;
-
-  /** Process node identifier */
-  u32 process_node_index;
-} unix_cli_file_t;
-
-/** Resets the pager buffer and other data.
- * @param f The CLI session whose pager needs to be reset.
- */
-always_inline void
-unix_cli_pager_reset (unix_cli_file_t * f)
-{
-  u8 **p;
-
-  f->pager_start = 0;
-
-  vec_free (f->pager_index);
-  f->pager_index = 0;
-
-  vec_foreach (p, f->pager_vector)
-  {
-    vec_free (*p);
-  }
-  vec_free (f->pager_vector);
-  f->pager_vector = 0;
-}
-
-/** Release storage used by a CLI session.
- * @param f The CLI session whose storage needs to be released.
- */
-always_inline void
-unix_cli_file_free (unix_cli_file_t * f)
-{
-  vec_free (f->output_vector);
-  vec_free (f->input_vector);
-  unix_cli_pager_reset (f);
-}
-
-/** CLI actions */
-typedef enum
-{
-  UNIX_CLI_PARSE_ACTION_NOACTION = 0,	/**< No action */
-  UNIX_CLI_PARSE_ACTION_CRLF,		/**< Carriage return, newline or enter */
-  UNIX_CLI_PARSE_ACTION_TAB,		/**< Tab key */
-  UNIX_CLI_PARSE_ACTION_ERASE,		/**< Erase cursor left */
-  UNIX_CLI_PARSE_ACTION_ERASERIGHT,	/**< Erase cursor right */
-  UNIX_CLI_PARSE_ACTION_UP,		/**< Up arrow */
-  UNIX_CLI_PARSE_ACTION_DOWN,		/**< Down arrow */
-  UNIX_CLI_PARSE_ACTION_LEFT,		/**< Left arrow */
-  UNIX_CLI_PARSE_ACTION_RIGHT,		/**< Right arrow */
-  UNIX_CLI_PARSE_ACTION_HOME,		/**< Home key (jump to start of line) */
-  UNIX_CLI_PARSE_ACTION_END,		/**< End key (jump to end of line) */
-  UNIX_CLI_PARSE_ACTION_WORDLEFT,	/**< Jump cursor to start of left word */
-  UNIX_CLI_PARSE_ACTION_WORDRIGHT,	/**< Jump cursor to start of right word */
-  UNIX_CLI_PARSE_ACTION_ERASELINELEFT,	/**< Erase line to left of cursor */
-  UNIX_CLI_PARSE_ACTION_ERASELINERIGHT,	/**< Erase line to right & including cursor */
-  UNIX_CLI_PARSE_ACTION_CLEAR,		/**< Clear the terminal */
-  UNIX_CLI_PARSE_ACTION_REVSEARCH,	/**< Search backwards in command history */
-  UNIX_CLI_PARSE_ACTION_FWDSEARCH,	/**< Search forwards in command history */
-  UNIX_CLI_PARSE_ACTION_YANK,		/**< Undo last erase action */
-  UNIX_CLI_PARSE_ACTION_TELNETIAC,	/**< Telnet control code */
-
-  UNIX_CLI_PARSE_ACTION_PAGER_CRLF,	/**< Enter pressed (CR, CRLF, LF, etc) */
-  UNIX_CLI_PARSE_ACTION_PAGER_QUIT,	/**< Exit the pager session */
-  UNIX_CLI_PARSE_ACTION_PAGER_NEXT,	/**< Scroll to next page */
-  UNIX_CLI_PARSE_ACTION_PAGER_DN,	/**< Scroll to next line */
-  UNIX_CLI_PARSE_ACTION_PAGER_UP,	/**< Scroll to previous line */
-  UNIX_CLI_PARSE_ACTION_PAGER_TOP,	/**< Scroll to first line */
-  UNIX_CLI_PARSE_ACTION_PAGER_BOTTOM,	/**< Scroll to last line */
-  UNIX_CLI_PARSE_ACTION_PAGER_PGDN,	/**< Scroll to next page */
-  UNIX_CLI_PARSE_ACTION_PAGER_PGUP,	/**< Scroll to previous page */
-  UNIX_CLI_PARSE_ACTION_PAGER_REDRAW,	/**< Clear and redraw the page on the terminal */
-  UNIX_CLI_PARSE_ACTION_PAGER_SEARCH,	/**< Search the pager buffer */
-
-  UNIX_CLI_PARSE_ACTION_PARTIALMATCH,	/**< Action parser found a partial match */
-  UNIX_CLI_PARSE_ACTION_NOMATCH		/**< Action parser did not find any match */
-} unix_cli_parse_action_t;
-
-/** @brief Mapping of input buffer strings to action values.
- * @note This won't work as a hash since we need to be able to do
- *       partial matches on the string.
- */
-typedef struct
-{
-  u8 *input;			    /**< Input string to match. */
-  u32 len;			    /**< Length of input without final NUL. */
-  unix_cli_parse_action_t action;   /**< Action to take when matched. */
-} unix_cli_parse_actions_t;
-
-/** @brief Given a capital ASCII letter character return a @c NUL terminated
- * string with the control code for that letter.
- *
- * @param c An ASCII character.
- * @return A @c NUL terminated string of type @c u8[].
- *
- * @par Example
- *     @c CTL('A') returns <code>{ 0x01, 0x00 }</code> as a @c u8[].
- */
-#define CTL(c) (u8[]){ (c) - '@', 0 }
-
-#define _(a,b) { .input = (u8 *)(a), .len = sizeof(a) - 1, .action = (b) }
-/**
- * Patterns to match on a CLI input stream.
- * @showinitializer
- */
-static unix_cli_parse_actions_t unix_cli_parse_strings[] = {
-  /* Line handling */
-  _("\r\n", UNIX_CLI_PARSE_ACTION_CRLF),	/* Must be before '\r' */
-  _("\n", UNIX_CLI_PARSE_ACTION_CRLF),
-  _("\r\0", UNIX_CLI_PARSE_ACTION_CRLF),	/* Telnet does this */
-  _("\r", UNIX_CLI_PARSE_ACTION_CRLF),
-
-  /* Unix shell control codes */
-  _(CTL ('B'), UNIX_CLI_PARSE_ACTION_LEFT),
-  _(CTL ('F'), UNIX_CLI_PARSE_ACTION_RIGHT),
-  _(CTL ('P'), UNIX_CLI_PARSE_ACTION_UP),
-  _(CTL ('N'), UNIX_CLI_PARSE_ACTION_DOWN),
-  _(CTL ('A'), UNIX_CLI_PARSE_ACTION_HOME),
-  _(CTL ('E'), UNIX_CLI_PARSE_ACTION_END),
-  _(CTL ('D'), UNIX_CLI_PARSE_ACTION_ERASERIGHT),
-  _(CTL ('U'), UNIX_CLI_PARSE_ACTION_ERASELINELEFT),
-  _(CTL ('K'), UNIX_CLI_PARSE_ACTION_ERASELINERIGHT),
-  _(CTL ('Y'), UNIX_CLI_PARSE_ACTION_YANK),
-  _(CTL ('L'), UNIX_CLI_PARSE_ACTION_CLEAR),
-  _(ESC "b", UNIX_CLI_PARSE_ACTION_WORDLEFT),	/* Alt-B */
-  _(ESC "f", UNIX_CLI_PARSE_ACTION_WORDRIGHT),	/* Alt-F */
-  _("\b", UNIX_CLI_PARSE_ACTION_ERASE),	/* ^H */
-  _("\x7f", UNIX_CLI_PARSE_ACTION_ERASE),	/* Backspace */
-  _("\t", UNIX_CLI_PARSE_ACTION_TAB),	/* ^I */
-
-  /* VT100 Normal mode - Broadest support */
-  _(CSI "A", UNIX_CLI_PARSE_ACTION_UP),
-  _(CSI "B", UNIX_CLI_PARSE_ACTION_DOWN),
-  _(CSI "C", UNIX_CLI_PARSE_ACTION_RIGHT),
-  _(CSI "D", UNIX_CLI_PARSE_ACTION_LEFT),
-  _(CSI "H", UNIX_CLI_PARSE_ACTION_HOME),
-  _(CSI "F", UNIX_CLI_PARSE_ACTION_END),
-  _(CSI "3~", UNIX_CLI_PARSE_ACTION_ERASERIGHT),	/* Delete */
-  _(CSI "1;5D", UNIX_CLI_PARSE_ACTION_WORDLEFT),	/* C-Left */
-  _(CSI "1;5C", UNIX_CLI_PARSE_ACTION_WORDRIGHT),	/* C-Right */
-
-  /* VT100 Application mode - Some Gnome Terminal functions use these */
-  _(ESC "OA", UNIX_CLI_PARSE_ACTION_UP),
-  _(ESC "OB", UNIX_CLI_PARSE_ACTION_DOWN),
-  _(ESC "OC", UNIX_CLI_PARSE_ACTION_RIGHT),
-  _(ESC "OD", UNIX_CLI_PARSE_ACTION_LEFT),
-  _(ESC "OH", UNIX_CLI_PARSE_ACTION_HOME),
-  _(ESC "OF", UNIX_CLI_PARSE_ACTION_END),
-
-  /* ANSI X3.41-1974 - sent by Microsoft Telnet and PuTTY */
-  _(CSI "1~", UNIX_CLI_PARSE_ACTION_HOME),
-  _(CSI "4~", UNIX_CLI_PARSE_ACTION_END),
-
-  /* Emacs-ish history search */
-  _(CTL ('S'), UNIX_CLI_PARSE_ACTION_FWDSEARCH),
-  _(CTL ('R'), UNIX_CLI_PARSE_ACTION_REVSEARCH),
-
-  /* Other protocol things */
-  _("\xff", UNIX_CLI_PARSE_ACTION_TELNETIAC),	/* IAC */
-  _("\0", UNIX_CLI_PARSE_ACTION_NOACTION),	/* NUL */
-  _(NULL, UNIX_CLI_PARSE_ACTION_NOMATCH)
-};
-
-/**
- * Patterns to match when a CLI session is in the pager.
- * @showinitializer
- */
-static unix_cli_parse_actions_t unix_cli_parse_pager[] = {
-  /* Line handling */
-  _("\r\n", UNIX_CLI_PARSE_ACTION_PAGER_CRLF),	/* Must be before '\r' */
-  _("\n", UNIX_CLI_PARSE_ACTION_PAGER_CRLF),
-  _("\r\0", UNIX_CLI_PARSE_ACTION_PAGER_CRLF),	/* Telnet does this */
-  _("\r", UNIX_CLI_PARSE_ACTION_PAGER_CRLF),
-
-  /* Pager commands */
-  _(" ", UNIX_CLI_PARSE_ACTION_PAGER_NEXT),
-  _("q", UNIX_CLI_PARSE_ACTION_PAGER_QUIT),
-  _(CTL ('L'), UNIX_CLI_PARSE_ACTION_PAGER_REDRAW),
-  _(CTL ('R'), UNIX_CLI_PARSE_ACTION_PAGER_REDRAW),
-  _("/", UNIX_CLI_PARSE_ACTION_PAGER_SEARCH),
-
-  /* VT100 */
-  _(CSI "A", UNIX_CLI_PARSE_ACTION_PAGER_UP),
-  _(CSI "B", UNIX_CLI_PARSE_ACTION_PAGER_DN),
-  _(CSI "H", UNIX_CLI_PARSE_ACTION_PAGER_TOP),
-  _(CSI "F", UNIX_CLI_PARSE_ACTION_PAGER_BOTTOM),
-
-  /* VT100 Application mode */
-  _(ESC "OA", UNIX_CLI_PARSE_ACTION_PAGER_UP),
-  _(ESC "OB", UNIX_CLI_PARSE_ACTION_PAGER_DN),
-  _(ESC "OH", UNIX_CLI_PARSE_ACTION_PAGER_TOP),
-  _(ESC "OF", UNIX_CLI_PARSE_ACTION_PAGER_BOTTOM),
-
-  /* ANSI X3.41-1974 */
-  _(CSI "1~", UNIX_CLI_PARSE_ACTION_PAGER_TOP),
-  _(CSI "4~", UNIX_CLI_PARSE_ACTION_PAGER_BOTTOM),
-  _(CSI "5~", UNIX_CLI_PARSE_ACTION_PAGER_PGUP),
-  _(CSI "6~", UNIX_CLI_PARSE_ACTION_PAGER_PGDN),
-
-  /* Other protocol things */
-  _("\xff", UNIX_CLI_PARSE_ACTION_TELNETIAC),	/* IAC */
-  _("\0", UNIX_CLI_PARSE_ACTION_NOACTION),	/* NUL */
-  _(NULL, UNIX_CLI_PARSE_ACTION_NOMATCH)
-};
-
-#undef _
-
-/** CLI session events. */
-typedef enum
-{
-  UNIX_CLI_PROCESS_EVENT_READ_READY,  /**< A file descriptor has data to be read. */
-  UNIX_CLI_PROCESS_EVENT_QUIT,	      /**< A CLI session wants to close. */
-} unix_cli_process_event_type_t;
-
-/** CLI global state. */
-typedef struct
-{
-  /** Prompt string for CLI. */
-  u8 *cli_prompt;
-
-  /** Vec pool of CLI sessions. */
-  unix_cli_file_t *cli_file_pool;
-
-  /** Vec pool of unused session indices. */
-  u32 *unused_cli_process_node_indices;
-
-  /** The session index of the stdin cli */
-  u32 stdin_cli_file_index;
-
-  /** File pool index of current input. */
-  u32 current_input_file_index;
-} unix_cli_main_t;
-
-/** CLI global state */
-static unix_cli_main_t unix_cli_main;
-
-/**
- * @brief Search for a byte sequence in the action list.
- *
- * Searches the @ref unix_cli_parse_actions_t list in @a a for a match with
- * the bytes in @a input of maximum length @a ilen bytes.
- * When a match is made @a *matched indicates how many bytes were matched.
- * Returns a value from the enum @ref unix_cli_parse_action_t to indicate
- * whether no match was found, a partial match was found or a complete
- * match was found and what action, if any, should be taken.
- *
- * @param[in]  a        Actions list to search within.
- * @param[in]  input    String fragment to search for.
- * @param[in]  ilen     Length of the string in 'input'.
- * @param[out] matched  Pointer to an integer that will contain the number
- *                      of bytes matched when a complete match is found.
- *
- * @return Action from @ref unix_cli_parse_action_t that the string fragment
- *         matches.
- *         @ref UNIX_CLI_PARSE_ACTION_PARTIALMATCH is returned when the
- *         whole input string matches the start of at least one action.
- *         @ref UNIX_CLI_PARSE_ACTION_NOMATCH is returned when there is no
- *         match at all.
- */
-static unix_cli_parse_action_t
-unix_cli_match_action (unix_cli_parse_actions_t * a,
-		       u8 * input, u32 ilen, i32 * matched)
-{
-  u8 partial = 0;
-
-  while (a->input)
-    {
-      if (ilen >= a->len)
-	{
-	  /* see if the start of the input buffer exactly matches the current
-	   * action string. */
-	  if (memcmp (input, a->input, a->len) == 0)
-	    {
-	      *matched = a->len;
-	      return a->action;
-	    }
-	}
-      else
-	{
-	  /* if the first ilen characters match, flag this as a partial -
-	   * meaning keep collecting bytes in case of a future match */
-	  if (memcmp (input, a->input, ilen) == 0)
-	    partial = 1;
-	}
-
-      /* check next action */
-      a++;
-    }
-
-  return partial ?
-    UNIX_CLI_PARSE_ACTION_PARTIALMATCH : UNIX_CLI_PARSE_ACTION_NOMATCH;
-}
-
-
-/** Add bytes to the output vector and then flagg the I/O system that bytes
- * are available to be sent.
- */
-static void
-unix_cli_add_pending_output (unix_file_t * uf,
-			     unix_cli_file_t * cf,
-			     u8 * buffer, uword buffer_bytes)
-{
-  unix_main_t *um = &unix_main;
-
-  vec_add (cf->output_vector, buffer, buffer_bytes);
-  if (vec_len (cf->output_vector) > 0)
-    {
-      int skip_update = 0 != (uf->flags & UNIX_FILE_DATA_AVAILABLE_TO_WRITE);
-      uf->flags |= UNIX_FILE_DATA_AVAILABLE_TO_WRITE;
-      if (!skip_update)
-	um->file_update (uf, UNIX_FILE_UPDATE_MODIFY);
-    }
-}
-
-/** Delete all bytes from the output vector and flag the I/O system
- * that no more bytes are available to be sent.
- */
-static void
-unix_cli_del_pending_output (unix_file_t * uf,
-			     unix_cli_file_t * cf, uword n_bytes)
-{
-  unix_main_t *um = &unix_main;
-
-  vec_delete (cf->output_vector, n_bytes, 0);
-  if (vec_len (cf->output_vector) <= 0)
-    {
-      int skip_update = 0 == (uf->flags & UNIX_FILE_DATA_AVAILABLE_TO_WRITE);
-      uf->flags &= ~UNIX_FILE_DATA_AVAILABLE_TO_WRITE;
-      if (!skip_update)
-	um->file_update (uf, UNIX_FILE_UPDATE_MODIFY);
-    }
-}
-
-/** @brief A bit like strchr with a buffer length limit.
- * Search a buffer for the first instance of a character up to the limit of
- * the buffer length. If found then return the position of that character.
- *
- * The key departure from strchr is that if the character is not found then
- * return the buffer length.
- *
- * @param chr The byte value to search for.
- * @param str The buffer in which to search for the value.
- * @param len The depth into the buffer to search.
- *
- * @return The index of the first occurence of \c chr. If \c chr is not
- *          found then \c len instead.
- */
-always_inline word
-unix_vlib_findchr (u8 chr, u8 * str, word len)
-{
-  word i = 0;
-  for (i = 0; i < len; i++, str++)
-    {
-      if (*str == chr)
-	return i;
-    }
-  return len;
-}
-
-/** @brief Send a buffer to the CLI stream if possible, enqueue it otherwise.
- * Attempts to write given buffer to the file descriptor of the given
- * Unix CLI session. If that session already has data in the output buffer
- * or if the write attempt tells us to try again later then the given buffer
- * is appended to the pending output buffer instead.
- *
- * This is typically called only from \c unix_vlib_cli_output_cooked since
- * that is where CRLF handling occurs or from places where we explicitly do
- * not want cooked handling.
- *
- * @param cf Unix CLI session of the desired stream to write to.
- * @param uf The Unix file structure of the desired stream to write to.
- * @param buffer Pointer to the buffer that needs to be written.
- * @param buffer_bytes The number of bytes from \c buffer to write.
- */
-static void
-unix_vlib_cli_output_raw (unix_cli_file_t * cf,
-			  unix_file_t * uf, u8 * buffer, uword buffer_bytes)
-{
-  int n = 0;
-
-  if (vec_len (cf->output_vector) == 0)
-    n = write (uf->file_descriptor, buffer, buffer_bytes);
-
-  if (n < 0 && errno != EAGAIN)
-    {
-      clib_unix_warning ("write");
-    }
-  else if ((word) n < (word) buffer_bytes)
-    {
-      /* We got EAGAIN or we already have stuff in the buffer;
-       * queue up whatever didn't get sent for later. */
-      if (n < 0)
-	n = 0;
-      unix_cli_add_pending_output (uf, cf, buffer + n, buffer_bytes - n);
-    }
-}
-
-/** @brief Process a buffer for CRLF handling before outputting it to the CLI.
- *
- * @param cf Unix CLI session of the desired stream to write to.
- * @param uf The Unix file structure of the desired stream to write to.
- * @param buffer Pointer to the buffer that needs to be written.
- * @param buffer_bytes The number of bytes from \c buffer to write.
- */
-static void
-unix_vlib_cli_output_cooked (unix_cli_file_t * cf,
-			     unix_file_t * uf,
-			     u8 * buffer, uword buffer_bytes)
-{
-  word end = 0, start = 0;
-
-  while (end < buffer_bytes)
-    {
-      if (cf->crlf_mode)
-	{
-	  /* iterate the line on \n's so we can insert a \r before it */
-	  end = unix_vlib_findchr ('\n',
-				   buffer + start,
-				   buffer_bytes - start) + start;
-	}
-      else
-	{
-	  /* otherwise just send the whole buffer */
-	  end = buffer_bytes;
-	}
-
-      unix_vlib_cli_output_raw (cf, uf, buffer + start, end - start);
-
-      if (cf->crlf_mode)
-	{
-	  if (end < buffer_bytes)
-	    {
-	      unix_vlib_cli_output_raw (cf, uf, (u8 *) "\r\n", 2);
-	      end++;		/* skip the \n that we already sent */
-	    }
-	  start = end;
-	}
-    }
-}
-
-/** @brief Output the CLI prompt */
-static void
-unix_cli_cli_prompt (unix_cli_file_t * cf, unix_file_t * uf)
-{
-  unix_cli_main_t *cm = &unix_cli_main;
-
-  unix_vlib_cli_output_raw (cf, uf, cm->cli_prompt, vec_len (cm->cli_prompt));
-}
-
-/** @brief Output a pager prompt and show number of buffered lines */
-static void
-unix_cli_pager_prompt (unix_cli_file_t * cf, unix_file_t * uf)
-{
-  u8 *prompt;
-  u32 h;
-
-  h = cf->pager_start + (cf->height - 1);
-  if (h > vec_len (cf->pager_index))
-    h = vec_len (cf->pager_index);
-
-  prompt = format (0, "\r%s-- more -- (%d-%d/%d)%s",
-		   cf->ansi_capable ? ANSI_BOLD : "",
-		   cf->pager_start + 1,
-		   h,
-		   vec_len (cf->pager_index),
-		   cf->ansi_capable ? ANSI_RESET : "");
-
-  unix_vlib_cli_output_cooked (cf, uf, prompt, vec_len (prompt));
-
-  vec_free (prompt);
-}
-
-/** @brief Output a pager "skipping" message */
-static void
-unix_cli_pager_message (unix_cli_file_t * cf, unix_file_t * uf,
-			char *message, char *postfix)
-{
-  u8 *prompt;
-
-  prompt = format (0, "\r%s-- %s --%s%s",
-		   cf->ansi_capable ? ANSI_BOLD : "",
-		   message, cf->ansi_capable ? ANSI_RESET : "", postfix);
-
-  unix_vlib_cli_output_cooked (cf, uf, prompt, vec_len (prompt));
-
-  vec_free (prompt);
-}
-
-/** @brief Erase the printed pager prompt */
-static void
-unix_cli_pager_prompt_erase (unix_cli_file_t * cf, unix_file_t * uf)
-{
-  if (cf->ansi_capable)
-    {
-      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\r", 1);
-      unix_vlib_cli_output_cooked (cf, uf,
-				   (u8 *) ANSI_CLEARLINE,
-				   sizeof (ANSI_CLEARLINE) - 1);
-    }
-  else
-    {
-      int i;
-
-      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\r", 1);
-      for (i = 0; i < cf->width - 1; i++)
-	unix_vlib_cli_output_cooked (cf, uf, (u8 *) " ", 1);
-      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\r", 1);
-    }
-}
-
-/** @brief Uses an ANSI escape sequence to move the cursor */
-static void
-unix_cli_ansi_cursor (unix_cli_file_t * cf, unix_file_t * uf, u16 x, u16 y)
-{
-  u8 *str;
-
-  str = format (0, "%s%d;%dH", CSI, y, x);
-
-  unix_vlib_cli_output_cooked (cf, uf, str, vec_len (str));
-
-  vec_free (str);
-}
-
-/** Redraw the currently displayed page of text.
- * @param cf CLI session to redraw the pager buffer of.
- * @param uf Unix file of the CLI session.
- */
-static void
-unix_cli_pager_redraw (unix_cli_file_t * cf, unix_file_t * uf)
-{
-  unix_cli_pager_index_t *pi = NULL;
-  u8 *line = NULL;
-  word i;
-
-  /* No active pager? Do nothing. */
-  if (!vec_len (cf->pager_index))
-    return;
-
-  if (cf->ansi_capable)
-    {
-      /* If we have ANSI, send the clear screen sequence */
-      unix_vlib_cli_output_cooked (cf, uf,
-				   (u8 *) ANSI_CLEAR,
-				   sizeof (ANSI_CLEAR) - 1);
-    }
-  else
-    {
-      /* Otherwise make sure we're on a blank line */
-      unix_cli_pager_prompt_erase (cf, uf);
-    }
-
-  /* (Re-)send the current page of content */
-  for (i = 0; i < cf->height - 1 &&
-       i + cf->pager_start < vec_len (cf->pager_index); i++)
-    {
-      pi = &cf->pager_index[cf->pager_start + i];
-      line = cf->pager_vector[pi->line] + pi->offset;
-
-      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
-    }
-  /* if the last line didn't end in newline, add a newline */
-  if (pi && line[pi->length - 1] != '\n')
-    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
-
-  unix_cli_pager_prompt (cf, uf);
-}
-
-/** @brief Process and add a line to the pager index.
- * In normal operation this function will take the given character string
- * found in @c line and with length @c len_or_index and iterates the over the
- * contents, adding each line of text discovered within it to the
- * pager index. Lines are identified by newlines ("<code>\\n</code>") and by
- * strings longer than the width of the terminal.
- *
- * If instead @c line is @c NULL then @c len_or_index is taken to mean the
- * index of an existing line in the pager buffer; this simply means that the
- * input line does not need to be cloned since we alreayd have it. This is
- * typical if we are reindexing the pager buffer.
- *
- * @param cf           The CLI session whose pager we are adding to.
- * @param line         The string of text to be indexed into the pager buffer.
- *                     If @c line is @c NULL then the mode of operation
- *                     changes slightly; see the description above.
- * @param len_or_index If @c line is a pointer to a string then this parameter
- *                     indicates the length of that string; Otherwise this
- *                     value provides the index in the pager buffer of an
- *                     existing string to be indexed.
- */
-static void
-unix_cli_pager_add_line (unix_cli_file_t * cf, u8 * line, word len_or_index)
-{
-  u8 *p;
-  word i, j, k;
-  word line_index, len;
-  u32 width = cf->width;
-  unix_cli_pager_index_t *pi;
-
-  if (line == NULL)
-    {
-      /* Use a line already in the pager buffer */
-      line_index = len_or_index;
-      p = cf->pager_vector[line_index];
-      len = vec_len (p);
-    }
-  else
-    {
-      len = len_or_index;
-      /* Add a copy of the raw string to the pager buffer */
-      p = vec_new (u8, len);
-      clib_memcpy (p, line, len);
-
-      /* store in pager buffer */
-      line_index = vec_len (cf->pager_vector);
-      vec_add1 (cf->pager_vector, p);
-    }
-
-  i = 0;
-  while (i < len)
-    {
-      /* Find the next line, or run to terminal width, or run to EOL */
-      int l = len - i;
-      j = unix_vlib_findchr ((u8) '\n', p, l < width ? l : width);
-
-      if (j < l && p[j] == '\n')	/* incl \n */
-	j++;
-
-      /* Add the line to the index */
-      k = vec_len (cf->pager_index);
-      vec_validate (cf->pager_index, k);
-      pi = &cf->pager_index[k];
-
-      pi->line = line_index;
-      pi->offset = i;
-      pi->length = j;
-
-      i += j;
-      p += j;
-    }
-}
-
-/** @brief Reindex entire pager buffer.
- * Resets the current pager index and then re-adds the lines in the pager
- * buffer to the index.
- *
- * Additionally this function attempts to retain the current page start
- * line offset by searching for the same top-of-screen line in the new index.
- *
- * @param cf The CLI session whose pager buffer should be reindexed.
- */
-static void
-unix_cli_pager_reindex (unix_cli_file_t * cf)
-{
-  word i, old_line, old_offset;
-  unix_cli_pager_index_t *pi;
-
-  /* If there is nothing in the pager buffer then make sure the index
-   * is empty and move on.
-   */
-  if (cf->pager_vector == 0)
-    {
-      vec_reset_length (cf->pager_index);
-      return;
-    }
-
-  /* Retain a pointer to the current page start line so we can
-   * find it later
-   */
-  pi = &cf->pager_index[cf->pager_start];
-  old_line = pi->line;
-  old_offset = pi->offset;
-
-  /* Re-add the buffered lines to the index */
-  vec_reset_length (cf->pager_index);
-  vec_foreach_index (i, cf->pager_vector)
-  {
-    unix_cli_pager_add_line (cf, NULL, i);
-  }
-
-  /* Attempt to re-locate the previously stored page start line */
-  vec_foreach_index (i, cf->pager_index)
-  {
-    pi = &cf->pager_index[i];
-
-    if (pi->line == old_line &&
-	(pi->offset <= old_offset || pi->offset + pi->length > old_offset))
-      {
-	/* Found it! */
-	cf->pager_start = i;
-	break;
-      }
-  }
-
-  /* In case the start line was not found (rare), ensure the pager start
-   * index is within bounds
-   */
-  if (cf->pager_start >= vec_len (cf->pager_index))
-    {
-      if (!cf->height || vec_len (cf->pager_index) < (cf->height - 1))
-	cf->pager_start = 0;
-      else
-	cf->pager_start = vec_len (cf->pager_index) - (cf->height - 1);
-    }
-}
-
-/** VLIB CLI output function.
- *
- * If the terminal has a pager configured then this function takes care
- * of collating output into the pager buffer; ensuring only the first page
- * is displayed and any lines in excess of the first page are buffered.
- *
- * If the maximum number of index lines in the buffer is exceeded then the
- * pager is cancelled and the contents of the current buffer are sent to the
- * terminal.
- *
- * If there is no pager configured then the output is sent directly to the
- * terminal.
- *
- * @param cli_file_index Index of the CLI session where this output is
- *                       directed.
- * @param buffer         String of printabe bytes to be output.
- * @param buffer_bytes   The number of bytes in @c buffer to be output.
- */
-static void
-unix_vlib_cli_output (uword cli_file_index, u8 * buffer, uword buffer_bytes)
-{
-  unix_main_t *um = &unix_main;
-  unix_cli_main_t *cm = &unix_cli_main;
-  unix_cli_file_t *cf;
-  unix_file_t *uf;
-
-  cf = pool_elt_at_index (cm->cli_file_pool, cli_file_index);
-  uf = pool_elt_at_index (um->file_pool, cf->unix_file_index);
-
-  if (cf->no_pager || um->cli_pager_buffer_limit == 0 || cf->height == 0)
-    {
-      unix_vlib_cli_output_cooked (cf, uf, buffer, buffer_bytes);
-    }
-  else
-    {
-      word row = vec_len (cf->pager_index);
-      u8 *line;
-      unix_cli_pager_index_t *pi;
-
-      /* Index and add the output lines to the pager buffer. */
-      unix_cli_pager_add_line (cf, buffer, buffer_bytes);
-
-      /* Now iterate what was added to display the lines.
-       * If we reach the bottom of the page, display a prompt.
-       */
-      while (row < vec_len (cf->pager_index))
-	{
-	  if (row < cf->height - 1)
-	    {
-	      /* output this line */
-	      pi = &cf->pager_index[row];
-	      line = cf->pager_vector[pi->line] + pi->offset;
-	      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
-
-	      /* if the last line didn't end in newline, and we're at the
-	       * bottom of the page, add a newline */
-	      if (line[pi->length - 1] != '\n' && row == cf->height - 2)
-		unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
-	    }
-	  else
-	    {
-	      /* Display the pager prompt every 10 lines */
-	      if (!(row % 10))
-		unix_cli_pager_prompt (cf, uf);
-	    }
-	  row++;
-	}
-
-      /* Check if we went over the pager buffer limit */
-      if (vec_len (cf->pager_index) > um->cli_pager_buffer_limit)
-	{
-	  /* Stop using the pager for the remainder of this CLI command */
-	  cf->no_pager = 2;
-
-	  /* If we likely printed the prompt, erase it */
-	  if (vec_len (cf->pager_index) > cf->height - 1)
-	    unix_cli_pager_prompt_erase (cf, uf);
-
-	  /* Dump out the contents of the buffer */
-	  for (row = cf->pager_start + (cf->height - 1);
-	       row < vec_len (cf->pager_index); row++)
-	    {
-	      pi = &cf->pager_index[row];
-	      line = cf->pager_vector[pi->line] + pi->offset;
-	      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
-	    }
-
-	  unix_cli_pager_reset (cf);
-	}
-    }
-}
-
-/** Identify whether a terminal type is ANSI capable.
- *
- * Compares the string given in @c term with a list of terminal types known
- * to support ANSI escape sequences.
- *
- * This list contains, for example, @c xterm, @c screen and @c ansi.
- *
- * @param term A string with a terminal type in it.
- * @param len The length of the string in @c term.
- *
- * @return @c 1 if the terminal type is recognized as supporting ANSI
- *         terminal sequences; @c 0 otherwise.
- */
-static u8
-unix_cli_terminal_type (u8 * term, uword len)
-{
-  /* This may later be better done as a hash of some sort. */
-#define _(a) do { \
-    if (strncasecmp(a, (char *)term, (size_t)len) == 0) return 1; \
-  } while(0)
-
-  _("xterm");
-  _("xterm-color");
-  _("xterm-256color");		/* iTerm on Mac */
-  _("screen");
-  _("ansi");			/* Microsoft Telnet */
-#undef _
-
-  return 0;
-}
-
-/** @brief Emit initial welcome banner and prompt on a connection. */
-static void
-unix_cli_file_welcome (unix_cli_main_t * cm, unix_cli_file_t * cf)
-{
-  unix_main_t *um = &unix_main;
-  unix_file_t *uf = pool_elt_at_index (um->file_pool, cf->unix_file_index);
-  unix_cli_banner_t *banner;
-  int i, len;
-
-  /*
-   * Put the first bytes directly into the buffer so that further output is
-   * queued until everything is ready. (oterwise initial prompt can appear
-   * mid way through VPP initialization)
-   */
-  unix_cli_add_pending_output (uf, cf, (u8 *) "\r", 1);
-
-  if (!um->cli_no_banner)
-    {
-      if (cf->ansi_capable)
-	{
-	  banner = unix_cli_banner_color;
-	  len = ARRAY_LEN (unix_cli_banner_color);
-	}
-      else
-	{
-	  banner = unix_cli_banner;
-	  len = ARRAY_LEN (unix_cli_banner);
-	}
-
-      for (i = 0; i < len; i++)
-	{
-	  unix_vlib_cli_output_cooked (cf, uf,
-				       banner[i].line, banner[i].length);
-	}
-    }
-
-  /* Prompt. */
-  unix_cli_cli_prompt (cf, uf);
-
-  cf->started = 1;
-}
-
-/** @brief A failsafe triggered on a timer to ensure we send the prompt
- * to telnet sessions that fail to negotiate the terminal type. */
-static void
-unix_cli_file_welcome_timer (any arg, f64 delay)
-{
-  unix_cli_main_t *cm = &unix_cli_main;
-  unix_cli_file_t *cf;
-  (void) delay;
-
-  /* Check the connection didn't close already */
-  if (pool_is_free_index (cm->cli_file_pool, (uword) arg))
-    return;
-
-  cf = pool_elt_at_index (cm->cli_file_pool, (uword) arg);
-
-  if (!cf->started)
-    unix_cli_file_welcome (cm, cf);
-}
-
-/** @brief A mostly no-op Telnet state machine.
- * Process Telnet command bytes in a way that ensures we're mostly
- * transparent to the Telnet protocol. That is, it's mostly a no-op.
- *
- * @return -1 if we need more bytes, otherwise a positive integer number of
- *          bytes to consume from the input_vector, not including the initial
- *          IAC byte.
- */
-static i32
-unix_cli_process_telnet (unix_main_t * um,
-			 unix_cli_file_t * cf,
-			 unix_file_t * uf, u8 * input_vector, uword len)
-{
-  /* Input_vector starts at IAC byte.
-   * See if we have a complete message; if not, return -1 so we wait for more.
-   * if we have a complete message, consume those bytes from the vector.
-   */
-  i32 consume = 0;
-
-  if (len == 1)
-    return -1;			/* want more bytes */
-
-  switch (input_vector[1])
-    {
-    case IAC:
-      /* two IAC's in a row means to pass through 0xff.
-       * since that makes no sense here, just consume it.
-       */
-      consume = 1;
-      break;
-
-    case WILL:
-    case WONT:
-    case DO:
-    case DONT:
-      /* Expect 3 bytes */
-      if (vec_len (input_vector) < 3)
-	return -1;		/* want more bytes */
-
-      consume = 2;
-      break;
-
-    case SB:
-      {
-	/* Sub option - search ahead for IAC SE to end it */
-	i32 i;
-	for (i = 3; i < len && i < UNIX_CLI_MAX_DEPTH_TELNET; i++)
-	  {
-	    if (input_vector[i - 1] == IAC && input_vector[i] == SE)
-	      {
-		/* We have a complete message; see if we care about it */
-		switch (input_vector[2])
-		  {
-		  case TELOPT_TTYPE:
-		    if (input_vector[3] != 0)
-		      break;
-		    /* See if the terminal type is ANSI capable */
-		    cf->ansi_capable =
-		      unix_cli_terminal_type (input_vector + 4, i - 5);
-		    /* If session not started, we can release the pause */
-		    if (!cf->started)
-		      /* Send the welcome banner and initial prompt */
-		      unix_cli_file_welcome (&unix_cli_main, cf);
-		    break;
-
-		  case TELOPT_NAWS:
-		    /* Window size */
-		    if (i != 8)	/* check message is correct size */
-		      break;
-		    cf->width =
-		      clib_net_to_host_u16 (*((u16 *) (input_vector + 3)));
-		    cf->height =
-		      clib_net_to_host_u16 (*((u16 *) (input_vector + 5)));
-		    /* reindex pager buffer */
-		    unix_cli_pager_reindex (cf);
-		    /* redraw page */
-		    unix_cli_pager_redraw (cf, uf);
-		    break;
-
-		  default:
-		    break;
-		  }
-		/* Consume it all */
-		consume = i;
-		break;
-	      }
-	  }
-
-	if (i == UNIX_CLI_MAX_DEPTH_TELNET)
-	  consume = 1;		/* hit max search depth, advance one byte */
-
-	if (consume == 0)
-	  return -1;		/* want more bytes */
-
-	break;
-      }
-
-    case GA:
-    case EL:
-    case EC:
-    case AO:
-    case IP:
-    case BREAK:
-    case DM:
-    case NOP:
-    case SE:
-    case EOR:
-    case ABORT:
-    case SUSP:
-    case xEOF:
-      /* Simple one-byte messages */
-      consume = 1;
-      break;
-
-    case AYT:
-      /* Are You There - trigger a visible response */
-      consume = 1;
-      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "fd.io VPP\n", 10);
-      break;
-
-    default:
-      /* Unknown command! Eat the IAC byte */
-      break;
-    }
-
-  return consume;
-}
-
-/** @brief Process actionable input.
- * Based on the \c action process the input; this typically involves
- * searching the command history or editing the current command line.
- */
-static int
-unix_cli_line_process_one (unix_cli_main_t * cm,
-			   unix_main_t * um,
-			   unix_cli_file_t * cf,
-			   unix_file_t * uf,
-			   u8 input, unix_cli_parse_action_t action)
-{
-  u8 *prev;
-  int j, delta;
-
-  switch (action)
-    {
-    case UNIX_CLI_PARSE_ACTION_NOACTION:
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_REVSEARCH:
-    case UNIX_CLI_PARSE_ACTION_FWDSEARCH:
-      if (!cf->has_history || !cf->history_limit)
-	break;
-      if (cf->search_mode == 0)
-	{
-	  /* Erase the current command (if any) */
-	  for (j = 0; j < (vec_len (cf->current_command)); j++)
-	    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b \b", 3);
-
-	  vec_reset_length (cf->search_key);
-	  vec_reset_length (cf->current_command);
-	  if (action == UNIX_CLI_PARSE_ACTION_REVSEARCH)
-	    cf->search_mode = -1;
-	  else
-	    cf->search_mode = 1;
-	  cf->cursor = 0;
-	}
-      else
-	{
-	  if (action == UNIX_CLI_PARSE_ACTION_REVSEARCH)
-	    cf->search_mode = -1;
-	  else
-	    cf->search_mode = 1;
-
-	  cf->excursion += cf->search_mode;
-	  goto search_again;
-	}
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_ERASELINELEFT:
-      /* Erase the command from the cursor to the start */
-
-      /* Shimmy forwards to the new end of line position */
-      delta = vec_len (cf->current_command) - cf->cursor;
-      for (j = cf->cursor; j > delta; j--)
-	unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
-      /* Zap from here to the end of what is currently displayed */
-      for (; j < (vec_len (cf->current_command)); j++)
-	unix_vlib_cli_output_cooked (cf, uf, (u8 *) " ", 1);
-      /* Get back to the start of the line */
-      for (j = 0; j < (vec_len (cf->current_command)); j++)
-	unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
-
-      j = vec_len (cf->current_command) - cf->cursor;
-      memmove (cf->current_command, cf->current_command + cf->cursor, j);
-      _vec_len (cf->current_command) = j;
-
-      /* Print the new contents */
-      unix_vlib_cli_output_cooked (cf, uf, cf->current_command, j);
-      /* Shimmy back to the start */
-      for (j = 0; j < (vec_len (cf->current_command)); j++)
-	unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
-      cf->cursor = 0;
-
-      cf->search_mode = 0;
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_ERASELINERIGHT:
-      /* Erase the command from the cursor to the end */
-
-      /* Zap from cursor to end of what is currently displayed */
-      for (j = cf->cursor; j < (vec_len (cf->current_command)); j++)
-	unix_vlib_cli_output_cooked (cf, uf, (u8 *) " ", 1);
-      /* Get back to where we were */
-      for (j = cf->cursor; j < (vec_len (cf->current_command)); j++)
-	unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
-
-      /* Truncate the line at the cursor */
-      _vec_len (cf->current_command) = cf->cursor;
-
-      cf->search_mode = 0;
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_LEFT:
-      if (cf->cursor > 0)
-	{
-	  unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
-	  cf->cursor--;
-	}
-
-      cf->search_mode = 0;
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_RIGHT:
-      if (cf->cursor < vec_len (cf->current_command))
-	{
-	  /* have to emit the character under the cursor */
-	  unix_vlib_cli_output_cooked (cf, uf,
-				       cf->current_command + cf->cursor, 1);
-	  cf->cursor++;
-	}
-
-      cf->search_mode = 0;
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_UP:
-    case UNIX_CLI_PARSE_ACTION_DOWN:
-      if (!cf->has_history || !cf->history_limit)
-	break;
-      cf->search_mode = 0;
-      /* Erase the command */
-      for (j = cf->cursor; j < (vec_len (cf->current_command)); j++)
-	unix_vlib_cli_output_cooked (cf, uf, (u8 *) " ", 1);
-      for (j = 0; j < (vec_len (cf->current_command)); j++)
-	unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b \b", 3);
-      vec_reset_length (cf->current_command);
-      if (vec_len (cf->command_history))
-	{
-	  if (action == UNIX_CLI_PARSE_ACTION_UP)
-	    delta = -1;
-	  else
-	    delta = 1;
-
-	  cf->excursion += delta;
-
-	  if (cf->excursion == vec_len (cf->command_history))
-	    {
-	      /* down-arrowed to last entry - want a blank line */
-	      _vec_len (cf->current_command) = 0;
-	    }
-	  else if (cf->excursion < 0)
-	    {
-	      /* up-arrowed over the start to the end, want a blank line */
-	      cf->excursion = vec_len (cf->command_history);
-	      _vec_len (cf->current_command) = 0;
-	    }
-	  else
-	    {
-	      if (cf->excursion > (i32) vec_len (cf->command_history) - 1)
-		/* down-arrowed past end - wrap to start */
-		cf->excursion = 0;
-
-	      /* Print the command at the current position */
-	      prev = cf->command_history[cf->excursion];
-	      vec_validate (cf->current_command, vec_len (prev) - 1);
-
-	      clib_memcpy (cf->current_command, prev, vec_len (prev));
-	      _vec_len (cf->current_command) = vec_len (prev);
-	      unix_vlib_cli_output_cooked (cf, uf, cf->current_command,
-					   vec_len (cf->current_command));
-	    }
-	  cf->cursor = vec_len (cf->current_command);
-
-	  break;
-	}
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_HOME:
-      if (vec_len (cf->current_command) && cf->cursor > 0)
-	{
-	  while (cf->cursor)
-	    {
-	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
-	      cf->cursor--;
-	    }
-	}
-
-      cf->search_mode = 0;
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_END:
-      if (vec_len (cf->current_command) &&
-	  cf->cursor < vec_len (cf->current_command))
-	{
-	  unix_vlib_cli_output_cooked (cf, uf,
-				       cf->current_command + cf->cursor,
-				       vec_len (cf->current_command) -
-				       cf->cursor);
-	  cf->cursor = vec_len (cf->current_command);
-	}
-
-      cf->search_mode = 0;
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_WORDLEFT:
-      if (vec_len (cf->current_command) && cf->cursor > 0)
-	{
-	  j = cf->cursor;
-
-	  unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
-	  j--;
-
-	  while (j && isspace (cf->current_command[j]))
-	    {
-	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
-	      j--;
-	    }
-	  while (j && !isspace (cf->current_command[j]))
-	    {
-	      if (isspace (cf->current_command[j - 1]))
-		break;
-	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
-	      j--;
-	    }
-
-	  cf->cursor = j;
-	}
-
-      cf->search_mode = 0;
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_WORDRIGHT:
-      if (vec_len (cf->current_command) &&
-	  cf->cursor < vec_len (cf->current_command))
-	{
-	  int e = vec_len (cf->current_command);
-	  j = cf->cursor;
-	  while (j < e && !isspace (cf->current_command[j]))
-	    j++;
-	  while (j < e && isspace (cf->current_command[j]))
-	    j++;
-	  unix_vlib_cli_output_cooked (cf, uf,
-				       cf->current_command + cf->cursor,
-				       j - cf->cursor);
-	  cf->cursor = j;
-	}
-
-      cf->search_mode = 0;
-      break;
-
-
-    case UNIX_CLI_PARSE_ACTION_ERASE:
-      if (vec_len (cf->current_command))
-	{
-	  if (cf->cursor == vec_len (cf->current_command))
-	    {
-	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b \b", 3);
-	      _vec_len (cf->current_command)--;
-	      cf->cursor--;
-	    }
-	  else if (cf->cursor > 0)
-	    {
-	      /* shift everything at & to the right of the cursor left by 1 */
-	      j = vec_len (cf->current_command) - cf->cursor;
-	      memmove (cf->current_command + cf->cursor - 1,
-		       cf->current_command + cf->cursor, j);
-	      _vec_len (cf->current_command)--;
-	      cf->cursor--;
-	      /* redraw the rest of the line */
-	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
-	      unix_vlib_cli_output_cooked (cf, uf,
-					   cf->current_command + cf->cursor,
-					   j);
-	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) " \b\b", 3);
-	      /* and shift the terminal cursor back where it should be */
-	      while (--j)
-		unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
-	    }
-	}
-      cf->search_mode = 0;
-      cf->excursion = 0;
-      vec_reset_length (cf->search_key);
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_ERASERIGHT:
-      if (vec_len (cf->current_command))
-	{
-	  if (cf->cursor < vec_len (cf->current_command))
-	    {
-	      /* shift everything to the right of the cursor left by 1 */
-	      j = vec_len (cf->current_command) - cf->cursor - 1;
-	      memmove (cf->current_command + cf->cursor,
-		       cf->current_command + cf->cursor + 1, j);
-	      _vec_len (cf->current_command)--;
-	      /* redraw the rest of the line */
-	      unix_vlib_cli_output_cooked (cf, uf,
-					   cf->current_command + cf->cursor,
-					   j);
-	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) " \b", 2);
-	      /* and shift the terminal cursor back where it should be */
-	      if (j)
-		{
-		  unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
-		  while (--j)
-		    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
-		}
-	    }
-	}
-      else if (input == 'D' - '@')
-	{
-	  /* ^D with no command entered = quit */
-	  unix_vlib_cli_output_cooked (cf, uf, (u8 *) "quit\n", 5);
-	  vlib_process_signal_event (um->vlib_main,
-				     vlib_current_process (um->vlib_main),
-				     UNIX_CLI_PROCESS_EVENT_QUIT,
-				     cf - cm->cli_file_pool);
-	}
-      cf->search_mode = 0;
-      cf->excursion = 0;
-      vec_reset_length (cf->search_key);
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_CLEAR:
-      /* If we're in ANSI mode, clear the screen.
-       * Then redraw the prompt and any existing command input, then put
-       * the cursor back where it was in that line.
-       */
-      if (cf->ansi_capable)
-	unix_vlib_cli_output_cooked (cf, uf,
-				     (u8 *) ANSI_CLEAR,
-				     sizeof (ANSI_CLEAR) - 1);
-      else
-	unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
-
-      unix_vlib_cli_output_raw (cf, uf,
-				cm->cli_prompt, vec_len (cm->cli_prompt));
-      unix_vlib_cli_output_raw (cf, uf,
-				cf->current_command,
-				vec_len (cf->current_command));
-      for (j = cf->cursor; j < vec_len (cf->current_command); j++)
-	unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b", 1);
-
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_TAB:
-    case UNIX_CLI_PARSE_ACTION_YANK:
-      /* TODO */
-      break;
-
-
-    case UNIX_CLI_PARSE_ACTION_PAGER_QUIT:
-    pager_quit:
-      unix_cli_pager_prompt_erase (cf, uf);
-      unix_cli_pager_reset (cf);
-      unix_cli_cli_prompt (cf, uf);
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_PAGER_NEXT:
-    case UNIX_CLI_PARSE_ACTION_PAGER_PGDN:
-      /* show next page of the buffer */
-      if (cf->height + cf->pager_start < vec_len (cf->pager_index))
-	{
-	  u8 *line = NULL;
-	  unix_cli_pager_index_t *pi = NULL;
-
-	  int m = cf->pager_start + (cf->height - 1);
-	  unix_cli_pager_prompt_erase (cf, uf);
-	  for (j = m;
-	       j < vec_len (cf->pager_index) && cf->pager_start < m;
-	       j++, cf->pager_start++)
-	    {
-	      pi = &cf->pager_index[j];
-	      line = cf->pager_vector[pi->line] + pi->offset;
-	      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
-	    }
-	  /* if the last line didn't end in newline, add a newline */
-	  if (pi && line[pi->length - 1] != '\n')
-	    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
-	  unix_cli_pager_prompt (cf, uf);
-	}
-      else
-	{
-	  if (action == UNIX_CLI_PARSE_ACTION_PAGER_NEXT)
-	    /* no more in buffer, exit, but only if it was <space> */
-	    goto pager_quit;
-	}
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_PAGER_DN:
-    case UNIX_CLI_PARSE_ACTION_PAGER_CRLF:
-      /* display the next line of the buffer */
-      if (cf->pager_start < vec_len (cf->pager_index) - (cf->height - 1))
-	{
-	  u8 *line;
-	  unix_cli_pager_index_t *pi;
-
-	  unix_cli_pager_prompt_erase (cf, uf);
-	  pi = &cf->pager_index[cf->pager_start + (cf->height - 1)];
-	  line = cf->pager_vector[pi->line] + pi->offset;
-	  unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
-	  cf->pager_start++;
-	  /* if the last line didn't end in newline, add a newline */
-	  if (line[pi->length - 1] != '\n')
-	    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
-	  unix_cli_pager_prompt (cf, uf);
-	}
-      else
-	{
-	  if (action == UNIX_CLI_PARSE_ACTION_PAGER_CRLF)
-	    /* no more in buffer, exit, but only if it was <enter> */
-	    goto pager_quit;
-	}
-
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_PAGER_UP:
-      /* scroll the page back one line */
-      if (cf->pager_start > 0)
-	{
-	  u8 *line = NULL;
-	  unix_cli_pager_index_t *pi = NULL;
-
-	  cf->pager_start--;
-	  if (cf->ansi_capable)
-	    {
-	      pi = &cf->pager_index[cf->pager_start];
-	      line = cf->pager_vector[pi->line] + pi->offset;
-	      unix_cli_pager_prompt_erase (cf, uf);
-	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) ANSI_SCROLLDN,
-					   sizeof (ANSI_SCROLLDN) - 1);
-	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) ANSI_SAVECURSOR,
-					   sizeof (ANSI_SAVECURSOR) - 1);
-	      unix_cli_ansi_cursor (cf, uf, 1, 1);
-	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) ANSI_CLEARLINE,
-					   sizeof (ANSI_CLEARLINE) - 1);
-	      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
-	      unix_vlib_cli_output_cooked (cf, uf, (u8 *) ANSI_RESTCURSOR,
-					   sizeof (ANSI_RESTCURSOR) - 1);
-	      unix_cli_pager_prompt_erase (cf, uf);
-	      unix_cli_pager_prompt (cf, uf);
-	    }
-	  else
-	    {
-	      int m = cf->pager_start + (cf->height - 1);
-	      unix_cli_pager_prompt_erase (cf, uf);
-	      for (j = cf->pager_start;
-		   j < vec_len (cf->pager_index) && j < m; j++)
-		{
-		  pi = &cf->pager_index[j];
-		  line = cf->pager_vector[pi->line] + pi->offset;
-		  unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
-		}
-	      /* if the last line didn't end in newline, add a newline */
-	      if (pi && line[pi->length - 1] != '\n')
-		unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
-	      unix_cli_pager_prompt (cf, uf);
-	    }
-	}
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_PAGER_TOP:
-      /* back to the first page of the buffer */
-      if (cf->pager_start > 0)
-	{
-	  u8 *line = NULL;
-	  unix_cli_pager_index_t *pi = NULL;
-
-	  cf->pager_start = 0;
-	  int m = cf->pager_start + (cf->height - 1);
-	  unix_cli_pager_prompt_erase (cf, uf);
-	  for (j = cf->pager_start; j < vec_len (cf->pager_index) && j < m;
-	       j++)
-	    {
-	      pi = &cf->pager_index[j];
-	      line = cf->pager_vector[pi->line] + pi->offset;
-	      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
-	    }
-	  /* if the last line didn't end in newline, add a newline */
-	  if (pi && line[pi->length - 1] != '\n')
-	    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
-	  unix_cli_pager_prompt (cf, uf);
-	}
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_PAGER_BOTTOM:
-      /* skip to the last page of the buffer */
-      if (cf->pager_start < vec_len (cf->pager_index) - (cf->height - 1))
-	{
-	  u8 *line = NULL;
-	  unix_cli_pager_index_t *pi = NULL;
-
-	  cf->pager_start = vec_len (cf->pager_index) - (cf->height - 1);
-	  unix_cli_pager_prompt_erase (cf, uf);
-	  unix_cli_pager_message (cf, uf, "skipping", "\n");
-	  for (j = cf->pager_start; j < vec_len (cf->pager_index); j++)
-	    {
-	      pi = &cf->pager_index[j];
-	      line = cf->pager_vector[pi->line] + pi->offset;
-	      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
-	    }
-	  /* if the last line didn't end in newline, add a newline */
-	  if (pi && line[pi->length - 1] != '\n')
-	    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
-	  unix_cli_pager_prompt (cf, uf);
-	}
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_PAGER_PGUP:
-      /* wander back one page in the buffer */
-      if (cf->pager_start > 0)
-	{
-	  u8 *line = NULL;
-	  unix_cli_pager_index_t *pi = NULL;
-	  int m;
-
-	  if (cf->pager_start >= cf->height)
-	    cf->pager_start -= cf->height - 1;
-	  else
-	    cf->pager_start = 0;
-	  m = cf->pager_start + cf->height - 1;
-	  unix_cli_pager_prompt_erase (cf, uf);
-	  for (j = cf->pager_start; j < vec_len (cf->pager_index) && j < m;
-	       j++)
-	    {
-	      pi = &cf->pager_index[j];
-	      line = cf->pager_vector[pi->line] + pi->offset;
-	      unix_vlib_cli_output_cooked (cf, uf, line, pi->length);
-	    }
-	  /* if the last line didn't end in newline, add a newline */
-	  if (pi && line[pi->length - 1] != '\n')
-	    unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
-	  unix_cli_pager_prompt (cf, uf);
-	}
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_PAGER_REDRAW:
-      /* Redraw the current pager screen */
-      unix_cli_pager_redraw (cf, uf);
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_PAGER_SEARCH:
-      /* search forwards in the buffer */
-      break;
-
-
-    case UNIX_CLI_PARSE_ACTION_CRLF:
-    crlf:
-      unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\n", 1);
-
-      if (cf->has_history && cf->history_limit)
-	{
-	  if (cf->command_history
-	      && vec_len (cf->command_history) >= cf->history_limit)
-	    {
-	      vec_free (cf->command_history[0]);
-	      vec_delete (cf->command_history, 1, 0);
-	    }
-	  /* Don't add blank lines to the cmd history */
-	  if (vec_len (cf->current_command))
-	    {
-	      /* Don't duplicate the previous command */
-	      j = vec_len (cf->command_history);
-	      if (j == 0 ||
-		  (vec_len (cf->current_command) !=
-		   vec_len (cf->command_history[j - 1])
-		   || memcmp (cf->current_command, cf->command_history[j - 1],
-			      vec_len (cf->current_command)) != 0))
-		{
-		  /* copy the command to the history */
-		  u8 *c = 0;
-		  vec_append (c, cf->current_command);
-		  vec_add1 (cf->command_history, c);
-		  cf->command_number++;
-		}
-	    }
-	  cf->excursion = vec_len (cf->command_history);
-	}
-
-      cf->search_mode = 0;
-      vec_reset_length (cf->search_key);
-      cf->cursor = 0;
-
-      return 0;
-
-    case UNIX_CLI_PARSE_ACTION_PARTIALMATCH:
-    case UNIX_CLI_PARSE_ACTION_NOMATCH:
-      if (vec_len (cf->pager_index))
-	{
-	  /* no-op for now */
-	}
-      else if (cf->has_history && cf->search_mode && isprint (input))
-	{
-	  int k, limit, offset;
-	  u8 *item;
-
-	  vec_add1 (cf->search_key, input);
-
-	search_again:
-	  for (j = 0; j < vec_len (cf->command_history); j++)
-	    {
-	      if (cf->excursion > (i32) vec_len (cf->command_history) - 1)
-		cf->excursion = 0;
-	      else if (cf->excursion < 0)
-		cf->excursion = vec_len (cf->command_history) - 1;
-
-	      item = cf->command_history[cf->excursion];
-
-	      limit = (vec_len (cf->search_key) > vec_len (item)) ?
-		vec_len (item) : vec_len (cf->search_key);
-
-	      for (offset = 0; offset <= vec_len (item) - limit; offset++)
-		{
-		  for (k = 0; k < limit; k++)
-		    {
-		      if (item[k + offset] != cf->search_key[k])
-			goto next_offset;
-		    }
-		  goto found_at_offset;
-
-		next_offset:
-		  ;
-		}
-	      goto next;
-
-	    found_at_offset:
-	      for (j = 0; j < vec_len (cf->current_command); j++)
-		unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\b \b", 3);
-
-	      vec_validate (cf->current_command, vec_len (item) - 1);
-	      clib_memcpy (cf->current_command, item, vec_len (item));
-	      _vec_len (cf->current_command) = vec_len (item);
-
-	      unix_vlib_cli_output_cooked (cf, uf, cf->current_command,
-					   vec_len (cf->current_command));
-	      cf->cursor = vec_len (cf->current_command);
-	      goto found;
-
-	    next:
-	      cf->excursion += cf->search_mode;
-	    }
-
-	  unix_vlib_cli_output_cooked (cf, uf, (u8 *) "\nNo match...", 12);
-	  vec_reset_length (cf->search_key);
-	  vec_reset_length (cf->current_command);
-	  cf->search_mode = 0;
-	  cf->cursor = 0;
-	  goto crlf;
-	}
-      else if (isprint (input))	/* skip any errant control codes */
-	{
-	  if (cf->cursor == vec_len (cf->current_command))
-	    {
-	      /* Append to end */
-	      vec_add1 (cf->current_command, input);
-	      cf->cursor++;
-
-	      /* Echo the character back to the client */
-	      unix_vlib_cli_output_raw (cf, uf, &input, 1);
-	    }
-	  else
-	    {
-	      /* Insert at cursor: resize +1 byte, move everything over */
-	      j = vec_len (cf->current_command) - cf->cursor;
-	      vec_add1 (cf->current_command, (u8) 'A');
-	      memmove (cf->current_command + cf->cursor + 1,
-		       cf->current_command + cf->cursor, j);
-	      cf->current_command[cf->cursor] = input;
-	      /* Redraw the line */
-	      j++;
-	      unix_vlib_cli_output_raw (cf, uf,
-					cf->current_command + cf->cursor, j);
-	      /* Put terminal cursor back */
-	      while (--j)
-		unix_vlib_cli_output_raw (cf, uf, (u8 *) "\b", 1);
-	      cf->cursor++;
-	    }
-	}
-      else
-	{
-	  /* no-op - not printable or otherwise not actionable */
-	}
-
-    found:
-
-      break;
-
-    case UNIX_CLI_PARSE_ACTION_TELNETIAC:
-      break;
-    }
-  return 1;
-}
-
-/** @brief Process input bytes on a stream to provide line editing and
- * command history in the CLI. */
-static int
-unix_cli_line_edit (unix_cli_main_t * cm,
-		    unix_main_t * um, unix_cli_file_t * cf)
-{
-  unix_file_t *uf = pool_elt_at_index (um->file_pool, cf->unix_file_index);
-  int i;
-
-  for (i = 0; i < vec_len (cf->input_vector); i++)
-    {
-      unix_cli_parse_action_t action;
-      i32 matched = 0;
-      unix_cli_parse_actions_t *a;
-
-      /* If we're in the pager mode, search the pager actions */
-      a =
-	vec_len (cf->pager_index) ? unix_cli_parse_pager :
-	unix_cli_parse_strings;
-
-      /* See if the input buffer is some sort of control code */
-      action = unix_cli_match_action (a, &cf->input_vector[i],
-				      vec_len (cf->input_vector) - i,
-				      &matched);
-
-      switch (action)
-	{
-	case UNIX_CLI_PARSE_ACTION_PARTIALMATCH:
-	  if (i)
-	    {
-	      /* There was a partial match which means we need more bytes
-	       * than the input buffer currently has.
-	       * Since the bytes before here have been processed, shift
-	       * the remaining contents to the start of the input buffer.
-	       */
-	      vec_delete (cf->input_vector, i, 0);
-	    }
-	  return 1;		/* wait for more */
-
-	case UNIX_CLI_PARSE_ACTION_TELNETIAC:
-	  /* process telnet options */
-	  matched = unix_cli_process_telnet (um, cf, uf,
-					     cf->input_vector + i,
-					     vec_len (cf->input_vector) - i);
-	  if (matched < 0)
-	    {
-	      if (i)
-		{
-		  /* There was a partial match which means we need more bytes
-		   * than the input buffer currently has.
-		   * Since the bytes before here have been processed, shift
-		   * the remaining contents to the start of the input buffer.
-		   */
-		  vec_delete (cf->input_vector, i, 0);
-		}
-	      return 1;		/* wait for more */
-	    }
-	  break;
-
-	default:
-	  /* process the action */
-	  if (!unix_cli_line_process_one (cm, um, cf, uf,
-					  cf->input_vector[i], action))
-	    {
-	      /* CRLF found. Consume the bytes from the input_vector */
-	      vec_delete (cf->input_vector, i + matched, 0);
-	      /* And tell our caller to execute cf->input_command */
-	      return 0;
-	    }
-	}
-
-      i += matched;
-    }
-
-  vec_reset_length (cf->input_vector);
-  return 1;
-}
-
-/** @brief Process input to a CLI session. */
-static void
-unix_cli_process_input (unix_cli_main_t * cm, uword cli_file_index)
-{
-  unix_main_t *um = &unix_main;
-  unix_file_t *uf;
-  unix_cli_file_t *cf = pool_elt_at_index (cm->cli_file_pool, cli_file_index);
-  unformat_input_t input;
-  int vlib_parse_eval (u8 *);
-
-more:
-  /* Try vlibplex first.  Someday... */
-  if (0 && vlib_parse_eval (cf->input_vector) == 0)
-    goto done;
-
-  if (cf->line_mode)
-    {
-      /* just treat whatever we got as a complete line of input */
-      cf->current_command = cf->input_vector;
-    }
-  else
-    {
-      /* Line edit, echo, etc. */
-      if (unix_cli_line_edit (cm, um, cf))
-	/* want more input */
-	return;
-    }
-
-  if (um->log_fd)
-    {
-      static u8 *lv;
-      vec_reset_length (lv);
-      lv = format (lv, "%U[%d]: %v",
-		   format_timeval, 0 /* current bat-time */ ,
-		   0 /* current bat-format */ ,
-		   cli_file_index, cf->input_vector);
-      {
-	int rv __attribute__ ((unused)) =
-	  write (um->log_fd, lv, vec_len (lv));
-      }
-    }
-
-  /* Copy our input command to a new string */
-  unformat_init_vector (&input, cf->current_command);
-
-  /* Remove leading white space from input. */
-  (void) unformat (&input, "");
-
-  cm->current_input_file_index = cli_file_index;
-  cf->pager_start = 0;		/* start a new pager session */
-
-  if (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
-    vlib_cli_input (um->vlib_main, &input, unix_vlib_cli_output,
-		    cli_file_index);
-
-  /* Zero buffer since otherwise unformat_free will call vec_free on it. */
-  input.buffer = 0;
-
-  unformat_free (&input);
-
-  /* Re-fetch pointer since pool may have moved. */
-  cf = pool_elt_at_index (cm->cli_file_pool, cli_file_index);
-  uf = pool_elt_at_index (um->file_pool, cf->unix_file_index);
-
-done:
-  /* reset vector; we'll re-use it later  */
-  if (cf->line_mode)
-    vec_reset_length (cf->input_vector);
-  else
-    vec_reset_length (cf->current_command);
-
-  if (cf->no_pager == 2)
-    {
-      /* Pager was programmatically disabled */
-      unix_cli_pager_message (cf, uf, "pager buffer overflowed", "\n");
-      cf->no_pager = um->cli_no_pager;
-    }
-
-  if (vec_len (cf->pager_index) == 0
-      || vec_len (cf->pager_index) < cf->height)
-    {
-      /* There was no need for the pager */
-      unix_cli_pager_reset (cf);
-
-      /* Prompt. */
-      unix_cli_cli_prompt (cf, uf);
-    }
-  else
-    {
-      /* Display the pager prompt */
-      unix_cli_pager_prompt (cf, uf);
-    }
-
-  /* Any residual data in the input vector? */
-  if (vec_len (cf->input_vector))
-    goto more;
-}
-
-/** Destroy a CLI session.
- * @note If we destroy the @c stdin session this additionally signals
- *       the shutdown of VPP.
- */
-static void
-unix_cli_kill (unix_cli_main_t * cm, uword cli_file_index)
-{
-  unix_main_t *um = &unix_main;
-  unix_cli_file_t *cf;
-  unix_file_t *uf;
-  int i;
-
-  cf = pool_elt_at_index (cm->cli_file_pool, cli_file_index);
-  uf = pool_elt_at_index (um->file_pool, cf->unix_file_index);
-
-  /* Quit/EOF on stdin means quit program. */
-  if (uf->file_descriptor == UNIX_CLI_STDIN_FD)
-    clib_longjmp (&um->vlib_main->main_loop_exit, VLIB_MAIN_LOOP_EXIT_CLI);
-
-  vec_free (cf->current_command);
-  vec_free (cf->search_key);
-
-  for (i = 0; i < vec_len (cf->command_history); i++)
-    vec_free (cf->command_history[i]);
-
-  vec_free (cf->command_history);
-
-  unix_file_del (um, uf);
-
-  unix_cli_file_free (cf);
-  pool_put (cm->cli_file_pool, cf);
-}
-
-/** Handle system events. */
-static uword
-unix_cli_process (vlib_main_t * vm,
-		  vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  unix_cli_main_t *cm = &unix_cli_main;
-  uword i, *data = 0;
-
-  while (1)
-    {
-      unix_cli_process_event_type_t event_type;
-      vlib_process_wait_for_event (vm);
-      event_type = vlib_process_get_events (vm, &data);
-
-      switch (event_type)
-	{
-	case UNIX_CLI_PROCESS_EVENT_READ_READY:
-	  for (i = 0; i < vec_len (data); i++)
-	    unix_cli_process_input (cm, data[i]);
-	  break;
-
-	case UNIX_CLI_PROCESS_EVENT_QUIT:
-	  /* Kill this process. */
-	  for (i = 0; i < vec_len (data); i++)
-	    unix_cli_kill (cm, data[i]);
-	  goto done;
-	}
-
-      if (data)
-	_vec_len (data) = 0;
-    }
-
-done:
-  vec_free (data);
-
-  vlib_node_set_state (vm, rt->node_index, VLIB_NODE_STATE_DISABLED);
-
-  /* Add node index so we can re-use this process later. */
-  vec_add1 (cm->unused_cli_process_node_indices, rt->node_index);
-
-  return 0;
-}
-
-/** Called when a CLI session file descriptor can be written to without
- * blocking. */
-static clib_error_t *
-unix_cli_write_ready (unix_file_t * uf)
-{
-  unix_cli_main_t *cm = &unix_cli_main;
-  unix_cli_file_t *cf;
-  int n;
-
-  cf = pool_elt_at_index (cm->cli_file_pool, uf->private_data);
-
-  /* Flush output vector. */
-  n = write (uf->file_descriptor,
-	     cf->output_vector, vec_len (cf->output_vector));
-
-  if (n < 0 && errno != EAGAIN)
-    return clib_error_return_unix (0, "write");
-
-  else if (n > 0)
-    unix_cli_del_pending_output (uf, cf, n);
-
-  return /* no error */ 0;
-}
-
-/** Called when a CLI session file descriptor has data to be read. */
-static clib_error_t *
-unix_cli_read_ready (unix_file_t * uf)
-{
-  unix_main_t *um = &unix_main;
-  unix_cli_main_t *cm = &unix_cli_main;
-  unix_cli_file_t *cf;
-  uword l;
-  int n, n_read, n_try;
-
-  cf = pool_elt_at_index (cm->cli_file_pool, uf->private_data);
-
-  n = n_try = 4096;
-  while (n == n_try)
-    {
-      l = vec_len (cf->input_vector);
-      vec_resize (cf->input_vector, l + n_try);
-
-      n = read (uf->file_descriptor, cf->input_vector + l, n_try);
-
-      /* Error? */
-      if (n < 0 && errno != EAGAIN)
-	return clib_error_return_unix (0, "read");
-
-      n_read = n < 0 ? 0 : n;
-      _vec_len (cf->input_vector) = l + n_read;
-    }
-
-  if (!(n < 0))
-    vlib_process_signal_event (um->vlib_main,
-			       cf->process_node_index,
-			       (n_read == 0
-				? UNIX_CLI_PROCESS_EVENT_QUIT
-				: UNIX_CLI_PROCESS_EVENT_READ_READY),
-			       /* event data */ uf->private_data);
-
-  return /* no error */ 0;
-}
-
-/** Store a new CLI session.
- * @param name The name of the session.
- * @param fd   The file descriptor for the session I/O.
- * @return The session ID.
- */
-static u32
-unix_cli_file_add (unix_cli_main_t * cm, char *name, int fd)
-{
-  unix_main_t *um = &unix_main;
-  unix_cli_file_t *cf;
-  unix_file_t template = { 0 };
-  vlib_main_t *vm = um->vlib_main;
-  vlib_node_t *n;
-
-  name = (char *) format (0, "unix-cli-%s", name);
-
-  if (vec_len (cm->unused_cli_process_node_indices) > 0)
-    {
-      uword l = vec_len (cm->unused_cli_process_node_indices);
-
-      /* Find node and give it new name. */
-      n = vlib_get_node (vm, cm->unused_cli_process_node_indices[l - 1]);
-      vec_free (n->name);
-      n->name = (u8 *) name;
-
-      vlib_node_set_state (vm, n->index, VLIB_NODE_STATE_POLLING);
-
-      _vec_len (cm->unused_cli_process_node_indices) = l - 1;
-    }
-  else
-    {
-      static vlib_node_registration_t r = {
-	.function = unix_cli_process,
-	.type = VLIB_NODE_TYPE_PROCESS,
-	.process_log2_n_stack_bytes = 16,
-      };
-
-      r.name = name;
-      vlib_register_node (vm, &r);
-      vec_free (name);
-
-      n = vlib_get_node (vm, r.index);
-    }
-
-  pool_get (cm->cli_file_pool, cf);
-  memset (cf, 0, sizeof (*cf));
-
-  template.read_function = unix_cli_read_ready;
-  template.write_function = unix_cli_write_ready;
-  template.file_descriptor = fd;
-  template.private_data = cf - cm->cli_file_pool;
-
-  cf->process_node_index = n->index;
-  cf->unix_file_index = unix_file_add (um, &template);
-  cf->output_vector = 0;
-  cf->input_vector = 0;
-
-  vlib_start_process (vm, n->runtime_index);
-
-  vlib_process_t *p = vlib_get_process_from_node (vm, n);
-  p->output_function = unix_vlib_cli_output;
-  p->output_function_arg = cf - cm->cli_file_pool;
-
-  return cf - cm->cli_file_pool;
-}
-
-/** Telnet listening socket has a new connection. */
-static clib_error_t *
-unix_cli_listen_read_ready (unix_file_t * uf)
-{
-  unix_main_t *um = &unix_main;
-  unix_cli_main_t *cm = &unix_cli_main;
-  clib_socket_t *s = &um->cli_listen_socket;
-  clib_socket_t client;
-  char *client_name;
-  clib_error_t *error;
-  unix_cli_file_t *cf;
-  u32 cf_index;
-
-  error = clib_socket_accept (s, &client);
-  if (error)
-    return error;
-
-  client_name = (char *) format (0, "%U%c", format_sockaddr, &client.peer, 0);
-
-  cf_index = unix_cli_file_add (cm, client_name, client.fd);
-  cf = pool_elt_at_index (cm->cli_file_pool, cf_index);
-
-  /* No longer need CLIB version of socket. */
-  clib_socket_free (&client);
-
-  vec_free (client_name);
-
-  /* if we're supposed to run telnet session in character mode (default) */
-  if (um->cli_line_mode == 0)
-    {
-      /*
-       * Set telnet client character mode, echo on, suppress "go-ahead".
-       * Technically these should be negotiated, but this works.
-       */
-      u8 charmode_option[] = {
-	IAC, WONT, TELOPT_LINEMODE,	/* server will do char-by-char */
-	IAC, DONT, TELOPT_LINEMODE,	/* client should do char-by-char */
-	IAC, WILL, TELOPT_SGA,	/* server willl supress GA */
-	IAC, DO, TELOPT_SGA,	/* client should supress Go Ahead */
-	IAC, WILL, TELOPT_ECHO,	/* server will do echo */
-	IAC, DONT, TELOPT_ECHO,	/* client should not echo */
-	IAC, DO, TELOPT_TTYPE,	/* client should tell us its term type */
-	IAC, SB, TELOPT_TTYPE, 1, IAC, SE,	/* now tell me ttype */
-	IAC, DO, TELOPT_NAWS,	/* client should tell us its window sz */
-	IAC, SB, TELOPT_NAWS, 1, IAC, SE,	/* now tell me window size */
-      };
-
-      /* Enable history on this CLI */
-      cf->history_limit = um->cli_history_limit;
-      cf->has_history = cf->history_limit != 0;
-
-      /* Make sure this session is in line mode */
-      cf->line_mode = 0;
-
-      /* We need CRLF */
-      cf->crlf_mode = 1;
-
-      /* Setup the pager */
-      cf->no_pager = um->cli_no_pager;
-
-      uf = pool_elt_at_index (um->file_pool, cf->unix_file_index);
-
-      /* Send the telnet options */
-      unix_vlib_cli_output_raw (cf, uf, charmode_option,
-				ARRAY_LEN (charmode_option));
-
-      /* In case the client doesn't negotiate terminal type, use
-       * a timer to kick off the initial prompt. */
-      timer_call (unix_cli_file_welcome_timer, cf_index, 1);
-    }
-
-  return error;
-}
-
-/** The system terminal has informed us that the window size
- * has changed.
- */
-static void
-unix_cli_resize_interrupt (int signum)
-{
-  unix_main_t *um = &unix_main;
-  unix_cli_main_t *cm = &unix_cli_main;
-  unix_cli_file_t *cf = pool_elt_at_index (cm->cli_file_pool,
-					   cm->stdin_cli_file_index);
-  unix_file_t *uf = pool_elt_at_index (um->file_pool, cf->unix_file_index);
-  struct winsize ws;
-  (void) signum;
-
-  /* Terminal resized, fetch the new size */
-  if (ioctl (UNIX_CLI_STDIN_FD, TIOCGWINSZ, &ws) < 0)
-    {
-      /* "Should never happen..." */
-      clib_unix_warning ("TIOCGWINSZ");
-      /* We can't trust ws.XXX... */
-      return;
-    }
-  cf->width = ws.ws_col;
-  cf->height = ws.ws_row;
-
-  /* Reindex the pager buffer */
-  unix_cli_pager_reindex (cf);
-
-  /* Redraw the page */
-  unix_cli_pager_redraw (cf, uf);
-}
-
-/** Handle configuration directives in the @em unix section. */
-static clib_error_t *
-unix_cli_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  unix_main_t *um = &unix_main;
-  unix_cli_main_t *cm = &unix_cli_main;
-  int flags;
-  clib_error_t *error = 0;
-  unix_cli_file_t *cf;
-  u32 cf_index;
-  struct termios tio;
-  struct sigaction sa;
-  struct winsize ws;
-  u8 *term;
-
-  /* We depend on unix flags being set. */
-  if ((error = vlib_call_config_function (vm, unix_config)))
-    return error;
-
-  if (um->flags & UNIX_FLAG_INTERACTIVE)
-    {
-      /* Set stdin to be non-blocking. */
-      if ((flags = fcntl (UNIX_CLI_STDIN_FD, F_GETFL, 0)) < 0)
-	flags = 0;
-      (void) fcntl (UNIX_CLI_STDIN_FD, F_SETFL, flags | O_NONBLOCK);
-
-      cf_index = unix_cli_file_add (cm, "stdin", UNIX_CLI_STDIN_FD);
-      cf = pool_elt_at_index (cm->cli_file_pool, cf_index);
-      cm->stdin_cli_file_index = cf_index;
-
-      /* If stdin is a tty and we are using chacracter mode, enable
-       * history on the CLI and set the tty line discipline accordingly. */
-      if (isatty (UNIX_CLI_STDIN_FD) && um->cli_line_mode == 0)
-	{
-	  /* Capture terminal resize events */
-	  memset (&sa, 0, sizeof (sa));
-	  sa.sa_handler = unix_cli_resize_interrupt;
-	  if (sigaction (SIGWINCH, &sa, 0) < 0)
-	    clib_panic ("sigaction");
-
-	  /* Retrieve the current terminal size */
-	  ioctl (UNIX_CLI_STDIN_FD, TIOCGWINSZ, &ws);
-	  cf->width = ws.ws_col;
-	  cf->height = ws.ws_row;
-
-	  if (cf->width == 0 || cf->height == 0)
-	    /* We have a tty, but no size. Stick to line mode. */
-	    goto notty;
-
-	  /* Setup the history */
-	  cf->history_limit = um->cli_history_limit;
-	  cf->has_history = cf->history_limit != 0;
-
-	  /* Setup the pager */
-	  cf->no_pager = um->cli_no_pager;
-
-	  /* We're going to be in char by char mode */
-	  cf->line_mode = 0;
-
-	  /* Save the original tty state so we can restore it later */
-	  tcgetattr (UNIX_CLI_STDIN_FD, &um->tio_stdin);
-	  um->tio_isset = 1;
-
-	  /* Tweak the tty settings */
-	  tio = um->tio_stdin;
-	  /* echo off, canonical mode off, ext'd input processing off */
-	  tio.c_lflag &= ~(ECHO | ICANON | IEXTEN);
-	  tio.c_cc[VMIN] = 1;	/* 1 byte at a time */
-	  tio.c_cc[VTIME] = 0;	/* no timer */
-	  tcsetattr (UNIX_CLI_STDIN_FD, TCSAFLUSH, &tio);
-
-	  /* See if we can do ANSI/VT100 output */
-	  term = (u8 *) getenv ("TERM");
-	  if (term != NULL)
-	    cf->ansi_capable = unix_cli_terminal_type (term,
-						       strlen ((char *)
-							       term));
-	}
-      else
-	{
-	notty:
-	  /* No tty, so make sure these things are off */
-	  cf->no_pager = 1;
-	  cf->history_limit = 0;
-	  cf->has_history = 0;
-	  cf->line_mode = 1;
-	}
-
-      /* Send banner and initial prompt */
-      unix_cli_file_welcome (cm, cf);
-    }
-
-  /* If we have socket config, LISTEN, otherwise, don't */
-  clib_socket_t *s = &um->cli_listen_socket;
-  if (s->config && s->config[0] != 0)
-    {
-      /* CLI listen. */
-      unix_file_t template = { 0 };
-
-      s->flags = SOCKET_IS_SERVER;	/* listen, don't connect */
-      error = clib_socket_init (s);
-
-      if (error)
-	return error;
-
-      template.read_function = unix_cli_listen_read_ready;
-      template.file_descriptor = s->fd;
-
-      unix_file_add (um, &template);
-    }
-
-  /* Set CLI prompt. */
-  if (!cm->cli_prompt)
-    cm->cli_prompt = format (0, "VLIB: ");
-
-  return 0;
-}
-
-/*?
- * This module has no configurable parameters.
-?*/
-VLIB_CONFIG_FUNCTION (unix_cli_config, "unix-cli");
-
-/** Called when VPP is shutting down, this restores the system
- * terminal state if previously saved.
- */
-static clib_error_t *
-unix_cli_exit (vlib_main_t * vm)
-{
-  unix_main_t *um = &unix_main;
-
-  /* If stdin is a tty and we saved the tty state, reset the tty state */
-  if (isatty (UNIX_CLI_STDIN_FD) && um->tio_isset)
-    tcsetattr (UNIX_CLI_STDIN_FD, TCSAFLUSH, &um->tio_stdin);
-
-  return 0;
-}
-
-VLIB_MAIN_LOOP_EXIT_FUNCTION (unix_cli_exit);
-
-/** Set the CLI prompt.
- * @param prompt The C string to set the prompt to.
- * @note This setting is global; it impacts all current
- *       and future CLI sessions.
- */
-void
-vlib_unix_cli_set_prompt (char *prompt)
-{
-  char *fmt = (prompt[strlen (prompt) - 1] == ' ') ? "%s" : "%s ";
-  unix_cli_main_t *cm = &unix_cli_main;
-  if (cm->cli_prompt)
-    vec_free (cm->cli_prompt);
-  cm->cli_prompt = format (0, fmt, prompt);
-}
-
-/** CLI command to quit the terminal session.
- * @note If this is a stdin session then this will
- *       shutdown VPP also.
- */
-static clib_error_t *
-unix_cli_quit (vlib_main_t * vm,
-	       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unix_cli_main_t *cm = &unix_cli_main;
-
-  vlib_process_signal_event (vm,
-			     vlib_current_process (vm),
-			     UNIX_CLI_PROCESS_EVENT_QUIT,
-			     cm->current_input_file_index);
-  return 0;
-}
-
-/*?
- * Terminates the current CLI session.
- *
- * If VPP is running in @em interactive mode and this is the console session
- * (that is, the session on @c stdin) then this will also terminate VPP.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (unix_cli_quit_command, static) = {
-  .path = "quit",
-  .short_help = "Exit CLI",
-  .function = unix_cli_quit,
-};
-/* *INDENT-ON* */
-
-/** CLI command to execute a VPP command script. */
-static clib_error_t *
-unix_cli_exec (vlib_main_t * vm,
-	       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  char *file_name;
-  int fd;
-  unformat_input_t sub_input;
-  clib_error_t *error;
-
-  file_name = 0;
-  fd = -1;
-  error = 0;
-
-  if (!unformat (input, "%s", &file_name))
-    {
-      error = clib_error_return (0, "expecting file name, got `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  fd = open (file_name, O_RDONLY);
-  if (fd < 0)
-    {
-      error = clib_error_return_unix (0, "failed to open `%s'", file_name);
-      goto done;
-    }
-
-  /* Make sure its a regular file. */
-  {
-    struct stat s;
-
-    if (fstat (fd, &s) < 0)
-      {
-	error = clib_error_return_unix (0, "failed to stat `%s'", file_name);
-	goto done;
-      }
-
-    if (!(S_ISREG (s.st_mode) || S_ISLNK (s.st_mode)))
-      {
-	error = clib_error_return (0, "not a regular file `%s'", file_name);
-	goto done;
-      }
-  }
-
-  unformat_init_unix_file (&sub_input, fd);
-
-  vlib_cli_input (vm, &sub_input, 0, 0);
-  unformat_free (&sub_input);
-
-done:
-  if (fd > 0)
-    close (fd);
-  vec_free (file_name);
-
-  return error;
-}
-
-/*?
- * Executes a sequence of CLI commands which are read from a file.
- *
- * If a command is unrecognised or otherwise invalid then the usual CLI
- * feedback will be generated, however execution of subsequent commands
- * from the file will continue.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_exec, static) = {
-  .path = "exec",
-  .short_help = "Execute commands from file",
-  .function = unix_cli_exec,
-  .is_mp_safe = 1,
-};
-/* *INDENT-ON* */
-
-/** CLI command to show various unix error statistics. */
-static clib_error_t *
-unix_show_errors (vlib_main_t * vm,
-		  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unix_main_t *um = &unix_main;
-  clib_error_t *error = 0;
-  int i, n_errors_to_show;
-  unix_error_history_t *unix_errors = 0;
-
-  n_errors_to_show = 1 << 30;
-
-  if (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (!unformat (input, "%d", &n_errors_to_show))
-	{
-	  error =
-	    clib_error_return (0,
-			       "expecting integer number of errors to show, got `%U'",
-			       format_unformat_error, input);
-	  goto done;
-	}
-    }
-
-  n_errors_to_show =
-    clib_min (ARRAY_LEN (um->error_history), n_errors_to_show);
-
-  i =
-    um->error_history_index >
-    0 ? um->error_history_index - 1 : ARRAY_LEN (um->error_history) - 1;
-
-  while (n_errors_to_show > 0)
-    {
-      unix_error_history_t *eh = um->error_history + i;
-
-      if (!eh->error)
-	break;
-
-      vec_add1 (unix_errors, eh[0]);
-      n_errors_to_show -= 1;
-      if (i == 0)
-	i = ARRAY_LEN (um->error_history) - 1;
-      else
-	i--;
-    }
-
-  if (vec_len (unix_errors) == 0)
-    vlib_cli_output (vm, "no Unix errors so far");
-  else
-    {
-      vlib_cli_output (vm, "%Ld total errors seen", um->n_total_errors);
-      for (i = vec_len (unix_errors) - 1; i >= 0; i--)
-	{
-	  unix_error_history_t *eh = vec_elt_at_index (unix_errors, i);
-	  vlib_cli_output (vm, "%U: %U",
-			   format_time_interval, "h:m:s:u", eh->time,
-			   format_clib_error, eh->error);
-	}
-      vlib_cli_output (vm, "%U: time now",
-		       format_time_interval, "h:m:s:u", vlib_time_now (vm));
-    }
-
-done:
-  vec_free (unix_errors);
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_unix_show_errors, static) = {
-  .path = "show unix-errors",
-  .short_help = "Show Unix system call error history",
-  .function = unix_show_errors,
-};
-/* *INDENT-ON* */
-
-/** CLI command to show session command history. */
-static clib_error_t *
-unix_cli_show_history (vlib_main_t * vm,
-		       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unix_cli_main_t *cm = &unix_cli_main;
-  unix_cli_file_t *cf;
-  int i, j;
-
-  cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
-
-  if (cf->has_history && cf->history_limit)
-    {
-      i = 1 + cf->command_number - vec_len (cf->command_history);
-      for (j = 0; j < vec_len (cf->command_history); j++)
-	vlib_cli_output (vm, "%d  %v\n", i + j, cf->command_history[j]);
-    }
-  else
-    {
-      vlib_cli_output (vm, "History not enabled.\n");
-    }
-
-  return 0;
-}
-
-/*?
- * Displays the command history for the current session, if any.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_unix_cli_show_history, static) = {
-  .path = "history",
-  .short_help = "Show current session command history",
-  .function = unix_cli_show_history,
-};
-/* *INDENT-ON* */
-
-/** CLI command to show terminal status. */
-static clib_error_t *
-unix_cli_show_terminal (vlib_main_t * vm,
-			unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unix_main_t *um = &unix_main;
-  unix_cli_main_t *cm = &unix_cli_main;
-  unix_cli_file_t *cf;
-  vlib_node_t *n;
-
-  cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
-  n = vlib_get_node (vm, cf->process_node_index);
-
-  vlib_cli_output (vm, "Terminal name:   %v\n", n->name);
-  vlib_cli_output (vm, "Terminal mode:   %s\n", cf->line_mode ?
-		   "line-by-line" : "char-by-char");
-  vlib_cli_output (vm, "Terminal width:  %d\n", cf->width);
-  vlib_cli_output (vm, "Terminal height: %d\n", cf->height);
-  vlib_cli_output (vm, "ANSI capable:    %s\n",
-		   cf->ansi_capable ? "yes" : "no");
-  vlib_cli_output (vm, "History enabled: %s%s\n",
-		   cf->has_history ? "yes" : "no", !cf->has_history
-		   || cf->history_limit ? "" :
-		   " (disabled by history limit)");
-  if (cf->has_history)
-    vlib_cli_output (vm, "History limit:   %d\n", cf->history_limit);
-  vlib_cli_output (vm, "Pager enabled:   %s%s%s\n",
-		   cf->no_pager ? "no" : "yes",
-		   cf->no_pager
-		   || cf->height ? "" : " (disabled by terminal height)",
-		   cf->no_pager
-		   || um->cli_pager_buffer_limit ? "" :
-		   " (disabled by buffer limit)");
-  if (!cf->no_pager)
-    vlib_cli_output (vm, "Pager limit:     %d\n", um->cli_pager_buffer_limit);
-  vlib_cli_output (vm, "CRLF mode:       %s\n",
-		   cf->crlf_mode ? "CR+LF" : "LF");
-
-  return 0;
-}
-
-/*?
- * Displays various information about the state of the current terminal
- * session.
- *
- * @cliexpar
- * @cliexstart{show terminal}
- * Terminal name:   unix-cli-stdin
- * Terminal mode:   char-by-char
- * Terminal width:  123
- * Terminal height: 48
- * ANSI capable:    yes
- * History enabled: yes
- * History limit:   50
- * Pager enabled:   yes
- * Pager limit:     100000
- * CRLF mode:       LF
- * @cliexend
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_unix_cli_show_terminal, static) = {
-  .path = "show terminal",
-  .short_help = "Show current session terminal settings",
-  .function = unix_cli_show_terminal,
-};
-/* *INDENT-ON* */
-
-/** CLI command to set terminal pager settings. */
-static clib_error_t *
-unix_cli_set_terminal_pager (vlib_main_t * vm,
-			     unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  unix_main_t *um = &unix_main;
-  unix_cli_main_t *cm = &unix_cli_main;
-  unix_cli_file_t *cf;
-  unformat_input_t _line_input, *line_input = &_line_input;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "on"))
-	cf->no_pager = 0;
-      else if (unformat (line_input, "off"))
-	cf->no_pager = 1;
-      else if (unformat (line_input, "limit %u", &um->cli_pager_buffer_limit))
-	vlib_cli_output (vm,
-			 "Pager limit set to %u lines; note, this is global.\n",
-			 um->cli_pager_buffer_limit);
-      else
-	return clib_error_return (0, "unknown parameter: `%U`",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  return 0;
-}
-
-/*?
- * Enables or disables the terminal pager for this session. Generally
- * this defaults to enabled.
- *
- * Additionally allows the pager buffer size to be set; though note that
- * this value is set globally and not per session.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_unix_cli_set_terminal_pager, static) = {
-  .path = "set terminal pager",
-  .short_help = "set terminal pager [on|off] [limit <lines>]",
-  .function = unix_cli_set_terminal_pager,
-};
-/* *INDENT-ON* */
-
-/** CLI command to set terminal history settings. */
-static clib_error_t *
-unix_cli_set_terminal_history (vlib_main_t * vm,
-			       unformat_input_t * input,
-			       vlib_cli_command_t * cmd)
-{
-  unix_cli_main_t *cm = &unix_cli_main;
-  unix_cli_file_t *cf;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u32 limit;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "on"))
-	cf->has_history = 1;
-      else if (unformat (line_input, "off"))
-	cf->has_history = 0;
-      else if (unformat (line_input, "limit %u", &cf->history_limit))
-	;
-      else
-	return clib_error_return (0, "unknown parameter: `%U`",
-				  format_unformat_error, line_input);
-
-      /* If we reduced history size, or turned it off, purge the history */
-      limit = cf->has_history ? cf->history_limit : 0;
-
-      while (cf->command_history && vec_len (cf->command_history) >= limit)
-	{
-	  vec_free (cf->command_history[0]);
-	  vec_delete (cf->command_history, 1, 0);
-	}
-    }
-
-  unformat_free (line_input);
-
-  return 0;
-}
-
-/*?
- * Enables or disables the command history function of the current
- * terminal. Generally this defaults to enabled.
- *
- * This command also allows the maximum size of the history buffer for
- * this session to be altered.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_unix_cli_set_terminal_history, static) = {
-  .path = "set terminal history",
-  .short_help = "set terminal history [on|off] [limit <lines>]",
-  .function = unix_cli_set_terminal_history,
-};
-/* *INDENT-ON* */
-
-/** CLI command to set terminal ANSI settings. */
-static clib_error_t *
-unix_cli_set_terminal_ansi (vlib_main_t * vm,
-			    unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-  unix_cli_main_t *cm = &unix_cli_main;
-  unix_cli_file_t *cf;
-
-  cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
-
-  if (unformat (input, "on"))
-    cf->ansi_capable = 1;
-  else if (unformat (input, "off"))
-    cf->ansi_capable = 0;
-  else
-    return clib_error_return (0, "unknown parameter: `%U`",
-			      format_unformat_error, input);
-
-  return 0;
-}
-
-/*?
- * Enables or disables the use of ANSI control sequences by this terminal.
- * The default will vary based on terminal detection at the start of the
- * session.
- *
- * ANSI control sequences are used in a small number of places to provide,
- * for example, color text output and to control the cursor in the pager.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cli_unix_cli_set_terminal_ansi, static) = {
-  .path = "set terminal ansi",
-  .short_help = "set terminal ansi [on|off]",
-  .function = unix_cli_set_terminal_ansi,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-unix_cli_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (unix_cli_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/unix/dir.dox b/vlib/vlib/unix/dir.dox
deleted file mode 100644
index 1380fa56..00000000
--- a/vlib/vlib/unix/dir.dox
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* Doxygen directory documentation */
-
-/**
-@dir
-@brief VLIB Unix interface
-
-VLIB application library Unix interface layer.
-
-*/
-/*? %%clicmd:group_label Unix Interface %% ?*/
-/*? %%syscfg:group_label Unix Interface %% ?*/
-
diff --git a/vlib/vlib/unix/input.c b/vlib/vlib/unix/input.c
deleted file mode 100644
index 07096ed2..00000000
--- a/vlib/vlib/unix/input.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * input.c: Unix file input
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <signal.h>
-
-/* FIXME autoconf */
-#define HAVE_LINUX_EPOLL
-
-#ifdef HAVE_LINUX_EPOLL
-
-#include <sys/epoll.h>
-
-typedef struct
-{
-  int epoll_fd;
-  struct epoll_event *epoll_events;
-
-  /* Statistics. */
-  u64 epoll_files_ready;
-  u64 epoll_waits;
-} linux_epoll_main_t;
-
-static linux_epoll_main_t linux_epoll_main;
-
-static void
-linux_epoll_file_update (unix_file_t * f, unix_file_update_type_t update_type)
-{
-  unix_main_t *um = &unix_main;
-  linux_epoll_main_t *em = &linux_epoll_main;
-  struct epoll_event e;
-
-  memset (&e, 0, sizeof (e));
-
-  e.events = EPOLLIN;
-  if (f->flags & UNIX_FILE_DATA_AVAILABLE_TO_WRITE)
-    e.events |= EPOLLOUT;
-  if (f->flags & UNIX_FILE_EVENT_EDGE_TRIGGERED)
-    e.events |= EPOLLET;
-  e.data.u32 = f - um->file_pool;
-
-  if (epoll_ctl (em->epoll_fd,
-		 (update_type == UNIX_FILE_UPDATE_ADD
-		  ? EPOLL_CTL_ADD
-		  : (update_type == UNIX_FILE_UPDATE_MODIFY
-		     ? EPOLL_CTL_MOD
-		     : EPOLL_CTL_DEL)), f->file_descriptor, &e) < 0)
-    clib_warning ("epoll_ctl");
-}
-
-static uword
-linux_epoll_input (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  unix_main_t *um = &unix_main;
-  linux_epoll_main_t *em = &linux_epoll_main;
-  struct epoll_event *e;
-  int n_fds_ready;
-
-  {
-    vlib_node_main_t *nm = &vm->node_main;
-    u64 t = nm->cpu_time_next_process_ready;
-    f64 timeout;
-    int timeout_ms, max_timeout_ms = 10;
-    f64 vector_rate = vlib_last_vectors_per_main_loop (vm);
-
-    if (t == ~0ULL)
-      {
-	timeout = 10e-3;
-	timeout_ms = max_timeout_ms;
-      }
-    else
-      {
-	timeout =
-	  (((i64) t - (i64) clib_cpu_time_now ())
-	   * vm->clib_time.seconds_per_clock)
-	  /* subtract off some slop time */  - 50e-6;
-
-	if (timeout < 1e3)
-	  {
-	    /* We have event happenning in less than 1 ms so
-	       don't allow epoll to wait */
-	    timeout_ms = 0;
-	  }
-	else
-	  {
-	    timeout_ms = timeout * 1e3;
-
-	    /* Must be between 1 and 10 ms. */
-	    timeout_ms = clib_max (1, timeout_ms);
-	    timeout_ms = clib_min (max_timeout_ms, timeout_ms);
-	  }
-      }
-
-    /* If we still have input nodes polling (e.g. vnet packet generator)
-       don't sleep. */
-    if (nm->input_node_counts_by_state[VLIB_NODE_STATE_POLLING] > 0)
-      timeout_ms = 0;
-
-    /*
-     * When busy: don't wait & only epoll for input
-     * every 1024 times through main loop.
-     */
-    if (vector_rate > 1 || vm->api_queue_nonempty)
-      {
-	timeout_ms = 0;
-	node->input_main_loops_per_call = 1024;
-      }
-    else
-      /* We're not busy; go to sleep for a while. */
-      node->input_main_loops_per_call = 0;
-
-    /* Allow any signal to wakeup our sleep. */
-    {
-      static sigset_t unblock_all_signals;
-      n_fds_ready = epoll_pwait (em->epoll_fd,
-				 em->epoll_events,
-				 vec_len (em->epoll_events),
-				 timeout_ms, &unblock_all_signals);
-
-      /* This kludge is necessary to run over absurdly old kernels */
-      if (n_fds_ready < 0 && errno == ENOSYS)
-	{
-	  n_fds_ready = epoll_wait (em->epoll_fd,
-				    em->epoll_events,
-				    vec_len (em->epoll_events), timeout_ms);
-	}
-    }
-  }
-
-  if (n_fds_ready < 0)
-    {
-      if (unix_error_is_fatal (errno))
-	vlib_panic_with_error (vm, clib_error_return_unix (0, "epoll_wait"));
-
-      /* non fatal error (e.g. EINTR). */
-      return 0;
-    }
-
-  em->epoll_waits += 1;
-  em->epoll_files_ready += n_fds_ready;
-
-  for (e = em->epoll_events; e < em->epoll_events + n_fds_ready; e++)
-    {
-      u32 i = e->data.u32;
-      unix_file_t *f = pool_elt_at_index (um->file_pool, i);
-      clib_error_t *errors[4];
-      int n_errors = 0;
-
-      if (PREDICT_TRUE (!(e->events & EPOLLERR)))
-	{
-	  if (e->events & EPOLLIN)
-	    {
-	      errors[n_errors] = f->read_function (f);
-	      n_errors += errors[n_errors] != 0;
-	    }
-	  if (e->events & EPOLLOUT)
-	    {
-	      errors[n_errors] = f->write_function (f);
-	      n_errors += errors[n_errors] != 0;
-	    }
-	}
-      else
-	{
-	  if (f->error_function)
-	    {
-	      errors[n_errors] = f->error_function (f);
-	      n_errors += errors[n_errors] != 0;
-	    }
-	  else
-	    close (f->file_descriptor);
-	}
-
-      ASSERT (n_errors < ARRAY_LEN (errors));
-      for (i = 0; i < n_errors; i++)
-	{
-	  unix_save_error (um, errors[i]);
-	}
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (linux_epoll_input_node,static) = {
-  .function = linux_epoll_input,
-  .type = VLIB_NODE_TYPE_PRE_INPUT,
-  .name = "unix-epoll-input",
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-linux_epoll_input_init (vlib_main_t * vm)
-{
-  linux_epoll_main_t *em = &linux_epoll_main;
-  unix_main_t *um = &unix_main;
-
-  /* Allocate some events. */
-  vec_resize (em->epoll_events, VLIB_FRAME_SIZE);
-
-  em->epoll_fd = epoll_create (vec_len (em->epoll_events));
-  if (em->epoll_fd < 0)
-    return clib_error_return_unix (0, "epoll_create");
-
-  um->file_update = linux_epoll_file_update;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (linux_epoll_input_init);
-
-#endif /* HAVE_LINUX_EPOLL */
-
-static clib_error_t *
-unix_input_init (vlib_main_t * vm)
-{
-  return vlib_call_init_function (vm, linux_epoll_input_init);
-}
-
-VLIB_INIT_FUNCTION (unix_input_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/unix/main.c b/vlib/vlib/unix/main.c
deleted file mode 100644
index 562778e0..00000000
--- a/vlib/vlib/unix/main.c
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * main.c: Unix main routine
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlib/unix/plugin.h>
-
-#include <signal.h>
-#include <sys/ucontext.h>
-#include <syslog.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-/** Default CLI pager limit is not configured in startup.conf */
-#define UNIX_CLI_DEFAULT_PAGER_LIMIT 100000
-
-/** Default CLI history depth if not configured in startup.conf */
-#define UNIX_CLI_DEFAULT_HISTORY 50
-
-
-unix_main_t unix_main;
-
-static clib_error_t *
-unix_main_init (vlib_main_t * vm)
-{
-  unix_main_t *um = &unix_main;
-  um->vlib_main = vm;
-  return vlib_call_init_function (vm, unix_input_init);
-}
-
-VLIB_INIT_FUNCTION (unix_main_init);
-
-static void
-unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc)
-{
-  uword fatal;
-  u8 *msg = 0;
-
-  msg = format (msg, "received signal %U, PC %U",
-		format_signal, signum, format_ucontext_pc, uc);
-
-  if (signum == SIGSEGV)
-    msg = format (msg, ", faulting address %p", si->si_addr);
-
-  switch (signum)
-    {
-      /* these (caught) signals cause the application to exit */
-    case SIGTERM:
-      if (unix_main.vlib_main->main_loop_exit_set)
-	{
-	  syslog (LOG_ERR | LOG_DAEMON, "received SIGTERM, exiting...");
-
-	  clib_longjmp (&unix_main.vlib_main->main_loop_exit,
-			VLIB_MAIN_LOOP_EXIT_CLI);
-	}
-      /* fall through */
-    case SIGQUIT:
-    case SIGINT:
-    case SIGILL:
-    case SIGBUS:
-    case SIGSEGV:
-    case SIGHUP:
-    case SIGFPE:
-      fatal = 1;
-      break;
-
-      /* by default, print a message and continue */
-    default:
-      fatal = 0;
-      break;
-    }
-
-  /* Null terminate. */
-  vec_add1 (msg, 0);
-
-  if (fatal)
-    {
-      syslog (LOG_ERR | LOG_DAEMON, "%s", msg);
-      os_exit (1);
-    }
-  else
-    clib_warning ("%s", msg);
-
-  vec_free (msg);
-}
-
-static clib_error_t *
-setup_signal_handlers (unix_main_t * um)
-{
-  uword i;
-  struct sigaction sa;
-
-  for (i = 1; i < 32; i++)
-    {
-      memset (&sa, 0, sizeof (sa));
-      sa.sa_sigaction = (void *) unix_signal_handler;
-      sa.sa_flags = SA_SIGINFO;
-
-      switch (i)
-	{
-	  /* these signals take the default action */
-	case SIGABRT:
-	case SIGKILL:
-	case SIGSTOP:
-	case SIGUSR1:
-	case SIGUSR2:
-	  continue;
-
-	  /* ignore SIGPIPE, SIGCHLD */
-	case SIGPIPE:
-	case SIGCHLD:
-	  sa.sa_sigaction = (void *) SIG_IGN;
-	  break;
-
-	  /* catch and handle all other signals */
-	default:
-	  break;
-	}
-
-      if (sigaction (i, &sa, 0) < 0)
-	return clib_error_return_unix (0, "sigaction %U", format_signal, i);
-    }
-
-  return 0;
-}
-
-static void
-unix_error_handler (void *arg, u8 * msg, int msg_len)
-{
-  unix_main_t *um = arg;
-
-  /* Echo to stderr when interactive. */
-  if (um->flags & UNIX_FLAG_INTERACTIVE)
-    {
-      CLIB_UNUSED (int r) = write (2, msg, msg_len);
-    }
-  else
-    {
-      char save = msg[msg_len - 1];
-
-      /* Null Terminate. */
-      msg[msg_len - 1] = 0;
-
-      syslog (LOG_ERR | LOG_DAEMON, "%s", msg);
-
-      msg[msg_len - 1] = save;
-    }
-}
-
-void
-vlib_unix_error_report (vlib_main_t * vm, clib_error_t * error)
-{
-  unix_main_t *um = &unix_main;
-
-  if (um->flags & UNIX_FLAG_INTERACTIVE || error == 0)
-    return;
-
-  {
-    char save;
-    u8 *msg;
-    u32 msg_len;
-
-    msg = error->what;
-    msg_len = vec_len (msg);
-
-    /* Null Terminate. */
-    save = msg[msg_len - 1];
-    msg[msg_len - 1] = 0;
-
-    syslog (LOG_ERR | LOG_DAEMON, "%s", msg);
-
-    msg[msg_len - 1] = save;
-  }
-}
-
-static uword
-startup_config_process (vlib_main_t * vm,
-			vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  unix_main_t *um = &unix_main;
-  u8 *buf = 0;
-  uword l, n = 1;
-
-  vlib_process_suspend (vm, 2.0);
-
-  while (um->unix_config_complete == 0)
-    vlib_process_suspend (vm, 0.1);
-
-  if (um->startup_config_filename)
-    {
-      unformat_input_t sub_input;
-      int fd;
-      struct stat s;
-      char *fn = (char *) um->startup_config_filename;
-
-      fd = open (fn, O_RDONLY);
-      if (fd < 0)
-	{
-	  clib_warning ("failed to open `%s'", fn);
-	  return 0;
-	}
-
-      if (fstat (fd, &s) < 0)
-	{
-	  clib_warning ("failed to stat `%s'", fn);
-	bail:
-	  close (fd);
-	  return 0;
-	}
-
-      if (!(S_ISREG (s.st_mode) || S_ISLNK (s.st_mode)))
-	{
-	  clib_warning ("not a regular file: `%s'", fn);
-	  goto bail;
-	}
-
-      while (n > 0)
-	{
-	  l = vec_len (buf);
-	  vec_resize (buf, 4096);
-	  n = read (fd, buf + l, 4096);
-	  if (n > 0)
-	    {
-	      _vec_len (buf) = l + n;
-	      if (n < 4096)
-		break;
-	    }
-	  else
-	    break;
-	}
-      if (um->log_fd && vec_len (buf))
-	{
-	  u8 *lv = 0;
-	  lv = format (lv, "%U: ***** Startup Config *****\n%v",
-		       format_timeval, 0 /* current bat-time */ ,
-		       0 /* current bat-format */ ,
-		       buf);
-	  {
-	    int rv __attribute__ ((unused)) =
-	      write (um->log_fd, lv, vec_len (lv));
-	  }
-	  vec_reset_length (lv);
-	  lv = format (lv, "%U: ***** End Startup Config *****\n",
-		       format_timeval, 0 /* current bat-time */ ,
-		       0 /* current bat-format */ );
-	  {
-	    int rv __attribute__ ((unused)) =
-	      write (um->log_fd, lv, vec_len (lv));
-	  }
-	  vec_free (lv);
-	}
-
-      if (vec_len (buf))
-	{
-	  unformat_init_vector (&sub_input, buf);
-	  vlib_cli_input (vm, &sub_input, 0, 0);
-	  /* frees buf for us */
-	  unformat_free (&sub_input);
-	}
-      close (fd);
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (startup_config_node,static) = {
-    .function = startup_config_process,
-    .type = VLIB_NODE_TYPE_PROCESS,
-    .name = "startup-config-process",
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-unix_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  unix_main_t *um = &unix_main;
-  clib_error_t *error = 0;
-
-  /* Defaults */
-  um->cli_pager_buffer_limit = UNIX_CLI_DEFAULT_PAGER_LIMIT;
-  um->cli_history_limit = UNIX_CLI_DEFAULT_HISTORY;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      char *cli_prompt;
-      if (unformat (input, "interactive"))
-	um->flags |= UNIX_FLAG_INTERACTIVE;
-      else if (unformat (input, "nodaemon"))
-	um->flags |= UNIX_FLAG_NODAEMON;
-      else if (unformat (input, "cli-prompt %s", &cli_prompt))
-	vlib_unix_cli_set_prompt (cli_prompt);
-      else
-	if (unformat (input, "cli-listen %s", &um->cli_listen_socket.config))
-	;
-      else if (unformat (input, "cli-line-mode"))
-	um->cli_line_mode = 1;
-      else if (unformat (input, "cli-no-banner"))
-	um->cli_no_banner = 1;
-      else if (unformat (input, "cli-no-pager"))
-	um->cli_no_pager = 1;
-      else if (unformat (input, "cli-pager-buffer-limit %d",
-			 &um->cli_pager_buffer_limit))
-	;
-      else
-	if (unformat (input, "cli-history-limit %d", &um->cli_history_limit))
-	;
-      else if (unformat (input, "full-coredump"))
-	{
-	  int fd;
-
-	  fd = open ("/proc/self/coredump_filter", O_WRONLY);
-	  if (fd >= 0)
-	    {
-	      if (write (fd, "0x6f\n", 5) != 5)
-		clib_unix_warning ("coredump filter write failed!");
-	      close (fd);
-	    }
-	  else
-	    clib_unix_warning ("couldn't open /proc/self/coredump_filter");
-	}
-      else if (unformat (input, "startup-config %s",
-			 &um->startup_config_filename))
-	;
-      else if (unformat (input, "exec %s", &um->startup_config_filename))
-	;
-      else if (unformat (input, "log %s", &um->log_filename))
-	{
-	  um->log_fd = open ((char *) um->log_filename,
-			     O_CREAT | O_WRONLY | O_APPEND, 0644);
-	  if (um->log_fd < 0)
-	    {
-	      clib_warning ("couldn't open log '%s'\n", um->log_filename);
-	      um->log_fd = 0;
-	    }
-	  else
-	    {
-	      u8 *lv = 0;
-	      lv = format (0, "%U: ***** Start: PID %d *****\n",
-			   format_timeval, 0 /* current bat-time */ ,
-			   0 /* current bat-format */ ,
-			   getpid ());
-	      {
-		int rv __attribute__ ((unused)) =
-		  write (um->log_fd, lv, vec_len (lv));
-	      }
-	      vec_free (lv);
-	    }
-	}
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-
-  if (!(um->flags & UNIX_FLAG_INTERACTIVE))
-    {
-      error = setup_signal_handlers (um);
-      if (error)
-	return error;
-
-      openlog (vm->name, LOG_CONS | LOG_PERROR | LOG_PID, LOG_DAEMON);
-      clib_error_register_handler (unix_error_handler, um);
-
-      if (!(um->flags & UNIX_FLAG_NODAEMON) && daemon ( /* chdir to / */ 0,
-						       /* stdin/stdout/stderr -> /dev/null */
-						       0) < 0)
-	clib_error_return (0, "daemon () fails");
-    }
-  um->unix_config_complete = 1;
-
-  return 0;
-}
-
-/* unix { ... } configuration. */
-/*?
- *
- * @cfgcmd{interactive}
- * Attach CLI to stdin/out and provide a debugging command line interface.
- * Implies @c nodaemon.
- *
- * @cfgcmd{nodaemon}
- * Do not fork or background the VPP process. Typically used when invoking
- * VPP applications from a process monitor.
- *
- * @cfgcmd{exec, &lt;filename&gt;}
- * @par <code>startup-config &lt;filename&gt;</code>
- * Read startup operational configuration from @c filename.
- * The contents of the file will be performed as though entered at the CLI.
- * The two keywords are aliases for the same function; if both are specified,
- * only the last will have an effect.
- *
- * @cfgcmd{log, &lt;filename&gt;}
- * Logs the startup configuration and all subsequent CLI commands in
- * @c filename.
- * Very useful in situations where folks don't remember or can't be bothered
- * to include CLI commands in bug reports.
- *
- * @cfgcmd{full-coredump}
- * Ask the Linux kernel to dump all memory-mapped address regions, instead
- * of just text+data+bss.
- *
- * @cfgcmd{cli-listen, &lt;address:port&gt;}
- * Bind the CLI to listen at the address and port given. @clocalhost
- * on TCP port @c 5002, given as <tt>cli-listen localhost:5002</tt>,
- * is typical.
- *
- * @cfgcmd{cli-line-mode}
- * Disable character-by-character I/O on stdin. Useful when combined with,
- * for example, <tt>emacs M-x gud-gdb</tt>.
- *
- * @cfgcmd{cli-prompt, &lt;string&gt;}
- * Configure the CLI prompt to be @c string.
- *
- * @cfgcmd{cli-history-limit, &lt;nn&gt;}
- * Limit commmand history to @c nn  lines. A value of @c 0
- * disables command history. Default value: @c 50
- *
- * @cfgcmd{cli-no-banner}
- * Disable the login banner on stdin and Telnet connections.
- *
- * @cfgcmd{cli-no-pager}
- * Disable the output pager.
- *
- * @cfgcmd{cli-pager-buffer-limit, &lt;nn&gt;}
- * Limit pager buffer to @c nn lines of output.
- * A value of @c 0 disables the pager. Default value: @c 100000
-?*/
-VLIB_CONFIG_FUNCTION (unix_config, "unix");
-
-static clib_error_t *
-unix_exit (vlib_main_t * vm)
-{
-  /* Close syslog connection. */
-  closelog ();
-  return 0;
-}
-
-VLIB_MAIN_LOOP_EXIT_FUNCTION (unix_exit);
-
-u8 **vlib_thread_stacks;
-
-static uword
-thread0 (uword arg)
-{
-  vlib_main_t *vm = (vlib_main_t *) arg;
-  unformat_input_t input;
-  int i;
-
-  unformat_init_command_line (&input, (char **) vm->argv);
-  i = vlib_main (vm, &input);
-  unformat_free (&input);
-
-  return i;
-}
-
-int
-vlib_unix_main (int argc, char *argv[])
-{
-  vlib_main_t *vm = &vlib_global_main;	/* one and only time for this! */
-  vlib_thread_main_t *tm = &vlib_thread_main;
-  unformat_input_t input;
-  u8 *thread_stacks;
-  clib_error_t *e;
-  int i;
-
-  vm->argv = (u8 **) argv;
-  vm->name = argv[0];
-  vm->heap_base = clib_mem_get_heap ();
-  ASSERT (vm->heap_base);
-
-  i = vlib_plugin_early_init (vm);
-  if (i)
-    return i;
-
-  unformat_init_command_line (&input, (char **) vm->argv);
-  if (vm->init_functions_called == 0)
-    vm->init_functions_called = hash_create (0, /* value bytes */ 0);
-  e = vlib_call_all_config_functions (vm, &input, 1 /* early */ );
-  if (e != 0)
-    {
-      clib_error_report (e);
-      return 1;
-    }
-  unformat_free (&input);
-
-  /*
-   * allocate n x VLIB_THREAD_STACK_SIZE stacks, aligned to a
-   * VLIB_THREAD_STACK_SIZE boundary
-   * See also: os_get_cpu_number() in vlib/vlib/threads.c
-   */
-  thread_stacks = clib_mem_alloc_aligned
-    ((uword) tm->n_thread_stacks * VLIB_THREAD_STACK_SIZE,
-     VLIB_THREAD_STACK_SIZE);
-
-  vec_validate (vlib_thread_stacks, tm->n_thread_stacks - 1);
-  for (i = 0; i < vec_len (vlib_thread_stacks); i++)
-    {
-      vlib_thread_stacks[i] = thread_stacks;
-
-      /*
-       * Disallow writes to the bottom page of the stack, to
-       * catch stack overflows.
-       */
-      if (mprotect (thread_stacks, clib_mem_get_page_size (), PROT_READ) < 0)
-	clib_unix_warning ("thread stack");
-
-      thread_stacks += VLIB_THREAD_STACK_SIZE;
-    }
-
-  i = clib_calljmp (thread0, (uword) vm,
-		    (void *) (vlib_thread_stacks[0] +
-			      VLIB_THREAD_STACK_SIZE));
-  return i;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/unix/mc_socket.c b/vlib/vlib/unix/mc_socket.c
deleted file mode 100644
index 9c12ad3b..00000000
--- a/vlib/vlib/unix/mc_socket.c
+++ /dev/null
@@ -1,1049 +0,0 @@
-/*
- * mc_socket.c: socket based multicast for vlib mc
- *
- * Copyright (c) 2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vlib/unix/mc_socket.h>
-
-#include <sys/ioctl.h>		/* for FIONBIO */
-#include <netinet/tcp.h>	/* for TCP_NODELAY */
-#include <net/if.h>		/* for struct ifreq */
-
-static u8 *
-format_socket_peer_id (u8 * s, va_list * args)
-{
-  u64 peer_id_as_u64 = va_arg (*args, u64);
-  mc_peer_id_t peer_id;
-  peer_id.as_u64 = peer_id_as_u64;
-  u32 a = mc_socket_peer_id_get_address (peer_id);
-  u32 p = mc_socket_peer_id_get_port (peer_id);
-
-  s = format (s, "%U:%04x", format_network_address, AF_INET, &a, ntohs (p));
-
-  return s;
-}
-
-typedef void (mc_msg_handler_t) (mc_main_t * mcm, void *msg,
-				 u32 buffer_index);
-
-always_inline void
-msg_handler (mc_main_t * mcm,
-	     u32 buffer_index, u32 handler_frees_buffer, void *_h)
-{
-  vlib_main_t *vm = mcm->vlib_main;
-  mc_msg_handler_t *h = _h;
-  vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
-  void *the_msg = vlib_buffer_get_current (b);
-
-  h (mcm, the_msg, buffer_index);
-  if (!handler_frees_buffer)
-    vlib_buffer_free_one (vm, buffer_index);
-}
-
-static uword
-append_buffer_index_to_iovec (vlib_main_t * vm,
-			      u32 buffer_index, struct iovec **iovs_return)
-{
-  struct iovec *i;
-  vlib_buffer_t *b;
-  u32 bi = buffer_index;
-  u32 l = 0;
-
-  while (1)
-    {
-      b = vlib_get_buffer (vm, bi);
-      vec_add2 (*iovs_return, i, 1);
-      i->iov_base = vlib_buffer_get_current (b);
-      i->iov_len = b->current_length;
-      l += i->iov_len;
-      if (!(b->flags & VLIB_BUFFER_NEXT_PRESENT))
-	break;
-      bi = b->next_buffer;
-    }
-
-  return l;
-}
-
-static clib_error_t *
-sendmsg_helper (mc_socket_main_t * msm,
-		int socket, struct sockaddr_in *tx_addr, u32 buffer_index)
-{
-  vlib_main_t *vm = msm->mc_main.vlib_main;
-  struct msghdr h;
-  word n_bytes, n_bytes_tx, n_retries;
-
-  memset (&h, 0, sizeof (h));
-  h.msg_name = tx_addr;
-  h.msg_namelen = sizeof (tx_addr[0]);
-
-  if (msm->iovecs)
-    _vec_len (msm->iovecs) = 0;
-
-  n_bytes = append_buffer_index_to_iovec (vm, buffer_index, &msm->iovecs);
-  ASSERT (n_bytes <= msm->mc_main.transport.max_packet_size);
-  if (n_bytes > msm->mc_main.transport.max_packet_size)
-    clib_error ("sending packet larger than interace MTU %d bytes", n_bytes);
-
-  h.msg_iov = msm->iovecs;
-  h.msg_iovlen = vec_len (msm->iovecs);
-
-  n_retries = 0;
-  while ((n_bytes_tx = sendmsg (socket, &h, /* flags */ 0)) != n_bytes
-	 && errno == EAGAIN)
-    n_retries++;
-  if (n_bytes_tx != n_bytes)
-    {
-      clib_unix_warning ("sendmsg");
-      return 0;
-    }
-  if (n_retries)
-    {
-      ELOG_TYPE_DECLARE (e) =
-      {
-      .format = "sendmsg-helper: %d retries",.format_args = "i4",};
-      struct
-      {
-	u32 retries;
-      } *ed = 0;
-
-      ed = ELOG_DATA (&vm->elog_main, e);
-      ed->retries = n_retries;
-    }
-  return 0;
-}
-
-static clib_error_t *
-tx_buffer (void *transport, mc_transport_type_t type, u32 buffer_index)
-{
-  mc_socket_main_t *msm = (mc_socket_main_t *) transport;
-  vlib_main_t *vm = msm->mc_main.vlib_main;
-  mc_multicast_socket_t *ms = &msm->multicast_sockets[type];
-  clib_error_t *error;
-  error = sendmsg_helper (msm, ms->socket, &ms->tx_addr, buffer_index);
-  if (type != MC_TRANSPORT_USER_REQUEST_TO_RELAY)
-    vlib_buffer_free_one (vm, buffer_index);
-  return error;
-}
-
-static clib_error_t *
-tx_ack (void *transport, mc_peer_id_t dest_peer_id, u32 buffer_index)
-{
-  struct sockaddr_in tx_addr;
-  mc_socket_main_t *msm = (mc_socket_main_t *) transport;
-  vlib_main_t *vm = msm->mc_main.vlib_main;
-  clib_error_t *error;
-
-  memset (&tx_addr, 0, sizeof (tx_addr));
-  tx_addr.sin_family = AF_INET;
-  tx_addr.sin_addr.s_addr = mc_socket_peer_id_get_address (dest_peer_id);
-  tx_addr.sin_port = mc_socket_peer_id_get_port (dest_peer_id);
-
-  error = sendmsg_helper (msm, msm->ack_socket, &tx_addr, buffer_index);
-  vlib_buffer_free_one (vm, buffer_index);
-  return error;
-}
-
-static clib_error_t *
-recvmsg_helper (mc_socket_main_t * msm,
-		int socket,
-		struct sockaddr_in *rx_addr,
-		u32 * buffer_index, u32 drop_message)
-{
-  vlib_main_t *vm = msm->mc_main.vlib_main;
-  vlib_buffer_t *b;
-  uword n_left, n_alloc, n_mtu, i, i_rx;
-  const uword buffer_size = VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES;
-  word n_bytes_left;
-
-  /* Make sure we have at least a MTU worth of buffers. */
-  n_mtu = msm->rx_mtu_n_buffers;
-  n_left = vec_len (msm->rx_buffers);
-  if (n_left < n_mtu)
-    {
-      uword max_alloc = 8 * n_mtu;
-      vec_validate (msm->rx_buffers, max_alloc - 1);
-      n_alloc =
-	vlib_buffer_alloc (vm, msm->rx_buffers + n_left, max_alloc - n_left);
-      _vec_len (msm->rx_buffers) = n_left + n_alloc;
-    }
-
-  ASSERT (vec_len (msm->rx_buffers) >= n_mtu);
-  vec_validate (msm->iovecs, n_mtu - 1);
-
-  /* Allocate RX buffers from end of rx_buffers.
-     Turn them into iovecs to pass to readv. */
-  i_rx = vec_len (msm->rx_buffers) - 1;
-  for (i = 0; i < n_mtu; i++)
-    {
-      b = vlib_get_buffer (vm, msm->rx_buffers[i_rx - i]);
-      msm->iovecs[i].iov_base = b->data;
-      msm->iovecs[i].iov_len = buffer_size;
-    }
-  _vec_len (msm->iovecs) = n_mtu;
-
-  {
-    struct msghdr h;
-
-    memset (&h, 0, sizeof (h));
-    if (rx_addr)
-      {
-	h.msg_name = rx_addr;
-	h.msg_namelen = sizeof (rx_addr[0]);
-      }
-    h.msg_iov = msm->iovecs;
-    h.msg_iovlen = vec_len (msm->iovecs);
-
-    n_bytes_left = recvmsg (socket, &h, 0);
-    if (n_bytes_left < 0)
-      return clib_error_return_unix (0, "recvmsg");
-  }
-
-  if (drop_message)
-    {
-      *buffer_index = ~0;
-      return 0;
-    }
-
-  *buffer_index = msm->rx_buffers[i_rx];
-  while (1)
-    {
-      b = vlib_get_buffer (vm, msm->rx_buffers[i_rx]);
-
-      b->flags = 0;
-      b->current_data = 0;
-      b->current_length =
-	n_bytes_left < buffer_size ? n_bytes_left : buffer_size;
-
-      n_bytes_left -= buffer_size;
-
-      if (n_bytes_left <= 0)
-	break;
-
-      i_rx--;
-      b->flags |= VLIB_BUFFER_NEXT_PRESENT;
-      b->next_buffer = msm->rx_buffers[i_rx];
-    }
-
-  _vec_len (msm->rx_buffers) = i_rx;
-
-  return 0 /* no error */ ;
-}
-
-static clib_error_t *
-mastership_socket_read_ready (unix_file_t * uf)
-{
-  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
-  mc_main_t *mcm = &msm->mc_main;
-  mc_multicast_socket_t *ms =
-    &msm->multicast_sockets[MC_TRANSPORT_MASTERSHIP];
-  clib_error_t *error;
-  u32 bi;
-
-  error = recvmsg_helper (msm, ms->socket, /* rx_addr */ 0, &bi,	/* drop_message */
-			  0);
-  if (!error)
-    msg_handler (mcm, bi,
-		 /* handler_frees_buffer */ 0,
-		 mc_msg_master_assert_handler);
-
-  return error;
-}
-
-static clib_error_t *
-to_relay_socket_read_ready (unix_file_t * uf)
-{
-  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
-  mc_main_t *mcm = &msm->mc_main;
-  vlib_main_t *vm = msm->mc_main.vlib_main;
-  mc_multicast_socket_t *ms_to_relay =
-    &msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_TO_RELAY];
-  mc_multicast_socket_t *ms_from_relay =
-    &msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_FROM_RELAY];
-  clib_error_t *error;
-  u32 bi;
-  u32 is_master = mcm->relay_state == MC_RELAY_STATE_MASTER;
-
-  /* Not the ordering master? Turf the msg */
-  error = recvmsg_helper (msm, ms_to_relay->socket, /* rx_addr */ 0, &bi,
-			  /* drop_message */ !is_master);
-
-  /* If we are the master, number and rebroadcast the msg. */
-  if (!error && is_master)
-    {
-      vlib_buffer_t *b = vlib_get_buffer (vm, bi);
-      mc_msg_user_request_t *mp = vlib_buffer_get_current (b);
-      mp->global_sequence = clib_host_to_net_u32 (mcm->relay_global_sequence);
-      mcm->relay_global_sequence++;
-      error =
-	sendmsg_helper (msm, ms_from_relay->socket, &ms_from_relay->tx_addr,
-			bi);
-      vlib_buffer_free_one (vm, bi);
-    }
-
-  return error;
-}
-
-static clib_error_t *
-from_relay_socket_read_ready (unix_file_t * uf)
-{
-  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
-  mc_main_t *mcm = &msm->mc_main;
-  mc_multicast_socket_t *ms =
-    &msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_FROM_RELAY];
-  clib_error_t *error;
-  u32 bi;
-
-  error = recvmsg_helper (msm, ms->socket, /* rx_addr */ 0, &bi,	/* drop_message */
-			  0);
-  if (!error)
-    {
-      msg_handler (mcm, bi, /* handler_frees_buffer */ 1,
-		   mc_msg_user_request_handler);
-    }
-  return error;
-}
-
-static clib_error_t *
-join_socket_read_ready (unix_file_t * uf)
-{
-  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
-  mc_main_t *mcm = &msm->mc_main;
-  vlib_main_t *vm = mcm->vlib_main;
-  mc_multicast_socket_t *ms = &msm->multicast_sockets[MC_TRANSPORT_JOIN];
-  clib_error_t *error;
-  u32 bi;
-
-  error = recvmsg_helper (msm, ms->socket, /* rx_addr */ 0, &bi,	/* drop_message */
-			  0);
-  if (!error)
-    {
-      vlib_buffer_t *b = vlib_get_buffer (vm, bi);
-      mc_msg_join_or_leave_request_t *mp = vlib_buffer_get_current (b);
-
-      switch (clib_host_to_net_u32 (mp->type))
-	{
-	case MC_MSG_TYPE_join_or_leave_request:
-	  msg_handler (mcm, bi, /* handler_frees_buffer */ 0,
-		       mc_msg_join_or_leave_request_handler);
-	  break;
-
-	case MC_MSG_TYPE_join_reply:
-	  msg_handler (mcm, bi, /* handler_frees_buffer */ 0,
-		       mc_msg_join_reply_handler);
-	  break;
-
-	default:
-	  ASSERT (0);
-	  break;
-	}
-    }
-  return error;
-}
-
-static clib_error_t *
-ack_socket_read_ready (unix_file_t * uf)
-{
-  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
-  mc_main_t *mcm = &msm->mc_main;
-  clib_error_t *error;
-  u32 bi;
-
-  error = recvmsg_helper (msm, msm->ack_socket, /* rx_addr */ 0, &bi,
-			  /* drop_message */ 0);
-  if (!error)
-    msg_handler (mcm, bi, /* handler_frees_buffer */ 0,
-		 mc_msg_user_ack_handler);
-  return error;
-}
-
-static void
-catchup_cleanup (mc_socket_main_t * msm,
-		 mc_socket_catchup_t * c, unix_main_t * um, unix_file_t * uf)
-{
-  hash_unset (msm->catchup_index_by_file_descriptor, uf->file_descriptor);
-  unix_file_del (um, uf);
-  vec_free (c->input_vector);
-  vec_free (c->output_vector);
-  pool_put (msm->catchups, c);
-}
-
-static mc_socket_catchup_t *
-find_catchup_from_file_descriptor (mc_socket_main_t * msm,
-				   int file_descriptor)
-{
-  uword *p =
-    hash_get (msm->catchup_index_by_file_descriptor, file_descriptor);
-  return p ? pool_elt_at_index (msm->catchups, p[0]) : 0;
-}
-
-static clib_error_t *
-catchup_socket_read_ready (unix_file_t * uf, int is_server)
-{
-  unix_main_t *um = &unix_main;
-  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
-  mc_main_t *mcm = &msm->mc_main;
-  mc_socket_catchup_t *c =
-    find_catchup_from_file_descriptor (msm, uf->file_descriptor);
-  word l, n, is_eof;
-
-  l = vec_len (c->input_vector);
-  vec_resize (c->input_vector, 4096);
-  n =
-    read (uf->file_descriptor, c->input_vector + l,
-	  vec_len (c->input_vector) - l);
-  is_eof = n == 0;
-
-  if (n < 0)
-    {
-      if (errno == EAGAIN)
-	n = 0;
-      else
-	{
-	  catchup_cleanup (msm, c, um, uf);
-	  return clib_error_return_unix (0, "read");
-	}
-    }
-
-  _vec_len (c->input_vector) = l + n;
-
-  if (is_eof && vec_len (c->input_vector) > 0)
-    {
-      if (is_server)
-	{
-	  mc_msg_catchup_request_handler (mcm, (void *) c->input_vector,
-					  c - msm->catchups);
-	  _vec_len (c->input_vector) = 0;
-	}
-      else
-	{
-	  mc_msg_catchup_reply_handler (mcm, (void *) c->input_vector,
-					c - msm->catchups);
-	  c->input_vector = 0;	/* reply handler is responsible for freeing vector */
-	  catchup_cleanup (msm, c, um, uf);
-	}
-    }
-
-  return 0 /* no error */ ;
-}
-
-static clib_error_t *
-catchup_server_read_ready (unix_file_t * uf)
-{
-  return catchup_socket_read_ready (uf, /* is_server */ 1);
-}
-
-static clib_error_t *
-catchup_client_read_ready (unix_file_t * uf)
-{
-  if (MC_EVENT_LOGGING)
-    {
-      mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
-      vlib_main_t *vm = msm->mc_main.vlib_main;
-
-      ELOG_TYPE (e, "catchup_client_read_ready");
-      ELOG (&vm->elog_main, e, 0);
-    }
-  return catchup_socket_read_ready (uf, /* is_server */ 0);
-}
-
-static clib_error_t *
-catchup_socket_write_ready (unix_file_t * uf, int is_server)
-{
-  unix_main_t *um = &unix_main;
-  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
-  mc_socket_catchup_t *c =
-    find_catchup_from_file_descriptor (msm, uf->file_descriptor);
-  clib_error_t *error = 0;
-  int n;
-
-  if (c->connect_in_progress)
-    {
-      u32 len, value;
-
-      c->connect_in_progress = 0;
-      len = sizeof (value);
-      if (getsockopt (c->socket, SOL_SOCKET, SO_ERROR, &value, &len) < 0)
-	{
-	  error = clib_error_return_unix (0, "getsockopt SO_ERROR");
-	  goto error_quit;
-	}
-      if (value != 0)
-	{
-	  error =
-	    clib_error_return_code (0, value, CLIB_ERROR_ERRNO_VALID,
-				    "connect fails");
-	  goto error_quit;
-	}
-    }
-
-  while (1)
-    {
-      u32 n_this_write;
-
-      n_this_write =
-	clib_min (vec_len (c->output_vector) - c->output_vector_n_written,
-		  msm->rx_mtu_n_bytes -
-		  64 /* ip + tcp + option allowance */ );
-
-      if (n_this_write <= 0)
-	break;
-
-      do
-	{
-	  n = write (uf->file_descriptor,
-		     c->output_vector + c->output_vector_n_written,
-		     n_this_write);
-	}
-      while (n < 0 && errno == EAGAIN);
-
-      if (n < 0)
-	{
-	  error = clib_error_return_unix (0, "write");
-	  goto error_quit;
-	}
-      c->output_vector_n_written += n;
-    }
-
-  if (c->output_vector_n_written >= vec_len (c->output_vector))
-    {
-      if (!is_server)
-	{
-	  uf->flags &= ~UNIX_FILE_DATA_AVAILABLE_TO_WRITE;
-	  unix_main.file_update (uf, UNIX_FILE_UPDATE_MODIFY);
-	  /* Send EOF to other side. */
-	  shutdown (uf->file_descriptor, SHUT_WR);
-	  return error;
-	}
-      else
-	{
-	error_quit:
-	  catchup_cleanup (msm, c, um, uf);
-	}
-    }
-  return error;
-}
-
-static clib_error_t *
-catchup_server_write_ready (unix_file_t * uf)
-{
-  return catchup_socket_write_ready (uf, /* is_server */ 1);
-}
-
-static clib_error_t *
-catchup_client_write_ready (unix_file_t * uf)
-{
-  return catchup_socket_write_ready (uf, /* is_server */ 0);
-}
-
-static clib_error_t *
-catchup_socket_error_ready (unix_file_t * uf)
-{
-  unix_main_t *um = &unix_main;
-  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
-  mc_socket_catchup_t *c =
-    find_catchup_from_file_descriptor (msm, uf->file_descriptor);
-  catchup_cleanup (msm, c, um, uf);
-  return clib_error_return (0, "error");
-}
-
-static clib_error_t *
-catchup_listen_read_ready (unix_file_t * uf)
-{
-  mc_socket_main_t *msm = (mc_socket_main_t *) uf->private_data;
-  struct sockaddr_in client_addr;
-  int client_len;
-  mc_socket_catchup_t *c;
-  unix_file_t template = { 0 };
-
-  pool_get (msm->catchups, c);
-  memset (c, 0, sizeof (c[0]));
-
-  client_len = sizeof (client_addr);
-
-  /* Acquires the non-blocking attrib from the server socket. */
-  c->socket = accept (uf->file_descriptor,
-		      (struct sockaddr *) &client_addr,
-		      (socklen_t *) & client_len);
-
-  if (c->socket < 0)
-    {
-      pool_put (msm->catchups, c);
-      return clib_error_return_unix (0, "accept");
-    }
-
-  if (MC_EVENT_LOGGING)
-    {
-      mc_main_t *mcm = &msm->mc_main;
-      vlib_main_t *vm = mcm->vlib_main;
-
-      ELOG_TYPE_DECLARE (e) =
-      {
-      .format = "catchup accepted from 0x%lx",.format_args = "i4",};
-      struct
-      {
-	u32 addr;
-      } *ed = 0;
-
-      ed = ELOG_DATA (&vm->elog_main, e);
-      ed->addr = ntohl (client_addr.sin_addr.s_addr);
-    }
-
-  /* Disable the Nagle algorithm, ship catchup pkts immediately */
-  {
-    int one = 1;
-    if ((setsockopt (c->socket, IPPROTO_TCP,
-		     TCP_NODELAY, (void *) &one, sizeof (one))) < 0)
-      {
-	clib_unix_warning ("catchup socket: set TCP_NODELAY");
-      }
-  }
-
-  template.read_function = catchup_server_read_ready;
-  template.write_function = catchup_server_write_ready;
-  template.error_function = catchup_socket_error_ready;
-  template.file_descriptor = c->socket;
-  template.private_data = pointer_to_uword (msm);
-  c->unix_file_index = unix_file_add (&unix_main, &template);
-  hash_set (msm->catchup_index_by_file_descriptor, c->socket,
-	    c - msm->catchups);
-
-  return 0;
-}
-
-/* Return and bind to an unused port. */
-static word
-find_and_bind_to_free_port (word sock, word port)
-{
-  for (; port < 1 << 16; port++)
-    {
-      struct sockaddr_in a;
-
-      memset (&a, 0, sizeof (a));	/* Warnings be gone */
-
-      a.sin_family = PF_INET;
-      a.sin_addr.s_addr = INADDR_ANY;
-      a.sin_port = htons (port);
-
-      if (bind (sock, (struct sockaddr *) &a, sizeof (a)) >= 0)
-	break;
-    }
-
-  return port < 1 << 16 ? port : -1;
-}
-
-static clib_error_t *
-setup_mutlicast_socket (mc_socket_main_t * msm,
-			mc_multicast_socket_t * ms,
-			char *type, uword udp_port)
-{
-  int one = 1;
-  struct ip_mreq mcast_req;
-
-  if (!msm->multicast_ttl)
-    msm->multicast_ttl = 1;
-
-  /* mastership (multicast) TX socket */
-  if ((ms->socket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
-    return clib_error_return_unix (0, "%s socket", type);
-
-  {
-    u8 ttl = msm->multicast_ttl;
-
-    if ((setsockopt (ms->socket, IPPROTO_IP,
-		     IP_MULTICAST_TTL, (void *) &ttl, sizeof (ttl))) < 0)
-      return clib_error_return_unix (0, "%s set multicast ttl", type);
-  }
-
-  if (setsockopt (ms->socket, SOL_SOCKET, SO_REUSEADDR, &one, sizeof (one)) <
-      0)
-    return clib_error_return_unix (0, "%s setsockopt SO_REUSEADDR", type);
-
-  memset (&ms->tx_addr, 0, sizeof (ms->tx_addr));
-  ms->tx_addr.sin_family = AF_INET;
-  ms->tx_addr.sin_addr.s_addr =
-    htonl (msm->multicast_tx_ip4_address_host_byte_order);
-  ms->tx_addr.sin_port = htons (udp_port);
-
-  if (bind (ms->socket, (struct sockaddr *) &ms->tx_addr,
-	    sizeof (ms->tx_addr)) < 0)
-    return clib_error_return_unix (0, "%s bind", type);
-
-  memset (&mcast_req, 0, sizeof (mcast_req));
-  mcast_req.imr_multiaddr.s_addr =
-    htonl (msm->multicast_tx_ip4_address_host_byte_order);
-  mcast_req.imr_interface.s_addr = msm->if_ip4_address_net_byte_order;
-
-  if ((setsockopt (ms->socket, IPPROTO_IP,
-		   IP_ADD_MEMBERSHIP, (void *) &mcast_req,
-		   sizeof (mcast_req))) < 0)
-    return clib_error_return_unix (0, "%s IP_ADD_MEMBERSHIP setsockopt",
-				   type);
-
-  if (ioctl (ms->socket, FIONBIO, &one) < 0)
-    return clib_error_return_unix (0, "%s set FIONBIO", type);
-
-  /* FIXME remove this when we support tx_ready. */
-  {
-    u32 len = 1 << 20;
-    socklen_t sl = sizeof (len);
-    if (setsockopt (ms->socket, SOL_SOCKET, SO_SNDBUF, &len, sl) < 0)
-      clib_unix_error ("setsockopt");
-  }
-
-  return 0;
-}
-
-static clib_error_t *
-socket_setup (mc_socket_main_t * msm)
-{
-  int one = 1;
-  clib_error_t *error;
-  u32 port;
-
-  if (!msm->base_multicast_udp_port_host_byte_order)
-    msm->base_multicast_udp_port_host_byte_order =
-      0xffff - ((MC_N_TRANSPORT_TYPE + 2 /* ack socket, catchup socket */ )
-		- 1);
-
-  port = msm->base_multicast_udp_port_host_byte_order;
-
-  error = setup_mutlicast_socket (msm,
-				  &msm->multicast_sockets
-				  [MC_TRANSPORT_MASTERSHIP], "mastership",
-				  port++);
-  if (error)
-    return error;
-
-  error = setup_mutlicast_socket (msm,
-				  &msm->multicast_sockets[MC_TRANSPORT_JOIN],
-				  "join", port++);
-  if (error)
-    return error;
-
-  error = setup_mutlicast_socket (msm,
-				  &msm->multicast_sockets
-				  [MC_TRANSPORT_USER_REQUEST_TO_RELAY],
-				  "to relay", port++);
-  if (error)
-    return error;
-
-  error = setup_mutlicast_socket (msm,
-				  &msm->multicast_sockets
-				  [MC_TRANSPORT_USER_REQUEST_FROM_RELAY],
-				  "from relay", port++);
-  if (error)
-    return error;
-
-  /* ACK rx socket */
-  msm->ack_socket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
-  if (msm->ack_socket < 0)
-    return clib_error_return_unix (0, "ack socket");
-
-  msm->ack_udp_port = find_and_bind_to_free_port (msm->ack_socket, port++);
-
-  if (ioctl (msm->ack_socket, FIONBIO, &one) < 0)
-    return clib_error_return_unix (0, "ack socket FIONBIO");
-
-  msm->catchup_server_socket = socket (AF_INET, SOCK_STREAM, 0);
-  if (msm->catchup_server_socket < 0)
-    return clib_error_return_unix (0, "catchup server socket");
-
-  msm->catchup_tcp_port =
-    find_and_bind_to_free_port (msm->catchup_server_socket, port++);
-
-  if (ioctl (msm->catchup_server_socket, FIONBIO, &one) < 0)
-    return clib_error_return_unix (0, "catchup server socket FIONBIO");
-
-  if (listen (msm->catchup_server_socket, 5) < 0)
-    return clib_error_return_unix (0, "catchup server socket listen");
-
-  /* epoll setup for multicast mastership socket */
-  {
-    unix_file_t template = { 0 };
-
-    template.read_function = mastership_socket_read_ready;
-    template.file_descriptor =
-      msm->multicast_sockets[MC_TRANSPORT_MASTERSHIP].socket;
-    template.private_data = (uword) msm;
-    unix_file_add (&unix_main, &template);
-
-    /* epoll setup for multicast to_relay socket */
-    template.read_function = to_relay_socket_read_ready;
-    template.file_descriptor =
-      msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_TO_RELAY].socket;
-    template.private_data = (uword) msm;
-    unix_file_add (&unix_main, &template);
-
-    /* epoll setup for multicast from_relay socket */
-    template.read_function = from_relay_socket_read_ready;
-    template.file_descriptor =
-      msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_FROM_RELAY].socket;
-    template.private_data = (uword) msm;
-    unix_file_add (&unix_main, &template);
-
-    template.read_function = join_socket_read_ready;
-    template.file_descriptor =
-      msm->multicast_sockets[MC_TRANSPORT_JOIN].socket;
-    template.private_data = (uword) msm;
-    unix_file_add (&unix_main, &template);
-
-    /* epoll setup for ack rx socket */
-    template.read_function = ack_socket_read_ready;
-    template.file_descriptor = msm->ack_socket;
-    template.private_data = (uword) msm;
-    unix_file_add (&unix_main, &template);
-
-    /* epoll setup for TCP catchup server */
-    template.read_function = catchup_listen_read_ready;
-    template.file_descriptor = msm->catchup_server_socket;
-    template.private_data = (uword) msm;
-    unix_file_add (&unix_main, &template);
-  }
-
-  return 0;
-}
-
-static void *
-catchup_add_pending_output (mc_socket_catchup_t * c, uword n_bytes,
-			    u8 * set_output_vector)
-{
-  unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
-				       c->unix_file_index);
-  u8 *result = 0;
-
-  if (set_output_vector)
-    c->output_vector = set_output_vector;
-  else
-    vec_add2 (c->output_vector, result, n_bytes);
-  if (vec_len (c->output_vector) > 0)
-    {
-      int skip_update = 0 != (uf->flags & UNIX_FILE_DATA_AVAILABLE_TO_WRITE);
-      uf->flags |= UNIX_FILE_DATA_AVAILABLE_TO_WRITE;
-      if (!skip_update)
-	unix_main.file_update (uf, UNIX_FILE_UPDATE_MODIFY);
-    }
-  return result;
-}
-
-static uword
-catchup_request_fun (void *transport_main,
-		     u32 stream_index, mc_peer_id_t catchup_peer_id)
-{
-  mc_socket_main_t *msm = (mc_socket_main_t *) transport_main;
-  mc_main_t *mcm = &msm->mc_main;
-  vlib_main_t *vm = mcm->vlib_main;
-  mc_socket_catchup_t *c;
-  struct sockaddr_in addr;
-  unix_main_t *um = &unix_main;
-  int one = 1;
-
-  pool_get (msm->catchups, c);
-  memset (c, 0, sizeof (*c));
-
-  c->socket = socket (AF_INET, SOCK_STREAM, 0);
-  if (c->socket < 0)
-    {
-      clib_unix_warning ("socket");
-      return 0;
-    }
-
-  if (ioctl (c->socket, FIONBIO, &one) < 0)
-    {
-      clib_unix_warning ("FIONBIO");
-      return 0;
-    }
-
-  memset (&addr, 0, sizeof (addr));
-  addr.sin_family = AF_INET;
-  addr.sin_addr.s_addr = mc_socket_peer_id_get_address (catchup_peer_id);
-  addr.sin_port = mc_socket_peer_id_get_port (catchup_peer_id);
-
-  c->connect_in_progress = 1;
-
-  if (MC_EVENT_LOGGING)
-    {
-      ELOG_TYPE_DECLARE (e) =
-      {
-      .format = "connecting to peer 0x%Lx",.format_args = "i8",};
-      struct
-      {
-	u64 peer;
-      } *ed;
-      ed = ELOG_DATA (&vm->elog_main, e);
-      ed->peer = catchup_peer_id.as_u64;
-    }
-
-  if (connect (c->socket, (const void *) &addr, sizeof (addr))
-      < 0 && errno != EINPROGRESS)
-    {
-      clib_unix_warning ("connect to %U fails",
-			 format_socket_peer_id, catchup_peer_id);
-      return 0;
-    }
-
-  {
-    unix_file_t template = { 0 };
-
-    template.read_function = catchup_client_read_ready;
-    template.write_function = catchup_client_write_ready;
-    template.error_function = catchup_socket_error_ready;
-    template.file_descriptor = c->socket;
-    template.private_data = (uword) msm;
-    c->unix_file_index = unix_file_add (um, &template);
-
-    hash_set (msm->catchup_index_by_file_descriptor, c->socket,
-	      c - msm->catchups);
-  }
-
-  {
-    mc_msg_catchup_request_t *mp;
-    mp = catchup_add_pending_output (c, sizeof (mp[0]),	/* set_output_vector */
-				     0);
-    mp->peer_id = msm->mc_main.transport.our_catchup_peer_id;
-    mp->stream_index = stream_index;
-    mc_byte_swap_msg_catchup_request (mp);
-  }
-
-  return c - msm->catchups;
-}
-
-static void
-catchup_send_fun (void *transport_main, uword opaque, u8 * data)
-{
-  mc_socket_main_t *msm = (mc_socket_main_t *) transport_main;
-  mc_socket_catchup_t *c = pool_elt_at_index (msm->catchups, opaque);
-  catchup_add_pending_output (c, 0, data);
-}
-
-static int
-find_interface_ip4_address (char *if_name, u32 * ip4_address, u32 * mtu)
-{
-  int fd;
-  struct ifreq ifr;
-  struct sockaddr_in *sa;
-
-  /* Dig up our IP address */
-  fd = socket (PF_INET, AF_INET, 0);
-  if (fd < 0)
-    {
-      clib_unix_error ("socket");
-      return -1;
-    }
-
-  ifr.ifr_addr.sa_family = AF_INET;
-  strncpy (ifr.ifr_name, if_name, sizeof (ifr.ifr_name) - 1);
-  if (ioctl (fd, SIOCGIFADDR, &ifr) < 0)
-    {
-      clib_unix_error ("ioctl(SIOCFIGADDR)");
-      close (fd);
-      return -1;
-    }
-
-  sa = (void *) &ifr.ifr_addr;
-  clib_memcpy (ip4_address, &sa->sin_addr.s_addr, sizeof (ip4_address[0]));
-
-  if (ioctl (fd, SIOCGIFMTU, &ifr) < 0)
-    {
-      close (fd);
-      return -1;
-    }
-  if (mtu)
-    *mtu = ifr.ifr_mtu - ( /* IP4 header */ 20 + /* UDP header */ 8);
-
-  close (fd);
-
-  return 0;
-}
-
-clib_error_t *
-mc_socket_main_init (mc_socket_main_t * msm, char **intfc_probe_list,
-		     int n_intfcs_to_probe)
-{
-  clib_error_t *error;
-  mc_main_t *mcm;
-  u32 mtu;
-
-  mcm = &msm->mc_main;
-
-  /* 239.255.0.7 */
-  if (!msm->multicast_tx_ip4_address_host_byte_order)
-    msm->multicast_tx_ip4_address_host_byte_order = 0xefff0007;
-
-  {
-    u32 i, a, win;
-
-    win = 0;
-    if (msm->multicast_interface_name)
-      {
-	win =
-	  !find_interface_ip4_address (msm->multicast_interface_name, &a,
-				       &mtu);
-      }
-    else
-      {
-	for (i = 0; i < n_intfcs_to_probe; i++)
-	  if (!find_interface_ip4_address (intfc_probe_list[i], &a, &mtu))
-	    {
-	      win = 1;
-	      msm->multicast_interface_name = intfc_probe_list[i];
-	      break;
-	    }
-      }
-
-    if (!win)
-      return clib_error_return (0, "can't find interface ip4 address");
-
-    msm->if_ip4_address_net_byte_order = a;
-  }
-
-  msm->rx_mtu_n_bytes = mtu;
-  msm->rx_mtu_n_buffers =
-    msm->rx_mtu_n_bytes / VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES;
-  msm->rx_mtu_n_buffers +=
-    (msm->rx_mtu_n_bytes % VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES) != 0;
-
-  error = socket_setup (msm);
-  if (error)
-    return error;
-
-  mcm->transport.our_ack_peer_id =
-    mc_socket_set_peer_id (msm->if_ip4_address_net_byte_order,
-			   msm->ack_udp_port);
-
-  mcm->transport.our_catchup_peer_id =
-    mc_socket_set_peer_id (msm->if_ip4_address_net_byte_order,
-			   msm->catchup_tcp_port);
-
-  mcm->transport.tx_buffer = tx_buffer;
-  mcm->transport.tx_ack = tx_ack;
-  mcm->transport.catchup_request_fun = catchup_request_fun;
-  mcm->transport.catchup_send_fun = catchup_send_fun;
-  mcm->transport.format_peer_id = format_socket_peer_id;
-  mcm->transport.opaque = msm;
-  mcm->transport.max_packet_size = mtu;
-
-  mc_main_init (mcm, "socket");
-
-  return error;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/unix/mc_socket.h b/vlib/vlib/unix/mc_socket.h
deleted file mode 100644
index 273c9ad4..00000000
--- a/vlib/vlib/unix/mc_socket.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * mc_socket.h: socket based multicast for vlib mc
- *
- * Copyright (c) 2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __included_mc_socket_h__
-#define __included_mc_socket_h__
-
-#include <vlib/unix/unix.h>
-#include <netinet/in.h>
-
-typedef struct
-{
-  int socket;
-  struct sockaddr_in tx_addr;
-} mc_multicast_socket_t;
-
-/* TCP catchup socket */
-typedef struct
-{
-  int socket;
-  u32 unix_file_index;
-
-  u8 *input_vector;
-  u8 *output_vector;
-  u32 output_vector_n_written;
-
-  u32 connect_in_progress;
-} mc_socket_catchup_t;
-
-typedef struct mc_socket_main_t
-{
-  mc_main_t mc_main;
-
-  /* Multicast mastership/to-relay/from-relay sockets. */
-  mc_multicast_socket_t multicast_sockets[MC_N_TRANSPORT_TYPE];
-
-  /* Unicast UDP ack sockets */
-  int ack_socket;
-
-  /* TCP catchup server socket */
-  int catchup_server_socket;
-
-  /* Pool of stream-private catchup sockets */
-  mc_socket_catchup_t *catchups;
-
-  uword *catchup_index_by_file_descriptor;
-
-  u32 rx_mtu_n_bytes;
-
-  /* Receive MTU in bytes and VLIB buffers. */
-  u32 rx_mtu_n_buffers;
-
-  /* Vector of RX VLIB buffers. */
-  u32 *rx_buffers;
-  /* Vector of scatter/gather descriptors for sending/receiving VLIB buffers
-     via kernel. */
-  struct iovec *iovecs;
-
-  /* IP address of interface to use for multicast. */
-  u32 if_ip4_address_net_byte_order;
-
-  u32 ack_udp_port;
-  u32 catchup_tcp_port;
-
-  /* Interface on which to listen for multicasts. */
-  char *multicast_interface_name;
-
-  /* Multicast address to use (e.g. 0xefff0000).
-     Host byte order. */
-  u32 multicast_tx_ip4_address_host_byte_order;
-
-  /* TTL to use for multicasts. */
-  u32 multicast_ttl;
-
-  /* Multicast ports for mastership, joins, etc. will be chosen
-     starting at the given port in host byte order.
-     A total of MC_N_TRANSPORT_TYPE ports will be used. */
-  u32 base_multicast_udp_port_host_byte_order;
-} mc_socket_main_t;
-
-always_inline u32
-mc_socket_peer_id_get_address (mc_peer_id_t i)
-{
-  u32 a = ((i.as_u8[0] << 24)
-	   | (i.as_u8[1] << 16) | (i.as_u8[2] << 8) | (i.as_u8[3] << 0));
-  return clib_host_to_net_u32 (a);
-}
-
-always_inline u32
-mc_socket_peer_id_get_port (mc_peer_id_t i)
-{
-  return clib_host_to_net_u16 ((i.as_u8[4] << 8) | i.as_u8[5]);
-}
-
-static_always_inline mc_peer_id_t
-mc_socket_set_peer_id (u32 address_net_byte_order, u32 port_host_byte_order)
-{
-  mc_peer_id_t i;
-  u32 a = ntohl (address_net_byte_order);
-  u32 p = port_host_byte_order;
-  i.as_u8[0] = (a >> 24) & 0xff;
-  i.as_u8[1] = (a >> 16) & 0xff;
-  i.as_u8[2] = (a >> 8) & 0xff;
-  i.as_u8[3] = (a >> 0) & 0xff;
-  i.as_u8[4] = (p >> 8) & 0xff;
-  i.as_u8[5] = (p >> 0) & 0xff;
-  i.as_u8[6] = 0;
-  i.as_u8[7] = 0;
-  return i;
-}
-
-clib_error_t *mc_socket_main_init (mc_socket_main_t * msm,
-				   char **intfc_probe_list,
-				   int n_intfcs_to_probe);
-#endif /* __included_mc_socket_h__ */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/unix/physmem.c b/vlib/vlib/unix/physmem.c
deleted file mode 100644
index 80ab7b9d..00000000
--- a/vlib/vlib/unix/physmem.c
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * physmem.c: Unix physical memory
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/unix/physmem.h>
-
-static physmem_main_t physmem_main;
-
-static void *
-unix_physmem_alloc_aligned (vlib_physmem_main_t * vpm, uword n_bytes,
-			    uword alignment)
-{
-  physmem_main_t *pm = &physmem_main;
-  uword lo_offset, hi_offset;
-  uword *to_free = 0;
-
-#if DPDK > 0
-  clib_warning ("unsafe alloc!");
-#endif
-
-  /* IO memory is always at least cache aligned. */
-  alignment = clib_max (alignment, CLIB_CACHE_LINE_BYTES);
-
-  while (1)
-    {
-      mheap_get_aligned (pm->heap, n_bytes,
-			 /* align */ alignment,
-			 /* align offset */ 0,
-			 &lo_offset);
-
-      /* Allocation failed? */
-      if (lo_offset == ~0)
-	break;
-
-      /* Make sure allocation does not span DMA physical chunk boundary. */
-      hi_offset = lo_offset + n_bytes - 1;
-
-      if ((lo_offset >> vpm->log2_n_bytes_per_page) ==
-	  (hi_offset >> vpm->log2_n_bytes_per_page))
-	break;
-
-      /* Allocation would span chunk boundary, queue it to be freed as soon as
-         we find suitable chunk. */
-      vec_add1 (to_free, lo_offset);
-    }
-
-  if (to_free != 0)
-    {
-      uword i;
-      for (i = 0; i < vec_len (to_free); i++)
-	mheap_put (pm->heap, to_free[i]);
-      vec_free (to_free);
-    }
-
-  return lo_offset != ~0 ? pm->heap + lo_offset : 0;
-}
-
-static void
-unix_physmem_free (void *x)
-{
-  physmem_main_t *pm = &physmem_main;
-
-  /* Return object to region's heap. */
-  mheap_put (pm->heap, x - pm->heap);
-}
-
-static void
-htlb_shutdown (void)
-{
-  physmem_main_t *pm = &physmem_main;
-
-  if (!pm->shmid)
-    return;
-  shmctl (pm->shmid, IPC_RMID, 0);
-  pm->shmid = 0;
-}
-
-/* try to use huge TLB pgs if possible */
-static int
-htlb_init (vlib_main_t * vm)
-{
-  vlib_physmem_main_t *vpm = &vm->physmem_main;
-  physmem_main_t *pm = &physmem_main;
-  u64 hugepagesize, pagesize;
-  u64 pfn, seek_loc;
-  u64 cur, physaddr, ptbits;
-  int fd, i;
-
-  pm->shmid = shmget (11 /* key, my amp goes to 11 */ , pm->mem_size,
-		      IPC_CREAT | SHM_HUGETLB | SHM_R | SHM_W);
-  if (pm->shmid < 0)
-    {
-      clib_unix_warning ("shmget");
-      return 0;
-    }
-
-  pm->mem = shmat (pm->shmid, NULL, 0 /* flags */ );
-  if (pm->mem == 0)
-    {
-      shmctl (pm->shmid, IPC_RMID, 0);
-      return 0;
-    }
-
-  memset (pm->mem, 0, pm->mem_size);
-
-  /* $$$ get page size info from /proc/meminfo */
-  hugepagesize = 2 << 20;
-  pagesize = 4 << 10;
-  vpm->log2_n_bytes_per_page = min_log2 (hugepagesize);
-  vec_resize (vpm->page_table, pm->mem_size / hugepagesize);
-
-  vpm->page_mask = pow2_mask (vpm->log2_n_bytes_per_page);
-  vpm->virtual.start = pointer_to_uword (pm->mem);
-  vpm->virtual.size = pm->mem_size;
-  vpm->virtual.end = vpm->virtual.start + vpm->virtual.size;
-
-  fd = open ("/proc/self/pagemap", O_RDONLY);
-
-  if (fd < 0)
-    {
-      (void) shmdt (pm->mem);
-      return 0;
-    }
-
-  pm->heap = mheap_alloc_with_flags (pm->mem, pm->mem_size,
-				     /* Don't want mheap mmap/munmap with IO memory. */
-				     MHEAP_FLAG_DISABLE_VM);
-
-  cur = pointer_to_uword (pm->mem);
-  i = 0;
-
-  while (cur < pointer_to_uword (pm->mem) + pm->mem_size)
-    {
-      pfn = (u64) cur / pagesize;
-      seek_loc = pfn * sizeof (u64);
-      if (lseek (fd, seek_loc, SEEK_SET) != seek_loc)
-	{
-	  clib_unix_warning ("lseek to 0x%llx", seek_loc);
-	  shmctl (pm->shmid, IPC_RMID, 0);
-	  close (fd);
-	  return 0;
-	}
-      if (read (fd, &ptbits, sizeof (ptbits)) != (sizeof (ptbits)))
-	{
-	  clib_unix_warning ("read ptbits");
-	  shmctl (pm->shmid, IPC_RMID, 0);
-	  close (fd);
-	  return 0;
-	}
-
-      /* bits 0-54 are the physical page number */
-      physaddr = (ptbits & 0x7fffffffffffffULL) * pagesize;
-      if (CLIB_DEBUG > 1)
-	fformat (stderr, "pm: virtual 0x%llx physical 0x%llx\n",
-		 cur, physaddr);
-      vpm->page_table[i++] = physaddr;
-
-      cur += hugepagesize;
-    }
-  close (fd);
-  atexit (htlb_shutdown);
-  return 1;
-}
-
-int vlib_app_physmem_init (vlib_main_t * vm,
-			   physmem_main_t * pm, int) __attribute__ ((weak));
-int
-vlib_app_physmem_init (vlib_main_t * vm, physmem_main_t * pm, int x)
-{
-  return 0;
-}
-
-clib_error_t *
-unix_physmem_init (vlib_main_t * vm, int physical_memory_required)
-{
-  vlib_physmem_main_t *vpm = &vm->physmem_main;
-  physmem_main_t *pm = &physmem_main;
-  clib_error_t *error = 0;
-
-  /* Avoid multiple calls. */
-  if (vm->os_physmem_alloc_aligned)
-    return error;
-
-  vm->os_physmem_alloc_aligned = unix_physmem_alloc_aligned;
-  vm->os_physmem_free = unix_physmem_free;
-  pm->mem = MAP_FAILED;
-
-  if (pm->mem_size == 0)
-    pm->mem_size = 16 << 20;
-
-  /* OK, Mr. App, you tell us */
-  if (vlib_app_physmem_init (vm, pm, physical_memory_required))
-    return 0;
-
-  if (!pm->no_hugepages && htlb_init (vm))
-    {
-      fformat (stderr, "%s: use huge pages\n", __FUNCTION__);
-      return 0;
-    }
-
-  pm->mem =
-    mmap (0, pm->mem_size, PROT_READ | PROT_WRITE,
-	  MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-  if (pm->mem == MAP_FAILED)
-    {
-      error = clib_error_return_unix (0, "mmap");
-      goto done;
-    }
-
-  pm->heap = mheap_alloc (pm->mem, pm->mem_size);
-
-  /* Identity map with a single page. */
-  vpm->log2_n_bytes_per_page = min_log2 (pm->mem_size);
-  vec_add1 (vpm->page_table, pointer_to_uword (pm->mem));
-
-  vpm->page_mask = pow2_mask (vpm->log2_n_bytes_per_page);
-  vpm->virtual.start = pointer_to_uword (pm->mem);
-  vpm->virtual.size = pm->mem_size;
-  vpm->virtual.end = vpm->virtual.start + vpm->virtual.size;
-  vpm->is_fake = 1;
-
-  fformat (stderr, "%s: use fake dma pages\n", __FUNCTION__);
-
-done:
-  if (error)
-    {
-      if (pm->mem != MAP_FAILED)
-	munmap (pm->mem, pm->mem_size);
-    }
-  return error;
-}
-
-static clib_error_t *
-show_physmem (vlib_main_t * vm,
-	      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-#if DPDK > 0
-  vlib_cli_output (vm, "Not supported with DPDK drivers.");
-#else
-  physmem_main_t *pm = &physmem_main;
-
-  if (pm->heap)
-    vlib_cli_output (vm, "%U", format_mheap, pm->heap, /* verbose */ 1);
-  else
-    vlib_cli_output (vm, "No physmem allocated.");
-#endif
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_physmem_command, static) = {
-  .path = "show physmem",
-  .short_help = "Show physical memory allocation",
-  .function = show_physmem,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-show_affinity (vlib_main_t * vm,
-	       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  cpu_set_t set;
-  cpu_set_t *setp = &set;
-  int i, rv;
-  u8 *s = 0;
-  int first_set_bit_in_run = -1;
-  int last_set_bit_in_run = -1;
-  int output_done = 0;
-
-  rv = sched_getaffinity (0 /* pid, 0 = this proc */ ,
-			  sizeof (*setp), setp);
-  if (rv < 0)
-    {
-      vlib_cli_output (vm, "Couldn't get affinity mask: %s\n",
-		       strerror (errno));
-      return 0;
-    }
-
-  for (i = 0; i < 64; i++)
-    {
-      if (CPU_ISSET (i, setp))
-	{
-	  if (first_set_bit_in_run == -1)
-	    {
-	      first_set_bit_in_run = i;
-	      last_set_bit_in_run = i;
-	      if (output_done)
-		s = format (s, ",");
-	      s = format (s, "%d-", i);
-	      output_done = 1;
-	    }
-	  else
-	    {
-	      if (i == (last_set_bit_in_run + 1))
-		last_set_bit_in_run = i;
-	    }
-	}
-      else
-	{
-	  if (first_set_bit_in_run != -1)
-	    {
-	      if (first_set_bit_in_run == (i - 1))
-		{
-		  _vec_len (s) -= 2 + ((first_set_bit_in_run / 10));
-		}
-	      s = format (s, "%d", last_set_bit_in_run);
-	      first_set_bit_in_run = -1;
-	      last_set_bit_in_run = -1;
-	    }
-	}
-    }
-
-  if (first_set_bit_in_run != -1)
-    s = format (s, "%d", first_set_bit_in_run);
-
-  vlib_cli_output (vm, "Process runs on: %v", s);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_affinity_command, static) = {
-  .path = "show affinity",
-  .short_help = "Show process cpu affinity",
-  .function = show_affinity,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_affinity (vlib_main_t * vm,
-	      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  cpu_set_t set;
-  cpu_set_t *setp = &set;
-  int i, rv;
-  int another_round;
-  u32 first, last;
-
-  memset (setp, 0, sizeof (*setp));
-
-  do
-    {
-      another_round = 0;
-      if (unformat (input, "%d-%d,", &first, &last))
-	{
-	  if (first > 64 || last > 64)
-	    {
-	    barf1:
-	      vlib_cli_output (vm, "range %d-%d invalid", first, last);
-	      return 0;
-	    }
-
-	  for (i = first; i <= last; i++)
-	    CPU_SET (i, setp);
-	  another_round = 1;
-	}
-      else if (unformat (input, "%d-%d", &first, &last))
-	{
-	  if (first > 64 || last > 64)
-	    goto barf1;
-
-	  for (i = first; i <= last; i++)
-	    CPU_SET (i, setp);
-	}
-      else if (unformat (input, "%d,", &first))
-	{
-	  if (first > 64)
-	    {
-	    barf2:
-	      vlib_cli_output (vm, "cpu %d invalid", first);
-	      return 0;
-	    }
-	  CPU_SET (first, setp);
-	  another_round = 1;
-	}
-      else if (unformat (input, "%d", &first))
-	{
-	  if (first > 64)
-	    goto barf2;
-
-	  CPU_SET (first, setp);
-	}
-    }
-  while (another_round);
-
-  rv = sched_setaffinity (0 /* pid, 0 = this proc */ ,
-			  sizeof (*setp), setp);
-
-  if (rv < 0)
-    {
-      vlib_cli_output (vm, "Couldn't get affinity mask: %s\n",
-		       strerror (errno));
-      return 0;
-    }
-  return show_affinity (vm, input, cmd);
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_affinity_command, static) = {
-  .path = "set affinity",
-  .short_help = "Set process cpu affinity",
-  .function = set_affinity,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-vlib_physmem_configure (vlib_main_t * vm, unformat_input_t * input)
-{
-  physmem_main_t *pm = &physmem_main;
-  u32 size_in_mb;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "no-huge") || unformat (input, "no-huge-pages"))
-	pm->no_hugepages = 1;
-
-      else if (unformat (input, "size-in-mb %d", &size_in_mb) ||
-	       unformat (input, "size %d", &size_in_mb))
-	pm->mem_size = size_in_mb << 20;
-      else
-	return unformat_parse_error (input);
-    }
-
-  unformat_free (input);
-  return 0;
-}
-
-VLIB_EARLY_CONFIG_FUNCTION (vlib_physmem_configure, "physmem");
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/unix/physmem.h b/vlib/vlib/unix/physmem.h
deleted file mode 100644
index 5519a7d6..00000000
--- a/vlib/vlib/unix/physmem.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_physmem_h__
-#define __included_physmem_h__
-
-/* Manage I/O physical memory. */
-#define _GNU_SOURCE
-#include <sched.h>
-#include <vppinfra/cache.h>
-#include <vppinfra/error.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/os.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-
-#include <sys/fcntl.h>		/* for open */
-#include <sys/file.h>		/* for flock */
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-
-typedef struct
-{
-  /* Virtual memory via mmaped. */
-  void *mem;
-
-  /* Size in bytes. */
-  uword mem_size;
-
-  /* Heap allocated out of virtual memory. */
-  void *heap;
-
-  /* huge TLB segment id */
-  int shmid;
-
-  /* should we try to use htlb ? */
-  int no_hugepages;
-
-} physmem_main_t;
-
-#endif /* __included_physmem_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/unix/plugin.c b/vlib/vlib/unix/plugin.c
deleted file mode 100644
index b3d5be02..00000000
--- a/vlib/vlib/unix/plugin.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * plugin.c: plugin handling
- *
- * Copyright (c) 2011 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/unix/plugin.h>
-#include <dlfcn.h>
-#include <dirent.h>
-
-plugin_main_t vlib_plugin_main;
-
-void
-vlib_set_get_handoff_structure_cb (void *cb)
-{
-  plugin_main_t *pm = &vlib_plugin_main;
-  pm->handoff_structure_get_cb = cb;
-}
-
-static void *
-vnet_get_handoff_structure (void)
-{
-  void *(*fp) (void);
-
-  fp = vlib_plugin_main.handoff_structure_get_cb;
-  if (fp == 0)
-    return 0;
-  else
-    return (*fp) ();
-}
-
-static int
-load_one_plugin (plugin_main_t * pm, plugin_info_t * pi, int from_early_init)
-{
-  void *handle, *register_handle;
-  clib_error_t *(*fp) (vlib_main_t *, void *, int);
-  clib_error_t *error;
-  void *handoff_structure;
-
-  handle = dlopen ((char *) pi->name, RTLD_LAZY);
-
-  /*
-   * Note: this can happen if the plugin has an undefined symbol reference,
-   * so print a warning. Otherwise, the poor slob won't know what happened.
-   * Ask me how I know that...
-   */
-  if (handle == 0)
-    {
-      clib_warning ("%s", dlerror ());
-      return -1;
-    }
-
-  pi->handle = handle;
-
-
-  register_handle = dlsym (pi->handle, "vlib_plugin_register");
-  if (register_handle == 0)
-    {
-      dlclose (handle);
-      clib_warning ("Plugin missing vlib_plugin_register: %s\n",
-		    (char *) pi->name);
-      return 1;
-    }
-
-  fp = register_handle;
-
-  handoff_structure = vnet_get_handoff_structure ();
-
-  if (handoff_structure == 0)
-    error = clib_error_return (0, "handoff structure callback returned 0");
-  else
-    error = (*fp) (pm->vlib_main, handoff_structure, from_early_init);
-
-  if (error)
-    {
-      clib_error_report (error);
-      dlclose (handle);
-      return 1;
-    }
-
-  clib_warning ("Loaded plugin: %s", pi->name);
-
-  return 0;
-}
-
-static u8 **
-split_plugin_path (plugin_main_t * pm)
-{
-  int i;
-  u8 **rv = 0;
-  u8 *path = pm->plugin_path;
-  u8 *this = 0;
-
-  for (i = 0; i < vec_len (pm->plugin_path); i++)
-    {
-      if (path[i] != ':')
-	{
-	  vec_add1 (this, path[i]);
-	  continue;
-	}
-      vec_add1 (this, 0);
-      vec_add1 (rv, this);
-      this = 0;
-    }
-  if (this)
-    {
-      vec_add1 (this, 0);
-      vec_add1 (rv, this);
-    }
-  return rv;
-}
-
-int
-vlib_load_new_plugins (plugin_main_t * pm, int from_early_init)
-{
-  DIR *dp;
-  struct dirent *entry;
-  struct stat statb;
-  uword *p;
-  plugin_info_t *pi;
-  u8 **plugin_path;
-  int i;
-
-  plugin_path = split_plugin_path (pm);
-
-  for (i = 0; i < vec_len (plugin_path); i++)
-    {
-      dp = opendir ((char *) plugin_path[i]);
-
-      if (dp == 0)
-	continue;
-
-      while ((entry = readdir (dp)))
-	{
-	  u8 *plugin_name;
-
-	  if (pm->plugin_name_filter)
-	    {
-	      int j;
-	      for (j = 0; j < vec_len (pm->plugin_name_filter); j++)
-		if (entry->d_name[j] != pm->plugin_name_filter[j])
-		  goto next;
-	    }
-
-	  plugin_name = format (0, "%s/%s%c", plugin_path[i],
-				entry->d_name, 0);
-
-	  /* Only accept .so */
-	  char *ext = strrchr ((const char *) plugin_name, '.');
-	  /* unreadable */
-	  if (!ext || (strcmp (ext, ".so") != 0) ||
-	      stat ((char *) plugin_name, &statb) < 0)
-	    {
-	    ignore:
-	      vec_free (plugin_name);
-	      continue;
-	    }
-
-	  /* a dir or other things which aren't plugins */
-	  if (!S_ISREG (statb.st_mode))
-	    goto ignore;
-
-	  p = hash_get_mem (pm->plugin_by_name_hash, plugin_name);
-	  if (p == 0)
-	    {
-	      vec_add2 (pm->plugin_info, pi, 1);
-	      pi->name = plugin_name;
-	      pi->file_info = statb;
-
-	      if (load_one_plugin (pm, pi, from_early_init))
-		{
-		  vec_free (plugin_name);
-		  _vec_len (pm->plugin_info) = vec_len (pm->plugin_info) - 1;
-		  continue;
-		}
-	      memset (pi, 0, sizeof (*pi));
-	      hash_set_mem (pm->plugin_by_name_hash, plugin_name,
-			    pi - pm->plugin_info);
-	    }
-	next:
-	  ;
-	}
-      closedir (dp);
-      vec_free (plugin_path[i]);
-    }
-  vec_free (plugin_path);
-  return 0;
-}
-
-char *vlib_plugin_path __attribute__ ((weak));
-char *vlib_plugin_path = "";
-char *vlib_plugin_name_filter __attribute__ ((weak));
-char *vlib_plugin_name_filter = 0;
-
-int
-vlib_plugin_early_init (vlib_main_t * vm)
-{
-  plugin_main_t *pm = &vlib_plugin_main;
-
-  pm->plugin_path = format (0, "%s%c", vlib_plugin_path, 0);
-
-  clib_warning ("plugin path %s", pm->plugin_path);
-
-  if (vlib_plugin_name_filter)
-    pm->plugin_name_filter = format (0, "%s%c", vlib_plugin_name_filter, 0);
-
-  pm->plugin_by_name_hash = hash_create_string (0, sizeof (uword));
-  pm->vlib_main = vm;
-
-  return vlib_load_new_plugins (pm, 1 /* from_early_init */ );
-}
-
-static clib_error_t *
-vlib_plugins_show_cmd_fn (vlib_main_t * vm,
-			  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  plugin_main_t *pm = &vlib_plugin_main;
-  u8 *s = 0;
-  u8 *key = 0;
-  uword *value = 0;
-  int index = 1;
-
-  s = format (s, " Plugin path is: %s\n", pm->plugin_path);
-  if (vlib_plugin_name_filter)
-    s = format (s, " Plugin filter: %s\n", vlib_plugin_name_filter);
-
-  s = format (s, " Plugins loaded: \n");
-  hash_foreach_mem (key, value, pm->plugin_by_name_hash,
-		    {
-		    if (key != 0)
-		    s = format (s, "  %d.%s\n", index, key); index++;}
-  );
-
-  vlib_cli_output (vm, "%v", s);
-  vec_free (s);
-  return 0;
-}
-
-VLIB_CLI_COMMAND (plugins_show_cmd, static) =
-{
-.path = "show plugins",.short_help = "show loaded plugins",.function =
-    vlib_plugins_show_cmd_fn,};
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/unix/plugin.h b/vlib/vlib/unix/plugin.h
deleted file mode 100644
index c17053bd..00000000
--- a/vlib/vlib/unix/plugin.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * plugin.h: plugin handling
- *
- * Copyright (c) 2011 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __included_plugin_h__
-#define __included_plugin_h__
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-/*
- * vlib plugin scheme
- *
- * Almost anything which can be made to work in a vlib unix
- * application will also work in a vlib plugin.
- *
- * The elf-section magic which registers static objects
- * works so long as plugins are preset when the vlib unix process
- * starts. But wait: there's more...
- *
- * If an application calls vlib_load_new_plugins() -- possibly after
- * changing vlib_plugin_main.plugin_path / vlib_plugin_main.plugin_name_filter,
- * -- new plugins will be loaded. That, in turn, allows considerable
- * flexibility in terms of adding feature code or fixing bugs without
- * requiring the data-plane process to restart.
- *
- * When the plugin mechanism loads a plugin, it uses dlsym to locate
- * and call the plugin's function vlib_plugin_register() if it exists.
- * A plugin which expects to be loaded after the vlib application
- * starts uses this callback to modify the application. If vlib_plugin_register
- * returns non-zero, the plugin mechanism dlclose()'s the plugin.
- *
- * Applications control the plugin search path and name filter by
- * declaring the variables vlib_plugin_path and vlib_plugin_name_filter.
- * libvlib_unix.la supplies weak references for these symbols which
- * effectively disable the scheme. In order for the elf-section magic to
- * work, static plugins must be loaded at the earliest possible moment.
- *
- * An application can change these parameters at any time and call
- * vlib_load_new_plugins().
- */
-
-
-
-typedef struct
-{
-  u8 *name;
-  struct stat file_info;
-  void *handle;
-} plugin_info_t;
-
-typedef struct
-{
-  /* loaded plugin info */
-  plugin_info_t *plugin_info;
-  uword *plugin_by_name_hash;
-
-  /* path and name filter */
-  u8 *plugin_path;
-  u8 *plugin_name_filter;
-
-  /* handoff structure get callback */
-  void *handoff_structure_get_cb;
-
-  /* usual */
-  vlib_main_t *vlib_main;
-} plugin_main_t;
-
-extern plugin_main_t vlib_plugin_main;
-
-int vlib_plugin_early_init (vlib_main_t * vm);
-int vlib_load_new_plugins (plugin_main_t * pm, int from_early_init);
-
-#endif /* __included_plugin_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/unix/unix.h b/vlib/vlib/unix/unix.h
deleted file mode 100644
index ea0d417b..00000000
--- a/vlib/vlib/unix/unix.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * unix.h: Unix specific main state
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_unix_unix_h
-#define included_unix_unix_h
-
-#include <vppinfra/socket.h>
-#include <termios.h>
-
-struct unix_file;
-typedef clib_error_t *(unix_file_function_t) (struct unix_file * f);
-
-typedef struct unix_file
-{
-  /* Unix file descriptor from open/socket. */
-  u32 file_descriptor;
-
-  u32 flags;
-#define UNIX_FILE_DATA_AVAILABLE_TO_WRITE (1 << 0)
-#define UNIX_FILE_EVENT_EDGE_TRIGGERED   (1 << 1)
-
-  /* Data available for function's use. */
-  uword private_data;
-
-  /* Functions to be called when read/write data becomes ready. */
-  unix_file_function_t *read_function, *write_function, *error_function;
-} unix_file_t;
-
-typedef struct
-{
-  f64 time;
-  clib_error_t *error;
-} unix_error_history_t;
-
-typedef enum
-{
-  UNIX_FILE_UPDATE_ADD,
-  UNIX_FILE_UPDATE_MODIFY,
-  UNIX_FILE_UPDATE_DELETE,
-} unix_file_update_type_t;
-
-typedef struct
-{
-  /* Back pointer to main structure. */
-  vlib_main_t *vlib_main;
-
-  u32 flags;
-  /* Run interactively or as daemon (background process). */
-#define UNIX_FLAG_INTERACTIVE (1 << 0)
-#define UNIX_FLAG_NODAEMON (1 << 1)
-
-  /* Pool of files to poll for input/output. */
-  unix_file_t *file_pool;
-
-  /* CLI listen socket. */
-  clib_socket_t cli_listen_socket;
-
-  void (*file_update) (unix_file_t * file,
-		       unix_file_update_type_t update_type);
-
-  /* Circular buffer of last unix errors. */
-  unix_error_history_t error_history[128];
-  u32 error_history_index;
-  u64 n_total_errors;
-
-  /* startup-config filename */
-  u8 *startup_config_filename;
-
-  /* unix config complete */
-  volatile int unix_config_complete;
-
-  /* CLI log file. GIGO. */
-  u8 *log_filename;
-  int log_fd;
-
-  /* Don't put CLI connections into character mode */
-  int cli_line_mode;
-
-  /* Maximum amount of command line history to keep per session */
-  u32 cli_history_limit;
-
-  /* Suppress the welcome banner at CLI session start */
-  int cli_no_banner;
-
-  /* Maximum pager buffer size */
-  u32 cli_pager_buffer_limit;
-
-  /* Suppress the pager */
-  int cli_no_pager;
-
-  /* Store the original state of stdin when it's a tty */
-  struct termios tio_stdin;
-  int tio_isset;
-} unix_main_t;
-
-/* Global main structure. */
-extern unix_main_t unix_main;
-
-always_inline uword
-unix_file_add (unix_main_t * um, unix_file_t * template)
-{
-  unix_file_t *f;
-  pool_get (um->file_pool, f);
-  f[0] = template[0];
-  um->file_update (f, UNIX_FILE_UPDATE_ADD);
-  return f - um->file_pool;
-}
-
-always_inline void
-unix_file_del (unix_main_t * um, unix_file_t * f)
-{
-  um->file_update (f, UNIX_FILE_UPDATE_DELETE);
-  close (f->file_descriptor);
-  f->file_descriptor = ~0;
-  pool_put (um->file_pool, f);
-}
-
-always_inline uword
-unix_file_set_data_available_to_write (u32 unix_file_index,
-				       uword is_available)
-{
-  unix_file_t *uf = pool_elt_at_index (unix_main.file_pool, unix_file_index);
-  uword was_available = (uf->flags & UNIX_FILE_DATA_AVAILABLE_TO_WRITE);
-  if ((was_available != 0) != (is_available != 0))
-    {
-      uf->flags ^= UNIX_FILE_DATA_AVAILABLE_TO_WRITE;
-      unix_main.file_update (uf, UNIX_FILE_UPDATE_MODIFY);
-    }
-  return was_available != 0;
-}
-
-always_inline void
-unix_save_error (unix_main_t * um, clib_error_t * error)
-{
-  unix_error_history_t *eh = um->error_history + um->error_history_index;
-  clib_error_free_vector (eh->error);
-  eh->error = error;
-  eh->time = vlib_time_now (um->vlib_main);
-  um->n_total_errors += 1;
-  if (++um->error_history_index >= ARRAY_LEN (um->error_history))
-    um->error_history_index = 0;
-}
-
-/* Main function for Unix VLIB. */
-int vlib_unix_main (int argc, char *argv[]);
-
-/* Call to allocate/initialize physical DMA memory subsystem.
-   This is not an init function so that users can explicitly enable/disable
-   physmem when its not needed. */
-clib_error_t *unix_physmem_init (vlib_main_t * vm,
-				 int fail_if_physical_memory_not_present);
-
-static inline int
-unix_physmem_is_fake (vlib_main_t * vm)
-{
-  vlib_physmem_main_t *vpm = &vm->physmem_main;
-  return vpm->is_fake;
-}
-
-/* Set prompt for CLI. */
-void vlib_unix_cli_set_prompt (char *prompt);
-
-static inline unix_main_t *
-vlib_unix_get_main (void)
-{
-  return &unix_main;
-}
-
-/* thread stack array; vec_len = max number of threads */
-extern u8 **vlib_thread_stacks;
-
-/* utils */
-
-clib_error_t *vlib_sysfs_write (char *file_name, char *fmt, ...);
-
-clib_error_t *vlib_sysfs_read (char *file_name, char *fmt, ...);
-
-u8 *vlib_sysfs_link_to_name (char *link);
-
-int vlib_sysfs_get_free_hugepages (unsigned int numa_node, int page_size);
-
-clib_error_t *foreach_directory_file (char *dir_name,
-				      clib_error_t * (*f) (void *arg,
-							   u8 * path_name,
-							   u8 * file_name),
-				      void *arg, int scan_dirs);
-
-#endif /* included_unix_unix_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/unix/util.c b/vlib/vlib/unix/util.c
deleted file mode 100644
index edc3e591..00000000
--- a/vlib/vlib/unix/util.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pci.c: Linux user space PCI bus management.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-
-clib_error_t *
-foreach_directory_file (char *dir_name,
-			clib_error_t * (*f) (void *arg, u8 * path_name,
-					     u8 * file_name), void *arg,
-			int scan_dirs)
-{
-  DIR *d;
-  struct dirent *e;
-  clib_error_t *error = 0;
-  u8 *s, *t;
-
-  d = opendir (dir_name);
-  if (!d)
-    {
-      if (errno == ENOENT)
-	return 0;
-      return clib_error_return_unix (0, "open `%s'", dir_name);
-    }
-
-  s = t = 0;
-  while (1)
-    {
-      e = readdir (d);
-      if (!e)
-	break;
-      if (scan_dirs)
-	{
-	  if (e->d_type == DT_DIR
-	      && (!strcmp (e->d_name, ".") || !strcmp (e->d_name, "..")))
-	    continue;
-	}
-      else
-	{
-	  if (e->d_type == DT_DIR)
-	    continue;
-	}
-
-      s = format (s, "%s/%s", dir_name, e->d_name);
-      t = format (t, "%s", e->d_name);
-      error = f (arg, s, t);
-      _vec_len (s) = 0;
-      _vec_len (t) = 0;
-
-      if (error)
-	break;
-    }
-
-  vec_free (s);
-  closedir (d);
-
-  return error;
-}
-
-clib_error_t *
-vlib_sysfs_write (char *file_name, char *fmt, ...)
-{
-  u8 *s;
-  int fd;
-  clib_error_t *error = 0;
-
-  fd = open (file_name, O_WRONLY);
-  if (fd < 0)
-    return clib_error_return_unix (0, "open `%s'", file_name);
-
-  va_list va;
-  va_start (va, fmt);
-  s = va_format (0, fmt, &va);
-  va_end (va);
-
-  if (write (fd, s, vec_len (s)) < 0)
-    error = clib_error_return_unix (0, "write `%s'", file_name);
-
-  vec_free (s);
-  close (fd);
-  return error;
-}
-
-clib_error_t *
-vlib_sysfs_read (char *file_name, char *fmt, ...)
-{
-  unformat_input_t input;
-  u8 *s = 0;
-  int fd;
-  ssize_t sz;
-  uword result;
-
-  fd = open (file_name, O_RDONLY);
-  if (fd < 0)
-    return clib_error_return_unix (0, "open `%s'", file_name);
-
-  vec_validate (s, 4095);
-
-  sz = read (fd, s, vec_len (s));
-  if (sz < 0)
-    {
-      close (fd);
-      vec_free (s);
-      return clib_error_return_unix (0, "read `%s'", file_name);
-    }
-
-  _vec_len (s) = sz;
-  unformat_init_vector (&input, s);
-
-  va_list va;
-  va_start (va, fmt);
-  result = va_unformat (&input, fmt, &va);
-  va_end (va);
-
-  vec_free (s);
-  close (fd);
-
-  if (result == 0)
-    return clib_error_return (0, "unformat error");
-
-  return 0;
-}
-
-u8 *
-vlib_sysfs_link_to_name (char *link)
-{
-  char *p, buffer[64];
-  unformat_input_t in;
-  u8 *s = 0;
-  int r;
-
-  r = readlink (link, buffer, sizeof (buffer) - 1);
-
-  if (r < 0)
-    return 0;
-
-  buffer[r] = 0;
-  p = strrchr (buffer, '/');
-
-  if (!p)
-    return 0;
-
-  unformat_init_string (&in, p + 1, strlen (p + 1));
-  if (unformat (&in, "%s", &s) != 1)
-    clib_unix_warning ("no string?");
-  unformat_free (&in);
-
-  return s;
-}
-
-int
-vlib_sysfs_get_free_hugepages (unsigned int numa_node, int page_size)
-{
-  struct stat sb;
-  u8 *p = 0;
-  int r = -1;
-
-  p = format (p, "/sys/devices/system/node/node%u%c", numa_node, 0);
-
-  if (stat ((char *) p, &sb) == 0)
-    {
-      if (S_ISDIR (sb.st_mode) == 0)
-	goto done;
-    }
-  else if (numa_node == 0)
-    {
-      vec_reset_length (p);
-      p = format (p, "/sys/kernel/mm%c", 0);
-      if (stat ((char *) p, &sb) < 0 || S_ISDIR (sb.st_mode) == 0)
-	goto done;
-    }
-  else
-    goto done;
-
-  _vec_len (p) -= 1;
-  p = format (p, "/hugepages/hugepages-%ukB/free_hugepages%c", page_size, 0);
-  vlib_sysfs_read ((char *) p, "%d", &r);
-
-done:
-  vec_free (p);
-  return r;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/vlib.h b/vlib/vlib/vlib.h
deleted file mode 100644
index b146a49b..00000000
--- a/vlib/vlib/vlib.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * vlib.h: top-level include file
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_h
-#define included_vlib_h
-
-#include <vppinfra/clib.h>
-#include <vppinfra/elf_clib.h>
-
-/* Generic definitions. */
-#include <vlib/defs.h>
-
-/* Forward declarations of structs to avoid circular dependencies. */
-struct vlib_main_t;
-
-/* All includes in alphabetical order. */
-#include <vlib/buffer.h>
-#include <vlib/cli.h>
-#include <vlib/counter.h>
-#include <vlib/error.h>
-#include <vlib/init.h>
-#include <vlib/mc.h>
-#include <vlib/node.h>
-#include <vlib/physmem.h>
-#include <vlib/trace.h>
-
-/* Main include depends on other vlib/ includes so we put it last. */
-#include <vlib/main.h>
-
-/* Inline/extern function declarations. */
-#include <vlib/threads.h>
-#include <vlib/buffer_funcs.h>
-#include <vlib/cli_funcs.h>
-#include <vlib/error_funcs.h>
-#include <vlib/format_funcs.h>
-#include <vlib/node_funcs.h>
-#include <vlib/trace_funcs.h>
-#include <vlib/global_funcs.h>
-
-#include <vlib/buffer_node.h>
-
-#endif /* included_vlib_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vlib/vlib/vlib_process_doc.h b/vlib/vlib/vlib_process_doc.h
deleted file mode 100644
index a47c5e4b..00000000
--- a/vlib/vlib/vlib_process_doc.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#error do not #include this file!
-
-/** \file
-
-    Cooperative multi-tasking thread support.
-
-    Vlib provides a lightweight cooperative multi-tasking thread
-    model. Context switching costs a setjmp/longjump pair.  It's not
-    unreasonable to put vlib threads to sleep for 10us.
-
-    The graph node scheduler invokes these processes in much the same
-    way as traditional vector-processing run-to-completion graph
-    nodes; plus-or-minus a setjmp/longjmp pair required to switch
-    stacks. Simply set the vlib_node_registration_t type field to
-    VLIB_NODE_TYPE_PROCESS. Process is a misnomer; these are threads.
-
-    As of this writing, the default stack size is 2<<15;
-    32kb. Initialize the node registration's
-    process_log2_n_stack_bytes member as needed. The graph node
-    dispatcher makes some effort to detect stack overrun. We map a
-    no-access page below each thread stack.
-
-    Process node dispatch functions are expected to be while(1) { }
-    loops which suspend when not otherwise occupied, and which must
-    not run for unreasonably long periods of time.  Unreasonably long
-    is an application-dependent concept. Over the years, we have
-    constructed frame-size sensitive control-plane nodes which will
-    use a much higher fraction of the available CPU bandwidth when the
-    frame size is low. Classic example: modifying forwarding
-    tables. So long as the table-builder leaves the forwarding tables
-    in a valid state, one can suspend the table builder to avoid
-    dropping packets as a result of control-plane activity.
-
-    Process nodes can suspend for fixed amounts of time, or until another
-    entity signals an event, or both. See the example below.
-
-    When running in VLIB process context, one must pay strict attention to
-    loop invariant issues. If one walks a data structure and calls a
-    function which may suspend, one had best know by construction that it
-    cannot change. Often, it s best to simply make a snapshot copy of a
-    data structure, walk the copy at leisure, then free the copy.
-
-    Here's an example:
-
-    <code><pre>
-    \#define EXAMPLE_POLL_PERIOD 10.0
-
-    static uword
-    example_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
-                     vlib_frame_t * f)
-    {
-      f64 poll_time_remaining;
-      uword event_type, *event_data = 0;
-
-      poll_time_remaining = EXAMPLE_POLL_PERIOD;
-      while (1)
-        {
-          int i;
-
-           // Sleep until next periodic call due,
-           // or until we receive event(s)
-           //
-          poll_time_remaining =
-    	    vlib_process_wait_for_event_or_clock (vm, poll_time_remaining);
-
-          event_type = vlib_process_get_events (vm, &event_data);
-          switch (event_type)
-     	    {
-       	    case ~0:		// no events => timeout
-      	      break;
-
-            case EVENT1:
-    	      for (i = 0; i < vec_len (event_data); i++)
-    	        handle_event1 (mm, event_data[i]);
-    	      break;
-
-    	    case EVENT2:
-    	      for (i = 0; i < vec_len (event_data); i++)
-    	        handle_event2 (vm, event_data[i]);
-    	      break;
-
-              // ... and so forth for each event type
-
-            default:
-              // This should never happen...
-    	      clib_warning ("BUG: unhandled event type %d",
-                            event_type);
-    	      break;
-      	    }
-          vec_reset_length (event_data);
-
-          // Timer expired, call periodic function
-          if (vlib_process_suspend_time_is_zero (poll_time_remaining))
-    	    {
-    	      example_periodic (vm);
-    	      poll_time_remaining = EXAMPLE_POLL_PERIOD;
-    	    }
-        }
-      // NOTREACHED
-      return 0;
-    }
-
-    static VLIB_REGISTER_NODE (example_node) = {
-      .function = example_process,
-      .type = VLIB_NODE_TYPE_PROCESS,
-      .name = "example-process",
-    };
-    </pre></code>
-
-    In this example, the VLIB process node waits for an event to
-    occur, or for 10 seconds to elapse. The code demuxes on the event
-    type, calling the appropriate handler function.
-
-    Each call to vlib_process_get_events returns a vector of
-    per-event-type data passed to successive vlib_process_signal_event
-    calls; vec_len (event_data) >= 1.  It is an error to process only
-    event_data[0].
-
-    Resetting the event_data vector-length to 0 by calling
-    vec_reset_length (event_data) - instead of calling vec_free (...)
-    - means that the event scheme doesn t burn cycles continuously
-    allocating and freeing the event data vector. This is a common
-    coding pattern, well worth using when appropriate.
-*/
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/.gitignore b/vnet/.gitignore
deleted file mode 100644
index b25c15b8..00000000
--- a/vnet/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
diff --git a/vnet/Makefile.am b/vnet/Makefile.am
deleted file mode 100644
index adc9043a..00000000
--- a/vnet/Makefile.am
+++ /dev/null
@@ -1,993 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall -Werror @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @IPV6SR@
-
-API_FILES =
-
-libvnet_la_SOURCES =
-libvnetplugin_la_SOURCES =
-nobase_include_HEADERS =
-noinst_PROGRAMS =
-TESTS =
-
-dpdk_libs =
-if WITH_DPDK
-dpdk_libs += -l:libdpdk.a
-endif
-
-########################################
-# Generic stuff
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/config.c					\
-  vnet/devices/devices.c			\
-  vnet/handoff.c				\
-  vnet/interface.c				\
-  vnet/interface_api.c				\
-  vnet/interface_cli.c				\
-  vnet/interface_format.c			\
-  vnet/interface_output.c			\
-  vnet/misc.c					\
-  vnet/replication.c				\
-  vnet/rewrite.c
-
-nobase_include_HEADERS +=			\
-  vnet/api_errno.h				\
-  vnet/buffer.h					\
-  vnet/config.h					\
-  vnet/devices/devices.h			\
-  vnet/global_funcs.h				\
-  vnet/handoff.h				\
-  vnet/interface.h				\
-  vnet/interface.api.h				\
-  vnet/interface_funcs.h			\
-  vnet/l3_types.h				\
-  vnet/pipeline.h				\
-  vnet/replication.h				\
-  vnet/rewrite.h				\
-  vnet/vnet.h					\
-  vnet/vnet_all_api_h.h				\
-  vnet/vnet_msg_enum.h
-
-API_FILES += vnet/interface.api
-
-########################################
-# Policer infra
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/policer/node_funcs.c			\
-  vnet/policer/policer.c			\
-  vnet/policer/xlate.c
-
-nobase_include_HEADERS +=			\
-  vnet/policer/police.h				\
-  vnet/policer/policer.h			\
-  vnet/policer/xlate.h
-
-########################################
-# Cop - junk filter
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/cop/cop.c				\
-  vnet/cop/node1.c				\
-  vnet/cop/ip4_whitelist.c			\
-  vnet/cop/ip6_whitelist.c
-
-nobase_include_HEADERS +=			\
-  vnet/cop/cop.h
-
-########################################
-# Layer 2 protocols go here
-########################################
-
-########################################
-# Layer 2 protocol: Ethernet
-########################################
-libvnet_la_SOURCES +=				\
- vnet/ethernet/arp.c				\
- vnet/ethernet/format.c				\
- vnet/ethernet/init.c				\
- vnet/ethernet/interface.c			\
- vnet/ethernet/node.c				\
- vnet/ethernet/pg.c
-
-nobase_include_HEADERS +=			\
- vnet/ethernet/arp_packet.h			\
- vnet/ethernet/error.def			\
- vnet/ethernet/ethernet.h			\
- vnet/ethernet/packet.h				\
- vnet/ethernet/types.def
-
-########################################
-# Layer 2 protocol: Ethernet bridging
-########################################
-libvnet_la_SOURCES +=				\
- vnet/l2/feat_bitmap.c				\
- vnet/l2/l2_api.c				\
- vnet/l2/l2_bd.c				\
- vnet/l2/l2_bvi.c				\
- vnet/l2/l2_input_classify.c			\
- vnet/l2/l2_output_classify.c			\
- vnet/l2/l2_efp_filter.c			\
- vnet/l2/l2_fib.c				\
- vnet/l2/l2_flood.c				\
- vnet/l2/l2_fwd.c				\
- vnet/l2/l2_input_acl.c				\
- vnet/l2/l2_input.c				\
- vnet/l2/l2_input_vtr.c				\
- vnet/l2/l2_learn.c				\
- vnet/l2/l2_output_acl.c			\
- vnet/l2/l2_output.c				\
- vnet/l2/l2_patch.c				\
- vnet/l2/l2_rw.c				\
- vnet/l2/l2_vtr.c				\
- vnet/l2/l2_xcrw.c
-
-nobase_include_HEADERS +=			\
- vnet/l2/feat_bitmap.h				\
- vnet/l2/l2_input.h				\
- vnet/l2/l2_output.h				\
- vnet/l2/l2_vtr.h				\
- vnet/l2/l2_input_vtr.h				\
- vnet/l2/l2_efp_filter.h			\
- vnet/l2/l2_fwd.h				\
- vnet/l2/l2_bd.h				\
- vnet/l2/l2_bvi.h				\
- vnet/l2/l2_flood.h				\
- vnet/l2/l2_fib.h				\
- vnet/l2/l2_rw.h				\
- vnet/l2/l2_xcrw.h				\
- vnet/l2/l2_classify.h				\
- vnet/l2/l2.api.h
-
-API_FILES += vnet/l2/l2.api
-
-########################################
-# Layer 2 protocol: SRP
-########################################
-libvnet_la_SOURCES +=				\
- vnet/srp/format.c				\
- vnet/srp/interface.c				\
- vnet/srp/node.c				\
- vnet/srp/pg.c
-
-nobase_include_HEADERS +=			\
- vnet/srp/packet.h				\
- vnet/srp/srp.h
-
-########################################
-# Layer 2 protocol: PPP
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/ppp/node.c				\
-  vnet/ppp/pg.c					\
-  vnet/ppp/ppp.c
-
-nobase_include_HEADERS +=			\
- vnet/ppp/error.def				\
- vnet/ppp/ppp.h					\
- vnet/ppp/packet.h
-
-########################################
-# Layer 2 protocol: HDLC
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/hdlc/node.c				\
-  vnet/hdlc/pg.c				\
-  vnet/hdlc/hdlc.c
-
-nobase_include_HEADERS +=			\
- vnet/hdlc/error.def				\
- vnet/hdlc/hdlc.h				\
- vnet/hdlc/packet.h
-
-########################################
-# Layer 2 protocol: LLC
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/llc/llc.c				\
-  vnet/llc/node.c				\
-  vnet/llc/pg.c
-
-nobase_include_HEADERS +=			\
- vnet/llc/llc.h
-
-########################################
-# Layer 2 protocol: SNAP
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/snap/snap.c				\
-  vnet/snap/node.c				\
-  vnet/snap/pg.c
-
-nobase_include_HEADERS +=			\
- vnet/snap/snap.h
-
-########################################
-# Layer 2 / vxlan
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/vxlan/vxlan.c				\
-  vnet/vxlan/encap.c				\
-  vnet/vxlan/decap.c				\
-  vnet/vxlan/vxlan_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/vxlan/vxlan.h				\
-  vnet/vxlan/vxlan_packet.h			\
-  vnet/vxlan/vxlan_error.def			\
-  vnet/vxlan/vxlan.api.h
-
-API_FILES += vnet/vxlan/vxlan.api
-
-########################################
-# Layer 2 / CDP
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/cdp/cdp_input.c				\
-  vnet/cdp/cdp_node.c				\
-  vnet/cdp/cdp_periodic.c
-
-nobase_include_HEADERS +=			\
-  vnet/cdp/cdp_protocol.h
-
-########################################
-# Layer 2 / LLDP
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/lldp/lldp_input.c			\
-  vnet/lldp/lldp_node.c				\
-  vnet/lldp/lldp_output.c			\
-  vnet/lldp/lldp_cli.c
-
-nobase_include_HEADERS +=			\
-  vnet/lldp/lldp_protocol.h
-
-########################################
-# Layer 2/3 "classify"
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/classify/vnet_classify.c			\
-  vnet/classify/ip_classify.c			\
-  vnet/classify/input_acl.c			\
-  vnet/classify/policer_classify.c		\
-  vnet/classify/flow_classify.c                 \
-  vnet/classify/flow_classify_node.c            \
-  vnet/classify/vnet_classify.h
-
-nobase_include_HEADERS +=			\
-  vnet/classify/vnet_classify.h	                \
-  vnet/classify/input_acl.h                     \
-  vnet/classify/policer_classify.h              \
-  vnet/classify/flow_classify.h
-
-########################################
-# Layer 3 protocols go here
-########################################
-
-########################################
-# Layer 3 protocol: IP v4/v6
-########################################
-libvnet_la_SOURCES +=				\
- vnet/ip/format.c				\
- vnet/ip/icmp4.c				\
- vnet/ip/icmp6.c				\
- vnet/ip/ip46_cli.c				\
- vnet/ip/ip4_format.c				\
- vnet/ip/ip4_forward.c				\
- vnet/ip/ip4_input.c				\
- vnet/ip/ip4_mtrie.c				\
- vnet/ip/ip4_pg.c				\
- vnet/ip/ip4_source_and_port_range_check.c	\
- vnet/ip/ip4_source_check.c			\
- vnet/ip/ip6_format.c				\
- vnet/ip/ip6_forward.c				\
- vnet/ip/ip6_hop_by_hop.c			\
- vnet/ip/ip6_input.c				\
- vnet/ip/ip6_neighbor.c				\
- vnet/ip/ip6_pg.c				\
- vnet/ip/ip_api.c				\
- vnet/ip/ip_checksum.c				\
- vnet/ip/ip_frag.c				\
- vnet/ip/ip.h					\
- vnet/ip/ip_init.c				\
- vnet/ip/ip_input_acl.c				\
- vnet/ip/lookup.c				\
- vnet/ip/ping.c					\
- vnet/ip/punt.c					\
- vnet/ip/udp_format.c				\
- vnet/ip/udp_init.c				\
- vnet/ip/udp_local.c				\
- vnet/ip/udp_pg.c
-
-nobase_include_HEADERS +=			\
- vnet/ip/format.h				\
- vnet/ip/icmp46_packet.h			\
- vnet/ip/icmp4.h				\
- vnet/ip/icmp6.h				\
- vnet/ip/igmp_packet.h				\
- vnet/ip/ip.api.h				\
- vnet/ip/ip4_error.h				\
- vnet/ip/ip4.h					\
- vnet/ip/ip4_mtrie.h				\
- vnet/ip/ip4_packet.h				\
- vnet/ip/ip6_error.h				\
- vnet/ip/ip6.h					\
- vnet/ip/ip6_hop_by_hop.h			\
- vnet/ip/ip6_hop_by_hop_packet.h		\
- vnet/ip/ip6_packet.h				\
- vnet/ip/ip6_neighbor.h				\
- vnet/ip/ip.h					\
- vnet/ip/ip_packet.h				\
- vnet/ip/ip_source_and_port_range_check.h	\
- vnet/ip/lookup.h				\
- vnet/ip/ports.def				\
- vnet/ip/protocols.def				\
- vnet/ip/punt_error.def				\
- vnet/ip/punt.h					\
- vnet/ip/tcp_packet.h				\
- vnet/ip/udp_error.def				\
- vnet/ip/udp.h					\
- vnet/ip/udp_packet.h
-
-API_FILES += vnet/ip/ip.api
-
-########################################
-# Bidirectional Forwarding Detection
-########################################
-
-nobase_include_HEADERS +=			\
- vnet/bfd/bfd_protocol.h			\
- vnet/bfd/bfd_main.h				\
- vnet/bfd/bfd_api.h				\
- vnet/bfd/bfd_udp.h				\
- vnet/bfd/bfd.api.h
-
-libvnet_la_SOURCES +=				\
- vnet/bfd/bfd_api.h				\
- vnet/bfd/bfd_udp.c				\
- vnet/bfd/bfd_main.c				\
- vnet/bfd/bfd_protocol.c			\
- vnet/bfd/bfd_api.c
-
-API_FILES += vnet/bfd/bfd.api
-
-########################################
-# Layer 3 protocol: IPSec
-########################################
-if WITH_IPSEC
-libvnet_la_SOURCES +=				\
- vnet/ipsec/ipsec.c				\
- vnet/ipsec/ipsec_cli.c				\
- vnet/ipsec/ipsec_format.c			\
- vnet/ipsec/ipsec_input.c			\
- vnet/ipsec/ipsec_if.c				\
- vnet/ipsec/ipsec_if_in.c			\
- vnet/ipsec/ipsec_if_out.c			\
- vnet/ipsec/esp_encrypt.c			\
- vnet/ipsec/esp_decrypt.c			\
- vnet/ipsec/ikev2.c				\
- vnet/ipsec/ikev2_crypto.c			\
- vnet/ipsec/ikev2_cli.c				\
- vnet/ipsec/ikev2_payload.c			\
- vnet/ipsec/ikev2_format.c			\
- vnet/ipsec/ipsec_api.c
-
-API_FILES += vnet/ipsec/ipsec.api
-
-if WITH_DPDK_CRYPTO
-libvnet_la_SOURCES +=				\
- vnet/devices/dpdk/ipsec/esp_encrypt.c		\
- vnet/devices/dpdk/ipsec/esp_decrypt.c		\
- vnet/devices/dpdk/ipsec/crypto_node.c		\
- vnet/devices/dpdk/ipsec/cli.c			\
- vnet/devices/dpdk/ipsec/ipsec.c
-endif
-endif
-
-libvnet_la_SOURCES +=				\
- vnet/ipsec/ipsec_output.c
-
-nobase_include_HEADERS +=			\
- vnet/ipsec/ipsec.h				\
- vnet/ipsec/esp.h				\
- vnet/ipsec/ikev2.h				\
- vnet/ipsec/ikev2_priv.h			\
- vnet/ipsec/ipsec.api.h
-if WITH_DPDK_CRYPTO
-nobase_include_HEADERS +=			\
- vnet/devices/dpdk/ipsec/ipsec.h		\
- vnet/devices/dpdk/ipsec/esp.h
-endif
-
-########################################
-# Layer 3 protocol: osi
-########################################
-libvnet_la_SOURCES +=				\
- vnet/osi/node.c				\
- vnet/osi/osi.c					\
- vnet/osi/pg.c
-
-nobase_include_HEADERS +=			\
- vnet/osi/osi.h
-
-########################################
-# Layer 3 protocol: MAP
-########################################
-libvnet_la_SOURCES +=				\
- vnet/map/map.c					\
- vnet/map/map_dpo.c				\
- vnet/map/ip4_map.c				\
- vnet/map/ip6_map.c				\
- vnet/map/ip4_map_t.c				\
- vnet/map/ip6_map_t.c				\
- vnet/map/map_api.c
-
-nobase_include_HEADERS +=			\
- vnet/map/map.h					\
- vnet/map/map_dpo.h				\
- vnet/map/map.api.h
-
-API_FILES += vnet/map/map.api
-
-if ENABLE_TESTS
-TESTS += test_map
-test_map_SOURCES =                             \
- vnet/map/test.c
-test_map_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-
-test_map_LDADD = libvnet.la -lvppinfra -lvlib	\
-  -lpthread -lvlibmemory -lvlibapi -lvlib_unix	\
-  -ldl -lsvm -lrt
-
-test_map_LDFLAGS = -static
-endif
-
-
-########################################
-# Tunnel protocol: gre
-########################################
-libvnet_la_SOURCES +=				\
- vnet/gre/gre.c					\
- vnet/gre/node.c				\
- vnet/gre/interface.c				\
- vnet/gre/pg.c					\
- vnet/gre/gre_api.c
-
-nobase_include_HEADERS +=			\
- vnet/gre/gre.h					\
- vnet/gre/packet.h				\
- vnet/gre/error.def				\
- vnet/gre/gre.api.h
-
-API_FILES += vnet/gre/gre.api
-
-########################################
-# Tunnel protocol: l2tpv3
-########################################
-libvnet_la_SOURCES +=				\
- vnet/l2tp/l2tp.c				\
- vnet/l2tp/encap.c 				\
- vnet/l2tp/decap.c  				\
- vnet/l2tp/pg.c					\
- vnet/l2tp/l2tp_api.c
-
-nobase_include_HEADERS +=			\
- vnet/l2tp/l2tp.h				\
- vnet/l2tp/packet.h				\
- vnet/l2tp/l2tp.api.h
-
-API_FILES += vnet/l2tp/l2tp.api
-
-########################################
-# Tunnel protocol: gre+mpls
-########################################
-libvnet_la_SOURCES +=				\
- vnet/mpls/mpls.c				\
- vnet/mpls/mpls_lookup.c			\
- vnet/mpls/mpls_output.c			\
- vnet/mpls/mpls_features.c			\
- vnet/mpls/node.c				\
- vnet/mpls/interface.c			        \
- vnet/mpls/mpls_tunnel.c		        \
- vnet/mpls/pg.c
-
-nobase_include_HEADERS +=			\
- vnet/mpls/mpls.h				\
- vnet/mpls/mpls_types.h				\
- vnet/mpls/mpls_tunnel.h			\
- vnet/mpls/packet.h				\
- vnet/mpls/error.def
-
-
-########################################
-# Tunnel protocol: vxlan-gpe
-########################################
-
-libvnet_la_SOURCES +=				\
- vnet/vxlan-gpe/vxlan_gpe.c			\
- vnet/vxlan-gpe/encap.c				\
- vnet/vxlan-gpe/decap.c				\
- vnet/vxlan-gpe/vxlan_gpe_api.c
-
-nobase_include_HEADERS +=			\
- vnet/vxlan-gpe/vxlan_gpe.h			\
- vnet/vxlan-gpe/vxlan_gpe_packet.h		\
- vnet/vxlan-gpe/vxlan_gpe_error.def		\
- vnet/vxlan-gpe/vxlan_gpe.api.h
-
-API_FILES += vnet/vxlan-gpe/vxlan_gpe.api
-
-########################################
-# Tunnel protocol: ipsec+gre
-########################################
-libvnet_la_SOURCES +=				\
- vnet/ipsec-gre/ipsec_gre.c			\
- vnet/ipsec-gre/node.c				\
- vnet/ipsec-gre/interface.c			\
- vnet/ipsec-gre/ipsec_gre_api.c
-
-nobase_include_HEADERS +=			\
- vnet/ipsec-gre/ipsec_gre.h			\
- vnet/ipsec-gre/error.def			\
- vnet/ipsec-gre/ipsec_gre.api.h
-
-API_FILES += vnet/ipsec-gre/ipsec_gre.api
-
-########################################
-# LISP control plane: lisp-cp
-########################################
-
-libvnet_la_SOURCES +=				\
- vnet/lisp-cp/lisp_types.c			\
- vnet/lisp-cp/lisp_cp_dpo.c			\
- vnet/lisp-cp/control.c				\
- vnet/lisp-cp/gid_dictionary.c			\
- vnet/lisp-cp/lisp_msg_serdes.c			\
- vnet/lisp-cp/packets.c				\
- vnet/lisp-cp/lisp_api.c
-
-nobase_include_HEADERS +=			\
- vnet/lisp-cp/lisp_types.h			\
- vnet/lisp-cp/packets.h				\
- vnet/lisp-cp/gid_dictionary.h			\
- vnet/lisp-cp/lisp_cp_messages.h		\
- vnet/lisp-cp/lisp_msg_serdes.h			\
- vnet/lisp-cp/control.h				\
- vnet/lisp-cp/lisp.api.h
-
-API_FILES += vnet/lisp-cp/lisp.api
-
-if ENABLE_TESTS
-LDS = -lvppinfra -l:libvlib.a $(dpdk_libs) -l:libvlibmemory.a \
-	-l:libvlibapi.a -l:libsvm.a -lpthread -ldl -lrt -lm -l:libvlib_unix.a
-
-TESTS += test_cp_serdes test_lisp_types
-
-test_cp_serdes_SOURCES =			\
- test/lisp-cp/test_cp_serdes.c			\
- vnet/lisp-cp/lisp_msg_serdes.c			\
- vnet/lisp-cp/lisp_types.c			\
- vnet/lisp-cp/packets.c				\
- vnet/ip/ip_checksum.c
-
-test_lisp_types_SOURCES =			\
- test/lisp-cp/test_lisp_types.c			\
- vnet/lisp-cp/lisp_types.c
-
-test_cp_serdes_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_lisp_types_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-
-test_cp_serdes_LDADD = libvnet.la $(LDS)
-test_lisp_types_LDADD = libvnet.la $(LDS)
-
-test_cp_serdes_LDFLAGS = -static
-test_lisp_types_LDFLAGS = -static
-endif
-
-########################################
-# Tunnel protocol: lisp-gpe
-########################################
-
-libvnet_la_SOURCES +=				\
- vnet/lisp-gpe/lisp_gpe.c			\
- vnet/lisp-gpe/lisp_gpe_sub_interface.c		\
- vnet/lisp-gpe/lisp_gpe_adjacency.c		\
- vnet/lisp-gpe/lisp_gpe_tunnel.c		\
- vnet/lisp-gpe/lisp_gpe_fwd_entry.c		\
- vnet/lisp-gpe/lisp_gpe_tenant.c		\
- vnet/lisp-gpe/interface.c			\
- vnet/lisp-gpe/decap.c				\
- vnet/lisp-gpe/lisp_gpe_api.c
-
-nobase_include_HEADERS +=			\
- vnet/lisp-gpe/lisp_gpe.h			\
- vnet/lisp-gpe/lisp_gpe_fwd_entry.h		\
- vnet/lisp-gpe/lisp_gpe_tenant.h		\
- vnet/lisp-gpe/lisp_gpe_packet.h		\
- vnet/lisp-gpe/lisp_gpe_error.def		\
- vnet/lisp-gpe/lisp_gpe.api.h
-
-API_FILES += vnet/lisp-gpe/lisp_gpe.api
-
-if ENABLE_TESTS
-TESTS += test_test
-
-test_test_SOURCES = test/lisp-gpe/test.c
-
-test_test_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-
-test_test_LDADD = $(LIBOBJS)
-
-noinst_PROGRAMS += $(TESTS)
-check_PROGRAMS = $(TESTS)
-endif
-
-########################################
-# DHCP client
-########################################
-libvnet_la_SOURCES +=				\
- vnet/dhcp/client.c				\
- vnet/dhcp/client.h
-
-nobase_include_HEADERS +=			\
- vnet/dhcp/client.h
-
-########################################
-# DHCP proxy
-########################################
-libvnet_la_SOURCES +=				\
- vnet/dhcp/proxy_node.c				\
- vnet/dhcp/proxy.h
-
-nobase_include_HEADERS +=			\
- vnet/dhcp/packet.h				\
- vnet/dhcp/proxy.h				\
- vnet/dhcp/proxy_error.def
-
-########################################
-# ipv6 segment routing
-########################################
-
-if WITH_IPV6SR
-libvnet_la_SOURCES +=				\
- vnet/sr/sr.c					\
- vnet/sr/sr_replicate.c
-endif
-
-nobase_include_HEADERS +=			\
- vnet/sr/sr_packet.h				\
- vnet/sr/sr_error.def				\
- vnet/sr/sr.h
-
-########################################
-# DHCPv6 proxy
-########################################
-libvnet_la_SOURCES +=				\
- vnet/dhcpv6/proxy_node.c
-
-nobase_include_HEADERS +=			\
- vnet/dhcpv6/packet.h				\
- vnet/dhcpv6/proxy.h				\
- vnet/dhcpv6/proxy_error.def
-
-########################################
-# IPFIX / netflow v10
-########################################
-libvnet_la_SOURCES +=				\
- vnet/flow/flow_report.c
-
-nobase_include_HEADERS +=			\
- vnet/flow/flow_report.h			\
- vnet/flow/ipfix_info_elements.h		\
- vnet/flow/ipfix_packet.h
-
-########################################
-# IPFIX classify code
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/flow/flow_report_classify.c
-
-nobase_include_HEADERS +=			\
-  vnet/flow/flow_report_classify.h
-
-########################################
-# lawful intercept
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/lawful-intercept/lawful_intercept.c	\
-  vnet/lawful-intercept/node.c
-
-nobase_include_HEADERS += 			\
-  vnet/lawful-intercept/lawful_intercept.h
-
-########################################
-# SPAN (port mirroring)
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/span/span_api.c  \
-  vnet/span/span.c	    \
-  vnet/span/node.c
-
-nobase_include_HEADERS += 			\
-  vnet/span/span.api.h  \
-  vnet/span/span.h
-
-API_FILES += vnet/span/span.api
-
-########################################
-# Packet generator
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/pg/cli.c					\
-  vnet/pg/edit.c				\
-  vnet/pg/init.c				\
-  vnet/pg/input.c				\
-  vnet/pg/output.c				\
-  vnet/pg/stream.c
-
-nobase_include_HEADERS +=			\
-  vnet/pg/pg.h					\
-  vnet/pg/edit.h
-
-########################################
-# DPDK
-########################################
-if WITH_DPDK
-libvnet_la_SOURCES +=				\
-  vnet/devices/dpdk/dpdk_priv.h		\
-  vnet/devices/dpdk/device.c		\
-  vnet/devices/dpdk/format.c		\
-  vnet/devices/dpdk/init.c			\
-  vnet/devices/dpdk/node.c			\
-  vnet/devices/dpdk/hqos.c			\
-  vnet/devices/dpdk/cli.c
-
-nobase_include_HEADERS +=			\
-  vnet/devices/dpdk/dpdk.h
-else
-libvnet_la_SOURCES +=				\
-  vnet/devices/nic/ixge.c                       \
-  vnet/devices/nic/ixge.h                       \
-  vnet/devices/nic/sfp.c                        \
-  vnet/devices/nic/sfp.h
-endif
-
-########################################
-# virtio
-########################################
-
-libvnet_la_SOURCES +=       \
-  vnet/devices/virtio/vhost-user.c	\
-  vnet/devices/virtio/vhost_user_api.c
-
-nobase_include_HEADERS +=     \
-  vnet/devices/virtio/vhost-user.h	\
-  vnet/devices/virtio/vhost_user.api.h
-
-API_FILES += vnet/devices/virtio/vhost_user.api
-
-########################################
-# ssvm ethernet
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/devices/ssvm/ssvm_eth.c			\
-  vnet/devices/ssvm/node.c
-
-nobase_include_HEADERS +=			\
-  vnet/devices/ssvm/ssvm_eth.h
-
-########################################
-# Linux packet interface
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/devices/af_packet/af_packet.c		\
-  vnet/devices/af_packet/device.c		\
-  vnet/devices/af_packet/node.c			\
-  vnet/devices/af_packet/cli.c			\
-  vnet/devices/af_packet/af_packet_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/devices/af_packet/af_packet.h	\
-  vnet/devices/af_packet/af_packet.api.h
-
-API_FILES += vnet/devices/af_packet/af_packet.api
-
-########################################
-# NETMAP interface
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/devices/netmap/netmap.c			\
-  vnet/devices/netmap/device.c			\
-  vnet/devices/netmap/node.c			\
-  vnet/devices/netmap/cli.c			\
-  vnet/devices/netmap/netmap_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/devices/netmap/netmap.h		\
-  vnet/devices/netmap/netmap.api.h
-
-API_FILES += vnet/devices/netmap/netmap.api
-
-########################################
-# Driver feature graph arc support
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/feature/feature.c			\
-  vnet/feature/registration.c
-
-nobase_include_HEADERS +=			\
-  vnet/feature/feature.h
-
-########################################
-# Unix kernel related
-########################################
-
-# FIXME: vnet/unix/hgshm.c
-
-libvnet_la_SOURCES +=				\
-  vnet/unix/gdb_funcs.c				\
-  vnet/unix/pcap.c				\
-  vnet/unix/tap_api.c				\
-  vnet/unix/tapcli.c				\
-  vnet/unix/tuntap.c
-
-nobase_include_HEADERS +=			\
-  vnet/unix/pcap.h				\
-  vnet/unix/tuntap.h				\
-  vnet/unix/tap.api.h				\
-  vnet/unix/tapcli.h
-
-API_FILES += vnet/unix/tap.api
-
-########################################
-# FIB
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/fib/fib.c                                \
-  vnet/fib/fib_test.c                           \
-  vnet/fib/ip4_fib.c                            \
-  vnet/fib/ip6_fib.c                            \
-  vnet/fib/mpls_fib.c                           \
-  vnet/fib/fib_table.c                          \
-  vnet/fib/fib_walk.c                           \
-  vnet/fib/fib_types.c                          \
-  vnet/fib/fib_node.c                           \
-  vnet/fib/fib_node_list.c                      \
-  vnet/fib/fib_entry.c                          \
-  vnet/fib/fib_entry_src.c                      \
-  vnet/fib/fib_entry_src_rr.c                   \
-  vnet/fib/fib_entry_src_interface.c            \
-  vnet/fib/fib_entry_src_default_route.c        \
-  vnet/fib/fib_entry_src_special.c              \
-  vnet/fib/fib_entry_src_api.c                  \
-  vnet/fib/fib_entry_src_adj.c                  \
-  vnet/fib/fib_entry_src_mpls.c                 \
-  vnet/fib/fib_entry_src_lisp.c                 \
-  vnet/fib/fib_entry_cover.c                    \
-  vnet/fib/fib_entry_delegate.c                 \
-  vnet/fib/fib_path_list.c                      \
-  vnet/fib/fib_path.c				\
-  vnet/fib/fib_path_ext.c			\
-  vnet/fib/fib_urpf_list.c			\
-  vnet/fib/fib_attached_export.c
-
-nobase_include_HEADERS +=			\
-  vnet/fib/fib.h				\
-  vnet/fib/fib_api.h				\
-  vnet/fib/ip4_fib.h				\
-  vnet/fib/ip6_fib.h				\
-  vnet/fib/fib_types.h				\
-  vnet/fib/fib_table.h				\
-  vnet/fib/fib_node.h				\
-  vnet/fib/fib_node_list.h			\
-  vnet/fib/fib_entry.h				\
-  vnet/fib/fib_entry_delegate.h
-
-########################################
-# ADJ
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/adj/adj_nbr.c				\
-  vnet/adj/adj_rewrite.c			\
-  vnet/adj/adj_glean.c   			\
-  vnet/adj/adj_midchain.c   			\
-  vnet/adj/adj_l2.c      			\
-  vnet/adj/adj.c
-
-nobase_include_HEADERS +=			\
-  vnet/adj/adj.h				\
-  vnet/adj/adj_types.h				\
-  vnet/adj/adj_rewrite.h			\
-  vnet/adj/adj_glean.h  			\
-  vnet/adj/adj_nbr.h
-
-########################################
-# Data-Plane Objects
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/dpo/dpo.c				\
-  vnet/dpo/drop_dpo.c				\
-  vnet/dpo/ip_null_dpo.c			\
-  vnet/dpo/punt_dpo.c				\
-  vnet/dpo/receive_dpo.c			\
-  vnet/dpo/load_balance.c			\
-  vnet/dpo/load_balance_map.c			\
-  vnet/dpo/lookup_dpo.c				\
-  vnet/dpo/classify_dpo.c			\
-  vnet/dpo/mpls_label_dpo.c
-
-nobase_include_HEADERS +=			\
-  vnet/dpo/load_balance.h			\
-  vnet/dpo/drop_dpo.h				\
-  vnet/dpo/lookup_dpo.h				\
-  vnet/dpo/punt_dpo.h				\
-  vnet/dpo/classify_dpo.h			\
-  vnet/dpo/receive_dpo.h			\
-  vnet/dpo/ip_null_dpo.h			\
-  vnet/dpo/dpo.h
-
-########################################
-# Plugin client library
-########################################
-
-libvnetplugin_la_SOURCES +=                    \
-  vnet/plugin/p1.c
-
-nobase_include_HEADERS +=                      \
-  vnet/plugin/plugin.h
-
-lib_LTLIBRARIES = libvnet.la libvnetplugin.la
-
-pcap2pg_SOURCES = 				\
-  vnet/unix/pcap2pg.c				\
-  vnet/unix/pcap.h
-
-pcap2pg_LDFLAGS = -static
-pcap2pg_LDADD = libvnet.la -l:libvppinfra.a -lpthread -lm -ldl
-
-noinst_PROGRAMS += pcap2pg
-
-# Set the suffix list
-SUFFIXES = .api.h .api .api.json
-
-# install the API definition, so we can produce java bindings, etc.
-
-apidir = $(prefix)/vnet
-
-api_DATA = \
-	$(patsubst %.api,%.api.json,$(API_FILES))
-
-BUILT_SOURCES = \
-	$(patsubst %.api,%.api.json,$(API_FILES)) \
-	$(patsubst %.api,%.api.h,$(API_FILES))
-
-# The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk
-# and requires a symbolic link at the top of the vnet source tree
-
-include $(top_srcdir)/suffix-rules.mk
diff --git a/vnet/configure.ac b/vnet/configure.ac
deleted file mode 100644
index 6a5281b0..00000000
--- a/vnet/configure.ac
+++ /dev/null
@@ -1,49 +0,0 @@
-AC_INIT(vnet, 1.1)
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_HEADERS(config/config.h)
-LT_INIT
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-AC_ARG_WITH(dpdk,
-            AC_HELP_STRING([--with-dpdk],[Use DPDK]),
-            [with_dpdk=1],
-            [with_dpdk=0])
-
-AC_ARG_WITH(dpdk_crypto,
-            AC_HELP_STRING([--with-dpdk-crypto],[Use DPDK cryptodev]),
-            [with_dpdk_crypto=1],
-            [with_dpdk_crypto=0])
-
-AC_ARG_WITH(ipsec,
-            AC_HELP_STRING([--without-ipsec],[Disable ipsec]),
-            [with_ipsec=0],
-            [with_ipsec=1])
-
-AC_ARG_WITH(ipv6sr,
-            AC_HELP_STRING([--without-ipv6sr],[Disable ipv6sr]),
-            [with_ipv6sr=0],
-            [with_ipv6sr=1])
-
-AC_ARG_ENABLE(tests,
-              AC_HELP_STRING([--enable-tests], [Build unit tests]),
-              [enable_tests=1],
-              [enable_tests=0])
-
-AM_CONDITIONAL(WITH_DPDK_CRYPTO, test "$with_dpdk_crypto" = "1")
-AC_SUBST(DPDK_CRYPTO,[-DDPDK_CRYPTO=${with_dpdk_crypto}])
-
-AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1")
-AC_SUBST(DPDK,[-DDPDK=${with_dpdk}])
-
-AM_CONDITIONAL(WITH_IPSEC, test "$with_ipsec" = "1")
-AC_SUBST(IPSEC,[-DIPSEC=${with_ipsec}])
-
-AM_CONDITIONAL(WITH_IPV6SR, test "$with_ipv6sr" = "1")
-AC_SUBST(IPV6SR,[-DIPV6SR=${with_ipv6sr}])
-
-AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" = "1")
-
-AC_OUTPUT([Makefile])
diff --git a/vnet/etc/scripts/arp4 b/vnet/etc/scripts/arp4
deleted file mode 100644
index acb20da3..00000000
--- a/vnet/etc/scripts/arp4
+++ /dev/null
@@ -1,21 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.0.0.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-trace add pg-input 100
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 1.0.0.1/24
-set int ip address loop1 2.0.0.1/24
diff --git a/vnet/etc/scripts/arp4-mpls b/vnet/etc/scripts/arp4-mpls
deleted file mode 100644
index d3d39f3b..00000000
--- a/vnet/etc/scripts/arp4-mpls
+++ /dev/null
@@ -1,24 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.2.2.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 1.0.0.1/24
-set int ip address loop1 2.0.0.1/24
-
-ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
-
-trace add pg-input 100
diff --git a/vnet/etc/scripts/arp6 b/vnet/etc/scripts/arp6
deleted file mode 100644
index e6a98935..00000000
--- a/vnet/etc/scripts/arp6
+++ /dev/null
@@ -1,21 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip6-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP6: 2000::2 -> 2001::2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 2000::1/64
-set int ip address loop1 2001::1/64
diff --git a/vnet/etc/scripts/bvi b/vnet/etc/scripts/bvi
deleted file mode 100644
index 2174da0d..00000000
--- a/vnet/etc/scripts/bvi
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-set int state tuntap-0 down
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-
-set int state GigabitEthernet2/1/0 up 
-cre sub GigabitEthernet2/1/0 1 dot1q 7 
-set int state GigabitEthernet2/1/0.1 up
-
-set int state GigabitEthernet2/2/0 up
-cre sub GigabitEthernet2/2/0 1 dot1q 9 
-set int state GigabitEthernet2/2/0.1 up
-
-
-loop create
-set int l2 bridge loop0 0 bvi
-set int ip table loop0 0
-set int state loop0 up
-
-
-set int l2 bridge GigabitEthernet2/1/0.1 0
-set int l2 bridge GigabitEthernet2/2/0.1 0
-
-set int l2 tag-rewrite GigabitEthernet2/1/0.1 pop 1
-set int l2 tag-rewrite GigabitEthernet2/2/0.1 pop 1 
-
-l2fib add 00:22:44:06:08:0a    0  GigabitEthernet2/1/0.1 static
-l2fib add 00:02:04:06:08:0a    0  GigabitEthernet2/2/0.1 static
-
-
-ip route table 0 8.0.0.1/32 via loop0
-set ip arp loop0 8.0.0.1 00:02:04:06:08:0a
-
-
-ip route add 1.2.3.3/32 via GigabitEthernet2/1/0 IP4: 00:15:17:61:73:47 -> 00:15:17:61:73:46
-
-cle er
-cle int
-cle run
-
-packet-generator new {
-  name bvi_to_l2 
-  limit 100
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
-      GRE: 1.2.3.3 -> 8.0.0.1 mpls_unicast 
-  }
-}
-
-packet-generator new {
-  name l2_to_bvi
-  limit 50
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP4: 0050.56b7.7c83 -> dead.0000.0000  vlan 9
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-}
-
-packet-generator new {
-  name l2_to_bvi_via_flood
-  limit 25
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP4: 0050.56b7.7c83 -> ffff.ffff.ffff  vlan 9
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-}
-
diff --git a/vnet/etc/scripts/dhcp/dhcpd.conf b/vnet/etc/scripts/dhcp/dhcpd.conf
deleted file mode 100644
index d4cb3ed7..00000000
--- a/vnet/etc/scripts/dhcp/dhcpd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# add at the bottom
-
-subnet 192.168.0.0 netmask 255.255.0.0 {
-   range 192.168.1.10 192.168.1.254;
-   option routers 192.168.1.1;
-   default-lease-time 15;
-   max-lease-time 15;
-}
diff --git a/vnet/etc/scripts/dhcp/left-ping-target.sh b/vnet/etc/scripts/dhcp/left-ping-target.sh
deleted file mode 100644
index 2edc2a50..00000000
--- a/vnet/etc/scripts/dhcp/left-ping-target.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# to obtain dhcp address from leftpeer
-dhclient -d -v eth1
diff --git a/vnet/etc/scripts/dhcp/leftpeer.conf b/vnet/etc/scripts/dhcp/leftpeer.conf
deleted file mode 100644
index 458eecf0..00000000
--- a/vnet/etc/scripts/dhcp/leftpeer.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-set int ip table GigabitEthernet2/2/0 12
-set int ip address GigabitEthernet2/2/0 192.168.1.1/24
-set int state GigabitEthernet2/2/0 up
-
-set int ip table GigabitEthernet2/7/0 11
-set int ip address GigabitEthernet2/7/0 192.168.2.1/24
-set int state GigabitEthernet2/7/0 up
-
-comment { set dhcp proxy server 1.2.3.4 src-address 1.2.3.5 add-option-82 rx-fib-id 0 server-fib-id 0 }
-
-comment { set dhcp proxy server 192.168.2.2 src-address 192.168.2.1 add-option-82 rx-fib-id 12 server-fib-id 11 }
-
-ip route add 0.0.0.0/24 table 11 via local
-ip route add 255.255.255.255/24 table 11 via local
-
-ip route add 0.0.0.0/24 table 12 via local
-ip route add 255.255.255.255/24 table 12 via local
diff --git a/vnet/etc/scripts/icmp b/vnet/etc/scripts/icmp
deleted file mode 100644
index 1e054e2d..00000000
--- a/vnet/etc/scripts/icmp
+++ /dev/null
@@ -1,16 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.2.3.4 -> 5.6.7.8
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-ip route 5.6.7.8/32 via local
-ip route 1.2.3.4/32 via local
diff --git a/vnet/etc/scripts/icmp6 b/vnet/etc/scripts/icmp6
deleted file mode 100644
index 2a65acba..00000000
--- a/vnet/etc/scripts/icmp6
+++ /dev/null
@@ -1,16 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip6-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP6: ::1 -> ::2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-ip route ::1/128 via local
-ip route ::2/128 via local
diff --git a/vnet/etc/scripts/ige b/vnet/etc/scripts/ige
deleted file mode 100644
index 80d045af..00000000
--- a/vnet/etc/scripts/ige
+++ /dev/null
@@ -1,19 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-lookup
-  size 50-50
-  data {
-    ICMP: 1.0.0.1 -> 1.0.0.3 ttl 1
-    incrementing 30
-  }
-}
-
-comment { tr add pg-input 100 }
-set int ip address GigabitEthernet4/0/0 1.0.0.1/24
-set int ip address GigabitEthernet4/0/1 1.0.0.2/24
-set int state GigabitEthernet4/0/0 up
-set int state GigabitEthernet4/0/1 up
-
-ip route add 1.0.0.3/32 via GigabitEthernet4/0/1 IP4: 00:15:17:61:73:47 -> 00:15:17:61:73:46
-tr add ige-input 10
diff --git a/vnet/etc/scripts/ip6 b/vnet/etc/scripts/ip6
deleted file mode 100644
index 4f9f3ee5..00000000
--- a/vnet/etc/scripts/ip6
+++ /dev/null
@@ -1,15 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ethernet-input
-  size 64-64
-  no-recycle
-  data {
-    IP6: 1.2.3 -> 4.5.6
-    ICMP: ::1 -> ::2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
diff --git a/vnet/etc/scripts/ip6-hbh b/vnet/etc/scripts/ip6-hbh
deleted file mode 100644
index 0c6de47f..00000000
--- a/vnet/etc/scripts/ip6-hbh
+++ /dev/null
@@ -1,84 +0,0 @@
-tap connect tap0
-set int state tap-0 up
-set int ip address tap-0 1::1/64
-packet-generator new {
-  name hbh1
-  limit 1
-  node ip6-input
-  size 48-48
-  no-recycle
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    hex 0x3B00010403040506
-    incrementing 100
-  }
-}
-packet-generator new {
-  name hbh2
-  limit 1
-  node ip6-input
-  size 48-48
-  no-recycle
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    hex 0x3B00C10403040506
-    incrementing 100
-  }
-}
-
-packet-generator new {
-  name hbh3
-  limit 1
-  node ip6-input
-  size 48-48
-  no-recycle
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    hex 0x3BffC10403040506
-    incrementing 100
-  }
-}
-
-packet-generator new {
-  name hbh4
-  limit 1
-  node ip6-input
-  size 64-64
-  no-recycle
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    hex 0x3BffC10403040506
-    incrementing 100
-  }
-}
-
-packet-generator new {
-  name hbh5
-  limit 1
-  node ip6-input
-  size 56-56
-  no-recycle
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    length 16
-    hex 0x3B010104030405060106030405060708
-    incrementing 100
-  }
-}
-
-packet-generator new {
-  name hbh6
-  limit 1
-  node ip6-input
-  size 56-56
-  no-recycle
-  data {
-    IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2
-    length 16
-    hex 0x3a00050200000100
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
diff --git a/vnet/etc/scripts/ixge b/vnet/etc/scripts/ixge
deleted file mode 100644
index 6722b536..00000000
--- a/vnet/etc/scripts/ixge
+++ /dev/null
@@ -1,15 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-lookup
-  size 50-50
-  data {
-    ICMP: 1.0.0.1 -> 1.0.0.3 ttl 1
-    incrementing 30
-  }
-}
-
-comment { tr add pg-input 100 }
-set int ip address TenGigabitEthernet5/0/0 33.0.1.1/8
-set int state TenGigabitEthernet5/0/0 up
-
diff --git a/vnet/etc/scripts/l2efpfilter b/vnet/etc/scripts/l2efpfilter
deleted file mode 100644
index 307b4436..00000000
--- a/vnet/etc/scripts/l2efpfilter
+++ /dev/null
@@ -1,83 +0,0 @@
-
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-set int state GigabitEthernet2/1/0 up 
-set int state tuntap-0 down
-
-
-cre sub GigabitEthernet2/1/0 1 dot1q 1 
-cre sub GigabitEthernet2/1/0 2 dot1q 2 
-cre sub GigabitEthernet2/1/0 3 dot1q 3
-cre sub GigabitEthernet2/2/0 1 dot1q 1 
-cre sub GigabitEthernet2/2/0 100 dot1q 100 
-
-set int l2 bridge GigabitEthernet2/1/0 0
-set int l2 bridge GigabitEthernet2/1/0.1 0
-set int l2 bridge GigabitEthernet2/1/0.2 0
-set int l2 bridge GigabitEthernet2/1/0.3 0
-set int l2 bridge GigabitEthernet2/2/0 0
-set int l2 bridge GigabitEthernet2/2/0.1 0
-set int l2 bridge GigabitEthernet2/2/0.100 0
-
-set int l2 tag-rewrite GigabitEthernet2/2/0.1 push dot1q 50
-set int l2 tag-rewrite GigabitEthernet2/1/0.2 translate 1-1 dot1q 100
-set int l2 tag-rewrite GigabitEthernet2/1/0.3 translate 1-1 dot1q 99 
-
-set int l2 efp-filter GigabitEthernet2/2/0
-set int l2 efp-filter GigabitEthernet2/2/0.1
-set int l2 efp-filter GigabitEthernet2/2/0.100
-
-
-l2fib add 00:00:00:00:00:11    0  GigabitEthernet2/2/0.1 static
-l2fib add 00:00:00:00:00:22    0  GigabitEthernet2/2/0.100 static
-
-set int state GigabitEthernet2/1/0 up
-set int state GigabitEthernet2/1/0.1 up
-set int state GigabitEthernet2/1/0.2 up
-set int state GigabitEthernet2/1/0.3 up
-set int state GigabitEthernet2/2/0 up
-set int state GigabitEthernet2/2/0.1 up
-set int state GigabitEthernet2/2/0.100 up
-
-
-trace add pg-input 6
-
-clear error
-clear run
-clear int
-
-packet-generator new {
-  name pre_vtr_fail
-  limit 10
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:11 vlan 1
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-}
-
-packet-generator new {
-  name post_vtr_pass
-  limit 20
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 2
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-}
-
-packet-generator new {
-  name post_vtr_fail
-  limit 50
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 3
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-}
-
diff --git a/vnet/etc/scripts/l2efpfilter_perf b/vnet/etc/scripts/l2efpfilter_perf
deleted file mode 100644
index b2f4b490..00000000
--- a/vnet/etc/scripts/l2efpfilter_perf
+++ /dev/null
@@ -1,58 +0,0 @@
-
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-set int state GigabitEthernet2/1/0 up 
-set int state tuntap-0 down
-
-
-cre sub GigabitEthernet2/1/0 1 dot1q 1 
-cre sub GigabitEthernet2/1/0 2 dot1q 2 
-cre sub GigabitEthernet2/1/0 3 dot1q 3
-cre sub GigabitEthernet2/2/0 1 dot1q 1 
-cre sub GigabitEthernet2/2/0 100 dot1q 100 
-
-set int l2 bridge GigabitEthernet2/1/0 0
-set int l2 bridge GigabitEthernet2/1/0.1 0
-set int l2 bridge GigabitEthernet2/1/0.2 0
-set int l2 bridge GigabitEthernet2/1/0.3 0
-set int l2 bridge GigabitEthernet2/2/0 0
-set int l2 bridge GigabitEthernet2/2/0.1 0
-set int l2 bridge GigabitEthernet2/2/0.100 0
-
-set int l2 tag-rewrite GigabitEthernet2/2/0.1 push dot1q 50
-set int l2 tag-rewrite GigabitEthernet2/1/0.2 translate 1-1 dot1q 100
-set int l2 tag-rewrite GigabitEthernet2/1/0.3 translate 1-1 dot1q 99 
-
-set int l2 efp-filter GigabitEthernet2/2/0
-set int l2 efp-filter GigabitEthernet2/2/0.1
-set int l2 efp-filter GigabitEthernet2/2/0.100
-
-
-l2fib add 00:00:00:00:00:11    0  GigabitEthernet2/2/0.1 static
-l2fib add 00:00:00:00:00:22    0  GigabitEthernet2/2/0.100 static
-
-set int state GigabitEthernet2/1/0 up
-set int state GigabitEthernet2/1/0.1 up
-set int state GigabitEthernet2/1/0.2 up
-set int state GigabitEthernet2/1/0.3 up
-set int state GigabitEthernet2/2/0 up
-set int state GigabitEthernet2/2/0.1 up
-set int state GigabitEthernet2/2/0.100 up
-
-
-trace add pg-input 6
-
-clear error
-clear run
-clear int
-
-packet-generator new {
-  name post_vtr_pass
-  limit 9111003
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 00:00:00:00:00:22 vlan 2
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-}
diff --git a/vnet/etc/scripts/l2fib b/vnet/etc/scripts/l2fib
deleted file mode 100644
index 81ede171..00000000
--- a/vnet/etc/scripts/l2fib
+++ /dev/null
@@ -1,46 +0,0 @@
-
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-set int state GigabitEthernet2/1/0 up 
-
-set int state GigabitEthernet2/2/0 up
-cre sub GigabitEthernet2/2/0 1 dot1q 9 
-set int state GigabitEthernet2/2/0.1 up
-set int state tuntap-0 down
-
-set int acl input GigabitEthernet2/1/0
-set int acl output GigabitEthernet2/1/0
-set int acl input GigabitEthernet2/2/0.1 
-set int acl output GigabitEthernet2/2/0.1
-
-set int l2 bridge GigabitEthernet2/1/0 0
-set int l2 bridge GigabitEthernet2/2/0.1 0
-
-set int l2 tag-rewrite GigabitEthernet2/1/0 push dot1q 50
-set int l2 tag-rewrite GigabitEthernet2/2/0.1 pop 1
-
-
-trace add pg-input 6
-
-clear error
-clear run
-clear int
-
-packet-generator new {
-  name new_input_if_index_mac_move
-  limit 4
-  no-recycle
-  node ethernet-input 
-  interface GigabitEthernet2/1/0
-  size 98-98
-  data { hex 0x00010203040500020406080a080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
-}
-
-packet-generator new {
-  name dmac_hit
-  limit 7
-  no-recycle
-  node ethernet-input 
-  interface GigabitEthernet2/2/0
-  size 98-98
-  data { hex 0x00020406080a00224406080a8100000981000011080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
-}
diff --git a/vnet/etc/scripts/l2fib_perf b/vnet/etc/scripts/l2fib_perf
deleted file mode 100644
index 638317ff..00000000
--- a/vnet/etc/scripts/l2fib_perf
+++ /dev/null
@@ -1,29 +0,0 @@
-
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-set int state GigabitEthernet2/1/0 up 
-
-set int state GigabitEthernet2/2/0 up
-cre sub GigabitEthernet2/2/0 1 dot1q 9 
-set int state GigabitEthernet2/2/0.1 up
-set int state tuntap-0 down
-
-set int l2 bridge GigabitEthernet2/1/0 0
-set int l2 bridge GigabitEthernet2/2/0.1 0
-
-l2fib add 00:22:44:06:08:0a    0  GigabitEthernet2/1/0   static
-l2fib add 00:02:04:06:08:0a    0  GigabitEthernet2/2/0.1 static
-
-cle er
-cle int
-cle run
-
-packet-generator new {
-  name perf
-  limit 9111003
-  no-recycle
-  node ethernet-input 
-  interface GigabitEthernet2/2/0.1 
-  size 98-98
-  data { hex 0x00224406080a00020406080a81000009080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
-}
-
diff --git a/vnet/etc/scripts/l2fib_xc b/vnet/etc/scripts/l2fib_xc
deleted file mode 100644
index 35d7342b..00000000
--- a/vnet/etc/scripts/l2fib_xc
+++ /dev/null
@@ -1,31 +0,0 @@
-
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-set int state GigabitEthernet2/1/0 up 
-
-set int state GigabitEthernet2/2/0 up
-cre sub GigabitEthernet2/2/0 1 dot1q 9 
-set int state GigabitEthernet2/2/0.1 up
-set int state tuntap-0 down
-
-set int acl input GigabitEthernet2/1/0
-set int acl output GigabitEthernet2/1/0
-set int acl input GigabitEthernet2/2/0.1 
-set int acl output GigabitEthernet2/2/0.1
-
-set int l2 xc GigabitEthernet2/1/0   GigabitEthernet2/2/0.1
-set int l2 xc GigabitEthernet2/2/0.1 GigabitEthernet2/1/0
-
-clear error
-clear run
-clear int
-
-packet-generator new {
-  name xc
-  limit 11
-  no-recycle
-  node ethernet-input 
-  interface GigabitEthernet2/1/0
-  size 98-98
-  data { hex 0x00010203040500020406080a080045006402b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2040160011000000010101cc000400000000001a00100000000100000000ffffffff }
-}
-
diff --git a/vnet/etc/scripts/l2flood b/vnet/etc/scripts/l2flood
deleted file mode 100644
index 013462ce..00000000
--- a/vnet/etc/scripts/l2flood
+++ /dev/null
@@ -1,42 +0,0 @@
-
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-set int state GigabitEthernet2/1/0 up 
-set int state tuntap-0 down
-
-
-loop create
-cre sub loop0 1 dot1q 1 
-cre sub loop0 2 dot1q 2 
-cre sub loop0 3 dot1q 3 
-cre sub GigabitEthernet2/1/0 1 dot1q 1 
-
-
-set int l2 bridge loop0.1 7
-set int l2 bridge loop0.2 7
-set int l2 bridge loop0.3 7
-set int l2 bridge GigabitEthernet2/1/0.1 7
-
-loop cre
-set int l2 bridge loop1 7 bvi
-
-set int state GigabitEthernet2/1/0.1 up 
-
-trace add pg-input 6
-
-clear error
-clear run
-clear int
-
-packet-generator new {
-  name flood
-  limit 1
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> ffff.ffff.ffff  vlan 1
-      GRE: 8.0.0.1 -> 1.2.3.3 mpls_unicast 
-  }
-
-}
-
diff --git a/vnet/etc/scripts/l2tp b/vnet/etc/scripts/l2tp
deleted file mode 100644
index 337805aa..00000000
--- a/vnet/etc/scripts/l2tp
+++ /dev/null
@@ -1,134 +0,0 @@
-
-set int ip address GigabitEthernet2/1/0 1.2.3.4/24
-set int state GigabitEthernet2/1/0 up 
-set int state tuntap-0 down
-
-
-cre sub GigabitEthernet2/1/0 1 dot1q 1 
-cre sub GigabitEthernet2/1/0 2 dot1q 2 
-cre sub GigabitEthernet2/1/0 3 dot1q 3
-cre sub GigabitEthernet2/2/0 1 dot1q 1 
-cre sub GigabitEthernet2/2/0 100 dot1q 100 
-
-
-set int l2 tag-rewrite GigabitEthernet2/1/0.1 pop 1
-set int l2 tag-rewrite GigabitEthernet2/1/0.2 pop 1
-
-
-l2tp session add client 11::1 our 22::2 l2-interface GigabitEthernet2/1/0.1
-l2tp session add client 11::1 our 22::3 l2-interface GigabitEthernet2/1/0.2 local-session-id 2 l2-sublayer-present
-
-ip route 11::1/128 via GigabitEthernet2/2/0
-set ip6 neighbor GigabitEthernet2/2/0 11::1 00:02:04:06:08:0a
-
-enable ip6 interface GigabitEthernet2/2/0 
-
-set int ip6 l2tpv3 GigabitEthernet2/2/0
-
-set int state GigabitEthernet2/1/0 up
-set int state GigabitEthernet2/1/0.1 up
-set int state GigabitEthernet2/1/0.2 up
-set int state GigabitEthernet2/1/0.3 up
-set int state GigabitEthernet2/2/0 up
-
-
-trace add pg-input 2
-
-clear error
-clear run
-clear int
-
-packet-generator new {
-  name decap
-  limit 10
-  size 200-200
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
-      L2TP: 11::1 -> 22::2 
-      L2TP: session_id 1 cookie 0xffffffffffffffff 
-      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
-}
-
-packet-generator new {
-  name decap_bad_sid
-  limit 30
-  size 200-200
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
-      L2TP: 11::1 -> 22::2 
-      L2TP: session_id 0x999 cookie 0xffffffffffffffff
-      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
-}
-
-packet-generator new {
-  name decap_bad_cookie
-  limit 50
-  size 200-200
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
-      L2TP: 11::1 -> 22::2 
-      L2TP: session_id 1 cookie 0x3333ffffffffffff
-      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
-}
-
-packet-generator new {
-  name encap
-  limit 100
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0000.5555.0002 -> 00:00:dd:dd:00:02 vlan 1
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
-}
-
-packet-generator new {
-  name decap_sublayer
-  limit 300
-  size 200-200
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/2/0
-  data {
-      IP6: 00:50:00:00:00:01 -> 00:50:56:b7:29:7a 
-      L2TP: 11::1 -> 22::3
-      L2TP: session_id 2 cookie 0xffffffffffffffff l2_sublayer 0
-      IP4: 00:55:55:55:00:01 -> 00:dd:dd:dd:00:01
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
-}
-
-packet-generator new {
-  name encap_sublayer
-  limit 700
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0000.5555.0002 -> 00:00:dd:dd:00:02 vlan 2
-      UDP: 1.2.3.4 -> 5.6.7.8
-      incrementing 8
-  }
-}
-
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-classify b/vnet/etc/scripts/leftpeer/leftpeer-classify
deleted file mode 100755
index 74285912..00000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-classify
+++ /dev/null
@@ -1,8 +0,0 @@
-classify table mask l2 src l3 ip4 src buckets 2 miss-next local
-
-comment { classify table mask l3 ip4 src buckets 2 miss-next local }
-set ip classify intfc GigabitEthernet2/2/0 table-index 0
-set int ip address GigabitEthernet2/2/0 192.168.1.1/24
-set int state GigabitEthernet2/2/0 up
-
-classify session hit-next local table-index 0 match l2 src 00:50:56:b7:05:bb l3 ip4 src 192.168.1.2
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-classify6 b/vnet/etc/scripts/leftpeer/leftpeer-classify6
deleted file mode 100644
index 6579d50d..00000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-classify6
+++ /dev/null
@@ -1,5 +0,0 @@
-classify table mask l3 ip6 src buckets 2 miss-next local
-set ip6 classify intfc GigabitEthernet2/2/0 table-index 0
-set int ip address GigabitEthernet2/2/0 db01::1/64
-set int state GigabitEthernet2/2/0 up
-classify session hit-next local table-index 0 match l3 ip6 src db01::2
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-classifyl2 b/vnet/etc/scripts/leftpeer/leftpeer-classifyl2
deleted file mode 100644
index 6be4b1e5..00000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-classifyl2
+++ /dev/null
@@ -1,8 +0,0 @@
-set int ip address GigabitEthernet2/2/0 192.168.1.1/24
-set int state GigabitEthernet2/2/0 up
-
-classify table mask l3 ip4 src buckets 2 l2-miss-next ethernet
-
-classify session advance 14 l2-hit-next ip4 table-index 0 match l3 ip4 src 192.168.1.2
-
-set int l2 class intfc GigabitEthernet2/2/0 ip4-table 0
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-dhcp b/vnet/etc/scripts/leftpeer/leftpeer-dhcp
deleted file mode 100644
index c13a8f3a..00000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-dhcp
+++ /dev/null
@@ -1,23 +0,0 @@
-loop cre
-set int ip table loop0 12
-set int ip address loop0 192.168.1.1/24
-set int state loop0 up
-
-set int ip table GigabitEthernet2/2/0 12
-comment { set int ip address GigabitEthernet2/2/0 192.168.1.1/24 }
-set int unnumbered GigabitEthernet2/2/0 use loop0
-set int state GigabitEthernet2/2/0 up
-
-set int ip table GigabitEthernet2/7/0 11
-set int ip address GigabitEthernet2/7/0 192.168.2.1/24
-set int state GigabitEthernet2/7/0 up
-
-uncomment { set dhcp proxy server 1.2.3.4 src-address 1.2.3.5 add-option-82 rx-fib-id 0 server-fib-id 0 }
-
-uncomment { set dhcp proxy server 192.168.2.2 src-address 192.168.2.1 add-option-82 rx-fib-id 12 server-fib-id 11 }
-
-ip route add 0.0.0.0/24 table 11 via local
-ip route add 255.255.255.255/24 table 11 via local
-
-ip route add 0.0.0.0/24 table 12 via local
-ip route add 255.255.255.255/24 table 12 via local
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-ioam.conf b/vnet/etc/scripts/leftpeer/leftpeer-ioam.conf
deleted file mode 100644
index 6c1b502c..00000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-ioam.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-comment { connects to linux ping source eth1 addr db02::2/64 }
-set int ip address GigabitEthernet2/2/0 db02::1/64
-set int state GigabitEthernet2/2/0 up
-
-comment { connects to ioam domain rightpeer eth2 addr db03::3/64 }
-set int ip address GigabitEthernet2/3/0 db03::1/64
-set int state GigabitEthernet2/3/0 up
-
-ioam set rewrite trace-elts 2 pow
-
-set ip6 neighbor GigabitEthernet2/3/0 db03::3 00:50:56:b7:05:cb
-
-ip route add db04::0/64 via db03::3 
-
-ioam set destination db04::0/64 add 
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf b/vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf
deleted file mode 100644
index a75f9b4c..00000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { tunnel to rightpeer 6.0.3.3 on vlan 101 }
-
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-vxlan tunnel src 6.0.3.1 peer 6.0.3.3 vni 123 adj 6.0.4.4/24
-
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-lisp.conf b/vnet/etc/scripts/leftpeer/leftpeer-lisp.conf
deleted file mode 100644
index cb3180b7..00000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-lisp.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-comment { vpe_phase2 configuration }
-
-comment { local client facing interface on vlan 100  }
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-comment { tunnel to rightpeer on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-lisp gpe tunnel src 6.0.3.1 dst 6.0.3.3 next-ip4 decap-next ip4 iid 1133
-set int ip address lisp_gpe_tunnel0 6.0.4.1/24
-set int state lisp_gpe_tunnel0 up
-
-lisp gpe tunnel src 6.0.3.3 dst 6.0.3.1 next-ip4 decap-next ip4 iid 3311 
-set int stat lisp_gpe_tunnel1 up
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-mpls.conf b/vnet/etc/scripts/leftpeer/leftpeer-mpls.conf
deleted file mode 100644
index 74bce81b..00000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-mpls.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-comment { vpe_phase2 configuration }
-
-comment { local client facing interface on vlan 100  }
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip table GigabitEthernet2/2/0 1
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-comment { tunnel to rightpeer on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-mpls encap add label 30 fib 1 dest 6.0.3.3
-mpls decap add label 30 fib 1 
-
-create mpls gre tunnel src 6.0.3.1 dst 6.0.3.3 intfc 6.0.4.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-sr.conf b/vnet/etc/scripts/leftpeer/leftpeer-sr.conf
deleted file mode 100644
index a7b962d3..00000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-sr.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-comment { test sr segment chunk-offset on }
-test sr hmac validate on
-
-comment { trunk to rightpeer }
-set int ip address GigabitEthernet2/3/0 db03::2/64
-enable ip6 interface GigabitEthernet2/3/0
-set int state GigabitEthernet2/3/0 up
-
-comment { subscriber linux-ping-source }
-set int ip address GigabitEthernet2/2/0 db02::2/64
-enable ip6 interface GigabitEthernet2/2/0
-set int state GigabitEthernet2/2/0 up
-
-sr hmac id 2 key Gozzer
-sr hmac id 3 key Hoser
-
-sr tunnel src db01::1 dst db04::1/128 next db03::1 next db04::1 tag db02::2 clean key Gozzer InPE 1
-
-tap connect srlocal hwaddr random
-set int ip6 table tap-0 1
-set int ip address tap-0 db04::99/64
-enable ip6 interface tap-0
-set int state tap-0 up
-ip route add table 1 db02::0/64 lookup in table 0
diff --git a/vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf b/vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf
deleted file mode 100644
index d50e8bf4..00000000
--- a/vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-comment { tunnel to rightpeer 6.0.3.3 on vlan 101 }
-
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-comment { tunnel to thirdpeer 6.0.5.5 on vlan 105 }
-set int ip address GigabitEthernet2/7/0 6.0.5.1/24
-set int state GigabitEthernet2/7/0 up
-
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-vxlan tunnel src 6.0.3.1 peer 6.0.3.3 peer 6.0.3.5 vni 123 
-vxlan l2 GigabitEthernet2/2/0 vni 123
-
diff --git a/vnet/etc/scripts/leftpeer/leftpeer.script b/vnet/etc/scripts/leftpeer/leftpeer.script
deleted file mode 100644
index f08c8090..00000000
--- a/vnet/etc/scripts/leftpeer/leftpeer.script
+++ /dev/null
@@ -1,9 +0,0 @@
-l2tp_set_lookup_key lookup_v6_src
-
-sw_interface_add_del_address GigabitEthernet2/3/0 db03::2/64
-sw_interface_set_flags GigabitEthernet2/3/0 admin-up
-
-comment sw_interface_add_del_address GigabitEthernet2/2/0 db02::2/64
-sw_interface_set_flags GigabitEthernet2/2/0 admin-up
-
-l2tp_session_add_del client_address db03::1 our_address db03::2 GigabitEthernet2/2/0 local_session_id 1 remote_session_id 3 local_cookie 11 remote_cookie 33
diff --git a/vnet/etc/scripts/lfib/ip4-to-mpls b/vnet/etc/scripts/lfib/ip4-to-mpls
deleted file mode 100644
index 85753797..00000000
--- a/vnet/etc/scripts/lfib/ip4-to-mpls
+++ /dev/null
@@ -1,26 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.2.2.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 1.0.0.1/24
-set int ip address loop1 2.0.0.1/24
-
-set ip arp static loop1 2.0.0.2 dead.beef.babe
-set int mpls loop1 enable
-ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
-
-trace add pg-input 100
diff --git a/vnet/etc/scripts/lfib/mpls-pop-to-mpls b/vnet/etc/scripts/lfib/mpls-pop-to-mpls
deleted file mode 100644
index 2818ac13..00000000
--- a/vnet/etc/scripts/lfib/mpls-pop-to-mpls
+++ /dev/null
@@ -1,28 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node mpls-input
-  size 72-72
-  no-recycle
-  data {
-   hex 0x0001e0ff0001f1ff4500004000000000400177ba010000020202020208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
-  }
-}
-
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 1.0.0.1/24
-set int ip address loop1 2.0.0.1/24
-
-set ip arp static loop1 2.0.0.2 dead.beef.babe
-set int mpls loop1 enable
-
-ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
-
-mpls local-label add 30 non-eos mpls-lookup-in-table 0
-mpls local-label add 31 2.2.2.2/32 
-
-trace add pg-input 100
diff --git a/vnet/etc/scripts/lfib/mpls-to-ip4 b/vnet/etc/scripts/lfib/mpls-to-ip4
deleted file mode 100644
index 24e235e0..00000000
--- a/vnet/etc/scripts/lfib/mpls-to-ip4
+++ /dev/null
@@ -1,27 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node mpls-input
-  size 68-68
-  no-recycle
-  data {
-   hex 0x0001e1ff4500004000000000400177ba010000020202020208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
-  }
-}
-
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 1.0.0.1/24
-set int ip address loop1 2.0.0.1/24
-
-set ip arp static loop1 2.0.0.2 dead.beef.babe
-set int mpls loop1 enable
-
-ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
-
-mpls local-label add 30 eos ip4-lookup-in-table 0
-
-trace add pg-input 100
diff --git a/vnet/etc/scripts/lfib/mpls-to-mpls b/vnet/etc/scripts/lfib/mpls-to-mpls
deleted file mode 100644
index 497dbab3..00000000
--- a/vnet/etc/scripts/lfib/mpls-to-mpls
+++ /dev/null
@@ -1,26 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node mpls-input
-  size 68-68
-  no-recycle
-  data {
-   hex 0x0001e1ff4500004000000000400177ba010000020200000208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
-  }
-}
-
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 1.0.0.1/24
-set int ip address loop1 2.0.0.1/24
-
-set ip arp static loop1 2.0.0.2 dead.beef.babe
-set int mpls loop1 enable
-
-ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
-mpls local-label add 30 2.2.2.2/32 
-
-trace add pg-input 100
diff --git a/vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf b/vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf
deleted file mode 100644
index dd37b942..00000000
--- a/vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-comment { vpe_phase2 configuration }
-
-comment { local client facing interface  }
-comment { configure lc2 eth1 at e.g. 6.0.2.2/24 }
-
-set int ip table GigabitEthernet2/2/0 1
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-comment { tunnel to rightpeer }
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-mpls encap add label 30 fib 1 dest 6.0.4.1
-mpls decap add label 30 fib 1
-
-create mpls ethernet tunnel dst 00:50:56:b7:05:cb adj 6.0.4.1/24 tx-intfc GigabitEthernet2/3/0 fib-id 1
diff --git a/vnet/etc/scripts/mpls-o-ethernet/pg b/vnet/etc/scripts/mpls-o-ethernet/pg
deleted file mode 100644
index ba5397f7..00000000
--- a/vnet/etc/scripts/mpls-o-ethernet/pg
+++ /dev/null
@@ -1,10 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node mpls-ethernet-input
-  size 68-68
-  no-recycle
-  data {
-   hex 0x0001e1ff4500004000000000400177ba010000020200000208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627
-  }
-}
\ No newline at end of file
diff --git a/vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf b/vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf
deleted file mode 100644
index 7709ce4d..00000000
--- a/vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-comment { local client facing interface }
-comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
-
-set int ip table GigabitEthernet2/4/0 1
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to leftpeer }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-mpls encap add label 30 fib 1 dest 6.0.2.1
-mpls decap add label 30 fib 1
-
-create mpls ethernet tunnel dst 00:50:56:b7:05:bf adj 6.0.2.1/24 tx-intfc GigabitEthernet2/3/0 fib-id 1
diff --git a/vnet/etc/scripts/mpls-o-ethernet/single.conf b/vnet/etc/scripts/mpls-o-ethernet/single.conf
deleted file mode 100644
index 2a25d355..00000000
--- a/vnet/etc/scripts/mpls-o-ethernet/single.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-comment { single node configuration }
-
-loop create
-loop create
-set int state loop0 up
-set int state loop1 up
-
-set int ip address loop0 1.0.0.1/24
-set int ip address loop1 2.0.0.1/24
-
-
-ip route add 2.2.2.2/32 via 2.0.0.2 loop1
-
-mpls encap add label 30 fib 0 dest 2.2.2.2
-mpls decap add label 30 fib 0
-
-create mpls ethernet tunnel dst 00:50:56:b7:05:cb adj 2.2.2.2/32 tx-intfc loop1 fib-id 0
diff --git a/vnet/etc/scripts/mpls-o-gre/dhcpd.conf b/vnet/etc/scripts/mpls-o-gre/dhcpd.conf
deleted file mode 100644
index f0f659cd..00000000
--- a/vnet/etc/scripts/mpls-o-gre/dhcpd.conf
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Sample configuration file for ISC dhcpd for Debian
-#
-# Attention: If /etc/ltsp/dhcpd.conf exists, that will be used as
-# configuration file instead of this file.
-#
-#
-
-# The ddns-updates-style parameter controls whether or not the server will
-# attempt to do a DNS update when a lease is confirmed. We default to the
-# behavior of the version 2 packages ('none', since DHCP v2 didn't
-# have support for DDNS.)
-ddns-update-style none;
-
-# option definitions common to all supported networks...
-option domain-name "example.org";
-option domain-name-servers ns1.example.org, ns2.example.org;
-
-default-lease-time 600;
-max-lease-time 7200;
-
-# If this DHCP server is the official DHCP server for the local
-# network, the authoritative directive should be uncommented.
-#authoritative;
-
-# Use this to send dhcp log messages to a different log file (you also
-# have to hack syslog.conf to complete the redirection).
-log-facility local7;
-
-# No service will be given on this subnet, but declaring it helps the 
-# DHCP server to understand the network topology.
-
-#subnet 10.152.187.0 netmask 255.255.255.0 {
-#}
-
-# This is a very basic subnet declaration.
-
-#subnet 10.254.239.0 netmask 255.255.255.224 {
-#  range 10.254.239.10 10.254.239.20;
-#  option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
-#}
-
-# This declaration allows BOOTP clients to get dynamic addresses,
-# which we don't really recommend.
-
-#subnet 10.254.239.32 netmask 255.255.255.224 {
-#  range dynamic-bootp 10.254.239.40 10.254.239.60;
-#  option broadcast-address 10.254.239.31;
-#  option routers rtr-239-32-1.example.org;
-#}
-
-# A slightly different configuration for an internal subnet.
-#subnet 10.5.5.0 netmask 255.255.255.224 {
-#  range 10.5.5.26 10.5.5.30;
-#  option domain-name-servers ns1.internal.example.org;
-#  option domain-name "internal.example.org";
-#  option routers 10.5.5.1;
-#  option broadcast-address 10.5.5.31;
-#  default-lease-time 600;
-#  max-lease-time 7200;
-#}
-
-# Hosts which require special configuration options can be listed in
-# host statements.   If no address is specified, the address will be
-# allocated dynamically (if possible), but the host-specific information
-# will still come from the host declaration.
-
-#host passacaglia {
-#  hardware ethernet 0:0:c0:5d:bd:95;
-#  filename "vmunix.passacaglia";
-#  server-name "toccata.fugue.com";
-#}
-
-# Fixed IP addresses can also be specified for hosts.   These addresses
-# should not also be listed as being available for dynamic assignment.
-# Hosts for which fixed IP addresses have been specified can boot using
-# BOOTP or DHCP.   Hosts for which no fixed address is specified can only
-# be booted with DHCP, unless there is an address range on the subnet
-# to which a BOOTP client is connected which has the dynamic-bootp flag
-# set.
-#host fantasia {
-#  hardware ethernet 08:00:07:26:c0:a5;
-#  fixed-address fantasia.fugue.com;
-#}
-
-# You can declare a class of clients and then do address allocation
-# based on that.   The example below shows a case where all clients
-# in a certain class get addresses on the 10.17.224/24 subnet, and all
-# other clients get addresses on the 10.0.29/24 subnet.
-
-#class "foo" {
-#  match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
-#}
-
-#shared-network 224-29 {
-#  subnet 10.17.224.0 netmask 255.255.255.0 {
-#    option routers rtr-224.example.org;
-#  }
-#  subnet 10.0.29.0 netmask 255.255.255.0 {
-#    option routers rtr-29.example.org;
-#  }
-#  pool {
-#    allow members of "foo";
-#    range 10.17.224.10 10.17.224.250;
-#  }
-#  pool {
-#    deny members of "foo";
-#    range 10.0.29.10 10.0.29.230;
-#  }
-#}
-subnet 6.0.0.0 netmask 255.255.0.0 {
-   range 6.0.2.2 6.0.2.5;
-   option routers 6.0.2.1;
-   default-lease-time 15;
-   max-lease-time 15;
-}
diff --git a/vnet/etc/scripts/mpls-o-gre/leftpeer.conf b/vnet/etc/scripts/mpls-o-gre/leftpeer.conf
deleted file mode 100644
index 149c70c0..00000000
--- a/vnet/etc/scripts/mpls-o-gre/leftpeer.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-comment { left linux ping target configure at e.g. 6.0.2.2/24 }
-
-set int ip table GigabitEthernet2/2/0 1
-set int ip address GigabitEthernet2/2/0 6.0.2.1/24
-set int state GigabitEthernet2/2/0 up
-
-comment { tunnel to rightpeer }
-set int ip address GigabitEthernet2/3/0 6.0.3.1/24
-set int state GigabitEthernet2/3/0 up
-
-mpls encap add label 30 fib 1 dest 6.0.3.3
-mpls decap add label 30 fib 1
-
-create mpls gre tunnel src 6.0.3.1 dst 6.0.3.3 intfc 6.0.4.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/vnet/etc/scripts/mpls-o-gre/rightpeer.conf b/vnet/etc/scripts/mpls-o-gre/rightpeer.conf
deleted file mode 100644
index b5bb597d..00000000
--- a/vnet/etc/scripts/mpls-o-gre/rightpeer.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-comment { right linux ping target configure  e.g. 6.0.4.4/24 }
-
-set int ip table GigabitEthernet2/4/0 1
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to leftpeer }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-mpls encap add label 30 fib 1 dest 6.0.3.1
-mpls decap add label 30 fib 1
-
-create mpls gre tunnel src 6.0.3.3 dst 6.0.3.1 intfc 6.0.2.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/vnet/etc/scripts/mpls-tunnel b/vnet/etc/scripts/mpls-tunnel
deleted file mode 100644
index d04b2970..00000000
--- a/vnet/etc/scripts/mpls-tunnel
+++ /dev/null
@@ -1,87 +0,0 @@
-packet-generator new {
-  name x0
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.0.0.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-packet-generator new {
-  name x1
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.0.1.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-packet-generator new {
-  name x2
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.0.2.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-packet-generator new {
-  name x3
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.0.3.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-
-
-trace add pg-input 100
-
-loop create
-set int state loop0 up
-
-set int ip address loop0 10.0.0.1/24
-set ip arp loop0 10.0.0.2 00:00:11:aa:bb:cc
-
-mpls tunnel add via 10.0.0.2 loop0 out-label 33 out-label 34 out-label 35 out-label 36
-set int state mpls-tunnel0 up
-set int ip addr  mpls-tunnel0 192.168.0.1/32
-ip route add 2.0.0.2/32 via 192.168.0.2 mpls-tunnel0
-
-
-mpls tunnel add via 10.0.0.2 out-label 33
-set int state mpls-tunnel1 up
-set int ip addr  mpls-tunnel1 192.168.1.1/32
-ip route add 2.0.1.2/32 via 192.168.1.2 mpls-tunnel1 out-label 99
-
-mpls tunnel add via 10.0.0.2 loop0 out-label 3
-set int state mpls-tunnel2 up
-set int ip addr  mpls-tunnel2 192.168.2.1/32
-ip route add 2.0.2.2/32 via 192.168.2.2 mpls-tunnel2
-
-
-mpls tunnel add l2-only via 10.0.0.2 loop0 out-label 234 out-label 0
-set int state mpls-tunnel3 up
-set int l2 bridge mpls-tunnel3 1
-
-loop create
-set int ip addr loop1 6.0.1.44/24
-set int l2 bridge loop1 1 bvi
-set int l2 learn loop1 disable
-set int state loop1 up
-
-ip route add 2.0.3.2/32 via 6.0.1.45 loop1
diff --git a/vnet/etc/scripts/pcap b/vnet/etc/scripts/pcap
deleted file mode 100644
index 692e5f27..00000000
--- a/vnet/etc/scripts/pcap
+++ /dev/null
@@ -1,18 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ethernet-input
-  no-recycle
-  pcap /home/eliot/pcap-data/ISIS_level1_adjacency.cap
-}
-
-packet-generator new {
-  name y
-  limit 1
-  node hdlc-input
-  no-recycle
-  pcap /home/eliot/pcap-data/ISIS_p2p_adjacency.cap
-}
-
-tr add pg-input 10
-
diff --git a/vnet/etc/scripts/probe4 b/vnet/etc/scripts/probe4
deleted file mode 100644
index b530e0db..00000000
--- a/vnet/etc/scripts/probe4
+++ /dev/null
@@ -1,11 +0,0 @@
-ethernet create-interfaces
-set int state fake-eth0 up
-set int ip address fake-eth0 1.0.0.1/24
-comment { error }
-comment { ip probe fake-eth0 1.0.0.1 }
-comment { ip probe fake-eth0 1.2.3.4 }
-comment { error }
-comment { ip probe fake-eth0 1.0.0.2 }
-
-
-
diff --git a/vnet/etc/scripts/probe6 b/vnet/etc/scripts/probe6
deleted file mode 100644
index a5490c90..00000000
--- a/vnet/etc/scripts/probe6
+++ /dev/null
@@ -1,7 +0,0 @@
-ethernet create-interfaces
-set int state fake-eth0 up
-set int ip address fake-eth0 2000::1/64
-comment { ip probe fake-eth0 2000::1 }
-
-
-
diff --git a/vnet/etc/scripts/rewrite b/vnet/etc/scripts/rewrite
deleted file mode 100644
index d41b9dbf..00000000
--- a/vnet/etc/scripts/rewrite
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-comment { test ipv4 port/vlan/qinq rewrites by generating arps }
-
-set int state tuntap-0 down
-
-set int ip address GigabitEthernet2/2/0 1.2.5.4/24
-
-cre sub GigabitEthernet2/2/0 1 dot1q 6 exact-match
-set int ip address GigabitEthernet2/2/0.1 1.2.6.4/24
-
-cre sub GigabitEthernet2/2/0 2 dot1ad 7 inner-dot1q 8 exact-match
-set int ip address GigabitEthernet2/2/0.2 1.2.7.4/24
-
-set int state GigabitEthernet2/1/0 up 
-set int state GigabitEthernet2/2/0 up
-set int state GigabitEthernet2/2/0.1 up
-set int state GigabitEthernet2/2/0.2 up
-
-trace add pg-input 2
-
-cle er
-cle int
-cle run
-
-packet-generator new {
-  name toport
-  limit 2
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
-      GRE: 8.0.0.1 -> 1.2.5.6 mpls_unicast 
-  }
-}
-
-packet-generator new {
-  name tovlan
-  limit 2
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
-      GRE: 8.0.0.1 -> 1.2.6.6 mpls_unicast 
-  }
-}
-
-packet-generator new {
-  name toqinq
-  limit 2
-  no-recycle
-  node ethernet-input
-  interface GigabitEthernet2/1/0
-  data {
-      IP4: 0050.56b7.7c83 -> 0050.56b7.296d 
-      GRE: 8.0.0.1 -> 1.2.7.6 mpls_unicast 
-  }
-}
-
-
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-ioam.conf b/vnet/etc/scripts/rightpeer/rightpeer-ioam.conf
deleted file mode 100644
index 3e9a8d34..00000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-ioam.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-comment { connects to right ping target eth3 addr db04::4/64 }
-set int ip address GigabitEthernet2/4/0 db04::1/64
-set int state GigabitEthernet2/4/0 up
-
-comment { connects to ioam domain leftpeer addr db03::1/64 }
-set int ip address GigabitEthernet2/3/0 db03::3/64
-set int state GigabitEthernet2/3/0 up
-
-set ip6 neighbor GigabitEthernet2/3/0 db03::1 00:50:56:b7:05:bf
-set ip6 neighbor GigabitEthernet2/4/0 db04::4 00:50:56:b7:05:d2
-
-ip route add db02::0/64 via db03::1
-
-ioam set destination db04::4/128 pop
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf b/vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf
deleted file mode 100644
index abba1ab0..00000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24 
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to leftpeer on vlan 101 }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-vxlan tunnel src 6.0.3.3 peer 6.0.3.1 vni 123 adj 6.0.2.0/24
-
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-lisp.conf b/vnet/etc/scripts/rightpeer/rightpeer-lisp.conf
deleted file mode 100644
index 961204a3..00000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-lisp.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-comment { local client facing interface }
-comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
-
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to leftpeer }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-lisp gpe tunnel src 6.0.3.3 dst 6.0.3.1 next-ip4 decap-next ip4 iid 3311
-set int ip address lisp_gpe_tunnel0 6.0.2.3/24
-set int state lisp_gpe_tunnel0 up
-
-lisp gpe tunnel src 6.0.3.1 dst 6.0.3.3 next-ip4 decap-next ip4 iid 1133
-set int state lisp_gpe_tunnel1 up
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf b/vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf
deleted file mode 100644
index 0ce38583..00000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-comment { vpe_phase1d configuration }
-
-comment { local client facing interface }
-comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
-
-set int ip table GigabitEthernet2/4/0 1
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to leftpeer }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-mpls encap add label 30 fib 1 dest 6.0.3.1
-mpls decap add label 30 next output GigabitEthernet2/4/0
-
-comment { create mpls gre tunnel src 6.0.3.3 dst 6.0.3.1 intfc 6.0.2.1/24 inner-fib-id 1 outer-fib-id 0 l2-only }
-
-comment {set int l2 xconnect GigabitEthernet2/4/0 mpls-gre0 }
-
-uncomment { create mpls ethernet tunnel dst 00:50:56:b7:05:bf adj 6.0.3.1/8 l2-only tx-intfc GigabitEthernet2/3/0 fib-id 1 }
-
-uncomment { set int l2 xconnect GigabitEthernet2/4/0 mpls-eth0 }
-
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-mpls.conf b/vnet/etc/scripts/rightpeer/rightpeer-mpls.conf
deleted file mode 100644
index fc97ba16..00000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-mpls.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-comment { vpe_phase1d configuration }
-
-comment { local client facing interface }
-comment { configure lc4 eth1 at e.g. 6.0.4.4/24 }
-
-set int ip table GigabitEthernet2/4/0 1
-set int ip address GigabitEthernet2/4/0 6.0.4.1/24
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to leftpeer }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-mpls encap add label 30 fib 1 dest 6.0.3.1
-mpls decap add label 30 fib 1
-
-create mpls gre tunnel src 6.0.3.3 dst 6.0.3.1 intfc 6.0.2.1/24 inner-fib-id 1 outer-fib-id 0
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-sr.conf b/vnet/etc/scripts/rightpeer/rightpeer-sr.conf
deleted file mode 100644
index 0b2a98bb..00000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-sr.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-comment { test sr segment chunk-offset on }
-test sr hmac validate on
-
-comment { trunk to leftpeer }
-set int ip address GigabitEthernet2/3/0 db03::1/64
-enable ip6 interface GigabitEthernet2/3/0
-set int state GigabitEthernet2/3/0 up
-
-comment { subscriber right peer target }
-set int ip address GigabitEthernet2/4/0 db04::2/64
-
-comment { next address to fake out ND on shared LAN segment }
-comment { set int ip address GigabitEthernet2/4/0 db02::13/64 }
-
-enable ip6 interface GigabitEthernet2/4/0
-set int state GigabitEthernet2/4/0 up
-
-sr hmac id 2 key Gozzer
-sr hmac id 3 key Hoser
-
-sr tunnel src db04::1 dst db02::1/128 next db03::2 next db02::1 tag db04::2 clean key Hoser
-
-tap connect srlocal hwaddr random
-set int ip6 table tap-0 1
-set int ip address tap-0 db04::99/64
-enable ip6 interface tap-0
-set int state tap-0 up
-ip route add table 1 db02::0/64 lookup in table 0
diff --git a/vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf b/vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf
deleted file mode 100644
index bd4c427e..00000000
--- a/vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-
-comment { local client facing interface }
-
-comment { configure client lc4 eth1 }
-set int state GigabitEthernet2/4/0 up
-
-comment { tunnel to leftpeer }
-set int ip address GigabitEthernet2/3/0 6.0.3.3/24
-set int state GigabitEthernet2/3/0 up
-
-comment { tunnel to extra ping target }
-set int ip address GigabitEthernet2/7/0 6.0.5.3/24
-set int state GigabitEthernet2/3/0 up
-
-vxlan tunnel src 6.0.3.3 peer 6.0.3.1 peer 6.0.3.5 vni 123 
-vxlan l2 GigabitEthernet2/4/0 vni 123
diff --git a/vnet/etc/scripts/rightpeer/rightpeer.script b/vnet/etc/scripts/rightpeer/rightpeer.script
deleted file mode 100644
index 153988ce..00000000
--- a/vnet/etc/scripts/rightpeer/rightpeer.script
+++ /dev/null
@@ -1,9 +0,0 @@
-l2tp_set_lookup_key lookup_v6_src
-
-sw_interface_add_del_address GigabitEthernet2/3/0 db03::1/64
-sw_interface_set_flags GigabitEthernet2/3/0 admin-up
-
-comment sw_interface_add_del_address GigabitEthernet2/4/0 db02::2/64
-sw_interface_set_flags GigabitEthernet2/4/0 admin-up
-
-l2tp_session_add_del client_address db03::2 our_address db03::1 GigabitEthernet2/4/0 local_session_id 3 remote_session_id 1 local_cookie 33 remote_cookie 11
diff --git a/vnet/etc/scripts/rpf b/vnet/etc/scripts/rpf
deleted file mode 100644
index 571c6b79..00000000
--- a/vnet/etc/scripts/rpf
+++ /dev/null
@@ -1,18 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.2.3.4 -> 5.6.7.8
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-set interface ip source-check pg/stream-0
-ip route 1.2.3.4/32 via pg/stream-0 0x01020304
-ip route 5.6.7.8/32 via drop
-
diff --git a/vnet/etc/scripts/rtt-test b/vnet/etc/scripts/rtt-test
deleted file mode 100644
index 5501b99d..00000000
--- a/vnet/etc/scripts/rtt-test
+++ /dev/null
@@ -1,31 +0,0 @@
-set int state TenGigabitEthernet4/0/0 up
-set int state TenGigabitEthernet5/0/0 up
-
-set int ip address TenGigabitEthernet4/0/0 1.0.0.1/24
-set int ip address TenGigabitEthernet5/0/0 2.0.0.1/24
-
-ip route table 0 1.0.0.2/32 via TenGigabitEthernet4/0/0 IP4: 00:1b:21:74:5b:04 -> 00:1b:21:79:8e:bc
-ip route table 0 2.0.0.2/32 via TenGigabitEthernet5/0/0 IP4: 00:1b:21:79:8e:bc -> 00:1b:21:74:5b:04
-ip route table 1 2.0.0.2/32 via local
-ip route table 1 1.0.0.2/32 via local
-
-set int ip table TenGigabitEthernet5/0/0 1
-set int ip table TenGigabitEthernet4/0/0 1
-
-comment { trace add rtt-test-tx 100 }
-comment { trace add ixge-input 100 }
-comment { te rtt { 1.0.0.2 -> 2.0.0.2 count 1e4 rate 1e9 size 100 histogram-time 1e-5 } }
-
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 170-170
-  data {
-    ICMP: 1.0.0.2 -> 2.0.0.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-
diff --git a/vnet/etc/scripts/snat b/vnet/etc/scripts/snat
deleted file mode 100644
index 87fd699e..00000000
--- a/vnet/etc/scripts/snat
+++ /dev/null
@@ -1,34 +0,0 @@
-packet-generator new {
-  name f1
-  limit 1000000
-  node ip4-input
-  size 64-64
-  no-recycle
-  worker 0
-  data {
-    UDP: 10.0.0.3 -> 172.16.1.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-
-packet-generator new {
-  name f2
-  limit 1000000
-  node ip4-input
-  size 64-64
-  no-recycle
-  worker 1
-  data {
-    UDP: 10.0.0.3 -> 172.16.1.2
-    UDP: 3005 -> 3006
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-snat add address 172.16.1.3
-ip route 172.16.1.2/32 via drop
-set int ip address pg0 10.0.0.1/24
-set int snat in pg0
-trace add pg-input 10
diff --git a/vnet/etc/scripts/snat_static b/vnet/etc/scripts/snat_static
deleted file mode 100644
index 8fe48bff..00000000
--- a/vnet/etc/scripts/snat_static
+++ /dev/null
@@ -1,44 +0,0 @@
-create packet-generator interface pg0
-create packet-generator interface pg1
-
-packet-generator new {
-  name f1
-  limit 1000000
-  node ip4-input
-  size 64-64
-  no-recycle
-  worker 0
-  interface pg0
-  data {
-    UDP: 10.0.0.3 -> 172.16.1.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-
-packet-generator new {
-  name f2
-  limit 1000000
-  node ip4-input
-  size 64-64
-  no-recycle
-  worker 1
-  interface pg1
-  data {
-    UDP: 172.16.1.2 -> 172.16.1.3
-    UDP: 3001 -> 3000
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-snat add address 172.16.1.3
-snat add static mapping local 10.0.0.3 external 172.16.1.3
-set int ip address pg0 10.0.0.1/24
-set int ip address pg1 172.16.1.1/24
-set int state pg0 up
-set int state pg1 up
-set ip arp static pg0 10.0.0.3 abcd.abcd.abcd
-set ip arp static pg1 172.16.1.2 cdef.abcd.abcd
-set int snat in pg0 out pg1
-trace add pg-input 10
diff --git a/vnet/etc/scripts/snat_static_with_port b/vnet/etc/scripts/snat_static_with_port
deleted file mode 100644
index f646145a..00000000
--- a/vnet/etc/scripts/snat_static_with_port
+++ /dev/null
@@ -1,44 +0,0 @@
-create packet-generator interface pg0
-create packet-generator interface pg1
-
-packet-generator new {
-  name f1
-  limit 1000000
-  node ip4-input
-  size 64-64
-  no-recycle
-  worker 0
-  interface pg0
-  data {
-    UDP: 10.0.0.3 -> 172.16.1.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-
-packet-generator new {
-  name f2
-  limit 1000000
-  node ip4-input
-  size 64-64
-  no-recycle
-  worker 1
-  interface pg1
-  data {
-    UDP: 172.16.1.2 -> 172.16.1.3
-    UDP: 3001 -> 3000
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-snat add address 172.16.1.3
-snat add static mapping local 10.0.0.3 3000 external 172.16.1.3 3000
-set int ip address pg0 10.0.0.1/24
-set int ip address pg1 172.16.1.1/24
-set int state pg0 up
-set int state pg1 up
-set ip arp static pg0 10.0.0.3 abcd.abcd.abcd
-set ip arp static pg1 172.16.1.2 cdef.abcd.abcd
-set int snat in pg0 out pg1
-trace add pg-input 10
diff --git a/vnet/etc/scripts/source_and_port_range_check b/vnet/etc/scripts/source_and_port_range_check
deleted file mode 100644
index dce227b4..00000000
--- a/vnet/etc/scripts/source_and_port_range_check
+++ /dev/null
@@ -1,63 +0,0 @@
-
-create loop int
-
-set int state loop0 up
-set int ip addr loop0 10.10.10.10/32
-
-packet-generator new {
-  name deny-from-default-route
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 1.2.3.4 -> 5.6.7.8
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-packet-generator new {
-  name allow
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 1.1.1.1 -> 5.6.7.8
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-packet-generator new {
-  name deny-from-port-range
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 1.1.1.1 -> 5.6.7.8
-    UDP: 6000 -> 6001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-set ip source-and-port-range-check 1.1.1.0/24 range 2000 - 3000 vrf 99
-
-set interface ip source-and-port-range-check pg0 udp-out-vrf 99
-
- show ip source-and-port-range-check vrf 99 1.1.1.1
-
-set ip source-and-port-range-check 1.1.1.0/24 range 4000 - 5000 vrf 99
-
-set ip source-and-port-range-check 1.1.2.0/24 range 4000 - 5000 vrf 99
-
-show ip source-and-port-range-check vrf 99 1.1.1.1
-show ip source-and-port-range-check vrf 99 1.1.2.1
-
-set ip source-and-port-range-check 1.1.2.0/24 range 4000 - 5000 vrf 99 del
-
-show ip source-and-port-range-check vrf 99 1.1.2.1
-
-tr add pg-input 100
diff --git a/vnet/etc/scripts/speed b/vnet/etc/scripts/speed
deleted file mode 100644
index d60d671f..00000000
--- a/vnet/etc/scripts/speed
+++ /dev/null
@@ -1,14 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 50-50
-  data {
-    ICMP: 1.2.3.4 -> 5.6.7.8
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-ip route 5.6.7.8/32 via pg/stream-0 000102030405060708090a0b0c0d
diff --git a/vnet/etc/scripts/sr/left-linux-ping.sh b/vnet/etc/scripts/sr/left-linux-ping.sh
deleted file mode 100755
index 55b83506..00000000
--- a/vnet/etc/scripts/sr/left-linux-ping.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-ifconfig eth2 inet6 add db02::1/64
-route -A inet6 add db04::1/128 gw db02::2
diff --git a/vnet/etc/scripts/sr/leftpeer.conf b/vnet/etc/scripts/sr/leftpeer.conf
deleted file mode 100644
index 9591d968..00000000
--- a/vnet/etc/scripts/sr/leftpeer.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-comment { test sr segment chunk-offset on }
-test sr hmac validate on
-
-comment { trunk to rightpeer }
-set int ip address GigabitEthernet2/3/0 db03::2/64
-enable ip6 interface GigabitEthernet2/3/0
-set int state GigabitEthernet2/3/0 up
-
-comment { subscriber left-linux-ping }
-set int ip address GigabitEthernet2/2/0 db02::2/64
-enable ip6 interface GigabitEthernet2/2/0
-set int state GigabitEthernet2/2/0 up
-
-sr hmac id 2 key Gozzer
-sr hmac id 3 key Hoser
-
-sr tunnel src db01::1 dst db04::1/128 next db03::1 next db04::1 tag db02::2 clean key Gozzer InPE 1
-
-comment { sr unaware service chaining to db03::5 }
-comment { sr tunnel src db01::1 dst db04::1/128 next db03::1 next db03::5 next db04::1 tag db02::2 clean key Gozzer InPE 1 }
-
-comment { tap connect srlocal hwaddr random }
-comment { set int ip6 table tap-0 1 }
-comment { set int ip address tap-0 db04::99/64 }
-comment { enable ip6 interface tap-0 }
-comment { set int state tap-0 up }
-comment { ip route add table 1 db02::0/64 lookup in table 0 }
diff --git a/vnet/etc/scripts/sr/right-linux-ping.sh b/vnet/etc/scripts/sr/right-linux-ping.sh
deleted file mode 100755
index 029368db..00000000
--- a/vnet/etc/scripts/sr/right-linux-ping.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-ifconfig eth1 inet6 add db04::1/64
-route -A inet6 add db02::1/128 gw db04::2
diff --git a/vnet/etc/scripts/sr/rightpeer.conf b/vnet/etc/scripts/sr/rightpeer.conf
deleted file mode 100644
index 6da7a7af..00000000
--- a/vnet/etc/scripts/sr/rightpeer.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-comment { trunk to leftpeer }
-set int ip address GigabitEthernet2/0/0 db03::1/64
-enable ip6 interface GigabitEthernet2/0/0
-set int state GigabitEthernet2/0/0 up
-
-comment { subscriber right-linux-ping }
-set int ip address GigabitEthernet2/2/0 db04::2/64
-
-comment { next address to fake out ND on shared LAN segment }
-set int ip address GigabitEthernet2/2/0 db02::13/64
-
-enable ip6 interface GigabitEthernet2/2/0
-set int state GigabitEthernet2/2/0 up
-
-sr tunnel src db04::1 dst db02::1/128 next db03::2 next db02::1 tag db04::2 clean
-
-tap connect srlocal hwaddr random
-set int ip6 table tap-0 1
-set int ip address tap-0 db04::99/64
-enable ip6 interface tap-0
-set int state tap-0 up
-ip route add table 1 db02::0/64 lookup in table 0
diff --git a/vnet/etc/scripts/sr/srlocal.sh b/vnet/etc/scripts/sr/srlocal.sh
deleted file mode 100755
index 2f568408..00000000
--- a/vnet/etc/scripts/sr/srlocal.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-ifconfig srlocal inet6 add db04::1/64
-route -6 add db02::0/64 gw db04::99
diff --git a/vnet/etc/scripts/srp b/vnet/etc/scripts/srp
deleted file mode 100644
index 7cc37011..00000000
--- a/vnet/etc/scripts/srp
+++ /dev/null
@@ -1,27 +0,0 @@
-srp create-interfaces
-srp create-interfaces
-set int hw-class fake-srp0 srp
-set int hw-class fake-srp1 srp
-
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    ICMP: 1.0.0.2 -> 2.0.0.2
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-set int state fake-srp0 up
-set int state fake-srp1 up
-
-set int ip address fake-srp0 1.0.0.1/24
-set int ip address fake-srp1 2.0.0.1/24
-
-
-
diff --git a/vnet/etc/scripts/tcp b/vnet/etc/scripts/tcp
deleted file mode 100644
index a2ee8b2d..00000000
--- a/vnet/etc/scripts/tcp
+++ /dev/null
@@ -1,16 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    TCP: 1.2.3.4 -> 5.6.7.8
-    TCP: 1234 -> 5678
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-ip route 5.6.7.8/32 via local
-ip route 1.2.3.4/32 via local
diff --git a/vnet/etc/scripts/tcp-test b/vnet/etc/scripts/tcp-test
deleted file mode 100644
index 52bfbcdd..00000000
--- a/vnet/etc/scripts/tcp-test
+++ /dev/null
@@ -1,6 +0,0 @@
-int create-ethernet
-set int ip address fake-eth0 1.2.3.4/24
-set int state fake-eth0 up
-ip route 1.2.3.5/32 via local
-trace add tuntap-rx 100
-
diff --git a/vnet/etc/scripts/tf-ucs-1 b/vnet/etc/scripts/tf-ucs-1
deleted file mode 100644
index efa5f2dc..00000000
--- a/vnet/etc/scripts/tf-ucs-1
+++ /dev/null
@@ -1,16 +0,0 @@
-comment { connected to Ixia port 1}
-set int ip address TenGigabitEthernet4/0/0 1.0.0.2/8
-
-set int state TenGigabitEthernet4/0/0 up
-
-comment { connected to Ixia port 2}
-set int ip address TenGigabitEthernet4/0/1 2.0.0.2/8
-set int state TenGigabitEthernet4/0/1 up
-
-comment { connected to Ixia port 3}
-set int ip address TenGigabitEthernet6/0/0 3.0.0.2/8
-set int state TenGigabitEthernet6/0/0 up
-
-comment { connected to Ixia port 4}
-set int ip address TenGigabitEthernet6/0/1 4.0.0.2/8
-set int state TenGigabitEthernet6/0/1 up
diff --git a/vnet/etc/scripts/urpf b/vnet/etc/scripts/urpf
deleted file mode 100644
index a4d87527..00000000
--- a/vnet/etc/scripts/urpf
+++ /dev/null
@@ -1,86 +0,0 @@
-
-create loop int
-
-set int state loop0 up
-set int ip addr loop0 10.10.10.10/24
-
-packet-generator new {
-  name transit-deny
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 1.2.3.4 -> 2.2.2.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-packet-generator new {
-  name transit-allow
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 1.1.1.1 -> 2.2.2.2
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-packet-generator new {
-  name transit-allow-from-excemption
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 11.11.12.13 -> 2.2.2.2
-    UDP: 6000 -> 6001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-packet-generator new {
-  name for-us-allow-from-excemption
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 11.11.12.13 -> 10.10.10.10
-    UDP: 6000 -> 6001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-packet-generator new {
-  name for-us-allow
-  limit 1
-  node ip4-input
-  size 64-64
-  no-recycle
-  data {
-    UDP: 1.1.1.1 -> 10.10.10.10
-    UDP: 3000 -> 3001
-    length 128 checksum 0 incrementing 1
-  }
-}
-
-tr add pg-input 100
-
-set int ip addr pg0 10.10.11.10/24
-
-set interface ip source-check pg0 strict
-
-ip route add 1.1.1.1/32 via 10.10.11.11 pg0
-ip route add 2.2.2.2/32 via 10.10.10.11 loop0
-
-ip urpf-accept 11.11.0.0/16
-
-#set interface ip source-check pg0 strict del
-#set interface ip source-check pg0 loose
-
-#ip urpf-accept del 11.11.0.0/16
diff --git a/vnet/etc/scripts/virl/ip6sr.virl b/vnet/etc/scripts/virl/ip6sr.virl
deleted file mode 100644
index 5d4d1a0a..00000000
--- a/vnet/etc/scripts/virl/ip6sr.virl
+++ /dev/null
@@ -1,874 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<topology xmlns="http://www.cisco.com/VIRL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="0.9" xsi:schemaLocation="http://www.cisco.com/VIRL https://raw.github.com/CiscoVIRL/schema/v0.9/virl.xsd">
-    <extensions>
-        <entry key="management_network" type="String">flat</entry>
-        <entry key="AutoNetkit.address_family" type="String">dual_stack</entry>
-        <entry key="AutoNetkit.enable_routing" type="Boolean">false</entry>
-    </extensions>
-    <node name="iosv-1" type="SIMPLE" subtype="IOSv" location="195,78" ipv4="192.168.0.2" ipv6="::b:1:0:0:2">
-        <extensions>
-            <entry key="config" type="string">!
-! Last configuration change at 16:41:18 UTC Fri Mar 27 2015
-!
-version 15.4
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname iosv-1
-!
-boot-start-marker
-boot-end-marker
-!
-!
-enable password cisco
-!
-no aaa new-model
-!
-!
-!
-mmi polling-interval 60
-no mmi auto-configure
-no mmi pvc
-mmi snmp-timeout 180
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-no ip domain lookup
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-multilink bundle-name authenticated
-!
-!
-cts logging verbose
-!
-!
-!
-redundancy
-!
-!
-! 
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-interface Loopback0
- description Loopback
- ip address 192.168.0.2 255.255.255.255
- ipv6 address ::B:1:0:0:2/128
-!
-interface GigabitEthernet0/0
- description OOB Management
- ip address 172.16.1.193 255.255.255.0
- duplex auto
- speed auto
- media-type rj45
-!
-interface GigabitEthernet0/1
- description to vpp-1
- ip address 10.0.0.5 255.255.255.252
- duplex auto
- speed auto
- media-type rj45
- ipv6 address ::A:1:1:0:6/126
-!
-ip forward-protocol nd
-!
-!
-no ip http server
-no ip http secure-server
-!
-! route to iosv-2
-ipv6 route ::A:1:1:0:16/128 ::A:1:1:0:7
-! route to iosv-4
-ipv6 route ::A:1:1:0:22/128 ::A:1:1:0:7
-!
-!
-!
-control-plane
-!
-banner exec `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner incoming `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner login `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-!
-line con 0
- password cisco
-line aux 0
-line vty 0 4
- exec-timeout 720 0
- password cisco
- login
- transport input telnet ssh
-!
-no scheduler allocate
-!
-end</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.5" ipv6="::a:1:1:0:6" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <node name="iosv-2" type="SIMPLE" subtype="IOSv" location="667,82" ipv4="192.168.0.3" ipv6="::b:1:0:0:3">
-        <extensions>
-            <entry key="config" type="string">!
-! Last configuration change at 16:41:10 UTC Fri Mar 27 2015
-!
-version 15.4
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname iosv-2
-!
-boot-start-marker
-boot-end-marker
-!
-!
-enable password cisco
-!
-no aaa new-model
-!
-!
-!
-mmi polling-interval 60
-no mmi auto-configure
-no mmi pvc
-mmi snmp-timeout 180
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-no ip domain lookup
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-multilink bundle-name authenticated
-!
-!
-cts logging verbose
-!
-!
-!
-redundancy
-!
-!
-! 
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-interface Loopback0
- description Loopback
- ip address 192.168.0.3 255.255.255.255
- ipv6 address ::B:1:0:0:3/128
-!
-interface GigabitEthernet0/0
- description OOB Management
- ip address 172.16.1.191 255.255.255.0
- duplex auto
- speed auto
- media-type rj45
-!
-interface GigabitEthernet0/1
- description to vpp-2
- ip address 10.0.0.21 255.255.255.252
- duplex auto
- speed auto
- media-type rj45
- ipv6 address ::A:1:1:0:16/126
-!
-ip forward-protocol nd
-!
-!
-no ip http server
-no ip http secure-server
-!
-ipv6 route ::A:1:1:0:6/128 ::A:1:1:0:17
-!
-!
-!
-control-plane
-!
-banner exec `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner incoming `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner login `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-!
-line con 0
- password cisco
-line aux 0
-line vty 0 4
- exec-timeout 720 0
- password cisco
- login
- transport input telnet ssh
-!
-no scheduler allocate
-!
-end</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.21" ipv6="::a:1:1:0:16" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <node name="iosv-3" type="SIMPLE" subtype="IOSv" location="194,186" ipv4="192.168.0.6" ipv6="::b:1:0:0:4">
-        <extensions>
-            <entry key="config" type="string">!
-! Last configuration change at 16:27:43 UTC Fri Mar 27 2015
-!
-version 15.4
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname iosv-3
-!
-boot-start-marker
-boot-end-marker
-!
-!
-enable password cisco
-!
-no aaa new-model
-!
-!
-!
-mmi polling-interval 60
-no mmi auto-configure
-no mmi pvc
-mmi snmp-timeout 180
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-no ip domain lookup
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-multilink bundle-name authenticated
-!
-!
-cts logging verbose
-!
-!
-!
-redundancy
-!
-!
-! 
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-interface Loopback0
- description Loopback
- ip address 192.168.0.6 255.255.255.255
- ipv6 address ::B:1:0:0:4/128
-!
-interface GigabitEthernet0/0
- description OOB Management
- ip address 172.16.1.192 255.255.255.0
- duplex auto
- speed auto
- media-type rj45
-!
-interface GigabitEthernet0/1
- description to vpp-1
- ip address 10.0.0.9 255.255.255.252
- duplex auto
- speed auto
- media-type rj45
- ipv6 address ::A:1:1:0:A/126
-!
-ip forward-protocol nd
-!
-!
-no ip http server
-no ip http secure-server
-!
-!
-!
-!
-control-plane
-!
-banner exec `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner incoming `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner login `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-!
-line con 0
- password cisco
-line aux 0
-line vty 0 4
- exec-timeout 720 0
- password cisco
- login
- transport input telnet ssh
-!
-no scheduler allocate
-!
-end</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.9" ipv6="::a:1:1:0:a" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <node name="iosv-4" type="SIMPLE" subtype="IOSv" location="668,193" ipv4="192.168.0.8" ipv6="::b:1:0:0:5">
-        <extensions>
-            <entry key="config" type="string">!
-! Last configuration change at 16:27:43 UTC Fri Mar 27 2015
-!
-version 15.4
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname iosv-4
-!
-boot-start-marker
-boot-end-marker
-!
-!
-enable password cisco
-!
-no aaa new-model
-!
-!
-!
-mmi polling-interval 60
-no mmi auto-configure
-no mmi pvc
-mmi snmp-timeout 180
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-no ip domain lookup
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-multilink bundle-name authenticated
-!
-!
-cts logging verbose
-!
-!
-!
-redundancy
-!
-!
-! 
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-interface Loopback0
- description Loopback
- ip address 192.168.0.8 255.255.255.255
- ipv6 address ::B:1:0:0:5/128
-!
-interface GigabitEthernet0/0
- description OOB Management
- ip address 172.16.1.194 255.255.255.0
- duplex auto
- speed auto
- media-type rj45
-!
-interface GigabitEthernet0/1
- description to vpp-2
- ip address 10.0.0.33 255.255.255.252
- duplex auto
- speed auto
- media-type rj45
- ipv6 address ::A:1:1:0:22/126
-!
-! Route to iosv-1
-ipv6 route ::A:1:1:0:6/128 ::A:1:1:0:23
-ip forward-protocol nd
-!
-!
-no ip http server
-no ip http secure-server
-!
-!
-!
-!
-control-plane
-!
-banner exec `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner incoming `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner login `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-!
-line con 0
- password cisco
-line aux 0
-line vty 0 4
- exec-timeout 720 0
- password cisco
- login
- transport input telnet ssh
-!
-no scheduler allocate
-!
-end</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.33" ipv6="::a:1:1:0:22" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <node name="vpp-1" type="SIMPLE" subtype="vPP" location="302,140">
-        <extensions>
-            <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: vpp-1
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-- sed -i 's/no-pci//' /cisco/etc/qn.conf
-- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.15.3
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /cisco/etc/vpp-server.conf
-  owner: root:root
-  permissions: '0644'
-  content: |-
-    set interface ip address GigabitEthernet0/4/0 10.0.0.6/30
-    set interface ip address GigabitEthernet0/4/0 ::a:1:1:0:7/126
-    set interface state GigabitEthernet0/4/0 up
-    set interface ip address GigabitEthernet0/5/0 10.0.0.10/30
-    set interface ip address GigabitEthernet0/5/0 ::a:1:1:0:b/126
-    set interface state GigabitEthernet0/5/0 up
-    set interface ip address GigabitEthernet0/6/0 10.0.0.13/30
-    set interface ip address GigabitEthernet0/6/0 ::a:1:1:0:e/126
-    set interface state GigabitEthernet0/6/0 up
-    set interface ip address GigabitEthernet0/7/0 10.0.0.17/30
-    set interface ip address GigabitEthernet0/7/0 ::a:1:1:0:12/126
-    set interface state GigabitEthernet0/7/0 up
-    sr tunnel src 0::a:1:1:0:6 dst 0::a:1:1:0:16/128 next 0::a:1:1:0:f next 0::a:1:1:0:1a next 0::a:1:1:0:16 tag 0::a:1:1:0:7 InPE 1 clean
-    sr tunnel src 0::a:1:1:0:6 dst 0::a:1:1:0:22/128 next 0::a:1:1:0:f next 0::a:1:1:0:1a next 0::a:1:1:0:22 tag 0::a:1:1:0:7 InPE 1 clean
-</entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.6" ipv6="::a:1:1:0:7" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.10" ipv6="::a:1:1:0:b" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="2" name="GigabitEthernet0/6/0" ipv4="10.0.0.13" ipv6="::a:1:1:0:e" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="3" name="GigabitEthernet0/7/0" ipv4="10.0.0.17" ipv6="::a:1:1:0:12" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <node name="vpp-2" type="SIMPLE" subtype="vPP" location="541,147">
-        <extensions>
-            <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: vpp-2
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-- sed -i 's/no-pci//' /cisco/etc/qn.conf
-- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.15.3
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /cisco/etc/vpp-server.conf
-  owner: root:root
-  permissions: '0644'
-  content: |-
-    set interface ip address GigabitEthernet0/4/0 10.0.0.25/30
-    set interface ip address GigabitEthernet0/4/0 ::a:1:1:0:1a/126
-    set interface state GigabitEthernet0/4/0 up
-    set interface ip address GigabitEthernet0/5/0 10.0.0.29/30
-    set interface ip address GigabitEthernet0/5/0 ::a:1:1:0:1e/126
-    set interface state GigabitEthernet0/5/0 up
-    set interface ip address GigabitEthernet0/6/0 10.0.0.22/30
-    set interface ip address GigabitEthernet0/6/0 ::a:1:1:0:17/126
-    set interface state GigabitEthernet0/6/0 up
-    set interface ip address GigabitEthernet0/7/0 10.0.0.34/30
-    set interface ip address GigabitEthernet0/7/0 ::a:1:1:0:23/126
-    set interface state GigabitEthernet0/7/0 up
-    sr tunnel src 0::a:1:1:0:16 dst 0::a:1:1:0:6/128 next 0::a:1:1:0:1b next 0::a:1:1:0:e next 0::a:1:1:0:6 tag 0::a:1:1:0:17 InPE 1 clean
-</entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.25" ipv6="::a:1:1:0:1a" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.29" ipv6="::a:1:1:0:1e" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="2" name="GigabitEthernet0/6/0" ipv4="10.0.0.22" ipv6="::a:1:1:0:17" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="3" name="GigabitEthernet0/7/0" ipv4="10.0.0.34" ipv6="::a:1:1:0:23" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <node name="vpp-3" type="SIMPLE" subtype="vPP" location="415,89">
-        <extensions>
-            <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: vpp-3
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-- sed -i 's/no-pci//' /cisco/etc/qn.conf
-- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.15.3
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /cisco/etc/vpp-server.conf
-  owner: root:root
-  permissions: '0644'
-  content: |-
-    set interface ip address GigabitEthernet0/4/0 10.0.0.14/30
-    set interface ip address GigabitEthernet0/4/0 ::a:1:1:0:f/126
-    set interface state GigabitEthernet0/4/0 up
-    set interface ip address GigabitEthernet0/5/0 10.0.0.26/30
-    set interface ip address GigabitEthernet0/5/0 ::a:1:1:0:1b/126
-    set interface state GigabitEthernet0/5/0 up
-    comment { fix src rpf drop screws}
-    ip route add ::a:1:1:0:6/128 via drop
-    ip route add ::a:1:1:0:16/128 via drop
-    ip route add ::a:1:1:0:22/128 via drop
-</entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.14" ipv6="::a:1:1:0:f" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.26" ipv6="::a:1:1:0:1b" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <node name="vpp-4" type="SIMPLE" subtype="vPP" location="419,216">
-        <extensions>
-            <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: vpp-4
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-- sed -i 's/no-pci//' /cisco/etc/qn.conf
-- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.15.3
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /cisco/etc/vpp-server.conf
-  owner: root:root
-  permissions: '0644'
-  content: |-
-    set interface ip address GigabitEthernet0/4/0 10.0.0.18/30
-    set interface ip address GigabitEthernet0/4/0 ::a:1:1:0:13/126
-    set interface state GigabitEthernet0/4/0 up
-    set interface ip address GigabitEthernet0/5/0 10.0.0.30/30
-    set interface ip address GigabitEthernet0/5/0 ::a:1:1:0:1f/126
-    set interface state GigabitEthernet0/5/0 up
-</entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.18" ipv6="::a:1:1:0:13" netPrefixLenV4="30" netPrefixLenV6="126"/>
-        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.30" ipv6="::a:1:1:0:1f" netPrefixLenV4="30" netPrefixLenV6="126"/>
-    </node>
-    <connection dst="/virl:topology/virl:node[5]/virl:interface[1]" src="/virl:topology/virl:node[1]/virl:interface[1]"/>
-    <connection dst="/virl:topology/virl:node[5]/virl:interface[2]" src="/virl:topology/virl:node[3]/virl:interface[1]"/>
-    <connection dst="/virl:topology/virl:node[7]/virl:interface[1]" src="/virl:topology/virl:node[5]/virl:interface[3]"/>
-    <connection dst="/virl:topology/virl:node[8]/virl:interface[1]" src="/virl:topology/virl:node[5]/virl:interface[4]"/>
-    <connection dst="/virl:topology/virl:node[6]/virl:interface[1]" src="/virl:topology/virl:node[7]/virl:interface[2]"/>
-    <connection dst="/virl:topology/virl:node[6]/virl:interface[2]" src="/virl:topology/virl:node[8]/virl:interface[2]"/>
-    <connection dst="/virl:topology/virl:node[2]/virl:interface[1]" src="/virl:topology/virl:node[6]/virl:interface[3]"/>
-    <connection dst="/virl:topology/virl:node[4]/virl:interface[1]" src="/virl:topology/virl:node[6]/virl:interface[4]"/>
-</topology>
diff --git a/vnet/etc/scripts/virl/ip6sr_notes.txt b/vnet/etc/scripts/virl/ip6sr_notes.txt
deleted file mode 100644
index 5febf2c6..00000000
--- a/vnet/etc/scripts/virl/ip6sr_notes.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-vpp-1, tunnel 1: iosv-1 vpp-1 vpp-3 vpp-2 iosv-2
-
-iosv-1
-::a:1:1:0:6
-
-to iosv2
-ipv6 route ::a:1:1:0:16/128 ::a:1:1:0:7
-to iosv4
-ipv6 route ::a:1:1:0:22/128 ::a:1:1:0:7
-
-vpp-1
-
-::a:1:1:0:7
-...
-::a:1:1:0:e
-
-sr tunnel src 0::a:1:1:0:6 dst 0::a:1:1:0:16/128 next 0::a:1:1:0:f next 0::a:1:1:0:1a next 0::a:1:1:0:16 tag 0::a:1:1:0:7 InPE 1 clean
-
-vpp-3
-::a:1:1:0:f
-..
-::a:1:1:0:1b
-
-comment {fix src rpf screws}
-ip route add ::a:1:1:0:6/128 via drop
-ip route add ::a:1:1:0:16/128 via drop
-ip route add ::a:1:1:0:22/128 via drop
-vpp-2
-::a:1:1:0:1a
-..
-::a:1:1:0:17
-
-sr tunnel src 0::a:1:1:0:16 dst 0::a:1:1:0:6/128 next 0::a:1:1:0:1b next 0::a:1:1:0:e next 0::a:1:1:0:6 tag 0::a:1:1:0:17 InPE 1 clean
-
-iosv-2
-::a:1:1:0:16
-
-ipv6 route ::a:1:1:0:6/128 ::a:1:1:0:17
diff --git a/vnet/etc/scripts/virl/mplsogre.virl b/vnet/etc/scripts/virl/mplsogre.virl
deleted file mode 100644
index 33dd0329..00000000
--- a/vnet/etc/scripts/virl/mplsogre.virl
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<topology xmlns="http://www.cisco.com/VIRL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="0.9" xsi:schemaLocation="http://www.cisco.com/VIRL https://raw.github.com/CiscoVIRL/schema/v0.9/virl.xsd">
-    <extensions>
-        <entry key="management_network" type="String">flat</entry>
-    </extensions>
-    <node name="vpp-1" type="SIMPLE" subtype="vPP" location="467,307" vmImage="vPP-hacker [445e503a-564e-4c14-93e1-9660957c539a]" vmFlavor="vPP-small [e7f7de38-54e3-46f1-92ef-92b0039c1c60]">
-        <extensions>
-            <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: vpp-1
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo &quot;UseDNS no&quot; &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-- sed -i 's/no-pci//' /cisco/etc/qn.conf
-- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.15.3
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /cisco/etc/vpp-server.conf
-  owner: root:root
-  permissions: '0644'
-  content: |-
-    set interface ip address GigabitEthernet0/4/0 10.0.0.6/30
-    set interface state GigabitEthernet0/4/0 up
-    set interface ip address GigabitEthernet0/5/0 10.0.0.9/30
-    set interface state GigabitEthernet0/5/0 up
-    mpls encap add label 30 fib 0 dest 10.0.0.10
-    mpls decap add label 30 fib 0 
-    create mpls gre tunnel src 10.0.0.9 dst 10.0.0.10 intfc 10.0.0.13/30 inner-fib-id 0 outer-fib-id 0
-</entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.6" netPrefixLenV4="30"/>
-        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.9" netPrefixLenV4="30"/>
-    </node>
-    <node name="vpp-2" type="SIMPLE" subtype="vPP" location="591,305" vmImage="vPP-hacker [445e503a-564e-4c14-93e1-9660957c539a]" vmFlavor="vPP-small [e7f7de38-54e3-46f1-92ef-92b0039c1c60]">
-        <extensions>
-            <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: vpp-2
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo &quot;UseDNS no&quot; &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-- sed -i 's/no-pci//' /cisco/etc/qn.conf
-- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.15.3
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /cisco/etc/vpp-server.conf
-  owner: root:root
-  permissions: '0644'
-  content: |-
-    set interface ip address GigabitEthernet0/4/0 10.0.0.10/30
-    set interface state GigabitEthernet0/4/0 up
-    set interface ip address GigabitEthernet0/5/0 10.0.0.14/30
-    set interface state GigabitEthernet0/5/0 up
-    mpls encap add label 30 fib 0 dest 10.0.0.9
-    mpls decap add label 30 fib 0 
-    create mpls gre tunnel src 10.0.0.10 dst 10.0.0.9 intfc 10.0.0.5/30 inner-fib-id 0 outer-fib-id 0
-</entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.10" netPrefixLenV4="30"/>
-        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.14" netPrefixLenV4="30"/>
-    </node>
-    <node name="iosv-1" type="SIMPLE" subtype="IOSv" location="326,311" ipv4="192.168.0.1">
-        <extensions>
-            <entry key="config" type="string">! IOS Config generated on 2015-03-03 17:26
-! by autonetkit_0.15.0
-!
-hostname iosv-1
-boot-start-marker
-boot-end-marker
-!
-no aaa new-model
-!
-!
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-!
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-no service config
-enable password cisco
-ip classless
-ip subnet-zero
-no ip domain lookup
-line vty 0 4
- transport input ssh telnet
- exec-timeout 720 0
- password cisco
- login
-line con 0
- password cisco
-!
-!
-interface Loopback0
-  description Loopback
-  ip address 192.168.0.1 255.255.255.255
-!
-interface GigabitEthernet0/0
-  description OOB Management
-  ! Configured on launch
-  no ip address
-  duplex auto
-  speed auto
-  no shutdown
-!
-interface GigabitEthernet0/1
-  description to vpp-1
-  ip address 10.0.0.5 255.255.255.252
-  ip ospf cost 1
-  duplex auto
-  speed auto
-  no shutdown
-!
-!
-!
-router ospf 1
-  network 192.168.0.1 0.0.0.0 area 0
-  log-adjacency-changes
-  passive-interface Loopback0
-  network 10.0.0.4 0.0.0.3 area 0
-!
-!
-router bgp 1
-  bgp router-id 192.168.0.1
-  no synchronization
-! ibgp
-  ! ibgp peers
-  !
-  neighbor 192.168.0.4 remote-as 1
-  neighbor 192.168.0.4 description iBGP peer iosv-2
-  neighbor 192.168.0.4 update-source Loopback0
-!
-!
- !
- address-family ipv4
-  network 192.168.0.1 mask 255.255.255.255
-  neighbor 192.168.0.4 activate
- exit-address-family
-!
-!
-!
-ip route 10.0.0.13 255.255.255.255 10.0.0.6
-end
-</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.5" netPrefixLenV4="30"/>
-    </node>
-    <node name="iosv-2" type="SIMPLE" subtype="IOSv" location="741,307" ipv4="192.168.0.4">
-        <extensions>
-            <entry key="config" type="string">! IOS Config generated on 2015-03-03 17:26
-! by autonetkit_0.15.0
-!
-hostname iosv-2
-boot-start-marker
-boot-end-marker
-!
-no aaa new-model
-!
-!
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-!
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-no service config
-enable password cisco
-ip classless
-ip subnet-zero
-no ip domain lookup
-line vty 0 4
- transport input ssh telnet
- exec-timeout 720 0
- password cisco
- login
-line con 0
- password cisco
-!
-!
-interface Loopback0
-  description Loopback
-  ip address 192.168.0.4 255.255.255.255
-!
-interface GigabitEthernet0/0
-  description OOB Management
-  ! Configured on launch
-  no ip address
-  duplex auto
-  speed auto
-  no shutdown
-!
-interface GigabitEthernet0/1
-  description to vpp-2
-  ip address 10.0.0.13 255.255.255.252
-  ip ospf cost 1
-  duplex auto
-  speed auto
-  no shutdown
-!
-!
-!
-router ospf 1
-  network 192.168.0.4 0.0.0.0 area 0
-  log-adjacency-changes
-  passive-interface Loopback0
-  network 10.0.0.12 0.0.0.3 area 0
-!
-!
-router bgp 1
-  bgp router-id 192.168.0.4
-  no synchronization
-! ibgp
-  ! ibgp peers
-  !
-  neighbor 192.168.0.1 remote-as 1
-  neighbor 192.168.0.1 description iBGP peer iosv-1
-  neighbor 192.168.0.1 update-source Loopback0
-!
-!
- !
- address-family ipv4
-  network 192.168.0.4 mask 255.255.255.255
-  neighbor 192.168.0.1 activate
- exit-address-family
-!
-!
-ip route 10.0.0.5 255.255.255.255 10.0.0.14
-!
-end
-</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.13" netPrefixLenV4="30"/>
-    </node>
-    <connection dst="/virl:topology/virl:node[1]/virl:interface[1]" src="/virl:topology/virl:node[3]/virl:interface[1]"/>
-    <connection dst="/virl:topology/virl:node[2]/virl:interface[1]" src="/virl:topology/virl:node[1]/virl:interface[2]"/>
-    <connection dst="/virl:topology/virl:node[4]/virl:interface[1]" src="/virl:topology/virl:node[2]/virl:interface[2]"/>
-</topology>
diff --git a/vnet/etc/scripts/virl/simple.virl b/vnet/etc/scripts/virl/simple.virl
deleted file mode 100644
index 6033c42c..00000000
--- a/vnet/etc/scripts/virl/simple.virl
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<topology xmlns="http://www.cisco.com/VIRL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="0.9" xsi:schemaLocation="http://www.cisco.com/VIRL https://raw.github.com/CiscoVIRL/schema/v0.9/virl.xsd">
-    <extensions>
-        <entry key="management_network" type="String">flat</entry>
-    </extensions>
-    <node name="iosv-1" type="SIMPLE" subtype="IOSv" location="427,219" ipv4="192.168.0.2">
-        <extensions>
-            <entry key="config" type="string">!
-! Last configuration change at 14:27:32 UTC Fri Mar 27 2015
-!
-version 15.4
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname iosv-1
-!
-boot-start-marker
-boot-end-marker
-!
-!
-enable password cisco
-!
-no aaa new-model
-!
-!
-!
-mmi polling-interval 60
-no mmi auto-configure
-no mmi pvc
-mmi snmp-timeout 180
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-no ip domain lookup
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-multilink bundle-name authenticated
-!
-!
-cts logging verbose
-!
-!
-!
-redundancy
-!
-!
-! 
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-interface Loopback0
- description Loopback
- ip address 192.168.0.2 255.255.255.255
-!
-interface GigabitEthernet0/0
- description OOB Management
- ip address 172.16.1.167 255.255.255.0
- duplex auto
- speed auto
- media-type rj45
-!
-interface GigabitEthernet0/1
- description to vpp-1
- ip address 10.0.0.5 255.255.255.252
- ip ospf cost 1
- duplex auto
- speed auto
- media-type rj45
-!
-router ospf 1
- passive-interface Loopback0
- network 10.0.0.4 0.0.0.3 area 0
- network 192.168.0.2 0.0.0.0 area 0
-!
-router bgp 1
- bgp router-id 192.168.0.2
- bgp log-neighbor-changes
- neighbor 192.168.0.3 remote-as 1
- neighbor 192.168.0.3 description iBGP peer iosv-2
- neighbor 192.168.0.3 update-source Loopback0
- !
- address-family ipv4
-  network 192.168.0.2 mask 255.255.255.255
-  neighbor 192.168.0.3 activate
- exit-address-family
-!
-ip forward-protocol nd
-!
-!
-no ip http server
-no ip http secure-server
-ip route 10.0.0.9 255.255.255.255 10.0.0.6
-!
-!
-!
-!
-control-plane
-!
-banner exec `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner incoming `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner login `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-!
-line con 0
- password cisco
-line aux 0
-line vty 0 4
- exec-timeout 720 0
- password cisco
- login
- transport input telnet ssh
-!
-no scheduler allocate
-!
-end</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.5" netPrefixLenV4="30"/>
-    </node>
-    <node name="iosv-2" type="SIMPLE" subtype="IOSv" location="704,221" ipv4="192.168.0.3">
-        <extensions>
-            <entry key="config" type="string">!
-! Last configuration change at 14:26:58 UTC Fri Mar 27 2015
-!
-version 15.4
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname iosv-2
-!
-boot-start-marker
-boot-end-marker
-!
-!
-enable password cisco
-!
-no aaa new-model
-!
-!
-!
-mmi polling-interval 60
-no mmi auto-configure
-no mmi pvc
-mmi snmp-timeout 180
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-no ip domain lookup
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-multilink bundle-name authenticated
-!
-!
-cts logging verbose
-!
-!
-!
-redundancy
-!
-!
-! 
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-!
-interface Loopback0
- description Loopback
- ip address 192.168.0.3 255.255.255.255
-!
-interface GigabitEthernet0/0
- description OOB Management
- ip address 172.16.1.164 255.255.255.0
- duplex auto
- speed auto
- media-type rj45
-!
-interface GigabitEthernet0/1
- description to vpp-1
- ip address 10.0.0.9 255.255.255.252
- ip ospf cost 1
- duplex auto
- speed auto
- media-type rj45
-!
-router ospf 1
- passive-interface Loopback0
- network 10.0.0.8 0.0.0.3 area 0
- network 192.168.0.3 0.0.0.0 area 0
-!
-router bgp 1
- bgp router-id 192.168.0.3
- bgp log-neighbor-changes
- neighbor 192.168.0.2 remote-as 1
- neighbor 192.168.0.2 description iBGP peer iosv-1
- neighbor 192.168.0.2 update-source Loopback0
- !
- address-family ipv4
-  network 192.168.0.3 mask 255.255.255.255
-  neighbor 192.168.0.2 activate
- exit-address-family
-!
-ip forward-protocol nd
-!
-!
-no ip http server
-no ip http secure-server
-ip route 10.0.0.5 255.255.255.255 10.0.0.10
-!
-!
-!
-!
-control-plane
-!
-banner exec `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner incoming `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-banner login `
-**************************************************************************
-* IOSv is strictly limited to use for evaluation, demonstration and IOS  *
-* education. IOSv is provided as-is and is not supported by Cisco's      *
-* Technical Advisory Center. Any use or disclosure, in whole or in part, *
-* of the IOSv Software or Documentation to any third party for any       *
-* purposes is expressly prohibited except as otherwise authorized by     *
-* Cisco in writing.                                                      *
-**************************************************************************`
-!
-line con 0
- password cisco
-line aux 0
-line vty 0 4
- exec-timeout 720 0
- password cisco
- login
- transport input telnet ssh
-!
-no scheduler allocate
-!
-end</entry>
-            <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/1" ipv4="10.0.0.9" netPrefixLenV4="30"/>
-    </node>
-    <node name="vpp-1" type="SIMPLE" subtype="vPP" location="561,217">
-        <extensions>
-            <entry key="config" type="string">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: vpp-1
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-- sed -i 's/no-pci//' /cisco/etc/qn.conf
-- sed -i 's/1024/1024 decimal-interface-names/g' /cisco/etc/qn.conf
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.15.3
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /cisco/etc/vpp-server.conf
-  owner: root:root
-  permissions: '0644'
-  content: |-
-    set interface ip address GigabitEthernet0/4/0 10.0.0.6/30
-    set interface state GigabitEthernet0/4/0 up
-    set interface ip address GigabitEthernet0/5/0 10.0.0.10/30
-    set interface state GigabitEthernet0/5/0 up
-</entry>
-        </extensions>
-        <interface id="0" name="GigabitEthernet0/4/0" ipv4="10.0.0.6" netPrefixLenV4="30"/>
-        <interface id="1" name="GigabitEthernet0/5/0" ipv4="10.0.0.10" netPrefixLenV4="30"/>
-    </node>
-    <connection dst="/virl:topology/virl:node[3]/virl:interface[1]" src="/virl:topology/virl:node[1]/virl:interface[1]"/>
-    <connection dst="/virl:topology/virl:node[2]/virl:interface[1]" src="/virl:topology/virl:node[3]/virl:interface[2]"/>
-</topology>
diff --git a/vnet/etc/scripts/vlan b/vnet/etc/scripts/vlan
deleted file mode 100644
index 076080a6..00000000
--- a/vnet/etc/scripts/vlan
+++ /dev/null
@@ -1,23 +0,0 @@
-int create-ethernet
-int create-sub fake-eth0 1
-set int state fake-eth0 up
-set int state fake-eth0.1 up
-
-packet-generator new {
-  name x
-  limit 1
-  node ethernet-input
-  interface fake-eth0
-  size 64-64
-  no-recycle
-  data {
-    IP4: 1.2.3 -> 4.5.6 vlan 1
-    ICMP: 1.2.3.4 -> 5.6.7.8
-    ICMP echo_request
-    incrementing 100
-  }
-}
-
-tr add pg-input 100
-ip route 5.6.7.8/32 via local
-ip route 1.2.3.4/32 via local
diff --git a/vnet/suffix-rules.mk b/vnet/suffix-rules.mk
deleted file mode 120000
index f6098400..00000000
--- a/vnet/suffix-rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-../build-data/suffix-rules.mk
\ No newline at end of file
diff --git a/vnet/test/README b/vnet/test/README
deleted file mode 100644
index 10579e50..00000000
--- a/vnet/test/README
+++ /dev/null
@@ -1,10 +0,0 @@
-Unit test infrastructure for vnet
-
-To run unit tests do the following:
-
-  1. build vpp with 'vpp_enable_tests = yes' in build-data/platforms/vpp.mk
-
-  2. go to build-root/build-$tag-$arch/vnet
-
-  3. run
-    $ make check
diff --git a/vnet/test/lisp-cp/test_cp_serdes.c b/vnet/test/lisp-cp/test_cp_serdes.c
deleted file mode 100644
index 5343d0e4..00000000
--- a/vnet/test/lisp-cp/test_cp_serdes.c
+++ /dev/null
@@ -1,635 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vppinfra/error.h>
-#include <vnet/lisp-cp/lisp_cp_messages.h>
-#include <vnet/lisp-cp/control.h>
-#include <vnet/lisp-cp/lisp_msg_serdes.h>
-#include <vlibapi/api.h>
-#include <vnet/lisp-cp/packets.h>
-
-#define _assert(e)                    \
-  error = CLIB_ERROR_ASSERT (e);      \
-  if (error)                          \
-    goto done;
-
-static void print_chunk(u8 * b, int * offset, int c, char * des)
-{
-  int i, n = offset[0] + c;;
-  for (i = offset[0]; i < n; i++)
-  {
-    printf("0x%02x, ", b[i]);
-  }
-  printf(" // %s\n", des);
-  *offset += c;
-}
-
-void print_map_request(map_request_hdr_t * h)
-{
-#define pchunk(_count, _desc) \
-  print_chunk((u8 *)h, &offset, _count, _desc)
-
-  int offset = 0;
-
-  pchunk(4, "data");
-  pchunk(8, "Nonce");
-  pchunk(2, "Source-EID-AFI");
-  pchunk(4, "Source EID Address");
-  pchunk(2, "ITR-RLOC-AFI 1");
-  pchunk(4, "ITR-RLOC Address 1");
-  pchunk(2, "ITR-RLOC-AFI 2");
-  pchunk(16, "ITR-RLOC Address 2");
-  pchunk(1, "REC: reserved");
-  pchunk(1, "REC: EID mask-len");
-  pchunk(2, "REC: EID-prefix-AFI");
-  pchunk(4, "REC: EID-prefix");
-  printf("\n");
-}
-
-static clib_error_t * test_lisp_msg_push_ecm ()
-{
-  vlib_main_t * vm = vlib_get_main ();
-  clib_error_t * error = 0;
-  gid_address_t la, ra;
-  vlib_buffer_t * b = 0;
-  u32 buff_len = 900;
-  int lp = 0x15, rp = 0x14;
-
-  b = clib_mem_alloc (buff_len);
-  memset((u8 *)b, 0, buff_len);
-  b->current_length = buff_len;
-  b->current_data = sizeof(udp_header_t) + sizeof(ip4_header_t) +
-    sizeof(ecm_hdr_t) + 1;
-
-  la.type = GID_ADDR_IP_PREFIX;
-  la.ippref.addr.ip.v4.as_u32 = 0xa1b2c3d4;
-  la.ippref.addr.version = IP4;
-
-  ra.type = GID_ADDR_IP_PREFIX;
-  ra.ippref.addr.ip.v4.as_u32 = 0x90817263;
-  ra.ippref.addr.version = IP4;
-
-  ecm_hdr_t * lh = lisp_msg_push_ecm (vm, b, lp, rp, &la, &ra);
-
-  u8 expected_ecm_hdr[] = {
-    0x80, 0x00, 0x00, 0x00
-  };
-  _assert(0 == memcmp(expected_ecm_hdr, lh, sizeof(expected_ecm_hdr)));
-
-  ip4_header_t * ih = (ip4_header_t *) (lh + 1);
-  /* clear ip checksum */
-  memset((u8 *)ih + 10, 0, 2);
-
-  u8 expected_ip4_hdr[] = {
-    0x45,                   /* version; IHL */
-    0x00,                   /* services */
-    0x03, 0xa0,             /* total length */
-    0x00, 0x00,             /* identification */
-    0x40, 0x00,             /* flags; fragment offset*/
-    0xff,                   /* TTL */
-    0x11,                   /* protocol */
-    0x00, 0x00,             /* header checksum */
-    0xd4, 0xc3, 0xb2, 0xa1, /* src IP */
-    0x63, 0x72, 0x81, 0x90, /* dst IP */
-  };
-  _assert(0 == memcmp(ih, expected_ip4_hdr, sizeof(expected_ip4_hdr)));
-
-  udp_header_t * uh = (udp_header_t *) (ih + 1);
-  /* clear udp checksum */
-  memset((u8 *)uh + 6, 0, 2);
-
-  u8 expected_udp_hdr[] = {
-    0x00, 0x15, /* src port */
-    0x00, 0x14, /* dst port */
-    0x03, 0x8c, /* length */
-    0x00, 0x00, /* checksum */
-  };
-  _assert(0 == memcmp(uh, expected_udp_hdr, sizeof(expected_udp_hdr)));
-
-done:
-  clib_mem_free (b);
-  return error;
-}
-
-static clib_error_t * test_lisp_msg_parse_mapping_record ()
-{
-  clib_error_t * error = 0;
-  locator_t probed;
-  locator_t * locs = 0;
-  vlib_buffer_t * b = 0;
-  gid_address_t eid;
-  u32 buff_len = 500;
-
-  b = clib_mem_alloc (buff_len);
-  memset((u8 *)b, 0, buff_len);
-
-  u8 map_reply_records[] = {
-    /* 1. record */
-    0x01, 0x02, 0x03, 0x04, /* record TTL */
-    0x01,                   /* locator count */
-    0x00, 0x00, 0x00,       /* eid-mask-len; ... */
-    0x00, 0x00,             /* reserved; map-version num */
-    0x00, 0x01,             /* EID-Prefix-AFI */
-    0x33, 0x44, 0x55, 0x66, /* eid-prefix */
-    /* loc */
-    0x0a,                   /* prority */
-    0x0b,                   /* weight */
-    0x0c,                   /* m-prority */
-    0x0d,                   /* m-weight */
-    0x00, 0x00,             /* unused flags */
-    0x00, 0x01,             /* Loc-AFI */
-    0xaa, 0xbb, 0xcc, 0xdd, /* Loator */
-  };
-  b->current_length = buff_len;
-  clib_memcpy(b->data, map_reply_records, sizeof(map_reply_records));
-
-  lisp_msg_parse_mapping_record (b, &eid, &locs, &probed);
-  _assert(vec_len (locs) == 1);
-  _assert(eid.ippref.addr.ip.v4.as_u32 == 0x66554433);
-  _assert(locs[0].local == 0);
-  _assert(locs[0].address.ippref.addr.ip.v4.as_u32 == 0xddccbbaa);
-  _assert(locs[0].address.type == GID_ADDR_IP_PREFIX);
-  _assert(locs[0].priority == 0xa);
-  _assert(locs[0].weight == 0xb);
-  _assert(locs[0].mpriority == 0xc);
-  _assert(locs[0].mweight == 0xd);
-
-done:
-  clib_mem_free (b);
-  if (locs)
-    vec_free (locs);
-  return error;
-}
-
-static map_request_hdr_t *
-build_map_request (lisp_cp_main_t * lcm, vlib_buffer_t * b,
-                   gid_address_t * rlocs)
-{
-  gid_address_t _seid, * seid = &_seid;
-  gid_address_t _deid, * deid = &_deid;
-  u8 is_smr_invoked = 1;
-  u8 rloc_probe_set = 0;
-  u64 nonce = 0;
-  map_request_hdr_t * h = 0;
-  memset (deid, 0, sizeof (deid[0]));
-  memset (seid, 0, sizeof (seid[0]));
-
-  gid_address_type (seid) = GID_ADDR_IP_PREFIX;
-  ip_address_t * ip_addr = &gid_address_ip (seid);
-  ip_addr_v4 (ip_addr).as_u32 = 0x12345678;
-  seid->ippref.addr.version = IP4;
-
-  gid_address_type (deid) = GID_ADDR_IP_PREFIX;
-  ip_address_t * ip_addr2 = &gid_address_ip (deid);
-  ip_addr_v4 (ip_addr2).as_u32 = 0x9abcdef0;
-  deid->ippref.addr.version = IP4;
-  gid_address_ippref_len (deid) = 24;
-
-  h = lisp_msg_put_mreq (lcm, b, seid, deid, rlocs,
-                     is_smr_invoked, rloc_probe_set, &nonce);
-  vec_free(rlocs);
-  return h;
-}
-
-static void
-generate_rlocs (gid_address_t **rlocs, u32 * count)
-{
-  gid_address_t gid_addr_data, * gid_addr = &gid_addr_data;
-  memset (gid_addr, 0, sizeof (gid_addr[0]));
-  ip_address_t * addr = &gid_address_ip (gid_addr);
-
-  gid_address_type (gid_addr) = GID_ADDR_IP_PREFIX;
-
-  ip_addr_version (addr) = IP4;
-  ip_addr_v4 (addr).data_u32 = 0x10203040;
-  vec_add1 (rlocs[0], gid_addr[0]);
-
-  ip_addr_v6 (addr).as_u32[0] = 0xffeeddcc;
-  ip_addr_v6 (addr).as_u32[1] = 0xbbaa9988;
-  ip_addr_v6 (addr).as_u32[2] = 0x77665544;
-  ip_addr_v6 (addr).as_u32[3] = 0x33221100;
-  ip_addr_version (addr) = IP6;
-  vec_add1 (rlocs[0], gid_addr[0]);
-}
-
-static clib_error_t * test_lisp_msg_parse ()
-{
-  gid_address_t eid;
-  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
-  map_request_hdr_t *h;
-  gid_address_t gid;
-  clib_error_t * error = 0;
-  vlib_buffer_t * b;
-  gid_address_t * rlocs_decode = 0, * rlocs = 0;
-  u32 rloc_count_parse = 0;
-
-  u8 * data = clib_mem_alloc(500);
-  memset(data, 0, 500);
-  b = (vlib_buffer_t *) data;
-
-  generate_rlocs (&rlocs_decode, &rloc_count_parse);
-  h = build_map_request (lcm, b, rlocs_decode);
-
-  vlib_buffer_pull(b, sizeof(*h));
-  u32 len = lisp_msg_parse_addr(b, &gid);
-  _assert (len == 2 + 4
-      /* Source-EID-AFI field lenght + IPv4 address length */);
-  _assert (gid.ippref.addr.ip.v4.as_u32 == 0x12345678);
-  _assert (gid.ippref.addr.version == IP4);
-
-  u8 rloc_count = MREQ_ITR_RLOC_COUNT(h) + 1;
-  lisp_msg_parse_itr_rlocs (b, &rlocs, rloc_count);
-
-  _assert (vec_len (rlocs) == 2);
-  _assert (rlocs[0].ippref.addr.ip.v4.as_u32 == 0x10203040);
-  _assert (rlocs[0].ippref.addr.version == IP4);
-
-  _assert (rlocs[1].ippref.addr.ip.v6.as_u32[0] == 0xffeeddcc);
-  _assert (rlocs[1].ippref.addr.ip.v6.as_u32[1] == 0xbbaa9988);
-  _assert (rlocs[1].ippref.addr.ip.v6.as_u32[2] == 0x77665544);
-  _assert (rlocs[1].ippref.addr.ip.v6.as_u32[3] == 0x33221100);
-  _assert (rlocs[1].ippref.addr.version == IP6);
-
-  lisp_msg_parse_eid_rec (b, &eid);
-  _assert (eid.ippref.addr.ip.v4.as_u32 == 0x9abcdef0);
-  _assert (eid.ippref.addr.version == IP4);
-  _assert (eid.ippref.len == 24);
-
-done:
-  clib_mem_free (data);
-  if (rlocs)
-    vec_free (rlocs);
-  return error;
-}
-
-static clib_error_t * test_lisp_msg_put_mreq_with_lcaf ()
-{
-  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
-  clib_error_t * error = 0;
-  map_request_hdr_t *h = 0;
-  gid_address_t * rlocs = 0;
-
-  ip_prefix_t ippref;
-  ip_prefix_version (&ippref) = IP4;
-  ip4_address_t * ip = &ip_prefix_v4 (&ippref);
-  ip->as_u32 = 0x11223344;
-
-  gid_address_t g =
-    {
-      .type = GID_ADDR_IP_PREFIX,
-      .ippref = ippref,
-      .vni = 0x90919293,
-      .vni_mask = 0x17
-    };
-  vec_add1 (rlocs, g);
-
-  u8 * data = clib_mem_alloc (500);
-  memset (data, 0, 500);
-
-  h = build_map_request (lcm, (vlib_buffer_t *) data, rlocs);
-
-  /* clear Nonce to simplify comparison */
-  memset ((u8 *)h + 4, 0, 8);
-
-  u8 expected_data[] =
-    {
-      0x10, 0x40, 0x00, 0x01, /* type; flags; IRC; REC count */
-      0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, /* nonce */
-      0x00, 0x01,             /* Source-EID-AFI */
-      0x78, 0x56, 0x34, 0x12, /* Source EID Address */
-
-      /* RLOCs */
-      0x40, 0x03,             /* AFI = LCAF*/
-      /* LCAF header*/
-      0x00, 0x00,             /* reserved1, flags */
-      0x02,                   /* type = Instance ID */
-      0x17,                   /* IID mask-len */
-      0x00, 0x0a,             /* lenght */
-      0x90, 0x91, 0x92, 0x93, /* IID / VNI */
-
-      0x00, 0x01,             /* AFI = ipv4 */
-      0x44, 0x33, 0x22, 0x11, /* ITR-RLOC Address 1 */
-
-      /* record */
-      0x00,                   /* reserved */
-      0x18,                   /* EID mask-len */
-      0x00, 0x01,             /* EID-prefix-AFI */
-      0xf0, 0xde, 0xbc, 0x9a, /* EID-prefix */
-    };
-
-  _assert (0 == memcmp (expected_data, (u8 *) h, sizeof (expected_data)));
-done:
-  clib_mem_free (data);
-  return error;
-}
-
-static clib_error_t * test_lisp_msg_put_mreq ()
-{
-  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
-  clib_error_t * error = 0;
-  map_request_hdr_t *h;
-  gid_address_t * rlocs = 0;
-  u32 rloc_count = 0;
-
-  u8 * data = clib_mem_alloc(500);
-  memset(data, 0, 500);
-
-  generate_rlocs (&rlocs, &rloc_count);
-  h = build_map_request (lcm, (vlib_buffer_t *) data, rlocs);
-
-  /* clear Nonce to simplify comparison */
-  memset((u8 *)h + 4, 0, 8);
-
-  print_map_request(h);
-
-  u8 expected_data[50] = {
-    0x10, 0x40, 0x01, 0x01, /* type; flags; IRC; REC count */
-    0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, /* nonce */
-    0x00, 0x01,             /* Source-EID-AFI */
-    0x78, 0x56, 0x34, 0x12, /* Source EID Address */
-
-    /* RLOCs */
-    0x00, 0x01,             /* ITR-RLOC-AFI 1 */
-    0x40, 0x30, 0x20, 0x10, /* ITR-RLOC Address 1 */
-    0x00, 0x02,             /* ITR-RLOC-AFI 2 */
-    0xcc, 0xdd, 0xee, 0xff,
-    0x88, 0x99, 0xaa, 0xbb,
-    0x44, 0x55, 0x66, 0x77,
-    0x00, 0x11, 0x22, 0x33, /* ITR-RLOC Address 2 */
-
-    /* record */
-    0x00,                   /* reserved */
-    0x18,                   /* EID mask-len */
-    0x00, 0x01,             /* EID-prefix-AFI */
-    0xf0, 0xde, 0xbc, 0x9a, /* EID-prefix */
-  };
-  _assert (0 == memcmp (expected_data, (u8 *) h, sizeof (expected_data)));
-
-done:
-  clib_mem_free (data);
-  return error;
-}
-
-/* generate a vector of eid records */
-static mapping_t *
-build_test_map_records ()
-{
-  mapping_t * records = 0;
-
-  mapping_t r = {
-    .ttl = 0x44332211,
-    .eid = {
-      .type = GID_ADDR_MAC,
-      .mac = {1, 2, 3, 4, 5, 6},
-      .vni = 0x0
-    }
-  };
-
-  locator_t loc = {
-    .weight = 1,
-    .priority = 2,
-    .local = 1,
-    .address = {
-      .type = GID_ADDR_IP_PREFIX,
-      .ippref = {
-        .addr = {
-          .ip.v4.as_u32 = 0x99887766,
-          .version = IP4
-        }
-      }
-    }
-  };
-  vec_add1 (r.locators, loc);
-  vec_add1 (records, r);
-
-  return records;
-}
-
-static void
-free_test_map_records (mapping_t * maps)
-{
-  mapping_t * map;
-  vec_foreach (map, maps)
-    {
-      vec_free (map->locators);
-    }
-  vec_free (maps);
-}
-
-static clib_error_t *
-test_lisp_map_register ()
-{
-  vlib_buffer_t *b;
-  clib_error_t * error = 0;
-  u64 nonce;
-  u32 msg_len = 0;
-  mapping_t * records = build_test_map_records ();
-
-  u8 * data = clib_mem_alloc(500);
-  memset(data, 0, 500);
-  b = (vlib_buffer_t *) data;
-
-  lisp_msg_put_map_register (b, records, 1 /* want map notify */,
-                            20 /* length of HMAC_SHA_1_96 */,
-                            &nonce, &msg_len);
-  free_test_map_records (records);
-
-  /* clear Nonce to simplify comparison */
-  memset((u8 *)b->data + 4, 0, 8);
-
-  /* clear authentication data */
-  memset ((u8 *)b->data + 16, 0, 20);
-
-  u8 expected_data[] = {
-    0x30, 0x00, 0x01, 0x01, /* type; rsvd; want notify; REC count */
-    0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, /* nonce */
-    0x00, 0x00, 0x00, 0x00, /* key id, auth data length:
-                              both are zeroes because those are set in another
-                              function (see auth_data_len_by_key_id())*/
-    0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, /* auth data */
-
-    /* first record */
-    0x44, 0x33, 0x22, 0x11, /* ttl */
-    0x01, 0x00, 0x00, 0x00, /* loc count, eid len, ACT, A */
-    0x00, 0x00, 0x40, 0x05, /* rsvd, map ver num, AFI = MAC */
-    0x01, 0x02, 0x03, 0x04,
-    0x05, 0x06,             /* MAC EID */
-
-    /* locator 1 */
-    0x02, 0x01, 0x00, 0x00, /* prio, weight, mprio, mweight */
-    0x00, 0x04, 0x00, 0x01, /* flags, AFI = ipv4 */
-    0x66, 0x77, 0x88, 0x99, /* ipv4 locator address */
-  };
-  _assert (0 == memcmp (expected_data, b->data, sizeof (expected_data)));
-done:
-  clib_mem_free (data);
-  return error;
-}
-
-static clib_error_t *
-test_lisp_parse_lcaf ()
-{
-  int i;
-  clib_error_t * error = 0;
-  gid_address_t eid;
-  locator_t * locs = 0;
-  locator_t probed;
-  vlib_buffer_t * b = 0;
-  u32 buff_len = 500;
-
-  b = clib_mem_alloc (buff_len);
-  memset ((u8 *)b, 0, buff_len);
-
-  u8 map_reply_records[] =
-    {
-      /* 1. record */
-      0x01, 0x02, 0x03, 0x04, /* record TTL */
-      0x03,                   /* locator count */
-      0x00, 0x00, 0x00,       /* eid-mask-len; ... */
-      0x00, 0x00,             /* reserved; map-version num */
-      0x00, 0x01,             /* EID-Prefix-AFI */
-      0x33, 0x44, 0x55, 0x66, /* eid-prefix */
-
-      /* 1st locator */
-      0x0a,                   /* prority */
-      0x0b,                   /* weight */
-      0x0c,                   /* m-prority */
-      0x0d,                   /* m-weight */
-      0x00, 0x00,             /* unused flags */
-      0x40, 0x03,             /* Loc-AFI = LCAF*/
-
-      /* LCAF header*/
-      0x00, 0x00,             /* reserved1, flags */
-      0x02,                   /* type = Instance ID */
-      0x18,                   /* IID mask-len */
-      0x00, 0x0a,             /* lenght */
-      /* LCAF Instance ID */
-      0x00, 0x00, 0x00, 0x09, /* iid */
-      0x00, 0x01,             /* AFI = ipv4 */
-      0x10, 0xbb, 0xcc, 0xdd, /* ipv4 loator address */
-
-      /* 2nd locator */
-      0x07,                   /* prority */
-      0x06,                   /* weight */
-      0x05,                   /* m-prority */
-      0x04,                   /* m-weight */
-      0x00, 0x00,             /* unused flags */
-      0x40, 0x03,             /* Loc-AFI = LCAF*/
-
-      /* LCAF header*/
-      0x00, 0x00,             /* reserved1, flags */
-      0x02,                   /* type = Instance ID */
-      0x18,                   /* IID mask-len */
-      0x00, 0x16,             /* iid length + next AFI lenght */
-      /* LCAF Instance ID */
-      0x22, 0x44, 0x66, 0x88, /* iid */
-      0x00, 0x02,             /* AFI = ipv6 */
-      0xcc, 0xdd, 0xee, 0xff,
-      0x88, 0x99, 0xaa, 0xbb,
-      0x44, 0x55, 0x66, 0x77,
-      0x00, 0x11, 0x22, 0x33, /* ipv6 locator address */
-
-      /* 3rd locator */
-      0x0a,                   /* prority */
-      0x0b,                   /* weight */
-      0x0c,                   /* m-prority */
-      0x0d,                   /* m-weight */
-      0x00, 0x00,             /* unused flags */
-      0x00, 0x01,             /* Loc-AFI */
-      0xaa, 0xbb, 0xcc, 0xdd, /* Loator */
-    };
-
-  b->current_length = buff_len;
-  memcpy (b->data, map_reply_records, sizeof (map_reply_records));
-
-  lisp_msg_parse_mapping_record (b, &eid, &locs, &probed);
-  _assert (vec_len (locs) == 3);
-  _assert (eid.ippref.addr.ip.v4.as_u32 == 0x66554433);
-
-  /* check 1st locator - an LCAF with ipv4 */
-  _assert (locs[0].local == 0);
-  _assert (locs[0].priority == 0xa);
-  _assert (locs[0].weight == 0xb);
-  _assert (locs[0].mpriority == 0xc);
-  _assert (locs[0].mweight == 0xd);
-
-  _assert (gid_address_type (&locs[0].address) == GID_ADDR_IP_PREFIX);
-  _assert (gid_address_vni (&locs[0].address) == 0x09);
-  ip_prefix_t * ip_pref = &gid_address_ippref (&locs[0].address);
-  _assert (IP4 == ip_prefix_version (ip_pref));
-
-  /* 2nd locator - LCAF entry with ipv6 address */
-  _assert (locs[1].local == 0);
-  _assert (locs[1].priority == 0x7);
-  _assert (locs[1].weight == 0x6);
-  _assert (locs[1].mpriority == 0x5);
-  _assert (locs[1].mweight == 0x4);
-
-  _assert (gid_address_type (&locs[1].address) == GID_ADDR_IP_PREFIX);
-  _assert (0x22446688 == gid_address_vni (&locs[1].address));
-  ip_pref = &gid_address_ippref (&locs[1].address);
-  _assert (IP6 == ip_prefix_version (ip_pref));
-
-  /* 3rd locator - simple ipv4 address */
-  _assert (gid_address_type (&locs[2].address) == GID_ADDR_IP_PREFIX);
-done:
-  clib_mem_free (b);
-
-  for (i = 0; i < 3; i++)
-    locator_free (&locs[i]);
-  vec_free (locs);
-  return error;
-}
-
-#define foreach_test_case                 \
-  _(lisp_msg_put_mreq)                    \
-  _(lisp_msg_put_mreq_with_lcaf)          \
-  _(lisp_msg_push_ecm)                    \
-  _(lisp_msg_parse)                       \
-  _(lisp_msg_parse_mapping_record)        \
-  _(lisp_parse_lcaf)                      \
-  _(lisp_map_register)
-
-int run_tests (void)
-{
-  clib_error_t * error;
-
-#define _(_test_name)                   \
-  error = test_ ## _test_name ();       \
-  if (error)                            \
-    {                                   \
-      clib_error_report (error);        \
-      return 0;                         \
-    }
-
-  foreach_test_case
-#undef _
-
-  return 0;
-}
-
-int main()
-{
-  return run_tests ();
-}
-#undef _assert
diff --git a/vnet/test/lisp-cp/test_lisp_types.c b/vnet/test/lisp-cp/test_lisp_types.c
deleted file mode 100644
index 8aa9d418..00000000
--- a/vnet/test/lisp-cp/test_lisp_types.c
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vppinfra/error.h>
-#include <vnet/lisp-cp/lisp_types.h>
-#include <vnet/lisp-cp/lisp_cp_messages.h>
-
-#define _assert(e)                    \
-  error = CLIB_ERROR_ASSERT (e);      \
-  if (error)                          \
-    goto done;
-
-static clib_error_t * test_locator_type (void)
-{
-  clib_error_t * error = 0;
-  gid_address_t _gid_addr, * gid = &_gid_addr;
-  ip_prefix_t * ippref;
-  gid_address_type (gid) = GID_ADDR_IP_PREFIX;
-  gid_address_ippref_len (gid) = 24;
-  ippref = &gid_address_ippref (gid);
-  ip_prefix_version (ippref) = IP4;
-  ip_prefix_len (ippref) = 0;
-  ip4_address_t * ip4 = &ip_prefix_v4 (ippref);
-  ip4->as_u32 = 0x20304050;
-
-  /* local locator */
-  locator_t loc1, loc2 = {
-    .local = 1,
-    .state = 2,
-    .sw_if_index = 8,
-    .priority = 3,
-    .weight = 100,
-    .mpriority = 4,
-    .mweight = 101
-  };
-  locator_copy (&loc1, &loc2);
-  _assert (0 == locator_cmp (&loc1, &loc2));
-
-  /* remote locator */
-  loc2.local = 0;
-
-  ip_prefix_t nested_ippref;
-  ip_prefix_version (&nested_ippref) = IP4;
-  ip_prefix_len (&nested_ippref) = 0;
-  ip4 = &ip_prefix_v4 (&nested_ippref);
-  ip4->as_u32 = 0x33882299;
-  gid_address_t nested_gid =
-    {
-      .type = GID_ADDR_IP_PREFIX,
-      .ippref = nested_ippref
-    };
-
-  lcaf_t lcaf =
-    {
-      .type = LCAF_INSTANCE_ID,
-      .uni =
-        {
-          .vni_mask_len = 5,
-          .vni = 0xa1b2c3d4,
-          .gid_addr = &nested_gid
-        }
-    };
-  gid_address_type (gid) = GID_ADDR_LCAF;
-  gid_address_lcaf (gid) = lcaf;
-
-  loc2.address = gid[0];
-  locator_copy(&loc1, &loc2);
-
-  _assert (0 == locator_cmp (&loc1, &loc2));
-
-done:
-  locator_free (&loc1);
-  return error;
-}
-
-static clib_error_t * test_gid_parse_ip_pref ()
-{
-  clib_error_t * error = 0;
-  gid_address_t _gid_addr, * gid_addr = &_gid_addr;
-  gid_address_t _gid_addr_copy, * gid_addr_copy = &_gid_addr_copy;
-  u8 data[] =
-    {
-      0x00, 0x01,             /* AFI = IPv4 */
-      0x10, 0xbb, 0xcc, 0xdd, /* ipv4 address */
-    };
-
-  u32 len = gid_address_parse (data, gid_addr);
-  _assert (6 == len);
-  gid_address_copy (gid_addr_copy, gid_addr);
-  _assert (0 == gid_address_cmp (gid_addr_copy, gid_addr));
-done:
-  return error;
-}
-
-static clib_error_t * test_gid_parse_mac ()
-{
-  clib_error_t * error = 0;
-  gid_address_t _gid, * gid = &_gid;
-  gid_address_t _gid_copy, * gid_copy = &_gid_copy;
-
-  u8 data[] =
-    {
-      0x40, 0x05,             /* AFI = MAC address */
-      0x10, 0xbb, 0xcc, 0xdd, /* MAC */
-      0x77, 0x99,
-    };
-
-  u32 len = gid_address_parse (data, gid);
-  _assert (8 == len);
-  _assert (GID_ADDR_MAC == gid_address_type (gid));
-  gid_address_copy (gid_copy, gid);
-  _assert (0 == gid_address_cmp (gid_copy, gid));
-done:
-  return error;
-}
-
-static clib_error_t * test_gid_parse_lcaf ()
-{
-  clib_error_t * error = 0;
-  gid_address_t _gid_addr, * gid_addr = &_gid_addr;
-  gid_address_t _gid_addr_copy, * gid_addr_copy = &_gid_addr_copy;
-
-  memset (gid_addr, 0, sizeof (gid_addr[0]));
-  memset (gid_addr_copy, 0, sizeof (gid_addr_copy[0]));
-
-  u8 data[] =
-    {
-      0x40, 0x03,             /* AFI = LCAF*/
-
-      /* LCAF header*/
-      0x00, 0x00,             /* reserved1, flags */
-      0x02,                   /* type = Instance ID */
-      0x18,                   /* IID mask-len */
-      0x00, 0x0a,             /* iid length + next AFI lenght */
-      /* LCAF Instance ID */
-      0x00, 0x00, 0x00, 0x09, /* iid */
-      0x00, 0x01,             /* AFI = ipv4 */
-      0x10, 0xbb, 0xcc, 0xdd, /* ipv4 address */
-    };
-  u32 len = gid_address_parse (data, gid_addr);
-  _assert (18 == len);
-  gid_address_copy (gid_addr_copy, gid_addr);
-  _assert (0 == gid_address_cmp (gid_addr_copy, gid_addr));
-  _assert (GID_ADDR_IP_PREFIX == gid_address_type (gid_addr));
-  _assert (9 == gid_address_vni (gid_addr));
-  _assert (0x18 == gid_address_vni_mask (gid_addr));
-  _assert (0xddccbb10 == gid_addr->ippref.addr.ip.v4.as_u32);
-
-done:
-  gid_address_free (gid_addr);
-  gid_address_free (gid_addr_copy);
-  return error;
-}
-
-/* recursive LCAFs are not supported */
-#if 0
-static clib_error_t * test_gid_parse_lcaf_complex ()
-{
-  clib_error_t * error = 0;
-  gid_address_t _gid_addr, * gid_addr = &_gid_addr;
-  gid_address_t _gid_addr_copy, * gid_addr_copy = &_gid_addr_copy;
-
-  memset (gid_addr, 0, sizeof (gid_addr[0]));
-  memset (gid_addr_copy, 0, sizeof (gid_addr_copy[0]));
-
-  u8 data[] =
-    {
-      0x40, 0x03,             /* AFI = LCAF*/
-
-      /* LCAF header*/
-      0x00, 0x00,             /* reserved1, flags */
-      0x02,                   /* type = Instance ID */
-      0x18,                   /* IID mask-len */
-      0x00, 0x0a,             /* iid length + next AFI lenght */
-      /* LCAF Instance ID */
-      0x00, 0x00, 0x00, 0x0b, /* iid */
-
-      0x40, 0x03,             /* AFI = LCAF*/
-      /* LCAF header*/
-      0x00, 0x00,             /* reserved1, flags */
-      0x02,                   /* type = Instance ID */
-      0x17,                   /* IID mask-len */
-      0x00, 0x0a,             /* iid length + next AFI lenght */
-      /* LCAF Instance ID */
-      0x00, 0x00, 0x00, 0x0c, /* iid */
-
-      0x40, 0x03,             /* AFI = LCAF*/
-      /* LCAF header*/
-      0x00, 0x00,             /* reserved1, flags */
-      0x02,                   /* type = Instance ID */
-      0x16,                   /* IID mask-len */
-      0x00, 0x16,             /* iid length + next AFI lenght */
-      /* LCAF Instance ID */
-      0x00, 0x00, 0x00, 0x0d, /* iid */
-
-      0x00, 0x02,             /* AFI = IPv6 */
-
-      0x10, 0xbb, 0xcc, 0xdd,
-      0x10, 0xbb, 0xcc, 0xdd,
-      0x10, 0xbb, 0xcc, 0xdd,
-      0x10, 0xbb, 0xcc, 0xdd, /* ipv6 address */
-    };
-  u32 len = gid_address_parse (data, gid_addr);
-  _assert (54 == len);
-  _assert (gid_addr->type == GID_ADDR_LCAF);
-  gid_address_copy (gid_addr_copy, gid_addr);
-  _assert (0 == gid_address_cmp (gid_addr_copy, gid_addr));
-  _assert (gid_addr_copy->type == GID_ADDR_LCAF);
-
-  lcaf_t * lcaf = &gid_address_lcaf (gid_addr_copy);
-  _assert (lcaf->type == LCAF_INSTANCE_ID);
-  vni_t * v = (vni_t *) lcaf;
-  _assert (v->vni == 0x0b);
-  _assert (v->vni_mask_len == 0x18);
-
-  gid_address_t * tmp = vni_gid (v);
-  _assert (gid_address_type (tmp) == GID_ADDR_LCAF);
-  lcaf = &gid_address_lcaf (tmp);
-  _assert (lcaf->type == LCAF_INSTANCE_ID);
-
-  v = (vni_t *) lcaf;
-  _assert (v->vni == 0x0c);
-  _assert (v->vni_mask_len == 0x17);
-
-  tmp = vni_gid (v);
-  _assert (gid_address_type (tmp) == GID_ADDR_LCAF);
-  lcaf = &gid_address_lcaf (tmp);
-
-  _assert (lcaf->type == LCAF_INSTANCE_ID);
-  v = (vni_t *) lcaf;
-  _assert (v->vni == 0x0d);
-  _assert (v->vni_mask_len == 0x16);
-
-  tmp = vni_gid (v);
-  _assert (gid_address_type (tmp) == GID_ADDR_IP_PREFIX);
-
-  ip_prefix_t * ip_pref = &gid_address_ippref (tmp);
-  ip6_address_t * ip6 = &ip_prefix_v6 (ip_pref);
-  _assert (ip6->as_u32[0] == 0xddccbb10);
-  _assert (ip6->as_u32[1] == 0xddccbb10);
-  _assert (ip6->as_u32[2] == 0xddccbb10);
-  _assert (ip6->as_u32[3] == 0xddccbb10);
-  _assert (ip_prefix_version (ip_pref) == IP6);
-
-done:
-  gid_address_free (gid_addr);
-  gid_address_free (gid_addr_copy);
-  return error;
-}
-#endif
-
-#if 0 /* uncomment this once VNI is supported */
-static clib_error_t * test_write_mac_in_lcaf (void)
-{
-  clib_error_t * error = 0;
-
-  u8 * b = clib_mem_alloc(500);
-  memset(b, 0, 500);
-
-  gid_address_t g =
-    {
-      .mac = {0x1, 0x2, 0x3, 0x4, 0x5, 0x6},
-      .vni = 0x30,
-      .vni_mask = 0x10,
-      .type = GID_ADDR_MAC,
-    };
-
-  u16 len = gid_address_put (b, &g);
-  _assert (8 == len);
-
-  u8 expected[] =
-    {
-      0x40, 0x03,             /* AFI = LCAF */
-      0x00,                   /* reserved1 */
-      0x00,                   /* flags */
-      0x02,                   /* LCAF type = Instance ID */
-      0x20,                   /* IID/VNI mask len */
-      0x00, 0x0a,             /* length */
-      0x01, 0x02, 0x03, 0x04, /* Instance ID / VNI */
-
-      0x00, 0x06,             /* AFI = MAC */
-      0x01, 0x02, 0x03, 0x04,
-      0x05, 0x06              /* MAC */
-    }
-  _assert (0 == memcmp (expected, b, len));
-done:
-  clib_mem_free (b);
-  return error;
-}
-#endif
-
-static clib_error_t * test_mac_address_write (void)
-{
-  clib_error_t * error = 0;
-
-  u8 * b = clib_mem_alloc(500);
-  memset(b, 0, 500);
-
-  gid_address_t g =
-    {
-      .mac = {0x1, 0x2, 0x3, 0x4, 0x5, 0x6},
-      .type = GID_ADDR_MAC,
-    };
-
-  u16 len = gid_address_put (b, &g);
-  _assert (8 == len);
-
-  u8 expected[] =
-    {
-      0x40, 0x05,             /* AFI = MAC */
-      0x01, 0x02, 0x03, 0x04,
-      0x05, 0x06              /* MAC */
-    };
-  _assert (0 == memcmp (expected, b, len));
-done:
-  clib_mem_free (b);
-  return error;
-}
-
-static clib_error_t *
-test_src_dst_with_vni_serdes (void)
-{
-  clib_error_t * error = 0;
-  u8 * b = clib_mem_alloc (500);
-  memset (b, 0, 500);
-
-  fid_address_t src =
-    {
-      .type = FID_ADDR_IP_PREF,
-      .ippref =
-        {
-          .len = 24,
-          .addr =
-            {
-              .version = IP4,
-              .ip.v4.data = { 0x1, 0x2, 0x3, 0x0 }
-            }
-        }
-    };
-
-  fid_address_t dst =
-    {
-      .type = FID_ADDR_IP_PREF,
-      .ippref =
-        {
-          .len = 16,
-          .addr =
-            {
-              .version = IP4,
-              .ip.v4.data = { 0x9, 0x8, 0x0, 0x0 }
-            }
-        }
-    };
-
-  source_dest_t sd =
-    {
-      .src = src,
-      .dst = dst
-    };
-
-  gid_address_t g =
-    {
-      .sd = sd,
-      .type = GID_ADDR_SRC_DST,
-      .vni = 0x12345678,
-      .vni_mask = 0x9
-    };
-
-  u16 size_to_put = gid_address_size_to_put(&g);
-  _assert (36 == size_to_put);
-  _assert (0 == gid_address_len(&g));
-
-  u16 write_len = gid_address_put (b, &g);
-  printf("sizetoput %d; writelen %d\n", size_to_put, write_len);
-  _assert (size_to_put == write_len);
-
-  u8 expected_data[] =
-    {
-      0x40, 0x03, 0x00, 0x00,  /* AFI = LCAF, reserved1, flags */
-      0x02, 0x09, 0x00, 0x1c,  /* LCAF type = IID, IID mask-len, length */
-      0x12, 0x34, 0x56, 0x78,  /* reserved; source-ML, Dest-ML */
-
-      0x40, 0x03, 0x00, 0x00,  /* AFI = LCAF, reserved1, flags */
-      0x0c, 0x00, 0x00, 0x10,  /* LCAF type = source/dest key, rsvd, length */
-      0x00, 0x00, 0x18, 0x10,  /* reserved; source-ML, Dest-ML */
-
-      0x00, 0x01,              /* AFI = ip4 */
-      0x01, 0x02, 0x03, 0x00,  /* source */
-
-      0x00, 0x01,              /* AFI = ip4 */
-      0x09, 0x08, 0x00, 0x00,  /* destination */
-    };
-  _assert (0 == memcmp (expected_data, b, sizeof (expected_data)));
-
-  gid_address_t p;
-  memset (&p, 0, sizeof (p));
-  _assert (write_len == gid_address_parse (b, &p));
-  _assert (0 == gid_address_cmp (&g, &p));
-done:
-  clib_mem_free (b);
-  return error;
-}
-
-static clib_error_t *
-test_src_dst_serdes (void)
-{
-  clib_error_t * error = 0;
-
-  u8 * b = clib_mem_alloc (500);
-  memset (b, 0, 500);
-
-  fid_address_t src =
-    {
-      .type = FID_ADDR_MAC,
-      .mac = { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66 }
-    };
-
-  fid_address_t dst =
-    {
-      .type = FID_ADDR_MAC,
-      .mac = { 0x10, 0x21, 0x32, 0x43, 0x54, 0x65 }
-    };
-
-  source_dest_t sd =
-    {
-      .src = src,
-      .dst = dst
-    };
-
-  gid_address_t g =
-    {
-      .sd = sd,
-      .type = GID_ADDR_SRC_DST,
-      .vni = 0x0,
-      .vni_mask = 0x0
-    };
-
-  u16 size_to_put = gid_address_size_to_put(&g);
-  _assert (28 == size_to_put);
-  _assert (0 == gid_address_len(&g));
-
-  u16 write_len = gid_address_put (b, &g);
-  _assert (size_to_put == write_len);
-
-  u8 expected_data[] =
-    {
-      0x40, 0x03, 0x00, 0x00,  /* AFI = LCAF, reserved1, flags */
-      0x0c, 0x00, 0x00, 0x14,  /* LCAF type = source/dest key, rsvd, length */
-      0x00, 0x00, 0x00, 0x00,  /* reserved; source-ML, Dest-ML */
-
-      0x40, 0x05,              /* AFI = MAC */
-      0x11, 0x22, 0x33, 0x44,
-      0x55, 0x66,              /* source */
-
-      0x40, 0x05,              /* AFI = MAC */
-      0x10, 0x21, 0x32, 0x43,
-      0x54, 0x65,              /* destination */
-    };
-  _assert (0 == memcmp (expected_data, b, sizeof (expected_data)));
-
-  gid_address_t p;
-  memset (&p, 0, sizeof (p));
-  _assert (write_len == gid_address_parse (b, &p));
-  _assert (0 == gid_address_cmp (&g, &p));
-done:
-  clib_mem_free (b);
-  return error;
-}
-
-static clib_error_t * test_gid_address_write (void)
-{
-  clib_error_t * error = 0;
-  ip_prefix_t ippref_data, * ippref = &ippref_data;
-
-  u8 * b = clib_mem_alloc(500);
-  memset(b, 0, 500);
-
-  ip_prefix_version (ippref) = IP4;
-  ip_prefix_len (ippref) = 9;
-  ip4_address_t * ip4 = &ip_prefix_v4 (ippref);
-  ip4->as_u32 = 0xaabbccdd;
-
-  gid_address_t g =
-    {
-      .ippref = ippref[0],
-      .type = GID_ADDR_IP_PREFIX,
-      .vni = 0x01020304,
-      .vni_mask = 0x18
-    };
-
-  _assert (18 == gid_address_size_to_put (&g));
-  _assert (gid_address_len (&g) == 9);
-
-  u16 write_len = gid_address_put (b, &g);
-  _assert (18 == write_len);
-
-  u8 expected_gid_data[] =
-    {
-      0x40, 0x03,             /* AFI = LCAF */
-      0x00,                   /* reserved1 */
-      0x00,                   /* flags */
-      0x02,                   /* LCAF type = Instance ID */
-      0x18,                   /* IID/VNI mask len */
-      0x00, 0x0a,             /* length */
-      0x01, 0x02, 0x03, 0x04, /* Instance ID / VNI */
-
-      0x00, 0x01,             /* AFI = IPv4 */
-      0xdd, 0xcc, 0xbb, 0xaa, /* ipv4 addr */
-    };
-  _assert (0 == memcmp (expected_gid_data, b, sizeof (expected_gid_data)));
-done:
-  clib_mem_free (b);
-  return error;
-}
-
-#define foreach_test_case                 \
-  _(locator_type)                         \
-  _(gid_parse_ip_pref)                    \
-  _(gid_parse_mac)                        \
-  _(gid_parse_lcaf)                       \
-  _(mac_address_write)                    \
-  _(gid_address_write)                    \
-  _(src_dst_serdes)                       \
-  _(src_dst_with_vni_serdes)
-
-int run_tests (void)
-{
-  clib_error_t * error;
-
-#define _(_test_name)                   \
-  error = test_ ## _test_name ();       \
-  if (error)                            \
-    {                                   \
-      clib_error_report (error);        \
-      return 0;                         \
-    }
-
-  foreach_test_case
-#undef _
-
-  return 0;
-}
-
-int main()
-{
-  return run_tests ();
-}
-
diff --git a/vnet/test/lisp-gpe/test.c b/vnet/test/lisp-gpe/test.c
deleted file mode 100644
index dde633ae..00000000
--- a/vnet/test/lisp-gpe/test.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-int main(int argc, char **argv) {
-    return 0;
-}
diff --git a/vnet/vnet/adj/adj.c b/vnet/vnet/adj/adj.c
deleted file mode 100644
index e740c4cb..00000000
--- a/vnet/vnet/adj/adj.c
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/adj/adj.h>
-#include <vnet/adj/adj_internal.h>
-#include <vnet/adj/adj_glean.h>
-#include <vnet/adj/adj_midchain.h>
-#include <vnet/fib/fib_node_list.h>
-
-/*
- * Special Adj with index zero. we need to define this since the v4 mtrie
- * assumes an index of 0 implies the ply is empty. therefore all 'real'
- * adjs need a non-zero index.
- */
-static ip_adjacency_t *special_v4_miss_adj_with_index_zero;
-
-/* Adjacency packet/byte counters indexed by adjacency index. */
-vlib_combined_counter_main_t adjacency_counters;
-
-/*
- * the single adj pool
- */
-ip_adjacency_t *adj_pool;
-
-always_inline void
-adj_poison (ip_adjacency_t * adj)
-{
-    if (CLIB_DEBUG > 0)
-    {
-	memset (adj, 0xfe, sizeof (adj[0]));
-    }
-}
-
-ip_adjacency_t *
-adj_alloc (fib_protocol_t proto)
-{
-    ip_adjacency_t *adj;
-
-    pool_get(adj_pool, adj);
-
-    adj_poison(adj);
-
-    /* Make sure certain fields are always initialized. */
-    /* Validate adjacency counters. */
-    vlib_validate_combined_counter(&adjacency_counters,
-                                   adj_get_index(adj));
-
-    adj->rewrite_header.sw_if_index = ~0;
-    adj->mcast_group_index = ~0;
-    adj->saved_lookup_next_index = 0;
-    adj->n_adj = 1;
-    adj->lookup_next_index = 0;
-
-    fib_node_init(&adj->ia_node,
-                  FIB_NODE_TYPE_ADJ);
-    adj->ia_nh_proto = proto;
-    adj->ia_flags = 0;
-
-    ip4_main.lookup_main.adjacency_heap = adj_pool;
-    ip6_main.lookup_main.adjacency_heap = adj_pool;
-
-    return (adj);
-}
-
-static int
-adj_index_is_special (adj_index_t adj_index)
-{
-    if (ADJ_INDEX_INVALID == adj_index)
-	return (!0);
-
-    return (0);
-}
-
-/**
- * @brief Pretty print helper function for formatting specific adjacencies.
- * @param s - input string to format
- * @param args - other args passed to format function such as:
- *                 - vnet_main_t
- *                 - ip_lookup_main_t
- *                 - adj_index
- */
-u8 *
-format_ip_adjacency (u8 * s, va_list * args)
-{
-    format_ip_adjacency_flags_t fiaf;
-    ip_adjacency_t * adj;
-    u32 adj_index;
-
-    adj_index = va_arg (*args, u32);
-    fiaf = va_arg (*args, format_ip_adjacency_flags_t);
-    adj = adj_get(adj_index);
-  
-    switch (adj->lookup_next_index)
-    {
-    case IP_LOOKUP_NEXT_REWRITE:
-	s = format (s, "%U", format_adj_nbr, adj_index, 0);
-	break;
-    case IP_LOOKUP_NEXT_ARP:
-	s = format (s, "%U", format_adj_nbr_incomplete, adj_index, 0);
-	break;
-    case IP_LOOKUP_NEXT_GLEAN:
-	s = format (s, "%U", format_adj_glean, adj_index, 0);
-	break;
-    case IP_LOOKUP_NEXT_MIDCHAIN:
-	s = format (s, "%U", format_adj_midchain, adj_index, 2);
-	break;
-    default:
-	break;
-    }
-
-    if (fiaf & FORMAT_IP_ADJACENCY_DETAIL)
-    {
-	s = format (s, "\n locks:%d", adj->ia_node.fn_locks);
-	s = format (s, " node:[%d]:%U",
-		    adj->rewrite_header.node_index,
-		    format_vlib_node_name, vlib_get_main(),
-		    adj->rewrite_header.node_index);
-	s = format (s, " next:[%d]:%U",
-		    adj->rewrite_header.next_index,
-		    format_vlib_next_node_name,
-		    vlib_get_main(),
-		    adj->rewrite_header.node_index,
-		    adj->rewrite_header.next_index);
-	s = format(s, "\n children:\n  ");
-	s = fib_node_children_format(adj->ia_node.fn_children, s);
-    }
-
-    return s;
-}
-
-/*
- * adj_last_lock_gone
- *
- * last lock/reference to the adj has gone, we no longer need it.
- */
-static void
-adj_last_lock_gone (ip_adjacency_t *adj)
-{
-    vlib_main_t * vm = vlib_get_main();
-
-    ASSERT(0 == fib_node_list_get_size(adj->ia_node.fn_children));
-    ADJ_DBG(adj, "last-lock-gone");
-
-    vlib_worker_thread_barrier_sync (vm);
-
-    switch (adj->lookup_next_index)
-    {
-    case IP_LOOKUP_NEXT_MIDCHAIN:
-        dpo_reset(&adj->sub_type.midchain.next_dpo);
-        /* FALL THROUGH */
-    case IP_LOOKUP_NEXT_ARP:
-    case IP_LOOKUP_NEXT_REWRITE:
-	/*
-	 * complete and incomplete nbr adjs
-	 */
-	adj_nbr_remove(adj_get_index(adj),
-                       adj->ia_nh_proto,
-		       adj->ia_link,
-		       &adj->sub_type.nbr.next_hop,
-		       adj->rewrite_header.sw_if_index);
-	break;
-    case IP_LOOKUP_NEXT_GLEAN:
-	adj_glean_remove(adj->ia_nh_proto,
-			 adj->rewrite_header.sw_if_index);
-	break;
-    default:
-	/*
-	 * type not stored in any DB from which we need to remove it
-	 */
-	break;
-    }
-
-    vlib_worker_thread_barrier_release(vm);
-
-    fib_node_deinit(&adj->ia_node);
-    pool_put(adj_pool, adj);
-}
-
-void
-adj_lock (adj_index_t adj_index)
-{
-    ip_adjacency_t *adj;
-
-    if (adj_index_is_special(adj_index))
-    {
-	return;
-    }
-
-    adj = adj_get(adj_index);
-    ASSERT(adj);
-
-    ADJ_DBG(adj, "lock");
-    fib_node_lock(&adj->ia_node);
-}
-
-void
-adj_unlock (adj_index_t adj_index)
-{
-    ip_adjacency_t *adj;
-
-    if (adj_index_is_special(adj_index))
-    {
-	return;
-    }
-
-    adj = adj_get(adj_index);
-    ASSERT(adj);
-
-    ADJ_DBG(adj, "unlock");
-    ASSERT(adj);
-
-    fib_node_unlock(&adj->ia_node);
-}
-
-u32
-adj_child_add (adj_index_t adj_index,
-	       fib_node_type_t child_type,
-	       fib_node_index_t child_index)
-{
-    ASSERT(ADJ_INDEX_INVALID != adj_index);
-    if (adj_index_is_special(adj_index))
-    {
-	return (~0);
-    }
-
-    return (fib_node_child_add(FIB_NODE_TYPE_ADJ,
-                               adj_index,
-                               child_type,
-                               child_index));
-}
-
-void
-adj_child_remove (adj_index_t adj_index,
-		  u32 sibling_index)
-{
-    if (adj_index_is_special(adj_index))
-    {
-	return;
-    }
-
-    fib_node_child_remove(FIB_NODE_TYPE_ADJ,
-                          adj_index,
-                          sibling_index);
-}
-
-/**
- * @brief Return the link type of the adjacency
- */
-vnet_link_t
-adj_get_link_type (adj_index_t ai)
-{
-    const ip_adjacency_t *adj;
-
-    adj = adj_get(ai);
-
-    return (adj->ia_link); 
-}
-
-/**
- * @brief Return the sw interface index of the adjacency.
- */
-u32
-adj_get_sw_if_index (adj_index_t ai)
-{
-    const ip_adjacency_t *adj;
-
-    adj = adj_get(ai);
-
-    return (adj->rewrite_header.sw_if_index);
-}
-
-/**
- * @brief Return the link type of the adjacency
- */
-const u8*
-adj_get_rewrite (adj_index_t ai)
-{
-    vnet_rewrite_header_t *rw;
-    ip_adjacency_t *adj;
-
-    adj = adj_get(ai);
-    rw = &adj->rewrite_header;
-
-    ASSERT (rw->data_bytes != 0xfefe);
-
-    return (rw->data - rw->data_bytes);
-}
-
-static fib_node_t *
-adj_get_node (fib_node_index_t index)
-{
-    ip_adjacency_t *adj;
-
-    adj = adj_get(index);
-
-    return (&adj->ia_node);
-}
-
-#define ADJ_FROM_NODE(_node)						\
-    ((ip_adjacency_t*)((char*)_node - STRUCT_OFFSET_OF(ip_adjacency_t, ia_node)))
-
-static void
-adj_node_last_lock_gone (fib_node_t *node)
-{
-    adj_last_lock_gone(ADJ_FROM_NODE(node));
-}
-
-static fib_node_back_walk_rc_t
-adj_back_walk_notify (fib_node_t *node,
-		      fib_node_back_walk_ctx_t *ctx)
-{
-    /*
-     * Que pasa. yo soj en el final!
-     */
-    ASSERT(0);
-
-    return (FIB_NODE_BACK_WALK_CONTINUE);
-}
-
-/*
- * Adjacency's graph node virtual function table
- */
-static const fib_node_vft_t adj_vft = {
-    .fnv_get = adj_get_node,
-    .fnv_last_lock = adj_node_last_lock_gone,
-    .fnv_back_walk = adj_back_walk_notify,
-};
-
-static clib_error_t *
-adj_module_init (vlib_main_t * vm)
-{
-    fib_node_register_type(FIB_NODE_TYPE_ADJ, &adj_vft);
-
-    adj_nbr_module_init();
-    adj_glean_module_init();
-    adj_midchain_module_init();
-
-    /*
-     * one special adj to reserve index 0
-     */
-    special_v4_miss_adj_with_index_zero = adj_alloc(FIB_PROTOCOL_IP4);
-
-    return (NULL);
-}
-
-VLIB_INIT_FUNCTION (adj_module_init);
-
-static clib_error_t *
-adj_show (vlib_main_t * vm,
-	  unformat_input_t * input,
-	  vlib_cli_command_t * cmd)
-{
-    adj_index_t ai = ADJ_INDEX_INVALID;
-    u32 sw_if_index = ~0;
-
-    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-	if (unformat (input, "%d", &ai))
-	    ;
-	else if (unformat (input, "%U",
-			   unformat_vnet_sw_interface, vnet_get_main(),
-			   &sw_if_index))
-	    ;
-	else
-	    break;
-    }
-
-    if (ADJ_INDEX_INVALID != ai)
-    {
-        if (pool_is_free_index(adj_pool, ai))
-        {
-	    vlib_cli_output (vm, "adjacency %d invalid", ai);
-            return 0;
-        }
-
-	vlib_cli_output (vm, "[@%d] %U",
-                         ai,
-                         format_ip_adjacency,  ai,
-			 FORMAT_IP_ADJACENCY_DETAIL);
-    }
-    else
-    {
-	/* *INDENT-OFF* */
-	pool_foreach_index(ai, adj_pool,
-	({
-	    if (~0 != sw_if_index &&
-		sw_if_index != adj_get_sw_if_index(ai))
-	    {
-            }
-            else
-            {
-		vlib_cli_output (vm, "[@%d] %U",
-				 ai,
-				 format_ip_adjacency, ai,
-				 FORMAT_IP_ADJACENCY_NONE);
-	    }
-	}));
-	/* *INDENT-ON* */
-    }
-
-    return 0;
-}
-
-/*?
- * Show all adjacencies.
- * @cliexpar
- * @cliexstart{sh adj}
- * [@0]
- * [@1]  glean: loop0
- * [@2] ipv4 via 1.0.0.2 loop0: IP4: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
- * [@3] mpls via 1.0.0.2 loop0: MPLS_UNICAST: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
- * [@4] ipv4 via 1.0.0.3 loop0: IP4: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
- * [@5] mpls via 1.0.0.3 loop0: MPLS_UNICAST: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND (adj_show_command, static) = {
-    .path = "show adj",
-    .short_help = "show adj [<adj_index>] [interface]",
-    .function = adj_show,
-};
-
-/* 
- * DEPRECATED: DO NOT USE
- */
-ip_adjacency_t *
-ip_add_adjacency (ip_lookup_main_t * lm,
-		  ip_adjacency_t * copy_adj,
-		  u32 n_adj,
-		  u32 * adj_index_return)
-{
-  ip_adjacency_t * adj;
-
-  ASSERT(1==n_adj);
-
-  adj = adj_alloc(FIB_PROTOCOL_IP4);
-
-  if (copy_adj)
-      *adj = *copy_adj;
-
-  *adj_index_return = adj_get_index(adj);
-  return adj;
-}
diff --git a/vnet/vnet/adj/adj.h b/vnet/vnet/adj/adj.h
deleted file mode 100644
index e85625db..00000000
--- a/vnet/vnet/adj/adj.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * An adjacency is a representation of an attached L3 peer.
- *
- * Adjacency Sub-types:
- *   - neighbour: a representation of an attached L3 peer.
- *                Key:{addr,interface,link/ether-type}
- *           SHARED
- *   - glean: used to drive ARP/ND for packets destined to a local sub-net.
- *            'glean' mean use the packet's destination address as the target
- *            address in the ARP packet.
- *          UNSHARED. Only one per-interface.
- *   - midchain: a nighbour adj on a virtual/tunnel interface.
- *   - rewrite: an adj with no key, but with a rewrite string.
- *
- * The API to create and update the adjacency is very sub-type specific. This
- * is intentional as it encourages the user to carefully consider which adjacency
- * sub-type they are really using, and hence assign it data in the appropriate
- * sub-type space in the union of sub-types. This prevents the adj becoming a
- * disorganised dumping group for 'my features needs a u16 somewhere' data. It
- * is important to enforce this approach as space in the adjacency is a premium,
- * as we need it to fit in 1 cache line.
- *
- * the API is also based around an index to an ajdacency not a raw pointer. This
- * is so the user doesn't suffer the same limp inducing firearm injuries that
- * the author suffered as the adjacenices can realloc.
- */
-
-#ifndef __ADJ_H__
-#define __ADJ_H__
-
-#include <vnet/ip/lookup.h>
-#include <vnet/adj/adj_types.h>
-#include <vnet/adj/adj_nbr.h>
-#include <vnet/adj/adj_rewrite.h>
-#include <vnet/adj/adj_glean.h>
-
-/**
- * @brief
- *   Take a reference counting lock on the adjacency
- */
-extern void adj_lock(adj_index_t adj_index);
-/**
- * @brief
- *   Release a reference counting lock on the adjacency
- */
-extern void adj_unlock(adj_index_t adj_index);
-
-/**
- * @brief
- *  Add a child dependent to an adjacency. The child will
- *  thus be informed via its registerd back-walk function
- *  when the adjacency state changes.
- */
-extern u32 adj_child_add(adj_index_t adj_index,
-			 fib_node_type_t type,
-			 fib_node_index_t child_index);
-/**
- * @brief
- *  Remove a child dependent
- */
-extern void adj_child_remove(adj_index_t adj_index,
-			     u32 sibling_index);
-
-/**
- * @brief Walk the Adjacencies on a given interface
- */
-extern void adj_walk (u32 sw_if_index,
-		      adj_walk_cb_t cb,
-		      void *ctx);
-
-/**
- * @brief Return the link type of the adjacency
- */
-extern vnet_link_t adj_get_link_type (adj_index_t ai);
-
-/**
- * @brief Return the sw interface index of the adjacency.
- */
-extern u32 adj_get_sw_if_index (adj_index_t ai);
-
-/**
- * @brief Return the link type of the adjacency
- */
-extern const u8* adj_get_rewrite (adj_index_t ai);
-
-/**
- * @brief
- * The global adjacnecy pool. Exposed for fast/inline data-plane access
- */
-extern ip_adjacency_t *adj_pool;
-
-/**
- * @brief 
- * Adjacency packet counters
- */
-extern vlib_combined_counter_main_t adjacency_counters;
-
-/**
- * @brief
- * Get a pointer to an adjacency object from its index
- */
-static inline ip_adjacency_t *
-adj_get (adj_index_t adj_index)
-{
-    return (vec_elt_at_index(adj_pool, adj_index));
-}
-
-#endif
diff --git a/vnet/vnet/adj/adj_glean.c b/vnet/vnet/adj/adj_glean.c
deleted file mode 100644
index 8d86e2a9..00000000
--- a/vnet/vnet/adj/adj_glean.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/adj/adj.h>
-#include <vnet/adj/adj_internal.h>
-#include <vnet/fib/fib_walk.h>
-
-/*
- * The 'DB' of all glean adjs.
- * There is only one glean per-interface per-protocol, so this is a per-interface
- * vector
- */
-static adj_index_t *adj_gleans[FIB_PROTOCOL_MAX];
-
-static inline vlib_node_registration_t*
-adj_get_glean_node (fib_protocol_t proto)
-{
-    switch (proto) {
-    case FIB_PROTOCOL_IP4:
-	return (&ip4_glean_node);
-    case FIB_PROTOCOL_IP6:
-	return (&ip6_glean_node);
-    case FIB_PROTOCOL_MPLS:
-	break;
-    }
-    ASSERT(0);
-    return (NULL);
-}
-
-/*
- * adj_glean_add_or_lock
- *
- * The next_hop address here is used for source address selection in the DP.
- * The glean adj is added to an interface's connected prefix, the next-hop
- * passed here is the local prefix on the same interface.
- */
-adj_index_t
-adj_glean_add_or_lock (fib_protocol_t proto,
-		       u32 sw_if_index,
-		       const ip46_address_t *nh_addr)
-{
-    ip_adjacency_t * adj;
-
-    vec_validate_init_empty(adj_gleans[proto], sw_if_index, ADJ_INDEX_INVALID);
-
-    if (ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index])
-    {
-	adj = adj_alloc(proto);
-
-	adj->lookup_next_index = IP_LOOKUP_NEXT_GLEAN;
-	adj->ia_nh_proto = proto;
-	adj_gleans[proto][sw_if_index] = adj_get_index(adj);
-
-	if (NULL != nh_addr)
-	{
-	    adj->sub_type.glean.receive_addr = *nh_addr;
-	}
-
-	adj->rewrite_header.data_bytes = 0;
-
-	vnet_rewrite_for_sw_interface(vnet_get_main(),
-				      adj_fib_proto_2_nd(proto),
-				      sw_if_index,
-				      adj_get_glean_node(proto)->index,
-				      VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST,
-				      &adj->rewrite_header,
-				      sizeof (adj->rewrite_data));
-    }
-    else
-    {
-	adj = adj_get(adj_gleans[proto][sw_if_index]);
-    }
-
-    adj_lock(adj_get_index(adj));
-
-    return (adj_get_index(adj));
-}
-
-void
-adj_glean_remove (fib_protocol_t proto,
-		  u32 sw_if_index)
-{
-    ASSERT(sw_if_index < vec_len(adj_gleans[proto]));
-
-    adj_gleans[proto][sw_if_index] = ADJ_INDEX_INVALID;
-}
-
-static clib_error_t *
-adj_glean_interface_state_change (vnet_main_t * vnm,
-				  u32 sw_if_index,
-				  u32 flags)
-{
-    /*
-     * for each glean on the interface trigger a walk back to the children
-     */
-    fib_protocol_t proto;
-    ip_adjacency_t *adj;
-
-
-    for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
-    {
-	if (sw_if_index >= vec_len(adj_gleans[proto]) ||
-	    ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index])
-	    continue;
-
-	adj = adj_get(adj_gleans[proto][sw_if_index]);
-
-	fib_node_back_walk_ctx_t bw_ctx = {
-	    .fnbw_reason = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP ?
-			    FIB_NODE_BW_REASON_FLAG_INTERFACE_UP :
-			    FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN),
-	};
-
-	fib_walk_sync(FIB_NODE_TYPE_ADJ, adj_get_index(adj), &bw_ctx);
-    }
-
-    return (NULL);
-}
-
-VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION(adj_glean_interface_state_change);
-
-/**
- * @brief Invoked on each SW interface of a HW interface when the
- * HW interface state changes
- */
-static void
-adj_nbr_hw_sw_interface_state_change (vnet_main_t * vnm,
-                                      u32 sw_if_index,
-                                      void *arg)
-{
-    adj_glean_interface_state_change(vnm, sw_if_index, (uword) arg);
-}
-
-/**
- * @brief Registered callback for HW interface state changes
- */
-static clib_error_t *
-adj_glean_hw_interface_state_change (vnet_main_t * vnm,
-                                     u32 hw_if_index,
-                                     u32 flags)
-{
-    /*
-     * walk SW interfaces on the HW
-     */
-    uword sw_flags;
-
-    sw_flags = ((flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ?
-                VNET_SW_INTERFACE_FLAG_ADMIN_UP :
-                0);
-
-    vnet_hw_interface_walk_sw(vnm, hw_if_index,
-                              adj_nbr_hw_sw_interface_state_change,
-                              (void*) sw_flags);
-
-    return (NULL);
-}
-
-VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION(
-    adj_glean_hw_interface_state_change);
-
-static clib_error_t *
-adj_glean_interface_delete (vnet_main_t * vnm,
-			    u32 sw_if_index,
-			    u32 is_add)
-{
-    /*
-     * for each glean on the interface trigger a walk back to the children
-     */
-    fib_protocol_t proto;
-    ip_adjacency_t *adj;
-
-    if (is_add)
-    {
-	/*
-	 * not interested in interface additions. we will not back walk
-	 * to resolve paths through newly added interfaces. Why? The control
-	 * plane should have the brains to add interfaces first, then routes.
-	 * So the case where there are paths with a interface that matches
-	 * one just created is the case where the path resolved through an
-	 * interface that was deleted, and still has not been removed. The
-	 * new interface added, is NO GUARANTEE that the interface being
-	 * added now, even though it may have the same sw_if_index, is the
-	 * same interface that the path needs. So tough!
-	 * If the control plane wants these routes to resolve it needs to
-	 * remove and add them again.
-	 */
-	return (NULL);
-    }
-
-    for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
-    {
-	if (sw_if_index >= vec_len(adj_gleans[proto]) ||
-	    ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index])
-	    continue;
-
-	adj = adj_get(adj_gleans[proto][sw_if_index]);
-
-	fib_node_back_walk_ctx_t bw_ctx = {
-	    .fnbw_reason =  FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE,
-	};
-
-	fib_walk_sync(FIB_NODE_TYPE_ADJ, adj_get_index(adj), &bw_ctx);
-    }
-
-    return (NULL);
-}
-
-VNET_SW_INTERFACE_ADD_DEL_FUNCTION(adj_glean_interface_delete);
-
-u8*
-format_adj_glean (u8* s, va_list *ap)
-{
-    index_t index = va_arg(*ap, index_t);
-    CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
-    vnet_main_t * vnm = vnet_get_main();
-    ip_adjacency_t * adj = adj_get(index);
-
-    return (format(s, "%U-glean: %U",
-		   format_fib_protocol, adj->ia_nh_proto,
-                   format_vnet_sw_interface_name,
-                   vnm,
-                   vnet_get_sw_interface(vnm,
-                                         adj->rewrite_header.sw_if_index)));
-}
-
-
-static void
-adj_dpo_lock (dpo_id_t *dpo)
-{
-    adj_lock(dpo->dpoi_index);
-}
-static void
-adj_dpo_unlock (dpo_id_t *dpo)
-{
-    adj_unlock(dpo->dpoi_index);
-}
-
-const static dpo_vft_t adj_glean_dpo_vft = {
-    .dv_lock = adj_dpo_lock,
-    .dv_unlock = adj_dpo_unlock,
-    .dv_format = format_adj_glean,
-};
-
-/**
- * @brief The per-protocol VLIB graph nodes that are assigned to a glean
- *        object.
- *
- * this means that these graph nodes are ones from which a glean is the
- * parent object in the DPO-graph.
- */
-const static char* const glean_ip4_nodes[] =
-{
-    "ip4-glean",
-    NULL,
-};
-const static char* const glean_ip6_nodes[] =
-{
-    "ip6-glean",
-    NULL,
-};
-
-const static char* const * const glean_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = glean_ip4_nodes,
-    [DPO_PROTO_IP6]  = glean_ip6_nodes,
-    [DPO_PROTO_MPLS] = NULL,
-};
-
-void
-adj_glean_module_init (void)
-{
-    dpo_register(DPO_ADJACENCY_GLEAN, &adj_glean_dpo_vft, glean_nodes);
-}
diff --git a/vnet/vnet/adj/adj_glean.h b/vnet/vnet/adj/adj_glean.h
deleted file mode 100644
index 640bd2f9..00000000
--- a/vnet/vnet/adj/adj_glean.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @brief Glean Adjacency
- *
- * A gleean adjacency represent the need to discover new peers on an
- * attached link. Packets that hit a glean adjacency will generate an
- * ARP/ND packet addessesed to the packet's destination address.
- * Note this is different to an incomplete neighbour adjacency, which
- * does not send ARP/ND requests to the packet's destination address,
- * but instead to the next-hop address of the adjacency itself.
- */
-
-#ifndef __ADJ_GLEAN_H__
-#define __ADJ_GLEAN_H__
-
-#include <vnet/adj/adj_types.h>
-
-/**
- * @brief
- *  Add (and lock) a new or lock an existing glean adjacency
- *
- * @param proto
- *  The protocol for the neighbours that we wish to glean
- *
- * @param sw_if_index
- *  The interface on which to glean
- *
- * @param nh_addr
- *  the address applied to the interface on which to glean. This
- *  as the source address in packets when the ARP/ND packet is sent
- */
-extern adj_index_t adj_glean_add_or_lock(fib_protocol_t proto,
-					 u32 sw_if_index,
-					 const ip46_address_t *nh_addr);
-
-/**
- * @brief Format/display a glean adjacency.
- */
-extern u8* format_adj_glean(u8* s, va_list *ap);
-
-/**
- * @brief
- *  Module initialisation
- */
-extern void adj_glean_module_init(void);
-
-#endif
diff --git a/vnet/vnet/adj/adj_internal.h b/vnet/vnet/adj/adj_internal.h
deleted file mode 100644
index 833bc7c9..00000000
--- a/vnet/vnet/adj/adj_internal.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __ADJ_INTERNAL_H__
-#define __ADJ_INTERNAL_H__
-
-#include <vnet/adj/adj.h>
-#include <vnet/ip/ip.h>
-#include <vnet/mpls/mpls.h>
-#include <vnet/adj/adj_l2.h>
-
-
-/**
- * big switch to turn on Adjacency debugging
- */
-#undef ADJ_DEBUG
-
-/*
- * Debug macro
- */
-#ifdef ADJ_DEBUG
-#define ADJ_DBG(_adj, _fmt, _args...)		\
-{						\
-    clib_warning("adj:[%d:%p]:" _fmt,		\
-		 _adj - adj_pool, _adj,		\
-		 ##_args);			\
-}
-#else
-#define ADJ_DBG(_e, _fmt, _args...)
-#endif
-
-static inline u32
-adj_get_rewrite_node (vnet_link_t linkt)
-{
-    switch (linkt) {
-    case VNET_LINK_IP4:
-	return (ip4_rewrite_node.index);
-    case VNET_LINK_IP6:
-	return (ip6_rewrite_node.index);
-    case VNET_LINK_MPLS:
-	return (mpls_output_node.index);
-    case VNET_LINK_ETHERNET:
-	return (adj_l2_rewrite_node.index);
-    case VNET_LINK_ARP:
-	break;
-    }
-    ASSERT(0);
-    return (0);
-}
-
-static inline vnet_link_t
-adj_fib_proto_2_nd (fib_protocol_t fp)
-{
-    switch (fp)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (VNET_LINK_ARP);
-    case FIB_PROTOCOL_IP6:
-	return (VNET_LINK_IP6);
-    case FIB_PROTOCOL_MPLS:
-	return (VNET_LINK_MPLS);
-    }
-    return (0);
-}
-
-/**
- * @brief
- * Get a pointer to an adjacency object from its index
- */
-static inline adj_index_t
-adj_get_index (ip_adjacency_t *adj)
-{
-    return (adj - adj_pool);
-}
-
-extern void adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
-					     ip_lookup_next_t adj_next_index,
-					     u32 complete_next_index,
-					     u32 next_index,
-					     u8 *rewrite);
-
-extern ip_adjacency_t * adj_alloc(fib_protocol_t proto);
-
-extern void adj_nbr_remove(adj_index_t ai,
-                           fib_protocol_t nh_proto,
-			   vnet_link_t link_type,
-			   const ip46_address_t *nh_addr,
-			   u32 sw_if_index);
-extern void adj_glean_remove(fib_protocol_t proto,
-			     u32 sw_if_index);
-
-#endif
diff --git a/vnet/vnet/adj/adj_l2.c b/vnet/vnet/adj/adj_l2.c
deleted file mode 100644
index 4d2dd708..00000000
--- a/vnet/vnet/adj/adj_l2.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/adj/adj_l2.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/ip.h>
-
-/**
- * @brief Trace data for a L2 Midchain
- */
-typedef struct adj_l2_trace_t_ {
-    /** Adjacency index taken. */
-    u32 adj_index;
-} adj_l2_trace_t;
-
-static u8 *
-format_adj_l2_trace (u8 * s, va_list * args)
-{
-    CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-    CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-    adj_l2_trace_t * t = va_arg (*args, adj_l2_trace_t *);
-
-    s = format (s, "adj-idx %d : %U",
-		t->adj_index,
-		format_ip_adjacency, t->adj_index, FORMAT_IP_ADJACENCY_NONE);
-    return s;
-}
-
-typedef enum adj_l2_rewrite_next_t_
-{
-    ADJ_L2_REWRITE_NEXT_DROP,
-} adj_l2_rewrite_next_t;
-
-always_inline uword
-adj_l2_rewrite_inline (vlib_main_t * vm,
-		       vlib_node_runtime_t * node,
-		       vlib_frame_t * frame,
-		       int is_midchain)
-{
-    u32 * from = vlib_frame_vector_args (frame);
-    u32 n_left_from, n_left_to_next, * to_next, next_index;
-    u32 cpu_index = os_get_cpu_number();
-    ethernet_main_t * em = &ethernet_main;
-
-    n_left_from = frame->n_vectors;
-    next_index = node->cached_next_index;
-
-    while (n_left_from > 0)
-    {
-	vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-	while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	    ip_adjacency_t * adj0;
-	    vlib_buffer_t * p0;
-	    char *h0;
-	    u32 pi0, rw_len0, adj_index0, next0 = 0;
-	    u32 tx_sw_if_index0;
-
-	    pi0 = to_next[0] = from[0];
-	    from += 1;
-	    n_left_from -= 1;
-	    to_next += 1;
-	    n_left_to_next -= 1;
-
-	    p0 = vlib_get_buffer (vm, pi0);
-	    h0 = vlib_buffer_get_current (p0);
-
-	    adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-
-	    /* We should never rewrite a pkt using the MISS adjacency */
-	    ASSERT(adj_index0);
-
-	    adj0 = adj_get (adj_index0);
-
-	    /* Guess we are only writing on simple Ethernet header. */
-	    vnet_rewrite_one_header (adj0[0], h0,
-				     sizeof (ethernet_header_t));
-
-	    /* Update packet buffer attributes/set output interface. */
-	    rw_len0 = adj0[0].rewrite_header.data_bytes;
-	    vnet_buffer(p0)->ip.save_rewrite_length = rw_len0;
-
-	    vlib_increment_combined_counter
-		(&adjacency_counters,
-		 cpu_index, adj_index0,
-		 /* packet increment */ 0,
-		 /* byte increment */ rw_len0-sizeof(ethernet_header_t));
-
-	    /* Check MTU of outgoing interface. */
-	    if (PREDICT_TRUE((vlib_buffer_length_in_chain (vm, p0)  <=
-			      adj0[0].rewrite_header.max_l3_packet_bytes)))
-	    {
-		/* Don't adjust the buffer for ttl issue; icmp-error node wants
-		 * to see the IP headerr */
-		p0->current_data -= rw_len0;
-		p0->current_length += rw_len0;
-		tx_sw_if_index0 = adj0[0].rewrite_header.sw_if_index;
-
-		if (is_midchain)
-		{
-		    adj0->sub_type.midchain.fixup_func(vm, adj0, p0);
-		}
-
-		vnet_buffer (p0)->sw_if_index[VLIB_TX] = tx_sw_if_index0;
-
-		/*
-		 * Follow the feature ARC. this will result eventually in
-		 * the midchain-tx node
-		 */
-		vnet_feature_arc_start(em->output_feature_arc_index, tx_sw_if_index0, &next0, p0);
-	    }
-	    else
-	    {
-		/* can't fragment L2 */
-		next0 = ADJ_L2_REWRITE_NEXT_DROP;
-	    }
-
-	    if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-		adj_l2_trace_t *tr = vlib_add_trace (vm, node,
-						     p0, sizeof (*tr));
-		tr->adj_index = vnet_buffer(p0)->ip.adj_index[VLIB_TX];
-	    }
-
-	    vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					     to_next, n_left_to_next,
-					     pi0, next0);
-	}
-
-	vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-    return frame->n_vectors;
-}
-
-static uword
-adj_l2_rewrite (vlib_main_t * vm,
-		vlib_node_runtime_t * node,
-		vlib_frame_t * frame)
-{
-    return adj_l2_rewrite_inline (vm, node, frame, 0);
-}
-
-static uword
-adj_l2_midchain (vlib_main_t * vm,
-		 vlib_node_runtime_t * node,
-		 vlib_frame_t * frame)
-{
-    return adj_l2_rewrite_inline (vm, node, frame, 1);
-}
-
-VLIB_REGISTER_NODE (adj_l2_rewrite_node) = {
-    .function = adj_l2_rewrite,
-    .name = "adj-l2-rewrite",
-    .vector_size = sizeof (u32),
-
-    .format_trace = format_adj_l2_trace,
-
-    .n_next_nodes = 1,
-    .next_nodes = {
-	[ADJ_L2_REWRITE_NEXT_DROP] = "error-drop",
-    },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (adj_l2_rewrite_node, adj_l2_rewrite)
-
-VLIB_REGISTER_NODE (adj_l2_midchain_node) = {
-    .function = adj_l2_midchain,
-    .name = "adj-l2-midchain",
-    .vector_size = sizeof (u32),
-
-    .format_trace = format_adj_l2_trace,
-
-    .n_next_nodes = 1,
-    .next_nodes = {
-	[ADJ_L2_REWRITE_NEXT_DROP] = "error-drop",
-    },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (adj_l2_midchain_node, adj_l2_midchain)
diff --git a/vnet/vnet/adj/adj_l2.h b/vnet/vnet/adj/adj_l2.h
deleted file mode 100644
index 3aa1c74b..00000000
--- a/vnet/vnet/adj/adj_l2.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __ADJ_L2_H__
-#define __ADJ_L2_H__
-
-#include <vnet/adj/adj.h>
-
-extern vlib_node_registration_t adj_l2_midchain_node;
-extern vlib_node_registration_t adj_l2_rewrite_node;
-
-#endif
diff --git a/vnet/vnet/adj/adj_midchain.c b/vnet/vnet/adj/adj_midchain.c
deleted file mode 100644
index 8c6ab5aa..00000000
--- a/vnet/vnet/adj/adj_midchain.c
+++ /dev/null
@@ -1,559 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/adj/adj_nbr.h>
-#include <vnet/adj/adj_internal.h>
-#include <vnet/adj/adj_l2.h>
-#include <vnet/adj/adj_midchain.h>
-#include <vnet/ethernet/arp_packet.h>
-#include <vnet/dpo/drop_dpo.h>
-#include <vnet/fib/fib_walk.h>
-
-/**
- * The two midchain tx feature node indices
- */
-static u32 adj_midchain_tx_feature_node[VNET_LINK_NUM];
-static u32 adj_midchain_tx_no_count_feature_node[VNET_LINK_NUM];
-
-/**
- * @brief Trace data for packets traversing the midchain tx node
- */
-typedef struct adj_midchain_tx_trace_t_
-{
-    /**
-     * @brief the midchain adj we are traversing
-     */
-    adj_index_t ai;
-} adj_midchain_tx_trace_t;
-
-always_inline uword
-adj_midchain_tx_inline (vlib_main_t * vm,
-			vlib_node_runtime_t * node,
-			vlib_frame_t * frame,
-			int interface_count)
-{
-    u32 * from, * to_next, n_left_from, n_left_to_next;
-    u32 next_index;
-    vnet_main_t *vnm = vnet_get_main ();
-    vnet_interface_main_t *im = &vnm->interface_main;
-    u32 cpu_index = vm->cpu_index;
-
-    /* Vector of buffer / pkt indices we're supposed to process */
-    from = vlib_frame_vector_args (frame);
-
-    /* Number of buffers / pkts */
-    n_left_from = frame->n_vectors;
-
-    /* Speculatively send the first buffer to the last disposition we used */
-    next_index = node->cached_next_index;
-
-    while (n_left_from > 0)
-    {
-	/* set up to enqueue to our disposition with index = next_index */
-	vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-
-	while (n_left_from >= 4 && n_left_to_next > 2)
-	{
-	    u32 bi0, adj_index0, next0;
-	    const ip_adjacency_t * adj0;
-	    const dpo_id_t *dpo0;
-	    vlib_buffer_t * b0;
-	    u32 bi1, adj_index1, next1;
-	    const ip_adjacency_t * adj1;
-	    const dpo_id_t *dpo1;
-	    vlib_buffer_t * b1;
-
-	    /* Prefetch next iteration. */
-	    {
-		vlib_buffer_t * p2, * p3;
-
-		p2 = vlib_get_buffer (vm, from[2]);
-		p3 = vlib_get_buffer (vm, from[3]);
-
-		vlib_prefetch_buffer_header (p2, LOAD);
-		vlib_prefetch_buffer_header (p3, LOAD);
-
-		CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-		CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    }
-
-	    bi0 = from[0];
-	    to_next[0] = bi0;
-	    bi1 = from[1];
-	    to_next[1] = bi1;
-
-	    from += 2;
-	    to_next += 2;
-	    n_left_from -= 2;
-	    n_left_to_next -= 2;
-
-	    b0 = vlib_get_buffer(vm, bi0);
-	    b1 = vlib_get_buffer(vm, bi1);
-
-	    /* Follow the DPO on which the midchain is stacked */
-	    adj_index0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
-	    adj_index1 = vnet_buffer(b1)->ip.adj_index[VLIB_TX];
-
-	    adj0 = adj_get(adj_index0);
-	    adj1 = adj_get(adj_index1);
-
-	    dpo0 = &adj0->sub_type.midchain.next_dpo;
-	    dpo1 = &adj1->sub_type.midchain.next_dpo;
-
-	    next0 = dpo0->dpoi_next_node;
-	    next1 = dpo1->dpoi_next_node;
-
-	    vnet_buffer(b1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
-	    vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-
-	    if (interface_count)
-	    {
-		vlib_increment_combined_counter (im->combined_sw_if_counters
-						 + VNET_INTERFACE_COUNTER_TX,
-						 cpu_index,
-						 adj0->rewrite_header.sw_if_index,
-						 1,
-						 vlib_buffer_length_in_chain (vm, b0));
-		vlib_increment_combined_counter (im->combined_sw_if_counters
-						 + VNET_INTERFACE_COUNTER_TX,
-						 cpu_index,
-						 adj1->rewrite_header.sw_if_index,
-						 1,
-						 vlib_buffer_length_in_chain (vm, b1));
-	    }
-
-	    if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-		adj_midchain_tx_trace_t *tr = vlib_add_trace (vm, node,
-							      b0, sizeof (*tr));
-		tr->ai = adj_index0;
-	    }
-	    if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-		adj_midchain_tx_trace_t *tr = vlib_add_trace (vm, node,
-							      b1, sizeof (*tr));
-		tr->ai = adj_index1;
-	    }
-
-	    vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					     to_next, n_left_to_next,
-					     bi0, bi1,
-					     next0, next1);
-	}
-	while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	    u32 bi0, adj_index0, next0;
-	    const ip_adjacency_t * adj0;
-	    const dpo_id_t *dpo0;
-	    vlib_buffer_t * b0;
-
-	    bi0 = from[0];
-	    to_next[0] = bi0;
-	    from += 1;
-	    to_next += 1;
-	    n_left_from -= 1;
-	    n_left_to_next -= 1;
-
-	    b0 = vlib_get_buffer(vm, bi0);
-
-	    /* Follow the DPO on which the midchain is stacked */
-	    adj_index0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
-	    adj0 = adj_get(adj_index0);
-	    dpo0 = &adj0->sub_type.midchain.next_dpo;
-	    next0 = dpo0->dpoi_next_node;
-	    vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-
-	    if (interface_count)
-	    {
-		vlib_increment_combined_counter (im->combined_sw_if_counters
-						 + VNET_INTERFACE_COUNTER_TX,
-						 cpu_index,
-						 adj0->rewrite_header.sw_if_index,
-						 1,
-						 vlib_buffer_length_in_chain (vm, b0));
-	    }
-
-	    if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-		adj_midchain_tx_trace_t *tr = vlib_add_trace (vm, node,
-							      b0, sizeof (*tr));
-		tr->ai = adj_index0;
-	    }
-
-	    vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					     to_next, n_left_to_next,
-					     bi0, next0);
-	}
-
-	vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-    return frame->n_vectors;
-}
-
-static u8 *
-format_adj_midchain_tx_trace (u8 * s, va_list * args)
-{
-    CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-    CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-    adj_midchain_tx_trace_t *tr = va_arg (*args, adj_midchain_tx_trace_t*);
-
-    s = format(s, "adj-midchain:[%d]:%U", tr->ai,
-	       format_ip_adjacency, tr->ai,
-	       FORMAT_IP_ADJACENCY_NONE);
-
-    return (s);
-}
-
-static uword
-adj_midchain_tx (vlib_main_t * vm,
-		 vlib_node_runtime_t * node,
-		 vlib_frame_t * frame)
-{
-    return (adj_midchain_tx_inline(vm, node, frame, 1));
-}
-
-VLIB_REGISTER_NODE (adj_midchain_tx_node, static) = {
-    .function = adj_midchain_tx,
-    .name = "adj-midchain-tx",
-    .vector_size = sizeof (u32),
-
-    .format_trace = format_adj_midchain_tx_trace,
-
-    .n_next_nodes = 1,
-    .next_nodes = {
-	[0] = "error-drop",
-    },
-};
-
-static uword
-adj_midchain_tx_no_count (vlib_main_t * vm,
-			  vlib_node_runtime_t * node,
-			  vlib_frame_t * frame)
-{
-    return (adj_midchain_tx_inline(vm, node, frame, 0));
-}
-
-VLIB_REGISTER_NODE (adj_midchain_tx_no_count_node, static) = {
-    .function = adj_midchain_tx_no_count,
-    .name = "adj-midchain-tx-no-count",
-    .vector_size = sizeof (u32),
-
-    .format_trace = format_adj_midchain_tx_trace,
-
-    .n_next_nodes = 1,
-    .next_nodes = {
-	[0] = "error-drop",
-    },
-};
-
-VNET_FEATURE_INIT (adj_midchain_tx_ip4, static) = {
-    .arc_name = "ip4-output",
-    .node_name = "adj-midchain-tx",
-    .runs_before = VNET_FEATURES ("interface-output"),
-    .feature_index_ptr = &adj_midchain_tx_feature_node[VNET_LINK_IP4],
-};
-VNET_FEATURE_INIT (adj_midchain_tx_no_count_ip4, static) = {
-    .arc_name = "ip4-output",
-    .node_name = "adj-midchain-tx-no-count",
-    .runs_before = VNET_FEATURES ("interface-output"),
-    .feature_index_ptr = &adj_midchain_tx_no_count_feature_node[VNET_LINK_IP4],
-};
-VNET_FEATURE_INIT (adj_midchain_tx_ip6, static) = {
-    .arc_name = "ip6-output",
-    .node_name = "adj-midchain-tx",
-    .runs_before = VNET_FEATURES ("interface-output"),
-    .feature_index_ptr = &adj_midchain_tx_feature_node[VNET_LINK_IP6],
-};
-VNET_FEATURE_INIT (adj_midchain_tx_no_count_ip6, static) = {
-    .arc_name = "ip6-output",
-    .node_name = "adj-midchain-tx-no-count",
-    .runs_before = VNET_FEATURES ("interface-output"),
-    .feature_index_ptr = &adj_midchain_tx_no_count_feature_node[VNET_LINK_IP6],
-};
-VNET_FEATURE_INIT (adj_midchain_tx_mpls, static) = {
-    .arc_name = "mpls-output",
-    .node_name = "adj-midchain-tx",
-    .runs_before = VNET_FEATURES ("interface-output"),
-    .feature_index_ptr = &adj_midchain_tx_feature_node[VNET_LINK_MPLS],
-};
-VNET_FEATURE_INIT (adj_midchain_tx_no_count_mpls, static) = {
-    .arc_name = "mpls-output",
-    .node_name = "adj-midchain-tx-no-count",
-    .runs_before = VNET_FEATURES ("interface-output"),
-    .feature_index_ptr = &adj_midchain_tx_no_count_feature_node[VNET_LINK_MPLS],
-};
-VNET_FEATURE_INIT (adj_midchain_tx_ethernet, static) = {
-    .arc_name = "ethernet-output",
-    .node_name = "adj-midchain-tx",
-    .runs_before = VNET_FEATURES ("error-drop"),
-    .feature_index_ptr = &adj_midchain_tx_feature_node[VNET_LINK_ETHERNET],
-};
-VNET_FEATURE_INIT (adj_midchain_tx_no_count_ethernet, static) = {
-    .arc_name = "ethernet-output",
-    .node_name = "adj-midchain-tx-no-count",
-    .runs_before = VNET_FEATURES ("error-drop"),
-    .feature_index_ptr = &adj_midchain_tx_no_count_feature_node[VNET_LINK_ETHERNET],
-};
-
-static inline u32
-adj_get_midchain_node (vnet_link_t link)
-{
-    switch (link) {
-    case VNET_LINK_IP4:
-	return (ip4_midchain_node.index);
-    case VNET_LINK_IP6:
-	return (ip6_midchain_node.index);
-    case VNET_LINK_MPLS:
-	return (mpls_midchain_node.index);
-    case VNET_LINK_ETHERNET:
-	return (adj_l2_midchain_node.index);
-    case VNET_LINK_ARP:
-	break;
-    }
-    ASSERT(0);
-    return (0);
-}
-
-static u8
-adj_midchain_get_feature_arc_index_for_link_type (const ip_adjacency_t *adj)
-{
-  u8 arc = (u8) ~0;
-    switch (adj->ia_link)
-    {
-    case VNET_LINK_IP4:
-	{
-	    arc = ip4_main.lookup_main.output_feature_arc_index;
-	    break;
-	}
-    case VNET_LINK_IP6:
-	{
-	    arc = ip6_main.lookup_main.output_feature_arc_index;
-	    break;
-	}
-    case VNET_LINK_MPLS:
-	{
-	    arc = mpls_main.output_feature_arc_index;
-	    break;
-	}
-    case VNET_LINK_ETHERNET:
-	{
-	    arc = ethernet_main.output_feature_arc_index;
-	    break;
-	}
-    case VNET_LINK_ARP:
-	ASSERT(0);
-	break;
-    }
-
-    ASSERT (arc != (u8) ~0);
-
-    return (arc);
-}
-
-/**
- * adj_nbr_midchain_update_rewrite
- *
- * Update the adjacency's rewrite string. A NULL string implies the
- * rewrite is reset (i.e. when ARP/ND etnry is gone).
- * NB: the adj being updated may be handling traffic in the DP.
- */
-void
-adj_nbr_midchain_update_rewrite (adj_index_t adj_index,
-				 adj_midchain_fixup_t fixup,
-				 adj_midchain_flag_t flags,
-				 u8 *rewrite)
-{
-    ip_adjacency_t *adj;
-    u8 arc_index;
-    u32 feature_index;
-
-    ASSERT(ADJ_INDEX_INVALID != adj_index);
-
-    adj = adj_get(adj_index);
-
-    /*
-     * one time only update. since we don't support chainging the tunnel
-     * src,dst, this is all we need.
-     */
-    ASSERT(adj->lookup_next_index == IP_LOOKUP_NEXT_ARP);
-    /*
-     * tunnels can always provide a rewrite.
-     */
-    ASSERT(NULL != rewrite);
-
-    adj->sub_type.midchain.fixup_func = fixup;
-
-    arc_index = adj_midchain_get_feature_arc_index_for_link_type (adj);
-    feature_index = (flags & ADJ_MIDCHAIN_FLAG_NO_COUNT) ?
-                    adj_midchain_tx_no_count_feature_node[adj->ia_link] :
-                    adj_midchain_tx_feature_node[adj->ia_link];
-
-    adj->sub_type.midchain.tx_function_node = (flags & ADJ_MIDCHAIN_FLAG_NO_COUNT) ?
-                                               adj_midchain_tx_no_count_node.index :
-                                               adj_midchain_tx_node.index;
-
-    vnet_feature_enable_disable_with_index (arc_index, feature_index,
-					    adj->rewrite_header.sw_if_index,
-					    1 /* enable */, 0, 0);
-
-    /*
-     * stack the midchain on the drop so it's ready to forward in the adj-midchain-tx.
-     * The graph arc used/created here is from the midchain-tx node to the
-     * child's registered node. This is because post adj processing the next
-     * node are any output features, then the midchain-tx.  from there we
-     * need to get to the stacked child's node.
-     */
-    dpo_stack_from_node(adj->sub_type.midchain.tx_function_node,
-			&adj->sub_type.midchain.next_dpo,
-			drop_dpo_get(vnet_link_to_dpo_proto(adj->ia_link)));
-
-    /*
-     * update the rewirte with the workers paused.
-     */
-    adj_nbr_update_rewrite_internal(adj,
-				    IP_LOOKUP_NEXT_MIDCHAIN,
-				    adj_get_midchain_node(adj->ia_link),
-				    adj->sub_type.midchain.tx_function_node,
-				    rewrite);
-}
-
-/**
- * adj_nbr_midchain_unstack
- *
- * Unstack the adj. stack it on drop
- */
-void
-adj_nbr_midchain_unstack (adj_index_t adj_index)
-{
-    ip_adjacency_t *adj;
-
-    ASSERT(ADJ_INDEX_INVALID != adj_index);
-
-    adj = adj_get(adj_index);
-
-    /*
-     * stack on the drop
-     */
-    dpo_stack(DPO_ADJACENCY_MIDCHAIN,
-	      vnet_link_to_dpo_proto(adj->ia_link),
-	      &adj->sub_type.midchain.next_dpo,
-	      drop_dpo_get(vnet_link_to_dpo_proto(adj->ia_link)));
-
-    CLIB_MEMORY_BARRIER();
-}
-
-/**
- * adj_nbr_midchain_stack
- */
-void
-adj_nbr_midchain_stack (adj_index_t adj_index,
-			const dpo_id_t *next)
-{
-    ip_adjacency_t *adj;
-
-    ASSERT(ADJ_INDEX_INVALID != adj_index);
-
-    adj = adj_get(adj_index);
-
-    ASSERT(IP_LOOKUP_NEXT_MIDCHAIN == adj->lookup_next_index);
-
-    dpo_stack_from_node(adj->sub_type.midchain.tx_function_node,
-			&adj->sub_type.midchain.next_dpo,
-			next);
-}
-
-u8*
-format_adj_midchain (u8* s, va_list *ap)
-{
-    index_t index = va_arg(*ap, index_t);
-    u32 indent = va_arg(*ap, u32);
-    vnet_main_t * vnm = vnet_get_main();
-    ip_adjacency_t * adj = adj_get(index);
-
-    s = format (s, "%U", format_vnet_link, adj->ia_link);
-    s = format (s, " via %U ",
-		format_ip46_address, &adj->sub_type.nbr.next_hop);
-    s = format (s, " %U",
-		format_vnet_rewrite,
-		vnm->vlib_main, &adj->rewrite_header,
-		sizeof (adj->rewrite_data), indent);
-    s = format (s, "\n%Ustacked-on:\n%U%U",
-		format_white_space, indent,
-		format_white_space, indent+2,
-		format_dpo_id, &adj->sub_type.midchain.next_dpo, indent+2);
-
-    return (s);
-}
-
-static void
-adj_dpo_lock (dpo_id_t *dpo)
-{
-    adj_lock(dpo->dpoi_index);
-}
-static void
-adj_dpo_unlock (dpo_id_t *dpo)
-{
-    adj_unlock(dpo->dpoi_index);
-}
-
-const static dpo_vft_t adj_midchain_dpo_vft = {
-    .dv_lock = adj_dpo_lock,
-    .dv_unlock = adj_dpo_unlock,
-    .dv_format = format_adj_midchain,
-};
-
-/**
- * @brief The per-protocol VLIB graph nodes that are assigned to a midchain
- *        object.
- *
- * this means that these graph nodes are ones from which a midchain is the
- * parent object in the DPO-graph.
- */
-const static char* const midchain_ip4_nodes[] =
-{
-    "ip4-midchain",
-    NULL,
-};
-const static char* const midchain_ip6_nodes[] =
-{
-    "ip6-midchain",
-    NULL,
-};
-const static char* const midchain_mpls_nodes[] =
-{
-    "mpls-midchain",
-    NULL,
-};
-const static char* const midchain_ethernet_nodes[] =
-{
-    "adj-l2-midchain",
-    NULL,
-};
-
-const static char* const * const midchain_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = midchain_ip4_nodes,
-    [DPO_PROTO_IP6]  = midchain_ip6_nodes,
-    [DPO_PROTO_MPLS] = midchain_mpls_nodes,
-    [DPO_PROTO_ETHERNET] = midchain_ethernet_nodes,
-};
-
-void
-adj_midchain_module_init (void)
-{
-    dpo_register(DPO_ADJACENCY_MIDCHAIN, &adj_midchain_dpo_vft, midchain_nodes);
-}
diff --git a/vnet/vnet/adj/adj_midchain.h b/vnet/vnet/adj/adj_midchain.h
deleted file mode 100644
index ae414aea..00000000
--- a/vnet/vnet/adj/adj_midchain.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * Midchain Adjacency sub-type. These adjs represent an L3 peer on a
- * tunnel interface. The tunnel's adjacency is thus not the end of the chain,
- * and needs to stack on/link to another chain (or portion of the graph) to
- * reach the tunnel's destination.
- */
-
-#ifndef __ADJ_MIDCHAIN_H__
-#define __ADJ_MIDCHAIN_H__
-
-#include <vnet/adj/adj.h>
-
-/**
- * @brief Flags controlling the midchain adjacency
- */
-typedef enum adj_midchain_flag_t_
-{
-    /**
-     * No flags
-     */
-    ADJ_MIDCHAIN_FLAG_NONE = 0,
-
-    /**
-     * Packets TX through the midchain do not increment the interface
-     * counters. This should be used when the adj is associated with an L2
-     * interface and that L2 interface is in a bridege domain. In that case
-     * the packet will have traversed the interface's TX node, and hence have
-     * been counted, before it traverses ths midchain
-     */
-    ADJ_MIDCHAIN_FLAG_NO_COUNT = (1 << 0),
-} adj_midchain_flag_t;
-
-/**
- * @brief
- *  Convert an existing neighbour adjacency into a midchain
- *
- * @param adj_index
- *  The index of the neighbour adjacency.
- *
- * @param post_rewrite_node
- *  The VLIB graph node that provides the post-encap fixup.
- *  where 'fixup' is e.g., correcting chksum, length, etc.
- *
- * @param rewrite
- *  The rewrite.
- */
-extern void adj_nbr_midchain_update_rewrite(adj_index_t adj_index,
-					    adj_midchain_fixup_t fixup,
-					    adj_midchain_flag_t flags,
-					    u8 *rewrite);
-
-/**
- * @brief
- *  [re]stack a midchain. 'Stacking' is the act of forming parent-child
- *  relationships in the data-plane graph.
- *
- * @param adj_index
- *  The index of the midchain to stack
- *
- * @param dpo
- *  The parent DPO to stack onto (i.e. become a child of).
- */
-extern void adj_nbr_midchain_stack(adj_index_t adj_index,
-				   const dpo_id_t *dpo);
-
-/**
- * @brief
- *  unstack a midchain. This will break the chain between the midchain and
- *  the next graph section. This is a implemented as stack-on-drop
- *
- * @param adj_index
- *  The index of the midchain to stack
- */
-extern void adj_nbr_midchain_unstack(adj_index_t adj_index);
-
-/**
- * @brief
- *  Module initialisation
- */
-extern void adj_midchain_module_init(void);
-
-/**
- * @brief
- * Format a midchain adjacency
- */
-extern u8* format_adj_midchain(u8* s, va_list *ap);
-
-#endif
diff --git a/vnet/vnet/adj/adj_nbr.c b/vnet/vnet/adj/adj_nbr.c
deleted file mode 100644
index 1344bb67..00000000
--- a/vnet/vnet/adj/adj_nbr.c
+++ /dev/null
@@ -1,1087 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/adj/adj_nbr.h>
-#include <vnet/adj/adj_internal.h>
-#include <vnet/ethernet/arp_packet.h>
-#include <vnet/fib/fib_walk.h>
-
-/*
- * Vector Hash tables of neighbour (traditional) adjacencies
- *  Key: interface(for the vector index), address (and its proto),
- *       link-type/ether-type.
- */
-static BVT(clib_bihash) **adj_nbr_tables[FIB_PROTOCOL_MAX];
-
-// FIXME SIZE APPROPRIATELY. ASK DAVEB.
-#define ADJ_NBR_DEFAULT_HASH_NUM_BUCKETS (64 * 64)
-#define ADJ_NBR_DEFAULT_HASH_MEMORY_SIZE (32<<20)
-
-
-#define ADJ_NBR_SET_KEY(_key, _lt, _nh)         \
-{						\
-    _key.key[0] = (_nh)->as_u64[0];		\
-    _key.key[1] = (_nh)->as_u64[1];		\
-    _key.key[2] = (_lt);			\
-}
-
-#define ADJ_NBR_ITF_OK(_proto, _itf)			\
-    (((_itf) < vec_len(adj_nbr_tables[_proto])) &&	\
-     (NULL != adj_nbr_tables[_proto][sw_if_index]))
-
-static void
-adj_nbr_insert (fib_protocol_t nh_proto,
-		vnet_link_t link_type,
-		const ip46_address_t *nh_addr,
-		u32 sw_if_index,
-		adj_index_t adj_index)
-{
-    BVT(clib_bihash_kv) kv;
-
-    if (sw_if_index >= vec_len(adj_nbr_tables[nh_proto]))
-    {
-	vec_validate(adj_nbr_tables[nh_proto], sw_if_index);
-    }
-    if (NULL == adj_nbr_tables[nh_proto][sw_if_index])
-    {
-	adj_nbr_tables[nh_proto][sw_if_index] =
-	    clib_mem_alloc_aligned(sizeof(BVT(clib_bihash)),
-				   CLIB_CACHE_LINE_BYTES);
-	memset(adj_nbr_tables[nh_proto][sw_if_index],
-	       0,
-	       sizeof(BVT(clib_bihash)));
-
-	BV(clib_bihash_init) (adj_nbr_tables[nh_proto][sw_if_index],
-			      "Adjacency Neighbour table",
-			      ADJ_NBR_DEFAULT_HASH_NUM_BUCKETS,
-			      ADJ_NBR_DEFAULT_HASH_MEMORY_SIZE);
-    }
-
-    ADJ_NBR_SET_KEY(kv, link_type, nh_addr);
-    kv.value = adj_index;
-
-    BV(clib_bihash_add_del) (adj_nbr_tables[nh_proto][sw_if_index], &kv, 1);
-}
-
-void
-adj_nbr_remove (adj_index_t ai,
-                fib_protocol_t nh_proto,
-		vnet_link_t link_type,
-		const ip46_address_t *nh_addr,
-		u32 sw_if_index)
-{
-    BVT(clib_bihash_kv) kv;
-
-    if (!ADJ_NBR_ITF_OK(nh_proto, sw_if_index))
-	return;
-
-    ADJ_NBR_SET_KEY(kv, link_type, nh_addr);
-    kv.value = ai;
-
-    BV(clib_bihash_add_del) (adj_nbr_tables[nh_proto][sw_if_index], &kv, 0);
-}
-
-static adj_index_t
-adj_nbr_find (fib_protocol_t nh_proto,
-	      vnet_link_t link_type,
-	      const ip46_address_t *nh_addr,
-	      u32 sw_if_index)
-{
-    BVT(clib_bihash_kv) kv;
-
-    ADJ_NBR_SET_KEY(kv, link_type, nh_addr);
-
-    if (!ADJ_NBR_ITF_OK(nh_proto, sw_if_index))
-	return (ADJ_INDEX_INVALID);
-
-    if (BV(clib_bihash_search)(adj_nbr_tables[nh_proto][sw_if_index],
-			       &kv, &kv) < 0)
-    {
-	return (ADJ_INDEX_INVALID);
-    }
-    else
-    {
-	return (kv.value);
-    }
-}
-
-static inline u32
-adj_get_nd_node (fib_protocol_t proto)
-{
-    switch (proto) {
-    case FIB_PROTOCOL_IP4:
-	return (ip4_arp_node.index);
-    case FIB_PROTOCOL_IP6:
-	return (ip6_discover_neighbor_node.index);
-    case FIB_PROTOCOL_MPLS:
-	break;
-    }
-    ASSERT(0);
-    return (ip4_arp_node.index);
-}
-
-static ip_adjacency_t*
-adj_nbr_alloc (fib_protocol_t nh_proto,
-	       vnet_link_t link_type,
-	       const ip46_address_t *nh_addr,
-	       u32 sw_if_index)
-{
-    ip_adjacency_t *adj;
-
-    adj = adj_alloc(nh_proto);
-
-    adj_nbr_insert(nh_proto, link_type, nh_addr,
-		   sw_if_index,
-		   adj_get_index(adj));
-
-    /*
-     * since we just added the ADJ we have no rewrite string for it,
-     * so its for ARP
-     */
-    adj->lookup_next_index = IP_LOOKUP_NEXT_ARP;
-    adj->sub_type.nbr.next_hop = *nh_addr;
-    adj->ia_link = link_type;
-    adj->ia_nh_proto = nh_proto;
-    adj->rewrite_header.sw_if_index = sw_if_index;
-    memset(&adj->sub_type.midchain.next_dpo, 0,
-           sizeof(adj->sub_type.midchain.next_dpo));
-
-    return (adj);
-}
-
-/*
- * adj_add_for_nbr
- *
- * Add an adjacency for the neighbour requested.
- *
- * The key for an adj is:
- *   - the Next-hops protocol (i.e. v4 or v6)
- *   - the address of the next-hop
- *   - the interface the next-hop is reachable through
- */
-adj_index_t
-adj_nbr_add_or_lock (fib_protocol_t nh_proto,
-		     vnet_link_t link_type,
-		     const ip46_address_t *nh_addr,
-		     u32 sw_if_index)
-{
-    adj_index_t adj_index;
-    ip_adjacency_t *adj;
-
-    adj_index = adj_nbr_find(nh_proto, link_type, nh_addr, sw_if_index);
-
-    if (ADJ_INDEX_INVALID == adj_index)
-    {
-	vnet_main_t *vnm;
-
-	vnm = vnet_get_main();
-	adj = adj_nbr_alloc(nh_proto, link_type, nh_addr, sw_if_index);
-	adj_index = adj_get_index(adj);
-	adj_lock(adj_index);
-
-	vnet_rewrite_init(vnm, sw_if_index,
-			  adj_get_nd_node(nh_proto),
-			  vnet_tx_node_index_for_sw_interface(vnm, sw_if_index),
-			  &adj->rewrite_header);
-
-	/*
-	 * we need a rewrite where the destination IP address is converted
-	 * to the appropriate link-layer address. This is interface specific.
-	 * So ask the interface to do it.
-	 */
-	vnet_update_adjacency_for_sw_interface(vnm, sw_if_index, adj_index);
-    }
-    else
-    {
-	adj_lock(adj_index);
-    }
-
-    return (adj_index);
-}
-
-adj_index_t
-adj_nbr_add_or_lock_w_rewrite (fib_protocol_t nh_proto,
-			       vnet_link_t link_type,
-			       const ip46_address_t *nh_addr,
-			       u32 sw_if_index,
-			       u8 *rewrite)
-{
-    adj_index_t adj_index;
-    ip_adjacency_t *adj;
-
-    adj_index = adj_nbr_find(nh_proto, link_type, nh_addr, sw_if_index);
-
-    if (ADJ_INDEX_INVALID == adj_index)
-    {
-	adj = adj_nbr_alloc(nh_proto, link_type, nh_addr, sw_if_index);
-	adj->rewrite_header.sw_if_index = sw_if_index;
-    }
-    else
-    {
-        adj = adj_get(adj_index);
-    }
-
-    adj_lock(adj_get_index(adj));
-    adj_nbr_update_rewrite(adj_get_index(adj),
-			   ADJ_NBR_REWRITE_FLAG_COMPLETE,
-			   rewrite);
-
-    return (adj_get_index(adj));
-}
-
-/**
- * adj_nbr_update_rewrite
- *
- * Update the adjacency's rewrite string. A NULL string implies the
- * rewirte is reset (i.e. when ARP/ND etnry is gone).
- * NB: the adj being updated may be handling traffic in the DP.
- */
-void
-adj_nbr_update_rewrite (adj_index_t adj_index,
-			adj_nbr_rewrite_flag_t flags,
-			u8 *rewrite)
-{
-    ip_adjacency_t *adj;
-
-    ASSERT(ADJ_INDEX_INVALID != adj_index);
-
-    adj = adj_get(adj_index);
-
-    if (flags & ADJ_NBR_REWRITE_FLAG_COMPLETE)
-    {
-	/*
-	 * update the adj's rewrite string and build the arc
-	 * from the rewrite node to the interface's TX node
-	 */
-	adj_nbr_update_rewrite_internal(adj, IP_LOOKUP_NEXT_REWRITE,
-					adj_get_rewrite_node(adj->ia_link),
-					vnet_tx_node_index_for_sw_interface(
-					    vnet_get_main(),
-					    adj->rewrite_header.sw_if_index),
-					rewrite);
-    }
-    else
-    {
-	adj_nbr_update_rewrite_internal(adj, IP_LOOKUP_NEXT_ARP,
-					adj_get_nd_node(adj->ia_nh_proto),
-					vnet_tx_node_index_for_sw_interface(
-					    vnet_get_main(),
-					    adj->rewrite_header.sw_if_index),
-					rewrite);
-    }
-}
-
-/**
- * adj_nbr_update_rewrite_internal
- *
- * Update the adjacency's rewrite string. A NULL string implies the
- * rewirte is reset (i.e. when ARP/ND etnry is gone).
- * NB: the adj being updated may be handling traffic in the DP.
- */
-void
-adj_nbr_update_rewrite_internal (ip_adjacency_t *adj,
-				 u32 adj_next_index,
-				 u32 this_node,
-				 u32 next_node,
-				 u8 *rewrite)
-{
-    ip_adjacency_t *walk_adj;
-    adj_index_t walk_ai;
-    vlib_main_t * vm;
-    u32 old_next;
-    int do_walk;
-
-    vm = vlib_get_main();
-    old_next = adj->lookup_next_index;
-
-    walk_ai = adj_get_index(adj);
-    if (VNET_LINK_MPLS == adj->ia_link)
-    {
-        /*
-         * The link type MPLS has no children in the control plane graph, it only
-         * has children in the data-palne graph. The backwalk is up the former.
-         * So we need to walk from its IP cousin.
-         */
-        walk_ai = adj_nbr_find(adj->ia_nh_proto,
-                               fib_proto_to_link(adj->ia_nh_proto),
-                               &adj->sub_type.nbr.next_hop,
-                               adj->rewrite_header.sw_if_index);
-    }
-
-    /*
-     * Don't call the walk re-entrantly
-     */
-    if (ADJ_INDEX_INVALID != walk_ai)
-    {
-        walk_adj = adj_get(walk_ai);
-        if (IP_ADJ_SYNC_WALK_ACTIVE & walk_adj->ia_flags)
-        {
-            do_walk = 0;
-        }
-        else
-        {
-            /*
-             * Prevent re-entrant walk of the same adj
-             */
-            walk_adj->ia_flags |= IP_ADJ_SYNC_WALK_ACTIVE;
-            do_walk = 1;
-        }
-    }
-    else
-    {
-        do_walk = 0;
-    }
-
-    /*
-     * lock the adjacencies that are affected by updates this walk will provoke.
-     * Since the aim of the walk is to update children to link to a different
-     * DPO, this adj will no longer be in use and its lock count will drop to 0.
-     * We don't want it to be deleted as part of this endevour.
-     */
-    adj_lock(adj_get_index(adj));
-    adj_lock(walk_ai);
-
-    /*
-     * Updating a rewrite string is not atomic;
-     *  - the rewrite string is too long to write in one instruction
-     *  - when swapping from incomplete to complete, we also need to update
-     *    the VLIB graph next-index of the adj.
-     * ideally we would only want to suspend forwarding via this adj whilst we
-     * do this, but we do not have that level of granularity - it's suspend all
-     * worker threads or nothing.
-     * The other chioces are:
-     *  - to mark the adj down and back walk so child load-balances drop this adj
-     *    from the set.
-     *  - update the next_node index of this adj to point to error-drop
-     * both of which will mean for MAC change we will drop for this adj
-     * which is not acceptable. However, when the adj changes type (from
-     * complete to incomplete and vice-versa) the child DPOs, which have the
-     * VLIB graph next node index, will be sending packets to the wrong graph
-     * node. So from the options above, updating the next_node of the adj to
-     * be drop will work, but it relies on each graph node v4/v6/mpls, rewrite/
-     * arp/midchain always be valid w.r.t. a mis-match of adj type and node type
-     * (i.e. a rewrite adj in the arp node). This is not enforcable. Getting it
-     * wrong will lead to hard to find bugs since its a race condition. So we
-     * choose the more reliable method of updating the children to use the drop,
-     * then switching adj's type, then updating the children again. Did I mention
-     * that this doesn't happen often...
-     * So we need to distinguish between the two cases:
-     *  1 - mac change
-     *  2 - adj type change
-     */
-    if (do_walk &&
-        old_next != adj_next_index &&
-        ADJ_INDEX_INVALID != walk_ai)
-    {
-        /*
-         * the adj is changing type. we need to fix all children so that they
-         * stack momentarily on a drop, while the adj changes. If we don't do
-         * this  the children will send packets to a VLIB graph node that does
-         * not correspond to the adj's type - and it goes downhill from there.
-         */
-	fib_node_back_walk_ctx_t bw_ctx = {
-	    .fnbw_reason = FIB_NODE_BW_REASON_FLAG_ADJ_DOWN,
-            /*
-             * force this walk to be synchrous. if we don't and a node in the graph
-             * (a heavily shared path-list) chooses to back-ground the walk (make it
-             * async) then it will pause and we will do the adj update below, before
-             * all the children are updated. not good.
-             */
-            .fnbw_flags = FIB_NODE_BW_FLAG_FORCE_SYNC,
-	};
-
-	fib_walk_sync(FIB_NODE_TYPE_ADJ, walk_ai, &bw_ctx);
-    }
-
-    /*
-     * If we are just updating the MAC string of the adj (which we also can't
-     * do atomically), then we need to stop packets switching through the adj.
-     * We can't do that on a per-adj basis, so it's all the packets.
-     * If we are updating the type, and we walked back to the children above,
-     * then this barrier serves to flush the queues/frames.
-     */
-    vlib_worker_thread_barrier_sync(vm);
-
-    adj->lookup_next_index = adj_next_index;
-
-    if (NULL != rewrite)
-    {
-	/*
-	 * new rewrite provided.
-	 * fill in the adj's rewrite string, and build the VLIB graph arc.
-	 */
-	vnet_rewrite_set_data_internal(&adj->rewrite_header,
-				       sizeof(adj->rewrite_data),
-				       rewrite,
-				       vec_len(rewrite));
-	vec_free(rewrite);
-    }
-    else
-    {
-	vnet_rewrite_clear_data_internal(&adj->rewrite_header,
-					 sizeof(adj->rewrite_data));
-    }
-    adj->rewrite_header.node_index = this_node;
-    adj->rewrite_header.next_index = vlib_node_add_next(vlib_get_main(),
-                                                        this_node,
-                                                        next_node);
-
-    /*
-     * done with the rewirte update - let the workers loose.
-     */
-    vlib_worker_thread_barrier_release(vm);
-
-    if (do_walk &&
-        (old_next != adj->lookup_next_index) &&
-        (ADJ_INDEX_INVALID != walk_ai))
-    {
-        /*
-         * backwalk to the children so they can stack on the now updated
-         * adjacency
-         */
-        fib_node_back_walk_ctx_t bw_ctx = {
-	    .fnbw_reason = FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE,
-	};
-
-	fib_walk_sync(FIB_NODE_TYPE_ADJ, walk_ai, &bw_ctx);
-    }
-    /*
-     * Prevent re-entrant walk of the same adj
-     */
-    if (do_walk)
-    {
-        walk_adj->ia_flags &= ~IP_ADJ_SYNC_WALK_ACTIVE;
-    }
-
-    adj_unlock(adj_get_index(adj));
-    adj_unlock(walk_ai);
-}
-
-typedef struct adj_db_count_ctx_t_ {
-    u64 count;
-} adj_db_count_ctx_t;
-
-static void
-adj_db_count (BVT(clib_bihash_kv) * kvp,
-	      void *arg)
-{
-    adj_db_count_ctx_t * ctx = arg;
-    ctx->count++;
-}
-
-u32
-adj_nbr_db_size (void)
-{
-    adj_db_count_ctx_t ctx = {
-	.count = 0,
-    };
-    fib_protocol_t proto;
-    u32 sw_if_index = 0;
-
-    for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
-    {
-	vec_foreach_index(sw_if_index, adj_nbr_tables[proto])
-	{
-	    if (NULL != adj_nbr_tables[proto][sw_if_index])
-	    {
-		BV(clib_bihash_foreach_key_value_pair) (
-		    adj_nbr_tables[proto][sw_if_index],
-		    adj_db_count,
-		    &ctx);
-	    }
-	}
-    }
-    return (ctx.count);
-}
-
-/**
- * @brief Context for a walk of the adjacency neighbour DB
- */
-typedef struct adj_walk_ctx_t_
-{
-    adj_walk_cb_t awc_cb;
-    void *awc_ctx;
-} adj_walk_ctx_t;
-
-static void
-adj_nbr_walk_cb (BVT(clib_bihash_kv) * kvp,
-		 void *arg)
-{
-    adj_walk_ctx_t *ctx = arg;
-
-    // FIXME: can't stop early...
-    ctx->awc_cb(kvp->value, ctx->awc_ctx);
-}
-
-void
-adj_nbr_walk (u32 sw_if_index,
-	      fib_protocol_t adj_nh_proto,
-	      adj_walk_cb_t cb,
-	      void *ctx)
-{
-    if (!ADJ_NBR_ITF_OK(adj_nh_proto, sw_if_index))
-	return;
-
-    adj_walk_ctx_t awc = {
-	.awc_ctx = ctx,
-	.awc_cb = cb,
-    };
-
-    BV(clib_bihash_foreach_key_value_pair) (
-	adj_nbr_tables[adj_nh_proto][sw_if_index],
-	adj_nbr_walk_cb,
-	&awc);
-}
-
-/**
- * @brief Context for a walk of the adjacency neighbour DB
- */
-typedef struct adj_walk_nh_ctx_t_
-{
-    adj_walk_cb_t awc_cb;
-    void *awc_ctx;
-    const ip46_address_t *awc_nh;
-} adj_walk_nh_ctx_t;
-
-static void
-adj_nbr_walk_nh_cb (BVT(clib_bihash_kv) * kvp,
-		    void *arg)
-{
-    ip_adjacency_t *adj;
-    adj_walk_nh_ctx_t *ctx = arg;
-
-    adj = adj_get(kvp->value);
-
-    if (!ip46_address_cmp(&adj->sub_type.nbr.next_hop, ctx->awc_nh)) 
-	ctx->awc_cb(kvp->value, ctx->awc_ctx);
-}
-
-/**
- * @brief Walk adjacencies on a link with a given v4 next-hop.
- * that is visit the adjacencies with different link types.
- */
-void
-adj_nbr_walk_nh4 (u32 sw_if_index,
-		 const ip4_address_t *addr,
-		 adj_walk_cb_t cb,
-		 void *ctx)
-{
-    if (!ADJ_NBR_ITF_OK(FIB_PROTOCOL_IP4, sw_if_index))
-	return;
-
-    ip46_address_t nh = {
-	.ip4 = *addr,
-    };
-
-    adj_walk_nh_ctx_t awc = {
-	.awc_ctx = ctx,
-	.awc_cb = cb,
-	.awc_nh = &nh,
-    };
-
-    BV(clib_bihash_foreach_key_value_pair) (
-	adj_nbr_tables[FIB_PROTOCOL_IP4][sw_if_index],
-	adj_nbr_walk_nh_cb,
-	&awc);
-}
-
-/**
- * @brief Walk adjacencies on a link with a given v6 next-hop.
- * that is visit the adjacencies with different link types.
- */
-void
-adj_nbr_walk_nh6 (u32 sw_if_index,
-		 const ip6_address_t *addr,
-		 adj_walk_cb_t cb,
-		 void *ctx)
-{
-    if (!ADJ_NBR_ITF_OK(FIB_PROTOCOL_IP6, sw_if_index))
-	return;
-
-    ip46_address_t nh = {
-	.ip6 = *addr,
-    };
-
-    adj_walk_nh_ctx_t awc = {
-	.awc_ctx = ctx,
-	.awc_cb = cb,
-	.awc_nh = &nh,
-    };
-
-    BV(clib_bihash_foreach_key_value_pair) (
-	adj_nbr_tables[FIB_PROTOCOL_IP6][sw_if_index],
-	adj_nbr_walk_nh_cb,
-	&awc);
-}
-
-/**
- * @brief Walk adjacencies on a link with a given next-hop.
- * that is visit the adjacencies with different link types.
- */
-void
-adj_nbr_walk_nh (u32 sw_if_index,
-		 fib_protocol_t adj_nh_proto,
-		 const ip46_address_t *nh,
-		 adj_walk_cb_t cb,
-		 void *ctx)
-{
-    if (!ADJ_NBR_ITF_OK(adj_nh_proto, sw_if_index))
-	return;
-
-    adj_walk_nh_ctx_t awc = {
-	.awc_ctx = ctx,
-	.awc_cb = cb,
-	.awc_nh = nh,
-    };
-
-    BV(clib_bihash_foreach_key_value_pair) (
-	adj_nbr_tables[adj_nh_proto][sw_if_index],
-	adj_nbr_walk_nh_cb,
-	&awc);
-}
-
-/**
- * Flags associated with the interface state walks
- */
-typedef enum adj_nbr_interface_flags_t_
-{
-    ADJ_NBR_INTERFACE_UP = (1 << 0),
-} adj_nbr_interface_flags_t;
-
-/**
- * Context for the state change walk of the DB
- */
-typedef struct adj_nbr_interface_state_change_ctx_t_
-{
-    /**
-     * Flags on the interface
-     */
-    adj_nbr_interface_flags_t flags;
-} adj_nbr_interface_state_change_ctx_t;
-
-static adj_walk_rc_t
-adj_nbr_interface_state_change_one (adj_index_t ai,
-                                    void *arg)
-{
-    /*
-     * Back walk the graph to inform the forwarding entries
-     * that this interface state has changed. Do this synchronously
-     * since this is the walk that provides convergence
-     */
-    adj_nbr_interface_state_change_ctx_t *ctx = arg;
-
-    fib_node_back_walk_ctx_t bw_ctx = {
-	.fnbw_reason = ((ctx->flags & ADJ_NBR_INTERFACE_UP) ?
-                        FIB_NODE_BW_REASON_FLAG_INTERFACE_UP :
-                        FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN),
-        /*
-         * the force sync applies only as far as the first fib_entry.
-         * And it's the fib_entry's we need to converge away from
-         * the adjacencies on the now down link
-         */
-        .fnbw_flags = (!(ctx->flags & ADJ_NBR_INTERFACE_UP) ?
-                       FIB_NODE_BW_FLAG_FORCE_SYNC :
-                       0),
-    };
-
-    fib_walk_sync(FIB_NODE_TYPE_ADJ, ai, &bw_ctx);
-
-    return (ADJ_WALK_RC_CONTINUE);
-}
-
-/**
- * @brief Registered function for SW interface state changes
- */
-static clib_error_t *
-adj_nbr_sw_interface_state_change (vnet_main_t * vnm,
-                                   u32 sw_if_index,
-                                   u32 flags)
-{
-    fib_protocol_t proto;
-
-    /*
-     * walk each adj on the interface and trigger a walk from that adj
-     */
-    for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
-    {
-	adj_nbr_interface_state_change_ctx_t ctx = {
-	    .flags = ((flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ?
-                      ADJ_NBR_INTERFACE_UP :
-                      0),
-	};
-
-	adj_nbr_walk(sw_if_index, proto,
-		     adj_nbr_interface_state_change_one,
-		     &ctx);
-    }
-
-    return (NULL);
-}
-
-VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION_PRIO(
-    adj_nbr_sw_interface_state_change,
-    VNET_ITF_FUNC_PRIORITY_HIGH);
-
-/**
- * @brief Invoked on each SW interface of a HW interface when the
- * HW interface state changes
- */
-static void
-adj_nbr_hw_sw_interface_state_change (vnet_main_t * vnm,
-                                      u32 sw_if_index,
-                                      void *arg)
-{
-    adj_nbr_interface_state_change_ctx_t *ctx = arg;
-    fib_protocol_t proto;
-
-    /*
-     * walk each adj on the interface and trigger a walk from that adj
-     */
-    for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
-    {
-	adj_nbr_walk(sw_if_index, proto,
-		     adj_nbr_interface_state_change_one,
-		     ctx);
-    }
-}
-
-/**
- * @brief Registered callback for HW interface state changes
- */
-static clib_error_t *
-adj_nbr_hw_interface_state_change (vnet_main_t * vnm,
-                                   u32 hw_if_index,
-                                   u32 flags)
-{
-    /*
-     * walk SW interface on the HW
-     */
-    adj_nbr_interface_state_change_ctx_t ctx = {
-        .flags = ((flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ?
-                  ADJ_NBR_INTERFACE_UP :
-                  0),
-    };
-
-    vnet_hw_interface_walk_sw(vnm, hw_if_index,
-                              adj_nbr_hw_sw_interface_state_change,
-                              &ctx);
-
-    return (NULL);
-}
-
-VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION_PRIO(
-    adj_nbr_hw_interface_state_change,
-    VNET_ITF_FUNC_PRIORITY_HIGH);
-
-static adj_walk_rc_t
-adj_nbr_interface_delete_one (adj_index_t ai,
-			      void *arg)
-{
-    /*
-     * Back walk the graph to inform the forwarding entries
-     * that this interface has been deleted.
-     */
-    fib_node_back_walk_ctx_t bw_ctx = {
-	.fnbw_reason = FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE,
-    };
-
-    fib_walk_sync(FIB_NODE_TYPE_ADJ, ai, &bw_ctx);
-
-    return (ADJ_WALK_RC_CONTINUE);
-}
-
-/**
- * adj_nbr_interface_add_del
- *
- * Registered to receive interface Add and delete notifications
- */
-static clib_error_t *
-adj_nbr_interface_add_del (vnet_main_t * vnm,
-			   u32 sw_if_index,
-			   u32 is_add)
-{
-    fib_protocol_t proto;
-
-    if (is_add)
-    {
-	/*
-	 * not interested in interface additions. we will not back walk
-	 * to resolve paths through newly added interfaces. Why? The control
-	 * plane should have the brains to add interfaces first, then routes.
-	 * So the case where there are paths with a interface that matches
-	 * one just created is the case where the path resolved through an
-	 * interface that was deleted, and still has not been removed. The
-	 * new interface added, is NO GUARANTEE that the interface being
-	 * added now, even though it may have the same sw_if_index, is the
-	 * same interface that the path needs. So tough!
-	 * If the control plane wants these routes to resolve it needs to
-	 * remove and add them again.
-	 */
-	return (NULL);
-    }
-
-    for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
-    {
-	adj_nbr_walk(sw_if_index, proto,
-		     adj_nbr_interface_delete_one,
-		     NULL);
-    }
-
-    return (NULL);
-   
-}
-
-VNET_SW_INTERFACE_ADD_DEL_FUNCTION(adj_nbr_interface_add_del);
-
-
-static adj_walk_rc_t
-adj_nbr_show_one (adj_index_t ai,
-		  void *arg)
-{
-    vlib_cli_output (arg, "[@%d]  %U",
-                     ai,
-                     format_ip_adjacency, ai,
-		     FORMAT_IP_ADJACENCY_NONE);
-
-    return (ADJ_WALK_RC_CONTINUE);
-}
-
-static clib_error_t *
-adj_nbr_show (vlib_main_t * vm,
-	      unformat_input_t * input,
-	      vlib_cli_command_t * cmd)
-{
-    adj_index_t ai = ADJ_INDEX_INVALID;
-    u32 sw_if_index = ~0;
-
-    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-	if (unformat (input, "%d", &ai))
-	    ;
-	else if (unformat (input, "%U",
-			   unformat_vnet_sw_interface, vnet_get_main(),
-			   &sw_if_index))
-	    ;
-	else
-	    break;
-    }
-
-    if (ADJ_INDEX_INVALID != ai)
-    {
-	vlib_cli_output (vm, "[@%d] %U",
-                         ai,
-                         format_ip_adjacency, ai,
-			 FORMAT_IP_ADJACENCY_DETAIL);
-    }
-    else if (~0 != sw_if_index)
-    {
-	fib_protocol_t proto;
-
-	for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
-	{
-	    adj_nbr_walk(sw_if_index, proto,
-			 adj_nbr_show_one,
-			 vm);
-	}
-    }
-    else
-    {
-	fib_protocol_t proto;
-
-	for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
-	{
-	    vec_foreach_index(sw_if_index, adj_nbr_tables[proto])
-	    {
-		adj_nbr_walk(sw_if_index, proto,
-			     adj_nbr_show_one,
-			     vm);
-	    }
-	}
-    }
-
-    return 0;
-}
-
-/*?
- * Show all neighbour adjacencies.
- * @cliexpar
- * @cliexstart{sh adj nbr}
- * [@2] ipv4 via 1.0.0.2 loop0: IP4: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
- * [@3] mpls via 1.0.0.2 loop0: MPLS_UNICAST: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
- * [@4] ipv4 via 1.0.0.3 loop0: IP4: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
- * [@5] mpls via 1.0.0.3 loop0: MPLS_UNICAST: 00:00:22:aa:bb:cc -> 00:00:11:aa:bb:cc
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND (ip4_show_fib_command, static) = {
-    .path = "show adj nbr",
-    .short_help = "show adj nbr [<adj_index>] [interface]",
-    .function = adj_nbr_show,
-};
-
-static ip46_type_t
-adj_proto_to_46 (fib_protocol_t proto)
-{
-    switch (proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (IP46_TYPE_IP4);
-    case FIB_PROTOCOL_IP6:
-	return (IP46_TYPE_IP6);
-    default:
-	return (IP46_TYPE_IP4);
-    }
-    return (IP46_TYPE_IP4);
-}
-
-u8*
-format_adj_nbr_incomplete (u8* s, va_list *ap)
-{
-    index_t index = va_arg(*ap, index_t);
-    CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
-    vnet_main_t * vnm = vnet_get_main();
-    ip_adjacency_t * adj = adj_get(index);
-
-    s = format (s, "arp-%U", format_vnet_link, adj->ia_link);
-    s = format (s, ": via %U",
-                format_ip46_address, &adj->sub_type.nbr.next_hop,
-		adj_proto_to_46(adj->ia_nh_proto));
-    s = format (s, " %U",
-                format_vnet_sw_interface_name,
-                vnm,
-                vnet_get_sw_interface(vnm,
-                                      adj->rewrite_header.sw_if_index));
-
-    return (s);
-}
-
-u8*
-format_adj_nbr (u8* s, va_list *ap)
-{
-    index_t index = va_arg(*ap, index_t);
-    CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
-    vnet_main_t * vnm = vnet_get_main();
-    ip_adjacency_t * adj = adj_get(index);
-
-    s = format (s, "%U", format_vnet_link, adj->ia_link);
-    s = format (s, " via %U ",
-		format_ip46_address, &adj->sub_type.nbr.next_hop,
-		adj_proto_to_46(adj->ia_nh_proto));
-    s = format (s, "%U",
-		format_vnet_rewrite,
-		vnm->vlib_main, &adj->rewrite_header, sizeof (adj->rewrite_data), 0);
-
-    return (s);
-}
-
-static void
-adj_dpo_lock (dpo_id_t *dpo)
-{
-    adj_lock(dpo->dpoi_index);
-}
-static void
-adj_dpo_unlock (dpo_id_t *dpo)
-{
-    adj_unlock(dpo->dpoi_index);
-}
-
-static void
-adj_mem_show (void)
-{
-    fib_show_memory_usage("Adjacency",
-			  pool_elts(adj_pool),
-			  pool_len(adj_pool),
-			  sizeof(ip_adjacency_t));
-}
-
-const static dpo_vft_t adj_nbr_dpo_vft = {
-    .dv_lock = adj_dpo_lock,
-    .dv_unlock = adj_dpo_unlock,
-    .dv_format = format_adj_nbr,
-    .dv_mem_show = adj_mem_show,
-};
-const static dpo_vft_t adj_nbr_incompl_dpo_vft = {
-    .dv_lock = adj_dpo_lock,
-    .dv_unlock = adj_dpo_unlock,
-    .dv_format = format_adj_nbr_incomplete,
-};
-
-/**
- * @brief The per-protocol VLIB graph nodes that are assigned to an adjacency
- *        object.
- *
- * this means that these graph nodes are ones from which a nbr is the
- * parent object in the DPO-graph.
- */
-const static char* const nbr_ip4_nodes[] =
-{
-    "ip4-rewrite",
-    NULL,
-};
-const static char* const nbr_ip6_nodes[] =
-{
-    "ip6-rewrite",
-    NULL,
-};
-const static char* const nbr_mpls_nodes[] =
-{
-    "mpls-output",
-    NULL,
-};
-const static char* const nbr_ethernet_nodes[] =
-{
-    "adj-l2-rewrite",
-    NULL,
-};
-const static char* const * const nbr_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = nbr_ip4_nodes,
-    [DPO_PROTO_IP6]  = nbr_ip6_nodes,
-    [DPO_PROTO_MPLS] = nbr_mpls_nodes,
-    [DPO_PROTO_ETHERNET] = nbr_ethernet_nodes,
-};
-
-const static char* const nbr_incomplete_ip4_nodes[] =
-{
-    "ip4-arp",
-    NULL,
-};
-const static char* const nbr_incomplete_ip6_nodes[] =
-{
-    "ip6-discover-neighbor",
-    NULL,
-};
-const static char* const nbr_incomplete_mpls_nodes[] =
-{
-    "mpls-adj-incomplete",
-    NULL,
-};
-
-const static char* const * const nbr_incomplete_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = nbr_incomplete_ip4_nodes,
-    [DPO_PROTO_IP6]  = nbr_incomplete_ip6_nodes,
-    [DPO_PROTO_MPLS] = nbr_incomplete_mpls_nodes,
-};
-
-void
-adj_nbr_module_init (void)
-{
-    dpo_register(DPO_ADJACENCY,
-                 &adj_nbr_dpo_vft,
-                 nbr_nodes);
-    dpo_register(DPO_ADJACENCY_INCOMPLETE,
-                 &adj_nbr_incompl_dpo_vft,
-                 nbr_incomplete_nodes);
-}
diff --git a/vnet/vnet/adj/adj_nbr.h b/vnet/vnet/adj/adj_nbr.h
deleted file mode 100644
index 293766b8..00000000
--- a/vnet/vnet/adj/adj_nbr.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief
- * Neighbour Adjacency sub-type. These adjs represent an L3 peer on a
- * connected link. 
- */
-
-#ifndef __ADJ_NBR_H__
-#define __ADJ_NBR_H__
-
-#include <vnet/vnet.h>
-#include <vnet/adj/adj_types.h>
-#include <vnet/fib/fib_node.h>
-#include <vnet/dpo/dpo.h>
-
-/**
- * @brief
- *  Add (and lock) a new or lock an existing neighbour adjacency
- *
- * @param nh_proto
- *  The protocol for the next-hop address (v4 or v6)
- *
- * @param link_type
- *  A description of the protocol of the packets that will forward
- *  through this adj. On an ethernet interface this is the MAC header's
- *  ether-type
- *
- * @param nh_addr
- *  The address of the next-hop/peer to send the packet to
- *
- * @param sw_if_index
- *  The interface on which the peer resides
- */
-extern adj_index_t adj_nbr_add_or_lock(fib_protocol_t nh_proto,
-				       vnet_link_t link_type,
-				       const ip46_address_t *nh_addr,
-				       u32 sw_if_index);
-
-/**
- * @brief
- *  Add (and lock) a new or lock an existing neighbour adjacency
- *
- * @param nh_proto
- *  The protocol for the next-hop address (v4 or v6)
- *
- * @param link_type
- *  A description of the protocol of the packets that will forward
- *  through this adj. On an ethernet interface this is the MAC header's
- *  ether-type
- *
- * @param nh_addr
- *  The address of the next-hop/peer to send the packet to
- *
- * @param sw_if_index
- *  The interface on which the peer resides
- *
- * @param rewrite
- *  The rewrite to prepend to packets
- */
-extern adj_index_t adj_nbr_add_or_lock_w_rewrite(fib_protocol_t nh_proto,
-						 vnet_link_t link_type,
-						 const ip46_address_t *nh_addr,
-						 u32 sw_if_index,
-						 u8 *rewrite);
-/**
- * @brief When adding a rewrite to an adjacency these are flags that
- * apply to that rewrite
- */
-typedef enum adj_nbr_rewrite_flag_t_
-{
-    ADJ_NBR_REWRITE_FLAG_NONE,
-
-    /**
-     * An indication that the rewrite is incomplete, i.e. that it describes the
-     * ARP/ND rewrite when probing.
-     */
-    ADJ_NBR_REWRITE_FLAG_INCOMPLETE = ADJ_NBR_REWRITE_FLAG_NONE,
-
-    /**
-     * An indication that the rewrite is complete, i.e. that it fully describes
-     * the link-layer addressing for the desintation.
-     * The opposite of this is an incomplete rewrite that describes the ARP/ND
-     * rewrite when probing.
-     */
-    ADJ_NBR_REWRITE_FLAG_COMPLETE = (1 << 0),
-} adj_nbr_rewrite_flag_t;
-
-/**
- * @brief
- *  Update the rewrite string for an existing adjacecny.
- *
- * @param
- *  The index of the adj to update
- *
- * @param
- *  The new rewrite
- */
-extern void adj_nbr_update_rewrite(adj_index_t adj_index,
-				   adj_nbr_rewrite_flag_t flags,
-				   u8 *rewrite);
-
-/**
- * @brief
- * Format aa incomplete neigbour (ARP) adjacency
- */
-extern u8* format_adj_nbr_incomplete(u8* s, va_list *ap);
-
-/**
- * @brief
- * Format a neigbour (REWRITE) adjacency
- */
-extern u8* format_adj_nbr(u8* s, va_list *ap);
-
-/**
- * @brief Walk the neighbour Adjacencies on a given interface
- */
-extern void adj_nbr_walk (u32 sw_if_index,
-			  fib_protocol_t adj_nh_proto,
-			  adj_walk_cb_t cb,
-			  void *ctx);
-/**
- * @brief Walk the neighbour Adjacencies on a given interface with a given next-hop
- */
-void
-adj_nbr_walk_nh (u32 sw_if_index,
-		 fib_protocol_t adj_nh_proto,
-		 const ip46_address_t *nh,
-		 adj_walk_cb_t cb,
-		 void *ctx);
-
-/**
- * @brief Walk adjacencies on a link with a given v4 next-hop.
- * that is visit the adjacencies with different link types.
- */
-void
-adj_nbr_walk_nh4 (u32 sw_if_index,
-		  const ip4_address_t *addr,
-		  adj_walk_cb_t cb,
-		  void *ctx);
-
-/**
- * @brief Walk adjacencies on a link with a given v6 next-hop.
- * that is visit the adjacencies with different link types.
- */
-void
-adj_nbr_walk_nh6 (u32 sw_if_index,
-		  const ip6_address_t *addr,
-		  adj_walk_cb_t cb,
-		  void *ctx);
-
-/**
- * @brief
- *  Module initialisation
- */
-extern void adj_nbr_module_init(void);
-
-/**
- * @brief
- *  Return the size of the adjacency database. for testing purposes
- */
-extern u32 adj_nbr_db_size(void);
-
-#endif
diff --git a/vnet/vnet/adj/adj_rewrite.c b/vnet/vnet/adj/adj_rewrite.c
deleted file mode 100644
index 7d792557..00000000
--- a/vnet/vnet/adj/adj_rewrite.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/adj/adj.h>
-#include <vnet/adj/adj_internal.h>
-
-/**
- * adj_rewrite_add_and_lock
- *
- * A rewrite sub-type has the rewrite string provided, but no key
- */
-adj_index_t
-adj_rewrite_add_and_lock (fib_protocol_t nh_proto,
-			  vnet_link_t link_type,
-			  u32 sw_if_index,
-			  u8 *rewrite)
-{
-    ip_adjacency_t *adj;
-
-    adj = adj_alloc(nh_proto);
-
-    adj->lookup_next_index = IP_LOOKUP_NEXT_REWRITE;
-    memset(&adj->sub_type.nbr.next_hop, 0, sizeof(adj->sub_type.nbr.next_hop));
-    adj->ia_link = link_type;
-    adj->ia_nh_proto = nh_proto;
-    adj->rewrite_header.sw_if_index = sw_if_index;
-
-    ASSERT(NULL != rewrite);
-
-    vnet_rewrite_for_sw_interface(vnet_get_main(),
-				  link_type,
-				  adj->rewrite_header.sw_if_index,
-				  adj_get_rewrite_node(link_type),
-				  rewrite,
-				  &adj->rewrite_header,
-				  sizeof (adj->rewrite_data));
-
-    adj_lock(adj_get_index(adj));
-
-    return (adj_get_index(adj));
-}
diff --git a/vnet/vnet/adj/adj_rewrite.h b/vnet/vnet/adj/adj_rewrite.h
deleted file mode 100644
index 25e6bba8..00000000
--- a/vnet/vnet/adj/adj_rewrite.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief
- * A rewrite adjacency has no key, and thus cannot be 'found' from the
- * FIB resolution code. the client therefore needs to maange these adjacencies
- */
-
-#ifndef __ADJ_REWRITE_H__
-#define __ADJ_REWRITE_H__
-
-#include <vnet/adj/adj_types.h>
-
-/**
- * @brief
- *  Add (and lock) a new or lock an existing neighbour adjacency
- *
- * @param nh_proto
- *  The protocol for the next-hop address (v4 or v6)
- *
- * @param link_type
- *  A description of the protocol of the packets that will forward
- *  through this adj. On an ethernet interface this is the MAC header's
- *  ether-type
- *
- * @param sw_if_index
- *  The interface on which the peer resides
- *
- * @param rewrite
- *  The rewrite to prepend to packets
- */
-extern adj_index_t adj_rewrite_add_and_lock(fib_protocol_t nh_proto,
-					    vnet_link_t link_type,
-					    u32 sw_if_index,
-					    u8 *rewrite);
-
-#endif
diff --git a/vnet/vnet/adj/adj_types.h b/vnet/vnet/adj/adj_types.h
deleted file mode 100644
index cf90c084..00000000
--- a/vnet/vnet/adj/adj_types.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __ADJ_TYPES_H__
-#define __ADJ_TYPES_H__
-
-#include <vnet/vnet.h>
-
-/**
- * @brief An index for adjacencies.
- * Alas 'C' is not typesafe enough to b0rk when a u32 is used instead of
- * an adi_index_t. However, for us humans, we can glean much more intent
- * from the declaration
- *  foo bar(adj_index_t t);
- * than we can from
- *  foo bar(u32 t);
- */
-typedef u32 adj_index_t; 
-
-/**
- * @brief Invalid ADJ index - used when no adj is known
- * likewise blazoned capitals INVALID speak volumes where ~0 does not.
- */
-#define ADJ_INDEX_INVALID ((u32)~0)
-
-/**
- * @brief return codes from a adjacency walker callback function
- */
-typedef enum adj_walk_rc_t_
-{
-    ADJ_WALK_RC_STOP,
-    ADJ_WALK_RC_CONTINUE,
-} adj_walk_rc_t;
-
-/**
- * @brief Call back function when walking adjacencies
- */
-typedef adj_walk_rc_t (*adj_walk_cb_t)(adj_index_t ai,
-				       void *ctx);
-
-#endif
diff --git a/vnet/vnet/api_errno.h b/vnet/vnet/api_errno.h
deleted file mode 100644
index 65e3e591..00000000
--- a/vnet/vnet/api_errno.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vnet_api_errno_h
-#define included_vnet_api_errno_h
-
-#define foreach_vnet_api_error						\
-_(UNSPECIFIED, -1, "Unspecified Error")                                 \
-_(INVALID_SW_IF_INDEX, -2, "Invalid sw_if_index")                       \
-_(NO_SUCH_FIB, -3, "No such FIB / VRF")                                 \
-_(NO_SUCH_INNER_FIB, -4, "No such inner FIB / VRF")                     \
-_(NO_SUCH_LABEL, -5, "No such label")                                   \
-_(NO_SUCH_ENTRY, -6, "No such entry")                                   \
-_(INVALID_VALUE, -7, "Invalid value")                                   \
-_(INVALID_VALUE_2, -8, "Invalid value #2")                              \
-_(UNIMPLEMENTED, -9, "Unimplemented")                                   \
-_(INVALID_SW_IF_INDEX_2, -10, "Invalid sw_if_index #2")                 \
-_(SYSCALL_ERROR_1, -11, "System call error #1")                         \
-_(SYSCALL_ERROR_2, -12, "System call error #2")                         \
-_(SYSCALL_ERROR_3, -13, "System call error #3")                         \
-_(SYSCALL_ERROR_4, -14, "System call error #4")                         \
-_(SYSCALL_ERROR_5, -15, "System call error #5")                         \
-_(SYSCALL_ERROR_6, -16, "System call error #6")                         \
-_(SYSCALL_ERROR_7, -17, "System call error #7")                         \
-_(SYSCALL_ERROR_8, -18, "System call error #8")                         \
-_(SYSCALL_ERROR_9, -19, "System call error #9")                         \
-_(SYSCALL_ERROR_10, -20, "System call error #9")                        \
-_(FEATURE_DISABLED, -30, "Feature disabled by configuration")           \
-_(INVALID_REGISTRATION, -31, "Invalid registration")                    \
-_(NEXT_HOP_NOT_IN_FIB, -50, "Next hop not in FIB")                      \
-_(UNKNOWN_DESTINATION, -51, "Unknown destination")                      \
-_(PREFIX_MATCHES_NEXT_HOP, -52, "Prefix matches next hop")              \
-_(NEXT_HOP_NOT_FOUND_MP, -53, "Next hop not found (multipath)")         \
-_(NO_MATCHING_INTERFACE, -54, "No matching interface for probe")        \
-_(INVALID_VLAN, -55, "Invalid VLAN")                                    \
-_(VLAN_ALREADY_EXISTS, -56, "VLAN subif already exists")                \
-_(INVALID_SRC_ADDRESS, -57, "Invalid src address")                      \
-_(INVALID_DST_ADDRESS, -58, "Invalid dst address")                      \
-_(ADDRESS_LENGTH_MISMATCH, -59, "Address length mismatch")              \
-_(ADDRESS_NOT_FOUND_FOR_INTERFACE, -60, "Address not found for interface") \
-_(ADDRESS_NOT_LINK_LOCAL, -61, "Address not link-local")                \
-_(IP6_NOT_ENABLED, -62, "ip6 not enabled")				\
-_(ADDRESS_MATCHES_INTERFACE_ADDRESS, -63, "Address matches interface address") \
-_(IN_PROGRESS, 10, "Operation in progress")				\
-_(NO_SUCH_NODE, -63, "No such graph node")				\
-_(NO_SUCH_NODE2, -64, "No such graph node #2")				\
-_(NO_SUCH_TABLE, -65, "No such table")                                  \
-_(NO_SUCH_TABLE2, -66, "No such table #2")                              \
-_(NO_SUCH_TABLE3, -67, "No such table #3")                              \
-_(SUBIF_ALREADY_EXISTS, -68, "Subinterface already exists")             \
-_(SUBIF_CREATE_FAILED, -69, "Subinterface creation failed")		\
-_(INVALID_MEMORY_SIZE, -70, "Invalid memory size requested")            \
-_(INVALID_INTERFACE, -71, "Invalid interface")                          \
-_(INVALID_VLAN_TAG_COUNT, -72, "Invalid number of tags for requested operation") \
-_(INVALID_ARGUMENT, -73, "Invalid argument")                            \
-_(UNEXPECTED_INTF_STATE, -74, "Unexpected interface state")             \
-_(TUNNEL_EXIST, -75, "Tunnel already exists")                           \
-_(INVALID_DECAP_NEXT, -76, "Invalid decap-next")			\
-_(RESPONSE_NOT_READY, -77, "Response not ready")			\
-_(NOT_CONNECTED, -78, "Not connected to the data plane")                \
-_(IF_ALREADY_EXISTS, -79, "Interface already exists")                   \
-_(BOND_SLAVE_NOT_ALLOWED, -80, "Operation not allowed on slave of BondEthernet") \
-_(VALUE_EXIST, -81, "Value already exists")                             \
-_(SAME_SRC_DST, -82, "Source and destination are the same")             \
-_(IP6_MULTICAST_ADDRESS_NOT_PRESENT, -83, "IP6 multicast address required") \
-_(SR_POLICY_NAME_NOT_PRESENT, -84, "Segement routing policy name required") \
-_(NOT_RUNNING_AS_ROOT, -85, "Not running as root") \
-_(ALREADY_CONNECTED, -86, "Connection to the data plane already exists") \
-_(UNSUPPORTED_JNI_VERSION, -87, "Unsupported JNI version") \
-_(FAILED_TO_ATTACH_TO_JAVA_THREAD, -88, "Failed to attach to Java thread") \
-_(INVALID_WORKER, -89, "Invalid worker thread")                         \
-_(LISP_DISABLED, -90, "LISP is disabled")                               \
-_(CLASSIFY_TABLE_NOT_FOUND, -91, "Classify table not found")            \
-_(INVALID_EID_TYPE, -92, "Unsupported LSIP EID type")                   \
-_(CANNOT_CREATE_PCAP_FILE, -93, "Cannot create pcap file")              \
-_(INCORRECT_ADJACENCY_TYPE, -94, "Invalid adjacency type for this operation") \
-_(EXCEEDED_NUMBER_OF_RANGES_CAPACITY, -95, "Operation would exceed configured capacity of ranges") \
-_(EXCEEDED_NUMBER_OF_PORTS_CAPACITY, -96, "Operation would exceed capacity of number of ports") \
-_(INVALID_ADDRESS_FAMILY, -97, "Invalid address family")                \
-_(INVALID_SUB_SW_IF_INDEX, -98, "Invalid sub-interface sw_if_index")    \
-_(TABLE_TOO_BIG, -99, "Table too big")                                  \
-_(CANNOT_ENABLE_DISABLE_FEATURE, -100, "Cannot enable/disable feature") \
-_(BFD_EEXIST, -101, "Duplicate BFD session") \
-_(BFD_NOENT, -102, "No such BFD session")
-
-typedef enum
-{
-#define _(a,b,c) VNET_API_ERROR_##a = (b),
-  foreach_vnet_api_error
-#undef _
-    VNET_API_N_ERROR,
-} vnet_api_error_t;
-
-#endif /* included_vnet_api_errno_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/bfd/bfd.api b/vnet/vnet/bfd/bfd.api
deleted file mode 100644
index 5798ee69..00000000
--- a/vnet/vnet/bfd/bfd.api
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \brief Configure BFD feature
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param slow_timer - slow timer (seconds)
-    @param min_tx - desired min tx interval
-    @param min_rx - desired min rx interval
-    @param detect_mult - desired detection multiplier
-*/
-define bfd_set_config {
-  u32 client_index;
-  u32 context;
-  u32 slow_timer;
-  u32 min_tx;
-  u32 min_rx;
-  u8 detect_mult;
-};
-
-/** \brief Configure BFD feature response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define bfd_set_config_reply {
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Get BFD configuration
-*/
-define bfd_get_config {
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Get BFD configuration response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-    @param slow_timer - slow timer (seconds)
-    @param min_tx - desired min tx interval
-    @param min_rx - desired min rx interval
-    @param detect_mult - desired detection multiplier
-*/
-define bfd_get_config_reply {
-  u32 client_index;
-  u32 context;
-  u32 slow_timer;
-  u32 min_tx;
-  u32 min_rx;
-  u8 detect_mult;
-};
-
-/** \brief Add UDP BFD session on interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - sw index of the interface
-    @param desired_min_tx - desired min transmit interval (microseconds)
-    @param required_min_rx - required min receive interval (microseconds)
-    @param detect_mult - detect multiplier (# of packets missed between connection goes down)
-    @param local_addr - local address
-    @param peer_addr - peer address
-    @param is_ipv6 - local_addr, peer_addr are IPv6 if non-zero, otherwise IPv4
-*/
-define bfd_udp_add {
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u32 desired_min_tx;
-  u32 required_min_rx;
-  u8 local_addr[16];
-  u8 peer_addr[16];
-  u8 is_ipv6;
-  u8 detect_mult;
-};
-
-/** \brief Add UDP BFD session response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-    @param bs_index - index of the session created
-*/
-define bfd_udp_add_reply {
-  u32 context;
-  i32 retval;
-  u32 bs_index;
-};
-
-/** \brief Delete UDP BFD session on interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - sw index of the interface
-    @param local_addr - local address
-    @param peer_addr - peer address
-    @param is_ipv6 - local_addr, peer_addr are IPv6 if non-zero, otherwise IPv4
-*/
-define bfd_udp_del {
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 local_addr[16];
-  u8 peer_addr[16];
-  u8 is_ipv6;
-};
-
-/** \brief Delete UDP BFD session response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define bfd_udp_del_reply {
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Get all BFD sessions
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define bfd_udp_session_dump {
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief BFD session details structure
-    @param context - sender context, to match reply w/ request
-    @param bs_index - index of the session
-    @param sw_if_index - sw index of the interface
-    @param local_addr - local address
-    @param peer_addr - peer address
-    @param is_ipv6 - local_addr, peer_addr are IPv6 if non-zero, otherwise IPv4
-    @param state - session state
-*/
-define bfd_udp_session_details {
-  u32 context;
-  u32 bs_index; 
-  u32 sw_if_index;
-  u8 local_addr[16];
-  u8 peer_addr[16];
-  u8 is_ipv6;
-  u8 state;
-};
-
-/** \brief Set flags of BFD session
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param bs_index - index of the bfd session to set flags on
-    @param admin_up_down - set the admin state, 1 = up, 0 = down
-*/
-define bfd_session_set_flags {
-  u32 client_index;
-  u32 context;
-  u32 bs_index;
-  u8 admin_up_down;
-};
-
-/** \brief Reply to bfd_session_set_flags 
-    @param context - sender context which was passed in the request
-    @param retval - return code of the set flags request
-*/
-define bfd_session_set_flags_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Register for BFD events
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param enable_disable - 1 => register for events, 0 => cancel registration
-    @param pid - sender's pid
-*/
-define want_bfd_events
-{
-  u32 client_index;
-  u32 context;
-  u32 enable_disable;
-  u32 pid;
-};
-
-/** \brief Reply for BFD events registration
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define want_bfd_events_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/bfd/bfd_api.c b/vnet/vnet/bfd/bfd_api.c
deleted file mode 100644
index 126cf29a..00000000
--- a/vnet/vnet/bfd/bfd_api.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- *------------------------------------------------------------------
- * bfd_api.c - bfd api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/bfd/bfd_main.h>
-#include <vnet/bfd/bfd_api.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                             \
-_(BFD_UDP_ADD, bfd_udp_add)                             \
-_(BFD_UDP_DEL, bfd_udp_del)                             \
-_(BFD_UDP_SESSION_DUMP, bfd_udp_session_dump)           \
-_(BFD_SESSION_SET_FLAGS, bfd_session_set_flags)         \
-_(WANT_BFD_EVENTS, want_bfd_events)
-
-pub_sub_handler (bfd_events, BFD_EVENTS);
-
-static void
-vl_api_bfd_udp_add_t_handler (vl_api_bfd_udp_add_t * mp)
-{
-  vl_api_bfd_udp_add_reply_t *rmp;
-  int rv;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  ip46_address_t local_addr;
-  memset (&local_addr, 0, sizeof (local_addr));
-  ip46_address_t peer_addr;
-  memset (&peer_addr, 0, sizeof (peer_addr));
-  if (mp->is_ipv6)
-    {
-      clib_memcpy (&local_addr.ip6, mp->local_addr, sizeof (local_addr.ip6));
-      clib_memcpy (&peer_addr.ip6, mp->peer_addr, sizeof (peer_addr.ip6));
-    }
-  else
-    {
-      clib_memcpy (&local_addr.ip4, mp->local_addr, sizeof (local_addr.ip4));
-      clib_memcpy (&peer_addr.ip4, mp->peer_addr, sizeof (peer_addr.ip4));
-    }
-
-  rv = bfd_udp_add_session (clib_net_to_host_u32 (mp->sw_if_index),
-			    clib_net_to_host_u32 (mp->desired_min_tx),
-			    clib_net_to_host_u32 (mp->required_min_rx),
-			    mp->detect_mult, &local_addr, &peer_addr);
-
-  BAD_SW_IF_INDEX_LABEL;
-  REPLY_MACRO (VL_API_BFD_UDP_ADD_REPLY);
-}
-
-static void
-vl_api_bfd_udp_del_t_handler (vl_api_bfd_udp_del_t * mp)
-{
-  vl_api_bfd_udp_del_reply_t *rmp;
-  int rv;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  ip46_address_t local_addr;
-  memset (&local_addr, 0, sizeof (local_addr));
-  ip46_address_t peer_addr;
-  memset (&peer_addr, 0, sizeof (peer_addr));
-  if (mp->is_ipv6)
-    {
-      clib_memcpy (&local_addr.ip6, mp->local_addr, sizeof (local_addr.ip6));
-      clib_memcpy (&peer_addr.ip6, mp->peer_addr, sizeof (peer_addr.ip6));
-    }
-  else
-    {
-      clib_memcpy (&local_addr.ip4, mp->local_addr, sizeof (local_addr.ip4));
-      clib_memcpy (&peer_addr.ip4, mp->peer_addr, sizeof (peer_addr.ip4));
-    }
-
-  rv =
-    bfd_udp_del_session (clib_net_to_host_u32 (mp->sw_if_index), &local_addr,
-			 &peer_addr);
-
-  BAD_SW_IF_INDEX_LABEL;
-  REPLY_MACRO (VL_API_BFD_UDP_DEL_REPLY);
-}
-
-void
-send_bfd_udp_session_details (unix_shared_memory_queue_t * q, u32 context,
-			      bfd_session_t * bs)
-{
-  if (bs->transport != BFD_TRANSPORT_UDP4 &&
-      bs->transport != BFD_TRANSPORT_UDP6)
-    {
-      return;
-    }
-
-  vl_api_bfd_udp_session_details_t *mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_BFD_UDP_SESSION_DETAILS);
-  mp->context = context;
-  mp->bs_index = clib_host_to_net_u32 (bs->bs_idx);
-  mp->state = bs->local_state;
-  bfd_udp_session_t *bus = &bs->udp;
-  bfd_udp_key_t *key = &bus->key;
-  mp->sw_if_index = clib_host_to_net_u32 (key->sw_if_index);
-  mp->is_ipv6 = !(ip46_address_is_ip4 (&key->local_addr));
-  if (mp->is_ipv6)
-    {
-      clib_memcpy (mp->local_addr, &key->local_addr,
-		   sizeof (key->local_addr));
-      clib_memcpy (mp->peer_addr, &key->peer_addr, sizeof (key->peer_addr));
-    }
-  else
-    {
-      clib_memcpy (mp->local_addr, key->local_addr.ip4.data,
-		   sizeof (key->local_addr.ip4.data));
-      clib_memcpy (mp->peer_addr, key->peer_addr.ip4.data,
-		   sizeof (key->peer_addr.ip4.data));
-    }
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-void
-bfd_event (bfd_main_t * bm, bfd_session_t * bs)
-{
-  vpe_api_main_t *vam = &vpe_api_main;
-  vpe_client_registration_t *reg;
-  unix_shared_memory_queue_t *q;
-  /* *INDENT-OFF* */
-  pool_foreach (reg, vam->bfd_events_registrations, ({
-                  q = vl_api_client_index_to_input_queue (reg->client_index);
-                  if (q)
-                    {
-                      switch (bs->transport)
-                        {
-                        case BFD_TRANSPORT_UDP4:
-                        /* fallthrough */
-                        case BFD_TRANSPORT_UDP6:
-                          send_bfd_udp_session_details (q, 0, bs);
-                        }
-                    }
-                }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_bfd_udp_session_dump_t_handler (vl_api_bfd_udp_session_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-
-  if (q == 0)
-    return;
-
-  bfd_session_t *bs = NULL;
-  /* *INDENT-OFF* */
-  pool_foreach (bs, bfd_main.sessions, ({
-                  if (bs->transport == BFD_TRANSPORT_UDP4 ||
-                      bs->transport == BFD_TRANSPORT_UDP6)
-                    send_bfd_udp_session_details (q, mp->context, bs);
-                }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_bfd_session_set_flags_t_handler (vl_api_bfd_session_set_flags_t * mp)
-{
-  vl_api_bfd_session_set_flags_reply_t *rmp;
-  int rv;
-
-  rv =
-    bfd_session_set_flags (clib_net_to_host_u32 (mp->bs_index),
-			   mp->admin_up_down);
-
-  REPLY_MACRO (VL_API_BFD_SESSION_SET_FLAGS_REPLY);
-}
-
-
-/*
- * bfd_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_bfd;
-#undef _
-}
-
-static clib_error_t *
-bfd_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (bfd_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/bfd/bfd_api.h b/vnet/vnet/bfd/bfd_api.h
deleted file mode 100644
index cfcd04f3..00000000
--- a/vnet/vnet/bfd/bfd_api.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief BFD global declarations
- */
-#ifndef __included_bfd_api_h__
-#define __included_bfd_api_h__
-
-#include <vnet/api_errno.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vnet/bfd/bfd_udp.h>
-
-vnet_api_error_t bfd_udp_add_session (u32 sw_if_index, u32 desired_min_tx_us,
-				      u32 required_min_rx_us, u8 detect_mult,
-				      const ip46_address_t * local_addr,
-				      const ip46_address_t * peer_addr);
-
-vnet_api_error_t bfd_udp_del_session (u32 sw_if_index,
-				      const ip46_address_t * local_addr,
-				      const ip46_address_t * peer_addr);
-
-vnet_api_error_t bfd_session_set_flags (u32 bs_index, u8 admin_up_down);
-
-#endif /* __included_bfd_api_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/bfd/bfd_debug.h b/vnet/vnet/bfd/bfd_debug.h
deleted file mode 100644
index 707ebab2..00000000
--- a/vnet/vnet/bfd/bfd_debug.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief BFD global declarations
- */
-#ifndef __included_bfd_debug_h__
-#define __included_bfd_debug_h__
-
-/* controls debug prints */
-#define BFD_DEBUG (0)
-
-#if BFD_DEBUG
-#define BFD_DEBUG_FILE_DEF            \
-  static const char *__file = NULL;   \
-  {                                   \
-    __file = strrchr (__FILE__, '/'); \
-    if (__file)                       \
-      {                               \
-        ++__file;                     \
-      }                               \
-    else                              \
-      {                               \
-        __file = __FILE__;            \
-      }                               \
-  }
-
-#define BFD_DBG(fmt, ...)                                                \
-  do                                                                     \
-    {                                                                    \
-      BFD_DEBUG_FILE_DEF                                                 \
-      static u8 *_s = NULL;                                              \
-      vlib_main_t *vm = vlib_get_main ();                                \
-      _s = format (_s, "%6.02f:DBG:%s:%d:%s():" fmt, vlib_time_now (vm), \
-                   __file, __LINE__, __func__, ##__VA_ARGS__);           \
-      printf ("%.*s\n", vec_len (_s), _s);                               \
-      vec_reset_length (_s);                                             \
-    }                                                                    \
-  while (0);
-
-#define BFD_ERR(fmt, ...)                                                \
-  do                                                                     \
-    {                                                                    \
-      BFD_DEBUG_FILE_DEF                                                 \
-      static u8 *_s = NULL;                                              \
-      vlib_main_t *vm = vlib_get_main ();                                \
-      _s = format (_s, "%6.02f:ERR:%s:%d:%s():" fmt, vlib_time_now (vm), \
-                   __file, __LINE__, __func__, ##__VA_ARGS__);           \
-      printf ("%.*s\n", vec_len (_s), _s);                               \
-      vec_reset_length (_s);                                             \
-    }                                                                    \
-  while (0);
-
-#else
-#define BFD_DBG(...)
-#define BFD_ERR(...)
-#endif
-
-#endif /* __included_bfd_debug_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/bfd/bfd_doc.md b/vnet/vnet/bfd/bfd_doc.md
deleted file mode 100644
index 1333ed77..00000000
--- a/vnet/vnet/bfd/bfd_doc.md
+++ /dev/null
@@ -1 +0,0 @@
-TODO
diff --git a/vnet/vnet/bfd/bfd_main.c b/vnet/vnet/bfd/bfd_main.c
deleted file mode 100644
index e25eadfc..00000000
--- a/vnet/vnet/bfd/bfd_main.c
+++ /dev/null
@@ -1,969 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief BFD nodes implementation
- */
-
-#include <vppinfra/random.h>
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/bfd/bfd_debug.h>
-#include <vnet/bfd/bfd_protocol.h>
-#include <vnet/bfd/bfd_main.h>
-
-static u64
-bfd_us_to_clocks (bfd_main_t * bm, u64 us)
-{
-  return bm->cpu_cps * ((f64) us / USEC_PER_SECOND);
-}
-
-static vlib_node_registration_t bfd_process_node;
-
-typedef enum
-{
-#define F(t, n) BFD_OUTPUT_##t,
-  foreach_bfd_transport (F)
-#undef F
-    BFD_OUTPUT_N_NEXT,
-} bfd_output_next_t;
-
-static u32 bfd_next_index_by_transport[] = {
-#define F(t, n) [BFD_TRANSPORT_##t] = BFD_OUTPUT_##t,
-  foreach_bfd_transport (F)
-#undef F
-};
-
-/*
- * We actually send all bfd pkts to the "error" node after scanning
- * them, so the graph node has only one next-index. The "error-drop"
- * node automatically bumps our per-node packet counters for us.
- */
-typedef enum
-{
-  BFD_INPUT_NEXT_NORMAL,
-  BFD_INPUT_N_NEXT,
-} bfd_input_next_t;
-
-static void bfd_on_state_change (bfd_main_t * bm, bfd_session_t * bs, u64 now,
-				 int handling_wakeup);
-
-static void
-bfd_set_defaults (bfd_main_t * bm, bfd_session_t * bs)
-{
-  bs->local_state = BFD_STATE_down;
-  bs->local_diag = BFD_DIAG_CODE_no_diag;
-  bs->remote_state = BFD_STATE_down;
-  bs->local_demand = 0;
-  bs->remote_discr = 0;
-  bs->desired_min_tx_us = BFD_DEFAULT_DESIRED_MIN_TX_US;
-  bs->desired_min_tx_clocks = bfd_us_to_clocks (bm, bs->desired_min_tx_us);
-  bs->remote_min_rx_us = 1;
-  bs->remote_demand = 0;
-}
-
-static void
-bfd_set_diag (bfd_session_t * bs, bfd_diag_code_e code)
-{
-  if (bs->local_diag != code)
-    {
-      BFD_DBG ("set local_diag, bs_idx=%d: '%d:%s'", bs->bs_idx, code,
-	       bfd_diag_code_string (code));
-      bs->local_diag = code;
-    }
-}
-
-static void
-bfd_set_state (bfd_main_t * bm, bfd_session_t * bs,
-	       bfd_state_e new_state, int handling_wakeup)
-{
-  if (bs->local_state != new_state)
-    {
-      BFD_DBG ("Change state, bs_idx=%d: %s->%s", bs->bs_idx,
-	       bfd_state_string (bs->local_state),
-	       bfd_state_string (new_state));
-      bs->local_state = new_state;
-      bfd_on_state_change (bm, bs, clib_cpu_time_now (), handling_wakeup);
-    }
-}
-
-static void
-bfd_recalc_tx_interval (bfd_main_t * bm, bfd_session_t * bs)
-{
-  if (!bs->local_demand)
-    {
-      bs->transmit_interval_clocks =
-	clib_max (bs->desired_min_tx_clocks, bs->remote_min_rx_clocks);
-    }
-  else
-    {
-      /* TODO */
-    }
-  BFD_DBG ("Recalculated transmit interval %lu clocks/%.2fs",
-	   bs->transmit_interval_clocks,
-	   bs->transmit_interval_clocks / bm->cpu_cps);
-}
-
-static void
-bfd_calc_next_tx (bfd_main_t * bm, bfd_session_t * bs, u64 now)
-{
-  if (!bs->local_demand)
-    {
-      if (bs->local_detect_mult > 1)
-	{
-	  /* common case - 75-100% of transmit interval */
-	  bs->tx_timeout_clocks = now +
-	    (1 - .25 * (random_f64 (&bm->random_seed))) *
-	    bs->transmit_interval_clocks;
-	  if (bs->tx_timeout_clocks < now)
-	    {
-	      /* huh, we've missed it already, skip the missed events */
-	      const u64 missed =
-		(now - bs->tx_timeout_clocks) / bs->transmit_interval_clocks;
-	      BFD_ERR ("Missed %lu transmit events (now is %lu, calc "
-		       "tx_timeout is %lu)!",
-		       missed, now, bs->tx_timeout_clocks);
-	      bs->tx_timeout_clocks +=
-		(missed + 1) * bs->transmit_interval_clocks;
-	    }
-	}
-      else
-	{
-	  /* special case - 75-90% of transmit interval */
-	  bs->tx_timeout_clocks =
-	    now +
-	    (.9 - .15 * (random_f64 (&bm->random_seed))) *
-	    bs->transmit_interval_clocks;
-	  if (bs->tx_timeout_clocks < now)
-	    {
-	      /* huh, we've missed it already, skip the missed events */
-	      const u64 missed =
-		(now - bs->tx_timeout_clocks) / bs->transmit_interval_clocks;
-	      BFD_ERR ("Missed %lu transmit events (now is %lu, calc "
-		       "tx_timeout is %lu)!",
-		       missed, now, bs->tx_timeout_clocks);
-	      bs->tx_timeout_clocks +=
-		(missed + 1) * bs->transmit_interval_clocks;
-	    }
-	}
-    }
-  else
-    {
-      /* TODO */
-    }
-  if (bs->tx_timeout_clocks)
-    {
-      BFD_DBG ("Next transmit in %lu clocks/%.02fs@%lu",
-	       bs->tx_timeout_clocks - now,
-	       (bs->tx_timeout_clocks - now) / bm->cpu_cps,
-	       bs->tx_timeout_clocks);
-    }
-}
-
-static void
-bfd_recalc_detection_time (bfd_main_t * bm, bfd_session_t * bs)
-{
-  if (!bs->local_demand)
-    {
-      bs->detection_time_clocks =
-	bs->remote_detect_mult *
-	bfd_us_to_clocks (bm, clib_max (bs->required_min_rx_us,
-					bs->remote_desired_min_tx_us));
-    }
-  else
-    {
-      bs->detection_time_clocks =
-	bs->local_detect_mult *
-	bfd_us_to_clocks (bm,
-			  clib_max (bs->desired_min_tx_us,
-				    bs->remote_min_rx_us));
-    }
-  BFD_DBG ("Recalculated detection time %lu clocks/%.2fs",
-	   bs->detection_time_clocks,
-	   bs->detection_time_clocks / bm->cpu_cps);
-}
-
-static void
-bfd_set_timer (bfd_main_t * bm, bfd_session_t * bs, u64 now,
-	       int handling_wakeup)
-{
-  u64 next = 0;
-  u64 rx_timeout = 0;
-  if (BFD_STATE_up == bs->local_state)
-    {
-      rx_timeout = bs->last_rx_clocks + bs->detection_time_clocks;
-    }
-  if (bs->tx_timeout_clocks && rx_timeout)
-    {
-      next = clib_min (bs->tx_timeout_clocks, rx_timeout);
-    }
-  else if (bs->tx_timeout_clocks)
-    {
-      next = bs->tx_timeout_clocks;
-    }
-  else if (rx_timeout)
-    {
-      next = rx_timeout;
-    }
-  BFD_DBG ("bs_idx=%u, tx_timeout=%lu, rx_timeout=%lu, next=%s", bs->bs_idx,
-	   bs->tx_timeout_clocks, rx_timeout,
-	   next == bs->tx_timeout_clocks ? "tx" : "rx");
-  /* sometimes the wheel expires an event a bit sooner than requested, account
-     for that here */
-  if (next && (now + bm->wheel_inaccuracy > bs->wheel_time_clocks ||
-	       next < bs->wheel_time_clocks || !bs->wheel_time_clocks))
-    {
-      bs->wheel_time_clocks = next;
-      BFD_DBG ("timing_wheel_insert(%p, %lu (%ld clocks/%.2fs in the "
-	       "future), %u);",
-	       &bm->wheel, bs->wheel_time_clocks,
-	       (i64) bs->wheel_time_clocks - clib_cpu_time_now (),
-	       (i64) (bs->wheel_time_clocks - clib_cpu_time_now ()) /
-	       bm->cpu_cps, bs->bs_idx);
-      timing_wheel_insert (&bm->wheel, bs->wheel_time_clocks, bs->bs_idx);
-      if (!handling_wakeup)
-	{
-	  vlib_process_signal_event (bm->vlib_main,
-				     bm->bfd_process_node_index,
-				     BFD_EVENT_RESCHEDULE, bs->bs_idx);
-	}
-    }
-}
-
-static void
-bfd_set_desired_min_tx (bfd_main_t * bm, bfd_session_t * bs, u64 now,
-			u32 desired_min_tx_us, int handling_wakeup)
-{
-  bs->desired_min_tx_us = desired_min_tx_us;
-  bs->desired_min_tx_clocks = bfd_us_to_clocks (bm, bs->desired_min_tx_us);
-  BFD_DBG ("Set desired min tx to %uus/%lu clocks/%.2fs",
-	   bs->desired_min_tx_us, bs->desired_min_tx_clocks,
-	   bs->desired_min_tx_clocks / bm->cpu_cps);
-  bfd_recalc_detection_time (bm, bs);
-  bfd_recalc_tx_interval (bm, bs);
-  bfd_calc_next_tx (bm, bs, now);
-  bfd_set_timer (bm, bs, now, handling_wakeup);
-}
-
-static void
-bfd_set_remote_required_min_rx (bfd_main_t * bm, bfd_session_t * bs,
-				u64 now,
-				u32 remote_required_min_rx_us,
-				int handling_wakeup)
-{
-  bs->remote_min_rx_us = remote_required_min_rx_us;
-  bs->remote_min_rx_clocks = bfd_us_to_clocks (bm, bs->remote_min_rx_us);
-  BFD_DBG ("Set remote min rx to %uus/%lu clocks/%.2fs", bs->remote_min_rx_us,
-	   bs->remote_min_rx_clocks, bs->remote_min_rx_clocks / bm->cpu_cps);
-  bfd_recalc_detection_time (bm, bs);
-  bfd_recalc_tx_interval (bm, bs);
-  bfd_calc_next_tx (bm, bs, now);
-  bfd_set_timer (bm, bs, now, handling_wakeup);
-}
-
-void
-bfd_session_start (bfd_main_t * bm, bfd_session_t * bs)
-{
-  BFD_DBG ("%U", format_bfd_session, bs);
-  bfd_recalc_tx_interval (bm, bs);
-  vlib_process_signal_event (bm->vlib_main, bm->bfd_process_node_index,
-			     BFD_EVENT_NEW_SESSION, bs->bs_idx);
-}
-
-vnet_api_error_t
-bfd_del_session (uword bs_idx)
-{
-  const bfd_main_t *bm = &bfd_main;
-  if (!pool_is_free_index (bm->sessions, bs_idx))
-    {
-      bfd_session_t *bs = pool_elt_at_index (bm->sessions, bs_idx);
-      pool_put (bm->sessions, bs);
-      return 0;
-    }
-  else
-    {
-      BFD_ERR ("no such session");
-      return VNET_API_ERROR_BFD_NOENT;
-    }
-  return 0;
-}
-
-const char *
-bfd_diag_code_string (bfd_diag_code_e diag)
-{
-#define F(n, t, s)             \
-  case BFD_DIAG_CODE_NAME (t): \
-    return s;
-  switch (diag)
-    {
-    foreach_bfd_diag_code (F)}
-  return "UNKNOWN";
-#undef F
-}
-
-const char *
-bfd_state_string (bfd_state_e state)
-{
-#define F(n, t, s)         \
-  case BFD_STATE_NAME (t): \
-    return s;
-  switch (state)
-    {
-    foreach_bfd_state (F)}
-  return "UNKNOWN";
-#undef F
-}
-
-vnet_api_error_t
-bfd_session_set_flags (u32 bs_idx, u8 admin_up_down)
-{
-  bfd_main_t *bm = &bfd_main;
-  if (pool_is_free_index (bm->sessions, bs_idx))
-    {
-      BFD_ERR ("invalid bs_idx=%u", bs_idx);
-      return VNET_API_ERROR_BFD_NOENT;
-    }
-  bfd_session_t *bs = pool_elt_at_index (bm->sessions, bs_idx);
-  if (admin_up_down)
-    {
-      bfd_set_state (bm, bs, BFD_STATE_down, 0);
-    }
-  else
-    {
-      bfd_set_diag (bs, BFD_DIAG_CODE_neighbor_sig_down);
-      bfd_set_state (bm, bs, BFD_STATE_admin_down, 0);
-    }
-  return 0;
-}
-
-u8 *
-bfd_input_format_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  const bfd_input_trace_t *t = va_arg (*args, bfd_input_trace_t *);
-  const bfd_pkt_t *pkt = (bfd_pkt_t *) t->data;
-  if (t->len > STRUCT_SIZE_OF (bfd_pkt_t, head))
-    {
-      s = format (s, "BFD v%u, diag=%u(%s), state=%u(%s),\n"
-		  "    flags=(P:%u, F:%u, C:%u, A:%u, D:%u, M:%u), detect_mult=%u, "
-		  "length=%u\n",
-		  bfd_pkt_get_version (pkt), bfd_pkt_get_diag_code (pkt),
-		  bfd_diag_code_string (bfd_pkt_get_diag_code (pkt)),
-		  bfd_pkt_get_state (pkt),
-		  bfd_state_string (bfd_pkt_get_state (pkt)),
-		  bfd_pkt_get_poll (pkt), bfd_pkt_get_final (pkt),
-		  bfd_pkt_get_control_plane_independent (pkt),
-		  bfd_pkt_get_auth_present (pkt), bfd_pkt_get_demand (pkt),
-		  bfd_pkt_get_multipoint (pkt), pkt->head.detect_mult,
-		  pkt->head.length);
-      if (t->len >= sizeof (bfd_pkt_t)
-	  && pkt->head.length >= sizeof (bfd_pkt_t))
-	{
-	  s = format (s, "    my discriminator: %u\n", pkt->my_disc);
-	  s = format (s, "    your discriminator: %u\n", pkt->your_disc);
-	  s = format (s, "    desired min tx interval: %u\n",
-		      clib_net_to_host_u32 (pkt->des_min_tx));
-	  s = format (s, "    required min rx interval: %u\n",
-		      clib_net_to_host_u32 (pkt->req_min_rx));
-	  s = format (s, "    required min echo rx interval: %u\n",
-		      clib_net_to_host_u32 (pkt->req_min_echo_rx));
-	}
-    }
-
-  return s;
-}
-
-static void
-bfd_on_state_change (bfd_main_t * bm, bfd_session_t * bs, u64 now,
-		     int handling_wakeup)
-{
-  BFD_DBG ("State changed: %U", format_bfd_session, bs);
-  bfd_event (bm, bs);
-  switch (bs->local_state)
-    {
-    case BFD_STATE_admin_down:
-      bfd_set_desired_min_tx (bm, bs, now,
-			      clib_max (bs->config_desired_min_tx_us,
-					BFD_DEFAULT_DESIRED_MIN_TX_US),
-			      handling_wakeup);
-      break;
-    case BFD_STATE_down:
-      bfd_set_desired_min_tx (bm, bs, now,
-			      clib_max (bs->config_desired_min_tx_us,
-					BFD_DEFAULT_DESIRED_MIN_TX_US),
-			      handling_wakeup);
-      break;
-    case BFD_STATE_init:
-      bfd_set_desired_min_tx (bm, bs, now,
-			      clib_max (bs->config_desired_min_tx_us,
-					BFD_DEFAULT_DESIRED_MIN_TX_US),
-			      handling_wakeup);
-      break;
-    case BFD_STATE_up:
-      bfd_set_desired_min_tx (bm, bs, now, bs->config_desired_min_tx_us,
-			      handling_wakeup);
-      break;
-    }
-}
-
-static void
-bfd_add_transport_layer (vlib_main_t * vm, vlib_buffer_t * b,
-			 bfd_session_t * bs)
-{
-  switch (bs->transport)
-    {
-    case BFD_TRANSPORT_UDP4:
-      /* fallthrough */
-    case BFD_TRANSPORT_UDP6:
-      BFD_DBG ("Transport bfd via udp, bs_idx=%u", bs->bs_idx);
-      bfd_add_udp_transport (vm, b, &bs->udp);
-      break;
-    }
-}
-
-static vlib_buffer_t *
-bfd_create_frame (vlib_main_t * vm, vlib_node_runtime_t * rt,
-		  bfd_session_t * bs)
-{
-  u32 bi;
-  if (vlib_buffer_alloc (vm, &bi, 1) != 1)
-    {
-      clib_warning ("buffer allocation failure");
-      return NULL;
-    }
-
-  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
-  ASSERT (b->current_data == 0);
-
-  u32 *to_next;
-  u32 n_left_to_next;
-
-  vlib_get_next_frame (vm, rt, bfd_next_index_by_transport[bs->transport],
-		       to_next, n_left_to_next);
-
-  to_next[0] = bi;
-  n_left_to_next -= 1;
-
-  vlib_put_next_frame (vm, rt, bfd_next_index_by_transport[bs->transport],
-		       n_left_to_next);
-  return b;
-}
-
-static void
-bfd_init_control_frame (vlib_buffer_t * b, bfd_session_t * bs)
-{
-  bfd_pkt_t *pkt = vlib_buffer_get_current (b);
-  const u32 bfd_length = 24;
-  memset (pkt, 0, sizeof (*pkt));
-
-  bfd_pkt_set_version (pkt, 1);
-  bfd_pkt_set_diag_code (pkt, bs->local_diag);
-  bfd_pkt_set_state (pkt, bs->local_state);
-  if (bs->local_demand && BFD_STATE_up == bs->local_state &&
-      BFD_STATE_up == bs->remote_state)
-    {
-      bfd_pkt_set_demand (pkt);
-    }
-  pkt->head.detect_mult = bs->local_detect_mult;
-  pkt->head.length = clib_host_to_net_u32 (bfd_length);
-  pkt->my_disc = bs->local_discr;
-  pkt->your_disc = bs->remote_discr;
-  pkt->des_min_tx = clib_host_to_net_u32 (bs->desired_min_tx_us);
-  pkt->req_min_rx = clib_host_to_net_u32 (bs->required_min_rx_us);
-  pkt->req_min_echo_rx = clib_host_to_net_u32 (0);	/* FIXME */
-  b->current_length = bfd_length;
-}
-
-static void
-bfd_send_periodic (vlib_main_t * vm, vlib_node_runtime_t * rt,
-		   bfd_main_t * bm, bfd_session_t * bs, u64 now,
-		   int handling_wakeup)
-{
-  if (!bs->remote_min_rx_us)
-    {
-      BFD_DBG
-	("bfd.RemoteMinRxInterval is zero, not sending periodic control "
-	 "frame");
-      return;
-    }
-  /* FIXME
-     A system MUST NOT periodically transmit BFD Control packets if Demand
-     mode is active on the remote system (bfd.RemoteDemandMode is 1,
-     bfd.SessionState is Up, and bfd.RemoteSessionState is Up) and a Poll
-     Sequence is not being transmitted.
-   */
-  /* sometimes the wheel expires an event a bit sooner than requested, account
-     for that here */
-  if (now + bm->wheel_inaccuracy >= bs->tx_timeout_clocks)
-    {
-      BFD_DBG ("Send periodic control frame for bs_idx=%lu", bs->bs_idx);
-      vlib_buffer_t *b = bfd_create_frame (vm, rt, bs);
-      if (!b)
-	{
-	  return;
-	}
-      bfd_init_control_frame (b, bs);
-      bfd_add_transport_layer (vm, b, bs);
-      bfd_calc_next_tx (bm, bs, now);
-    }
-  else
-    {
-      BFD_DBG
-	("No need to send control frame now, now is %lu, tx_timeout is %lu",
-	 now, bs->tx_timeout_clocks);
-    }
-  bfd_set_timer (bm, bs, now, handling_wakeup);
-}
-
-void
-bfd_send_final (vlib_main_t * vm, vlib_buffer_t * b, bfd_session_t * bs)
-{
-  BFD_DBG ("Send final control frame for bs_idx=%lu", bs->bs_idx);
-  bfd_init_control_frame (b, bs);
-  bfd_pkt_set_final (vlib_buffer_get_current (b));
-  bfd_add_transport_layer (vm, b, bs);
-}
-
-static void
-bfd_check_rx_timeout (bfd_main_t * bm, bfd_session_t * bs, u64 now,
-		      int handling_wakeup)
-{
-  /* sometimes the wheel expires an event a bit sooner than requested, account
-     for that here */
-  if (bs->last_rx_clocks + bs->detection_time_clocks <=
-      now + bm->wheel_inaccuracy)
-    {
-      BFD_DBG ("Rx timeout, session goes down");
-      bfd_set_diag (bs, BFD_DIAG_CODE_det_time_exp);
-      bfd_set_state (bm, bs, BFD_STATE_down, handling_wakeup);
-    }
-}
-
-void
-bfd_on_timeout (vlib_main_t * vm, vlib_node_runtime_t * rt, bfd_main_t * bm,
-		bfd_session_t * bs, u64 now)
-{
-  BFD_DBG ("Timeout for bs_idx=%lu", bs->bs_idx);
-  switch (bs->local_state)
-    {
-    case BFD_STATE_admin_down:
-      BFD_ERR ("Unexpected timeout when in %s state",
-	       bfd_state_string (bs->local_state));
-      abort ();
-      break;
-    case BFD_STATE_down:
-      bfd_send_periodic (vm, rt, bm, bs, now, 1);
-      break;
-    case BFD_STATE_init:
-      BFD_ERR ("Unexpected timeout when in %s state",
-	       bfd_state_string (bs->local_state));
-      abort ();
-      break;
-    case BFD_STATE_up:
-      bfd_check_rx_timeout (bm, bs, now, 1);
-      bfd_send_periodic (vm, rt, bm, bs, now, 1);
-      break;
-    }
-}
-
-/*
- * bfd process node function
- */
-static uword
-bfd_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  bfd_main_t *bm = &bfd_main;
-  u32 *expired = 0;
-  uword event_type, *event_data = 0;
-
-  /* So we can send events to the bfd process */
-  bm->bfd_process_node_index = bfd_process_node.index;
-
-  while (1)
-    {
-      u64 now = clib_cpu_time_now ();
-      u64 next_expire = timing_wheel_next_expiring_elt_time (&bm->wheel);
-      BFD_DBG ("timing_wheel_next_expiring_elt_time(%p) returns %lu",
-	       &bm->wheel, next_expire);
-      if ((i64) next_expire < 0)
-	{
-	  BFD_DBG ("wait for event without timeout");
-	  (void) vlib_process_wait_for_event (vm);
-	  event_type = vlib_process_get_events (vm, &event_data);
-	}
-      else
-	{
-	  f64 timeout = ((i64) next_expire - (i64) now) / bm->cpu_cps;
-	  BFD_DBG ("wait for event with timeout %.02f", timeout);
-	  if (timeout < 0)
-	    {
-	      BFD_DBG ("negative timeout, already expired, skipping wait");
-	      event_type = ~0;
-	    }
-	  else
-	    {
-	      (void) vlib_process_wait_for_event_or_clock (vm, timeout);
-	      event_type = vlib_process_get_events (vm, &event_data);
-	    }
-	}
-      now = clib_cpu_time_now ();
-      switch (event_type)
-	{
-	case ~0:		/* no events => timeout */
-	  /* nothing to do here */
-	  break;
-	case BFD_EVENT_RESCHEDULE:
-	  /* nothing to do here - reschedule is done automatically after
-	   * each event or timeout */
-	  break;
-	case BFD_EVENT_NEW_SESSION:
-	  do
-	    {
-	      bfd_session_t *bs =
-		pool_elt_at_index (bm->sessions, *event_data);
-	      bfd_send_periodic (vm, rt, bm, bs, now, 1);
-	    }
-	  while (0);
-	  break;
-	default:
-	  clib_warning ("BUG: event type 0x%wx", event_type);
-	  break;
-	}
-      BFD_DBG ("advancing wheel, now is %lu", now);
-      BFD_DBG ("timing_wheel_advance (%p, %lu, %p, 0);", &bm->wheel, now,
-	       expired);
-      expired = timing_wheel_advance (&bm->wheel, now, expired, 0);
-      BFD_DBG ("Expired %d elements", vec_len (expired));
-      u32 *p = NULL;
-      vec_foreach (p, expired)
-      {
-	const u32 bs_idx = *p;
-	if (!pool_is_free_index (bm->sessions, bs_idx))
-	  {
-	    bfd_session_t *bs = pool_elt_at_index (bm->sessions, bs_idx);
-	    bfd_on_timeout (vm, rt, bm, bs, now);
-	  }
-      }
-      if (expired)
-	{
-	  _vec_len (expired) = 0;
-	}
-      if (event_data)
-	{
-	  _vec_len (event_data) = 0;
-	}
-    }
-
-  return 0;
-}
-
-/*
- * bfd process node declaration
- */
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (bfd_process_node, static) = {
-  .function = bfd_process,
-  .type = VLIB_NODE_TYPE_PROCESS,
-  .name = "bfd-process",
-  .n_next_nodes = BFD_OUTPUT_N_NEXT,
-  .next_nodes =
-      {
-#define F(t, n) [BFD_OUTPUT_##t] = n,
-          foreach_bfd_transport (F)
-#undef F
-      },
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-bfd_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
-{
-  // bfd_main_t *bm = &bfd_main;
-  // vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
-    {
-      /* TODO */
-    }
-  return 0;
-}
-
-VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (bfd_sw_interface_up_down);
-
-static clib_error_t *
-bfd_hw_interface_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
-{
-  // bfd_main_t *bm = &bfd_main;
-  if (flags & VNET_HW_INTERFACE_FLAG_LINK_UP)
-    {
-      /* TODO */
-    }
-  return 0;
-}
-
-VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (bfd_hw_interface_up_down);
-
-/*
- * setup function
- */
-static clib_error_t *
-bfd_main_init (vlib_main_t * vm)
-{
-  bfd_main_t *bm = &bfd_main;
-  bm->random_seed = random_default_seed ();
-  bm->vlib_main = vm;
-  bm->vnet_main = vnet_get_main ();
-  memset (&bm->wheel, 0, sizeof (bm->wheel));
-  bm->cpu_cps = 2590000000;	// vm->clib_time.clocks_per_second;
-  BFD_DBG ("cps is %.2f", bm->cpu_cps);
-  const u64 now = clib_cpu_time_now ();
-  timing_wheel_init (&bm->wheel, now, bm->cpu_cps);
-  bm->wheel_inaccuracy = 2 << bm->wheel.log2_clocks_per_bin;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (bfd_main_init);
-
-bfd_session_t *
-bfd_get_session (bfd_main_t * bm, bfd_transport_t t)
-{
-  bfd_session_t *result;
-  pool_get (bm->sessions, result);
-  memset (result, 0, sizeof (*result));
-  result->bs_idx = result - bm->sessions;
-  result->transport = t;
-  result->local_discr = random_u32 (&bm->random_seed);
-  bfd_set_defaults (bm, result);
-  hash_set (bm->session_by_disc, result->local_discr, result->bs_idx);
-  return result;
-}
-
-void
-bfd_put_session (bfd_main_t * bm, bfd_session_t * bs)
-{
-  hash_unset (bm->session_by_disc, bs->local_discr);
-  pool_put (bm->sessions, bs);
-}
-
-bfd_session_t *
-bfd_find_session_by_idx (bfd_main_t * bm, uword bs_idx)
-{
-  if (!pool_is_free_index (bm->sessions, bs_idx))
-    {
-      return pool_elt_at_index (bm->sessions, bs_idx);
-    }
-  return NULL;
-}
-
-bfd_session_t *
-bfd_find_session_by_disc (bfd_main_t * bm, u32 disc)
-{
-  uword *p = hash_get (bfd_main.session_by_disc, disc);
-  if (p)
-    {
-      return pool_elt_at_index (bfd_main.sessions, *p);
-    }
-  return NULL;
-}
-
-/**
- * @brief verify bfd packet - common checks
- *
- * @param pkt
- *
- * @return 1 if bfd packet is valid
- */
-int
-bfd_verify_pkt_common (const bfd_pkt_t * pkt)
-{
-  if (1 != bfd_pkt_get_version (pkt))
-    {
-      BFD_ERR ("BFD verification failed - unexpected version: '%d'",
-	       bfd_pkt_get_version (pkt));
-      return 0;
-    }
-  if (pkt->head.length < sizeof (bfd_pkt_t) ||
-      (bfd_pkt_get_auth_present (pkt) &&
-       pkt->head.length < sizeof (bfd_pkt_with_auth_t)))
-    {
-      BFD_ERR ("BFD verification failed - unexpected length: '%d' (auth "
-	       "present: %d)",
-	       pkt->head.length, bfd_pkt_get_auth_present (pkt));
-      return 0;
-    }
-  if (!pkt->head.detect_mult)
-    {
-      BFD_ERR ("BFD verification failed - unexpected detect-mult: '%d'",
-	       pkt->head.detect_mult);
-      return 0;
-    }
-  if (bfd_pkt_get_multipoint (pkt))
-    {
-      BFD_ERR ("BFD verification failed - unexpected multipoint: '%d'",
-	       bfd_pkt_get_multipoint (pkt));
-      return 0;
-    }
-  if (!pkt->my_disc)
-    {
-      BFD_ERR ("BFD verification failed - unexpected my-disc: '%d'",
-	       pkt->my_disc);
-      return 0;
-    }
-  if (!pkt->your_disc)
-    {
-      const u8 pkt_state = bfd_pkt_get_state (pkt);
-      if (pkt_state != BFD_STATE_down && pkt_state != BFD_STATE_admin_down)
-	{
-	  BFD_ERR ("BFD verification failed - unexpected state: '%s' "
-		   "(your-disc is zero)", bfd_state_string (pkt_state));
-	  return 0;
-	}
-    }
-  return 1;
-}
-
-/**
- * @brief verify bfd packet - authentication
- *
- * @param pkt
- *
- * @return 1 if bfd packet is valid
- */
-int
-bfd_verify_pkt_session (const bfd_pkt_t * pkt, u16 pkt_size,
-			const bfd_session_t * bs)
-{
-  const bfd_pkt_with_auth_t *with_auth = (bfd_pkt_with_auth_t *) pkt;
-  if (!bfd_pkt_get_auth_present (pkt))
-    {
-      if (pkt_size > sizeof (*pkt))
-	{
-	  BFD_ERR ("BFD verification failed - unexpected packet size '%d' "
-		   "(auth not present)", pkt_size);
-	  return 0;
-	}
-    }
-  else
-    {
-      if (!with_auth->auth.type)
-	{
-	  BFD_ERR ("BFD verification failed - unexpected auth type: '%d'",
-		   with_auth->auth.type);
-	  return 0;
-	}
-      /* TODO FIXME - implement the actual verification */
-    }
-  return 1;
-}
-
-void
-bfd_consume_pkt (bfd_main_t * bm, const bfd_pkt_t * pkt, u32 bs_idx)
-{
-  bfd_session_t *bs = bfd_find_session_by_idx (bm, bs_idx);
-  if (!bs)
-    {
-      return;
-    }
-  BFD_DBG ("Scanning bfd packet, bs_idx=%d", bs->bs_idx);
-  bs->remote_discr = pkt->my_disc;
-  bs->remote_state = bfd_pkt_get_state (pkt);
-  bs->remote_demand = bfd_pkt_get_demand (pkt);
-  u64 now = clib_cpu_time_now ();
-  bs->last_rx_clocks = now;
-  bs->remote_desired_min_tx_us = clib_net_to_host_u32 (pkt->des_min_tx);
-  bs->remote_detect_mult = pkt->head.detect_mult;
-  bfd_set_remote_required_min_rx (bm, bs, now,
-				  clib_net_to_host_u32 (pkt->req_min_rx), 0);
-  /* FIXME
-     If the Required Min Echo RX Interval field is zero, the
-     transmission of Echo packets, if any, MUST cease.
-
-     If a Poll Sequence is being transmitted by the local system and
-     the Final (F) bit in the received packet is set, the Poll Sequence
-     MUST be terminated.
-   */
-  /* FIXME 6.8.2 */
-  /* FIXME 6.8.4 */
-  if (BFD_STATE_admin_down == bs->local_state)
-    return;
-  if (BFD_STATE_admin_down == bs->remote_state)
-    {
-      bfd_set_diag (bs, BFD_DIAG_CODE_neighbor_sig_down);
-      bfd_set_state (bm, bs, BFD_STATE_down, 0);
-    }
-  else if (BFD_STATE_down == bs->local_state)
-    {
-      if (BFD_STATE_down == bs->remote_state)
-	{
-	  bfd_set_state (bm, bs, BFD_STATE_init, 0);
-	}
-      else if (BFD_STATE_init == bs->remote_state)
-	{
-	  bfd_set_state (bm, bs, BFD_STATE_up, 0);
-	}
-    }
-  else if (BFD_STATE_init == bs->local_state)
-    {
-      if (BFD_STATE_up == bs->remote_state ||
-	  BFD_STATE_init == bs->remote_state)
-	{
-	  bfd_set_state (bm, bs, BFD_STATE_up, 0);
-	}
-    }
-  else				/* BFD_STATE_up == bs->local_state */
-    {
-      if (BFD_STATE_down == bs->remote_state)
-	{
-	  bfd_set_diag (bs, BFD_DIAG_CODE_neighbor_sig_down);
-	  bfd_set_state (bm, bs, BFD_STATE_down, 0);
-	}
-    }
-}
-
-u8 *
-format_bfd_session (u8 * s, va_list * args)
-{
-  const bfd_session_t *bs = va_arg (*args, bfd_session_t *);
-  return format (s, "BFD(%u): bfd.SessionState=%s, "
-		 "bfd.RemoteSessionState=%s, "
-		 "bfd.LocalDiscr=%u, "
-		 "bfd.RemoteDiscr=%u, "
-		 "bfd.LocalDiag=%s, "
-		 "bfd.DesiredMinTxInterval=%u, "
-		 "bfd.RequiredMinRxInterval=%u, "
-		 "bfd.RemoteMinRxInterval=%u, "
-		 "bfd.DemandMode=%s, "
-		 "bfd.RemoteDemandMode=%s, "
-		 "bfd.DetectMult=%u, ",
-		 bs->bs_idx, bfd_state_string (bs->local_state),
-		 bfd_state_string (bs->remote_state), bs->local_discr,
-		 bs->remote_discr, bfd_diag_code_string (bs->local_diag),
-		 bs->desired_min_tx_us, bs->required_min_rx_us,
-		 bs->remote_min_rx_us, (bs->local_demand ? "yes" : "no"),
-		 (bs->remote_demand ? "yes" : "no"), bs->local_detect_mult);
-}
-
-bfd_main_t bfd_main;
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/bfd/bfd_main.h b/vnet/vnet/bfd/bfd_main.h
deleted file mode 100644
index c72ea92a..00000000
--- a/vnet/vnet/bfd/bfd_main.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief BFD global declarations
- */
-#ifndef __included_bfd_main_h__
-#define __included_bfd_main_h__
-
-#include <vppinfra/timing_wheel.h>
-#include <vnet/vnet.h>
-#include <vnet/bfd/bfd_protocol.h>
-#include <vnet/bfd/bfd_udp.h>
-
-#define foreach_bfd_transport(F) \
-  F (UDP4, "ip4-rewrite")  \
-  F (UDP6, "ip6-rewrite")
-
-typedef enum
-{
-#define F(t, n) BFD_TRANSPORT_##t,
-  foreach_bfd_transport (F)
-#undef F
-} bfd_transport_t;
-
-#define foreach_bfd_mode(F) \
-  F (asynchronous)          \
-  F (demand)
-
-typedef enum
-{
-#define F(x) BFD_MODE_##x,
-  foreach_bfd_mode (F)
-#undef F
-} bfd_mode_e;
-
-typedef struct
-{
-  /* index in bfd_main.sessions pool */
-  u32 bs_idx;
-
-  /* session state */
-  bfd_state_e local_state;
-
-  /* local diagnostics */
-  bfd_diag_code_e local_diag;
-
-  /* remote session state */
-  bfd_state_e remote_state;
-
-  /* local discriminator */
-  u32 local_discr;
-
-  /* remote discriminator */
-  u32 remote_discr;
-
-  /* configured desired min tx interval (microseconds) */
-  u32 config_desired_min_tx_us;
-
-  /* desired min tx interval (microseconds) */
-  u32 desired_min_tx_us;
-
-  /* desired min tx interval (clocks) */
-  u64 desired_min_tx_clocks;
-
-  /* required min rx interval */
-  u32 required_min_rx_us;
-
-  /* remote min rx interval (microseconds) */
-  u32 remote_min_rx_us;
-
-  /* remote min rx interval (clocks) */
-  u64 remote_min_rx_clocks;
-
-  /* remote desired min tx interval */
-  u32 remote_desired_min_tx_us;
-
-  /* 1 if in demand mode, 0 otherwise */
-  u8 local_demand;
-
-  /* 1 if remote system sets demand mode, 0 otherwise */
-  u8 remote_demand;
-
-  /* local detect multiplier */
-  u8 local_detect_mult;
-
-  /* remote detect multiplier */
-  u8 remote_detect_mult;
-
-  /* set to value of timer in timing wheel, 0 if never set */
-  u64 wheel_time_clocks;
-
-  /* transmit interval */
-  u64 transmit_interval_clocks;
-
-  /* next time at which to transmit a packet */
-  u64 tx_timeout_clocks;
-
-  /* timestamp of last packet received */
-  u64 last_rx_clocks;
-
-  /* detection time */
-  u64 detection_time_clocks;
-
-  /* transport type for this session */
-  bfd_transport_t transport;
-
-  union
-  {
-    bfd_udp_session_t udp;
-  };
-} bfd_session_t;
-
-typedef struct
-{
-  u32 client_index;
-  u32 client_pid;
-} event_subscriber_t;
-
-typedef struct
-{
-  /* pool of bfd sessions context data */
-  bfd_session_t *sessions;
-
-  /* timing wheel for scheduling timeouts */
-  timing_wheel_t wheel;
-
-  /* timing wheel inaccuracy, in clocks */
-  u64 wheel_inaccuracy;
-
-  /* hashmap - bfd session by discriminator */
-  u32 *session_by_disc;
-
-  /* background process node index */
-  u32 bfd_process_node_index;
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-
-  /* cpu clocks per second */
-  f64 cpu_cps;
-
-  /* for generating random numbers */
-  u32 random_seed;
-
-} bfd_main_t;
-
-extern bfd_main_t bfd_main;
-
-/* Packet counters */
-#define foreach_bfd_error(F)               \
-  F (NONE, "good bfd packets (processed)") \
-  F (BAD, "invalid bfd packets")           \
-  F (DISABLED, "bfd packets received on disabled interfaces")
-
-typedef enum
-{
-#define F(sym, str) BFD_ERROR_##sym,
-  foreach_bfd_error (F)
-#undef F
-    BFD_N_ERROR,
-} bfd_error_t;
-
-/* bfd packet trace capture */
-typedef struct
-{
-  u32 len;
-  u8 data[400];
-} bfd_input_trace_t;
-
-enum
-{
-  BFD_EVENT_RESCHEDULE = 1,
-  BFD_EVENT_NEW_SESSION,
-} bfd_process_event_e;
-
-u8 *bfd_input_format_trace (u8 * s, va_list * args);
-
-bfd_session_t *bfd_get_session (bfd_main_t * bm, bfd_transport_t t);
-void bfd_put_session (bfd_main_t * bm, bfd_session_t * bs);
-bfd_session_t *bfd_find_session_by_idx (bfd_main_t * bm, uword bs_idx);
-bfd_session_t *bfd_find_session_by_disc (bfd_main_t * bm, u32 disc);
-void bfd_session_start (bfd_main_t * bm, bfd_session_t * bs);
-void bfd_consume_pkt (bfd_main_t * bm, const bfd_pkt_t * bfd, u32 bs_idx);
-int bfd_verify_pkt_common (const bfd_pkt_t * pkt);
-int bfd_verify_pkt_session (const bfd_pkt_t * pkt, u16 pkt_size,
-			    const bfd_session_t * bs);
-void bfd_event (bfd_main_t * bm, bfd_session_t * bs);
-void bfd_send_final (vlib_main_t * vm, vlib_buffer_t * b, bfd_session_t * bs);
-u8 *format_bfd_session (u8 * s, va_list * args);
-
-
-#define USEC_PER_MS 1000LL
-#define USEC_PER_SECOND (1000 * USEC_PER_MS)
-
-/* default, slow transmission interval for BFD packets, per spec at least 1s */
-#define BFD_DEFAULT_DESIRED_MIN_TX_US USEC_PER_SECOND
-
-#endif /* __included_bfd_main_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/bfd/bfd_protocol.c b/vnet/vnet/bfd/bfd_protocol.c
deleted file mode 100644
index ede9536f..00000000
--- a/vnet/vnet/bfd/bfd_protocol.c
+++ /dev/null
@@ -1,74 +0,0 @@
-#include <vnet/bfd/bfd_protocol.h>
-
-u8 bfd_pkt_get_version (const bfd_pkt_t *pkt)
-{
-  return pkt->head.vers_diag >> 5;
-}
-
-void bfd_pkt_set_version (bfd_pkt_t *pkt, int version)
-{
-  pkt->head.vers_diag =
-      (version << 5) | (pkt->head.vers_diag & ((1 << 5) - 1));
-}
-
-u8 bfd_pkt_get_diag_code (const bfd_pkt_t *pkt)
-{
-  return pkt->head.vers_diag & ((1 << 5) - 1);
-}
-
-void bfd_pkt_set_diag_code (bfd_pkt_t *pkt, int value)
-{
-  pkt->head.vers_diag =
-      (pkt->head.vers_diag & ~((1 << 5) - 1)) | (value & ((1 << 5) - 1));
-}
-
-u8 bfd_pkt_get_state (const bfd_pkt_t *pkt)
-{
-  return pkt->head.sta_flags >> 6;
-}
-
-void bfd_pkt_set_state (bfd_pkt_t *pkt, int value)
-{
-  pkt->head.sta_flags = (value << 6) | (pkt->head.sta_flags & ((1 << 6) - 1));
-}
-
-u8 bfd_pkt_get_poll (const bfd_pkt_t *pkt)
-{
-  return (pkt->head.sta_flags >> 5) & 1;
-}
-
-void bfd_pkt_set_final (bfd_pkt_t *pkt) { pkt->head.sta_flags |= 1 << 5; }
-
-u8 bfd_pkt_get_final (const bfd_pkt_t *pkt)
-{
-  return (pkt->head.sta_flags >> 4) & 1;
-}
-
-void bfd_pkt_set_poll (bfd_pkt_t *pkt);
-u8 bfd_pkt_get_control_plane_independent (const bfd_pkt_t *pkt)
-{
-  return (pkt->head.sta_flags >> 3) & 1;
-}
-
-void bfd_pkt_set_control_plane_independent (bfd_pkt_t *pkt);
-
-u8 bfd_pkt_get_auth_present (const bfd_pkt_t *pkt)
-{
-  return (pkt->head.sta_flags >> 2) & 1;
-}
-
-void bfd_pkt_set_auth_present (bfd_pkt_t *pkt);
-
-u8 bfd_pkt_get_demand (const bfd_pkt_t *pkt)
-{
-  return (pkt->head.sta_flags >> 1) & 1;
-}
-
-void bfd_pkt_set_demand (bfd_pkt_t *pkt) { pkt->head.sta_flags |= 1 << 1; }
-
-u8 bfd_pkt_get_multipoint (const bfd_pkt_t *pkt)
-{
-  return pkt->head.sta_flags & 1;
-}
-
-void bfd_pkt_set_multipoint (bfd_pkt_t *pkt);
diff --git a/vnet/vnet/bfd/bfd_protocol.h b/vnet/vnet/bfd/bfd_protocol.h
deleted file mode 100644
index cf751b3b..00000000
--- a/vnet/vnet/bfd/bfd_protocol.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_bfd_protocol_h__
-#define __included_bfd_protocol_h__
-/**
- * @file
- * @brief BFD protocol declarations
- */
-
-#include <vppinfra/types.h>
-#include <vppinfra/clib.h>
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  /*
-   An optional Authentication Section MAY be present:
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |   Auth Type   |   Auth Len    |    Authentication Data...     |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  */
-  u8 type;
-  u8 len;
-  u8 data[0];
-}) bfd_auth_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  /*
-     The Mandatory Section of a BFD Control packet has the following
-     format:
-
-      0                   1                   2                   3
-      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     |Vers |  Diag   |Sta|P|F|C|A|D|M|  Detect Mult  |    Length     |
-     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     |                       My Discriminator                        |
-     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     |                      Your Discriminator                       |
-     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     |                    Desired Min TX Interval                    |
-     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     |                   Required Min RX Interval                    |
-     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     |                 Required Min Echo RX Interval                 |
-     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  */
-  struct
-  {
-    u8 vers_diag;
-    u8 sta_flags;
-    u8 detect_mult;
-    u8 length;
-  } head;
-  u32 my_disc;
-  u32 your_disc;
-  u32 des_min_tx;
-  u32 req_min_rx;
-  u32 req_min_echo_rx;
-}) bfd_pkt_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  bfd_pkt_t pkt;
-  bfd_auth_t auth;
-}) bfd_pkt_with_auth_t;
-/* *INDENT-ON* */
-
-u8 bfd_pkt_get_version (const bfd_pkt_t * pkt);
-void bfd_pkt_set_version (bfd_pkt_t * pkt, int version);
-u8 bfd_pkt_get_diag_code (const bfd_pkt_t * pkt);
-void bfd_pkt_set_diag_code (bfd_pkt_t * pkt, int value);
-u8 bfd_pkt_get_state (const bfd_pkt_t * pkt);
-void bfd_pkt_set_state (bfd_pkt_t * pkt, int value);
-u8 bfd_pkt_get_poll (const bfd_pkt_t * pkt);
-void bfd_pkt_set_final (bfd_pkt_t * pkt);
-u8 bfd_pkt_get_final (const bfd_pkt_t * pkt);
-void bfd_pkt_set_poll (bfd_pkt_t * pkt);
-u8 bfd_pkt_get_control_plane_independent (const bfd_pkt_t * pkt);
-void bfd_pkt_set_control_plane_independent (bfd_pkt_t * pkt);
-u8 bfd_pkt_get_auth_present (const bfd_pkt_t * pkt);
-void bfd_pkt_set_auth_present (bfd_pkt_t * pkt);
-u8 bfd_pkt_get_demand (const bfd_pkt_t * pkt);
-void bfd_pkt_set_demand (bfd_pkt_t * pkt);
-u8 bfd_pkt_get_multipoint (const bfd_pkt_t * pkt);
-void bfd_pkt_set_multipoint (bfd_pkt_t * pkt);
-
-/* BFD diagnostic codes */
-#define foreach_bfd_diag_code(F)                             \
-  F (0, no_diag, "No Diagnostic")                            \
-  F (1, det_time_exp, "Control Detection Time Expired")      \
-  F (2, echo_failed, "Echo Function Failed")                 \
-  F (3, neighbor_sig_down, "Neighbor Signaled Session Down") \
-  F (4, fwd_plain_reset, "Forwarding Plane Reset")           \
-  F (5, path_down, "Path Down")                              \
-  F (6, concat_path_down, "Concatenated Path Down")          \
-  F (7, admin_down, "Administratively Down")                 \
-  F (8, reverse_concat_path_down, "Reverse Concatenated Path Down")
-
-#define BFD_DIAG_CODE_NAME(t) BFD_DIAG_CODE_##t
-
-typedef enum
-{
-#define F(n, t, s) BFD_DIAG_CODE_NAME (t) = n,
-  foreach_bfd_diag_code (F)
-#undef F
-} bfd_diag_code_e;
-
-const char *bfd_diag_code_string (bfd_diag_code_e diag);
-
-/* BFD state values */
-#define foreach_bfd_state(F)     \
-  F (0, admin_down, "AdminDown") \
-  F (1, down, "Down")            \
-  F (2, init, "Init")            \
-  F (3, up, "Up")
-
-#define BFD_STATE_NAME(t) BFD_STATE_##t
-
-typedef enum
-{
-#define F(n, t, s) BFD_STATE_NAME (t) = n,
-  foreach_bfd_state (F)
-#undef F
-} bfd_state_e;
-
-const char *bfd_state_string (bfd_state_e state);
-
-#endif /* __included_bfd_protocol_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/bfd/bfd_udp.c b/vnet/vnet/bfd/bfd_udp.c
deleted file mode 100644
index 3c747d86..00000000
--- a/vnet/vnet/bfd/bfd_udp.c
+++ /dev/null
@@ -1,639 +0,0 @@
-#include <vppinfra/types.h>
-#include <vlibmemory/api.h>
-#include <vlib/vlib.h>
-#include <vlib/buffer.h>
-#include <vnet/ip/format.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/ip/udp_packet.h>
-#include <vnet/ip/lookup.h>
-#include <vnet/ip/icmp46_packet.h>
-#include <vnet/ip/ip4.h>
-#include <vnet/ip/ip6.h>
-#include <vnet/ip/udp.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vnet/adj/adj.h>
-#include <vnet/adj/adj_nbr.h>
-#include <vnet/bfd/bfd_debug.h>
-#include <vnet/bfd/bfd_udp.h>
-#include <vnet/bfd/bfd_main.h>
-#include <vnet/bfd/bfd_api.h>
-
-typedef struct
-{
-  bfd_main_t *bfd_main;
-  /* hashmap - bfd session index by bfd key - used for CLI/API lookup, where
-   * discriminator is unknown */
-  mhash_t bfd_session_idx_by_bfd_key;
-} bfd_udp_main_t;
-
-static vlib_node_registration_t bfd_udp4_input_node;
-static vlib_node_registration_t bfd_udp6_input_node;
-
-bfd_udp_main_t bfd_udp_main;
-
-void bfd_udp_transport_to_buffer (vlib_main_t *vm, vlib_buffer_t *b,
-                                  bfd_udp_session_t *bus)
-{
-  udp_header_t *udp;
-  u16 udp_length, ip_length;
-  bfd_udp_key_t *key = &bus->key;
-
-  b->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
-  if (ip46_address_is_ip4 (&key->local_addr))
-    {
-      ip4_header_t *ip4;
-      const size_t data_size = sizeof (*ip4) + sizeof (*udp);
-      vlib_buffer_advance (b, -data_size);
-      ip4 = vlib_buffer_get_current (b);
-      udp = (udp_header_t *)(ip4 + 1);
-      memset (ip4, 0, data_size);
-      ip4->ip_version_and_header_length = 0x45;
-      ip4->ttl = 255;
-      ip4->protocol = IP_PROTOCOL_UDP;
-      ip4->src_address.as_u32 = key->local_addr.ip4.as_u32;
-      ip4->dst_address.as_u32 = key->peer_addr.ip4.as_u32;
-
-      udp->src_port = clib_host_to_net_u16 (50000); /* FIXME */
-      udp->dst_port = clib_host_to_net_u16 (UDP_DST_PORT_bfd4);
-
-      /* fix ip length, checksum and udp length */
-      ip_length = vlib_buffer_length_in_chain (vm, b);
-
-      ip4->length = clib_host_to_net_u16 (ip_length);
-      ip4->checksum = ip4_header_checksum (ip4);
-
-      udp_length = ip_length - (sizeof (*ip4));
-      udp->length = clib_host_to_net_u16 (udp_length);
-    }
-  else
-    {
-      BFD_ERR ("not implemented");
-      abort ();
-    }
-}
-
-void bfd_add_udp_transport (vlib_main_t *vm, vlib_buffer_t *b,
-                            bfd_udp_session_t *bus)
-{
-  vnet_buffer (b)->ip.adj_index[VLIB_RX] = bus->adj_index;
-  vnet_buffer (b)->ip.adj_index[VLIB_TX] = bus->adj_index;
-  bfd_udp_transport_to_buffer (vm, b, bus);
-}
-
-static bfd_session_t *bfd_lookup_session (bfd_udp_main_t *bum,
-                                          const bfd_udp_key_t *key)
-{
-  uword *p = mhash_get (&bum->bfd_session_idx_by_bfd_key, key);
-  if (p)
-    {
-      return bfd_find_session_by_idx (bum->bfd_main, *p);
-    }
-  return 0;
-}
-
-static vnet_api_error_t
-bfd_udp_add_session_internal (bfd_udp_main_t *bum, u32 sw_if_index,
-                              u32 desired_min_tx_us, u32 required_min_rx_us,
-                              u8 detect_mult, const ip46_address_t *local_addr,
-                              const ip46_address_t *peer_addr)
-{
-  vnet_sw_interface_t *sw_if =
-      vnet_get_sw_interface (vnet_get_main (), sw_if_index);
-  /* get a pool entry and if we end up not needing it, give it back */
-  bfd_transport_t t = BFD_TRANSPORT_UDP4;
-  if (!ip46_address_is_ip4 (local_addr))
-    {
-      t = BFD_TRANSPORT_UDP6;
-    }
-  bfd_session_t *bs = bfd_get_session (bum->bfd_main, t);
-  bfd_udp_session_t *bus = &bs->udp;
-  memset (bus, 0, sizeof (*bus));
-  bfd_udp_key_t *key = &bus->key;
-  key->sw_if_index = sw_if->sw_if_index;
-  key->local_addr.as_u64[0] = local_addr->as_u64[0];
-  key->local_addr.as_u64[1] = local_addr->as_u64[1];
-  key->peer_addr.as_u64[0] = peer_addr->as_u64[0];
-  key->peer_addr.as_u64[1] = peer_addr->as_u64[1];
-  const bfd_session_t *tmp = bfd_lookup_session (bum, key);
-  if (tmp)
-    {
-      BFD_ERR ("duplicate bfd-udp session, existing bs_idx=%d", tmp->bs_idx);
-      bfd_put_session (bum->bfd_main, bs);
-      return VNET_API_ERROR_BFD_EEXIST;
-    }
-  key->sw_if_index = sw_if->sw_if_index;
-  mhash_set (&bum->bfd_session_idx_by_bfd_key, key, bs->bs_idx, NULL);
-  BFD_DBG ("session created, bs_idx=%u, sw_if_index=%d, local=%U, peer=%U",
-           bs->bs_idx, key->sw_if_index, format_ip46_address, &key->local_addr,
-           IP46_TYPE_ANY, format_ip46_address, &key->peer_addr, IP46_TYPE_ANY);
-  if (BFD_TRANSPORT_UDP4 == t)
-    {
-      bus->adj_index = adj_nbr_add_or_lock (FIB_PROTOCOL_IP4, VNET_LINK_IP4,
-                                            &key->peer_addr, key->sw_if_index);
-      BFD_DBG ("adj_nbr_add_or_lock(FIB_PROTOCOL_IP4, VNET_LINK_IP4, %U, %d) "
-               "returns %d",
-               format_ip46_address, &key->peer_addr, IP46_TYPE_ANY,
-               key->sw_if_index, bus->adj_index);
-    }
-  else
-    {
-      bus->adj_index = adj_nbr_add_or_lock (FIB_PROTOCOL_IP6, VNET_LINK_IP6,
-                                            &key->peer_addr, key->sw_if_index);
-      BFD_DBG ("adj_nbr_add_or_lock(FIB_PROTOCOL_IP6, VNET_LINK_IP6, %U, %d) "
-               "returns %d",
-               format_ip46_address, &key->peer_addr, IP46_TYPE_ANY,
-               key->sw_if_index, bus->adj_index);
-    }
-  bs->config_desired_min_tx_us = desired_min_tx_us;
-  bs->required_min_rx_us = required_min_rx_us;
-  bs->local_detect_mult = detect_mult;
-  bfd_session_start (bum->bfd_main, bs);
-  return 0;
-}
-
-static vnet_api_error_t
-bfd_udp_validate_api_input (u32 sw_if_index, const ip46_address_t *local_addr,
-                            const ip46_address_t *peer_addr)
-{
-  vnet_sw_interface_t *sw_if =
-      vnet_get_sw_interface (vnet_get_main (), sw_if_index);
-  u8 local_ip_valid = 0;
-  ip_interface_address_t *ia = NULL;
-  if (!sw_if)
-    {
-      BFD_ERR ("got NULL sw_if");
-      return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-    }
-  if (ip46_address_is_ip4 (local_addr))
-    {
-      if (!ip46_address_is_ip4 (peer_addr))
-        {
-          BFD_ERR ("IP family mismatch");
-          return VNET_API_ERROR_INVALID_ARGUMENT;
-        }
-      ip4_main_t *im = &ip4_main;
-
-      /* *INDENT-OFF* */
-      foreach_ip_interface_address (
-          &im->lookup_main, ia, sw_if_index, 0 /* honor unnumbered */, ({
-            ip4_address_t *x =
-                ip_interface_address_get_address (&im->lookup_main, ia);
-            if (x->as_u32 == local_addr->ip4.as_u32)
-              {
-                /* valid address for this interface */
-                local_ip_valid = 1;
-                break;
-              }
-          }));
-      /* *INDENT-ON* */
-    }
-  else
-    {
-      if (ip46_address_is_ip4 (peer_addr))
-        {
-          BFD_ERR ("IP family mismatch");
-          return VNET_API_ERROR_INVALID_ARGUMENT;
-        }
-      ip6_main_t *im = &ip6_main;
-      /* *INDENT-OFF* */
-      foreach_ip_interface_address (
-          &im->lookup_main, ia, sw_if_index, 0 /* honor unnumbered */, ({
-            ip6_address_t *x =
-                ip_interface_address_get_address (&im->lookup_main, ia);
-            if (local_addr->ip6.as_u64[0] == x->as_u64[0] &&
-                local_addr->ip6.as_u64[1] == x->as_u64[1])
-              {
-                /* valid address for this interface */
-                local_ip_valid = 1;
-                break;
-              }
-          }));
-      /* *INDENT-ON* */
-    }
-
-  if (!local_ip_valid)
-    {
-      BFD_ERR ("address not found on interface");
-      return VNET_API_ERROR_ADDRESS_NOT_FOUND_FOR_INTERFACE;
-    }
-
-  return 0;
-}
-
-vnet_api_error_t bfd_udp_add_session (u32 sw_if_index, u32 desired_min_tx_us,
-                                      u32 required_min_rx_us, u8 detect_mult,
-                                      const ip46_address_t *local_addr,
-                                      const ip46_address_t *peer_addr)
-{
-  vnet_api_error_t rv =
-      bfd_udp_validate_api_input (sw_if_index, local_addr, peer_addr);
-  if (rv)
-    {
-      return rv;
-    }
-  if (detect_mult < 1)
-    {
-      BFD_ERR ("detect_mult < 1");
-      return VNET_API_ERROR_INVALID_ARGUMENT;
-    }
-  if (desired_min_tx_us < 1)
-    {
-      BFD_ERR ("desired_min_tx_us < 1");
-      return VNET_API_ERROR_INVALID_ARGUMENT;
-    }
-  return bfd_udp_add_session_internal (&bfd_udp_main, sw_if_index,
-                                       desired_min_tx_us, required_min_rx_us,
-                                       detect_mult, local_addr, peer_addr);
-}
-
-vnet_api_error_t bfd_udp_del_session (u32 sw_if_index,
-                                      const ip46_address_t *local_addr,
-                                      const ip46_address_t *peer_addr)
-{
-  vnet_api_error_t rv =
-      bfd_udp_validate_api_input (sw_if_index, local_addr, peer_addr);
-  if (rv)
-    {
-      return rv;
-    }
-  bfd_udp_main_t *bum = &bfd_udp_main;
-  vnet_sw_interface_t *sw_if =
-      vnet_get_sw_interface (vnet_get_main (), sw_if_index);
-  bfd_udp_key_t key;
-  memset (&key, 0, sizeof (key));
-  key.sw_if_index = sw_if->sw_if_index;
-  key.local_addr.as_u64[0] = local_addr->as_u64[0];
-  key.local_addr.as_u64[1] = local_addr->as_u64[1];
-  key.peer_addr.as_u64[0] = peer_addr->as_u64[0];
-  key.peer_addr.as_u64[1] = peer_addr->as_u64[1];
-  bfd_session_t *tmp = bfd_lookup_session (bum, &key);
-  if (tmp)
-    {
-      BFD_DBG ("free bfd-udp session, bs_idx=%d", tmp->bs_idx);
-      mhash_unset (&bum->bfd_session_idx_by_bfd_key, &key, NULL);
-      adj_unlock (tmp->udp.adj_index);
-      bfd_put_session (bum->bfd_main, tmp);
-    }
-  else
-    {
-      BFD_ERR ("no such session");
-      return VNET_API_ERROR_BFD_NOENT;
-    }
-  return 0;
-}
-
-typedef enum {
-  BFD_UDP_INPUT_NEXT_NORMAL,
-  BFD_UDP_INPUT_NEXT_REPLY,
-  BFD_UDP_INPUT_N_NEXT,
-} bfd_udp_input_next_t;
-
-/* Packet counters */
-#define foreach_bfd_udp_error(F)           \
-  F (NONE, "good bfd packets (processed)") \
-  F (BAD, "invalid bfd packets")           \
-  F (DISABLED, "bfd packets received on disabled interfaces")
-
-#define F(sym, string) static char BFD_UDP_ERR_##sym##_STR[] = string;
-foreach_bfd_udp_error (F);
-#undef F
-
-static char *bfd_udp_error_strings[] = {
-#define F(sym, string) BFD_UDP_ERR_##sym##_STR,
-  foreach_bfd_udp_error (F)
-#undef F
-};
-
-typedef enum {
-#define F(sym, str) BFD_UDP_ERROR_##sym,
-  foreach_bfd_udp_error (F)
-#undef F
-      BFD_UDP_N_ERROR,
-} bfd_udp_error_t;
-
-static void bfd_udp4_find_headers (vlib_buffer_t *b, const ip4_header_t **ip4,
-                                   const udp_header_t **udp)
-{
-  /* sanity check first */
-  const i32 start = vnet_buffer (b)->ip.start_of_ip_header;
-  if (start < 0 && start < sizeof (b->pre_data))
-    {
-      BFD_ERR ("Start of ip header is before pre_data, ignoring");
-      *ip4 = NULL;
-      *udp = NULL;
-      return;
-    }
-  *ip4 = (ip4_header_t *)(b->data + start);
-  if ((u8 *)*ip4 > (u8 *)vlib_buffer_get_current (b))
-    {
-      BFD_ERR ("Start of ip header is beyond current data, ignoring");
-      *ip4 = NULL;
-      *udp = NULL;
-      return;
-    }
-  *udp = (udp_header_t *)((*ip4) + 1);
-}
-
-static bfd_udp_error_t bfd_udp4_verify_transport (const ip4_header_t *ip4,
-                                                  const udp_header_t *udp,
-                                                  const bfd_session_t *bs)
-{
-  const bfd_udp_session_t *bus = &bs->udp;
-  const bfd_udp_key_t *key = &bus->key;
-  if (ip4->src_address.as_u32 != key->peer_addr.ip4.as_u32)
-    {
-      BFD_ERR ("IP src addr mismatch, got %U, expected %U", format_ip4_address,
-               ip4->src_address.as_u32, format_ip4_address,
-               key->peer_addr.ip4.as_u32);
-      return BFD_UDP_ERROR_BAD;
-    }
-  if (ip4->dst_address.as_u32 != key->local_addr.ip4.as_u32)
-    {
-      BFD_ERR ("IP dst addr mismatch, got %U, expected %U", format_ip4_address,
-               ip4->dst_address.as_u32, format_ip4_address,
-               key->local_addr.ip4.as_u32);
-      return BFD_UDP_ERROR_BAD;
-    }
-  const u8 expected_ttl = 255;
-  if (ip4->ttl != expected_ttl)
-    {
-      BFD_ERR ("IP unexpected TTL value %d, expected %d", ip4->ttl,
-               expected_ttl);
-      return BFD_UDP_ERROR_BAD;
-    }
-  if (clib_net_to_host_u16 (udp->src_port) < 49152 ||
-      clib_net_to_host_u16 (udp->src_port) > 65535)
-    {
-      BFD_ERR ("Invalid UDP src port %d, out of range <49152,65535>",
-               udp->src_port);
-    }
-  return BFD_UDP_ERROR_NONE;
-}
-
-typedef struct
-{
-  u32 bs_idx;
-  bfd_pkt_t pkt;
-} bfd_rpc_update_t;
-
-static void bfd_rpc_update_session_cb (const bfd_rpc_update_t *a)
-{
-  bfd_consume_pkt (bfd_udp_main.bfd_main, &a->pkt, a->bs_idx);
-}
-
-static void bfd_rpc_update_session (u32 bs_idx, const bfd_pkt_t *pkt)
-{
-  /* packet length was already verified to be correct by the caller */
-  const u32 data_size = sizeof (bfd_rpc_update_t) -
-                        STRUCT_SIZE_OF (bfd_rpc_update_t, pkt) +
-                        pkt->head.length;
-  u8 data[data_size];
-  bfd_rpc_update_t *update = (bfd_rpc_update_t *)data;
-  update->bs_idx = bs_idx;
-  clib_memcpy (&update->pkt, pkt, pkt->head.length);
-  vl_api_rpc_call_main_thread (bfd_rpc_update_session_cb, data, data_size);
-}
-
-static bfd_udp_error_t bfd_udp4_scan (vlib_main_t *vm, vlib_node_runtime_t *rt,
-                                      vlib_buffer_t *b, bfd_session_t **bs_out)
-{
-  const bfd_pkt_t *pkt = vlib_buffer_get_current (b);
-  if (sizeof (*pkt) > b->current_length)
-    {
-      BFD_ERR (
-          "Payload size %d too small to hold bfd packet of minimum size %d",
-          b->current_length, sizeof (*pkt));
-      return BFD_UDP_ERROR_BAD;
-    }
-  const ip4_header_t *ip4;
-  const udp_header_t *udp;
-  bfd_udp4_find_headers (b, &ip4, &udp);
-  if (!ip4 || !udp)
-    {
-      BFD_ERR ("Couldn't find ip4 or udp header");
-      return BFD_UDP_ERROR_BAD;
-    }
-  if (!bfd_verify_pkt_common (pkt))
-    {
-      return BFD_UDP_ERROR_BAD;
-    }
-  bfd_session_t *bs = NULL;
-  if (pkt->your_disc)
-    {
-      BFD_DBG ("Looking up BFD session using discriminator %u",
-               pkt->your_disc);
-      bs = bfd_find_session_by_disc (bfd_udp_main.bfd_main, pkt->your_disc);
-    }
-  else
-    {
-      bfd_udp_key_t key;
-      memset (&key, 0, sizeof (key));
-      key.sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_RX];
-      key.local_addr.ip4.as_u32 = ip4->dst_address.as_u32;
-      key.peer_addr.ip4.as_u32 = ip4->src_address.as_u32;
-      BFD_DBG ("Looking up BFD session using key (sw_if_index=%u, local=%U, "
-               "peer=%U)",
-               key.sw_if_index, format_ip4_address, key.local_addr.ip4.as_u8,
-               format_ip4_address, key.peer_addr.ip4.as_u8);
-      bs = bfd_lookup_session (&bfd_udp_main, &key);
-    }
-  if (!bs)
-    {
-      BFD_ERR ("BFD session lookup failed - no session matches BFD pkt");
-      return BFD_UDP_ERROR_BAD;
-    }
-  BFD_DBG ("BFD session found, bs_idx=%u", bs->bs_idx);
-  if (!bfd_verify_pkt_session (pkt, b->current_length, bs))
-    {
-      return BFD_UDP_ERROR_BAD;
-    }
-  bfd_udp_error_t err;
-  if (BFD_UDP_ERROR_NONE != (err = bfd_udp4_verify_transport (ip4, udp, bs)))
-    {
-      return err;
-    }
-  bfd_rpc_update_session (bs->bs_idx, pkt);
-  *bs_out = bs;
-  return BFD_UDP_ERROR_NONE;
-}
-
-static bfd_udp_error_t bfd_udp6_scan (vlib_main_t *vm, vlib_buffer_t *b)
-{
-  /* TODO */
-  return BFD_UDP_ERROR_BAD;
-}
-
-/*
- * Process a frame of bfd packets
- * Expect 1 packet / frame
- */
-static uword bfd_udp_input (vlib_main_t *vm, vlib_node_runtime_t *rt,
-                            vlib_frame_t *f, int is_ipv6)
-{
-  u32 n_left_from, *from;
-  bfd_input_trace_t *t0;
-
-  from = vlib_frame_vector_args (f); /* array of buffer indices */
-  n_left_from = f->n_vectors;        /* number of buffer indices */
-
-  while (n_left_from > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      u32 next0, error0;
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-
-      bfd_session_t *bs = NULL;
-
-      /* If this pkt is traced, snapshot the data */
-      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-        {
-          int len;
-          t0 = vlib_add_trace (vm, rt, b0, sizeof (*t0));
-          len = (b0->current_length < sizeof (t0->data)) ? b0->current_length
-                                                         : sizeof (t0->data);
-          t0->len = len;
-          clib_memcpy (t0->data, vlib_buffer_get_current (b0), len);
-        }
-
-      /* scan this bfd pkt. error0 is the counter index to bmp */
-      if (is_ipv6)
-        {
-          error0 = bfd_udp6_scan (vm, b0);
-        }
-      else
-        {
-          error0 = bfd_udp4_scan (vm, rt, b0, &bs);
-        }
-      b0->error = rt->errors[error0];
-
-      next0 = BFD_UDP_INPUT_NEXT_NORMAL;
-      if (BFD_UDP_ERROR_NONE == error0)
-        {
-          /* if everything went fine, check for poll bit, if present, re-use
-             the buffer and based on (now updated) session parameters, send the
-             final packet back */
-          const bfd_pkt_t *pkt = vlib_buffer_get_current (b0);
-          if (bfd_pkt_get_poll (pkt))
-            {
-              bfd_send_final (vm, b0, bs);
-              if (is_ipv6)
-                {
-                  vlib_node_increment_counter (vm, bfd_udp6_input_node.index,
-                                               b0->error, 1);
-                }
-              else
-                {
-                  vlib_node_increment_counter (vm, bfd_udp4_input_node.index,
-                                               b0->error, 1);
-                }
-              next0 = BFD_UDP_INPUT_NEXT_REPLY;
-            }
-        }
-      vlib_set_next_frame_buffer (vm, rt, next0, bi0);
-
-      from += 1;
-      n_left_from -= 1;
-    }
-
-  return f->n_vectors;
-}
-
-static uword bfd_udp4_input (vlib_main_t *vm, vlib_node_runtime_t *rt,
-                             vlib_frame_t *f)
-{
-  return bfd_udp_input (vm, rt, f, 0);
-}
-
-/*
- * bfd input graph node declaration
- */
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (bfd_udp4_input_node, static) = {
-  .function = bfd_udp4_input,
-  .name = "bfd-udp4-input",
-  .vector_size = sizeof (u32),
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = BFD_UDP_N_ERROR,
-  .error_strings = bfd_udp_error_strings,
-
-  .format_trace = bfd_input_format_trace,
-
-  .n_next_nodes = BFD_UDP_INPUT_N_NEXT,
-  .next_nodes =
-      {
-              [BFD_UDP_INPUT_NEXT_NORMAL] = "error-drop",
-              [BFD_UDP_INPUT_NEXT_REPLY] = "ip4-lookup",
-      },
-};
-/* *INDENT-ON* */
-
-static uword bfd_udp6_input (vlib_main_t *vm, vlib_node_runtime_t *rt,
-                             vlib_frame_t *f)
-{
-  return bfd_udp_input (vm, rt, f, 1);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (bfd_udp6_input_node, static) = {
-  .function = bfd_udp6_input,
-  .name = "bfd-udp6-input",
-  .vector_size = sizeof (u32),
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = BFD_UDP_N_ERROR,
-  .error_strings = bfd_udp_error_strings,
-
-  .format_trace = bfd_input_format_trace,
-
-  .n_next_nodes = BFD_UDP_INPUT_N_NEXT,
-  .next_nodes =
-      {
-              [BFD_UDP_INPUT_NEXT_NORMAL] = "error-drop",
-              [BFD_UDP_INPUT_NEXT_REPLY] = "ip6-lookup",
-      },
-};
-/* *INDENT-ON* */
-
-static clib_error_t *bfd_sw_interface_up_down (vnet_main_t *vnm,
-                                               u32 sw_if_index, u32 flags)
-{
-  // vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
-    {
-      /* TODO */
-    }
-  return 0;
-}
-
-VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (bfd_sw_interface_up_down);
-
-static clib_error_t *bfd_hw_interface_up_down (vnet_main_t *vnm,
-                                               u32 hw_if_index, u32 flags)
-{
-  if (flags & VNET_HW_INTERFACE_FLAG_LINK_UP)
-    {
-      /* TODO */
-    }
-  return 0;
-}
-
-VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (bfd_hw_interface_up_down);
-
-/*
- * setup function
- */
-static clib_error_t *bfd_udp_init (vlib_main_t *vm)
-{
-  mhash_init (&bfd_udp_main.bfd_session_idx_by_bfd_key, sizeof (uword),
-              sizeof (bfd_udp_key_t));
-  bfd_udp_main.bfd_main = &bfd_main;
-  udp_register_dst_port (vm, UDP_DST_PORT_bfd4, bfd_udp4_input_node.index, 1);
-  udp_register_dst_port (vm, UDP_DST_PORT_bfd6, bfd_udp6_input_node.index, 0);
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (bfd_udp_init);
diff --git a/vnet/vnet/bfd/bfd_udp.h b/vnet/vnet/bfd/bfd_udp.h
deleted file mode 100644
index 51f5327b..00000000
--- a/vnet/vnet/bfd/bfd_udp.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief BFD global declarations
- */
-
-#ifndef __included_bfd_udp_h__
-#define __included_bfd_udp_h__
-
-#include <vppinfra/clib.h>
-#include <vnet/adj/adj_types.h>
-#include <vnet/ip/ip6_packet.h>
-
-#define BFD_UDP_KEY_BODY
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-
-  u32 sw_if_index;
-  ip46_address_t local_addr;
-  ip46_address_t peer_addr;
-
-}) bfd_udp_key_t;
-/* *INDENT-ON* */
-
-typedef struct
-{
-  bfd_udp_key_t key;
-
-  adj_index_t adj_index;
-} bfd_udp_session_t;
-
-void bfd_add_udp_transport (vlib_main_t * vm, vlib_buffer_t * b,
-			    bfd_udp_session_t * bs);
-
-#endif /* __included_bfd_udp_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/bfd/dir.dox b/vnet/vnet/bfd/dir.dox
deleted file mode 100644
index ed656b52..00000000
--- a/vnet/vnet/bfd/dir.dox
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- @dir vnet/vnet/bfd
- @brief Bidirectional Forwarding Detection (BFD) implementation
-*/
diff --git a/vnet/vnet/buffer.h b/vnet/vnet/buffer.h
deleted file mode 100644
index 7935027f..00000000
--- a/vnet/vnet/buffer.h
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * vnet/buffer.h: vnet buffer flags
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vnet_buffer_h
-#define included_vnet_buffer_h
-
-#include <vlib/vlib.h>
-
-/* VLIB buffer flags for ip4/ip6 packets.  Set by input interfaces for ip4/ip6
-   tcp/udp packets with hardware computed checksums. */
-#define LOG2_IP_BUFFER_L4_CHECKSUM_COMPUTED LOG2_VLIB_BUFFER_FLAG_USER(1)
-#define LOG2_IP_BUFFER_L4_CHECKSUM_CORRECT  LOG2_VLIB_BUFFER_FLAG_USER(2)
-#define IP_BUFFER_L4_CHECKSUM_COMPUTED (1 << LOG2_IP_BUFFER_L4_CHECKSUM_COMPUTED)
-#define IP_BUFFER_L4_CHECKSUM_CORRECT  (1 << LOG2_IP_BUFFER_L4_CHECKSUM_CORRECT)
-
-/* VLAN header flags.
- * These bits are zeroed in vlib_buffer_init_for_free_list()
- * meaning wherever the buffer comes from they have a reasonable
- * value (eg, if ip4/ip6 generates the packet.)
- */
-#define LOG2_ETH_BUFFER_VLAN_2_DEEP LOG2_VLIB_BUFFER_FLAG_USER(3)
-#define LOG2_ETH_BUFFER_VLAN_1_DEEP LOG2_VLIB_BUFFER_FLAG_USER(4)
-#define ETH_BUFFER_VLAN_2_DEEP (1 << LOG2_ETH_BUFFER_VLAN_2_DEEP)
-#define ETH_BUFFER_VLAN_1_DEEP (1 << LOG2_ETH_BUFFER_VLAN_1_DEEP)
-#define ETH_BUFFER_VLAN_BITS (ETH_BUFFER_VLAN_1_DEEP | \
-                              ETH_BUFFER_VLAN_2_DEEP)
-
-#define LOG2_VNET_BUFFER_RTE_MBUF_VALID LOG2_VLIB_BUFFER_FLAG_USER(5)
-#define VNET_BUFFER_RTE_MBUF_VALID (1 << LOG2_VNET_BUFFER_RTE_MBUF_VALID)
-
-#define LOG2_BUFFER_HANDOFF_NEXT_VALID LOG2_VLIB_BUFFER_FLAG_USER(6)
-#define BUFFER_HANDOFF_NEXT_VALID (1 << LOG2_BUFFER_HANDOFF_NEXT_VALID)
-
-#define LOG2_VNET_BUFFER_LOCALLY_ORIGINATED LOG2_VLIB_BUFFER_FLAG_USER(7)
-#define VNET_BUFFER_LOCALLY_ORIGINATED (1 << LOG2_VNET_BUFFER_LOCALLY_ORIGINATED)
-
-#define LOG2_VNET_BUFFER_SPAN_CLONE LOG2_VLIB_BUFFER_FLAG_USER(8)
-#define VNET_BUFFER_SPAN_CLONE (1 << LOG2_VNET_BUFFER_SPAN_CLONE)
-
-#define foreach_buffer_opaque_union_subtype     \
-_(ethernet)                                     \
-_(ip)                                           \
-_(mcast)                                        \
-_(swt)                                          \
-_(l2)                                           \
-_(l2t)                                          \
-_(gre)                                          \
-_(l2_classify)                                  \
-_(handoff)                                      \
-_(policer)                                      \
-_(ipsec)					\
-_(map)						\
-_(map_t)					\
-_(ip_frag)
-
-/*
- * vnet stack buffer opaque array overlay structure.
- * The vnet_buffer_opaque_t *must* be the same size as the
- * vlib_buffer_t "opaque" structure member, 32 bytes.
- *
- * When adding a union type, please add a stanza to
- * foreach_buffer_opaque_union_subtype (directly above).
- * Code in vnet_interface_init(...) verifies the size
- * of the union, and will announce any deviations in an
- * impossible-to-miss manner.
- */
-typedef struct
-{
-  u32 sw_if_index[VLIB_N_RX_TX];
-
-  union
-  {
-    /* Ethernet. */
-    struct
-    {
-      /* Saved value of current header by ethernet-input. */
-      i32 start_of_ethernet_header;
-    } ethernet;
-
-    /* IP4/6 buffer opaque. */
-    struct
-    {
-      /* Adjacency from destination IP address lookup [VLIB_TX].
-         Adjacency from source IP address lookup [VLIB_RX].
-         This gets set to ~0 until source lookup is performed. */
-      u32 adj_index[VLIB_N_RX_TX];
-
-      union
-      {
-	struct
-	{
-	  /* Flow hash value for this packet computed from IP src/dst address
-	     protocol and ports. */
-	  u32 flow_hash;
-
-	  /* next protocol */
-	  u32 save_protocol;
-
-	  /* Rewrite length */
-	  u32 save_rewrite_length;
-	};
-
-	/* ICMP */
-	struct
-	{
-	  u8 type;
-	  u8 code;
-	  u32 data;
-	} icmp;
-
-	/* IP header offset from vlib_buffer.data - saved by ip*_local nodes */
-	i32 start_of_ip_header;
-      };
-
-    } ip;
-
-    /*
-     * MPLS:
-     * data copied from the MPLS header that was popped from the packet
-     * during the look-up.
-     */
-    struct
-    {
-      u8 ttl;
-      u8 exp;
-      u8 first;
-    } mpls;
-
-    /* Multicast replication */
-    struct
-    {
-      u32 pad[3];
-      u32 mcast_group_index;
-      u32 mcast_current_index;
-      u32 original_free_list_index;
-    } mcast;
-
-    /* ip4-in-ip6 softwire termination, only valid there */
-    struct
-    {
-      u8 swt_disable;
-      u32 mapping_index;
-    } swt;
-
-    /* l2 bridging path, only valid there */
-    struct
-    {
-      u32 feature_bitmap;
-      u16 bd_index;		// bridge-domain index
-      u8 l2_len;		// ethernet header length
-      u8 shg;			// split-horizon group
-    } l2;
-
-    /* l2tpv3 softwire encap, only valid there */
-    struct
-    {
-      u32 pad[4];		/* do not overlay w/ ip.adj_index[0,1] */
-      u8 next_index;
-      u32 session_index;
-    } l2t;
-
-    struct
-    {
-      u32 src, dst;
-    } gre;
-
-    /* L2 classify */
-    struct
-    {
-      u64 pad;
-      u32 table_index;
-      u32 opaque_index;
-      u64 hash;
-    } l2_classify;
-
-    /* IO - worker thread handoff */
-    struct
-    {
-      u32 next_index;
-    } handoff;
-
-    /* vnet policer */
-    struct
-    {
-      u32 pad[8 - VLIB_N_RX_TX - 1];	/* to end of opaque */
-      u32 index;
-    } policer;
-
-    /* interface output features */
-    struct
-    {
-      u32 flags;
-      u32 sad_index;
-    } ipsec;
-
-    /* vcgn udp inside input, only valid there */
-    struct
-    {
-      /* This part forms context of the packet. The structure should be
-       * exactly same as spp_ctx_t. Also this should be the first
-       * element of this vcgn_uii structure.
-       */
-      /****** BEGIN spp_ctx_t section ***********************/
-      union
-      {				/* Roddick specific */
-	u32 roddick_info;
-	struct _tx_pkt_info
-	{			/* Used by PI to PI communication for TX */
-	  u32 uidb_index:16;	/* uidb_index to transmit */
-	  u32 packet_type:2;	/* 1-IPv4, 2-Ipv6, - 0,3 - Unused */
-	  u32 ipv4_defrag:1;	/* 0 - Normal, 1 - update first
-				 * segment size
-				 * (set by 6rd defrag node)
-				 */
-
-	  u32 dst_ip_port_idx:4;	/* Index to dst_ip_port_table */
-	  u32 from_node:4;
-	  u32 calc_chksum:1;
-	  u32 reserved:4;
-	} tx;
-	struct _rx_pkt_info
-	{			/* Used by PD / PI communication */
-	  u32 uidb_index:16;	/* uidb_index received in packet */
-	  u32 packet_type:2;	/* 1-IPv4, 2-Ipv6, - 0,3 - Unused */
-	  u32 icmp_type:1;	/* 0-ICMP query type, 1-ICMP error type */
-	  u32 protocol_type:2;	/* 1-TCP, 2-UDP, 3-ICMP, 0 - Unused */
-	  u32 ipv4_defrag:1;	/* 0 - Normal, 1 - update first
-				 * segment size
-				 * (set by 6rd defrag node)
-				 */
-
-	  u32 direction:1;	/* 0-Outside, 1-Inside */
-	  u32 frag:1;		/*IP fragment-1, Otherwise-0 */
-	  u32 option:1;		/* 0-No IP option (v4) present, non-fragHdr
-				 * option hdr present (v6)
-				 */
-	  u32 df_bit:1;		/* IPv4 DF bit copied here */
-	  u32 reserved1:6;
-	} rx;
-      } ru;
-      /****** END  spp_ctx_t section ***********************/
-
-      union
-      {
-	struct
-	{
-	  u32 ipv4;
-	  u16 port;
-	  u16 vrf;		//bit0-13:i/f, bit14-15:protocol
-	} k;
-
-	u64 key64;
-      } key;
-
-      u32 bucket;
-
-      u16 ovrf;			/* Exit interface */
-      u8 frag_pkt;
-      u8 vcgn_unused1;
-    } vcgn_uii;
-
-    /* MAP */
-    struct
-    {
-      u16 mtu;
-    } map;
-
-    /* MAP-T */
-    struct
-    {
-      u32 map_domain_index;
-      struct
-      {
-	u32 saddr, daddr;
-	u16 frag_offset;	//Fragmentation header offset
-	u16 l4_offset;		//L4 header overall offset
-	u8 l4_protocol;		//The final protocol number
-      } v6;			//Used by ip6_map_t only
-      u16 checksum_offset;	//L4 checksum overall offset
-      u16 mtu;			//Exit MTU
-    } map_t;
-
-    /* IP Fragmentation */
-    struct
-    {
-      u16 header_offset;
-      u16 mtu;
-      u8 next_index;
-      u8 flags;			//See ip_frag.h
-    } ip_frag;
-
-    /* COP - configurable junk filter(s) */
-    struct
-    {
-      /* Current configuration index. */
-      u32 current_config_index;
-    } cop;
-
-    /* LISP */
-    struct
-    {
-      /* overlay address family */
-      u16 overlay_afi;
-    } lisp;
-
-    /* Driver rx feature */
-    struct
-    {
-      u32 saved_next_index;		/**< saved by drivers for short-cut */
-      u16 buffer_advance;
-    } device_input_feat;
-
-    u32 unused[6];
-  };
-} vnet_buffer_opaque_t;
-
-/*
- * The opaque field of the vlib_buffer_t is intepreted as a
- * vnet_buffer_opaque_t. Hence it should be big enough to accommodate one.
- */
-STATIC_ASSERT (sizeof (vnet_buffer_opaque_t) <= STRUCT_SIZE_OF (vlib_buffer_t,
-								opaque),
-	       "VNET buffer meta-data too large for vlib_buffer");
-
-#define vnet_buffer(b) ((vnet_buffer_opaque_t *) (b)->opaque)
-
-/* Full cache line (64 bytes) of additional space */
-typedef struct
-{
-  union
-  {
-  };
-} vnet_buffer_opaque2_t;
-
-
-
-#endif /* included_vnet_buffer_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/cdp/cdp.pg b/vnet/vnet/cdp/cdp.pg
deleted file mode 100644
index b6ba1865..00000000
--- a/vnet/vnet/cdp/cdp.pg
+++ /dev/null
@@ -1,7 +0,0 @@
-packet-generator new {
-  name cdp
-  limit 1
-  node cdp-input
-  size 374-374
-  data { hex 0x02b46b96000100096978676265000500bf436973636f20494f5320536f6674776172652c2043333735304520536f66747761726520284333373530452d554e4956455253414c2d4d292c2056657273696f6e2031322e32283335295345352c2052454c4541534520534f4654574152452028666331290a436f707972696768742028632920313938362d3230303720627920436973636f2053797374656d732c20496e632e0a436f6d70696c6564205468752031392d4a756c2d30372031363a3137206279206e616368656e00060018636973636f2057532d4333373530452d3234544400020011000000010101cc0004000000000003001b54656e4769676162697445746865726e6574312f302f3100040008000000280008002400000c011200000000ffffffff010221ff000000000000001e7a50f000ff000000090004000a00060001000b0005010012000500001300050000160011000000010101cc000400000000001a00100000000100000000ffffffff }
-}
diff --git a/vnet/vnet/cdp/cdp_input.c b/vnet/vnet/cdp/cdp_input.c
deleted file mode 100644
index 3574de68..00000000
--- a/vnet/vnet/cdp/cdp_input.c
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/cdp/cdp_node.h>
-
-cdp_main_t cdp_main;
-
-#define DEBUG_TLV_DUMP 0	/* 1=> dump TLV's to stdout while processing them */
-
-/* Reliable multicast messages we use to keep peers updated */
-mc_serialize_msg_t serialize_cdp_neighbor_msg;
-mc_serialize_msg_t serialize_cdp_keepalive_msg;
-
-/*
- * ported from an unspecified Cisco cdp implementation.
- * Compute / return in HOST byte order. 0 => good checksum.
- */
-u16
-cdp_checksum (void *p, int count)
-{
-  u32 sum;
-  u16 i, *data;
-
-  data = p;
-  sum = 0;
-  while (count > 1)
-    {
-      sum += ntohs (*data);
-      data++;
-      count -= 2;
-    }
-
-  if (count > 0)
-    sum += *(char *) data;
-
-  while (sum >> 16)
-    {
-      sum = (sum & 0xFFFF) + (sum >> 16);
-    }
-
-  i = (i16) sum;
-  return (~i);
-}
-
-/* TLV handler table */
-typedef struct
-{
-  char *name;
-  u32 tlv_id;
-  void *format;
-  void *process;
-} tlv_handler_t;
-
-static tlv_handler_t tlv_handlers[];
-
-/* Display a generic TLV as a set of hex bytes */
-static u8 *
-format_generic_tlv (u8 * s, va_list * va)
-{
-  cdp_tlv_t *t = va_arg (*va, cdp_tlv_t *);
-  tlv_handler_t *h = &tlv_handlers[t->t];
-
-  s = format (s, "%s(%d): %U\n", h->name,
-	      t->t, format_hex_bytes, t->v, t->l - sizeof (*t));
-  return s;
-}
-
-/* Ignore / skip a TLV we don't support */
-static cdp_error_t
-process_generic_tlv (cdp_main_t * cm, cdp_neighbor_t * n, cdp_tlv_t * t)
-{
-#if DEBUG_TLV_DUMP > 0
-  fformat (stdout, "%U", format_generic_tlv, t);
-#endif
-
-  return CDP_ERROR_NONE;
-}
-
-/* print a text tlv */
-static u8 *
-format_text_tlv (u8 * s, va_list * va)
-{
-  cdp_tlv_t *t = va_arg (*va, cdp_tlv_t *);
-  tlv_handler_t *h = &tlv_handlers[t->t];
-  int i;
-
-  s = format (s, "%s(%d): ", h->name, t->t);
-
-  for (i = 0; i < (t->l - sizeof (*t)); i++)
-    vec_add1 (s, t->v[i]);
-
-  vec_add1 (s, '\n');
-  return s;
-}
-
-#if DEBUG_TLV_DUMP == 0
-/* gcc warning be gone */
-CLIB_UNUSED (static cdp_error_t
-	     process_text_tlv (cdp_main_t * cm, cdp_neighbor_t * n,
-			       cdp_tlv_t * t));
-#endif
-
-/* process / skip a generic text TLV that we don't support */
-static cdp_error_t
-process_text_tlv (cdp_main_t * cm, cdp_neighbor_t * n, cdp_tlv_t * t)
-{
-#if DEBUG_TLV_DUMP > 0
-  fformat (stdout, "%U\n", format_text_tlv, t);
-#endif
-
-  return CDP_ERROR_NONE;
-}
-
-/* per-TLV format function definitions */
-#define format_unused_tlv format_generic_tlv
-#define format_device_name_tlv format_text_tlv
-#define format_address_tlv format_generic_tlv
-#define format_port_id_tlv format_text_tlv
-#define format_capabilities_tlv format_generic_tlv
-#define format_version_tlv format_text_tlv
-#define format_platform_tlv format_text_tlv
-#define format_ipprefix_tlv format_generic_tlv
-#define format_hello_tlv format_generic_tlv
-#define format_vtp_domain_tlv format_generic_tlv
-#define format_native_vlan_tlv format_generic_tlv
-#define format_duplex_tlv format_generic_tlv
-#define format_appl_vlan_tlv format_generic_tlv
-#define format_trigger_tlv format_generic_tlv
-#define format_power_tlv format_generic_tlv
-#define format_mtu_tlv format_generic_tlv
-#define format_trust_tlv format_generic_tlv
-#define format_cos_tlv format_generic_tlv
-#define format_sysname_tlv format_generic_tlv
-#define format_sysobject_tlv format_generic_tlv
-#define format_mgmt_addr_tlv format_generic_tlv
-#define format_physical_loc_tlv format_generic_tlv
-#define format_mgmt_addr2_tlv format_generic_tlv
-#define format_power_requested_tlv format_generic_tlv
-#define format_power_available_tlv format_generic_tlv
-#define format_port_unidirectional_tlv format_generic_tlv
-#define format_unknown_28_tlv format_generic_tlv
-#define format_energywise_tlv format_generic_tlv
-#define format_unknown_30_tlv format_generic_tlv
-#define format_spare_poe_tlv format_generic_tlv
-
-/* tlv ID=0 is a mistake */
-static cdp_error_t
-process_unused_tlv (cdp_main_t * cm, cdp_neighbor_t * n, cdp_tlv_t * t)
-{
-  return CDP_ERROR_BAD_TLV;
-}
-
-/* list of text TLV's that we snapshoot */
-#define foreach_text_to_struct_tlv              \
-_(device_name,DEBUG_TLV_DUMP)                   \
-_(version,DEBUG_TLV_DUMP)                       \
-_(platform,DEBUG_TLV_DUMP)                      \
-_(port_id,DEBUG_TLV_DUMP)
-
-#define _(z,dbg)                                                        \
-static                                                                  \
-cdp_error_t process_##z##_tlv (cdp_main_t *cm, cdp_neighbor_t *n,       \
-                                  cdp_tlv_t *t)                         \
-{                                                                       \
-    int i;                                                              \
-    if (dbg)                                                            \
-       fformat(stdout, "%U\n", format_text_tlv, t);                     \
-                                                                        \
-    if (n->z)                                                           \
-        _vec_len(n->z) = 0;                                             \
-                                                                        \
-    for (i = 0; i < (t->l - sizeof (*t)); i++)                          \
-        vec_add1(n->z, t->v[i]);                                        \
-                                                                        \
-    vec_add1(n->z, 0);                                                  \
-                                                                        \
-    return CDP_ERROR_NONE;                                              \
-}
-
-foreach_text_to_struct_tlv
-#undef _
-#define process_address_tlv process_generic_tlv
-#define process_capabilities_tlv process_generic_tlv
-#define process_ipprefix_tlv process_generic_tlv
-#define process_hello_tlv process_generic_tlv
-#define process_vtp_domain_tlv process_generic_tlv
-#define process_native_vlan_tlv process_generic_tlv
-#define process_duplex_tlv process_generic_tlv
-#define process_appl_vlan_tlv process_generic_tlv
-#define process_trigger_tlv process_generic_tlv
-#define process_power_tlv process_generic_tlv
-#define process_mtu_tlv process_generic_tlv
-#define process_trust_tlv process_generic_tlv
-#define process_cos_tlv process_generic_tlv
-#define process_sysname_tlv process_generic_tlv
-#define process_sysobject_tlv process_generic_tlv
-#define process_mgmt_addr_tlv process_generic_tlv
-#define process_physical_loc_tlv process_generic_tlv
-#define process_mgmt_addr2_tlv process_generic_tlv
-#define process_power_requested_tlv process_generic_tlv
-#define process_power_available_tlv process_generic_tlv
-#define process_port_unidirectional_tlv process_generic_tlv
-#define process_unknown_28_tlv process_generic_tlv
-#define process_energywise_tlv process_generic_tlv
-#define process_unknown_30_tlv process_generic_tlv
-#define process_spare_poe_tlv process_generic_tlv
-static tlv_handler_t tlv_handlers[] = {
-#define _(a) {#a, CDP_TLV_##a, format_##a##_tlv, process_##a##_tlv},
-  foreach_cdp_tlv_type
-#undef _
-};
-
-#if DEBUG_TLV_DUMP == 0
-CLIB_UNUSED (static u8 * format_cdp_hdr (u8 * s, va_list * va));
-#endif
-
-static u8 *
-format_cdp_hdr (u8 * s, va_list * va)
-{
-  cdp_hdr_t *h = va_arg (*va, cdp_hdr_t *);
-
-  s = format (s, "version %d, ttl %d(secs), cksum 0x%04x\n",
-	      h->version, h->ttl, h->checksum);
-  return s;
-}
-
-static cdp_error_t
-process_cdp_hdr (cdp_main_t * cm, cdp_neighbor_t * n, cdp_hdr_t * h)
-{
-#if DEBUG_TLV_DUMP > 0
-  fformat (stdout, "%U", format_cdp_hdr, h);
-#endif
-
-  if (h->version != 1 && h->version != 2)
-    return CDP_ERROR_PROTOCOL_VERSION;
-
-  n->ttl_in_seconds = h->ttl;
-
-  return CDP_ERROR_NONE;
-}
-
-/* scan a cdp packet; header, then tlv's */
-static int
-cdp_packet_scan (cdp_main_t * cm, cdp_neighbor_t * n)
-{
-  u8 *cur = n->last_rx_pkt;
-  cdp_hdr_t *h;
-  cdp_tlv_t *tlv;
-  cdp_error_t e = CDP_ERROR_NONE;
-  tlv_handler_t *handler;
-  cdp_error_t (*fp) (cdp_main_t *, cdp_neighbor_t *, cdp_tlv_t *);
-  u16 computed_checksum;
-
-  computed_checksum = cdp_checksum (cur, vec_len (cur));
-
-  if (computed_checksum)
-    return CDP_ERROR_CHECKSUM;
-
-  h = (cdp_hdr_t *) cur;
-
-  e = process_cdp_hdr (cm, n, h);
-  if (e)
-    return e;
-
-  cur = (u8 *) (h + 1);
-
-  while (cur < n->last_rx_pkt + vec_len (n->last_rx_pkt) - 1)
-    {
-      tlv = (cdp_tlv_t *) cur;
-      tlv->t = ntohs (tlv->t);
-      tlv->l = ntohs (tlv->l);
-      if (tlv->t >= ARRAY_LEN (tlv_handlers))
-	return CDP_ERROR_BAD_TLV;
-      handler = &tlv_handlers[tlv->t];
-      fp = handler->process;
-      e = (*fp) (cm, n, tlv);
-      if (e)
-	return e;
-      /* tlv length includes (t, l) */
-      cur += tlv->l;
-    }
-
-  return CDP_ERROR_NONE;
-}
-
-/*
- * cdp input routine
- */
-cdp_error_t
-cdp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0)
-{
-  cdp_main_t *cm = &cdp_main;
-  cdp_neighbor_t *n;
-  uword *p, nbytes;
-  cdp_error_t e;
-  uword last_packet_signature;
-
-  /* find or create a neighbor pool entry for the (sw) interface
-     upon which we received this pkt */
-  p = hash_get (cm->neighbor_by_sw_if_index,
-		vnet_buffer (b0)->sw_if_index[VLIB_RX]);
-
-  if (p == 0)
-    {
-      pool_get (cm->neighbors, n);
-      memset (n, 0, sizeof (*n));
-      n->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      n->packet_template_index = (u8) ~ 0;
-      hash_set (cm->neighbor_by_sw_if_index, n->sw_if_index,
-		n - cm->neighbors);
-    }
-  else
-    {
-      n = pool_elt_at_index (cm->neighbors, p[0]);
-    }
-
-  /*
-   * typical clib idiom. Don't repeatedly allocate and free
-   * the per-neighbor rx buffer. Reset its apparent length to zero
-   * and reuse it.
-   */
-
-  if (n->last_rx_pkt)
-    _vec_len (n->last_rx_pkt) = 0;
-
-  /* cdp disabled on this interface, we're done */
-  if (n->disabled)
-    return CDP_ERROR_DISABLED;
-
-  /*
-   * Make sure the per-neighbor rx buffer is big enough to hold
-   * the data we're about to copy
-   */
-  vec_validate (n->last_rx_pkt, vlib_buffer_length_in_chain (vm, b0) - 1);
-
-  /*
-   * Coalesce / copy e the buffer chain into the per-neighbor
-   * rx buffer
-   */
-  nbytes = vlib_buffer_contents (vm, bi0, n->last_rx_pkt);
-  ASSERT (nbytes <= vec_len (n->last_rx_pkt));
-
-  /*
-   * Compute Jenkins hash of the new packet, decide if we need to
-   * actually parse through the TLV's. CDP packets are all identical,
-   * so unless we time out the peer, we don't need to process the packet.
-   */
-  last_packet_signature =
-    hash_memory (n->last_rx_pkt, vec_len (n->last_rx_pkt), 0xd00b);
-
-  if (n->last_packet_signature_valid &&
-      n->last_packet_signature == last_packet_signature)
-    {
-      e = CDP_ERROR_CACHE_HIT;
-    }
-  else
-    {
-      /* Actually scan the packet */
-      e = cdp_packet_scan (cm, n);
-      n->last_packet_signature_valid = 1;
-      n->last_packet_signature = last_packet_signature;
-    }
-
-  if (e == CDP_ERROR_NONE)
-    {
-      n->last_heard = vlib_time_now (vm);
-    }
-
-  return e;
-}
-
-/*
- * setup neighbor hash table
- */
-static clib_error_t *
-cdp_init (vlib_main_t * vm)
-{
-  clib_error_t *error;
-  cdp_main_t *cm = &cdp_main;
-  void vnet_cdp_node_reference (void);
-
-  vnet_cdp_node_reference ();
-
-  if ((error = vlib_call_init_function (vm, cdp_periodic_init)))
-    return error;
-
-  cm->vlib_main = vm;
-  cm->vnet_main = vnet_get_main ();
-  cm->neighbor_by_sw_if_index = hash_create (0, sizeof (uword));
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (cdp_init);
-
-
-static u8 *
-format_cdp_neighbors (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  cdp_main_t *cm = va_arg (*va, cdp_main_t *);
-  vnet_main_t *vnm = &vnet_main;
-  cdp_neighbor_t *n;
-  vnet_hw_interface_t *hw;
-
-  s = format (s,
-	      "%=25s %=15s %=25s %=10s\n",
-	      "Our Port", "Peer System", "Peer Port", "Last Heard");
-
-  /* *INDENT-OFF* */
-  pool_foreach (n, cm->neighbors,
-  ({
-    hw = vnet_get_sup_hw_interface (vnm, n->sw_if_index);
-
-    if (n->disabled == 0)
-      s = format (s, "%=25s %=15s %=25s %=10.1f\n",
-                  hw->name, n->device_name, n->port_id,
-                  n->last_heard);
-  }));
-  /* *INDENT-ON* */
-  return s;
-}
-
-
-static clib_error_t *
-show_cdp (vlib_main_t * vm,
-	  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  cdp_main_t *cm = &cdp_main;
-
-  vlib_cli_output (vm, "%U\n", format_cdp_neighbors, vm, cm);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_cdp_command, static) = {
-  .path = "show cdp",
-  .short_help = "Show cdp command",
-  .function = show_cdp,
-};
-/* *INDENT-ON* */
-
-
-/*
- * packet trace format function, very similar to
- * cdp_packet_scan except that we call the per TLV format
- * functions instead of the per TLV processing functions
- */
-u8 *
-cdp_input_format_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  cdp_input_trace_t *t = va_arg (*args, cdp_input_trace_t *);
-  u8 *cur;
-  cdp_hdr_t *h;
-  cdp_tlv_t *tlv;
-  tlv_handler_t *handler;
-  u8 *(*fp) (cdp_tlv_t *);
-
-  cur = t->data;
-
-  h = (cdp_hdr_t *) cur;
-  s = format (s, "%U", format_cdp_hdr, h);
-
-  cur = (u8 *) (h + 1);
-
-  while (cur < t->data + t->len)
-    {
-      tlv = (cdp_tlv_t *) cur;
-      tlv->t = ntohs (tlv->t);
-      tlv->l = ntohs (tlv->l);
-      if (tlv->t >= ARRAY_LEN (tlv_handlers))
-	{
-	  s = format (s, "BAD_TLV\n");
-	  break;
-	}
-      handler = &tlv_handlers[tlv->t];
-      fp = handler->format;
-      s = format (s, "  %U", fp, tlv);
-      /* tlv length includes (t, l) */
-      cur += tlv->l;
-    }
-
-  return s;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/cdp/cdp_node.c b/vnet/vnet/cdp/cdp_node.c
deleted file mode 100644
index 39ac4a90..00000000
--- a/vnet/vnet/cdp/cdp_node.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/cdp/cdp_node.h>
-#include <vnet/ethernet/packet.h>
-
-static vlib_node_registration_t cdp_process_node;
-
-/** \file
-
-    2 x CDP graph nodes: an "interior" node to process
-    incoming announcements, and a "process" node to periodically
-    send announcements.
-
-    The interior node is neither pipelined nor dual-looped, because
-    it would be very unusual to see more than one CDP packet in
-    a given input frame. So, it's a very simple / straighforward
-    example.
-*/
-
-/*
- * packet counter strings
- * Dump these counters via the "show error" CLI command
- */
-static char *cdp_error_strings[] = {
-#define _(sym,string) string,
-  foreach_cdp_error
-#undef _
-};
-
-/*
- * We actually send all cdp pkts to the "error" node after scanning
- * them, so the graph node has only one next-index. The "error-drop"
- * node automatically bumps our per-node packet counters for us.
- */
-typedef enum
-{
-  CDP_INPUT_NEXT_NORMAL,
-  CDP_INPUT_N_NEXT,
-} cdp_next_t;
-
-/*
- * Process a frame of cdp packets
- * Expect 1 packet / frame
- */
-static uword
-cdp_node_fn (vlib_main_t * vm,
-	     vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from;
-  cdp_input_trace_t *t0;
-
-  from = vlib_frame_vector_args (frame);	/* array of buffer indices */
-  n_left_from = frame->n_vectors;	/* number of buffer indices */
-
-  while (n_left_from > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      u32 next0, error0;
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-
-      next0 = CDP_INPUT_NEXT_NORMAL;
-
-      /* scan this cdp pkt. error0 is the counter index to bump */
-      error0 = cdp_input (vm, b0, bi0);
-      b0->error = node->errors[error0];
-
-      /* If this pkt is traced, snapshoot the data */
-      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  int len;
-	  t0 = vlib_add_trace (vm, node, b0, sizeof (*t0));
-	  len = (b0->current_length < sizeof (t0->data))
-	    ? b0->current_length : sizeof (t0->data);
-	  t0->len = len;
-	  clib_memcpy (t0->data, vlib_buffer_get_current (b0), len);
-	}
-      /* push this pkt to the next graph node, always error-drop */
-      vlib_set_next_frame_buffer (vm, node, next0, bi0);
-
-      from += 1;
-      n_left_from -= 1;
-    }
-
-  return frame->n_vectors;
-}
-
-/*
- * cdp input graph node declaration
- */
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (cdp_input_node, static) = {
-  .function = cdp_node_fn,
-  .name = "cdp-input",
-  .vector_size = sizeof (u32),
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = CDP_N_ERROR,
-  .error_strings = cdp_error_strings,
-
-  .format_trace = cdp_input_format_trace,
-
-  .n_next_nodes = CDP_INPUT_N_NEXT,
-  .next_nodes = {
-    [CDP_INPUT_NEXT_NORMAL] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/*
- * cdp periodic function
- */
-static uword
-cdp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  cdp_main_t *cm = &cdp_main;
-  f64 poll_time_remaining;
-  uword event_type, *event_data = 0;
-
-  /* So we can send events to the cdp process */
-  cm->cdp_process_node_index = cdp_process_node.index;
-
-  /* Dynamically register the cdp input node with the snap classifier */
-  snap_register_input_protocol (vm, "cdp-input", 0xC /* ieee_oui, Cisco */ ,
-				0x2000 /* protocol CDP */ ,
-				cdp_input_node.index);
-
-  snap_register_input_protocol (vm, "cdp-input", 0xC /* ieee_oui, Cisco */ ,
-				0x2004 /* protocol CDP */ ,
-				cdp_input_node.index);
-
-#if 0				/* retain for reference */
-  /* with the hdlc classifier */
-  hdlc_register_input_protocol (vm, HDLC_PROTOCOL_cdp, cdp_input_node.index);
-#endif
-
-  /* with ethernet input (for SRP) */
-  ethernet_register_input_type (vm, ETHERNET_TYPE_CDP /* CDP */ ,
-				cdp_input_node.index);
-
-  poll_time_remaining = 10.0 /* seconds */ ;
-  while (1)
-    {
-      /* sleep until next poll time, or msg serialize event occurs */
-      poll_time_remaining =
-	vlib_process_wait_for_event_or_clock (vm, poll_time_remaining);
-
-      event_type = vlib_process_get_events (vm, &event_data);
-      switch (event_type)
-	{
-	case ~0:		/* no events => timeout */
-	  break;
-
-	default:
-	  clib_warning ("BUG: event type 0x%wx", event_type);
-	  break;
-	}
-      if (event_data)
-	_vec_len (event_data) = 0;
-
-      /* peer timeout scan, send announcements */
-      if (vlib_process_suspend_time_is_zero (poll_time_remaining))
-	{
-	  cdp_periodic (vm);
-	  poll_time_remaining = 10.0;
-	}
-    }
-
-  return 0;
-}
-
-/*
- * cdp periodic node declaration
- */
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (cdp_process_node, static) = {
-  .function = cdp_process,
-  .type = VLIB_NODE_TYPE_PROCESS,
-  .name = "cdp-process",
-};
-/* *INDENT-ON* */
-
-void
-vnet_cdp_node_reference (void)
-{
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/cdp/cdp_node.h b/vnet/vnet/cdp/cdp_node.h
deleted file mode 100644
index 7028ddca..00000000
--- a/vnet/vnet/cdp/cdp_node.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_cdp_node_h__
-#define __included_cdp_node_h__
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-
-#include <vnet/snap/snap.h>
-#include <vnet/hdlc/hdlc.h>
-#include <vnet/hdlc/packet.h>
-
-#include <vppinfra/format.h>
-#include <vppinfra/hash.h>
-
-#include <vnet/cdp/cdp_protocol.h>
-
-typedef enum
-{
-  CDP_PACKET_TEMPLATE_ETHERNET,
-  CDP_PACKET_TEMPLATE_HDLC,
-  CDP_PACKET_TEMPLATE_SRP,
-  CDP_N_PACKET_TEMPLATES,
-} cdp_packet_template_id_t;
-
-typedef struct
-{
-  /* neighbor's vlib software interface index */
-  u32 sw_if_index;
-
-  /* Timers */
-  f64 last_heard;
-  f64 last_sent;
-
-  /* Neighbor time-to-live (usually 180s) */
-  u8 ttl_in_seconds;
-
-  /* "no cdp run" or similar */
-  u8 disabled;
-
-  /* tx packet template id for this neighbor */
-  u8 packet_template_index;
-
-  /* Jenkins hash optimization: avoid tlv scan, send short keepalive msg */
-  u8 last_packet_signature_valid;
-  uword last_packet_signature;
-
-  /* Info we actually keep about each neighbor */
-  u8 *device_name;
-  u8 *version;
-  u8 *port_id;
-  u8 *platform;
-
-  /* last received packet, for the J-hash optimization */
-  u8 *last_rx_pkt;
-} cdp_neighbor_t;
-
-#define foreach_neighbor_string_field           \
-_(device_name)                                  \
-_(version)                                      \
-_(port_id)                                      \
-_(platform)
-
-typedef struct
-{
-  /* pool of cdp neighbors */
-  cdp_neighbor_t *neighbors;
-
-  /* tx pcap debug enable */
-  u8 tx_pcap_debug;
-
-  /* rapidly find a neighbor by vlib software interface index */
-  uword *neighbor_by_sw_if_index;
-
-  /* Background process node index */
-  u32 cdp_process_node_index;
-
-  /* Packet templates for different encap types */
-  vlib_packet_template_t packet_templates[CDP_N_PACKET_TEMPLATES];
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} cdp_main_t;
-
-cdp_main_t cdp_main;
-
-/* Packet counters */
-#define foreach_cdp_error                                       \
-_ (NONE, "good cdp packets (processed)")	                \
-_ (CACHE_HIT, "good cdp packets (cache hit)")			\
-_ (BAD_TLV, "cdp packets with bad TLVs")                        \
-_ (PROTOCOL_VERSION, "cdp packets with bad protocol versions")  \
-_ (CHECKSUM, "cdp packets with bad checksums")                  \
-_ (DISABLED, "cdp packets received on disabled interfaces")
-
-typedef enum
-{
-#define _(sym,str) CDP_ERROR_##sym,
-  foreach_cdp_error
-#undef _
-    CDP_N_ERROR,
-} cdp_error_t;
-
-/* cdp packet trace capture */
-typedef struct
-{
-  u32 len;
-  u8 data[400];
-} cdp_input_trace_t;
-
-typedef enum
-{
-  CDP_EVENT_SEND_NEIGHBOR,
-  CDP_EVENT_SEND_KEEPALIVE,
-} cdp_process_event_t;
-
-
-cdp_error_t cdp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0);
-void cdp_periodic (vlib_main_t * vm);
-void cdp_keepalive (cdp_main_t * cm, cdp_neighbor_t * n);
-u16 cdp_checksum (void *p, int count);
-u8 *cdp_input_format_trace (u8 * s, va_list * args);
-
-serialize_function_t serialize_cdp_main, unserialize_cdp_main;
-
-#endif /* __included_cdp_node_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/cdp/cdp_periodic.c b/vnet/vnet/cdp/cdp_periodic.c
deleted file mode 100644
index de111079..00000000
--- a/vnet/vnet/cdp/cdp_periodic.c
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/cdp/cdp_node.h>
-#include <vppinfra/hash.h>
-#include <vnet/unix/pcap.h>
-#include <vnet/srp/srp.h>
-#include <vnet/ppp/ppp.h>
-#include <vnet/hdlc/hdlc.h>
-#include <vnet/srp/packet.h>
-
-/*
- * Generate a set of specific CDP TLVs.
- *
- * $$$ eventually these need to fish better data from
- * other data structures; e.g. the hostname, software version info
- * etc.
- */
-
-static void
-add_device_name_tlv (vnet_hw_interface_t * hw, u8 ** t0p)
-{
-  cdp_tlv_t *t = (cdp_tlv_t *) * t0p;
-
-  t->t = htons (CDP_TLV_device_name);
-  t->l = htons (3 + sizeof (*t));
-  clib_memcpy (&t->v, "VPP", 3);
-
-  *t0p += ntohs (t->l);
-}
-
-static void
-add_port_id_tlv (vnet_hw_interface_t * hw, u8 ** t0p)
-{
-  cdp_tlv_t *t = (cdp_tlv_t *) * t0p;
-
-  t->t = htons (CDP_TLV_port_id);
-  t->l = htons (vec_len (hw->name) + sizeof (*t));
-  clib_memcpy (&t->v, hw->name, vec_len (hw->name));
-  *t0p += ntohs (t->l);
-}
-
-static void
-add_version_tlv (vnet_hw_interface_t * hw, u8 ** t0p)
-{
-  cdp_tlv_t *t = (cdp_tlv_t *) * t0p;
-
-  t->t = htons (CDP_TLV_version);
-  t->l = htons (12 + sizeof (*t));
-  clib_memcpy (&t->v, "VPP Software", 12);
-  *t0p += ntohs (t->l);
-}
-
-static void
-add_platform_tlv (vnet_hw_interface_t * hw, u8 ** t0p)
-{
-  cdp_tlv_t *t = (cdp_tlv_t *) * t0p;
-
-  t->t = htons (CDP_TLV_platform);
-  t->l = htons (2 + sizeof (*t));
-  clib_memcpy (&t->v, "SW", 2);
-  *t0p += ntohs (t->l);
-}
-
-static void
-add_capability_tlv (vnet_hw_interface_t * hw, u8 ** t0p)
-{
-  cdp_tlv_t *t = (cdp_tlv_t *) * t0p;
-  u32 capabilities;
-
-  t->t = htons (CDP_TLV_capabilities);
-  t->l = htons (4 + sizeof (*t));
-  capabilities = CDP_ROUTER_DEVICE;
-  capabilities = htonl (capabilities);
-  clib_memcpy (&t->v, &capabilities, sizeof (capabilities));
-  *t0p += ntohs (t->l);
-}
-
-static void
-add_tlvs (cdp_main_t * cm, vnet_hw_interface_t * hw, u8 ** t0p)
-{
-  add_device_name_tlv (hw, t0p);
-  add_port_id_tlv (hw, t0p);
-  add_version_tlv (hw, t0p);
-  add_platform_tlv (hw, t0p);
-  add_capability_tlv (hw, t0p);
-}
-
-/*
- * send a cdp pkt on an ethernet interface
- */
-static void
-send_ethernet_hello (cdp_main_t * cm, cdp_neighbor_t * n, int count)
-{
-  u32 *to_next;
-  ethernet_llc_snap_and_cdp_header_t *h0;
-  vnet_hw_interface_t *hw;
-  u32 bi0;
-  vlib_buffer_t *b0;
-  u8 *t0;
-  u16 checksum;
-  int nbytes_to_checksum;
-  int i;
-  vlib_frame_t *f;
-  vlib_main_t *vm = cm->vlib_main;
-  vnet_main_t *vnm = cm->vnet_main;
-
-  for (i = 0; i < count; i++)
-    {
-      /*
-       * see cdp_periodic_init() to understand what's already painted
-       * into the buffer by the packet template mechanism
-       */
-      h0 = vlib_packet_template_get_packet
-	(vm, &cm->packet_templates[n->packet_template_index], &bi0);
-
-      /* Add the interface's ethernet source address */
-      hw = vnet_get_sup_hw_interface (vnm, n->sw_if_index);
-
-      clib_memcpy (h0->ethernet.src_address, hw->hw_address,
-		   vec_len (hw->hw_address));
-
-      t0 = (u8 *) & h0->cdp.data;
-
-      /* add TLVs */
-      add_tlvs (cm, hw, &t0);
-
-      /* add the cdp packet checksum */
-      nbytes_to_checksum = t0 - (u8 *) & h0->cdp;
-      checksum = cdp_checksum (&h0->cdp, nbytes_to_checksum);
-      h0->cdp.checksum = htons (checksum);
-
-      /* Set the outbound packet length */
-      b0 = vlib_get_buffer (vm, bi0);
-      b0->current_length = nbytes_to_checksum + sizeof (*h0)
-	- sizeof (cdp_hdr_t);
-
-      /* And the outbound interface */
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] = hw->sw_if_index;
-
-      /* Set the 802.3 ethernet length */
-      h0->ethernet.len = htons (b0->current_length
-				- sizeof (ethernet_802_3_header_t));
-
-      /* And output the packet on the correct interface */
-      f = vlib_get_frame_to_node (vm, hw->output_node_index);
-      to_next = vlib_frame_vector_args (f);
-      to_next[0] = bi0;
-      f->n_vectors = 1;
-
-      vlib_put_frame_to_node (vm, hw->output_node_index, f);
-      n->last_sent = vlib_time_now (vm);
-    }
-}
-
-/*
- * send a cdp pkt on an hdlc interface
- */
-static void
-send_hdlc_hello (cdp_main_t * cm, cdp_neighbor_t * n, int count)
-{
-  u32 *to_next;
-  hdlc_and_cdp_header_t *h0;
-  vnet_hw_interface_t *hw;
-  u32 bi0;
-  vlib_buffer_t *b0;
-  u8 *t0;
-  u16 checksum;
-  int nbytes_to_checksum;
-  int i;
-  vlib_frame_t *f;
-  vlib_main_t *vm = cm->vlib_main;
-  vnet_main_t *vnm = cm->vnet_main;
-
-  for (i = 0; i < count; i++)
-    {
-      /*
-       * see cdp_periodic_init() to understand what's already painted
-       * into the buffer by the packet template mechanism
-       */
-      h0 = vlib_packet_template_get_packet
-	(vm, &cm->packet_templates[n->packet_template_index], &bi0);
-
-      hw = vnet_get_sup_hw_interface (vnm, n->sw_if_index);
-
-      t0 = (u8 *) & h0->cdp.data;
-
-      /* add TLVs */
-      add_tlvs (cm, hw, &t0);
-
-      /* add the cdp packet checksum */
-      nbytes_to_checksum = t0 - (u8 *) & h0->cdp;
-      checksum = cdp_checksum (&h0->cdp, nbytes_to_checksum);
-      h0->cdp.checksum = htons (checksum);
-
-      /* Set the outbound packet length */
-      b0 = vlib_get_buffer (vm, bi0);
-      b0->current_length = nbytes_to_checksum + sizeof (*h0)
-	- sizeof (cdp_hdr_t);
-
-      /* And output the packet on the correct interface */
-      f = vlib_get_frame_to_node (vm, hw->output_node_index);
-      to_next = vlib_frame_vector_args (f);
-      to_next[0] = bi0;
-      f->n_vectors = 1;
-
-      vlib_put_frame_to_node (vm, hw->output_node_index, f);
-      n->last_sent = vlib_time_now (vm);
-    }
-}
-
-/*
- * send a cdp pkt on an srp interface
- */
-static void
-send_srp_hello (cdp_main_t * cm, cdp_neighbor_t * n, int count)
-{
-  u32 *to_next;
-  srp_and_cdp_header_t *h0;
-  vnet_hw_interface_t *hw;
-  u32 bi0;
-  vlib_buffer_t *b0;
-  u8 *t0;
-  u16 checksum;
-  int nbytes_to_checksum;
-  int i;
-  vlib_frame_t *f;
-  vlib_main_t *vm = cm->vlib_main;
-  vnet_main_t *vnm = cm->vnet_main;
-
-  for (i = 0; i < count; i++)
-    {
-      /*
-       * see cdp_periodic_init() to understand what's already painted
-       * into the buffer by the packet template mechanism
-       */
-      h0 = vlib_packet_template_get_packet
-	(vm, &cm->packet_templates[n->packet_template_index], &bi0);
-
-      hw = vnet_get_sup_hw_interface (vnm, n->sw_if_index);
-
-      t0 = (u8 *) & h0->cdp.data;
-
-      /* add TLVs */
-      add_tlvs (cm, hw, &t0);
-
-      /* Add the interface's ethernet source address */
-      clib_memcpy (h0->ethernet.src_address, hw->hw_address,
-		   vec_len (hw->hw_address));
-
-      /* add the cdp packet checksum */
-      nbytes_to_checksum = t0 - (u8 *) & h0->cdp;
-      checksum = cdp_checksum (&h0->cdp, nbytes_to_checksum);
-      h0->cdp.checksum = htons (checksum);
-
-      /* Set the outbound packet length */
-      b0 = vlib_get_buffer (vm, bi0);
-      b0->current_length = nbytes_to_checksum + sizeof (*h0)
-	- sizeof (cdp_hdr_t);
-
-      /* And output the packet on the correct interface */
-      f = vlib_get_frame_to_node (vm, hw->output_node_index);
-      to_next = vlib_frame_vector_args (f);
-      to_next[0] = bi0;
-      f->n_vectors = 1;
-
-      vlib_put_frame_to_node (vm, hw->output_node_index, f);
-      n->last_sent = vlib_time_now (vm);
-    }
-}
-
-/*
- * Decide which cdp packet template to use
- */
-static int
-pick_packet_template (cdp_main_t * cm, cdp_neighbor_t * n)
-{
-  n->packet_template_index = CDP_PACKET_TEMPLATE_ETHERNET;
-
-  return 0;
-}
-
-/* Send a cdp neighbor announcement */
-static void
-send_hello (cdp_main_t * cm, cdp_neighbor_t * n, int count)
-{
-  if (n->packet_template_index == (u8) ~ 0)
-    {
-      /* If we don't know how to talk to this peer, don't try again */
-      if (pick_packet_template (cm, n))
-	{
-	  n->last_sent = 1e70;
-	  return;
-	}
-    }
-
-  switch (n->packet_template_index)
-    {
-    case CDP_PACKET_TEMPLATE_ETHERNET:
-      send_ethernet_hello (cm, n, count);
-      break;
-
-    case CDP_PACKET_TEMPLATE_HDLC:
-      send_hdlc_hello (cm, n, count);
-      break;
-
-    case CDP_PACKET_TEMPLATE_SRP:
-      send_srp_hello (cm, n, count);
-      break;
-
-    default:
-      ASSERT (0);
-    }
-  n->last_sent = vlib_time_now (cm->vlib_main);
-}
-
-static void
-delete_neighbor (cdp_main_t * cm, cdp_neighbor_t * n, int want_broadcast)
-{
-  hash_unset (cm->neighbor_by_sw_if_index, n->sw_if_index);
-  vec_free (n->device_name);
-  vec_free (n->version);
-  vec_free (n->port_id);
-  vec_free (n->platform);
-  vec_free (n->last_rx_pkt);
-  pool_put (cm->neighbors, n);
-}
-
-void
-cdp_periodic (vlib_main_t * vm)
-{
-  cdp_main_t *cm = &cdp_main;
-  cdp_neighbor_t *n;
-  f64 now = vlib_time_now (vm);
-  vnet_sw_interface_t *sw;
-  static u32 *delete_list = 0;
-  int i;
-  static cdp_neighbor_t **n_list = 0;
-
-  /* *INDENT-OFF* */
-  pool_foreach (n, cm->neighbors,
-  ({
-    vec_add1 (n_list, n);
-  }));
-  /* *INDENT-ON* */
-
-  /* Across all cdp neighbors known to the system */
-  for (i = 0; i < vec_len (n_list); i++)
-    {
-      n = n_list[i];
-
-      /* "no cdp run" provisioned on the interface? */
-      if (n->disabled == 1)
-	continue;
-
-      sw = vnet_get_sw_interface (cm->vnet_main, n->sw_if_index);
-
-      /* Interface shutdown or rx timeout? */
-      if (!(sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
-	  || (now > (n->last_heard + (f64) n->ttl_in_seconds)))
-	/* add to list of neighbors to delete */
-	vec_add1 (delete_list, n - cm->neighbors);
-      else if (n->last_sent == 0.0)
-	/* First time, send 3 hellos */
-	send_hello (cm, n, 3 /* three to begin with */ );
-      else if (now > (n->last_sent + (((f64) n->ttl_in_seconds) / 6.0)))
-	/* Normal keepalive, send one */
-	send_hello (cm, n, 1 /* one as a keepalive */ );
-    }
-
-  for (i = 0; i < vec_len (delete_list); i++)
-    {
-      n = vec_elt_at_index (cm->neighbors, delete_list[i]);
-      delete_neighbor (cm, n, 1);
-    }
-  if (delete_list)
-    _vec_len (delete_list) = 0;
-  if (n_list)
-    _vec_len (n_list) = 0;
-}
-
-static clib_error_t *
-cdp_periodic_init (vlib_main_t * vm)
-{
-  cdp_main_t *cm = &cdp_main;
-
-  /* Create the ethernet cdp hello packet template */
-  {
-    ethernet_llc_snap_and_cdp_header_t h;
-
-    memset (&h, 0, sizeof (h));
-
-    /* Send to 01:00:0c:cc:cc */
-    h.ethernet.dst_address[0] = 0x01;
-    /* h.ethernet.dst_address[1] = 0x00; (memset) */
-    h.ethernet.dst_address[2] = 0x0C;
-    h.ethernet.dst_address[3] = 0xCC;
-    h.ethernet.dst_address[4] = 0xCC;
-    h.ethernet.dst_address[5] = 0xCC;
-
-    /* leave src address blank (fill in at send time) */
-
-    /* leave length blank (fill in at send time) */
-
-    /* LLC */
-    h.llc.dst_sap = h.llc.src_sap = 0xAA;	/* SNAP */
-    h.llc.control = 0x03;	/* UI (no extended control bytes) */
-
-    /* SNAP */
-    /* h.snap.oui[0] = 0x00; (memset) */
-    /* h.snap.oui[1] = 0x00; (memset) */
-    h.snap.oui[2] = 0x0C;	/* Cisco = 0x00000C */
-    h.snap.protocol = htons (0x2000);	/* CDP = 0x2000 */
-
-    /* CDP */
-    h.cdp.version = 2;
-    h.cdp.ttl = 180;
-
-    vlib_packet_template_init
-      (vm, &cm->packet_templates[CDP_PACKET_TEMPLATE_ETHERNET],
-       /* data */ &h,
-       sizeof (h),
-       /* alloc chunk size */ 8,
-       "cdp-ethernet");
-  }
-
-#if 0				/* retain for reference */
-
-  /* Create the hdlc cdp hello packet template */
-  {
-    hdlc_and_cdp_header_t h;
-
-    memset (&h, 0, sizeof (h));
-
-    h.hdlc.address = 0x0f;
-    /* h.hdlc.control = 0; (memset) */
-    h.hdlc.protocol = htons (0x2000);	/* CDP = 0x2000 */
-
-    /* CDP */
-    h.cdp.version = 2;
-    h.cdp.ttl = 180;
-
-    vlib_packet_template_init
-      (vm, &cm->packet_templates[CDP_PACKET_TEMPLATE_HDLC],
-       /* data */ &h,
-       sizeof (h),
-       /* alloc chunk size */ 8,
-       "cdp-hdlc");
-  }
-
-  /* Create the srp cdp hello packet template */
-  {
-    srp_and_cdp_header_t h;
-
-    memset (&h, 0, sizeof (h));
-
-    /* Send to 01:00:0c:cc:cc */
-    h.ethernet.dst_address[0] = 0x01;
-    /* h.ethernet.dst_address[1] = 0x00; (memset) */
-    h.ethernet.dst_address[2] = 0x0C;
-    h.ethernet.dst_address[3] = 0xCC;
-    h.ethernet.dst_address[4] = 0xCC;
-    h.ethernet.dst_address[5] = 0xCC;
-
-    /* leave src address blank (fill in at send time) */
-
-    /* The srp header is filled in at xmt */
-    h.srp.ttl = 1;
-    h.srp.priority = 7;
-    h.srp.mode = SRP_MODE_data;
-    srp_header_compute_parity (&h.srp);
-
-    /* Inner ring and parity will be set at send time */
-
-    h.ethernet.type = htons (0x2000);	/* CDP = 0x2000 */
-
-    /* CDP */
-    h.cdp.version = 2;
-    h.cdp.ttl = 180;
-
-    vlib_packet_template_init
-      (vm, &cm->packet_templates[CDP_PACKET_TEMPLATE_SRP],
-       /* data */ &h,
-       sizeof (h),
-       /* alloc chunk size */ 8,
-       "cdp-srp");
-  }
-#endif
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (cdp_periodic_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/cdp/cdp_protocol.h b/vnet/vnet/cdp/cdp_protocol.h
deleted file mode 100644
index dc6c66d5..00000000
--- a/vnet/vnet/cdp/cdp_protocol.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_cdp_protocol_h__
-#define __included_cdp_protocol_h__
-
-#include <vnet/ethernet/ethernet.h>	/* for ethernet_header_t */
-#include <vnet/llc/llc.h>
-#include <vnet/snap/snap.h>
-#include <vnet/srp/packet.h>
-
-typedef CLIB_PACKED (struct
-		     {
-		     u8 version;
-		     u8 ttl;
-		     u16 checksum;	/* 1's complement of the 1's complement sum */
-		     u8 data[0];
-		     }) cdp_hdr_t;
-
-typedef struct
-{
-  u8 dst_address[6];
-  u8 src_address[6];
-  u16 len;
-} ethernet_802_3_header_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     ethernet_802_3_header_t ethernet;
-		     llc_header_t llc; snap_header_t snap; cdp_hdr_t cdp;
-		     }) ethernet_llc_snap_and_cdp_header_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     hdlc_header_t hdlc; cdp_hdr_t cdp;
-		     }) hdlc_and_cdp_header_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     srp_header_t srp;
-		     ethernet_header_t ethernet; cdp_hdr_t cdp;
-		     }) srp_and_cdp_header_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     u16 t;
-		     u16 l;
-		     u8 v[0];
-		     }) cdp_tlv_t;
-
-/*
- * TLV codes.
- */
-#define foreach_cdp_tlv_type                                    \
-_(unused)                                                       \
-_(device_name)		/* uniquely identifies the device    */ \
-_(address)              /* list of addresses this device has */ \
-_(port_id)              /* port CDP packet was sent out on   */ \
-_(capabilities)         /* funct. capabilities of the device */ \
-_(version)              /* version                           */ \
-_(platform)             /* hardware platform of this device  */ \
-_(ipprefix)             /* An IP network prefix              */ \
-_(hello)                /* Pprotocol piggyback hello msg     */ \
-_(vtp_domain)           /* VTP management domain             */ \
-_(native_vlan)          /* Native VLAN number                */ \
-_(duplex)               /* The interface duplex mode         */ \
-_(appl_vlan)            /* Appliance VLAN-ID TLV             */ \
-_(trigger)              /* For sending trigger TLV msgs.     */ \
-_(power)                /* Power consumption of that device  */ \
-_(mtu)                  /* MTU defined for sending intf.     */ \
-_(trust)                /* Extended trust TLV                */ \
-_(cos)                  /* COS for Untrusted Port TLV        */ \
-_(sysname)              /* System name (FQDN of device)      */ \
-_(sysobject)            /* OID of sysObjectID MIB object     */ \
-_(mgmt_addr)            /* SNMP manageable addrs. of device  */ \
-_(physical_loc)         /* Physical Location of the device   */ \
-_(mgmt_addr2)           /* External Port-ID                  */ \
-_(power_requested)                                              \
-_(power_available)                                              \
-_(port_unidirectional)                                          \
-_(unknown_28)                                                   \
-_(energywise)                                                   \
-_(unknown_30)                                                   \
-_(spare_poe)
-
-typedef enum
-{
-#define _(t) CDP_TLV_##t,
-  foreach_cdp_tlv_type
-#undef _
-} cdp_tlv_code_t;
-
-/*
-  The address TLV looks as follows:
-
-          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-          |                    Number of addresses                        |
-          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-          |                   IDRP encoded address                        |
-          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-	  An address is encoded in IDRP format:
-
-	   0                   1                   2                   3
-           0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-          |       PT      |    PT Length  |    Protocol (variable) ...
-          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-          |        Address length         |    Address (variable) ...
-          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-	  PT: Protocol type
-	      1 = NLPID format
-              2 = 802.2 format
-
-	  PT Length:
-	      Length of protocol field, 1 for PT = 1, and either 3 or 8 for
-	      802.2 format depending if SNAP is used for PT = 2.
-
-	      The encodings for the other protocols have the following format:
-
-          field:    <SSAP><DSAP><CTRL><-------OUI------><protocl_TYPE>
-                    |     |     |     |     |     |     |     |      |
-          bytes:    0     1     2     3     4     5     6     7      8
-
-          where the first 3 bytes are 0xAAAA03 for SNAP encoded addresses.
-          The OUI is 000000 for ethernet and <protocl_TYPE>
-          is the assigned Ethernet type code for the particular protocol.
-          e.g. for DECnet the encoding is AAAA03 000000 6003.
-               for IPv6   the encoding is AAAA03 000000 86DD
-*/
-
-/*
- * Capabilities.
- */
-
-#define CDP_ROUTER_DEVICE	0x0001
-#define CDP_TB_DEVICE		0x0002
-#define CDP_SRB_DEVICE		0x0004
-#define CDP_SWITCH_DEVICE	0x0008
-#define CDP_HOST_DEVICE		0x0010
-#define CDP_IGMP_DEVICE		0x0020
-#define CDP_REPEATER_DEVICE	0x0040
-
-/*
-  The protocol-hello TLV looks as follows:
-
-           0         1         2         3
-           012345678901234567890123456789012345678
-          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-          |      Type     |      Length   |
-          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-          |           OUI                         |
-          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-          |           Protocol ID         |
-          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	  |   up to 27 bytes of message           |
-          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-*/
-
-/*
- * These macros define the valid values for the Duplex TLV.
- */
-#define CDP_DUPLEX_TLV_HALF 0x0
-#define CDP_DUPLEX_TLV_FULL 0x1
-
-#endif /* __included_cdp_protocol_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/classify/README b/vnet/vnet/classify/README
deleted file mode 100644
index 1ef5ab5a..00000000
--- a/vnet/vnet/classify/README
+++ /dev/null
@@ -1,180 +0,0 @@
-=== vnet classifier theory of operation ===
-
-The vnet classifier trades off simplicity and perf / scale
-characteristics. At a certain level, it's a dumb robot. Given an
-incoming packet, search an ordered list of (mask, match) tables. If
-the classifier finds a matching entry, take the indicated action. If
-not, take a last-resort action.
-
-We use the MMX-unit to match or hash 16 octets at a time. For hardware
-backward compatibility, the code does not [currently] use 256-bit
-(32-octet) vector instructions.
-
-Effective use of the classifier centers around building table lists
-which "hit" as soon as practicable. In many cases, established
-sessions hit in the first table. In this mode of operation, the
-classifier easily processes multiple MPPS / core - even with millions
-of sessions in the data base. Searching 357 tables on a regular basis
-will neatly solve the halting problem.
-
-==== Basic operation ====
-
-The classifier mask-and-match operation proceeds as follows. Given a
-starting classifier table index, lay hands on the indicated mask
-vector.  When building tables, we arrange for the mask to obey
-mmx-unit (16-octet) alignment.
-
-We know that the first octet of packet data starts on a cache-line
-boundary. Further, it's reasonably likely that folks won't want to use
-the generalized classifier on the L2 header; preferring to decode the
-Ethertype manually. That scheme makes it easy to select among ip4 /
-ip6 / MPLS, etc. classifier table sets.
-
-A no-vlan-tag L2 header is 14 octets long. A typical ipv4 header
-begins with the octets 0x4500: version=4, header_length=5, DSCP=0,
-ECN=0. If one doesn't intend to classify on (DSCP, ECN) - the typical
-case - we program the classifier to skip the first 16-octet vector.
-
-To classify untagged ipv4 packets on source address, we program the
-classifier to skip one vector, and mask-and-match one vector.
-
-The basic match-and-match operation looks like this:
-
- switch (t->match_n_vectors)
-   {
-   case 1:
-     result = (data[0 + t->skip_n_vectors] & mask[0]) ^ key[0];
-     break;
-     
-   case 2:
-     result =  (data[0 + t->skip_n_vectors] & mask[0]) ^ key[0];
-     result |= (data[1 + t->skip_n_vectors] & mask[1]) ^ key[1];
-     break;
-     
-     <etc>
-    }
-
- result_mask = u32x4_zero_byte_mask (result);
- if (result_mask == 0xffff)
-     return (v);
-
-Net of setup, it costs a couple of clock cycles to mask-and-match 16
-octets.
-
-At the risk of belaboring an obvious point, the control-plane
-'''must''' pay attention to detail. When skipping one (or more)
-vectors, masks and matches must reflect that decision. See
-.../vnet/vnet/classify/vnet_classify.c:unformat_classify_[mask|match]. Note
-that vec_validate (xxx, 13) creates a 14-element vector.
-
-==== Creating a classifier table ====
-
-To create a new classifier table via the control-plane API, send a
-"classify_add_del_table" message. The underlying action routine,
-vnet_classify_add_del_table(...), is located in
-.../vnet/vnet/classify/vnet_classify.c, and has the following
-prototype:
-
- int vnet_classify_add_del_table (vnet_classify_main_t * cm,
-                                  u8 * mask, 
-                                  u32 nbuckets,
-                                  u32 memory_size,
-                                  u32 skip,
-                                  u32 match,
-                                  u32 next_table_index,
-                                  u32 miss_next_index,
-                                  u32 * table_index,
-                                  int is_add)
-
-Pass cm = &vnet_classify_main if calling this routine directly. Mask,
-skip(_n_vectors) and match(_n_vectors) are as described above. Mask
-need not be aligned, but it must be match*16 octets in length. To
-avoid having your head explode, be absolutely certain that '''only'''
-the bits you intend to match on are set.
-
-The classifier uses thread-safe, no-reader-locking-required
-bounded-index extensible hashing. Nbuckets is the [fixed] size of the
-hash bucket vector. The algorithm works in constant time regardless of
-hash collisions, but wastes space when the bucket array is too
-small. A good rule of thumb: let nbuckets = approximate number of
-entries expected.
-
-At a signficant cost in complexity, it would be possible to resize the
-bucket array dynamically. We have no plans to implement that function.
-
-Each classifier table has its own clib mheap memory allocation
-arena. To pick the memory_size parameter, note that each classifier
-table entry needs 16*(1 + match_n_vectors) bytes. Within reason, aim a
-bit high. Clib mheap memory uses o/s level virtual memory - not wired
-or hugetlb memory - so it's best not to scrimp on size.
-
-The "next_table_index" parameter is as described: the pool index in
-vnet_classify_main.tables of the next table to search. Code ~0 to
-indicate the end of the table list. 0 is a valid table index!
-
-We often create classification tables in reverse order -
-last-table-searched to first-table-searched - so we can easily set
-this parameter. Of course, one can manually adjust the data structure
-after-the-fact.
-
-Specific classifier client nodes - for example,
-.../vnet/vnet/classify/ip_classify.c - interpret the "miss_next_index"
-parameter as a vpp graph-node next index. When packet classification
-fails to produce a match, ip_classify_inline sends packets to the
-indicated disposition. A classifier application might program this
-parameter to send packets which don't match an existing session to a
-"first-sign-of-life, create-new-session" node.
-
-Finally, the is_add parameter indicates whether to add or delete the
-indicated table. The delete case implicitly terminates all sessions
-with extreme prejudice, by freeing the specified clib mheap.
-
-==== Creating a classifier session ====
-
-To create a new classifier session via the control-plane API, send a
-"classify_add_del_session" message. The underlying action routine,
-vnet_classify_add_del_session(...), is located in
-.../vnet/vnet/classify/vnet_classify.c, and has the following
-prototype:
-
-int vnet_classify_add_del_session (vnet_classify_main_t * cm, 
-                                   u32 table_index, 
-                                   u8 * match, 
-                                   u32 hit_next_index,
-                                   u32 opaque_index, 
-                                   i32 advance,
-                                   int is_add)
-
-Pass cm = &vnet_classify_main if calling this routine directly. Table
-index specifies the table which receives the new session / contains
-the session to delete depending on is_add.
-
-Match is the key for the indicated session. It need not be aligned,
-but it must be table->match_n_vectors*16 octets in length. As a
-courtesy, vnet_classify_add_del_session applies the table's mask to
-the stored key-value. In this way, one can create a session by passing
-unmasked (packet_data + offset) as the "match" parameter, and end up
-with unconfusing session keys. 
-
-Specific classifier client nodes - for example,
-.../vnet/vnet/classify/ip_classify.c - interpret the per-session
-hit_next_index parameter as a vpp graph-node next index. When packet
-classification produces a match, ip_classify_inline sends packets to
-the indicated disposition.
-
-ip4/6_classify place the per-session opaque_index parameter into
-vnet_buffer(b)->l2_classify.opaque_index; a slight misnomer, but
-anyhow classifier applications can send session-hit packets to
-specific graph nodes, with useful values in buffer metadata. Depending
-on the required semantics, we send known-session traffic to a certain
-node, with e.g. a session pool index in buffer metadata. It's totally
-up to the control-plane and the specific use-case.
-
-Finally, nodes such as ip4/6-classify apply the advance parameter as a
-[signed!] argument to vlib_buffer_advance(...); to "consume" a
-networking layer. Example: if we classify incoming tunneled IP packets
-by (inner) source/dest address and source/dest port, we might choose
-to decapsulate and reencapsulate the inner packet. In such a case,
-program the advance parameter to perform the tunnel decapsulation, and
-program next_index to send traffic to a node which uses
-e.g. opaque_index to output traffic on a specific tunnel interface.
diff --git a/vnet/vnet/classify/flow_classify.c b/vnet/vnet/classify/flow_classify.c
deleted file mode 100644
index 0a624204..00000000
--- a/vnet/vnet/classify/flow_classify.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/classify/flow_classify.h>
-
-static void
-vnet_flow_classify_feature_enable (vlib_main_t * vnm,
-                                   flow_classify_main_t * fcm,
-                                   u32 sw_if_index,
-                                   flow_classify_table_id_t tid,
-                                   int feature_enable)
-{
-  vnet_feature_config_main_t *vfcm;
-  u8 arc;
-
-  if (tid == FLOW_CLASSIFY_TABLE_IP4)
-    {
-      vnet_feature_enable_disable ("ip4-unicast", "ip4-flow-classify",
-				   sw_if_index, feature_enable, 0, 0);
-      arc = vnet_get_feature_arc_index ("ip4-unicast");
-    }
-  else
-    {
-      vnet_feature_enable_disable ("ip6-unicast", "ip6-flow-classify",
-				   sw_if_index, feature_enable, 0, 0);
-      arc = vnet_get_feature_arc_index ("ip6-unicast");
-    }
-
-  vfcm = vnet_get_feature_arc_config_main (arc);
-  fcm->vnet_config_main[tid] = &vfcm->config_main;
-}
-
-int vnet_set_flow_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
-                                  u32 ip4_table_index, u32 ip6_table_index,
-                                  u32 is_add)
-{
-  flow_classify_main_t * fcm = &flow_classify_main;
-  vnet_classify_main_t * vcm = fcm->vnet_classify_main;
-  u32 pct[FLOW_CLASSIFY_N_TABLES] = {ip4_table_index, ip6_table_index};
-  u32 ti;
-
-  /* Assume that we've validated sw_if_index in the API layer */
-
-  for (ti = 0; ti < FLOW_CLASSIFY_N_TABLES; ti++)
-    {
-      if (pct[ti] == ~0)
-        continue;
-
-      if (pool_is_free_index (vcm->tables, pct[ti]))
-        return VNET_API_ERROR_NO_SUCH_TABLE;
-
-      vec_validate_init_empty
-        (fcm->classify_table_index_by_sw_if_index[ti], sw_if_index, ~0);
-
-      /* Reject any DEL operation with wrong sw_if_index */
-      if (!is_add &&
-          (pct[ti] != fcm->classify_table_index_by_sw_if_index[ti][sw_if_index]))
-        {
-          clib_warning ("Non-existent intf_idx=%d with table_index=%d for delete",
-                        sw_if_index, pct[ti]);
-          return VNET_API_ERROR_NO_SUCH_TABLE;
-        }
-
-      /* Return ok on ADD operaton if feature is already enabled */
-      if (is_add &&
-          fcm->classify_table_index_by_sw_if_index[ti][sw_if_index] != ~0)
-          return 0;
-
-      vnet_flow_classify_feature_enable (vm, fcm, sw_if_index, ti, is_add);
-
-      if (is_add)
-        fcm->classify_table_index_by_sw_if_index[ti][sw_if_index] = pct[ti];
-      else
-        fcm->classify_table_index_by_sw_if_index[ti][sw_if_index] = ~0;
-    }
-
-
-  return 0;
-}
-
-static clib_error_t *
-set_flow_classify_command_fn (vlib_main_t * vm,
-                              unformat_input_t * input,
-                              vlib_cli_command_t * cmd)
-{
-  vnet_main_t * vnm = vnet_get_main();
-  u32 sw_if_index = ~0;
-  u32 ip4_table_index = ~0;
-  u32 ip6_table_index = ~0;
-  u32 is_add = 1;
-  u32 idx_cnt = 0;
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "interface %U", unformat_vnet_sw_interface,
-                    vnm, &sw_if_index))
-        ;
-      else if (unformat (input, "ip4-table %d", &ip4_table_index))
-        idx_cnt++;
-      else if (unformat (input, "ip6-table %d", &ip6_table_index))
-        idx_cnt++;
-      else if (unformat (input, "del"))
-        is_add = 0;
-      else
-        break;
-    }
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "Interface must be specified.");
-
-  if (!idx_cnt)
-    return clib_error_return (0, "Table index should be specified.");
-
-  if (idx_cnt > 1)
-    return clib_error_return (0, "Only one table index per API is allowed.");
-
-  rv = vnet_set_flow_classify_intfc(vm, sw_if_index, ip4_table_index,
-                                       ip6_table_index, is_add);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case VNET_API_ERROR_NO_MATCHING_INTERFACE:
-      return clib_error_return (0, "No such interface");
-
-    case VNET_API_ERROR_NO_SUCH_ENTRY:
-      return clib_error_return (0, "No such classifier table");
-    }
-  return 0;
-}
-
-VLIB_CLI_COMMAND (set_input_acl_command, static) = {
-    .path = "set flow classify",
-    .short_help =
-    "set flow classify interface <int> [ip4-table <index>]\n"
-    "  [ip6-table <index>] [del]",
-    .function = set_flow_classify_command_fn,
-};
-
-static uword
-unformat_table_type (unformat_input_t * input, va_list * va)
-{
-  u32 * r = va_arg (*va, u32 *);
-  u32 tid;
-
-  if (unformat (input, "ip4"))
-    tid = FLOW_CLASSIFY_TABLE_IP4;
-  else if (unformat (input, "ip6"))
-    tid = FLOW_CLASSIFY_TABLE_IP6;
-  else
-    return 0;
-
-  *r = tid;
-  return 1;
-}
-static clib_error_t *
-show_flow_classify_command_fn (vlib_main_t * vm,
-                               unformat_input_t * input,
-                               vlib_cli_command_t * cmd)
-{
-  flow_classify_main_t * fcm = &flow_classify_main;
-  u32 type = FLOW_CLASSIFY_N_TABLES;
-  u32 * vec_tbl;
-  int i;
-
-  if (unformat (input, "type %U", unformat_table_type, &type))
-    ;
-  else
-    return clib_error_return (0, "Type must be specified.");;
-
-  if (type == FLOW_CLASSIFY_N_TABLES)
-    return clib_error_return (0, "Invalid table type.");
-
-  vec_tbl = fcm->classify_table_index_by_sw_if_index[type];
-
-  if (vec_len(vec_tbl))
-      vlib_cli_output (vm, "%10s%20s\t\t%s", "Intfc idx", "Classify table",
-                       "Interface name");
-  else
-    vlib_cli_output (vm, "No tables configured.");
-
-  for (i = 0; i < vec_len (vec_tbl); i++)
-    {
-      if (vec_elt(vec_tbl, i) == ~0)
-        continue;
-
-      vlib_cli_output (vm, "%10d%20d\t\t%U", i, vec_elt(vec_tbl, i),
-                       format_vnet_sw_if_index_name, fcm->vnet_main, i);
-    }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (show_flow_classify_command, static) = {
-    .path = "show classify flow",
-    .short_help = "show classify flow type [ip4|ip6]",
-    .function = show_flow_classify_command_fn,
-};
diff --git a/vnet/vnet/classify/flow_classify.h b/vnet/vnet/classify/flow_classify.h
deleted file mode 100644
index 3ae04cd7..00000000
--- a/vnet/vnet/classify/flow_classify.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __included_vnet_flow_classify_h__
-#define __included_vnet_flow_classify_h__
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/classify/vnet_classify.h>
-
-typedef enum {
-  FLOW_CLASSIFY_TABLE_IP4,
-  FLOW_CLASSIFY_TABLE_IP6,
-  FLOW_CLASSIFY_N_TABLES,
-} flow_classify_table_id_t;
-
-typedef enum {
-  FLOW_CLASSIFY_NEXT_INDEX_DROP,
-  FLOW_CLASSIFY_NEXT_INDEX_N_NEXT,
-} flow_classify_next_index_t;
-
-typedef struct {
-  /* Classifier table vectors */
-  u32 * classify_table_index_by_sw_if_index [FLOW_CLASSIFY_N_TABLES];
-
-  /* Convenience variables */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-  vnet_classify_main_t * vnet_classify_main;
-  vnet_config_main_t * vnet_config_main [FLOW_CLASSIFY_N_TABLES];
-} flow_classify_main_t;
-
-flow_classify_main_t flow_classify_main;
-
-int vnet_set_flow_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
-                                  u32 ip4_table_index, u32 ip6_table_index,
-                                  u32 is_add);
-
-#endif /* __included_vnet_flow_classify_h__ */
diff --git a/vnet/vnet/classify/flow_classify_node.c b/vnet/vnet/classify/flow_classify_node.c
deleted file mode 100644
index d3261d33..00000000
--- a/vnet/vnet/classify/flow_classify_node.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdint.h>
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/classify/flow_classify.h>
-#include <vnet/classify/vnet_classify.h>
-
-typedef struct {
-  u32 sw_if_index;
-  u32 next_index;
-  u32 table_index;
-  u32 offset;
-} flow_classify_trace_t;
-
-static u8 *
-format_flow_classify_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  flow_classify_trace_t * t = va_arg (*args, flow_classify_trace_t *);
-
-  s = format (s, "FLOW_CLASSIFY: sw_if_index %d next %d table %d offset %d",
-              t->sw_if_index, t->next_index, t->table_index, t->offset);
-  return s;
-}
-
-#define foreach_flow_classify_error                 \
-_(MISS, "Flow classify misses")                     \
-_(HIT, "Flow classify hits")                        \
-_(CHAIN_HIT, "Flow classify hits after chain walk") \
-_(DROP, "Flow classify action drop")
-
-typedef enum {
-#define _(sym,str) FLOW_CLASSIFY_ERROR_##sym,
-  foreach_flow_classify_error
-#undef _
-  FLOW_CLASSIFY_N_ERROR,
-} flow_classify_error_t;
-
-static char * flow_classify_error_strings[] = {
-#define _(sym,string) string,
-  foreach_flow_classify_error
-#undef _
-};
-
-static inline uword
-flow_classify_inline (vlib_main_t * vm,
-                      vlib_node_runtime_t * node,
-                      vlib_frame_t * frame,
-                      flow_classify_table_id_t tid)
-{
-  u32 n_left_from, * from, * to_next;
-  flow_classify_next_index_t next_index;
-  flow_classify_main_t * fcm = &flow_classify_main;
-  vnet_classify_main_t * vcm = fcm->vnet_classify_main;
-  f64 now = vlib_time_now (vm);
-  u32 hits = 0;
-  u32 misses = 0;
-  u32 chain_hits = 0;
-  u32 drop = 0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  /* First pass: compute hashes */
-  while (n_left_from > 2)
-    {
-      vlib_buffer_t * b0, * b1;
-      u32 bi0, bi1;
-      u8 * h0, * h1;
-      u32 sw_if_index0, sw_if_index1;
-      u32 table_index0, table_index1;
-      vnet_classify_table_t * t0, * t1;
-
-      /* Prefetch next iteration */
-      {
-        vlib_buffer_t * p1, * p2;
-
-        p1 = vlib_get_buffer (vm, from[1]);
-        p2 = vlib_get_buffer (vm, from[2]);
-
-        vlib_prefetch_buffer_header (p1, STORE);
-        CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE);
-        vlib_prefetch_buffer_header (p2, STORE);
-        CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-      }
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      h0 = b0->data;
-
-      bi1 = from[1];
-      b1 = vlib_get_buffer (vm, bi1);
-      h1 = b1->data;
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      table_index0 = fcm->classify_table_index_by_sw_if_index[tid][sw_if_index0];
-
-      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-      table_index1 = fcm->classify_table_index_by_sw_if_index[tid][sw_if_index1];
-
-      t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-      t1 = pool_elt_at_index (vcm->tables, table_index1);
-
-      vnet_buffer(b0)->l2_classify.hash =
-        vnet_classify_hash_packet (t0, (u8 *) h0);
-
-      vnet_classify_prefetch_bucket (t0, vnet_buffer(b0)->l2_classify.hash);
-
-      vnet_buffer(b1)->l2_classify.hash =
-        vnet_classify_hash_packet (t1, (u8 *) h1);
-
-      vnet_classify_prefetch_bucket (t1, vnet_buffer(b1)->l2_classify.hash);
-
-      vnet_buffer(b0)->l2_classify.table_index = table_index0;
-
-      vnet_buffer(b1)->l2_classify.table_index = table_index1;
-
-      from += 2;
-      n_left_from -= 2;
-    }
-
-  while (n_left_from > 0)
-    {
-      vlib_buffer_t * b0;
-      u32 bi0;
-      u8 * h0;
-      u32 sw_if_index0;
-      u32 table_index0;
-      vnet_classify_table_t * t0;
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      h0 = b0->data;
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      table_index0 = fcm->classify_table_index_by_sw_if_index[tid][sw_if_index0];
-
-      t0 = pool_elt_at_index (vcm->tables, table_index0);
-      vnet_buffer(b0)->l2_classify.hash =
-        vnet_classify_hash_packet (t0, (u8 *) h0);
-
-      vnet_buffer(b0)->l2_classify.table_index = table_index0;
-      vnet_classify_prefetch_bucket (t0, vnet_buffer(b0)->l2_classify.hash);
-
-      from++;
-      n_left_from--;
-    }
-
-  next_index = node->cached_next_index;
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /* Not enough load/store slots to dual loop... */
-      while (n_left_from > 0 && n_left_to_next > 0)
-        {
-          u32 bi0;
-          vlib_buffer_t * b0;
-          u32 next0 = FLOW_CLASSIFY_NEXT_INDEX_DROP;
-          u32 table_index0;
-          vnet_classify_table_t * t0;
-          vnet_classify_entry_t * e0;
-          u64 hash0;
-          u8 * h0;
-
-          /* Stride 3 seems to work best */
-          if (PREDICT_TRUE (n_left_from > 3))
-            {
-              vlib_buffer_t * p1 = vlib_get_buffer(vm, from[3]);
-              vnet_classify_table_t * tp1;
-              u32 table_index1;
-              u64 phash1;
-
-              table_index1 = vnet_buffer(p1)->l2_classify.table_index;
-
-              if (PREDICT_TRUE (table_index1 != ~0))
-                {
-                  tp1 = pool_elt_at_index (vcm->tables, table_index1);
-                  phash1 = vnet_buffer(p1)->l2_classify.hash;
-                  vnet_classify_prefetch_entry (tp1, phash1);
-                }
-            }
-
-          /* Speculatively enqueue b0 to the current next frame */
-          bi0 = from[0];
-          to_next[0] = bi0;
-          from += 1;
-          to_next += 1;
-          n_left_from -= 1;
-          n_left_to_next -= 1;
-
-          b0 = vlib_get_buffer (vm, bi0);
-          h0 = b0->data;
-          table_index0 = vnet_buffer(b0)->l2_classify.table_index;
-          e0 = 0;
-          t0 = 0;
-
-          vnet_get_config_data (fcm->vnet_config_main[tid],
-                                &b0->current_config_index,
-                                &next0,
-                                /* # bytes of config data */ 0);
-
-          if (PREDICT_TRUE(table_index0 != ~0))
-            {
-              hash0 = vnet_buffer(b0)->l2_classify.hash;
-              t0 = pool_elt_at_index (vcm->tables, table_index0);
-              e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
-              if (e0)
-                {
-                  hits++;
-                }
-              else
-                {
-                  misses++;
-                  vnet_classify_add_del_session (vcm, table_index0,
-                                                 h0, ~0, 0, 0, 0, 0, 1);
-                  /* increment counter */
-                  vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
-                }
-            }
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-            {
-              flow_classify_trace_t * t =
-                vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->sw_if_index = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-              t->next_index = next0;
-              t->table_index = t0 ? t0 - vcm->tables : ~0;
-              t->offset = (t0 && e0) ? vnet_classify_get_offset (t0, e0): ~0;
-            }
-
-          /* Verify speculative enqueue, maybe switch current next frame */
-          vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-                                           n_left_to_next, bi0, next0);
-        }
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, node->node_index,
-                               FLOW_CLASSIFY_ERROR_MISS,
-                               misses);
-  vlib_node_increment_counter (vm, node->node_index,
-                               FLOW_CLASSIFY_ERROR_HIT,
-                               hits);
-  vlib_node_increment_counter (vm, node->node_index,
-                               FLOW_CLASSIFY_ERROR_CHAIN_HIT,
-                               chain_hits);
-  vlib_node_increment_counter (vm, node->node_index,
-                               FLOW_CLASSIFY_ERROR_DROP,
-                               drop);
-
-  return frame->n_vectors;
-}
-
-static uword
-ip4_flow_classify (vlib_main_t * vm,
-                   vlib_node_runtime_t * node,
-                   vlib_frame_t * frame)
-{
-  return flow_classify_inline(vm, node, frame, FLOW_CLASSIFY_TABLE_IP4);
-}
-
-VLIB_REGISTER_NODE (ip4_flow_classify_node) = {
-  .function = ip4_flow_classify,
-  .name = "ip4-flow-classify",
-  .vector_size = sizeof (u32),
-  .format_trace = format_flow_classify_trace,
-  .n_errors = ARRAY_LEN(flow_classify_error_strings),
-  .error_strings = flow_classify_error_strings,
-  .n_next_nodes = FLOW_CLASSIFY_NEXT_INDEX_N_NEXT,
-  .next_nodes = {
-    [FLOW_CLASSIFY_NEXT_INDEX_DROP] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_flow_classify_node, ip4_flow_classify);
-
-static uword
-ip6_flow_classify (vlib_main_t * vm,
-                   vlib_node_runtime_t * node,
-                   vlib_frame_t * frame)
-{
-  return flow_classify_inline(vm, node, frame, FLOW_CLASSIFY_TABLE_IP6);
-}
-
-VLIB_REGISTER_NODE (ip6_flow_classify_node) = {
-  .function = ip6_flow_classify,
-  .name = "ip6-flow-classify",
-  .vector_size = sizeof (u32),
-  .format_trace = format_flow_classify_trace,
-  .n_errors = ARRAY_LEN(flow_classify_error_strings),
-  .error_strings = flow_classify_error_strings,
-  .n_next_nodes = FLOW_CLASSIFY_NEXT_INDEX_N_NEXT,
-  .next_nodes = {
-    [FLOW_CLASSIFY_NEXT_INDEX_DROP] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_flow_classify_node, ip6_flow_classify);
-
-
-static clib_error_t *
-flow_classify_init (vlib_main_t *vm)
-{
-  flow_classify_main_t * fcm = &flow_classify_main;
-
-  fcm->vlib_main = vm;
-  fcm->vnet_main = vnet_get_main();
-  fcm->vnet_classify_main = &vnet_classify_main;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (flow_classify_init);
diff --git a/vnet/vnet/classify/input_acl.c b/vnet/vnet/classify/input_acl.c
deleted file mode 100644
index c446f2d6..00000000
--- a/vnet/vnet/classify/input_acl.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/ip/ip.h>
-#include <vnet/classify/vnet_classify.h>
-#include <vnet/classify/input_acl.h>
-
-input_acl_main_t input_acl_main;
-
-static int
-vnet_inacl_ip_feature_enable (vlib_main_t * vnm,
-                              input_acl_main_t *am,
-                              u32 sw_if_index,
-                              input_acl_table_id_t tid,
-                              int feature_enable)
-{
-
-  if (tid == INPUT_ACL_TABLE_L2)
-    {
-      l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_ACL,
-                                  feature_enable);
-    }
-  else
-    { /* IP[46] */
-      vnet_feature_config_main_t *fcm;
-      u8 arc;
-
-      if (tid == INPUT_ACL_TABLE_IP4)
-	{
-	  vnet_feature_enable_disable ("ip4-unicast", "ip4-inacl",
-				       sw_if_index, feature_enable, 0, 0);
-	  arc = vnet_get_feature_arc_index ("ip4-unicast");
-	}
-      else
-	{
-	  vnet_feature_enable_disable ("ip6-unicast", "ip6-inacl",
-				       sw_if_index, feature_enable, 0, 0);
-	  arc = vnet_get_feature_arc_index ("ip6-unicast");
-	}
-
-      fcm = vnet_get_feature_arc_config_main (arc);
-      am->vnet_config_main[tid] = &fcm->config_main;
-    }
-
-  return 0;
-}
-
-int vnet_set_input_acl_intfc (vlib_main_t * vm, u32 sw_if_index,
-                              u32 ip4_table_index,
-                              u32 ip6_table_index,
-                              u32 l2_table_index, u32 is_add)
-{
-  input_acl_main_t * am = &input_acl_main;
-  vnet_classify_main_t * vcm = am->vnet_classify_main;
-  u32 acl[INPUT_ACL_N_TABLES] = {ip4_table_index, ip6_table_index,
-                                 l2_table_index};
-  u32 ti;
-
-  /* Assume that we've validated sw_if_index in the API layer */
-
-  for (ti = 0; ti < INPUT_ACL_N_TABLES; ti++)
-    {
-      if (acl[ti] == ~0)
-        continue;
-
-      if (pool_is_free_index (vcm->tables, acl[ti]))
-        return VNET_API_ERROR_NO_SUCH_TABLE;
-
-      vec_validate_init_empty
-        (am->classify_table_index_by_sw_if_index[ti], sw_if_index, ~0);
-
-      /* Reject any DEL operation with wrong sw_if_index */
-      if (!is_add &&
-          (acl[ti] != am->classify_table_index_by_sw_if_index[ti][sw_if_index]))
-        {
-          clib_warning ("Non-existent intf_idx=%d with table_index=%d for delete",
-                        sw_if_index, acl[ti]);
-          return VNET_API_ERROR_NO_SUCH_TABLE;
-        }
-
-      /* Return ok on ADD operaton if feature is already enabled */
-      if (is_add &&
-          am->classify_table_index_by_sw_if_index[ti][sw_if_index] != ~0)
-          return 0;
-
-      vnet_inacl_ip_feature_enable (vm, am, sw_if_index, ti, is_add);
-
-      if (is_add)
-        am->classify_table_index_by_sw_if_index[ti][sw_if_index] = acl[ti];
-      else
-        am->classify_table_index_by_sw_if_index[ti][sw_if_index] = ~0;
-    }
-
-  return 0;
-}
-
-static clib_error_t *
-set_input_acl_command_fn (vlib_main_t * vm,
-                          unformat_input_t * input,
-                          vlib_cli_command_t * cmd)
-{
-  vnet_main_t * vnm = vnet_get_main();
-  u32 sw_if_index = ~0;
-  u32 ip4_table_index = ~0;
-  u32 ip6_table_index = ~0;
-  u32 l2_table_index = ~0;
-  u32 is_add = 1;
-  u32 idx_cnt = 0;
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "intfc %U", unformat_vnet_sw_interface,
-                    vnm, &sw_if_index))
-        ;
-      else if (unformat (input, "ip4-table %d", &ip4_table_index))
-        idx_cnt++;
-      else if (unformat (input, "ip6-table %d", &ip6_table_index))
-        idx_cnt++;
-      else if (unformat (input, "l2-table %d", &l2_table_index))
-        idx_cnt++;
-      else if (unformat (input, "del"))
-        is_add = 0;
-      else
-        break;
-    }
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "Interface must be specified.");
-
-  if (!idx_cnt)
-    return clib_error_return (0, "Table index should be specified.");
-
-  if (idx_cnt > 1)
-    return clib_error_return (0, "Only one table index per API is allowed.");
-
-  rv = vnet_set_input_acl_intfc (vm, sw_if_index, ip4_table_index,
-                                 ip6_table_index, l2_table_index, is_add);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case VNET_API_ERROR_NO_MATCHING_INTERFACE:
-      return clib_error_return (0, "No such interface");
-
-    case VNET_API_ERROR_NO_SUCH_ENTRY:
-      return clib_error_return (0, "No such classifier table");
-    }
-  return 0;
-}
-
-/*
- * Configure interface to enable/disble input ACL feature:
- * intfc - interface name to be configured as input ACL
- * Ip4-table <index> [del] - enable/disable IP4 input ACL
- * Ip6-table <index> [del] - enable/disable IP6 input ACL
- * l2-table <index> [del] - enable/disable Layer2 input ACL
- *
- * Note: Only one table index per API call is allowed.
- *
- */
-VLIB_CLI_COMMAND (set_input_acl_command, static) = {
-    .path = "set interface input acl",
-    .short_help =
-    "set interface input acl intfc <int> [ip4-table <index>]\n"
-    "  [ip6-table <index>] [l2-table <index>] [del]",
-    .function = set_input_acl_command_fn,
-};
-
-clib_error_t *input_acl_init (vlib_main_t *vm)
-{
-  input_acl_main_t * am = &input_acl_main;
-  clib_error_t * error = 0;
-
-  if ((error = vlib_call_init_function (vm, ip_inacl_init)))
-    return error;
-
-  am->vlib_main = vm;
-  am->vnet_main = vnet_get_main();
-  am->vnet_classify_main = &vnet_classify_main;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (input_acl_init);
-
-uword unformat_acl_type (unformat_input_t * input, va_list * args)
-{
-  u32 * acl_type = va_arg (*args, u32 *);
-  u32 tid = INPUT_ACL_N_TABLES;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "ip4"))
-      tid = INPUT_ACL_TABLE_IP4;
-    else if (unformat (input, "ip6"))
-      tid = INPUT_ACL_TABLE_IP6;
-    else if (unformat (input, "l2"))
-      tid = INPUT_ACL_TABLE_L2;
-    else
-      break;
-  }
-
-  *acl_type = tid;
-  return 1;
-}
-
-u8 * format_vnet_inacl_info (u8 * s, va_list * va)
-{
-  input_acl_main_t * am = va_arg (*va, input_acl_main_t *);
-  int sw_if_idx = va_arg (*va, int);
-  u32 tid = va_arg (*va, u32);
-
-  if (tid == ~0)
-    {
-      s = format (s, "%10s%20s\t\t%s", "Intfc idx", "Classify table",
-                  "Interface name");
-      return s;
-    }
-
-  s = format (s, "%10d%20d\t\t%U", sw_if_idx, tid,
-              format_vnet_sw_if_index_name, am->vnet_main, sw_if_idx);
-
-  return s;
-}
-
-static clib_error_t *
-show_inacl_command_fn (vlib_main_t * vm,
-                       unformat_input_t * input,
-                       vlib_cli_command_t * cmd)
-{
-  input_acl_main_t * am = &input_acl_main;
-  u32 type = INPUT_ACL_N_TABLES;
-  int i;
-  u32 * vec_tbl;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "type %U", unformat_acl_type, &type))
-        ;
-      else
-        break;
-    }
-
-  if (type == INPUT_ACL_N_TABLES)
-    return clib_error_return (0, "Invalid input ACL table type.");
-
-  vec_tbl = am->classify_table_index_by_sw_if_index[type];
-
-  if (vec_len(vec_tbl))
-    vlib_cli_output (vm, "%U", format_vnet_inacl_info, am, ~0 /* hdr */, ~0);
-  else
-    vlib_cli_output (vm, "No input ACL tables configured");
-
-  for (i = 0; i < vec_len (vec_tbl); i++)
-    {
-      if (vec_elt(vec_tbl, i) == ~0)
-        continue;
-
-      vlib_cli_output (vm, "%U", format_vnet_inacl_info,
-                       am, i, vec_elt(vec_tbl, i));
-    }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (show_inacl_command, static) = {
-    .path = "show inacl",
-    .short_help = "show inacl type [ip4|ip6|l2]",
-    .function = show_inacl_command_fn,
-};
diff --git a/vnet/vnet/classify/input_acl.h b/vnet/vnet/classify/input_acl.h
deleted file mode 100644
index 7ffc189f..00000000
--- a/vnet/vnet/classify/input_acl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __included_vnet_input_acl_h__
-#define __included_vnet_input_acl_h__
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/classify/vnet_classify.h>
-
-typedef enum {
-  INPUT_ACL_TABLE_IP4,
-  INPUT_ACL_TABLE_IP6,
-  INPUT_ACL_TABLE_L2,
-  INPUT_ACL_N_TABLES,
-} input_acl_table_id_t;
-
-typedef enum {
-  ACL_NEXT_INDEX_DENY,
-  ACL_NEXT_INDEX_N_NEXT,
-} acl_next_index_t;
-
-typedef struct {
-
-  /* classifier table vectors */
-  u32 * classify_table_index_by_sw_if_index [INPUT_ACL_N_TABLES];
-
-  /* convenience variables */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-  vnet_classify_main_t * vnet_classify_main;
-  vnet_config_main_t * vnet_config_main [INPUT_ACL_N_TABLES];
-} input_acl_main_t;
-
-extern input_acl_main_t input_acl_main;
-
-int vnet_set_input_acl_intfc (vlib_main_t * vm, u32 sw_if_index,
-                              u32 ip4_table_index,
-                              u32 ip6_table_index,
-                              u32 l2_table_index, u32 is_add);
-
-#endif /* __included_vnet_input_acl_h__ */
diff --git a/vnet/vnet/classify/ip_classify.c b/vnet/vnet/classify/ip_classify.c
deleted file mode 100644
index 44973ae5..00000000
--- a/vnet/vnet/classify/ip_classify.c
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>	/* for ethernet_header_t */
-#include <vnet/classify/vnet_classify.h>
-#include <vnet/dpo/classify_dpo.h>
-
-typedef struct {
-  u32 next_index;
-  u32 table_index;
-  u32 entry_index;
-} ip_classify_trace_t;
-
-/* packet trace format function */
-static u8 * format_ip_classify_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip_classify_trace_t * t = va_arg (*args, ip_classify_trace_t *);
-  
-  s = format (s, "IP_CLASSIFY: next_index %d, table %d, entry %d",
-              t->next_index, t->table_index, t->entry_index);
-  return s;
-}
-
-vlib_node_registration_t ip4_classify_node;
-vlib_node_registration_t ip6_classify_node;
-
-#define foreach_ip_classify_error               \
-_(MISS, "Classify misses")                      \
-_(HIT, "Classify hits")                         \
-_(CHAIN_HIT, "Classify hits after chain walk")
-
-typedef enum {
-#define _(sym,str) IP_CLASSIFY_ERROR_##sym,
-  foreach_ip_classify_error
-#undef _
-  IP_CLASSIFY_N_ERROR,
-} ip_classify_error_t;
-
-static char * ip_classify_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ip_classify_error
-#undef _
-};
-
-static inline uword
-ip_classify_inline (vlib_main_t * vm,
-                    vlib_node_runtime_t * node,
-                    vlib_frame_t * frame, int is_ip4)
-{
-  u32 n_left_from, * from, * to_next;
-  ip_lookup_next_t next_index;
-  vnet_classify_main_t * vcm = &vnet_classify_main;
-  f64 now = vlib_time_now (vm);
-  u32 hits = 0;
-  u32 misses = 0;
-  u32 chain_hits = 0;
-  u32 n_next;
-
-  if (is_ip4) {
-    n_next = IP4_LOOKUP_N_NEXT;
-  } else {
-    n_next = IP6_LOOKUP_N_NEXT;
-  }
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  /* First pass: compute hashes */
-
-  while (n_left_from > 2)
-    {
-      vlib_buffer_t * b0, * b1;
-      u32 bi0, bi1;
-      u8 * h0, * h1;
-      u32 cd_index0, cd_index1;
-      classify_dpo_t *cd0, * cd1;
-      u32 table_index0, table_index1;
-      vnet_classify_table_t * t0, * t1;
-
-      /* prefetch next iteration */
-        {
-          vlib_buffer_t * p1, * p2;
-          
-          p1 = vlib_get_buffer (vm, from[1]);
-          p2 = vlib_get_buffer (vm, from[2]);
-          
-          vlib_prefetch_buffer_header (p1, STORE);
-          CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE);
-          vlib_prefetch_buffer_header (p2, STORE);
-          CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-        }
-        
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      h0 = (void *)vlib_buffer_get_current(b0) -
-                ethernet_buffer_header_size(b0);
-
-      bi1 = from[1];
-      b1 = vlib_get_buffer (vm, bi1);
-      h1 = (void *)vlib_buffer_get_current(b1) -
-                ethernet_buffer_header_size(b1);
-        
-      cd_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
-      cd0 = classify_dpo_get(cd_index0);
-      table_index0 = cd0->cd_table_index;
-
-      cd_index1 = vnet_buffer (b1)->ip.adj_index[VLIB_TX];
-      cd1 = classify_dpo_get(cd_index1);
-      table_index1 = cd1->cd_table_index;
-
-      t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-      t1 = pool_elt_at_index (vcm->tables, table_index1);
-            
-      vnet_buffer(b0)->l2_classify.hash = 
-        vnet_classify_hash_packet (t0, (u8 *) h0);
-
-      vnet_classify_prefetch_bucket (t0, vnet_buffer(b0)->l2_classify.hash);
-
-      vnet_buffer(b1)->l2_classify.hash = 
-        vnet_classify_hash_packet (t1, (u8 *) h1);
-
-      vnet_classify_prefetch_bucket (t1, vnet_buffer(b1)->l2_classify.hash);
-
-      vnet_buffer(b0)->l2_classify.table_index = table_index0;
-
-      vnet_buffer(b1)->l2_classify.table_index = table_index1;
-
-      from += 2;
-      n_left_from -= 2;
-    }
-
-  while (n_left_from > 0)
-    {
-      vlib_buffer_t * b0;
-      u32 bi0;
-      u8 * h0;
-      u32 cd_index0;
-      classify_dpo_t *cd0;
-      u32 table_index0;
-      vnet_classify_table_t * t0;
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      h0 = (void *)vlib_buffer_get_current(b0) -
-                ethernet_buffer_header_size(b0);
-        
-      cd_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
-      cd0 = classify_dpo_get(cd_index0);
-      table_index0 = cd0->cd_table_index;
-
-      t0 = pool_elt_at_index (vcm->tables, table_index0);
-      vnet_buffer(b0)->l2_classify.hash = 
-        vnet_classify_hash_packet (t0, (u8 *) h0);
-
-      vnet_buffer(b0)->l2_classify.table_index = table_index0;
-      vnet_classify_prefetch_bucket (t0, vnet_buffer(b0)->l2_classify.hash);
-
-      from++;
-      n_left_from--;
-    }
-        
-  next_index = node->cached_next_index;
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      /* Not enough load/store slots to dual loop... */
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-          u32 bi0;
-	  vlib_buffer_t * b0;
-          u32 next0 = IP_LOOKUP_NEXT_DROP;
-          u32 table_index0;
-          vnet_classify_table_t * t0;
-          vnet_classify_entry_t * e0;
-          u64 hash0;
-          u8 * h0;
-
-          /* Stride 3 seems to work best */
-          if (PREDICT_TRUE (n_left_from > 3))
-            {
-              vlib_buffer_t * p1 = vlib_get_buffer(vm, from[3]);
-              vnet_classify_table_t * tp1;
-              u32 table_index1;
-              u64 phash1;
-
-              table_index1 = vnet_buffer(p1)->l2_classify.table_index;
-              
-              if (PREDICT_TRUE (table_index1 != ~0))
-                {
-                  tp1 = pool_elt_at_index (vcm->tables, table_index1);
-                  phash1 = vnet_buffer(p1)->l2_classify.hash;
-                  vnet_classify_prefetch_entry (tp1, phash1); 
-                }
-            }
-
-          /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-          h0 = b0->data;
-          table_index0 = vnet_buffer(b0)->l2_classify.table_index;
-          e0 = 0;
-          t0 = 0;
-          vnet_buffer(b0)->l2_classify.opaque_index = ~0;
-
-          if (PREDICT_TRUE(table_index0 != ~0))
-            {
-              hash0 = vnet_buffer(b0)->l2_classify.hash;
-              t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-              e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0,
-                                             now);
-              if (e0)
-                {
-                  vnet_buffer(b0)->l2_classify.opaque_index
-                    = e0->opaque_index;
-                  vlib_buffer_advance (b0, e0->advance);
-                  next0 = (e0->next_index < node->n_next_nodes)?
-                           e0->next_index:next0;
-                  hits++;
-                }
-              else
-                {
-                  while (1)
-                    {
-                      if (t0->next_table_index != ~0)
-                        t0 = pool_elt_at_index (vcm->tables,
-                                                t0->next_table_index);
-                      else
-                        {
-                          next0 = (t0->miss_next_index < n_next) ?
-                                   t0->miss_next_index : next0;
-                          misses++;
-                          break;
-                        }
-
-                      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
-                      e0 = vnet_classify_find_entry
-                        (t0, (u8 *) h0, hash0, now);
-                      if (e0)
-                        {
-                          vnet_buffer(b0)->l2_classify.opaque_index
-                            = e0->opaque_index;
-                          vlib_buffer_advance (b0, e0->advance);
-                          next0 = (e0->next_index < node->n_next_nodes)?
-                                   e0->next_index:next0;
-                          hits++;
-                          chain_hits++;
-                          break;
-                        }
-                    }
-                }
-            }
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              ip_classify_trace_t *t = 
-                vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->next_index = next0;
-              t->table_index = t0 ? t0 - vcm->tables : ~0;
-              t->entry_index = e0 ? e0 - t0->entries : ~0;
-            }
-
-          /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, node->node_index, 
-                               IP_CLASSIFY_ERROR_MISS, 
-                               misses);
-  vlib_node_increment_counter (vm, node->node_index, 
-                               IP_CLASSIFY_ERROR_HIT, 
-                               hits);
-  vlib_node_increment_counter (vm, node->node_index, 
-                               IP_CLASSIFY_ERROR_CHAIN_HIT, 
-                               chain_hits);
-  return frame->n_vectors;
-}
-
-static uword
-ip4_classify (vlib_main_t * vm,
-              vlib_node_runtime_t * node,
-              vlib_frame_t * frame)
-{
-  return ip_classify_inline (vm, node, frame, 1 /* is_ip4 */);
-}
-
-
-VLIB_REGISTER_NODE (ip4_classify_node) = {
-  .function = ip4_classify,
-  .name = "ip4-classify",
-  .vector_size = sizeof (u32),
-  .sibling_of = "ip4-lookup",
-  .format_trace = format_ip_classify_trace,
-  .n_errors = ARRAY_LEN(ip_classify_error_strings),
-  .error_strings = ip_classify_error_strings,
-
-  .n_next_nodes = 0,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_classify_node, ip4_classify)
-
-static uword
-ip6_classify (vlib_main_t * vm,
-              vlib_node_runtime_t * node,
-              vlib_frame_t * frame)
-{
-  return ip_classify_inline (vm, node, frame, 0 /* is_ip4 */);
-}
-
-
-VLIB_REGISTER_NODE (ip6_classify_node) = {
-  .function = ip6_classify,
-  .name = "ip6-classify",
-  .vector_size = sizeof (u32),
-  .sibling_of = "ip6-lookup",
-  .format_trace = format_ip_classify_trace,
-  .n_errors = ARRAY_LEN(ip_classify_error_strings),
-  .error_strings = ip_classify_error_strings,
-
-  .n_next_nodes = 0,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_classify_node, ip6_classify)
-
-static clib_error_t *
-ip_classify_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ip_classify_init);
diff --git a/vnet/vnet/classify/policer_classify.c b/vnet/vnet/classify/policer_classify.c
deleted file mode 100644
index 569234fb..00000000
--- a/vnet/vnet/classify/policer_classify.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/classify/policer_classify.h>
-
-static void
-vnet_policer_classify_feature_enable (vlib_main_t * vnm,
-                                      policer_classify_main_t * pcm,
-                                      u32 sw_if_index,
-                                      policer_classify_table_id_t tid,
-                                      int feature_enable)
-{
-  if (tid == POLICER_CLASSIFY_TABLE_L2)
-    {
-      l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_POLICER_CLAS,
-                                  feature_enable);
-    }
-  else
-    {
-      vnet_feature_config_main_t * fcm;
-      u8 arc;
-
-      if (tid == POLICER_CLASSIFY_TABLE_IP4)
-	{
-	  vnet_feature_enable_disable ("ip4-unicast", "ip4-policer-classify",
-				       sw_if_index, feature_enable, 0, 0);
-	  arc = vnet_get_feature_arc_index ("ip4-unicast");
-	}
-      
-      else
-	{
-	  vnet_feature_enable_disable ("ip6-unicast", "ip6-policer-classify",
-				       sw_if_index, feature_enable, 0, 0);
-	  arc = vnet_get_feature_arc_index ("ip6-unicast");
-	}
-
-      fcm = vnet_get_feature_arc_config_main (arc);
-      pcm->vnet_config_main[tid] = &fcm->config_main;
-    }
-}
-
-int vnet_set_policer_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
-                                     u32 ip4_table_index, u32 ip6_table_index,
-                                     u32 l2_table_index, u32 is_add)
-{
-  policer_classify_main_t * pcm = &policer_classify_main;
-  vnet_classify_main_t * vcm = pcm->vnet_classify_main;
-  u32 pct[POLICER_CLASSIFY_N_TABLES] = {ip4_table_index, ip6_table_index,
-                                        l2_table_index};
-  u32 ti;
-
-  /* Assume that we've validated sw_if_index in the API layer */
-
-  for (ti = 0; ti < POLICER_CLASSIFY_N_TABLES; ti++)
-    {
-      if (pct[ti] == ~0)
-        continue;
-
-      if (pool_is_free_index (vcm->tables, pct[ti]))
-        return VNET_API_ERROR_NO_SUCH_TABLE;
-
-      vec_validate_init_empty
-        (pcm->classify_table_index_by_sw_if_index[ti], sw_if_index, ~0);
-
-      /* Reject any DEL operation with wrong sw_if_index */
-      if (!is_add &&
-          (pct[ti] != pcm->classify_table_index_by_sw_if_index[ti][sw_if_index]))
-        {
-          clib_warning ("Non-existent intf_idx=%d with table_index=%d for delete",
-                        sw_if_index, pct[ti]);
-          return VNET_API_ERROR_NO_SUCH_TABLE;
-        }
-
-      /* Return ok on ADD operaton if feature is already enabled */
-      if (is_add &&
-          pcm->classify_table_index_by_sw_if_index[ti][sw_if_index] != ~0)
-          return 0;
-
-      vnet_policer_classify_feature_enable (vm, pcm, sw_if_index, ti, is_add);
-
-      if (is_add)
-        pcm->classify_table_index_by_sw_if_index[ti][sw_if_index] = pct[ti];
-      else
-        pcm->classify_table_index_by_sw_if_index[ti][sw_if_index] = ~0;
-    }
-
-
-  return 0;
-}
-
-static clib_error_t *
-set_policer_classify_command_fn (vlib_main_t * vm,
-                                 unformat_input_t * input,
-                                 vlib_cli_command_t * cmd)
-{
-  vnet_main_t * vnm = vnet_get_main();
-  u32 sw_if_index = ~0;
-  u32 ip4_table_index = ~0;
-  u32 ip6_table_index = ~0;
-  u32 l2_table_index = ~0;
-  u32 is_add = 1;
-  u32 idx_cnt = 0;
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "interface %U", unformat_vnet_sw_interface,
-                    vnm, &sw_if_index))
-        ;
-      else if (unformat (input, "ip4-table %d", &ip4_table_index))
-        idx_cnt++;
-      else if (unformat (input, "ip6-table %d", &ip6_table_index))
-        idx_cnt++;
-      else if (unformat (input, "l2-table %d", &l2_table_index))
-        idx_cnt++;
-      else if (unformat (input, "del"))
-        is_add = 0;
-      else
-        break;
-    }
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "Interface must be specified.");
-
-  if (!idx_cnt)
-    return clib_error_return (0, "Table index should be specified.");
-
-  if (idx_cnt > 1)
-    return clib_error_return (0, "Only one table index per API is allowed.");
-
-  rv = vnet_set_policer_classify_intfc(vm, sw_if_index, ip4_table_index,
-                                       ip6_table_index, l2_table_index, is_add);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case VNET_API_ERROR_NO_MATCHING_INTERFACE:
-      return clib_error_return (0, "No such interface");
-
-    case VNET_API_ERROR_NO_SUCH_ENTRY:
-      return clib_error_return (0, "No such classifier table");
-    }
-  return 0;
-}
-
-VLIB_CLI_COMMAND (set_policer_classify_command, static) = {
-    .path = "set policer classify",
-    .short_help =
-    "set policer classify interface <int> [ip4-table <index>]\n"
-    "  [ip6-table <index>] [l2-table <index>] [del]",
-    .function = set_policer_classify_command_fn,
-};
-
-static uword
-unformat_table_type (unformat_input_t * input, va_list * va)
-{
-  u32 * r = va_arg (*va, u32 *);
-  u32 tid;
-
-  if (unformat (input, "ip4"))
-    tid = POLICER_CLASSIFY_TABLE_IP4;
-  else if (unformat (input, "ip6"))
-    tid = POLICER_CLASSIFY_TABLE_IP6;
-  else if (unformat (input, "l2"))
-    tid = POLICER_CLASSIFY_TABLE_L2;
-  else
-    return 0;
-
-  *r = tid;
-  return 1;
-}
-static clib_error_t *
-show_policer_classify_command_fn (vlib_main_t * vm,
-                                  unformat_input_t * input,
-                                  vlib_cli_command_t * cmd)
-{
-  policer_classify_main_t * pcm = &policer_classify_main;
-  u32 type = POLICER_CLASSIFY_N_TABLES;
-  u32 * vec_tbl;
-  int i;
-
-  if (unformat (input, "type %U", unformat_table_type, &type))
-    ;
-  else
-    return clib_error_return (0, "Type must be specified.");;
-
-  if (type == POLICER_CLASSIFY_N_TABLES)
-    return clib_error_return (0, "Invalid table type.");
-
-  vec_tbl = pcm->classify_table_index_by_sw_if_index[type];
-
-  if (vec_len(vec_tbl))
-      vlib_cli_output (vm, "%10s%20s\t\t%s", "Intfc idx", "Classify table",
-                       "Interface name");
-  else
-    vlib_cli_output (vm, "No tables configured.");
-
-  for (i = 0; i < vec_len (vec_tbl); i++)
-    {
-      if (vec_elt(vec_tbl, i) == ~0)
-        continue;
-
-      vlib_cli_output (vm, "%10d%20d\t\t%U", i, vec_elt(vec_tbl, i),
-                       format_vnet_sw_if_index_name, pcm->vnet_main, i);
-    }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (show_policer_classify_command, static) = {
-    .path = "show classify policer",
-    .short_help = "show classify policer type [ip4|ip6|l2]",
-    .function = show_policer_classify_command_fn,
-};
diff --git a/vnet/vnet/classify/policer_classify.h b/vnet/vnet/classify/policer_classify.h
deleted file mode 100644
index 30656444..00000000
--- a/vnet/vnet/classify/policer_classify.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __included_vnet_policer_classify_h__
-#define __included_vnet_policer_classify_h__
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/classify/vnet_classify.h>
-
-typedef enum {
-  POLICER_CLASSIFY_TABLE_IP4,
-  POLICER_CLASSIFY_TABLE_IP6,
-  POLICER_CLASSIFY_TABLE_L2,
-  POLICER_CLASSIFY_N_TABLES,
-} policer_classify_table_id_t;
-
-typedef enum {
-  POLICER_CLASSIFY_NEXT_INDEX_DROP,
-  POLICER_CLASSIFY_NEXT_INDEX_N_NEXT,
-} policer_classify_next_index_t;
-
-typedef struct {
-  /* Classifier table vectors */
-  u32 * classify_table_index_by_sw_if_index [POLICER_CLASSIFY_N_TABLES];
-
-  /* L2 next nodes for each feature */
-  u32 feat_next_node_index[32];
-
-  /* Convenience variables */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-  vnet_classify_main_t * vnet_classify_main;
-  vnet_config_main_t * vnet_config_main [POLICER_CLASSIFY_N_TABLES];
-} policer_classify_main_t;
-
-policer_classify_main_t policer_classify_main;
-
-int vnet_set_policer_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
-                                     u32 ip4_table_index, u32 ip6_table_index,
-                                     u32 l2_table_index, u32 is_add);
-
-#endif /* __included_vnet_policer_classify_h__ */
diff --git a/vnet/vnet/classify/vnet_classify.c b/vnet/vnet/classify/vnet_classify.c
deleted file mode 100644
index ce38f9f1..00000000
--- a/vnet/vnet/classify/vnet_classify.c
+++ /dev/null
@@ -1,2436 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/classify/vnet_classify.h>
-#include <vnet/classify/input_acl.h>
-#include <vnet/ip/ip.h>
-#include <vnet/api_errno.h>     /* for API error numbers */
-#include <vnet/l2/l2_classify.h> /* for L2_INPUT_CLASSIFY_NEXT_xxx */
-#include <vnet/fib/fib_table.h>
-
-vnet_classify_main_t vnet_classify_main;
-
-#if VALIDATION_SCAFFOLDING
-/* Validation scaffolding */
-void mv (vnet_classify_table_t * t)
-{
-  void * oldheap;
-
-  oldheap = clib_mem_set_heap (t->mheap);
-  clib_mem_validate();
-  clib_mem_set_heap (oldheap);
-}
-
-void rogue (vnet_classify_table_t * t)
-{
-  int i, j, k;
-  vnet_classify_entry_t * v, * save_v;
-  u32 active_elements = 0;
-  vnet_classify_bucket_t * b;
-  
-  for (i = 0; i < t->nbuckets; i++)
-    {
-      b = &t->buckets [i];
-      if (b->offset == 0)
-        continue;
-      save_v = vnet_classify_get_entry (t, b->offset);
-      for (j = 0; j < (1<<b->log2_pages); j++)
-        {
-          for (k = 0; k < t->entries_per_page; k++)
-            {
-              v = vnet_classify_entry_at_index 
-                (t, save_v, j*t->entries_per_page + k);
-
-              if (vnet_classify_entry_is_busy (v))
-                active_elements++;
-            }
-        }
-    }
-
-  if (active_elements != t->active_elements)
-    clib_warning ("found %u expected %u elts", active_elements, 
-                  t->active_elements);
-}
-#else
-void mv (vnet_classify_table_t * t) { }
-void rogue (vnet_classify_table_t * t) { }
-#endif
-
-void vnet_classify_register_unformat_l2_next_index_fn (unformat_function_t * fn)
-{
-  vnet_classify_main_t * cm = &vnet_classify_main;
-
-  vec_add1 (cm->unformat_l2_next_index_fns, fn);
-}
-
-void vnet_classify_register_unformat_ip_next_index_fn (unformat_function_t * fn)
-{
-  vnet_classify_main_t * cm = &vnet_classify_main;
-
-  vec_add1 (cm->unformat_ip_next_index_fns, fn);
-}
-
-void 
-vnet_classify_register_unformat_acl_next_index_fn (unformat_function_t * fn)
-{
-  vnet_classify_main_t * cm = &vnet_classify_main;
-
-  vec_add1 (cm->unformat_acl_next_index_fns, fn);
-}
-
-void
-vnet_classify_register_unformat_policer_next_index_fn (unformat_function_t * fn)
-{
-  vnet_classify_main_t * cm = &vnet_classify_main;
-
-  vec_add1 (cm->unformat_policer_next_index_fns, fn);
-}
-
-void vnet_classify_register_unformat_opaque_index_fn (unformat_function_t * fn)
-{
-  vnet_classify_main_t * cm = &vnet_classify_main;
-
-  vec_add1 (cm->unformat_opaque_index_fns, fn);
-}
-
-vnet_classify_table_t * 
-vnet_classify_new_table (vnet_classify_main_t *cm,
-                         u8 * mask, u32 nbuckets, u32 memory_size,
-                         u32 skip_n_vectors,
-                         u32 match_n_vectors)
-{
-  vnet_classify_table_t * t;
-  void * oldheap;
-    
-  nbuckets = 1 << (max_log2 (nbuckets));
-
-  pool_get_aligned (cm->tables, t, CLIB_CACHE_LINE_BYTES);
-  memset(t, 0, sizeof (*t));
-  
-  vec_validate_aligned (t->mask, match_n_vectors - 1, sizeof(u32x4));
-  clib_memcpy (t->mask, mask, match_n_vectors * sizeof (u32x4));
-
-  t->next_table_index = ~0;
-  t->nbuckets = nbuckets;
-  t->log2_nbuckets = max_log2 (nbuckets);
-  t->match_n_vectors = match_n_vectors;
-  t->skip_n_vectors = skip_n_vectors;
-  t->entries_per_page = 2;
-
-  t->mheap = mheap_alloc (0 /* use VM */, memory_size);
-
-  vec_validate_aligned (t->buckets, nbuckets - 1, CLIB_CACHE_LINE_BYTES);
-  oldheap = clib_mem_set_heap (t->mheap);
-
-  t->writer_lock = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, 
-                                           CLIB_CACHE_LINE_BYTES);
-  t->writer_lock[0] = 0;
-
-  clib_mem_set_heap (oldheap);
-  return (t);
-}
-
-void vnet_classify_delete_table_index (vnet_classify_main_t *cm, 
-                                       u32 table_index, int del_chain)
-{
-  vnet_classify_table_t * t;
-
-  /* Tolerate multiple frees, up to a point */
-  if (pool_is_free_index (cm->tables, table_index))
-    return;
-
-  t = pool_elt_at_index (cm->tables, table_index);
-  if (del_chain && t->next_table_index != ~0)
-    /* Recursively delete the entire chain */
-    vnet_classify_delete_table_index (cm, t->next_table_index, del_chain);
-
-  vec_free (t->mask);
-  vec_free (t->buckets);
-  mheap_free (t->mheap);
-  
-  pool_put (cm->tables, t);
-}
-
-static vnet_classify_entry_t *
-vnet_classify_entry_alloc (vnet_classify_table_t * t, u32 log2_pages)
-{
-  vnet_classify_entry_t * rv = 0;
-#define _(size)                                 \
-  vnet_classify_entry_##size##_t * rv##size = 0;
-  foreach_size_in_u32x4;
-#undef _
-  
-  void * oldheap;
-
-  ASSERT (t->writer_lock[0]);
-  if (log2_pages >= vec_len (t->freelists) || t->freelists [log2_pages] == 0)
-    {
-      oldheap = clib_mem_set_heap (t->mheap);
-      
-      vec_validate (t->freelists, log2_pages);
-
-      switch(t->match_n_vectors)
-        {
-          /* Euchre the vector allocator into allocating the right sizes */
-#define _(size)                                                         \
-        case size:                                                      \
-          vec_validate_aligned                                          \
-            (rv##size, ((1<<log2_pages)*t->entries_per_page) - 1,       \
-          CLIB_CACHE_LINE_BYTES);                                       \
-          rv = (vnet_classify_entry_t *) rv##size;                      \
-          break;
-          foreach_size_in_u32x4;
-#undef _
-
-        default:
-          abort();
-        }
-      
-      clib_mem_set_heap (oldheap);
-      goto initialize;
-    }
-  rv = t->freelists[log2_pages];
-  t->freelists[log2_pages] = rv->next_free;
-  
-initialize:
-  ASSERT(rv);
-  ASSERT (vec_len(rv) == (1<<log2_pages)*t->entries_per_page);
-
-  switch (t->match_n_vectors)
-    {
-#define _(size)                                                         \
-    case size:                                                          \
-      if(vec_len(rv)) 							\
-        memset (rv, 0xff, sizeof (*rv##size) * vec_len(rv));            \
-      break;
-      foreach_size_in_u32x4;
-#undef _
-      
-    default:
-      abort();
-    }
-  
-  return rv;
-}
-
-static void
-vnet_classify_entry_free (vnet_classify_table_t * t,
-                          vnet_classify_entry_t * v)
-{
-    u32 free_list_index;
-
-    ASSERT (t->writer_lock[0]);
-
-    free_list_index = min_log2(vec_len(v)/t->entries_per_page);
-
-    ASSERT(vec_len (t->freelists) > free_list_index);
-
-    v->next_free = t->freelists[free_list_index];
-    t->freelists[free_list_index] = v;
-}
-
-static inline void make_working_copy
-(vnet_classify_table_t * t, vnet_classify_bucket_t * b)
-{
-  vnet_classify_entry_t * v;
-  vnet_classify_bucket_t working_bucket __attribute__((aligned (8)));
-  void * oldheap;
-  vnet_classify_entry_t * working_copy;
-#define _(size)                                 \
-  vnet_classify_entry_##size##_t * working_copy##size = 0;
-  foreach_size_in_u32x4;
-#undef _
-  u32 cpu_number = os_get_cpu_number();
-
-  if (cpu_number >= vec_len (t->working_copies))
-    {
-      oldheap = clib_mem_set_heap (t->mheap);
-      vec_validate (t->working_copies, cpu_number);
-      clib_mem_set_heap (oldheap);
-    }
-
-  /* 
-   * working_copies are per-cpu so that near-simultaneous
-   * updates from multiple threads will not result in sporadic, spurious
-   * lookup failures. 
-   */
-  working_copy = t->working_copies[cpu_number];
-
-  t->saved_bucket.as_u64 = b->as_u64;
-  oldheap = clib_mem_set_heap (t->mheap);
-
-  if ((1<<b->log2_pages)*t->entries_per_page > vec_len (working_copy))
-    {
-      switch(t->match_n_vectors)
-        {
-          /* Euchre the vector allocator into allocating the right sizes */
-#define _(size)                                                         \
-        case size:                                                      \
-          working_copy##size = (void *) working_copy;                   \
-          vec_validate_aligned                                          \
-            (working_copy##size, 					\
-             ((1<<b->log2_pages)*t->entries_per_page) - 1,              \
-             CLIB_CACHE_LINE_BYTES);                                    \
-          working_copy = (void *) working_copy##size;                   \
-            break;
-        foreach_size_in_u32x4;
-#undef _
-
-        default:
-          abort();
-        }
-      t->working_copies[cpu_number] = working_copy;
-    }
-
-  _vec_len(working_copy) = (1<<b->log2_pages)*t->entries_per_page;
-  clib_mem_set_heap (oldheap);
-
-  v = vnet_classify_get_entry (t, b->offset);
-  
-  switch(t->match_n_vectors)
-    {
-#define _(size)                                         \
-    case size:                                          \
-      clib_memcpy (working_copy, v,                          \
-              sizeof (vnet_classify_entry_##size##_t)   \
-              * (1<<b->log2_pages)                      \
-              * (t->entries_per_page));                 \
-      break;
-      foreach_size_in_u32x4 ;
-#undef _
-
-    default: 
-      abort();
-    }
-  
-  working_bucket.as_u64 = b->as_u64;
-  working_bucket.offset = vnet_classify_get_offset (t, working_copy);
-  CLIB_MEMORY_BARRIER();
-  b->as_u64 = working_bucket.as_u64;
-  t->working_copies[cpu_number] = working_copy;
-}
-
-static vnet_classify_entry_t *
-split_and_rehash (vnet_classify_table_t * t,
-                  vnet_classify_entry_t * old_values,
-                  u32 new_log2_pages)
-{
-  vnet_classify_entry_t * new_values, * v, * new_v;
-  int i, j, k;
-  
-  new_values = vnet_classify_entry_alloc (t, new_log2_pages);
-  
-  for (i = 0; i < (vec_len (old_values)/t->entries_per_page); i++)
-    {
-      u64 new_hash;
-      
-      for (j = 0; j < t->entries_per_page; j++)
-        {
-          v = vnet_classify_entry_at_index 
-            (t, old_values, i * t->entries_per_page + j);
-          
-          if (vnet_classify_entry_is_busy (v))
-            {
-              /* Hack so we can use the packet hash routine */
-              u8 * key_minus_skip;
-              key_minus_skip = (u8 *) v->key;
-              key_minus_skip -= t->skip_n_vectors * sizeof (u32x4);
-
-              new_hash = vnet_classify_hash_packet (t, key_minus_skip);
-              new_hash >>= t->log2_nbuckets;
-              new_hash &= (1<<new_log2_pages) - 1;
-              
-              for (k = 0; k < t->entries_per_page; k++)
-                {
-                  new_v = vnet_classify_entry_at_index (t, new_values, 
-                                                        new_hash + k);
-                  
-                  if (vnet_classify_entry_is_free (new_v))
-                    {
-                      clib_memcpy (new_v, v, sizeof (vnet_classify_entry_t) 
-                              + (t->match_n_vectors * sizeof (u32x4)));
-                      new_v->flags &= ~(VNET_CLASSIFY_ENTRY_FREE);
-                      goto doublebreak;
-                    }
-                }
-              /* Crap. Tell caller to try again */
-              vnet_classify_entry_free (t, new_values);
-              return 0;
-            }
-        doublebreak:
-          ;
-        }
-    }
-  return new_values;
-}
-
-int vnet_classify_add_del (vnet_classify_table_t * t, 
-                           vnet_classify_entry_t * add_v,
-                           int is_add)
-{
-  u32 bucket_index;
-  vnet_classify_bucket_t * b, tmp_b;
-  vnet_classify_entry_t * v, * new_v, * save_new_v, * working_copy, * save_v;
-  u32 value_index;
-  int rv = 0;
-  int i;
-  u64 hash, new_hash;
-  u32 new_log2_pages;
-  u32 cpu_number = os_get_cpu_number();
-  u8 * key_minus_skip;
-
-  ASSERT ((add_v->flags & VNET_CLASSIFY_ENTRY_FREE) == 0);
-
-  key_minus_skip = (u8 *) add_v->key;
-  key_minus_skip -= t->skip_n_vectors * sizeof (u32x4);
-
-  hash = vnet_classify_hash_packet (t, key_minus_skip);
-
-  bucket_index = hash & (t->nbuckets-1);
-  b = &t->buckets[bucket_index];
-
-  hash >>= t->log2_nbuckets;
-
-  while (__sync_lock_test_and_set (t->writer_lock, 1))
-    ; 
-
-  /* First elt in the bucket? */
-  if (b->offset == 0)
-    {
-      if (is_add == 0)
-        {
-          rv = -1;
-          goto unlock;
-        }
-
-      v = vnet_classify_entry_alloc (t, 0 /* new_log2_pages */);
-      clib_memcpy (v, add_v, sizeof (vnet_classify_entry_t) +
-              t->match_n_vectors * sizeof (u32x4));
-      v->flags &= ~(VNET_CLASSIFY_ENTRY_FREE);
-
-      tmp_b.as_u64 = 0;
-      tmp_b.offset = vnet_classify_get_offset (t, v);
-
-      b->as_u64 = tmp_b.as_u64;
-      t->active_elements ++;
-
-      goto unlock;
-    }
-  
-  make_working_copy (t, b);
-  
-  save_v = vnet_classify_get_entry (t, t->saved_bucket.offset);
-  value_index = hash & ((1<<t->saved_bucket.log2_pages)-1);
-  
-  if (is_add)
-    {
-      /* 
-       * For obvious (in hindsight) reasons, see if we're supposed to
-       * replace an existing key, then look for an empty slot.
-       */
-
-      for (i = 0; i < t->entries_per_page; i++)
-        {
-          v = vnet_classify_entry_at_index (t, save_v, value_index + i);
-
-          if (!memcmp (v->key, add_v->key, t->match_n_vectors * sizeof (u32x4)))
-            {
-              clib_memcpy (v, add_v, sizeof (vnet_classify_entry_t) +
-                      t->match_n_vectors * sizeof(u32x4));
-              v->flags &= ~(VNET_CLASSIFY_ENTRY_FREE);
-
-              CLIB_MEMORY_BARRIER();
-              /* Restore the previous (k,v) pairs */
-              b->as_u64 = t->saved_bucket.as_u64;
-              goto unlock;
-            }
-        }
-      for (i = 0; i < t->entries_per_page; i++)
-        {
-          v = vnet_classify_entry_at_index (t, save_v, value_index + i);
-
-          if (vnet_classify_entry_is_free (v))
-            {
-              clib_memcpy (v, add_v, sizeof (vnet_classify_entry_t) +
-                      t->match_n_vectors * sizeof(u32x4));
-              v->flags &= ~(VNET_CLASSIFY_ENTRY_FREE);
-              CLIB_MEMORY_BARRIER();
-              b->as_u64 = t->saved_bucket.as_u64;
-              t->active_elements ++;
-              goto unlock;
-            }
-        }
-      /* no room at the inn... split case... */
-    }
-  else
-    {
-      for (i = 0; i < t->entries_per_page; i++)
-        {
-          v = vnet_classify_entry_at_index (t, save_v, value_index + i);
-
-          if (!memcmp (v->key, add_v->key, t->match_n_vectors * sizeof (u32x4)))
-            {
-              memset (v, 0xff, sizeof (vnet_classify_entry_t) +
-                      t->match_n_vectors * sizeof(u32x4));
-              v->flags |= VNET_CLASSIFY_ENTRY_FREE;
-              CLIB_MEMORY_BARRIER();
-              b->as_u64 = t->saved_bucket.as_u64;
-              t->active_elements --;
-              goto unlock;
-            }
-        }
-      rv = -3;
-      b->as_u64 = t->saved_bucket.as_u64;
-      goto unlock;
-    }
-
-  new_log2_pages = t->saved_bucket.log2_pages + 1;
-
- expand_again:
-  working_copy = t->working_copies[cpu_number];
-  new_v = split_and_rehash (t, working_copy, new_log2_pages);
-
-  if (new_v == 0)
-    {
-      new_log2_pages++;
-      goto expand_again;
-    }
-
-  /* Try to add the new entry */
-  save_new_v = new_v;
-
-  key_minus_skip = (u8 *) add_v->key;
-  key_minus_skip -= t->skip_n_vectors * sizeof (u32x4);
-
-  new_hash = vnet_classify_hash_packet_inline (t, key_minus_skip);
-  new_hash >>= t->log2_nbuckets;
-  new_hash &= (1<<min_log2((vec_len(new_v)/t->entries_per_page))) - 1;
-  
-  for (i = 0; i < t->entries_per_page; i++)
-    {
-      new_v = vnet_classify_entry_at_index (t, save_new_v, new_hash + i);
-
-      if (vnet_classify_entry_is_free (new_v))
-        {
-          clib_memcpy (new_v, add_v, sizeof (vnet_classify_entry_t) +
-                  t->match_n_vectors * sizeof(u32x4));
-          new_v->flags &= ~(VNET_CLASSIFY_ENTRY_FREE);
-          goto expand_ok;
-        }
-    }
-  /* Crap. Try again */
-  new_log2_pages++;
-  vnet_classify_entry_free (t, save_new_v);
-  goto expand_again;
-
- expand_ok:
-  tmp_b.log2_pages = min_log2 (vec_len (save_new_v)/t->entries_per_page);
-  tmp_b.offset = vnet_classify_get_offset (t, save_new_v);
-  CLIB_MEMORY_BARRIER();
-  b->as_u64 = tmp_b.as_u64;
-  t->active_elements ++;
-  v = vnet_classify_get_entry (t, t->saved_bucket.offset);
-  vnet_classify_entry_free (t, v);
-
- unlock:
-  CLIB_MEMORY_BARRIER();
-  t->writer_lock[0] = 0;
-
-  return rv;
-}
-
-typedef CLIB_PACKED(struct {
-  ethernet_header_t eh;
-  ip4_header_t ip;
-}) classify_data_or_mask_t;
-
-u64 vnet_classify_hash_packet (vnet_classify_table_t * t, u8 * h)
-{
-  return vnet_classify_hash_packet_inline (t, h);      
-}
-
-vnet_classify_entry_t * 
-vnet_classify_find_entry (vnet_classify_table_t * t,
-                          u8 * h, u64 hash, f64 now)
-{
-  return vnet_classify_find_entry_inline (t, h, hash, now);
-}
-
-static u8 * format_classify_entry (u8 * s, va_list * args)
-  {
-  vnet_classify_table_t * t = va_arg (*args, vnet_classify_table_t *);
-  vnet_classify_entry_t * e = va_arg (*args, vnet_classify_entry_t *);
-
-  s = format
-    (s, "[%u]: next_index %d advance %d opaque %d action %d metadata %d\n",
-     vnet_classify_get_offset (t, e), e->next_index, e->advance, 
-     e->opaque_index, e->action, e->metadata);
-
-
-  s = format (s, "        k: %U\n", format_hex_bytes, e->key,
-              t->match_n_vectors * sizeof(u32x4));
-  
-  if (vnet_classify_entry_is_busy (e))
-    s = format (s, "        hits %lld, last_heard %.2f\n",
-                e->hits, e->last_heard);
-  else
-    s = format (s, "  entry is free\n");
-  return s;
-  }
- 
-u8 * format_classify_table (u8 * s, va_list * args)
-{
-  vnet_classify_table_t * t = va_arg (*args, vnet_classify_table_t *);
-  int verbose = va_arg (*args, int);
-  vnet_classify_bucket_t * b;
-  vnet_classify_entry_t * v, * save_v;
-  int i, j, k;
-  u64 active_elements = 0;
-  
-  for (i = 0; i < t->nbuckets; i++)
-    {
-      b = &t->buckets [i];
-      if (b->offset == 0)
-        {
-          if (verbose > 1)
-            s = format (s, "[%d]: empty\n", i);
-          continue;
-        }
-
-      if (verbose)
-        {
-          s = format (s, "[%d]: heap offset %d, len %d\n", i, 
-                      b->offset, (1<<b->log2_pages));
-        }
-
-      save_v = vnet_classify_get_entry (t, b->offset);
-      for (j = 0; j < (1<<b->log2_pages); j++)
-        {
-          for (k = 0; k < t->entries_per_page; k++)
-            {
-  
-              v = vnet_classify_entry_at_index (t, save_v, 
-                                                j*t->entries_per_page + k);
-
-              if (vnet_classify_entry_is_free (v))
-                {
-                  if (verbose > 1)
-                    s = format (s, "    %d: empty\n", 
-                                j * t->entries_per_page + k);
-                  continue;
-                }
-              if (verbose)
-                {
-                  s = format (s, "    %d: %U\n", 
-                              j * t->entries_per_page + k,
-                              format_classify_entry, t, v);
-                }
-              active_elements++;
-            }
-        }
-    }
-
-  s = format (s, "    %lld active elements\n", active_elements);
-  s = format (s, "    %d free lists\n", vec_len (t->freelists));
-  return s;
-}
-
-int vnet_classify_add_del_table (vnet_classify_main_t * cm,
-                                 u8 * mask, 
-                                 u32 nbuckets,
-                                 u32 memory_size,
-                                 u32 skip,
-                                 u32 match,
-                                 u32 next_table_index,
-                                 u32 miss_next_index,
-                                 u32 * table_index,
-                                 u8 current_data_flag,
-                                 i16 current_data_offset,
-                                 int is_add,
-                                 int del_chain)
-{
-  vnet_classify_table_t * t;
-
-  if (is_add)
-    {
-      if (*table_index == ~0) /* add */
-        {
-          if (memory_size == 0)
-            return VNET_API_ERROR_INVALID_MEMORY_SIZE;
-
-          if (nbuckets == 0)
-            return VNET_API_ERROR_INVALID_VALUE;
-
-          t = vnet_classify_new_table (cm, mask, nbuckets, memory_size,
-            skip, match);
-          t->next_table_index = next_table_index;
-          t->miss_next_index = miss_next_index;
-          t->current_data_flag = current_data_flag;
-          t->current_data_offset = current_data_offset;
-          *table_index = t - cm->tables;
-        }
-      else /* update */
-        {
-          vnet_classify_main_t *cm = &vnet_classify_main;
-          t = pool_elt_at_index (cm->tables, *table_index);
-
-          t->next_table_index = next_table_index;
-        }
-      return 0;
-    }
-  
-  vnet_classify_delete_table_index (cm, *table_index, del_chain);
-  return 0;
-}
-
-#define foreach_tcp_proto_field                 \
-_(src_port)                                     \
-_(dst_port)
-
-#define foreach_udp_proto_field                 \
-_(src_port)                                     \
-_(dst_port)
-
-#define foreach_ip4_proto_field                 \
-_(src_address)                                  \
-_(dst_address)                                  \
-_(tos)                                          \
-_(length)					\
-_(fragment_id)                                  \
-_(ttl)                                          \
-_(protocol)                                     \
-_(checksum)
-
-uword unformat_tcp_mask (unformat_input_t * input, va_list * args)
-{
-  u8 ** maskp = va_arg (*args, u8 **);
-  u8 * mask = 0;
-  u8 found_something = 0;
-  tcp_header_t * tcp;
-
-#define _(a) u8 a=0;
-  foreach_tcp_proto_field;
-#undef _
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (0) ;
-#define _(a) else if (unformat (input, #a)) a=1;
-      foreach_tcp_proto_field
-#undef _
-      else
-        break;
-    }
-
-#define _(a) found_something += a;
-  foreach_tcp_proto_field;
-#undef _
-
-  if (found_something == 0)
-    return 0;
-
-  vec_validate (mask, sizeof (*tcp) - 1);
-
-  tcp = (tcp_header_t *) mask;
-
-#define _(a) if (a) memset (&tcp->a, 0xff, sizeof (tcp->a));
-  foreach_tcp_proto_field;
-#undef _
-
-  *maskp = mask;
-  return 1;
-}
-
-uword unformat_udp_mask (unformat_input_t * input, va_list * args)
-{
-  u8 ** maskp = va_arg (*args, u8 **);
-  u8 * mask = 0;
-  u8 found_something = 0;
-  udp_header_t * udp;
-
-#define _(a) u8 a=0;
-  foreach_udp_proto_field;
-#undef _
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (0) ;
-#define _(a) else if (unformat (input, #a)) a=1;
-      foreach_udp_proto_field
-#undef _
-      else
-        break;
-    }
-
-#define _(a) found_something += a;
-  foreach_udp_proto_field;
-#undef _
-
-  if (found_something == 0)
-    return 0;
-
-  vec_validate (mask, sizeof (*udp) - 1);
-
-  udp = (udp_header_t *) mask;
-
-#define _(a) if (a) memset (&udp->a, 0xff, sizeof (udp->a));
-  foreach_udp_proto_field;
-#undef _
-
-  *maskp = mask;
-  return 1;
-}
-
-typedef struct {
-  u16 src_port, dst_port;
-} tcpudp_header_t;
-
-uword unformat_l4_mask (unformat_input_t * input, va_list * args)
-{
-  u8 ** maskp = va_arg (*args, u8 **);
-  u16 src_port = 0, dst_port = 0;
-  tcpudp_header_t * tcpudp;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "tcp %U", unformat_tcp_mask, maskp))
-        return 1;
-      else if (unformat (input, "udp %U", unformat_udp_mask, maskp))
-        return 1;
-      else if (unformat (input, "src_port"))
-        src_port = 0xFFFF;
-      else if (unformat (input, "dst_port"))
-        dst_port = 0xFFFF;
-      else
-        return 0;
-    }
-
-  if (!src_port && !dst_port)
-    return 0;
-
-  u8 * mask = 0;
-  vec_validate (mask, sizeof (tcpudp_header_t) - 1);
-
-  tcpudp = (tcpudp_header_t *) mask;
-  tcpudp->src_port = src_port;
-  tcpudp->dst_port = dst_port;
-
-  *maskp = mask;
-
-  return 1;
-}
-
-uword unformat_ip4_mask (unformat_input_t * input, va_list * args)
-{
-  u8 ** maskp = va_arg (*args, u8 **);
-  u8 * mask = 0;
-  u8 found_something = 0;
-  ip4_header_t * ip;
-  
-#define _(a) u8 a=0;
-  foreach_ip4_proto_field;
-#undef _
-  u8 version = 0;
-  u8 hdr_length = 0;
-  
-  
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
-    {
-      if (unformat (input, "version")) 
-        version = 1;
-      else if (unformat (input, "hdr_length"))
-        hdr_length = 1;
-      else if (unformat (input, "src"))
-        src_address = 1;
-      else if (unformat (input, "dst"))
-        dst_address = 1;
-      else if (unformat (input, "proto"))
-        protocol = 1;
-      
-#define _(a) else if (unformat (input, #a)) a=1;
-      foreach_ip4_proto_field
-#undef _
-      else
-        break;
-    }
-  
-#define _(a) found_something += a;
-  foreach_ip4_proto_field;
-#undef _
-  
-  if (found_something == 0)
-    return 0;
-  
-  vec_validate (mask, sizeof (*ip) - 1);
-  
-  ip = (ip4_header_t *) mask;
-  
-#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
-  foreach_ip4_proto_field;
-#undef _
-  
-  ip->ip_version_and_header_length = 0;
-  
-  if (version)
-    ip->ip_version_and_header_length |= 0xF0;
-  
-  if (hdr_length)
-    ip->ip_version_and_header_length |= 0x0F;
-  
-  *maskp = mask;
-  return 1;
-}
-
-#define foreach_ip6_proto_field                 \
-_(src_address)                                  \
-_(dst_address)                                  \
-_(payload_length)				\
-_(hop_limit)                                    \
-_(protocol)
-
-uword unformat_ip6_mask (unformat_input_t * input, va_list * args)
-{
-  u8 ** maskp = va_arg (*args, u8 **);
-  u8 * mask = 0;
-  u8 found_something = 0;
-  ip6_header_t * ip;
-  u32 ip_version_traffic_class_and_flow_label;
-  
-#define _(a) u8 a=0;
-  foreach_ip6_proto_field;
-#undef _
-  u8 version = 0;
-  u8 traffic_class = 0;
-  u8 flow_label = 0;
-  
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
-    {
-      if (unformat (input, "version")) 
-        version = 1;
-      else if (unformat (input, "traffic-class"))
-        traffic_class = 1;
-      else if (unformat (input, "flow-label"))
-        flow_label = 1;
-      else if (unformat (input, "src"))
-        src_address = 1;
-      else if (unformat (input, "dst"))
-        dst_address = 1;
-      else if (unformat (input, "proto"))
-        protocol = 1;
-      
-#define _(a) else if (unformat (input, #a)) a=1;
-      foreach_ip6_proto_field
-#undef _
-      else
-        break;
-    }
-  
-#define _(a) found_something += a;
-  foreach_ip6_proto_field;
-#undef _
-  
-  if (found_something == 0)
-    return 0;
-  
-  vec_validate (mask, sizeof (*ip) - 1);
-  
-  ip = (ip6_header_t *) mask;
-  
-#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
-  foreach_ip6_proto_field;
-#undef _
-  
-  ip_version_traffic_class_and_flow_label = 0;
-  
-  if (version)
-    ip_version_traffic_class_and_flow_label |= 0xF0000000;
-
-  if (traffic_class)
-    ip_version_traffic_class_and_flow_label |= 0x0FF00000;
-
-  if (flow_label)
-    ip_version_traffic_class_and_flow_label |= 0x000FFFFF;
-
-  ip->ip_version_traffic_class_and_flow_label = 
-    clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label);
-  
-  *maskp = mask;
-  return 1;
-}
-
-uword unformat_l3_mask (unformat_input_t * input, va_list * args)
-{
-  u8 ** maskp = va_arg (*args, u8 **);
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp))
-      return 1;
-    else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp))
-      return 1;
-    else
-      break;
-  }
-  return 0;
-}
-
-uword unformat_l2_mask (unformat_input_t * input, va_list * args)
-{
-  u8 ** maskp = va_arg (*args, u8 **);
-  u8 * mask = 0;
-  u8 src = 0;
-  u8 dst = 0;
-  u8 proto = 0;
-  u8 tag1 = 0;
-  u8 tag2 = 0;
-  u8 ignore_tag1 = 0;
-  u8 ignore_tag2 = 0;
-  u8 cos1 = 0;
-  u8 cos2 = 0;
-  u8 dot1q = 0;
-  u8 dot1ad = 0;
-  int len = 14;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "src"))
-      src = 1;
-    else if (unformat (input, "dst"))
-      dst = 1;
-    else if (unformat (input, "proto"))
-      proto = 1;
-    else if (unformat (input, "tag1"))
-      tag1 = 1;
-    else if (unformat (input, "tag2"))
-      tag2 = 1;
-    else if (unformat (input, "ignore-tag1"))
-      ignore_tag1 = 1;
-    else if (unformat (input, "ignore-tag2"))
-      ignore_tag2 = 1;
-    else if (unformat (input, "cos1"))
-      cos1 = 1;
-    else if (unformat (input, "cos2"))
-      cos2 = 1;
-    else if (unformat (input, "dot1q"))
-      dot1q = 1;
-    else if (unformat (input, "dot1ad"))
-      dot1ad = 1;
-    else
-      break;
-  }
-  if ((src + dst + proto + tag1 + tag2 + dot1q + dot1ad +
-      ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
-    return 0;
-
-  if (tag1 || ignore_tag1 || cos1 || dot1q)
-    len = 18;
-  if (tag2 || ignore_tag2 || cos2 || dot1ad)
-    len = 22;
-
-  vec_validate (mask, len-1);
-
-  if (dst)
-    memset (mask, 0xff, 6);
-
-  if (src)
-    memset (mask + 6, 0xff, 6);
-  
-  if (tag2 || dot1ad)
-    {
-      /* inner vlan tag */
-      if (tag2)
-        {
-          mask[19] = 0xff;
-          mask[18] = 0x0f;
-        }
-      if (cos2)
-        mask[18] |= 0xe0;
-      if (proto)
-        mask[21] = mask [20] = 0xff;
-      if (tag1)
-        {
-          mask [15] = 0xff;
-          mask [14] = 0x0f;
-        }
-      if (cos1)
-        mask[14] |= 0xe0;
-      *maskp = mask;
-      return 1;
-    }
-  if (tag1 | dot1q)
-    {
-      if (tag1)
-        {
-          mask [15] = 0xff;
-          mask [14] = 0x0f;
-        }
-      if (cos1)
-        mask[14] |= 0xe0;
-      if (proto)
-        mask[16] = mask [17] = 0xff;
-      *maskp = mask;
-      return 1;
-    }
-  if (cos2)
-    mask[18] |= 0xe0;
-  if (cos1)
-    mask[14] |= 0xe0;
-  if (proto)
-    mask[12] = mask [13] = 0xff;
-    
-  *maskp = mask;
-  return 1;
-}
-
-uword unformat_classify_mask (unformat_input_t * input, va_list * args)
-{
-  vnet_classify_main_t * CLIB_UNUSED(cm) 
-    = va_arg (*args, vnet_classify_main_t *);
-  u8 ** maskp = va_arg (*args, u8 **);
-  u32 * skipp = va_arg (*args, u32 *);
-  u32 * matchp = va_arg (*args, u32 *);
-  u32 match;
-  u8 * mask = 0;
-  u8 * l2 = 0;
-  u8 * l3 = 0;
-  u8 * l4 = 0;
-  int i;
-  
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "hex %U", unformat_hex_string, &mask))
-      ;
-    else if (unformat (input, "l2 %U", unformat_l2_mask, &l2))
-      ;
-    else if (unformat (input, "l3 %U", unformat_l3_mask, &l3))
-      ;
-    else if (unformat (input, "l4 %U", unformat_l4_mask, &l4))
-      ;
-    else
-      break;
-  }
-
-  if (l4 && !l3) {
-    vec_free (mask);
-    vec_free (l2);
-    vec_free (l4);
-    return 0;
-  }
-
-  if (mask || l2 || l3 || l4)
-    {
-      if (l2 || l3 || l4)
-        {
-          /* "With a free Ethernet header in every package" */
-          if (l2 == 0)
-            vec_validate (l2, 13);
-          mask = l2;
-          if (l3)
-            {
-              vec_append (mask, l3);
-              vec_free (l3);
-            }
-          if (l4)
-            {
-              vec_append (mask, l4);
-              vec_free (l4);
-            }
-        }
-
-      /* Scan forward looking for the first significant mask octet */
-      for (i = 0; i < vec_len (mask); i++)
-        if (mask[i])
-          break;
-
-      /* compute (skip, match) params */
-      *skipp = i / sizeof(u32x4);
-      vec_delete (mask, *skipp * sizeof(u32x4), 0);
-
-      /* Pad mask to an even multiple of the vector size */
-      while (vec_len (mask) % sizeof (u32x4))
-        vec_add1 (mask, 0);
-
-      match = vec_len (mask) / sizeof (u32x4);
-
-      for (i = match*sizeof(u32x4); i > 0; i-= sizeof(u32x4))
-        {
-          u64 *tmp = (u64 *)(mask + (i-sizeof(u32x4)));
-          if (*tmp || *(tmp+1))
-            break;
-          match--;
-        }
-      if (match == 0)
-        clib_warning ("BUG: match 0");
-
-      _vec_len (mask) = match * sizeof(u32x4);
-
-      *matchp = match;
-      *maskp = mask;
-
-      return 1;
-    }
-
-  return 0;
-}
-
-#define foreach_l2_input_next                   \
-_(drop, DROP)                                   \
-_(ethernet, ETHERNET_INPUT)                     \
-_(ip4, IP4_INPUT)                               \
-_(ip6, IP6_INPUT)				\
-_(li, LI)
-
-uword unformat_l2_input_next_index (unformat_input_t * input, va_list * args)
-{
-  vnet_classify_main_t * cm = &vnet_classify_main;
-  u32 * miss_next_indexp = va_arg (*args, u32 *);
-  u32 next_index = 0;
-  u32 tmp;
-  int i;
-  
-  /* First try registered unformat fns, allowing override... */
-  for (i = 0; i < vec_len (cm->unformat_l2_next_index_fns); i++)
-    {
-      if (unformat (input, "%U", cm->unformat_l2_next_index_fns[i], &tmp))
-        {
-          next_index = tmp;
-          goto out;
-        }
-    }
-
-#define _(n,N) \
-  if (unformat (input, #n)) { next_index = L2_INPUT_CLASSIFY_NEXT_##N; goto out;}
-  foreach_l2_input_next;
-#undef _
-  
-  if (unformat (input, "%d", &tmp))
-    { 
-      next_index = tmp; 
-      goto out; 
-    }
-  
-  return 0;
-
- out:
-  *miss_next_indexp = next_index;
-  return 1;
-}
-
-#define foreach_l2_output_next                   \
-_(drop, DROP)
-
-uword unformat_l2_output_next_index (unformat_input_t * input, va_list * args)
-{
-  vnet_classify_main_t * cm = &vnet_classify_main;
-  u32 * miss_next_indexp = va_arg (*args, u32 *);
-  u32 next_index = 0;
-  u32 tmp;
-  int i;
-  
-  /* First try registered unformat fns, allowing override... */
-  for (i = 0; i < vec_len (cm->unformat_l2_next_index_fns); i++)
-    {
-      if (unformat (input, "%U", cm->unformat_l2_next_index_fns[i], &tmp))
-        {
-          next_index = tmp;
-          goto out;
-        }
-    }
-
-#define _(n,N) \
-  if (unformat (input, #n)) { next_index = L2_OUTPUT_CLASSIFY_NEXT_##N; goto out;}
-  foreach_l2_output_next;
-#undef _
-  
-  if (unformat (input, "%d", &tmp))
-    { 
-      next_index = tmp; 
-      goto out; 
-    }
-  
-  return 0;
-
- out:
-  *miss_next_indexp = next_index;
-  return 1;
-}
-
-#define foreach_ip_next                         \
-_(drop, DROP)                                   \
-_(rewrite, REWRITE)
-
-uword unformat_ip_next_index (unformat_input_t * input, va_list * args)
-{
-  u32 * miss_next_indexp = va_arg (*args, u32 *);
-  vnet_classify_main_t * cm = &vnet_classify_main;
-  u32 next_index = 0;
-  u32 tmp;
-  int i;
-  
-  /* First try registered unformat fns, allowing override... */
-  for (i = 0; i < vec_len (cm->unformat_ip_next_index_fns); i++)
-    {
-      if (unformat (input, "%U", cm->unformat_ip_next_index_fns[i], &tmp))
-        {
-          next_index = tmp;
-          goto out;
-        }
-    }
-
-#define _(n,N) \
-  if (unformat (input, #n)) { next_index = IP_LOOKUP_NEXT_##N; goto out;}
-  foreach_ip_next;
-#undef _
-  
-  if (unformat (input, "%d", &tmp))
-    { 
-      next_index = tmp; 
-      goto out; 
-    }
-  
-  return 0;
-
- out:
-  *miss_next_indexp = next_index;
-  return 1;
-}
-
-#define foreach_acl_next                        \
-_(deny, DENY)
-
-uword unformat_acl_next_index (unformat_input_t * input, va_list * args)
-{
-  u32 * next_indexp = va_arg (*args, u32 *);
-  vnet_classify_main_t * cm = &vnet_classify_main;
-  u32 next_index = 0;
-  u32 tmp;
-  int i;
-
-  /* First try registered unformat fns, allowing override... */
-  for (i = 0; i < vec_len (cm->unformat_acl_next_index_fns); i++)
-    {
-      if (unformat (input, "%U", cm->unformat_acl_next_index_fns[i], &tmp))
-        {
-          next_index = tmp;
-          goto out;
-        }
-    }
-
-#define _(n,N) \
-  if (unformat (input, #n)) { next_index = ACL_NEXT_INDEX_##N; goto out;}
-  foreach_acl_next;
-#undef _
-
-  if (unformat (input, "permit"))
-    {
-      next_index = ~0;
-      goto out;
-    }
-  else if (unformat (input, "%d", &tmp))
-    {
-      next_index = tmp;
-      goto out;
-    }
-
-  return 0;
-
- out:
-  *next_indexp = next_index;
-  return 1;
-}
-
-uword unformat_policer_next_index (unformat_input_t * input, va_list * args)
-{
-  u32 * next_indexp = va_arg (*args, u32 *);
-  vnet_classify_main_t * cm = &vnet_classify_main;
-  u32 next_index = 0;
-  u32 tmp;
-  int i;
-
-  /* First try registered unformat fns, allowing override... */
-  for (i = 0; i < vec_len (cm->unformat_policer_next_index_fns); i++)
-    {
-      if (unformat (input, "%U", cm->unformat_policer_next_index_fns[i], &tmp))
-        {
-          next_index = tmp;
-          goto out;
-        }
-    }
-
-  if (unformat (input, "%d", &tmp))
-    {
-      next_index = tmp;
-      goto out;
-    }
-
-  return 0;
-
- out:
-  *next_indexp = next_index;
-  return 1;
-}
-
-static clib_error_t *
-classify_table_command_fn (vlib_main_t * vm,
-                           unformat_input_t * input,
-                           vlib_cli_command_t * cmd)
-{
-  u32 nbuckets = 2;
-  u32 skip = ~0;
-  u32 match = ~0;
-  int is_add = 1;
-  int del_chain = 0;
-  u32 table_index = ~0;
-  u32 next_table_index = ~0;
-  u32 miss_next_index = ~0;
-  u32 memory_size = 2<<20;
-  u32 tmp;
-  u32 current_data_flag = 0;
-  int current_data_offset = 0;
-
-  u8 * mask = 0;
-  vnet_classify_main_t * cm = &vnet_classify_main;
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "del"))
-      is_add = 0;
-    else if (unformat (input, "del-chain"))
-      {
-	is_add = 0;
-        del_chain = 1;
-      }
-    else if (unformat (input, "buckets %d", &nbuckets))
-      ;
-    else if (unformat (input, "skip %d", &skip))
-      ;
-    else if (unformat (input, "match %d", &match))
-      ;
-    else if (unformat (input, "table %d", &table_index))
-      ;
-    else if (unformat (input, "mask %U", unformat_classify_mask, 
-                       cm, &mask, &skip, &match))
-      ;
-    else if (unformat (input, "memory-size %uM", &tmp))
-      memory_size = tmp<<20;
-    else if (unformat (input, "memory-size %uG", &tmp))
-      memory_size = tmp<<30;
-    else if (unformat (input, "next-table %d", &next_table_index))
-      ;
-    else if (unformat (input, "miss-next %U", unformat_ip_next_index,
-                       &miss_next_index))
-      ;
-    else if (unformat (input, "l2-input-miss-next %U", unformat_l2_input_next_index,
-                       &miss_next_index))
-        ;
-    else if (unformat (input, "l2-output-miss-next %U", unformat_l2_output_next_index,
-                       &miss_next_index))
-      ;
-    else if (unformat (input, "acl-miss-next %U", unformat_acl_next_index,
-                       &miss_next_index))
-      ;
-    else if (unformat (input, "current-data-flag %d", &current_data_flag))
-      ;
-    else if (unformat (input, "current-data-offset %d", &current_data_offset))
-      ;
-
-    else
-      break;
-  }
-  
-  if (is_add && mask == 0 && table_index == ~0)
-    return clib_error_return (0, "Mask required");
-
-  if (is_add && skip == ~0 && table_index == ~0)
-    return clib_error_return (0, "skip count required");
-
-  if (is_add && match == ~0 && table_index == ~0)
-    return clib_error_return (0, "match count required");
-      
-  if (!is_add && table_index == ~0)
-    return clib_error_return (0, "table index required for delete");
-
-  rv = vnet_classify_add_del_table (cm, mask, nbuckets, memory_size,
-        skip, match, next_table_index, miss_next_index, &table_index,
-	current_data_flag, current_data_offset, is_add, del_chain);
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    default:
-      return clib_error_return (0, "vnet_classify_add_del_table returned %d",
-                                rv);
-    }
-  return 0;
-}
-
-VLIB_CLI_COMMAND (classify_table, static) = {
-  .path = "classify table",
-  .short_help = 
-  "classify table [miss-next|l2-miss_next|acl-miss-next <next_index>]"
-  "\n mask <mask-value> buckets <nn> [skip <n>] [match <n>]"
-  "\n [current-data-flag <n>] [current-data-offset <n>] [table <n>]"
-  "\n [del] [del-chain]",
-  .function = classify_table_command_fn,
-};
-
-static u8 * format_vnet_classify_table (u8 * s, va_list * args)
-{
-  vnet_classify_main_t * cm = va_arg (*args, vnet_classify_main_t *);
-  int verbose = va_arg (*args, int);
-  u32 index = va_arg (*args, u32);
-  vnet_classify_table_t * t;
-
-  if (index == ~0)
-    {
-      s = format (s, "%10s%10s%10s%10s", "TableIdx", "Sessions", "NextTbl",
-                  "NextNode", verbose ? "Details" : "");
-      return s;
-    }
-
-  t = pool_elt_at_index (cm->tables, index);
-  s = format (s, "%10u%10d%10d%10d", index, t->active_elements,
-              t->next_table_index, t->miss_next_index);
-
-  s = format (s, "\n  Heap: %U", format_mheap, t->mheap, 0 /*verbose*/); 
-
-  s = format (s, "\n  nbuckets %d, skip %d match %d flag %d offset %d",
-              t->nbuckets, t->skip_n_vectors, t->match_n_vectors,
-              t->current_data_flag, t->current_data_offset);
-  s = format (s, "\n  mask %U", format_hex_bytes, t->mask, 
-              t->match_n_vectors * sizeof (u32x4));
-
-  if (verbose == 0)
-    return s;
-
-  s = format (s, "\n%U", format_classify_table, t, verbose);
-  
-  return s;
-}
-
-static clib_error_t *
-show_classify_tables_command_fn (vlib_main_t * vm,
-                                 unformat_input_t * input,
-                                 vlib_cli_command_t * cmd)
-{
-  vnet_classify_main_t * cm = &vnet_classify_main;
-  vnet_classify_table_t * t;
-  u32 match_index = ~0;
-  u32 * indices = 0;
-  int verbose = 0;
-  int i;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
-    {
-      if (unformat (input, "index %d", &match_index))
-        ;
-      else if (unformat (input, "verbose %d", &verbose))
-        ;
-      else if (unformat (input, "verbose"))
-        verbose = 1;
-      else 
-        break;
-    }
-  
-  pool_foreach (t, cm->tables, 
-  ({
-    if (match_index == ~0 || (match_index == t - cm->tables))
-      vec_add1 (indices, t - cm->tables);
-  }));
-
-  if (vec_len(indices))
-    {
-      vlib_cli_output (vm, "%U", format_vnet_classify_table, cm, verbose,
-                       ~0 /* hdr */);
-      for (i = 0; i < vec_len (indices); i++)
-        vlib_cli_output (vm, "%U", format_vnet_classify_table, cm, 
-                         verbose, indices[i]);
-    }
-  else
-    vlib_cli_output (vm, "No classifier tables configured");
-
-  vec_free (indices);
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (show_classify_table_command, static) = {
-  .path = "show classify tables",
-  .short_help = "show classify tables [index <nn>]",
-  .function = show_classify_tables_command_fn,
-};
-
-uword unformat_l4_match (unformat_input_t * input, va_list * args)
-{
-  u8 ** matchp = va_arg (*args, u8 **);
-
-  u8 * proto_header = 0;
-  int src_port = 0;
-  int dst_port = 0;
-
-  tcpudp_header_t h;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "src_port %d", &src_port))
-        ;
-      else if (unformat (input, "dst_port %d", &dst_port))
-        ;
-      else
-        return 0;
-    }
-
-  h.src_port = clib_host_to_net_u16(src_port);
-  h.dst_port = clib_host_to_net_u16(dst_port);
-  vec_validate(proto_header, sizeof(h)-1);
-  memcpy(proto_header, &h, sizeof(h));
-
-  *matchp = proto_header;
-
-  return 1;
-}
-
-uword unformat_ip4_match (unformat_input_t * input, va_list * args)
-{
-  u8 ** matchp = va_arg (*args, u8 **);
-  u8 * match = 0;
-  ip4_header_t * ip;
-  int version = 0;
-  u32 version_val;
-  int hdr_length = 0;
-  u32 hdr_length_val;
-  int src = 0, dst = 0;
-  ip4_address_t src_val, dst_val;
-  int proto = 0;
-  u32 proto_val;
-  int tos = 0;
-  u32 tos_val;
-  int length = 0;
-  u32 length_val;
-  int fragment_id = 0;
-  u32 fragment_id_val;
-  int ttl = 0;
-  int ttl_val;
-  int checksum = 0;
-  u32 checksum_val;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
-    {
-      if (unformat (input, "version %d", &version_val)) 
-        version = 1;
-      else if (unformat (input, "hdr_length %d", &hdr_length_val))
-        hdr_length = 1;
-      else if (unformat (input, "src %U", unformat_ip4_address, &src_val))
-        src = 1;
-      else if (unformat (input, "dst %U", unformat_ip4_address, &dst_val))
-        dst = 1;
-      else if (unformat (input, "proto %d", &proto_val))
-        proto = 1;
-      else if (unformat (input, "tos %d", &tos_val))
-        tos = 1;
-      else if (unformat (input, "length %d", &length_val))
-        length = 1;
-      else if (unformat (input, "fragment_id %d", &fragment_id_val))
-        fragment_id = 1;
-      else if (unformat (input, "ttl %d", &ttl_val))
-        ttl = 1;
-      else if (unformat (input, "checksum %d", &checksum_val))
-        checksum = 1;
-      else
-        break;
-    }
-  
-  if (version + hdr_length + src + dst + proto + tos + length + fragment_id
-      + ttl + checksum == 0)
-    return 0;
-
-  /* 
-   * Aligned because we use the real comparison functions
-   */
-  vec_validate_aligned (match, sizeof (*ip) - 1, sizeof(u32x4));
-  
-  ip = (ip4_header_t *) match;
-  
-  /* These are realistically matched in practice */
-  if (src)
-    ip->src_address.as_u32 = src_val.as_u32;
-
-  if (dst)
-    ip->dst_address.as_u32 = dst_val.as_u32;
-  
-  if (proto)
-    ip->protocol = proto_val;
-    
-
-  /* These are not, but they're included for completeness */
-  if (version)
-    ip->ip_version_and_header_length |= (version_val & 0xF)<<4;
-
-  if (hdr_length)
-    ip->ip_version_and_header_length |= (hdr_length_val & 0xF);
-    
-  if (tos)
-    ip->tos = tos_val;
-  
-  if (length)
-    ip->length = clib_host_to_net_u16 (length_val);
-  
-  if (ttl)
-    ip->ttl = ttl_val;
-
-  if (checksum)
-    ip->checksum = clib_host_to_net_u16 (checksum_val);
-
-  *matchp = match;
-  return 1;
-}
-
-uword unformat_ip6_match (unformat_input_t * input, va_list * args)
-{
-  u8 ** matchp = va_arg (*args, u8 **);
-  u8 * match = 0;
-  ip6_header_t * ip;
-  int version = 0;
-  u32 version_val;
-  u8  traffic_class = 0;
-  u32 traffic_class_val;
-  u8  flow_label = 0;
-  u8  flow_label_val;
-  int src = 0, dst = 0;
-  ip6_address_t src_val, dst_val;
-  int proto = 0;
-  u32 proto_val;
-  int payload_length = 0;
-  u32 payload_length_val;
-  int hop_limit = 0;
-  int hop_limit_val;
-  u32 ip_version_traffic_class_and_flow_label;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
-    {
-      if (unformat (input, "version %d", &version_val)) 
-        version = 1;
-      else if (unformat (input, "traffic_class %d", &traffic_class_val))
-        traffic_class = 1;
-      else if (unformat (input, "flow_label %d", &flow_label_val))
-        flow_label = 1;
-      else if (unformat (input, "src %U", unformat_ip6_address, &src_val))
-        src = 1;
-      else if (unformat (input, "dst %U", unformat_ip6_address, &dst_val))
-        dst = 1;
-      else if (unformat (input, "proto %d", &proto_val))
-        proto = 1;
-      else if (unformat (input, "payload_length %d", &payload_length_val))
-        payload_length = 1;
-      else if (unformat (input, "hop_limit %d", &hop_limit_val))
-        hop_limit = 1;
-      else
-        break;
-    }
-  
-  if (version + traffic_class + flow_label + src + dst + proto +
-      payload_length + hop_limit == 0)
-    return 0;
-
-  /* 
-   * Aligned because we use the real comparison functions
-   */
-  vec_validate_aligned (match, sizeof (*ip) - 1, sizeof(u32x4));
-  
-  ip = (ip6_header_t *) match;
-  
-  if (src)
-    clib_memcpy (&ip->src_address, &src_val, sizeof (ip->src_address));
-
-  if (dst)
-    clib_memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address));
-  
-  if (proto)
-    ip->protocol = proto_val;
-    
-  ip_version_traffic_class_and_flow_label = 0;
-
-  if (version)
-    ip_version_traffic_class_and_flow_label |= (version_val & 0xF) << 28;
-
-  if (traffic_class)
-    ip_version_traffic_class_and_flow_label |= (traffic_class_val & 0xFF) << 20;
-
-  if (flow_label)
-    ip_version_traffic_class_and_flow_label |= (flow_label_val & 0xFFFFF);
-    
-  ip->ip_version_traffic_class_and_flow_label = 
-    clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label);
-
-  if (payload_length)
-    ip->payload_length = clib_host_to_net_u16 (payload_length_val);
-  
-  if (hop_limit)
-    ip->hop_limit = hop_limit_val;
-
-  *matchp = match;
-  return 1;
-}
-
-uword unformat_l3_match (unformat_input_t * input, va_list * args)
-{
-  u8 ** matchp = va_arg (*args, u8 **);
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "ip4 %U", unformat_ip4_match, matchp))
-      return 1;
-    else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp))
-      return 1;
-    /* $$$$ add mpls */
-    else
-      break;
-  }
-  return 0;
-}
-
-uword unformat_vlan_tag (unformat_input_t * input, va_list * args)
-{
-  u8 * tagp = va_arg (*args, u8 *);
-  u32 tag;
-
-  if (unformat(input, "%d", &tag))
-    {
-      tagp[0] = (tag>>8) & 0x0F;
-      tagp[1] = tag & 0xFF;
-      return 1;
-    }
-
-  return 0;
-}
-
-uword unformat_l2_match (unformat_input_t * input, va_list * args)
-{
-  u8 ** matchp = va_arg (*args, u8 **);
-  u8 * match = 0;
-  u8 src = 0;
-  u8 src_val[6];
-  u8 dst = 0;
-  u8 dst_val[6];
-  u8 proto = 0;
-  u16 proto_val;
-  u8 tag1 = 0;
-  u8 tag1_val [2];
-  u8 tag2 = 0;
-  u8 tag2_val [2];
-  int len = 14;
-  u8 ignore_tag1 = 0;
-  u8 ignore_tag2 = 0;
-  u8 cos1 = 0;
-  u8 cos2 = 0;
-  u32 cos1_val = 0;
-  u32 cos2_val = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "src %U", unformat_ethernet_address, &src_val))
-      src = 1;
-    else if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val))
-      dst = 1;
-    else if (unformat (input, "proto %U", 
-                       unformat_ethernet_type_host_byte_order, &proto_val))
-      proto = 1;
-    else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val))
-      tag1 = 1;
-    else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val))
-      tag2 = 1;
-    else if (unformat (input, "ignore-tag1"))
-      ignore_tag1 = 1;
-    else if (unformat (input, "ignore-tag2"))
-      ignore_tag2 = 1;
-    else if (unformat (input, "cos1 %d", &cos1_val))
-      cos1 = 1;
-    else if (unformat (input, "cos2 %d", &cos2_val))
-      cos2 = 1;
-    else
-      break;
-  }
-  if ((src + dst + proto + tag1 + tag2 +
-      ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
-    return 0;
-
-  if (tag1 || ignore_tag1 || cos1)
-    len = 18;
-  if (tag2 || ignore_tag2 || cos2)
-    len = 22;
-
-  vec_validate_aligned (match, len-1, sizeof(u32x4));
-
-  if (dst)
-    clib_memcpy (match, dst_val, 6);
-
-  if (src)
-    clib_memcpy (match + 6, src_val, 6);
-  
-  if (tag2)
-    {
-      /* inner vlan tag */
-      match[19] = tag2_val[1];
-      match[18] = tag2_val[0];
-      if (cos2)
-        match [18] |= (cos2_val & 0x7) << 5;
-      if (proto)
-        {
-          match[21] = proto_val & 0xff;
-          match[20] = proto_val >> 8;
-        }
-      if (tag1)
-        {
-          match [15] = tag1_val[1];
-          match [14] = tag1_val[0];
-        }
-      if (cos1)
-        match [14] |= (cos1_val & 0x7) << 5;
-      *matchp = match;
-      return 1;
-    }
-  if (tag1)
-    {
-      match [15] = tag1_val[1];
-      match [14] = tag1_val[0];
-      if (proto)
-        {
-          match[17] = proto_val & 0xff;
-          match[16] = proto_val >> 8;
-        }
-      if (cos1)
-        match [14] |= (cos1_val & 0x7) << 5;
-
-      *matchp = match;
-      return 1;
-    }
-  if (cos2)
-    match [18] |= (cos2_val & 0x7) << 5;
-  if (cos1)
-    match [14] |= (cos1_val & 0x7) << 5;
-  if (proto)
-    {
-      match[13] = proto_val & 0xff;
-      match[12] = proto_val >> 8;
-    }
-  
-  *matchp = match;
-  return 1;
-}
-
-
-uword unformat_classify_match (unformat_input_t * input, va_list * args)
-{
-  vnet_classify_main_t * cm = va_arg (*args, vnet_classify_main_t *);
-  u8 ** matchp = va_arg (*args, u8 **);
-  u32 table_index = va_arg (*args, u32);
-  vnet_classify_table_t * t;
-  
-  u8 * match = 0;
-  u8 * l2 = 0;
-  u8 * l3 = 0;
-  u8 * l4 = 0;
-
-  if (pool_is_free_index (cm->tables, table_index))
-    return 0;
-
-  t = pool_elt_at_index (cm->tables, table_index);
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "hex %U", unformat_hex_string, &match))
-      ;
-    else if (unformat (input, "l2 %U", unformat_l2_match, &l2))
-      ;
-    else if (unformat (input, "l3 %U", unformat_l3_match, &l3))
-      ;
-    else if (unformat (input, "l4 %U", unformat_l4_match, &l4))
-      ;
-    else
-      break;
-  }
-
-  if (l4 && !l3) {
-    vec_free (match);
-    vec_free (l2);
-    vec_free (l4);
-    return 0;
-  }
-
-  if (match || l2 || l3 || l4)
-    {
-      if (l2 || l3 || l4)
-        {
-          /* "Win a free Ethernet header in every packet" */
-          if (l2 == 0)
-            vec_validate_aligned (l2, 13, sizeof(u32x4));
-          match = l2;
-          if (l3)
-            {
-              vec_append_aligned (match, l3, sizeof(u32x4));
-              vec_free (l3);
-            }
-          if (l4)
-            {
-              vec_append_aligned (match, l4, sizeof(u32x4));
-              vec_free (l4);
-            }
-        }
-
-      /* Make sure the vector is big enough even if key is all 0's */
-      vec_validate_aligned 
-        (match, ((t->match_n_vectors + t->skip_n_vectors) * sizeof(u32x4)) - 1,
-         sizeof(u32x4));
-      
-      /* Set size, include skipped vectors*/
-      _vec_len (match) = (t->match_n_vectors+t->skip_n_vectors) * sizeof(u32x4);
-
-      *matchp = match;
-
-      return 1;
-    }
-
-  return 0;
-}
-
-int vnet_classify_add_del_session (vnet_classify_main_t * cm, 
-                                   u32 table_index, 
-                                   u8 * match, 
-                                   u32 hit_next_index,
-                                   u32 opaque_index, 
-                                   i32 advance,
-                                   u8 action,
-                                   u32 metadata,
-                                   int is_add)
-{
-  vnet_classify_table_t * t;
-  vnet_classify_entry_5_t _max_e __attribute__((aligned (16)));
-  vnet_classify_entry_t * e;
-  int i, rv;
-
-  if (pool_is_free_index (cm->tables, table_index))
-    return VNET_API_ERROR_NO_SUCH_TABLE;
-  
-  t = pool_elt_at_index (cm->tables, table_index);
-  
-  e = (vnet_classify_entry_t *)&_max_e;
-  e->next_index = hit_next_index;
-  e->opaque_index = opaque_index;
-  e->advance = advance;
-  e->hits = 0;
-  e->last_heard = 0;
-  e->flags = 0;
-  e->action = action;
-  if (e->action == CLASSIFY_ACTION_SET_IP4_FIB_INDEX)
-    e->metadata = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, metadata);
-  else if (e->action == CLASSIFY_ACTION_SET_IP6_FIB_INDEX)
-    e->metadata = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, metadata);
-
-  /* Copy key data, honoring skip_n_vectors */
-  clib_memcpy (&e->key, match + t->skip_n_vectors * sizeof (u32x4),
-          t->match_n_vectors * sizeof (u32x4));
-
-  /* Clear don't-care bits; likely when dynamically creating sessions */
-  for (i = 0; i < t->match_n_vectors; i++)
-    e->key[i] &= t->mask[i];
-
-  rv = vnet_classify_add_del (t, e, is_add);
-  if (rv)
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-  return 0;
-}
-
-static clib_error_t *
-classify_session_command_fn (vlib_main_t * vm,
-                             unformat_input_t * input,
-                             vlib_cli_command_t * cmd)
-{
-  vnet_classify_main_t * cm = &vnet_classify_main;
-  int is_add = 1;
-  u32 table_index = ~0;
-  u32 hit_next_index = ~0;
-  u64 opaque_index = ~0;
-  u8 * match = 0;
-  i32 advance = 0;
-  u32 action = 0;
-  u32 metadata = 0;
-  int i, rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) 
-    {
-      if (unformat (input, "del"))
-        is_add = 0;
-      else if (unformat (input, "hit-next %U", unformat_ip_next_index,
-                         &hit_next_index))
-        ;
-      else if (unformat (input, "l2-input-hit-next %U", unformat_l2_input_next_index,
-                         &hit_next_index))
-        ;
-      else if (unformat (input, "l2-output-hit-next %U", unformat_l2_output_next_index,
-                         &hit_next_index))
-        ;
-      else if (unformat (input, "acl-hit-next %U", unformat_acl_next_index,
-                         &hit_next_index))
-        ;
-      else if (unformat (input, "policer-hit-next %U",
-                         unformat_policer_next_index, &hit_next_index))
-        ;
-      else if (unformat (input, "opaque-index %lld", &opaque_index))
-        ;
-      else if (unformat (input, "match %U", unformat_classify_match,
-                         cm, &match, table_index))
-        ;
-      else if (unformat (input, "advance %d", &advance))
-        ;
-      else if (unformat (input, "table-index %d", &table_index))
-        ;
-      else if (unformat (input, "action set-ip4-fib-id %d", &metadata))
-        action = 1;
-      else if (unformat (input, "action set-ip6-fib-id %d", &metadata))
-        action = 2;
-      else
-        {
-          /* Try registered opaque-index unformat fns */
-          for (i = 0; i < vec_len (cm->unformat_opaque_index_fns); i++)
-            {
-              if (unformat (input, "%U", cm->unformat_opaque_index_fns[i], 
-                            &opaque_index))
-                goto found_opaque;
-            }
-          break;
-        }
-    found_opaque:
-      ;
-    }
-
-  if (table_index == ~0)
-    return clib_error_return (0, "Table index required");
-
-  if (is_add && match == 0)
-    return clib_error_return (0, "Match value required");
-
-  rv = vnet_classify_add_del_session (cm, table_index, match, 
-                                      hit_next_index,
-                                      opaque_index, advance,
-                                      action, metadata, is_add);
-
-  switch(rv)
-    {
-    case 0:
-      break;
-
-    default:
-      return clib_error_return (0, "vnet_classify_add_del_session returned %d",
-                                rv);
-    }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (classify_session_command, static) = {
-    .path = "classify session",
-    .short_help =
-    "classify session [hit-next|l2-hit-next|"
-    "acl-hit-next <next_index>|policer-hit-next <policer_name>]"
-    "\n table-index <nn> match [hex] [l2] [l3 ip4] [opaque-index <index>]"
-    "\n [action set-ip4-fib-id <n>] [action set-ip6-fib-id <n>] [del]",
-    .function = classify_session_command_fn,
-};
-
-static uword 
-unformat_opaque_sw_if_index (unformat_input_t * input, va_list * args)
-{
-  u64 * opaquep = va_arg (*args, u64 *);
-  u32 sw_if_index;
-
-  if (unformat (input, "opaque-sw_if_index %U", unformat_vnet_sw_interface,
-                vnet_get_main(), &sw_if_index))
-    {
-      *opaquep = sw_if_index;
-      return 1;
-    }
-  return 0;
-}
-
-static uword
-unformat_ip_next_node (unformat_input_t * input, va_list * args)
-{
-  vnet_classify_main_t * cm = &vnet_classify_main;
-  u32 * next_indexp = va_arg (*args, u32 *);
-  u32 node_index;
-  u32 next_index = ~0;
-
-  if (unformat (input, "ip6-node %U", unformat_vlib_node,
-                cm->vlib_main, &node_index))
-    {
-      next_index = vlib_node_add_next (cm->vlib_main,
-				       ip6_classify_node.index, node_index);
-    }
-  else if (unformat (input, "ip4-node %U", unformat_vlib_node,
-		     cm->vlib_main, &node_index))
-    {
-      next_index = vlib_node_add_next (cm->vlib_main,
-				       ip4_classify_node.index, node_index);
-    }
-  else
-    return 0;
-
-  *next_indexp = next_index;
-  return 1;
-}
-
-static uword 
-unformat_acl_next_node (unformat_input_t * input, va_list * args)
-{
-  vnet_classify_main_t * cm = &vnet_classify_main;
-  u32 * next_indexp = va_arg (*args, u32 *);
-  u32 node_index;
-  u32 next_index;
-
-  if (unformat (input, "ip6-node %U", unformat_vlib_node,
-                cm->vlib_main, &node_index))
-    {
-      next_index = vlib_node_add_next (cm->vlib_main,
-				       ip6_inacl_node.index, node_index);
-    }
-  else if (unformat (input, "ip4-node %U", unformat_vlib_node,
-		     cm->vlib_main, &node_index))
-    {
-      next_index = vlib_node_add_next (cm->vlib_main,
-				       ip4_inacl_node.index, node_index);
-    }
-  else
-    return 0;
-
-  *next_indexp = next_index;
-  return 1;
-}
-
-static uword 
-unformat_l2_input_next_node (unformat_input_t * input, va_list * args)
-{
-  vnet_classify_main_t * cm = &vnet_classify_main;
-  u32 * next_indexp = va_arg (*args, u32 *);
-  u32 node_index;
-  u32 next_index;
-
-  if (unformat (input, "input-node %U", unformat_vlib_node,
-                cm->vlib_main, &node_index))
-    {
-      next_index = vlib_node_add_next 
-        (cm->vlib_main, l2_input_classify_node.index, node_index);
-
-      *next_indexp = next_index;
-      return 1;
-    }
-  return 0;
-}
-
-static uword 
-unformat_l2_output_next_node (unformat_input_t * input, va_list * args)
-{
-  vnet_classify_main_t * cm = &vnet_classify_main;
-  u32 * next_indexp = va_arg (*args, u32 *);
-  u32 node_index;
-  u32 next_index;
-
-  if (unformat (input, "output-node %U", unformat_vlib_node,
-                cm->vlib_main, &node_index))
-    {
-      next_index = vlib_node_add_next 
-        (cm->vlib_main, l2_output_classify_node.index, node_index);
-
-      *next_indexp = next_index;
-      return 1;
-    }
-  return 0;
-}
-
-static clib_error_t * 
-vnet_classify_init (vlib_main_t * vm)
-{
-  vnet_classify_main_t * cm = &vnet_classify_main;
-
-  cm->vlib_main = vm;
-  cm->vnet_main = vnet_get_main();
-
-  vnet_classify_register_unformat_opaque_index_fn 
-    (unformat_opaque_sw_if_index);
-
-  vnet_classify_register_unformat_ip_next_index_fn
-    (unformat_ip_next_node);
-
-  vnet_classify_register_unformat_l2_next_index_fn
-    (unformat_l2_input_next_node);
-
-  vnet_classify_register_unformat_l2_next_index_fn
-    (unformat_l2_output_next_node);
-
-  vnet_classify_register_unformat_acl_next_index_fn
-    (unformat_acl_next_node);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (vnet_classify_init);
-
-#define TEST_CODE 1
-
-#if TEST_CODE > 0
-static clib_error_t *
-test_classify_command_fn (vlib_main_t * vm,
-		 unformat_input_t * input,
-		 vlib_cli_command_t * cmd)
-{
-  u32 buckets = 2;
-  u32 sessions = 10;
-  int i, rv;
-  vnet_classify_table_t * t = 0;
-  classify_data_or_mask_t * mask;
-  classify_data_or_mask_t * data;
-  u8 *mp = 0, *dp = 0;
-  vnet_classify_main_t * cm = &vnet_classify_main;
-  vnet_classify_entry_t * e;
-  int is_add = 1;
-  u32 tmp;
-  u32 table_index = ~0;
-  ip4_address_t src;
-  u32 deleted = 0;
-  u32 memory_size = 64<<20;
-
-  /* Default starting address 1.0.0.10 */
-  src.as_u32 = clib_net_to_host_u32 (0x0100000A);
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "sessions %d", &sessions))
-      ;
-    else if (unformat (input, "src %U", unformat_ip4_address, &src))
-      ;
-    else if (unformat (input, "buckets %d", &buckets))
-      ;
-    else if (unformat (input, "memory-size %uM", &tmp))
-      memory_size = tmp<<20;
-    else if (unformat (input, "memory-size %uG", &tmp))
-      memory_size = tmp<<30;
-    else if (unformat (input, "del"))
-      is_add = 0;
-    else if (unformat (input, "table %d", &table_index))
-      ;
-    else
-      break;
-    }
-
-  vec_validate_aligned (mp, 3 * sizeof(u32x4), sizeof(u32x4));
-  vec_validate_aligned (dp, 3 * sizeof(u32x4), sizeof(u32x4));
-
-  mask = (classify_data_or_mask_t *) mp;
-  data = (classify_data_or_mask_t *) dp;
-
-  data->ip.src_address.as_u32 = src.as_u32;
-
-  /* Mask on src address */
-  memset (&mask->ip.src_address, 0xff, 4);
-
-  buckets = 1<<max_log2(buckets);
-
-  if (table_index != ~0)
-    {
-      if (pool_is_free_index (cm->tables, table_index))
-        {
-          vlib_cli_output (vm, "No such table %d", table_index);
-          goto out;
-        }
-      t = pool_elt_at_index (cm->tables, table_index);
-    }
-
-  if (is_add)
-    {
-      if (t == 0)
-        {
-          t = vnet_classify_new_table (cm, (u8 *)mask, buckets, 
-                                       memory_size,
-                                       0 /* skip */,
-                                       3 /* vectors to match */);
-          t->miss_next_index = IP_LOOKUP_NEXT_DROP;
-          vlib_cli_output (vm, "Create table %d", t - cm->tables);
-        }
-      
-      vlib_cli_output (vm, "Add %d sessions to %d buckets...", 
-                       sessions, buckets);
-      
-      for (i = 0; i < sessions; i++)
-        {
-          rv = vnet_classify_add_del_session (cm, t - cm->tables, (u8 *) data,
-                                              IP_LOOKUP_NEXT_DROP,
-                                              i+100 /* opaque_index */, 
-                                              0 /* advance */, 0, 0,
-                                              1 /* is_add */);
-
-          if (rv != 0)
-            clib_warning ("add: returned %d", rv);
-          
-          tmp = clib_net_to_host_u32 (data->ip.src_address.as_u32) + 1;
-          data->ip.src_address.as_u32 = clib_net_to_host_u32 (tmp);
-        }
-      goto out;
-    }
-
-  if (t == 0)
-    {
-      vlib_cli_output (vm, "Must specify table index to delete sessions");
-      goto out;
-    }
-
-  vlib_cli_output (vm, "Try to delete %d sessions...", sessions);
-
-  for (i = 0; i < sessions; i++)
-    {
-      u8 * key_minus_skip;
-      u64 hash;
-
-      hash = vnet_classify_hash_packet (t, (u8 *) data);
-
-      e = vnet_classify_find_entry (t, (u8 *) data, hash, 0 /* time_now */);
-      /* Previous delete, perhaps... */
-      if (e == 0)
-        continue;
-      ASSERT (e->opaque_index == (i+100));
-
-      key_minus_skip = (u8 *)e->key;
-      key_minus_skip -= t->skip_n_vectors * sizeof (u32x4);
-
-      rv = vnet_classify_add_del_session (cm, t - cm->tables, key_minus_skip,
-                                          IP_LOOKUP_NEXT_DROP,
-                                          i+100 /* opaque_index */, 
-                                          0 /* advance */, 0, 0,
-                                          0 /* is_add */);
-      if (rv != 0)
-        clib_warning ("del: returned %d", rv);
-      
-      tmp = clib_net_to_host_u32 (data->ip.src_address.as_u32) + 1;
-      data->ip.src_address.as_u32 = clib_net_to_host_u32 (tmp);
-      deleted++;
-    }
-
-  vlib_cli_output (vm, "Deleted %d sessions...", deleted);
-
- out:
-  vec_free (mp);
-  vec_free (dp);
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (test_classify_command, static) = {
-    .path = "test classify",
-    .short_help = 
-    "test classify [src <ip>] [sessions <nn>] [buckets <nn>] [table <nn>] [del]",
-    .function = test_classify_command_fn,
-};
-#endif /* TEST_CODE */
diff --git a/vnet/vnet/classify/vnet_classify.h b/vnet/vnet/classify/vnet_classify.h
deleted file mode 100644
index d0b896ed..00000000
--- a/vnet/vnet/classify/vnet_classify.h
+++ /dev/null
@@ -1,523 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_vnet_classify_h__
-#define __included_vnet_classify_h__
-
-#include <stdarg.h>
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/ip/ip_packet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vlib/cli.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/feat_bitmap.h>
-#include <vnet/api_errno.h>     /* for API error numbers */
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/cache.h>
-#include <vppinfra/xxhash.h>
-
-extern vlib_node_registration_t ip4_classify_node;
-extern vlib_node_registration_t ip6_classify_node;
-
-#define CLASSIFY_TRACE 0
-
-#if !defined( __aarch64__) && !defined(__arm__)
-#define CLASSIFY_USE_SSE //Allow usage of SSE operations
-#endif
-
-#define U32X4_ALIGNED(p) PREDICT_TRUE((((intptr_t)p) & 0xf) == 0)
-
-/*
- * Classify table option to process packets
- *  CLASSIFY_FLAG_USE_CURR_DATA:
- *   - classify packets starting from VPP node’s current data pointer
- */
-#define CLASSIFY_FLAG_USE_CURR_DATA              1
-
-/*
- * Classify session action
- *  CLASSIFY_ACTION_SET_IP4_FIB_INDEX:
- *   - Classified IP packets will be looked up
- *     from the specified ipv4 fib table
- *  CLASSIFY_ACTION_SET_IP6_FIB_INDEX:
- *   - Classified IP packets will be looked up
- *     from the specified ipv6 fib table
- */
-#define CLASSIFY_ACTION_SET_IP4_FIB_INDEX       1
-#define CLASSIFY_ACTION_SET_IP6_FIB_INDEX       2
-
-struct _vnet_classify_main;
-typedef struct _vnet_classify_main vnet_classify_main_t;
-
-#define foreach_size_in_u32x4                   \
-_(1)                                            \
-_(2)                                            \
-_(3)                                            \
-_(4)                                            \
-_(5)
-
-typedef CLIB_PACKED(struct _vnet_classify_entry {
-  /* Graph node next index */
-  u32 next_index;
-
-  /* put into vnet_buffer(b)->l2_classfy.opaque_index */
-  union {
-    struct {
-      u32 opaque_index;
-      /* advance on hit, note it's a signed quantity... */
-      i32 advance;
-    };
-    u64 opaque_count;
-  };
-
-  /* Really only need 1 bit */
-  u8 flags;
-#define VNET_CLASSIFY_ENTRY_FREE	(1<<0)
-
-  u8 action;
-  u16 metadata;
-
-  /* Hit counter, last heard time */
-  union {
-    u64 hits;
-    struct _vnet_classify_entry * next_free;
-  };
-    
-  f64 last_heard;
-
-  /* Must be aligned to a 16-octet boundary */
-  u32x4 key[0];
-}) vnet_classify_entry_t;
-
-static inline int vnet_classify_entry_is_free (vnet_classify_entry_t * e)
-{
-  return e->flags & VNET_CLASSIFY_ENTRY_FREE;
-}
-
-static inline int vnet_classify_entry_is_busy (vnet_classify_entry_t * e)
-{
-  return ((e->flags & VNET_CLASSIFY_ENTRY_FREE) == 0);
-}
-
-/* Need these to con the vector allocator */
-#define _(size)                                 \
-typedef CLIB_PACKED(struct {                    \
-  u32 pad0[4];                                  \
-  u64 pad1[2];                                  \
-  u32x4 key[size];                              \
-}) vnet_classify_entry_##size##_t;
-foreach_size_in_u32x4;
-#undef _
-
-typedef struct {
-  union {
-    struct {
-      u32 offset;
-      u8 pad[3];
-      u8 log2_pages;
-    };
-    u64 as_u64;
-  };
-} vnet_classify_bucket_t;
-
-typedef struct {
-  /* Mask to apply after skipping N vectors */
-  u32x4 *mask;
-  /* Buckets and entries */
-  vnet_classify_bucket_t * buckets;
-  vnet_classify_entry_t * entries;
-  
-  /* Config parameters */
-  u32 match_n_vectors;
-  u32 skip_n_vectors;
-  u32 nbuckets;
-  u32 log2_nbuckets;
-  int entries_per_page;
-  u32 active_elements;
-  u32 current_data_flag;
-  int current_data_offset;
-  u32 data_offset;
-  /* Index of next table to try */
-  u32 next_table_index;
-  
-  /* Miss next index, return if next_table_index = 0 */
-  u32 miss_next_index;
-  
-  /* Per-bucket working copies, one per thread */
-  vnet_classify_entry_t ** working_copies;
-  vnet_classify_bucket_t saved_bucket;
-  
-  /* Free entry freelists */
-  vnet_classify_entry_t **freelists;
-
-  u8 * name;
-  
-  /* Private allocation arena, protected by the writer lock */
-  void * mheap;
-  
-  /* Writer (only) lock for this table */
-  volatile u32 * writer_lock;
-  
-} vnet_classify_table_t;
-
-struct _vnet_classify_main {
-  /* Table pool */
-  vnet_classify_table_t * tables;
-  
-  /* Registered next-index, opaque unformat fcns */
-  unformat_function_t ** unformat_l2_next_index_fns;
-  unformat_function_t ** unformat_ip_next_index_fns;
-  unformat_function_t ** unformat_acl_next_index_fns;
-  unformat_function_t ** unformat_policer_next_index_fns;
-  unformat_function_t ** unformat_opaque_index_fns;
-
-  /* convenience variables */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-};
-
-extern vnet_classify_main_t vnet_classify_main;
-
-u8 * format_classify_table (u8 * s, va_list * args);
-
-u64 vnet_classify_hash_packet (vnet_classify_table_t * t, u8 * h);
-
-static inline u64 
-vnet_classify_hash_packet_inline (vnet_classify_table_t * t, 
-                                  u8 * h)
-{
-  u32x4 *mask;
-
-  union {
-    u32x4 as_u32x4;
-    u64 as_u64[2];
-  } xor_sum __attribute__((aligned(sizeof(u32x4))));
-
-  ASSERT(t);
-  mask = t->mask;
-#ifdef CLASSIFY_USE_SSE
-  if (U32X4_ALIGNED(h)) {  //SSE can't handle unaligned data
-    u32x4 *data = (u32x4 *)h;
-    xor_sum.as_u32x4  = data[0 + t->skip_n_vectors] & mask[0];
-    switch (t->match_n_vectors)
-    {
-      case 5:
-        xor_sum.as_u32x4 ^= data[4 + t->skip_n_vectors] & mask[4];
-        /* FALLTHROUGH */
-      case 4:
-        xor_sum.as_u32x4 ^= data[3 + t->skip_n_vectors] & mask[3];
-        /* FALLTHROUGH */
-      case 3:
-        xor_sum.as_u32x4 ^= data[2 + t->skip_n_vectors] & mask[2];
-        /* FALLTHROUGH */
-      case 2:
-        xor_sum.as_u32x4 ^= data[1 + t->skip_n_vectors] & mask[1];
-        /* FALLTHROUGH */
-      case 1:
-        break;
-      default:
-        abort();
-    }
-  } else
-#endif /* CLASSIFY_USE_SSE */
-  {
-    u32 skip_u64 = t->skip_n_vectors * 2;
-    u64 *data64 = (u64 *)h;
-    xor_sum.as_u64[0] = data64[0 + skip_u64] & ((u64 *)mask)[0];
-    xor_sum.as_u64[1] = data64[1 + skip_u64] & ((u64 *)mask)[1];
-    switch (t->match_n_vectors)
-    {
-      case 5:
-        xor_sum.as_u64[0]  ^= data64[8 + skip_u64] & ((u64 *)mask)[8];
-        xor_sum.as_u64[1]  ^= data64[9 + skip_u64] & ((u64 *)mask)[9];
-        /* FALLTHROUGH */
-      case 4:
-        xor_sum.as_u64[0]  ^= data64[6 + skip_u64] & ((u64 *)mask)[6];
-        xor_sum.as_u64[1]  ^= data64[7 + skip_u64] & ((u64 *)mask)[7];
-        /* FALLTHROUGH */
-      case 3:
-        xor_sum.as_u64[0]  ^= data64[4 + skip_u64] & ((u64 *)mask)[4];
-        xor_sum.as_u64[1]  ^= data64[5 + skip_u64] & ((u64 *)mask)[5];
-        /* FALLTHROUGH */
-      case 2:
-        xor_sum.as_u64[0]  ^= data64[2 + skip_u64] & ((u64 *)mask)[2];
-        xor_sum.as_u64[1]  ^= data64[3 + skip_u64] & ((u64 *)mask)[3];
-        /* FALLTHROUGH */
-      case 1:
-        break;
-
-      default:
-        abort();
-    }
-  }
-  
-  return clib_xxhash (xor_sum.as_u64[0] ^ xor_sum.as_u64[1]);
-}
-
-static inline void 
-vnet_classify_prefetch_bucket (vnet_classify_table_t * t, u64 hash)
-{
-  u32 bucket_index;
-  
-  ASSERT (is_pow2(t->nbuckets));
-  
-  bucket_index = hash & (t->nbuckets - 1);
-  
-  CLIB_PREFETCH(&t->buckets[bucket_index], CLIB_CACHE_LINE_BYTES, LOAD);
-}
-
-static inline vnet_classify_entry_t * 
-vnet_classify_get_entry (vnet_classify_table_t * t, uword offset)
-{
-  u8 * hp = t->mheap;
-  u8 * vp = hp + offset;
-  
-  return (void *) vp;
-}
-
-static inline uword vnet_classify_get_offset (vnet_classify_table_t * t, 
-                                              vnet_classify_entry_t * v)
-{
-  u8 * hp, * vp;
-
-  hp = (u8 *) t->mheap;
-  vp = (u8 *) v;
-
-  ASSERT((vp - hp) < 0x100000000ULL);
-  return vp - hp;
-}
-
-static inline vnet_classify_entry_t *
-vnet_classify_entry_at_index (vnet_classify_table_t * t, 
-                              vnet_classify_entry_t * e,
-                              u32 index)
-{
-  u8 * eu8;
-
-  eu8 = (u8 *)e;
-
-  eu8 += index * (sizeof (vnet_classify_entry_t) +
-                  (t->match_n_vectors * sizeof (u32x4)));
-
-  return (vnet_classify_entry_t *) eu8;
-}
-
-static inline void
-vnet_classify_prefetch_entry (vnet_classify_table_t * t, 
-                              u64 hash)
-{
-  u32 bucket_index;
-  u32 value_index;
-  vnet_classify_bucket_t * b;
-  vnet_classify_entry_t * e;
-
-  bucket_index = hash & (t->nbuckets - 1);
-
-  b = &t->buckets[bucket_index];
-  
-  if (b->offset == 0)
-    return;
-
-  hash >>= t->log2_nbuckets;
-
-  e = vnet_classify_get_entry (t, b->offset);
-  value_index = hash & ((1<<b->log2_pages)-1);
-
-  e = vnet_classify_entry_at_index (t, e, value_index);
-
-  CLIB_PREFETCH(e, CLIB_CACHE_LINE_BYTES, LOAD);
-}
-
-vnet_classify_entry_t *
-vnet_classify_find_entry (vnet_classify_table_t * t,
-                          u8 * h, u64 hash, f64 now);
-
-static inline vnet_classify_entry_t *
-vnet_classify_find_entry_inline (vnet_classify_table_t * t,
-                                 u8 * h, u64 hash, f64 now)
-  {
-  vnet_classify_entry_t * v;
-  u32x4 *mask, *key;
-  union {
-    u32x4 as_u32x4;
-    u64 as_u64[2];
-  } result __attribute__((aligned(sizeof(u32x4))));
-  vnet_classify_bucket_t * b;
-  u32 value_index;
-  u32 bucket_index;
-  int i;
-
-  bucket_index = hash & (t->nbuckets-1);
-  b = &t->buckets[bucket_index];
-  mask = t->mask;
-
-  if (b->offset == 0)
-    return 0;
-
-  hash >>= t->log2_nbuckets;
-
-  v = vnet_classify_get_entry (t, b->offset);
-  value_index = hash & ((1<<b->log2_pages)-1);
-  v = vnet_classify_entry_at_index (t, v, value_index);
-
-#ifdef CLASSIFY_USE_SSE
-  if (U32X4_ALIGNED(h)) {
-    u32x4 *data = (u32x4 *) h;
-    for (i = 0; i < t->entries_per_page; i++) {
-      key = v->key;
-      result.as_u32x4 = (data[0 + t->skip_n_vectors] & mask[0]) ^ key[0];
-      switch (t->match_n_vectors)
-      {
-        case 5:
-          result.as_u32x4 |= (data[4 + t->skip_n_vectors] & mask[4]) ^ key[4];
-          /* FALLTHROUGH */
-        case 4:
-          result.as_u32x4 |= (data[3 + t->skip_n_vectors] & mask[3]) ^ key[3];
-          /* FALLTHROUGH */
-        case 3:
-          result.as_u32x4 |= (data[2 + t->skip_n_vectors] & mask[2]) ^ key[2];
-          /* FALLTHROUGH */
-        case 2:
-          result.as_u32x4 |= (data[1 + t->skip_n_vectors] & mask[1]) ^ key[1];
-          /* FALLTHROUGH */
-        case 1:
-          break;
-        default:
-          abort();
-      }
-
-      if (u32x4_zero_byte_mask (result.as_u32x4) == 0xffff) {
-        if (PREDICT_TRUE(now)) {
-          v->hits++;
-          v->last_heard = now;
-        }
-        return (v);
-      }
-      v = vnet_classify_entry_at_index (t, v, 1);
-    }
-  } else
-#endif /* CLASSIFY_USE_SSE */
-  {
-    u32 skip_u64 = t->skip_n_vectors * 2;
-    u64 *data64 = (u64 *)h;
-    for (i = 0; i < t->entries_per_page; i++) {
-      key = v->key;
-
-      result.as_u64[0] = (data64[0 + skip_u64] & ((u64 *)mask)[0]) ^ ((u64 *)key)[0];
-      result.as_u64[1] = (data64[1 + skip_u64] & ((u64 *)mask)[1]) ^ ((u64 *)key)[1];
-      switch (t->match_n_vectors)
-      {
-        case 5:
-          result.as_u64[0] |= (data64[8 + skip_u64] & ((u64 *)mask)[8]) ^ ((u64 *)key)[8];
-          result.as_u64[1] |= (data64[9 + skip_u64] & ((u64 *)mask)[9]) ^ ((u64 *)key)[9];
-          /* FALLTHROUGH */
-        case 4:
-          result.as_u64[0] |= (data64[6 + skip_u64] & ((u64 *)mask)[6]) ^ ((u64 *)key)[6];
-          result.as_u64[1] |= (data64[7 + skip_u64] & ((u64 *)mask)[7]) ^ ((u64 *)key)[7];
-          /* FALLTHROUGH */
-        case 3:
-          result.as_u64[0] |= (data64[4 + skip_u64] & ((u64 *)mask)[4]) ^ ((u64 *)key)[4];
-          result.as_u64[1] |= (data64[5 + skip_u64] & ((u64 *)mask)[5]) ^ ((u64 *)key)[5];
-          /* FALLTHROUGH */
-        case 2:
-          result.as_u64[0] |= (data64[2 + skip_u64] & ((u64 *)mask)[2]) ^ ((u64 *)key)[2];
-          result.as_u64[1] |= (data64[3 + skip_u64] & ((u64 *)mask)[3]) ^ ((u64 *)key)[3];
-          /* FALLTHROUGH */
-        case 1:
-          break;
-        default:
-          abort();
-      }
-
-      if (result.as_u64[0] == 0 && result.as_u64[1] == 0) {
-        if (PREDICT_TRUE(now)) {
-          v->hits++;
-          v->last_heard = now;
-        }
-        return (v);
-      }
-
-      v = vnet_classify_entry_at_index (t, v, 1);
-    }
-  }
-  return 0;
-  }
-
-vnet_classify_table_t * 
-vnet_classify_new_table (vnet_classify_main_t *cm,
-                         u8 * mask, u32 nbuckets, u32 memory_size,
-                         u32 skip_n_vectors,
-                         u32 match_n_vectors);
-
-int vnet_classify_add_del_session (vnet_classify_main_t * cm, 
-                                   u32 table_index, 
-                                   u8 * match, 
-                                   u32 hit_next_index,
-                                   u32 opaque_index, 
-                                   i32 advance,
-                                   u8 action,
-                                   u32 metadata,
-                                   int is_add);
-
-int vnet_classify_add_del_table (vnet_classify_main_t * cm,
-                                 u8 * mask, 
-                                 u32 nbuckets,
-                                 u32 memory_size,
-                                 u32 skip,
-                                 u32 match,
-                                 u32 next_table_index,
-                                 u32 miss_next_index,
-                                 u32 * table_index,
-                                 u8 current_data_flag,
-                                 i16 current_data_offset,
-                                 int is_add,
-				 int del_chain);
-
-unformat_function_t unformat_ip4_mask;
-unformat_function_t unformat_ip6_mask;
-unformat_function_t unformat_l3_mask;
-unformat_function_t unformat_l2_mask;
-unformat_function_t unformat_classify_mask;
-unformat_function_t unformat_l2_next_index;
-unformat_function_t unformat_ip_next_index;
-unformat_function_t unformat_ip4_match;
-unformat_function_t unformat_ip6_match;
-unformat_function_t unformat_l3_match;
-unformat_function_t unformat_vlan_tag;
-unformat_function_t unformat_l2_match;
-unformat_function_t unformat_classify_match;
-
-void vnet_classify_register_unformat_ip_next_index_fn 
-(unformat_function_t * fn);
-
-void vnet_classify_register_unformat_l2_next_index_fn 
-(unformat_function_t * fn);
-
-void vnet_classify_register_unformat_acl_next_index_fn 
-(unformat_function_t * fn);
-
-void  vnet_classify_register_unformat_policer_next_index_fn
-(unformat_function_t * fn);
-
-void vnet_classify_register_unformat_opaque_index_fn (unformat_function_t * fn);
-
-#endif /* __included_vnet_classify_h__ */
diff --git a/vnet/vnet/config.c b/vnet/vnet/config.c
deleted file mode 100644
index 03189d77..00000000
--- a/vnet/vnet/config.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * config.c: feature configuration
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-
-static vnet_config_feature_t *
-duplicate_feature_vector (vnet_config_feature_t * feature_vector)
-{
-  vnet_config_feature_t *result, *f;
-
-  result = vec_dup (feature_vector);
-  vec_foreach (f, result) f->feature_config = vec_dup (f->feature_config);
-
-  return result;
-}
-
-static void
-free_feature_vector (vnet_config_feature_t * feature_vector)
-{
-  vnet_config_feature_t *f;
-
-  vec_foreach (f, feature_vector) vnet_config_feature_free (f);
-  vec_free (feature_vector);
-}
-
-static u32
-add_next (vlib_main_t * vm,
-	  vnet_config_main_t * cm, u32 last_node_index, u32 this_node_index)
-{
-  u32 i, ni = ~0;
-
-  if (last_node_index != ~0)
-    return vlib_node_add_next (vm, last_node_index, this_node_index);
-
-  for (i = 0; i < vec_len (cm->start_node_indices); i++)
-    {
-      u32 tmp;
-      tmp =
-	vlib_node_add_next (vm, cm->start_node_indices[i], this_node_index);
-      if (ni == ~0)
-	ni = tmp;
-      /* Start nodes to first must agree on next indices. */
-      ASSERT (ni == tmp);
-    }
-
-  return ni;
-}
-
-static vnet_config_t *
-find_config_with_features (vlib_main_t * vm,
-			   vnet_config_main_t * cm,
-			   vnet_config_feature_t * feature_vector)
-{
-  u32 last_node_index = ~0;
-  vnet_config_feature_t *f;
-  u32 *config_string;
-  uword *p;
-  vnet_config_t *c;
-
-  config_string = cm->config_string_temp;
-  cm->config_string_temp = 0;
-  if (config_string)
-    _vec_len (config_string) = 0;
-
-  vec_foreach (f, feature_vector)
-  {
-    /* Connect node graph. */
-    f->next_index = add_next (vm, cm, last_node_index, f->node_index);
-    last_node_index = f->node_index;
-
-    /* Store next index in config string. */
-    vec_add1 (config_string, f->next_index);
-
-    /* Store feature config. */
-    vec_add (config_string, f->feature_config, vec_len (f->feature_config));
-  }
-
-  /* Terminate config string with next for end node. */
-  if (last_node_index == ~0 || last_node_index != cm->end_node_index)
-    {
-      u32 next_index = add_next (vm, cm, last_node_index, cm->end_node_index);
-      vec_add1 (config_string, next_index);
-    }
-
-  /* See if config string is unique. */
-  p = hash_get_mem (cm->config_string_hash, config_string);
-  if (p)
-    {
-      /* Not unique.  Share existing config. */
-      cm->config_string_temp = config_string;	/* we'll use it again later. */
-      free_feature_vector (feature_vector);
-      c = pool_elt_at_index (cm->config_pool, p[0]);
-    }
-  else
-    {
-      u32 *d;
-
-      pool_get (cm->config_pool, c);
-      c->index = c - cm->config_pool;
-      c->features = feature_vector;
-      c->config_string_vector = config_string;
-
-      /* Allocate copy of config string in heap.
-         VLIB buffers will maintain pointers to heap as they read out
-         configuration data. */
-      c->config_string_heap_index
-	= heap_alloc (cm->config_string_heap, vec_len (config_string) + 1,
-		      c->config_string_heap_handle);
-
-      /* First element in heap points back to pool index. */
-      d =
-	vec_elt_at_index (cm->config_string_heap,
-			  c->config_string_heap_index);
-      d[0] = c->index;
-      clib_memcpy (d + 1, config_string, vec_bytes (config_string));
-      hash_set_mem (cm->config_string_hash, config_string, c->index);
-
-      c->reference_count = 0;	/* will be incremented by caller. */
-    }
-
-  return c;
-}
-
-void
-vnet_config_init (vlib_main_t * vm,
-		  vnet_config_main_t * cm,
-		  char *start_node_names[],
-		  int n_start_node_names,
-		  char *feature_node_names[], int n_feature_node_names)
-{
-  vlib_node_t *n;
-  u32 i;
-
-  memset (cm, 0, sizeof (cm[0]));
-
-  cm->config_string_hash =
-    hash_create_vec (0,
-		     STRUCT_SIZE_OF (vnet_config_t, config_string_vector[0]),
-		     sizeof (uword));
-
-  ASSERT (n_feature_node_names >= 1);
-
-  vec_resize (cm->start_node_indices, n_start_node_names);
-  for (i = 0; i < n_start_node_names; i++)
-    {
-      n = vlib_get_node_by_name (vm, (u8 *) start_node_names[i]);
-      /* Given node name must exist. */
-      ASSERT (n != 0);
-      cm->start_node_indices[i] = n->index;
-    }
-
-  vec_resize (cm->node_index_by_feature_index, n_feature_node_names);
-  for (i = 0; i < n_feature_node_names; i++)
-    {
-      if (!feature_node_names[i])
-	cm->node_index_by_feature_index[i] = ~0;
-      else
-	{
-	  n = vlib_get_node_by_name (vm, (u8 *) feature_node_names[i]);
-	  /* Given node may exist in plug-in library which is not present */
-	  if (n)
-	    {
-	      if (i + 1 == n_feature_node_names)
-		cm->end_node_index = n->index;
-	      cm->node_index_by_feature_index[i] = n->index;
-	    }
-	  else
-	    cm->node_index_by_feature_index[i] = ~0;
-	}
-    }
-}
-
-static void
-remove_reference (vnet_config_main_t * cm, vnet_config_t * c)
-{
-  ASSERT (c->reference_count > 0);
-  c->reference_count -= 1;
-  if (c->reference_count == 0)
-    {
-      hash_unset (cm->config_string_hash, c->config_string_vector);
-      vnet_config_free (cm, c);
-      pool_put (cm->config_pool, c);
-    }
-}
-
-static int
-feature_cmp (void *a1, void *a2)
-{
-  vnet_config_feature_t *f1 = a1;
-  vnet_config_feature_t *f2 = a2;
-
-  return (int) f1->feature_index - f2->feature_index;
-}
-
-always_inline u32 *
-vnet_get_config_heap (vnet_config_main_t * cm, u32 ci)
-{
-  return heap_elt_at_index (cm->config_string_heap, ci);
-}
-
-u32
-vnet_config_add_feature (vlib_main_t * vm,
-			 vnet_config_main_t * cm,
-			 u32 config_string_heap_index,
-			 u32 feature_index,
-			 void *feature_config, u32 n_feature_config_bytes)
-{
-  vnet_config_t *old, *new;
-  vnet_config_feature_t *new_features, *f;
-  u32 n_feature_config_u32s;
-  u32 node_index = vec_elt (cm->node_index_by_feature_index, feature_index);
-
-  if (node_index == ~0)		// feature node does not exist
-    return config_string_heap_index;	// return original config index
-
-  if (config_string_heap_index == ~0)
-    {
-      old = 0;
-      new_features = 0;
-    }
-  else
-    {
-      u32 *p = vnet_get_config_heap (cm, config_string_heap_index);
-      old = pool_elt_at_index (cm->config_pool, p[-1]);
-      new_features = old->features;
-      if (new_features)
-	new_features = duplicate_feature_vector (new_features);
-    }
-
-  vec_add2 (new_features, f, 1);
-  f->feature_index = feature_index;
-  f->node_index = node_index;
-
-  n_feature_config_u32s =
-    round_pow2 (n_feature_config_bytes,
-		sizeof (f->feature_config[0])) /
-    sizeof (f->feature_config[0]);
-  vec_add (f->feature_config, feature_config, n_feature_config_u32s);
-
-  /* Sort (prioritize) features. */
-  if (vec_len (new_features) > 1)
-    vec_sort_with_function (new_features, feature_cmp);
-
-  if (old)
-    remove_reference (cm, old);
-
-  new = find_config_with_features (vm, cm, new_features);
-  new->reference_count += 1;
-
-  /*
-   * User gets pointer to config string first element
-   * (which defines the pool index
-   * this config string comes from).
-   */
-  vec_validate (cm->config_pool_index_by_user_index,
-		new->config_string_heap_index + 1);
-  cm->config_pool_index_by_user_index[new->config_string_heap_index + 1]
-    = new - cm->config_pool;
-  return new->config_string_heap_index + 1;
-}
-
-u32
-vnet_config_del_feature (vlib_main_t * vm,
-			 vnet_config_main_t * cm,
-			 u32 config_string_heap_index,
-			 u32 feature_index,
-			 void *feature_config, u32 n_feature_config_bytes)
-{
-  vnet_config_t *old, *new;
-  vnet_config_feature_t *new_features, *f;
-  u32 n_feature_config_u32s;
-
-  {
-    u32 *p = vnet_get_config_heap (cm, config_string_heap_index);
-
-    old = pool_elt_at_index (cm->config_pool, p[-1]);
-  }
-
-  n_feature_config_u32s =
-    round_pow2 (n_feature_config_bytes,
-		sizeof (f->feature_config[0])) /
-    sizeof (f->feature_config[0]);
-
-  /* Find feature with same index and opaque data. */
-  vec_foreach (f, old->features)
-  {
-    if (f->feature_index == feature_index
-	&& vec_len (f->feature_config) == n_feature_config_u32s
-	&& (n_feature_config_u32s == 0
-	    || !memcmp (f->feature_config, feature_config,
-			n_feature_config_bytes)))
-      break;
-  }
-
-  /* Feature not found. */
-  if (f >= vec_end (old->features))
-    return config_string_heap_index;	// return original config index
-
-  new_features = duplicate_feature_vector (old->features);
-  f = new_features + (f - old->features);
-  vnet_config_feature_free (f);
-  vec_delete (new_features, 1, f - new_features);
-
-  /* must remove old from config_pool now as it may be expanded and change
-     memory location if the following function find_config_with_features()
-     adds a new config because none of existing config's has matching features
-     and so can be reused */
-  remove_reference (cm, old);
-  new = find_config_with_features (vm, cm, new_features);
-  new->reference_count += 1;
-
-  vec_validate (cm->config_pool_index_by_user_index,
-		new->config_string_heap_index + 1);
-  cm->config_pool_index_by_user_index[new->config_string_heap_index + 1]
-    = new - cm->config_pool;
-  return new->config_string_heap_index + 1;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/config.h b/vnet/vnet/config.h
deleted file mode 100644
index b77a7794..00000000
--- a/vnet/vnet/config.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * config.h: feature configuration
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vnet_config_h
-#define included_vnet_config_h
-
-#include <vlib/vlib.h>
-#include <vppinfra/heap.h>
-
-typedef struct
-{
-  /* Features are prioritized by index.  Smaller indices get
-     performed first. */
-  u32 feature_index;
-
-  /* VLIB node which performs feature. */
-  u32 node_index;
-
-  /* Next index relative to previous node or main node. */
-  u32 next_index;
-
-  /* Opaque per feature configuration data. */
-  u32 *feature_config;
-} vnet_config_feature_t;
-
-always_inline void
-vnet_config_feature_free (vnet_config_feature_t * f)
-{
-  vec_free (f->feature_config);
-}
-
-typedef struct
-{
-  /* Sorted vector of features for this configuration. */
-  vnet_config_feature_t *features;
-
-  /* Config string as vector for hashing. */
-  u32 *config_string_vector;
-
-  /* Config string including all next indices and feature data as a vector. */
-  u32 config_string_heap_index, config_string_heap_handle;
-
-  /* Index in main pool. */
-  u32 index;
-
-  /* Number of interfaces/traffic classes that reference this config. */
-  u32 reference_count;
-} vnet_config_t;
-
-typedef struct
-{
-  /* Pool of configs.  Index 0 is always null config and is never deleted. */
-  vnet_config_t *config_pool;
-
-  /* Hash table mapping vector config string to config pool index. */
-  uword *config_string_hash;
-
-  /* Global heap of configuration data. */
-  u32 *config_string_heap;
-
-  /* Node index which starts/ends feature processing. */
-  u32 *start_node_indices, end_node_index;
-
-  /* Interior feature processing nodes (not including start and end nodes). */
-  u32 *node_index_by_feature_index;
-
-  /* vnet_config pool index by user index */
-  u32 *config_pool_index_by_user_index;
-
-  /* Temporary vector for holding config strings.  Used to avoid continually
-     allocating vectors. */
-  u32 *config_string_temp;
-} vnet_config_main_t;
-
-always_inline void
-vnet_config_free (vnet_config_main_t * cm, vnet_config_t * c)
-{
-  vnet_config_feature_t *f;
-  vec_foreach (f, c->features) vnet_config_feature_free (f);
-  vec_free (c->features);
-  heap_dealloc (cm->config_string_heap, c->config_string_heap_handle);
-  vec_free (c->config_string_vector);
-}
-
-always_inline void *
-vnet_get_config_data (vnet_config_main_t * cm,
-		      u32 * config_index, u32 * next_index, u32 n_data_bytes)
-{
-  u32 i, n, *d;
-
-  i = *config_index;
-
-  d = heap_elt_at_index (cm->config_string_heap, i);
-
-  n = round_pow2 (n_data_bytes, sizeof (d[0])) / sizeof (d[0]);
-
-  /* Last 32 bits are next index. */
-  *next_index = d[n];
-
-  /* Advance config index to next config. */
-  *config_index = (i + n + 1);
-
-  /* Return config data to user for this feature. */
-  return (void *) d;
-}
-
-void vnet_config_init (vlib_main_t * vm,
-		       vnet_config_main_t * cm,
-		       char *start_node_names[],
-		       int n_start_node_names,
-		       char *feature_node_names[], int n_feature_node_names);
-
-/* Calls to add/delete features from configurations. */
-u32 vnet_config_add_feature (vlib_main_t * vm,
-			     vnet_config_main_t * cm,
-			     u32 config_id,
-			     u32 feature_index,
-			     void *feature_config,
-			     u32 n_feature_config_bytes);
-
-u32 vnet_config_del_feature (vlib_main_t * vm,
-			     vnet_config_main_t * cm,
-			     u32 config_id,
-			     u32 feature_index,
-			     void *feature_config,
-			     u32 n_feature_config_bytes);
-
-u8 *vnet_config_format_features (vlib_main_t * vm,
-				 vnet_config_main_t * cm,
-				 u32 config_index, u8 * s);
-
-#endif /* included_vnet_config_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/cop/cop.c b/vnet/vnet/cop/cop.c
deleted file mode 100644
index 465d6c97..00000000
--- a/vnet/vnet/cop/cop.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/cop/cop.h>
-
-cop_main_t cop_main;
-
-static clib_error_t *
-cop_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
-{
-  cop_main_t * cm = &cop_main;
-  cop_config_data_t _data, *data = &_data;
-  vlib_main_t * vm = cm->vlib_main;
-  vnet_hw_interface_t * hi = vnet_get_sup_hw_interface (vnm, sw_if_index);;
-  cop_config_main_t * ccm;
-  int address_family;
-  u32 ci, default_next;
-
-  memset (data, 0, sizeof(*data));
-
-  /* 
-   * Ignore local interface, pg interfaces. $$$ need a #define for the
-   * first "real" interface. The answer is 5 at the moment.
-   */
-  if (hi->dev_class_index == vnet_local_interface_device_class.index)
-    return 0;
-
-   for (address_family = VNET_COP_IP4; address_family < VNET_N_COPS;
-       address_family++)
-    {
-      ccm = &cm->cop_config_mains[address_family];
-
-      /* 
-       * Once-only code to initialize the per-address-family
-       * cop feature subgraphs.
-       * Since the (single) start-node, cop-input, must be able
-       * to push pkts into three separate subgraphs, we
-       * use a unified cop_feature_type_t enumeration.
-       */
-
-      if (!(ccm->config_main.node_index_by_feature_index))
-        {
-          switch (address_family)
-            {
-            case VNET_COP_IP4:
-              {
-                static char * start_nodes[] = { "cop-input" };
-                static char * feature_nodes[] = {
-                  [IP4_RX_COP_WHITELIST] = "ip4-cop-whitelist",
-                  [IP4_RX_COP_INPUT] = "ip4-input",
-                };
-                
-                vnet_config_init (vm, &ccm->config_main, 
-                                  start_nodes, ARRAY_LEN(start_nodes),
-                                  feature_nodes, ARRAY_LEN(feature_nodes));
-              }
-              break;
-            case VNET_COP_IP6:
-              {
-                static char * start_nodes[] = { "cop-input" };
-                static char * feature_nodes[] = {
-                  [IP6_RX_COP_WHITELIST] = "ip6-cop-whitelist",
-                  [IP6_RX_COP_INPUT] = "ip6-input",
-                };
-                vnet_config_init (vm, &ccm->config_main, 
-                                  start_nodes, ARRAY_LEN(start_nodes),
-                                  feature_nodes, ARRAY_LEN(feature_nodes));
-              }
-              break;
-
-            case VNET_COP_DEFAULT:
-              {
-                static char * start_nodes[] = { "cop-input" };
-                static char * feature_nodes[] = {
-                  [DEFAULT_RX_COP_WHITELIST] = "default-cop-whitelist",
-                  [DEFAULT_RX_COP_INPUT] = "ethernet-input",
-                };
-                vnet_config_init (vm, &ccm->config_main, 
-                                  start_nodes, ARRAY_LEN(start_nodes),
-                                  feature_nodes, ARRAY_LEN(feature_nodes));
-              }
-              break;
-
-            default:
-              clib_warning ("bug");
-              break;
-            }
-        }
-      vec_validate_init_empty (ccm->config_index_by_sw_if_index, sw_if_index,
-                               ~0);
-
-      ci = ccm->config_index_by_sw_if_index[sw_if_index];
-
-      /* Create a sensible initial config: send pkts to xxx-input */
-      if (address_family == VNET_COP_IP4)
-        default_next = IP4_RX_COP_INPUT;
-      else if (address_family == VNET_COP_IP6)
-        default_next = IP6_RX_COP_INPUT;
-      else
-        default_next = DEFAULT_RX_COP_INPUT;
-        
-      if (is_add)
-        ci = vnet_config_add_feature (vm, &ccm->config_main,
-                                      ci, 
-                                      default_next,
-                                      data, sizeof(*data));
-      else
-        ci = vnet_config_del_feature (vm, &ccm->config_main,
-                                      ci, 
-                                      default_next,
-                                      data, sizeof(*data));
-
-      ccm->config_index_by_sw_if_index[sw_if_index] = ci;
-    }
-  return 0;
-}
-
-VNET_SW_INTERFACE_ADD_DEL_FUNCTION (cop_sw_interface_add_del);
-
-static clib_error_t *
-cop_init (vlib_main_t *vm)
-{
-  cop_main_t * cm = &cop_main;
-  clib_error_t * error;
-
-  if ((error = vlib_call_init_function (vm, ip4_whitelist_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip6_whitelist_init)))
-    return error;
-
-  cm->vlib_main = vm;
-  cm->vnet_main = vnet_get_main();
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (cop_init);
-
-int cop_interface_enable_disable (u32 sw_if_index, int enable_disable)
-{
-  cop_main_t * cm = &cop_main;
-  vnet_sw_interface_t * sw;
-  int rv;
-  u32 node_index = enable_disable ? cop_input_node.index : ~0;
-
-  /* Not a physical port? */
-  sw = vnet_get_sw_interface (cm->vnet_main, sw_if_index);
-  if (sw->type != VNET_SW_INTERFACE_TYPE_HARDWARE)
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-  
-  /* 
-   * Redirect pkts from the driver to the cop node.
-   * Returns VNET_API_ERROR_UNIMPLEMENTED if the h/w driver
-   * doesn't implement the API. 
-   *
-   * Node_index = ~0 => shut off redirection
-   */
-  rv = vnet_hw_interface_rx_redirect_to_node (cm->vnet_main, sw_if_index,
-                                              node_index);
-  return rv;
-}
-
-static clib_error_t *
-cop_enable_disable_command_fn (vlib_main_t * vm,
-                                unformat_input_t * input,
-                                vlib_cli_command_t * cmd)
-{
-  cop_main_t * cm = &cop_main;
-  u32 sw_if_index = ~0;
-  int enable_disable = 1;
-    
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "disable"))
-      enable_disable = 0;
-    else if (unformat (input, "%U", unformat_vnet_sw_interface,
-                       cm->vnet_main, &sw_if_index))
-      ;
-    else
-      break;
-  }
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "Please specify an interface...");
-    
-  rv = cop_interface_enable_disable (sw_if_index, enable_disable);
-
-  switch(rv) {
-  case 0:
-    break;
-
-  case VNET_API_ERROR_INVALID_SW_IF_INDEX:
-    return clib_error_return 
-      (0, "Invalid interface, only works on physical ports");
-    break;
-
-  case VNET_API_ERROR_UNIMPLEMENTED:
-    return clib_error_return (0, "Device driver doesn't support redirection");
-    break;
-
-  default:
-    return clib_error_return (0, "cop_interface_enable_disable returned %d",
-                              rv);
-  }
-  return 0;
-}
-
-VLIB_CLI_COMMAND (cop_interface_command, static) = {
-    .path = "cop interface",
-    .short_help = 
-    "cop interface <interface-name> [disable]",
-    .function = cop_enable_disable_command_fn,
-};
-
-
-int cop_whitelist_enable_disable (cop_whitelist_enable_disable_args_t *a)
-{
-  cop_main_t * cm = &cop_main;
-  vlib_main_t * vm = cm->vlib_main;
-  ip4_main_t * im4 = &ip4_main;
-  ip6_main_t * im6 = &ip6_main;
-  int address_family;
-  int is_add;
-  cop_config_main_t * ccm;
-  u32 next_to_add_del = 0;
-  uword * p;
-  u32 fib_index = 0;
-  u32 ci;
-  cop_config_data_t _data, *data=&_data;
-
-  /*
-   * Enable / disable whitelist processing on the specified interface
-   */
-
-  for (address_family = VNET_COP_IP4; address_family < VNET_N_COPS;
-       address_family++) 
-    {
-      ccm = &cm->cop_config_mains[address_family];
-    
-      switch(address_family)
-        {
-        case VNET_COP_IP4:
-          is_add = (a->ip4 != 0);
-          next_to_add_del = IP4_RX_COP_WHITELIST;
-          /* configured opaque data must match, or no supper */
-          p = hash_get (im4->fib_index_by_table_id, a->fib_id);
-          if (p)
-            fib_index = p[0];
-          else
-            {
-              if (is_add)
-                return VNET_API_ERROR_NO_SUCH_FIB;
-              else
-                continue;
-            }
-          break;
-              
-        case VNET_COP_IP6:
-          is_add = (a->ip6 != 0);
-          next_to_add_del = IP6_RX_COP_WHITELIST;
-          p = hash_get (im6->fib_index_by_table_id, a->fib_id);
-          if (p)
-            fib_index = p[0];
-          else
-            {
-              if (is_add)
-                return VNET_API_ERROR_NO_SUCH_FIB;
-              else
-                continue;
-            }
-          break;
-
-        case VNET_COP_DEFAULT:
-          is_add = (a->default_cop != 0);
-          next_to_add_del = DEFAULT_RX_COP_WHITELIST;
-          break;
-        
-        default:
-          clib_warning ("BUG");
-        }
-
-      ci = ccm->config_index_by_sw_if_index[a->sw_if_index];
-      data->fib_index = fib_index;
-
-      if (is_add)
-	ci = vnet_config_add_feature (vm, &ccm->config_main,
-				      ci,
-                                      next_to_add_del,
-                                      data, sizeof (*data));
-      else
-	ci = vnet_config_del_feature (vm, &ccm->config_main,
-				      ci,
-                                      next_to_add_del,
-                                      data, sizeof (*data));
-
-      ccm->config_index_by_sw_if_index[a->sw_if_index] = ci;
-    }
-  return 0;
-}
-
-static clib_error_t *
-cop_whitelist_enable_disable_command_fn (vlib_main_t * vm,
-                                         unformat_input_t * input,
-                                         vlib_cli_command_t * cmd)
-{
-  cop_main_t * cm = &cop_main;
-  u32 sw_if_index = ~0;
-  u8 ip4 = 0;
-  u8 ip6 = 0;
-  u8 default_cop = 0;
-  u32 fib_id = 0;
-  int rv;
-  cop_whitelist_enable_disable_args_t _a, * a = &_a;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "ip4"))
-      ip4 = 1;
-    else if (unformat (input, "ip6"))
-      ip6 = 1;
-    else if (unformat (input, "default"))
-      default_cop = 1;
-    else if (unformat (input, "%U", unformat_vnet_sw_interface,
-                       cm->vnet_main, &sw_if_index))
-      ;
-    else if (unformat (input, "fib-id %d", &fib_id))
-      ;
-    else
-      break;
-  }
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "Please specify an interface...");
-    
-  a->sw_if_index = sw_if_index;
-  a->ip4 = ip4;
-  a->ip6 = ip6;
-  a->default_cop = default_cop;
-  a->fib_id = fib_id;
-
-  rv = cop_whitelist_enable_disable (a);
-
-  switch(rv) {
-  case 0:
-    break;
-
-  case VNET_API_ERROR_INVALID_SW_IF_INDEX:
-    return clib_error_return 
-      (0, "Invalid interface, only works on physical ports");
-    break;
-
-  case VNET_API_ERROR_NO_SUCH_FIB:
-    return clib_error_return 
-      (0, "Invalid fib");
-    break;
-
-  case VNET_API_ERROR_UNIMPLEMENTED:
-    return clib_error_return (0, "Device driver doesn't support redirection");
-    break;
-
-  default:
-    return clib_error_return (0, "cop_whitelist_enable_disable returned %d",
-                              rv);
-  }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (cop_whitelist_command, static) = {
-    .path = "cop whitelist",
-    .short_help = 
-    "cop whitelist <interface-name> [ip4][ip6][default][fib-id <NN>][disable]",
-    .function = cop_whitelist_enable_disable_command_fn,
-};
-
diff --git a/vnet/vnet/cop/cop.h b/vnet/vnet/cop/cop.h
deleted file mode 100644
index eb5f1dfd..00000000
--- a/vnet/vnet/cop/cop.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __vnet_cop_h__
-#define __vnet_cop_h__
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-
-typedef enum {
-  VNET_COP_IP4,
-  VNET_COP_IP6,
-  VNET_COP_DEFAULT,
-  VNET_N_COPS,
-} vnet_cop_t;
-
-typedef enum {
-  /* First check src address against whitelist */
-  IP4_RX_COP_WHITELIST,
-  IP6_RX_COP_WHITELIST,
-  DEFAULT_RX_COP_WHITELIST,
-
-  /* Pkts not otherwise dropped go to xxx-input */
-  IP4_RX_COP_INPUT,
-  IP6_RX_COP_INPUT,
-  DEFAULT_RX_COP_INPUT,
-
-  /* Going, going, gone... */
-  RX_COP_DROP,
-
-  COP_RX_N_FEATURES,
-} cop_feature_type_t;
-
-typedef struct {
-  vnet_config_main_t config_main;
-  u32 * config_index_by_sw_if_index;
-} cop_config_main_t;
-
-typedef struct {
-  u32 fib_index;
-} cop_config_data_t;
-
-typedef struct {
-  cop_config_main_t cop_config_mains[VNET_N_COPS];
-
-  /* convenience */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-} cop_main_t;
-
-cop_main_t cop_main;
-
-extern vlib_node_registration_t cop_input_node;
-
-int cop_interface_enable_disable (u32 sw_if_index, int enable_disable);
-
-typedef struct {
-  u32 sw_if_index;
-  u8 ip4;
-  u8 ip6;
-  u8 default_cop;
-  u32 fib_id;
-} cop_whitelist_enable_disable_args_t;
-
-int cop_whitelist_enable_disable (cop_whitelist_enable_disable_args_t *a);
-
-#endif /* __vnet_cop_h__ */
diff --git a/vnet/vnet/cop/ip4_whitelist.c b/vnet/vnet/cop/ip4_whitelist.c
deleted file mode 100644
index d5121e72..00000000
--- a/vnet/vnet/cop/ip4_whitelist.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/cop/cop.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/dpo/load_balance.h>
-
-typedef struct {
-  u32 next_index;
-  u32 sw_if_index;
-} ip4_cop_whitelist_trace_t;
-
-/* packet trace format function */
-static u8 * format_ip4_cop_whitelist_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip4_cop_whitelist_trace_t * t = va_arg (*args, ip4_cop_whitelist_trace_t *);
-  
-  s = format (s, "IP4_COP_WHITELIST: sw_if_index %d, next index %d",
-              t->sw_if_index, t->next_index);
-  return s;
-}
-
-vlib_node_registration_t ip4_cop_whitelist_node;
-
-#define foreach_ip4_cop_whitelist_error                         \
-_(DROPPED, "ip4 cop whitelist packets dropped")
-
-typedef enum {
-#define _(sym,str) IP4_COP_WHITELIST_ERROR_##sym,
-  foreach_ip4_cop_whitelist_error
-#undef _
-  IP4_COP_WHITELIST_N_ERROR,
-} ip4_cop_whitelist_error_t;
-
-static char * ip4_cop_whitelist_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ip4_cop_whitelist_error
-#undef _
-};
-
-static uword
-ip4_cop_whitelist_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * frame)
-{
-  u32 n_left_from, * from, * to_next;
-  cop_feature_type_t next_index;
-  cop_main_t *cm = &cop_main;
-  vlib_combined_counter_main_t * vcm = &load_balance_main.lbm_via_counters;
-  u32 cpu_index = vm->cpu_index;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-      	{
-          u32 bi0, bi1;
-          vlib_buffer_t * b0, * b1;
-          u32 next0, next1;
-          u32 sw_if_index0, sw_if_index1;
-          ip4_header_t * ip0, * ip1;
-          cop_config_main_t * ccm0, * ccm1;
-          cop_config_data_t * c0, * c1;
-      	  ip4_fib_mtrie_t * mtrie0, * mtrie1;
-      	  ip4_fib_mtrie_leaf_t leaf0, leaf1;
-          u32 lb_index0, lb_index1;
-          const load_balance_t * lb0, *lb1;
-          const dpo_id_t *dpo0, *dpo1;
-
-      	  /* Prefetch next iteration. */
-      	  {
-      	    vlib_buffer_t * p2, * p3;
-            
-      	    p2 = vlib_get_buffer (vm, from[2]);
-      	    p3 = vlib_get_buffer (vm, from[3]);
-            
-      	    vlib_prefetch_buffer_header (p2, LOAD);
-      	    vlib_prefetch_buffer_header (p3, LOAD);
-
-      	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-      	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-      	  }
-
-          /* speculatively enqueue b0 and b1 to the current next frame */
-      	  to_next[0] = bi0 = from[0];
-      	  to_next[1] = bi1 = from[1];
-      	  from += 2;
-      	  to_next += 2;
-      	  n_left_from -= 2;
-      	  n_left_to_next -= 2;
-
-      	  b0 = vlib_get_buffer (vm, bi0);
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-
-      	  ip0 = vlib_buffer_get_current (b0);
-
-      	  ccm0 = cm->cop_config_mains + VNET_COP_IP4;
-
-      	  c0 = vnet_get_config_data
-              (&ccm0->config_main,
-               &vnet_buffer (b0)->cop.current_config_index,
-               &next0,
-               sizeof (c0[0]));
-
-	  mtrie0 = &ip4_fib_get (c0->fib_index)->mtrie;
-
-      	  leaf0 = IP4_FIB_MTRIE_LEAF_ROOT;
-
-      	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0,
-                                             &ip0->src_address, 0);
-
-      	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0,
-                                             &ip0->src_address, 1);
-
-      	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0,
-                                             &ip0->src_address, 2);
-
-      	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0,
-                                             &ip0->src_address, 3);
-
-      	  lb_index0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
-
-	  ASSERT (lb_index0
-                  == ip4_fib_table_lookup_lb (ip4_fib_get(c0->fib_index),
-	  				       &ip0->src_address));
-	  lb0 = load_balance_get (lb_index0);
-          dpo0 = load_balance_get_bucket_i(lb0, 0);
-
-          if (PREDICT_FALSE(dpo0->dpoi_type != DPO_RECEIVE))
-            {
-              b0->error = node->errors[IP4_COP_WHITELIST_ERROR_DROPPED];
-              next0 = RX_COP_DROP;
-            }
-
-      	  b1 = vlib_get_buffer (vm, bi1);
-          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
-
-      	  ip1 = vlib_buffer_get_current (b1);
-
-      	  ccm1 = cm->cop_config_mains + VNET_COP_IP4;
-
-      	  c1 = vnet_get_config_data
-              (&ccm1->config_main,
-               &vnet_buffer (b1)->cop.current_config_index,
-               &next1,
-               sizeof (c1[0]));
-	  mtrie1 = &ip4_fib_get (c1->fib_index)->mtrie;
-
-      	  leaf1 = IP4_FIB_MTRIE_LEAF_ROOT;
-
-      	  leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1,
-                                             &ip1->src_address, 0);
-
-      	  leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1,
-                                             &ip1->src_address, 1);
-
-      	  leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1,
-                                             &ip1->src_address, 2);
-
-      	  leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1,
-                                             &ip1->src_address, 3);
-
-      	  lb_index1 = ip4_fib_mtrie_leaf_get_adj_index (leaf1);
-	  ASSERT (lb_index1
-                  == ip4_fib_table_lookup_lb (ip4_fib_get(c1->fib_index),
-	  				       &ip1->src_address));
-	  lb1 = load_balance_get (lb_index1);
-          dpo1 = load_balance_get_bucket_i(lb1, 0);
-
-          vlib_increment_combined_counter
-              (vcm, cpu_index, lb_index0, 1,
-               vlib_buffer_length_in_chain (vm, b0)
-               + sizeof(ethernet_header_t));
-
-          vlib_increment_combined_counter
-              (vcm, cpu_index, lb_index1, 1,
-               vlib_buffer_length_in_chain (vm, b1)
-               + sizeof(ethernet_header_t));
-
-
-          if (PREDICT_FALSE(dpo1->dpoi_type != DPO_RECEIVE))
-            {
-              b1->error = node->errors[IP4_COP_WHITELIST_ERROR_DROPPED];
-              next1 = RX_COP_DROP;
-            }
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-            {
-              ip4_cop_whitelist_trace_t *t =
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->sw_if_index = sw_if_index0;
-              t->next_index = next0;
-            }
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)
-                            && (b1->flags & VLIB_BUFFER_IS_TRACED)))
-            {
-              ip4_cop_whitelist_trace_t *t =
-                 vlib_add_trace (vm, node, b1, sizeof (*t));
-              t->sw_if_index = sw_if_index1;
-              t->next_index = next1;
-            }
-
-          /* verify speculative enqueues, maybe switch current next frame */
-          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-                                           to_next, n_left_to_next,
-                                           bi0, bi1, next0, next1);
-        }
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-          u32 bi0;
-	  vlib_buffer_t * b0;
-          u32 next0;
-          u32 sw_if_index0;
-          ip4_header_t * ip0;
-          cop_config_main_t *ccm0;
-          cop_config_data_t *c0;
-	  ip4_fib_mtrie_t * mtrie0;
-	  ip4_fib_mtrie_leaf_t leaf0;
-          u32 lb_index0;
-          const load_balance_t * lb0;
-          const dpo_id_t *dpo0;
-
-          /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-
-	  ip0 = vlib_buffer_get_current (b0);
-
-	  ccm0 = cm->cop_config_mains + VNET_COP_IP4;
-
-	  c0 = vnet_get_config_data 
-              (&ccm0->config_main,
-               &vnet_buffer (b0)->cop.current_config_index,
-               &next0,
-               sizeof (c0[0]));
-
-	  mtrie0 = &ip4_fib_get (c0->fib_index)->mtrie;
-
-	  leaf0 = IP4_FIB_MTRIE_LEAF_ROOT;
-
-	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, 
-                                             &ip0->src_address, 0);
-
-	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, 
-                                             &ip0->src_address, 1);
-
-	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, 
-                                             &ip0->src_address, 2);
-
-	  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, 
-                                             &ip0->src_address, 3);
-
-	  lb_index0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
-
-	  ASSERT (lb_index0 
-                  == ip4_fib_table_lookup_lb (ip4_fib_get(c0->fib_index),
-					      &ip0->src_address));
-
-	  lb0 = load_balance_get (lb_index0);
-          dpo0 = load_balance_get_bucket_i(lb0, 0);
-
-          vlib_increment_combined_counter 
-              (vcm, cpu_index, lb_index0, 1,
-               vlib_buffer_length_in_chain (vm, b0) 
-               + sizeof(ethernet_header_t));
-
-          if (PREDICT_FALSE(dpo0->dpoi_type != DPO_RECEIVE))
-            {
-              b0->error = node->errors[IP4_COP_WHITELIST_ERROR_DROPPED];
-              next0 = RX_COP_DROP;
-            }
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              ip4_cop_whitelist_trace_t *t = 
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->sw_if_index = sw_if_index0;
-              t->next_index = next0;
-            }
-            
-          /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (ip4_cop_whitelist_node) = {
-  .function = ip4_cop_whitelist_node_fn,
-  .name = "ip4-cop-whitelist",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip4_cop_whitelist_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_errors = ARRAY_LEN(ip4_cop_whitelist_error_strings),
-  .error_strings = ip4_cop_whitelist_error_strings,
-
-  .n_next_nodes = COP_RX_N_FEATURES,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [IP4_RX_COP_WHITELIST] = "ip4-cop-whitelist",
-    [IP6_RX_COP_WHITELIST] = "ip6-cop-whitelist",
-    [DEFAULT_RX_COP_WHITELIST] = "default-cop-whitelist",
-    [IP4_RX_COP_INPUT] = "ip4-input",
-    [IP6_RX_COP_INPUT] = "ip6-input",
-    [DEFAULT_RX_COP_INPUT] = "ethernet-input",
-    [RX_COP_DROP] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_cop_whitelist_node, ip4_cop_whitelist_node_fn)
-
-static clib_error_t *
-ip4_whitelist_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ip4_whitelist_init);
diff --git a/vnet/vnet/cop/ip6_whitelist.c b/vnet/vnet/cop/ip6_whitelist.c
deleted file mode 100644
index c2e16ccf..00000000
--- a/vnet/vnet/cop/ip6_whitelist.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/cop/cop.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/dpo/load_balance.h>
-
-typedef struct {
-  u32 next_index;
-  u32 sw_if_index;
-} ip6_cop_whitelist_trace_t;
-
-/* packet trace format function */
-static u8 * format_ip6_cop_whitelist_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip6_cop_whitelist_trace_t * t = va_arg (*args, ip6_cop_whitelist_trace_t *);
-  
-  s = format (s, "IP6_COP_WHITELIST: sw_if_index %d, next index %d",
-              t->sw_if_index, t->next_index);
-  return s;
-}
-
-vlib_node_registration_t ip6_cop_whitelist_node;
-
-#define foreach_ip6_cop_whitelist_error                         \
-_(DROPPED, "ip6 cop whitelist packets dropped")
-
-typedef enum {
-#define _(sym,str) IP6_COP_WHITELIST_ERROR_##sym,
-  foreach_ip6_cop_whitelist_error
-#undef _
-  IP6_COP_WHITELIST_N_ERROR,
-} ip6_cop_whitelist_error_t;
-
-static char * ip6_cop_whitelist_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ip6_cop_whitelist_error
-#undef _
-};
-
-static uword
-ip6_cop_whitelist_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * frame)
-{
-  u32 n_left_from, * from, * to_next;
-  cop_feature_type_t next_index;
-  cop_main_t *cm = &cop_main;
-  ip6_main_t * im6 = &ip6_main;
-  vlib_combined_counter_main_t * vcm = &load_balance_main.lbm_via_counters;
-  u32 cpu_index = vm->cpu_index;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-          u32 bi0, bi1;
-          vlib_buffer_t * b0, * b1;
-          u32 next0, next1;
-          u32 sw_if_index0, sw_if_index1;
-          ip6_header_t * ip0, * ip1;
-          cop_config_main_t * ccm0, * ccm1;
-          cop_config_data_t * c0, * c1;
-          u32 lb_index0, lb_index1;
-          const load_balance_t * lb0, *lb1;
-          const dpo_id_t *dpo0, *dpo1;
-         
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * p2, * p3;
-            
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-            
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-          /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-
-	  ip0 = vlib_buffer_get_current (b0);
-
-	  ccm0 = cm->cop_config_mains + VNET_COP_IP6;
-
-	  c0 = vnet_get_config_data 
-              (&ccm0->config_main,
-               &vnet_buffer (b0)->cop.current_config_index,
-               &next0,
-               sizeof (c0[0]));
-
-          lb_index0 = ip6_fib_table_fwding_lookup (im6, c0->fib_index, 
-						    &ip0->src_address);
-	  lb0 = load_balance_get (lb_index0);
-          dpo0 = load_balance_get_bucket_i(lb0, 0);
-
-          if (PREDICT_FALSE(dpo0->dpoi_type != DPO_RECEIVE))
-            {
-              b0->error = node->errors[IP6_COP_WHITELIST_ERROR_DROPPED];
-              next0 = RX_COP_DROP;
-            }
-
-	  b1 = vlib_get_buffer (vm, bi1);
-          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
-
-	  ip1 = vlib_buffer_get_current (b1);
-
-	  ccm1 = cm->cop_config_mains + VNET_COP_IP6;
-
-	  c1 = vnet_get_config_data 
-              (&ccm1->config_main,
-               &vnet_buffer (b1)->cop.current_config_index,
-               &next1,
-               sizeof (c1[0]));
-
-          lb_index1 = ip6_fib_table_fwding_lookup (im6, c1->fib_index, 
-						    &ip1->src_address);
-
-	  lb1 = load_balance_get (lb_index1);
-          dpo1 = load_balance_get_bucket_i(lb1, 0);
-
-          vlib_increment_combined_counter 
-              (vcm, cpu_index, lb_index0, 1,
-               vlib_buffer_length_in_chain (vm, b0) 
-               + sizeof(ethernet_header_t));
-
-          vlib_increment_combined_counter 
-              (vcm, cpu_index, lb_index1, 1,
-               vlib_buffer_length_in_chain (vm, b1)
-               + sizeof(ethernet_header_t));
-
-          if (PREDICT_FALSE(dpo1->dpoi_type != DPO_RECEIVE))
-            {
-              b1->error = node->errors[IP6_COP_WHITELIST_ERROR_DROPPED];
-              next1 = RX_COP_DROP;
-            }
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              ip6_cop_whitelist_trace_t *t = 
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->sw_if_index = sw_if_index0;
-              t->next_index = next0;
-            }
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b1->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              ip6_cop_whitelist_trace_t *t = 
-                 vlib_add_trace (vm, node, b1, sizeof (*t));
-              t->sw_if_index = sw_if_index1;
-              t->next_index = next1;
-            }
-
-          /* verify speculative enqueues, maybe switch current next frame */
-          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-                                           to_next, n_left_to_next,
-                                           bi0, bi1, next0, next1);
-        }
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-          u32 bi0;
-	  vlib_buffer_t * b0;
-          u32 next0;
-          u32 sw_if_index0;
-          ip6_header_t * ip0;
-          cop_config_main_t *ccm0;
-          cop_config_data_t *c0;
-          u32 lb_index0;
-          const load_balance_t * lb0;
-          const dpo_id_t *dpo0;
-
-          /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-
-	  ip0 = vlib_buffer_get_current (b0);
-
-	  ccm0 = cm->cop_config_mains + VNET_COP_IP6;
-
-	  c0 = vnet_get_config_data 
-              (&ccm0->config_main,
-               &vnet_buffer (b0)->cop.current_config_index,
-               &next0,
-               sizeof (c0[0]));
-
-          lb_index0 = ip6_fib_table_fwding_lookup (im6, c0->fib_index, 
-						    &ip0->src_address);
-
-	  lb0 = load_balance_get (lb_index0);
-          dpo0 = load_balance_get_bucket_i(lb0, 0);
-
-          vlib_increment_combined_counter 
-              (vcm, cpu_index, lb_index0, 1,
-               vlib_buffer_length_in_chain (vm, b0) 
-               + sizeof(ethernet_header_t));
-
-          if (PREDICT_FALSE(dpo0->dpoi_type != DPO_RECEIVE))
-            {
-              b0->error = node->errors[IP6_COP_WHITELIST_ERROR_DROPPED];
-              next0 = RX_COP_DROP;
-            }
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              ip6_cop_whitelist_trace_t *t = 
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->sw_if_index = sw_if_index0;
-              t->next_index = next0;
-            }
-            
-          /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (ip6_cop_whitelist_node) = {
-  .function = ip6_cop_whitelist_node_fn,
-  .name = "ip6-cop-whitelist",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip6_cop_whitelist_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_errors = ARRAY_LEN(ip6_cop_whitelist_error_strings),
-  .error_strings = ip6_cop_whitelist_error_strings,
-
-  .n_next_nodes = COP_RX_N_FEATURES,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [IP4_RX_COP_WHITELIST] = "ip4-cop-whitelist",
-    [IP6_RX_COP_WHITELIST] = "ip6-cop-whitelist",
-    [DEFAULT_RX_COP_WHITELIST] = "default-cop-whitelist",
-    [IP4_RX_COP_INPUT] = "ip4-input",
-    [IP6_RX_COP_INPUT] = "ip6-input",
-    [DEFAULT_RX_COP_INPUT] = "ethernet-input",
-    [RX_COP_DROP] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_cop_whitelist_node, ip6_cop_whitelist_node_fn)
-
-static clib_error_t *
-ip6_whitelist_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ip6_whitelist_init);
diff --git a/vnet/vnet/cop/node1.c b/vnet/vnet/cop/node1.c
deleted file mode 100644
index b448b531..00000000
--- a/vnet/vnet/cop/node1.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/cop/cop.h>
-
-typedef struct {
-  u32 next_index;
-  u32 sw_if_index;
-} cop_input_trace_t;
-
-/* packet trace format function */
-static u8 * format_cop_input_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  cop_input_trace_t * t = va_arg (*args, cop_input_trace_t *);
-  
-  s = format (s, "COP_INPUT: sw_if_index %d, next index %d",
-              t->sw_if_index, t->next_index);
-  return s;
-}
-
-vlib_node_registration_t cop_input_node;
-
-#define foreach_cop_input_error \
-_(PROCESSED, "COP input packets processed")
-
-typedef enum {
-#define _(sym,str) COP_INPUT_ERROR_##sym,
-  foreach_cop_input_error
-#undef _
-  COP_INPUT_N_ERROR,
-} cop_input_error_t;
-
-static char * cop_input_error_strings[] = {
-#define _(sym,string) string,
-  foreach_cop_input_error
-#undef _
-};
-
-static uword
-cop_input_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * frame)
-{
-  u32 n_left_from, * from, * to_next;
-  cop_feature_type_t next_index;
-  cop_main_t *cm = &cop_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-          u32 bi0, bi1;
-	  vlib_buffer_t * b0, * b1;
-          u32 next0, next1;
-          u32 sw_if_index0, sw_if_index1;
-          ethernet_header_t * en0, * en1;
-          cop_config_main_t * ccm0, * ccm1;
-          u32 advance0, advance1;
-          int proto0, proto1;
-          
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * p2, * p3;
-            
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-            
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-          /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-          en0 = vlib_buffer_get_current (b0);
-          en1 = vlib_buffer_get_current (b1);
-
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
-
-          proto0 = VNET_COP_DEFAULT;
-          proto1 = VNET_COP_DEFAULT;
-          advance0 = 0;
-          advance1 = 0;
-
-          if (en0->type == clib_host_to_net_u16(ETHERNET_TYPE_IP4))
-            {
-              proto0 = VNET_COP_IP4;
-              advance0 = sizeof(ethernet_header_t);
-            }
-          else if (en0->type == clib_host_to_net_u16(ETHERNET_TYPE_IP6))
-            {
-              proto0 = VNET_COP_IP6;
-              advance0 = sizeof(ethernet_header_t);
-            }
-
-          if (en1->type == clib_host_to_net_u16(ETHERNET_TYPE_IP4))
-            {
-              proto1 = VNET_COP_IP4;
-              advance1 = sizeof(ethernet_header_t);
-            }
-          else if (en1->type == clib_host_to_net_u16(ETHERNET_TYPE_IP6))
-            {
-              proto1 = VNET_COP_IP6;
-              advance1 = sizeof(ethernet_header_t);
-            }
-
-	  ccm0 = cm->cop_config_mains + proto0;
-	  ccm1 = cm->cop_config_mains + proto1;
-          vnet_buffer(b0)->cop.current_config_index = 
-            ccm0->config_index_by_sw_if_index [sw_if_index0];
-
-          vnet_buffer(b1)->cop.current_config_index = 
-            ccm1->config_index_by_sw_if_index [sw_if_index1];
-
-          vlib_buffer_advance (b0, advance0);
-          vlib_buffer_advance (b1, advance1);
-
-          vnet_get_config_data (&ccm0->config_main,
-                                &vnet_buffer(b0)->cop.current_config_index,
-                                &next0, 0 /* bytes of config data */);
-
-          vnet_get_config_data (&ccm1->config_main,
-                                &vnet_buffer(b1)->cop.current_config_index,
-                                &next1, 0 /* bytes of config data */);
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              cop_input_trace_t *t = 
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->sw_if_index = sw_if_index0;
-              t->next_index = next0;
-            }
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b1->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              cop_input_trace_t *t = 
-                 vlib_add_trace (vm, node, b1, sizeof (*t));
-              t->sw_if_index = sw_if_index1;
-              t->next_index = next1;
-            }
-          /* verify speculative enqueues, maybe switch current next frame */
-          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-                                           to_next, n_left_to_next,
-                                           bi0, bi1, next0, next1);
-        }
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-          u32 bi0;
-	  vlib_buffer_t * b0;
-          u32 next0;
-          u32 sw_if_index0;
-          ethernet_header_t *en0;
-          cop_config_main_t *ccm0;
-          u32 advance0;
-          int proto0;
-
-          /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-          /* 
-           * Direct from the driver, we should be at offset 0
-           * aka at &b0->data[0]
-           */
-          ASSERT (b0->current_data == 0);
-
-          en0 = vlib_buffer_get_current (b0);
-
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-
-          proto0 = VNET_COP_DEFAULT;
-          advance0 = 0;
-
-          if (en0->type == clib_host_to_net_u16(ETHERNET_TYPE_IP4))
-            {
-              proto0 = VNET_COP_IP4;
-              advance0 = sizeof(ethernet_header_t);
-            }
-          else if (en0->type == clib_host_to_net_u16(ETHERNET_TYPE_IP6))
-            {
-              proto0 = VNET_COP_IP6;
-              advance0 = sizeof(ethernet_header_t);
-            }
-
-	  ccm0 = cm->cop_config_mains + proto0;
-          vnet_buffer(b0)->cop.current_config_index = 
-            ccm0->config_index_by_sw_if_index [sw_if_index0];
-
-          vlib_buffer_advance (b0, advance0);
-
-          vnet_get_config_data (&ccm0->config_main,
-                                &vnet_buffer(b0)->cop.current_config_index,
-                                &next0, 0 /* bytes of config data */);
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              cop_input_trace_t *t = 
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->sw_if_index = sw_if_index0;
-              t->next_index = next0;
-            }
-            
-          /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, cop_input_node.index, 
-                               COP_INPUT_ERROR_PROCESSED, frame->n_vectors);
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (cop_input_node) = {
-  .function = cop_input_node_fn,
-  .name = "cop-input",
-  .vector_size = sizeof (u32),
-  .format_trace = format_cop_input_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_errors = ARRAY_LEN(cop_input_error_strings),
-  .error_strings = cop_input_error_strings,
-
-  .n_next_nodes = COP_RX_N_FEATURES,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [IP4_RX_COP_WHITELIST] = "ip4-cop-whitelist",
-    [IP6_RX_COP_WHITELIST] = "ip6-cop-whitelist",
-    [DEFAULT_RX_COP_WHITELIST] = "default-cop-whitelist",
-    [IP4_RX_COP_INPUT] = "ip4-input",
-    [IP6_RX_COP_INPUT] = "ip6-input",
-    [DEFAULT_RX_COP_INPUT] = "ethernet-input",
-    [RX_COP_DROP] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (cop_input_node, cop_input_node_fn)
-
-#define foreach_cop_stub                        \
-_(default-cop-whitelist, default_cop_whitelist)
-
-#define _(n,f)                                  \
-                                                \
-static uword                                    \
-f##_node_fn (vlib_main_t * vm,                  \
-             vlib_node_runtime_t * node,        \
-             vlib_frame_t * frame)              \
-{                                               \
-  clib_warning ("BUG: stub function called");   \
-  return 0;                                     \
-}                                               \
-                                                \
-VLIB_REGISTER_NODE (f##_input_node) = {         \
-  .function = f##_node_fn,                      \
-  .name = #n,                                   \
-  .vector_size = sizeof (u32),                  \
-  .type = VLIB_NODE_TYPE_INTERNAL,              \
-                                                \
-  .n_errors = 0,                                \
-  .error_strings = 0,                           \
-                                                \
-  .n_next_nodes = 0,                            \
-};
-
-foreach_cop_stub;
-
-
-
-
-
-
diff --git a/vnet/vnet/devices/af_packet/af_packet.api b/vnet/vnet/devices/af_packet/af_packet.api
deleted file mode 100644
index 9fb2a207..00000000
--- a/vnet/vnet/devices/af_packet/af_packet.api
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \brief Create host-interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param host_if_name - interface name
-    @param hw_addr - interface MAC
-    @param use_random_hw_addr - use random generated MAC
-*/
-define af_packet_create
-{
-  u32 client_index;
-  u32 context;
-
-  u8 host_if_name[64];
-  u8 hw_addr[6];
-  u8 use_random_hw_addr;
-};
-
-/** \brief Create host-interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define af_packet_create_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-};
-
-/** \brief Delete host-interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param host_if_name - interface name
-*/
-define af_packet_delete
-{
-  u32 client_index;
-  u32 context;
-
-  u8 host_if_name[64];
-};
-
-/** \brief Delete host-interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define af_packet_delete_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/af_packet/af_packet.c b/vnet/vnet/devices/af_packet/af_packet.c
deleted file mode 100644
index 91c3988b..00000000
--- a/vnet/vnet/devices/af_packet/af_packet.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- *------------------------------------------------------------------
- * af_packet.c - linux kernel packet interface
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <linux/if_ether.h>
-#include <linux/if_packet.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-
-#include <vnet/devices/af_packet/af_packet.h>
-
-#define AF_PACKET_DEBUG_SOCKET		0
-
-#define AF_PACKET_TX_FRAMES_PER_BLOCK	1024
-#define AF_PACKET_TX_FRAME_SIZE	 	(2048 * 5)
-#define AF_PACKET_TX_BLOCK_NR		1
-#define AF_PACKET_TX_FRAME_NR		(AF_PACKET_TX_BLOCK_NR * \
-					 AF_PACKET_TX_FRAMES_PER_BLOCK)
-#define AF_PACKET_TX_BLOCK_SIZE	 	(AF_PACKET_TX_FRAME_SIZE * \
-					 AF_PACKET_TX_FRAMES_PER_BLOCK)
-
-#define AF_PACKET_RX_FRAMES_PER_BLOCK	1024
-#define AF_PACKET_RX_FRAME_SIZE	 	(2048 * 5)
-#define AF_PACKET_RX_BLOCK_NR		1
-#define AF_PACKET_RX_FRAME_NR		(AF_PACKET_RX_BLOCK_NR * \
-					 AF_PACKET_RX_FRAMES_PER_BLOCK)
-#define AF_PACKET_RX_BLOCK_SIZE		(AF_PACKET_RX_FRAME_SIZE * \
-					 AF_PACKET_RX_FRAMES_PER_BLOCK)
-
-#if AF_PACKET_DEBUG_SOCKET == 1
-#define DBG_SOCK(args...) clib_warning(args);
-#else
-#define DBG_SOCK(args...)
-#endif
-
-/*defined in net/if.h but clashes with dpdk headers */
-unsigned int if_nametoindex (const char *ifname);
-
-typedef struct tpacket_req tpacket_req_t;
-
-static u32
-af_packet_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi,
-			   u32 flags)
-{
-  /* nothing for now */
-  return 0;
-}
-
-static clib_error_t *
-af_packet_fd_read_ready (unix_file_t * uf)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  af_packet_main_t *apm = &af_packet_main;
-  u32 idx = uf->private_data;
-
-  apm->pending_input_bitmap =
-    clib_bitmap_set (apm->pending_input_bitmap, idx, 1);
-
-  /* Schedule the rx node */
-  vlib_node_set_interrupt_pending (vm, af_packet_input_node.index);
-
-  return 0;
-}
-
-static int
-create_packet_v2_sock (u8 * name, tpacket_req_t * rx_req,
-		       tpacket_req_t * tx_req, int *fd, u8 ** ring)
-{
-  int ret, err;
-  struct sockaddr_ll sll;
-  uint host_if_index;
-  int ver = TPACKET_V2;
-  socklen_t req_sz = sizeof (struct tpacket_req);
-  u32 ring_sz = rx_req->tp_block_size * rx_req->tp_block_nr +
-    tx_req->tp_block_size * tx_req->tp_block_nr;
-
-  host_if_index = if_nametoindex ((const char *) name);
-
-  if (!host_if_index)
-    {
-      DBG_SOCK ("Wrong host interface name");
-      ret = VNET_API_ERROR_INVALID_INTERFACE;
-      goto error;
-    }
-
-  if ((*fd = socket (AF_PACKET, SOCK_RAW, htons (ETH_P_ALL))) < 0)
-    {
-      DBG_SOCK ("Failed to create socket");
-      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
-      goto error;
-    }
-
-  if ((err =
-       setsockopt (*fd, SOL_PACKET, PACKET_VERSION, &ver, sizeof (ver))) < 0)
-    {
-      DBG_SOCK ("Failed to set rx packet interface version");
-      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
-      goto error;
-    }
-
-  int opt = 1;
-  if ((err =
-       setsockopt (*fd, SOL_PACKET, PACKET_LOSS, &opt, sizeof (opt))) < 0)
-    {
-      DBG_SOCK ("Failed to set packet tx ring error handling option");
-      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
-      goto error;
-    }
-
-  if ((err =
-       setsockopt (*fd, SOL_PACKET, PACKET_RX_RING, rx_req, req_sz)) < 0)
-    {
-      DBG_SOCK ("Failed to set packet rx ring options");
-      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
-      goto error;
-    }
-
-  if ((err =
-       setsockopt (*fd, SOL_PACKET, PACKET_TX_RING, tx_req, req_sz)) < 0)
-    {
-      DBG_SOCK ("Failed to set packet rx ring options");
-      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
-      goto error;
-    }
-
-  *ring =
-    mmap (NULL, ring_sz, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_LOCKED, *fd,
-	  0);
-  if (*ring == MAP_FAILED)
-    {
-      DBG_SOCK ("mmap failure");
-      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
-      goto error;
-    }
-
-  memset (&sll, 0, sizeof (sll));
-  sll.sll_family = PF_PACKET;
-  sll.sll_protocol = htons (ETH_P_ALL);
-  sll.sll_ifindex = host_if_index;
-
-  if ((err = bind (*fd, (struct sockaddr *) &sll, sizeof (sll))) < 0)
-    {
-      DBG_SOCK ("Failed to bind rx packet socket (error %d)", err);
-      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
-      goto error;
-    }
-
-  return 0;
-error:
-  if (*fd >= 0)
-    close (*fd);
-  *fd = -1;
-  return ret;
-}
-
-int
-af_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set,
-		     u32 * sw_if_index)
-{
-  af_packet_main_t *apm = &af_packet_main;
-  int ret, fd = -1;
-  struct tpacket_req *rx_req = 0;
-  struct tpacket_req *tx_req = 0;
-  u8 *ring = 0;
-  af_packet_if_t *apif = 0;
-  u8 hw_addr[6];
-  clib_error_t *error;
-  vnet_sw_interface_t *sw;
-  vnet_main_t *vnm = vnet_get_main ();
-  uword *p;
-  uword if_index;
-  u8 *host_if_name_dup = vec_dup (host_if_name);
-
-  p = mhash_get (&apm->if_index_by_host_if_name, host_if_name);
-  if (p)
-    {
-      return VNET_API_ERROR_SUBIF_ALREADY_EXISTS;
-    }
-
-  vec_validate (rx_req, 0);
-  rx_req->tp_block_size = AF_PACKET_RX_BLOCK_SIZE;
-  rx_req->tp_frame_size = AF_PACKET_RX_FRAME_SIZE;
-  rx_req->tp_block_nr = AF_PACKET_RX_BLOCK_NR;
-  rx_req->tp_frame_nr = AF_PACKET_RX_FRAME_NR;
-
-  vec_validate (tx_req, 0);
-  tx_req->tp_block_size = AF_PACKET_TX_BLOCK_SIZE;
-  tx_req->tp_frame_size = AF_PACKET_TX_FRAME_SIZE;
-  tx_req->tp_block_nr = AF_PACKET_TX_BLOCK_NR;
-  tx_req->tp_frame_nr = AF_PACKET_TX_FRAME_NR;
-
-  ret = create_packet_v2_sock (host_if_name, rx_req, tx_req, &fd, &ring);
-
-  if (ret != 0)
-    goto error;
-
-  /* So far everything looks good, let's create interface */
-  pool_get (apm->interfaces, apif);
-  if_index = apif - apm->interfaces;
-
-  apif->fd = fd;
-  apif->rx_ring = ring;
-  apif->tx_ring = ring + rx_req->tp_block_size * rx_req->tp_block_nr;
-  apif->rx_req = rx_req;
-  apif->tx_req = tx_req;
-  apif->host_if_name = host_if_name_dup;
-  apif->per_interface_next_index = ~0;
-  apif->next_tx_frame = 0;
-  apif->next_rx_frame = 0;
-
-  {
-    unix_file_t template = { 0 };
-    template.read_function = af_packet_fd_read_ready;
-    template.file_descriptor = fd;
-    template.private_data = if_index;
-    template.flags = UNIX_FILE_EVENT_EDGE_TRIGGERED;
-    apif->unix_file_index = unix_file_add (&unix_main, &template);
-  }
-
-  /*use configured or generate random MAC address */
-  if (hw_addr_set)
-    clib_memcpy (hw_addr, hw_addr_set, 6);
-  else
-    {
-      f64 now = vlib_time_now (vm);
-      u32 rnd;
-      rnd = (u32) (now * 1e6);
-      rnd = random_u32 (&rnd);
-
-      clib_memcpy (hw_addr + 2, &rnd, sizeof (rnd));
-      hw_addr[0] = 2;
-      hw_addr[1] = 0xfe;
-    }
-
-  error = ethernet_register_interface (vnm, af_packet_device_class.index,
-				       if_index, hw_addr, &apif->hw_if_index,
-				       af_packet_eth_flag_change);
-
-  if (error)
-    {
-      memset (apif, 0, sizeof (*apif));
-      pool_put (apm->interfaces, apif);
-      clib_error_report (error);
-      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
-      goto error;
-    }
-
-  sw = vnet_get_hw_sw_interface (vnm, apif->hw_if_index);
-  apif->sw_if_index = sw->sw_if_index;
-
-  vnet_hw_interface_set_flags (vnm, apif->hw_if_index,
-			       VNET_HW_INTERFACE_FLAG_LINK_UP);
-
-  mhash_set_mem (&apm->if_index_by_host_if_name, host_if_name_dup, &if_index,
-		 0);
-  if (sw_if_index)
-    *sw_if_index = apif->sw_if_index;
-  return 0;
-
-error:
-  vec_free (host_if_name_dup);
-  vec_free (rx_req);
-  vec_free (tx_req);
-  return ret;
-}
-
-int
-af_packet_delete_if (vlib_main_t * vm, u8 * host_if_name)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  af_packet_main_t *apm = &af_packet_main;
-  af_packet_if_t *apif;
-  uword *p;
-  uword if_index;
-  u32 ring_sz;
-
-  p = mhash_get (&apm->if_index_by_host_if_name, host_if_name);
-  if (p == NULL)
-    {
-      clib_warning ("Host interface %s does not exist", host_if_name);
-      return VNET_API_ERROR_SYSCALL_ERROR_1;
-    }
-  apif = pool_elt_at_index (apm->interfaces, p[0]);
-  if_index = apif - apm->interfaces;
-
-  /* bring down the interface */
-  vnet_hw_interface_set_flags (vnm, apif->hw_if_index, 0);
-
-  /* clean up */
-  if (apif->unix_file_index != ~0)
-    {
-      unix_file_del (&unix_main, unix_main.file_pool + apif->unix_file_index);
-      apif->unix_file_index = ~0;
-    }
-  else
-    close (apif->fd);
-
-  ring_sz = apif->rx_req->tp_block_size * apif->rx_req->tp_block_nr +
-    apif->tx_req->tp_block_size * apif->tx_req->tp_block_nr;
-  if (munmap (apif->rx_ring, ring_sz))
-    clib_warning ("Host interface %s could not free rx/tx ring",
-		  host_if_name);
-  apif->rx_ring = NULL;
-  apif->tx_ring = NULL;
-  apif->fd = -1;
-
-  vec_free (apif->rx_req);
-  apif->rx_req = NULL;
-  vec_free (apif->tx_req);
-  apif->tx_req = NULL;
-
-  vec_free (apif->host_if_name);
-  apif->host_if_name = NULL;
-
-  mhash_unset (&apm->if_index_by_host_if_name, host_if_name, &if_index);
-
-  ethernet_delete_interface (vnm, apif->hw_if_index);
-
-  pool_put (apm->interfaces, apif);
-
-  return 0;
-}
-
-static clib_error_t *
-af_packet_init (vlib_main_t * vm)
-{
-  af_packet_main_t *apm = &af_packet_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-
-  memset (apm, 0, sizeof (af_packet_main_t));
-
-  mhash_init_vec_string (&apm->if_index_by_host_if_name, sizeof (uword));
-
-  vec_validate_aligned (apm->rx_buffers, tm->n_vlib_mains - 1,
-			CLIB_CACHE_LINE_BYTES);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (af_packet_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/af_packet/af_packet.h b/vnet/vnet/devices/af_packet/af_packet.h
deleted file mode 100644
index 19e2523d..00000000
--- a/vnet/vnet/devices/af_packet/af_packet.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *------------------------------------------------------------------
- * af_packet.h - linux kernel packet interface header file
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  u8 *host_if_name;
-  int fd;
-  struct tpacket_req *rx_req;
-  struct tpacket_req *tx_req;
-  u8 *rx_ring;
-  u8 *tx_ring;
-  u32 hw_if_index;
-  u32 sw_if_index;
-  u32 unix_file_index;
-
-  u32 next_rx_frame;
-  u32 next_tx_frame;
-
-  u32 per_interface_next_index;
-  u8 is_admin_up;
-} af_packet_if_t;
-
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  af_packet_if_t *interfaces;
-
-  /* bitmap of pending rx interfaces */
-  uword *pending_input_bitmap;
-
-  /* rx buffer cache */
-  u32 **rx_buffers;
-
-  /* hash of host interface names */
-  mhash_t if_index_by_host_if_name;
-} af_packet_main_t;
-
-af_packet_main_t af_packet_main;
-extern vnet_device_class_t af_packet_device_class;
-extern vlib_node_registration_t af_packet_input_node;
-
-int af_packet_create_if (vlib_main_t * vm, u8 * host_if_name,
-			 u8 * hw_addr_set, u32 * sw_if_index);
-int af_packet_delete_if (vlib_main_t * vm, u8 * host_if_name);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/af_packet/af_packet_api.c b/vnet/vnet/devices/af_packet/af_packet_api.c
deleted file mode 100644
index 414c838c..00000000
--- a/vnet/vnet/devices/af_packet/af_packet_api.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *------------------------------------------------------------------
- * af_packet_api.c - af-packet api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/devices/af_packet/af_packet.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                             \
-_(AF_PACKET_CREATE, af_packet_create)                   \
-_(AF_PACKET_DELETE, af_packet_delete)
-
-static void
-vl_api_af_packet_create_t_handler (vl_api_af_packet_create_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_af_packet_create_reply_t *rmp;
-  int rv = 0;
-  u8 *host_if_name = NULL;
-  u32 sw_if_index;
-
-  host_if_name = format (0, "%s", mp->host_if_name);
-  vec_add1 (host_if_name, 0);
-
-  rv = af_packet_create_if (vm, host_if_name,
-			    mp->use_random_hw_addr ? 0 : mp->hw_addr,
-			    &sw_if_index);
-
-  vec_free (host_if_name);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_AF_PACKET_CREATE_REPLY,
-  ({
-    rmp->sw_if_index = clib_host_to_net_u32(sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_af_packet_delete_t_handler (vl_api_af_packet_delete_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_af_packet_delete_reply_t *rmp;
-  int rv = 0;
-  u8 *host_if_name = NULL;
-
-  host_if_name = format (0, "%s", mp->host_if_name);
-  vec_add1 (host_if_name, 0);
-
-  rv = af_packet_delete_if (vm, host_if_name);
-
-  vec_free (host_if_name);
-
-  REPLY_MACRO (VL_API_AF_PACKET_DELETE_REPLY);
-}
-
-/*
- * af_packet_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_af_packet;
-#undef _
-}
-
-static clib_error_t *
-af_packet_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (af_packet_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/af_packet/cli.c b/vnet/vnet/devices/af_packet/cli.c
deleted file mode 100644
index 2cbd4152..00000000
--- a/vnet/vnet/devices/af_packet/cli.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *------------------------------------------------------------------
- * af_packet.c - linux kernel packet interface
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <fcntl.h>		/* for open */
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/uio.h>		/* for iovec */
-#include <netinet/in.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-
-#include <vnet/devices/af_packet/af_packet.h>
-
-static clib_error_t *
-af_packet_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 *host_if_name = NULL;
-  u8 hwaddr[6];
-  u8 *hw_addr_ptr = 0;
-  u32 sw_if_index;
-  int r;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "name %s", &host_if_name))
-	;
-      else
-	if (unformat
-	    (line_input, "hw-addr %U", unformat_ethernet_address, hwaddr))
-	hw_addr_ptr = hwaddr;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  if (host_if_name == NULL)
-    return clib_error_return (0, "missing host interface name");
-
-  r = af_packet_create_if (vm, host_if_name, hw_addr_ptr, &sw_if_index);
-  vec_free (host_if_name);
-
-  if (r == VNET_API_ERROR_SYSCALL_ERROR_1)
-    return clib_error_return (0, "%s (errno %d)", strerror (errno), errno);
-
-  if (r == VNET_API_ERROR_INVALID_INTERFACE)
-    return clib_error_return (0, "Invalid interface name");
-
-  if (r == VNET_API_ERROR_SUBIF_ALREADY_EXISTS)
-    return clib_error_return (0, "Interface elready exists");
-
-  vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main (),
-		   sw_if_index);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (af_packet_create_command, static) = {
-  .path = "create host-interface",
-  .short_help = "create host-interface name <interface name> [hw-addr <mac>]",
-  .function = af_packet_create_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-af_packet_delete_command_fn (vlib_main_t * vm, unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 *host_if_name = NULL;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "name %s", &host_if_name))
-	;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  if (host_if_name == NULL)
-    return clib_error_return (0, "missing host interface name");
-
-  af_packet_delete_if (vm, host_if_name);
-  vec_free (host_if_name);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (af_packet_delete_command, static) = {
-  .path = "delete host-interface",
-  .short_help = "delete host-interface name <interface name>",
-  .function = af_packet_delete_command_fn,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-af_packet_cli_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (af_packet_cli_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/af_packet/device.c b/vnet/vnet/devices/af_packet/device.c
deleted file mode 100644
index 1fb4000f..00000000
--- a/vnet/vnet/devices/af_packet/device.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- *------------------------------------------------------------------
- * af_packet.c - linux kernel packet interface
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <linux/if_packet.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-
-#include <vnet/devices/af_packet/af_packet.h>
-
-#define foreach_af_packet_tx_func_error               \
-_(FRAME_NOT_READY, "tx frame not ready")              \
-_(TXRING_EAGAIN,   "tx sendto temporary failure")     \
-_(TXRING_FATAL,    "tx sendto fatal failure")         \
-_(TXRING_OVERRUN,  "tx ring overrun")
-
-typedef enum
-{
-#define _(f,s) AF_PACKET_TX_ERROR_##f,
-  foreach_af_packet_tx_func_error
-#undef _
-    AF_PACKET_TX_N_ERROR,
-} af_packet_tx_func_error_t;
-
-static char *af_packet_tx_func_error_strings[] = {
-#define _(n,s) s,
-  foreach_af_packet_tx_func_error
-#undef _
-};
-
-
-static u8 *
-format_af_packet_device_name (u8 * s, va_list * args)
-{
-  u32 i = va_arg (*args, u32);
-  af_packet_main_t *apm = &af_packet_main;
-  af_packet_if_t *apif = pool_elt_at_index (apm->interfaces, i);
-
-  s = format (s, "host-%s", apif->host_if_name);
-  return s;
-}
-
-static u8 *
-format_af_packet_device (u8 * s, va_list * args)
-{
-  s = format (s, "Linux PACKET socket interface");
-  return s;
-}
-
-static u8 *
-format_af_packet_tx_trace (u8 * s, va_list * args)
-{
-  s = format (s, "Unimplemented...");
-  return s;
-}
-
-static uword
-af_packet_interface_tx (vlib_main_t * vm,
-			vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  af_packet_main_t *apm = &af_packet_main;
-  u32 *buffers = vlib_frame_args (frame);
-  u32 n_left = frame->n_vectors;
-  u32 n_sent = 0;
-  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
-  af_packet_if_t *apif =
-    pool_elt_at_index (apm->interfaces, rd->dev_instance);
-  int block = 0;
-  u32 block_size = apif->tx_req->tp_block_size;
-  u32 frame_size = apif->tx_req->tp_frame_size;
-  u32 frame_num = apif->tx_req->tp_frame_nr;
-  u8 *block_start = apif->tx_ring + block * block_size;
-  u32 tx_frame = apif->next_tx_frame;
-  struct tpacket2_hdr *tph;
-  u32 frame_not_ready = 0;
-
-  while (n_left > 0)
-    {
-      u32 len;
-      u32 offset = 0;
-      vlib_buffer_t *b0;
-      n_left--;
-      u32 bi = buffers[0];
-      buffers++;
-
-      tph = (struct tpacket2_hdr *) (block_start + tx_frame * frame_size);
-
-      if (PREDICT_FALSE
-	  (tph->tp_status & (TP_STATUS_SEND_REQUEST | TP_STATUS_SENDING)))
-	{
-	  frame_not_ready++;
-	  goto next;
-	}
-
-      do
-	{
-	  b0 = vlib_get_buffer (vm, bi);
-	  len = b0->current_length;
-	  clib_memcpy ((u8 *) tph +
-		       TPACKET_ALIGN (sizeof (struct tpacket2_hdr)) + offset,
-		       vlib_buffer_get_current (b0), len);
-	  offset += len;
-	}
-      while ((bi = b0->next_buffer));
-
-      tph->tp_len = tph->tp_snaplen = offset;
-      tph->tp_status = TP_STATUS_SEND_REQUEST;
-      n_sent++;
-    next:
-      /* check if we've exhausted the ring */
-      if (PREDICT_FALSE (frame_not_ready + n_sent == frame_num))
-	break;
-
-      tx_frame = (tx_frame + 1) % frame_num;
-    }
-
-  CLIB_MEMORY_BARRIER ();
-
-  if (PREDICT_TRUE (n_sent))
-    {
-      apif->next_tx_frame = tx_frame;
-
-      if (PREDICT_FALSE (sendto (apif->fd, NULL, 0,
-				 MSG_DONTWAIT, NULL, 0) == -1))
-	{
-	  /* Uh-oh, drop & move on, but count whether it was fatal or not.
-	   * Note that we have no reliable way to properly determine the
-	   * disposition of the packets we just enqueued for delivery.
-	   */
-	  vlib_error_count (vm, node->node_index,
-			    unix_error_is_fatal (errno) ?
-			    AF_PACKET_TX_ERROR_TXRING_FATAL :
-			    AF_PACKET_TX_ERROR_TXRING_EAGAIN, n_sent);
-	}
-    }
-
-  if (PREDICT_FALSE (frame_not_ready))
-    vlib_error_count (vm, node->node_index,
-		      AF_PACKET_TX_ERROR_FRAME_NOT_READY, frame_not_ready);
-
-  if (PREDICT_FALSE (frame_not_ready + n_sent == frame_num))
-    vlib_error_count (vm, node->node_index, AF_PACKET_TX_ERROR_TXRING_OVERRUN,
-		      n_left);
-
-  vlib_buffer_free (vm, vlib_frame_args (frame), frame->n_vectors);
-  return frame->n_vectors;
-}
-
-static void
-af_packet_set_interface_next_node (vnet_main_t * vnm, u32 hw_if_index,
-				   u32 node_index)
-{
-  af_packet_main_t *apm = &af_packet_main;
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  af_packet_if_t *apif =
-    pool_elt_at_index (apm->interfaces, hw->dev_instance);
-
-  /* Shut off redirection */
-  if (node_index == ~0)
-    {
-      apif->per_interface_next_index = node_index;
-      return;
-    }
-
-  apif->per_interface_next_index =
-    vlib_node_add_next (vlib_get_main (), af_packet_input_node.index,
-			node_index);
-}
-
-static void
-af_packet_clear_hw_interface_counters (u32 instance)
-{
-  /* Nothing for now */
-}
-
-static clib_error_t *
-af_packet_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index,
-				   u32 flags)
-{
-  af_packet_main_t *apm = &af_packet_main;
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  af_packet_if_t *apif =
-    pool_elt_at_index (apm->interfaces, hw->dev_instance);
-  u32 hw_flags;
-
-  apif->is_admin_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
-
-  if (apif->is_admin_up)
-    hw_flags = VNET_HW_INTERFACE_FLAG_LINK_UP;
-  else
-    hw_flags = 0;
-
-  vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
-
-  return 0;
-}
-
-static clib_error_t *
-af_packet_subif_add_del_function (vnet_main_t * vnm,
-				  u32 hw_if_index,
-				  struct vnet_sw_interface_t *st, int is_add)
-{
-  /* Nothing for now */
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (af_packet_device_class) = {
-  .name = "af-packet",
-  .tx_function = af_packet_interface_tx,
-  .format_device_name = format_af_packet_device_name,
-  .format_device = format_af_packet_device,
-  .format_tx_trace = format_af_packet_tx_trace,
-  .tx_function_n_errors = AF_PACKET_TX_N_ERROR,
-  .tx_function_error_strings = af_packet_tx_func_error_strings,
-  .rx_redirect_to_node = af_packet_set_interface_next_node,
-  .clear_counters = af_packet_clear_hw_interface_counters,
-  .admin_up_down_function = af_packet_interface_admin_up_down,
-  .subif_add_del_function = af_packet_subif_add_del_function,
-};
-
-VLIB_DEVICE_TX_FUNCTION_MULTIARCH (af_packet_device_class,
-				   af_packet_interface_tx)
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/af_packet/node.c b/vnet/vnet/devices/af_packet/node.c
deleted file mode 100644
index 72004320..00000000
--- a/vnet/vnet/devices/af_packet/node.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- *------------------------------------------------------------------
- * af_packet.c - linux kernel packet interface
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <linux/if_packet.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/devices/devices.h>
-#include <vnet/feature/feature.h>
-
-#include <vnet/devices/af_packet/af_packet.h>
-
-#define foreach_af_packet_input_error
-
-typedef enum
-{
-#define _(f,s) AF_PACKET_INPUT_ERROR_##f,
-  foreach_af_packet_input_error
-#undef _
-    AF_PACKET_INPUT_N_ERROR,
-} af_packet_input_error_t;
-
-static char *af_packet_input_error_strings[] = {
-#define _(n,s) s,
-  foreach_af_packet_input_error
-#undef _
-};
-
-typedef struct
-{
-  u32 next_index;
-  u32 hw_if_index;
-  int block;
-  struct tpacket2_hdr tph;
-} af_packet_input_trace_t;
-
-static u8 *
-format_af_packet_input_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  af_packet_input_trace_t *t = va_arg (*args, af_packet_input_trace_t *);
-  uword indent = format_get_indent (s);
-
-  s = format (s, "af_packet: hw_if_index %d next-index %d",
-	      t->hw_if_index, t->next_index);
-
-  s =
-    format (s,
-	    "\n%Utpacket2_hdr:\n%Ustatus 0x%x len %u snaplen %u mac %u net %u"
-	    "\n%Usec 0x%x nsec 0x%x vlan %U"
-#ifdef TP_STATUS_VLAN_TPID_VALID
-	    " vlan_tpid %u"
-#endif
-	    ,
-	    format_white_space, indent + 2,
-	    format_white_space, indent + 4,
-	    t->tph.tp_status,
-	    t->tph.tp_len,
-	    t->tph.tp_snaplen,
-	    t->tph.tp_mac,
-	    t->tph.tp_net,
-	    format_white_space, indent + 4,
-	    t->tph.tp_sec,
-	    t->tph.tp_nsec, format_ethernet_vlan_tci, t->tph.tp_vlan_tci
-#ifdef TP_STATUS_VLAN_TPID_VALID
-	    , t->tph.tp_vlan_tpid
-#endif
-    );
-  return s;
-}
-
-always_inline void
-buffer_add_to_chain (vlib_main_t * vm, u32 bi, u32 first_bi, u32 prev_bi)
-{
-  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
-  vlib_buffer_t *first_b = vlib_get_buffer (vm, first_bi);
-  vlib_buffer_t *prev_b = vlib_get_buffer (vm, prev_bi);
-
-  /* update first buffer */
-  first_b->total_length_not_including_first_buffer += b->current_length;
-
-  /* update previous buffer */
-  prev_b->next_buffer = bi;
-  prev_b->flags |= VLIB_BUFFER_NEXT_PRESENT;
-
-  /* update current buffer */
-  b->next_buffer = 0;
-}
-
-always_inline uword
-af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-			   vlib_frame_t * frame, u32 device_idx)
-{
-  af_packet_main_t *apm = &af_packet_main;
-  af_packet_if_t *apif = pool_elt_at_index (apm->interfaces, device_idx);
-  struct tpacket2_hdr *tph;
-  u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-  u32 block = 0;
-  u32 rx_frame;
-  u32 n_free_bufs;
-  u32 n_rx_packets = 0;
-  u32 n_rx_bytes = 0;
-  u32 *to_next = 0;
-  u32 block_size = apif->rx_req->tp_block_size;
-  u32 frame_size = apif->rx_req->tp_frame_size;
-  u32 frame_num = apif->rx_req->tp_frame_nr;
-  u8 *block_start = apif->rx_ring + block * block_size;
-  uword n_trace = vlib_get_trace_count (vm, node);
-  u32 n_buffer_bytes = vlib_buffer_free_list_buffer_size (vm,
-							  VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-  u32 min_bufs = apif->rx_req->tp_frame_size / n_buffer_bytes;
-  int cpu_index = node->cpu_index;
-
-  if (apif->per_interface_next_index != ~0)
-    next_index = apif->per_interface_next_index;
-
-  n_free_bufs = vec_len (apm->rx_buffers[cpu_index]);
-  if (PREDICT_FALSE (n_free_bufs < VLIB_FRAME_SIZE))
-    {
-      vec_validate (apm->rx_buffers[cpu_index],
-		    VLIB_FRAME_SIZE + n_free_bufs - 1);
-      n_free_bufs +=
-	vlib_buffer_alloc (vm, &apm->rx_buffers[cpu_index][n_free_bufs],
-			   VLIB_FRAME_SIZE);
-      _vec_len (apm->rx_buffers[cpu_index]) = n_free_bufs;
-    }
-
-  rx_frame = apif->next_rx_frame;
-  tph = (struct tpacket2_hdr *) (block_start + rx_frame * frame_size);
-  while ((tph->tp_status & TP_STATUS_USER) && (n_free_bufs > min_bufs))
-    {
-      vlib_buffer_t *b0 = 0, *first_b0 = 0;
-      u32 next0 = next_index;
-
-      u32 n_left_to_next;
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-      while ((tph->tp_status & TP_STATUS_USER) && (n_free_bufs > min_bufs) &&
-	     n_left_to_next)
-	{
-	  u32 data_len = tph->tp_snaplen;
-	  u32 offset = 0;
-	  u32 bi0 = 0, first_bi0 = 0, prev_bi0;
-
-	  while (data_len)
-	    {
-	      /* grab free buffer */
-	      u32 last_empty_buffer =
-		vec_len (apm->rx_buffers[cpu_index]) - 1;
-	      prev_bi0 = bi0;
-	      bi0 = apm->rx_buffers[cpu_index][last_empty_buffer];
-	      b0 = vlib_get_buffer (vm, bi0);
-	      _vec_len (apm->rx_buffers[cpu_index]) = last_empty_buffer;
-	      n_free_bufs--;
-
-	      /* copy data */
-	      u32 bytes_to_copy =
-		data_len > n_buffer_bytes ? n_buffer_bytes : data_len;
-	      b0->current_data = 0;
-	      clib_memcpy (vlib_buffer_get_current (b0),
-			   (u8 *) tph + tph->tp_mac + offset, bytes_to_copy);
-
-	      /* fill buffer header */
-	      b0->current_length = bytes_to_copy;
-
-	      if (offset == 0)
-		{
-		  b0->total_length_not_including_first_buffer = 0;
-		  b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
-		  vnet_buffer (b0)->sw_if_index[VLIB_RX] = apif->sw_if_index;
-		  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-		  first_bi0 = bi0;
-		  first_b0 = vlib_get_buffer (vm, first_bi0);
-		}
-	      else
-		buffer_add_to_chain (vm, bi0, first_bi0, prev_bi0);
-
-	      offset += bytes_to_copy;
-	      data_len -= bytes_to_copy;
-	    }
-	  n_rx_packets++;
-	  n_rx_bytes += tph->tp_snaplen;
-	  to_next[0] = first_bi0;
-	  to_next += 1;
-	  n_left_to_next--;
-
-	  /* trace */
-	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (first_b0);
-	  if (PREDICT_FALSE (n_trace > 0))
-	    {
-	      af_packet_input_trace_t *tr;
-	      vlib_trace_buffer (vm, node, next0, first_b0,	/* follow_chain */
-				 0);
-	      vlib_set_trace_count (vm, node, --n_trace);
-	      tr = vlib_add_trace (vm, node, first_b0, sizeof (*tr));
-	      tr->next_index = next0;
-	      tr->hw_if_index = apif->hw_if_index;
-	      clib_memcpy (&tr->tph, tph, sizeof (struct tpacket2_hdr));
-	    }
-
-	  /* redirect if feature path enabled */
-	  vnet_feature_start_device_input_x1 (apif->sw_if_index, &next0, b0,
-					      0);
-
-	  /* enque and take next packet */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, first_bi0, next0);
-
-	  /* next packet */
-	  tph->tp_status = TP_STATUS_KERNEL;
-	  rx_frame = (rx_frame + 1) % frame_num;
-	  tph = (struct tpacket2_hdr *) (block_start + rx_frame * frame_size);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  apif->next_rx_frame = rx_frame;
-
-  vlib_increment_combined_counter
-    (vnet_get_main ()->interface_main.combined_sw_if_counters
-     + VNET_INTERFACE_COUNTER_RX,
-     os_get_cpu_number (), apif->hw_if_index, n_rx_packets, n_rx_bytes);
-
-  return n_rx_packets;
-}
-
-static uword
-af_packet_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-		    vlib_frame_t * frame)
-{
-  int i;
-  u32 n_rx_packets = 0;
-
-  af_packet_main_t *apm = &af_packet_main;
-
-  /* *INDENT-OFF* */
-  clib_bitmap_foreach (i, apm->pending_input_bitmap,
-    ({
-      clib_bitmap_set (apm->pending_input_bitmap, i, 0);
-      n_rx_packets += af_packet_device_input_fn(vm, node, frame, i);
-    }));
-  /* *INDENT-ON* */
-
-  return n_rx_packets;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (af_packet_input_node) = {
-  .function = af_packet_input_fn,
-  .name = "af-packet-input",
-  .sibling_of = "device-input",
-  .format_trace = format_af_packet_input_trace,
-  .type = VLIB_NODE_TYPE_INPUT,
-  .state = VLIB_NODE_STATE_INTERRUPT,
-  .n_errors = AF_PACKET_INPUT_N_ERROR,
-  .error_strings = af_packet_input_error_strings,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (af_packet_input_node, af_packet_input_fn)
-/* *INDENT-ON* */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/devices.c b/vnet/vnet/devices/devices.c
deleted file mode 100644
index cd4386eb..00000000
--- a/vnet/vnet/devices/devices.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/devices/devices.h>
-#include <vnet/feature/feature.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-
-static uword
-device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-		 vlib_frame_t * frame)
-{
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (device_input_node) = {
-  .function = device_input_fn,
-  .name = "device-input",
-  .type = VLIB_NODE_TYPE_INPUT,
-  .state = VLIB_NODE_STATE_DISABLED,
-  .n_next_nodes = VNET_DEVICE_INPUT_N_NEXT_NODES,
-  .next_nodes = VNET_DEVICE_INPUT_NEXT_NODES,
-};
-
-/* Table defines how much we need to advance current data pointer
-   in the buffer if we shortcut to l3 nodes */
-
-const u32 __attribute__((aligned (CLIB_CACHE_LINE_BYTES)))
-device_input_next_node_advance[((VNET_DEVICE_INPUT_N_NEXT_NODES /
-				CLIB_CACHE_LINE_BYTES) +1) * CLIB_CACHE_LINE_BYTES] =
-{
-      [VNET_DEVICE_INPUT_NEXT_IP4_INPUT] = sizeof (ethernet_header_t),
-      [VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT] = sizeof (ethernet_header_t),
-      [VNET_DEVICE_INPUT_NEXT_IP6_INPUT] = sizeof (ethernet_header_t),
-      [VNET_DEVICE_INPUT_NEXT_MPLS_INPUT] = sizeof (ethernet_header_t),
-};
-
-VNET_FEATURE_ARC_INIT (device_input, static) =
-{
-  .arc_name  = "device-input",
-  .start_nodes = VNET_FEATURES ("device-input"),
-  .end_node = "ethernet-input",
-  .arc_index_ptr = &feature_main.device_input_feature_arc_index,
-};
-
-VNET_FEATURE_INIT (l2_patch, static) = {
-  .arc_name = "device-input",
-  .node_name = "l2-patch",
-  .runs_before = VNET_FEATURES ("ethernet-input"),
-};
-
-VNET_FEATURE_INIT (worker_handoff, static) = {
-  .arc_name = "device-input",
-  .node_name = "worker-handoff",
-  .runs_before = VNET_FEATURES ("ethernet-input"),
-};
-
-VNET_FEATURE_INIT (span_input, static) = {
-  .arc_name = "device-input",
-  .node_name = "span-input",
-  .runs_before = VNET_FEATURES ("ethernet-input"),
-};
-
-VNET_FEATURE_INIT (ethernet_input, static) = {
-  .arc_name = "device-input",
-  .node_name = "ethernet-input",
-  .runs_before = 0, /* not before any other features */
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/devices.h b/vnet/vnet/devices/devices.h
deleted file mode 100644
index c46dab90..00000000
--- a/vnet/vnet/devices/devices.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_vnet_vnet_device_h
-#define included_vnet_vnet_device_h
-
-#include <vnet/unix/pcap.h>
-#include <vnet/l3_types.h>
-
-typedef enum
-{
-  VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT,
-  VNET_DEVICE_INPUT_NEXT_IP4_INPUT,
-  VNET_DEVICE_INPUT_NEXT_IP6_INPUT,
-  VNET_DEVICE_INPUT_NEXT_MPLS_INPUT,
-  VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT,
-  VNET_DEVICE_INPUT_NEXT_DROP,
-  VNET_DEVICE_INPUT_N_NEXT_NODES,
-} vnet_device_input_next_t;
-
-#define VNET_DEVICE_INPUT_NEXT_NODES {					\
-    [VNET_DEVICE_INPUT_NEXT_DROP] = "error-drop",			\
-    [VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT] = "ethernet-input",		\
-    [VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT] = "ip4-input-no-checksum",	\
-    [VNET_DEVICE_INPUT_NEXT_IP4_INPUT] = "ip4-input",			\
-    [VNET_DEVICE_INPUT_NEXT_IP6_INPUT] = "ip6-input",			\
-    [VNET_DEVICE_INPUT_NEXT_MPLS_INPUT] = "mpls-input",			\
-}
-
-extern vlib_node_registration_t device_input_node;
-extern const u32 device_input_next_node_advance[];
-
-#endif /* included_vnet_vnet_device_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/cli.c b/vnet/vnet/devices/dpdk/cli.c
deleted file mode 100644
index 538a00fd..00000000
--- a/vnet/vnet/devices/dpdk/cli.c
+++ /dev/null
@@ -1,1296 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/vnet.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/error.h>
-#include <vppinfra/format.h>
-#include <vppinfra/xxhash.h>
-
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/devices/dpdk/dpdk.h>
-#include <vnet/classify/vnet_classify.h>
-#include <vnet/mpls/packet.h>
-
-#include "dpdk_priv.h"
-
-static clib_error_t *
-pcap_trace_command_fn (vlib_main_t * vm,
-		       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  dpdk_main_t *dm = &dpdk_main;
-  u8 *filename;
-  u32 max;
-  int matched = 0;
-  clib_error_t *error = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "on"))
-	{
-	  if (dm->tx_pcap_enable == 0)
-	    {
-	      if (dm->pcap_filename == 0)
-		dm->pcap_filename = format (0, "/tmp/vpe.pcap%c", 0);
-
-	      memset (&dm->pcap_main, 0, sizeof (dm->pcap_main));
-	      dm->pcap_main.file_name = (char *) dm->pcap_filename;
-	      dm->pcap_main.n_packets_to_capture = 100;
-	      if (dm->pcap_pkts_to_capture)
-		dm->pcap_main.n_packets_to_capture = dm->pcap_pkts_to_capture;
-
-	      dm->pcap_main.packet_type = PCAP_PACKET_TYPE_ethernet;
-	      dm->tx_pcap_enable = 1;
-	      matched = 1;
-	      vlib_cli_output (vm, "pcap tx capture on...");
-	    }
-	  else
-	    {
-	      vlib_cli_output (vm, "pcap tx capture already on...");
-	    }
-	  matched = 1;
-	}
-      else if (unformat (input, "off"))
-	{
-	  if (dm->tx_pcap_enable)
-	    {
-	      vlib_cli_output (vm, "captured %d pkts...",
-			       dm->pcap_main.n_packets_captured + 1);
-	      if (dm->pcap_main.n_packets_captured)
-		{
-		  dm->pcap_main.n_packets_to_capture =
-		    dm->pcap_main.n_packets_captured;
-		  error = pcap_write (&dm->pcap_main);
-		  if (error)
-		    clib_error_report (error);
-		  else
-		    vlib_cli_output (vm, "saved to %s...", dm->pcap_filename);
-		}
-	    }
-	  else
-	    {
-	      vlib_cli_output (vm, "pcap tx capture already off...");
-	    }
-
-	  dm->tx_pcap_enable = 0;
-	  matched = 1;
-	}
-      else if (unformat (input, "max %d", &max))
-	{
-	  dm->pcap_pkts_to_capture = max;
-	  matched = 1;
-	}
-
-      else if (unformat (input, "intfc %U",
-			 unformat_vnet_sw_interface, dm->vnet_main,
-			 &dm->pcap_sw_if_index))
-	matched = 1;
-      else if (unformat (input, "intfc any"))
-	{
-	  dm->pcap_sw_if_index = 0;
-	  matched = 1;
-	}
-      else if (unformat (input, "file %s", &filename))
-	{
-	  u8 *chroot_filename;
-	  /* Brain-police user path input */
-	  if (strstr ((char *) filename, "..")
-	      || index ((char *) filename, '/'))
-	    {
-	      vlib_cli_output (vm, "illegal characters in filename '%s'",
-			       filename);
-	      continue;
-	    }
-
-	  chroot_filename = format (0, "/tmp/%s%c", filename, 0);
-	  vec_free (filename);
-
-	  if (dm->pcap_filename)
-	    vec_free (dm->pcap_filename);
-	  vec_add1 (filename, 0);
-	  dm->pcap_filename = chroot_filename;
-	  matched = 1;
-	}
-      else if (unformat (input, "status"))
-	{
-	  if (dm->tx_pcap_enable == 0)
-	    {
-	      vlib_cli_output (vm, "pcap tx capture is off...");
-	      continue;
-	    }
-
-	  vlib_cli_output (vm, "pcap tx capture: %d of %d pkts...",
-			   dm->pcap_main.n_packets_captured,
-			   dm->pcap_main.n_packets_to_capture);
-	  matched = 1;
-	}
-
-      else
-	break;
-    }
-
-  if (matched == 0)
-    return clib_error_return (0, "unknown input `%U'",
-			      format_unformat_error, input);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (pcap_trace_command, static) = {
-    .path = "pcap tx trace",
-    .short_help =
-    "pcap tx trace on off max <nn> intfc <intfc> file <name> status",
-    .function = pcap_trace_command_fn,
-};
-/* *INDENT-ON* */
-
-
-static clib_error_t *
-show_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input,
-		  vlib_cli_command_t * cmd)
-{
-  struct rte_mempool *rmp;
-  int i;
-
-  for (i = 0; i < vec_len (vm->buffer_main->pktmbuf_pools); i++)
-    {
-      rmp = vm->buffer_main->pktmbuf_pools[i];
-      if (rmp)
-	{
-	  unsigned count = rte_mempool_avail_count (rmp);
-	  unsigned free_count = rte_mempool_in_use_count (rmp);
-
-	  vlib_cli_output (vm,
-			   "name=\"%s\"  available = %7d allocated = %7d total = %7d\n",
-			   rmp->name, (u32) count, (u32) free_count,
-			   (u32) (count + free_count));
-	}
-      else
-	{
-	  vlib_cli_output (vm, "rte_mempool is NULL (!)\n");
-	}
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_show_dpdk_bufferr,static) = {
-    .path = "show dpdk buffer",
-    .short_help = "show dpdk buffer state",
-    .function = show_dpdk_buffer,
-    .is_mp_safe = 1,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-test_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input,
-		  vlib_cli_command_t * cmd)
-{
-  static u32 *allocated_buffers;
-  u32 n_alloc = 0;
-  u32 n_free = 0;
-  u32 first, actual_alloc;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "allocate %d", &n_alloc))
-	;
-      else if (unformat (input, "free %d", &n_free))
-	;
-      else
-	break;
-    }
-
-  if (n_free)
-    {
-      if (vec_len (allocated_buffers) < n_free)
-	return clib_error_return (0, "Can't free %d, only %d allocated",
-				  n_free, vec_len (allocated_buffers));
-
-      first = vec_len (allocated_buffers) - n_free;
-      vlib_buffer_free (vm, allocated_buffers + first, n_free);
-      _vec_len (allocated_buffers) = first;
-    }
-  if (n_alloc)
-    {
-      first = vec_len (allocated_buffers);
-      vec_validate (allocated_buffers,
-		    vec_len (allocated_buffers) + n_alloc - 1);
-
-      actual_alloc = vlib_buffer_alloc (vm, allocated_buffers + first,
-					n_alloc);
-      _vec_len (allocated_buffers) = first + actual_alloc;
-
-      if (actual_alloc < n_alloc)
-	vlib_cli_output (vm, "WARNING: only allocated %d buffers",
-			 actual_alloc);
-    }
-
-  vlib_cli_output (vm, "Currently %d buffers allocated",
-		   vec_len (allocated_buffers));
-
-  if (allocated_buffers && vec_len (allocated_buffers) == 0)
-    vec_free (allocated_buffers);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_test_dpdk_buffer,static) = {
-    .path = "test dpdk buffer",
-    .short_help = "test dpdk buffer [allocate <nn>][free <nn>]",
-    .function = test_dpdk_buffer,
-    .is_mp_safe = 1,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_dpdk_if_desc (vlib_main_t * vm, unformat_input_t * input,
-		  vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  dpdk_main_t *dm = &dpdk_main;
-  vnet_hw_interface_t *hw;
-  dpdk_device_t *xd;
-  u32 hw_if_index = (u32) ~ 0;
-  u32 nb_rx_desc = (u32) ~ 0;
-  u32 nb_tx_desc = (u32) ~ 0;
-  clib_error_t *rv;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
-	   &hw_if_index))
-	;
-      else if (unformat (line_input, "tx %d", &nb_tx_desc))
-	;
-      else if (unformat (line_input, "rx %d", &nb_rx_desc))
-	;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (hw_if_index == (u32) ~ 0)
-    return clib_error_return (0, "please specify valid interface name");
-
-  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
-  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
-
-  if ((xd->flags & DPDK_DEVICE_FLAG_PMD) == 0)
-    return clib_error_return (0, "number of descriptors can be set only for "
-			      "physical devices");
-
-  if ((nb_rx_desc == (u32) ~ 0 || nb_rx_desc == xd->nb_rx_desc) &&
-      (nb_tx_desc == (u32) ~ 0 || nb_tx_desc == xd->nb_tx_desc))
-    return clib_error_return (0, "nothing changed");
-
-  if (nb_rx_desc != (u32) ~ 0)
-    xd->nb_rx_desc = nb_rx_desc;
-
-  if (nb_tx_desc != (u32) ~ 0)
-    xd->nb_tx_desc = nb_tx_desc;
-
-  rv = dpdk_port_setup (dm, xd);
-
-  return rv;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_set_dpdk_if_desc,static) = {
-    .path = "set dpdk interface descriptors",
-    .short_help = "set dpdk interface descriptors <if-name> [rx <n>] [tx <n>]",
-    .function = set_dpdk_if_desc,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-show_dpdk_if_placement (vlib_main_t * vm, unformat_input_t * input,
-			vlib_cli_command_t * cmd)
-{
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_and_queue_t *dq;
-  int cpu;
-
-  if (tm->n_vlib_mains == 1)
-    vlib_cli_output (vm, "All interfaces are handled by main thread");
-
-  for (cpu = 0; cpu < vec_len (dm->devices_by_cpu); cpu++)
-    {
-      if (vec_len (dm->devices_by_cpu[cpu]))
-	vlib_cli_output (vm, "Thread %u (%s at lcore %u):", cpu,
-			 vlib_worker_threads[cpu].name,
-			 vlib_worker_threads[cpu].lcore_id);
-
-      /* *INDENT-OFF* */
-      vec_foreach(dq, dm->devices_by_cpu[cpu])
-        {
-          u32 hw_if_index = dm->devices[dq->device].vlib_hw_if_index;
-          vnet_hw_interface_t * hi =  vnet_get_hw_interface(dm->vnet_main, hw_if_index);
-          vlib_cli_output(vm, "  %v queue %u", hi->name, dq->queue_id);
-        }
-      /* *INDENT-ON* */
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_show_dpdk_if_placement,static) = {
-    .path = "show dpdk interface placement",
-    .short_help = "show dpdk interface placement",
-    .function = show_dpdk_if_placement,
-};
-/* *INDENT-ON* */
-
-static int
-dpdk_device_queue_sort (void *a1, void *a2)
-{
-  dpdk_device_and_queue_t *dq1 = a1;
-  dpdk_device_and_queue_t *dq2 = a2;
-
-  if (dq1->device > dq2->device)
-    return 1;
-  else if (dq1->device < dq2->device)
-    return -1;
-  else if (dq1->queue_id > dq2->queue_id)
-    return 1;
-  else if (dq1->queue_id < dq2->queue_id)
-    return -1;
-  else
-    return 0;
-}
-
-static clib_error_t *
-set_dpdk_if_placement (vlib_main_t * vm, unformat_input_t * input,
-		       vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_and_queue_t *dq;
-  vnet_hw_interface_t *hw;
-  dpdk_device_t *xd;
-  u32 hw_if_index = (u32) ~ 0;
-  u32 queue = (u32) 0;
-  u32 cpu = (u32) ~ 0;
-  int i;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
-	   &hw_if_index))
-	;
-      else if (unformat (line_input, "queue %d", &queue))
-	;
-      else if (unformat (line_input, "thread %d", &cpu))
-	;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (hw_if_index == (u32) ~ 0)
-    return clib_error_return (0, "please specify valid interface name");
-
-  if (cpu < dm->input_cpu_first_index ||
-      cpu >= (dm->input_cpu_first_index + dm->input_cpu_count))
-    return clib_error_return (0, "please specify valid thread id");
-
-  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
-  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
-
-  for (i = 0; i < vec_len (dm->devices_by_cpu); i++)
-    {
-      /* *INDENT-OFF* */
-      vec_foreach(dq, dm->devices_by_cpu[i])
-        {
-          if (hw_if_index == dm->devices[dq->device].vlib_hw_if_index &&
-              queue == dq->queue_id)
-            {
-              if (cpu == i) /* nothing to do */
-                return 0;
-
-              vec_del1(dm->devices_by_cpu[i], dq - dm->devices_by_cpu[i]);
-              vec_add2(dm->devices_by_cpu[cpu], dq, 1);
-              dq->queue_id = queue;
-              dq->device = xd->device_index;
-              xd->cpu_socket_id_by_queue[queue] =
-                rte_lcore_to_socket_id(vlib_worker_threads[cpu].lcore_id);
-
-              vec_sort_with_function(dm->devices_by_cpu[i],
-                                     dpdk_device_queue_sort);
-
-              vec_sort_with_function(dm->devices_by_cpu[cpu],
-                                     dpdk_device_queue_sort);
-
-              if (vec_len(dm->devices_by_cpu[i]) == 0)
-                vlib_node_set_state (vlib_mains[i], dpdk_input_node.index,
-                                     VLIB_NODE_STATE_DISABLED);
-
-              if (vec_len(dm->devices_by_cpu[cpu]) == 1)
-                vlib_node_set_state (vlib_mains[cpu], dpdk_input_node.index,
-                                     VLIB_NODE_STATE_POLLING);
-
-              return 0;
-            }
-        }
-      /* *INDENT-ON* */
-    }
-
-  return clib_error_return (0, "not found");
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_set_dpdk_if_placement,static) = {
-    .path = "set dpdk interface placement",
-    .short_help = "set dpdk interface placement <if-name> [queue <n>]  thread <n>",
-    .function = set_dpdk_if_placement,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-show_dpdk_if_hqos_placement (vlib_main_t * vm, unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_and_queue_t *dq;
-  int cpu;
-
-  if (tm->n_vlib_mains == 1)
-    vlib_cli_output (vm, "All interfaces are handled by main thread");
-
-  for (cpu = 0; cpu < vec_len (dm->devices_by_hqos_cpu); cpu++)
-    {
-      if (vec_len (dm->devices_by_hqos_cpu[cpu]))
-	vlib_cli_output (vm, "Thread %u (%s at lcore %u):", cpu,
-			 vlib_worker_threads[cpu].name,
-			 vlib_worker_threads[cpu].lcore_id);
-
-      vec_foreach (dq, dm->devices_by_hqos_cpu[cpu])
-      {
-	u32 hw_if_index = dm->devices[dq->device].vlib_hw_if_index;
-	vnet_hw_interface_t *hi =
-	  vnet_get_hw_interface (dm->vnet_main, hw_if_index);
-	vlib_cli_output (vm, "  %v queue %u", hi->name, dq->queue_id);
-      }
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_show_dpdk_if_hqos_placement, static) = {
-  .path = "show dpdk interface hqos placement",
-  .short_help = "show dpdk interface hqos placement",
-  .function = show_dpdk_if_hqos_placement,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_dpdk_if_hqos_placement (vlib_main_t * vm, unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_and_queue_t *dq;
-  vnet_hw_interface_t *hw;
-  dpdk_device_t *xd;
-  u32 hw_if_index = (u32) ~ 0;
-  u32 cpu = (u32) ~ 0;
-  int i;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
-	   &hw_if_index))
-	;
-      else if (unformat (line_input, "thread %d", &cpu))
-	;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (hw_if_index == (u32) ~ 0)
-    return clib_error_return (0, "please specify valid interface name");
-
-  if (cpu < dm->hqos_cpu_first_index ||
-      cpu >= (dm->hqos_cpu_first_index + dm->hqos_cpu_count))
-    return clib_error_return (0, "please specify valid thread id");
-
-  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
-  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
-
-  for (i = 0; i < vec_len (dm->devices_by_hqos_cpu); i++)
-    {
-      vec_foreach (dq, dm->devices_by_hqos_cpu[i])
-      {
-	if (hw_if_index == dm->devices[dq->device].vlib_hw_if_index)
-	  {
-	    if (cpu == i)	/* nothing to do */
-	      return 0;
-
-	    vec_del1 (dm->devices_by_hqos_cpu[i],
-		      dq - dm->devices_by_hqos_cpu[i]);
-	    vec_add2 (dm->devices_by_hqos_cpu[cpu], dq, 1);
-	    dq->queue_id = 0;
-	    dq->device = xd->device_index;
-
-	    vec_sort_with_function (dm->devices_by_hqos_cpu[i],
-				    dpdk_device_queue_sort);
-
-	    vec_sort_with_function (dm->devices_by_hqos_cpu[cpu],
-				    dpdk_device_queue_sort);
-
-	    return 0;
-	  }
-      }
-    }
-
-  return clib_error_return (0, "not found");
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_set_dpdk_if_hqos_placement, static) = {
-  .path = "set dpdk interface hqos placement",
-  .short_help = "set dpdk interface hqos placement <if-name> thread <n>",
-  .function = set_dpdk_if_hqos_placement,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_dpdk_if_hqos_pipe (vlib_main_t * vm, unformat_input_t * input,
-		       vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  dpdk_main_t *dm = &dpdk_main;
-  vnet_hw_interface_t *hw;
-  dpdk_device_t *xd;
-  u32 hw_if_index = (u32) ~ 0;
-  u32 subport_id = (u32) ~ 0;
-  u32 pipe_id = (u32) ~ 0;
-  u32 profile_id = (u32) ~ 0;
-  int rv;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
-	   &hw_if_index))
-	;
-      else if (unformat (line_input, "subport %d", &subport_id))
-	;
-      else if (unformat (line_input, "pipe %d", &pipe_id))
-	;
-      else if (unformat (line_input, "profile %d", &profile_id))
-	;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (hw_if_index == (u32) ~ 0)
-    return clib_error_return (0, "please specify valid interface name");
-
-  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
-  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
-
-  rv =
-    rte_sched_pipe_config (xd->hqos_ht->hqos, subport_id, pipe_id,
-			   profile_id);
-  if (rv)
-    return clib_error_return (0, "pipe configuration failed");
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_set_dpdk_if_hqos_pipe, static) =
-{
-  .path = "set dpdk interface hqos pipe",
-  .short_help = "set dpdk interface hqos pipe <if-name> subport <n> pipe <n> "
-                  "profile <n>",
-  .function = set_dpdk_if_hqos_pipe,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_dpdk_if_hqos_subport (vlib_main_t * vm, unformat_input_t * input,
-			  vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  dpdk_main_t *dm = &dpdk_main;
-  vnet_hw_interface_t *hw;
-  dpdk_device_t *xd;
-  u32 hw_if_index = (u32) ~ 0;
-  u32 subport_id = (u32) ~ 0;
-  struct rte_sched_subport_params p = {
-    .tb_rate = 1250000000,	/* 10GbE */
-    .tb_size = 1000000,
-    .tc_rate = {1250000000, 1250000000, 1250000000, 1250000000},
-    .tc_period = 10,
-  };
-  int rv;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
-	   &hw_if_index))
-	;
-      else if (unformat (line_input, "subport %d", &subport_id))
-	;
-      else if (unformat (line_input, "rate %d", &p.tb_rate))
-	{
-	  p.tc_rate[0] = p.tb_rate;
-	  p.tc_rate[1] = p.tb_rate;
-	  p.tc_rate[2] = p.tb_rate;
-	  p.tc_rate[3] = p.tb_rate;
-	}
-      else if (unformat (line_input, "bktsize %d", &p.tb_size))
-	;
-      else if (unformat (line_input, "tc0 %d", &p.tc_rate[0]))
-	;
-      else if (unformat (line_input, "tc1 %d", &p.tc_rate[1]))
-	;
-      else if (unformat (line_input, "tc2 %d", &p.tc_rate[2]))
-	;
-      else if (unformat (line_input, "tc3 %d", &p.tc_rate[3]))
-	;
-      else if (unformat (line_input, "period %d", &p.tc_period))
-	;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (hw_if_index == (u32) ~ 0)
-    return clib_error_return (0, "please specify valid interface name");
-
-  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
-  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
-
-  rv = rte_sched_subport_config (xd->hqos_ht->hqos, subport_id, &p);
-  if (rv)
-    return clib_error_return (0, "subport configuration failed");
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_set_dpdk_if_hqos_subport, static) = {
-  .path = "set dpdk interface hqos subport",
-  .short_help = "set dpdk interface hqos subport <if-name> subport <n> "
-                 "[rate <n>] [bktsize <n>] [tc0 <n>] [tc1 <n>] [tc2 <n>] [tc3 <n>] "
-                 "[period <n>]",
-  .function = set_dpdk_if_hqos_subport,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_dpdk_if_hqos_tctbl (vlib_main_t * vm, unformat_input_t * input,
-			vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  dpdk_main_t *dm = &dpdk_main;
-  vnet_hw_interface_t *hw;
-  dpdk_device_t *xd;
-  u32 hw_if_index = (u32) ~ 0;
-  u32 tc = (u32) ~ 0;
-  u32 queue = (u32) ~ 0;
-  u32 entry = (u32) ~ 0;
-  u32 val, i;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
-	   &hw_if_index))
-	;
-      else if (unformat (line_input, "entry %d", &entry))
-	;
-      else if (unformat (line_input, "tc %d", &tc))
-	;
-      else if (unformat (line_input, "queue %d", &queue))
-	;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (hw_if_index == (u32) ~ 0)
-    return clib_error_return (0, "please specify valid interface name");
-  if (entry >= 64)
-    return clib_error_return (0, "invalid entry");
-  if (tc >= RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE)
-    return clib_error_return (0, "invalid traffic class");
-  if (queue >= RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS)
-    return clib_error_return (0, "invalid traffic class");
-
-  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
-  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
-
-  /* Detect the set of worker threads */
-  uword *p = hash_get_mem (tm->thread_registrations_by_name, "workers");
-  /* Should never happen, shut up Coverity warning */
-  if (p == 0)
-    return clib_error_return (0, "no worker registrations?");
-
-  vlib_thread_registration_t *tr = (vlib_thread_registration_t *) p[0];
-  int worker_thread_first = tr->first_index;
-  int worker_thread_count = tr->count;
-
-  val = tc * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + queue;
-  for (i = 0; i < worker_thread_count; i++)
-    xd->hqos_wt[worker_thread_first + i].hqos_tc_table[entry] = val;
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_set_dpdk_if_hqos_tctbl, static) = {
-  .path = "set dpdk interface hqos tctbl",
-  .short_help = "set dpdk interface hqos tctbl <if-name> entry <n> tc <n> queue <n>",
-  .function = set_dpdk_if_hqos_tctbl,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_dpdk_if_hqos_pktfield (vlib_main_t * vm, unformat_input_t * input,
-			   vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  dpdk_main_t *dm = &dpdk_main;
-
-  /* Device specific data */
-  struct rte_eth_dev_info dev_info;
-  dpdk_device_config_t *devconf = 0;
-  vnet_hw_interface_t *hw;
-  dpdk_device_t *xd;
-  u32 hw_if_index = (u32) ~ 0;
-
-  /* Detect the set of worker threads */
-  uword *p = hash_get_mem (tm->thread_registrations_by_name, "workers");
-  /* Should never happen, shut up Coverity warning */
-  if (p == 0)
-    return clib_error_return (0, "no worker registrations?");
-
-  vlib_thread_registration_t *tr = (vlib_thread_registration_t *) p[0];
-  int worker_thread_first = tr->first_index;
-  int worker_thread_count = tr->count;
-
-  /* Packet field configuration */
-  u64 mask = (u64) ~ 0;
-  u32 id = (u32) ~ 0;
-  u32 offset = (u32) ~ 0;
-
-  /* HQoS params */
-  u32 n_subports_per_port, n_pipes_per_subport, tctbl_size;
-
-  u32 i;
-
-  /* Parse input arguments */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
-	   &hw_if_index))
-	;
-      else if (unformat (line_input, "id %d", &id))
-	;
-      else if (unformat (line_input, "offset %d", &offset))
-	;
-      else if (unformat (line_input, "mask %llx", &mask))
-	;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  /* Get interface */
-  if (hw_if_index == (u32) ~ 0)
-    return clib_error_return (0, "please specify valid interface name");
-
-  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
-  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
-
-  rte_eth_dev_info_get (xd->device_index, &dev_info);
-  if (dev_info.pci_dev)
-    {				/* bonded interface has no pci info */
-      vlib_pci_addr_t pci_addr;
-
-      pci_addr.domain = dev_info.pci_dev->addr.domain;
-      pci_addr.bus = dev_info.pci_dev->addr.bus;
-      pci_addr.slot = dev_info.pci_dev->addr.devid;
-      pci_addr.function = dev_info.pci_dev->addr.function;
-
-      p =
-	hash_get (dm->conf->device_config_index_by_pci_addr, pci_addr.as_u32);
-    }
-
-  if (p)
-    devconf = pool_elt_at_index (dm->conf->dev_confs, p[0]);
-  else
-    devconf = &dm->conf->default_devconf;
-
-  if (devconf->hqos_enabled == 0)
-    {
-      vlib_cli_output (vm, "HQoS disabled for this interface");
-      return 0;
-    }
-
-  n_subports_per_port = devconf->hqos.port.n_subports_per_port;
-  n_pipes_per_subport = devconf->hqos.port.n_pipes_per_subport;
-  tctbl_size = RTE_DIM (devconf->hqos.tc_table);
-
-  /* Validate packet field configuration: id, offset and mask */
-  if (id >= 3)
-    return clib_error_return (0, "invalid packet field id");
-
-  switch (id)
-    {
-    case 0:
-      if (dpdk_hqos_validate_mask (mask, n_subports_per_port) != 0)
-	return clib_error_return (0, "invalid subport ID mask "
-				  "(n_subports_per_port = %u)",
-				  n_subports_per_port);
-      break;
-    case 1:
-      if (dpdk_hqos_validate_mask (mask, n_pipes_per_subport) != 0)
-	return clib_error_return (0, "invalid pipe ID mask "
-				  "(n_pipes_per_subport = %u)",
-				  n_pipes_per_subport);
-      break;
-    case 2:
-    default:
-      if (dpdk_hqos_validate_mask (mask, tctbl_size) != 0)
-	return clib_error_return (0, "invalid TC table index mask "
-				  "(TC table size = %u)", tctbl_size);
-    }
-
-  /* Propagate packet field configuration to all workers */
-  for (i = 0; i < worker_thread_count; i++)
-    switch (id)
-      {
-      case 0:
-	xd->hqos_wt[worker_thread_first + i].hqos_field0_slabpos = offset;
-	xd->hqos_wt[worker_thread_first + i].hqos_field0_slabmask = mask;
-	xd->hqos_wt[worker_thread_first + i].hqos_field0_slabshr =
-	  __builtin_ctzll (mask);
-	break;
-      case 1:
-	xd->hqos_wt[worker_thread_first + i].hqos_field1_slabpos = offset;
-	xd->hqos_wt[worker_thread_first + i].hqos_field1_slabmask = mask;
-	xd->hqos_wt[worker_thread_first + i].hqos_field1_slabshr =
-	  __builtin_ctzll (mask);
-	break;
-      case 2:
-      default:
-	xd->hqos_wt[worker_thread_first + i].hqos_field2_slabpos = offset;
-	xd->hqos_wt[worker_thread_first + i].hqos_field2_slabmask = mask;
-	xd->hqos_wt[worker_thread_first + i].hqos_field2_slabshr =
-	  __builtin_ctzll (mask);
-      }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_set_dpdk_if_hqos_pktfield, static) = {
-  .path = "set dpdk interface hqos pktfield",
-  .short_help = "set dpdk interface hqos pktfield <if-name> id <n> offset <n> "
-                 "mask <n>",
-  .function = set_dpdk_if_hqos_pktfield,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-show_dpdk_if_hqos (vlib_main_t * vm, unformat_input_t * input,
-		   vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  dpdk_main_t *dm = &dpdk_main;
-  vnet_hw_interface_t *hw;
-  dpdk_device_t *xd;
-  dpdk_device_config_hqos_t *cfg;
-  dpdk_device_hqos_per_hqos_thread_t *ht;
-  dpdk_device_hqos_per_worker_thread_t *wk;
-  u32 *tctbl;
-  u32 hw_if_index = (u32) ~ 0;
-  u32 profile_id, i;
-  struct rte_eth_dev_info dev_info;
-  dpdk_device_config_t *devconf = 0;
-  vlib_thread_registration_t *tr;
-  uword *p = 0;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
-	   &hw_if_index))
-	;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (hw_if_index == (u32) ~ 0)
-    return clib_error_return (0, "please specify interface name!!");
-
-  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
-  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
-
-  rte_eth_dev_info_get (xd->device_index, &dev_info);
-  if (dev_info.pci_dev)
-    {				/* bonded interface has no pci info */
-      vlib_pci_addr_t pci_addr;
-
-      pci_addr.domain = dev_info.pci_dev->addr.domain;
-      pci_addr.bus = dev_info.pci_dev->addr.bus;
-      pci_addr.slot = dev_info.pci_dev->addr.devid;
-      pci_addr.function = dev_info.pci_dev->addr.function;
-
-      p =
-	hash_get (dm->conf->device_config_index_by_pci_addr, pci_addr.as_u32);
-    }
-
-  if (p)
-    devconf = pool_elt_at_index (dm->conf->dev_confs, p[0]);
-  else
-    devconf = &dm->conf->default_devconf;
-
-  if (devconf->hqos_enabled == 0)
-    {
-      vlib_cli_output (vm, "HQoS disabled for this interface");
-      return 0;
-    }
-
-  /* Detect the set of worker threads */
-  p = hash_get_mem (tm->thread_registrations_by_name, "workers");
-
-  /* Should never happen, shut up Coverity warning */
-  if (p == 0)
-    return clib_error_return (0, "no worker registrations?");
-
-  tr = (vlib_thread_registration_t *) p[0];
-
-  cfg = &devconf->hqos;
-  ht = xd->hqos_ht;
-  wk = &xd->hqos_wt[tr->first_index];
-  tctbl = wk->hqos_tc_table;
-
-  vlib_cli_output (vm, " Thread:");
-  vlib_cli_output (vm, "   Input SWQ size = %u packets", cfg->swq_size);
-  vlib_cli_output (vm, "   Enqueue burst size = %u packets",
-		   ht->hqos_burst_enq);
-  vlib_cli_output (vm, "   Dequeue burst size = %u packets",
-		   ht->hqos_burst_deq);
-
-  vlib_cli_output (vm,
-		   "   Packet field 0: slab position = %4u, slab bitmask = 0x%016llx",
-		   wk->hqos_field0_slabpos, wk->hqos_field0_slabmask);
-  vlib_cli_output (vm,
-		   "   Packet field 1: slab position = %4u, slab bitmask = 0x%016llx",
-		   wk->hqos_field1_slabpos, wk->hqos_field1_slabmask);
-  vlib_cli_output (vm,
-		   "   Packet field 2: slab position = %4u, slab bitmask = 0x%016llx",
-		   wk->hqos_field2_slabpos, wk->hqos_field2_slabmask);
-  vlib_cli_output (vm, "   Packet field 2 translation table:");
-  vlib_cli_output (vm, "     [ 0 .. 15]: "
-		   "%2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u",
-		   tctbl[0], tctbl[1], tctbl[2], tctbl[3],
-		   tctbl[4], tctbl[5], tctbl[6], tctbl[7],
-		   tctbl[8], tctbl[9], tctbl[10], tctbl[11],
-		   tctbl[12], tctbl[13], tctbl[14], tctbl[15]);
-  vlib_cli_output (vm, "     [16 .. 31]: "
-		   "%2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u",
-		   tctbl[16], tctbl[17], tctbl[18], tctbl[19],
-		   tctbl[20], tctbl[21], tctbl[22], tctbl[23],
-		   tctbl[24], tctbl[25], tctbl[26], tctbl[27],
-		   tctbl[28], tctbl[29], tctbl[30], tctbl[31]);
-  vlib_cli_output (vm, "     [32 .. 47]: "
-		   "%2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u",
-		   tctbl[32], tctbl[33], tctbl[34], tctbl[35],
-		   tctbl[36], tctbl[37], tctbl[38], tctbl[39],
-		   tctbl[40], tctbl[41], tctbl[42], tctbl[43],
-		   tctbl[44], tctbl[45], tctbl[46], tctbl[47]);
-  vlib_cli_output (vm, "     [48 .. 63]: "
-		   "%2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u %2u",
-		   tctbl[48], tctbl[49], tctbl[50], tctbl[51],
-		   tctbl[52], tctbl[53], tctbl[54], tctbl[55],
-		   tctbl[56], tctbl[57], tctbl[58], tctbl[59],
-		   tctbl[60], tctbl[61], tctbl[62], tctbl[63]);
-
-  vlib_cli_output (vm, " Port:");
-  vlib_cli_output (vm, "   Rate = %u bytes/second", cfg->port.rate);
-  vlib_cli_output (vm, "   MTU = %u bytes", cfg->port.mtu);
-  vlib_cli_output (vm, "   Frame overhead = %u bytes",
-		   cfg->port.frame_overhead);
-  vlib_cli_output (vm, "   Number of subports = %u",
-		   cfg->port.n_subports_per_port);
-  vlib_cli_output (vm, "   Number of pipes per subport = %u",
-		   cfg->port.n_pipes_per_subport);
-  vlib_cli_output (vm,
-		   "   Packet queue size: TC0 = %u, TC1 = %u, TC2 = %u, TC3 = %u packets",
-		   cfg->port.qsize[0], cfg->port.qsize[1], cfg->port.qsize[2],
-		   cfg->port.qsize[3]);
-  vlib_cli_output (vm, "   Number of pipe profiles = %u",
-		   cfg->port.n_pipe_profiles);
-
-  for (profile_id = 0; profile_id < vec_len (cfg->pipe); profile_id++)
-    {
-      vlib_cli_output (vm, " Pipe profile %u:", profile_id);
-      vlib_cli_output (vm, "   Rate = %u bytes/second",
-		       cfg->pipe[profile_id].tb_rate);
-      vlib_cli_output (vm, "   Token bucket size = %u bytes",
-		       cfg->pipe[profile_id].tb_size);
-      vlib_cli_output (vm,
-		       "   Traffic class rate: TC0 = %u, TC1 = %u, TC2 = %u, TC3 = %u bytes/second",
-		       cfg->pipe[profile_id].tc_rate[0],
-		       cfg->pipe[profile_id].tc_rate[1],
-		       cfg->pipe[profile_id].tc_rate[2],
-		       cfg->pipe[profile_id].tc_rate[3]);
-      vlib_cli_output (vm, "   TC period = %u milliseconds",
-		       cfg->pipe[profile_id].tc_period);
-#ifdef RTE_SCHED_SUBPORT_TC_OV
-      vlib_cli_output (vm, "   TC3 oversubscription_weight = %u",
-		       cfg->pipe[profile_id].tc_ov_weight);
-#endif
-
-      for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++)
-	{
-	  vlib_cli_output (vm,
-			   "   TC%u WRR weights: Q0 = %u, Q1 = %u, Q2 = %u, Q3 = %u",
-			   i, cfg->pipe[profile_id].wrr_weights[i * 4],
-			   cfg->pipe[profile_id].wrr_weights[i * 4 + 1],
-			   cfg->pipe[profile_id].wrr_weights[i * 4 + 2],
-			   cfg->pipe[profile_id].wrr_weights[i * 4 + 3]);
-	}
-    }
-
-#ifdef RTE_SCHED_RED
-  vlib_cli_output (vm, " Weighted Random Early Detection (WRED):");
-  for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++)
-    {
-      vlib_cli_output (vm, "   TC%u min: G = %u, Y = %u, R = %u", i,
-		       cfg->port.red_params[i][e_RTE_METER_GREEN].min_th,
-		       cfg->port.red_params[i][e_RTE_METER_YELLOW].min_th,
-		       cfg->port.red_params[i][e_RTE_METER_RED].min_th);
-
-      vlib_cli_output (vm, "   TC%u max: G = %u, Y = %u, R = %u", i,
-		       cfg->port.red_params[i][e_RTE_METER_GREEN].max_th,
-		       cfg->port.red_params[i][e_RTE_METER_YELLOW].max_th,
-		       cfg->port.red_params[i][e_RTE_METER_RED].max_th);
-
-      vlib_cli_output (vm,
-		       "   TC%u inverted probability: G = %u, Y = %u, R = %u",
-		       i, cfg->port.red_params[i][e_RTE_METER_GREEN].maxp_inv,
-		       cfg->port.red_params[i][e_RTE_METER_YELLOW].maxp_inv,
-		       cfg->port.red_params[i][e_RTE_METER_RED].maxp_inv);
-
-      vlib_cli_output (vm, "   TC%u weight: R = %u, Y = %u, R = %u", i,
-		       cfg->port.red_params[i][e_RTE_METER_GREEN].wq_log2,
-		       cfg->port.red_params[i][e_RTE_METER_YELLOW].wq_log2,
-		       cfg->port.red_params[i][e_RTE_METER_RED].wq_log2);
-    }
-#endif
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_show_dpdk_if_hqos, static) = {
-  .path = "show dpdk interface hqos",
-  .short_help = "show dpdk interface hqos <if-name>",
-  .function = show_dpdk_if_hqos,
-};
-
-/* *INDENT-ON* */
-
-static clib_error_t *
-show_dpdk_hqos_queue_stats (vlib_main_t * vm, unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  dpdk_main_t *dm = &dpdk_main;
-  u32 hw_if_index = (u32) ~ 0;
-  u32 subport = (u32) ~ 0;
-  u32 pipe = (u32) ~ 0;
-  u32 tc = (u32) ~ 0;
-  u32 tc_q = (u32) ~ 0;
-  vnet_hw_interface_t *hw;
-  dpdk_device_t *xd;
-  uword *p = 0;
-  struct rte_eth_dev_info dev_info;
-  dpdk_device_config_t *devconf = 0;
-  u32 qindex;
-  struct rte_sched_queue_stats stats;
-  u16 qlen;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (line_input, "%U", unformat_vnet_hw_interface, dm->vnet_main,
-	   &hw_if_index))
-	;
-
-      else if (unformat (line_input, "subport %d", &subport))
-	;
-
-      else if (unformat (line_input, "pipe %d", &pipe))
-	;
-
-      else if (unformat (line_input, "tc %d", &tc))
-	;
-
-      else if (unformat (line_input, "tc_q %d", &tc_q))
-	;
-
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (hw_if_index == (u32) ~ 0)
-    return clib_error_return (0, "please specify interface name!!");
-
-  hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index);
-  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
-
-  rte_eth_dev_info_get (xd->device_index, &dev_info);
-  if (dev_info.pci_dev)
-    {				/* bonded interface has no pci info */
-      vlib_pci_addr_t pci_addr;
-
-      pci_addr.domain = dev_info.pci_dev->addr.domain;
-      pci_addr.bus = dev_info.pci_dev->addr.bus;
-      pci_addr.slot = dev_info.pci_dev->addr.devid;
-      pci_addr.function = dev_info.pci_dev->addr.function;
-
-      p =
-	hash_get (dm->conf->device_config_index_by_pci_addr, pci_addr.as_u32);
-    }
-
-  if (p)
-    devconf = pool_elt_at_index (dm->conf->dev_confs, p[0]);
-  else
-    devconf = &dm->conf->default_devconf;
-
-  if (devconf->hqos_enabled == 0)
-    {
-      vlib_cli_output (vm, "HQoS disabled for this interface");
-      return 0;
-    }
-
-  /*
-   * Figure out which queue to query.  cf rte_sched_port_qindex.  (Not sure why
-   * that method isn't made public by DPDK - how _should_ we get the queue ID?)
-   */
-  qindex = subport * devconf->hqos.port.n_pipes_per_subport + pipe;
-  qindex = qindex * RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE + tc;
-  qindex = qindex * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + tc_q;
-
-  if (rte_sched_queue_read_stats (xd->hqos_ht->hqos, qindex, &stats, &qlen) !=
-      0)
-    return clib_error_return (0, "failed to read stats");
-
-  vlib_cli_output (vm, "%=24s%=16s", "Stats Parameter", "Value");
-  vlib_cli_output (vm, "%=24s%=16d", "Packets", stats.n_pkts);
-  vlib_cli_output (vm, "%=24s%=16d", "Packets dropped", stats.n_pkts_dropped);
-#ifdef RTE_SCHED_RED
-  vlib_cli_output (vm, "%=24s%=16d", "Packets dropped (RED)",
-		   stats.n_pkts_red_dropped);
-#endif
-  vlib_cli_output (vm, "%=24s%=16d", "Bytes", stats.n_bytes);
-  vlib_cli_output (vm, "%=24s%=16d", "Bytes dropped", stats.n_bytes_dropped);
-
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_show_dpdk_hqos_queue_stats, static) = {
-  .path = "show dpdk hqos queue",
-  .short_help = "show dpdk hqos queue <if-name> subport <subport> pipe <pipe> tc <tc> tc_q <tc_q>",
-  .function = show_dpdk_hqos_queue_stats,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-dpdk_cli_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (dpdk_cli_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/device.c b/vnet/vnet/devices/dpdk/device.c
deleted file mode 100644
index b22fbf2e..00000000
--- a/vnet/vnet/devices/dpdk/device.c
+++ /dev/null
@@ -1,840 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/vnet.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/format.h>
-#include <vlib/unix/cj.h>
-#include <assert.h>
-
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/devices/dpdk/dpdk.h>
-
-#include "dpdk_priv.h"
-#include <vppinfra/error.h>
-
-#define foreach_dpdk_tx_func_error			\
-  _(BAD_RETVAL, "DPDK tx function returned an error")	\
-  _(RING_FULL, "Tx packet drops (ring full)")	        \
-  _(PKT_DROP, "Tx packet drops (dpdk tx failure)")	\
-  _(REPL_FAIL, "Tx packet drops (replication failure)")
-
-typedef enum
-{
-#define _(f,s) DPDK_TX_FUNC_ERROR_##f,
-  foreach_dpdk_tx_func_error
-#undef _
-    DPDK_TX_FUNC_N_ERROR,
-} dpdk_tx_func_error_t;
-
-static char *dpdk_tx_func_error_strings[] = {
-#define _(n,s) s,
-  foreach_dpdk_tx_func_error
-#undef _
-};
-
-clib_error_t *
-dpdk_set_mac_address (vnet_hw_interface_t * hi, char *address)
-{
-  int error;
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_t *xd = vec_elt_at_index (dm->devices, hi->dev_instance);
-
-  error = rte_eth_dev_default_mac_addr_set (xd->device_index,
-					    (struct ether_addr *) address);
-
-  if (error)
-    {
-      return clib_error_return (0, "mac address set failed: %d", error);
-    }
-  else
-    {
-      return NULL;
-    }
-}
-
-clib_error_t *
-dpdk_set_mc_filter (vnet_hw_interface_t * hi,
-		    struct ether_addr mc_addr_vec[], int naddr)
-{
-  int error;
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_t *xd = vec_elt_at_index (dm->devices, hi->dev_instance);
-
-  error = rte_eth_dev_set_mc_addr_list (xd->device_index, mc_addr_vec, naddr);
-
-  if (error)
-    {
-      return clib_error_return (0, "mc addr list failed: %d", error);
-    }
-  else
-    {
-      return NULL;
-    }
-}
-
-struct rte_mbuf *
-dpdk_replicate_packet_mb (vlib_buffer_t * b)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  struct rte_mbuf **mbufs = 0, *s, *d;
-  u8 nb_segs;
-  unsigned socket_id = rte_socket_id ();
-  int i;
-
-  ASSERT (bm->pktmbuf_pools[socket_id]);
-  s = rte_mbuf_from_vlib_buffer (b);
-  nb_segs = s->nb_segs;
-  vec_validate (mbufs, nb_segs - 1);
-
-  if (rte_pktmbuf_alloc_bulk (bm->pktmbuf_pools[socket_id], mbufs, nb_segs))
-    {
-      vec_free (mbufs);
-      return 0;
-    }
-
-  d = mbufs[0];
-  d->nb_segs = s->nb_segs;
-  d->data_len = s->data_len;
-  d->pkt_len = s->pkt_len;
-  d->data_off = s->data_off;
-  clib_memcpy (d->buf_addr, s->buf_addr, RTE_PKTMBUF_HEADROOM + s->data_len);
-
-  for (i = 1; i < nb_segs; i++)
-    {
-      d->next = mbufs[i];
-      d = mbufs[i];
-      s = s->next;
-      d->data_len = s->data_len;
-      clib_memcpy (d->buf_addr, s->buf_addr,
-		   RTE_PKTMBUF_HEADROOM + s->data_len);
-    }
-
-  d = mbufs[0];
-  vec_free (mbufs);
-  return d;
-}
-
-static void
-dpdk_tx_trace_buffer (dpdk_main_t * dm,
-		      vlib_node_runtime_t * node,
-		      dpdk_device_t * xd,
-		      u16 queue_id, u32 buffer_index, vlib_buffer_t * buffer)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  dpdk_tx_dma_trace_t *t0;
-  struct rte_mbuf *mb;
-
-  mb = rte_mbuf_from_vlib_buffer (buffer);
-
-  t0 = vlib_add_trace (vm, node, buffer, sizeof (t0[0]));
-  t0->queue_index = queue_id;
-  t0->device_index = xd->device_index;
-  t0->buffer_index = buffer_index;
-  clib_memcpy (&t0->mb, mb, sizeof (t0->mb));
-  clib_memcpy (&t0->buffer, buffer,
-	       sizeof (buffer[0]) - sizeof (buffer->pre_data));
-  clib_memcpy (t0->buffer.pre_data, buffer->data + buffer->current_data,
-	       sizeof (t0->buffer.pre_data));
-}
-
-static_always_inline void
-dpdk_validate_rte_mbuf (vlib_main_t * vm, vlib_buffer_t * b,
-			int maybe_multiseg)
-{
-  struct rte_mbuf *mb, *first_mb, *last_mb;
-
-  /* buffer is coming from non-dpdk source so we need to init
-     rte_mbuf header */
-  if (PREDICT_FALSE ((b->flags & VNET_BUFFER_RTE_MBUF_VALID) == 0))
-    {
-      vlib_buffer_t *b2 = b;
-      last_mb = mb = rte_mbuf_from_vlib_buffer (b2);
-      rte_pktmbuf_reset (mb);
-      while (maybe_multiseg && (b2->flags & VLIB_BUFFER_NEXT_PRESENT))
-	{
-	  b2 = vlib_get_buffer (vm, b2->next_buffer);
-	  mb = rte_mbuf_from_vlib_buffer (b2);
-	  last_mb->next = mb;
-	  last_mb = mb;
-	  rte_pktmbuf_reset (mb);
-	}
-    }
-
-  first_mb = mb = rte_mbuf_from_vlib_buffer (b);
-  first_mb->nb_segs = 1;
-  mb->data_len = b->current_length;
-  mb->pkt_len = maybe_multiseg ? vlib_buffer_length_in_chain (vm, b) :
-    b->current_length;
-  mb->data_off = VLIB_BUFFER_PRE_DATA_SIZE + b->current_data;
-
-  while (maybe_multiseg && (b->flags & VLIB_BUFFER_NEXT_PRESENT))
-    {
-      b = vlib_get_buffer (vm, b->next_buffer);
-      mb = rte_mbuf_from_vlib_buffer (b);
-      mb->data_len = b->current_length;
-      mb->pkt_len = b->current_length;
-      mb->data_off = VLIB_BUFFER_PRE_DATA_SIZE + b->current_data;
-      first_mb->nb_segs++;
-    }
-}
-
-/*
- * This function calls the dpdk's tx_burst function to transmit the packets
- * on the tx_vector. It manages a lock per-device if the device does not
- * support multiple queues. It returns the number of packets untransmitted
- * on the tx_vector. If all packets are transmitted (the normal case), the
- * function returns 0.
- *
- * The function assumes there is at least one packet on the tx_vector.
- */
-static_always_inline
-  u32 tx_burst_vector_internal (vlib_main_t * vm,
-				dpdk_device_t * xd,
-				struct rte_mbuf **tx_vector)
-{
-  dpdk_main_t *dm = &dpdk_main;
-  u32 n_packets;
-  u32 tx_head;
-  u32 tx_tail;
-  u32 n_retry;
-  int rv;
-  int queue_id;
-  tx_ring_hdr_t *ring;
-
-  ring = vec_header (tx_vector, sizeof (*ring));
-
-  n_packets = ring->tx_head - ring->tx_tail;
-
-  tx_head = ring->tx_head % xd->nb_tx_desc;
-
-  /*
-   * Ensure rte_eth_tx_burst is not called with 0 packets, which can lead to
-   * unpredictable results.
-   */
-  ASSERT (n_packets > 0);
-
-  /*
-   * Check for tx_vector overflow. If this fails it is a system configuration
-   * error. The ring should be sized big enough to handle the largest un-flowed
-   * off burst from a traffic manager. A larger size also helps performance
-   * a bit because it decreases the probability of having to issue two tx_burst
-   * calls due to a ring wrap.
-   */
-  ASSERT (n_packets < xd->nb_tx_desc);
-  ASSERT (ring->tx_tail == 0);
-
-  n_retry = 16;
-  queue_id = vm->cpu_index;
-
-  do
-    {
-      /* start the burst at the tail */
-      tx_tail = ring->tx_tail % xd->nb_tx_desc;
-
-      /*
-       * This device only supports one TX queue,
-       * and we're running multi-threaded...
-       */
-      if (PREDICT_FALSE (xd->lockp != 0))
-	{
-	  queue_id = queue_id % xd->tx_q_used;
-	  while (__sync_lock_test_and_set (xd->lockp[queue_id], 1))
-	    /* zzzz */
-	    queue_id = (queue_id + 1) % xd->tx_q_used;
-	}
-
-      if (PREDICT_FALSE (xd->flags & DPDK_DEVICE_FLAG_HQOS))	/* HQoS ON */
-	{
-	  /* no wrap, transmit in one burst */
-	  dpdk_device_hqos_per_worker_thread_t *hqos =
-	    &xd->hqos_wt[vm->cpu_index];
-
-	  ASSERT (hqos->swq != NULL);
-
-	  dpdk_hqos_metadata_set (hqos,
-				  &tx_vector[tx_tail], tx_head - tx_tail);
-	  rv = rte_ring_sp_enqueue_burst (hqos->swq,
-					  (void **) &tx_vector[tx_tail],
-					  (uint16_t) (tx_head - tx_tail));
-	}
-      else if (PREDICT_TRUE (xd->flags & DPDK_DEVICE_FLAG_PMD))
-	{
-	  /* no wrap, transmit in one burst */
-	  rv = rte_eth_tx_burst (xd->device_index,
-				 (uint16_t) queue_id,
-				 &tx_vector[tx_tail],
-				 (uint16_t) (tx_head - tx_tail));
-	}
-      else
-	{
-	  ASSERT (0);
-	  rv = 0;
-	}
-
-      if (PREDICT_FALSE (xd->lockp != 0))
-	*xd->lockp[queue_id] = 0;
-
-      if (PREDICT_FALSE (rv < 0))
-	{
-	  // emit non-fatal message, bump counter
-	  vnet_main_t *vnm = dm->vnet_main;
-	  vnet_interface_main_t *im = &vnm->interface_main;
-	  u32 node_index;
-
-	  node_index = vec_elt_at_index (im->hw_interfaces,
-					 xd->vlib_hw_if_index)->tx_node_index;
-
-	  vlib_error_count (vm, node_index, DPDK_TX_FUNC_ERROR_BAD_RETVAL, 1);
-	  clib_warning ("rte_eth_tx_burst[%d]: error %d", xd->device_index,
-			rv);
-	  return n_packets;	// untransmitted packets
-	}
-      ring->tx_tail += (u16) rv;
-      n_packets -= (uint16_t) rv;
-    }
-  while (rv && n_packets && (n_retry > 0));
-
-  return n_packets;
-}
-
-static_always_inline void
-dpdk_prefetch_buffer_by_index (vlib_main_t * vm, u32 bi)
-{
-  vlib_buffer_t *b;
-  struct rte_mbuf *mb;
-  b = vlib_get_buffer (vm, bi);
-  mb = rte_mbuf_from_vlib_buffer (b);
-  CLIB_PREFETCH (mb, CLIB_CACHE_LINE_BYTES, LOAD);
-  CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD);
-}
-
-static_always_inline void
-dpdk_buffer_recycle (vlib_main_t * vm, vlib_node_runtime_t * node,
-		     vlib_buffer_t * b, u32 bi, struct rte_mbuf **mbp)
-{
-  dpdk_main_t *dm = &dpdk_main;
-  u32 my_cpu = vm->cpu_index;
-  struct rte_mbuf *mb_new;
-
-  if (PREDICT_FALSE (b->flags & VLIB_BUFFER_RECYCLE) == 0)
-    return;
-
-  mb_new = dpdk_replicate_packet_mb (b);
-  if (PREDICT_FALSE (mb_new == 0))
-    {
-      vlib_error_count (vm, node->node_index,
-			DPDK_TX_FUNC_ERROR_REPL_FAIL, 1);
-      b->flags |= VLIB_BUFFER_REPL_FAIL;
-    }
-  else
-    *mbp = mb_new;
-
-  vec_add1 (dm->recycle[my_cpu], bi);
-}
-
-/*
- * Transmits the packets on the frame to the interface associated with the
- * node. It first copies packets on the frame to a tx_vector containing the
- * rte_mbuf pointers. It then passes this vector to tx_burst_vector_internal
- * which calls the dpdk tx_burst function.
- */
-static uword
-dpdk_interface_tx (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  dpdk_main_t *dm = &dpdk_main;
-  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
-  dpdk_device_t *xd = vec_elt_at_index (dm->devices, rd->dev_instance);
-  u32 n_packets = f->n_vectors;
-  u32 n_left;
-  u32 *from;
-  struct rte_mbuf **tx_vector;
-  u16 i;
-  u16 nb_tx_desc = xd->nb_tx_desc;
-  int queue_id;
-  u32 my_cpu;
-  u32 tx_pkts = 0;
-  tx_ring_hdr_t *ring;
-  u32 n_on_ring;
-
-  my_cpu = vm->cpu_index;
-
-  queue_id = my_cpu;
-
-  tx_vector = xd->tx_vectors[queue_id];
-  ring = vec_header (tx_vector, sizeof (*ring));
-
-  n_on_ring = ring->tx_head - ring->tx_tail;
-  from = vlib_frame_vector_args (f);
-
-  ASSERT (n_packets <= VLIB_FRAME_SIZE);
-
-  if (PREDICT_FALSE (n_on_ring + n_packets > nb_tx_desc))
-    {
-      /*
-       * Overflowing the ring should never happen.
-       * If it does then drop the whole frame.
-       */
-      vlib_error_count (vm, node->node_index, DPDK_TX_FUNC_ERROR_RING_FULL,
-			n_packets);
-
-      while (n_packets--)
-	{
-	  u32 bi0 = from[n_packets];
-	  vlib_buffer_t *b0 = vlib_get_buffer (vm, bi0);
-	  struct rte_mbuf *mb0 = rte_mbuf_from_vlib_buffer (b0);
-	  rte_pktmbuf_free (mb0);
-	}
-      return n_on_ring;
-    }
-
-  if (PREDICT_FALSE (dm->tx_pcap_enable))
-    {
-      n_left = n_packets;
-      while (n_left > 0)
-	{
-	  u32 bi0 = from[0];
-	  vlib_buffer_t *b0 = vlib_get_buffer (vm, bi0);
-	  if (dm->pcap_sw_if_index == 0 ||
-	      dm->pcap_sw_if_index == vnet_buffer (b0)->sw_if_index[VLIB_TX])
-	    pcap_add_buffer (&dm->pcap_main, vm, bi0, 512);
-	  from++;
-	  n_left--;
-	}
-    }
-
-  from = vlib_frame_vector_args (f);
-  n_left = n_packets;
-  i = ring->tx_head % nb_tx_desc;
-
-  while (n_left >= 8)
-    {
-      u32 bi0, bi1, bi2, bi3;
-      struct rte_mbuf *mb0, *mb1, *mb2, *mb3;
-      vlib_buffer_t *b0, *b1, *b2, *b3;
-      u32 or_flags;
-
-      dpdk_prefetch_buffer_by_index (vm, from[4]);
-      dpdk_prefetch_buffer_by_index (vm, from[5]);
-      dpdk_prefetch_buffer_by_index (vm, from[6]);
-      dpdk_prefetch_buffer_by_index (vm, from[7]);
-
-      bi0 = from[0];
-      bi1 = from[1];
-      bi2 = from[2];
-      bi3 = from[3];
-      from += 4;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-      b2 = vlib_get_buffer (vm, bi2);
-      b3 = vlib_get_buffer (vm, bi3);
-
-      or_flags = b0->flags | b1->flags | b2->flags | b3->flags;
-
-      if (or_flags & VLIB_BUFFER_NEXT_PRESENT)
-	{
-	  dpdk_validate_rte_mbuf (vm, b0, 1);
-	  dpdk_validate_rte_mbuf (vm, b1, 1);
-	  dpdk_validate_rte_mbuf (vm, b2, 1);
-	  dpdk_validate_rte_mbuf (vm, b3, 1);
-	}
-      else
-	{
-	  dpdk_validate_rte_mbuf (vm, b0, 0);
-	  dpdk_validate_rte_mbuf (vm, b1, 0);
-	  dpdk_validate_rte_mbuf (vm, b2, 0);
-	  dpdk_validate_rte_mbuf (vm, b3, 0);
-	}
-
-      mb0 = rte_mbuf_from_vlib_buffer (b0);
-      mb1 = rte_mbuf_from_vlib_buffer (b1);
-      mb2 = rte_mbuf_from_vlib_buffer (b2);
-      mb3 = rte_mbuf_from_vlib_buffer (b3);
-
-      if (PREDICT_FALSE (or_flags & VLIB_BUFFER_RECYCLE))
-	{
-	  dpdk_buffer_recycle (vm, node, b0, bi0, &mb0);
-	  dpdk_buffer_recycle (vm, node, b1, bi1, &mb1);
-	  dpdk_buffer_recycle (vm, node, b2, bi2, &mb2);
-	  dpdk_buffer_recycle (vm, node, b3, bi3, &mb3);
-
-	  /* dont enqueue packets if replication failed as they must
-	     be sent back to recycle */
-	  if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_REPL_FAIL) == 0))
-	    tx_vector[i++ % nb_tx_desc] = mb0;
-	  if (PREDICT_TRUE ((b1->flags & VLIB_BUFFER_REPL_FAIL) == 0))
-	    tx_vector[i++ % nb_tx_desc] = mb1;
-	  if (PREDICT_TRUE ((b2->flags & VLIB_BUFFER_REPL_FAIL) == 0))
-	    tx_vector[i++ % nb_tx_desc] = mb2;
-	  if (PREDICT_TRUE ((b3->flags & VLIB_BUFFER_REPL_FAIL) == 0))
-	    tx_vector[i++ % nb_tx_desc] = mb3;
-	}
-      else
-	{
-	  if (PREDICT_FALSE (i + 3 >= nb_tx_desc))
-	    {
-	      tx_vector[i++ % nb_tx_desc] = mb0;
-	      tx_vector[i++ % nb_tx_desc] = mb1;
-	      tx_vector[i++ % nb_tx_desc] = mb2;
-	      tx_vector[i++ % nb_tx_desc] = mb3;
-	      i %= nb_tx_desc;
-	    }
-	  else
-	    {
-	      tx_vector[i++] = mb0;
-	      tx_vector[i++] = mb1;
-	      tx_vector[i++] = mb2;
-	      tx_vector[i++] = mb3;
-	    }
-	}
-
-
-      if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE))
-	{
-	  if (b0->flags & VLIB_BUFFER_IS_TRACED)
-	    dpdk_tx_trace_buffer (dm, node, xd, queue_id, bi0, b0);
-	  if (b1->flags & VLIB_BUFFER_IS_TRACED)
-	    dpdk_tx_trace_buffer (dm, node, xd, queue_id, bi1, b1);
-	  if (b2->flags & VLIB_BUFFER_IS_TRACED)
-	    dpdk_tx_trace_buffer (dm, node, xd, queue_id, bi2, b2);
-	  if (b3->flags & VLIB_BUFFER_IS_TRACED)
-	    dpdk_tx_trace_buffer (dm, node, xd, queue_id, bi3, b3);
-	}
-
-      n_left -= 4;
-    }
-  while (n_left > 0)
-    {
-      u32 bi0;
-      struct rte_mbuf *mb0;
-      vlib_buffer_t *b0;
-
-      bi0 = from[0];
-      from++;
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      dpdk_validate_rte_mbuf (vm, b0, 1);
-
-      mb0 = rte_mbuf_from_vlib_buffer (b0);
-      dpdk_buffer_recycle (vm, node, b0, bi0, &mb0);
-
-      if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE))
-	if (b0->flags & VLIB_BUFFER_IS_TRACED)
-	  dpdk_tx_trace_buffer (dm, node, xd, queue_id, bi0, b0);
-
-      if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_REPL_FAIL) == 0))
-	{
-	  tx_vector[i % nb_tx_desc] = mb0;
-	  i++;
-	}
-      n_left--;
-    }
-
-  /* account for additional packets in the ring */
-  ring->tx_head += n_packets;
-  n_on_ring = ring->tx_head - ring->tx_tail;
-
-  /* transmit as many packets as possible */
-  n_packets = tx_burst_vector_internal (vm, xd, tx_vector);
-
-  /*
-   * tx_pkts is the number of packets successfully transmitted
-   * This is the number originally on ring minus the number remaining on ring
-   */
-  tx_pkts = n_on_ring - n_packets;
-
-  {
-    /* If there is no callback then drop any non-transmitted packets */
-    if (PREDICT_FALSE (n_packets))
-      {
-	vlib_simple_counter_main_t *cm;
-	vnet_main_t *vnm = vnet_get_main ();
-
-	cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
-			       VNET_INTERFACE_COUNTER_TX_ERROR);
-
-	vlib_increment_simple_counter (cm, my_cpu, xd->vlib_sw_if_index,
-				       n_packets);
-
-	vlib_error_count (vm, node->node_index, DPDK_TX_FUNC_ERROR_PKT_DROP,
-			  n_packets);
-
-	while (n_packets--)
-	  rte_pktmbuf_free (tx_vector[ring->tx_tail + n_packets]);
-      }
-
-    /* Reset head/tail to avoid unnecessary wrap */
-    ring->tx_head = 0;
-    ring->tx_tail = 0;
-  }
-
-  /* Recycle replicated buffers */
-  if (PREDICT_FALSE (vec_len (dm->recycle[my_cpu])))
-    {
-      vlib_buffer_free (vm, dm->recycle[my_cpu],
-			vec_len (dm->recycle[my_cpu]));
-      _vec_len (dm->recycle[my_cpu]) = 0;
-    }
-
-  ASSERT (ring->tx_head >= ring->tx_tail);
-
-  return tx_pkts;
-}
-
-static void
-dpdk_clear_hw_interface_counters (u32 instance)
-{
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_t *xd = vec_elt_at_index (dm->devices, instance);
-
-  /*
-   * Set the "last_cleared_stats" to the current stats, so that
-   * things appear to clear from a display perspective.
-   */
-  dpdk_update_counters (xd, vlib_time_now (dm->vlib_main));
-
-  clib_memcpy (&xd->last_cleared_stats, &xd->stats, sizeof (xd->stats));
-  clib_memcpy (xd->last_cleared_xstats, xd->xstats,
-	       vec_len (xd->last_cleared_xstats) *
-	       sizeof (xd->last_cleared_xstats[0]));
-
-}
-
-static clib_error_t *
-dpdk_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
-{
-  vnet_hw_interface_t *hif = vnet_get_hw_interface (vnm, hw_if_index);
-  uword is_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_t *xd = vec_elt_at_index (dm->devices, hif->dev_instance);
-  int rv = 0;
-
-  if (is_up)
-    {
-      f64 now = vlib_time_now (dm->vlib_main);
-
-      if ((xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP) == 0)
-	rv = rte_eth_dev_start (xd->device_index);
-
-      if (xd->flags & DPDK_DEVICE_FLAG_PROMISC)
-	rte_eth_promiscuous_enable (xd->device_index);
-      else
-	rte_eth_promiscuous_disable (xd->device_index);
-
-      rte_eth_allmulticast_enable (xd->device_index);
-      xd->flags |= DPDK_DEVICE_FLAG_ADMIN_UP;
-      dpdk_update_counters (xd, now);
-      dpdk_update_link_state (xd, now);
-    }
-  else
-    {
-      xd->flags &= ~DPDK_DEVICE_FLAG_ADMIN_UP;
-
-      rte_eth_allmulticast_disable (xd->device_index);
-      vnet_hw_interface_set_flags (vnm, xd->vlib_hw_if_index, 0);
-      rte_eth_dev_stop (xd->device_index);
-
-      /* For bonded interface, stop slave links */
-      if (xd->pmd == VNET_DPDK_PMD_BOND)
-	{
-	  u8 slink[16];
-	  int nlink = rte_eth_bond_slaves_get (xd->device_index, slink, 16);
-	  while (nlink >= 1)
-	    {
-	      u8 dpdk_port = slink[--nlink];
-	      rte_eth_dev_stop (dpdk_port);
-	    }
-	}
-    }
-
-  if (rv < 0)
-    clib_warning ("rte_eth_dev_%s error: %d", is_up ? "start" : "stop", rv);
-
-  return /* no error */ 0;
-}
-
-/*
- * Dynamically redirect all pkts from a specific interface
- * to the specified node
- */
-static void
-dpdk_set_interface_next_node (vnet_main_t * vnm, u32 hw_if_index,
-			      u32 node_index)
-{
-  dpdk_main_t *xm = &dpdk_main;
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  dpdk_device_t *xd = vec_elt_at_index (xm->devices, hw->dev_instance);
-
-  /* Shut off redirection */
-  if (node_index == ~0)
-    {
-      xd->per_interface_next_index = node_index;
-      return;
-    }
-
-  xd->per_interface_next_index =
-    vlib_node_add_next (xm->vlib_main, dpdk_input_node.index, node_index);
-}
-
-
-static clib_error_t *
-dpdk_subif_add_del_function (vnet_main_t * vnm,
-			     u32 hw_if_index,
-			     struct vnet_sw_interface_t *st, int is_add)
-{
-  dpdk_main_t *xm = &dpdk_main;
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  dpdk_device_t *xd = vec_elt_at_index (xm->devices, hw->dev_instance);
-  vnet_sw_interface_t *t = (vnet_sw_interface_t *) st;
-  int r, vlan_offload;
-  u32 prev_subifs = xd->num_subifs;
-  clib_error_t *err = 0;
-
-  if (is_add)
-    xd->num_subifs++;
-  else if (xd->num_subifs)
-    xd->num_subifs--;
-
-  if ((xd->flags & DPDK_DEVICE_FLAG_PMD) == 0)
-    goto done;
-
-  /* currently we program VLANS only for IXGBE VF and I40E VF */
-  if ((xd->pmd != VNET_DPDK_PMD_IXGBEVF) && (xd->pmd != VNET_DPDK_PMD_I40EVF))
-    goto done;
-
-  if (t->sub.eth.flags.no_tags == 1)
-    goto done;
-
-  if ((t->sub.eth.flags.one_tag != 1) || (t->sub.eth.flags.exact_match != 1))
-    {
-      xd->num_subifs = prev_subifs;
-      err = clib_error_return (0, "unsupported VLAN setup");
-      goto done;
-    }
-
-  vlan_offload = rte_eth_dev_get_vlan_offload (xd->device_index);
-  vlan_offload |= ETH_VLAN_FILTER_OFFLOAD;
-
-  if ((r = rte_eth_dev_set_vlan_offload (xd->device_index, vlan_offload)))
-    {
-      xd->num_subifs = prev_subifs;
-      err = clib_error_return (0, "rte_eth_dev_set_vlan_offload[%d]: err %d",
-			       xd->device_index, r);
-      goto done;
-    }
-
-
-  if ((r =
-       rte_eth_dev_vlan_filter (xd->device_index, t->sub.eth.outer_vlan_id,
-				is_add)))
-    {
-      xd->num_subifs = prev_subifs;
-      err = clib_error_return (0, "rte_eth_dev_vlan_filter[%d]: err %d",
-			       xd->device_index, r);
-      goto done;
-    }
-
-done:
-  if (xd->num_subifs)
-    xd->flags |= DPDK_DEVICE_FLAG_HAVE_SUBIF;
-  else
-    xd->flags &= ~DPDK_DEVICE_FLAG_HAVE_SUBIF;
-
-  return err;
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (dpdk_device_class) = {
-  .name = "dpdk",
-  .tx_function = dpdk_interface_tx,
-  .tx_function_n_errors = DPDK_TX_FUNC_N_ERROR,
-  .tx_function_error_strings = dpdk_tx_func_error_strings,
-  .format_device_name = format_dpdk_device_name,
-  .format_device = format_dpdk_device,
-  .format_tx_trace = format_dpdk_tx_dma_trace,
-  .clear_counters = dpdk_clear_hw_interface_counters,
-  .admin_up_down_function = dpdk_interface_admin_up_down,
-  .subif_add_del_function = dpdk_subif_add_del_function,
-  .rx_redirect_to_node = dpdk_set_interface_next_node,
-  .mac_addr_change_function = dpdk_set_mac_address,
-};
-
-VLIB_DEVICE_TX_FUNCTION_MULTIARCH (dpdk_device_class, dpdk_interface_tx)
-/* *INDENT-ON* */
-
-#define UP_DOWN_FLAG_EVENT 1
-
-uword
-admin_up_down_process (vlib_main_t * vm,
-		       vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  clib_error_t *error = 0;
-  uword event_type;
-  uword *event_data = 0;
-  u32 sw_if_index;
-  u32 flags;
-
-  while (1)
-    {
-      vlib_process_wait_for_event (vm);
-
-      event_type = vlib_process_get_events (vm, &event_data);
-
-      dpdk_main.admin_up_down_in_progress = 1;
-
-      switch (event_type)
-	{
-	case UP_DOWN_FLAG_EVENT:
-	  {
-	    if (vec_len (event_data) == 2)
-	      {
-		sw_if_index = event_data[0];
-		flags = event_data[1];
-		error =
-		  vnet_sw_interface_set_flags (vnet_get_main (), sw_if_index,
-					       flags);
-		clib_error_report (error);
-	      }
-	  }
-	  break;
-	}
-
-      vec_reset_length (event_data);
-
-      dpdk_main.admin_up_down_in_progress = 0;
-
-    }
-  return 0;			/* or not */
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (admin_up_down_process_node,static) = {
-    .function = admin_up_down_process,
-    .type = VLIB_NODE_TYPE_PROCESS,
-    .name = "admin-up-down-process",
-    .process_log2_n_stack_bytes = 17,  // 256KB
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/dpdk.h b/vnet/vnet/devices/dpdk/dpdk.h
deleted file mode 100644
index d8f378d2..00000000
--- a/vnet/vnet/devices/dpdk/dpdk.h
+++ /dev/null
@@ -1,534 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_dpdk_h__
-#define __included_dpdk_h__
-
-/* $$$$ We should rename always_inline -> clib_always_inline */
-#undef always_inline
-
-#include <rte_config.h>
-
-#include <rte_common.h>
-#include <rte_dev.h>
-#include <rte_log.h>
-#include <rte_memory.h>
-#include <rte_memzone.h>
-#include <rte_tailq.h>
-#include <rte_eal.h>
-#include <rte_per_lcore.h>
-#include <rte_launch.h>
-#include <rte_atomic.h>
-#include <rte_cycles.h>
-#include <rte_prefetch.h>
-#include <rte_lcore.h>
-#include <rte_per_lcore.h>
-#include <rte_branch_prediction.h>
-#include <rte_interrupts.h>
-#include <rte_pci.h>
-#include <rte_random.h>
-#include <rte_debug.h>
-#include <rte_ether.h>
-#include <rte_ethdev.h>
-#include <rte_ring.h>
-#include <rte_mempool.h>
-#include <rte_mbuf.h>
-#include <rte_virtio_net.h>
-#include <rte_version.h>
-#include <rte_eth_bond.h>
-#include <rte_sched.h>
-
-#include <vnet/unix/pcap.h>
-#include <vnet/devices/devices.h>
-
-#if CLIB_DEBUG > 0
-#define always_inline static inline
-#else
-#define always_inline static inline __attribute__ ((__always_inline__))
-#endif
-
-#include <vlib/pci/pci.h>
-
-#define NB_MBUF   (16<<10)
-
-extern vnet_device_class_t dpdk_device_class;
-extern vlib_node_registration_t dpdk_input_node;
-extern vlib_node_registration_t handoff_dispatch_node;
-
-#if RTE_VERSION >= RTE_VERSION_NUM(16, 11, 0, 0)
-#define foreach_dpdk_pmd          \
-  _ ("net_thunderx", THUNDERX)    \
-  _ ("net_e1000_em", E1000EM)     \
-  _ ("net_e1000_igb", IGB)        \
-  _ ("net_e1000_igb_vf", IGBVF)   \
-  _ ("net_ixgbe", IXGBE)          \
-  _ ("net_ixgbe_vf", IXGBEVF)     \
-  _ ("net_i40e", I40E)            \
-  _ ("net_i40e_vf", I40EVF)       \
-  _ ("net_virtio", VIRTIO)        \
-  _ ("net_enic", ENIC)            \
-  _ ("net_vmxnet3", VMXNET3)      \
-  _ ("net_af_packet", AF_PACKET)  \
-  _ ("rte_bond_pmd", BOND)        \
-  _ ("net_fm10k", FM10K)          \
-  _ ("net_cxgbe", CXGBE)          \
-  _ ("net_mlx5", MLX5)            \
-  _ ("net_dpaa2", DPAA2)
-#else
-#define foreach_dpdk_pmd          \
-  _ ("rte_nicvf_pmd", THUNDERX)	  \
-  _ ("rte_em_pmd", E1000EM)       \
-  _ ("rte_igb_pmd", IGB)          \
-  _ ("rte_igbvf_pmd", IGBVF)      \
-  _ ("rte_ixgbe_pmd", IXGBE)      \
-  _ ("rte_ixgbevf_pmd", IXGBEVF)  \
-  _ ("rte_i40e_pmd", I40E)        \
-  _ ("rte_i40evf_pmd", I40EVF)    \
-  _ ("rte_virtio_pmd", VIRTIO)    \
-  _ ("rte_enic_pmd", ENIC)        \
-  _ ("rte_vmxnet3_pmd", VMXNET3)  \
-  _ ("AF_PACKET PMD", AF_PACKET)  \
-  _ ("rte_bond_pmd", BOND)        \
-  _ ("rte_pmd_fm10k", FM10K)      \
-  _ ("rte_cxgbe_pmd", CXGBE)      \
-  _ ("rte_dpaa2_dpni", DPAA2)
-#endif
-
-typedef enum
-{
-  VNET_DPDK_PMD_NONE,
-#define _(s,f) VNET_DPDK_PMD_##f,
-  foreach_dpdk_pmd
-#undef _
-    VNET_DPDK_PMD_UNKNOWN,	/* must be last */
-} dpdk_pmd_t;
-
-typedef enum
-{
-  VNET_DPDK_PORT_TYPE_ETH_1G,
-  VNET_DPDK_PORT_TYPE_ETH_10G,
-  VNET_DPDK_PORT_TYPE_ETH_40G,
-  VNET_DPDK_PORT_TYPE_ETH_100G,
-  VNET_DPDK_PORT_TYPE_ETH_BOND,
-  VNET_DPDK_PORT_TYPE_ETH_SWITCH,
-  VNET_DPDK_PORT_TYPE_AF_PACKET,
-  VNET_DPDK_PORT_TYPE_UNKNOWN,
-} dpdk_port_type_t;
-
-/*
- * The header for the tx_vector in dpdk_device_t.
- * Head and tail are indexes into the tx_vector and are of type
- * u64 so they never overflow.
- */
-typedef struct
-{
-  u64 tx_head;
-  u64 tx_tail;
-} tx_ring_hdr_t;
-
-typedef struct
-{
-  struct rte_ring *swq;
-
-  u64 hqos_field0_slabmask;
-  u32 hqos_field0_slabpos;
-  u32 hqos_field0_slabshr;
-  u64 hqos_field1_slabmask;
-  u32 hqos_field1_slabpos;
-  u32 hqos_field1_slabshr;
-  u64 hqos_field2_slabmask;
-  u32 hqos_field2_slabpos;
-  u32 hqos_field2_slabshr;
-  u32 hqos_tc_table[64];
-} dpdk_device_hqos_per_worker_thread_t;
-
-typedef struct
-{
-  struct rte_ring **swq;
-  struct rte_mbuf **pkts_enq;
-  struct rte_mbuf **pkts_deq;
-  struct rte_sched_port *hqos;
-  u32 hqos_burst_enq;
-  u32 hqos_burst_deq;
-  u32 pkts_enq_len;
-  u32 swq_pos;
-  u32 flush_count;
-} dpdk_device_hqos_per_hqos_thread_t;
-
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  volatile u32 **lockp;
-
-  /* Instance ID */
-  u32 device_index;
-
-  u32 vlib_hw_if_index;
-  u32 vlib_sw_if_index;
-
-  /* next node index if we decide to steal the rx graph arc */
-  u32 per_interface_next_index;
-
-  /* dpdk rte_mbuf rx and tx vectors, VLIB_FRAME_SIZE */
-  struct rte_mbuf ***tx_vectors;	/* one per worker thread */
-  struct rte_mbuf ***rx_vectors;
-
-  /* vector of traced contexts, per device */
-  u32 **d_trace_buffers;
-
-  dpdk_pmd_t pmd:8;
-  i8 cpu_socket;
-
-  u16 flags;
-#define DPDK_DEVICE_FLAG_ADMIN_UP           (1 << 0)
-#define DPDK_DEVICE_FLAG_PROMISC            (1 << 1)
-#define DPDK_DEVICE_FLAG_PMD                (1 << 2)
-#define DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE (1 << 3)
-#define DPDK_DEVICE_FLAG_MAYBE_MULTISEG     (1 << 4)
-#define DPDK_DEVICE_FLAG_HAVE_SUBIF         (1 << 5)
-#define DPDK_DEVICE_FLAG_HQOS               (1 << 6)
-
-  u16 nb_tx_desc;
-    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
-
-  u8 *interface_name_suffix;
-
-  /* number of sub-interfaces */
-  u16 num_subifs;
-
-  /* PMD related */
-  u16 tx_q_used;
-  u16 rx_q_used;
-  u16 nb_rx_desc;
-  u16 *cpu_socket_id_by_queue;
-  struct rte_eth_conf port_conf;
-  struct rte_eth_txconf tx_conf;
-
-  /* HQoS related */
-  dpdk_device_hqos_per_worker_thread_t *hqos_wt;
-  dpdk_device_hqos_per_hqos_thread_t *hqos_ht;
-
-  /* af_packet */
-  u8 af_packet_port_id;
-
-  struct rte_eth_link link;
-  f64 time_last_link_update;
-
-  struct rte_eth_stats stats;
-  struct rte_eth_stats last_stats;
-  struct rte_eth_stats last_cleared_stats;
-  struct rte_eth_xstat *xstats;
-  struct rte_eth_xstat *last_cleared_xstats;
-  f64 time_last_stats_update;
-  dpdk_port_type_t port_type;
-} dpdk_device_t;
-
-#define DPDK_STATS_POLL_INTERVAL      (10.0)
-#define DPDK_MIN_STATS_POLL_INTERVAL  (0.001)	/* 1msec */
-
-#define DPDK_LINK_POLL_INTERVAL       (3.0)
-#define DPDK_MIN_LINK_POLL_INTERVAL   (0.001)	/* 1msec */
-
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-
-  /* total input packet counter */
-  u64 aggregate_rx_packets;
-} dpdk_worker_t;
-
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-
-  /* total input packet counter */
-  u64 aggregate_rx_packets;
-} dpdk_hqos_thread_t;
-
-typedef struct
-{
-  u32 device;
-  u16 queue_id;
-} dpdk_device_and_queue_t;
-
-#ifndef DPDK_HQOS_DBG_BYPASS
-#define DPDK_HQOS_DBG_BYPASS 0
-#endif
-
-#ifndef HQOS_FLUSH_COUNT_THRESHOLD
-#define HQOS_FLUSH_COUNT_THRESHOLD              100000
-#endif
-
-typedef struct dpdk_device_config_hqos_t
-{
-  u32 hqos_thread;
-  u32 hqos_thread_valid;
-
-  u32 swq_size;
-  u32 burst_enq;
-  u32 burst_deq;
-
-  u32 pktfield0_slabpos;
-  u32 pktfield1_slabpos;
-  u32 pktfield2_slabpos;
-  u64 pktfield0_slabmask;
-  u64 pktfield1_slabmask;
-  u64 pktfield2_slabmask;
-  u32 tc_table[64];
-
-  struct rte_sched_port_params port;
-  struct rte_sched_subport_params *subport;
-  struct rte_sched_pipe_params *pipe;
-  uint32_t *pipe_map;
-} dpdk_device_config_hqos_t;
-
-int dpdk_hqos_validate_mask (u64 mask, u32 n);
-void dpdk_device_config_hqos_pipe_profile_default (dpdk_device_config_hqos_t *
-						   hqos, u32 pipe_profile_id);
-void dpdk_device_config_hqos_default (dpdk_device_config_hqos_t * hqos);
-clib_error_t *dpdk_port_setup_hqos (dpdk_device_t * xd,
-				    dpdk_device_config_hqos_t * hqos);
-void dpdk_hqos_metadata_set (dpdk_device_hqos_per_worker_thread_t * hqos,
-			     struct rte_mbuf **pkts, u32 n_pkts);
-
-#define foreach_dpdk_device_config_item \
-  _ (num_rx_queues) \
-  _ (num_tx_queues) \
-  _ (num_rx_desc) \
-  _ (num_tx_desc) \
-  _ (rss_fn)
-
-typedef struct
-{
-  vlib_pci_addr_t pci_addr;
-  u8 is_blacklisted;
-  u8 vlan_strip_offload;
-#define DPDK_DEVICE_VLAN_STRIP_DEFAULT 0
-#define DPDK_DEVICE_VLAN_STRIP_OFF 1
-#define DPDK_DEVICE_VLAN_STRIP_ON  2
-
-#define _(x) uword x;
-    foreach_dpdk_device_config_item
-#undef _
-    clib_bitmap_t * workers;
-  u32 hqos_enabled;
-  dpdk_device_config_hqos_t hqos;
-} dpdk_device_config_t;
-
-typedef struct
-{
-
-  /* Config stuff */
-  u8 **eal_init_args;
-  u8 *eal_init_args_str;
-  u8 *uio_driver_name;
-  u8 no_multi_seg;
-  u8 enable_tcp_udp_checksum;
-
-  /* Required config parameters */
-  u8 coremask_set_manually;
-  u8 nchannels_set_manually;
-  u32 coremask;
-  u32 nchannels;
-  u32 num_mbufs;
-  u8 num_kni;			/* while kni_init allows u32, port_id in callback fn is only u8 */
-
-  /*
-   * format interface names ala xxxEthernet%d/%d/%d instead of
-   * xxxEthernet%x/%x/%x.
-   */
-  u8 interface_name_format_decimal;
-
-  /* per-device config */
-  dpdk_device_config_t default_devconf;
-  dpdk_device_config_t *dev_confs;
-  uword *device_config_index_by_pci_addr;
-
-} dpdk_config_main_t;
-
-dpdk_config_main_t dpdk_config_main;
-
-typedef struct
-{
-
-  /* Devices */
-  dpdk_device_t *devices;
-  dpdk_device_and_queue_t **devices_by_cpu;
-  dpdk_device_and_queue_t **devices_by_hqos_cpu;
-
-  /* per-thread recycle lists */
-  u32 **recycle;
-
-  /* buffer flags template, configurable to enable/disable tcp / udp cksum */
-  u32 buffer_flags_template;
-
-  /* vlib buffer free list, must be same size as an rte_mbuf */
-  u32 vlib_buffer_free_list_index;
-
-  /* dpdk worker "threads" */
-  dpdk_worker_t *workers;
-
-  /* dpdk HQoS "threads" */
-  dpdk_hqos_thread_t *hqos_threads;
-
-  /* Ethernet input node index */
-  u32 ethernet_input_node_index;
-
-  /* pcap tracing [only works if (CLIB_DEBUG > 0)] */
-  int tx_pcap_enable;
-  pcap_main_t pcap_main;
-  u8 *pcap_filename;
-  u32 pcap_sw_if_index;
-  u32 pcap_pkts_to_capture;
-
-  /* hashes */
-  uword *dpdk_device_by_kni_port_id;
-  uword *vu_sw_if_index_by_listener_fd;
-  uword *vu_sw_if_index_by_sock_fd;
-  u32 *vu_inactive_interfaces_device_index;
-
-  /*
-   * flag indicating that a posted admin up/down
-   * (via post_sw_interface_set_flags) is in progress
-   */
-  u8 admin_up_down_in_progress;
-
-  u8 use_rss;
-
-  /* which cpus are running dpdk-input */
-  int input_cpu_first_index;
-  int input_cpu_count;
-
-  /* which cpus are running I/O TX */
-  int hqos_cpu_first_index;
-  int hqos_cpu_count;
-
-  /* control interval of dpdk link state and stat polling */
-  f64 link_state_poll_interval;
-  f64 stat_poll_interval;
-
-  /* Sleep for this many MS after each device poll */
-  u32 poll_sleep;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-  dpdk_config_main_t *conf;
-} dpdk_main_t;
-
-dpdk_main_t dpdk_main;
-
-typedef struct
-{
-  u32 buffer_index;
-  u16 device_index;
-  u8 queue_index;
-  struct rte_mbuf mb;
-  /* Copy of VLIB buffer; packet data stored in pre_data. */
-  vlib_buffer_t buffer;
-} dpdk_tx_dma_trace_t;
-
-typedef struct
-{
-  u32 buffer_index;
-  u16 device_index;
-  u16 queue_index;
-  struct rte_mbuf mb;
-  vlib_buffer_t buffer;		/* Copy of VLIB buffer; pkt data stored in pre_data. */
-  u8 data[256];			/* First 256 data bytes, used for hexdump */
-} dpdk_rx_dma_trace_t;
-
-void vnet_buffer_needs_dpdk_mb (vlib_buffer_t * b);
-
-clib_error_t *dpdk_set_mac_address (vnet_hw_interface_t * hi, char *address);
-
-clib_error_t *dpdk_set_mc_filter (vnet_hw_interface_t * hi,
-				  struct ether_addr mc_addr_vec[], int naddr);
-
-void dpdk_thread_input (dpdk_main_t * dm, dpdk_device_t * xd);
-
-clib_error_t *dpdk_port_setup (dpdk_main_t * dm, dpdk_device_t * xd);
-
-u32 dpdk_interface_tx_vector (vlib_main_t * vm, u32 dev_instance);
-
-struct rte_mbuf *dpdk_replicate_packet_mb (vlib_buffer_t * b);
-struct rte_mbuf *dpdk_zerocopy_replicate_packet_mb (vlib_buffer_t * b);
-
-#define foreach_dpdk_error						\
-  _(NONE, "no error")							\
-  _(RX_PACKET_ERROR, "Rx packet errors")				\
-  _(RX_BAD_FCS, "Rx bad fcs")						\
-  _(IP_CHECKSUM_ERROR, "Rx ip checksum errors")				\
-  _(RX_ALLOC_FAIL, "rx buf alloc from free list failed")		\
-  _(RX_ALLOC_NO_PHYSMEM, "rx buf alloc failed no physmem")		\
-  _(RX_ALLOC_DROP_PKTS, "rx packets dropped due to alloc error")
-
-typedef enum
-{
-#define _(f,s) DPDK_ERROR_##f,
-  foreach_dpdk_error
-#undef _
-    DPDK_N_ERROR,
-} dpdk_error_t;
-
-int dpdk_set_stat_poll_interval (f64 interval);
-int dpdk_set_link_state_poll_interval (f64 interval);
-void dpdk_update_link_state (dpdk_device_t * xd, f64 now);
-void dpdk_device_lock_init (dpdk_device_t * xd);
-void dpdk_device_lock_free (dpdk_device_t * xd);
-
-static inline u64
-vnet_get_aggregate_rx_packets (void)
-{
-  dpdk_main_t *dm = &dpdk_main;
-  u64 sum = 0;
-  dpdk_worker_t *dw;
-
-  vec_foreach (dw, dm->workers) sum += dw->aggregate_rx_packets;
-
-  return sum;
-}
-
-void dpdk_rx_trace (dpdk_main_t * dm,
-		    vlib_node_runtime_t * node,
-		    dpdk_device_t * xd,
-		    u16 queue_id, u32 * buffers, uword n_buffers);
-
-#define EFD_OPERATION_LESS_THAN          0
-#define EFD_OPERATION_GREATER_OR_EQUAL   1
-
-format_function_t format_dpdk_device_name;
-format_function_t format_dpdk_device;
-format_function_t format_dpdk_tx_dma_trace;
-format_function_t format_dpdk_rx_dma_trace;
-format_function_t format_dpdk_rte_mbuf;
-format_function_t format_dpdk_rx_rte_mbuf;
-unformat_function_t unformat_socket_mem;
-clib_error_t *unformat_rss_fn (unformat_input_t * input, uword * rss_fn);
-clib_error_t *unformat_hqos (unformat_input_t * input,
-			     dpdk_device_config_hqos_t * hqos);
-
-uword
-admin_up_down_process (vlib_main_t * vm,
-		       vlib_node_runtime_t * rt, vlib_frame_t * f);
-
-#endif /* __included_dpdk_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/dpdk_priv.h b/vnet/vnet/devices/dpdk/dpdk_priv.h
deleted file mode 100644
index 0c81dbc3..00000000
--- a/vnet/vnet/devices/dpdk/dpdk_priv.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define DPDK_NB_RX_DESC_DEFAULT   1024
-#define DPDK_NB_TX_DESC_DEFAULT   1024
-#define DPDK_NB_RX_DESC_VIRTIO    256
-#define DPDK_NB_TX_DESC_VIRTIO    256
-
-#define I40E_DEV_ID_SFP_XL710           0x1572
-#define I40E_DEV_ID_QSFP_A              0x1583
-#define I40E_DEV_ID_QSFP_B              0x1584
-#define I40E_DEV_ID_QSFP_C              0x1585
-#define I40E_DEV_ID_10G_BASE_T          0x1586
-#define I40E_DEV_ID_VF                  0x154C
-
-/* These args appear by themselves */
-#define foreach_eal_double_hyphen_predicate_arg \
-_(no-shconf)                                    \
-_(no-hpet)                                      \
-_(no-huge)                                      \
-_(vmware-tsc-map)
-
-#define foreach_eal_single_hyphen_mandatory_arg \
-_(coremask, c)                                  \
-_(nchannels, n)                                 \
-
-#define foreach_eal_single_hyphen_arg           \
-_(blacklist, b)                                 \
-_(mem-alloc-request, m)                         \
-_(force-ranks, r)
-
-/* These args are preceeded by "--" and followed by a single string */
-#define foreach_eal_double_hyphen_arg           \
-_(huge-dir)                                     \
-_(proc-type)                                    \
-_(file-prefix)                                  \
-_(vdev)
-
-static inline void
-dpdk_get_xstats (dpdk_device_t * xd)
-{
-  int len;
-  if ((len = rte_eth_xstats_get (xd->device_index, NULL, 0)) > 0)
-    {
-      vec_validate (xd->xstats, len - 1);
-      vec_validate (xd->last_cleared_xstats, len - 1);
-
-      len =
-	rte_eth_xstats_get (xd->device_index, xd->xstats,
-			    vec_len (xd->xstats));
-
-      ASSERT (vec_len (xd->xstats) == len);
-      ASSERT (vec_len (xd->last_cleared_xstats) == len);
-
-      _vec_len (xd->xstats) = len;
-      _vec_len (xd->last_cleared_xstats) = len;
-
-    }
-}
-
-
-static inline void
-dpdk_update_counters (dpdk_device_t * xd, f64 now)
-{
-  vlib_simple_counter_main_t *cm;
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 my_cpu = os_get_cpu_number ();
-  u64 rxerrors, last_rxerrors;
-
-  /* only update counters for PMD interfaces */
-  if ((xd->flags & DPDK_DEVICE_FLAG_PMD) == 0)
-    return;
-
-  xd->time_last_stats_update = now ? now : xd->time_last_stats_update;
-  clib_memcpy (&xd->last_stats, &xd->stats, sizeof (xd->last_stats));
-  rte_eth_stats_get (xd->device_index, &xd->stats);
-
-  /* maybe bump interface rx no buffer counter */
-  if (PREDICT_FALSE (xd->stats.rx_nombuf != xd->last_stats.rx_nombuf))
-    {
-      cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
-			     VNET_INTERFACE_COUNTER_RX_NO_BUF);
-
-      vlib_increment_simple_counter (cm, my_cpu, xd->vlib_sw_if_index,
-				     xd->stats.rx_nombuf -
-				     xd->last_stats.rx_nombuf);
-    }
-
-  /* missed pkt counter */
-  if (PREDICT_FALSE (xd->stats.imissed != xd->last_stats.imissed))
-    {
-      cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
-			     VNET_INTERFACE_COUNTER_RX_MISS);
-
-      vlib_increment_simple_counter (cm, my_cpu, xd->vlib_sw_if_index,
-				     xd->stats.imissed -
-				     xd->last_stats.imissed);
-    }
-  rxerrors = xd->stats.ierrors;
-  last_rxerrors = xd->last_stats.ierrors;
-
-  if (PREDICT_FALSE (rxerrors != last_rxerrors))
-    {
-      cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
-			     VNET_INTERFACE_COUNTER_RX_ERROR);
-
-      vlib_increment_simple_counter (cm, my_cpu, xd->vlib_sw_if_index,
-				     rxerrors - last_rxerrors);
-    }
-
-  dpdk_get_xstats (xd);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/format.c b/vnet/vnet/devices/dpdk/format.c
deleted file mode 100644
index ff7c7a5a..00000000
--- a/vnet/vnet/devices/dpdk/format.c
+++ /dev/null
@@ -1,763 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/vnet.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/format.h>
-#include <vlib/unix/cj.h>
-#include <assert.h>
-
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/devices/dpdk/dpdk.h>
-
-#include "dpdk_priv.h"
-#include <vppinfra/error.h>
-
-#define foreach_dpdk_counter                    \
-  _ (tx_frames_ok, opackets)                    \
-  _ (tx_bytes_ok, obytes)                       \
-  _ (tx_errors, oerrors)                        \
-  _ (rx_frames_ok, ipackets)                    \
-  _ (rx_bytes_ok, ibytes)                       \
-  _ (rx_errors, ierrors)                        \
-  _ (rx_missed, imissed)                        \
-  _ (rx_no_bufs, rx_nombuf)
-
-#define foreach_dpdk_q_counter                  \
-  _ (rx_frames_ok, q_ipackets)                  \
-  _ (tx_frames_ok, q_opackets)                  \
-  _ (rx_bytes_ok, q_ibytes)                     \
-  _ (tx_bytes_ok, q_obytes)                     \
-  _ (rx_errors, q_errors)
-
-#define foreach_dpdk_rss_hf                    \
-  _(ETH_RSS_FRAG_IPV4,          "ipv4-frag")   \
-  _(ETH_RSS_NONFRAG_IPV4_TCP,   "ipv4-tcp")    \
-  _(ETH_RSS_NONFRAG_IPV4_UDP,   "ipv4-udp")    \
-  _(ETH_RSS_NONFRAG_IPV4_SCTP,  "ipv4-sctp")   \
-  _(ETH_RSS_NONFRAG_IPV4_OTHER, "ipv4-other")  \
-  _(ETH_RSS_IPV4,               "ipv4")        \
-  _(ETH_RSS_IPV6_TCP_EX,        "ipv6-tcp-ex") \
-  _(ETH_RSS_IPV6_UDP_EX,        "ipv6-udp-ex") \
-  _(ETH_RSS_FRAG_IPV6,          "ipv6-frag")   \
-  _(ETH_RSS_NONFRAG_IPV6_TCP,   "ipv6-tcp")    \
-  _(ETH_RSS_NONFRAG_IPV6_UDP,   "ipv6-udp")    \
-  _(ETH_RSS_NONFRAG_IPV6_SCTP,  "ipv6-sctp")   \
-  _(ETH_RSS_NONFRAG_IPV6_OTHER, "ipv6-other")  \
-  _(ETH_RSS_L2_PAYLOAD,         "l2-payload")  \
-  _(ETH_RSS_IPV6_EX,            "ipv6-ex")     \
-  _(ETH_RSS_IPV6,               "ipv6")
-
-
-#define foreach_dpdk_rx_offload_caps            \
-  _(DEV_RX_OFFLOAD_VLAN_STRIP, "vlan-strip")    \
-  _(DEV_RX_OFFLOAD_IPV4_CKSUM, "ipv4-cksum")    \
-  _(DEV_RX_OFFLOAD_UDP_CKSUM , "udp-cksum")     \
-  _(DEV_RX_OFFLOAD_TCP_CKSUM , "tcp-cksum")     \
-  _(DEV_RX_OFFLOAD_TCP_LRO   , "rcp-lro")       \
-  _(DEV_RX_OFFLOAD_QINQ_STRIP, "qinq-strip")
-
-#define foreach_dpdk_tx_offload_caps           \
-  _(DEV_TX_OFFLOAD_VLAN_INSERT, "vlan-insert") \
-  _(DEV_TX_OFFLOAD_IPV4_CKSUM,  "ipv4-cksum")  \
-  _(DEV_TX_OFFLOAD_UDP_CKSUM  , "udp-cksum")   \
-  _(DEV_TX_OFFLOAD_TCP_CKSUM  , "tcp-cksum")   \
-  _(DEV_TX_OFFLOAD_SCTP_CKSUM , "sctp-cksum")  \
-  _(DEV_TX_OFFLOAD_TCP_TSO    , "tcp-tso")     \
-  _(DEV_TX_OFFLOAD_UDP_TSO    , "udp-tso")     \
-  _(DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM, "outer-ipv4-cksum") \
-  _(DEV_TX_OFFLOAD_QINQ_INSERT, "qinq-insert")
-
-#if RTE_VERSION < RTE_VERSION_NUM(16, 11, 0, 0)
-/* New ol_flags bits added in DPDK-16.11 */
-#define PKT_RX_IP_CKSUM_GOOD    (1ULL << 7)
-#define PKT_RX_L4_CKSUM_GOOD    (1ULL << 8)
-#endif
-
-#define foreach_dpdk_pkt_rx_offload_flag                                \
-  _ (PKT_RX_VLAN_PKT, "RX packet is a 802.1q VLAN packet")              \
-  _ (PKT_RX_RSS_HASH, "RX packet with RSS hash result")                 \
-  _ (PKT_RX_FDIR, "RX packet with FDIR infos")                          \
-  _ (PKT_RX_L4_CKSUM_BAD, "L4 cksum of RX pkt. is not OK")              \
-  _ (PKT_RX_IP_CKSUM_BAD, "IP cksum of RX pkt. is not OK")              \
-  _ (PKT_RX_VLAN_STRIPPED, "RX packet VLAN tag stripped")               \
-  _ (PKT_RX_IP_CKSUM_GOOD, "IP cksum of RX pkt. is valid")              \
-  _ (PKT_RX_L4_CKSUM_GOOD, "L4 cksum of RX pkt. is valid")              \
-  _ (PKT_RX_IEEE1588_PTP, "RX IEEE1588 L2 Ethernet PT Packet")          \
-  _ (PKT_RX_IEEE1588_TMST, "RX IEEE1588 L2/L4 timestamped packet")      \
-  _ (PKT_RX_QINQ_STRIPPED, "RX packet QinQ tags stripped")
-
-#if RTE_VERSION < RTE_VERSION_NUM(16, 11, 0, 0)
-/* PTYPE added in DPDK-16.11 */
-#define RTE_PTYPE_L2_ETHER_VLAN             0x00000006
-#define RTE_PTYPE_L2_ETHER_QINQ             0x00000007
-#endif
-
-#define foreach_dpdk_pkt_type                                           \
-  _ (L2, ETHER, "Ethernet packet")                                      \
-  _ (L2, ETHER_TIMESYNC, "Ethernet packet for time sync")               \
-  _ (L2, ETHER_ARP, "ARP packet")                                       \
-  _ (L2, ETHER_LLDP, "LLDP (Link Layer Discovery Protocol) packet")     \
-  _ (L2, ETHER_NSH, "NSH (Network Service Header) packet")              \
-  _ (L2, ETHER_VLAN, "VLAN packet")                                     \
-  _ (L2, ETHER_QINQ, "QinQ packet")                                     \
-  _ (L3, IPV4, "IPv4 packet without extension headers")                 \
-  _ (L3, IPV4_EXT, "IPv4 packet with extension headers")                \
-  _ (L3, IPV4_EXT_UNKNOWN, "IPv4 packet with or without extension headers") \
-  _ (L3, IPV6, "IPv6 packet without extension headers")                 \
-  _ (L3, IPV6_EXT, "IPv6 packet with extension headers")                \
-  _ (L3, IPV6_EXT_UNKNOWN, "IPv6 packet with or without extension headers") \
-  _ (L4, TCP, "TCP packet")                                             \
-  _ (L4, UDP, "UDP packet")                                             \
-  _ (L4, FRAG, "Fragmented IP packet")                                  \
-  _ (L4, SCTP, "SCTP (Stream Control Transmission Protocol) packet")    \
-  _ (L4, ICMP, "ICMP packet")                                           \
-  _ (L4, NONFRAG, "Non-fragmented IP packet")                           \
-  _ (TUNNEL, GRE, "GRE tunneling packet")                               \
-  _ (TUNNEL, VXLAN, "VXLAN tunneling packet")                           \
-  _ (TUNNEL, NVGRE, "NVGRE Tunneling packet")                           \
-  _ (TUNNEL, GENEVE, "GENEVE Tunneling packet")                         \
-  _ (TUNNEL, GRENAT, "Teredo, VXLAN or GRE Tunneling packet")           \
-  _ (INNER_L2, ETHER, "Inner Ethernet packet")                          \
-  _ (INNER_L2, ETHER_VLAN, "Inner Ethernet packet with VLAN")           \
-  _ (INNER_L3, IPV4, "Inner IPv4 packet without extension headers")     \
-  _ (INNER_L3, IPV4_EXT, "Inner IPv4 packet with extension headers")    \
-  _ (INNER_L3, IPV4_EXT_UNKNOWN, "Inner IPv4 packet with or without extension headers") \
-  _ (INNER_L3, IPV6, "Inner IPv6 packet without extension headers")     \
-  _ (INNER_L3, IPV6_EXT, "Inner IPv6 packet with extension headers")    \
-  _ (INNER_L3, IPV6_EXT_UNKNOWN, "Inner IPv6 packet with or without extension headers") \
-  _ (INNER_L4, TCP, "Inner TCP packet")                                 \
-  _ (INNER_L4, UDP, "Inner UDP packet")                                 \
-  _ (INNER_L4, FRAG, "Inner fagmented IP packet")                       \
-  _ (INNER_L4, SCTP, "Inner SCTP (Stream Control Transmission Protocol) packet") \
-  _ (INNER_L4, ICMP, "Inner ICMP packet")                               \
-  _ (INNER_L4, NONFRAG, "Inner non-fragmented IP packet")
-
-#define foreach_dpdk_pkt_tx_offload_flag                                \
-  _ (PKT_TX_VLAN_PKT, "TX packet is a 802.1q VLAN packet")              \
-  _ (PKT_TX_IP_CKSUM, "IP cksum of TX pkt. computed by NIC")            \
-  _ (PKT_TX_TCP_CKSUM, "TCP cksum of TX pkt. computed by NIC")          \
-  _ (PKT_TX_SCTP_CKSUM, "SCTP cksum of TX pkt. computed by NIC")        \
-  _ (PKT_TX_IEEE1588_TMST, "TX IEEE1588 packet to timestamp")
-
-#define foreach_dpdk_pkt_offload_flag           \
-  foreach_dpdk_pkt_rx_offload_flag              \
-  foreach_dpdk_pkt_tx_offload_flag
-
-u8 *
-format_dpdk_device_name (u8 * s, va_list * args)
-{
-  dpdk_main_t *dm = &dpdk_main;
-  char *devname_format;
-  char *device_name;
-  u32 i = va_arg (*args, u32);
-  struct rte_eth_dev_info dev_info;
-  u8 *ret;
-
-  if (dm->conf->interface_name_format_decimal)
-    devname_format = "%s%d/%d/%d";
-  else
-    devname_format = "%s%x/%x/%x";
-
-  switch (dm->devices[i].port_type)
-    {
-    case VNET_DPDK_PORT_TYPE_ETH_1G:
-      device_name = "GigabitEthernet";
-      break;
-
-    case VNET_DPDK_PORT_TYPE_ETH_10G:
-      device_name = "TenGigabitEthernet";
-      break;
-
-    case VNET_DPDK_PORT_TYPE_ETH_40G:
-      device_name = "FortyGigabitEthernet";
-      break;
-
-    case VNET_DPDK_PORT_TYPE_ETH_100G:
-      device_name = "HundredGigabitEthernet";
-      break;
-
-    case VNET_DPDK_PORT_TYPE_ETH_BOND:
-      return format (s, "BondEthernet%d", dm->devices[i].device_index);
-
-    case VNET_DPDK_PORT_TYPE_ETH_SWITCH:
-      device_name = "EthernetSwitch";
-      break;
-
-    case VNET_DPDK_PORT_TYPE_AF_PACKET:
-      rte_eth_dev_info_get (i, &dev_info);
-      return format (s, "af_packet%d", dm->devices[i].af_packet_port_id);
-
-    default:
-    case VNET_DPDK_PORT_TYPE_UNKNOWN:
-      device_name = "UnknownEthernet";
-      break;
-    }
-
-  rte_eth_dev_info_get (i, &dev_info);
-
-  if (dev_info.pci_dev)
-    ret = format (s, devname_format, device_name, dev_info.pci_dev->addr.bus,
-		  dev_info.pci_dev->addr.devid,
-		  dev_info.pci_dev->addr.function);
-  else
-    ret = format (s, "%s%d", device_name, dm->devices[i].device_index);
-
-  if (dm->devices[i].interface_name_suffix)
-    return format (ret, "/%s", dm->devices[i].interface_name_suffix);
-  return ret;
-}
-
-static u8 *
-format_dpdk_device_type (u8 * s, va_list * args)
-{
-  dpdk_main_t *dm = &dpdk_main;
-  char *dev_type;
-  u32 i = va_arg (*args, u32);
-
-  switch (dm->devices[i].pmd)
-    {
-    case VNET_DPDK_PMD_E1000EM:
-      dev_type = "Intel 82540EM (e1000)";
-      break;
-
-    case VNET_DPDK_PMD_IGB:
-      dev_type = "Intel e1000";
-      break;
-
-    case VNET_DPDK_PMD_I40E:
-      dev_type = "Intel X710/XL710 Family";
-      break;
-
-    case VNET_DPDK_PMD_I40EVF:
-      dev_type = "Intel X710/XL710 Family VF";
-      break;
-
-    case VNET_DPDK_PMD_FM10K:
-      dev_type = "Intel FM10000 Family Ethernet Switch";
-      break;
-
-    case VNET_DPDK_PMD_IGBVF:
-      dev_type = "Intel e1000 VF";
-      break;
-
-    case VNET_DPDK_PMD_VIRTIO:
-      dev_type = "Red Hat Virtio";
-      break;
-
-    case VNET_DPDK_PMD_IXGBEVF:
-      dev_type = "Intel 82599 VF";
-      break;
-
-    case VNET_DPDK_PMD_IXGBE:
-      dev_type = "Intel 82599";
-      break;
-
-    case VNET_DPDK_PMD_ENIC:
-      dev_type = "Cisco VIC";
-      break;
-
-    case VNET_DPDK_PMD_CXGBE:
-      dev_type = "Chelsio T4/T5";
-      break;
-
-    case VNET_DPDK_PMD_MLX5:
-      dev_type = "Mellanox ConnectX-4 Family";
-      break;
-
-    case VNET_DPDK_PMD_VMXNET3:
-      dev_type = "VMware VMXNET3";
-      break;
-
-    case VNET_DPDK_PMD_AF_PACKET:
-      dev_type = "af_packet";
-      break;
-
-    case VNET_DPDK_PMD_BOND:
-      dev_type = "Ethernet Bonding";
-      break;
-
-    case VNET_DPDK_PMD_DPAA2:
-      dev_type = "NXP DPAA2 Mac";
-      break;
-
-    default:
-    case VNET_DPDK_PMD_UNKNOWN:
-      dev_type = "### UNKNOWN ###";
-      break;
-    }
-
-  return format (s, dev_type);
-}
-
-static u8 *
-format_dpdk_link_status (u8 * s, va_list * args)
-{
-  dpdk_device_t *xd = va_arg (*args, dpdk_device_t *);
-  struct rte_eth_link *l = &xd->link;
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, xd->vlib_hw_if_index);
-
-  s = format (s, "%s ", l->link_status ? "up" : "down");
-  if (l->link_status)
-    {
-      u32 promisc = rte_eth_promiscuous_get (xd->device_index);
-
-      s = format (s, "%s duplex ", (l->link_duplex == ETH_LINK_FULL_DUPLEX) ?
-		  "full" : "half");
-      s = format (s, "speed %u mtu %d %s\n", l->link_speed,
-		  hi->max_packet_bytes, promisc ? " promisc" : "");
-    }
-  else
-    s = format (s, "\n");
-
-  return s;
-}
-
-#define _line_len 72
-#define _(v, str)                                            \
-if (bitmap & v) {                                            \
-  if (format_get_indent (s) > next_split ) {                 \
-    next_split += _line_len;                                 \
-    s = format(s,"\n%U", format_white_space, indent);        \
-  }                                                          \
-  s = format(s, "%s ", str);                                 \
-}
-
-static u8 *
-format_dpdk_rss_hf_name (u8 * s, va_list * args)
-{
-  u64 bitmap = va_arg (*args, u64);
-  int next_split = _line_len;
-  int indent = format_get_indent (s);
-
-  if (!bitmap)
-    return format (s, "none");
-
-  foreach_dpdk_rss_hf return s;
-}
-
-static u8 *
-format_dpdk_rx_offload_caps (u8 * s, va_list * args)
-{
-  u32 bitmap = va_arg (*args, u32);
-  int next_split = _line_len;
-  int indent = format_get_indent (s);
-
-  if (!bitmap)
-    return format (s, "none");
-
-  foreach_dpdk_rx_offload_caps return s;
-}
-
-static u8 *
-format_dpdk_tx_offload_caps (u8 * s, va_list * args)
-{
-  u32 bitmap = va_arg (*args, u32);
-  int next_split = _line_len;
-  int indent = format_get_indent (s);
-  if (!bitmap)
-    return format (s, "none");
-
-  foreach_dpdk_tx_offload_caps return s;
-}
-
-#undef _line_len
-#undef _
-
-u8 *
-format_dpdk_device (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  int verbose = va_arg (*args, int);
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_t *xd = vec_elt_at_index (dm->devices, dev_instance);
-  uword indent = format_get_indent (s);
-  f64 now = vlib_time_now (dm->vlib_main);
-  struct rte_eth_dev_info di;
-
-  dpdk_update_counters (xd, now);
-  dpdk_update_link_state (xd, now);
-
-  s = format (s, "%U\n%Ucarrier %U",
-	      format_dpdk_device_type, xd->device_index,
-	      format_white_space, indent + 2, format_dpdk_link_status, xd);
-
-  rte_eth_dev_info_get (xd->device_index, &di);
-
-  if (verbose > 1 && xd->flags & DPDK_DEVICE_FLAG_PMD)
-    {
-      struct rte_pci_device *pci;
-      struct rte_eth_rss_conf rss_conf;
-      int vlan_off;
-      int retval;
-
-      rss_conf.rss_key = 0;
-      retval = rte_eth_dev_rss_hash_conf_get (xd->device_index, &rss_conf);
-      if (retval < 0)
-	clib_warning ("rte_eth_dev_rss_hash_conf_get returned %d", retval);
-      pci = di.pci_dev;
-
-      if (pci)
-	s =
-	  format (s,
-		  "%Upci id:            device %04x:%04x subsystem %04x:%04x\n"
-		  "%Upci address:       %04x:%02x:%02x.%02x\n",
-		  format_white_space, indent + 2, pci->id.vendor_id,
-		  pci->id.device_id, pci->id.subsystem_vendor_id,
-		  pci->id.subsystem_device_id, format_white_space, indent + 2,
-		  pci->addr.domain, pci->addr.bus, pci->addr.devid,
-		  pci->addr.function);
-      s =
-	format (s, "%Umax rx packet len: %d\n", format_white_space,
-		indent + 2, di.max_rx_pktlen);
-      s =
-	format (s, "%Umax num of queues: rx %d tx %d\n", format_white_space,
-		indent + 2, di.max_rx_queues, di.max_tx_queues);
-      s =
-	format (s, "%Upromiscuous:       unicast %s all-multicast %s\n",
-		format_white_space, indent + 2,
-		rte_eth_promiscuous_get (xd->device_index) ? "on" : "off",
-		rte_eth_promiscuous_get (xd->device_index) ? "on" : "off");
-      vlan_off = rte_eth_dev_get_vlan_offload (xd->device_index);
-      s = format (s, "%Uvlan offload:      strip %s filter %s qinq %s\n",
-		  format_white_space, indent + 2,
-		  vlan_off & ETH_VLAN_STRIP_OFFLOAD ? "on" : "off",
-		  vlan_off & ETH_VLAN_FILTER_OFFLOAD ? "on" : "off",
-		  vlan_off & ETH_VLAN_EXTEND_OFFLOAD ? "on" : "off");
-      s = format (s, "%Urx offload caps:   %U\n",
-		  format_white_space, indent + 2,
-		  format_dpdk_rx_offload_caps, di.rx_offload_capa);
-      s = format (s, "%Utx offload caps:   %U\n",
-		  format_white_space, indent + 2,
-		  format_dpdk_tx_offload_caps, di.tx_offload_capa);
-      s = format (s, "%Urss active:        %U\n"
-		  "%Urss supported:     %U\n",
-		  format_white_space, indent + 2,
-		  format_dpdk_rss_hf_name, rss_conf.rss_hf,
-		  format_white_space, indent + 2,
-		  format_dpdk_rss_hf_name, di.flow_type_rss_offloads);
-    }
-
-  s = format (s, "%Urx queues %d, rx desc %d, tx queues %d, tx desc %d\n",
-	      format_white_space, indent + 2,
-	      xd->rx_q_used, xd->nb_rx_desc, xd->tx_q_used, xd->nb_tx_desc);
-
-  if (xd->cpu_socket > -1)
-    s = format (s, "%Ucpu socket %d\n",
-		format_white_space, indent + 2, xd->cpu_socket);
-
-  /* $$$ MIB counters  */
-  {
-#define _(N, V)							\
-    if ((xd->stats.V - xd->last_cleared_stats.V) != 0) {       \
-      s = format (s, "\n%U%-40U%16Ld",                         \
-                  format_white_space, indent + 2,              \
-                  format_c_identifier, #N,                     \
-                  xd->stats.V - xd->last_cleared_stats.V);     \
-    }                                                          \
-
-    foreach_dpdk_counter
-#undef _
-  }
-
-  u8 *xs = 0;
-  u32 i = 0;
-  struct rte_eth_xstat *xstat, *last_xstat;
-  struct rte_eth_xstat_name *xstat_names = 0;
-  int len = rte_eth_xstats_get_names (xd->device_index, NULL, 0);
-  vec_validate (xstat_names, len - 1);
-  rte_eth_xstats_get_names (xd->device_index, xstat_names, len);
-
-  ASSERT (vec_len (xd->xstats) == vec_len (xd->last_cleared_xstats));
-
-  /* *INDENT-OFF* */
-  vec_foreach_index(i, xd->xstats)
-    {
-      u64 delta = 0;
-      xstat = vec_elt_at_index(xd->xstats, i);
-      last_xstat = vec_elt_at_index(xd->last_cleared_xstats, i);
-
-      delta = xstat->value - last_xstat->value;
-      if (verbose == 2 || (verbose && delta))
-        {
-          /* format_c_identifier doesn't like c strings inside vector */
-          u8 * name = format(0,"%s", xstat_names[i].name);
-          xs = format(xs, "\n%U%-38U%16Ld",
-                      format_white_space, indent + 4,
-                      format_c_identifier, name, delta);
-          vec_free(name);
-        }
-    }
-  /* *INDENT-ON* */
-
-  vec_free (xstat_names);
-
-  if (xs)
-    {
-      s = format (s, "\n%Uextended stats:%v",
-		  format_white_space, indent + 2, xs);
-      vec_free (xs);
-    }
-
-  return s;
-}
-
-u8 *
-format_dpdk_tx_dma_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  CLIB_UNUSED (vnet_main_t * vnm) = vnet_get_main ();
-  dpdk_tx_dma_trace_t *t = va_arg (*va, dpdk_tx_dma_trace_t *);
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_t *xd = vec_elt_at_index (dm->devices, t->device_index);
-  uword indent = format_get_indent (s);
-  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
-
-  s = format (s, "%U tx queue %d",
-	      format_vnet_sw_interface_name, vnm, sw, t->queue_index);
-
-  s = format (s, "\n%Ubuffer 0x%x: %U",
-	      format_white_space, indent,
-	      t->buffer_index, format_vlib_buffer, &t->buffer);
-
-  s = format (s, "\n%U%U", format_white_space, indent,
-	      format_ethernet_header_with_length, t->buffer.pre_data,
-	      sizeof (t->buffer.pre_data));
-
-  return s;
-}
-
-u8 *
-format_dpdk_rx_dma_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  CLIB_UNUSED (vnet_main_t * vnm) = vnet_get_main ();
-  dpdk_rx_dma_trace_t *t = va_arg (*va, dpdk_rx_dma_trace_t *);
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_t *xd = vec_elt_at_index (dm->devices, t->device_index);
-  format_function_t *f;
-  uword indent = format_get_indent (s);
-  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
-
-  s = format (s, "%U rx queue %d",
-	      format_vnet_sw_interface_name, vnm, sw, t->queue_index);
-
-  s = format (s, "\n%Ubuffer 0x%x: %U",
-	      format_white_space, indent,
-	      t->buffer_index, format_vlib_buffer, &t->buffer);
-
-  s = format (s, "\n%U%U",
-	      format_white_space, indent,
-	      format_dpdk_rte_mbuf, &t->mb, &t->data);
-
-  if (vm->trace_main.verbose)
-    {
-      s = format (s, "\n%UPacket Dump%s", format_white_space, indent + 2,
-		  t->mb.data_len > sizeof (t->data) ? " (truncated)" : "");
-      s = format (s, "\n%U%U", format_white_space, indent + 4,
-		  format_hexdump, &t->data,
-		  t->mb.data_len >
-		  sizeof (t->data) ? sizeof (t->data) : t->mb.data_len);
-    }
-  f = node->format_buffer;
-  if (!f)
-    f = format_hex_bytes;
-  s = format (s, "\n%U%U", format_white_space, indent,
-	      f, t->buffer.pre_data, sizeof (t->buffer.pre_data));
-
-  return s;
-}
-
-
-static inline u8 *
-format_dpdk_pkt_types (u8 * s, va_list * va)
-{
-  u32 *pkt_types = va_arg (*va, u32 *);
-  uword indent __attribute__ ((unused)) = format_get_indent (s) + 2;
-
-  if (!*pkt_types)
-    return s;
-
-  s = format (s, "Packet Types");
-
-#define _(L, F, S)             \
-  if ((*pkt_types & RTE_PTYPE_##L##_MASK) == RTE_PTYPE_##L##_##F)           \
-    {                                                                       \
-      s = format (s, "\n%U%s (0x%04x) %s", format_white_space, indent,      \
-                     "RTE_PTYPE_" #L "_" #F, RTE_PTYPE_##L##_##F, S);       \
-    }
-
-  foreach_dpdk_pkt_type
-#undef _
-    return s;
-}
-
-static inline u8 *
-format_dpdk_pkt_offload_flags (u8 * s, va_list * va)
-{
-  u64 *ol_flags = va_arg (*va, u64 *);
-  uword indent = format_get_indent (s) + 2;
-
-  if (!*ol_flags)
-    return s;
-
-  s = format (s, "Packet Offload Flags");
-
-#define _(F, S)             \
-  if (*ol_flags & F)            \
-    {               \
-      s = format (s, "\n%U%s (0x%04x) %s",      \
-      format_white_space, indent, #F, F, S);  \
-    }
-
-  foreach_dpdk_pkt_offload_flag
-#undef _
-    return s;
-}
-
-u8 *
-format_dpdk_rte_mbuf_vlan (u8 * s, va_list * va)
-{
-  ethernet_vlan_header_tv_t *vlan_hdr =
-    va_arg (*va, ethernet_vlan_header_tv_t *);
-
-  if (clib_net_to_host_u16 (vlan_hdr->type) == ETHERNET_TYPE_DOT1AD)
-    {
-      s = format (s, "%U 802.1q vlan ",
-		  format_ethernet_vlan_tci,
-		  clib_net_to_host_u16 (vlan_hdr->priority_cfi_and_id));
-      vlan_hdr++;
-    }
-
-  s = format (s, "%U",
-	      format_ethernet_vlan_tci,
-	      clib_net_to_host_u16 (vlan_hdr->priority_cfi_and_id));
-
-  return s;
-}
-
-u8 *
-format_dpdk_rte_mbuf (u8 * s, va_list * va)
-{
-  struct rte_mbuf *mb = va_arg (*va, struct rte_mbuf *);
-  ethernet_header_t *eth_hdr = va_arg (*va, ethernet_header_t *);
-  uword indent = format_get_indent (s) + 2;
-
-  s = format (s, "PKT MBUF: port %d, nb_segs %d, pkt_len %d"
-	      "\n%Ubuf_len %d, data_len %d, ol_flags 0x%x, data_off %d, phys_addr 0x%x"
-	      "\n%Upacket_type 0x%x",
-	      mb->port, mb->nb_segs, mb->pkt_len,
-	      format_white_space, indent,
-	      mb->buf_len, mb->data_len, mb->ol_flags, mb->data_off,
-	      mb->buf_physaddr, format_white_space, indent, mb->packet_type);
-
-  if (mb->ol_flags)
-    s = format (s, "\n%U%U", format_white_space, indent,
-		format_dpdk_pkt_offload_flags, &mb->ol_flags);
-
-  if ((mb->ol_flags & PKT_RX_VLAN_PKT) &&
-      ((mb->ol_flags & (PKT_RX_VLAN_STRIPPED | PKT_RX_QINQ_STRIPPED)) == 0))
-    {
-      ethernet_vlan_header_tv_t *vlan_hdr =
-	((ethernet_vlan_header_tv_t *) & (eth_hdr->type));
-      s = format (s, " %U", format_dpdk_rte_mbuf_vlan, vlan_hdr);
-    }
-
-  if (mb->packet_type)
-    s = format (s, "\n%U%U", format_white_space, indent,
-		format_dpdk_pkt_types, &mb->packet_type);
-
-  return s;
-}
-
-uword
-unformat_socket_mem (unformat_input_t * input, va_list * va)
-{
-  uword **r = va_arg (*va, uword **);
-  int i = 0;
-  u32 mem;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, ","))
-	hash_set (*r, i, 1024);
-      else if (unformat (input, "%u,", &mem))
-	hash_set (*r, i, mem);
-      else if (unformat (input, "%u", &mem))
-	hash_set (*r, i, mem);
-      else
-	{
-	  unformat_put_input (input);
-	  goto done;
-	}
-      i++;
-    }
-
-done:
-  return 1;
-}
-
-clib_error_t *
-unformat_rss_fn (unformat_input_t * input, uword * rss_fn)
-{
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (0)
-	;
-#undef _
-#define _(f, s)                                 \
-      else if (unformat (input, s))             \
-        *rss_fn |= f;
-
-      foreach_dpdk_rss_hf
-#undef _
-	else
-	{
-	  return clib_error_return (0, "unknown input `%U'",
-				    format_unformat_error, input);
-	}
-    }
-  return 0;
-}
-
-clib_error_t *
-unformat_hqos (unformat_input_t * input, dpdk_device_config_hqos_t * hqos)
-{
-  clib_error_t *error = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "hqos-thread %u", &hqos->hqos_thread))
-	hqos->hqos_thread_valid = 1;
-      else
-	{
-	  error = clib_error_return (0, "unknown input `%U'",
-				     format_unformat_error, input);
-	  break;
-	}
-    }
-
-  return error;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/hqos.c b/vnet/vnet/devices/dpdk/hqos.c
deleted file mode 100644
index d68bc48f..00000000
--- a/vnet/vnet/devices/dpdk/hqos.c
+++ /dev/null
@@ -1,775 +0,0 @@
-/*
- * Copyright(c) 2016 Intel Corporation. All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/mount.h>
-#include <string.h>
-#include <fcntl.h>
-
-#include <vppinfra/vec.h>
-#include <vppinfra/error.h>
-#include <vppinfra/format.h>
-#include <vppinfra/bitmap.h>
-
-#include <vnet/vnet.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/devices/dpdk/dpdk.h>
-
-#include <vlib/unix/physmem.h>
-#include <vlib/pci/pci.h>
-#include <vlibmemory/api.h>
-#include <vlibmemory/vl_memory_msg_enum.h>	/* enumerate all vlib messages */
-
-#define vl_typedefs		/* define message structures */
-#include <vlibmemory/vl_memory_api_h.h>
-#undef vl_typedefs
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vlibmemory/vl_memory_api_h.h>
-#undef vl_printfun
-
-#include "dpdk_priv.h"
-
-dpdk_main_t dpdk_main;
-
-/***
- *
- * HQoS default configuration values
- *
- ***/
-
-static dpdk_device_config_hqos_t hqos_params_default = {
-  .hqos_thread_valid = 0,
-
-  .swq_size = 4096,
-  .burst_enq = 256,
-  .burst_deq = 220,
-
-  /*
-   * Packet field to identify the subport.
-   *
-   * Default value: Since only one subport is defined by default (see below:
-   *     n_subports_per_port = 1), the subport ID is hardcoded to 0.
-   */
-  .pktfield0_slabpos = 0,
-  .pktfield0_slabmask = 0,
-
-  /*
-   * Packet field to identify the pipe.
-   *
-   * Default value: Assuming Ethernet/IPv4/UDP packets, UDP payload bits 12 .. 23
-   */
-  .pktfield1_slabpos = 40,
-  .pktfield1_slabmask = 0x0000000FFF000000LLU,
-
-  /* Packet field used as index into TC translation table to identify the traffic
-   *     class and queue.
-   *
-   * Default value: Assuming Ethernet/IPv4 packets, IPv4 DSCP field
-   */
-  .pktfield2_slabpos = 8,
-  .pktfield2_slabmask = 0x00000000000000FCLLU,
-  .tc_table = {
-	       0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-	       0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-	       0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-	       0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-	       },
-
-  /* port */
-  .port = {
-	   .name = NULL,	/* Set at init */
-	   .socket = 0,		/* Set at init */
-	   .rate = 1250000000,	/* Assuming 10GbE port */
-	   .mtu = 14 + 1500,	/* Assuming Ethernet/IPv4 pkt (Ethernet FCS not included) */
-	   .frame_overhead = RTE_SCHED_FRAME_OVERHEAD_DEFAULT,
-	   .n_subports_per_port = 1,
-	   .n_pipes_per_subport = 4096,
-	   .qsize = {64, 64, 64, 64},
-	   .pipe_profiles = NULL,	/* Set at config */
-	   .n_pipe_profiles = 1,
-
-#ifdef RTE_SCHED_RED
-	   .red_params = {
-			  /* Traffic Class 0 Colors Green / Yellow / Red */
-			  [0][0] = {.min_th = 48,.max_th = 64,.maxp_inv =
-				    10,.wq_log2 = 9},
-			  [0][1] = {.min_th = 40,.max_th = 64,.maxp_inv =
-				    10,.wq_log2 = 9},
-			  [0][2] = {.min_th = 32,.max_th = 64,.maxp_inv =
-				    10,.wq_log2 = 9},
-
-			  /* Traffic Class 1 - Colors Green / Yellow / Red */
-			  [1][0] = {.min_th = 48,.max_th = 64,.maxp_inv =
-				    10,.wq_log2 = 9},
-			  [1][1] = {.min_th = 40,.max_th = 64,.maxp_inv =
-				    10,.wq_log2 = 9},
-			  [1][2] = {.min_th = 32,.max_th = 64,.maxp_inv =
-				    10,.wq_log2 = 9},
-
-			  /* Traffic Class 2 - Colors Green / Yellow / Red */
-			  [2][0] = {.min_th = 48,.max_th = 64,.maxp_inv =
-				    10,.wq_log2 = 9},
-			  [2][1] = {.min_th = 40,.max_th = 64,.maxp_inv =
-				    10,.wq_log2 = 9},
-			  [2][2] = {.min_th = 32,.max_th = 64,.maxp_inv =
-				    10,.wq_log2 = 9},
-
-			  /* Traffic Class 3 - Colors Green / Yellow / Red */
-			  [3][0] = {.min_th = 48,.max_th = 64,.maxp_inv =
-				    10,.wq_log2 = 9},
-			  [3][1] = {.min_th = 40,.max_th = 64,.maxp_inv =
-				    10,.wq_log2 = 9},
-			  [3][2] = {.min_th = 32,.max_th = 64,.maxp_inv =
-				    10,.wq_log2 = 9}
-			  },
-#endif /* RTE_SCHED_RED */
-	   },
-};
-
-static struct rte_sched_subport_params hqos_subport_params_default = {
-  .tb_rate = 1250000000,	/* 10GbE line rate (measured in bytes/second) */
-  .tb_size = 1000000,
-  .tc_rate = {1250000000, 1250000000, 1250000000, 1250000000},
-  .tc_period = 10,
-};
-
-static struct rte_sched_pipe_params hqos_pipe_params_default = {
-  .tb_rate = 305175,		/* 10GbE line rate divided by 4K pipes */
-  .tb_size = 1000000,
-  .tc_rate = {305175, 305175, 305175, 305175},
-  .tc_period = 40,
-#ifdef RTE_SCHED_SUBPORT_TC_OV
-  .tc_ov_weight = 1,
-#endif
-  .wrr_weights = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
-};
-
-/***
- *
- * HQoS configuration
- *
- ***/
-
-int
-dpdk_hqos_validate_mask (u64 mask, u32 n)
-{
-  int count = __builtin_popcountll (mask);
-  int pos_lead = sizeof (u64) * 8 - __builtin_clzll (mask);
-  int pos_trail = __builtin_ctzll (mask);
-  int count_expected = __builtin_popcount (n - 1);
-
-  /* Handle the exceptions */
-  if (n == 0)
-    return -1;			/* Error */
-
-  if ((mask == 0) && (n == 1))
-    return 0;			/* OK */
-
-  if (((mask == 0) && (n != 1)) || ((mask != 0) && (n == 1)))
-    return -2;			/* Error */
-
-  /* Check that mask is contiguous */
-  if ((pos_lead - pos_trail) != count)
-    return -3;			/* Error */
-
-  /* Check that mask contains the expected number of bits set */
-  if (count != count_expected)
-    return -4;			/* Error */
-
-  return 0;			/* OK */
-}
-
-void
-dpdk_device_config_hqos_pipe_profile_default (dpdk_device_config_hqos_t *
-					      hqos, u32 pipe_profile_id)
-{
-  memcpy (&hqos->pipe[pipe_profile_id], &hqos_pipe_params_default,
-	  sizeof (hqos_pipe_params_default));
-}
-
-void
-dpdk_device_config_hqos_default (dpdk_device_config_hqos_t * hqos)
-{
-  struct rte_sched_subport_params *subport_params;
-  struct rte_sched_pipe_params *pipe_params;
-  u32 *pipe_map;
-  u32 i;
-
-  memcpy (hqos, &hqos_params_default, sizeof (hqos_params_default));
-
-  /* pipe */
-  vec_add2 (hqos->pipe, pipe_params, hqos->port.n_pipe_profiles);
-
-  for (i = 0; i < vec_len (hqos->pipe); i++)
-    memcpy (&pipe_params[i],
-	    &hqos_pipe_params_default, sizeof (hqos_pipe_params_default));
-
-  hqos->port.pipe_profiles = hqos->pipe;
-
-  /* subport */
-  vec_add2 (hqos->subport, subport_params, hqos->port.n_subports_per_port);
-
-  for (i = 0; i < vec_len (hqos->subport); i++)
-    memcpy (&subport_params[i],
-	    &hqos_subport_params_default,
-	    sizeof (hqos_subport_params_default));
-
-  /* pipe profile */
-  vec_add2 (hqos->pipe_map,
-	    pipe_map,
-	    hqos->port.n_subports_per_port * hqos->port.n_pipes_per_subport);
-
-  for (i = 0; i < vec_len (hqos->pipe_map); i++)
-    pipe_map[i] = 0;
-}
-
-/***
- *
- * HQoS init
- *
- ***/
-
-clib_error_t *
-dpdk_port_setup_hqos (dpdk_device_t * xd, dpdk_device_config_hqos_t * hqos)
-{
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  char name[32];
-  u32 subport_id, i;
-  int rv;
-
-  /* Detect the set of worker threads */
-  int worker_thread_first = 0;
-  int worker_thread_count = 0;
-
-  uword *p = hash_get_mem (tm->thread_registrations_by_name, "workers");
-  vlib_thread_registration_t *tr =
-    p ? (vlib_thread_registration_t *) p[0] : 0;
-
-  if (tr && tr->count > 0)
-    {
-      worker_thread_first = tr->first_index;
-      worker_thread_count = tr->count;
-    }
-
-  /* Allocate the per-thread device data array */
-  vec_validate_aligned (xd->hqos_wt, tm->n_vlib_mains - 1,
-			CLIB_CACHE_LINE_BYTES);
-  memset (xd->hqos_wt, 0, tm->n_vlib_mains * sizeof (xd->hqos_wt[0]));
-
-  vec_validate_aligned (xd->hqos_ht, 0, CLIB_CACHE_LINE_BYTES);
-  memset (xd->hqos_ht, 0, sizeof (xd->hqos_ht[0]));
-
-  /* Allocate space for one SWQ per worker thread in the I/O TX thread data structure */
-  vec_validate (xd->hqos_ht->swq, worker_thread_count);
-
-  /* SWQ */
-  for (i = 0; i < worker_thread_count + 1; i++)
-    {
-      u32 swq_flags = RING_F_SP_ENQ | RING_F_SC_DEQ;
-
-      snprintf (name, sizeof (name), "SWQ-worker%u-to-device%u", i,
-		xd->device_index);
-      xd->hqos_ht->swq[i] =
-	rte_ring_create (name, hqos->swq_size, xd->cpu_socket, swq_flags);
-      if (xd->hqos_ht->swq[i] == NULL)
-	return clib_error_return (0,
-				  "SWQ-worker%u-to-device%u: rte_ring_create err",
-				  i, xd->device_index);
-    }
-
-  /*
-   * HQoS
-   */
-
-  /* HQoS port */
-  snprintf (name, sizeof (name), "HQoS%u", xd->device_index);
-  hqos->port.name = strdup (name);
-  if (hqos->port.name == NULL)
-    return clib_error_return (0, "HQoS%u: strdup err", xd->device_index);
-
-  hqos->port.socket = rte_eth_dev_socket_id (xd->device_index);
-  if (hqos->port.socket == SOCKET_ID_ANY)
-    hqos->port.socket = 0;
-
-  xd->hqos_ht->hqos = rte_sched_port_config (&hqos->port);
-  if (xd->hqos_ht->hqos == NULL)
-    return clib_error_return (0, "HQoS%u: rte_sched_port_config err",
-			      xd->device_index);
-
-  /* HQoS subport */
-  for (subport_id = 0; subport_id < hqos->port.n_subports_per_port;
-       subport_id++)
-    {
-      u32 pipe_id;
-
-      rv =
-	rte_sched_subport_config (xd->hqos_ht->hqos, subport_id,
-				  &hqos->subport[subport_id]);
-      if (rv)
-	return clib_error_return (0,
-				  "HQoS%u subport %u: rte_sched_subport_config err (%d)",
-				  xd->device_index, subport_id, rv);
-
-      /* HQoS pipe */
-      for (pipe_id = 0; pipe_id < hqos->port.n_pipes_per_subport; pipe_id++)
-	{
-	  u32 pos = subport_id * hqos->port.n_pipes_per_subport + pipe_id;
-	  u32 profile_id = hqos->pipe_map[pos];
-
-	  rv =
-	    rte_sched_pipe_config (xd->hqos_ht->hqos, subport_id, pipe_id,
-				   profile_id);
-	  if (rv)
-	    return clib_error_return (0,
-				      "HQoS%u subport %u pipe %u: rte_sched_pipe_config err (%d)",
-				      xd->device_index, subport_id, pipe_id,
-				      rv);
-	}
-    }
-
-  /* Set up per-thread device data for the I/O TX thread */
-  xd->hqos_ht->hqos_burst_enq = hqos->burst_enq;
-  xd->hqos_ht->hqos_burst_deq = hqos->burst_deq;
-  vec_validate (xd->hqos_ht->pkts_enq, 2 * hqos->burst_enq - 1);
-  vec_validate (xd->hqos_ht->pkts_deq, hqos->burst_deq - 1);
-  xd->hqos_ht->pkts_enq_len = 0;
-  xd->hqos_ht->swq_pos = 0;
-  xd->hqos_ht->flush_count = 0;
-
-  /* Set up per-thread device data for each worker thread */
-  for (i = 0; i < worker_thread_count + 1; i++)
-    {
-      u32 tid;
-      if (i)
-	tid = worker_thread_first + (i - 1);
-      else
-	tid = i;
-
-      xd->hqos_wt[tid].swq = xd->hqos_ht->swq[i];
-      xd->hqos_wt[tid].hqos_field0_slabpos = hqos->pktfield0_slabpos;
-      xd->hqos_wt[tid].hqos_field0_slabmask = hqos->pktfield0_slabmask;
-      xd->hqos_wt[tid].hqos_field0_slabshr =
-	__builtin_ctzll (hqos->pktfield0_slabmask);
-      xd->hqos_wt[tid].hqos_field1_slabpos = hqos->pktfield1_slabpos;
-      xd->hqos_wt[tid].hqos_field1_slabmask = hqos->pktfield1_slabmask;
-      xd->hqos_wt[tid].hqos_field1_slabshr =
-	__builtin_ctzll (hqos->pktfield1_slabmask);
-      xd->hqos_wt[tid].hqos_field2_slabpos = hqos->pktfield2_slabpos;
-      xd->hqos_wt[tid].hqos_field2_slabmask = hqos->pktfield2_slabmask;
-      xd->hqos_wt[tid].hqos_field2_slabshr =
-	__builtin_ctzll (hqos->pktfield2_slabmask);
-      memcpy (xd->hqos_wt[tid].hqos_tc_table, hqos->tc_table,
-	      sizeof (hqos->tc_table));
-    }
-
-  return 0;
-}
-
-/***
- *
- * HQoS run-time
- *
- ***/
-/*
- * dpdk_hqos_thread - Contains the main loop of an HQoS thread.
- *
- * w
- *     Information for the current thread
- */
-static_always_inline void
-dpdk_hqos_thread_internal_hqos_dbg_bypass (vlib_main_t * vm)
-{
-  dpdk_main_t *dm = &dpdk_main;
-  u32 cpu_index = vm->cpu_index;
-  u32 dev_pos;
-
-  dev_pos = 0;
-  while (1)
-    {
-      vlib_worker_thread_barrier_check ();
-
-      u32 n_devs = vec_len (dm->devices_by_hqos_cpu[cpu_index]);
-      if (dev_pos >= n_devs)
-	dev_pos = 0;
-
-      dpdk_device_and_queue_t *dq =
-	vec_elt_at_index (dm->devices_by_hqos_cpu[cpu_index], dev_pos);
-      dpdk_device_t *xd = vec_elt_at_index (dm->devices, dq->device);
-
-      dpdk_device_hqos_per_hqos_thread_t *hqos = xd->hqos_ht;
-      u32 device_index = xd->device_index;
-      u16 queue_id = dq->queue_id;
-
-      struct rte_mbuf **pkts_enq = hqos->pkts_enq;
-      u32 pkts_enq_len = hqos->pkts_enq_len;
-      u32 swq_pos = hqos->swq_pos;
-      u32 n_swq = vec_len (hqos->swq), i;
-      u32 flush_count = hqos->flush_count;
-
-      for (i = 0; i < n_swq; i++)
-	{
-	  /* Get current SWQ for this device */
-	  struct rte_ring *swq = hqos->swq[swq_pos];
-
-	  /* Read SWQ burst to packet buffer of this device */
-	  pkts_enq_len += rte_ring_sc_dequeue_burst (swq,
-						     (void **)
-						     &pkts_enq[pkts_enq_len],
-						     hqos->hqos_burst_enq);
-
-	  /* Get next SWQ for this device */
-	  swq_pos++;
-	  if (swq_pos >= n_swq)
-	    swq_pos = 0;
-	  hqos->swq_pos = swq_pos;
-
-	  /* HWQ TX enqueue when burst available */
-	  if (pkts_enq_len >= hqos->hqos_burst_enq)
-	    {
-	      u32 n_pkts = rte_eth_tx_burst (device_index,
-					     (uint16_t) queue_id,
-					     pkts_enq,
-					     (uint16_t) pkts_enq_len);
-
-	      for (; n_pkts < pkts_enq_len; n_pkts++)
-		rte_pktmbuf_free (pkts_enq[n_pkts]);
-
-	      pkts_enq_len = 0;
-	      flush_count = 0;
-	      break;
-	    }
-	}
-      if (pkts_enq_len)
-	{
-	  flush_count++;
-	  if (PREDICT_FALSE (flush_count == HQOS_FLUSH_COUNT_THRESHOLD))
-	    {
-	      rte_sched_port_enqueue (hqos->hqos, pkts_enq, pkts_enq_len);
-
-	      pkts_enq_len = 0;
-	      flush_count = 0;
-	    }
-	}
-      hqos->pkts_enq_len = pkts_enq_len;
-      hqos->flush_count = flush_count;
-
-      /* Advance to next device */
-      dev_pos++;
-    }
-}
-
-static_always_inline void
-dpdk_hqos_thread_internal (vlib_main_t * vm)
-{
-  dpdk_main_t *dm = &dpdk_main;
-  u32 cpu_index = vm->cpu_index;
-  u32 dev_pos;
-
-  dev_pos = 0;
-  while (1)
-    {
-      vlib_worker_thread_barrier_check ();
-
-      u32 n_devs = vec_len (dm->devices_by_hqos_cpu[cpu_index]);
-      if (PREDICT_FALSE (n_devs == 0))
-	{
-	  dev_pos = 0;
-	  continue;
-	}
-      if (dev_pos >= n_devs)
-	dev_pos = 0;
-
-      dpdk_device_and_queue_t *dq =
-	vec_elt_at_index (dm->devices_by_hqos_cpu[cpu_index], dev_pos);
-      dpdk_device_t *xd = vec_elt_at_index (dm->devices, dq->device);
-
-      dpdk_device_hqos_per_hqos_thread_t *hqos = xd->hqos_ht;
-      u32 device_index = xd->device_index;
-      u16 queue_id = dq->queue_id;
-
-      struct rte_mbuf **pkts_enq = hqos->pkts_enq;
-      struct rte_mbuf **pkts_deq = hqos->pkts_deq;
-      u32 pkts_enq_len = hqos->pkts_enq_len;
-      u32 swq_pos = hqos->swq_pos;
-      u32 n_swq = vec_len (hqos->swq), i;
-      u32 flush_count = hqos->flush_count;
-
-      /*
-       * SWQ dequeue and HQoS enqueue for current device
-       */
-      for (i = 0; i < n_swq; i++)
-	{
-	  /* Get current SWQ for this device */
-	  struct rte_ring *swq = hqos->swq[swq_pos];
-
-	  /* Read SWQ burst to packet buffer of this device */
-	  pkts_enq_len += rte_ring_sc_dequeue_burst (swq,
-						     (void **)
-						     &pkts_enq[pkts_enq_len],
-						     hqos->hqos_burst_enq);
-
-	  /* Get next SWQ for this device */
-	  swq_pos++;
-	  if (swq_pos >= n_swq)
-	    swq_pos = 0;
-	  hqos->swq_pos = swq_pos;
-
-	  /* HQoS enqueue when burst available */
-	  if (pkts_enq_len >= hqos->hqos_burst_enq)
-	    {
-	      rte_sched_port_enqueue (hqos->hqos, pkts_enq, pkts_enq_len);
-
-	      pkts_enq_len = 0;
-	      flush_count = 0;
-	      break;
-	    }
-	}
-      if (pkts_enq_len)
-	{
-	  flush_count++;
-	  if (PREDICT_FALSE (flush_count == HQOS_FLUSH_COUNT_THRESHOLD))
-	    {
-	      rte_sched_port_enqueue (hqos->hqos, pkts_enq, pkts_enq_len);
-
-	      pkts_enq_len = 0;
-	      flush_count = 0;
-	    }
-	}
-      hqos->pkts_enq_len = pkts_enq_len;
-      hqos->flush_count = flush_count;
-
-      /*
-       * HQoS dequeue and HWQ TX enqueue for current device
-       */
-      {
-	u32 pkts_deq_len, n_pkts;
-
-	pkts_deq_len = rte_sched_port_dequeue (hqos->hqos,
-					       pkts_deq,
-					       hqos->hqos_burst_deq);
-
-	for (n_pkts = 0; n_pkts < pkts_deq_len;)
-	  n_pkts += rte_eth_tx_burst (device_index,
-				      (uint16_t) queue_id,
-				      &pkts_deq[n_pkts],
-				      (uint16_t) (pkts_deq_len - n_pkts));
-      }
-
-      /* Advance to next device */
-      dev_pos++;
-    }
-}
-
-void
-dpdk_hqos_thread (vlib_worker_thread_t * w)
-{
-  vlib_main_t *vm;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  dpdk_main_t *dm = &dpdk_main;
-
-  vm = vlib_get_main ();
-
-  ASSERT (vm->cpu_index == os_get_cpu_number ());
-
-  clib_time_init (&vm->clib_time);
-  clib_mem_set_heap (w->thread_mheap);
-
-  /* Wait until the dpdk init sequence is complete */
-  while (tm->worker_thread_release == 0)
-    vlib_worker_thread_barrier_check ();
-
-  if (vec_len (dm->devices_by_hqos_cpu[vm->cpu_index]) == 0)
-    return
-      clib_error
-      ("current I/O TX thread does not have any devices assigned to it");
-
-  if (DPDK_HQOS_DBG_BYPASS)
-    dpdk_hqos_thread_internal_hqos_dbg_bypass (vm);
-  else
-    dpdk_hqos_thread_internal (vm);
-}
-
-void
-dpdk_hqos_thread_fn (void *arg)
-{
-  vlib_worker_thread_t *w = (vlib_worker_thread_t *) arg;
-  vlib_worker_thread_init (w);
-  dpdk_hqos_thread (w);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_THREAD (hqos_thread_reg, static) =
-{
-  .name = "hqos-threads",
-  .short_name = "hqos-threads",
-  .function = dpdk_hqos_thread_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * HQoS run-time code to be called by the worker threads
- */
-#define BITFIELD(byte_array, slab_pos, slab_mask, slab_shr)     \
-({                                                              \
-  u64 slab = *((u64 *) &byte_array[slab_pos]);                  \
-  u64 val = (rte_be_to_cpu_64(slab) & slab_mask) >> slab_shr;   \
-  val;                                                          \
-})
-
-#define RTE_SCHED_PORT_HIERARCHY(subport, pipe, traffic_class, queue, color) \
-  ((((u64) (queue)) & 0x3) |                               \
-  ((((u64) (traffic_class)) & 0x3) << 2) |                 \
-  ((((u64) (color)) & 0x3) << 4) |                         \
-  ((((u64) (subport)) & 0xFFFF) << 16) |                   \
-  ((((u64) (pipe)) & 0xFFFFFFFF) << 32))
-
-void
-dpdk_hqos_metadata_set (dpdk_device_hqos_per_worker_thread_t * hqos,
-			struct rte_mbuf **pkts, u32 n_pkts)
-{
-  u32 i;
-
-  for (i = 0; i < (n_pkts & (~0x3)); i += 4)
-    {
-      struct rte_mbuf *pkt0 = pkts[i];
-      struct rte_mbuf *pkt1 = pkts[i + 1];
-      struct rte_mbuf *pkt2 = pkts[i + 2];
-      struct rte_mbuf *pkt3 = pkts[i + 3];
-
-      u8 *pkt0_data = rte_pktmbuf_mtod (pkt0, u8 *);
-      u8 *pkt1_data = rte_pktmbuf_mtod (pkt1, u8 *);
-      u8 *pkt2_data = rte_pktmbuf_mtod (pkt2, u8 *);
-      u8 *pkt3_data = rte_pktmbuf_mtod (pkt3, u8 *);
-
-      u64 pkt0_subport = BITFIELD (pkt0_data, hqos->hqos_field0_slabpos,
-				   hqos->hqos_field0_slabmask,
-				   hqos->hqos_field0_slabshr);
-      u64 pkt0_pipe = BITFIELD (pkt0_data, hqos->hqos_field1_slabpos,
-				hqos->hqos_field1_slabmask,
-				hqos->hqos_field1_slabshr);
-      u64 pkt0_dscp = BITFIELD (pkt0_data, hqos->hqos_field2_slabpos,
-				hqos->hqos_field2_slabmask,
-				hqos->hqos_field2_slabshr);
-      u32 pkt0_tc = hqos->hqos_tc_table[pkt0_dscp & 0x3F] >> 2;
-      u32 pkt0_tc_q = hqos->hqos_tc_table[pkt0_dscp & 0x3F] & 0x3;
-
-      u64 pkt1_subport = BITFIELD (pkt1_data, hqos->hqos_field0_slabpos,
-				   hqos->hqos_field0_slabmask,
-				   hqos->hqos_field0_slabshr);
-      u64 pkt1_pipe = BITFIELD (pkt1_data, hqos->hqos_field1_slabpos,
-				hqos->hqos_field1_slabmask,
-				hqos->hqos_field1_slabshr);
-      u64 pkt1_dscp = BITFIELD (pkt1_data, hqos->hqos_field2_slabpos,
-				hqos->hqos_field2_slabmask,
-				hqos->hqos_field2_slabshr);
-      u32 pkt1_tc = hqos->hqos_tc_table[pkt1_dscp & 0x3F] >> 2;
-      u32 pkt1_tc_q = hqos->hqos_tc_table[pkt1_dscp & 0x3F] & 0x3;
-
-      u64 pkt2_subport = BITFIELD (pkt2_data, hqos->hqos_field0_slabpos,
-				   hqos->hqos_field0_slabmask,
-				   hqos->hqos_field0_slabshr);
-      u64 pkt2_pipe = BITFIELD (pkt2_data, hqos->hqos_field1_slabpos,
-				hqos->hqos_field1_slabmask,
-				hqos->hqos_field1_slabshr);
-      u64 pkt2_dscp = BITFIELD (pkt2_data, hqos->hqos_field2_slabpos,
-				hqos->hqos_field2_slabmask,
-				hqos->hqos_field2_slabshr);
-      u32 pkt2_tc = hqos->hqos_tc_table[pkt2_dscp & 0x3F] >> 2;
-      u32 pkt2_tc_q = hqos->hqos_tc_table[pkt2_dscp & 0x3F] & 0x3;
-
-      u64 pkt3_subport = BITFIELD (pkt3_data, hqos->hqos_field0_slabpos,
-				   hqos->hqos_field0_slabmask,
-				   hqos->hqos_field0_slabshr);
-      u64 pkt3_pipe = BITFIELD (pkt3_data, hqos->hqos_field1_slabpos,
-				hqos->hqos_field1_slabmask,
-				hqos->hqos_field1_slabshr);
-      u64 pkt3_dscp = BITFIELD (pkt3_data, hqos->hqos_field2_slabpos,
-				hqos->hqos_field2_slabmask,
-				hqos->hqos_field2_slabshr);
-      u32 pkt3_tc = hqos->hqos_tc_table[pkt3_dscp & 0x3F] >> 2;
-      u32 pkt3_tc_q = hqos->hqos_tc_table[pkt3_dscp & 0x3F] & 0x3;
-
-      u64 pkt0_sched = RTE_SCHED_PORT_HIERARCHY (pkt0_subport,
-						 pkt0_pipe,
-						 pkt0_tc,
-						 pkt0_tc_q,
-						 0);
-      u64 pkt1_sched = RTE_SCHED_PORT_HIERARCHY (pkt1_subport,
-						 pkt1_pipe,
-						 pkt1_tc,
-						 pkt1_tc_q,
-						 0);
-      u64 pkt2_sched = RTE_SCHED_PORT_HIERARCHY (pkt2_subport,
-						 pkt2_pipe,
-						 pkt2_tc,
-						 pkt2_tc_q,
-						 0);
-      u64 pkt3_sched = RTE_SCHED_PORT_HIERARCHY (pkt3_subport,
-						 pkt3_pipe,
-						 pkt3_tc,
-						 pkt3_tc_q,
-						 0);
-
-      pkt0->hash.sched.lo = pkt0_sched & 0xFFFFFFFF;
-      pkt0->hash.sched.hi = pkt0_sched >> 32;
-      pkt1->hash.sched.lo = pkt1_sched & 0xFFFFFFFF;
-      pkt1->hash.sched.hi = pkt1_sched >> 32;
-      pkt2->hash.sched.lo = pkt2_sched & 0xFFFFFFFF;
-      pkt2->hash.sched.hi = pkt2_sched >> 32;
-      pkt3->hash.sched.lo = pkt3_sched & 0xFFFFFFFF;
-      pkt3->hash.sched.hi = pkt3_sched >> 32;
-    }
-
-  for (; i < n_pkts; i++)
-    {
-      struct rte_mbuf *pkt = pkts[i];
-
-      u8 *pkt_data = rte_pktmbuf_mtod (pkt, u8 *);
-
-      u64 pkt_subport = BITFIELD (pkt_data, hqos->hqos_field0_slabpos,
-				  hqos->hqos_field0_slabmask,
-				  hqos->hqos_field0_slabshr);
-      u64 pkt_pipe = BITFIELD (pkt_data, hqos->hqos_field1_slabpos,
-			       hqos->hqos_field1_slabmask,
-			       hqos->hqos_field1_slabshr);
-      u64 pkt_dscp = BITFIELD (pkt_data, hqos->hqos_field2_slabpos,
-			       hqos->hqos_field2_slabmask,
-			       hqos->hqos_field2_slabshr);
-      u32 pkt_tc = hqos->hqos_tc_table[pkt_dscp & 0x3F] >> 2;
-      u32 pkt_tc_q = hqos->hqos_tc_table[pkt_dscp & 0x3F] & 0x3;
-
-      u64 pkt_sched = RTE_SCHED_PORT_HIERARCHY (pkt_subport,
-						pkt_pipe,
-						pkt_tc,
-						pkt_tc_q,
-						0);
-
-      pkt->hash.sched.lo = pkt_sched & 0xFFFFFFFF;
-      pkt->hash.sched.hi = pkt_sched >> 32;
-    }
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c
deleted file mode 100755
index 693ca985..00000000
--- a/vnet/vnet/devices/dpdk/init.c
+++ /dev/null
@@ -1,1803 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/vnet.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/error.h>
-#include <vppinfra/format.h>
-#include <vppinfra/bitmap.h>
-
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/devices/dpdk/dpdk.h>
-#include <vlib/unix/physmem.h>
-#include <vlib/pci/pci.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/mount.h>
-#include <string.h>
-#include <fcntl.h>
-
-#include "dpdk_priv.h"
-
-dpdk_main_t dpdk_main;
-
-/* force linker to link functions used by vlib and declared weak */
-void *vlib_weakly_linked_functions[] = {
-  &rte_pktmbuf_init,
-  &rte_pktmbuf_pool_init,
-};
-
-#define LINK_STATE_ELOGS	0
-
-#define DEFAULT_HUGE_DIR "/run/vpp/hugepages"
-#define VPP_RUN_DIR "/run/vpp"
-
-/* Port configuration, mildly modified Intel app values */
-
-static struct rte_eth_conf port_conf_template = {
-  .rxmode = {
-	     .split_hdr_size = 0,
-	     .header_split = 0,		/**< Header Split disabled */
-	     .hw_ip_checksum = 0,	/**< IP checksum offload disabled */
-	     .hw_vlan_filter = 0,	/**< VLAN filtering disabled */
-	     .hw_strip_crc = 0,		/**< CRC stripped by hardware */
-	     },
-  .txmode = {
-	     .mq_mode = ETH_MQ_TX_NONE,
-	     },
-};
-
-clib_error_t *
-dpdk_port_setup (dpdk_main_t * dm, dpdk_device_t * xd)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  int rv;
-  int j;
-
-  ASSERT (os_get_cpu_number () == 0);
-
-  if (xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP)
-    {
-      vnet_hw_interface_set_flags (dm->vnet_main, xd->vlib_hw_if_index, 0);
-      rte_eth_dev_stop (xd->device_index);
-    }
-
-  rv = rte_eth_dev_configure (xd->device_index, xd->rx_q_used,
-			      xd->tx_q_used, &xd->port_conf);
-
-  if (rv < 0)
-    return clib_error_return (0, "rte_eth_dev_configure[%d]: err %d",
-			      xd->device_index, rv);
-
-  /* Set up one TX-queue per worker thread */
-  for (j = 0; j < xd->tx_q_used; j++)
-    {
-      rv = rte_eth_tx_queue_setup (xd->device_index, j, xd->nb_tx_desc,
-				   xd->cpu_socket, &xd->tx_conf);
-
-      /* retry with any other CPU socket */
-      if (rv < 0)
-	rv = rte_eth_tx_queue_setup (xd->device_index, j, xd->nb_tx_desc,
-				     SOCKET_ID_ANY, &xd->tx_conf);
-      if (rv < 0)
-	break;
-    }
-
-  if (rv < 0)
-    return clib_error_return (0, "rte_eth_tx_queue_setup[%d]: err %d",
-			      xd->device_index, rv);
-
-  for (j = 0; j < xd->rx_q_used; j++)
-    {
-
-      rv = rte_eth_rx_queue_setup (xd->device_index, j, xd->nb_rx_desc,
-				   xd->cpu_socket, 0,
-				   bm->
-				   pktmbuf_pools[xd->cpu_socket_id_by_queue
-						 [j]]);
-
-      /* retry with any other CPU socket */
-      if (rv < 0)
-	rv = rte_eth_rx_queue_setup (xd->device_index, j, xd->nb_rx_desc,
-				     SOCKET_ID_ANY, 0,
-				     bm->
-				     pktmbuf_pools[xd->cpu_socket_id_by_queue
-						   [j]]);
-      if (rv < 0)
-	return clib_error_return (0, "rte_eth_rx_queue_setup[%d]: err %d",
-				  xd->device_index, rv);
-    }
-
-  if (xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP)
-    {
-      int rv;
-      rv = rte_eth_dev_start (xd->device_index);
-      if (rv < 0)
-	clib_warning ("rte_eth_dev_start %d returned %d",
-		      xd->device_index, rv);
-    }
-  return 0;
-}
-
-static u32
-dpdk_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, u32 flags)
-{
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_t *xd = vec_elt_at_index (dm->devices, hi->dev_instance);
-  u32 old = 0;
-
-  if (ETHERNET_INTERFACE_FLAG_CONFIG_PROMISC (flags))
-    {
-      old = (xd->flags & DPDK_DEVICE_FLAG_PROMISC) != 0;
-
-      if (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL)
-	xd->flags |= DPDK_DEVICE_FLAG_PROMISC;
-      else
-	xd->flags &= ~DPDK_DEVICE_FLAG_PROMISC;
-
-      if (xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP)
-	{
-	  if (xd->flags & DPDK_DEVICE_FLAG_PROMISC)
-	    rte_eth_promiscuous_enable (xd->device_index);
-	  else
-	    rte_eth_promiscuous_disable (xd->device_index);
-	}
-    }
-  else if (ETHERNET_INTERFACE_FLAG_CONFIG_MTU (flags))
-    {
-      /*
-       * DAW-FIXME: The Cisco VIC firmware does not provide an api for a
-       *            driver to dynamically change the mtu.  If/when the
-       *            VIC firmware gets fixed, then this should be removed.
-       */
-      if (xd->pmd == VNET_DPDK_PMD_ENIC)
-	{
-	  struct rte_eth_dev_info dev_info;
-
-	  /*
-	   * Restore mtu to what has been set by CIMC in the firmware cfg.
-	   */
-	  rte_eth_dev_info_get (xd->device_index, &dev_info);
-	  hi->max_packet_bytes = dev_info.max_rx_pktlen;
-
-	  vlib_cli_output (vlib_get_main (),
-			   "Cisco VIC mtu can only be changed "
-			   "using CIMC then rebooting the server!");
-	}
-      else
-	{
-	  int rv;
-
-	  xd->port_conf.rxmode.max_rx_pkt_len = hi->max_packet_bytes;
-
-	  if (xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP)
-	    rte_eth_dev_stop (xd->device_index);
-
-	  rv = rte_eth_dev_configure
-	    (xd->device_index, xd->rx_q_used, xd->tx_q_used, &xd->port_conf);
-
-	  if (rv < 0)
-	    vlib_cli_output (vlib_get_main (),
-			     "rte_eth_dev_configure[%d]: err %d",
-			     xd->device_index, rv);
-
-	  rte_eth_dev_set_mtu (xd->device_index, hi->max_packet_bytes);
-
-	  if (xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP)
-	    {
-	      int rv = rte_eth_dev_start (xd->device_index);
-	      if (rv < 0)
-		clib_warning ("rte_eth_dev_start %d returned %d",
-			      xd->device_index, rv);
-	    }
-	}
-    }
-  return old;
-}
-
-void
-dpdk_device_lock_init (dpdk_device_t * xd)
-{
-  int q;
-  vec_validate (xd->lockp, xd->tx_q_used - 1);
-  for (q = 0; q < xd->tx_q_used; q++)
-    {
-      xd->lockp[q] = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
-					     CLIB_CACHE_LINE_BYTES);
-      memset ((void *) xd->lockp[q], 0, CLIB_CACHE_LINE_BYTES);
-    }
-}
-
-void
-dpdk_device_lock_free (dpdk_device_t * xd)
-{
-  int q;
-
-  for (q = 0; q < vec_len (xd->lockp); q++)
-    clib_mem_free ((void *) xd->lockp[q]);
-  vec_free (xd->lockp);
-  xd->lockp = 0;
-}
-
-static clib_error_t *
-dpdk_lib_init (dpdk_main_t * dm)
-{
-  u32 nports;
-  u32 nb_desc = 0;
-  int i;
-  clib_error_t *error;
-  vlib_main_t *vm = vlib_get_main ();
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  vnet_sw_interface_t *sw;
-  vnet_hw_interface_t *hi;
-  dpdk_device_t *xd;
-  vlib_pci_addr_t last_pci_addr;
-  u32 last_pci_addr_port = 0;
-  vlib_thread_registration_t *tr, *tr_hqos;
-  uword *p, *p_hqos;
-
-  u32 next_cpu = 0, next_hqos_cpu = 0;
-  u8 af_packet_port_id = 0;
-  last_pci_addr.as_u32 = ~0;
-
-  dm->input_cpu_first_index = 0;
-  dm->input_cpu_count = 1;
-
-  /* find out which cpus will be used for input */
-  p = hash_get_mem (tm->thread_registrations_by_name, "workers");
-  tr = p ? (vlib_thread_registration_t *) p[0] : 0;
-
-  if (tr && tr->count > 0)
-    {
-      dm->input_cpu_first_index = tr->first_index;
-      dm->input_cpu_count = tr->count;
-    }
-
-  vec_validate_aligned (dm->devices_by_cpu, tm->n_vlib_mains - 1,
-			CLIB_CACHE_LINE_BYTES);
-
-  vec_validate_aligned (dm->workers, tm->n_vlib_mains - 1,
-			CLIB_CACHE_LINE_BYTES);
-
-  dm->hqos_cpu_first_index = 0;
-  dm->hqos_cpu_count = 0;
-
-  /* find out which cpus will be used for I/O TX */
-  p_hqos = hash_get_mem (tm->thread_registrations_by_name, "hqos-threads");
-  tr_hqos = p_hqos ? (vlib_thread_registration_t *) p_hqos[0] : 0;
-
-  if (tr_hqos && tr_hqos->count > 0)
-    {
-      dm->hqos_cpu_first_index = tr_hqos->first_index;
-      dm->hqos_cpu_count = tr_hqos->count;
-    }
-
-  vec_validate_aligned (dm->devices_by_hqos_cpu, tm->n_vlib_mains - 1,
-			CLIB_CACHE_LINE_BYTES);
-
-  vec_validate_aligned (dm->hqos_threads, tm->n_vlib_mains - 1,
-			CLIB_CACHE_LINE_BYTES);
-
-  nports = rte_eth_dev_count ();
-  if (nports < 1)
-    {
-      clib_warning ("DPDK drivers found no ports...");
-    }
-
-  if (CLIB_DEBUG > 0)
-    clib_warning ("DPDK drivers found %d ports...", nports);
-
-  /*
-   * All buffers are all allocated from the same rte_mempool.
-   * Thus they all have the same number of data bytes.
-   */
-  dm->vlib_buffer_free_list_index =
-    vlib_buffer_get_or_create_free_list (vm,
-					 VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES,
-					 "dpdk rx");
-
-  if (dm->conf->enable_tcp_udp_checksum)
-    dm->buffer_flags_template &= ~(IP_BUFFER_L4_CHECKSUM_CORRECT
-				   | IP_BUFFER_L4_CHECKSUM_COMPUTED);
-
-  for (i = 0; i < nports; i++)
-    {
-      u8 addr[6];
-      u8 vlan_strip = 0;
-      int j;
-      struct rte_eth_dev_info dev_info;
-      clib_error_t *rv;
-      struct rte_eth_link l;
-      dpdk_device_config_t *devconf = 0;
-      vlib_pci_addr_t pci_addr;
-      uword *p = 0;
-
-      rte_eth_dev_info_get (i, &dev_info);
-      if (dev_info.pci_dev)	/* bonded interface has no pci info */
-	{
-	  pci_addr.domain = dev_info.pci_dev->addr.domain;
-	  pci_addr.bus = dev_info.pci_dev->addr.bus;
-	  pci_addr.slot = dev_info.pci_dev->addr.devid;
-	  pci_addr.function = dev_info.pci_dev->addr.function;
-	  p =
-	    hash_get (dm->conf->device_config_index_by_pci_addr,
-		      pci_addr.as_u32);
-	}
-
-      if (p)
-	devconf = pool_elt_at_index (dm->conf->dev_confs, p[0]);
-      else
-	devconf = &dm->conf->default_devconf;
-
-      /* Create vnet interface */
-      vec_add2_aligned (dm->devices, xd, 1, CLIB_CACHE_LINE_BYTES);
-      xd->nb_rx_desc = DPDK_NB_RX_DESC_DEFAULT;
-      xd->nb_tx_desc = DPDK_NB_TX_DESC_DEFAULT;
-      xd->cpu_socket = (i8) rte_eth_dev_socket_id (i);
-
-      /* Handle interface naming for devices with multiple ports sharing same PCI ID */
-      if (dev_info.pci_dev)
-	{
-	  struct rte_eth_dev_info di = { 0 };
-	  rte_eth_dev_info_get (i + 1, &di);
-	  if (di.pci_dev && pci_addr.as_u32 != last_pci_addr.as_u32 &&
-	      memcmp (&dev_info.pci_dev->addr, &di.pci_dev->addr,
-		      sizeof (struct rte_pci_addr)) == 0)
-	    {
-	      xd->interface_name_suffix = format (0, "0");
-	      last_pci_addr.as_u32 = pci_addr.as_u32;
-	      last_pci_addr_port = i;
-	    }
-	  else if (pci_addr.as_u32 == last_pci_addr.as_u32)
-	    {
-	      xd->interface_name_suffix =
-		format (0, "%u", i - last_pci_addr_port);
-	    }
-	  else
-	    {
-	      last_pci_addr.as_u32 = ~0;
-	    }
-	}
-      else
-	last_pci_addr.as_u32 = ~0;
-
-      clib_memcpy (&xd->tx_conf, &dev_info.default_txconf,
-		   sizeof (struct rte_eth_txconf));
-      if (dm->conf->no_multi_seg)
-	{
-	  xd->tx_conf.txq_flags |= ETH_TXQ_FLAGS_NOMULTSEGS;
-	  port_conf_template.rxmode.jumbo_frame = 0;
-	}
-      else
-	{
-	  xd->tx_conf.txq_flags &= ~ETH_TXQ_FLAGS_NOMULTSEGS;
-	  port_conf_template.rxmode.jumbo_frame = 1;
-	  xd->flags |= DPDK_DEVICE_FLAG_MAYBE_MULTISEG;
-	}
-
-      clib_memcpy (&xd->port_conf, &port_conf_template,
-		   sizeof (struct rte_eth_conf));
-
-      xd->tx_q_used = clib_min (dev_info.max_tx_queues, tm->n_vlib_mains);
-
-      if (devconf->num_tx_queues > 0
-	  && devconf->num_tx_queues < xd->tx_q_used)
-	xd->tx_q_used = clib_min (xd->tx_q_used, devconf->num_tx_queues);
-
-      if (devconf->num_rx_queues > 1 && dm->use_rss == 0)
-	{
-	  dm->use_rss = 1;
-	}
-
-      if (devconf->num_rx_queues > 1
-	  && dev_info.max_rx_queues >= devconf->num_rx_queues)
-	{
-	  xd->rx_q_used = devconf->num_rx_queues;
-	  xd->port_conf.rxmode.mq_mode = ETH_MQ_RX_RSS;
-	  if (devconf->rss_fn == 0)
-	    xd->port_conf.rx_adv_conf.rss_conf.rss_hf =
-	      ETH_RSS_IP | ETH_RSS_UDP | ETH_RSS_TCP;
-	  else
-	    xd->port_conf.rx_adv_conf.rss_conf.rss_hf = devconf->rss_fn;
-	}
-      else
-	xd->rx_q_used = 1;
-
-      xd->flags |= DPDK_DEVICE_FLAG_PMD;
-
-      /* workaround for drivers not setting driver_name */
-      if ((!dev_info.driver_name) && (dev_info.pci_dev))
-#if RTE_VERSION < RTE_VERSION_NUM(16, 11, 0, 0)
-	dev_info.driver_name = dev_info.pci_dev->driver->name;
-#else
-	dev_info.driver_name = dev_info.pci_dev->driver->driver.name;
-#endif
-      ASSERT (dev_info.driver_name);
-
-      if (!xd->pmd)
-	{
-
-
-#define _(s,f) else if (dev_info.driver_name &&                 \
-                        !strcmp(dev_info.driver_name, s))       \
-                 xd->pmd = VNET_DPDK_PMD_##f;
-	  if (0)
-	    ;
-	  foreach_dpdk_pmd
-#undef _
-	    else
-	    xd->pmd = VNET_DPDK_PMD_UNKNOWN;
-
-	  xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN;
-	  xd->nb_rx_desc = DPDK_NB_RX_DESC_DEFAULT;
-	  xd->nb_tx_desc = DPDK_NB_TX_DESC_DEFAULT;
-
-	  switch (xd->pmd)
-	    {
-	      /* 1G adapters */
-	    case VNET_DPDK_PMD_E1000EM:
-	    case VNET_DPDK_PMD_IGB:
-	    case VNET_DPDK_PMD_IGBVF:
-	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_1G;
-	      break;
-
-	      /* 10G adapters */
-	    case VNET_DPDK_PMD_IXGBE:
-	    case VNET_DPDK_PMD_IXGBEVF:
-	    case VNET_DPDK_PMD_THUNDERX:
-	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G;
-	      break;
-	    case VNET_DPDK_PMD_DPAA2:
-	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G;
-	      break;
-
-	      /* Cisco VIC */
-	    case VNET_DPDK_PMD_ENIC:
-	      rte_eth_link_get_nowait (i, &l);
-	      xd->flags |= DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE;
-	      if (l.link_speed == 40000)
-		xd->port_type = VNET_DPDK_PORT_TYPE_ETH_40G;
-	      else
-		xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G;
-	      break;
-
-	      /* Intel Fortville */
-	    case VNET_DPDK_PMD_I40E:
-	    case VNET_DPDK_PMD_I40EVF:
-	      xd->flags |= DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE;
-	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_40G;
-
-	      switch (dev_info.pci_dev->id.device_id)
-		{
-		case I40E_DEV_ID_10G_BASE_T:
-		case I40E_DEV_ID_SFP_XL710:
-		  xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G;
-		  break;
-		case I40E_DEV_ID_QSFP_A:
-		case I40E_DEV_ID_QSFP_B:
-		case I40E_DEV_ID_QSFP_C:
-		  xd->port_type = VNET_DPDK_PORT_TYPE_ETH_40G;
-		  break;
-		case I40E_DEV_ID_VF:
-		  rte_eth_link_get_nowait (i, &l);
-		  xd->port_type = l.link_speed == 10000 ?
-		    VNET_DPDK_PORT_TYPE_ETH_10G : VNET_DPDK_PORT_TYPE_ETH_40G;
-		  break;
-		default:
-		  xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN;
-		}
-	      break;
-
-	    case VNET_DPDK_PMD_CXGBE:
-	      switch (dev_info.pci_dev->id.device_id)
-		{
-		case 0x540d:	/* T580-CR */
-		case 0x5410:	/* T580-LP-cr */
-		  xd->port_type = VNET_DPDK_PORT_TYPE_ETH_40G;
-		  break;
-		case 0x5403:	/* T540-CR */
-		  xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G;
-		  break;
-		default:
-		  xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN;
-		}
-	      break;
-
-	    case VNET_DPDK_PMD_MLX5:
-	      {
-		char *pn_100g[] = { "MCX415A-CCAT", "MCX416A-CCAT", 0 };
-		char *pn_40g[] = { "MCX413A-BCAT", "MCX414A-BCAT",
-		  "MCX415A-BCAT", "MCX416A-BCAT", "MCX4131A-BCAT", 0
-		};
-		char *pn_10g[] = { "MCX4111A-XCAT", "MCX4121A-XCAT", 0 };
-
-		vlib_pci_device_t *pd = vlib_get_pci_device (&pci_addr);
-		u8 *pn = 0;
-		char **c;
-		int found = 0;
-		pn = format (0, "%U%c",
-			     format_vlib_pci_vpd, pd->vpd_r, "PN", 0);
-
-		if (!pn)
-		  break;
-
-		c = pn_100g;
-		while (!found && c[0])
-		  {
-		    if (strncmp ((char *) pn, c[0], strlen (c[0])) == 0)
-		      {
-			xd->port_type = VNET_DPDK_PORT_TYPE_ETH_100G;
-			break;
-		      }
-		    c++;
-		  }
-
-		c = pn_40g;
-		while (!found && c[0])
-		  {
-		    if (strncmp ((char *) pn, c[0], strlen (c[0])) == 0)
-		      {
-			xd->port_type = VNET_DPDK_PORT_TYPE_ETH_40G;
-			break;
-		      }
-		    c++;
-		  }
-
-		c = pn_10g;
-		while (!found && c[0])
-		  {
-		    if (strncmp ((char *) pn, c[0], strlen (c[0])) == 0)
-		      {
-			xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G;
-			break;
-		      }
-		    c++;
-		  }
-
-		vec_free (pn);
-	      }
-
-	      break;
-	      /* Intel Red Rock Canyon */
-	    case VNET_DPDK_PMD_FM10K:
-	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_SWITCH;
-	      break;
-
-	      /* virtio */
-	    case VNET_DPDK_PMD_VIRTIO:
-	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_1G;
-	      xd->nb_rx_desc = DPDK_NB_RX_DESC_VIRTIO;
-	      xd->nb_tx_desc = DPDK_NB_TX_DESC_VIRTIO;
-	      break;
-
-	      /* vmxnet3 */
-	    case VNET_DPDK_PMD_VMXNET3:
-	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_1G;
-	      xd->tx_conf.txq_flags |= ETH_TXQ_FLAGS_NOMULTSEGS;
-	      break;
-
-	    case VNET_DPDK_PMD_AF_PACKET:
-	      xd->port_type = VNET_DPDK_PORT_TYPE_AF_PACKET;
-	      xd->af_packet_port_id = af_packet_port_id++;
-	      break;
-
-	    case VNET_DPDK_PMD_BOND:
-	      xd->flags |= DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE;
-	      xd->port_type = VNET_DPDK_PORT_TYPE_ETH_BOND;
-	      break;
-
-	    default:
-	      xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN;
-	    }
-
-	  if (devconf->num_rx_desc)
-	    xd->nb_rx_desc = devconf->num_rx_desc;
-
-	  if (devconf->num_tx_desc)
-	    xd->nb_tx_desc = devconf->num_tx_desc;
-	}
-
-      /*
-       * Ensure default mtu is not > the mtu read from the hardware.
-       * Otherwise rte_eth_dev_configure() will fail and the port will
-       * not be available.
-       */
-      if (ETHERNET_MAX_PACKET_BYTES > dev_info.max_rx_pktlen)
-	{
-	  /*
-	   * This device does not support the platforms's max frame
-	   * size. Use it's advertised mru instead.
-	   */
-	  xd->port_conf.rxmode.max_rx_pkt_len = dev_info.max_rx_pktlen;
-	}
-      else
-	{
-	  xd->port_conf.rxmode.max_rx_pkt_len = ETHERNET_MAX_PACKET_BYTES;
-
-	  /*
-	   * Some platforms do not account for Ethernet FCS (4 bytes) in
-	   * MTU calculations. To interop with them increase mru but only
-	   * if the device's settings can support it.
-	   */
-	  if ((dev_info.max_rx_pktlen >= (ETHERNET_MAX_PACKET_BYTES + 4)) &&
-	      xd->port_conf.rxmode.hw_strip_crc)
-	    {
-	      /*
-	       * Allow additional 4 bytes (for Ethernet FCS). These bytes are
-	       * stripped by h/w and so will not consume any buffer memory.
-	       */
-	      xd->port_conf.rxmode.max_rx_pkt_len += 4;
-	    }
-	}
-
-      if (xd->pmd == VNET_DPDK_PMD_AF_PACKET)
-	{
-	  f64 now = vlib_time_now (vm);
-	  u32 rnd;
-	  rnd = (u32) (now * 1e6);
-	  rnd = random_u32 (&rnd);
-	  clib_memcpy (addr + 2, &rnd, sizeof (rnd));
-	  addr[0] = 2;
-	  addr[1] = 0xfe;
-	}
-      else
-	rte_eth_macaddr_get (i, (struct ether_addr *) addr);
-
-      if (xd->tx_q_used < tm->n_vlib_mains)
-	dpdk_device_lock_init (xd);
-
-      xd->device_index = xd - dm->devices;
-      ASSERT (i == xd->device_index);
-      xd->per_interface_next_index = ~0;
-
-      /* assign interface to input thread */
-      dpdk_device_and_queue_t *dq;
-      int q;
-
-      if (devconf->workers)
-	{
-	  int i;
-	  q = 0;
-	  /* *INDENT-OFF* */
-	  clib_bitmap_foreach (i, devconf->workers, ({
-	    int cpu = dm->input_cpu_first_index + i;
-	    unsigned lcore = vlib_worker_threads[cpu].lcore_id;
-	    vec_validate(xd->cpu_socket_id_by_queue, q);
-	    xd->cpu_socket_id_by_queue[q] = rte_lcore_to_socket_id(lcore);
-	    vec_add2(dm->devices_by_cpu[cpu], dq, 1);
-	    dq->device = xd->device_index;
-	    dq->queue_id = q++;
-	  }));
-	  /* *INDENT-ON* */
-	}
-      else
-	for (q = 0; q < xd->rx_q_used; q++)
-	  {
-	    int cpu = dm->input_cpu_first_index + next_cpu;
-	    unsigned lcore = vlib_worker_threads[cpu].lcore_id;
-
-	    /*
-	     * numa node for worker thread handling this queue
-	     * needed for taking buffers from the right mempool
-	     */
-	    vec_validate (xd->cpu_socket_id_by_queue, q);
-	    xd->cpu_socket_id_by_queue[q] = rte_lcore_to_socket_id (lcore);
-
-	    /*
-	     * construct vector of (device,queue) pairs for each worker thread
-	     */
-	    vec_add2 (dm->devices_by_cpu[cpu], dq, 1);
-	    dq->device = xd->device_index;
-	    dq->queue_id = q;
-
-	    next_cpu++;
-	    if (next_cpu == dm->input_cpu_count)
-	      next_cpu = 0;
-	  }
-
-
-      if (devconf->hqos_enabled)
-	{
-	  xd->flags |= DPDK_DEVICE_FLAG_HQOS;
-
-	  if (devconf->hqos.hqos_thread_valid)
-	    {
-	      int cpu = dm->hqos_cpu_first_index + devconf->hqos.hqos_thread;
-
-	      if (devconf->hqos.hqos_thread >= dm->hqos_cpu_count)
-		return clib_error_return (0, "invalid HQoS thread index");
-
-	      vec_add2 (dm->devices_by_hqos_cpu[cpu], dq, 1);
-	      dq->device = xd->device_index;
-	      dq->queue_id = 0;
-	    }
-	  else
-	    {
-	      int cpu = dm->hqos_cpu_first_index + next_hqos_cpu;
-
-	      if (dm->hqos_cpu_count == 0)
-		return clib_error_return (0, "no HQoS threads available");
-
-	      vec_add2 (dm->devices_by_hqos_cpu[cpu], dq, 1);
-	      dq->device = xd->device_index;
-	      dq->queue_id = 0;
-
-	      next_hqos_cpu++;
-	      if (next_hqos_cpu == dm->hqos_cpu_count)
-		next_hqos_cpu = 0;
-
-	      devconf->hqos.hqos_thread_valid = 1;
-	      devconf->hqos.hqos_thread = cpu;
-	    }
-	}
-
-      vec_validate_aligned (xd->tx_vectors, tm->n_vlib_mains,
-			    CLIB_CACHE_LINE_BYTES);
-      for (j = 0; j < tm->n_vlib_mains; j++)
-	{
-	  vec_validate_ha (xd->tx_vectors[j], xd->nb_tx_desc,
-			   sizeof (tx_ring_hdr_t), CLIB_CACHE_LINE_BYTES);
-	  vec_reset_length (xd->tx_vectors[j]);
-	}
-
-      vec_validate_aligned (xd->rx_vectors, xd->rx_q_used,
-			    CLIB_CACHE_LINE_BYTES);
-      for (j = 0; j < xd->rx_q_used; j++)
-	{
-	  vec_validate_aligned (xd->rx_vectors[j], VLIB_FRAME_SIZE - 1,
-				CLIB_CACHE_LINE_BYTES);
-	  vec_reset_length (xd->rx_vectors[j]);
-	}
-
-      vec_validate_aligned (xd->d_trace_buffers, tm->n_vlib_mains,
-			    CLIB_CACHE_LINE_BYTES);
-
-      rv = dpdk_port_setup (dm, xd);
-
-      if (rv)
-	return rv;
-
-      if (devconf->hqos_enabled)
-	{
-	  rv = dpdk_port_setup_hqos (xd, &devconf->hqos);
-	  if (rv)
-	    return rv;
-	}
-
-      /* count the number of descriptors used for this device */
-      nb_desc += xd->nb_rx_desc + xd->nb_tx_desc * xd->tx_q_used;
-
-      error = ethernet_register_interface
-	(dm->vnet_main, dpdk_device_class.index, xd->device_index,
-	 /* ethernet address */ addr,
-	 &xd->vlib_hw_if_index, dpdk_flag_change);
-      if (error)
-	return error;
-
-      sw = vnet_get_hw_sw_interface (dm->vnet_main, xd->vlib_hw_if_index);
-      xd->vlib_sw_if_index = sw->sw_if_index;
-      hi = vnet_get_hw_interface (dm->vnet_main, xd->vlib_hw_if_index);
-
-      /*
-       * DAW-FIXME: The Cisco VIC firmware does not provide an api for a
-       *            driver to dynamically change the mtu.  If/when the
-       *            VIC firmware gets fixed, then this should be removed.
-       */
-      if (xd->pmd == VNET_DPDK_PMD_ENIC)
-	{
-	  /*
-	   * Initialize mtu to what has been set by CIMC in the firmware cfg.
-	   */
-	  hi->max_packet_bytes = dev_info.max_rx_pktlen;
-	  if (devconf->vlan_strip_offload != DPDK_DEVICE_VLAN_STRIP_OFF)
-	    vlan_strip = 1;	/* remove vlan tag from VIC port by default */
-	  else
-	    clib_warning ("VLAN strip disabled for interface\n");
-	}
-      else if (devconf->vlan_strip_offload == DPDK_DEVICE_VLAN_STRIP_ON)
-	vlan_strip = 1;
-
-      if (vlan_strip)
-	{
-	  int vlan_off;
-	  vlan_off = rte_eth_dev_get_vlan_offload (xd->device_index);
-	  vlan_off |= ETH_VLAN_STRIP_OFFLOAD;
-	  xd->port_conf.rxmode.hw_vlan_strip = vlan_off;
-	  if (rte_eth_dev_set_vlan_offload (xd->device_index, vlan_off) == 0)
-	    clib_warning ("VLAN strip enabled for interface\n");
-	  else
-	    clib_warning ("VLAN strip cannot be supported by interface\n");
-	}
-
-      hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] =
-	xd->port_conf.rxmode.max_rx_pkt_len - sizeof (ethernet_header_t);
-
-      rte_eth_dev_set_mtu (xd->device_index, hi->max_packet_bytes);
-    }
-
-  if (nb_desc > dm->conf->num_mbufs)
-    clib_warning ("%d mbufs allocated but total rx/tx ring size is %d\n",
-		  dm->conf->num_mbufs, nb_desc);
-
-  return 0;
-}
-
-static void
-dpdk_bind_devices_to_uio (dpdk_config_main_t * conf)
-{
-  vlib_pci_main_t *pm = &pci_main;
-  clib_error_t *error;
-  vlib_pci_device_t *d;
-  u8 *pci_addr = 0;
-  int num_whitelisted = vec_len (conf->dev_confs);
-
-  /* *INDENT-OFF* */
-  pool_foreach (d, pm->pci_devs, ({
-    dpdk_device_config_t * devconf = 0;
-    vec_reset_length (pci_addr);
-    pci_addr = format (pci_addr, "%U%c", format_vlib_pci_addr, &d->bus_address, 0);
-
-    if (d->device_class != PCI_CLASS_NETWORK_ETHERNET)
-      continue;
-
-    if (num_whitelisted)
-      {
-	uword * p = hash_get (conf->device_config_index_by_pci_addr, d->bus_address.as_u32);
-
-	if (!p)
-	  continue;
-
-	devconf = pool_elt_at_index (conf->dev_confs, p[0]);
-      }
-
-    /* virtio */
-    if (d->vendor_id == 0x1af4 && d->device_id == 0x1000)
-      ;
-    /* vmxnet3 */
-    else if (d->vendor_id == 0x15ad && d->device_id == 0x07b0)
-      ;
-    /* all Intel devices */
-    else if (d->vendor_id == 0x8086)
-      ;
-    /* Cisco VIC */
-    else if (d->vendor_id == 0x1137 && d->device_id == 0x0043)
-      ;
-    /* Chelsio T4/T5 */
-    else if (d->vendor_id == 0x1425 && (d->device_id & 0xe000) == 0x4000)
-      ;
-    else
-      {
-        clib_warning ("Unsupported Ethernet PCI device 0x%04x:0x%04x found "
-		      "at PCI address %s\n", (u16) d->vendor_id, (u16) d->device_id,
-		      pci_addr);
-        continue;
-      }
-
-    error = vlib_pci_bind_to_uio (d, (char *) conf->uio_driver_name);
-
-    if (error)
-      {
-	if (devconf == 0)
-	  {
-	    pool_get (conf->dev_confs, devconf);
-	    hash_set (conf->device_config_index_by_pci_addr, d->bus_address.as_u32,
-		      devconf - conf->dev_confs);
-	    devconf->pci_addr.as_u32 = d->bus_address.as_u32;
-	  }
-	devconf->is_blacklisted = 1;
-	clib_error_report (error);
-      }
-  }));
-  /* *INDENT-ON* */
-  vec_free (pci_addr);
-}
-
-static clib_error_t *
-dpdk_device_config (dpdk_config_main_t * conf, vlib_pci_addr_t pci_addr,
-		    unformat_input_t * input, u8 is_default)
-{
-  clib_error_t *error = 0;
-  uword *p;
-  dpdk_device_config_t *devconf;
-  unformat_input_t sub_input;
-
-  if (is_default)
-    {
-      devconf = &conf->default_devconf;
-    }
-  else
-    {
-      p = hash_get (conf->device_config_index_by_pci_addr, pci_addr.as_u32);
-
-      if (!p)
-	{
-	  pool_get (conf->dev_confs, devconf);
-	  hash_set (conf->device_config_index_by_pci_addr, pci_addr.as_u32,
-		    devconf - conf->dev_confs);
-	}
-      else
-	return clib_error_return (0,
-				  "duplicate configuration for PCI address %U",
-				  format_vlib_pci_addr, &pci_addr);
-    }
-
-  devconf->pci_addr.as_u32 = pci_addr.as_u32;
-  devconf->hqos_enabled = 0;
-  dpdk_device_config_hqos_default (&devconf->hqos);
-
-  if (!input)
-    return 0;
-
-  unformat_skip_white_space (input);
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "num-rx-queues %u", &devconf->num_rx_queues))
-	;
-      else if (unformat (input, "num-tx-queues %u", &devconf->num_tx_queues))
-	;
-      else if (unformat (input, "num-rx-desc %u", &devconf->num_rx_desc))
-	;
-      else if (unformat (input, "num-tx-desc %u", &devconf->num_tx_desc))
-	;
-      else if (unformat (input, "workers %U", unformat_bitmap_list,
-			 &devconf->workers))
-	;
-      else
-	if (unformat
-	    (input, "rss %U", unformat_vlib_cli_sub_input, &sub_input))
-	{
-	  error = unformat_rss_fn (&sub_input, &devconf->rss_fn);
-	  if (error)
-	    break;
-	}
-      else if (unformat (input, "vlan-strip-offload off"))
-	devconf->vlan_strip_offload = DPDK_DEVICE_VLAN_STRIP_OFF;
-      else if (unformat (input, "vlan-strip-offload on"))
-	devconf->vlan_strip_offload = DPDK_DEVICE_VLAN_STRIP_ON;
-      else
-	if (unformat
-	    (input, "hqos %U", unformat_vlib_cli_sub_input, &sub_input))
-	{
-	  devconf->hqos_enabled = 1;
-	  error = unformat_hqos (&sub_input, &devconf->hqos);
-	  if (error)
-	    break;
-	}
-      else if (unformat (input, "hqos"))
-	{
-	  devconf->hqos_enabled = 1;
-	}
-      else
-	{
-	  error = clib_error_return (0, "unknown input `%U'",
-				     format_unformat_error, input);
-	  break;
-	}
-    }
-
-  if (error)
-    return error;
-
-  if (devconf->workers && devconf->num_rx_queues == 0)
-    devconf->num_rx_queues = clib_bitmap_count_set_bits (devconf->workers);
-  else if (devconf->workers &&
-	   clib_bitmap_count_set_bits (devconf->workers) !=
-	   devconf->num_rx_queues)
-    error =
-      clib_error_return (0,
-			 "%U: number of worker threadds must be "
-			 "equal to number of rx queues", format_vlib_pci_addr,
-			 &pci_addr);
-
-  return error;
-}
-
-static clib_error_t *
-dpdk_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  clib_error_t *error = 0;
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_config_main_t *conf = &dpdk_config_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  dpdk_device_config_t *devconf;
-  vlib_pci_addr_t pci_addr;
-  unformat_input_t sub_input;
-  u8 *s, *tmp = 0;
-  u8 *rte_cmd = 0, *ethname = 0;
-  u32 log_level;
-  int ret, i;
-  int num_whitelisted = 0;
-  u8 no_pci = 0;
-  u8 no_huge = 0;
-  u8 huge_dir = 0;
-  u8 file_prefix = 0;
-  u8 *socket_mem = 0;
-
-  conf->device_config_index_by_pci_addr = hash_create (0, sizeof (uword));
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      /* Prime the pump */
-      if (unformat (input, "no-hugetlb"))
-	{
-	  vec_add1 (conf->eal_init_args, (u8 *) "no-huge");
-	  no_huge = 1;
-	}
-
-      else if (unformat (input, "enable-tcp-udp-checksum"))
-	conf->enable_tcp_udp_checksum = 1;
-
-      else if (unformat (input, "decimal-interface-names"))
-	conf->interface_name_format_decimal = 1;
-
-      else if (unformat (input, "no-multi-seg"))
-	conf->no_multi_seg = 1;
-
-      else if (unformat (input, "dev default %U", unformat_vlib_cli_sub_input,
-			 &sub_input))
-	{
-	  error =
-	    dpdk_device_config (conf, (vlib_pci_addr_t) (u32) ~ 1, &sub_input,
-				1);
-
-	  if (error)
-	    return error;
-	}
-      else
-	if (unformat
-	    (input, "dev %U %U", unformat_vlib_pci_addr, &pci_addr,
-	     unformat_vlib_cli_sub_input, &sub_input))
-	{
-	  error = dpdk_device_config (conf, pci_addr, &sub_input, 0);
-
-	  if (error)
-	    return error;
-
-	  num_whitelisted++;
-	}
-      else if (unformat (input, "dev %U", unformat_vlib_pci_addr, &pci_addr))
-	{
-	  error = dpdk_device_config (conf, pci_addr, 0, 0);
-
-	  if (error)
-	    return error;
-
-	  num_whitelisted++;
-	}
-      else if (unformat (input, "num-mbufs %d", &conf->num_mbufs))
-	;
-      else if (unformat (input, "kni %d", &conf->num_kni))
-	;
-      else if (unformat (input, "uio-driver %s", &conf->uio_driver_name))
-	;
-      else if (unformat (input, "socket-mem %s", &socket_mem))
-	;
-      else if (unformat (input, "no-pci"))
-	{
-	  no_pci = 1;
-	  tmp = format (0, "--no-pci%c", 0);
-	  vec_add1 (conf->eal_init_args, tmp);
-	}
-      else if (unformat (input, "poll-sleep %d", &dm->poll_sleep))
-	;
-
-#define _(a)                                    \
-      else if (unformat(input, #a))             \
-        {                                       \
-          tmp = format (0, "--%s%c", #a, 0);    \
-          vec_add1 (conf->eal_init_args, tmp);    \
-        }
-      foreach_eal_double_hyphen_predicate_arg
-#undef _
-#define _(a)                                          \
-	else if (unformat(input, #a " %s", &s))	      \
-	  {					      \
-            if (!strncmp(#a, "huge-dir", 8))          \
-              huge_dir = 1;                           \
-            else if (!strncmp(#a, "file-prefix", 11)) \
-              file_prefix = 1;                        \
-	    tmp = format (0, "--%s%c", #a, 0);	      \
-	    vec_add1 (conf->eal_init_args, tmp);      \
-	    vec_add1 (s, 0);			      \
-	    vec_add1 (conf->eal_init_args, s);	      \
-	  }
-	foreach_eal_double_hyphen_arg
-#undef _
-#define _(a,b)						\
-	  else if (unformat(input, #a " %s", &s))	\
-	    {						\
-	      tmp = format (0, "-%s%c", #b, 0);		\
-	      vec_add1 (conf->eal_init_args, tmp);	\
-	      vec_add1 (s, 0);				\
-	      vec_add1 (conf->eal_init_args, s);	\
-	    }
-	foreach_eal_single_hyphen_arg
-#undef _
-#define _(a,b)						\
-	    else if (unformat(input, #a " %s", &s))	\
-	      {						\
-		tmp = format (0, "-%s%c", #b, 0);	\
-		vec_add1 (conf->eal_init_args, tmp);	\
-		vec_add1 (s, 0);			\
-		vec_add1 (conf->eal_init_args, s);	\
-		conf->a##_set_manually = 1;		\
-	      }
-	foreach_eal_single_hyphen_mandatory_arg
-#undef _
-	else if (unformat (input, "default"))
-	;
-
-      else if (unformat_skip_white_space (input))
-	;
-      else
-	{
-	  error = clib_error_return (0, "unknown input `%U'",
-				     format_unformat_error, input);
-	  goto done;
-	}
-    }
-
-  if (!conf->uio_driver_name)
-    conf->uio_driver_name = format (0, "igb_uio%c", 0);
-
-  /*
-   * Use 1G huge pages if available.
-   */
-  if (!no_huge && !huge_dir)
-    {
-      u32 x, *mem_by_socket = 0;
-      uword c = 0;
-      u8 use_1g = 1;
-      u8 use_2m = 1;
-      u8 less_than_1g = 1;
-      int rv;
-
-      umount (DEFAULT_HUGE_DIR);
-
-      /* Process "socket-mem" parameter value */
-      if (vec_len (socket_mem))
-	{
-	  unformat_input_t in;
-	  unformat_init_vector (&in, socket_mem);
-	  while (unformat_check_input (&in) != UNFORMAT_END_OF_INPUT)
-	    {
-	      if (unformat (&in, "%u,", &x))
-		;
-	      else if (unformat (&in, "%u", &x))
-		;
-	      else if (unformat (&in, ","))
-		x = 0;
-	      else
-		break;
-
-	      vec_add1 (mem_by_socket, x);
-
-	      if (x > 1023)
-		less_than_1g = 0;
-	    }
-	  /* Note: unformat_free vec_frees(in.buffer), aka socket_mem... */
-	  unformat_free (&in);
-	  socket_mem = 0;
-	}
-      else
-	{
-	  /* *INDENT-OFF* */
-	  clib_bitmap_foreach (c, tm->cpu_socket_bitmap, (
-	    {
-	      vec_validate(mem_by_socket, c);
-	      mem_by_socket[c] = 256; /* default per-socket mem */
-	    }
-	  ));
-	  /* *INDENT-ON* */
-	}
-
-      /* check if available enough 1GB pages for each socket */
-      /* *INDENT-OFF* */
-      clib_bitmap_foreach (c, tm->cpu_socket_bitmap, (
-        {
-	  int pages_avail, page_size, mem;
-
-	  vec_validate(mem_by_socket, c);
-	  mem = mem_by_socket[c];
-
-	  page_size = 1024;
-	  pages_avail = vlib_sysfs_get_free_hugepages(c, page_size * 1024);
-
-	  if (pages_avail < 0 || page_size * pages_avail < mem)
-	    use_1g = 0;
-
-	  page_size = 2;
-	  pages_avail = vlib_sysfs_get_free_hugepages(c, page_size * 1024);
-
-	  if (pages_avail < 0 || page_size * pages_avail < mem)
-	    use_2m = 0;
-      }));
-      /* *INDENT-ON* */
-
-      if (mem_by_socket == 0)
-	{
-	  error = clib_error_return (0, "mem_by_socket NULL");
-	  goto done;
-	}
-      _vec_len (mem_by_socket) = c + 1;
-
-      /* regenerate socket_mem string */
-      vec_foreach_index (x, mem_by_socket)
-	socket_mem = format (socket_mem, "%s%u",
-			     socket_mem ? "," : "", mem_by_socket[x]);
-      socket_mem = format (socket_mem, "%c", 0);
-
-      vec_free (mem_by_socket);
-
-      rv = mkdir (VPP_RUN_DIR, 0755);
-      if (rv && errno != EEXIST)
-	{
-	  error = clib_error_return (0, "mkdir '%s' failed errno %d",
-				     VPP_RUN_DIR, errno);
-	  goto done;
-	}
-
-      rv = mkdir (DEFAULT_HUGE_DIR, 0755);
-      if (rv && errno != EEXIST)
-	{
-	  error = clib_error_return (0, "mkdir '%s' failed errno %d",
-				     DEFAULT_HUGE_DIR, errno);
-	  goto done;
-	}
-
-      if (use_1g && !(less_than_1g && use_2m))
-	{
-	  rv =
-	    mount ("none", DEFAULT_HUGE_DIR, "hugetlbfs", 0, "pagesize=1G");
-	}
-      else if (use_2m)
-	{
-	  rv = mount ("none", DEFAULT_HUGE_DIR, "hugetlbfs", 0, NULL);
-	}
-      else
-	{
-	  return clib_error_return (0, "not enough free huge pages");
-	}
-
-      if (rv)
-	{
-	  error = clib_error_return (0, "mount failed %d", errno);
-	  goto done;
-	}
-
-      tmp = format (0, "--huge-dir%c", 0);
-      vec_add1 (conf->eal_init_args, tmp);
-      tmp = format (0, "%s%c", DEFAULT_HUGE_DIR, 0);
-      vec_add1 (conf->eal_init_args, tmp);
-      if (!file_prefix)
-	{
-	  tmp = format (0, "--file-prefix%c", 0);
-	  vec_add1 (conf->eal_init_args, tmp);
-	  tmp = format (0, "vpp%c", 0);
-	  vec_add1 (conf->eal_init_args, tmp);
-	}
-    }
-
-  vec_free (rte_cmd);
-  vec_free (ethname);
-
-  if (error)
-    return error;
-
-  /* I'll bet that -c and -n must be the first and second args... */
-  if (!conf->coremask_set_manually)
-    {
-      vlib_thread_registration_t *tr;
-      uword *coremask = 0;
-      int i;
-
-      /* main thread core */
-      coremask = clib_bitmap_set (coremask, tm->main_lcore, 1);
-
-      for (i = 0; i < vec_len (tm->registrations); i++)
-	{
-	  tr = tm->registrations[i];
-	  coremask = clib_bitmap_or (coremask, tr->coremask);
-	}
-
-      vec_insert (conf->eal_init_args, 2, 1);
-      conf->eal_init_args[1] = (u8 *) "-c";
-      tmp = format (0, "%U%c", format_bitmap_hex, coremask, 0);
-      conf->eal_init_args[2] = tmp;
-      clib_bitmap_free (coremask);
-    }
-
-  if (!conf->nchannels_set_manually)
-    {
-      vec_insert (conf->eal_init_args, 2, 3);
-      conf->eal_init_args[3] = (u8 *) "-n";
-      tmp = format (0, "%d", conf->nchannels);
-      conf->eal_init_args[4] = tmp;
-    }
-
-  if (no_pci == 0 && geteuid () == 0)
-    dpdk_bind_devices_to_uio (conf);
-
-#define _(x) \
-    if (devconf->x == 0 && conf->default_devconf.x > 0) \
-      devconf->x = conf->default_devconf.x ;
-
-  /* *INDENT-OFF* */
-  pool_foreach (devconf, conf->dev_confs, ({
-
-    /* default per-device config items */
-    foreach_dpdk_device_config_item
-
-    /* add DPDK EAL whitelist/blacklist entry */
-    if (num_whitelisted > 0 && devconf->is_blacklisted == 0)
-      {
-	tmp = format (0, "-w%c", 0);
-	vec_add1 (conf->eal_init_args, tmp);
-	tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr, 0);
-	vec_add1 (conf->eal_init_args, tmp);
-      }
-    else if (num_whitelisted == 0 && devconf->is_blacklisted != 0)
-      {
-	tmp = format (0, "-b%c", 0);
-	vec_add1 (conf->eal_init_args, tmp);
-	tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr, 0);
-	vec_add1 (conf->eal_init_args, tmp);
-      }
-  }));
-  /* *INDENT-ON* */
-
-#undef _
-
-  /* set master-lcore */
-  tmp = format (0, "--master-lcore%c", 0);
-  vec_add1 (conf->eal_init_args, tmp);
-  tmp = format (0, "%u%c", tm->main_lcore, 0);
-  vec_add1 (conf->eal_init_args, tmp);
-
-  /* set socket-mem */
-  tmp = format (0, "--socket-mem%c", 0);
-  vec_add1 (conf->eal_init_args, tmp);
-  tmp = format (0, "%s%c", socket_mem, 0);
-  vec_add1 (conf->eal_init_args, tmp);
-
-  /* NULL terminate the "argv" vector, in case of stupidity */
-  vec_add1 (conf->eal_init_args, 0);
-  _vec_len (conf->eal_init_args) -= 1;
-
-  /* Set up DPDK eal and packet mbuf pool early. */
-
-  log_level = (CLIB_DEBUG > 0) ? RTE_LOG_DEBUG : RTE_LOG_NOTICE;
-
-  rte_set_log_level (log_level);
-
-  vm = vlib_get_main ();
-
-  /* make copy of args as rte_eal_init tends to mess up with arg array */
-  for (i = 1; i < vec_len (conf->eal_init_args); i++)
-    conf->eal_init_args_str = format (conf->eal_init_args_str, "%s ",
-				      conf->eal_init_args[i]);
-
-  ret =
-    rte_eal_init (vec_len (conf->eal_init_args),
-		  (char **) conf->eal_init_args);
-
-  /* lazy umount hugepages */
-  umount2 (DEFAULT_HUGE_DIR, MNT_DETACH);
-
-  if (ret < 0)
-    return clib_error_return (0, "rte_eal_init returned %d", ret);
-
-  /* Dump the physical memory layout prior to creating the mbuf_pool */
-  fprintf (stdout, "DPDK physical memory layout:\n");
-  rte_dump_physmem_layout (stdout);
-
-  /* main thread 1st */
-  error = vlib_buffer_pool_create (vm, conf->num_mbufs, rte_socket_id ());
-  if (error)
-    return error;
-
-  for (i = 0; i < RTE_MAX_LCORE; i++)
-    {
-      error = vlib_buffer_pool_create (vm, conf->num_mbufs,
-				       rte_lcore_to_socket_id (i));
-      if (error)
-	return error;
-    }
-
-done:
-  return error;
-}
-
-VLIB_CONFIG_FUNCTION (dpdk_config, "dpdk");
-
-void
-dpdk_update_link_state (dpdk_device_t * xd, f64 now)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  struct rte_eth_link prev_link = xd->link;
-  u32 hw_flags = 0;
-  u8 hw_flags_chg = 0;
-
-  /* only update link state for PMD interfaces */
-  if ((xd->flags & DPDK_DEVICE_FLAG_PMD) == 0)
-    return;
-
-  xd->time_last_link_update = now ? now : xd->time_last_link_update;
-  memset (&xd->link, 0, sizeof (xd->link));
-  rte_eth_link_get_nowait (xd->device_index, &xd->link);
-
-  if (LINK_STATE_ELOGS)
-    {
-      vlib_main_t *vm = vlib_get_main ();
-      ELOG_TYPE_DECLARE (e) =
-      {
-      .format =
-	  "update-link-state: sw_if_index %d, admin_up %d,"
-	  "old link_state %d new link_state %d",.format_args = "i4i1i1i1",};
-
-      struct
-      {
-	u32 sw_if_index;
-	u8 admin_up;
-	u8 old_link_state;
-	u8 new_link_state;
-      } *ed;
-      ed = ELOG_DATA (&vm->elog_main, e);
-      ed->sw_if_index = xd->vlib_sw_if_index;
-      ed->admin_up = (xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP) != 0;
-      ed->old_link_state = (u8)
-	vnet_hw_interface_is_link_up (vnm, xd->vlib_hw_if_index);
-      ed->new_link_state = (u8) xd->link.link_status;
-    }
-
-  if ((xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP) &&
-      ((xd->link.link_status != 0) ^
-       vnet_hw_interface_is_link_up (vnm, xd->vlib_hw_if_index)))
-    {
-      hw_flags_chg = 1;
-      hw_flags |= (xd->link.link_status ? VNET_HW_INTERFACE_FLAG_LINK_UP : 0);
-    }
-
-  if (hw_flags_chg || (xd->link.link_duplex != prev_link.link_duplex))
-    {
-      hw_flags_chg = 1;
-      switch (xd->link.link_duplex)
-	{
-	case ETH_LINK_HALF_DUPLEX:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_HALF_DUPLEX;
-	  break;
-	case ETH_LINK_FULL_DUPLEX:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_FULL_DUPLEX;
-	  break;
-	default:
-	  break;
-	}
-    }
-  if (hw_flags_chg || (xd->link.link_speed != prev_link.link_speed))
-    {
-      hw_flags_chg = 1;
-      switch (xd->link.link_speed)
-	{
-	case ETH_SPEED_NUM_10M:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_10M;
-	  break;
-	case ETH_SPEED_NUM_100M:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_100M;
-	  break;
-	case ETH_SPEED_NUM_1G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_1G;
-	  break;
-	case ETH_SPEED_NUM_10G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_10G;
-	  break;
-	case ETH_SPEED_NUM_40G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_40G;
-	  break;
-	case 0:
-	  break;
-	default:
-	  clib_warning ("unknown link speed %d", xd->link.link_speed);
-	  break;
-	}
-    }
-  if (hw_flags_chg)
-    {
-      if (LINK_STATE_ELOGS)
-	{
-	  vlib_main_t *vm = vlib_get_main ();
-
-	  ELOG_TYPE_DECLARE (e) =
-	  {
-	  .format =
-	      "update-link-state: sw_if_index %d, new flags %d",.format_args
-	      = "i4i4",};
-
-	  struct
-	  {
-	    u32 sw_if_index;
-	    u32 flags;
-	  } *ed;
-	  ed = ELOG_DATA (&vm->elog_main, e);
-	  ed->sw_if_index = xd->vlib_sw_if_index;
-	  ed->flags = hw_flags;
-	}
-      vnet_hw_interface_set_flags (vnm, xd->vlib_hw_if_index, hw_flags);
-    }
-}
-
-static uword
-dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  clib_error_t *error;
-  vnet_main_t *vnm = vnet_get_main ();
-  dpdk_main_t *dm = &dpdk_main;
-  ethernet_main_t *em = &ethernet_main;
-  dpdk_device_t *xd;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  int i;
-
-  error = dpdk_lib_init (dm);
-
-  /*
-   * Turn on the input node if we found some devices to drive
-   * and we're not running worker threads or i/o threads
-   */
-
-  if (error == 0 && vec_len (dm->devices) > 0)
-    {
-      if (tm->n_vlib_mains == 1)
-	vlib_node_set_state (vm, dpdk_input_node.index,
-			     VLIB_NODE_STATE_POLLING);
-      else
-	for (i = 0; i < tm->n_vlib_mains; i++)
-	  if (vec_len (dm->devices_by_cpu[i]) > 0)
-	    vlib_node_set_state (vlib_mains[i], dpdk_input_node.index,
-				 VLIB_NODE_STATE_POLLING);
-    }
-
-  if (error)
-    clib_error_report (error);
-
-  tm->worker_thread_release = 1;
-
-  f64 now = vlib_time_now (vm);
-  vec_foreach (xd, dm->devices)
-  {
-    dpdk_update_link_state (xd, now);
-  }
-
-  {
-    /*
-     * Extra set up for bond interfaces:
-     *  1. Setup MACs for bond interfaces and their slave links which was set
-     *     in dpdk_port_setup() but needs to be done again here to take effect.
-     *  2. Set up info for bond interface related CLI support.
-     */
-    int nports = rte_eth_dev_count ();
-    if (nports > 0)
-      {
-	for (i = 0; i < nports; i++)
-	  {
-	    struct rte_eth_dev_info dev_info;
-	    rte_eth_dev_info_get (i, &dev_info);
-	    if (!dev_info.driver_name)
-#if RTE_VERSION < RTE_VERSION_NUM(16, 11, 0, 0)
-	      dev_info.driver_name = dev_info.pci_dev->driver->name;
-#else
-	      dev_info.driver_name = dev_info.pci_dev->driver->driver.name;
-#endif
-	    ASSERT (dev_info.driver_name);
-	    if (strncmp (dev_info.driver_name, "rte_bond_pmd", 12) == 0)
-	      {
-		u8 addr[6];
-		u8 slink[16];
-		int nlink = rte_eth_bond_slaves_get (i, slink, 16);
-		if (nlink > 0)
-		  {
-		    vnet_hw_interface_t *bhi;
-		    ethernet_interface_t *bei;
-		    int rv;
-
-		    /* Get MAC of 1st slave link */
-		    rte_eth_macaddr_get (slink[0],
-					 (struct ether_addr *) addr);
-		    /* Set MAC of bounded interface to that of 1st slave link */
-		    rv =
-		      rte_eth_bond_mac_address_set (i,
-						    (struct ether_addr *)
-						    addr);
-		    if (rv < 0)
-		      clib_warning ("Failed to set MAC address");
-
-		    /* Populate MAC of bonded interface in VPP hw tables */
-		    bhi =
-		      vnet_get_hw_interface (vnm,
-					     dm->devices[i].vlib_hw_if_index);
-		    bei =
-		      pool_elt_at_index (em->interfaces, bhi->hw_instance);
-		    clib_memcpy (bhi->hw_address, addr, 6);
-		    clib_memcpy (bei->address, addr, 6);
-		    /* Init l3 packet size allowed on bonded interface */
-		    bhi->max_packet_bytes = ETHERNET_MAX_PACKET_BYTES;
-		    bhi->max_l3_packet_bytes[VLIB_RX] =
-		      bhi->max_l3_packet_bytes[VLIB_TX] =
-		      ETHERNET_MAX_PACKET_BYTES - sizeof (ethernet_header_t);
-		    while (nlink >= 1)
-		      {		/* for all slave links */
-			int slave = slink[--nlink];
-			dpdk_device_t *sdev = &dm->devices[slave];
-			vnet_hw_interface_t *shi;
-			vnet_sw_interface_t *ssi;
-			/* Add MAC to all slave links except the first one */
-			if (nlink)
-			  rte_eth_dev_mac_addr_add (slave,
-						    (struct ether_addr *)
-						    addr, 0);
-			/* Set slaves bitmap for bonded interface */
-			bhi->bond_info =
-			  clib_bitmap_set (bhi->bond_info,
-					   sdev->vlib_hw_if_index, 1);
-			/* Set slave link flags on slave interface */
-			shi =
-			  vnet_get_hw_interface (vnm, sdev->vlib_hw_if_index);
-			ssi =
-			  vnet_get_sw_interface (vnm, sdev->vlib_sw_if_index);
-			shi->bond_info = VNET_HW_INTERFACE_BOND_INFO_SLAVE;
-			ssi->flags |= VNET_SW_INTERFACE_FLAG_BOND_SLAVE;
-
-			/* Set l3 packet size allowed as the lowest of slave */
-			if (bhi->max_l3_packet_bytes[VLIB_RX] >
-			    shi->max_l3_packet_bytes[VLIB_RX])
-			  bhi->max_l3_packet_bytes[VLIB_RX] =
-			    bhi->max_l3_packet_bytes[VLIB_TX] =
-			    shi->max_l3_packet_bytes[VLIB_RX];
-
-			/* Set max packet size allowed as the lowest of slave */
-			if (bhi->max_packet_bytes > shi->max_packet_bytes)
-			  bhi->max_packet_bytes = shi->max_packet_bytes;
-		      }
-		  }
-	      }
-	  }
-      }
-  }
-
-  while (1)
-    {
-      /*
-       * check each time through the loop in case intervals are changed
-       */
-      f64 min_wait = dm->link_state_poll_interval < dm->stat_poll_interval ?
-	dm->link_state_poll_interval : dm->stat_poll_interval;
-
-      vlib_process_wait_for_event_or_clock (vm, min_wait);
-
-      if (dm->admin_up_down_in_progress)
-	/* skip the poll if an admin up down is in progress (on any interface) */
-	continue;
-
-      vec_foreach (xd, dm->devices)
-      {
-	f64 now = vlib_time_now (vm);
-	if ((now - xd->time_last_stats_update) >= dm->stat_poll_interval)
-	  dpdk_update_counters (xd, now);
-	if ((now - xd->time_last_link_update) >= dm->link_state_poll_interval)
-	  dpdk_update_link_state (xd, now);
-
-      }
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (dpdk_process_node,static) = {
-    .function = dpdk_process,
-    .type = VLIB_NODE_TYPE_PROCESS,
-    .name = "dpdk-process",
-    .process_log2_n_stack_bytes = 17,
-};
-/* *INDENT-ON* */
-
-int
-dpdk_set_stat_poll_interval (f64 interval)
-{
-  if (interval < DPDK_MIN_STATS_POLL_INTERVAL)
-    return (VNET_API_ERROR_INVALID_VALUE);
-
-  dpdk_main.stat_poll_interval = interval;
-
-  return 0;
-}
-
-int
-dpdk_set_link_state_poll_interval (f64 interval)
-{
-  if (interval < DPDK_MIN_LINK_POLL_INTERVAL)
-    return (VNET_API_ERROR_INVALID_VALUE);
-
-  dpdk_main.link_state_poll_interval = interval;
-
-  return 0;
-}
-
-clib_error_t *
-dpdk_init (vlib_main_t * vm)
-{
-  dpdk_main_t *dm = &dpdk_main;
-  vlib_node_t *ei;
-  clib_error_t *error = 0;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-
-  /* verify that structs are cacheline aligned */
-  STATIC_ASSERT (offsetof (dpdk_device_t, cacheline0) == 0,
-		 "Cache line marker must be 1st element in dpdk_device_t");
-  STATIC_ASSERT (offsetof (dpdk_device_t, cacheline1) ==
-		 CLIB_CACHE_LINE_BYTES,
-		 "Data in cache line 0 is bigger than cache line size");
-  STATIC_ASSERT (offsetof (dpdk_worker_t, cacheline0) == 0,
-		 "Cache line marker must be 1st element in dpdk_worker_t");
-  STATIC_ASSERT (offsetof (frame_queue_trace_t, cacheline0) == 0,
-		 "Cache line marker must be 1st element in frame_queue_trace_t");
-
-  dm->vlib_main = vm;
-  dm->vnet_main = vnet_get_main ();
-  dm->conf = &dpdk_config_main;
-
-  ei = vlib_get_node_by_name (vm, (u8 *) "ethernet-input");
-  if (ei == 0)
-    return clib_error_return (0, "ethernet-input node AWOL");
-
-  dm->ethernet_input_node_index = ei->index;
-
-  dm->conf->nchannels = 4;
-  dm->conf->num_mbufs = dm->conf->num_mbufs ? dm->conf->num_mbufs : NB_MBUF;
-  vec_add1 (dm->conf->eal_init_args, (u8 *) "vnet");
-
-  dm->dpdk_device_by_kni_port_id = hash_create (0, sizeof (uword));
-  dm->vu_sw_if_index_by_listener_fd = hash_create (0, sizeof (uword));
-  dm->vu_sw_if_index_by_sock_fd = hash_create (0, sizeof (uword));
-
-  /* $$$ use n_thread_stacks since it's known-good at this point */
-  vec_validate (dm->recycle, tm->n_thread_stacks - 1);
-
-  /* Default vlib_buffer_t flags, DISABLES tcp/udp checksumming... */
-  dm->buffer_flags_template =
-    (VLIB_BUFFER_TOTAL_LENGTH_VALID | VNET_BUFFER_RTE_MBUF_VALID
-     | IP_BUFFER_L4_CHECKSUM_COMPUTED | IP_BUFFER_L4_CHECKSUM_CORRECT);
-
-  dm->stat_poll_interval = DPDK_STATS_POLL_INTERVAL;
-  dm->link_state_poll_interval = DPDK_LINK_POLL_INTERVAL;
-
-  /* init CLI */
-  if ((error = vlib_call_init_function (vm, dpdk_cli_init)))
-    return error;
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (dpdk_init);
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/ipsec/cli.c b/vnet/vnet/devices/dpdk/ipsec/cli.c
deleted file mode 100644
index 3b634e03..00000000
--- a/vnet/vnet/devices/dpdk/ipsec/cli.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2016 Intel and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/devices/dpdk/ipsec/ipsec.h>
-
-static void
-dpdk_ipsec_show_mapping (vlib_main_t * vm, u16 detail_display)
-{
-  dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  u32 i, skip_master;
-
-  if (detail_display)
-    vlib_cli_output (vm, "worker\t%10s\t%15s\tdir\tdev\tqp\n",
-		     "cipher", "auth");
-  else
-    vlib_cli_output (vm, "worker\tcrypto device id(type)\n");
-
-  skip_master = vlib_num_workers () > 0;
-
-  for (i = 0; i < tm->n_vlib_mains; i++)
-    {
-      uword key, data;
-      u32 cpu_index = vlib_mains[i]->cpu_index;
-      crypto_worker_main_t *cwm = &dcm->workers_main[cpu_index];
-      u8 *s = 0;
-
-      if (skip_master)
-	{
-	  skip_master = 0;
-	  continue;
-	}
-
-      if (!detail_display)
-	{
-	  i32 last_cdev = -1;
-	  crypto_qp_data_t *qpd;
-
-	  s = format (s, "%u\t", cpu_index);
-
-	  /* *INDENT-OFF* */
-	  vec_foreach (qpd, cwm->qp_data)
-	    {
-	      u32 dev_id = qpd->dev_id;
-
-	      if ((u16) last_cdev != dev_id)
-		{
-		  struct rte_cryptodev_info cdev_info;
-
-		  rte_cryptodev_info_get (dev_id, &cdev_info);
-
-		  s = format(s, "%u(%s)\t", dev_id, cdev_info.feature_flags &
-			     RTE_CRYPTODEV_FF_HW_ACCELERATED ? "HW" : "SW");
-		}
-	      last_cdev = dev_id;
-	    }
-	  /* *INDENT-ON* */
-	  vlib_cli_output (vm, "%s", s);
-	}
-      else
-	{
-	  char cipher_str[15], auth_str[15];
-	  struct rte_cryptodev_capabilities cap;
-	  crypto_worker_qp_key_t *p_key = (crypto_worker_qp_key_t *) & key;
-	  /* *INDENT-OFF* */
-	  hash_foreach (key, data, cwm->algo_qp_map,
-	  ({
-	    cap.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC;
-	    cap.sym.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-	    cap.sym.cipher.algo = p_key->cipher_algo;
-	    check_algo_is_supported (&cap, cipher_str);
-	    cap.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC;
-	    cap.sym.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH;
-	    cap.sym.auth.algo = p_key->auth_algo;
-	    check_algo_is_supported (&cap, auth_str);
-	    vlib_cli_output (vm, "%u\t%10s\t%15s\t%3s\t%u\t%u\n",
-			     vlib_mains[i]->cpu_index, cipher_str, auth_str,
-			     p_key->is_outbound ? "out" : "in",
-			     cwm->qp_data[data].dev_id,
-			     cwm->qp_data[data].qp_id);
-	  }));
-	  /* *INDENT-ON* */
-	}
-    }
-}
-
-static clib_error_t *
-lcore_cryptodev_map_fn (vlib_main_t * vm, unformat_input_t * input,
-			vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u16 detail = 0;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "verbose"))
-	detail = 1;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  dpdk_ipsec_show_mapping (vm, detail);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lcore_cryptodev_map, static) = {
-    .path = "show crypto device mapping",
-    .short_help =
-    "show cryptodev device mapping <verbose>",
-    .function = lcore_cryptodev_map_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/ipsec/crypto_node.c b/vnet/vnet/devices/dpdk/ipsec/crypto_node.c
deleted file mode 100644
index 7b32704e..00000000
--- a/vnet/vnet/devices/dpdk/ipsec/crypto_node.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- *------------------------------------------------------------------
- * crypto_node.c - DPDK Cryptodev input node
- *
- * Copyright (c) 2016 Intel and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vlib/vlib.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ipsec/ipsec.h>
-
-#include <vnet/devices/dpdk/ipsec/ipsec.h>
-
-#define foreach_dpdk_crypto_input_next		\
-  _(DROP, "error-drop")				\
-  _(ENCRYPT_POST, "dpdk-esp-encrypt-post")	\
-  _(DECRYPT_POST, "dpdk-esp-decrypt-post")
-
-typedef enum
-{
-#define _(f,s) DPDK_CRYPTO_INPUT_NEXT_##f,
-  foreach_dpdk_crypto_input_next
-#undef _
-    DPDK_CRYPTO_INPUT_N_NEXT,
-} dpdk_crypto_input_next_t;
-
-#define foreach_dpdk_crypto_input_error		\
-  _(DQ_COPS, "Crypto ops dequeued")		\
-  _(COP_FAILED, "Crypto op failed")
-
-typedef enum
-{
-#define _(f,s) DPDK_CRYPTO_INPUT_ERROR_##f,
-  foreach_dpdk_crypto_input_error
-#undef _
-    DPDK_CRYPTO_INPUT_N_ERROR,
-} dpdk_crypto_input_error_t;
-
-static char *dpdk_crypto_input_error_strings[] = {
-#define _(n, s) s,
-  foreach_dpdk_crypto_input_error
-#undef _
-};
-
-vlib_node_registration_t dpdk_crypto_input_node;
-
-typedef struct
-{
-  u32 cdev;
-  u32 qp;
-  u32 status;
-  u32 sa_idx;
-  u32 next_index;
-} dpdk_crypto_input_trace_t;
-
-static u8 *
-format_dpdk_crypto_input_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  dpdk_crypto_input_trace_t *t = va_arg (*args, dpdk_crypto_input_trace_t *);
-
-  s = format (s, "dpdk_crypto: cryptodev-id %u queue-pair %u next-index %d",
-	      t->cdev, t->qp, t->next_index);
-
-  s = format (s, " status %u sa-idx %u\n", t->status, t->sa_idx);
-
-  return s;
-}
-
-static_always_inline u32
-dpdk_crypto_dequeue (vlib_main_t * vm, vlib_node_runtime_t * node,
-		     crypto_qp_data_t * qpd)
-{
-  u32 n_deq, *to_next = 0, next_index, n_cops, def_next_index;
-  struct rte_crypto_op **cops = qpd->cops;
-
-  if (qpd->inflights == 0)
-    return 0;
-
-  if (qpd->is_outbound)
-    def_next_index = DPDK_CRYPTO_INPUT_NEXT_ENCRYPT_POST;
-  else
-    def_next_index = DPDK_CRYPTO_INPUT_NEXT_DECRYPT_POST;
-
-  n_cops = rte_cryptodev_dequeue_burst (qpd->dev_id, qpd->qp_id,
-					cops, VLIB_FRAME_SIZE);
-  n_deq = n_cops;
-  next_index = def_next_index;
-
-  qpd->inflights -= n_cops;
-  ASSERT (qpd->inflights >= 0);
-
-  while (n_cops > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_cops > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, next0;
-	  vlib_buffer_t *b0 = 0;
-	  struct rte_crypto_op *cop;
-	  struct rte_crypto_sym_op *sym_cop;
-
-	  cop = cops[0];
-	  cops += 1;
-	  n_cops -= 1;
-	  n_left_to_next -= 1;
-
-	  next0 = def_next_index;
-
-	  if (PREDICT_FALSE (cop->status != RTE_CRYPTO_OP_STATUS_SUCCESS))
-	    {
-	      next0 = DPDK_CRYPTO_INPUT_NEXT_DROP;
-	      vlib_node_increment_counter (vm, dpdk_crypto_input_node.index,
-					   DPDK_CRYPTO_INPUT_ERROR_COP_FAILED,
-					   1);
-	    }
-	  cop->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
-
-	  sym_cop = (struct rte_crypto_sym_op *) (cop + 1);
-	  b0 = vlib_buffer_from_rte_mbuf (sym_cop->m_src);
-	  bi0 = vlib_get_buffer_index (vm, b0);
-
-	  to_next[0] = bi0;
-	  to_next += 1;
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      vlib_trace_next_frame (vm, node, next0);
-	      dpdk_crypto_input_trace_t *tr =
-		vlib_add_trace (vm, node, b0, sizeof (*tr));
-	      tr->cdev = qpd->dev_id;
-	      tr->qp = qpd->qp_id;
-	      tr->status = cop->status;
-	      tr->next_index = next0;
-	      tr->sa_idx = vnet_buffer (b0)->ipsec.sad_index;
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  crypto_free_cop (qpd, qpd->cops, n_deq);
-
-  vlib_node_increment_counter (vm, dpdk_crypto_input_node.index,
-			       DPDK_CRYPTO_INPUT_ERROR_DQ_COPS, n_deq);
-  return n_deq;
-}
-
-static uword
-dpdk_crypto_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-		      vlib_frame_t * frame)
-{
-  u32 cpu_index = os_get_cpu_number ();
-  dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
-  crypto_worker_main_t *cwm = &dcm->workers_main[cpu_index];
-  crypto_qp_data_t *qpd;
-  u32 n_deq = 0;
-
-  /* *INDENT-OFF* */
-  vec_foreach (qpd, cwm->qp_data)
-      n_deq += dpdk_crypto_dequeue(vm, node, qpd);
-  /* *INDENT-ON* */
-
-  return n_deq;
-}
-
-VLIB_REGISTER_NODE (dpdk_crypto_input_node) =
-{
-  .function = dpdk_crypto_input_fn,.name = "dpdk-crypto-input",.format_trace =
-    format_dpdk_crypto_input_trace,.type = VLIB_NODE_TYPE_INPUT,.state =
-    VLIB_NODE_STATE_DISABLED,.n_errors =
-    DPDK_CRYPTO_INPUT_N_ERROR,.error_strings =
-    dpdk_crypto_input_error_strings,.n_next_nodes =
-    DPDK_CRYPTO_INPUT_N_NEXT,.next_nodes =
-  {
-#define _(s,n) [DPDK_CRYPTO_INPUT_NEXT_##s] = n,
-    foreach_dpdk_crypto_input_next
-#undef _
-  }
-,};
-
-#if DPDK_CRYPTO==1
-VLIB_NODE_FUNCTION_MULTIARCH (dpdk_crypto_input_node, dpdk_crypto_input_fn)
-#endif
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/ipsec/dir.dox b/vnet/vnet/devices/dpdk/ipsec/dir.dox
deleted file mode 100644
index ffebfc4d..00000000
--- a/vnet/vnet/devices/dpdk/ipsec/dir.dox
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2016 Intel and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- @dir vnet/vnet/devices/dpdk/ipsec
- @brief IPSec ESP encrypt/decrypt using DPDK Cryptodev API
-*/
diff --git a/vnet/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md b/vnet/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md
deleted file mode 100644
index 8089696f..00000000
--- a/vnet/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# VPP IPSec implementation using DPDK Cryptodev API    {#dpdk_crypto_ipsec_doc}
-
-This document is meant to contain all related information about implementation and usability.
-
-
-## VPP IPsec with DPDK Cryptodev
-
-DPDK Cryptodev is an asynchronous crypto API that supports both Hardware and Software implementations (for more details refer to [DPDK Cryptography Device Library documentation](http://dpdk.org/doc/guides/prog_guide/cryptodev_lib.html)).
-
-When DPDK Cryptodev support is enabled, the node graph is modified by adding and replacing some of the nodes.
-
-The following nodes are replaced:
-* esp-encrypt -> dpdk-esp-encrypt
-* esp-decrypt -> dpdk-esp-decrypt
-
-The following nodes are added:
-* dpdk-crypto-input : polling input node, basically dequeuing from crypto devices.
-* dpdk-esp-encrypt-post : internal node.
-* dpdk-esp-decrypt-post : internal node.
-
-
-### How to enable VPP IPSec with DPDK Cryptodev support
-
-To enable DPDK Cryptodev support (disabled by default), we need the following env option:
-
-    vpp_uses_dpdk_cryptodev=yes
-
-A couple of ways to achive this:
-* uncomment/add it in the platforms config (ie. build-data/platforms/vpp.mk)
-* set the option when building vpp (ie. make vpp_uses_dpdk_cryptodev=yes build-release)
-
-
-### Crypto Resources allocation
-
-VPP allocates crypto resources based on a best effort approach:
-* first allocate Hardware crypto resources, then Software.
-* if there are not enough crypto resources for all workers, all packets will be dropped if they reach ESP encrypt/decrypt nodes, displaying the warning:
-
-      0: dpdk_ipsec_init: not enough cryptodevs for ipsec
-
-
-### Configuration example
-
-No especial IPsec configuration is required.
-
-Once DPDK Cryptodev is enabled, the user just needs to provide cryptodevs in the startup.conf.
-
-Example startup.conf:
-
-```
-dpdk {
-    socket-mem 1024,1024
-    num-mbufs 131072
-    dev 0000:81:00.0
-    dev 0000:81:00.1
-    dev 0000:85:01.0
-    dev 0000:85:01.1
-    vdev cryptodev_aesni_mb_pmd,socket_id=1
-    vdev cryptodev_aesni_mb_pmd,socket_id=1
-}
-```
-
-In the above configuration:
-* 0000:85:01.0 and 0000:85:01.1 are crypto BDFs and they require the same driver binding as DPDK Ethernet devices but they do not support any extra configuration options.
-* Two AESNI-MB Software Cryptodev PMDs are created in NUMA node 1.
-
-For further details refer to [DPDK Crypto Device Driver documentation](http://dpdk.org/doc/guides/cryptodevs/index.html)
-
-### Operational data
-
-The following CLI command displays the Cryptodev/Worker mapping:
-
-    show crypto device mapping [verbose]
diff --git a/vnet/vnet/devices/dpdk/ipsec/esp.h b/vnet/vnet/devices/dpdk/ipsec/esp.h
deleted file mode 100644
index 7ef90c49..00000000
--- a/vnet/vnet/devices/dpdk/ipsec/esp.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (c) 2016 Intel and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __DPDK_ESP_H__
-#define __DPDK_ESP_H__
-
-#include <vnet/devices/dpdk/ipsec/ipsec.h>
-#include <vnet/ipsec/ipsec.h>
-#include <vnet/ipsec/esp.h>
-
-typedef struct
-{
-  enum rte_crypto_cipher_algorithm algo;
-  u8 key_len;
-  u8 iv_len;
-} dpdk_esp_crypto_alg_t;
-
-typedef struct
-{
-  enum rte_crypto_auth_algorithm algo;
-  u8 trunc_size;
-} dpdk_esp_integ_alg_t;
-
-typedef struct
-{
-  dpdk_esp_crypto_alg_t *esp_crypto_algs;
-  dpdk_esp_integ_alg_t *esp_integ_algs;
-} dpdk_esp_main_t;
-
-dpdk_esp_main_t dpdk_esp_main;
-
-static_always_inline void
-dpdk_esp_init ()
-{
-  dpdk_esp_main_t *em = &dpdk_esp_main;
-  dpdk_esp_integ_alg_t *i;
-  dpdk_esp_crypto_alg_t *c;
-
-  vec_validate (em->esp_crypto_algs, IPSEC_CRYPTO_N_ALG - 1);
-
-  c = &em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_CBC_128];
-  c->algo = RTE_CRYPTO_CIPHER_AES_CBC;
-  c->key_len = 16;
-  c->iv_len = 16;
-
-  c = &em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_CBC_192];
-  c->algo = RTE_CRYPTO_CIPHER_AES_CBC;
-  c->key_len = 24;
-  c->iv_len = 16;
-
-  c = &em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_CBC_256];
-  c->algo = RTE_CRYPTO_CIPHER_AES_CBC;
-  c->key_len = 32;
-  c->iv_len = 16;
-
-  c = &em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_GCM_128];
-  c->algo = RTE_CRYPTO_CIPHER_AES_GCM;
-  c->key_len = 16;
-  c->iv_len = 8;
-
-  vec_validate (em->esp_integ_algs, IPSEC_INTEG_N_ALG - 1);
-
-  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA1_96];
-  i->algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
-  i->trunc_size = 12;
-
-  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_256_96];
-  i->algo = RTE_CRYPTO_AUTH_SHA256_HMAC;
-  i->trunc_size = 12;
-
-  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_256_128];
-  i->algo = RTE_CRYPTO_AUTH_SHA256_HMAC;
-  i->trunc_size = 16;
-
-  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_384_192];
-  i->algo = RTE_CRYPTO_AUTH_SHA384_HMAC;
-  i->trunc_size = 24;
-
-  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_512_256];
-  i->algo = RTE_CRYPTO_AUTH_SHA512_HMAC;
-  i->trunc_size = 32;
-
-  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_AES_GCM_128];
-  i->algo = RTE_CRYPTO_AUTH_AES_GCM;
-  i->trunc_size = 16;
-}
-
-static_always_inline int
-add_del_sa_sess (u32 sa_index, u8 is_add)
-{
-  dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
-  crypto_worker_main_t *cwm;
-  u8 skip_master = vlib_num_workers () > 0;
-
-  /* *INDENT-OFF* */
-  vec_foreach (cwm, dcm->workers_main)
-    {
-      crypto_sa_session_t *sa_sess;
-      u8 is_outbound;
-
-      if (skip_master)
-	{
-	  skip_master = 0;
-	  continue;
-	}
-
-      for (is_outbound = 0; is_outbound < 2; is_outbound++)
-	{
-	  if (is_add)
-	    {
-	      pool_get (cwm->sa_sess_d[is_outbound], sa_sess);
-	    }
-	  else
-	    {
-	      u8 dev_id;
-
-	      sa_sess = pool_elt_at_index (cwm->sa_sess_d[is_outbound], sa_index);
-	      dev_id = cwm->qp_data[sa_sess->qp_index].dev_id;
-
-	      if (!sa_sess->sess)
-		continue;
-
-	      if (rte_cryptodev_sym_session_free(dev_id, sa_sess->sess))
-		{
-		  clib_warning("failed to free session");
-		  return -1;
-		}
-	      memset(sa_sess, 0, sizeof(sa_sess[0]));
-	    }
-	}
-    }
-  /* *INDENT-OFF* */
-
-  return 0;
-}
-
-static_always_inline int
-translate_crypto_algo(ipsec_crypto_alg_t crypto_algo,
-		      struct rte_crypto_sym_xform *cipher_xform)
-{
-  switch (crypto_algo)
-  {
-    case IPSEC_CRYPTO_ALG_NONE:
-      cipher_xform->cipher.algo = RTE_CRYPTO_CIPHER_NULL;
-      break;
-    case IPSEC_CRYPTO_ALG_AES_CBC_128:
-    case IPSEC_CRYPTO_ALG_AES_CBC_192:
-    case IPSEC_CRYPTO_ALG_AES_CBC_256:
-      cipher_xform->cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
-      break;
-    case IPSEC_CRYPTO_ALG_AES_GCM_128:
-      cipher_xform->cipher.algo = RTE_CRYPTO_CIPHER_AES_GCM;
-      break;
-    default:
-      return -1;
-  }
-
-  cipher_xform->type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-
-  return 0;
-}
-
-static_always_inline int
-translate_integ_algo(ipsec_integ_alg_t integ_alg,
-		     struct rte_crypto_sym_xform *auth_xform, int use_esn)
-{
-  switch (integ_alg) {
-    case IPSEC_INTEG_ALG_NONE:
-      auth_xform->auth.algo = RTE_CRYPTO_AUTH_NULL;
-      auth_xform->auth.digest_length = 0;
-      break;
-    case IPSEC_INTEG_ALG_SHA1_96:
-      auth_xform->auth.algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
-      auth_xform->auth.digest_length = 12;
-      break;
-    case IPSEC_INTEG_ALG_SHA_256_96:
-      auth_xform->auth.algo = RTE_CRYPTO_AUTH_SHA256_HMAC;
-      auth_xform->auth.digest_length = 12;
-      break;
-    case IPSEC_INTEG_ALG_SHA_256_128:
-      auth_xform->auth.algo = RTE_CRYPTO_AUTH_SHA256_HMAC;
-      auth_xform->auth.digest_length = 16;
-      break;
-    case IPSEC_INTEG_ALG_SHA_384_192:
-      auth_xform->auth.algo = RTE_CRYPTO_AUTH_SHA384_HMAC;
-      auth_xform->auth.digest_length = 24;
-      break;
-    case IPSEC_INTEG_ALG_SHA_512_256:
-      auth_xform->auth.algo = RTE_CRYPTO_AUTH_SHA512_HMAC;
-      auth_xform->auth.digest_length = 32;
-      break;
-    case IPSEC_INTEG_ALG_AES_GCM_128:
-      auth_xform->auth.algo = RTE_CRYPTO_AUTH_AES_GCM;
-      auth_xform->auth.digest_length = 16;
-      auth_xform->auth.add_auth_data_length = use_esn? 12 : 8;
-      break;
-    default:
-      return -1;
-  }
-
-  auth_xform->type = RTE_CRYPTO_SYM_XFORM_AUTH;
-
-  return 0;
-}
-
-static_always_inline int
-create_sym_sess(ipsec_sa_t *sa, crypto_sa_session_t *sa_sess, u8 is_outbound)
-{
-  u32 cpu_index = os_get_cpu_number();
-  dpdk_crypto_main_t * dcm = &dpdk_crypto_main;
-  crypto_worker_main_t *cwm = &dcm->workers_main[cpu_index];
-  struct rte_crypto_sym_xform cipher_xform = {0};
-  struct rte_crypto_sym_xform auth_xform = {0};
-  struct rte_crypto_sym_xform *xfs;
-  uword key = 0, *data;
-  crypto_worker_qp_key_t *p_key = (crypto_worker_qp_key_t *)&key;
-
-  if (sa->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
-    {
-      sa->crypto_key_len -= 4;
-      clib_memcpy(&sa->salt, &sa->crypto_key[sa->crypto_key_len], 4);
-    }
-  else
-    {
-      sa->salt = (u32) rand();
-    }
-
-  cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-  cipher_xform.cipher.key.data = sa->crypto_key;
-  cipher_xform.cipher.key.length = sa->crypto_key_len;
-
-  auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-  auth_xform.auth.key.data = sa->integ_key;
-  auth_xform.auth.key.length = sa->integ_key_len;
-
-  if (translate_crypto_algo(sa->crypto_alg, &cipher_xform) < 0)
-    return -1;
-  p_key->cipher_algo = cipher_xform.cipher.algo;
-
-  if (translate_integ_algo(sa->integ_alg, &auth_xform, sa->use_esn) < 0)
-    return -1;
-  p_key->auth_algo = auth_xform.auth.algo;
-
-  if (is_outbound)
-    {
-      cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
-      auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
-      cipher_xform.next = &auth_xform;
-      xfs = &cipher_xform;
-    }
-  else
-    {
-      cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_DECRYPT;
-      auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_VERIFY;
-      auth_xform.next = &cipher_xform;
-      xfs = &auth_xform;
-    }
-
-  p_key->is_outbound = is_outbound;
-
-  data = hash_get(cwm->algo_qp_map, key);
-  if (!data)
-    return -1;
-
-  sa_sess->sess =
-    rte_cryptodev_sym_session_create(cwm->qp_data[*data].dev_id, xfs);
-
-  if (!sa_sess->sess)
-    return -1;
-
-  sa_sess->qp_index = (u8)*data;
-
-  return 0;
-}
-
-#endif /* __DPDK_ESP_H__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/ipsec/esp_decrypt.c b/vnet/vnet/devices/dpdk/ipsec/esp_decrypt.c
deleted file mode 100644
index 89ab9f9b..00000000
--- a/vnet/vnet/devices/dpdk/ipsec/esp_decrypt.c
+++ /dev/null
@@ -1,583 +0,0 @@
-/*
- * esp_decrypt.c : IPSec ESP Decrypt node using DPDK Cryptodev
- *
- * Copyright (c) 2016 Intel and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-
-#include <vnet/ipsec/ipsec.h>
-#include <vnet/devices/dpdk/ipsec/ipsec.h>
-#include <vnet/devices/dpdk/ipsec/esp.h>
-
-#define foreach_esp_decrypt_next	       \
-_(DROP, "error-drop")			       \
-_(IP4_INPUT, "ip4-input")		       \
-_(IP6_INPUT, "ip6-input")
-
-#define _(v, s) ESP_DECRYPT_NEXT_##v,
-typedef enum {
-  foreach_esp_decrypt_next
-#undef _
-  ESP_DECRYPT_N_NEXT,
-} esp_decrypt_next_t;
-
-#define foreach_esp_decrypt_error		 \
- _(RX_PKTS, "ESP pkts received")		 \
- _(DECRYPTION_FAILED, "ESP decryption failed")   \
- _(REPLAY, "SA replayed packet")	         \
- _(NOT_IP, "Not IP packet (dropped)")	         \
- _(ENQ_FAIL, "Enqueue failed (buffer full)")     \
- _(NO_CRYPTODEV, "Cryptodev not configured")     \
- _(BAD_LEN, "Invalid ciphertext length")         \
- _(UNSUPPORTED, "Cipher/Auth not supported")
-
-
-typedef enum {
-#define _(sym,str) ESP_DECRYPT_ERROR_##sym,
-  foreach_esp_decrypt_error
-#undef _
-  ESP_DECRYPT_N_ERROR,
-} esp_decrypt_error_t;
-
-static char * esp_decrypt_error_strings[] = {
-#define _(sym,string) string,
-  foreach_esp_decrypt_error
-#undef _
-};
-
-vlib_node_registration_t dpdk_esp_decrypt_node;
-
-typedef struct {
-  ipsec_crypto_alg_t crypto_alg;
-  ipsec_integ_alg_t integ_alg;
-} esp_decrypt_trace_t;
-
-/* packet trace format function */
-static u8 * format_esp_decrypt_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  esp_decrypt_trace_t * t = va_arg (*args, esp_decrypt_trace_t *);
-
-  s = format (s, "esp: crypto %U integrity %U",
-	      format_ipsec_crypto_alg, t->crypto_alg,
-	      format_ipsec_integ_alg, t->integ_alg);
-  return s;
-}
-
-static uword
-dpdk_esp_decrypt_node_fn (vlib_main_t * vm,
-	     vlib_node_runtime_t * node,
-	     vlib_frame_t * from_frame)
-{
-  u32 n_left_from, *from, *to_next, next_index;
-  ipsec_main_t *im = &ipsec_main;
-  u32 cpu_index = os_get_cpu_number();
-  dpdk_crypto_main_t * dcm = &dpdk_crypto_main;
-  dpdk_esp_main_t * em = &dpdk_esp_main;
-  u32 i;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  if (PREDICT_FALSE(!dcm->workers_main))
-    {
-      vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
-	      ESP_DECRYPT_ERROR_NO_CRYPTODEV, n_left_from);
-      vlib_buffer_free(vm, from, n_left_from);
-      return n_left_from;
-    }
-
-  crypto_worker_main_t *cwm = vec_elt_at_index(dcm->workers_main, cpu_index);
-  u32 n_qps = vec_len(cwm->qp_data);
-  struct rte_crypto_op ** cops_to_enq[n_qps];
-  u32 n_cop_qp[n_qps], * bi_to_enq[n_qps];
-
-  for (i = 0; i < n_qps; i++)
-    {
-      bi_to_enq[i] = cwm->qp_data[i].bi;
-      cops_to_enq[i] = cwm->qp_data[i].cops;
-    }
-
-  memset(n_cop_qp, 0, n_qps * sizeof(u32));
-
-  crypto_alloc_cops();
-
-  next_index = ESP_DECRYPT_NEXT_DROP;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, sa_index0 = ~0, seq, icv_size, iv_size;
-	  vlib_buffer_t * b0;
-	  esp_header_t * esp0;
-	  ipsec_sa_t * sa0;
-	  struct rte_mbuf * mb0 = 0;
-	  const int BLOCK_SIZE = 16;
-	  crypto_sa_session_t * sa_sess;
-	  void * sess;
-	  u16 qp_index;
-	  struct rte_crypto_op * cop = 0;
-
-	  bi0 = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  esp0 = vlib_buffer_get_current (b0);
-
-	  sa_index0 = vnet_buffer(b0)->ipsec.sad_index;
-	  sa0 = pool_elt_at_index (im->sad, sa_index0);
-
-	  seq = clib_host_to_net_u32(esp0->seq);
-
-	  /* anti-replay check */
-	  if (sa0->use_anti_replay)
-	    {
-	      int rv = 0;
-
-	      if (PREDICT_TRUE(sa0->use_esn))
-		rv = esp_replay_check_esn(sa0, seq);
-	      else
-		rv = esp_replay_check(sa0, seq);
-
-	      if (PREDICT_FALSE(rv))
-		{
-		  clib_warning ("anti-replay SPI %u seq %u", sa0->spi, seq);
-		  vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
-					       ESP_DECRYPT_ERROR_REPLAY, 1);
-		  to_next[0] = bi0;
-		  to_next += 1;
-		  n_left_to_next -= 1;
-		  goto trace;
-		}
-	    }
-
-	  if (PREDICT_FALSE(sa0->integ_alg == IPSEC_INTEG_ALG_NONE) ||
-		  PREDICT_FALSE(sa0->crypto_alg == IPSEC_CRYPTO_ALG_NONE))
-	    {
-	      clib_warning ("SPI %u : only cipher + auth supported", sa0->spi);
-	      vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
-					   ESP_DECRYPT_ERROR_UNSUPPORTED, 1);
-	      to_next[0] = bi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-	      goto trace;
-	    }
-
-	  sa_sess = pool_elt_at_index(cwm->sa_sess_d[0], sa_index0);
-
-	  if (PREDICT_FALSE(!sa_sess->sess))
-	    {
-	      int ret = create_sym_sess(sa0, sa_sess, 0);
-	      ASSERT(ret == 0);
-	    }
-
-	  sess = sa_sess->sess;
-	  qp_index = sa_sess->qp_index;
-
-	  ASSERT (vec_len (vec_elt (cwm->qp_data, qp_index).free_cops) > 0);
-	  cop = vec_pop (vec_elt (cwm->qp_data, qp_index).free_cops);
-	  ASSERT (cop->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED);
-
-	  cops_to_enq[qp_index][0] = cop;
-	  cops_to_enq[qp_index] += 1;
-	  n_cop_qp[qp_index] += 1;
-	  bi_to_enq[qp_index][0] = bi0;
-	  bi_to_enq[qp_index] += 1;
-
-	  rte_crypto_op_attach_sym_session(cop, sess);
-
-	  icv_size = em->esp_integ_algs[sa0->integ_alg].trunc_size;
-	  iv_size = em->esp_crypto_algs[sa0->crypto_alg].iv_len;
-
-	  /* Convert vlib buffer to mbuf */
-	  mb0 = rte_mbuf_from_vlib_buffer(b0);
-	  mb0->data_len = b0->current_length;
-	  mb0->pkt_len = b0->current_length;
-	  mb0->data_off = RTE_PKTMBUF_HEADROOM + b0->current_data;
-
-	  /* Outer IP header has already been stripped */
-	  u16 payload_len = rte_pktmbuf_pkt_len(mb0) - sizeof (esp_header_t) -
-	      iv_size - icv_size;
-
-	  if ((payload_len & (BLOCK_SIZE - 1)) || (payload_len <= 0))
-	    {
-	      clib_warning ("payload %u not multiple of %d\n",
-			    payload_len, BLOCK_SIZE);
-	      vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
-					   ESP_DECRYPT_ERROR_BAD_LEN, 1);
-	      vec_add (vec_elt (cwm->qp_data, qp_index).free_cops, &cop, 1);
-	      bi_to_enq[qp_index] -= 1;
-	      cops_to_enq[qp_index] -= 1;
-	      n_cop_qp[qp_index] -= 1;
-	      to_next[0] = bi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-	      goto trace;
-	    }
-
-	  struct rte_crypto_sym_op *sym_cop = (struct rte_crypto_sym_op *)(cop + 1);
-
-	  sym_cop->m_src = mb0;
-	  sym_cop->cipher.data.offset = sizeof (esp_header_t) + iv_size;
-	  sym_cop->cipher.data.length = payload_len;
-
-          u8 *iv = rte_pktmbuf_mtod_offset(mb0, void*, sizeof (esp_header_t));
-          dpdk_cop_priv_t * priv = (dpdk_cop_priv_t *)(sym_cop + 1);
-
-          if (sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
-            {
-              dpdk_gcm_cnt_blk *icb = &priv->cb;
-              icb->salt = sa0->salt;
-              clib_memcpy(icb->iv, iv, 8);
-              icb->cnt = clib_host_to_net_u32(1);
-              sym_cop->cipher.iv.data = (u8 *)icb;
-              sym_cop->cipher.iv.phys_addr = cop->phys_addr +
-		(uintptr_t)icb - (uintptr_t)cop;
-              sym_cop->cipher.iv.length = 16;
-
-              u8 *aad = priv->aad;
-              clib_memcpy(aad, iv - sizeof(esp_header_t), 8);
-              sym_cop->auth.aad.data = aad;
-              sym_cop->auth.aad.phys_addr = cop->phys_addr +
-                  (uintptr_t)aad - (uintptr_t)cop;
-              if (sa0->use_esn)
-                {
-                  *((u32*)&aad[8]) = sa0->seq_hi;
-                  sym_cop->auth.aad.length = 12;
-                }
-              else
-                {
-                  sym_cop->auth.aad.length = 8;
-                }
-
-              sym_cop->auth.digest.data = rte_pktmbuf_mtod_offset(mb0, void*,
-                       rte_pktmbuf_pkt_len(mb0) - icv_size);
-              sym_cop->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(mb0,
-                       rte_pktmbuf_pkt_len(mb0) - icv_size);
-              sym_cop->auth.digest.length = icv_size;
-
-            }
-          else
-            {
-              sym_cop->cipher.iv.data = rte_pktmbuf_mtod_offset(mb0, void*,
-                       sizeof (esp_header_t));
-              sym_cop->cipher.iv.phys_addr = rte_pktmbuf_mtophys_offset(mb0,
-                       sizeof (esp_header_t));
-              sym_cop->cipher.iv.length = iv_size;
-
-              if (sa0->use_esn)
-                {
-                  dpdk_cop_priv_t* priv = (dpdk_cop_priv_t*) (sym_cop + 1);
-                  u8* payload_end = rte_pktmbuf_mtod_offset(
-                      mb0, u8*, sizeof(esp_header_t) + iv_size + payload_len);
-
-                  clib_memcpy (priv->icv, payload_end, icv_size);
-                  *((u32*) payload_end) = sa0->seq_hi;
-                  sym_cop->auth.data.offset = 0;
-                  sym_cop->auth.data.length = sizeof(esp_header_t) + iv_size
-                      + payload_len + sizeof(sa0->seq_hi);
-                  sym_cop->auth.digest.data = priv->icv;
-                  sym_cop->auth.digest.phys_addr = cop->phys_addr
-                      + (uintptr_t) priv->icv - (uintptr_t) cop;
-                  sym_cop->auth.digest.length = icv_size;
-                }
-              else
-                {
-                  sym_cop->auth.data.offset = 0;
-                  sym_cop->auth.data.length = sizeof(esp_header_t) +
-                           iv_size + payload_len;
-
-                  sym_cop->auth.digest.data = rte_pktmbuf_mtod_offset(mb0, void*,
-                           rte_pktmbuf_pkt_len(mb0) - icv_size);
-                  sym_cop->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(mb0,
-                           rte_pktmbuf_pkt_len(mb0) - icv_size);
-                  sym_cop->auth.digest.length = icv_size;
-                }
-            }
-
-trace:
-	  if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      esp_decrypt_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
-	      tr->crypto_alg = sa0->crypto_alg;
-	      tr->integ_alg = sa0->integ_alg;
-	    }
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
-			       ESP_DECRYPT_ERROR_RX_PKTS,
-			       from_frame->n_vectors);
-  crypto_qp_data_t *qpd;
-  /* *INDENT-OFF* */
-  vec_foreach_index (i, cwm->qp_data)
-    {
-      u32 enq;
-
-      qpd = vec_elt_at_index(cwm->qp_data, i);
-      enq = rte_cryptodev_enqueue_burst(qpd->dev_id, qpd->qp_id,
-					qpd->cops, n_cop_qp[i]);
-      qpd->inflights += enq;
-
-      if (PREDICT_FALSE(enq < n_cop_qp[i]))
-	{
-	  crypto_free_cop (qpd, &qpd->cops[enq], n_cop_qp[i] - enq);
-	  vlib_buffer_free (vm, &qpd->bi[enq], n_cop_qp[i] - enq);
-
-	  vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
-				       ESP_DECRYPT_ERROR_ENQ_FAIL,
-				       n_cop_qp[i] - enq);
-	}
-    }
-  /* *INDENT-ON* */
-
-  return from_frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (dpdk_esp_decrypt_node) = {
-  .function = dpdk_esp_decrypt_node_fn,
-  .name = "dpdk-esp-decrypt",
-  .vector_size = sizeof (u32),
-  .format_trace = format_esp_decrypt_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(esp_decrypt_error_strings),
-  .error_strings = esp_decrypt_error_strings,
-
-  .n_next_nodes = ESP_DECRYPT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [ESP_DECRYPT_NEXT_##s] = n,
-    foreach_esp_decrypt_next
-#undef _
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp_decrypt_node, dpdk_esp_decrypt_node_fn)
-
-/*
- * Decrypt Post Node
- */
-
-#define foreach_esp_decrypt_post_error	      \
- _(PKTS, "ESP post pkts")
-
-typedef enum {
-#define _(sym,str) ESP_DECRYPT_POST_ERROR_##sym,
-  foreach_esp_decrypt_post_error
-#undef _
-  ESP_DECRYPT_POST_N_ERROR,
-} esp_decrypt_post_error_t;
-
-static char * esp_decrypt_post_error_strings[] = {
-#define _(sym,string) string,
-  foreach_esp_decrypt_post_error
-#undef _
-};
-
-vlib_node_registration_t dpdk_esp_decrypt_post_node;
-
-static u8 * format_esp_decrypt_post_trace (u8 * s, va_list * args)
-{
-  return s;
-}
-
-static uword
-dpdk_esp_decrypt_post_node_fn (vlib_main_t * vm,
-	     vlib_node_runtime_t * node,
-	     vlib_frame_t * from_frame)
-{
-  u32 n_left_from, *from, *to_next = 0, next_index;
-  ipsec_sa_t * sa0;
-  u32 sa_index0 = ~0;
-  ipsec_main_t *im = &ipsec_main;
-  dpdk_esp_main_t *em = &dpdk_esp_main;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  esp_footer_t * f0;
-	  u32 bi0, next0, icv_size, iv_size;
-	  vlib_buffer_t * b0 = 0;
-	  ip4_header_t *ih4 = 0, *oh4 = 0;
-	  ip6_header_t *ih6 = 0, *oh6 = 0;
-	  u8 tunnel_mode = 1;
-	  u8 transport_ip6 = 0;
-
-	  next0 = ESP_DECRYPT_NEXT_DROP;
-
-	  bi0 = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  sa_index0 = vnet_buffer(b0)->ipsec.sad_index;
-	  sa0 = pool_elt_at_index (im->sad, sa_index0);
-
-	  to_next[0] = bi0;
-	  to_next += 1;
-
-	  icv_size = em->esp_integ_algs[sa0->integ_alg].trunc_size;
-	  iv_size = em->esp_crypto_algs[sa0->crypto_alg].iv_len;
-
-	  if (sa0->use_anti_replay)
-	    {
-	      esp_header_t * esp0 = vlib_buffer_get_current (b0);
-	      u32 seq;
-	      seq = clib_host_to_net_u32(esp0->seq);
-	      if (PREDICT_TRUE(sa0->use_esn))
-		esp_replay_advance_esn(sa0, seq);
-	      else
-		esp_replay_advance(sa0, seq);
-	    }
-
-	  ih4 = (ip4_header_t *) (b0->data + sizeof(ethernet_header_t));
-	  vlib_buffer_advance (b0, sizeof (esp_header_t) + iv_size);
-
-	  b0->current_length -= (icv_size + 2);
-	  b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
-	  f0 = (esp_footer_t *) ((u8 *) vlib_buffer_get_current (b0) +
-				 b0->current_length);
-	  b0->current_length -= f0->pad_length;
-
-	  /* transport mode */
-	  if (PREDICT_FALSE(!sa0->is_tunnel && !sa0->is_tunnel_ip6))
-	    {
-	      tunnel_mode = 0;
-
-	      if (PREDICT_TRUE((ih4->ip_version_and_header_length & 0xF0) != 0x40))
-		{
-		  if (PREDICT_TRUE((ih4->ip_version_and_header_length & 0xF0) == 0x60))
-		    transport_ip6 = 1;
-		  else
-		    {
-		      clib_warning("next header: 0x%x", f0->next_header);
-		      vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
-						   ESP_DECRYPT_ERROR_NOT_IP, 1);
-		      goto trace;
-		    }
-		}
-	    }
-
-	  if (PREDICT_TRUE (tunnel_mode))
-	    {
-	      if (PREDICT_TRUE(f0->next_header == IP_PROTOCOL_IP_IN_IP))
-		next0 = ESP_DECRYPT_NEXT_IP4_INPUT;
-	      else if (f0->next_header == IP_PROTOCOL_IPV6)
-		next0 = ESP_DECRYPT_NEXT_IP6_INPUT;
-	      else
-		{
-		  clib_warning("next header: 0x%x", f0->next_header);
-		  vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
-					       ESP_DECRYPT_ERROR_DECRYPTION_FAILED,
-					       1);
-		  goto trace;
-		}
-	    }
-	  /* transport mode */
-	  else
-	    {
-	      if (PREDICT_FALSE(transport_ip6))
-		{
-		  ih6 = (ip6_header_t *) (b0->data + sizeof(ethernet_header_t));
-		  vlib_buffer_advance (b0, -sizeof(ip6_header_t));
-		  oh6 = vlib_buffer_get_current (b0);
-		  memmove(oh6, ih6, sizeof(ip6_header_t));
-
-		  next0 = ESP_DECRYPT_NEXT_IP6_INPUT;
-		  oh6->protocol = f0->next_header;
-		  oh6->payload_length =
-		      clib_host_to_net_u16 (
-			  vlib_buffer_length_in_chain(vm, b0) -
-			  sizeof (ip6_header_t));
-		}
-	      else
-		{
-		  vlib_buffer_advance (b0, -sizeof(ip4_header_t));
-		  oh4 = vlib_buffer_get_current (b0);
-		  memmove(oh4, ih4, sizeof(ip4_header_t));
-
-		  next0 = ESP_DECRYPT_NEXT_IP4_INPUT;
-		  oh4->ip_version_and_header_length = 0x45;
-		  oh4->fragment_id = 0;
-		  oh4->flags_and_fragment_offset = 0;
-		  oh4->protocol = f0->next_header;
-		  oh4->length = clib_host_to_net_u16 (
-		      vlib_buffer_length_in_chain (vm, b0));
-		  oh4->checksum = ip4_header_checksum (oh4);
-		}
-	    }
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32)~0;
-
-trace:
-	  if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      esp_decrypt_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
-	      tr->crypto_alg = sa0->crypto_alg;
-	      tr->integ_alg = sa0->integ_alg;
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next, bi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, dpdk_esp_decrypt_post_node.index,
-			       ESP_DECRYPT_POST_ERROR_PKTS,
-			       from_frame->n_vectors);
-
-  return from_frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (dpdk_esp_decrypt_post_node) = {
-  .function = dpdk_esp_decrypt_post_node_fn,
-  .name = "dpdk-esp-decrypt-post",
-  .vector_size = sizeof (u32),
-  .format_trace = format_esp_decrypt_post_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(esp_decrypt_post_error_strings),
-  .error_strings = esp_decrypt_post_error_strings,
-
-  .n_next_nodes = ESP_DECRYPT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [ESP_DECRYPT_NEXT_##s] = n,
-    foreach_esp_decrypt_next
-#undef _
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp_decrypt_post_node, dpdk_esp_decrypt_post_node_fn)
diff --git a/vnet/vnet/devices/dpdk/ipsec/esp_encrypt.c b/vnet/vnet/devices/dpdk/ipsec/esp_encrypt.c
deleted file mode 100644
index 10bb4616..00000000
--- a/vnet/vnet/devices/dpdk/ipsec/esp_encrypt.c
+++ /dev/null
@@ -1,598 +0,0 @@
-/*
- * esp_encrypt.c : IPSec ESP encrypt node using DPDK Cryptodev
- *
- * Copyright (c) 2016 Intel and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-
-#include <vnet/ipsec/ipsec.h>
-#include <vnet/devices/dpdk/ipsec/ipsec.h>
-#include <vnet/devices/dpdk/ipsec/esp.h>
-
-#define foreach_esp_encrypt_next                   \
-_(DROP, "error-drop")                              \
-_(IP4_LOOKUP, "ip4-lookup")                        \
-_(IP6_LOOKUP, "ip6-lookup")                        \
-_(INTERFACE_OUTPUT, "interface-output")
-
-#define _(v, s) ESP_ENCRYPT_NEXT_##v,
-typedef enum
-{
-  foreach_esp_encrypt_next
-#undef _
-    ESP_ENCRYPT_N_NEXT,
-} esp_encrypt_next_t;
-
-#define foreach_esp_encrypt_error                   \
- _(RX_PKTS, "ESP pkts received")                    \
- _(SEQ_CYCLED, "sequence number cycled")            \
- _(ENQ_FAIL, "Enqueue failed (buffer full)")        \
- _(NO_CRYPTODEV, "Cryptodev not configured")        \
- _(UNSUPPORTED, "Cipher/Auth not supported")
-
-
-typedef enum
-{
-#define _(sym,str) ESP_ENCRYPT_ERROR_##sym,
-  foreach_esp_encrypt_error
-#undef _
-    ESP_ENCRYPT_N_ERROR,
-} esp_encrypt_error_t;
-
-static char *esp_encrypt_error_strings[] = {
-#define _(sym,string) string,
-  foreach_esp_encrypt_error
-#undef _
-};
-
-vlib_node_registration_t dpdk_esp_encrypt_node;
-
-typedef struct
-{
-  u32 spi;
-  u32 seq;
-  ipsec_crypto_alg_t crypto_alg;
-  ipsec_integ_alg_t integ_alg;
-} esp_encrypt_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_esp_encrypt_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  esp_encrypt_trace_t *t = va_arg (*args, esp_encrypt_trace_t *);
-
-  s = format (s, "esp: spi %u seq %u crypto %U integrity %U",
-	      t->spi, t->seq,
-	      format_ipsec_crypto_alg, t->crypto_alg,
-	      format_ipsec_integ_alg, t->integ_alg);
-  return s;
-}
-
-static uword
-dpdk_esp_encrypt_node_fn (vlib_main_t * vm,
-			  vlib_node_runtime_t * node,
-			  vlib_frame_t * from_frame)
-{
-  u32 n_left_from, *from, *to_next, next_index;
-  ipsec_main_t *im = &ipsec_main;
-  u32 cpu_index = os_get_cpu_number ();
-  dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
-  dpdk_esp_main_t *em = &dpdk_esp_main;
-  u32 i;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  if (PREDICT_FALSE (!dcm->workers_main))
-    {
-      /* Likely there are not enough cryptodevs, so drop frame */
-      vlib_node_increment_counter (vm, dpdk_esp_encrypt_node.index,
-				   ESP_ENCRYPT_ERROR_NO_CRYPTODEV,
-				   n_left_from);
-      vlib_buffer_free (vm, from, n_left_from);
-      return n_left_from;
-    }
-
-  crypto_worker_main_t *cwm = vec_elt_at_index (dcm->workers_main, cpu_index);
-  u32 n_qps = vec_len (cwm->qp_data);
-  struct rte_crypto_op **cops_to_enq[n_qps];
-  u32 n_cop_qp[n_qps], *bi_to_enq[n_qps];
-
-  for (i = 0; i < n_qps; i++)
-    {
-      bi_to_enq[i] = cwm->qp_data[i].bi;
-      cops_to_enq[i] = cwm->qp_data[i].cops;
-    }
-
-  memset (n_cop_qp, 0, n_qps * sizeof (u32));
-
-  crypto_alloc_cops ();
-
-  next_index = ESP_ENCRYPT_NEXT_DROP;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, next0;
-	  vlib_buffer_t *b0 = 0;
-	  u32 sa_index0;
-	  ipsec_sa_t *sa0;
-	  ip4_and_esp_header_t *ih0, *oh0 = 0;
-	  ip6_and_esp_header_t *ih6_0, *oh6_0 = 0;
-	  struct rte_mbuf *mb0 = 0;
-	  esp_footer_t *f0;
-	  u8 is_ipv6;
-	  u8 ip_hdr_size;
-	  u8 next_hdr_type;
-	  u8 transport_mode = 0;
-	  const int BLOCK_SIZE = 16;
-	  u32 iv_size;
-	  u16 orig_sz;
-	  crypto_sa_session_t *sa_sess;
-	  void *sess;
-	  struct rte_crypto_op *cop = 0;
-	  u16 qp_index;
-
-	  bi0 = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  sa_index0 = vnet_buffer (b0)->ipsec.sad_index;
-	  sa0 = pool_elt_at_index (im->sad, sa_index0);
-
-	  if (PREDICT_FALSE (esp_seq_advance (sa0)))
-	    {
-	      clib_warning ("sequence number counter has cycled SPI %u",
-			    sa0->spi);
-	      vlib_node_increment_counter (vm, dpdk_esp_encrypt_node.index,
-					   ESP_ENCRYPT_ERROR_SEQ_CYCLED, 1);
-	      //TODO: rekey SA
-	      to_next[0] = bi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-	      goto trace;
-	    }
-
-	  sa_sess = pool_elt_at_index (cwm->sa_sess_d[1], sa_index0);
-	  if (PREDICT_FALSE (!sa_sess->sess))
-	    {
-	      int ret = create_sym_sess (sa0, sa_sess, 1);
-	      ASSERT (ret == 0);
-	    }
-
-	  qp_index = sa_sess->qp_index;
-	  sess = sa_sess->sess;
-
-	  ASSERT (vec_len (vec_elt (cwm->qp_data, qp_index).free_cops) > 0);
-	  cop = vec_pop (vec_elt (cwm->qp_data, qp_index).free_cops);
-	  ASSERT (cop->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED);
-
-	  cops_to_enq[qp_index][0] = cop;
-	  cops_to_enq[qp_index] += 1;
-	  n_cop_qp[qp_index] += 1;
-	  bi_to_enq[qp_index][0] = bi0;
-	  bi_to_enq[qp_index] += 1;
-
-	  ssize_t adv;
-	  iv_size = em->esp_crypto_algs[sa0->crypto_alg].iv_len;
-	  ih0 = vlib_buffer_get_current (b0);
-	  orig_sz = b0->current_length;
-	  is_ipv6 = (ih0->ip4.ip_version_and_header_length & 0xF0) == 0x60;
-	  /* is ipv6 */
-	  if (PREDICT_TRUE (sa0->is_tunnel))
-	    {
-	      if (PREDICT_TRUE (!is_ipv6))
-		adv = -sizeof (ip4_and_esp_header_t);
-	      else
-		adv = -sizeof (ip6_and_esp_header_t);
-	    }
-	  else
-	    {
-	      adv = -sizeof (esp_header_t);
-	      if (PREDICT_TRUE (!is_ipv6))
-		orig_sz -= sizeof (ip4_header_t);
-	      else
-		orig_sz -= sizeof (ip6_header_t);
-	    }
-
-	  /*transport mode save the eth header before it is overwritten */
-	  if (PREDICT_FALSE (!sa0->is_tunnel))
-	    {
-	      ethernet_header_t *ieh0 = (ethernet_header_t *)
-		((u8 *) vlib_buffer_get_current (b0) -
-		 sizeof (ethernet_header_t));
-	      ethernet_header_t *oeh0 =
-		(ethernet_header_t *) ((u8 *) ieh0 + (adv - iv_size));
-	      clib_memcpy (oeh0, ieh0, sizeof (ethernet_header_t));
-	    }
-
-	  vlib_buffer_advance (b0, adv - iv_size);
-
-	  /* XXX IP6/ip4 and IP4/IP6 not supported, only IP4/IP4 and IP6/IP6 */
-
-	  /* is ipv6 */
-	  if (PREDICT_FALSE (is_ipv6))
-	    {
-	      ih6_0 = (ip6_and_esp_header_t *) ih0;
-	      ip_hdr_size = sizeof (ip6_header_t);
-	      oh6_0 = vlib_buffer_get_current (b0);
-
-	      if (PREDICT_TRUE (sa0->is_tunnel))
-		{
-		  next_hdr_type = IP_PROTOCOL_IPV6;
-		  oh6_0->ip6.ip_version_traffic_class_and_flow_label =
-		    ih6_0->ip6.ip_version_traffic_class_and_flow_label;
-		}
-	      else
-		{
-		  next_hdr_type = ih6_0->ip6.protocol;
-		  memmove (oh6_0, ih6_0, sizeof (ip6_header_t));
-		}
-
-	      oh6_0->ip6.protocol = IP_PROTOCOL_IPSEC_ESP;
-	      oh6_0->ip6.hop_limit = 254;
-	      oh6_0->esp.spi = clib_net_to_host_u32 (sa0->spi);
-	      oh6_0->esp.seq = clib_net_to_host_u32 (sa0->seq);
-	    }
-	  else
-	    {
-	      ip_hdr_size = sizeof (ip4_header_t);
-	      oh0 = vlib_buffer_get_current (b0);
-
-	      if (PREDICT_TRUE (sa0->is_tunnel))
-		{
-		  next_hdr_type = IP_PROTOCOL_IP_IN_IP;
-		  oh0->ip4.tos = ih0->ip4.tos;
-		}
-	      else
-		{
-		  next_hdr_type = ih0->ip4.protocol;
-		  memmove (oh0, ih0, sizeof (ip4_header_t));
-		}
-
-	      oh0->ip4.ip_version_and_header_length = 0x45;
-	      oh0->ip4.fragment_id = 0;
-	      oh0->ip4.flags_and_fragment_offset = 0;
-	      oh0->ip4.ttl = 254;
-	      oh0->ip4.protocol = IP_PROTOCOL_IPSEC_ESP;
-	      oh0->esp.spi = clib_net_to_host_u32 (sa0->spi);
-	      oh0->esp.seq = clib_net_to_host_u32 (sa0->seq);
-	    }
-
-	  if (PREDICT_TRUE (sa0->is_tunnel && !sa0->is_tunnel_ip6))
-	    {
-	      oh0->ip4.src_address.as_u32 = sa0->tunnel_src_addr.ip4.as_u32;
-	      oh0->ip4.dst_address.as_u32 = sa0->tunnel_dst_addr.ip4.as_u32;
-
-	      /* in tunnel mode send it back to FIB */
-	      next0 = ESP_ENCRYPT_NEXT_IP4_LOOKUP;
-	      vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-	    }
-	  else if (sa0->is_tunnel && sa0->is_tunnel_ip6)
-	    {
-	      oh6_0->ip6.src_address.as_u64[0] =
-		sa0->tunnel_src_addr.ip6.as_u64[0];
-	      oh6_0->ip6.src_address.as_u64[1] =
-		sa0->tunnel_src_addr.ip6.as_u64[1];
-	      oh6_0->ip6.dst_address.as_u64[0] =
-		sa0->tunnel_dst_addr.ip6.as_u64[0];
-	      oh6_0->ip6.dst_address.as_u64[1] =
-		sa0->tunnel_dst_addr.ip6.as_u64[1];
-
-	      /* in tunnel mode send it back to FIB */
-	      next0 = ESP_ENCRYPT_NEXT_IP6_LOOKUP;
-	      vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-	    }
-	  else
-	    {
-	      next0 = ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT;
-	      transport_mode = 1;
-	    }
-
-	  ASSERT (sa0->crypto_alg < IPSEC_CRYPTO_N_ALG);
-	  ASSERT (sa0->crypto_alg != IPSEC_CRYPTO_ALG_NONE);
-
-	  int blocks = 1 + (orig_sz + 1) / BLOCK_SIZE;
-
-	  /* pad packet in input buffer */
-	  u8 pad_bytes = BLOCK_SIZE * blocks - 2 - orig_sz;
-	  u8 i;
-	  u8 *padding = vlib_buffer_get_current (b0) + b0->current_length;
-
-	  for (i = 0; i < pad_bytes; ++i)
-	    padding[i] = i + 1;
-
-	  f0 = vlib_buffer_get_current (b0) + b0->current_length + pad_bytes;
-	  f0->pad_length = pad_bytes;
-	  f0->next_header = next_hdr_type;
-	  b0->current_length += pad_bytes + 2 +
-	    em->esp_integ_algs[sa0->integ_alg].trunc_size;
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
-	    vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  b0->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
-
-	  struct rte_crypto_sym_op *sym_cop;
-	  sym_cop = (struct rte_crypto_sym_op *) (cop + 1);
-
-	  dpdk_cop_priv_t *priv = (dpdk_cop_priv_t *) (sym_cop + 1);
-
-	  vnet_buffer (b0)->unused[0] = next0;
-
-	  mb0 = rte_mbuf_from_vlib_buffer (b0);
-	  mb0->data_len = b0->current_length;
-	  mb0->pkt_len = b0->current_length;
-	  mb0->data_off = RTE_PKTMBUF_HEADROOM + b0->current_data;
-
-	  rte_crypto_op_attach_sym_session (cop, sess);
-
-	  sym_cop->m_src = mb0;
-
-	  dpdk_gcm_cnt_blk *icb = &priv->cb;
-	  icb->salt = sa0->salt;
-	  icb->iv[0] = sa0->seq;
-	  icb->iv[1] = sa0->seq_hi;
-
-	  if (sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
-	    {
-	      icb->cnt = clib_host_to_net_u32 (1);
-	      clib_memcpy (vlib_buffer_get_current (b0) + ip_hdr_size +
-			   sizeof (esp_header_t), icb->iv, 8);
-	      sym_cop->cipher.data.offset =
-		ip_hdr_size + sizeof (esp_header_t) + iv_size;
-	      sym_cop->cipher.data.length = BLOCK_SIZE * blocks;
-	      sym_cop->cipher.iv.length = 16;
-	    }
-	  else
-	    {
-	      sym_cop->cipher.data.offset =
-		ip_hdr_size + sizeof (esp_header_t);
-	      sym_cop->cipher.data.length = BLOCK_SIZE * blocks + iv_size;
-	      sym_cop->cipher.iv.length = iv_size;
-	    }
-
-	  sym_cop->cipher.iv.data = (u8 *) icb;
-	  sym_cop->cipher.iv.phys_addr = cop->phys_addr + (uintptr_t) icb
-	    - (uintptr_t) cop;
-
-
-	  ASSERT (sa0->integ_alg < IPSEC_INTEG_N_ALG);
-	  ASSERT (sa0->integ_alg != IPSEC_INTEG_ALG_NONE);
-
-	  if (PREDICT_FALSE (sa0->integ_alg == IPSEC_INTEG_ALG_AES_GCM_128))
-	    {
-	      u8 *aad = priv->aad;
-	      clib_memcpy (aad, vlib_buffer_get_current (b0) + ip_hdr_size,
-			   8);
-	      sym_cop->auth.aad.data = aad;
-	      sym_cop->auth.aad.phys_addr = cop->phys_addr +
-		(uintptr_t) aad - (uintptr_t) cop;
-
-	      if (PREDICT_FALSE (sa0->use_esn))
-		{
-		  *((u32 *) & aad[8]) = sa0->seq_hi;
-		  sym_cop->auth.aad.length = 12;
-		}
-	      else
-		{
-		  sym_cop->auth.aad.length = 8;
-		}
-	    }
-	  else
-	    {
-	      sym_cop->auth.data.offset = ip_hdr_size;
-	      sym_cop->auth.data.length = b0->current_length - ip_hdr_size
-		- em->esp_integ_algs[sa0->integ_alg].trunc_size;
-
-	      if (PREDICT_FALSE (sa0->use_esn))
-		{
-		  u8 *payload_end =
-		    vlib_buffer_get_current (b0) + b0->current_length;
-		  *((u32 *) payload_end) = sa0->seq_hi;
-		  sym_cop->auth.data.length += sizeof (sa0->seq_hi);
-		}
-	    }
-	  sym_cop->auth.digest.data = vlib_buffer_get_current (b0) +
-	    b0->current_length -
-	    em->esp_integ_algs[sa0->integ_alg].trunc_size;
-	  sym_cop->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset (mb0,
-								       b0->current_length
-								       -
-								       em->esp_integ_algs
-								       [sa0->integ_alg].trunc_size);
-	  sym_cop->auth.digest.length =
-	    em->esp_integ_algs[sa0->integ_alg].trunc_size;
-
-
-	  if (PREDICT_FALSE (is_ipv6))
-	    {
-	      oh6_0->ip6.payload_length =
-		clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0) -
-				      sizeof (ip6_header_t));
-	    }
-	  else
-	    {
-	      oh0->ip4.length =
-		clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
-	      oh0->ip4.checksum = ip4_header_checksum (&oh0->ip4);
-	    }
-
-	  if (transport_mode)
-	    vlib_buffer_advance (b0, -sizeof (ethernet_header_t));
-
-	trace:
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      esp_encrypt_trace_t *tr =
-		vlib_add_trace (vm, node, b0, sizeof (*tr));
-	      tr->spi = sa0->spi;
-	      tr->seq = sa0->seq - 1;
-	      tr->crypto_alg = sa0->crypto_alg;
-	      tr->integ_alg = sa0->integ_alg;
-	    }
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, dpdk_esp_encrypt_node.index,
-			       ESP_ENCRYPT_ERROR_RX_PKTS,
-			       from_frame->n_vectors);
-  crypto_qp_data_t *qpd;
-  /* *INDENT-OFF* */
-  vec_foreach_index (i, cwm->qp_data)
-    {
-      u32 enq;
-
-      qpd = vec_elt_at_index(cwm->qp_data, i);
-      enq = rte_cryptodev_enqueue_burst(qpd->dev_id, qpd->qp_id,
-					qpd->cops, n_cop_qp[i]);
-      qpd->inflights += enq;
-
-      if (PREDICT_FALSE(enq < n_cop_qp[i]))
-	{
-	  crypto_free_cop (qpd, &qpd->cops[enq], n_cop_qp[i] - enq);
-	  vlib_buffer_free (vm, &qpd->bi[enq], n_cop_qp[i] - enq);
-
-          vlib_node_increment_counter (vm, dpdk_esp_encrypt_node.index,
-				       ESP_ENCRYPT_ERROR_ENQ_FAIL,
-				       n_cop_qp[i] - enq);
-        }
-    }
-  /* *INDENT-ON* */
-
-  return from_frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (dpdk_esp_encrypt_node) =
-{
-  .function = dpdk_esp_encrypt_node_fn,.name = "dpdk-esp-encrypt",.flags =
-    VLIB_NODE_FLAG_IS_OUTPUT,.vector_size = sizeof (u32),.format_trace =
-    format_esp_encrypt_trace,.n_errors =
-    ARRAY_LEN (esp_encrypt_error_strings),.error_strings =
-    esp_encrypt_error_strings,.n_next_nodes = 1,.next_nodes =
-  {
-  [ESP_ENCRYPT_NEXT_DROP] = "error-drop",}
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp_encrypt_node, dpdk_esp_encrypt_node_fn)
-/*
- * ESP Encrypt Post Node
- */
-#define foreach_esp_encrypt_post_error              \
- _(PKTS, "ESP post pkts")
-     typedef enum
-     {
-#define _(sym,str) ESP_ENCRYPT_POST_ERROR_##sym,
-       foreach_esp_encrypt_post_error
-#undef _
-	 ESP_ENCRYPT_POST_N_ERROR,
-     } esp_encrypt_post_error_t;
-
-     static char *esp_encrypt_post_error_strings[] = {
-#define _(sym,string) string,
-       foreach_esp_encrypt_post_error
-#undef _
-     };
-
-vlib_node_registration_t dpdk_esp_encrypt_post_node;
-
-static u8 *
-format_esp_encrypt_post_trace (u8 * s, va_list * args)
-{
-  return s;
-}
-
-static uword
-dpdk_esp_encrypt_post_node_fn (vlib_main_t * vm,
-			       vlib_node_runtime_t * node,
-			       vlib_frame_t * from_frame)
-{
-  u32 n_left_from, *from, *to_next = 0, next_index;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, next0;
-	  vlib_buffer_t *b0 = 0;
-
-	  bi0 = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  to_next[0] = bi0;
-	  to_next += 1;
-
-	  next0 = vnet_buffer (b0)->unused[0];
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next, bi0,
-					   next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, dpdk_esp_encrypt_post_node.index,
-			       ESP_ENCRYPT_POST_ERROR_PKTS,
-			       from_frame->n_vectors);
-
-  return from_frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (dpdk_esp_encrypt_post_node) =
-{
-  .function = dpdk_esp_encrypt_post_node_fn,.name =
-    "dpdk-esp-encrypt-post",.vector_size = sizeof (u32),.format_trace =
-    format_esp_encrypt_post_trace,.type = VLIB_NODE_TYPE_INTERNAL,.n_errors =
-    ARRAY_LEN (esp_encrypt_post_error_strings),.error_strings =
-    esp_encrypt_post_error_strings,.n_next_nodes =
-    ESP_ENCRYPT_N_NEXT,.next_nodes =
-  {
-#define _(s,n) [ESP_ENCRYPT_NEXT_##s] = n,
-    foreach_esp_encrypt_next
-#undef _
-  }
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp_encrypt_post_node,
-			      dpdk_esp_encrypt_post_node_fn)
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/ipsec/ipsec.c b/vnet/vnet/devices/dpdk/ipsec/ipsec.c
deleted file mode 100644
index de253f02..00000000
--- a/vnet/vnet/devices/dpdk/ipsec/ipsec.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright (c) 2016 Intel and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/api_errno.h>
-#include <vnet/devices/dpdk/dpdk.h>
-#include <vnet/devices/dpdk/ipsec/ipsec.h>
-#include <vnet/devices/dpdk/ipsec/esp.h>
-#include <vnet/ipsec/ipsec.h>
-
-#define DPDK_CRYPTO_NB_OBJS	  2048
-#define DPDK_CRYPTO_CACHE_SIZE	  512
-#define DPDK_CRYPTO_PRIV_SIZE	  128
-#define DPDK_CRYPTO_N_QUEUE_DESC  512
-#define DPDK_CRYPTO_NB_COPS	  (1024 * 4)
-
-/*
- * return:
- * -1: 	update failed
- * 0:	already exist
- * 1:	mapped
- */
-static int
-update_qp_data (crypto_worker_main_t * cwm,
-		u8 cdev_id, u16 qp_id, u8 is_outbound, u16 * idx)
-{
-  crypto_qp_data_t *qpd;
-
-  /* *INDENT-OFF* */
-  vec_foreach_index (*idx, cwm->qp_data)
-    {
-      qpd = vec_elt_at_index(cwm->qp_data, *idx);
-
-      if (qpd->dev_id == cdev_id && qpd->qp_id == qp_id &&
-	  qpd->is_outbound == is_outbound)
-	  return 0;
-    }
-  /* *INDENT-ON* */
-
-  vec_add2 (cwm->qp_data, qpd, 1);
-
-  qpd->dev_id = cdev_id;
-  qpd->qp_id = qp_id;
-  qpd->is_outbound = is_outbound;
-
-  return 1;
-}
-
-/*
- * return:
- * 	-1: error
- * 	0: already exist
- * 	1: mapped
- */
-static int
-add_mapping (crypto_worker_main_t * cwm,
-	     u8 cdev_id, u16 qp, u8 is_outbound,
-	     const struct rte_cryptodev_capabilities *cipher_cap,
-	     const struct rte_cryptodev_capabilities *auth_cap)
-{
-  int mapped;
-  u16 qp_index;
-  uword key = 0, data, *ret;
-  crypto_worker_qp_key_t *p_key = (crypto_worker_qp_key_t *) & key;
-
-  p_key->cipher_algo = (u8) cipher_cap->sym.cipher.algo;
-  p_key->auth_algo = (u8) auth_cap->sym.auth.algo;
-  p_key->is_outbound = is_outbound;
-
-  ret = hash_get (cwm->algo_qp_map, key);
-  if (ret)
-    return 0;
-
-  mapped = update_qp_data (cwm, cdev_id, qp, is_outbound, &qp_index);
-  if (mapped < 0)
-    return -1;
-
-  data = (uword) qp_index;
-
-  ret = hash_set (cwm->algo_qp_map, key, data);
-  if (!ret)
-    rte_panic ("Failed to insert hash table\n");
-
-  return mapped;
-}
-
-/*
- * return:
- * 	0: already exist
- * 	1: mapped
- */
-static int
-add_cdev_mapping (crypto_worker_main_t * cwm,
-		  struct rte_cryptodev_info *dev_info, u8 cdev_id,
-		  u16 qp, u8 is_outbound)
-{
-  const struct rte_cryptodev_capabilities *i, *j;
-  u32 mapped = 0;
-
-  for (i = dev_info->capabilities; i->op != RTE_CRYPTO_OP_TYPE_UNDEFINED; i++)
-    {
-      if (i->sym.xform_type != RTE_CRYPTO_SYM_XFORM_CIPHER)
-	continue;
-
-      if (check_algo_is_supported (i, NULL) != 0)
-	continue;
-
-      for (j = dev_info->capabilities; j->op != RTE_CRYPTO_OP_TYPE_UNDEFINED;
-	   j++)
-	{
-	  int status = 0;
-
-	  if (j->sym.xform_type != RTE_CRYPTO_SYM_XFORM_AUTH)
-	    continue;
-
-	  if (check_algo_is_supported (j, NULL) != 0)
-	    continue;
-
-	  status = add_mapping (cwm, cdev_id, qp, is_outbound, i, j);
-	  if (status == 1)
-	    mapped += 1;
-	  if (status < 0)
-	    return status;
-	}
-    }
-
-  return mapped;
-}
-
-static int
-check_cryptodev_queues ()
-{
-  u32 n_qs = 0;
-  u8 cdev_id;
-  u32 n_req_qs = 2;
-
-  if (vlib_num_workers () > 0)
-    n_req_qs = vlib_num_workers () * 2;
-
-  for (cdev_id = 0; cdev_id < rte_cryptodev_count (); cdev_id++)
-    {
-      struct rte_cryptodev_info cdev_info;
-
-      rte_cryptodev_info_get (cdev_id, &cdev_info);
-
-      if (!
-	  (cdev_info.feature_flags & RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING))
-	continue;
-
-      n_qs += cdev_info.max_nb_queue_pairs;
-    }
-
-  if (n_qs >= n_req_qs)
-    return 0;
-  else
-    return -1;
-}
-
-static clib_error_t *
-dpdk_ipsec_init (vlib_main_t * vm)
-{
-  dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  struct rte_cryptodev_config dev_conf;
-  struct rte_cryptodev_qp_conf qp_conf;
-  struct rte_cryptodev_info cdev_info;
-  struct rte_mempool *rmp;
-  i32 dev_id, ret;
-  u32 i, skip_master;
-
-  if (check_cryptodev_queues () < 0)
-    return clib_error_return (0, "not enough cryptodevs for ipsec");
-
-  vec_alloc (dcm->workers_main, tm->n_vlib_mains);
-  _vec_len (dcm->workers_main) = tm->n_vlib_mains;
-
-  fprintf (stdout, "DPDK Cryptodevs info:\n");
-  fprintf (stdout, "dev_id\tn_qp\tnb_obj\tcache_size\n");
-  /* HW cryptodevs have higher dev_id, use HW first */
-  for (dev_id = rte_cryptodev_count () - 1; dev_id >= 0; dev_id--)
-    {
-      u16 max_nb_qp, qp = 0;
-      skip_master = vlib_num_workers () > 0;
-
-      rte_cryptodev_info_get (dev_id, &cdev_info);
-
-      if (!
-	  (cdev_info.feature_flags & RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING))
-	continue;
-
-      max_nb_qp = cdev_info.max_nb_queue_pairs;
-
-      for (i = 0; i < tm->n_vlib_mains; i++)
-	{
-	  u8 is_outbound;
-	  crypto_worker_main_t *cwm;
-	  uword *map;
-
-	  if (skip_master)
-	    {
-	      skip_master = 0;
-	      continue;
-	    }
-
-	  cwm = vec_elt_at_index (dcm->workers_main, i);
-	  map = cwm->algo_qp_map;
-
-	  if (!map)
-	    {
-	      map = hash_create (0, sizeof (crypto_worker_qp_key_t));
-	      if (!map)
-		return clib_error_return (0, "unable to create hash table "
-					  "for worker %u",
-					  vlib_mains[i]->cpu_index);
-	      cwm->algo_qp_map = map;
-	    }
-
-	  for (is_outbound = 0; is_outbound < 2 && qp < max_nb_qp;
-	       is_outbound++)
-	    {
-	      int mapped = add_cdev_mapping (cwm, &cdev_info,
-					     dev_id, qp, is_outbound);
-	      if (mapped > 0)
-		qp++;
-
-	      if (mapped < 0)
-		return clib_error_return (0,
-					  "too many queues for one worker");
-	    }
-	}
-
-      if (qp == 0)
-	continue;
-
-      dev_conf.socket_id = rte_cryptodev_socket_id (dev_id);
-      dev_conf.nb_queue_pairs = cdev_info.max_nb_queue_pairs;
-      dev_conf.session_mp.nb_objs = DPDK_CRYPTO_NB_OBJS;
-      dev_conf.session_mp.cache_size = DPDK_CRYPTO_CACHE_SIZE;
-
-      ret = rte_cryptodev_configure (dev_id, &dev_conf);
-      if (ret < 0)
-	return clib_error_return (0, "cryptodev %u config error", dev_id);
-
-      qp_conf.nb_descriptors = DPDK_CRYPTO_N_QUEUE_DESC;
-      for (qp = 0; qp < dev_conf.nb_queue_pairs; qp++)
-	{
-	  ret = rte_cryptodev_queue_pair_setup (dev_id, qp, &qp_conf,
-						dev_conf.socket_id);
-	  if (ret < 0)
-	    return clib_error_return (0, "cryptodev %u qp %u setup error",
-				      dev_id, qp);
-	}
-      fprintf (stdout, "%u\t%u\t%u\t%u\n", dev_id, dev_conf.nb_queue_pairs,
-	       DPDK_CRYPTO_NB_OBJS, DPDK_CRYPTO_CACHE_SIZE);
-    }
-
-  u32 socket_id = rte_socket_id ();
-
-  vec_validate_aligned (dcm->cop_pools, socket_id, CLIB_CACHE_LINE_BYTES);
-
-  /* pool already exists, nothing to do */
-  if (dcm->cop_pools[socket_id])
-    return 0;
-
-  u8 *pool_name = format (0, "crypto_op_pool_socket%u%c", socket_id, 0);
-
-  rmp = rte_crypto_op_pool_create ((char *) pool_name,
-				   RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-				   DPDK_CRYPTO_NB_COPS *
-				   (1 + vlib_num_workers ()),
-				   DPDK_CRYPTO_CACHE_SIZE,
-				   DPDK_CRYPTO_PRIV_SIZE, socket_id);
-  vec_free (pool_name);
-
-  if (!rmp)
-    return clib_error_return (0, "failed to allocate mempool on socket %u",
-			      socket_id);
-  dcm->cop_pools[socket_id] = rmp;
-
-  dpdk_esp_init ();
-
-  if (vec_len (vlib_mains) == 0)
-    vlib_node_set_state (&vlib_global_main, dpdk_crypto_input_node.index,
-			 VLIB_NODE_STATE_POLLING);
-  else
-    for (i = 1; i < tm->n_vlib_mains; i++)
-      vlib_node_set_state (vlib_mains[i], dpdk_crypto_input_node.index,
-			   VLIB_NODE_STATE_POLLING);
-
-  return 0;
-}
-
-VLIB_MAIN_LOOP_ENTER_FUNCTION (dpdk_ipsec_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/ipsec/ipsec.h b/vnet/vnet/devices/dpdk/ipsec/ipsec.h
deleted file mode 100644
index e6c7498c..00000000
--- a/vnet/vnet/devices/dpdk/ipsec/ipsec.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (c) 2016 Intel and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __DPDK_IPSEC_H__
-#define __DPDK_IPSEC_H__
-
-#include <vnet/vnet.h>
-
-#undef always_inline
-#include <rte_crypto.h>
-#include <rte_cryptodev.h>
-
-#if CLIB_DEBUG > 0
-#define always_inline static inline
-#else
-#define always_inline static inline __attribute__ ((__always_inline__))
-#endif
-
-
-#define MAX_QP_PER_LCORE 16
-
-typedef struct
-{
-  u32 salt;
-  u32 iv[2];
-  u32 cnt;
-} dpdk_gcm_cnt_blk;
-
-typedef struct
-{
-  dpdk_gcm_cnt_blk cb;
-  union
-  {
-    u8 aad[12];
-    u8 icv[64];
-  };
-} dpdk_cop_priv_t;
-
-typedef struct
-{
-  u8 cipher_algo;
-  u8 auth_algo;
-  u8 is_outbound;
-} crypto_worker_qp_key_t;
-
-typedef struct
-{
-  u16 dev_id;
-  u16 qp_id;
-  u16 is_outbound;
-  i16 inflights;
-  u32 bi[VLIB_FRAME_SIZE];
-  struct rte_crypto_op *cops[VLIB_FRAME_SIZE];
-  struct rte_crypto_op **free_cops;
-} crypto_qp_data_t;
-
-typedef struct
-{
-  u8 qp_index;
-  void *sess;
-} crypto_sa_session_t;
-
-typedef struct
-{
-  crypto_sa_session_t *sa_sess_d[2];
-  crypto_qp_data_t *qp_data;
-  uword *algo_qp_map;
-} crypto_worker_main_t;
-
-typedef struct
-{
-  struct rte_mempool **cop_pools;
-  crypto_worker_main_t *workers_main;
-} dpdk_crypto_main_t;
-
-dpdk_crypto_main_t dpdk_crypto_main;
-
-extern vlib_node_registration_t dpdk_crypto_input_node;
-
-#define CRYPTO_N_FREE_COPS (VLIB_FRAME_SIZE * 3)
-
-static_always_inline void
-crypto_alloc_cops ()
-{
-  dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
-  u32 cpu_index = os_get_cpu_number ();
-  crypto_worker_main_t *cwm = &dcm->workers_main[cpu_index];
-  unsigned socket_id = rte_socket_id ();
-  crypto_qp_data_t *qpd;
-
-  /* *INDENT-OFF* */
-  vec_foreach (qpd, cwm->qp_data)
-    {
-      u32 l = vec_len (qpd->free_cops);
-
-      if (PREDICT_FALSE (l < VLIB_FRAME_SIZE))
-	{
-	  u32 n_alloc;
-
-	  if (PREDICT_FALSE (!qpd->free_cops))
-	    vec_alloc (qpd->free_cops, CRYPTO_N_FREE_COPS);
-
-	  n_alloc = rte_crypto_op_bulk_alloc (dcm->cop_pools[socket_id],
-					      RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-					      &qpd->free_cops[l],
-					      CRYPTO_N_FREE_COPS - l - 1);
-
-	  _vec_len (qpd->free_cops) = l + n_alloc;
-	}
-    }
-  /* *INDENT-ON* */
-}
-
-static_always_inline void
-crypto_free_cop (crypto_qp_data_t * qpd, struct rte_crypto_op **cops, u32 n)
-{
-  u32 l = vec_len (qpd->free_cops);
-
-  if (l + n >= CRYPTO_N_FREE_COPS)
-    {
-      l -= VLIB_FRAME_SIZE;
-      rte_mempool_put_bulk (cops[0]->mempool,
-			    (void **) &qpd->free_cops[l], VLIB_FRAME_SIZE);
-    }
-  clib_memcpy (&qpd->free_cops[l], cops, sizeof (*cops) * n);
-
-  _vec_len (qpd->free_cops) = l + n;
-}
-
-static_always_inline int
-check_algo_is_supported (const struct rte_cryptodev_capabilities *cap,
-			 char *name)
-{
-  struct
-  {
-    uint8_t cipher_algo;
-    enum rte_crypto_sym_xform_type type;
-    union
-    {
-      enum rte_crypto_auth_algorithm auth;
-      enum rte_crypto_cipher_algorithm cipher;
-    };
-    char *name;
-  } supported_algo[] =
-  {
-    {
-    .type = RTE_CRYPTO_SYM_XFORM_CIPHER,.cipher =
-	RTE_CRYPTO_CIPHER_NULL,.name = "NULL"},
-    {
-    .type = RTE_CRYPTO_SYM_XFORM_CIPHER,.cipher =
-	RTE_CRYPTO_CIPHER_AES_CBC,.name = "AES_CBC"},
-    {
-    .type = RTE_CRYPTO_SYM_XFORM_CIPHER,.cipher =
-	RTE_CRYPTO_CIPHER_AES_CTR,.name = "AES_CTR"},
-    {
-    .type = RTE_CRYPTO_SYM_XFORM_CIPHER,.cipher =
-	RTE_CRYPTO_CIPHER_3DES_CBC,.name = "3DES-CBC"},
-    {
-    .type = RTE_CRYPTO_SYM_XFORM_CIPHER,.auth =
-	RTE_CRYPTO_CIPHER_AES_GCM,.name = "AES-GCM"},
-    {
-    .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
-	RTE_CRYPTO_AUTH_SHA1_HMAC,.name = "HMAC-SHA1"},
-    {
-    .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
-	RTE_CRYPTO_AUTH_SHA256_HMAC,.name = "HMAC-SHA256"},
-    {
-    .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
-	RTE_CRYPTO_AUTH_SHA384_HMAC,.name = "HMAC-SHA384"},
-    {
-    .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
-	RTE_CRYPTO_AUTH_SHA512_HMAC,.name = "HMAC-SHA512"},
-    {
-    .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
-	RTE_CRYPTO_AUTH_AES_XCBC_MAC,.name = "AES-XCBC-MAC"},
-    {
-    .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
-	RTE_CRYPTO_AUTH_AES_GCM,.name = "AES-GCM"},
-    {
-      /* tail */
-  .type = RTE_CRYPTO_SYM_XFORM_NOT_SPECIFIED},};
-  uint32_t i = 0;
-
-  if (cap->op != RTE_CRYPTO_OP_TYPE_SYMMETRIC)
-    return -1;
-
-  while (supported_algo[i].type != RTE_CRYPTO_SYM_XFORM_NOT_SPECIFIED)
-    {
-      if (cap->sym.xform_type == supported_algo[i].type)
-	{
-	  if ((cap->sym.xform_type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
-	       cap->sym.cipher.algo == supported_algo[i].cipher) ||
-	      (cap->sym.xform_type == RTE_CRYPTO_SYM_XFORM_AUTH &&
-	       cap->sym.auth.algo == supported_algo[i].auth))
-	    {
-	      if (name)
-		strcpy (name, supported_algo[i].name);
-	      return 0;
-	    }
-	}
-
-      i++;
-    }
-
-  return -1;
-}
-
-#endif /* __DPDK_IPSEC_H__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/node.c b/vnet/vnet/devices/dpdk/node.c
deleted file mode 100644
index e541cdbc..00000000
--- a/vnet/vnet/devices/dpdk/node.c
+++ /dev/null
@@ -1,687 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/vnet.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/error.h>
-#include <vppinfra/format.h>
-#include <vppinfra/xxhash.h>
-
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/devices/dpdk/dpdk.h>
-#include <vnet/classify/vnet_classify.h>
-#include <vnet/mpls/packet.h>
-#include <vnet/handoff.h>
-#include <vnet/devices/devices.h>
-#include <vnet/feature/feature.h>
-
-#include "dpdk_priv.h"
-
-static char *dpdk_error_strings[] = {
-#define _(n,s) s,
-  foreach_dpdk_error
-#undef _
-};
-
-always_inline int
-vlib_buffer_is_ip4 (vlib_buffer_t * b)
-{
-  ethernet_header_t *h = (ethernet_header_t *) b->data;
-  return (h->type == clib_host_to_net_u16 (ETHERNET_TYPE_IP4));
-}
-
-always_inline int
-vlib_buffer_is_ip6 (vlib_buffer_t * b)
-{
-  ethernet_header_t *h = (ethernet_header_t *) b->data;
-  return (h->type == clib_host_to_net_u16 (ETHERNET_TYPE_IP6));
-}
-
-always_inline int
-vlib_buffer_is_mpls (vlib_buffer_t * b)
-{
-  ethernet_header_t *h = (ethernet_header_t *) b->data;
-  return (h->type == clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST));
-}
-
-#if RTE_VERSION < RTE_VERSION_NUM(16, 11, 0, 0)
-/* New ol_flags bits added in DPDK-16.11 */
-#define PKT_RX_IP_CKSUM_GOOD    (1ULL << 7)
-#endif
-
-always_inline u32
-dpdk_rx_next_from_etype (struct rte_mbuf * mb, vlib_buffer_t * b0)
-{
-  if (PREDICT_TRUE (vlib_buffer_is_ip4 (b0)))
-    if (PREDICT_TRUE ((mb->ol_flags & PKT_RX_IP_CKSUM_GOOD) != 0))
-      return VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT;
-    else
-      return VNET_DEVICE_INPUT_NEXT_IP4_INPUT;
-  else if (PREDICT_TRUE (vlib_buffer_is_ip6 (b0)))
-    return VNET_DEVICE_INPUT_NEXT_IP6_INPUT;
-  else if (PREDICT_TRUE (vlib_buffer_is_mpls (b0)))
-    return VNET_DEVICE_INPUT_NEXT_MPLS_INPUT;
-  else
-    return VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-}
-
-always_inline int
-dpdk_mbuf_is_vlan (struct rte_mbuf *mb)
-{
-#if RTE_VERSION >= RTE_VERSION_NUM(16, 11, 0, 0)
-  return (mb->packet_type & RTE_PTYPE_L2_ETHER_VLAN) ==
-    RTE_PTYPE_L2_ETHER_VLAN;
-#else
-  return
-    (mb->ol_flags &
-     (PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED | PKT_RX_QINQ_STRIPPED)) ==
-    PKT_RX_VLAN_PKT;
-#endif
-}
-
-always_inline int
-dpdk_mbuf_is_ip4 (struct rte_mbuf *mb)
-{
-  return RTE_ETH_IS_IPV4_HDR (mb->packet_type) != 0;
-}
-
-always_inline int
-dpdk_mbuf_is_ip6 (struct rte_mbuf *mb)
-{
-  return RTE_ETH_IS_IPV6_HDR (mb->packet_type) != 0;
-}
-
-always_inline u32
-dpdk_rx_next_from_mb (struct rte_mbuf * mb, vlib_buffer_t * b0)
-{
-  if (PREDICT_FALSE (dpdk_mbuf_is_vlan (mb)))
-    return VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-  else if (PREDICT_TRUE (dpdk_mbuf_is_ip4 (mb)))
-    return VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT;
-  else if (PREDICT_TRUE (dpdk_mbuf_is_ip6 (mb)))
-    return VNET_DEVICE_INPUT_NEXT_IP6_INPUT;
-  else if (PREDICT_TRUE (vlib_buffer_is_mpls (b0)))
-    return VNET_DEVICE_INPUT_NEXT_MPLS_INPUT;
-  else
-    return dpdk_rx_next_from_etype (mb, b0);
-}
-
-always_inline void
-dpdk_rx_error_from_mb (struct rte_mbuf *mb, u32 * next, u8 * error)
-{
-  if (mb->ol_flags & PKT_RX_IP_CKSUM_BAD)
-    {
-      *error = DPDK_ERROR_IP_CHECKSUM_ERROR;
-      *next = VNET_DEVICE_INPUT_NEXT_DROP;
-    }
-  else
-    *error = DPDK_ERROR_NONE;
-}
-
-void
-dpdk_rx_trace (dpdk_main_t * dm,
-	       vlib_node_runtime_t * node,
-	       dpdk_device_t * xd,
-	       u16 queue_id, u32 * buffers, uword n_buffers)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  u32 *b, n_left;
-  u32 next0;
-
-  n_left = n_buffers;
-  b = buffers;
-
-  while (n_left >= 1)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      dpdk_rx_dma_trace_t *t0;
-      struct rte_mbuf *mb;
-      u8 error0;
-
-      bi0 = b[0];
-      n_left -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      mb = rte_mbuf_from_vlib_buffer (b0);
-
-      if (PREDICT_FALSE (xd->per_interface_next_index != ~0))
-	next0 = xd->per_interface_next_index;
-      else if (PREDICT_TRUE
-	       ((xd->flags & DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE) != 0))
-	next0 = dpdk_rx_next_from_mb (mb, b0);
-      else
-	next0 = dpdk_rx_next_from_etype (mb, b0);
-
-      dpdk_rx_error_from_mb (mb, &next0, &error0);
-
-      vlib_trace_buffer (vm, node, next0, b0, /* follow_chain */ 0);
-      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-      t0->queue_index = queue_id;
-      t0->device_index = xd->device_index;
-      t0->buffer_index = bi0;
-
-      clib_memcpy (&t0->mb, mb, sizeof (t0->mb));
-      clib_memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
-      clib_memcpy (t0->buffer.pre_data, b0->data,
-		   sizeof (t0->buffer.pre_data));
-      clib_memcpy (&t0->data, mb->buf_addr + mb->data_off, sizeof (t0->data));
-
-      b += 1;
-    }
-}
-
-static inline u32
-dpdk_rx_burst (dpdk_main_t * dm, dpdk_device_t * xd, u16 queue_id)
-{
-  u32 n_buffers;
-  u32 n_left;
-  u32 n_this_chunk;
-
-  n_left = VLIB_FRAME_SIZE;
-  n_buffers = 0;
-
-  if (PREDICT_TRUE (xd->flags & DPDK_DEVICE_FLAG_PMD))
-    {
-      while (n_left)
-	{
-	  n_this_chunk = rte_eth_rx_burst (xd->device_index, queue_id,
-					   xd->rx_vectors[queue_id] +
-					   n_buffers, n_left);
-	  n_buffers += n_this_chunk;
-	  n_left -= n_this_chunk;
-
-	  /* Empirically, DPDK r1.8 produces vectors w/ 32 or fewer elts */
-	  if (n_this_chunk < 32)
-	    break;
-	}
-    }
-  else
-    {
-      ASSERT (0);
-    }
-
-  return n_buffers;
-}
-
-
-static_always_inline void
-dpdk_process_subseq_segs (vlib_main_t * vm, vlib_buffer_t * b,
-			  struct rte_mbuf *mb, vlib_buffer_free_list_t * fl)
-{
-  u8 nb_seg = 1;
-  struct rte_mbuf *mb_seg = 0;
-  vlib_buffer_t *b_seg, *b_chain = 0;
-  mb_seg = mb->next;
-  b_chain = b;
-
-  while ((mb->nb_segs > 1) && (nb_seg < mb->nb_segs))
-    {
-      ASSERT (mb_seg != 0);
-
-      b_seg = vlib_buffer_from_rte_mbuf (mb_seg);
-      vlib_buffer_init_for_free_list (b_seg, fl);
-
-      ASSERT ((b_seg->flags & VLIB_BUFFER_NEXT_PRESENT) == 0);
-      ASSERT (b_seg->current_data == 0);
-
-      /*
-       * The driver (e.g. virtio) may not put the packet data at the start
-       * of the segment, so don't assume b_seg->current_data == 0 is correct.
-       */
-      b_seg->current_data =
-	(mb_seg->buf_addr + mb_seg->data_off) - (void *) b_seg->data;
-
-      b_seg->current_length = mb_seg->data_len;
-      b->total_length_not_including_first_buffer += mb_seg->data_len;
-
-      b_chain->flags |= VLIB_BUFFER_NEXT_PRESENT;
-      b_chain->next_buffer = vlib_get_buffer_index (vm, b_seg);
-
-      b_chain = b_seg;
-      mb_seg = mb_seg->next;
-      nb_seg++;
-    }
-}
-
-static_always_inline void
-dpdk_prefetch_buffer (struct rte_mbuf *mb)
-{
-  vlib_buffer_t *b = vlib_buffer_from_rte_mbuf (mb);
-  CLIB_PREFETCH (mb, CLIB_CACHE_LINE_BYTES, LOAD);
-  CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, STORE);
-}
-
-/*
- * This function is used when there are no worker threads.
- * The main thread performs IO and forwards the packets.
- */
-static_always_inline u32
-dpdk_device_input (dpdk_main_t * dm, dpdk_device_t * xd,
-		   vlib_node_runtime_t * node, u32 cpu_index, u16 queue_id)
-{
-  u32 n_buffers;
-  u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-  u32 n_left_to_next, *to_next;
-  u32 mb_index;
-  vlib_main_t *vm = vlib_get_main ();
-  uword n_rx_bytes = 0;
-  u32 n_trace, trace_cnt __attribute__ ((unused));
-  vlib_buffer_free_list_t *fl;
-  u32 buffer_flags_template;
-
-  if ((xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP) == 0)
-    return 0;
-
-  n_buffers = dpdk_rx_burst (dm, xd, queue_id);
-
-  if (n_buffers == 0)
-    {
-      return 0;
-    }
-
-  buffer_flags_template = dm->buffer_flags_template;
-
-  vec_reset_length (xd->d_trace_buffers[cpu_index]);
-  trace_cnt = n_trace = vlib_get_trace_count (vm, node);
-
-  if (n_trace > 0)
-    {
-      u32 n = clib_min (n_trace, n_buffers);
-      mb_index = 0;
-
-      while (n--)
-	{
-	  struct rte_mbuf *mb = xd->rx_vectors[queue_id][mb_index++];
-	  vlib_buffer_t *b = vlib_buffer_from_rte_mbuf (mb);
-	  vec_add1 (xd->d_trace_buffers[cpu_index],
-		    vlib_get_buffer_index (vm, b));
-	}
-    }
-
-  fl = vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-
-  mb_index = 0;
-
-  while (n_buffers > 0)
-    {
-      vlib_buffer_t *b0, *b1, *b2, *b3;
-      u32 bi0, next0, l3_offset0;
-      u32 bi1, next1, l3_offset1;
-      u32 bi2, next2, l3_offset2;
-      u32 bi3, next3, l3_offset3;
-      u8 error0, error1, error2, error3;
-      u64 or_ol_flags;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_buffers > 8 && n_left_to_next > 4)
-	{
-	  struct rte_mbuf *mb0 = xd->rx_vectors[queue_id][mb_index];
-	  struct rte_mbuf *mb1 = xd->rx_vectors[queue_id][mb_index + 1];
-	  struct rte_mbuf *mb2 = xd->rx_vectors[queue_id][mb_index + 2];
-	  struct rte_mbuf *mb3 = xd->rx_vectors[queue_id][mb_index + 3];
-
-	  dpdk_prefetch_buffer (xd->rx_vectors[queue_id][mb_index + 4]);
-	  dpdk_prefetch_buffer (xd->rx_vectors[queue_id][mb_index + 5]);
-	  dpdk_prefetch_buffer (xd->rx_vectors[queue_id][mb_index + 6]);
-	  dpdk_prefetch_buffer (xd->rx_vectors[queue_id][mb_index + 7]);
-
-	  if (xd->flags & DPDK_DEVICE_FLAG_MAYBE_MULTISEG)
-	    {
-	      if (PREDICT_FALSE (mb0->nb_segs > 1))
-		dpdk_prefetch_buffer (mb0->next);
-	      if (PREDICT_FALSE (mb1->nb_segs > 1))
-		dpdk_prefetch_buffer (mb1->next);
-	      if (PREDICT_FALSE (mb2->nb_segs > 1))
-		dpdk_prefetch_buffer (mb2->next);
-	      if (PREDICT_FALSE (mb3->nb_segs > 1))
-		dpdk_prefetch_buffer (mb3->next);
-	    }
-
-	  ASSERT (mb0);
-	  ASSERT (mb1);
-	  ASSERT (mb2);
-	  ASSERT (mb3);
-
-	  or_ol_flags = (mb0->ol_flags | mb1->ol_flags |
-			 mb2->ol_flags | mb3->ol_flags);
-	  b0 = vlib_buffer_from_rte_mbuf (mb0);
-	  b1 = vlib_buffer_from_rte_mbuf (mb1);
-	  b2 = vlib_buffer_from_rte_mbuf (mb2);
-	  b3 = vlib_buffer_from_rte_mbuf (mb3);
-
-	  vlib_buffer_init_for_free_list (b0, fl);
-	  vlib_buffer_init_for_free_list (b1, fl);
-	  vlib_buffer_init_for_free_list (b2, fl);
-	  vlib_buffer_init_for_free_list (b3, fl);
-
-	  bi0 = vlib_get_buffer_index (vm, b0);
-	  bi1 = vlib_get_buffer_index (vm, b1);
-	  bi2 = vlib_get_buffer_index (vm, b2);
-	  bi3 = vlib_get_buffer_index (vm, b3);
-
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  to_next[2] = bi2;
-	  to_next[3] = bi3;
-	  to_next += 4;
-	  n_left_to_next -= 4;
-
-	  if (PREDICT_FALSE (xd->per_interface_next_index != ~0))
-	    {
-	      next0 = next1 = next2 = next3 = xd->per_interface_next_index;
-	    }
-	  else if (PREDICT_TRUE
-		   ((xd->flags & DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE) != 0))
-	    {
-	      next0 = dpdk_rx_next_from_mb (mb0, b0);
-	      next1 = dpdk_rx_next_from_mb (mb1, b1);
-	      next2 = dpdk_rx_next_from_mb (mb2, b2);
-	      next3 = dpdk_rx_next_from_mb (mb3, b3);
-	    }
-	  else
-	    {
-	      next0 = dpdk_rx_next_from_etype (mb0, b0);
-	      next1 = dpdk_rx_next_from_etype (mb1, b1);
-	      next2 = dpdk_rx_next_from_etype (mb2, b2);
-	      next3 = dpdk_rx_next_from_etype (mb3, b3);
-	    }
-
-	  if (PREDICT_FALSE (or_ol_flags & PKT_RX_IP_CKSUM_BAD))
-	    {
-	      dpdk_rx_error_from_mb (mb0, &next0, &error0);
-	      dpdk_rx_error_from_mb (mb1, &next1, &error1);
-	      dpdk_rx_error_from_mb (mb2, &next2, &error2);
-	      dpdk_rx_error_from_mb (mb3, &next3, &error3);
-	      b0->error = node->errors[error0];
-	      b1->error = node->errors[error1];
-	      b2->error = node->errors[error2];
-	      b3->error = node->errors[error3];
-	    }
-	  else
-	    {
-	      b0->error = b1->error = node->errors[DPDK_ERROR_NONE];
-	      b2->error = b3->error = node->errors[DPDK_ERROR_NONE];
-	    }
-
-	  l3_offset0 = device_input_next_node_advance[next0];
-	  l3_offset1 = device_input_next_node_advance[next1];
-	  l3_offset2 = device_input_next_node_advance[next2];
-	  l3_offset3 = device_input_next_node_advance[next3];
-
-	  b0->current_data = l3_offset0 + mb0->data_off;
-	  b1->current_data = l3_offset1 + mb1->data_off;
-	  b2->current_data = l3_offset2 + mb2->data_off;
-	  b3->current_data = l3_offset3 + mb3->data_off;
-
-	  b0->current_data -= RTE_PKTMBUF_HEADROOM;
-	  b1->current_data -= RTE_PKTMBUF_HEADROOM;
-	  b2->current_data -= RTE_PKTMBUF_HEADROOM;
-	  b3->current_data -= RTE_PKTMBUF_HEADROOM;
-
-	  b0->current_length = mb0->data_len - l3_offset0;
-	  b1->current_length = mb1->data_len - l3_offset1;
-	  b2->current_length = mb2->data_len - l3_offset2;
-	  b3->current_length = mb3->data_len - l3_offset3;
-
-	  b0->flags = buffer_flags_template;
-	  b1->flags = buffer_flags_template;
-	  b2->flags = buffer_flags_template;
-	  b3->flags = buffer_flags_template;
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
-	  vnet_buffer (b1)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
-	  vnet_buffer (b2)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
-	  vnet_buffer (b3)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-	  vnet_buffer (b1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-	  vnet_buffer (b2)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-	  vnet_buffer (b3)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-
-	  n_rx_bytes += mb0->pkt_len;
-	  n_rx_bytes += mb1->pkt_len;
-	  n_rx_bytes += mb2->pkt_len;
-	  n_rx_bytes += mb3->pkt_len;
-
-	  /* Process subsequent segments of multi-segment packets */
-	  if (xd->flags & DPDK_DEVICE_FLAG_MAYBE_MULTISEG)
-	    {
-	      dpdk_process_subseq_segs (vm, b0, mb0, fl);
-	      dpdk_process_subseq_segs (vm, b1, mb1, fl);
-	      dpdk_process_subseq_segs (vm, b2, mb2, fl);
-	      dpdk_process_subseq_segs (vm, b3, mb3, fl);
-	    }
-
-	  /*
-	   * Turn this on if you run into
-	   * "bad monkey" contexts, and you want to know exactly
-	   * which nodes they've visited... See main.c...
-	   */
-	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
-	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b1);
-	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b2);
-	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b3);
-
-	  /* Do we have any driver RX features configured on the interface? */
-	  vnet_feature_start_device_input_x4 (xd->vlib_sw_if_index,
-					      &next0, &next1, &next2, &next3,
-					      b0, b1, b2, b3,
-					      l3_offset0, l3_offset1,
-					      l3_offset2, l3_offset3);
-
-	  vlib_validate_buffer_enqueue_x4 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, bi2, bi3,
-					   next0, next1, next2, next3);
-	  n_buffers -= 4;
-	  mb_index += 4;
-	}
-      while (n_buffers > 0 && n_left_to_next > 0)
-	{
-	  struct rte_mbuf *mb0 = xd->rx_vectors[queue_id][mb_index];
-
-	  ASSERT (mb0);
-
-	  b0 = vlib_buffer_from_rte_mbuf (mb0);
-
-	  /* Prefetch one next segment if it exists. */
-	  if (PREDICT_FALSE (mb0->nb_segs > 1))
-	    dpdk_prefetch_buffer (mb0->next);
-
-	  vlib_buffer_init_for_free_list (b0, fl);
-
-	  bi0 = vlib_get_buffer_index (vm, b0);
-
-	  to_next[0] = bi0;
-	  to_next++;
-	  n_left_to_next--;
-
-	  if (PREDICT_FALSE (xd->per_interface_next_index != ~0))
-	    next0 = xd->per_interface_next_index;
-	  else if (PREDICT_TRUE
-		   ((xd->flags & DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE) != 0))
-	    next0 = dpdk_rx_next_from_mb (mb0, b0);
-	  else
-	    next0 = dpdk_rx_next_from_etype (mb0, b0);
-
-	  dpdk_rx_error_from_mb (mb0, &next0, &error0);
-	  b0->error = node->errors[error0];
-
-	  l3_offset0 = device_input_next_node_advance[next0];
-
-	  b0->current_data = l3_offset0;
-	  b0->current_data += mb0->data_off - RTE_PKTMBUF_HEADROOM;
-	  b0->current_length = mb0->data_len - l3_offset0;
-
-	  b0->flags = buffer_flags_template;
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-	  n_rx_bytes += mb0->pkt_len;
-
-	  /* Process subsequent segments of multi-segment packets */
-	  dpdk_process_subseq_segs (vm, b0, mb0, fl);
-
-	  /*
-	   * Turn this on if you run into
-	   * "bad monkey" contexts, and you want to know exactly
-	   * which nodes they've visited... See main.c...
-	   */
-	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
-
-	  /* Do we have any driver RX features configured on the interface? */
-	  vnet_feature_start_device_input_x1 (xd->vlib_sw_if_index, &next0,
-					      b0, l3_offset0);
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	  n_buffers--;
-	  mb_index++;
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  if (PREDICT_FALSE (vec_len (xd->d_trace_buffers[cpu_index]) > 0))
-    {
-      dpdk_rx_trace (dm, node, xd, queue_id, xd->d_trace_buffers[cpu_index],
-		     vec_len (xd->d_trace_buffers[cpu_index]));
-      vlib_set_trace_count (vm, node, n_trace -
-			    vec_len (xd->d_trace_buffers[cpu_index]));
-    }
-
-  vlib_increment_combined_counter
-    (vnet_get_main ()->interface_main.combined_sw_if_counters
-     + VNET_INTERFACE_COUNTER_RX,
-     cpu_index, xd->vlib_sw_if_index, mb_index, n_rx_bytes);
-
-  dpdk_worker_t *dw = vec_elt_at_index (dm->workers, cpu_index);
-  dw->aggregate_rx_packets += mb_index;
-
-  return mb_index;
-}
-
-static inline void
-poll_rate_limit (dpdk_main_t * dm)
-{
-  /* Limit the poll rate by sleeping for N msec between polls */
-  if (PREDICT_FALSE (dm->poll_sleep != 0))
-    {
-      struct timespec ts, tsrem;
-
-      ts.tv_sec = 0;
-      ts.tv_nsec = 1000 * 1000 * dm->poll_sleep;	/* 1ms */
-
-      while (nanosleep (&ts, &tsrem) < 0)
-	{
-	  ts = tsrem;
-	}
-    }
-}
-
-/** \brief Main DPDK input node
-    @node dpdk-input
-
-    This is the main DPDK input node: across each assigned interface,
-    call rte_eth_rx_burst(...) or similar to obtain a vector of
-    packets to process. Handle early packet discard. Derive @c
-    vlib_buffer_t metadata from <code>struct rte_mbuf</code> metadata,
-    Depending on the resulting metadata: adjust <code>b->current_data,
-    b->current_length </code> and dispatch directly to
-    ip4-input-no-checksum, or ip6-input. Trace the packet if required.
-
-    @param vm   vlib_main_t corresponding to the current thread
-    @param node vlib_node_runtime_t
-    @param f    vlib_frame_t input-node, not used.
-
-    @par Graph mechanics: buffer metadata, next index usage
-
-    @em Uses:
-    - <code>struct rte_mbuf mb->ol_flags</code>
-        - PKT_RX_IP_CKSUM_BAD
-    - <code> RTE_ETH_IS_xxx_HDR(mb->packet_type) </code>
-        - packet classification result
-
-    @em Sets:
-    - <code>b->error</code> if the packet is to be dropped immediately
-    - <code>b->current_data, b->current_length</code>
-        - adjusted as needed to skip the L2 header in  direct-dispatch cases
-    - <code>vnet_buffer(b)->sw_if_index[VLIB_RX]</code>
-        - rx interface sw_if_index
-    - <code>vnet_buffer(b)->sw_if_index[VLIB_TX] = ~0</code>
-        - required by ipX-lookup
-    - <code>b->flags</code>
-        - to indicate multi-segment pkts (VLIB_BUFFER_NEXT_PRESENT), etc.
-
-    <em>Next Nodes:</em>
-    - Static arcs to: error-drop, ethernet-input,
-      ip4-input-no-checksum, ip6-input, mpls-input
-    - per-interface redirection, controlled by
-      <code>xd->per_interface_next_index</code>
-*/
-
-static uword
-dpdk_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_t *xd;
-  uword n_rx_packets = 0;
-  dpdk_device_and_queue_t *dq;
-  u32 cpu_index = os_get_cpu_number ();
-
-  /*
-   * Poll all devices on this cpu for input/interrupts.
-   */
-  /* *INDENT-OFF* */
-  vec_foreach (dq, dm->devices_by_cpu[cpu_index])
-    {
-      xd = vec_elt_at_index(dm->devices, dq->device);
-      n_rx_packets += dpdk_device_input (dm, xd, node, cpu_index, dq->queue_id);
-    }
-  /* *INDENT-ON* */
-
-  poll_rate_limit (dm);
-
-  return n_rx_packets;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (dpdk_input_node) = {
-  .function = dpdk_input,
-  .type = VLIB_NODE_TYPE_INPUT,
-  .name = "dpdk-input",
-  .sibling_of = "device-input",
-
-  /* Will be enabled if/when hardware is detected. */
-  .state = VLIB_NODE_STATE_DISABLED,
-
-  .format_buffer = format_ethernet_header_with_length,
-  .format_trace = format_dpdk_rx_dma_trace,
-
-  .n_errors = DPDK_N_ERROR,
-  .error_strings = dpdk_error_strings,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (dpdk_input_node, dpdk_input);
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/dpdk/qos_doc.md b/vnet/vnet/devices/dpdk/qos_doc.md
deleted file mode 100644
index 9bd0659d..00000000
--- a/vnet/vnet/devices/dpdk/qos_doc.md
+++ /dev/null
@@ -1,404 +0,0 @@
-# QoS Hierarchical Scheduler    {#qos_doc}
-
-The Quality-of-Service (QoS) scheduler performs egress-traffic management by
-prioritizing the transmission of the packets of different type services and
-subcribers based on the Service Level Agreements (SLAs). The QoS scheduler can
-be enabled on one or more NIC output interfaces depending upon the
-requirement.
-
-
-## Overview
-
-The QoS schdeuler supports a number of scheduling and shaping levels which
-construct hierarchical-tree. The first level in the hierarchy is port (i.e.
-the physical interface) that constitutes the root node of the tree. The
-subsequent level is subport which represents the group of the
-users/subscribers. The individual user/subscriber is represented by the pipe
-at the next level. Each user can have different traffic type based on the
-criteria of specific loss rate, jitter, and latency. These traffic types are
-represented at the traffic-class level in the form of different traffic-
-classes. The last level contains number of queues which are grouped together
-to host the packets of the specific class type traffic.
-
-The QoS scheduler implementation requires flow classification, enqueue  and
-dequeue operations. The flow classification is mandatory stage for HQoS where
-incoming packets are classified by mapping the packet fields information to
-5-tuple (HQoS subport, pipe, traffic class, queue within traffic class, and
-color) and storing that information in mbuf sched field. The enqueue operation
-uses this information to determine the queue for storing the packet, and at
-this stage, if the specific queue is full, QoS drops the packet. The dequeue
-operation consists of scheduling the packet based on its length and available
-credits, and handing over the scheduled packet to the output interface.
-
-For more information on QoS Scheduler, please refer DPDK Programmer's Guide-
-http://dpdk.org/doc/guides/prog_guide/qos_framework.html
-
-
-### QoS Schdeuler Parameters
-
-Following illustrates the default HQoS configuration for each 10GbE output
-port:
-
-Single subport (subport 0):
-  - Subport rate set to 100% of port rate
-  - Each of the 4 traffic classes has rate set to 100% of port rate
-
-4K pipes per subport 0 (pipes 0 .. 4095) with identical configuration:
-  - Pipe rate set to 1/4K of port rate
-  - Each of the 4 traffic classes has rate set to 100% of pipe rate
-  - Within each traffic class, the byte-level WRR weights for the 4 queues are set to 1:1:1:1
-
-
-#### Port configuration
-
-```
-port {
-  rate 1250000000           /* Assuming 10GbE port */
-  frame_overhead 24         /* Overhead fields per Ethernet frame:
-                             * 7B (Preamble) +
-                             * 1B (Start of Frame Delimiter (SFD)) + 
-                             * 4B (Frame Check Sequence (FCS)) +
-                             * 12B (Inter Frame Gap (IFG))
-                             */
-  mtu 1522                  /* Assuming Ethernet/IPv4 pkt (FCS not included) */
-  n_subports_per_port 1     /* Number of subports per output interface */
-  n_pipes_per_subport 4096  /* Number of pipes (users/subscribers) */
-  queue_sizes 64 64 64 64   /* Packet queue size for each traffic class.
-                             * All queues within the same pipe traffic class
-                             * have the same size. Queues from different
-                             * pipes serving the same traffic class have
-                             * the same size. */
-}
-```
-
-
-#### Subport configuration
-
-```
-subport 0 {
-  tb_rate 1250000000        /* Subport level token bucket rate (bytes per second) */
-  tb_size 1000000           /* Subport level token bucket size (bytes) */
-  tc0_rate 1250000000       /* Subport level token bucket rate for traffic class 0 (bytes per second) */
-  tc1_rate 1250000000       /* Subport level token bucket rate for traffic class 1 (bytes per second) */
-  tc2_rate 1250000000       /* Subport level token bucket rate for traffic class 2 (bytes per second) */
-  tc3_rate 1250000000       /* Subport level token bucket rate for traffic class 3 (bytes per second) */
-  tc_period 10              /* Time interval for refilling the token bucket associated with traffic class (Milliseconds) */
-  pipe 0 4095 profile 0     /* pipes (users/subscribers) configured with pipe profile 0 */
-}
-```
-
-
-#### Pipe configuration
-
-```
-pipe_profile 0 {
-  tb_rate 305175          /* Pipe level token bucket rate (bytes per second) */
-  tb_size 1000000         /* Pipe level token bucket size (bytes) */
-  tc0_rate 305175         /* Pipe level token bucket rate for traffic class 0 (bytes per second) */
-  tc1_rate 305175         /* Pipe level token bucket rate for traffic class 1 (bytes per second) */
-  tc2_rate 305175         /* Pipe level token bucket rate for traffic class 2 (bytes per second) */
-  tc3_rate 305175         /* Pipe level token bucket rate for traffic class 3 (bytes per second) */
-  tc_period 40            /* Time interval for refilling the token bucket associated with traffic class at pipe level (Milliseconds) */
-  tc3_oversubscription_weight 1 /* Weight traffic class 3 oversubscription */
-  tc0_wrr_weights 1 1 1 1     /* Pipe queues WRR weights for traffic class 0 */
-  tc1_wrr_weights 1 1 1 1     /* Pipe queues WRR weights for traffic class 1 */
-  tc2_wrr_weights 1 1 1 1     /* Pipe queues WRR weights for traffic class 2 */
-  tc3_wrr_weights 1 1 1 1     /* Pipe queues WRR weights for traffic class 3 */
-}
-```
-
-
-#### Random Early Detection (RED) parameters per traffic class and color (Green / Yellow / Red)
-
-```
-red {
-  tc0_wred_min 48 40 32     /* Minimum threshold for traffic class 0 queue (min_th) in number of packets */
-  tc0_wred_max 64 64 64     /* Maximum threshold for traffic class 0 queue (max_th) in number of packets */
-  tc0_wred_inv_prob 10 10 10    /* Inverse of packet marking probability for traffic class 0 queue (maxp = 1 / maxp_inv) */
-  tc0_wred_weight 9 9 9     /* Traffic Class 0 queue weight */
-  tc1_wred_min 48 40 32     /* Minimum threshold for traffic class 1 queue (min_th) in number of packets */
-  tc1_wred_max 64 64 64     /* Maximum threshold for traffic class 1 queue (max_th) in number of packets */
-  tc1_wred_inv_prob 10 10 10    /* Inverse of packet marking probability for traffic class 1 queue (maxp = 1 / maxp_inv) */
-  tc1_wred_weight 9 9 9     /* Traffic Class 1 queue weight */
-  tc2_wred_min 48 40 32     /* Minimum threshold for traffic class 2 queue (min_th) in number of packets */
-  tc2_wred_max 64 64 64     /* Maximum threshold for traffic class 2 queue (max_th) in number of packets */
-  tc2_wred_inv_prob 10 10 10    /* Inverse of packet marking probability for traffic class 2 queue (maxp = 1 / maxp_inv) */
-  tc2_wred_weight 9 9 9     /* Traffic Class 2 queue weight */
-  tc3_wred_min 48 40 32     /* Minimum threshold for traffic class 3 queue (min_th) in number of packets */
-  tc3_wred_max 64 64 64     /* Maximum threshold for traffic class 3 queue (max_th) in number of packets */
-  tc3_wred_inv_prob 10 10 10    /* Inverse of packet marking probability for traffic class 3 queue (maxp = 1 / maxp_inv) */
-  tc3_wred_weight 9 9 9     /* Traffic Class 3 queue weight */
-}
-```
-
-
-### DPDK QoS Scheduler Integration in VPP
-
-The Hierarchical Quaity-of-Service (HQoS) scheduler object could be seen as
-part of the logical NIC output interface. To enable HQoS on specific output
-interface, vpp startup.conf file has to be configured accordingly. The output
-interface that requires HQoS, should have "hqos" parameter specified in dpdk
-section. Another optional parameter "hqos-thread"  has been defined which can
-be used to associate the output interface with specific hqos thread. In cpu
-section of the config file, "corelist-hqos-threads" is introduced to assign
-logical cpu cores to run the HQoS threads. A HQoS thread can run multiple HQoS
-objects each associated with different output interfaces. All worker threads
-instead of writing packets to NIC TX queue directly, write the packets to a
-software queues. The hqos_threads read the software queues, and enqueue the
-packets to HQoS objects, as well as dequeue packets from HQOS objects and
-write them to NIC output interfaces. The worker threads need to be able to
-send the packets to any output interface, therefore, each HQoS object
-associated with NIC output interface should have software queues equal to
-worker threads count.
-
-Following illustrates the sample startup configuration file with 4x worker
-threads feeding 2x hqos threads that handle each QoS scheduler for 1x output
-interface.
-
-```
-dpdk {
-  socket-mem 16384,16384
-
-  dev 0000:02:00.0 {
-    num-rx-queues 2
-    hqos
-  }
-  dev 0000:06:00.0 {
-    num-rx-queues 2
-    hqos
-  }
-
-  num-mbufs 1000000
-}
-
-cpu {
-  main-core 0
-  corelist-workers  1, 2, 3, 4
-  corelist-hqos-threads  5, 6
-}
-```
-
-
-### QoS scheduler CLI Commands
-
-Each QoS scheduler instance is initialised with default parameters required to
-configure hqos port, subport, pipe and queues. Some of the parameters can be
-re-configured in run-time through CLI commands.
-
-
-#### Configuration
-
-Following commands can be used to configure QoS scheduler parameters.
-
-The command below can be used to set the subport level parameters such as
-token bucket rate (bytes per seconds), token bucket size (bytes), traffic
-class rates (bytes per seconds) and token update period (Milliseconds).
-
-```
-set dpdk interface hqos subport <if-name> subport <n> [rate <n>]
-    [bktsize <n>] [tc0 <n>] [tc1 <n>] [tc2 <n>] [tc3 <n>] [period <n>]
-```
-
-For setting the pipe profile, following command can be used.    
-
-```
-set dpdk interface hqos pipe <if-name> subport <n> pipe <n> profile <n>
-```
-
-To assign QoS scheduler instance to the specific thread, following command can
-be used.
-
-```
-set dpdk interface hqos placement <if-name> thread <n>
-```
-
-The command below is used to set the packet fields required for classifiying
-the incoming packet. As a result of classification process,     packet field
-information will be mapped to 5 tuples (subport, pipe, traffic class, pipe,
-color) and stored in packet mbuf.
-
-```
-set dpdk interface hqos pktfield <if-name> id <n> offset <n> mask <n>
-```
-
-The DSCP table entries used for idenfiying the traffic class and queue can be set using the command below;   
-
-```  
-set dpdk interface hqos tctbl <if-name> entry <n> tc <n> queue <n>
-```
-
-
-#### Show Command
-
-The QoS Scheduler configuration can displayed using the command below.
-
-```
-   vpp# show dpdk interface hqos TenGigabitEthernet2/0/0
-   Thread:
-     Input SWQ size = 4096 packets
-     Enqueue burst size = 256 packets
-     Dequeue burst size = 220 packets
-     Packet field 0: slab position =    0, slab bitmask = 0x0000000000000000
-     Packet field 1: slab position =   40, slab bitmask = 0x0000000fff000000
-     Packet field 2: slab position =    8, slab bitmask = 0x00000000000000fc
-     Packet field 2 translation table:
-     [ 0 .. 15]:  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
-     [16 .. 31]:  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
-     [32 .. 47]:  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
-     [48 .. 63]:  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
-   Port:
-     Rate = 1250000000 bytes/second
-     MTU = 1514 bytes
-     Frame overhead = 24 bytes
-     Number of subports = 1
-     Number of pipes per subport = 4096
-     Packet queue size: TC0 = 64, TC1 = 64, TC2 = 64, TC3 = 64 packets
-     Number of pipe profiles = 1
-     Pipe profile 0:
-     Rate = 305175 bytes/second
-     Token bucket size = 1000000 bytes
-     Traffic class rate: TC0 = 305175, TC1 = 305175, TC2 = 305175, TC3 = 305175 bytes/second
-     TC period = 40 milliseconds
-     TC0 WRR weights: Q0 = 1, Q1 = 1, Q2 = 1, Q3 = 1
-     TC1 WRR weights: Q0 = 1, Q1 = 1, Q2 = 1, Q3 = 1
-     TC2 WRR weights: Q0 = 1, Q1 = 1, Q2 = 1, Q3 = 1
-     TC3 WRR weights: Q0 = 1, Q1 = 1, Q2 = 1, Q3 = 1
-```
-
-The QoS Scheduler placement over the logical cpu cores can be displayed using
-below command.
-
-```
-    vpp# show dpdk interface hqos placement
-      Thread 5 (vpp_hqos-threads_0 at lcore 5):
-      TenGigabitEthernet2/0/0 queue 0
-      Thread 6 (vpp_hqos-threads_1 at lcore 6):
-      TenGigabitEthernet4/0/1 queue 0
-```
-
-
-### QoS Scheduler Binary APIs
-
-This section explans the available binary APIs for configuring QoS scheduler
-parameters in run-time.
-
-The following API can be used to set the pipe profile of a pipe that belongs
-to a given subport:
-
-```
-sw_interface_set_dpdk_hqos_pipe rx <intfc> | sw_if_index <id>
-    subport <subport-id> pipe <pipe-id> profile <profile-id>
-```
-
-The data structures used for set the pipe profile parameter are as follows;
-
-```
-  /** \\brief DPDK interface HQoS pipe profile set request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - the interface
-    @param subport - subport ID
-    @param pipe - pipe ID within its subport
-    @param profile - pipe profile ID
-  */
-  define sw_interface_set_dpdk_hqos_pipe {
-    u32 client_index;
-    u32 context;
-    u32 sw_if_index;
-    u32 subport;
-    u32 pipe;
-    u32 profile;
-  };
-
-  /** \\brief DPDK interface HQoS pipe profile set reply
-    @param context - sender context, to match reply w/ request
-    @param retval - request return code
-  */
-  define sw_interface_set_dpdk_hqos_pipe_reply {
-    u32 context;
-    i32 retval;
-  };
-```
-
-The following API can be used to set the subport level parameters, for
-example- token bucket rate (bytes per seconds), token bucket size (bytes),
-traffic class rate (bytes per seconds) and tokens update period.
-
-```
-sw_interface_set_dpdk_hqos_subport rx <intfc> | sw_if_index <id>
-    subport <subport-id> [rate <n>] [bktsize <n>]
-    [tc0 <n>] [tc1 <n>] [tc2 <n>] [tc3 <n>] [period <n>]
-```
-
-The data structures used for set the subport level parameter are as follows;
-
-```
-  /** \\brief DPDK interface HQoS subport parameters set request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - the interface
-    @param subport - subport ID
-    @param tb_rate - subport token bucket rate (measured in bytes/second)
-    @param tb_size - subport token bucket size (measured in credits)
-    @param tc_rate - subport traffic class 0 .. 3 rates (measured in bytes/second)
-    @param tc_period - enforcement period for rates (measured in milliseconds)
-  */
-  define sw_interface_set_dpdk_hqos_subport {
-    u32 client_index;
-    u32 context;
-    u32 sw_if_index;
-    u32 subport;
-    u32 tb_rate;
-    u32 tb_size;
-    u32 tc_rate[4];
-    u32 tc_period;
-  };
-
-  /** \\brief DPDK interface HQoS subport parameters set reply
-    @param context - sender context, to match reply w/ request
-    @param retval - request return code
-  */
-  define sw_interface_set_dpdk_hqos_subport_reply {
-    u32 context;
-    i32 retval;
-  };
-```
-
-The following API can be used set the DSCP table entry. The DSCP table have
-64 entries to map the packet DSCP field onto traffic class and hqos input
-queue.
-
-```
-sw_interface_set_dpdk_hqos_tctbl rx <intfc> | sw_if_index <id> 
-    entry <n> tc <n> queue <n>
-```
-
-The data structures used for setting DSCP table entries are given below.
-
-```
-  /** \\brief DPDK interface HQoS tctbl entry set request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - the interface
-    @param entry - entry index ID
-    @param tc - traffic class (0 .. 3)
-    @param queue - traffic class queue (0 .. 3)
-  */
-  define sw_interface_set_dpdk_hqos_tctbl {
-    u32 client_index;
-    u32 context;
-    u32 sw_if_index;
-    u32 entry;
-    u32 tc;
-    u32 queue;
-  };
-
-  /** \\brief DPDK interface HQoS tctbl entry set reply
-    @param context - sender context, to match reply w/ request
-    @param retval - request return code
-  */
-  define sw_interface_set_dpdk_hqos_tctbl_reply {
-    u32 context;
-    i32 retval;
-  };
-```
diff --git a/vnet/vnet/devices/netmap/cli.c b/vnet/vnet/devices/netmap/cli.c
deleted file mode 100644
index 68695250..00000000
--- a/vnet/vnet/devices/netmap/cli.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- *------------------------------------------------------------------
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-#include <stdint.h>
-#include <net/if.h>
-#include <sys/ioctl.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vnet/ethernet/ethernet.h>
-
-#include <vnet/devices/netmap/net_netmap.h>
-#include <vnet/devices/netmap/netmap.h>
-
-static clib_error_t *
-netmap_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
-			  vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 *host_if_name = NULL;
-  u8 hwaddr[6];
-  u8 *hw_addr_ptr = 0;
-  int r;
-  u8 is_pipe = 0;
-  u8 is_master = 0;
-  u32 sw_if_index = ~0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "name %s", &host_if_name))
-	;
-      else
-	if (unformat
-	    (line_input, "hw-addr %U", unformat_ethernet_address, hwaddr))
-	hw_addr_ptr = hwaddr;
-      else if (unformat (line_input, "pipe"))
-	is_pipe = 1;
-      else if (unformat (line_input, "master"))
-	is_master = 1;
-      else if (unformat (line_input, "slave"))
-	is_master = 0;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  if (host_if_name == NULL)
-    return clib_error_return (0, "missing host interface name");
-
-  r =
-    netmap_create_if (vm, host_if_name, hw_addr_ptr, is_pipe, is_master,
-		      &sw_if_index);
-
-  if (r == VNET_API_ERROR_SYSCALL_ERROR_1)
-    return clib_error_return (0, "%s (errno %d)", strerror (errno), errno);
-
-  if (r == VNET_API_ERROR_INVALID_INTERFACE)
-    return clib_error_return (0, "Invalid interface name");
-
-  if (r == VNET_API_ERROR_SUBIF_ALREADY_EXISTS)
-    return clib_error_return (0, "Interface already exists");
-
-  vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main (),
-		   sw_if_index);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (netmap_create_command, static) = {
-  .path = "create netmap",
-  .short_help = "create netmap name [<intf name>|valeXXX:YYY] "
-    "[hw-addr <mac>] [pipe] [master|slave]",
-  .function = netmap_create_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-netmap_delete_command_fn (vlib_main_t * vm, unformat_input_t * input,
-			  vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 *host_if_name = NULL;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "name %s", &host_if_name))
-	;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  if (host_if_name == NULL)
-    return clib_error_return (0, "missing host interface name");
-
-  netmap_delete_if (vm, host_if_name);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (netmap_delete_command, static) = {
-  .path = "delete netmap",
-  .short_help = "delete netmap name <interface name>",
-  .function = netmap_delete_command_fn,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-netmap_cli_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (netmap_cli_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/netmap/device.c b/vnet/vnet/devices/netmap/device.c
deleted file mode 100644
index 2152824f..00000000
--- a/vnet/vnet/devices/netmap/device.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- *------------------------------------------------------------------
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdint.h>
-#include <net/if.h>
-#include <sys/ioctl.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vnet/ethernet/ethernet.h>
-
-#include <vnet/devices/netmap/net_netmap.h>
-#include <vnet/devices/netmap/netmap.h>
-
-#define foreach_netmap_tx_func_error	       \
-_(NO_FREE_SLOTS, "no free tx slots")           \
-_(PENDING_MSGS, "pending msgs in tx ring")
-
-typedef enum
-{
-#define _(f,s) NETMAP_TX_ERROR_##f,
-  foreach_netmap_tx_func_error
-#undef _
-    NETMAP_TX_N_ERROR,
-} netmap_tx_func_error_t;
-
-static char *netmap_tx_func_error_strings[] = {
-#define _(n,s) s,
-  foreach_netmap_tx_func_error
-#undef _
-};
-
-
-static u8 *
-format_netmap_device_name (u8 * s, va_list * args)
-{
-  u32 i = va_arg (*args, u32);
-  netmap_main_t *apm = &netmap_main;
-  netmap_if_t *nif = pool_elt_at_index (apm->interfaces, i);
-
-  s = format (s, "netmap-%s", nif->host_if_name);
-  return s;
-}
-
-static u8 *
-format_netmap_device (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  int verbose = va_arg (*args, int);
-  netmap_main_t *nm = &netmap_main;
-  netmap_if_t *nif = vec_elt_at_index (nm->interfaces, dev_instance);
-  uword indent = format_get_indent (s);
-
-  s = format (s, "NETMAP interface");
-  if (verbose)
-    {
-      s = format (s, "\n%U version %d flags 0x%x"
-		  "\n%U region %u memsize 0x%x offset 0x%x"
-		  "\n%U tx_slots %u rx_slots %u tx_rings %u rx_rings %u",
-		  format_white_space, indent + 2,
-		  nif->req->nr_version,
-		  nif->req->nr_flags,
-		  format_white_space, indent + 2,
-		  nif->mem_region,
-		  nif->req->nr_memsize,
-		  nif->req->nr_offset,
-		  format_white_space, indent + 2,
-		  nif->req->nr_tx_slots,
-		  nif->req->nr_rx_slots,
-		  nif->req->nr_tx_rings, nif->req->nr_rx_rings);
-    }
-  return s;
-}
-
-static u8 *
-format_netmap_tx_trace (u8 * s, va_list * args)
-{
-  s = format (s, "Unimplemented...");
-  return s;
-}
-
-static uword
-netmap_interface_tx (vlib_main_t * vm,
-		     vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  netmap_main_t *nm = &netmap_main;
-  u32 *buffers = vlib_frame_args (frame);
-  u32 n_left = frame->n_vectors;
-  f64 const time_constant = 1e3;
-  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
-  netmap_if_t *nif = pool_elt_at_index (nm->interfaces, rd->dev_instance);
-  int cur_ring;
-
-  if (PREDICT_FALSE (nif->lockp != 0))
-    {
-      while (__sync_lock_test_and_set (nif->lockp, 1))
-	;
-    }
-
-  cur_ring = nif->first_tx_ring;
-
-  while (n_left && cur_ring <= nif->last_tx_ring)
-    {
-      struct netmap_ring *ring = NETMAP_TXRING (nif->nifp, cur_ring);
-      int n_free_slots = nm_ring_space (ring);
-      uint cur = ring->cur;
-
-      if (nm_tx_pending (ring))
-	{
-	  if (ioctl (nif->fd, NIOCTXSYNC, NULL) < 0)
-	    clib_unix_warning ("NIOCTXSYNC");
-	  clib_cpu_time_wait (time_constant);
-
-	  if (nm_tx_pending (ring) && !n_free_slots)
-	    {
-	      cur_ring++;
-	      continue;
-	    }
-	}
-
-      while (n_left && n_free_slots)
-	{
-	  vlib_buffer_t *b0 = 0;
-	  u32 bi = buffers[0];
-	  u32 len;
-	  u32 offset = 0;
-	  buffers++;
-
-	  struct netmap_slot *slot = &ring->slot[cur];
-
-	  do
-	    {
-	      b0 = vlib_get_buffer (vm, bi);
-	      len = b0->current_length;
-	      /* memcpy */
-	      clib_memcpy ((u8 *) NETMAP_BUF (ring, slot->buf_idx) + offset,
-			   vlib_buffer_get_current (b0), len);
-	      offset += len;
-	    }
-	  while ((bi = b0->next_buffer));
-
-	  slot->len = offset;
-	  cur = (cur + 1) % ring->num_slots;
-	  n_free_slots--;
-	  n_left--;
-	}
-      CLIB_MEMORY_BARRIER ();
-      ring->head = ring->cur = cur;
-    }
-
-  if (n_left < frame->n_vectors)
-    ioctl (nif->fd, NIOCTXSYNC, NULL);
-
-  if (PREDICT_FALSE (nif->lockp != 0))
-    *nif->lockp = 0;
-
-  if (n_left)
-    vlib_error_count (vm, node->node_index,
-		      (n_left ==
-		       frame->n_vectors ? NETMAP_TX_ERROR_PENDING_MSGS :
-		       NETMAP_TX_ERROR_NO_FREE_SLOTS), n_left);
-
-  vlib_buffer_free (vm, vlib_frame_args (frame), frame->n_vectors);
-  return frame->n_vectors;
-}
-
-static void
-netmap_set_interface_next_node (vnet_main_t * vnm, u32 hw_if_index,
-				u32 node_index)
-{
-  netmap_main_t *apm = &netmap_main;
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  netmap_if_t *nif = pool_elt_at_index (apm->interfaces, hw->dev_instance);
-
-  /* Shut off redirection */
-  if (node_index == ~0)
-    {
-      nif->per_interface_next_index = node_index;
-      return;
-    }
-
-  nif->per_interface_next_index =
-    vlib_node_add_next (vlib_get_main (), netmap_input_node.index,
-			node_index);
-}
-
-static void
-netmap_clear_hw_interface_counters (u32 instance)
-{
-  /* Nothing for now */
-}
-
-static clib_error_t *
-netmap_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
-{
-  netmap_main_t *apm = &netmap_main;
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  netmap_if_t *nif = pool_elt_at_index (apm->interfaces, hw->dev_instance);
-  u32 hw_flags;
-
-  nif->is_admin_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
-
-  if (nif->is_admin_up)
-    hw_flags = VNET_HW_INTERFACE_FLAG_LINK_UP;
-  else
-    hw_flags = 0;
-
-  vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
-
-  return 0;
-}
-
-static clib_error_t *
-netmap_subif_add_del_function (vnet_main_t * vnm,
-			       u32 hw_if_index,
-			       struct vnet_sw_interface_t *st, int is_add)
-{
-  /* Nothing for now */
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (netmap_device_class) = {
-  .name = "netmap",
-  .tx_function = netmap_interface_tx,
-  .format_device_name = format_netmap_device_name,
-  .format_device = format_netmap_device,
-  .format_tx_trace = format_netmap_tx_trace,
-  .tx_function_n_errors = NETMAP_TX_N_ERROR,
-  .tx_function_error_strings = netmap_tx_func_error_strings,
-  .rx_redirect_to_node = netmap_set_interface_next_node,
-  .clear_counters = netmap_clear_hw_interface_counters,
-  .admin_up_down_function = netmap_interface_admin_up_down,
-  .subif_add_del_function = netmap_subif_add_del_function,
-};
-
-VLIB_DEVICE_TX_FUNCTION_MULTIARCH(netmap_device_class,
-				  netmap_interface_tx)
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/netmap/net_netmap.h b/vnet/vnet/devices/netmap/net_netmap.h
deleted file mode 100644
index fd4253b7..00000000
--- a/vnet/vnet/devices/netmap/net_netmap.h
+++ /dev/null
@@ -1,650 +0,0 @@
-/*
- * Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``S IS''AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * $FreeBSD: head/sys/net/netmap.h 251139 2013-05-30 14:07:14Z luigi $
- *
- * Definitions of constants and the structures used by the netmap
- * framework, for the part visible to both kernel and userspace.
- * Detailed info on netmap is available with "man netmap" or at
- *
- *	http://info.iet.unipi.it/~luigi/netmap/
- *
- * This API is also used to communicate with the VALE software switch
- */
-
-#ifndef _NET_NETMAP_H_
-#define _NET_NETMAP_H_
-
-#define	NETMAP_API	11		/* current API version */
-
-#define	NETMAP_MIN_API	11		/* min and max versions accepted */
-#define	NETMAP_MAX_API	15
-/*
- * Some fields should be cache-aligned to reduce contention.
- * The alignment is architecture and OS dependent, but rather than
- * digging into OS headers to find the exact value we use an estimate
- * that should cover most architectures.
- */
-#define NM_CACHE_ALIGN	128
-
-/*
- * --- Netmap data structures ---
- *
- * The userspace data structures used by netmap are shown below.
- * They are allocated by the kernel and mmap()ed by userspace threads.
- * Pointers are implemented as memory offsets or indexes,
- * so that they can be easily dereferenced in kernel and userspace.
-
-   KERNEL (opaque, obviously)
-
-  ====================================================================
-                                         |
-   USERSPACE                             |      struct netmap_ring
-                                         +---->+---------------+
-                                             / | head,cur,tail |
-   struct netmap_if (nifp, 1 per fd)        /  | buf_ofs       |
-    +---------------+                      /   | other fields  |
-    | ni_tx_rings   |                     /    +===============+
-    | ni_rx_rings   |                    /     | buf_idx, len  | slot[0]
-    |               |                   /      | flags, ptr    |
-    |               |                  /       +---------------+
-    +===============+                 /        | buf_idx, len  | slot[1]
-    | txring_ofs[0] | (rel.to nifp)--'         | flags, ptr    |
-    | txring_ofs[1] |                          +---------------+
-     (tx+1 entries)                           (num_slots entries)
-    | txring_ofs[t] |                          | buf_idx, len  | slot[n-1]
-    +---------------+                          | flags, ptr    |
-    | rxring_ofs[0] |                          +---------------+
-    | rxring_ofs[1] |
-     (rx+1 entries)
-    | rxring_ofs[r] |
-    +---------------+
-
- * For each "interface" (NIC, host stack, PIPE, VALE switch port) bound to
- * a file descriptor, the mmap()ed region contains a (logically readonly)
- * struct netmap_if pointing to struct netmap_ring's.
- *
- * There is one netmap_ring per physical NIC ring, plus one tx/rx ring
- * pair attached to the host stack (this pair is unused for non-NIC ports).
- *
- * All physical/host stack ports share the same memory region,
- * so that zero-copy can be implemented between them.
- * VALE switch ports instead have separate memory regions.
- *
- * The netmap_ring is the userspace-visible replica of the NIC ring.
- * Each slot has the index of a buffer (MTU-sized and residing in the
- * mmapped region), its length and some flags. An extra 64-bit pointer
- * is provided for user-supplied buffers in the tx path.
- *
- * In user space, the buffer address is computed as
- *	(char *)ring + buf_ofs + index * NETMAP_BUF_SIZE
- *
- * Added in NETMAP_API 11:
- *
- * + NIOCREGIF can request the allocation of extra spare buffers from
- *   the same memory pool. The desired number of buffers must be in
- *   nr_arg3. The ioctl may return fewer buffers, depending on memory
- *   availability. nr_arg3 will return the actual value, and, once
- *   mapped, nifp->ni_bufs_head will be the index of the first buffer.
- *
- *   The buffers are linked to each other using the first uint32_t
- *   as the index. On close, ni_bufs_head must point to the list of
- *   buffers to be released.
- *
- * + NIOCREGIF can request space for extra rings (and buffers)
- *   allocated in the same memory space. The number of extra rings
- *   is in nr_arg1, and is advisory. This is a no-op on NICs where
- *   the size of the memory space is fixed.
- *
- * + NIOCREGIF can attach to PIPE rings sharing the same memory
- *   space with a parent device. The ifname indicates the parent device,
- *   which must already exist. Flags in nr_flags indicate if we want to
- *   bind the master or slave side, the index (from nr_ringid)
- *   is just a cookie and does not need to be sequential.
- *
- * + NIOCREGIF can also attach to 'monitor' rings that replicate
- *   the content of specific rings, also from the same memory space.
- *
- *   Extra flags in nr_flags support the above functions.
- *   Application libraries may use the following naming scheme:
- *	netmap:foo			all NIC ring pairs
- *	netmap:foo^			only host ring pair
- *	netmap:foo+			all NIC ring + host ring pairs
- *	netmap:foo-k			the k-th NIC ring pair
- *	netmap:foo{k			PIPE ring pair k, master side
- *	netmap:foo}k			PIPE ring pair k, slave side
- */
-
-/*
- * struct netmap_slot is a buffer descriptor
- */
-struct netmap_slot {
-	uint32_t buf_idx;	/* buffer index */
-	uint16_t len;		/* length for this slot */
-	uint16_t flags;		/* buf changed, etc. */
-	uint64_t ptr;		/* pointer for indirect buffers */
-};
-
-/*
- * The following flags control how the slot is used
- */
-
-#define	NS_BUF_CHANGED	0x0001	/* buf_idx changed */
-	/*
-	 * must be set whenever buf_idx is changed (as it might be
-	 * necessary to recompute the physical address and mapping)
-	 *
-	 * It is also set by the kernel whenever the buf_idx is
-	 * changed internally (e.g., by pipes). Applications may
-	 * use this information to know when they can reuse the
-	 * contents of previously prepared buffers.
-	 */
-
-#define	NS_REPORT	0x0002	/* ask the hardware to report results */
-	/*
-	 * Request notification when slot is used by the hardware.
-	 * Normally transmit completions are handled lazily and
-	 * may be unreported. This flag lets us know when a slot
-	 * has been sent (e.g. to terminate the sender).
-	 */
-
-#define	NS_FORWARD	0x0004	/* pass packet 'forward' */
-	/*
-	 * (Only for physical ports, rx rings with NR_FORWARD set).
-	 * Slot released to the kernel (i.e. before ring->head) with
-	 * this flag set are passed to the peer ring (host/NIC),
-	 * thus restoring the host-NIC connection for these slots.
-	 * This supports efficient traffic monitoring or firewalling.
-	 */
-
-#define	NS_NO_LEARN	0x0008	/* disable bridge learning */
- 	/*
-	 * On a VALE switch, do not 'learn' the source port for
- 	 * this buffer.
-	 */
-
-#define	NS_INDIRECT	0x0010	/* userspace buffer */
- 	/*
-	 * (VALE tx rings only) data is in a userspace buffer,
-	 * whose address is in the 'ptr' field in the slot.
-	 */
-
-#define	NS_MOREFRAG	0x0020	/* packet has more fragments */
- 	/*
-	 * (VALE ports only)
-	 * Set on all but the last slot of a multi-segment packet.
-	 * The 'len' field refers to the individual fragment.
-	 */
-
-#define	NS_PORT_SHIFT	8
-#define	NS_PORT_MASK	(0xff << NS_PORT_SHIFT)
-	/*
- 	 * The high 8 bits of the flag, if not zero, indicate the
-	 * destination port for the VALE switch, overriding
- 	 * the lookup table.
- 	 */
-
-#define	NS_RFRAGS(_slot)	( ((_slot)->flags >> 8) & 0xff)
-	/*
-	 * (VALE rx rings only) the high 8 bits
-	 *  are the number of fragments.
-	 */
-
-
-/*
- * struct netmap_ring
- *
- * Netmap representation of a TX or RX ring (also known as "queue").
- * This is a queue implemented as a fixed-size circular array.
- * At the software level the important fields are: head, cur, tail.
- *
- * In TX rings:
- *
- *	head	first slot available for transmission.
- *	cur	wakeup point. select() and poll() will unblock
- *		when 'tail' moves past 'cur'
- *	tail	(readonly) first slot reserved to the kernel
- *
- *	[head .. tail-1] can be used for new packets to send;
- *	'head' and 'cur' must be incremented as slots are filled
- *	    with new packets to be sent;
- *	'cur' can be moved further ahead if we need more space
- *	for new transmissions. XXX todo (2014-03-12)
- *
- * In RX rings:
- *
- *	head	first valid received packet
- *	cur	wakeup point. select() and poll() will unblock
- *		when 'tail' moves past 'cur'
- *	tail	(readonly) first slot reserved to the kernel
- *
- *	[head .. tail-1] contain received packets;
- *	'head' and 'cur' must be incremented as slots are consumed
- *		and can be returned to the kernel;
- *	'cur' can be moved further ahead if we want to wait for
- *		new packets without returning the previous ones.
- *
- * DATA OWNERSHIP/LOCKING:
- *	The netmap_ring, and all slots and buffers in the range
- *	[head .. tail-1] are owned by the user program;
- *	the kernel only accesses them during a netmap system call
- *	and in the user thread context.
- *
- *	Other slots and buffers are reserved for use by the kernel
- */
-struct netmap_ring {
-	/*
-	 * buf_ofs is meant to be used through macros.
-	 * It contains the offset of the buffer region from this
-	 * descriptor.
-	 */
-	const int64_t	buf_ofs;
-	const uint32_t	num_slots;	/* number of slots in the ring. */
-	const uint32_t	nr_buf_size;
-	const uint16_t	ringid;
-	const uint16_t	dir;		/* 0: tx, 1: rx */
-
-	uint32_t        head;		/* (u) first user slot */
-	uint32_t        cur;		/* (u) wakeup point */
-	uint32_t	tail;		/* (k) first kernel slot */
-
-	uint32_t	flags;
-
-	struct timeval	ts;		/* (k) time of last *sync() */
-
-	/* opaque room for a mutex or similar object */
-#if !defined(_WIN32) || defined(__CYGWIN__)
-	uint8_t	__attribute__((__aligned__(NM_CACHE_ALIGN))) sem[128];
-#else
-	uint8_t	__declspec(align(NM_CACHE_ALIGN)) sem[128];
-#endif
-
-	/* the slots follow. This struct has variable size */
-	struct netmap_slot slot[0];	/* array of slots. */
-};
-
-
-/*
- * RING FLAGS
- */
-#define	NR_TIMESTAMP	0x0002		/* set timestamp on *sync() */
-	/*
-	 * updates the 'ts' field on each netmap syscall. This saves
-	 * saves a separate gettimeofday(), and is not much worse than
-	 * software timestamps generated in the interrupt handler.
-	 */
-
-#define	NR_FORWARD	0x0004		/* enable NS_FORWARD for ring */
- 	/*
-	 * Enables the NS_FORWARD slot flag for the ring.
-	 */
-
-
-/*
- * Netmap representation of an interface and its queue(s).
- * This is initialized by the kernel when binding a file
- * descriptor to a port, and should be considered as readonly
- * by user programs. The kernel never uses it.
- *
- * There is one netmap_if for each file descriptor on which we want
- * to select/poll.
- * select/poll operates on one or all pairs depending on the value of
- * nmr_queueid passed on the ioctl.
- */
-struct netmap_if {
-	char		ni_name[IFNAMSIZ]; /* name of the interface. */
-	const uint32_t	ni_version;	/* API version, currently unused */
-	const uint32_t	ni_flags;	/* properties */
-#define	NI_PRIV_MEM	0x1		/* private memory region */
-
-	/*
-	 * The number of packet rings available in netmap mode.
-	 * Physical NICs can have different numbers of tx and rx rings.
-	 * Physical NICs also have a 'host' ring pair.
-	 * Additionally, clients can request additional ring pairs to
-	 * be used for internal communication.
-	 */
-	const uint32_t	ni_tx_rings;	/* number of HW tx rings */
-	const uint32_t	ni_rx_rings;	/* number of HW rx rings */
-
-	uint32_t	ni_bufs_head;	/* head index for extra bufs */
-	uint32_t	ni_spare1[5];
-	/*
-	 * The following array contains the offset of each netmap ring
-	 * from this structure, in the following order:
-	 * NIC tx rings (ni_tx_rings); host tx ring (1); extra tx rings;
-	 * NIC rx rings (ni_rx_rings); host tx ring (1); extra rx rings.
-	 *
-	 * The area is filled up by the kernel on NIOCREGIF,
-	 * and then only read by userspace code.
-	 */
-	const ssize_t	ring_ofs[0];
-};
-
-
-#ifndef NIOCREGIF
-/*
- * ioctl names and related fields
- *
- * NIOCTXSYNC, NIOCRXSYNC synchronize tx or rx queues,
- *	whose identity is set in NIOCREGIF through nr_ringid.
- *	These are non blocking and take no argument.
- *
- * NIOCGINFO takes a struct ifreq, the interface name is the input,
- *	the outputs are number of queues and number of descriptor
- *	for each queue (useful to set number of threads etc.).
- *	The info returned is only advisory and may change before
- *	the interface is bound to a file descriptor.
- *
- * NIOCREGIF takes an interface name within a struct nmre,
- *	and activates netmap mode on the interface (if possible).
- *
- * The argument to NIOCGINFO/NIOCREGIF overlays struct ifreq so we
- * can pass it down to other NIC-related ioctls.
- *
- * The actual argument (struct nmreq) has a number of options to request
- * different functions.
- * The following are used in NIOCREGIF when nr_cmd == 0:
- *
- * nr_name	(in)
- *	The name of the port (em0, valeXXX:YYY, etc.)
- *	limited to IFNAMSIZ for backward compatibility.
- *
- * nr_version	(in/out)
- *	Must match NETMAP_API as used in the kernel, error otherwise.
- *	Always returns the desired value on output.
- *
- * nr_tx_slots, nr_tx_slots, nr_tx_rings, nr_rx_rings (in/out)
- *	On input, non-zero values may be used to reconfigure the port
- *	according to the requested values, but this is not guaranteed.
- *	On output the actual values in use are reported.
- *
- * nr_ringid (in)
- *	Indicates how rings should be bound to the file descriptors.
- *	If nr_flags != 0, then the low bits (in NETMAP_RING_MASK)
- *	are used to indicate the ring number, and nr_flags specifies
- *	the actual rings to bind. NETMAP_NO_TX_POLL is unaffected.
- *
- *	NOTE: THE FOLLOWING (nr_flags == 0) IS DEPRECATED:
- *	If nr_flags == 0, NETMAP_HW_RING and NETMAP_SW_RING control
- *	the binding as follows:
- *	0 (default)			binds all physical rings
- *	NETMAP_HW_RING | ring number	binds a single ring pair
- *	NETMAP_SW_RING			binds only the host tx/rx rings
- *
- *	NETMAP_NO_TX_POLL can be OR-ed to make select()/poll() push
- *		packets on tx rings only if POLLOUT is set.
- *		The default is to push any pending packet.
- *
- *	NETMAP_DO_RX_POLL can be OR-ed to make select()/poll() release
- *		packets on rx rings also when POLLIN is NOT set.
- *		The default is to touch the rx ring only with POLLIN.
- *		Note that this is the opposite of TX because it
- *		reflects the common usage.
- *
- *	NOTE: NETMAP_PRIV_MEM IS DEPRECATED, use nr_arg2 instead.
- *	NETMAP_PRIV_MEM is set on return for ports that do not use
- *		the global memory allocator.
- *		This information is not significant and applications
- *		should look at the region id in nr_arg2
- *
- * nr_flags	is the recommended mode to indicate which rings should
- *		be bound to a file descriptor. Values are NR_REG_*
- *
- * nr_arg1 (in)	The number of extra rings to be reserved.
- *		Especially when allocating a VALE port the system only
- *		allocates the amount of memory needed for the port.
- *		If more shared memory rings are desired (e.g. for pipes),
- *		the first invocation for the same basename/allocator
- *		should specify a suitable number. Memory cannot be
- *		extended after the first allocation without closing
- *		all ports on the same region.
- *
- * nr_arg2 (in/out) The identity of the memory region used.
- *		On input, 0 means the system decides autonomously,
- *		other values may try to select a specific region.
- *		On return the actual value is reported.
- *		Region '1' is the global allocator, normally shared
- *		by all interfaces. Other values are private regions.
- *		If two ports the same region zero-copy is possible.
- *
- * nr_arg3 (in/out)	number of extra buffers to be allocated.
- *
- *
- *
- * nr_cmd (in)	if non-zero indicates a special command:
- *	NETMAP_BDG_ATTACH	 and nr_name = vale*:ifname
- *		attaches the NIC to the switch; nr_ringid specifies
- *		which rings to use. Used by vale-ctl -a ...
- *	    nr_arg1 = NETMAP_BDG_HOST also attaches the host port
- *		as in vale-ctl -h ...
- *
- *	NETMAP_BDG_DETACH	and nr_name = vale*:ifname
- *		disconnects a previously attached NIC.
- *		Used by vale-ctl -d ...
- *
- *	NETMAP_BDG_LIST
- *		list the configuration of VALE switches.
- *
- *	NETMAP_BDG_VNET_HDR
- *		Set the virtio-net header length used by the client
- *		of a VALE switch port.
- *
- *	NETMAP_BDG_NEWIF
- *		create a persistent VALE port with name nr_name.
- *		Used by vale-ctl -n ...
- *
- *	NETMAP_BDG_DELIF
- *		delete a persistent VALE port. Used by vale-ctl -d ...
- *
- * nr_arg1, nr_arg2, nr_arg3  (in/out)		command specific
- *
- *
- *
- */
-
-
-/*
- * struct nmreq overlays a struct ifreq (just the name)
- */
-struct nmreq {
-	char		nr_name[IFNAMSIZ];
-	uint32_t	nr_version;	/* API version */
-	uint32_t	nr_offset;	/* nifp offset in the shared region */
-	uint32_t	nr_memsize;	/* size of the shared region */
-	uint32_t	nr_tx_slots;	/* slots in tx rings */
-	uint32_t	nr_rx_slots;	/* slots in rx rings */
-	uint16_t	nr_tx_rings;	/* number of tx rings */
-	uint16_t	nr_rx_rings;	/* number of rx rings */
-
-	uint16_t	nr_ringid;	/* ring(s) we care about */
-#define NETMAP_HW_RING		0x4000	/* single NIC ring pair */
-#define NETMAP_SW_RING		0x2000	/* only host ring pair */
-
-#define NETMAP_RING_MASK	0x0fff	/* the ring number */
-
-#define NETMAP_NO_TX_POLL	0x1000	/* no automatic txsync on poll */
-
-#define NETMAP_DO_RX_POLL	0x8000	/* DO automatic rxsync on poll */
-
-	uint16_t	nr_cmd;
-#define NETMAP_BDG_ATTACH	1	/* attach the NIC */
-#define NETMAP_BDG_DETACH	2	/* detach the NIC */
-#define NETMAP_BDG_REGOPS	3	/* register bridge callbacks */
-#define NETMAP_BDG_LIST		4	/* get bridge's info */
-#define NETMAP_BDG_VNET_HDR     5       /* set the port virtio-net-hdr length */
-#define NETMAP_BDG_OFFSET	NETMAP_BDG_VNET_HDR	/* deprecated alias */
-#define NETMAP_BDG_NEWIF	6	/* create a virtual port */
-#define NETMAP_BDG_DELIF	7	/* destroy a virtual port */
-#define NETMAP_PT_HOST_CREATE	8	/* create ptnetmap kthreads */
-#define NETMAP_PT_HOST_DELETE	9	/* delete ptnetmap kthreads */
-#define NETMAP_BDG_POLLING_ON	10	/* delete polling kthread */
-#define NETMAP_BDG_POLLING_OFF	11	/* delete polling kthread */
-#define NETMAP_VNET_HDR_GET	12      /* get the port virtio-net-hdr length */
-	uint16_t	nr_arg1;	/* reserve extra rings in NIOCREGIF */
-#define NETMAP_BDG_HOST		1	/* attach the host stack on ATTACH */
-
-	uint16_t	nr_arg2;
-	uint32_t	nr_arg3;	/* req. extra buffers in NIOCREGIF */
-	uint32_t	nr_flags;
-	/* various modes, extends nr_ringid */
-	uint32_t	spare2[1];
-};
-
-#define NR_REG_MASK		0xf /* values for nr_flags */
-enum {	NR_REG_DEFAULT	= 0,	/* backward compat, should not be used. */
-	NR_REG_ALL_NIC	= 1,
-	NR_REG_SW	= 2,
-	NR_REG_NIC_SW	= 3,
-	NR_REG_ONE_NIC	= 4,
-	NR_REG_PIPE_MASTER = 5,
-	NR_REG_PIPE_SLAVE = 6,
-};
-/* monitor uses the NR_REG to select the rings to monitor */
-#define NR_MONITOR_TX	0x100
-#define NR_MONITOR_RX	0x200
-#define NR_ZCOPY_MON	0x400
-/* request exclusive access to the selected rings */
-#define NR_EXCLUSIVE	0x800
-/* request ptnetmap host support */
-#define NR_PASSTHROUGH_HOST	NR_PTNETMAP_HOST /* deprecated */
-#define NR_PTNETMAP_HOST	0x1000
-#define NR_RX_RINGS_ONLY	0x2000
-#define NR_TX_RINGS_ONLY	0x4000
-/* Applications set this flag if they are able to deal with virtio-net headers,
- * that is send/receive frames that start with a virtio-net header.
- * If not set, NIOCREGIF will fail with netmap ports that require applications
- * to use those headers. If the flag is set, the application can use the
- * NETMAP_VNET_HDR_GET command to figure out the header length. */
-#define NR_ACCEPT_VNET_HDR	0x8000
-
-
-/*
- * Windows does not have _IOWR(). _IO(), _IOW() and _IOR() are defined
- * in ws2def.h but not sure if they are in the form we need.
- * XXX so we redefine them
- * in a convenient way to use for DeviceIoControl signatures
- */
-#ifdef _WIN32
-#undef _IO	// ws2def.h
-#define _WIN_NM_IOCTL_TYPE 40000
-#define _IO(_c, _n)	CTL_CODE(_WIN_NM_IOCTL_TYPE, ((_n) + 0x800) , \
-		METHOD_BUFFERED, FILE_ANY_ACCESS  )
-#define _IO_direct(_c, _n)	CTL_CODE(_WIN_NM_IOCTL_TYPE, ((_n) + 0x800) , \
-		METHOD_OUT_DIRECT, FILE_ANY_ACCESS  )
-
-#define _IOWR(_c, _n, _s)	_IO(_c, _n)
-
-/* We havesome internal sysctl in addition to the externally visible ones */
-#define NETMAP_MMAP _IO_direct('i', 160)	// note METHOD_OUT_DIRECT
-#define NETMAP_POLL _IO('i', 162)
-
-/* and also two setsockopt for sysctl emulation */
-#define NETMAP_SETSOCKOPT _IO('i', 140)
-#define NETMAP_GETSOCKOPT _IO('i', 141)
-
-
-//These linknames are for the Netmap Core Driver
-#define NETMAP_NT_DEVICE_NAME			L"\\Device\\NETMAP"
-#define NETMAP_DOS_DEVICE_NAME			L"\\DosDevices\\netmap"
-
-//Definition of a structure used to pass a virtual address within an IOCTL
-typedef struct _MEMORY_ENTRY {
-	PVOID       pUsermodeVirtualAddress;
-} MEMORY_ENTRY, *PMEMORY_ENTRY;
-
-typedef struct _POLL_REQUEST_DATA {
-	int events;
-	int timeout;
-	int revents;
-} POLL_REQUEST_DATA;
-
-#endif /* _WIN32 */
-
-/*
- * FreeBSD uses the size value embedded in the _IOWR to determine
- * how much to copy in/out. So we need it to match the actual
- * data structure we pass. We put some spares in the structure
- * to ease compatibility with other versions
- */
-#define NIOCGINFO	_IOWR('i', 145, struct nmreq) /* return IF info */
-#define NIOCREGIF	_IOWR('i', 146, struct nmreq) /* interface register */
-#define NIOCTXSYNC	_IO('i', 148) /* sync tx queues */
-#define NIOCRXSYNC	_IO('i', 149) /* sync rx queues */
-#define NIOCCONFIG	_IOWR('i',150, struct nm_ifreq) /* for ext. modules */
-#endif /* !NIOCREGIF */
-
-
-/*
- * Helper functions for kernel and userspace
- */
-
-/*
- * check if space is available in the ring.
- */
-static inline int
-nm_ring_empty(struct netmap_ring *ring)
-{
-	return (ring->cur == ring->tail);
-}
-
-/*
- * Opaque structure that is passed to an external kernel
- * module via ioctl(fd, NIOCCONFIG, req) for a user-owned
- * bridge port (at this point ephemeral VALE interface).
- */
-#define NM_IFRDATA_LEN 256
-struct nm_ifreq {
-	char nifr_name[IFNAMSIZ];
-	char data[NM_IFRDATA_LEN];
-};
-
-/*
- * netmap kernel thread configuration
- */
-/* bhyve/vmm.ko MSIX parameters for IOCTL */
-struct ptn_vmm_ioctl_msix {
-	uint64_t        msg;
-	uint64_t        addr;
-};
-
-/* IOCTL parameters */
-struct nm_kth_ioctl {
-	u_long				com;
-	/* TODO: use union */
-	union {
-		struct ptn_vmm_ioctl_msix msix;
-	} data;
-};
-
-/* Configuration of a ptnetmap ring */
-struct ptnet_ring_cfg {
-	uint64_t ioeventfd;		/* eventfd in linux, tsleep() parameter in FreeBSD */
-	uint64_t irqfd;			/* eventfd in linux, ioctl fd in FreeBSD */
-	struct nm_kth_ioctl ioctl;	/* ioctl parameter to send irq (only used in bhyve/FreeBSD) */
-};
-#endif /* _NET_NETMAP_H_ */
diff --git a/vnet/vnet/devices/netmap/netmap.api b/vnet/vnet/devices/netmap/netmap.api
deleted file mode 100644
index 377ccffd..00000000
--- a/vnet/vnet/devices/netmap/netmap.api
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \brief Create netmap
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param netmap_if_name - interface name
-    @param hw_addr - interface MAC
-    @param use_random_hw_addr - use random generated MAC
-    @param is_pipe - is pipe
-    @param is_master - 0=slave, 1=master
-*/
-define netmap_create
-{
-  u32 client_index;
-  u32 context;
-
-  u8 netmap_if_name[64];
-  u8 hw_addr[6];
-  u8 use_random_hw_addr;
-  u8 is_pipe;
-  u8 is_master;
-};
-
-/** \brief Create netmap response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define netmap_create_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Delete netmap
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param netmap_if_name - interface name
-*/
-define netmap_delete
-{
-  u32 client_index;
-  u32 context;
-
-  u8 netmap_if_name[64];
-};
-
-/** \brief Delete netmap response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define netmap_delete_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/netmap/netmap.c b/vnet/vnet/devices/netmap/netmap.c
deleted file mode 100644
index 3bdb442d..00000000
--- a/vnet/vnet/devices/netmap/netmap.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- *------------------------------------------------------------------
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdint.h>
-#include <net/if.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <vnet/devices/netmap/net_netmap.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/devices/netmap/netmap.h>
-
-static u32
-netmap_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi,
-			u32 flags)
-{
-  /* nothing for now */
-  return 0;
-}
-
-static clib_error_t *
-netmap_fd_read_ready (unix_file_t * uf)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  netmap_main_t *nm = &netmap_main;
-  u32 idx = uf->private_data;
-
-  nm->pending_input_bitmap =
-    clib_bitmap_set (nm->pending_input_bitmap, idx, 1);
-
-  /* Schedule the rx node */
-  vlib_node_set_interrupt_pending (vm, netmap_input_node.index);
-
-  return 0;
-}
-
-static void
-close_netmap_if (netmap_main_t * nm, netmap_if_t * nif)
-{
-  if (nif->unix_file_index != ~0)
-    {
-      unix_file_del (&unix_main, unix_main.file_pool + nif->unix_file_index);
-      nif->unix_file_index = ~0;
-    }
-  else if (nif->fd > -1)
-    close (nif->fd);
-
-  if (nif->mem_region)
-    {
-      netmap_mem_region_t *reg = &nm->mem_regions[nif->mem_region];
-      if (--reg->refcnt == 0)
-	{
-	  munmap (reg->mem, reg->region_size);
-	  reg->region_size = 0;
-	}
-    }
-
-
-  mhash_unset (&nm->if_index_by_host_if_name, nif->host_if_name,
-	       &nif->if_index);
-  vec_free (nif->host_if_name);
-  vec_free (nif->req);
-
-  memset (nif, 0, sizeof (*nif));
-  pool_put (nm->interfaces, nif);
-}
-
-int
-netmap_worker_thread_enable ()
-{
-  /* if worker threads are enabled, switch to polling mode */
-  foreach_vlib_main ((
-		       {
-		       vlib_node_set_state (this_vlib_main,
-					    netmap_input_node.index,
-					    VLIB_NODE_STATE_POLLING);
-		       }));
-
-  return 0;
-}
-
-int
-netmap_worker_thread_disable ()
-{
-  foreach_vlib_main ((
-		       {
-		       vlib_node_set_state (this_vlib_main,
-					    netmap_input_node.index,
-					    VLIB_NODE_STATE_INTERRUPT);
-		       }));
-
-  return 0;
-}
-
-int
-netmap_create_if (vlib_main_t * vm, u8 * if_name, u8 * hw_addr_set,
-		  u8 is_pipe, u8 is_master, u32 * sw_if_index)
-{
-  netmap_main_t *nm = &netmap_main;
-  int ret = 0;
-  netmap_if_t *nif = 0;
-  u8 hw_addr[6];
-  clib_error_t *error = 0;
-  vnet_sw_interface_t *sw;
-  vnet_main_t *vnm = vnet_get_main ();
-  uword *p;
-  struct nmreq *req = 0;
-  netmap_mem_region_t *reg;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  int fd;
-
-  p = mhash_get (&nm->if_index_by_host_if_name, if_name);
-  if (p)
-    return VNET_API_ERROR_SUBIF_ALREADY_EXISTS;
-
-  fd = open ("/dev/netmap", O_RDWR);
-  if (fd < 0)
-    return VNET_API_ERROR_SUBIF_ALREADY_EXISTS;
-
-  pool_get (nm->interfaces, nif);
-  nif->if_index = nif - nm->interfaces;
-  nif->fd = fd;
-  nif->unix_file_index = ~0;
-
-  vec_validate (req, 0);
-  nif->req = req;
-  req->nr_version = NETMAP_API;
-  req->nr_flags = NR_REG_ALL_NIC;
-
-  if (is_pipe)
-    req->nr_flags = is_master ? NR_REG_PIPE_MASTER : NR_REG_PIPE_SLAVE;
-  else
-    req->nr_flags = NR_REG_ALL_NIC;
-
-  req->nr_flags |= NR_ACCEPT_VNET_HDR;
-  snprintf (req->nr_name, IFNAMSIZ, "%s", if_name);
-  req->nr_name[IFNAMSIZ - 1] = 0;
-
-  if (ioctl (nif->fd, NIOCREGIF, req))
-    {
-      ret = VNET_API_ERROR_NOT_CONNECTED;
-      goto error;
-    }
-
-  nif->mem_region = req->nr_arg2;
-  vec_validate (nm->mem_regions, nif->mem_region);
-  reg = &nm->mem_regions[nif->mem_region];
-  if (reg->region_size == 0)
-    {
-      reg->mem = mmap (NULL, req->nr_memsize, PROT_READ | PROT_WRITE,
-		       MAP_SHARED, fd, 0);
-      clib_warning ("mem %p", reg->mem);
-      if (reg->mem == MAP_FAILED)
-	{
-	  ret = VNET_API_ERROR_NOT_CONNECTED;
-	  goto error;
-	}
-      reg->region_size = req->nr_memsize;
-    }
-  reg->refcnt++;
-
-  nif->nifp = NETMAP_IF (reg->mem, req->nr_offset);
-  nif->first_rx_ring = 0;
-  nif->last_rx_ring = 0;
-  nif->first_tx_ring = 0;
-  nif->last_tx_ring = 0;
-  nif->host_if_name = if_name;
-  nif->per_interface_next_index = ~0;
-
-  if (tm->n_vlib_mains > 1)
-    {
-      nif->lockp = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
-					   CLIB_CACHE_LINE_BYTES);
-      memset ((void *) nif->lockp, 0, CLIB_CACHE_LINE_BYTES);
-    }
-
-  {
-    unix_file_t template = { 0 };
-    template.read_function = netmap_fd_read_ready;
-    template.file_descriptor = nif->fd;
-    template.private_data = nif->if_index;
-    nif->unix_file_index = unix_file_add (&unix_main, &template);
-  }
-
-  /*use configured or generate random MAC address */
-  if (hw_addr_set)
-    memcpy (hw_addr, hw_addr_set, 6);
-  else
-    {
-      f64 now = vlib_time_now (vm);
-      u32 rnd;
-      rnd = (u32) (now * 1e6);
-      rnd = random_u32 (&rnd);
-
-      memcpy (hw_addr + 2, &rnd, sizeof (rnd));
-      hw_addr[0] = 2;
-      hw_addr[1] = 0xfe;
-    }
-
-  error = ethernet_register_interface (vnm, netmap_device_class.index,
-				       nif->if_index, hw_addr,
-				       &nif->hw_if_index,
-				       netmap_eth_flag_change);
-
-  if (error)
-    {
-      clib_error_report (error);
-      ret = VNET_API_ERROR_SYSCALL_ERROR_1;
-      goto error;
-    }
-
-  sw = vnet_get_hw_sw_interface (vnm, nif->hw_if_index);
-  nif->sw_if_index = sw->sw_if_index;
-
-  mhash_set_mem (&nm->if_index_by_host_if_name, if_name, &nif->if_index, 0);
-
-  if (sw_if_index)
-    *sw_if_index = nif->sw_if_index;
-
-  if (tm->n_vlib_mains > 1 && pool_elts (nm->interfaces) == 1)
-    netmap_worker_thread_enable ();
-
-  return 0;
-
-error:
-  close_netmap_if (nm, nif);
-  return ret;
-}
-
-int
-netmap_delete_if (vlib_main_t * vm, u8 * host_if_name)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  netmap_main_t *nm = &netmap_main;
-  netmap_if_t *nif;
-  uword *p;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-
-  p = mhash_get (&nm->if_index_by_host_if_name, host_if_name);
-  if (p == NULL)
-    {
-      clib_warning ("Host interface %s does not exist", host_if_name);
-      return VNET_API_ERROR_SYSCALL_ERROR_1;
-    }
-  nif = pool_elt_at_index (nm->interfaces, p[0]);
-
-  /* bring down the interface */
-  vnet_hw_interface_set_flags (vnm, nif->hw_if_index, 0);
-
-  ethernet_delete_interface (vnm, nif->hw_if_index);
-
-  close_netmap_if (nm, nif);
-
-  if (tm->n_vlib_mains > 1 && pool_elts (nm->interfaces) == 0)
-    netmap_worker_thread_disable ();
-
-  return 0;
-}
-
-static clib_error_t *
-netmap_init (vlib_main_t * vm)
-{
-  netmap_main_t *nm = &netmap_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  vlib_thread_registration_t *tr;
-  uword *p;
-
-  memset (nm, 0, sizeof (netmap_main_t));
-
-  nm->input_cpu_first_index = 0;
-  nm->input_cpu_count = 1;
-
-  /* find out which cpus will be used for input */
-  p = hash_get_mem (tm->thread_registrations_by_name, "workers");
-  tr = p ? (vlib_thread_registration_t *) p[0] : 0;
-
-  if (tr && tr->count > 0)
-    {
-      nm->input_cpu_first_index = tr->first_index;
-      nm->input_cpu_count = tr->count;
-    }
-
-  mhash_init_vec_string (&nm->if_index_by_host_if_name, sizeof (uword));
-
-  vec_validate_aligned (nm->rx_buffers, tm->n_vlib_mains - 1,
-			CLIB_CACHE_LINE_BYTES);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (netmap_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/netmap/netmap.h b/vnet/vnet/devices/netmap/netmap.h
deleted file mode 100644
index 39a94043..00000000
--- a/vnet/vnet/devices/netmap/netmap.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- *------------------------------------------------------------------
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-/*
- * Copyright (C) 2011-2014 Universita` di Pisa. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  volatile u32 *lockp;
-  u8 *host_if_name;
-  uword if_index;
-  u32 hw_if_index;
-  u32 sw_if_index;
-  u32 unix_file_index;
-
-  u32 per_interface_next_index;
-  u8 is_admin_up;
-
-  /* netmap */
-  struct nmreq *req;
-  u16 mem_region;
-  int fd;
-  struct netmap_if *nifp;
-  u16 first_tx_ring;
-  u16 last_tx_ring;
-  u16 first_rx_ring;
-  u16 last_rx_ring;
-
-} netmap_if_t;
-
-typedef struct
-{
-  char *mem;
-  u32 region_size;
-  int refcnt;
-} netmap_mem_region_t;
-
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  netmap_if_t *interfaces;
-
-  /* bitmap of pending rx interfaces */
-  uword *pending_input_bitmap;
-
-  /* rx buffer cache */
-  u32 **rx_buffers;
-
-  /* hash of host interface names */
-  mhash_t if_index_by_host_if_name;
-
-  /* vector of memory regions */
-  netmap_mem_region_t *mem_regions;
-
-  /* first cpu index */
-  u32 input_cpu_first_index;
-
-  /* total cpu count */
-  u32 input_cpu_count;
-} netmap_main_t;
-
-netmap_main_t netmap_main;
-extern vnet_device_class_t netmap_device_class;
-extern vlib_node_registration_t netmap_input_node;
-
-int netmap_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set,
-		      u8 is_pipe, u8 is_master, u32 * sw_if_index);
-int netmap_delete_if (vlib_main_t * vm, u8 * host_if_name);
-
-
-/* Macros and helper functions from sys/net/netmap_user.h */
-
-#ifdef _NET_NETMAP_H_
-
-#define _NETMAP_OFFSET(type, ptr, offset) \
-	((type)(void *)((char *)(ptr) + (offset)))
-
-#define NETMAP_IF(_base, _ofs)	_NETMAP_OFFSET(struct netmap_if *, _base, _ofs)
-
-#define NETMAP_TXRING(nifp, index) _NETMAP_OFFSET(struct netmap_ring *, \
-	nifp, (nifp)->ring_ofs[index] )
-
-#define NETMAP_RXRING(nifp, index) _NETMAP_OFFSET(struct netmap_ring *,	\
-	nifp, (nifp)->ring_ofs[index + (nifp)->ni_tx_rings + 1] )
-
-#define NETMAP_BUF(ring, index)				\
-	((char *)(ring) + (ring)->buf_ofs + ((index)*(ring)->nr_buf_size))
-
-#define NETMAP_BUF_IDX(ring, buf)			\
-	( ((char *)(buf) - ((char *)(ring) + (ring)->buf_ofs) ) / \
-		(ring)->nr_buf_size )
-
-static inline uint32_t
-nm_ring_next (struct netmap_ring *ring, uint32_t i)
-{
-  return (PREDICT_FALSE (i + 1 == ring->num_slots) ? 0 : i + 1);
-}
-
-
-/*
- * Return 1 if we have pending transmissions in the tx ring.
- * When everything is complete ring->head = ring->tail + 1 (modulo ring size)
- */
-static inline int
-nm_tx_pending (struct netmap_ring *ring)
-{
-  return nm_ring_next (ring, ring->tail) != ring->head;
-}
-
-static inline uint32_t
-nm_ring_space (struct netmap_ring *ring)
-{
-  int ret = ring->tail - ring->cur;
-  if (ret < 0)
-    ret += ring->num_slots;
-  return ret;
-}
-#endif
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/netmap/netmap_api.c b/vnet/vnet/devices/netmap/netmap_api.c
deleted file mode 100644
index 9a393b1f..00000000
--- a/vnet/vnet/devices/netmap/netmap_api.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *------------------------------------------------------------------
- * netmap_api.c - netmap api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/devices/netmap/netmap.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                             \
-_(NETMAP_CREATE, netmap_create)                                         \
-_(NETMAP_DELETE, netmap_delete)                                         \
-
-static void
-vl_api_netmap_create_t_handler (vl_api_netmap_create_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_netmap_create_reply_t *rmp;
-  int rv = 0;
-  u8 *if_name = NULL;
-
-  if_name = format (0, "%s", mp->netmap_if_name);
-  vec_add1 (if_name, 0);
-
-  rv =
-    netmap_create_if (vm, if_name, mp->use_random_hw_addr ? 0 : mp->hw_addr,
-		      mp->is_pipe, mp->is_master, 0);
-
-  vec_free (if_name);
-
-  REPLY_MACRO (VL_API_NETMAP_CREATE_REPLY);
-}
-
-static void
-vl_api_netmap_delete_t_handler (vl_api_netmap_delete_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_netmap_delete_reply_t *rmp;
-  int rv = 0;
-  u8 *if_name = NULL;
-
-  if_name = format (0, "%s", mp->netmap_if_name);
-  vec_add1 (if_name, 0);
-
-  rv = netmap_delete_if (vm, if_name);
-
-  vec_free (if_name);
-
-  REPLY_MACRO (VL_API_NETMAP_DELETE_REPLY);
-}
-
-/*
- * netmap_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_netmap;
-#undef _
-}
-
-static clib_error_t *
-netmap_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (netmap_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/netmap/node.c b/vnet/vnet/devices/netmap/node.c
deleted file mode 100644
index 19895e47..00000000
--- a/vnet/vnet/devices/netmap/node.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- *------------------------------------------------------------------
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdint.h>
-#include <net/if.h>
-#include <sys/ioctl.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/devices/devices.h>
-#include <vnet/feature/feature.h>
-
-#include <vnet/devices/netmap/net_netmap.h>
-#include <vnet/devices/netmap/netmap.h>
-
-#define foreach_netmap_input_error
-
-typedef enum
-{
-#define _(f,s) NETMAP_INPUT_ERROR_##f,
-  foreach_netmap_input_error
-#undef _
-    NETMAP_INPUT_N_ERROR,
-} netmap_input_error_t;
-
-static char *netmap_input_error_strings[] = {
-#define _(n,s) s,
-  foreach_netmap_input_error
-#undef _
-};
-
-typedef struct
-{
-  u32 next_index;
-  u32 hw_if_index;
-  struct netmap_slot slot;
-} netmap_input_trace_t;
-
-static u8 *
-format_netmap_input_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  netmap_input_trace_t *t = va_arg (*args, netmap_input_trace_t *);
-  uword indent = format_get_indent (s);
-
-  s = format (s, "netmap: hw_if_index %d next-index %d",
-	      t->hw_if_index, t->next_index);
-  s = format (s, "\n%Uslot: flags 0x%x len %u buf_idx %u",
-	      format_white_space, indent + 2,
-	      t->slot.flags, t->slot.len, t->slot.buf_idx);
-  return s;
-}
-
-always_inline void
-buffer_add_to_chain (vlib_main_t * vm, u32 bi, u32 first_bi, u32 prev_bi)
-{
-  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
-  vlib_buffer_t *first_b = vlib_get_buffer (vm, first_bi);
-  vlib_buffer_t *prev_b = vlib_get_buffer (vm, prev_bi);
-
-  /* update first buffer */
-  first_b->total_length_not_including_first_buffer += b->current_length;
-
-  /* update previous buffer */
-  prev_b->next_buffer = bi;
-  prev_b->flags |= VLIB_BUFFER_NEXT_PRESENT;
-
-  /* update current buffer */
-  b->next_buffer = 0;
-}
-
-always_inline uword
-netmap_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-			vlib_frame_t * frame, netmap_if_t * nif)
-{
-  u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-  uword n_trace = vlib_get_trace_count (vm, node);
-  netmap_main_t *nm = &netmap_main;
-  u32 n_rx_packets = 0;
-  u32 n_rx_bytes = 0;
-  u32 *to_next = 0;
-  u32 n_free_bufs;
-  struct netmap_ring *ring;
-  int cur_ring;
-  u32 cpu_index = os_get_cpu_number ();
-  u32 n_buffer_bytes = vlib_buffer_free_list_buffer_size (vm,
-							  VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-
-  if (nif->per_interface_next_index != ~0)
-    next_index = nif->per_interface_next_index;
-
-  n_free_bufs = vec_len (nm->rx_buffers[cpu_index]);
-  if (PREDICT_FALSE (n_free_bufs < VLIB_FRAME_SIZE))
-    {
-      vec_validate (nm->rx_buffers[cpu_index],
-		    VLIB_FRAME_SIZE + n_free_bufs - 1);
-      n_free_bufs +=
-	vlib_buffer_alloc (vm, &nm->rx_buffers[cpu_index][n_free_bufs],
-			   VLIB_FRAME_SIZE);
-      _vec_len (nm->rx_buffers[cpu_index]) = n_free_bufs;
-    }
-
-  cur_ring = nif->first_rx_ring;
-  while (cur_ring <= nif->last_rx_ring && n_free_bufs)
-    {
-      int r = 0;
-      u32 cur_slot_index;
-      ring = NETMAP_RXRING (nif->nifp, cur_ring);
-      r = nm_ring_space (ring);
-
-      if (!r)
-	{
-	  cur_ring++;
-	  continue;
-	}
-
-      if (r > n_free_bufs)
-	r = n_free_bufs;
-
-      cur_slot_index = ring->cur;
-      while (r)
-	{
-	  u32 n_left_to_next;
-	  u32 next0 = next_index;
-	  vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-	  while (r && n_left_to_next)
-	    {
-	      vlib_buffer_t *first_b0 = 0;
-	      u32 offset = 0;
-	      u32 bi0 = 0, first_bi0 = 0, prev_bi0;
-	      u32 next_slot_index = (cur_slot_index + 1) % ring->num_slots;
-	      u32 next2_slot_index = (cur_slot_index + 2) % ring->num_slots;
-	      struct netmap_slot *slot = &ring->slot[cur_slot_index];
-	      u32 data_len = slot->len;
-
-	      /* prefetch 2 slots in advance */
-	      CLIB_PREFETCH (&ring->slot[next2_slot_index],
-			     CLIB_CACHE_LINE_BYTES, LOAD);
-	      /* prefetch start of next packet */
-	      CLIB_PREFETCH (NETMAP_BUF
-			     (ring, ring->slot[next_slot_index].buf_idx),
-			     CLIB_CACHE_LINE_BYTES, LOAD);
-
-	      while (data_len && n_free_bufs)
-		{
-		  vlib_buffer_t *b0;
-		  /* grab free buffer */
-		  u32 last_empty_buffer =
-		    vec_len (nm->rx_buffers[cpu_index]) - 1;
-		  prev_bi0 = bi0;
-		  bi0 = nm->rx_buffers[cpu_index][last_empty_buffer];
-		  b0 = vlib_get_buffer (vm, bi0);
-		  _vec_len (nm->rx_buffers[cpu_index]) = last_empty_buffer;
-		  n_free_bufs--;
-
-		  /* copy data */
-		  u32 bytes_to_copy =
-		    data_len > n_buffer_bytes ? n_buffer_bytes : data_len;
-		  b0->current_data = 0;
-		  clib_memcpy (vlib_buffer_get_current (b0),
-			       (u8 *) NETMAP_BUF (ring,
-						  slot->buf_idx) + offset,
-			       bytes_to_copy);
-
-		  /* fill buffer header */
-		  b0->current_length = bytes_to_copy;
-
-		  if (offset == 0)
-		    {
-		      b0->total_length_not_including_first_buffer = 0;
-		      b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
-		      vnet_buffer (b0)->sw_if_index[VLIB_RX] =
-			nif->sw_if_index;
-		      vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-		      first_bi0 = bi0;
-		      first_b0 = vlib_get_buffer (vm, first_bi0);
-		    }
-		  else
-		    buffer_add_to_chain (vm, bi0, first_bi0, prev_bi0);
-
-		  offset += bytes_to_copy;
-		  data_len -= bytes_to_copy;
-		}
-
-	      /* trace */
-	      VLIB_BUFFER_TRACE_TRAJECTORY_INIT (first_b0);
-	      if (PREDICT_FALSE (n_trace > 0))
-		{
-		  if (PREDICT_TRUE (first_b0 != 0))
-		    {
-		      netmap_input_trace_t *tr;
-		      vlib_trace_buffer (vm, node, next0, first_b0,
-					 /* follow_chain */ 0);
-		      vlib_set_trace_count (vm, node, --n_trace);
-		      tr = vlib_add_trace (vm, node, first_b0, sizeof (*tr));
-		      tr->next_index = next0;
-		      tr->hw_if_index = nif->hw_if_index;
-		      memcpy (&tr->slot, slot, sizeof (struct netmap_slot));
-		    }
-		}
-
-	      /* redirect if feature path enabled */
-	      vnet_feature_start_device_input_x1 (nif->sw_if_index, &next0,
-						  first_b0, 0);
-
-	      /* enque and take next packet */
-	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					       n_left_to_next, first_bi0,
-					       next0);
-
-	      /* next packet */
-	      n_rx_packets++;
-	      n_rx_bytes += slot->len;
-	      to_next[0] = first_bi0;
-	      to_next += 1;
-	      n_left_to_next--;
-	      cur_slot_index = next_slot_index;
-
-	      r--;
-	    }
-	  vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-	}
-      ring->head = ring->cur = cur_slot_index;
-      cur_ring++;
-    }
-
-  if (n_rx_packets)
-    ioctl (nif->fd, NIOCRXSYNC, NULL);
-
-  vlib_increment_combined_counter
-    (vnet_get_main ()->interface_main.combined_sw_if_counters
-     + VNET_INTERFACE_COUNTER_RX,
-     os_get_cpu_number (), nif->hw_if_index, n_rx_packets, n_rx_bytes);
-
-  return n_rx_packets;
-}
-
-static uword
-netmap_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-		 vlib_frame_t * frame)
-{
-  int i;
-  u32 n_rx_packets = 0;
-  u32 cpu_index = os_get_cpu_number ();
-  netmap_main_t *nm = &netmap_main;
-  netmap_if_t *nmi;
-
-  for (i = 0; i < vec_len (nm->interfaces); i++)
-    {
-      nmi = vec_elt_at_index (nm->interfaces, i);
-      if (nmi->is_admin_up &&
-	  (i % nm->input_cpu_count) ==
-	  (cpu_index - nm->input_cpu_first_index))
-	n_rx_packets += netmap_device_input_fn (vm, node, frame, nmi);
-    }
-
-  return n_rx_packets;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (netmap_input_node) = {
-  .function = netmap_input_fn,
-  .name = "netmap-input",
-  .sibling_of = "device-input",
-  .format_trace = format_netmap_input_trace,
-  .type = VLIB_NODE_TYPE_INPUT,
-  /* default state is INTERRUPT mode, switch to POLLING if worker threads are enabled */
-  .state = VLIB_NODE_STATE_INTERRUPT,
-  .n_errors = NETMAP_INPUT_N_ERROR,
-  .error_strings = netmap_input_error_strings,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (netmap_input_node, netmap_input_fn)
-/* *INDENT-ON* */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/nic/ixge.c b/vnet/vnet/devices/nic/ixge.c
deleted file mode 100644
index d4c4c6b7..00000000
--- a/vnet/vnet/devices/nic/ixge.c
+++ /dev/null
@@ -1,2938 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- *   WARNING!
- *   This driver is not intended for production use and it is unsupported.
- *   It is provided for educational use only.
- *   Please use supported DPDK driver instead.
- */
-
-#if __x86_64__
-#include <vppinfra/vector.h>
-
-#ifndef CLIB_HAVE_VEC128
-#warning HACK: ixge driver wont really work, missing u32x4
-typedef unsigned long long u32x4;
-#endif
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlib/pci/pci.h>
-#include <vnet/vnet.h>
-#include <vnet/devices/nic/ixge.h>
-#include <vnet/ethernet/ethernet.h>
-
-#define IXGE_ALWAYS_POLL 0
-
-#define EVENT_SET_FLAGS 0
-#define IXGE_HWBP_RACE_ELOG 0
-
-#define PCI_VENDOR_ID_INTEL 0x8086
-
-/* 10 GIG E (XGE) PHY IEEE 802.3 clause 45 definitions. */
-#define XGE_PHY_DEV_TYPE_PMA_PMD 1
-#define XGE_PHY_DEV_TYPE_PHY_XS 4
-#define XGE_PHY_ID1 0x2
-#define XGE_PHY_ID2 0x3
-#define XGE_PHY_CONTROL 0x0
-#define XGE_PHY_CONTROL_RESET (1 << 15)
-
-ixge_main_t ixge_main;
-static vlib_node_registration_t ixge_input_node;
-static vlib_node_registration_t ixge_process_node;
-
-static void
-ixge_semaphore_get (ixge_device_t * xd)
-{
-  ixge_main_t *xm = &ixge_main;
-  vlib_main_t *vm = xm->vlib_main;
-  ixge_regs_t *r = xd->regs;
-  u32 i;
-
-  i = 0;
-  while (!(r->software_semaphore & (1 << 0)))
-    {
-      if (i > 0)
-	vlib_process_suspend (vm, 100e-6);
-      i++;
-    }
-  do
-    {
-      r->software_semaphore |= 1 << 1;
-    }
-  while (!(r->software_semaphore & (1 << 1)));
-}
-
-static void
-ixge_semaphore_release (ixge_device_t * xd)
-{
-  ixge_regs_t *r = xd->regs;
-  r->software_semaphore &= ~3;
-}
-
-static void
-ixge_software_firmware_sync (ixge_device_t * xd, u32 sw_mask)
-{
-  ixge_main_t *xm = &ixge_main;
-  vlib_main_t *vm = xm->vlib_main;
-  ixge_regs_t *r = xd->regs;
-  u32 fw_mask = sw_mask << 5;
-  u32 m, done = 0;
-
-  while (!done)
-    {
-      ixge_semaphore_get (xd);
-      m = r->software_firmware_sync;
-      done = (m & fw_mask) == 0;
-      if (done)
-	r->software_firmware_sync = m | sw_mask;
-      ixge_semaphore_release (xd);
-      if (!done)
-	vlib_process_suspend (vm, 10e-3);
-    }
-}
-
-static void
-ixge_software_firmware_sync_release (ixge_device_t * xd, u32 sw_mask)
-{
-  ixge_regs_t *r = xd->regs;
-  ixge_semaphore_get (xd);
-  r->software_firmware_sync &= ~sw_mask;
-  ixge_semaphore_release (xd);
-}
-
-u32
-ixge_read_write_phy_reg (ixge_device_t * xd, u32 dev_type, u32 reg_index,
-			 u32 v, u32 is_read)
-{
-  ixge_regs_t *r = xd->regs;
-  const u32 busy_bit = 1 << 30;
-  u32 x;
-
-  ASSERT (xd->phy_index < 2);
-  ixge_software_firmware_sync (xd, 1 << (1 + xd->phy_index));
-
-  ASSERT (reg_index < (1 << 16));
-  ASSERT (dev_type < (1 << 5));
-  if (!is_read)
-    r->xge_mac.phy_data = v;
-
-  /* Address cycle. */
-  x =
-    reg_index | (dev_type << 16) | (xd->
-				    phys[xd->phy_index].mdio_address << 21);
-  r->xge_mac.phy_command = x | busy_bit;
-  /* Busy wait timed to take 28e-6 secs.  No suspend. */
-  while (r->xge_mac.phy_command & busy_bit)
-    ;
-
-  r->xge_mac.phy_command = x | ((is_read ? 2 : 1) << 26) | busy_bit;
-  while (r->xge_mac.phy_command & busy_bit)
-    ;
-
-  if (is_read)
-    v = r->xge_mac.phy_data >> 16;
-
-  ixge_software_firmware_sync_release (xd, 1 << (1 + xd->phy_index));
-
-  return v;
-}
-
-static u32
-ixge_read_phy_reg (ixge_device_t * xd, u32 dev_type, u32 reg_index)
-{
-  return ixge_read_write_phy_reg (xd, dev_type, reg_index, 0,	/* is_read */
-				  1);
-}
-
-static void
-ixge_write_phy_reg (ixge_device_t * xd, u32 dev_type, u32 reg_index, u32 v)
-{
-  (void) ixge_read_write_phy_reg (xd, dev_type, reg_index, v,	/* is_read */
-				  0);
-}
-
-static void
-ixge_i2c_put_bits (i2c_bus_t * b, int scl, int sda)
-{
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, b->private_data);
-  u32 v;
-
-  v = 0;
-  v |= (sda != 0) << 3;
-  v |= (scl != 0) << 1;
-  xd->regs->i2c_control = v;
-}
-
-static void
-ixge_i2c_get_bits (i2c_bus_t * b, int *scl, int *sda)
-{
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, b->private_data);
-  u32 v;
-
-  v = xd->regs->i2c_control;
-  *sda = (v & (1 << 2)) != 0;
-  *scl = (v & (1 << 0)) != 0;
-}
-
-static u16
-ixge_read_eeprom (ixge_device_t * xd, u32 address)
-{
-  ixge_regs_t *r = xd->regs;
-  u32 v;
-  r->eeprom_read = (( /* start bit */ (1 << 0)) | (address << 2));
-  /* Wait for done bit. */
-  while (!((v = r->eeprom_read) & (1 << 1)))
-    ;
-  return v >> 16;
-}
-
-static void
-ixge_sfp_enable_disable_laser (ixge_device_t * xd, uword enable)
-{
-  u32 tx_disable_bit = 1 << 3;
-  if (enable)
-    xd->regs->sdp_control &= ~tx_disable_bit;
-  else
-    xd->regs->sdp_control |= tx_disable_bit;
-}
-
-static void
-ixge_sfp_enable_disable_10g (ixge_device_t * xd, uword enable)
-{
-  u32 is_10g_bit = 1 << 5;
-  if (enable)
-    xd->regs->sdp_control |= is_10g_bit;
-  else
-    xd->regs->sdp_control &= ~is_10g_bit;
-}
-
-static clib_error_t *
-ixge_sfp_phy_init_from_eeprom (ixge_device_t * xd, u16 sfp_type)
-{
-  u16 a, id, reg_values_addr = 0;
-
-  a = ixge_read_eeprom (xd, 0x2b);
-  if (a == 0 || a == 0xffff)
-    return clib_error_create ("no init sequence in eeprom");
-
-  while (1)
-    {
-      id = ixge_read_eeprom (xd, ++a);
-      if (id == 0xffff)
-	break;
-      reg_values_addr = ixge_read_eeprom (xd, ++a);
-      if (id == sfp_type)
-	break;
-    }
-  if (id != sfp_type)
-    return clib_error_create ("failed to find id 0x%x", sfp_type);
-
-  ixge_software_firmware_sync (xd, 1 << 3);
-  while (1)
-    {
-      u16 v = ixge_read_eeprom (xd, ++reg_values_addr);
-      if (v == 0xffff)
-	break;
-      xd->regs->core_analog_config = v;
-    }
-  ixge_software_firmware_sync_release (xd, 1 << 3);
-
-  /* Make sure laser is off.  We'll turn on the laser when
-     the interface is brought up. */
-  ixge_sfp_enable_disable_laser (xd, /* enable */ 0);
-  ixge_sfp_enable_disable_10g (xd, /* is_10g */ 1);
-
-  return 0;
-}
-
-static void
-ixge_sfp_device_up_down (ixge_device_t * xd, uword is_up)
-{
-  u32 v;
-
-  if (is_up)
-    {
-      /* pma/pmd 10g serial SFI. */
-      xd->regs->xge_mac.auto_negotiation_control2 &= ~(3 << 16);
-      xd->regs->xge_mac.auto_negotiation_control2 |= 2 << 16;
-
-      v = xd->regs->xge_mac.auto_negotiation_control;
-      v &= ~(7 << 13);
-      v |= (0 << 13);
-      /* Restart autoneg. */
-      v |= (1 << 12);
-      xd->regs->xge_mac.auto_negotiation_control = v;
-
-      while (!(xd->regs->xge_mac.link_partner_ability[0] & 0xf0000))
-	;
-
-      v = xd->regs->xge_mac.auto_negotiation_control;
-
-      /* link mode 10g sfi serdes */
-      v &= ~(7 << 13);
-      v |= (3 << 13);
-
-      /* Restart autoneg. */
-      v |= (1 << 12);
-      xd->regs->xge_mac.auto_negotiation_control = v;
-
-      xd->regs->xge_mac.link_status;
-    }
-
-  ixge_sfp_enable_disable_laser (xd, /* enable */ is_up);
-
-  /* Give time for link partner to notice that we're up. */
-  if (is_up && vlib_in_process_context (vlib_get_main ()))
-    {
-      vlib_process_suspend (vlib_get_main (), 300e-3);
-    }
-}
-
-always_inline ixge_dma_regs_t *
-get_dma_regs (ixge_device_t * xd, vlib_rx_or_tx_t rt, u32 qi)
-{
-  ixge_regs_t *r = xd->regs;
-  ASSERT (qi < 128);
-  if (rt == VLIB_RX)
-    return qi < 64 ? &r->rx_dma0[qi] : &r->rx_dma1[qi - 64];
-  else
-    return &r->tx_dma[qi];
-}
-
-static clib_error_t *
-ixge_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
-{
-  vnet_hw_interface_t *hif = vnet_get_hw_interface (vnm, hw_if_index);
-  uword is_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, hif->dev_instance);
-  ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_RX, 0);
-
-  if (is_up)
-    {
-      xd->regs->rx_enable |= 1;
-      xd->regs->tx_dma_control |= 1;
-      dr->control |= 1 << 25;
-      while (!(dr->control & (1 << 25)))
-	;
-    }
-  else
-    {
-      xd->regs->rx_enable &= ~1;
-      xd->regs->tx_dma_control &= ~1;
-    }
-
-  ixge_sfp_device_up_down (xd, is_up);
-
-  return /* no error */ 0;
-}
-
-static void
-ixge_sfp_phy_init (ixge_device_t * xd)
-{
-  ixge_phy_t *phy = xd->phys + xd->phy_index;
-  i2c_bus_t *ib = &xd->i2c_bus;
-
-  ib->private_data = xd->device_index;
-  ib->put_bits = ixge_i2c_put_bits;
-  ib->get_bits = ixge_i2c_get_bits;
-  vlib_i2c_init (ib);
-
-  vlib_i2c_read_eeprom (ib, 0x50, 0, 128, (u8 *) & xd->sfp_eeprom);
-
-  if (vlib_i2c_bus_timed_out (ib) || !sfp_eeprom_is_valid (&xd->sfp_eeprom))
-    xd->sfp_eeprom.id = SFP_ID_unknown;
-  else
-    {
-      /* FIXME 5 => SR/LR eeprom ID. */
-      clib_error_t *e =
-	ixge_sfp_phy_init_from_eeprom (xd, 5 + xd->pci_function);
-      if (e)
-	clib_error_report (e);
-    }
-
-  phy->mdio_address = ~0;
-}
-
-static void
-ixge_phy_init (ixge_device_t * xd)
-{
-  ixge_main_t *xm = &ixge_main;
-  vlib_main_t *vm = xm->vlib_main;
-  ixge_phy_t *phy = xd->phys + xd->phy_index;
-
-  switch (xd->device_id)
-    {
-    case IXGE_82599_sfp:
-    case IXGE_82599_sfp_em:
-    case IXGE_82599_sfp_fcoe:
-      /* others? */
-      return ixge_sfp_phy_init (xd);
-
-    default:
-      break;
-    }
-
-  /* Probe address of phy. */
-  {
-    u32 i, v;
-
-    phy->mdio_address = ~0;
-    for (i = 0; i < 32; i++)
-      {
-	phy->mdio_address = i;
-	v = ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PMA_PMD, XGE_PHY_ID1);
-	if (v != 0xffff && v != 0)
-	  break;
-      }
-
-    /* No PHY found? */
-    if (i >= 32)
-      return;
-  }
-
-  phy->id =
-    ((ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PMA_PMD, XGE_PHY_ID1) << 16) |
-     ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PMA_PMD, XGE_PHY_ID2));
-
-  {
-    ELOG_TYPE_DECLARE (e) =
-    {
-    .function = (char *) __FUNCTION__,.format =
-	"ixge %d, phy id 0x%d mdio address %d",.format_args = "i4i4i4",};
-    struct
-    {
-      u32 instance, id, address;
-    } *ed;
-    ed = ELOG_DATA (&vm->elog_main, e);
-    ed->instance = xd->device_index;
-    ed->id = phy->id;
-    ed->address = phy->mdio_address;
-  }
-
-  /* Reset phy. */
-  ixge_write_phy_reg (xd, XGE_PHY_DEV_TYPE_PHY_XS, XGE_PHY_CONTROL,
-		      XGE_PHY_CONTROL_RESET);
-
-  /* Wait for self-clearning reset bit to clear. */
-  do
-    {
-      vlib_process_suspend (vm, 1e-3);
-    }
-  while (ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PHY_XS, XGE_PHY_CONTROL) &
-	 XGE_PHY_CONTROL_RESET);
-}
-
-static u8 *
-format_ixge_rx_from_hw_descriptor (u8 * s, va_list * va)
-{
-  ixge_rx_from_hw_descriptor_t *d =
-    va_arg (*va, ixge_rx_from_hw_descriptor_t *);
-  u32 s0 = d->status[0], s2 = d->status[2];
-  u32 is_ip4, is_ip6, is_ip, is_tcp, is_udp;
-  uword indent = format_get_indent (s);
-
-  s = format (s, "%s-owned",
-	      (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE) ? "sw" :
-	      "hw");
-  s =
-    format (s, ", length this descriptor %d, l3 offset %d",
-	    d->n_packet_bytes_this_descriptor,
-	    IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s0));
-  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET)
-    s = format (s, ", end-of-packet");
-
-  s = format (s, "\n%U", format_white_space, indent);
-
-  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_ETHERNET_ERROR)
-    s = format (s, "layer2 error");
-
-  if (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_LAYER2)
-    {
-      s = format (s, "layer 2 type %d", (s0 & 0x1f));
-      return s;
-    }
-
-  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_VLAN)
-    s = format (s, "vlan header 0x%x\n%U", d->vlan_tag,
-		format_white_space, indent);
-
-  if ((is_ip4 = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4)))
-    {
-      s = format (s, "ip4%s",
-		  (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4_EXT) ? " options" :
-		  "");
-      if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED)
-	s = format (s, " checksum %s",
-		    (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR) ?
-		    "bad" : "ok");
-    }
-  if ((is_ip6 = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6)))
-    s = format (s, "ip6%s",
-		(s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6_EXT) ? " extended" :
-		"");
-  is_tcp = is_udp = 0;
-  if ((is_ip = (is_ip4 | is_ip6)))
-    {
-      is_tcp = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_TCP) != 0;
-      is_udp = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_UDP) != 0;
-      if (is_tcp)
-	s = format (s, ", tcp");
-      if (is_udp)
-	s = format (s, ", udp");
-    }
-
-  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED)
-    s = format (s, ", tcp checksum %s",
-		(s2 & IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR) ? "bad" :
-		"ok");
-  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED)
-    s = format (s, ", udp checksum %s",
-		(s2 & IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR) ? "bad" :
-		"ok");
-
-  return s;
-}
-
-static u8 *
-format_ixge_tx_descriptor (u8 * s, va_list * va)
-{
-  ixge_tx_descriptor_t *d = va_arg (*va, ixge_tx_descriptor_t *);
-  u32 s0 = d->status0, s1 = d->status1;
-  uword indent = format_get_indent (s);
-  u32 v;
-
-  s = format (s, "buffer 0x%Lx, %d packet bytes, %d bytes this buffer",
-	      d->buffer_address, s1 >> 14, d->n_bytes_this_buffer);
-
-  s = format (s, "\n%U", format_white_space, indent);
-
-  if ((v = (s0 >> 0) & 3))
-    s = format (s, "reserved 0x%x, ", v);
-
-  if ((v = (s0 >> 2) & 3))
-    s = format (s, "mac 0x%x, ", v);
-
-  if ((v = (s0 >> 4) & 0xf) != 3)
-    s = format (s, "type 0x%x, ", v);
-
-  s = format (s, "%s%s%s%s%s%s%s%s",
-	      (s0 & (1 << 8)) ? "eop, " : "",
-	      (s0 & (1 << 9)) ? "insert-fcs, " : "",
-	      (s0 & (1 << 10)) ? "reserved26, " : "",
-	      (s0 & (1 << 11)) ? "report-status, " : "",
-	      (s0 & (1 << 12)) ? "reserved28, " : "",
-	      (s0 & (1 << 13)) ? "is-advanced, " : "",
-	      (s0 & (1 << 14)) ? "vlan-enable, " : "",
-	      (s0 & (1 << 15)) ? "tx-segmentation, " : "");
-
-  if ((v = s1 & 0xf) != 0)
-    s = format (s, "status 0x%x, ", v);
-
-  if ((v = (s1 >> 4) & 0xf))
-    s = format (s, "context 0x%x, ", v);
-
-  if ((v = (s1 >> 8) & 0x3f))
-    s = format (s, "options 0x%x, ", v);
-
-  return s;
-}
-
-typedef struct
-{
-  ixge_descriptor_t before, after;
-
-  u32 buffer_index;
-
-  u16 device_index;
-
-  u8 queue_index;
-
-  u8 is_start_of_packet;
-
-  /* Copy of VLIB buffer; packet data stored in pre_data. */
-  vlib_buffer_t buffer;
-} ixge_rx_dma_trace_t;
-
-static u8 *
-format_ixge_rx_dma_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  vlib_node_t *node = va_arg (*va, vlib_node_t *);
-  vnet_main_t *vnm = vnet_get_main ();
-  ixge_rx_dma_trace_t *t = va_arg (*va, ixge_rx_dma_trace_t *);
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, t->device_index);
-  format_function_t *f;
-  uword indent = format_get_indent (s);
-
-  {
-    vnet_sw_interface_t *sw =
-      vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
-    s =
-      format (s, "%U rx queue %d", format_vnet_sw_interface_name, vnm, sw,
-	      t->queue_index);
-  }
-
-  s = format (s, "\n%Ubefore: %U",
-	      format_white_space, indent,
-	      format_ixge_rx_from_hw_descriptor, &t->before);
-  s = format (s, "\n%Uafter : head/tail address 0x%Lx/0x%Lx",
-	      format_white_space, indent,
-	      t->after.rx_to_hw.head_address, t->after.rx_to_hw.tail_address);
-
-  s = format (s, "\n%Ubuffer 0x%x: %U",
-	      format_white_space, indent,
-	      t->buffer_index, format_vlib_buffer, &t->buffer);
-
-  s = format (s, "\n%U", format_white_space, indent);
-
-  f = node->format_buffer;
-  if (!f || !t->is_start_of_packet)
-    f = format_hex_bytes;
-  s = format (s, "%U", f, t->buffer.pre_data, sizeof (t->buffer.pre_data));
-
-  return s;
-}
-
-#define foreach_ixge_error					\
-  _ (none, "no error")						\
-  _ (tx_full_drops, "tx ring full drops")			\
-  _ (ip4_checksum_error, "ip4 checksum errors")			\
-  _ (rx_alloc_fail, "rx buf alloc from free list failed")	\
-  _ (rx_alloc_no_physmem, "rx buf alloc failed no physmem")
-
-typedef enum
-{
-#define _(f,s) IXGE_ERROR_##f,
-  foreach_ixge_error
-#undef _
-    IXGE_N_ERROR,
-} ixge_error_t;
-
-always_inline void
-ixge_rx_next_and_error_from_status_x1 (ixge_device_t * xd,
-				       u32 s00, u32 s02,
-				       u8 * next0, u8 * error0, u32 * flags0)
-{
-  u8 is0_ip4, is0_ip6, n0, e0;
-  u32 f0;
-
-  e0 = IXGE_ERROR_none;
-  n0 = IXGE_RX_NEXT_ETHERNET_INPUT;
-
-  is0_ip4 = s02 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED;
-  n0 = is0_ip4 ? IXGE_RX_NEXT_IP4_INPUT : n0;
-
-  e0 = (is0_ip4 && (s02 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR)
-	? IXGE_ERROR_ip4_checksum_error : e0);
-
-  is0_ip6 = s00 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6;
-  n0 = is0_ip6 ? IXGE_RX_NEXT_IP6_INPUT : n0;
-
-  n0 = (xd->per_interface_next_index != ~0) ?
-    xd->per_interface_next_index : n0;
-
-  /* Check for error. */
-  n0 = e0 != IXGE_ERROR_none ? IXGE_RX_NEXT_DROP : n0;
-
-  f0 = ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
-		| IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
-	? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
-
-  f0 |= ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
-		 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
-	 ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
-
-  *error0 = e0;
-  *next0 = n0;
-  *flags0 = f0;
-}
-
-always_inline void
-ixge_rx_next_and_error_from_status_x2 (ixge_device_t * xd,
-				       u32 s00, u32 s02,
-				       u32 s10, u32 s12,
-				       u8 * next0, u8 * error0, u32 * flags0,
-				       u8 * next1, u8 * error1, u32 * flags1)
-{
-  u8 is0_ip4, is0_ip6, n0, e0;
-  u8 is1_ip4, is1_ip6, n1, e1;
-  u32 f0, f1;
-
-  e0 = e1 = IXGE_ERROR_none;
-  n0 = n1 = IXGE_RX_NEXT_IP4_INPUT;
-
-  is0_ip4 = s02 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED;
-  is1_ip4 = s12 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED;
-
-  n0 = is0_ip4 ? IXGE_RX_NEXT_IP4_INPUT : n0;
-  n1 = is1_ip4 ? IXGE_RX_NEXT_IP4_INPUT : n1;
-
-  e0 = (is0_ip4 && (s02 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR)
-	? IXGE_ERROR_ip4_checksum_error : e0);
-  e1 = (is1_ip4 && (s12 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR)
-	? IXGE_ERROR_ip4_checksum_error : e1);
-
-  is0_ip6 = s00 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6;
-  is1_ip6 = s10 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6;
-
-  n0 = is0_ip6 ? IXGE_RX_NEXT_IP6_INPUT : n0;
-  n1 = is1_ip6 ? IXGE_RX_NEXT_IP6_INPUT : n1;
-
-  n0 = (xd->per_interface_next_index != ~0) ?
-    xd->per_interface_next_index : n0;
-  n1 = (xd->per_interface_next_index != ~0) ?
-    xd->per_interface_next_index : n1;
-
-  /* Check for error. */
-  n0 = e0 != IXGE_ERROR_none ? IXGE_RX_NEXT_DROP : n0;
-  n1 = e1 != IXGE_ERROR_none ? IXGE_RX_NEXT_DROP : n1;
-
-  *error0 = e0;
-  *error1 = e1;
-
-  *next0 = n0;
-  *next1 = n1;
-
-  f0 = ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
-		| IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
-	? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
-  f1 = ((s12 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
-		| IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
-	? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
-
-  f0 |= ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
-		 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
-	 ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
-  f1 |= ((s12 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
-		 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
-	 ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
-
-  *flags0 = f0;
-  *flags1 = f1;
-}
-
-static void
-ixge_rx_trace (ixge_main_t * xm,
-	       ixge_device_t * xd,
-	       ixge_dma_queue_t * dq,
-	       ixge_descriptor_t * before_descriptors,
-	       u32 * before_buffers,
-	       ixge_descriptor_t * after_descriptors, uword n_descriptors)
-{
-  vlib_main_t *vm = xm->vlib_main;
-  vlib_node_runtime_t *node = dq->rx.node;
-  ixge_rx_from_hw_descriptor_t *bd;
-  ixge_rx_to_hw_descriptor_t *ad;
-  u32 *b, n_left, is_sop, next_index_sop;
-
-  n_left = n_descriptors;
-  b = before_buffers;
-  bd = &before_descriptors->rx_from_hw;
-  ad = &after_descriptors->rx_to_hw;
-  is_sop = dq->rx.is_start_of_packet;
-  next_index_sop = dq->rx.saved_start_of_packet_next_index;
-
-  while (n_left >= 2)
-    {
-      u32 bi0, bi1, flags0, flags1;
-      vlib_buffer_t *b0, *b1;
-      ixge_rx_dma_trace_t *t0, *t1;
-      u8 next0, error0, next1, error1;
-
-      bi0 = b[0];
-      bi1 = b[1];
-      n_left -= 2;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      ixge_rx_next_and_error_from_status_x2 (xd,
-					     bd[0].status[0], bd[0].status[2],
-					     bd[1].status[0], bd[1].status[2],
-					     &next0, &error0, &flags0,
-					     &next1, &error1, &flags1);
-
-      next_index_sop = is_sop ? next0 : next_index_sop;
-      vlib_trace_buffer (vm, node, next_index_sop, b0, /* follow_chain */ 0);
-      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-      t0->is_start_of_packet = is_sop;
-      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      next_index_sop = is_sop ? next1 : next_index_sop;
-      vlib_trace_buffer (vm, node, next_index_sop, b1, /* follow_chain */ 0);
-      t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
-      t1->is_start_of_packet = is_sop;
-      is_sop = (b1->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      t0->queue_index = dq->queue_index;
-      t1->queue_index = dq->queue_index;
-      t0->device_index = xd->device_index;
-      t1->device_index = xd->device_index;
-      t0->before.rx_from_hw = bd[0];
-      t1->before.rx_from_hw = bd[1];
-      t0->after.rx_to_hw = ad[0];
-      t1->after.rx_to_hw = ad[1];
-      t0->buffer_index = bi0;
-      t1->buffer_index = bi1;
-      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
-      memcpy (&t1->buffer, b1, sizeof (b1[0]) - sizeof (b0->pre_data));
-      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
-	      sizeof (t0->buffer.pre_data));
-      memcpy (t1->buffer.pre_data, b1->data + b1->current_data,
-	      sizeof (t1->buffer.pre_data));
-
-      b += 2;
-      bd += 2;
-      ad += 2;
-    }
-
-  while (n_left >= 1)
-    {
-      u32 bi0, flags0;
-      vlib_buffer_t *b0;
-      ixge_rx_dma_trace_t *t0;
-      u8 next0, error0;
-
-      bi0 = b[0];
-      n_left -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      ixge_rx_next_and_error_from_status_x1 (xd,
-					     bd[0].status[0], bd[0].status[2],
-					     &next0, &error0, &flags0);
-
-      next_index_sop = is_sop ? next0 : next_index_sop;
-      vlib_trace_buffer (vm, node, next_index_sop, b0, /* follow_chain */ 0);
-      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-      t0->is_start_of_packet = is_sop;
-      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      t0->queue_index = dq->queue_index;
-      t0->device_index = xd->device_index;
-      t0->before.rx_from_hw = bd[0];
-      t0->after.rx_to_hw = ad[0];
-      t0->buffer_index = bi0;
-      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
-      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
-	      sizeof (t0->buffer.pre_data));
-
-      b += 1;
-      bd += 1;
-      ad += 1;
-    }
-}
-
-typedef struct
-{
-  ixge_tx_descriptor_t descriptor;
-
-  u32 buffer_index;
-
-  u16 device_index;
-
-  u8 queue_index;
-
-  u8 is_start_of_packet;
-
-  /* Copy of VLIB buffer; packet data stored in pre_data. */
-  vlib_buffer_t buffer;
-} ixge_tx_dma_trace_t;
-
-static u8 *
-format_ixge_tx_dma_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  ixge_tx_dma_trace_t *t = va_arg (*va, ixge_tx_dma_trace_t *);
-  vnet_main_t *vnm = vnet_get_main ();
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, t->device_index);
-  format_function_t *f;
-  uword indent = format_get_indent (s);
-
-  {
-    vnet_sw_interface_t *sw =
-      vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
-    s =
-      format (s, "%U tx queue %d", format_vnet_sw_interface_name, vnm, sw,
-	      t->queue_index);
-  }
-
-  s = format (s, "\n%Udescriptor: %U",
-	      format_white_space, indent,
-	      format_ixge_tx_descriptor, &t->descriptor);
-
-  s = format (s, "\n%Ubuffer 0x%x: %U",
-	      format_white_space, indent,
-	      t->buffer_index, format_vlib_buffer, &t->buffer);
-
-  s = format (s, "\n%U", format_white_space, indent);
-
-  f = format_ethernet_header_with_length;
-  if (!f || !t->is_start_of_packet)
-    f = format_hex_bytes;
-  s = format (s, "%U", f, t->buffer.pre_data, sizeof (t->buffer.pre_data));
-
-  return s;
-}
-
-typedef struct
-{
-  vlib_node_runtime_t *node;
-
-  u32 is_start_of_packet;
-
-  u32 n_bytes_in_packet;
-
-  ixge_tx_descriptor_t *start_of_packet_descriptor;
-} ixge_tx_state_t;
-
-static void
-ixge_tx_trace (ixge_main_t * xm,
-	       ixge_device_t * xd,
-	       ixge_dma_queue_t * dq,
-	       ixge_tx_state_t * tx_state,
-	       ixge_tx_descriptor_t * descriptors,
-	       u32 * buffers, uword n_descriptors)
-{
-  vlib_main_t *vm = xm->vlib_main;
-  vlib_node_runtime_t *node = tx_state->node;
-  ixge_tx_descriptor_t *d;
-  u32 *b, n_left, is_sop;
-
-  n_left = n_descriptors;
-  b = buffers;
-  d = descriptors;
-  is_sop = tx_state->is_start_of_packet;
-
-  while (n_left >= 2)
-    {
-      u32 bi0, bi1;
-      vlib_buffer_t *b0, *b1;
-      ixge_tx_dma_trace_t *t0, *t1;
-
-      bi0 = b[0];
-      bi1 = b[1];
-      n_left -= 2;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-      t0->is_start_of_packet = is_sop;
-      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
-      t1->is_start_of_packet = is_sop;
-      is_sop = (b1->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      t0->queue_index = dq->queue_index;
-      t1->queue_index = dq->queue_index;
-      t0->device_index = xd->device_index;
-      t1->device_index = xd->device_index;
-      t0->descriptor = d[0];
-      t1->descriptor = d[1];
-      t0->buffer_index = bi0;
-      t1->buffer_index = bi1;
-      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
-      memcpy (&t1->buffer, b1, sizeof (b1[0]) - sizeof (b0->pre_data));
-      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
-	      sizeof (t0->buffer.pre_data));
-      memcpy (t1->buffer.pre_data, b1->data + b1->current_data,
-	      sizeof (t1->buffer.pre_data));
-
-      b += 2;
-      d += 2;
-    }
-
-  while (n_left >= 1)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      ixge_tx_dma_trace_t *t0;
-
-      bi0 = b[0];
-      n_left -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-      t0->is_start_of_packet = is_sop;
-      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      t0->queue_index = dq->queue_index;
-      t0->device_index = xd->device_index;
-      t0->descriptor = d[0];
-      t0->buffer_index = bi0;
-      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
-      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
-	      sizeof (t0->buffer.pre_data));
-
-      b += 1;
-      d += 1;
-    }
-}
-
-always_inline uword
-ixge_ring_sub (ixge_dma_queue_t * q, u32 i0, u32 i1)
-{
-  i32 d = i1 - i0;
-  ASSERT (i0 < q->n_descriptors);
-  ASSERT (i1 < q->n_descriptors);
-  return d < 0 ? q->n_descriptors + d : d;
-}
-
-always_inline uword
-ixge_ring_add (ixge_dma_queue_t * q, u32 i0, u32 i1)
-{
-  u32 d = i0 + i1;
-  ASSERT (i0 < q->n_descriptors);
-  ASSERT (i1 < q->n_descriptors);
-  d -= d >= q->n_descriptors ? q->n_descriptors : 0;
-  return d;
-}
-
-always_inline uword
-ixge_tx_descriptor_matches_template (ixge_main_t * xm,
-				     ixge_tx_descriptor_t * d)
-{
-  u32 cmp;
-
-  cmp = ((d->status0 & xm->tx_descriptor_template_mask.status0)
-	 ^ xm->tx_descriptor_template.status0);
-  if (cmp)
-    return 0;
-  cmp = ((d->status1 & xm->tx_descriptor_template_mask.status1)
-	 ^ xm->tx_descriptor_template.status1);
-  if (cmp)
-    return 0;
-
-  return 1;
-}
-
-static uword
-ixge_tx_no_wrap (ixge_main_t * xm,
-		 ixge_device_t * xd,
-		 ixge_dma_queue_t * dq,
-		 u32 * buffers,
-		 u32 start_descriptor_index,
-		 u32 n_descriptors, ixge_tx_state_t * tx_state)
-{
-  vlib_main_t *vm = xm->vlib_main;
-  ixge_tx_descriptor_t *d, *d_sop;
-  u32 n_left = n_descriptors;
-  u32 *to_free = vec_end (xm->tx_buffers_pending_free);
-  u32 *to_tx =
-    vec_elt_at_index (dq->descriptor_buffer_indices, start_descriptor_index);
-  u32 is_sop = tx_state->is_start_of_packet;
-  u32 len_sop = tx_state->n_bytes_in_packet;
-  u16 template_status = xm->tx_descriptor_template.status0;
-  u32 descriptor_prefetch_rotor = 0;
-
-  ASSERT (start_descriptor_index + n_descriptors <= dq->n_descriptors);
-  d = &dq->descriptors[start_descriptor_index].tx;
-  d_sop = is_sop ? d : tx_state->start_of_packet_descriptor;
-
-  while (n_left >= 4)
-    {
-      vlib_buffer_t *b0, *b1;
-      u32 bi0, fi0, len0;
-      u32 bi1, fi1, len1;
-      u8 is_eop0, is_eop1;
-
-      /* Prefetch next iteration. */
-      vlib_prefetch_buffer_with_index (vm, buffers[2], LOAD);
-      vlib_prefetch_buffer_with_index (vm, buffers[3], LOAD);
-
-      if ((descriptor_prefetch_rotor & 0x3) == 0)
-	CLIB_PREFETCH (d + 4, CLIB_CACHE_LINE_BYTES, STORE);
-
-      descriptor_prefetch_rotor += 2;
-
-      bi0 = buffers[0];
-      bi1 = buffers[1];
-
-      to_free[0] = fi0 = to_tx[0];
-      to_tx[0] = bi0;
-      to_free += fi0 != 0;
-
-      to_free[0] = fi1 = to_tx[1];
-      to_tx[1] = bi1;
-      to_free += fi1 != 0;
-
-      buffers += 2;
-      n_left -= 2;
-      to_tx += 2;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      is_eop0 = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-      is_eop1 = (b1->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      len0 = b0->current_length;
-      len1 = b1->current_length;
-
-      ASSERT (ixge_tx_descriptor_matches_template (xm, d + 0));
-      ASSERT (ixge_tx_descriptor_matches_template (xm, d + 1));
-
-      d[0].buffer_address =
-	vlib_get_buffer_data_physical_address (vm, bi0) + b0->current_data;
-      d[1].buffer_address =
-	vlib_get_buffer_data_physical_address (vm, bi1) + b1->current_data;
-
-      d[0].n_bytes_this_buffer = len0;
-      d[1].n_bytes_this_buffer = len1;
-
-      d[0].status0 =
-	template_status | (is_eop0 <<
-			   IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET);
-      d[1].status0 =
-	template_status | (is_eop1 <<
-			   IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET);
-
-      len_sop = (is_sop ? 0 : len_sop) + len0;
-      d_sop[0].status1 =
-	IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET (len_sop);
-      d += 1;
-      d_sop = is_eop0 ? d : d_sop;
-
-      is_sop = is_eop0;
-
-      len_sop = (is_sop ? 0 : len_sop) + len1;
-      d_sop[0].status1 =
-	IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET (len_sop);
-      d += 1;
-      d_sop = is_eop1 ? d : d_sop;
-
-      is_sop = is_eop1;
-    }
-
-  while (n_left > 0)
-    {
-      vlib_buffer_t *b0;
-      u32 bi0, fi0, len0;
-      u8 is_eop0;
-
-      bi0 = buffers[0];
-
-      to_free[0] = fi0 = to_tx[0];
-      to_tx[0] = bi0;
-      to_free += fi0 != 0;
-
-      buffers += 1;
-      n_left -= 1;
-      to_tx += 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      is_eop0 = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      len0 = b0->current_length;
-
-      ASSERT (ixge_tx_descriptor_matches_template (xm, d + 0));
-
-      d[0].buffer_address =
-	vlib_get_buffer_data_physical_address (vm, bi0) + b0->current_data;
-
-      d[0].n_bytes_this_buffer = len0;
-
-      d[0].status0 =
-	template_status | (is_eop0 <<
-			   IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET);
-
-      len_sop = (is_sop ? 0 : len_sop) + len0;
-      d_sop[0].status1 =
-	IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET (len_sop);
-      d += 1;
-      d_sop = is_eop0 ? d : d_sop;
-
-      is_sop = is_eop0;
-    }
-
-  if (tx_state->node->flags & VLIB_NODE_FLAG_TRACE)
-    {
-      to_tx =
-	vec_elt_at_index (dq->descriptor_buffer_indices,
-			  start_descriptor_index);
-      ixge_tx_trace (xm, xd, dq, tx_state,
-		     &dq->descriptors[start_descriptor_index].tx, to_tx,
-		     n_descriptors);
-    }
-
-  _vec_len (xm->tx_buffers_pending_free) =
-    to_free - xm->tx_buffers_pending_free;
-
-  /* When we are done d_sop can point to end of ring.  Wrap it if so. */
-  {
-    ixge_tx_descriptor_t *d_start = &dq->descriptors[0].tx;
-
-    ASSERT (d_sop - d_start <= dq->n_descriptors);
-    d_sop = d_sop - d_start == dq->n_descriptors ? d_start : d_sop;
-  }
-
-  tx_state->is_start_of_packet = is_sop;
-  tx_state->start_of_packet_descriptor = d_sop;
-  tx_state->n_bytes_in_packet = len_sop;
-
-  return n_descriptors;
-}
-
-static uword
-ixge_interface_tx (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  ixge_main_t *xm = &ixge_main;
-  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, rd->dev_instance);
-  ixge_dma_queue_t *dq;
-  u32 *from, n_left_tx, n_descriptors_to_tx, n_tail_drop;
-  u32 queue_index = 0;		/* fixme parameter */
-  ixge_tx_state_t tx_state;
-
-  tx_state.node = node;
-  tx_state.is_start_of_packet = 1;
-  tx_state.start_of_packet_descriptor = 0;
-  tx_state.n_bytes_in_packet = 0;
-
-  from = vlib_frame_vector_args (f);
-
-  dq = vec_elt_at_index (xd->dma_queues[VLIB_TX], queue_index);
-
-  dq->head_index = dq->tx.head_index_write_back[0];
-
-  /* Since head == tail means ring is empty we can send up to dq->n_descriptors - 1. */
-  n_left_tx = dq->n_descriptors - 1;
-  n_left_tx -= ixge_ring_sub (dq, dq->head_index, dq->tail_index);
-
-  _vec_len (xm->tx_buffers_pending_free) = 0;
-
-  n_descriptors_to_tx = f->n_vectors;
-  n_tail_drop = 0;
-  if (PREDICT_FALSE (n_descriptors_to_tx > n_left_tx))
-    {
-      i32 i, n_ok, i_eop, i_sop;
-
-      i_sop = i_eop = ~0;
-      for (i = n_left_tx - 1; i >= 0; i--)
-	{
-	  vlib_buffer_t *b = vlib_get_buffer (vm, from[i]);
-	  if (!(b->flags & VLIB_BUFFER_NEXT_PRESENT))
-	    {
-	      if (i_sop != ~0 && i_eop != ~0)
-		break;
-	      i_eop = i;
-	      i_sop = i + 1;
-	    }
-	}
-      if (i == 0)
-	n_ok = 0;
-      else
-	n_ok = i_eop + 1;
-
-      {
-	ELOG_TYPE_DECLARE (e) =
-	{
-	.function = (char *) __FUNCTION__,.format =
-	    "ixge %d, ring full to tx %d head %d tail %d",.format_args =
-	    "i2i2i2i2",};
-	struct
-	{
-	  u16 instance, to_tx, head, tail;
-	} *ed;
-	ed = ELOG_DATA (&vm->elog_main, e);
-	ed->instance = xd->device_index;
-	ed->to_tx = n_descriptors_to_tx;
-	ed->head = dq->head_index;
-	ed->tail = dq->tail_index;
-      }
-
-      if (n_ok < n_descriptors_to_tx)
-	{
-	  n_tail_drop = n_descriptors_to_tx - n_ok;
-	  vec_add (xm->tx_buffers_pending_free, from + n_ok, n_tail_drop);
-	  vlib_error_count (vm, ixge_input_node.index,
-			    IXGE_ERROR_tx_full_drops, n_tail_drop);
-	}
-
-      n_descriptors_to_tx = n_ok;
-    }
-
-  dq->tx.n_buffers_on_ring += n_descriptors_to_tx;
-
-  /* Process from tail to end of descriptor ring. */
-  if (n_descriptors_to_tx > 0 && dq->tail_index < dq->n_descriptors)
-    {
-      u32 n =
-	clib_min (dq->n_descriptors - dq->tail_index, n_descriptors_to_tx);
-      n = ixge_tx_no_wrap (xm, xd, dq, from, dq->tail_index, n, &tx_state);
-      from += n;
-      n_descriptors_to_tx -= n;
-      dq->tail_index += n;
-      ASSERT (dq->tail_index <= dq->n_descriptors);
-      if (dq->tail_index == dq->n_descriptors)
-	dq->tail_index = 0;
-    }
-
-  if (n_descriptors_to_tx > 0)
-    {
-      u32 n =
-	ixge_tx_no_wrap (xm, xd, dq, from, 0, n_descriptors_to_tx, &tx_state);
-      from += n;
-      ASSERT (n == n_descriptors_to_tx);
-      dq->tail_index += n;
-      ASSERT (dq->tail_index <= dq->n_descriptors);
-      if (dq->tail_index == dq->n_descriptors)
-	dq->tail_index = 0;
-    }
-
-  /* We should only get full packets. */
-  ASSERT (tx_state.is_start_of_packet);
-
-  /* Report status when last descriptor is done. */
-  {
-    u32 i = dq->tail_index == 0 ? dq->n_descriptors - 1 : dq->tail_index - 1;
-    ixge_tx_descriptor_t *d = &dq->descriptors[i].tx;
-    d->status0 |= IXGE_TX_DESCRIPTOR_STATUS0_REPORT_STATUS;
-  }
-
-  /* Give new descriptors to hardware. */
-  {
-    ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_TX, queue_index);
-
-    CLIB_MEMORY_BARRIER ();
-
-    dr->tail_index = dq->tail_index;
-  }
-
-  /* Free any buffers that are done. */
-  {
-    u32 n = _vec_len (xm->tx_buffers_pending_free);
-    if (n > 0)
-      {
-	vlib_buffer_free_no_next (vm, xm->tx_buffers_pending_free, n);
-	_vec_len (xm->tx_buffers_pending_free) = 0;
-	ASSERT (dq->tx.n_buffers_on_ring >= n);
-	dq->tx.n_buffers_on_ring -= (n - n_tail_drop);
-      }
-  }
-
-  return f->n_vectors;
-}
-
-static uword
-ixge_rx_queue_no_wrap (ixge_main_t * xm,
-		       ixge_device_t * xd,
-		       ixge_dma_queue_t * dq,
-		       u32 start_descriptor_index, u32 n_descriptors)
-{
-  vlib_main_t *vm = xm->vlib_main;
-  vlib_node_runtime_t *node = dq->rx.node;
-  ixge_descriptor_t *d;
-  static ixge_descriptor_t *d_trace_save;
-  static u32 *d_trace_buffers;
-  u32 n_descriptors_left = n_descriptors;
-  u32 *to_rx =
-    vec_elt_at_index (dq->descriptor_buffer_indices, start_descriptor_index);
-  u32 *to_add;
-  u32 bi_sop = dq->rx.saved_start_of_packet_buffer_index;
-  u32 bi_last = dq->rx.saved_last_buffer_index;
-  u32 next_index_sop = dq->rx.saved_start_of_packet_next_index;
-  u32 is_sop = dq->rx.is_start_of_packet;
-  u32 next_index, n_left_to_next, *to_next;
-  u32 n_packets = 0;
-  u32 n_bytes = 0;
-  u32 n_trace = vlib_get_trace_count (vm, node);
-  vlib_buffer_t *b_last, b_dummy;
-
-  ASSERT (start_descriptor_index + n_descriptors <= dq->n_descriptors);
-  d = &dq->descriptors[start_descriptor_index];
-
-  b_last = bi_last != ~0 ? vlib_get_buffer (vm, bi_last) : &b_dummy;
-  next_index = dq->rx.next_index;
-
-  if (n_trace > 0)
-    {
-      u32 n = clib_min (n_trace, n_descriptors);
-      if (d_trace_save)
-	{
-	  _vec_len (d_trace_save) = 0;
-	  _vec_len (d_trace_buffers) = 0;
-	}
-      vec_add (d_trace_save, (ixge_descriptor_t *) d, n);
-      vec_add (d_trace_buffers, to_rx, n);
-    }
-
-  {
-    uword l = vec_len (xm->rx_buffers_to_add);
-
-    if (l < n_descriptors_left)
-      {
-	u32 n_to_alloc = 2 * dq->n_descriptors - l;
-	u32 n_allocated;
-
-	vec_resize (xm->rx_buffers_to_add, n_to_alloc);
-
-	_vec_len (xm->rx_buffers_to_add) = l;
-	n_allocated = vlib_buffer_alloc_from_free_list
-	  (vm, xm->rx_buffers_to_add + l, n_to_alloc,
-	   xm->vlib_buffer_free_list_index);
-	_vec_len (xm->rx_buffers_to_add) += n_allocated;
-
-	/* Handle transient allocation failure */
-	if (PREDICT_FALSE (l + n_allocated <= n_descriptors_left))
-	  {
-	    if (n_allocated == 0)
-	      vlib_error_count (vm, ixge_input_node.index,
-				IXGE_ERROR_rx_alloc_no_physmem, 1);
-	    else
-	      vlib_error_count (vm, ixge_input_node.index,
-				IXGE_ERROR_rx_alloc_fail, 1);
-
-	    n_descriptors_left = l + n_allocated;
-	  }
-	n_descriptors = n_descriptors_left;
-      }
-
-    /* Add buffers from end of vector going backwards. */
-    to_add = vec_end (xm->rx_buffers_to_add) - 1;
-  }
-
-  while (n_descriptors_left > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_descriptors_left >= 4 && n_left_to_next >= 2)
-	{
-	  vlib_buffer_t *b0, *b1;
-	  u32 bi0, fi0, len0, l3_offset0, s20, s00, flags0;
-	  u32 bi1, fi1, len1, l3_offset1, s21, s01, flags1;
-	  u8 is_eop0, error0, next0;
-	  u8 is_eop1, error1, next1;
-	  ixge_descriptor_t d0, d1;
-
-	  vlib_prefetch_buffer_with_index (vm, to_rx[2], STORE);
-	  vlib_prefetch_buffer_with_index (vm, to_rx[3], STORE);
-
-	  CLIB_PREFETCH (d + 2, 32, STORE);
-
-	  d0.as_u32x4 = d[0].as_u32x4;
-	  d1.as_u32x4 = d[1].as_u32x4;
-
-	  s20 = d0.rx_from_hw.status[2];
-	  s21 = d1.rx_from_hw.status[2];
-
-	  s00 = d0.rx_from_hw.status[0];
-	  s01 = d1.rx_from_hw.status[0];
-
-	  if (!
-	      ((s20 & s21) & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE))
-	    goto found_hw_owned_descriptor_x2;
-
-	  bi0 = to_rx[0];
-	  bi1 = to_rx[1];
-
-	  ASSERT (to_add - 1 >= xm->rx_buffers_to_add);
-	  fi0 = to_add[0];
-	  fi1 = to_add[-1];
-
-	  to_rx[0] = fi0;
-	  to_rx[1] = fi1;
-	  to_rx += 2;
-	  to_add -= 2;
-
-	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
-		  vlib_buffer_is_known (vm, bi0));
-	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
-		  vlib_buffer_is_known (vm, bi1));
-	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
-		  vlib_buffer_is_known (vm, fi0));
-	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
-		  vlib_buffer_is_known (vm, fi1));
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  /*
-	   * Turn this on if you run into
-	   * "bad monkey" contexts, and you want to know exactly
-	   * which nodes they've visited... See main.c...
-	   */
-	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
-	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b1);
-
-	  CLIB_PREFETCH (b0->data, CLIB_CACHE_LINE_BYTES, LOAD);
-	  CLIB_PREFETCH (b1->data, CLIB_CACHE_LINE_BYTES, LOAD);
-
-	  is_eop0 = (s20 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET) != 0;
-	  is_eop1 = (s21 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET) != 0;
-
-	  ixge_rx_next_and_error_from_status_x2 (xd, s00, s20, s01, s21,
-						 &next0, &error0, &flags0,
-						 &next1, &error1, &flags1);
-
-	  next0 = is_sop ? next0 : next_index_sop;
-	  next1 = is_eop0 ? next1 : next0;
-	  next_index_sop = next1;
-
-	  b0->flags |= flags0 | (!is_eop0 << VLIB_BUFFER_LOG2_NEXT_PRESENT);
-	  b1->flags |= flags1 | (!is_eop1 << VLIB_BUFFER_LOG2_NEXT_PRESENT);
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
-	  vnet_buffer (b1)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-	  vnet_buffer (b1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-
-	  b0->error = node->errors[error0];
-	  b1->error = node->errors[error1];
-
-	  len0 = d0.rx_from_hw.n_packet_bytes_this_descriptor;
-	  len1 = d1.rx_from_hw.n_packet_bytes_this_descriptor;
-	  n_bytes += len0 + len1;
-	  n_packets += is_eop0 + is_eop1;
-
-	  /* Give new buffers to hardware. */
-	  d0.rx_to_hw.tail_address =
-	    vlib_get_buffer_data_physical_address (vm, fi0);
-	  d1.rx_to_hw.tail_address =
-	    vlib_get_buffer_data_physical_address (vm, fi1);
-	  d0.rx_to_hw.head_address = d[0].rx_to_hw.tail_address;
-	  d1.rx_to_hw.head_address = d[1].rx_to_hw.tail_address;
-	  d[0].as_u32x4 = d0.as_u32x4;
-	  d[1].as_u32x4 = d1.as_u32x4;
-
-	  d += 2;
-	  n_descriptors_left -= 2;
-
-	  /* Point to either l2 or l3 header depending on next. */
-	  l3_offset0 = (is_sop && (next0 != IXGE_RX_NEXT_ETHERNET_INPUT))
-	    ? IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s00) : 0;
-	  l3_offset1 = (is_eop0 && (next1 != IXGE_RX_NEXT_ETHERNET_INPUT))
-	    ? IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s01) : 0;
-
-	  b0->current_length = len0 - l3_offset0;
-	  b1->current_length = len1 - l3_offset1;
-	  b0->current_data = l3_offset0;
-	  b1->current_data = l3_offset1;
-
-	  b_last->next_buffer = is_sop ? ~0 : bi0;
-	  b0->next_buffer = is_eop0 ? ~0 : bi1;
-	  bi_last = bi1;
-	  b_last = b1;
-
-	  if (CLIB_DEBUG > 0)
-	    {
-	      u32 bi_sop0 = is_sop ? bi0 : bi_sop;
-	      u32 bi_sop1 = is_eop0 ? bi1 : bi_sop0;
-
-	      if (is_eop0)
-		{
-		  u8 *msg = vlib_validate_buffer (vm, bi_sop0,
-						  /* follow_buffer_next */ 1);
-		  ASSERT (!msg);
-		}
-	      if (is_eop1)
-		{
-		  u8 *msg = vlib_validate_buffer (vm, bi_sop1,
-						  /* follow_buffer_next */ 1);
-		  ASSERT (!msg);
-		}
-	    }
-	  if (0)		/* "Dave" version */
-	    {
-	      u32 bi_sop0 = is_sop ? bi0 : bi_sop;
-	      u32 bi_sop1 = is_eop0 ? bi1 : bi_sop0;
-
-	      if (is_eop0)
-		{
-		  to_next[0] = bi_sop0;
-		  to_next++;
-		  n_left_to_next--;
-
-		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-						   to_next, n_left_to_next,
-						   bi_sop0, next0);
-		}
-	      if (is_eop1)
-		{
-		  to_next[0] = bi_sop1;
-		  to_next++;
-		  n_left_to_next--;
-
-		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-						   to_next, n_left_to_next,
-						   bi_sop1, next1);
-		}
-	      is_sop = is_eop1;
-	      bi_sop = bi_sop1;
-	    }
-	  if (1)		/* "Eliot" version */
-	    {
-	      /* Speculatively enqueue to cached next. */
-	      u8 saved_is_sop = is_sop;
-	      u32 bi_sop_save = bi_sop;
-
-	      bi_sop = saved_is_sop ? bi0 : bi_sop;
-	      to_next[0] = bi_sop;
-	      to_next += is_eop0;
-	      n_left_to_next -= is_eop0;
-
-	      bi_sop = is_eop0 ? bi1 : bi_sop;
-	      to_next[0] = bi_sop;
-	      to_next += is_eop1;
-	      n_left_to_next -= is_eop1;
-
-	      is_sop = is_eop1;
-
-	      if (PREDICT_FALSE
-		  (!(next0 == next_index && next1 == next_index)))
-		{
-		  /* Undo speculation. */
-		  to_next -= is_eop0 + is_eop1;
-		  n_left_to_next += is_eop0 + is_eop1;
-
-		  /* Re-do both descriptors being careful about where we enqueue. */
-		  bi_sop = saved_is_sop ? bi0 : bi_sop_save;
-		  if (is_eop0)
-		    {
-		      if (next0 != next_index)
-			vlib_set_next_frame_buffer (vm, node, next0, bi_sop);
-		      else
-			{
-			  to_next[0] = bi_sop;
-			  to_next += 1;
-			  n_left_to_next -= 1;
-			}
-		    }
-
-		  bi_sop = is_eop0 ? bi1 : bi_sop;
-		  if (is_eop1)
-		    {
-		      if (next1 != next_index)
-			vlib_set_next_frame_buffer (vm, node, next1, bi_sop);
-		      else
-			{
-			  to_next[0] = bi_sop;
-			  to_next += 1;
-			  n_left_to_next -= 1;
-			}
-		    }
-
-		  /* Switch cached next index when next for both packets is the same. */
-		  if (is_eop0 && is_eop1 && next0 == next1)
-		    {
-		      vlib_put_next_frame (vm, node, next_index,
-					   n_left_to_next);
-		      next_index = next0;
-		      vlib_get_next_frame (vm, node, next_index,
-					   to_next, n_left_to_next);
-		    }
-		}
-	    }
-	}
-
-      /* Bail out of dual loop and proceed with single loop. */
-    found_hw_owned_descriptor_x2:
-
-      while (n_descriptors_left > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *b0;
-	  u32 bi0, fi0, len0, l3_offset0, s20, s00, flags0;
-	  u8 is_eop0, error0, next0;
-	  ixge_descriptor_t d0;
-
-	  d0.as_u32x4 = d[0].as_u32x4;
-
-	  s20 = d0.rx_from_hw.status[2];
-	  s00 = d0.rx_from_hw.status[0];
-
-	  if (!(s20 & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE))
-	    goto found_hw_owned_descriptor_x1;
-
-	  bi0 = to_rx[0];
-	  ASSERT (to_add >= xm->rx_buffers_to_add);
-	  fi0 = to_add[0];
-
-	  to_rx[0] = fi0;
-	  to_rx += 1;
-	  to_add -= 1;
-
-	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
-		  vlib_buffer_is_known (vm, bi0));
-	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
-		  vlib_buffer_is_known (vm, fi0));
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  /*
-	   * Turn this on if you run into
-	   * "bad monkey" contexts, and you want to know exactly
-	   * which nodes they've visited...
-	   */
-	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
-
-	  is_eop0 = (s20 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET) != 0;
-	  ixge_rx_next_and_error_from_status_x1
-	    (xd, s00, s20, &next0, &error0, &flags0);
-
-	  next0 = is_sop ? next0 : next_index_sop;
-	  next_index_sop = next0;
-
-	  b0->flags |= flags0 | (!is_eop0 << VLIB_BUFFER_LOG2_NEXT_PRESENT);
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-
-	  b0->error = node->errors[error0];
-
-	  len0 = d0.rx_from_hw.n_packet_bytes_this_descriptor;
-	  n_bytes += len0;
-	  n_packets += is_eop0;
-
-	  /* Give new buffer to hardware. */
-	  d0.rx_to_hw.tail_address =
-	    vlib_get_buffer_data_physical_address (vm, fi0);
-	  d0.rx_to_hw.head_address = d0.rx_to_hw.tail_address;
-	  d[0].as_u32x4 = d0.as_u32x4;
-
-	  d += 1;
-	  n_descriptors_left -= 1;
-
-	  /* Point to either l2 or l3 header depending on next. */
-	  l3_offset0 = (is_sop && (next0 != IXGE_RX_NEXT_ETHERNET_INPUT))
-	    ? IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s00) : 0;
-	  b0->current_length = len0 - l3_offset0;
-	  b0->current_data = l3_offset0;
-
-	  b_last->next_buffer = is_sop ? ~0 : bi0;
-	  bi_last = bi0;
-	  b_last = b0;
-
-	  bi_sop = is_sop ? bi0 : bi_sop;
-
-	  if (CLIB_DEBUG > 0 && is_eop0)
-	    {
-	      u8 *msg =
-		vlib_validate_buffer (vm, bi_sop, /* follow_buffer_next */ 1);
-	      ASSERT (!msg);
-	    }
-
-	  if (0)		/* "Dave" version */
-	    {
-	      if (is_eop0)
-		{
-		  to_next[0] = bi_sop;
-		  to_next++;
-		  n_left_to_next--;
-
-		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-						   to_next, n_left_to_next,
-						   bi_sop, next0);
-		}
-	    }
-	  if (1)		/* "Eliot" version */
-	    {
-	      if (PREDICT_TRUE (next0 == next_index))
-		{
-		  to_next[0] = bi_sop;
-		  to_next += is_eop0;
-		  n_left_to_next -= is_eop0;
-		}
-	      else
-		{
-		  if (next0 != next_index && is_eop0)
-		    vlib_set_next_frame_buffer (vm, node, next0, bi_sop);
-
-		  vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-		  next_index = next0;
-		  vlib_get_next_frame (vm, node, next_index,
-				       to_next, n_left_to_next);
-		}
-	    }
-	  is_sop = is_eop0;
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-found_hw_owned_descriptor_x1:
-  if (n_descriptors_left > 0)
-    vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-
-  _vec_len (xm->rx_buffers_to_add) = (to_add + 1) - xm->rx_buffers_to_add;
-
-  {
-    u32 n_done = n_descriptors - n_descriptors_left;
-
-    if (n_trace > 0 && n_done > 0)
-      {
-	u32 n = clib_min (n_trace, n_done);
-	ixge_rx_trace (xm, xd, dq,
-		       d_trace_save,
-		       d_trace_buffers,
-		       &dq->descriptors[start_descriptor_index], n);
-	vlib_set_trace_count (vm, node, n_trace - n);
-      }
-    if (d_trace_save)
-      {
-	_vec_len (d_trace_save) = 0;
-	_vec_len (d_trace_buffers) = 0;
-      }
-
-    /* Don't keep a reference to b_last if we don't have to.
-       Otherwise we can over-write a next_buffer pointer after already haven
-       enqueued a packet. */
-    if (is_sop)
-      {
-	b_last->next_buffer = ~0;
-	bi_last = ~0;
-      }
-
-    dq->rx.n_descriptors_done_this_call = n_done;
-    dq->rx.n_descriptors_done_total += n_done;
-    dq->rx.is_start_of_packet = is_sop;
-    dq->rx.saved_start_of_packet_buffer_index = bi_sop;
-    dq->rx.saved_last_buffer_index = bi_last;
-    dq->rx.saved_start_of_packet_next_index = next_index_sop;
-    dq->rx.next_index = next_index;
-    dq->rx.n_bytes += n_bytes;
-
-    return n_packets;
-  }
-}
-
-static uword
-ixge_rx_queue (ixge_main_t * xm,
-	       ixge_device_t * xd,
-	       vlib_node_runtime_t * node, u32 queue_index)
-{
-  ixge_dma_queue_t *dq =
-    vec_elt_at_index (xd->dma_queues[VLIB_RX], queue_index);
-  ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_RX, dq->queue_index);
-  uword n_packets = 0;
-  u32 hw_head_index, sw_head_index;
-
-  /* One time initialization. */
-  if (!dq->rx.node)
-    {
-      dq->rx.node = node;
-      dq->rx.is_start_of_packet = 1;
-      dq->rx.saved_start_of_packet_buffer_index = ~0;
-      dq->rx.saved_last_buffer_index = ~0;
-    }
-
-  dq->rx.next_index = node->cached_next_index;
-
-  dq->rx.n_descriptors_done_total = 0;
-  dq->rx.n_descriptors_done_this_call = 0;
-  dq->rx.n_bytes = 0;
-
-  /* Fetch head from hardware and compare to where we think we are. */
-  hw_head_index = dr->head_index;
-  sw_head_index = dq->head_index;
-
-  if (hw_head_index == sw_head_index)
-    goto done;
-
-  if (hw_head_index < sw_head_index)
-    {
-      u32 n_tried = dq->n_descriptors - sw_head_index;
-      n_packets += ixge_rx_queue_no_wrap (xm, xd, dq, sw_head_index, n_tried);
-      sw_head_index =
-	ixge_ring_add (dq, sw_head_index,
-		       dq->rx.n_descriptors_done_this_call);
-
-      if (dq->rx.n_descriptors_done_this_call != n_tried)
-	goto done;
-    }
-  if (hw_head_index >= sw_head_index)
-    {
-      u32 n_tried = hw_head_index - sw_head_index;
-      n_packets += ixge_rx_queue_no_wrap (xm, xd, dq, sw_head_index, n_tried);
-      sw_head_index =
-	ixge_ring_add (dq, sw_head_index,
-		       dq->rx.n_descriptors_done_this_call);
-    }
-
-done:
-  dq->head_index = sw_head_index;
-  dq->tail_index =
-    ixge_ring_add (dq, dq->tail_index, dq->rx.n_descriptors_done_total);
-
-  /* Give tail back to hardware. */
-  CLIB_MEMORY_BARRIER ();
-
-  dr->tail_index = dq->tail_index;
-
-  vlib_increment_combined_counter (vnet_main.
-				   interface_main.combined_sw_if_counters +
-				   VNET_INTERFACE_COUNTER_RX,
-				   0 /* cpu_index */ ,
-				   xd->vlib_sw_if_index, n_packets,
-				   dq->rx.n_bytes);
-
-  return n_packets;
-}
-
-static void
-ixge_interrupt (ixge_main_t * xm, ixge_device_t * xd, u32 i)
-{
-  vlib_main_t *vm = xm->vlib_main;
-  ixge_regs_t *r = xd->regs;
-
-  if (i != 20)
-    {
-      ELOG_TYPE_DECLARE (e) =
-      {
-	.function = (char *) __FUNCTION__,.format =
-	  "ixge %d, %s",.format_args = "i1t1",.n_enum_strings =
-	  16,.enum_strings =
-	{
-      "flow director",
-	    "rx miss",
-	    "pci exception",
-	    "mailbox",
-	    "link status change",
-	    "linksec key exchange",
-	    "manageability event",
-	    "reserved23",
-	    "sdp0",
-	    "sdp1",
-	    "sdp2",
-	    "sdp3",
-	    "ecc", "descriptor handler error", "tcp timer", "other",},};
-      struct
-      {
-	u8 instance;
-	u8 index;
-      } *ed;
-      ed = ELOG_DATA (&vm->elog_main, e);
-      ed->instance = xd->device_index;
-      ed->index = i - 16;
-    }
-  else
-    {
-      u32 v = r->xge_mac.link_status;
-      uword is_up = (v & (1 << 30)) != 0;
-
-      ELOG_TYPE_DECLARE (e) =
-      {
-      .function = (char *) __FUNCTION__,.format =
-	  "ixge %d, link status change 0x%x",.format_args = "i4i4",};
-      struct
-      {
-	u32 instance, link_status;
-      } *ed;
-      ed = ELOG_DATA (&vm->elog_main, e);
-      ed->instance = xd->device_index;
-      ed->link_status = v;
-      xd->link_status_at_last_link_change = v;
-
-      vlib_process_signal_event (vm, ixge_process_node.index,
-				 EVENT_SET_FLAGS,
-				 ((is_up << 31) | xd->vlib_hw_if_index));
-    }
-}
-
-always_inline u32
-clean_block (u32 * b, u32 * t, u32 n_left)
-{
-  u32 *t0 = t;
-
-  while (n_left >= 4)
-    {
-      u32 bi0, bi1, bi2, bi3;
-
-      t[0] = bi0 = b[0];
-      b[0] = 0;
-      t += bi0 != 0;
-
-      t[0] = bi1 = b[1];
-      b[1] = 0;
-      t += bi1 != 0;
-
-      t[0] = bi2 = b[2];
-      b[2] = 0;
-      t += bi2 != 0;
-
-      t[0] = bi3 = b[3];
-      b[3] = 0;
-      t += bi3 != 0;
-
-      b += 4;
-      n_left -= 4;
-    }
-
-  while (n_left > 0)
-    {
-      u32 bi0;
-
-      t[0] = bi0 = b[0];
-      b[0] = 0;
-      t += bi0 != 0;
-      b += 1;
-      n_left -= 1;
-    }
-
-  return t - t0;
-}
-
-static void
-ixge_tx_queue (ixge_main_t * xm, ixge_device_t * xd, u32 queue_index)
-{
-  vlib_main_t *vm = xm->vlib_main;
-  ixge_dma_queue_t *dq =
-    vec_elt_at_index (xd->dma_queues[VLIB_TX], queue_index);
-  u32 n_clean, *b, *t, *t0;
-  i32 n_hw_owned_descriptors;
-  i32 first_to_clean, last_to_clean;
-  u64 hwbp_race = 0;
-
-  /* Handle case where head write back pointer update
-   * arrives after the interrupt during high PCI bus loads.
-   */
-  while ((dq->head_index == dq->tx.head_index_write_back[0]) &&
-	 dq->tx.n_buffers_on_ring && (dq->head_index != dq->tail_index))
-    {
-      hwbp_race++;
-      if (IXGE_HWBP_RACE_ELOG && (hwbp_race == 1))
-	{
-	  ELOG_TYPE_DECLARE (e) =
-	  {
-	  .function = (char *) __FUNCTION__,.format =
-	      "ixge %d tx head index race: head %4d, tail %4d, buffs %4d",.format_args
-	      = "i4i4i4i4",};
-	  struct
-	  {
-	    u32 instance, head_index, tail_index, n_buffers_on_ring;
-	  } *ed;
-	  ed = ELOG_DATA (&vm->elog_main, e);
-	  ed->instance = xd->device_index;
-	  ed->head_index = dq->head_index;
-	  ed->tail_index = dq->tail_index;
-	  ed->n_buffers_on_ring = dq->tx.n_buffers_on_ring;
-	}
-    }
-
-  dq->head_index = dq->tx.head_index_write_back[0];
-  n_hw_owned_descriptors = ixge_ring_sub (dq, dq->head_index, dq->tail_index);
-  ASSERT (dq->tx.n_buffers_on_ring >= n_hw_owned_descriptors);
-  n_clean = dq->tx.n_buffers_on_ring - n_hw_owned_descriptors;
-
-  if (IXGE_HWBP_RACE_ELOG && hwbp_race)
-    {
-      ELOG_TYPE_DECLARE (e) =
-      {
-      .function = (char *) __FUNCTION__,.format =
-	  "ixge %d tx head index race: head %4d, hw_owned %4d, n_clean %4d, retries %d",.format_args
-	  = "i4i4i4i4i4",};
-      struct
-      {
-	u32 instance, head_index, n_hw_owned_descriptors, n_clean, retries;
-      } *ed;
-      ed = ELOG_DATA (&vm->elog_main, e);
-      ed->instance = xd->device_index;
-      ed->head_index = dq->head_index;
-      ed->n_hw_owned_descriptors = n_hw_owned_descriptors;
-      ed->n_clean = n_clean;
-      ed->retries = hwbp_race;
-    }
-
-  /*
-   * This function used to wait until hardware owned zero descriptors.
-   * At high PPS rates, that doesn't happen until the TX ring is
-   * completely full of descriptors which need to be cleaned up.
-   * That, in turn, causes TX ring-full drops and/or long RX service
-   * interruptions.
-   */
-  if (n_clean == 0)
-    return;
-
-  /* Clean the n_clean descriptors prior to the reported hardware head */
-  last_to_clean = dq->head_index - 1;
-  last_to_clean = (last_to_clean < 0) ? last_to_clean + dq->n_descriptors :
-    last_to_clean;
-
-  first_to_clean = (last_to_clean) - (n_clean - 1);
-  first_to_clean = (first_to_clean < 0) ? first_to_clean + dq->n_descriptors :
-    first_to_clean;
-
-  vec_resize (xm->tx_buffers_pending_free, dq->n_descriptors - 1);
-  t0 = t = xm->tx_buffers_pending_free;
-  b = dq->descriptor_buffer_indices + first_to_clean;
-
-  /* Wrap case: clean from first to end, then start to last */
-  if (first_to_clean > last_to_clean)
-    {
-      t += clean_block (b, t, (dq->n_descriptors - 1) - first_to_clean);
-      first_to_clean = 0;
-      b = dq->descriptor_buffer_indices;
-    }
-
-  /* Typical case: clean from first to last */
-  if (first_to_clean <= last_to_clean)
-    t += clean_block (b, t, (last_to_clean - first_to_clean) + 1);
-
-  if (t > t0)
-    {
-      u32 n = t - t0;
-      vlib_buffer_free_no_next (vm, t0, n);
-      ASSERT (dq->tx.n_buffers_on_ring >= n);
-      dq->tx.n_buffers_on_ring -= n;
-      _vec_len (xm->tx_buffers_pending_free) = 0;
-    }
-}
-
-/* RX queue interrupts 0 thru 7; TX 8 thru 15. */
-always_inline uword
-ixge_interrupt_is_rx_queue (uword i)
-{
-  return i < 8;
-}
-
-always_inline uword
-ixge_interrupt_is_tx_queue (uword i)
-{
-  return i >= 8 && i < 16;
-}
-
-always_inline uword
-ixge_tx_queue_to_interrupt (uword i)
-{
-  return 8 + i;
-}
-
-always_inline uword
-ixge_rx_queue_to_interrupt (uword i)
-{
-  return 0 + i;
-}
-
-always_inline uword
-ixge_interrupt_rx_queue (uword i)
-{
-  ASSERT (ixge_interrupt_is_rx_queue (i));
-  return i - 0;
-}
-
-always_inline uword
-ixge_interrupt_tx_queue (uword i)
-{
-  ASSERT (ixge_interrupt_is_tx_queue (i));
-  return i - 8;
-}
-
-static uword
-ixge_device_input (ixge_main_t * xm,
-		   ixge_device_t * xd, vlib_node_runtime_t * node)
-{
-  ixge_regs_t *r = xd->regs;
-  u32 i, s;
-  uword n_rx_packets = 0;
-
-  s = r->interrupt.status_write_1_to_set;
-  if (s)
-    r->interrupt.status_write_1_to_clear = s;
-
-  /* *INDENT-OFF* */
-  foreach_set_bit (i, s, ({
-    if (ixge_interrupt_is_rx_queue (i))
-      n_rx_packets += ixge_rx_queue (xm, xd, node, ixge_interrupt_rx_queue (i));
-
-    else if (ixge_interrupt_is_tx_queue (i))
-      ixge_tx_queue (xm, xd, ixge_interrupt_tx_queue (i));
-
-    else
-      ixge_interrupt (xm, xd, i);
-  }));
-  /* *INDENT-ON* */
-
-  return n_rx_packets;
-}
-
-static uword
-ixge_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd;
-  uword n_rx_packets = 0;
-
-  if (node->state == VLIB_NODE_STATE_INTERRUPT)
-    {
-      uword i;
-
-      /* Loop over devices with interrupts. */
-      /* *INDENT-OFF* */
-      foreach_set_bit (i, node->runtime_data[0], ({
-	xd = vec_elt_at_index (xm->devices, i);
-	n_rx_packets += ixge_device_input (xm, xd, node);
-
-	/* Re-enable interrupts since we're going to stay in interrupt mode. */
-	if (! (node->flags & VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE))
-	  xd->regs->interrupt.enable_write_1_to_set = ~0;
-      }));
-      /* *INDENT-ON* */
-
-      /* Clear mask of devices with pending interrupts. */
-      node->runtime_data[0] = 0;
-    }
-  else
-    {
-      /* Poll all devices for input/interrupts. */
-      vec_foreach (xd, xm->devices)
-      {
-	n_rx_packets += ixge_device_input (xm, xd, node);
-
-	/* Re-enable interrupts when switching out of polling mode. */
-	if (node->flags &
-	    VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE)
-	  xd->regs->interrupt.enable_write_1_to_set = ~0;
-      }
-    }
-
-  return n_rx_packets;
-}
-
-static char *ixge_error_strings[] = {
-#define _(n,s) s,
-  foreach_ixge_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ixge_input_node, static) = {
-  .function = ixge_input,
-  .type = VLIB_NODE_TYPE_INPUT,
-  .name = "ixge-input",
-
-  /* Will be enabled if/when hardware is detected. */
-  .state = VLIB_NODE_STATE_DISABLED,
-
-  .format_buffer = format_ethernet_header_with_length,
-  .format_trace = format_ixge_rx_dma_trace,
-
-  .n_errors = IXGE_N_ERROR,
-  .error_strings = ixge_error_strings,
-
-  .n_next_nodes = IXGE_RX_N_NEXT,
-  .next_nodes = {
-    [IXGE_RX_NEXT_DROP] = "error-drop",
-    [IXGE_RX_NEXT_ETHERNET_INPUT] = "ethernet-input",
-    [IXGE_RX_NEXT_IP4_INPUT] = "ip4-input",
-    [IXGE_RX_NEXT_IP6_INPUT] = "ip6-input",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH_CLONE (ixge_input)
-CLIB_MULTIARCH_SELECT_FN (ixge_input)
-/* *INDENT-ON* */
-
-static u8 *
-format_ixge_device_name (u8 * s, va_list * args)
-{
-  u32 i = va_arg (*args, u32);
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, i);
-  return format (s, "TenGigabitEthernet%U",
-		 format_vlib_pci_handle, &xd->pci_device.bus_address);
-}
-
-#define IXGE_COUNTER_IS_64_BIT (1 << 0)
-#define IXGE_COUNTER_NOT_CLEAR_ON_READ (1 << 1)
-
-static u8 ixge_counter_flags[] = {
-#define _(a,f) 0,
-#define _64(a,f) IXGE_COUNTER_IS_64_BIT,
-  foreach_ixge_counter
-#undef _
-#undef _64
-};
-
-static void
-ixge_update_counters (ixge_device_t * xd)
-{
-  /* Byte offset for counter registers. */
-  static u32 reg_offsets[] = {
-#define _(a,f) (a) / sizeof (u32),
-#define _64(a,f) _(a,f)
-    foreach_ixge_counter
-#undef _
-#undef _64
-  };
-  volatile u32 *r = (volatile u32 *) xd->regs;
-  int i;
-
-  for (i = 0; i < ARRAY_LEN (xd->counters); i++)
-    {
-      u32 o = reg_offsets[i];
-      xd->counters[i] += r[o];
-      if (ixge_counter_flags[i] & IXGE_COUNTER_NOT_CLEAR_ON_READ)
-	r[o] = 0;
-      if (ixge_counter_flags[i] & IXGE_COUNTER_IS_64_BIT)
-	xd->counters[i] += (u64) r[o + 1] << (u64) 32;
-    }
-}
-
-static u8 *
-format_ixge_device_id (u8 * s, va_list * args)
-{
-  u32 device_id = va_arg (*args, u32);
-  char *t = 0;
-  switch (device_id)
-    {
-#define _(f,n) case n: t = #f; break;
-      foreach_ixge_pci_device_id;
-#undef _
-    default:
-      t = 0;
-      break;
-    }
-  if (t == 0)
-    s = format (s, "unknown 0x%x", device_id);
-  else
-    s = format (s, "%s", t);
-  return s;
-}
-
-static u8 *
-format_ixge_link_status (u8 * s, va_list * args)
-{
-  ixge_device_t *xd = va_arg (*args, ixge_device_t *);
-  u32 v = xd->link_status_at_last_link_change;
-
-  s = format (s, "%s", (v & (1 << 30)) ? "up" : "down");
-
-  {
-    char *modes[] = {
-      "1g", "10g parallel", "10g serial", "autoneg",
-    };
-    char *speeds[] = {
-      "unknown", "100m", "1g", "10g",
-    };
-    s = format (s, ", mode %s, speed %s",
-		modes[(v >> 26) & 3], speeds[(v >> 28) & 3]);
-  }
-
-  return s;
-}
-
-static u8 *
-format_ixge_device (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  CLIB_UNUSED (int verbose) = va_arg (*args, int);
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, dev_instance);
-  ixge_phy_t *phy = xd->phys + xd->phy_index;
-  uword indent = format_get_indent (s);
-
-  ixge_update_counters (xd);
-  xd->link_status_at_last_link_change = xd->regs->xge_mac.link_status;
-
-  s = format (s, "Intel 8259X: id %U\n%Ulink %U",
-	      format_ixge_device_id, xd->device_id,
-	      format_white_space, indent + 2, format_ixge_link_status, xd);
-
-  {
-
-    s = format (s, "\n%UPCIe %U", format_white_space, indent + 2,
-		format_vlib_pci_link_speed, &xd->pci_device);
-  }
-
-  s = format (s, "\n%U", format_white_space, indent + 2);
-  if (phy->mdio_address != ~0)
-    s = format (s, "PHY address %d, id 0x%x", phy->mdio_address, phy->id);
-  else if (xd->sfp_eeprom.id == SFP_ID_sfp)
-    s = format (s, "SFP %U", format_sfp_eeprom, &xd->sfp_eeprom);
-  else
-    s = format (s, "PHY not found");
-
-  /* FIXME */
-  {
-    ixge_dma_queue_t *dq = vec_elt_at_index (xd->dma_queues[VLIB_RX], 0);
-    ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_RX, 0);
-    u32 hw_head_index = dr->head_index;
-    u32 sw_head_index = dq->head_index;
-    u32 nitems;
-
-    nitems = ixge_ring_sub (dq, hw_head_index, sw_head_index);
-    s = format (s, "\n%U%d unprocessed, %d total buffers on rx queue 0 ring",
-		format_white_space, indent + 2, nitems, dq->n_descriptors);
-
-    s = format (s, "\n%U%d buffers in driver rx cache",
-		format_white_space, indent + 2,
-		vec_len (xm->rx_buffers_to_add));
-
-    s = format (s, "\n%U%d buffers on tx queue 0 ring",
-		format_white_space, indent + 2,
-		xd->dma_queues[VLIB_TX][0].tx.n_buffers_on_ring);
-  }
-  {
-    u32 i;
-    u64 v;
-    static char *names[] = {
-#define _(a,f) #f,
-#define _64(a,f) _(a,f)
-      foreach_ixge_counter
-#undef _
-#undef _64
-    };
-
-    for (i = 0; i < ARRAY_LEN (names); i++)
-      {
-	v = xd->counters[i] - xd->counters_last_clear[i];
-	if (v != 0)
-	  s = format (s, "\n%U%-40U%16Ld",
-		      format_white_space, indent + 2,
-		      format_c_identifier, names[i], v);
-      }
-  }
-
-  return s;
-}
-
-static void
-ixge_clear_hw_interface_counters (u32 instance)
-{
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, instance);
-  ixge_update_counters (xd);
-  memcpy (xd->counters_last_clear, xd->counters, sizeof (xd->counters));
-}
-
-/*
- * Dynamically redirect all pkts from a specific interface
- * to the specified node
- */
-static void
-ixge_set_interface_next_node (vnet_main_t * vnm, u32 hw_if_index,
-			      u32 node_index)
-{
-  ixge_main_t *xm = &ixge_main;
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, hw->dev_instance);
-
-  /* Shut off redirection */
-  if (node_index == ~0)
-    {
-      xd->per_interface_next_index = node_index;
-      return;
-    }
-
-  xd->per_interface_next_index =
-    vlib_node_add_next (xm->vlib_main, ixge_input_node.index, node_index);
-}
-
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (ixge_device_class) = {
-  .name = "ixge",
-  .tx_function = ixge_interface_tx,
-  .format_device_name = format_ixge_device_name,
-  .format_device = format_ixge_device,
-  .format_tx_trace = format_ixge_tx_dma_trace,
-  .clear_counters = ixge_clear_hw_interface_counters,
-  .admin_up_down_function = ixge_interface_admin_up_down,
-  .rx_redirect_to_node = ixge_set_interface_next_node,
-  .flatten_output_chains = 1,
-};
-/* *INDENT-ON* */
-
-#define IXGE_N_BYTES_IN_RX_BUFFER  (2048)	// DAW-HACK: Set Rx buffer size so all packets < ETH_MTU_SIZE fit in the buffer (i.e. sop & eop for all descriptors).
-
-static clib_error_t *
-ixge_dma_init (ixge_device_t * xd, vlib_rx_or_tx_t rt, u32 queue_index)
-{
-  ixge_main_t *xm = &ixge_main;
-  vlib_main_t *vm = xm->vlib_main;
-  ixge_dma_queue_t *dq;
-  clib_error_t *error = 0;
-
-  vec_validate (xd->dma_queues[rt], queue_index);
-  dq = vec_elt_at_index (xd->dma_queues[rt], queue_index);
-
-  if (!xm->n_descriptors_per_cache_line)
-    xm->n_descriptors_per_cache_line =
-      CLIB_CACHE_LINE_BYTES / sizeof (dq->descriptors[0]);
-
-  if (!xm->n_bytes_in_rx_buffer)
-    xm->n_bytes_in_rx_buffer = IXGE_N_BYTES_IN_RX_BUFFER;
-  xm->n_bytes_in_rx_buffer = round_pow2 (xm->n_bytes_in_rx_buffer, 1024);
-  if (!xm->vlib_buffer_free_list_index)
-    {
-      xm->vlib_buffer_free_list_index =
-	vlib_buffer_get_or_create_free_list (vm, xm->n_bytes_in_rx_buffer,
-					     "ixge rx");
-      ASSERT (xm->vlib_buffer_free_list_index != 0);
-    }
-
-  if (!xm->n_descriptors[rt])
-    xm->n_descriptors[rt] = 4 * VLIB_FRAME_SIZE;
-
-  dq->queue_index = queue_index;
-  dq->n_descriptors =
-    round_pow2 (xm->n_descriptors[rt], xm->n_descriptors_per_cache_line);
-  dq->head_index = dq->tail_index = 0;
-
-  dq->descriptors = vlib_physmem_alloc_aligned (vm, &error,
-						dq->n_descriptors *
-						sizeof (dq->descriptors[0]),
-						128 /* per chip spec */ );
-  if (error)
-    return error;
-
-  memset (dq->descriptors, 0,
-	  dq->n_descriptors * sizeof (dq->descriptors[0]));
-  vec_resize (dq->descriptor_buffer_indices, dq->n_descriptors);
-
-  if (rt == VLIB_RX)
-    {
-      u32 n_alloc, i;
-
-      n_alloc = vlib_buffer_alloc_from_free_list
-	(vm, dq->descriptor_buffer_indices,
-	 vec_len (dq->descriptor_buffer_indices),
-	 xm->vlib_buffer_free_list_index);
-      ASSERT (n_alloc == vec_len (dq->descriptor_buffer_indices));
-      for (i = 0; i < n_alloc; i++)
-	{
-	  vlib_buffer_t *b =
-	    vlib_get_buffer (vm, dq->descriptor_buffer_indices[i]);
-	  dq->descriptors[i].rx_to_hw.tail_address =
-	    vlib_physmem_virtual_to_physical (vm, b->data);
-	}
-    }
-  else
-    {
-      u32 i;
-
-      dq->tx.head_index_write_back =
-	vlib_physmem_alloc (vm, &error, CLIB_CACHE_LINE_BYTES);
-
-      for (i = 0; i < dq->n_descriptors; i++)
-	dq->descriptors[i].tx = xm->tx_descriptor_template;
-
-      vec_validate (xm->tx_buffers_pending_free, dq->n_descriptors - 1);
-    }
-
-  {
-    ixge_dma_regs_t *dr = get_dma_regs (xd, rt, queue_index);
-    u64 a;
-
-    a = vlib_physmem_virtual_to_physical (vm, dq->descriptors);
-    dr->descriptor_address[0] = a & 0xFFFFFFFF;
-    dr->descriptor_address[1] = a >> (u64) 32;
-    dr->n_descriptor_bytes = dq->n_descriptors * sizeof (dq->descriptors[0]);
-    dq->head_index = dq->tail_index = 0;
-
-    if (rt == VLIB_RX)
-      {
-	ASSERT ((xm->n_bytes_in_rx_buffer / 1024) < 32);
-	dr->rx_split_control =
-	  ( /* buffer size */ ((xm->n_bytes_in_rx_buffer / 1024) << 0)
-	   | (			/* lo free descriptor threshold (units of 64 descriptors) */
-	       (1 << 22)) | (	/* descriptor type: advanced one buffer */
-			      (1 << 25)) | (	/* drop if no descriptors available */
-					     (1 << 28)));
-
-	/* Give hardware all but last 16 cache lines' worth of descriptors. */
-	dq->tail_index = dq->n_descriptors -
-	  16 * xm->n_descriptors_per_cache_line;
-      }
-    else
-      {
-	/* Make sure its initialized before hardware can get to it. */
-	dq->tx.head_index_write_back[0] = dq->head_index;
-
-	a =
-	  vlib_physmem_virtual_to_physical (vm, dq->tx.head_index_write_back);
-	dr->tx.head_index_write_back_address[0] = /* enable bit */ 1 | a;
-	dr->tx.head_index_write_back_address[1] = (u64) a >> (u64) 32;
-      }
-
-    /* DMA on 82599 does not work with [13] rx data write relaxed ordering
-       and [12] undocumented set. */
-    if (rt == VLIB_RX)
-      dr->dca_control &= ~((1 << 13) | (1 << 12));
-
-    CLIB_MEMORY_BARRIER ();
-
-    if (rt == VLIB_TX)
-      {
-	xd->regs->tx_dma_control |= (1 << 0);
-	dr->control |= ((32 << 0)	/* prefetch threshold */
-			| (64 << 8)	/* host threshold */
-			| (0 << 16) /* writeback threshold */ );
-      }
-
-    /* Enable this queue and wait for hardware to initialize
-       before adding to tail. */
-    if (rt == VLIB_TX)
-      {
-	dr->control |= 1 << 25;
-	while (!(dr->control & (1 << 25)))
-	  ;
-      }
-
-    /* Set head/tail indices and enable DMA. */
-    dr->head_index = dq->head_index;
-    dr->tail_index = dq->tail_index;
-  }
-
-  return error;
-}
-
-static u32
-ixge_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hw, u32 flags)
-{
-  ixge_device_t *xd;
-  ixge_regs_t *r;
-  u32 old;
-  ixge_main_t *xm = &ixge_main;
-
-  xd = vec_elt_at_index (xm->devices, hw->dev_instance);
-  r = xd->regs;
-
-  old = r->filter_control;
-
-  if (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL)
-    r->filter_control = old | (1 << 9) /* unicast promiscuous */ ;
-  else
-    r->filter_control = old & ~(1 << 9);
-
-  return old;
-}
-
-static void
-ixge_device_init (ixge_main_t * xm)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ixge_device_t *xd;
-
-  /* Reset chip(s). */
-  vec_foreach (xd, xm->devices)
-  {
-    ixge_regs_t *r = xd->regs;
-    const u32 reset_bit = (1 << 26) | (1 << 3);
-
-    r->control |= reset_bit;
-
-    /* No need to suspend.  Timed to take ~1e-6 secs */
-    while (r->control & reset_bit)
-      ;
-
-    /* Software loaded. */
-    r->extended_control |= (1 << 28);
-
-    ixge_phy_init (xd);
-
-    /* Register ethernet interface. */
-    {
-      u8 addr8[6];
-      u32 i, addr32[2];
-      clib_error_t *error;
-
-      addr32[0] = r->rx_ethernet_address0[0][0];
-      addr32[1] = r->rx_ethernet_address0[0][1];
-      for (i = 0; i < 6; i++)
-	addr8[i] = addr32[i / 4] >> ((i % 4) * 8);
-
-      error = ethernet_register_interface
-	(vnm, ixge_device_class.index, xd->device_index,
-	 /* ethernet address */ addr8,
-	 &xd->vlib_hw_if_index, ixge_flag_change);
-      if (error)
-	clib_error_report (error);
-    }
-
-    {
-      vnet_sw_interface_t *sw =
-	vnet_get_hw_sw_interface (vnm, xd->vlib_hw_if_index);
-      xd->vlib_sw_if_index = sw->sw_if_index;
-    }
-
-    ixge_dma_init (xd, VLIB_RX, /* queue_index */ 0);
-
-    xm->n_descriptors[VLIB_TX] = 20 * VLIB_FRAME_SIZE;
-
-    ixge_dma_init (xd, VLIB_TX, /* queue_index */ 0);
-
-    /* RX/TX queue 0 gets mapped to interrupt bits 0 & 8. */
-    r->interrupt.queue_mapping[0] = (( /* valid bit */ (1 << 7) |
-				      ixge_rx_queue_to_interrupt (0)) << 0);
-
-    r->interrupt.queue_mapping[0] |= (( /* valid bit */ (1 << 7) |
-				       ixge_tx_queue_to_interrupt (0)) << 8);
-
-    /* No use in getting too many interrupts.
-       Limit them to one every 3/4 ring size at line rate
-       min sized packets.
-       No need for this since kernel/vlib main loop provides adequate interrupt
-       limiting scheme. */
-    if (0)
-      {
-	f64 line_rate_max_pps =
-	  10e9 / (8 * (64 + /* interframe padding */ 20));
-	ixge_throttle_queue_interrupt (r, 0,
-				       .75 * xm->n_descriptors[VLIB_RX] /
-				       line_rate_max_pps);
-      }
-
-    /* Accept all multicast and broadcast packets. Should really add them
-       to the dst_ethernet_address register array. */
-    r->filter_control |= (1 << 10) | (1 << 8);
-
-    /* Enable frames up to size in mac frame size register. */
-    r->xge_mac.control |= 1 << 2;
-    r->xge_mac.rx_max_frame_size = (9216 + 14) << 16;
-
-    /* Enable all interrupts. */
-    if (!IXGE_ALWAYS_POLL)
-      r->interrupt.enable_write_1_to_set = ~0;
-  }
-}
-
-static uword
-ixge_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd;
-  uword event_type, *event_data = 0;
-  f64 timeout, link_debounce_deadline;
-
-  ixge_device_init (xm);
-
-  /* Clear all counters. */
-  vec_foreach (xd, xm->devices)
-  {
-    ixge_update_counters (xd);
-    memset (xd->counters, 0, sizeof (xd->counters));
-  }
-
-  timeout = 30.0;
-  link_debounce_deadline = 1e70;
-
-  while (1)
-    {
-      /* 36 bit stat counters could overflow in ~50 secs.
-         We poll every 30 secs to be conservative. */
-      vlib_process_wait_for_event_or_clock (vm, timeout);
-
-      event_type = vlib_process_get_events (vm, &event_data);
-
-      switch (event_type)
-	{
-	case EVENT_SET_FLAGS:
-	  /* 1 ms */
-	  link_debounce_deadline = vlib_time_now (vm) + 1e-3;
-	  timeout = 1e-3;
-	  break;
-
-	case ~0:
-	  /* No events found: timer expired. */
-	  if (vlib_time_now (vm) > link_debounce_deadline)
-	    {
-	      vec_foreach (xd, xm->devices)
-	      {
-		ixge_regs_t *r = xd->regs;
-		u32 v = r->xge_mac.link_status;
-		uword is_up = (v & (1 << 30)) != 0;
-
-		vnet_hw_interface_set_flags
-		  (vnm, xd->vlib_hw_if_index,
-		   is_up ? VNET_HW_INTERFACE_FLAG_LINK_UP : 0);
-	      }
-	      link_debounce_deadline = 1e70;
-	      timeout = 30.0;
-	    }
-	  break;
-
-	default:
-	  ASSERT (0);
-	}
-
-      if (event_data)
-	_vec_len (event_data) = 0;
-
-      /* Query stats every 30 secs. */
-      {
-	f64 now = vlib_time_now (vm);
-	if (now - xm->time_last_stats_update > 30)
-	  {
-	    xm->time_last_stats_update = now;
-	    vec_foreach (xd, xm->devices) ixge_update_counters (xd);
-	  }
-      }
-    }
-
-  return 0;
-}
-
-static vlib_node_registration_t ixge_process_node = {
-  .function = ixge_process,
-  .type = VLIB_NODE_TYPE_PROCESS,
-  .name = "ixge-process",
-};
-
-clib_error_t *
-ixge_init (vlib_main_t * vm)
-{
-  ixge_main_t *xm = &ixge_main;
-  clib_error_t *error;
-
-  xm->vlib_main = vm;
-  memset (&xm->tx_descriptor_template, 0,
-	  sizeof (xm->tx_descriptor_template));
-  memset (&xm->tx_descriptor_template_mask, 0,
-	  sizeof (xm->tx_descriptor_template_mask));
-  xm->tx_descriptor_template.status0 =
-    (IXGE_TX_DESCRIPTOR_STATUS0_ADVANCED |
-     IXGE_TX_DESCRIPTOR_STATUS0_IS_ADVANCED |
-     IXGE_TX_DESCRIPTOR_STATUS0_INSERT_FCS);
-  xm->tx_descriptor_template_mask.status0 = 0xffff;
-  xm->tx_descriptor_template_mask.status1 = 0x00003fff;
-
-  xm->tx_descriptor_template_mask.status0 &=
-    ~(IXGE_TX_DESCRIPTOR_STATUS0_IS_END_OF_PACKET
-      | IXGE_TX_DESCRIPTOR_STATUS0_REPORT_STATUS);
-  xm->tx_descriptor_template_mask.status1 &=
-    ~(IXGE_TX_DESCRIPTOR_STATUS1_DONE);
-
-  error = vlib_call_init_function (vm, pci_bus_init);
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (ixge_init);
-
-
-static void
-ixge_pci_intr_handler (vlib_pci_device_t * dev)
-{
-  ixge_main_t *xm = &ixge_main;
-  vlib_main_t *vm = xm->vlib_main;
-
-  vlib_node_set_interrupt_pending (vm, ixge_input_node.index);
-
-  /* Let node know which device is interrupting. */
-  {
-    vlib_node_runtime_t *rt =
-      vlib_node_get_runtime (vm, ixge_input_node.index);
-    rt->runtime_data[0] |= 1 << dev->private_data;
-  }
-}
-
-static clib_error_t *
-ixge_pci_init (vlib_main_t * vm, vlib_pci_device_t * dev)
-{
-  ixge_main_t *xm = &ixge_main;
-  clib_error_t *error;
-  void *r;
-  ixge_device_t *xd;
-
-  /* Device found: make sure we have dma memory. */
-  if (unix_physmem_is_fake (vm))
-    return clib_error_return (0, "no physical memory available");
-
-  error = vlib_pci_map_resource (dev, 0, &r);
-  if (error)
-    return error;
-
-  vec_add2 (xm->devices, xd, 1);
-
-  if (vec_len (xm->devices) == 1)
-    {
-      ixge_input_node.function = ixge_input_multiarch_select ();
-    }
-
-  xd->pci_device = dev[0];
-  xd->device_id = xd->pci_device.config0.header.device_id;
-  xd->regs = r;
-  xd->device_index = xd - xm->devices;
-  xd->pci_function = dev->bus_address.function;
-  xd->per_interface_next_index = ~0;
-
-
-  /* Chip found so enable node. */
-  {
-    vlib_node_set_state (vm, ixge_input_node.index,
-			 (IXGE_ALWAYS_POLL
-			  ? VLIB_NODE_STATE_POLLING
-			  : VLIB_NODE_STATE_INTERRUPT));
-
-    dev->private_data = xd->device_index;
-  }
-
-  if (vec_len (xm->devices) == 1)
-    {
-      vlib_register_node (vm, &ixge_process_node);
-      xm->process_node_index = ixge_process_node.index;
-    }
-
-  error = vlib_pci_bus_master_enable (dev);
-
-  if (error)
-    return error;
-
-  return vlib_pci_intr_enable (dev);
-}
-
-/* *INDENT-OFF* */
-PCI_REGISTER_DEVICE (ixge_pci_device_registration,static) = {
-  .init_function = ixge_pci_init,
-  .interrupt_handler = ixge_pci_intr_handler,
-  .supported_devices = {
-#define _(t,i) { .vendor_id = PCI_VENDOR_ID_INTEL, .device_id = i, },
-    foreach_ixge_pci_device_id
-#undef _
-    { 0 },
-  },
-};
-/* *INDENT-ON* */
-
-void
-ixge_set_next_node (ixge_rx_next_t next, char *name)
-{
-  vlib_node_registration_t *r = &ixge_input_node;
-
-  switch (next)
-    {
-    case IXGE_RX_NEXT_IP4_INPUT:
-    case IXGE_RX_NEXT_IP6_INPUT:
-    case IXGE_RX_NEXT_ETHERNET_INPUT:
-      r->next_nodes[next] = name;
-      break;
-
-    default:
-      clib_warning ("%s: illegal next %d\n", __FUNCTION__, next);
-      break;
-    }
-}
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/nic/ixge.h b/vnet/vnet/devices/nic/ixge.h
deleted file mode 100644
index a8e652dc..00000000
--- a/vnet/vnet/devices/nic/ixge.h
+++ /dev/null
@@ -1,1293 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_ixge_h
-#define included_ixge_h
-
-#include <vnet/vnet.h>
-#include <vlib/pci/pci.h>
-#include <vlib/i2c.h>
-#include <vnet/devices/nic/sfp.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-
-typedef volatile struct
-{
-  /* [31:7] 128 byte aligned. */
-  u32 descriptor_address[2];
-  u32 n_descriptor_bytes;
-
-  /* [5] rx/tx descriptor dca enable
-     [6] rx packet head dca enable
-     [7] rx packet tail dca enable
-     [9] rx/tx descriptor relaxed order
-     [11] rx/tx descriptor write back relaxed order
-     [13] rx/tx data write/read relaxed order
-     [15] rx head data write relaxed order
-     [31:24] apic id for cpu's cache. */
-  u32 dca_control;
-
-  u32 head_index;
-
-  /* [4:0] tail buffer size (in 1k byte units)
-     [13:8] head buffer size (in 64 byte units)
-     [24:22] lo free descriptors threshold (units of 64 descriptors)
-     [27:25] descriptor type 0 = legacy, 1 = advanced one buffer (e.g. tail),
-     2 = advanced header splitting (head + tail), 5 = advanced header
-     splitting (head only).
-     [28] drop if no descriptors available. */
-  u32 rx_split_control;
-
-  u32 tail_index;
-    CLIB_PAD_FROM_TO (0x1c, 0x28);
-
-  /* [7:0] rx/tx prefetch threshold
-     [15:8] rx/tx host threshold
-     [24:16] rx/tx write back threshold
-     [25] rx/tx enable
-     [26] tx descriptor writeback flush
-     [30] rx strip vlan enable */
-  u32 control;
-
-  u32 rx_coallesce_control;
-
-  union
-  {
-    struct
-    {
-      /* packets bytes lo hi */
-      u32 stats[3];
-
-      u32 unused;
-    } rx;
-
-    struct
-    {
-      u32 unused[2];
-
-      /* [0] enables head write back. */
-      u32 head_index_write_back_address[2];
-    } tx;
-  };
-} ixge_dma_regs_t;
-
-/* Only advanced descriptors are supported. */
-typedef struct
-{
-  u64 tail_address;
-  u64 head_address;
-} ixge_rx_to_hw_descriptor_t;
-
-typedef struct
-{
-  u32 status[3];
-  u16 n_packet_bytes_this_descriptor;
-  u16 vlan_tag;
-} ixge_rx_from_hw_descriptor_t;
-
-#define IXGE_RX_DESCRIPTOR_STATUS0_IS_LAYER2 (1 << (4 + 11))
-/* Valid if not layer2. */
-#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4 (1 << (4 + 0))
-#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4_EXT (1 << (4 + 1))
-#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6 (1 << (4 + 2))
-#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6_EXT (1 << (4 + 3))
-#define IXGE_RX_DESCRIPTOR_STATUS0_IS_TCP (1 << (4 + 4))
-#define IXGE_RX_DESCRIPTOR_STATUS0_IS_UDP (1 << (4 + 5))
-#define IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET(s) (((s) >> 21) & 0x3ff)
-
-#define IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE (1 << (0 + 0))
-#define IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET (1 << (0 + 1))
-#define IXGE_RX_DESCRIPTOR_STATUS2_IS_VLAN (1 << (0 + 3))
-#define IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED (1 << (0 + 4))
-#define IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED (1 << (0 + 5))
-#define IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED (1 << (0 + 6))
-#define IXGE_RX_DESCRIPTOR_STATUS2_NOT_UNICAST (1 << (0 + 7))
-#define IXGE_RX_DESCRIPTOR_STATUS2_IS_DOUBLE_VLAN (1 << (0 + 9))
-#define IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR (1 << (0 + 10))
-#define IXGE_RX_DESCRIPTOR_STATUS2_ETHERNET_ERROR (1 << (20 + 9))
-#define IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR (1 << (20 + 10))
-#define IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR (1 << (20 + 11))
-
-/* For layer2 packets stats0 bottom 3 bits give ether type index from filter. */
-#define IXGE_RX_DESCRIPTOR_STATUS0_LAYER2_ETHERNET_TYPE(s) ((s) & 7)
-
-typedef struct
-{
-  u64 buffer_address;
-  u16 n_bytes_this_buffer;
-  u16 status0;
-  u32 status1;
-#define IXGE_TX_DESCRIPTOR_STATUS0_ADVANCED (3 << 4)
-#define IXGE_TX_DESCRIPTOR_STATUS0_IS_ADVANCED (1 << (8 + 5))
-#define IXGE_TX_DESCRIPTOR_STATUS0_LOG2_REPORT_STATUS (8 + 3)
-#define IXGE_TX_DESCRIPTOR_STATUS0_REPORT_STATUS (1 << IXGE_TX_DESCRIPTOR_STATUS0_LOG2_REPORT_STATUS)
-#define IXGE_TX_DESCRIPTOR_STATUS0_INSERT_FCS (1 << (8 + 1))
-#define IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET (8 + 0)
-#define IXGE_TX_DESCRIPTOR_STATUS0_IS_END_OF_PACKET (1 << IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET)
-#define IXGE_TX_DESCRIPTOR_STATUS1_DONE (1 << 0)
-#define IXGE_TX_DESCRIPTOR_STATUS1_CONTEXT(i) (/* valid */ (1 << 7) | ((i) << 4))
-#define IXGE_TX_DESCRIPTOR_STATUS1_IPSEC_OFFLOAD (1 << (8 + 2))
-#define IXGE_TX_DESCRIPTOR_STATUS1_INSERT_TCP_UDP_CHECKSUM (1 << (8 + 1))
-#define IXGE_TX_DESCRIPTOR_STATUS1_INSERT_IP4_CHECKSUM (1 << (8 + 0))
-#define IXGE_TX_DESCRIPTOR_STATUS0_N_BYTES_THIS_BUFFER(l) ((l) << 0)
-#define IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET(l) ((l) << 14)
-} ixge_tx_descriptor_t;
-
-typedef struct
-{
-  struct
-  {
-    u8 checksum_start_offset;
-    u8 checksum_insert_offset;
-    u16 checksum_end_offset;
-  } ip, tcp;
-  u32 status0;
-
-  u8 status1;
-
-  /* Byte offset after UDP/TCP header. */
-  u8 payload_offset;
-
-  u16 max_tcp_segment_size;
-} __attribute__ ((packed)) ixge_tx_context_descriptor_t;
-
-typedef union
-{
-  ixge_rx_to_hw_descriptor_t rx_to_hw;
-  ixge_rx_from_hw_descriptor_t rx_from_hw;
-  ixge_tx_descriptor_t tx;
-  u32x4 as_u32x4;
-} ixge_descriptor_t;
-
-typedef volatile struct
-{
-  /* [2] pcie master disable
-     [3] mac reset
-     [26] global device reset */
-  u32 control;
-  u32 control_alias;
-  /* [3:2] device id (0 or 1 for dual port chips)
-     [7] link is up
-     [17:10] num vfs
-     [18] io active
-     [19] pcie master enable status */
-  u32 status_read_only;
-    CLIB_PAD_FROM_TO (0xc, 0x18);
-  /* [14] pf reset done
-     [17] relaxed ordering disable
-     [26] extended vlan enable
-     [28] driver loaded */
-  u32 extended_control;
-    CLIB_PAD_FROM_TO (0x1c, 0x20);
-
-  /* software definable pins.
-     sdp_data [7:0]
-     sdp_is_output [15:8]
-     sdp_is_native [23:16]
-     sdp_function [31:24].
-   */
-  u32 sdp_control;
-    CLIB_PAD_FROM_TO (0x24, 0x28);
-
-  /* [0] i2c clock in
-     [1] i2c clock out
-     [2] i2c data in
-     [3] i2c data out */
-  u32 i2c_control;
-    CLIB_PAD_FROM_TO (0x2c, 0x4c);
-  u32 tcp_timer;
-
-    CLIB_PAD_FROM_TO (0x50, 0x200);
-
-  u32 led_control;
-
-    CLIB_PAD_FROM_TO (0x204, 0x600);
-  u32 core_spare;
-    CLIB_PAD_FROM_TO (0x604, 0x700);
-
-  struct
-  {
-    u32 vflr_events_clear[4];
-    u32 mailbox_interrupt_status[4];
-    u32 mailbox_interrupt_enable[4];
-      CLIB_PAD_FROM_TO (0x730, 0x800);
-  } pf_foo;
-
-  struct
-  {
-    u32 status_write_1_to_clear;
-      CLIB_PAD_FROM_TO (0x804, 0x808);
-    u32 status_write_1_to_set;
-      CLIB_PAD_FROM_TO (0x80c, 0x810);
-    u32 status_auto_clear_enable;
-      CLIB_PAD_FROM_TO (0x814, 0x820);
-
-    /* [11:3] minimum inter-interrupt interval
-       (2e-6 units; 20e-6 units for fast ethernet).
-       [15] low-latency interrupt moderation enable
-       [20:16] low-latency interrupt credit
-       [27:21] interval counter
-       [31] write disable for credit and counter (write only). */
-    u32 throttle0[24];
-
-    u32 enable_write_1_to_set;
-      CLIB_PAD_FROM_TO (0x884, 0x888);
-    u32 enable_write_1_to_clear;
-      CLIB_PAD_FROM_TO (0x88c, 0x890);
-    u32 enable_auto_clear;
-    u32 msi_to_eitr_select;
-    /* [3:0] spd 0-3 interrupt detection enable
-       [4] msi-x enable
-       [5] other clear disable (makes other bits in status not clear on read)
-       etc. */
-    u32 control;
-      CLIB_PAD_FROM_TO (0x89c, 0x900);
-
-    /* Defines interrupt mapping for 128 rx + 128 tx queues.
-       64 x 4 8 bit entries.
-       For register [i]:
-       [5:0] bit in interrupt status for rx queue 2*i + 0
-       [7] valid bit
-       [13:8] bit for tx queue 2*i + 0
-       [15] valid bit
-       similar for rx 2*i + 1 and tx 2*i + 1. */
-    u32 queue_mapping[64];
-
-    /* tcp timer [7:0] and other interrupts [15:8] */
-    u32 misc_mapping;
-      CLIB_PAD_FROM_TO (0xa04, 0xa90);
-
-    /* 64 interrupts determined by mappings. */
-    u32 status1_write_1_to_clear[4];
-    u32 enable1_write_1_to_set[4];
-    u32 enable1_write_1_to_clear[4];
-      CLIB_PAD_FROM_TO (0xac0, 0xad0);
-    u32 status1_enable_auto_clear[4];
-      CLIB_PAD_FROM_TO (0xae0, 0x1000);
-  } interrupt;
-
-  ixge_dma_regs_t rx_dma0[64];
-
-    CLIB_PAD_FROM_TO (0x2000, 0x2140);
-  u32 dcb_rx_packet_plane_t4_config[8];
-  u32 dcb_rx_packet_plane_t4_status[8];
-    CLIB_PAD_FROM_TO (0x2180, 0x2300);
-
-  /* reg i defines mapping for 4 rx queues starting at 4*i + 0. */
-  u32 rx_queue_stats_mapping[32];
-  u32 rx_queue_stats_control;
-
-    CLIB_PAD_FROM_TO (0x2384, 0x2410);
-  u32 fc_user_descriptor_ptr[2];
-  u32 fc_buffer_control;
-    CLIB_PAD_FROM_TO (0x241c, 0x2420);
-  u32 fc_rx_dma;
-    CLIB_PAD_FROM_TO (0x2424, 0x2430);
-  u32 dcb_packet_plane_control;
-    CLIB_PAD_FROM_TO (0x2434, 0x2f00);
-
-  u32 rx_dma_control;
-  u32 pf_queue_drop_enable;
-    CLIB_PAD_FROM_TO (0x2f08, 0x2f20);
-  u32 rx_dma_descriptor_cache_config;
-    CLIB_PAD_FROM_TO (0x2f24, 0x3000);
-
-  /* 1 bit. */
-  u32 rx_enable;
-    CLIB_PAD_FROM_TO (0x3004, 0x3008);
-  /* [15:0] ether type (little endian)
-     [31:16] opcode (big endian) */
-  u32 flow_control_control;
-    CLIB_PAD_FROM_TO (0x300c, 0x3020);
-  /* 3 bit traffic class for each of 8 priorities. */
-  u32 rx_priority_to_traffic_class;
-    CLIB_PAD_FROM_TO (0x3024, 0x3028);
-  u32 rx_coallesce_data_buffer_control;
-    CLIB_PAD_FROM_TO (0x302c, 0x3190);
-  u32 rx_packet_buffer_flush_detect;
-    CLIB_PAD_FROM_TO (0x3194, 0x3200);
-  u32 flow_control_tx_timers[4];	/* 2 timer values */
-    CLIB_PAD_FROM_TO (0x3210, 0x3220);
-  u32 flow_control_rx_threshold_lo[8];
-    CLIB_PAD_FROM_TO (0x3240, 0x3260);
-  u32 flow_control_rx_threshold_hi[8];
-    CLIB_PAD_FROM_TO (0x3280, 0x32a0);
-  u32 flow_control_refresh_threshold;
-    CLIB_PAD_FROM_TO (0x32a4, 0x3c00);
-  /* For each of 8 traffic classes (units of bytes). */
-  u32 rx_packet_buffer_size[8];
-    CLIB_PAD_FROM_TO (0x3c20, 0x3d00);
-  u32 flow_control_config;
-    CLIB_PAD_FROM_TO (0x3d04, 0x4200);
-
-  struct
-  {
-    u32 pcs_config;
-      CLIB_PAD_FROM_TO (0x4204, 0x4208);
-    u32 link_control;
-    u32 link_status;
-    u32 pcs_debug[2];
-    u32 auto_negotiation;
-    u32 link_partner_ability;
-    u32 auto_negotiation_tx_next_page;
-    u32 auto_negotiation_link_partner_next_page;
-      CLIB_PAD_FROM_TO (0x4228, 0x4240);
-  } gige_mac;
-
-  struct
-  {
-    /* [0] tx crc enable
-       [2] enable frames up to max frame size register [31:16]
-       [10] pad frames < 64 bytes if specified by user
-       [15] loopback enable
-       [16] mdc hi speed
-       [17] turn off mdc between mdio packets */
-    u32 control;
-
-    /* [5] rx symbol error (all bits clear on read)
-       [6] rx illegal symbol
-       [7] rx idle error
-       [8] rx local fault
-       [9] rx remote fault */
-    u32 status;
-
-    u32 pause_and_pace_control;
-      CLIB_PAD_FROM_TO (0x424c, 0x425c);
-    u32 phy_command;
-    u32 phy_data;
-      CLIB_PAD_FROM_TO (0x4264, 0x4268);
-
-    /* [31:16] max frame size in bytes. */
-    u32 rx_max_frame_size;
-      CLIB_PAD_FROM_TO (0x426c, 0x4288);
-
-    /* [0]
-       [2] pcs receive link up? (latch lo)
-       [7] local fault
-       [1]
-       [0] pcs 10g base r capable
-       [1] pcs 10g base x capable
-       [2] pcs 10g base w capable
-       [10] rx local fault
-       [11] tx local fault
-       [15:14] 2 => device present at this address (else not present) */
-    u32 xgxs_status[2];
-
-    u32 base_x_pcs_status;
-
-    /* [0] pass unrecognized flow control frames
-       [1] discard pause frames
-       [2] rx priority flow control enable (only in dcb mode)
-       [3] rx flow control enable. */
-    u32 flow_control;
-
-    /* [3:0] tx lanes change polarity
-       [7:4] rx lanes change polarity
-       [11:8] swizzle tx lanes
-       [15:12] swizzle rx lanes
-       4 x 2 bit tx lane swap
-       4 x 2 bit rx lane swap. */
-    u32 serdes_control;
-
-    u32 fifo_control;
-
-    /* [0] force link up
-       [1] autoneg ack2 bit to transmit
-       [6:2] autoneg selector field to transmit
-       [8:7] 10g pma/pmd type 0 => xaui, 1 kx4, 2 cx4
-       [9] 1g pma/pmd type 0 => sfi, 1 => kx/bx
-       [10] disable 10g on without main power
-       [11] restart autoneg on transition to dx power state
-       [12] restart autoneg
-       [15:13] link mode:
-       0 => 1g no autoneg
-       1 => 10g kx4 parallel link no autoneg
-       2 => 1g bx autoneg
-       3 => 10g sfi serdes
-       4 => kx4/kx/kr
-       5 => xgmii 1g/100m
-       6 => kx4/kx/kr 1g an
-       7 kx4/kx/kr sgmii.
-       [16] kr support
-       [17] fec requested
-       [18] fec ability
-       etc. */
-    u32 auto_negotiation_control;
-
-    /* [0] signal detect 1g/100m
-       [1] fec signal detect
-       [2] 10g serial pcs fec block lock
-       [3] 10g serial high error rate
-       [4] 10g serial pcs block lock
-       [5] kx/kx4/kr autoneg next page received
-       [6] kx/kx4/kr backplane autoneg next page received
-       [7] link status clear to read
-       [11:8] 10g signal detect (4 lanes) (for serial just lane 0)
-       [12] 10g serial signal detect
-       [16:13] 10g parallel lane sync status
-       [17] 10g parallel align status
-       [18] 1g sync status
-       [19] kx/kx4/kr backplane autoneg is idle
-       [20] 1g autoneg enabled
-       [21] 1g pcs enabled for sgmii
-       [22] 10g xgxs enabled
-       [23] 10g serial fec enabled (forward error detection)
-       [24] 10g kr pcs enabled
-       [25] sgmii enabled
-       [27:26] mac link mode
-       0 => 1g
-       1 => 10g parallel
-       2 => 10g serial
-       3 => autoneg
-       [29:28] link speed
-       1 => 100m
-       2 => 1g
-       3 => 10g
-       [30] link is up
-       [31] kx/kx4/kr backplane autoneg completed successfully. */
-    u32 link_status;
-
-    /* [17:16] pma/pmd for 10g serial
-       0 => kr, 2 => sfi
-       [18] disable dme pages */
-    u32 auto_negotiation_control2;
-
-      CLIB_PAD_FROM_TO (0x42ac, 0x42b0);
-    u32 link_partner_ability[2];
-      CLIB_PAD_FROM_TO (0x42b8, 0x42d0);
-    u32 manageability_control;
-    u32 link_partner_next_page[2];
-      CLIB_PAD_FROM_TO (0x42dc, 0x42e0);
-    u32 kr_pcs_control;
-    u32 kr_pcs_status;
-    u32 fec_status[2];
-      CLIB_PAD_FROM_TO (0x42f0, 0x4314);
-    u32 sgmii_control;
-      CLIB_PAD_FROM_TO (0x4318, 0x4324);
-    u32 link_status2;
-      CLIB_PAD_FROM_TO (0x4328, 0x4900);
-  } xge_mac;
-
-  u32 tx_dcb_control;
-  u32 tx_dcb_descriptor_plane_queue_select;
-  u32 tx_dcb_descriptor_plane_t1_config;
-  u32 tx_dcb_descriptor_plane_t1_status;
-    CLIB_PAD_FROM_TO (0x4910, 0x4950);
-
-  /* For each TC in units of 1k bytes. */
-  u32 tx_packet_buffer_thresholds[8];
-    CLIB_PAD_FROM_TO (0x4970, 0x4980);
-  struct
-  {
-    u32 mmw;
-    u32 config;
-    u32 status;
-    u32 rate_drift;
-  } dcb_tx_rate_scheduler;
-    CLIB_PAD_FROM_TO (0x4990, 0x4a80);
-  u32 tx_dma_control;
-    CLIB_PAD_FROM_TO (0x4a84, 0x4a88);
-  u32 tx_dma_tcp_flags_control[2];
-    CLIB_PAD_FROM_TO (0x4a90, 0x4b00);
-  u32 pf_mailbox[64];
-    CLIB_PAD_FROM_TO (0x4c00, 0x5000);
-
-  /* RX */
-  u32 checksum_control;
-    CLIB_PAD_FROM_TO (0x5004, 0x5008);
-  u32 rx_filter_control;
-    CLIB_PAD_FROM_TO (0x500c, 0x5010);
-  u32 management_vlan_tag[8];
-  u32 management_udp_tcp_ports[8];
-    CLIB_PAD_FROM_TO (0x5050, 0x5078);
-  /* little endian. */
-  u32 extended_vlan_ether_type;
-    CLIB_PAD_FROM_TO (0x507c, 0x5080);
-  /* [1] store/dma bad packets
-     [8] accept all multicast
-     [9] accept all unicast
-     [10] accept all broadcast. */
-  u32 filter_control;
-    CLIB_PAD_FROM_TO (0x5084, 0x5088);
-  /* [15:0] vlan ethernet type (0x8100) little endian
-     [28] cfi bit expected
-     [29] drop packets with unexpected cfi bit
-     [30] vlan filter enable. */
-  u32 vlan_control;
-    CLIB_PAD_FROM_TO (0x508c, 0x5090);
-  /* [1:0] hi bit of ethernet address for 12 bit index into multicast table
-     0 => 47, 1 => 46, 2 => 45, 3 => 43.
-     [2] enable multicast filter
-   */
-  u32 multicast_control;
-    CLIB_PAD_FROM_TO (0x5094, 0x5100);
-  u32 fcoe_rx_control;
-    CLIB_PAD_FROM_TO (0x5104, 0x5108);
-  u32 fc_flt_context;
-    CLIB_PAD_FROM_TO (0x510c, 0x5110);
-  u32 fc_filter_control;
-    CLIB_PAD_FROM_TO (0x5114, 0x5120);
-  u32 rx_message_type_lo;
-    CLIB_PAD_FROM_TO (0x5124, 0x5128);
-  /* [15:0] ethernet type (little endian)
-     [18:16] matche pri in vlan tag
-     [19] priority match enable
-     [25:20] virtualization pool
-     [26] pool enable
-     [27] is fcoe
-     [30] ieee 1588 timestamp enable
-     [31] filter enable.
-     (See ethernet_type_queue_select.) */
-  u32 ethernet_type_queue_filter[8];
-    CLIB_PAD_FROM_TO (0x5148, 0x5160);
-  /* [7:0] l2 ethernet type and
-     [15:8] l2 ethernet type or */
-  u32 management_decision_filters1[8];
-  u32 vf_vm_tx_switch_loopback_enable[2];
-  u32 rx_time_sync_control;
-    CLIB_PAD_FROM_TO (0x518c, 0x5190);
-  u32 management_ethernet_type_filters[4];
-  u32 rx_timestamp_attributes_lo;
-  u32 rx_timestamp_hi;
-  u32 rx_timestamp_attributes_hi;
-    CLIB_PAD_FROM_TO (0x51ac, 0x51b0);
-  u32 pf_virtual_control;
-    CLIB_PAD_FROM_TO (0x51b4, 0x51d8);
-  u32 fc_offset_parameter;
-    CLIB_PAD_FROM_TO (0x51dc, 0x51e0);
-  u32 vf_rx_enable[2];
-  u32 rx_timestamp_lo;
-    CLIB_PAD_FROM_TO (0x51ec, 0x5200);
-  /* 12 bits determined by multicast_control
-     lookup bits in this vector. */
-  u32 multicast_enable[128];
-
-  /* [0] ethernet address [31:0]
-     [1] [15:0] ethernet address [47:32]
-     [31] valid bit.
-     Index 0 is read from eeprom after reset. */
-  u32 rx_ethernet_address0[16][2];
-
-    CLIB_PAD_FROM_TO (0x5480, 0x5800);
-  u32 wake_up_control;
-    CLIB_PAD_FROM_TO (0x5804, 0x5808);
-  u32 wake_up_filter_control;
-    CLIB_PAD_FROM_TO (0x580c, 0x5818);
-  u32 multiple_rx_queue_command_82598;
-    CLIB_PAD_FROM_TO (0x581c, 0x5820);
-  u32 management_control;
-  u32 management_filter_control;
-    CLIB_PAD_FROM_TO (0x5828, 0x5838);
-  u32 wake_up_ip4_address_valid;
-    CLIB_PAD_FROM_TO (0x583c, 0x5840);
-  u32 wake_up_ip4_address_table[4];
-  u32 management_control_to_host;
-    CLIB_PAD_FROM_TO (0x5854, 0x5880);
-  u32 wake_up_ip6_address_table[4];
-
-  /* unicast_and broadcast_and vlan_and ip_address_and
-     etc. */
-  u32 management_decision_filters[8];
-
-  u32 management_ip4_or_ip6_address_filters[4][4];
-    CLIB_PAD_FROM_TO (0x58f0, 0x5900);
-  u32 wake_up_packet_length;
-    CLIB_PAD_FROM_TO (0x5904, 0x5910);
-  u32 management_ethernet_address_filters[4][2];
-    CLIB_PAD_FROM_TO (0x5930, 0x5a00);
-  u32 wake_up_packet_memory[32];
-    CLIB_PAD_FROM_TO (0x5a80, 0x5c00);
-  u32 redirection_table_82598[32];
-  u32 rss_random_keys_82598[10];
-    CLIB_PAD_FROM_TO (0x5ca8, 0x6000);
-
-  ixge_dma_regs_t tx_dma[128];
-
-  u32 pf_vm_vlan_insert[64];
-  u32 tx_dma_tcp_max_alloc_size_requests;
-    CLIB_PAD_FROM_TO (0x8104, 0x8110);
-  u32 vf_tx_enable[2];
-    CLIB_PAD_FROM_TO (0x8118, 0x8120);
-  /* [0] dcb mode enable
-     [1] virtualization mode enable
-     [3:2] number of tcs/qs per pool. */
-  u32 multiple_tx_queues_command;
-    CLIB_PAD_FROM_TO (0x8124, 0x8200);
-  u32 pf_vf_anti_spoof[8];
-  u32 pf_dma_tx_switch_control;
-    CLIB_PAD_FROM_TO (0x8224, 0x82e0);
-  u32 tx_strict_low_latency_queues[4];
-    CLIB_PAD_FROM_TO (0x82f0, 0x8600);
-  u32 tx_queue_stats_mapping_82599[32];
-  u32 tx_queue_packet_counts[32];
-  u32 tx_queue_byte_counts[32][2];
-
-  struct
-  {
-    u32 control;
-    u32 status;
-    u32 buffer_almost_full;
-      CLIB_PAD_FROM_TO (0x880c, 0x8810);
-    u32 buffer_min_ifg;
-      CLIB_PAD_FROM_TO (0x8814, 0x8900);
-  } tx_security;
-
-  struct
-  {
-    u32 index;
-    u32 salt;
-    u32 key[4];
-      CLIB_PAD_FROM_TO (0x8918, 0x8a00);
-  } tx_ipsec;
-
-  struct
-  {
-    u32 capabilities;
-    u32 control;
-    u32 tx_sci[2];
-    u32 sa;
-    u32 sa_pn[2];
-    u32 key[2][4];
-    /* untagged packets, encrypted packets, protected packets,
-       encrypted bytes, protected bytes */
-    u32 stats[5];
-      CLIB_PAD_FROM_TO (0x8a50, 0x8c00);
-  } tx_link_security;
-
-  struct
-  {
-    u32 control;
-    u32 timestamp_value[2];
-    u32 system_time[2];
-    u32 increment_attributes;
-    u32 time_adjustment_offset[2];
-    u32 aux_control;
-    u32 target_time[2][2];
-      CLIB_PAD_FROM_TO (0x8c34, 0x8c3c);
-    u32 aux_time_stamp[2][2];
-      CLIB_PAD_FROM_TO (0x8c4c, 0x8d00);
-  } tx_timesync;
-
-  struct
-  {
-    u32 control;
-    u32 status;
-      CLIB_PAD_FROM_TO (0x8d08, 0x8e00);
-  } rx_security;
-
-  struct
-  {
-    u32 index;
-    u32 ip_address[4];
-    u32 spi;
-    u32 ip_index;
-    u32 key[4];
-    u32 salt;
-    u32 mode;
-      CLIB_PAD_FROM_TO (0x8e34, 0x8f00);
-  } rx_ipsec;
-
-  struct
-  {
-    u32 capabilities;
-    u32 control;
-    u32 sci[2];
-    u32 sa[2];
-    u32 sa_pn[2];
-    u32 key[2][4];
-    /* see datasheet */
-    u32 stats[17];
-      CLIB_PAD_FROM_TO (0x8f84, 0x9000);
-  } rx_link_security;
-
-  /* 4 wake up, 2 management, 2 wake up. */
-  u32 flexible_filters[8][16][4];
-    CLIB_PAD_FROM_TO (0x9800, 0xa000);
-
-  /* 4096 bits. */
-  u32 vlan_filter[128];
-
-  /* [0] ethernet address [31:0]
-     [1] [15:0] ethernet address [47:32]
-     [31] valid bit.
-     Index 0 is read from eeprom after reset. */
-  u32 rx_ethernet_address1[128][2];
-
-  /* select one of 64 pools for each rx address. */
-  u32 rx_ethernet_address_pool_select[128][2];
-    CLIB_PAD_FROM_TO (0xaa00, 0xc800);
-  u32 tx_priority_to_traffic_class;
-    CLIB_PAD_FROM_TO (0xc804, 0xcc00);
-
-  /* In bytes units of 1k.  Total packet buffer is 160k. */
-  u32 tx_packet_buffer_size[8];
-
-    CLIB_PAD_FROM_TO (0xcc20, 0xcd10);
-  u32 tx_manageability_tc_mapping;
-    CLIB_PAD_FROM_TO (0xcd14, 0xcd20);
-  u32 dcb_tx_packet_plane_t2_config[8];
-  u32 dcb_tx_packet_plane_t2_status[8];
-    CLIB_PAD_FROM_TO (0xcd60, 0xce00);
-
-  u32 tx_flow_control_status;
-    CLIB_PAD_FROM_TO (0xce04, 0xd000);
-
-  ixge_dma_regs_t rx_dma1[64];
-
-  struct
-  {
-    /* Bigendian ip4 src/dst address. */
-    u32 src_address[128];
-    u32 dst_address[128];
-
-    /* TCP/UDP ports [15:0] src [31:16] dst; bigendian. */
-    u32 tcp_udp_port[128];
-
-    /* [1:0] protocol tcp, udp, sctp, other
-       [4:2] match priority (highest wins)
-       [13:8] pool
-       [25] src address match disable
-       [26] dst address match disable
-       [27] src port match disable
-       [28] dst port match disable
-       [29] protocol match disable
-       [30] pool match disable
-       [31] enable. */
-    u32 control[128];
-
-    /* [12] size bypass
-       [19:13] must be 0x80
-       [20] low-latency interrupt
-       [27:21] rx queue. */
-    u32 interrupt[128];
-  } ip4_filters;
-
-    CLIB_PAD_FROM_TO (0xea00, 0xeb00);
-  /* 4 bit rss output index indexed by 7 bit hash.
-     128 8 bit fields = 32 registers. */
-  u32 redirection_table_82599[32];
-
-  u32 rss_random_key_82599[10];
-    CLIB_PAD_FROM_TO (0xeba8, 0xec00);
-  /* [15:0] reserved
-     [22:16] rx queue index
-     [29] low-latency interrupt on match
-     [31] enable */
-  u32 ethernet_type_queue_select[8];
-    CLIB_PAD_FROM_TO (0xec20, 0xec30);
-  u32 syn_packet_queue_filter;
-    CLIB_PAD_FROM_TO (0xec34, 0xec60);
-  u32 immediate_interrupt_rx_vlan_priority;
-    CLIB_PAD_FROM_TO (0xec64, 0xec70);
-  u32 rss_queues_per_traffic_class;
-    CLIB_PAD_FROM_TO (0xec74, 0xec90);
-  u32 lli_size_threshold;
-    CLIB_PAD_FROM_TO (0xec94, 0xed00);
-
-  struct
-  {
-    u32 control;
-      CLIB_PAD_FROM_TO (0xed04, 0xed10);
-    u32 table[8];
-      CLIB_PAD_FROM_TO (0xed30, 0xee00);
-  } fcoe_redirection;
-
-  struct
-  {
-    /* [1:0] packet buffer allocation 0 => disabled, else 64k*2^(f-1)
-       [3] packet buffer initialization done
-       [4] perfetch match mode
-       [5] report status in rss field of rx descriptors
-       [7] report status always
-       [14:8] drop queue
-       [20:16] flex 2 byte packet offset (units of 2 bytes)
-       [27:24] max linked list length
-       [31:28] full threshold. */
-    u32 control;
-      CLIB_PAD_FROM_TO (0xee04, 0xee0c);
-
-    u32 data[8];
-
-    /* [1:0] 0 => no action, 1 => add, 2 => remove, 3 => query.
-       [2] valid filter found by query command
-       [3] filter update override
-       [4] ip6 adress table
-       [6:5] l4 protocol reserved, udp, tcp, sctp
-       [7] is ip6
-       [8] clear head/tail
-       [9] packet drop action
-       [10] matched packet generates low-latency interrupt
-       [11] last in linked list
-       [12] collision
-       [15] rx queue enable
-       [22:16] rx queue
-       [29:24] pool. */
-    u32 command;
-
-      CLIB_PAD_FROM_TO (0xee30, 0xee3c);
-    /* ip4 dst/src address, tcp ports, udp ports.
-       set bits mean bit is ignored. */
-    u32 ip4_masks[4];
-    u32 filter_length;
-    u32 usage_stats;
-    u32 failed_usage_stats;
-    u32 filters_match_stats;
-    u32 filters_miss_stats;
-      CLIB_PAD_FROM_TO (0xee60, 0xee68);
-    /* Lookup, signature. */
-    u32 hash_keys[2];
-    /* [15:0] ip6 src address 1 bit per byte
-       [31:16] ip6 dst address. */
-    u32 ip6_mask;
-    /* [0] vlan id
-       [1] vlan priority
-       [2] pool
-       [3] ip protocol
-       [4] flex
-       [5] dst ip6. */
-    u32 other_mask;
-      CLIB_PAD_FROM_TO (0xee78, 0xf000);
-  } flow_director;
-
-  struct
-  {
-    u32 l2_control[64];
-    u32 vlan_pool_filter[64];
-    u32 vlan_pool_filter_bitmap[128];
-    u32 dst_ethernet_address[128];
-    u32 mirror_rule[4];
-    u32 mirror_rule_vlan[8];
-    u32 mirror_rule_pool[8];
-      CLIB_PAD_FROM_TO (0xf650, 0x10010);
-  } pf_bar;
-
-  u32 eeprom_flash_control;
-  /* [0] start
-     [1] done
-     [15:2] address
-     [31:16] read data. */
-  u32 eeprom_read;
-    CLIB_PAD_FROM_TO (0x10018, 0x1001c);
-  u32 flash_access;
-    CLIB_PAD_FROM_TO (0x10020, 0x10114);
-  u32 flash_data;
-  u32 flash_control;
-  u32 flash_read_data;
-    CLIB_PAD_FROM_TO (0x10120, 0x1013c);
-  u32 flash_opcode;
-  u32 software_semaphore;
-    CLIB_PAD_FROM_TO (0x10144, 0x10148);
-  u32 firmware_semaphore;
-    CLIB_PAD_FROM_TO (0x1014c, 0x10160);
-  u32 software_firmware_sync;
-    CLIB_PAD_FROM_TO (0x10164, 0x10200);
-  u32 general_rx_control;
-    CLIB_PAD_FROM_TO (0x10204, 0x11000);
-
-  struct
-  {
-    u32 control;
-      CLIB_PAD_FROM_TO (0x11004, 0x11010);
-    /* [3:0] enable counters
-       [7:4] leaky bucket counter mode
-       [29] reset
-       [30] stop
-       [31] start. */
-    u32 counter_control;
-    /* [7:0],[15:8],[23:16],[31:24] event for counters 0-3.
-       event codes:
-       0x0 bad tlp
-       0x10 reqs that reached timeout
-       etc. */
-    u32 counter_event;
-      CLIB_PAD_FROM_TO (0x11018, 0x11020);
-    u32 counters_clear_on_read[4];
-    u32 counter_config[4];
-    struct
-    {
-      u32 address;
-      u32 data;
-    } indirect_access;
-      CLIB_PAD_FROM_TO (0x11048, 0x11050);
-    u32 extended_control;
-      CLIB_PAD_FROM_TO (0x11054, 0x11064);
-    u32 mirrored_revision_id;
-      CLIB_PAD_FROM_TO (0x11068, 0x11070);
-    u32 dca_requester_id_information;
-
-    /* [0] global disable
-       [4:1] mode: 0 => legacy, 1 => dca 1.0. */
-    u32 dca_control;
-      CLIB_PAD_FROM_TO (0x11078, 0x110b0);
-    /* [0] pci completion abort
-       [1] unsupported i/o address
-       [2] wrong byte enable
-       [3] pci timeout */
-    u32 pcie_interrupt_status;
-      CLIB_PAD_FROM_TO (0x110b4, 0x110b8);
-    u32 pcie_interrupt_enable;
-      CLIB_PAD_FROM_TO (0x110bc, 0x110c0);
-    u32 msi_x_pba_clear[8];
-      CLIB_PAD_FROM_TO (0x110e0, 0x12300);
-  } pcie;
-
-  u32 interrupt_throttle1[128 - 24];
-    CLIB_PAD_FROM_TO (0x124a0, 0x14f00);
-
-  u32 core_analog_config;
-    CLIB_PAD_FROM_TO (0x14f04, 0x14f10);
-  u32 core_common_config;
-    CLIB_PAD_FROM_TO (0x14f14, 0x15f14);
-
-  u32 link_sec_software_firmware_interface;
-} ixge_regs_t;
-
-typedef union
-{
-  struct
-  {
-    /* Addresses bigendian. */
-    union
-    {
-      struct
-      {
-	ip6_address_t src_address;
-	u32 unused[1];
-      } ip6;
-      struct
-      {
-	u32 unused[3];
-	ip4_address_t src_address, dst_address;
-      } ip4;
-    };
-
-    /* [15:0] src port (little endian).
-       [31:16] dst port. */
-    u32 tcp_udp_ports;
-
-    /* [15:0] vlan (cfi bit set to 0).
-       [31:16] flex bytes.  bigendian. */
-    u32 vlan_and_flex_word;
-
-    /* [14:0] hash
-       [15] bucket valid
-       [31:16] signature (signature filers)/sw-index (perfect match). */
-    u32 hash;
-  };
-
-  u32 as_u32[8];
-} ixge_flow_director_key_t;
-
-always_inline void
-ixge_throttle_queue_interrupt (ixge_regs_t * r,
-			       u32 queue_interrupt_index,
-			       f64 inter_interrupt_interval_in_secs)
-{
-  volatile u32 *tr =
-    (queue_interrupt_index < ARRAY_LEN (r->interrupt.throttle0)
-     ? &r->interrupt.throttle0[queue_interrupt_index]
-     : &r->interrupt_throttle1[queue_interrupt_index]);
-  ASSERT (queue_interrupt_index < 128);
-  u32 v;
-  i32 i, mask = (1 << 9) - 1;
-
-  i = flt_round_nearest (inter_interrupt_interval_in_secs / 2e-6);
-  i = i < 1 ? 1 : i;
-  i = i >= mask ? mask : i;
-
-  v = tr[0];
-  v &= ~(mask << 3);
-  v |= i << 3;
-  tr[0] = v;
-}
-
-#define foreach_ixge_counter				\
-  _ (0x40d0, rx_total_packets)				\
-  _64 (0x40c0, rx_total_bytes)				\
-  _ (0x41b0, rx_good_packets_before_filtering)		\
-  _64 (0x41b4, rx_good_bytes_before_filtering)		\
-  _ (0x2f50, rx_dma_good_packets)			\
-  _64 (0x2f54, rx_dma_good_bytes)			\
-  _ (0x2f5c, rx_dma_duplicated_good_packets)		\
-  _64 (0x2f60, rx_dma_duplicated_good_bytes)		\
-  _ (0x2f68, rx_dma_good_loopback_packets)		\
-  _64 (0x2f6c, rx_dma_good_loopback_bytes)		\
-  _ (0x2f74, rx_dma_good_duplicated_loopback_packets)	\
-  _64 (0x2f78, rx_dma_good_duplicated_loopback_bytes)	\
-  _ (0x4074, rx_good_packets)				\
-  _64 (0x4088, rx_good_bytes)				\
-  _ (0x407c, rx_multicast_packets)			\
-  _ (0x4078, rx_broadcast_packets)			\
-  _ (0x405c, rx_64_byte_packets)			\
-  _ (0x4060, rx_65_127_byte_packets)			\
-  _ (0x4064, rx_128_255_byte_packets)			\
-  _ (0x4068, rx_256_511_byte_packets)			\
-  _ (0x406c, rx_512_1023_byte_packets)			\
-  _ (0x4070, rx_gt_1023_byte_packets)			\
-  _ (0x4000, rx_crc_errors)				\
-  _ (0x4120, rx_ip_checksum_errors)			\
-  _ (0x4004, rx_illegal_symbol_errors)			\
-  _ (0x4008, rx_error_symbol_errors)			\
-  _ (0x4034, rx_mac_local_faults)			\
-  _ (0x4038, rx_mac_remote_faults)			\
-  _ (0x4040, rx_length_errors)				\
-  _ (0x41a4, rx_xons)					\
-  _ (0x41a8, rx_xoffs)					\
-  _ (0x40a4, rx_undersize_packets)			\
-  _ (0x40a8, rx_fragments)				\
-  _ (0x40ac, rx_oversize_packets)			\
-  _ (0x40b0, rx_jabbers)				\
-  _ (0x40b4, rx_management_packets)			\
-  _ (0x40b8, rx_management_drops)			\
-  _ (0x3fa0, rx_missed_packets_pool_0)			\
-  _ (0x40d4, tx_total_packets)				\
-  _ (0x4080, tx_good_packets)				\
-  _64 (0x4090, tx_good_bytes)				\
-  _ (0x40f0, tx_multicast_packets)			\
-  _ (0x40f4, tx_broadcast_packets)			\
-  _ (0x87a0, tx_dma_good_packets)			\
-  _64 (0x87a4, tx_dma_good_bytes)			\
-  _ (0x40d8, tx_64_byte_packets)			\
-  _ (0x40dc, tx_65_127_byte_packets)			\
-  _ (0x40e0, tx_128_255_byte_packets)			\
-  _ (0x40e4, tx_256_511_byte_packets)			\
-  _ (0x40e8, tx_512_1023_byte_packets)			\
-  _ (0x40ec, tx_gt_1023_byte_packets)			\
-  _ (0x4010, tx_undersize_drops)			\
-  _ (0x8780, switch_security_violation_packets)		\
-  _ (0x5118, fc_crc_errors)				\
-  _ (0x241c, fc_rx_drops)				\
-  _ (0x2424, fc_last_error_count)			\
-  _ (0x2428, fcoe_rx_packets)				\
-  _ (0x242c, fcoe_rx_dwords)				\
-  _ (0x8784, fcoe_tx_packets)				\
-  _ (0x8788, fcoe_tx_dwords)				\
-  _ (0x1030, queue_0_rx_count)				\
-  _ (0x1430, queue_0_drop_count)			\
-  _ (0x1070, queue_1_rx_count)				\
-  _ (0x1470, queue_1_drop_count)			\
-  _ (0x10b0, queue_2_rx_count)				\
-  _ (0x14b0, queue_2_drop_count)			\
-  _ (0x10f0, queue_3_rx_count)				\
-  _ (0x14f0, queue_3_drop_count)			\
-  _ (0x1130, queue_4_rx_count)				\
-  _ (0x1530, queue_4_drop_count)			\
-  _ (0x1170, queue_5_rx_count)				\
-  _ (0x1570, queue_5_drop_count)			\
-  _ (0x11b0, queue_6_rx_count)				\
-  _ (0x15b0, queue_6_drop_count)			\
-  _ (0x11f0, queue_7_rx_count)				\
-  _ (0x15f0, queue_7_drop_count)			\
-  _ (0x1230, queue_8_rx_count)				\
-  _ (0x1630, queue_8_drop_count)			\
-  _ (0x1270, queue_9_rx_count)				\
-  _ (0x1270, queue_9_drop_count)
-
-
-
-
-typedef enum
-{
-#define _(a,f) IXGE_COUNTER_##f,
-#define _64(a,f) _(a,f)
-  foreach_ixge_counter
-#undef _
-#undef _64
-    IXGE_N_COUNTER,
-} ixge_counter_type_t;
-
-typedef struct
-{
-  u32 mdio_address;
-
-  /* 32 bit ID read from ID registers. */
-  u32 id;
-} ixge_phy_t;
-
-typedef struct
-{
-  /* Cache aligned descriptors. */
-  ixge_descriptor_t *descriptors;
-
-  /* Number of descriptors in table. */
-  u32 n_descriptors;
-
-  /* Software head and tail pointers into descriptor ring. */
-  u32 head_index, tail_index;
-
-  /* Index into dma_queues vector. */
-  u32 queue_index;
-
-  /* Buffer indices corresponding to each active descriptor. */
-  u32 *descriptor_buffer_indices;
-
-  union
-  {
-    struct
-    {
-      u32 *volatile head_index_write_back;
-
-      u32 n_buffers_on_ring;
-    } tx;
-
-    struct
-    {
-      /* Buffer indices to use to replenish each descriptor. */
-      u32 *replenish_buffer_indices;
-
-      vlib_node_runtime_t *node;
-      u32 next_index;
-
-      u32 saved_start_of_packet_buffer_index;
-
-      u32 saved_start_of_packet_next_index;
-      u32 saved_last_buffer_index;
-
-      u32 is_start_of_packet;
-
-      u32 n_descriptors_done_total;
-
-      u32 n_descriptors_done_this_call;
-
-      u32 n_bytes;
-    } rx;
-  };
-} ixge_dma_queue_t;
-
-#define foreach_ixge_pci_device_id		\
-  _ (82598, 0x10b6)				\
-  _ (82598_bx, 0x1508)				\
-  _ (82598af_dual_port, 0x10c6)			\
-  _ (82598af_single_port, 0x10c7)		\
-  _ (82598at, 0x10c8)				\
-  _ (82598at2, 0x150b)				\
-  _ (82598eb_sfp_lom, 0x10db)			\
-  _ (82598eb_cx4, 0x10dd)			\
-  _ (82598_cx4_dual_port, 0x10ec)		\
-  _ (82598_da_dual_port, 0x10f1)		\
-  _ (82598_sr_dual_port_em, 0x10e1)		\
-  _ (82598eb_xf_lr, 0x10f4)			\
-  _ (82599_kx4, 0x10f7)				\
-  _ (82599_kx4_mezz, 0x1514)			\
-  _ (82599_kr, 0x1517)				\
-  _ (82599_combo_backplane, 0x10f8)		\
-  _ (82599_cx4, 0x10f9)				\
-  _ (82599_sfp, 0x10fb)				\
-  _ (82599_backplane_fcoe, 0x152a)		\
-  _ (82599_sfp_fcoe, 0x1529)			\
-  _ (82599_sfp_em, 0x1507)			\
-  _ (82599_xaui_lom, 0x10fc)			\
-  _ (82599_t3_lom, 0x151c)			\
-  _ (x540t, 0x1528)
-
-typedef enum
-{
-#define _(f,n) IXGE_##f = n,
-  foreach_ixge_pci_device_id
-#undef _
-} ixge_pci_device_id_t;
-
-typedef struct
-{
-  /* registers */
-  ixge_regs_t *regs;
-
-  /* Specific next index when using dynamic redirection */
-  u32 per_interface_next_index;
-
-  /* PCI bus info. */
-  vlib_pci_device_t pci_device;
-
-  /* From PCI config space header. */
-  ixge_pci_device_id_t device_id;
-
-  u16 device_index;
-
-  /* 0 or 1. */
-  u16 pci_function;
-
-  /* VLIB interface for this instance. */
-  u32 vlib_hw_if_index, vlib_sw_if_index;
-
-  ixge_dma_queue_t *dma_queues[VLIB_N_RX_TX];
-
-  /* Phy index (0 or 1) and address on MDI bus. */
-  u32 phy_index;
-  ixge_phy_t phys[2];
-
-  /* Value of link_status register at last link change. */
-  u32 link_status_at_last_link_change;
-
-  i2c_bus_t i2c_bus;
-  sfp_eeprom_t sfp_eeprom;
-
-  /* Counters. */
-  u64 counters[IXGE_N_COUNTER], counters_last_clear[IXGE_N_COUNTER];
-} ixge_device_t;
-
-typedef struct
-{
-  vlib_main_t *vlib_main;
-
-  /* Vector of devices. */
-  ixge_device_t *devices;
-
-  /* Descriptor ring sizes. */
-  u32 n_descriptors[VLIB_N_RX_TX];
-
-  /* RX buffer size.  Must be at least 1k; will be rounded to
-     next largest 1k size. */
-  u32 n_bytes_in_rx_buffer;
-
-  u32 n_descriptors_per_cache_line;
-
-  u32 vlib_buffer_free_list_index;
-
-  u32 process_node_index;
-
-  /* Template and mask for initializing/validating TX descriptors. */
-  ixge_tx_descriptor_t tx_descriptor_template, tx_descriptor_template_mask;
-
-  /* Vector of buffers for which TX is done and can be freed. */
-  u32 *tx_buffers_pending_free;
-
-  u32 *rx_buffers_to_add;
-
-  f64 time_last_stats_update;
-} ixge_main_t;
-
-ixge_main_t ixge_main;
-vnet_device_class_t ixge_device_class;
-
-typedef enum
-{
-  IXGE_RX_NEXT_IP4_INPUT,
-  IXGE_RX_NEXT_IP6_INPUT,
-  IXGE_RX_NEXT_ETHERNET_INPUT,
-  IXGE_RX_NEXT_DROP,
-  IXGE_RX_N_NEXT,
-} ixge_rx_next_t;
-
-void ixge_set_next_node (ixge_rx_next_t, char *);
-
-#endif /* included_ixge_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/nic/sfp.c b/vnet/vnet/devices/nic/sfp.c
deleted file mode 100644
index 9e9c008d..00000000
--- a/vnet/vnet/devices/nic/sfp.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/devices/nic/sfp.h>
-
-static u8 *
-format_space_terminated (u8 * s, va_list * args)
-{
-  u32 l = va_arg (*args, u32);
-  u8 *v = va_arg (*args, u8 *);
-  u8 *p;
-
-  for (p = v + l - 1; p >= v && p[0] == ' '; p--)
-    ;
-  vec_add (s, v, clib_min (p - v + 1, l));
-  return s;
-}
-
-static u8 *
-format_sfp_id (u8 * s, va_list * args)
-{
-  u32 id = va_arg (*args, u32);
-  char *t = 0;
-  switch (id)
-    {
-#define _(f) case SFP_ID_##f: t = #f; break;
-      foreach_sfp_id
-#undef _
-    default:
-      return format (s, "unknown 0x%x", id);
-    }
-  return format (s, "%s", t);
-}
-
-static u8 *
-format_sfp_compatibility (u8 * s, va_list * args)
-{
-  u32 c = va_arg (*args, u32);
-  char *t = 0;
-  switch (c)
-    {
-#define _(a,b,f) case SFP_COMPATIBILITY_##f: t = #f; break;
-      foreach_sfp_compatibility
-#undef _
-    default:
-      return format (s, "unknown 0x%x", c);
-    }
-  return format (s, "%s", t);
-}
-
-u32
-sfp_is_comatible (sfp_eeprom_t * e, sfp_compatibility_t c)
-{
-  static struct
-  {
-    u8 byte, bit;
-  } t[] =
-  {
-#define _(a,b,f) { .byte = a, .bit = b, },
-    foreach_sfp_compatibility
-#undef _
-  };
-
-  ASSERT (c < ARRAY_LEN (t));
-  return (e->compatibility[t[c].byte] & (1 << t[c].bit)) != 0;
-}
-
-u8 *
-format_sfp_eeprom (u8 * s, va_list * args)
-{
-  sfp_eeprom_t *e = va_arg (*args, sfp_eeprom_t *);
-  uword indent = format_get_indent (s);
-  int i;
-
-  if (e->id != SFP_ID_sfp)
-    s = format (s, "id %U, ", format_sfp_id, e->id);
-
-  s = format (s, "compatibility:");
-  for (i = 0; i < SFP_N_COMPATIBILITY; i++)
-    if (sfp_is_comatible (e, i))
-      s = format (s, " %U", format_sfp_compatibility, i);
-
-  s = format (s, "\n%Uvendor: %U, part %U",
-	      format_white_space, indent,
-	      format_space_terminated, sizeof (e->vendor_name),
-	      e->vendor_name, format_space_terminated,
-	      sizeof (e->vendor_part_number), e->vendor_part_number);
-  s =
-    format (s, "\n%Urevision: %U, serial: %U, date code: %U",
-	    format_white_space, indent, format_space_terminated,
-	    sizeof (e->vendor_revision), e->vendor_revision,
-	    format_space_terminated, sizeof (e->vendor_serial_number),
-	    e->vendor_serial_number, format_space_terminated,
-	    sizeof (e->vendor_date_code), e->vendor_date_code);
-
-  return s;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/nic/sfp.h b/vnet/vnet/devices/nic/sfp.h
deleted file mode 100644
index a1ac7997..00000000
--- a/vnet/vnet/devices/nic/sfp.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_vnet_optics_sfp_h
-#define included_vnet_optics_sfp_h
-
-#include <vppinfra/format.h>
-
-#define foreach_sfp_id				\
-  _ (unknown)					\
-  _ (gbic)					\
-  _ (on_motherboard)				\
-  _ (sfp)
-
-typedef enum
-{
-#define _(f) SFP_ID_##f,
-  foreach_sfp_id
-#undef _
-} sfp_id_t;
-
-typedef struct
-{
-  u8 id;
-  u8 extended_id;
-  u8 connector_type;
-  u8 compatibility[8];
-  u8 encoding;
-  u8 nominal_bit_rate_100mbits_per_sec;
-  u8 reserved13;
-  u8 link_length[5];
-  u8 reserved19;
-  u8 vendor_name[16];
-  u8 reserved36;
-  u8 vendor_oui[3];
-  u8 vendor_part_number[16];
-  u8 vendor_revision[4];
-  /* 16 bit value network byte order. */
-  u8 laser_wavelength_in_nm[2];
-  u8 reserved62;
-  u8 checksum_0_to_62;
-
-  u8 options[2];
-  u8 max_bit_rate_margin_percent;
-  u8 min_bit_rate_margin_percent;
-  u8 vendor_serial_number[16];
-  u8 vendor_date_code[8];
-  u8 reserved92[3];
-  u8 checksum_63_to_94;
-  u8 vendor_specific[32];
-  u8 reserved128[384];
-
-  /* Vendor specific data follows. */
-  u8 vendor_specific1[0];
-} sfp_eeprom_t;
-
-always_inline uword
-sfp_eeprom_is_valid (sfp_eeprom_t * e)
-{
-  int i;
-  u8 sum = 0;
-  for (i = 0; i < 63; i++)
-    sum += ((u8 *) e)[i];
-  return sum == e->checksum_0_to_62;
-}
-
-/* _ (byte_index, bit_index, name) */
-#define foreach_sfp_compatibility		\
-  _ (0, 4, 10g_base_sr)				\
-  _ (0, 5, 10g_base_lr)				\
-  _ (1, 2, oc48_long_reach)			\
-  _ (1, 1, oc48_intermediate_reach)		\
-  _ (1, 0, oc48_short_reach)			\
-  _ (2, 6, oc12_long_reach)			\
-  _ (2, 5, oc12_intermediate_reach)		\
-  _ (2, 4, oc12_short_reach)			\
-  _ (2, 2, oc3_long_reach)			\
-  _ (2, 1, oc3_intermediate_reach)		\
-  _ (2, 0, oc3_short_reach)			\
-  _ (3, 3, 1g_base_t)				\
-  _ (3, 2, 1g_base_cx)				\
-  _ (3, 1, 1g_base_lx)				\
-  _ (3, 0, 1g_base_sx)
-
-typedef enum
-{
-#define _(a,b,f) SFP_COMPATIBILITY_##f,
-  foreach_sfp_compatibility
-#undef _
-    SFP_N_COMPATIBILITY,
-} sfp_compatibility_t;
-
-u32 sfp_is_comatible (sfp_eeprom_t * e, sfp_compatibility_t c);
-
-format_function_t format_sfp_eeprom;
-
-#endif /* included_vnet_optics_sfp_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/ssvm/node.c b/vnet/vnet/devices/ssvm/node.c
deleted file mode 100644
index 3a695b1d..00000000
--- a/vnet/vnet/devices/ssvm/node.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "ssvm_eth.h"
-
-vlib_node_registration_t ssvm_eth_input_node;
-
-typedef struct
-{
-  u32 next_index;
-  u32 sw_if_index;
-} ssvm_eth_input_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_ssvm_eth_input_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ssvm_eth_input_trace_t *t = va_arg (*args, ssvm_eth_input_trace_t *);
-
-  s = format (s, "SSVM_ETH_INPUT: sw_if_index %d, next index %d",
-	      t->sw_if_index, t->next_index);
-  return s;
-}
-
-vlib_node_registration_t ssvm_eth_input_node;
-
-#define foreach_ssvm_eth_input_error \
-_(NO_BUFFERS, "Rx packet drops (no buffers)")
-
-typedef enum
-{
-#define _(sym,str) SSVM_ETH_INPUT_ERROR_##sym,
-  foreach_ssvm_eth_input_error
-#undef _
-    SSVM_ETH_INPUT_N_ERROR,
-} ssvm_eth_input_error_t;
-
-static char *ssvm_eth_input_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ssvm_eth_input_error
-#undef _
-};
-
-typedef enum
-{
-  SSVM_ETH_INPUT_NEXT_DROP,
-  SSVM_ETH_INPUT_NEXT_ETHERNET_INPUT,
-  SSVM_ETH_INPUT_NEXT_IP4_INPUT,
-  SSVM_ETH_INPUT_NEXT_IP6_INPUT,
-  SSVM_ETH_INPUT_NEXT_MPLS_INPUT,
-  SSVM_ETH_INPUT_N_NEXT,
-} ssvm_eth_input_next_t;
-
-static inline uword
-ssvm_eth_device_input (ssvm_eth_main_t * em,
-		       ssvm_private_t * intfc, vlib_node_runtime_t * node)
-{
-  ssvm_shared_header_t *sh = intfc->sh;
-  vlib_main_t *vm = em->vlib_main;
-  unix_shared_memory_queue_t *q;
-  ssvm_eth_queue_elt_t *elt, *elts;
-  u32 elt_index;
-  u32 my_pid = intfc->my_pid;
-  int rx_queue_index;
-  u32 n_to_alloc = VLIB_FRAME_SIZE * 2;
-  u32 n_allocated, n_present_in_cache;
-  u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-  vlib_buffer_free_list_t *fl;
-  u32 n_left_to_next, *to_next;
-  u32 next0;
-  u32 n_buffers;
-  u32 n_available;
-  u32 bi0, saved_bi0;
-  vlib_buffer_t *b0, *prev;
-  u32 saved_cache_size = 0;
-  ethernet_header_t *eh0;
-  u16 type0;
-  u32 n_rx_bytes = 0, l3_offset0;
-  u32 cpu_index = os_get_cpu_number ();
-  u32 trace_cnt __attribute__ ((unused)) = vlib_get_trace_count (vm, node);
-  volatile u32 *lock;
-  u32 *elt_indices;
-  uword n_trace = vlib_get_trace_count (vm, node);
-
-  /* Either side down? buh-bye... */
-  if (pointer_to_uword (sh->opaque[MASTER_ADMIN_STATE_INDEX]) == 0 ||
-      pointer_to_uword (sh->opaque[SLAVE_ADMIN_STATE_INDEX]) == 0)
-    return 0;
-
-  if (intfc->i_am_master)
-    q = (unix_shared_memory_queue_t *) (sh->opaque[TO_MASTER_Q_INDEX]);
-  else
-    q = (unix_shared_memory_queue_t *) (sh->opaque[TO_SLAVE_Q_INDEX]);
-
-  /* Nothing to do? */
-  if (q->cursize == 0)
-    return 0;
-
-  fl = vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-
-  vec_reset_length (intfc->rx_queue);
-
-  lock = (u32 *) q;
-  while (__sync_lock_test_and_set (lock, 1))
-    ;
-  while (q->cursize > 0)
-    {
-      unix_shared_memory_queue_sub_raw (q, (u8 *) & elt_index);
-      ASSERT (elt_index < 2048);
-      vec_add1 (intfc->rx_queue, elt_index);
-    }
-  CLIB_MEMORY_BARRIER ();
-  *lock = 0;
-
-  n_present_in_cache = vec_len (em->buffer_cache);
-
-  if (vec_len (em->buffer_cache) < vec_len (intfc->rx_queue) * 2)
-    {
-      vec_validate (em->buffer_cache,
-		    n_to_alloc + vec_len (em->buffer_cache) - 1);
-      n_allocated =
-	vlib_buffer_alloc (vm, &em->buffer_cache[n_present_in_cache],
-			   n_to_alloc);
-
-      n_present_in_cache += n_allocated;
-      _vec_len (em->buffer_cache) = n_present_in_cache;
-    }
-
-  elts = (ssvm_eth_queue_elt_t *) (sh->opaque[CHUNK_POOL_INDEX]);
-
-  n_buffers = vec_len (intfc->rx_queue);
-  rx_queue_index = 0;
-
-  while (n_buffers > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_buffers > 0 && n_left_to_next > 0)
-	{
-	  elt = elts + intfc->rx_queue[rx_queue_index];
-
-	  saved_cache_size = n_present_in_cache;
-	  if (PREDICT_FALSE (saved_cache_size == 0))
-	    {
-	      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-	      goto out;
-	    }
-	  saved_bi0 = bi0 = em->buffer_cache[--n_present_in_cache];
-	  b0 = vlib_get_buffer (vm, bi0);
-	  prev = 0;
-
-	  while (1)
-	    {
-	      vlib_buffer_init_for_free_list (b0, fl);
-
-	      b0->current_data = elt->current_data_hint;
-	      b0->current_length = elt->length_this_buffer;
-	      b0->total_length_not_including_first_buffer =
-		elt->total_length_not_including_first_buffer;
-
-	      clib_memcpy (b0->data + b0->current_data, elt->data,
-			   b0->current_length);
-
-	      if (PREDICT_FALSE (prev != 0))
-		prev->next_buffer = bi0;
-
-	      if (PREDICT_FALSE (elt->flags & SSVM_BUFFER_NEXT_PRESENT))
-		{
-		  prev = b0;
-		  if (PREDICT_FALSE (n_present_in_cache == 0))
-		    {
-		      vlib_put_next_frame (vm, node, next_index,
-					   n_left_to_next);
-		      goto out;
-		    }
-		  bi0 = em->buffer_cache[--n_present_in_cache];
-		  b0 = vlib_get_buffer (vm, bi0);
-		}
-	      else
-		break;
-	    }
-
-	  saved_cache_size = n_present_in_cache;
-
-	  to_next[0] = saved_bi0;
-	  to_next++;
-	  n_left_to_next--;
-
-	  b0 = vlib_get_buffer (vm, saved_bi0);
-	  eh0 = vlib_buffer_get_current (b0);
-
-	  type0 = clib_net_to_host_u16 (eh0->type);
-
-	  next0 = SSVM_ETH_INPUT_NEXT_ETHERNET_INPUT;
-
-	  if (type0 == ETHERNET_TYPE_IP4)
-	    next0 = SSVM_ETH_INPUT_NEXT_IP4_INPUT;
-	  else if (type0 == ETHERNET_TYPE_IP6)
-	    next0 = SSVM_ETH_INPUT_NEXT_IP6_INPUT;
-	  else if (type0 == ETHERNET_TYPE_MPLS_UNICAST)
-	    next0 = SSVM_ETH_INPUT_NEXT_MPLS_INPUT;
-
-	  l3_offset0 = ((next0 == SSVM_ETH_INPUT_NEXT_IP4_INPUT ||
-			 next0 == SSVM_ETH_INPUT_NEXT_IP6_INPUT ||
-			 next0 == SSVM_ETH_INPUT_NEXT_MPLS_INPUT) ?
-			sizeof (ethernet_header_t) : 0);
-
-	  n_rx_bytes += b0->current_length
-	    + b0->total_length_not_including_first_buffer;
-
-	  b0->current_data += l3_offset0;
-	  b0->current_length -= l3_offset0;
-	  b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = intfc->vlib_hw_if_index;
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-
-	  /*
-	   * Turn this on if you run into
-	   * "bad monkey" contexts, and you want to know exactly
-	   * which nodes they've visited... See main.c...
-	   */
-	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
-
-	  if (PREDICT_FALSE (n_trace > 0))
-	    {
-	      ssvm_eth_input_trace_t *tr;
-
-	      vlib_trace_buffer (vm, node, next0, b0, /* follow_chain */ 1);
-	      vlib_set_trace_count (vm, node, --n_trace);
-
-	      tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
-
-	      tr->next_index = next0;
-	      tr->sw_if_index = intfc->vlib_hw_if_index;
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	  n_buffers--;
-	  rx_queue_index++;
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-out:
-  if (em->buffer_cache)
-    _vec_len (em->buffer_cache) = saved_cache_size;
-  else
-    ASSERT (saved_cache_size == 0);
-
-  ssvm_lock (sh, my_pid, 2);
-
-  ASSERT (vec_len (intfc->rx_queue) > 0);
-
-  n_available = (u32) pointer_to_uword (sh->opaque[CHUNK_POOL_NFREE]);
-  elt_indices = (u32 *) (sh->opaque[CHUNK_POOL_FREELIST_INDEX]);
-
-  clib_memcpy (&elt_indices[n_available], intfc->rx_queue,
-	       vec_len (intfc->rx_queue) * sizeof (u32));
-
-  n_available += vec_len (intfc->rx_queue);
-  sh->opaque[CHUNK_POOL_NFREE] = uword_to_pointer (n_available, void *);
-
-  ssvm_unlock (sh);
-
-  vlib_error_count (vm, node->node_index, SSVM_ETH_INPUT_ERROR_NO_BUFFERS,
-		    n_buffers);
-
-  vlib_increment_combined_counter
-    (vnet_get_main ()->interface_main.combined_sw_if_counters
-     + VNET_INTERFACE_COUNTER_RX, cpu_index,
-     intfc->vlib_hw_if_index, rx_queue_index, n_rx_bytes);
-
-  return rx_queue_index;
-}
-
-static uword
-ssvm_eth_input_node_fn (vlib_main_t * vm,
-			vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  ssvm_eth_main_t *em = &ssvm_eth_main;
-  ssvm_private_t *intfc;
-  uword n_rx_packets = 0;
-
-  vec_foreach (intfc, em->intfcs)
-  {
-    n_rx_packets += ssvm_eth_device_input (em, intfc, node);
-  }
-
-  return n_rx_packets;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ssvm_eth_input_node) = {
-  .function = ssvm_eth_input_node_fn,
-  .name = "ssvm_eth_input",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ssvm_eth_input_trace,
-  .type = VLIB_NODE_TYPE_INPUT,
-  .state = VLIB_NODE_STATE_DISABLED,
-
-  .n_errors = ARRAY_LEN(ssvm_eth_input_error_strings),
-  .error_strings = ssvm_eth_input_error_strings,
-
-  .n_next_nodes = SSVM_ETH_INPUT_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-        [SSVM_ETH_INPUT_NEXT_DROP] = "error-drop",
-        [SSVM_ETH_INPUT_NEXT_ETHERNET_INPUT] = "ethernet-input",
-        [SSVM_ETH_INPUT_NEXT_IP4_INPUT] = "ip4-input",
-        [SSVM_ETH_INPUT_NEXT_IP6_INPUT] = "ip6-input",
-        [SSVM_ETH_INPUT_NEXT_MPLS_INPUT] = "mpls-input",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ssvm_eth_input_node, ssvm_eth_input_node_fn)
-/* *INDENT-ON* */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/ssvm/ssvm_eth.c b/vnet/vnet/devices/ssvm/ssvm_eth.c
deleted file mode 100644
index db4fafa9..00000000
--- a/vnet/vnet/devices/ssvm/ssvm_eth.c
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "ssvm_eth.h"
-
-ssvm_eth_main_t ssvm_eth_main;
-
-#define foreach_ssvm_eth_tx_func_error          \
-_(RING_FULL, "Tx packet drops (ring full)")     \
-_(NO_BUFFERS, "Tx packet drops (no buffers)")   \
-_(ADMIN_DOWN, "Tx packet drops (admin down)")
-
-typedef enum
-{
-#define _(f,s) SSVM_ETH_TX_ERROR_##f,
-  foreach_ssvm_eth_tx_func_error
-#undef _
-    SSVM_ETH_TX_N_ERROR,
-} ssvm_eth_tx_func_error_t;
-
-static u32 ssvm_eth_flag_change (vnet_main_t * vnm,
-				 vnet_hw_interface_t * hi, u32 flags);
-
-int
-ssvm_eth_create (ssvm_eth_main_t * em, u8 * name, int is_master)
-{
-  ssvm_private_t *intfc;
-  void *oldheap;
-  clib_error_t *e;
-  unix_shared_memory_queue_t *q;
-  ssvm_shared_header_t *sh;
-  ssvm_eth_queue_elt_t *elts;
-  u32 *elt_indices;
-  u8 enet_addr[6];
-  int i, rv;
-
-  vec_add2 (em->intfcs, intfc, 1);
-
-  intfc->ssvm_size = em->segment_size;
-  intfc->i_am_master = 1;
-  intfc->name = name;
-  intfc->my_pid = getpid ();
-  if (is_master == 0)
-    {
-      rv = ssvm_slave_init (intfc, 20 /* timeout in seconds */ );
-      if (rv < 0)
-	return rv;
-      goto create_vnet_interface;
-    }
-
-  intfc->requested_va = em->next_base_va;
-  em->next_base_va += em->segment_size;
-  rv = ssvm_master_init (intfc, intfc - em->intfcs /* master index */ );
-
-  if (rv < 0)
-    return rv;
-
-  /* OK, segment created, set up queues and so forth.  */
-
-  sh = intfc->sh;
-  oldheap = ssvm_push_heap (sh);
-
-  q = unix_shared_memory_queue_init (em->queue_elts, sizeof (u32),
-				     0 /* consumer pid not interesting */ ,
-				     0 /* signal not sent */ );
-  sh->opaque[TO_MASTER_Q_INDEX] = (void *) q;
-  q = unix_shared_memory_queue_init (em->queue_elts, sizeof (u32),
-				     0 /* consumer pid not interesting */ ,
-				     0 /* signal not sent */ );
-  sh->opaque[TO_SLAVE_Q_INDEX] = (void *) q;
-
-  /*
-   * Preallocate the requested number of buffer chunks
-   * There must be a better way to do this, etc.
-   * Add some slop to avoid pool reallocation, which will not go well
-   */
-  elts = 0;
-  elt_indices = 0;
-
-  vec_validate_aligned (elts, em->nbuffers - 1, CLIB_CACHE_LINE_BYTES);
-  vec_validate_aligned (elt_indices, em->nbuffers - 1, CLIB_CACHE_LINE_BYTES);
-
-  for (i = 0; i < em->nbuffers; i++)
-    elt_indices[i] = i;
-
-  sh->opaque[CHUNK_POOL_INDEX] = (void *) elts;
-  sh->opaque[CHUNK_POOL_FREELIST_INDEX] = (void *) elt_indices;
-  sh->opaque[CHUNK_POOL_NFREE] = (void *) (uword) em->nbuffers;
-
-  ssvm_pop_heap (oldheap);
-
-create_vnet_interface:
-
-  sh = intfc->sh;
-
-  memset (enet_addr, 0, sizeof (enet_addr));
-  enet_addr[0] = 2;
-  enet_addr[1] = 0xFE;
-  enet_addr[2] = is_master;
-  enet_addr[5] = sh->master_index;
-
-  e = ethernet_register_interface
-    (em->vnet_main, ssvm_eth_device_class.index, intfc - em->intfcs,
-     /* ethernet address */ enet_addr,
-     &intfc->vlib_hw_if_index, ssvm_eth_flag_change);
-
-  if (e)
-    {
-      clib_error_report (e);
-      /* $$$$ unmap offending region? */
-      return VNET_API_ERROR_INVALID_INTERFACE;
-    }
-
-  /* Declare link up */
-  vnet_hw_interface_set_flags (em->vnet_main, intfc->vlib_hw_if_index,
-			       VNET_HW_INTERFACE_FLAG_LINK_UP);
-
-  /* Let the games begin... */
-  if (is_master)
-    sh->ready = 1;
-  return 0;
-}
-
-static clib_error_t *
-ssvm_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  u8 *name;
-  int is_master = 1;
-  int i, rv;
-  ssvm_eth_main_t *em = &ssvm_eth_main;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "base-va %llx", &em->next_base_va))
-	;
-      else if (unformat (input, "segment-size %lld", &em->segment_size))
-	em->segment_size = 1ULL << (max_log2 (em->segment_size));
-      else if (unformat (input, "nbuffers %lld", &em->nbuffers))
-	;
-      else if (unformat (input, "queue-elts %lld", &em->queue_elts))
-	;
-      else if (unformat (input, "slave"))
-	is_master = 0;
-      else if (unformat (input, "%s", &name))
-	vec_add1 (em->names, name);
-      else
-	break;
-    }
-
-  /* No configured instances, we're done... */
-  if (vec_len (em->names) == 0)
-    return 0;
-
-  for (i = 0; i < vec_len (em->names); i++)
-    {
-      rv = ssvm_eth_create (em, em->names[i], is_master);
-      if (rv < 0)
-	return clib_error_return (0, "ssvm_eth_create '%s' failed, error %d",
-				  em->names[i], rv);
-    }
-
-  vlib_node_set_state (vm, ssvm_eth_input_node.index,
-		       VLIB_NODE_STATE_POLLING);
-
-  return 0;
-}
-
-VLIB_CONFIG_FUNCTION (ssvm_config, "ssvm_eth");
-
-
-static clib_error_t *
-ssvm_eth_init (vlib_main_t * vm)
-{
-  ssvm_eth_main_t *em = &ssvm_eth_main;
-
-  if (((sizeof (ssvm_eth_queue_elt_t) / CLIB_CACHE_LINE_BYTES)
-       * CLIB_CACHE_LINE_BYTES) != sizeof (ssvm_eth_queue_elt_t))
-    clib_warning ("ssvm_eth_queue_elt_t size %d not a multiple of %d",
-		  sizeof (ssvm_eth_queue_elt_t), CLIB_CACHE_LINE_BYTES);
-
-  em->vlib_main = vm;
-  em->vnet_main = vnet_get_main ();
-  em->elog_main = &vm->elog_main;
-
-  /* default config param values... */
-
-  em->next_base_va = 0x600000000ULL;
-  /*
-   * Allocate 2 full superframes in each dir (256 x 2 x 2 x 2048 bytes),
-   * 2mb; double that so we have plenty of space... 4mb
-   */
-  em->segment_size = 8 << 20;
-  em->nbuffers = 1024;
-  em->queue_elts = 512;
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ssvm_eth_init);
-
-static char *ssvm_eth_tx_func_error_strings[] = {
-#define _(n,s) s,
-  foreach_ssvm_eth_tx_func_error
-#undef _
-};
-
-static u8 *
-format_ssvm_eth_device_name (u8 * s, va_list * args)
-{
-  u32 i = va_arg (*args, u32);
-
-  s = format (s, "ssvmEthernet%d", i);
-  return s;
-}
-
-static u8 *
-format_ssvm_eth_device (u8 * s, va_list * args)
-{
-  s = format (s, "SSVM Ethernet");
-  return s;
-}
-
-static u8 *
-format_ssvm_eth_tx_trace (u8 * s, va_list * args)
-{
-  s = format (s, "Unimplemented...");
-  return s;
-}
-
-
-static uword
-ssvm_eth_interface_tx (vlib_main_t * vm,
-		       vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  ssvm_eth_main_t *em = &ssvm_eth_main;
-  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
-  ssvm_private_t *intfc = vec_elt_at_index (em->intfcs, rd->dev_instance);
-  ssvm_shared_header_t *sh = intfc->sh;
-  unix_shared_memory_queue_t *q;
-  u32 *from;
-  u32 n_left;
-  ssvm_eth_queue_elt_t *elts, *elt, *prev_elt;
-  u32 my_pid = intfc->my_pid;
-  vlib_buffer_t *b0;
-  u32 bi0;
-  u32 size_this_buffer;
-  u32 chunks_this_buffer;
-  u8 i_am_master = intfc->i_am_master;
-  u32 elt_index;
-  int is_ring_full, interface_down;
-  int i;
-  volatile u32 *queue_lock;
-  u32 n_to_alloc = VLIB_FRAME_SIZE;
-  u32 n_allocated, n_present_in_cache, n_available;
-  u32 *elt_indices;
-
-  if (i_am_master)
-    q = (unix_shared_memory_queue_t *) sh->opaque[TO_SLAVE_Q_INDEX];
-  else
-    q = (unix_shared_memory_queue_t *) sh->opaque[TO_MASTER_Q_INDEX];
-
-  queue_lock = (u32 *) q;
-
-  from = vlib_frame_vector_args (f);
-  n_left = f->n_vectors;
-  is_ring_full = 0;
-  interface_down = 0;
-
-  n_present_in_cache = vec_len (em->chunk_cache);
-
-  /* admin / link up/down check */
-  if (sh->opaque[MASTER_ADMIN_STATE_INDEX] == 0 ||
-      sh->opaque[SLAVE_ADMIN_STATE_INDEX] == 0)
-    {
-      interface_down = 1;
-      goto out;
-    }
-
-  ssvm_lock (sh, my_pid, 1);
-
-  elts = (ssvm_eth_queue_elt_t *) (sh->opaque[CHUNK_POOL_INDEX]);
-  elt_indices = (u32 *) (sh->opaque[CHUNK_POOL_FREELIST_INDEX]);
-  n_available = (u32) pointer_to_uword (sh->opaque[CHUNK_POOL_NFREE]);
-
-  if (n_present_in_cache < n_left * 2)
-    {
-      vec_validate (em->chunk_cache, n_to_alloc + n_present_in_cache - 1);
-
-      n_allocated = n_to_alloc < n_available ? n_to_alloc : n_available;
-
-      if (PREDICT_TRUE (n_allocated > 0))
-	{
-	  clib_memcpy (&em->chunk_cache[n_present_in_cache],
-		       &elt_indices[n_available - n_allocated],
-		       sizeof (u32) * n_allocated);
-	}
-
-      n_present_in_cache += n_allocated;
-      n_available -= n_allocated;
-      sh->opaque[CHUNK_POOL_NFREE] = uword_to_pointer (n_available, void *);
-      _vec_len (em->chunk_cache) = n_present_in_cache;
-    }
-
-  ssvm_unlock (sh);
-
-  while (n_left)
-    {
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-
-      size_this_buffer = vlib_buffer_length_in_chain (vm, b0);
-      chunks_this_buffer = (size_this_buffer + (SSVM_BUFFER_SIZE - 1))
-	/ SSVM_BUFFER_SIZE;
-
-      /* If we're not going to be able to enqueue the buffer, tail drop. */
-      if (q->cursize >= q->maxsize)
-	{
-	  is_ring_full = 1;
-	  break;
-	}
-
-      prev_elt = 0;
-      elt_index = ~0;
-      for (i = 0; i < chunks_this_buffer; i++)
-	{
-	  if (PREDICT_FALSE (n_present_in_cache == 0))
-	    goto out;
-
-	  elt_index = em->chunk_cache[--n_present_in_cache];
-	  elt = elts + elt_index;
-
-	  elt->type = SSVM_PACKET_TYPE;
-	  elt->flags = 0;
-	  elt->total_length_not_including_first_buffer =
-	    b0->total_length_not_including_first_buffer;
-	  elt->length_this_buffer = b0->current_length;
-	  elt->current_data_hint = b0->current_data;
-	  elt->owner = !i_am_master;
-	  elt->tag = 1;
-
-	  clib_memcpy (elt->data, b0->data + b0->current_data,
-		       b0->current_length);
-
-	  if (PREDICT_FALSE (prev_elt != 0))
-	    prev_elt->next_index = elt - elts;
-
-	  if (PREDICT_FALSE (i < (chunks_this_buffer - 1)))
-	    {
-	      elt->flags = SSVM_BUFFER_NEXT_PRESENT;
-	      ASSERT (b0->flags & VLIB_BUFFER_NEXT_PRESENT);
-	      b0 = vlib_get_buffer (vm, b0->next_buffer);
-	    }
-	  prev_elt = elt;
-	}
-
-      while (__sync_lock_test_and_set (queue_lock, 1))
-	;
-
-      unix_shared_memory_queue_add_raw (q, (u8 *) & elt_index);
-      CLIB_MEMORY_BARRIER ();
-      *queue_lock = 0;
-
-      from++;
-      n_left--;
-    }
-
-out:
-  if (PREDICT_FALSE (n_left))
-    {
-      if (is_ring_full)
-	vlib_error_count (vm, node->node_index, SSVM_ETH_TX_ERROR_RING_FULL,
-			  n_left);
-      else if (interface_down)
-	vlib_error_count (vm, node->node_index, SSVM_ETH_TX_ERROR_ADMIN_DOWN,
-			  n_left);
-      else
-	vlib_error_count (vm, node->node_index, SSVM_ETH_TX_ERROR_NO_BUFFERS,
-			  n_left);
-
-      vlib_buffer_free (vm, from, n_left);
-    }
-  else
-    vlib_buffer_free (vm, vlib_frame_vector_args (f), f->n_vectors);
-
-  if (PREDICT_TRUE (vec_len (em->chunk_cache)))
-    _vec_len (em->chunk_cache) = n_present_in_cache;
-
-  return f->n_vectors;
-}
-
-static void
-ssvm_eth_clear_hw_interface_counters (u32 instance)
-{
-  /* Nothing for now */
-}
-
-static clib_error_t *
-ssvm_eth_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index,
-				  u32 flags)
-{
-  vnet_hw_interface_t *hif = vnet_get_hw_interface (vnm, hw_if_index);
-  uword is_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
-  ssvm_eth_main_t *em = &ssvm_eth_main;
-  ssvm_private_t *intfc = vec_elt_at_index (em->intfcs, hif->dev_instance);
-  ssvm_shared_header_t *sh;
-
-  /* publish link-state in shared-memory, to discourage buffer-wasting */
-  sh = intfc->sh;
-  if (intfc->i_am_master)
-    sh->opaque[MASTER_ADMIN_STATE_INDEX] = (void *) is_up;
-  else
-    sh->opaque[SLAVE_ADMIN_STATE_INDEX] = (void *) is_up;
-
-  return 0;
-}
-
-static clib_error_t *
-ssvm_eth_subif_add_del_function (vnet_main_t * vnm,
-				 u32 hw_if_index,
-				 struct vnet_sw_interface_t *st, int is_add)
-{
-  /* Nothing for now */
-  return 0;
-}
-
-/*
- * Dynamically redirect all pkts from a specific interface
- * to the specified node
- */
-static void
-ssvm_eth_set_interface_next_node (vnet_main_t * vnm, u32 hw_if_index,
-				  u32 node_index)
-{
-  ssvm_eth_main_t *em = &ssvm_eth_main;
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  ssvm_private_t *intfc = pool_elt_at_index (em->intfcs, hw->dev_instance);
-
-  /* Shut off redirection */
-  if (node_index == ~0)
-    {
-      intfc->per_interface_next_index = node_index;
-      return;
-    }
-
-  intfc->per_interface_next_index =
-    vlib_node_add_next (em->vlib_main, ssvm_eth_input_node.index, node_index);
-}
-
-static u32
-ssvm_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, u32 flags)
-{
-  /* nothing for now */
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (ssvm_eth_device_class) = {
-  .name = "ssvm-eth",
-  .tx_function = ssvm_eth_interface_tx,
-  .tx_function_n_errors = SSVM_ETH_TX_N_ERROR,
-  .tx_function_error_strings = ssvm_eth_tx_func_error_strings,
-  .format_device_name = format_ssvm_eth_device_name,
-  .format_device = format_ssvm_eth_device,
-  .format_tx_trace = format_ssvm_eth_tx_trace,
-  .clear_counters = ssvm_eth_clear_hw_interface_counters,
-  .admin_up_down_function = ssvm_eth_interface_admin_up_down,
-  .subif_add_del_function = ssvm_eth_subif_add_del_function,
-  .rx_redirect_to_node = ssvm_eth_set_interface_next_node,
-};
-
-VLIB_DEVICE_TX_FUNCTION_MULTIARCH (ssvm_eth_device_class,
-				   ssvm_eth_interface_tx)
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/ssvm/ssvm_eth.h b/vnet/vnet/devices/ssvm/ssvm_eth.h
deleted file mode 100644
index ac611f4e..00000000
--- a/vnet/vnet/devices/ssvm/ssvm_eth.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_ssvm_eth_h__
-#define __included_ssvm_eth_h__
-
-#include <vnet/vnet.h>
-
-#include <vppinfra/elog.h>
-#include <vppinfra/error.h>
-#include <vppinfra/format.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/elog.h>
-#include <vlib/vlib.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/devices/devices.h>
-#include <vnet/ip/ip.h>
-#include <vnet/pg/pg.h>
-#include <vlibmemory/unix_shared_memory_queue.h>
-
-#include <ssvm.h>
-
-extern vnet_device_class_t ssvm_eth_device_class;
-extern vlib_node_registration_t ssvm_eth_input_node;
-
-#define SSVM_BUFFER_SIZE  \
-  (VLIB_BUFFER_DATA_SIZE + VLIB_BUFFER_PRE_DATA_SIZE)
-#define SSVM_PACKET_TYPE 1
-
-typedef struct
-{
-  /* Type of queue element */
-  u8 type;
-  u8 flags;
-#define SSVM_BUFFER_NEXT_PRESENT (1<<0)
-  u8 owner;
-  u8 tag;
-  i16 current_data_hint;
-  u16 length_this_buffer;
-  u16 total_length_not_including_first_buffer;
-  u16 pad;
-  u32 next_index;
-  /* offset 16 */
-  u8 data[SSVM_BUFFER_SIZE];
-  /* pad to an even multiple of 64 octets */
-  u8 pad2[CLIB_CACHE_LINE_BYTES - 16];
-} ssvm_eth_queue_elt_t;
-
-typedef struct
-{
-  /* vector of point-to-point connections */
-  ssvm_private_t *intfcs;
-
-  u32 *buffer_cache;
-  u32 *chunk_cache;
-
-  /* Configurable parameters */
-  /* base address for next placement */
-  u64 next_base_va;
-  u64 segment_size;
-  u64 nbuffers;
-  u64 queue_elts;
-
-  /* Segment names */
-  u8 **names;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-  elog_main_t *elog_main;
-} ssvm_eth_main_t;
-
-ssvm_eth_main_t ssvm_eth_main;
-
-typedef enum
-{
-  CHUNK_POOL_FREELIST_INDEX = 0,
-  CHUNK_POOL_INDEX,
-  CHUNK_POOL_NFREE,
-  TO_MASTER_Q_INDEX,
-  TO_SLAVE_Q_INDEX,
-  MASTER_ADMIN_STATE_INDEX,
-  SLAVE_ADMIN_STATE_INDEX,
-} ssvm_eth_opaque_index_t;
-
-/*
- * debug scaffolding.
- */
-static inline void
-ssvm_eth_validate_freelists (int need_lock)
-{
-#if CLIB_DEBUG > 0
-  ssvm_eth_main_t *em = &ssvm_eth_main;
-  ssvm_private_t *intfc;
-  ssvm_shared_header_t *sh;
-  u32 *elt_indices;
-  u32 n_available;
-  int i;
-
-  for (i = 0; i < vec_len (em->intfcs); i++)
-    {
-      intfc = em->intfcs + i;
-      sh = intfc->sh;
-      u32 my_pid = intfc->my_pid;
-
-      if (need_lock)
-	ssvm_lock (sh, my_pid, 15);
-
-      elt_indices = (u32 *) (sh->opaque[CHUNK_POOL_FREELIST_INDEX]);
-      n_available = (u32) (uword) (sh->opaque[CHUNK_POOL_NFREE]);
-
-      for (i = 0; i < n_available; i++)
-	ASSERT (elt_indices[i] < 2048);
-
-      if (need_lock)
-	ssvm_unlock (sh);
-    }
-#endif
-}
-
-#endif /* __included_ssvm_eth_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/virtio/dir.dox b/vnet/vnet/devices/virtio/dir.dox
deleted file mode 100644
index 50150799..00000000
--- a/vnet/vnet/devices/virtio/dir.dox
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* Doxygen directory documentation */
-
-/**
-@dir
-@brief vHost User Interface Implementation.
-
-This directory contains the source code for vHost User driver.
-
-*/
-/*? %%clicmd:group_label vHost User %% ?*/
-/*? %%syscfg:group_label vHost User %% ?*/
diff --git a/vnet/vnet/devices/virtio/vhost-user.c b/vnet/vnet/devices/virtio/vhost-user.c
deleted file mode 100644
index bde8106c..00000000
--- a/vnet/vnet/devices/virtio/vhost-user.c
+++ /dev/null
@@ -1,3314 +0,0 @@
-/*
- *------------------------------------------------------------------
- * vhost.c - vhost-user
- *
- * Copyright (c) 2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <fcntl.h>		/* for open */
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/uio.h>		/* for iovec */
-#include <netinet/in.h>
-#include <sys/vfs.h>
-
-#include <linux/if_arp.h>
-#include <linux/if_tun.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-
-#include <vnet/ip/ip.h>
-
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/devices/devices.h>
-#include <vnet/feature/feature.h>
-
-#include <vnet/devices/virtio/vhost-user.h>
-
-/**
- * @file
- * @brief vHost User Device Driver.
- *
- * This file contains the source code for vHost User interface.
- */
-
-
-#define VHOST_USER_DEBUG_SOCKET 0
-#define VHOST_DEBUG_VQ 0
-
-#if VHOST_USER_DEBUG_SOCKET == 1
-#define DBG_SOCK(args...) clib_warning(args);
-#else
-#define DBG_SOCK(args...)
-#endif
-
-#if VHOST_DEBUG_VQ == 1
-#define DBG_VQ(args...) clib_warning(args);
-#else
-#define DBG_VQ(args...)
-#endif
-
-/*
- * When an RX queue is down but active, received packets
- * must be discarded. This value controls up to how many
- * packets will be discarded during each round.
- */
-#define VHOST_USER_DOWN_DISCARD_COUNT 256
-
-/*
- * When the number of available buffers gets under this threshold,
- * RX node will start discarding packets.
- */
-#define VHOST_USER_RX_BUFFER_STARVATION 32
-
-/*
- * On the receive side, the host should free descriptors as soon
- * as possible in order to avoid TX drop in the VM.
- * This value controls the number of copy operations that are stacked
- * before copy is done for all and descriptors are given back to
- * the guest.
- * The value 64 was obtained by testing (48 and 128 were not as good).
- */
-#define VHOST_USER_RX_COPY_THRESHOLD 64
-
-#define UNIX_GET_FD(unixfd_idx) \
-    (unixfd_idx != ~0) ? \
-	pool_elt_at_index (unix_main.file_pool, \
-			   unixfd_idx)->file_descriptor : -1;
-
-#define foreach_virtio_trace_flags \
-  _ (SIMPLE_CHAINED, 0, "Simple descriptor chaining") \
-  _ (SINGLE_DESC,  1, "Single descriptor packet") \
-  _ (INDIRECT, 2, "Indirect descriptor") \
-  _ (MAP_ERROR, 4, "Memory mapping error")
-
-typedef enum
-{
-#define _(n,i,s) VIRTIO_TRACE_F_##n,
-  foreach_virtio_trace_flags
-#undef _
-} virtio_trace_flag_t;
-
-vlib_node_registration_t vhost_user_input_node;
-
-#define foreach_vhost_user_tx_func_error      \
-  _(NONE, "no error")  \
-  _(NOT_READY, "vhost vring not ready")  \
-  _(DOWN, "vhost interface is down")  \
-  _(PKT_DROP_NOBUF, "tx packet drops (no available descriptors)")  \
-  _(PKT_DROP_NOMRG, "tx packet drops (cannot merge descriptors)")  \
-  _(MMAP_FAIL, "mmap failure") \
-  _(INDIRECT_OVERFLOW, "indirect descriptor table overflow")
-
-typedef enum
-{
-#define _(f,s) VHOST_USER_TX_FUNC_ERROR_##f,
-  foreach_vhost_user_tx_func_error
-#undef _
-    VHOST_USER_TX_FUNC_N_ERROR,
-} vhost_user_tx_func_error_t;
-
-static char *vhost_user_tx_func_error_strings[] = {
-#define _(n,s) s,
-  foreach_vhost_user_tx_func_error
-#undef _
-};
-
-#define foreach_vhost_user_input_func_error      \
-  _(NO_ERROR, "no error")  \
-  _(NO_BUFFER, "no available buffer")  \
-  _(MMAP_FAIL, "mmap failure")  \
-  _(INDIRECT_OVERFLOW, "indirect descriptor overflows table")  \
-  _(UNDERSIZED_FRAME, "undersized ethernet frame received (< 14 bytes)") \
-  _(FULL_RX_QUEUE, "full rx queue (possible driver tx drop)")
-
-typedef enum
-{
-#define _(f,s) VHOST_USER_INPUT_FUNC_ERROR_##f,
-  foreach_vhost_user_input_func_error
-#undef _
-    VHOST_USER_INPUT_FUNC_N_ERROR,
-} vhost_user_input_func_error_t;
-
-static char *vhost_user_input_func_error_strings[] = {
-#define _(n,s) s,
-  foreach_vhost_user_input_func_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-static vhost_user_main_t vhost_user_main = {
-  .mtu_bytes = 1518,
-};
-
-VNET_HW_INTERFACE_CLASS (vhost_interface_class, static) = {
-  .name = "vhost-user",
-};
-/* *INDENT-ON* */
-
-static u8 *
-format_vhost_user_interface_name (u8 * s, va_list * args)
-{
-  u32 i = va_arg (*args, u32);
-  u32 show_dev_instance = ~0;
-  vhost_user_main_t *vum = &vhost_user_main;
-
-  if (i < vec_len (vum->show_dev_instance_by_real_dev_instance))
-    show_dev_instance = vum->show_dev_instance_by_real_dev_instance[i];
-
-  if (show_dev_instance != ~0)
-    i = show_dev_instance;
-
-  s = format (s, "VirtualEthernet0/0/%d", i);
-  return s;
-}
-
-static int
-vhost_user_name_renumber (vnet_hw_interface_t * hi, u32 new_dev_instance)
-{
-  // FIXME: check if the new dev instance is already used
-  vhost_user_main_t *vum = &vhost_user_main;
-  vec_validate_init_empty (vum->show_dev_instance_by_real_dev_instance,
-			   hi->dev_instance, ~0);
-
-  vum->show_dev_instance_by_real_dev_instance[hi->dev_instance] =
-    new_dev_instance;
-
-  DBG_SOCK ("renumbered vhost-user interface dev_instance %d to %d",
-	    hi->dev_instance, new_dev_instance);
-
-  return 0;
-}
-
-static_always_inline void *
-map_guest_mem (vhost_user_intf_t * vui, uword addr, u32 * hint)
-{
-  int i = *hint;
-  if (PREDICT_TRUE ((vui->regions[i].guest_phys_addr <= addr) &&
-		    ((vui->regions[i].guest_phys_addr +
-		      vui->regions[i].memory_size) > addr)))
-    {
-      return (void *) (vui->region_mmap_addr[i] + addr -
-		       vui->regions[i].guest_phys_addr);
-    }
-#if __SSE4_2__
-  __m128i rl, rh, al, ah, r;
-  al = _mm_set1_epi64x (addr + 1);
-  ah = _mm_set1_epi64x (addr);
-
-  rl = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_lo[0]);
-  rl = _mm_cmpgt_epi64 (al, rl);
-  rh = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_hi[0]);
-  rh = _mm_cmpgt_epi64 (rh, ah);
-  r = _mm_and_si128 (rl, rh);
-
-  rl = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_lo[2]);
-  rl = _mm_cmpgt_epi64 (al, rl);
-  rh = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_hi[2]);
-  rh = _mm_cmpgt_epi64 (rh, ah);
-  r = _mm_blend_epi16 (r, _mm_and_si128 (rl, rh), 0x22);
-
-  rl = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_lo[4]);
-  rl = _mm_cmpgt_epi64 (al, rl);
-  rh = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_hi[4]);
-  rh = _mm_cmpgt_epi64 (rh, ah);
-  r = _mm_blend_epi16 (r, _mm_and_si128 (rl, rh), 0x44);
-
-  rl = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_lo[6]);
-  rl = _mm_cmpgt_epi64 (al, rl);
-  rh = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_hi[6]);
-  rh = _mm_cmpgt_epi64 (rh, ah);
-  r = _mm_blend_epi16 (r, _mm_and_si128 (rl, rh), 0x88);
-
-  r = _mm_shuffle_epi8 (r, _mm_set_epi64x (0, 0x0e060c040a020800));
-  i = __builtin_ctzll (_mm_movemask_epi8 (r));
-
-  if (i < vui->nregions)
-    {
-      *hint = i;
-      return (void *) (vui->region_mmap_addr[i] + addr -
-		       vui->regions[i].guest_phys_addr);
-    }
-
-#else
-  for (i = 0; i < vui->nregions; i++)
-    {
-      if ((vui->regions[i].guest_phys_addr <= addr) &&
-	  ((vui->regions[i].guest_phys_addr + vui->regions[i].memory_size) >
-	   addr))
-	{
-	  *hint = i;
-	  return (void *) (vui->region_mmap_addr[i] + addr -
-			   vui->regions[i].guest_phys_addr);
-	}
-    }
-#endif
-  DBG_VQ ("failed to map guest mem addr %llx", addr);
-  *hint = 0;
-  return 0;
-}
-
-static inline void *
-map_user_mem (vhost_user_intf_t * vui, uword addr)
-{
-  int i;
-  for (i = 0; i < vui->nregions; i++)
-    {
-      if ((vui->regions[i].userspace_addr <= addr) &&
-	  ((vui->regions[i].userspace_addr + vui->regions[i].memory_size) >
-	   addr))
-	{
-	  return (void *) (vui->region_mmap_addr[i] + addr -
-			   vui->regions[i].userspace_addr);
-	}
-    }
-  return 0;
-}
-
-static long
-get_huge_page_size (int fd)
-{
-  struct statfs s;
-  fstatfs (fd, &s);
-  return s.f_bsize;
-}
-
-static void
-unmap_all_mem_regions (vhost_user_intf_t * vui)
-{
-  int i, r;
-  for (i = 0; i < vui->nregions; i++)
-    {
-      if (vui->region_mmap_addr[i] != (void *) -1)
-	{
-
-	  long page_sz = get_huge_page_size (vui->region_mmap_fd[i]);
-
-	  ssize_t map_sz = (vui->regions[i].memory_size +
-			    vui->regions[i].mmap_offset +
-			    page_sz) & ~(page_sz - 1);
-
-	  r =
-	    munmap (vui->region_mmap_addr[i] - vui->regions[i].mmap_offset,
-		    map_sz);
-
-	  DBG_SOCK
-	    ("unmap memory region %d addr 0x%lx len 0x%lx page_sz 0x%x", i,
-	     vui->region_mmap_addr[i], map_sz, page_sz);
-
-	  vui->region_mmap_addr[i] = (void *) -1;
-
-	  if (r == -1)
-	    {
-	      clib_warning ("failed to unmap memory region (errno %d)",
-			    errno);
-	    }
-	  close (vui->region_mmap_fd[i]);
-	}
-    }
-  vui->nregions = 0;
-}
-
-static void
-vhost_user_tx_thread_placement (vhost_user_intf_t * vui)
-{
-  //Let's try to assign one queue to each thread
-  u32 qid = 0;
-  u32 cpu_index = 0;
-  vui->use_tx_spinlock = 0;
-  while (1)
-    {
-      for (qid = 0; qid < VHOST_VRING_MAX_N / 2; qid++)
-	{
-	  vhost_user_vring_t *rxvq = &vui->vrings[VHOST_VRING_IDX_RX (qid)];
-	  if (!rxvq->started || !rxvq->enabled)
-	    continue;
-
-	  vui->per_cpu_tx_qid[cpu_index] = qid;
-	  cpu_index++;
-	  if (cpu_index == vlib_get_thread_main ()->n_vlib_mains)
-	    return;
-	}
-      //We need to loop, meaning the spinlock has to be used
-      vui->use_tx_spinlock = 1;
-      if (cpu_index == 0)
-	{
-	  //Could not find a single valid one
-	  for (cpu_index = 0;
-	       cpu_index < vlib_get_thread_main ()->n_vlib_mains; cpu_index++)
-	    {
-	      vui->per_cpu_tx_qid[cpu_index] = 0;
-	    }
-	  return;
-	}
-    }
-}
-
-static void
-vhost_user_rx_thread_placement ()
-{
-  vhost_user_main_t *vum = &vhost_user_main;
-  vhost_user_intf_t *vui;
-  vhost_cpu_t *vhc;
-  u32 *workers = 0;
-
-  //Let's list all workers cpu indexes
-  u32 i;
-  for (i = vum->input_cpu_first_index;
-       i < vum->input_cpu_first_index + vum->input_cpu_count; i++)
-    {
-      vlib_node_set_state (vlib_mains ? vlib_mains[i] : &vlib_global_main,
-			   vhost_user_input_node.index,
-			   VLIB_NODE_STATE_DISABLED);
-      vec_add1 (workers, i);
-    }
-
-  vec_foreach (vhc, vum->cpus)
-  {
-    vec_reset_length (vhc->rx_queues);
-  }
-
-  i = 0;
-  vhost_iface_and_queue_t iaq;
-  /* *INDENT-OFF* */
-  pool_foreach (vui, vum->vhost_user_interfaces, {
-      u32 *vui_workers = vec_len (vui->workers) ? vui->workers : workers;
-      u32 qid;
-      for (qid = 0; qid < VHOST_VRING_MAX_N / 2; qid++)
-	{
-	  vhost_user_vring_t *txvq =
-	      &vui->vrings[VHOST_VRING_IDX_TX (qid)];
-	  if (!txvq->started)
-	    continue;
-
-	  i %= vec_len (vui_workers);
-	  u32 cpu_index = vui_workers[i];
-	  i++;
-	  vhc = &vum->cpus[cpu_index];
-
-	  iaq.qid = qid;
-	  iaq.vhost_iface_index = vui - vum->vhost_user_interfaces;
-	  vec_add1 (vhc->rx_queues, iaq);
-	  vlib_node_set_state (vlib_mains ? vlib_mains[cpu_index] :
-	      &vlib_global_main, vhost_user_input_node.index,
-	      VLIB_NODE_STATE_POLLING);
-	}
-  });
-  /* *INDENT-ON* */
-}
-
-static int
-vhost_user_thread_placement (u32 sw_if_index, u32 worker_thread_index, u8 del)
-{
-  vhost_user_main_t *vum = &vhost_user_main;
-  vhost_user_intf_t *vui;
-  vnet_hw_interface_t *hw;
-
-  if (worker_thread_index < vum->input_cpu_first_index ||
-      worker_thread_index >=
-      vum->input_cpu_first_index + vum->input_cpu_count)
-    return -1;
-
-  if (!(hw = vnet_get_sup_hw_interface (vnet_get_main (), sw_if_index)))
-    return -2;
-
-  vui = pool_elt_at_index (vum->vhost_user_interfaces, hw->dev_instance);
-  u32 found = ~0, *w;
-  vec_foreach (w, vui->workers)
-  {
-    if (*w == worker_thread_index)
-      {
-	found = w - vui->workers;
-	break;
-      }
-  }
-
-  if (del)
-    {
-      if (found == ~0)
-	return -3;
-      vec_del1 (vui->workers, found);
-    }
-  else if (found == ~0)
-    {
-      vec_add1 (vui->workers, worker_thread_index);
-    }
-
-  vhost_user_rx_thread_placement ();
-  return 0;
-}
-
-/** @brief Returns whether at least one TX and one RX vring are enabled */
-int
-vhost_user_intf_ready (vhost_user_intf_t * vui)
-{
-  int i, found[2] = { };	//RX + TX
-
-  for (i = 0; i < VHOST_VRING_MAX_N; i++)
-    if (vui->vrings[i].started && vui->vrings[i].enabled)
-      found[i & 1] = 1;
-
-  return found[0] && found[1];
-}
-
-static void
-vhost_user_update_iface_state (vhost_user_intf_t * vui)
-{
-  /* if we have pointers to descriptor table, go up */
-  int is_up = vhost_user_intf_ready (vui);
-  if (is_up != vui->is_up)
-    {
-      DBG_SOCK ("interface %d %s", vui->sw_if_index,
-		is_up ? "ready" : "down");
-      vnet_hw_interface_set_flags (vnet_get_main (), vui->hw_if_index,
-				   is_up ? VNET_HW_INTERFACE_FLAG_LINK_UP :
-				   0);
-      vui->is_up = is_up;
-    }
-  vhost_user_rx_thread_placement ();
-  vhost_user_tx_thread_placement (vui);
-}
-
-static clib_error_t *
-vhost_user_callfd_read_ready (unix_file_t * uf)
-{
-  __attribute__ ((unused)) int n;
-  u8 buff[8];
-  n = read (uf->file_descriptor, ((char *) &buff), 8);
-  return 0;
-}
-
-static clib_error_t *
-vhost_user_kickfd_read_ready (unix_file_t * uf)
-{
-  __attribute__ ((unused)) int n;
-  u8 buff[8];
-  vhost_user_intf_t *vui =
-    pool_elt_at_index (vhost_user_main.vhost_user_interfaces,
-		       uf->private_data >> 8);
-  u32 qid = uf->private_data & 0xff;
-  n = read (uf->file_descriptor, ((char *) &buff), 8);
-  DBG_SOCK ("if %d KICK queue %d", uf->private_data >> 8, qid);
-
-  vlib_worker_thread_barrier_sync (vlib_get_main ());
-  vui->vrings[qid].started = 1;
-  vhost_user_update_iface_state (vui);
-  vlib_worker_thread_barrier_release (vlib_get_main ());
-  return 0;
-}
-
-/**
- * @brief Try once to lock the vring
- * @return 0 on success, non-zero on failure.
- */
-static inline int
-vhost_user_vring_try_lock (vhost_user_intf_t * vui, u32 qid)
-{
-  return __sync_lock_test_and_set (vui->vring_locks[qid], 1);
-}
-
-/**
- * @brief Spin until the vring is successfully locked
- */
-static inline void
-vhost_user_vring_lock (vhost_user_intf_t * vui, u32 qid)
-{
-  while (vhost_user_vring_try_lock (vui, qid))
-    ;
-}
-
-/**
- * @brief Unlock the vring lock
- */
-static inline void
-vhost_user_vring_unlock (vhost_user_intf_t * vui, u32 qid)
-{
-  *vui->vring_locks[qid] = 0;
-}
-
-static inline void
-vhost_user_vring_init (vhost_user_intf_t * vui, u32 qid)
-{
-  vhost_user_vring_t *vring = &vui->vrings[qid];
-  memset (vring, 0, sizeof (*vring));
-  vring->kickfd_idx = ~0;
-  vring->callfd_idx = ~0;
-  vring->errfd = -1;
-
-  /*
-   * We have a bug with some qemu 2.5, and this may be a fix.
-   * Feel like interpretation holy text, but this is from vhost-user.txt.
-   * "
-   * One queue pair is enabled initially. More queues are enabled
-   * dynamically, by sending message VHOST_USER_SET_VRING_ENABLE.
-   * "
-   * Don't know who's right, but this is what DPDK does.
-   */
-  if (qid == 0 || qid == 1)
-    vring->enabled = 1;
-}
-
-static inline void
-vhost_user_vring_close (vhost_user_intf_t * vui, u32 qid)
-{
-  vhost_user_vring_t *vring = &vui->vrings[qid];
-  if (vring->kickfd_idx != ~0)
-    {
-      unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
-					   vring->kickfd_idx);
-      unix_file_del (&unix_main, uf);
-      vring->kickfd_idx = ~0;
-    }
-  if (vring->callfd_idx != ~0)
-    {
-      unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
-					   vring->callfd_idx);
-      unix_file_del (&unix_main, uf);
-      vring->callfd_idx = ~0;
-    }
-  if (vring->errfd != -1)
-    close (vring->errfd);
-  vhost_user_vring_init (vui, qid);
-}
-
-static inline void
-vhost_user_if_disconnect (vhost_user_intf_t * vui)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  int q;
-
-  vnet_hw_interface_set_flags (vnm, vui->hw_if_index, 0);
-
-  if (vui->unix_file_index != ~0)
-    {
-      unix_file_del (&unix_main, unix_main.file_pool + vui->unix_file_index);
-      vui->unix_file_index = ~0;
-    }
-
-  vui->is_up = 0;
-
-  for (q = 0; q < VHOST_VRING_MAX_N; q++)
-    vhost_user_vring_close (vui, q);
-
-  unmap_all_mem_regions (vui);
-  DBG_SOCK ("interface ifindex %d disconnected", vui->sw_if_index);
-}
-
-#define VHOST_LOG_PAGE 0x1000
-static_always_inline void
-vhost_user_log_dirty_pages_2 (vhost_user_intf_t * vui,
-			      u64 addr, u64 len, u8 is_host_address)
-{
-  if (PREDICT_TRUE (vui->log_base_addr == 0
-		    || !(vui->features & (1 << FEAT_VHOST_F_LOG_ALL))))
-    {
-      return;
-    }
-  if (is_host_address)
-    {
-      addr = (u64) map_user_mem (vui, (uword) addr);
-    }
-  if (PREDICT_FALSE ((addr + len - 1) / VHOST_LOG_PAGE / 8 >= vui->log_size))
-    {
-      DBG_SOCK ("vhost_user_log_dirty_pages(): out of range\n");
-      return;
-    }
-
-  CLIB_MEMORY_BARRIER ();
-  u64 page = addr / VHOST_LOG_PAGE;
-  while (page * VHOST_LOG_PAGE < addr + len)
-    {
-      ((u8 *) vui->log_base_addr)[page / 8] |= 1 << page % 8;
-      page++;
-    }
-}
-
-static_always_inline void
-vhost_user_log_dirty_pages (vhost_user_intf_t * vui, u64 addr, u64 len)
-{
-  vhost_user_log_dirty_pages_2 (vui, addr, len, 0);
-}
-
-#define vhost_user_log_dirty_ring(vui, vq, member) \
-  if (PREDICT_FALSE(vq->log_used)) { \
-    vhost_user_log_dirty_pages(vui, vq->log_guest_addr + STRUCT_OFFSET_OF(vring_used_t, member), \
-                             sizeof(vq->used->member)); \
-  }
-
-static clib_error_t *
-vhost_user_socket_read (unix_file_t * uf)
-{
-  int n, i;
-  int fd, number_of_fds = 0;
-  int fds[VHOST_MEMORY_MAX_NREGIONS];
-  vhost_user_msg_t msg;
-  struct msghdr mh;
-  struct iovec iov[1];
-  vhost_user_main_t *vum = &vhost_user_main;
-  vhost_user_intf_t *vui;
-  struct cmsghdr *cmsg;
-  u8 q;
-  unix_file_t template = { 0 };
-  vnet_main_t *vnm = vnet_get_main ();
-
-  vui = pool_elt_at_index (vum->vhost_user_interfaces, uf->private_data);
-
-  char control[CMSG_SPACE (VHOST_MEMORY_MAX_NREGIONS * sizeof (int))];
-
-  memset (&mh, 0, sizeof (mh));
-  memset (control, 0, sizeof (control));
-
-  for (i = 0; i < VHOST_MEMORY_MAX_NREGIONS; i++)
-    fds[i] = -1;
-
-  /* set the payload */
-  iov[0].iov_base = (void *) &msg;
-  iov[0].iov_len = VHOST_USER_MSG_HDR_SZ;
-
-  mh.msg_iov = iov;
-  mh.msg_iovlen = 1;
-  mh.msg_control = control;
-  mh.msg_controllen = sizeof (control);
-
-  n = recvmsg (uf->file_descriptor, &mh, 0);
-
-  /* Stop workers to avoid end of the world */
-  vlib_worker_thread_barrier_sync (vlib_get_main ());
-
-  if (n != VHOST_USER_MSG_HDR_SZ)
-    {
-      if (n == -1)
-	{
-	  DBG_SOCK ("recvmsg returned error %d %s", errno, strerror (errno));
-	}
-      else
-	{
-	  DBG_SOCK ("n (%d) != VHOST_USER_MSG_HDR_SZ (%d)",
-		    n, VHOST_USER_MSG_HDR_SZ);
-	}
-      goto close_socket;
-    }
-
-  if (mh.msg_flags & MSG_CTRUNC)
-    {
-      DBG_SOCK ("MSG_CTRUNC is set");
-      goto close_socket;
-    }
-
-  cmsg = CMSG_FIRSTHDR (&mh);
-
-  if (cmsg && (cmsg->cmsg_len > 0) && (cmsg->cmsg_level == SOL_SOCKET) &&
-      (cmsg->cmsg_type == SCM_RIGHTS) &&
-      (cmsg->cmsg_len - CMSG_LEN (0) <=
-       VHOST_MEMORY_MAX_NREGIONS * sizeof (int)))
-    {
-      number_of_fds = (cmsg->cmsg_len - CMSG_LEN (0)) / sizeof (int);
-      clib_memcpy (fds, CMSG_DATA (cmsg), number_of_fds * sizeof (int));
-    }
-
-  /* version 1, no reply bit set */
-  if ((msg.flags & 7) != 1)
-    {
-      DBG_SOCK ("malformed message received. closing socket");
-      goto close_socket;
-    }
-
-  {
-    int rv;
-    rv =
-      read (uf->file_descriptor, ((char *) &msg) + VHOST_USER_MSG_HDR_SZ,
-	    msg.size);
-    if (rv < 0)
-      {
-	DBG_SOCK ("read failed %s", strerror (errno));
-	goto close_socket;
-      }
-    else if (rv != msg.size)
-      {
-	DBG_SOCK ("message too short (read %dB should be %dB)", rv, msg.size);
-	goto close_socket;
-      }
-  }
-
-  switch (msg.request)
-    {
-    case VHOST_USER_GET_FEATURES:
-      msg.flags |= 4;
-      msg.u64 = (1ULL << FEAT_VIRTIO_NET_F_MRG_RXBUF) |
-	(1ULL << FEAT_VIRTIO_NET_F_CTRL_VQ) |
-	(1ULL << FEAT_VIRTIO_F_ANY_LAYOUT) |
-	(1ULL << FEAT_VIRTIO_F_INDIRECT_DESC) |
-	(1ULL << FEAT_VHOST_F_LOG_ALL) |
-	(1ULL << FEAT_VIRTIO_NET_F_GUEST_ANNOUNCE) |
-	(1ULL << FEAT_VIRTIO_NET_F_MQ) |
-	(1ULL << FEAT_VHOST_USER_F_PROTOCOL_FEATURES) |
-	(1ULL << FEAT_VIRTIO_F_VERSION_1);
-      msg.u64 &= vui->feature_mask;
-      msg.size = sizeof (msg.u64);
-      DBG_SOCK ("if %d msg VHOST_USER_GET_FEATURES - reply 0x%016llx",
-		vui->hw_if_index, msg.u64);
-      break;
-
-    case VHOST_USER_SET_FEATURES:
-      DBG_SOCK ("if %d msg VHOST_USER_SET_FEATURES features 0x%016llx",
-		vui->hw_if_index, msg.u64);
-
-      vui->features = msg.u64;
-
-      if (vui->features &
-	  ((1 << FEAT_VIRTIO_NET_F_MRG_RXBUF) |
-	   (1ULL << FEAT_VIRTIO_F_VERSION_1)))
-	vui->virtio_net_hdr_sz = 12;
-      else
-	vui->virtio_net_hdr_sz = 10;
-
-      vui->is_any_layout =
-	(vui->features & (1 << FEAT_VIRTIO_F_ANY_LAYOUT)) ? 1 : 0;
-
-      ASSERT (vui->virtio_net_hdr_sz < VLIB_BUFFER_PRE_DATA_SIZE);
-      vnet_hw_interface_set_flags (vnm, vui->hw_if_index, 0);
-      vui->is_up = 0;
-
-      /*for (q = 0; q < VHOST_VRING_MAX_N; q++)
-         vhost_user_vring_close(&vui->vrings[q]); */
-
-      break;
-
-    case VHOST_USER_SET_MEM_TABLE:
-      DBG_SOCK ("if %d msg VHOST_USER_SET_MEM_TABLE nregions %d",
-		vui->hw_if_index, msg.memory.nregions);
-
-      if ((msg.memory.nregions < 1) ||
-	  (msg.memory.nregions > VHOST_MEMORY_MAX_NREGIONS))
-	{
-
-	  DBG_SOCK ("number of mem regions must be between 1 and %i",
-		    VHOST_MEMORY_MAX_NREGIONS);
-
-	  goto close_socket;
-	}
-
-      if (msg.memory.nregions != number_of_fds)
-	{
-	  DBG_SOCK ("each memory region must have FD");
-	  goto close_socket;
-	}
-      unmap_all_mem_regions (vui);
-      for (i = 0; i < msg.memory.nregions; i++)
-	{
-	  clib_memcpy (&(vui->regions[i]), &msg.memory.regions[i],
-		       sizeof (vhost_user_memory_region_t));
-
-	  long page_sz = get_huge_page_size (fds[i]);
-
-	  /* align size to 2M page */
-	  ssize_t map_sz = (vui->regions[i].memory_size +
-			    vui->regions[i].mmap_offset +
-			    page_sz) & ~(page_sz - 1);
-
-	  vui->region_mmap_addr[i] = mmap (0, map_sz, PROT_READ | PROT_WRITE,
-					   MAP_SHARED, fds[i], 0);
-	  vui->region_guest_addr_lo[i] = vui->regions[i].guest_phys_addr;
-	  vui->region_guest_addr_hi[i] = vui->regions[i].guest_phys_addr +
-	    vui->regions[i].memory_size;
-
-	  DBG_SOCK
-	    ("map memory region %d addr 0 len 0x%lx fd %d mapped 0x%lx "
-	     "page_sz 0x%x", i, map_sz, fds[i], vui->region_mmap_addr[i],
-	     page_sz);
-
-	  if (vui->region_mmap_addr[i] == MAP_FAILED)
-	    {
-	      clib_warning ("failed to map memory. errno is %d", errno);
-	      goto close_socket;
-	    }
-	  vui->region_mmap_addr[i] += vui->regions[i].mmap_offset;
-	  vui->region_mmap_fd[i] = fds[i];
-	}
-      vui->nregions = msg.memory.nregions;
-      break;
-
-    case VHOST_USER_SET_VRING_NUM:
-      DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_NUM idx %d num %d",
-		vui->hw_if_index, msg.state.index, msg.state.num);
-
-      if ((msg.state.num > 32768) ||	/* maximum ring size is 32768 */
-	  (msg.state.num == 0) ||	/* it cannot be zero */
-	  ((msg.state.num - 1) & msg.state.num))	/* must be power of 2 */
-	goto close_socket;
-      vui->vrings[msg.state.index].qsz = msg.state.num;
-      break;
-
-    case VHOST_USER_SET_VRING_ADDR:
-      DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_ADDR idx %d",
-		vui->hw_if_index, msg.state.index);
-
-      if (msg.state.index >= VHOST_VRING_MAX_N)
-	{
-	  DBG_SOCK ("invalid vring index VHOST_USER_SET_VRING_ADDR:"
-		    " %d >= %d", msg.state.index, VHOST_VRING_MAX_N);
-	  goto close_socket;
-	}
-
-      if (msg.size < sizeof (msg.addr))
-	{
-	  DBG_SOCK ("vhost message is too short (%d < %d)",
-		    msg.size, sizeof (msg.addr));
-	  goto close_socket;
-	}
-
-      vui->vrings[msg.state.index].desc = (vring_desc_t *)
-	map_user_mem (vui, msg.addr.desc_user_addr);
-      vui->vrings[msg.state.index].used = (vring_used_t *)
-	map_user_mem (vui, msg.addr.used_user_addr);
-      vui->vrings[msg.state.index].avail = (vring_avail_t *)
-	map_user_mem (vui, msg.addr.avail_user_addr);
-
-      if ((vui->vrings[msg.state.index].desc == NULL) ||
-	  (vui->vrings[msg.state.index].used == NULL) ||
-	  (vui->vrings[msg.state.index].avail == NULL))
-	{
-	  DBG_SOCK ("failed to map user memory for hw_if_index %d",
-		    vui->hw_if_index);
-	  goto close_socket;
-	}
-
-      vui->vrings[msg.state.index].log_guest_addr = msg.addr.log_guest_addr;
-      vui->vrings[msg.state.index].log_used =
-	(msg.addr.flags & (1 << VHOST_VRING_F_LOG)) ? 1 : 0;
-
-      /* Spec says: If VHOST_USER_F_PROTOCOL_FEATURES has not been negotiated,
-         the ring is initialized in an enabled state. */
-      if (!(vui->features & (1 << FEAT_VHOST_USER_F_PROTOCOL_FEATURES)))
-	{
-	  vui->vrings[msg.state.index].enabled = 1;
-	}
-
-      vui->vrings[msg.state.index].last_used_idx =
-	vui->vrings[msg.state.index].last_avail_idx =
-	vui->vrings[msg.state.index].used->idx;
-
-      /* tell driver that we don't want interrupts */
-      vui->vrings[msg.state.index].used->flags = VRING_USED_F_NO_NOTIFY;
-      break;
-
-    case VHOST_USER_SET_OWNER:
-      DBG_SOCK ("if %d msg VHOST_USER_SET_OWNER", vui->hw_if_index);
-      break;
-
-    case VHOST_USER_RESET_OWNER:
-      DBG_SOCK ("if %d msg VHOST_USER_RESET_OWNER", vui->hw_if_index);
-      break;
-
-    case VHOST_USER_SET_VRING_CALL:
-      DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_CALL u64 %d",
-		vui->hw_if_index, msg.u64);
-
-      q = (u8) (msg.u64 & 0xFF);
-
-      /* if there is old fd, delete and close it */
-      if (vui->vrings[q].callfd_idx != ~0)
-	{
-	  unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
-					       vui->vrings[q].callfd_idx);
-	  unix_file_del (&unix_main, uf);
-	  vui->vrings[q].callfd_idx = ~0;
-	}
-
-      if (!(msg.u64 & 0x100))
-	{
-	  if (number_of_fds != 1)
-	    {
-	      DBG_SOCK ("More than one fd received !");
-	      goto close_socket;
-	    }
-
-	  template.read_function = vhost_user_callfd_read_ready;
-	  template.file_descriptor = fds[0];
-	  template.private_data =
-	    ((vui - vhost_user_main.vhost_user_interfaces) << 8) + q;
-	  vui->vrings[q].callfd_idx = unix_file_add (&unix_main, &template);
-	}
-      else
-	vui->vrings[q].callfd_idx = ~0;
-      break;
-
-    case VHOST_USER_SET_VRING_KICK:
-      DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_KICK u64 %d",
-		vui->hw_if_index, msg.u64);
-
-      q = (u8) (msg.u64 & 0xFF);
-
-      if (vui->vrings[q].kickfd_idx != ~0)
-	{
-	  unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
-					       vui->vrings[q].kickfd_idx);
-	  unix_file_del (&unix_main, uf);
-	  vui->vrings[q].kickfd_idx = ~0;
-	}
-
-      if (!(msg.u64 & 0x100))
-	{
-	  if (number_of_fds != 1)
-	    {
-	      DBG_SOCK ("More than one fd received !");
-	      goto close_socket;
-	    }
-
-	  template.read_function = vhost_user_kickfd_read_ready;
-	  template.file_descriptor = fds[0];
-	  template.private_data =
-	    (((uword) (vui - vhost_user_main.vhost_user_interfaces)) << 8) +
-	    q;
-	  vui->vrings[q].kickfd_idx = unix_file_add (&unix_main, &template);
-	}
-      else
-	{
-	  //When no kickfd is set, the queue is initialized as started
-	  vui->vrings[q].kickfd_idx = ~0;
-	  vui->vrings[q].started = 1;
-	}
-
-      break;
-
-    case VHOST_USER_SET_VRING_ERR:
-      DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_ERR u64 %d",
-		vui->hw_if_index, msg.u64);
-
-      q = (u8) (msg.u64 & 0xFF);
-
-      if (vui->vrings[q].errfd != -1)
-	close (vui->vrings[q].errfd);
-
-      if (!(msg.u64 & 0x100))
-	{
-	  if (number_of_fds != 1)
-	    goto close_socket;
-
-	  vui->vrings[q].errfd = fds[0];
-	}
-      else
-	vui->vrings[q].errfd = -1;
-
-      break;
-
-    case VHOST_USER_SET_VRING_BASE:
-      DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_BASE idx %d num %d",
-		vui->hw_if_index, msg.state.index, msg.state.num);
-
-      vui->vrings[msg.state.index].last_avail_idx = msg.state.num;
-      break;
-
-    case VHOST_USER_GET_VRING_BASE:
-      DBG_SOCK ("if %d msg VHOST_USER_GET_VRING_BASE idx %d num %d",
-		vui->hw_if_index, msg.state.index, msg.state.num);
-
-      if (msg.state.index >= VHOST_VRING_MAX_N)
-	{
-	  DBG_SOCK ("invalid vring index VHOST_USER_GET_VRING_BASE:"
-		    " %d >= %d", msg.state.index, VHOST_VRING_MAX_N);
-	  goto close_socket;
-	}
-
-      /* Spec says: Client must [...] stop ring upon receiving VHOST_USER_GET_VRING_BASE. */
-      vhost_user_vring_close (vui, msg.state.index);
-
-      msg.state.num = vui->vrings[msg.state.index].last_avail_idx;
-      msg.flags |= 4;
-      msg.size = sizeof (msg.state);
-      break;
-
-    case VHOST_USER_NONE:
-      DBG_SOCK ("if %d msg VHOST_USER_NONE", vui->hw_if_index);
-
-      break;
-
-    case VHOST_USER_SET_LOG_BASE:
-      {
-	DBG_SOCK ("if %d msg VHOST_USER_SET_LOG_BASE", vui->hw_if_index);
-
-	if (msg.size != sizeof (msg.log))
-	  {
-	    DBG_SOCK
-	      ("invalid msg size for VHOST_USER_SET_LOG_BASE: %d instead of %d",
-	       msg.size, sizeof (msg.log));
-	    goto close_socket;
-	  }
-
-	if (!
-	    (vui->protocol_features & (1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD)))
-	  {
-	    DBG_SOCK
-	      ("VHOST_USER_PROTOCOL_F_LOG_SHMFD not set but VHOST_USER_SET_LOG_BASE received");
-	    goto close_socket;
-	  }
-
-	fd = fds[0];
-	/* align size to 2M page */
-	long page_sz = get_huge_page_size (fd);
-	ssize_t map_sz =
-	  (msg.log.size + msg.log.offset + page_sz) & ~(page_sz - 1);
-
-	vui->log_base_addr = mmap (0, map_sz, PROT_READ | PROT_WRITE,
-				   MAP_SHARED, fd, 0);
-
-	DBG_SOCK
-	  ("map log region addr 0 len 0x%lx off 0x%lx fd %d mapped 0x%lx",
-	   map_sz, msg.log.offset, fd, vui->log_base_addr);
-
-	if (vui->log_base_addr == MAP_FAILED)
-	  {
-	    clib_warning ("failed to map memory. errno is %d", errno);
-	    goto close_socket;
-	  }
-
-	vui->log_base_addr += msg.log.offset;
-	vui->log_size = msg.log.size;
-
-	msg.flags |= 4;
-	msg.size = sizeof (msg.u64);
-
-	break;
-      }
-
-    case VHOST_USER_SET_LOG_FD:
-      DBG_SOCK ("if %d msg VHOST_USER_SET_LOG_FD", vui->hw_if_index);
-
-      break;
-
-    case VHOST_USER_GET_PROTOCOL_FEATURES:
-      DBG_SOCK ("if %d msg VHOST_USER_GET_PROTOCOL_FEATURES",
-		vui->hw_if_index);
-
-      msg.flags |= 4;
-      msg.u64 = (1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD) |
-	(1 << VHOST_USER_PROTOCOL_F_MQ);
-      msg.size = sizeof (msg.u64);
-      break;
-
-    case VHOST_USER_SET_PROTOCOL_FEATURES:
-      DBG_SOCK ("if %d msg VHOST_USER_SET_PROTOCOL_FEATURES features 0x%lx",
-		vui->hw_if_index, msg.u64);
-
-      vui->protocol_features = msg.u64;
-
-      break;
-
-    case VHOST_USER_GET_QUEUE_NUM:
-      DBG_SOCK ("if %d msg VHOST_USER_GET_QUEUE_NUM", vui->hw_if_index);
-      msg.flags |= 4;
-      msg.u64 = VHOST_VRING_MAX_N;
-      msg.size = sizeof (msg.u64);
-      break;
-
-    case VHOST_USER_SET_VRING_ENABLE:
-      DBG_SOCK ("if %d VHOST_USER_SET_VRING_ENABLE: %s queue %d",
-		vui->hw_if_index, msg.state.num ? "enable" : "disable",
-		msg.state.index);
-      if (msg.state.index >= VHOST_VRING_MAX_N)
-	{
-	  DBG_SOCK ("invalid vring index VHOST_USER_SET_VRING_ENABLE:"
-		    " %d >= %d", msg.state.index, VHOST_VRING_MAX_N);
-	  goto close_socket;
-	}
-
-      vui->vrings[msg.state.index].enabled = msg.state.num;
-      break;
-
-    default:
-      DBG_SOCK ("unknown vhost-user message %d received. closing socket",
-		msg.request);
-      goto close_socket;
-    }
-
-  /* if we need to reply */
-  if (msg.flags & 4)
-    {
-      n =
-	send (uf->file_descriptor, &msg, VHOST_USER_MSG_HDR_SZ + msg.size, 0);
-      if (n != (msg.size + VHOST_USER_MSG_HDR_SZ))
-	{
-	  DBG_SOCK ("could not send message response");
-	  goto close_socket;
-	}
-    }
-
-  vhost_user_update_iface_state (vui);
-  vlib_worker_thread_barrier_release (vlib_get_main ());
-  return 0;
-
-close_socket:
-  vhost_user_if_disconnect (vui);
-  vhost_user_update_iface_state (vui);
-  vlib_worker_thread_barrier_release (vlib_get_main ());
-  return 0;
-}
-
-static clib_error_t *
-vhost_user_socket_error (unix_file_t * uf)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vhost_user_main_t *vum = &vhost_user_main;
-  vhost_user_intf_t *vui =
-    pool_elt_at_index (vum->vhost_user_interfaces, uf->private_data);
-
-  DBG_SOCK ("socket error on if %d", vui->sw_if_index);
-  vlib_worker_thread_barrier_sync (vm);
-  vhost_user_if_disconnect (vui);
-  vhost_user_rx_thread_placement ();
-  vlib_worker_thread_barrier_release (vm);
-  return 0;
-}
-
-static clib_error_t *
-vhost_user_socksvr_accept_ready (unix_file_t * uf)
-{
-  int client_fd, client_len;
-  struct sockaddr_un client;
-  unix_file_t template = { 0 };
-  vhost_user_main_t *vum = &vhost_user_main;
-  vhost_user_intf_t *vui;
-
-  vui = pool_elt_at_index (vum->vhost_user_interfaces, uf->private_data);
-
-  client_len = sizeof (client);
-  client_fd = accept (uf->file_descriptor,
-		      (struct sockaddr *) &client,
-		      (socklen_t *) & client_len);
-
-  if (client_fd < 0)
-    return clib_error_return_unix (0, "accept");
-
-  DBG_SOCK ("New client socket for vhost interface %d", vui->sw_if_index);
-  template.read_function = vhost_user_socket_read;
-  template.error_function = vhost_user_socket_error;
-  template.file_descriptor = client_fd;
-  template.private_data = vui - vhost_user_main.vhost_user_interfaces;
-  vui->unix_file_index = unix_file_add (&unix_main, &template);
-  return 0;
-}
-
-static clib_error_t *
-vhost_user_init (vlib_main_t * vm)
-{
-  clib_error_t *error;
-  vhost_user_main_t *vum = &vhost_user_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  vlib_thread_registration_t *tr;
-  uword *p;
-
-  error = vlib_call_init_function (vm, ip4_init);
-  if (error)
-    return error;
-
-  vum->coalesce_frames = 32;
-  vum->coalesce_time = 1e-3;
-
-  vec_validate (vum->cpus, tm->n_vlib_mains - 1);
-
-  vhost_cpu_t *cpu;
-  vec_foreach (cpu, vum->cpus)
-  {
-    /* This is actually not necessary as validate already zeroes it
-     * Just keeping the loop here for later because I am lazy. */
-    cpu->rx_buffers_len = 0;
-  }
-
-  /* find out which cpus will be used for input */
-  vum->input_cpu_first_index = 0;
-  vum->input_cpu_count = 1;
-  p = hash_get_mem (tm->thread_registrations_by_name, "workers");
-  tr = p ? (vlib_thread_registration_t *) p[0] : 0;
-
-  if (tr && tr->count > 0)
-    {
-      vum->input_cpu_first_index = tr->first_index;
-      vum->input_cpu_count = tr->count;
-    }
-
-  vum->random = random_default_seed ();
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (vhost_user_init);
-
-static clib_error_t *
-vhost_user_exit (vlib_main_t * vm)
-{
-  /* TODO cleanup */
-  return 0;
-}
-
-VLIB_MAIN_LOOP_EXIT_FUNCTION (vhost_user_exit);
-
-static u8 *
-format_vhost_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  CLIB_UNUSED (vnet_main_t * vnm) = vnet_get_main ();
-  vhost_user_main_t *vum = &vhost_user_main;
-  vhost_trace_t *t = va_arg (*va, vhost_trace_t *);
-  vhost_user_intf_t *vui = pool_elt_at_index (vum->vhost_user_interfaces,
-					      t->device_index);
-
-  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, vui->sw_if_index);
-
-  uword indent = format_get_indent (s);
-
-  s = format (s, "%U %U queue %d\n", format_white_space, indent,
-	      format_vnet_sw_interface_name, vnm, sw, t->qid);
-
-  s = format (s, "%U virtio flags:\n", format_white_space, indent);
-#define _(n,i,st) \
-	  if (t->virtio_ring_flags & (1 << VIRTIO_TRACE_F_##n)) \
-	    s = format (s, "%U  %s %s\n", format_white_space, indent, #n, st);
-  foreach_virtio_trace_flags
-#undef _
-    s = format (s, "%U virtio_net_hdr first_desc_len %u\n",
-		format_white_space, indent, t->first_desc_len);
-
-  s = format (s, "%U   flags 0x%02x gso_type %u\n",
-	      format_white_space, indent,
-	      t->hdr.hdr.flags, t->hdr.hdr.gso_type);
-
-  if (vui->virtio_net_hdr_sz == 12)
-    s = format (s, "%U   num_buff %u",
-		format_white_space, indent, t->hdr.num_buffers);
-
-  return s;
-}
-
-void
-vhost_user_rx_trace (vhost_trace_t * t,
-		     vhost_user_intf_t * vui, u16 qid,
-		     vlib_buffer_t * b, vhost_user_vring_t * txvq)
-{
-  vhost_user_main_t *vum = &vhost_user_main;
-  u32 qsz_mask = txvq->qsz - 1;
-  u32 last_avail_idx = txvq->last_avail_idx;
-  u32 desc_current = txvq->avail->ring[last_avail_idx & qsz_mask];
-  vring_desc_t *hdr_desc = 0;
-  virtio_net_hdr_mrg_rxbuf_t *hdr;
-  u32 hint = 0;
-
-  memset (t, 0, sizeof (*t));
-  t->device_index = vui - vum->vhost_user_interfaces;
-  t->qid = qid;
-
-  hdr_desc = &txvq->desc[desc_current];
-  if (txvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT)
-    {
-      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_INDIRECT;
-      /* Header is the first here */
-      hdr_desc = map_guest_mem (vui, txvq->desc[desc_current].addr, &hint);
-    }
-  if (txvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT)
-    {
-      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_SIMPLE_CHAINED;
-    }
-  if (!(txvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT) &&
-      !(txvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT))
-    {
-      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_SINGLE_DESC;
-    }
-
-  t->first_desc_len = hdr_desc ? hdr_desc->len : 0;
-
-  if (!hdr_desc || !(hdr = map_guest_mem (vui, hdr_desc->addr, &hint)))
-    {
-      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_MAP_ERROR;
-    }
-  else
-    {
-      u32 len = vui->virtio_net_hdr_sz;
-      memcpy (&t->hdr, hdr, len > hdr_desc->len ? hdr_desc->len : len);
-    }
-}
-
-static inline void
-vhost_user_send_call (vlib_main_t * vm, vhost_user_vring_t * vq)
-{
-  vhost_user_main_t *vum = &vhost_user_main;
-  u64 x = 1;
-  int fd = UNIX_GET_FD (vq->callfd_idx);
-  int rv __attribute__ ((unused));
-  /* TODO: pay attention to rv */
-  rv = write (fd, &x, sizeof (x));
-  vq->n_since_last_int = 0;
-  vq->int_deadline = vlib_time_now (vm) + vum->coalesce_time;
-}
-
-static_always_inline u32
-vhost_user_input_copy (vhost_user_intf_t * vui, vhost_copy_t * cpy,
-		       u16 copy_len, u32 * map_hint)
-{
-  void *src0, *src1, *src2, *src3;
-  if (PREDICT_TRUE (copy_len >= 4))
-    {
-      if (PREDICT_FALSE (!(src2 = map_guest_mem (vui, cpy[0].src, map_hint))))
-	return 1;
-      if (PREDICT_FALSE (!(src3 = map_guest_mem (vui, cpy[1].src, map_hint))))
-	return 1;
-
-      while (PREDICT_TRUE (copy_len >= 4))
-	{
-	  src0 = src2;
-	  src1 = src3;
-
-	  if (PREDICT_FALSE
-	      (!(src2 = map_guest_mem (vui, cpy[2].src, map_hint))))
-	    return 1;
-	  if (PREDICT_FALSE
-	      (!(src3 = map_guest_mem (vui, cpy[3].src, map_hint))))
-	    return 1;
-
-	  CLIB_PREFETCH (src2, 64, LOAD);
-	  CLIB_PREFETCH (src3, 64, LOAD);
-
-	  clib_memcpy ((void *) cpy[0].dst, src0, cpy[0].len);
-	  clib_memcpy ((void *) cpy[1].dst, src1, cpy[1].len);
-	  copy_len -= 2;
-	  cpy += 2;
-	}
-    }
-  while (copy_len)
-    {
-      if (PREDICT_FALSE (!(src0 = map_guest_mem (vui, cpy->src, map_hint))))
-	return 1;
-      clib_memcpy ((void *) cpy->dst, src0, cpy->len);
-      copy_len -= 1;
-      cpy += 1;
-    }
-  return 0;
-}
-
-/**
- * Try to discard packets from the tx ring (VPP RX path).
- * Returns the number of discarded packets.
- */
-u32
-vhost_user_rx_discard_packet (vlib_main_t * vm,
-			      vhost_user_intf_t * vui,
-			      vhost_user_vring_t * txvq, u32 discard_max)
-{
-  /*
-   * On the RX side, each packet corresponds to one descriptor
-   * (it is the same whether it is a shallow descriptor, chained, or indirect).
-   * Therefore, discarding a packet is like discarding a descriptor.
-   */
-  u32 discarded_packets = 0;
-  u32 avail_idx = txvq->avail->idx;
-  u16 qsz_mask = txvq->qsz - 1;
-  while (discarded_packets != discard_max)
-    {
-      if (avail_idx == txvq->last_avail_idx)
-	goto out;
-
-      u16 desc_chain_head =
-	txvq->avail->ring[txvq->last_avail_idx & qsz_mask];
-      txvq->last_avail_idx++;
-      txvq->used->ring[txvq->last_used_idx & qsz_mask].id = desc_chain_head;
-      txvq->used->ring[txvq->last_used_idx & qsz_mask].len = 0;
-      vhost_user_log_dirty_ring (vui, txvq,
-				 ring[txvq->last_used_idx & qsz_mask]);
-      txvq->last_used_idx++;
-      discarded_packets++;
-    }
-
-out:
-  CLIB_MEMORY_BARRIER ();
-  txvq->used->idx = txvq->last_used_idx;
-  vhost_user_log_dirty_ring (vui, txvq, idx);
-  return discarded_packets;
-}
-
-/*
- * In case of overflow, we need to rewind the array of allocated buffers.
- */
-static void
-vhost_user_input_rewind_buffers (vlib_main_t * vm,
-				 vhost_cpu_t * cpu, vlib_buffer_t * b_head)
-{
-  u32 bi_current = cpu->rx_buffers[cpu->rx_buffers_len];
-  vlib_buffer_t *b_current = vlib_get_buffer (vm, bi_current);
-  b_current->current_length = 0;
-  b_current->flags = 0;
-  while (b_current != b_head)
-    {
-      cpu->rx_buffers_len++;
-      bi_current = cpu->rx_buffers[cpu->rx_buffers_len];
-      b_current = vlib_get_buffer (vm, bi_current);
-      b_current->current_length = 0;
-      b_current->flags = 0;
-    }
-}
-
-static u32
-vhost_user_if_input (vlib_main_t * vm,
-		     vhost_user_main_t * vum,
-		     vhost_user_intf_t * vui,
-		     u16 qid, vlib_node_runtime_t * node)
-{
-  vhost_user_vring_t *txvq = &vui->vrings[VHOST_VRING_IDX_TX (qid)];
-  u16 n_rx_packets = 0;
-  u32 n_rx_bytes = 0;
-  u16 n_left;
-  u32 n_left_to_next, *to_next;
-  u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-  u32 n_trace = vlib_get_trace_count (vm, node);
-  u16 qsz_mask;
-  u32 map_hint = 0;
-  u16 cpu_index = os_get_cpu_number ();
-  u16 copy_len = 0;
-
-  {
-    /* do we have pending interrupts ? */
-    vhost_user_vring_t *rxvq = &vui->vrings[VHOST_VRING_IDX_RX (qid)];
-    f64 now = vlib_time_now (vm);
-
-    if ((txvq->n_since_last_int) && (txvq->int_deadline < now))
-      vhost_user_send_call (vm, txvq);
-
-    if ((rxvq->n_since_last_int) && (rxvq->int_deadline < now))
-      vhost_user_send_call (vm, rxvq);
-  }
-
-  if (PREDICT_FALSE (txvq->avail->flags & 0xFFFE))
-    return 0;
-
-  n_left = (u16) (txvq->avail->idx - txvq->last_avail_idx);
-
-  /* nothing to do */
-  if (PREDICT_FALSE (n_left == 0))
-    return 0;
-
-  if (PREDICT_FALSE (!vui->admin_up || !(txvq->enabled)))
-    {
-      /*
-       * Discard input packet if interface is admin down or vring is not
-       * enabled.
-       * "For example, for a networking device, in the disabled state
-       * client must not supply any new RX packets, but must process
-       * and discard any TX packets."
-       */
-      vhost_user_rx_discard_packet (vm, vui, txvq,
-				    VHOST_USER_DOWN_DISCARD_COUNT);
-      return 0;
-    }
-
-  if (PREDICT_FALSE (n_left == txvq->qsz))
-    {
-      /*
-       * Informational error logging when VPP is not
-       * receiving packets fast enough.
-       */
-      vlib_error_count (vm, node->node_index,
-			VHOST_USER_INPUT_FUNC_ERROR_FULL_RX_QUEUE, 1);
-    }
-
-  qsz_mask = txvq->qsz - 1;
-
-  if (n_left > VLIB_FRAME_SIZE)
-    n_left = VLIB_FRAME_SIZE;
-
-  /*
-   * For small packets (<2kB), we will not need more than one vlib buffer
-   * per packet. In case packets are bigger, we will just yeld at some point
-   * in the loop and come back later. This is not an issue as for big packet,
-   * processing cost really comes from the memory copy.
-   */
-  if (PREDICT_FALSE (vum->cpus[cpu_index].rx_buffers_len < n_left + 1))
-    {
-      u32 curr_len = vum->cpus[cpu_index].rx_buffers_len;
-      vum->cpus[cpu_index].rx_buffers_len +=
-	vlib_buffer_alloc_from_free_list (vm,
-					  vum->cpus[cpu_index].rx_buffers +
-					  curr_len,
-					  VHOST_USER_RX_BUFFERS_N - curr_len,
-					  VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-
-      if (PREDICT_FALSE
-	  (vum->cpus[cpu_index].rx_buffers_len <
-	   VHOST_USER_RX_BUFFER_STARVATION))
-	{
-	  /* In case of buffer starvation, discard some packets from the queue
-	   * and log the event.
-	   * We keep doing best effort for the remaining packets. */
-	  u32 flush = (n_left + 1 > vum->cpus[cpu_index].rx_buffers_len) ?
-	    n_left + 1 - vum->cpus[cpu_index].rx_buffers_len : 1;
-	  flush = vhost_user_rx_discard_packet (vm, vui, txvq, flush);
-
-	  n_left -= flush;
-	  vlib_increment_simple_counter (vnet_main.
-					 interface_main.sw_if_counters +
-					 VNET_INTERFACE_COUNTER_DROP,
-					 os_get_cpu_number (),
-					 vui->sw_if_index, flush);
-
-	  vlib_error_count (vm, vhost_user_input_node.index,
-			    VHOST_USER_INPUT_FUNC_ERROR_NO_BUFFER, flush);
-	}
-    }
-
-  while (n_left > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *b_head, *b_current;
-	  u32 bi_current;
-	  u16 desc_current;
-	  u32 desc_data_offset;
-	  vring_desc_t *desc_table = txvq->desc;
-
-	  if (PREDICT_FALSE (vum->cpus[cpu_index].rx_buffers_len <= 1))
-	    {
-	      /* Not enough rx_buffers
-	       * Note: We yeld on 1 so we don't need to do an additional
-	       * check for the next buffer prefetch.
-	       */
-	      n_left = 0;
-	      break;
-	    }
-
-	  desc_current = txvq->avail->ring[txvq->last_avail_idx & qsz_mask];
-	  vum->cpus[cpu_index].rx_buffers_len--;
-	  bi_current = (vum->cpus[cpu_index].rx_buffers)
-	    [vum->cpus[cpu_index].rx_buffers_len];
-	  b_head = b_current = vlib_get_buffer (vm, bi_current);
-	  to_next[0] = bi_current;	//We do that now so we can forget about bi_current
-	  to_next++;
-	  n_left_to_next--;
-
-	  vlib_prefetch_buffer_with_index (vm,
-					   (vum->cpus[cpu_index].rx_buffers)
-					   [vum->cpus[cpu_index].
-					    rx_buffers_len - 1], LOAD);
-
-	  /* Just preset the used descriptor id and length for later */
-	  txvq->used->ring[txvq->last_used_idx & qsz_mask].id = desc_current;
-	  txvq->used->ring[txvq->last_used_idx & qsz_mask].len = 0;
-	  vhost_user_log_dirty_ring (vui, txvq,
-				     ring[txvq->last_used_idx & qsz_mask]);
-
-	  /* The buffer should already be initialized */
-	  b_head->total_length_not_including_first_buffer = 0;
-	  b_head->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
-
-	  if (PREDICT_FALSE (n_trace))
-	    {
-	      //TODO: next_index is not exactly known at that point
-	      vlib_trace_buffer (vm, node, next_index, b_head,
-				 /* follow_chain */ 0);
-	      vhost_trace_t *t0 =
-		vlib_add_trace (vm, node, b_head, sizeof (t0[0]));
-	      vhost_user_rx_trace (t0, vui, qid, b_head, txvq);
-	      n_trace--;
-	      vlib_set_trace_count (vm, node, n_trace);
-	    }
-
-	  /* This depends on the setup but is very consistent
-	   * So I think the CPU branch predictor will make a pretty good job
-	   * at optimizing the decision. */
-	  if (txvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT)
-	    {
-	      desc_table = map_guest_mem (vui, txvq->desc[desc_current].addr,
-					  &map_hint);
-	      desc_current = 0;
-	      if (PREDICT_FALSE (desc_table == 0))
-		{
-		  //FIXME: Handle error by shutdown the queue
-		  goto out;
-		}
-	    }
-
-	  if (PREDICT_TRUE (vui->is_any_layout) ||
-	      (!(desc_table[desc_current].flags & VIRTQ_DESC_F_NEXT)))
-	    {
-	      /* ANYLAYOUT or single buffer */
-	      desc_data_offset = vui->virtio_net_hdr_sz;
-	    }
-	  else
-	    {
-	      /* CSR case without ANYLAYOUT, skip 1st buffer */
-	      desc_data_offset = desc_table[desc_current].len;
-	    }
-
-	  while (1)
-	    {
-	      /* Get more input if necessary. Or end of packet. */
-	      if (desc_data_offset == desc_table[desc_current].len)
-		{
-		  if (PREDICT_FALSE (desc_table[desc_current].flags &
-				     VIRTQ_DESC_F_NEXT))
-		    {
-		      desc_current = desc_table[desc_current].next;
-		      desc_data_offset = 0;
-		    }
-		  else
-		    {
-		      goto out;
-		    }
-		}
-
-	      /* Get more output if necessary. Or end of packet. */
-	      if (PREDICT_FALSE
-		  (b_current->current_length == VLIB_BUFFER_DATA_SIZE))
-		{
-		  if (PREDICT_FALSE
-		      (vum->cpus[cpu_index].rx_buffers_len == 0))
-		    {
-		      /*
-		       * Checking if there are some left buffers.
-		       * If not, just rewind the used buffers and stop.
-		       * Note: Scheduled copies are not cancelled. This is
-		       * not an issue as they would still be valid. Useless,
-		       * but valid.
-		       */
-		      vhost_user_input_rewind_buffers (vm,
-						       &vum->cpus[cpu_index],
-						       b_head);
-		      n_left = 0;
-		      goto stop;
-		    }
-
-		  /* Get next output */
-		  vum->cpus[cpu_index].rx_buffers_len--;
-		  u32 bi_next =
-		    (vum->cpus[cpu_index].rx_buffers)[vum->cpus
-						      [cpu_index].rx_buffers_len];
-		  b_current->next_buffer = bi_next;
-		  b_current->flags |= VLIB_BUFFER_NEXT_PRESENT;
-		  bi_current = bi_next;
-		  b_current = vlib_get_buffer (vm, bi_current);
-		}
-
-	      /* Prepare a copy order executed later for the data */
-	      vhost_copy_t *cpy = &vum->cpus[cpu_index].copy[copy_len];
-	      copy_len++;
-	      u32 desc_data_l =
-		desc_table[desc_current].len - desc_data_offset;
-	      cpy->len = VLIB_BUFFER_DATA_SIZE - b_current->current_length;
-	      cpy->len = (cpy->len > desc_data_l) ? desc_data_l : cpy->len;
-	      cpy->dst = (uword) vlib_buffer_get_current (b_current);
-	      cpy->src = desc_table[desc_current].addr + desc_data_offset;
-
-	      desc_data_offset += cpy->len;
-
-	      b_current->current_length += cpy->len;
-	      b_head->total_length_not_including_first_buffer += cpy->len;
-	    }
-
-	out:
-	  CLIB_PREFETCH (&n_left, sizeof (n_left), LOAD);
-
-	  n_rx_bytes += b_head->total_length_not_including_first_buffer;
-	  n_rx_packets++;
-
-	  b_head->total_length_not_including_first_buffer -=
-	    b_head->current_length;
-
-	  /* consume the descriptor and return it as used */
-	  txvq->last_avail_idx++;
-	  txvq->last_used_idx++;
-
-	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b_head);
-
-	  vnet_buffer (b_head)->sw_if_index[VLIB_RX] = vui->sw_if_index;
-	  vnet_buffer (b_head)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-	  b_head->error = 0;
-
-	  {
-	    u32 next0 = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-
-	    /* redirect if feature path enabled */
-	    vnet_feature_start_device_input_x1 (vui->sw_if_index, &next0,
-						b_head, 0);
-
-	    u32 bi = to_next[-1];	//Cannot use to_next[-1] in the macro
-	    vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					     to_next, n_left_to_next,
-					     bi, next0);
-	  }
-
-	  n_left--;
-
-	  /*
-	   * Although separating memory copies from virtio ring parsing
-	   * is beneficial, we can offer to perform the copies from time
-	   * to time in order to free some space in the ring.
-	   */
-	  if (PREDICT_FALSE (copy_len >= VHOST_USER_RX_COPY_THRESHOLD))
-	    {
-	      if (PREDICT_FALSE
-		  (vhost_user_input_copy (vui, vum->cpus[cpu_index].copy,
-					  copy_len, &map_hint)))
-		{
-		  clib_warning
-		    ("Memory mapping error on interface hw_if_index=%d "
-		     "(Shutting down - Switch interface down and up to restart)",
-		     vui->hw_if_index);
-		  vui->admin_up = 0;
-		  copy_len = 0;
-		  break;
-		}
-	      copy_len = 0;
-
-	      /* give buffers back to driver */
-	      CLIB_MEMORY_BARRIER ();
-	      txvq->used->idx = txvq->last_used_idx;
-	      vhost_user_log_dirty_ring (vui, txvq, idx);
-	    }
-	}
-    stop:
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  /* Do the memory copies */
-  if (PREDICT_FALSE
-      (vhost_user_input_copy (vui, vum->cpus[cpu_index].copy,
-			      copy_len, &map_hint)))
-    {
-      clib_warning ("Memory mapping error on interface hw_if_index=%d "
-		    "(Shutting down - Switch interface down and up to restart)",
-		    vui->hw_if_index);
-      vui->admin_up = 0;
-    }
-
-  /* give buffers back to driver */
-  CLIB_MEMORY_BARRIER ();
-  txvq->used->idx = txvq->last_used_idx;
-  vhost_user_log_dirty_ring (vui, txvq, idx);
-
-  /* interrupt (call) handling */
-  if ((txvq->callfd_idx != ~0) && !(txvq->avail->flags & 1))
-    {
-      txvq->n_since_last_int += n_rx_packets;
-
-      if (txvq->n_since_last_int > vum->coalesce_frames)
-	vhost_user_send_call (vm, txvq);
-    }
-
-  /* increase rx counters */
-  vlib_increment_combined_counter
-    (vnet_main.interface_main.combined_sw_if_counters
-     + VNET_INTERFACE_COUNTER_RX,
-     os_get_cpu_number (), vui->sw_if_index, n_rx_packets, n_rx_bytes);
-
-  return n_rx_packets;
-}
-
-static uword
-vhost_user_input (vlib_main_t * vm,
-		  vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  vhost_user_main_t *vum = &vhost_user_main;
-  uword n_rx_packets = 0;
-  u32 cpu_index = os_get_cpu_number ();
-
-
-  vhost_iface_and_queue_t *vhiq;
-  vec_foreach (vhiq, vum->cpus[cpu_index].rx_queues)
-  {
-    vhost_user_intf_t *vui =
-      &vum->vhost_user_interfaces[vhiq->vhost_iface_index];
-    n_rx_packets += vhost_user_if_input (vm, vum, vui, vhiq->qid, node);
-  }
-
-  return n_rx_packets;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (vhost_user_input_node) = {
-  .function = vhost_user_input,
-  .type = VLIB_NODE_TYPE_INPUT,
-  .name = "vhost-user-input",
-  .sibling_of = "device-input",
-
-  /* Will be enabled if/when hardware is detected. */
-  .state = VLIB_NODE_STATE_DISABLED,
-
-  .format_buffer = format_ethernet_header_with_length,
-  .format_trace = format_vhost_trace,
-
-  .n_errors = VHOST_USER_INPUT_FUNC_N_ERROR,
-  .error_strings = vhost_user_input_func_error_strings,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (vhost_user_input_node, vhost_user_input)
-/* *INDENT-ON* */
-
-
-void
-vhost_user_tx_trace (vhost_trace_t * t,
-		     vhost_user_intf_t * vui, u16 qid,
-		     vlib_buffer_t * b, vhost_user_vring_t * rxvq)
-{
-  vhost_user_main_t *vum = &vhost_user_main;
-  u32 qsz_mask = rxvq->qsz - 1;
-  u32 last_avail_idx = rxvq->last_avail_idx;
-  u32 desc_current = rxvq->avail->ring[last_avail_idx & qsz_mask];
-  vring_desc_t *hdr_desc = 0;
-  u32 hint = 0;
-
-  memset (t, 0, sizeof (*t));
-  t->device_index = vui - vum->vhost_user_interfaces;
-  t->qid = qid;
-
-  hdr_desc = &rxvq->desc[desc_current];
-  if (rxvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT)
-    {
-      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_INDIRECT;
-      /* Header is the first here */
-      hdr_desc = map_guest_mem (vui, rxvq->desc[desc_current].addr, &hint);
-    }
-  if (rxvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT)
-    {
-      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_SIMPLE_CHAINED;
-    }
-  if (!(rxvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT) &&
-      !(rxvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT))
-    {
-      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_SINGLE_DESC;
-    }
-
-  t->first_desc_len = hdr_desc ? hdr_desc->len : 0;
-}
-
-static_always_inline u32
-vhost_user_tx_copy (vhost_user_intf_t * vui, vhost_copy_t * cpy,
-		    u16 copy_len, u32 * map_hint)
-{
-  void *dst0, *dst1, *dst2, *dst3;
-  if (PREDICT_TRUE (copy_len >= 4))
-    {
-      if (PREDICT_FALSE (!(dst2 = map_guest_mem (vui, cpy[0].dst, map_hint))))
-	return 1;
-      if (PREDICT_FALSE (!(dst3 = map_guest_mem (vui, cpy[1].dst, map_hint))))
-	return 1;
-      while (PREDICT_TRUE (copy_len >= 4))
-	{
-	  dst0 = dst2;
-	  dst1 = dst3;
-
-	  if (PREDICT_FALSE
-	      (!(dst2 = map_guest_mem (vui, cpy[2].dst, map_hint))))
-	    return 1;
-	  if (PREDICT_FALSE
-	      (!(dst3 = map_guest_mem (vui, cpy[3].dst, map_hint))))
-	    return 1;
-
-	  CLIB_PREFETCH ((void *) cpy[2].src, 64, LOAD);
-	  CLIB_PREFETCH ((void *) cpy[3].src, 64, LOAD);
-
-	  clib_memcpy (dst0, (void *) cpy[0].src, cpy[0].len);
-	  clib_memcpy (dst1, (void *) cpy[1].src, cpy[1].len);
-
-	  vhost_user_log_dirty_pages_2 (vui, cpy[0].dst, cpy[0].len, 1);
-	  vhost_user_log_dirty_pages_2 (vui, cpy[1].dst, cpy[1].len, 1);
-	  copy_len -= 2;
-	  cpy += 2;
-	}
-    }
-  while (copy_len)
-    {
-      if (PREDICT_FALSE (!(dst0 = map_guest_mem (vui, cpy->dst, map_hint))))
-	return 1;
-      clib_memcpy (dst0, (void *) cpy->src, cpy->len);
-      vhost_user_log_dirty_pages_2 (vui, cpy->dst, cpy->len, 1);
-      copy_len -= 1;
-      cpy += 1;
-    }
-  return 0;
-}
-
-
-static uword
-vhost_user_tx (vlib_main_t * vm,
-	       vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 *buffers = vlib_frame_args (frame);
-  u32 n_left = frame->n_vectors;
-  vhost_user_main_t *vum = &vhost_user_main;
-  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
-  vhost_user_intf_t *vui =
-    pool_elt_at_index (vum->vhost_user_interfaces, rd->dev_instance);
-  u32 qid = ~0;
-  vhost_user_vring_t *rxvq;
-  u16 qsz_mask;
-  u8 error;
-  u32 cpu_index = os_get_cpu_number ();
-  u32 map_hint = 0;
-  u8 retry = 8;
-  u16 copy_len;
-  u16 tx_headers_len;
-
-  if (PREDICT_FALSE (!vui->admin_up))
-    {
-      error = VHOST_USER_TX_FUNC_ERROR_DOWN;
-      goto done3;
-    }
-
-  if (PREDICT_FALSE (!vui->is_up))
-    {
-      error = VHOST_USER_TX_FUNC_ERROR_NOT_READY;
-      goto done3;
-    }
-
-  qid =
-    VHOST_VRING_IDX_RX (*vec_elt_at_index
-			(vui->per_cpu_tx_qid, os_get_cpu_number ()));
-  rxvq = &vui->vrings[qid];
-  if (PREDICT_FALSE (vui->use_tx_spinlock))
-    vhost_user_vring_lock (vui, qid);
-
-  qsz_mask = rxvq->qsz - 1;	/* qsz is always power of 2 */
-
-retry:
-  error = VHOST_USER_TX_FUNC_ERROR_NONE;
-  tx_headers_len = 0;
-  copy_len = 0;
-  while (n_left > 0)
-    {
-      vlib_buffer_t *b0, *current_b0;
-      u16 desc_head, desc_index, desc_len;
-      vring_desc_t *desc_table;
-      uword buffer_map_addr;
-      u32 buffer_len;
-      u16 bytes_left;
-
-      if (PREDICT_TRUE (n_left > 1))
-	vlib_prefetch_buffer_with_index (vm, buffers[1], LOAD);
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-
-      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	{
-	  vum->cpus[cpu_index].current_trace =
-	    vlib_add_trace (vm, node, b0,
-			    sizeof (*vum->cpus[cpu_index].current_trace));
-	  vhost_user_tx_trace (vum->cpus[cpu_index].current_trace,
-			       vui, qid / 2, b0, rxvq);
-	}
-
-      if (PREDICT_FALSE (rxvq->last_avail_idx == rxvq->avail->idx))
-	{
-	  error = VHOST_USER_TX_FUNC_ERROR_PKT_DROP_NOBUF;
-	  goto done;
-	}
-
-      desc_table = rxvq->desc;
-      desc_head = desc_index =
-	rxvq->avail->ring[rxvq->last_avail_idx & qsz_mask];
-
-      /* Go deeper in case of indirect descriptor
-       * I don't know of any driver providing indirect for RX. */
-      if (PREDICT_FALSE (rxvq->desc[desc_head].flags & VIRTQ_DESC_F_INDIRECT))
-	{
-	  if (PREDICT_FALSE
-	      (rxvq->desc[desc_head].len < sizeof (vring_desc_t)))
-	    {
-	      error = VHOST_USER_TX_FUNC_ERROR_INDIRECT_OVERFLOW;
-	      goto done;
-	    }
-	  if (PREDICT_FALSE
-	      (!(desc_table =
-		 map_guest_mem (vui, rxvq->desc[desc_index].addr,
-				&map_hint))))
-	    {
-	      error = VHOST_USER_TX_FUNC_ERROR_MMAP_FAIL;
-	      goto done;
-	    }
-	  desc_index = 0;
-	}
-
-      desc_len = vui->virtio_net_hdr_sz;
-      buffer_map_addr = desc_table[desc_index].addr;
-      buffer_len = desc_table[desc_index].len;
-
-      {
-	// Get a header from the header array
-	virtio_net_hdr_mrg_rxbuf_t *hdr =
-	  &vum->cpus[cpu_index].tx_headers[tx_headers_len];
-	tx_headers_len++;
-	hdr->hdr.flags = 0;
-	hdr->hdr.gso_type = 0;
-	hdr->num_buffers = 1;	//This is local, no need to check
-
-	// Prepare a copy order executed later for the header
-	vhost_copy_t *cpy = &vum->cpus[cpu_index].copy[copy_len];
-	copy_len++;
-	cpy->len = vui->virtio_net_hdr_sz;
-	cpy->dst = buffer_map_addr;
-	cpy->src = (uword) hdr;
-      }
-
-      buffer_map_addr += vui->virtio_net_hdr_sz;
-      buffer_len -= vui->virtio_net_hdr_sz;
-      bytes_left = b0->current_length;
-      current_b0 = b0;
-      while (1)
-	{
-	  if (buffer_len == 0)
-	    {			//Get new output
-	      if (desc_table[desc_index].flags & VIRTQ_DESC_F_NEXT)
-		{
-		  //Next one is chained
-		  desc_index = desc_table[desc_index].next;
-		  buffer_map_addr = desc_table[desc_index].addr;
-		  buffer_len = desc_table[desc_index].len;
-		}
-	      else if (vui->virtio_net_hdr_sz == 12)	//MRG is available
-		{
-		  virtio_net_hdr_mrg_rxbuf_t *hdr =
-		    &vum->cpus[cpu_index].tx_headers[tx_headers_len - 1];
-
-		  //Move from available to used buffer
-		  rxvq->used->ring[rxvq->last_used_idx & qsz_mask].id =
-		    desc_head;
-		  rxvq->used->ring[rxvq->last_used_idx & qsz_mask].len =
-		    desc_len;
-		  vhost_user_log_dirty_ring (vui, rxvq,
-					     ring[rxvq->last_used_idx &
-						  qsz_mask]);
-
-		  rxvq->last_avail_idx++;
-		  rxvq->last_used_idx++;
-		  hdr->num_buffers++;
-		  desc_len = 0;
-
-		  if (PREDICT_FALSE
-		      (rxvq->last_avail_idx == rxvq->avail->idx))
-		    {
-		      //Dequeue queued descriptors for this packet
-		      rxvq->last_used_idx -= hdr->num_buffers - 1;
-		      rxvq->last_avail_idx -= hdr->num_buffers - 1;
-		      error = VHOST_USER_TX_FUNC_ERROR_PKT_DROP_NOBUF;
-		      goto done;
-		    }
-
-		  desc_table = rxvq->desc;
-		  desc_head = desc_index =
-		    rxvq->avail->ring[rxvq->last_avail_idx & qsz_mask];
-		  if (PREDICT_FALSE
-		      (rxvq->desc[desc_head].flags & VIRTQ_DESC_F_INDIRECT))
-		    {
-		      //It is seriously unlikely that a driver will put indirect descriptor
-		      //after non-indirect descriptor.
-		      if (PREDICT_FALSE
-			  (rxvq->desc[desc_head].len < sizeof (vring_desc_t)))
-			{
-			  error = VHOST_USER_TX_FUNC_ERROR_INDIRECT_OVERFLOW;
-			  goto done;
-			}
-		      if (PREDICT_FALSE
-			  (!(desc_table =
-			     map_guest_mem (vui,
-					    rxvq->desc[desc_index].addr,
-					    &map_hint))))
-			{
-			  error = VHOST_USER_TX_FUNC_ERROR_MMAP_FAIL;
-			  goto done;
-			}
-		      desc_index = 0;
-		    }
-		  buffer_map_addr = desc_table[desc_index].addr;
-		  buffer_len = desc_table[desc_index].len;
-		}
-	      else
-		{
-		  error = VHOST_USER_TX_FUNC_ERROR_PKT_DROP_NOMRG;
-		  goto done;
-		}
-	    }
-
-	  {
-	    vhost_copy_t *cpy = &vum->cpus[cpu_index].copy[copy_len];
-	    copy_len++;
-	    cpy->len = bytes_left;
-	    cpy->len = (cpy->len > buffer_len) ? buffer_len : cpy->len;
-	    cpy->dst = buffer_map_addr;
-	    cpy->src = (uword) vlib_buffer_get_current (current_b0) +
-	      current_b0->current_length - bytes_left;
-
-	    bytes_left -= cpy->len;
-	    buffer_len -= cpy->len;
-	    buffer_map_addr += cpy->len;
-	    desc_len += cpy->len;
-
-	    CLIB_PREFETCH (&rxvq->desc, CLIB_CACHE_LINE_BYTES, LOAD);
-	  }
-
-	  // Check if vlib buffer has more data. If not, get more or break.
-	  if (PREDICT_TRUE (!bytes_left))
-	    {
-	      if (PREDICT_FALSE
-		  (current_b0->flags & VLIB_BUFFER_NEXT_PRESENT))
-		{
-		  current_b0 = vlib_get_buffer (vm, current_b0->next_buffer);
-		  bytes_left = current_b0->current_length;
-		}
-	      else
-		{
-		  //End of packet
-		  break;
-		}
-	    }
-	}
-
-      //Move from available to used ring
-      rxvq->used->ring[rxvq->last_used_idx & qsz_mask].id = desc_head;
-      rxvq->used->ring[rxvq->last_used_idx & qsz_mask].len = desc_len;
-      vhost_user_log_dirty_ring (vui, rxvq,
-				 ring[rxvq->last_used_idx & qsz_mask]);
-      rxvq->last_avail_idx++;
-      rxvq->last_used_idx++;
-
-      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	{
-	  vum->cpus[cpu_index].current_trace->hdr =
-	    vum->cpus[cpu_index].tx_headers[tx_headers_len - 1];
-	}
-
-      n_left--;			//At the end for error counting when 'goto done' is invoked
-      buffers++;
-    }
-
-done:
-  //Do the memory copies
-  if (PREDICT_FALSE
-      (vhost_user_tx_copy (vui, vum->cpus[cpu_index].copy,
-			   copy_len, &map_hint)))
-    {
-      clib_warning ("Memory mapping error on interface hw_if_index=%d "
-		    "(Shutting down - Switch interface down and up to restart)",
-		    vui->hw_if_index);
-      vui->admin_up = 0;
-    }
-
-  CLIB_MEMORY_BARRIER ();
-  rxvq->used->idx = rxvq->last_used_idx;
-  vhost_user_log_dirty_ring (vui, rxvq, idx);
-
-  /*
-   * When n_left is set, error is always set to something too.
-   * In case error is due to lack of remaining buffers, we go back up and
-   * retry.
-   * The idea is that it is better to waste some time on packets
-   * that have been processed already than dropping them and get
-   * more fresh packets with a good likelyhood that they will be dropped too.
-   * This technique also gives more time to VM driver to pick-up packets.
-   * In case the traffic flows from physical to virtual interfaces, this
-   * technique will end-up leveraging the physical NIC buffer in order to
-   * absorb the VM's CPU jitter.
-   */
-  if (n_left && (error == VHOST_USER_TX_FUNC_ERROR_PKT_DROP_NOBUF) && retry)
-    {
-      retry--;
-      goto retry;
-    }
-
-  /* interrupt (call) handling */
-  if ((rxvq->callfd_idx != ~0) && !(rxvq->avail->flags & 1))
-    {
-      rxvq->n_since_last_int += frame->n_vectors - n_left;
-
-      if (rxvq->n_since_last_int > vum->coalesce_frames)
-	vhost_user_send_call (vm, rxvq);
-    }
-
-  vhost_user_vring_unlock (vui, qid);
-
-done3:
-  if (PREDICT_FALSE (n_left && error != VHOST_USER_TX_FUNC_ERROR_NONE))
-    {
-      vlib_error_count (vm, node->node_index, error, n_left);
-      vlib_increment_simple_counter
-	(vnet_main.interface_main.sw_if_counters
-	 + VNET_INTERFACE_COUNTER_DROP,
-	 os_get_cpu_number (), vui->sw_if_index, n_left);
-    }
-
-  vlib_buffer_free (vm, vlib_frame_args (frame), frame->n_vectors);
-  return frame->n_vectors;
-}
-
-static clib_error_t *
-vhost_user_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index,
-				    u32 flags)
-{
-  vnet_hw_interface_t *hif = vnet_get_hw_interface (vnm, hw_if_index);
-  uword is_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
-  vhost_user_main_t *vum = &vhost_user_main;
-  vhost_user_intf_t *vui =
-    pool_elt_at_index (vum->vhost_user_interfaces, hif->dev_instance);
-
-  vui->admin_up = is_up;
-
-  if (is_up)
-    vnet_hw_interface_set_flags (vnm, vui->hw_if_index,
-				 VNET_HW_INTERFACE_FLAG_LINK_UP);
-
-  return /* no error */ 0;
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (vhost_user_dev_class,static) = {
-  .name = "vhost-user",
-  .tx_function = vhost_user_tx,
-  .tx_function_n_errors = VHOST_USER_TX_FUNC_N_ERROR,
-  .tx_function_error_strings = vhost_user_tx_func_error_strings,
-  .format_device_name = format_vhost_user_interface_name,
-  .name_renumber = vhost_user_name_renumber,
-  .admin_up_down_function = vhost_user_interface_admin_up_down,
-  .format_tx_trace = format_vhost_trace,
-};
-
-VLIB_DEVICE_TX_FUNCTION_MULTIARCH (vhost_user_dev_class,
-				   vhost_user_tx)
-/* *INDENT-ON* */
-
-static uword
-vhost_user_process (vlib_main_t * vm,
-		    vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  vhost_user_main_t *vum = &vhost_user_main;
-  vhost_user_intf_t *vui;
-  struct sockaddr_un sun;
-  int sockfd;
-  unix_file_t template = { 0 };
-  f64 timeout = 3153600000.0 /* 100 years */ ;
-  uword *event_data = 0;
-
-  sockfd = socket (AF_UNIX, SOCK_STREAM, 0);
-  sun.sun_family = AF_UNIX;
-  template.read_function = vhost_user_socket_read;
-  template.error_function = vhost_user_socket_error;
-
-  if (sockfd < 0)
-    return 0;
-
-  while (1)
-    {
-      vlib_process_wait_for_event_or_clock (vm, timeout);
-      vlib_process_get_events (vm, &event_data);
-      vec_reset_length (event_data);
-
-      timeout = 3.0;
-
-      /* *INDENT-OFF* */
-      pool_foreach (vui, vum->vhost_user_interfaces, {
-
-	  if (vui->unix_server_index == ~0) { //Nothing to do for server sockets
-	      if (vui->unix_file_index == ~0)
-		{
-		  /* try to connect */
-		  strncpy (sun.sun_path, (char *) vui->sock_filename,
-			   sizeof (sun.sun_path) - 1);
-
-		  if (connect (sockfd, (struct sockaddr *) &sun,
-			       sizeof (struct sockaddr_un)) == 0)
-		    {
-		      vui->sock_errno = 0;
-		      template.file_descriptor = sockfd;
-		      template.private_data =
-			  vui - vhost_user_main.vhost_user_interfaces;
-		      vui->unix_file_index = unix_file_add (&unix_main, &template);
-
-		      //Re-open for next connect
-		      if ((sockfd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) {
-			  clib_warning("Critical: Could not open unix socket");
-			  return 0;
-		      }
-		    }
-		  else
-		    {
-		      vui->sock_errno = errno;
-		    }
-		}
-	      else
-		{
-		  /* check if socket is alive */
-		  int error = 0;
-		  socklen_t len = sizeof (error);
-		  int fd = UNIX_GET_FD(vui->unix_file_index);
-		  int retval =
-		      getsockopt (fd, SOL_SOCKET, SO_ERROR, &error, &len);
-
-		  if (retval)
-		    {
-		      DBG_SOCK ("getsockopt returned %d", retval);
-		      vhost_user_if_disconnect (vui);
-		    }
-		}
-	  }
-      });
-      /* *INDENT-ON* */
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (vhost_user_process_node,static) = {
-    .function = vhost_user_process,
-    .type = VLIB_NODE_TYPE_PROCESS,
-    .name = "vhost-user-process",
-};
-/* *INDENT-ON* */
-
-/**
- * Disables and reset interface structure.
- * It can then be either init again, or removed from used interfaces.
- */
-static void
-vhost_user_term_if (vhost_user_intf_t * vui)
-{
-  // Delete configured thread pinning
-  vec_reset_length (vui->workers);
-  // disconnect interface sockets
-  vhost_user_if_disconnect (vui);
-  vhost_user_update_iface_state (vui);
-
-  if (vui->unix_server_index != ~0)
-    {
-      //Close server socket
-      unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
-					   vui->unix_server_index);
-      unix_file_del (&unix_main, uf);
-      vui->unix_server_index = ~0;
-    }
-}
-
-int
-vhost_user_delete_if (vnet_main_t * vnm, vlib_main_t * vm, u32 sw_if_index)
-{
-  vhost_user_main_t *vum = &vhost_user_main;
-  vhost_user_intf_t *vui;
-  int rv = 0;
-  vnet_hw_interface_t *hwif;
-
-  if (!(hwif = vnet_get_sup_hw_interface (vnm, sw_if_index)) ||
-      hwif->dev_class_index != vhost_user_dev_class.index)
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-  DBG_SOCK ("Deleting vhost-user interface %s (instance %d)",
-	    hwif->name, hwif->dev_instance);
-
-  vui = pool_elt_at_index (vum->vhost_user_interfaces, hwif->dev_instance);
-
-  // Disable and reset interface
-  vhost_user_term_if (vui);
-
-  // Back to pool
-  pool_put (vum->vhost_user_interfaces, vui);
-
-  // Reset renumbered iface
-  if (hwif->dev_instance <
-      vec_len (vum->show_dev_instance_by_real_dev_instance))
-    vum->show_dev_instance_by_real_dev_instance[hwif->dev_instance] = ~0;
-
-  // Delete ethernet interface
-  ethernet_delete_interface (vnm, vui->hw_if_index);
-  return rv;
-}
-
-/**
- * Open server unix socket on specified sock_filename.
- */
-static int
-vhost_user_init_server_sock (const char *sock_filename, int *sock_fd)
-{
-  int rv = 0;
-  struct sockaddr_un un = { };
-  int fd;
-  /* create listening socket */
-  if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
-    return VNET_API_ERROR_SYSCALL_ERROR_1;
-
-  un.sun_family = AF_UNIX;
-  strncpy ((char *) un.sun_path, (char *) sock_filename,
-	   sizeof (un.sun_path) - 1);
-
-  /* remove if exists */
-  unlink ((char *) sock_filename);
-
-  if (bind (fd, (struct sockaddr *) &un, sizeof (un)) == -1)
-    {
-      rv = VNET_API_ERROR_SYSCALL_ERROR_2;
-      goto error;
-    }
-
-  if (listen (fd, 1) == -1)
-    {
-      rv = VNET_API_ERROR_SYSCALL_ERROR_3;
-      goto error;
-    }
-
-  *sock_fd = fd;
-  return 0;
-
-error:
-  close (fd);
-  return rv;
-}
-
-/**
- * Create ethernet interface for vhost user interface.
- */
-static void
-vhost_user_create_ethernet (vnet_main_t * vnm, vlib_main_t * vm,
-			    vhost_user_intf_t * vui, u8 * hwaddress)
-{
-  vhost_user_main_t *vum = &vhost_user_main;
-  u8 hwaddr[6];
-  clib_error_t *error;
-
-  /* create hw and sw interface */
-  if (hwaddress)
-    {
-      clib_memcpy (hwaddr, hwaddress, 6);
-    }
-  else
-    {
-      random_u32 (&vum->random);
-      clib_memcpy (hwaddr + 2, &vum->random, sizeof (vum->random));
-      hwaddr[0] = 2;
-      hwaddr[1] = 0xfe;
-    }
-
-  error = ethernet_register_interface
-    (vnm,
-     vhost_user_dev_class.index,
-     vui - vum->vhost_user_interfaces /* device instance */ ,
-     hwaddr /* ethernet address */ ,
-     &vui->hw_if_index, 0 /* flag change */ );
-
-  if (error)
-    clib_error_report (error);
-
-  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, vui->hw_if_index);
-  hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] = 9000;
-}
-
-/*
- *  Initialize vui with specified attributes
- */
-static void
-vhost_user_vui_init (vnet_main_t * vnm,
-		     vhost_user_intf_t * vui,
-		     int server_sock_fd,
-		     const char *sock_filename,
-		     u64 feature_mask, u32 * sw_if_index)
-{
-  vnet_sw_interface_t *sw;
-  sw = vnet_get_hw_sw_interface (vnm, vui->hw_if_index);
-  int q;
-
-  if (server_sock_fd != -1)
-    {
-      unix_file_t template = { 0 };
-      template.read_function = vhost_user_socksvr_accept_ready;
-      template.file_descriptor = server_sock_fd;
-      template.private_data = vui - vhost_user_main.vhost_user_interfaces;	//hw index
-      vui->unix_server_index = unix_file_add (&unix_main, &template);
-    }
-  else
-    {
-      vui->unix_server_index = ~0;
-    }
-
-  vui->sw_if_index = sw->sw_if_index;
-  strncpy (vui->sock_filename, sock_filename,
-	   ARRAY_LEN (vui->sock_filename) - 1);
-  vui->sock_errno = 0;
-  vui->is_up = 0;
-  vui->feature_mask = feature_mask;
-  vui->unix_file_index = ~0;
-  vui->log_base_addr = 0;
-
-  for (q = 0; q < VHOST_VRING_MAX_N; q++)
-    vhost_user_vring_init (vui, q);
-
-  vnet_hw_interface_set_flags (vnm, vui->hw_if_index, 0);
-
-  if (sw_if_index)
-    *sw_if_index = vui->sw_if_index;
-
-  for (q = 0; q < VHOST_VRING_MAX_N; q++)
-    {
-      vui->vring_locks[q] = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
-						    CLIB_CACHE_LINE_BYTES);
-      memset ((void *) vui->vring_locks[q], 0, CLIB_CACHE_LINE_BYTES);
-    }
-
-  vec_validate (vui->per_cpu_tx_qid,
-		vlib_get_thread_main ()->n_vlib_mains - 1);
-  vhost_user_tx_thread_placement (vui);
-}
-
-int
-vhost_user_create_if (vnet_main_t * vnm, vlib_main_t * vm,
-		      const char *sock_filename,
-		      u8 is_server,
-		      u32 * sw_if_index,
-		      u64 feature_mask,
-		      u8 renumber, u32 custom_dev_instance, u8 * hwaddr)
-{
-  vhost_user_intf_t *vui = NULL;
-  u32 sw_if_idx = ~0;
-  int rv = 0;
-  int server_sock_fd = -1;
-
-  if (is_server)
-    {
-      if ((rv =
-	   vhost_user_init_server_sock (sock_filename, &server_sock_fd)) != 0)
-	{
-	  return rv;
-	}
-    }
-
-  pool_get (vhost_user_main.vhost_user_interfaces, vui);
-
-  vhost_user_create_ethernet (vnm, vm, vui, hwaddr);
-  vhost_user_vui_init (vnm, vui, server_sock_fd, sock_filename,
-		       feature_mask, &sw_if_idx);
-
-  if (renumber)
-    vnet_interface_name_renumber (sw_if_idx, custom_dev_instance);
-
-  if (sw_if_index)
-    *sw_if_index = sw_if_idx;
-
-  // Process node must connect
-  vlib_process_signal_event (vm, vhost_user_process_node.index, 0, 0);
-  return rv;
-}
-
-int
-vhost_user_modify_if (vnet_main_t * vnm, vlib_main_t * vm,
-		      const char *sock_filename,
-		      u8 is_server,
-		      u32 sw_if_index,
-		      u64 feature_mask, u8 renumber, u32 custom_dev_instance)
-{
-  vhost_user_main_t *vum = &vhost_user_main;
-  vhost_user_intf_t *vui = NULL;
-  u32 sw_if_idx = ~0;
-  int server_sock_fd = -1;
-  int rv = 0;
-  vnet_hw_interface_t *hwif;
-
-  if (!(hwif = vnet_get_sup_hw_interface (vnm, sw_if_index)) ||
-      hwif->dev_class_index != vhost_user_dev_class.index)
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-  vui = vec_elt_at_index (vum->vhost_user_interfaces, hwif->dev_instance);
-
-  // First try to open server socket
-  if (is_server)
-    if ((rv = vhost_user_init_server_sock (sock_filename,
-					   &server_sock_fd)) != 0)
-      return rv;
-
-  vhost_user_term_if (vui);
-  vhost_user_vui_init (vnm, vui, server_sock_fd,
-		       sock_filename, feature_mask, &sw_if_idx);
-
-  if (renumber)
-    vnet_interface_name_renumber (sw_if_idx, custom_dev_instance);
-
-  // Process node must connect
-  vlib_process_signal_event (vm, vhost_user_process_node.index, 0, 0);
-  return rv;
-}
-
-clib_error_t *
-vhost_user_connect_command_fn (vlib_main_t * vm,
-			       unformat_input_t * input,
-			       vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 *sock_filename = NULL;
-  u32 sw_if_index;
-  u8 is_server = 0;
-  u64 feature_mask = (u64) ~ (0ULL);
-  u8 renumber = 0;
-  u32 custom_dev_instance = ~0;
-  u8 hwaddr[6];
-  u8 *hw = NULL;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "socket %s", &sock_filename))
-	;
-      else if (unformat (line_input, "server"))
-	is_server = 1;
-      else if (unformat (line_input, "feature-mask 0x%llx", &feature_mask))
-	;
-      else
-	if (unformat
-	    (line_input, "hwaddr %U", unformat_ethernet_address, hwaddr))
-	hw = hwaddr;
-      else if (unformat (line_input, "renumber %d", &custom_dev_instance))
-	{
-	  renumber = 1;
-	}
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  vnet_main_t *vnm = vnet_get_main ();
-
-  int rv;
-  if ((rv = vhost_user_create_if (vnm, vm, (char *) sock_filename,
-				  is_server, &sw_if_index, feature_mask,
-				  renumber, custom_dev_instance, hw)))
-    {
-      vec_free (sock_filename);
-      return clib_error_return (0, "vhost_user_create_if returned %d", rv);
-    }
-
-  vec_free (sock_filename);
-  vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main (),
-		   sw_if_index);
-  return 0;
-}
-
-clib_error_t *
-vhost_user_delete_command_fn (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u32 sw_if_index = ~0;
-  vnet_main_t *vnm = vnet_get_main ();
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "sw_if_index %d", &sw_if_index))
-	;
-      else if (unformat
-	       (line_input, "%U", unformat_vnet_sw_interface, vnm,
-		&sw_if_index))
-	{
-	  vnet_hw_interface_t *hwif =
-	    vnet_get_sup_hw_interface (vnm, sw_if_index);
-	  if (hwif == NULL ||
-	      vhost_user_dev_class.index != hwif->dev_class_index)
-	    return clib_error_return (0, "Not a vhost interface");
-	}
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-  vhost_user_delete_if (vnm, vm, sw_if_index);
-  return 0;
-}
-
-int
-vhost_user_dump_ifs (vnet_main_t * vnm, vlib_main_t * vm,
-		     vhost_user_intf_details_t ** out_vuids)
-{
-  int rv = 0;
-  vhost_user_main_t *vum = &vhost_user_main;
-  vhost_user_intf_t *vui;
-  vhost_user_intf_details_t *r_vuids = NULL;
-  vhost_user_intf_details_t *vuid = NULL;
-  u32 *hw_if_indices = 0;
-  vnet_hw_interface_t *hi;
-  u8 *s = NULL;
-  int i;
-
-  if (!out_vuids)
-    return -1;
-
-  pool_foreach (vui, vum->vhost_user_interfaces,
-		vec_add1 (hw_if_indices, vui->hw_if_index);
-    );
-
-  for (i = 0; i < vec_len (hw_if_indices); i++)
-    {
-      hi = vnet_get_hw_interface (vnm, hw_if_indices[i]);
-      vui = pool_elt_at_index (vum->vhost_user_interfaces, hi->dev_instance);
-
-      vec_add2 (r_vuids, vuid, 1);
-      vuid->sw_if_index = vui->sw_if_index;
-      vuid->virtio_net_hdr_sz = vui->virtio_net_hdr_sz;
-      vuid->features = vui->features;
-      vuid->num_regions = vui->nregions;
-      vuid->sock_errno = vui->sock_errno;
-      strncpy ((char *) vuid->sock_filename, (char *) vui->sock_filename,
-	       ARRAY_LEN (vuid->sock_filename) - 1);
-
-      s = format (s, "%v%c", hi->name, 0);
-
-      strncpy ((char *) vuid->if_name, (char *) s,
-	       ARRAY_LEN (vuid->if_name) - 1);
-      _vec_len (s) = 0;
-    }
-
-  vec_free (s);
-  vec_free (hw_if_indices);
-
-  *out_vuids = r_vuids;
-
-  return rv;
-}
-
-clib_error_t *
-show_vhost_user_command_fn (vlib_main_t * vm,
-			    unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-  clib_error_t *error = 0;
-  vnet_main_t *vnm = vnet_get_main ();
-  vhost_user_main_t *vum = &vhost_user_main;
-  vhost_user_intf_t *vui;
-  u32 hw_if_index, *hw_if_indices = 0;
-  vnet_hw_interface_t *hi;
-  vhost_cpu_t *vhc;
-  vhost_iface_and_queue_t *vhiq;
-  u32 ci;
-
-  int i, j, q;
-  int show_descr = 0;
-  struct feat_struct
-  {
-    u8 bit;
-    char *str;
-  };
-  struct feat_struct *feat_entry;
-
-  static struct feat_struct feat_array[] = {
-#define _(s,b) { .str = #s, .bit = b, },
-    foreach_virtio_net_feature
-#undef _
-    {.str = NULL}
-  };
-
-#define foreach_protocol_feature \
-  _(VHOST_USER_PROTOCOL_F_MQ) \
-  _(VHOST_USER_PROTOCOL_F_LOG_SHMFD)
-
-  static struct feat_struct proto_feat_array[] = {
-#define _(s) { .str = #s, .bit = s},
-    foreach_protocol_feature
-#undef _
-    {.str = NULL}
-  };
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (input, "%U", unformat_vnet_hw_interface, vnm, &hw_if_index))
-	{
-	  vec_add1 (hw_if_indices, hw_if_index);
-	}
-      else if (unformat (input, "descriptors") || unformat (input, "desc"))
-	show_descr = 1;
-      else
-	{
-	  error = clib_error_return (0, "unknown input `%U'",
-				     format_unformat_error, input);
-	  goto done;
-	}
-    }
-  if (vec_len (hw_if_indices) == 0)
-    {
-      pool_foreach (vui, vum->vhost_user_interfaces,
-		    vec_add1 (hw_if_indices, vui->hw_if_index);
-	);
-    }
-  vlib_cli_output (vm, "Virtio vhost-user interfaces");
-  vlib_cli_output (vm, "Global:\n  coalesce frames %d time %e",
-		   vum->coalesce_frames, vum->coalesce_time);
-
-  for (i = 0; i < vec_len (hw_if_indices); i++)
-    {
-      hi = vnet_get_hw_interface (vnm, hw_if_indices[i]);
-      vui = pool_elt_at_index (vum->vhost_user_interfaces, hi->dev_instance);
-      vlib_cli_output (vm, "Interface: %s (ifindex %d)",
-		       hi->name, hw_if_indices[i]);
-
-      vlib_cli_output (vm, "virtio_net_hdr_sz %d\n"
-		       " features mask (0x%llx): \n"
-		       " features (0x%llx): \n",
-		       vui->virtio_net_hdr_sz, vui->feature_mask,
-		       vui->features);
-
-      feat_entry = (struct feat_struct *) &feat_array;
-      while (feat_entry->str)
-	{
-	  if (vui->features & (1ULL << feat_entry->bit))
-	    vlib_cli_output (vm, "   %s (%d)", feat_entry->str,
-			     feat_entry->bit);
-	  feat_entry++;
-	}
-
-      vlib_cli_output (vm, "  protocol features (0x%llx)",
-		       vui->protocol_features);
-      feat_entry = (struct feat_struct *) &proto_feat_array;
-      while (feat_entry->str)
-	{
-	  if (vui->protocol_features & (1ULL << feat_entry->bit))
-	    vlib_cli_output (vm, "   %s (%d)", feat_entry->str,
-			     feat_entry->bit);
-	  feat_entry++;
-	}
-
-      vlib_cli_output (vm, "\n");
-
-      vlib_cli_output (vm, " socket filename %s type %s errno \"%s\"\n\n",
-		       vui->sock_filename,
-		       (vui->unix_server_index != ~0) ? "server" : "client",
-		       strerror (vui->sock_errno));
-
-      vlib_cli_output (vm, " rx placement: ");
-      vec_foreach (vhc, vum->cpus)
-      {
-	vec_foreach (vhiq, vhc->rx_queues)
-	{
-	  if (vhiq->vhost_iface_index == vui - vum->vhost_user_interfaces)
-	    vlib_cli_output (vm, "   thread %d on vring %d\n",
-			     vhc - vum->cpus, VHOST_VRING_IDX_TX (vhiq->qid));
-	}
-      }
-
-      vlib_cli_output (vm, " tx placement: %s\n",
-		       vui->use_tx_spinlock ? "spin-lock" : "lock-free");
-
-      vec_foreach_index (ci, vui->per_cpu_tx_qid)
-      {
-	vlib_cli_output (vm, "   thread %d on vring %d\n", ci,
-			 VHOST_VRING_IDX_RX (vui->per_cpu_tx_qid[ci]));
-      }
-
-      vlib_cli_output (vm, "\n");
-
-      vlib_cli_output (vm, " Memory regions (total %d)\n", vui->nregions);
-
-      if (vui->nregions)
-	{
-	  vlib_cli_output (vm,
-			   " region fd    guest_phys_addr    memory_size        userspace_addr     mmap_offset        mmap_addr\n");
-	  vlib_cli_output (vm,
-			   " ====== ===== ================== ================== ================== ================== ==================\n");
-	}
-      for (j = 0; j < vui->nregions; j++)
-	{
-	  vlib_cli_output (vm,
-			   "  %d     %-5d 0x%016lx 0x%016lx 0x%016lx 0x%016lx 0x%016lx\n",
-			   j, vui->region_mmap_fd[j],
-			   vui->regions[j].guest_phys_addr,
-			   vui->regions[j].memory_size,
-			   vui->regions[j].userspace_addr,
-			   vui->regions[j].mmap_offset,
-			   pointer_to_uword (vui->region_mmap_addr[j]));
-	}
-      for (q = 0; q < VHOST_VRING_MAX_N; q++)
-	{
-	  if (!vui->vrings[q].started)
-	    continue;
-
-	  vlib_cli_output (vm, "\n Virtqueue %d (%s%s)\n", q,
-			   (q & 1) ? "RX" : "TX",
-			   vui->vrings[q].enabled ? "" : " disabled");
-
-	  vlib_cli_output (vm,
-			   "  qsz %d last_avail_idx %d last_used_idx %d\n",
-			   vui->vrings[q].qsz, vui->vrings[q].last_avail_idx,
-			   vui->vrings[q].last_used_idx);
-
-	  if (vui->vrings[q].avail && vui->vrings[q].used)
-	    vlib_cli_output (vm,
-			     "  avail.flags %x avail.idx %d used.flags %x used.idx %d\n",
-			     vui->vrings[q].avail->flags,
-			     vui->vrings[q].avail->idx,
-			     vui->vrings[q].used->flags,
-			     vui->vrings[q].used->idx);
-
-	  int kickfd = UNIX_GET_FD (vui->vrings[q].kickfd_idx);
-	  int callfd = UNIX_GET_FD (vui->vrings[q].callfd_idx);
-	  vlib_cli_output (vm, "  kickfd %d callfd %d errfd %d\n",
-			   kickfd, callfd, vui->vrings[q].errfd);
-
-	  if (show_descr)
-	    {
-	      vlib_cli_output (vm, "\n  descriptor table:\n");
-	      vlib_cli_output (vm,
-			       "   id          addr         len  flags  next      user_addr\n");
-	      vlib_cli_output (vm,
-			       "  ===== ================== ===== ====== ===== ==================\n");
-	      for (j = 0; j < vui->vrings[q].qsz; j++)
-		{
-		  u32 mem_hint = 0;
-		  vlib_cli_output (vm,
-				   "  %-5d 0x%016lx %-5d 0x%04x %-5d 0x%016lx\n",
-				   j, vui->vrings[q].desc[j].addr,
-				   vui->vrings[q].desc[j].len,
-				   vui->vrings[q].desc[j].flags,
-				   vui->vrings[q].desc[j].next,
-				   pointer_to_uword (map_guest_mem
-						     (vui,
-						      vui->vrings[q].desc[j].
-						      addr, &mem_hint)));
-		}
-	    }
-	}
-      vlib_cli_output (vm, "\n");
-    }
-done:
-  vec_free (hw_if_indices);
-  return error;
-}
-
-/*
- * CLI functions
- */
-
-/*?
- * Create a vHost User interface. Once created, a new virtual interface
- * will exist with the name '<em>VirtualEthernet0/0/x</em>', where '<em>x</em>'
- * is the next free index.
- *
- * There are several parameters associated with a vHost interface:
- *
- * - <b>socket <socket-filename></b> - Name of the linux socket used by QEMU/VM and
- * VPP to manage the vHost interface. If socket does not already exist, VPP will
- * create the socket.
- *
- * - <b>server</b> - Optional flag to indicate that VPP should be the server for the
- * linux socket. If not provided, VPP will be the client.
- *
- * - <b>feature-mask <hex></b> - Optional virtio/vhost feature set negotiated at
- * startup. By default, all supported features will be advertised. Otherwise,
- * provide the set of features desired.
- *   - 0x000008000 (15) - VIRTIO_NET_F_MRG_RXBUF
- *   - 0x000020000 (17) - VIRTIO_NET_F_CTRL_VQ
- *   - 0x000200000 (21) - VIRTIO_NET_F_GUEST_ANNOUNCE
- *   - 0x000400000 (22) - VIRTIO_NET_F_MQ
- *   - 0x004000000 (26) - VHOST_F_LOG_ALL
- *   - 0x008000000 (27) - VIRTIO_F_ANY_LAYOUT
- *   - 0x010000000 (28) - VIRTIO_F_INDIRECT_DESC
- *   - 0x040000000 (30) - VHOST_USER_F_PROTOCOL_FEATURES
- *   - 0x100000000 (32) - VIRTIO_F_VERSION_1
- *
- * - <b>hwaddr <mac-addr></b> - Optional ethernet address, can be in either
- * X:X:X:X:X:X unix or X.X.X cisco format.
- *
- * - <b>renumber <dev_instance></b> - Optional parameter which allows the instance
- * in the name to be specified. If instance already exists, name will be used
- * anyway and multiple instances will have the same name. Use with caution.
- *
- * @cliexpar
- * Example of how to create a vhost interface with VPP as the client and all features enabled:
- * @cliexstart{create vhost-user socket /tmp/vhost1.sock}
- * VirtualEthernet0/0/0
- * @cliexend
- * Example of how to create a vhost interface with VPP as the server and with just
- * multiple queues enabled:
- * @cliexstart{create vhost-user socket /tmp/vhost2.sock server feature-mask 0x40400000}
- * VirtualEthernet0/0/1
- * @cliexend
- * Once the vHost interface is created, enable the interface using:
- * @cliexcmd{set interface state VirtualEthernet0/0/0 up}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vhost_user_connect_command, static) = {
-    .path = "create vhost-user",
-    .short_help = "create vhost-user socket <socket-filename> [server] [feature-mask <hex>] [hwaddr <mac-addr>] [renumber <dev_instance>]",
-    .function = vhost_user_connect_command_fn,
-};
-/* *INDENT-ON* */
-
-/*?
- * Delete a vHost User interface using the interface name or the
- * software interface index. Use the '<em>show interfaces</em>'
- * command to determine the software interface index. On deletion,
- * the linux socket will not be deleted.
- *
- * @cliexpar
- * Example of how to delete a vhost interface by name:
- * @cliexcmd{delete vhost-user VirtualEthernet0/0/1}
- * Example of how to delete a vhost interface by software interface index:
- * @cliexcmd{delete vhost-user sw_if_index 1}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vhost_user_delete_command, static) = {
-    .path = "delete vhost-user",
-    .short_help = "delete vhost-user {<interface> | sw_if_index <sw_idx>}",
-    .function = vhost_user_delete_command_fn,
-};
-
-/*?
- * Display the attributes of a single vHost User interface (provide interface
- * name), multiple vHost User interfaces (provide a list of interface names seperated
- * by spaces) or all Vhost User interfaces (omit an interface name to display all
- * vHost interfaces).
- *
- * @cliexpar
- * @parblock
- * Example of how to display a vhost interface:
- * @cliexstart{show vhost-user VirtualEthernet0/0/0}
- * Virtio vhost-user interfaces
- * Global:
- *   coalesce frames 32 time 1e-3
- * Interface: VirtualEthernet0/0/0 (ifindex 1)
- * virtio_net_hdr_sz 12
- *  features mask (0xffffffffffffffff):
- *  features (0x50408000):
- *    VIRTIO_NET_F_MRG_RXBUF (15)
- *    VIRTIO_NET_F_MQ (22)
- *    VIRTIO_F_INDIRECT_DESC (28)
- *    VHOST_USER_F_PROTOCOL_FEATURES (30)
- *   protocol features (0x3)
- *    VHOST_USER_PROTOCOL_F_MQ (0)
- *    VHOST_USER_PROTOCOL_F_LOG_SHMFD (1)
- *
- *  socket filename /tmp/vhost1.sock type client errno "Success"
- *
- * rx placement:
- *    thread 1 on vring 1
- *    thread 1 on vring 5
- *    thread 2 on vring 3
- *    thread 2 on vring 7
- *  tx placement: spin-lock
- *    thread 0 on vring 0
- *    thread 1 on vring 2
- *    thread 2 on vring 0
- *
- * Memory regions (total 2)
- * region fd    guest_phys_addr    memory_size        userspace_addr     mmap_offset        mmap_addr
- * ====== ===== ================== ================== ================== ================== ==================
- *   0     60    0x0000000000000000 0x00000000000a0000 0x00002aaaaac00000 0x0000000000000000 0x00002aab2b400000
- *   1     61    0x00000000000c0000 0x000000003ff40000 0x00002aaaaacc0000 0x00000000000c0000 0x00002aababcc0000
- *
- *  Virtqueue 0 (TX)
- *   qsz 256 last_avail_idx 0 last_used_idx 0
- *   avail.flags 1 avail.idx 128 used.flags 1 used.idx 0
- *   kickfd 62 callfd 64 errfd -1
- *
- *  Virtqueue 1 (RX)
- *   qsz 256 last_avail_idx 0 last_used_idx 0
- *   avail.flags 1 avail.idx 0 used.flags 1 used.idx 0
- *   kickfd 65 callfd 66 errfd -1
- *
- *  Virtqueue 2 (TX)
- *   qsz 256 last_avail_idx 0 last_used_idx 0
- *   avail.flags 1 avail.idx 128 used.flags 1 used.idx 0
- *   kickfd 63 callfd 70 errfd -1
- *
- *  Virtqueue 3 (RX)
- *   qsz 256 last_avail_idx 0 last_used_idx 0
- *   avail.flags 1 avail.idx 0 used.flags 1 used.idx 0
- *   kickfd 72 callfd 74 errfd -1
- *
- *  Virtqueue 4 (TX disabled)
- *   qsz 256 last_avail_idx 0 last_used_idx 0
- *   avail.flags 1 avail.idx 0 used.flags 1 used.idx 0
- *   kickfd 76 callfd 78 errfd -1
- *
- *  Virtqueue 5 (RX disabled)
- *   qsz 256 last_avail_idx 0 last_used_idx 0
- *   avail.flags 1 avail.idx 0 used.flags 1 used.idx 0
- *   kickfd 80 callfd 82 errfd -1
- *
- *  Virtqueue 6 (TX disabled)
- *   qsz 256 last_avail_idx 0 last_used_idx 0
- *  avail.flags 1 avail.idx 0 used.flags 1 used.idx 0
- *   kickfd 84 callfd 86 errfd -1
- *
- *  Virtqueue 7 (RX disabled)
- *   qsz 256 last_avail_idx 0 last_used_idx 0
- *   avail.flags 1 avail.idx 0 used.flags 1 used.idx 0
- *   kickfd 88 callfd 90 errfd -1
- *
- * @cliexend
- *
- * The optional '<em>descriptors</em>' parameter will display the same output as
- * the previous example but will include the descriptor table for each queue.
- * The output is truncated below:
- * @cliexstart{show vhost-user VirtualEthernet0/0/0 descriptors}
- * Virtio vhost-user interfaces
- * Global:
- *   coalesce frames 32 time 1e-3
- * Interface: VirtualEthernet0/0/0 (ifindex 1)
- * virtio_net_hdr_sz 12
- *  features mask (0xffffffffffffffff):
- *  features (0x50408000):
- *    VIRTIO_NET_F_MRG_RXBUF (15)
- *    VIRTIO_NET_F_MQ (22)
- * :
- *  Virtqueue 0 (TX)
- *   qsz 256 last_avail_idx 0 last_used_idx 0
- *   avail.flags 1 avail.idx 128 used.flags 1 used.idx 0
- *   kickfd 62 callfd 64 errfd -1
- *
- *   descriptor table:
- *    id          addr         len  flags  next      user_addr
- *   ===== ================== ===== ====== ===== ==================
- *   0     0x0000000010b6e974 2060  0x0002 1     0x00002aabbc76e974
- *   1     0x0000000010b6e034 2060  0x0002 2     0x00002aabbc76e034
- *   2     0x0000000010b6d6f4 2060  0x0002 3     0x00002aabbc76d6f4
- *   3     0x0000000010b6cdb4 2060  0x0002 4     0x00002aabbc76cdb4
- *   4     0x0000000010b6c474 2060  0x0002 5     0x00002aabbc76c474
- *   5     0x0000000010b6bb34 2060  0x0002 6     0x00002aabbc76bb34
- *   6     0x0000000010b6b1f4 2060  0x0002 7     0x00002aabbc76b1f4
- *   7     0x0000000010b6a8b4 2060  0x0002 8     0x00002aabbc76a8b4
- *   8     0x0000000010b69f74 2060  0x0002 9     0x00002aabbc769f74
- *   9     0x0000000010b69634 2060  0x0002 10    0x00002aabbc769634
- *   10    0x0000000010b68cf4 2060  0x0002 11    0x00002aabbc768cf4
- * :
- *   249   0x0000000000000000 0     0x0000 250   0x00002aab2b400000
- *   250   0x0000000000000000 0     0x0000 251   0x00002aab2b400000
- *   251   0x0000000000000000 0     0x0000 252   0x00002aab2b400000
- *   252   0x0000000000000000 0     0x0000 253   0x00002aab2b400000
- *   253   0x0000000000000000 0     0x0000 254   0x00002aab2b400000
- *   254   0x0000000000000000 0     0x0000 255   0x00002aab2b400000
- *   255   0x0000000000000000 0     0x0000 32768 0x00002aab2b400000
- *
- *  Virtqueue 1 (RX)
- *   qsz 256 last_avail_idx 0 last_used_idx 0
- * :
- * @cliexend
- * @endparblock
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_vhost_user_command, static) = {
-    .path = "show vhost-user",
-    .short_help = "show vhost-user [<interface> [<interface> [..]]] [descriptors]",
-    .function = show_vhost_user_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-vhost_user_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  vhost_user_main_t *vum = &vhost_user_main;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "coalesce-frames %d", &vum->coalesce_frames))
-	;
-      else if (unformat (input, "coalesce-time %f", &vum->coalesce_time))
-	;
-      else if (unformat (input, "dont-dump-memory"))
-	vum->dont_dump_vhost_user_memory = 1;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-
-  return 0;
-}
-
-/* vhost-user { ... } configuration. */
-VLIB_CONFIG_FUNCTION (vhost_user_config, "vhost-user");
-
-void
-vhost_user_unmap_all (void)
-{
-  vhost_user_main_t *vum = &vhost_user_main;
-  vhost_user_intf_t *vui;
-
-  if (vum->dont_dump_vhost_user_memory)
-    {
-      pool_foreach (vui, vum->vhost_user_interfaces,
-		    unmap_all_mem_regions (vui);
-	);
-    }
-}
-
-static clib_error_t *
-vhost_thread_command_fn (vlib_main_t * vm,
-			 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u32 worker_thread_index;
-  u32 sw_if_index;
-  u8 del = 0;
-  int rv;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  if (!unformat
-      (line_input, "%U %d", unformat_vnet_sw_interface, vnet_get_main (),
-       &sw_if_index, &worker_thread_index))
-    {
-      unformat_free (line_input);
-      return clib_error_return (0, "unknown input `%U'",
-				format_unformat_error, input);
-    }
-
-  if (unformat (line_input, "del"))
-    del = 1;
-
-  if ((rv =
-       vhost_user_thread_placement (sw_if_index, worker_thread_index, del)))
-    return clib_error_return (0, "vhost_user_thread_placement returned %d",
-			      rv);
-  return 0;
-}
-
-
-/*?
- * This command is used to move the RX processing for the given
- * interfaces to the provided thread. If the '<em>del</em>' option is used,
- * the forced thread assignment is removed and the thread assigment is
- * reassigned automatically. Use '<em>show vhost-user <interface></em>'
- * to see the thread assignment.
- *
- * @cliexpar
- * Example of how to move the RX processing for a given interface to a given thread:
- * @cliexcmd{vhost thread VirtualEthernet0/0/0 1}
- * Example of how to remove the forced thread assignment for a given interface:
- * @cliexcmd{vhost thread VirtualEthernet0/0/0 1 del}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vhost_user_thread_command, static) = {
-    .path = "vhost thread",
-    .short_help = "vhost thread <iface> <worker-index> [del]",
-    .function = vhost_thread_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/virtio/vhost-user.h b/vnet/vnet/devices/virtio/vhost-user.h
deleted file mode 100644
index 3083b614..00000000
--- a/vnet/vnet/devices/virtio/vhost-user.h
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __VIRTIO_VHOST_USER_H__
-#define __VIRTIO_VHOST_USER_H__
-/* vhost-user data structures */
-
-#define VHOST_MEMORY_MAX_NREGIONS       8
-#define VHOST_USER_MSG_HDR_SZ           12
-#define VHOST_VRING_MAX_SIZE            32768
-#define VHOST_VRING_MAX_N               16	//8TX + 8RX
-#define VHOST_VRING_IDX_RX(qid)         (2*qid)
-#define VHOST_VRING_IDX_TX(qid)         (2*qid + 1)
-
-#define VIRTQ_DESC_F_NEXT               1
-#define VIRTQ_DESC_F_INDIRECT           4
-#define VHOST_USER_REPLY_MASK       (0x1 << 2)
-
-#define VHOST_USER_PROTOCOL_F_MQ   0
-#define VHOST_USER_PROTOCOL_F_LOG_SHMFD	1
-#define VHOST_VRING_F_LOG 0
-
-#define VHOST_USER_F_PROTOCOL_FEATURES  30
-#define VHOST_USER_PROTOCOL_FEATURES   ((1ULL << VHOST_USER_PROTOCOL_F_MQ) |	\
-					(1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD))
-
-/* If multiqueue is provided by host, then we suppport it. */
-#define VIRTIO_NET_CTRL_MQ   4
-#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET        0
-#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN        1
-#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX        0x8000
-
-#define VRING_USED_F_NO_NOTIFY  1
-
-#define foreach_virtio_net_feature      \
- _ (VIRTIO_NET_F_MRG_RXBUF, 15)         \
- _ (VIRTIO_NET_F_CTRL_VQ, 17)           \
- _ (VIRTIO_NET_F_GUEST_ANNOUNCE, 21)    \
- _ (VIRTIO_NET_F_MQ, 22)                \
- _ (VHOST_F_LOG_ALL, 26)                \
- _ (VIRTIO_F_ANY_LAYOUT, 27)            \
- _ (VIRTIO_F_INDIRECT_DESC, 28)         \
- _ (VHOST_USER_F_PROTOCOL_FEATURES, 30) \
- _ (VIRTIO_F_VERSION_1, 32)
-
-
-typedef enum
-{
-#define _(f,n) FEAT_##f = (n),
-  foreach_virtio_net_feature
-#undef _
-} virtio_net_feature_t;
-
-int vhost_user_create_if (vnet_main_t * vnm, vlib_main_t * vm,
-			  const char *sock_filename, u8 is_server,
-			  u32 * sw_if_index, u64 feature_mask,
-			  u8 renumber, u32 custom_dev_instance, u8 * hwaddr);
-int vhost_user_modify_if (vnet_main_t * vnm, vlib_main_t * vm,
-			  const char *sock_filename, u8 is_server,
-			  u32 sw_if_index, u64 feature_mask,
-			  u8 renumber, u32 custom_dev_instance);
-int vhost_user_delete_if (vnet_main_t * vnm, vlib_main_t * vm,
-			  u32 sw_if_index);
-
-/* *INDENT-OFF* */
-typedef struct vhost_user_memory_region
-{
-  u64 guest_phys_addr;
-  u64 memory_size;
-  u64 userspace_addr;
-  u64 mmap_offset;
-} __attribute ((packed)) vhost_user_memory_region_t;
-
-typedef struct vhost_user_memory
-{
-  u32 nregions;
-  u32 padding;
-  vhost_user_memory_region_t regions[VHOST_MEMORY_MAX_NREGIONS];
-} __attribute ((packed)) vhost_user_memory_t;
-
-typedef struct
-{
-  u32 index, num;
-} __attribute ((packed)) vhost_vring_state_t;
-
-typedef struct
-{
-  u32 index, flags;
-  u64 desc_user_addr, used_user_addr, avail_user_addr, log_guest_addr;
-} __attribute ((packed)) vhost_vring_addr_t;
-
-typedef struct vhost_user_log
-{
-  u64 size;
-  u64 offset;
-} __attribute ((packed)) vhost_user_log_t;
-
-typedef enum vhost_user_req
-{
-  VHOST_USER_NONE = 0,
-  VHOST_USER_GET_FEATURES = 1,
-  VHOST_USER_SET_FEATURES = 2,
-  VHOST_USER_SET_OWNER = 3,
-  VHOST_USER_RESET_OWNER = 4,
-  VHOST_USER_SET_MEM_TABLE = 5,
-  VHOST_USER_SET_LOG_BASE = 6,
-  VHOST_USER_SET_LOG_FD = 7,
-  VHOST_USER_SET_VRING_NUM = 8,
-  VHOST_USER_SET_VRING_ADDR = 9,
-  VHOST_USER_SET_VRING_BASE = 10,
-  VHOST_USER_GET_VRING_BASE = 11,
-  VHOST_USER_SET_VRING_KICK = 12,
-  VHOST_USER_SET_VRING_CALL = 13,
-  VHOST_USER_SET_VRING_ERR = 14,
-  VHOST_USER_GET_PROTOCOL_FEATURES = 15,
-  VHOST_USER_SET_PROTOCOL_FEATURES = 16,
-  VHOST_USER_GET_QUEUE_NUM = 17,
-  VHOST_USER_SET_VRING_ENABLE = 18,
-  VHOST_USER_MAX
-} vhost_user_req_t;
-
-// vring_desc I/O buffer descriptor
-typedef struct
-{
-  uint64_t addr;  // packet data buffer address
-  uint32_t len;   // packet data buffer size
-  uint16_t flags; // (see below)
-  uint16_t next;  // optional index next descriptor in chain
-} __attribute ((packed)) vring_desc_t;
-
-typedef struct
-{
-  uint16_t flags;
-  volatile uint16_t idx;
-  uint16_t ring[VHOST_VRING_MAX_SIZE];
-} __attribute ((packed)) vring_avail_t;
-
-typedef struct
-{
-  uint16_t flags;
-  uint16_t idx;
-  struct /* vring_used_elem */
-    {
-      uint32_t id;
-      uint32_t len;
-    } ring[VHOST_VRING_MAX_SIZE];
-} __attribute ((packed)) vring_used_t;
-
-typedef struct
-{
-  u8 flags;
-  u8 gso_type;
-  u16 hdr_len;
-  u16 gso_size;
-  u16 csum_start;
-  u16 csum_offset;
-} __attribute ((packed)) virtio_net_hdr_t;
-
-typedef struct  {
-  virtio_net_hdr_t hdr;
-  u16 num_buffers;
-} __attribute ((packed)) virtio_net_hdr_mrg_rxbuf_t;
-
-typedef struct vhost_user_msg {
-  vhost_user_req_t request;
-  u32 flags;
-  u32 size;
-  union
-    {
-      u64 u64;
-      vhost_vring_state_t state;
-      vhost_vring_addr_t addr;
-      vhost_user_memory_t memory;
-      vhost_user_log_t log;
-    };
-} __attribute ((packed)) vhost_user_msg_t;
-/* *INDENT-ON* */
-
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  u16 qsz;
-  u16 last_avail_idx;
-  u16 last_used_idx;
-  u16 n_since_last_int;
-  vring_desc_t *desc;
-  vring_avail_t *avail;
-  vring_used_t *used;
-  f64 int_deadline;
-  u8 started;
-  u8 enabled;
-  u8 log_used;
-  //Put non-runtime in a different cache line
-    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
-  int errfd;
-  u32 callfd_idx;
-  u32 kickfd_idx;
-  u64 log_guest_addr;
-} vhost_user_vring_t;
-
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  u32 is_up;
-  u32 admin_up;
-  u32 unix_server_index;
-  u32 unix_file_index;
-  char sock_filename[256];
-  int sock_errno;
-  u32 hw_if_index, sw_if_index;
-
-  //Feature negotiation
-  u64 features;
-  u64 feature_mask;
-  u64 protocol_features;
-
-  //Memory region information
-  u32 nregions;
-  vhost_user_memory_region_t regions[VHOST_MEMORY_MAX_NREGIONS];
-  void *region_mmap_addr[VHOST_MEMORY_MAX_NREGIONS];
-  u64 region_guest_addr_lo[VHOST_MEMORY_MAX_NREGIONS];
-  u64 region_guest_addr_hi[VHOST_MEMORY_MAX_NREGIONS];
-  u32 region_mmap_fd[VHOST_MEMORY_MAX_NREGIONS];
-
-  //Virtual rings
-  vhost_user_vring_t vrings[VHOST_VRING_MAX_N];
-  volatile u32 *vring_locks[VHOST_VRING_MAX_N];
-
-  int virtio_net_hdr_sz;
-  int is_any_layout;
-
-  void *log_base_addr;
-  u64 log_size;
-
-  /* Whether to use spinlock or per_cpu_tx_qid assignment */
-  u8 use_tx_spinlock;
-  u16 *per_cpu_tx_qid;
-
-  /* Vector of workers for this interface */
-  u32 *workers;
-} vhost_user_intf_t;
-
-typedef struct
-{
-  u16 vhost_iface_index;
-  u16 qid;
-} vhost_iface_and_queue_t;
-
-typedef struct
-{
-  uword dst;
-  uword src;
-  u32 len;
-} vhost_copy_t;
-
-typedef struct
-{
-  u16 qid; /** The interface queue index (Not the virtio vring idx) */
-  u16 device_index; /** The device index */
-  u32 virtio_ring_flags; /** Runtime queue flags  **/
-  u16 first_desc_len; /** Length of the first data descriptor **/
-  virtio_net_hdr_mrg_rxbuf_t hdr; /** Virtio header **/
-} vhost_trace_t;
-
-
-#define VHOST_USER_RX_BUFFERS_N (2 * VLIB_FRAME_SIZE + 2)
-#define VHOST_USER_COPY_ARRAY_N (4 * VLIB_FRAME_SIZE)
-
-typedef struct
-{
-  vhost_iface_and_queue_t *rx_queues;
-  u32 rx_buffers_len;
-  u32 rx_buffers[VHOST_USER_RX_BUFFERS_N];
-
-  virtio_net_hdr_mrg_rxbuf_t tx_headers[VLIB_FRAME_SIZE];
-  vhost_copy_t copy[VHOST_USER_COPY_ARRAY_N];
-
-  /* This is here so it doesn't end-up
-   * using stack or registers. */
-  vhost_trace_t *current_trace;
-} vhost_cpu_t;
-
-typedef struct
-{
-  u32 mtu_bytes;
-  vhost_user_intf_t *vhost_user_interfaces;
-  u32 *show_dev_instance_by_real_dev_instance;
-  u32 coalesce_frames;
-  f64 coalesce_time;
-  int dont_dump_vhost_user_memory;
-
-  /** first cpu index */
-  u32 input_cpu_first_index;
-
-  /** total cpu count */
-  u32 input_cpu_count;
-
-  /** Per-CPU data for vhost-user */
-  vhost_cpu_t *cpus;
-
-  /** Pseudo random iterator */
-  u32 random;
-} vhost_user_main_t;
-
-typedef struct
-{
-  u8 if_name[64];
-  u32 sw_if_index;
-  u32 virtio_net_hdr_sz;
-  u64 features;
-  u8 is_server;
-  u8 sock_filename[256];
-  u32 num_regions;
-  int sock_errno;
-} vhost_user_intf_details_t;
-
-int vhost_user_dump_ifs (vnet_main_t * vnm, vlib_main_t * vm,
-			 vhost_user_intf_details_t ** out_vuids);
-
-// CLI commands to be used from dpdk
-clib_error_t *vhost_user_connect_command_fn (vlib_main_t * vm,
-					     unformat_input_t * input,
-					     vlib_cli_command_t * cmd);
-clib_error_t *vhost_user_delete_command_fn (vlib_main_t * vm,
-					    unformat_input_t * input,
-					    vlib_cli_command_t * cmd);
-clib_error_t *show_vhost_user_command_fn (vlib_main_t * vm,
-					  unformat_input_t * input,
-					  vlib_cli_command_t * cmd);
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/virtio/vhost_user.api b/vnet/vnet/devices/virtio/vhost_user.api
deleted file mode 100644
index 21e42298..00000000
--- a/vnet/vnet/devices/virtio/vhost_user.api
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \brief vhost-user interface create request
-    @param client_index - opaque cookie to identify the sender
-    @param is_server - our side is socket server
-    @param sock_filename - unix socket filename, used to speak with frontend
-    @param use_custom_mac - enable or disable the use of the provided hardware address
-    @param mac_address - hardware address to use if 'use_custom_mac' is set
-*/
-define create_vhost_user_if
-{
-  u32 client_index;
-  u32 context;
-  u8 is_server;
-  u8 sock_filename[256];
-  u8 renumber;
-  u32 custom_dev_instance;
-  u8 use_custom_mac;
-  u8 mac_address[6];
-  u8 tag[64];
-};
-
-/** \brief vhost-user interface create response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-    @param sw_if_index - interface the operation is applied to
-*/
-define create_vhost_user_if_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-};
-
-/** \brief vhost-user interface modify request
-    @param client_index - opaque cookie to identify the sender
-    @param is_server - our side is socket server
-    @param sock_filename - unix socket filename, used to speak with frontend
-*/
-define modify_vhost_user_if
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 is_server;
-  u8 sock_filename[256];
-  u8 renumber;
-  u32 custom_dev_instance;
-};
-
-/** \brief vhost-user interface modify response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define modify_vhost_user_if_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief vhost-user interface delete request
-    @param client_index - opaque cookie to identify the sender
-*/
-define delete_vhost_user_if
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-};
-
-/** \brief vhost-user interface delete response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define delete_vhost_user_if_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Vhost-user interface details structure (fix this)
-    @param sw_if_index - index of the interface
-    @param interface_name - name of interface
-    @param virtio_net_hdr_sz - net header size
-    @param features - interface features
-    @param is_server - vhost-user server socket
-    @param sock_filename - socket filename
-    @param num_regions - number of used memory regions
-*/
-define sw_interface_vhost_user_details
-{
-  u32 context;
-  u32 sw_if_index;
-  u8 interface_name[64];
-  u32 virtio_net_hdr_sz;
-  u64 features;
-  u8 is_server;
-  u8 sock_filename[256];
-  u32 num_regions;
-  i32 sock_errno;
-};
-
-define sw_interface_vhost_user_dump
-{
-  u32 client_index;
-  u32 context;
-};
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/devices/virtio/vhost_user_api.c b/vnet/vnet/devices/virtio/vhost_user_api.c
deleted file mode 100644
index dd517c26..00000000
--- a/vnet/vnet/devices/virtio/vhost_user_api.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- *------------------------------------------------------------------
- * vhost-user_api.c - vhost-user api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/devices/virtio/vhost-user.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                                             \
-_(CREATE_VHOST_USER_IF, create_vhost_user_if)                           \
-_(MODIFY_VHOST_USER_IF, modify_vhost_user_if)                           \
-_(DELETE_VHOST_USER_IF, delete_vhost_user_if)                           \
-_(SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump)           \
-_(SW_INTERFACE_VHOST_USER_DETAILS, sw_interface_vhost_user_details)
-
-/*
- * WARNING: replicated pending api refactor completion
- */
-static void
-send_sw_interface_flags_deleted (vpe_api_main_t * am,
-				 unix_shared_memory_queue_t * q,
-				 u32 sw_if_index)
-{
-  vl_api_sw_interface_set_flags_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_FLAGS);
-  mp->sw_if_index = ntohl (sw_if_index);
-
-  mp->admin_up_down = 0;
-  mp->link_up_down = 0;
-  mp->deleted = 1;
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_create_vhost_user_if_t_handler (vl_api_create_vhost_user_if_t * mp)
-{
-  int rv = 0;
-  vl_api_create_vhost_user_if_reply_t *rmp;
-  u32 sw_if_index = (u32) ~ 0;
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-
-  rv = vhost_user_create_if (vnm, vm, (char *) mp->sock_filename,
-			     mp->is_server, &sw_if_index, (u64) ~ 0,
-			     mp->renumber, ntohl (mp->custom_dev_instance),
-			     (mp->use_custom_mac) ? mp->mac_address : NULL);
-
-  /* Remember an interface tag for the new interface */
-  if (rv == 0)
-    {
-      /* If a tag was supplied... */
-      if (mp->tag[0])
-	{
-	  /* Make sure it's a proper C-string */
-	  mp->tag[ARRAY_LEN (mp->tag) - 1] = 0;
-	  u8 *tag = format (0, "%s%c", mp->tag, 0);
-	  vnet_set_sw_interface_tag (vnm, tag, sw_if_index);
-	}
-    }
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CREATE_VHOST_USER_IF_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_modify_vhost_user_if_t_handler (vl_api_modify_vhost_user_if_t * mp)
-{
-  int rv = 0;
-  vl_api_modify_vhost_user_if_reply_t *rmp;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-
-  rv = vhost_user_modify_if (vnm, vm, (char *) mp->sock_filename,
-			     mp->is_server, sw_if_index, (u64) ~ 0,
-			     mp->renumber, ntohl (mp->custom_dev_instance));
-
-  REPLY_MACRO (VL_API_MODIFY_VHOST_USER_IF_REPLY);
-}
-
-static void
-vl_api_delete_vhost_user_if_t_handler (vl_api_delete_vhost_user_if_t * mp)
-{
-  int rv = 0;
-  vl_api_delete_vhost_user_if_reply_t *rmp;
-  vpe_api_main_t *vam = &vpe_api_main;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-
-  rv = vhost_user_delete_if (vnm, vm, sw_if_index);
-
-  REPLY_MACRO (VL_API_DELETE_VHOST_USER_IF_REPLY);
-  if (!rv)
-    {
-      unix_shared_memory_queue_t *q =
-	vl_api_client_index_to_input_queue (mp->client_index);
-      if (!q)
-	return;
-
-      vnet_clear_sw_interface_tag (vnm, sw_if_index);
-      send_sw_interface_flags_deleted (vam, q, sw_if_index);
-    }
-}
-
-static void
-  vl_api_sw_interface_vhost_user_details_t_handler
-  (vl_api_sw_interface_vhost_user_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-send_sw_interface_vhost_user_details (vpe_api_main_t * am,
-				      unix_shared_memory_queue_t * q,
-				      vhost_user_intf_details_t * vui,
-				      u32 context)
-{
-  vl_api_sw_interface_vhost_user_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_VHOST_USER_DETAILS);
-  mp->sw_if_index = ntohl (vui->sw_if_index);
-  mp->virtio_net_hdr_sz = ntohl (vui->virtio_net_hdr_sz);
-  mp->features = clib_net_to_host_u64 (vui->features);
-  mp->is_server = vui->is_server;
-  mp->num_regions = ntohl (vui->num_regions);
-  mp->sock_errno = ntohl (vui->sock_errno);
-  mp->context = context;
-
-  strncpy ((char *) mp->sock_filename,
-	   (char *) vui->sock_filename, ARRAY_LEN (mp->sock_filename) - 1);
-  strncpy ((char *) mp->interface_name,
-	   (char *) vui->if_name, ARRAY_LEN (mp->interface_name) - 1);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-  vl_api_sw_interface_vhost_user_dump_t_handler
-  (vl_api_sw_interface_vhost_user_dump_t * mp)
-{
-  int rv = 0;
-  vpe_api_main_t *am = &vpe_api_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-  vhost_user_intf_details_t *ifaces = NULL;
-  vhost_user_intf_details_t *vuid = NULL;
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  rv = vhost_user_dump_ifs (vnm, vm, &ifaces);
-  if (rv)
-    return;
-
-  vec_foreach (vuid, ifaces)
-  {
-    send_sw_interface_vhost_user_details (am, q, vuid, mp->context);
-  }
-  vec_free (ifaces);
-}
-
-/*
- * vhost-user_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_vhost_user;
-#undef _
-}
-
-static clib_error_t *
-vhost_user_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (vhost_user_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/dhcp/client.c b/vnet/vnet/dhcp/client.c
deleted file mode 100644
index c352e310..00000000
--- a/vnet/vnet/dhcp/client.c
+++ /dev/null
@@ -1,1031 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/dhcp/proxy.h>
-#include <vnet/fib/fib_table.h>
-
-dhcp_client_main_t dhcp_client_main;
-static u8 * format_dhcp_client_state (u8 * s, va_list * va);
-static vlib_node_registration_t dhcp_client_process_node;
-
-static void 
-dhcp_client_acquire_address (dhcp_client_main_t * dcm, dhcp_client_t * c)
-{
-  /* 
-   * Install any/all info gleaned from dhcp, right here
-   */
-  ip4_add_del_interface_address (dcm->vlib_main, c->sw_if_index,
-                                 (void *) &c->leased_address,
-                                 c->subnet_mask_width, 0 /*is_del*/);
-}
-
-static void 
-dhcp_client_release_address (dhcp_client_main_t * dcm, dhcp_client_t * c)
-{
-  /* 
-   * Remove any/all info gleaned from dhcp, right here. Caller(s)
-   * have not wiped out the info yet.
-   */
-
-  ip4_add_del_interface_address (dcm->vlib_main, c->sw_if_index,
-                                 (void *) &c->leased_address,
-                                 c->subnet_mask_width, 1 /*is_del*/);
-}
-
-static void
-set_l2_rewrite (dhcp_client_main_t * dcm, dhcp_client_t * c)
-{
-  /* Acquire the L2 rewrite string for the indicated sw_if_index */
-  c->l2_rewrite = vnet_build_rewrite_for_sw_interface(
-                      dcm->vnet_main,
-		      c->sw_if_index, 
-		      VNET_LINK_IP4,
-		      0 /* broadcast */);
-}
-
-/* 
- * dhcp_client_for_us - server-to-client callback.
- * Called from proxy_node.c:dhcp_proxy_to_client_input().
- * This function first decides that the packet in question is
- * actually for the dhcp client code in case we're also acting as
- * a dhcp proxy. Ay caramba, what a folly!
- */
-int dhcp_client_for_us (u32 bi, vlib_buffer_t * b,
-                        ip4_header_t * ip,
-                        udp_header_t * udp,
-                        dhcp_header_t * dhcp)
-{
-  dhcp_client_main_t * dcm = &dhcp_client_main;
-  vlib_main_t * vm = dcm->vlib_main;
-  dhcp_client_t * c;
-  uword * p;
-  f64 now = vlib_time_now (dcm->vlib_main);
-  u8 dhcp_message_type = 0;
-  dhcp_option_t * o;
-
-  /* 
-   * Doing dhcp client on this interface? 
-   * Presumably we will always receive dhcp clnt for-us pkts on
-   * the interface that's asking for an address.
-   */
-  p = hash_get (dcm->client_by_sw_if_index, 
-                vnet_buffer(b)->sw_if_index [VLIB_RX]);
-  if (p == 0)
-    return 0;                   /* no */
-  
-  c = pool_elt_at_index (dcm->clients, p[0]);
-
-  /* Mixing dhcp relay and dhcp proxy? DGMS... */
-  if (c->state == DHCP_BOUND && c->retry_count == 0)
-    return 0;
-
-  /* parse through the packet, learn what we can */
-  if (dhcp->your_ip_address.as_u32)
-    c->leased_address.as_u32 = dhcp->your_ip_address.as_u32;
-      
-  o = (dhcp_option_t *) dhcp->options;
-  
-  while (o->option != 0xFF /* end of options */ &&
-         (u8 *) o < (b->data + b->current_data + b->current_length))
-    {
-      switch (o->option)
-        {
-        case 53:                /* dhcp message type */
-          dhcp_message_type = o->data[0];
-          break;
-
-        case 51:                /* lease time */
-          {
-            u32 lease_time_in_seconds = 
-              clib_host_to_net_u32 (o->data_as_u32[0]);
-            c->lease_expires = now + (f64) lease_time_in_seconds;
-            c->lease_lifetime = lease_time_in_seconds;
-            /* Set a sensible default, in case we don't get opt 58 */
-            c->lease_renewal_interval = lease_time_in_seconds / 2;
-          }
-          break;
-
-        case 58:                /* lease renew time in seconds */
-          {
-            u32 lease_renew_time_in_seconds = 
-              clib_host_to_net_u32 (o->data_as_u32[0]);
-            c->lease_renewal_interval = lease_renew_time_in_seconds;
-          }
-          break;
-
-        case 54:                /* dhcp server address */
-          c->dhcp_server.as_u32 = o->data_as_u32[0];
-          break;
-
-        case 1:                 /* subnet mask */
-          {
-            u32 subnet_mask = 
-              clib_host_to_net_u32 (o->data_as_u32[0]);
-            c->subnet_mask_width = count_set_bits (subnet_mask);
-          }
-          break;
-        case 3:                 /* router address */
-          {
-            u32 router_address = o->data_as_u32[0];
-            c->router_address.as_u32 = router_address;
-          }
-          break;
-
-        case 12:                 /* hostname */
-          {
-            /* Replace the existing hostname if necessary */
-            vec_free (c->hostname);
-            vec_validate (c->hostname, o->length - 1);
-            clib_memcpy (c->hostname, o->data, o->length);
-          }
-          break;
-
-          /* $$$$ Your message in this space, parse more options */
-        default:
-          break;
-        }
-
-      o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
-    }
-
-  switch (c->state)
-    {
-    case DHCP_DISCOVER:
-      if (dhcp_message_type != DHCP_PACKET_OFFER)
-        {
-          clib_warning ("sw_if_index %d state %U message type %d",
-                        c->sw_if_index, format_dhcp_client_state,
-                        c->state, dhcp_message_type);
-          c->next_transmit = now + 5.0;
-          break;
-        }
-      /* Received an offer, go send a request */
-      c->state = DHCP_REQUEST;
-      c->retry_count = 0;
-      c->next_transmit = 0;     /* send right now... */
-      /* Poke the client process, which will send the request */
-      vlib_process_signal_event (vm, dhcp_client_process_node.index, 
-                                 EVENT_DHCP_CLIENT_WAKEUP, c - dcm->clients);
-      break;
-
-    case DHCP_BOUND:
-    case DHCP_REQUEST:
-      if (dhcp_message_type != DHCP_PACKET_ACK)
-        {
-          clib_warning ("sw_if_index %d state %U message type %d",
-                        c->sw_if_index, format_dhcp_client_state,
-                        c->state, dhcp_message_type);
-          c->next_transmit = now + 5.0;
-          break;
-        }
-      /* OK, we own the address (etc), add to the routing table(s) */
-      if (c->state == DHCP_REQUEST)
-        {
-          void (*fp)(u32, u32, u8 *, u8, u8 *, u8 *, u8 *) = c->event_callback;
-
-          dhcp_client_acquire_address (dcm, c);
-
-          /*
-           * Configure default IP route:
-           */
-          if (c->router_address.as_u32)
-	    {
-	      fib_prefix_t all_0s =
-	      {
-		  .fp_len = 0,
-		  .fp_addr.ip4.as_u32 = 0x0,
-		  .fp_proto = FIB_PROTOCOL_IP4,
-	      };
-	      ip46_address_t nh =
-	      {
-		  .ip4 = c->router_address,
-	      };
-
-	      fib_table_entry_path_add (fib_table_get_index_for_sw_if_index(
-					   FIB_PROTOCOL_IP4,
-					   c->sw_if_index),
-					&all_0s,
-					FIB_SOURCE_DHCP,
-					FIB_ENTRY_FLAG_NONE,
-					FIB_PROTOCOL_IP4,
-					&nh,
-					c->sw_if_index,
-					~0,
-					1,
-					NULL, // no label stack
-					FIB_ROUTE_PATH_FLAG_NONE);
-	    }
-
-          /*
-           * Call the user's event callback to report DHCP information
-           */
-          if (fp)
-            (*fp) (c->client_index,  /* clinet index */
-                   c->pid,
-                   c->hostname,
-                   0, /* is_ipv6 */
-                   (u8 *)&c->leased_address,  /* host IP address */
-                   (u8 *)&c->router_address,  /* router IP address */
-                   (u8 *)(c->l2_rewrite + 6));/* host MAC address */
-        }
-
-      c->state = DHCP_BOUND;
-      c->retry_count = 0;
-      c->next_transmit = now + (f64) c->lease_renewal_interval;
-      c->lease_expires = now + (f64) c->lease_lifetime;
-      break;
-
-    default:
-      clib_warning ("client %d bogus state %d", 
-                    c - dcm->clients, c->state);
-      break;
-    }
-
-  /* drop the pkt, return 1 */
-  vlib_buffer_free (vm, &bi, 1);
-  return 1;
-}
-
-static void 
-send_dhcp_pkt (dhcp_client_main_t * dcm, dhcp_client_t * c, 
-               dhcp_packet_type_t type, int is_broadcast)
-{
-  vlib_main_t * vm = dcm->vlib_main;
-  vnet_main_t * vnm = dcm->vnet_main;
-  vnet_hw_interface_t * hw = vnet_get_sup_hw_interface (vnm, c->sw_if_index);
-  vnet_sw_interface_t * sup_sw 
-    = vnet_get_sup_sw_interface (vnm, c->sw_if_index);
-  vnet_sw_interface_t * sw = vnet_get_sw_interface (vnm, c->sw_if_index);
-  vlib_buffer_t * b;
-  u32 bi;
-  ip4_header_t * ip;
-  udp_header_t * udp;
-  dhcp_header_t * dhcp;
-  u32 * to_next;
-  vlib_frame_t * f;
-  dhcp_option_t * o;
-  u16 udp_length, ip_length;
-
-  /* Interface(s) down? */
-  if ((hw->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) == 0)
-    return;
-  if ((sup_sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) == 0)
-    return;
-  if ((sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) == 0)
-    return;
-
-  if (vlib_buffer_alloc (vm, &bi, 1) != 1) {
-    clib_warning ("buffer allocation failure");
-    c->next_transmit = 0;
-    return;
-  }
-    
-  /* Build a dhcpv4 pkt from whole cloth */
-  b = vlib_get_buffer (vm, bi);
-
-  ASSERT (b->current_data == 0);
-
-  vnet_buffer(b)->sw_if_index[VLIB_RX] = c->sw_if_index;
-  if (is_broadcast) 
-    {
-      f = vlib_get_frame_to_node (vm, hw->output_node_index);
-      vnet_buffer(b)->sw_if_index[VLIB_TX] = c->sw_if_index;
-      clib_memcpy (b->data, c->l2_rewrite, vec_len(c->l2_rewrite));
-      ip = (void *)
-        (((u8 *)vlib_buffer_get_current (b)) + vec_len (c->l2_rewrite));
-    }
-  else
-    {
-      f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
-      vnet_buffer(b)->sw_if_index[VLIB_TX] = ~0; /* use interface VRF */
-      ip = vlib_buffer_get_current (b);
-    }
-
-  /* Enqueue the packet right now */
-  to_next = vlib_frame_vector_args (f);
-  to_next[0] = bi;
-  f->n_vectors = 1;
-
-  if (is_broadcast)
-    vlib_put_frame_to_node (vm, hw->output_node_index, f);
-  else
-    vlib_put_frame_to_node (vm, ip4_lookup_node.index, f);
-    
-  udp = (udp_header_t *)(ip+1);
-  dhcp = (dhcp_header_t *)(udp+1);
-
-  /* $$$ optimize, maybe */
-  memset (ip, 0, sizeof (*ip) + sizeof (*udp) + sizeof (*dhcp));
-
-  ip->ip_version_and_header_length = 0x45;
-  ip->ttl = 128;
-  ip->protocol = IP_PROTOCOL_UDP;
-  
-  if (is_broadcast)
-    {
-      /* src = 0.0.0.0, dst = 255.255.255.255 */
-      ip->dst_address.as_u32 = ~0;
-    }
-  else
-    {
-      /* Renewing an active lease, plain old ip4 src/dst */
-      ip->src_address.as_u32 = c->leased_address.as_u32;
-      ip->dst_address.as_u32 = c->dhcp_server.as_u32;
-    }
-
-  udp->src_port = clib_host_to_net_u16 (UDP_DST_PORT_dhcp_to_client);
-  udp->dst_port = clib_host_to_net_u16 (UDP_DST_PORT_dhcp_to_server);
-
-  /* Send the interface MAC address */
-  clib_memcpy (dhcp->client_hardware_address, c->l2_rewrite + 6, 6);
-
-  /* Lease renewal, set up client_ip_address */
-  if (is_broadcast == 0)
-    dhcp->client_ip_address.as_u32 = c->leased_address.as_u32;
-
-  dhcp->opcode = 1; /* request, all we send */
-  dhcp->hardware_type = 1; /* ethernet */
-  dhcp->hardware_address_length = 6; 
-  dhcp->transaction_identifier = c->transaction_id;  
-  dhcp->flags = clib_host_to_net_u16(is_broadcast ? DHCP_FLAG_BROADCAST : 0);
-  dhcp->magic_cookie.as_u32 = DHCP_MAGIC;
-  
-  o = (dhcp_option_t * )dhcp->options;
-
-  /* Send option 53, the DHCP message type */
-  o->option = 53;
-  o->length = 1;
-  o->data[0] = type;
-  o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
-
-  /* Send option 57, max msg length */
-  if (0 /* not needed, apparently */)
-    {
-      o->option = 57;
-      o->length = 2;
-      {
-        u16 *o2 = (u16 *) o->data;
-        *o2 = clib_host_to_net_u16 (1152);
-        o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
-      }
-    }
-
-  /*
-   * If server ip address is available with non-zero value,
-   * option 54 (DHCP Server Identifier) is sent.
-   */
-  if (c->dhcp_server.as_u32)
-    {
-      o->option = 54;
-      o->length = 4;
-      clib_memcpy (o->data, &c->dhcp_server.as_u32, 4);
-      o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
-    }
-
-  /* send option 50, requested IP address */
-  if (c->leased_address.as_u32)
-    {
-      o->option = 50;
-      o->length = 4;
-      clib_memcpy (o->data, &c->leased_address.as_u32, 4);
-      o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
-    }
-
-  /* send option 12, host name */
-  if (vec_len (c->hostname))
-    {
-      o->option = 12;
-      o->length = vec_len (c->hostname);
-      clib_memcpy (o->data, c->hostname, vec_len (c->hostname));
-      o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
-    }
-
-  /* $$ maybe send the client s/w version if anyone cares */
-
-  /* 
-   * send option 55, parameter request list
-   * The current list - see below, matches the Linux dhcp client's list
-   * Any specific dhcp server config and/or dhcp server may or may
-   * not yield specific options.
-   */
-  o->option = 55;
-  o->length = vec_len (c->option_55_data);
-  clib_memcpy (o->data, c->option_55_data, vec_len(c->option_55_data));
-  o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
-
-  /* End of list */
-  o->option = 0xff;
-  o->length = 0;
-  o++;
-  
-  b->current_length = ((u8 *)o) - b->data;
-
-  /* fix ip length, checksum and udp length */
-  ip_length = vlib_buffer_length_in_chain (vm, b);
-  if (is_broadcast)
-      ip_length -= vec_len (c->l2_rewrite);
-
-  ip->length = clib_host_to_net_u16(ip_length);
-  ip->checksum = ip4_header_checksum(ip);
-
-  udp_length = ip_length - (sizeof (*ip));
-  udp->length = clib_host_to_net_u16 (udp_length);
-}
-
-static int 
-dhcp_discover_state (dhcp_client_main_t * dcm, dhcp_client_t * c, f64 now)
-{
-  /*
-   * State machine "DISCOVER" state. Send a dhcp discover packet,
-   * eventually back off the retry rate.
-   */
-  send_dhcp_pkt (dcm, c, DHCP_PACKET_DISCOVER, 1 /* is_broadcast */);
-
-  c->retry_count++;
-  if (c->retry_count > 10)
-    c->next_transmit = now + 5.0;
-  else
-    c->next_transmit = now + 1.0;
-  return 0;
-}
-                                
-static int 
-dhcp_request_state (dhcp_client_main_t * dcm, dhcp_client_t * c, f64 now)
-{                              
-  /*
-   * State machine "REQUEST" state. Send a dhcp request packet,
-   * eventually drop back to the discover state.
-   */
-  send_dhcp_pkt (dcm, c, DHCP_PACKET_REQUEST, 1 /* is_broadcast */);
-
-  c->retry_count++;
-  if (c->retry_count > 7 /* lucky you */)
-    {
-      c->state = DHCP_DISCOVER;
-      c->next_transmit = now;
-      c->retry_count = 0;
-      return 1;
-    }
-  c->next_transmit = now + 1.0;
-  return 0;
-}
-
-static int 
-dhcp_bound_state (dhcp_client_main_t * dcm, dhcp_client_t * c, f64 now)
-{
-  /*
-   * State machine "BOUND" state. Send a dhcp request packet,
-   * eventually, when the lease expires, forget the dhcp data
-   * and go back to the stone age.
-   */
-  send_dhcp_pkt (dcm, c, DHCP_PACKET_REQUEST, 0 /* is_broadcast */);
-  
-  c->retry_count++;
-  if (c->retry_count > 10)
-    c->next_transmit = now + 5.0;
-  else
-    c->next_transmit = now + 1.0;
-  
-  if (now > c->lease_expires)
-    {
-      if (c->router_address.as_u32)
-        {
-	  fib_prefix_t all_0s =
-	  {
-	      .fp_len = 0,
-	      .fp_addr.ip4.as_u32 = 0x0,
-	      .fp_proto = FIB_PROTOCOL_IP4,
-	  };
-	  ip46_address_t nh = {
-	      .ip4 = c->router_address,
-	  };
-
-	  fib_table_entry_path_remove(fib_table_get_index_for_sw_if_index(
-					  FIB_PROTOCOL_IP4,
-					  c->sw_if_index),
-				      &all_0s,
-				      FIB_SOURCE_DHCP,
-				      FIB_PROTOCOL_IP4,
-				      &nh,
-				      c->sw_if_index,
-				      ~0,
-				      1,
-				      FIB_ROUTE_PATH_FLAG_NONE);
-	}
-
-      dhcp_client_release_address (dcm, c);
-      c->state = DHCP_DISCOVER;
-      c->next_transmit = now;
-      c->retry_count = 0;
-      /* Wipe out any memory of the address we had... */
-      c->leased_address.as_u32 = 0;
-      c->subnet_mask_width = 0;
-      c->router_address.as_u32 = 0;
-      c->lease_renewal_interval = 0;
-      c->dhcp_server.as_u32 = 0;
-      return 1;
-    }
-  return 0;
-}
-
-static f64 dhcp_client_sm (f64 now, f64 timeout, uword pool_index)
-{
-  dhcp_client_main_t * dcm = &dhcp_client_main;
-  dhcp_client_t * c;
-
-  /* deleted, pooched, yadda yadda yadda */
-  if (pool_is_free_index (dcm->clients, pool_index))
-    return timeout;
-
-  c = pool_elt_at_index (dcm->clients, pool_index);
-
-  /* Time for us to do something with this client? */
-  if (now < c->next_transmit)
-    return timeout;
-
- again:
-  switch (c->state)
-    {
-    case DHCP_DISCOVER:         /* send a discover */
-      if (dhcp_discover_state (dcm, c, now))
-        goto again;
-      break;
-
-    case DHCP_REQUEST:          /* send a request */
-      if (dhcp_request_state (dcm, c, now))
-        goto again;
-      break;
-      
-    case DHCP_BOUND:            /* bound, renew needed? */
-      if (dhcp_bound_state (dcm, c, now))
-        goto again;
-      break;
-      
-    default:
-      clib_warning ("dhcp client %d bogus state %d", 
-                    c - dcm->clients, c->state);
-      break;
-    }
-  
-  if (c->next_transmit < now + timeout)
-    return c->next_transmit - now;
-
-  return timeout;
-}
-
-static uword
-dhcp_client_process (vlib_main_t * vm,
-                     vlib_node_runtime_t * rt,
-                     vlib_frame_t * f)
-{
-  f64 timeout = 100.0;
-  f64 now;
-  uword event_type;
-  uword * event_data = 0;
-  dhcp_client_main_t * dcm = &dhcp_client_main;
-  dhcp_client_t * c;
-  int i;
-
-  while (1)
-    {
-      vlib_process_wait_for_event_or_clock (vm, timeout);
-
-      event_type = vlib_process_get_events (vm, &event_data);
-
-      now = vlib_time_now (vm);
-
-      switch (event_type)
-        {
-        case EVENT_DHCP_CLIENT_WAKEUP:
-          for (i = 0; i < vec_len (event_data); i++)
-            timeout = dhcp_client_sm (now, timeout, event_data[i]);
-          break;
-
-        case ~0:
-          pool_foreach (c, dcm->clients,
-          ({
-            timeout = dhcp_client_sm (now, timeout, 
-                                          (uword)(c - dcm->clients));
-          }));
-          if (pool_elts (dcm->clients) == 0)
-            timeout = 100.0;
-          break;
-        }
-
-      vec_reset_length (event_data);
-    }
-
-  /* NOTREACHED */
-  return 0;
-}
-
-VLIB_REGISTER_NODE (dhcp_client_process_node,static) = {
-    .function = dhcp_client_process,
-    .type = VLIB_NODE_TYPE_PROCESS,
-    .name = "dhcp-client-process",
-    .process_log2_n_stack_bytes = 16,
-};
-
-static u8 * format_dhcp_client_state (u8 * s, va_list * va)
-{
-  dhcp_client_state_t state = va_arg (*va, dhcp_client_state_t);
-  char * str = "BOGUS!";
-
-  switch (state)
-    {
-#define _(a)                                    \
-    case a:                                     \
-      str = #a;                                 \
-        break;
-      foreach_dhcp_client_state;
-#undef _
-    default:
-      break;
-    }
-
-  s = format (s, "%s", str);
-  return s;
-}
-
-static u8 * format_dhcp_client (u8 * s, va_list * va)
-{
-  dhcp_client_main_t * dcm = va_arg (*va, dhcp_client_main_t *);
-  dhcp_client_t * c = va_arg (*va, dhcp_client_t *);
-  int verbose = va_arg (*va, int);
-
-  s = format (s, "[%d] %U state %U ", c - dcm->clients, 
-              format_vnet_sw_if_index_name, dcm->vnet_main, c->sw_if_index,
-              format_dhcp_client_state, c->state);
-
-  if (c->leased_address.as_u32)
-    s = format (s, "addr %U/%d gw %U\n",
-                format_ip4_address, &c->leased_address, 
-                c->subnet_mask_width, format_ip4_address, &c->router_address);
-  else
-    s = format (s, "no address\n");
-
-  if (verbose)
-    {
-      s = format (s, "retry count %d, next xmt %.2f",
-                  c->retry_count, c->next_transmit);
-    }
-  return s;
-}
-
-static clib_error_t *
-show_dhcp_client_command_fn (vlib_main_t * vm,
-                             unformat_input_t * input,
-                             vlib_cli_command_t * cmd)
-{
-  dhcp_client_main_t * dcm = &dhcp_client_main;
-  dhcp_client_t * c;
-  int verbose = 0;
-  u32 sw_if_index = ~0;
-  uword * p;
-
-  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT) 
-    {
-      if (unformat (input, "intfc %U", 
-                    unformat_vnet_sw_interface, dcm->vnet_main, 
-                    &sw_if_index))
-        ;
-      else if (unformat (input, "verbose"))
-        verbose = 1;
-      else
-        break;
-    }
-
-  if (sw_if_index != ~0)
-    {
-      p = hash_get (dcm->client_by_sw_if_index, sw_if_index);
-      if (p == 0)
-        return clib_error_return (0, "dhcp client not configured");
-      c = pool_elt_at_index (dcm->clients, p[0]);
-      vlib_cli_output (vm, "%U", format_dhcp_client, dcm, c, verbose);
-      return 0;
-    }
-
-  pool_foreach (c, dcm->clients, 
-  ({
-    vlib_cli_output (vm, "%U", format_dhcp_client, dcm, c, verbose);
-  }));
-  
-  return 0;
-}
-
-VLIB_CLI_COMMAND (show_dhcp_client_command, static) = {
-  .path = "show dhcp client",
-  .short_help = "show dhcp client [intfc <intfc>][verbose]",
-  .function = show_dhcp_client_command_fn,
-};
-
-
-int dhcp_client_add_del (dhcp_client_add_del_args_t * a)
-{
-  dhcp_client_main_t * dcm = &dhcp_client_main;
-  vlib_main_t * vm = dcm->vlib_main;
-  dhcp_client_t * c;
-  uword * p;
-  fib_prefix_t all_1s =
-  {
-      .fp_len = 32,
-      .fp_addr.ip4.as_u32 = 0xffffffff,
-      .fp_proto = FIB_PROTOCOL_IP4,
-  };
-  fib_prefix_t all_0s =
-  {
-      .fp_len = 0,
-      .fp_addr.ip4.as_u32 = 0x0,
-      .fp_proto = FIB_PROTOCOL_IP4,
-  };
-
-  p = hash_get (dcm->client_by_sw_if_index, a->sw_if_index);
-
-  if ((p && a->is_add) || (!p && a->is_add == 0))
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  if (a->is_add)
-    {
-      pool_get (dcm->clients, c);
-      memset (c, 0, sizeof (*c));
-      c->state = DHCP_DISCOVER;
-      c->sw_if_index = a->sw_if_index;
-      c->client_index = a->client_index;
-      c->pid = a->pid;
-      c->event_callback = a->event_callback;
-      c->option_55_data = a->option_55_data;
-      c->hostname = a->hostname;
-      c->client_identifier = a->client_identifier;
-      do {
-        c->transaction_id = random_u32 (&dcm->seed);
-      } while (c->transaction_id == 0);
-      set_l2_rewrite (dcm, c);
-      hash_set (dcm->client_by_sw_if_index, a->sw_if_index, c - dcm->clients);
-
-      /* this add is ref counted by FIB so we can add for each itf */
-      fib_table_entry_special_add(fib_table_get_index_for_sw_if_index(
-				      FIB_PROTOCOL_IP4,
-				      c->sw_if_index),
-				  &all_1s,
-				  FIB_SOURCE_DHCP,
-				  FIB_ENTRY_FLAG_LOCAL,
-				  ADJ_INDEX_INVALID);
-
-     /*
-       * enable the interface to RX IPv4 packets
-       * this is also ref counted
-       */
-      ip4_sw_interface_enable_disable (c->sw_if_index, 1);
-
-      vlib_process_signal_event (vm, dhcp_client_process_node.index, 
-                                 EVENT_DHCP_CLIENT_WAKEUP, c - dcm->clients);
-    }
-  else
-    {
-      c = pool_elt_at_index (dcm->clients, p[0]);
-
-      fib_table_entry_special_remove(fib_table_get_index_for_sw_if_index(
-					 FIB_PROTOCOL_IP4,
-					 c->sw_if_index),
-				     &all_1s,
-				     FIB_SOURCE_DHCP);
-
-      if (c->router_address.as_u32)
-      {
-	  ip46_address_t nh = {
-	      .ip4 = c->router_address,
-	  };
-
-	  fib_table_entry_path_remove(fib_table_get_index_for_sw_if_index(
-					  FIB_PROTOCOL_IP4,
-					  c->sw_if_index),
-				      &all_0s,
-				      FIB_SOURCE_DHCP,
-				      FIB_PROTOCOL_IP4,
-				      &nh,
-				      c->sw_if_index,
-				      ~0,
-				      1,
-				      FIB_ROUTE_PATH_FLAG_NONE);
-      }
-      ip4_sw_interface_enable_disable (c->sw_if_index, 0);
-
-      vec_free (c->option_55_data);
-      vec_free (c->hostname);
-      vec_free (c->client_identifier);
-      vec_free (c->l2_rewrite);
-      hash_unset (dcm->client_by_sw_if_index, c->sw_if_index);
-      pool_put (dcm->clients, c);
-    }
-  return 0;
-}
-
-int
-dhcp_client_config (vlib_main_t * vm,
-                    u32 sw_if_index,
-                    u8 * hostname,
-                    u32 is_add,
-                    u32 client_index,
-                    void * event_callback,
-                    u32 pid)
-{
-  dhcp_client_add_del_args_t _a, *a = &_a;
-  int rv;
-
-  memset (a, 0, sizeof (*a));
-  a->is_add = is_add;
-  a->sw_if_index = sw_if_index;
-  a->client_index = client_index;
-  a->pid = pid;
-  a->event_callback = event_callback;
-  vec_validate(a->hostname, strlen((char *)hostname) - 1);
-  strncpy((char *)a->hostname, (char *)hostname, vec_len(a->hostname));
-  a->client_identifier = format (0, "vpe 1.0%c", 0);
-  /* 
-   * Option 55 request list. These data precisely match
-   * the Ubuntu dhcp client. YMMV.
-   */
-
-  /* Subnet Mask */
-  vec_add1 (a->option_55_data, 1);
-  /* Broadcast address */
-  vec_add1 (a->option_55_data, 28);
-  /* time offset */
-  vec_add1 (a->option_55_data, 2);
-  /* Router */
-  vec_add1 (a->option_55_data, 3);
-  /* Domain Name */
-  vec_add1 (a->option_55_data, 15);
-  /* DNS */
-  vec_add1 (a->option_55_data, 6);
-  /* Domain search */
-  vec_add1 (a->option_55_data, 119);
-  /* Host name */
-  vec_add1 (a->option_55_data, 12);
-  /* NetBIOS name server */
-  vec_add1 (a->option_55_data, 44);
-  /* NetBIOS Scope */
-  vec_add1 (a->option_55_data, 47);
-  /* MTU */
-  vec_add1 (a->option_55_data, 26);
-  /* Classless static route */
-  vec_add1 (a->option_55_data, 121);
-  /* NTP servers */
-  vec_add1 (a->option_55_data, 42);
-
-  rv = dhcp_client_add_del (a);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case VNET_API_ERROR_INVALID_VALUE:
-
-      vec_free (a->hostname);
-      vec_free (a->client_identifier);
-      vec_free (a->option_55_data);
-
-      if (is_add)
-        clib_warning ("dhcp client already enabled on intf_idx %d",
-                      sw_if_index);
-      else
-        clib_warning ("dhcp client not enabled on on intf_idx %d",
-                      sw_if_index);
-      break;
-
-    default:
-      clib_warning ("dhcp_client_add_del returned %d", rv);
-    }
-
-  return rv;
-}
-
-static clib_error_t *
-dhcp_client_set_command_fn (vlib_main_t * vm,
-                           unformat_input_t * input,
-                           vlib_cli_command_t * cmd)
-{
-
-  dhcp_client_main_t * dcm = &dhcp_client_main;
-  u32 sw_if_index;
-  u8 * hostname = 0;
-  u8 sw_if_index_set = 0;
-  int is_add = 1;
-  dhcp_client_add_del_args_t _a, *a = &_a;
-  int rv;
-
-  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT) 
-    {
-      if (unformat (input, "intfc %U", 
-                   unformat_vnet_sw_interface, dcm->vnet_main, 
-                   &sw_if_index))
-        sw_if_index_set = 1;
-      else if (unformat (input, "hostname %v", &hostname))
-        ;
-      else if (unformat (input, "del"))
-        is_add = 0;
-      else
-        break;
-    }
-
-  if (sw_if_index_set == 0)
-    return clib_error_return (0, "interface not specified");
-
-  memset (a, 0, sizeof (*a));
-  a->is_add = is_add;
-  a->sw_if_index = sw_if_index;
-  a->hostname = hostname;
-  a->client_identifier = format (0, "vpe 1.0%c", 0);
-
-  /* 
-   * Option 55 request list. These data precisely match
-   * the Ubuntu dhcp client. YMMV.
-   */
-
-  /* Subnet Mask */
-  vec_add1 (a->option_55_data, 1);
-  /* Broadcast address */
-  vec_add1 (a->option_55_data, 28);
-  /* time offset */
-  vec_add1 (a->option_55_data, 2);
-  /* Router */
-  vec_add1 (a->option_55_data, 3);
-  /* Domain Name */
-  vec_add1 (a->option_55_data, 15);
-  /* DNS */
-  vec_add1 (a->option_55_data, 6);
-  /* Domain search */
-  vec_add1 (a->option_55_data, 119);
-  /* Host name */
-  vec_add1 (a->option_55_data, 12);
-  /* NetBIOS name server */
-  vec_add1 (a->option_55_data, 44);
-  /* NetBIOS Scope */
-  vec_add1 (a->option_55_data, 47);
-  /* MTU */
-  vec_add1 (a->option_55_data, 26);
-  /* Classless static route */
-  vec_add1 (a->option_55_data, 121);
-  /* NTP servers */
-  vec_add1 (a->option_55_data, 42);
-
-  rv = dhcp_client_add_del (a);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case VNET_API_ERROR_INVALID_VALUE:
-
-      vec_free (a->hostname);
-      vec_free (a->client_identifier);
-      vec_free (a->option_55_data);
-      if (is_add)
-        return clib_error_return (0, "dhcp client already enabled on %U", 
-                                  format_vnet_sw_if_index_name, 
-                                  dcm->vnet_main, sw_if_index);
-      else
-        return clib_error_return (0, "dhcp client not enabled on %U", 
-                                  format_vnet_sw_if_index_name, 
-                                  dcm->vnet_main, sw_if_index);
-      break;
-
-    default:
-      vlib_cli_output (vm, "dhcp_client_add_del returned %d", rv);
-    }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (dhcp_client_set_command, static) = {
-  .path = "set dhcp client",
-  .short_help = "set dhcp client [del] intfc <interface> [hostname <name>]",
-  .function = dhcp_client_set_command_fn,
-};
-
-static clib_error_t *
-dhcp_client_init (vlib_main_t * vm)
-{
-  dhcp_client_main_t * dcm = &dhcp_client_main;
-
-  dcm->vlib_main = vm;
-  dcm->vnet_main = vnet_get_main();
-  dcm->seed = 0xdeaddabe;
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (dhcp_client_init);
diff --git a/vnet/vnet/dhcp/client.h b/vnet/vnet/dhcp/client.h
deleted file mode 100644
index d15e686b..00000000
--- a/vnet/vnet/dhcp/client.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * client.h: dhcp client
- */
-
-#ifndef included_dhcp_client_h
-#define included_dhcp_client_h
-
-#define foreach_dhcp_client_state               \
-_(DHCP_DISCOVER)                                \
-_(DHCP_REQUEST)                                 \
-_(DHCP_BOUND)
-
-typedef enum {
-#define _(a) a,
-  foreach_dhcp_client_state
-#undef _
-} dhcp_client_state_t;
-
-typedef struct {
-  dhcp_client_state_t state;
-
-  /* the interface in question */
-  u32 sw_if_index;
-
-  /* State machine retry counter */
-  u32 retry_count;
-
-  /* Send next pkt at this time */
-  f64 next_transmit;
-  f64 lease_expires;
-
-  /* DHCP transaction ID, a random number */
-  u32 transaction_id;
-
-  /* leased address, other learned info DHCP */
-  ip4_address_t leased_address; /* from your_ip_address field */
-  ip4_address_t dhcp_server;
-  u32 subnet_mask_width;        /* option 1 */
-  ip4_address_t router_address; /* option 3 */
-  u32 lease_renewal_interval;   /* option 51 */
-  u32 lease_lifetime;           /* option 59 */
-
-  /* Requested data (option 55) */
-  u8 * option_55_data;
-
-  u8 * l2_rewrite;
-
-  /* hostname and software client identifiers */
-  u8 * hostname;
-  u8 * client_identifier;       /* software version, e.g. vpe 1.0*/
-
-  /* Information used for event callback */
-  u32 client_index;
-  u32 pid;
-  void * event_callback;
-} dhcp_client_t;
-
-typedef struct {
-  /* DHCP client pool */
-  dhcp_client_t * clients;
-  uword * client_by_sw_if_index;
-  u32 seed;
-
-  /* convenience */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-} dhcp_client_main_t;
-
-typedef struct {
-  int is_add;
-  u32 sw_if_index;
-
-  /* vectors, consumed by dhcp client code */
-  u8 * hostname;
-  u8 * client_identifier;
-
-  /* Bytes containing requested option numbers */
-  u8 * option_55_data;
-
-  /* Information used for event callback */
-  u32 client_index;
-  u32 pid;
-  void * event_callback;
-} dhcp_client_add_del_args_t;
-
-dhcp_client_main_t dhcp_client_main;
-
-#define EVENT_DHCP_CLIENT_WAKEUP	1
-
-int dhcp_client_for_us (u32 bi0, 
-                          vlib_buffer_t * b0,
-                          ip4_header_t * ip0, 
-                          udp_header_t * u0,
-                          dhcp_header_t * dh0);
-
-int dhcp_client_config (vlib_main_t * vm,
-                        u32 sw_if_index,
-                        u8 * hostname,
-                        u32 is_add,
-                        u32 client_index,
-                        void *event_callback,
-                        u32 pid);
-
-#endif /* included_dhcp_client_h */
diff --git a/vnet/vnet/dhcp/packet.h b/vnet/vnet/dhcp/packet.h
deleted file mode 100644
index 267a8eaf..00000000
--- a/vnet/vnet/dhcp/packet.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef included_vnet_dhcp_packet_h
-#define included_vnet_dhcp_packet_h
-
-/*
- * DHCP packet format
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/ip/ip4_packet.h>
-
-typedef struct {
-  u8 opcode;                    /* 1 = request, 2 = reply */
-  u8 hardware_type;             /* 1 = ethernet */
-  u8 hardware_address_length;
-  u8 hops;
-  u32 transaction_identifier;
-  u16 seconds;
-  u16 flags;
-#define DHCP_FLAG_BROADCAST (1<<15)
-  ip4_address_t client_ip_address;
-  ip4_address_t your_ip_address; /* use this one */
-  ip4_address_t server_ip_address;
-  ip4_address_t gateway_ip_address; /* use option 3, not this one */
-  u8 client_hardware_address[16];
-  u8 server_name[64];
-  u8 boot_filename[128];
-  ip4_address_t magic_cookie;
-  u8 options[0];
-} dhcp_header_t;
-
-typedef struct {
-  u8 option;
-  u8 length;
-  union {
-    u8 data[0];
-    u32 data_as_u32[0];
-  };
-} __attribute__((packed)) dhcp_option_t;
-
-typedef enum {
-  DHCP_PACKET_DISCOVER=1,
-  DHCP_PACKET_OFFER,
-  DHCP_PACKET_REQUEST,
-  DHCP_PACKET_ACK=5,
-} dhcp_packet_type_t;
-
-/* charming antique: 99.130.83.99 is the dhcp magic cookie */
-#define DHCP_MAGIC (clib_host_to_net_u32(0x63825363))
-
-#endif /* included_vnet_dhcp_packet_h */
diff --git a/vnet/vnet/dhcp/proxy.h b/vnet/vnet/dhcp/proxy.h
deleted file mode 100644
index e12c0d00..00000000
--- a/vnet/vnet/dhcp/proxy.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * proxy.h: dhcp proxy 
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_dhcp_proxy_h
-#define included_dhcp_proxy_h
-
-#include <vnet/vnet.h>
-#include <vnet/dhcp/packet.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ip/ip4.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ip/format.h>
-#include <vnet/ip/udp.h>
-#include <vnet/dhcp/client.h>
-
-typedef enum {
-#define dhcp_proxy_error(n,s) DHCP_PROXY_ERROR_##n,
-#include <vnet/dhcp/proxy_error.def>
-#undef dhcp_proxy_error
-  DHCP_PROXY_N_ERROR,
-} dhcp_proxy_error_t;
-
-typedef struct {
-  u32 oui;
-  u32 fib_id;
-} vss_id;
-
-typedef union {
-  u8 as_u8[8];
-  vss_id vpn_id;
-} vss_info;
-
-typedef struct {
-  ip4_address_t dhcp_server;
-  ip4_address_t dhcp_src_address;
-  u32 insert_option_82;
-  u32 server_fib_index;
-  u32 valid;
-} dhcp_server_t;
-
-typedef struct {
-  /* Pool of DHCP servers */
-  dhcp_server_t * dhcp_servers;
-
-  /* Pool of selected DHCP server. Zero is the default server */
-  u32 * dhcp_server_index_by_rx_fib_index;
-
-  /* to drop pkts in server-to-client direction */
-  u32 error_drop_node_index;
-
-  vss_info *opt82vss;
-
-  /* hash lookup specific vrf_id -> option 82 vss suboption  */
-  uword * opt82vss_index_by_vrf_id;
-
-  /* convenience */
-  dhcp_client_main_t * dhcp_client_main;
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-} dhcp_proxy_main_t;
-
-dhcp_proxy_main_t dhcp_proxy_main;
-
-int dhcp_proxy_set_server (ip4_address_t *addr, ip4_address_t *src_address,
-                           u32 fib_id, int insert_option_82, int is_del);
-
-int dhcp_proxy_set_server_2 (ip4_address_t *addr, ip4_address_t *src_address,
-                             u32 rx_fib_id,
-                             u32 server_fib_id, 
-                             int insert_option_82, int is_del);
-
-int dhcp_proxy_set_option82_vss(u32 vrf_id,
-                                u32 oui,
-                                u32 fib_id, 
-                                int is_del);
-#endif /* included_dhcp_proxy_h */
diff --git a/vnet/vnet/dhcp/proxy_error.def b/vnet/vnet/dhcp/proxy_error.def
deleted file mode 100644
index 6aa06eb5..00000000
--- a/vnet/vnet/dhcp/proxy_error.def
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * dhcp_proxy_error.def: dhcp proxy errors
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-dhcp_proxy_error (NONE, "no error")
-dhcp_proxy_error (NO_SERVER, "no dhcp server configured")
-dhcp_proxy_error (RELAY_TO_SERVER, "DHCP packets relayed to the server")
-dhcp_proxy_error (RELAY_TO_CLIENT, "DHCP packets relayed to clients")
-dhcp_proxy_error (OPTION_82_ERROR, "DHCP failed to insert option 82")
-dhcp_proxy_error (NO_OPTION_82, "DHCP option 82 missing")
-dhcp_proxy_error (BAD_OPTION_82, "Bad DHCP option 82 value")
-dhcp_proxy_error (BAD_FIB_ID, "DHCP option 82 fib-id to fib-index map failure")
-dhcp_proxy_error (NO_INTERFACE_ADDRESS, "DHCP no interface address")
-dhcp_proxy_error (OPTION_82_VSS_NOT_PROCESSED, "DHCP VSS not processed by DHCP server")
-dhcp_proxy_error (BAD_YIADDR, "DHCP packets with bad your_ip_address fields")
-dhcp_proxy_error (BAD_SVR_FIB_OR_ADDRESS, "DHCP packets not from DHCP server or server FIB.")
-dhcp_proxy_error (PKT_TOO_BIG, "DHCP packets which are too big.")
diff --git a/vnet/vnet/dhcp/proxy_node.c b/vnet/vnet/dhcp/proxy_node.c
deleted file mode 100644
index d0d99d7e..00000000
--- a/vnet/vnet/dhcp/proxy_node.c
+++ /dev/null
@@ -1,1114 +0,0 @@
-/*
- * proxy_node.c: dhcp proxy node processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/dhcp/proxy.h>
-#include <vnet/fib/ip4_fib.h>
-
-static char * dhcp_proxy_error_strings[] = {
-#define dhcp_proxy_error(n,s) s,
-#include "proxy_error.def"
-#undef dhcp_proxy_error
-};
-
-#define foreach_dhcp_proxy_to_server_input_next \
-  _ (DROP, "error-drop")			\
-  _ (LOOKUP, "ip4-lookup")			\
-  _ (SEND_TO_CLIENT, "dhcp-proxy-to-client")
-
-typedef enum {
-#define _(s,n) DHCP_PROXY_TO_SERVER_INPUT_NEXT_##s,
-  foreach_dhcp_proxy_to_server_input_next
-#undef _
-  DHCP_PROXY_TO_SERVER_INPUT_N_NEXT,
-} dhcp_proxy_to_server_input_next_t;
-
-typedef struct {
-  /* 0 => to server, 1 => to client */
-  int which; 
-  ip4_address_t trace_ip4_address;
-  u32 error;
-  u32 sw_if_index;
-  u32 original_sw_if_index;
-} dhcp_proxy_trace_t;
-
-#define VPP_DHCP_OPTION82_SUB1_SIZE   6
-#define VPP_DHCP_OPTION82_SUB5_SIZE   6
-#define VPP_DHCP_OPTION82_VSS_SIZE    12
-#define VPP_DHCP_OPTION82_SIZE (VPP_DHCP_OPTION82_SUB1_SIZE + \
-                                VPP_DHCP_OPTION82_SUB5_SIZE + \
-                                VPP_DHCP_OPTION82_VSS_SIZE +3)
-
-vlib_node_registration_t dhcp_proxy_to_server_node;
-vlib_node_registration_t dhcp_proxy_to_client_node;
-
-u8 * format_dhcp_proxy_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  dhcp_proxy_trace_t * t = va_arg (*args, dhcp_proxy_trace_t *);
-    
-  if (t->which == 0)
-    s = format (s, "DHCP proxy: sent to server %U\n",
-                format_ip4_address, &t->trace_ip4_address, t->error);
-  else
-    s = format (s, "DHCP proxy: broadcast to client from %U\n",
-                format_ip4_address, &t->trace_ip4_address);
-      
-  if (t->error != (u32)~0)
-    s = format (s, "  error: %s\n", dhcp_proxy_error_strings[t->error]);
-
-  s = format (s, "  original_sw_if_index: %d, sw_if_index: %d\n",
-              t->original_sw_if_index, t->sw_if_index);
-  
-  return s;
-}
-
-u8 * format_dhcp_proxy_header_with_length (u8 * s, va_list * args)
-{
-  dhcp_header_t * h = va_arg (*args, dhcp_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-  u32 header_bytes;
-
-  header_bytes = sizeof (h[0]);
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    return format (s, "dhcp header truncated");
-
-  s = format (s, "DHCP Proxy");
-
-  return s;
-}
-
-static uword
-dhcp_proxy_to_server_input (vlib_main_t * vm,
-                            vlib_node_runtime_t * node,
-                            vlib_frame_t * from_frame)
-{
-  u32 n_left_from, next_index, * from, * to_next;
-  dhcp_proxy_main_t * dpm = &dhcp_proxy_main;
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-  u32 pkts_to_server=0, pkts_to_client=0, pkts_no_server=0;
-  u32 pkts_no_interface_address=0;
-  u32 pkts_too_big=0;
-  ip4_main_t * im = &ip4_main;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t * b0;
-          udp_header_t * u0;
-	  dhcp_header_t * h0;
-          ip4_header_t * ip0;
-	  u32 next0;
-          u32 old0, new0;
-          ip_csum_t sum0;
-          u32 error0 = (u32) ~0;
-          u32 sw_if_index = 0;
-          u32 original_sw_if_index = 0;
-          u8  *end = NULL;
-          u32 fib_index, server_index;
-          dhcp_server_t * server;
-          u32 rx_sw_if_index;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-          h0 = vlib_buffer_get_current (b0);
-
-          /* 
-           * udp_local hands us the DHCP header, need udp hdr, 
-           * ip hdr to relay to server
-           */
-          vlib_buffer_advance (b0, -(sizeof(*u0)));
-	  u0 = vlib_buffer_get_current (b0);
-
-          /* This blows. Return traffic has src_port = 67, dst_port = 67 */
-          if (u0->src_port == clib_net_to_host_u16(UDP_DST_PORT_dhcp_to_server))
-            {
-              vlib_buffer_advance (b0, sizeof(*u0));
-              next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_SEND_TO_CLIENT;
-              error0 = 0;
-              pkts_to_client++;
-              goto do_enqueue;
-            }
-
-          rx_sw_if_index = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-
-          fib_index = im->fib_index_by_sw_if_index [rx_sw_if_index];
-
-          if (fib_index < vec_len(dpm->dhcp_server_index_by_rx_fib_index))
-            server_index = dpm->dhcp_server_index_by_rx_fib_index[fib_index];
-          else
-            server_index = 0;
-          
-          if (PREDICT_FALSE (pool_is_free_index (dpm->dhcp_servers, 
-                                                 server_index)))
-            {
-            no_server:
-              error0 = DHCP_PROXY_ERROR_NO_SERVER;
-              next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_DROP;
-              pkts_no_server++;
-              goto do_trace;
-            }
-          
-          server = pool_elt_at_index (dpm->dhcp_servers, server_index);
-          if (server->valid == 0)
-            goto no_server;
-
-          vlib_buffer_advance (b0, -(sizeof(*ip0)));
-          ip0 = vlib_buffer_get_current (b0);
-
-          /* disable UDP checksum */
-          u0->checksum = 0;
-          sum0 = ip0->checksum;
-          old0 = ip0->dst_address.as_u32;
-          new0 = server->dhcp_server.as_u32;
-          ip0->dst_address.as_u32 = server->dhcp_server.as_u32;
-          sum0 = ip_csum_update (sum0, old0, new0, 
-                                ip4_header_t /* structure */, 
-                                dst_address /* changed member */);
-          ip0->checksum = ip_csum_fold (sum0);
-
-          sum0 = ip0->checksum;
-          old0 = ip0->src_address.as_u32;
-          new0 = server->dhcp_src_address.as_u32;
-          ip0->src_address.as_u32 = new0;
-          sum0 = ip_csum_update (sum0, old0, new0, 
-                                ip4_header_t /* structure */, 
-                                src_address /* changed member */);
-          ip0->checksum = ip_csum_fold (sum0);
-
-          /* Send to DHCP server via the configured FIB */
-          vnet_buffer(b0)->sw_if_index[VLIB_TX] =
-            server->server_fib_index;
-
-          h0->gateway_ip_address.as_u32 = server->dhcp_src_address.as_u32;
-          pkts_to_server++;
-
-          if (server->insert_option_82) 
-            {
-              u32 fib_index, fib_id, opt82_fib_id=0, opt82_oui=0;
-	      ip4_fib_t * fib;
-              dhcp_option_t *o = (dhcp_option_t *) h0->options;
-              u32 len = 0;
-              vlib_buffer_free_list_t *fl;
-              
-              fib_index = im->fib_index_by_sw_if_index 
-                [vnet_buffer(b0)->sw_if_index[VLIB_RX]];
-	      fib = ip4_fib_get (fib_index);
-	      fib_id = fib->table_id;
-
-              end = b0->data + b0->current_data + b0->current_length;
-              /* TLVs are not performance-friendly... */
-              while  (o->option != 0xFF /* end of options */ && (u8 *)o < end) 
-                  o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
-
-              fl = vlib_buffer_get_free_list (vm, b0->free_list_index);
-              // start write at (option*)o, some packets have padding
-              if (((u8 *)o - (u8 *)b0->data + VPP_DHCP_OPTION82_SIZE) > fl->n_data_bytes)
-                {
-                  next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_DROP;
-                  pkts_too_big++;
-                  goto do_trace;
-                }
-
-              if ((o->option == 0xFF)  && ((u8 *)o <= end))
-                {  
-                  vnet_main_t *vnm = vnet_get_main();   
-                  u16 old_l0, new_l0;
-                  ip4_address_t _ia0, * ia0 = &_ia0;
-                  uword  *p_vss;
-                  vss_info *vss;
-                  vnet_sw_interface_t *swif;
-                  sw_if_index = 0;
-                  original_sw_if_index = 0;
-                  
-                  original_sw_if_index = sw_if_index = 
-                      vnet_buffer(b0)->sw_if_index[VLIB_RX];
-                  swif = vnet_get_sw_interface (vnm, sw_if_index);
-                  if (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
-                      sw_if_index = swif->unnumbered_sw_if_index;
-                  
-                  p_vss = hash_get (dpm->opt82vss_index_by_vrf_id,
-                                    fib_id);
-                  if (p_vss) 
-                    {
-                      vss = pool_elt_at_index (dpm->opt82vss, p_vss[0]);
-                      opt82_oui =  vss->vpn_id.oui;
-                      opt82_fib_id =  vss->vpn_id.fib_id;
-                    }
-                  /* 
-                   * Get the first ip4 address on the [client-side] 
-                   * RX interface, if not unnumbered. otherwise use
-                   * the loopback interface's ip address.
-                   */
-                  ia0 = ip4_interface_first_address(&ip4_main, sw_if_index, 0);
-                  
-                  if (ia0 == 0)
-                    {
-                      error0 = DHCP_PROXY_ERROR_NO_INTERFACE_ADDRESS;
-                      next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_DROP;
-                      pkts_no_interface_address++;
-                      goto do_trace;
-                    }
-
-                  /* Add option 82 */
-                  o->option = 82;   /* option 82 */
-                  o->length = 12;   /* 12 octets to follow */
-                  o->data[0] = 1;   /* suboption 1, circuit ID (=FIB id) */
-                  o->data[1] = 4;   /* length of suboption */
-                  o->data[2] = (original_sw_if_index >> 24) & 0xFF;
-                  o->data[3] = (original_sw_if_index >> 16) & 0xFF;
-                  o->data[4] = (original_sw_if_index >> 8)  & 0xFF;
-                  o->data[5] = (original_sw_if_index >> 0)  & 0xFF;
-		  o->data[6] = 5; /* suboption 5 (client RX intfc address) */
-		  o->data[7] = 4; /* length 4 */
-		  o->data[8] = ia0->as_u8[0];
-		  o->data[9] = ia0->as_u8[1];
-		  o->data[10] = ia0->as_u8[2];
-		  o->data[11] = ia0->as_u8[3];
-                  o->data[12] = 0xFF;
-                  if (opt82_oui !=0 || opt82_fib_id != 0)
-                    {
-                      o->data[12] = 151; /* vss suboption */
-                      if (255 == opt82_fib_id) {
-                          o->data[13] = 1;   /* length */
-                          o->data[14] = 255;   /* vss option type */
-                          o->data[15] = 152; /* vss control suboption */
-                          o->data[16] = 0;   /* length */
-                          /* and a new "end-of-options" option (0xff) */
-                          o->data[17] = 0xFF;
-                          o->length += 5;
-                      } else {
-                          o->data[13] = 8;   /* length */
-                          o->data[14] = 1;   /* vss option type */
-                          o->data[15] = (opt82_oui >> 16) & 0xff;
-                          o->data[16] = (opt82_oui >> 8) & 0xff;
-                          o->data[17] = (opt82_oui ) & 0xff;
-                          o->data[18] = (opt82_fib_id >> 24) & 0xff;
-                          o->data[19] = (opt82_fib_id >> 16) & 0xff;
-                          o->data[20] = (opt82_fib_id >> 8) & 0xff;
-                          o->data[21] = (opt82_fib_id) & 0xff;
-                          o->data[22] = 152; /* vss control suboption */
-                          o->data[23] = 0;   /* length */
-                          
-                          /* and a new "end-of-options" option (0xff) */
-                          o->data[24] = 0xFF;
-                          o->length += 12;
-                      }
-                  }
-
-                  len = o->length + 3;
-                  b0->current_length += len;
-                  /* Fix IP header length and checksum */
-                  old_l0 = ip0->length;
-                  new_l0 = clib_net_to_host_u16 (old_l0);
-                  new_l0 += len;
-                  new_l0 = clib_host_to_net_u16 (new_l0);
-                  ip0->length = new_l0;
-                  sum0 = ip0->checksum;
-                  sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
-                                         length /* changed member */);
-                  ip0->checksum = ip_csum_fold (sum0);
-
-                  /* Fix UDP length */
-                  new_l0 = clib_net_to_host_u16 (u0->length);
-                  new_l0 += len;
-                  u0->length = clib_host_to_net_u16 (new_l0);
-                } else {
-                  vlib_node_increment_counter 
-                      (vm, dhcp_proxy_to_server_node.index,
-                       DHCP_PROXY_ERROR_OPTION_82_ERROR, 1);
-                }
-            }
-          
-          next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_LOOKUP;
-
-        do_trace:
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
-            {
-               dhcp_proxy_trace_t *tr = vlib_add_trace (vm, node, 
-                                                        b0, sizeof (*tr));
-               tr->which = 0; /* to server */
-               tr->error = error0;
-               tr->original_sw_if_index = original_sw_if_index;
-               tr->sw_if_index = sw_if_index;
-               if (next0 == DHCP_PROXY_TO_SERVER_INPUT_NEXT_LOOKUP)
-                 tr->trace_ip4_address.as_u32 = server->dhcp_server.as_u32;
-            }
-
-        do_enqueue:
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
-                               DHCP_PROXY_ERROR_RELAY_TO_CLIENT,
-                               pkts_to_client);
-  vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
-                               DHCP_PROXY_ERROR_RELAY_TO_SERVER,
-                               pkts_to_server);
-  vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
-                               DHCP_PROXY_ERROR_NO_SERVER,
-                               pkts_no_server);
-  vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
-                               DHCP_PROXY_ERROR_NO_INTERFACE_ADDRESS,
-                               pkts_no_interface_address);
- vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
-                              DHCP_PROXY_ERROR_PKT_TOO_BIG,
-                              pkts_too_big);
-  return from_frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (dhcp_proxy_to_server_node) = {
-  .function = dhcp_proxy_to_server_input,
-  .name = "dhcp-proxy-to-server",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .n_errors = DHCP_PROXY_N_ERROR,
-  .error_strings = dhcp_proxy_error_strings,
-
-  .n_next_nodes = DHCP_PROXY_TO_SERVER_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [DHCP_PROXY_TO_SERVER_INPUT_NEXT_##s] = n,
-    foreach_dhcp_proxy_to_server_input_next
-#undef _
-  },
-
-  .format_buffer = format_dhcp_proxy_header_with_length,
-  .format_trace = format_dhcp_proxy_trace,
-#if 0
-  .unformat_buffer = unformat_dhcp_proxy_header,
-#endif
-};
-
-static uword
-dhcp_proxy_to_client_input (vlib_main_t * vm,
-                            vlib_node_runtime_t * node,
-                            vlib_frame_t * from_frame)
-{
-  u32 n_left_from, * from;
-  ethernet_main_t *em = ethernet_get_main (vm);
-  dhcp_proxy_main_t * dpm = &dhcp_proxy_main;
-  vnet_main_t * vnm = vnet_get_main();
-  ip4_main_t * im = &ip4_main;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t * b0;
-      udp_header_t * u0;
-      dhcp_header_t * h0;
-      ip4_header_t * ip0 = 0;
-      ip4_address_t * ia0 = 0;
-      u32 old0, new0;
-      ip_csum_t sum0;
-      ethernet_interface_t *ei0;
-      ethernet_header_t *mac0;
-      vnet_hw_interface_t *hi0;
-      vlib_frame_t *f0;
-      u32 * to_next0;
-      u32 sw_if_index = ~0;
-      vnet_sw_interface_t *si0;
-      u32 error0 = (u32)~0;
-      vnet_sw_interface_t *swif;
-      u32 server_index;
-      u32 fib_index;
-      dhcp_server_t * server;
-      u32 original_sw_if_index = (u32) ~0;
-          
-      bi0 = from[0];
-      from += 1;
-      n_left_from -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      h0 = vlib_buffer_get_current (b0);
-
-      /* 
-       * udp_local hands us the DHCP header, need udp hdr, 
-       * ip hdr to relay to client
-       */
-      vlib_buffer_advance (b0, -(sizeof(*u0)));
-      u0 = vlib_buffer_get_current (b0);
-
-      vlib_buffer_advance (b0, -(sizeof(*ip0)));
-      ip0 = vlib_buffer_get_current (b0);
-
-      /* Consumed by dhcp client code? */
-      if (dhcp_client_for_us (bi0, b0, ip0, u0, h0))
-          continue;
-
-      if (1 /* dpm->insert_option_82 */)
-        {
-          dhcp_option_t *o = (dhcp_option_t *) h0->options;
-          dhcp_option_t *sub;
-              
-          /* Parse through TLVs looking for option 82.
-             The circuit-ID is the FIB number we need
-             to track down the client-facing interface */
-
-          while (o->option != 0xFF /* end of options */ &&
-                 (u8 *) o < (b0->data + b0->current_data + b0->current_length))
-            {
-              if (o->option == 82)
-                {
-                    u32 vss_exist = 0;
-                    u32 vss_ctrl = 0;
-                    sub = (dhcp_option_t *) &o->data[0];
-                    while (sub->option != 0xFF /* end of options */ &&
-                           (u8 *) sub < (u8 *)(o + o->length)) {
-                        /* If this is one of ours, it will have
-                           total length 12, circuit-id suboption type,
-                           and the sw_if_index */
-                        if (sub->option == 1 && sub->length == 4)
-                          {
-                            sw_if_index = (o->data[2] << 24)
-                                | (o->data[3] << 16)
-                                | (o->data[4] << 8)
-                                | (o->data[5]);
-                          } else if (sub->option == 151 &&
-                                     sub->length == 7 &&
-                                     sub->data[0] == 1)
-                            vss_exist = 1;
-                        else if (sub->option == 152 && sub->length == 0)
-                            vss_ctrl = 1;
-                        sub = (dhcp_option_t *) 
-                          (((uword) sub) + (sub->length + 2));
-                    }
-                    if (vss_ctrl && vss_exist)
-                      vlib_node_increment_counter 
-                        (vm, dhcp_proxy_to_client_node.index,
-                         DHCP_PROXY_ERROR_OPTION_82_VSS_NOT_PROCESSED, 1);
-
-                }
-              o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
-            }
-        }
-
-      if (sw_if_index == (u32)~0)
-        {
-          error0 = DHCP_PROXY_ERROR_NO_OPTION_82;
-          
-        drop_packet:
-          vlib_node_increment_counter (vm, dhcp_proxy_to_client_node.index,
-                                       error0, 1);
-          f0 = vlib_get_frame_to_node (vm, dpm->error_drop_node_index);
-          to_next0 = vlib_frame_vector_args (f0);
-          to_next0[0] = bi0;
-          f0->n_vectors = 1;
-          vlib_put_frame_to_node (vm, dpm->error_drop_node_index, f0);
-          goto do_trace;
-        }
-      
-
-      if (sw_if_index >= vec_len (im->fib_index_by_sw_if_index))
-        {
-          error0 = DHCP_PROXY_ERROR_BAD_OPTION_82;
-          goto drop_packet;
-        }
-
-      fib_index = im->fib_index_by_sw_if_index [sw_if_index];
-
-      if (fib_index < vec_len(dpm->dhcp_server_index_by_rx_fib_index))
-        server_index = dpm->dhcp_server_index_by_rx_fib_index[fib_index];
-      else
-        server_index = 0;
-
-      if (PREDICT_FALSE (pool_is_free_index (dpm->dhcp_servers, 
-                                             server_index)))
-        {
-          error0 = DHCP_PROXY_ERROR_BAD_OPTION_82;
-          goto drop_packet;
-        }
-      
-      server = pool_elt_at_index (dpm->dhcp_servers, server_index);
-      if (server->valid == 0)
-        {
-          error0 = DHCP_PROXY_ERROR_NO_SERVER;
-          goto drop_packet;
-        }
-
-      if (ip0->src_address.as_u32 != server->dhcp_server.as_u32)
-        {             
-          error0 = DHCP_PROXY_ERROR_BAD_SVR_FIB_OR_ADDRESS;
-          goto drop_packet;
-        }
-
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] = sw_if_index;
-
-      swif = vnet_get_sw_interface (vnm, sw_if_index);
-      original_sw_if_index = sw_if_index;
-      if (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
-          sw_if_index = swif->unnumbered_sw_if_index;
-
-      ia0 = ip4_interface_first_address (&ip4_main, sw_if_index, 0);
-      if (ia0 == 0)
-        {
-          error0 = DHCP_PROXY_ERROR_NO_INTERFACE_ADDRESS;
-          goto drop_packet;
-        }
-
-      u0->checksum = 0;
-      u0->dst_port = clib_net_to_host_u16 (UDP_DST_PORT_dhcp_to_client);
-      sum0 = ip0->checksum;
-      old0 = ip0->dst_address.as_u32;
-      new0 = 0xFFFFFFFF;
-      ip0->dst_address.as_u32 = new0;
-      sum0 = ip_csum_update (sum0, old0, new0, 
-                            ip4_header_t /* structure */, 
-                            dst_address /* offset of changed member */);
-      ip0->checksum = ip_csum_fold (sum0);
-
-      sum0 = ip0->checksum;
-      old0 = ip0->src_address.as_u32;
-      new0 = ia0->as_u32;
-      ip0->src_address.as_u32 = new0;
-      sum0 = ip_csum_update (sum0, old0, new0, 
-                            ip4_header_t /* structure */, 
-                            src_address /* offset of changed member */);
-      ip0->checksum = ip_csum_fold (sum0);
-
-      vlib_buffer_advance (b0, -(sizeof(ethernet_header_t)));
-      si0 = vnet_get_sw_interface (vnm, original_sw_if_index);
-      if (si0->type == VNET_SW_INTERFACE_TYPE_SUB)
-	  vlib_buffer_advance (b0, -4 /* space for VLAN tag */);
-
-      mac0 = vlib_buffer_get_current (b0);
-
-      hi0 = vnet_get_sup_hw_interface (vnm, original_sw_if_index);
-      ei0 = pool_elt_at_index (em->interfaces, hi0->hw_instance);
-      clib_memcpy (mac0->src_address, ei0->address, sizeof (ei0->address));
-      memset (mac0->dst_address, 0xff, sizeof (mac0->dst_address));
-      mac0->type = (si0->type == VNET_SW_INTERFACE_TYPE_SUB) ?
-	clib_net_to_host_u16(0x8100) : clib_net_to_host_u16 (0x0800);
-
-      if (si0->type == VNET_SW_INTERFACE_TYPE_SUB)
-	{
-	  u32 * vlan_tag = (u32 *)(mac0+1);
-	  u32 tmp;
-	  tmp = (si0->sub.id << 16) | 0x0800;
-	  *vlan_tag = clib_host_to_net_u32 (tmp);
-	}
-
-      /* $$$ This needs to be rewritten, for sure */
-      f0 = vlib_get_frame_to_node (vm, hi0->output_node_index);
-      to_next0 = vlib_frame_vector_args (f0);
-      to_next0[0] = bi0;
-      f0->n_vectors = 1;
-      vlib_put_frame_to_node (vm, hi0->output_node_index, f0);
-
-    do_trace:
-      if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
-        {
-          dhcp_proxy_trace_t *tr = vlib_add_trace (vm, node, 
-                                                   b0, sizeof (*tr));
-          tr->which = 1; /* to client */
-          tr->trace_ip4_address.as_u32 = ia0 ? ia0->as_u32 : 0;
-          tr->error = error0;
-          tr->original_sw_if_index = original_sw_if_index;
-          tr->sw_if_index = sw_if_index;
-        }
-    }
-  return from_frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (dhcp_proxy_to_client_node) = {
-  .function = dhcp_proxy_to_client_input,
-  .name = "dhcp-proxy-to-client",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .n_errors = DHCP_PROXY_N_ERROR,
-  .error_strings = dhcp_proxy_error_strings,
-  .format_buffer = format_dhcp_proxy_header_with_length,
-  .format_trace = format_dhcp_proxy_trace,
-#if 0
-  .unformat_buffer = unformat_dhcp_proxy_header,
-#endif
-};
-
-clib_error_t * dhcp_proxy_init (vlib_main_t * vm)
-{
-  dhcp_proxy_main_t * dm = &dhcp_proxy_main;
-  vlib_node_t * error_drop_node;
-  dhcp_server_t * server;
-
-  dm->vlib_main = vm;
-  dm->vnet_main = vnet_get_main();
-  error_drop_node = vlib_get_node_by_name (vm, (u8 *) "error-drop");
-  dm->error_drop_node_index = error_drop_node->index;
-
-  dm->opt82vss_index_by_vrf_id = hash_create (0, sizeof (uword));
-
-  udp_register_dst_port (vm, UDP_DST_PORT_dhcp_to_client, 
-                         dhcp_proxy_to_client_node.index, 1 /* is_ip4 */);
-
-  udp_register_dst_port (vm, UDP_DST_PORT_dhcp_to_server, 
-                         dhcp_proxy_to_server_node.index, 1 /* is_ip4 */);
-
-  /* Create the default server, don't mark it valid */
-  pool_get (dm->dhcp_servers, server);
-  memset (server, 0, sizeof (*server));
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (dhcp_proxy_init);
-
-int dhcp_proxy_set_server_2 (ip4_address_t *addr, ip4_address_t *src_address,
-                             u32 rx_fib_id,
-                             u32 server_fib_id, 
-                             int insert_option_82, int is_del)
-{
-  dhcp_proxy_main_t * dpm = &dhcp_proxy_main;
-  dhcp_server_t * server = 0;
-  u32 server_index = 0;
-  u32 rx_fib_index = 0;
-
-  if (addr->as_u32 == 0)
-    return VNET_API_ERROR_INVALID_DST_ADDRESS;
-  
-  if (src_address->as_u32 == 0)
-    return VNET_API_ERROR_INVALID_SRC_ADDRESS;
-
-  rx_fib_index = fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP4,
-                                                   rx_fib_id);
-
-  if (rx_fib_id == 0)
-    {
-      server = pool_elt_at_index (dpm->dhcp_servers, 0);
-      
-      if (is_del)
-        {
-          memset (server, 0, sizeof (*server));
-          return 0;
-        }
-      goto initialize_it;
-    }
-
-  if (is_del)
-    {
-      if (rx_fib_index >= vec_len(dpm->dhcp_server_index_by_rx_fib_index))
-        return VNET_API_ERROR_NO_SUCH_ENTRY;
-      
-      server_index = dpm->dhcp_server_index_by_rx_fib_index[rx_fib_index];
-      ASSERT(server_index > 0);
-
-      /* Use the default server again.  */
-      dpm->dhcp_server_index_by_rx_fib_index[rx_fib_index] = 0;
-      server = pool_elt_at_index (dpm->dhcp_servers, server_index);
-      memset (server, 0, sizeof (*server));
-      pool_put (dpm->dhcp_servers, server);
-      return 0;
-    }
-
-  if (rx_fib_index < vec_len(dpm->dhcp_server_index_by_rx_fib_index))
-    {
-      server_index = dpm->dhcp_server_index_by_rx_fib_index[rx_fib_index];
-      if (server_index != 0)
-        {
-          server = pool_elt_at_index (dpm->dhcp_servers, server_index);
-          goto initialize_it;
-        }
-    }
-
-  pool_get (dpm->dhcp_servers, server);
-  
- initialize_it:
-
-  server->dhcp_server.as_u32 = addr->as_u32;
-  server->server_fib_index = 
-      fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP4,
-	  				server_fib_id);
-  server->dhcp_src_address.as_u32 = src_address->as_u32;
-  server->insert_option_82 = insert_option_82;
-  server->valid = 1;
-  if (rx_fib_index)
-    {
-      vec_validate (dpm->dhcp_server_index_by_rx_fib_index, rx_fib_index);
-      dpm->dhcp_server_index_by_rx_fib_index[rx_fib_index] = 
-        server - dpm->dhcp_servers;
-    }
-
-  return 0;
-}
-
-/* Old API, manipulates the default server (only) */
-int dhcp_proxy_set_server (ip4_address_t *addr, ip4_address_t *src_address,
-                           u32 fib_id, int insert_option_82, int is_del)
-{
-  return dhcp_proxy_set_server_2 (addr, src_address, 0 /* rx_fib_id */,
-                                  fib_id /* server_fib_id */, 
-                                  insert_option_82, is_del);
-}
-
-
-static clib_error_t *
-dhcp_proxy_set_command_fn (vlib_main_t * vm,
-                           unformat_input_t * input,
-                           vlib_cli_command_t * cmd)
-{
-  ip4_address_t server_addr, src_addr;
-  u32 server_fib_id = 0, rx_fib_id = 0;
-  int is_del = 0;
-  int add_option_82 = 0;
-  int set_src = 0, set_server = 0;
-  
-  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT) 
-    {
-      if (unformat (input, "server %U", 
-                    unformat_ip4_address, &server_addr)) 
-        set_server = 1;
-      else if (unformat (input, "server-fib-id %d", &server_fib_id))
-        ;
-      else if (unformat (input, "rx-fib-id %d", &rx_fib_id))
-        ;
-      else if (unformat(input, "src-address %U", 
-			unformat_ip4_address, &src_addr))
-        set_src = 1;
-      else if (unformat (input, "add-option-82")
-               || unformat (input, "insert-option-82"))
-        add_option_82 = 1;
-      else if (unformat (input, "delete") ||
-               unformat (input, "del"))
-        is_del = 1;
-      else
-        break;
-    }
-
-  if (is_del || (set_server && set_src))
-    {
-      int rv;
-
-      rv = dhcp_proxy_set_server_2 (&server_addr, &src_addr, rx_fib_id, 
-                                    server_fib_id, add_option_82, is_del);
-      switch (rv)
-        {
-        case 0:
-          return 0;
-
-        case VNET_API_ERROR_INVALID_DST_ADDRESS:
-          return clib_error_return (0, "Invalid server address");
-          
-        case VNET_API_ERROR_INVALID_SRC_ADDRESS:
-          return clib_error_return (0, "Invalid src address");
-          
-        case VNET_API_ERROR_NO_SUCH_INNER_FIB:
-          return clib_error_return (0, "No such rx fib id %d", rx_fib_id);
-          
-        case VNET_API_ERROR_NO_SUCH_FIB:
-          return clib_error_return (0, "No such server fib id %d", 
-                                    server_fib_id);
-
-        case VNET_API_ERROR_NO_SUCH_ENTRY:
-          return clib_error_return 
-            (0, "Fib id %d: no per-fib DHCP server configured", rx_fib_id);
-
-        default:
-          return clib_error_return (0, "BUG: rv %d", rv);
-        }
-    }
-  else
-    return clib_error_return (0, "parse error`%U'",
-                              format_unformat_error, input);
-}
-
-VLIB_CLI_COMMAND (dhcp_proxy_set_command, static) = {
-  .path = "set dhcp proxy",
-  .short_help = "set dhcp proxy [del] server <ip-addr> src-address <ip-addr> [add-option-82] [server-fib-id <n>] [rx-fib-id <n>]",
-  .function = dhcp_proxy_set_command_fn,
-};
-
-u8 * format_dhcp_proxy_server (u8 * s, va_list * args)
-{
-  dhcp_proxy_main_t * dm = va_arg (*args, dhcp_proxy_main_t *);
-  dhcp_server_t * server = va_arg (*args, dhcp_server_t *);
-  u32 rx_fib_index = va_arg (*args, u32);
-  ip4_fib_t * rx_fib, * server_fib;
-  u32 server_fib_id = ~0, rx_fib_id = ~0;
-
-  if (dm == 0)
-    {
-      s = format (s, "%=16s%=16s%=14s%=14s%=20s", "Server", "Src Address", 
-                  "Server FIB", "RX FIB", "Insert Option 82");
-      return s;
-    }
-
-  server_fib = ip4_fib_get(server->server_fib_index);
-
-  if (server_fib)
-    server_fib_id = server_fib->table_id;
-
-  rx_fib = ip4_fib_get(rx_fib_index);
-
-  if (rx_fib)
-    rx_fib_id = rx_fib->table_id;
-
-  s = format (s, "%=16U%=16U%=14u%=14u%=20s",
-              format_ip4_address, &server->dhcp_server,
-              format_ip4_address, &server->dhcp_src_address,
-              server_fib_id, rx_fib_id,
-              server->insert_option_82 ? "yes" : "no");
-  return s;
-}
-
-static clib_error_t *
-dhcp_proxy_show_command_fn (vlib_main_t * vm,
-                            unformat_input_t * input,
-                            vlib_cli_command_t * cmd)
-{
-  dhcp_proxy_main_t * dpm = &dhcp_proxy_main;
-  ip4_main_t * im = &ip4_main;
-  dhcp_server_t * server;
-  u32 server_index;
-  int i;
-
-  vlib_cli_output (vm, "%U", format_dhcp_proxy_server, 0 /* header line */,
-                   0, 0);
-
-  for (i = 0; i < vec_len (im->fibs); i++)
-    {
-      if (i < vec_len(dpm->dhcp_server_index_by_rx_fib_index))
-        server_index = dpm->dhcp_server_index_by_rx_fib_index[i];
-      else
-        server_index = 0;
-      server = pool_elt_at_index (dpm->dhcp_servers, server_index);
-      if (server->valid)
-        vlib_cli_output (vm, "%U", format_dhcp_proxy_server, dpm, 
-                         server, i);
-    }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (dhcp_proxy_show_command, static) = {
-  .path = "show dhcp proxy",
-  .short_help = "Display dhcp proxy server info",
-  .function = dhcp_proxy_show_command_fn,
-};
-
-
-int dhcp_proxy_set_option82_vss(  u32 vrf_id,
-                                  u32 oui,
-                                  u32 fib_id, 
-                                  int is_del)
-{
-  dhcp_proxy_main_t *dm = &dhcp_proxy_main;
-  uword *p;
-  vss_info *a;
-  u32 old_oui=0, old_fib_id=0;
-  
-  p = hash_get (dm->opt82vss_index_by_vrf_id, vrf_id);
-
-  if (p) 
-    {
-      a = pool_elt_at_index (dm->opt82vss, p[0]);
-      if (!a) 
-        return VNET_API_ERROR_NO_SUCH_FIB;
-      old_oui = a->vpn_id.oui;
-      old_fib_id = a->vpn_id.fib_id;
-          
-      if (is_del)
-        {
-          if (old_oui == oui &&
-              old_fib_id == fib_id)
-            {
-              pool_put(dm->opt82vss, a);
-              hash_unset (dm->opt82vss_index_by_vrf_id, vrf_id);
-              return 0;
-            }
-          else
-            return VNET_API_ERROR_NO_SUCH_ENTRY;
-        }
-      pool_put(dm->opt82vss, a);
-      hash_unset (dm->opt82vss_index_by_vrf_id, vrf_id);
-  } else if (is_del)
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-  pool_get (dm->opt82vss, a);
-  memset (a, ~0, sizeof (a[0]));
-  a->vpn_id.oui = oui;
-  a->vpn_id.fib_id = fib_id;
-  hash_set (dm->opt82vss_index_by_vrf_id, vrf_id, a - dm->opt82vss);
-  
-  return 0;
-}
-
-static clib_error_t *
-dhcp_option_82_vss_fn (vlib_main_t * vm,
-                        unformat_input_t * input,
-                        vlib_cli_command_t * cmd)
-{
-  int is_del = 0, got_new_vpn_id=0;
-  u32 oui=0, fib_id=0, tbl_id=~0;
- 
-
-  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT) 
-    {
-
-      if (unformat(input, "delete") || unformat(input, "del"))
-          is_del = 1;    
-      else if (unformat (input, "oui %d", &oui))
-          got_new_vpn_id = 1;
-      else if (unformat (input, "vpn-id %d", &fib_id))
-          got_new_vpn_id = 1;
-      else if (unformat (input, "table %d", &tbl_id))
-          got_new_vpn_id = 1;
-      else
-          break;
-  }
-  if (tbl_id == ~0)
-      return clib_error_return (0, "no table ID specified.");
-  
-  if (is_del || got_new_vpn_id)
-    {
-      int rv;
-      rv = dhcp_proxy_set_option82_vss(tbl_id, oui, fib_id, is_del);
-      switch (rv)
-        {
-        case 0:
-            return 0;
-            
-        case VNET_API_ERROR_NO_SUCH_FIB:
-            return clib_error_return (0, "option 82 vss(oui:%d, vpn-id:%d) not found in table %d",
-                                      oui, fib_id, tbl_id);
-            
-        case VNET_API_ERROR_NO_SUCH_ENTRY:
-            return clib_error_return (0, "option 82 vss for table %d not found in in pool.",
-                                      tbl_id);
-        default:
-          return clib_error_return (0, "BUG: rv %d", rv);
-        }
-    }
-  else
-      return clib_error_return (0, "parse error`%U'",
-                                format_unformat_error, input);
-}
-
-VLIB_CLI_COMMAND (dhcp_proxy_vss_command,static) = {
-  .path = "set dhcp option-82 vss",
-  .short_help = "set dhcp option-82 vss [del] table <table id> oui <oui> vpn-id <vpn-id>",
-  .function = dhcp_option_82_vss_fn,
-};
-
-
-static clib_error_t *
-dhcp_vss_show_command_fn (vlib_main_t * vm,
-                          unformat_input_t * input,
-                          vlib_cli_command_t * cmd)
-  
-{
-  dhcp_proxy_main_t * dm = &dhcp_proxy_main;
-  vss_info *v;
-  u32 oui;
-  u32 fib_id;
-  u32 tbl_id;
-  uword index;
-  
-  vlib_cli_output (vm, "%=9s%=11s%=12s","Table", "OUI", "VPN-ID");
-  hash_foreach (tbl_id, index, dm->opt82vss_index_by_vrf_id,
-  ({
-     v = pool_elt_at_index (dm->opt82vss, index);
-     oui = v->vpn_id.oui;
-     fib_id = v->vpn_id.fib_id;
-     vlib_cli_output (vm, "%=9d 0x%08x%=12d",
-                      tbl_id, oui, fib_id);
-  }));
-  
-  return 0;
-}
-
-VLIB_CLI_COMMAND (dhcp_proxy_vss_show_command, static) = {
-  .path = "show dhcp vss",
-  .short_help = "show dhcp VSS",
-  .function = dhcp_vss_show_command_fn,
-};
-
-static clib_error_t *
-dhcp_option_82_address_show_command_fn (vlib_main_t * vm,
-                                unformat_input_t * input,
-                                vlib_cli_command_t * cmd)
-  
-{
-  dhcp_proxy_main_t *dm = &dhcp_proxy_main;
-  vnet_main_t *vnm = vnet_get_main();                                     
-  u32 sw_if_index0=0, sw_if_index;
-  ip4_address_t *ia0;
-  vnet_sw_interface_t *swif;
-  
-  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT) 
-    {
-      
-      if (unformat(input, "%U",
-                   unformat_vnet_sw_interface, dm->vnet_main, &sw_if_index0))
-        {
-          swif = vnet_get_sw_interface (vnm, sw_if_index0);
-          sw_if_index = (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED) ?
-            swif->unnumbered_sw_if_index : sw_if_index0;
-          ia0 = ip4_interface_first_address(&ip4_main, sw_if_index, 0);
-          if (ia0)
-            {
-              vlib_cli_output (vm, "%=20s%=20s", "interface", 
-                               "source IP address");
-              
-              vlib_cli_output (vm, "%=20U%=20U",
-                               format_vnet_sw_if_index_name, 
-                               dm->vnet_main, sw_if_index0,
-                               format_ip4_address, ia0);
-            }
-          else
-            vlib_cli_output (vm, "%=34s %=20U", 
-                             "No IPv4 address configured on",
-                             format_vnet_sw_if_index_name, 
-                             dm->vnet_main, sw_if_index);
-        }
-      else
-        break;
-    }
-  
-  return 0;
-}
-
-VLIB_CLI_COMMAND (dhcp_proxy_address_show_command,static) = {
-  .path = "show dhcp option-82-address interface",
-  .short_help = "show dhcp option-82-address interface <interface>",
-  .function = dhcp_option_82_address_show_command_fn,
-};
diff --git a/vnet/vnet/dhcpv6/packet.h b/vnet/vnet/dhcpv6/packet.h
deleted file mode 100644
index 8634b5d8..00000000
--- a/vnet/vnet/dhcpv6/packet.h
+++ /dev/null
@@ -1,183 +0,0 @@
-#ifndef included_vnet_dhcp_packet_h
-#define included_vnet_dhcp_packet_h
-
-/*
- * DHCP packet format
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/ip/ip6_packet.h>
-
-// #define DHCP_VRF_NAME_MAX_LEN L3VM_MAX_NAME_STR_LEN
-// #define DHCPV6_MAX_VRF_NAME_LEN L3VM_MAX_NAME_STR_LEN
-#define DHCP_MAX_RELAY_ADDR    16
-#define PROTO_UDP 17
-#define DHCPV6_CLIENT_PORT 546
-#define DHCPV6_SERVER_PORT 547
-#define HOP_COUNT_LIMIT  32
-#define DHCPV6_CISCO_ENT_NUM 9
-
-/*
- * DHCPv6 message types
- */
-typedef enum dhcpv6_msg_type_{
-    DHCPV6_MSG_SOLICIT              = 1,
-    DHCPV6_MSG_ADVERTISE            = 2,
-    DHCPV6_MSG_REQUEST              = 3,
-    DHCPV6_MSG_CONFIRM              = 4,
-    DHCPV6_MSG_RENEW                = 5,
-    DHCPV6_MSG_REBIND               = 6,
-    DHCPV6_MSG_REPLY                = 7,
-    DHCPV6_MSG_RELEASE              = 8,
-    DHCPV6_MSG_DECLINE              = 9,
-    DHCPV6_MSG_RECONFIGURE          = 10,
-    DHCPV6_MSG_INFORMATION_REQUEST  = 11,
-    DHCPV6_MSG_RELAY_FORW           = 12,
-    DHCPV6_MSG_RELAY_REPL           = 13,
-} dhcpv6_msg_type_t;
-
-/*
- * DHCPv6 options types
- */
-enum {
-    DHCPV6_OPTION_CLIENTID      = 1,
-    DHCPV6_OPTION_SERVERID      = 2,
-    DHCPV6_OPTION_IA_NA         = 3,
-    DHCPV6_OPTION_IA_TA         = 4,
-    DHCPV6_OPTION_IAADDR        = 5,
-    DHCPV6_OPTION_ORO           = 6,
-    DHCPV6_OPTION_PREFERENCE    = 7,
-    DHCPV6_OPTION_ELAPSED_TIME  = 8,
-    DHCPV6_OPTION_RELAY_MSG     = 9,
-    DHCPV6_OPTION_AUTH          = 11,
-    DHCPV6_OPTION_UNICAST       = 12,
-    DHCPV6_OPTION_STATUS_CODE   = 13,
-    DHCPV6_OPTION_RAPID_COMMIT  = 14,
-    DHCPV6_OPTION_USER_CLASS    = 15,
-    DHCPV6_OPTION_VENDOR_CLASS  = 16,
-    DHCPV6_OPTION_VENDOR_OPTS   = 17,
-    DHCPV6_OPTION_INTERFACE_ID  = 18, // relay agent fills this
-    DHCPV6_OPTION_RECONF_MSG    = 19,
-    DHCPV6_OPTION_RECONF_ACCEPT = 20,
-    DHCPV6_OPTION_REMOTEID      = 37, // relay agent fills this
-    DHCPV6_OPTION_VSS      = 68, // relay agent fills this
-    DHCPV6_OPTION_CLIENT_LINK_LAYER_ADDRESS = 79, 
-    DHCPV6_OPTION_MAX
-};
-
-/*
-* DHCPv6 status codes
- */
-enum {
-    DHCPV6_STATUS_SUCCESS       = 0,
-    DHCPV6_STATUS_UNSPEC_FAIL   = 1,
-    DHCPV6_STATUS_NOADDRS_AVAIL = 2,
-    DHCPV6_STATUS_NO_BINDING    = 3,
-    DHCPV6_STATUS_NOT_ONLINK    = 4,
-    DHCPV6_STATUS_USE_MULTICAST = 5,
-};
-
-/*
- * DHCPv6 DUID types
- */
-enum {
-    DHCPV6_DUID_LLT =   1,  /* DUID Based on Link-layer Address Plus Time */
-    DHCPV6_DUID_EN =    2,  /* DUID Based on Enterprise Number */
-    DHCPV6_DUID_LL =    3,  /* DUID Based on Link-layer Address */
-};
-
-//Structure for DHCPv6 payload from client
-typedef struct dhcpv6_hdr_ {
-    union {
-        u8 msg_type; //DHCP msg type
-        u32 xid;     // transaction id
-    }u;
-    u8  data[0];
-} dhcpv6_header_t;
-
-
-
-typedef CLIB_PACKED (struct dhcpv6_relay_ctx_ {
-    dhcpv6_header_t *pkt;
-    u32  pkt_len;
-    u32  dhcpv6_len; //DHCPv6 payload load
-//    if_ordinal iod;
-    u32 if_index;
-    u32 ctx_id;
-    char ctx_name[32+1];
-    u8 dhcp_msg_type;
-}) dhcpv6_relay_ctx_t;
-
-//Structure for DHCPv6 RELAY-FORWARD and DHCPv6 RELAY-REPLY pkts
-typedef CLIB_PACKED (struct dhcpv6_relay_hdr_ {
-    u8           msg_type;
-    u8           hop_count;
-    ip6_address_t    link_addr;
-    ip6_address_t    peer_addr;
-    u8           data[0];
-}) dhcpv6_relay_hdr_t;
-
-typedef enum dhcp_stats_action_type_ {
-    DHCP_STATS_ACTION_FORWARDED=1,
-    DHCP_STATS_ACTION_RECEIVED,
-    DHCP_STATS_ACTION_DROPPED
-} dhcp_stats_action_type_t;
-//Generic counters for a packet
-typedef  struct dhcp_stats_counters_ {
-    u64  rx_pkts; //counter for received pkts
-    u64  tx_pkts; //counter for forwarded pkts
-    u64  drops;   //counter for dropped pkts
-} dhcp_stats_counters_t;
-
-
-typedef enum dhcpv6_stats_drop_reason_ {
-    DHCPV6_RELAY_PKT_DROP_RELAYDISABLE = 1,
-    DHCPV6_RELAY_PKT_DROP_MAX_HOPS,
-    DHCPV6_RELAY_PKT_DROP_VALIDATION_FAIL,
-    DHCPV6_RELAY_PKT_DROP_UNKNOWN_OP_INTF,
-    DHCPV6_RELAY_PKT_DROP_BAD_CONTEXT,
-    DHCPV6_RELAY_PKT_DROP_OPT_INSERT_FAIL,
-    DHCPV6_RELAY_PKT_DROP_REPLY_FROM_CLIENT,
-} dhcpv6_stats_drop_reason_t;
-
-typedef CLIB_PACKED (struct {
-  u16 option;
-  u16 length;
-  u8 data[0];
-}) dhcpv6_option_t;
-
-typedef CLIB_PACKED (struct {
-  dhcpv6_option_t opt;
-  u32 int_idx;
-}) dhcpv6_int_id_t;
-
-typedef CLIB_PACKED (struct {
-  dhcpv6_option_t opt;
-  u8 data[8];  // data[0]:type, data[1..7]: VPN ID
-}) dhcpv6_vss_t;
-
-typedef CLIB_PACKED (struct {
-  dhcpv6_option_t opt;
-  u32 ent_num;
-  u32 rmt_id;
-}) dhcpv6_rmt_id_t;
-
-typedef CLIB_PACKED (struct {
-  dhcpv6_option_t opt;
-  u16 link_type;
-  u8 data[6];  // data[0]:data[5]: MAC address
-}) dhcpv6_client_mac_t;
-
-
-#endif /* included_vnet_dhcp_packet_h */
diff --git a/vnet/vnet/dhcpv6/proxy.h b/vnet/vnet/dhcpv6/proxy.h
deleted file mode 100644
index 9e18913a..00000000
--- a/vnet/vnet/dhcpv6/proxy.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * proxy.h: dhcp proxy 
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_dhcpv6_proxy_h
-#define included_dhcpv6_proxy_h
-
-#include <vnet/vnet.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ip/ip4.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ip/format.h>
-#include <vnet/ip/udp.h>
-#include <vnet/dhcpv6/packet.h>
-
-typedef enum {
-#define dhcpv6_proxy_error(n,s) DHCPV6_PROXY_ERROR_##n,
-#include <vnet/dhcpv6/proxy_error.def>
-#undef dhcpv6_proxy_error
-  DHCPV6_PROXY_N_ERROR,
-} dhcpv6_proxy_error_t;
-
-typedef struct {
-  u32 oui;
-  u32 fib_id;
-} dhcpv6_vss_id;
-
-typedef union {
-  u8 as_u8[8];
-  dhcpv6_vss_id vpn_id;
-} dhcpv6_vss_info;
-
-typedef struct {
-  ip6_address_t dhcp6_server;
-  ip6_address_t dhcp6_src_address;
-  u32 insert_vss;
-  u32 server_fib6_index;
-  u32 valid;
-} dhcpv6_server_t;
-
-typedef struct {
-  /* Pool of DHCP servers */
-  dhcpv6_server_t * dhcp6_servers;
-
-  /* Pool of selected DHCP server. Zero is the default server */
-   u32 * dhcp6_server_index_by_rx_fib_index;
-
-  /* all DHCP servers address */
-  ip6_address_t all_dhcpv6_server_address;
-  ip6_address_t all_dhcpv6_server_relay_agent_address;
-
-  /* to drop pkts in server-to-client direction */
-  u32 error_drop_node_index;
-
-  dhcpv6_vss_info *vss;
-
-  /* hash lookup specific vrf_id -> VSS vector index*/
-  uword  *vss_index_by_vrf_id;
-   
-  /* convenience */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-} dhcpv6_proxy_main_t;
-
-dhcpv6_proxy_main_t dhcpv6_proxy_main;
-
-int dhcpv6_proxy_set_server (ip6_address_t *addr, ip6_address_t *src_address,
-                             u32 fib_id, int insert_vss, int is_del);
-
-int dhcpv6_proxy_set_vss(u32 tbl_id,
-                         u32 oui,
-                         u32 fib_id, 
-                         int is_del);
-
-int dhcpv6_proxy_set_server_2 (ip6_address_t *addr, ip6_address_t *src_address,
-                             u32 rx_fib_id,
-                             u32 server_fib_id,
-                             int insert_vss, int is_del);
-
-#endif /* included_dhcpv6_proxy_h */
diff --git a/vnet/vnet/dhcpv6/proxy_error.def b/vnet/vnet/dhcpv6/proxy_error.def
deleted file mode 100644
index 55fa7317..00000000
--- a/vnet/vnet/dhcpv6/proxy_error.def
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * dhcp_proxy_error.def: dhcp proxy errors
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-dhcpv6_proxy_error (NONE, "no error")
-dhcpv6_proxy_error (NO_SERVER, "no dhcpv6 server configured")
-dhcpv6_proxy_error (RELAY_TO_SERVER, "DHCPV6 packets relayed to the server")
-dhcpv6_proxy_error (RELAY_TO_CLIENT, "DHCPV6 packets relayed to clients")
-dhcpv6_proxy_error (NO_INTERFACE_ADDRESS, "DHCPV6 no interface address")
-dhcpv6_proxy_error (WRONG_MESSAGE_TYPE, "DHCPV6 wrong message type.")
-dhcpv6_proxy_error (NO_SRC_ADDRESS, "DHCPV6 no srouce IPv6 address configured.")
-dhcpv6_proxy_error (NO_CIRCUIT_ID_OPTION, "DHCPv6 reply packets without circuit ID option")
-dhcpv6_proxy_error (NO_RELAY_MESSAGE_OPTION, "DHCPv6 reply packets without relay message option")
-dhcpv6_proxy_error (BAD_SVR_FIB_OR_ADDRESS, "DHCPv6 packets not from DHCPv6 server or server FIB.")
-dhcpv6_proxy_error (PKT_TOO_BIG, "DHCPv6 packets which are too big.")
-dhcpv6_proxy_error (WRONG_INTERFACE_ID_OPTION, "DHCPv6 reply to invalid interface.")
diff --git a/vnet/vnet/dhcpv6/proxy_node.c b/vnet/vnet/dhcpv6/proxy_node.c
deleted file mode 100644
index 40df35cd..00000000
--- a/vnet/vnet/dhcpv6/proxy_node.c
+++ /dev/null
@@ -1,1191 +0,0 @@
-/*
- * proxy_node.c: dhcpv6 proxy node processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/dhcpv6/proxy.h>
-#include <vnet/fib/ip6_fib.h>
-
-static char * dhcpv6_proxy_error_strings[] = {
-#define dhcpv6_proxy_error(n,s) s,
-#include "proxy_error.def"
-#undef dhcpv6_proxy_error
-};
-
-#define foreach_dhcpv6_proxy_to_server_input_next \
-  _ (DROP, "error-drop")			\
-  _ (LOOKUP, "ip6-lookup")                      \
-  _ (SEND_TO_CLIENT, "dhcpv6-proxy-to-client")
-
-
-typedef enum {
-#define _(s,n) DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_##s,
-  foreach_dhcpv6_proxy_to_server_input_next
-#undef _
-  DHCPV6_PROXY_TO_SERVER_INPUT_N_NEXT,
-} dhcpv6_proxy_to_server_input_next_t;
-
-typedef struct {
-  /* 0 => to server, 1 => to client */
-  int which;
-  u8 packet_data[64];
-  u32 error;
-  u32 sw_if_index;
-  u32 original_sw_if_index;
-} dhcpv6_proxy_trace_t;
-
-vlib_node_registration_t dhcpv6_proxy_to_server_node;
-vlib_node_registration_t dhcpv6_proxy_to_client_node;
-
-
-u8 * format_dhcpv6_proxy_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  dhcpv6_proxy_trace_t * t = va_arg (*args, dhcpv6_proxy_trace_t *);
-
-  if (t->which == 0)
-    s = format (s, "DHCPV6 proxy: sent to server %U",
-                format_ip6_address, &t->packet_data, sizeof (ip6_address_t));
-  else
-    s = format (s, "DHCPV6 proxy: sent to client from %U",
-                format_ip6_address, &t->packet_data, sizeof (ip6_address_t));
-  if (t->error != (u32)~0)
-    s = format (s, " error: %s\n", dhcpv6_proxy_error_strings[t->error]);
-
-  s = format (s, "  original_sw_if_index: %d, sw_if_index: %d\n",
-              t->original_sw_if_index, t->sw_if_index);
-
-  return s;
-}
-
-u8 * format_dhcpv6_proxy_header_with_length (u8 * s, va_list * args)
-{
-  dhcpv6_header_t * h = va_arg (*args, dhcpv6_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-  u32 header_bytes;
-
-  header_bytes = sizeof (h[0]);
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    return format (s, "dhcpv6 header truncated");
-
-  s = format (s, "DHCPV6 Proxy");
-
-  return s;
-}
-/* get first interface address */
-static ip6_address_t *
-ip6_interface_first_global_or_site_address (ip6_main_t * im, u32 sw_if_index)
-{
-  ip_lookup_main_t * lm = &im->lookup_main;
-  ip_interface_address_t * ia = 0;
-  ip6_address_t * result = 0;
-
-  foreach_ip_interface_address (lm, ia, sw_if_index,
-                                1 /* honor unnumbered */,
-  ({
-    ip6_address_t * a = ip_interface_address_get_address (lm, ia);
-    if ((a->as_u8[0] & 0xe0) == 0x20 ||
-        (a->as_u8[0] & 0xfe) == 0xfc)  {
-        result = a;
-        break;
-    }
-  }));
-  return result;
-}
-
-/* get first interface address */
-static ip6_address_t *
-ip6_interface_first_address (ip6_main_t * im, u32 sw_if_index)
-{
-  ip_lookup_main_t * lm = &im->lookup_main;
-  ip_interface_address_t * ia = 0;
-  ip6_address_t * result = 0;
-
-  foreach_ip_interface_address (lm, ia, sw_if_index,
-                                1 /* honor unnumbered */,
-  ({
-    ip6_address_t * a = ip_interface_address_get_address (lm, ia);
-    result = a;
-    break;
-  }));
-  return result;
-}
-
-static inline void copy_ip6_address (ip6_address_t *dst, ip6_address_t *src) 
-{
-
-  dst->as_u64[0] = src->as_u64[0];
-  dst->as_u64[1] = src->as_u64[1];
-} 
-
-static uword
-dhcpv6_proxy_to_server_input (vlib_main_t * vm,
-                            vlib_node_runtime_t * node,
-                            vlib_frame_t * from_frame)
-{
-  u32 n_left_from, next_index, * from, * to_next;
-  dhcpv6_proxy_main_t * dpm = &dhcpv6_proxy_main;
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-  u32 pkts_to_server=0, pkts_to_client=0, pkts_no_server=0;
-  u32 pkts_no_interface_address=0, pkts_no_exceeding_max_hop=0;
-  u32 pkts_no_src_address=0;
-  u32 pkts_wrong_msg_type=0;
-  u32 pkts_too_big=0;
-  ip6_main_t * im = &ip6_main;
-  ip6_fib_t * fib;
-  ip6_address_t * src;
-  int bogus_length;
-  dhcpv6_server_t * server;
-  u32  rx_fib_idx = 0, server_fib_idx = 0;
-  u32 server_idx;
-  u32 fib_id1 = 0;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-          vnet_main_t *vnm = vnet_get_main();
-          u32 sw_if_index = 0;
-          u32 rx_sw_if_index = 0;
-          vnet_sw_interface_t *swif;
- 	  u32 bi0;
-	  vlib_buffer_t * b0;
-          udp_header_t * u0, *u1;
-	  dhcpv6_header_t * h0;  // client msg hdr
-          ip6_header_t * ip0, *ip1;
-          ip6_address_t _ia0, *ia0=&_ia0;
-	  u32 next0;
-          u32 error0 = (u32) ~0;
-          dhcpv6_option_t *fwd_opt;
-          dhcpv6_relay_hdr_t *r1;
-          u16 len;
-          dhcpv6_int_id_t *id1;
-          dhcpv6_vss_t *vss1;
-          dhcpv6_client_mac_t *cmac; // client mac
-          ethernet_header_t * e_h0;
-          u8 client_src_mac[6];
-          vlib_buffer_free_list_t *fl;
-
-          uword *p_vss;
-          u32  oui1=0;
-          dhcpv6_vss_info *vss;
-
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-          h0 = vlib_buffer_get_current (b0);
-
-          /*
-           * udp_local hands us the DHCPV6 header.
-           */
-          u0 = (void *)h0 -(sizeof(*u0));
-          ip0 = (void *)u0 -(sizeof(*ip0));
-          e_h0 = (void *)ip0 - ethernet_buffer_header_size(b0);
-
-          clib_memcpy(client_src_mac, e_h0->src_address, 6);
-
-          switch (h0->u.msg_type) {
-            case DHCPV6_MSG_SOLICIT:
-            case DHCPV6_MSG_REQUEST:
-            case DHCPV6_MSG_CONFIRM:
-            case DHCPV6_MSG_RENEW:
-            case DHCPV6_MSG_REBIND:
-            case DHCPV6_MSG_RELEASE:
-            case DHCPV6_MSG_DECLINE:
-            case DHCPV6_MSG_INFORMATION_REQUEST:
-            case DHCPV6_MSG_RELAY_FORW:
-                /* send to server */
-                break;
-            case DHCPV6_MSG_RELAY_REPL:
-                /* send to client */
-                next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_SEND_TO_CLIENT;
-                error0 = 0;
-                pkts_to_client++;
-                goto do_enqueue;
-            default:
-                /* drop the packet */
-                pkts_wrong_msg_type++;
-                error0 = DHCPV6_PROXY_ERROR_WRONG_MESSAGE_TYPE;
-                next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP;
-                goto do_trace;
-
-          }
-
-          /* Send to DHCPV6 server via the configured FIB */
-          rx_sw_if_index = sw_if_index =  vnet_buffer(b0)->sw_if_index[VLIB_RX];
-          rx_fib_idx = im->fib_index_by_sw_if_index [rx_sw_if_index];
-          server_idx = dpm->dhcp6_server_index_by_rx_fib_index[rx_fib_idx];
-
-          if (PREDICT_FALSE (pool_is_free_index (dpm->dhcp6_servers,
-                                                          server_idx)))
-                     {
-                     no_server:
-                       error0 = DHCPV6_PROXY_ERROR_NO_SERVER;
-                       next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP;
-                       pkts_no_server++;
-                       goto do_trace;
-                     }
-
-          server = pool_elt_at_index(dpm->dhcp6_servers, server_idx);
-          if (server->valid == 0)
-            goto no_server;
-
-          server_fib_idx = server->server_fib6_index;
-          vnet_buffer(b0)->sw_if_index[VLIB_TX] = server_fib_idx;
-
-
-          /* relay-option header pointer */
-          vlib_buffer_advance(b0, -(sizeof(*fwd_opt)));
-          fwd_opt = vlib_buffer_get_current(b0);
-          /* relay message header pointer */
-          vlib_buffer_advance(b0, -(sizeof(*r1)));
-          r1 = vlib_buffer_get_current(b0);
-
-          vlib_buffer_advance(b0, -(sizeof(*u1)));
-          u1 = vlib_buffer_get_current(b0);
-
-          vlib_buffer_advance(b0, -(sizeof(*ip1)));
-          ip1 = vlib_buffer_get_current(b0);
-
-          /* fill in all that rubbish... */
-          len = clib_net_to_host_u16(u0->length) - sizeof(udp_header_t);
-          copy_ip6_address(&r1->peer_addr, &ip0->src_address);
-
-          r1->msg_type = DHCPV6_MSG_RELAY_FORW;
-          fwd_opt->length = clib_host_to_net_u16(len);
-          fwd_opt->option = clib_host_to_net_u16(DHCPV6_OPTION_RELAY_MSG);
-
-          r1->hop_count++;
-          r1->hop_count = (h0->u.msg_type != DHCPV6_MSG_RELAY_FORW) ? 0 : r1->hop_count;
-
-          if (PREDICT_FALSE(r1->hop_count >= HOP_COUNT_LIMIT))
-            {
-              error0 =  DHCPV6_RELAY_PKT_DROP_MAX_HOPS;
-              next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP;
-              pkts_no_exceeding_max_hop++;
-              goto do_trace;
-            }
-
-
-          /* If relay-fwd and src address is site or global unicast address  */
-          if (h0->u.msg_type == DHCPV6_MSG_RELAY_FORW &&
-              ((ip0->src_address.as_u8[0] & 0xe0) == 0x20 ||
-               (ip0->src_address.as_u8[0] & 0xfe) == 0xfc))
-            {
-              /* Set link address to zero */
-              r1->link_addr.as_u64[0] = 0;
-              r1->link_addr.as_u64[1] = 0;
-              goto link_address_set;
-            }
-
-          /* if receiving interface is unnumbered, use receiving interface
-           * IP address as link address, otherwise use the loopback interface
-           * IP address as link address.
-           */
-
-          swif = vnet_get_sw_interface (vnm, rx_sw_if_index);
-          if (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
-              sw_if_index = swif->unnumbered_sw_if_index;
-
-          ia0 = ip6_interface_first_global_or_site_address(&ip6_main, sw_if_index);
-          if (ia0 == 0)
-            {
-              error0 = DHCPV6_PROXY_ERROR_NO_INTERFACE_ADDRESS;
-              next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP;
-              pkts_no_interface_address++;
-              goto do_trace;
-            }
-
-          copy_ip6_address(&r1->link_addr, ia0);
-
-        link_address_set:
-          fl = vlib_buffer_get_free_list (vm, b0->free_list_index);
-
-          if ((b0->current_length+sizeof(*id1)+sizeof(*vss1)+sizeof(*cmac))
-              > fl->n_data_bytes)
-            {
-              error0 = DHCPV6_PROXY_ERROR_PKT_TOO_BIG;
-              next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP;
-              pkts_too_big++;
-              goto do_trace;
-            }
-
-          id1 = (dhcpv6_int_id_t *) (((uword) ip1) + b0->current_length);
-          b0->current_length += (sizeof (*id1));
-
-
-          fib = ip6_fib_get (rx_fib_idx);
-
-          //TODO: Revisit if hash makes sense here
-          p_vss = hash_get (dpm->vss_index_by_vrf_id,
-                            fib->table_id);
-          if (p_vss)
-            {
-              vss = pool_elt_at_index (dpm->vss, p_vss[0]);
-              oui1 =  vss->vpn_id.oui;
-              fib_id1 =  vss->vpn_id.fib_id;
-            }
-
-          id1->opt.option = clib_host_to_net_u16(DHCPV6_OPTION_INTERFACE_ID);
-          id1->opt.length = clib_host_to_net_u16(sizeof(rx_sw_if_index));
-          id1->int_idx = clib_host_to_net_u32(rx_sw_if_index);
-
-          u1->length =0;
-          if (h0->u.msg_type != DHCPV6_MSG_RELAY_FORW)
-            {
-               cmac = (dhcpv6_client_mac_t *) (((uword) ip1) + b0->current_length);
-               b0->current_length += (sizeof (*cmac));
-               cmac->opt.length =clib_host_to_net_u16(sizeof(*cmac) -
-                                                      sizeof(cmac->opt));
-               cmac->opt.option = clib_host_to_net_u16(DHCPV6_OPTION_CLIENT_LINK_LAYER_ADDRESS);
-               cmac->link_type = clib_host_to_net_u16(1); // ethernet
-               clib_memcpy(cmac->data, client_src_mac, 6);
-               u1->length += sizeof(*cmac);
-            }
-          if (server->insert_vss !=0 ) {
-              vss1 = (dhcpv6_vss_t *) (((uword) ip1) + b0->current_length);
-              b0->current_length += (sizeof (*vss1));
-              vss1->opt.length =clib_host_to_net_u16(sizeof(*vss1) -
-						     sizeof(vss1->opt));
-              vss1->opt.option = clib_host_to_net_u16(DHCPV6_OPTION_VSS);
-              vss1->data[0] = 1;   // type
-              vss1->data[1] = oui1>>16 & 0xff;
-              vss1->data[2] = oui1>>8  & 0xff;
-              vss1->data[3] = oui1 & 0xff;
-              vss1->data[4] = fib_id1>>24 & 0xff;
-              vss1->data[5] = fib_id1>>16 & 0xff;
-              vss1->data[6] = fib_id1>>8 & 0xff;
-              vss1->data[7] = fib_id1 & 0xff;
-              u1->length += sizeof(*vss1);
-          }
-
-          pkts_to_server++;
-          u1->checksum = 0;
-          u1->src_port = clib_host_to_net_u16(UDP_DST_PORT_dhcpv6_to_client);
-          u1->dst_port = clib_host_to_net_u16(UDP_DST_PORT_dhcpv6_to_server);
-
-          u1->length =
-              clib_host_to_net_u16( clib_net_to_host_u16(fwd_opt->length) +
-                                    sizeof(*r1) + sizeof(*fwd_opt) +
-                                    sizeof(*u1) + sizeof(*id1) + u1->length);
-
-          memset(ip1, 0, sizeof(*ip1));
-          ip1->ip_version_traffic_class_and_flow_label = 0x60;
-          ip1->payload_length =  u1->length;
-          ip1->protocol = PROTO_UDP;
-          ip1->hop_limit = HOP_COUNT_LIMIT;
-	      src = (server->dhcp6_server.as_u64[0] || server->dhcp6_server.as_u64[1]) ?
-	        &server->dhcp6_server : &dpm->all_dhcpv6_server_address;
-          copy_ip6_address(&ip1->dst_address, src);
-
-
-          ia0 = ip6_interface_first_global_or_site_address
-              (&ip6_main, vnet_buffer(b0)->sw_if_index[VLIB_RX]);
-
-	      src = (server->dhcp6_src_address.as_u64[0] || server->dhcp6_src_address.as_u64[1]) ?
-	        &server->dhcp6_src_address : ia0;
-          if (ia0 == 0)
-            {
-              error0 = DHCPV6_PROXY_ERROR_NO_SRC_ADDRESS;
-              next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP;
-              pkts_no_src_address++;
-              goto do_trace;
-            }
-
-	  copy_ip6_address (&ip1->src_address, src);
-
-
-          u1->checksum = ip6_tcp_udp_icmp_compute_checksum(vm, b0, ip1,
-                                                           &bogus_length);
-          ASSERT(bogus_length == 0);
-
-          next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_LOOKUP;
-
-        do_trace:
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-            {
-               dhcpv6_proxy_trace_t *tr = vlib_add_trace (vm, node,
-                                                          b0, sizeof (*tr));
-               tr->which = 0; /* to server */
-               tr->error = error0;
-               tr->original_sw_if_index = rx_sw_if_index;
-               tr->sw_if_index = sw_if_index;
-               if (DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_LOOKUP == next0)
-                 copy_ip6_address((ip6_address_t *)&tr->packet_data[0], &server->dhcp6_server);
-            }
-
-        do_enqueue:
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, dhcpv6_proxy_to_server_node.index,
-                               DHCPV6_PROXY_ERROR_RELAY_TO_CLIENT,
-                               pkts_to_client);
-  vlib_node_increment_counter (vm, dhcpv6_proxy_to_server_node.index,
-                               DHCPV6_PROXY_ERROR_RELAY_TO_SERVER,
-                               pkts_to_server);
-  vlib_node_increment_counter (vm, dhcpv6_proxy_to_server_node.index,
-                               DHCPV6_PROXY_ERROR_NO_INTERFACE_ADDRESS,
-                               pkts_no_interface_address);
-  vlib_node_increment_counter (vm, dhcpv6_proxy_to_server_node.index,
-                               DHCPV6_PROXY_ERROR_WRONG_MESSAGE_TYPE,
-                               pkts_wrong_msg_type);
-  vlib_node_increment_counter (vm, dhcpv6_proxy_to_server_node.index,
-                               DHCPV6_PROXY_ERROR_NO_SRC_ADDRESS,
-                               pkts_no_src_address);
-  vlib_node_increment_counter (vm, dhcpv6_proxy_to_server_node.index,
-                               DHCPV6_PROXY_ERROR_PKT_TOO_BIG,
-                               pkts_too_big);
-  return from_frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (dhcpv6_proxy_to_server_node) = {
-  .function = dhcpv6_proxy_to_server_input,
-  .name = "dhcpv6-proxy-to-server",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .n_errors = DHCPV6_PROXY_N_ERROR,
-  .error_strings = dhcpv6_proxy_error_strings,
-
-  .n_next_nodes = DHCPV6_PROXY_TO_SERVER_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_##s] = n,
-    foreach_dhcpv6_proxy_to_server_input_next
-#undef _
-  },
-
-  .format_buffer = format_dhcpv6_proxy_header_with_length,
-  .format_trace = format_dhcpv6_proxy_trace,
-#if 0
-  .unformat_buffer = unformat_dhcpv6_proxy_header,
-#endif
-};
-
-static uword
-dhcpv6_proxy_to_client_input (vlib_main_t * vm,
-                            vlib_node_runtime_t * node,
-                            vlib_frame_t * from_frame)
-{
-
-  u32 n_left_from, * from;
-  ethernet_main_t *em = ethernet_get_main (vm);
-  dhcpv6_proxy_main_t * dm = &dhcpv6_proxy_main;
-  dhcpv6_server_t * server;
-  vnet_main_t * vnm = vnet_get_main();
-  int bogus_length;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t * b0;
-      udp_header_t * u0, *u1=0;
-      dhcpv6_relay_hdr_t * h0;
-      ip6_header_t * ip1 = 0, *ip0;
-      ip6_address_t _ia0, * ia0 = &_ia0;
-      ip6_address_t client_address;
-      ethernet_interface_t *ei0;
-      ethernet_header_t *mac0;
-      vnet_hw_interface_t *hi0;
-      vlib_frame_t *f0;
-      u32 * to_next0;
-      u32 sw_if_index = ~0;
-      u32 original_sw_if_index = ~0;
-      vnet_sw_interface_t *si0;
-      u32 error0 = (u32)~0;
-      vnet_sw_interface_t *swif;
-      dhcpv6_option_t *r0 = 0, *o;
-      u16 len = 0;
-      u8 interface_opt_flag = 0;
-      u8 relay_msg_opt_flag = 0;
-      ip6_fib_t * svr_fib;
-      ip6_main_t * im = &ip6_main;
-      u32 server_fib_idx, svr_fib_id, client_fib_idx, server_idx;
-
-      bi0 = from[0];
-      from += 1;
-      n_left_from -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      h0 = vlib_buffer_get_current (b0);
-
-      if (DHCPV6_MSG_RELAY_REPL != h0->msg_type)
-        {
-          error0 =  DHCPV6_PROXY_ERROR_WRONG_MESSAGE_TYPE;
-
-        drop_packet:
-          vlib_node_increment_counter (vm, dhcpv6_proxy_to_client_node.index,
-                                       error0, 1);
-
-          f0 = vlib_get_frame_to_node (vm, dm->error_drop_node_index);
-          to_next0 = vlib_frame_vector_args (f0);
-          to_next0[0] = bi0;
-          f0->n_vectors = 1;
-          vlib_put_frame_to_node (vm, dm->error_drop_node_index, f0);
-          goto do_trace;
-        }
-      /* hop count seems not need to be checked */
-      if (HOP_COUNT_LIMIT < h0->hop_count)
-        {
-          error0 =  DHCPV6_RELAY_PKT_DROP_MAX_HOPS;
-          goto drop_packet;
-        }
-      u0 = (void *)h0 -(sizeof(*u0));
-      ip0 = (void *)u0 -(sizeof(*ip0));
-
-      vlib_buffer_advance (b0, sizeof(*h0));
-      o = vlib_buffer_get_current (b0);
-
-      /* Parse through TLVs looking for option 18 (DHCPV6_OPTION_INTERFACE_ID)
-         _and_ option 9 (DHCPV6_OPTION_RELAY_MSG) option which must be there.
-         Currently assuming no other options need to be processed
-         The interface-ID is the FIB number we need
-         to track down the client-facing interface */
-
-      while ((u8 *) o < (b0->data + b0->current_data + b0->current_length))
-        {
-           if (DHCPV6_OPTION_INTERFACE_ID == clib_net_to_host_u16(o->option))
-             {
-                interface_opt_flag = 1;
-                if (clib_net_to_host_u16(o->length) == sizeof(sw_if_index))
-                    sw_if_index = clib_net_to_host_u32(((dhcpv6_int_id_t*)o)->int_idx);
-                if (sw_if_index >= vec_len (im->fib_index_by_sw_if_index))
-                  {
-                    error0 = DHCPV6_PROXY_ERROR_WRONG_INTERFACE_ID_OPTION;
-                    goto drop_packet;
-                  }
-             }
-           if (DHCPV6_OPTION_RELAY_MSG == clib_net_to_host_u16(o->option))
-             {
-                relay_msg_opt_flag = 1;
-                r0 = vlib_buffer_get_current (b0);
-             }
-           if ((relay_msg_opt_flag == 1) && (interface_opt_flag == 1))
-             break;
-           vlib_buffer_advance (b0, sizeof(*o) + clib_net_to_host_u16(o->length));
-           o = (dhcpv6_option_t *) (((uword) o) + clib_net_to_host_u16(o->length) + sizeof(*o));
-        }
-
-      if ((relay_msg_opt_flag == 0) || (r0 == 0))
-        {
-    	  error0 = DHCPV6_PROXY_ERROR_NO_RELAY_MESSAGE_OPTION;
-    	  goto drop_packet;
-        }
-
-      if ((u32)~0 == sw_if_index)
-        {
-          error0 = DHCPV6_PROXY_ERROR_NO_CIRCUIT_ID_OPTION;
-          goto drop_packet;
-        }
-
-      //Advance buffer to start of encapsulated DHCPv6 message
-      vlib_buffer_advance (b0, sizeof(*r0));
-
-      client_fib_idx = im->fib_index_by_sw_if_index[sw_if_index];
-      if (client_fib_idx < vec_len(dm->dhcp6_server_index_by_rx_fib_index))
-    	  server_idx = dm->dhcp6_server_index_by_rx_fib_index[client_fib_idx];
-      else
-    	  server_idx = 0;
-
-      if (PREDICT_FALSE (pool_is_free_index (dm->dhcp6_servers, server_idx)))
-        {
-          error0 = DHCPV6_PROXY_ERROR_WRONG_INTERFACE_ID_OPTION;
-          goto drop_packet;
-        }
-
-      server = pool_elt_at_index (dm->dhcp6_servers, server_idx);
-      if (server->valid == 0)
-      {
-    	  error0 = DHCPV6_PROXY_ERROR_NO_SERVER;
-          goto drop_packet;
-      }
-
-
-      server_fib_idx = im->fib_index_by_sw_if_index
-          [vnet_buffer(b0)->sw_if_index[VLIB_RX]];
-      svr_fib = ip6_fib_get (server_fib_idx);
-      svr_fib_id = svr_fib->table_id;
-
-      if (svr_fib_id != server->server_fib6_index ||
-          ip0->src_address.as_u64[0] != server->dhcp6_server.as_u64[0] ||
-          ip0->src_address.as_u64[1] != server->dhcp6_server.as_u64[1])
-        {
-          //drop packet if not from server with configured address or FIB
-          error0 = DHCPV6_PROXY_ERROR_BAD_SVR_FIB_OR_ADDRESS;
-          goto drop_packet;
-        }
-
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] = original_sw_if_index
-          = sw_if_index;
-
-      swif = vnet_get_sw_interface (vnm, original_sw_if_index);
-      if (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
-          sw_if_index = swif->unnumbered_sw_if_index;
-
-
-      /*
-       * udp_local hands us the DHCPV6 header, need udp hdr,
-       * ip hdr to relay to client
-       */
-      vlib_buffer_advance (b0, -(sizeof(*u1)));
-      u1 = vlib_buffer_get_current (b0);
-
-      vlib_buffer_advance (b0, -(sizeof(*ip1)));
-      ip1 = vlib_buffer_get_current (b0);
-
-      copy_ip6_address(&client_address, &h0->peer_addr);
-
-      ia0 = ip6_interface_first_address (&ip6_main, sw_if_index);
-      if (ia0 == 0)
-        {
-          error0 = DHCPV6_PROXY_ERROR_NO_INTERFACE_ADDRESS;
-          goto drop_packet;
-        }
-
-      len =  clib_net_to_host_u16(r0->length);
-      memset(ip1, 0, sizeof(*ip1));
-      copy_ip6_address(&ip1->dst_address, &client_address);
-      u1->checksum = 0;
-      u1->src_port = clib_net_to_host_u16 (UDP_DST_PORT_dhcpv6_to_server);
-      u1->dst_port = clib_net_to_host_u16 (UDP_DST_PORT_dhcpv6_to_client);
-      u1->length = clib_host_to_net_u16 (len + sizeof(udp_header_t));
-
-      ip1->ip_version_traffic_class_and_flow_label =
-          ip0->ip_version_traffic_class_and_flow_label &
-          0x00000fff;
-      ip1->payload_length =  u1->length;
-      ip1->protocol = PROTO_UDP;
-      ip1->hop_limit = HOP_COUNT_LIMIT;
-      copy_ip6_address(&ip1->src_address, ia0);
-
-      u1->checksum = ip6_tcp_udp_icmp_compute_checksum(vm, b0, ip1,
-                                                       &bogus_length);
-      ASSERT(bogus_length == 0);
-
-      vlib_buffer_advance (b0, -(sizeof(ethernet_header_t)));
-      si0 = vnet_get_sw_interface (vnm, original_sw_if_index);
-      if (si0->type == VNET_SW_INTERFACE_TYPE_SUB)
-	  vlib_buffer_advance (b0, -4 /* space for VLAN tag */);
-
-      mac0 = vlib_buffer_get_current (b0);
-
-      hi0 = vnet_get_sup_hw_interface (vnm, original_sw_if_index);
-      ei0 = pool_elt_at_index (em->interfaces, hi0->hw_instance);
-      clib_memcpy (mac0->src_address, ei0->address, sizeof (ei0->address));
-      memset (&mac0->dst_address, 0xff, sizeof (mac0->dst_address));
-      mac0->type = (si0->type == VNET_SW_INTERFACE_TYPE_SUB) ?
-	clib_net_to_host_u16(0x8100) : clib_net_to_host_u16 (0x86dd);
-
-      if (si0->type == VNET_SW_INTERFACE_TYPE_SUB)
-	{
-	  u32 * vlan_tag = (u32 *)(mac0+1);
-	  u32 tmp;
-	  tmp = (si0->sub.id << 16) | 0x0800;
-	  *vlan_tag = clib_host_to_net_u32 (tmp);
-	}
-
-      /* $$$ consider adding a dynamic next to the graph node, for performance */
-      f0 = vlib_get_frame_to_node (vm, hi0->output_node_index);
-      to_next0 = vlib_frame_vector_args (f0);
-      to_next0[0] = bi0;
-      f0->n_vectors = 1;
-      vlib_put_frame_to_node (vm, hi0->output_node_index, f0);
-
-    do_trace:
-      if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-        {
-          dhcpv6_proxy_trace_t *tr = vlib_add_trace (vm, node,
-                                                     b0, sizeof (*tr));
-          tr->which = 1; /* to client */
-          if (ia0)
-              copy_ip6_address((ip6_address_t*)tr->packet_data, ia0);
-          tr->error = error0;
-          tr->original_sw_if_index = original_sw_if_index;
-          tr->sw_if_index = sw_if_index;
-        }
-    }
-  return from_frame->n_vectors;
-
-}
-
-VLIB_REGISTER_NODE (dhcpv6_proxy_to_client_node) = {
-  .function = dhcpv6_proxy_to_client_input,
-  .name = "dhcpv6-proxy-to-client",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .n_errors = DHCPV6_PROXY_N_ERROR,
-  .error_strings = dhcpv6_proxy_error_strings,
-  .format_buffer = format_dhcpv6_proxy_header_with_length,
-  .format_trace = format_dhcpv6_proxy_trace,
-#if 0
-  .unformat_buffer = unformat_dhcpv6_proxy_header,
-#endif
-};
-
-clib_error_t * dhcpv6_proxy_init (vlib_main_t * vm)
-{
-  dhcpv6_proxy_main_t * dm = &dhcpv6_proxy_main;
-  vlib_node_t * error_drop_node;
-  dhcpv6_server_t * server;
-
-  dm->vlib_main = vm;
-  dm->vnet_main = vnet_get_main();
-  error_drop_node = vlib_get_node_by_name (vm, (u8 *) "error-drop");
-  dm->error_drop_node_index = error_drop_node->index;
-
-  dm->vss_index_by_vrf_id = hash_create (0, sizeof (uword));
-
-  /* RFC says this is the dhcpv6 server address  */
-  dm->all_dhcpv6_server_address.as_u64[0] = clib_host_to_net_u64 (0xFF05000000000000);
-  dm->all_dhcpv6_server_address.as_u64[1] = clib_host_to_net_u64 (0x00010003);
-
-  /* RFC says this is the server and agent address */
-  dm->all_dhcpv6_server_relay_agent_address.as_u64[0] = clib_host_to_net_u64 (0xFF02000000000000);
-  dm->all_dhcpv6_server_relay_agent_address.as_u64[1] = clib_host_to_net_u64 (0x00010002);
-
-  udp_register_dst_port (vm, UDP_DST_PORT_dhcpv6_to_client,
-                         dhcpv6_proxy_to_client_node.index, 0 /* is_ip6 */);
-
-  udp_register_dst_port (vm, UDP_DST_PORT_dhcpv6_to_server,
-                         dhcpv6_proxy_to_server_node.index, 0 /* is_ip6 */);
-
-  /* Create the default server, don't mark it valid */
-  pool_get (dm->dhcp6_servers, server);
-  memset (server, 0, sizeof (*server));
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (dhcpv6_proxy_init);
-
-/* Old API, manipulates a single server (only) shared by all Rx VRFs */
-int dhcpv6_proxy_set_server (ip6_address_t *addr, ip6_address_t *src_address,
-                             u32 fib_id, int insert_vss, int is_del)
-{
-	return dhcpv6_proxy_set_server_2 (addr, src_address,
-			0, fib_id,
-			insert_vss, is_del);
-}
-
-int dhcpv6_proxy_set_server_2 (ip6_address_t *addr, ip6_address_t *src_address,
-                             u32 rx_fib_id, u32 server_fib_id,
-							 int insert_vss, int is_del)
-{
-  dhcpv6_proxy_main_t * dm = &dhcpv6_proxy_main;
-  dhcpv6_server_t * server = 0;
-  u32 server_fib_index = 0;
-  u32 rx_fib_index = 0;
-
-  rx_fib_index = ip6_fib_table_find_or_create_and_lock(rx_fib_id);
-  server_fib_index = ip6_fib_table_find_or_create_and_lock(server_fib_id);
-
-  if (is_del)
-      {
-
-	  if (rx_fib_index >= vec_len(dm->dhcp6_server_index_by_rx_fib_index))
-		  return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-	  server_fib_index = dm->dhcp6_server_index_by_rx_fib_index[rx_fib_index];
-
-	  dm->dhcp6_server_index_by_rx_fib_index[rx_fib_index] = 0;
-	  server = pool_elt_at_index (dm->dhcp6_servers, server_fib_index);
-	  memset (server, 0, sizeof (*server));
-	  pool_put (dm->dhcp6_servers, server);
-	  return 0;
-      }
-
-  if (addr->as_u64[0] == 0 &&
-        addr->as_u64[1] == 0 )
-      return VNET_API_ERROR_INVALID_DST_ADDRESS;
-
-    if (src_address->as_u64[0] == 0 &&
-        src_address->as_u64[1] == 0)
-      return VNET_API_ERROR_INVALID_SRC_ADDRESS;
-
-  if (rx_fib_id == 0)
-    {
-      server = pool_elt_at_index (dm->dhcp6_servers, 0);
-
-      goto initialize_it;
-    }
-
-  if (rx_fib_index < vec_len(dm->dhcp6_server_index_by_rx_fib_index))
-    {
-      server_fib_index = dm->dhcp6_server_index_by_rx_fib_index[rx_fib_index];
-      if (server_fib_index != 0)
-        {
-          server = pool_elt_at_index (dm->dhcp6_servers, server_fib_index);
-          goto initialize_it;
-        }
-    }
-
-  /*Allocate a new server*/
-  pool_get (dm->dhcp6_servers, server);
-
-  initialize_it:
-
-  copy_ip6_address(&server->dhcp6_server, addr);
-  copy_ip6_address(&server->dhcp6_src_address, src_address);
-  server->server_fib6_index = server_fib_index;
-  server->valid = 1;
-  server->insert_vss = insert_vss;
-
-  vec_validate (dm->dhcp6_server_index_by_rx_fib_index, rx_fib_index);
-  dm->dhcp6_server_index_by_rx_fib_index[rx_fib_index] =
-		  server - dm->dhcp6_servers;
-
-  return 0;
-}
-
-static clib_error_t *
-dhcpv6_proxy_set_command_fn (vlib_main_t * vm,
-                           unformat_input_t * input,
-                           vlib_cli_command_t * cmd)
-{
-  ip6_address_t addr, src_addr;
-  int set_server = 0, set_src_address = 0;
-  u32 rx_fib_id = 0, server_fib_id = 0;
-  int is_del = 0, add_vss = 0;
-
-  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "server %U",
-                    unformat_ip6_address, &addr))
-	 set_server = 1;
-      else if (unformat(input, "src-address %U",
-			unformat_ip6_address, &src_addr))
-	  set_src_address =1;
-       else if (unformat (input, "server-fib-id %d", &server_fib_id))
-        ;
-       else if (unformat (input, "rx-fib-id %d", &rx_fib_id))
-         ;
-       else if (unformat (input, "add-vss-option")
-               || unformat (input, "insert-option"))
-          add_vss = 1;
-       else if (unformat (input, "delete") ||
-                unformat (input, "del"))
-           is_del = 1;
-      else
-        break;
-    }
-
-  if (is_del || (set_server && set_src_address))
-  {
-      int rv;
-
-      rv = dhcpv6_proxy_set_server_2 (&addr, &src_addr, rx_fib_id,
-    		  server_fib_id, add_vss, is_del);
-
-      //TODO: Complete the errors
-      switch (rv)
-        {
-        case 0:
-          return 0;
-
-        case -1:
-          return clib_error_return (0, "FIB id %d does not exist", server_fib_id);
-
-        default:
-          return clib_error_return (0, "BUG: rv %d", rv);
-        }
-  }
-  else
-    return clib_error_return (0, "parse error`%U'",
-                              format_unformat_error, input);
-}
-
-VLIB_CLI_COMMAND (dhcpv6_proxy_set_command, static) = {
-  .path = "set dhcpv6 proxy",
-  .short_help = "set dhcpv6 proxy [del] server <ipv6-addr> src-address <ipv6-addr> "
-		  "[add-vss-option] [server-fib-id <fib-id>] [rx-fib-id <fib-id>] ",
-  .function = dhcpv6_proxy_set_command_fn,
-};
-
-u8 * format_dhcpv6_proxy_server (u8 * s, va_list * args)
-{
-  dhcpv6_proxy_main_t * dm = va_arg (*args, dhcpv6_proxy_main_t *);
-  dhcpv6_server_t * server = va_arg (*args, dhcpv6_server_t *);
-  u32 rx_fib_index = va_arg (*args, u32);
-  ip6_fib_t * rx_fib, * server_fib;
-  u32 server_fib_id = (u32)~0, rx_fib_id = ~0;
-
-  if (dm == 0)
-    {
-      s = format (s, "%=40s%=40s%=14s%=14s%=20s", "Server Address", "Source Address",
-                  "Server FIB", "RX FIB", "Insert VSS Option");
-      return s;
-    }
-
-  server_fib = ip6_fib_get(server->server_fib6_index);
-  if (server_fib)
-	  server_fib_id= server_fib->table_id;
-
-  rx_fib= ip6_fib_get(rx_fib_index);
-
-  if (rx_fib)
-	  rx_fib_id = rx_fib->table_id;
-
-  s = format (s, "%=40U%=40U%=14u%=14u%=20s",
-              format_ip6_address, &server->dhcp6_server,
-              format_ip6_address, &server->dhcp6_src_address,
-			  server_fib_id, rx_fib_id,
-			                server->insert_vss ? "yes" : "no");
-  return s;
-}
-
-static clib_error_t *
-dhcpv6_proxy_show_command_fn (vlib_main_t * vm,
-                            unformat_input_t * input,
-                            vlib_cli_command_t * cmd)
-{
-  dhcpv6_proxy_main_t * dm = &dhcpv6_proxy_main;
-  ip6_main_t * im = &ip6_main;
-  int i;
-  u32 server_index;
-  dhcpv6_server_t * server;
-
-  vlib_cli_output (vm, "%U", format_dhcpv6_proxy_server, 0 /* header line */,
-		  0, 0);
-  for (i = 0; i < vec_len (im->fibs); i++)
-      {
-        if (i < vec_len(dm->dhcp6_server_index_by_rx_fib_index))
-          server_index = dm->dhcp6_server_index_by_rx_fib_index[i];
-        else
-          server_index = 0;
-        server = pool_elt_at_index (dm->dhcp6_servers, server_index);
-        if (server->valid)
-          vlib_cli_output (vm, "%U", format_dhcpv6_proxy_server, dm,
-		  server, i);
-      }
-  return 0;
-}
-
-VLIB_CLI_COMMAND (dhcpv6_proxy_show_command, static) = {
-  .path = "show dhcpv6 proxy",
-  .short_help = "Display dhcpv6 proxy info",
-  .function = dhcpv6_proxy_show_command_fn,
-};
-
-int dhcpv6_proxy_set_vss(u32 tbl_id,
-                         u32 oui,
-                         u32 fib_id,
-                         int is_del)
-{
-  dhcpv6_proxy_main_t *dm = &dhcpv6_proxy_main;
-  u32 old_oui, old_fib_id;
-  uword *p;
-  dhcpv6_vss_info *v;
-
-  p = hash_get (dm->vss_index_by_vrf_id, tbl_id);
-
-  if (p) {
-      v = pool_elt_at_index (dm->vss, p[0]);
-      if (!v)
-        return VNET_API_ERROR_NO_SUCH_FIB;
-
-      old_oui = v->vpn_id.oui;
-      old_fib_id = v->vpn_id.fib_id;
-
-      if (is_del)
-      {
-          if (old_oui == oui &&
-              old_fib_id == fib_id )
-          {
-              pool_put(dm->vss, v);
-              hash_unset (dm->vss_index_by_vrf_id, tbl_id);
-              return 0;
-          }
-          else
-            return VNET_API_ERROR_NO_SUCH_ENTRY;
-      }
-
-      pool_put(dm->vss, v);
-      hash_unset (dm->vss_index_by_vrf_id, tbl_id);
-  } else if (is_del)
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-  pool_get (dm->vss, v);
-  memset (v, ~0, sizeof (*v));
-  v->vpn_id.fib_id = fib_id;
-  v->vpn_id.oui = oui;
-  hash_set (dm->vss_index_by_vrf_id, tbl_id, v - dm->vss);
-
-  return 0;
-}
-
-
-static clib_error_t *
-dhcpv6_vss_command_fn (vlib_main_t * vm,
-                           unformat_input_t * input,
-                           vlib_cli_command_t * cmd)
-{
-  int is_del = 0, got_new_vss=0;
-  u32 oui=0;
-  u32 fib_id=0, tbl_id=~0;
-
-  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "oui %d", &oui))
-          got_new_vss = 1;
-      else if (unformat (input, "vpn-id %d", &fib_id))
-          got_new_vss = 1;
-      else if (unformat (input, "table %d", &tbl_id))
-          got_new_vss = 1;
-      else if (unformat(input, "delete") || unformat(input, "del"))
-          is_del = 1;
-      else
-          break;
-    }
-
-  if (tbl_id ==~0)
-      return clib_error_return (0, "no table ID specified.");
-
-  if (is_del || got_new_vss)
-    {
-      int rv;
-
-      rv = dhcpv6_proxy_set_vss(tbl_id, oui, fib_id, is_del);
-      switch (rv)
-        {
-        case 0:
-          return 0;
-
-        case VNET_API_ERROR_NO_SUCH_FIB:
-            return clib_error_return (0, "vss info (oui:%d, vpn-id:%d)  not found in table %d.",
-                                      oui, fib_id, tbl_id);
-
-        case VNET_API_ERROR_NO_SUCH_ENTRY:
-            return clib_error_return (0, "vss for table %d not found in pool.",
-                                      tbl_id);
-
-        default:
-          return clib_error_return (0, "BUG: rv %d", rv);
-        }
-    }
-  else
-      return clib_error_return (0, "parse error`%U'",
-                                format_unformat_error, input);
-
-}
-
-VLIB_CLI_COMMAND (dhcpv6_proxy_vss_command, static) = {
-  .path = "set dhcpv6 vss",
-  .short_help = "set dhcpv6 vss table <table-id> oui <oui> vpn-idx <vpn-idx>",
-  .function = dhcpv6_vss_command_fn,
-};
-
-static clib_error_t *
-dhcpv6_vss_show_command_fn (vlib_main_t * vm,
-                            unformat_input_t * input,
-                            vlib_cli_command_t * cmd)
-
-{
-  dhcpv6_proxy_main_t * dm = &dhcpv6_proxy_main;
-  dhcpv6_vss_info *v;
-  u32 oui;
-  u32 fib_id;
-  u32 tbl_id;
-  uword index;
-
-  vlib_cli_output (vm, "%=6s%=6s%=12s","Table", "OUI", "VPN ID");
-  hash_foreach (tbl_id, index, dm->vss_index_by_vrf_id,
-  ({
-     v = pool_elt_at_index (dm->vss, index);
-     oui = v->vpn_id.oui;
-     fib_id = v->vpn_id.fib_id;
-     vlib_cli_output (vm, "%=6d%=6d%=12d",
-                      tbl_id, oui, fib_id);
-  }));
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (dhcpv6_proxy_vss_show_command, static) = {
-  .path = "show dhcpv6 vss",
-  .short_help = "show dhcpv6 VSS",
-  .function = dhcpv6_vss_show_command_fn,
-};
-
-static clib_error_t *
-dhcpv6_link_address_show_command_fn (vlib_main_t * vm,
-                                unformat_input_t * input,
-                                vlib_cli_command_t * cmd)
-
-{
-  dhcpv6_proxy_main_t *dm = &dhcpv6_proxy_main;
-  vnet_main_t *vnm = vnet_get_main();
-  u32 sw_if_index0=0, sw_if_index;
-  ip6_address_t *ia0;
-  vnet_sw_interface_t *swif;
-
-  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
-    {
-
-      if (unformat(input, "%U",
-                   unformat_vnet_sw_interface, dm->vnet_main, &sw_if_index0))
-        {
-            swif = vnet_get_sw_interface (vnm, sw_if_index0);
-            sw_if_index = (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED) ?
-                swif->unnumbered_sw_if_index : sw_if_index0;
-            ia0 = ip6_interface_first_address(&ip6_main, sw_if_index);
-            if (ia0)
-              {
-                  vlib_cli_output (vm, "%=20s%=48s", "interface", "link-address");
-
-                  vlib_cli_output (vm, "%=20U%=48U",
-                                   format_vnet_sw_if_index_name, dm->vnet_main, sw_if_index0,
-                                   format_ip6_address, ia0);
-              } else
-                vlib_cli_output (vm, "%=34s%=20U", "No IPv6 address configured on",
-                                 format_vnet_sw_if_index_name, dm->vnet_main, sw_if_index);
-        } else
-          break;
-    }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (dhcpv6_proxy_address_show_command, static) = {
-  .path = "show dhcpv6 link-address interface",
-  .short_help = "show dhcpv6 link-address interface <interface>",
-  .function = dhcpv6_link_address_show_command_fn,
-};
diff --git a/vnet/vnet/dpo/classify_dpo.c b/vnet/vnet/dpo/classify_dpo.c
deleted file mode 100644
index 9e7886c9..00000000
--- a/vnet/vnet/dpo/classify_dpo.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/ip/ip.h>
-#include <vnet/dpo/classify_dpo.h>
-#include <vnet/mpls/mpls.h>
-
-/*
- * pool of all MPLS Label DPOs
- */
-classify_dpo_t *classify_dpo_pool;
-
-static classify_dpo_t *
-classify_dpo_alloc (void)
-{
-    classify_dpo_t *cd;
-
-    pool_get_aligned(classify_dpo_pool, cd, CLIB_CACHE_LINE_BYTES);
-    memset(cd, 0, sizeof(*cd));
-
-    return (cd);
-}
-
-static index_t
-classify_dpo_get_index (classify_dpo_t *cd)
-{
-    return (cd - classify_dpo_pool);
-}
-
-index_t
-classify_dpo_create (dpo_proto_t proto,
-                     u32 classify_table_index)
-{
-    classify_dpo_t *cd;
-
-    cd = classify_dpo_alloc();
-    cd->cd_proto = proto;
-    cd->cd_table_index = classify_table_index;
-
-    return (classify_dpo_get_index(cd));
-}
-
-u8*
-format_classify_dpo (u8 *s, va_list *args)
-{
-    index_t index = va_arg (*args, index_t);
-    CLIB_UNUSED(u32 indent) = va_arg (*args, u32);
-    classify_dpo_t *cd;
-
-    cd = classify_dpo_get(index);
-
-    return (format(s, "%U-classify:[%d]:table:%d",
-		   format_dpo_proto, cd->cd_proto,
-		   index, cd->cd_table_index));
-}
-
-static void
-classify_dpo_lock (dpo_id_t *dpo)
-{
-    classify_dpo_t *cd;
-
-    cd = classify_dpo_get(dpo->dpoi_index);
-
-    cd->cd_locks++;
-}
-
-static void
-classify_dpo_unlock (dpo_id_t *dpo)
-{
-    classify_dpo_t *cd;
-
-    cd = classify_dpo_get(dpo->dpoi_index);
-
-    cd->cd_locks--;
-
-    if (0 == cd->cd_locks)
-    {
-	pool_put(classify_dpo_pool, cd);
-    }
-}
-
-static void
-classify_dpo_mem_show (void)
-{
-    fib_show_memory_usage("Classify",
-			  pool_elts(classify_dpo_pool),
-			  pool_len(classify_dpo_pool),
-			  sizeof(classify_dpo_t));
-}
-
-const static dpo_vft_t cd_vft = {
-    .dv_lock = classify_dpo_lock,
-    .dv_unlock = classify_dpo_unlock,
-    .dv_format = format_classify_dpo,
-    .dv_mem_show = classify_dpo_mem_show,
-};
-
-const static char* const classify_ip4_nodes[] =
-{
-    "ip4-classify",
-    NULL,
-};
-const static char* const classify_ip6_nodes[] =
-{
-    "ip6-classify",
-    NULL,
-};
-const static char* const * const classify_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = classify_ip4_nodes,
-    [DPO_PROTO_IP6]  = classify_ip6_nodes,
-    [DPO_PROTO_MPLS] = NULL,
-};
-
-void
-classify_dpo_module_init (void)
-{
-    dpo_register(DPO_CLASSIFY, &cd_vft, classify_nodes);
-}
diff --git a/vnet/vnet/dpo/classify_dpo.h b/vnet/vnet/dpo/classify_dpo.h
deleted file mode 100644
index 48f4b2bf..00000000
--- a/vnet/vnet/dpo/classify_dpo.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __CLASSIFY_DPO_H__
-#define __CLASSIFY_DPO_H__
-
-#include <vnet/vnet.h>
-#include <vnet/mpls/packet.h>
-#include <vnet/dpo/dpo.h>
-
-/**
- * A representation of an MPLS label for imposition in the data-path
- */
-typedef struct classify_dpo_t
-{
-    dpo_proto_t cd_proto;
-
-    u32 cd_table_index;
-
-    /**
-     * Number of locks/users of the label
-     */
-    u16 cd_locks;
-} classify_dpo_t;
-
-extern index_t classify_dpo_create(dpo_proto_t proto,
-                                   u32 classify_table_index);
-
-extern u8* format_classify_dpo(u8 *s, va_list *args);
-
-/*
- * Encapsulation violation for fast data-path access
- */
-extern classify_dpo_t *classify_dpo_pool;
-
-static inline classify_dpo_t *
-classify_dpo_get (index_t index)
-{
-    return (pool_elt_at_index(classify_dpo_pool, index));
-}
-
-extern void classify_dpo_module_init(void);
-
-#endif
diff --git a/vnet/vnet/dpo/dpo.c b/vnet/vnet/dpo/dpo.c
deleted file mode 100644
index 688d2892..00000000
--- a/vnet/vnet/dpo/dpo.c
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief
- * A Data-Path Object is an object that represents actions that are
- * applied to packets are they are switched through VPP.
- * 
- * The DPO is a base class that is specialised by other objects to provide
- * concreate actions
- *
- * The VLIB graph nodes are graph of types, the DPO graph is a graph of instances.
- */
-
-#include <vnet/dpo/dpo.h>
-#include <vnet/ip/lookup.h>
-#include <vnet/ip/format.h>
-#include <vnet/adj/adj.h>
-
-#include <vnet/dpo/load_balance.h>
-#include <vnet/dpo/mpls_label_dpo.h>
-#include <vnet/dpo/lookup_dpo.h>
-#include <vnet/dpo/drop_dpo.h>
-#include <vnet/dpo/receive_dpo.h>
-#include <vnet/dpo/punt_dpo.h>
-#include <vnet/dpo/classify_dpo.h>
-#include <vnet/dpo/ip_null_dpo.h>
-
-/**
- * Array of char* names for the DPO types and protos
- */
-static const char* dpo_type_names[] = DPO_TYPES;
-static const char* dpo_proto_names[] = DPO_PROTOS;
-
-/**
- * @brief Vector of virtual function tables for the DPO types
- *
- * This is a vector so we can dynamically register new DPO types in plugins.
- */
-static dpo_vft_t *dpo_vfts;
-
-/**
- * @brief vector of graph node names associated with each DPO type and protocol.
- *
- *   dpo_nodes[child_type][child_proto][node_X] = node_name;
- * i.e.
- *   dpo_node[DPO_LOAD_BALANCE][DPO_PROTO_IP4][0] = "ip4-lookup"
- *   dpo_node[DPO_LOAD_BALANCE][DPO_PROTO_IP4][1] = "ip4-load-balance"
- *
- * This is a vector so we can dynamically register new DPO types in plugins.
- */
-static const char* const * const ** dpo_nodes;
-
-/**
- * @brief Vector of edge indicies from parent DPO nodes to child
- *
- * dpo_edges[child_type][child_proto][parent_type][parent_proto] = edge_index
- *
- * This array is derived at init time from the dpo_nodes above. Note that
- * the third dimension in dpo_nodes is lost, hence, the edge index from each
- * node MUST be the same.
- * Including both the child and parent protocol is required to support the
- * case where it changes as the grapth is traversed, most notablly when an
- * MPLS label is popped.
- *
- * Note that this array is child type specific, not child instance specific.
- */
-static u32 ****dpo_edges;
-
-/**
- * @brief The DPO type value that can be assigend to the next dynamic
- *        type registration.
- */
-static dpo_type_t dpo_dynamic = DPO_LAST;
-
-dpo_proto_t
-vnet_link_to_dpo_proto (vnet_link_t linkt)
-{
-    switch (linkt)
-    {
-    case VNET_LINK_IP6:
-        return (DPO_PROTO_IP6);
-    case VNET_LINK_IP4:
-        return (DPO_PROTO_IP4);
-    case VNET_LINK_MPLS:
-        return (DPO_PROTO_MPLS);
-    case VNET_LINK_ETHERNET:
-        return (DPO_PROTO_ETHERNET);
-    case VNET_LINK_ARP:
-	break;
-    }
-    ASSERT(0);
-    return (0);
-}
-
-u8 *
-format_dpo_type (u8 * s, va_list * args)
-{
-    dpo_type_t type = va_arg (*args, int);
-
-    s = format(s, "%s", dpo_type_names[type]);
-
-    return (s);
-}
-
-u8 *
-format_dpo_id (u8 * s, va_list * args)
-{
-    dpo_id_t *dpo = va_arg (*args, dpo_id_t*);
-    u32 indent = va_arg (*args, u32);
-
-    s = format(s, "[@%d]: ", dpo->dpoi_next_node);
-
-    if (NULL != dpo_vfts[dpo->dpoi_type].dv_format)
-    {
-        return (format(s, "%U",
-                       dpo_vfts[dpo->dpoi_type].dv_format,
-                       dpo->dpoi_index,
-                       indent));
-    }
-
-    switch (dpo->dpoi_type)
-    {
-    case DPO_FIRST:
-	s = format(s, "unset");
-	break;
-    default:
-	s = format(s, "unknown");
-	break;
-    }
-    return (s);
-}
-
-u8 *
-format_dpo_proto (u8 * s, va_list * args)
-{
-    dpo_proto_t proto = va_arg (*args, int);
-
-    return (format(s, "%s", dpo_proto_names[proto]));
-}
-
-void
-dpo_set (dpo_id_t *dpo,
-	 dpo_type_t type,
-	 dpo_proto_t proto,
-	 index_t index)
-{
-    dpo_id_t tmp = *dpo;
-
-    dpo->dpoi_type = type;
-    dpo->dpoi_proto = proto,
-    dpo->dpoi_index = index;
-
-    if (DPO_ADJACENCY == type)
-    {
-	/*
-	 * set the adj subtype
-	 */
-	ip_adjacency_t *adj;
-
-	adj = adj_get(index);
-
-	switch (adj->lookup_next_index)
-	{
-	case IP_LOOKUP_NEXT_ARP:
-	    dpo->dpoi_type = DPO_ADJACENCY_INCOMPLETE;
-	    break;
-	case IP_LOOKUP_NEXT_MIDCHAIN:
-	    dpo->dpoi_type = DPO_ADJACENCY_MIDCHAIN;
-	    break;
-	default:
-	    break;
-	}
-    }
-    dpo_lock(dpo);
-    dpo_unlock(&tmp);
-}
-
-void
-dpo_reset (dpo_id_t *dpo)
-{
-    dpo_id_t tmp = DPO_INVALID;
-
-    /*
-     * use the atomic copy operation.
-     */
-    dpo_copy(dpo, &tmp);
-}
-
-/**
- * \brief
- * Compare two Data-path objects
- *
- * like memcmp, return 0 is matching, !0 otherwise.
- */
-int
-dpo_cmp (const dpo_id_t *dpo1,
-	 const dpo_id_t *dpo2)
-{
-    int res;
-
-    res = dpo1->dpoi_type - dpo2->dpoi_type;
-
-    if (0 != res) return (res);
-
-    return (dpo1->dpoi_index - dpo2->dpoi_index);
-}
-
-void
-dpo_copy (dpo_id_t *dst,
-	  const dpo_id_t *src)
-{
-    dpo_id_t tmp = *dst;
-
-    /*
-     * the destination is written in a single u64 write - hence atomically w.r.t
-     * any packets inflight.
-     */
-    *((u64*)dst) = *(u64*)src; 
-
-    dpo_lock(dst);
-    dpo_unlock(&tmp);    
-}
-
-int
-dpo_is_adj (const dpo_id_t *dpo)
-{
-    return ((dpo->dpoi_type == DPO_ADJACENCY) ||
-	    (dpo->dpoi_type == DPO_ADJACENCY_INCOMPLETE) ||
-	    (dpo->dpoi_type == DPO_ADJACENCY_MIDCHAIN) ||
-	    (dpo->dpoi_type == DPO_ADJACENCY_GLEAN));
-}
-
-void
-dpo_register (dpo_type_t type,
-	      const dpo_vft_t *vft,
-              const char * const * const * nodes)
-{
-    vec_validate(dpo_vfts, type);
-    dpo_vfts[type] = *vft;
-
-    vec_validate(dpo_nodes, type);
-    dpo_nodes[type] = nodes;
-}
-
-dpo_type_t
-dpo_register_new_type (const dpo_vft_t *vft,
-                       const char * const * const * nodes)
-{
-    dpo_type_t type = dpo_dynamic++;
-
-    dpo_register(type, vft, nodes);
-
-    return (type);
-}
-
-void
-dpo_lock (dpo_id_t *dpo)
-{
-    if (!dpo_id_is_valid(dpo))
-	return;
-
-    dpo_vfts[dpo->dpoi_type].dv_lock(dpo);
-}
-
-void
-dpo_unlock (dpo_id_t *dpo)
-{
-    if (!dpo_id_is_valid(dpo))
-	return;
-
-    dpo_vfts[dpo->dpoi_type].dv_unlock(dpo);
-}
-
-
-static u32
-dpo_get_next_node (dpo_type_t child_type,
-                   dpo_proto_t child_proto,
-                   const dpo_id_t *parent_dpo)
-{
-    dpo_proto_t parent_proto;
-    dpo_type_t parent_type;
-
-    parent_type = parent_dpo->dpoi_type;
-    parent_proto = parent_dpo->dpoi_proto;
-
-    vec_validate(dpo_edges, child_type);
-    vec_validate(dpo_edges[child_type], child_proto);
-    vec_validate(dpo_edges[child_type][child_proto], parent_type);
-    vec_validate_init_empty(
-        dpo_edges[child_type][child_proto][parent_type],
-        parent_proto, ~0);
-
-    /*
-     * if the edge index has not yet been created for this node to node transistion
-     */
-    if (~0 == dpo_edges[child_type][child_proto][parent_type][parent_proto])
-    {
-        vlib_node_t *parent_node, *child_node;
-        vlib_main_t *vm;
-        u32 edge ,pp, cc;
-
-        vm = vlib_get_main();
-
-        ASSERT(NULL != dpo_nodes[child_type]);
-        ASSERT(NULL != dpo_nodes[child_type][child_proto]);
-        ASSERT(NULL != dpo_nodes[parent_type]);
-        ASSERT(NULL != dpo_nodes[parent_type][parent_proto]);
-
-        cc = 0;
-
-        /*
-         * create a graph arc from each of the parent's registered node types,
-         * to each of the childs.
-         */
-        while (NULL != dpo_nodes[child_type][child_proto][cc])
-        {
-            child_node =
-                vlib_get_node_by_name(vm,
-                                      (u8*) dpo_nodes[child_type][child_proto][cc]);
-
-            pp = 0;
-
-            while (NULL != dpo_nodes[parent_type][parent_proto][pp])
-            {
-                parent_node =
-                    vlib_get_node_by_name(vm,
-                                          (u8*) dpo_nodes[parent_type][parent_proto][pp]);
-
-                edge = vlib_node_add_next(vm,
-                                          child_node->index,
-                                          parent_node->index);
-
-                if (~0 == dpo_edges[child_type][child_proto][parent_type][parent_proto])
-                {
-                    dpo_edges[child_type][child_proto][parent_type][parent_proto] = edge;
-                }
-                else
-                {
-                    ASSERT(dpo_edges[child_type][child_proto][parent_type][parent_proto] == edge);
-                }
-                pp++;
-            }
-            cc++;
-        }
-    }
-
-    return (dpo_edges[child_type][child_proto][parent_type][parent_proto]);
-}
-
-/**
- * @brief Stack one DPO object on another, and thus establish a child parent
- * relationship. The VLIB graph arc used is taken from the parent and child types
- * passed.
- */
-static void
-dpo_stack_i (u32 edge,
-             dpo_id_t *dpo,
-             const dpo_id_t *parent)
-{
-    /*
-     * in order to get an atomic update of the parent we create a temporary,
-     * from a copy of the child, and add the next_node. then we copy to the parent
-     */
-    dpo_id_t tmp = DPO_INVALID;
-    dpo_copy(&tmp, parent);
-
-    /*
-     * get the edge index for the parent to child VLIB graph transisition
-     */
-    tmp.dpoi_next_node = edge;
-
-    /*
-     * this update is atomic.
-     */
-    dpo_copy(dpo, &tmp);
-
-    dpo_reset(&tmp);
-}
-
-/**
- * @brief Stack one DPO object on another, and thus establish a child-parent
- * relationship. The VLIB graph arc used is taken from the parent and child types
- * passed.
- */
-void
-dpo_stack (dpo_type_t child_type,
-           dpo_proto_t child_proto,
-           dpo_id_t *dpo,
-           const dpo_id_t *parent)
-{
-    dpo_stack_i(dpo_get_next_node(child_type, child_proto, parent), dpo, parent);
-}
-
-/**
- * @brief Stack one DPO object on another, and thus establish a child parent
- * relationship. A new VLIB graph arc is created from the child node passed
- * to the nodes registered by the parent. The VLIB infra will ensure this arc
- * is added only once.
- */
-void
-dpo_stack_from_node (u32 child_node_index,
-                     dpo_id_t *dpo,
-                     const dpo_id_t *parent)
-{
-    dpo_proto_t parent_proto;
-    vlib_node_t *parent_node;
-    dpo_type_t parent_type;
-    vlib_main_t *vm;
-    u32 edge;
-
-    parent_type = parent->dpoi_type;
-    parent_proto = parent->dpoi_proto;
-
-    vm = vlib_get_main();
-
-    ASSERT(NULL != dpo_nodes[parent_type]);
-    ASSERT(NULL != dpo_nodes[parent_type][parent_proto]);
-
-    parent_node =
-        vlib_get_node_by_name(vm, (u8*) dpo_nodes[parent_type][parent_proto][0]);
-
-    edge = vlib_node_add_next(vm,
-                              child_node_index,
-                              parent_node->index);
-
-    dpo_stack_i(edge, dpo, parent);
-}
-
-static clib_error_t *
-dpo_module_init (vlib_main_t * vm)
-{
-    drop_dpo_module_init();
-    punt_dpo_module_init();
-    receive_dpo_module_init();
-    load_balance_module_init();
-    mpls_label_dpo_module_init();
-    classify_dpo_module_init();
-    lookup_dpo_module_init();
-    ip_null_dpo_module_init();
-
-    return (NULL);
-}
-
-VLIB_INIT_FUNCTION(dpo_module_init);
-
-static clib_error_t *
-dpo_memory_show (vlib_main_t * vm,
-		 unformat_input_t * input,
-		 vlib_cli_command_t * cmd)
-{
-    dpo_vft_t *vft;
-
-    vlib_cli_output (vm, "DPO memory");
-    vlib_cli_output (vm, "%=30s %=5s %=8s/%=9s   totals",
-		     "Name","Size", "in-use", "allocated");
-
-    vec_foreach(vft, dpo_vfts)
-    {
-	if (NULL != vft->dv_mem_show)
-	    vft->dv_mem_show();
-    }
-
-    return (NULL);
-}
-
-/* *INDENT-OFF* */
-/*?
- * The '<em>sh dpo memory </em>' command displays the memory usage for each
- * data-plane object type.
- *
- * @cliexpar
- * @cliexstart{show dpo memory}
- * DPO memory
- *             Name               Size  in-use /allocated   totals
- *         load-balance            64     12   /    12      768/768
- *           Adjacency            256      1   /    1       256/256
- *            Receive              24      5   /    5       120/120
- *            Lookup               12      0   /    0       0/0
- *           Classify              12      0   /    0       0/0
- *          MPLS label             24      0   /    0       0/0
- * @cliexend
-?*/
-VLIB_CLI_COMMAND (show_fib_memory, static) = {
-    .path = "show dpo memory",
-    .function = dpo_memory_show,
-    .short_help = "show dpo memory",
-};
-/* *INDENT-ON* */
diff --git a/vnet/vnet/dpo/dpo.h b/vnet/vnet/dpo/dpo.h
deleted file mode 100644
index 1efcbc88..00000000
--- a/vnet/vnet/dpo/dpo.h
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief
- * A Data-Path Object is an object that represents actions that are
- * applied to packets are they are switched through VPP's data-path.
- * 
- * The DPO can be considered to be like is a base class that is specialised
- * by other objects to provide concreate actions
- *
- * The VLIB graph nodes are graph of DPO types, the DPO graph is a graph of
- * instances.
- */
-
-#ifndef __DPO_H__
-#define __DPO_H__
-
-#include <vnet/vnet.h>
-
-/**
- * @brief An index for adjacencies.
- * Alas 'C' is not typesafe enough to b0rk when a u32 is used instead of
- * an index_t. However, for us humans, we can glean much more intent
- * from the declaration
- *  foo barindex_t t);
- * than we can from
- *  foo bar(u32 t);
- */
-typedef u32 index_t;
-
-/**
- * @brief Invalid index - used when no index is known
- * blazoned capitals INVALID speak volumes where ~0 does not.
- */
-#define INDEX_INVALID ((index_t)(~0))
-
-/**
- * @brief Data path protocol.
- * Actions performed on packets in the data-plane can be described and represented
- * by protocol independent objects, i.e. ADJACENCY, but the spceifics actions
- * required during ADJACENCY processing can be protocol dependent. For example,
- * the adjacency rewrite node performs a ip4 checksum calculation,  ip6 and MPLS
- * do not, all 3 perform a TTL decrement. The VLIB graph nodes are thus protocol
- * dependent, and thus each graph edge/arc is too.
- * When programming a DPO's next node arc from child to parent it is thus required
- * to know the parent's data-path protocol so the correct arc index can be used.
- */
-typedef enum dpo_proto_t_
-{
-#if CLIB_DEBUG > 0
-    DPO_PROTO_IP4 = 1,
-#else
-    DPO_PROTO_IP4 = 0,
-#endif
-    DPO_PROTO_IP6,
-    DPO_PROTO_ETHERNET,
-    DPO_PROTO_MPLS,
-} __attribute__((packed)) dpo_proto_t;
-
-#define DPO_PROTO_NUM ((dpo_proto_t)(DPO_PROTO_MPLS+1))
-#define DPO_PROTO_NONE ((dpo_proto_t)(DPO_PROTO_NUM+1))
-
-#define DPO_PROTOS {		\
-    [DPO_PROTO_IP4]  = "ip4",	\
-    [DPO_PROTO_IP6]  = "ip6",	\
-    [DPO_PROTO_ETHERNET]  = "ethernet", \
-    [DPO_PROTO_MPLS] = "mpls",	\
-}
-
-#define FOR_EACH_DPO_PROTO(_proto)    \
-    for (_proto = DPO_PROTO_IP4;      \
-	 _proto <= DPO_PROTO_MPLS;    \
-	 _proto++)
-
-/**
- * @brief Common types of data-path objects
- * New types can be dynamically added using dpo_register_new_type()
- */
-typedef enum dpo_type_t_ {
-    /**
-     * A non-zero value first so we can spot unitialisation errors
-     */
-    DPO_FIRST,
-    DPO_DROP,
-    DPO_IP_NULL,
-    DPO_PUNT,
-    /**
-     * @brief load-balancing over a choice of [un]equal cost paths
-     */
-    DPO_LOAD_BALANCE,
-    DPO_ADJACENCY,
-    DPO_ADJACENCY_INCOMPLETE,
-    DPO_ADJACENCY_MIDCHAIN,
-    DPO_ADJACENCY_GLEAN,
-    DPO_RECEIVE,
-    DPO_LOOKUP,
-    DPO_LISP_CP,
-    DPO_CLASSIFY,
-    DPO_MPLS_LABEL,
-    DPO_LAST,
-} __attribute__((packed)) dpo_type_t;
-
-#define DPO_TYPE_NUM DPO_LAST
-
-#define DPO_TYPES {			\
-    [DPO_FIRST] = "dpo-invalid",	\
-    [DPO_DROP] = "dpo-drop",	\
-    [DPO_IP_NULL] = "dpo-ip-null",		\
-    [DPO_PUNT] = "dpo-punt",	\
-    [DPO_ADJACENCY] = "dpo-adjacency",	\
-    [DPO_ADJACENCY_INCOMPLETE] = "dpo-adjacency-incomplete",	\
-    [DPO_ADJACENCY_MIDCHAIN] = "dpo-adjacency-midcahin",	\
-    [DPO_ADJACENCY_GLEAN] = "dpo-glean",	\
-    [DPO_RECEIVE] = "dpo-receive",	\
-    [DPO_LOOKUP] = "dpo-lookup",	\
-    [DPO_LOAD_BALANCE] = "dpo-load-balance",	\
-    [DPO_LISP_CP] = "dpo-lisp-cp",	\
-    [DPO_CLASSIFY] = "dpo-classify",	\
-    [DPO_MPLS_LABEL] = "dpo-mpls-label"	\
-}
-
-/**
- * @brief The identity of a DPO is a combination of its type and its
- * instance number/index of objects of that type
- */
-typedef struct dpo_id_t_ {
-    /**
-     * the type
-     */
-    dpo_type_t dpoi_type;
-    /**
-     * the data-path protocol of the type.
-     */
-    dpo_proto_t dpoi_proto;
-    /**
-     * The next VLIB node to follow.
-     */
-    u16 dpoi_next_node;
-    /**
-     * the index of objects of that type
-     */
-    index_t dpoi_index;
-} __attribute__ ((aligned(sizeof(u64)))) dpo_id_t;
-
-STATIC_ASSERT(sizeof(dpo_id_t) <= sizeof(u64),
-	      "DPO ID is greater than sizeof u64 "
-	      "atomic updates need to be revisited");
-
-/**
- * @brief An initialiser for DPOs declared on the stack.
- * Thenext node is set to 0 since VLIB graph nodes should set 0 index to drop.
- */
-#define DPO_INVALID                \
-{                                  \
-    .dpoi_type = DPO_FIRST,        \
-    .dpoi_proto = DPO_PROTO_NONE,  \
-    .dpoi_index = INDEX_INVALID,   \
-    .dpoi_next_node = 0,           \
-}
-
-/**
- * @brief Return true if the DPO object is valid, i.e. has been initialised.
- */
-static inline int
-dpo_id_is_valid (const dpo_id_t *dpoi)
-{
-    return (dpoi->dpoi_type != DPO_FIRST &&
-	    dpoi->dpoi_index != INDEX_INVALID);
-}
-
-extern dpo_proto_t vnet_link_to_dpo_proto(vnet_link_t linkt);
-
-/**
- * @brief
- *  Take a reference counting lock on the DPO
- */
-extern void dpo_lock(dpo_id_t *dpo);
-
-/**
- * @brief
- *  Release a reference counting lock on the DPO
- */
-extern void dpo_unlock(dpo_id_t *dpo);
-
-/**
- * @brief Set/create a DPO ID
- * The DPO will be locked.
- *
- * @param dpo
- *  The DPO object to configure
- *
- * @param type
- *  The dpo_type_t of the DPO
- *
- * @param proto
- *  The dpo_proto_t of the DPO
- *
- * @param index
- *  The type specific index of the DPO
- */
-extern void dpo_set(dpo_id_t *dpo,
-		    dpo_type_t type,
-		    dpo_proto_t proto,
-		    index_t index);
-
-/**
- * @brief reset a DPO ID
- * The DPO will be unlocked.
- *
- * @param dpo
- *  The DPO object to reset
- */
-extern void dpo_reset(dpo_id_t *dpo);
-
-/**
- * @brief compare two DPOs for equality
- */
-extern int dpo_cmp(const dpo_id_t *dpo1,
-		   const dpo_id_t *dpo2);
-
-/**
- * @brief
- *  atomic copy a data-plane object.
- * This is safe to use when the dst DPO is currently switching packets
- */
-extern void dpo_copy(dpo_id_t *dst,
-		     const dpo_id_t *src);
-
-/**
- * @brief Return TRUE is the DPO is any type of adjacency
- */
-extern int dpo_is_adj(const dpo_id_t *dpo);
-
-/**
- * @biref Format a DPO_id_t oject
- */
-extern u8 *format_dpo_id(u8 * s, va_list * args);
-
-/**
- * @biref format a DPO type
- */
-extern u8 *format_dpo_type(u8 * s, va_list * args);
-
-/**
- * @brief format a DPO protocol
- */
-extern u8 *format_dpo_proto(u8 * s, va_list * args);
-
-/**
- * @brief
- *  Set and stack a DPO.
- *  The DPO passed is set to the parent DPO and the necessary
- *  VLIB graph arcs are created. The child_type and child_proto
- * are used to get the VLID nodes from which the arcs are added.
- *
- * @param child_type
- *  Child DPO type.
- *
- * @param child_proto
- *  Child DPO proto
- *
- * @parem dpo
- *  This is the DPO to stack and set.
- *
- * @paren parent_dpo
- *  The parent DPO to stack onto.
- */
-extern void dpo_stack(dpo_type_t child_type,
-                      dpo_proto_t child_proto,
-                      dpo_id_t *dpo,
-                      const dpo_id_t *parent_dpo);
-
-/**
- * @brief 
- *  Set and stack a DPO.
- *  The DPO passed is set to the parent DPO and the necessary
- *  VLIB graph arcs are created, from the child_node passed.
- *
- * @param child_node
- *  The VLIB grpah node index to create an arc from to the parent
- *
- * @parem dpo
- *  This is the DPO to stack and set.
- *
- * @paren parent_dpo
- *  The parent DPO to stack onto.
- */ 
-extern void dpo_stack_from_node(u32 child_node,
-                                dpo_id_t *dpo,
-                                const dpo_id_t *parent);
-
-/**
- * @brief  A lock function registered for a DPO type
- */
-typedef void (*dpo_lock_fn_t)(dpo_id_t *dpo);
-
-/**
- * @brief An unlock function registered for a DPO type
- */
-typedef void (*dpo_unlock_fn_t)(dpo_id_t *dpo);
-
-/**
- * @brief An memory usage show command
- */
-typedef void (*dpo_mem_show_t)(void);
-
-/**
- * @brief A virtual function table regisitered for a DPO type
- */
-typedef struct dpo_vft_t_
-{
-    /**
-     * A reference counting lock function
-     */
-    dpo_lock_fn_t dv_lock;
-    /**
-     * A reference counting unlock function
-     */
-    dpo_lock_fn_t dv_unlock;
-    /**
-     * A format function
-     */
-    format_function_t *dv_format;
-    /**
-     * A show memory usage function
-     */
-    dpo_mem_show_t dv_mem_show;
-} dpo_vft_t;
-
-
-/**
- * @brief For a given DPO type Register:
- *   - a virtual function table
- *   - a NULL terminated array of graph nodes from which that object type
- *     will originate packets, i.e. the nodes in which the object type will be
- *     the parent DPO in the DP graph. The ndoes are per-data-path protocol
- *     (see above).
- *
- * @param type
- *  The type being registered. 
- *
- * @param vft
- *  The virtual function table to register for the type.
- *
- * @param nodes
- *  The string description of the per-protocol VLIB graph nodes.
- */
-extern void dpo_register(dpo_type_t type,
-			 const dpo_vft_t *vft,
-			 const char * const * const * nodes);
-
-/**
- * @brief Create and register a new DPO type.
- *
- * This can be used by plugins to create new DPO types that are not listed
- * in dpo_type_t enum
- *
- * @param vft
- *  The virtual function table to register for the type.
- *
- * @param nodes
- *  The string description of the per-protocol VLIB graph nodes.
- *
- * @return The new dpo_type_t
- */
-extern dpo_type_t dpo_register_new_type(const dpo_vft_t *vft,
-					const char * const * const * nodes);
-
-#endif
diff --git a/vnet/vnet/dpo/drop_dpo.c b/vnet/vnet/dpo/drop_dpo.c
deleted file mode 100644
index 5118d2a4..00000000
--- a/vnet/vnet/dpo/drop_dpo.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief
- * The data-path object representing dropping the packet
- */
-
-#include <vnet/dpo/dpo.h>
-
-static dpo_id_t drop_dpos[DPO_PROTO_NUM];
-
-const dpo_id_t *
-drop_dpo_get (dpo_proto_t proto)
-{
-    dpo_set(&drop_dpos[proto], DPO_DROP, proto, proto);
-
-    return (&drop_dpos[proto]);
-}
-
-int
-dpo_is_drop (const dpo_id_t *dpo)
-{
-    return (dpo->dpoi_type == DPO_DROP);
-}
-
-static void
-drop_dpo_lock (dpo_id_t *dpo)
-{
-    /*
-     * not maintaining a lock count on the drop
-     * more trouble than it's worth.
-     * There always needs to be one around. no point it managaing its lifetime
-     */
-}
-static void
-drop_dpo_unlock (dpo_id_t *dpo)
-{
-}
-
-static u8*
-format_drop_dpo (u8 *s, va_list *ap)
-{
-    CLIB_UNUSED(index_t index) = va_arg(*ap, index_t);
-    CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
-
-    return (format(s, "dpo-drop %U", format_dpo_proto, index));
-}
-
-const static dpo_vft_t drop_vft = {
-    .dv_lock   = drop_dpo_lock,
-    .dv_unlock = drop_dpo_unlock,
-    .dv_format = format_drop_dpo,
-};
-
-/**
- * @brief The per-protocol VLIB graph nodes that are assigned to a drop
- *        object.
- *
- * this means that these graph nodes are ones from which a drop is the
- * parent object in the DPO-graph.
- */
-const static char* const drop_ip4_nodes[] =
-{
-    "ip4-drop",
-    NULL,
-};
-const static char* const drop_ip6_nodes[] =
-{
-    "ip6-drop",
-    NULL,
-};
-const static char* const drop_mpls_nodes[] =
-{
-    "mpls-drop",
-    NULL,
-};
-const static char* const drop_ethernet_nodes[] =
-{
-    "error-drop",
-    NULL,
-};
-const static char* const * const drop_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = drop_ip4_nodes,
-    [DPO_PROTO_IP6]  = drop_ip6_nodes,
-    [DPO_PROTO_MPLS] = drop_mpls_nodes,
-    [DPO_PROTO_ETHERNET] = drop_ethernet_nodes,
-};
-
-void
-drop_dpo_module_init (void)
-{
-    dpo_register(DPO_DROP, &drop_vft, drop_nodes);
-}
diff --git a/vnet/vnet/dpo/drop_dpo.h b/vnet/vnet/dpo/drop_dpo.h
deleted file mode 100644
index 436df36c..00000000
--- a/vnet/vnet/dpo/drop_dpo.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief The Drop DPO will drop all packets, no questions asked. It is valid
- * for any packet protocol.
- */
-
-#ifndef __DROP_DPO_H__
-#define __DROP_DPO_H__
-
-#include <vnet/dpo/dpo.h>
-
-extern int dpo_is_drop(const dpo_id_t *dpo);
-
-extern const dpo_id_t *drop_dpo_get(dpo_proto_t proto);
-
-extern void drop_dpo_module_init(void);
-
-#endif
diff --git a/vnet/vnet/dpo/ip_null_dpo.c b/vnet/vnet/dpo/ip_null_dpo.c
deleted file mode 100644
index 22682e4e..00000000
--- a/vnet/vnet/dpo/ip_null_dpo.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief
- * The data-path object representing dropping the packet
- */
-
-#include <vnet/dpo/ip_null_dpo.h>
-#include <vnet/ip/ip.h>
-
-/**
- * @brief A representation of the IP_NULL DPO
- */
-typedef struct ip_null_dpo_t_
-{
-    /**
-     * @brief The action to take on a packet
-     */
-    ip_null_dpo_action_t ind_action;
-    /**
-     * @brief The next VLIB node
-     */
-    u32 ind_next_index;
-    /**
-     * rate limits
-     */
-} ip_null_dpo_t;
-
-/**
- * @brief the IP_NULL dpos are shared by all routes, hence they are global.
- * As the neame implies this is only for IP, hence 2.
- */
-static ip_null_dpo_t ip_null_dpos[2 * IP_NULL_DPO_ACTION_NUM] = {
-    [0] = {
-	/* proto ip4, no action */
-	.ind_action = IP_NULL_ACTION_NONE,
-    },
-    [1] = {
-	/* proto ip4, action send unreach */
-	.ind_action = IP_NULL_ACTION_SEND_ICMP_UNREACH,
-    },
-    [2] = {
-	/* proto ip4, action send unreach */
-	.ind_action = IP_NULL_ACTION_SEND_ICMP_PROHIBIT,
-    },
-    [3] = {
-	/* proto ip6, no action */
-	.ind_action = IP_NULL_ACTION_NONE,
-    },
-    [4] = {
-	/* proto ip6, action send unreach */
-	.ind_action = IP_NULL_ACTION_SEND_ICMP_UNREACH,
-    },
-    [5] = {
-	/* proto ip6, action send unreach */
-	.ind_action = IP_NULL_ACTION_SEND_ICMP_PROHIBIT,
-    },
-};
-
-/**
- * @brief Action strings
- */
-const char *ip_null_action_strings[] = IP_NULL_ACTIONS;
-
-void
-ip_null_dpo_add_and_lock (dpo_proto_t proto,
-			  ip_null_dpo_action_t action,
-			  dpo_id_t *dpo)
-{
-    int i;
-
-    ASSERT((proto == DPO_PROTO_IP4) ||
-	   (proto == DPO_PROTO_IP6));
-    ASSERT(action < IP_NULL_DPO_ACTION_NUM);
-
-    i = (proto == DPO_PROTO_IP4 ? 0 : 1);
-
-    dpo_set(dpo, DPO_IP_NULL, proto, (i*IP_NULL_DPO_ACTION_NUM) + action);
-}
-
-always_inline const ip_null_dpo_t*
-ip_null_dpo_get (index_t indi)
-{
-    return (&ip_null_dpos[indi]);
-}
-
-static void
-ip_null_dpo_lock (dpo_id_t *dpo)
-{
-    /*
-     * not maintaining a lock count on the ip_null, they are const global and
-     * never die.
-     */
-}
-static void
-ip_null_dpo_unlock (dpo_id_t *dpo)
-{
-}
-
-static u8*
-format_ip_null_dpo (u8 *s, va_list *ap)
-{
-    index_t index = va_arg(*ap, index_t);
-    CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
-    const ip_null_dpo_t *ind;
-    dpo_proto_t proto;
-
-    ind = ip_null_dpo_get(index);
-    proto = (index < IP_NULL_DPO_ACTION_NUM ? DPO_PROTO_IP4 : DPO_PROTO_IP6);
-
-    return (format(s, "%U-null action:%s",
-		   format_dpo_proto, proto,
-		   ip_null_action_strings[ind->ind_action]));
-}
-
-const static dpo_vft_t ip_null_vft = {
-    .dv_lock   = ip_null_dpo_lock,
-    .dv_unlock = ip_null_dpo_unlock,
-    .dv_format = format_ip_null_dpo,
-};
-
-/**
- * @brief The per-protocol VLIB graph nodes that are assigned to a ip_null
- *        object.
- *
- * this means that these graph nodes are ones from which a ip_null is the
- * parent object in the DPO-graph.
- */
-const static char* const ip4_null_nodes[] =
-{
-    "ip4-null",
-    NULL,
-};
-const static char* const ip6_null_nodes[] =
-{
-    "ip6-null",
-    NULL,
-};
-
-const static char* const * const ip_null_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4] = ip4_null_nodes,
-    [DPO_PROTO_IP6] = ip6_null_nodes,
-};
-
-typedef struct ip_null_dpo_trace_t_
-{
-    index_t ind_index;
-} ip_null_dpo_trace_t;
-
-/**
- * @brief Exit nodes from a IP_NULL
- */
-typedef enum ip_null_next_t_
-{
-    IP_NULL_NEXT_DROP,
-    IP_NULL_NEXT_ICMP,
-    IP_NULL_NEXT_NUM,
-} ip_null_next_t;
-
-always_inline uword
-ip_null_dpo_switch (vlib_main_t * vm,
-		    vlib_node_runtime_t * node,
-		    vlib_frame_t * frame,
-		    u8 is_ip4)
-{
-    u32 n_left_from, next_index, *from, *to_next;
-    static f64 time_last_seed_change = -1e100;
-    static u32 hash_seeds[3];
-    static uword hash_bitmap[256 / BITS (uword)];
-    f64 time_now;
-
-    from = vlib_frame_vector_args (frame);
-    n_left_from = frame->n_vectors;
-
-    time_now = vlib_time_now (vm);
-    if (time_now - time_last_seed_change > 1e-1)
-    {
-	uword i;
-	u32 * r = clib_random_buffer_get_data (&vm->random_buffer,
-					       sizeof (hash_seeds));
-	for (i = 0; i < ARRAY_LEN (hash_seeds); i++)
-	    hash_seeds[i] = r[i];
-
-	/* Mark all hash keys as been not-seen before. */
-	for (i = 0; i < ARRAY_LEN (hash_bitmap); i++)
-	    hash_bitmap[i] = 0;
-
-	time_last_seed_change = time_now;
-    }
-
-    next_index = node->cached_next_index;
-
-    while (n_left_from > 0)
-    {
-	u32 n_left_to_next;
-
-	vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-	while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	    u32 a0, b0, c0, m0, drop0;
-	    vlib_buffer_t *p0;
-	    u32 bi0, indi0, next0;
-	    const ip_null_dpo_t *ind0;
-	    uword bm0;
-
-	    bi0 = from[0];
-	    to_next[0] = bi0;
-	    from += 1;
-	    to_next += 1;
-	    n_left_from -= 1;
-	    n_left_to_next -= 1;
-
-	    p0 = vlib_get_buffer (vm, bi0);
-
-	    /* lookup dst + src mac */
-	    indi0 =  vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-	    ind0 = ip_null_dpo_get(indi0);
-	    next0 = IP_NULL_NEXT_DROP;
-
-	    /*
-	     * rate limit - don't DoS the sender.
-	     */
-	    a0 = hash_seeds[0];
-	    b0 = hash_seeds[1];
-	    c0 = hash_seeds[2];
-
-	    if (is_ip4)
-	    {
-		ip4_header_t *ip0 = vlib_buffer_get_current (p0);
-
-		a0 ^= ip0->dst_address.data_u32;
-		b0 ^= ip0->src_address.data_u32;
-
-		hash_v3_finalize32 (a0, b0, c0);
-	    }
-	    else
-	    {
-		ip6_header_t *ip0 = vlib_buffer_get_current (p0);
-
-		a0 ^= ip0->dst_address.as_u32[0];
-		b0 ^= ip0->src_address.as_u32[0];
-		c0 ^= ip0->src_address.as_u32[1];
-
-		hash_v3_mix32 (a0, b0, c0);
-
-		a0 ^= ip0->dst_address.as_u32[1];
-		b0 ^= ip0->src_address.as_u32[2];
-		c0 ^= ip0->src_address.as_u32[3];
-
-		hash_v3_finalize32 (a0, b0, c0);
-	    }
-
-	    c0 &= BITS (hash_bitmap) - 1;
-	    c0 = c0 / BITS (uword);
-	    m0 = (uword) 1 << (c0 % BITS (uword));
-
-	    bm0 = hash_bitmap[c0];
-	    drop0 = (bm0 & m0) != 0;
-
-	    /* Mark it as seen. */
-	    hash_bitmap[c0] = bm0 | m0;
-
-	    if (PREDICT_FALSE(!drop0))
-	    {
-		if (is_ip4)
-		{
-		    /*
-		     * There's a trade-off here. This conditinal statement
-		     * versus a graph node per-condition. Given the number
-		     * expect number of packets to reach a null route is 0
-		     * we favour the run-time cost over the graph complexity
-		     */
-		    if (IP_NULL_ACTION_SEND_ICMP_UNREACH == ind0->ind_action)
-		    {
-			next0 = IP_NULL_NEXT_ICMP;
-			icmp4_error_set_vnet_buffer(
-			    p0,
-			    ICMP4_destination_unreachable,
-			    ICMP4_destination_unreachable_destination_unreachable_host,
-			    0);
-		    }
-		    else if (IP_NULL_ACTION_SEND_ICMP_PROHIBIT == ind0->ind_action)
-		    {
-			next0 = IP_NULL_NEXT_ICMP;
-			icmp4_error_set_vnet_buffer(
-			    p0,
-			    ICMP4_destination_unreachable,
-			    ICMP4_destination_unreachable_host_administratively_prohibited,
-			    0);
-		    }
-		}
-		else
-		{
-		    if (IP_NULL_ACTION_SEND_ICMP_UNREACH == ind0->ind_action)
-		    {
-			next0 = IP_NULL_NEXT_ICMP;
-			icmp6_error_set_vnet_buffer(
-			    p0,
-			    ICMP6_destination_unreachable,
-			    ICMP6_destination_unreachable_no_route_to_destination,
-			    0);
-		    }
-		    else if (IP_NULL_ACTION_SEND_ICMP_PROHIBIT == ind0->ind_action)
-		    {
-			next0 = IP_NULL_NEXT_ICMP;
-			icmp6_error_set_vnet_buffer(
-			    p0,
-			    ICMP6_destination_unreachable,
-			    ICMP6_destination_unreachable_destination_administratively_prohibited,
-			    0);
-		    }
-		}
-	    }
-
-	    if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-		ip_null_dpo_trace_t *tr = vlib_add_trace (vm, node, p0,
-							  sizeof (*tr));
-		tr->ind_index = indi0;
-	    }
-	    vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					     n_left_to_next, bi0, next0);
-	}
-
-	vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-    return frame->n_vectors;
-}
-
-static u8 *
-format_ip_null_dpo_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip_null_dpo_trace_t *t = va_arg (*args, ip_null_dpo_trace_t *);
-
-  s = format (s, "%U", format_ip_null_dpo, t->ind_index, 0);
-  return s;
-}
-
-static uword
-ip4_null_dpo_switch (vlib_main_t * vm,
-		    vlib_node_runtime_t * node,
-		    vlib_frame_t * frame)
-{
-    return (ip_null_dpo_switch(vm, node, frame, 1));
-}
-
-/**
- * @brief
- */
-VLIB_REGISTER_NODE (ip4_null_dpo_node) = {
-  .function = ip4_null_dpo_switch,
-  .name = "ip4-null",
-  .vector_size = sizeof (u32),
-
-  .format_trace = format_ip_null_dpo_trace,
-  .n_next_nodes = IP_NULL_NEXT_NUM,
-  .next_nodes = {
-      [IP_NULL_NEXT_DROP] = "ip4-drop",
-      [IP_NULL_NEXT_ICMP] = "ip4-icmp-error",
-  },
-};
-
-static uword
-ip6_null_dpo_switch (vlib_main_t * vm,
-		    vlib_node_runtime_t * node,
-		    vlib_frame_t * frame)
-{
-    return (ip_null_dpo_switch(vm, node, frame, 0));
-}
-
-/**
- * @brief
- */
-VLIB_REGISTER_NODE (ip6_null_dpo_node) = {
-  .function = ip6_null_dpo_switch,
-  .name = "ip6-null",
-  .vector_size = sizeof (u32),
-
-  .format_trace = format_ip_null_dpo_trace,
-  .n_next_nodes = IP_NULL_NEXT_NUM,
-  .next_nodes = {
-      [IP_NULL_NEXT_DROP] = "ip6-drop",
-      [IP_NULL_NEXT_ICMP] = "ip6-icmp-error",
-  },
-};
-
-void
-ip_null_dpo_module_init (void)
-{
-    dpo_register(DPO_IP_NULL, &ip_null_vft, ip_null_nodes);
-}
diff --git a/vnet/vnet/dpo/ip_null_dpo.h b/vnet/vnet/dpo/ip_null_dpo.h
deleted file mode 100644
index 002a2a70..00000000
--- a/vnet/vnet/dpo/ip_null_dpo.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief
- * The IP NULL DPO represents the rubbish bin for IP traffic. Without specifying an
- * action (i.e. send IMCP type X to sender) it is equivalent to using a drop DPO.
- * However, in contrast to the drop DPO any route that resovles via a NULL, is
- * considered to 'resolved' by FIB, i.e. a IP NULL is used when the control plane
- * is explicitly expressing the desire to drop packets. Drop DPOs are used
- * internally by FIB when resolution is not possible.
- *
- * Any replies to sender are rate limited.
- */
-
-#ifndef __IP_NULL_DPO_H__
-#define __IP_NULL_DPO_H__
-
-#include <vnet/dpo/dpo.h>
-
-/**
- * @brief Actions to take when a packet encounters the NULL DPO
- */
-typedef enum ip_null_dpo_action_t_
-{
-    IP_NULL_ACTION_NONE,
-    IP_NULL_ACTION_SEND_ICMP_UNREACH,
-    IP_NULL_ACTION_SEND_ICMP_PROHIBIT,
-} ip_null_dpo_action_t;
-
-#define IP_NULL_ACTIONS {						\
-    [IP_NULL_ACTION_NONE] = "discard",					\
-    [IP_NULL_ACTION_SEND_ICMP_UNREACH] = "send-unreachable",		\
-    [IP_NULL_ACTION_SEND_ICMP_PROHIBIT] = "send-prohibited",		\
-}
-
-#define IP_NULL_DPO_ACTION_NUM (IP_NULL_ACTION_SEND_ICMP_PROHIBIT+1)
-
-extern void ip_null_dpo_add_and_lock (dpo_proto_t proto,
-				      ip_null_dpo_action_t action,
-				      dpo_id_t *dpo);
-
-extern void ip_null_dpo_module_init(void);
-
-#endif
diff --git a/vnet/vnet/dpo/load_balance.c b/vnet/vnet/dpo/load_balance.c
deleted file mode 100644
index a244776f..00000000
--- a/vnet/vnet/dpo/load_balance.c
+++ /dev/null
@@ -1,993 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/ip/lookup.h>
-#include <vnet/dpo/load_balance.h>
-#include <vnet/dpo/load_balance_map.h>
-#include <vnet/dpo/drop_dpo.h>
-#include <vppinfra/math.h>              /* for fabs */
-#include <vnet/adj/adj.h>
-#include <vnet/adj/adj_internal.h>
-#include <vnet/fib/fib_urpf_list.h>
-
-/*
- * distribution error tolerance for load-balancing
- */
-const f64 multipath_next_hop_error_tolerance = 0.1;
-
-#undef LB_DEBUG
-
-#ifdef LB_DEBUG
-#define LB_DBG(_lb, _fmt, _args...)                                     \
-{                                                                       \
-    u8* _tmp =NULL;                                                     \
-    clib_warning("lb:[%s]:" _fmt,                                       \
-                 load_balance_format(load_balance_get_index((_lb)),     \
-                                     0, _tmp),                          \
-                 ##_args);                                              \
-    vec_free(_tmp);                                                     \
-}
-#else
-#define LB_DBG(_p, _fmt, _args...)
-#endif
-
-
-/**
- * Pool of all DPOs. It's not static so the DP can have fast access
- */
-load_balance_t *load_balance_pool;
-
-/**
- * The one instance of load-balance main
- */
-load_balance_main_t load_balance_main;
-
-f64
-load_balance_get_multipath_tolerance (void)
-{
-    return (multipath_next_hop_error_tolerance);
-}
-
-static inline index_t
-load_balance_get_index (const load_balance_t *lb)
-{
-    return (lb - load_balance_pool);
-}
-
-static inline dpo_id_t*
-load_balance_get_buckets (load_balance_t *lb)
-{
-    if (LB_HAS_INLINE_BUCKETS(lb))
-    {
-        return (lb->lb_buckets_inline);
-    }
-    else
-    {
-        return (lb->lb_buckets);
-    }
-}
-
-static load_balance_t *
-load_balance_alloc_i (void)
-{
-    load_balance_t *lb;
-
-    pool_get_aligned(load_balance_pool, lb, CLIB_CACHE_LINE_BYTES);
-    memset(lb, 0, sizeof(*lb));
-
-    lb->lb_map = INDEX_INVALID;
-    lb->lb_urpf = INDEX_INVALID;
-    vlib_validate_combined_counter(&(load_balance_main.lbm_to_counters),
-                                   load_balance_get_index(lb));
-    vlib_validate_combined_counter(&(load_balance_main.lbm_via_counters),
-                                   load_balance_get_index(lb));
-    vlib_zero_combined_counter(&(load_balance_main.lbm_to_counters),
-                               load_balance_get_index(lb));
-    vlib_zero_combined_counter(&(load_balance_main.lbm_via_counters),
-                               load_balance_get_index(lb));
-
-    return (lb);
-}
-
-static u8*
-load_balance_format (index_t lbi,
-                     load_balance_format_flags_t flags,
-                     u32 indent,
-                     u8 *s)
-{
-    vlib_counter_t to, via;
-    load_balance_t *lb;
-    dpo_id_t *buckets;
-    u32 i;
-
-    lb = load_balance_get(lbi);
-    vlib_get_combined_counter(&(load_balance_main.lbm_to_counters), lbi, &to);
-    vlib_get_combined_counter(&(load_balance_main.lbm_via_counters), lbi, &via);
-    buckets = load_balance_get_buckets(lb);
-
-    s = format(s, "%U: ", format_dpo_type, DPO_LOAD_BALANCE);
-    s = format(s, "[index:%d buckets:%d ", lbi, lb->lb_n_buckets);
-    s = format(s, "uRPF:%d ", lb->lb_urpf);
-    s = format(s, "to:[%Ld:%Ld]", to.packets, to.bytes);
-    if (0 != via.packets)
-    {
-        s = format(s, " via:[%Ld:%Ld]",
-                   via.packets, via.bytes);
-    }
-    s = format(s, "]");
-
-    if (INDEX_INVALID != lb->lb_map)
-    {
-        s = format(s, "\n%U%U",
-                   format_white_space, indent+4,
-                   format_load_balance_map, lb->lb_map, indent+4);
-    }
-    for (i = 0; i < lb->lb_n_buckets; i++)
-    {
-        s = format(s, "\n%U[%d] %U",
-                   format_white_space, indent+2,
-                   i,
-                   format_dpo_id,
-                   &buckets[i], indent+6);
-    }
-    return (s);
-}
-
-u8*
-format_load_balance (u8 * s, va_list * args)
-{
-    index_t lbi = va_arg(*args, index_t);
-    load_balance_format_flags_t flags = va_arg(*args, load_balance_format_flags_t);
-
-    return (load_balance_format(lbi, flags, 0, s));
-}
-static u8*
-format_load_balance_dpo (u8 * s, va_list * args)
-{
-    index_t lbi = va_arg(*args, index_t);
-    u32 indent = va_arg(*args, u32);
-
-    return (load_balance_format(lbi, LOAD_BALANCE_FORMAT_DETAIL, indent, s));
-}
-
-
-static load_balance_t *
-load_balance_create_i (u32 num_buckets,
-                       dpo_proto_t lb_proto,
-                       flow_hash_config_t fhc)
-{
-    load_balance_t *lb;
-
-    lb = load_balance_alloc_i();
-    lb->lb_hash_config = fhc;
-    lb->lb_n_buckets = num_buckets;
-    lb->lb_n_buckets_minus_1 = num_buckets-1;
-    lb->lb_proto = lb_proto;
-
-    if (!LB_HAS_INLINE_BUCKETS(lb))
-    {
-        vec_validate_aligned(lb->lb_buckets,
-                             lb->lb_n_buckets - 1,
-                             CLIB_CACHE_LINE_BYTES);
-    }
-
-    LB_DBG(lb, "create");
-
-    return (lb);
-}
-
-index_t
-load_balance_create (u32 n_buckets,
-                     dpo_proto_t lb_proto,
-                     flow_hash_config_t fhc)
-{
-    return (load_balance_get_index(load_balance_create_i(n_buckets, lb_proto, fhc)));
-}
-
-static inline void
-load_balance_set_bucket_i (load_balance_t *lb,
-                           u32 bucket,
-                           dpo_id_t *buckets,
-                           const dpo_id_t *next)
-{
-    dpo_stack(DPO_LOAD_BALANCE, lb->lb_proto, &buckets[bucket], next);
-}
-
-void
-load_balance_set_bucket (index_t lbi,
-                         u32 bucket,
-                         const dpo_id_t *next)
-{
-    load_balance_t *lb;
-    dpo_id_t *buckets;
-
-    lb = load_balance_get(lbi);
-    buckets = load_balance_get_buckets(lb);
-
-    ASSERT(bucket < lb->lb_n_buckets);
-
-    load_balance_set_bucket_i(lb, bucket, buckets, next);
-}
-
-int
-load_balance_is_drop (const dpo_id_t *dpo)
-{
-    load_balance_t *lb;
-
-    if (DPO_LOAD_BALANCE != dpo->dpoi_type)
-        return (0);
-
-    lb = load_balance_get(dpo->dpoi_index);
-
-    if (1 == lb->lb_n_buckets)
-    {
-        return (dpo_is_drop(load_balance_get_bucket_i(lb, 0)));
-    }
-    return (0);
-}
-
-void
-load_balance_set_urpf (index_t lbi,
-		       index_t urpf)
-{
-    load_balance_t *lb;
-    index_t old;
-
-    lb = load_balance_get(lbi);
-
-    /*
-     * packets in flight we see this change. but it's atomic, so :P
-     */
-    old = lb->lb_urpf;
-    lb->lb_urpf = urpf;
-
-    fib_urpf_list_unlock(old);
-    fib_urpf_list_lock(urpf);
-}
-
-index_t
-load_balance_get_urpf (index_t lbi)
-{
-    load_balance_t *lb;
-
-    lb = load_balance_get(lbi);
-
-    return (lb->lb_urpf);
-}
-
-const dpo_id_t *
-load_balance_get_bucket (index_t lbi,
-                         u32 bucket)
-{
-    load_balance_t *lb;
-
-    lb = load_balance_get(lbi);
-
-    return (load_balance_get_bucket_i(lb, bucket));
-}
-
-static int
-next_hop_sort_by_weight (load_balance_path_t * n1,
-                         load_balance_path_t * n2)
-{
-    return ((int) n1->path_weight - (int) n2->path_weight);
-}
-
-/* Given next hop vector is over-written with normalized one with sorted weights and
-   with weights corresponding to the number of adjacencies for each next hop.
-   Returns number of adjacencies in block. */
-u32
-ip_multipath_normalize_next_hops (load_balance_path_t * raw_next_hops,
-                                  load_balance_path_t ** normalized_next_hops,
-                                  u32 *sum_weight_in,
-                                  f64 multipath_next_hop_error_tolerance)
-{
-    load_balance_path_t * nhs;
-    uword n_nhs, n_adj, n_adj_left, i, sum_weight;
-    f64 norm, error;
-
-    n_nhs = vec_len (raw_next_hops);
-    ASSERT (n_nhs > 0);
-    if (n_nhs == 0)
-        return 0;
-
-    /* Allocate enough space for 2 copies; we'll use second copy to save original weights. */
-    nhs = *normalized_next_hops;
-    vec_validate (nhs, 2*n_nhs - 1);
-
-    /* Fast path: 1 next hop in block. */
-    n_adj = n_nhs;
-    if (n_nhs == 1)
-    {
-        nhs[0] = raw_next_hops[0];
-        nhs[0].path_weight = 1;
-        _vec_len (nhs) = 1;
-        sum_weight = 1;
-        goto done;
-    }
-
-    else if (n_nhs == 2)
-    {
-        int cmp = next_hop_sort_by_weight (&raw_next_hops[0], &raw_next_hops[1]) < 0;
-
-        /* Fast sort. */
-        nhs[0] = raw_next_hops[cmp];
-        nhs[1] = raw_next_hops[cmp ^ 1];
-
-        /* Fast path: equal cost multipath with 2 next hops. */
-        if (nhs[0].path_weight == nhs[1].path_weight)
-        {
-            nhs[0].path_weight = nhs[1].path_weight = 1;
-            _vec_len (nhs) = 2;
-            sum_weight = 2;
-            goto done;
-        }
-    }
-    else
-    {
-        clib_memcpy (nhs, raw_next_hops, n_nhs * sizeof (raw_next_hops[0]));
-        qsort (nhs, n_nhs, sizeof (nhs[0]), (void *) next_hop_sort_by_weight);
-    }
-
-    /* Find total weight to normalize weights. */
-    sum_weight = 0;
-    for (i = 0; i < n_nhs; i++)
-        sum_weight += nhs[i].path_weight;
-
-    /* In the unlikely case that all weights are given as 0, set them all to 1. */
-    if (sum_weight == 0)
-    {
-        for (i = 0; i < n_nhs; i++)
-            nhs[i].path_weight = 1;
-        sum_weight = n_nhs;
-    }
-
-    /* Save copies of all next hop weights to avoid being overwritten in loop below. */
-    for (i = 0; i < n_nhs; i++)
-        nhs[n_nhs + i].path_weight = nhs[i].path_weight;
-
-    /* Try larger and larger power of 2 sized adjacency blocks until we
-       find one where traffic flows to within 1% of specified weights. */
-    for (n_adj = max_pow2 (n_nhs); ; n_adj *= 2)
-    {
-        error = 0;
-
-        norm = n_adj / ((f64) sum_weight);
-        n_adj_left = n_adj;
-        for (i = 0; i < n_nhs; i++)
-        {
-            f64 nf = nhs[n_nhs + i].path_weight * norm; /* use saved weights */
-            word n = flt_round_nearest (nf);
-
-            n = n > n_adj_left ? n_adj_left : n;
-            n_adj_left -= n;
-            error += fabs (nf - n);
-            nhs[i].path_weight = n;
-
-            if (0 == nhs[i].path_weight)
-            {
-                /*
-                 * when the weight skew is high (norm is small) and n == nf.
-                 * without this correction the path with a low weight would have
-                 * no represenation in the load-balanace - don't want that.
-                 * If the weight skew is high so the load-balance has many buckets
-                 * to allow it. pays ya money takes ya choice.
-                 */
-                error = n_adj;
-                break;
-            }
-        }
-
-        nhs[0].path_weight += n_adj_left;
-
-        /* Less than 5% average error per adjacency with this size adjacency block? */
-        if (error <= multipath_next_hop_error_tolerance*n_adj)
-        {
-            /* Truncate any next hops with zero weight. */
-            _vec_len (nhs) = i;
-            break;
-        }
-    }
-
-done:
-    /* Save vector for next call. */
-    *normalized_next_hops = nhs;
-    *sum_weight_in = sum_weight;
-    return n_adj;
-}
-
-static load_balance_path_t *
-load_balance_multipath_next_hop_fixup (load_balance_path_t *nhs,
-                                       dpo_proto_t drop_proto)
-{
-    if (0 == vec_len(nhs))
-    {
-        load_balance_path_t *nh;
-
-        /*
-         * we need something for the load-balance. so use the drop
-         */
-        vec_add2(nhs, nh, 1);
-
-        nh->path_weight = 1;
-        dpo_copy(&nh->path_dpo, drop_dpo_get(drop_proto));
-    }
-
-    return (nhs);
-}
-
-/*
- * Fill in adjacencies in block based on corresponding
- * next hop adjacencies.
- */
-static void
-load_balance_fill_buckets (load_balance_t *lb,
-                           load_balance_path_t *nhs,
-                           dpo_id_t *buckets,
-                           u32 n_buckets)
-{
-    load_balance_path_t * nh;
-    u16 ii, bucket;
-
-    bucket = 0;
-
-    /*
-     * the next-hops have normalised weights. that means their sum is the number
-     * of buckets we need to fill.
-     */
-    vec_foreach (nh, nhs)
-    {
-        for (ii = 0; ii < nh->path_weight; ii++)
-        {
-            ASSERT(bucket < n_buckets);
-            load_balance_set_bucket_i(lb, bucket++, buckets, &nh->path_dpo);
-        }
-    }
-}
-
-static inline void
-load_balance_set_n_buckets (load_balance_t *lb,
-                            u32 n_buckets)
-{
-    lb->lb_n_buckets = n_buckets;
-    lb->lb_n_buckets_minus_1 = n_buckets-1;
-}
-
-void
-load_balance_multipath_update (const dpo_id_t *dpo,
-                               load_balance_path_t * raw_next_hops,
-                               load_balance_flags_t flags)
-{
-    u32 sum_of_weights,n_buckets, ii;
-    load_balance_path_t * nh, * nhs;
-    index_t lbmi, old_lbmi;
-    load_balance_t *lb;
-    dpo_id_t *tmp_dpo;
-
-    nhs = NULL;
-
-    ASSERT(DPO_LOAD_BALANCE == dpo->dpoi_type);
-    lb = load_balance_get(dpo->dpoi_index);
-    raw_next_hops =
-        load_balance_multipath_next_hop_fixup(raw_next_hops,
-                                              lb->lb_proto);
-    n_buckets =
-        ip_multipath_normalize_next_hops(raw_next_hops,
-                                         &nhs,
-                                         &sum_of_weights,
-                                         multipath_next_hop_error_tolerance);
-
-    ASSERT (n_buckets >= vec_len (raw_next_hops));
-
-    /*
-     * Save the old load-balance map used, and get a new one if required.
-     */
-    old_lbmi = lb->lb_map;
-    if (flags & LOAD_BALANCE_FLAG_USES_MAP)
-    {
-        lbmi = load_balance_map_add_or_lock(n_buckets, sum_of_weights, nhs);
-    }
-    else
-    {
-        lbmi = INDEX_INVALID;
-    }
-
-    if (0 == lb->lb_n_buckets)
-    {
-        /*
-         * first time initialisation. no packets inflight, so we can write
-         * at leisure.
-         */
-        load_balance_set_n_buckets(lb, n_buckets);
-
-        if (!LB_HAS_INLINE_BUCKETS(lb))
-            vec_validate_aligned(lb->lb_buckets,
-                                 lb->lb_n_buckets - 1,
-                                 CLIB_CACHE_LINE_BYTES);
-
-        load_balance_fill_buckets(lb, nhs,
-                                  load_balance_get_buckets(lb),
-                                  n_buckets);
-        lb->lb_map = lbmi;
-    }
-    else
-    {
-        /*
-         * This is a modification of an existing load-balance.
-         * We need to ensure that packets inflight see a consistent state, that
-         * is the number of reported buckets the LB has (read from
-         * lb_n_buckets_minus_1) is not more than it actually has. So if the
-         * number of buckets is increasing, we must update the bucket array first,
-         * then the reported number. vice-versa if the number of buckets goes down.
-         */
-        if (n_buckets == lb->lb_n_buckets)
-        {
-            /*
-             * no change in the number of buckets. we can simply fill what
-             * is new over what is old.
-             */
-            load_balance_fill_buckets(lb, nhs,
-                                      load_balance_get_buckets(lb),
-                                      n_buckets);
-            lb->lb_map = lbmi;
-        }
-        else if (n_buckets > lb->lb_n_buckets)
-        {
-            /*
-             * we have more buckets. the old load-balance map (if there is one)
-             * will remain valid, i.e. mapping to indices within range, so we
-             * update it last.
-             */
-            if (n_buckets > LB_NUM_INLINE_BUCKETS &&
-                lb->lb_n_buckets <= LB_NUM_INLINE_BUCKETS)
-            {
-                /*
-                 * the new increased number of buckets is crossing the threshold
-                 * from the inline storage to out-line. Alloc the outline buckets
-                 * first, then fixup the number. then reset the inlines.
-                 */
-                ASSERT(NULL == lb->lb_buckets);
-                vec_validate_aligned(lb->lb_buckets,
-                                     n_buckets - 1,
-                                     CLIB_CACHE_LINE_BYTES);
-
-                load_balance_fill_buckets(lb, nhs,
-                                          lb->lb_buckets,
-                                          n_buckets);
-                CLIB_MEMORY_BARRIER();
-                load_balance_set_n_buckets(lb, n_buckets);
-
-                CLIB_MEMORY_BARRIER();
-
-                for (ii = 0; ii < LB_NUM_INLINE_BUCKETS; ii++)
-                {
-                    dpo_reset(&lb->lb_buckets_inline[ii]);
-                }
-            }
-            else
-            {
-                if (n_buckets <= LB_NUM_INLINE_BUCKETS)
-                {
-                    /*
-                     * we are not crossing the threshold and it's still inline buckets.
-                     * we can write the new on the old..
-                     */
-                    load_balance_fill_buckets(lb, nhs,
-                                              load_balance_get_buckets(lb),
-                                              n_buckets);
-                    CLIB_MEMORY_BARRIER();
-                    load_balance_set_n_buckets(lb, n_buckets);
-                }
-                else
-                {
-                    /*
-                     * we are not crossing the threshold. We need a new bucket array to
-                     * hold the increased number of choices.
-                     */
-                    dpo_id_t *new_buckets, *old_buckets, *tmp_dpo;
-
-                    new_buckets = NULL;
-                    old_buckets = load_balance_get_buckets(lb);
-
-                    vec_validate_aligned(new_buckets,
-                                         n_buckets - 1,
-                                         CLIB_CACHE_LINE_BYTES);
-
-                    load_balance_fill_buckets(lb, nhs, new_buckets, n_buckets);
-                    CLIB_MEMORY_BARRIER();
-                    lb->lb_buckets = new_buckets;
-                    CLIB_MEMORY_BARRIER();
-                    load_balance_set_n_buckets(lb, n_buckets);
-
-                    vec_foreach(tmp_dpo, old_buckets)
-                    {
-                        dpo_reset(tmp_dpo);
-                    }
-                    vec_free(old_buckets);
-                }
-            }
-
-            /*
-             * buckets fixed. ready for the MAP update.
-             */
-            lb->lb_map = lbmi;
-        }
-        else
-        {
-            /*
-             * bucket size shrinkage.
-             * Any map we have will be based on the old
-             * larger number of buckets, so will be translating to indices
-             * out of range. So the new MAP must be installed first.
-             */
-            lb->lb_map = lbmi;
-            CLIB_MEMORY_BARRIER();
-
-
-            if (n_buckets <= LB_NUM_INLINE_BUCKETS &&
-                lb->lb_n_buckets > LB_NUM_INLINE_BUCKETS)
-            {
-                /*
-                 * the new decreased number of buckets is crossing the threshold
-                 * from out-line storage to inline:
-                 *   1 - Fill the inline buckets,
-                 *   2 - fixup the number (and this point the inline buckets are
-                 *       used).
-                 *   3 - free the outline buckets
-                 */
-                load_balance_fill_buckets(lb, nhs,
-                                          lb->lb_buckets_inline,
-                                          n_buckets);
-                CLIB_MEMORY_BARRIER();
-                load_balance_set_n_buckets(lb, n_buckets);
-                CLIB_MEMORY_BARRIER();
-
-                vec_foreach(tmp_dpo, lb->lb_buckets)
-                {
-                    dpo_reset(tmp_dpo);
-                }
-                vec_free(lb->lb_buckets);
-            }
-            else
-            {
-                /*
-                 * not crossing the threshold.
-                 *  1 - update the number to the smaller size
-                 *  2 - write the new buckets
-                 *  3 - reset those no longer used.
-                 */
-                dpo_id_t *buckets;
-                u32 old_n_buckets;
-
-                old_n_buckets = lb->lb_n_buckets;
-                buckets = load_balance_get_buckets(lb);
-
-                load_balance_set_n_buckets(lb, n_buckets);
-                CLIB_MEMORY_BARRIER();
-
-                load_balance_fill_buckets(lb, nhs,
-                                          buckets,
-                                          n_buckets);
-
-                for (ii = old_n_buckets-n_buckets; ii < old_n_buckets; ii++)
-                {
-                    dpo_reset(&buckets[ii]);
-                }
-            }
-        }
-    }
-
-    vec_foreach (nh, nhs)
-    {
-        dpo_reset(&nh->path_dpo);
-    }
-    vec_free(nhs);
-
-    load_balance_map_unlock(old_lbmi);
-}
-
-static void
-load_balance_lock (dpo_id_t *dpo)
-{
-    load_balance_t *lb;
-
-    lb = load_balance_get(dpo->dpoi_index);
-
-    lb->lb_locks++;
-}
-
-static void
-load_balance_destroy (load_balance_t *lb)
-{
-    dpo_id_t *buckets;
-    int i;
-
-    buckets = load_balance_get_buckets(lb);
-
-    for (i = 0; i < lb->lb_n_buckets; i++)
-    {
-        dpo_reset(&buckets[i]);
-    }
-
-    LB_DBG(lb, "destroy");
-    if (!LB_HAS_INLINE_BUCKETS(lb))
-    {
-        vec_free(lb->lb_buckets);
-    }
-
-    fib_urpf_list_unlock(lb->lb_urpf);
-    load_balance_map_unlock(lb->lb_map);
-
-    pool_put(load_balance_pool, lb);
-}
-
-static void
-load_balance_unlock (dpo_id_t *dpo)
-{
-    load_balance_t *lb;
-
-    lb = load_balance_get(dpo->dpoi_index);
-
-    lb->lb_locks--;
-
-    if (0 == lb->lb_locks)
-    {
-        load_balance_destroy(lb);
-    }
-}
-
-static void
-load_balance_mem_show (void)
-{
-    fib_show_memory_usage("load-balance",
-			  pool_elts(load_balance_pool),
-			  pool_len(load_balance_pool),
-			  sizeof(load_balance_t));
-    load_balance_map_show_mem();
-}
-
-const static dpo_vft_t lb_vft = {
-    .dv_lock = load_balance_lock,
-    .dv_unlock = load_balance_unlock,
-    .dv_format = format_load_balance_dpo,
-    .dv_mem_show = load_balance_mem_show,
-};
-
-/**
- * @brief The per-protocol VLIB graph nodes that are assigned to a load-balance
- *        object.
- *
- * this means that these graph nodes are ones from which a load-balance is the
- * parent object in the DPO-graph.
- *
- * We do not list all the load-balance nodes, such as the *-lookup. instead
- * we are relying on the correct use of the .sibling_of field when setting
- * up these sibling nodes.
- */
-const static char* const load_balance_ip4_nodes[] =
-{
-    "ip4-load-balance",
-    NULL,
-};
-const static char* const load_balance_ip6_nodes[] =
-{
-    "ip6-load-balance",
-    NULL,
-};
-const static char* const load_balance_mpls_nodes[] =
-{
-    "mpls-load-balance",
-    NULL,
-};
-const static char* const load_balance_l2_nodes[] =
-{
-    "l2-load-balance",
-    NULL,
-};
-const static char* const * const load_balance_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = load_balance_ip4_nodes,
-    [DPO_PROTO_IP6]  = load_balance_ip6_nodes,
-    [DPO_PROTO_MPLS] = load_balance_mpls_nodes,
-    [DPO_PROTO_ETHERNET] = load_balance_l2_nodes,
-};
-
-void
-load_balance_module_init (void)
-{
-    dpo_register(DPO_LOAD_BALANCE, &lb_vft, load_balance_nodes);
-
-    load_balance_map_module_init();
-}
-
-static clib_error_t *
-load_balance_show (vlib_main_t * vm,
-                   unformat_input_t * input,
-                   vlib_cli_command_t * cmd)
-{
-    index_t lbi = INDEX_INVALID;
-
-    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-        if (unformat (input, "%d", &lbi))
-            ;
-        else
-            break;
-    }
-
-    if (INDEX_INVALID != lbi)
-    {
-        vlib_cli_output (vm, "%U", format_load_balance, lbi,
-                         LOAD_BALANCE_FORMAT_DETAIL);
-    }
-    else
-    {
-        load_balance_t *lb;
-
-        pool_foreach(lb, load_balance_pool,
-        ({
-            vlib_cli_output (vm, "%U", format_load_balance,
-                             load_balance_get_index(lb),
-                             LOAD_BALANCE_FORMAT_NONE);
-        }));
-    }
-
-    return 0;
-}
-
-VLIB_CLI_COMMAND (load_balance_show_command, static) = {
-    .path = "show load-balance",
-    .short_help = "show load-balance [<index>]",
-    .function = load_balance_show,
-};
-
-
-always_inline u32
-ip_flow_hash (void *data)
-{
-  ip4_header_t *iph = (ip4_header_t *) data;
-
-  if ((iph->ip_version_and_header_length & 0xF0) == 0x40)
-    return ip4_compute_flow_hash (iph, IP_FLOW_HASH_DEFAULT);
-  else
-    return ip6_compute_flow_hash ((ip6_header_t *) iph, IP_FLOW_HASH_DEFAULT);
-}
-
-always_inline u64
-mac_to_u64 (u8 * m)
-{
-  return (*((u64 *) m) & 0xffffffffffff);
-}
-
-always_inline u32
-l2_flow_hash (vlib_buffer_t * b0)
-{
-  ethernet_header_t *eh;
-  u64 a, b, c;
-  uword is_ip, eh_size;
-  u16 eh_type;
-
-  eh = vlib_buffer_get_current (b0);
-  eh_type = clib_net_to_host_u16 (eh->type);
-  eh_size = ethernet_buffer_header_size (b0);
-
-  is_ip = (eh_type == ETHERNET_TYPE_IP4 || eh_type == ETHERNET_TYPE_IP6);
-
-  /* since we have 2 cache lines, use them */
-  if (is_ip)
-    a = ip_flow_hash ((u8 *) vlib_buffer_get_current (b0) + eh_size);
-  else
-    a = eh->type;
-
-  b = mac_to_u64 ((u8 *) eh->dst_address);
-  c = mac_to_u64 ((u8 *) eh->src_address);
-  hash_mix64 (a, b, c);
-
-  return (u32) c;
-}
-
-typedef struct load_balance_trace_t_
-{
-    index_t lb_index;
-} load_balance_trace_t;
-
-static uword
-l2_load_balance (vlib_main_t * vm,
-		 vlib_node_runtime_t * node,
-		 vlib_frame_t * frame)
-{
-  u32 n_left_from, next_index, *from, *to_next;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *b0;
-	  u32 bi0, lbi0, next0;
-	  const dpo_id_t *dpo0;
-	  const load_balance_t *lb0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  /* lookup dst + src mac */
-	  lbi0 =  vnet_buffer (b0)->ip.adj_index[VLIB_TX];
-	  lb0 = load_balance_get(lbi0);
-
-	  vnet_buffer(b0)->ip.flow_hash = l2_flow_hash(b0);
-
-	  dpo0 = load_balance_get_bucket_i(lb0, 
-					   vnet_buffer(b0)->ip.flow_hash &
-					   (lb0->lb_n_buckets_minus_1));
-
-	  next0 = dpo0->dpoi_next_node;
-	  vnet_buffer (b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      load_balance_trace_t *tr = vlib_add_trace (vm, node, b0,
-							 sizeof (*tr));
-	      tr->lb_index = lbi0;
-	    }
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-static u8 *
-format_load_balance_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  load_balance_trace_t *t = va_arg (*args, load_balance_trace_t *);
-
-  s = format (s, "L2-load-balance: index %d", t->lb_index);
-  return s;
-}
-
-/**
- * @brief
- */
-VLIB_REGISTER_NODE (l2_load_balance_node) = {
-  .function = l2_load_balance,
-  .name = "l2-load-balance",
-  .vector_size = sizeof (u32),
-
-  .format_trace = format_load_balance_trace,
-  .n_next_nodes = 1,
-  .next_nodes = {
-      [0] = "error-drop",
-  },
-};
diff --git a/vnet/vnet/dpo/load_balance.h b/vnet/vnet/dpo/load_balance.h
deleted file mode 100644
index dc6485e6..00000000
--- a/vnet/vnet/dpo/load_balance.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * \brief
- * The load-balance object represents an ECMP choice. The buckets of a load
- * balance object point to the sub-graph after the choice is made.
- * THe load-balance object is also object type returned from a FIB table lookup.
- * As such it needs to represent the case where there is only one coice. It may
- * seem like overkill to use a load-balance object in this case, but the reason
- * is for performance. If the load-balance object were not the result of the FIB
- * lookup, then some other object would be. The case where there was ECMP
- * this other object would need a load-balance as a parent and hence just add
- * an unnecessary indirection.
- *
- * It is also the object in the DP that represents a via-fib-entry in a recursive
- * route.
- *
- */
-
-#ifndef __LOAD_BALANCE_H__
-#define __LOAD_BALANCE_H__
-
-#include <vlib/vlib.h>
-#include <vnet/ip/lookup.h>
-#include <vnet/dpo/dpo.h>
-#include <vnet/fib/fib_types.h>
-
-/**
- * Load-balance main
- */
-typedef struct load_balance_main_t_
-{
-    vlib_combined_counter_main_t lbm_to_counters;
-    vlib_combined_counter_main_t lbm_via_counters;
-} load_balance_main_t;
-
-extern load_balance_main_t load_balance_main;
-
-/**
- * The number of buckets that a load-balance object can have and still
- * fit in one cache-line
- */
-#define LB_NUM_INLINE_BUCKETS 4
-
-/**
- * @brief One path from an [EU]CMP set that the client wants to add to a
- * load-balance object
- */
-typedef struct load_balance_path_t_ {
-    /**
-     * ID of the Data-path object.
-     */
-    dpo_id_t path_dpo;
-
-    /**
-     * The index of the FIB path
-     */
-    fib_node_index_t path_index;
-
-    /**
-     * weight for the path.
-     */
-    u32 path_weight;
-} load_balance_path_t;
-
-/**
- * The FIB DPO provieds;
- *  - load-balancing over the next DPOs in the chain/graph
- *  - per-route counters
- */
-typedef struct load_balance_t_ {
-    /**
-     * number of buckets in the load-balance. always a power of 2.
-     */
-    u16 lb_n_buckets;
-    /**
-     * number of buckets in the load-balance - 1. used in the switch path
-     * as part of the hash calculation.
-     */
-    u16 lb_n_buckets_minus_1;
-
-   /**
-     * The protocol of packets that traverse this LB.
-     * need in combination with the flow hash config to determine how to hash.
-     * u8.
-     */
-    dpo_proto_t lb_proto;
-
-    /**
-     * The number of locks, which is approximately the number of users,
-     * of this load-balance.
-     * Load-balance objects of via-entries are heavily shared by recursives,
-     * so the lock count is a u32.
-     */
-    u32 lb_locks;
-
-    /**
-     * index of the load-balance map, INVALID if this LB does not use one
-     */
-    index_t lb_map;
-
-    /**
-     * This is the index of the uRPF list for this LB
-     */
-    index_t lb_urpf;
-
-    /**
-     * the hash config to use when selecting a bucket. this is a u16
-     */
-    flow_hash_config_t lb_hash_config;
-
-    /**
-     * Vector of buckets containing the next DPOs, sized as lbo_num
-     */
-    dpo_id_t *lb_buckets;
-
-    /**
-     * The rest of the cache line is used for buckets. In the common case
-     * where there there are less than 4 buckets, then the buckets are
-     * on the same cachlie and we save ourselves a pointer dereferance in 
-     * the data-path.
-     */
-    dpo_id_t lb_buckets_inline[LB_NUM_INLINE_BUCKETS];
-} load_balance_t;
-
-STATIC_ASSERT(sizeof(load_balance_t) <= CLIB_CACHE_LINE_BYTES,
-	      "A load_balance object size exceeds one cachline");
-
-/**
- * Flags controlling load-balance formatting/display
- */
-typedef enum load_balance_format_flags_t_ {
-    LOAD_BALANCE_FORMAT_NONE,
-    LOAD_BALANCE_FORMAT_DETAIL = (1 << 0),
-} load_balance_format_flags_t;
-
-/**
- * Flags controlling load-balance creation and modification
- */
-typedef enum load_balance_flags_t_ {
-    LOAD_BALANCE_FLAG_NONE = 0,
-    LOAD_BALANCE_FLAG_USES_MAP = (1 << 0),
-} load_balance_flags_t;
-
-extern index_t load_balance_create(u32 num_buckets,
-				   dpo_proto_t lb_proto,
-				   flow_hash_config_t fhc);
-extern void load_balance_multipath_update(
-    const dpo_id_t *dpo,
-    load_balance_path_t * raw_next_hops,
-    load_balance_flags_t flags);
-
-extern void load_balance_set_bucket(index_t lbi,
-				    u32 bucket,
-				    const dpo_id_t *next);
-extern void load_balance_set_urpf(index_t lbi,
-				  index_t urpf);
-extern index_t load_balance_get_urpf(index_t lbi);
-
-extern u8* format_load_balance(u8 * s, va_list * args);
-
-extern const dpo_id_t *load_balance_get_bucket(index_t lbi,
-					       u32 bucket);
-extern int load_balance_is_drop(const dpo_id_t *dpo);
-
-extern f64 load_balance_get_multipath_tolerance(void);
-
-/**
- * The encapsulation breakages are for fast DP access
- */
-extern load_balance_t *load_balance_pool;
-static inline load_balance_t*
-load_balance_get (index_t lbi)
-{
-    return (pool_elt_at_index(load_balance_pool, lbi));
-}
-
-#define LB_HAS_INLINE_BUCKETS(_lb)		\
-    ((_lb)->lb_n_buckets <= LB_NUM_INLINE_BUCKETS)
-
-static inline const dpo_id_t *
-load_balance_get_bucket_i (const load_balance_t *lb,
-			   u32 bucket)
-{
-    ASSERT(bucket < lb->lb_n_buckets);
-
-    if (PREDICT_TRUE(LB_HAS_INLINE_BUCKETS(lb)))
-    {
-	return (&lb->lb_buckets_inline[bucket]);
-    }
-    else
-    {
-	return (&lb->lb_buckets[bucket]);
-    }
-}
-
-extern void load_balance_module_init(void);
-
-#endif
diff --git a/vnet/vnet/dpo/load_balance_map.c b/vnet/vnet/dpo/load_balance_map.c
deleted file mode 100644
index 70ce1bf7..00000000
--- a/vnet/vnet/dpo/load_balance_map.c
+++ /dev/null
@@ -1,575 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief
- */
-#include <vnet/fib/fib_path.h>
-#include <vnet/fib/fib_node_list.h>
-#include <vnet/dpo/load_balance_map.h>
-#include <vnet/dpo/load_balance.h>
-
-/**
- * A hash-table of load-balance maps by path index.
- * this provides the fast lookup of the LB map when a path goes down
- */
-static uword *lb_maps_by_path_index;
-
-/**
- * A hash-table of load-balance maps by set of paths.
- * This provides the LB map sharing.
- * LB maps do not necessarily use all the paths in the list, since
- * the entry that is requesting the map, may not have an out-going
- * label for each of the paths.
- */
-static uword *load_balance_map_db;
-
-typedef enum load_balance_map_path_flags_t_
-{
-    LOAD_BALANCE_MAP_PATH_UP     = (1 << 0),
-    LOAD_BALANCE_MAP_PATH_USABLE = (1 << 1),
-} __attribute__ ((packed)) load_balance_map_path_flags_t;
-
-typedef struct load_balance_map_path_t_ {
-    /**
-     * Index of the path
-     */
-    fib_node_index_t lbmp_index;
-
-    /**
-     * Sibling Index in the list of all maps with this path index
-     */
-    fib_node_index_t lbmp_sibling;
-
-    /**
-     * the normalised wegiht of the path
-     */
-    u32 lbmp_weight;
-
-    /**
-     * The sate of the path
-     */
-    load_balance_map_path_flags_t lbmp_flags;
-} load_balance_map_path_t;
-
-/**
- * The global pool of LB maps
- */
-load_balance_map_t *load_balance_map_pool;
-
-/*
- * Debug macro
- */
-#ifdef FIB_DEBUG
-#define LOAD_BALANCE_MAP_DBG(_pl, _fmt, _args...)       \
-    {                                                   \
-        clib_warning("lbm: FIXME" _fmt,                 \
-                     ##_args);                          \
-    }
-#else
-#define LOAD_BALANCE_MAP_DBG(_pl, _fmt, _args...)
-#endif
-
-static index_t
-load_balance_map_get_index (load_balance_map_t *lbm)
-{
-    return (lbm - load_balance_map_pool);
-}
-
-u8*
-format_load_balance_map (u8 *s, va_list ap)
-{
-    index_t lbmi = va_arg(ap, index_t);
-    u32 indent = va_arg(ap, u32);
-    load_balance_map_t *lbm;
-    u32 n_buckets, ii;
-
-    lbm = load_balance_map_get(lbmi);
-    n_buckets = vec_len(lbm->lbm_buckets);
-
-    s = format(s, "load-balance-map: index:%d buckets:%d", lbmi, n_buckets);
-    s = format(s, "\n%U index:", format_white_space, indent+2);
-    for (ii = 0; ii < n_buckets; ii++)
-    {
-        s = format(s, "%5d", ii);
-    }
-    s = format(s, "\n%U   map:", format_white_space, indent+2);
-    for (ii = 0; ii < n_buckets; ii++)
-    {
-        s = format(s, "%5d", lbm->lbm_buckets[ii]);
-    }
-
-    return (s);
-}
-
-
-static uword
-load_balance_map_hash (load_balance_map_t *lbm)
-{
-    u32 old_lbm_hash, new_lbm_hash, hash;
-    load_balance_map_path_t *lb_path;
-
-    new_lbm_hash = old_lbm_hash = vec_len(lbm->lbm_paths);
-
-    vec_foreach (lb_path, lbm->lbm_paths)
-    {
-        hash = lb_path->lbmp_index;
-        hash_mix32(hash, old_lbm_hash, new_lbm_hash);
-    }
-
-    return (new_lbm_hash);
-}
-
-always_inline uword
-load_balance_map_db_hash_key_from_index (uword index)
-{
-    return 1 + 2*index;
-}
-
-always_inline uword
-load_balance_map_db_hash_key_is_index (uword key)
-{
-    return key & 1;
-}
-
-always_inline uword
-load_balance_map_db_hash_key_2_index (uword key)
-{
-    ASSERT (load_balance_map_db_hash_key_is_index (key));
-    return key / 2;
-}
-
-static load_balance_map_t*
-load_balance_map_db_get_from_hash_key (uword key)
-{
-    load_balance_map_t *lbm;
-
-    if (load_balance_map_db_hash_key_is_index (key))
-    {
-        index_t lbm_index;
-
-        lbm_index = load_balance_map_db_hash_key_2_index(key);
-        lbm = load_balance_map_get(lbm_index);
-    }
-    else
-    {
-        lbm = uword_to_pointer (key, load_balance_map_t *);
-    }
-
-    return (lbm);
-}
-
-static uword
-load_balance_map_db_hash_key_sum (hash_t * h,
-                                  uword key)
-{
-    load_balance_map_t *lbm;
-
-    lbm = load_balance_map_db_get_from_hash_key(key);
-
-    return (load_balance_map_hash(lbm));
-}
-
-static uword
-load_balance_map_db_hash_key_equal (hash_t * h,
-                                    uword key1,
-                                    uword key2)
-{
-    load_balance_map_t *lbm1, *lbm2;
-
-    lbm1 = load_balance_map_db_get_from_hash_key(key1);
-    lbm2 = load_balance_map_db_get_from_hash_key(key2);
-
-    return (load_balance_map_hash(lbm1) ==
-            load_balance_map_hash(lbm2));
-}
-
-static index_t
-load_balance_map_db_find (load_balance_map_t *lbm)
-{
-    uword *p;
-
-    p = hash_get(load_balance_map_db, lbm);
-
-    if (NULL != p)
-    {
-        return p[0];
-    }
-
-    return (FIB_NODE_INDEX_INVALID);
-}
-
-static void
-load_balance_map_db_insert (load_balance_map_t *lbm)
-{
-    load_balance_map_path_t *lbmp;
-    fib_node_list_t list;
-    uword *p;
-
-    ASSERT(FIB_NODE_INDEX_INVALID == load_balance_map_db_find(lbm));
-
-    /*
-     * insert into the DB based on the set of paths.
-     */
-    hash_set (load_balance_map_db,
-              load_balance_map_db_hash_key_from_index(
-                  load_balance_map_get_index(lbm)),
-              load_balance_map_get_index(lbm));
-
-    /*
-     * insert into each per-path list.
-     */
-    vec_foreach(lbmp, lbm->lbm_paths)
-    {
-        p = hash_get(lb_maps_by_path_index, lbmp->lbmp_index);
-
-        if (NULL == p)
-        {
-            list = fib_node_list_create();
-            hash_set(lb_maps_by_path_index, lbmp->lbmp_index, list);
-        }
-        else
-        {
-            list = p[0];
-        }
-
-        lbmp->lbmp_sibling =
-            fib_node_list_push_front(list,
-                                     0, FIB_NODE_TYPE_FIRST,
-                                     load_balance_map_get_index(lbm));
-    }
-
-    LOAD_BALANCE_MAP_DBG(lbm, "DB-inserted");
-}
-
-static void
-load_balance_map_db_remove (load_balance_map_t *lbm)
-{
-    load_balance_map_path_t *lbmp;
-    uword *p;
-
-    ASSERT(FIB_NODE_INDEX_INVALID != load_balance_map_db_find(lbm));
-
-    hash_unset(load_balance_map_db,
-               load_balance_map_db_hash_key_from_index(
-                   load_balance_map_get_index(lbm)));
-
-    /*
-     * remove from each per-path list.
-     */
-    vec_foreach(lbmp, lbm->lbm_paths)
-    {
-        p = hash_get(lb_maps_by_path_index, lbmp->lbmp_index);
-
-        ASSERT(NULL != p);
-
-        fib_node_list_remove(p[0], lbmp->lbmp_sibling);
-    }
-
-    LOAD_BALANCE_MAP_DBG(lbm, "DB-removed");
-}
-
-/**
- * @brief from the paths that are usable, fill the Map.
- */
-static void
-load_balance_map_fill (load_balance_map_t *lbm)
-{
-    load_balance_map_path_t *lbmp;
-    u32 n_buckets, bucket, ii, jj;
-    u16 *tmp_buckets;
-
-    tmp_buckets = NULL;
-    n_buckets = vec_len(lbm->lbm_buckets);
-
-    /*
-     * run throught the set of paths once, and build a vector of the
-     * indices that are usable. we do this is a scratch space, since we
-     * need to refer to it multiple times as we build the real buckets.
-     */
-    vec_validate(tmp_buckets, n_buckets-1);
-
-    bucket = jj = 0;
-    vec_foreach (lbmp, lbm->lbm_paths)
-    {
-        if (fib_path_is_resolved(lbmp->lbmp_index))
-        {
-            for (ii = 0; ii < lbmp->lbmp_weight; ii++)
-            {
-                tmp_buckets[jj++] = bucket++;
-            }
-        }
-        else 
-        {
-            bucket += lbmp->lbmp_weight;
-        }
-    }
-    _vec_len(tmp_buckets) = jj;
-
-    /*
-     * If the number of temporaries written is as many as we need, implying
-     * all paths were up, then we can simply copy the scratch area over the
-     * actual buckets' memory
-     */
-    if (jj == n_buckets)
-    {
-        memcpy(lbm->lbm_buckets,
-               tmp_buckets,
-               sizeof(lbm->lbm_buckets[0]) * n_buckets);
-    }
-    else
-    {
-        /*
-         * one or more paths are down.
-         */
-        if (0 == vec_len(tmp_buckets))
-        {
-            /*
-             * if the scratch area is empty, then no paths are usable.
-             * they will all drop. so use them all, lest we account drops
-             * against only one.
-             */
-            for (bucket = 0; bucket < n_buckets; bucket++)
-            {
-                lbm->lbm_buckets[bucket] = bucket;
-            }
-        }
-        else
-        {
-            bucket = jj = 0;
-            vec_foreach (lbmp, lbm->lbm_paths)
-            {
-                if (fib_path_is_resolved(lbmp->lbmp_index))
-                {
-                    for (ii = 0; ii < lbmp->lbmp_weight; ii++)
-                    {
-                        lbm->lbm_buckets[bucket] = bucket;
-                        bucket++;
-                    }
-                }
-                else
-                {
-                    /*
-                     * path is unusable
-                     * cycle through the scratch space selecting a index.
-                     * this means we load balance, in the intended ratio,
-                     * over the paths that are still usable.
-                     */
-                    for (ii = 0; ii < lbmp->lbmp_weight; ii++)
-                    {
-                        lbm->lbm_buckets[bucket] = tmp_buckets[jj];
-                        jj = (jj + 1) % vec_len(tmp_buckets);
-                        bucket++;
-                    }
-                }
-            }
-       }
-    }
-
-    vec_free(tmp_buckets);
-}
-
-static load_balance_map_t*
-load_balance_map_alloc (const load_balance_path_t *paths)
-{
-    load_balance_map_t *lbm;
-    u32 ii;
-
-    pool_get_aligned(load_balance_map_pool, lbm, CLIB_CACHE_LINE_BYTES);
-    memset(lbm, 0, sizeof(*lbm));
-
-    vec_validate(lbm->lbm_paths, vec_len(paths)-1);
-
-    vec_foreach_index(ii, paths)
-    {
-        lbm->lbm_paths[ii].lbmp_index  = paths[ii].path_index;
-        lbm->lbm_paths[ii].lbmp_weight = paths[ii].path_weight;
-    }
-
-    return (lbm);
-}
-
-static load_balance_map_t *
-load_balance_map_init (load_balance_map_t *lbm,
-                       u32 n_buckets,
-                       u32 sum_of_weights)
-{
-    lbm->lbm_sum_of_norm_weights = sum_of_weights;
-    vec_validate(lbm->lbm_buckets, n_buckets-1);
-
-    load_balance_map_db_insert(lbm);
-
-    load_balance_map_fill(lbm);
-
-    return (lbm);
-}
-
-index_t
-load_balance_map_add_or_lock (u32 n_buckets,
-                              u32 sum_of_weights,
-                              const load_balance_path_t *paths)
-{
-    load_balance_map_t *tmp, *lbm;
-    index_t lbmi;
-
-    tmp = load_balance_map_alloc(paths);
-
-    lbmi = load_balance_map_db_find(tmp);
-
-    if (INDEX_INVALID == lbmi)
-    {
-        lbm = load_balance_map_init(tmp, n_buckets, sum_of_weights);
-    }
-    else
-    {
-        lbm = load_balance_map_get(lbmi);
-    }
-
-    lbm->lbm_locks++;
-
-    return (load_balance_map_get_index(lbm));
-}
-
-void
-load_balance_map_lock (index_t lbmi)
-{
-    load_balance_map_t *lbm;
-
-    lbm = load_balance_map_get(lbmi);
-
-    lbm->lbm_locks++;
-}
-
-void
-load_balance_map_unlock (index_t lbmi)
-{
-    load_balance_map_t *lbm;
-
-    if (INDEX_INVALID == lbmi)
-    {
-        return;
-    }
-
-    lbm = load_balance_map_get(lbmi);
-
-    lbm->lbm_locks--;
-
-    if (0 == lbm->lbm_locks)
-    {
-        load_balance_map_db_remove(lbm);
-        vec_free(lbm->lbm_paths);
-        vec_free(lbm->lbm_buckets);
-        pool_put(load_balance_map_pool, lbm);
-    }
-}
-
-static int
-load_balance_map_path_state_change_walk (fib_node_ptr_t *fptr,
-                                         void *ctx)
-{
-    load_balance_map_t *lbm;
-
-    lbm = load_balance_map_get(fptr->fnp_index);
-
-    load_balance_map_fill(lbm);
-
-    return (!0);
-}
-
-/**
- * @brief the state of a path has changed (it has no doubt gone down).
- * This is the trigger to perform a PIC edge cutover and update the maps
- * to exclude this path.
- */
-void
-load_balance_map_path_state_change (fib_node_index_t path_index)
-{
-    uword *p;
-
-    /*
-     * re-stripe the buckets for each affect MAP
-     */
-    p = hash_get(lb_maps_by_path_index, path_index);
-
-    if (NULL == p)
-        return;
-
-    fib_node_list_walk(p[0], load_balance_map_path_state_change_walk, NULL);
-}
-
-/**
- * @brief Make/add a new or lock an existing Load-balance map
- */
-void
-load_balance_map_module_init (void)
-{
-    load_balance_map_db =
-        hash_create2 (/* elts */ 0,
-                      /* user */ 0,
-                      /* value_bytes */ sizeof (index_t),
-                      load_balance_map_db_hash_key_sum,
-                      load_balance_map_db_hash_key_equal,
-                      /* format pair/arg */
-                      0, 0);
-
-    lb_maps_by_path_index = hash_create(0, sizeof(fib_node_list_t));
-}
-
-void
-load_balance_map_show_mem (void)
-{
-    fib_show_memory_usage("Load-Balance Map",
-			  pool_elts(load_balance_map_pool),
-			  pool_len(load_balance_map_pool),
-			  sizeof(load_balance_map_t));
-}
-
-static clib_error_t *
-load_balance_map_show (vlib_main_t * vm,
-                       unformat_input_t * input,
-                       vlib_cli_command_t * cmd)
-{
-    index_t lbmi = INDEX_INVALID;
-
-    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-        if (unformat (input, "%d", &lbmi))
-            ;
-        else
-            break;
-    }
-
-    if (INDEX_INVALID != lbmi)
-    {
-        vlib_cli_output (vm, "%U", format_load_balance_map, lbmi, 0);
-    }
-    else
-    {
-        load_balance_map_t *lbm;
-
-        pool_foreach(lbm, load_balance_map_pool,
-        ({
-            vlib_cli_output (vm, "%U", format_load_balance_map,
-                             load_balance_map_get_index(lbm), 0);
-        }));
-    }
-
-    return 0;
-}
-
-VLIB_CLI_COMMAND (load_balance_map_show_command, static) = {
-    .path = "show load-balance-map",
-    .short_help = "show load-balance-map [<index>]",
-    .function = load_balance_map_show,
-};
diff --git a/vnet/vnet/dpo/load_balance_map.h b/vnet/vnet/dpo/load_balance_map.h
deleted file mode 100644
index 454bf4b3..00000000
--- a/vnet/vnet/dpo/load_balance_map.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief
- */
-
-#ifndef __LOAD_BALANCE_MAP_H__
-#define __LOAD_BALANCE_MAP_H__
-
-#include <vlib/vlib.h>
-#include <vnet/fib/fib_types.h>
-#include <vnet/dpo/load_balance.h>
-
-struct load_balance_map_path_t_;
-
-/**
- */
-typedef struct load_balance_map_t_ {
-    /**
-     * The buckets of the map that provide the index to index translation.
-     * In the first cacheline.
-     */
-    u16 *lbm_buckets;
-
-    /**
-     * the vector of paths this MAP represents
-     */
-    struct load_balance_map_path_t_ *lbm_paths;
-
-    /**
-     * the sum of the normalised weights. cache for convenience
-     */
-    u32 lbm_sum_of_norm_weights;
-
-    /**
-     * Number of locks. Maps are shared by a large number of recrusvie fib_entry_ts
-     */
-    u32 lbm_locks;
-} load_balance_map_t;
-
-extern index_t load_balance_map_add_or_lock(u32 n_buckets,
-                                            u32 sum_of_weights,
-                                            const load_balance_path_t *norm_paths);
-
-extern void load_balance_map_lock(index_t lmbi);
-extern void load_balance_map_unlock(index_t lbmi);
-
-extern void load_balance_map_path_state_change(fib_node_index_t path_index);
-
-extern u8* format_load_balance_map(u8 *s, va_list ap);
-extern void load_balance_map_show_mem(void);
-
-/**
- * The encapsulation breakages are for fast DP access
- */
-extern load_balance_map_t *load_balance_map_pool;
-
-static inline load_balance_map_t*
-load_balance_map_get (index_t lbmi)
-{
-    return (pool_elt_at_index(load_balance_map_pool, lbmi));
-}
-
-
-extern void load_balance_map_module_init(void);
-
-#endif
diff --git a/vnet/vnet/dpo/lookup_dpo.c b/vnet/vnet/dpo/lookup_dpo.c
deleted file mode 100644
index 96fedd27..00000000
--- a/vnet/vnet/dpo/lookup_dpo.c
+++ /dev/null
@@ -1,1185 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/ip/ip.h>
-#include <vnet/dpo/lookup_dpo.h>
-#include <vnet/dpo/load_balance.h>
-#include <vnet/mpls/mpls.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/fib/mpls_fib.h>
-
-static const char *const lookup_input_names[] = LOOKUP_INPUTS;
-
-/**
- * @brief Enumeration of the lookup subtypes
- */
-typedef enum lookup_sub_type_t_
-{
-    LOOKUP_SUB_TYPE_SRC,
-    LOOKUP_SUB_TYPE_DST,
-    LOOKUP_SUB_TYPE_DST_TABLE_FROM_INTERFACE,
-} lookup_sub_type_t;
-#define LOOKUP_SUB_TYPE_NUM (LOOKUP_SUB_TYPE_DST_TABLE_FROM_INTERFACE+1)
-
-#define FOR_EACH_LOOKUP_SUB_TYPE(_st)                                   \
-    for (_st = LOOKUP_SUB_TYPE_IP4_SRC; _st < LOOKUP_SUB_TYPE_NUM; _st++)
-
-/**
- * @brief pool of all MPLS Label DPOs
- */
-lookup_dpo_t *lookup_dpo_pool;
-
-/**
- * @brief An array of registered DPO type values for the sub-types
- */
-static dpo_type_t lookup_dpo_sub_types[LOOKUP_SUB_TYPE_NUM];
-
-static lookup_dpo_t *
-lookup_dpo_alloc (void)
-{
-    lookup_dpo_t *lkd;
-
-    pool_get_aligned(lookup_dpo_pool, lkd, CLIB_CACHE_LINE_BYTES);
-
-    return (lkd);
-}
-
-static index_t
-lookup_dpo_get_index (lookup_dpo_t *lkd)
-{
-    return (lkd - lookup_dpo_pool);
-}
-
-static void
-lookup_dpo_add_or_lock_i (fib_node_index_t fib_index,
-                          dpo_proto_t proto,
-                          lookup_input_t input,
-                          lookup_table_t table_config,
-                          dpo_id_t *dpo)
-{
-    lookup_dpo_t *lkd;
-    dpo_type_t type;
-
-    lkd = lookup_dpo_alloc();
-    lkd->lkd_fib_index = fib_index;
-    lkd->lkd_proto = proto;
-    lkd->lkd_input = input;
-    lkd->lkd_table = table_config;
-
-    /*
-     * use the input type to select the lookup sub-type
-     */
-    type = 0;
-
-    switch (input)
-    {
-    case LOOKUP_INPUT_SRC_ADDR:
-        type = lookup_dpo_sub_types[LOOKUP_SUB_TYPE_SRC];
-        break;
-    case LOOKUP_INPUT_DST_ADDR:
-        switch (table_config)
-        {
-        case LOOKUP_TABLE_FROM_INPUT_INTERFACE:
-            type = lookup_dpo_sub_types[LOOKUP_SUB_TYPE_DST_TABLE_FROM_INTERFACE];
-            break;
-        case LOOKUP_TABLE_FROM_CONFIG:
-            type = lookup_dpo_sub_types[LOOKUP_SUB_TYPE_DST];
-            break;
-        }
-    }
-
-    if (0 == type)
-    {
-        dpo_reset(dpo);
-    }
-    else
-    {
-        dpo_set(dpo, type, proto, lookup_dpo_get_index(lkd));
-    }
-}
-
-void
-lookup_dpo_add_or_lock_w_fib_index (fib_node_index_t fib_index,
-                                    dpo_proto_t proto,
-                                    lookup_input_t input,
-                                    lookup_table_t table_config,
-                                    dpo_id_t *dpo)
-{
-    if (LOOKUP_TABLE_FROM_CONFIG == table_config)
-    {
-	fib_table_lock(fib_index, dpo_proto_to_fib(proto));
-    }
-    lookup_dpo_add_or_lock_i(fib_index, proto, input, table_config, dpo);
-}
-
-void
-lookup_dpo_add_or_lock_w_table_id (u32 table_id,
-                                   dpo_proto_t proto,
-                                   lookup_input_t input,
-                                   lookup_table_t table_config,
-                                   dpo_id_t *dpo)
-{
-    fib_node_index_t fib_index = FIB_NODE_INDEX_INVALID;
-
-    if (LOOKUP_TABLE_FROM_CONFIG == table_config)
-    {
-	fib_index =
-	    fib_table_find_or_create_and_lock(dpo_proto_to_fib(proto),
-					      table_id);
-    }
-
-    ASSERT(FIB_NODE_INDEX_INVALID != fib_index);
-    lookup_dpo_add_or_lock_i(fib_index, proto, input, table_config, dpo);    
-}
-
-u8*
-format_lookup_dpo (u8 *s, va_list *args)
-{
-    index_t index = va_arg (*args, index_t);
-    lookup_dpo_t *lkd;
-
-    lkd = lookup_dpo_get(index);
-
-    if (LOOKUP_TABLE_FROM_INPUT_INTERFACE == lkd->lkd_table)
-    {
-        s = format(s, "%s lookup in interface's %U table",
-                   lookup_input_names[lkd->lkd_input],
-                   format_dpo_proto, lkd->lkd_proto);
-    }
-    else
-    {
-	s = format(s, "%s lookup in %U",
-		   lookup_input_names[lkd->lkd_input],
-		   format_fib_table_name, lkd->lkd_fib_index,
-		   dpo_proto_to_fib(lkd->lkd_proto));
-    }
-    return (s);
-}
-
-static void
-lookup_dpo_lock (dpo_id_t *dpo)
-{
-    lookup_dpo_t *lkd;
-
-    lkd = lookup_dpo_get(dpo->dpoi_index);
-
-    lkd->lkd_locks++;
-}
-
-static void
-lookup_dpo_unlock (dpo_id_t *dpo)
-{
-    lookup_dpo_t *lkd;
-
-    lkd = lookup_dpo_get(dpo->dpoi_index);
-
-    lkd->lkd_locks--;
-
-    if (0 == lkd->lkd_locks)
-    {
-        if (LOOKUP_TABLE_FROM_CONFIG == lkd->lkd_table)
-        {
-	    fib_table_unlock(lkd->lkd_fib_index,
-			     dpo_proto_to_fib(lkd->lkd_proto));
-        }
-        pool_put(lookup_dpo_pool, lkd);
-    }
-}
-
-always_inline void
-ip4_src_fib_lookup_one (u32 src_fib_index0,
-                        const ip4_address_t * addr0,
-                        u32 * src_adj_index0)
-{
-    ip4_fib_mtrie_leaf_t leaf0, leaf1;
-    ip4_fib_mtrie_t * mtrie0;
-
-    mtrie0 = &ip4_fib_get (src_fib_index0)->mtrie;
-
-    leaf0 = leaf1 = IP4_FIB_MTRIE_LEAF_ROOT;
-    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 0);
-    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 1);
-    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 2);
-    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 3);
-
-    /* Handle default route. */
-    leaf0 = (leaf0 == IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie0->default_leaf : leaf0);
-    src_adj_index0[0] = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
-}
-
-always_inline void
-ip4_src_fib_lookup_two (u32 src_fib_index0,
-                        u32 src_fib_index1,
-                        const ip4_address_t * addr0,
-                        const ip4_address_t * addr1,
-                        u32 * src_adj_index0,
-                        u32 * src_adj_index1)
-{
-    ip4_fib_mtrie_leaf_t leaf0, leaf1;
-    ip4_fib_mtrie_t * mtrie0, * mtrie1;
-
-    mtrie0 = &ip4_fib_get (src_fib_index0)->mtrie;
-    mtrie1 = &ip4_fib_get (src_fib_index1)->mtrie;
-
-    leaf0 = leaf1 = IP4_FIB_MTRIE_LEAF_ROOT;
-
-    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 0);
-    leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, addr1, 0);
-
-    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 1);
-    leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, addr1, 1);
-
-    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 2);
-    leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, addr1, 2);
-
-    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, addr0, 3);
-    leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, addr1, 3);
-
-    /* Handle default route. */
-    leaf0 = (leaf0 == IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie0->default_leaf : leaf0);
-    leaf1 = (leaf1 == IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie1->default_leaf : leaf1);
-    src_adj_index0[0] = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
-    src_adj_index1[0] = ip4_fib_mtrie_leaf_get_adj_index (leaf1);
-}
-
-/**
- * @brief Lookup trace  data
- */
-typedef struct lookup_trace_t_
-{
-    union {
-	ip46_address_t addr;
-	mpls_unicast_header_t hdr;
-    };
-    fib_node_index_t fib_index;
-    index_t lbi;
-} lookup_trace_t;
-
-
-always_inline uword
-lookup_dpo_ip4_inline (vlib_main_t * vm,
-                       vlib_node_runtime_t * node,
-                       vlib_frame_t * from_frame,
-                       int input_src_addr,
-                       int table_from_interface)
-{
-    u32 n_left_from, next_index, * from, * to_next;
-    u32 cpu_index = os_get_cpu_number();
-    vlib_combined_counter_main_t * cm = &load_balance_main.lbm_to_counters;
-
-    from = vlib_frame_vector_args (from_frame);
-    n_left_from = from_frame->n_vectors;
-
-    next_index = node->cached_next_index;
-
-    while (n_left_from > 0)
-    {
-        u32 n_left_to_next;
-
-        vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
-
-	while (n_left_from >= 4 && n_left_to_next > 2)
-	{
-	    u32 bi0, lkdi0, lbi0, fib_index0, next0, hash_c0;
-	    flow_hash_config_t flow_hash_config0;
-	    const ip4_address_t *input_addr0;
-	    const load_balance_t *lb0;
-	    const lookup_dpo_t * lkd0;
-	    const ip4_header_t * ip0;
-	    const dpo_id_t *dpo0;
-	    vlib_buffer_t * b0;
-	    u32 bi1, lkdi1, lbi1, fib_index1, next1, hash_c1;
-	    flow_hash_config_t flow_hash_config1;
-	    const ip4_address_t *input_addr1;
-	    const load_balance_t *lb1;
-	    const lookup_dpo_t * lkd1;
-	    const ip4_header_t * ip1;
-	    const dpo_id_t *dpo1;
-	    vlib_buffer_t * b1;
-
-	    /* Prefetch next iteration. */
-	    {
-		vlib_buffer_t * p2, * p3;
-
-		p2 = vlib_get_buffer (vm, from[2]);
-		p3 = vlib_get_buffer (vm, from[3]);
-
-		vlib_prefetch_buffer_header (p2, LOAD);
-		vlib_prefetch_buffer_header (p3, LOAD);
-
-		CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-		CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    }
-
-	    bi0 = from[0];
-	    to_next[0] = bi0;
-	    bi1 = from[1];
-	    to_next[1] = bi1;
-	    from += 2;
-	    to_next += 2;
-	    n_left_from -= 2;
-	    n_left_to_next -= 2;
-
-	    b0 = vlib_get_buffer (vm, bi0);
-	    ip0 = vlib_buffer_get_current (b0);
-	    b1 = vlib_get_buffer (vm, bi1);
-	    ip1 = vlib_buffer_get_current (b1);
-
-	    /* dst lookup was done by ip4 lookup */
-	    lkdi0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
-	    lkdi1 = vnet_buffer(b1)->ip.adj_index[VLIB_TX];
-	    lkd0 = lookup_dpo_get(lkdi0);
-	    lkd1 = lookup_dpo_get(lkdi1);
-
-	    /*
-	     * choose between a lookup using the fib index in the DPO
-	     * or getting the FIB index from the interface.
-	     */
-	    if (table_from_interface)
-	    {
-		fib_index0 =
-		    ip4_fib_table_get_index_for_sw_if_index(
-			vnet_buffer(b0)->sw_if_index[VLIB_RX]);
-		fib_index1 =
-		    ip4_fib_table_get_index_for_sw_if_index(
-			vnet_buffer(b1)->sw_if_index[VLIB_RX]);
-	    }
-	    else
-	    {
-		fib_index0 = lkd0->lkd_fib_index;
-		fib_index1 = lkd1->lkd_fib_index;
-	    }
-
-	    /*
-	     * choose between a source or destination address lookup in the table
-	     */
-	    if (input_src_addr)
-	    {
-		input_addr0 = &ip0->src_address;
-		input_addr1 = &ip1->src_address;
-	    }
-	    else
-	    {
-		input_addr0 = &ip0->dst_address;
-		input_addr1 = &ip1->dst_address;
-	    }
-
-	    /* do lookup */
-	    ip4_src_fib_lookup_two (fib_index0, fib_index1,
-                                    input_addr0, input_addr1,
-                                    &lbi0, &lbi1);
-	    lb0 = load_balance_get(lbi0);
-	    lb1 = load_balance_get(lbi1);
-
-            vnet_buffer(b0)->sw_if_index[VLIB_TX] = fib_index0;
-            vnet_buffer(b1)->sw_if_index[VLIB_TX] = fib_index1;
-
-	    /* Use flow hash to compute multipath adjacency. */
-	    hash_c0 = vnet_buffer (b0)->ip.flow_hash = 0;
-	    hash_c1 = vnet_buffer (b1)->ip.flow_hash = 0;
-
-	    if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
-	    {
-		flow_hash_config0 = lb0->lb_hash_config;
-		hash_c0 = vnet_buffer (b0)->ip.flow_hash =
-		    ip4_compute_flow_hash (ip0, flow_hash_config0);
-	    }
-
-	    if (PREDICT_FALSE (lb1->lb_n_buckets > 1))
-	    {
-		flow_hash_config1 = lb1->lb_hash_config;
-		hash_c1 = vnet_buffer (b1)->ip.flow_hash =
-		    ip4_compute_flow_hash (ip1, flow_hash_config1);
-	    }
-
-	    dpo0 = load_balance_get_bucket_i(lb0,
-					     (hash_c0 &
-					      (lb0->lb_n_buckets_minus_1)));
-	    dpo1 = load_balance_get_bucket_i(lb1,
-					     (hash_c1 &
-					      (lb1->lb_n_buckets_minus_1)));
-
-	    next0 = dpo0->dpoi_next_node;
-	    next1 = dpo1->dpoi_next_node;
-	    vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-	    vnet_buffer(b1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
-
-	    vlib_increment_combined_counter
-		(cm, cpu_index, lbi0, 1,
-		 vlib_buffer_length_in_chain (vm, b0));
-	    vlib_increment_combined_counter
-		(cm, cpu_index, lbi1, 1,
-		 vlib_buffer_length_in_chain (vm, b1));
-
-	    if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-		lookup_trace_t *tr = vlib_add_trace (vm, node,
-						     b0, sizeof (*tr));
-		tr->fib_index = fib_index0;
-		tr->lbi = lbi0;
-		tr->addr.ip4 = *input_addr0;
-	    }
-	    if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-		lookup_trace_t *tr = vlib_add_trace (vm, node,
-						     b1, sizeof (*tr));
-		tr->fib_index = fib_index1;
-		tr->lbi = lbi1;
-		tr->addr.ip4 = *input_addr1;
-	    }
-
-	    vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					     to_next, n_left_to_next,
-					     bi0, bi1, next0, next1);
-	}
-
-	while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	    u32 bi0, lkdi0, lbi0, fib_index0, next0, hash_c0;
-	    flow_hash_config_t flow_hash_config0;
-	    const ip4_address_t *input_addr;
-	    const load_balance_t *lb0;
-	    const lookup_dpo_t * lkd0;
-	    const ip4_header_t * ip0;
-	    const dpo_id_t *dpo0;
-	    vlib_buffer_t * b0;
-
-	    bi0 = from[0];
-	    to_next[0] = bi0;
-	    from += 1;
-	    to_next += 1;
-	    n_left_from -= 1;
-	    n_left_to_next -= 1;
-
-	    b0 = vlib_get_buffer (vm, bi0);
-	    ip0 = vlib_buffer_get_current (b0);
-
-	    /* dst lookup was done by ip4 lookup */
-	    lkdi0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
-	    lkd0 = lookup_dpo_get(lkdi0);
-
-	    /*
-	     * choose between a lookup using the fib index in the DPO
-	     * or getting the FIB index from the interface.
-	     */
-	    if (table_from_interface)
-	    {
-		fib_index0 =
-		    ip4_fib_table_get_index_for_sw_if_index(
-			vnet_buffer(b0)->sw_if_index[VLIB_RX]);
-	    }
-	    else
-	    {
-		fib_index0 = lkd0->lkd_fib_index;
-	    }
-
-	    /*
-	     * choose between a source or destination address lookup in the table
-	     */
-	    if (input_src_addr)
-	    {
-		input_addr = &ip0->src_address;
-	    }
-	    else
-	    {
-		input_addr = &ip0->dst_address;
-	    }
-
-	    /* do lookup */
-	    ip4_src_fib_lookup_one (fib_index0, input_addr, &lbi0);
-	    lb0 = load_balance_get(lbi0);
-
-            vnet_buffer(b0)->sw_if_index[VLIB_TX] = fib_index0;
-
-	    /* Use flow hash to compute multipath adjacency. */
-	    hash_c0 = vnet_buffer (b0)->ip.flow_hash = 0;
-
-	    if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
-	    {
-		flow_hash_config0 = lb0->lb_hash_config;
-		hash_c0 = vnet_buffer (b0)->ip.flow_hash =
-		    ip4_compute_flow_hash (ip0, flow_hash_config0);
-	    }
-
-	    dpo0 = load_balance_get_bucket_i(lb0,
-					     (hash_c0 &
-					      (lb0->lb_n_buckets_minus_1)));
-
-	    next0 = dpo0->dpoi_next_node;
-	    vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-
-	    vlib_increment_combined_counter
-		(cm, cpu_index, lbi0, 1,
-		 vlib_buffer_length_in_chain (vm, b0));
-
-	    if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-		lookup_trace_t *tr = vlib_add_trace (vm, node,
-						     b0, sizeof (*tr));
-		tr->fib_index = fib_index0;
-		tr->lbi = lbi0;
-		tr->addr.ip4 = *input_addr;
-	    }
-
-	    vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
-					    n_left_to_next, bi0, next0);
-	}
-        vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-    return from_frame->n_vectors;
-}
-
-static u8 *
-format_lookup_trace (u8 * s, va_list * args)
-{
-    CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-    CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-    lookup_trace_t * t = va_arg (*args, lookup_trace_t *);
-    uword indent = format_get_indent (s);
-    s = format (s, "%U fib-index:%d addr:%U load-balance:%d",
-                format_white_space, indent,
-                t->fib_index,
-                format_ip46_address, &t->addr, IP46_TYPE_ANY,
-                t->lbi);
-    return s;
-}
-
-always_inline uword
-lookup_ip4_dst (vlib_main_t * vm,
-                vlib_node_runtime_t * node,
-                vlib_frame_t * from_frame)
-{
-    return (lookup_dpo_ip4_inline(vm, node, from_frame, 0, 0));
-}
-
-VLIB_REGISTER_NODE (lookup_ip4_dst_node) = {
-    .function = lookup_ip4_dst,
-    .name = "lookup-ip4-dst",
-    .vector_size = sizeof (u32),
-    .sibling_of = "ip4-lookup",
-    .format_trace = format_lookup_trace,
-};
-VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip4_dst_node, lookup_ip4_dst)
-
-always_inline uword
-lookup_ip4_dst_itf (vlib_main_t * vm,
-                    vlib_node_runtime_t * node,
-                    vlib_frame_t * from_frame)
-{
-    return (lookup_dpo_ip4_inline(vm, node, from_frame, 0, 1));
-}
-
-VLIB_REGISTER_NODE (lookup_ip4_dst_itf_node) = {
-    .function = lookup_ip4_dst_itf,
-    .name = "lookup-ip4-dst-itf",
-    .vector_size = sizeof (u32),
-    .sibling_of = "ip4-lookup",
-    .format_trace = format_lookup_trace,
-};
-VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip4_dst_itf_node, lookup_ip4_dst_itf)
-
-always_inline uword
-lookup_ip4_src (vlib_main_t * vm,
-                vlib_node_runtime_t * node,
-                vlib_frame_t * from_frame)
-{
-    return (lookup_dpo_ip4_inline(vm, node, from_frame, 1, 0));
-}
-
-VLIB_REGISTER_NODE (lookup_ip4_src_node) = {
-    .function = lookup_ip4_src,
-    .name = "lookup-ip4-src",
-    .vector_size = sizeof (u32),
-    .format_trace = format_lookup_trace,
-    .sibling_of = "ip4-lookup",
-};
-VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip4_src_node, lookup_ip4_src)
-
-always_inline uword
-lookup_dpo_ip6_inline (vlib_main_t * vm,
-                       vlib_node_runtime_t * node,
-                       vlib_frame_t * from_frame,
-                       int input_src_addr,
-                       int table_from_interface)
-{
-    vlib_combined_counter_main_t * cm = &load_balance_main.lbm_to_counters;
-    u32 n_left_from, next_index, * from, * to_next;
-    u32 cpu_index = os_get_cpu_number();
-
-    from = vlib_frame_vector_args (from_frame);
-    n_left_from = from_frame->n_vectors;
-
-    next_index = node->cached_next_index;
-
-    while (n_left_from > 0)
-    {
-        u32 n_left_to_next;
-
-        vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
-
-	while (n_left_from >= 4 && n_left_to_next > 2)
-	{
-	    u32 bi0, lkdi0, lbi0, fib_index0, next0, hash_c0;
-	    flow_hash_config_t flow_hash_config0;
-	    const ip6_address_t *input_addr0;
-	    const load_balance_t *lb0;
-	    const lookup_dpo_t * lkd0;
-	    const ip6_header_t * ip0;
-	    const dpo_id_t *dpo0;
-	    vlib_buffer_t * b0;
-	    u32 bi1, lkdi1, lbi1, fib_index1, next1, hash_c1;
-	    flow_hash_config_t flow_hash_config1;
-	    const ip6_address_t *input_addr1;
-	    const load_balance_t *lb1;
-	    const lookup_dpo_t * lkd1;
-	    const ip6_header_t * ip1;
-	    const dpo_id_t *dpo1;
-	    vlib_buffer_t * b1;
-
-	    /* Prefetch next iteration. */
-	    {
-		vlib_buffer_t * p2, * p3;
-
-		p2 = vlib_get_buffer (vm, from[2]);
-		p3 = vlib_get_buffer (vm, from[3]);
-
-		vlib_prefetch_buffer_header (p2, LOAD);
-		vlib_prefetch_buffer_header (p3, LOAD);
-
-		CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-		CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    }
-
-	    bi0 = from[0];
-	    to_next[0] = bi0;
-	    bi1 = from[1];
-	    to_next[1] = bi1;
-	    from += 2;
-	    to_next += 2;
-	    n_left_from -= 2;
-	    n_left_to_next -= 2;
-
-	    b0 = vlib_get_buffer (vm, bi0);
-	    ip0 = vlib_buffer_get_current (b0);
-	    b1 = vlib_get_buffer (vm, bi1);
-	    ip1 = vlib_buffer_get_current (b1);
-
-	    /* dst lookup was done by ip6 lookup */
-	    lkdi0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
-	    lkdi1 = vnet_buffer(b1)->ip.adj_index[VLIB_TX];
-	    lkd0 = lookup_dpo_get(lkdi0);
-	    lkd1 = lookup_dpo_get(lkdi1);
-
-	    /*
-	     * choose between a lookup using the fib index in the DPO
-	     * or getting the FIB index from the interface.
-	     */
-	    if (table_from_interface)
-	    {
-		fib_index0 =
-		    ip6_fib_table_get_index_for_sw_if_index(
-			vnet_buffer(b0)->sw_if_index[VLIB_RX]);
-		fib_index1 =
-		    ip6_fib_table_get_index_for_sw_if_index(
-			vnet_buffer(b1)->sw_if_index[VLIB_RX]);
-	    }
-	    else
-	    {
-		fib_index0 = lkd0->lkd_fib_index;
-		fib_index1 = lkd1->lkd_fib_index;
-	    }
-
-	    /*
-	     * choose between a source or destination address lookup in the table
-	     */
-	    if (input_src_addr)
-	    {
-		input_addr0 = &ip0->src_address;
-		input_addr1 = &ip1->src_address;
-	    }
-	    else
-	    {
-		input_addr0 = &ip0->dst_address;
-		input_addr1 = &ip1->dst_address;
-	    }
-
-	    /* do src lookup */
-	    lbi0 = ip6_fib_table_fwding_lookup(&ip6_main,
-					       fib_index0,
-					       input_addr0);
-	    lbi1 = ip6_fib_table_fwding_lookup(&ip6_main,
-					       fib_index1,
-					       input_addr1);
-	    lb0 = load_balance_get(lbi0);
-	    lb1 = load_balance_get(lbi1);
-
-            vnet_buffer(b0)->sw_if_index[VLIB_TX] = fib_index0;
-            vnet_buffer(b1)->sw_if_index[VLIB_TX] = fib_index1;
-
-	    /* Use flow hash to compute multipath adjacency. */
-	    hash_c0 = vnet_buffer (b0)->ip.flow_hash = 0;
-	    hash_c1 = vnet_buffer (b1)->ip.flow_hash = 0;
-
-	    if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
-	    {
-		flow_hash_config0 = lb0->lb_hash_config;
-		hash_c0 = vnet_buffer (b0)->ip.flow_hash =
-		    ip6_compute_flow_hash (ip0, flow_hash_config0);
-	    }
-
-	    if (PREDICT_FALSE (lb1->lb_n_buckets > 1))
-	    {
-		flow_hash_config1 = lb1->lb_hash_config;
-		hash_c1 = vnet_buffer (b1)->ip.flow_hash =
-		    ip6_compute_flow_hash (ip1, flow_hash_config1);
-	    }
-
-	    dpo0 = load_balance_get_bucket_i(lb0,
-					     (hash_c0 &
-					      (lb0->lb_n_buckets_minus_1)));
-	    dpo1 = load_balance_get_bucket_i(lb1,
-					     (hash_c1 &
-					      (lb1->lb_n_buckets_minus_1)));
-
-	    next0 = dpo0->dpoi_next_node;
-	    next1 = dpo1->dpoi_next_node;
-	    vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-	    vnet_buffer(b1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
-
-	    vlib_increment_combined_counter
-		(cm, cpu_index, lbi0, 1,
-		 vlib_buffer_length_in_chain (vm, b0));
-	    vlib_increment_combined_counter
-		(cm, cpu_index, lbi1, 1,
-		 vlib_buffer_length_in_chain (vm, b1));
-
-	    if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-		lookup_trace_t *tr = vlib_add_trace (vm, node,
-						     b0, sizeof (*tr));
-		tr->fib_index = fib_index0;
-		tr->lbi = lbi0;
-		tr->addr.ip6 = *input_addr0;
-	    }
-	    if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-		lookup_trace_t *tr = vlib_add_trace (vm, node,
-						     b1, sizeof (*tr));
-		tr->fib_index = fib_index1;
-		tr->lbi = lbi1;
-		tr->addr.ip6 = *input_addr1;
-	    }
-	    vlib_validate_buffer_enqueue_x2(vm, node, next_index, to_next,
-					    n_left_to_next, bi0, bi1,
-					    next0, next1);
-	}
-	while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	    u32 bi0, lkdi0, lbi0, fib_index0, next0, hash_c0;
-	    flow_hash_config_t flow_hash_config0;
-	    const ip6_address_t *input_addr0;
-	    const load_balance_t *lb0;
-	    const lookup_dpo_t * lkd0;
-	    const ip6_header_t * ip0;
-	    const dpo_id_t *dpo0;
-	    vlib_buffer_t * b0;
-
-	    bi0 = from[0];
-	    to_next[0] = bi0;
-	    from += 1;
-	    to_next += 1;
-	    n_left_from -= 1;
-	    n_left_to_next -= 1;
-
-	    b0 = vlib_get_buffer (vm, bi0);
-	    ip0 = vlib_buffer_get_current (b0);
-
-	    /* dst lookup was done by ip6 lookup */
-	    lkdi0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
-	    lkd0 = lookup_dpo_get(lkdi0);
-
-	    /*
-	     * choose between a lookup using the fib index in the DPO
-	     * or getting the FIB index from the interface.
-	     */
-	    if (table_from_interface)
-	    {
-		fib_index0 =
-		    ip6_fib_table_get_index_for_sw_if_index(
-			vnet_buffer(b0)->sw_if_index[VLIB_RX]);
-	    }
-	    else
-	    {
-		fib_index0 = lkd0->lkd_fib_index;
-	    }
-
-	    /*
-	     * choose between a source or destination address lookup in the table
-	     */
-	    if (input_src_addr)
-	    {
-		input_addr0 = &ip0->src_address;
-	    }
-	    else
-	    {
-		input_addr0 = &ip0->dst_address;
-	    }
-
-	    /* do src lookup */
-	    lbi0 = ip6_fib_table_fwding_lookup(&ip6_main,
-					       fib_index0,
-					       input_addr0);
-	    lb0 = load_balance_get(lbi0);
-
-            vnet_buffer(b0)->sw_if_index[VLIB_TX] = fib_index0;
-
-	    /* Use flow hash to compute multipath adjacency. */
-	    hash_c0 = vnet_buffer (b0)->ip.flow_hash = 0;
-
-	    if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
-	    {
-		flow_hash_config0 = lb0->lb_hash_config;
-		hash_c0 = vnet_buffer (b0)->ip.flow_hash =
-		    ip6_compute_flow_hash (ip0, flow_hash_config0);
-	    }
-
-	    dpo0 = load_balance_get_bucket_i(lb0,
-					     (hash_c0 &
-					      (lb0->lb_n_buckets_minus_1)));
-
-	    next0 = dpo0->dpoi_next_node;
-	    vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-
-	    vlib_increment_combined_counter
-		(cm, cpu_index, lbi0, 1,
-		 vlib_buffer_length_in_chain (vm, b0));
-
-	    if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-		lookup_trace_t *tr = vlib_add_trace (vm, node,
-						     b0, sizeof (*tr));
-		tr->fib_index = fib_index0;
-		tr->lbi = lbi0;
-		tr->addr.ip6 = *input_addr0;
-	    }
-	    vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
-					    n_left_to_next, bi0, next0);
-	}
-        vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-    return from_frame->n_vectors;
-}
-
-always_inline uword
-lookup_ip6_dst (vlib_main_t * vm,
-                vlib_node_runtime_t * node,
-                vlib_frame_t * from_frame)
-{
-    return (lookup_dpo_ip6_inline(vm, node, from_frame, 0 /*use src*/, 0));
-}
-
-VLIB_REGISTER_NODE (lookup_ip6_dst_node) = {
-    .function = lookup_ip6_dst,
-    .name = "lookup-ip6-dst",
-    .vector_size = sizeof (u32),
-    .format_trace = format_lookup_trace,
-    .sibling_of = "ip6-lookup",
-};
-VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip6_dst_node, lookup_ip6_dst)
-
-always_inline uword
-lookup_ip6_dst_itf (vlib_main_t * vm,
-		    vlib_node_runtime_t * node,
-		    vlib_frame_t * from_frame)
-{
-    return (lookup_dpo_ip6_inline(vm, node, from_frame, 0 /*use src*/, 1));
-}
-
-VLIB_REGISTER_NODE (lookup_ip6_dst_itf_node) = {
-    .function = lookup_ip6_dst_itf,
-    .name = "lookup-ip6-dst-itf",
-    .vector_size = sizeof (u32),
-    .format_trace = format_lookup_trace,
-    .sibling_of = "ip6-lookup",
-};
-VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip6_dst_itf_node, lookup_ip6_dst_itf)
-
-always_inline uword
-lookup_ip6_src (vlib_main_t * vm,
-                vlib_node_runtime_t * node,
-                vlib_frame_t * from_frame)
-{
-    return (lookup_dpo_ip6_inline(vm, node, from_frame, 1, 0));
-}
-
-VLIB_REGISTER_NODE (lookup_ip6_src_node) = {
-    .function = lookup_ip6_src,
-    .name = "lookup-ip6-src",
-    .vector_size = sizeof (u32),
-    .format_trace = format_lookup_trace,
-    .sibling_of = "ip6-lookup",
-};
-VLIB_NODE_FUNCTION_MULTIARCH (lookup_ip6_src_node, lookup_ip6_src)
-
-always_inline uword
-lookup_dpo_mpls_inline (vlib_main_t * vm,
-                       vlib_node_runtime_t * node,
-                       vlib_frame_t * from_frame,
-                       int table_from_interface)
-{
-    u32 n_left_from, next_index, * from, * to_next;
-    u32 cpu_index = os_get_cpu_number();
-    vlib_combined_counter_main_t * cm = &load_balance_main.lbm_to_counters;
-
-    from = vlib_frame_vector_args (from_frame);
-    n_left_from = from_frame->n_vectors;
-
-    next_index = node->cached_next_index;
-
-    while (n_left_from > 0)
-    {
-        u32 n_left_to_next;
-
-        vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
-
-        /* while (n_left_from >= 4 && n_left_to_next >= 2) */
-        /*   } */
-
-        while (n_left_from > 0 && n_left_to_next > 0)
-        {
-            u32 bi0, lkdi0, lbi0, fib_index0,  next0;
-            const mpls_unicast_header_t * hdr0;
-            const load_balance_t *lb0;
-            const lookup_dpo_t * lkd0;
-            const dpo_id_t *dpo0;
-            vlib_buffer_t * b0;
-
-            bi0 = from[0];
-            to_next[0] = bi0;
-            from += 1;
-            to_next += 1;
-            n_left_from -= 1;
-            n_left_to_next -= 1;
-
-            b0 = vlib_get_buffer (vm, bi0);
-            hdr0 = vlib_buffer_get_current (b0);
-
-            /* dst lookup was done by mpls lookup */
-            lkdi0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
-            lkd0 = lookup_dpo_get(lkdi0);
-
-            /*
-             * choose between a lookup using the fib index in the DPO
-             * or getting the FIB index from the interface.
-             */
-            if (table_from_interface)
-            {
-                fib_index0 = 
-                    mpls_fib_table_get_index_for_sw_if_index(
-                        vnet_buffer(b0)->sw_if_index[VLIB_RX]);
-            }
-            else
-            {
-                fib_index0 = lkd0->lkd_fib_index;
-            }
-
-            /* do lookup */
-            lbi0 = mpls_fib_table_forwarding_lookup (fib_index0, hdr0);
-            lb0  = load_balance_get(lbi0);
-            dpo0 = load_balance_get_bucket_i(lb0, 0);
-
-            next0 = dpo0->dpoi_next_node;
-            vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-
-            vlib_increment_combined_counter
-                (cm, cpu_index, lbi0, 1,
-                 vlib_buffer_length_in_chain (vm, b0));
-
-	    if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
-            {
-                lookup_trace_t *tr = vlib_add_trace (vm, node, 
-                                                     b0, sizeof (*tr));
-                tr->fib_index = fib_index0;
-                tr->lbi = lbi0;
-                tr->hdr = *hdr0;
-            }
-
-           vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
-                                            n_left_to_next, bi0, next0);
-        }
-        vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-    return from_frame->n_vectors;
-}
-
-static u8 *
-format_lookup_mpls_trace (u8 * s, va_list * args)
-{
-    CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-    CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-    lookup_trace_t * t = va_arg (*args, lookup_trace_t *);
-    uword indent = format_get_indent (s);
-    mpls_unicast_header_t hdr;
-
-    hdr.label_exp_s_ttl = clib_net_to_host_u32(t->hdr.label_exp_s_ttl);
-
-    s = format (s, "%U fib-index:%d hdr:%U load-balance:%d",
-                format_white_space, indent,
-                t->fib_index,
-                format_mpls_header, hdr,
-                t->lbi);
-    return s;
-}
-
-always_inline uword
-lookup_mpls_dst (vlib_main_t * vm,
-                vlib_node_runtime_t * node,
-                vlib_frame_t * from_frame)
-{
-    return (lookup_dpo_mpls_inline(vm, node, from_frame, 0));
-}
-
-VLIB_REGISTER_NODE (lookup_mpls_dst_node) = {
-    .function = lookup_mpls_dst,
-    .name = "lookup-mpls-dst",
-    .vector_size = sizeof (u32),
-    .sibling_of = "mpls-lookup",
-    .format_trace = format_lookup_mpls_trace,
-    .n_next_nodes = 0,
-};
-VLIB_NODE_FUNCTION_MULTIARCH (lookup_mpls_dst_node, lookup_mpls_dst)
-
-always_inline uword
-lookup_mpls_dst_itf (vlib_main_t * vm,
-                    vlib_node_runtime_t * node,
-                    vlib_frame_t * from_frame)
-{
-    return (lookup_dpo_mpls_inline(vm, node, from_frame, 1));
-}
-
-VLIB_REGISTER_NODE (lookup_mpls_dst_itf_node) = {
-    .function = lookup_mpls_dst_itf,
-    .name = "lookup-mpls-dst-itf",
-    .vector_size = sizeof (u32),
-    .sibling_of = "mpls-lookup",
-    .format_trace = format_lookup_mpls_trace,
-    .n_next_nodes = 0,
-};
-VLIB_NODE_FUNCTION_MULTIARCH (lookup_mpls_dst_itf_node, lookup_mpls_dst_itf)
-
-static void
-lookup_dpo_mem_show (void)
-{
-    fib_show_memory_usage("Lookup",
-			  pool_elts(lookup_dpo_pool),
-			  pool_len(lookup_dpo_pool),
-			  sizeof(lookup_dpo_t));
-}
-
-const static dpo_vft_t lkd_vft = {
-    .dv_lock = lookup_dpo_lock,
-    .dv_unlock = lookup_dpo_unlock,
-    .dv_format = format_lookup_dpo,
-};
-const static dpo_vft_t lkd_vft_w_mem_show = {
-    .dv_lock = lookup_dpo_lock,
-    .dv_unlock = lookup_dpo_unlock,
-    .dv_format = format_lookup_dpo,
-    .dv_mem_show = lookup_dpo_mem_show,
-};
-
-const static char* const lookup_src_ip4_nodes[] =
-{
-    "lookup-ip4-src",
-    NULL,
-};
-const static char* const lookup_src_ip6_nodes[] =
-{
-    "lookup-ip6-src",
-    NULL,
-};
-const static char* const * const lookup_src_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = lookup_src_ip4_nodes,
-    [DPO_PROTO_IP6]  = lookup_src_ip6_nodes,
-    [DPO_PROTO_MPLS] = NULL,
-};
-
-const static char* const lookup_dst_ip4_nodes[] =
-{
-    "lookup-ip4-dst",
-    NULL,
-};
-const static char* const lookup_dst_ip6_nodes[] =
-{
-    "lookup-ip6-dst",
-    NULL,
-};
-const static char* const lookup_dst_mpls_nodes[] =
-{
-    "lookup-mpls-dst",
-    NULL,
-};
-const static char* const * const lookup_dst_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = lookup_dst_ip4_nodes,
-    [DPO_PROTO_IP6]  = lookup_dst_ip6_nodes,
-    [DPO_PROTO_MPLS] = lookup_dst_mpls_nodes,
-};
-
-const static char* const lookup_dst_from_interface_ip4_nodes[] =
-{
-    "lookup-ip4-dst-itf",
-    NULL,
-};
-const static char* const lookup_dst_from_interface_ip6_nodes[] =
-{
-    "lookup-ip6-dst-itf",
-    NULL,
-};
-const static char* const lookup_dst_from_interface_mpls_nodes[] =
-{
-    "lookup-mpls-dst-itf",
-    NULL,
-};
-const static char* const * const lookup_dst_from_interface_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = lookup_dst_from_interface_ip4_nodes,
-    [DPO_PROTO_IP6]  = lookup_dst_from_interface_ip6_nodes,
-    [DPO_PROTO_MPLS] = lookup_dst_from_interface_mpls_nodes,
-};
-
-
-void
-lookup_dpo_module_init (void)
-{
-    dpo_register(DPO_LOOKUP, &lkd_vft_w_mem_show, NULL);
-
-    /*
-     * There are various sorts of lookup; src or dst addr v4 /v6 etc.
-     * there isn't an object type for each (there is only the lookup_dpo_t),
-     * but, for performance reasons, there is a data plane function, and hence
-     * VLIB node for each. VLIB graph node construction is based on DPO types
-     * so we create sub-types.
-     */
-    lookup_dpo_sub_types[LOOKUP_SUB_TYPE_SRC] =
-        dpo_register_new_type(&lkd_vft, lookup_src_nodes);
-    lookup_dpo_sub_types[LOOKUP_SUB_TYPE_DST] =
-        dpo_register_new_type(&lkd_vft, lookup_dst_nodes);
-    lookup_dpo_sub_types[LOOKUP_SUB_TYPE_DST_TABLE_FROM_INTERFACE] =
-        dpo_register_new_type(&lkd_vft, lookup_dst_from_interface_nodes);
-}
diff --git a/vnet/vnet/dpo/lookup_dpo.h b/vnet/vnet/dpo/lookup_dpo.h
deleted file mode 100644
index ff283388..00000000
--- a/vnet/vnet/dpo/lookup_dpo.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __LOOKUP_DPO_H__
-#define __LOOKUP_DPO_H__
-
-#include <vnet/vnet.h>
-#include <vnet/fib/fib_types.h>
-#include <vnet/dpo/dpo.h>
-
-/**
- * Switch to use the packet's source or destination address for lookup
- */
-typedef enum lookup_input_t_ {
-    LOOKUP_INPUT_SRC_ADDR,
-    LOOKUP_INPUT_DST_ADDR,
-} __attribute__ ((packed)) lookup_input_t;
-
-#define LOOKUP_INPUTS {                         \
-    [LOOKUP_INPUT_SRC_ADDR] = "src-address",    \
-    [LOOKUP_INPUT_DST_ADDR] = "dst-address",    \
-}
-
-/**
- * Switch to use the packet's source or destination address for lookup
- */
-typedef enum lookup_table_t_ {
-    LOOKUP_TABLE_FROM_INPUT_INTERFACE,
-    LOOKUP_TABLE_FROM_CONFIG,
-} __attribute__ ((packed)) lookup_table_t;
-
-#define LOOKUP_TABLES {                                   \
-    [LOOKUP_INPUT_SRC_ADDR] = "table-input-interface",    \
-    [LOOKUP_INPUT_DST_ADDR] = "table-configured",         \
-}
-
-/**
- * A representation of an MPLS label for imposition in the data-path
- */
-typedef struct lookup_dpo_t
-{
-    /**
-     * The FIB, or interface from which to get a FIB, in which to perform
-     * the next lookup;
-     */
-    fib_node_index_t lkd_fib_index;
-
-    /**
-     * The protocol of the FIB for the lookup, and hence
-     * the protocol of the packet
-     */
-    dpo_proto_t lkd_proto;
-
-    /**
-     * Switch to use src or dst address
-     */
-    lookup_input_t lkd_input;
-
-    /**
-     * Switch to use the table index passed, or the table of the input interface
-     */
-    lookup_table_t lkd_table;
-
-    /**
-     * Number of locks
-     */
-    u16 lkd_locks;
-} lookup_dpo_t;
-
-extern void lookup_dpo_add_or_lock_w_fib_index(fib_node_index_t fib_index,
-                                               dpo_proto_t proto,
-                                               lookup_input_t input,
-                                               lookup_table_t table,
-                                               dpo_id_t *dpo);
-extern void lookup_dpo_add_or_lock_w_table_id(u32 table_id,
-                                              dpo_proto_t proto,
-                                              lookup_input_t input,
-                                              lookup_table_t table,
-                                              dpo_id_t *dpo);
-
-extern u8* format_lookup_dpo(u8 *s, va_list *args);
-
-/*
- * Encapsulation violation for fast data-path access
- */
-extern lookup_dpo_t *lookup_dpo_pool;
-
-static inline lookup_dpo_t *
-lookup_dpo_get (index_t index)
-{
-    return (pool_elt_at_index(lookup_dpo_pool, index));
-}
-
-extern void lookup_dpo_module_init(void);
-
-#endif
diff --git a/vnet/vnet/dpo/mpls_label_dpo.c b/vnet/vnet/dpo/mpls_label_dpo.c
deleted file mode 100644
index bbdc9666..00000000
--- a/vnet/vnet/dpo/mpls_label_dpo.c
+++ /dev/null
@@ -1,570 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/ip/ip.h>
-#include <vnet/dpo/mpls_label_dpo.h>
-#include <vnet/mpls/mpls.h>
-
-/*
- * pool of all MPLS Label DPOs
- */
-mpls_label_dpo_t *mpls_label_dpo_pool;
-
-static mpls_label_dpo_t *
-mpls_label_dpo_alloc (void)
-{
-    mpls_label_dpo_t *mld;
-
-    pool_get_aligned(mpls_label_dpo_pool, mld, CLIB_CACHE_LINE_BYTES);
-    memset(mld, 0, sizeof(*mld));
-
-    dpo_reset(&mld->mld_dpo);
-
-    return (mld);
-}
-
-static index_t
-mpls_label_dpo_get_index (mpls_label_dpo_t *mld)
-{
-    return (mld - mpls_label_dpo_pool);
-}
-
-index_t
-mpls_label_dpo_create (mpls_label_t *label_stack,
-                       mpls_eos_bit_t eos,
-                       u8 ttl,
-                       u8 exp,
-                       dpo_proto_t payload_proto,
-		       const dpo_id_t *dpo)
-{
-    mpls_label_dpo_t *mld;
-    u32 ii;
-
-    mld = mpls_label_dpo_alloc();
-    mld->mld_n_labels = vec_len(label_stack);
-    mld->mld_n_hdr_bytes = mld->mld_n_labels * sizeof(mld->mld_hdr[0]);
-    mld->mld_payload_proto = payload_proto;
-
-    /*
-     * construct label rewrite headers for each value value passed.
-     * get the header in network byte order since we will paint it
-     * on a packet in the data-plane
-     */
-
-    for (ii = 0; ii < mld->mld_n_labels-1; ii++)
-    {
-	vnet_mpls_uc_set_label(&mld->mld_hdr[ii].label_exp_s_ttl, label_stack[ii]);
-	vnet_mpls_uc_set_ttl(&mld->mld_hdr[ii].label_exp_s_ttl, 255);
-	vnet_mpls_uc_set_exp(&mld->mld_hdr[ii].label_exp_s_ttl, 0);
-	vnet_mpls_uc_set_s(&mld->mld_hdr[ii].label_exp_s_ttl, MPLS_NON_EOS);
-	mld->mld_hdr[ii].label_exp_s_ttl =
-	    clib_host_to_net_u32(mld->mld_hdr[ii].label_exp_s_ttl);
-    }
-
-    /*
-     * the inner most label
-     */
-    ii = mld->mld_n_labels-1;
-
-    vnet_mpls_uc_set_label(&mld->mld_hdr[ii].label_exp_s_ttl, label_stack[ii]);
-    vnet_mpls_uc_set_ttl(&mld->mld_hdr[ii].label_exp_s_ttl, ttl);
-    vnet_mpls_uc_set_exp(&mld->mld_hdr[ii].label_exp_s_ttl, exp);
-    vnet_mpls_uc_set_s(&mld->mld_hdr[ii].label_exp_s_ttl, eos);
-    mld->mld_hdr[ii].label_exp_s_ttl =
-	clib_host_to_net_u32(mld->mld_hdr[ii].label_exp_s_ttl);
-
-    /*
-     * stack this label objct on its parent.
-     */
-    dpo_stack(DPO_MPLS_LABEL,
-              mld->mld_payload_proto,
-              &mld->mld_dpo,
-              dpo);
-
-    return (mpls_label_dpo_get_index(mld));
-}
-
-u8*
-format_mpls_label_dpo (u8 *s, va_list *args)
-{
-    index_t index = va_arg (*args, index_t);
-    u32 indent = va_arg (*args, u32);
-    mpls_unicast_header_t hdr;
-    mpls_label_dpo_t *mld;
-    u32 ii;
-
-    mld = mpls_label_dpo_get(index);
-
-    s = format(s, "mpls-label:[%d]:", index);
-
-    for (ii = 0; ii < mld->mld_n_labels; ii++)
-    {
-	hdr.label_exp_s_ttl =
-	    clib_net_to_host_u32(mld->mld_hdr[ii].label_exp_s_ttl);
-	s = format(s, "%U", format_mpls_header, hdr);
-    }
-
-    s = format(s, "\n%U", format_white_space, indent);
-    s = format(s, "%U", format_dpo_id, &mld->mld_dpo, indent+2);
-
-    return (s);
-}
-
-static void
-mpls_label_dpo_lock (dpo_id_t *dpo)
-{
-    mpls_label_dpo_t *mld;
-
-    mld = mpls_label_dpo_get(dpo->dpoi_index);
-
-    mld->mld_locks++;
-}
-
-static void
-mpls_label_dpo_unlock (dpo_id_t *dpo)
-{
-    mpls_label_dpo_t *mld;
-
-    mld = mpls_label_dpo_get(dpo->dpoi_index);
-
-    mld->mld_locks--;
-
-    if (0 == mld->mld_locks)
-    {
-	dpo_reset(&mld->mld_dpo);
-	pool_put(mpls_label_dpo_pool, mld);
-    }
-}
-
-/**
- * @brief A struct to hold tracing information for the MPLS label imposition
- * node.
- */
-typedef struct mpls_label_imposition_trace_t_
-{
-    /**
-     * The MPLS header imposed
-     */
-    mpls_unicast_header_t hdr;
-} mpls_label_imposition_trace_t;
-
-always_inline uword
-mpls_label_imposition_inline (vlib_main_t * vm,
-                              vlib_node_runtime_t * node,
-                              vlib_frame_t * from_frame,
-                              u8 payload_is_ip4,
-                              u8 payload_is_ip6)
-{
-    u32 n_left_from, next_index, * from, * to_next;
-
-    from = vlib_frame_vector_args (from_frame);
-    n_left_from = from_frame->n_vectors;
-
-    next_index = node->cached_next_index;
-
-    while (n_left_from > 0)
-    {
-        u32 n_left_to_next;
-
-        vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
-
-        while (n_left_from >= 4 && n_left_to_next >= 2)
-        {
-            mpls_unicast_header_t *hdr0, *hdr1;
-            mpls_label_dpo_t *mld0, *mld1;
-            u32 bi0, mldi0, bi1, mldi1;
-            vlib_buffer_t * b0, *b1;
-            u32 next0, next1;
-            u8 ttl0, ttl1;
-
-            bi0 = to_next[0] = from[0];
-            bi1 = to_next[1] = from[1];
-
-            /* Prefetch next iteration. */
-            {
-                vlib_buffer_t * p2, * p3;
-
-                p2 = vlib_get_buffer (vm, from[2]);
-                p3 = vlib_get_buffer (vm, from[3]);
-
-                vlib_prefetch_buffer_header (p2, STORE);
-                vlib_prefetch_buffer_header (p3, STORE);
-
-                CLIB_PREFETCH (p2->data, sizeof (hdr0[0]), STORE);
-                CLIB_PREFETCH (p3->data, sizeof (hdr0[0]), STORE);
-            }
-
-            from += 2;
-            to_next += 2;
-            n_left_from -= 2;
-            n_left_to_next -= 2;
-
-            b0 = vlib_get_buffer (vm, bi0);
-            b1 = vlib_get_buffer (vm, bi1);
-
-            /* dst lookup was done by ip4 lookup */
-            mldi0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
-            mldi1 = vnet_buffer(b1)->ip.adj_index[VLIB_TX];
-            mld0 = mpls_label_dpo_get(mldi0);
-            mld1 = mpls_label_dpo_get(mldi1);
-
-            if (payload_is_ip4)
-            {
-                /*
-                 * decrement the TTL on ingress to the LSP
-                 */
-                ip4_header_t * ip0 = vlib_buffer_get_current(b0);
-                ip4_header_t * ip1 = vlib_buffer_get_current(b1);
-                u32 checksum0;
-                u32 checksum1;
-
-                checksum0 = ip0->checksum + clib_host_to_net_u16 (0x0100);
-                checksum1 = ip1->checksum + clib_host_to_net_u16 (0x0100);
-
-                checksum0 += checksum0 >= 0xffff;
-                checksum1 += checksum1 >= 0xffff;
-
-                ip0->checksum = checksum0;
-                ip1->checksum = checksum1;
-
-                ip0->ttl -= 1;
-                ip1->ttl -= 1;
-
-                ttl1 = ip1->ttl;
-                ttl0 = ip0->ttl;
-            }
-            else if (payload_is_ip6)
-            {
-                /*
-                 * decrement the TTL on ingress to the LSP
-                 */
-                ip6_header_t * ip0 = vlib_buffer_get_current(b0);
-                ip6_header_t * ip1 = vlib_buffer_get_current(b1);
-
-
-                ip0->hop_limit -= 1;
-                ip1->hop_limit -= 1;
-
-                ttl0 = ip0->hop_limit;
-                ttl1 = ip1->hop_limit;
-            }
-            else
-            {
-                /*
-                 * else, the packet to be encapped is an MPLS packet
-                 */
-                if (PREDICT_TRUE(vnet_buffer(b0)->mpls.first))
-                {
-                    /*
-                     * The first label to be imposed on the packet. this is a label swap.
-                     * in which case we stashed the TTL and EXP bits in the
-                     * packet in the lookup node
-                     */
-                    ASSERT(0 != vnet_buffer (b0)->mpls.ttl);
-
-                    ttl0 = vnet_buffer(b0)->mpls.ttl - 1;
-                }
-                else
-                {
-                    /*
-                     * not the first label. implying we are recusring down a chain of
-                     * output labels.
-                     * Each layer is considered a new LSP - hence the TTL is reset.
-                     */
-                    ttl0 = 255;
-                }
-                if (PREDICT_TRUE(vnet_buffer(b1)->mpls.first))
-                {
-                    ASSERT(1 != vnet_buffer (b1)->mpls.ttl);
-                    ttl1 = vnet_buffer(b1)->mpls.ttl - 1;
-                }
-                else
-                {
-                    ttl1 = 255;
-                }
-            }
-            vnet_buffer(b0)->mpls.first = 0;
-            vnet_buffer(b1)->mpls.first = 0;
-
-            /* Paint the MPLS header */
-            vlib_buffer_advance(b0, -(mld0->mld_n_hdr_bytes));
-            vlib_buffer_advance(b1, -(mld1->mld_n_hdr_bytes));
-
-            hdr0 = vlib_buffer_get_current(b0);
-            hdr1 = vlib_buffer_get_current(b1);
-
-            clib_memcpy(hdr0, mld0->mld_hdr, mld0->mld_n_hdr_bytes);
-            clib_memcpy(hdr1, mld1->mld_hdr, mld1->mld_n_hdr_bytes);
-
-            /* fixup the TTL for the inner most label */
-            hdr0 = hdr0 + (mld0->mld_n_labels - 1);
-            hdr1 = hdr1 + (mld1->mld_n_labels - 1);
-            ((char*)hdr0)[3] = ttl0;
-            ((char*)hdr1)[3] = ttl1;
-
-            next0 = mld0->mld_dpo.dpoi_next_node;
-            next1 = mld1->mld_dpo.dpoi_next_node;
-            vnet_buffer(b0)->ip.adj_index[VLIB_TX] = mld0->mld_dpo.dpoi_index;
-            vnet_buffer(b1)->ip.adj_index[VLIB_TX] = mld1->mld_dpo.dpoi_index;
-
-            if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-            {
-                mpls_label_imposition_trace_t *tr =
-                    vlib_add_trace (vm, node, b0, sizeof (*tr));
-                tr->hdr = *hdr0;
-            }
-            if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
-            {
-                mpls_label_imposition_trace_t *tr =
-                    vlib_add_trace (vm, node, b1, sizeof (*tr));
-                tr->hdr = *hdr1;
-            }
-
-            vlib_validate_buffer_enqueue_x2(vm, node, next_index, to_next,
-                                            n_left_to_next,
-                                            bi0, bi1, next0, next1);
-        }
-
-        while (n_left_from > 0 && n_left_to_next > 0)
-        {
-            mpls_unicast_header_t *hdr0;
-            mpls_label_dpo_t *mld0;
-            vlib_buffer_t * b0;
-            u32 bi0, mldi0;
-            u32 next0;
-            u8 ttl;
-
-            bi0 = from[0];
-            to_next[0] = bi0;
-            from += 1;
-            to_next += 1;
-            n_left_from -= 1;
-            n_left_to_next -= 1;
-
-            b0 = vlib_get_buffer (vm, bi0);
-
-            /* dst lookup was done by ip4 lookup */
-            mldi0 = vnet_buffer(b0)->ip.adj_index[VLIB_TX];
-            mld0 = mpls_label_dpo_get(mldi0);
-
-            if (payload_is_ip4)
-            {
-                /*
-                 * decrement the TTL on ingress to the LSP
-                 */
-                ip4_header_t * ip0 = vlib_buffer_get_current(b0);
-                u32 checksum0;
-
-                checksum0 = ip0->checksum + clib_host_to_net_u16 (0x0100);
-                checksum0 += checksum0 >= 0xffff;
-
-                ip0->checksum = checksum0;
-                ip0->ttl -= 1;
-                ttl = ip0->ttl;
-            }
-            else if (payload_is_ip6)
-            {
-                /*
-                 * decrement the TTL on ingress to the LSP
-                 */
-                ip6_header_t * ip0 = vlib_buffer_get_current(b0);
-
-                ip0->hop_limit -= 1;
-                ttl = ip0->hop_limit;
-            }
-            else
-            {
-                /*
-                 * else, the packet to be encapped is an MPLS packet
-                 */
-                if (vnet_buffer(b0)->mpls.first)
-                {
-                    /*
-                     * The first label to be imposed on the packet. this is a label swap.
-                     * in which case we stashed the TTL and EXP bits in the
-                     * packet in the lookup node
-                     */
-                    ASSERT(0 != vnet_buffer (b0)->mpls.ttl);
-
-                    ttl = vnet_buffer(b0)->mpls.ttl - 1;
-                }
-                else
-                {
-                    /*
-                     * not the first label. implying we are recusring down a chain of
-                     * output labels.
-                     * Each layer is considered a new LSP - hence the TTL is reset.
-                     */
-                    ttl = 255;
-                }
-            }
-            vnet_buffer(b0)->mpls.first = 0;
-
-            /* Paint the MPLS header */
-            vlib_buffer_advance(b0, -(mld0->mld_n_hdr_bytes));
-            hdr0 = vlib_buffer_get_current(b0);
-            clib_memcpy(hdr0, mld0->mld_hdr, mld0->mld_n_hdr_bytes);
-
-            /* fixup the TTL for the inner most label */
-            hdr0 = hdr0 + (mld0->mld_n_labels - 1);
-            ((char*)hdr0)[3] = ttl;
-
-            next0 = mld0->mld_dpo.dpoi_next_node;
-            vnet_buffer(b0)->ip.adj_index[VLIB_TX] = mld0->mld_dpo.dpoi_index;
-
-            if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-            {
-                mpls_label_imposition_trace_t *tr =
-                    vlib_add_trace (vm, node, b0, sizeof (*tr));
-                tr->hdr = *hdr0;
-            }
-
-            vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
-                                            n_left_to_next, bi0, next0);
-        }
-        vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-    return from_frame->n_vectors;
-}
-
-static u8 *
-format_mpls_label_imposition_trace (u8 * s, va_list * args)
-{
-    CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-    CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-    mpls_label_imposition_trace_t * t;
-    mpls_unicast_header_t hdr;
-    uword indent;
-
-    t = va_arg (*args, mpls_label_imposition_trace_t *);
-    indent = format_get_indent (s);
-    hdr.label_exp_s_ttl = clib_net_to_host_u32(t->hdr.label_exp_s_ttl);
-
-    s = format (s, "%Umpls-header:%U",
-                format_white_space, indent,
-                format_mpls_header, hdr);
-    return (s);
-}
-
-static uword
-mpls_label_imposition (vlib_main_t * vm,
-                       vlib_node_runtime_t * node,
-                       vlib_frame_t * frame)
-{
-    return (mpls_label_imposition_inline(vm, node, frame, 0, 0));
-}
-
-VLIB_REGISTER_NODE (mpls_label_imposition_node) = {
-    .function = mpls_label_imposition,
-    .name = "mpls-label-imposition",
-    .vector_size = sizeof (u32),
-
-    .format_trace = format_mpls_label_imposition_trace,
-    .n_next_nodes = 1,
-    .next_nodes = {
-        [0] = "error-drop",
-    }
-};
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_label_imposition_node,
-                              mpls_label_imposition)
-
-static uword
-ip4_mpls_label_imposition (vlib_main_t * vm,
-                           vlib_node_runtime_t * node,
-                           vlib_frame_t * frame)
-{
-    return (mpls_label_imposition_inline(vm, node, frame, 1, 0));
-}
-
-VLIB_REGISTER_NODE (ip4_mpls_label_imposition_node) = {
-    .function = ip4_mpls_label_imposition,
-    .name = "ip4-mpls-label-imposition",
-    .vector_size = sizeof (u32),
-
-    .format_trace = format_mpls_label_imposition_trace,
-    .n_next_nodes = 1,
-    .next_nodes = {
-        [0] = "error-drop",
-    }
-};
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_mpls_label_imposition_node,
-                              ip4_mpls_label_imposition)
-
-static uword
-ip6_mpls_label_imposition (vlib_main_t * vm,
-                           vlib_node_runtime_t * node,
-                           vlib_frame_t * frame)
-{
-    return (mpls_label_imposition_inline(vm, node, frame, 0, 1));
-}
-
-VLIB_REGISTER_NODE (ip6_mpls_label_imposition_node) = {
-    .function = ip6_mpls_label_imposition,
-    .name = "ip6-mpls-label-imposition",
-    .vector_size = sizeof (u32),
-
-    .format_trace = format_mpls_label_imposition_trace,
-    .n_next_nodes = 1,
-    .next_nodes = {
-        [0] = "error-drop",
-    }
-};
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_mpls_label_imposition_node,
-                              ip6_mpls_label_imposition)
-
-static void
-mpls_label_dpo_mem_show (void)
-{
-    fib_show_memory_usage("MPLS label",
-			  pool_elts(mpls_label_dpo_pool),
-			  pool_len(mpls_label_dpo_pool),
-			  sizeof(mpls_label_dpo_t));
-}
-
-const static dpo_vft_t mld_vft = {
-    .dv_lock = mpls_label_dpo_lock,
-    .dv_unlock = mpls_label_dpo_unlock,
-    .dv_format = format_mpls_label_dpo,
-    .dv_mem_show = mpls_label_dpo_mem_show,
-};
-
-const static char* const mpls_label_imp_ip4_nodes[] =
-{
-    "ip4-mpls-label-imposition",
-    NULL,
-};
-const static char* const mpls_label_imp_ip6_nodes[] =
-{
-    "ip6-mpls-label-imposition",
-    NULL,
-};
-const static char* const mpls_label_imp_mpls_nodes[] =
-{
-    "mpls-label-imposition",
-    NULL,
-};
-const static char* const * const mpls_label_imp_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = mpls_label_imp_ip4_nodes,
-    [DPO_PROTO_IP6]  = mpls_label_imp_ip6_nodes,
-    [DPO_PROTO_MPLS] = mpls_label_imp_mpls_nodes,
-};
-
-
-void
-mpls_label_dpo_module_init (void)
-{
-    dpo_register(DPO_MPLS_LABEL, &mld_vft, mpls_label_imp_nodes);
-}
diff --git a/vnet/vnet/dpo/mpls_label_dpo.h b/vnet/vnet/dpo/mpls_label_dpo.h
deleted file mode 100644
index 89bcb093..00000000
--- a/vnet/vnet/dpo/mpls_label_dpo.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __MPLS_LABEL_DPO_H__
-#define __MPLS_LABEL_DPO_H__
-
-#include <vnet/vnet.h>
-#include <vnet/mpls/packet.h>
-#include <vnet/dpo/dpo.h>
-
-/**
- * A representation of an MPLS label for imposition in the data-path
- */
-typedef struct mpls_label_dpo_t
-{
-    /**
-     * The MPLS label header to impose. Outer most label first.
-     */
-    mpls_unicast_header_t mld_hdr[8];
-
-    /**
-     * Next DPO in the graph
-     */
-    dpo_id_t mld_dpo;
-
-    /**
-     * The protocol of the payload/packets that are being encapped
-     */
-    dpo_proto_t mld_payload_proto;
-
-    /**
-     * Size of the label stack
-     */
-    u16 mld_n_labels;
-
-    /**
-     * Cached amount of header bytes to paint
-     */
-    u16 mld_n_hdr_bytes;
-
-    /**
-     * Number of locks/users of the label
-     */
-    u16 mld_locks;
-} mpls_label_dpo_t;
-
-/**
- * @brief Assert that the MPLS label object is less than a cache line in size.
- * Should this get any bigger then we will need to reconsider how many labels
- * can be pushed in one object.
- */
-_Static_assert((sizeof(mpls_label_dpo_t) <= CLIB_CACHE_LINE_BYTES),
-	       "MPLS label DPO is larger than one cache line.");
-
-/**
- * @brief Create an MPLS label object
- *
- * @param label_stack The stack if labels to impose, outer most label first
- * @param eos The inner most label's EOS bit
- * @param ttl The inner most label's TTL bit
- * @param exp The inner most label's EXP bit
- * @param payload_proto The ptocool of the payload packets that will
- *                      be imposed with this label header.
- * @param dpo The parent of the created MPLS label object
- */
-extern index_t mpls_label_dpo_create(mpls_label_t *label_stack,
-                                     mpls_eos_bit_t eos,
-                                     u8 ttl,
-                                     u8 exp,
-                                     dpo_proto_t payload_proto,
-				     const dpo_id_t *dpo);
-
-extern u8* format_mpls_label_dpo(u8 *s, va_list *args);
-
-
-/*
- * Encapsulation violation for fast data-path access
- */
-extern mpls_label_dpo_t *mpls_label_dpo_pool;
-
-static inline mpls_label_dpo_t *
-mpls_label_dpo_get (index_t index)
-{
-    return (pool_elt_at_index(mpls_label_dpo_pool, index));
-}
-
-extern void mpls_label_dpo_module_init(void);
-
-#endif
diff --git a/vnet/vnet/dpo/punt_dpo.c b/vnet/vnet/dpo/punt_dpo.c
deleted file mode 100644
index d1661dcc..00000000
--- a/vnet/vnet/dpo/punt_dpo.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief
- * The data-path object representing puntping the packet
- */
-
-#include <vnet/dpo/dpo.h>
-
-static dpo_id_t punt_dpos[DPO_PROTO_NUM];
-
-const dpo_id_t *
-punt_dpo_get (dpo_proto_t proto)
-{
-    dpo_set(&punt_dpos[proto], DPO_PUNT, proto, 1);
-
-    return (&punt_dpos[proto]);
-}
-
-int
-dpo_is_punt (const dpo_id_t *dpo)
-{
-    return (dpo->dpoi_type == DPO_PUNT);
-}
-
-static void
-punt_dpo_lock (dpo_id_t *dpo)
-{
-    /*
-     * not maintaining a lock count on the punt
-     * more trouble than it's worth.
-     * There always needs to be one around. no point it managaing its lifetime
-     */
-}
-static void
-punt_dpo_unlock (dpo_id_t *dpo)
-{
-}
-
-static u8*
-format_punt_dpo (u8 *s, va_list *ap)
-{
-    CLIB_UNUSED(index_t index) = va_arg(*ap, index_t);
-    CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
-
-    return (format(s, "dpo-punt"));
-}
-
-const static dpo_vft_t punt_vft = {
-    .dv_lock   = punt_dpo_lock,
-    .dv_unlock = punt_dpo_unlock,
-    .dv_format = format_punt_dpo,
-};
-
-/**
- * @brief The per-protocol VLIB graph nodes that are assigned to a punt
- *        object.
- *
- * this means that these graph nodes are ones from which a punt is the
- * parent object in the DPO-graph.
- */
-const static char* const punt_ip4_nodes[] =
-{
-    "ip4-punt",
-    NULL,
-};
-const static char* const punt_ip6_nodes[] =
-{
-    "ip6-punt",
-    NULL,
-};
-const static char* const punt_mpls_nodes[] =
-{
-    "mpls-punt",
-    NULL,
-};
-const static char* const * const punt_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = punt_ip4_nodes,
-    [DPO_PROTO_IP6]  = punt_ip6_nodes,
-    [DPO_PROTO_MPLS] = punt_mpls_nodes,
-};
-
-void
-punt_dpo_module_init (void)
-{
-    dpo_register(DPO_PUNT, &punt_vft, punt_nodes);
-}
diff --git a/vnet/vnet/dpo/punt_dpo.h b/vnet/vnet/dpo/punt_dpo.h
deleted file mode 100644
index 370547c1..00000000
--- a/vnet/vnet/dpo/punt_dpo.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief A DPO to punt packets to the Control-plane
- */
-
-#ifndef __PUNT_DPO_H__
-#define __PUNT_DPO_H__
-
-#include <vnet/dpo/dpo.h>
-
-extern int dpo_is_punt(const dpo_id_t *dpo);
-
-extern const dpo_id_t *punt_dpo_get(dpo_proto_t proto);
-
-extern void punt_dpo_module_init(void);
-
-#endif
diff --git a/vnet/vnet/dpo/receive_dpo.c b/vnet/vnet/dpo/receive_dpo.c
deleted file mode 100644
index 2b2571c6..00000000
--- a/vnet/vnet/dpo/receive_dpo.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief
- * The data-path object representing receiveing the packet, i.e. it's for-us
- */
-#include <vlib/vlib.h>
-#include <vnet/ip/ip.h>
-#include <vnet/dpo/receive_dpo.h>
-
-/**
- * @brief pool of all receive DPOs
- */
-receive_dpo_t *receive_dpo_pool;
-
-static receive_dpo_t *
-receive_dpo_alloc (void)
-{
-    receive_dpo_t *rd;
-
-    pool_get_aligned(receive_dpo_pool, rd, CLIB_CACHE_LINE_BYTES);
-    memset(rd, 0, sizeof(*rd));
-
-    return (rd);
-}
-
-static receive_dpo_t *
-receive_dpo_get_from_dpo (const dpo_id_t *dpo)
-{
-    ASSERT(DPO_RECEIVE == dpo->dpoi_type);
-
-    return (receive_dpo_get(dpo->dpoi_index));
-}
-
-
-/*
- * receive_dpo_add_or_lock
- *
- * The next_hop address here is used for source address selection in the DP.
- * The local adj is added to an interface's receive prefix, the next-hop
- * passed here is the local prefix on the same interface.
- */
-void
-receive_dpo_add_or_lock (dpo_proto_t proto,
-                         u32 sw_if_index,
-                         const ip46_address_t *nh_addr,
-                         dpo_id_t *dpo)
-{
-    receive_dpo_t *rd;
-
-    rd = receive_dpo_alloc();
-
-    rd->rd_sw_if_index = sw_if_index;
-    if (NULL != nh_addr)
-    {
-	rd->rd_addr = *nh_addr;
-    }
-
-    dpo_set(dpo, DPO_RECEIVE, proto, (rd - receive_dpo_pool));
-}
-
-static void
-receive_dpo_lock (dpo_id_t *dpo)
-{
-    receive_dpo_t *rd;
-
-    rd = receive_dpo_get_from_dpo(dpo);
-    rd->rd_locks++;
-}
-
-static void
-receive_dpo_unlock (dpo_id_t *dpo)
-{
-    receive_dpo_t *rd;
-
-    rd = receive_dpo_get_from_dpo(dpo);
-    rd->rd_locks--;
-
-    if (0 == rd->rd_locks)
-    {
-        pool_put(receive_dpo_pool, rd);
-    }
-}
-
-static u8*
-format_receive_dpo (u8 *s, va_list *ap)
-{
-    CLIB_UNUSED(index_t index) = va_arg(*ap, index_t);
-    CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
-    vnet_main_t * vnm = vnet_get_main();
-    receive_dpo_t *rd;
-
-    rd = receive_dpo_get(index);
-
-    if (~0 != rd->rd_sw_if_index)
-    {
-        return (format(s, "dpo-receive: %U on %U",
-                       format_ip46_address, &rd->rd_addr, IP46_TYPE_ANY,
-                       format_vnet_sw_interface_name, vnm,
-                       vnet_get_sw_interface(vnm, rd->rd_sw_if_index)));
-    }
-    else
-    {
-        return (format(s, "dpo-receive"));
-    }
-}
-
-static void
-receive_dpo_mem_show (void)
-{
-    fib_show_memory_usage("Receive",
-			  pool_elts(receive_dpo_pool),
-			  pool_len(receive_dpo_pool),
-			  sizeof(receive_dpo_t));
-}
-
-const static dpo_vft_t receive_vft = {
-    .dv_lock = receive_dpo_lock,
-    .dv_unlock = receive_dpo_unlock,
-    .dv_format = format_receive_dpo,
-    .dv_mem_show = receive_dpo_mem_show,
-};
-
-/**
- * @brief The per-protocol VLIB graph nodes that are assigned to a receive
- *        object.
- *
- * this means that these graph nodes are ones from which a receive is the
- * parent object in the DPO-graph.
- */
-const static char* const receive_ip4_nodes[] =
-{
-    "ip4-local",
-    NULL,
-};
-const static char* const receive_ip6_nodes[] =
-{
-    "ip6-local",
-    NULL,
-};
-
-const static char* const * const receive_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = receive_ip4_nodes,
-    [DPO_PROTO_IP6]  = receive_ip6_nodes,
-    [DPO_PROTO_MPLS] = NULL,
-};
-
-void
-receive_dpo_module_init (void)
-{
-    dpo_register(DPO_RECEIVE, &receive_vft, receive_nodes);
-}
diff --git a/vnet/vnet/dpo/receive_dpo.h b/vnet/vnet/dpo/receive_dpo.h
deleted file mode 100644
index 2420fd78..00000000
--- a/vnet/vnet/dpo/receive_dpo.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief
- * The data-path object representing receiveing the packet, i.e. it's for-us
- */
-
-#ifndef __RECEIVE_DPO_H__
-#define __RECEIVE_DPO_H__
-
-#include <vnet/dpo/dpo.h>
-#include <vnet/ip/ip6.h>
-
-typedef struct receive_dpo_t_
-{
-    /**
-     * The Software interface index on which traffic is received
-     */
-    u32 rd_sw_if_index;
-
-    /**
-     * The address on the receive interface. packet are destined to this address
-     */
-    ip46_address_t rd_addr;
-
-    /**
-     * number oflocks.
-     */
-    u16 rd_locks;
-} receive_dpo_t;
-
-extern void receive_dpo_add_or_lock (dpo_proto_t proto,
-                                     u32 sw_if_index,
-                                     const ip46_address_t *nh_addr,
-                                     dpo_id_t *dpo);
-
-extern void receive_dpo_module_init(void);
-
-/**
- * @brief pool of all receive DPOs
- */
-receive_dpo_t *receive_dpo_pool;
-
-static inline receive_dpo_t *
-receive_dpo_get (index_t index)
-{
-    return (pool_elt_at_index(receive_dpo_pool, index));
-}
-
-#endif
diff --git a/vnet/vnet/ethernet/arp.c b/vnet/vnet/ethernet/arp.c
deleted file mode 100644
index b388e778..00000000
--- a/vnet/vnet/ethernet/arp.c
+++ /dev/null
@@ -1,2355 +0,0 @@
-/*
- * ethernet/arp.c: IP v4 ARP node
- *
- * Copyright (c) 2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/ip/ip.h>
-#include <vnet/ip/ip6.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/arp_packet.h>
-#include <vnet/l2/l2_input.h>
-#include <vppinfra/mhash.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/adj/adj_nbr.h>
-#include <vnet/mpls/mpls.h>
-
-/**
- * @file
- * @brief IPv4 ARP.
- *
- * This file contains code to manage the IPv4 ARP tables (IP Address
- * to MAC Address lookup).
- */
-
-
-void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
-
-/**
- * @brief Per-interface ARP configuration and state
- */
-typedef struct ethernet_arp_interface_t_
-{
-  /**
-   * Hash table of ARP entries.
-   * Since this hash table is per-interface, the key is only the IPv4 address.
-   */
-  uword *arp_entries;
-} ethernet_arp_interface_t;
-
-typedef struct
-{
-  u32 lo_addr;
-  u32 hi_addr;
-  u32 fib_index;
-} ethernet_proxy_arp_t;
-
-typedef struct
-{
-  u32 next_index;
-  uword node_index;
-  uword type_opaque;
-  uword data;
-  /* Used for arp event notification only */
-  void *data_callback;
-  u32 pid;
-} pending_resolution_t;
-
-typedef struct
-{
-  /* Hash tables mapping name to opcode. */
-  uword *opcode_by_name;
-
-  /* lite beer "glean" adjacency handling */
-  uword *pending_resolutions_by_address;
-  pending_resolution_t *pending_resolutions;
-
-  /* Mac address change notification */
-  uword *mac_changes_by_address;
-  pending_resolution_t *mac_changes;
-
-  ethernet_arp_ip4_entry_t *ip4_entry_pool;
-
-  /* ARP attack mitigation */
-  u32 arp_delete_rotor;
-  u32 limit_arp_cache_size;
-
-  /** Per interface state */
-  ethernet_arp_interface_t *ethernet_arp_by_sw_if_index;
-
-  /* Proxy arp vector */
-  ethernet_proxy_arp_t *proxy_arps;
-} ethernet_arp_main_t;
-
-static ethernet_arp_main_t ethernet_arp_main;
-
-typedef struct
-{
-  u32 sw_if_index;
-  ethernet_arp_ip4_over_ethernet_address_t a;
-  int is_static;
-  int flags;
-#define ETHERNET_ARP_ARGS_REMOVE (1<<0)
-#define ETHERNET_ARP_ARGS_FLUSH  (1<<1)
-#define ETHERNET_ARP_ARGS_POPULATE  (1<<2)
-} vnet_arp_set_ip4_over_ethernet_rpc_args_t;
-
-static void
-set_ip4_over_ethernet_rpc_callback (vnet_arp_set_ip4_over_ethernet_rpc_args_t
-				    * a);
-
-static u8 *
-format_ethernet_arp_hardware_type (u8 * s, va_list * va)
-{
-  ethernet_arp_hardware_type_t h = va_arg (*va, ethernet_arp_hardware_type_t);
-  char *t = 0;
-  switch (h)
-    {
-#define _(n,f) case n: t = #f; break;
-      foreach_ethernet_arp_hardware_type;
-#undef _
-
-    default:
-      return format (s, "unknown 0x%x", h);
-    }
-
-  return format (s, "%s", t);
-}
-
-static u8 *
-format_ethernet_arp_opcode (u8 * s, va_list * va)
-{
-  ethernet_arp_opcode_t o = va_arg (*va, ethernet_arp_opcode_t);
-  char *t = 0;
-  switch (o)
-    {
-#define _(f) case ETHERNET_ARP_OPCODE_##f: t = #f; break;
-      foreach_ethernet_arp_opcode;
-#undef _
-
-    default:
-      return format (s, "unknown 0x%x", o);
-    }
-
-  return format (s, "%s", t);
-}
-
-static uword
-unformat_ethernet_arp_opcode_host_byte_order (unformat_input_t * input,
-					      va_list * args)
-{
-  int *result = va_arg (*args, int *);
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  int x, i;
-
-  /* Numeric opcode. */
-  if (unformat (input, "0x%x", &x) || unformat (input, "%d", &x))
-    {
-      if (x >= (1 << 16))
-	return 0;
-      *result = x;
-      return 1;
-    }
-
-  /* Named type. */
-  if (unformat_user (input, unformat_vlib_number_by_name,
-		     am->opcode_by_name, &i))
-    {
-      *result = i;
-      return 1;
-    }
-
-  return 0;
-}
-
-static uword
-unformat_ethernet_arp_opcode_net_byte_order (unformat_input_t * input,
-					     va_list * args)
-{
-  int *result = va_arg (*args, int *);
-  if (!unformat_user
-      (input, unformat_ethernet_arp_opcode_host_byte_order, result))
-    return 0;
-
-  *result = clib_host_to_net_u16 ((u16) * result);
-  return 1;
-}
-
-static u8 *
-format_ethernet_arp_header (u8 * s, va_list * va)
-{
-  ethernet_arp_header_t *a = va_arg (*va, ethernet_arp_header_t *);
-  u32 max_header_bytes = va_arg (*va, u32);
-  uword indent;
-  u16 l2_type, l3_type;
-
-  if (max_header_bytes != 0 && sizeof (a[0]) > max_header_bytes)
-    return format (s, "ARP header truncated");
-
-  l2_type = clib_net_to_host_u16 (a->l2_type);
-  l3_type = clib_net_to_host_u16 (a->l3_type);
-
-  indent = format_get_indent (s);
-
-  s = format (s, "%U, type %U/%U, address size %d/%d",
-	      format_ethernet_arp_opcode, clib_net_to_host_u16 (a->opcode),
-	      format_ethernet_arp_hardware_type, l2_type,
-	      format_ethernet_type, l3_type,
-	      a->n_l2_address_bytes, a->n_l3_address_bytes);
-
-  if (l2_type == ETHERNET_ARP_HARDWARE_TYPE_ethernet
-      && l3_type == ETHERNET_TYPE_IP4)
-    {
-      s = format (s, "\n%U%U/%U -> %U/%U",
-		  format_white_space, indent,
-		  format_ethernet_address, a->ip4_over_ethernet[0].ethernet,
-		  format_ip4_address, &a->ip4_over_ethernet[0].ip4,
-		  format_ethernet_address, a->ip4_over_ethernet[1].ethernet,
-		  format_ip4_address, &a->ip4_over_ethernet[1].ip4);
-    }
-  else
-    {
-      uword n2 = a->n_l2_address_bytes;
-      uword n3 = a->n_l3_address_bytes;
-      s = format (s, "\n%U%U/%U -> %U/%U",
-		  format_white_space, indent,
-		  format_hex_bytes, a->data + 0 * n2 + 0 * n3, n2,
-		  format_hex_bytes, a->data + 1 * n2 + 0 * n3, n3,
-		  format_hex_bytes, a->data + 1 * n2 + 1 * n3, n2,
-		  format_hex_bytes, a->data + 2 * n2 + 1 * n3, n3);
-    }
-
-  return s;
-}
-
-u8 *
-format_ethernet_arp_ip4_entry (u8 * s, va_list * va)
-{
-  vnet_main_t *vnm = va_arg (*va, vnet_main_t *);
-  ethernet_arp_ip4_entry_t *e = va_arg (*va, ethernet_arp_ip4_entry_t *);
-  vnet_sw_interface_t *si;
-  u8 *flags = 0;
-
-  if (!e)
-    return format (s, "%=12s%=16s%=6s%=20s%=24s", "Time", "IP4",
-		   "Flags", "Ethernet", "Interface");
-
-  si = vnet_get_sw_interface (vnm, e->sw_if_index);
-
-  if (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC)
-    flags = format (flags, "S");
-
-  if (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC)
-    flags = format (flags, "D");
-
-  s = format (s, "%=12U%=16U%=6s%=20U%=24U",
-	      format_vlib_cpu_time, vnm->vlib_main, e->cpu_time_last_updated,
-	      format_ip4_address, &e->ip4_address,
-	      flags ? (char *) flags : "",
-	      format_ethernet_address, e->ethernet_address,
-	      format_vnet_sw_interface_name, vnm, si);
-
-  vec_free (flags);
-  return s;
-}
-
-typedef struct
-{
-  u8 packet_data[64];
-} ethernet_arp_input_trace_t;
-
-static u8 *
-format_ethernet_arp_input_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  ethernet_arp_input_trace_t *t = va_arg (*va, ethernet_arp_input_trace_t *);
-
-  s = format (s, "%U",
-	      format_ethernet_arp_header,
-	      t->packet_data, sizeof (t->packet_data));
-
-  return s;
-}
-
-static u8 *
-format_arp_term_input_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  ethernet_arp_input_trace_t *t = va_arg (*va, ethernet_arp_input_trace_t *);
-
-  /* arp-term trace data saved is either arp or ip6/icmp6 packet:
-     - for arp, the 1st 16-bit field is hw type of value of 0x0001.
-     - for ip6, the first nibble has value of 6. */
-  s = format (s, "%U", t->packet_data[0] == 0 ?
-	      format_ethernet_arp_header : format_ip6_header,
-	      t->packet_data, sizeof (t->packet_data));
-
-  return s;
-}
-
-static void
-arp_nbr_probe (ip_adjacency_t * adj)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip4_main_t *im = &ip4_main;
-  ip_interface_address_t *ia;
-  ethernet_arp_header_t *h;
-  vnet_hw_interface_t *hi;
-  vnet_sw_interface_t *si;
-  ip4_address_t *src;
-  vlib_buffer_t *b;
-  vlib_main_t *vm;
-  u32 bi = 0;
-
-  vm = vlib_get_main ();
-
-  si = vnet_get_sw_interface (vnm, adj->rewrite_header.sw_if_index);
-
-  if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
-    {
-      return;
-    }
-
-  src =
-    ip4_interface_address_matching_destination (im,
-						&adj->sub_type.nbr.next_hop.
-						ip4,
-						adj->rewrite_header.
-						sw_if_index, &ia);
-  if (!src)
-    {
-      return;
-    }
-
-  h =
-    vlib_packet_template_get_packet (vm, &im->ip4_arp_request_packet_template,
-				     &bi);
-
-  hi = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index);
-
-  clib_memcpy (h->ip4_over_ethernet[0].ethernet,
-	       hi->hw_address, sizeof (h->ip4_over_ethernet[0].ethernet));
-
-  h->ip4_over_ethernet[0].ip4 = src[0];
-  h->ip4_over_ethernet[1].ip4 = adj->sub_type.nbr.next_hop.ip4;
-
-  b = vlib_get_buffer (vm, bi);
-  vnet_buffer (b)->sw_if_index[VLIB_RX] =
-    vnet_buffer (b)->sw_if_index[VLIB_TX] = adj->rewrite_header.sw_if_index;
-
-  /* Add encapsulation string for software interface (e.g. ethernet header). */
-  vnet_rewrite_one_header (adj[0], h, sizeof (ethernet_header_t));
-  vlib_buffer_advance (b, -adj->rewrite_header.data_bytes);
-
-  {
-    vlib_frame_t *f = vlib_get_frame_to_node (vm, hi->output_node_index);
-    u32 *to_next = vlib_frame_vector_args (f);
-    to_next[0] = bi;
-    f->n_vectors = 1;
-    vlib_put_frame_to_node (vm, hi->output_node_index, f);
-  }
-}
-
-static void
-arp_mk_complete (adj_index_t ai, ethernet_arp_ip4_entry_t * e)
-{
-  adj_nbr_update_rewrite
-    (ai, ADJ_NBR_REWRITE_FLAG_COMPLETE,
-     ethernet_build_rewrite (vnet_get_main (),
-			     e->sw_if_index,
-			     adj_get_link_type (ai), e->ethernet_address));
-}
-
-static void
-arp_mk_incomplete (adj_index_t ai)
-{
-  ip_adjacency_t *adj = adj_get (ai);
-
-  adj_nbr_update_rewrite
-    (ai,
-     ADJ_NBR_REWRITE_FLAG_INCOMPLETE,
-     ethernet_build_rewrite (vnet_get_main (),
-			     adj->rewrite_header.sw_if_index,
-			     VNET_LINK_ARP,
-			     VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST));
-}
-
-static ethernet_arp_ip4_entry_t *
-arp_entry_find (ethernet_arp_interface_t * eai, const ip4_address_t * addr)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ethernet_arp_ip4_entry_t *e = NULL;
-  uword *p;
-
-  if (NULL != eai->arp_entries)
-    {
-      p = hash_get (eai->arp_entries, addr->as_u32);
-      if (!p)
-	return (NULL);
-
-      e = pool_elt_at_index (am->ip4_entry_pool, p[0]);
-    }
-
-  return (e);
-}
-
-static adj_walk_rc_t
-arp_mk_complete_walk (adj_index_t ai, void *ctx)
-{
-  ethernet_arp_ip4_entry_t *e = ctx;
-
-  arp_mk_complete (ai, e);
-
-  return (ADJ_WALK_RC_CONTINUE);
-}
-
-static adj_walk_rc_t
-arp_mk_incomplete_walk (adj_index_t ai, void *ctx)
-{
-  arp_mk_incomplete (ai);
-
-  return (ADJ_WALK_RC_CONTINUE);
-}
-
-void
-arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ethernet_arp_interface_t *arp_int;
-  ethernet_arp_ip4_entry_t *e;
-  ip_adjacency_t *adj;
-
-  adj = adj_get (ai);
-
-  vec_validate (am->ethernet_arp_by_sw_if_index, sw_if_index);
-  arp_int = &am->ethernet_arp_by_sw_if_index[sw_if_index];
-  e = arp_entry_find (arp_int, &adj->sub_type.nbr.next_hop.ip4);
-
-  if (NULL != e)
-    {
-      adj_nbr_walk_nh4 (sw_if_index,
-			&e->ip4_address, arp_mk_complete_walk, e);
-    }
-  else
-    {
-      /*
-       * no matching ARP entry.
-       * construct the rewire required to for an ARP packet, and stick
-       * that in the adj's pipe to smoke.
-       */
-      adj_nbr_update_rewrite (ai,
-			      ADJ_NBR_REWRITE_FLAG_INCOMPLETE,
-			      ethernet_build_rewrite (vnm,
-						      sw_if_index,
-						      VNET_LINK_ARP,
-						      VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST));
-
-      /*
-       * since the FIB has added this adj for a route, it makes sense it may
-       * want to forward traffic sometime soon. Let's send a speculative ARP.
-       * just one. If we were to do periodically that wouldn't be bad either,
-       * but that's more code than i'm prepared to write at this time for
-       * relatively little reward.
-       */
-      arp_nbr_probe (adj);
-    }
-}
-
-int
-vnet_arp_set_ip4_over_ethernet_internal (vnet_main_t * vnm,
-					 vnet_arp_set_ip4_over_ethernet_rpc_args_t
-					 * args)
-{
-  ethernet_arp_ip4_entry_t *e = 0;
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ethernet_arp_ip4_over_ethernet_address_t *a = &args->a;
-  vlib_main_t *vm = vlib_get_main ();
-  int make_new_arp_cache_entry = 1;
-  uword *p;
-  pending_resolution_t *pr, *mc;
-  ethernet_arp_interface_t *arp_int;
-  int is_static = args->is_static;
-  u32 sw_if_index = args->sw_if_index;
-
-  vec_validate (am->ethernet_arp_by_sw_if_index, sw_if_index);
-
-  arp_int = &am->ethernet_arp_by_sw_if_index[sw_if_index];
-
-  if (NULL != arp_int->arp_entries)
-    {
-      p = hash_get (arp_int->arp_entries, a->ip4.as_u32);
-      if (p)
-	{
-	  e = pool_elt_at_index (am->ip4_entry_pool, p[0]);
-
-	  /* Refuse to over-write static arp. */
-	  if (!is_static && (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC))
-	    return -2;
-	  make_new_arp_cache_entry = 0;
-	}
-    }
-
-  if (make_new_arp_cache_entry)
-    {
-      fib_prefix_t pfx = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-		    .ip4 = a->ip4,
-		    }
-	,
-      };
-      u32 fib_index;
-
-      pool_get (am->ip4_entry_pool, e);
-
-      if (NULL == arp_int->arp_entries)
-	{
-	  arp_int->arp_entries = hash_create (0, sizeof (u32));
-	}
-
-      hash_set (arp_int->arp_entries, a->ip4.as_u32, e - am->ip4_entry_pool);
-
-      e->sw_if_index = sw_if_index;
-      e->ip4_address = a->ip4;
-      clib_memcpy (e->ethernet_address,
-		   a->ethernet, sizeof (e->ethernet_address));
-
-      fib_index = ip4_fib_table_get_index_for_sw_if_index (e->sw_if_index);
-      e->fib_entry_index =
-	fib_table_entry_update_one_path (fib_index,
-					 &pfx,
-					 FIB_SOURCE_ADJ,
-					 FIB_ENTRY_FLAG_ATTACHED,
-					 FIB_PROTOCOL_IP4,
-					 &pfx.fp_addr,
-					 e->sw_if_index,
-					 ~0,
-					 1, NULL, FIB_ROUTE_PATH_FLAG_NONE);
-    }
-  else
-    {
-      /*
-       * prevent a DoS attack from the data-plane that
-       * spams us with no-op updates to the MAC address
-       */
-      if (0 == memcmp (e->ethernet_address,
-		       a->ethernet, sizeof (e->ethernet_address)))
-	return -1;
-
-      /* Update time stamp and ethernet address. */
-      clib_memcpy (e->ethernet_address, a->ethernet,
-		   sizeof (e->ethernet_address));
-    }
-
-  e->cpu_time_last_updated = clib_cpu_time_now ();
-  if (is_static)
-    e->flags |= ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC;
-  else
-    e->flags |= ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC;
-
-  adj_nbr_walk_nh4 (sw_if_index, &e->ip4_address, arp_mk_complete_walk, e);
-
-  /* Customer(s) waiting for this address to be resolved? */
-  p = hash_get (am->pending_resolutions_by_address, a->ip4.as_u32);
-  if (p)
-    {
-      u32 next_index;
-      next_index = p[0];
-
-      while (next_index != (u32) ~ 0)
-	{
-	  pr = pool_elt_at_index (am->pending_resolutions, next_index);
-	  vlib_process_signal_event (vm, pr->node_index,
-				     pr->type_opaque, pr->data);
-	  next_index = pr->next_index;
-	  pool_put (am->pending_resolutions, pr);
-	}
-
-      hash_unset (am->pending_resolutions_by_address, a->ip4.as_u32);
-    }
-
-  /* Customer(s) requesting ARP event for this address? */
-  p = hash_get (am->mac_changes_by_address, a->ip4.as_u32);
-  if (p)
-    {
-      u32 next_index;
-      next_index = p[0];
-
-      while (next_index != (u32) ~ 0)
-	{
-	  int (*fp) (u32, u8 *, u32, u32);
-	  int rv = 1;
-	  mc = pool_elt_at_index (am->mac_changes, next_index);
-	  fp = mc->data_callback;
-
-	  /* Call the user's data callback, return 1 to suppress dup events */
-	  if (fp)
-	    rv = (*fp) (mc->data, a->ethernet, sw_if_index, 0);
-
-	  /*
-	   * Signal the resolver process, as long as the user
-	   * says they want to be notified
-	   */
-	  if (rv == 0)
-	    vlib_process_signal_event (vm, mc->node_index,
-				       mc->type_opaque, mc->data);
-	  next_index = mc->next_index;
-	}
-    }
-
-  return 0;
-}
-
-void
-vnet_register_ip4_arp_resolution_event (vnet_main_t * vnm,
-					void *address_arg,
-					uword node_index,
-					uword type_opaque, uword data)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ip4_address_t *address = address_arg;
-  uword *p;
-  pending_resolution_t *pr;
-
-  pool_get (am->pending_resolutions, pr);
-
-  pr->next_index = ~0;
-  pr->node_index = node_index;
-  pr->type_opaque = type_opaque;
-  pr->data = data;
-  pr->data_callback = 0;
-
-  p = hash_get (am->pending_resolutions_by_address, address->as_u32);
-  if (p)
-    {
-      /* Insert new resolution at the head of the list */
-      pr->next_index = p[0];
-      hash_unset (am->pending_resolutions_by_address, address->as_u32);
-    }
-
-  hash_set (am->pending_resolutions_by_address, address->as_u32,
-	    pr - am->pending_resolutions);
-}
-
-int
-vnet_add_del_ip4_arp_change_event (vnet_main_t * vnm,
-				   void *data_callback,
-				   u32 pid,
-				   void *address_arg,
-				   uword node_index,
-				   uword type_opaque, uword data, int is_add)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ip4_address_t *address = address_arg;
-  uword *p;
-  pending_resolution_t *mc;
-  void (*fp) (u32, u8 *) = data_callback;
-
-  if (is_add)
-    {
-      pool_get (am->mac_changes, mc);
-
-      mc->next_index = ~0;
-      mc->node_index = node_index;
-      mc->type_opaque = type_opaque;
-      mc->data = data;
-      mc->data_callback = data_callback;
-      mc->pid = pid;
-
-      p = hash_get (am->mac_changes_by_address, address->as_u32);
-      if (p)
-	{
-	  /* Insert new resolution at the head of the list */
-	  mc->next_index = p[0];
-	  hash_unset (am->mac_changes_by_address, address->as_u32);
-	}
-
-      hash_set (am->mac_changes_by_address, address->as_u32,
-		mc - am->mac_changes);
-      return 0;
-    }
-  else
-    {
-      u32 index;
-      pending_resolution_t *mc_last = 0;
-
-      p = hash_get (am->mac_changes_by_address, address->as_u32);
-      if (p == 0)
-	return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-      index = p[0];
-
-      while (index != (u32) ~ 0)
-	{
-	  mc = pool_elt_at_index (am->mac_changes, index);
-	  if (mc->node_index == node_index &&
-	      mc->type_opaque == type_opaque && mc->pid == pid)
-	    {
-	      /* Clients may need to clean up pool entries, too */
-	      if (fp)
-		(*fp) (mc->data, 0 /* no new mac addrs */ );
-	      if (index == p[0])
-		{
-		  hash_unset (am->mac_changes_by_address, address->as_u32);
-		  if (mc->next_index != ~0)
-		    hash_set (am->mac_changes_by_address, address->as_u32,
-			      mc->next_index);
-		  pool_put (am->mac_changes, mc);
-		  return 0;
-		}
-	      else
-		{
-		  ASSERT (mc_last);
-		  mc_last->next_index = mc->next_index;
-		  pool_put (am->mac_changes, mc);
-		  return 0;
-		}
-	    }
-	  mc_last = mc;
-	  index = mc->next_index;
-	}
-
-      return VNET_API_ERROR_NO_SUCH_ENTRY;
-    }
-}
-
-/* Either we drop the packet or we send a reply to the sender. */
-typedef enum
-{
-  ARP_INPUT_NEXT_DROP,
-  ARP_INPUT_NEXT_REPLY_TX,
-  ARP_INPUT_N_NEXT,
-} arp_input_next_t;
-
-#define foreach_ethernet_arp_error					\
-  _ (replies_sent, "ARP replies sent")					\
-  _ (l2_type_not_ethernet, "L2 type not ethernet")			\
-  _ (l3_type_not_ip4, "L3 type not IP4")				\
-  _ (l3_src_address_not_local, "IP4 source address not local to subnet") \
-  _ (l3_dst_address_not_local, "IP4 destination address not local to subnet") \
-  _ (l3_src_address_is_local, "IP4 source address matches local interface") \
-  _ (l3_src_address_learned, "ARP request IP4 source address learned")  \
-  _ (replies_received, "ARP replies received")				\
-  _ (opcode_not_request, "ARP opcode not request")                      \
-  _ (proxy_arp_replies_sent, "Proxy ARP replies sent")			\
-  _ (l2_address_mismatch, "ARP hw addr does not match L2 frame src addr") \
-  _ (missing_interface_address, "ARP missing interface address") \
-  _ (gratuitous_arp, "ARP probe or announcement dropped") \
-  _ (interface_no_table, "Interface is not mapped to an IP table") \
-
-typedef enum
-{
-#define _(sym,string) ETHERNET_ARP_ERROR_##sym,
-  foreach_ethernet_arp_error
-#undef _
-    ETHERNET_ARP_N_ERROR,
-} ethernet_arp_input_error_t;
-
-
-static void
-unset_random_arp_entry (void)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ethernet_arp_ip4_entry_t *e;
-  vnet_main_t *vnm = vnet_get_main ();
-  ethernet_arp_ip4_over_ethernet_address_t delme;
-  u32 index;
-
-  index = pool_next_index (am->ip4_entry_pool, am->arp_delete_rotor);
-  am->arp_delete_rotor = index;
-
-  /* Try again from elt 0, could happen if an intfc goes down */
-  if (index == ~0)
-    {
-      index = pool_next_index (am->ip4_entry_pool, am->arp_delete_rotor);
-      am->arp_delete_rotor = index;
-    }
-
-  /* Nothing left in the pool */
-  if (index == ~0)
-    return;
-
-  e = pool_elt_at_index (am->ip4_entry_pool, index);
-
-  clib_memcpy (&delme.ethernet, e->ethernet_address, 6);
-  delme.ip4.as_u32 = e->ip4_address.as_u32;
-
-  vnet_arp_unset_ip4_over_ethernet (vnm, e->sw_if_index, &delme);
-}
-
-static int
-arp_unnumbered (vlib_buffer_t * p0,
-		u32 pi0, ethernet_header_t * eth0, u32 sw_if_index)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *vim = &vnm->interface_main;
-  vnet_sw_interface_t *si;
-  vnet_hw_interface_t *hi;
-  u32 unnum_src_sw_if_index;
-  u32 *broadcast_swifs = 0;
-  u32 *buffers = 0;
-  u32 n_alloc = 0;
-  vlib_buffer_t *b0;
-  int i;
-  u8 dst_mac_address[6];
-  i16 header_size;
-  ethernet_arp_header_t *arp0;
-
-  /* Save the dst mac address */
-  clib_memcpy (dst_mac_address, eth0->dst_address, sizeof (dst_mac_address));
-
-  /* Figure out which sw_if_index supplied the address */
-  unnum_src_sw_if_index = sw_if_index;
-
-  /* Track down all users of the unnumbered source */
-  /* *INDENT-OFF* */
-  pool_foreach (si, vim->sw_interfaces,
-  ({
-    if (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED &&
-	(si->unnumbered_sw_if_index == unnum_src_sw_if_index))
-      {
-	vec_add1 (broadcast_swifs, si->sw_if_index);
-      }
-  }));
-  /* *INDENT-ON* */
-
-  /* If there are no interfaces un-unmbered to this interface,
-     we are done  here. */
-  if (0 == vec_len (broadcast_swifs))
-    return 0;
-
-  /* Allocate buffering if we need it */
-  if (vec_len (broadcast_swifs) > 1)
-    {
-      vec_validate (buffers, vec_len (broadcast_swifs) - 2);
-      n_alloc = vlib_buffer_alloc (vm, buffers, vec_len (buffers));
-      _vec_len (buffers) = n_alloc;
-      for (i = 0; i < n_alloc; i++)
-	{
-	  b0 = vlib_get_buffer (vm, buffers[i]);
-
-	  /* xerox (partially built) ARP pkt */
-	  clib_memcpy (b0->data, p0->data,
-		       p0->current_length + p0->current_data);
-	  b0->current_data = p0->current_data;
-	  b0->current_length = p0->current_length;
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
-	    vnet_buffer (p0)->sw_if_index[VLIB_RX];
-	}
-    }
-
-  vec_insert (buffers, 1, 0);
-  buffers[0] = pi0;
-
-  for (i = 0; i < vec_len (buffers); i++)
-    {
-      b0 = vlib_get_buffer (vm, buffers[i]);
-      arp0 = vlib_buffer_get_current (b0);
-
-      hi = vnet_get_sup_hw_interface (vnm, broadcast_swifs[i]);
-      si = vnet_get_sw_interface (vnm, broadcast_swifs[i]);
-
-      /* For decoration, most likely */
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] = hi->sw_if_index;
-
-      /* Fix ARP pkt src address */
-      clib_memcpy (arp0->ip4_over_ethernet[0].ethernet, hi->hw_address, 6);
-
-      /* Build L2 encaps for this swif */
-      header_size = sizeof (ethernet_header_t);
-      if (si->sub.eth.flags.one_tag)
-	header_size += 4;
-      else if (si->sub.eth.flags.two_tags)
-	header_size += 8;
-
-      vlib_buffer_advance (b0, -header_size);
-      eth0 = vlib_buffer_get_current (b0);
-
-      if (si->sub.eth.flags.one_tag)
-	{
-	  ethernet_vlan_header_t *outer = (void *) (eth0 + 1);
-
-	  eth0->type = si->sub.eth.flags.dot1ad ?
-	    clib_host_to_net_u16 (ETHERNET_TYPE_DOT1AD) :
-	    clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
-	  outer->priority_cfi_and_id =
-	    clib_host_to_net_u16 (si->sub.eth.outer_vlan_id);
-	  outer->type = clib_host_to_net_u16 (ETHERNET_TYPE_ARP);
-
-	}
-      else if (si->sub.eth.flags.two_tags)
-	{
-	  ethernet_vlan_header_t *outer = (void *) (eth0 + 1);
-	  ethernet_vlan_header_t *inner = (void *) (outer + 1);
-
-	  eth0->type = si->sub.eth.flags.dot1ad ?
-	    clib_host_to_net_u16 (ETHERNET_TYPE_DOT1AD) :
-	    clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
-	  outer->priority_cfi_and_id =
-	    clib_host_to_net_u16 (si->sub.eth.outer_vlan_id);
-	  outer->type = clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
-	  inner->priority_cfi_and_id =
-	    clib_host_to_net_u16 (si->sub.eth.inner_vlan_id);
-	  inner->type = clib_host_to_net_u16 (ETHERNET_TYPE_ARP);
-
-	}
-      else
-	{
-	  eth0->type = clib_host_to_net_u16 (ETHERNET_TYPE_ARP);
-	}
-
-      /* Restore the original dst address, set src address */
-      clib_memcpy (eth0->dst_address, dst_mac_address,
-		   sizeof (eth0->dst_address));
-      clib_memcpy (eth0->src_address, hi->hw_address,
-		   sizeof (eth0->src_address));
-
-      /* Transmit replicas */
-      if (i > 0)
-	{
-	  vlib_frame_t *f =
-	    vlib_get_frame_to_node (vm, hi->output_node_index);
-	  u32 *to_next = vlib_frame_vector_args (f);
-	  to_next[0] = buffers[i];
-	  f->n_vectors = 1;
-	  vlib_put_frame_to_node (vm, hi->output_node_index, f);
-	}
-    }
-
-  /* The regular path outputs the original pkt.. */
-  vnet_buffer (p0)->sw_if_index[VLIB_TX] = broadcast_swifs[0];
-
-  vec_free (broadcast_swifs);
-  vec_free (buffers);
-
-  return !0;
-}
-
-static uword
-arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  ip4_main_t *im4 = &ip4_main;
-  u32 n_left_from, next_index, *from, *to_next;
-  u32 n_replies_sent = 0, n_proxy_arp_replies_sent = 0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-				   /* stride */ 1,
-				   sizeof (ethernet_arp_input_trace_t));
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  vnet_hw_interface_t *hw_if0;
-	  ethernet_arp_header_t *arp0;
-	  ethernet_header_t *eth0;
-	  ip_adjacency_t *adj0;
-	  ip4_address_t *if_addr0, proxy_src;
-	  u32 pi0, error0, next0, sw_if_index0, conn_sw_if_index0, fib_index0;
-	  u8 is_request0, dst_is_local0, is_unnum0;
-	  ethernet_proxy_arp_t *pa;
-	  fib_node_index_t dst_fei, src_fei;
-	  fib_prefix_t pfx0;
-	  fib_entry_flag_t src_flags, dst_flags;
-
-	  pi0 = from[0];
-	  to_next[0] = pi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-	  pa = 0;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  arp0 = vlib_buffer_get_current (p0);
-
-	  is_request0 = arp0->opcode
-	    == clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_request);
-
-	  error0 = ETHERNET_ARP_ERROR_replies_sent;
-
-	  error0 =
-	    (arp0->l2_type !=
-	     clib_net_to_host_u16 (ETHERNET_ARP_HARDWARE_TYPE_ethernet) ?
-	     ETHERNET_ARP_ERROR_l2_type_not_ethernet : error0);
-	  error0 =
-	    (arp0->l3_type !=
-	     clib_net_to_host_u16 (ETHERNET_TYPE_IP4) ?
-	     ETHERNET_ARP_ERROR_l3_type_not_ip4 : error0);
-
-	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
-
-	  if (error0)
-	    goto drop2;
-
-	  /* Check that IP address is local and matches incoming interface. */
-	  fib_index0 = ip4_fib_table_get_index_for_sw_if_index (sw_if_index0);
-	  if (~0 == fib_index0)
-	    {
-	      error0 = ETHERNET_ARP_ERROR_interface_no_table;
-	      goto drop2;
-
-	    }
-	  dst_fei = ip4_fib_table_lookup (ip4_fib_get (fib_index0),
-					  &arp0->ip4_over_ethernet[1].ip4,
-					  32);
-	  dst_flags = fib_entry_get_flags_for_source (dst_fei,
-						      FIB_SOURCE_INTERFACE);
-
-	  conn_sw_if_index0 =
-	    fib_entry_get_resolving_interface_for_source (dst_fei,
-							  FIB_SOURCE_INTERFACE);
-
-	  if (!(FIB_ENTRY_FLAG_CONNECTED & dst_flags))
-	    {
-	      error0 = ETHERNET_ARP_ERROR_l3_dst_address_not_local;
-	      goto drop1;
-	    }
-
-	  /* Honor unnumbered interface, if any */
-	  is_unnum0 = sw_if_index0 != conn_sw_if_index0;
-
-	  /* Source must also be local to subnet of matching interface address. */
-	  src_fei = ip4_fib_table_lookup (ip4_fib_get (fib_index0),
-					  &arp0->ip4_over_ethernet[0].ip4,
-					  32);
-	  src_flags = fib_entry_get_flags (src_fei);
-
-	  if (!((FIB_ENTRY_FLAG_ATTACHED & src_flags) ||
-		(FIB_ENTRY_FLAG_CONNECTED & src_flags)) ||
-	      sw_if_index0 != fib_entry_get_resolving_interface (src_fei))
-	    {
-	      error0 = ETHERNET_ARP_ERROR_l3_src_address_not_local;
-	      goto drop2;
-	    }
-
-	  /* Reject requests/replies with our local interface address. */
-	  if (FIB_ENTRY_FLAG_LOCAL & src_flags)
-	    {
-	      error0 = ETHERNET_ARP_ERROR_l3_src_address_is_local;
-	      goto drop2;
-	    }
-
-	  dst_is_local0 = (FIB_ENTRY_FLAG_LOCAL & dst_flags);
-	  fib_entry_get_prefix (dst_fei, &pfx0);
-	  if_addr0 = &pfx0.fp_addr.ip4;
-
-	  /* Fill in ethernet header. */
-	  eth0 = ethernet_buffer_get_header (p0);
-
-	  /* Trash ARP packets whose ARP-level source addresses do not
-	     match their L2-frame-level source addresses */
-	  if (memcmp (eth0->src_address, arp0->ip4_over_ethernet[0].ethernet,
-		      sizeof (eth0->src_address)))
-	    {
-	      error0 = ETHERNET_ARP_ERROR_l2_address_mismatch;
-	      goto drop2;
-	    }
-
-	  /* Learn or update sender's mapping only for requests or unicasts
-	     that don't match local interface address. */
-	  if (ethernet_address_cast (eth0->dst_address) ==
-	      ETHERNET_ADDRESS_UNICAST || is_request0)
-	    {
-	      if (am->limit_arp_cache_size &&
-		  pool_elts (am->ip4_entry_pool) >= am->limit_arp_cache_size)
-		unset_random_arp_entry ();
-
-	      vnet_arp_set_ip4_over_ethernet (vnm, sw_if_index0,
-					      &arp0->ip4_over_ethernet[0],
-					      0 /* is_static */ );
-	      error0 = ETHERNET_ARP_ERROR_l3_src_address_learned;
-	    }
-
-	  /* Only send a reply for requests sent which match a local interface. */
-	  if (!(is_request0 && dst_is_local0))
-	    {
-	      error0 =
-		(arp0->opcode ==
-		 clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply) ?
-		 ETHERNET_ARP_ERROR_replies_received : error0);
-	      goto drop1;
-	    }
-
-	  /* Send a reply. */
-	send_reply:
-	  vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0;
-	  hw_if0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
-
-	  /* Send reply back through input interface */
-	  vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0;
-	  next0 = ARP_INPUT_NEXT_REPLY_TX;
-
-	  arp0->opcode = clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply);
-
-	  arp0->ip4_over_ethernet[1] = arp0->ip4_over_ethernet[0];
-
-	  clib_memcpy (arp0->ip4_over_ethernet[0].ethernet,
-		       hw_if0->hw_address, 6);
-	  clib_mem_unaligned (&arp0->ip4_over_ethernet[0].ip4.data_u32, u32) =
-	    if_addr0->data_u32;
-
-	  /* Hardware must be ethernet-like. */
-	  ASSERT (vec_len (hw_if0->hw_address) == 6);
-
-	  clib_memcpy (eth0->dst_address, eth0->src_address, 6);
-	  clib_memcpy (eth0->src_address, hw_if0->hw_address, 6);
-
-	  /* Figure out how much to rewind current data from adjacency. */
-	  /* get the adj from the destination's covering connected */
-	  if (NULL == pa)
-	    {
-	      adj0 =
-		adj_get (fib_entry_get_adj_for_source
-			 (ip4_fib_table_lookup
-			  (ip4_fib_get (fib_index0),
-			   &arp0->ip4_over_ethernet[1].ip4, 31),
-			  FIB_SOURCE_INTERFACE));
-	      if (adj0->lookup_next_index != IP_LOOKUP_NEXT_GLEAN)
-		{
-		  error0 = ETHERNET_ARP_ERROR_missing_interface_address;
-		  goto drop2;
-		}
-	      if (is_unnum0)
-		{
-		  if (!arp_unnumbered (p0, pi0, eth0, conn_sw_if_index0))
-		    goto drop2;
-		}
-	      else
-		vlib_buffer_advance (p0, -adj0->rewrite_header.data_bytes);
-	    }
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, pi0, next0);
-
-	  n_replies_sent += 1;
-	  continue;
-
-	drop1:
-	  if (0 == arp0->ip4_over_ethernet[0].ip4.as_u32 ||
-	      (arp0->ip4_over_ethernet[0].ip4.as_u32 ==
-	       arp0->ip4_over_ethernet[1].ip4.as_u32))
-	    {
-	      error0 = ETHERNET_ARP_ERROR_gratuitous_arp;
-	      goto drop2;
-	    }
-	  /* See if proxy arp is configured for the address */
-	  if (is_request0)
-	    {
-	      vnet_sw_interface_t *si;
-	      u32 this_addr = clib_net_to_host_u32
-		(arp0->ip4_over_ethernet[1].ip4.as_u32);
-	      u32 fib_index0;
-
-	      si = vnet_get_sw_interface (vnm, sw_if_index0);
-
-	      if (!(si->flags & VNET_SW_INTERFACE_FLAG_PROXY_ARP))
-		goto drop2;
-
-	      fib_index0 = vec_elt (im4->fib_index_by_sw_if_index,
-				    sw_if_index0);
-
-	      vec_foreach (pa, am->proxy_arps)
-	      {
-		u32 lo_addr = clib_net_to_host_u32 (pa->lo_addr);
-		u32 hi_addr = clib_net_to_host_u32 (pa->hi_addr);
-
-		/* an ARP request hit in the proxy-arp table? */
-		if ((this_addr >= lo_addr && this_addr <= hi_addr) &&
-		    (fib_index0 == pa->fib_index))
-		  {
-		    eth0 = ethernet_buffer_get_header (p0);
-		    proxy_src.as_u32 =
-		      arp0->ip4_over_ethernet[1].ip4.data_u32;
-
-		    /*
-		     * Rewind buffer, direct code above not to
-		     * think too hard about it.
-		     */
-		    if_addr0 = &proxy_src;
-		    is_unnum0 = 0;
-		    i32 ethernet_start =
-		      vnet_buffer (p0)->ethernet.start_of_ethernet_header;
-		    i32 rewind = p0->current_data - ethernet_start;
-		    vlib_buffer_advance (p0, -rewind);
-		    n_proxy_arp_replies_sent++;
-		    goto send_reply;
-		  }
-	      }
-	    }
-
-	drop2:
-
-	  next0 = ARP_INPUT_NEXT_DROP;
-	  p0->error = node->errors[error0];
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, pi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_error_count (vm, node->node_index,
-		    ETHERNET_ARP_ERROR_replies_sent,
-		    n_replies_sent - n_proxy_arp_replies_sent);
-
-  vlib_error_count (vm, node->node_index,
-		    ETHERNET_ARP_ERROR_proxy_arp_replies_sent,
-		    n_proxy_arp_replies_sent);
-  return frame->n_vectors;
-}
-
-static char *ethernet_arp_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ethernet_arp_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (arp_input_node, static) =
-{
-  .function = arp_input,
-  .name = "arp-input",
-  .vector_size = sizeof (u32),
-  .n_errors = ETHERNET_ARP_N_ERROR,
-  .error_strings = ethernet_arp_error_strings,
-  .n_next_nodes = ARP_INPUT_N_NEXT,
-  .next_nodes = {
-    [ARP_INPUT_NEXT_DROP] = "error-drop",
-    [ARP_INPUT_NEXT_REPLY_TX] = "interface-output",
-  },
-  .format_buffer = format_ethernet_arp_header,
-  .format_trace = format_ethernet_arp_input_trace,
-};
-/* *INDENT-ON* */
-
-static int
-ip4_arp_entry_sort (void *a1, void *a2)
-{
-  ethernet_arp_ip4_entry_t *e1 = a1;
-  ethernet_arp_ip4_entry_t *e2 = a2;
-
-  int cmp;
-  vnet_main_t *vnm = vnet_get_main ();
-
-  cmp = vnet_sw_interface_compare (vnm, e1->sw_if_index, e2->sw_if_index);
-  if (!cmp)
-    cmp = ip4_address_compare (&e1->ip4_address, &e2->ip4_address);
-  return cmp;
-}
-
-ethernet_arp_ip4_entry_t *
-ip4_neighbor_entries (u32 sw_if_index)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ethernet_arp_ip4_entry_t *n, *ns = 0;
-
-  /* *INDENT-OFF* */
-  pool_foreach (n, am->ip4_entry_pool, ({
-    if (sw_if_index != ~0 && n->sw_if_index != sw_if_index)
-      continue;
-    vec_add1 (ns, n[0]);
-  }));
-  /* *INDENT-ON* */
-
-  if (ns)
-    vec_sort_with_function (ns, ip4_arp_entry_sort);
-  return ns;
-}
-
-static clib_error_t *
-show_ip4_arp (vlib_main_t * vm,
-	      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ethernet_arp_ip4_entry_t *e, *es;
-  ethernet_proxy_arp_t *pa;
-  clib_error_t *error = 0;
-  u32 sw_if_index;
-
-  /* Filter entries by interface if given. */
-  sw_if_index = ~0;
-  (void) unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index);
-
-  es = ip4_neighbor_entries (sw_if_index);
-  if (es)
-    {
-      vlib_cli_output (vm, "%U", format_ethernet_arp_ip4_entry, vnm, 0);
-      vec_foreach (e, es)
-      {
-	vlib_cli_output (vm, "%U", format_ethernet_arp_ip4_entry, vnm, e);
-      }
-      vec_free (es);
-    }
-
-  if (vec_len (am->proxy_arps))
-    {
-      vlib_cli_output (vm, "Proxy arps enabled for:");
-      vec_foreach (pa, am->proxy_arps)
-      {
-	vlib_cli_output (vm, "Fib_index %d   %U - %U ",
-			 pa->fib_index,
-			 format_ip4_address, &pa->lo_addr,
-			 format_ip4_address, &pa->hi_addr);
-      }
-    }
-
-  return error;
-}
-
-/*?
- * Display all the IPv4 ARP entries.
- *
- * @cliexpar
- * Example of how to display the IPv4 ARP table:
- * @cliexstart{show ip arp}
- *    Time      FIB        IP4       Flags      Ethernet              Interface
- *    346.3028   0       6.1.1.3            de:ad:be:ef:ba:be   GigabitEthernet2/0/0
- *   3077.4271   0       6.1.1.4       S    de:ad:be:ef:ff:ff   GigabitEthernet2/0/0
- *   2998.6409   1       6.2.2.3            de:ad:be:ef:00:01   GigabitEthernet2/0/0
- * Proxy arps enabled for:
- * Fib_index 0   6.0.0.1 - 6.0.0.11
- * @cliexend
- ?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_ip4_arp_command, static) = {
-  .path = "show ip arp",
-  .function = show_ip4_arp,
-  .short_help = "show ip arp",
-};
-/* *INDENT-ON* */
-
-typedef struct
-{
-  pg_edit_t l2_type, l3_type;
-  pg_edit_t n_l2_address_bytes, n_l3_address_bytes;
-  pg_edit_t opcode;
-  struct
-  {
-    pg_edit_t ethernet;
-    pg_edit_t ip4;
-  } ip4_over_ethernet[2];
-} pg_ethernet_arp_header_t;
-
-static inline void
-pg_ethernet_arp_header_init (pg_ethernet_arp_header_t * p)
-{
-  /* Initialize fields that are not bit fields in the IP header. */
-#define _(f) pg_edit_init (&p->f, ethernet_arp_header_t, f);
-  _(l2_type);
-  _(l3_type);
-  _(n_l2_address_bytes);
-  _(n_l3_address_bytes);
-  _(opcode);
-  _(ip4_over_ethernet[0].ethernet);
-  _(ip4_over_ethernet[0].ip4);
-  _(ip4_over_ethernet[1].ethernet);
-  _(ip4_over_ethernet[1].ip4);
-#undef _
-}
-
-uword
-unformat_pg_arp_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t *s = va_arg (*args, pg_stream_t *);
-  pg_ethernet_arp_header_t *p;
-  u32 group_index;
-
-  p = pg_create_edit_group (s, sizeof (p[0]), sizeof (ethernet_arp_header_t),
-			    &group_index);
-  pg_ethernet_arp_header_init (p);
-
-  /* Defaults. */
-  pg_edit_set_fixed (&p->l2_type, ETHERNET_ARP_HARDWARE_TYPE_ethernet);
-  pg_edit_set_fixed (&p->l3_type, ETHERNET_TYPE_IP4);
-  pg_edit_set_fixed (&p->n_l2_address_bytes, 6);
-  pg_edit_set_fixed (&p->n_l3_address_bytes, 4);
-
-  if (!unformat (input, "%U: %U/%U -> %U/%U",
-		 unformat_pg_edit,
-		 unformat_ethernet_arp_opcode_net_byte_order, &p->opcode,
-		 unformat_pg_edit,
-		 unformat_ethernet_address, &p->ip4_over_ethernet[0].ethernet,
-		 unformat_pg_edit,
-		 unformat_ip4_address, &p->ip4_over_ethernet[0].ip4,
-		 unformat_pg_edit,
-		 unformat_ethernet_address, &p->ip4_over_ethernet[1].ethernet,
-		 unformat_pg_edit,
-		 unformat_ip4_address, &p->ip4_over_ethernet[1].ip4))
-    {
-      /* Free up any edits we may have added. */
-      pg_free_edit_group (s);
-      return 0;
-    }
-  return 1;
-}
-
-clib_error_t *
-ip4_set_arp_limit (u32 arp_limit)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-
-  am->limit_arp_cache_size = arp_limit;
-  return 0;
-}
-
-/**
- * @brief Control Plane hook to remove an ARP entry
- */
-int
-vnet_arp_unset_ip4_over_ethernet (vnet_main_t * vnm,
-				  u32 sw_if_index, void *a_arg)
-{
-  ethernet_arp_ip4_over_ethernet_address_t *a = a_arg;
-  vnet_arp_set_ip4_over_ethernet_rpc_args_t args;
-
-  args.sw_if_index = sw_if_index;
-  args.flags = ETHERNET_ARP_ARGS_REMOVE;
-  clib_memcpy (&args.a, a, sizeof (*a));
-
-  vl_api_rpc_call_main_thread (set_ip4_over_ethernet_rpc_callback,
-			       (u8 *) & args, sizeof (args));
-  return 0;
-}
-
-/**
- * @brief Internally generated event to flush the ARP cache on an
- * interface state change event.
- * A flush will remove dynamic ARP entries, and for statics remove the MAC
- * address from the corresponding adjacencies.
- */
-static int
-vnet_arp_flush_ip4_over_ethernet (vnet_main_t * vnm,
-				  u32 sw_if_index, void *a_arg)
-{
-  ethernet_arp_ip4_over_ethernet_address_t *a = a_arg;
-  vnet_arp_set_ip4_over_ethernet_rpc_args_t args;
-
-  args.sw_if_index = sw_if_index;
-  args.flags = ETHERNET_ARP_ARGS_FLUSH;
-  clib_memcpy (&args.a, a, sizeof (*a));
-
-  vl_api_rpc_call_main_thread (set_ip4_over_ethernet_rpc_callback,
-			       (u8 *) & args, sizeof (args));
-  return 0;
-}
-
-/**
- * @brief Internally generated event to populate the ARP cache on an
- * interface state change event.
- * For static entries this will re-source the adjacencies.
- *
- * @param sw_if_index The interface on which the ARP entires are acted
- */
-static int
-vnet_arp_populate_ip4_over_ethernet (vnet_main_t * vnm,
-				     u32 sw_if_index, void *a_arg)
-{
-  ethernet_arp_ip4_over_ethernet_address_t *a = a_arg;
-  vnet_arp_set_ip4_over_ethernet_rpc_args_t args;
-
-  args.sw_if_index = sw_if_index;
-  args.flags = ETHERNET_ARP_ARGS_POPULATE;
-  clib_memcpy (&args.a, a, sizeof (*a));
-
-  vl_api_rpc_call_main_thread (set_ip4_over_ethernet_rpc_callback,
-			       (u8 *) & args, sizeof (args));
-  return 0;
-}
-
-/*
- * arp_add_del_interface_address
- *
- * callback when an interface address is added or deleted
- */
-static void
-arp_add_del_interface_address (ip4_main_t * im,
-			       uword opaque,
-			       u32 sw_if_index,
-			       ip4_address_t * address,
-			       u32 address_length,
-			       u32 if_address_index, u32 is_del)
-{
-  /*
-   * Flush the ARP cache of all entries covered by the address
-   * that is being removed.
-   */
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ethernet_arp_ip4_entry_t *e;
-
-  if (vec_len (am->ethernet_arp_by_sw_if_index) <= sw_if_index)
-    return;
-
-  if (is_del)
-    {
-      ethernet_arp_interface_t *eai;
-      u32 i, *to_delete = 0;
-      hash_pair_t *pair;
-
-      eai = &am->ethernet_arp_by_sw_if_index[sw_if_index];
-
-      /* *INDENT-OFF* */
-      hash_foreach_pair (pair, eai->arp_entries,
-      ({
-	e = pool_elt_at_index(am->ip4_entry_pool,
-			      pair->value[0]);
-	if (ip4_destination_matches_route (im, &e->ip4_address,
-					   address, address_length))
-	  {
-	    vec_add1 (to_delete, e - am->ip4_entry_pool);
-	  }
-      }));
-      /* *INDENT-ON* */
-
-      for (i = 0; i < vec_len (to_delete); i++)
-	{
-	  ethernet_arp_ip4_over_ethernet_address_t delme;
-	  e = pool_elt_at_index (am->ip4_entry_pool, to_delete[i]);
-
-	  clib_memcpy (&delme.ethernet, e->ethernet_address, 6);
-	  delme.ip4.as_u32 = e->ip4_address.as_u32;
-
-	  vnet_arp_flush_ip4_over_ethernet (vnet_get_main (),
-					    e->sw_if_index, &delme);
-	}
-
-      vec_free (to_delete);
-    }
-}
-
-static clib_error_t *
-ethernet_arp_init (vlib_main_t * vm)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ip4_main_t *im = &ip4_main;
-  clib_error_t *error;
-  pg_node_t *pn;
-
-  if ((error = vlib_call_init_function (vm, ethernet_init)))
-    return error;
-
-  ethernet_register_input_type (vm, ETHERNET_TYPE_ARP, arp_input_node.index);
-
-  pn = pg_get_node (arp_input_node.index);
-  pn->unformat_edit = unformat_pg_arp_header;
-
-  am->opcode_by_name = hash_create_string (0, sizeof (uword));
-#define _(o) hash_set_mem (am->opcode_by_name, #o, ETHERNET_ARP_OPCODE_##o);
-  foreach_ethernet_arp_opcode;
-#undef _
-
-  /* $$$ configurable */
-  am->limit_arp_cache_size = 50000;
-
-  am->pending_resolutions_by_address = hash_create (0, sizeof (uword));
-  am->mac_changes_by_address = hash_create (0, sizeof (uword));
-
-  /* don't trace ARP error packets */
-  {
-    vlib_node_runtime_t *rt =
-      vlib_node_get_runtime (vm, arp_input_node.index);
-
-#define _(a,b)                                  \
-    vnet_pcap_drop_trace_filter_add_del         \
-        (rt->errors[ETHERNET_ARP_ERROR_##a],    \
-         1 /* is_add */);
-    foreach_ethernet_arp_error
-#undef _
-  }
-
-  ip4_add_del_interface_address_callback_t cb;
-  cb.function = arp_add_del_interface_address;
-  cb.function_opaque = 0;
-  vec_add1 (im->add_del_interface_address_callbacks, cb);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ethernet_arp_init);
-
-static void
-arp_entry_free (ethernet_arp_interface_t * eai, ethernet_arp_ip4_entry_t * e)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-
-  fib_table_entry_delete_index (e->fib_entry_index, FIB_SOURCE_ADJ);
-  hash_unset (eai->arp_entries, e->ip4_address.as_u32);
-  pool_put (am->ip4_entry_pool, e);
-}
-
-static inline int
-vnet_arp_unset_ip4_over_ethernet_internal (vnet_main_t * vnm,
-					   vnet_arp_set_ip4_over_ethernet_rpc_args_t
-					   * args)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ethernet_arp_ip4_entry_t *e;
-  ethernet_arp_interface_t *eai;
-
-  eai = &am->ethernet_arp_by_sw_if_index[args->sw_if_index];
-
-  e = arp_entry_find (eai, &args->a.ip4);
-
-  if (NULL != e)
-    {
-      arp_entry_free (eai, e);
-
-      adj_nbr_walk_nh4 (e->sw_if_index,
-			&e->ip4_address, arp_mk_incomplete_walk, NULL);
-    }
-
-  return 0;
-}
-
-static int
-vnet_arp_flush_ip4_over_ethernet_internal (vnet_main_t * vnm,
-					   vnet_arp_set_ip4_over_ethernet_rpc_args_t
-					   * args)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ethernet_arp_ip4_entry_t *e;
-  ethernet_arp_interface_t *eai;
-
-  eai = &am->ethernet_arp_by_sw_if_index[args->sw_if_index];
-
-  e = arp_entry_find (eai, &args->a.ip4);
-
-  if (NULL != e)
-    {
-      adj_nbr_walk_nh4 (e->sw_if_index,
-			&e->ip4_address, arp_mk_incomplete_walk, e);
-
-      /*
-       * The difference between flush and unset, is that an unset
-       * means delete for static and dynamic entries. A flush
-       * means delete only for dynamic. Flushing is what the DP
-       * does in response to interface events. unset is only done
-       * by the control plane.
-       */
-      if (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC)
-	{
-	  arp_entry_free (eai, e);
-	}
-    }
-  return (0);
-}
-
-static int
-vnet_arp_populate_ip4_over_ethernet_internal (vnet_main_t * vnm,
-					      vnet_arp_set_ip4_over_ethernet_rpc_args_t
-					      * args)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ethernet_arp_ip4_entry_t *e;
-  ethernet_arp_interface_t *eai;
-
-  eai = &am->ethernet_arp_by_sw_if_index[args->sw_if_index];
-
-  e = arp_entry_find (eai, &args->a.ip4);
-
-  if (NULL != e)
-    {
-      adj_nbr_walk_nh4 (e->sw_if_index,
-			&e->ip4_address, arp_mk_complete_walk, e);
-    }
-  return (0);
-}
-
-static void
-set_ip4_over_ethernet_rpc_callback (vnet_arp_set_ip4_over_ethernet_rpc_args_t
-				    * a)
-{
-  vnet_main_t *vm = vnet_get_main ();
-  ASSERT (os_get_cpu_number () == 0);
-
-  if (a->flags & ETHERNET_ARP_ARGS_REMOVE)
-    vnet_arp_unset_ip4_over_ethernet_internal (vm, a);
-  else if (a->flags & ETHERNET_ARP_ARGS_FLUSH)
-    vnet_arp_flush_ip4_over_ethernet_internal (vm, a);
-  else if (a->flags & ETHERNET_ARP_ARGS_POPULATE)
-    vnet_arp_populate_ip4_over_ethernet_internal (vm, a);
-  else
-    vnet_arp_set_ip4_over_ethernet_internal (vm, a);
-}
-
-/**
- * @brief Invoked when the interface's admin state changes
- */
-static clib_error_t *
-ethernet_arp_sw_interface_up_down (vnet_main_t * vnm,
-				   u32 sw_if_index, u32 flags)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ethernet_arp_ip4_entry_t *e;
-  u32 i, *to_delete = 0;
-
-  /* *INDENT-OFF* */
-  pool_foreach (e, am->ip4_entry_pool,
-  ({
-    if (e->sw_if_index == sw_if_index)
-      vec_add1 (to_delete,
-		e - am->ip4_entry_pool);
-  }));
-  /* *INDENT-ON* */
-
-  for (i = 0; i < vec_len (to_delete); i++)
-    {
-      ethernet_arp_ip4_over_ethernet_address_t delme;
-      e = pool_elt_at_index (am->ip4_entry_pool, to_delete[i]);
-
-      clib_memcpy (&delme.ethernet, e->ethernet_address, 6);
-      delme.ip4.as_u32 = e->ip4_address.as_u32;
-
-      if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
-	{
-	  vnet_arp_populate_ip4_over_ethernet (vnm, e->sw_if_index, &delme);
-	}
-      else
-	{
-	  vnet_arp_flush_ip4_over_ethernet (vnm, e->sw_if_index, &delme);
-	}
-
-    }
-  vec_free (to_delete);
-
-  return 0;
-}
-
-VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (ethernet_arp_sw_interface_up_down);
-
-static void
-increment_ip4_and_mac_address (ethernet_arp_ip4_over_ethernet_address_t * a)
-{
-  u8 old;
-  int i;
-
-  for (i = 3; i >= 0; i--)
-    {
-      old = a->ip4.as_u8[i];
-      a->ip4.as_u8[i] += 1;
-      if (old < a->ip4.as_u8[i])
-	break;
-    }
-
-  for (i = 5; i >= 0; i--)
-    {
-      old = a->ethernet[i];
-      a->ethernet[i] += 1;
-      if (old < a->ethernet[i])
-	break;
-    }
-}
-
-int
-vnet_arp_set_ip4_over_ethernet (vnet_main_t * vnm,
-				u32 sw_if_index, void *a_arg, int is_static)
-{
-  ethernet_arp_ip4_over_ethernet_address_t *a = a_arg;
-  vnet_arp_set_ip4_over_ethernet_rpc_args_t args;
-
-  args.sw_if_index = sw_if_index;
-  args.is_static = is_static;
-  args.flags = 0;
-  clib_memcpy (&args.a, a, sizeof (*a));
-
-  vl_api_rpc_call_main_thread (set_ip4_over_ethernet_rpc_callback,
-			       (u8 *) & args, sizeof (args));
-  return 0;
-}
-
-int
-vnet_proxy_arp_add_del (ip4_address_t * lo_addr,
-			ip4_address_t * hi_addr, u32 fib_index, int is_del)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ethernet_proxy_arp_t *pa;
-  u32 found_at_index = ~0;
-
-  vec_foreach (pa, am->proxy_arps)
-  {
-    if (pa->lo_addr == lo_addr->as_u32
-	&& pa->hi_addr == hi_addr->as_u32 && pa->fib_index == fib_index)
-      {
-	found_at_index = pa - am->proxy_arps;
-	break;
-      }
-  }
-
-  if (found_at_index != ~0)
-    {
-      /* Delete, otherwise it's already in the table */
-      if (is_del)
-	vec_delete (am->proxy_arps, 1, found_at_index);
-      return 0;
-    }
-  /* delete, no such entry */
-  if (is_del)
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-  /* add, not in table */
-  vec_add2 (am->proxy_arps, pa, 1);
-  pa->lo_addr = lo_addr->as_u32;
-  pa->hi_addr = hi_addr->as_u32;
-  pa->fib_index = fib_index;
-  return 0;
-}
-
-/*
- * Remove any proxy arp entries asdociated with the
- * specificed fib.
- */
-int
-vnet_proxy_arp_fib_reset (u32 fib_id)
-{
-  ip4_main_t *im = &ip4_main;
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ethernet_proxy_arp_t *pa;
-  u32 *entries_to_delete = 0;
-  u32 fib_index;
-  uword *p;
-  int i;
-
-  p = hash_get (im->fib_index_by_table_id, fib_id);
-  if (!p)
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-  fib_index = p[0];
-
-  vec_foreach (pa, am->proxy_arps)
-  {
-    if (pa->fib_index == fib_index)
-      {
-	vec_add1 (entries_to_delete, pa - am->proxy_arps);
-      }
-  }
-
-  for (i = 0; i < vec_len (entries_to_delete); i++)
-    {
-      vec_delete (am->proxy_arps, 1, entries_to_delete[i]);
-    }
-
-  vec_free (entries_to_delete);
-
-  return 0;
-}
-
-static clib_error_t *
-ip_arp_add_del_command_fn (vlib_main_t * vm,
-			   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index;
-  ethernet_arp_ip4_over_ethernet_address_t lo_addr, hi_addr, addr;
-  int addr_valid = 0;
-  int is_del = 0;
-  int count = 1;
-  u32 fib_index = 0;
-  u32 fib_id;
-  int is_static = 0;
-  int is_proxy = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      /* set ip arp TenGigE1/1/0/1 1.2.3.4 aa:bb:... or aabb.ccdd... */
-      if (unformat (input, "%U %U %U",
-		    unformat_vnet_sw_interface, vnm, &sw_if_index,
-		    unformat_ip4_address, &addr.ip4,
-		    unformat_ethernet_address, &addr.ethernet))
-	addr_valid = 1;
-
-      else if (unformat (input, "delete") || unformat (input, "del"))
-	is_del = 1;
-
-      else if (unformat (input, "static"))
-	is_static = 1;
-
-      else if (unformat (input, "count %d", &count))
-	;
-
-      else if (unformat (input, "fib-id %d", &fib_id))
-	{
-	  ip4_main_t *im = &ip4_main;
-	  uword *p = hash_get (im->fib_index_by_table_id, fib_id);
-	  if (!p)
-	    return clib_error_return (0, "fib ID %d doesn't exist\n", fib_id);
-	  fib_index = p[0];
-	}
-
-      else if (unformat (input, "proxy %U - %U",
-			 unformat_ip4_address, &lo_addr.ip4,
-			 unformat_ip4_address, &hi_addr.ip4))
-	is_proxy = 1;
-      else
-	break;
-    }
-
-  if (is_proxy)
-    {
-      (void) vnet_proxy_arp_add_del (&lo_addr.ip4, &hi_addr.ip4,
-				     fib_index, is_del);
-      return 0;
-    }
-
-  if (addr_valid)
-    {
-      int i;
-
-      for (i = 0; i < count; i++)
-	{
-	  if (is_del == 0)
-	    {
-	      uword event_type, *event_data = 0;
-
-	      /* Park the debug CLI until the arp entry is installed */
-	      vnet_register_ip4_arp_resolution_event
-		(vnm, &addr.ip4, vlib_current_process (vm),
-		 1 /* type */ , 0 /* data */ );
-
-	      vnet_arp_set_ip4_over_ethernet
-		(vnm, sw_if_index, &addr, is_static);
-
-	      vlib_process_wait_for_event (vm);
-	      event_type = vlib_process_get_events (vm, &event_data);
-	      vec_reset_length (event_data);
-	      if (event_type != 1)
-		clib_warning ("event type %d unexpected", event_type);
-	    }
-	  else
-	    vnet_arp_unset_ip4_over_ethernet (vnm, sw_if_index, &addr);
-
-	  increment_ip4_and_mac_address (&addr);
-	}
-    }
-  else
-    {
-      return clib_error_return (0, "unknown input `%U'",
-				format_unformat_error, input);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-/*?
- * Add or delete IPv4 ARP cache entries.
- *
- * @note 'set ip arp' options (e.g. delete, static, 'fib-id <id>',
- * 'count <number>', 'interface ip4_addr mac_addr') can be added in
- * any order and combination.
- *
- * @cliexpar
- * @parblock
- * Add or delete IPv4 ARP cache entries as follows. MAC Address can be in
- * either aa:bb:cc:dd:ee:ff format or aabb.ccdd.eeff format.
- * @cliexcmd{set ip arp GigabitEthernet2/0/0 6.0.0.3 dead.beef.babe}
- * @cliexcmd{set ip arp delete GigabitEthernet2/0/0 6.0.0.3 de:ad:be:ef:ba:be}
- *
- * To add or delete an IPv4 ARP cache entry to or from a specific fib
- * table:
- * @cliexcmd{set ip arp fib-id 1 GigabitEthernet2/0/0 6.0.0.3 dead.beef.babe}
- * @cliexcmd{set ip arp fib-id 1 delete GigabitEthernet2/0/0 6.0.0.3 dead.beef.babe}
- *
- * Add or delete IPv4 static ARP cache entries as follows:
- * @cliexcmd{set ip arp static GigabitEthernet2/0/0 6.0.0.3 dead.beef.babe}
- * @cliexcmd{set ip arp static delete GigabitEthernet2/0/0 6.0.0.3 dead.beef.babe}
- *
- * For testing / debugging purposes, the 'set ip arp' command can add or
- * delete multiple entries. Supply the 'count N' parameter:
- * @cliexcmd{set ip arp count 10 GigabitEthernet2/0/0 6.0.0.3 dead.beef.babe}
- * @endparblock
- ?*/
-VLIB_CLI_COMMAND (ip_arp_add_del_command, static) = {
-  .path = "set ip arp",
-  .short_help =
-  "set ip arp [del] <intfc> <ip-address> <mac-address> [static] [count <count>] [fib-id <fib-id>] [proxy <lo-addr> - <hi-addr>]",
-  .function = ip_arp_add_del_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_int_proxy_arp_command_fn (vlib_main_t * vm,
-			      unformat_input_t *
-			      input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index;
-  vnet_sw_interface_t *si;
-  int enable = 0;
-  int intfc_set = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%U", unformat_vnet_sw_interface,
-		    vnm, &sw_if_index))
-	intfc_set = 1;
-      else if (unformat (input, "enable") || unformat (input, "on"))
-	enable = 1;
-      else if (unformat (input, "disable") || unformat (input, "off"))
-	enable = 0;
-      else
-	break;
-    }
-
-  if (intfc_set == 0)
-    return clib_error_return (0, "unknown input '%U'",
-			      format_unformat_error, input);
-
-  si = vnet_get_sw_interface (vnm, sw_if_index);
-  ASSERT (si);
-  if (enable)
-    si->flags |= VNET_SW_INTERFACE_FLAG_PROXY_ARP;
-  else
-    si->flags &= ~VNET_SW_INTERFACE_FLAG_PROXY_ARP;
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-/*?
- * Enable proxy-arp on an interface. The vpp stack will answer ARP
- * requests for the indicated address range. Multiple proxy-arp
- * ranges may be provisioned.
- *
- * @note Proxy ARP as a technology is infamous for blackholing traffic.
- * Also, the underlying implementation has not been performance-tuned.
- * Avoid creating an unnecessarily large set of ranges.
- *
- * @cliexpar
- * To enable proxy arp on a range of addresses, use:
- * @cliexcmd{set ip arp proxy 6.0.0.1 - 6.0.0.11}
- * Append 'del' to delete a range of proxy ARP addresses:
- * @cliexcmd{set ip arp proxy 6.0.0.1 - 6.0.0.11 del}
- * You must then specifically enable proxy arp on individual interfaces:
- * @cliexcmd{set interface proxy-arp GigabitEthernet0/8/0 enable}
- * To disable proxy arp on an individual interface:
- * @cliexcmd{set interface proxy-arp GigabitEthernet0/8/0 disable}
- ?*/
-VLIB_CLI_COMMAND (set_int_proxy_enable_command, static) = {
-  .path = "set interface proxy-arp",
-  .short_help =
-  "set interface proxy-arp <intfc> [enable|disable]",
-  .function = set_int_proxy_arp_command_fn,
-};
-/* *INDENT-ON* */
-
-
-/*
- * ARP/ND Termination in a L2 Bridge Domain based on IP4/IP6 to MAC
- * hash tables mac_by_ip4 and mac_by_ip6 for each BD.
- */
-typedef enum
-{
-  ARP_TERM_NEXT_L2_OUTPUT,
-  ARP_TERM_NEXT_DROP,
-  ARP_TERM_N_NEXT,
-} arp_term_next_t;
-
-u32 arp_term_next_node_index[32];
-
-static uword
-arp_term_l2bd (vlib_main_t * vm,
-	       vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  l2input_main_t *l2im = &l2input_main;
-  u32 n_left_from, next_index, *from, *to_next;
-  u32 n_replies_sent = 0;
-  u16 last_bd_index = ~0;
-  l2_bridge_domain_t *last_bd_config = 0;
-  l2_input_config_t *cfg0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ethernet_header_t *eth0;
-	  ethernet_arp_header_t *arp0;
-	  ip6_header_t *iph0;
-	  u8 *l3h0;
-	  u32 pi0, error0, next0, sw_if_index0;
-	  u16 ethertype0;
-	  u16 bd_index0;
-	  u32 ip0;
-	  u8 *macp0;
-
-	  pi0 = from[0];
-	  to_next[0] = pi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  eth0 = vlib_buffer_get_current (p0);
-	  l3h0 = (u8 *) eth0 + vnet_buffer (p0)->l2.l2_len;
-	  ethertype0 = clib_net_to_host_u16 (*(u16 *) (l3h0 - 2));
-	  arp0 = (ethernet_arp_header_t *) l3h0;
-
-	  if (PREDICT_FALSE ((ethertype0 != ETHERNET_TYPE_ARP) ||
-			     (arp0->opcode !=
-			      clib_host_to_net_u16
-			      (ETHERNET_ARP_OPCODE_request))))
-	    goto check_ip6_nd;
-
-	  /* Must be ARP request packet here */
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&
-			     (p0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      u8 *t0 = vlib_add_trace (vm, node, p0,
-				       sizeof (ethernet_arp_input_trace_t));
-	      clib_memcpy (t0, l3h0, sizeof (ethernet_arp_input_trace_t));
-	    }
-
-	  error0 = ETHERNET_ARP_ERROR_replies_sent;
-	  error0 =
-	    (arp0->l2_type !=
-	     clib_net_to_host_u16 (ETHERNET_ARP_HARDWARE_TYPE_ethernet)
-	     ? ETHERNET_ARP_ERROR_l2_type_not_ethernet : error0);
-	  error0 =
-	    (arp0->l3_type !=
-	     clib_net_to_host_u16 (ETHERNET_TYPE_IP4) ?
-	     ETHERNET_ARP_ERROR_l3_type_not_ip4 : error0);
-
-	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
-
-	  if (error0)
-	    goto drop;
-
-	  /* Trash ARP packets whose ARP-level source addresses do not
-	     match their L2-frame-level source addresses  */
-	  if (PREDICT_FALSE
-	      (memcmp
-	       (eth0->src_address, arp0->ip4_over_ethernet[0].ethernet,
-		sizeof (eth0->src_address))))
-	    {
-	      error0 = ETHERNET_ARP_ERROR_l2_address_mismatch;
-	      goto drop;
-	    }
-
-	  /* Check if anyone want ARP request events for L2 BDs */
-	  {
-	    pending_resolution_t *mc;
-	    ethernet_arp_main_t *am = &ethernet_arp_main;
-	    uword *p = hash_get (am->mac_changes_by_address, 0);
-	    if (p && (vnet_buffer (p0)->l2.shg == 0))
-	      {			// Only SHG 0 interface which is more likely local
-		u32 next_index = p[0];
-		while (next_index != (u32) ~ 0)
-		  {
-		    int (*fp) (u32, u8 *, u32, u32);
-		    int rv = 1;
-		    mc = pool_elt_at_index (am->mac_changes, next_index);
-		    fp = mc->data_callback;
-		    /* Call the callback, return 1 to suppress dup events */
-		    if (fp)
-		      rv = (*fp) (mc->data,
-				  arp0->ip4_over_ethernet[0].ethernet,
-				  sw_if_index0,
-				  arp0->ip4_over_ethernet[0].ip4.as_u32);
-		    /* Signal the resolver process */
-		    if (rv == 0)
-		      vlib_process_signal_event (vm, mc->node_index,
-						 mc->type_opaque, mc->data);
-		    next_index = mc->next_index;
-		  }
-	      }
-	  }
-
-	  /* lookup BD mac_by_ip4 hash table for MAC entry */
-	  ip0 = arp0->ip4_over_ethernet[1].ip4.as_u32;
-	  bd_index0 = vnet_buffer (p0)->l2.bd_index;
-	  if (PREDICT_FALSE ((bd_index0 != last_bd_index)
-			     || (last_bd_index == (u16) ~ 0)))
-	    {
-	      last_bd_index = bd_index0;
-	      last_bd_config = vec_elt_at_index (l2im->bd_configs, bd_index0);
-	    }
-	  macp0 = (u8 *) hash_get (last_bd_config->mac_by_ip4, ip0);
-
-	  if (PREDICT_FALSE (!macp0))
-	    goto next_l2_feature;	/* MAC not found */
-
-	  /* MAC found, send ARP reply -
-	     Convert ARP request packet to ARP reply */
-	  arp0->opcode = clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply);
-	  arp0->ip4_over_ethernet[1] = arp0->ip4_over_ethernet[0];
-	  arp0->ip4_over_ethernet[0].ip4.as_u32 = ip0;
-	  clib_memcpy (arp0->ip4_over_ethernet[0].ethernet, macp0, 6);
-	  clib_memcpy (eth0->dst_address, eth0->src_address, 6);
-	  clib_memcpy (eth0->src_address, macp0, 6);
-	  n_replies_sent += 1;
-
-	output_response:
-	  /* For BVI, need to use l2-fwd node to send ARP reply as
-	     l2-output node cannot output packet to BVI properly */
-	  cfg0 = vec_elt_at_index (l2im->configs, sw_if_index0);
-	  if (PREDICT_FALSE (cfg0->bvi))
-	    {
-	      vnet_buffer (p0)->l2.feature_bitmap |= L2INPUT_FEAT_FWD;
-	      vnet_buffer (p0)->sw_if_index[VLIB_RX] = 0;
-	      goto next_l2_feature;
-	    }
-
-	  /* Send ARP/ND reply back out input interface through l2-output */
-	  vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0;
-	  next0 = ARP_TERM_NEXT_L2_OUTPUT;
-	  /* Note that output to VXLAN tunnel will fail due to SHG which
-	     is probably desireable since ARP termination is not intended
-	     for ARP requests from other hosts. If output to VXLAN tunnel is
-	     required, however, can just clear the SHG in packet as follows:
-	     vnet_buffer(p0)->l2.shg = 0;         */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next, pi0,
-					   next0);
-	  continue;
-
-	check_ip6_nd:
-	  /* IP6 ND event notification or solicitation handling to generate
-	     local response instead of flooding */
-	  iph0 = (ip6_header_t *) l3h0;
-	  if (PREDICT_FALSE (ethertype0 == ETHERNET_TYPE_IP6 &&
-			     iph0->protocol == IP_PROTOCOL_ICMP6 &&
-			     !ip6_address_is_unspecified
-			     (&iph0->src_address)))
-	    {
-	      sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
-	      if (vnet_ip6_nd_term
-		  (vm, node, p0, eth0, iph0, sw_if_index0,
-		   vnet_buffer (p0)->l2.bd_index, vnet_buffer (p0)->l2.shg))
-		goto output_response;
-	    }
-
-	next_l2_feature:
-	  {
-	    u32 feature_bitmap0 =
-	      vnet_buffer (p0)->l2.feature_bitmap & ~L2INPUT_FEAT_ARP_TERM;
-	    vnet_buffer (p0)->l2.feature_bitmap = feature_bitmap0;
-	    next0 =
-	      feat_bitmap_get_next_node_index (arp_term_next_node_index,
-					       feature_bitmap0);
-	    vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					     to_next, n_left_to_next,
-					     pi0, next0);
-	    continue;
-	  }
-
-	drop:
-	  if (0 == arp0->ip4_over_ethernet[0].ip4.as_u32 ||
-	      (arp0->ip4_over_ethernet[0].ip4.as_u32 ==
-	       arp0->ip4_over_ethernet[1].ip4.as_u32))
-	    {
-	      error0 = ETHERNET_ARP_ERROR_gratuitous_arp;
-	    }
-	  next0 = ARP_TERM_NEXT_DROP;
-	  p0->error = node->errors[error0];
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next, pi0,
-					   next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_error_count (vm, node->node_index,
-		    ETHERNET_ARP_ERROR_replies_sent, n_replies_sent);
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (arp_term_l2bd_node, static) = {
-  .function = arp_term_l2bd,
-  .name = "arp-term-l2bd",
-  .vector_size = sizeof (u32),
-  .n_errors = ETHERNET_ARP_N_ERROR,
-  .error_strings = ethernet_arp_error_strings,
-  .n_next_nodes = ARP_TERM_N_NEXT,
-  .next_nodes = {
-    [ARP_TERM_NEXT_L2_OUTPUT] = "l2-output",
-    [ARP_TERM_NEXT_DROP] = "error-drop",
-  },
-  .format_buffer = format_ethernet_arp_header,
-  .format_trace = format_arp_term_input_trace,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-arp_term_init (vlib_main_t * vm)
-{
-  // Initialize the feature next-node indexes
-  feat_bitmap_init_next_nodes (vm,
-			       arp_term_l2bd_node.index,
-			       L2INPUT_N_FEAT,
-			       l2input_get_feat_names (),
-			       arp_term_next_node_index);
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (arp_term_init);
-
-void
-change_arp_mac (u32 sw_if_index, ethernet_arp_ip4_entry_t * e)
-{
-  if (e->sw_if_index == sw_if_index)
-    {
-      adj_nbr_walk_nh4 (e->sw_if_index,
-			&e->ip4_address, arp_mk_complete_walk, e);
-    }
-}
-
-void
-ethernet_arp_change_mac (u32 sw_if_index)
-{
-  ethernet_arp_main_t *am = &ethernet_arp_main;
-  ethernet_arp_ip4_entry_t *e;
-
-  /* *INDENT-OFF* */
-  pool_foreach (e, am->ip4_entry_pool,
-  ({
-    change_arp_mac (sw_if_index, e);
-  }));
-  /* *INDENT-ON* */
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ethernet/arp_packet.h b/vnet/vnet/ethernet/arp_packet.h
deleted file mode 100644
index e762ffa4..00000000
--- a/vnet/vnet/ethernet/arp_packet.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * ethernet/arp.c: IP v4 ARP node
- *
- * Copyright (c) 2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_ethernet_arp_packet_h
-#define included_ethernet_arp_packet_h
-
-#define foreach_ethernet_arp_hardware_type	\
-  _ (0, reserved)				\
-  _ (1, ethernet)				\
-  _ (2, experimental_ethernet)			\
-  _ (3, ax_25)					\
-  _ (4, proteon_pronet_token_ring)		\
-  _ (5, chaos)					\
-  _ (6, ieee_802)				\
-  _ (7, arcnet)					\
-  _ (8, hyperchannel)				\
-  _ (9, lanstar)				\
-  _ (10, autonet)				\
-  _ (11, localtalk)				\
-  _ (12, localnet)				\
-  _ (13, ultra_link)				\
-  _ (14, smds)					\
-  _ (15, frame_relay)				\
-  _ (16, atm)					\
-  _ (17, hdlc)					\
-  _ (18, fibre_channel)				\
-  _ (19, atm19)					\
-  _ (20, serial_line)				\
-  _ (21, atm21)					\
-  _ (22, mil_std_188_220)			\
-  _ (23, metricom)				\
-  _ (24, ieee_1394)				\
-  _ (25, mapos)					\
-  _ (26, twinaxial)				\
-  _ (27, eui_64)				\
-  _ (28, hiparp)				\
-  _ (29, iso_7816_3)				\
-  _ (30, arpsec)				\
-  _ (31, ipsec_tunnel)				\
-  _ (32, infiniband)				\
-  _ (33, cai)					\
-  _ (34, wiegand)				\
-  _ (35, pure_ip)				\
-  _ (36, hw_exp1)				\
-  _ (256, hw_exp2)
-
-#define foreach_ethernet_arp_opcode		\
-  _ (reserved)					\
-  _ (request)					\
-  _ (reply)					\
-  _ (reverse_request)				\
-  _ (reverse_reply)				\
-  _ (drarp_request)				\
-  _ (drarp_reply)				\
-  _ (drarp_error)				\
-  _ (inarp_request)				\
-  _ (inarp_reply)				\
-  _ (arp_nak)					\
-  _ (mars_request)				\
-  _ (mars_multi)				\
-  _ (mars_mserv)				\
-  _ (mars_join)					\
-  _ (mars_leave)				\
-  _ (mars_nak)					\
-  _ (mars_unserv)				\
-  _ (mars_sjoin)				\
-  _ (mars_sleave)				\
-  _ (mars_grouplist_request)			\
-  _ (mars_grouplist_reply)			\
-  _ (mars_redirect_map)				\
-  _ (mapos_unarp)				\
-  _ (exp1)					\
-  _ (exp2)
-
-typedef enum
-{
-#define _(n,f) ETHERNET_ARP_HARDWARE_TYPE_##f = (n),
-  foreach_ethernet_arp_hardware_type
-#undef _
-} ethernet_arp_hardware_type_t;
-
-typedef enum
-{
-#define _(f) ETHERNET_ARP_OPCODE_##f,
-  foreach_ethernet_arp_opcode
-#undef _
-    ETHERNET_ARP_N_OPCODE,
-} ethernet_arp_opcode_t;
-
-typedef enum
-{
-  IP4_ARP_NEXT_DROP,
-  IP4_ARP_N_NEXT,
-} ip4_arp_next_t;
-
-typedef enum
-{
-  IP4_ARP_ERROR_DROP,
-  IP4_ARP_ERROR_REQUEST_SENT,
-  IP4_ARP_ERROR_NON_ARP_ADJ,
-  IP4_ARP_ERROR_REPLICATE_DROP,
-  IP4_ARP_ERROR_REPLICATE_FAIL,
-  IP4_ARP_ERROR_NO_SOURCE_ADDRESS,
-} ip4_arp_error_t;
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u8 ethernet[6];
-  ip4_address_t ip4;
-}) ethernet_arp_ip4_over_ethernet_address_t;
-/* *INDENT-ON* */
-
-typedef struct
-{
-  u16 l2_type;
-  u16 l3_type;
-  u8 n_l2_address_bytes;
-  u8 n_l3_address_bytes;
-  u16 opcode;
-  union
-  {
-    ethernet_arp_ip4_over_ethernet_address_t ip4_over_ethernet[2];
-
-    /* Others... */
-    u8 data[0];
-  };
-} ethernet_arp_header_t;
-
-typedef struct
-{
-  u32 sw_if_index;
-  ip4_address_t ip4_address;
-
-  u8 ethernet_address[6];
-
-  u16 flags;
-#define ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC  (1 << 0)
-#define ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC (1 << 1)
-
-  u64 cpu_time_last_updated;
-
-  /**
-   * The index of the adj-fib entry created
-   */
-  fib_node_index_t fib_entry_index;
-} ethernet_arp_ip4_entry_t;
-
-ethernet_arp_ip4_entry_t *ip4_neighbor_entries (u32 sw_if_index);
-u8 *format_ethernet_arp_ip4_entry (u8 * s, va_list * va);
-
-#endif /* included_ethernet_arp_packet_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ethernet/dir.dox b/vnet/vnet/ethernet/dir.dox
deleted file mode 100644
index a55a73c0..00000000
--- a/vnet/vnet/ethernet/dir.dox
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
-@dir
-@brief Ethernet ARP and Loopback Code.
-
-This directory contains the source code for ARP and Loopback Interfaces.
-
-*/
-/*? %%clicmd:group_label ARP and Loopback CLI %% ?*/
diff --git a/vnet/vnet/ethernet/error.def b/vnet/vnet/ethernet/error.def
deleted file mode 100644
index 36679c0c..00000000
--- a/vnet/vnet/ethernet/error.def
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ethernet_error.def: ethernet errors
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-ethernet_error (NONE, PUNT, "no error")
-ethernet_error (BAD_LLC_LENGTH, DROP, "llc length > packet length")
-ethernet_error (UNKNOWN_TYPE, PUNT, "unknown ethernet type")
-ethernet_error (UNKNOWN_VLAN, DROP, "unknown vlan")
-ethernet_error (L3_MAC_MISMATCH, DROP, "l3 mac mismatch")
-ethernet_error (DOWN, DROP, "subinterface down")
-
diff --git a/vnet/vnet/ethernet/ethernet.h b/vnet/vnet/ethernet/ethernet.h
deleted file mode 100644
index f88b0cf3..00000000
--- a/vnet/vnet/ethernet/ethernet.h
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ethernet.h: types/functions for ethernet.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_ethernet_h
-#define included_ethernet_h
-
-#include <vnet/vnet.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/feature/feature.h>
-
-always_inline u64
-ethernet_mac_address_u64 (u8 * a)
-{
-  return (((u64) a[0] << (u64) (5 * 8))
-	  | ((u64) a[1] << (u64) (4 * 8))
-	  | ((u64) a[2] << (u64) (3 * 8))
-	  | ((u64) a[3] << (u64) (2 * 8))
-	  | ((u64) a[4] << (u64) (1 * 8)) | ((u64) a[5] << (u64) (0 * 8)));
-}
-
-static inline int
-ethernet_mac_address_is_multicast_u64 (u64 a)
-{
-  return (a & (1ULL << (5 * 8))) != 0;
-}
-
-static_always_inline int
-ethernet_frame_is_tagged (u16 type)
-{
-#if __SSE4_2__
-  const __m128i ethertype_mask = _mm_set_epi16 (ETHERNET_TYPE_VLAN,
-						ETHERNET_TYPE_DOT1AD,
-						ETHERNET_TYPE_VLAN_9100,
-						ETHERNET_TYPE_VLAN_9200,
-						/* duplicate last one to
-						   fill register */
-						ETHERNET_TYPE_VLAN_9200,
-						ETHERNET_TYPE_VLAN_9200,
-						ETHERNET_TYPE_VLAN_9200,
-						ETHERNET_TYPE_VLAN_9200);
-
-  __m128i r = _mm_set1_epi16 (type);
-  r = _mm_cmpeq_epi16 (ethertype_mask, r);
-  return !_mm_test_all_zeros (r, r);
-#else
-  if ((type == ETHERNET_TYPE_VLAN) ||
-      (type == ETHERNET_TYPE_DOT1AD) ||
-      (type == ETHERNET_TYPE_VLAN_9100) || (type == ETHERNET_TYPE_VLAN_9200))
-    return 1;
-#endif
-  return 0;
-}
-
-/* Max. sized ethernet/vlan header for parsing. */
-typedef struct
-{
-  ethernet_header_t ethernet;
-
-  /* Allow up to 2 stacked vlan headers. */
-  ethernet_vlan_header_t vlan[2];
-} ethernet_max_header_t;
-
-struct vnet_hw_interface_t;
-/* Ethernet flag change callback. */
-typedef u32 (ethernet_flag_change_function_t)
-  (vnet_main_t * vnm, struct vnet_hw_interface_t * hi, u32 flags);
-
-#define ETHERNET_MIN_PACKET_BYTES  64
-#define ETHERNET_MAX_PACKET_BYTES  9216
-
-/* Ethernet interface instance. */
-typedef struct ethernet_interface
-{
-
-  /* Accept all packets (promiscuous mode). */
-#define ETHERNET_INTERFACE_FLAG_ACCEPT_ALL (1 << 0)
-#define ETHERNET_INTERFACE_FLAG_CONFIG_PROMISC(flags) \
-  (((flags) & ~ETHERNET_INTERFACE_FLAG_ACCEPT_ALL) == 0)
-
-  /* Change MTU on interface from hw interface structure */
-#define ETHERNET_INTERFACE_FLAG_MTU (1 << 1)
-#define ETHERNET_INTERFACE_FLAG_CONFIG_MTU(flags) \
-  ((flags) & ETHERNET_INTERFACE_FLAG_MTU)
-
-  /* Callback, e.g. to turn on/off promiscuous mode */
-  ethernet_flag_change_function_t *flag_change;
-
-  u32 driver_instance;
-
-  /* Ethernet (MAC) address for this interface. */
-  u8 address[6];
-} ethernet_interface_t;
-
-extern vnet_hw_interface_class_t ethernet_hw_interface_class;
-
-typedef struct
-{
-  /* Name (a c string). */
-  char *name;
-
-  /* Ethernet type in host byte order. */
-  ethernet_type_t type;
-
-  /* Node which handles this type. */
-  u32 node_index;
-
-  /* Next index for this type. */
-  u32 next_index;
-} ethernet_type_info_t;
-
-typedef enum
-{
-#define ethernet_error(n,c,s) ETHERNET_ERROR_##n,
-#include <vnet/ethernet/error.def>
-#undef ethernet_error
-  ETHERNET_N_ERROR,
-} ethernet_error_t;
-
-
-// Structs used when parsing packet to find sw_if_index
-
-typedef struct
-{
-  u32 sw_if_index;
-  u32 flags;
-  // config entry is-valid flag
-  // exact match flags (valid if packet has 0/1/2/3 tags)
-  // L2 vs L3 forwarding mode
-#define SUBINT_CONFIG_MATCH_0_TAG (1<<0)
-#define SUBINT_CONFIG_MATCH_1_TAG (1<<1)
-#define SUBINT_CONFIG_MATCH_2_TAG (1<<2)
-#define SUBINT_CONFIG_MATCH_3_TAG (1<<3)
-#define SUBINT_CONFIG_VALID       (1<<4)
-#define SUBINT_CONFIG_L2          (1<<5)
-
-} subint_config_t;
-
-always_inline u32
-eth_create_valid_subint_match_flags (u32 num_tags)
-{
-  return SUBINT_CONFIG_VALID | (1 << num_tags);
-}
-
-
-typedef struct
-{
-  subint_config_t untagged_subint;
-  subint_config_t default_subint;
-  u16 dot1q_vlans;		// pool id for vlan table
-  u16 dot1ad_vlans;		// pool id for vlan table
-} main_intf_t;
-
-typedef struct
-{
-  subint_config_t single_tag_subint;
-  subint_config_t inner_any_subint;
-  u32 qinqs;			// pool id for qinq table
-} vlan_intf_t;
-
-typedef struct
-{
-  vlan_intf_t vlans[ETHERNET_N_VLAN];
-} vlan_table_t;
-
-typedef struct
-{
-  subint_config_t subint;
-} qinq_intf_t;
-
-typedef struct
-{
-  qinq_intf_t vlans[ETHERNET_N_VLAN];
-} qinq_table_t;
-
-// Structure mapping to a next index based on ethertype.
-// Common ethertypes are stored explicitly, others are
-// stored in a sparse table.
-typedef struct
-{
-  /* Sparse vector mapping ethernet type in network byte order
-     to next index. */
-  u16 *input_next_by_type;
-  u32 *sparse_index_by_input_next_index;
-
-  /* cached next indexes for common ethertypes */
-  u32 input_next_ip4;
-  u32 input_next_ip6;
-  u32 input_next_mpls;
-} next_by_ethertype_t;
-
-typedef struct
-{
-  vlib_main_t *vlib_main;
-
-  /* next node index for the L3 input node of each ethertype */
-  next_by_ethertype_t l3_next;
-
-  /* next node index for L2 interfaces */
-  u32 l2_next;
-
-  /* flag and next node index for L3 redirect */
-  u32 redirect_l3;
-  u32 redirect_l3_next;
-
-  /* Pool of ethernet interface instances. */
-  ethernet_interface_t *interfaces;
-
-  ethernet_type_info_t *type_infos;
-
-  /* Hash tables mapping name/type to type info index. */
-  uword *type_info_by_name, *type_info_by_type;
-
-  // The root of the vlan parsing tables. A vector with one element
-  // for each main interface, indexed by hw_if_index.
-  main_intf_t *main_intfs;
-
-  // Pool of vlan tables
-  vlan_table_t *vlan_pool;
-
-  // Pool of qinq tables;
-  qinq_table_t *qinq_pool;
-
-  /* Set to one to use AB.CD.EF instead of A:B:C:D:E:F as ethernet format. */
-  int format_ethernet_address_16bit;
-
-  /* debug: make sure we don't wipe out an ethernet registration by mistake */
-  u8 next_by_ethertype_register_called;
-
-  /* Feature arc index */
-  u8 output_feature_arc_index;
-} ethernet_main_t;
-
-ethernet_main_t ethernet_main;
-
-always_inline ethernet_type_info_t *
-ethernet_get_type_info (ethernet_main_t * em, ethernet_type_t type)
-{
-  uword *p = hash_get (em->type_info_by_type, type);
-  return p ? vec_elt_at_index (em->type_infos, p[0]) : 0;
-}
-
-ethernet_interface_t *ethernet_get_interface (ethernet_main_t * em,
-					      u32 hw_if_index);
-
-clib_error_t *ethernet_register_interface (vnet_main_t * vnm,
-					   u32 dev_class_index,
-					   u32 dev_instance,
-					   u8 * address,
-					   u32 * hw_if_index_return,
-					   ethernet_flag_change_function_t
-					   flag_change);
-
-void ethernet_delete_interface (vnet_main_t * vnm, u32 hw_if_index);
-
-/* Register given node index to take input for given ethernet type. */
-void
-ethernet_register_input_type (vlib_main_t * vm,
-			      ethernet_type_t type, u32 node_index);
-
-/* Register given node index to take input for packet from L2 interfaces. */
-void ethernet_register_l2_input (vlib_main_t * vm, u32 node_index);
-
-/* Register given node index to take redirected L3 traffic, and enable L3 redirect */
-void ethernet_register_l3_redirect (vlib_main_t * vm, u32 node_index);
-
-/* Formats ethernet address X:X:X:X:X:X */
-u8 *format_ethernet_address (u8 * s, va_list * args);
-u8 *format_ethernet_type (u8 * s, va_list * args);
-u8 *format_ethernet_vlan_tci (u8 * s, va_list * va);
-u8 *format_ethernet_header (u8 * s, va_list * args);
-u8 *format_ethernet_header_with_length (u8 * s, va_list * args);
-
-/* Parse ethernet address in either X:X:X:X:X:X unix or X.X.X cisco format. */
-uword unformat_ethernet_address (unformat_input_t * input, va_list * args);
-
-/* Parse ethernet type as 0xXXXX or type name from ethernet/types.def.
-   In either host or network byte order. */
-uword
-unformat_ethernet_type_host_byte_order (unformat_input_t * input,
-					va_list * args);
-uword
-unformat_ethernet_type_net_byte_order (unformat_input_t * input,
-				       va_list * args);
-
-/* Parse ethernet header. */
-uword unformat_ethernet_header (unformat_input_t * input, va_list * args);
-
-/* Parse ethernet interface name; return hw_if_index. */
-uword unformat_ethernet_interface (unformat_input_t * input, va_list * args);
-
-uword unformat_pg_ethernet_header (unformat_input_t * input, va_list * args);
-
-always_inline void
-ethernet_setup_node (vlib_main_t * vm, u32 node_index)
-{
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  pg_node_t *pn = pg_get_node (node_index);
-
-  n->format_buffer = format_ethernet_header_with_length;
-  n->unformat_buffer = unformat_ethernet_header;
-  pn->unformat_edit = unformat_pg_ethernet_header;
-}
-
-always_inline ethernet_header_t *
-ethernet_buffer_get_header (vlib_buffer_t * b)
-{
-  return (void *)
-    (b->data + vnet_buffer (b)->ethernet.start_of_ethernet_header);
-}
-
-/** Returns the number of VLAN headers in the current Ethernet frame in the
- * buffer. Returns 0, 1, 2 for the known header count. The value 3 indicates
- * the number of headers is not known.
- */
-#define ethernet_buffer_get_vlan_count(b) ( \
-    ((b)->flags & ETH_BUFFER_VLAN_BITS) >> LOG2_ETH_BUFFER_VLAN_1_DEEP \
-)
-
-/** Sets the number of VLAN headers in the current Ethernet frame in the
- * buffer. Values 0, 1, 2 indicate  the header count. The value 3 indicates
- * the number of headers is not known.
- */
-#define ethernet_buffer_set_vlan_count(b, v) ( \
-    (b)->flags = ((b)->flags & ~ETH_BUFFER_VLAN_BITS) | \
-        (((v) << LOG2_ETH_BUFFER_VLAN_1_DEEP) & ETH_BUFFER_VLAN_BITS) \
-)
-
-/** Adjusts the vlan count by the delta in 'v' */
-#define ethernet_buffer_adjust_vlan_count(b, v) ( \
-  ethernet_buffer_set_vlan_count(b,  \
-      (word)ethernet_buffer_get_vlan_count(b) + (word)(v)) \
-)
-
-/** Adjusts the vlan count by the header size byte delta in 'v' */
-#define ethernet_buffer_adjust_vlan_count_by_bytes(b, v) ( \
-    (b)->flags = ((b)->flags & ~ETH_BUFFER_VLAN_BITS) | (( \
-        ((b)->flags & ETH_BUFFER_VLAN_BITS) + \
-        ((v) << (LOG2_ETH_BUFFER_VLAN_1_DEEP - 2)) \
-    ) & ETH_BUFFER_VLAN_BITS) \
-)
-
-/**
- * Determine the size of the Ethernet headers of the current frame in
- * the buffer. This uses the VLAN depth flags that are set by
- * ethernet-input. Because these flags are stored in the vlib_buffer_t
- * "flags" field this count is valid regardless of the node so long as it's
- * checked downstream of ethernet-input; That is, the value is not stored in
- * the opaque space.
- */
-#define ethernet_buffer_header_size(b) ( \
-        ethernet_buffer_get_vlan_count((b)) * sizeof(ethernet_vlan_header_t) + \
-        sizeof(ethernet_header_t) \
-)
-
-ethernet_main_t *ethernet_get_main (vlib_main_t * vm);
-u32 ethernet_set_flags (vnet_main_t * vnm, u32 hw_if_index, u32 flags);
-void ethernet_sw_interface_set_l2_mode (vnet_main_t * vnm, u32 sw_if_index,
-					u32 l2);
-void ethernet_sw_interface_set_l2_mode_noport (vnet_main_t * vnm,
-					       u32 sw_if_index, u32 l2);
-void ethernet_set_rx_redirect (vnet_main_t * vnm, vnet_hw_interface_t * hi,
-			       u32 enable);
-
-int
-vnet_arp_set_ip4_over_ethernet (vnet_main_t * vnm,
-				u32 sw_if_index, void *a_arg, int is_static);
-
-int
-vnet_arp_unset_ip4_over_ethernet (vnet_main_t * vnm,
-				  u32 sw_if_index, void *a_arg);
-
-int vnet_proxy_arp_fib_reset (u32 fib_id);
-
-clib_error_t *next_by_ethertype_init (next_by_ethertype_t * l3_next);
-clib_error_t *next_by_ethertype_register (next_by_ethertype_t * l3_next,
-					  u32 ethertype, u32 next_index);
-
-int vnet_create_loopback_interface (u32 * sw_if_indexp, u8 * mac_address);
-int vnet_delete_loopback_interface (u32 sw_if_index);
-int vnet_delete_sub_interface (u32 sw_if_index);
-
-// Perform ethernet subinterface classification table lookups given
-// the ports's sw_if_index and fields extracted from the ethernet header.
-// The resulting tables are used by identify_subint().
-always_inline void
-eth_vlan_table_lookups (ethernet_main_t * em,
-			vnet_main_t * vnm,
-			u32 port_sw_if_index0,
-			u16 first_ethertype,
-			u16 outer_id,
-			u16 inner_id,
-			vnet_hw_interface_t ** hi,
-			main_intf_t ** main_intf,
-			vlan_intf_t ** vlan_intf, qinq_intf_t ** qinq_intf)
-{
-  vlan_table_t *vlan_table;
-  qinq_table_t *qinq_table;
-  u32 vlan_table_id;
-
-  // Read the main, vlan, and qinq interface table entries
-  // TODO: Consider if/how to prefetch tables. Also consider
-  // single-entry cache to skip table lookups and identify_subint()
-  // processing.
-  *hi = vnet_get_sup_hw_interface (vnm, port_sw_if_index0);
-  *main_intf = vec_elt_at_index (em->main_intfs, (*hi)->hw_if_index);
-
-  // Always read the vlan and qinq tables, even if there are not that
-  // many tags on the packet. This makes the lookups and comparisons
-  // easier (and less branchy).
-  vlan_table_id = (first_ethertype == ETHERNET_TYPE_DOT1AD) ?
-    (*main_intf)->dot1ad_vlans : (*main_intf)->dot1q_vlans;
-  vlan_table = vec_elt_at_index (em->vlan_pool, vlan_table_id);
-  *vlan_intf = &vlan_table->vlans[outer_id];
-
-  qinq_table = vec_elt_at_index (em->qinq_pool, (*vlan_intf)->qinqs);
-  *qinq_intf = &qinq_table->vlans[inner_id];
-}
-
-
-// Determine the subinterface for this packet, given the result of the
-// vlan table lookups and vlan header parsing. Check the most specific
-// matches first.
-// Returns 1 if a matching subinterface was found, otherwise returns 0.
-always_inline u32
-eth_identify_subint (vnet_hw_interface_t * hi,
-		     vlib_buffer_t * b0,
-		     u32 match_flags,
-		     main_intf_t * main_intf,
-		     vlan_intf_t * vlan_intf,
-		     qinq_intf_t * qinq_intf,
-		     u32 * new_sw_if_index, u8 * error0, u32 * is_l2)
-{
-  subint_config_t *subint;
-
-  // Each comparison is checking both the valid flag and the number of tags
-  // (incorporating exact-match/non-exact-match).
-
-  // check for specific double tag
-  subint = &qinq_intf->subint;
-  if ((subint->flags & match_flags) == match_flags)
-    goto matched;
-
-  // check for specific outer and 'any' inner
-  subint = &vlan_intf->inner_any_subint;
-  if ((subint->flags & match_flags) == match_flags)
-    goto matched;
-
-  // check for specific single tag
-  subint = &vlan_intf->single_tag_subint;
-  if ((subint->flags & match_flags) == match_flags)
-    goto matched;
-
-  // check for untagged interface
-  subint = &main_intf->untagged_subint;
-  if ((subint->flags & match_flags) == match_flags)
-    goto matched;
-
-  // check for default interface
-  subint = &main_intf->default_subint;
-  if ((subint->flags & match_flags) == match_flags)
-    goto matched;
-
-  // No matching subinterface
-  *new_sw_if_index = ~0;
-  *error0 = ETHERNET_ERROR_UNKNOWN_VLAN;
-  *is_l2 = 0;
-  return 0;
-
-matched:
-  *new_sw_if_index = subint->sw_if_index;
-  *is_l2 = subint->flags & SUBINT_CONFIG_L2;
-  return 1;
-}
-
-// Compare two ethernet macs. Return 1 if they are the same, 0 if different
-always_inline u32
-eth_mac_equal (u8 * mac1, u8 * mac2)
-{
-  return (*((u32 *) (mac1 + 0)) == *((u32 *) (mac2 + 0)) &&
-	  *((u32 *) (mac1 + 2)) == *((u32 *) (mac2 + 2)));
-}
-
-
-always_inline ethernet_main_t *
-vnet_get_ethernet_main (void)
-{
-  return &ethernet_main;
-}
-
-void vnet_register_ip4_arp_resolution_event (vnet_main_t * vnm,
-					     void *address_arg,
-					     uword node_index,
-					     uword type_opaque, uword data);
-
-
-int vnet_add_del_ip4_arp_change_event (vnet_main_t * vnm,
-				       void *data_callback,
-				       u32 pid,
-				       void *address_arg,
-				       uword node_index,
-				       uword type_opaque,
-				       uword data, int is_add);
-
-void ethernet_arp_change_mac (u32 sw_if_index);
-void ethernet_ndp_change_mac (u32 sw_if_index);
-
-void arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai);
-
-void ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai);
-u8 *ethernet_build_rewrite (vnet_main_t * vnm,
-			    u32 sw_if_index,
-			    vnet_link_t link_type, const void *dst_address);
-
-extern vlib_node_registration_t ethernet_input_node;
-
-#endif /* included_ethernet_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ethernet/format.c b/vnet/vnet/ethernet/format.c
deleted file mode 100644
index 4edef5ad..00000000
--- a/vnet/vnet/ethernet/format.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ethernet_format.c: ethernet formatting/parsing.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/ethernet/ethernet.h>
-
-u8 *
-format_ethernet_address (u8 * s, va_list * args)
-{
-  ethernet_main_t *em = &ethernet_main;
-  u8 *a = va_arg (*args, u8 *);
-
-  if (em->format_ethernet_address_16bit)
-    return format (s, "%02x%02x.%02x%02x.%02x%02x",
-		   a[0], a[1], a[2], a[3], a[4], a[5]);
-  else
-    return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
-		   a[0], a[1], a[2], a[3], a[4], a[5]);
-}
-
-u8 *
-format_ethernet_type (u8 * s, va_list * args)
-{
-  ethernet_type_t type = va_arg (*args, u32);
-  ethernet_main_t *em = &ethernet_main;
-  ethernet_type_info_t *t = ethernet_get_type_info (em, type);
-
-  if (t)
-    s = format (s, "%s", t->name);
-  else
-    s = format (s, "0x%04x", type);
-
-  return s;
-}
-
-u8 *
-format_ethernet_vlan_tci (u8 * s, va_list * va)
-{
-  u32 vlan_tci = va_arg (*va, u32);
-
-  u32 vid = (vlan_tci & 0xfff);
-  u32 cfi = (vlan_tci >> 12) & 1;
-  u32 pri = (vlan_tci >> 13);
-
-  s = format (s, "%d", vid);
-  if (pri != 0)
-    s = format (s, " priority %d", pri);
-  if (cfi != 0)
-    s = format (s, " cfi");
-
-  return s;
-}
-
-u8 *
-format_ethernet_pbb (u8 * s, va_list * va)
-{
-  u32 b_tag = va_arg (*va, u32);
-  u32 i_tag = va_arg (*va, u32);
-  u32 vid = (b_tag & 0xfff);
-  u32 bdei = (b_tag >> 12) & 1;
-  u32 bpcp = (b_tag >> 13);
-  u32 sid = (i_tag & 0xffffff);
-  u8 ires = (i_tag >> 24) & 3;
-  u8 iuca = (i_tag >> 27) & 1;
-  u8 idei = (i_tag >> 28) & 1;
-  u8 ipcp = (i_tag >> 29);
-
-  s =
-    format (s, "B_tag %04X (vid %d, dei %d, pcp %d), ", b_tag, vid, bdei,
-	    bpcp);
-  s =
-    format (s, "I_tag %08X (sid %d, res %d, dei %d, pcp %d)", i_tag, sid,
-	    ires, iuca, idei, ipcp);
-
-  return s;
-}
-
-u8 *
-format_ethernet_header_with_length (u8 * s, va_list * args)
-{
-  ethernet_pbb_header_packed_t *ph =
-    va_arg (*args, ethernet_pbb_header_packed_t *);
-  ethernet_max_header_t *m = (ethernet_max_header_t *) ph;
-  u32 max_header_bytes = va_arg (*args, u32);
-  ethernet_main_t *em = &ethernet_main;
-  ethernet_header_t *e = &m->ethernet;
-  ethernet_vlan_header_t *v;
-  ethernet_type_t type = clib_net_to_host_u16 (e->type);
-  ethernet_type_t vlan_type[ARRAY_LEN (m->vlan)];
-  u32 n_vlan = 0, i, header_bytes;
-  uword indent;
-
-  while ((type == ETHERNET_TYPE_VLAN || type == ETHERNET_TYPE_DOT1AD
-	  || type == ETHERNET_TYPE_DOT1AH) && n_vlan < ARRAY_LEN (m->vlan))
-    {
-      vlan_type[n_vlan] = type;
-      if (type != ETHERNET_TYPE_DOT1AH)
-	{
-	  v = m->vlan + n_vlan;
-	  type = clib_net_to_host_u16 (v->type);
-	}
-      n_vlan++;
-    }
-
-  header_bytes = sizeof (e[0]) + n_vlan * sizeof (v[0]);
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    return format (s, "ethernet header truncated");
-
-  indent = format_get_indent (s);
-
-  s = format (s, "%U: %U -> %U",
-	      format_ethernet_type, type,
-	      format_ethernet_address, e->src_address,
-	      format_ethernet_address, e->dst_address);
-
-  if (type != ETHERNET_TYPE_DOT1AH)
-    {
-      for (i = 0; i < n_vlan; i++)
-	{
-	  u32 v = clib_net_to_host_u16 (m->vlan[i].priority_cfi_and_id);
-	  if (*vlan_type == ETHERNET_TYPE_VLAN)
-	    s = format (s, " 802.1q vlan %U", format_ethernet_vlan_tci, v);
-	  else
-	    s = format (s, " 802.1ad vlan %U", format_ethernet_vlan_tci, v);
-	}
-
-      if (max_header_bytes != 0 && header_bytes < max_header_bytes)
-	{
-	  ethernet_type_info_t *ti;
-	  vlib_node_t *node = 0;
-
-	  ti = ethernet_get_type_info (em, type);
-	  if (ti && ti->node_index != ~0)
-	    node = vlib_get_node (em->vlib_main, ti->node_index);
-	  if (node && node->format_buffer)
-	    s = format (s, "\n%U%U",
-			format_white_space, indent,
-			node->format_buffer, (void *) m + header_bytes,
-			max_header_bytes - header_bytes);
-	}
-    }
-  else
-    {
-      s = format (s, "\n%UPBB header : %U", format_white_space, indent,
-		  format_ethernet_pbb,
-		  clib_net_to_host_u16 (ph->priority_dei_id),
-		  clib_net_to_host_u32 (ph->priority_dei_uca_res_sid));
-    }
-
-  return s;
-}
-
-u8 *
-format_ethernet_header (u8 * s, va_list * args)
-{
-  ethernet_max_header_t *m = va_arg (*args, ethernet_max_header_t *);
-  return format (s, "%U", format_ethernet_header_with_length, m, 0);
-}
-
-/* Parse X:X:X:X:X:X unix style ethernet address. */
-static uword
-unformat_ethernet_address_unix (unformat_input_t * input, va_list * args)
-{
-  u8 *result = va_arg (*args, u8 *);
-  u32 i, a[6];
-
-  if (!unformat (input, "%_%x:%x:%x:%x:%x:%x%_",
-		 &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
-    return 0;
-
-  /* Check range. */
-  for (i = 0; i < ARRAY_LEN (a); i++)
-    if (a[i] >= (1 << 8))
-      return 0;
-
-  for (i = 0; i < ARRAY_LEN (a); i++)
-    result[i] = a[i];
-
-  return 1;
-}
-
-/* Parse X.X.X cisco style ethernet address. */
-static uword
-unformat_ethernet_address_cisco (unformat_input_t * input, va_list * args)
-{
-  u8 *result = va_arg (*args, u8 *);
-  u32 i, a[3];
-
-  if (!unformat (input, "%_%x.%x.%x%_", &a[0], &a[1], &a[2]))
-    return 0;
-
-  /* Check range. */
-  for (i = 0; i < ARRAY_LEN (a); i++)
-    if (a[i] >= (1 << 16))
-      return 0;
-
-  result[0] = (a[0] >> 8) & 0xff;
-  result[1] = (a[0] >> 0) & 0xff;
-  result[2] = (a[1] >> 8) & 0xff;
-  result[3] = (a[1] >> 0) & 0xff;
-  result[4] = (a[2] >> 8) & 0xff;
-  result[5] = (a[2] >> 0) & 0xff;
-
-  return 1;
-}
-
-/* Parse ethernet address; accept either unix or style addresses. */
-uword
-unformat_ethernet_address (unformat_input_t * input, va_list * args)
-{
-  u8 *result = va_arg (*args, u8 *);
-  return (unformat_user (input, unformat_ethernet_address_unix, result)
-	  || unformat_user (input, unformat_ethernet_address_cisco, result));
-}
-
-/* Returns ethernet type as an int in host byte order. */
-uword
-unformat_ethernet_type_host_byte_order (unformat_input_t * input,
-					va_list * args)
-{
-  u16 *result = va_arg (*args, u16 *);
-  ethernet_main_t *em = &ethernet_main;
-  int type, i;
-
-  /* Numeric type. */
-  if (unformat (input, "0x%x", &type) || unformat (input, "%d", &type))
-    {
-      if (type >= (1 << 16))
-	return 0;
-      *result = type;
-      return 1;
-    }
-
-  /* Named type. */
-  if (unformat_user (input, unformat_vlib_number_by_name,
-		     em->type_info_by_name, &i))
-    {
-      ethernet_type_info_t *ti = vec_elt_at_index (em->type_infos, i);
-      *result = ti->type;
-      return 1;
-    }
-
-  return 0;
-}
-
-uword
-unformat_ethernet_type_net_byte_order (unformat_input_t * input,
-				       va_list * args)
-{
-  u16 *result = va_arg (*args, u16 *);
-  if (!unformat_user (input, unformat_ethernet_type_host_byte_order, result))
-    return 0;
-
-  *result = clib_host_to_net_u16 ((u16) * result);
-  return 1;
-}
-
-uword
-unformat_ethernet_header (unformat_input_t * input, va_list * args)
-{
-  u8 **result = va_arg (*args, u8 **);
-  ethernet_max_header_t _m, *m = &_m;
-  ethernet_header_t *e = &m->ethernet;
-  u16 type;
-  u32 n_vlan;
-
-  if (!unformat (input, "%U: %U -> %U",
-		 unformat_ethernet_type_host_byte_order, &type,
-		 unformat_ethernet_address, &e->src_address,
-		 unformat_ethernet_address, &e->dst_address))
-    return 0;
-
-  n_vlan = 0;
-  while (unformat (input, "vlan"))
-    {
-      u32 id, priority;
-
-      if (!unformat_user (input, unformat_vlib_number, &id)
-	  || id >= ETHERNET_N_VLAN)
-	return 0;
-
-      if (unformat (input, "priority %d", &priority))
-	{
-	  if (priority >= 8)
-	    return 0;
-	  id |= priority << 13;
-	}
-
-      if (unformat (input, "cfi"))
-	id |= 1 << 12;
-
-      /* Too many vlans given. */
-      if (n_vlan >= ARRAY_LEN (m->vlan))
-	return 0;
-
-      m->vlan[n_vlan].priority_cfi_and_id = clib_host_to_net_u16 (id);
-      n_vlan++;
-    }
-
-  if (n_vlan == 0)
-    e->type = clib_host_to_net_u16 (type);
-  else
-    {
-      int i;
-
-      e->type = clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
-      for (i = 0; i < n_vlan - 1; i++)
-	m->vlan[i].type = clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
-      m->vlan[n_vlan - 1].type = clib_host_to_net_u16 (type);
-    }
-
-  /* Add header to result. */
-  {
-    void *p;
-    u32 n_bytes = sizeof (e[0]) + n_vlan * sizeof (m->vlan[0]);
-
-    vec_add2 (*result, p, n_bytes);
-    clib_memcpy (p, m, n_bytes);
-  }
-
-  return 1;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ethernet/init.c b/vnet/vnet/ethernet/init.c
deleted file mode 100644
index 2d20adc9..00000000
--- a/vnet/vnet/ethernet/init.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ethernet_init.c: ethernet initialization
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/ip.h>		// for feature registration
-
-/* Global main structure. */
-ethernet_main_t ethernet_main;
-
-static void
-add_type (ethernet_main_t * em, ethernet_type_t type, char *type_name)
-{
-  ethernet_type_info_t *ti;
-  u32 i;
-
-  vec_add2 (em->type_infos, ti, 1);
-  i = ti - em->type_infos;
-
-  ti->name = type_name;
-  ti->type = type;
-  ti->next_index = ti->node_index = ~0;
-
-  hash_set (em->type_info_by_type, type, i);
-  hash_set_mem (em->type_info_by_name, ti->name, i);
-}
-
-/* Built-in ip4 tx feature path definition */
-/* *INDENT-OFF* */
-VNET_FEATURE_ARC_INIT (ethernet_output, static) =
-{
-  .arc_name  = "ethernet-output",
-  .start_nodes = VNET_FEATURES ("adj-l2-midchain"),
-  .arc_index_ptr = &ethernet_main.output_feature_arc_index,
-};
-
-VNET_FEATURE_INIT (ethernet_tx_drop, static) =
-{
-  .arc_name = "ethernet-output",
-  .node_name = "error-drop",
-  .runs_before = 0,	/* not before any other features */
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-ethernet_init (vlib_main_t * vm)
-{
-  ethernet_main_t *em = &ethernet_main;
-  clib_error_t *error;
-
-  /*
-   * Set up the L2 path now, or we'll wipe out the L2 ARP
-   * registration set up by ethernet_arp_init.
-   */
-  if ((error = vlib_call_init_function (vm, l2_init)))
-    return error;
-
-  em->vlib_main = vm;
-
-  em->type_info_by_name = hash_create_string (0, sizeof (uword));
-  em->type_info_by_type = hash_create (0, sizeof (uword));
-
-#define ethernet_type(n,s) add_type (em, ETHERNET_TYPE_##s, #s);
-#include "types.def"
-#undef ethernet_type
-
-  if ((error = vlib_call_init_function (vm, llc_init)))
-    return error;
-  if ((error = vlib_call_init_function (vm, ethernet_input_init)))
-    return error;
-  if ((error = vlib_call_init_function (vm, vnet_feature_init)))
-    return error;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ethernet_init);
-
-ethernet_main_t *
-ethernet_get_main (vlib_main_t * vm)
-{
-  vlib_call_init_function (vm, ethernet_init);
-  return &ethernet_main;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ethernet/interface.c b/vnet/vnet/ethernet/interface.c
deleted file mode 100644
index 1c1f4353..00000000
--- a/vnet/vnet/ethernet/interface.c
+++ /dev/null
@@ -1,730 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ethernet_interface.c: ethernet interfaces
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/adj/adj.h>
-
-/**
- * @file
- * @brief Loopback Interfaces.
- *
- * This file contains code to manage loopback interfaces.
- */
-
-/**
- * @brief build a rewrite string to use for sending packets of type 'link_type'
- * to 'dst_address'
- */
-u8 *
-ethernet_build_rewrite (vnet_main_t * vnm,
-			u32 sw_if_index,
-			vnet_link_t link_type, const void *dst_address)
-{
-  vnet_sw_interface_t *sub_sw = vnet_get_sw_interface (vnm, sw_if_index);
-  vnet_sw_interface_t *sup_sw = vnet_get_sup_sw_interface (vnm, sw_if_index);
-  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  ethernet_main_t *em = &ethernet_main;
-  ethernet_interface_t *ei;
-  ethernet_header_t *h;
-  ethernet_type_t type;
-  uword n_bytes = sizeof (h[0]);
-  u8 *rewrite = NULL;
-
-  if (sub_sw != sup_sw)
-    {
-      if (sub_sw->sub.eth.flags.one_tag)
-	{
-	  n_bytes += sizeof (ethernet_vlan_header_t);
-	}
-      else if (sub_sw->sub.eth.flags.two_tags)
-	{
-	  n_bytes += 2 * (sizeof (ethernet_vlan_header_t));
-	}
-      // Check for encaps that are not supported for L3 interfaces
-      if (!(sub_sw->sub.eth.flags.exact_match) ||
-	  (sub_sw->sub.eth.flags.default_sub) ||
-	  (sub_sw->sub.eth.flags.outer_vlan_id_any) ||
-	  (sub_sw->sub.eth.flags.inner_vlan_id_any))
-	{
-	  return 0;
-	}
-    }
-
-  switch (link_type)
-    {
-#define _(a,b) case VNET_LINK_##a: type = ETHERNET_TYPE_##b; break
-      _(IP4, IP4);
-      _(IP6, IP6);
-      _(MPLS, MPLS_UNICAST);
-      _(ARP, ARP);
-#undef _
-    default:
-      return NULL;
-    }
-
-  vec_validate (rewrite, n_bytes - 1);
-  h = (ethernet_header_t *) rewrite;
-  ei = pool_elt_at_index (em->interfaces, hw->hw_instance);
-  clib_memcpy (h->src_address, ei->address, sizeof (h->src_address));
-  if (dst_address)
-    clib_memcpy (h->dst_address, dst_address, sizeof (h->dst_address));
-  else
-    memset (h->dst_address, ~0, sizeof (h->dst_address));	/* broadcast */
-
-  if (sub_sw->sub.eth.flags.one_tag)
-    {
-      ethernet_vlan_header_t *outer = (void *) (h + 1);
-
-      h->type = sub_sw->sub.eth.flags.dot1ad ?
-	clib_host_to_net_u16 (ETHERNET_TYPE_DOT1AD) :
-	clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
-      outer->priority_cfi_and_id =
-	clib_host_to_net_u16 (sub_sw->sub.eth.outer_vlan_id);
-      outer->type = clib_host_to_net_u16 (type);
-
-    }
-  else if (sub_sw->sub.eth.flags.two_tags)
-    {
-      ethernet_vlan_header_t *outer = (void *) (h + 1);
-      ethernet_vlan_header_t *inner = (void *) (outer + 1);
-
-      h->type = sub_sw->sub.eth.flags.dot1ad ?
-	clib_host_to_net_u16 (ETHERNET_TYPE_DOT1AD) :
-	clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
-      outer->priority_cfi_and_id =
-	clib_host_to_net_u16 (sub_sw->sub.eth.outer_vlan_id);
-      outer->type = clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
-      inner->priority_cfi_and_id =
-	clib_host_to_net_u16 (sub_sw->sub.eth.inner_vlan_id);
-      inner->type = clib_host_to_net_u16 (type);
-
-    }
-  else
-    {
-      h->type = clib_host_to_net_u16 (type);
-    }
-
-  return (rewrite);
-}
-
-void
-ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
-{
-  ip_adjacency_t *adj;
-
-  adj = adj_get (ai);
-
-  if (FIB_PROTOCOL_IP4 == adj->ia_nh_proto)
-    {
-      arp_update_adjacency (vnm, sw_if_index, ai);
-    }
-  else if (FIB_PROTOCOL_IP6 == adj->ia_nh_proto)
-    {
-      ip6_ethernet_update_adjacency (vnm, sw_if_index, ai);
-    }
-  else
-    {
-      ASSERT (0);
-    }
-}
-
-static clib_error_t *
-ethernet_mac_change (vnet_hw_interface_t * hi, char *mac_address)
-{
-  ethernet_interface_t *ei;
-  ethernet_main_t *em;
-
-  em = &ethernet_main;
-  ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
-
-  vec_validate (hi->hw_address,
-		STRUCT_SIZE_OF (ethernet_header_t, src_address) - 1);
-  clib_memcpy (hi->hw_address, mac_address, vec_len (hi->hw_address));
-
-  clib_memcpy (ei->address, (u8 *) mac_address, sizeof (ei->address));
-  ethernet_arp_change_mac (hi->sw_if_index);
-  ethernet_ndp_change_mac (hi->sw_if_index);
-
-  return (NULL);
-}
-
-/* *INDENT-OFF* */
-VNET_HW_INTERFACE_CLASS (ethernet_hw_interface_class) = {
-  .name = "Ethernet",
-  .format_address = format_ethernet_address,
-  .format_header = format_ethernet_header_with_length,
-  .unformat_hw_address = unformat_ethernet_address,
-  .unformat_header = unformat_ethernet_header,
-  .build_rewrite = ethernet_build_rewrite,
-  .update_adjacency = ethernet_update_adjacency,
-  .mac_addr_change_function = ethernet_mac_change,
-};
-/* *INDENT-ON* */
-
-uword
-unformat_ethernet_interface (unformat_input_t * input, va_list * args)
-{
-  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
-  u32 *result = va_arg (*args, u32 *);
-  u32 hw_if_index;
-  ethernet_main_t *em = &ethernet_main;
-  ethernet_interface_t *eif;
-
-  if (!unformat_user (input, unformat_vnet_hw_interface, vnm, &hw_if_index))
-    return 0;
-
-  eif = ethernet_get_interface (em, hw_if_index);
-  if (eif)
-    {
-      *result = hw_if_index;
-      return 1;
-    }
-  return 0;
-}
-
-clib_error_t *
-ethernet_register_interface (vnet_main_t * vnm,
-			     u32 dev_class_index,
-			     u32 dev_instance,
-			     u8 * address,
-			     u32 * hw_if_index_return,
-			     ethernet_flag_change_function_t flag_change)
-{
-  ethernet_main_t *em = &ethernet_main;
-  ethernet_interface_t *ei;
-  vnet_hw_interface_t *hi;
-  clib_error_t *error = 0;
-  u32 hw_if_index;
-
-  pool_get (em->interfaces, ei);
-  ei->flag_change = flag_change;
-
-  hw_if_index = vnet_register_interface
-    (vnm,
-     dev_class_index, dev_instance,
-     ethernet_hw_interface_class.index, ei - em->interfaces);
-  *hw_if_index_return = hw_if_index;
-
-  hi = vnet_get_hw_interface (vnm, hw_if_index);
-
-  ethernet_setup_node (vnm->vlib_main, hi->output_node_index);
-
-  hi->min_packet_bytes = hi->min_supported_packet_bytes =
-    ETHERNET_MIN_PACKET_BYTES;
-  hi->max_packet_bytes = hi->max_supported_packet_bytes =
-    ETHERNET_MAX_PACKET_BYTES;
-  hi->per_packet_overhead_bytes =
-    /* preamble */ 8 + /* inter frame gap */ 12;
-
-  /* Standard default ethernet MTU. */
-  hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] = 9000;
-
-  clib_memcpy (ei->address, address, sizeof (ei->address));
-  vec_free (hi->hw_address);
-  vec_add (hi->hw_address, address, sizeof (ei->address));
-
-  if (error)
-    {
-      pool_put (em->interfaces, ei);
-      return error;
-    }
-  return error;
-}
-
-void
-ethernet_delete_interface (vnet_main_t * vnm, u32 hw_if_index)
-{
-  ethernet_main_t *em = &ethernet_main;
-  ethernet_interface_t *ei;
-  vnet_hw_interface_t *hi;
-  main_intf_t *main_intf;
-  vlan_table_t *vlan_table;
-  u32 idx;
-
-  hi = vnet_get_hw_interface (vnm, hw_if_index);
-  ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
-
-  /* Delete vlan mapping table for dot1q and dot1ad. */
-  main_intf = vec_elt_at_index (em->main_intfs, hi->hw_if_index);
-  if (main_intf->dot1q_vlans)
-    {
-      vlan_table = vec_elt_at_index (em->vlan_pool, main_intf->dot1q_vlans);
-      for (idx = 0; idx < ETHERNET_N_VLAN; idx++)
-	{
-	  if (vlan_table->vlans[idx].qinqs)
-	    {
-	      pool_put_index (em->qinq_pool, vlan_table->vlans[idx].qinqs);
-	    }
-	}
-      pool_put_index (em->vlan_pool, main_intf->dot1q_vlans);
-    }
-  if (main_intf->dot1ad_vlans)
-    {
-      vlan_table = vec_elt_at_index (em->vlan_pool, main_intf->dot1ad_vlans);
-      for (idx = 0; idx < ETHERNET_N_VLAN; idx++)
-	{
-	  if (vlan_table->vlans[idx].qinqs)
-	    {
-	      pool_put_index (em->qinq_pool, vlan_table->vlans[idx].qinqs);
-	    }
-	}
-      pool_put_index (em->vlan_pool, main_intf->dot1ad_vlans);
-    }
-
-  vnet_delete_hw_interface (vnm, hw_if_index);
-  pool_put (em->interfaces, ei);
-}
-
-u32
-ethernet_set_flags (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
-{
-  ethernet_main_t *em = &ethernet_main;
-  vnet_hw_interface_t *hi;
-  ethernet_interface_t *ei;
-
-  hi = vnet_get_hw_interface (vnm, hw_if_index);
-
-  ASSERT (hi->hw_class_index == ethernet_hw_interface_class.index);
-
-  ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
-  if (ei->flag_change)
-    return ei->flag_change (vnm, hi, flags);
-  return (u32) ~ 0;
-}
-
-/* Echo packets back to ethernet/l2-input. */
-static uword
-simulated_ethernet_interface_tx (vlib_main_t * vm,
-				 vlib_node_runtime_t * node,
-				 vlib_frame_t * frame)
-{
-  u32 n_left_from, n_left_to_next, n_copy, *from, *to_next;
-  u32 next_index = VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT;
-  u32 i, next_node_index, bvi_flag, sw_if_index;
-  u32 n_pkts = 0, n_bytes = 0;
-  u32 cpu_index = vm->cpu_index;
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vlib_node_main_t *nm = &vm->node_main;
-  vlib_node_t *loop_node;
-  vlib_buffer_t *b;
-
-  // check tx node index, it is ethernet-input on loopback create
-  // but can be changed to l2-input if loopback is configured as
-  // BVI of a BD (Bridge Domain).
-  loop_node = vec_elt (nm->nodes, node->node_index);
-  next_node_index = loop_node->next_nodes[next_index];
-  bvi_flag = (next_node_index == l2input_node.index) ? 1 : 0;
-
-  n_left_from = frame->n_vectors;
-  from = vlib_frame_args (frame);
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      n_copy = clib_min (n_left_from, n_left_to_next);
-
-      clib_memcpy (to_next, from, n_copy * sizeof (from[0]));
-      n_left_to_next -= n_copy;
-      n_left_from -= n_copy;
-      i = 0;
-      b = vlib_get_buffer (vm, from[i]);
-      sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_TX];
-      while (1)
-	{
-	  // Set up RX and TX indices as if received from a real driver
-	  // unless loopback is used as a BVI. For BVI case, leave TX index
-	  // and update l2_len in packet as required for l2 forwarding path
-	  vnet_buffer (b)->sw_if_index[VLIB_RX] = sw_if_index;
-	  if (bvi_flag)
-	    {
-	      vnet_update_l2_len (b);
-	      vnet_buffer (b)->sw_if_index[VLIB_TX] = L2INPUT_BVI;
-	    }
-	  else
-	    vnet_buffer (b)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-
-	  i++;
-	  n_pkts++;
-	  n_bytes += vlib_buffer_length_in_chain (vm, b);
-
-	  if (i < n_copy)
-	    b = vlib_get_buffer (vm, from[i]);
-	  else
-	    break;
-	}
-      from += n_copy;
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-
-      /* increment TX interface stat */
-      vlib_increment_combined_counter (im->combined_sw_if_counters +
-				       VNET_INTERFACE_COUNTER_TX, cpu_index,
-				       sw_if_index, n_pkts, n_bytes);
-    }
-
-  return n_left_from;
-}
-
-static u8 *
-format_simulated_ethernet_name (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  return format (s, "loop%d", dev_instance);
-}
-
-static clib_error_t *
-simulated_ethernet_admin_up_down (vnet_main_t * vnm, u32 hw_if_index,
-				  u32 flags)
-{
-  u32 hw_flags = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ?
-    VNET_HW_INTERFACE_FLAG_LINK_UP : 0;
-  vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (ethernet_simulated_device_class) = {
-  .name = "Loopback",
-  .format_device_name = format_simulated_ethernet_name,
-  .tx_function = simulated_ethernet_interface_tx,
-  .admin_up_down_function = simulated_ethernet_admin_up_down,
-};
-/* *INDENT-ON* */
-
-int
-vnet_create_loopback_interface (u32 * sw_if_indexp, u8 * mac_address)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-  clib_error_t *error;
-  static u32 instance;
-  u8 address[6];
-  u32 hw_if_index;
-  vnet_hw_interface_t *hw_if;
-  u32 slot;
-  int rv = 0;
-
-  ASSERT (sw_if_indexp);
-
-  *sw_if_indexp = (u32) ~ 0;
-
-  memset (address, 0, sizeof (address));
-
-  /*
-   * Default MAC address (dead:0000:0000 + instance) is allocated
-   * if zero mac_address is configured. Otherwise, user-configurable MAC
-   * address is programmed on the loopback interface.
-   */
-  if (memcmp (address, mac_address, sizeof (address)))
-    clib_memcpy (address, mac_address, sizeof (address));
-  else
-    {
-      address[0] = 0xde;
-      address[1] = 0xad;
-      address[5] = instance;
-    }
-
-  error = ethernet_register_interface
-    (vnm,
-     ethernet_simulated_device_class.index, instance++, address, &hw_if_index,
-     /* flag change */ 0);
-
-  if (error)
-    {
-      rv = VNET_API_ERROR_INVALID_REGISTRATION;
-      clib_error_report (error);
-      return rv;
-    }
-
-  hw_if = vnet_get_hw_interface (vnm, hw_if_index);
-  slot = vlib_node_add_named_next_with_slot
-    (vm, hw_if->tx_node_index,
-     "ethernet-input", VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
-  ASSERT (slot == VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
-
-  {
-    vnet_sw_interface_t *si = vnet_get_hw_sw_interface (vnm, hw_if_index);
-    *sw_if_indexp = si->sw_if_index;
-  }
-
-  return 0;
-}
-
-static clib_error_t *
-create_simulated_ethernet_interfaces (vlib_main_t * vm,
-				      unformat_input_t * input,
-				      vlib_cli_command_t * cmd)
-{
-  int rv;
-  u32 sw_if_index;
-  u8 mac_address[6];
-
-  memset (mac_address, 0, sizeof (mac_address));
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "mac %U", unformat_ethernet_address, mac_address))
-	;
-      else
-	break;
-    }
-
-  rv = vnet_create_loopback_interface (&sw_if_index, mac_address);
-
-  if (rv)
-    return clib_error_return (0, "vnet_create_loopback_interface failed");
-
-  vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main (),
-		   sw_if_index);
-  return 0;
-}
-
-/*?
- * Create a loopback interface. Optionally, a MAC Address can be
- * provided. If not provided, de:ad:00:00:00:<loopId> will be used.
- *
- * @cliexpar
- * The following two command syntaxes are equivalent:
- * @cliexcmd{loopback create-interface [mac <mac-addr>]}
- * @cliexcmd{create loopback interface [mac <mac-addr>]}
- * Example of how to create a loopback interface:
- * @cliexcmd{loopback create-interface}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (create_simulated_ethernet_interface_command, static) = {
-  .path = "loopback create-interface",
-  .short_help = "loopback create-interface [mac <mac-addr>]",
-  .function = create_simulated_ethernet_interfaces,
-};
-/* *INDENT-ON* */
-
-/*?
- * Create a loopback interface. Optionally, a MAC Address can be
- * provided. If not provided, de:ad:00:00:00:<loopId> will be used.
- *
- * @cliexpar
- * The following two command syntaxes are equivalent:
- * @cliexcmd{loopback create-interface [mac <mac-addr>]}
- * @cliexcmd{create loopback interface [mac <mac-addr>]}
- * Example of how to create a loopback interface:
- * @cliexcmd{create loopback interface}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (create_loopback_interface_command, static) = {
-  .path = "create loopback interface",
-  .short_help = "create loopback interface [mac <mac-addr>]",
-  .function = create_simulated_ethernet_interfaces,
-};
-/* *INDENT-ON* */
-
-ethernet_interface_t *
-ethernet_get_interface (ethernet_main_t * em, u32 hw_if_index)
-{
-  vnet_hw_interface_t *i =
-    vnet_get_hw_interface (vnet_get_main (), hw_if_index);
-  return (i->hw_class_index ==
-	  ethernet_hw_interface_class.
-	  index ? pool_elt_at_index (em->interfaces, i->hw_instance) : 0);
-}
-
-int
-vnet_delete_loopback_interface (u32 sw_if_index)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_sw_interface_t *si;
-
-  if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-  si = vnet_get_sw_interface (vnm, sw_if_index);
-  ethernet_delete_interface (vnm, si->hw_if_index);
-
-  return 0;
-}
-
-int
-vnet_delete_sub_interface (u32 sw_if_index)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  int rv = 0;
-
-  if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index);
-
-  if (si->type == VNET_SW_INTERFACE_TYPE_SUB)
-    {
-      vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index);
-      u64 sup_and_sub_key =
-	((u64) (si->sup_sw_if_index) << 32) | (u64) si->sub.id;
-
-      hash_unset_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key);
-      vnet_delete_sw_interface (vnm, sw_if_index);
-    }
-  else
-    {
-      rv = VNET_API_ERROR_INVALID_SUB_SW_IF_INDEX;
-    }
-  return rv;
-}
-
-static clib_error_t *
-delete_simulated_ethernet_interfaces (vlib_main_t * vm,
-				      unformat_input_t * input,
-				      vlib_cli_command_t * cmd)
-{
-  int rv;
-  u32 sw_if_index = ~0;
-  vnet_main_t *vnm = vnet_get_main ();
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "intfc %U",
-		    unformat_vnet_sw_interface, vnm, &sw_if_index))
-	;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "interface not specified");
-
-  rv = vnet_delete_loopback_interface (sw_if_index);
-
-  if (rv)
-    return clib_error_return (0, "vnet_delete_loopback_interface failed");
-
-  return 0;
-}
-
-static clib_error_t *
-delete_sub_interface (vlib_main_t * vm,
-		      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  int rv = 0;
-  u32 sw_if_index = ~0;
-  vnet_main_t *vnm = vnet_get_main ();
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
-	;
-      else
-	break;
-    }
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "interface doesn't exist");
-
-  if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
-    rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-  else
-    rv = vnet_delete_sub_interface (sw_if_index);
-  if (rv)
-    return clib_error_return (0, "delete_subinterface_interface failed");
-  return 0;
-}
-
-/*?
- * Delete a loopback interface.
- *
- * @cliexpar
- * The following two command syntaxes are equivalent:
- * @cliexcmd{loopback delete-interface intfc <interface>}
- * @cliexcmd{delete loopback interface intfc <interface>}
- * Example of how to delete a loopback interface:
- * @cliexcmd{loopback delete-interface intfc loop0}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (delete_simulated_ethernet_interface_command, static) = {
-  .path = "loopback delete-interface",
-  .short_help = "loopback delete-interface intfc <interface>",
-  .function = delete_simulated_ethernet_interfaces,
-};
-/* *INDENT-ON* */
-
-/*?
- * Delete a loopback interface.
- *
- * @cliexpar
- * The following two command syntaxes are equivalent:
- * @cliexcmd{loopback delete-interface intfc <interface>}
- * @cliexcmd{delete loopback interface intfc <interface>}
- * Example of how to delete a loopback interface:
- * @cliexcmd{delete loopback interface intfc loop0}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (delete_loopback_interface_command, static) = {
-  .path = "delete loopback interface",
-  .short_help = "delete loopback interface intfc <interface>",
-  .function = delete_simulated_ethernet_interfaces,
-};
-/* *INDENT-ON* */
-
-/*?
- * Delete a sub-interface.
- *
- * @cliexpar
- * Example of how to delete a sub-interface:
- * @cliexcmd{delete sub-interface GigabitEthernet0/8/0.200}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (delete_sub_interface_command, static) = {
-  .path = "delete sub-interface",
-  .short_help = "delete sub-interface <interface>",
-  .function = delete_sub_interface,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ethernet/mac_swap.c b/vnet/vnet/ethernet/mac_swap.c
deleted file mode 100644
index c0fec12e..00000000
--- a/vnet/vnet/ethernet/mac_swap.c
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vppinfra/error.h>
-#include <vnet/devices/pci/ige.h>
-#include <vnet/devices/pci/ixge.h>
-#include <vnet/devices/pci/ixgev.h>
-
-typedef struct
-{
-  u32 cached_next_index;
-  u32 cached_sw_if_index;
-
-  /* Hash table to map sw_if_index to next node index */
-  uword *next_node_index_by_sw_if_index;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} mac_swap_main_t;
-
-typedef struct
-{
-  u8 src[6];
-  u8 dst[6];
-  u32 sw_if_index;
-  u32 next_index;
-} swap_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_swap_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  swap_trace_t *t = va_arg (*args, swap_trace_t *);
-
-  s = format (s, "SWAP: dst now %U src now %U sw_if_index %d next_index %d",
-	      format_ethernet_address, t->dst,
-	      format_ethernet_address, t->src, t->sw_if_index, t->next_index);
-  return s;
-}
-
-#define foreach_hw_driver_next                  \
-  _(IP4)                                        \
-  _(IP6)                                        \
-  _(ETHERNET)
-
-mac_swap_main_t mac_swap_main;
-
-static vlib_node_registration_t mac_swap_node;
-
-#define foreach_mac_swap_error \
-_(SWAPS, "mac addresses swapped")
-
-typedef enum
-{
-#define _(sym,str) MAC_SWAP_ERROR_##sym,
-  foreach_mac_swap_error
-#undef _
-    MAC_SWAP_N_ERROR,
-} mac_swap_error_t;
-
-static char *mac_swap_error_strings[] = {
-#define _(sym,string) string,
-  foreach_mac_swap_error
-#undef _
-};
-
-/*
- * To drop a pkt and increment one of the previous counters:
- *
- * set b0->error = error_node->errors[RANDOM_ERROR_SAMPLE];
- * set next0 to a disposition index bound to "error-drop".
- *
- * To manually increment the specific counter MAC_SWAP_ERROR_SAMPLE:
- *
- *  vlib_node_t *n = vlib_get_node (vm, mac_swap.index);
- *  u32 node_counter_base_index = n->error_heap_index;
- *  vlib_error_main_t * em = &vm->error_main;
- *  em->counters[node_counter_base_index + MAC_SWAP_ERROR_SAMPLE] += 1;
- *
- */
-
-typedef enum
-{
-  MAC_SWAP_NEXT_DROP,
-  MAC_SWAP_N_NEXT,
-} mac_swap_next_t;
-
-static uword
-mac_swap_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  mac_swap_next_t next_index;
-  mac_swap_main_t *msm = &mac_swap_main;
-  vlib_node_t *n = vlib_get_node (vm, mac_swap_node.index);
-  u32 node_counter_base_index = n->error_heap_index;
-  vlib_error_main_t *em = &vm->error_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-	  u32 sw_if_index0, sw_if_index1;
-	  uword *p0, *p1;
-	  u64 tmp0a, tmp0b;
-	  u64 tmp1a, tmp1b;
-	  ethernet_header_t *h0, *h1;
-
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  next0 = msm->cached_next_index;
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-	  next1 = msm->cached_next_index;
-
-	  if (PREDICT_FALSE (msm->cached_sw_if_index != sw_if_index0))
-	    {
-	      p0 =
-		hash_get (msm->next_node_index_by_sw_if_index, sw_if_index0);
-	      if (p0 == 0)
-		{
-		  vnet_hw_interface_t *hw0;
-
-		  hw0 = vnet_get_sup_hw_interface (msm->vnet_main,
-						   sw_if_index0);
-
-		  next0 = vlib_node_add_next (msm->vlib_main,
-					      mac_swap_node.index,
-					      hw0->output_node_index);
-		  hash_set (msm->next_node_index_by_sw_if_index,
-			    sw_if_index0, next0);
-		}
-	      else
-		next0 = p0[0];
-	      msm->cached_sw_if_index = sw_if_index0;
-	      msm->cached_next_index = next0;
-	      next1 = next0;
-	    }
-	  if (PREDICT_FALSE (msm->cached_sw_if_index != sw_if_index1))
-	    {
-	      p1 =
-		hash_get (msm->next_node_index_by_sw_if_index, sw_if_index1);
-	      if (p1 == 0)
-		{
-		  vnet_hw_interface_t *hw1;
-
-		  hw1 = vnet_get_sup_hw_interface (msm->vnet_main,
-						   sw_if_index1);
-
-		  next1 = vlib_node_add_next (msm->vlib_main,
-					      mac_swap_node.index,
-					      hw1->output_node_index);
-		  hash_set (msm->next_node_index_by_sw_if_index,
-			    sw_if_index1, next1);
-		}
-	      else
-		next1 = p1[0];
-	      msm->cached_sw_if_index = sw_if_index1;
-	      msm->cached_next_index = next1;
-	    }
-
-	  em->counters[node_counter_base_index + MAC_SWAP_ERROR_SWAPS] += 2;
-
-	  /* reset buffer so we always point at the MAC hdr */
-	  vlib_buffer_reset (b0);
-	  vlib_buffer_reset (b1);
-	  h0 = vlib_buffer_get_current (b0);
-	  h1 = vlib_buffer_get_current (b1);
-
-	  /* Swap 2 x src and dst mac addresses using 8-byte load/stores */
-	  tmp0a = clib_net_to_host_u64 (((u64 *) (h0->dst_address))[0]);
-	  tmp1a = clib_net_to_host_u64 (((u64 *) (h1->dst_address))[0]);
-	  tmp0b = clib_net_to_host_u64 (((u64 *) (h0->src_address))[0]);
-	  tmp1b = clib_net_to_host_u64 (((u64 *) (h1->src_address))[0]);
-	  ((u64 *) (h0->dst_address))[0] = clib_host_to_net_u64 (tmp0b);
-	  ((u64 *) (h1->dst_address))[0] = clib_host_to_net_u64 (tmp1b);
-	  /* Move the ethertype from "b" to "a" */
-	  tmp0a &= ~(0xFFFF);
-	  tmp1a &= ~(0xFFFF);
-	  tmp0a |= tmp0b & 0xFFFF;
-	  ((u64 *) (h0->src_address))[0] = clib_host_to_net_u64 (tmp0a);
-	  tmp1a |= tmp1b & 0xFFFF;
-	  ((u64 *) (h1->src_address))[0] = clib_host_to_net_u64 (tmp1a);
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  swap_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  clib_memcpy (t->src, h0->src_address, 6);
-		  clib_memcpy (t->dst, h0->dst_address, 6);
-		  t->sw_if_index = sw_if_index0;
-		  t->next_index = next0;
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  swap_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  clib_memcpy (t->src, h1->src_address, 6);
-		  clib_memcpy (t->dst, h1->dst_address, 6);
-		  t->sw_if_index = sw_if_index1;
-		  t->next_index = next1;
-		}
-	    }
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 sw_if_index0;
-	  uword *p0;
-	  u64 tmp0a, tmp0b;
-	  ethernet_header_t *h0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  next0 = msm->cached_next_index;
-
-	  if (PREDICT_FALSE (msm->cached_sw_if_index != sw_if_index0))
-	    {
-	      p0 =
-		hash_get (msm->next_node_index_by_sw_if_index, sw_if_index0);
-	      if (p0 == 0)
-		{
-		  vnet_hw_interface_t *hw0;
-
-		  hw0 = vnet_get_sup_hw_interface (msm->vnet_main,
-						   sw_if_index0);
-
-		  next0 = vlib_node_add_next (msm->vlib_main,
-					      mac_swap_node.index,
-					      hw0->output_node_index);
-		  hash_set (msm->next_node_index_by_sw_if_index,
-			    sw_if_index0, next0);
-		}
-	      else
-		next0 = p0[0];
-	      msm->cached_sw_if_index = sw_if_index0;
-	      msm->cached_next_index = next0;
-	    }
-
-	  em->counters[node_counter_base_index + MAC_SWAP_ERROR_SWAPS] += 1;
-
-	  /* reset buffer so we always point at the MAC hdr */
-	  vlib_buffer_reset (b0);
-	  h0 = vlib_buffer_get_current (b0);
-
-	  /* Exchange src and dst, preserve the ethertype */
-	  tmp0a = clib_net_to_host_u64 (((u64 *) (h0->dst_address))[0]);
-	  tmp0b = clib_net_to_host_u64 (((u64 *) (h0->src_address))[0]);
-	  ((u64 *) (h0->dst_address))[0] = clib_host_to_net_u64 (tmp0b);
-	  tmp0a &= ~(0xFFFF);
-	  tmp0a |= tmp0b & 0xFFFF;
-	  ((u64 *) (h0->src_address))[0] = clib_host_to_net_u64 (tmp0a);
-
-	  /* ship it */
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      swap_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-	      clib_memcpy (t->src, h0->src_address, 6);
-	      clib_memcpy (t->dst, h0->dst_address, 6);
-	      t->sw_if_index = sw_if_index0;
-	      t->next_index = next0;
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (mac_swap_node,static) = {
-  .function = mac_swap_node_fn,
-  .name = "mac-swap",
-  .vector_size = sizeof (u32),
-  .format_trace = format_swap_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(mac_swap_error_strings),
-  .error_strings = mac_swap_error_strings,
-
-  .n_next_nodes = MAC_SWAP_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-        [MAC_SWAP_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-mac_swap_init (vlib_main_t * vm)
-{
-  mac_swap_main_t *msm = &mac_swap_main;
-
-  msm->next_node_index_by_sw_if_index = hash_create (0, sizeof (uword));
-  msm->cached_next_index = (u32) ~ 0;
-  msm->cached_sw_if_index = (u32) ~ 0;
-  msm->vlib_main = vm;
-  msm->vnet_main = vnet_get_main ();
-
-  /* Driver RX nodes send pkts here... */
-#define _(a) ixge_set_next_node (IXGE_RX_NEXT_##a##_INPUT, "mac-swap");
-  foreach_hw_driver_next
-#undef _
-#define _(a) ixgev_set_next_node (IXGEV_RX_NEXT_##a##_INPUT, "mac-swap");
-    foreach_hw_driver_next
-#undef _
-#define _(a) ige_set_next_node (IGE_RX_NEXT_##a##_INPUT, "mac-swap");
-    foreach_hw_driver_next
-#undef _
-    return 0;
-}
-
-VLIB_INIT_FUNCTION (mac_swap_init);
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ethernet/node.c b/vnet/vnet/ethernet/node.c
deleted file mode 100755
index 6d57da31..00000000
--- a/vnet/vnet/ethernet/node.c
+++ /dev/null
@@ -1,1368 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ethernet_node.c: ethernet packet processing
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vppinfra/sparse_vec.h>
-#include <vnet/l2/l2_bvi.h>
-
-
-#define foreach_ethernet_input_next		\
-  _ (PUNT, "error-punt")			\
-  _ (DROP, "error-drop")			\
-  _ (LLC, "llc-input")
-
-typedef enum
-{
-#define _(s,n) ETHERNET_INPUT_NEXT_##s,
-  foreach_ethernet_input_next
-#undef _
-    ETHERNET_INPUT_N_NEXT,
-} ethernet_input_next_t;
-
-typedef struct
-{
-  u8 packet_data[32];
-} ethernet_input_trace_t;
-
-static u8 *
-format_ethernet_input_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  ethernet_input_trace_t *t = va_arg (*va, ethernet_input_trace_t *);
-
-  s = format (s, "%U", format_ethernet_header, t->packet_data);
-
-  return s;
-}
-
-vlib_node_registration_t ethernet_input_node;
-
-typedef enum
-{
-  ETHERNET_INPUT_VARIANT_ETHERNET,
-  ETHERNET_INPUT_VARIANT_ETHERNET_TYPE,
-  ETHERNET_INPUT_VARIANT_NOT_L2,
-} ethernet_input_variant_t;
-
-
-// Parse the ethernet header to extract vlan tags and innermost ethertype
-static_always_inline void
-parse_header (ethernet_input_variant_t variant,
-	      vlib_buffer_t * b0,
-	      u16 * type,
-	      u16 * orig_type,
-	      u16 * outer_id, u16 * inner_id, u32 * match_flags)
-{
-  u8 vlan_count;
-
-  if (variant == ETHERNET_INPUT_VARIANT_ETHERNET
-      || variant == ETHERNET_INPUT_VARIANT_NOT_L2)
-    {
-      ethernet_header_t *e0;
-
-      e0 = (void *) (b0->data + b0->current_data);
-
-      vnet_buffer (b0)->ethernet.start_of_ethernet_header = b0->current_data;
-
-      vlib_buffer_advance (b0, sizeof (e0[0]));
-
-      *type = clib_net_to_host_u16 (e0->type);
-    }
-  else if (variant == ETHERNET_INPUT_VARIANT_ETHERNET_TYPE)
-    {
-      // here when prior node was LLC/SNAP processing
-      u16 *e0;
-
-      e0 = (void *) (b0->data + b0->current_data);
-
-      vlib_buffer_advance (b0, sizeof (e0[0]));
-
-      *type = clib_net_to_host_u16 (e0[0]);
-    }
-
-  // save for distinguishing between dot1q and dot1ad later
-  *orig_type = *type;
-
-  // default the tags to 0 (used if there is no corresponding tag)
-  *outer_id = 0;
-  *inner_id = 0;
-
-  *match_flags = SUBINT_CONFIG_VALID | SUBINT_CONFIG_MATCH_0_TAG;
-  vlan_count = 0;
-
-  // check for vlan encaps
-  if (ethernet_frame_is_tagged (*type))
-    {
-      ethernet_vlan_header_t *h0;
-      u16 tag;
-
-      *match_flags = SUBINT_CONFIG_VALID | SUBINT_CONFIG_MATCH_1_TAG;
-
-      h0 = (void *) (b0->data + b0->current_data);
-
-      tag = clib_net_to_host_u16 (h0->priority_cfi_and_id);
-
-      *outer_id = tag & 0xfff;
-
-      *type = clib_net_to_host_u16 (h0->type);
-
-      vlib_buffer_advance (b0, sizeof (h0[0]));
-      vlan_count = 1;
-
-      if (*type == ETHERNET_TYPE_VLAN)
-	{
-	  // Double tagged packet
-	  *match_flags = SUBINT_CONFIG_VALID | SUBINT_CONFIG_MATCH_2_TAG;
-
-	  h0 = (void *) (b0->data + b0->current_data);
-
-	  tag = clib_net_to_host_u16 (h0->priority_cfi_and_id);
-
-	  *inner_id = tag & 0xfff;
-
-	  *type = clib_net_to_host_u16 (h0->type);
-
-	  vlib_buffer_advance (b0, sizeof (h0[0]));
-	  vlan_count = 2;
-
-	  if (*type == ETHERNET_TYPE_VLAN)
-	    {
-	      // More than double tagged packet
-	      *match_flags = SUBINT_CONFIG_VALID | SUBINT_CONFIG_MATCH_3_TAG;
-	      vlan_count = 3;	// "unknown" number, aka, 3-or-more
-	    }
-	}
-    }
-  ethernet_buffer_set_vlan_count (b0, vlan_count);
-}
-
-// Determine the subinterface for this packet, given the result of the
-// vlan table lookups and vlan header parsing. Check the most specific
-// matches first.
-static_always_inline void
-identify_subint (vnet_hw_interface_t * hi,
-		 vlib_buffer_t * b0,
-		 u32 match_flags,
-		 main_intf_t * main_intf,
-		 vlan_intf_t * vlan_intf,
-		 qinq_intf_t * qinq_intf,
-		 u32 * new_sw_if_index, u8 * error0, u32 * is_l2)
-{
-  u32 matched;
-
-  matched = eth_identify_subint (hi, b0, match_flags,
-				 main_intf, vlan_intf, qinq_intf,
-				 new_sw_if_index, error0, is_l2);
-
-  if (matched)
-    {
-
-      // Perform L3 my-mac filter
-      // A unicast packet arriving on an L3 interface must have a dmac matching the interface mac.
-      // This is required for promiscuous mode, else we will forward packets we aren't supposed to.
-      if (!(*is_l2))
-	{
-	  ethernet_header_t *e0;
-	  e0 =
-	    (void *) (b0->data +
-		      vnet_buffer (b0)->ethernet.start_of_ethernet_header);
-
-	  if (!(ethernet_address_cast (e0->dst_address)))
-	    {
-	      if (!eth_mac_equal ((u8 *) e0, hi->hw_address))
-		{
-		  *error0 = ETHERNET_ERROR_L3_MAC_MISMATCH;
-		}
-	    }
-	}
-
-      // Check for down subinterface
-      *error0 = (*new_sw_if_index) != ~0 ? (*error0) : ETHERNET_ERROR_DOWN;
-    }
-}
-
-static_always_inline void
-determine_next_node (ethernet_main_t * em,
-		     ethernet_input_variant_t variant,
-		     u32 is_l20,
-		     u32 type0, vlib_buffer_t * b0, u8 * error0, u8 * next0)
-{
-  if (PREDICT_FALSE (*error0 != ETHERNET_ERROR_NONE))
-    {
-      // some error occurred
-      *next0 = ETHERNET_INPUT_NEXT_DROP;
-    }
-  else if (is_l20)
-    {
-      *next0 = em->l2_next;
-      // record the L2 len and reset the buffer so the L2 header is preserved
-      u32 eth_start = vnet_buffer (b0)->ethernet.start_of_ethernet_header;
-      vnet_buffer (b0)->l2.l2_len = b0->current_data - eth_start;
-      vlib_buffer_advance (b0, -ethernet_buffer_header_size (b0));
-
-      // check for common IP/MPLS ethertypes
-    }
-  else if (type0 == ETHERNET_TYPE_IP4)
-    {
-      *next0 = em->l3_next.input_next_ip4;
-    }
-  else if (type0 == ETHERNET_TYPE_IP6)
-    {
-      *next0 = em->l3_next.input_next_ip6;
-    }
-  else if (type0 == ETHERNET_TYPE_MPLS_UNICAST)
-    {
-      *next0 = em->l3_next.input_next_mpls;
-
-    }
-  else if (em->redirect_l3)
-    {
-      // L3 Redirect is on, the cached common next nodes will be
-      // pointing to the redirect node, catch the uncommon types here
-      *next0 = em->redirect_l3_next;
-    }
-  else
-    {
-      // uncommon ethertype, check table
-      u32 i0;
-      i0 = sparse_vec_index (em->l3_next.input_next_by_type, type0);
-      *next0 = vec_elt (em->l3_next.input_next_by_type, i0);
-      *error0 =
-	i0 ==
-	SPARSE_VEC_INVALID_INDEX ? ETHERNET_ERROR_UNKNOWN_TYPE : *error0;
-
-      // The table is not populated with LLC values, so check that now.
-      // If variant is variant_ethernet then we came from LLC processing. Don't
-      // go back there; drop instead using by keeping the drop/bad table result.
-      if ((type0 < 0x600) && (variant == ETHERNET_INPUT_VARIANT_ETHERNET))
-	{
-	  *next0 = ETHERNET_INPUT_NEXT_LLC;
-	}
-    }
-}
-
-static_always_inline uword
-ethernet_input_inline (vlib_main_t * vm,
-		       vlib_node_runtime_t * node,
-		       vlib_frame_t * from_frame,
-		       ethernet_input_variant_t variant)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ethernet_main_t *em = &ethernet_main;
-  vlib_node_runtime_t *error_node;
-  u32 n_left_from, next_index, *from, *to_next;
-  u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
-  u32 cpu_index = os_get_cpu_number ();
-  u32 cached_sw_if_index = ~0;
-  u32 cached_is_l2 = 0;		/* shut up gcc */
-
-  if (variant != ETHERNET_INPUT_VARIANT_ETHERNET)
-    error_node = vlib_node_get_runtime (vm, ethernet_input_node.index);
-  else
-    error_node = node;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node,
-				   from,
-				   n_left_from,
-				   sizeof (from[0]),
-				   sizeof (ethernet_input_trace_t));
-
-  next_index = node->cached_next_index;
-  stats_sw_if_index = node->runtime_data[0];
-  stats_n_packets = stats_n_bytes = 0;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u8 next0, next1, error0, error1;
-	  u16 type0, orig_type0, type1, orig_type1;
-	  u16 outer_id0, inner_id0, outer_id1, inner_id1;
-	  u32 match_flags0, match_flags1;
-	  u32 old_sw_if_index0, new_sw_if_index0, len0, old_sw_if_index1,
-	    new_sw_if_index1, len1;
-	  vnet_hw_interface_t *hi0, *hi1;
-	  main_intf_t *main_intf0, *main_intf1;
-	  vlan_intf_t *vlan_intf0, *vlan_intf1;
-	  qinq_intf_t *qinq_intf0, *qinq_intf1;
-	  u32 is_l20, is_l21;
-	  ethernet_header_t *e0, *e1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *b2, *b3;
-
-	    b2 = vlib_get_buffer (vm, from[2]);
-	    b3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (b2, STORE);
-	    vlib_prefetch_buffer_header (b3, STORE);
-
-	    CLIB_PREFETCH (b2->data, sizeof (ethernet_header_t), LOAD);
-	    CLIB_PREFETCH (b3->data, sizeof (ethernet_header_t), LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  error0 = error1 = ETHERNET_ERROR_NONE;
-	  e0 = vlib_buffer_get_current (b0);
-	  type0 = clib_net_to_host_u16 (e0->type);
-	  e1 = vlib_buffer_get_current (b1);
-	  type1 = clib_net_to_host_u16 (e1->type);
-
-	  /* Speed-path for the untagged case */
-	  if (PREDICT_TRUE (variant == ETHERNET_INPUT_VARIANT_ETHERNET
-			    && !ethernet_frame_is_tagged (type0)
-			    && !ethernet_frame_is_tagged (type1)))
-	    {
-	      main_intf_t *intf0;
-	      subint_config_t *subint0;
-	      u32 sw_if_index0, sw_if_index1;
-
-	      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-	      is_l20 = cached_is_l2;
-
-	      /* This is probably wholly unnecessary */
-	      if (PREDICT_FALSE (sw_if_index0 != sw_if_index1))
-		goto slowpath;
-
-	      if (PREDICT_FALSE (cached_sw_if_index != sw_if_index0))
-		{
-		  cached_sw_if_index = sw_if_index0;
-		  hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
-		  intf0 = vec_elt_at_index (em->main_intfs, hi0->hw_if_index);
-		  subint0 = &intf0->untagged_subint;
-		  cached_is_l2 = is_l20 = subint0->flags & SUBINT_CONFIG_L2;
-		}
-
-	      vnet_buffer (b0)->ethernet.start_of_ethernet_header =
-		b0->current_data;
-	      vnet_buffer (b1)->ethernet.start_of_ethernet_header =
-		b1->current_data;
-
-	      if (PREDICT_TRUE (is_l20 != 0))
-		{
-		  next0 = em->l2_next;
-		  vnet_buffer (b0)->l2.l2_len = sizeof (ethernet_header_t);
-		  next1 = em->l2_next;
-		  vnet_buffer (b1)->l2.l2_len = sizeof (ethernet_header_t);
-		}
-	      else
-		{
-		  determine_next_node (em, variant, 0, type0, b0,
-				       &error0, &next0);
-		  vlib_buffer_advance (b0, sizeof (ethernet_header_t));
-		  determine_next_node (em, variant, 0, type1, b1,
-				       &error1, &next1);
-		  vlib_buffer_advance (b1, sizeof (ethernet_header_t));
-		}
-	      goto ship_it01;
-	    }
-
-	  /* Slow-path for the tagged case */
-	slowpath:
-	  parse_header (variant,
-			b0,
-			&type0,
-			&orig_type0, &outer_id0, &inner_id0, &match_flags0);
-
-	  parse_header (variant,
-			b1,
-			&type1,
-			&orig_type1, &outer_id1, &inner_id1, &match_flags1);
-
-	  old_sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  old_sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-
-	  eth_vlan_table_lookups (em,
-				  vnm,
-				  old_sw_if_index0,
-				  orig_type0,
-				  outer_id0,
-				  inner_id0,
-				  &hi0,
-				  &main_intf0, &vlan_intf0, &qinq_intf0);
-
-	  eth_vlan_table_lookups (em,
-				  vnm,
-				  old_sw_if_index1,
-				  orig_type1,
-				  outer_id1,
-				  inner_id1,
-				  &hi1,
-				  &main_intf1, &vlan_intf1, &qinq_intf1);
-
-	  identify_subint (hi0,
-			   b0,
-			   match_flags0,
-			   main_intf0,
-			   vlan_intf0,
-			   qinq_intf0, &new_sw_if_index0, &error0, &is_l20);
-
-	  identify_subint (hi1,
-			   b1,
-			   match_flags1,
-			   main_intf1,
-			   vlan_intf1,
-			   qinq_intf1, &new_sw_if_index1, &error1, &is_l21);
-
-	  // Save RX sw_if_index for later nodes
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
-	    error0 !=
-	    ETHERNET_ERROR_NONE ? old_sw_if_index0 : new_sw_if_index0;
-	  vnet_buffer (b1)->sw_if_index[VLIB_RX] =
-	    error1 !=
-	    ETHERNET_ERROR_NONE ? old_sw_if_index1 : new_sw_if_index1;
-
-	  // Check if there is a stat to take (valid and non-main sw_if_index for pkt 0 or pkt 1)
-	  if (((new_sw_if_index0 != ~0)
-	       && (new_sw_if_index0 != old_sw_if_index0))
-	      || ((new_sw_if_index1 != ~0)
-		  && (new_sw_if_index1 != old_sw_if_index1)))
-	    {
-
-	      len0 = vlib_buffer_length_in_chain (vm, b0) + b0->current_data
-		- vnet_buffer (b0)->ethernet.start_of_ethernet_header;
-	      len1 = vlib_buffer_length_in_chain (vm, b1) + b1->current_data
-		- vnet_buffer (b1)->ethernet.start_of_ethernet_header;
-
-	      stats_n_packets += 2;
-	      stats_n_bytes += len0 + len1;
-
-	      if (PREDICT_FALSE
-		  (!(new_sw_if_index0 == stats_sw_if_index
-		     && new_sw_if_index1 == stats_sw_if_index)))
-		{
-		  stats_n_packets -= 2;
-		  stats_n_bytes -= len0 + len1;
-
-		  if (new_sw_if_index0 != old_sw_if_index0
-		      && new_sw_if_index0 != ~0)
-		    vlib_increment_combined_counter (vnm->
-						     interface_main.combined_sw_if_counters
-						     +
-						     VNET_INTERFACE_COUNTER_RX,
-						     cpu_index,
-						     new_sw_if_index0, 1,
-						     len0);
-		  if (new_sw_if_index1 != old_sw_if_index1
-		      && new_sw_if_index1 != ~0)
-		    vlib_increment_combined_counter (vnm->
-						     interface_main.combined_sw_if_counters
-						     +
-						     VNET_INTERFACE_COUNTER_RX,
-						     cpu_index,
-						     new_sw_if_index1, 1,
-						     len1);
-
-		  if (new_sw_if_index0 == new_sw_if_index1)
-		    {
-		      if (stats_n_packets > 0)
-			{
-			  vlib_increment_combined_counter
-			    (vnm->interface_main.combined_sw_if_counters
-			     + VNET_INTERFACE_COUNTER_RX,
-			     cpu_index,
-			     stats_sw_if_index,
-			     stats_n_packets, stats_n_bytes);
-			  stats_n_packets = stats_n_bytes = 0;
-			}
-		      stats_sw_if_index = new_sw_if_index0;
-		    }
-		}
-	    }
-
-	  if (variant == ETHERNET_INPUT_VARIANT_NOT_L2)
-	    is_l20 = is_l21 = 0;
-
-	  determine_next_node (em, variant, is_l20, type0, b0, &error0,
-			       &next0);
-	  determine_next_node (em, variant, is_l21, type1, b1, &error1,
-			       &next1);
-
-	  b0->error = error_node->errors[error0];
-	  b1->error = error_node->errors[error1];
-
-	ship_it01:
-	  // verify speculative enqueue
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, bi1, next0,
-					   next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u8 error0, next0;
-	  u16 type0, orig_type0;
-	  u16 outer_id0, inner_id0;
-	  u32 match_flags0;
-	  u32 old_sw_if_index0, new_sw_if_index0, len0;
-	  vnet_hw_interface_t *hi0;
-	  main_intf_t *main_intf0;
-	  vlan_intf_t *vlan_intf0;
-	  qinq_intf_t *qinq_intf0;
-	  ethernet_header_t *e0;
-	  u32 is_l20;
-
-	  // Prefetch next iteration
-	  if (n_left_from > 1)
-	    {
-	      vlib_buffer_t *p2;
-
-	      p2 = vlib_get_buffer (vm, from[1]);
-	      vlib_prefetch_buffer_header (p2, STORE);
-	      CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, LOAD);
-	    }
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  error0 = ETHERNET_ERROR_NONE;
-	  e0 = vlib_buffer_get_current (b0);
-	  type0 = clib_net_to_host_u16 (e0->type);
-
-	  /* Speed-path for the untagged case */
-	  if (PREDICT_TRUE (variant == ETHERNET_INPUT_VARIANT_ETHERNET
-			    && !ethernet_frame_is_tagged (type0)))
-	    {
-	      main_intf_t *intf0;
-	      subint_config_t *subint0;
-	      u32 sw_if_index0;
-
-	      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	      is_l20 = cached_is_l2;
-
-	      if (PREDICT_FALSE (cached_sw_if_index != sw_if_index0))
-		{
-		  cached_sw_if_index = sw_if_index0;
-		  hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
-		  intf0 = vec_elt_at_index (em->main_intfs, hi0->hw_if_index);
-		  subint0 = &intf0->untagged_subint;
-		  cached_is_l2 = is_l20 = subint0->flags & SUBINT_CONFIG_L2;
-		}
-
-	      vnet_buffer (b0)->ethernet.start_of_ethernet_header =
-		b0->current_data;
-
-	      if (PREDICT_TRUE (is_l20 != 0))
-		{
-		  next0 = em->l2_next;
-		  vnet_buffer (b0)->l2.l2_len = sizeof (ethernet_header_t);
-		}
-	      else
-		{
-		  determine_next_node (em, variant, 0, type0, b0,
-				       &error0, &next0);
-		  vlib_buffer_advance (b0, sizeof (ethernet_header_t));
-		}
-	      goto ship_it0;
-	    }
-
-	  /* Slow-path for the tagged case */
-	  parse_header (variant,
-			b0,
-			&type0,
-			&orig_type0, &outer_id0, &inner_id0, &match_flags0);
-
-	  old_sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-
-	  eth_vlan_table_lookups (em,
-				  vnm,
-				  old_sw_if_index0,
-				  orig_type0,
-				  outer_id0,
-				  inner_id0,
-				  &hi0,
-				  &main_intf0, &vlan_intf0, &qinq_intf0);
-
-	  identify_subint (hi0,
-			   b0,
-			   match_flags0,
-			   main_intf0,
-			   vlan_intf0,
-			   qinq_intf0, &new_sw_if_index0, &error0, &is_l20);
-
-	  // Save RX sw_if_index for later nodes
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
-	    error0 !=
-	    ETHERNET_ERROR_NONE ? old_sw_if_index0 : new_sw_if_index0;
-
-	  // Increment subinterface stats
-	  // Note that interface-level counters have already been incremented
-	  // prior to calling this function. Thus only subinterface counters
-	  // are incremented here.
-	  //
-	  // Interface level counters include packets received on the main
-	  // interface and all subinterfaces. Subinterface level counters
-	  // include only those packets received on that subinterface
-	  // Increment stats if the subint is valid and it is not the main intf
-	  if ((new_sw_if_index0 != ~0)
-	      && (new_sw_if_index0 != old_sw_if_index0))
-	    {
-
-	      len0 = vlib_buffer_length_in_chain (vm, b0) + b0->current_data
-		- vnet_buffer (b0)->ethernet.start_of_ethernet_header;
-
-	      stats_n_packets += 1;
-	      stats_n_bytes += len0;
-
-	      // Batch stat increments from the same subinterface so counters
-	      // don't need to be incremented for every packet.
-	      if (PREDICT_FALSE (new_sw_if_index0 != stats_sw_if_index))
-		{
-		  stats_n_packets -= 1;
-		  stats_n_bytes -= len0;
-
-		  if (new_sw_if_index0 != ~0)
-		    vlib_increment_combined_counter
-		      (vnm->interface_main.combined_sw_if_counters
-		       + VNET_INTERFACE_COUNTER_RX,
-		       cpu_index, new_sw_if_index0, 1, len0);
-		  if (stats_n_packets > 0)
-		    {
-		      vlib_increment_combined_counter
-			(vnm->interface_main.combined_sw_if_counters
-			 + VNET_INTERFACE_COUNTER_RX,
-			 cpu_index,
-			 stats_sw_if_index, stats_n_packets, stats_n_bytes);
-		      stats_n_packets = stats_n_bytes = 0;
-		    }
-		  stats_sw_if_index = new_sw_if_index0;
-		}
-	    }
-
-	  if (variant == ETHERNET_INPUT_VARIANT_NOT_L2)
-	    is_l20 = 0;
-
-	  determine_next_node (em, variant, is_l20, type0, b0, &error0,
-			       &next0);
-
-	  b0->error = error_node->errors[error0];
-
-	  // verify speculative enqueue
-	ship_it0:
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  // Increment any remaining batched stats
-  if (stats_n_packets > 0)
-    {
-      vlib_increment_combined_counter
-	(vnm->interface_main.combined_sw_if_counters
-	 + VNET_INTERFACE_COUNTER_RX,
-	 cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
-      node->runtime_data[0] = stats_sw_if_index;
-    }
-
-  return from_frame->n_vectors;
-}
-
-static uword
-ethernet_input (vlib_main_t * vm,
-		vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  return ethernet_input_inline (vm, node, from_frame,
-				ETHERNET_INPUT_VARIANT_ETHERNET);
-}
-
-static uword
-ethernet_input_type (vlib_main_t * vm,
-		     vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  return ethernet_input_inline (vm, node, from_frame,
-				ETHERNET_INPUT_VARIANT_ETHERNET_TYPE);
-}
-
-static uword
-ethernet_input_not_l2 (vlib_main_t * vm,
-		       vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  return ethernet_input_inline (vm, node, from_frame,
-				ETHERNET_INPUT_VARIANT_NOT_L2);
-}
-
-
-// Return the subinterface config struct for the given sw_if_index
-// Also return via parameter the appropriate match flags for the
-// configured number of tags.
-// On error (unsupported or not ethernet) return 0.
-static subint_config_t *
-ethernet_sw_interface_get_config (vnet_main_t * vnm,
-				  u32 sw_if_index,
-				  u32 * flags, u32 * unsupported)
-{
-  ethernet_main_t *em = &ethernet_main;
-  vnet_hw_interface_t *hi;
-  vnet_sw_interface_t *si;
-  main_intf_t *main_intf;
-  vlan_table_t *vlan_table;
-  qinq_table_t *qinq_table;
-  subint_config_t *subint = 0;
-
-  hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
-
-  if (!hi || (hi->hw_class_index != ethernet_hw_interface_class.index))
-    {
-      *unsupported = 0;
-      goto done;		// non-ethernet interface
-    }
-
-  // ensure there's an entry for the main intf (shouldn't really be necessary)
-  vec_validate (em->main_intfs, hi->hw_if_index);
-  main_intf = vec_elt_at_index (em->main_intfs, hi->hw_if_index);
-
-  // Locate the subint for the given ethernet config
-  si = vnet_get_sw_interface (vnm, sw_if_index);
-
-  if (si->sub.eth.flags.default_sub)
-    {
-      subint = &main_intf->default_subint;
-      *flags = SUBINT_CONFIG_MATCH_0_TAG |
-	SUBINT_CONFIG_MATCH_1_TAG |
-	SUBINT_CONFIG_MATCH_2_TAG | SUBINT_CONFIG_MATCH_3_TAG;
-    }
-  else if ((si->sub.eth.flags.no_tags) || (si->sub.eth.raw_flags == 0))
-    {
-      // if no flags are set then this is a main interface
-      // so treat as untagged
-      subint = &main_intf->untagged_subint;
-      *flags = SUBINT_CONFIG_MATCH_0_TAG;
-    }
-  else
-    {
-      // one or two tags
-      // first get the vlan table
-      if (si->sub.eth.flags.dot1ad)
-	{
-	  if (main_intf->dot1ad_vlans == 0)
-	    {
-	      // Allocate a vlan table from the pool
-	      pool_get (em->vlan_pool, vlan_table);
-	      main_intf->dot1ad_vlans = vlan_table - em->vlan_pool;
-	    }
-	  else
-	    {
-	      // Get ptr to existing vlan table
-	      vlan_table =
-		vec_elt_at_index (em->vlan_pool, main_intf->dot1ad_vlans);
-	    }
-	}
-      else
-	{			// dot1q
-	  if (main_intf->dot1q_vlans == 0)
-	    {
-	      // Allocate a vlan table from the pool
-	      pool_get (em->vlan_pool, vlan_table);
-	      main_intf->dot1q_vlans = vlan_table - em->vlan_pool;
-	    }
-	  else
-	    {
-	      // Get ptr to existing vlan table
-	      vlan_table =
-		vec_elt_at_index (em->vlan_pool, main_intf->dot1q_vlans);
-	    }
-	}
-
-      if (si->sub.eth.flags.one_tag)
-	{
-	  *flags = si->sub.eth.flags.exact_match ?
-	    SUBINT_CONFIG_MATCH_1_TAG :
-	    (SUBINT_CONFIG_MATCH_1_TAG |
-	     SUBINT_CONFIG_MATCH_2_TAG | SUBINT_CONFIG_MATCH_3_TAG);
-
-	  if (si->sub.eth.flags.outer_vlan_id_any)
-	    {
-	      // not implemented yet
-	      *unsupported = 1;
-	      goto done;
-	    }
-	  else
-	    {
-	      // a single vlan, a common case
-	      subint =
-		&vlan_table->vlans[si->sub.eth.
-				   outer_vlan_id].single_tag_subint;
-	    }
-
-	}
-      else
-	{
-	  // Two tags
-	  *flags = si->sub.eth.flags.exact_match ?
-	    SUBINT_CONFIG_MATCH_2_TAG :
-	    (SUBINT_CONFIG_MATCH_2_TAG | SUBINT_CONFIG_MATCH_3_TAG);
-
-	  if (si->sub.eth.flags.outer_vlan_id_any
-	      && si->sub.eth.flags.inner_vlan_id_any)
-	    {
-	      // not implemented yet
-	      *unsupported = 1;
-	      goto done;
-	    }
-
-	  if (si->sub.eth.flags.inner_vlan_id_any)
-	    {
-	      // a specific outer and "any" inner
-	      // don't need a qinq table for this
-	      subint =
-		&vlan_table->vlans[si->sub.eth.
-				   outer_vlan_id].inner_any_subint;
-	      if (si->sub.eth.flags.exact_match)
-		{
-		  *flags = SUBINT_CONFIG_MATCH_2_TAG;
-		}
-	      else
-		{
-		  *flags = SUBINT_CONFIG_MATCH_2_TAG |
-		    SUBINT_CONFIG_MATCH_3_TAG;
-		}
-	    }
-	  else
-	    {
-	      // a specific outer + specifc innner vlan id, a common case
-
-	      // get the qinq table
-	      if (vlan_table->vlans[si->sub.eth.outer_vlan_id].qinqs == 0)
-		{
-		  // Allocate a qinq table from the pool
-		  pool_get (em->qinq_pool, qinq_table);
-		  vlan_table->vlans[si->sub.eth.outer_vlan_id].qinqs =
-		    qinq_table - em->qinq_pool;
-		}
-	      else
-		{
-		  // Get ptr to existing qinq table
-		  qinq_table =
-		    vec_elt_at_index (em->qinq_pool,
-				      vlan_table->vlans[si->sub.
-							eth.outer_vlan_id].
-				      qinqs);
-		}
-	      subint = &qinq_table->vlans[si->sub.eth.inner_vlan_id].subint;
-	    }
-	}
-    }
-
-done:
-  return subint;
-}
-
-clib_error_t *
-ethernet_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
-{
-  subint_config_t *subint;
-  u32 dummy_flags;
-  u32 dummy_unsup;
-  clib_error_t *error = 0;
-
-  // Find the config for this subinterface
-  subint =
-    ethernet_sw_interface_get_config (vnm, sw_if_index, &dummy_flags,
-				      &dummy_unsup);
-
-  if (subint == 0)
-    {
-      // not implemented yet or not ethernet
-      goto done;
-    }
-
-  subint->sw_if_index =
-    ((flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? sw_if_index : ~0);
-
-done:
-  return error;
-}
-
-VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (ethernet_sw_interface_up_down);
-
-
-// Set the L2/L3 mode for the subinterface
-void
-ethernet_sw_interface_set_l2_mode (vnet_main_t * vnm, u32 sw_if_index, u32 l2)
-{
-  subint_config_t *subint;
-  u32 dummy_flags;
-  u32 dummy_unsup;
-  int is_port;
-  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, sw_if_index);
-
-  is_port = !(sw->type == VNET_SW_INTERFACE_TYPE_SUB);
-
-  // Find the config for this subinterface
-  subint =
-    ethernet_sw_interface_get_config (vnm, sw_if_index, &dummy_flags,
-				      &dummy_unsup);
-
-  if (subint == 0)
-    {
-      // unimplemented or not ethernet
-      goto done;
-    }
-
-  // Double check that the config we found is for our interface (or the interface is down)
-  ASSERT ((subint->sw_if_index == sw_if_index) | (subint->sw_if_index == ~0));
-
-  if (l2)
-    {
-      subint->flags |= SUBINT_CONFIG_L2;
-      if (is_port)
-	subint->flags |=
-	  SUBINT_CONFIG_MATCH_0_TAG | SUBINT_CONFIG_MATCH_1_TAG
-	  | SUBINT_CONFIG_MATCH_2_TAG | SUBINT_CONFIG_MATCH_3_TAG;
-    }
-  else
-    {
-      subint->flags &= ~SUBINT_CONFIG_L2;
-      if (is_port)
-	subint->flags &=
-	  ~(SUBINT_CONFIG_MATCH_1_TAG | SUBINT_CONFIG_MATCH_2_TAG
-	    | SUBINT_CONFIG_MATCH_3_TAG);
-    }
-
-done:
-  return;
-}
-
-/*
- * Set the L2/L3 mode for the subinterface regardless of port
- */
-void
-ethernet_sw_interface_set_l2_mode_noport (vnet_main_t * vnm,
-					  u32 sw_if_index, u32 l2)
-{
-  subint_config_t *subint;
-  u32 dummy_flags;
-  u32 dummy_unsup;
-
-  /* Find the config for this subinterface */
-  subint =
-    ethernet_sw_interface_get_config (vnm, sw_if_index, &dummy_flags,
-				      &dummy_unsup);
-
-  if (subint == 0)
-    {
-      /* unimplemented or not ethernet */
-      goto done;
-    }
-
-  /*
-   * Double check that the config we found is for our interface (or the
-   * interface is down)
-   */
-  ASSERT ((subint->sw_if_index == sw_if_index) | (subint->sw_if_index == ~0));
-
-  if (l2)
-    {
-      subint->flags |= SUBINT_CONFIG_L2;
-    }
-  else
-    {
-      subint->flags &= ~SUBINT_CONFIG_L2;
-    }
-
-done:
-  return;
-}
-
-static clib_error_t *
-ethernet_sw_interface_add_del (vnet_main_t * vnm,
-			       u32 sw_if_index, u32 is_create)
-{
-  clib_error_t *error = 0;
-  subint_config_t *subint;
-  u32 match_flags;
-  u32 unsupported = 0;
-
-  // Find the config for this subinterface
-  subint =
-    ethernet_sw_interface_get_config (vnm, sw_if_index, &match_flags,
-				      &unsupported);
-
-  if (subint == 0)
-    {
-      // not implemented yet or not ethernet
-      if (unsupported)
-	{
-	  // this is the NYI case
-	  error = clib_error_return (0, "not implemented yet");
-	}
-      goto done;
-    }
-
-  if (!is_create)
-    {
-      subint->flags = 0;
-      return error;
-    }
-
-  // Initialize the subint
-  if (subint->flags & SUBINT_CONFIG_VALID)
-    {
-      // Error vlan already in use
-      error = clib_error_return (0, "vlan is already in use");
-    }
-  else
-    {
-      // Note that config is L3 by defaulty
-      subint->flags = SUBINT_CONFIG_VALID | match_flags;
-      subint->sw_if_index = ~0;	// because interfaces are initially down
-    }
-
-done:
-  return error;
-}
-
-VNET_SW_INTERFACE_ADD_DEL_FUNCTION (ethernet_sw_interface_add_del);
-
-static char *ethernet_error_strings[] = {
-#define ethernet_error(n,c,s) s,
-#include "error.def"
-#undef ethernet_error
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ethernet_input_node) = {
-  .function = ethernet_input,
-  .name = "ethernet-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-  .n_errors = ETHERNET_N_ERROR,
-  .error_strings = ethernet_error_strings,
-  .n_next_nodes = ETHERNET_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [ETHERNET_INPUT_NEXT_##s] = n,
-    foreach_ethernet_input_next
-#undef _
-  },
-  .format_buffer = format_ethernet_header_with_length,
-  .format_trace = format_ethernet_input_trace,
-  .unformat_buffer = unformat_ethernet_header,
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_NODE_FUNCTION_MULTIARCH (ethernet_input_node, ethernet_input)
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ethernet_input_type_node, static) = {
-  .function = ethernet_input_type,
-  .name = "ethernet-input-type",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-  .n_next_nodes = ETHERNET_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [ETHERNET_INPUT_NEXT_##s] = n,
-    foreach_ethernet_input_next
-#undef _
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_NODE_FUNCTION_MULTIARCH (ethernet_input_type_node, ethernet_input_type)
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ethernet_input_not_l2_node, static) = {
-  .function = ethernet_input_not_l2,
-  .name = "ethernet-input-not-l2",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-  .n_next_nodes = ETHERNET_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [ETHERNET_INPUT_NEXT_##s] = n,
-    foreach_ethernet_input_next
-#undef _
-  },
-};
-/* *INDENT-ON* */
-
-
-/* *INDENT-OFF* */
-VLIB_NODE_FUNCTION_MULTIARCH (ethernet_input_not_l2_node,
-			      ethernet_input_not_l2)
-/* *INDENT-ON* */
-
-
-void
-ethernet_set_rx_redirect (vnet_main_t * vnm,
-			  vnet_hw_interface_t * hi, u32 enable)
-{
-  // Insure all packets go to ethernet-input (i.e. untagged ipv4 packets
-  // don't go directly to ip4-input)
-  vnet_hw_interface_rx_redirect_to_node
-    (vnm, hi->hw_if_index, enable ? ethernet_input_node.index : ~0);
-}
-
-
-/*
- * Initialization and registration for the next_by_ethernet structure
- */
-
-clib_error_t *
-next_by_ethertype_init (next_by_ethertype_t * l3_next)
-{
-  l3_next->input_next_by_type = sparse_vec_new
-    ( /* elt bytes */ sizeof (l3_next->input_next_by_type[0]),
-     /* bits in index */ BITS (((ethernet_header_t *) 0)->type));
-
-  vec_validate (l3_next->sparse_index_by_input_next_index,
-		ETHERNET_INPUT_NEXT_DROP);
-  vec_validate (l3_next->sparse_index_by_input_next_index,
-		ETHERNET_INPUT_NEXT_PUNT);
-  l3_next->sparse_index_by_input_next_index[ETHERNET_INPUT_NEXT_DROP] =
-    SPARSE_VEC_INVALID_INDEX;
-  l3_next->sparse_index_by_input_next_index[ETHERNET_INPUT_NEXT_PUNT] =
-    SPARSE_VEC_INVALID_INDEX;
-
-  /*
-   * Make sure we don't wipe out an ethernet registration by mistake
-   * Can happen if init function ordering constraints are missing.
-   */
-  if (CLIB_DEBUG > 0)
-    {
-      ethernet_main_t *em = &ethernet_main;
-      ASSERT (em->next_by_ethertype_register_called == 0);
-    }
-
-  return 0;
-}
-
-// Add an ethertype -> next index mapping to the structure
-clib_error_t *
-next_by_ethertype_register (next_by_ethertype_t * l3_next,
-			    u32 ethertype, u32 next_index)
-{
-  u32 i;
-  u16 *n;
-  ethernet_main_t *em = &ethernet_main;
-
-  if (CLIB_DEBUG > 0)
-    {
-      ethernet_main_t *em = &ethernet_main;
-      em->next_by_ethertype_register_called = 1;
-    }
-
-  /* Setup ethernet type -> next index sparse vector mapping. */
-  n = sparse_vec_validate (l3_next->input_next_by_type, ethertype);
-  n[0] = next_index;
-
-  /* Rebuild next index -> sparse index inverse mapping when sparse vector
-     is updated. */
-  vec_validate (l3_next->sparse_index_by_input_next_index, next_index);
-  for (i = 1; i < vec_len (l3_next->input_next_by_type); i++)
-    l3_next->
-      sparse_index_by_input_next_index[l3_next->input_next_by_type[i]] = i;
-
-  // do not allow the cached next index's to be updated if L3
-  // redirect is enabled, as it will have overwritten them
-  if (!em->redirect_l3)
-    {
-      // Cache common ethertypes directly
-      if (ethertype == ETHERNET_TYPE_IP4)
-	{
-	  l3_next->input_next_ip4 = next_index;
-	}
-      else if (ethertype == ETHERNET_TYPE_IP6)
-	{
-	  l3_next->input_next_ip6 = next_index;
-	}
-      else if (ethertype == ETHERNET_TYPE_MPLS_UNICAST)
-	{
-	  l3_next->input_next_mpls = next_index;
-	}
-    }
-  return 0;
-}
-
-
-static clib_error_t *
-ethernet_input_init (vlib_main_t * vm)
-{
-  ethernet_main_t *em = &ethernet_main;
-  __attribute__ ((unused)) vlan_table_t *invalid_vlan_table;
-  __attribute__ ((unused)) qinq_table_t *invalid_qinq_table;
-
-  ethernet_setup_node (vm, ethernet_input_node.index);
-  ethernet_setup_node (vm, ethernet_input_type_node.index);
-  ethernet_setup_node (vm, ethernet_input_not_l2_node.index);
-
-  next_by_ethertype_init (&em->l3_next);
-
-  // Initialize pools and vector for vlan parsing
-  vec_validate (em->main_intfs, 10);	// 10 main interfaces
-  pool_alloc (em->vlan_pool, 10);
-  pool_alloc (em->qinq_pool, 1);
-
-  // The first vlan pool will always be reserved for an invalid table
-  pool_get (em->vlan_pool, invalid_vlan_table);	// first id = 0
-  // The first qinq pool will always be reserved for an invalid table
-  pool_get (em->qinq_pool, invalid_qinq_table);	// first id = 0
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ethernet_input_init);
-
-void
-ethernet_register_input_type (vlib_main_t * vm,
-			      ethernet_type_t type, u32 node_index)
-{
-  ethernet_main_t *em = &ethernet_main;
-  ethernet_type_info_t *ti;
-  u32 i;
-
-  {
-    clib_error_t *error = vlib_call_init_function (vm, ethernet_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  ti = ethernet_get_type_info (em, type);
-  ti->node_index = node_index;
-  ti->next_index = vlib_node_add_next (vm,
-				       ethernet_input_node.index, node_index);
-  i = vlib_node_add_next (vm, ethernet_input_type_node.index, node_index);
-  ASSERT (i == ti->next_index);
-
-  i = vlib_node_add_next (vm, ethernet_input_not_l2_node.index, node_index);
-  ASSERT (i == ti->next_index);
-
-  // Add the L3 node for this ethertype to the next nodes structure
-  next_by_ethertype_register (&em->l3_next, type, ti->next_index);
-
-  // Call the registration functions for other nodes that want a mapping
-  l2bvi_register_input_type (vm, type, node_index);
-}
-
-void
-ethernet_register_l2_input (vlib_main_t * vm, u32 node_index)
-{
-  ethernet_main_t *em = &ethernet_main;
-  u32 i;
-
-  em->l2_next =
-    vlib_node_add_next (vm, ethernet_input_node.index, node_index);
-
-  /*
-   * Even if we never use these arcs, we have to align the next indices...
-   */
-  i = vlib_node_add_next (vm, ethernet_input_type_node.index, node_index);
-
-  ASSERT (i == em->l2_next);
-
-  i = vlib_node_add_next (vm, ethernet_input_not_l2_node.index, node_index);
-  ASSERT (i == em->l2_next);
-}
-
-// Register a next node for L3 redirect, and enable L3 redirect
-void
-ethernet_register_l3_redirect (vlib_main_t * vm, u32 node_index)
-{
-  ethernet_main_t *em = &ethernet_main;
-  u32 i;
-
-  em->redirect_l3 = 1;
-  em->redirect_l3_next = vlib_node_add_next (vm,
-					     ethernet_input_node.index,
-					     node_index);
-  /*
-   * Change the cached next nodes to the redirect node
-   */
-  em->l3_next.input_next_ip4 = em->redirect_l3_next;
-  em->l3_next.input_next_ip6 = em->redirect_l3_next;
-  em->l3_next.input_next_mpls = em->redirect_l3_next;
-
-  /*
-   * Even if we never use these arcs, we have to align the next indices...
-   */
-  i = vlib_node_add_next (vm, ethernet_input_type_node.index, node_index);
-
-  ASSERT (i == em->redirect_l3_next);
-
-  i = vlib_node_add_next (vm, ethernet_input_not_l2_node.index, node_index);
-
-  ASSERT (i == em->redirect_l3_next);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ethernet/packet.h b/vnet/vnet/ethernet/packet.h
deleted file mode 100644
index 964cf638..00000000
--- a/vnet/vnet/ethernet/packet.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ethernet/packet.h: ethernet packet format.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_ethernet_packet_h
-#define included_ethernet_packet_h
-
-typedef enum
-{
-#define ethernet_type(n,s) ETHERNET_TYPE_##s = n,
-#include <vnet/ethernet/types.def>
-#undef ethernet_type
-} ethernet_type_t;
-
-typedef struct
-{
-  /* Source/destination address. */
-  u8 dst_address[6];
-  u8 src_address[6];
-
-  /* Ethernet type. */
-  u16 type;
-} ethernet_header_t;
-
-#define ETHERNET_ADDRESS_UNICAST 0
-#define ETHERNET_ADDRESS_MULTICAST 1
-
-/* I/G bit: individual (unicast)/group (broadcast/multicast). */
-always_inline uword
-ethernet_address_cast (u8 * a)
-{
-  return (a[0] >> 0) & 1;
-}
-
-always_inline uword
-ethernet_address_is_locally_administered (u8 * a)
-{
-  return (a[0] >> 1) & 1;
-}
-
-always_inline void
-ethernet_address_set_locally_administered (u8 * a)
-{
-  a[0] |= 1 << 1;
-}
-
-/* For VLAN ethernet type. */
-typedef struct
-{
-  /* 3 bit priority, 1 bit CFI and 12 bit vlan id. */
-  u16 priority_cfi_and_id;
-
-#define ETHERNET_N_VLAN (1 << 12)
-
-  /* Inner ethernet type. */
-  u16 type;
-} ethernet_vlan_header_t;
-
-
-/* VLAN with ethertype first and vlan id second */
-typedef struct
-{
-  /* vlan type */
-  u16 type;
-
-  /* 3 bit priority, 1 bit CFI and 12 bit vlan id. */
-  u16 priority_cfi_and_id;
-} ethernet_vlan_header_tv_t;
-
-/* PBB header with B-TAG - backbone VLAN indicator and I-TAG - service encapsulation */
-typedef struct
-{
-  /* Backbone source/destination address. */
-  u8 b_dst_address[6];
-  u8 b_src_address[6];
-
-  /* B-tag */
-  u16 b_type;
-  /* 3 bit priority, 1 bit DEI and 12 bit vlan id */
-  u16 priority_dei_id;
-
-  /* I-tag */
-  u16 i_type;
-  /* 3 bit priority, 1 bit DEI, 1 bit UCA, 3 bit RES and 24 bit I_SID (service identifier) */
-  u32 priority_dei_uca_res_sid;
-
-#define ETHERNET_N_PBB (1 << 24)
-} ethernet_pbb_header_t;
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-{
-  /* Backbone source/destination address. */
-  u8 b_dst_address[6];
-  u8 b_src_address[6];
-
-  /* B-tag */
-  u16 b_type;
-  /* 3 bit priority, 1 bit DEI and 12 bit vlan id */
-  u16 priority_dei_id;
-
-  /* I-tag */
-  u16 i_type;
-  /* 3 bit priority, 1 bit DEI, 1 bit UCA, 3 bit RES and 24 bit I_SID (service identifier) */
-  u32 priority_dei_uca_res_sid;
-}) ethernet_pbb_header_packed_t;
-/* *INDENT-ON* */
-
-#endif /* included_ethernet_packet_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ethernet/pg.c b/vnet/vnet/ethernet/pg.c
deleted file mode 100644
index 67ccfcf5..00000000
--- a/vnet/vnet/ethernet/pg.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ethernet_pg.c: packet generator ethernet interface
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-
-typedef struct
-{
-  pg_edit_t type;
-  pg_edit_t src_address;
-  pg_edit_t dst_address;
-} pg_ethernet_header_t;
-
-static inline void
-pg_ethernet_header_init (pg_ethernet_header_t * e)
-{
-  pg_edit_init (&e->type, ethernet_header_t, type);
-  pg_edit_init (&e->src_address, ethernet_header_t, src_address);
-  pg_edit_init (&e->dst_address, ethernet_header_t, dst_address);
-}
-
-typedef struct
-{
-  pg_edit_t type;
-  pg_edit_t id;
-  pg_edit_t cfi;
-  pg_edit_t priority;
-} pg_ethernet_vlan_header_t;
-
-static inline void
-pg_ethernet_vlan_header_init (pg_ethernet_vlan_header_t * v, int vlan_index)
-{
-  ASSERT (vlan_index < ARRAY_LEN (((ethernet_max_header_t *) 0)->vlan));
-  pg_edit_init (&v->type, ethernet_max_header_t, vlan[vlan_index].type);
-
-  pg_edit_init_bitfield (&v->id, ethernet_max_header_t,
-			 vlan[vlan_index].priority_cfi_and_id, 0, 12);
-  pg_edit_init_bitfield (&v->cfi, ethernet_max_header_t,
-			 vlan[vlan_index].priority_cfi_and_id, 12, 1);
-  pg_edit_init_bitfield (&v->priority, ethernet_max_header_t,
-			 vlan[vlan_index].priority_cfi_and_id, 13, 3);
-}
-
-uword
-unformat_pg_ethernet_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t *s = va_arg (*args, pg_stream_t *);
-  pg_ethernet_header_t *e;
-  pg_ethernet_vlan_header_t *v;
-  pg_edit_t *ether_type_edit;
-  u32 n_vlan, error, group_index;
-
-  e = pg_create_edit_group (s, sizeof (e[0]), sizeof (ethernet_header_t),
-			    &group_index);
-  pg_ethernet_header_init (e);
-  error = 1;
-
-  if (!unformat (input, "%U: %U -> %U",
-		 unformat_pg_edit,
-		 unformat_ethernet_type_net_byte_order, &e->type,
-		 unformat_pg_edit,
-		 unformat_ethernet_address, &e->src_address,
-		 unformat_pg_edit,
-		 unformat_ethernet_address, &e->dst_address))
-    goto done;
-
-  n_vlan = 0;
-  while (unformat (input, "vlan"))
-    {
-      v = pg_add_edits (s, sizeof (v[0]), sizeof (ethernet_vlan_header_t),
-			group_index);
-      pg_ethernet_vlan_header_init (v, n_vlan);
-
-      if (!unformat_user (input, unformat_pg_edit,
-			  unformat_pg_number, &v->id))
-	goto done;
-
-      if (!unformat (input, "priority %U", unformat_pg_edit,
-		     unformat_pg_number, &v->priority))
-	pg_edit_set_fixed (&v->priority, 0);
-
-      if (!unformat (input, "cfi %U", unformat_pg_edit,
-		     unformat_pg_number, &v->cfi))
-	pg_edit_set_fixed (&v->cfi, 0);
-
-      /* Too many vlans given. */
-      if (n_vlan >= 2)
-	goto done;
-
-      n_vlan++;
-    }
-
-  /* Address of e may have changed due to vlan edits being added */
-  e = pg_get_edit_group (s, group_index);
-  v = (void *) (e + 1);
-
-  /* Correct types for vlan packets. */
-  ether_type_edit = &e->type;
-  if (n_vlan > 0)
-    {
-      int i;
-
-      ether_type_edit = &v[n_vlan - 1].type;
-      pg_edit_copy_type_and_values (ether_type_edit, &e->type);
-      pg_edit_set_fixed (&e->type, ETHERNET_TYPE_VLAN);
-
-      for (i = 0; i < n_vlan - 1; i++)
-	pg_edit_set_fixed (&v[i].type, ETHERNET_TYPE_VLAN);
-    }
-
-  {
-    ethernet_main_t *em = &ethernet_main;
-    ethernet_type_info_t *ti = 0;
-    pg_node_t *pg_node = 0;
-
-    if (ether_type_edit->type == PG_EDIT_FIXED)
-      {
-	u16 t = *(u16 *) ether_type_edit->values[PG_EDIT_LO];
-	ti = ethernet_get_type_info (em, clib_net_to_host_u16 (t));
-	if (ti && ti->node_index != ~0)
-	  pg_node = pg_get_node (ti->node_index);
-      }
-
-    if (pg_node && pg_node->unformat_edit
-	&& unformat_user (input, pg_node->unformat_edit, s))
-      ;
-    else if (!unformat_user (input, unformat_pg_payload, s))
-      goto done;
-  }
-
-  error = 0;
-
-done:
-  if (error)
-    pg_free_edit_group (s);
-  return error == 0;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ethernet/types.def b/vnet/vnet/ethernet/types.def
deleted file mode 100644
index 643f3152..00000000
--- a/vnet/vnet/ethernet/types.def
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Emacs editing mode -*-C-*- Ethernet types. */
-
-/*
- * ethernet types
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* Types < 0x600 (1536) are LLC packet lengths. */
-ethernet_type (0x600, LLC_LENGTH)
-
-ethernet_type (0x600, XNS_IDP)
-ethernet_type (0x800, IP4)
-ethernet_type (0x806, ARP)
-ethernet_type (0x0BAD, VINES_IP)
-ethernet_type (0x0BAE, VINES_LOOPBACK)
-ethernet_type (0x0BAF, VINES_ECHO)
-ethernet_type (0x1984, TRAIN)
-ethernet_type (0x2000, CDP)
-ethernet_type (0x2001, CGMP)
-ethernet_type (0x2007, SRP_CONTROL)
-ethernet_type (0x2452, CENTRINO_PROMISC)
-ethernet_type (0x6000, DECNET)
-ethernet_type (0x6001, DECNET_DUMP_LOAD)
-ethernet_type (0x6002, DECNET_REMOTE_CONSOLE)
-ethernet_type (0x6003, DECNET_ROUTE)
-ethernet_type (0x6004, DEC_LAT)
-ethernet_type (0x6005, DEC_DIAGNOSTIC)
-ethernet_type (0x6006, DEC_CUSTOMER)
-ethernet_type (0x6007, DEC_SCA)
-ethernet_type (0x6558, TRANSPARENT_BRIDGING)
-ethernet_type (0x6559, RAW_FRAME_RELAY)
-ethernet_type (0x8035, REVERSE_ARP)
-ethernet_type (0x8038, DEC_LAN_BRIDGE)
-ethernet_type (0x803D, DEC_ETHERNET_ENCRYPTION)
-ethernet_type (0x803F, DEC_LAN_TRAFFIC_MONITOR)
-ethernet_type (0x8041, DEC_LAST)
-ethernet_type (0x809B, APPLETALK)
-ethernet_type (0x80D5, IBM_SNA)
-ethernet_type (0x80F3, APPLETALK_AARP)
-ethernet_type (0x80FF, WELLFLEET_COMPRESSION)
-ethernet_type (0x8100, VLAN)
-ethernet_type (0x8137, IPX)
-ethernet_type (0x814C, SNMP)
-ethernet_type (0x81FD, CABLETRON_ISMP)
-ethernet_type (0x81FF, CABLETRON_ISMP_TBFLOOD)
-ethernet_type (0x86DD, IP6)
-ethernet_type (0x86DF, ATOMIC)
-ethernet_type (0x876B, TCP_IP_COMPRESSION)
-ethernet_type (0x876C, IP_AUTONOMOUS_SYSTEMS)
-ethernet_type (0x876D, SECURE_DATA)
-ethernet_type (0x8808, MAC_CONTROL)
-ethernet_type (0x8809, SLOW_PROTOCOLS)
-ethernet_type (0x880B, PPP)
-ethernet_type (0x8847, MPLS_UNICAST)
-ethernet_type (0x8848, MPLS_MULTICAST)
-ethernet_type (0x8863, PPPOE_DISCOVERY)
-ethernet_type (0x8864, PPPOE_SESSION)
-ethernet_type (0x886D, INTEL_ANS)
-ethernet_type (0x886F, MICROSOFT_NLB_HEARTBEAT)
-ethernet_type (0x8881, CDMA_2000)
-ethernet_type (0x888e, 802_1X_AUTHENTICATION)
-ethernet_type (0x8892, PROFINET)
-ethernet_type (0x889a, HYPERSCSI)
-ethernet_type (0x88a2, AOE)
-ethernet_type (0x88a8, DOT1AD)
-ethernet_type (0x88AE, BRDWALK)
-ethernet_type (0x88B7, 802_OUI_EXTENDED)
-ethernet_type (0x88c7, 802_11I_PRE_AUTHENTICATION)
-ethernet_type (0x88cc, 802_1_LLDP)
-ethernet_type (0x88e7, DOT1AH)
-ethernet_type (0x894f, VPATH_3)
-ethernet_type (0x9000, LOOPBACK)
-ethernet_type (0x9021, RTNET_MAC)
-ethernet_type (0x9022, RTNET_CONFIG)
-ethernet_type (0x9100, VLAN_9100)
-ethernet_type (0x9200, VLAN_9200)
-ethernet_type (0x9999, PGLAN)
-ethernet_type (0xFEFE, SRP_ISIS)
-ethernet_type (0xFFFF, RESERVED)
diff --git a/vnet/vnet/feature/feature.c b/vnet/vnet/feature/feature.c
deleted file mode 100644
index 032fe784..00000000
--- a/vnet/vnet/feature/feature.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/feature/feature.h>
-
-vnet_feature_main_t feature_main;
-
-static clib_error_t *
-vnet_feature_init (vlib_main_t * vm)
-{
-  vnet_feature_main_t *fm = &feature_main;
-  vnet_feature_registration_t *freg;
-  vnet_feature_arc_registration_t *areg;
-  u32 arc_index = 0;
-
-  fm->arc_index_by_name = hash_create_string (0, sizeof (uword));
-  areg = fm->next_arc;
-
-  /* process feature arc registrations */
-  while (areg)
-    {
-      char *s;
-      int i = 0;
-      areg->feature_arc_index = arc_index;
-      if (areg->arc_index_ptr)
-	*areg->arc_index_ptr = arc_index;
-      hash_set_mem (fm->arc_index_by_name, areg->arc_name,
-		    pointer_to_uword (areg));
-
-      /* process start nodes */
-      while ((s = areg->start_nodes[i]))
-	{
-	  i++;
-	}
-      areg->n_start_nodes = i;
-
-      /* next */
-      areg = areg->next;
-      arc_index++;
-    }
-
-  vec_validate (fm->next_feature_by_arc, arc_index - 1);
-  vec_validate (fm->feature_nodes, arc_index - 1);
-  vec_validate (fm->feature_config_mains, arc_index - 1);
-  vec_validate (fm->next_feature_by_name, arc_index - 1);
-  vec_validate (fm->sw_if_index_has_features, arc_index - 1);
-  vec_validate (fm->feature_count_by_sw_if_index, arc_index - 1);
-
-  freg = fm->next_feature;
-  while (freg)
-    {
-      vnet_feature_registration_t *next;
-      uword *p = hash_get_mem (fm->arc_index_by_name, freg->arc_name);
-      if (p == 0)
-	return clib_error_return (0, "Unknown feature arc '%s'",
-				  freg->arc_name);
-
-      areg = uword_to_pointer (p[0], vnet_feature_arc_registration_t *);
-      arc_index = areg->feature_arc_index;
-
-      next = freg->next;
-      freg->next = fm->next_feature_by_arc[arc_index];
-      fm->next_feature_by_arc[arc_index] = freg;
-
-      /* next */
-      freg = next;
-    }
-
-  areg = fm->next_arc;
-  while (areg)
-    {
-      clib_error_t *error;
-      vnet_feature_config_main_t *cm;
-      vnet_config_main_t *vcm;
-
-      arc_index = areg->feature_arc_index;
-      cm = &fm->feature_config_mains[arc_index];
-      vcm = &cm->config_main;
-      if ((error = vnet_feature_arc_init (vm, vcm,
-					  areg->start_nodes,
-					  areg->n_start_nodes,
-					  fm->next_feature_by_arc[arc_index],
-					  &fm->feature_nodes[arc_index])))
-	{
-	  return error;
-	}
-
-      fm->next_feature_by_name[arc_index] =
-	hash_create_string (0, sizeof (uword));
-      freg = fm->next_feature_by_arc[arc_index];
-
-      while (freg)
-	{
-	  hash_set_mem (fm->next_feature_by_name[arc_index],
-			freg->node_name, pointer_to_uword (freg));
-	  freg = freg->next;
-	}
-
-      cm->end_feature_index =
-	vnet_get_feature_index (arc_index, areg->end_node);
-
-      /* next */
-      areg = areg->next;
-      arc_index++;
-    }
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (vnet_feature_init);
-
-u8
-vnet_get_feature_arc_index (const char *s)
-{
-  vnet_feature_main_t *fm = &feature_main;
-  vnet_feature_arc_registration_t *reg;
-  uword *p;
-
-  p = hash_get_mem (fm->arc_index_by_name, s);
-  if (p == 0)
-    return ~0;
-
-  reg = uword_to_pointer (p[0], vnet_feature_arc_registration_t *);
-  return reg->feature_arc_index;
-}
-
-vnet_feature_registration_t *
-vnet_get_feature_reg (const char *arc_name, const char *node_name)
-{
-  u8 arc_index;
-
-  arc_index = vnet_get_feature_arc_index (arc_name);
-  if (arc_index == (u8) ~ 0)
-    return 0;
-
-  vnet_feature_main_t *fm = &feature_main;
-  vnet_feature_registration_t *reg;
-  uword *p;
-
-  p = hash_get_mem (fm->next_feature_by_name[arc_index], node_name);
-  if (p == 0)
-    return 0;
-
-  reg = uword_to_pointer (p[0], vnet_feature_registration_t *);
-  return reg;
-}
-
-u32
-vnet_get_feature_index (u8 arc, const char *s)
-{
-  vnet_feature_main_t *fm = &feature_main;
-  vnet_feature_registration_t *reg;
-  uword *p;
-
-  if (s == 0)
-    return ~0;
-
-  p = hash_get_mem (fm->next_feature_by_name[arc], s);
-  if (p == 0)
-    return ~0;
-
-  reg = uword_to_pointer (p[0], vnet_feature_registration_t *);
-  return reg->feature_index;
-}
-
-int
-vnet_feature_enable_disable_with_index (u8 arc_index, u32 feature_index,
-					u32 sw_if_index, int enable_disable,
-					void *feature_config,
-					u32 n_feature_config_bytes)
-{
-  vnet_feature_main_t *fm = &feature_main;
-  vnet_feature_config_main_t *cm;
-  i16 feature_count;
-  int is_first_or_last;
-  u32 ci;
-
-  if (arc_index == (u8) ~ 0)
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  if (feature_index == ~0)
-    return VNET_API_ERROR_INVALID_VALUE_2;
-
-  cm = &fm->feature_config_mains[arc_index];
-  vec_validate_init_empty (cm->config_index_by_sw_if_index, sw_if_index, ~0);
-  ci = cm->config_index_by_sw_if_index[sw_if_index];
-
-  vec_validate (fm->feature_count_by_sw_if_index[arc_index], sw_if_index);
-  feature_count = fm->feature_count_by_sw_if_index[arc_index][sw_if_index];
-
-  if (!enable_disable && feature_count < 1)
-    return 0;
-
-  ci = (enable_disable
-	? vnet_config_add_feature
-	: vnet_config_del_feature)
-    (vlib_get_main (), &cm->config_main, ci, feature_index, feature_config,
-     n_feature_config_bytes);
-  cm->config_index_by_sw_if_index[sw_if_index] = ci;
-
-  /* update feature count */
-  enable_disable = (enable_disable > 0);
-  feature_count += enable_disable ? 1 : -1;
-  is_first_or_last = (feature_count == enable_disable);
-  ASSERT (feature_count >= 0);
-
-  if (is_first_or_last && cm->end_feature_index != ~0)
-    {
-      /*register end node */
-      ci = (enable_disable
-	    ? vnet_config_add_feature
-	    : vnet_config_del_feature)
-	(vlib_get_main (), &cm->config_main, ci, cm->end_feature_index, 0, 0);
-      cm->config_index_by_sw_if_index[sw_if_index] = ci;
-    }
-
-  fm->sw_if_index_has_features[arc_index] =
-    clib_bitmap_set (fm->sw_if_index_has_features[arc_index], sw_if_index,
-		     (feature_count > 0));
-
-  fm->feature_count_by_sw_if_index[arc_index][sw_if_index] = feature_count;
-  return 0;
-}
-
-int
-vnet_feature_enable_disable (const char *arc_name, const char *node_name,
-			     u32 sw_if_index, int enable_disable,
-			     void *feature_config, u32 n_feature_config_bytes)
-{
-  u32 feature_index;
-  u8 arc_index;
-
-  arc_index = vnet_get_feature_arc_index (arc_name);
-
-  if (arc_index == (u8) ~ 0)
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  feature_index = vnet_get_feature_index (arc_index, node_name);
-
-  return vnet_feature_enable_disable_with_index (arc_index, feature_index,
-						 sw_if_index, enable_disable,
-						 feature_config,
-						 n_feature_config_bytes);
-}
-
-
-/** Display the set of available driver features.
-    Useful for verifying that expected features are present
-*/
-
-static clib_error_t *
-show_features_command_fn (vlib_main_t * vm,
-			  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_feature_main_t *fm = &feature_main;
-  vnet_feature_arc_registration_t *areg;
-  vnet_feature_registration_t *freg;
-
-  vlib_cli_output (vm, "Available feature paths");
-
-  areg = fm->next_arc;
-  while (areg)
-    {
-      vlib_cli_output (vm, "%s:", areg->arc_name);
-      freg = fm->next_feature_by_arc[areg->feature_arc_index];
-      while (freg)
-	{
-	  vlib_cli_output (vm, "  %s\n", freg->node_name);
-	  freg = freg->next;
-	}
-
-
-      /* next */
-      areg = areg->next;
-    }
-
-  return 0;
-}
-
-/*?
- * Display the set of available driver features
- *
- * @cliexpar
- * Example:
- * @cliexcmd{show ip features}
- * @cliexend
- * @endparblock
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_features_command, static) = {
-  .path = "show features",
-  .short_help = "show features",
-  .function = show_features_command_fn,
-};
-/* *INDENT-ON* */
-
-/** Display the set of driver features configured on a specific interface
-  * Called by "show interface" handler
- */
-
-void
-vnet_interface_features_show (vlib_main_t * vm, u32 sw_if_index)
-{
-  vnet_feature_main_t *fm = &feature_main;
-  u32 node_index, current_config_index;
-  u16 feature_arc;
-  vnet_feature_config_main_t *cm = fm->feature_config_mains;
-  vnet_feature_arc_registration_t *areg;
-  vnet_config_main_t *vcm;
-  vnet_config_t *cfg;
-  u32 cfg_index;
-  vnet_config_feature_t *feat;
-  vlib_node_t *n;
-  int i;
-
-  vlib_cli_output (vm, "Driver feature paths configured on %U...",
-		   format_vnet_sw_if_index_name,
-		   vnet_get_main (), sw_if_index);
-
-  areg = fm->next_arc;
-  while (areg)
-    {
-      feature_arc = areg->feature_arc_index;
-      vcm = &(cm[feature_arc].config_main);
-
-      vlib_cli_output (vm, "\n%s:", areg->arc_name);
-      areg = areg->next;
-
-      if (NULL == cm[feature_arc].config_index_by_sw_if_index ||
-	  vec_len (cm[feature_arc].config_index_by_sw_if_index) <=
-	  sw_if_index)
-	{
-	  vlib_cli_output (vm, "  none configured");
-	  continue;
-	}
-
-      current_config_index =
-	vec_elt (cm[feature_arc].config_index_by_sw_if_index, sw_if_index);
-
-      if (current_config_index == ~0)
-	{
-	  vlib_cli_output (vm, "  none configured");
-	  continue;
-	}
-
-      ASSERT (current_config_index
-	      < vec_len (vcm->config_pool_index_by_user_index));
-
-      cfg_index = vcm->config_pool_index_by_user_index[current_config_index];
-      cfg = pool_elt_at_index (vcm->config_pool, cfg_index);
-
-      for (i = 0; i < vec_len (cfg->features); i++)
-	{
-	  feat = cfg->features + i;
-	  node_index = feat->node_index;
-	  n = vlib_get_node (vm, node_index);
-	  vlib_cli_output (vm, "  %v", n->name);
-	}
-    }
-}
-
-static clib_error_t *
-set_interface_features_command_fn (vlib_main_t * vm,
-				   unformat_input_t * input,
-				   vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  unformat_input_t _line_input, *line_input = &_line_input;
-  clib_error_t *error = 0;
-
-  u8 *arc_name = 0;
-  u8 *feature_name = 0;
-  u32 sw_if_index = ~0;
-  u8 enable = 1;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    goto done;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (line_input, "%U %v", unformat_vnet_sw_interface, vnm, &sw_if_index,
-	   &feature_name))
-	;
-      else if (unformat (line_input, "arc %v", &arc_name))
-	;
-      else if (unformat (line_input, "disable"))
-	enable = 0;
-      else
-	{
-	  error = unformat_parse_error (line_input);
-	  goto done;
-	}
-    }
-
-  if (sw_if_index == ~0)
-    {
-      error = clib_error_return (0, "Interface not specified...");
-      goto done;
-    }
-
-  vec_add1 (arc_name, 0);
-  vec_add1 (feature_name, 0);
-
-  vnet_feature_registration_t *reg;
-  reg =
-    vnet_get_feature_reg ((const char *) arc_name,
-			  (const char *) feature_name);
-  if (reg == 0)
-    {
-      error = clib_error_return (0, "Unknown feature...");
-      goto done;
-    }
-  if (reg->enable_disable_cb)
-    error = reg->enable_disable_cb (sw_if_index, enable);
-  if (!error)
-    vnet_feature_enable_disable ((const char *) arc_name,
-				 (const char *) feature_name, sw_if_index,
-				 enable, 0, 0);
-
-done:
-  vec_free (feature_name);
-  vec_free (arc_name);
-  return error;
-}
-
-/*?
- * Set feature for given interface
- *
- * @cliexpar
- * Example:
- * @cliexcmd{set interface feature GigabitEthernet2/0/0 ip4_flow_classify arc ip4_unicast}
- * @cliexend
- * @endparblock
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_feature_command, static) = {
-  .path = "set interface feature",
-  .short_help = "set interface feature <intfc> <feature_name> arc <arc_name>",
-  .function = set_interface_features_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/feature/feature.h b/vnet/vnet/feature/feature.h
deleted file mode 100644
index b27aaf17..00000000
--- a/vnet/vnet/feature/feature.h
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_features_h
-#define included_features_h
-
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-
-/** feature registration object */
-typedef struct _vnet_feature_arc_registration
-{
-  /** next registration in list of all registrations*/
-  struct _vnet_feature_arc_registration *next;
-  /** Feature Arc name */
-  char *arc_name;
-  /** Start nodes */
-  char **start_nodes;
-  int n_start_nodes;
-  /** End node */
-  char *end_node;
-  /* Feature arc index, assigned by init function */
-  u8 feature_arc_index;
-  u8 *arc_index_ptr;
-} vnet_feature_arc_registration_t;
-
-/* Enable feature callback. */
-typedef clib_error_t *(vnet_feature_enable_disable_function_t)
-  (u32 sw_if_index, int enable_disable);
-
-/** feature registration object */
-typedef struct _vnet_feature_registration
-{
-  /** next registration in list of all registrations*/
-  struct _vnet_feature_registration *next;
-  /** Feature arc name */
-  char *arc_name;
-  /** Graph node name */
-  char *node_name;
-  /** Pointer to this feature index, filled in by vnet_feature_arc_init */
-  u32 *feature_index_ptr;
-  u32 feature_index;
-  /** Constraints of the form "this feature runs before X" */
-  char **runs_before;
-  /** Constraints of the form "this feature runs after Y" */
-  char **runs_after;
-
-  /** Function to enable/disable feature  **/
-  vnet_feature_enable_disable_function_t *enable_disable_cb;
-} vnet_feature_registration_t;
-
-typedef struct vnet_feature_config_main_t_
-{
-  vnet_config_main_t config_main;
-  u32 *config_index_by_sw_if_index;
-  u32 end_feature_index;
-} vnet_feature_config_main_t;
-
-typedef struct
-{
-  /** feature arc configuration list */
-  vnet_feature_arc_registration_t *next_arc;
-  uword **arc_index_by_name;
-
-  /** feature path configuration lists */
-  vnet_feature_registration_t *next_feature;
-  vnet_feature_registration_t **next_feature_by_arc;
-  uword **next_feature_by_name;
-
-  /** feature config main objects */
-  vnet_feature_config_main_t *feature_config_mains;
-
-  /** Save partial order results for show command */
-  char ***feature_nodes;
-
-  /** bitmap of interfaces which have driver rx features configured */
-  uword **sw_if_index_has_features;
-
-  /** feature reference counts by interface */
-  i16 **feature_count_by_sw_if_index;
-
-  /** Feature arc index for device-input */
-  u8 device_input_feature_arc_index;
-
-  /** convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} vnet_feature_main_t;
-
-extern vnet_feature_main_t feature_main;
-
-#define VNET_FEATURE_ARC_INIT(x,...)				\
-  __VA_ARGS__ vnet_feature_arc_registration_t vnet_feat_arc_##x;\
-static void __vnet_add_feature_arc_registration_##x (void)	\
-  __attribute__((__constructor__)) ;				\
-static void __vnet_add_feature_arc_registration_##x (void)	\
-{								\
-  vnet_feature_main_t * fm = &feature_main;			\
-  vnet_feat_arc_##x.next = fm->next_arc;			\
-  fm->next_arc = & vnet_feat_arc_##x;				\
-}								\
-__VA_ARGS__ vnet_feature_arc_registration_t vnet_feat_arc_##x
-
-#define VNET_FEATURE_INIT(x,...)				\
-  __VA_ARGS__ vnet_feature_registration_t vnet_feat_##x;	\
-static void __vnet_add_feature_registration_##x (void)		\
-  __attribute__((__constructor__)) ;				\
-static void __vnet_add_feature_registration_##x (void)		\
-{								\
-  vnet_feature_main_t * fm = &feature_main;			\
-  vnet_feat_##x.next = fm->next_feature;			\
-  fm->next_feature = & vnet_feat_##x;				\
-}								\
-__VA_ARGS__ vnet_feature_registration_t vnet_feat_##x
-
-void
-vnet_config_update_feature_count (vnet_feature_main_t * fm, u8 arc,
-				  u32 sw_if_index, int is_add);
-
-u32 vnet_get_feature_index (u8 arc, const char *s);
-u8 vnet_get_feature_arc_index (const char *s);
-vnet_feature_registration_t *vnet_get_feature_reg (const char *arc_name,
-						   const char *node_name);
-
-
-int
-vnet_feature_enable_disable_with_index (u8 arc_index, u32 feature_index,
-					u32 sw_if_index, int enable_disable,
-					void *feature_config,
-					u32 n_feature_config_bytes);
-
-int
-vnet_feature_enable_disable (const char *arc_name, const char *node_name,
-			     u32 sw_if_index, int enable_disable,
-			     void *feature_config,
-			     u32 n_feature_config_bytes);
-
-static inline vnet_feature_config_main_t *
-vnet_get_feature_arc_config_main (u8 arc_index)
-{
-  vnet_feature_main_t *fm = &feature_main;
-
-  if (arc_index == (u8) ~ 0)
-    return 0;
-
-  return &fm->feature_config_mains[arc_index];
-}
-
-static_always_inline vnet_feature_config_main_t *
-vnet_feature_get_config_main (u16 arc)
-{
-  vnet_feature_main_t *fm = &feature_main;
-  return &fm->feature_config_mains[arc];
-}
-
-static_always_inline int
-vnet_have_features (u8 arc, u32 sw_if_index)
-{
-  vnet_feature_main_t *fm = &feature_main;
-  return clib_bitmap_get (fm->sw_if_index_has_features[arc], sw_if_index);
-}
-
-static_always_inline u32
-vnet_get_feature_config_index (u8 arc, u32 sw_if_index)
-{
-  vnet_feature_main_t *fm = &feature_main;
-  vnet_feature_config_main_t *cm = &fm->feature_config_mains[arc];
-  return vec_elt (cm->config_index_by_sw_if_index, sw_if_index);
-}
-
-static_always_inline void *
-vnet_feature_arc_start_with_data (u8 arc, u32 sw_if_index, u32 * next,
-				  vlib_buffer_t * b, u32 n_data_bytes)
-{
-  vnet_feature_main_t *fm = &feature_main;
-  vnet_feature_config_main_t *cm;
-  cm = &fm->feature_config_mains[arc];
-
-  if (PREDICT_FALSE (vnet_have_features (arc, sw_if_index)))
-    {
-      b->feature_arc_index = arc;
-      b->current_config_index =
-	vec_elt (cm->config_index_by_sw_if_index, sw_if_index);
-      return vnet_get_config_data (&cm->config_main, &b->current_config_index,
-				   next, n_data_bytes);
-    }
-  return 0;
-}
-
-static_always_inline void
-vnet_feature_arc_start (u8 arc, u32 sw_if_index, u32 * next0,
-			vlib_buffer_t * b0)
-{
-  vnet_feature_arc_start_with_data (arc, sw_if_index, next0, b0, 0);
-}
-
-static_always_inline void *
-vnet_feature_next_with_data (u32 sw_if_index, u32 * next0,
-			     vlib_buffer_t * b0, u32 n_data_bytes)
-{
-  vnet_feature_main_t *fm = &feature_main;
-  u8 arc = b0->feature_arc_index;
-  vnet_feature_config_main_t *cm = &fm->feature_config_mains[arc];
-
-  return vnet_get_config_data (&cm->config_main,
-			       &b0->current_config_index, next0,
-			       n_data_bytes);
-}
-
-static_always_inline void
-vnet_feature_next (u32 sw_if_index, u32 * next0, vlib_buffer_t * b0)
-{
-  vnet_feature_next_with_data (sw_if_index, next0, b0, 0);
-}
-
-static_always_inline void
-vnet_feature_start_device_input_x1 (u32 sw_if_index, u32 * next0,
-				    vlib_buffer_t * b0, u16 buffer_advanced0)
-{
-  vnet_feature_main_t *fm = &feature_main;
-  vnet_feature_config_main_t *cm;
-  u8 feature_arc_index = fm->device_input_feature_arc_index;
-  cm = &fm->feature_config_mains[feature_arc_index];
-
-  if (PREDICT_FALSE
-      (clib_bitmap_get
-       (fm->sw_if_index_has_features[feature_arc_index], sw_if_index)))
-    {
-      /*
-       * Save next0 so that the last feature in the chain
-       * can skip ethernet-input if indicated...
-       */
-      vnet_buffer (b0)->device_input_feat.saved_next_index = *next0;
-      vnet_buffer (b0)->device_input_feat.buffer_advance = buffer_advanced0;
-      vlib_buffer_advance (b0, -buffer_advanced0);
-
-      b0->feature_arc_index = feature_arc_index;
-      b0->current_config_index =
-	vec_elt (cm->config_index_by_sw_if_index, sw_if_index);
-      vnet_get_config_data (&cm->config_main, &b0->current_config_index,
-			    next0, /* # bytes of config data */ 0);
-    }
-}
-
-static_always_inline void
-vnet_feature_start_device_input_x2 (u32 sw_if_index,
-				    u32 * next0,
-				    u32 * next1,
-				    vlib_buffer_t * b0,
-				    vlib_buffer_t * b1,
-				    u16 buffer_advanced0,
-				    u16 buffer_advanced1)
-{
-  vnet_feature_main_t *fm = &feature_main;
-  vnet_feature_config_main_t *cm;
-  u8 feature_arc_index = fm->device_input_feature_arc_index;
-  cm = &fm->feature_config_mains[feature_arc_index];
-
-  if (PREDICT_FALSE
-      (clib_bitmap_get
-       (fm->sw_if_index_has_features[feature_arc_index], sw_if_index)))
-    {
-      /*
-       * Save next0 so that the last feature in the chain
-       * can skip ethernet-input if indicated...
-       */
-      vnet_buffer (b0)->device_input_feat.saved_next_index = *next0;
-      vnet_buffer (b1)->device_input_feat.saved_next_index = *next1;
-      vnet_buffer (b0)->device_input_feat.buffer_advance = buffer_advanced0;
-      vnet_buffer (b1)->device_input_feat.buffer_advance = buffer_advanced1;
-      vlib_buffer_advance (b0, -buffer_advanced0);
-      vlib_buffer_advance (b1, -buffer_advanced1);
-
-      b0->feature_arc_index = feature_arc_index;
-      b1->feature_arc_index = feature_arc_index;
-      b0->current_config_index =
-	vec_elt (cm->config_index_by_sw_if_index, sw_if_index);
-      b1->current_config_index = b0->current_config_index;
-      vnet_get_config_data (&cm->config_main, &b0->current_config_index,
-			    next0, /* # bytes of config data */ 0);
-      vnet_get_config_data (&cm->config_main, &b1->current_config_index,
-			    next1, /* # bytes of config data */ 0);
-    }
-}
-
-static_always_inline void
-vnet_feature_start_device_input_x4 (u32 sw_if_index,
-				    u32 * next0,
-				    u32 * next1,
-				    u32 * next2,
-				    u32 * next3,
-				    vlib_buffer_t * b0,
-				    vlib_buffer_t * b1,
-				    vlib_buffer_t * b2,
-				    vlib_buffer_t * b3,
-				    u16 buffer_advanced0,
-				    u16 buffer_advanced1,
-				    u16 buffer_advanced2,
-				    u16 buffer_advanced3)
-{
-  vnet_feature_main_t *fm = &feature_main;
-  vnet_feature_config_main_t *cm;
-  u8 feature_arc_index = fm->device_input_feature_arc_index;
-  cm = &fm->feature_config_mains[feature_arc_index];
-
-  if (PREDICT_FALSE
-      (clib_bitmap_get
-       (fm->sw_if_index_has_features[feature_arc_index], sw_if_index)))
-    {
-      /*
-       * Save next0 so that the last feature in the chain
-       * can skip ethernet-input if indicated...
-       */
-      vnet_buffer (b0)->device_input_feat.saved_next_index = *next0;
-      vnet_buffer (b1)->device_input_feat.saved_next_index = *next1;
-      vnet_buffer (b2)->device_input_feat.saved_next_index = *next2;
-      vnet_buffer (b3)->device_input_feat.saved_next_index = *next3;
-
-      vnet_buffer (b0)->device_input_feat.buffer_advance = buffer_advanced0;
-      vnet_buffer (b1)->device_input_feat.buffer_advance = buffer_advanced1;
-      vnet_buffer (b2)->device_input_feat.buffer_advance = buffer_advanced2;
-      vnet_buffer (b3)->device_input_feat.buffer_advance = buffer_advanced3;
-
-      vlib_buffer_advance (b0, -buffer_advanced0);
-      vlib_buffer_advance (b1, -buffer_advanced1);
-      vlib_buffer_advance (b2, -buffer_advanced2);
-      vlib_buffer_advance (b3, -buffer_advanced3);
-
-      b0->feature_arc_index = feature_arc_index;
-      b1->feature_arc_index = feature_arc_index;
-      b2->feature_arc_index = feature_arc_index;
-      b3->feature_arc_index = feature_arc_index;
-
-      b0->current_config_index =
-	vec_elt (cm->config_index_by_sw_if_index, sw_if_index);
-      b1->current_config_index = b0->current_config_index;
-      b2->current_config_index = b0->current_config_index;
-      b3->current_config_index = b0->current_config_index;
-
-      vnet_get_config_data (&cm->config_main, &b0->current_config_index,
-			    next0, /* # bytes of config data */ 0);
-      vnet_get_config_data (&cm->config_main, &b1->current_config_index,
-			    next1, /* # bytes of config data */ 0);
-      vnet_get_config_data (&cm->config_main, &b2->current_config_index,
-			    next2, /* # bytes of config data */ 0);
-      vnet_get_config_data (&cm->config_main, &b3->current_config_index,
-			    next3, /* # bytes of config data */ 0);
-    }
-}
-
-#define VNET_FEATURES(...)  (char*[]) { __VA_ARGS__, 0}
-
-clib_error_t *vnet_feature_arc_init (vlib_main_t * vm,
-				     vnet_config_main_t * vcm,
-				     char **feature_start_nodes,
-				     int num_feature_start_nodes,
-				     vnet_feature_registration_t *
-				     first_reg, char ***feature_nodes);
-
-void vnet_interface_features_show (vlib_main_t * vm, u32 sw_if_index);
-
-#endif /* included_feature_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/feature/registration.c b/vnet/vnet/feature/registration.c
deleted file mode 100644
index 1deeeef9..00000000
--- a/vnet/vnet/feature/registration.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/mpls/mpls.h>
-
-/**
- * @file
- * @brief Feature Subgraph Ordering.
-
-    Dynamically compute feature subgraph ordering by performing a
-    topological sort across a set of "feature A before feature B" and
-    "feature C after feature B" constraints.
-
-    Use the topological sort result to set up vnet_config_main_t's for
-    use at runtime.
-
-    Feature subgraph arcs are simple enough. They start at specific
-    fixed nodes, and end at specific fixed nodes.  In between, a
-    per-interface current feature configuration dictates which
-    additional nodes each packet visits. Each so-called feature node
-    can [of course] drop any specific packet.
-
-    See ip4_forward.c, ip6_forward.c in this directory to see the
-    current rx-unicast, rx-multicast, and tx feature subgraph arc
-    definitions.
-
-    Let's say that we wish to add a new feature to the ip4 unicast
-    feature subgraph arc, which needs to run before @c ip4-lookup.  In
-    either base code or a plugin,
-    <CODE><PRE>
-    \#include <vnet/feature/feature.h>
-    </PRE></CODE>
-
-    and add the new feature as shown:
-
-    <CODE><PRE>
-    VNET_FEATURE_INIT (ip4_lookup, static) =
-    {
-      .arch_name = "ip4-unicast",
-      .node_name = "my-ip4-unicast-feature",
-      .runs_before = VLIB_FEATURES ("ip4-lookup")
-    };
-    </PRE></CODE>
-
-    Here's the standard coding pattern to enable / disable
-    @c my-ip4-unicast-feature on an interface:
-
-    <CODE><PRE>
-
-    sw_if_index = <interface-handle>
-    vnet_feature_enable_disable ("ip4-unicast", "my-ip4-unicast-feature",
-                                 sw_if_index, 1 );
-    </PRE></CODE>
-
-    Here's how to obtain the correct next node index in packet
-    processing code, aka in the implementation of @c my-ip4-unicast-feature:
-
-    <CODE><PRE>
-    vnet_feature_next (sw_if_index0, &next0, b0);
-
-    </PRE></CODE>
-
-    Nodes are free to drop or otherwise redirect packets. Packets
-    which "pass" should be enqueued via the next0 arc computed by
-    vnet_feature_next.
-*/
-
-
-static int
-comma_split (u8 * s, u8 ** a, u8 ** b)
-{
-  *a = s;
-
-  while (*s && *s != ',')
-    s++;
-
-  if (*s == ',')
-    *s = 0;
-  else
-    return 1;
-
-  *b = (u8 *) (s + 1);
-  return 0;
-}
-
-/**
- * @brief Initialize a feature graph arc
- * @param vm vlib main structure pointer
- * @param vcm vnet config main structure pointer
- * @param feature_start_nodes names of start-nodes which use this
- *	  feature graph arc
- * @param num_feature_start_nodes number of start-nodes
- * @param first_reg first element in
- *        [an __attribute__((constructor)) function built, or
- *        otherwise created] singly-linked list of feature registrations
- * @param [out] in_feature_nodes returned vector of
- *        topologically-sorted feature node names, for use in
- *        show commands
- * @returns 0 on success, otherwise an error message. Errors
- *        are fatal since they invariably involve mistyped node-names, or
- *        genuinely missing node-names
- */
-clib_error_t *
-vnet_feature_arc_init (vlib_main_t * vm,
-		       vnet_config_main_t * vcm,
-		       char **feature_start_nodes,
-		       int num_feature_start_nodes,
-		       vnet_feature_registration_t * first_reg,
-		       char ***in_feature_nodes)
-{
-  uword *index_by_name;
-  uword *reg_by_index;
-  u8 **node_names = 0;
-  u8 *node_name;
-  char **these_constraints;
-  char *this_constraint_c;
-  u8 **constraints = 0;
-  u8 *constraint_tuple;
-  u8 *this_constraint;
-  u8 **orig, **closure;
-  uword *p;
-  int i, j, k;
-  u8 *a_name, *b_name;
-  int a_index, b_index;
-  int n_features;
-  u32 *result = 0;
-  vnet_feature_registration_t *this_reg = 0;
-  char **feature_nodes = 0;
-  hash_pair_t *hp;
-  u8 **keys_to_delete = 0;
-
-  index_by_name = hash_create_string (0, sizeof (uword));
-  reg_by_index = hash_create (0, sizeof (uword));
-
-  this_reg = first_reg;
-
-  /* pass 1, collect feature node names, construct a before b pairs */
-  while (this_reg)
-    {
-      node_name = format (0, "%s%c", this_reg->node_name, 0);
-      hash_set (reg_by_index, vec_len (node_names), (uword) this_reg);
-
-      hash_set_mem (index_by_name, node_name, vec_len (node_names));
-
-      vec_add1 (node_names, node_name);
-
-      these_constraints = this_reg->runs_before;
-      while (these_constraints && these_constraints[0])
-	{
-	  this_constraint_c = these_constraints[0];
-
-	  constraint_tuple = format (0, "%s,%s%c", node_name,
-				     this_constraint_c, 0);
-	  vec_add1 (constraints, constraint_tuple);
-	  these_constraints++;
-	}
-
-      these_constraints = this_reg->runs_after;
-      while (these_constraints && these_constraints[0])
-	{
-	  this_constraint_c = these_constraints[0];
-
-	  constraint_tuple = format (0, "%s,%s%c",
-				     this_constraint_c, node_name, 0);
-	  vec_add1 (constraints, constraint_tuple);
-	  these_constraints++;
-	}
-
-      this_reg = this_reg->next;
-    }
-
-  n_features = vec_len (node_names);
-  orig = clib_ptclosure_alloc (n_features);
-
-  for (i = 0; i < vec_len (constraints); i++)
-    {
-      this_constraint = constraints[i];
-
-      if (comma_split (this_constraint, &a_name, &b_name))
-	return clib_error_return (0, "comma_split failed!");
-
-      p = hash_get_mem (index_by_name, a_name);
-      /*
-       * Note: the next two errors mean that something is
-       * b0rked. As in: if you code "A depends on B," and you forget
-       * to define a FEATURE_INIT macro for B, you lose.
-       * Nonexistent graph nodes are tolerated.
-       */
-      if (p == 0)
-	return clib_error_return (0, "feature node '%s' not found", a_name);
-      a_index = p[0];
-
-      p = hash_get_mem (index_by_name, b_name);
-      if (p == 0)
-	return clib_error_return (0, "feature node '%s' not found", b_name);
-      b_index = p[0];
-
-      /* add a before b to the original set of constraints */
-      orig[a_index][b_index] = 1;
-      vec_free (this_constraint);
-    }
-
-  /* Compute the positive transitive closure of the original constraints */
-  closure = clib_ptclosure (orig);
-
-  /* Compute a partial order across feature nodes, if one exists. */
-again:
-  for (i = 0; i < n_features; i++)
-    {
-      for (j = 0; j < n_features; j++)
-	{
-	  if (closure[i][j])
-	    goto item_constrained;
-	}
-      /* Item i can be output */
-      vec_add1 (result, i);
-      {
-	for (k = 0; k < n_features; k++)
-	  closure[k][i] = 0;
-	/*
-	 * Add a "Magic" a before a constraint.
-	 * This means we'll never output it again
-	 */
-	closure[i][i] = 1;
-	goto again;
-      }
-    item_constrained:
-      ;
-    }
-
-  /* see if we got a partial order... */
-  if (vec_len (result) != n_features)
-    return clib_error_return (0, "%d feature_init_cast no partial order!");
-
-  /*
-   * We win.
-   * Bind the index variables, and output the feature node name vector
-   * using the partial order we just computed. Result is in stack
-   * order, because the entry with the fewest constraints (e.g. none)
-   * is output first, etc.
-   */
-
-  for (i = n_features - 1; i >= 0; i--)
-    {
-      p = hash_get (reg_by_index, result[i]);
-      ASSERT (p != 0);
-      this_reg = (vnet_feature_registration_t *) p[0];
-      if (this_reg->feature_index_ptr)
-	*this_reg->feature_index_ptr = n_features - (i + 1);
-      this_reg->feature_index = n_features - (i + 1);
-      vec_add1 (feature_nodes, this_reg->node_name);
-    }
-
-  /* Set up the config infrastructure */
-  vnet_config_init (vm, vcm,
-		    feature_start_nodes,
-		    num_feature_start_nodes,
-		    feature_nodes, vec_len (feature_nodes));
-
-  /* Save a copy for show command */
-  *in_feature_nodes = feature_nodes;
-
-  /* Finally, clean up all the shit we allocated */
-  /* *INDENT-OFF* */
-  hash_foreach_pair (hp, index_by_name,
-  ({
-    vec_add1 (keys_to_delete, (u8 *)hp->key);
-  }));
-  /* *INDENT-ON* */
-  hash_free (index_by_name);
-  for (i = 0; i < vec_len (keys_to_delete); i++)
-    vec_free (keys_to_delete[i]);
-  vec_free (keys_to_delete);
-  hash_free (reg_by_index);
-  vec_free (result);
-  clib_ptclosure_free (orig);
-  clib_ptclosure_free (closure);
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/fib/fib.c b/vnet/vnet/fib/fib.c
deleted file mode 100644
index 413f93e8..00000000
--- a/vnet/vnet/fib/fib.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/fib/fib_entry_src.h>
-#include <vnet/fib/fib_entry.h>
-#include <vnet/fib/fib_path.h>
-#include <vnet/fib/fib_walk.h>
-#include <vnet/fib/fib_path_list.h>
-
-static clib_error_t *
-fib_module_init (vlib_main_t * vm)
-{
-    clib_error_t * error;
-
-    if ((error = vlib_call_init_function (vm, dpo_module_init)))
-	return (error);
-    if ((error = vlib_call_init_function (vm, adj_module_init)))
-	return (error);
-
-    fib_entry_module_init();
-    fib_entry_src_module_init();
-    fib_path_module_init();
-    fib_path_list_module_init();
-    fib_walk_module_init();
-
-    return (NULL);
-}
-
-VLIB_INIT_FUNCTION (fib_module_init);
diff --git a/vnet/vnet/fib/fib.h b/vnet/vnet/fib/fib.h
deleted file mode 100644
index 7cf1d136..00000000
--- a/vnet/vnet/fib/fib.h
+++ /dev/null
@@ -1,652 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * \brief
- * A IP v4/6 independent FIB.
- *
- * The main functions provided by the FIB are as follows;
- *
- *  - source priorities
- *
- *   A route can be added to the FIB by more than entity or source. Sources
- * include, but are not limited to, API, CLI, LISP, MAP, etc (for the full list
- * see fib_entry.h). Each source provides the forwarding information (FI) that
- * is has determined as required for that route. Since each source determines the
- * FI using different best  path and loop prevention algorithms, it is not
- * correct for the FI of multiple sources to be combined. Instead the FIB must
- * choose to use the FI from only one source. This choose is based on a static
- * priority assignment. For example;
- * IF a prefix is added as a result of interface configuration:
- *    set interface address 192.168.1.1/24 GigE0
- * and then it is also added from the CLI
- *    ip route 192.168.1.1/32 via 2.2.2.2/32
- * then the 'interface' source will prevail, and the route will remain as
- * 'local'.
- * The requirement of the FIB is to always install the FI from the winning
- * source and thus to maintain the FI added by losing sources so it can be
- * installed should the winning source be withdrawn.
- *
- *  - adj-fib maintenance
- *
- *   When ARP or ND discover a neighbour on a link an adjacency forms for the
- * address of that neighbour. It is also required to insert a route in the
- * appropriate FIB table, corresponding to the VRF for the link, an entry for
- * that neighbour. This entry is often referred to as an adj-fib. Adj-fibs
- * have a dedicated source; 'ADJ'.
- * The priority of the ADJ source is lower than most. This is so the following
- * config;
- *    set interface address 192.168.1.1/32 GigE0
- *    ip arp 192.168.1.2 GigE0 dead.dead.dead
- *    ip route add 192.168.1.2 via 10.10.10.10 GigE1
- * will forward traffic for 192.168.1.2 via GigE1. That is the route added
- * by the control plane is favoured over the adjacency discovered by ARP.
- * The control plane, with its associated authentication, is considered the
- * authoritative source.
- * To counter the nefarious addition of adj-fib, through the nefarious injection
- * of adjacencies, the FIB is also required to ensure that only adj-fibs whose
- * less specific covering prefix is connected are installed in forwarding. This
- * requires the use of 'cover tracking', where a route maintains a dependency
- * relationship with the route that is its less specific cover. When this cover
- * changes (i.e. there is a new covering route) or the forwarding information
- * of the cover changes, then the covered route is notified.
- *
- * Overlapping sub-nets are not supported, so no adj-fib has multiple paths.
- * The control plane is expected to remove a prefix configured for an interface
- * before the interface changes VRF.
- * So while the following config is accepted:
- *    set interface address 192.168.1.1/32 GigE0
- *    ip arp 192.168.1.2 GigE0 dead.dead.dead
- *    set interface ip table GigE0 2
- * it does not result in the desired behaviour.
- *
- *  - attached export.
- *
- * Further to adj-fib maintenance above consider the following config:
- *    set interface address 192.168.1.1/24 GigE0
- *    ip route add table 2 192.168.1.0/24 GigE0
- * Traffic destined for 192.168.1.2 in table 2 will generate an ARP request
- * on GigE0. However, since GigE0 is in table 0, all adj-fibs will be added in
- * FIB 0. Hence all hosts in the sub-net are unreachable from table 2. To resolve
- * this, all adj-fib and local prefixes are exported (i.e. copied) from the 
- * 'export' table 0, to the 'import' table 2. There can be many import tables
- * for a single export table.
- *
- *  - recursive route resolution
- *
- *   A recursive route is of the form:
- *       1.1.1.1/32 via 10.10.10.10
- * i.e. a route for which no egress interface is provided. In order to forward
- * traffic to 1.1.1.1/32 the FIB must therefore first determine how to forward
- * traffic to 10.10.10.10/32. This is recursive resolution.
- * Recursive resolution, just like normal resolution, proceeds via a longest
- * prefix match for the 'via-address' 10.10.10.10. Note it is only possible
- * to add routes via an address (i.e. a /32 or /128) not via a shorter mask
- * prefix. There is no use case for the latter.
- * Since recursive resolution proceeds via a longest prefix match, the entry
- * in the FIB that will resolve the recursive route, termed the via-entry, may
- * change as other routes are added to the FIB. Consider the recursive
- * route shown above, and this non-recursive route:
- *       10.10.10.0/24 via 192.168.16.1 GigE0
- * The entry for 10.10.10.0/24 is thus the resolving via-entry. If this entry is
- * modified, to say;
- *       10.10.10.0/24 via 192.16.1.3 GigE0
- * Then packet for 1.1.1.1/32 must also be sent to the new next-hop.
- * Now consider the addition of;
- *       10.10.10.0/28 via 192.168.16.2 GigE0
- * The more specific /28 is a better longest prefix match and thus becomes the
- * via-entry. Removal of the /28 means the resolution will revert to the /24.
- * The tracking to the changes in recursive resolution is the requirement of
- * the FIB. When the forwarding information of the via-entry changes a back-walk
- * is used to update dependent recursive routes. When new routes are added to
- * the table the cover tracking feature provides the necessary notifications to
- * the via-entry routes.
- * The adjacency constructed for 1.1.1.1/32 will be a recursive adjacency
- * whose next adjacency will be contributed from the via-entry. Maintaining
- * the validity of this recursive adjacency is a requirement of the FIB.
- *
- *  - recursive loop avoidance
- *
- * Consider this set of routes:
- *     1.1.1.1/32 via 2.2.2.2
- *     2.2.2.2/32 via 3.3.3.3
- *     3.3.3.3/32 via 1.1.1.1
- * this is termed a recursion loop - all of the routes in the loop are
- * unresolved in so far as they do not have a resolving adjacency, but each
- * is resolved because the via-entry is known. It is important here to note
- * the distinction between the control-plane objects and the data-plane objects
- * (more details in the implementation section). The control plane objects must
- * allow the loop to form (i.e. the graph becomes cyclic), however, the
- * data-plane absolutely must not allow the loop to form, otherwise the packet
- * would loop indefinitely and never egress the device - meltdown would follow.
- * The control plane must allow the loop to form, because when the loop breaks,
- * all members of the loop need to be updated. Forming the loop allows the
- * dependencies to be correctly setup to allow this to happen.
- * There is no limit to the depth of recursion supported by VPP so:
- *    9.9.9.100/32 via 9.9.9.99
- *    9.9.9.99/32  via 9.9.9.98
- *    9.9.9.98/32  via 9.9.9.97
- *      ... turtles, turtles, turtles ...
- *    9.9.9.1/32 via 10.10.10.10 Gig0
- * is supported to as many layers of turtles is desired, however, when
- * back-walking a graph (in this case from 9.9.9.1/32 up toward 9.9.9.100/32)
- * a FIB needs to differentiate the case where the recursion is deep versus
- * the case where the recursion is looped. A simple method, employed by VPP FIB,
- * is to limit the number of steps. VPP FIB limit is 16. Typical BGP scenarios
- * in the wild do not exceed 3 (BGP Inter-AS option C).
- * 
- * - Fast Convergence
- * 
- * After a network topology change, the 'convergence' time, is the time taken
- * for the router to complete a transition to forward traffic using the new
- * topology. The convergence time is therefore a summation of the time to;
- *  - detect the failure.
- *  - calculate the new 'best path' information
- *  - download the new best paths to the data-plane.
- *  - install those best best in data-plane forwarding.
- * The last two points are of relevance to VPP architecture. The download API is
- * binary and batch, details are not discussed here. There is no HW component to
- * programme, installation time is bounded by the memory allocation and table
- * lookup and insert access times.
- *
- * 'Fast' convergence refers to a set of technologies that a FIB can employ to
- * completely or partially restore forwarding whilst the convergence actions
- * listed above are ongoing. Fast convergence technologies are further
- * sub-divided into Prefix Independent Convergence (PIC) and Loop Free
- * Alternate path Fast re-route (LFA-FRR or sometimes called IP-FRR) which
- * affect recursive and non-recursive routes respectively.
- *
- * LFA-FRR
- *
- * Consider the network topology below:
- *
- *          C
- *        /   \
- *  X -- A --- B - Y
- *       |     |
- *       D     F
- *        \   /
- *          E
- *
- * all links are equal cost, traffic is passing from X to Y. the best path is
- * X-A-B-Y. There are two alternative paths, one via C and one via E. An
- * alternate path is considered to be loop free if no other router on that path
- * would forward the traffic back to the sender. Consider router C, its best
- * path to Y is via B, so if A were to send traffic destined to Y to C, then C
- * would forward that traffic to B - this is a loop-free alternate path. In
- * contrast consider router D. D's shortest path to Y is via A, so if A were to
- * send traffic destined to Y via D, then D would send it back to A; this is
- * not a loop-free alternate path. There are several points of note;
- *   - we are considering the pre-failure routing topology
- *   - any equal-cost multi-path between A and B is also a LFA path.
- *   - in order for A to calculate LFA paths it must be aware of the best-path
- *     to Y from the perspective of D. These calculations are thus limited to
- *     routing protocols that have a full view of the network topology, i.e.
- *     link-state DB protocols like OSPF or an SDN controller. LFA protected
- *     prefixes are thus non-recursive.
- *
- * LFA is specified as a 1 to 1 redundancy; a primary path has only one LFA
- * (a.k.a. backup) path. To my knowledge this limitation is one of complexity
- * in the calculation of and capacity planning using a 1-n redundancy. 
- *
- * In the event that the link A-B fails, the alternate path via C can be used.
- * In order to provide 'fast' failover in the event of a failure, the control
- * plane will download both the primary and the backup path to the FIB. It is
- * then a requirement of the FIB to perform the failover (a.k.a cutover) from
- * the primary to the backup path as quickly as possible, and particularly
- * without any other control-plane intervention. The expectation is cutover is
- * less than 50 milli-seconds - a value allegedly from the VOIP QoS. Note that
- * cutover time still includes the fault detection time, which in a vitalised
- * environment could be the dominant factor. Failure detection can be either a
- * link down, which will affect multiple paths on a multi-access interface, or
- * via a specific path heartbeat (i.e. BFD). 
- * At this time VPP does not support LFA, that is it does not support the
- * installation of a primary and backup path[s] for a route. However, it does
- * support ECMP, and VPP FIB is designed to quickly remove failed paths from
- * the ECMP set, however, it does not insert shared objects specific to the
- * protected resource into the forwarding object graph, since this would incur
- * a forwarding/performance cost. Failover time is thus route number dependent.
- * Details are provided in the implementation section below.
- *
- * PIC
- *
- * PIC refers to the concept that the converge time should be independent of
- * the number of prefixes/routes that are affected by the failure. PIC is
- * therefore most appropriate when considering networks with large number of
- * prefixes, i.e. BGP networks and thus recursive prefixes. There are several
- * flavours of PIC covering different locations of protection and failure
- * scenarios. An outline is given below, see the literature for more details:
- *
- * Y/16 - CE1 -- PE1---\
- *                | \   P1---\
- *                |  \        PE3 -- CE3 - X/16
- *                |   - P2---/
- * Y/16 - CE2 -- PE2---/
- *
- * CE = customer edge, PE = provider edge. external-BGP runs between customer
- * and provider, internal-BGP runs between provider and provider.
- *
- * 1) iBGP PIC-core: consider traffic from CE1 to X/16 via CE3. On PE1 there is
- *    are routes;
- *       X/16 (and hundreds of thousands of others like it)
- *         via PE3
- *    and
- *      PE3/32 (its loopback address)
- *        via 10.0.0.1 Link0 (this is P1)
- *        via 10.1.1.1 Link1 (this is P2)
- * the failure is the loss of link0 or link1
- * As in all PIC scenarios, in order to provide prefix independent convergence
- * it must be that the route for X/16 (and all other routes via PE3) do not
- * need to be updated in the FIB. The FIB therefore needs to update a single
- * object that is shared by all routes - once this shared object is updated,
- * then all routes using it will be instantly updated to use the new forwarding
- * information. In this case the shared object is the resolving route via PE3.
- * Once the route via PE3 is updated via IGP (OSPF) convergence, then all
- * recursive routes that resolve through it are also updated. VPP FIB
- * implements this scenario via a recursive-adjacency. the X/16 and it sibling
- * routes share a recursive-adjacency that links to/points at/stacks on the
- * normal adjacency contributed by the route for PE3. Once this shared
- * recursive adj is re-linked then all routes are switched to using the new
- * forwarding information. This is shown below;
- *
- * pre-failure;
- *   X/16 --> R-ADJ-1 --> ADJ-1-PE3 (multi-path via P1 and P2)
- *
- * post-failure:
- *   X/16 --> R-ADJ-1 --> ADJ-2-PE3 (single path via P1)
- *
- * note that R-ADJ-1 (the recursive adj) remains in the forwarding graph,
- * therefore X/16 (and all its siblings) is not updated.
- * X/16 and its siblings share the recursive adj since they share the same
- * path-list. It is the path-list object that contributes the recursive-adj
- * (see next section for more details)
- *
- *
- * 2) iBGP PIC-edge; Traffic from CE3 to Y/16. On PE3 there is are routes;
- *      Y/16  (and hundreds of thousands of others like it)
- *        via PE1
- *        via PE2 
- *  and
- *     PE1/32 (PE1's loopback address)
- *       via 10.0.2.2 Link0 (this is P1)
- *     PE2/32 (PE2's loopback address)
- *       via 10.0.3.3 Link1 (this is P2)
- *
- * the failure is the loss of reachability to PE2. this could be either the
- * loss of the link P2-PE2 or the loss of the node PE2. This is detected either
- * by the withdrawal of the PE2's loopback route or by some form of failure
- * detection (i.e. BFD).
- * VPP FIB again provides PIC via the use of the shared recursive-adj. Y/16 and
- * its siblings will again share a path-list for the list {PE1,PE2}, this
- * path-list will contribute a multi-path-recursive-adj, i.e. a multi-path-adj
- * with each choice therein being another adj;
- *
- *  Y/16 -> RM-ADJ --> ADJ1 (for PE1)
- *                 --> ADJ2 (for PE2)
- *
- * when the route for PE1 is withdrawn then the multi-path-recursive-adjacency
- * is updated to be;
- *
- * Y/16 --> RM-ADJ --> ADJ1 (for PE1)
- *                 --> ADJ1 (for PE1)
- *
- * that is both choices in the ECMP set are the same and thus all traffic is
- * forwarded to PE1. Eventually the control plane will download a route update
- * for Y/16 to be via PE1 only. At that time the situation will be:
- *
- * Y/16 -> R-ADJ --> ADJ1 (for PE1)
- *
- * In the scenario above we assumed that PE1 and PE2 are ECMP for Y/16. eBGP
- * PIC core is also specified for the case were one PE is primary and the other
- * backup - VPP FIB does not support that case at this time.
- *
- * 3) eBGP PIC Edge; Traffic from CE3 to Y/16. On PE1 there is are routes;
- *      Y/16 (and hundreds of thousands of others like it)
- *         via CE1 (primary)
- *         via PE2 (backup)
- *   and
- *     CE1 (this is an adj-fib)
- *       via 11.0.0.1 Link0 (this is CE1) << this is an adj-fib
- *     PE2 (PE2's loopback address)
- *       via 10.0.5.5 Link1 (this is link PE1-PE2)
- * the failure is the loss of link0 to CE1. The failure can be detected by FIB
- * either as a link down event or by the control plane withdrawing the connected
- * prefix on the link0 (say 10.0.5.4/30). The latter works because the resolving
- * entry is an adj-fib, so removing the connected will withdraw the adj-fib, and
- * hence the recursive path becomes unresolved. The former is faster,
- * particularly in the case of Inter-AS option A where there are many VLAN
- * sub-interfaces on the PE-CE link, one for each VRF, and so the control plane
- * must remove the connected prefix for each sub-interface to trigger PIC in
- * each VRF. Note though that total PIC cutover time will depend on VRF scale
- * with either trigger.
- * Primary and backup paths in this eBGP PIC-edge scenario are calculated by
- * BGP. Each peer is configured to always advertise its best external path to
- * its iBGP peers. Backup paths therefore send traffic from the PE back into the
- * core to an alternate PE. A PE may have multiple external paths, i.e. multiple
- * directly connected CEs, it may also have multiple backup PEs, however there
- * is no correlation between the two, so unlike LFA-FRR, the redundancy model is
- * N-M; N primary paths are backed-up by M backup paths - only when all primary
- * paths fail, then the cutover is performed onto the M backup paths. Note that
- * PE2 must be suitably configured to forward traffic on its external path that
- * was received from PE1. VPP FIB does not support external-internal-BGP (eiBGP)
- * load-balancing.
- *
- * As with LFA-FRR the use of primary and backup paths is not currently
- * supported, however, the use of a recursive-multi-path-adj, and a suitably
- * constrained hashing algorithm to choose from the primary or backup path sets,
- * would again provide the necessary shared object and hence the prefix scale
- * independent cutover.
- *
- * Astute readers will recognise that both of the eBGP PIC scenarios refer only
- * to a BGP free core.
- *
- * Fast convergence implementation options come in two flavours:
- *  1) Insert switches into the data-path. The switch represents the protected
- *     resource. If the switch is 'on' the primary path is taken, otherwise
- *     the backup path is taken. Testing the switch in the data-path comes with
- *     an associated performance cost. A given packet may encounter more than
- *     one protected resource as it is forwarded. This approach minimises
- *     cutover times as packets will be forwarded on the backup path as soon
- *     as the protected resource is detected to be down and the single switch
- *     is tripped. However, it comes at a performance cost, which increases
- *     with each shared resource a packet encounters in the data-path.
- *     This approach is thus best suited to LFA-FRR where the protected routes
- *     are non-recursive (i.e. encounter few shared resources) and the
- *     expectation on cutover times is more stringent (<50msecs).
- *  2) Update shared objects. Identify objects in the data-path, that are
- *     required to be present whether or not fast convergence is required (i.e.
- *     adjacencies) that can be shared by multiple routes. Create a dependency
- *     between these objects at the protected resource. When the protected
- *     resource fails, each of the shared objects is updated in a way that all
- *     users of it see a consistent change. This approach incurs no performance
- *     penalty as the data-path structure is unchanged, however, the cutover
- *     times are longer as more work is required when the resource fails. This
- *     scheme is thus more appropriate to recursive prefixes (where the packet
- *     will encounter multiple protected resources) and to fast-convergence
- *     technologies where the cutover times are less stringent (i.e. PIC).
- *
- * Implementation:
- * ---------------
- *
- * Due to the requirements outlined above, not all routes known to FIB
- * (e.g. adj-fibs) are installed in forwarding. However, should circumstances
- * change, those routes will need to be added. This adds the requirement that
- * a FIB maintains two tables per-VRF, per-AF (where a 'table' is indexed by
- * prefix); the forwarding and non-forwarding tables.
- *
- * For DP speed in VPP we want the lookup in the forwarding table to directly 
- * result in the ADJ. So the two tables; one contains all the routes (a 
- * lookup therein yields a fib_entry_t), the other contains only the forwarding 
- * routes (a lookup therein yields an ip_adjacency_t). The latter is used by the
- * DP. 
- * This trades memory for forwarding performance. A good trade-off in VPP's
- * expected operating environments.
- *
- * Note these tables are keyed only by the prefix (and since there 2 two
- * per-VRF, implicitly by the VRF too). The key for an adjacency is the
- * tuple:{next-hop, address (and it's AF), interface, link/ether-type}.
- * consider this curious, but allowed, config;
- *
- *   set int ip addr 10.0.0.1/24 Gig0
- *   set ip arp Gig0 10.0.0.2 dead.dead.dead
- *   # a host in that sub-net is routed via a better next hop (say it avoids a
- *   # big L2 domain)
- *   ip route add 10.0.0.2 Gig1 192.168.1.1
- *   # this recursive should go via Gig1
- *   ip route add 1.1.1.1/32 via 10.0.0.2
- *   # this non-recursive should go via Gig0
- *   ip route add 2.2.2.2/32 via Gig0 10.0.0.2
- *
- * for the last route, the lookup for the path (via {Gig0, 10.0.0.2}) in the
- * prefix table would not yield the correct result. To fix this we need a
- * separate table for the adjacencies.
- *
- *  - FIB data structures;
- *
- * fib_entry_t:
- *   - a representation of a route.
- *     - has a prefix.
- *    - it maintains an array of path-lists that have been contributed by the
- *      different sources
- *    - install an adjacency in the forwarding table contributed by the best
- *      source's path-list.
- *
- * fib_path_list_t:
- *   - a list of paths
- *   - path-lists may be shared between FIB entries. The path-lists are thus
- *     kept in a DB. The key is the combined description of the paths. We share
- *     path-lists  when it will aid convergence to do so. Adding path-lists to
- *     this DB that are never shared, or are not shared by prefixes that are
- *     not subject to PIC, will increase the size of the DB unnecessarily and
- *     may lead to increased search times due to hash collisions.
- *   - the path-list contributes the appropriate adj for the entry in the 
- *     forwarding table. The adj can be 'normal', multi-path or recursive,
- *     depending on the number of paths and their types.
- *   - since path-lists are shared there is only one instance of the multi-path 
- *     adj that they [may] create. As such multi-path adjacencies do not need a
- *     separate DB.
- * The path-list with recursive paths and the recursive adjacency that it
- * contributes forms the backbone of the fast convergence architecture (as 
- * described previously). 
- *
- * fib_path_t:
- *   - a description of how to forward the traffic (i.e. via {Gig1, K}).
- *   - the path describes the intent on how to forward. This differs from how 
- *     the path resolves. I.e. it might not be resolved at all (since the
- *     interface is deleted or down).
- *   - paths have different types, most notably recursive or non-recursive.
- *   - a fib_path_t will contribute the appropriate adjacency object. It is from
- *     these contributions that the DP graph/chain for the route is built.
- *   - if the path is recursive and a recursion loop is detected, then the path
- *     will contribute the special DROP adjacency. This way, whilst the control
- *     plane graph is looped, the data-plane graph does not.
- *
- * we build a graph of these objects;
- *
- *  fib_entry_t -> fib_path_list_t -> fib_path_t -> ...
- *
- * for recursive paths:
- *
- *   fib_path_t -> fib_entry_t -> ....
- *
- * for non-recursive paths
- *
- *  fib_path_t -> ip_adjacency_t -> interface
- *
- * These objects, which constitute the 'control plane' part of the FIB are used
- * to represent the resolution of a route. As a whole this is referred to as the
- * control plane graph. There is a separate DP graph to represent the forwarding
- * of a packet. In the DP graph each object represents an action that is applied
- * to a packet as it traverses the graph. For example, a lookup of a IP address
- * in the forwarding table could result in the following graph:
- *
- *    recursive-adj --> multi-path-adj --> interface_A
- *                                     --> interface_B
- *
- * A packet traversing this FIB DP graph would thus also traverse a VPP node
- * graph of:
- *
- *    ipX_recursive --> ipX_rewrite --> interface_A_tx --> etc
- *
- * The taxonomy of objects in a FIB graph is as follows, consider;
- *
- *   A -->  
- *   B --> D
- *   C -->
- *
- * Where A,B and C are (for example) routes that resolve through D. 
- *  parent; D is the parent of A, B, and C.
- *  children: A, B, and C are children of D. 
- *  sibling: A, B and C are siblings of one another.
- *
- * All shared objects in the FIB are reference counted. Users of these objects
- * are thus expected to use the add_lock/unlock semantics (as one would
- * normally use malloc/free).
- *
- * WALKS
- *
- * It is necessary to walk/traverse the graph forwards (entry to interface) to
- * perform a collapse or build a recursive adj and backwards (interface
- * to entry) to perform updates, i.e. when interface state changes or when
- * recursive route resolution updates occur.
- * A forward walk follows simply by navigating an object's parent pointer to
- * access its parent object. For objects with multiple parents (e.g. a 
- * path-list), each parent is walked in turn.
- * To support back-walks direct dependencies are maintained between objects,
- * i.e. in the relationship, {A, B, C} --> D, then object D will maintain a list
- * of 'pointers' to its children {A, B, C}. Bare C-language pointers are not 
- * allowed, so a pointer is described in terms of an object type (i.e. entry,
- * path-list, etc) and index - this allows the object to be retrieved from the
- * appropriate pool. A list is maintained to achieve fast convergence at scale.
- * When there are millions or recursive prefixes, it is very inefficient to
- * blindly walk the tables looking for entries that were affected by a given
- * topology change. The lowest hanging fruit when optimising is to remove
- * actions that are not required, so all back-walks only traverse objects that
- * are directly affected by the change.
- *
- * PIC Core and fast-reroute rely on FIB reacting quickly to an interface
- * state change to update the multi-path-adjacencies that use this interface.
- * An example graph is shown below:
- *
- *    E_a -->
- *    E_b --> PL_2 --> P_a --> Interface_A
- *    ...          --> P_c -\
- *    E_k -->                \
- *                            Interface_K
- *                            /
- *    E_l -->                /
- *    E_m --> PL_1 --> P_d -/ 
- *    ...          --> P_f --> Interface_F
- *    E_z -->
- *
- * E  = fib_entry_t
- * PL = fib_path_list_t
- * P  = fib_path_t 
- * The subscripts are arbitrary and serve only to distinguish object instances.
- * This CP graph result in the following DP graph:
- *
- *     M-ADJ-2 --> Interface_A
- *             \
- *              -> Interface_K
- *             / 
- *     M-ADJ-1 --> Interface_F
- *
- * M-ADJ = multi-path-adjacency.
- *
- * When interface K goes down a back-walk is started over its dependants in the
- * control plane graph. This back-walk will reach PL_1 and PL_2 and result in
- * the calculation of new adjacencies that have interface K removed. The walk
- * will continue to the entry objects and thus the forwarding table is updated
- * for each prefix with the new adjacency. The DP graph then becomes:
- *
- *    ADJ-3 --> Interface_A
- *
- *    ADJ-4 --> Interface_F
- * 
- * The eBGP PIC scenarios described above relied on the update of a path-list's
- * recursive-adjacency to provide the shared point of cutover. This is shown
- * below
- *
- *    E_a -->
- *    E_b --> PL_2 --> P_a --> E_44 --> PL_a --> P_b --> Interface_A
- *    ...          --> P_c -\
- *    E_k -->                \
- *                            \
- *                           E_1 --> PL_k -> P_k --> Interface_K
- *                            /
- *    E_l -->                /
- *    E_m --> PL_1 --> P_d -/ 
- *    ...          --> P_f --> E_55 --> PL_e --> P_e --> Interface_E
- *    E_z -->
- *
- * The failure scenario is the removal of entry E_1 and thus the paths P_c and
- * P_d become unresolved. To achieve PIC the two shared recursive path-lists,
- * PL_1 and PL_2 must be updated to remove E_1 from the recursive-multi-path-
- * adjacencies that they contribute, before any entry E_a to E_z is updated.
- * This means that as the update propagates backwards (right to left) in the
- * graph it must do so breadth first not depth first. Note this approach leads
- * to convergence times that are dependent on the number of path-list and so
- * the number of combinations of egress PEs - this is desirable as this
- * scale is considerably lower than the number of prefixes.
- *
- * If we consider another section of the graph that is similar to the one
- * shown above where there is another prefix E_2 in a similar position to E_1
- * and so also has many dependent children. It is reasonable to expect that a
- * particular network failure may simultaneously render E_1 and E_2 unreachable.
- * This means that the update to withdraw E_2 is download immediately after the
- * update to withdraw E_1. It is a requirement on the FIB to not spend large
- * amounts of time in a back-walk whilst processing the update for E_1, i.e. the
- * back-walk must not reach as far as E_a and its siblings. Therefore, after the
- * back-walk has traversed one generation (breadth first) to update all the
- * path-lists it should be suspended/back-ground and further updates allowed
- * to be handled. Once the update queue is empty, the suspended walks can be
- * resumed. Note that in the case that multiple updates affect the same entry
- * (say E_1) then this will trigger multiple similar walks, these are merged,
- * so each child is updated only once.
- * In the presence of more layers of recursion PIC is still a desirable
- * feature. Consider an extension to the diagram above, where more recursive
- * routes (E_100 -> E_200) are added as children of E_a:
- *
- * E_100 -->
- * E_101 --> PL_3 --> P_j-\
- * ...                     \
- * E_199 -->               E_a -->
- *                         E_b --> PL_2 --> P_a --> E_44 --> ...etc..
- *                         ...          --> P_c -\
- *                         E_k                    \
- *                                                E_1 --> ...etc..
- *                                                 /
- *                         E_l -->                /
- *                         E_m --> PL_1 --> P_d -/ 
- *                         ...          --> P_e --> E_55 --> ...etc..
- *                         E_z -->
- *
- * To achieve PIC for the routes E_100->E_199, PL_3 needs to be updated before
- * E_b -> E_z, a breadth first traversal at each level would not achieve this.
- * Instead the walk must proceed intelligently. Children on PL_2 are sorted so
- * those Entry objects that themselves have children appear first in the list,
- * those without later. When an entry object is walked that has children, a
- * walk of its children is pushed to the front background queue. The back
- * ground queue is a priority queue. As the breadth first traversal proceeds
- * across the dependent entry object E_a to E_k, when the first entry that does
- * not have children is reached (E_b), the walk is suspended and placed at the
- * back of the queue. Following this prioritisation method shared path-list
- * updates are performed before all non-resolving entry objects.
- * The CPU/core/thread that handles the updates is the same thread that handles
- * the back-walks. Handling updates has a higher priority than making walk
- * progress, so a walk is required to be interruptable/suspendable when new
- * updates are available.
- * !!! TODO - this section describes how walks should be not how they are !!!
- *
- * In the diagram above E_100 is an IP route, however, VPP has no restrictions
- * on the type of object that can be a dependent of a FIB entry. Children of
- * a FIB entry can be (and are) GRE & VXLAN tunnels endpoints, L2VPN LSPs etc.
- * By including all object types into the graph and extending the back-walk, we
- * can thus deliver fast convergence to technologies that overlay on an IP
- * network.
- *
- * If having read all the above carefully you are still thinking;  'i don't need
- * all this %&$* i have a route only I know about and I just need to jam it in',
- * then fib_table_entry_special_add() is your only friend.
- */
-
-#ifndef __FIB_H__
-#define __FIB_H__
-
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/fib_entry.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/ip6_fib.h>
-
-#endif
diff --git a/vnet/vnet/fib/fib_api.h b/vnet/vnet/fib/fib_api.h
deleted file mode 100644
index f8275317..00000000
--- a/vnet/vnet/fib/fib_api.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __FIB_API_H__
-#define __FIB_API_H__
-
-
-int
-add_del_route_check (fib_protocol_t table_proto,
-		     u32 table_id,
-		     u32 next_hop_sw_if_index,
-		     fib_protocol_t next_hop_table_proto,
-		     u32 next_hop_table_id,
-		     u8 create_missing_tables,
-		     u32 * fib_index, u32 * next_hop_fib_index);
-
-int
-add_del_route_t_handler (u8 is_multipath,
-			 u8 is_add,
-			 u8 is_drop,
-			 u8 is_unreach,
-			 u8 is_prohibit,
-			 u8 is_local,
-			 u8 is_classify,
-			 u32 classify_table_index,
-			 u8 is_resolve_host,
-			 u8 is_resolve_attached,
-			 u32 fib_index,
-			 const fib_prefix_t * prefix,
-			 u8 next_hop_proto_is_ip4,
-			 const ip46_address_t * next_hop,
-			 u32 next_hop_sw_if_index,
-			 u8 next_hop_fib_index,
-			 u32 next_hop_weight,
-			 mpls_label_t next_hop_via_label,
-			 mpls_label_t * next_hop_out_label_stack);
-
-void
-copy_fib_next_hop (fib_route_path_encode_t * api_rpath,
-		   void * fp_arg);
-
-#endif /* __FIB_API_H__ */
diff --git a/vnet/vnet/fib/fib_attached_export.c b/vnet/vnet/fib/fib_attached_export.c
deleted file mode 100644
index c389ea43..00000000
--- a/vnet/vnet/fib/fib_attached_export.c
+++ /dev/null
@@ -1,572 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/fib/fib_entry.h>
-#include <vnet/fib/fib_table.h>
-
-#include <vnet/fib/fib_attached_export.h>
-#include <vnet/fib/fib_entry_cover.h>
-#include <vnet/fib/fib_entry_src.h>
-#include <vnet/fib/fib_entry_delegate.h>
-
-/**
- * A description of the need to import routes from the export table
- */
-typedef struct fib_ae_import_t_
-{
-    /**
-     * The entry in the epxort table that this importer
-     * is importing covereds from
-     */
-    fib_node_index_t faei_export_entry;
-
-    /**
-     * The attached entry in the import table
-     */
-    fib_node_index_t faei_import_entry;
-    /**
-     * the sibling index on the cover
-     */
-    u32 faei_export_sibling;
-
-    /**
-     * The index of the exporter tracker. Not set if the
-     * export entry is not valid for export
-     */
-    fib_node_index_t faei_exporter;
-
-    /**
-     * A vector/list of imported entry indicies
-     */
-    fib_node_index_t *faei_importeds;
-
-    /**
-     * The FIB index and prefix we are tracking
-     */
-    fib_node_index_t faei_export_fib;
-    fib_prefix_t faei_prefix;
-
-    /**
-     * The FIB index we are importing into
-     */
-    fib_node_index_t faei_import_fib;
-} fib_ae_import_t;
-
-/**
- * A description of the need to export routes to one or more export tables
- */
-typedef struct fib_ae_export_t_ {
-    /**
-     * The vector/list of import tracker indicies
-     */
-    fib_node_index_t *faee_importers;
-
-    /**
-     * THe connected entry this export is acting on behalf of
-     */
-    fib_node_index_t faee_ei;
-
-    /**
-     * Reference counting locks
-     */
-    u32 faee_locks;
-} fib_ae_export_t;
-
-/*
- * memory pools for the importers and exportes
- */
-static fib_ae_import_t *fib_ae_import_pool;
-static fib_ae_export_t *fib_ae_export_pool;
-
-static fib_ae_export_t *
-fib_entry_ae_add_or_lock (fib_node_index_t connected)
-{
-    fib_entry_delegate_t *fed;
-    fib_ae_export_t *export;
-    fib_entry_t *entry;
-
-    entry = fib_entry_get(connected);
-    fed = fib_entry_delegate_get(entry,
-                                 FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
-
-    if (NULL == fed)
-    {
-        fed = fib_entry_delegate_find_or_add(entry,
-                                             FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
-	pool_get(fib_ae_export_pool, export);
-	memset(export, 0, sizeof(*export));
-
-	fed->fd_index = (export - fib_ae_export_pool);
-	export->faee_ei = connected;
-    }
-    else
-    {
-	export = pool_elt_at_index(fib_ae_export_pool, fed->fd_index);
-    }
-
-    export->faee_locks++;
-
-    return (export);
-}
-
-static void
-fib_entry_import_remove (fib_ae_import_t *import,
-			 fib_node_index_t entry_index)
-{
-    fib_prefix_t prefix;
-    u32 index;
-
-    /*
-     * find the index in the vector of the entry we are removing
-     */
-    index = vec_search(import->faei_importeds, entry_index);
-
-    if (index < vec_len(import->faei_importeds))
-    {
-	/*
-	 * this is an entry that was previsouly imported
-	 */
-	fib_entry_get_prefix(entry_index, &prefix);
-
-	fib_table_entry_special_remove(import->faei_import_fib,
-				       &prefix,
-				       FIB_SOURCE_AE);
-
-	fib_entry_unlock(entry_index);
-	vec_del1(import->faei_importeds, index);
-    }
-}
-
-static void
-fib_entry_import_add (fib_ae_import_t *import,
-		      fib_node_index_t entry_index)
-{
-    fib_node_index_t *existing;
-    fib_prefix_t prefix;
-
-    /*
-     * ensure we only add the exported entry once, since
-     * sourcing prefixes in the table is reference counted
-     */
-    vec_foreach(existing, import->faei_importeds)
-    {
-	if (*existing == entry_index)
-	{
-	    return;
-	}
-    }
-
-    /*
-     * this is the first time this export entry has been imported
-     * Add it to the import FIB and to the list of importeds
-     */
-    fib_entry_get_prefix(entry_index, &prefix);
-
-    /*
-     * don't import entries that have the same prefix the import entry
-     */
-    if (0 != fib_prefix_cmp(&prefix,
-			    &import->faei_prefix))
-    {
-        const dpo_id_t *dpo;
-
-        dpo = fib_entry_contribute_ip_forwarding(entry_index);
-
-        if (dpo_id_is_valid(dpo))
-        {
-            fib_table_entry_special_dpo_add(import->faei_import_fib,
-                                            &prefix,
-                                            FIB_SOURCE_AE,
-                                            (fib_entry_get_flags(entry_index) |
-                                             FIB_ENTRY_FLAG_EXCLUSIVE),
-                                            load_balance_get_bucket(dpo->dpoi_index, 0));
-
-            fib_entry_lock(entry_index);
-            vec_add1(import->faei_importeds, entry_index);
-        }
-        /*
-         * else
-         *   the entry currently has no valid forwarding. when it
-         * does it will export itself
-         */
-    }
-}
-
-/**
- * Call back when walking a connected prefix's covered prefixes for import
- */
-static int
-fib_entry_covered_walk_import (fib_entry_t *cover,
-			       fib_node_index_t covered,
-			       void *ctx)
-{
-    fib_ae_import_t *import = ctx;
-
-    fib_entry_import_add(import, covered);
-
-    return (0);
-}
-
-/*
- * fib_entry_ae_import_add
- *
- * Add an importer to a connected entry
- */
-static void
-fib_ae_export_import_add (fib_ae_export_t *export,
-			  fib_ae_import_t *import)
-{
-    fib_entry_t *entry;
-
-    import->faei_exporter = (export - fib_ae_export_pool);
-    entry = fib_entry_get(export->faee_ei);
-
-    fib_entry_cover_walk(entry,
-			 fib_entry_covered_walk_import,
-			 import);
-}
-
-void
-fib_attached_export_import (fib_entry_t *fib_entry,
-			    fib_node_index_t export_fib)
-{
-    fib_entry_delegate_t *fed;
-    fib_ae_import_t *import;
-
-    pool_get(fib_ae_import_pool, import);
-
-    import->faei_import_fib = fib_entry->fe_fib_index;
-    import->faei_export_fib = export_fib;
-    import->faei_prefix = fib_entry->fe_prefix;
-    import->faei_import_entry = fib_entry_get_index(fib_entry);
-    import->faei_export_sibling = ~0;
-
-    /*
-     * do an exact match in the export table
-     */
-    import->faei_export_entry =
-	fib_table_lookup_exact_match(import->faei_export_fib,
-				     &import->faei_prefix);
-
-    if (FIB_NODE_INDEX_INVALID == import->faei_export_entry)
-    {
-	/*
-	 * no exact matching entry in the export table. can't be good.
-	 * track the next best thing
-	 */
-	import->faei_export_entry =
-	    fib_table_lookup(import->faei_export_fib,
-			     &import->faei_prefix);
-	import->faei_exporter = FIB_NODE_INDEX_INVALID;
-    }
-    else
-    {
-	/*
-	 * found the entry in the export table. import the
-	 * the prefixes that it covers.
-	 * only if the prefix found in the export FIB really is
-	 * attached do we want to import its covered
-	 */
-	if (FIB_ENTRY_FLAG_ATTACHED &
-	    fib_entry_get_flags_i(fib_entry_get(import->faei_export_entry)))
-	{
-	    fib_ae_export_t *export;
-
-	    export = fib_entry_ae_add_or_lock(import->faei_export_entry);
-	    vec_add1(export->faee_importers, (import - fib_ae_import_pool));
-	    fib_ae_export_import_add(export, import);
-	}
-    }
-
-    /*
-     * track the entry in the export table so we can update appropriately
-     * when it changes
-     */
-    import->faei_export_sibling =
-	fib_entry_cover_track(fib_entry_get(import->faei_export_entry),
-			      fib_entry_get_index(fib_entry));
-
-    fed = fib_entry_delegate_find_or_add(fib_entry,
-                                         FIB_ENTRY_DELEGATE_ATTACHED_IMPORT);
-    fed->fd_index = (import - fib_ae_import_pool);
-}
-
-/**
- * \brief All the imported entries need to be pruged
- */
-void
-fib_attached_export_purge (fib_entry_t *fib_entry)
-{
-    fib_entry_delegate_t *fed;
-
-    fed = fib_entry_delegate_get(fib_entry,
-                                 FIB_ENTRY_DELEGATE_ATTACHED_IMPORT);
-
-    if (NULL != fed)
-    {
- 	fib_node_index_t *import_index;
-	fib_entry_t *export_entry;
-	fib_ae_import_t *import;
-	fib_ae_export_t *export;
-
-	import = pool_elt_at_index(fib_ae_import_pool, fed->fd_index);
-
-	/*
-	 * remove each imported entry
-	 */
-	vec_foreach(import_index, import->faei_importeds)
-	{
-	    fib_prefix_t prefix;
-
-	    fib_entry_get_prefix(*import_index, &prefix);
-
-	    fib_table_entry_delete(import->faei_import_fib,
-				   &prefix,
-				   FIB_SOURCE_AE);
-	    fib_entry_unlock(*import_index);
-	}
-	vec_free(import->faei_importeds);
-
-	/*
-	 * stop tracking the export entry
-	 */
-	if (~0 != import->faei_export_sibling)
-	{
-	    fib_entry_cover_untrack(fib_entry_get(import->faei_export_entry),
-				    import->faei_export_sibling);
-	}
-	import->faei_export_sibling = ~0;
-
-	/*
-	 * remove this import tracker from the export's list,
-	 * if it is attached to one. It won't be in the case the tracked
-	 * export entry is not an attached exact match.
-	 */
-	if (FIB_NODE_INDEX_INVALID != import->faei_exporter)
-	{
-            fib_entry_delegate_t *fed;
-
-	    export_entry = fib_entry_get(import->faei_export_entry);
-
-            fed = fib_entry_delegate_get(export_entry,
-                                         FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
-            ASSERT(NULL != fed);
-
-	    export = pool_elt_at_index(fib_ae_export_pool, fed->fd_index);
-
-	    u32 index = vec_search(export->faee_importers,
-				   (import - fib_ae_import_pool));
-
-	    ASSERT(index < vec_len(export->faee_importers));
-	    vec_del1(export->faee_importers, index);
-
-	    /*
-	     * free the exporter if there are no longer importers
-	     */
-	    if (0 == --export->faee_locks)
-	    {
-		pool_put(fib_ae_export_pool, export);
-                fib_entry_delegate_remove(export_entry,
-                                          FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
-	    }
-	}
-
-	/*
-	 * free the import tracker
-	 */
-	pool_put(fib_ae_import_pool, import);
-        fib_entry_delegate_remove(fib_entry,
-                                  FIB_ENTRY_DELEGATE_ATTACHED_IMPORT);
-    }	
-}
-
-void
-fib_attached_export_covered_added (fib_entry_t *cover,
-				   fib_node_index_t covered)
-{
-    fib_entry_delegate_t *fed;
-
-    fed = fib_entry_delegate_get(cover,
-                                 FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
-
-    if (NULL != fed)
-    {
-	/*
-	 * the covering prefix is exporting to other tables
-	 */
- 	fib_node_index_t *import_index;
-	fib_ae_import_t *import;
-	fib_ae_export_t *export;
-
-	export = pool_elt_at_index(fib_ae_export_pool, fed->fd_index);
-
-	/*
-	 * export the covered entry to each of the importers
-	 */
-	vec_foreach(import_index, export->faee_importers)
-	{
-	    import = pool_elt_at_index(fib_ae_import_pool, *import_index);
-
-	    fib_entry_import_add(import, covered);
-	}
-    }
-}
-
-void
-fib_attached_export_covered_removed (fib_entry_t *cover,
-				     fib_node_index_t covered)
-{
-    fib_entry_delegate_t *fed;
-
-    fed = fib_entry_delegate_get(cover,
-                                 FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
-
-    if (NULL != fed)
-    {
-	/*
-	 * the covering prefix is exporting to other tables
-	 */
- 	fib_node_index_t *import_index;
-	fib_ae_import_t *import;
-	fib_ae_export_t *export;
-
-	export = pool_elt_at_index(fib_ae_export_pool, fed->fd_index);
-
-	/*
-	 * remove the covered entry from each of the importers
-	 */
-	vec_foreach(import_index, export->faee_importers)
-	{
-	    import = pool_elt_at_index(fib_ae_import_pool, *import_index);
-
-	    fib_entry_import_remove(import, covered);
-	}
-    }
-}
-
-static void
-fib_attached_export_cover_modified_i (fib_entry_t *fib_entry)
-{
-    fib_entry_delegate_t *fed;
-
-    fed = fib_entry_delegate_get(fib_entry,
-                                 FIB_ENTRY_DELEGATE_ATTACHED_IMPORT);
-
-    if (NULL != fed)
-    {
-	fib_ae_import_t *import;
-	u32 export_fib;
-
-	/*
-	 * safe the temporaries we need from the existing import
-	 * since it will be toast after the purge.
-	 */
-	import = pool_elt_at_index(fib_ae_import_pool, fed->fd_index);
-	export_fib = import->faei_export_fib;
-
-	/*
-	 * keep it simple. purge anything that was previously imported.
-	 * then re-evaluate the need to import.
-	 */
-	fib_attached_export_purge(fib_entry);
-	fib_attached_export_import(fib_entry, export_fib);
-    }
-}
-
-/**
- * \brief If this entry is tracking a cover (in another table)
- *        then that cover has changed. re-evaluate import.
- */
-void
-fib_attached_export_cover_change (fib_entry_t *fib_entry)
-{
-    fib_attached_export_cover_modified_i(fib_entry);
-}
-
-/**
- * \brief If this entry is tracking a cover (in another table)
- *        then that cover has been updated. re-evaluate import.
- */
-void
-fib_attached_export_cover_update (fib_entry_t *fib_entry)
-{
-    fib_attached_export_cover_modified_i(fib_entry);
-}
-
-u8*
-fib_ae_import_format (fib_entry_t *fib_entry,
-		      u8* s)
-{
-    fib_entry_delegate_t *fed;
-
-    fed = fib_entry_delegate_get(fib_entry,
-                                 FIB_ENTRY_DELEGATE_ATTACHED_IMPORT);
-
-    if (NULL != fed)
-    {
-	fib_node_index_t *index;
-	fib_ae_import_t *import;
-
-	import = pool_elt_at_index(fib_ae_import_pool, fed->fd_index);
-
-	s = format(s, "\n  Attached-Import:%d:[", (import - fib_ae_import_pool));
-	s = format(s, "export-prefix:%U ", format_fib_prefix, &import->faei_prefix);
-	s = format(s, "export-entry:%d ", import->faei_export_entry);
-	s = format(s, "export-sibling:%d ", import->faei_export_sibling);
-	s = format(s, "exporter:%d ", import->faei_exporter);
-	s = format(s, "export-fib:%d ", import->faei_export_fib);
-
-	s = format(s, "import-entry:%d ", import->faei_import_entry);
-	s = format(s, "import-fib:%d ", import->faei_import_fib);
-
-	s = format(s, "importeds:[");
-	vec_foreach(index, import->faei_importeds)
-	{
-	    s = format(s, "%d, ", *index);
-	}
-	    s = format(s, "]]");
-    }
-
-    return (s);
-}
-
-u8*
-fib_ae_export_format (fib_entry_t *fib_entry,
-		      u8* s)
-{
-    fib_entry_delegate_t *fed;
-
-    fed = fib_entry_delegate_get(fib_entry,
-                                 FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
-
-    if (NULL != fed)
-    {
-        fib_node_index_t *index;
-	fib_ae_export_t *export;
-
-	export = pool_elt_at_index(fib_ae_export_pool, fed->fd_list);
-    
-	s = format(s, "\n  Attached-Export:%d:[", (export - fib_ae_export_pool));
-	s = format(s, "export-entry:%d ", export->faee_ei);
-
-	s = format(s, "importers:[");
-	vec_foreach(index, export->faee_importers)
-	{
-	    s = format(s, "%d, ", *index);
-	}
-	s = format(s, "]]");
-    }
-    return (s);
-}
diff --git a/vnet/vnet/fib/fib_attached_export.h b/vnet/vnet/fib/fib_attached_export.h
deleted file mode 100644
index fa28a6e1..00000000
--- a/vnet/vnet/fib/fib_attached_export.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * FIB attached export
- *
- * what's it all about?
- * say one does this:
- *    set int ip table Gig0 2
- *    set int ip addr  Gig0 10.0.0.1/24
- * Ggi0 is in table 2 with a connected address.
- * Now we add a routing matching said connected in a different table
- *    ip route add table 3 10.0.0.0/24 via Gig0
- * How do we expect traffic in table 3 to be forwarded? Clearly out of
- * Ggi0. It's an attached route, hence we are saying that we can ARP for
- * hosts in the attached subnet. and we can. but any ARP entries we send
- * we be received on Gig0, but since Gig0 is in table 2, it will install
- * the adj-fins in table 2. So traffic in table 3 will never hit an adj-fib
- * and hence always the glean, and so thus be effectively dropped.
- * How do we fix this? Attached Export !! All more specfiic entries in table 2
- * that track and are covered by the connected are automatically exported into
- * table 3. Now table 3 also has adj-fibs (and the local) so traffic to hosts
- * is restored.
- */
-
-#ifndef __FIB_ATTACHED_EXPORT_H__
-#define __FIB_ATTACHED_EXPORT_H__
-
-#include <vnet/fib/fib_types.h>
-
-extern void fib_attached_export_import(fib_entry_t *fib_entry,
-				       fib_node_index_t export_fib);
-				       
-extern void fib_attached_export_purge(fib_entry_t *fib_entry);
-
-extern void fib_attached_export_covered_added(fib_entry_t *cover,
-					      fib_node_index_t covered);
-extern void fib_attached_export_covered_removed(fib_entry_t *cover,
-						fib_node_index_t covered);
-extern void fib_attached_export_cover_change(fib_entry_t *fib_entry);
-extern void fib_attached_export_cover_update(fib_entry_t *fib_entry);
-
-extern u8* fib_ae_import_format(fib_entry_t *fib_entry, u8*s);
-extern u8* fib_ae_export_format(fib_entry_t *fib_entry, u8*s);
-
-#endif
diff --git a/vnet/vnet/fib/fib_entry.c b/vnet/vnet/fib/fib_entry.c
deleted file mode 100644
index 24b50637..00000000
--- a/vnet/vnet/fib/fib_entry.c
+++ /dev/null
@@ -1,1503 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/ip/format.h>
-#include <vnet/ip/lookup.h>
-#include <vnet/adj/adj.h>
-#include <vnet/dpo/load_balance.h>
-#include <vnet/dpo/drop_dpo.h>
-
-#include <vnet/fib/fib_entry.h>
-#include <vnet/fib/fib_walk.h>
-#include <vnet/fib/fib_entry_src.h>
-#include <vnet/fib/fib_entry_cover.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/fib_internal.h>
-#include <vnet/fib/fib_attached_export.h>
-#include <vnet/fib/fib_path_ext.h>
-
-/*
- * Array of strings/names for the FIB sources
- */
-static const char *fib_source_names[] = FIB_SOURCES;
-static const char *fib_attribute_names[] = FIB_ENTRY_ATTRIBUTES;
-
-/*
- * Pool for all fib_entries
- */
-static fib_entry_t *fib_entry_pool;
-
-fib_entry_t *
-fib_entry_get (fib_node_index_t index)
-{
-    return (pool_elt_at_index(fib_entry_pool, index));
-}
-
-static fib_node_t *
-fib_entry_get_node (fib_node_index_t index)
-{
-    return ((fib_node_t*)fib_entry_get(index));
-}
-
-fib_node_index_t
-fib_entry_get_index (const fib_entry_t * fib_entry)
-{
-    return (fib_entry - fib_entry_pool);
-}
-
-static fib_protocol_t
-fib_entry_get_proto (const fib_entry_t * fib_entry)
-{
-    return (fib_entry->fe_prefix.fp_proto);
-}
-
-fib_forward_chain_type_t
-fib_entry_get_default_chain_type (const fib_entry_t *fib_entry)
-{
-    switch (fib_entry->fe_prefix.fp_proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
-    case FIB_PROTOCOL_IP6:
-	return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
-    case FIB_PROTOCOL_MPLS:
-	if (MPLS_EOS == fib_entry->fe_prefix.fp_eos)
-	    /*
-	     * If the entry being asked is a eos-MPLS label entry,
-	     * then use the payload-protocol field, that we stashed there
-	     * for just this purpose
-	     */
-	    return (fib_forw_chain_type_from_dpo_proto(
-			fib_entry->fe_prefix.fp_payload_proto));
-	else
-	    return (FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS);
-    }
-
-    return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
-}
-
-u8 *
-format_fib_entry (u8 * s, va_list * args)
-{
-    fib_forward_chain_type_t fct;
-    fib_entry_attribute_t attr;
-    fib_path_ext_t *path_ext;
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *src;
-    fib_node_index_t fei;
-    fib_source_t source;
-    u32 n_covered;
-    int level;
-
-    fei = va_arg (*args, fib_node_index_t);
-    level = va_arg (*args, int);
-    fib_entry = fib_entry_get(fei);
-
-    s = format (s, "%U", format_fib_prefix, &fib_entry->fe_prefix);
-
-    if (level >= FIB_ENTRY_FORMAT_DETAIL)
-    {
-	s = format (s, " fib:%d", fib_entry->fe_fib_index);
-	s = format (s, " index:%d", fib_entry_get_index(fib_entry));
-	s = format (s, " locks:%d", fib_entry->fe_node.fn_locks);
-
-	FOR_EACH_SRC_ADDED(fib_entry, src, source,
-        ({
-	    s = format (s, "\n  src:%s ",
-			fib_source_names[source]);
-	    s = fib_entry_src_format(fib_entry, source, s);
-	    s = format (s, " refs:%d ", src->fes_ref_count);
-	    if (FIB_ENTRY_FLAG_NONE != src->fes_entry_flags) {
-		s = format(s, "flags:");
-		FOR_EACH_FIB_ATTRIBUTE(attr) {
-		    if ((1<<attr) & src->fes_entry_flags) {
-			s = format (s, "%s,", fib_attribute_names[attr]);
-		    }
-		}
-	    }
-	    s = format (s, "\n");
-	    if (FIB_NODE_INDEX_INVALID != src->fes_pl)
-	    {
-		s = fib_path_list_format(src->fes_pl, s);
-	    }
-	    if (NULL != src->fes_path_exts)
-	    {
-		s = format(s, "    Extensions:");
-		vec_foreach(path_ext, src->fes_path_exts)
-		{
-		    s = format(s, "\n     %U", format_fib_path_ext, path_ext);
-		}
-	    }
-	}));
-    
-	n_covered = fib_entry_cover_get_size(fib_entry);
-	if (n_covered > 0) {
-	    s = format(s, "\n tracking %d covered: ", n_covered);
-	    s = fib_entry_cover_list_format(fib_entry, s);
-	}
-	s = fib_ae_import_format(fib_entry, s);
-	s = fib_ae_export_format(fib_entry, s);
-
-	s = format (s, "\n forwarding: ");
-    }
-    else
-    {
-	s = format (s, "\n");
-    }
-
-    fct = fib_entry_get_default_chain_type(fib_entry);
-
-    if (!dpo_id_is_valid(&fib_entry->fe_lb))
-    {
-	s = format (s, "  UNRESOLVED\n");
-	return (s);
-    }
-    else
-    {
-        s = format(s, "  %U-chain\n  %U",
-                   format_fib_forw_chain_type, fct,
-                   format_dpo_id,
-                   &fib_entry->fe_lb,
-                   2);
-        s = format(s, "\n");
-
-        if (level >= FIB_ENTRY_FORMAT_DETAIL2)
-        {
-            fib_entry_delegate_type_t fdt;
-            fib_entry_delegate_t *fed;
-
-            FOR_EACH_DELEGATE_CHAIN(fib_entry, fdt, fed,
-            {
-                s = format(s, "  %U-chain\n  %U",
-                           format_fib_forw_chain_type,
-                           fib_entry_delegate_type_to_chain_type(fdt),
-                           format_dpo_id, &fed->fd_dpo, 2);
-                s = format(s, "\n");
-            });
-        }
-    }
-
-    if (level >= FIB_ENTRY_FORMAT_DETAIL2)
-    {
-        s = format(s, "\nchildren:");
-        s = fib_node_children_format(fib_entry->fe_node.fn_children, s);
-    }
-
-    return (s);
-}
-
-static fib_entry_t*
-fib_entry_from_fib_node (fib_node_t *node)
-{
-#if CLIB_DEBUG > 0
-    ASSERT(FIB_NODE_TYPE_ENTRY == node->fn_type);
-#endif
-    return ((fib_entry_t*)node);
-}
-
-static void
-fib_entry_last_lock_gone (fib_node_t *node)
-{
-    fib_entry_delegate_type_t fdt;
-    fib_entry_delegate_t *fed;
-    fib_entry_t *fib_entry;
-
-    fib_entry = fib_entry_from_fib_node(node);
-
-    FOR_EACH_DELEGATE_CHAIN(fib_entry, fdt, fed,
-    {
-	dpo_reset(&fed->fd_dpo);
-        fib_entry_delegate_remove(fib_entry, fdt);
-    });
-
-    FIB_ENTRY_DBG(fib_entry, "last-lock");
-
-    fib_node_deinit(&fib_entry->fe_node);
-    // FIXME -RR Backwalk
-
-    ASSERT(0 == vec_len(fib_entry->fe_delegates));
-    vec_free(fib_entry->fe_delegates);
-    pool_put(fib_entry_pool, fib_entry);
-}
-
-static fib_entry_src_t*
-fib_entry_get_best_src_i (const fib_entry_t *fib_entry)
-{
-    fib_entry_src_t *bsrc;
-
-    /*
-     * the enum of sources is deliberately arranged in priority order
-     */
-    if (0 == vec_len(fib_entry->fe_srcs))
-    {
-	bsrc = NULL;
-    }
-    else
-    {
-	bsrc = vec_elt_at_index(fib_entry->fe_srcs, 0);
-    }
-
-    return (bsrc);
-}
-
-static fib_source_t
-fib_entry_src_get_source (const fib_entry_src_t *esrc)
-{
-    if (NULL != esrc)
-    {
-	return (esrc->fes_src);
-    }
-    return (FIB_SOURCE_MAX);
-}
-
-static fib_entry_flag_t
-fib_entry_src_get_flags (const fib_entry_src_t *esrc)
-{
-    if (NULL != esrc)
-    {
-	return (esrc->fes_entry_flags);
-    }
-    return (FIB_ENTRY_FLAG_NONE);
-}
-
-fib_entry_flag_t
-fib_entry_get_flags (fib_node_index_t fib_entry_index)
-{
-    return (fib_entry_get_flags_i(fib_entry_get(fib_entry_index)));
-}
-
-/*
- * fib_entry_back_walk_notify
- *
- * A back walk has reach this entry.
- */
-static fib_node_back_walk_rc_t
-fib_entry_back_walk_notify (fib_node_t *node,
-			    fib_node_back_walk_ctx_t *ctx)
-{
-    fib_entry_t *fib_entry;
-
-    fib_entry = fib_entry_from_fib_node(node);
-
-    if (FIB_NODE_BW_REASON_FLAG_EVALUATE & ctx->fnbw_reason        ||
-        FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE & ctx->fnbw_reason      ||
-        FIB_NODE_BW_REASON_FLAG_ADJ_DOWN & ctx->fnbw_reason        ||
-	FIB_NODE_BW_REASON_FLAG_INTERFACE_UP & ctx->fnbw_reason    ||
-	FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN & ctx->fnbw_reason  ||
-	FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE & ctx->fnbw_reason)
-    {
-	fib_entry_src_action_reactivate(fib_entry,
-                                        fib_entry_get_best_source(
-                                            fib_entry_get_index(fib_entry)));
-    }
-
-    /*
-     * all other walk types can be reclassifed to a re-evaluate to
-     * all recursive dependents.
-     * By reclassifying we ensure that should any of these walk types meet
-     * they can be merged.
-     */
-    ctx->fnbw_reason = FIB_NODE_BW_REASON_FLAG_EVALUATE;
-
-    /*
-     * ... and nothing is forced sync from now on.
-     */
-    ctx->fnbw_flags &= ~FIB_NODE_BW_FLAG_FORCE_SYNC;
-
-    /*
-     * propagate the backwalk further if we haven't already reached the
-     * maximum depth.
-     */
-    fib_walk_sync(FIB_NODE_TYPE_ENTRY,
-		  fib_entry_get_index(fib_entry),
-		  ctx);
-
-    return (FIB_NODE_BACK_WALK_CONTINUE);
-}
-
-static void
-fib_entry_show_memory (void)
-{
-    u32 n_srcs = 0, n_exts = 0;
-    fib_entry_src_t *esrc;
-    fib_entry_t *entry;
-
-    fib_show_memory_usage("Entry",
-			  pool_elts(fib_entry_pool),
-			  pool_len(fib_entry_pool),
-			  sizeof(fib_entry_t));
-
-    pool_foreach(entry, fib_entry_pool,
-    ({
-	n_srcs += vec_len(entry->fe_srcs);
-	vec_foreach(esrc, entry->fe_srcs)
-	{
-	    n_exts += vec_len(esrc->fes_path_exts);
-	}
-    }));
-
-    fib_show_memory_usage("Entry Source",
-			  n_srcs, n_srcs, sizeof(fib_entry_src_t));
-    fib_show_memory_usage("Entry Path-Extensions",
-			  n_exts, n_exts,
-			  sizeof(fib_path_ext_t));
-}
-
-/*
- * The FIB path-list's graph node virtual function table
- */
-static const fib_node_vft_t fib_entry_vft = {
-    .fnv_get = fib_entry_get_node,
-    .fnv_last_lock = fib_entry_last_lock_gone,
-    .fnv_back_walk = fib_entry_back_walk_notify,
-    .fnv_mem_show = fib_entry_show_memory,
-};
-
-/**
- * @brief Contribute the set of Adjacencies that this entry forwards with
- * to build the uRPF list of its children
- */
-void
-fib_entry_contribute_urpf (fib_node_index_t entry_index,
-			   index_t urpf)
-{
-    fib_entry_t *fib_entry;
-
-    fib_entry = fib_entry_get(entry_index);
-
-    return (fib_path_list_contribute_urpf(fib_entry->fe_parent, urpf));
-}
-
-/*
- * fib_entry_contribute_forwarding
- *
- * Get an lock the forwarding information (DPO) contributed by the FIB entry.
- */
-void
-fib_entry_contribute_forwarding (fib_node_index_t fib_entry_index,
-				 fib_forward_chain_type_t fct,
-				 dpo_id_t *dpo)
-{
-    fib_entry_delegate_t *fed;
-    fib_entry_t *fib_entry;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    if (fct == fib_entry_get_default_chain_type(fib_entry))
-    {
-        dpo_copy(dpo, &fib_entry->fe_lb);
-    }
-    else
-    {
-        fed = fib_entry_delegate_get(fib_entry,
-                                     fib_entry_chain_type_to_delegate_type(fct));
-
-        if (NULL == fed)
-        {
-            fed = fib_entry_delegate_find_or_add(
-                      fib_entry,
-                      fib_entry_chain_type_to_delegate_type(fct));
-            /*
-             * on-demand create eos/non-eos.
-             * There is no on-demand delete because:
-             *   - memory versus complexity & reliability:
-             *      leaving unrequired [n]eos LB arounds wastes memory, cleaning
-             *      then up on the right trigger is more code. i favour the latter.
-             */
-            fib_entry_src_mk_lb(fib_entry,
-                                fib_entry_get_best_src_i(fib_entry),
-                                fct,
-                                &fed->fd_dpo);
-        }
-
-        dpo_copy(dpo, &fed->fd_dpo);
-    }
-}
-
-const dpo_id_t *
-fib_entry_contribute_ip_forwarding (fib_node_index_t fib_entry_index)
-{
-    fib_forward_chain_type_t fct;
-    fib_entry_t *fib_entry;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-    fct = fib_entry_get_default_chain_type(fib_entry);
-
-    ASSERT((fct == FIB_FORW_CHAIN_TYPE_UNICAST_IP4 ||
-            fct == FIB_FORW_CHAIN_TYPE_UNICAST_IP6));
-
-    return (&fib_entry->fe_lb);
-}
-
-adj_index_t
-fib_entry_get_adj (fib_node_index_t fib_entry_index)
-{
-    const dpo_id_t *dpo;
-
-    dpo = fib_entry_contribute_ip_forwarding(fib_entry_index);
-    dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
-
-    if (dpo_is_adj(dpo))
-    {
-	return (dpo->dpoi_index);
-    }
-    return (ADJ_INDEX_INVALID);
-}
-
-fib_node_index_t
-fib_entry_get_path_list (fib_node_index_t fib_entry_index)
-{
-    fib_entry_t *fib_entry;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    return (fib_entry->fe_parent);
-}
-
-u32
-fib_entry_child_add (fib_node_index_t fib_entry_index,
-		     fib_node_type_t child_type,
-		     fib_node_index_t child_index)
-{
-    return (fib_node_child_add(FIB_NODE_TYPE_ENTRY,
-                               fib_entry_index,
-                               child_type,
-                               child_index));
-};
-
-void
-fib_entry_child_remove (fib_node_index_t fib_entry_index,
-			u32 sibling_index)
-{
-    fib_node_child_remove(FIB_NODE_TYPE_ENTRY,
-                          fib_entry_index,
-                          sibling_index);
-
-    if (0 == fib_node_get_n_children(FIB_NODE_TYPE_ENTRY,
-                                     fib_entry_index))
-    {
-        /*
-         * if there are no children left then there is no reason to keep
-         * the non-default forwarding chains. those chains are built only
-         * because the children want them.
-         */
-        fib_entry_delegate_type_t fdt;
-        fib_entry_delegate_t *fed;
-        fib_entry_t *fib_entry;
-
-        fib_entry = fib_entry_get(fib_entry_index);
-
-        FOR_EACH_DELEGATE_CHAIN(fib_entry, fdt, fed,
-        {
-            dpo_reset(&fed->fd_dpo);
-            fib_entry_delegate_remove(fib_entry, fdt);
-        });
-    }
-}
-
-static fib_entry_t *
-fib_entry_alloc (u32 fib_index,
-		 const fib_prefix_t *prefix,
-		 fib_node_index_t *fib_entry_index)
-{
-    fib_entry_t *fib_entry;
-    fib_prefix_t *fep;
-
-    pool_get(fib_entry_pool, fib_entry);
-    memset(fib_entry, 0, sizeof(*fib_entry));
-
-    fib_node_init(&fib_entry->fe_node,
-		  FIB_NODE_TYPE_ENTRY);
-
-    fib_entry->fe_fib_index = fib_index;
-
-    /*
-     * the one time we need to update the const prefix is when
-     * the entry is first created
-     */
-    fep = (fib_prefix_t*)&(fib_entry->fe_prefix);
-    *fep = *prefix;
-
-    if (FIB_PROTOCOL_MPLS == fib_entry->fe_prefix.fp_proto)
-    {
-	fep->fp_len = 21;
-	if (MPLS_NON_EOS == fep->fp_eos)
-	{
-	    fep->fp_payload_proto = DPO_PROTO_MPLS;
-	}
-    	ASSERT(DPO_PROTO_NONE != fib_entry->fe_prefix.fp_payload_proto);
-    }
-
-    dpo_reset(&fib_entry->fe_lb);
-
-    *fib_entry_index = fib_entry_get_index(fib_entry);
-
-    FIB_ENTRY_DBG(fib_entry, "alloc");
-
-    return (fib_entry);
-}
-
-static void
-fib_entry_post_flag_update_actions (fib_entry_t *fib_entry,
-				    fib_source_t source,
-				    fib_entry_flag_t old_flags)
-{
-    /*
-     * handle changes to attached export for import entries
-     */
-    int is_import  = (FIB_ENTRY_FLAG_IMPORT & fib_entry_get_flags_i(fib_entry));
-    int was_import = (FIB_ENTRY_FLAG_IMPORT & old_flags);
-
-    if (!was_import && is_import)
-    {
-	/*
-	 * transition from not exported to exported
-	 */
-
-	/*
-	 * there is an assumption here that the entry resolves via only
-	 * one interface and that it is the cross VRF interface.
-	 */
-	u32 sw_if_index = fib_path_list_get_resolving_interface(fib_entry->fe_parent);
-
-	fib_attached_export_import(fib_entry,
-				   fib_table_get_index_for_sw_if_index(
-				       fib_entry_get_proto(fib_entry),
-                                       sw_if_index));
-    }
-    else if (was_import && !is_import)
-    {
-	/*
-	 * transition from exported to not exported
-	 */
-	fib_attached_export_purge(fib_entry);
-    }
-    /*
-     * else
-     *   no change. nothing to do.
-     */
-
-    /*
-     * handle changes to attached export for export entries
-     */
-    int is_attached  = (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(fib_entry));
-    int was_attached = (FIB_ENTRY_FLAG_ATTACHED & old_flags);
-
-    if (!was_attached && is_attached)
-    {
-	/*
-	 * transition to attached. time to export
-	 */
-	// FIXME
-    }
-    // else FIXME
-}
-
-static void
-fib_entry_post_install_actions (fib_entry_t *fib_entry,
-				fib_source_t source,
-				fib_entry_flag_t old_flags)
-{
-    fib_entry_post_flag_update_actions(fib_entry, source, old_flags);
-    fib_entry_src_action_installed(fib_entry, source);
-}
-
-fib_node_index_t
-fib_entry_create (u32 fib_index,
-		  const fib_prefix_t *prefix,
-		  fib_source_t source,
-		  fib_entry_flag_t flags,
-		  const fib_route_path_t *paths)
-{
-    fib_node_index_t fib_entry_index;
-    fib_entry_t *fib_entry;
-
-    ASSERT(0 < vec_len(paths));
-
-    fib_entry = fib_entry_alloc(fib_index, prefix, &fib_entry_index);
-
-    /*
-     * since this is a new entry create, we don't need to check for winning
-     * sources - there is only one.
-     */
-    fib_entry = fib_entry_src_action_add(fib_entry, source, flags,
-                                         drop_dpo_get(
-                                             fib_proto_to_dpo(
-                                                 fib_entry_get_proto(fib_entry))));
-    fib_entry_src_action_path_swap(fib_entry,
-				   source,
-				   flags,
-				   paths);
-    /*
-     * handle possible realloc's by refetching the pointer
-     */
-    fib_entry = fib_entry_get(fib_entry_index);
-    fib_entry_src_action_activate(fib_entry, source);
-
-    fib_entry_post_install_actions(fib_entry, source, FIB_ENTRY_FLAG_NONE);
-
-    return (fib_entry_index);
-}
-
-fib_node_index_t
-fib_entry_create_special (u32 fib_index,
-			  const fib_prefix_t *prefix,
-			  fib_source_t source,
-			  fib_entry_flag_t flags,
-			  const dpo_id_t *dpo)
-{
-    fib_node_index_t fib_entry_index;
-    fib_entry_t *fib_entry;
-
-    /*
-     * create and initiliase the new enty
-     */
-    fib_entry = fib_entry_alloc(fib_index, prefix, &fib_entry_index);
-
-    /*
-     * create the path-list
-     */
-    fib_entry = fib_entry_src_action_add(fib_entry, source, flags, dpo);
-    fib_entry_src_action_activate(fib_entry, source);
-
-    fib_entry_post_install_actions(fib_entry, source, FIB_ENTRY_FLAG_NONE);
-
-    return (fib_entry_index);
-}
-
-static void
-fib_entry_post_update_actions (fib_entry_t *fib_entry,
-			       fib_source_t source,
-			       fib_entry_flag_t old_flags)
-{
-    /*
-     * backwalk to children to inform then of the change to forwarding.
-     */
-    fib_node_back_walk_ctx_t bw_ctx = {
-	.fnbw_reason = FIB_NODE_BW_REASON_FLAG_EVALUATE,
-    };
-
-    fib_walk_sync(FIB_NODE_TYPE_ENTRY, fib_entry_get_index(fib_entry), &bw_ctx);
-
-    /*
-     * then inform any covered prefixes
-     */
-    fib_entry_cover_update_notify(fib_entry);
-
-    fib_entry_post_install_actions(fib_entry, source, old_flags);
-}
-
-static void
-fib_entry_source_change (fib_entry_t *fib_entry,
-			 fib_source_t best_source,
-			 fib_source_t new_source,
-			 fib_entry_flag_t old_flags)
-{
-    /*
-     * if the path list for the source passed is invalid,
-     * then we need to create a new one. else we are updating
-     * an existing.
-     */
-    if (new_source < best_source)
-    {
-	/*
-	 * we have a new winning source.
-	 */
-	fib_entry_src_action_deactivate(fib_entry, best_source);
-	fib_entry_src_action_activate(fib_entry, new_source);
-    }
-    else if (new_source > best_source)
-    {
-	/*
-	 * the new source loses. nothing to do here.
-	 * the data from the source is saved in the path-list created
-	 */
-	return;
-    }
-    else
-    {
-	/*
-	 * the new source is one this entry already has.
-	 * But the path-list was updated, which will contribute new forwarding,
-	 * so install it.
-	 */
-	fib_entry_src_action_deactivate(fib_entry, new_source);
-	fib_entry_src_action_activate(fib_entry, new_source);
-    }
-
-    fib_entry_post_update_actions(fib_entry, new_source, old_flags);
-}
-
-void
-fib_entry_special_add (fib_node_index_t fib_entry_index,
-		       fib_source_t source,
-		       fib_entry_flag_t flags,
-		       const dpo_id_t *dpo)
-{
-    fib_source_t best_source;
-    fib_entry_flag_t bflags;
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *bsrc;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    bsrc = fib_entry_get_best_src_i(fib_entry);
-    best_source = fib_entry_src_get_source(bsrc);
-    bflags = fib_entry_src_get_flags(bsrc);
-
-    fib_entry = fib_entry_src_action_add(fib_entry, source, flags, dpo);
-    fib_entry_source_change(fib_entry, best_source, source, bflags);
-}
-
-void
-fib_entry_special_update (fib_node_index_t fib_entry_index,
-			  fib_source_t source,
-			  fib_entry_flag_t flags,
-			  const dpo_id_t *dpo)
-{
-    fib_source_t best_source;
-    fib_entry_flag_t bflags;
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *bsrc;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    bsrc = fib_entry_get_best_src_i(fib_entry);
-    best_source = fib_entry_src_get_source(bsrc);
-    bflags = fib_entry_src_get_flags(bsrc);
-
-    fib_entry = fib_entry_src_action_update(fib_entry, source, flags, dpo);
-    fib_entry_source_change(fib_entry, best_source, source, bflags);
-}
-
-
-void
-fib_entry_path_add (fib_node_index_t fib_entry_index,
-		    fib_source_t source,
-		    fib_entry_flag_t flags,
-		    const fib_route_path_t *rpath)
-{
-    fib_source_t best_source;
-    fib_entry_flag_t bflags;
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *bsrc;
-
-    ASSERT(1 == vec_len(rpath));
-
-    fib_entry = fib_entry_get(fib_entry_index);
-    ASSERT(NULL != fib_entry);
-
-    bsrc = fib_entry_get_best_src_i(fib_entry);
-    best_source = fib_entry_src_get_source(bsrc);
-    bflags = fib_entry_src_get_flags(bsrc);
-    
-    fib_entry = fib_entry_src_action_path_add(fib_entry, source, flags, rpath);
-
-    /*
-     * if the path list for the source passed is invalid,
-     * then we need to create a new one. else we are updating
-     * an existing.
-     */
-    if (source < best_source)
-    {
-	/*
-	 * we have a new winning source.
-	 */
-	fib_entry_src_action_deactivate(fib_entry, best_source);
-	fib_entry_src_action_activate(fib_entry, source);
-    }
-    else if (source > best_source)
-    {
-	/*
-	 * the new source loses. nothing to do here.
-	 * the data from the source is saved in the path-list created
-	 */
-	return;
-    }
-    else
-    {
-	/*
-	 * the new source is one this entry already has.
-	 * But the path-list was updated, which will contribute new forwarding,
-	 * so install it.
-	 */
-	fib_entry_src_action_deactivate(fib_entry, source);
-	fib_entry_src_action_activate(fib_entry, source);
-    }
-
-    fib_entry_post_update_actions(fib_entry, source, bflags);
-}
-
-/*
- * fib_entry_path_remove
- *
- * remove a path from the entry.
- * return the fib_entry's index if it is still present, INVALID otherwise.
- */
-fib_entry_src_flag_t
-fib_entry_path_remove (fib_node_index_t fib_entry_index,
-		       fib_source_t source,
-		       const fib_route_path_t *rpath)
-{
-    fib_entry_src_flag_t sflag;
-    fib_source_t best_source;
-    fib_entry_flag_t bflags;
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *bsrc;
-
-    ASSERT(1 == vec_len(rpath));
-
-    fib_entry = fib_entry_get(fib_entry_index);
-    ASSERT(NULL != fib_entry);
-
-    bsrc = fib_entry_get_best_src_i(fib_entry);
-    best_source = fib_entry_src_get_source(bsrc);
-    bflags = fib_entry_src_get_flags(bsrc);
-
-    sflag = fib_entry_src_action_path_remove(fib_entry, source, rpath);
-
-    /*
-     * if the path list for the source passed is invalid,
-     * then we need to create a new one. else we are updating
-     * an existing.
-     */
-    if (source < best_source )
-    {
-	/*
-	 * Que! removing a path from a source that is better than the
-	 * one this entry is using.
-	 */
-	ASSERT(0);
-    }
-    else if (source > best_source )
-    {
-	/*
-	 * the source is not the best. nothing to do.
-	 */
-	return (FIB_ENTRY_SRC_FLAG_ADDED);
-    }
-    else
-    {
-	/*
-	 * removing a path from the path-list we were using.
-	 */
-	if (!(FIB_ENTRY_SRC_FLAG_ADDED & sflag))
-	{
-	    /*
-	     * the last path from the source was removed.
-	     * fallback to lower source
-	     */
-	    bsrc = fib_entry_get_best_src_i(fib_entry);
-	    best_source = fib_entry_src_get_source(bsrc);
-
-	    if (FIB_SOURCE_MAX == best_source) {
-		/*
-		 * no more sources left. this entry is toast.
-		 */
-		fib_entry_src_action_uninstall(fib_entry);
-		fib_entry_post_flag_update_actions(fib_entry, source, bflags);
-
-		return (FIB_ENTRY_SRC_FLAG_NONE);
-	    }
-	    else
-	    {
-		fib_entry_src_action_activate(fib_entry, best_source);
-		source = best_source;
-	    }
-	}
-	else
-	{
-	    /*
-	     * re-install the new forwarding information
-	     */
-	    fib_entry_src_action_deactivate(fib_entry, source);
-	    fib_entry_src_action_activate(fib_entry, source);
-	}
-    }
-
-    fib_entry_post_update_actions(fib_entry, source, bflags);
-
-    /*
-     * still have sources
-     */
-    return (FIB_ENTRY_SRC_FLAG_ADDED);
-}
-
-/*
- * fib_entry_special_remove
- *
- * remove a special source from the entry.
- * return the fib_entry's index if it is still present, INVALID otherwise.
- */
-fib_entry_src_flag_t
-fib_entry_special_remove (fib_node_index_t fib_entry_index,
-			  fib_source_t source)
-{
-    fib_entry_src_flag_t sflag;
-    fib_source_t best_source;
-    fib_entry_flag_t bflags;
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *bsrc;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-    ASSERT(NULL != fib_entry);
-
-    bsrc = fib_entry_get_best_src_i(fib_entry);
-    best_source = fib_entry_src_get_source(bsrc);
-    bflags = fib_entry_src_get_flags(bsrc);
-
-    sflag = fib_entry_src_action_remove(fib_entry, source);
-
-    /*
-     * if the path list for the source passed is invalid,
-     * then we need to create a new one. else we are updating
-     * an existing.
-     */
-    if (source < best_source )
-    {
-	/*
-	 * Que! removing a path from a source that is better than the
-	 * one this entry is using. This can only mean it is a source
-         * this prefix does not have.
-	 */
-        return (FIB_ENTRY_SRC_FLAG_ADDED);
-    }
-    else if (source > best_source ) {
-	/*
-	 * the source is not the best. nothing to do.
-	 */
-	return (FIB_ENTRY_SRC_FLAG_ADDED);
-    }
-    else
-    {
-	if (!(FIB_ENTRY_SRC_FLAG_ADDED & sflag))
-	{
-	    /*
-	     * the source was removed. use the next best.
-	     */
-	    bsrc = fib_entry_get_best_src_i(fib_entry);
-	    best_source = fib_entry_src_get_source(bsrc);
-
-	    if (FIB_SOURCE_MAX == best_source) {
-		/*
-		 * no more sources left. this entry is toast.
-		 */
-		fib_entry_src_action_uninstall(fib_entry);
-		fib_entry_post_flag_update_actions(fib_entry, source, bflags);
-
-		return (FIB_ENTRY_SRC_FLAG_NONE);
-	    }
-	    else
-	    {
-		fib_entry_src_action_activate(fib_entry, best_source);
-		source = best_source;
-	    }
-	}
-	else
-	{
-	    /*
-	     * re-install the new forwarding information
-	     */
-	    fib_entry_src_action_reactivate(fib_entry, source);
-	}
-    }
-
-    fib_entry_post_update_actions(fib_entry, source, bflags);
-
-    /*
-     * still have sources
-     */
-    return (FIB_ENTRY_SRC_FLAG_ADDED);
-}
-
-/**
- * fib_entry_delete
- *
- * The source is withdrawing all the paths it provided
- */
-fib_entry_src_flag_t
-fib_entry_delete (fib_node_index_t fib_entry_index,
-		  fib_source_t source)
-{
-    return (fib_entry_special_remove(fib_entry_index, source));
-}
-
-/**
- * fib_entry_update
- *
- * The source has provided a new set of paths that will replace the old.
- */
-void
-fib_entry_update (fib_node_index_t fib_entry_index,
-		  fib_source_t source,
-		  fib_entry_flag_t flags,
-		  const fib_route_path_t *paths)
-{
-    fib_source_t best_source;
-    fib_entry_flag_t bflags;
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *bsrc;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-    ASSERT(NULL != fib_entry);
-
-    bsrc = fib_entry_get_best_src_i(fib_entry);
-    best_source = fib_entry_src_get_source(bsrc);
-    bflags = fib_entry_src_get_flags(bsrc);
-
-    fib_entry_src_action_path_swap(fib_entry,
-				   source,
-				   flags,
-				   paths);
-    /*
-     * handle possible realloc's by refetching the pointer
-     */
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    /*
-     * if the path list for the source passed is invalid,
-     * then we need to create a new one. else we are updating
-     * an existing.
-     */
-    if (source < best_source)
-    {
-	/*
-	 * we have a new winning source.
-	 */
-	fib_entry_src_action_deactivate(fib_entry, best_source);
-	fib_entry_src_action_activate(fib_entry, source);
-    }
-    else if (source > best_source) {
-	/*
-	 * the new source loses. nothing to do here.
-	 * the data from the source is saved in the path-list created
-	 */
-	return;
-    }
-    else
-    {
-	/*
-	 * the new source is one this entry already has.
-	 * But the path-list was updated, which will contribute new forwarding,
-	 * so install it.
-	 */
-	fib_entry_src_action_deactivate(fib_entry, source);
-	fib_entry_src_action_activate(fib_entry, source);
-    }
-
-    fib_entry_post_update_actions(fib_entry, source, bflags);
-}
-
-
-/*
- * fib_entry_cover_changed
- *
- * this entry is tracking its cover and that cover has changed.
- */
-void
-fib_entry_cover_changed (fib_node_index_t fib_entry_index)
-{
-    fib_entry_src_cover_res_t res = {
-	.install = !0,
-	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
-    };
-    fib_source_t source, best_source;
-    fib_entry_flag_t bflags;
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *esrc;
-    u32 index;
-
-    bflags = FIB_ENTRY_FLAG_NONE;
-    best_source = FIB_SOURCE_FIRST;
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    fib_attached_export_cover_change(fib_entry);
-
-    /*
-     * propagate the notificuation to each of the added sources
-     */
-    index = 0;
-    FOR_EACH_SRC_ADDED(fib_entry, esrc, source,
-    ({
-	if (0 == index)
-	{
-	    /*
-	     * only the best source gets to set the back walk flags
-	     */
-	    res = fib_entry_src_action_cover_change(fib_entry, source);
-            bflags = fib_entry_src_get_flags(esrc);
-            best_source = fib_entry_src_get_source(esrc);
-	}
-	else
-	{
-	    fib_entry_src_action_cover_change(fib_entry, source);
-	}
-	index++;
-    }));
-
-    if (res.install)
-    {
-	fib_entry_src_action_reactivate(fib_entry,
-					fib_entry_src_get_source(
-					    fib_entry_get_best_src_i(fib_entry)));
-        fib_entry_post_install_actions(fib_entry, best_source, bflags);
-    }
-    else
-    {
-	fib_entry_src_action_uninstall(fib_entry);
-    }
-
-    if (FIB_NODE_BW_REASON_FLAG_NONE != res.bw_reason)
-    {
-	/*
-	 * time for walkies fido.
-	 */
-	fib_node_back_walk_ctx_t bw_ctx = {
-	    .fnbw_reason = res.bw_reason,
-        };
-
-	fib_walk_sync(FIB_NODE_TYPE_ENTRY, fib_entry_index, &bw_ctx);
-    }
-}
-
-/*
- * fib_entry_cover_updated
- *
- * this entry is tracking its cover and that cover has been updated
- * (i.e. its forwarding information has changed).
- */
-void
-fib_entry_cover_updated (fib_node_index_t fib_entry_index)
-{
-    fib_entry_src_cover_res_t res = {
-	.install = !0,
-	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
-    };
-    fib_source_t source, best_source;
-    fib_entry_flag_t bflags;
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *esrc;
-    u32 index;
-
-    bflags = FIB_ENTRY_FLAG_NONE;
-    best_source = FIB_SOURCE_FIRST;
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    fib_attached_export_cover_update(fib_entry);
-
-    /*
-     * propagate the notificuation to each of the added sources
-     */
-    index = 0;
-    FOR_EACH_SRC_ADDED(fib_entry, esrc, source,
-    ({
-	if (0 == index)
-	{
-	    /*
-	     * only the best source gets to set the back walk flags
-	     */
-	    res = fib_entry_src_action_cover_update(fib_entry, source);
-            bflags = fib_entry_src_get_flags(esrc);
-            best_source = fib_entry_src_get_source(esrc);
-	}
-	else
-	{
-	    fib_entry_src_action_cover_update(fib_entry, source);
-	}
-	index++;
-    }));
-
-    if (res.install)
-    {
-	fib_entry_src_action_reactivate(fib_entry,
-					fib_entry_src_get_source(
-					    fib_entry_get_best_src_i(fib_entry)));
-        fib_entry_post_install_actions(fib_entry, best_source, bflags);
-    }
-    else
-    {
-	fib_entry_src_action_uninstall(fib_entry);
-    }
-
-    if (FIB_NODE_BW_REASON_FLAG_NONE != res.bw_reason)
-    {
-	/*
-	 * time for walkies fido.
-	 */
-	fib_node_back_walk_ctx_t bw_ctx = {
-	    .fnbw_reason = res.bw_reason,
-        };
-
-	fib_walk_sync(FIB_NODE_TYPE_ENTRY, fib_entry_index, &bw_ctx);
-    }
-}
-
-int
-fib_entry_recursive_loop_detect (fib_node_index_t entry_index,
-				 fib_node_index_t **entry_indicies)
-{
-    fib_entry_t *fib_entry;
-    int was_looped, is_looped;
-
-    fib_entry = fib_entry_get(entry_index);
-
-    if (FIB_NODE_INDEX_INVALID != fib_entry->fe_parent)
-    {
-	fib_node_index_t *entries = *entry_indicies;
-
-	vec_add1(entries, entry_index);
-	was_looped = fib_path_list_is_looped(fib_entry->fe_parent);
-	is_looped = fib_path_list_recursive_loop_detect(fib_entry->fe_parent,
-							&entries);
-
-	*entry_indicies = entries;
-
-	if (!!was_looped != !!is_looped)
-	{
-	    /*
-	     * re-evaluate all the entry's forwarding
-	     * NOTE: this is an inplace modify
-	     */
-            fib_entry_delegate_type_t fdt;
-            fib_entry_delegate_t *fed;
-
-            FOR_EACH_DELEGATE_CHAIN(fib_entry, fdt, fed,
-            {
-                fib_entry_src_mk_lb(fib_entry,
-                                    fib_entry_get_best_src_i(fib_entry),
-                                    fib_entry_delegate_type_to_chain_type(fdt),
-                                    &fed->fd_dpo);
-	    });
-	}
-    }
-    else
-    {
-	/*
-	 * the entry is currently not linked to a path-list. this happens
-	 * when it is this entry that is re-linking path-lists and has thus
-	 * broken the loop
-	 */
-	is_looped = 0;
-    }
-
-    return (is_looped);
-}
-
-u32
-fib_entry_get_resolving_interface (fib_node_index_t entry_index)
-{
-    fib_entry_t *fib_entry;
-
-    fib_entry = fib_entry_get(entry_index);
-
-    return (fib_path_list_get_resolving_interface(fib_entry->fe_parent));
-}
-
-fib_source_t
-fib_entry_get_best_source (fib_node_index_t entry_index)
-{
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *bsrc;
-
-    fib_entry = fib_entry_get(entry_index);
-
-    bsrc = fib_entry_get_best_src_i(fib_entry);
-    return (fib_entry_src_get_source(bsrc));
-}
-
-static int
-fib_ip4_address_compare (const ip4_address_t * a1,
-                         const ip4_address_t * a2)
-{
-    /*
-     * IP addresses are unsiged ints. the return value here needs to be signed
-     * a simple subtraction won't cut it.
-     * If the addresses are the same, the sort order is undefiend, so phoey.
-     */
-    return ((clib_net_to_host_u32(a1->data_u32) >
-	     clib_net_to_host_u32(a2->data_u32) ) ?
-	    1 : -1);
-}
-
-static int
-fib_ip6_address_compare (const ip6_address_t * a1,
-                         const ip6_address_t * a2)
-{
-  int i;
-  for (i = 0; i < ARRAY_LEN (a1->as_u16); i++)
-  {
-      int cmp = (clib_net_to_host_u16 (a1->as_u16[i]) -
-		 clib_net_to_host_u16 (a2->as_u16[i]));
-      if (cmp != 0)
-	  return cmp;
-  }
-  return 0;
-}
-
-static int
-fib_entry_cmp (fib_node_index_t fib_entry_index1,
-	       fib_node_index_t fib_entry_index2)
-{
-    fib_entry_t *fib_entry1, *fib_entry2;
-    int cmp = 0;
-
-    fib_entry1 = fib_entry_get(fib_entry_index1);
-    fib_entry2 = fib_entry_get(fib_entry_index2);
-
-    switch (fib_entry1->fe_prefix.fp_proto)
-    {
-    case FIB_PROTOCOL_IP4:
-        cmp = fib_ip4_address_compare(&fib_entry1->fe_prefix.fp_addr.ip4,
-                                      &fib_entry2->fe_prefix.fp_addr.ip4);
-        break;
-    case FIB_PROTOCOL_IP6:
-        cmp = fib_ip6_address_compare(&fib_entry1->fe_prefix.fp_addr.ip6,
-                                      &fib_entry2->fe_prefix.fp_addr.ip6);
-        break;
-    case FIB_PROTOCOL_MPLS:
-	cmp = (fib_entry1->fe_prefix.fp_label - fib_entry2->fe_prefix.fp_label);
-
-	if (0 == cmp)
-	{
-	    cmp = (fib_entry1->fe_prefix.fp_eos - fib_entry2->fe_prefix.fp_eos);
-	}
-        break;
-    }
-
-    if (0 == cmp) {
-	cmp = (fib_entry1->fe_prefix.fp_len - fib_entry2->fe_prefix.fp_len);
-    }
-    return (cmp);   
-}
-
-int
-fib_entry_cmp_for_sort (void *i1, void *i2)
-{
-    fib_node_index_t *fib_entry_index1 = i1, *fib_entry_index2 = i2;
-
-    return (fib_entry_cmp(*fib_entry_index1,
-			  *fib_entry_index2));
-}
-
-void
-fib_entry_lock (fib_node_index_t fib_entry_index)
-{
-    fib_entry_t *fib_entry;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    fib_node_lock(&fib_entry->fe_node);
-}
-
-void
-fib_entry_unlock (fib_node_index_t fib_entry_index)
-{
-    fib_entry_t *fib_entry;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    fib_node_unlock(&fib_entry->fe_node);
-}
-
-void
-fib_entry_module_init (void)
-{
-    fib_node_register_type (FIB_NODE_TYPE_ENTRY, &fib_entry_vft);
-}
-
-void
-fib_entry_encode (fib_node_index_t fib_entry_index,
-		  fib_route_path_encode_t **api_rpaths)
-{
-    fib_entry_t *fib_entry;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-    fib_path_list_walk(fib_entry->fe_parent, fib_path_encode, api_rpaths);
-}
-
-void
-fib_entry_get_prefix (fib_node_index_t fib_entry_index,
-		      fib_prefix_t *pfx)
-{
-    fib_entry_t *fib_entry;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-    *pfx = fib_entry->fe_prefix;
-}
-
-u32
-fib_entry_get_fib_index (fib_node_index_t fib_entry_index)
-{
-    fib_entry_t *fib_entry;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    return (fib_entry->fe_fib_index);
-}
-
-u32
-fib_entry_pool_size (void)
-{
-    return (pool_elts(fib_entry_pool));
-}
-
-static clib_error_t *
-show_fib_entry_command (vlib_main_t * vm,
-			unformat_input_t * input,
-			vlib_cli_command_t * cmd)
-{
-    fib_node_index_t fei;
-
-    if (unformat (input, "%d", &fei))
-    {
-	/*
-	 * show one in detail
-	 */
-	if (!pool_is_free_index(fib_entry_pool, fei))
-	{
-	    vlib_cli_output (vm, "%d@%U",
-			     fei,
-			     format_fib_entry, fei,
-			     FIB_ENTRY_FORMAT_DETAIL2);
-	}
-	else
-	{
-	    vlib_cli_output (vm, "entry %d invalid", fei);
-	}
-    }
-    else
-    {
-	/*
-	 * show all
-	 */
-	vlib_cli_output (vm, "FIB Entries:");
-	pool_foreach_index(fei, fib_entry_pool,
-        ({
-	    vlib_cli_output (vm, "%d@%U",
-			     fei,
-			     format_fib_entry, fei,
-			     FIB_ENTRY_FORMAT_BRIEF);
-	}));
-    }
-
-    return (NULL);
-}
-
-VLIB_CLI_COMMAND (show_fib_entry, static) = {
-  .path = "show fib entry",
-  .function = show_fib_entry_command,
-  .short_help = "show fib entry",
-};
diff --git a/vnet/vnet/fib/fib_entry.h b/vnet/vnet/fib/fib_entry.h
deleted file mode 100644
index 44a5f2e6..00000000
--- a/vnet/vnet/fib/fib_entry.h
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __FIB_ENTRY_H__
-#define __FIB_ENTRY_H__
-
-#include <vnet/fib/fib_node.h>
-#include <vnet/fib/fib_entry_delegate.h>
-#include <vnet/adj/adj.h>
-#include <vnet/ip/ip.h>
-#include <vnet/dpo/dpo.h>
-
-/**
- * The different sources that can create a route.
- * The sources are defined here the thier relative priority order.
- * The lower the value the higher the priority
- */
-typedef enum fib_source_t_ {
-    /**
-     * Marker. Add new values after this one.
-     */
-    FIB_SOURCE_FIRST,
-    /**
-     * Special sources. These are for entries that are added to all
-     * FIBs by default, and should never be over-ridden (hence they
-     * are the highest priority)
-     */
-    FIB_SOURCE_SPECIAL = FIB_SOURCE_FIRST,
-    /**
-     * Classify. A route that links directly to a classify adj
-     */
-    FIB_SOURCE_CLASSIFY,
-    /**
-     * Route added as a result of interface configuration.
-     * this will also come from the API/CLI, but the distinction is
-     * that is from confiiguration on an interface, not a 'ip route' command
-     */
-    FIB_SOURCE_INTERFACE,
-    /**
-     * A high priority source a plugin can use
-     */
-    FIB_SOURCE_PLUGIN_HI,
-    /**
-     * From the control plane API
-     */
-    FIB_SOURCE_API,
-    /**
-     * From the CLI.
-     */
-    FIB_SOURCE_CLI,
-    /**
-     * LISP
-     */
-    FIB_SOURCE_LISP,
-    /**
-     * SRv6
-     */
-    FIB_SOURCE_SR,
-    /**
-     * IPv[46] Mapping
-     */
-    FIB_SOURCE_MAP,
-    /**
-     * SIXRD
-     */
-    FIB_SOURCE_SIXRD,
-    /**
-     * DHCP
-     */
-    FIB_SOURCE_DHCP,
-    /**
-     * Adjacency source.
-     * routes created as a result of ARP/ND entries. This is lower priority
-     * then the API/CLI. This is on purpose. trust me.
-     */
-    FIB_SOURCE_ADJ,
-    /**
-     * MPLS label. The prefix has been assigned a local label. This source
-     * never provides forwarding information, instead it acts as a place-holder
-     * so the association of label to prefix can be maintained
-     */
-    FIB_SOURCE_MPLS,
-    /**
-     * Attached Export source.
-     * routes created as a result of attahced export. routes thus sourced
-     * will be present in the export tables
-     */
-    FIB_SOURCE_AE,
-    /**
-     * Recursive resolution source.
-     * Used to install an entry that is the resolution traget of another.
-     */
-    FIB_SOURCE_RR,
-    /**
-     * uRPF bypass/exemption.
-     * Used to install an entry that is exempt from the loose uRPF check
-     */
-    FIB_SOURCE_URPF_EXEMPT,
-    /**
-     * The default route source.
-     * The default route is always added to the FIB table (like the
-     * special sources) but we need to be able to over-ride it with
-     * 'ip route' sources when provided
-     */
-    FIB_SOURCE_DEFAULT_ROUTE,
-    /**
-     * Marker. add new entries before this one.
-     */
-    FIB_SOURCE_LAST = FIB_SOURCE_DEFAULT_ROUTE,
-} __attribute__ ((packed)) fib_source_t;
-
-STATIC_ASSERT (sizeof(fib_source_t) == 1,
-	       "FIB too many sources");
-
-/**
- * The maximum number of sources
- */
-#define FIB_SOURCE_MAX (FIB_SOURCE_LAST+1)
-
-#define FIB_SOURCES {					\
-    [FIB_SOURCE_SPECIAL] = "special",			\
-    [FIB_SOURCE_INTERFACE] = "interface",		\
-    [FIB_SOURCE_API] = "API",			        \
-    [FIB_SOURCE_CLI] = "CLI",			        \
-    [FIB_SOURCE_ADJ] = "adjacency",			\
-    [FIB_SOURCE_MAP] = "MAP",			        \
-    [FIB_SOURCE_SR] = "SR",			        \
-    [FIB_SOURCE_SIXRD] = "SixRD",			\
-    [FIB_SOURCE_LISP] = "LISP", 			\
-    [FIB_SOURCE_CLASSIFY] = "classify",			\
-    [FIB_SOURCE_DHCP] = "DHCP",   			\
-    [FIB_SOURCE_RR] = "recursive-resolution",	        \
-    [FIB_SOURCE_AE] = "attached_export",	        \
-    [FIB_SOURCE_MPLS] = "mpls",           	        \
-    [FIB_SOURCE_URPF_EXEMPT] = "urpf-exempt",	        \
-    [FIB_SOURCE_DEFAULT_ROUTE] = "default-route",	\
-}
-
-#define FOR_EACH_FIB_SOURCE(_item) \
-    for (_item = FIB_SOURCE_FIRST; _item < FIB_SOURCE_MAX; _item++)
-
-/**
- * The different sources that can create a route.
- * The sources are defined here the thier relative priority order.
- * The lower the value the higher the priority
- */
-typedef enum fib_entry_attribute_t_ {
-    /**
-     * Marker. Add new values after this one.
-     */
-    FIB_ENTRY_ATTRIBUTE_FIRST,
-    /**
-     * Connected. The prefix is configured on an interface.
-     */
-    FIB_ENTRY_ATTRIBUTE_CONNECTED = FIB_ENTRY_ATTRIBUTE_FIRST,
-    /**
-     * Attached. The prefix is attached to an interface.
-     */
-    FIB_ENTRY_ATTRIBUTE_ATTACHED,
-    /**
-     * The route is an explicit drop.
-     */
-    FIB_ENTRY_ATTRIBUTE_DROP,
-    /**
-     * The route is exclusive. The client creating the route is
-     * providing an exclusive adjacency.
-     */
-    FIB_ENTRY_ATTRIBUTE_EXCLUSIVE,
-    /**
-     * The route is attached cross tables and thus imports covered
-     * prefixes from the other table.
-     */
-    FIB_ENTRY_ATTRIBUTE_IMPORT,
-    /**
-     * The prefix/address is local to this device
-     */
-    FIB_ENTRY_ATTRIBUTE_LOCAL,
-    /**
-     * Marker. add new entries before this one.
-     */
-    FIB_ENTRY_ATTRIBUTE_LAST = FIB_ENTRY_ATTRIBUTE_LOCAL,
-} fib_entry_attribute_t;
-
-/**
- * The maximum number of sources
- */
-#define FIB_ENTRY_ATTRIBUTE_MAX (FIB_ENTRY_ATTRIBUTE_LAST+1)
-
-#define FIB_ENTRY_ATTRIBUTES {		       		\
-    [FIB_ENTRY_ATTRIBUTE_CONNECTED] = "connected",	\
-    [FIB_ENTRY_ATTRIBUTE_ATTACHED]  = "attached",	\
-    [FIB_ENTRY_ATTRIBUTE_IMPORT]    = "import",	        \
-    [FIB_ENTRY_ATTRIBUTE_DROP]      = "drop",		\
-    [FIB_ENTRY_ATTRIBUTE_EXCLUSIVE] = "exclusive",      \
-    [FIB_ENTRY_ATTRIBUTE_LOCAL]     = "local",		\
-}
-
-#define FOR_EACH_FIB_ATTRIBUTE(_item)			\
-    for (_item = FIB_ENTRY_ATTRIBUTE_FIRST;		\
-	 _item < FIB_ENTRY_ATTRIBUTE_MAX;		\
-	 _item++)
-
-typedef enum fib_entry_flag_t_ {
-    FIB_ENTRY_FLAG_NONE      = 0,
-    FIB_ENTRY_FLAG_CONNECTED = (1 << FIB_ENTRY_ATTRIBUTE_CONNECTED),
-    FIB_ENTRY_FLAG_ATTACHED  = (1 << FIB_ENTRY_ATTRIBUTE_ATTACHED),
-    FIB_ENTRY_FLAG_DROP      = (1 << FIB_ENTRY_ATTRIBUTE_DROP),
-    FIB_ENTRY_FLAG_EXCLUSIVE = (1 << FIB_ENTRY_ATTRIBUTE_EXCLUSIVE),
-    FIB_ENTRY_FLAG_LOCAL     = (1 << FIB_ENTRY_ATTRIBUTE_LOCAL),
-    FIB_ENTRY_FLAG_IMPORT    = (1 << FIB_ENTRY_ATTRIBUTE_IMPORT),
-} fib_entry_flag_t;
-
-/**
- * Flags for the source data
- */
-typedef enum fib_entry_src_attribute_t_ {
-    /**
-     * Marker. Add new values after this one.
-     */
-    FIB_ENTRY_SRC_ATTRIBUTE_FIRST,
-    /**
-     * the source has been added to the entry
-     */
-    FIB_ENTRY_SRC_ATTRIBUTE_ADDED = FIB_ENTRY_SRC_ATTRIBUTE_FIRST,
-    /**
-     * the source is active/best
-     */
-    FIB_ENTRY_SRC_ATTRIBUTE_ACTIVE,
-    /**
-     * Marker. add new entries before this one.
-     */
-    FIB_ENTRY_SRC_ATTRIBUTE_LAST = FIB_ENTRY_SRC_ATTRIBUTE_ACTIVE,
-} fib_entry_src_attribute_t;
-
-#define FIB_ENTRY_SRC_ATTRIBUTE_MAX (FIB_ENTRY_SRC_ATTRIBUTE_LAST+1)
-
-#define FIB_ENTRY_SRC_ATTRIBUTES {		 \
-    [FIB_ENTRY_SRC_ATTRIBUTE_ADDED]  = "added",	 \
-    [FIB_ENTRY_SRC_ATTRIBUTE_ACTIVE] = "active", \
-}
-
-typedef enum fib_entry_src_flag_t_ {
-    FIB_ENTRY_SRC_FLAG_NONE   = 0,
-    FIB_ENTRY_SRC_FLAG_ADDED  = (1 << FIB_ENTRY_SRC_ATTRIBUTE_ADDED),
-    FIB_ENTRY_SRC_FLAG_ACTIVE = (1 << FIB_ENTRY_SRC_ATTRIBUTE_ACTIVE),
-} __attribute__ ((packed)) fib_entry_src_flag_t;
-
-/*
- * Keep the size of the flags field to 2 bytes, so it
- * can be placed next to the 2 bytes reference count
- */
-STATIC_ASSERT (sizeof(fib_entry_src_flag_t) <= 2,
-	       "FIB entry flags field size too big");
-
-/**
- * Information related to the source of a FIB entry
- */
-typedef struct fib_entry_src_t_ {
-    /**
-     * A vector of path extensions
-     */
-    struct fib_path_ext_t_ *fes_path_exts;
-
-    /**
-     * The path-list created by the source
-     */
-    fib_node_index_t fes_pl;
-    /**
-     * Which source this info block is for
-     */
-    fib_source_t fes_src;
-    /**
-     * Flags on the source
-     */
-    fib_entry_src_flag_t fes_flags;
-
-    /**
-     * 1 bytes ref count. This is not the number of users of the Entry
-     * (which is itself not large, due to path-list sharing), but the number
-     * of times a given source has been added. Which is even fewer
-     */
-    u8 fes_ref_count;
-
-    /**
-     * Flags the source contributes to the entry
-     */
-    fib_entry_flag_t fes_entry_flags;
-    
-    /**
-     * Source specific info
-     */
-    union {
-	struct {
-	    /**
-	     * the index of the FIB entry that is the covering entry
-	     */
-	    fib_node_index_t fesr_cover;
-	    /**
-	     * This source's index in the cover's list
-	     */
-	    u32 fesr_sibling;
-	} rr;
-	struct {
-	    /**
-	     * the index of the FIB entry that is the covering entry
-	     */
-	    fib_node_index_t fesa_cover;
-	    /**
-	     * This source's index in the cover's list
-	     */
-	    u32 fesa_sibling;
-	} adj;
-	struct {
-	    /**
-	     * the index of the FIB entry that is the covering entry
-	     */
-	    fib_node_index_t fesi_cover;
-	    /**
-	     * This source's index in the cover's list
-	     */
-	    u32 fesi_sibling;
-	} interface;
-	struct {
-	    /**
-	     * This MPLS local label associated with the prefix.
-	     */
-	    mpls_label_t fesm_label;
-
-	    /**
-	     * the indicies of the LFIB entries created
-	     */
-	    fib_node_index_t fesm_lfes[2];
-	} mpls;
-	struct {
-	    /**
-	     * The source FIB index.
-	     */
-            fib_node_index_t fesl_fib_index;
-	} lisp;
-    };
-} fib_entry_src_t;
-
-/**
- * An entry in a FIB table.
- *
- * This entry represents a route added to the FIB that is stored
- * in one of the FIB tables.
- */
-typedef struct fib_entry_t_ {
-    /**
-     * Base class. The entry's node representation in the graph.
-     */
-    fib_node_t fe_node;
-    /**
-     * The prefix of the route. this is const just to be sure.
-     * It is the entry's key/identity and so should never change.
-     */
-    const fib_prefix_t fe_prefix;
-    /**
-     * The index of the FIB table this entry is in
-     */
-    u32 fe_fib_index;
-    /**
-     * The load-balance used for forwarding.
-     *
-     * We don't share the EOS and non-EOS even in case when they could be
-     * because:
-     *   - complexity & reliability v. memory
-     *       determining the conditions where sharing is possible is non-trivial.
-     *   - separate LBs means we can get the EOS bit right in the MPLS label DPO
-     *     and so save a few clock cycles in the DP imposition node since we can
-     *     paint the header straight on without the need to check the packet
-     *     type to derive the EOS bit value.
-     */
-    dpo_id_t fe_lb; // [FIB_FORW_CHAIN_MPLS_NUM];
-    /**
-     * Vector of source infos.
-     * Most entries will only have 1 source. So we optimise for memory usage,
-     * which is preferable since we have many entries.
-     */
-    fib_entry_src_t *fe_srcs;
-    /**
-     * the path-list for which this entry is a child. This is also the path-list
-     * that is contributing forwarding for this entry.
-     */
-    fib_node_index_t fe_parent;
-    /**
-     * index of this entry in the parent's child list.
-     * This is set when this entry is added as a child, but can also
-     * be changed by the parent as it manages its list.
-     */
-    u32 fe_sibling;
-
-    /**
-     * A vector of delegates.
-     */
-    fib_entry_delegate_t *fe_delegates;
-} fib_entry_t;
-
-#define FOR_EACH_FIB_ENTRY_FLAG(_item) \
-    for (_item = FIB_ENTRY_FLAG_FIRST; _item < FIB_ENTRY_FLAG_MAX; _item++)
-
-#define FIB_ENTRY_FORMAT_BRIEF   (0x0)
-#define FIB_ENTRY_FORMAT_DETAIL  (0x1)
-#define FIB_ENTRY_FORMAT_DETAIL2 (0x2)
-
-extern u8 *format_fib_entry (u8 * s, va_list * args);
-
-extern fib_node_index_t fib_entry_create_special(u32 fib_index,
-						 const fib_prefix_t *prefix,
-						 fib_source_t source,
-						 fib_entry_flag_t flags,
-						 const dpo_id_t *dpo);
-
-extern fib_node_index_t fib_entry_create (u32 fib_index,
-					  const fib_prefix_t *prefix,
-					  fib_source_t source,
-					  fib_entry_flag_t flags,
-					  const fib_route_path_t *paths);
-extern void fib_entry_update (fib_node_index_t fib_entry_index,
-			      fib_source_t source,
-			      fib_entry_flag_t flags,
-			      const fib_route_path_t *paths);
-
-extern void fib_entry_path_add(fib_node_index_t fib_entry_index,
-			       fib_source_t source,
-			       fib_entry_flag_t flags,
-			       const fib_route_path_t *rpath);
-extern void fib_entry_special_add(fib_node_index_t fib_entry_index,
-				  fib_source_t source,
-				  fib_entry_flag_t flags,
-				  const dpo_id_t *dpo);
-extern void fib_entry_special_update(fib_node_index_t fib_entry_index,
-				     fib_source_t source,
-				     fib_entry_flag_t flags,
-				     const dpo_id_t *dpo);
-extern fib_entry_src_flag_t fib_entry_special_remove(fib_node_index_t fib_entry_index,
-						     fib_source_t source);
-
-extern fib_entry_src_flag_t fib_entry_path_remove(fib_node_index_t fib_entry_index,
-						  fib_source_t source,
-						  const fib_route_path_t *rpath);
-extern fib_entry_src_flag_t fib_entry_delete(fib_node_index_t fib_entry_index,
-					     fib_source_t source);
-
-extern void fib_entry_contribute_urpf(fib_node_index_t path_index,
-				      index_t urpf);
-extern void fib_entry_contribute_forwarding(
-    fib_node_index_t fib_entry_index,
-    fib_forward_chain_type_t type,
-    dpo_id_t *dpo);
-extern const dpo_id_t * fib_entry_contribute_ip_forwarding(
-    fib_node_index_t fib_entry_index);
-extern adj_index_t fib_entry_get_adj_for_source(
-    fib_node_index_t fib_entry_index,
-    fib_source_t source);
-extern const int fib_entry_get_dpo_for_source (
-    fib_node_index_t fib_entry_index,
-    fib_source_t source,
-    dpo_id_t *dpo);
-
-extern adj_index_t fib_entry_get_adj(fib_node_index_t fib_entry_index);
-
-extern int fib_entry_cmp_for_sort(void *i1, void *i2);
-
-extern void fib_entry_cover_changed(fib_node_index_t fib_entry);
-extern void fib_entry_cover_updated(fib_node_index_t fib_entry);
-extern int fib_entry_recursive_loop_detect(fib_node_index_t entry_index,
-					   fib_node_index_t **entry_indicies);
-
-extern void fib_entry_lock(fib_node_index_t fib_entry_index);
-extern void fib_entry_unlock(fib_node_index_t fib_entry_index);
-
-extern u32 fib_entry_child_add(fib_node_index_t fib_entry_index,
-			       fib_node_type_t type,
-			       fib_node_index_t child_index);
-extern void fib_entry_child_remove(fib_node_index_t fib_entry_index,
-				   u32 sibling_index);
-extern u32 fib_entry_get_resolving_interface(fib_node_index_t fib_entry_index);
-extern u32 fib_entry_get_resolving_interface_for_source(
-    fib_node_index_t fib_entry_index,
-    fib_source_t source);
-
-extern void fib_entry_encode(fib_node_index_t fib_entry_index,
-			     fib_route_path_encode_t **api_rpaths);
-extern void fib_entry_get_prefix(fib_node_index_t fib_entry_index,
-				 fib_prefix_t *pfx);
-extern u32 fib_entry_get_fib_index(fib_node_index_t fib_entry_index);
-extern void fib_entry_set_source_data(fib_node_index_t fib_entry_index,
-                                      fib_source_t source,
-                                      const void *data);
-extern const void* fib_entry_get_source_data(fib_node_index_t fib_entry_index,
-                                             fib_source_t source);
-
-extern fib_entry_flag_t fib_entry_get_flags(fib_node_index_t fib_entry_index);
-extern fib_entry_flag_t fib_entry_get_flags_for_source(
-    fib_node_index_t fib_entry_index,
-    fib_source_t source);
-extern fib_source_t fib_entry_get_best_source(fib_node_index_t fib_entry_index);
-extern int fib_entry_is_sourced(fib_node_index_t fib_entry_index,
-                                fib_source_t source);
-
-extern fib_node_index_t fib_entry_get_path_list(fib_node_index_t fib_entry_index);
-
-extern void fib_entry_module_init(void);
-
-/*
- * unsafe... beware the raw pointer.
- */
-extern fib_node_index_t fib_entry_get_index(const fib_entry_t * fib_entry);
-extern fib_entry_t * fib_entry_get(fib_node_index_t fib_entry_index);
-
-/*
- * for testing purposes.
- */
-extern u32 fib_entry_pool_size(void);
-
-#endif
diff --git a/vnet/vnet/fib/fib_entry_cover.c b/vnet/vnet/fib/fib_entry_cover.c
deleted file mode 100644
index 147c5daa..00000000
--- a/vnet/vnet/fib/fib_entry_cover.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/fib/fib_entry_cover.h>
-#include <vnet/fib/fib_entry_src.h>
-#include <vnet/fib/fib_node_list.h>
-
-u32
-fib_entry_cover_track (fib_entry_t* cover,
-		       fib_node_index_t covered)
-{
-    fib_entry_delegate_t *fed;
-
-    FIB_ENTRY_DBG(cover, "cover-track %d", covered);
-
-    ASSERT(fib_entry_get_index(cover) != covered);
-
-    fed = fib_entry_delegate_get(cover, FIB_ENTRY_DELEGATE_COVERED);
-
-    if (NULL == fed)
-    {
-        fed = fib_entry_delegate_find_or_add(cover, FIB_ENTRY_DELEGATE_COVERED);
-        fed->fd_list = fib_node_list_create();
-    }
-
-    return (fib_node_list_push_front(fed->fd_list,
-                                     0, FIB_NODE_TYPE_ENTRY,
-                                     covered));
-}
-
-void
-fib_entry_cover_untrack (fib_entry_t* cover,
-			 u32 tracked_index)
-{
-    fib_entry_delegate_t *fed;
-
-    FIB_ENTRY_DBG(cover, "cover-untrack @ %d", tracked_index);
-
-    fed = fib_entry_delegate_get(cover, FIB_ENTRY_DELEGATE_COVERED);
-
-    if (NULL == fed)
-        return;
-
-    fib_node_list_remove(fed->fd_list, tracked_index);
-
-    if (0 == fib_node_list_get_size(fed->fd_list))
-    {
-        fib_node_list_destroy(&fed->fd_list);
-        fib_entry_delegate_remove(cover, FIB_ENTRY_DELEGATE_COVERED);        
-    }
-}
-
-/**
- * Internal struct to hold user supplied paraneters for the cover walk
- */
-typedef struct fib_enty_cover_walk_ctx_t_ {
-    fib_entry_t *cover;
-    fib_entry_covered_walk_t walk;
-    void *ctx;
-} fib_enty_cover_walk_ctx_t;
-
-static int
-fib_entry_cover_walk_node_ptr (fib_node_ptr_t *depend,
-			       void *args)
-{
-    fib_enty_cover_walk_ctx_t *ctx = args;
-
-    ctx->walk(ctx->cover, depend->fnp_index, ctx->ctx);
-
-    /* continue */
-    return (1);
-}
-
-void
-fib_entry_cover_walk (fib_entry_t *cover,
-		      fib_entry_covered_walk_t walk,
-		      void *args)
-{
-    fib_entry_delegate_t *fed;
-
-    fed = fib_entry_delegate_get(cover, FIB_ENTRY_DELEGATE_COVERED);
-
-    if (NULL == fed)
-        return;
-
-    fib_enty_cover_walk_ctx_t ctx = {
-        .cover = cover,
-        .walk = walk,
-        .ctx = args,
-    };
-
-    fib_node_list_walk(fed->fd_list,
-                       fib_entry_cover_walk_node_ptr,
-                       &ctx);
-}
-
-u32
-fib_entry_cover_get_size (fib_entry_t *cover)
-{
-    fib_entry_delegate_t *fed;
-
-    fed = fib_entry_delegate_get(cover, FIB_ENTRY_DELEGATE_COVERED);
-
-    if (NULL == fed)
-        return (0);
-
-    return (fib_node_list_get_size(fed->fd_list));
-}
-
-typedef struct fib_entry_cover_list_format_ctx_t_ {
-    u8 *s;
-} fib_entry_cover_list_format_ctx_t;
-
-static int
-fib_entry_covered_list_format_one (fib_entry_t *cover,
-				   fib_node_index_t covered,
-				   void *args)
-{
-    fib_entry_cover_list_format_ctx_t * ctx = args;
-
-    ctx->s = format(ctx->s, "%d, ", covered);
-
-    /* continue */
-    return (1);
-}
-
-u8*
-fib_entry_cover_list_format (fib_entry_t *fib_entry,
-			     u8 *s)
-{
-    fib_entry_cover_list_format_ctx_t ctx = {
-	.s = s,
-    };
-
-    fib_entry_cover_walk(fib_entry, 
-			 fib_entry_covered_list_format_one,
-			 &ctx);
-
-    return (ctx.s);
-}
-
-static int
-fib_entry_cover_change_one (fib_entry_t *cover,
-			    fib_node_index_t covered,
-			    void *args)
-{
-    fib_node_index_t new_cover;
-
-    /*
-     * The 3 entries involved here are:
-     *   cover - the least specific. It will cover both the others
-     *  new_cover - the enty just inserted below the cover
-     *  covered - the entry that was tracking the cover.
-     *
-     * The checks below are to determine if new_cover is a cover for covered.
-     */
-    new_cover = pointer_to_uword(args);
-
-    if (FIB_NODE_INDEX_INVALID == new_cover)
-    {
-	/*
-	 * nothing has been inserted, which implies the cover was removed.
-	 * 'cover' is thus the new cover.
-	 */
-	fib_entry_cover_changed(covered);
-    }
-    else if (new_cover != covered)
-    {
-	fib_prefix_t pfx_covered, pfx_new_cover;
-
-	fib_entry_get_prefix(covered, &pfx_covered);
-	fib_entry_get_prefix(new_cover, &pfx_new_cover);
-
-	if (fib_prefix_is_cover(&pfx_new_cover, &pfx_covered))
-	{
-	    fib_entry_cover_changed(covered);
-	}
-    }
-    /* continue */
-    return (1);
-}
-
-void
-fib_entry_cover_change_notify (fib_node_index_t cover_index,
-			       fib_node_index_t covered)
-{
-    fib_entry_t *cover;
-
-    cover = fib_entry_get(cover_index);
-
-    fib_entry_cover_walk(cover, 
-			 fib_entry_cover_change_one,
-			 uword_to_pointer(covered, void*));
-}
-
-static int
-fib_entry_cover_update_one (fib_entry_t *cover,
-			    fib_node_index_t covered,
-			    void *args)
-{
-    fib_entry_cover_updated(covered);
-
-    /* continue */
-    return (1);
-}
-
-void
-fib_entry_cover_update_notify (fib_entry_t *fib_entry)
-{
-    fib_entry_cover_walk(fib_entry, 
-			 fib_entry_cover_update_one,
-			 NULL);
-}
diff --git a/vnet/vnet/fib/fib_entry_cover.h b/vnet/vnet/fib/fib_entry_cover.h
deleted file mode 100644
index fbbbc211..00000000
--- a/vnet/vnet/fib/fib_entry_cover.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __FIB_ENTRY_COVER_H__
-#define __FIB_ENTRY_COVER_H__
-
-#include "fib_entry.h"
-
-/**
- * callback function used when walking the covered entries
- */
-typedef int (*fib_entry_covered_walk_t)(fib_entry_t *cover,
-					fib_node_index_t covered,
-					void *ctx);
-
-extern u32 fib_entry_cover_track(fib_entry_t *cover,
-				 fib_node_index_t covered);
-
-extern void fib_entry_cover_untrack(fib_entry_t *cover,
-				    u32 tracked_index);
-
-extern void fib_entry_cover_walk(fib_entry_t *cover,
-				 fib_entry_covered_walk_t walk,
-				 void *ctx);
-
-extern void fib_entry_cover_change_notify(fib_node_index_t cover_index,
-					  fib_node_index_t covered_index);
-extern void fib_entry_cover_update_notify(fib_entry_t *cover);
-
-extern u32 fib_entry_cover_get_size(fib_entry_t *cover);
-
-extern u8* fib_entry_cover_list_format(fib_entry_t *fib_entry,
-				       u8 *s);
-
-#endif
diff --git a/vnet/vnet/fib/fib_entry_delegate.c b/vnet/vnet/fib/fib_entry_delegate.c
deleted file mode 100644
index a0d45f97..00000000
--- a/vnet/vnet/fib/fib_entry_delegate.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/fib/fib_entry_delegate.h>
-#include <vnet/fib/fib_entry.h>
-
-static fib_entry_delegate_t *
-fib_entry_delegate_find_i (const fib_entry_t *fib_entry,
-                           fib_entry_delegate_type_t type,
-                           u32 *index)
-{
-    fib_entry_delegate_t *delegate;
-    int ii;
-
-    ii = 0;
-    vec_foreach(delegate, fib_entry->fe_delegates)
-    {
-	if (delegate->fd_type == type)
-	{
-            if (NULL != index)
-                *index = ii;
-
-	    return (delegate);
-	}
-	else
-	{
-	    ii++;
-	}
-    }
-
-    return (NULL);
-}
-
-fib_entry_delegate_t *
-fib_entry_delegate_get (const fib_entry_t *fib_entry,
-                        fib_entry_delegate_type_t type)
-{
-    return (fib_entry_delegate_find_i(fib_entry, type, NULL));
-}
-
-void
-fib_entry_delegate_remove (fib_entry_t *fib_entry,
-                           fib_entry_delegate_type_t type)
-{
-    fib_entry_delegate_t *fed;
-    u32 index = ~0;
-
-    fed = fib_entry_delegate_find_i(fib_entry, type, &index);
-
-    ASSERT(NULL != fed);
-
-    vec_del1(fib_entry->fe_delegates, index);
-}
-
-static int
-fib_entry_delegate_cmp_for_sort (void * v1,
-                                 void * v2)
-{
-    fib_entry_delegate_t *delegate1 = v1, *delegate2 = v2;
-
-    return (delegate1->fd_type - delegate2->fd_type);
-}
-
-static void
-fib_entry_delegate_init (fib_entry_t *fib_entry,
-                         fib_entry_delegate_type_t type)
-
-{
-    fib_entry_delegate_t delegate = {
-	.fd_entry_index = fib_entry_get_index(fib_entry),
-	.fd_type = type,
-    };
-
-    vec_add1(fib_entry->fe_delegates, delegate);
-    vec_sort_with_function(fib_entry->fe_delegates,
-			   fib_entry_delegate_cmp_for_sort);
-}
-
-fib_entry_delegate_t *
-fib_entry_delegate_find_or_add (fib_entry_t *fib_entry,
-                                fib_entry_delegate_type_t fdt)
-{
-    fib_entry_delegate_t *delegate;
-
-    delegate = fib_entry_delegate_get(fib_entry, fdt);
-
-    if (NULL == delegate)
-    {
-	fib_entry_delegate_init(fib_entry, fdt);
-    }
-
-    return (fib_entry_delegate_get(fib_entry, fdt));
-}
-
-fib_entry_delegate_type_t
-fib_entry_chain_type_to_delegate_type (fib_forward_chain_type_t fct)
-{
-    switch (fct)
-    {
-    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
-        return (FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP4);
-    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
-        return (FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP6);
-    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
-        return (FIB_ENTRY_DELEGATE_CHAIN_MPLS_EOS);
-    case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
-        return (FIB_ENTRY_DELEGATE_CHAIN_MPLS_NON_EOS);
-    case FIB_FORW_CHAIN_TYPE_ETHERNET:
-        return (FIB_ENTRY_DELEGATE_CHAIN_ETHERNET);
-    }
-    ASSERT(0);
-    return (FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP4);
-}
-
-fib_forward_chain_type_t
-fib_entry_delegate_type_to_chain_type (fib_entry_delegate_type_t fdt)
-{
-    switch (fdt)
-    {
-    case FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP4:
-        return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
-    case FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP6:
-        return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
-    case FIB_ENTRY_DELEGATE_CHAIN_MPLS_EOS:
-        return (FIB_FORW_CHAIN_TYPE_MPLS_EOS);
-    case FIB_ENTRY_DELEGATE_CHAIN_MPLS_NON_EOS:
-        return (FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS);
-    case FIB_ENTRY_DELEGATE_CHAIN_ETHERNET:
-        return (FIB_FORW_CHAIN_TYPE_ETHERNET);
-    case FIB_ENTRY_DELEGATE_COVERED:
-    case FIB_ENTRY_DELEGATE_ATTACHED_IMPORT:
-    case FIB_ENTRY_DELEGATE_ATTACHED_EXPORT:
-        break;
-    }
-    ASSERT(0);
-    return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
-}
diff --git a/vnet/vnet/fib/fib_entry_delegate.h b/vnet/vnet/fib/fib_entry_delegate.h
deleted file mode 100644
index 6d3a6549..00000000
--- a/vnet/vnet/fib/fib_entry_delegate.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __FIB_ENTRY_DELEGATE_T__
-#define __FIB_ENTRY_DELEGATE_T__
-
-#include <vnet/fib/fib_node.h>
-
-/**
- * Delegate types
- */
-typedef enum fib_entry_delegate_type_t_ {
-    /**
-     * Forwarding chain types:
-     * for the vast majority of FIB entries only one chain is required - the
-     * one that forwards traffic matching the fib_entry_t's fib_prefix_t. For those
-     * fib_entry_t that are a resolution target for other fib_entry_t's they will also
-     * need the chain to provide forwarding for those children. We store these additional
-     * chains in delegates to save memory in the common case.
-     */
-    FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP4 = FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-    FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP6 = FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
-    FIB_ENTRY_DELEGATE_CHAIN_MPLS_EOS = FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-    FIB_ENTRY_DELEGATE_CHAIN_MPLS_NON_EOS = FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-    FIB_ENTRY_DELEGATE_CHAIN_ETHERNET = FIB_FORW_CHAIN_TYPE_ETHERNET,
-    /**
-     * Dependency list of covered entries.
-     * these are more specific entries that are interested in changes
-     * to their respective cover
-     */
-    FIB_ENTRY_DELEGATE_COVERED,
-    /**
-     * Attached import/export functionality
-     */
-    FIB_ENTRY_DELEGATE_ATTACHED_IMPORT,
-    FIB_ENTRY_DELEGATE_ATTACHED_EXPORT,
-} fib_entry_delegate_type_t;
-
-#define FOR_EACH_DELEGATE_CHAIN(_entry, _fdt, _fed, _body)    \
-{                                                             \
-    for (_fdt = FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP4;         \
-         _fdt <= FIB_ENTRY_DELEGATE_CHAIN_ETHERNET;           \
-         _fdt++)                                              \
-    {                                                         \
-        _fed = fib_entry_delegate_get(_entry, _fdt);          \
-        if (NULL != _fed) {                                   \
-            _body;                                            \
-        }                                                     \
-    }                                                         \
-}
-
-/**
- * A Delagate is a means to implmenet the Delagation design pattern; the extension of an
- * objects functionality through the composition of, and delgation to, other objects.
- * These 'other' objects are delegates. Delagates are thus attached to other FIB objects
- * to extend their functionality.
- */
-typedef struct fib_entry_delegate_t_
-{
-    /**
-     * The FIB entry object to which the delagate is attached
-     */
-    fib_node_index_t fd_entry_index;
-
-    /**
-     * The delagate type
-     */
-    fib_entry_delegate_type_t fd_type;
-
-    /**
-     * A union of data for the different delegate types
-     * These delegates are stored in a sparse vector on the entry, so they
-     * must all be of the same size. We could use indirection here for all types,
-     * i.e. store an index, that's ok for large delegates, like the attached export
-     * but for the chain delegates it's excessive
-     */
-    union
-    {
-        /**
-         * Valid for the forwarding chain delegates. The LB that is built.
-         */
-        dpo_id_t fd_dpo;
-
-        /**
-         * Valid for the attached import cases. An index of the importer/exporter
-         */
-        fib_node_index_t fd_index;
-
-        /**
-         * For the cover tracking. The node list;
-         */
-        fib_node_list_t fd_list;
-    };
-} fib_entry_delegate_t;
-
-struct fib_entry_t_;
-
-extern void fib_entry_delegate_remove(struct fib_entry_t_ *fib_entry,
-                                      fib_entry_delegate_type_t type);
-
-extern fib_entry_delegate_t *fib_entry_delegate_find_or_add(struct fib_entry_t_ *fib_entry,
-                                                            fib_entry_delegate_type_t fdt);
-extern fib_entry_delegate_t *fib_entry_delegate_get(const struct fib_entry_t_ *fib_entry,
-                                                    fib_entry_delegate_type_t type);
-
-extern fib_forward_chain_type_t fib_entry_delegate_type_to_chain_type(
-    fib_entry_delegate_type_t type);
-
-extern fib_entry_delegate_type_t fib_entry_chain_type_to_delegate_type(
-     fib_forward_chain_type_t type);
-
-#endif
diff --git a/vnet/vnet/fib/fib_entry_src.c b/vnet/vnet/fib/fib_entry_src.c
deleted file mode 100644
index 060fac94..00000000
--- a/vnet/vnet/fib/fib_entry_src.c
+++ /dev/null
@@ -1,1456 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/adj/adj.h>
-#include <vnet/dpo/load_balance.h>
-#include <vnet/dpo/mpls_label_dpo.h>
-#include <vnet/dpo/drop_dpo.h>
-
-#include <vnet/fib/fib_entry_src.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/fib_path_ext.h>
-#include <vnet/fib/fib_urpf_list.h>
-
-/*
- * per-source type vft
- */
-static fib_entry_src_vft_t fib_entry_src_vft[FIB_SOURCE_MAX];
-
-static fib_protocol_t
-fib_entry_get_proto (const fib_entry_t * fib_entry)
-{
-    return (fib_entry->fe_prefix.fp_proto);
-}
-
-void
-fib_entry_src_register (fib_source_t source,
-			const fib_entry_src_vft_t *vft)
-{
-    fib_entry_src_vft[source] = *vft;
-}
-
-static int
-fib_entry_src_cmp_for_sort (void * v1,
-			    void * v2)
-{
-    fib_entry_src_t *esrc1 = v1, *esrc2 = v2;
-
-    return (esrc1->fes_src - esrc2->fes_src);
-}
-
-void
-fib_entry_src_action_init (fib_entry_t *fib_entry,
-			   fib_source_t source)
-
-{
-    fib_entry_src_t esrc = {
-	.fes_pl = FIB_NODE_INDEX_INVALID,
-	.fes_flags = FIB_ENTRY_SRC_FLAG_NONE,
-	.fes_src = source,
-    };
-
-    if (NULL != fib_entry_src_vft[source].fesv_init)
-    {
-	fib_entry_src_vft[source].fesv_init(&esrc);
-    }
-
-    vec_add1(fib_entry->fe_srcs, esrc);
-    vec_sort_with_function(fib_entry->fe_srcs,
-			   fib_entry_src_cmp_for_sort);
-}
-
-static fib_entry_src_t *
-fib_entry_src_find (const fib_entry_t *fib_entry,
-		    fib_source_t source,
-		    u32 *index)
-
-{
-    fib_entry_src_t *esrc;
-    int ii;
-
-    ii = 0;
-    vec_foreach(esrc, fib_entry->fe_srcs)
-    {
-	if (esrc->fes_src == source)
-	{
-	    if (NULL != index)
-	    {
-		*index = ii;
-	    }
-	    return (esrc);
-	}
-	else
-	{
-	    ii++;
-	}
-    }
-
-    return (NULL);
-}
-
-int
-fib_entry_is_sourced (fib_node_index_t fib_entry_index,
-                      fib_source_t source)
-{
-    fib_entry_t *fib_entry;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    return (NULL != fib_entry_src_find(fib_entry, source, NULL));
-}
-
-static fib_entry_src_t *
-fib_entry_src_find_or_create (fib_entry_t *fib_entry,
-			      fib_source_t source,
-			      u32 *index)
-{
-    fib_entry_src_t *esrc;
-
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    if (NULL == esrc)
-    {
-	fib_entry_src_action_init(fib_entry, source);
-    }
-
-    return (fib_entry_src_find(fib_entry, source, NULL));
-}
-
-void
-fib_entry_src_action_deinit (fib_entry_t *fib_entry,
-			     fib_source_t source)
-
-{
-    fib_entry_src_t *esrc;
-    u32 index = ~0;
-
-    esrc = fib_entry_src_find(fib_entry, source, &index);
-
-    ASSERT(NULL != esrc);
-
-    if (NULL != fib_entry_src_vft[source].fesv_deinit)
-    {
-	fib_entry_src_vft[source].fesv_deinit(esrc);
-    }
-
-    vec_free(esrc->fes_path_exts);
-    vec_del1(fib_entry->fe_srcs, index);
-}
-
-fib_entry_src_cover_res_t
-fib_entry_src_action_cover_change (fib_entry_t *fib_entry,
-				   fib_source_t source)
-{
-    if (NULL != fib_entry_src_vft[source].fesv_cover_change)
-    {
-	return (fib_entry_src_vft[source].fesv_cover_change(
-		    fib_entry_src_find(fib_entry, source, NULL),
-		    fib_entry));
-    }
-
-    fib_entry_src_cover_res_t res = {
-	.install = !0,
-	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
-    };
-    return (res);
-}
-
-fib_entry_src_cover_res_t
-fib_entry_src_action_cover_update (fib_entry_t *fib_entry,
-				   fib_source_t source)
-{
-    if (NULL != fib_entry_src_vft[source].fesv_cover_update)
-    {
-	return (fib_entry_src_vft[source].fesv_cover_update(
-		    fib_entry_src_find(fib_entry, source, NULL),
-		    fib_entry));
-    }
-
-    fib_entry_src_cover_res_t res = {
-	.install = !0,
-	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
-    };
-    return (res);
-}
-
-typedef struct fib_entry_src_collect_forwarding_ctx_t_
-{
-    load_balance_path_t * next_hops;
-    const fib_entry_t *fib_entry;
-    const fib_entry_src_t *esrc;
-    fib_forward_chain_type_t fct;
-    int is_recursive;
-} fib_entry_src_collect_forwarding_ctx_t;
-
-/**
- * @brief Determine whether this FIB entry should use a load-balance MAP
- * to support PIC edge fast convergence
- */
-load_balance_flags_t
-fib_entry_calc_lb_flags (fib_entry_src_collect_forwarding_ctx_t *ctx)
-{
-    /**
-     * We'll use a LB map is the path-list has recursive paths.
-     * recursive paths implies BGP, and hence scale.
-     */
-    if (ctx->is_recursive)
-    {
-        return (LOAD_BALANCE_FLAG_USES_MAP);
-    }
-    return (LOAD_BALANCE_FLAG_NONE);
-}
-
-static int
-fib_entry_src_valid_out_label (mpls_label_t label)
-{
-    return ((MPLS_LABEL_IS_REAL(label) ||
-             MPLS_IETF_IPV4_EXPLICIT_NULL_LABEL == label ||
-             MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL == label ||
-             MPLS_IETF_IMPLICIT_NULL_LABEL == label));
-}
-
-/**
- * @brief Turn the chain type requested by the client into the one they
- * really wanted
- */
-fib_forward_chain_type_t
-fib_entry_chain_type_fixup (const fib_entry_t *entry,
-			    fib_forward_chain_type_t fct)
-{
-    ASSERT(FIB_FORW_CHAIN_TYPE_MPLS_EOS == fct);
-
-    /*
-     * The EOS chain is a tricky since one cannot know the adjacency
-     * to link to without knowing what the packets payload protocol
-     * will be once the label is popped.
-     */
-    fib_forward_chain_type_t dfct;
-
-    dfct = fib_entry_get_default_chain_type(entry);
-
-    if (FIB_FORW_CHAIN_TYPE_MPLS_EOS == dfct)
-    {
-        /*
-         * If the entry being asked is a eos-MPLS label entry,
-         * then use the payload-protocol field, that we stashed there
-         * for just this purpose
-         */
-        return (fib_forw_chain_type_from_dpo_proto(
-                    entry->fe_prefix.fp_payload_proto));
-    }
-    /*
-     * else give them what this entry would be by default. i.e. if it's a v6
-     * entry, then the label its local labelled should be carrying v6 traffic.
-     * If it's a non-EOS label entry, then there are more labels and we want
-     * a non-eos chain.
-     */
-    return (dfct);
-}
-
-static int
-fib_entry_src_collect_forwarding (fib_node_index_t pl_index,
-                                  fib_node_index_t path_index,
-                                  void *arg)
-{
-    fib_entry_src_collect_forwarding_ctx_t *ctx;
-    fib_path_ext_t *path_ext;
-
-    ctx = arg;
-
-    /*
-     * if the path is not resolved, don't include it.
-     */
-    if (!fib_path_is_resolved(path_index))
-    {
-        return (!0);
-    }
-
-    if (fib_path_is_recursive(path_index))
-    {
-        ctx->is_recursive = 1;
-    }
-
-    /*
-     * get the matching path-extension for the path being visited.
-     */
-    vec_foreach(path_ext, ctx->esrc->fes_path_exts)
-    {
-        if (path_ext->fpe_path_index == path_index)
-            break;
-    }
-    
-    if (NULL != path_ext &&
-        path_ext->fpe_path_index == path_index &&
-        fib_entry_src_valid_out_label(path_ext->fpe_label_stack[0]))
-    {
-        /*
-         * found a matching extension. stack it to obtain the forwarding
-         * info for this path.
-         */
-        ctx->next_hops = fib_path_ext_stack(path_ext, ctx->fib_entry, ctx->fct, ctx->next_hops);
-    }
-    else
-    {
-        load_balance_path_t *nh;
-
-        /*
-         * no extension => no out-going label for this path. that's OK
-         * in the case of an IP or EOS chain, but not for non-EOS
-         */
-        switch (ctx->fct)
-        {
-        case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
-        case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
-            /*
-             * EOS traffic with no label to stack, we need the IP Adj
-             */
-            vec_add2(ctx->next_hops, nh, 1);
-
-            nh->path_index = path_index;
-            nh->path_weight = fib_path_get_weight(path_index);
-            fib_path_contribute_forwarding(path_index, ctx->fct, &nh->path_dpo);
-
-            break;
-        case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
-	    if (fib_path_is_exclusive(path_index) ||
-		fib_path_is_deag(path_index))
-	    {
-		vec_add2(ctx->next_hops, nh, 1);
-
-		nh->path_index = path_index;
-		nh->path_weight = fib_path_get_weight(path_index);
-		fib_path_contribute_forwarding(path_index,
-					       FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-					       &nh->path_dpo);
-	    }
-            break;
-        case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
-        {
-            /*
-             * no label. we need a chain based on the payload. fixup.
-             */
-            vec_add2(ctx->next_hops, nh, 1);
-
-            nh->path_index = path_index;
-            nh->path_weight = fib_path_get_weight(path_index);
-            fib_path_contribute_forwarding(path_index,
-                                           fib_entry_chain_type_fixup(ctx->fib_entry,
-                                                                      ctx->fct),
-                                           &nh->path_dpo);
-
-            break;
-        }
-        case FIB_FORW_CHAIN_TYPE_ETHERNET:
-	    ASSERT(0);
-	    break;
-        }
-    }
-
-    return (!0);
-}
-
-void
-fib_entry_src_mk_lb (fib_entry_t *fib_entry,
-		     const fib_entry_src_t *esrc,
-		     fib_forward_chain_type_t fct,
-		     dpo_id_t *dpo_lb)
-{
-    dpo_proto_t lb_proto;
-
-    /*
-     * If the entry has path extensions then we construct a load-balance
-     * by stacking the extensions on the forwarding chains of the paths.
-     * Otherwise we use the load-balance of the path-list
-     */
-    fib_entry_src_collect_forwarding_ctx_t ctx = {
-        .esrc = esrc,
-        .fib_entry = fib_entry,
-        .next_hops = NULL,
-        .is_recursive = 0,
-        .fct = fct,
-    };
-
-    lb_proto = fib_proto_to_dpo(fib_entry->fe_prefix.fp_proto);
-
-    fib_path_list_walk(esrc->fes_pl,
-                       fib_entry_src_collect_forwarding,
-                       &ctx);
-
-    if (esrc->fes_entry_flags & FIB_ENTRY_FLAG_EXCLUSIVE)
-    {
-	/*
-	 * the client provided the DPO that the entry should link to.
-	 * all entries must link to a LB, so if it is an LB already
-	 * then we can use it.
-	 */
-	if ((1 == vec_len(ctx.next_hops)) &&
-	    (DPO_LOAD_BALANCE == ctx.next_hops[0].path_dpo.dpoi_type))
-	{
-	    dpo_copy(dpo_lb, &ctx.next_hops[0].path_dpo);
-	    dpo_reset(&ctx.next_hops[0].path_dpo);
-	    return;
-	}
-    }
-
-    if (!dpo_id_is_valid(dpo_lb))
-    {
-        /*
-         * first time create
-         */
-        flow_hash_config_t fhc;
-
-        fhc = fib_table_get_flow_hash_config(fib_entry->fe_fib_index,
-                                             dpo_proto_to_fib(lb_proto));
-        dpo_set(dpo_lb,
-                DPO_LOAD_BALANCE,
-                lb_proto,
-                load_balance_create(0, lb_proto, fhc));
-    }
-
-    load_balance_multipath_update(dpo_lb,
-                                  ctx.next_hops,
-                                  fib_entry_calc_lb_flags(&ctx));
-    vec_free(ctx.next_hops);
-
-    /*
-     * if this entry is sourced by the uRPF-exempt source then we
-     * append the always present local0 interface (index 0) to the
-     * uRPF list so it is not empty. that way packets pass the loose check.
-     */
-    index_t ui = fib_path_list_get_urpf(esrc->fes_pl);
-
-    if (fib_entry_is_sourced(fib_entry_get_index(fib_entry),
-			     FIB_SOURCE_URPF_EXEMPT) &&
-	(0 == fib_urpf_check_size(ui)))
-    {
-	/*
-	 * The uRPF list we get from the path-list is shared by all
-	 * other users of the list, but the uRPF exemption applies
-	 * only to this prefix. So we need our own list.
-	 */
-	ui = fib_urpf_list_alloc_and_lock();
-	fib_urpf_list_append(ui, 0);
-	fib_urpf_list_bake(ui);
-	load_balance_set_urpf(dpo_lb->dpoi_index, ui);
-	fib_urpf_list_unlock(ui);
-    }
-    else
-    {
-	load_balance_set_urpf(dpo_lb->dpoi_index, ui);
-    }
-}
-
-void
-fib_entry_src_action_install (fib_entry_t *fib_entry,
-			      fib_source_t source)
-{
-    /*
-     * Install the forwarding chain for the given source into the forwarding
-     * tables
-     */
-    fib_forward_chain_type_t fct;
-    fib_entry_src_t *esrc;
-    int insert;
-
-    fct = fib_entry_get_default_chain_type(fib_entry);
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    /*
-     * Every entry has its own load-balance object. All changes to the entry's
-     * forwarding result in an inplace modify of the load-balance. This means
-     * the load-balance object only needs to be added to the forwarding
-     * DB once, when it is created.
-     */
-    insert = !dpo_id_is_valid(&fib_entry->fe_lb);
-
-    fib_entry_src_mk_lb(fib_entry, esrc, fct, &fib_entry->fe_lb);
-
-    ASSERT(dpo_id_is_valid(&fib_entry->fe_lb));
-    FIB_ENTRY_DBG(fib_entry, "install: %d", fib_entry->fe_lb);
-
-    /*
-     * insert the adj into the data-plane forwarding trie
-     */
-    if (insert)
-    {
-       fib_table_fwding_dpo_update(fib_entry->fe_fib_index,
-                                   &fib_entry->fe_prefix,
-                                   &fib_entry->fe_lb);
-    }
-
-    /*
-     * if any of the other chain types are already created they will need
-     * updating too
-     */
-    fib_entry_delegate_type_t fdt;
-    fib_entry_delegate_t *fed;
-
-    FOR_EACH_DELEGATE_CHAIN(fib_entry, fdt, fed,
-    {
-        fib_entry_src_mk_lb(fib_entry, esrc,
-                            fib_entry_delegate_type_to_chain_type(fdt),
-                            &fed->fd_dpo);
-    });
-}
-
-void
-fib_entry_src_action_uninstall (fib_entry_t *fib_entry)
-{
-    /*
-     * uninstall the forwarding chain from the forwarding tables
-     */
-    FIB_ENTRY_DBG(fib_entry, "uninstall: %d",
-		  fib_entry->fe_adj_index);
-
-    if (dpo_id_is_valid(&fib_entry->fe_lb))
-    {
-	fib_table_fwding_dpo_remove(
-	    fib_entry->fe_fib_index,
-	    &fib_entry->fe_prefix,
-	    &fib_entry->fe_lb);
-
-	dpo_reset(&fib_entry->fe_lb);
-    }
-}
-
-static void
-fib_entry_recursive_loop_detect_i (fib_node_index_t path_list_index)
-{
-    fib_node_index_t *entries = NULL;
-
-    fib_path_list_recursive_loop_detect(path_list_index, &entries);
-
-    vec_free(entries);
-}
-
-void
-fib_entry_src_action_activate (fib_entry_t *fib_entry,
-			       fib_source_t source)
-
-{
-    int houston_we_are_go_for_install;
-    fib_entry_src_t *esrc;
-
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    ASSERT(!(esrc->fes_flags & FIB_ENTRY_SRC_FLAG_ACTIVE));
-    ASSERT(esrc->fes_flags & FIB_ENTRY_SRC_FLAG_ADDED);
-
-    esrc->fes_flags |= FIB_ENTRY_SRC_FLAG_ACTIVE;
-
-    if (NULL != fib_entry_src_vft[source].fesv_activate)
-    {
-	houston_we_are_go_for_install =
-	    fib_entry_src_vft[source].fesv_activate(esrc, fib_entry);
-    }
-    else
-    {
-	/*
-	 * the source is not providing an activate function, we'll assume
-	 * therefore it has no objection to installing the entry
-	 */
-	houston_we_are_go_for_install = !0;
-    }
-
-    /*
-     * link to the path-list provided by the source, and go check
-     * if that forms any loops in the graph.
-     */
-    fib_entry->fe_parent = esrc->fes_pl;
-    fib_entry->fe_sibling =
-	fib_path_list_child_add(fib_entry->fe_parent,
-				FIB_NODE_TYPE_ENTRY,
-				fib_entry_get_index(fib_entry));
-
-    fib_entry_recursive_loop_detect_i(fib_entry->fe_parent);
-
-    FIB_ENTRY_DBG(fib_entry, "activate: %d",
-		  fib_entry->fe_parent);
-
-    if (0 != houston_we_are_go_for_install)
-    {
-	fib_entry_src_action_install(fib_entry, source);
-    }
-    else
-    {
-	fib_entry_src_action_uninstall(fib_entry);
-    }
-}
-
-void
-fib_entry_src_action_deactivate (fib_entry_t *fib_entry,
-				 fib_source_t source)
-
-{
-    fib_node_index_t path_list_index;
-    fib_entry_src_t *esrc;
-
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    ASSERT(esrc->fes_flags & FIB_ENTRY_SRC_FLAG_ACTIVE);
-
-    if (NULL != fib_entry_src_vft[source].fesv_deactivate)
-    {
-	fib_entry_src_vft[source].fesv_deactivate(esrc, fib_entry);
-    }
-
-    esrc->fes_flags &= ~FIB_ENTRY_SRC_FLAG_ACTIVE;
-
-    FIB_ENTRY_DBG(fib_entry, "deactivate: %d", fib_entry->fe_parent);
-
-    /*
-     * un-link from an old path-list. Check for any loops this will clear
-     */
-    path_list_index = fib_entry->fe_parent;
-    fib_entry->fe_parent = FIB_NODE_INDEX_INVALID;
-
-    fib_entry_recursive_loop_detect_i(path_list_index);
-
-    /*
-     * this will unlock the path-list, so it may be invalid thereafter.
-     */
-    fib_path_list_child_remove(path_list_index, fib_entry->fe_sibling);
-    fib_entry->fe_sibling = FIB_NODE_INDEX_INVALID;
-}
-
-static void
-fib_entry_src_action_fwd_update (const fib_entry_t *fib_entry,
-				 fib_source_t source)
-{
-    fib_entry_src_t *esrc;
-
-    vec_foreach(esrc, fib_entry->fe_srcs)
-    {
-	if (NULL != fib_entry_src_vft[esrc->fes_src].fesv_fwd_update)
-	{
-	    fib_entry_src_vft[esrc->fes_src].fesv_fwd_update(esrc,
-							     fib_entry,
-							     source);
-	}
-    }
-}
-
-void
-fib_entry_src_action_reactivate (fib_entry_t *fib_entry,
-				 fib_source_t source)
-{
-    fib_node_index_t path_list_index;
-    fib_entry_src_t *esrc;
-
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    ASSERT(esrc->fes_flags & FIB_ENTRY_SRC_FLAG_ACTIVE);
-
-    FIB_ENTRY_DBG(fib_entry, "reactivate: %d to %d",
-		  fib_entry->fe_parent,
-		  esrc->fes_pl);
-
-    if (fib_entry->fe_parent != esrc->fes_pl)
-    {
-	/*
-	 * un-link from an old path-list. Check for any loops this will clear
-	 */
-	path_list_index = fib_entry->fe_parent;
-	fib_entry->fe_parent = FIB_NODE_INDEX_INVALID;
-
-	/*
-	 * temporary lock so it doesn't get deleted when this entry is no
-	 * longer a child.
-	 */
-	fib_path_list_lock(path_list_index);
-
-	/*
-	 * this entry is no longer a child. after unlinking check if any loops
-	 * were broken
-	 */
-	fib_path_list_child_remove(path_list_index,
-				   fib_entry->fe_sibling);
-
-	fib_entry_recursive_loop_detect_i(path_list_index);
-
-	/*
-	 * link to the path-list provided by the source, and go check
-	 * if that forms any loops in the graph.
-	 */
-	fib_entry->fe_parent = esrc->fes_pl;
-	fib_entry->fe_sibling =
-	    fib_path_list_child_add(fib_entry->fe_parent,
-				    FIB_NODE_TYPE_ENTRY,
-				    fib_entry_get_index(fib_entry));
-
-	fib_entry_recursive_loop_detect_i(fib_entry->fe_parent);
-	fib_path_list_unlock(path_list_index);
-    }
-    fib_entry_src_action_install(fib_entry, source);
-    fib_entry_src_action_fwd_update(fib_entry, source);
-}
-
-void
-fib_entry_src_action_installed (const fib_entry_t *fib_entry,
-				fib_source_t source)
-{
-    fib_entry_src_t *esrc;
-
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    if (NULL != fib_entry_src_vft[source].fesv_installed)
-    {
-	fib_entry_src_vft[source].fesv_installed(esrc,
-						 fib_entry);
-    }
-
-    fib_entry_src_action_fwd_update(fib_entry, source);
-}
-
-/*
- * fib_entry_src_action_add
- *
- * Adding a source can result in a new fib_entry being created, which
- * can inturn mean the pool is realloc'd and thus the entry passed as
- * an argument it also realloc'd
- * @return the original entry
- */
-fib_entry_t *
-fib_entry_src_action_add (fib_entry_t *fib_entry,
-			  fib_source_t source,
-			  fib_entry_flag_t flags,
-			  const dpo_id_t *dpo)
-{
-    fib_node_index_t fib_entry_index;
-    fib_entry_src_t *esrc;
-
-    esrc = fib_entry_src_find_or_create(fib_entry, source, NULL);
-
-    esrc->fes_ref_count++;
-
-    if (1 != esrc->fes_ref_count)
-    {
-        /*
-         * we only want to add the source on the 0->1 transition
-         */
-        return (fib_entry);
-    }
-
-    esrc->fes_entry_flags = flags;
-
-    /*
-     * save variable so we can recover from a fib_entry realloc.
-     */
-    fib_entry_index = fib_entry_get_index(fib_entry);
-
-    if (NULL != fib_entry_src_vft[source].fesv_add)
-    {
-	fib_entry_src_vft[source].fesv_add(esrc,
-					   fib_entry,
-					   flags,
-					   fib_entry_get_proto(fib_entry),
-					   dpo);
-    }
-
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    esrc->fes_flags |= FIB_ENTRY_SRC_FLAG_ADDED;
-
-    fib_path_list_lock(esrc->fes_pl);
-
-    /*
-     * the source owns a lock on the entry
-     */
-    fib_entry_lock(fib_entry_get_index(fib_entry));
-
-    return (fib_entry);
-}
-
-/*
- * fib_entry_src_action_update
- *
- * Adding a source can result in a new fib_entry being created, which
- * can inturn mean the pool is realloc'd and thus the entry passed as
- * an argument it also realloc'd
- * @return the original entry
- */
-fib_entry_t *
-fib_entry_src_action_update (fib_entry_t *fib_entry,
-			     fib_source_t source,
-			     fib_entry_flag_t flags,
-			     const dpo_id_t *dpo)
-{
-    fib_node_index_t fib_entry_index, old_path_list_index;
-    fib_entry_src_t *esrc;
-
-    esrc = fib_entry_src_find_or_create(fib_entry, source, NULL);
-
-    if (NULL == esrc)
-	return (fib_entry_src_action_add(fib_entry, source, flags, dpo));
-
-    old_path_list_index = esrc->fes_pl;
-    esrc->fes_entry_flags = flags;
-
-    /*
-     * save variable so we can recover from a fib_entry realloc.
-     */
-    fib_entry_index = fib_entry_get_index(fib_entry);
-
-    if (NULL != fib_entry_src_vft[source].fesv_add)
-    {
-	fib_entry_src_vft[source].fesv_add(esrc,
-					   fib_entry,
-					   flags,
-					   fib_entry_get_proto(fib_entry),
-					   dpo);
-    }
-
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    esrc->fes_flags |= FIB_ENTRY_SRC_FLAG_ADDED;
-
-    fib_path_list_lock(esrc->fes_pl);
-    fib_path_list_unlock(old_path_list_index);
-
-    return (fib_entry);
-}
-
-
-fib_entry_src_flag_t
-fib_entry_src_action_remove (fib_entry_t *fib_entry,
-			     fib_source_t source)
-
-{
-    fib_node_index_t old_path_list;
-    fib_entry_src_flag_t sflags;
-    fib_entry_src_t *esrc;
-
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    if (NULL == esrc)
-	return (FIB_ENTRY_SRC_FLAG_ACTIVE);
-
-    esrc->fes_ref_count--;
-    sflags = esrc->fes_flags;
-
-    if (0 != esrc->fes_ref_count)
-    {
-        /*
-         * only remove the source on the 1->0 transisition
-         */
-        return (sflags);
-    }
-
-    if (esrc->fes_flags & FIB_ENTRY_SRC_FLAG_ACTIVE)
-    {
-	fib_entry_src_action_deactivate(fib_entry, source);
-    }
-
-    old_path_list = esrc->fes_pl;
-
-    if (NULL != fib_entry_src_vft[source].fesv_remove)
-    {
-	fib_entry_src_vft[source].fesv_remove(esrc);
-    }
-
-    fib_path_list_unlock(old_path_list);
-    fib_entry_unlock(fib_entry_get_index(fib_entry));
-
-    sflags &= ~FIB_ENTRY_SRC_FLAG_ADDED;
-    fib_entry_src_action_deinit(fib_entry, source);
-
-    return (sflags);
-}
-
-static inline int
-fib_route_recurses_via_self (const fib_prefix_t *prefix,
-			     const fib_route_path_t *rpath)
-{
-    /*
-     * not all zeros next hop &&
-     * is recursive path &&
-     * nexthop is same as the route's address
-     */
-    return ((!ip46_address_is_zero(&rpath->frp_addr)) &&
-	    (~0 == rpath->frp_sw_if_index) &&
-	    (0 == ip46_address_cmp(&rpath->frp_addr, &prefix->fp_addr)));
-
-}
-
-/*
- * fib_route_attached_cross_table
- *
- * Return true the the route is attached via an interface that
- * is not in the same table as the route
- */
-static inline int
-fib_route_attached_cross_table (const fib_entry_t *fib_entry,
-				const fib_route_path_t *rpath)
-{
-    /*
-     * - All zeros next-hop
-     * - a valid interface
-     * - entry's fib index not equeal to interface's index
-     */
-    if (ip46_address_is_zero(&rpath->frp_addr) &&
-	(~0 != rpath->frp_sw_if_index) &&
-	(fib_entry->fe_fib_index != 
-	 fib_table_get_index_for_sw_if_index(fib_entry_get_proto(fib_entry),
-					     rpath->frp_sw_if_index)))
-    {
-	return (!0);
-    }
-    return (0);
-}
-
-/*
- * fib_route_attached_cross_table
- *
- * Return true the the route is attached via an interface that
- * is not in the same table as the route
- */
-static inline int
-fib_path_is_attached (const fib_route_path_t *rpath)
-{
-    /*
-     * - All zeros next-hop
-     * - a valid interface
-     */
-    if (ip46_address_is_zero(&rpath->frp_addr) &&
-	(~0 != rpath->frp_sw_if_index))
-    {
-	return (!0);
-    }
-    return (0);
-}
-
-fib_path_list_flags_t
-fib_entry_src_flags_2_path_list_flags (fib_entry_flag_t eflags)
-{
-    fib_path_list_flags_t plf = FIB_PATH_LIST_FLAG_NONE;
-
-    if (eflags & FIB_ENTRY_FLAG_DROP)
-    {
-	plf |= FIB_PATH_LIST_FLAG_DROP;
-    }
-    if (eflags & FIB_ENTRY_FLAG_LOCAL)
-    {
-	plf |= FIB_PATH_LIST_FLAG_LOCAL;
-    }
-    if (eflags & FIB_ENTRY_FLAG_EXCLUSIVE)
-    {
-	plf |= FIB_PATH_LIST_FLAG_EXCLUSIVE;
-    }
-
-    return (plf);
-}
-
-static void
-fib_entry_flags_update (const fib_entry_t *fib_entry,
-			const fib_route_path_t *rpath,
-			fib_path_list_flags_t *pl_flags,
-			fib_entry_src_t *esrc)
-{
-    /*
-     * don't allow the addition of a recursive looped path for prefix
-     * via itself.
-     */
-    if (fib_route_recurses_via_self(&fib_entry->fe_prefix, rpath))	
-    {
-	/*
-	 * force the install of a drop path-list.
-	 * we want the entry to have some path-list, mainly so
-	 * the dodgy path can be rmeoved when the source stops playing
-	 * silly buggers.
-	 */
-	*pl_flags |= FIB_PATH_LIST_FLAG_DROP;
-    }
-    else
-    {
-	*pl_flags &= ~FIB_PATH_LIST_FLAG_DROP;
-    }
-
-    if ((esrc->fes_src == FIB_SOURCE_API) ||
-	(esrc->fes_src == FIB_SOURCE_CLI))
-    {
-	if (fib_path_is_attached(rpath))
-	{
-	    esrc->fes_entry_flags |= FIB_ENTRY_FLAG_ATTACHED;
-	}
-	else
-	{
-	    esrc->fes_entry_flags &= ~FIB_ENTRY_FLAG_ATTACHED;
-	}
-    }
-    if (fib_route_attached_cross_table(fib_entry, rpath))
-    {
-	esrc->fes_entry_flags |= FIB_ENTRY_FLAG_IMPORT;
-    }
-    else
-    {
-	esrc->fes_entry_flags &= ~FIB_ENTRY_FLAG_IMPORT;
-    }
-}
-
-/*
- * fib_entry_src_path_ext_add
- *
- * append a path extension to the entry's list
- */
-static void
-fib_entry_src_path_ext_append (fib_entry_src_t *esrc,
-			       const fib_route_path_t *rpath)
-{
-    if (NULL != rpath->frp_label_stack)
-    {
-	fib_path_ext_t *path_ext;
-
-	vec_add2(esrc->fes_path_exts, path_ext, 1);
-
-	fib_path_ext_init(path_ext, esrc->fes_pl, rpath);
-    }
-}
-
-/*
- * fib_entry_src_path_ext_insert
- *
- * insert, sorted, a path extension to the entry's list.
- * It's not strictly necessary in sort the path extensions, since each
- * extension has the path index to which it resolves. However, by being
- * sorted the load-balance produced has a deterministic order, not an order
- * based on the sequence of extension additions. this is a considerable benefit.
- */
-static void
-fib_entry_src_path_ext_insert (fib_entry_src_t *esrc,
-			       const fib_route_path_t *rpath)
-{
-    if (0 == vec_len(esrc->fes_path_exts))
-	return (fib_entry_src_path_ext_append(esrc, rpath));
-
-    if (NULL != rpath->frp_label_stack)
-    {
-	fib_path_ext_t path_ext;
-	int i = 0;
-
-	fib_path_ext_init(&path_ext, esrc->fes_pl, rpath);
-
-	while (i < vec_len(esrc->fes_path_exts) &&
-	       (fib_path_ext_cmp(&esrc->fes_path_exts[i], rpath) < 0))
-	{
-	    i++;
-	}
-
-	vec_insert_elts(esrc->fes_path_exts, &path_ext, 1, i);
-    }
-}
-
-/*
- * fib_entry_src_action_add
- *
- * Adding a source can result in a new fib_entry being created, which
- * can inturn mean the pool is realloc'd and thus the entry passed as
- * an argument it also realloc'd
- * @return the entry
- */
-fib_entry_t*
-fib_entry_src_action_path_add (fib_entry_t *fib_entry,
-			       fib_source_t source,
-			       fib_entry_flag_t flags,
-			       const fib_route_path_t *rpath)
-{
-    fib_node_index_t old_path_list, fib_entry_index;
-    fib_path_list_flags_t pl_flags;
-    fib_path_ext_t *path_ext;
-    fib_entry_src_t *esrc;
-
-    /*
-     * save variable so we can recover from a fib_entry realloc.
-     */
-    fib_entry_index = fib_entry_get_index(fib_entry);
-
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-    if (NULL == esrc)
-    {
-	fib_entry =
-            fib_entry_src_action_add(fib_entry,
-                                     source,
-                                     flags,
-                                     drop_dpo_get(
-                                         fib_proto_to_dpo(
-                                             fib_entry_get_proto(fib_entry))));
-	esrc = fib_entry_src_find(fib_entry, source, NULL);
-    }
-
-    /*
-     * we are no doubt modifying a path-list. If the path-list
-     * is shared, and hence not modifiable, then the index returned
-     * will be for a different path-list. This FIB entry to needs
-     * to maintain its lock appropriately.
-     */
-    old_path_list = esrc->fes_pl;
-
-    ASSERT(NULL != fib_entry_src_vft[source].fesv_path_add);
-
-    pl_flags = fib_entry_src_flags_2_path_list_flags(fib_entry_get_flags_i(fib_entry));
-    fib_entry_flags_update(fib_entry, rpath, &pl_flags, esrc);
-
-    fib_entry_src_vft[source].fesv_path_add(esrc, fib_entry, pl_flags, rpath);
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    /*
-     * re-resolve all the path-extensions with the new path-list
-     */
-    vec_foreach(path_ext, esrc->fes_path_exts)
-    {
-	fib_path_ext_resolve(path_ext, esrc->fes_pl);
-    }
-    /*
-     * if the path has a label we need to add a path extension
-     */
-    fib_entry_src_path_ext_insert(esrc, rpath);
-
-    fib_path_list_lock(esrc->fes_pl);
-    fib_path_list_unlock(old_path_list);
-
-    return (fib_entry);
-}
-
-/*
- * fib_entry_src_action_swap
- *
- * The source is providing new paths to replace the old ones.
- * Adding a source can result in a new fib_entry being created, which
- * can inturn mean the pool is realloc'd and thus the entry passed as
- * an argument it also realloc'd
- * @return the entry
- */
-fib_entry_t*
-fib_entry_src_action_path_swap (fib_entry_t *fib_entry,
-				fib_source_t source,
-				fib_entry_flag_t flags,				
-				const fib_route_path_t *rpaths)
-{
-    fib_node_index_t old_path_list, fib_entry_index;
-    fib_path_list_flags_t pl_flags;
-    const fib_route_path_t *rpath;
-    fib_path_ext_t *path_ext;
-    fib_entry_src_t *esrc;
-
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    /*
-     * save variable so we can recover from a fib_entry realloc.
-     */
-    fib_entry_index = fib_entry_get_index(fib_entry);
-
-    if (NULL == esrc)
-    {
-	fib_entry = fib_entry_src_action_add(fib_entry,
-					     source,
-					     flags,
-                                             drop_dpo_get(
-                                                 fib_proto_to_dpo(
-                                                     fib_entry_get_proto(fib_entry))));
-	esrc = fib_entry_src_find(fib_entry, source, NULL);
-    }
-
-    /*
-     * swapping paths may create a new path-list (or may use an existing shared)
-     * but we are certainly getting a different one. This FIB entry to needs
-     * to maintain its lock appropriately.
-     */
-    old_path_list = esrc->fes_pl;
-
-    ASSERT(NULL != fib_entry_src_vft[source].fesv_path_swap);
-
-    pl_flags = fib_entry_src_flags_2_path_list_flags(flags);
-
-    vec_foreach(rpath, rpaths)
-    {
-	fib_entry_flags_update(fib_entry, rpath, &pl_flags, esrc);
-    }
-
-    fib_entry_src_vft[source].fesv_path_swap(esrc,
-					     fib_entry,
-					     pl_flags,
-					     rpaths);
-
-    vec_foreach(path_ext, esrc->fes_path_exts)
-    {
-	vec_free(path_ext->fpe_label_stack);
-    }
-    vec_free(esrc->fes_path_exts);
-
-    vec_foreach(rpath, rpaths)
-    {
-	fib_entry_src_path_ext_append(esrc, rpath);
-    }
-
-    fib_entry = fib_entry_get(fib_entry_index);
-
-    fib_path_list_lock(esrc->fes_pl);
-    fib_path_list_unlock(old_path_list);
-
-    return (fib_entry);
-}
-
-fib_entry_src_flag_t
-fib_entry_src_action_path_remove (fib_entry_t *fib_entry,
-				  fib_source_t source,
-				  const fib_route_path_t *rpath)
-{
-    fib_path_list_flags_t pl_flags;
-    fib_node_index_t old_path_list;
-    fib_path_ext_t *path_ext;
-    fib_entry_src_t *esrc;
-
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    ASSERT(NULL != esrc);
-    ASSERT(esrc->fes_flags & FIB_ENTRY_SRC_FLAG_ADDED);
-
-    /*
-     * we no doubt modifying a path-list. If the path-list
-     * is shared, and hence not modifiable, then the index returned
-     * will be for a different path-list. This FIB entry to needs
-     * to maintain its lock appropriately.
-     */
-    old_path_list = esrc->fes_pl;
-
-    ASSERT(NULL != fib_entry_src_vft[source].fesv_path_remove);
-
-    pl_flags = fib_entry_src_flags_2_path_list_flags(fib_entry_get_flags_i(fib_entry));
-    fib_entry_flags_update(fib_entry, rpath, &pl_flags, esrc);
-
-    fib_entry_src_vft[source].fesv_path_remove(esrc, pl_flags, rpath);
-    /*
-     * find the matching path extension and remove it
-     */
-    vec_foreach(path_ext, esrc->fes_path_exts)
-    {
-	if (!fib_path_ext_cmp(path_ext, rpath))
-	{
-	    /*
-	     * delete the element moving the remaining elements down 1 position.
-	     * this preserves the sorted order.
-	     */
-	    vec_free(path_ext->fpe_label_stack);
-	    vec_delete(esrc->fes_path_exts, 1, (path_ext - esrc->fes_path_exts));
-	    break;
-	}
-    }
-    /*
-     * re-resolve all the path-extensions with the new path-list
-     */
-    vec_foreach(path_ext, esrc->fes_path_exts)
-    {
-	fib_path_ext_resolve(path_ext, esrc->fes_pl);
-    }
-
-    /*
-     * lock the new path-list, unlock the old if it had one
-     */
-    fib_path_list_unlock(old_path_list);
-
-    if (FIB_NODE_INDEX_INVALID != esrc->fes_pl) {
-	fib_path_list_lock(esrc->fes_pl);
-	return (FIB_ENTRY_SRC_FLAG_ADDED);
-    }
-    else
-    {
-	/*
-	 * no more paths left from this source
-	 */
-	fib_entry_src_action_remove(fib_entry, source);
-	return (FIB_ENTRY_SRC_FLAG_NONE);
-    }
-}
-
-u8*
-fib_entry_src_format (fib_entry_t *fib_entry,
-		      fib_source_t source,
-		      u8* s)
-{
-    fib_entry_src_t *esrc;
-
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    if (NULL != fib_entry_src_vft[source].fesv_format)
-    {
-	return (fib_entry_src_vft[source].fesv_format(esrc, s));
-    }
-    return (s);
-}
-
-adj_index_t
-fib_entry_get_adj_for_source (fib_node_index_t fib_entry_index,
-			      fib_source_t source)
-{
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *esrc;
-
-    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
-	return (ADJ_INDEX_INVALID);
-
-    fib_entry = fib_entry_get(fib_entry_index);
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    if (NULL != esrc)
-    {
-	if (FIB_NODE_INDEX_INVALID != esrc->fes_pl)
-	{
-	    return (fib_path_list_get_adj(
-			esrc->fes_pl,
-			fib_entry_get_default_chain_type(fib_entry)));
-	}
-    }
-    return (ADJ_INDEX_INVALID);
-}
-
-const int
-fib_entry_get_dpo_for_source (fib_node_index_t fib_entry_index,
-			      fib_source_t source,
-			      dpo_id_t *dpo)
-{
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *esrc;
-
-    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
-	return (0);
-
-    fib_entry = fib_entry_get(fib_entry_index);
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    if (NULL != esrc)
-    {
-	if (FIB_NODE_INDEX_INVALID != esrc->fes_pl)
-	{
-	    fib_path_list_contribute_forwarding(
-		esrc->fes_pl,
-		fib_entry_get_default_chain_type(fib_entry),
-		dpo);
-
-	    return (dpo_id_is_valid(dpo));
-	}
-    }
-    return (0);
-}
-
-u32
-fib_entry_get_resolving_interface_for_source (fib_node_index_t entry_index,
-					      fib_source_t source)
-{
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *esrc;
-
-    fib_entry = fib_entry_get(entry_index);
-
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    if (NULL != esrc)
-    {
-	if (FIB_NODE_INDEX_INVALID != esrc->fes_pl)
-	{
-	    return (fib_path_list_get_resolving_interface(esrc->fes_pl));
-	}
-    }
-    return (~0);
-}
-
-fib_entry_flag_t
-fib_entry_get_flags_for_source (fib_node_index_t entry_index,
-				fib_source_t source)
-{
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *esrc;
-
-    fib_entry = fib_entry_get(entry_index);
-
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    if (NULL != esrc)
-    {
-	return (esrc->fes_entry_flags);
-    }
-
-    return (FIB_ENTRY_FLAG_NONE);
-}
-
-fib_entry_flag_t
-fib_entry_get_flags_i (const fib_entry_t *fib_entry)
-{
-    fib_entry_flag_t flags;
-
-    /*
-     * the vector of sources is deliberately arranged in priority order
-     */
-    if (0 == vec_len(fib_entry->fe_srcs))
-    {
-	flags = FIB_ENTRY_FLAG_NONE;
-    }
-    else
-    {
-	fib_entry_src_t *esrc;
-
-	esrc = vec_elt_at_index(fib_entry->fe_srcs, 0);
-	flags = esrc->fes_entry_flags;
-    }
-
-    return (flags);
-}
-
-void
-fib_entry_set_source_data (fib_node_index_t fib_entry_index,
-                           fib_source_t source,
-                           const void *data)
-{
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *esrc;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    if (NULL != esrc &&
-        NULL != fib_entry_src_vft[source].fesv_set_data)
-    {
-	fib_entry_src_vft[source].fesv_set_data(esrc, fib_entry, data);
-    }
-}
-
-const void*
-fib_entry_get_source_data (fib_node_index_t fib_entry_index,
-                           fib_source_t source)
-{
-    fib_entry_t *fib_entry;
-    fib_entry_src_t *esrc;
-
-    fib_entry = fib_entry_get(fib_entry_index);
-    esrc = fib_entry_src_find(fib_entry, source, NULL);
-
-    if (NULL != esrc &&
-        NULL != fib_entry_src_vft[source].fesv_get_data)
-    {
-	return (fib_entry_src_vft[source].fesv_get_data(esrc, fib_entry));
-    }
-    return (NULL);
-}
-
-void
-fib_entry_src_module_init (void)
-{
-    fib_entry_src_rr_register();
-    fib_entry_src_interface_register();
-    fib_entry_src_default_route_register();
-    fib_entry_src_special_register();
-    fib_entry_src_api_register();
-    fib_entry_src_adj_register();
-    fib_entry_src_mpls_register();
-    fib_entry_src_lisp_register();
-}
diff --git a/vnet/vnet/fib/fib_entry_src.h b/vnet/vnet/fib/fib_entry_src.h
deleted file mode 100644
index 640c174d..00000000
--- a/vnet/vnet/fib/fib_entry_src.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __FIB_ENTRY_SRC_H__
-#define __FIB_ENTRY_SRC_H__
-
-#include "fib_entry.h"
-#include "fib_path_list.h"
-#include "fib_internal.h"
-
-/**
- * Debug macro
- */
-#ifdef FIB_DEBUG
-#define FIB_ENTRY_DBG(_e, _fmt, _args...)		\
-{   		          				\
-    u8*__tmp = NULL;					\
-    __tmp = format(__tmp, "e:[%d:%U",			\
-		   fib_entry_get_index(_e),		\
-		   format_ip46_address,			\
-		   &_e->fe_prefix.fp_addr,		\
-		   IP46_TYPE_ANY);			\
-    __tmp = format(__tmp, "/%d]:",			\
-		   _e->fe_prefix.fp_len);		\
-    __tmp = format(__tmp, _fmt, ##_args);		\
-    clib_warning("%s", __tmp);				\
-    vec_free(__tmp);					\
-}
-#else
-#define FIB_ENTRY_DBG(_e, _fmt, _args...)
-#endif
-
-/**
- * Source initialisation Function 
- */
-typedef void (*fib_entry_src_init_t)(fib_entry_src_t *src);
-
-/**
- * Source deinitialisation Function 
- */
-typedef void (*fib_entry_src_deinit_t)(fib_entry_src_t *src);
-
-/**
- * Source activation. Called when the source is the new best source on the entry.
- * Return non-zero if the entry can now install, 0 otherwise
- */
-typedef int (*fib_entry_src_activate_t)(fib_entry_src_t *src,
-					 const fib_entry_t *fib_entry);
-
-/**
- * Source Deactivate. 
- * Called when the source is no longer best source on the entry
- */
-typedef void (*fib_entry_src_deactivate_t)(fib_entry_src_t *src,
-					   const fib_entry_t *fib_entry);
-
-/**
- * Source Add.
- * Called when the source is added to the entry
- */
-typedef void (*fib_entry_src_add_t)(fib_entry_src_t *src,
-				    const fib_entry_t *entry,
-				    fib_entry_flag_t flags,
-				    fib_protocol_t proto,
-				    const dpo_id_t *dpo);
-
-/**
- * Source Remove.
- */
-typedef void (*fib_entry_src_remove_t)(fib_entry_src_t *src);
-
-/**
- * Result from a cover update/change
- */
-typedef struct fib_entry_src_cover_res_t_ {
-    u16 install;
-    fib_node_bw_reason_flag_t bw_reason;
-} fib_entry_src_cover_res_t;
-
-/**
- * Cover changed. the source should re-evaluate its cover.
- */
-typedef fib_entry_src_cover_res_t (*fib_entry_src_cover_change_t)(
-    fib_entry_src_t *src,
-    const fib_entry_t *fib_entry);
-
-/**
- * Cover updated. The cover the source has, has updated (i.e. its forwarding)
- * the source may need to re-evaluate.
- */
-typedef fib_entry_src_cover_res_t (*fib_entry_src_cover_update_t)(
-    fib_entry_src_t *src,
-    const fib_entry_t *fib_entry);
-
-/**
- * Forwarding updated. Notification that the forwarding information for the
- * entry has been updated. This notification is sent to all sources, not just
- * the active best.
- */
-typedef void (*fib_entry_src_fwd_update_t)(fib_entry_src_t *src,
-					   const fib_entry_t *fib_entry,
-					   fib_source_t best_source);
-
-/**
- * Installed. Notification that the source is now installed as
- * the entry's forwarding source.
- */
-typedef void (*fib_entry_src_installed_t)(fib_entry_src_t *src,
-					  const fib_entry_t *fib_entry);
-
-/**
- * format.
- */
-typedef u8* (*fib_entry_src_format_t)(fib_entry_src_t *src,
-				      u8* s);
-
-/**
- * Source path add
- * the source is adding a new path
- */
-typedef void (*fib_entry_src_path_add_t)(fib_entry_src_t *src,
-					 const fib_entry_t *fib_entry,
-					 fib_path_list_flags_t pl_flags,
-					 const fib_route_path_t *path);
-
-/**
- * Source path remove
- * the source is remoinvg a path
- */
-typedef void (*fib_entry_src_path_remove_t)(fib_entry_src_t *src,
-					    fib_path_list_flags_t pl_flags,
-					    const fib_route_path_t *path);
-
-/**
- * Source path replace/swap
- * the source is providing a new set of paths
- */
-typedef void (*fib_entry_src_path_swap_t)(fib_entry_src_t *src,
-					  const fib_entry_t *fib_entry,
-					  fib_path_list_flags_t pl_flags,
-					  const fib_route_path_t *path);
-
-/**
- * Set source specific opaque data
- */
-typedef void (*fib_entry_src_set_data_t)(fib_entry_src_t *src,
-                                         const fib_entry_t *fib_entry,
-                                         const void *data);
-
-/**
- * Get source specific opaque data
- */
-typedef const void* (*fib_entry_src_get_data_t)(fib_entry_src_t *src,
-                                                const fib_entry_t *fib_entry);
-
-/**
- * Virtual function table each FIB entry source will register
- */
-typedef struct fib_entry_src_vft_t_ {
-    fib_entry_src_init_t fesv_init;
-    fib_entry_src_deinit_t fesv_deinit;
-    fib_entry_src_activate_t fesv_activate;
-    fib_entry_src_deactivate_t fesv_deactivate;
-    fib_entry_src_add_t fesv_add;
-    fib_entry_src_remove_t fesv_remove;
-    fib_entry_src_path_swap_t fesv_path_swap;
-    fib_entry_src_path_add_t fesv_path_add;
-    fib_entry_src_path_remove_t fesv_path_remove;
-    fib_entry_src_cover_change_t fesv_cover_change;
-    fib_entry_src_cover_update_t fesv_cover_update;
-    fib_entry_src_format_t fesv_format;
-    fib_entry_src_installed_t fesv_installed;
-    fib_entry_src_fwd_update_t fesv_fwd_update;
-    fib_entry_src_get_data_t fesv_get_data;
-    fib_entry_src_set_data_t fesv_set_data;
-} fib_entry_src_vft_t;
-
-#define FOR_EACH_SRC_ADDED(_entry, _src, _source, action)	\
-{								\
-    vec_foreach(_src, _entry->fe_srcs)				\
-    {								\
-	if (_src->fes_flags & FIB_ENTRY_SRC_FLAG_ADDED) {	\
-	    _source = _src->fes_src;				\
-	    do {						\
-		action;						\
-	    } while(0);						\
-	}							\
-    }								\
-}
-
-extern u8* fib_entry_src_format(fib_entry_t *entry,
-				fib_source_t source,
-				u8* s);
-
-extern void fib_entry_src_register(fib_source_t source,
-				   const fib_entry_src_vft_t *vft);
-
-extern void fib_entry_src_action_init(fib_entry_t *entry,
-				      fib_source_t source);
-
-extern void fib_entry_src_action_deinit(fib_entry_t *fib_entry,
-					fib_source_t source);
-
-extern fib_entry_src_cover_res_t fib_entry_src_action_cover_change(
-    fib_entry_t *entry,
-    fib_source_t source);
-
-extern fib_entry_src_cover_res_t fib_entry_src_action_cover_update(
-    fib_entry_t *fib_entry,
-    fib_source_t source);
-
-extern void fib_entry_src_action_activate(fib_entry_t *fib_entry,
-					  fib_source_t source);
-
-extern void fib_entry_src_action_deactivate(fib_entry_t *fib_entry,
-					    fib_source_t source);
-extern void fib_entry_src_action_reactivate(fib_entry_t *fib_entry,
-					    fib_source_t source);
-
-extern fib_entry_t* fib_entry_src_action_add(fib_entry_t *fib_entry,
-					     fib_source_t source,
-					     fib_entry_flag_t flags,
-					     const dpo_id_t *dpo);
-extern fib_entry_t* fib_entry_src_action_update(fib_entry_t *fib_entry,
-						fib_source_t source,
-						fib_entry_flag_t flags,
-						const dpo_id_t *dpo);
-
-extern fib_entry_src_flag_t fib_entry_src_action_remove(fib_entry_t *fib_entry,
-							fib_source_t source);
-
-extern void fib_entry_src_action_install(fib_entry_t *fib_entry,
-					 fib_source_t source);
-
-extern void fib_entry_src_action_uninstall(fib_entry_t *fib_entry);
-
-extern fib_entry_t* fib_entry_src_action_path_add(fib_entry_t *fib_entry,
-						  fib_source_t source,
-						  fib_entry_flag_t flags,
-						  const fib_route_path_t *path);
-
-extern fib_entry_t* fib_entry_src_action_path_swap(fib_entry_t *fib_entry,
-						   fib_source_t source,
-						   fib_entry_flag_t flags,
-						   const fib_route_path_t *path);
-
-extern fib_entry_src_flag_t fib_entry_src_action_path_remove(fib_entry_t *fib_entry,
-							     fib_source_t source,
-							     const fib_route_path_t *path);
-
-extern void fib_entry_src_action_installed(const fib_entry_t *fib_entry,
-					   fib_source_t source);
-
-extern fib_forward_chain_type_t fib_entry_get_default_chain_type(
-    const fib_entry_t *fib_entry);
-extern fib_entry_flag_t fib_entry_get_flags_i(const fib_entry_t *fib_entry);
-extern fib_path_list_flags_t fib_entry_src_flags_2_path_list_flags(
-    fib_entry_flag_t eflags);
-
-extern fib_forward_chain_type_t fib_entry_chain_type_fixup(const fib_entry_t *entry,
-                                                           fib_forward_chain_type_t fct);
-
-extern void fib_entry_src_mk_lb (fib_entry_t *fib_entry,
-				 const fib_entry_src_t *esrc,
-				 fib_forward_chain_type_t fct,
-				 dpo_id_t *dpo_lb);
-
-
-/*
- * Per-source registration. declared here so we save a separate .h file for each
- */
-extern void fib_entry_src_default_register(void);
-extern void fib_entry_src_rr_register(void);
-extern void fib_entry_src_interface_register(void);
-extern void fib_entry_src_default_route_register(void);
-extern void fib_entry_src_special_register(void);
-extern void fib_entry_src_api_register(void);
-extern void fib_entry_src_adj_register(void);
-extern void fib_entry_src_mpls_register(void);
-extern void fib_entry_src_lisp_register(void);
-
-extern void fib_entry_src_module_init(void);
-
-#endif
diff --git a/vnet/vnet/fib/fib_entry_src_adj.c b/vnet/vnet/fib/fib_entry_src_adj.c
deleted file mode 100644
index 64f82a73..00000000
--- a/vnet/vnet/fib/fib_entry_src_adj.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "fib_entry.h"
-#include "fib_entry_src.h"
-#include "fib_path_list.h"
-#include "fib_table.h"
-#include "fib_entry_cover.h"
-#include "fib_attached_export.h"
-
-/**
- * Source initialisation Function 
- */
-static void
-fib_entry_src_adj_init (fib_entry_src_t *src)
-{
-    src->adj.fesa_cover = FIB_NODE_INDEX_INVALID;
-    src->adj.fesa_sibling = FIB_NODE_INDEX_INVALID;
-}
-
-static void
-fib_entry_src_adj_path_swap (fib_entry_src_t *src,
-			     const fib_entry_t *entry,
-			     fib_path_list_flags_t pl_flags,
-			     const fib_route_path_t *paths)
-{
-    src->fes_pl = fib_path_list_create(pl_flags, paths);
-}
-
-static void
-fib_entry_src_adj_remove (fib_entry_src_t *src)
-{
-    src->fes_pl = FIB_NODE_INDEX_INVALID;
-}
-
-
-/*
- * Source activate. 
- * Called when the source is teh new longer best source on the entry
- */
-static int
-fib_entry_src_adj_activate (fib_entry_src_t *src,
-			    const fib_entry_t *fib_entry)
-{
-    fib_entry_t *cover;
-
-    /*
-     * find the covering prefix. become a dependent thereof.
-     * there should always be a cover, though it may be the default route.
-     */
-    src->adj.fesa_cover = fib_table_get_less_specific(fib_entry->fe_fib_index,
-						      &fib_entry->fe_prefix);
-
-    ASSERT(FIB_NODE_INDEX_INVALID != src->adj.fesa_cover);
-    ASSERT(fib_entry_get_index(fib_entry) != src->adj.fesa_cover);
-
-    cover = fib_entry_get(src->adj.fesa_cover);
-
-    ASSERT(cover != fib_entry);
-
-    src->adj.fesa_sibling =
-	fib_entry_cover_track(cover,
-			      fib_entry_get_index(fib_entry));
-
-    /*
-     * if the ocver is attached then this adj source entry can install, 
-     * via the adj. otherwise install a drop.
-     * This prevents ARP/ND entries that on interface X that do not belong
-     * on X's subnet from being added to the FIB. To do so would allow
-     * nefarious gratuitous ARP requests from attracting traffic to the sender.
-     *
-     * and yes, I really do mean attached and not connected.
-     * this abomination;
-     *   ip route add 10.0.0.0/24 Eth0
-     * is attached. and we want adj-fibs to install on Eth0.
-     */
-    return (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(cover));
-}
-
-/*
- * Source Deactivate. 
- * Called when the source is no longer best source on the entry
- */
-static void
-fib_entry_src_adj_deactivate (fib_entry_src_t *src,
-			      const fib_entry_t *fib_entry)
-{
-    fib_entry_t *cover;
-
-    /*
-     * remove the depednecy on the covering entry
-     */
-    ASSERT(FIB_NODE_INDEX_INVALID != src->adj.fesa_cover);
-    cover = fib_entry_get(src->adj.fesa_cover);
-
-    fib_entry_cover_untrack(cover, src->adj.fesa_sibling);
-
-    /*
-     * tell the cover this entry no longer needs exporting
-     */
-    fib_attached_export_covered_removed(cover, fib_entry_get_index(fib_entry));
-
-    src->adj.fesa_cover = FIB_NODE_INDEX_INVALID;
-}
-
-static u8*
-fib_entry_src_adj_format (fib_entry_src_t *src,
-			 u8* s)
-{
-    return (format(s, "cover:%d", src->adj.fesa_cover));
-}
-
-static void
-fib_entry_src_adj_installed (fib_entry_src_t *src,
-			     const fib_entry_t *fib_entry)
-{
-    /*
-     * The adj source now rules! poke our cover to get exported
-     */
-    fib_entry_t *cover;
-
-    ASSERT(FIB_NODE_INDEX_INVALID != src->adj.fesa_cover);
-    cover = fib_entry_get(src->adj.fesa_cover);
-
-    fib_attached_export_covered_added(cover,
-				      fib_entry_get_index(fib_entry));
-}
-
-static fib_entry_src_cover_res_t
-fib_entry_src_adj_cover_change (fib_entry_src_t *src,
-				const fib_entry_t *fib_entry)
-{
-    fib_entry_src_cover_res_t res = {
-	.install = !0,
-	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
-    };
-
-    fib_entry_src_adj_deactivate(src, fib_entry);
-
-    res.install = fib_entry_src_adj_activate(src, fib_entry);
-
-    if (res.install) {
-	/*
-	 * ADJ fib can install
-	 */
-	res.bw_reason = FIB_NODE_BW_REASON_FLAG_EVALUATE;
-    }
-
-    return (res);
-}
-
-/*
- * fib_entry_src_adj_cover_update
- */
-static fib_entry_src_cover_res_t
-fib_entry_src_adj_cover_update (fib_entry_src_t *src,
-                                const fib_entry_t *fib_entry)
-{
-    /*
-     * the cover has updated, i.e. its forwarding or flags
-     * have changed. do'nt decativate/activate here, since this
-     * prefix is updated during the covers walk.
-     */
-    fib_entry_src_cover_res_t res = {
-	.install = !0,
-	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
-    };
-    fib_entry_t *cover;
-
-    ASSERT(FIB_NODE_INDEX_INVALID != src->adj.fesa_cover);
-
-    cover = fib_entry_get(src->adj.fesa_cover);
-
-    res.install = (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(cover));
-
-    return (res);
-}
-
-const static fib_entry_src_vft_t adj_src_vft = {
-    .fesv_init = fib_entry_src_adj_init,
-    .fesv_path_swap = fib_entry_src_adj_path_swap,
-    .fesv_remove = fib_entry_src_adj_remove,
-    .fesv_activate = fib_entry_src_adj_activate,
-    .fesv_deactivate = fib_entry_src_adj_deactivate,
-    .fesv_format = fib_entry_src_adj_format,
-    .fesv_installed = fib_entry_src_adj_installed,
-    .fesv_cover_change = fib_entry_src_adj_cover_change,
-    .fesv_cover_update = fib_entry_src_adj_cover_update,
-};
-
-void
-fib_entry_src_adj_register (void)
-{
-    fib_entry_src_register(FIB_SOURCE_ADJ, &adj_src_vft);
-}
diff --git a/vnet/vnet/fib/fib_entry_src_api.c b/vnet/vnet/fib/fib_entry_src_api.c
deleted file mode 100644
index edc8a47b..00000000
--- a/vnet/vnet/fib/fib_entry_src_api.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "fib_entry.h"
-#include "fib_entry_src.h"
-#include "fib_path_list.h"
-
-/**
- * Source initialisation Function 
- */
-static void
-fib_entry_src_api_init (fib_entry_src_t *src)
-{
-}
-
-/**
- * Source deinitialisation Function 
- */
-static void
-fib_entry_src_api_deinit (fib_entry_src_t *src)
-{
-}
-
-static void
-fib_entry_src_api_path_swap (fib_entry_src_t *src,
-			     const fib_entry_t *entry,
-			     fib_path_list_flags_t pl_flags,
-			     const fib_route_path_t *paths)
-{
-    src->fes_pl = fib_path_list_create((FIB_PATH_LIST_FLAG_SHARED | pl_flags),
-				       paths);
-}
-
-static void
-fib_entry_src_api_path_add (fib_entry_src_t *src,
-			    const fib_entry_t *entry,
-			    fib_path_list_flags_t pl_flags,
-			    const fib_route_path_t *paths)
-{
-    if (FIB_NODE_INDEX_INVALID == src->fes_pl)
-    {	
-	src->fes_pl =
-	    fib_path_list_create((FIB_PATH_LIST_FLAG_SHARED | pl_flags), paths);
-    }
-    else
-    {
-	src->fes_pl =
-	    fib_path_list_copy_and_path_add(src->fes_pl,
-					    (FIB_PATH_LIST_FLAG_SHARED | pl_flags),
-					    paths);
-    }
-}
-
-static void
-fib_entry_src_api_path_remove (fib_entry_src_t *src,
-			       fib_path_list_flags_t pl_flags,
-			       const fib_route_path_t *paths)
-{
-    if (FIB_NODE_INDEX_INVALID != src->fes_pl)
-    {
-	src->fes_pl =
-	    fib_path_list_copy_and_path_remove(src->fes_pl,
-					       (FIB_PATH_LIST_FLAG_SHARED | pl_flags),
-					       paths);
-    }
-}
-
-static void
-fib_entry_src_api_add (fib_entry_src_t *src,
-		       const fib_entry_t *entry,
-		       fib_entry_flag_t flags,
-		       fib_protocol_t proto,
-		       const dpo_id_t *dpo)
-{
-    if (FIB_ENTRY_FLAG_NONE != flags)
-    {
-	src->fes_pl = fib_path_list_create_special(
-	                  proto,
-			  fib_entry_src_flags_2_path_list_flags(flags),
-			  dpo);
-    }
-}
-
-static void
-fib_entry_src_api_remove (fib_entry_src_t *src)
-{
-    src->fes_pl = FIB_NODE_INDEX_INVALID;
-}
-
-const static fib_entry_src_vft_t api_src_vft = {
-    .fesv_init = fib_entry_src_api_init,
-    .fesv_deinit = fib_entry_src_api_deinit,
-    .fesv_add = fib_entry_src_api_add,
-    .fesv_remove = fib_entry_src_api_remove,
-    .fesv_path_add = fib_entry_src_api_path_add,
-    .fesv_path_swap = fib_entry_src_api_path_swap,
-    .fesv_path_remove = fib_entry_src_api_path_remove,
-};
-
-void
-fib_entry_src_api_register (void)
-{
-    fib_entry_src_register(FIB_SOURCE_PLUGIN_HI, &api_src_vft);
-    fib_entry_src_register(FIB_SOURCE_API, &api_src_vft);
-    fib_entry_src_register(FIB_SOURCE_CLI, &api_src_vft);
-    fib_entry_src_register(FIB_SOURCE_DHCP, &api_src_vft);
-}
diff --git a/vnet/vnet/fib/fib_entry_src_default.c b/vnet/vnet/fib/fib_entry_src_default.c
deleted file mode 100644
index 9846cf56..00000000
--- a/vnet/vnet/fib/fib_entry_src_default.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "fib_entry.h"
-#include "fib_entry_src.h"
-#include "fib_path_list.h"
-
-/**
- * Source initialisation Function 
- */
-static void
-fib_entry_src_default_init (fib_entry_src_t *src)
-{
-}
-
-/**
- * Source deinitialisation Function 
- */
-static void
-fib_entry_src_default_deinit (fib_entry_src_t *src)
-{
-}
-
-static void
-fib_entry_src_cover_change (fib_entry_src_t *src)
-{
-}
-
-/**
- * Source deinitialisation Function 
- */
-static void
-fib_entry_src_default_deinit (fib_entry_src_t *src)
-{
-}
-
-static void
-fib_entry_src_default_path_add (fib_entry_src_t *src,
-				fib_protocol_t proto,
-				const ip46_address_t *next_hop,
-				u32 next_hop_sw_if_index,
-				u32 next_hop_fib_index,
-				u32 next_hop_weight)
-{
-}
-
-static void
-fib_entry_src_default_path_remove (fib_entry_src_t *src,
-				     fib_protocol_t proto,
-				     const ip46_address_t *next_hop,
-				     u32 next_hop_sw_if_index,
-				     u32 next_hop_fib_index,
-				     u32 next_hop_weight)
-{
-}
-
-
-/*
- * Source activate. 
- * Called when the source is teh new longer best source on the entry
- */
-static void
-fib_entry_src_default_activate (fib_entry_src_t *src,
-				  const fib_entry_t *fib_entry)
-{
-}
-
-/*
- * Source Deactivate. 
- * Called when the source is no longer best source on the entry
- */
-static void
-fib_entry_src_default_deactivate (fib_entry_src_t *src,
-				    const fib_entry_t *fib_entry)
-{
-}
-
-static void
-fib_entry_src_default_add (fib_entry_src_t *src,
-			     fib_entry_flag_t flags,
-			     fib_protocol_t proto)
-{
-}
-
-static void
-fib_entry_src_default_remove (fib_entry_src_t *src)			     
-{
-}
-
-const static fib_entry_src_vft_t default_src_vft = {
-    .fesv_init = fib_entry_src_default_init,
-    .fesv_deinit = fib_entry_src_default_deinit,
-    .fesv_add = fib_entry_src_default_add,
-    .fesv_remove = fib_entry_src_default_remove,
-    .fesv_path_add = fib_entry_src_default_path_add,
-    .fesv_path_remove = fib_entry_src_default_path_remove,
-    .fesv_activate = fib_entry_src_default_activate,
-    .fesv_deactivate = fib_entry_src_default_deactivate,
-};
-
-void
-fib_entry_src_default_register (void)
-{
-    fib_source_t source;
-
-    FOR_EACH_FIB_SOURCE(source) {
-	fib_entry_src_register(source, &default_src_vft);    
-    }
-}
diff --git a/vnet/vnet/fib/fib_entry_src_default_route.c b/vnet/vnet/fib/fib_entry_src_default_route.c
deleted file mode 100644
index 9f4e7c36..00000000
--- a/vnet/vnet/fib/fib_entry_src_default_route.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "fib_entry.h"
-#include "fib_entry_src.h"
-
-/**
- * Source initialisation Function 
- */
-static void
-fib_entry_src_default_route_init (fib_entry_src_t *src)
-{
-    src->fes_flags = FIB_ENTRY_SRC_FLAG_NONE;
-}
-
-static void
-fib_entry_src_default_route_remove (fib_entry_src_t *src)
-{
-    src->fes_pl = FIB_NODE_INDEX_INVALID;
-}
-
-static void
-fib_entry_src_default_route_add (fib_entry_src_t *src,
-				 const fib_entry_t *entry,
-				 fib_entry_flag_t flags,
-				 fib_protocol_t proto,
-				 const dpo_id_t *dpo)
-{
-    src->fes_pl = fib_path_list_create_special(proto,
-					       FIB_PATH_LIST_FLAG_DROP,
-					       dpo);
-}
-
-const static fib_entry_src_vft_t interface_src_vft = {
-    .fesv_init = fib_entry_src_default_route_init,
-    .fesv_add = fib_entry_src_default_route_add,
-    .fesv_remove = fib_entry_src_default_route_remove,
-};
-
-void
-fib_entry_src_default_route_register (void)
-{
-    fib_entry_src_register(FIB_SOURCE_DEFAULT_ROUTE, &interface_src_vft);    
-}
-
-
diff --git a/vnet/vnet/fib/fib_entry_src_interface.c b/vnet/vnet/fib/fib_entry_src_interface.c
deleted file mode 100644
index ca04716e..00000000
--- a/vnet/vnet/fib/fib_entry_src_interface.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "fib_entry.h"
-#include "fib_entry_src.h"
-#include "fib_path_list.h"
-#include "fib_internal.h"
-#include "fib_table.h"
-#include "fib_entry_cover.h"
-#include "fib_attached_export.h"
-
-/**
- * Source initialisation Function 
- */
-static void
-fib_entry_src_interface_init (fib_entry_src_t *src)
-{
-    src->interface.fesi_cover = FIB_NODE_INDEX_INVALID;
-    src->interface.fesi_sibling = FIB_NODE_INDEX_INVALID;
-}
-
-static void
-fib_entry_src_interface_path_swap (fib_entry_src_t *src,
-				   const fib_entry_t *entry,
-				   fib_path_list_flags_t pl_flags,
-				   const fib_route_path_t *paths)
-{
-    ip_adjacency_t *adj;
-
-    src->fes_pl = fib_path_list_create(pl_flags, paths);
-
-    /*
-     * this is a hack to get the entry's prefix into the glean adjacnecy
-     * so that it is available for fast retreival in the switch path.
-     */
-    if (!(FIB_ENTRY_FLAG_LOCAL & src->fes_entry_flags))
-    {
-        adj = adj_get(fib_path_list_get_adj(
-			  src->fes_pl,
-			  fib_entry_get_default_chain_type(entry)));
-
-	if (IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index)
-        {
-            /*
-             * the connected prefix will link to a glean on a non-p2p
-             * interface.
-             */
-            adj->sub_type.glean.receive_addr = entry->fe_prefix.fp_addr;
-        }
-    }
-}
-
-/*
- * Source activate. 
- * Called when the source is teh new longer best source on the entry
- */
-static int
-fib_entry_src_interface_activate (fib_entry_src_t *src,
-				  const fib_entry_t *fib_entry)
-{
-    fib_entry_t *cover;
-
-    if (FIB_ENTRY_FLAG_LOCAL & src->fes_entry_flags)
-    {
-	/*
-	 * Track the covering attached/connected cover. This is so that
-	 * during an attached export of the cover, this local prefix is
-	 * also exported
-	 */
-	src->interface.fesi_cover =
-	    fib_table_get_less_specific(fib_entry->fe_fib_index,
-					&fib_entry->fe_prefix);
-
-	ASSERT(FIB_NODE_INDEX_INVALID != src->interface.fesi_cover);
-
-	cover = fib_entry_get(src->interface.fesi_cover);
-
-	src->interface.fesi_sibling =
-	    fib_entry_cover_track(cover, fib_entry_get_index(fib_entry));
-    }
-
-    return (!0);
-}
-
-
-/*
- * Source Deactivate. 
- * Called when the source is no longer best source on the entry
- */
-static void
-fib_entry_src_interface_deactivate (fib_entry_src_t *src,
-				    const fib_entry_t *fib_entry)
-{
-    fib_entry_t *cover;
-
-    /*
-     * remove the depednecy on the covering entry
-     */
-    if (FIB_NODE_INDEX_INVALID != src->interface.fesi_cover)
-    {
-	cover = fib_entry_get(src->interface.fesi_cover);
-
-	fib_entry_cover_untrack(cover, src->interface.fesi_sibling);
-
-	src->interface.fesi_cover = FIB_NODE_INDEX_INVALID;
-    }
-}
-
-static fib_entry_src_cover_res_t
-fib_entry_src_interface_cover_change (fib_entry_src_t *src,
-				      const fib_entry_t *fib_entry)
-{
-    fib_entry_src_cover_res_t res = {
-	.install = !0,
-	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
-    };
-
-    if (FIB_NODE_INDEX_INVALID == src->interface.fesi_cover)
-    {
-	/*
-	 * not tracking the cover. surprised we got poked?
-	 */
-	return (res);
-    }
-
-    /*
-     * this function is called when this entry's cover has a more specific
-     * entry inserted benaeth it. That does not necessarily mean that this
-     * entry is covered by the new prefix. check that
-     */
-    if (src->rr.fesr_cover != fib_table_get_less_specific(fib_entry->fe_fib_index,
-							  &fib_entry->fe_prefix))
-    {
-	fib_entry_src_interface_deactivate(src, fib_entry);
-	fib_entry_src_interface_activate(src, fib_entry);
-    }
-    return (res);
-}
-
-static void
-fib_entry_src_interface_installed (fib_entry_src_t *src,
-				   const fib_entry_t *fib_entry)
-{
-    /*
-     * The interface source now rules! poke our cover to get exported
-     */
-    fib_entry_t *cover;
-
-    if (FIB_NODE_INDEX_INVALID != src->interface.fesi_cover)
-    {
-	cover = fib_entry_get(src->interface.fesi_cover);
-
-	fib_attached_export_covered_added(cover,
-					  fib_entry_get_index(fib_entry));
-    }
-}
-
-static u8*
-fib_entry_src_interface_format (fib_entry_src_t *src,
-				u8* s)
-{
-    return (format(s, "cover:%d", src->interface.fesi_cover));
-}
-
-const static fib_entry_src_vft_t interface_src_vft = {
-    .fesv_init = fib_entry_src_interface_init,
-    .fesv_path_swap = fib_entry_src_interface_path_swap,
-    .fesv_activate = fib_entry_src_interface_activate,
-    .fesv_deactivate = fib_entry_src_interface_deactivate,
-    .fesv_format = fib_entry_src_interface_format,
-    .fesv_installed = fib_entry_src_interface_installed,
-    .fesv_cover_change = fib_entry_src_interface_cover_change,
-    /*
-     * not concerned about updates to the cover. the cover will
-     * decide to export or not
-     */
-};
-
-void
-fib_entry_src_interface_register (void)
-{
-    fib_entry_src_register(FIB_SOURCE_INTERFACE, &interface_src_vft);    
-}
diff --git a/vnet/vnet/fib/fib_entry_src_lisp.c b/vnet/vnet/fib/fib_entry_src_lisp.c
deleted file mode 100644
index 7f8b91bb..00000000
--- a/vnet/vnet/fib/fib_entry_src_lisp.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "fib_entry.h"
-#include "fib_entry_src.h"
-#include "fib_path_list.h"
-
-/**
- * Source initialisation Function 
- */
-static void
-fib_entry_src_lisp_init (fib_entry_src_t *src)
-{
-}
-
-/**
- * Source deinitialisation Function 
- */
-static void
-fib_entry_src_lisp_deinit (fib_entry_src_t *src)
-{
-}
-
-static void
-fib_entry_src_lisp_path_swap (fib_entry_src_t *src,
-			      const fib_entry_t *entry,
-			      fib_path_list_flags_t pl_flags,
-			     const fib_route_path_t *paths)
-{
-    src->fes_pl = fib_path_list_create((FIB_PATH_LIST_FLAG_SHARED | pl_flags),
-				       paths);
-}
-
-static void
-fib_entry_src_lisp_path_add (fib_entry_src_t *src,
-			    const fib_entry_t *entry,
-			    fib_path_list_flags_t pl_flags,
-			    const fib_route_path_t *paths)
-{
-    if (FIB_NODE_INDEX_INVALID == src->fes_pl)
-    {	
-	src->fes_pl =
-	    fib_path_list_create((FIB_PATH_LIST_FLAG_SHARED | pl_flags), paths);
-    }
-    else
-    {
-	src->fes_pl =
-	    fib_path_list_copy_and_path_add(src->fes_pl,
-					    (FIB_PATH_LIST_FLAG_SHARED | pl_flags),
-					    paths);
-    }
-}
-
-static void
-fib_entry_src_lisp_path_remove (fib_entry_src_t *src,
-			       fib_path_list_flags_t pl_flags,
-			       const fib_route_path_t *paths)
-{
-    if (FIB_NODE_INDEX_INVALID != src->fes_pl)
-    {
-	src->fes_pl =
-	    fib_path_list_copy_and_path_remove(src->fes_pl,
-					       (FIB_PATH_LIST_FLAG_SHARED | pl_flags),
-					       paths);
-    }
-}
-
-static void
-fib_entry_src_lisp_add (fib_entry_src_t *src,
-		       const fib_entry_t *entry,
-		       fib_entry_flag_t flags,
-		       fib_protocol_t proto,
-		       const dpo_id_t *dpo)
-{
-    if (FIB_ENTRY_FLAG_NONE != flags)
-    {
-	src->fes_pl = fib_path_list_create_special(
-	                  proto,
-			  fib_entry_src_flags_2_path_list_flags(flags),
-			  dpo);
-    }
-}
-
-static void
-fib_entry_src_lisp_remove (fib_entry_src_t *src)
-{
-    src->fes_pl = FIB_NODE_INDEX_INVALID;
-}
-
-static void
-fib_entry_src_lisp_set_data (fib_entry_src_t *src,
-                             const fib_entry_t *entry,
-                             const void *data)
-{
-    src->lisp.fesl_fib_index = *(u32*)data;
-}
-
-static const void*
-fib_entry_src_lisp_get_data (fib_entry_src_t *src,
-                             const fib_entry_t *entry)
-{
-    return (&(src->lisp.fesl_fib_index));
-}
-
-const static fib_entry_src_vft_t api_src_vft = {
-    .fesv_init = fib_entry_src_lisp_init,
-    .fesv_deinit = fib_entry_src_lisp_deinit,
-    .fesv_add = fib_entry_src_lisp_add,
-    .fesv_remove = fib_entry_src_lisp_remove,
-    .fesv_path_add = fib_entry_src_lisp_path_add,
-    .fesv_path_swap = fib_entry_src_lisp_path_swap,
-    .fesv_path_remove = fib_entry_src_lisp_path_remove,
-    .fesv_set_data = fib_entry_src_lisp_set_data,
-    .fesv_get_data = fib_entry_src_lisp_get_data,
-};
-
-void
-fib_entry_src_lisp_register (void)
-{
-    fib_entry_src_register(FIB_SOURCE_LISP, &api_src_vft);
-}
diff --git a/vnet/vnet/fib/fib_entry_src_mpls.c b/vnet/vnet/fib/fib_entry_src_mpls.c
deleted file mode 100644
index 14c7310f..00000000
--- a/vnet/vnet/fib/fib_entry_src_mpls.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/mpls/mpls_types.h>
-#include <vnet/dpo/drop_dpo.h>
-
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/fib_entry.h>
-#include <vnet/fib/fib_entry_src.h>
-#include <vnet/fib/mpls_fib.h>
-
-/**
- * Source initialisation Function 
- */
-static void
-fib_entry_src_mpls_init (fib_entry_src_t *src)
-{
-    mpls_eos_bit_t eos;
-
-    src->fes_flags = FIB_ENTRY_SRC_FLAG_NONE;
-    src->mpls.fesm_label = MPLS_LABEL_INVALID;
-
-    FOR_EACH_MPLS_EOS_BIT(eos)
-    {
-	src->mpls.fesm_lfes[eos] = FIB_NODE_INDEX_INVALID;
-    }
-}
-
-/**
- * Source deinitialisation Function 
- */
-static void
-fib_entry_src_mpls_deinit (fib_entry_src_t *src)
-{
-}
-
-static void
-fib_entry_src_mpls_remove (fib_entry_src_t *src)
-{
-    src->fes_pl = FIB_NODE_INDEX_INVALID;
-    src->mpls.fesm_label = MPLS_LABEL_INVALID;
-}
-
-static void
-fib_entry_src_mpls_add (fib_entry_src_t *src,
-                        const fib_entry_t *entry,
-                        fib_entry_flag_t flags,
-                        fib_protocol_t proto,
-                        const dpo_id_t *dpo)
-{
-    src->fes_pl =
-	fib_path_list_create_special(proto,
-				     FIB_PATH_LIST_FLAG_DROP,
-				     drop_dpo_get(fib_proto_to_dpo(proto)));
-}
-
-static void
-fib_entry_src_mpls_set_data (fib_entry_src_t *src,
-                             const fib_entry_t *entry,
-                             const void *data)
-{
-    fib_protocol_t payload_proto;
-    fib_node_index_t fei;
-    mpls_label_t label;
-    mpls_eos_bit_t eos;
-
-    /*
-     * post MPLS table alloc and the possible rea-alloc of fib entrys
-     * the entry pointer will no longer be valid. so save its index
-     */
-    payload_proto = entry->fe_prefix.fp_proto;
-    fei = fib_entry_get_index(entry);
-    label = *(mpls_label_t*)data;
-
-    if (MPLS_LABEL_INVALID == label)
-    {
-        /*
-         * removing the local label
-         */
-        FOR_EACH_MPLS_EOS_BIT(eos)
-        {
-	    fib_table_entry_delete_index(src->mpls.fesm_lfes[eos],
-					 FIB_SOURCE_SPECIAL);
-        }
-        fib_table_unlock(MPLS_FIB_DEFAULT_TABLE_ID, FIB_PROTOCOL_MPLS);
-        src->mpls.fesm_label = label;
-    }
-    else
-    {
-	fib_prefix_t prefix = {
-	    .fp_proto = FIB_PROTOCOL_MPLS,
-	    .fp_label = label,
-	};
-	fib_node_index_t fib_index;
-	dpo_id_t dpo = DPO_INVALID;
-
-        /*
-         * adding a new local label. make sure the MPLS fib exists.
-         */
-        if (MPLS_LABEL_INVALID == src->mpls.fesm_label)
-        {
-            fib_index =
-		fib_table_find_or_create_and_lock(FIB_PROTOCOL_MPLS,
-						  MPLS_FIB_DEFAULT_TABLE_ID);
-        }
-	else
-	{
-	    fib_index = mpls_fib_index_from_table_id(MPLS_FIB_DEFAULT_TABLE_ID);
-
-	    /*
-	     * if this is a change in label, reomve the old one first
-	     */
-	    if (src->mpls.fesm_label != label)
-	    {
-		FOR_EACH_MPLS_EOS_BIT(eos)
-		{
-		    ASSERT(FIB_NODE_INDEX_INVALID != src->mpls.fesm_lfes[eos]);
-		    fib_table_entry_delete_index(src->mpls.fesm_lfes[eos],
-						 FIB_SOURCE_SPECIAL);
-		}
-	    }
-	}
-
-        src->mpls.fesm_label = label;
-
-	FOR_EACH_MPLS_EOS_BIT(eos)
-	{
-	    prefix.fp_eos = eos;
-	    prefix.fp_payload_proto = fib_proto_to_dpo(payload_proto);
-
-	    fib_entry_contribute_forwarding(fei,
-					    (eos ?
-					     FIB_FORW_CHAIN_TYPE_MPLS_EOS :
-					     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS),
-					    &dpo);
-	    src->mpls.fesm_lfes[eos] = 
-		fib_table_entry_special_dpo_add(fib_index,
-						&prefix,
-						FIB_SOURCE_SPECIAL,
-						FIB_ENTRY_FLAG_EXCLUSIVE,
-						&dpo);
-	    dpo_reset(&dpo);
-	}
-    }
-}
-
-static const void *
-fib_entry_src_mpls_get_data (fib_entry_src_t *src,
-                             const fib_entry_t *entry)
-{
-    return (&(src->mpls.fesm_label));
-}
-
-static u8*
-fib_entry_src_mpls_format (fib_entry_src_t *src,
-			   u8* s)
-{
-    return (format(s, "MPLS local-label:%d", src->mpls.fesm_label));
-}
-
-const static fib_entry_src_vft_t mpls_src_vft = {
-    .fesv_init = fib_entry_src_mpls_init,
-    .fesv_deinit = fib_entry_src_mpls_deinit,
-    .fesv_add = fib_entry_src_mpls_add,
-    .fesv_remove = fib_entry_src_mpls_remove,
-    .fesv_format = fib_entry_src_mpls_format,
-    .fesv_set_data = fib_entry_src_mpls_set_data,
-    .fesv_get_data = fib_entry_src_mpls_get_data,
-    /*
-     * .fesv_fwd_update = fib_entry_src_mpls_fwd_update,
-     *  When the forwarding for the IP entry is updated, any MPLS chains
-     * it has created are also updated. Since the MPLS entry will have already
-     * installed that chain/load-balance there is no need to update the netry
-     * FIXME: later: propagate any walk to the children of the MPLS entry. for SR
-     */
-};
-
-void
-fib_entry_src_mpls_register (void)
-{
-    fib_entry_src_register(FIB_SOURCE_MPLS, &mpls_src_vft);    
-}
-
-
diff --git a/vnet/vnet/fib/fib_entry_src_rr.c b/vnet/vnet/fib/fib_entry_src_rr.c
deleted file mode 100644
index ff15c54e..00000000
--- a/vnet/vnet/fib/fib_entry_src_rr.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/ip/format.h>
-#include <vnet/ip/lookup.h>
-#include <vnet/adj/adj.h>
-#include <vnet/dpo/drop_dpo.h>
-
-#include "fib_entry_src.h"
-#include "fib_entry_cover.h"
-#include "fib_entry.h"
-#include "fib_table.h"
-
-/*
- * fib_entry_src_rr_resolve_via_connected
- *
- * Resolve via a connected cover.
- */
-static void
-fib_entry_src_rr_resolve_via_connected (fib_entry_src_t *src,
-					const fib_entry_t *fib_entry,
-					const fib_entry_t *cover)
-{
-    const fib_route_path_t path = {
-	.frp_proto = fib_entry->fe_prefix.fp_proto,
-	.frp_addr = fib_entry->fe_prefix.fp_addr,
-	.frp_sw_if_index = fib_entry_get_resolving_interface(
-	                       fib_entry_get_index(cover)),
-	.frp_fib_index = ~0,
-	.frp_weight = 1,
-    };
-    fib_route_path_t *paths = NULL;
-    vec_add1(paths, path);
-
-    /*
-     * since the cover is connected, the address this entry corresponds
-     * to is a peer (ARP-able for) on the interface to which the cover is
-     * connected. The fact we resolve via the cover, just means this RR
-     * source is the first SRC to use said peer. The ARP source will be along
-     * shortly to over-rule this RR source.
-     */
-    src->fes_pl = fib_path_list_create(FIB_PATH_LIST_FLAG_NONE, paths);
-    src->fes_entry_flags = fib_entry_get_flags(fib_entry_get_index(cover));
-
-    vec_free(paths);
-}
-
-
-/**
- * Source initialisation Function 
- */
-static void
-fib_entry_src_rr_init (fib_entry_src_t *src)
-{
-    src->rr.fesr_cover = FIB_NODE_INDEX_INVALID;
-    src->rr.fesr_sibling = FIB_NODE_INDEX_INVALID;
-}
-
-/*
- * Source activation. Called when the source is the new best source on the entry
- */
-static int
-fib_entry_src_rr_activate (fib_entry_src_t *src,
-			   const fib_entry_t *fib_entry)
-{
-    fib_entry_t *cover;
-
-    /*
-     * find the covering prefix. become a dependent thereof.
-     * for IP there should always be a cover, though it may be the default route.
-     * For MPLS there is never a cover.
-     */
-    if (FIB_PROTOCOL_MPLS == fib_entry->fe_prefix.fp_proto)
-    {
-	src->fes_pl = fib_path_list_create_special(FIB_PROTOCOL_MPLS,
-						   FIB_PATH_LIST_FLAG_DROP,
-						   NULL);
-	fib_path_list_lock(src->fes_pl);
-	return (!0);
-    }
-
-    src->rr.fesr_cover = fib_table_get_less_specific(fib_entry->fe_fib_index,
-						     &fib_entry->fe_prefix);
-
-    ASSERT(FIB_NODE_INDEX_INVALID != src->rr.fesr_cover);
-
-    cover = fib_entry_get(src->rr.fesr_cover);
-
-    src->rr.fesr_sibling =
-	fib_entry_cover_track(cover, fib_entry_get_index(fib_entry));
-
-    /*
-     * if the ocver is attached then install an attached-host path
-     * (like an adj-fib). Otherwise inherit the forwarding from the cover
-     */
-    if (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(cover))
-    {
-	fib_entry_src_rr_resolve_via_connected(src, fib_entry, cover);
-    }
-    else
-    {
-        /*
-         * use the path-list of the cover, unless it would form a loop.
-         * that is unless the cover is via this entry.
-         * If a loop were to form it would be a 1 level loop (i.e. X via X),
-         * and there would be 2 locks on the path-list; one since its used
-         * by the cover, and 1 from here. The first lock will go when the
-         * cover is removed, the second, and last, when the covered walk
-         * occurs during the cover's removel - this is not a place where
-         * we can handle last lock gone.
-         * In short, don't let the loop form. The usual rules of 'we must
-         * let it form so we know when it breaks' don't apply here, since
-         * the loop will break when the cover changes, and this function
-         * will be called again when that happens.
-         */
-        fib_node_index_t *entries = NULL;
-        fib_protocol_t proto;
-
-        proto = fib_entry->fe_prefix.fp_proto;
-        vec_add1(entries, fib_entry_get_index(fib_entry));
-
-        if (fib_path_list_recursive_loop_detect(cover->fe_parent,
-                                                &entries))
-        {
-            src->fes_pl = fib_path_list_create_special(
-                              proto,
-                              FIB_PATH_LIST_FLAG_DROP,
-                              drop_dpo_get(fib_proto_to_dpo(proto)));
-        }
-        else
-        {
-            src->fes_pl = cover->fe_parent;
-        }
-        vec_free(entries);
-
-    }
-    fib_path_list_lock(src->fes_pl);
-
-    /*
-     * return go for install
-     */
-    return (!0);
-}
-
-/**
- * Source Deactivate. 
- * Called when the source is no longer best source on the entry
- */
-static void
-fib_entry_src_rr_deactivate (fib_entry_src_t *src,
-			     const fib_entry_t *fib_entry)
-{
-    fib_entry_t *cover;
-
-    /*
-     * remove the depednecy on the covering entry
-     */
-    if (FIB_NODE_INDEX_INVALID != src->rr.fesr_cover)
-    {
-	cover = fib_entry_get(src->rr.fesr_cover);
-	fib_entry_cover_untrack(cover, src->rr.fesr_sibling);
-	src->rr.fesr_cover = FIB_NODE_INDEX_INVALID;
-    }
-
-    fib_path_list_unlock(src->fes_pl);
-    src->fes_pl = FIB_NODE_INDEX_INVALID;
-    src->fes_entry_flags = FIB_ENTRY_FLAG_NONE;
-}
-
-static fib_entry_src_cover_res_t
-fib_entry_src_rr_cover_change (fib_entry_src_t *src,
-			       const fib_entry_t *fib_entry)
-{
-    fib_entry_src_cover_res_t res = {
-	.install = !0,
-	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
-    };
-
-    if (FIB_NODE_INDEX_INVALID == src->rr.fesr_cover)
-    {
-	/*
-	 * the source may be added, but it is not active
-	 * if it is not tracking the cover.
-	 */
-	return (res);
-    }
-
-    /*
-     * this function is called when this entry's cover has a more specific
-     * entry inserted benaeth it. That does not necessarily mean that this
-     * entry is covered by the new prefix. check that
-     */
-    if (src->rr.fesr_cover != fib_table_get_less_specific(fib_entry->fe_fib_index,
-							  &fib_entry->fe_prefix))
-    {
-	fib_entry_src_rr_deactivate(src, fib_entry);
-	fib_entry_src_rr_activate(src, fib_entry);
-
-	/*
-	 * dependent children need to re-resolve to the new forwarding info
-	 */
-	res.bw_reason = FIB_NODE_BW_REASON_FLAG_EVALUATE;
-    }
-    return (res);
-}
-
-/*
- * fib_entry_src_rr_cover_update
- *
- * This entry's cover has updated its forwarding info. This entry
- * will need to re-inheret.
- */
-static fib_entry_src_cover_res_t
-fib_entry_src_rr_cover_update (fib_entry_src_t *src,
-			       const fib_entry_t *fib_entry)
-{
-    fib_entry_src_cover_res_t res = {
-	.install = !0,
-	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
-    };
-    fib_node_index_t old_path_list;
-    fib_entry_t *cover;
-
-    if (FIB_NODE_INDEX_INVALID == src->rr.fesr_cover)
-    {
-	/*
-	 * the source may be added, but it is not active
-	 * if it is not tracking the cover.
-	 */
-	return (res);
-    }
-
-    cover = fib_entry_get(src->rr.fesr_cover);
-    old_path_list = src->fes_pl;
-
-    /*
-     * if the ocver is attached then install an attached-host path
-     * (like an adj-fib). Otherwise inherit the forwarding from the cover
-     */
-    if (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(cover))
-    {
-	fib_entry_src_rr_resolve_via_connected(src, fib_entry, cover);
-    }
-    else
-    {
-	src->fes_pl = cover->fe_parent;
-    }
-    fib_path_list_lock(src->fes_pl);
-    fib_path_list_unlock(old_path_list);
-
-    /*
-     * dependent children need to re-resolve to the new forwarding info
-     */
-    res.bw_reason = FIB_NODE_BW_REASON_FLAG_EVALUATE;
-
-    return (res);
-}
-
-static u8*
-fib_entry_src_rr_format (fib_entry_src_t *src,
-			 u8* s)
-{
-    return (format(s, "cover:%d", src->rr.fesr_cover));
-}
-
-const static fib_entry_src_vft_t rr_src_vft = {
-    .fesv_init = fib_entry_src_rr_init,
-    .fesv_activate = fib_entry_src_rr_activate,
-    .fesv_deactivate = fib_entry_src_rr_deactivate,
-    .fesv_cover_change = fib_entry_src_rr_cover_change,
-    .fesv_cover_update = fib_entry_src_rr_cover_update,
-    .fesv_format = fib_entry_src_rr_format,
-};
-
-void
-fib_entry_src_rr_register (void)
-{
-    fib_entry_src_register(FIB_SOURCE_RR, &rr_src_vft);    
-    fib_entry_src_register(FIB_SOURCE_URPF_EXEMPT, &rr_src_vft);    
-}
diff --git a/vnet/vnet/fib/fib_entry_src_special.c b/vnet/vnet/fib/fib_entry_src_special.c
deleted file mode 100644
index 52a6134e..00000000
--- a/vnet/vnet/fib/fib_entry_src_special.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "fib_entry.h"
-#include "fib_entry_src.h"
-
-/**
- * Source initialisation Function
- */
-static void
-fib_entry_src_special_init (fib_entry_src_t *src)
-{
-    src->fes_flags = FIB_ENTRY_SRC_FLAG_NONE;
-}
-
-/**
- * Source deinitialisation Function
- */
-static void
-fib_entry_src_special_deinit (fib_entry_src_t *src)
-{
-}
-
-static void
-fib_entry_src_special_remove (fib_entry_src_t *src)
-{
-    src->fes_pl = FIB_NODE_INDEX_INVALID;
-}
-
-static void
-fib_entry_src_special_add (fib_entry_src_t *src,
-			   const fib_entry_t *entry,
-			   fib_entry_flag_t flags,
-			   fib_protocol_t proto,
-			   const dpo_id_t *dpo)
-{
-    src->fes_pl =
-	fib_path_list_create_special(proto,
-				     fib_entry_src_flags_2_path_list_flags(flags),
-				     dpo);
-}
-
-const static fib_entry_src_vft_t special_src_vft = {
-    .fesv_init = fib_entry_src_special_init,
-    .fesv_deinit = fib_entry_src_special_deinit,
-    .fesv_add = fib_entry_src_special_add,
-    .fesv_remove = fib_entry_src_special_remove,
-};
-
-void
-fib_entry_src_special_register (void)
-{
-    fib_entry_src_register(FIB_SOURCE_SPECIAL, &special_src_vft);
-    fib_entry_src_register(FIB_SOURCE_MAP, &special_src_vft);
-    fib_entry_src_register(FIB_SOURCE_SIXRD, &special_src_vft);
-    fib_entry_src_register(FIB_SOURCE_CLASSIFY, &special_src_vft);
-    fib_entry_src_register(FIB_SOURCE_SR, &special_src_vft);
-    fib_entry_src_register(FIB_SOURCE_AE, &special_src_vft);
-}
diff --git a/vnet/vnet/fib/fib_internal.h b/vnet/vnet/fib/fib_internal.h
deleted file mode 100644
index 2d980bcc..00000000
--- a/vnet/vnet/fib/fib_internal.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __FIB_INTERNAL_H__
-#define __FIB_INTERNAL_H__
-
-#include <vnet/ip/ip.h>
-#include <vnet/dpo/dpo.h>
-
-/**
- * Big train switch; FIB debugs on or off
- */
-#undef FIB_DEBUG
-
-extern void fib_prefix_from_mpls_label(mpls_label_t label,
-				       fib_prefix_t *prf);
-
-extern int fib_route_path_cmp(const fib_route_path_t *rpath1,
-			      const fib_route_path_t *rpath2);
-
-/**
- * @brief
- *  Add or update an entry in the FIB's forwarding table.
- * This is called from the fib_entry code. It is not meant to be used
- * by the client/source.
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix for the entry to add/update
- *
- * @param dpo
- *  The data-path object to use for forwarding
- */
-extern void fib_table_fwding_dpo_update(u32 fib_index,
-					const fib_prefix_t *prefix,
-					const dpo_id_t *dpo);
-/**
- * @brief
- *  remove an entry in the FIB's forwarding table
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix for the entry to add/update
- *
- * @param dpo
- *  The data-path object to use for forwarding
- */
-extern void fib_table_fwding_dpo_remove(u32 fib_index,
-					const fib_prefix_t *prefix,
-					const dpo_id_t *dpo);
-
-
-#endif
diff --git a/vnet/vnet/fib/fib_node.c b/vnet/vnet/fib/fib_node.c
deleted file mode 100644
index db3e22bb..00000000
--- a/vnet/vnet/fib/fib_node.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/fib/fib_node.h>
-#include <vnet/fib/fib_node_list.h>
-
-/*
- * The per-type vector of virtual function tables
- */
-static fib_node_vft_t *fn_vfts;
-
-/**
- * The last registered new type
- */
-static fib_node_type_t last_new_type = FIB_NODE_TYPE_LAST;
-
-/*
- * the node type names
- */
-static const char *fn_type_names[] = FIB_NODE_TYPES;
-
-const char*
-fib_node_type_get_name (fib_node_type_t type)
-{
-    if (type < FIB_NODE_TYPE_LAST)
-	return (fn_type_names[type]);
-    else
-    {
-	if (NULL != fn_vfts[type].fnv_format)
-	{
-	    return ("fixme");
-	}
-	else
-	{
-	    return ("unknown");
-	}
-    }
-}
-
-/**
- * fib_node_register_type
- *
- * Register the function table for a given type
- */
-void
-fib_node_register_type (fib_node_type_t type,
-			const fib_node_vft_t *vft)
-{
-    /*
-     * assert that one only registration is made per-node type
-     */
-    if (vec_len(fn_vfts) > type)
-	ASSERT(NULL == fn_vfts[type].fnv_get);
-
-    /*
-     * Assert that we are getting each of the required functions
-     */
-    ASSERT(NULL != vft->fnv_get);
-    ASSERT(NULL != vft->fnv_last_lock);
-
-    vec_validate(fn_vfts, type);
-    fn_vfts[type] = *vft;
-}
-
-fib_node_type_t
-fib_node_register_new_type (const fib_node_vft_t *vft)
-{
-    fib_node_type_t new_type;
-
-    new_type = ++last_new_type;
-
-    fib_node_register_type(new_type, vft);
-
-    return (new_type);
-}   
-
-static u8*
-fib_node_format (fib_node_ptr_t *fnp, u8*s)
-{
-    return (format(s, "{%s:%d}", fn_type_names[fnp->fnp_type], fnp->fnp_index)); 
-}
-
-u32
-fib_node_child_add (fib_node_type_t parent_type,
-                    fib_node_index_t parent_index,
-                    fib_node_type_t type,
-		    fib_node_index_t index)
-{
-    fib_node_t *parent;
-
-    parent = fn_vfts[parent_type].fnv_get(parent_index);
-
-    /*
-     * return the index of the sibling in the child list
-     */
-    fib_node_lock(parent);
-
-    if (FIB_NODE_INDEX_INVALID == parent->fn_children)
-    {
-        parent->fn_children = fib_node_list_create();
-    }   
-
-    return (fib_node_list_push_front(parent->fn_children,
-                                     0, type,
-                                     index));
-}
-
-void
-fib_node_child_remove (fib_node_type_t parent_type,
-                       fib_node_index_t parent_index,
-                       fib_node_index_t sibling_index)
-{
-    fib_node_t *parent;
-
-    parent = fn_vfts[parent_type].fnv_get(parent_index);
-
-    fib_node_list_remove(parent->fn_children, sibling_index);
-
-    if (0 == fib_node_list_get_size(parent->fn_children))
-    {
-        fib_node_list_destroy(&parent->fn_children);
-    }
-
-    fib_node_unlock(parent);
-}
-
-u32
-fib_node_get_n_children (fib_node_type_t parent_type,
-                         fib_node_index_t parent_index)
-{
-    fib_node_t *parent;
-
-    parent = fn_vfts[parent_type].fnv_get(parent_index);
-
-    return (fib_node_list_get_size(parent->fn_children));
-}
-
-
-fib_node_back_walk_rc_t
-fib_node_back_walk_one (fib_node_ptr_t *ptr,
-                        fib_node_back_walk_ctx_t *ctx)
-{
-    fib_node_t *node;
-
-    node = fn_vfts[ptr->fnp_type].fnv_get(ptr->fnp_index);
-
-    return (fn_vfts[ptr->fnp_type].fnv_back_walk(node, ctx));
-}
-
-static int
-fib_node_ptr_format_one_child (fib_node_ptr_t *ptr,
-			       void *arg)
-{
-    u8 **s = (u8**) arg;
-
-    *s = fib_node_format(ptr, *s);
-
-    return (1);
-}
-
-u8*
-fib_node_children_format (fib_node_list_t list,
-			  u8 *s)
-{
-    fib_node_list_walk(list, fib_node_ptr_format_one_child, (void*)&s);
-
-    return (s);
-}
-
-void
-fib_node_init (fib_node_t *node,
-	       fib_node_type_t type)
-{
-#if CLIB_DEBUG > 0
-    /**
-     * The node's type. make sure we are dynamic/down casting correctly
-     */
-    node->fn_type = type;
-#endif
-    node->fn_locks = 0;
-    node->fn_vft = &fn_vfts[type];
-    node->fn_children = FIB_NODE_INDEX_INVALID;
-}
-
-void
-fib_node_deinit (fib_node_t *node)
-{
-    fib_node_list_destroy(&node->fn_children);
-}
-
-void
-fib_node_lock (fib_node_t *node)
-{
-    node->fn_locks++;
-}
-
-void
-fib_node_unlock (fib_node_t *node)
-{
-    node->fn_locks--;
-
-    if (0 == node->fn_locks)
-    {
-	node->fn_vft->fnv_last_lock(node);
-    }
-}
-
-void
-fib_show_memory_usage (const char *name,
-		       u32 in_use_elts,
-		       u32 allocd_elts,
-		       size_t size_elt)
-{
-    vlib_cli_output (vlib_get_main(), "%=30s %=5d %=8d/%=9d   %d/%d ",
-		     name, size_elt,
-		     in_use_elts, allocd_elts,
-		     in_use_elts*size_elt, allocd_elts*size_elt);
-}
-
-static clib_error_t *
-fib_memory_show (vlib_main_t * vm,
-		 unformat_input_t * input,
-		 vlib_cli_command_t * cmd)
-{
-    fib_node_vft_t *vft;
-
-    vlib_cli_output (vm, "FIB memory");
-    vlib_cli_output (vm, "%=30s %=5s %=8s/%=9s   totals",
-		     "Name","Size", "in-use", "allocated");
-
-    vec_foreach(vft, fn_vfts)
-    {
-	if (NULL != vft->fnv_mem_show)
-	    vft->fnv_mem_show();
-    }
-
-    fib_node_list_memory_show();
-
-    return (NULL);
-}
-
-/* *INDENT-OFF* */
-/*?
- * The '<em>sh fib memory </em>' command displays the memory usage for each
- * FIB object type.
- *
- * @cliexpar
- * @cliexstart{show fib memory}
- * FIB memory
- *             Name               Size  in-use /allocated   totals
- *             Entry              120     11   /    11      1320/1320
- *         Entry Source            32     11   /    11      352/352
- *     Entry Path-Extensions       44      0   /    0       0/0
- *           Path-list             40     11   /    11      440/440
- *             Path                88     11   /    11      968/968
- *      Node-list elements         20     11   /    11      220/220
- *        Node-list heads          8      13   /    13      104/104
- * @cliexend
-?*/
-VLIB_CLI_COMMAND (show_fib_memory, static) = {
-    .path = "show fib memory",
-    .function = fib_memory_show,
-    .short_help = "show fib memory",
-};
-/* *INDENT-ON* */
diff --git a/vnet/vnet/fib/fib_node.h b/vnet/vnet/fib/fib_node.h
deleted file mode 100644
index 3ad8ee95..00000000
--- a/vnet/vnet/fib/fib_node.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __FIB_NODE_H__
-#define __FIB_NODE_H__
-
-#include <vnet/fib/fib_types.h>
-
-/**
- * The types of nodes in a FIB graph
- */
-typedef enum fib_node_type_t_ {
-    /**
-     * Marker. New types after this one.
-     */
-    FIB_NODE_TYPE_FIRST = 0,
-    /**
-     * See the respective fib_*.h files for descriptions of these objects.
-     */
-    FIB_NODE_TYPE_WALK,
-    FIB_NODE_TYPE_ENTRY,
-    FIB_NODE_TYPE_PATH_LIST,
-    FIB_NODE_TYPE_PATH,
-    FIB_NODE_TYPE_ADJ,
-    FIB_NODE_TYPE_MPLS_ENTRY,
-    FIB_NODE_TYPE_MPLS_TUNNEL,
-    FIB_NODE_TYPE_LISP_GPE_FWD_ENTRY,
-    FIB_NODE_TYPE_LISP_ADJ,
-    FIB_NODE_TYPE_GRE_TUNNEL,
-    FIB_NODE_TYPE_VXLAN_TUNNEL,
-    /**
-     * Marker. New types before this one. leave the test last.
-     */
-    FIB_NODE_TYPE_TEST,
-    FIB_NODE_TYPE_LAST = FIB_NODE_TYPE_TEST,
-} fib_node_type_t;
-
-#define FIB_NODE_TYPE_MAX (FIB_NODE_TYPE_LAST + 1)
-
-#define FIB_NODE_TYPES {                          \
-    [FIB_NODE_TYPE_ENTRY]     = "entry",          \
-    [FIB_NODE_TYPE_WALK]      = "walk",           \
-    [FIB_NODE_TYPE_PATH_LIST] = "path-list",      \
-    [FIB_NODE_TYPE_PATH]      = "path",           \
-    [FIB_NODE_TYPE_MPLS_ENTRY] = "mpls-entry",    \
-    [FIB_NODE_TYPE_MPLS_TUNNEL] = "mpls-tunnel",  \
-    [FIB_NODE_TYPE_ADJ] = "adj",                  \
-    [FIB_NODE_TYPE_LISP_GPE_FWD_ENTRY] = "lisp-gpe-fwd-entry", \
-    [FIB_NODE_TYPE_LISP_ADJ] = "lisp-adj", \
-    [FIB_NODE_TYPE_GRE_TUNNEL] = "gre-tunnel", \
-    [FIB_NODE_TYPE_VXLAN_TUNNEL] = "vxlan-tunnel", \
-}
-
-/**
- * Reasons for backwalking the FIB object graph
- */
-typedef enum fib_node_back_walk_reason_t_ {
-    /**
-     * Marker. Add new ones after.
-     */
-    FIB_NODE_BW_REASON_FIRST = 0,
-    /**
-     * Walk to re-resolve the child.
-     * Used when the parent is no longer a valid resolution target
-     */
-    FIB_NODE_BW_REASON_RESOLVE = FIB_NODE_BW_REASON_FIRST,
-    /**
-     * Walk to re-evaluate the forwarding contributed by the parent.
-     * Used when a parent's forwarding changes and the child needs to
-     * incorporate this change in its forwarding.
-     */
-    FIB_NODE_BW_REASON_EVALUATE,
-    /**
-     * A resolving interface has come up
-     */
-    FIB_NODE_BW_REASON_INTERFACE_UP,
-    /**
-     * A resolving interface has gone down
-     */
-    FIB_NODE_BW_REASON_INTERFACE_DOWN,
-    /**
-     * A resolving interface has been deleted.
-     */
-    FIB_NODE_BW_REASON_INTERFACE_DELETE,
-    /**
-     * Walk to re-collapse the multipath adjs when the rewrite of
-     * a unipath adjacency changes
-     */
-    FIB_NODE_BW_REASON_ADJ_UPDATE,
-    /**
-     * Walk to update children to inform them the adjacency is now down.
-     */
-    FIB_NODE_BW_REASON_ADJ_DOWN,
-    /**
-     * Marker. Add new before and update
-     */
-    FIB_NODE_BW_REASON_LAST = FIB_NODE_BW_REASON_ADJ_DOWN,
-} fib_node_back_walk_reason_t;
-
-#define FIB_NODE_BW_REASONS {			            \
-    [FIB_NODE_BW_REASON_RESOLVE] = "resolve",	            \
-    [FIB_NODE_BW_REASON_EVALUATE] = "evaluate",             \
-    [FIB_NODE_BW_REASON_INTERFACE_UP] = "if-up",            \
-    [FIB_NODE_BW_REASON_INTERFACE_DOWN] = "if-down",        \
-    [FIB_NODE_BW_REASON_INTERFACE_DELETE] = "if-delete",    \
-    [FIB_NODE_BW_REASON_ADJ_UPDATE] = "adj-update",         \
-    [FIB_NODE_BW_REASON_ADJ_DOWN] = "adj-down",             \
-}
-
-#define FOR_EACH_FIB_NODE_BW_REASON(_item) \
-    for (_item = FIB_NODE_BW_REASON_FIRST; \
-	 _item <= FIB_NODE_BW_REASON_LAST; \
-	 _item++)
-
-/**
- * Flags enum constructed from the reaons
- */
-typedef enum fib_node_bw_reason_flag_t_ {
-    FIB_NODE_BW_REASON_FLAG_NONE = 0,
-    FIB_NODE_BW_REASON_FLAG_RESOLVE = (1 << FIB_NODE_BW_REASON_RESOLVE),
-    FIB_NODE_BW_REASON_FLAG_EVALUATE = (1 << FIB_NODE_BW_REASON_EVALUATE),
-    FIB_NODE_BW_REASON_FLAG_INTERFACE_UP = (1 << FIB_NODE_BW_REASON_INTERFACE_UP),
-    FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN = (1 << FIB_NODE_BW_REASON_INTERFACE_DOWN),
-    FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE = (1 << FIB_NODE_BW_REASON_INTERFACE_DELETE),
-    FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE = (1 << FIB_NODE_BW_REASON_ADJ_UPDATE),
-    FIB_NODE_BW_REASON_FLAG_ADJ_DOWN = (1 << FIB_NODE_BW_REASON_ADJ_DOWN),
-} __attribute__ ((packed)) fib_node_bw_reason_flag_t;
-
-STATIC_ASSERT(sizeof(fib_node_bw_reason_flag_t) < 2,
-	      "BW Reason enum < 2 byte. Consequences for cover_upd_res_t");
-
-/**
- * Flags on the walk
- */
-typedef enum fib_node_bw_flags_t_
-{
-    /**
-     * Force the walk to be synchronous
-     */
-    FIB_NODE_BW_FLAG_FORCE_SYNC = (1 << 0),
-} fib_node_bw_flags_t;
-
-/**
- * Forward eclarations
- */
-struct fib_node_t_;
-
-/**
- * A representation of one pointer to another node.
- * To fully qualify a node, one must know its type and its index so it
- * can be retrieved from the appropriate pool. Direct pointers to nodes
- * are forbidden, since all nodes are allocated from pools, which are vectors,
- * and thus subject to realloc at any time.
- */
-typedef struct fib_node_ptr_t_ {
-    /**
-     * node type
-     */
-    fib_node_type_t fnp_type;
-    /**
-     * node's index
-     */
-    fib_node_index_t fnp_index;
-} fib_node_ptr_t;
-
-/**
- * @brief A list of FIB nodes.
- */
-typedef u32 fib_node_list_t;
-
-/**
- * Context passed between object during a back walk.
- */
-typedef struct fib_node_back_walk_ctx_t_ {
-    /**
-     * The reason/trigger for the backwalk
-     */
-    fib_node_bw_reason_flag_t fnbw_reason;
-
-    /**
-     * additional flags for the walk
-     */
-    fib_node_bw_flags_t fnbw_flags;
-
-    /**
-     * the number of levels the walk has already traversed.
-     * this value is maintained by the walk infra, tp limit the depth of
-     * a walk so it does not run indefinately the presence of a loop/cycle
-     * in the graph.
-     */
-    u32 fnbw_depth;
-} fib_node_back_walk_ctx_t;
-
-/**
- * We consider a depth of 32 to be sufficient to cover all sane
- * network topologies. Anything more is then an indication that
- * there is a loop/cycle in the FIB graph.
- * Note that all object types contribute to 1 to the depth.
- */
-#define FIB_NODE_GRAPH_MAX_DEPTH ((u32)32)
-
-/**
- * A callback function for walking a node dependency list
- */
-typedef int (*fib_node_ptr_walk_t)(fib_node_ptr_t *depend,
-				   void *ctx);
-
-/**
- * A list of dependent nodes.
- * This is currently implemented as a hash_table of fib_node_ptr_t
- */
-typedef fib_node_ptr_t fib_node_ptr_list_t;
-
-/**
- * Return code from a back walk function
- */
-typedef enum fib_node_back_walk_rc_t_ {
-    FIB_NODE_BACK_WALK_MERGE,
-    FIB_NODE_BACK_WALK_CONTINUE,
-} fib_node_back_walk_rc_t;
-
-/**
- * Function definition to backwalk a FIB node
- */
-typedef fib_node_back_walk_rc_t (*fib_node_back_walk_t)(
-    struct fib_node_t_ *node,
-    fib_node_back_walk_ctx_t *ctx);
-
-/**
- * Function definition to get a FIB node from its index
- */
-typedef struct fib_node_t_* (*fib_node_get_t)(fib_node_index_t index);
-
-/**
- * Function definition to inform the FIB node that its last lock has gone.
- */
-typedef void (*fib_node_last_lock_gone_t)(struct fib_node_t_ *node);
-
-/**
- * Function definition to display the amount of memory used by a type.
- * Implementations should call fib_show_memory_usage()
- */
-typedef void (*fib_node_memory_show_t)(void);
-
-/**
- * A FIB graph nodes virtual function table
- */
-typedef struct fib_node_vft_t_ {
-    fib_node_get_t fnv_get;
-    fib_node_last_lock_gone_t fnv_last_lock;
-    fib_node_back_walk_t fnv_back_walk;
-    format_function_t *fnv_format;
-    fib_node_memory_show_t fnv_mem_show;
-} fib_node_vft_t;
-
-/**
- * An node in the FIB graph
- *
- * Objects in the FIB form a graph. 
- */
-typedef struct fib_node_t_ {
-#if CLIB_DEBUG > 0
-    /**
-     * The node's type. make sure we are dynamic/down casting correctly
-     */
-    fib_node_type_t fn_type;
-#endif
-    /**
-     * The node's VFT.
-     * we could store the type here instead, and lookup the VFT using that. But
-     * I like this better,
-     */
-    const fib_node_vft_t *fn_vft;
-
-    /**
-     * Vector of nodes that depend upon/use/share this node
-     */
-    fib_node_list_t fn_children;
-
-    /**
-     * Number of dependents on this node. This number includes the number
-     * of children
-     */
-    u32 fn_locks;
-} fib_node_t;
-
-/**
- * @brief
- *  Register the function table for a given type
- *
- * @param ft
- *  FIB node type
- *
- * @param vft
- * virtual function table
- */
-extern void fib_node_register_type (fib_node_type_t ft,
-				    const fib_node_vft_t *vft);
-
-/**
- * @brief
- *  Create a new FIB node type and Register the function table for it.
- *
- * @param vft
- * virtual function table
- *
- * @return new FIB node type
- */
-extern fib_node_type_t fib_node_register_new_type (const fib_node_vft_t *vft);
-
-/**
- * @brief Show the memory usage for a type
- *
- * This should be invoked by the type in response to the infra calling
- * its registered memory show function
- *
- * @param name the name of the type
- * @param in_use_elts The number of elements in use
- * @param allocd_elts The number of allocated pool elemenets
- * @param size_elt The size of one element
- */
-extern void fib_show_memory_usage(const char *name,
-				  u32 in_use_elts,
-				  u32 allocd_elts,
-				  size_t size_elt);
-
-extern void fib_node_init(fib_node_t *node,
-			  fib_node_type_t ft);
-extern void fib_node_deinit(fib_node_t *node);
-
-extern void fib_node_lock(fib_node_t *node);
-extern void fib_node_unlock(fib_node_t *node);
-
-extern u32 fib_node_get_n_children(fib_node_type_t parent_type,
-                                   fib_node_index_t parent_index);
-extern u32 fib_node_child_add(fib_node_type_t parent_type,
-			      fib_node_index_t parent_index,
-			      fib_node_type_t child_type,
-			      fib_node_index_t child_index);
-extern void fib_node_child_remove(fib_node_type_t parent_type,
-                                  fib_node_index_t parent_index,
-                                  fib_node_index_t sibling_index);
-
-extern fib_node_back_walk_rc_t fib_node_back_walk_one(fib_node_ptr_t *ptr,
-                                                      fib_node_back_walk_ctx_t *ctx);
-
-extern u8* fib_node_children_format(fib_node_list_t list,
-				    u8 *s);
-
-extern const char* fib_node_type_get_name(fib_node_type_t type);
-
-static inline int
-fib_node_index_is_valid (fib_node_index_t ni)
-{
-    return (FIB_NODE_INDEX_INVALID != ni);
-}
-
-#endif
-
diff --git a/vnet/vnet/fib/fib_node_list.c b/vnet/vnet/fib/fib_node_list.c
deleted file mode 100644
index ceb951b4..00000000
--- a/vnet/vnet/fib/fib_node_list.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief a hetrogeneous w.r.t. FIB node type, of FIB nodes.
- * Since we cannot use C pointers, due to memeory reallocs, the next/prev
- * are described as key:{type,index}.
- */
-
-#include <vnet/fib/fib_node_list.h>
-
-/**
- * @brief An element in the list
- */
-typedef struct fib_node_list_elt_t_
-{
-    /**
-     * The index of the list this element is in
-     */
-    fib_node_list_t fnle_list;
-
-    /**
-     * The owner of this element
-     */
-    fib_node_ptr_t fnle_owner;
-
-    /**
-     * The next element in the list
-     */
-    u32 fnle_next;
-
-    /**
-     * The previous element in the list
-     */
-    u32 fnle_prev;
-} fib_node_list_elt_t;
-
-/**
- * @brief A list of FIB nodes
- */
-typedef struct fib_node_list_head_t_
-{
-    /**
-     * The head element
-     */
-    u32 fnlh_head;
-
-    /**
-     * Number of elements in the list
-     */
-    u32 fnlh_n_elts;
-} fib_node_list_head_t;
-
-/**
- * Pools of list elements and heads
- */
-static fib_node_list_elt_t *fib_node_list_elt_pool;
-static fib_node_list_head_t *fib_node_list_head_pool;
-
-static index_t
-fib_node_list_elt_get_index (fib_node_list_elt_t *elt)
-{
-    return (elt - fib_node_list_elt_pool);
-}
-
-static fib_node_list_elt_t *
-fib_node_list_elt_get (index_t fi)
-{
-    return (pool_elt_at_index(fib_node_list_elt_pool, fi));
-}
-
-static index_t
-fib_node_list_head_get_index (fib_node_list_head_t *head)
-{
-    return (head - fib_node_list_head_pool);
-}
-static fib_node_list_head_t *
-fib_node_list_head_get (fib_node_list_t fi)
-{
-    return (pool_elt_at_index(fib_node_list_head_pool, fi));
-}
-
-static fib_node_list_elt_t *
-fib_node_list_elt_create (fib_node_list_head_t *head,
-                          int id,
-                          fib_node_type_t type,
-                          fib_node_index_t index)
-{
-    fib_node_list_elt_t *elt;
-
-    pool_get(fib_node_list_elt_pool, elt);
-
-    elt->fnle_list = fib_node_list_head_get_index(head);
-    elt->fnle_owner.fnp_type  = type;
-    elt->fnle_owner.fnp_index = index;
-
-    elt->fnle_next = FIB_NODE_INDEX_INVALID;
-    elt->fnle_prev = FIB_NODE_INDEX_INVALID;
-
-    return (elt);
-}
-
-static void
-fib_node_list_head_init (fib_node_list_head_t *head)
-{
-    head->fnlh_n_elts = 0;
-    head->fnlh_head = FIB_NODE_INDEX_INVALID;
-}
-
-/**
- * @brief Create a new node list.
- */
-fib_node_list_t
-fib_node_list_create (void)
-{
-    fib_node_list_head_t *head;
-
-    pool_get(fib_node_list_head_pool, head);
-
-    fib_node_list_head_init(head);
-
-    return (fib_node_list_head_get_index(head));
-}
-
-void
-fib_node_list_destroy (fib_node_list_t *list)
-{
-    fib_node_list_head_t *head;
-
-    if (FIB_NODE_INDEX_INVALID == *list)
-        return;
-
-    head = fib_node_list_head_get(*list);
-    ASSERT(0 == head->fnlh_n_elts);
-
-    pool_put(fib_node_list_head_pool, head);
-    *list = FIB_NODE_INDEX_INVALID;
-}
-
-
-/**
- * @brief Insert an element at the from of the list.
- */
-u32
-fib_node_list_push_front (fib_node_list_t list,
-                          int owner_id,
-                          fib_node_type_t type,
-                          fib_node_index_t index)
-{
-    fib_node_list_elt_t *elt, *next;
-    fib_node_list_head_t *head;
-
-    head = fib_node_list_head_get(list);
-    elt = fib_node_list_elt_create(head, owner_id, type, index);
-
-    elt->fnle_prev = FIB_NODE_INDEX_INVALID;
-    elt->fnle_next = head->fnlh_head;
-
-    if (FIB_NODE_INDEX_INVALID != head->fnlh_head)
-    {
-        next = fib_node_list_elt_get(head->fnlh_head);
-        next->fnle_prev = fib_node_list_elt_get_index(elt);
-    }
-    head->fnlh_head = fib_node_list_elt_get_index(elt);
-
-    head->fnlh_n_elts++;
-
-    return (fib_node_list_elt_get_index(elt));
-}
-
-u32
-fib_node_list_push_back (fib_node_list_t list,
-                        int owner_id,
-                        fib_node_type_t type,
-                        fib_node_index_t index)
-{
-    ASSERT(0);
-    return (FIB_NODE_INDEX_INVALID);
-}
-
-static void
-fib_node_list_extract (fib_node_list_head_t *head,
-                       fib_node_list_elt_t *elt)
-{
-    fib_node_list_elt_t *next, *prev;
-
-    if (FIB_NODE_INDEX_INVALID != elt->fnle_next)
-    {
-        next = fib_node_list_elt_get(elt->fnle_next);
-        next->fnle_prev = elt->fnle_prev;
-    }
-
-    if (FIB_NODE_INDEX_INVALID != elt->fnle_prev)
-    {
-        prev = fib_node_list_elt_get(elt->fnle_prev);
-        prev->fnle_next = elt->fnle_next;
-    }
-    else
-    {
-        ASSERT (fib_node_list_elt_get_index(elt) == head->fnlh_head);
-        head->fnlh_head = elt->fnle_next;
-    }
-}
-
-static void
-fib_node_list_insert_after (fib_node_list_head_t *head,
-                            fib_node_list_elt_t *prev,
-                            fib_node_list_elt_t *elt)
-{
-    fib_node_list_elt_t *next;
-
-    elt->fnle_next = prev->fnle_next;
-    if (FIB_NODE_INDEX_INVALID != prev->fnle_next)
-    {
-        next = fib_node_list_elt_get(prev->fnle_next);
-        next->fnle_prev = fib_node_list_elt_get_index(elt);
-    }
-    prev->fnle_next = fib_node_list_elt_get_index(elt);
-    elt->fnle_prev = fib_node_list_elt_get_index(prev);
-}
-
-void
-fib_node_list_remove (fib_node_list_t list,
-                      u32 sibling)
-{
-    fib_node_list_head_t *head;
-    fib_node_list_elt_t *elt;
-
-    head = fib_node_list_head_get(list);
-    elt  = fib_node_list_elt_get(sibling);
-
-    fib_node_list_extract(head, elt);
-
-    head->fnlh_n_elts--;
-    pool_put(fib_node_list_elt_pool, elt);
-}
-
-void
-fib_node_list_elt_remove (u32 sibling)
-{
-    fib_node_list_elt_t *elt;
-
-    elt = fib_node_list_elt_get(sibling);
-
-    fib_node_list_remove(elt->fnle_list, sibling);
-}
-
-/**
- * @brief Advance the sibling one step (toward the tail) in the list.
- * return 0 if at the end of the list, 1 otherwise.
- */
-int
-fib_node_list_advance (u32 sibling)
-{
-    fib_node_list_elt_t *elt, *next;
-    fib_node_list_head_t *head;
-
-    elt = fib_node_list_elt_get(sibling);
-    head = fib_node_list_head_get(elt->fnle_list);
-
-    if (FIB_NODE_INDEX_INVALID != elt->fnle_next)
-    {
-        /*
-         * not at the end of the list
-         */
-        next = fib_node_list_elt_get(elt->fnle_next);
-
-        fib_node_list_extract(head, elt);
-        fib_node_list_insert_after(head, next, elt);
-
-        return (1);
-    }
-    else
-    {
-        return (0);
-    }
-}
-
-int
-fib_node_list_elt_get_next (u32 sibling,
-                            fib_node_ptr_t *ptr)
-{
-    fib_node_list_elt_t *elt, *next;
-
-    elt = fib_node_list_elt_get(sibling);
-
-    if (FIB_NODE_INDEX_INVALID != elt->fnle_next)
-    {
-        next = fib_node_list_elt_get(elt->fnle_next);
-
-        *ptr = next->fnle_owner;
-        return (1);
-    }
-    else
-    {
-        ptr->fnp_index = FIB_NODE_INDEX_INVALID;
-        return (0);
-    }
-}
-
-u32
-fib_node_list_get_size (fib_node_list_t list)
-{
-    fib_node_list_head_t *head;
-
-    if (FIB_NODE_INDEX_INVALID == list)
-    {
-        return (0);
-    }
-
-    head = fib_node_list_head_get(list);
-
-    return (head->fnlh_n_elts);
-}
-
-int
-fib_node_list_get_front (fib_node_list_t list,
-                         fib_node_ptr_t *ptr)
-{
-    fib_node_list_head_t *head;
-    fib_node_list_elt_t *elt;
-
-
-    if (0 == fib_node_list_get_size(list))
-    {
-        ptr->fnp_index = FIB_NODE_INDEX_INVALID;
-        return (0);
-    }
-
-    head = fib_node_list_head_get(list);
-    elt = fib_node_list_elt_get(head->fnlh_head);
-    
-    *ptr = elt->fnle_owner;
-
-    return (1);
-}
-
-/**
- * @brief Walk the list of node. This must be safe w.r.t. the removal
- * of nodes during the walk.
- */
-void
-fib_node_list_walk (fib_node_list_t list,
-                    fib_node_list_walk_cb_t fn,
-                    void *args)
-{
-    fib_node_list_elt_t *elt;
-    fib_node_list_head_t *head;
-    u32 sibling;
-
-    if (FIB_NODE_INDEX_INVALID == list)
-    {
-        return;
-    }
-
-    head = fib_node_list_head_get(list);
-    sibling = head->fnlh_head;
-
-    while (FIB_NODE_INDEX_INVALID != sibling)
-    {
-        elt = fib_node_list_elt_get(sibling);
-        sibling = elt->fnle_next;
-
-        fn(&elt->fnle_owner, args);
-    }
-}
-
-void
-fib_node_list_memory_show (void)
-{
-    fib_show_memory_usage("Node-list elements",
-			  pool_elts(fib_node_list_elt_pool),
-			  pool_len(fib_node_list_elt_pool),
-			  sizeof(fib_node_list_elt_t));
-    fib_show_memory_usage("Node-list heads",
-			  pool_elts(fib_node_list_head_pool),
-			  pool_len(fib_node_list_head_pool),
-			  sizeof(fib_node_list_head_t));
-}
diff --git a/vnet/vnet/fib/fib_node_list.h b/vnet/vnet/fib/fib_node_list.h
deleted file mode 100644
index 9567b966..00000000
--- a/vnet/vnet/fib/fib_node_list.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief a hetrogeneous w.r.t. FIB node type, list of FIB nodes.
- * Since we cannot use C pointers, due to memeory reallocs, the next/prev
- * are described as an index to an element. Each element contains a pointer
- * (key:{type, index}) to a FIB node.
- */
-
-#ifndef __FIB_NODE_LIST_H__
-#define __FIB_NODE_LIST_H__
-
-#include <vnet/fib/fib_node.h>
-
-extern fib_node_list_t fib_node_list_create(void);
-extern void fib_node_list_destroy(fib_node_list_t *list);
-
-extern u32 fib_node_list_push_front(fib_node_list_t head,
-                                    int owner_id,
-                                    fib_node_type_t type,
-                                    fib_node_index_t index);
-extern u32 fib_node_list_push_back(fib_node_list_t head,
-                                   int owner_id,
-                                   fib_node_type_t type,
-                                   fib_node_index_t index);
-extern void fib_node_list_remove(fib_node_list_t head,
-                                 u32 sibling);
-extern void fib_node_list_elt_remove(u32 sibling);
-
-extern int fib_node_list_advance(u32 sibling);
-
-extern int fib_node_list_get_front(fib_node_list_t head,
-                                   fib_node_ptr_t *ptr);
-
-extern int fib_node_list_elt_get_next(u32 elt,
-                                      fib_node_ptr_t *ptr);
-
-extern u32 fib_node_list_get_size(fib_node_list_t head);
-
-/**
- * @brief Callback function invoked during a list walk
- */
-typedef int (*fib_node_list_walk_cb_t)(fib_node_ptr_t *owner,
-                                       void *args);
-
-extern void fib_node_list_walk(fib_node_list_t head,
-                               fib_node_list_walk_cb_t fn,
-                               void *args);
-
-extern void fib_node_list_memory_show(void);
-
-#endif
diff --git a/vnet/vnet/fib/fib_path.c b/vnet/vnet/fib/fib_path.c
deleted file mode 100644
index 809e3e16..00000000
--- a/vnet/vnet/fib/fib_path.c
+++ /dev/null
@@ -1,2001 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/format.h>
-#include <vnet/ip/ip.h>
-#include <vnet/dpo/drop_dpo.h>
-#include <vnet/dpo/receive_dpo.h>
-#include <vnet/dpo/load_balance_map.h>
-#include <vnet/dpo/lookup_dpo.h>
-
-#include <vnet/adj/adj.h>
-
-#include <vnet/fib/fib_path.h>
-#include <vnet/fib/fib_node.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/fib_entry.h>
-#include <vnet/fib/fib_path_list.h>
-#include <vnet/fib/fib_internal.h>
-#include <vnet/fib/fib_urpf_list.h>
-
-/**
- * Enurmeration of path types
- */
-typedef enum fib_path_type_t_ {
-    /**
-     * Marker. Add new types after this one.
-     */
-    FIB_PATH_TYPE_FIRST = 0,
-    /**
-     * Attached-nexthop. An interface and a nexthop are known.
-     */
-    FIB_PATH_TYPE_ATTACHED_NEXT_HOP = FIB_PATH_TYPE_FIRST,
-    /**
-     * attached. Only the interface is known.
-     */
-    FIB_PATH_TYPE_ATTACHED,
-    /**
-     * recursive. Only the next-hop is known.
-     */
-    FIB_PATH_TYPE_RECURSIVE,
-    /**
-     * special. nothing is known. so we drop.
-     */
-    FIB_PATH_TYPE_SPECIAL,
-    /**
-     * exclusive. user provided adj.
-     */
-    FIB_PATH_TYPE_EXCLUSIVE,
-    /**
-     * deag. Link to a lookup adj in the next table
-     */
-    FIB_PATH_TYPE_DEAG,
-    /**
-     * receive. it's for-us.
-     */
-    FIB_PATH_TYPE_RECEIVE,
-    /**
-     * Marker. Add new types before this one, then update it.
-     */
-    FIB_PATH_TYPE_LAST = FIB_PATH_TYPE_RECEIVE,
-} __attribute__ ((packed)) fib_path_type_t;
-
-/**
- * The maximum number of path_types
- */
-#define FIB_PATH_TYPE_MAX (FIB_PATH_TYPE_LAST + 1)
-
-#define FIB_PATH_TYPES {					\
-    [FIB_PATH_TYPE_ATTACHED_NEXT_HOP] = "attached-nexthop",	\
-    [FIB_PATH_TYPE_ATTACHED]          = "attached",		\
-    [FIB_PATH_TYPE_RECURSIVE]         = "recursive",	        \
-    [FIB_PATH_TYPE_SPECIAL]           = "special",	        \
-    [FIB_PATH_TYPE_EXCLUSIVE]         = "exclusive",	        \
-    [FIB_PATH_TYPE_DEAG]              = "deag",	                \
-    [FIB_PATH_TYPE_RECEIVE]           = "receive",	        \
-}
-
-#define FOR_EACH_FIB_PATH_TYPE(_item) \
-    for (_item = FIB_PATH_TYPE_FIRST; _item <= FIB_PATH_TYPE_LAST; _item++)
-
-/**
- * Enurmeration of path operational (i.e. derived) attributes
- */
-typedef enum fib_path_oper_attribute_t_ {
-    /**
-     * Marker. Add new types after this one.
-     */
-    FIB_PATH_OPER_ATTRIBUTE_FIRST = 0,
-    /**
-     * The path forms part of a recursive loop.
-     */
-    FIB_PATH_OPER_ATTRIBUTE_RECURSIVE_LOOP = FIB_PATH_OPER_ATTRIBUTE_FIRST,
-    /**
-     * The path is resolved
-     */
-    FIB_PATH_OPER_ATTRIBUTE_RESOLVED,
-    /**
-     * The path has become a permanent drop.
-     */
-    FIB_PATH_OPER_ATTRIBUTE_DROP,
-    /**
-     * Marker. Add new types before this one, then update it.
-     */
-    FIB_PATH_OPER_ATTRIBUTE_LAST = FIB_PATH_OPER_ATTRIBUTE_DROP,
-} __attribute__ ((packed)) fib_path_oper_attribute_t;
-
-/**
- * The maximum number of path operational attributes
- */
-#define FIB_PATH_OPER_ATTRIBUTE_MAX (FIB_PATH_OPER_ATTRIBUTE_LAST + 1)
-
-#define FIB_PATH_OPER_ATTRIBUTES {					\
-    [FIB_PATH_OPER_ATTRIBUTE_RECURSIVE_LOOP] = "recursive-loop",	\
-    [FIB_PATH_OPER_ATTRIBUTE_RESOLVED]       = "resolved",	        \
-    [FIB_PATH_OPER_ATTRIBUTE_DROP]           = "drop",		        \
-}
-
-#define FOR_EACH_FIB_PATH_OPER_ATTRIBUTE(_item) \
-    for (_item = FIB_PATH_OPER_ATTRIBUTE_FIRST; \
-	 _item <= FIB_PATH_OPER_ATTRIBUTE_LAST; \
-	 _item++)
-
-/**
- * Path flags from the attributes
- */
-typedef enum fib_path_oper_flags_t_ {
-    FIB_PATH_OPER_FLAG_NONE = 0,
-    FIB_PATH_OPER_FLAG_RECURSIVE_LOOP = (1 << FIB_PATH_OPER_ATTRIBUTE_RECURSIVE_LOOP),
-    FIB_PATH_OPER_FLAG_DROP = (1 << FIB_PATH_OPER_ATTRIBUTE_DROP),
-    FIB_PATH_OPER_FLAG_RESOLVED = (1 << FIB_PATH_OPER_ATTRIBUTE_RESOLVED),
-} __attribute__ ((packed)) fib_path_oper_flags_t;
-
-/**
- * A FIB path
- */
-typedef struct fib_path_t_ {
-    /**
-     * A path is a node in the FIB graph.
-     */
-    fib_node_t fp_node;
-
-    /**
-     * The index of the path-list to which this path belongs
-     */
-    u32 fp_pl_index;
-
-    /**
-     * This marks the start of the memory area used to hash
-     * the path
-     */
-    STRUCT_MARK(path_hash_start);
-
-    /**
-     * Configuration Flags
-     */
-    fib_path_cfg_flags_t fp_cfg_flags;
-
-    /**
-     * The type of the path. This is the selector for the union
-     */
-    fib_path_type_t fp_type;
-
-    /**
-     * The protocol of the next-hop, i.e. the address family of the
-     * next-hop's address. We can't derive this from the address itself
-     * since the address can be all zeros
-     */
-    fib_protocol_t fp_nh_proto;
-
-    /**
-     * UCMP [unnormalised] weigt
-     */
-    u32 fp_weight;
-
-    /**
-     * per-type union of the data required to resolve the path
-     */
-    union {
-	struct {
-	    /**
-	     * The next-hop
-	     */
-	    ip46_address_t fp_nh;
-	    /**
-	     * The interface
-	     */
-	    u32 fp_interface;
-	} attached_next_hop;
-	struct {
-	    /**
-	     * The interface
-	     */
-	    u32 fp_interface;
-	} attached;
-	struct {
-	    union
-	    {
-		/**
-		 * The next-hop
-		 */
-		ip46_address_t fp_ip;
-		/**
-		 * The local label to resolve through.
-		 */
-		mpls_label_t fp_local_label;
-	    } fp_nh;
-	    /**
-	     * The FIB table index in which to find the next-hop.
-	     * This needs to be fixed. We should lookup the adjacencies in
-	     * a separate table of adjacencies, rather than from the FIB.
-	     * Two reasons I can think of:
-	     *   - consider:
-	     *       int ip addr Gig0 10.0.0.1/24
-	     *       ip route 10.0.0.2/32 via Gig1 192.168.1.2
-	     *       ip route 1.1.1.1/32 via Gig0 10.0.0.2
-	     *     this is perfectly valid.
-	     *     Packets addressed to 10.0.0.2 should be sent via Gig1.
-	     *     Packets address to 1.1.1.1 should be sent via Gig0.
-	     *    when we perform the adj resolution from the FIB for the path
-	     *    "via Gig0 10.0.0.2" the lookup will result in the route via Gig1
-	     *    and so we will pick up the adj via Gig1 - which was not what the
-	     *    operator wanted.
-	     *  - we can only return link-type IPv4 and so not the link-type MPLS.
-	     *    more on this in a later commit.
-	     *
-	     * The table ID should only belong to a recursive path and indicate
-	     * which FIB should be used to resolve the next-hop.
-	     */
-	    fib_node_index_t fp_tbl_id;
-	} recursive;
-	struct {
-	    /**
-	     * The FIB index in which to perfom the next lookup
-	     */
-	    fib_node_index_t fp_tbl_id;
-	} deag;
-	struct {
-	} special;
-	struct {
-	    /**
-	     * The user provided 'exclusive' DPO
-	     */
-	    dpo_id_t fp_ex_dpo;
-	} exclusive;
-	struct {
-	    /**
-	     * The interface on which the local address is configured
-	     */
-	    u32 fp_interface;
-	    /**
-	     * The next-hop
-	     */
-	    ip46_address_t fp_addr;
-	} receive;
-    };
-    STRUCT_MARK(path_hash_end);
-
-    /**
-     * Memebers in this last section represent information that is
-     * dervied during resolution. It should not be copied to new paths
-     * nor compared.
-     */
-
-    /**
-     * Operational Flags
-     */
-    fib_path_oper_flags_t fp_oper_flags;
-
-    /**
-     * the resolving via fib. not part of the union, since it it not part
-     * of the path's hash.
-     */
-    fib_node_index_t fp_via_fib;
-
-    /**
-     * The Data-path objects through which this path resolves for IP.
-     */
-    dpo_id_t fp_dpo;
-
-    /**
-     * the index of this path in the parent's child list.
-     */
-    u32 fp_sibling;
-} fib_path_t;
-
-/*
- * Array of strings/names for the path types and attributes
- */
-static const char *fib_path_type_names[] = FIB_PATH_TYPES;
-static const char *fib_path_oper_attribute_names[] = FIB_PATH_OPER_ATTRIBUTES;
-static const char *fib_path_cfg_attribute_names[]  = FIB_PATH_CFG_ATTRIBUTES;
-
-/*
- * The memory pool from which we allocate all the paths
- */
-static fib_path_t *fib_path_pool;
-
-/*
- * Debug macro
- */
-#ifdef FIB_DEBUG
-#define FIB_PATH_DBG(_p, _fmt, _args...)			\
-{       		          				\
-    u8 *_tmp = NULL;						\
-    _tmp = fib_path_format(fib_path_get_index(_p), _tmp);	\
-    clib_warning("path:[%d:%s]:" _fmt,				\
-		 fib_path_get_index(_p), _tmp,			\
-		 ##_args);					\
-    vec_free(_tmp);						\
-}
-#else
-#define FIB_PATH_DBG(_p, _fmt, _args...)
-#endif
-
-static fib_path_t *
-fib_path_get (fib_node_index_t index)
-{
-    return (pool_elt_at_index(fib_path_pool, index));
-}
-
-static fib_node_index_t 
-fib_path_get_index (fib_path_t *path)
-{
-    return (path - fib_path_pool);
-}
-
-static fib_node_t *
-fib_path_get_node (fib_node_index_t index)
-{
-    return ((fib_node_t*)fib_path_get(index));
-}
-
-static fib_path_t*
-fib_path_from_fib_node (fib_node_t *node)
-{
-#if CLIB_DEBUG > 0
-    ASSERT(FIB_NODE_TYPE_PATH == node->fn_type);
-#endif
-    return ((fib_path_t*)node);
-}
-
-u8 *
-format_fib_path (u8 * s, va_list * args)
-{
-    fib_path_t *path = va_arg (*args, fib_path_t *);
-    vnet_main_t * vnm = vnet_get_main();
-    fib_path_oper_attribute_t oattr;
-    fib_path_cfg_attribute_t cattr;
-
-    s = format (s, "      index:%d ", fib_path_get_index(path));
-    s = format (s, "pl-index:%d ", path->fp_pl_index);
-    s = format (s, "%U ", format_fib_protocol, path->fp_nh_proto);
-    s = format (s, "weight=%d ", path->fp_weight);
-    s = format (s, "%s: ", fib_path_type_names[path->fp_type]);
-    if (FIB_PATH_OPER_FLAG_NONE != path->fp_oper_flags) {
-	s = format(s, " oper-flags:");
-	FOR_EACH_FIB_PATH_OPER_ATTRIBUTE(oattr) {
-	    if ((1<<oattr) & path->fp_oper_flags) {
-		s = format (s, "%s,", fib_path_oper_attribute_names[oattr]);
-	    }
-	}
-    }
-    if (FIB_PATH_CFG_FLAG_NONE != path->fp_cfg_flags) {
-	s = format(s, " cfg-flags:");
-	FOR_EACH_FIB_PATH_CFG_ATTRIBUTE(cattr) {
-	    if ((1<<cattr) & path->fp_cfg_flags) {
-		s = format (s, "%s,", fib_path_cfg_attribute_names[cattr]);
-	    }
-	}
-    }
-    s = format(s, "\n       ");
-
-    switch (path->fp_type)
-    {
-    case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
-	s = format (s, "%U", format_ip46_address,
-		    &path->attached_next_hop.fp_nh,
-		    IP46_TYPE_ANY);
-	if (path->fp_oper_flags & FIB_PATH_OPER_FLAG_DROP)
-	{
-	    s = format (s, " if_index:%d", path->attached_next_hop.fp_interface);
-	}
-	else
-	{
-	    s = format (s, " %U",
-			format_vnet_sw_interface_name,
-			vnm,
-			vnet_get_sw_interface(
-			    vnm,
-			    path->attached_next_hop.fp_interface));
-	    if (vnet_sw_interface_is_p2p(vnet_get_main(),
-					 path->attached_next_hop.fp_interface))
-	    {
-		s = format (s, " (p2p)");
-	    }
-	}
-	if (!dpo_id_is_valid(&path->fp_dpo))
-	{
-	    s = format(s, "\n          unresolved");
-	}
-	else
-	{
-	    s = format(s, "\n          %U",
-		       format_dpo_id,
-		       &path->fp_dpo, 13);
-	}
-	break;
-    case FIB_PATH_TYPE_ATTACHED:
-	if (path->fp_oper_flags & FIB_PATH_OPER_FLAG_DROP)
-	{
-	    s = format (s, " if_index:%d", path->attached_next_hop.fp_interface);
-	}
-	else
-	{
-	    s = format (s, " %U",
-			format_vnet_sw_interface_name,
-			vnm,
-			vnet_get_sw_interface(
-			    vnm,
-			    path->attached.fp_interface));
-	}
-	break;
-    case FIB_PATH_TYPE_RECURSIVE:
-	if (FIB_PROTOCOL_MPLS == path->fp_nh_proto)
-	{
-	    s = format (s, "via %U",
-			format_mpls_unicast_label,
-			path->recursive.fp_nh.fp_local_label);
-	}
-	else
-	{
-	    s = format (s, "via %U",
-			format_ip46_address,
-			&path->recursive.fp_nh.fp_ip,
-			IP46_TYPE_ANY);
-	}
-	s = format (s, " in fib:%d",
-		    path->recursive.fp_tbl_id,
-		    path->fp_via_fib); 
-	s = format (s, " via-fib:%d", path->fp_via_fib); 
-	s = format (s, " via-dpo:[%U:%d]",
-		    format_dpo_type, path->fp_dpo.dpoi_type, 
-		    path->fp_dpo.dpoi_index);
-
-	break;
-    case FIB_PATH_TYPE_RECEIVE:
-    case FIB_PATH_TYPE_SPECIAL:
-    case FIB_PATH_TYPE_DEAG:
-    case FIB_PATH_TYPE_EXCLUSIVE:
-	if (dpo_id_is_valid(&path->fp_dpo))
-	{
-	    s = format(s, "%U", format_dpo_id,
-		       &path->fp_dpo, 2);
-	}
-	break;
-    }
-    return (s);
-}
-
-u8 *
-fib_path_format (fib_node_index_t pi, u8 *s)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(pi);
-    ASSERT(NULL != path);
-
-    return (format (s, "%U", format_fib_path, path));
-}
-
-u8 *
-fib_path_adj_format (fib_node_index_t pi,
-		     u32 indent,
-		     u8 *s)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(pi);
-    ASSERT(NULL != path);
-
-    if (!dpo_id_is_valid(&path->fp_dpo))
-    {
-	s = format(s, " unresolved");
-    }
-    else
-    {
-	s = format(s, "%U", format_dpo_id,
-		   &path->fp_dpo, 2);
-    }
-
-    return (s);
-}
-
-/*
- * fib_path_last_lock_gone
- *
- * We don't share paths, we share path lists, so the [un]lock functions
- * are no-ops
- */
-static void
-fib_path_last_lock_gone (fib_node_t *node)
-{
-    ASSERT(0);
-}
-
-static const adj_index_t
-fib_path_attached_next_hop_get_adj (fib_path_t *path,
-				    vnet_link_t link)
-{
-    if (vnet_sw_interface_is_p2p(vnet_get_main(),
-				 path->attached_next_hop.fp_interface))
-    {
-	/*
-	 * if the interface is p2p then the adj for the specific
-	 * neighbour on that link will never exist. on p2p links
-	 * the subnet address (the attached route) links to the
-	 * auto-adj (see below), we want that adj here too.
-	 */
-	return (adj_nbr_add_or_lock(path->fp_nh_proto,
-				    link,
-				    &zero_addr,
-				    path->attached_next_hop.fp_interface));
-    }
-    else
-    {
-	return (adj_nbr_add_or_lock(path->fp_nh_proto,
-				    link,
-				    &path->attached_next_hop.fp_nh,
-				    path->attached_next_hop.fp_interface));
-    }
-}
-
-static void
-fib_path_attached_next_hop_set (fib_path_t *path)
-{
-    /*
-     * resolve directly via the adjacnecy discribed by the
-     * interface and next-hop
-     */
-    if (!vnet_sw_interface_is_admin_up(vnet_get_main(),
-				      path->attached_next_hop.fp_interface))
-    {
-	path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
-    }
-
-    dpo_set(&path->fp_dpo,
-	    DPO_ADJACENCY,
-	    fib_proto_to_dpo(path->fp_nh_proto),
-	    fib_path_attached_next_hop_get_adj(
-		 path,
-		 fib_proto_to_link(path->fp_nh_proto)));
-
-    /*
-     * become a child of the adjacency so we receive updates
-     * when its rewrite changes
-     */
-    path->fp_sibling = adj_child_add(path->fp_dpo.dpoi_index,
-				     FIB_NODE_TYPE_PATH,
-				     fib_path_get_index(path));
-}
-
-/*
- * create of update the paths recursive adj
- */
-static void
-fib_path_recursive_adj_update (fib_path_t *path,
-			       fib_forward_chain_type_t fct,
-			       dpo_id_t *dpo)
-{
-    dpo_id_t via_dpo = DPO_INVALID;
-
-    /*
-     * get the DPO to resolve through from the via-entry
-     */
-    fib_entry_contribute_forwarding(path->fp_via_fib,
-				    fct,
-				    &via_dpo);
-
-
-    /*
-     * hope for the best - clear if restrictions apply.
-     */
-    path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RESOLVED;
-
-    /*
-     * Validate any recursion constraints and over-ride the via
-     * adj if not met
-     */
-    if (path->fp_oper_flags & FIB_PATH_OPER_FLAG_RECURSIVE_LOOP)
-    {
-	path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
-	dpo_copy(&via_dpo, drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
-    }
-    else if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_RESOLVE_HOST)
-    {
-	/*
-	 * the via FIB must be a host route.
-	 * note the via FIB just added will always be a host route
-	 * since it is an RR source added host route. So what we need to
-	 * check is whether the route has other sources. If it does then
-	 * some other source has added it as a host route. If it doesn't
-	 * then it was added only here and inherits forwarding from a cover.
-	 * the cover is not a host route.
-	 * The RR source is the lowest priority source, so we check if it
-	 * is the best. if it is there are no other sources.
-	 */
-	if (fib_entry_get_best_source(path->fp_via_fib) >= FIB_SOURCE_RR)
-	{
-	    path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
-            dpo_copy(&via_dpo, drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
-
-            /*
-             * PIC edge trigger. let the load-balance maps know
-             */
-            load_balance_map_path_state_change(fib_path_get_index(path));
-	}
-    }
-    else if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_RESOLVE_ATTACHED)
-    {
-	/*
-	 * RR source entries inherit the flags from the cover, so
-	 * we can check the via directly
-	 */
-	if (!(FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags(path->fp_via_fib)))
-	{
-	    path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
-            dpo_copy(&via_dpo, drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
-
-            /*
-             * PIC edge trigger. let the load-balance maps know
-             */
-            load_balance_map_path_state_change(fib_path_get_index(path));
-	}
-    }
-
-    /*
-     * update the path's contributed DPO
-     */
-    dpo_copy(dpo, &via_dpo);
-
-    FIB_PATH_DBG(path, "recursive update: %U",
-		 fib_get_lookup_main(path->fp_nh_proto),
-		 &path->fp_dpo, 2);
-
-    dpo_reset(&via_dpo);
-}
-
-/*
- * fib_path_is_permanent_drop
- *
- * Return !0 if the path is configured to permanently drop,
- * despite other attributes.
- */
-static int
-fib_path_is_permanent_drop (fib_path_t *path)
-{
-    return ((path->fp_cfg_flags & FIB_PATH_CFG_FLAG_DROP) ||
-	    (path->fp_oper_flags & FIB_PATH_OPER_FLAG_DROP));
-}
-
-/*
- * fib_path_unresolve
- *
- * Remove our dependency on the resolution target
- */
-static void
-fib_path_unresolve (fib_path_t *path)
-{
-    /*
-     * the forced drop path does not need unresolving
-     */
-    if (fib_path_is_permanent_drop(path))
-    {
-	return;
-    }
-
-    switch (path->fp_type)
-    {
-    case FIB_PATH_TYPE_RECURSIVE:
-	if (FIB_NODE_INDEX_INVALID != path->fp_via_fib)
-	{
-	    fib_prefix_t pfx;
-
-	    fib_entry_get_prefix(path->fp_via_fib, &pfx);
-	    fib_entry_child_remove(path->fp_via_fib,
-				   path->fp_sibling);
-	    fib_table_entry_special_remove(path->recursive.fp_tbl_id,
-					   &pfx,
-					   FIB_SOURCE_RR);
-	    path->fp_via_fib = FIB_NODE_INDEX_INVALID;
-	}
-	break;
-    case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
-    case FIB_PATH_TYPE_ATTACHED:
-	adj_child_remove(path->fp_dpo.dpoi_index,
-			 path->fp_sibling);
-        adj_unlock(path->fp_dpo.dpoi_index);
-        break;
-    case FIB_PATH_TYPE_EXCLUSIVE:
-	dpo_reset(&path->exclusive.fp_ex_dpo);
-        break;
-    case FIB_PATH_TYPE_SPECIAL:
-    case FIB_PATH_TYPE_RECEIVE:
-    case FIB_PATH_TYPE_DEAG:
-        /*
-         * these hold only the path's DPO, which is reset below.
-         */
-	break;
-    }
-
-    /*
-     * release the adj we were holding and pick up the
-     * drop just in case.
-     */
-    dpo_reset(&path->fp_dpo);
-    path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
-
-    return;
-}
-
-static fib_forward_chain_type_t
-fib_path_proto_to_chain_type (fib_protocol_t proto)
-{
-    switch (proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
-    case FIB_PROTOCOL_IP6:
-	return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
-    case FIB_PROTOCOL_MPLS:
-	return (FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS);
-    }
-    return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
-}
-
-/*
- * fib_path_back_walk_notify
- *
- * A back walk has reach this path.
- */
-static fib_node_back_walk_rc_t
-fib_path_back_walk_notify (fib_node_t *node,
-			   fib_node_back_walk_ctx_t *ctx)
-{
-    fib_path_t *path;
-
-    path = fib_path_from_fib_node(node);
-
-    switch (path->fp_type)
-    {
-    case FIB_PATH_TYPE_RECURSIVE:
-	if (FIB_NODE_BW_REASON_FLAG_EVALUATE & ctx->fnbw_reason)
-	{
-	    /*
-	     * modify the recursive adjacency to use the new forwarding
-	     * of the via-fib.
-	     * this update is visible to packets in flight in the DP.
-	     */
-	    fib_path_recursive_adj_update(
-		path,
-		fib_path_proto_to_chain_type(path->fp_nh_proto),
-		&path->fp_dpo);
-	}
-	if ((FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE & ctx->fnbw_reason) ||
-            (FIB_NODE_BW_REASON_FLAG_ADJ_DOWN   & ctx->fnbw_reason))
-	{
-	    /*
-	     * ADJ updates (complete<->incomplete) do not need to propagate to
-	     * recursive entries.
-	     * The only reason its needed as far back as here, is that the adj
-	     * and the incomplete adj are a different DPO type, so the LBs need
-	     * to re-stack.
-	     * If this walk was quashed in the fib_entry, then any non-fib_path
-	     * children (like tunnels that collapse out the LB when they stack)
-	     * would not see the update.
-	     */
-	    return (FIB_NODE_BACK_WALK_CONTINUE);
-	}
-	break;
-    case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
-	/*
-FIXME comment
-	 * ADJ_UPDATE backwalk pass silently through here and up to
-	 * the path-list when the multipath adj collapse occurs.
-	 * The reason we do this is that the assumtption is that VPP
-	 * runs in an environment where the Control-Plane is remote
-	 * and hence reacts slowly to link up down. In order to remove
-	 * this down link from the ECMP set quickly, we back-walk.
-	 * VPP also has dedicated CPUs, so we are not stealing resources
-	 * from the CP to do so.
-	 */
-	if (FIB_NODE_BW_REASON_FLAG_INTERFACE_UP & ctx->fnbw_reason)
-	{
-            if (path->fp_oper_flags & FIB_PATH_OPER_FLAG_RESOLVED)
-            {
-                /*
-                 * alreday resolved. no need to walk back again
-                 */
-                return (FIB_NODE_BACK_WALK_CONTINUE);
-            }
-	    path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RESOLVED;
-	}
-	if (FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN & ctx->fnbw_reason)
-	{
-            if (!(path->fp_oper_flags & FIB_PATH_OPER_FLAG_RESOLVED))
-            {
-                /*
-                 * alreday unresolved. no need to walk back again
-                 */
-                return (FIB_NODE_BACK_WALK_CONTINUE);
-            }
-	    path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
-	}
-	if (FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE & ctx->fnbw_reason)
-	{
-	    /*
-	     * The interface this path resolves through has been deleted.
-	     * This will leave the path in a permanent drop state. The route
-	     * needs to be removed and readded (and hence the path-list deleted)
-	     * before it can forward again.
-	     */
-	    fib_path_unresolve(path);
-	    path->fp_oper_flags |= FIB_PATH_OPER_FLAG_DROP;
-	}
-        if (FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE & ctx->fnbw_reason)
-	{
-            /*
-             * restack the DPO to pick up the correct DPO sub-type
-             */
-            uword if_is_up;
-            adj_index_t ai;
-
-            if_is_up = vnet_sw_interface_is_admin_up(
-                           vnet_get_main(),
-                           path->attached_next_hop.fp_interface);
-
-            if (if_is_up)
-            {
-                path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RESOLVED;
-            }
-
-            ai = fib_path_attached_next_hop_get_adj(
-                     path,
-                     fib_proto_to_link(path->fp_nh_proto));
-
-            dpo_set(&path->fp_dpo, DPO_ADJACENCY,
-                    fib_proto_to_dpo(path->fp_nh_proto),
-                    ai);
-            adj_unlock(ai);
-
-            if (!if_is_up)
-            {
-                /*
-                 * If the interface is not up there is no reason to walk
-                 * back to children. if we did they would only evalute
-                 * that this path is unresolved and hence it would
-                 * not contribute the adjacency - so it would be wasted
-                 * CPU time.
-                 */
-                return (FIB_NODE_BACK_WALK_CONTINUE);
-            }
-        }
-        if (FIB_NODE_BW_REASON_FLAG_ADJ_DOWN & ctx->fnbw_reason)
-	{
-            if (!(path->fp_oper_flags & FIB_PATH_OPER_FLAG_RESOLVED))
-            {
-                /*
-                 * alreday unresolved. no need to walk back again
-                 */
-                return (FIB_NODE_BACK_WALK_CONTINUE);
-            }
-            /*
-             * the adj has gone down. the path is no longer resolved.
-             */
-	    path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
-        }
-	break;
-    case FIB_PATH_TYPE_ATTACHED:
-	/*
-	 * FIXME; this could schedule a lower priority walk, since attached
-	 * routes are not usually in ECMP configurations so the backwalk to
-	 * the FIB entry does not need to be high priority
-	 */
-	if (FIB_NODE_BW_REASON_FLAG_INTERFACE_UP & ctx->fnbw_reason)
-	{
-	    path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RESOLVED;
-	}
-	if (FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN & ctx->fnbw_reason)
-	{
-	    path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
-	}
-	if (FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE & ctx->fnbw_reason)
-	{
-	    fib_path_unresolve(path);
-	    path->fp_oper_flags |= FIB_PATH_OPER_FLAG_DROP;
-	}
-	break;
-    case FIB_PATH_TYPE_DEAG:
-	/*
-	 * FIXME When VRF delete is allowed this will need a poke.
-	 */
-    case FIB_PATH_TYPE_SPECIAL:
-    case FIB_PATH_TYPE_RECEIVE:
-    case FIB_PATH_TYPE_EXCLUSIVE:
-	/*
-	 * these path types have no parents. so to be
-	 * walked from one is unexpected.
-	 */
-	ASSERT(0);
-	break;
-    }
-
-    /*
-     * propagate the backwalk further to the path-list
-     */
-    fib_path_list_back_walk(path->fp_pl_index, ctx);
-
-    return (FIB_NODE_BACK_WALK_CONTINUE);
-}
-
-static void
-fib_path_memory_show (void)
-{
-    fib_show_memory_usage("Path",
-			  pool_elts(fib_path_pool),
-			  pool_len(fib_path_pool),
-			  sizeof(fib_path_t));
-}
-
-/*
- * The FIB path's graph node virtual function table
- */
-static const fib_node_vft_t fib_path_vft = {
-    .fnv_get = fib_path_get_node,
-    .fnv_last_lock = fib_path_last_lock_gone,
-    .fnv_back_walk = fib_path_back_walk_notify,
-    .fnv_mem_show = fib_path_memory_show,
-};
-
-static fib_path_cfg_flags_t
-fib_path_route_flags_to_cfg_flags (const fib_route_path_t *rpath)
-{
-    fib_path_cfg_flags_t cfg_flags = FIB_PATH_CFG_FLAG_NONE;
-
-    if (rpath->frp_flags & FIB_ROUTE_PATH_RESOLVE_VIA_HOST)
-	cfg_flags |= FIB_PATH_CFG_FLAG_RESOLVE_HOST;
-    if (rpath->frp_flags & FIB_ROUTE_PATH_RESOLVE_VIA_ATTACHED)
-	cfg_flags |= FIB_PATH_CFG_FLAG_RESOLVE_ATTACHED;
-
-    return (cfg_flags);
-}
-
-/*
- * fib_path_create
- *
- * Create and initialise a new path object.
- * return the index of the path.
- */
-fib_node_index_t
-fib_path_create (fib_node_index_t pl_index,
-		 fib_protocol_t nh_proto,
-		 fib_path_cfg_flags_t flags,
-		 const fib_route_path_t *rpath)
-{
-    fib_path_t *path;
-
-    pool_get(fib_path_pool, path);
-    memset(path, 0, sizeof(*path));
-
-    fib_node_init(&path->fp_node,
-		  FIB_NODE_TYPE_PATH);
-
-    dpo_reset(&path->fp_dpo);
-    path->fp_pl_index = pl_index;
-    path->fp_nh_proto = nh_proto;
-    path->fp_via_fib = FIB_NODE_INDEX_INVALID;
-    path->fp_weight = rpath->frp_weight;
-    if (0 == path->fp_weight)
-    {
-        /*
-         * a weight of 0 is a meaningless value. We could either reject it, and thus force
-         * clients to always use 1, or we can accept it and fixup approrpiately.
-         */
-        path->fp_weight = 1;
-    }
-    path->fp_cfg_flags = flags;
-    path->fp_cfg_flags |= fib_path_route_flags_to_cfg_flags(rpath);
-
-    /*
-     * deduce the path's tpye from the parementers and save what is needed.
-     */
-    if (~0 != rpath->frp_sw_if_index)
-    {
-	if (flags & FIB_PATH_CFG_FLAG_LOCAL)
-	{
-	    path->fp_type = FIB_PATH_TYPE_RECEIVE;
-	    path->receive.fp_interface = rpath->frp_sw_if_index;
-            path->receive.fp_addr = rpath->frp_addr;
-	}
-	else
-	{
-	    if (ip46_address_is_zero(&rpath->frp_addr))
-	    {
-		path->fp_type = FIB_PATH_TYPE_ATTACHED;
-		path->attached.fp_interface = rpath->frp_sw_if_index;
-	    }
-	    else
-	    {
-		path->fp_type = FIB_PATH_TYPE_ATTACHED_NEXT_HOP;
-		path->attached_next_hop.fp_interface = rpath->frp_sw_if_index;
-		path->attached_next_hop.fp_nh = rpath->frp_addr;
-	    }
-	}
-    }
-    else
-    {
-	if (ip46_address_is_zero(&rpath->frp_addr))
-	{
-	    if (~0 == rpath->frp_fib_index)
-	    {
-		path->fp_type = FIB_PATH_TYPE_SPECIAL;
-	    }
-	    else
-	    {
-		path->fp_type = FIB_PATH_TYPE_DEAG;
-		path->deag.fp_tbl_id = rpath->frp_fib_index;
-	    }		
-	}
-	else
-	{
-	    path->fp_type = FIB_PATH_TYPE_RECURSIVE;
-	    if (FIB_PROTOCOL_MPLS == path->fp_nh_proto)
-	    {
-		path->recursive.fp_nh.fp_local_label = rpath->frp_local_label;
-	    }
-	    else
-	    {
-		path->recursive.fp_nh.fp_ip = rpath->frp_addr;
-	    }
-	    path->recursive.fp_tbl_id = rpath->frp_fib_index;
-	}
-    }
-
-    FIB_PATH_DBG(path, "create");
-
-    return (fib_path_get_index(path));
-}
-
-/*
- * fib_path_create_special
- *
- * Create and initialise a new path object.
- * return the index of the path.
- */
-fib_node_index_t
-fib_path_create_special (fib_node_index_t pl_index,
-			 fib_protocol_t nh_proto,
-			 fib_path_cfg_flags_t flags,
-			 const dpo_id_t *dpo)
-{
-    fib_path_t *path;
-
-    pool_get(fib_path_pool, path);
-    memset(path, 0, sizeof(*path));
-
-    fib_node_init(&path->fp_node,
-		  FIB_NODE_TYPE_PATH);
-    dpo_reset(&path->fp_dpo);
-
-    path->fp_pl_index = pl_index;
-    path->fp_weight = 1;
-    path->fp_nh_proto = nh_proto;
-    path->fp_via_fib = FIB_NODE_INDEX_INVALID;
-    path->fp_cfg_flags = flags;
-
-    if (FIB_PATH_CFG_FLAG_DROP & flags)
-    {
-	path->fp_type = FIB_PATH_TYPE_SPECIAL;
-    }
-    else if (FIB_PATH_CFG_FLAG_LOCAL & flags)
-    {
-	path->fp_type = FIB_PATH_TYPE_RECEIVE;
-	path->attached.fp_interface = FIB_NODE_INDEX_INVALID;
-    }
-    else
-    {
-	path->fp_type = FIB_PATH_TYPE_EXCLUSIVE;
-	ASSERT(NULL != dpo);
-	dpo_copy(&path->exclusive.fp_ex_dpo, dpo);
-    }
-
-    return (fib_path_get_index(path));
-}
-
-/*
- * fib_path_copy
- *
- * Copy a path. return index of new path.
- */
-fib_node_index_t
-fib_path_copy (fib_node_index_t path_index,
-	       fib_node_index_t path_list_index)
-{
-    fib_path_t *path, *orig_path;
-
-    pool_get(fib_path_pool, path);
-
-    orig_path = fib_path_get(path_index);
-    ASSERT(NULL != orig_path);
-
-    memcpy(path, orig_path, sizeof(*path));
-
-    FIB_PATH_DBG(path, "create-copy:%d", path_index);
-
-    /*
-     * reset the dynamic section
-     */
-    fib_node_init(&path->fp_node, FIB_NODE_TYPE_PATH);
-    path->fp_oper_flags     = FIB_PATH_OPER_FLAG_NONE;
-    path->fp_pl_index  = path_list_index;
-    path->fp_via_fib   = FIB_NODE_INDEX_INVALID;
-    memset(&path->fp_dpo, 0, sizeof(path->fp_dpo));
-    dpo_reset(&path->fp_dpo);
-
-    return (fib_path_get_index(path));
-}
-
-/*
- * fib_path_destroy
- *
- * destroy a path that is no longer required
- */
-void
-fib_path_destroy (fib_node_index_t path_index)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    ASSERT(NULL != path);
-    FIB_PATH_DBG(path, "destroy");
-
-    fib_path_unresolve(path);
-
-    fib_node_deinit(&path->fp_node);
-    pool_put(fib_path_pool, path);
-}
-
-/*
- * fib_path_destroy
- *
- * destroy a path that is no longer required
- */
-uword
-fib_path_hash (fib_node_index_t path_index)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    return (hash_memory(STRUCT_MARK_PTR(path, path_hash_start),
-			(STRUCT_OFFSET_OF(fib_path_t, path_hash_end) -
-			 STRUCT_OFFSET_OF(fib_path_t, path_hash_start)),
-			0));
-}
-
-/*
- * fib_path_cmp_i
- *
- * Compare two paths for equivalence.
- */
-static int
-fib_path_cmp_i (const fib_path_t *path1,
-		const fib_path_t *path2)
-{
-    int res;
-
-    res = 1;
-
-    /*
-     * paths of different types and protocol are not equal.
-     * different weights only are the same path.
-     */
-    if (path1->fp_type != path2->fp_type)
-    {
-	res = (path1->fp_type - path2->fp_type);
-    }
-    if (path1->fp_nh_proto != path2->fp_nh_proto)
-    {
-	res = (path1->fp_nh_proto - path2->fp_nh_proto);
-    }
-    else
-    {
-	/*
-	 * both paths are of the same type.
-	 * consider each type and its attributes in turn.
-	 */
-	switch (path1->fp_type)
-	{
-	case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
-	    res = ip46_address_cmp(&path1->attached_next_hop.fp_nh,
-				   &path2->attached_next_hop.fp_nh);
-	    if (0 == res) {
-		res = vnet_sw_interface_compare(
-			  vnet_get_main(),
-			  path1->attached_next_hop.fp_interface,
-			  path2->attached_next_hop.fp_interface);
-	    }
-	    break;
-	case FIB_PATH_TYPE_ATTACHED:
-	    res = vnet_sw_interface_compare(
-		      vnet_get_main(),
-		      path1->attached.fp_interface,
-		      path2->attached.fp_interface);
-	    break;
-	case FIB_PATH_TYPE_RECURSIVE:
-	    res = ip46_address_cmp(&path1->recursive.fp_nh,
-				   &path2->recursive.fp_nh);
- 
-	    if (0 == res)
-	    {
-		res = (path1->recursive.fp_tbl_id - path2->recursive.fp_tbl_id);
-	    }
-	    break;
-	case FIB_PATH_TYPE_DEAG:
-	    res = (path1->deag.fp_tbl_id - path2->deag.fp_tbl_id);
-	    break;
-	case FIB_PATH_TYPE_SPECIAL:
-	case FIB_PATH_TYPE_RECEIVE:
-	case FIB_PATH_TYPE_EXCLUSIVE:
-	    res = 0;
-	    break;
-	}
-    }
-    return (res);
-}
-
-/*
- * fib_path_cmp_for_sort
- *
- * Compare two paths for equivalence. Used during path sorting.
- * As usual 0 means equal.
- */
-int
-fib_path_cmp_for_sort (void * v1,
-		       void * v2)
-{
-    fib_node_index_t *pi1 = v1, *pi2 = v2;
-    fib_path_t *path1, *path2;
-
-    path1 = fib_path_get(*pi1);
-    path2 = fib_path_get(*pi2);
-
-    return (fib_path_cmp_i(path1, path2));
-}
-
-/*
- * fib_path_cmp
- *
- * Compare two paths for equivalence.
- */
-int
-fib_path_cmp (fib_node_index_t pi1,
-	      fib_node_index_t pi2)
-{
-    fib_path_t *path1, *path2;
-
-    path1 = fib_path_get(pi1);
-    path2 = fib_path_get(pi2);
-
-    return (fib_path_cmp_i(path1, path2));
-}
-
-int
-fib_path_cmp_w_route_path (fib_node_index_t path_index,
-			   const fib_route_path_t *rpath)
-{
-    fib_path_t *path;
-    int res;
-
-    path = fib_path_get(path_index);
-
-    res = 1;
-
-    if (path->fp_weight != rpath->frp_weight)
-    {
-	res = (path->fp_weight - rpath->frp_weight);
-    }
-    else
-    {
-	/*
-	 * both paths are of the same type.
-	 * consider each type and its attributes in turn.
-	 */
-	switch (path->fp_type)
-	{
-	case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
-	    res = ip46_address_cmp(&path->attached_next_hop.fp_nh,
-				   &rpath->frp_addr);
-	    if (0 == res)
-	    {
-		res = vnet_sw_interface_compare(
-			  vnet_get_main(),
-			  path->attached_next_hop.fp_interface,
-			  rpath->frp_sw_if_index);
-	    }
-	    break;
-	case FIB_PATH_TYPE_ATTACHED:
-	    res = vnet_sw_interface_compare(
-		      vnet_get_main(),
-		      path->attached.fp_interface,
-		      rpath->frp_sw_if_index);
-	    break;
-	case FIB_PATH_TYPE_RECURSIVE:
-            if (FIB_PROTOCOL_MPLS == path->fp_nh_proto)
-            {
-                res = path->recursive.fp_nh.fp_local_label - rpath->frp_local_label;
-            }
-            else
-            {
-                res = ip46_address_cmp(&path->recursive.fp_nh.fp_ip,
-                                       &rpath->frp_addr);
-            }
-
-            if (0 == res)
-            {
-                res = (path->recursive.fp_tbl_id - rpath->frp_fib_index);
-            }
-	    break;
-	case FIB_PATH_TYPE_DEAG:
-	    res = (path->deag.fp_tbl_id - rpath->frp_fib_index);
-	    break;
-	case FIB_PATH_TYPE_SPECIAL:
-	case FIB_PATH_TYPE_RECEIVE:
-	case FIB_PATH_TYPE_EXCLUSIVE:
-	    res = 0;
-	    break;
-	}
-    }
-    return (res);
-}
-
-/*
- * fib_path_recursive_loop_detect
- *
- * A forward walk of the FIB object graph to detect for a cycle/loop. This
- * walk is initiated when an entry is linking to a new path list or from an old.
- * The entry vector passed contains all the FIB entrys that are children of this
- * path (it is all the entries encountered on the walk so far). If this vector
- * contains the entry this path resolve via, then a loop is about to form.
- * The loop must be allowed to form, since we need the dependencies in place
- * so that we can track when the loop breaks.
- * However, we MUST not produce a loop in the forwarding graph (else packets
- * would loop around the switch path until the loop breaks), so we mark recursive
- * paths as looped so that they do not contribute forwarding information.
- * By marking the path as looped, an etry such as;
- *    X/Y
- *     via a.a.a.a (looped)
- *     via b.b.b.b (not looped)
- * can still forward using the info provided by b.b.b.b only
- */
-int
-fib_path_recursive_loop_detect (fib_node_index_t path_index,
-				fib_node_index_t **entry_indicies)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    /*
-     * the forced drop path is never looped, cos it is never resolved.
-     */
-    if (fib_path_is_permanent_drop(path))
-    {
-	return (0);
-    }
-
-    switch (path->fp_type)
-    {
-    case FIB_PATH_TYPE_RECURSIVE:
-    {
-	fib_node_index_t *entry_index, *entries;
-	int looped = 0;
-	entries = *entry_indicies;
-
-	vec_foreach(entry_index, entries) {
-	    if (*entry_index == path->fp_via_fib)
-	    {
-		/*
-		 * the entry that is about to link to this path-list (or
-		 * one of this path-list's children) is the same entry that
-		 * this recursive path resolves through. this is a cycle.
-		 * abort the walk.
-		 */
-		looped = 1;
-		break;
-	    }
-	}
-
-	if (looped)
-	{
-	    FIB_PATH_DBG(path, "recursive loop formed");
-	    path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RECURSIVE_LOOP;
-
-	    dpo_copy(&path->fp_dpo,
-                    drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
-	}
-	else
-	{
-	    /*
-	     * no loop here yet. keep forward walking the graph.
-	     */	    
-	    if (fib_entry_recursive_loop_detect(path->fp_via_fib, entry_indicies))
-	    {
-		FIB_PATH_DBG(path, "recursive loop formed");
-		path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RECURSIVE_LOOP;
-	    }
-	    else
-	    {
-		FIB_PATH_DBG(path, "recursive loop cleared");
-		path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RECURSIVE_LOOP;
-	    }
-	}
-	break;
-    }
-    case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
-    case FIB_PATH_TYPE_ATTACHED:
-    case FIB_PATH_TYPE_SPECIAL:
-    case FIB_PATH_TYPE_DEAG:
-    case FIB_PATH_TYPE_RECEIVE:
-    case FIB_PATH_TYPE_EXCLUSIVE:
-	/*
-	 * these path types cannot be part of a loop, since they are the leaves
-	 * of the graph.
-	 */
-	break;
-    }
-
-    return (fib_path_is_looped(path_index));
-}
-
-int
-fib_path_resolve (fib_node_index_t path_index)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    /*
-     * hope for the best.
-     */
-    path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RESOLVED;
-
-    /*
-     * the forced drop path resolves via the drop adj
-     */
-    if (fib_path_is_permanent_drop(path))
-    {
-	dpo_copy(&path->fp_dpo,
-                 drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
-	path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
-	return (fib_path_is_resolved(path_index));
-    }
-
-    switch (path->fp_type)
-    {
-    case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
-	fib_path_attached_next_hop_set(path);
-	break;
-    case FIB_PATH_TYPE_ATTACHED:
-	/*
-	 * path->attached.fp_interface
-	 */
-	if (!vnet_sw_interface_is_admin_up(vnet_get_main(),
-					   path->attached.fp_interface))
-	{
-	    path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
-	}
-	if (vnet_sw_interface_is_p2p(vnet_get_main(),
-				     path->attached.fp_interface))
-	{
-	    /*
-	     * point-2-point interfaces do not require a glean, since
-	     * there is nothing to ARP. Install a rewrite/nbr adj instead
-	     */
-	    dpo_set(&path->fp_dpo,
-		    DPO_ADJACENCY,
-		    fib_proto_to_dpo(path->fp_nh_proto),
-		    adj_nbr_add_or_lock(
-			path->fp_nh_proto,
-			fib_proto_to_link(path->fp_nh_proto),
-			&zero_addr,
-			path->attached.fp_interface));
-	}
-	else
-	{
-	    dpo_set(&path->fp_dpo,
-		    DPO_ADJACENCY_GLEAN,
-		    fib_proto_to_dpo(path->fp_nh_proto),
-		    adj_glean_add_or_lock(path->fp_nh_proto,
-					  path->attached.fp_interface,
-					  NULL));
-	}
-	/*
-	 * become a child of the adjacency so we receive updates
-	 * when the interface state changes
-	 */
-	path->fp_sibling = adj_child_add(path->fp_dpo.dpoi_index,
-					 FIB_NODE_TYPE_PATH,
-					 fib_path_get_index(path));
-
-	break;
-    case FIB_PATH_TYPE_RECURSIVE:
-    {
-	/*
-	 * Create a RR source entry in the table for the address
-	 * that this path recurses through.
-	 * This resolve action is recursive, hence we may create
-	 * more paths in the process. more creates mean maybe realloc
-	 * of this path.
-	 */
-	fib_node_index_t fei;
-	fib_prefix_t pfx;
-
-	ASSERT(FIB_NODE_INDEX_INVALID == path->fp_via_fib);
-
-	if (FIB_PROTOCOL_MPLS == path->fp_nh_proto)
-	{
-	    fib_prefix_from_mpls_label(path->recursive.fp_nh.fp_local_label, &pfx);
-	}
-	else
-	{
-	    fib_prefix_from_ip46_addr(&path->recursive.fp_nh.fp_ip, &pfx);
-	}
-
-	fei = fib_table_entry_special_add(path->recursive.fp_tbl_id,
-					  &pfx,
-					  FIB_SOURCE_RR,
-					  FIB_ENTRY_FLAG_NONE,
-					  ADJ_INDEX_INVALID);
-
-	path = fib_path_get(path_index);
-	path->fp_via_fib = fei;
-
-	/*
-	 * become a dependent child of the entry so the path is 
-	 * informed when the forwarding for the entry changes.
-	 */
-	path->fp_sibling = fib_entry_child_add(path->fp_via_fib,
-					       FIB_NODE_TYPE_PATH,
-					       fib_path_get_index(path));
-
-	/*
-	 * create and configure the IP DPO
-	 */
-	fib_path_recursive_adj_update(
-	    path,
-	    fib_path_proto_to_chain_type(path->fp_nh_proto),
-	    &path->fp_dpo);
-
-	break;
-    }
-    case FIB_PATH_TYPE_SPECIAL:
-	/*
-	 * Resolve via the drop
-	 */
-	dpo_copy(&path->fp_dpo,
-                 drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
-	break;
-    case FIB_PATH_TYPE_DEAG:
-	/*
-	 * Resolve via a lookup DPO.
-         * FIXME. control plane should add routes with a table ID
-	 */
-	lookup_dpo_add_or_lock_w_fib_index(path->deag.fp_tbl_id,
-                                          fib_proto_to_dpo(path->fp_nh_proto),
-                                          LOOKUP_INPUT_DST_ADDR,
-                                          LOOKUP_TABLE_FROM_CONFIG,
-                                          &path->fp_dpo);
-	break;
-    case FIB_PATH_TYPE_RECEIVE:
-	/*
-	 * Resolve via a receive DPO.
-	 */
-	receive_dpo_add_or_lock(fib_proto_to_dpo(path->fp_nh_proto),
-                                path->receive.fp_interface,
-                                &path->receive.fp_addr,
-                                &path->fp_dpo);
-	break;
-    case FIB_PATH_TYPE_EXCLUSIVE:
-	/*
-	 * Resolve via the user provided DPO
-	 */
-	dpo_copy(&path->fp_dpo, &path->exclusive.fp_ex_dpo);
-	break;
-    }
-
-    return (fib_path_is_resolved(path_index));
-}
-
-u32
-fib_path_get_resolving_interface (fib_node_index_t path_index)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    switch (path->fp_type)
-    {
-    case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
-	return (path->attached_next_hop.fp_interface);
-    case FIB_PATH_TYPE_ATTACHED:
-	return (path->attached.fp_interface);
-    case FIB_PATH_TYPE_RECEIVE:
-	return (path->receive.fp_interface);
-    case FIB_PATH_TYPE_RECURSIVE:
-	return (fib_entry_get_resolving_interface(path->fp_via_fib));    
-    case FIB_PATH_TYPE_SPECIAL:
-    case FIB_PATH_TYPE_DEAG:
-    case FIB_PATH_TYPE_EXCLUSIVE:
-	break;
-    }
-    return (~0);
-}
-
-adj_index_t
-fib_path_get_adj (fib_node_index_t path_index)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    ASSERT(dpo_is_adj(&path->fp_dpo));
-    if (dpo_is_adj(&path->fp_dpo))
-    {
-	return (path->fp_dpo.dpoi_index);
-    }
-    return (ADJ_INDEX_INVALID);
-}
-
-int
-fib_path_get_weight (fib_node_index_t path_index)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    ASSERT(path);
-
-    return (path->fp_weight);
-}
-
-/**
- * @brief Contribute the path's adjacency to the list passed.
- * By calling this function over all paths, recursively, a child
- * can construct its full set of forwarding adjacencies, and hence its
- * uRPF list.
- */
-void
-fib_path_contribute_urpf (fib_node_index_t path_index,
-			  index_t urpf)
-{
-    fib_path_t *path;
-
-    if (!fib_path_is_resolved(path_index))
-	return;
-
-    path = fib_path_get(path_index);
-
-    switch (path->fp_type)
-    {
-    case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
-	fib_urpf_list_append(urpf, path->attached_next_hop.fp_interface);
-	break;
-
-    case FIB_PATH_TYPE_ATTACHED:
-	fib_urpf_list_append(urpf, path->attached.fp_interface);
-	break;
-
-    case FIB_PATH_TYPE_RECURSIVE:
-	fib_entry_contribute_urpf(path->fp_via_fib, urpf);
-	break;
-
-    case FIB_PATH_TYPE_EXCLUSIVE:
-    case FIB_PATH_TYPE_SPECIAL:
-	/*
-	 * these path types may link to an adj, if that's what
-	 * the clinet gave
-	 */
-	if (dpo_is_adj(&path->fp_dpo))
-	{
-	    ip_adjacency_t *adj;
-
-	    adj = adj_get(path->fp_dpo.dpoi_index);
-
-	    fib_urpf_list_append(urpf, adj->rewrite_header.sw_if_index);
-	}
-	break;
-
-    case FIB_PATH_TYPE_DEAG:
-    case FIB_PATH_TYPE_RECEIVE:
-	/*
-	 * these path types don't link to an adj
-	 */
-	break;
-    }
-}
-
-void
-fib_path_contribute_forwarding (fib_node_index_t path_index,
-				fib_forward_chain_type_t fct,
-				dpo_id_t *dpo)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    ASSERT(path);
-    ASSERT(FIB_FORW_CHAIN_TYPE_MPLS_EOS != fct);
-
-    FIB_PATH_DBG(path, "contribute");
-
-    /*
-     * The DPO stored in the path was created when the path was resolved.
-     * This then represents the path's 'native' protocol; IP.
-     * For all others will need to go find something else.
-     */
-    if (fib_path_proto_to_chain_type(path->fp_nh_proto) == fct)
-    {
-	dpo_copy(dpo, &path->fp_dpo);
-    }
-    else
-    {
-	switch (path->fp_type)
-	{
-	case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
-	    switch (fct)
-	    {
-	    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
-	    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
-	    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
-	    case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
-	    case FIB_FORW_CHAIN_TYPE_ETHERNET:
-	    {
-		adj_index_t ai;
-
-		/*
-		 * get a appropriate link type adj.
-		 */
-		ai = fib_path_attached_next_hop_get_adj(
-		         path,
-			 fib_forw_chain_type_to_link_type(fct));
-		dpo_set(dpo, DPO_ADJACENCY,
-			fib_forw_chain_type_to_dpo_proto(fct), ai);
-		adj_unlock(ai);
-
-		break;
-	    }
-	    }
-	    break;
-	case FIB_PATH_TYPE_RECURSIVE:
-	    switch (fct)
-	    {
-	    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
-	    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
-	    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
-	    case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
-		fib_path_recursive_adj_update(path, fct, dpo);
-		break;
-	    case FIB_FORW_CHAIN_TYPE_ETHERNET:
-		ASSERT(0);
-		break;
-	    }
-	    break;
-	case FIB_PATH_TYPE_DEAG:
-	    switch (fct)
-	    {
-	    case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
-                lookup_dpo_add_or_lock_w_table_id(MPLS_FIB_DEFAULT_TABLE_ID,
-                                                  DPO_PROTO_MPLS,
-                                                  LOOKUP_INPUT_DST_ADDR,
-                                                  LOOKUP_TABLE_FROM_CONFIG,
-                                                  dpo);
-                break;
-	    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
-	    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
-	    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
-		dpo_copy(dpo, &path->fp_dpo);
-		break;		
-	    case FIB_FORW_CHAIN_TYPE_ETHERNET:
-		ASSERT(0);
-		break;
-            }
-            break;
-	case FIB_PATH_TYPE_EXCLUSIVE:
-	    dpo_copy(dpo, &path->exclusive.fp_ex_dpo);
-	    break;
-        case FIB_PATH_TYPE_ATTACHED:
-	case FIB_PATH_TYPE_RECEIVE:
-	case FIB_PATH_TYPE_SPECIAL:
-	    ASSERT(0);
-            break;
-	}
-
-    }
-}
-
-load_balance_path_t *
-fib_path_append_nh_for_multipath_hash (fib_node_index_t path_index,
-				       fib_forward_chain_type_t fct,
-				       load_balance_path_t *hash_key)
-{
-    load_balance_path_t *mnh;
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    ASSERT(path);
-
-    if (fib_path_is_resolved(path_index))
-    {
-	vec_add2(hash_key, mnh, 1);
-
-	mnh->path_weight = path->fp_weight;
-	mnh->path_index = path_index;
-	fib_path_contribute_forwarding(path_index, fct, &mnh->path_dpo);
-    }
-
-    return (hash_key);
-}
-
-int
-fib_path_is_recursive (fib_node_index_t path_index)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    return (FIB_PATH_TYPE_RECURSIVE == path->fp_type);
-}
-
-int
-fib_path_is_exclusive (fib_node_index_t path_index)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    return (FIB_PATH_TYPE_EXCLUSIVE == path->fp_type);
-}
-
-int
-fib_path_is_deag (fib_node_index_t path_index)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    return (FIB_PATH_TYPE_DEAG == path->fp_type);
-}
-
-int
-fib_path_is_resolved (fib_node_index_t path_index)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    return (dpo_id_is_valid(&path->fp_dpo) &&
-	    (path->fp_oper_flags & FIB_PATH_OPER_FLAG_RESOLVED) &&
-	    !fib_path_is_looped(path_index) &&
-	    !fib_path_is_permanent_drop(path));
-}
-
-int
-fib_path_is_looped (fib_node_index_t path_index)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    return (path->fp_oper_flags & FIB_PATH_OPER_FLAG_RECURSIVE_LOOP);
-}
-
-int
-fib_path_encode (fib_node_index_t path_list_index,
-		 fib_node_index_t path_index,
-                 void *ctx)
-{
-    fib_route_path_encode_t **api_rpaths = ctx;
-    fib_route_path_encode_t *api_rpath;
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-    if (!path)
-      return (0);
-    vec_add2(*api_rpaths, api_rpath, 1);
-    api_rpath->rpath.frp_weight = path->fp_weight;
-    api_rpath->rpath.frp_proto = path->fp_nh_proto;
-    api_rpath->rpath.frp_sw_if_index = ~0;
-    api_rpath->dpo = path->exclusive.fp_ex_dpo;
-    switch (path->fp_type)
-      {
-      case FIB_PATH_TYPE_RECEIVE:
-        api_rpath->rpath.frp_addr = path->receive.fp_addr;
-        api_rpath->rpath.frp_sw_if_index = path->receive.fp_interface;
-        break;
-      case FIB_PATH_TYPE_ATTACHED:
-        api_rpath->rpath.frp_sw_if_index = path->attached.fp_interface;
-        break;
-      case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
-        api_rpath->rpath.frp_sw_if_index = path->attached_next_hop.fp_interface;
-        api_rpath->rpath.frp_addr = path->attached_next_hop.fp_nh;
-        break;
-      case FIB_PATH_TYPE_SPECIAL:
-        break;
-      case FIB_PATH_TYPE_DEAG:
-        break;
-      case FIB_PATH_TYPE_RECURSIVE:
-        api_rpath->rpath.frp_addr = path->recursive.fp_nh.fp_ip;
-        break;
-      default:
-        break;
-      }
-    return (1);
-}
-
-fib_protocol_t
-fib_path_get_proto (fib_node_index_t path_index)
-{
-    fib_path_t *path;
-
-    path = fib_path_get(path_index);
-
-    return (path->fp_nh_proto);
-}
-
-void
-fib_path_module_init (void)
-{
-    fib_node_register_type (FIB_NODE_TYPE_PATH, &fib_path_vft);
-}
-
-static clib_error_t *
-show_fib_path_command (vlib_main_t * vm,
-			unformat_input_t * input,
-			vlib_cli_command_t * cmd)
-{
-    fib_node_index_t pi;
-    fib_path_t *path;
-
-    if (unformat (input, "%d", &pi))
-    {
-	/*
-	 * show one in detail
-	 */
-	if (!pool_is_free_index(fib_path_pool, pi))
-	{
-	    path = fib_path_get(pi);
-	    u8 *s = fib_path_format(pi, NULL);
-	    s = format(s, "children:");
-	    s = fib_node_children_format(path->fp_node.fn_children, s);
-	    vlib_cli_output (vm, "%s", s);
-	    vec_free(s);
-	}
-	else
-	{
-	    vlib_cli_output (vm, "path %d invalid", pi);
-	}
-    }
-    else
-    {
-	vlib_cli_output (vm, "FIB Paths");
-	pool_foreach(path, fib_path_pool,
-	({
-	    vlib_cli_output (vm, "%U", format_fib_path, path);
-	}));
-    }
-
-    return (NULL);
-}
-
-VLIB_CLI_COMMAND (show_fib_path, static) = {
-  .path = "show fib paths",
-  .function = show_fib_path_command,
-  .short_help = "show fib paths",
-};
diff --git a/vnet/vnet/fib/fib_path.h b/vnet/vnet/fib/fib_path.h
deleted file mode 100644
index 91f49d09..00000000
--- a/vnet/vnet/fib/fib_path.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Given a route of the form;
- *   q.r.s.t/Y
- *     via <interface> <next-hop>
- *
- * The prefix is: q.r.s.t./Y
- * the path is: 'via <interface> <next-hop>
- *
- * The path is the description of where to send the traffic, and the
- * the prefix is a description of which traffic to send.
- * It is the aim of the FIB to resolve the path, i.e. to find the corresponding
- * adjacency to match the path's description.
- */
-
-#ifndef __FIB_PATH_H__
-#define __FIB_PATH_H__
-
-#include <vnet/ip/ip.h>
-#include <vnet/dpo/load_balance.h>
-
-#include <vnet/fib/fib_types.h>
-#include <vnet/adj/adj_types.h>
-
-/**
- * Enurmeration of path configuration attributes
- */
-typedef enum fib_path_cfg_attribute_t_ {
-    /**
-     * Marker. Add new types after this one.
-     */
-    FIB_PATH_CFG_ATTRIBUTE_FIRST = 0,
-    /**
-     * The path is forced to a drop, whatever the next-hop info says.
-     * something somewhere knows better...
-     */
-    FIB_PATH_CFG_ATTRIBUTE_DROP = FIB_PATH_CFG_ATTRIBUTE_FIRST,
-    /**
-     * The path uses an adj that is exclusive. I.e. it is known only by
-     * the source of the route.
-     */
-    FIB_PATH_CFG_ATTRIBUTE_EXCLUSIVE,
-    /**
-     * Recursion constraint via host
-     */
-    FIB_PATH_CFG_ATTRIBUTE_RESOLVE_HOST,
-    /**
-     * Recursion constraint via attached
-     */
-    FIB_PATH_CFG_ATTRIBUTE_RESOLVE_ATTACHED,
-    /**
-     * The path is a for-us path
-     */
-    FIB_PATH_CFG_ATTRIBUTE_LOCAL,
-    /**
-     * Marker. Add new types before this one, then update it.
-     */
-    FIB_PATH_CFG_ATTRIBUTE_LAST = FIB_PATH_CFG_ATTRIBUTE_LOCAL,
-} __attribute__ ((packed)) fib_path_cfg_attribute_t;
-
-/**
- * The maximum number of path attributes
- */
-#define FIB_PATH_CFG_ATTRIBUTE_MAX (FIB_PATH_CFG_ATTRIBUTE_LAST + 1)
-
-#define FIB_PATH_CFG_ATTRIBUTES {			\
-    [FIB_PATH_CFG_ATTRIBUTE_DROP]  = "drop",	        \
-    [FIB_PATH_CFG_ATTRIBUTE_EXCLUSIVE] = "exclusive",	\
-    [FIB_PATH_CFG_ATTRIBUTE_RESOLVE_HOST] = "resolve-host", \
-    [FIB_PATH_CFG_ATTRIBUTE_RESOLVE_ATTACHED] = "resolve-attached", \
-    [FIB_PATH_CFG_ATTRIBUTE_LOCAL] = "local",	        \
-}
-
-#define FOR_EACH_FIB_PATH_CFG_ATTRIBUTE(_item) \
-    for (_item = FIB_PATH_CFG_ATTRIBUTE_FIRST; \
-	 _item <= FIB_PATH_CFG_ATTRIBUTE_LAST; \
-	 _item++)
-
-/**
- * Path config flags from the attributes
- */
-typedef enum fib_path_cfg_flags_t_ {
-    FIB_PATH_CFG_FLAG_NONE  = 0,
-    FIB_PATH_CFG_FLAG_DROP  = (1 << FIB_PATH_CFG_ATTRIBUTE_DROP),
-    FIB_PATH_CFG_FLAG_EXCLUSIVE = (1 << FIB_PATH_CFG_ATTRIBUTE_EXCLUSIVE),
-    FIB_PATH_CFG_FLAG_RESOLVE_HOST = (1 << FIB_PATH_CFG_ATTRIBUTE_RESOLVE_HOST),
-    FIB_PATH_CFG_FLAG_RESOLVE_ATTACHED = (1 << FIB_PATH_CFG_ATTRIBUTE_RESOLVE_ATTACHED),
-    FIB_PATH_CFG_FLAG_LOCAL = (1 << FIB_PATH_CFG_ATTRIBUTE_LOCAL),
-} __attribute__ ((packed)) fib_path_cfg_flags_t;
-
-
-extern u8 *fib_path_format(fib_node_index_t pi, u8 *s);
-extern u8 *fib_path_adj_format(fib_node_index_t pi,
-			       u32 indent,
-			       u8 *s);
-
-extern u8 * format_fib_path(u8 * s, va_list * args);
-
-extern fib_node_index_t fib_path_create(fib_node_index_t pl_index,
-					fib_protocol_t nh_proto,
-					fib_path_cfg_flags_t flags,
-					const fib_route_path_t *path);
-extern fib_node_index_t fib_path_create_special(fib_node_index_t pl_index,
-						fib_protocol_t nh_proto,
-						fib_path_cfg_flags_t flags,
-						const dpo_id_t *dpo);
-
-extern int fib_path_cmp(fib_node_index_t path_index1,
-			fib_node_index_t path_index2);
-extern int fib_path_cmp_for_sort(void * a1, void * a2);
-extern int fib_path_cmp_w_route_path(fib_node_index_t path_index,
-				     const fib_route_path_t *rpath);
-extern fib_node_index_t fib_path_copy(fib_node_index_t path_index,
-				      fib_node_index_t path_list_index);
-extern int fib_path_resolve(fib_node_index_t path_index);
-extern int fib_path_is_resolved(fib_node_index_t path_index);
-extern int fib_path_is_recursive(fib_node_index_t path_index);
-extern int fib_path_is_exclusive(fib_node_index_t path_index);
-extern int fib_path_is_deag(fib_node_index_t path_index);
-extern int fib_path_is_looped(fib_node_index_t path_index);
-extern fib_protocol_t fib_path_get_proto(fib_node_index_t path_index);
-extern void fib_path_destroy(fib_node_index_t path_index);
-extern uword fib_path_hash(fib_node_index_t path_index);
-extern load_balance_path_t * fib_path_append_nh_for_multipath_hash(
-    fib_node_index_t path_index,
-    fib_forward_chain_type_t fct,
-    load_balance_path_t *hash_key);
-extern void fib_path_contribute_forwarding(fib_node_index_t path_index,
-					   fib_forward_chain_type_t type,
-					   dpo_id_t *dpo);
-extern void fib_path_contribute_urpf(fib_node_index_t path_index,
-				     index_t urpf);
-extern adj_index_t fib_path_get_adj(fib_node_index_t path_index);
-extern int fib_path_recursive_loop_detect(fib_node_index_t path_index,
-					  fib_node_index_t **entry_indicies);
-extern u32 fib_path_get_resolving_interface(fib_node_index_t fib_entry_index);
-extern int fib_path_get_weight(fib_node_index_t path_index);
-
-extern void fib_path_module_init(void);
-extern int fib_path_encode(fib_node_index_t path_list_index,
-                           fib_node_index_t path_index,
-			   void *ctx);
-
-#endif
diff --git a/vnet/vnet/fib/fib_path_ext.c b/vnet/vnet/fib/fib_path_ext.c
deleted file mode 100644
index f75b5626..00000000
--- a/vnet/vnet/fib/fib_path_ext.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/mpls/mpls.h>
-#include <vnet/dpo/mpls_label_dpo.h>
-#include <vnet/dpo/load_balance.h>
-#include <vnet/dpo/drop_dpo.h>
-
-#include <vnet/fib/fib_path_ext.h>
-#include <vnet/fib/fib_entry_src.h>
-#include <vnet/fib/fib_path.h>
-#include <vnet/fib/fib_path_list.h>
-#include <vnet/fib/fib_internal.h>
-
-u8 *
-format_fib_path_ext (u8 * s, va_list * args)
-{
-    fib_path_ext_t *path_ext;
-    u32 ii;
-
-    path_ext = va_arg (*args, fib_path_ext_t *);
-
-    s = format(s, "path:%d labels:",
-	       path_ext->fpe_path_index);
-    for (ii = 0; ii < vec_len(path_ext->fpe_path.frp_label_stack); ii++)
-    {
-	s = format(s, "%U ",
-		   format_mpls_unicast_label,
-		   path_ext->fpe_path.frp_label_stack[ii]);
-    }
-    return (s);
-}
-
-int
-fib_path_ext_cmp (fib_path_ext_t *path_ext,
-		  const fib_route_path_t *rpath)
-{
-    return (fib_route_path_cmp(&path_ext->fpe_path, rpath));
-}
-
-static int
-fib_path_ext_match (fib_node_index_t pl_index,
-		    fib_node_index_t path_index,
-		    void *ctx)
-{
-    fib_path_ext_t *path_ext = ctx;
-
-    if (!fib_path_cmp_w_route_path(path_index,
-				   &path_ext->fpe_path))
-    {
-	path_ext->fpe_path_index = path_index;
-	return (0);
-    }
-    // keep going
-    return (1);
-}
-
-void
-fib_path_ext_resolve (fib_path_ext_t *path_ext,
-		      fib_node_index_t path_list_index)
-{
-    /*
-     * Find the path on the path list that this is an extension for
-     */
-    path_ext->fpe_path_index = FIB_NODE_INDEX_INVALID;
-    fib_path_list_walk(path_list_index,
-		       fib_path_ext_match,
-		       path_ext);
-}
-
-void
-fib_path_ext_init (fib_path_ext_t *path_ext,
-		   fib_node_index_t path_list_index,
-		   const fib_route_path_t *rpath)
-{
-    path_ext->fpe_path = *rpath;
-    path_ext->fpe_path_index = FIB_NODE_INDEX_INVALID;
-
-    fib_path_ext_resolve(path_ext, path_list_index);
-}
-
-/**
- * @brief Return true if the label stack is implicit null
- */
-static int
-fib_path_ext_is_imp_null (fib_path_ext_t *path_ext)
-{
-    return ((1 == vec_len(path_ext->fpe_label_stack)) &&
-	    (MPLS_IETF_IMPLICIT_NULL_LABEL == path_ext->fpe_label_stack[0]));
-}
-
-load_balance_path_t *
-fib_path_ext_stack (fib_path_ext_t *path_ext,
-		    const fib_entry_t *entry,
-                    fib_forward_chain_type_t child_fct,
-		    load_balance_path_t *nhs)
-{
-    fib_forward_chain_type_t parent_fct;
-    load_balance_path_t *nh;
-
-    if (!fib_path_is_resolved(path_ext->fpe_path_index))
-	return (nhs);
-
-    /*
-     * Since we are stacking this path-extension, it must have a valid out
-     * label. From the chain type request by the child, determine what
-     * chain type we will request from the parent.
-     */
-    switch (child_fct)
-    {
-    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
-    {
-	/*
-	 * The EOS chain is a tricky since, when the path has an imp NULL one cannot know
-         * the adjacency to link to without knowing what the packets payload protocol
-	 * will be once the label is popped.
-	 */
-	if (fib_path_ext_is_imp_null(path_ext))
-	{
-            parent_fct = fib_entry_chain_type_fixup(entry, child_fct);
-        }
-        else
-        {
-            /*
-             * we have a label to stack. packets will thus be labelled when
-             * they encounter the child, ergo, non-eos.
-             */
-	    parent_fct = FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS;
-        }
-	break;
-    }
-    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
-    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
-	if (fib_path_ext_is_imp_null(path_ext))
-	{
-            /*
-             * implicit-null label for the eos or IP chain, need to pick up
-             * the IP adj
-             */
-	    parent_fct = child_fct;
-	}
-        else
-        {
-            /*
-             * we have a label to stack. packets will thus be labelled when
-             * they encounter the child, ergo, non-eos.
-             */
-	    parent_fct = FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS;
-        }
-	break;
-    case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
-        parent_fct = child_fct;
-	break;
-    default:
-        return (nhs);
-	break;
-    }
-
-    dpo_id_t via_dpo = DPO_INVALID;
-
-    /*
-     * The next object in the graph after the imposition of the label
-     * will be the DPO contributed by the path through which the packets
-     * are to be sent. We stack the MPLS Label DPO on this path DPO
-     */
-    fib_path_contribute_forwarding(path_ext->fpe_path_index,
-				   parent_fct,
-				   &via_dpo);
-
-    if (dpo_is_drop(&via_dpo) ||
-	load_balance_is_drop(&via_dpo))
-    {
-	/*
-	 * don't stack a path extension on a drop. doing so will create
-	 * a LB bucket entry on drop, and we will lose a percentage of traffic.
-	 */
-    }
-    else
-    {
-	vec_add2(nhs, nh, 1);
-	nh->path_weight = fib_path_get_weight(path_ext->fpe_path_index);
-	nh->path_index = path_ext->fpe_path_index;
-	dpo_copy(&nh->path_dpo, &via_dpo);
-
-	/*
-	 * The label is stackable for this chain type
-	 * construct the mpls header that will be imposed in the data-path
-	 */
-	if (!fib_path_ext_is_imp_null(path_ext))
-	{
-            /*
-             * we use the parent protocol for the label so that
-             * we pickup the correct MPLS imposition nodes to do
-             * ip[46] processing.
-             */
-            dpo_proto_t chain_proto;
-            mpls_eos_bit_t eos;
-            index_t mldi;
-
-            eos = (child_fct == FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS ?
-                   MPLS_NON_EOS :
-                   MPLS_EOS);
-            chain_proto = fib_forw_chain_type_to_dpo_proto(child_fct);
-
-            mldi = mpls_label_dpo_create(path_ext->fpe_label_stack,
-                                         eos, 255, 0,
-                                         chain_proto,
-                                         &nh->path_dpo);
-
-	    dpo_set(&nh->path_dpo,
-		    DPO_MPLS_LABEL,
-                    chain_proto,
-                    mldi);
-	}
-    }
-    dpo_reset(&via_dpo);
-
-    return (nhs);
-}
diff --git a/vnet/vnet/fib/fib_path_ext.h b/vnet/vnet/fib/fib_path_ext.h
deleted file mode 100644
index cf8f8df0..00000000
--- a/vnet/vnet/fib/fib_path_ext.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __FIB_PATH_EXT_H__
-#define __FIB_PATH_EXT_H__
-
-#include <vnet/mpls/mpls.h>
-#include <vnet/fib/fib_types.h>
-
-/**
- * A path extension is a per-entry addition to the forwarding information
- * when packets are sent for that entry over that path.
- *
- * For example:
- *    ip route add 1.1.1.1/32 via 10.10.10.10 out-label 100
- *
- * The out-going MPLS label value 100 is a path-extension. It is a value sepcific
- * to the entry 1.1.1.1/32 and valid only when packets are sent via 10.10.10.10.
- */
-typedef struct fib_path_ext_t_
-{
-    /**
-     * A description of the path that is being extended.
-     * This description is used to match this extension with the [changing]
-     * instance of a fib_path_t that is extended
-     */
-    fib_route_path_t fpe_path;
-#define fpe_label_stack fpe_path.frp_label_stack
-
-    /**
-     * The index of the path. This is the global index, not the path's
-     * position in the path-list.
-     */
-    fib_node_index_t fpe_path_index;
-} fib_path_ext_t;
-
-struct fib_entry_t_;
-
-extern u8 * format_fib_path_ext(u8 * s, va_list * args);
-
-extern void fib_path_ext_init(fib_path_ext_t *path_ext,
-			      fib_node_index_t path_list_index,
-			      const fib_route_path_t *rpath);
-
-extern int fib_path_ext_cmp(fib_path_ext_t *path_ext,
-			    const fib_route_path_t *rpath);
-
-extern void fib_path_ext_resolve(fib_path_ext_t *path_ext,
-				 fib_node_index_t path_list_index);
-
-extern load_balance_path_t *fib_path_ext_stack(fib_path_ext_t *path_ext,
-                                               const struct fib_entry_t_ *entry,
-                                               fib_forward_chain_type_t fct,
-                                               load_balance_path_t *nhs);
-
-#endif
-
diff --git a/vnet/vnet/fib/fib_path_list.c b/vnet/vnet/fib/fib_path_list.c
deleted file mode 100644
index 5b35e9b8..00000000
--- a/vnet/vnet/fib/fib_path_list.c
+++ /dev/null
@@ -1,1223 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vppinfra/mhash.h>
-#include <vnet/ip/ip.h>
-#include <vnet/adj/adj.h>
-#include <vnet/dpo/load_balance.h>
-#include <vnet/dpo/load_balance_map.h>
-
-#include <vnet/fib/fib_path_list.h>
-#include <vnet/fib/fib_internal.h>
-#include <vnet/fib/fib_node_list.h>
-#include <vnet/fib/fib_walk.h>
-#include <vnet/fib/fib_urpf_list.h>
-
-/**
- * FIB path-list
- * A representation of the list/set of path trough which a prefix is reachable
- */
-typedef struct fib_path_list_t_ {
-    /**
-     * A path-list is a node in the FIB graph.
-     */
-    fib_node_t fpl_node;
-
-    /**
-     * Flags on the path-list
-     */
-    fib_path_list_flags_t fpl_flags;
-
-    /**
-     * The next-hop protocol for the paths in this path list.
-     * Note that fixing the proto here means we don't support a mix of
-     * v4 and v6 paths. ho hum.
-     */
-    fib_protocol_t fpl_nh_proto;
-
-    /**
-     * Vector of paths indicies for all configured paths.
-     * For shareable path-lists this list MUST not change.
-     */
-    fib_node_index_t *fpl_paths;
-
-    /**
-     * the RPF list calculated for this path list
-     */
-    fib_node_index_t fpl_urpf;
-} fib_path_list_t;
-
-/*
- * Array of strings/names for the FIB sources
- */
-static const char *fib_path_list_attr_names[] = FIB_PATH_LIST_ATTRIBUTES;
-
-/*
- * The memory pool from which we allocate all the path-lists
- */
-static fib_path_list_t * fib_path_list_pool;
-
-/*
- * The data-base of shared path-lists
- */
-static uword *fib_path_list_db;
-
-/*
- * Debug macro
- */
-#ifdef FIB_DEBUG
-#define FIB_PATH_LIST_DBG(_pl, _fmt, _args...)		  \
-{   		            				  \
-    u8 *_tmp = 0;					  \
-    _tmp = fib_path_list_format(			  \
-	fib_path_list_get_index(_pl), _tmp);		  \
-    clib_warning("pl:[%d:%p:%p:%s]:" _fmt,		  \
-		 fib_path_list_get_index(_pl),		  \
-		 _pl, _pl->fpl_paths, _tmp,		  \
-		 ##_args);				  \
-    vec_free(_tmp);					  \
-}
-#else
-#define FIB_PATH_LIST_DBG(_pl, _fmt, _args...)
-#endif
-
-static fib_path_list_t *
-fib_path_list_get (fib_node_index_t index)
-{
-    return (pool_elt_at_index(fib_path_list_pool, index));
-}
-
-static fib_node_t *
-fib_path_list_get_node (fib_node_index_t index)
-{
-    return ((fib_node_t*)fib_path_list_get(index));
-}
-
-static fib_path_list_t*
-fib_path_list_from_fib_node (fib_node_t *node)
-{
-#if CLIB_DEBUG > 0
-    ASSERT(FIB_NODE_TYPE_PATH_LIST == node->fn_type);
-#endif
-    return ((fib_path_list_t*)node);
-}
-
-static fib_node_index_t
-fib_path_list_get_index (fib_path_list_t *path_list)
-{
-    return (path_list - fib_path_list_pool);
-}
-
-static u8 *
-format_fib_path_list (u8 * s, va_list * args)
-{
-    fib_path_list_attribute_t attr;
-    fib_node_index_t *path_index;
-    fib_path_list_t *path_list;
-
-    path_list = va_arg (*args, fib_path_list_t *);
-    
-    s = format (s, "    index:%u", fib_path_list_get_index(path_list));
-    s = format (s, " locks:%u", path_list->fpl_node.fn_locks);
-    s = format (s, " proto:%U", format_fib_protocol, path_list->fpl_nh_proto);
-
-    if (FIB_PATH_LIST_FLAG_NONE != path_list->fpl_flags)
-    {
-	s = format (s, " flags:");
-	FOR_EACH_PATH_LIST_ATTRIBUTE(attr)
-        {
-	    if ((1<<attr) & path_list->fpl_flags)
-            {
-		s = format (s, "%s,", fib_path_list_attr_names[attr]);
-	    }
-	}
-    }
-    s = format (s, " %U\n", format_fib_urpf_list, path_list->fpl_urpf);
-
-    vec_foreach (path_index, path_list->fpl_paths)
-    {
-	s = fib_path_format(*path_index, s);
-	s = format(s, "\n");
-    }
-
-    return (s);
-}
-
-u8 *
-fib_path_list_adjs_format (fib_node_index_t path_list_index,
-			   u32 indent,
-			   u8 * s)
-{
-    fib_path_list_t *path_list;
-    u32 i;
-
-    path_list = fib_path_list_get(path_list_index);
-
-    vec_foreach_index (i, path_list->fpl_paths)
-    {
-	s = fib_path_adj_format(path_list->fpl_paths[i],
-				indent, s);
-    }
-
-    return (s);
-}
-
-
-u8 *
-fib_path_list_format (fib_node_index_t path_list_index,
-		      u8 * s)
-{
-    fib_path_list_t *path_list;
-
-    path_list = fib_path_list_get(path_list_index);
-
-    return (format(s, "%U", format_fib_path_list, path_list));
-}
-
-static uword
-fib_path_list_hash (fib_path_list_t *path_list)
-{
-    uword old_path_list_hash, new_path_list_hash, path_hash;
-    fib_node_index_t *path_index;
-
-    ASSERT(path_list);
-
-    new_path_list_hash = old_path_list_hash = vec_len(path_list->fpl_paths);
-
-    vec_foreach (path_index, path_list->fpl_paths)
-    {
-	path_hash = fib_path_hash(*path_index);
-#if uword_bits == 64
-	hash_mix64(path_hash, old_path_list_hash, new_path_list_hash);
-#else
-	hash_mix32(path_hash, old_path_list_hash, new_path_list_hash);
-#endif
-    }
-
-    return (new_path_list_hash);
-}
-
-always_inline uword
-fib_path_list_db_hash_key_from_index (uword index)
-{
-    return 1 + 2*index;
-}
-
-always_inline uword
-fib_path_list_db_hash_key_is_index (uword key)
-{
-    return key & 1;
-}
-
-always_inline uword
-fib_path_list_db_hash_key_2_index (uword key)
-{
-    ASSERT (fib_path_list_db_hash_key_is_index (key));
-    return key / 2;
-}
-
-static fib_path_list_t*
-fib_path_list_db_get_from_hash_key (uword key)
-{
-    fib_path_list_t *path_list;
-
-    if (fib_path_list_db_hash_key_is_index (key))
-    {
-	fib_node_index_t path_list_index;
-
-	path_list_index = fib_path_list_db_hash_key_2_index(key);
-	path_list = fib_path_list_get(path_list_index);
-    }
-    else
-    {       
-	path_list = uword_to_pointer (key, fib_path_list_t *);
-    }
-
-    return (path_list);
-}
-
-static uword
-fib_path_list_db_hash_key_sum (hash_t * h,
-			       uword key)
-{
-    fib_path_list_t *path_list;
-
-    path_list = fib_path_list_db_get_from_hash_key(key);
-
-    return (fib_path_list_hash(path_list));
-}
-
-static uword
-fib_path_list_db_hash_key_equal (hash_t * h,
-				 uword key1,
-				 uword key2)
-{
-    fib_path_list_t *path_list1, *path_list2;
-
-    path_list1 = fib_path_list_db_get_from_hash_key(key1);
-    path_list2 = fib_path_list_db_get_from_hash_key(key2);
-
-    return (fib_path_list_hash(path_list1) ==
-	    fib_path_list_hash(path_list2));
-}
-
-static fib_node_index_t
-fib_path_list_db_find (fib_path_list_t *path_list)
-{
-    uword *p;
-
-    p = hash_get(fib_path_list_db, path_list);
-
-    if (NULL != p)
-    {
-	return p[0];
-    }
-
-    return (FIB_NODE_INDEX_INVALID);
-}
-
-static void
-fib_path_list_db_insert (fib_node_index_t path_list_index)
-{
-    fib_path_list_t *path_list;
-
-    path_list = fib_path_list_get(path_list_index);
-
-    ASSERT(FIB_NODE_INDEX_INVALID == fib_path_list_db_find(path_list));
-
-    hash_set (fib_path_list_db,
-	      fib_path_list_db_hash_key_from_index(path_list_index),
-	      path_list_index);
-
-    FIB_PATH_LIST_DBG(path_list, "DB-inserted");
-}
-
-static void
-fib_path_list_db_remove (fib_node_index_t path_list_index)
-{
-    fib_path_list_t *path_list;
-
-    path_list = fib_path_list_get(path_list_index);
-
-    ASSERT(FIB_NODE_INDEX_INVALID != fib_path_list_db_find(path_list));
-
-    hash_unset(fib_path_list_db,
-	       fib_path_list_db_hash_key_from_index(path_list_index));
-
-    FIB_PATH_LIST_DBG(path_list, "DB-removed");
-}
-
-static void
-fib_path_list_destroy (fib_path_list_t *path_list)
-{
-    fib_node_index_t *path_index;
-
-    FIB_PATH_LIST_DBG(path_list, "destroy");
-
-    vec_foreach (path_index, path_list->fpl_paths)
-    {
-	fib_path_destroy(*path_index);
-    }
-
-    vec_free(path_list->fpl_paths);
-    fib_urpf_list_unlock(path_list->fpl_urpf);
-
-    fib_node_deinit(&path_list->fpl_node);
-    pool_put(fib_path_list_pool, path_list);
-}
-
-static void
-fib_path_list_last_lock_gone (fib_node_t *node)
-{
-    fib_path_list_t *path_list;
-
-    path_list = fib_path_list_from_fib_node(node);
-
-    FIB_PATH_LIST_DBG(path_list, "last-lock");
-
-    if (path_list->fpl_flags & FIB_PATH_LIST_FLAG_SHARED)
-    {
-	fib_path_list_db_remove(fib_path_list_get_index(path_list));
-    }
-    fib_path_list_destroy(path_list);
-}
-
-/*
- * fib_path_mk_lb
- *
- * update the multipath adj this path-list will contribute to its
- * children's forwarding.
- */
-static void
-fib_path_list_mk_lb (fib_path_list_t *path_list,
-		     fib_forward_chain_type_t fct,
-		     dpo_id_t *dpo)
-{
-    load_balance_path_t *hash_key;
-    fib_node_index_t *path_index;
-
-    hash_key  = NULL;
-
-    if (!dpo_id_is_valid(dpo))
-    {
-        /*
-         * first time create
-         */
-        dpo_set(dpo,
-                DPO_LOAD_BALANCE,
-                fib_forw_chain_type_to_dpo_proto(fct),
-                load_balance_create(0,
-				    fib_forw_chain_type_to_dpo_proto(fct),
-				    0 /* FIXME FLOW HASH */));
-    }
-
-    /*
-     * We gather the DPOs from resolved paths.
-     */
-    vec_foreach (path_index, path_list->fpl_paths)
-    {
-	hash_key = fib_path_append_nh_for_multipath_hash(
-	               *path_index,
-		       fct,
-		       hash_key);
-    }
-
-    /*
-     * Path-list load-balances, which if used, would be shared and hence
-     * never need a load-balance map.
-     */
-    load_balance_multipath_update(dpo, hash_key, LOAD_BALANCE_FLAG_NONE);
-
-    FIB_PATH_LIST_DBG(path_list, "mk lb: %d", dpo->dpoi_index);
-
-    vec_free(hash_key);
-}
-
-/**
- * @brief [re]build the path list's uRPF list
- */
-static void
-fib_path_list_mk_urpf (fib_path_list_t *path_list)
-{
-    fib_node_index_t *path_index;
-
-    /*
-     * ditch the old one. by iterating through all paths we are going
-     * to re-find all the adjs that were in the old one anyway. If we
-     * keep the old one, then the |sort|uniq requires more work.
-     * All users of the RPF list have their own lock, so we can release
-     * immediately.
-     */
-    fib_urpf_list_unlock(path_list->fpl_urpf);
-    path_list->fpl_urpf = fib_urpf_list_alloc_and_lock();
-
-    vec_foreach (path_index, path_list->fpl_paths)
-    {
-	fib_path_contribute_urpf(*path_index, path_list->fpl_urpf);
-    }
-
-    fib_urpf_list_bake(path_list->fpl_urpf);
-}
-
-/**
- * @brief Contribute (add) this path list's uRPF list. This allows the child
- * to construct an aggregate list.
- */
-void
-fib_path_list_contribute_urpf (fib_node_index_t path_list_index,
-			       index_t urpf)
-{
-    fib_path_list_t *path_list;
-
-    path_list = fib_path_list_get(path_list_index);
-
-    fib_urpf_list_combine(urpf, path_list->fpl_urpf);
-}
-
-/**
- * @brief Return the the child the RPF list pre-built for this path list
- */
-index_t
-fib_path_list_get_urpf (fib_node_index_t path_list_index)
-{
-    fib_path_list_t *path_list;
-
-    path_list = fib_path_list_get(path_list_index);
-
-    return (path_list->fpl_urpf);
-}
-
-/*
- * fib_path_list_back_walk
- *
- * Called from one of this path-list's paths to progate
- * a back walk
- */
-void
-fib_path_list_back_walk (fib_node_index_t path_list_index,
-			 fib_node_back_walk_ctx_t *ctx)
-{
-    fib_path_list_t *path_list;
-
-    path_list = fib_path_list_get(path_list_index);
-
-    fib_path_list_mk_urpf(path_list);
-
-    /*
-     * propagate the backwalk further
-     */
-    if (32 >= fib_node_list_get_size(path_list->fpl_node.fn_children))
-    {
-        /*
-         * only a few children. continue the walk synchronously
-         */
-	fib_walk_sync(FIB_NODE_TYPE_PATH_LIST, path_list_index, ctx);
-    }
-    else
-    {
-        /*
-         * many children. schedule a async walk
-         */
-        fib_walk_async(FIB_NODE_TYPE_PATH_LIST,
-                       path_list_index,
-                       FIB_WALK_PRIORITY_LOW,
-                       ctx);
-    }
-}
-
-/*
- * fib_path_list_back_walk_notify
- *
- * A back walk has reach this path-list.
- */
-static fib_node_back_walk_rc_t
-fib_path_list_back_walk_notify (fib_node_t *node,
-				fib_node_back_walk_ctx_t *ctx)
-{
-    /*
-     * the path-list is not a direct child of any other node type
-     * paths, which do not change thier to-list-mapping, save the
-     * list they are a member of, and invoke the BW function directly.
-     */
-    ASSERT(0);
-
-    return (FIB_NODE_BACK_WALK_CONTINUE);
-}
-
-/*
- * Display the path-list memory usage
- */
-static void
-fib_path_list_memory_show (void)
-{
-    fib_show_memory_usage("Path-list",
-			  pool_elts(fib_path_list_pool),
-			  pool_len(fib_path_list_pool),
-			  sizeof(fib_path_list_t));
-    fib_urpf_list_show_mem();
-}
-
-/*
- * The FIB path-list's graph node virtual function table
- */
-static const fib_node_vft_t fib_path_list_vft = {
-    .fnv_get = fib_path_list_get_node,
-    .fnv_last_lock = fib_path_list_last_lock_gone,
-    .fnv_back_walk = fib_path_list_back_walk_notify,
-    .fnv_mem_show = fib_path_list_memory_show,
-};
-
-static fib_path_list_t *
-fib_path_list_alloc (fib_node_index_t *path_list_index)
-{
-    fib_path_list_t *path_list;
-
-    pool_get(fib_path_list_pool, path_list);
-    memset(path_list, 0, sizeof(*path_list));
-
-    fib_node_init(&path_list->fpl_node,
-		  FIB_NODE_TYPE_PATH_LIST);
-    path_list->fpl_urpf = INDEX_INVALID;
-
-    if (NULL != path_list_index)
-    {
-	*path_list_index = fib_path_list_get_index(path_list);
-    }
-
-    FIB_PATH_LIST_DBG(path_list, "alloc");
-
-    return (path_list);
-}
-
-static fib_path_list_t *
-fib_path_list_resolve (fib_path_list_t *path_list)
-{
-    fib_node_index_t *path_index, *paths, path_list_index;
-
-    ASSERT(!(path_list->fpl_flags & FIB_PATH_LIST_FLAG_RESOLVED));
-
-    /*
-     * resolving a path-list is a recursive action. this means more path
-     * lists can be created during this call, and hence this path-list
-     * can be realloc'd. so we work with copies.
-     * this function is called only once per-path list, so its no great overhead.
-     */
-    path_list_index = fib_path_list_get_index(path_list);
-    paths = vec_dup(path_list->fpl_paths);
-
-    vec_foreach (path_index, paths)
-    {
-	fib_path_resolve(*path_index);
-    }
-
-    vec_free(paths);
-    path_list = fib_path_list_get(path_list_index);
-
-    FIB_PATH_LIST_DBG(path_list, "resovled");
-    fib_path_list_mk_urpf(path_list);
-
-    return (path_list);
-}
-
-u32
-fib_path_list_get_resolving_interface (fib_node_index_t path_list_index)
-{
-    fib_node_index_t *path_index;
-    fib_path_list_t *path_list;
-    u32 sw_if_index;
-
-    path_list = fib_path_list_get(path_list_index);
-
-    sw_if_index = ~0;
-    vec_foreach (path_index, path_list->fpl_paths)
-    {
-	sw_if_index = fib_path_get_resolving_interface(*path_index);
-	if (~0 != sw_if_index)
-	{
-	    return (sw_if_index);
-	}
-    }
-
-    return (sw_if_index);
-}
-
-fib_protocol_t
-fib_path_list_get_proto (fib_node_index_t path_list_index)
-{
-    fib_path_list_t *path_list;
-
-    path_list = fib_path_list_get(path_list_index);
-
-    /*
-     * we don't support a mix of path protocols, so we can return the proto
-     * of the first
-     */
-    return (fib_path_get_proto(path_list->fpl_paths[0]));
-}
-
-int
-fib_path_list_is_looped (fib_node_index_t path_list_index)
-{
-    fib_path_list_t *path_list;
-
-    path_list = fib_path_list_get(path_list_index);
-
-    return (path_list->fpl_flags & FIB_PATH_LIST_FLAG_LOOPED);
-}
-
-static fib_path_cfg_flags_t 
-fib_path_list_flags_2_path_flags (fib_path_list_flags_t plf)
-{
-    fib_path_cfg_flags_t pf = FIB_PATH_CFG_FLAG_NONE;
-
-    if (plf & FIB_PATH_LIST_FLAG_LOCAL)
-    {
-	pf |= FIB_PATH_CFG_FLAG_LOCAL;
-    }
-    if (plf & FIB_PATH_LIST_FLAG_DROP)
-    {
-	pf |= FIB_PATH_CFG_FLAG_DROP;
-    }
-    if (plf & FIB_PATH_LIST_FLAG_EXCLUSIVE)
-    {
-	pf |= FIB_PATH_CFG_FLAG_EXCLUSIVE;
-    }
-
-    return (pf);
-}
-
-static fib_path_list_flags_t
-fib_path_list_flags_fixup (fib_path_list_flags_t flags)
-{
-    /*
-     * we do no share drop nor exclusive path-lists
-     */
-    if (flags & FIB_PATH_LIST_FLAG_DROP ||
-	flags & FIB_PATH_LIST_FLAG_EXCLUSIVE)
-    {
-	flags &= ~FIB_PATH_LIST_FLAG_SHARED;
-    }
-
-    return (flags);
-}
-
-fib_node_index_t
-fib_path_list_create (fib_path_list_flags_t flags,
-		      const fib_route_path_t *rpaths)
-{
-    fib_node_index_t path_list_index, old_path_list_index;
-    fib_path_list_t *path_list;
-    int i;
-
-    flags = fib_path_list_flags_fixup(flags);
-    path_list = fib_path_list_alloc(&path_list_index);
-    path_list->fpl_flags = flags;
-    /*
-     * we'll assume for now all paths are the same next-hop protocol
-     */
-    path_list->fpl_nh_proto = rpaths[0].frp_proto;
-
-    vec_foreach_index(i, rpaths)
-    {
-	vec_add1(path_list->fpl_paths,
-		 fib_path_create(path_list_index,
-				 path_list->fpl_nh_proto,
-				 fib_path_list_flags_2_path_flags(flags),
-				 &rpaths[i]));
-    }
-
-    /*
-     * If a shared path list is requested, consult the DB for a match
-     */
-    if (flags & FIB_PATH_LIST_FLAG_SHARED)
-    {
-	/*
-	 * check for a matching path-list in the DB.
-	 * If we find one then we can return the existing one and destroy the
-	 * new one just created.
-	 */
-	old_path_list_index = fib_path_list_db_find(path_list);
-	if (FIB_NODE_INDEX_INVALID != old_path_list_index)
-	{
-	    fib_path_list_destroy(path_list);
-	
-	    path_list_index = old_path_list_index;
-	}
-	else
-	{
-	    /*
-	     * if there was not a matching path-list, then this
-	     * new one will need inserting into the DB and resolving.
-	     */
-	    fib_path_list_db_insert(path_list_index);
-	    path_list = fib_path_list_resolve(path_list);
-	}
-    }
-    else
-    {
-	/*
-	 * no shared path list requested. resolve and use the one
-	 * just created.
-	 */
-	path_list = fib_path_list_resolve(path_list);
-    }
-
-    return (path_list_index);
-}
-
-fib_node_index_t
-fib_path_list_create_special (fib_protocol_t nh_proto,
-			      fib_path_list_flags_t flags,
-			      const dpo_id_t *dpo)
-{
-    fib_node_index_t path_index, path_list_index;
-    fib_path_list_t *path_list;
-
-    path_list = fib_path_list_alloc(&path_list_index);
-    path_list->fpl_flags = flags;
-    path_list->fpl_nh_proto = nh_proto;
-
-    path_index =
-	fib_path_create_special(path_list_index,
-				path_list->fpl_nh_proto,
-				fib_path_list_flags_2_path_flags(flags),
-				dpo);
-    vec_add1(path_list->fpl_paths, path_index);
-
-    /*
-     * we don't share path-lists. we can do PIC on them so why bother.
-     */
-    path_list = fib_path_list_resolve(path_list);
-
-    return (path_list_index);
-}
-
-/*
- * fib_path_list_copy_and_path_add
- *
- * Create a copy of a path-list and append one more path to it.
- * The path-list returned could either have been newly created, or
- * can be a shared path-list from the data-base.
- */
-fib_node_index_t
-fib_path_list_copy_and_path_add (fib_node_index_t orig_path_list_index,
-				 fib_path_list_flags_t flags,
-				 const fib_route_path_t *rpaths)
-{
-    fib_node_index_t path_index, new_path_index, *orig_path_index;
-    fib_path_list_t *path_list, *orig_path_list;
-    fib_node_index_t path_list_index;
-    fib_node_index_t pi;
-
-    ASSERT(1 == vec_len(rpaths));
-
-    /*
-     * alloc the new list before we retrieve the old one, lest
-     * the alloc result in a realloc
-     */
-    path_list = fib_path_list_alloc(&path_list_index);
-
-    orig_path_list = fib_path_list_get(orig_path_list_index);
-
-    FIB_PATH_LIST_DBG(orig_path_list, "copy-add");
-
-    flags = fib_path_list_flags_fixup(flags);
-    path_list->fpl_flags = flags;
-    path_list->fpl_nh_proto = orig_path_list->fpl_nh_proto;
-    vec_validate(path_list->fpl_paths, vec_len(orig_path_list->fpl_paths));
-    pi = 0;
-
-    new_path_index = fib_path_create(path_list_index,
-                                     path_list->fpl_nh_proto,
-                                     fib_path_list_flags_2_path_flags(flags),
-                                     rpaths);
-
-    vec_foreach (orig_path_index, orig_path_list->fpl_paths)
-    {
-        /*
-         * don't add duplicate paths
-         * In the unlikely event the path is a duplicate, then we'll
-         * find a matching path-list later and this one will be toast.
-         */
-	if (0 != fib_path_cmp(new_path_index, *orig_path_index))
-        {
-            path_index = fib_path_copy(*orig_path_index, path_list_index);
-            path_list->fpl_paths[pi++] = path_index;
-        }
-        else
-        {
-            _vec_len(path_list->fpl_paths) = vec_len(orig_path_list->fpl_paths);
-        }
-    }
-
-    path_list->fpl_paths[pi] = new_path_index;
-
-    /*
-     * we sort the paths since the key for the path-list is
-     * the description of the paths it contains. The paths need to
-     * be sorted else this description will differ.
-     */
-    vec_sort_with_function(path_list->fpl_paths, fib_path_cmp_for_sort);
-
-    FIB_PATH_LIST_DBG(path_list, "path-added");
-
-    /*
-     * If a shared path list is requested, consult the DB for a match
-     */
-    if (path_list->fpl_flags & FIB_PATH_LIST_FLAG_SHARED)
-    {
-	fib_node_index_t exist_path_list_index;
-	/*
-	 * check for a matching path-list in the DB.
-	 * If we find one then we can return the existing one and destroy the
-	 * new one just created.
-	 */
-	exist_path_list_index = fib_path_list_db_find(path_list);
-	if (FIB_NODE_INDEX_INVALID != exist_path_list_index)
-	{
-	    fib_path_list_destroy(path_list);
-	
-	    path_list_index = exist_path_list_index;
-	}
-	else
-	{
-	    /*
-	     * if there was not a matching path-list, then this
-	     * new one will need inserting into the DB and resolving.
-	     */
-	    fib_path_list_db_insert(path_list_index);
-
-	    path_list = fib_path_list_resolve(path_list);
-	}
-    }
-    else
-    {
-	/*
-	 * no shared path list requested. resolve and use the one
-	 * just created.
-	 */
-	path_list = fib_path_list_resolve(path_list);
-    }
-
-    return (path_list_index);
-}
-
-/*
- * fib_path_list_copy_and_path_remove
- *
- * Copy the path-list excluding the path passed.
- * If the path is the last one, then the index reurned will be invalid.
- * i.e. the path-list is toast.
- */
-fib_node_index_t
-fib_path_list_copy_and_path_remove (fib_node_index_t orig_path_list_index,
-				    fib_path_list_flags_t flags,
-				    const fib_route_path_t *rpaths)
-{
-    fib_node_index_t path_index, *orig_path_index, path_list_index, tmp_path_index;
-    fib_path_list_t *path_list,  *orig_path_list;
-    fib_node_index_t pi;
-
-    ASSERT(1 == vec_len(rpaths));
-
-    path_list = fib_path_list_alloc(&path_list_index);
-
-    flags = fib_path_list_flags_fixup(flags);
-    orig_path_list = fib_path_list_get(orig_path_list_index);
-
-    FIB_PATH_LIST_DBG(orig_path_list, "copy-remove");
-
-    path_list->fpl_flags = flags;
-    path_list->fpl_nh_proto = orig_path_list->fpl_nh_proto;
-    /*
-     * allocate as many paths as we might need in one go, rather than
-     * using vec_add to do a few at a time.
-     */
-    if (vec_len(orig_path_list->fpl_paths) > 1)
-    {
-	vec_validate(path_list->fpl_paths, vec_len(orig_path_list->fpl_paths) - 2);
-    }
-    pi = 0;
-
-    /*
-     * create a representation of the path to be removed, so it
-     * can be used as a comparison object during the copy.
-     */
-    tmp_path_index = fib_path_create(path_list_index,
-				     path_list->fpl_nh_proto,
-				     fib_path_list_flags_2_path_flags(flags),
-				     rpaths);
-
-    vec_foreach (orig_path_index, orig_path_list->fpl_paths)
-    {
-	if (0 != fib_path_cmp(tmp_path_index, *orig_path_index)) {
-	    path_index = fib_path_copy(*orig_path_index, path_list_index);
-	    if (pi < vec_len(path_list->fpl_paths))
-	    {
-		path_list->fpl_paths[pi++] = path_index;
-	    }
-	    else
-	    {
-		/*
-		 * this is the unlikely case that the path being
-		 * removed does not match one in the path-list, so
-		 * we end up with as many paths as we started with.
-		 * the paths vector was sized above with the expectation
-		 * that we would have 1 less.
-		 */
-		vec_add1(path_list->fpl_paths, path_index);
-	    }
-	}
-    }
-
-    /*
-     * done with the temporary now
-     */
-    fib_path_destroy(tmp_path_index);
-
-    /*
-     * if there are no paths, then the new path-list is aborted
-     */
-    if (0 == vec_len(path_list->fpl_paths)) {
-	FIB_PATH_LIST_DBG(path_list, "last-path-removed");
-
-	fib_path_list_destroy(path_list);
-
-	path_list_index = FIB_NODE_INDEX_INVALID;
-    } else {
-	/*
-	 * we sort the paths since the key for the path-list is
-	 * the description of the paths it contains. The paths need to
-	 * be sorted else this description will differ.
-	 */
-	vec_sort_with_function(path_list->fpl_paths, fib_path_cmp_for_sort);
-    
-	/*
-	 * If a shared path list is requested, consult the DB for a match
-	 */
-	if (path_list->fpl_flags & FIB_PATH_LIST_FLAG_SHARED)
-	{
-	    fib_node_index_t exist_path_list_index;
-
-            /*
-	     * check for a matching path-list in the DB.
-	     * If we find one then we can return the existing one and destroy the
-	     * new one just created.
-	     */
-	    exist_path_list_index = fib_path_list_db_find(path_list);
-	    if (FIB_NODE_INDEX_INVALID != exist_path_list_index)
-	    {
-		fib_path_list_destroy(path_list);
-	
-		path_list_index = exist_path_list_index;
-	    }
-	    else
-	    {
-		/*
-		 * if there was not a matching path-list, then this
-		 * new one will need inserting into the DB and resolving.
-		 */
-		fib_path_list_db_insert(path_list_index);
-
-		path_list = fib_path_list_resolve(path_list);
-	    }
-	}
-	else
-	{
-	    /*
-	     * no shared path list requested. resolve and use the one
-	     * just created.
-	     */
-	    path_list = fib_path_list_resolve(path_list);
-	}
-    }
-
-    return (path_list_index);
-}
-
-/*
- * fib_path_list_contribute_forwarding
- *
- * Return the index of a load-balance that user of this path-list should
- * use for forwarding
- */
-void
-fib_path_list_contribute_forwarding (fib_node_index_t path_list_index,
-				     fib_forward_chain_type_t type,
-				     dpo_id_t *dpo)
-{
-    fib_path_list_t *path_list;
-
-    path_list = fib_path_list_get(path_list_index);
-
-    fib_path_list_mk_lb(path_list, type, dpo);
-}
-
-/*
- * fib_path_list_get_adj
- *
- * Return the index of a adjacency for the first path that user of this
- * path-list should use for forwarding
- */
-adj_index_t
-fib_path_list_get_adj (fib_node_index_t path_list_index,
-		       fib_forward_chain_type_t type)
-{
-    fib_path_list_t *path_list;
-
-    path_list = fib_path_list_get(path_list_index);
-    return (fib_path_get_adj(path_list->fpl_paths[0]));
-}
-
-int
-fib_path_list_recursive_loop_detect (fib_node_index_t path_list_index,
-				     fib_node_index_t **entry_indicies)
-{
-    fib_node_index_t *path_index;
-    int is_looped, list_looped;
-    fib_path_list_t *path_list;
-
-    list_looped = 0;
-    path_list = fib_path_list_get(path_list_index);
-
-    vec_foreach (path_index, path_list->fpl_paths)
-    {
-	fib_node_index_t *copy, **copy_ptr;
-
-	/*
-	 * we need a copy of the nodes visited so that when we add entries
-	 * we explore on the nth path and a looped is detected, those entries
-	 * are not again searched for n+1 path and so finding a loop that does
-	 * not exist.
-	 */
-	copy = vec_dup(*entry_indicies);
-	copy_ptr = &copy;
-
-	is_looped  = fib_path_recursive_loop_detect(*path_index, copy_ptr);
-	list_looped += is_looped;
-    }
-
-    FIB_PATH_LIST_DBG(path_list, "loop-detect: eval:%d", eval);
-
-    if (list_looped)
-    {
-	path_list->fpl_flags |= FIB_PATH_LIST_FLAG_LOOPED;
-    }
-    else
-    {
-	path_list->fpl_flags &= ~FIB_PATH_LIST_FLAG_LOOPED;
-    }
-
-    return (list_looped);
-}
-
-u32
-fib_path_list_child_add (fib_node_index_t path_list_index,
-			 fib_node_type_t child_type,
-			 fib_node_index_t child_index)
-{
-    return (fib_node_child_add(FIB_NODE_TYPE_PATH_LIST,
-                               path_list_index,
-                               child_type,
-                               child_index));
-}
-
-void
-fib_path_list_child_remove (fib_node_index_t path_list_index,
-			    u32 si)
-{
-    fib_node_child_remove(FIB_NODE_TYPE_PATH_LIST,
-                          path_list_index,
-                          si);
-}
-
-void
-fib_path_list_lock(fib_node_index_t path_list_index)
-{
-    fib_path_list_t *path_list;
-
-    if (FIB_NODE_INDEX_INVALID != path_list_index)
-    {
-	path_list = fib_path_list_get(path_list_index);
-
-	fib_node_lock(&path_list->fpl_node);
-	FIB_PATH_LIST_DBG(path_list, "lock");
-    }
-}
-
-void
-fib_path_list_unlock (fib_node_index_t path_list_index)
-{
-    fib_path_list_t *path_list;
-
-    if (FIB_NODE_INDEX_INVALID != path_list_index)
-    {
-	path_list = fib_path_list_get(path_list_index);
-	FIB_PATH_LIST_DBG(path_list, "unlock");
-    
-	fib_node_unlock(&path_list->fpl_node);
-    }
-}
-
-u32
-fib_path_list_pool_size (void)
-{
-    return (pool_elts(fib_path_list_pool));    
-}
-
-u32
-fib_path_list_db_size (void)
-{
-    return (hash_elts(fib_path_list_db));
-}
-
-void
-fib_path_list_walk (fib_node_index_t path_list_index,
-		    fib_path_list_walk_fn_t func,
-		    void *ctx)
-{
-    fib_node_index_t *path_index;
-    fib_path_list_t *path_list;
-
-    path_list = fib_path_list_get(path_list_index);
-
-    vec_foreach(path_index, path_list->fpl_paths)
-    {
-	if (!func(path_list_index, *path_index, ctx))
-	    break;
-    }
-}
-
-
-void
-fib_path_list_module_init (void)
-{
-    fib_node_register_type (FIB_NODE_TYPE_PATH_LIST, &fib_path_list_vft);
-
-    fib_path_list_db = hash_create2 (/* elts */ 0,
-    				     /* user */ 0,
-    				     /* value_bytes */ sizeof (fib_node_index_t),
-    				     fib_path_list_db_hash_key_sum,
-    				     fib_path_list_db_hash_key_equal,
-    				     /* format pair/arg */
-    				     0, 0);
-}
-
-static clib_error_t *
-show_fib_path_list_command (vlib_main_t * vm,
-			    unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-    fib_path_list_t *path_list;
-    fib_node_index_t pli;
-
-    if (unformat (input, "%d", &pli))
-    {
-	/*
-	 * show one in detail
-	 */
-	if (!pool_is_free_index(fib_path_list_pool, pli))
-	{
-	    path_list = fib_path_list_get(pli);
-	    u8 *s = fib_path_list_format(pli, NULL);
-	    s = format(s, "children:");
-	    s = fib_node_children_format(path_list->fpl_node.fn_children, s);
-	    vlib_cli_output (vm, "%s", s);
-	    vec_free(s);
-	}
-	else
-	{
-	    vlib_cli_output (vm, "path list %d invalid", pli);
-	}
-    }
-    else
-    {
-	/*
-	 * show all
-	 */
-	vlib_cli_output (vm, "FIB Path Lists");
-	pool_foreach(path_list, fib_path_list_pool,
-	({
-	    vlib_cli_output (vm, "%U", format_fib_path_list, path_list);
-	}));
-    }
-    return (NULL);
-}
-
-VLIB_CLI_COMMAND (show_fib_path_list, static) = {
-  .path = "show fib path-lists",
-  .function = show_fib_path_list_command,
-  .short_help = "show fib path-lists",
-};
diff --git a/vnet/vnet/fib/fib_path_list.h b/vnet/vnet/fib/fib_path_list.h
deleted file mode 100644
index 8bc1b20b..00000000
--- a/vnet/vnet/fib/fib_path_list.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __FIB_PATH_LIST_H__
-#define __FIB_PATH_LIST_H__
-
-#include <vlib/vlib.h>
-#include <vnet/adj/adj.h>
-
-#include "fib_node.h"
-#include "fib_path.h"
-
-/**
- * Enumeration of path-list flags.
- */
-typedef enum fib_path_list_attribute_t_ {
-    /**
-     * Marker. Add new flags after this one.
-     */
-    FIB_PATH_LIST_ATTRIBUTE_FIRST = 0,
-    /**
-     * This path list is shareable. Shareable path-lists
-     * are inserted into the path-list data-base.
-     * All path-list are inherently shareable, the reason we share some and
-     * not others is to limit the size of the path-list database. This DB must
-     * be searched for each route update.
-     */
-    FIB_PATH_LIST_ATTRIBUTE_SHARED = FIB_PATH_LIST_ATTRIBUTE_FIRST,
-    /**
-     * explicit drop path-list. Used when the entry source needs to 
-     * force a drop, despite the fact the path info is present.
-     */
-    FIB_PATH_LIST_ATTRIBUTE_DROP,
-    /**
-     * explicit local path-list.
-     */
-    FIB_PATH_LIST_ATTRIBUTE_LOCAL,
-    /**
-     * exclusive path-list. Exclusive means the path will resolve via the
-     * exclusive (user provided) adj.
-     */
-    FIB_PATH_LIST_ATTRIBUTE_EXCLUSIVE,
-    /**
-     * resolved path-list
-     */
-    FIB_PATH_LIST_ATTRIBUTE_RESOLVED,
-    /**
-     * looped path-list. one path looped implies the whole list is
-     */
-    FIB_PATH_LIST_ATTRIBUTE_LOOPED,
-    /**
-     * Marher. Add new flags before this one, and then update it.
-     */
-    FIB_PATH_LIST_ATTRIBUTE_LAST = FIB_PATH_LIST_ATTRIBUTE_LOOPED,
-} fib_path_list_attribute_t;
-
-typedef enum fib_path_list_flags_t_ {
-    FIB_PATH_LIST_FLAG_NONE      = 0,
-    FIB_PATH_LIST_FLAG_SHARED    = (1 << FIB_PATH_LIST_ATTRIBUTE_SHARED),
-    FIB_PATH_LIST_FLAG_DROP      = (1 << FIB_PATH_LIST_ATTRIBUTE_DROP),
-    FIB_PATH_LIST_FLAG_LOCAL     = (1 << FIB_PATH_LIST_ATTRIBUTE_LOCAL),
-    FIB_PATH_LIST_FLAG_EXCLUSIVE = (1 << FIB_PATH_LIST_ATTRIBUTE_EXCLUSIVE),
-    FIB_PATH_LIST_FLAG_RESOLVED  = (1 << FIB_PATH_LIST_ATTRIBUTE_RESOLVED),
-    FIB_PATH_LIST_FLAG_LOOPED    = (1 << FIB_PATH_LIST_ATTRIBUTE_LOOPED),
-} fib_path_list_flags_t;
-
-#define FIB_PATH_LIST_ATTRIBUTES {       		 \
-    [FIB_PATH_LIST_ATTRIBUTE_SHARED]    = "shared",	 \
-    [FIB_PATH_LIST_ATTRIBUTE_RESOLVED]  = "resolved",	 \
-    [FIB_PATH_LIST_ATTRIBUTE_DROP]      = "drop",	 \
-    [FIB_PATH_LIST_ATTRIBUTE_EXCLUSIVE] = "exclusive",   \
-    [FIB_PATH_LIST_ATTRIBUTE_LOCAL]     = "local",	 \
-    [FIB_PATH_LIST_ATTRIBUTE_LOOPED]     = "looped",	 \
-}
-
-#define FOR_EACH_PATH_LIST_ATTRIBUTE(_item)		\
-    for (_item = FIB_PATH_LIST_ATTRIBUTE_FIRST;		\
-	 _item <= FIB_PATH_LIST_ATTRIBUTE_LAST;		\
-	 _item++)
-
-extern fib_node_index_t fib_path_list_create(fib_path_list_flags_t flags,
-					     const fib_route_path_t *paths);
-extern fib_node_index_t fib_path_list_create_special(fib_protocol_t nh_proto,
-						     fib_path_list_flags_t flags,
-						     const dpo_id_t *dpo);
-
-extern fib_node_index_t fib_path_list_copy_and_path_add(
-    fib_node_index_t pl_index,
-    fib_path_list_flags_t flags,
-    const fib_route_path_t *path);
-extern fib_node_index_t fib_path_list_copy_and_path_remove(
-    fib_node_index_t pl_index,
-    fib_path_list_flags_t flags,
-    const fib_route_path_t *path);
-extern void fib_path_list_contribute_forwarding(fib_node_index_t path_list_index,
-						fib_forward_chain_type_t type,
-						dpo_id_t *dpo);
-extern void fib_path_list_contribute_urpf(fib_node_index_t path_index,
-					  index_t urpf);
-extern index_t fib_path_list_get_urpf(fib_node_index_t path_list_index);
-extern index_t fib_path_list_get_adj(fib_node_index_t path_list_index,
-				     fib_forward_chain_type_t type);
-
-extern u32 fib_path_list_child_add(fib_node_index_t pl_index,
-				   fib_node_type_t type,
-				   fib_node_index_t child_index);
-extern void fib_path_list_child_remove(fib_node_index_t pl_index,
-				       fib_node_index_t sibling_index);
-extern void fib_path_list_back_walk(fib_node_index_t pl_index,
-				    fib_node_back_walk_ctx_t *ctx);
-extern void fib_path_list_lock(fib_node_index_t pl_index);
-extern void fib_path_list_unlock(fib_node_index_t pl_index);
-extern int fib_path_list_recursive_loop_detect(fib_node_index_t path_list_index,
-					       fib_node_index_t **entry_indicies);
-extern u32 fib_path_list_get_resolving_interface(fib_node_index_t path_list_index);
-extern int fib_path_list_is_looped(fib_node_index_t path_list_index);
-extern fib_protocol_t fib_path_list_get_proto(fib_node_index_t path_list_index);
-extern u8 * fib_path_list_format(fib_node_index_t pl_index,
-				 u8 * s);
-extern u8 * fib_path_list_adjs_format(fib_node_index_t pl_index,
-				      u32 indent,
-				      u8 * s);
-extern index_t fib_path_list_lb_map_add_or_lock(fib_node_index_t pl_index,
-                                                const fib_node_index_t *pis);
-/**
- * A callback function type for walking a path-list's paths
- */
-typedef int (*fib_path_list_walk_fn_t)(fib_node_index_t pl_index,
-				       fib_node_index_t path_index,
-				       void *ctx);
-
-extern void fib_path_list_walk(fib_node_index_t pl_index,
-			       fib_path_list_walk_fn_t func,
-			       void *ctx);
-
-extern void fib_path_list_module_init(void);
-
-extern void fib_path_list_module_init(void);
-
-/*
- * functions for testing.
- */
-u32 fib_path_list_pool_size(void);
-u32 fib_path_list_db_size(void);
-
-#endif
diff --git a/vnet/vnet/fib/fib_table.c b/vnet/vnet/fib/fib_table.c
deleted file mode 100644
index 76db42d0..00000000
--- a/vnet/vnet/fib/fib_table.c
+++ /dev/null
@@ -1,1104 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/dpo/drop_dpo.h>
-
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/fib_entry_cover.h>
-#include <vnet/fib/fib_internal.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/fib/mpls_fib.h>
-
-fib_table_t *
-fib_table_get (fib_node_index_t index,
-	       fib_protocol_t proto)
-{
-    switch (proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (pool_elt_at_index(ip4_main.fibs, index));
-    case FIB_PROTOCOL_IP6:
-	return (pool_elt_at_index(ip6_main.fibs, index));
-    case FIB_PROTOCOL_MPLS:
-	return (pool_elt_at_index(mpls_main.fibs, index));
-    }
-    ASSERT(0);
-    return (NULL);
-}
-
-static inline fib_node_index_t
-fib_table_lookup_i (fib_table_t *fib_table,
-		    const fib_prefix_t *prefix)
-{
-    switch (prefix->fp_proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (ip4_fib_table_lookup(&fib_table->v4,
-				     &prefix->fp_addr.ip4,
-				     prefix->fp_len));
-    case FIB_PROTOCOL_IP6:
-	return (ip6_fib_table_lookup(fib_table->ft_index,
-				     &prefix->fp_addr.ip6,
-				     prefix->fp_len));
-    case FIB_PROTOCOL_MPLS:
-	return (mpls_fib_table_lookup(&fib_table->mpls,
-				      prefix->fp_label,
-				      prefix->fp_eos));
-    }
-    return (FIB_NODE_INDEX_INVALID);
-}
-
-fib_node_index_t
-fib_table_lookup (u32 fib_index,
-		  const fib_prefix_t *prefix)
-{
-    return (fib_table_lookup_i(fib_table_get(fib_index, prefix->fp_proto), prefix));
-}
-
-static inline fib_node_index_t
-fib_table_lookup_exact_match_i (const fib_table_t *fib_table,
-				const fib_prefix_t *prefix)
-{
-    switch (prefix->fp_proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (ip4_fib_table_lookup_exact_match(&fib_table->v4,
-						 &prefix->fp_addr.ip4,
-						 prefix->fp_len));
-    case FIB_PROTOCOL_IP6:
-	return (ip6_fib_table_lookup_exact_match(fib_table->ft_index,
-						 &prefix->fp_addr.ip6,
-						 prefix->fp_len));
-    case FIB_PROTOCOL_MPLS:
-	return (mpls_fib_table_lookup(&fib_table->mpls,
-				      prefix->fp_label,
-				      prefix->fp_eos));
-    }
-    return (FIB_NODE_INDEX_INVALID);
-}
-
-fib_node_index_t
-fib_table_lookup_exact_match (u32 fib_index,
-			      const fib_prefix_t *prefix)
-{
-    return (fib_table_lookup_exact_match_i(fib_table_get(fib_index,
-							 prefix->fp_proto),
-					   prefix));
-}
-
-static fib_node_index_t
-fib_table_get_less_specific_i (fib_table_t *fib_table,
-			       const fib_prefix_t *prefix)
-{
-    fib_prefix_t pfx;
-
-    pfx = *prefix;
-
-    if (FIB_PROTOCOL_MPLS == pfx.fp_proto)
-    {
-	return (FIB_NODE_INDEX_INVALID);
-    }
-
-    /*
-     * in the absence of a tree structure for the table that allows for an O(1)
-     * parent get, a cheeky way to find the cover is to LPM for the prefix with
-     * mask-1.
-     * there should always be a cover, though it may be the default route. the
-     * default route's cover is the default route.
-     */
-    if (pfx.fp_len != 0) {
-	pfx.fp_len -= 1;
-    }
-
-    return (fib_table_lookup_i(fib_table, &pfx));    
-}
-
-fib_node_index_t
-fib_table_get_less_specific (u32 fib_index,
-			     const fib_prefix_t *prefix)
-{
-    return (fib_table_get_less_specific_i(fib_table_get(fib_index,
-							prefix->fp_proto),
-					  prefix));
-}
-
-static void
-fib_table_entry_remove (fib_table_t *fib_table,
-			const fib_prefix_t *prefix,
-			fib_node_index_t fib_entry_index)
-{
-    vlib_smp_unsafe_warning();
-
-    fib_table->ft_total_route_counts--;
-
-    switch (prefix->fp_proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	ip4_fib_table_entry_remove(&fib_table->v4,
-				   &prefix->fp_addr.ip4,
-				   prefix->fp_len);
-	break;
-    case FIB_PROTOCOL_IP6:
-	ip6_fib_table_entry_remove(fib_table->ft_index,
-				   &prefix->fp_addr.ip6,
-				   prefix->fp_len);
-	break;
-    case FIB_PROTOCOL_MPLS:
-	mpls_fib_table_entry_remove(&fib_table->mpls,
-				    prefix->fp_label,
-				    prefix->fp_eos);
-	break;
-    }
-
-    fib_entry_unlock(fib_entry_index);
-}
-
-static void
-fib_table_post_insert_actions (fib_table_t *fib_table,
-			       const fib_prefix_t *prefix,
-			       fib_node_index_t fib_entry_index)
-{
-    fib_node_index_t fib_entry_cover_index;
-
-    /*
-     * no cover relationships in the MPLS FIB
-     */
-    if (FIB_PROTOCOL_MPLS == prefix->fp_proto)
-	return;
-
-    /*
-     * find and inform the covering entry that a new more specific
-     * has been inserted beneath it
-     */
-    fib_entry_cover_index = fib_table_get_less_specific_i(fib_table, prefix);
-    /*
-     * the indicies are the same when the default route is first added
-     */
-    if (fib_entry_cover_index != fib_entry_index)
-    {
-	fib_entry_cover_change_notify(fib_entry_cover_index,
-				      fib_entry_index);
-    }
-}
-
-static void
-fib_table_entry_insert (fib_table_t *fib_table,
-			const fib_prefix_t *prefix,
-			fib_node_index_t fib_entry_index)
-{
-    vlib_smp_unsafe_warning();
-
-    fib_entry_lock(fib_entry_index);
-    fib_table->ft_total_route_counts++;
-
-    switch (prefix->fp_proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	ip4_fib_table_entry_insert(&fib_table->v4,
-				   &prefix->fp_addr.ip4,
-				   prefix->fp_len,
-				   fib_entry_index);
-	break;
-    case FIB_PROTOCOL_IP6:
-	ip6_fib_table_entry_insert(fib_table->ft_index,
-				   &prefix->fp_addr.ip6,
-				   prefix->fp_len,
-				   fib_entry_index);
-	break;
-    case FIB_PROTOCOL_MPLS:
-	mpls_fib_table_entry_insert(&fib_table->mpls,
-				    prefix->fp_label,
-				    prefix->fp_eos,
-				    fib_entry_index);
-	break;
-    }
-
-    fib_table_post_insert_actions(fib_table, prefix, fib_entry_index);
-}
-
-void
-fib_table_fwding_dpo_update (u32 fib_index,
-			     const fib_prefix_t *prefix,
-			     const dpo_id_t *dpo)
-{
-    vlib_smp_unsafe_warning();
-
-    switch (prefix->fp_proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (ip4_fib_table_fwding_dpo_update(ip4_fib_get(fib_index),
-						&prefix->fp_addr.ip4,
-						prefix->fp_len,
-						dpo));
-    case FIB_PROTOCOL_IP6:
-	return (ip6_fib_table_fwding_dpo_update(fib_index,
-						&prefix->fp_addr.ip6,
-						prefix->fp_len,
-						dpo));
-    case FIB_PROTOCOL_MPLS:
-	return (mpls_fib_forwarding_table_update(mpls_fib_get(fib_index),
-						 prefix->fp_label,
-						 prefix->fp_eos,
-						 dpo));
-    }
-}
-
-void
-fib_table_fwding_dpo_remove (u32 fib_index,
-			     const fib_prefix_t *prefix,
-			     const dpo_id_t *dpo)
-{
-    vlib_smp_unsafe_warning();
-
-    switch (prefix->fp_proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (ip4_fib_table_fwding_dpo_remove(ip4_fib_get(fib_index),
-						&prefix->fp_addr.ip4,
-						prefix->fp_len,
-						dpo));
-    case FIB_PROTOCOL_IP6:
-	return (ip6_fib_table_fwding_dpo_remove(fib_index,
-						&prefix->fp_addr.ip6,
-						prefix->fp_len,
-						dpo));
-    case FIB_PROTOCOL_MPLS:
-	return (mpls_fib_forwarding_table_reset(mpls_fib_get(fib_index),
-						prefix->fp_label,
-						prefix->fp_eos));
-    }
-}
-
-
-fib_node_index_t
-fib_table_entry_special_dpo_add (u32 fib_index,
-                                 const fib_prefix_t *prefix,
-                                 fib_source_t source,
-                                 fib_entry_flag_t flags,
-                                 const dpo_id_t *dpo)
-{
-    fib_node_index_t fib_entry_index;
-    fib_table_t *fib_table;
-
-    fib_table = fib_table_get(fib_index, prefix->fp_proto);
-    fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
-
-    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
-    {
-	fib_entry_index = fib_entry_create_special(fib_index, prefix,
-						   source, flags,
-						   dpo);
-
-	fib_table_entry_insert(fib_table, prefix, fib_entry_index);
-        fib_table->ft_src_route_counts[source]++;
-    }
-    else
-    {
-        int was_sourced;
-
-        was_sourced = fib_entry_is_sourced(fib_entry_index, source);
-	fib_entry_special_add(fib_entry_index, source, flags, dpo);
-
-        if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
-        {
-            fib_table->ft_src_route_counts[source]++;
-        }
-    }
-
-
-    return (fib_entry_index);
-}
-
-fib_node_index_t
-fib_table_entry_special_dpo_update (u32 fib_index,
-				    const fib_prefix_t *prefix,
-				    fib_source_t source,
-				    fib_entry_flag_t flags,
-				    const dpo_id_t *dpo)
-{
-    fib_node_index_t fib_entry_index;
-    fib_table_t *fib_table;
-
-    fib_table = fib_table_get(fib_index, prefix->fp_proto);
-    fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
-
-    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
-    {
-	fib_entry_index = fib_entry_create_special(fib_index, prefix,
-						   source, flags,
-						   dpo);
-
-	fib_table_entry_insert(fib_table, prefix, fib_entry_index);
-        fib_table->ft_src_route_counts[source]++;
-    }
-    else
-    {
-        int was_sourced;
-
-        was_sourced = fib_entry_is_sourced(fib_entry_index, source);
-
-	if (was_sourced)
-	    fib_entry_special_update(fib_entry_index, source, flags, dpo);
-	else
-	    fib_entry_special_add(fib_entry_index, source, flags, dpo);
-
-        if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
-        {
-            fib_table->ft_src_route_counts[source]++;
-        }
-    }
-
-    return (fib_entry_index);
-}
-
-fib_node_index_t
-fib_table_entry_special_add (u32 fib_index,
-			     const fib_prefix_t *prefix,
-			     fib_source_t source,
-			     fib_entry_flag_t flags,
-			     adj_index_t adj_index)
-{
-    fib_node_index_t fib_entry_index;
-    dpo_id_t tmp_dpo = DPO_INVALID;
-
-    if (ADJ_INDEX_INVALID != adj_index)
-    {
-        dpo_set(&tmp_dpo,
-                DPO_ADJACENCY,
-                FIB_PROTOCOL_MAX,
-                adj_index);
-    }
-    else
-    {
-        dpo_copy(&tmp_dpo, drop_dpo_get(fib_proto_to_dpo(prefix->fp_proto)));
-    }
- 
-    fib_entry_index = fib_table_entry_special_dpo_add(fib_index, prefix, source,
-                                                      flags, &tmp_dpo);
-
-    dpo_unlock(&tmp_dpo);
-
-    return (fib_entry_index);
-}
-
-void
-fib_table_entry_special_remove (u32 fib_index,
-				const fib_prefix_t *prefix,
-				fib_source_t source)
-{
-    /*
-     * 1 is it present
-     *   yes => remove source
-     *    2 - is it still sourced?
-     *      no => cover walk
-     */
-    fib_node_index_t fib_entry_index;
-    fib_table_t *fib_table;
-
-    fib_table = fib_table_get(fib_index, prefix->fp_proto);
-    fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
-
-    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
-    {
-	/*
-	 * removing an etry that does not exist. i'll allow it.
-	 */
-    }
-    else
-    {
-	fib_entry_src_flag_t src_flag;
-        int was_sourced;
-
-	/*
-	 * don't nobody go nowhere
-	 */
-	fib_entry_lock(fib_entry_index);
-        was_sourced = fib_entry_is_sourced(fib_entry_index, source);
-
-	src_flag = fib_entry_special_remove(fib_entry_index, source);
-
-	if (!(FIB_ENTRY_SRC_FLAG_ADDED & src_flag))
-	{
-	    /*
-	     * last source gone. remove from the table
-	     */
-	    fib_table_entry_remove(fib_table, prefix, fib_entry_index);
-
-	    /*
-	     * now the entry is no longer in the table, we can
-	     * inform the entries that it covers to re-calculate their cover
-	     */
-	    fib_entry_cover_change_notify(fib_entry_index,
-					  FIB_NODE_INDEX_INVALID);
-	}
-	/*
-	 * else
-	 *   still has sources, leave it be.
-	 */
-        if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
-        {
-            fib_table->ft_src_route_counts[source]--;
-        }
-
-	fib_entry_unlock(fib_entry_index);
-    }
-}
-
-/**
- * fib_table_route_path_fixup
- *
- * Convert attached hosts to attached next-hops.
- * 
- * This special case is required because an attached path will link to a
- * glean, and the FIB entry will have the interface or API/CLI source. When
- * the ARP/ND process is completes then that source (which will provide a
- * complete adjacency) will be lower priority and so the FIB entry will
- * remain linked to a glean and traffic will never reach the hosts. For
- * an ATTAHCED_HOST path we can link the path directly to the [incomplete]
- * adjacency.
- */
-static void
-fib_table_route_path_fixup (const fib_prefix_t *prefix,
-			    fib_route_path_t *path)
-{
-    if (fib_prefix_is_host(prefix) &&
-	ip46_address_is_zero(&path->frp_addr) &&
-	path->frp_sw_if_index != ~0)
-    {
-	path->frp_addr = prefix->fp_addr;
-    }
-}		  
-
-fib_node_index_t
-fib_table_entry_path_add (u32 fib_index,
-			  const fib_prefix_t *prefix,
-			  fib_source_t source,
-			  fib_entry_flag_t flags,
-			  fib_protocol_t next_hop_proto,
-			  const ip46_address_t *next_hop,
-			  u32 next_hop_sw_if_index,
-			  u32 next_hop_fib_index,
-			  u32 next_hop_weight,
-			  mpls_label_t *next_hop_labels,
-			  fib_route_path_flags_t path_flags)
-{
-    fib_route_path_t path = {
-	.frp_proto = next_hop_proto,
-	.frp_addr = (NULL == next_hop? zero_addr : *next_hop),
-	.frp_sw_if_index = next_hop_sw_if_index,
-	.frp_fib_index = next_hop_fib_index,
-	.frp_weight = next_hop_weight,
-	.frp_flags = path_flags,
-	.frp_label_stack = next_hop_labels,
-    };
-    fib_node_index_t fib_entry_index;
-    fib_route_path_t *paths = NULL;
-
-    vec_add1(paths, path);
-
-    fib_entry_index = fib_table_entry_path_add2(fib_index, prefix,
-						source, flags, paths);
-
-    vec_free(paths);
-    return (fib_entry_index);
-}
-
-fib_node_index_t
-fib_table_entry_path_add2 (u32 fib_index,
-			   const fib_prefix_t *prefix,
-			   fib_source_t source,
-			   fib_entry_flag_t flags,
-			   fib_route_path_t *rpath)
-{
-    fib_node_index_t fib_entry_index;
-    fib_table_t *fib_table;
-    u32 ii;
-
-    fib_table = fib_table_get(fib_index, prefix->fp_proto);
-    fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
-
-    for (ii = 0; ii < vec_len(rpath); ii++)
-    {
-	fib_table_route_path_fixup(prefix, &rpath[ii]);
-    }
-
-    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
-    {
-	fib_entry_index = fib_entry_create(fib_index, prefix,
-					   source, flags,
-					   rpath);
-
-	fib_table_entry_insert(fib_table, prefix, fib_entry_index);
-        fib_table->ft_src_route_counts[source]++;
-    }
-    else
-    {
-        int was_sourced;
-
-        was_sourced = fib_entry_is_sourced(fib_entry_index, source);
-	fib_entry_path_add(fib_entry_index, source, flags, rpath);;
-
-        if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
-        {
-            fib_table->ft_src_route_counts[source]++;
-        }
-    }
-
-    return (fib_entry_index);
-}
-
-void
-fib_table_entry_path_remove2 (u32 fib_index,
-			      const fib_prefix_t *prefix,
-			      fib_source_t source,
-			      fib_route_path_t *rpath)
-{
-    /*
-     * 1 is it present
-     *   yes => remove source
-     *    2 - is it still sourced?
-     *      no => cover walk
-     */
-    fib_node_index_t fib_entry_index;
-    fib_table_t *fib_table;
-    u32 ii;
-
-    fib_table = fib_table_get(fib_index, prefix->fp_proto);
-    fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
-
-    for (ii = 0; ii < vec_len(rpath); ii++)
-    {
-	fib_table_route_path_fixup(prefix, &rpath[ii]);
-    }
-
-    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
-    {
-	/*
-	 * removing an etry that does not exist. i'll allow it.
-	 */
-    }
-    else
-    {
-	fib_entry_src_flag_t src_flag;
-        int was_sourced;
-
-	/*
-	 * don't nobody go nowhere
-	 */
-	fib_entry_lock(fib_entry_index);
-        was_sourced = fib_entry_is_sourced(fib_entry_index, source);
-
-	src_flag = fib_entry_path_remove(fib_entry_index, source, rpath);
-
-	if (!(FIB_ENTRY_SRC_FLAG_ADDED & src_flag))
-	{
-	    /*
-	     * last source gone. remove from the table
-	     */
-	    fib_table_entry_remove(fib_table, prefix, fib_entry_index);
-
-	    /*
-	     * now the entry is no longer in the table, we can
-	     * inform the entries that it covers to re-calculate their cover
-	     */
-	    fib_entry_cover_change_notify(fib_entry_index,
-					  FIB_NODE_INDEX_INVALID);
-	}
-	/*
-	 * else
-	 *   still has sources, leave it be.
-	 */
-        if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
-        {
-            fib_table->ft_src_route_counts[source]--;
-        }
-
-	fib_entry_unlock(fib_entry_index);
-    }
-}
-
-void
-fib_table_entry_path_remove (u32 fib_index,
-			     const fib_prefix_t *prefix,
-			     fib_source_t source,
-			     fib_protocol_t next_hop_proto,
-			     const ip46_address_t *next_hop,
-			     u32 next_hop_sw_if_index,
-			     u32 next_hop_fib_index,
-			     u32 next_hop_weight,
-			     fib_route_path_flags_t path_flags)
-{
-    /*
-     * 1 is it present
-     *   yes => remove source
-     *    2 - is it still sourced?
-     *      no => cover walk
-     */
-    fib_route_path_t path = {
-	.frp_proto = next_hop_proto,
-	.frp_addr = (NULL == next_hop? zero_addr : *next_hop),
-	.frp_sw_if_index = next_hop_sw_if_index,
-	.frp_fib_index = next_hop_fib_index,
-	.frp_weight = next_hop_weight,
-	.frp_flags = path_flags,
-    };
-    fib_route_path_t *paths = NULL;
-
-    fib_table_route_path_fixup(prefix, &path);
-    vec_add1(paths, path);
-
-    fib_table_entry_path_remove2(fib_index, prefix, source, paths);
-
-    vec_free(paths);
-}
-
-static int
-fib_route_path_cmp_for_sort (void * v1,
-			     void * v2)
-{
-    return (fib_route_path_cmp(v1, v2));
-}
-
-fib_node_index_t
-fib_table_entry_update (u32 fib_index,
-			const fib_prefix_t *prefix,
-			fib_source_t source,
-			fib_entry_flag_t flags,
-			fib_route_path_t *paths)
-{
-    fib_node_index_t fib_entry_index;
-    fib_table_t *fib_table;
-    u32 ii;
-
-    fib_table = fib_table_get(fib_index, prefix->fp_proto);
-    fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
-
-    for (ii = 0; ii < vec_len(paths); ii++)
-    {
-	fib_table_route_path_fixup(prefix, &paths[ii]);
-    }
-    /*
-     * sort the paths provided by the control plane. this means
-     * the paths and the extension on the entry will be sorted.
-     */
-    vec_sort_with_function(paths, fib_route_path_cmp_for_sort);
-
-    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
-    {
-    	fib_entry_index = fib_entry_create(fib_index, prefix,
-    					   source, flags,
-					   paths);
-
-    	fib_table_entry_insert(fib_table, prefix, fib_entry_index);
-        fib_table->ft_src_route_counts[source]++;
-    }
-    else
-    {
-        int was_sourced;
-
-        was_sourced = fib_entry_is_sourced(fib_entry_index, source);
-    	fib_entry_update(fib_entry_index, source, flags, paths);
-
-        if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
-        {
-            fib_table->ft_src_route_counts[source]++;
-        }
-    }
-
-    return (fib_entry_index);
-}
-
-fib_node_index_t
-fib_table_entry_update_one_path (u32 fib_index,
-				 const fib_prefix_t *prefix,
-				 fib_source_t source,
-				 fib_entry_flag_t flags,
-				 fib_protocol_t next_hop_proto,
-				 const ip46_address_t *next_hop,
-				 u32 next_hop_sw_if_index,
-				 u32 next_hop_fib_index,
-				 u32 next_hop_weight,
-				 mpls_label_t *next_hop_labels,
-				 fib_route_path_flags_t path_flags)
-{
-    fib_node_index_t fib_entry_index;
-    fib_route_path_t path = {
-	.frp_proto = next_hop_proto,
-	.frp_addr = (NULL == next_hop? zero_addr : *next_hop),
-	.frp_sw_if_index = next_hop_sw_if_index,
-	.frp_fib_index = next_hop_fib_index,
-	.frp_weight = next_hop_weight,
-	.frp_flags = path_flags,
-	.frp_label_stack = next_hop_labels,
-    };
-    fib_route_path_t *paths = NULL;
-
-    fib_table_route_path_fixup(prefix, &path);
-    vec_add1(paths, path);
-
-    fib_entry_index = 
-	fib_table_entry_update(fib_index, prefix, source, flags, paths);
-
-    vec_free(paths);
-
-    return (fib_entry_index);
-}
-
-static void
-fib_table_entry_delete_i (u32 fib_index,
-			  fib_node_index_t fib_entry_index,
-			  const fib_prefix_t *prefix,
-			  fib_source_t source)
-{
-    fib_entry_src_flag_t src_flag;
-    fib_table_t *fib_table;
-    int was_sourced;
-
-    fib_table = fib_table_get(fib_index, prefix->fp_proto);
-    was_sourced = fib_entry_is_sourced(fib_entry_index, source);
-
-    /*
-     * don't nobody go nowhere
-     */
-    fib_entry_lock(fib_entry_index);
-
-    src_flag = fib_entry_delete(fib_entry_index, source);
-
-    if (!(FIB_ENTRY_SRC_FLAG_ADDED & src_flag))
-    {
-	/*
-	 * last source gone. remove from the table
-	 */
-	fib_table_entry_remove(fib_table, prefix, fib_entry_index);
-
-	/*
-	 * now the entry is no longer in the table, we can
-	 * inform the entries that it covers to re-calculate their cover
-	 */
-	fib_entry_cover_change_notify(fib_entry_index,
-				      FIB_NODE_INDEX_INVALID);
-    }
-    /*
-     * else
-     *   still has sources, leave it be.
-     */
-    if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
-    {
-        fib_table->ft_src_route_counts[source]--;
-    }
-
-    fib_entry_unlock(fib_entry_index);
-}
-
-void
-fib_table_entry_delete (u32 fib_index,
-			const fib_prefix_t *prefix,
-			fib_source_t source)
-{
-    fib_node_index_t fib_entry_index;
-
-    fib_entry_index = fib_table_lookup_exact_match(fib_index, prefix);
-
-    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
-    {
-	/*
-	 * removing an etry that does not exist.
-	 * i'll allow it, but i won't like it.
-	 */
-	clib_warning("%U not in FIB", format_fib_prefix, prefix);
-    }
-    else
-    {
-	fib_table_entry_delete_i(fib_index, fib_entry_index, prefix, source);
-    }
-}
-
-void
-fib_table_entry_delete_index (fib_node_index_t fib_entry_index,
-			      fib_source_t source)
-{
-    fib_prefix_t prefix;
-
-    fib_entry_get_prefix(fib_entry_index, &prefix);
-
-    fib_table_entry_delete_i(fib_entry_get_fib_index(fib_entry_index),
-                             fib_entry_index, &prefix, source);
-}
-
-fib_node_index_t
-fib_table_entry_local_label_add (u32 fib_index,
-				 const fib_prefix_t *prefix,
-				 mpls_label_t label)
-{
-    fib_node_index_t fib_entry_index;
- 
-    fib_entry_index = fib_table_lookup_exact_match(fib_index, prefix);
-
-    if (FIB_NODE_INDEX_INVALID == fib_entry_index ||
-	!fib_entry_is_sourced(fib_entry_index, FIB_SOURCE_MPLS))
-    {
-	/*
-	 * only source the prefix once. this allows the label change
-	 * operation to work
-	 */
-	fib_entry_index = fib_table_entry_special_dpo_add(fib_index, prefix,
-							  FIB_SOURCE_MPLS,
-							  FIB_ENTRY_FLAG_NONE,
-							  NULL);
-    }
-
-    fib_entry_set_source_data(fib_entry_index, FIB_SOURCE_MPLS, &label);
-
-    return (fib_entry_index);
-}
-
-void
-fib_table_entry_local_label_remove (u32 fib_index,
-				    const fib_prefix_t *prefix,
-				    mpls_label_t label)
-{
-    fib_node_index_t fib_entry_index;
-    const void *data;
-    mpls_label_t pl;
-
-    fib_entry_index = fib_table_lookup_exact_match(fib_index, prefix);
-
-    if (FIB_NODE_INDEX_INVALID == fib_entry_index)
-        return;
-
-    data = fib_entry_get_source_data(fib_entry_index, FIB_SOURCE_MPLS);
-
-    if (NULL == data)
-        return;
-
-    pl = *(mpls_label_t*)data;
-
-    if (pl != label)
-        return;
-
-    pl = MPLS_LABEL_INVALID;
-
-    fib_entry_set_source_data(fib_entry_index, FIB_SOURCE_MPLS, &pl);
-    fib_table_entry_special_remove(fib_index,
-				   prefix,
-				   FIB_SOURCE_MPLS);
-}
-
-u32
-fib_table_get_index_for_sw_if_index (fib_protocol_t proto,
-				     u32 sw_if_index)
-{
-    switch (proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (ip4_fib_table_get_index_for_sw_if_index(sw_if_index));
-    case FIB_PROTOCOL_IP6:
-	return (ip6_fib_table_get_index_for_sw_if_index(sw_if_index));
-    case FIB_PROTOCOL_MPLS:
-	return (mpls_fib_table_get_index_for_sw_if_index(sw_if_index));
-    }
-    return (~0);
-}
-
-flow_hash_config_t
-fib_table_get_flow_hash_config (u32 fib_index,
-				fib_protocol_t proto)
-{
-    switch (proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (ip4_fib_table_get_flow_hash_config(fib_index));
-    case FIB_PROTOCOL_IP6:
-	return (ip6_fib_table_get_flow_hash_config(fib_index));
-    case FIB_PROTOCOL_MPLS:
-	return (mpls_fib_table_get_flow_hash_config(fib_index));
-    }
-    return (0);
-}
-
-
-u32
-fib_table_get_table_id_for_sw_if_index (fib_protocol_t proto,
-					u32 sw_if_index)
-{
-    fib_table_t *fib_table;
-
-    fib_table = fib_table_get(fib_table_get_index_for_sw_if_index(
-				  proto, sw_if_index),
-			      proto);
-
-    return ((NULL != fib_table ? fib_table->ft_table_id : ~0));
-}
-
-u32
-fib_table_find (fib_protocol_t proto,
-		u32 table_id)
-{
-    switch (proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (ip4_fib_index_from_table_id(table_id));
-    case FIB_PROTOCOL_IP6:
-	return (ip6_fib_index_from_table_id(table_id));
-    case FIB_PROTOCOL_MPLS:
-	return (mpls_fib_index_from_table_id(table_id));
-    }
-    return (~0);
-}
-
-u32
-fib_table_find_or_create_and_lock (fib_protocol_t proto,
-				   u32 table_id)
-{
-    fib_table_t *fib_table;
-    fib_node_index_t fi;
-
-    switch (proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	fi = ip4_fib_table_find_or_create_and_lock(table_id);
-        break;
-    case FIB_PROTOCOL_IP6:
-	fi = ip6_fib_table_find_or_create_and_lock(table_id);
-        break;
-    case FIB_PROTOCOL_MPLS:
-	fi = mpls_fib_table_find_or_create_and_lock(table_id);
-        break;
-    default:
-        return (~0);        
-    }
-
-    fib_table = fib_table_get(fi, proto);
-
-    fib_table->ft_desc = format(NULL, "%U-VRF:%d",
-                                format_fib_protocol, proto,
-                                table_id);
-
-    return (fi);
-}
-
-u32
-fib_table_create_and_lock (fib_protocol_t proto,
-                           const char *const fmt,
-                           ...)
-{
-    fib_table_t *fib_table;
-    fib_node_index_t fi;
-    va_list ap;
-
-    va_start(ap, fmt);
-
-    switch (proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	fi = ip4_fib_table_create_and_lock();
-        break;
-    case FIB_PROTOCOL_IP6:
-	fi = ip6_fib_table_create_and_lock();
-        break;
-     case FIB_PROTOCOL_MPLS:
-	fi = mpls_fib_table_create_and_lock();
-        break;
-   default:
-        return (~0);        
-    }
-
-    fib_table = fib_table_get(fi, proto);
-
-    fib_table->ft_desc = va_format(fib_table->ft_desc, fmt, &ap);
-
-    va_end(ap);
-    return (fi);
-}
-
-static void
-fib_table_destroy (fib_table_t *fib_table)
-{
-    vec_free(fib_table->ft_desc);
-
-    switch (fib_table->ft_proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	ip4_fib_table_destroy(&fib_table->v4);
-	break;
-    case FIB_PROTOCOL_IP6:
-	ip6_fib_table_destroy(fib_table->ft_index);
-	break;
-    case FIB_PROTOCOL_MPLS:
-	mpls_fib_table_destroy(&fib_table->mpls);
-	break;
-    }
-}
-
-void
-fib_table_unlock (u32 fib_index,
-		  fib_protocol_t proto)
-{
-    fib_table_t *fib_table;
-
-    fib_table = fib_table_get(fib_index, proto);
-    fib_table->ft_locks--;
-
-    if (0 == fib_table->ft_locks)
-    {
-	fib_table_destroy(fib_table);
-    }
-}
-void
-fib_table_lock (u32 fib_index,
-		fib_protocol_t proto)
-{
-    fib_table_t *fib_table;
-
-    fib_table = fib_table_get(fib_index, proto);
-    fib_table->ft_locks++;
-}
-
-u32
-fib_table_get_num_entries (u32 fib_index,
-			   fib_protocol_t proto,
-			   fib_source_t source)
-{
-    fib_table_t *fib_table;
-
-    fib_table = fib_table_get(fib_index, proto);
-
-    return (fib_table->ft_src_route_counts[source]);
-}
-
-u8*
-format_fib_table_name (u8* s, va_list ap)
-{
-    fib_node_index_t fib_index = va_arg(ap, fib_node_index_t);
-    fib_protocol_t proto = va_arg(ap, int); // int promotion
-    fib_table_t *fib_table;
-
-    fib_table = fib_table_get(fib_index, proto);
-
-    s = format(s, "%v", fib_table->ft_desc);
-
-    return (s);
-}
-
-void
-fib_table_flush (u32 fib_index,
-		 fib_protocol_t proto,
-		 fib_source_t source)
-{
-    // FIXME
-    ASSERT(0);
-}
diff --git a/vnet/vnet/fib/fib_table.h b/vnet/vnet/fib/fib_table.h
deleted file mode 100644
index cfec516d..00000000
--- a/vnet/vnet/fib/fib_table.h
+++ /dev/null
@@ -1,732 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __FIB_TABLE_H__
-#define __FIB_TABLE_H__
-
-#include <vnet/ip/ip.h>
-#include <vnet/adj/adj.h>
-#include <vnet/fib/fib_entry.h>
-#include <vnet/mpls/mpls.h>
-#include <vnet/mpls/packet.h>
-
-/**
- * @brief 
- *   A protocol Independent FIB table
- */
-typedef struct fib_table_t_
-{
-    /**
-     * A union of the protocol specific FIBs that provide the
-     * underlying LPM mechanism.
-     * This element is first in the struct so that it is in the
-     * first cache line.
-     */
-    union {
-	ip4_fib_t v4;
-	ip6_fib_t v6;
-	mpls_fib_t mpls;
-    };
-
-    /**
-     * Which protocol this table serves. Used to switch on the union above.
-     */
-    fib_protocol_t ft_proto;
-
-    /**
-     * number of locks on the table
-     */
-    u16 ft_locks;
-
-    /**
-     * Table ID (hash key) for this FIB.
-     */
-    u32 ft_table_id;
-
-    /**
-     * Index into FIB vector.
-     */
-    fib_node_index_t ft_index;
-
-    /**
-     * flow hash configuration
-     */
-    u32 ft_flow_hash_config;
-
-    /**
-     * Per-source route counters
-     */
-    u32 ft_src_route_counts[FIB_SOURCE_MAX];
-
-    /**
-     * Total route counters
-     */
-    u32 ft_total_route_counts;
-
-    /**
-     * Table description
-     */
-    u8* ft_desc;
-} fib_table_t;
-
-/**
- * @brief
- *  Format the description/name of the table
- */
-extern u8* format_fib_table_name(u8* s, va_list ap);
-
-/**
- * @brief
- *  Perfom a longest prefix match in the non-forwarding table
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix to lookup
- *
- * @return
- *  The index of the fib_entry_t for the best match, which may be the default route
- */
-extern fib_node_index_t fib_table_lookup(u32 fib_index,
-					 const fib_prefix_t *prefix);
-
-/**
- * @brief
- *  Perfom an exact match in the non-forwarding table
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix to lookup
- *
- * @return
- *  The index of the fib_entry_t for the exact match, or INVALID
- *  is there is no match.
- */
-extern fib_node_index_t fib_table_lookup_exact_match(u32 fib_index,
-						     const fib_prefix_t *prefix);
-
-/**
- * @brief
- *  Get the less specific (covering) prefix
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix to lookup
- *
- * @return
- *  The index of the less specific fib_entry_t.
- */
-extern fib_node_index_t fib_table_get_less_specific(u32 fib_index,
-						    const fib_prefix_t *prefix);
-
-/**
- * @brief
- *  Add a 'special' entry to the FIB that links to the adj passed
- *  A special entry is an entry that the FIB is not expect to resolve
- *  via the usual mechanisms (i.e. recurisve or neighbour adj DB lookup).
- *  Instead the client/source provides the adj to link to.
- *  This add is reference counting per-source. So n 'removes' are required
- *  for n 'adds', if the entry is no longer required.
- *
-  * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix to add
- *
- * @param source
- *  The ID of the client/source adding the entry.
- *
- * @param flags
- *  Flags for the entry.
- *
- * @param adj_index
- *  The adjacency to link to.
- *
- * @return
- *  the index of the fib_entry_t that is created (or exists already).
- */
-extern fib_node_index_t fib_table_entry_special_add(u32 fib_index,
-						    const fib_prefix_t *prefix,
-						    fib_source_t source,
-						    fib_entry_flag_t flags,
-						    adj_index_t adj_index);
-
-/**
- * @brief
- *  Add a 'special' entry to the FIB that links to the DPO passed
- *  A special entry is an entry that the FIB is not expect to resolve
- *  via the usual mechanisms (i.e. recurisve or neighbour adj DB lookup).
- *  Instead the client/source provides the DPO to link to.
- *  This add is reference counting per-source. So n 'removes' are required
- *  for n 'adds', if the entry is no longer required.
- *
-  * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix to add
- *
- * @param source
- *  The ID of the client/source adding the entry.
- *
- * @param flags
- *  Flags for the entry.
- *
- * @param dpo
- *  The DPO to link to.
- *
- * @return
- *  the index of the fib_entry_t that is created (or existed already).
- */
-extern fib_node_index_t fib_table_entry_special_dpo_add(u32 fib_index,
-                                                        const fib_prefix_t *prefix,
-                                                        fib_source_t source,
-                                                        fib_entry_flag_t stype,
-                                                        const dpo_id_t *dpo);
-
-/**
- * @brief
- *  Update a 'special' entry to the FIB that links to the DPO passed
- *  A special entry is an entry that the FIB is not expect to resolve
- *  via the usual mechanisms (i.e. recurisve or neighbour adj DB lookup).
- *  Instead the client/source provides the DPO to link to.
- *  Special entries are add/remove reference counted per-source. So n
- * 'removes' are required for n 'adds', if the entry is no longer required.
- *  An 'update' is an 'add' if no 'add' has already been called, otherwise an 'add'
- * is therefore assumed to act on the reference instance of that add.
- *
- * @param fib_entry_index
- *  The index of the FIB entry to update
- *
- * @param source
- *  The ID of the client/source adding the entry.
- *
- * @param flags
- *  Flags for the entry.
- *
- * @param dpo
- *  The DPO to link to.
- *
- * @return
- *  the index of the fib_entry_t that is created (or existed already).
- */
-extern fib_node_index_t fib_table_entry_special_dpo_update (u32 fib_index,
-							    const fib_prefix_t *prefix,
-							    fib_source_t source,
-							    fib_entry_flag_t stype,
-							    const dpo_id_t *dpo);
-
-/**
- * @brief
- *  Remove a 'special' entry from the FIB.
- *  This add is reference counting per-source. So n 'removes' are required
- *  for n 'adds', if the entry is no longer required.
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix to remove
- *
- * @param source
- *  The ID of the client/source adding the entry.
- *
- */
-extern void fib_table_entry_special_remove(u32 fib_index,
-					   const fib_prefix_t *prefix,
-					   fib_source_t source);
-
-/**
- * @brief
- *  Add one path to an entry (aka route) in the FIB. If the entry does not
- *  exist, it will be created.
- * See the documentation for fib_route_path_t for more descirptions of
- * the path parameters.
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix for the entry to add
- *
- * @param source
- *  The ID of the client/source adding the entry.
- *
- * @param flags
- *  Flags for the entry.
- *
- * @paran next_hop_proto
- *  The protocol of the next hop. This cannot be derived in the event that
- * the next hop is all zeros.
- *
- * @param next_hop
- *  The address of the next-hop.
- *
- * @param sw_if_index
- *  The index of the interface.
- *
- * @param next_hop_fib_index,
- *  The fib index of the next-hop for recursive resolution
- *
- * @param next_hop_weight
- *  [un]equal cost path weight
- *
- * @param  next_hop_label_stack
- *  The path's out-going label stack. NULL is there is none.
- *
- * @param  pf
- *  Flags for the path
- *
- * @return
- *  the index of the fib_entry_t that is created (or existed already).
- */
-extern fib_node_index_t fib_table_entry_path_add(u32 fib_index,
-						 const fib_prefix_t *prefix,
-						 fib_source_t source,
-						 fib_entry_flag_t flags,
-						 fib_protocol_t next_hop_proto,
-						 const ip46_address_t *next_hop,
-						 u32 next_hop_sw_if_index,
-						 u32 next_hop_fib_index,
-						 u32 next_hop_weight,
-						 mpls_label_t *next_hop_label_stack,
-						 fib_route_path_flags_t pf);
-/**
- * @brief
- *  Add n paths to an entry (aka route) in the FIB. If the entry does not
- *  exist, it will be created.
- * See the documentation for fib_route_path_t for more descirptions of
- * the path parameters.
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix for the entry to add
- *
- * @param source
- *  The ID of the client/source adding the entry.
- *
- * @param flags
- *  Flags for the entry.
- *
- * @param rpaths
- *  A vector of paths. Not const since they may be modified.
- *
- * @return
- *  the index of the fib_entry_t that is created (or existed already).
- */
-extern fib_node_index_t fib_table_entry_path_add2(u32 fib_index,
-						  const fib_prefix_t *prefix,
-						  fib_source_t source,
-						  fib_entry_flag_t flags,
-						  fib_route_path_t *rpath);
-
-/**
- * @brief
- * remove one path to an entry (aka route) in the FIB. If this is the entry's
- * last path, then the entry will be removed, unless it has other sources.
- * See the documentation for fib_route_path_t for more descirptions of
- * the path parameters.
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix for the entry to add
- *
- * @param source
- *  The ID of the client/source adding the entry.
- *
- * @paran next_hop_proto
- *  The protocol of the next hop. This cannot be derived in the event that
- * the next hop is all zeros.
- *
- * @param next_hop
- *  The address of the next-hop.
- *
- * @param sw_if_index
- *  The index of the interface.
- *
- * @param next_hop_fib_index,
- *  The fib index of the next-hop for recursive resolution
- *
- * @param next_hop_weight
- *  [un]equal cost path weight
- *
- * @param  pf
- *  Flags for the path
- */
-extern void fib_table_entry_path_remove(u32 fib_index,
-					const fib_prefix_t *prefix,
-					fib_source_t source,
-					fib_protocol_t next_hop_proto,
-					const ip46_address_t *next_hop,
-					u32 next_hop_sw_if_index,
-					u32 next_hop_fib_index,
-					u32 next_hop_weight,
-					fib_route_path_flags_t pf);
-
-/**
- * @brief
- * Remove n paths to an entry (aka route) in the FIB. If this is the entry's
- * last path, then the entry will be removed, unless it has other sources.
- * See the documentation for fib_route_path_t for more descirptions of
- * the path parameters.
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix for the entry to add
- *
- * @param source
- *  The ID of the client/source adding the entry.
- *
- * @param rpaths
- *  A vector of paths.
- */
-extern void fib_table_entry_path_remove2(u32 fib_index,
-					 const fib_prefix_t *prefix,
-					 fib_source_t source,
-					 fib_route_path_t *paths);
-
-/**
- * @brief
- *  Update an entry to have a new set of paths. If the entry does not
- *  exist, it will be created.
- * The difference between an 'path-add' and an update, is that path-add is
- * an incremental addition of paths, whereas an update is a wholesale swap.
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix for the entry to add
- *
- * @param source
- *  The ID of the client/source adding the entry.
- *
- * @param rpaths
- *  A vector of paths. Not const since they may be modified.
- *
- * @return
- *  the index of the fib_entry_t that is created (or existed already).
- */
-extern fib_node_index_t fib_table_entry_update(u32 fib_index,
-					       const fib_prefix_t *prefix,
-					       fib_source_t source,
-					       fib_entry_flag_t flags,
-					       fib_route_path_t *paths);
-
-/**
- * @brief
- *  Update the entry to have just one path. If the entry does not
- *  exist, it will be created.
- * See the documentation for fib_route_path_t for more descirptions of
- * the path parameters.
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix for the entry to add
- *
- * @param source
- *  The ID of the client/source adding the entry.
- *
- * @param flags
- *  Flags for the entry.
- *
- * @paran next_hop_proto
- *  The protocol of the next hop. This cannot be derived in the event that
- * the next hop is all zeros.
- *
- * @param next_hop
- *  The address of the next-hop.
- *
- * @param sw_if_index
- *  The index of the interface.
- *
- * @param next_hop_fib_index,
- *  The fib index of the next-hop for recursive resolution
- *
- * @param next_hop_weight
- *  [un]equal cost path weight
- *
- * @param  next_hop_label_stack
- *  The path's out-going label stack. NULL is there is none.
- *
- * @param  pf
- *  Flags for the path
- *
- * @return
- *  the index of the fib_entry_t that is created (or existed already).
- */
-extern fib_node_index_t fib_table_entry_update_one_path(u32 fib_index,
-							const fib_prefix_t *prefix,
-							fib_source_t source,
-							fib_entry_flag_t flags,
-							fib_protocol_t next_hop_proto,
-							const ip46_address_t *next_hop,
-							u32 next_hop_sw_if_index,
-							u32 next_hop_fib_index,
-							u32 next_hop_weight,
-							mpls_label_t *next_hop_label_stack,
-							fib_route_path_flags_t pf);
-
-/**
- * @brief
- *  Add a MPLS local label for the prefix/route. If the entry does not
- *  exist, it will be created. In theory more than one local label can be
- *  added, but this is not yet supported.
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix for the entry to which to add the label
- *
- * @param label
- *  The MPLS label to add
- *
- * @return
- *  the index of the fib_entry_t that is created (or existed already).
- */
-extern fib_node_index_t fib_table_entry_local_label_add(u32 fib_index,
-							const fib_prefix_t *prefix,
-							mpls_label_t label);
-/**
- * @brief
- *  remove a MPLS local label for the prefix/route.
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix for the entry to which to add the label
- *
- * @param label
- *  The MPLS label to add
- */
-extern void fib_table_entry_local_label_remove(u32 fib_index,
-					       const fib_prefix_t *prefix,
-					       mpls_label_t label);
-
-/**
- * @brief
- *  Delete a FIB entry. If the entry has no more sources, then it is
- * removed from the table.
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @param prefix
- *  The prefix for the entry to remove
- *
- * @param source
- *  The ID of the client/source adding the entry.
- */
-extern void fib_table_entry_delete(u32 fib_index,
-				   const fib_prefix_t *prefix,
-				   fib_source_t source);
-
-/**
- * @brief
- *  Delete a FIB entry. If the entry has no more sources, then it is
- * removed from the table.
- *
- * @param entry_index
- *  The index of the FIB entry
- *
- * @param source
- *  The ID of the client/source adding the entry.
- */
-extern void fib_table_entry_delete_index(fib_node_index_t entry_index,
-					 fib_source_t source);
-
-/**
- * @brief
- *  Flush all entries from a table for the source
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @paran proto
- *  The protocol of the entries in the table
- *
- * @param source
- *  the source to flush
- */
-extern void fib_table_flush(u32 fib_index,
-			    fib_protocol_t proto,
-			    fib_source_t source);
-
-/**
- * @brief
- *  Get the index of the FIB bound to the interface
- *
- * @paran proto
- *  The protocol of the FIB (and thus the entries therein)
- *
- * @param sw_if_index
- *  The interface index
- *
- * @return fib_index
- *  The index of the FIB
- */
-extern u32 fib_table_get_index_for_sw_if_index(fib_protocol_t proto,
-					       u32 sw_if_index);
-
-/**
- * @brief
- *  Get the Table-ID of the FIB bound to the interface
- *
- * @paran proto
- *  The protocol of the FIB (and thus the entries therein)
- *
- * @param sw_if_index
- *  The interface index
- *
- * @return fib_index
- *  The tableID of the FIB
- */
-extern u32 fib_table_get_table_id_for_sw_if_index(fib_protocol_t proto,
-						  u32 sw_if_index);
-
-/**
- * @brief
- *  Get the index of the FIB for a Table-ID. This DOES NOT create the
- * FIB if it does not exist.
- *
- * @paran proto
- *  The protocol of the FIB (and thus the entries therein)
- *
- * @param table-id
- *  The Table-ID
- *
- * @return fib_index
- *  The index of the FIB, which may be INVALID.
- */
-extern u32 fib_table_find(fib_protocol_t proto, u32 table_id);
-
-
-/**
- * @brief
- *  Get the index of the FIB for a Table-ID. This DOES create the
- * FIB if it does not exist.
- *
- * @paran proto
- *  The protocol of the FIB (and thus the entries therein)
- *
- * @param table-id
- *  The Table-ID
- *
- * @return fib_index
- *  The index of the FIB
- */
-extern u32 fib_table_find_or_create_and_lock(fib_protocol_t proto,
-					     u32 table_id);
-
-/**
- * @brief
- *  Create a new table with no table ID. This means it does not get
- * added to the hash-table and so can only be found by using the index returned.
- *
- * @paran proto
- *  The protocol of the FIB (and thus the entries therein)
- *
- * @param fmt
- *  A string to describe the table
- *
- * @return fib_index
- *  The index of the FIB
- */
-extern u32 fib_table_create_and_lock(fib_protocol_t proto,
-                                     const char *const fmt,
-                                     ...);
-
-/**
- * @brief
- *  Get the flow hash configured used by the table
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @paran proto
- *  The protocol of the FIB (and thus the entries therein)
- *
- * @return The flow hash config
- */
-extern flow_hash_config_t fib_table_get_flow_hash_config(u32 fib_index,
-							 fib_protocol_t proto);
-
-/**
- * @brief
- * Take a reference counting lock on the table
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @paran proto
- *  The protocol of the FIB (and thus the entries therein)
- */ 
-extern void fib_table_unlock(u32 fib_index,
-			     fib_protocol_t proto);
-
-/**
- * @brief
- * Release a reference counting lock on the table. When the last lock
- * has gone. the FIB is deleted.
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @paran proto
- *  The protocol of the FIB (and thus the entries therein)
- */ 
-extern void fib_table_lock(u32 fib_index,
-			   fib_protocol_t proto);
-
-/**
- * @brief
- * Return the number of entries in the FIB added by a given source.
- *
- * @param fib_index
- *  The index of the FIB
- *
- * @paran proto
- *  The protocol of the FIB (and thus the entries therein)
- *
- * @return number of sourced entries.
- */ 
-extern u32 fib_table_get_num_entries(u32 fib_index,
-				     fib_protocol_t proto,
-				     fib_source_t source);
-
-/**
- * @brief
- * Get a pointer to a FIB table
- */
-extern fib_table_t *fib_table_get(fib_node_index_t index,
-				  fib_protocol_t proto);
-
-#endif
diff --git a/vnet/vnet/fib/fib_test.c b/vnet/vnet/fib/fib_test.c
deleted file mode 100644
index 5083db26..00000000
--- a/vnet/vnet/fib/fib_test.c
+++ /dev/null
@@ -1,7112 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/mpls_fib.h>
-#include <vnet/adj/adj.h>
-#include <vnet/dpo/load_balance.h>
-#include <vnet/dpo/load_balance_map.h>
-#include <vnet/dpo/mpls_label_dpo.h>
-#include <vnet/dpo/lookup_dpo.h>
-#include <vnet/dpo/drop_dpo.h>
-#include <vnet/dpo/receive_dpo.h>
-#include <vnet/dpo/ip_null_dpo.h>
-
-#include <vnet/mpls/mpls.h>
-
-#include <vnet/fib/fib_path_list.h>
-#include <vnet/fib/fib_entry_src.h>
-#include <vnet/fib/fib_walk.h>
-#include <vnet/fib/fib_node_list.h>
-#include <vnet/fib/fib_urpf_list.h>
-
-#define FIB_TEST_I(_cond, _comment, _args...)			\
-({								\
-    int _evald = (_cond);					\
-    if (!(_evald)) {						\
-	fformat(stderr, "FAIL:%d: " _comment "\n",		\
-		__LINE__, ##_args);				\
-    } else {							\
-	fformat(stderr, "PASS:%d: " _comment "\n",		\
-		__LINE__, ##_args);				\
-    }								\
-    _evald;							\
-})
-#define FIB_TEST(_cond, _comment, _args...)			\
-{								\
-    if (!FIB_TEST_I(_cond, _comment, ##_args)) {		\
-	return 1;                                               \
-	ASSERT(!("FAIL: " _comment));				\
-    }								\
-}
-
-/**
- * A 'i'm not fussed is this is not efficient' store of test data
- */
-typedef struct test_main_t_ {
-    /**
-     * HW if indicies
-     */
-    u32 hw_if_indicies[4];
-    /**
-     * HW interfaces
-     */
-    vnet_hw_interface_t * hw[4];
-
-} test_main_t;
-static test_main_t test_main;
-
-/* fake ethernet device class, distinct from "fake-ethX" */
-static u8 * format_test_interface_name (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  return format (s, "test-eth%d", dev_instance);
-}
-
-static uword dummy_interface_tx (vlib_main_t * vm,
-				 vlib_node_runtime_t * node,
-				 vlib_frame_t * frame)
-{
-  clib_warning ("you shouldn't be here, leaking buffers...");
-  return frame->n_vectors;
-}
-
-static clib_error_t *
-test_interface_admin_up_down (vnet_main_t * vnm,
-                              u32 hw_if_index,
-                              u32 flags)
-{
-  u32 hw_flags = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ?
-    VNET_HW_INTERFACE_FLAG_LINK_UP : 0;
-  vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
-  return 0;
-}
-
-VNET_DEVICE_CLASS (test_interface_device_class,static) = {
-  .name = "Test interface",
-  .format_device_name = format_test_interface_name,
-  .tx_function = dummy_interface_tx,
-  .admin_up_down_function = test_interface_admin_up_down,
-};
-
-static u8 *hw_address;
-
-static int
-fib_test_mk_intf (u32 ninterfaces)
-{
-    clib_error_t * error = NULL;
-    test_main_t *tm = &test_main;
-    u8 byte;
-    u32 i;
-
-    ASSERT(ninterfaces <= ARRAY_LEN(tm->hw_if_indicies));
-
-    for (i=0; i<6; i++)
-    {
-	byte = 0xd0+i;
-	vec_add1(hw_address, byte);
-    }
-
-    for (i = 0; i < ninterfaces; i++)
-    {
-	hw_address[5] = i;
-
-	error = ethernet_register_interface(vnet_get_main(),
-                                            test_interface_device_class.index,
-					    i /* instance */,
-					    hw_address,
-					    &tm->hw_if_indicies[i], 
-					    /* flag change */ 0);
-
-	FIB_TEST((NULL == error), "ADD interface %d", i);
-      
-        error = vnet_hw_interface_set_flags(vnet_get_main(),
-                                            tm->hw_if_indicies[i],
-                                            VNET_HW_INTERFACE_FLAG_LINK_UP);
-        tm->hw[i] = vnet_get_hw_interface(vnet_get_main(),
-					  tm->hw_if_indicies[i]);
-	vec_validate (ip4_main.fib_index_by_sw_if_index,
-                      tm->hw[i]->sw_if_index);
-	vec_validate (ip6_main.fib_index_by_sw_if_index,
-                      tm->hw[i]->sw_if_index);
-	ip4_main.fib_index_by_sw_if_index[tm->hw[i]->sw_if_index] = 0;
-	ip6_main.fib_index_by_sw_if_index[tm->hw[i]->sw_if_index] = 0;
-
-	error = vnet_sw_interface_set_flags(vnet_get_main(),
-					    tm->hw[i]->sw_if_index,
-					    VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-	FIB_TEST((NULL == error), "UP interface %d", i);
-    }
-    /*
-     * re-eval after the inevitable realloc
-     */
-    for (i = 0; i < ninterfaces; i++)
-    {
-	tm->hw[i] = vnet_get_hw_interface(vnet_get_main(),
-					  tm->hw_if_indicies[i]);
-    }
-
-    return (0);
-}
-
-#define FIB_TEST_REC_FORW(_rec_prefix, _via_prefix, _bucket)		\
-{                                                                       \
-    const dpo_id_t *_rec_dpo = fib_entry_contribute_ip_forwarding(      \
-        fib_table_lookup_exact_match(fib_index, (_rec_prefix)));        \
-    const dpo_id_t *_via_dpo = fib_entry_contribute_ip_forwarding(      \
-        fib_table_lookup(fib_index, (_via_prefix)));                    \
-    FIB_TEST(!dpo_cmp(_via_dpo,                                         \
-                      load_balance_get_bucket(_rec_dpo->dpoi_index,	\
-					      _bucket)),		\
-             "%U is recursive via %U",                                  \
-             format_fib_prefix, (_rec_prefix),                          \
-             format_fib_prefix, _via_prefix);                           \
-}
-
-#define FIB_TEST_LB_BUCKET_VIA_ADJ(_prefix, _bucket, _ai)               \
-{                                                                       \
-    const dpo_id_t *_dpo = fib_entry_contribute_ip_forwarding(          \
-        fib_table_lookup_exact_match(fib_index, (_prefix)));            \
-    const dpo_id_t *_dpo1 =                                             \
-        load_balance_get_bucket(_dpo->dpoi_index, _bucket);             \
-    FIB_TEST(DPO_ADJACENCY == _dpo1->dpoi_type, "type is %U",           \
-             format_dpo_type, _dpo1->dpoi_type);                        \
-    FIB_TEST((_ai == _dpo1->dpoi_index),                                \
-	     "%U bucket %d resolves via %U",                            \
-             format_fib_prefix, (_prefix),                              \
-             _bucket,                                                   \
-             format_dpo_id, _dpo1, 0);                                  \
-}
-
-#define FIB_TEST_RPF(_cond, _comment, _args...)			\
-{								\
-    if (!FIB_TEST_I(_cond, _comment, ##_args)) {		\
-	return (0);						\
-    }								\
-}
-
-static int
-fib_test_urpf_is_equal (fib_node_index_t fei,
-		       fib_forward_chain_type_t fct,
-		       u32 num, ...)
-{
-    dpo_id_t dpo = DPO_INVALID;
-    fib_urpf_list_t *urpf;
-    index_t ui;
-    va_list ap;
-    int ii;
-
-    va_start(ap, num);
-
-    fib_entry_contribute_forwarding(fei, fct, &dpo);
-    ui = load_balance_get_urpf(dpo.dpoi_index);
-
-    urpf = fib_urpf_list_get(ui);
-
-    FIB_TEST_RPF(num == vec_len(urpf->furpf_itfs),
-		 "RPF:%U len %d == %d",
-		 format_fib_urpf_list, ui,
-		 num, vec_len(urpf->furpf_itfs));
-    FIB_TEST_RPF(num == fib_urpf_check_size(ui),
-		 "RPF:%U check-size %d == %d",
-		 format_fib_urpf_list, ui,
-		 num, vec_len(urpf->furpf_itfs));
-
-    for (ii = 0; ii < num; ii++)
-    {
-	adj_index_t ai = va_arg(ap, adj_index_t);
-
-	FIB_TEST_RPF(ai == urpf->furpf_itfs[ii],
-		     "RPF:%d item:%d - %d == %d",
-		     ui, ii, ai, urpf->furpf_itfs[ii]);
-	FIB_TEST_RPF(fib_urpf_check(ui, ai),
-		     "RPF:%d %d found",
-		     ui, ai);
-    }
-
-    dpo_reset(&dpo);
-
-    va_end(ap);
-
-    return (1);
-}
-
-static u8*
-fib_test_build_rewrite (u8 *eth_addr)
-{
-    u8* rewrite = NULL;
-
-    vec_validate(rewrite, 13);
-
-    memcpy(rewrite, eth_addr, 6);
-    memcpy(rewrite+6, eth_addr, 6);
-
-    return (rewrite);
-}
-
-typedef enum fib_test_lb_bucket_type_t_ {
-    FT_LB_LABEL_O_ADJ,
-    FT_LB_LABEL_STACK_O_ADJ,
-    FT_LB_LABEL_O_LB,
-    FT_LB_O_LB,
-    FT_LB_SPECIAL,
-    FT_LB_ADJ,
-} fib_test_lb_bucket_type_t;
-
-typedef struct fib_test_lb_bucket_t_ {
-    fib_test_lb_bucket_type_t type;
-
-    union
-    {
-	struct
-	{
-	    mpls_eos_bit_t eos;
-	    mpls_label_t label;
-	    u8 ttl;
-	    adj_index_t adj;
-	} label_o_adj;
-	struct
-	{
-	    mpls_eos_bit_t eos;
-	    mpls_label_t label_stack[8];
-	    u8 label_stack_size;
-	    u8 ttl;
-	    adj_index_t adj;
-	} label_stack_o_adj;
-	struct
-	{
-	    mpls_eos_bit_t eos;
-	    mpls_label_t label;
-	    u8 ttl;
-	    index_t lb;
-	} label_o_lb;
-	struct
-	{
-	    index_t adj;
-	} adj;
-	struct
-	{
-	    index_t lb;
-	} lb;
-	struct
-	{
-	    index_t adj;
-	} special;
-    };
-} fib_test_lb_bucket_t;
-
-#define FIB_TEST_LB(_cond, _comment, _args...)			\
-{								\
-    if (!FIB_TEST_I(_cond, _comment, ##_args)) {		\
-	return (0);						\
-    }								\
-}
-
-static int
-fib_test_validate_lb_v (const load_balance_t *lb,
-			u16 n_buckets,
-			va_list ap)
-{
-    const dpo_id_t *dpo;
-    int bucket;
-
-    FIB_TEST_LB((n_buckets == lb->lb_n_buckets), "n_buckets = %d", lb->lb_n_buckets);
-
-    for (bucket = 0; bucket < n_buckets; bucket++)
-    {
-	const fib_test_lb_bucket_t *exp;
-
-	exp = va_arg(ap, fib_test_lb_bucket_t*);
-	dpo = load_balance_get_bucket_i(lb, bucket);
-
-	switch (exp->type)
-	{
-	case FT_LB_LABEL_STACK_O_ADJ:
-	    {
-		const mpls_label_dpo_t *mld;
-                mpls_label_t hdr;
-		u32 ii;
-
-		FIB_TEST_LB((DPO_MPLS_LABEL == dpo->dpoi_type),
-			   "bucket %d stacks on %U",
-			   bucket,
-			   format_dpo_type, dpo->dpoi_type);
-	    
-		mld = mpls_label_dpo_get(dpo->dpoi_index);
-
-		FIB_TEST_LB(exp->label_stack_o_adj.label_stack_size == mld->mld_n_labels,
-			    "label stack size",
-			    mld->mld_n_labels);
-
-		for (ii = 0; ii < mld->mld_n_labels; ii++)
-		{
-		    hdr = clib_net_to_host_u32(mld->mld_hdr[ii].label_exp_s_ttl);
-		    FIB_TEST_LB((vnet_mpls_uc_get_label(hdr) ==
-				 exp->label_stack_o_adj.label_stack[ii]),
-				"bucket %d stacks on label %d",
-				bucket,
-				exp->label_stack_o_adj.label_stack[ii]);
-
-		    if (ii == mld->mld_n_labels-1)
-		    {
-			FIB_TEST_LB((vnet_mpls_uc_get_s(hdr) ==
-				     exp->label_o_adj.eos),
-				    "bucket %d stacks on label %d %U!=%U",
-				    bucket,
-				    exp->label_stack_o_adj.label_stack[ii],
-				    format_mpls_eos_bit, exp->label_o_adj.eos,
-				    format_mpls_eos_bit, vnet_mpls_uc_get_s(hdr));
-		    }
-		    else
-		    {
-			FIB_TEST_LB((vnet_mpls_uc_get_s(hdr) == MPLS_NON_EOS),
-				    "bucket %d stacks on label %d %U",
-				    bucket,
-				    exp->label_stack_o_adj.label_stack[ii],
-				    format_mpls_eos_bit, vnet_mpls_uc_get_s(hdr));
-		    }
-		}
-
-		FIB_TEST_LB((DPO_ADJACENCY_INCOMPLETE == mld->mld_dpo.dpoi_type),
-			    "bucket %d label stacks on %U",
-			    bucket,
-			    format_dpo_type, mld->mld_dpo.dpoi_type);
-
-		FIB_TEST_LB((exp->label_stack_o_adj.adj == mld->mld_dpo.dpoi_index),
-			    "bucket %d label stacks on adj %d",
-			    bucket,
-			    exp->label_stack_o_adj.adj);
-	    }
-	    break;
-	case FT_LB_LABEL_O_ADJ:
-	    {
-		const mpls_label_dpo_t *mld;
-                mpls_label_t hdr;
-		FIB_TEST_LB((DPO_MPLS_LABEL == dpo->dpoi_type),
-			   "bucket %d stacks on %U",
-			   bucket,
-			   format_dpo_type, dpo->dpoi_type);
-	    
-		mld = mpls_label_dpo_get(dpo->dpoi_index);
-                hdr = clib_net_to_host_u32(mld->mld_hdr[0].label_exp_s_ttl);
-
-		FIB_TEST_LB((vnet_mpls_uc_get_label(hdr) ==
-			     exp->label_o_adj.label),
-			    "bucket %d stacks on label %d",
-			    bucket,
-			    exp->label_o_adj.label);
-
-		FIB_TEST_LB((vnet_mpls_uc_get_s(hdr) ==
-			     exp->label_o_adj.eos),
-			    "bucket %d stacks on label %d %U",
-			    bucket,
-			    exp->label_o_adj.label,
-			    format_mpls_eos_bit, exp->label_o_adj.eos);
-
-		FIB_TEST_LB((DPO_ADJACENCY_INCOMPLETE == mld->mld_dpo.dpoi_type),
-			    "bucket %d label stacks on %U",
-			    bucket,
-			    format_dpo_type, mld->mld_dpo.dpoi_type);
-
-		FIB_TEST_LB((exp->label_o_adj.adj == mld->mld_dpo.dpoi_index),
-			    "bucket %d label stacks on adj %d",
-			    bucket,
-			    exp->label_o_adj.adj);
-	    }
-	    break;
-	case FT_LB_LABEL_O_LB:
-	    {
-		const mpls_label_dpo_t *mld;
-                mpls_label_t hdr;
-
-		FIB_TEST_LB((DPO_MPLS_LABEL == dpo->dpoi_type),
-			   "bucket %d stacks on %U",
-			   bucket,
-			   format_dpo_type, dpo->dpoi_type);
-	    
-		mld = mpls_label_dpo_get(dpo->dpoi_index);
-                hdr = clib_net_to_host_u32(mld->mld_hdr[0].label_exp_s_ttl);
-
-		FIB_TEST_LB(1 == mld->mld_n_labels, "label stack size",
-			    mld->mld_n_labels);
-		FIB_TEST_LB((vnet_mpls_uc_get_label(hdr) ==
-			     exp->label_o_lb.label),
-			    "bucket %d stacks on label %d",
-			    bucket,
-			    exp->label_o_lb.label);
-
-		FIB_TEST_LB((vnet_mpls_uc_get_s(hdr) ==
-			     exp->label_o_lb.eos),
-			    "bucket %d stacks on label %d %U",
-			    bucket,
-			    exp->label_o_lb.label,
-			    format_mpls_eos_bit, exp->label_o_lb.eos);
-
-		FIB_TEST_LB((DPO_LOAD_BALANCE == mld->mld_dpo.dpoi_type),
-			    "bucket %d label stacks on %U",
-			    bucket,
-			    format_dpo_type, mld->mld_dpo.dpoi_type);
-
-		FIB_TEST_LB((exp->label_o_lb.lb == mld->mld_dpo.dpoi_index),
-			    "bucket %d label stacks on LB %d",
-			    bucket,
-			    exp->label_o_lb.lb);
-	    }
-	    break;
-	case FT_LB_ADJ:
-	    FIB_TEST_I(((DPO_ADJACENCY == dpo->dpoi_type) ||
-			(DPO_ADJACENCY_INCOMPLETE == dpo->dpoi_type)),
-		       "bucket %d stacks on %U",
-		       bucket,
-		       format_dpo_type, dpo->dpoi_type);
-	    FIB_TEST_LB((exp->adj.adj == dpo->dpoi_index),
-			"bucket %d stacks on adj %d",
-			bucket,
-			exp->adj.adj);
-	    break;
-	case FT_LB_O_LB:
-	    FIB_TEST_I((DPO_LOAD_BALANCE == dpo->dpoi_type),
-                       "bucket %d stacks on %U",
-                       bucket,
-                       format_dpo_type, dpo->dpoi_type);
-	    FIB_TEST_LB((exp->lb.lb == dpo->dpoi_index),
-			"bucket %d stacks on lb %d",
-			bucket,
-			exp->lb.lb);
-	    break;
-	case FT_LB_SPECIAL:
-	    FIB_TEST_I((DPO_DROP == dpo->dpoi_type),
-		       "bucket %d stacks on %U",
-		       bucket,
-		       format_dpo_type, dpo->dpoi_type);
-	    FIB_TEST_LB((exp->special.adj == dpo->dpoi_index),
-			"bucket %d stacks on drop %d",
-			bucket,
-			exp->special.adj);
-	    break;
-	}
-    }
-    return (!0);
-}
-
-static int
-fib_test_validate_entry (fib_node_index_t fei,
-			 fib_forward_chain_type_t fct,
-			 u16 n_buckets,
-			 ...)
-{
-    dpo_id_t dpo = DPO_INVALID;
-    const load_balance_t *lb;
-    fib_prefix_t pfx;
-    index_t fw_lbi;
-    u32 fib_index;
-    va_list ap;
-    int res;
-
-    va_start(ap, n_buckets);
-
-    fib_entry_get_prefix(fei, &pfx);
-    fib_index = fib_entry_get_fib_index(fei);
-    fib_entry_contribute_forwarding(fei, fct, &dpo);
-
-    FIB_TEST_LB((DPO_LOAD_BALANCE == dpo.dpoi_type),
-		"Entry links to %U",
-		format_dpo_type, dpo.dpoi_type);
-    lb = load_balance_get(dpo.dpoi_index);
-
-    res = fib_test_validate_lb_v(lb, n_buckets, ap);
-
-    /*
-     * ensure that the LB contributed by the entry is the
-     * same as the LB in the forwarding tables
-     */
-    if (fct == fib_entry_get_default_chain_type(fib_entry_get(fei)))
-    {
-        switch (pfx.fp_proto)
-        {
-        case FIB_PROTOCOL_IP4:
-            fw_lbi = ip4_fib_forwarding_lookup(fib_index, &pfx.fp_addr.ip4);
-            break;
-        case FIB_PROTOCOL_IP6:
-            fw_lbi = ip6_fib_table_fwding_lookup(&ip6_main, fib_index, &pfx.fp_addr.ip6);
-            break;
-        case FIB_PROTOCOL_MPLS:
-            {
-                mpls_unicast_header_t hdr = {
-                    .label_exp_s_ttl = 0,
-                };
-
-                vnet_mpls_uc_set_label(&hdr.label_exp_s_ttl, pfx.fp_label);
-                vnet_mpls_uc_set_s(&hdr.label_exp_s_ttl, pfx.fp_eos);
-                hdr.label_exp_s_ttl = clib_host_to_net_u32(hdr.label_exp_s_ttl);
-
-                fw_lbi = mpls_fib_table_forwarding_lookup(fib_index, &hdr);
-                break;
-            }
-        default:
-            fw_lbi = 0;
-        }
-        FIB_TEST_LB((fw_lbi == dpo.dpoi_index),
-                    "Contributed LB = FW LB: %U\n %U",
-                    format_load_balance, fw_lbi, 0,
-                    format_load_balance, dpo.dpoi_index, 0);
-    }
-
-    dpo_reset(&dpo);
-
-    va_end(ap);
-
-    return (res);
-}
-
-static int
-fib_test_v4 (void)
-{
-    /*
-     * In the default table check for the presence and correct forwarding
-     * of the special entries
-     */
-    fib_node_index_t dfrt, fei, ai, ai2, locked_ai, ai_01, ai_02, ai_03;
-    const dpo_id_t *dpo, *dpo1, *dpo2, *dpo_drop;
-    const ip_adjacency_t *adj;
-    const load_balance_t *lb;
-    test_main_t *tm;
-    u32 fib_index;
-    int ii;
-
-    /* via 10.10.10.1 */
-    ip46_address_t nh_10_10_10_1 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
-    };
-    /* via 10.10.10.2 */
-    ip46_address_t nh_10_10_10_2 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02),
-    };
-
-    tm = &test_main;
-
-    /* Find or create FIB table 11 */
-    fib_index = fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP4, 11);
-
-    for (ii = 0; ii < 4; ii++)
-    {
-	ip4_main.fib_index_by_sw_if_index[tm->hw[ii]->sw_if_index] = fib_index;
-    }
-
-    fib_prefix_t pfx_0_0_0_0_s_0 = {
-	.fp_len = 0,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4 = {
-		{0}
-	    },
-	},
-    };
-
-    fib_prefix_t pfx = {
-	.fp_len = 0,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4 = {
-		{0}
-	    },
-	},
-    };
-
-    dpo_drop = drop_dpo_get(DPO_PROTO_IP4);
-
-    dfrt = fib_table_lookup(fib_index, &pfx_0_0_0_0_s_0);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != dfrt), "default route present");
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(dfrt)),
-	     "Default route is DROP");
-
-    pfx.fp_len = 32;
-    fei = fib_table_lookup(fib_index, &pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "all zeros route present");
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "all 0s route is DROP");
-
-    pfx.fp_addr.ip4.as_u32 = clib_host_to_net_u32(0xffffffff);
-    pfx.fp_len = 32;
-    fei = fib_table_lookup(fib_index, &pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "all ones route present");
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "all 1s route is DROP");
-
-    pfx.fp_addr.ip4.as_u32 = clib_host_to_net_u32(0xe0000000);
-    pfx.fp_len = 8;
-    fei = fib_table_lookup(fib_index, &pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "all-mcast route present");
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "all-mcast route is DROP");
-
-    pfx.fp_addr.ip4.as_u32 = clib_host_to_net_u32(0xf0000000);
-    pfx.fp_len = 8;
-    fei = fib_table_lookup(fib_index, &pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "class-e route present");
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "class-e route is DROP");
-
-    /*
-     * at this stage there are 5 entries in the test FIB (plus 5 in the default),
-     * all of which are special sourced and so none of which share path-lists.
-     * There are also 6 entries, and 6 non-shared path-lists, in the v6 default
-     * table
-     */
-#define NBR (5+5+6)
-    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
-    FIB_TEST((NBR == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * add interface routes.
-     *  validate presence of /24 attached and /32 recieve.
-     *  test for the presence of the receive address in the glean and local adj
-     */
-    fib_prefix_t local_pfx = {
-	.fp_len = 24,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4 = {
-		.as_u32 = clib_host_to_net_u32(0x0a0a0a0a),
-	    },
-	},
-    };
-
-    fib_table_entry_update_one_path(fib_index, &local_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_ATTACHED),
-				    FIB_PROTOCOL_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1, // weight
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached interface route present");
-    FIB_TEST(((FIB_ENTRY_FLAG_ATTACHED | FIB_ENTRY_FLAG_CONNECTED) ==
-	      fib_entry_get_flags(fei)),
-	     "Flags set on attached interface");
-
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != ai), "attached interface route adj present");
-    adj = adj_get(ai);
-    FIB_TEST((IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index),
-	     "attached interface adj is glean");
-    FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
-				    &adj->sub_type.glean.receive_addr)),
-	      "attached interface adj is receive ok");
-
-    local_pfx.fp_len = 32;
-    fib_table_entry_update_one_path(fib_index, &local_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_LOCAL),
-				    FIB_PROTOCOL_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1, // weight
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &local_pfx);
-    FIB_TEST(((FIB_ENTRY_FLAG_LOCAL | FIB_ENTRY_FLAG_CONNECTED) ==
-	      fib_entry_get_flags(fei)),
-	     "Flags set on local interface");
-
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local interface route present");
-
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
-	     "RPF list for local length 0");
-    dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
-    FIB_TEST((DPO_RECEIVE == dpo->dpoi_type),
-	     "local interface adj is local");
-    receive_dpo_t *rd = receive_dpo_get(dpo->dpoi_index);
-
-    FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
-				    &rd->rd_addr)),
-	      "local interface adj is receive ok");
-
-    FIB_TEST((2 == fib_table_get_num_entries(fib_index,
-                                             FIB_PROTOCOL_IP4,
-                                             FIB_SOURCE_INTERFACE)),
-             "2 Interface Source'd prefixes");
-
-    /*
-     * +2 interface routes +2 non-shared path-lists
-     */
-    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
-    FIB_TEST((NBR+2 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+2 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * Modify the default route to be via an adj not yet known.
-     * this sources the defalut route with the API source, which is
-     * a higher preference to the DEFAULT_ROUTE source
-     */
-    pfx.fp_addr.ip4.as_u32 = 0;
-    pfx.fp_len = 0;
-    fib_table_entry_path_add(fib_index, &pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &pfx);
-    FIB_TEST((FIB_ENTRY_FLAG_NONE == fib_entry_get_flags(fei)),
-	     "Flags set on API route");
-
-    FIB_TEST((fei == dfrt), "default route same index");
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != ai), "default route adj present");
-    adj = adj_get(ai);
-    FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
-	     "adj is incomplete");
-    FIB_TEST((0 == ip46_address_cmp(&nh_10_10_10_1, &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
-    FIB_TEST((1 == fib_table_get_num_entries(fib_index,
-                                             FIB_PROTOCOL_IP4,
-                                             FIB_SOURCE_API)),
-             "1 API Source'd prefixes");
-
-    /*
-     * find the adj in the shared db
-     */
-    locked_ai = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-				    VNET_LINK_IP4,
-				    &nh_10_10_10_1,
-				    tm->hw[0]->sw_if_index);
-    FIB_TEST((locked_ai == ai), "ADJ NBR DB find");
-    adj_unlock(locked_ai);
-
-    /*
-     * +1 shared path-list
-     */
-    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+3 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+2 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * remove the API source from the default route. We expected
-     * the route to remain, sourced by DEFAULT_ROUTE, and hence a DROP
-     */
-    pfx.fp_addr.ip4.as_u32 = 0;
-    pfx.fp_len = 0;
-    fib_table_entry_path_remove(fib_index, &pfx,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0, // non-recursive path, so no FIB index
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx);
-
-    FIB_TEST((fei == dfrt), "default route same index");
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "Default route is DROP");
-
-    /*
-     * -1 shared-path-list
-     */
-    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
-    FIB_TEST((NBR+2 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+2 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * Add an 2 ARP entry => a complete ADJ plus adj-fib.
-     */
-    fib_prefix_t pfx_10_10_10_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 10.10.10.1 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
-	},
-    };
-    fib_prefix_t pfx_10_10_10_2_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 10.10.10.2 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02),
-	},
-    };
-    fib_prefix_t pfx_11_11_11_11_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 11.11.11.11 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x0b0b0b0b),
-	},
-    };
-    u8 eth_addr[] = {
-	0xde, 0xde, 0xde, 0xba, 0xba, 0xba,
-    };
-
-    ip46_address_t nh_12_12_12_12 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0c0c0c0c),
-    };
-    adj_index_t ai_12_12_12_12;
-
-    /*
-     * Add a route via an incomplete ADJ. then complete the ADJ
-     * Expect the route LB is updated to use complete adj type.
-     */
-    fei = fib_table_entry_update_one_path(fib_index,
-                                          &pfx_11_11_11_11_s_32,
-                                          FIB_SOURCE_API,
-                                          FIB_ENTRY_FLAG_ATTACHED,
-					  FIB_PROTOCOL_IP4,
-                                          &pfx_10_10_10_1_s_32.fp_addr,
-                                          tm->hw[0]->sw_if_index,
-                                          ~0, // invalid fib index
-                                          1,
-                                          NULL,
-                                          FIB_ROUTE_PATH_FLAG_NONE);
-
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    dpo1 = load_balance_get_bucket(dpo->dpoi_index, 0);
-    FIB_TEST(DPO_ADJACENCY_INCOMPLETE == dpo1->dpoi_type,
-             "11.11.11.11/32 via incomplete adj");
-
-    ai_01 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-				VNET_LINK_IP4,
-				&pfx_10_10_10_1_s_32.fp_addr,
-				tm->hw[0]->sw_if_index);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != ai_01), "adj created");
-    adj = adj_get(ai_01);
-    FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
-	     "adj is incomplete");
-    FIB_TEST((0 == ip46_address_cmp(&pfx_10_10_10_1_s_32.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
-
-    adj_nbr_update_rewrite(ai_01, ADJ_NBR_REWRITE_FLAG_COMPLETE,
-			   fib_test_build_rewrite(eth_addr));
-    FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
-	     "adj is complete");
-    FIB_TEST((0 == ip46_address_cmp(&pfx_10_10_10_1_s_32.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "ADJ-FIB resolves via adj");
-
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    dpo1 = load_balance_get_bucket(dpo->dpoi_index, 0);
-    FIB_TEST(DPO_ADJACENCY == dpo1->dpoi_type,
-             "11.11.11.11/32 via complete adj");
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
-				    tm->hw[0]->sw_if_index),
-	     "RPF list for adj-fib contains adj");
-
-    ai_12_12_12_12 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-					 VNET_LINK_IP4,
-					 &nh_12_12_12_12,
-					 tm->hw[1]->sw_if_index);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != ai_12_12_12_12), "adj created");
-    adj = adj_get(ai_12_12_12_12);
-    FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
-	     "adj is incomplete");
-    FIB_TEST((0 == ip46_address_cmp(&nh_12_12_12_12,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
-    adj_nbr_update_rewrite(ai_12_12_12_12, ADJ_NBR_REWRITE_FLAG_COMPLETE,
-			   fib_test_build_rewrite(eth_addr));
-    FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
-	     "adj is complete");
-
-    /*
-     * add the adj fib
-     */
-    fei = fib_table_entry_update_one_path(fib_index,
-                                          &pfx_10_10_10_1_s_32,
-                                          FIB_SOURCE_ADJ,
-                                          FIB_ENTRY_FLAG_ATTACHED,
-					  FIB_PROTOCOL_IP4,
-                                          &pfx_10_10_10_1_s_32.fp_addr,
-                                          tm->hw[0]->sw_if_index,
-                                          ~0, // invalid fib index
-                                          1,
-                                          NULL,
-                                          FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST((FIB_ENTRY_FLAG_ATTACHED  == fib_entry_get_flags(fei)),
-	     "Flags set on adj-fib");
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "ADJ-FIB resolves via adj");
-
-    fib_table_entry_path_remove(fib_index,
-                                &pfx_11_11_11_11_s_32,
-                                FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-                                &pfx_10_10_10_1_s_32.fp_addr,
-                                tm->hw[0]->sw_if_index,
-                                ~0, // invalid fib index
-                                1,
-                                FIB_ROUTE_PATH_FLAG_NONE);
-
-    eth_addr[5] = 0xb2;
-
-    ai_02 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-				VNET_LINK_IP4,
-				&pfx_10_10_10_2_s_32.fp_addr,
-				tm->hw[0]->sw_if_index);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != ai_02), "adj created");
-    adj = adj_get(ai_02);
-    FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
-	     "adj is incomplete");
-    FIB_TEST((0 == ip46_address_cmp(&pfx_10_10_10_2_s_32.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
-
-    adj_nbr_update_rewrite(ai_02, ADJ_NBR_REWRITE_FLAG_COMPLETE,
-			   fib_test_build_rewrite(eth_addr));
-    FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
-	     "adj is complete");
-    FIB_TEST((0 == ip46_address_cmp(&pfx_10_10_10_2_s_32.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
-    FIB_TEST((ai_01 != ai_02), "ADJs are different");
-
-    fib_table_entry_update_one_path(fib_index,
-				    &pfx_10_10_10_2_s_32,
-				    FIB_SOURCE_ADJ,
-				    FIB_ENTRY_FLAG_ATTACHED,
-				    FIB_PROTOCOL_IP4,
-				    &pfx_10_10_10_2_s_32.fp_addr,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_10_10_10_2_s_32);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_02 == ai), "ADJ-FIB resolves via adj");
-
-    /*
-     * +2 adj-fibs, and their non-shared path-lists
-     */
-    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
-    FIB_TEST((NBR+4 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+4 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * Add 2 routes via the first ADJ. ensure path-list sharing
-     */
-    fib_prefix_t pfx_1_1_1_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 1.1.1.1/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010101),
-	},
-    };
-
-    fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_1_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "1.1.1.1 resolves via 10.10.10.1");
-
-    /*
-     * +1 entry and a shared path-list
-     */
-    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB is empty");
-    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+5 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /* 1.1.2.0/24 */
-    fib_prefix_t pfx_1_1_2_0_s_24 = {
-	.fp_len = 24,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010200),
-	}
-    };
-
-    fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_2_0_s_24,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &pfx_1_1_2_0_s_24);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "1.1.2.0/24 resolves via 10.10.10.1");
-
-    /*
-     * +1 entry only
-     */
-    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB is empty");
-    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+6 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * modify 1.1.2.0/24 to use multipath.
-     */
-    fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_2_0_s_24,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_2,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &pfx_1_1_2_0_s_24);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				    1, tm->hw[0]->sw_if_index),
-	     "RPF list for 1.1.2.0/24 contains both adjs");
-
-    dpo1 = load_balance_get_bucket(dpo->dpoi_index, 0);
-    FIB_TEST(DPO_ADJACENCY == dpo1->dpoi_type, "type is %d", dpo1->dpoi_type);
-    FIB_TEST((ai_01 == dpo1->dpoi_index),
-	     "1.1.2.0/24 bucket 0 resolves via 10.10.10.1 (%d=%d)",
-             ai_01, dpo1->dpoi_index);
-
-    dpo1 = load_balance_get_bucket(dpo->dpoi_index, 1);
-    FIB_TEST(DPO_ADJACENCY == dpo1->dpoi_type, "type is %d", dpo1->dpoi_type);
-    FIB_TEST((ai_02 == dpo1->dpoi_index),
-	     "1.1.2.0/24 bucket 1 resolves via 10.10.10.2");
-
-    /*
-     * +1 shared-pathlist
-     */
-    FIB_TEST((2 == fib_path_list_db_size()),   "path list DB is empty");
-    FIB_TEST((NBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+6 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * revert the modify
-     */
-    fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_2_0_s_24,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_10_10_10_2,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &pfx_1_1_2_0_s_24);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				   1, tm->hw[0]->sw_if_index),
-	     "RPF list for 1.1.2.0/24 contains one adj");
-
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "1.1.2.0/24 resolves via 10.10.10.1");
-
-    /*
-     * +1 shared-pathlist
-     */
-    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB is %d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+6 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * Add 2 recursive routes:
-     *   100.100.100.100/32 via 1.1.1.1/32  => the via entry is installed.
-     *   100.100.100.101/32 via 1.1.1.1/32  => the via entry is installed.
-     */
-    fib_prefix_t bgp_100_pfx = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 100.100.100.100/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x64646464),
-	},
-    };
-    /* via 1.1.1.1 */
-    ip46_address_t nh_1_1_1_1 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x01010101),
-    };
-
-    fei = fib_table_entry_path_add(fib_index,
-				   &bgp_100_pfx,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   FIB_PROTOCOL_IP4,
-				   &nh_1_1_1_1,
-				   ~0, // no index provided.
-				   fib_index, // nexthop in same fib as route
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST_REC_FORW(&bgp_100_pfx, &pfx_1_1_1_1_s_32, 0);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
-				    tm->hw[0]->sw_if_index),
-	     "RPF list for adj-fib contains adj");
-
-    /*
-     * +1 entry and +1 shared-path-list
-     */
-    FIB_TEST((2  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    fib_prefix_t bgp_101_pfx = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 100.100.100.101/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x64646465),
-	},
-    };
-
-    fib_table_entry_path_add(fib_index,
-			     &bgp_101_pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_1_1_1_1,
-			     ~0, // no index provided.
-			     fib_index, // nexthop in same fib as route
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST_REC_FORW(&bgp_101_pfx, &pfx_1_1_1_1_s_32, 0);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
-				    tm->hw[0]->sw_if_index),
-	     "RPF list for adj-fib contains adj");
-
-    /*
-     * +1 entry, but the recursive path-list is shared.
-     */
-    FIB_TEST((2  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+8 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * An EXCLUSIVE route; one where the user (me) provides the exclusive
-     * adjacency through which the route will resovle
-     */
-    fib_prefix_t ex_pfx = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 4.4.4.4/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x04040404),
-	},
-    };
-
-    fib_table_entry_special_add(fib_index,
-				&ex_pfx,
-				FIB_SOURCE_SPECIAL,
-				FIB_ENTRY_FLAG_EXCLUSIVE,
-				locked_ai);
-    fei = fib_table_lookup_exact_match(fib_index, &ex_pfx);
-    FIB_TEST((ai == fib_entry_get_adj(fei)),
-	     "Exclusive route links to user adj");
-
-    fib_table_entry_special_remove(fib_index,
-				   &ex_pfx,
-				   FIB_SOURCE_SPECIAL);
-    FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &ex_pfx),
-	     "Exclusive reoute removed");
-
-    /*
-     * An EXCLUSIVE route; one where the user (me) provides the exclusive
-     * adjacency through which the route will resovle
-     */
-    dpo_id_t ex_dpo = DPO_INVALID;
-
-    lookup_dpo_add_or_lock_w_fib_index(fib_index,
-                                       DPO_PROTO_IP4,
-                                       LOOKUP_INPUT_DST_ADDR,
-                                       LOOKUP_TABLE_FROM_CONFIG,
-                                       &ex_dpo);
-
-    fib_table_entry_special_dpo_add(fib_index,
-                                    &ex_pfx,
-                                    FIB_SOURCE_SPECIAL,
-                                    FIB_ENTRY_FLAG_EXCLUSIVE,
-                                    &ex_dpo);
-    fei = fib_table_lookup_exact_match(fib_index, &ex_pfx);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_cmp(&ex_dpo, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "exclusive remote uses lookup DPO");
-
-    /*
-     * update the exclusive to use a different DPO
-     */
-    ip_null_dpo_add_and_lock(DPO_PROTO_IP4,
-			     IP_NULL_ACTION_SEND_ICMP_UNREACH,
-			     &ex_dpo);
-    fib_table_entry_special_dpo_update(fib_index,
-				       &ex_pfx,
-				       FIB_SOURCE_SPECIAL,
-				       FIB_ENTRY_FLAG_EXCLUSIVE,
-				       &ex_dpo);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_cmp(&ex_dpo, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "exclusive remote uses now uses NULL DPO");
-
-    fib_table_entry_special_remove(fib_index,
-				   &ex_pfx,
-				   FIB_SOURCE_SPECIAL);
-    FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &ex_pfx),
-	     "Exclusive reoute removed");
-    dpo_reset(&ex_dpo);
-
-    /*
-     * Add a recursive route:
-     *   200.200.200.200/32 via 1.1.1.2/32  => the via entry is NOT installed.
-     */
-    fib_prefix_t bgp_200_pfx = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 200.200.200.200/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0xc8c8c8c8),
-	},
-    };
-    /* via 1.1.1.2 */
-    fib_prefix_t pfx_1_1_1_2_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010102),
-	},
-    };
-
-    fib_table_entry_path_add(fib_index,
-			     &bgp_200_pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &pfx_1_1_1_2_s_32.fp_addr,
-			     ~0, // no index provided.
-			     fib_index, // nexthop in same fib as route
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST_REC_FORW(&bgp_200_pfx, &pfx_1_1_1_2_s_32, 0);
-
-    /*
-     * the adj should be recursive via drop, since the route resolves via
-     * the default route, which is itself a DROP 
-     */
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_2_s_32);
-    dpo1 = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(load_balance_is_drop(dpo1), "1.1.1.2/32 is drop");
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
-	     "RPF list for 1.1.1.2/32 contains 0 adjs");
-
-    /*
-     * +2 entry and +1 shared-path-list
-     */
-    FIB_TEST((3  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+7 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+10 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * Unequal Cost load-balance. 3:1 ratio. fits in a 4 bucket LB
-     * The paths are sort by NH first. in this case the the path with greater
-     * weight is first in the set. This ordering is to test the RPF sort|uniq logic
-     */
-    fib_prefix_t pfx_1_2_3_4_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01020304),
-	},
-    };
-    fib_table_entry_path_add(fib_index,
-			     &pfx_1_2_3_4_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-                             &nh_10_10_10_1,
-                             tm->hw[0]->sw_if_index,
-                             ~0,
-                             1,
-                             NULL,
-                             FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_entry_path_add(fib_index,
-                                   &pfx_1_2_3_4_s_32,
-                                   FIB_SOURCE_API,
-                                   FIB_ENTRY_FLAG_NONE,
-				   FIB_PROTOCOL_IP4,
-                                   &nh_12_12_12_12,
-                                   tm->hw[1]->sw_if_index,
-                                   ~0,
-                                   3,
-                                   NULL,
-                                   FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "1.2.3.4/32 presnet");
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    lb = load_balance_get(dpo->dpoi_index);
-    FIB_TEST((lb->lb_n_buckets == 4),
-             "1.2.3.4/32 LB has %d bucket",
-             lb->lb_n_buckets);
-
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_4_s_32, 0, ai_12_12_12_12);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_4_s_32, 1, ai_12_12_12_12);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_4_s_32, 2, ai_12_12_12_12);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_4_s_32, 3, ai_01);
-
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 2,
-				    tm->hw[0]->sw_if_index,
-				    tm->hw[1]->sw_if_index),
-	     "RPF list for 1.2.3.4/32 contains both adjs");
-
-
-    /*
-     * Unequal Cost load-balance. 4:1 ratio.
-     *  fits in a 16 bucket LB with ratio 13:3
-     */
-    fib_prefix_t pfx_1_2_3_5_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01020305),
-	},
-    };
-    fib_table_entry_path_add(fib_index,
-			     &pfx_1_2_3_5_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-                             &nh_12_12_12_12,
-                             tm->hw[1]->sw_if_index,
-                             ~0,
-                             1,
-                             NULL,
-                             FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_entry_path_add(fib_index,
-                                   &pfx_1_2_3_5_s_32,
-                                   FIB_SOURCE_API,
-                                   FIB_ENTRY_FLAG_NONE,
-				   FIB_PROTOCOL_IP4,
-                                   &nh_10_10_10_1,
-                                   tm->hw[0]->sw_if_index,
-                                   ~0,
-                                   4,
-                                   NULL,
-                                   FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "1.2.3.5/32 presnet");
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    lb = load_balance_get(dpo->dpoi_index);
-    FIB_TEST((lb->lb_n_buckets == 16),
-             "1.2.3.5/32 LB has %d bucket",
-             lb->lb_n_buckets);
-
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 0, ai_01);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 1, ai_01);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 2, ai_01);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 3, ai_01);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 4, ai_01);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 5, ai_01);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 6, ai_01);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 7, ai_01);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 8, ai_01);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 9, ai_01);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 10, ai_01);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 11, ai_01);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 12, ai_01);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 13, ai_12_12_12_12);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 14, ai_12_12_12_12);
-    FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 15, ai_12_12_12_12);
-
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 2,
-				    tm->hw[0]->sw_if_index,
-				    tm->hw[1]->sw_if_index),
-	     "RPF list for 1.2.3.4/32 contains both adjs");
-
-    /*
-     * Test UCMP with a large weight skew - this produces load-balance objects with large
-     * numbers of buckets to accommodate the skew. By updating said load-balances we are
-     * laso testing the LB in placce modify code when number of buckets is large.
-     */
-    fib_prefix_t pfx_6_6_6_6_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 1.1.1.1/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x06060606),
-	},
-    };
-    fib_test_lb_bucket_t ip_6_6_6_6_o_10_10_10_1 = {
-	.type = FT_LB_ADJ,
-	.adj = {
-	    .adj = ai_01,
-	},
-    };
-    fib_test_lb_bucket_t ip_6_6_6_6_o_10_10_10_2 = {
-        .type = FT_LB_ADJ,
-        .adj = {
-            .adj = ai_02,
-        },
-    };
-    fib_test_lb_bucket_t ip_6_6_6_6_o_12_12_12_12 = {
-        .type = FT_LB_ADJ,
-        .adj = {
-            .adj = ai_12_12_12_12,
-        },
-    };
-    fib_table_entry_update_one_path(fib_index,
-				    &pfx_6_6_6_6_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    FIB_PROTOCOL_IP4,
-				    &nh_10_10_10_1,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    0,  // zero weigth
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &ip_6_6_6_6_o_10_10_10_1),
-	     "6.6.6.6/32 via 10.10.10.1");
-
-    fib_table_entry_path_add(fib_index,
-                             &pfx_6_6_6_6_s_32,
-                             FIB_SOURCE_API,
-                             FIB_ENTRY_FLAG_NONE,
-                             FIB_PROTOCOL_IP4,
-                             &nh_10_10_10_2,
-                             tm->hw[0]->sw_if_index,
-                             ~0, // invalid fib index
-                             100,
-                             NULL,
-                             FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     64,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_1),
-	     "6.6.6.6/32 via 10.10.10.1 and 10.10.10.2 in 63:1 ratio");
-
-    fib_table_entry_path_add(fib_index,
-                             &pfx_6_6_6_6_s_32,
-                             FIB_SOURCE_API,
-                             FIB_ENTRY_FLAG_NONE,
-                             FIB_PROTOCOL_IP4,
-                             &nh_12_12_12_12,
-                             tm->hw[1]->sw_if_index,
-                             ~0, // invalid fib index
-                             100,
-                             NULL,
-                             FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     128,
-				     &ip_6_6_6_6_o_10_10_10_1,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12),
-	     "6.6.6.6/32 via 10.10.10.1 and 10.10.10.2 in 63:1 ratio");
-
-    fib_table_entry_path_remove(fib_index,
-                                &pfx_6_6_6_6_s_32,
-                                FIB_SOURCE_API,
-                                FIB_PROTOCOL_IP4,
-                                &nh_12_12_12_12,
-                                tm->hw[1]->sw_if_index,
-                                ~0, // invalid fib index
-                                100,
-                                FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     64,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_2,
-				     &ip_6_6_6_6_o_10_10_10_1),
-	     "6.6.6.6/32 via 10.10.10.1 and 10.10.10.2 in 63:1 ratio");
-
-    fib_table_entry_path_remove(fib_index,
-                                &pfx_6_6_6_6_s_32,
-                                FIB_SOURCE_API,
-                                FIB_PROTOCOL_IP4,
-                                &nh_10_10_10_2,
-                                tm->hw[0]->sw_if_index,
-                                ~0, // invalid fib index
-                                100,
-                                FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &ip_6_6_6_6_o_10_10_10_1),
-	     "6.6.6.6/32 via 10.10.10.1");
-
-    fib_table_entry_delete(fib_index, &pfx_6_6_6_6_s_32, FIB_SOURCE_API);
-
-    /*
-     * A recursive via the two unequal cost entries
-     */
-    fib_prefix_t bgp_44_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 200.200.200.201/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x44444444),
-	},
-    };
-    fei = fib_table_entry_path_add(fib_index,
-                                   &bgp_44_s_32,
-                                   FIB_SOURCE_API,
-                                   FIB_ENTRY_FLAG_NONE,
-				   FIB_PROTOCOL_IP4,
-				   &pfx_1_2_3_4_s_32.fp_addr,
-                                   ~0,
-                                   fib_index,
-                                   1,
-                                   NULL,
-                                   FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_entry_path_add(fib_index,
-                                   &bgp_44_s_32,
-                                   FIB_SOURCE_API,
-                                   FIB_ENTRY_FLAG_NONE,
-				   FIB_PROTOCOL_IP4,
-				   &pfx_1_2_3_5_s_32.fp_addr,
-                                   ~0,
-                                   fib_index,
-                                   1,
-                                   NULL,
-                                   FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST_REC_FORW(&bgp_44_s_32, &pfx_1_2_3_4_s_32, 0);
-    FIB_TEST_REC_FORW(&bgp_44_s_32, &pfx_1_2_3_5_s_32, 1);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 2,
-				    tm->hw[0]->sw_if_index,
-				    tm->hw[1]->sw_if_index),
-	     "RPF list for 1.2.3.4/32 contains both adjs");
-
-    /*
-     * test the uRPF check functions
-     */
-    dpo_id_t dpo_44 = DPO_INVALID;
-    index_t urpfi;
-
-    fib_entry_contribute_forwarding(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, &dpo_44);
-    urpfi = load_balance_get_urpf(dpo_44.dpoi_index);
-
-    FIB_TEST(fib_urpf_check(urpfi, tm->hw[0]->sw_if_index),
-	     "uRPF check for 68.68.68.68/32 on %d OK",
-	     tm->hw[0]->sw_if_index);
-    FIB_TEST(fib_urpf_check(urpfi, tm->hw[1]->sw_if_index),
-	     "uRPF check for 68.68.68.68/32 on %d OK",
-	     tm->hw[1]->sw_if_index);
-    FIB_TEST(!fib_urpf_check(urpfi, 99),
-	     "uRPF check for 68.68.68.68/32 on 99 not-OK",
-	     99);
-    dpo_reset(&dpo_44);
-
-    fib_table_entry_delete(fib_index,
-                           &bgp_44_s_32,
-                           FIB_SOURCE_API);
-    fib_table_entry_delete(fib_index,
-                           &pfx_1_2_3_5_s_32,
-                           FIB_SOURCE_API);
-    fib_table_entry_delete(fib_index,
-                           &pfx_1_2_3_4_s_32,
-                           FIB_SOURCE_API);
-
-    /*
-     * Add a recursive route:
-     *   200.200.200.201/32 via 1.1.1.200/32  => the via entry is NOT installed.
-     */
-    fib_prefix_t bgp_201_pfx = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 200.200.200.201/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0xc8c8c8c9),
-	},
-    };
-    /* via 1.1.1.200 */
-    fib_prefix_t pfx_1_1_1_200_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x010101c8),
-	},
-    };
-
-    fib_table_entry_path_add(fib_index,
-			     &bgp_201_pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &pfx_1_1_1_200_s_32.fp_addr,
-			     ~0, // no index provided.
-			     fib_index, // nexthop in same fib as route
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST_REC_FORW(&bgp_201_pfx, &pfx_1_1_1_200_s_32, 0);
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_200_s_32);
-    FIB_TEST((FIB_ENTRY_FLAG_NONE == fib_entry_get_flags(fei)),
-	     "Flags set on RR via non-attached");
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
-	     "RPF list for BGP route empty");
-
-    /*
-     * +2 entry (BGP & RR) and +1 shared-path-list
-     */
-    FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+12 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * insert a route that covers the missing 1.1.1.2/32. we epxect
-     * 200.200.200.200/32 and 200.200.200.201/32 to resolve through it.
-     */
-    fib_prefix_t pfx_1_1_1_0_s_24 = {
-	.fp_len = 24,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 1.1.1.0/24 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010100),
-	},
-    };
-
-    fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_0_s_24,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_0_s_24);
-    dpo1 = fib_entry_contribute_ip_forwarding(fei);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "1.1.1.0/24 resolves via 10.10.10.1");
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_2_s_32);
-    dpo1 = fib_entry_contribute_ip_forwarding(fei);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "1.1.1.2/32 resolves via 10.10.10.1");
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_200_s_32);
-    dpo1 = fib_entry_contribute_ip_forwarding(fei);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "1.1.1.200/24 resolves via 10.10.10.1");
-
-    /*
-     * +1 entry. 1.1.1.1/32 already uses 10.10.10.1 so no new pah-list
-     */
-    FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+13 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * the recursive adj for 200.200.200.200 should be updated.
-     */
-    FIB_TEST_REC_FORW(&bgp_201_pfx, &pfx_1_1_1_200_s_32, 0);
-    FIB_TEST_REC_FORW(&bgp_200_pfx, &pfx_1_1_1_2_s_32, 0);
-    fei = fib_table_lookup(fib_index, &bgp_200_pfx);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
-				    tm->hw[0]->sw_if_index),
-	     "RPF list for BGP route has itf index 0");
-
-    /*
-     * insert a more specific route than 1.1.1.0/24 that also covers the
-     * missing 1.1.1.2/32, but not 1.1.1.200/32. we epxect
-     * 200.200.200.200 to resolve through it.
-     */
-    fib_prefix_t pfx_1_1_1_0_s_28 = {
-	.fp_len = 28,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 1.1.1.0/24 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010100),
-	},
-    };
-
-    fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_0_s_28,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_2,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_0_s_28);
-    dpo2 = fib_entry_contribute_ip_forwarding(fei);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_02 == ai), "1.1.1.0/24 resolves via 10.10.10.2");
-
-    /*
-     * +1 entry. +1 shared path-list
-     */
-    FIB_TEST((5  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+9 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+14 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * the recursive adj for 200.200.200.200 should be updated.
-     * 200.200.200.201 remains unchanged.
-     */
-    FIB_TEST_REC_FORW(&bgp_201_pfx, &pfx_1_1_1_200_s_32, 0);
-    FIB_TEST_REC_FORW(&bgp_200_pfx, &pfx_1_1_1_2_s_32, 0);
-
-    /*
-     * remove this /28. 200.200.200.200/32 should revert back to via 1.1.1.0/24
-     */
-    fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_0_s_28,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_10_10_10_2,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_28) == 
-	      FIB_NODE_INDEX_INVALID),
-	     "1.1.1.0/28 removed");
-    FIB_TEST((fib_table_lookup(fib_index, &pfx_1_1_1_0_s_28) == 
-	      fib_table_lookup(fib_index, &pfx_1_1_1_0_s_24)),
-	     "1.1.1.0/28 lookup via /24");
-    FIB_TEST_REC_FORW(&bgp_201_pfx, &pfx_1_1_1_200_s_32, 0);
-    FIB_TEST_REC_FORW(&bgp_200_pfx, &pfx_1_1_1_2_s_32, 0);
-
-    /*
-     * -1 entry. -1 shared path-list
-     */
-    FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+13 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * remove 1.1.1.0/24. 200.200.200.200/32 should revert back to via 0.0.0.0/0
-     */
-    fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_0_s_24,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_24) == 
-	      FIB_NODE_INDEX_INVALID),
-	     "1.1.1.0/24 removed");
-
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_2_s_32);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "1.1.1.2/32 route is DROP");
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_200_s_32);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "1.1.1.200/32 route is DROP");
-
-    FIB_TEST_REC_FORW(&bgp_201_pfx, &pfx_1_1_1_200_s_32, 0);
-    FIB_TEST_REC_FORW(&bgp_200_pfx, &pfx_1_1_1_2_s_32, 0);
-
-    /*
-     * -1 entry
-     */
-    FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
-	fib_path_list_db_size());
-    FIB_TEST((NBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
-	fib_path_list_pool_size());
-    FIB_TEST((NBR+12 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * insert the missing 1.1.1.2/32
-     */
-    fei = fib_table_entry_path_add(fib_index,
-	                           &pfx_1_1_1_2_s_32,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   FIB_PROTOCOL_IP4,
-				   &nh_10_10_10_1,
-				   tm->hw[0]->sw_if_index,
-				   ~0, // invalid fib index
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
-    dpo1 = fib_entry_contribute_ip_forwarding(fei);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai = ai_01), "1.1.1.2/32 resolves via 10.10.10.1");
-
-    FIB_TEST_REC_FORW(&bgp_201_pfx, &pfx_1_1_1_200_s_32, 0);
-    FIB_TEST_REC_FORW(&bgp_200_pfx, &pfx_1_1_1_2_s_32, 0);
-
-    /*
-     * no change. 1.1.1.2/32 was already there RR sourced.
-     */
-    FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+12 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * remove 200.200.200.201/32 which does not have a valid via FIB
-     */
-    fib_table_entry_path_remove(fib_index,
-				&bgp_201_pfx,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&pfx_1_1_1_200_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-
-    /*
-     * -2 entries (BGP and RR). -1 shared path-list;
-     */
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_201_pfx) == 
-	      FIB_NODE_INDEX_INVALID),
-	     "200.200.200.201/32 removed");
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_200_s_32) == 
-	      FIB_NODE_INDEX_INVALID),
-	     "1.1.1.200/32 removed");
-
-    FIB_TEST((3  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+7 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+10 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * remove 200.200.200.200/32 which does have a valid via FIB
-     */
-    fib_table_entry_path_remove(fib_index,
-				&bgp_200_pfx,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&pfx_1_1_1_2_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_200_pfx) == 
-	      FIB_NODE_INDEX_INVALID),
-	     "200.200.200.200/32 removed");
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_2_s_32) != 
-	      FIB_NODE_INDEX_INVALID),
-	     "1.1.1.2/32 still present");
-
-    /*
-     * -1 entry (BGP, the RR source is also API sourced). -1 shared path-list;
-     */
-    FIB_TEST((2  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+9 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * A recursive prefix that has a 2 path  load-balance.
-     * It also shares a next-hop with other BGP prefixes and hence
-     * test the ref counting of RR sourced prefixes and 2 level LB.
-     */
-    const fib_prefix_t bgp_102 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 100.100.100.101/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x64646466),
-	},
-    };
-    fib_table_entry_path_add(fib_index,
-			     &bgp_102,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &pfx_1_1_1_1_s_32.fp_addr,
-			     ~0, // no index provided.
-			     fib_index, // same as route
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fib_table_entry_path_add(fib_index,
-			     &bgp_102,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &pfx_1_1_1_2_s_32.fp_addr,
-			     ~0, // no index provided.
-			     fib_index, // same as route's FIB
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &bgp_102);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "100.100.100.102/32 presnet");
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-
-    fei  = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_1_s_32);
-    dpo1 = fib_entry_contribute_ip_forwarding(fei);
-    fei  = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_2_s_32);
-    dpo2 = fib_entry_contribute_ip_forwarding(fei);
-
-    lb = load_balance_get(dpo->dpoi_index);
-    FIB_TEST((lb->lb_n_buckets == 2), "Recursive LB has %d bucket", lb->lb_n_buckets);
-    FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "First via 10.10.10.1");
-    FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo->dpoi_index, 1)),
-	     "Second via 10.10.10.1");
-
-    fib_table_entry_path_remove(fib_index,
-				&bgp_102,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&pfx_1_1_1_1_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    fib_table_entry_path_remove(fib_index,
-				&bgp_102,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&pfx_1_1_1_2_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &bgp_102);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "100.100.100.102/32 removed");
-
-    /*
-     * remove the remaining recursives
-     */
-    fib_table_entry_path_remove(fib_index,
-				&bgp_100_pfx,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&pfx_1_1_1_1_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    fib_table_entry_path_remove(fib_index,
-				&bgp_101_pfx,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&pfx_1_1_1_1_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_100_pfx) == 
-	      FIB_NODE_INDEX_INVALID),
-	     "100.100.100.100/32 removed");
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_101_pfx) == 
-	      FIB_NODE_INDEX_INVALID),
-	     "100.100.100.101/32 removed");
-
-    /*
-     * -2 entry (2*BGP, the RR source is also API sourced). -1 shared path-list;
-     */
-    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * Add a recursive route via a connected cover, using an adj-fib that does exist
-     */
-    fib_table_entry_path_add(fib_index,
-			     &bgp_200_pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_1,
-			     ~0, // no index provided.
-			     fib_index, // Same as route's FIB
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-
-    /*
-     * +1 entry. +1 shared path-list (recursive via 10.10.10.1)
-     */
-    FIB_TEST((2  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+8 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-
-    fei  = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32);
-    dpo1 = fib_entry_contribute_ip_forwarding(fei);
-
-    FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "200.200.200.200/32 is recursive via adj for 10.10.10.1");
-
-    FIB_TEST((FIB_ENTRY_FLAG_ATTACHED  == fib_entry_get_flags(fei)),
-	     "Flags set on RR via existing attached");
-
-    /*
-     * Add a recursive route via a connected cover, using and adj-fib that does
-     * not exist
-     */
-    ip46_address_t nh_10_10_10_3 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a03),
-    };
-    fib_prefix_t pfx_10_10_10_3 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = nh_10_10_10_3,
-    };
-
-    fib_table_entry_path_add(fib_index,
-			     &bgp_201_pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_3,
-			     ~0, // no index provided.
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-
-    /*
-     * +2 entries (BGP and RR). +1 shared path-list (recursive via 10.10.10.3) and
-     * one unshared non-recursive via 10.10.10.3
-     */
-    FIB_TEST((3  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NBR+10 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    ai_03 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-				VNET_LINK_IP4,
-				&nh_10_10_10_3,
-				tm->hw[0]->sw_if_index);
-
-    fei  = fib_table_lookup_exact_match(fib_index, &bgp_201_pfx);
-    dpo  = fib_entry_contribute_ip_forwarding(fei);
-    fei  = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_3);
-    dpo1 = fib_entry_contribute_ip_forwarding(fei);
-
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai == ai_03), "adj for 10.10.10.3/32 is via adj for 10.10.10.3");
-    FIB_TEST(((FIB_ENTRY_FLAG_ATTACHED | FIB_ENTRY_FLAG_CONNECTED) ==
-	      fib_entry_get_flags(fei)),
-	     "Flags set on RR via non-existing attached");
-
-    FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "adj for 200.200.200.200/32 is recursive via adj for 10.10.10.3");
-
-    adj_unlock(ai_03);
-
-    /*
-     * remove the recursives
-     */
-    fib_table_entry_path_remove(fib_index,
-    				&bgp_200_pfx,
-    				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-    				&nh_10_10_10_1,
-    				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    fib_table_entry_path_remove(fib_index,
-    				&bgp_201_pfx,
-    				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-    				&nh_10_10_10_3,
-    				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_201_pfx) ==
-    	      FIB_NODE_INDEX_INVALID),
-    	     "200.200.200.201/32 removed");
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_200_pfx) ==
-    	      FIB_NODE_INDEX_INVALID),
-    	     "200.200.200.200/32 removed");
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_3) ==
-    	      FIB_NODE_INDEX_INVALID),
-    	     "10.10.10.3/32 removed");
-
-    /*
-     * -3 entries (2*BGP and RR). -2 shared path-list (recursive via 10.10.10.3 &
-     *  10.10.10.1) and one unshared non-recursive via 10.10.10.3
-     */
-    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
-    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
-    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
-
-
-    /*
-     * RECURSION LOOPS
-     *  Add 5.5.5.5/32 -> 5.5.5.6/32 -> 5.5.5.7/32 -> 5.5.5.5/32
-     */
-    fib_prefix_t pfx_5_5_5_5_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x05050505),
-	},
-    };
-    fib_prefix_t pfx_5_5_5_6_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x05050506),
-	},
-    };
-    fib_prefix_t pfx_5_5_5_7_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x05050507),
-	},
-    };
-
-    fib_table_entry_path_add(fib_index,
-			     &pfx_5_5_5_5_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &pfx_5_5_5_6_s_32.fp_addr,
-			     ~0, // no index provided.
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fib_table_entry_path_add(fib_index,
-			     &pfx_5_5_5_6_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &pfx_5_5_5_7_s_32.fp_addr,
-			     ~0, // no index provided.
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fib_table_entry_path_add(fib_index,
-			     &pfx_5_5_5_7_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &pfx_5_5_5_5_s_32.fp_addr,
-			     ~0, // no index provided.
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    /*
-     * +3 entries, +3 shared path-list
-     */
-    FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
-    FIB_TEST((NBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
-    FIB_TEST((NBR+10 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
-
-    /*
-     * All the entries have only looped paths, so they are all drop
-     */
-    fei = fib_table_lookup(fib_index, &pfx_5_5_5_7_s_32);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.7/32 is via adj for DROP");
-    fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.5/32 is via adj for DROP");
-    fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.6/32 is via adj for DROP");
-
-    /*
-     * provide 5.5.5.6/32 with alternate path.
-     * this will allow only 5.5.5.6/32 to forward with this path, the others
-     * are still drop since the loop is still present.
-     */
-    fib_table_entry_path_add(fib_index,
-			     &pfx_5_5_5_6_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-
-
-    fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
-    dpo1 = fib_entry_contribute_ip_forwarding(fei);
-
-    lb = load_balance_get(dpo1->dpoi_index);
-    FIB_TEST((lb->lb_n_buckets == 1), "5.5.5.6 LB has %d bucket", lb->lb_n_buckets);
-
-    dpo2 = load_balance_get_bucket(dpo1->dpoi_index, 0);
-    FIB_TEST(DPO_ADJACENCY == dpo2->dpoi_type, "type is %d", dpo2->dpoi_type);
-    FIB_TEST((ai_01 == dpo2->dpoi_index),
-	     "5.5.5.6 bucket 0 resolves via 10.10.10.2");
-
-    fei = fib_table_lookup(fib_index, &pfx_5_5_5_7_s_32);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.7/32 is via adj for DROP");
-    fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.5/32 is via adj for DROP");
-
-    /*
-     * remove the alternate path for 5.5.5.6/32
-     * back to all drop
-     */
-    fib_table_entry_path_remove(fib_index,
-				&pfx_5_5_5_6_s_32,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_5_5_5_7_s_32);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.7/32 is via adj for DROP");
-    fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.5/32 is via adj for DROP");
-    fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.6/32 is via adj for DROP");
-
-    /*
-     * break the loop by giving 5.5.5.5/32 a new set of paths
-     * expect all to forward via this new path.
-     */
-    fib_table_entry_update_one_path(fib_index,
-				    &pfx_5_5_5_5_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    FIB_PROTOCOL_IP4,
-				    &nh_10_10_10_1,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
-    dpo1 = fib_entry_contribute_ip_forwarding(fei);
-    lb = load_balance_get(dpo1->dpoi_index);
-    FIB_TEST((lb->lb_n_buckets == 1), "5.5.5.5 LB has %d bucket", lb->lb_n_buckets);
-
-    dpo2 = load_balance_get_bucket(dpo1->dpoi_index, 0);
-    FIB_TEST(DPO_ADJACENCY == dpo2->dpoi_type, "type is %d", dpo2->dpoi_type);
-    FIB_TEST((ai_01 == dpo2->dpoi_index),
-	     "5.5.5.5 bucket 0 resolves via 10.10.10.2");
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_5_5_5_7_s_32);
-    dpo2 = fib_entry_contribute_ip_forwarding(fei);
-
-    lb = load_balance_get(dpo2->dpoi_index);
-    FIB_TEST((lb->lb_n_buckets == 1), "Recursive LB has %d bucket", lb->lb_n_buckets);
-    FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo2->dpoi_index, 0)),
-	     "5.5.5.5.7 via 5.5.5.5");
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_5_5_5_6_s_32);
-    dpo1 = fib_entry_contribute_ip_forwarding(fei);
-
-    lb = load_balance_get(dpo1->dpoi_index);
-    FIB_TEST((lb->lb_n_buckets == 1), "Recursive LB has %d bucket", lb->lb_n_buckets);
-    FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo1->dpoi_index, 0)),
-	     "5.5.5.5.6 via 5.5.5.7");
-
-    /*
-     * revert back to the loop. so we can remove the prefixes with
-     * the loop intact
-     */
-    fib_table_entry_update_one_path(fib_index,
-				    &pfx_5_5_5_5_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    FIB_PROTOCOL_IP4,
-				    &pfx_5_5_5_6_s_32.fp_addr,
-				    ~0, // no index provided.
-				    fib_index,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_5_5_5_7_s_32);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.7/32 is via adj for DROP");
-    fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.5/32 is via adj for DROP");
-    fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.6/32 is via adj for DROP");
-
-    /*
-     * remove all the 5.5.5.x/32 prefixes
-     */
-    fib_table_entry_path_remove(fib_index,
-				&pfx_5_5_5_5_s_32,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&pfx_5_5_5_6_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    fib_table_entry_path_remove(fib_index,
-				&pfx_5_5_5_6_s_32,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&pfx_5_5_5_7_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    fib_table_entry_path_remove(fib_index,
-				&pfx_5_5_5_7_s_32,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&pfx_5_5_5_5_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    fib_table_entry_path_remove(fib_index,
-				&pfx_5_5_5_6_s_32,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_10_10_10_2,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-
-    /*
-     * -3 entries, -3 shared path-list
-     */
-    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
-    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
-    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
-
-    /*
-     * Single level loop 5.5.5.5/32 via 5.5.5.5/32
-     */
-    fib_table_entry_path_add(fib_index,
-			     &pfx_5_5_5_6_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &pfx_5_5_5_6_s_32.fp_addr,
-			     ~0, // no index provided.
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "1-level 5.5.5.6/32 loop is via adj for DROP");
- 
-    fib_table_entry_path_remove(fib_index,
-				&pfx_5_5_5_6_s_32,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&pfx_5_5_5_6_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_5_5_5_6_s_32),
-	     "1-level 5.5.5.6/32 loop is removed");
-
-    /*
-     * A recursive route whose next-hop is covered by the prefix.
-     * This would mean the via-fib, which inherits forwarding from its
-     * cover, thus picks up forwarding from the prfix, which is via the
-     * via-fib, and we have a loop.
-     */
-    fib_prefix_t pfx_23_23_23_0_s_24 = {
-	.fp_len = 24,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x17171700),
-	},
-    };
-    fib_prefix_t pfx_23_23_23_23_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-            .ip4.as_u32 = clib_host_to_net_u32(0x17171717),
-        },
-    };
-    fei = fib_table_entry_path_add(fib_index,
-				   &pfx_23_23_23_0_s_24,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   FIB_PROTOCOL_IP4,
-				   &pfx_23_23_23_23_s_32.fp_addr,
-				   ~0, // recursive
-				   fib_index,
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(load_balance_is_drop(dpo),
-	     "23.23.23.0/24 via covered is DROP");
-    fib_table_entry_delete_index(fei, FIB_SOURCE_API);
-
-    /*
-     * add-remove test. no change.
-     */
-    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
-    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
-    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
-
-    /*
-     * A recursive route with recursion constraints.
-     *  200.200.200.200/32 via 1.1.1.1 is recurse via host constrained
-     */
-    fib_table_entry_path_add(fib_index,
-			     &bgp_200_pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_1_1_1_1,
-			     ~0,
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_1_s_32);
-    dpo2 = fib_entry_contribute_ip_forwarding(fei);
-
-    fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
-    dpo1 = fib_entry_contribute_ip_forwarding(fei);
-
-    FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo1->dpoi_index, 0)),
-	     "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.1");
-
-    /*
-     * save the load-balance. we expect it to be inplace modified
-     */
-    lb = load_balance_get(dpo1->dpoi_index);
-
-    /*
-     * add a covering prefix for the via fib that would otherwise serve
-     * as the resolving route when the host is removed
-     */
-    fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_0_s_28,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_28);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai == ai_01),
-	     "adj for 1.1.1.0/28 is via adj for 1.1.1.1");
-
-    /*
-     * remove the host via FIB - expect the BGP prefix to be drop
-     */
-    fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_1_s_32,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0, // invalid fib index
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo1->dpoi_index, 0)),
-	     "adj for 200.200.200.200/32 is recursive via adj for DROP");
-
-    /*
-     * add the via-entry host reoute back. expect to resolve again
-     */
-    fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_1_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo1->dpoi_index, 0)),
-	     "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.1");
-
-    /*
-     * add another path for the recursive. it will then have 2.
-     */
-    fib_prefix_t pfx_1_1_1_3_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010103),
-	},
-    };
-    fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_3_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_2,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-
-    fib_table_entry_path_add(fib_index,
-			     &bgp_200_pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &pfx_1_1_1_3_s_32.fp_addr,
-			     ~0,
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
-
-    fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_1_s_32);
-    dpo2 = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.1");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_3_s_32);
-    dpo1 = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo->dpoi_index, 1)),
-	     "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.3");
-
-    /*
-     * expect the lb-map used by the recursive's load-balance is using both buckets
-     */
-    load_balance_map_t *lbm;
-    index_t lbmi;
-
-    lb = load_balance_get(dpo->dpoi_index);
-    lbmi = lb->lb_map;
-    load_balance_map_lock(lbmi);
-    lbm = load_balance_map_get(lbmi);
-
-    FIB_TEST(lbm->lbm_buckets[0] == 0,
-             "LB maps's bucket 0 is %d",
-             lbm->lbm_buckets[0]);
-    FIB_TEST(lbm->lbm_buckets[1] == 1,
-             "LB maps's bucket 1 is %d",
-             lbm->lbm_buckets[1]);
-
-    /*
-     * withdraw one of the /32 via-entrys.
-     * that ECMP path will be unresolved and forwarding should continue on the
-     * other available path. this is an iBGP PIC edge failover.
-     * Test the forwarding changes without re-fetching the adj from the
-     * recursive entry. this ensures its the same one that is updated; i.e. an
-     * inplace-modify.
-     */
-    fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_1_s_32,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0, // invalid fib index
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
-    FIB_TEST(!dpo_cmp(dpo, fib_entry_contribute_ip_forwarding(fei)),
-	     "post PIC 200.200.200.200/32 was inplace modified");
-
-    FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket_i(lb, 0)),
-	     "post PIC adj for 200.200.200.200/32 is recursive"
-	     " via adj for 1.1.1.3");
-
-    /*
-     * the LB maps that was locked above should have been modified to remove
-     * the path that was down, and thus its bucket points to a path that is
-     * still up.
-     */
-    FIB_TEST(lbm->lbm_buckets[0] == 1,
-             "LB maps's bucket 0 is %d",
-             lbm->lbm_buckets[0]);
-    FIB_TEST(lbm->lbm_buckets[1] == 1,
-             "LB maps's bucket 1 is %d",
-             lbm->lbm_buckets[1]);
-
-    load_balance_map_unlock(lb->lb_map);
-
-    /*
-     * add it back. again 
-     */
-    fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_1_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket_i(lb, 0)),
-	     "post PIC recovery adj for 200.200.200.200/32 is recursive "
-	     "via adj for 1.1.1.1");
-    FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket_i(lb, 1)),
-	     "post PIC recovery adj for 200.200.200.200/32 is recursive "
-	     "via adj for 1.1.1.3");
-
-    fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(lb == load_balance_get(dpo->dpoi_index),
-	     "post PIC 200.200.200.200/32 was inplace modified");
-
-    /*
-     * add a 3rd path. this makes the LB 16 buckets. 
-     */
-    fib_table_entry_path_add(fib_index,
-			     &bgp_200_pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &pfx_1_1_1_2_s_32.fp_addr,
-			     ~0,
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
-
-    fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(lb == load_balance_get(dpo->dpoi_index),
-	     "200.200.200.200/32 was inplace modified for 3rd path");
-    FIB_TEST(16 == lb->lb_n_buckets,
-	     "200.200.200.200/32 was inplace modified for 3rd path to 16 buckets");
-
-    lbmi = lb->lb_map;
-    load_balance_map_lock(lbmi);
-    lbm = load_balance_map_get(lbmi);
-
-    for (ii = 0; ii < 16; ii++)
-    {
-        FIB_TEST(lbm->lbm_buckets[ii] == ii,
-                 "LB Map for 200.200.200.200/32 at %d is %d",
-                 ii, lbm->lbm_buckets[ii]);
-    }
-
-    /*
-     * trigger PIC by removing the first via-entry
-     * the first 6 buckets of the map should map to the next 6
-     */
-    fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_1_s_32,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(lb == load_balance_get(dpo->dpoi_index),
-	     "200.200.200.200/32 was inplace modified for 3rd path");
-    FIB_TEST(2 == lb->lb_n_buckets,
-	     "200.200.200.200/32 was inplace modified for 3rd path remove to 2 buckets");
-
-    for (ii = 0; ii < 6; ii++)
-    {
-        FIB_TEST(lbm->lbm_buckets[ii] == ii+6,
-                 "LB Map for 200.200.200.200/32 at %d is %d",
-                 ii, lbm->lbm_buckets[ii]);
-    }
-    for (ii = 6; ii < 16; ii++)
-    {
-        FIB_TEST(lbm->lbm_buckets[ii] == ii,
-                 "LB Map for 200.200.200.200/32 at %d is %d",
-                 ii, lbm->lbm_buckets[ii]);
-    }
-
-
-    /*
-     * tidy up
-     */
-    fib_table_entry_path_add(fib_index,
-                             &pfx_1_1_1_1_s_32,
-                             FIB_SOURCE_API,
-                             FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-                             &nh_10_10_10_1,
-                             tm->hw[0]->sw_if_index,
-                             ~0,
-                             1,
-                             NULL,
-                             FIB_ROUTE_PATH_FLAG_NONE);
-
-    fib_table_entry_path_remove(fib_index,
-                                &bgp_200_pfx,
-                                FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-                                &pfx_1_1_1_2_s_32.fp_addr,
-                                ~0,
-                                fib_index,
-                                1,
-                                MPLS_LABEL_INVALID);
-    fib_table_entry_path_remove(fib_index,
-				&bgp_200_pfx,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_1_1_1_1,
-				~0,
-				fib_index,
-				1,
-				FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
-    fib_table_entry_path_remove(fib_index,
-				&bgp_200_pfx,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&pfx_1_1_1_3_s_32.fp_addr,
-				~0,
-				fib_index,
-				1,
-				FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
-    fib_table_entry_delete(fib_index,
-			   &pfx_1_1_1_3_s_32,
-			   FIB_SOURCE_API);
-    fib_table_entry_delete(fib_index,
-			   &pfx_1_1_1_0_s_28,
-			   FIB_SOURCE_API);
-    FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_28)),
-	     "1.1.1.1/28 removed");
-    FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_3_s_32)),
-	     "1.1.1.3/32 removed");
-    FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &bgp_200_pfx)),
-	     "200.200.200.200/32 removed");
-
-    /*
-     * add-remove test. no change.
-     */
-    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
-    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
-    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
-
-    /*
-     * A route whose paths are built up iteratively and then removed
-     * all at once
-     */
-    fib_prefix_t pfx_4_4_4_4_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 4.4.4.4/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x04040404),
-	},
-    };
-
-    fib_table_entry_path_add(fib_index,
-			     &pfx_4_4_4_4_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fib_table_entry_path_add(fib_index,
-			     &pfx_4_4_4_4_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_2,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fib_table_entry_path_add(fib_index,
-			     &pfx_4_4_4_4_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_3,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST(FIB_NODE_INDEX_INVALID !=
-	     fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
-	     "4.4.4.4/32 present");
-
-    fib_table_entry_delete(fib_index,
-			   &pfx_4_4_4_4_s_32,
-			   FIB_SOURCE_API);
-    FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
-	     "4.4.4.4/32 removed");
-
-    /*
-     * add-remove test. no change.
-     */
-    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
-    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
-    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
-
-    /*
-     * A route with multiple paths at once
-     */
-    fib_route_path_t *r_paths = NULL;
-
-    for (ii = 0; ii < 4; ii++)
-    {
-	fib_route_path_t r_path = {
-	    .frp_proto = FIB_PROTOCOL_IP4,
-	    .frp_addr = {
-		.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02 + ii),
-	    },
-	    .frp_sw_if_index = tm->hw[0]->sw_if_index,
-	    .frp_weight = 1,
-	    .frp_fib_index = ~0,
-	};
-	vec_add1(r_paths, r_path);
-    }
-
-    fib_table_entry_update(fib_index,
-			   &pfx_4_4_4_4_s_32,
-			   FIB_SOURCE_API,
-			   FIB_ENTRY_FLAG_NONE,
-			   r_paths);
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "4.4.4.4/32 present");
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-
-    lb = load_balance_get(dpo->dpoi_index);
-    FIB_TEST((lb->lb_n_buckets == 4), "4.4.4.4/32 lb over %d paths", lb->lb_n_buckets);
-
-    fib_table_entry_delete(fib_index,
-			   &pfx_4_4_4_4_s_32,
-			   FIB_SOURCE_API);
-    FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
-	     "4.4.4.4/32 removed");
-    vec_free(r_paths);
-
-    /*
-     * add-remove test. no change.
-     */
-    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
-    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
-    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
-
-    /*
-     * A route deag route
-     */
-    fib_table_entry_path_add(fib_index,
-			     &pfx_4_4_4_4_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &zero_addr,
-			     ~0,
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "4.4.4.4/32 present");
-
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
-    lookup_dpo_t *lkd = lookup_dpo_get(dpo->dpoi_index);
-
-    FIB_TEST((fib_index == lkd->lkd_fib_index),
-	     "4.4.4.4/32 is deag in %d %U",
-             lkd->lkd_fib_index,
-             format_dpo_id, dpo, 0);
-
-    fib_table_entry_delete(fib_index,
-			   &pfx_4_4_4_4_s_32,
-			   FIB_SOURCE_API);
-    FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
-	     "4.4.4.4/32 removed");
-    vec_free(r_paths);
-
-    /*
-     * add-remove test. no change.
-     */
-    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
-    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
-    FIB_TEST((NBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
-
-    /*
-     * Duplicate paths:
-     *  add a recursive with duplicate paths. Expect the duplicate to be ignored.
-     */
-    fib_prefix_t pfx_34_1_1_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x22010101),
-	},
-    };
-    fib_prefix_t pfx_34_34_1_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x22220101),
-	},
-    };
-    fei = fib_table_entry_path_add(fib_index,
-                                   &pfx_34_1_1_1_s_32,
-                                   FIB_SOURCE_API,
-                                   FIB_ENTRY_FLAG_NONE,
-                                   FIB_PROTOCOL_IP4,
-                                   &pfx_34_34_1_1_s_32.fp_addr,
-                                   ~0,
-                                   fib_index,
-                                   1,
-                                   NULL,
-                                   FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_entry_path_add(fib_index,
-                                   &pfx_34_1_1_1_s_32,
-                                   FIB_SOURCE_API,
-                                   FIB_ENTRY_FLAG_NONE,
-                                   FIB_PROTOCOL_IP4,
-                                   &pfx_34_34_1_1_s_32.fp_addr,
-                                   ~0,
-                                   fib_index,
-                                   1,
-                                   NULL,
-                                   FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST_REC_FORW(&pfx_34_1_1_1_s_32, &pfx_34_34_1_1_s_32, 0);
-    fib_table_entry_delete_index(fei, FIB_SOURCE_API);
-
-    /*
-     * CLEANUP
-     *   remove: 1.1.1.2/32, 1.1.2.0/24 and 1.1.1.1/32
-     *           all of which are via 10.10.10.1, Itf1
-     */
-    fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_2_s_32,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_1_s_32,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_2_0_s_24,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_1_s_32),
-	     "1.1.1.1/32 removed");
-    FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_2_s_32),
-	     "1.1.1.2/32 removed");
-    FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_1_1_2_0_s_24),
-	     "1.1.2.0/24 removed");
-
-    /*
-     * -3 entries and -1 shared path-list
-     */
-    FIB_TEST((0  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
-    FIB_TEST((NBR+4 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
-    FIB_TEST((NBR+4 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
-
-    /*
-     * An attached-host route. Expect to link to the incomplete adj
-     */
-    fib_prefix_t pfx_4_1_1_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 4.1.1.1/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x04010101),
-	},
-    };
-    fib_table_entry_path_add(fib_index,
-			     &pfx_4_1_1_1_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &zero_addr,
-			     tm->hw[0]->sw_if_index,
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_4_1_1_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "4.1.1.1/32 present");
-    ai = fib_entry_get_adj(fei);
-
-    ai2 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-			      VNET_LINK_IP4,
-			      &pfx_4_1_1_1_s_32.fp_addr,
-			      tm->hw[0]->sw_if_index);
-    FIB_TEST((ai == ai2), "Attached-host link to incomplete ADJ");
-    adj_unlock(ai2);
-
-    /*
-     * +1 entry and +1 shared path-list
-     */
-    FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
-    FIB_TEST((NBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
-    FIB_TEST((NBR+5 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
-
-    fib_table_entry_delete(fib_index,
-			   &pfx_4_1_1_1_s_32,
-			   FIB_SOURCE_API);
-
-    FIB_TEST((0  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
-    FIB_TEST((NBR+4 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
-    FIB_TEST((NBR+4 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
-
-    /*
-     * add a v6 prefix via v4 next-hops
-     */
-    fib_prefix_t pfx_2001_s_64 = {
-	.fp_len = 64,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr = {
-	    .ip6.as_u64[0] = clib_host_to_net_u64(0x2001000000000000),
-	},
-    };
-    fei = fib_table_entry_path_add(0, //default v6 table
-				   &pfx_2001_s_64,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   FIB_PROTOCOL_IP4,
-				   &nh_10_10_10_1,
-				   tm->hw[0]->sw_if_index,
-				   fib_index,
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup_exact_match(0, &pfx_2001_s_64);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "2001::/64 present");
-    ai = fib_entry_get_adj(fei);
-    adj = adj_get(ai);
-    FIB_TEST((adj->lookup_next_index == IP_LOOKUP_NEXT_ARP),
-	     "2001::/64 via ARP-adj");
-    FIB_TEST((adj->ia_link == VNET_LINK_IP6),
-	     "2001::/64 is link type v6");
-    FIB_TEST((adj->ia_nh_proto == FIB_PROTOCOL_IP4),
-	     "2001::/64 ADJ-adj is NH proto v4");
-    fib_table_entry_delete(0, &pfx_2001_s_64, FIB_SOURCE_API);
-
-    /*
-     * add a uRPF exempt prefix:
-     *  test:
-     *   - it's forwarding is drop
-     *   - it's uRPF list is not empty
-     *   - the uRPF list for the default route (it's cover) is empty
-     */
-    fei = fib_table_entry_special_add(fib_index,
-				      &pfx_4_1_1_1_s_32,
-				      FIB_SOURCE_URPF_EXEMPT,
-				      FIB_ENTRY_FLAG_DROP,
-				      ADJ_INDEX_INVALID);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(load_balance_is_drop(dpo),
-	     "uRPF exempt 4.1.1.1/32 DROP");
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1, 0),
-	     "uRPF list for exempt prefix has itf index 0");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_0_0_0_0_s_0);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
-	     "uRPF list for 0.0.0.0/0 empty");
-
-    fib_table_entry_delete(fib_index, &pfx_4_1_1_1_s_32, FIB_SOURCE_URPF_EXEMPT);
-
-    /*
-     * CLEANUP
-     *    remove adj-fibs: 
-     */
-    fib_table_entry_delete(fib_index,
-			   &pfx_10_10_10_1_s_32,
-			   FIB_SOURCE_ADJ);
-    fib_table_entry_delete(fib_index,
-			   &pfx_10_10_10_2_s_32,
-			   FIB_SOURCE_ADJ);
-    FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32),
-	     "10.10.10.1/32 adj-fib removed");
-    FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_2_s_32),
-	     "10.10.10.2/32 adj-fib removed");
-
-    /*
-     * -2 entries and -2 non-shared path-list
-     */
-    FIB_TEST((0  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
-    FIB_TEST((NBR+2 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
-    FIB_TEST((NBR+2 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
-
-    /*
-     * unlock the adjacencies for which this test provided a rewrite.
-     * These are the last locks on these adjs. they should thus go away.
-     */
-    adj_unlock(ai_02);
-    adj_unlock(ai_01);
-    adj_unlock(ai_12_12_12_12);
-
-    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
-
-    /*
-     * CLEANUP
-     *   remove the interface prefixes
-     */
-    local_pfx.fp_len = 32;
-    fib_table_entry_special_remove(fib_index, &local_pfx,
-				   FIB_SOURCE_INTERFACE);
-    fei = fib_table_lookup(fib_index, &local_pfx);
-
-    FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &local_pfx),
-	     "10.10.10.10/32 adj-fib removed");
-
-    local_pfx.fp_len = 24;
-    fib_table_entry_delete(fib_index, &local_pfx,
-			   FIB_SOURCE_INTERFACE);
-
-    FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &local_pfx),
-	     "10.10.10.10/24 adj-fib removed");
-
-    /*
-     * -2 entries and -2 non-shared path-list
-     */
-    FIB_TEST((0  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
-    FIB_TEST((NBR == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
-    FIB_TEST((NBR == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
-
-    /*
-     * Last but not least, remove the VRF
-     */
-    FIB_TEST((0 == fib_table_get_num_entries(fib_index,
-                                             FIB_PROTOCOL_IP4,
-                                             FIB_SOURCE_API)),
-             "NO API Source'd prefixes");
-    FIB_TEST((0 == fib_table_get_num_entries(fib_index,
-                                             FIB_PROTOCOL_IP4,
-                                             FIB_SOURCE_RR)),
-             "NO RR Source'd prefixes");
-    FIB_TEST((0 == fib_table_get_num_entries(fib_index,
-                                             FIB_PROTOCOL_IP4,
-                                             FIB_SOURCE_INTERFACE)),
-             "NO INterface Source'd prefixes");
-
-    fib_table_unlock(fib_index, FIB_PROTOCOL_IP4);
-
-    FIB_TEST((0  == fib_path_list_db_size()), "path list DB population:%d",
-    	     fib_path_list_db_size());
-    FIB_TEST((NBR-5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
-    FIB_TEST((NBR-5 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
-    FIB_TEST((NBR-5 == pool_elts(fib_urpf_list_pool)), "uRPF pool size is %d",
-    	     pool_elts(fib_urpf_list_pool));
-
-    return 0;
-}
-
-static int
-fib_test_v6 (void)
-{
-    /*
-     * In the default table check for the presence and correct forwarding
-     * of the special entries
-     */
-    fib_node_index_t dfrt, fei, ai, locked_ai, ai_01, ai_02;
-    const dpo_id_t *dpo, *dpo_drop;
-    const ip_adjacency_t *adj;
-    const receive_dpo_t *rd;
-    test_main_t *tm;
-    u32 fib_index;
-    int ii;
-
-    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
-
-    /* via 2001:0:0:1::2 */
-    ip46_address_t nh_2001_2 = {
-	.ip6 = {
-	    .as_u64 = {
-		[0] = clib_host_to_net_u64(0x2001000000000001),
-		[1] = clib_host_to_net_u64(0x0000000000000002),
-	    },
-	},
-    };
-
-    tm = &test_main;
-
-    dpo_drop = drop_dpo_get(DPO_PROTO_IP6);
-
-    /* Find or create FIB table 11 */
-    fib_index = fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP6, 11);
-
-    for (ii = 0; ii < 4; ii++)
-    {
-	ip6_main.fib_index_by_sw_if_index[tm->hw[ii]->sw_if_index] = fib_index;
-    }
-
-    fib_prefix_t pfx_0_0 = {
-	.fp_len = 0,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr = {
-	    .ip6 = {
-		{0, 0},
-	    },
-	},
-    };
-
-    dfrt = fib_table_lookup(fib_index, &pfx_0_0);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != dfrt), "default route present");
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(dfrt)),
-	     "Default route is DROP");
-
-    dpo = fib_entry_contribute_ip_forwarding(dfrt);
-    FIB_TEST((dpo->dpoi_index == ip6_fib_table_fwding_lookup(
-		                     &ip6_main,
-				     1,
-				     &pfx_0_0.fp_addr.ip6)),
-	     "default-route; fwd and non-fwd tables match");
-
-    // FIXME - check specials.
-
-    /*
-     * At this stage there is one v4 FIB with 5 routes and two v6 FIBs
-     * each with 6 entries. All entries are special so no path-list sharing.
-     */
-#define NPS (5+6+6)
-    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
-    FIB_TEST((NPS == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NPS == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * add interface routes.
-     *  validate presence of /64 attached and /128 recieve.
-     *  test for the presence of the receive address in the glean and local adj
-     *
-     * receive on 2001:0:0:1::1/128
-     */
-    fib_prefix_t local_pfx = {
-	.fp_len = 64,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr = {
-	    .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x2001000000000001),
-		    [1] = clib_host_to_net_u64(0x0000000000000001),
-		},
-	    },
-	}
-    };
-
-    fib_table_entry_update_one_path(fib_index, &local_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_ATTACHED),
-				    FIB_PROTOCOL_IP6,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached interface route present");
-
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != ai), "attached interface route adj present");
-    adj = adj_get(ai);
-    FIB_TEST((IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index),
-	     "attached interface adj is glean");
-    FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
-				    &adj->sub_type.glean.receive_addr)),
-	      "attached interface adj is receive ok");
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST((dpo->dpoi_index == ip6_fib_table_fwding_lookup(
-		                     &ip6_main,
-				     1,
-				     &local_pfx.fp_addr.ip6)),
-	     "attached-route; fwd and non-fwd tables match");
-
-    local_pfx.fp_len = 128;
-    fib_table_entry_update_one_path(fib_index, &local_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_LOCAL),
-				    FIB_PROTOCOL_IP6,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &local_pfx);
-
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local interface route present");
-
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
-    FIB_TEST((DPO_RECEIVE == dpo->dpoi_type),
-	     "local interface adj is local");
-    rd = receive_dpo_get(dpo->dpoi_index);
-
-    FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
-				    &rd->rd_addr)),
-	      "local interface adj is receive ok");
-
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST((dpo->dpoi_index == ip6_fib_table_fwding_lookup(
-		                     &ip6_main,
-				     1,
-				     &local_pfx.fp_addr.ip6)),
-	     "local-route; fwd and non-fwd tables match");
-
-    /*
-     * +2 entries. +2 unshared path-lists
-     */
-    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
-    FIB_TEST((NPS+2 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NPS+2 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * Modify the default route to be via an adj not yet known.
-     * this sources the defalut route with the API source, which is
-     * a higher preference to the DEFAULT_ROUTE source
-     */
-    fib_table_entry_path_add(fib_index, &pfx_0_0,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP6,
-			     &nh_2001_2,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &pfx_0_0);
-
-    FIB_TEST((fei == dfrt), "default route same index");
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != ai), "default route adj present");
-    adj = adj_get(ai);
-    FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
-	     "adj is incomplete");
-    FIB_TEST((0 == ip46_address_cmp(&nh_2001_2, &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
-
-    /*
-     * find the adj in the shared db
-     */
-    locked_ai = adj_nbr_add_or_lock(FIB_PROTOCOL_IP6,
-				    VNET_LINK_IP6,
-				    &nh_2001_2,
-				    tm->hw[0]->sw_if_index);
-    FIB_TEST((locked_ai == ai), "ADJ NBR DB find");
-    adj_unlock(locked_ai);
-
-    /*
-     * no more entires. +1 shared path-list
-     */
-    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NPS+3 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NPS+2 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * remove the API source from the default route. We expected
-     * the route to remain, sourced by DEFAULT_ROUTE, and hence a DROP
-     */
-    fib_table_entry_path_remove(fib_index, &pfx_0_0,
-				FIB_SOURCE_API,	
-				FIB_PROTOCOL_IP6,
-				&nh_2001_2,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &pfx_0_0);
-
-    FIB_TEST((fei == dfrt), "default route same index");
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(dfrt)),
-	     "Default route is DROP");
-
-    /*
-     * no more entires. -1 shared path-list
-     */
-    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NPS+2 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NPS+2 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * Add an 2 ARP entry => a complete ADJ plus adj-fib.
-     */
-    fib_prefix_t pfx_2001_1_2_s_128 = {
-	.fp_len   = 128,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr  = {
-	    .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x2001000000000001),
-		    [1] = clib_host_to_net_u64(0x0000000000000002),
-		},
-	    },
-	}
-    };
-    fib_prefix_t pfx_2001_1_3_s_128 = {
-	.fp_len   = 128,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr  = {
-	    .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x2001000000000001),
-		    [1] = clib_host_to_net_u64(0x0000000000000003),
-		},
-	    },
-	}
-    };
-    u8 eth_addr[] = {
-	0xde, 0xde, 0xde, 0xba, 0xba, 0xba,
-    };
-
-    ai_01 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP6,
-				VNET_LINK_IP6,
-				&pfx_2001_1_2_s_128.fp_addr,
-				tm->hw[0]->sw_if_index);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != ai_01), "adj created");
-    adj = adj_get(ai_01);
-    FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
-	     "adj is incomplete");
-    FIB_TEST((0 == ip46_address_cmp(&pfx_2001_1_2_s_128.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
-
-    adj_nbr_update_rewrite(ai_01, ADJ_NBR_REWRITE_FLAG_COMPLETE,
-			   fib_test_build_rewrite(eth_addr));
-    FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
-	     "adj is complete");
-    FIB_TEST((0 == ip46_address_cmp(&pfx_2001_1_2_s_128.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
-
-    fib_table_entry_update_one_path(fib_index,
-				    &pfx_2001_1_2_s_128,
-				    FIB_SOURCE_ADJ,
-				    FIB_ENTRY_FLAG_ATTACHED,
-				    FIB_PROTOCOL_IP6,
-				    &pfx_2001_1_2_s_128.fp_addr,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_2001_1_2_s_128);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "ADJ-FIB resolves via adj");
-
-    eth_addr[5] = 0xb2;
-
-    ai_02 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP6,
-				VNET_LINK_IP6,
-				&pfx_2001_1_3_s_128.fp_addr,
-				tm->hw[0]->sw_if_index);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != ai_02), "adj created");
-    adj = adj_get(ai_02);
-    FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
-	     "adj is incomplete");
-    FIB_TEST((0 == ip46_address_cmp(&pfx_2001_1_3_s_128.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
-
-    adj_nbr_update_rewrite(ai_02, ADJ_NBR_REWRITE_FLAG_COMPLETE,
-			   fib_test_build_rewrite(eth_addr));
-    FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
-	     "adj is complete");
-    FIB_TEST((0 == ip46_address_cmp(&pfx_2001_1_3_s_128.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
-    FIB_TEST((ai_01 != ai_02), "ADJs are different");
-
-    fib_table_entry_update_one_path(fib_index,
-				    &pfx_2001_1_3_s_128,
-				    FIB_SOURCE_ADJ,
-				    FIB_ENTRY_FLAG_ATTACHED,
-				    FIB_PROTOCOL_IP6,
-				    &pfx_2001_1_3_s_128.fp_addr,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_2001_1_3_s_128);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_02 == ai), "ADJ-FIB resolves via adj");
-
-    /*
-     * +2 entries, +2 unshread path-lists.
-     */
-    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NPS+4 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NPS+4 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * Add a 2 routes via the first ADJ. ensure path-list sharing
-     */
-    fib_prefix_t pfx_2001_a_s_64 = {
-	.fp_len   = 64,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr  = {
-	    .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x200100000000000a),
-		    [1] = clib_host_to_net_u64(0x0000000000000000),
-		},
-	    },
-	}
-    };
-    fib_prefix_t pfx_2001_b_s_64 = {
-	.fp_len   = 64,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr  = {
-	    .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x200100000000000b),
-		    [1] = clib_host_to_net_u64(0x0000000000000000),
-		},
-	    },
-	}
-    };
-
-    fib_table_entry_path_add(fib_index,
-			     &pfx_2001_a_s_64,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP6,
-			     &nh_2001_2,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &pfx_2001_a_s_64);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "2001::a/64 resolves via 2001:0:0:1::1");
-    fib_table_entry_path_add(fib_index,
-			     &pfx_2001_b_s_64,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP6,
-			     &nh_2001_2,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &pfx_2001_b_s_64);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "2001::b/64 resolves via 2001:0:0:1::1");
-
-    /*
-     * +2 entries, +1 shared path-list.
-     */
-    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NPS+5 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NPS+6 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * add a v4 prefix via a v6 next-hop
-     */
-    fib_prefix_t pfx_1_1_1_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = 0x01010101,
-	},
-    };
-    fei = fib_table_entry_path_add(0, // default table
-				   &pfx_1_1_1_1_s_32,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   FIB_PROTOCOL_IP6,
-				   &nh_2001_2,
-				   tm->hw[0]->sw_if_index,
-				   ~0,
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST(fei == fib_table_lookup_exact_match(0, &pfx_1_1_1_1_s_32),
-	     "1.1.1.1/32 o v6 route present");
-    ai = fib_entry_get_adj(fei);
-    adj = adj_get(ai);
-    FIB_TEST((adj->lookup_next_index == IP_LOOKUP_NEXT_ARP),
-	     "1.1.1.1/32 via ARP-adj");
-    FIB_TEST((adj->ia_link == VNET_LINK_IP4),
-	     "1.1.1.1/32 ADJ-adj is link type v4");
-    FIB_TEST((adj->ia_nh_proto == FIB_PROTOCOL_IP6),
-	     "1.1.1.1/32 ADJ-adj is NH proto v6");
-    fib_table_entry_delete(0, &pfx_1_1_1_1_s_32, FIB_SOURCE_API);
-
-    /*
-     * An attached route
-     */
-    fib_prefix_t pfx_2001_c_s_64 = {
-	.fp_len   = 64,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr  = {
-	    .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x200100000000000c),
-		    [1] = clib_host_to_net_u64(0x0000000000000000),
-		},
-	    },
-	}
-    };
-    fib_table_entry_path_add(fib_index,
-			     &pfx_2001_c_s_64,
-			     FIB_SOURCE_CLI,
-			     FIB_ENTRY_FLAG_ATTACHED,
-			     FIB_PROTOCOL_IP6,
-			     NULL,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_c_s_64);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached route present");
-    ai = fib_entry_get_adj(fei);
-    adj = adj_get(ai);
-    FIB_TEST((adj->lookup_next_index == IP_LOOKUP_NEXT_GLEAN),
-	     "2001:0:0:c/64 attached resolves via glean");
-
-    fib_table_entry_path_remove(fib_index,
-				&pfx_2001_c_s_64,
-				FIB_SOURCE_CLI,
-				FIB_PROTOCOL_IP6,
-				NULL,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_c_s_64);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "attached route removed");
-
-    /*
-     * Shutdown the interface on which we have a connected and through
-     * which the routes are reachable.
-     * This will result in the connected, adj-fibs, and routes linking to drop
-     * The local/for-us prefix continues to receive.
-     */
-    clib_error_t * error;
-
-    error = vnet_sw_interface_set_flags(vnet_get_main(),
-					tm->hw[0]->sw_if_index,
-					~VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-    FIB_TEST((NULL == error), "Interface shutdown OK");
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001::b/64 resolves via drop");
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001::a/64 resolves via drop");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1::3/64 resolves via drop");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1::2/64 resolves via drop");
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1::1/128 not drop");
-    local_pfx.fp_len = 64;
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1/64 resolves via drop");
-
-    /*
-     * no change
-     */
-    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NPS+5 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NPS+6 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * shutdown one of the other interfaces, then add a connected.
-     * and swap one of the routes to it.
-     */
-    error = vnet_sw_interface_set_flags(vnet_get_main(),
-					tm->hw[1]->sw_if_index,
-					~VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-    FIB_TEST((NULL == error), "Interface 1 shutdown OK");
-
-    fib_prefix_t connected_pfx = {
-	.fp_len = 64,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr = {
-	    .ip6 = {
-		/* 2001:0:0:2::1/64 */
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x2001000000000002),
-		    [1] = clib_host_to_net_u64(0x0000000000000001),
-		},
-	    },
-	}
-    };
-    fib_table_entry_update_one_path(fib_index, &connected_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_ATTACHED),
-				    FIB_PROTOCOL_IP6,
-				    NULL,
-				    tm->hw[1]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &connected_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached interface route present");
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
-    FIB_TEST(!dpo_cmp(dpo, dpo_drop),
-             "2001:0:0:2/64 not resolves via drop");
-
-    connected_pfx.fp_len = 128;
-    fib_table_entry_update_one_path(fib_index, &connected_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_LOCAL),
-				    FIB_PROTOCOL_IP6,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup(fib_index, &connected_pfx);
-
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local interface route present");
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
-    FIB_TEST((DPO_RECEIVE == dpo->dpoi_type),
-	     "local interface adj is local");
-    rd = receive_dpo_get(dpo->dpoi_index);
-    FIB_TEST((0 == ip46_address_cmp(&connected_pfx.fp_addr,
-				    &rd->rd_addr)),
-	      "local interface adj is receive ok");
-
-    /*
-     * +2 entries, +2 unshared path-lists
-     */
-    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NPS+7 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NPS+8 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-
-    /*
-     * bring the interface back up. we expected the routes to return
-     * to normal forwarding.
-     */
-    error = vnet_sw_interface_set_flags(vnet_get_main(),
-					tm->hw[0]->sw_if_index,
-					VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-    FIB_TEST((NULL == error), "Interface bring-up OK");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "2001::a/64 resolves via 2001:0:0:1::1");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "2001::b/64 resolves via 2001:0:0:1::1");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_02 == ai), "ADJ-FIB resolves via adj");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "ADJ-FIB resolves via adj");
-    local_pfx.fp_len = 64;
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-    ai = fib_entry_get_adj(fei);
-    adj = adj_get(ai);
-    FIB_TEST((IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index),
-	     "attached interface adj is glean");
-
-    /*
-     * Same test as above, but this time the HW interface goes down
-     */
-    error = vnet_hw_interface_set_flags(vnet_get_main(),
-					tm->hw_if_indicies[0],
-					~VNET_HW_INTERFACE_FLAG_LINK_UP);
-    FIB_TEST((NULL == error), "Interface shutdown OK");
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001::b/64 resolves via drop");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001::a/64 resolves via drop");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1::3/128 resolves via drop");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1::2/128 resolves via drop");
-    local_pfx.fp_len = 128;
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1::1/128 not drop");
-    local_pfx.fp_len = 64;
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1/64 resolves via drop");
-
-    error = vnet_hw_interface_set_flags(vnet_get_main(),
-					tm->hw_if_indicies[0],
-					VNET_HW_INTERFACE_FLAG_LINK_UP);
-    FIB_TEST((NULL == error), "Interface bring-up OK");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "2001::a/64 resolves via 2001:0:0:1::1");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "2001::b/64 resolves via 2001:0:0:1::1");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_02 == ai), "ADJ-FIB resolves via adj");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128);
-    ai = fib_entry_get_adj(fei);
-    FIB_TEST((ai_01 == ai), "ADJ-FIB resolves via adj");
-    local_pfx.fp_len = 64;
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-    ai = fib_entry_get_adj(fei);
-    adj = adj_get(ai);
-    FIB_TEST((IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index),
-	     "attached interface adj is glean");
-
-    /*
-     * Delete the interface that the routes reolve through.
-     * Again no routes are removed. They all point to drop.
-     *
-     * This is considered an error case. The control plane should
-     * not remove interfaces through which routes resolve, but
-     * such things can happen. ALL affected routes will drop.
-     */
-    vnet_delete_hw_interface(vnet_get_main(), tm->hw_if_indicies[0]);
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-             "2001::b/64 resolves via drop");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-             "2001::b/64 resolves via drop");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-             "2001:0:0:1::3/64 resolves via drop");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-             "2001:0:0:1::2/64 resolves via drop");
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-             "2001:0:0:1::1/128 is drop");
-    local_pfx.fp_len = 64;
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-             "2001:0:0:1/64 resolves via drop");
-
-    /*
-     * no change
-     */
-    FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NPS+7 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NPS+8 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * Add the interface back. routes stay unresolved.
-     */
-    error = ethernet_register_interface(vnet_get_main(),
-					test_interface_device_class.index,
-					0 /* instance */,
-					hw_address,
-					&tm->hw_if_indicies[0],
-					/* flag change */ 0);
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-             "2001::b/64 resolves via drop");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-             "2001::b/64 resolves via drop");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-             "2001:0:0:1::3/64 resolves via drop");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-             "2001:0:0:1::2/64 resolves via drop");
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-             "2001:0:0:1::1/128 is drop");
-    local_pfx.fp_len = 64;
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-    FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-             "2001:0:0:1/64 resolves via drop");
-
-    /*
-     * CLEANUP ALL the routes
-     */
-    fib_table_entry_delete(fib_index,
-			   &pfx_2001_c_s_64,
-			   FIB_SOURCE_API);
-    fib_table_entry_delete(fib_index,
-			   &pfx_2001_a_s_64,
-			   FIB_SOURCE_API);
-    fib_table_entry_delete(fib_index,
-			   &pfx_2001_b_s_64,
-			   FIB_SOURCE_API);
-    fib_table_entry_delete(fib_index,
-			   &pfx_2001_1_3_s_128,
-			   FIB_SOURCE_ADJ);
-    fib_table_entry_delete(fib_index,
-			   &pfx_2001_1_2_s_128,
-			   FIB_SOURCE_ADJ);
-    local_pfx.fp_len = 64;
-    fib_table_entry_delete(fib_index, &local_pfx,
-			   FIB_SOURCE_INTERFACE);
-    local_pfx.fp_len = 128;
-    fib_table_entry_special_remove(fib_index, &local_pfx,
-				   FIB_SOURCE_INTERFACE);
-    connected_pfx.fp_len = 64;
-    fib_table_entry_delete(fib_index, &connected_pfx,
-			   FIB_SOURCE_INTERFACE);
-    connected_pfx.fp_len = 128;
-    fib_table_entry_special_remove(fib_index, &connected_pfx,
-				   FIB_SOURCE_INTERFACE);
-
-    FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64)),
-	     "2001::a/64 removed");
-    FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64)),
-	     "2001::b/64 removed");
-    FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128)),
-	     "2001:0:0:1::3/128 removed");
-    FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128)),
-	     "2001:0:0:1::3/128 removed");
-    local_pfx.fp_len = 64;
-    FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &local_pfx)),
-	     "2001:0:0:1/64 removed");
-    local_pfx.fp_len = 128;
-    FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &local_pfx)),
-	     "2001:0:0:1::1/128 removed");
-    connected_pfx.fp_len = 64;
-    FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &connected_pfx)),
-	     "2001:0:0:2/64 removed");
-    connected_pfx.fp_len = 128;
-    FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &connected_pfx)),
-	     "2001:0:0:2::1/128 removed");
-
-    /*
-     * -8 entries. -7 path-lists (1 was shared).
-     */
-    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NPS == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NPS == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    /*
-     * now remove the VRF
-     */
-    fib_table_unlock(fib_index, FIB_PROTOCOL_IP6);
-
-    FIB_TEST((0 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
-    FIB_TEST((NPS-6 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
-    FIB_TEST((NPS-6 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
-
-    adj_unlock(ai_02);
-    adj_unlock(ai_01);
-
-    /*
-     * return the interfaces to up state
-     */
-    error = vnet_sw_interface_set_flags(vnet_get_main(),
-					tm->hw[0]->sw_if_index,
-					VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-    error = vnet_sw_interface_set_flags(vnet_get_main(),
-					tm->hw[1]->sw_if_index,
-					VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-
-    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
-
-    return (0);
-}
-
-/*
- * Test Attached Exports
- */
-static int
-fib_test_ae (void)
-{
-    const dpo_id_t *dpo, *dpo_drop;
-    const u32 fib_index = 0;
-    fib_node_index_t fei;
-    test_main_t *tm;
-    ip4_main_t *im;
-
-    tm = &test_main;
-    im = &ip4_main;
-
-    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
-
-    /*
-     * add interface routes. We'll assume this works. It's more rigorously
-     * tested elsewhere.
-     */
-    fib_prefix_t local_pfx = {
-	.fp_len = 24,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4 = {
-		/* 10.10.10.10 */
-		.as_u32 = clib_host_to_net_u32(0x0a0a0a0a),
-	    },
-	},
-    };
-
-    vec_validate(im->fib_index_by_sw_if_index, tm->hw[0]->sw_if_index);
-    im->fib_index_by_sw_if_index[tm->hw[0]->sw_if_index] = fib_index;
-
-    dpo_drop = drop_dpo_get(DPO_PROTO_IP4);
-
-    fib_table_entry_update_one_path(fib_index, &local_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_ATTACHED),
-				    FIB_PROTOCOL_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
-	     "attached interface route present");
-
-    local_pfx.fp_len = 32;
-    fib_table_entry_update_one_path(fib_index, &local_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_LOCAL),
-				    FIB_PROTOCOL_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
-	     "local interface route present");
-
-    /*
-     * Add an 2 ARP entry => a complete ADJ plus adj-fib.
-     */
-    fib_prefix_t pfx_10_10_10_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 10.10.10.1 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
-	},
-    };
-    fib_node_index_t ai;
-
-    fib_table_entry_update_one_path(fib_index,
-				    &pfx_10_10_10_1_s_32,
-				    FIB_SOURCE_ADJ,
-				    FIB_ENTRY_FLAG_ATTACHED,
-				    FIB_PROTOCOL_IP4,
-				    &pfx_10_10_10_1_s_32.fp_addr,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 created");
-    ai = fib_entry_get_adj(fei);
-
-    /*
-     * create another FIB table into which routes will be imported
-     */
-    u32 import_fib_index1;
-
-    import_fib_index1 = fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP4, 11);
-
-    /*
-     * Add an attached route in the import FIB
-     */
-    local_pfx.fp_len = 24;
-    fib_table_entry_update_one_path(import_fib_index1,
-				    &local_pfx,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    FIB_PROTOCOL_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached export created");
-
-    /*
-     * check for the presence of the adj-fibs in the import table
-     */
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 imported");
-    FIB_TEST((ai == fib_entry_get_adj(fei)),
-	     "adj-fib1 Import uses same adj as export");
-
-    /*
-     * check for the presence of the local in the import table
-     */
-    local_pfx.fp_len = 32;
-    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local imported");
-
-    /*
-     * Add another adj-fin in the export table. Expect this
-     * to get magically exported;
-     */
-    fib_prefix_t pfx_10_10_10_2_s_32 = {
-    	.fp_len = 32,
-    	.fp_proto = FIB_PROTOCOL_IP4,
-    	.fp_addr = {
-    	    /* 10.10.10.2 */
-    	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02),
-    	},
-    };
-
-    fib_table_entry_update_one_path(fib_index,
-				    &pfx_10_10_10_2_s_32,
-				    FIB_SOURCE_ADJ,
-				    FIB_ENTRY_FLAG_ATTACHED,
-				    FIB_PROTOCOL_IP4,
-				    &pfx_10_10_10_2_s_32.fp_addr,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_2_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 present");
-    ai = fib_entry_get_adj(fei);
-
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 imported");
-    FIB_TEST((ai == fib_entry_get_adj(fei)),
-	     "Import uses same adj as export");
-    FIB_TEST((FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags(fei)),
-             "ADJ-fib2 imported flags %d",
-             fib_entry_get_flags(fei));
-
-    /*
-     * create a 2nd FIB table into which routes will be imported
-     */
-    u32 import_fib_index2;
-
-    import_fib_index2 = fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP4, 12);
-
-    /*
-     * Add an attached route in the import FIB
-     */
-    local_pfx.fp_len = 24;
-    fib_table_entry_update_one_path(import_fib_index2,
-				    &local_pfx,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    FIB_PROTOCOL_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached export created");
-
-    /*
-     * check for the presence of all the adj-fibs and local in the import table
-     */
-    fei = fib_table_lookup_exact_match(import_fib_index2, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 imported");
-    fei = fib_table_lookup_exact_match(import_fib_index2, &pfx_10_10_10_2_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 imported");
-    local_pfx.fp_len = 32;
-    fei = fib_table_lookup_exact_match(import_fib_index2, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local imported");
-
-    /*
-     * add a 3rd adj-fib. expect it to be exported to both tables.
-     */
-    fib_prefix_t pfx_10_10_10_3_s_32 = {
-    	.fp_len = 32,
-    	.fp_proto = FIB_PROTOCOL_IP4,
-    	.fp_addr = {
-    	    /* 10.10.10.3 */
-    	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a03),
-    	},
-    };
-
-    fib_table_entry_update_one_path(fib_index,
-				    &pfx_10_10_10_3_s_32,
-				    FIB_SOURCE_ADJ,
-				    FIB_ENTRY_FLAG_ATTACHED,
-				    FIB_PROTOCOL_IP4,
-				    &pfx_10_10_10_3_s_32.fp_addr,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_3_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib3 present");
-    ai = fib_entry_get_adj(fei);
-
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_3_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib3 imported to FIB1");
-    FIB_TEST((ai == fib_entry_get_adj(fei)),
-	     "Import uses same adj as export");
-    fei = fib_table_lookup_exact_match(import_fib_index2, &pfx_10_10_10_3_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib3 imported to FIB2");
-    FIB_TEST((ai == fib_entry_get_adj(fei)),
-	     "Import uses same adj as export");
-
-    /*
-     * remove the 3rd adj fib. we expect it to be removed from both FIBs
-     */
-    fib_table_entry_delete(fib_index,
-			   &pfx_10_10_10_3_s_32,
-			   FIB_SOURCE_ADJ);
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_3_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib3 remved");
-
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_3_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib3 removed from FIB1");
-
-    fei = fib_table_lookup_exact_match(import_fib_index2, &pfx_10_10_10_3_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib3 removed from FIB2");
-
-    /*
-     * remove the attached route from the 2nd FIB. expect the imported
-     * entires to be removed
-     */
-    local_pfx.fp_len = 24;
-    fib_table_entry_delete(import_fib_index2,
-			   &local_pfx,
-			   FIB_SOURCE_API);
-    fei = fib_table_lookup_exact_match(import_fib_index2, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "attached export removed");
-
-    fei = fib_table_lookup_exact_match(import_fib_index2, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib1 removed from FIB2");
-    fei = fib_table_lookup_exact_match(import_fib_index2, &pfx_10_10_10_2_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib2 removed from FIB2");
-    local_pfx.fp_len = 32;
-    fei = fib_table_lookup_exact_match(import_fib_index2, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "local removed from FIB2");
-
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 still in FIB1");
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 still in FIB1");
-    local_pfx.fp_len = 32;
-    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local still in FIB1");
-
-    /*
-     * modify the route in FIB1 so it is no longer attached. expect the imported
-     * entires to be removed
-     */
-    local_pfx.fp_len = 24;
-    fib_table_entry_update_one_path(import_fib_index1,
-				    &local_pfx,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    FIB_PROTOCOL_IP4,
-				    &pfx_10_10_10_2_s_32.fp_addr,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib1 removed from FIB1");
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib2 removed from FIB1");
-    local_pfx.fp_len = 32;
-    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "local removed from FIB1");
-
-    /*
-     * modify it back to attached. expect the adj-fibs back
-     */
-    local_pfx.fp_len = 24;
-    fib_table_entry_update_one_path(import_fib_index1,
-				    &local_pfx,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    FIB_PROTOCOL_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 imported in FIB1");
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 imported in FIB1");
-    local_pfx.fp_len = 32;
-    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local imported in FIB1");
-
-    /*
-     * add a covering attached next-hop for the interface address, so we have
-     * a valid adj to find when we check the forwarding tables
-     */
-    fib_prefix_t pfx_10_0_0_0_s_8 = {
-    	.fp_len = 8,
-    	.fp_proto = FIB_PROTOCOL_IP4,
-    	.fp_addr = {
-    	    /* 10.0.0.0 */
-    	    .ip4.as_u32 = clib_host_to_net_u32(0x0a000000),
-    	},
-    };
-
-    fei = fib_table_entry_update_one_path(fib_index,
-                                          &pfx_10_0_0_0_s_8,
-                                          FIB_SOURCE_API,
-                                          FIB_ENTRY_FLAG_NONE,
-					  FIB_PROTOCOL_IP4,
-                                          &pfx_10_10_10_3_s_32.fp_addr,
-                                          tm->hw[0]->sw_if_index,
-                                          ~0, // invalid fib index
-                                          1,
-                                          NULL,
-                                          FIB_ROUTE_PATH_FLAG_NONE);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-
-    /*
-     * remove the route in the export fib. expect the adj-fibs to be removed
-     */
-    local_pfx.fp_len = 24;
-    fib_table_entry_delete(fib_index,
-			   &local_pfx,
-			   FIB_SOURCE_INTERFACE);
-
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "Delete export: ADJ-fib1 removed from FIB1");
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib2 removed from FIB1");
-    local_pfx.fp_len = 32;
-    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "local removed from FIB1");
-
-    /*
-     * the adj-fibs in the export VRF are present in the FIB table,
-     * but not installed in forwarding, since they have no attached cover.
-     * Consequently a lookup in the MTRIE gives the adj for the covering
-     * route 10.0.0.0/8.
-     */
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 in export");
-
-    index_t lbi;
-    lbi = ip4_fib_forwarding_lookup(fib_index, &pfx_10_10_10_1_s_32.fp_addr.ip4);
-    FIB_TEST(lbi == dpo->dpoi_index,
-             "10.10.10.1 forwards on \n%U not \n%U",
-             format_load_balance, lbi, 0,
-             format_dpo_id, dpo, 0);
-    lbi = ip4_fib_forwarding_lookup(fib_index, &pfx_10_10_10_2_s_32.fp_addr.ip4);
-    FIB_TEST(lbi == dpo->dpoi_index,
-             "10.10.10.2 forwards on %U", format_dpo_id, dpo, 0);
-    lbi = ip4_fib_forwarding_lookup(fib_index, &pfx_10_10_10_3_s_32.fp_addr.ip4);
-    FIB_TEST(lbi == dpo->dpoi_index,
-             "10.10.10.3 forwards on %U", format_dpo_id, dpo, 0);
-
-    /*
-     * add the export prefix back, but not as attached.
-     * No adj-fibs in export nor import tables
-     */
-    local_pfx.fp_len = 24;
-    fei = fib_table_entry_update_one_path(fib_index,
-                                          &local_pfx,
-                                          FIB_SOURCE_API,
-                                          FIB_ENTRY_FLAG_NONE,
-					  FIB_PROTOCOL_IP4,
-                                          &pfx_10_10_10_1_s_32.fp_addr,
-                                          tm->hw[0]->sw_if_index,
-                                          ~0, // invalid fib index
-                                          1,
-                                          NULL,
-                                          FIB_ROUTE_PATH_FLAG_NONE);
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "non-attached in export: ADJ-fib1 in export");
-    lbi = ip4_fib_forwarding_lookup(fib_index, &pfx_10_10_10_1_s_32.fp_addr.ip4);
-    FIB_TEST(lbi == dpo->dpoi_index,
-             "10.10.10.1 forwards on %U", format_dpo_id, dpo, 0);
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 in export");
-    lbi = ip4_fib_forwarding_lookup(fib_index, &pfx_10_10_10_2_s_32.fp_addr.ip4);
-    FIB_TEST(lbi == dpo->dpoi_index,
-             "10.10.10.2 forwards on %U", format_dpo_id, dpo, 0);
-
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib1 removed from FIB1");
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib2 removed from FIB1");
-    local_pfx.fp_len = 32;
-    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "local removed from FIB1");
-
-    /*
-     * modify the export prefix so it is attached. expect all covereds to return
-     */
-    local_pfx.fp_len = 24;
-    fib_table_entry_update_one_path(fib_index,
-				    &local_pfx,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    FIB_PROTOCOL_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 reinstalled in export");
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "Adj-fib1 is not drop in export");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_2_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 reinstalled in export");
-    local_pfx.fp_len = 32;
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local reinstalled in export");
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached in export: ADJ-fib1 imported");
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "Adj-fib1 is not drop in export");
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 imported");
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 imported");
-    local_pfx.fp_len = 32;
-    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local imported");
-
-    /*
-     * modify the export prefix so connected. no change.
-     */
-    local_pfx.fp_len = 24;
-    fib_table_entry_update_one_path(fib_index, &local_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_ATTACHED),
-				    FIB_PROTOCOL_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 reinstalled in export");
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "Adj-fib1 is not drop in export");
-    fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_2_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 reinstalled in export");
-    local_pfx.fp_len = 32;
-    fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local reinstalled in export");
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached in export: ADJ-fib1 imported");
-    dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "Adj-fib1 is not drop in export");
-    fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 imported");
-    local_pfx.fp_len = 32;
-    fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local imported");
-
-    /*
-     * CLEANUP
-     */
-    fib_table_entry_delete(fib_index,
-                           &pfx_10_0_0_0_s_8,
-                           FIB_SOURCE_API);
-    fib_table_entry_delete(fib_index,
-			   &pfx_10_10_10_1_s_32,
-			   FIB_SOURCE_ADJ);
-    fib_table_entry_delete(fib_index,
-			   &pfx_10_10_10_2_s_32,
-			   FIB_SOURCE_ADJ);
-    local_pfx.fp_len = 32;
-    fib_table_entry_delete(fib_index,
-			   &local_pfx,
-			   FIB_SOURCE_INTERFACE);
-    local_pfx.fp_len = 24;
-    fib_table_entry_delete(fib_index,
-			   &local_pfx,
-			   FIB_SOURCE_API);
-    fib_table_entry_delete(fib_index,
-			   &local_pfx,
-			   FIB_SOURCE_INTERFACE);
-    local_pfx.fp_len = 24;
-    fib_table_entry_delete(import_fib_index1,
-			   &local_pfx,
-			   FIB_SOURCE_API);
-
-    fib_table_unlock(import_fib_index1, FIB_PROTOCOL_IP4);
-    fib_table_unlock(import_fib_index2, FIB_PROTOCOL_IP4);
-
-    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
-
-    return (0);
-}
-
-
-/*
- * Test the recursive route route handling for GRE tunnels
- */
-static int
-fib_test_label (void)
-{
-    fib_node_index_t fei, ai_mpls_10_10_10_1, ai_v4_10_10_11_1, ai_v4_10_10_11_2, ai_mpls_10_10_11_2, ai_mpls_10_10_11_1;
-    const u32 fib_index = 0;
-    test_main_t *tm;
-    ip4_main_t *im;
-    int lb_count, ii;
-
-    lb_count = pool_elts(load_balance_pool);
-    tm = &test_main;
-    im = &ip4_main;
-
-    /*
-     * add interface routes. We'll assume this works. It's more rigorously
-     * tested elsewhere.
-     */
-    fib_prefix_t local0_pfx = {
-	.fp_len = 24,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4 = {
-		/* 10.10.10.10 */
-		.as_u32 = clib_host_to_net_u32(0x0a0a0a0a),
-	    },
-	},
-    };
-
-    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
-
-    vec_validate(im->fib_index_by_sw_if_index, tm->hw[0]->sw_if_index);
-    im->fib_index_by_sw_if_index[tm->hw[0]->sw_if_index] = fib_index;
-
-    fib_table_entry_update_one_path(fib_index, &local0_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_ATTACHED),
-				    FIB_PROTOCOL_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &local0_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
-	     "attached interface route present");
-
-    local0_pfx.fp_len = 32;
-    fib_table_entry_update_one_path(fib_index, &local0_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_LOCAL),
-				    FIB_PROTOCOL_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &local0_pfx);
-
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
-	     "local interface route present");
-
-    fib_prefix_t local1_pfx = {
-	.fp_len = 24,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4 = {
-		/* 10.10.11.10 */
-		.as_u32 = clib_host_to_net_u32(0x0a0a0b0a),
-	    },
-	},
-    };
-
-    vec_validate(im->fib_index_by_sw_if_index, tm->hw[1]->sw_if_index);
-    im->fib_index_by_sw_if_index[tm->hw[1]->sw_if_index] = fib_index;
-
-    fib_table_entry_update_one_path(fib_index, &local1_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_ATTACHED),
-				    FIB_PROTOCOL_IP4,
-				    NULL,
-				    tm->hw[1]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &local1_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
-	     "attached interface route present");
-
-    local1_pfx.fp_len = 32;
-    fib_table_entry_update_one_path(fib_index, &local1_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_LOCAL),
-				    FIB_PROTOCOL_IP4,
-				    NULL,
-				    tm->hw[1]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-    fei = fib_table_lookup_exact_match(fib_index, &local1_pfx);
-
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
-	     "local interface route present");
-
-    ip46_address_t nh_10_10_10_1 = {
-	.ip4 = {
-	    .as_u32 = clib_host_to_net_u32(0x0a0a0a01),
-	},
-    };
-    ip46_address_t nh_10_10_11_1 = {
-	.ip4 = {
-	    .as_u32 = clib_host_to_net_u32(0x0a0a0b01),
-	},
-    };
-    ip46_address_t nh_10_10_11_2 = {
-	.ip4 = {
-	    .as_u32 = clib_host_to_net_u32(0x0a0a0b02),
-	},
-    };
-
-    ai_v4_10_10_11_1 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-                                           VNET_LINK_IP4,
-                                           &nh_10_10_11_1,
-                                           tm->hw[1]->sw_if_index);
-    ai_v4_10_10_11_2 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-                                           VNET_LINK_IP4,
-                                           &nh_10_10_11_2,
-                                           tm->hw[1]->sw_if_index);
-    ai_mpls_10_10_10_1 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-                                             VNET_LINK_MPLS,
-                                             &nh_10_10_10_1,
-                                             tm->hw[0]->sw_if_index);
-    ai_mpls_10_10_11_2 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-                                             VNET_LINK_MPLS,
-                                             &nh_10_10_11_2,
-                                             tm->hw[1]->sw_if_index);
-    ai_mpls_10_10_11_1 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-                                             VNET_LINK_MPLS,
-                                             &nh_10_10_11_1,
-                                             tm->hw[1]->sw_if_index);
-
-    /*
-     * Add an etry with one path with a real out-going label
-     */
-    fib_prefix_t pfx_1_1_1_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010101),
-	},
-    };
-    fib_test_lb_bucket_t l99_eos_o_10_10_10_1 = {
-	.type = FT_LB_LABEL_O_ADJ,
-	.label_o_adj = {
-	    .adj = ai_mpls_10_10_10_1,
-	    .label = 99,
-	    .eos = MPLS_EOS,
-	},
-    };
-    fib_test_lb_bucket_t l99_neos_o_10_10_10_1 = {
-	.type = FT_LB_LABEL_O_ADJ,
-	.label_o_adj = {
-	    .adj = ai_mpls_10_10_10_1,
-	    .label = 99,
-	    .eos = MPLS_NON_EOS,
-	},
-    };
-    mpls_label_t *l99 = NULL;
-    vec_add1(l99, 99);
-
-    fib_table_entry_update_one_path(fib_index,
-				    &pfx_1_1_1_1_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    FIB_PROTOCOL_IP4,
-				    &nh_10_10_10_1,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    l99,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "1.1.1.1/32 created");
-
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &l99_eos_o_10_10_10_1),
-	     "1.1.1.1/32 LB 1 bucket via label 99 over 10.10.10.1");
-
-    /*
-     * add a path with an implicit NULL label
-     */
-    fib_test_lb_bucket_t a_o_10_10_11_1 = {
-	.type = FT_LB_ADJ,
-	.adj = {
-	    .adj = ai_v4_10_10_11_1,
-	},
-    };
-    fib_test_lb_bucket_t a_mpls_o_10_10_11_1 = {
-	.type = FT_LB_ADJ,
-	.adj = {
-	    .adj = ai_mpls_10_10_11_1,
-	},
-    };
-    mpls_label_t *l_imp_null = NULL;
-    vec_add1(l_imp_null, MPLS_IETF_IMPLICIT_NULL_LABEL);
-
-    fei = fib_table_entry_path_add(fib_index,
-				   &pfx_1_1_1_1_s_32,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   FIB_PROTOCOL_IP4,
-				   &nh_10_10_11_1,
-				   tm->hw[1]->sw_if_index,
-				   ~0, // invalid fib index
-				   1,
-				   l_imp_null,
-				   FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     2,
-				     &l99_eos_o_10_10_10_1,
-				     &a_o_10_10_11_1),
-	     "1.1.1.1/32 LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj over 10.10.11.1");
-
-    /*
-     * assign the route a local label
-     */
-    fib_table_entry_local_label_add(fib_index,
-				    &pfx_1_1_1_1_s_32,
-				    24001);
-
-    fib_prefix_t pfx_24001_eos = {
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_label = 24001,
-	.fp_eos = MPLS_EOS,
-    };
-    fib_prefix_t pfx_24001_neos = {
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_label = 24001,
-	.fp_eos = MPLS_NON_EOS,
-    };
-
-    /*
-     * The EOS entry should link to both the paths,
-     *  and use an ip adj for the imp-null
-     * The NON-EOS entry should link to both the paths,
-     *  and use an mpls adj for the imp-null
-     */
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_eos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				     2,
-				     &l99_eos_o_10_10_10_1,
-				     &a_o_10_10_11_1),
-	     "24001/eos LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj over 10.10.11.1");
-
-
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_neos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     2,
-				     &l99_neos_o_10_10_10_1,
-				     &a_mpls_o_10_10_11_1),
-	     "24001/neos LB 1 bucket via: "
-	     "label 99 over 10.10.10.1 ",
-	     "mpls-adj via 10.10.11.1");
-
-    /*
-     * add an unlabelled path, this is excluded from the neos chains,
-     */
-    fib_test_lb_bucket_t adj_o_10_10_11_2 = {
-	.type = FT_LB_ADJ,
-	.adj = {
-	    .adj = ai_v4_10_10_11_2,
-	},
-    };
-
-    fei = fib_table_entry_path_add(fib_index,
-				   &pfx_1_1_1_1_s_32,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   FIB_PROTOCOL_IP4,
-				   &nh_10_10_11_2,
-				   tm->hw[1]->sw_if_index,
-				   ~0, // invalid fib index
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     16, // 3 choices spread over 16 buckets
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2),
-	     "1.1.1.1/32 LB 16 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj over 10.10.11.1",
-	     "adj over 10.10.11.2");
-
-    /*
-     * get and lock a reference to the non-eos of the via entry 1.1.1.1/32
-     */
-    dpo_id_t non_eos_1_1_1_1 = DPO_INVALID;
-    fib_entry_contribute_forwarding(fei,
-				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				    &non_eos_1_1_1_1);
-
-    /*
-     * n-eos has only the 2 labelled paths
-     */
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_neos);
-
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     2,
-				     &l99_neos_o_10_10_10_1,
-				     &a_mpls_o_10_10_11_1),
-	     "24001/neos LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj-mpls over 10.10.11.2");
-
-    /*
-     * A labelled recursive
-     */
-    fib_prefix_t pfx_2_2_2_2_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x02020202),
-	},
-    };
-    fib_test_lb_bucket_t l1600_eos_o_1_1_1_1 = {
-	.type = FT_LB_LABEL_O_LB,
-	.label_o_lb = {
-	    .lb = non_eos_1_1_1_1.dpoi_index,
-	    .label = 1600,
-	    .eos = MPLS_EOS,
-	},
-    };
-    mpls_label_t *l1600 = NULL;
-    vec_add1(l1600, 1600);
-
-    fib_table_entry_update_one_path(fib_index,
-				    &pfx_2_2_2_2_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    FIB_PROTOCOL_IP4,
-				    &pfx_1_1_1_1_s_32.fp_addr,
-				    ~0,
-				    fib_index,
-				    1,
-				    l1600,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_2_2_2_2_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &l1600_eos_o_1_1_1_1),
-	     "2.2.2.2.2/32 LB 1 buckets via: "
-	     "label 1600 over 1.1.1.1");
-
-    dpo_id_t dpo_44 = DPO_INVALID;
-    index_t urpfi;
-
-    fib_entry_contribute_forwarding(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, &dpo_44);
-    urpfi = load_balance_get_urpf(dpo_44.dpoi_index);
-
-    FIB_TEST(fib_urpf_check(urpfi, tm->hw[0]->sw_if_index),
-	     "uRPF check for 2.2.2.2/32 on %d OK",
-	     tm->hw[0]->sw_if_index);
-    FIB_TEST(fib_urpf_check(urpfi, tm->hw[1]->sw_if_index),
-	     "uRPF check for 2.2.2.2/32 on %d OK",
-	     tm->hw[1]->sw_if_index);
-    FIB_TEST(!fib_urpf_check(urpfi, 99),
-	     "uRPF check for 2.2.2.2/32 on 99 not-OK",
-	     99);
-
-    fib_entry_contribute_forwarding(fei, FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS, &dpo_44);
-    FIB_TEST(urpfi == load_balance_get_urpf(dpo_44.dpoi_index),
-	     "Shared uRPF on IP and non-EOS chain");
-
-    dpo_reset(&dpo_44);
-
-    /*
-     * we are holding a lock on the non-eos LB of the via-entry.
-     * do a PIC-core failover by shutting the link of the via-entry.
-     *
-     * shut down the link with the valid label
-     */
-    vnet_sw_interface_set_flags(vnet_get_main(),
-				tm->hw[0]->sw_if_index,
-				0);
-
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     2,
-				     &a_o_10_10_11_1,
-				     &adj_o_10_10_11_2),
-	     "1.1.1.1/32 LB 2 buckets via: "
-	     "adj over 10.10.11.1, ",
-	     "adj-v4 over 10.10.11.2");
-
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_eos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				     2,
-				     &a_o_10_10_11_1,
-				     &adj_o_10_10_11_2),
-	     "24001/eos LB 2 buckets via: "
-	     "adj over 10.10.11.1, ",
-	     "adj-v4 over 10.10.11.2");
-
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_neos);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     1,
-				     &a_mpls_o_10_10_11_1),
-	     "24001/neos LB 1 buckets via: "
-	     "adj-mpls over 10.10.11.2");
-
-    /*
-     * test that the pre-failover load-balance has been in-place
-     * modified
-     */
-    dpo_id_t current = DPO_INVALID;
-    fib_entry_contribute_forwarding(fei,
-				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				    &current);
-
-    FIB_TEST(!dpo_cmp(&non_eos_1_1_1_1,
-                      &current),
-	     "PIC-core LB inplace modified %U %U",
-             format_dpo_id, &non_eos_1_1_1_1, 0,
-             format_dpo_id, &current, 0);
-
-    dpo_reset(&non_eos_1_1_1_1);
-    dpo_reset(&current);
-
-    /*
-     * no-shut the link with the valid label
-     */
-    vnet_sw_interface_set_flags(vnet_get_main(),
-				tm->hw[0]->sw_if_index,
-				VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     16, // 3 choices spread over 16 buckets
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2),
-	     "1.1.1.1/32 LB 16 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj over 10.10.11.1",
-	     "adj-v4 over 10.10.11.2");
-
-
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_eos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				     16, // 3 choices spread over 16 buckets
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2),
-	     "24001/eos LB 16 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj over 10.10.11.1",
-	     "adj-v4 over 10.10.11.2");
-
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_neos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     2,
-				     &l99_neos_o_10_10_10_1,
-				     &a_mpls_o_10_10_11_1),
-	     "24001/neos LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj-mpls over 10.10.11.2");
-
-    /*
-     * remove the first path with the valid label
-     */
-    fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_1_s_32,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0, // invalid fib index
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     2,
-				     &a_o_10_10_11_1,
-				     &adj_o_10_10_11_2),
-	     "1.1.1.1/32 LB 2 buckets via: "
-	     "adj over 10.10.11.1",
-	     "adj-v4 over 10.10.11.2");
-
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_eos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				     2,
-				     &a_o_10_10_11_1,
-				     &adj_o_10_10_11_2),
-	     "24001/eos LB 2 buckets via: "
-	     "adj over 10.10.11.1",
-	     "adj-v4 over 10.10.11.2");
-
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_neos);
-
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     1,
-				     &a_mpls_o_10_10_11_1),
-	     "24001/neos LB 1 buckets via: "
-	     "adj-mpls over 10.10.11.2");
-
-    /*
-     * remove the other path with a valid label
-     */
-    fib_test_lb_bucket_t bucket_drop = {
-	.type = FT_LB_SPECIAL,
-	.special = {
-	    .adj = DPO_PROTO_IP4,
-	},
-    };
-
-    fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_1_s_32,
-				FIB_SOURCE_API,
-				FIB_PROTOCOL_IP4,
-				&nh_10_10_11_1,
-				tm->hw[1]->sw_if_index,
-				~0, // invalid fib index
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_11_2),
-	     "1.1.1.1/32 LB 1 buckets via: "
-	     "adj over 10.10.11.2");
-
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_eos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				     1,
-				     &adj_o_10_10_11_2),
-	     "24001/eos LB 1 buckets via: "
-	     "adj over 10.10.11.2");
-
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_neos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				      1,
-				      &bucket_drop),
-	     "24001/eos LB 1 buckets via: DROP");
-
-    /*
-     * add back the path with the valid label
-     */
-    l99 = NULL;
-    vec_add1(l99, 99);
-
-    fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_1_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     FIB_PROTOCOL_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     l99,
-			     FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     2,
-				     &l99_eos_o_10_10_10_1,
-				     &adj_o_10_10_11_2),
-	     "1.1.1.1/32 LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj over 10.10.11.2");
-
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_eos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				     2,
-				     &l99_eos_o_10_10_10_1,
-				     &adj_o_10_10_11_2),
-	     "24001/eos LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj over 10.10.11.2");
-
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_neos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     1,
-				     &l99_neos_o_10_10_10_1),
-	     "24001/neos LB 1 buckets via: "
-	     "label 99 over 10.10.10.1");
-
-    /*
-     * change the local label
-     */
-    fib_table_entry_local_label_add(fib_index,
-				    &pfx_1_1_1_1_s_32,
-				    25005);
-
-    fib_prefix_t pfx_25005_eos = {
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_label = 25005,
-	.fp_eos = MPLS_EOS,
-    };
-    fib_prefix_t pfx_25005_neos = {
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_label = 25005,
-	.fp_eos = MPLS_NON_EOS,
-    };
-
-    FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup(fib_index, &pfx_24001_eos)),
-	     "24001/eos removed after label change");
-    FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup(fib_index, &pfx_24001_neos)),
-	     "24001/eos removed after label change");
-
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_25005_eos);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				     2,
-				     &l99_eos_o_10_10_10_1,
-				     &adj_o_10_10_11_2),
-	     "25005/eos LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj over 10.10.11.2");
-
-    fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_25005_neos);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     1,
-				     &l99_neos_o_10_10_10_1),
-	     "25005/neos LB 1 buckets via: "
-	     "label 99 over 10.10.10.1");
-
-    /*
-     * remove the local label.
-     * the check that the MPLS entries are gone is done by the fact the
-     * MPLS table is no longer present.
-     */
-    fib_table_entry_local_label_remove(fib_index,
-				       &pfx_1_1_1_1_s_32,
-				       25005);
-
-    fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     2,
-				     &l99_eos_o_10_10_10_1,
-				     &adj_o_10_10_11_2),
-	     "24001/eos LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj over 10.10.11.2");
-
-    FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      mpls_fib_index_from_table_id(MPLS_FIB_DEFAULT_TABLE_ID)),
-	     "No more MPLS FIB entries => table removed");
-
-    /*
-     * add another via-entry for the recursive
-     */
-    fib_prefix_t pfx_1_1_1_2_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010102),
-	},
-    };
-    fib_test_lb_bucket_t l101_eos_o_10_10_10_1 = {
-	.type = FT_LB_LABEL_O_ADJ,
-	.label_o_adj = {
-	    .adj = ai_mpls_10_10_10_1,
-	    .label = 101,
-	    .eos = MPLS_EOS,
-	},
-    };
-    mpls_label_t *l101 = NULL;
-    vec_add1(l101, 101);
-
-    fei = fib_table_entry_update_one_path(fib_index,
-					  &pfx_1_1_1_2_s_32,
-					  FIB_SOURCE_API,
-					  FIB_ENTRY_FLAG_NONE,
-					  FIB_PROTOCOL_IP4,
-					  &nh_10_10_10_1,
-					  tm->hw[0]->sw_if_index,
-					  ~0, // invalid fib index
-					  1,
-					  l101,
-					  FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &l101_eos_o_10_10_10_1),
-	     "1.1.1.2/32 LB 1 buckets via: "
-	     "label 101 over 10.10.10.1");
-
-    dpo_id_t non_eos_1_1_1_2 = DPO_INVALID;
-    fib_entry_contribute_forwarding(fib_table_lookup(fib_index,
-						     &pfx_1_1_1_1_s_32),
-				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				    &non_eos_1_1_1_1);
-    fib_entry_contribute_forwarding(fib_table_lookup(fib_index,
-						     &pfx_1_1_1_2_s_32),
-				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				    &non_eos_1_1_1_2);
-
-    fib_test_lb_bucket_t l1601_eos_o_1_1_1_2 = {
-    	.type = FT_LB_LABEL_O_LB,
-    	.label_o_lb = {
-    	    .lb = non_eos_1_1_1_2.dpoi_index,
-    	    .label = 1601,
-    	    .eos = MPLS_EOS,
-    	},
-    };
-    mpls_label_t *l1601 = NULL;
-    vec_add1(l1601, 1601);
-
-    l1600_eos_o_1_1_1_1.label_o_lb.lb = non_eos_1_1_1_1.dpoi_index;
-
-    fei = fib_table_entry_path_add(fib_index,
-				   &pfx_2_2_2_2_s_32,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   FIB_PROTOCOL_IP4,
-				   &pfx_1_1_1_2_s_32.fp_addr,
-				   ~0,
-				   fib_index,
-				   1,
-				   l1601,
-				   FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     2,
-				     &l1600_eos_o_1_1_1_1,
-				     &l1601_eos_o_1_1_1_2),
-	     "2.2.2.2/32 LB 2 buckets via: "
-	     "label 1600 via 1.1,1.1, "
-	     "label 16001 via 1.1.1.2");
-
-    /*
-     * update the via-entry so it no longer has an imp-null path.
-     * the LB for the recursive can use an imp-null
-     */
-    l_imp_null = NULL;
-    vec_add1(l_imp_null, MPLS_IETF_IMPLICIT_NULL_LABEL);
-
-    fei = fib_table_entry_update_one_path(fib_index,
-					  &pfx_1_1_1_2_s_32,
-					  FIB_SOURCE_API,
-					  FIB_ENTRY_FLAG_NONE,
-					  FIB_PROTOCOL_IP4,
-					  &nh_10_10_11_1,
-					  tm->hw[1]->sw_if_index,
-					  ~0, // invalid fib index
-					  1,
-					  l_imp_null,
-					  FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &a_o_10_10_11_1),
-	     "1.1.1.2/32 LB 1 buckets via: "
-	     "adj 10.10.11.1");
- 
-    fei = fib_table_lookup(fib_index, &pfx_2_2_2_2_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     2,
-				     &l1600_eos_o_1_1_1_1,
-				     &l1601_eos_o_1_1_1_2),
-	     "2.2.2.2/32 LB 2 buckets via: "
-	     "label 1600 via 1.1,1.1, "
-	     "label 16001 via 1.1.1.2");
-
-    /*
-     * update the via-entry so it no longer has labelled paths.
-     * the LB for the recursive should exclue this via form its LB
-     */
-    fei = fib_table_entry_update_one_path(fib_index,
-					  &pfx_1_1_1_2_s_32,
-					  FIB_SOURCE_API,
-					  FIB_ENTRY_FLAG_NONE,
-					  FIB_PROTOCOL_IP4,
-					  &nh_10_10_11_1,
-					  tm->hw[1]->sw_if_index,
-					  ~0, // invalid fib index
-					  1,
-					  NULL,
-					  FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &a_o_10_10_11_1),
-	     "1.1.1.2/32 LB 1 buckets via: "
-	     "adj 10.10.11.1");
- 
-    fei = fib_table_lookup(fib_index, &pfx_2_2_2_2_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &l1600_eos_o_1_1_1_1),
-	     "2.2.2.2/32 LB 1 buckets via: "
-	     "label 1600 via 1.1,1.1");
-
-    dpo_reset(&non_eos_1_1_1_1);
-    dpo_reset(&non_eos_1_1_1_2);
-
-    /*
-     * Add a recursive with no out-labels. We expect to use the IP of the via
-     */
-    fib_prefix_t pfx_2_2_2_3_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x02020203),
-	},
-    };
-    dpo_id_t ip_1_1_1_1 = DPO_INVALID;
-
-    fib_table_entry_update_one_path(fib_index,
-				    &pfx_2_2_2_3_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    FIB_PROTOCOL_IP4,
-				    &pfx_1_1_1_1_s_32.fp_addr,
-				    ~0,
-				    fib_index,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-
-    fib_entry_contribute_forwarding(fib_table_lookup(fib_index,
-						     &pfx_1_1_1_1_s_32),
-				    FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				    &ip_1_1_1_1);
-
-    fib_test_lb_bucket_t ip_o_1_1_1_1 = {
-	.type = FT_LB_O_LB,
-	.lb = {
-	    .lb = ip_1_1_1_1.dpoi_index,
-	},
-    };
-
-    fei = fib_table_lookup(fib_index, &pfx_2_2_2_3_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &ip_o_1_1_1_1),
-	     "2.2.2.2.3/32 LB 1 buckets via: "
-	     "ip 1.1.1.1");
-
-    /*
-     * Add a recursive with an imp-null out-label. 
-     * We expect to use the IP of the via
-     */
-    fib_prefix_t pfx_2_2_2_4_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x02020204),
-	},
-    };
-
-    fib_table_entry_update_one_path(fib_index,
-				    &pfx_2_2_2_4_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    FIB_PROTOCOL_IP4,
-				    &pfx_1_1_1_1_s_32.fp_addr,
-				    ~0,
-				    fib_index,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
-
-    fei = fib_table_lookup(fib_index, &pfx_2_2_2_4_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &ip_o_1_1_1_1),
-	     "2.2.2.2.4/32 LB 1 buckets via: "
-	     "ip 1.1.1.1");
-
-    dpo_reset(&ip_1_1_1_1);
-
-    /*
-     * Create an entry with a deep label stack
-     */
-    fib_prefix_t pfx_2_2_5_5_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x02020505),
-	},
-    };
-    fib_test_lb_bucket_t ls_eos_o_10_10_10_1 = {
-	.type = FT_LB_LABEL_STACK_O_ADJ,
-	.label_stack_o_adj = {
-	    .adj = ai_mpls_10_10_11_1,
-	    .label_stack_size = 8,
-	    .label_stack = {
-		200, 201, 202, 203, 204, 205, 206, 207
-	    },
-	    .eos = MPLS_EOS,
-	},
-    };
-    mpls_label_t *label_stack = NULL;
-    vec_validate(label_stack, 7);
-    for (ii = 0; ii < 8; ii++)
-    {
-	label_stack[ii] = ii + 200;
-    }
-
-    fei = fib_table_entry_update_one_path(fib_index,
-					  &pfx_2_2_5_5_s_32,
-					  FIB_SOURCE_API,
-					  FIB_ENTRY_FLAG_NONE,
-					  FIB_PROTOCOL_IP4,
-					  &nh_10_10_11_1,
-					  tm->hw[1]->sw_if_index,
-					  ~0, // invalid fib index
-					  1,
-					  label_stack,
-					  FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &ls_eos_o_10_10_10_1),
-	     "2.2.5.5/32 LB 1 buckets via: "
-	     "adj 10.10.11.1");
-    fib_table_entry_delete_index(fei, FIB_SOURCE_API);
-
-    /*
-     * cleanup
-     */
-    fib_table_entry_delete(fib_index,
-			   &pfx_1_1_1_2_s_32,
-			   FIB_SOURCE_API);
-
-    fei = fib_table_lookup(fib_index, &pfx_2_2_2_2_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &l1600_eos_o_1_1_1_1),
-	     "2.2.2.2/32 LB 1 buckets via: "
-	     "label 1600 via 1.1,1.1");
-
-    fib_table_entry_delete(fib_index,
-			   &pfx_1_1_1_1_s_32,
-			   FIB_SOURCE_API);
-
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &bucket_drop),
-	     "2.2.2.2/32 LB 1 buckets via: DROP");
-
-    fib_table_entry_delete(fib_index,
-			   &pfx_2_2_2_2_s_32,
-			   FIB_SOURCE_API);
-    fib_table_entry_delete(fib_index,
-			   &pfx_2_2_2_3_s_32,
-			   FIB_SOURCE_API);
-    fib_table_entry_delete(fib_index,
-			   &pfx_2_2_2_4_s_32,
-			   FIB_SOURCE_API);
-
-    adj_unlock(ai_mpls_10_10_10_1);
-    adj_unlock(ai_mpls_10_10_11_2);
-    adj_unlock(ai_v4_10_10_11_1);
-    adj_unlock(ai_v4_10_10_11_2);
-    adj_unlock(ai_mpls_10_10_11_1);
-
-    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
-
-    local0_pfx.fp_len = 32;
-    fib_table_entry_delete(fib_index,
-			   &local0_pfx,
-			   FIB_SOURCE_INTERFACE);
-    local0_pfx.fp_len = 24;
-    fib_table_entry_delete(fib_index,
-			   &local0_pfx,
-			   FIB_SOURCE_INTERFACE);
-    local1_pfx.fp_len = 32;
-    fib_table_entry_delete(fib_index,
-			   &local1_pfx,
-			   FIB_SOURCE_INTERFACE);
-    local1_pfx.fp_len = 24;
-    fib_table_entry_delete(fib_index,
-			   &local1_pfx,
-			   FIB_SOURCE_INTERFACE);
-
-    /*
-     * +1 for the drop LB in the MPLS tables.
-     */
-    FIB_TEST(lb_count+1 == pool_elts(load_balance_pool),
-	     "Load-balance resources freed %d of %d",
-             lb_count+1, pool_elts(load_balance_pool));
-
-    return (0);
-}
-
-#define N_TEST_CHILDREN 4
-#define PARENT_INDEX 0
-
-typedef struct fib_node_test_t_
-{
-    fib_node_t node;
-    u32 sibling;
-    u32 index;
-    fib_node_back_walk_ctx_t *ctxs;
-    u32 destroyed;
-} fib_node_test_t;
-
-static fib_node_test_t fib_test_nodes[N_TEST_CHILDREN+1];
-
-#define PARENT() (&fib_test_nodes[PARENT_INDEX].node)
-
-#define FOR_EACH_TEST_CHILD(_tc)                     \
-    for (ii = 1, (_tc) = &fib_test_nodes[1];         \
-         ii < N_TEST_CHILDREN+1;                     \
-         ii++, (_tc) = &fib_test_nodes[ii])
-
-static fib_node_t *
-fib_test_child_get_node (fib_node_index_t index)
-{
-    return (&fib_test_nodes[index].node);
-}
-
-static int fib_test_walk_spawns_walks;
-
-static fib_node_back_walk_rc_t
-fib_test_child_back_walk_notify (fib_node_t *node,
-                                 fib_node_back_walk_ctx_t *ctx)
-{
-    fib_node_test_t *tc = (fib_node_test_t*) node;
-
-    vec_add1(tc->ctxs, *ctx);
-
-    if (1 == fib_test_walk_spawns_walks)
-        fib_walk_sync(FIB_NODE_TYPE_TEST, tc->index, ctx);
-    if (2 == fib_test_walk_spawns_walks)
-        fib_walk_async(FIB_NODE_TYPE_TEST, tc->index,
-                       FIB_WALK_PRIORITY_HIGH, ctx);
-
-    return (FIB_NODE_BACK_WALK_CONTINUE);
-}
-
-static void
-fib_test_child_last_lock_gone (fib_node_t *node)
-{
-    fib_node_test_t *tc = (fib_node_test_t *)node;
-
-    tc->destroyed = 1;
-}
-
-/**
- * The FIB walk's graph node virtual function table
- */
-static const fib_node_vft_t fib_test_child_vft = {
-    .fnv_get = fib_test_child_get_node,
-    .fnv_last_lock = fib_test_child_last_lock_gone,
-    .fnv_back_walk = fib_test_child_back_walk_notify,
-};
-
-/*
- * the function (that should have been static but isn't so I can do this)
- * that processes the walk from the async queue,
- */
-f64 fib_walk_process_queues(vlib_main_t * vm,
-                            const f64 quota);
-u32 fib_walk_queue_get_size(fib_walk_priority_t prio);
-
-static int
-fib_test_walk (void)
-{
-    fib_node_back_walk_ctx_t high_ctx = {}, low_ctx = {};
-    fib_node_test_t *tc;
-    vlib_main_t *vm;
-    u32 ii;
-
-    vm = vlib_get_main();
-    fib_node_register_type(FIB_NODE_TYPE_TEST, &fib_test_child_vft);
-
-    /*
-     * init a fake node on which we will add children
-     */
-    fib_node_init(&fib_test_nodes[PARENT_INDEX].node,
-                  FIB_NODE_TYPE_TEST);
-
-    FOR_EACH_TEST_CHILD(tc)
-    {
-        fib_node_init(&tc->node, FIB_NODE_TYPE_TEST);
-        fib_node_lock(&tc->node);
-        tc->ctxs = NULL;
-        tc->index = ii;
-        tc->sibling = fib_node_child_add(FIB_NODE_TYPE_TEST,
-                                         PARENT_INDEX,
-                                         FIB_NODE_TYPE_TEST, ii);
-    }
-
-    /*
-     * enqueue a walk across the parents children.
-     */
-    high_ctx.fnbw_reason = FIB_NODE_BW_REASON_FLAG_RESOLVE;
-
-    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
-                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
-    FIB_TEST(N_TEST_CHILDREN+1 == fib_node_list_get_size(PARENT()->fn_children),
-             "Parent has %d children pre-walk",
-             fib_node_list_get_size(PARENT()->fn_children));
-
-    /*
-     * give the walk a large amount of time so it gets to the end
-     */
-    fib_walk_process_queues(vm, 1);
-
-    FOR_EACH_TEST_CHILD(tc)
-    {
-        FIB_TEST(1 == vec_len(tc->ctxs),
-                 "%d child visitsed %d times",
-                 ii, vec_len(tc->ctxs));
-        vec_free(tc->ctxs);
-    }
-    FIB_TEST(0 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
-             "Queue is empty post walk");
-    FIB_TEST(N_TEST_CHILDREN == fib_node_list_get_size(PARENT()->fn_children),
-             "Parent has %d children post walk",
-             fib_node_list_get_size(PARENT()->fn_children));
-
-    /*
-     * walk again. should be no increase in the number of visits, since
-     * the walk will have terminated.
-     */
-    fib_walk_process_queues(vm, 1);
-
-    FOR_EACH_TEST_CHILD(tc)
-    {
-        FIB_TEST(0 == vec_len(tc->ctxs),
-                 "%d child visitsed %d times",
-                 ii, vec_len(tc->ctxs));
-    }
-
-    /*
-     * schedule a low and hig priority walk. expect the high to be performed
-     * before the low.
-     * schedule the high prio walk first so that it is further from the head
-     * of the dependency list. that way it won't merge with the low one.
-     */
-    high_ctx.fnbw_reason = FIB_NODE_BW_REASON_FLAG_RESOLVE;
-    low_ctx.fnbw_reason = FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE;
-
-    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
-                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
-    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
-                   FIB_WALK_PRIORITY_LOW, &low_ctx);
-
-    fib_walk_process_queues(vm, 1);
-
-    FOR_EACH_TEST_CHILD(tc)
-    {
-        FIB_TEST(high_ctx.fnbw_reason == tc->ctxs[0].fnbw_reason,
-                 "%d child visitsed by high prio walk", ii);
-        FIB_TEST(low_ctx.fnbw_reason  == tc->ctxs[1].fnbw_reason,
-                 "%d child visitsed by low prio walk", ii);
-        vec_free(tc->ctxs);
-    }
-    FIB_TEST(0 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
-             "Queue is empty post prio walk");
-    FIB_TEST(N_TEST_CHILDREN == fib_node_list_get_size(PARENT()->fn_children),
-             "Parent has %d children post prio walk",
-             fib_node_list_get_size(PARENT()->fn_children));
-
-    /*
-     * schedule 2 walks of the same priority that can be megred.
-     * expect that each child is thus visited only once.
-     */
-    high_ctx.fnbw_reason = FIB_NODE_BW_REASON_FLAG_RESOLVE;
-    low_ctx.fnbw_reason  = FIB_NODE_BW_REASON_FLAG_RESOLVE;
-
-    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
-                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
-    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
-                   FIB_WALK_PRIORITY_HIGH, &low_ctx);
-
-    fib_walk_process_queues(vm, 1);
-
-    FOR_EACH_TEST_CHILD(tc)
-    {
-        FIB_TEST(1 == vec_len(tc->ctxs),
-                 "%d child visitsed %d times during merge walk",
-                 ii, vec_len(tc->ctxs));
-        vec_free(tc->ctxs);
-    }
-    FIB_TEST(0 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
-             "Queue is empty post merge walk");
-    FIB_TEST(N_TEST_CHILDREN == fib_node_list_get_size(PARENT()->fn_children),
-             "Parent has %d children post merge walk",
-             fib_node_list_get_size(PARENT()->fn_children));
-
-    /*
-     * schedule 2 walks of the same priority that cannot be megred.
-     * expect that each child is thus visited twice and in the order
-     * in which the walks were scheduled.
-     */
-    high_ctx.fnbw_reason = FIB_NODE_BW_REASON_FLAG_RESOLVE;
-    low_ctx.fnbw_reason  = FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE;
-
-    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
-                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
-    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
-                   FIB_WALK_PRIORITY_HIGH, &low_ctx);
-
-    fib_walk_process_queues(vm, 1);
-
-    FOR_EACH_TEST_CHILD(tc)
-    {
-        FIB_TEST(high_ctx.fnbw_reason == tc->ctxs[0].fnbw_reason,
-                 "%d child visitsed by high prio walk", ii);
-        FIB_TEST(low_ctx.fnbw_reason  == tc->ctxs[1].fnbw_reason,
-                 "%d child visitsed by low prio walk", ii);
-        vec_free(tc->ctxs);
-    }
-    FIB_TEST(0 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
-             "Queue is empty post no-merge walk");
-    FIB_TEST(N_TEST_CHILDREN == fib_node_list_get_size(PARENT()->fn_children),
-             "Parent has %d children post no-merge walk",
-             fib_node_list_get_size(PARENT()->fn_children));
-
-    /*
-     * schedule a walk that makes one one child progress.
-     * we do this by giving the queue draining process zero
-     * time quanta. it's a do..while loop, so it does something.
-     */
-    high_ctx.fnbw_reason = FIB_NODE_BW_REASON_FLAG_RESOLVE;
-
-    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
-                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
-    fib_walk_process_queues(vm, 0);
-
-    FOR_EACH_TEST_CHILD(tc)
-    {
-        if (ii == N_TEST_CHILDREN)
-        {
-            FIB_TEST(1 == vec_len(tc->ctxs),
-                     "%d child visitsed %d times in zero quanta walk",
-                     ii, vec_len(tc->ctxs));
-        }
-        else
-        {
-            FIB_TEST(0 == vec_len(tc->ctxs),
-                     "%d child visitsed %d times in 0 quanta walk",
-                     ii, vec_len(tc->ctxs));
-        }
-    }
-    FIB_TEST(1 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
-             "Queue is not empty post zero quanta walk");
-    FIB_TEST(N_TEST_CHILDREN+1 == fib_node_list_get_size(PARENT()->fn_children),
-             "Parent has %d children post zero qunta walk",
-             fib_node_list_get_size(PARENT()->fn_children));
-
-    /*
-     * another one step
-     */
-    fib_walk_process_queues(vm, 0);
-
-    FOR_EACH_TEST_CHILD(tc)
-    {
-        if (ii >= N_TEST_CHILDREN-1)
-        {
-            FIB_TEST(1 == vec_len(tc->ctxs),
-                     "%d child visitsed %d times in 2nd zero quanta walk",
-                     ii, vec_len(tc->ctxs));
-        }
-        else
-        {
-            FIB_TEST(0 == vec_len(tc->ctxs),
-                     "%d child visitsed %d times in 2nd 0 quanta walk",
-                     ii, vec_len(tc->ctxs));
-        }
-    }
-    FIB_TEST(1 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
-             "Queue is not empty post zero quanta walk");
-    FIB_TEST(N_TEST_CHILDREN+1 == fib_node_list_get_size(PARENT()->fn_children),
-             "Parent has %d children post zero qunta walk",
-             fib_node_list_get_size(PARENT()->fn_children));
-
-    /*
-     * schedule another walk that will catch-up and merge.
-     */
-    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
-                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
-    fib_walk_process_queues(vm, 1);
-
-    FOR_EACH_TEST_CHILD(tc)
-    {
-        if (ii >= N_TEST_CHILDREN-1)
-        {
-            FIB_TEST(2 == vec_len(tc->ctxs),
-                     "%d child visitsed %d times in 2nd zero quanta merge walk",
-                     ii, vec_len(tc->ctxs));
-            vec_free(tc->ctxs);
-        }
-        else
-        {
-            FIB_TEST(1 == vec_len(tc->ctxs),
-                     "%d child visitsed %d times in 2nd 0 quanta merge walk",
-                     ii, vec_len(tc->ctxs));
-            vec_free(tc->ctxs);
-        }
-    }
-    FIB_TEST(0 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
-             "Queue is not empty post 2nd zero quanta merge walk");
-    FIB_TEST(N_TEST_CHILDREN == fib_node_list_get_size(PARENT()->fn_children),
-             "Parent has %d children post 2nd zero qunta merge walk",
-             fib_node_list_get_size(PARENT()->fn_children));
-
-    /*
-     * park a async walk in the middle of the list, then have an sync walk catch
-     * it. same expectations as async catches async.
-     */
-    high_ctx.fnbw_reason = FIB_NODE_BW_REASON_FLAG_RESOLVE;
-
-    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
-                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
-
-    fib_walk_process_queues(vm, 0);
-    fib_walk_process_queues(vm, 0);
-
-    fib_walk_sync(FIB_NODE_TYPE_TEST, PARENT_INDEX, &high_ctx);
-
-    FOR_EACH_TEST_CHILD(tc)
-    {
-        if (ii >= N_TEST_CHILDREN-1)
-        {
-            FIB_TEST(2 == vec_len(tc->ctxs),
-                     "%d child visitsed %d times in sync catches async walk",
-                     ii, vec_len(tc->ctxs));
-            vec_free(tc->ctxs);
-        }
-        else
-        {
-            FIB_TEST(1 == vec_len(tc->ctxs),
-                     "%d child visitsed %d times in sync catches async walk",
-                     ii, vec_len(tc->ctxs));
-            vec_free(tc->ctxs);
-        }
-    }
-    FIB_TEST(0 == fib_walk_queue_get_size(FIB_WALK_PRIORITY_HIGH),
-             "Queue is not empty post 2nd zero quanta merge walk");
-    FIB_TEST(N_TEST_CHILDREN == fib_node_list_get_size(PARENT()->fn_children),
-             "Parent has %d children post 2nd zero qunta merge walk",
-             fib_node_list_get_size(PARENT()->fn_children));
-
-    /*
-     * make the parent a child of one of its children, thus inducing a routing loop.
-     */
-    fib_test_nodes[PARENT_INDEX].sibling =
-        fib_node_child_add(FIB_NODE_TYPE_TEST,
-                           1, // the first child
-                           FIB_NODE_TYPE_TEST,
-                           PARENT_INDEX);
-
-    /*
-     * execute a sync walk from the parent. each child visited spawns more sync
-     * walks. we expect the walk to terminate.
-     */
-    fib_test_walk_spawns_walks = 1;
-
-    fib_walk_sync(FIB_NODE_TYPE_TEST, PARENT_INDEX, &high_ctx);
-
-    FOR_EACH_TEST_CHILD(tc)
-    {
-        /*
-         * child 1 - which is last in the list - has the loop.
-         * the other children a re thus visitsed first. the we meet
-         * child 1. we go round the loop again, visting the other children.
-         * then we meet the walk in the dep list and bail. child 1 is not visitsed
-         * again.
-         */
-        if (1 == ii)
-        {
-            FIB_TEST(1 == vec_len(tc->ctxs),
-                     "child %d visitsed %d times during looped sync walk",
-                     ii, vec_len(tc->ctxs));
-        }
-        else
-        {
-            FIB_TEST(2 == vec_len(tc->ctxs),
-                     "child %d visitsed %d times during looped sync walk",
-                     ii, vec_len(tc->ctxs));
-        }
-        vec_free(tc->ctxs);
-    }
-    FIB_TEST(N_TEST_CHILDREN == fib_node_list_get_size(PARENT()->fn_children),
-             "Parent has %d children post sync loop walk",
-             fib_node_list_get_size(PARENT()->fn_children));
-
-    /*
-     * the walk doesn't reach the max depth because the infra knows that sync
-     * meets sync implies a loop and bails early.
-     */
-    FIB_TEST(high_ctx.fnbw_depth == 9,
-             "Walk context depth %d post sync loop walk",
-             high_ctx.fnbw_depth);
-
-    /*
-     * execute an async walk of the graph loop, with each child spawns sync walks
-     */
-    high_ctx.fnbw_depth = 0;
-    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
-                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
-
-    fib_walk_process_queues(vm, 1);
-
-    FOR_EACH_TEST_CHILD(tc)
-    {
-        /*
-         * we don't really care how many times the children are visisted, as long as
-         * it is more than once.
-         */
-        FIB_TEST(1 <= vec_len(tc->ctxs),
-                 "child %d visitsed %d times during looped aync spawns sync walk",
-                 ii, vec_len(tc->ctxs));
-        vec_free(tc->ctxs);
-    }
-
-    /*
-     * execute an async walk of the graph loop, with each child spawns async walks
-     */
-    fib_test_walk_spawns_walks = 2;
-    high_ctx.fnbw_depth = 0;
-    fib_walk_async(FIB_NODE_TYPE_TEST, PARENT_INDEX,
-                   FIB_WALK_PRIORITY_HIGH, &high_ctx);
-
-    fib_walk_process_queues(vm, 1);
-
-    FOR_EACH_TEST_CHILD(tc)
-    {
-        /*
-         * we don't really care how many times the children are visisted, as long as
-         * it is more than once.
-         */
-        FIB_TEST(1 <= vec_len(tc->ctxs),
-                 "child %d visitsed %d times during looped async spawns async walk",
-                 ii, vec_len(tc->ctxs));
-                vec_free(tc->ctxs);
-    }
-
-
-    fib_node_child_remove(FIB_NODE_TYPE_TEST,
-                          1, // the first child
-                          fib_test_nodes[PARENT_INDEX].sibling);
-
-    /*
-     * cleanup
-     */
-    FOR_EACH_TEST_CHILD(tc)
-    {
-        fib_node_child_remove(FIB_NODE_TYPE_TEST, PARENT_INDEX,
-                              tc->sibling);
-        fib_node_deinit(&tc->node);
-        fib_node_unlock(&tc->node);
-    }
-    fib_node_deinit(PARENT());
-
-    /*
-     * The parent will be destroyed when the last lock on it goes.
-     * this test ensures all the walk objects are unlocking it.
-     */
-    FIB_TEST((1 == fib_test_nodes[PARENT_INDEX].destroyed),
-             "Parent was destroyed");
-
-    return (0);
-}
-
-static int
-lfib_test (void)
-{
-    const mpls_label_t deag_label = 50;
-    const u32 lfib_index = 0;
-    const u32 fib_index = 0;
-    dpo_id_t dpo = DPO_INVALID;
-    const dpo_id_t *dpo1;
-    fib_node_index_t lfe;
-    lookup_dpo_t *lkd;
-    test_main_t *tm;
-    int lb_count;
-    adj_index_t ai_mpls_10_10_10_1;
-
-    tm = &test_main;
-    lb_count = pool_elts(load_balance_pool);
-
-    FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
-
-    /*
-     * MPLS enable an interface so we get the MPLS table created
-     */
-    mpls_sw_interface_enable_disable(&mpls_main,
-                                     tm->hw[0]->sw_if_index,
-                                     1);
-
-    ip46_address_t nh_10_10_10_1 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
-    };
-    ai_mpls_10_10_10_1 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-                                             VNET_LINK_MPLS,
-                                             &nh_10_10_10_1,
-                                             tm->hw[0]->sw_if_index);
-
-    /*
-     * Test the specials stack properly.
-     */
-    fib_prefix_t exp_null_v6_pfx = {
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_eos = MPLS_EOS,
-	.fp_label = MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL,
-	.fp_payload_proto = DPO_PROTO_IP6,
-    };
-    lfe = fib_table_lookup(lfib_index, &exp_null_v6_pfx);
-    FIB_TEST((FIB_NODE_INDEX_INVALID != lfe),
-	     "%U/%U present",
-	     format_mpls_unicast_label, MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL,
-	     format_mpls_eos_bit, MPLS_EOS);
-    fib_entry_contribute_forwarding(lfe,
-				    FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				    &dpo);
-    dpo1 = load_balance_get_bucket(dpo.dpoi_index, 0);
-    lkd = lookup_dpo_get(dpo1->dpoi_index);
-
-    FIB_TEST((fib_index == lkd->lkd_fib_index),
-              "%U/%U is deag in %d %U",
-             format_mpls_unicast_label, deag_label,
-             format_mpls_eos_bit, MPLS_EOS,
-             lkd->lkd_fib_index,
-             format_dpo_id, &dpo, 0);
-    FIB_TEST((LOOKUP_INPUT_DST_ADDR == lkd->lkd_input),
-             "%U/%U is dst deag",
-             format_mpls_unicast_label, deag_label,
-             format_mpls_eos_bit, MPLS_EOS);
-    FIB_TEST((LOOKUP_TABLE_FROM_INPUT_INTERFACE == lkd->lkd_table),
-             "%U/%U is lookup in interface's table",
-             format_mpls_unicast_label, deag_label,
-             format_mpls_eos_bit, MPLS_EOS);
-    FIB_TEST((DPO_PROTO_IP6 == lkd->lkd_proto),
-             "%U/%U is %U dst deag",
-             format_mpls_unicast_label, deag_label,
-             format_mpls_eos_bit, MPLS_EOS,
-             format_dpo_proto, lkd->lkd_proto);
-
-
-    /*
-     * A route deag route for EOS
-     */
-    fib_prefix_t pfx = {
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_eos = MPLS_EOS,
-	.fp_label = deag_label,
-	.fp_payload_proto = DPO_PROTO_IP4,
-    };
-    lfe = fib_table_entry_path_add(lfib_index,
-				   &pfx,
-				   FIB_SOURCE_CLI,
-				   FIB_ENTRY_FLAG_NONE,
-				   FIB_PROTOCOL_IP4,
-				   &zero_addr,
-				   ~0,
-				   fib_index,
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST((lfe == fib_table_lookup(lfib_index, &pfx)),
-              "%U/%U present",
-              format_mpls_unicast_label, deag_label,
-              format_mpls_eos_bit, MPLS_EOS);
-
-    fib_entry_contribute_forwarding(lfe,
-				    FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				    &dpo);
-    dpo1 = load_balance_get_bucket(dpo.dpoi_index, 0);
-    lkd = lookup_dpo_get(dpo1->dpoi_index);
-
-    FIB_TEST((fib_index == lkd->lkd_fib_index),
-              "%U/%U is deag in %d %U",
-             format_mpls_unicast_label, deag_label,
-             format_mpls_eos_bit, MPLS_EOS,
-             lkd->lkd_fib_index,
-             format_dpo_id, &dpo, 0);
-    FIB_TEST((LOOKUP_INPUT_DST_ADDR == lkd->lkd_input),
-             "%U/%U is dst deag",
-             format_mpls_unicast_label, deag_label,
-             format_mpls_eos_bit, MPLS_EOS);
-    FIB_TEST((DPO_PROTO_IP4 == lkd->lkd_proto),
-             "%U/%U is %U dst deag",
-             format_mpls_unicast_label, deag_label,
-             format_mpls_eos_bit, MPLS_EOS,
-             format_dpo_proto, lkd->lkd_proto);
-
-    fib_table_entry_delete_index(lfe, FIB_SOURCE_CLI);
-
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fib_table_lookup(lfib_index,
-							 &pfx)),
-              "%U/%U not present",
-              format_mpls_unicast_label, deag_label,
-              format_mpls_eos_bit, MPLS_EOS);
-
-    /*
-     * A route deag route for non-EOS
-     */
-    pfx.fp_eos = MPLS_NON_EOS;
-    lfe = fib_table_entry_path_add(lfib_index,
-				   &pfx,
-				   FIB_SOURCE_CLI,
-				   FIB_ENTRY_FLAG_NONE,
-				   FIB_PROTOCOL_IP4,
-				   &zero_addr,
-				   ~0,
-				   lfib_index,
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST((lfe == fib_table_lookup(lfib_index, &pfx)),
-              "%U/%U present",
-              format_mpls_unicast_label, deag_label,
-              format_mpls_eos_bit, MPLS_NON_EOS);
-
-    fib_entry_contribute_forwarding(lfe,
-				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				    &dpo);
-    dpo1 = load_balance_get_bucket(dpo.dpoi_index, 0);
-    lkd = lookup_dpo_get(dpo1->dpoi_index);
-
-    FIB_TEST((fib_index == lkd->lkd_fib_index),
-              "%U/%U is deag in %d %U",
-             format_mpls_unicast_label, deag_label,
-             format_mpls_eos_bit, MPLS_NON_EOS,
-             lkd->lkd_fib_index,
-             format_dpo_id, &dpo, 0);
-    FIB_TEST((LOOKUP_INPUT_DST_ADDR == lkd->lkd_input),
-             "%U/%U is dst deag",
-             format_mpls_unicast_label, deag_label,
-             format_mpls_eos_bit, MPLS_NON_EOS);
-
-    FIB_TEST((DPO_PROTO_MPLS == lkd->lkd_proto),
-             "%U/%U is %U dst deag",
-             format_mpls_unicast_label, deag_label,
-             format_mpls_eos_bit, MPLS_NON_EOS,
-             format_dpo_proto, lkd->lkd_proto);
-
-    fib_table_entry_delete_index(lfe, FIB_SOURCE_CLI);
-
-    FIB_TEST((FIB_NODE_INDEX_INVALID == fib_table_lookup(lfib_index,
-							 &pfx)),
-              "%U/%U not present",
-              format_mpls_unicast_label, deag_label,
-              format_mpls_eos_bit, MPLS_EOS);
-
-    dpo_reset(&dpo);
-
-    /*
-     * An MPLS x-connect
-     */
-    fib_prefix_t pfx_1200 = {
-	.fp_len = 21,
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_label = 1200,
-	.fp_eos = MPLS_NON_EOS,
-    };
-    fib_test_lb_bucket_t neos_o_10_10_10_1 = {
-	.type = FT_LB_LABEL_STACK_O_ADJ,
-	.label_stack_o_adj = {
-	    .adj = ai_mpls_10_10_10_1,
-	    .label_stack_size = 4,
-	    .label_stack = {
-		200, 300, 400, 500,
-	    },
-	    .eos = MPLS_NON_EOS,
-	},
-    };
-    dpo_id_t neos_1200 = DPO_INVALID;
-    dpo_id_t ip_1200 = DPO_INVALID;
-    mpls_label_t *l200 = NULL;
-    vec_add1(l200, 200);
-    vec_add1(l200, 300);
-    vec_add1(l200, 400);
-    vec_add1(l200, 500);
-
-    lfe = fib_table_entry_update_one_path(fib_index,
-					  &pfx_1200,
-					  FIB_SOURCE_API,
-					  FIB_ENTRY_FLAG_NONE,
-					  FIB_PROTOCOL_IP4,
-					  &nh_10_10_10_1,
-					  tm->hw[0]->sw_if_index,
-					  ~0, // invalid fib index
-					  1,
-					  l200,
-					  FIB_ROUTE_PATH_FLAG_NONE);
-
-    FIB_TEST(fib_test_validate_entry(lfe,
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     1,
-				     &neos_o_10_10_10_1),
-	     "1200/0 LB 1 buckets via: "
-	     "adj 10.10.11.1");
-
-    /*
-     * A recursive route via the MPLS x-connect
-     */
-    fib_prefix_t pfx_2_2_2_3_s_32 = {
-    	.fp_len = 32,
-    	.fp_proto = FIB_PROTOCOL_IP4,
-    	.fp_addr = {
-    	    .ip4.as_u32 = clib_host_to_net_u32(0x02020203),
-    	},
-    };
-    fib_route_path_t *rpaths = NULL, rpath = {
-    	.frp_proto = FIB_PROTOCOL_MPLS,
-    	.frp_local_label = 1200,
-    	.frp_sw_if_index = ~0, // recurive
-    	.frp_fib_index = 0, // Default MPLS fib
-    	.frp_weight = 1,
-    	.frp_flags = FIB_ROUTE_PATH_FLAG_NONE,
-    	.frp_label_stack = NULL,
-    };
-    vec_add1(rpaths, rpath);
-
-    fib_table_entry_path_add2(fib_index,
-    			      &pfx_2_2_2_3_s_32,
-    			      FIB_SOURCE_API,
-    			      FIB_ENTRY_FLAG_NONE,
-    			      rpaths);
-
-    /*
-     * A labelled recursive route via the MPLS x-connect
-     */
-    fib_prefix_t pfx_2_2_2_4_s_32 = {
-    	.fp_len = 32,
-    	.fp_proto = FIB_PROTOCOL_IP4,
-    	.fp_addr = {
-    	    .ip4.as_u32 = clib_host_to_net_u32(0x02020204),
-    	},
-    };
-    mpls_label_t *l999 = NULL;
-    vec_add1(l999, 999);
-    rpaths[0].frp_label_stack = l999,
-
-    fib_table_entry_path_add2(fib_index,
-    			      &pfx_2_2_2_4_s_32,
-    			      FIB_SOURCE_API,
-    			      FIB_ENTRY_FLAG_NONE,
-    			      rpaths);
-
-    fib_entry_contribute_forwarding(fib_table_lookup(fib_index, &pfx_1200),
-    				    FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-    				    &ip_1200);
-    fib_entry_contribute_forwarding(fib_table_lookup(fib_index, &pfx_1200),
-    				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-    				    &neos_1200);
-
-    fib_test_lb_bucket_t ip_o_1200 = {
-    	.type = FT_LB_O_LB,
-    	.lb = {
-    	    .lb = ip_1200.dpoi_index,
-    	},
-    };
-    fib_test_lb_bucket_t mpls_o_1200 = {
-	.type = FT_LB_LABEL_O_LB,
-	.label_o_lb = {
-    	    .lb = neos_1200.dpoi_index,
-	    .label = 999,
-	    .eos = MPLS_EOS,
-	},
-    };
-
-    lfe = fib_table_lookup(fib_index, &pfx_2_2_2_3_s_32);
-    FIB_TEST(fib_test_validate_entry(lfe,
-    				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-    				     1,
-    				     &ip_o_1200),
-    	     "2.2.2.2.3/32 LB 1 buckets via: label 1200 EOS");
-    lfe = fib_table_lookup(fib_index, &pfx_2_2_2_4_s_32);
-    FIB_TEST(fib_test_validate_entry(lfe,
-    				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-    				     1,
-    				     &mpls_o_1200),
-    	     "2.2.2.2.4/32 LB 1 buckets via: label 1200 non-EOS");
-
-    fib_table_entry_delete(fib_index, &pfx_1200, FIB_SOURCE_API);
-    fib_table_entry_delete(fib_index, &pfx_2_2_2_3_s_32, FIB_SOURCE_API);
-    fib_table_entry_delete(fib_index, &pfx_2_2_2_4_s_32, FIB_SOURCE_API);
-
-    dpo_reset(&neos_1200);
-    dpo_reset(&ip_1200);
-
-    /*
-     * A recursive via a label that does not exist
-     */
-    fib_test_lb_bucket_t bucket_drop = {
-	.type = FT_LB_SPECIAL,
-	.special = {
-	    .adj = DPO_PROTO_MPLS,
-	},
-    };
-
-    rpaths[0].frp_label_stack = NULL;
-    lfe = fib_table_entry_path_add2(fib_index,
-				    &pfx_2_2_2_4_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    rpaths);
-
-    fib_entry_contribute_forwarding(fib_table_lookup(fib_index, &pfx_1200),
-    				    FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-    				    &ip_1200);
-    ip_o_1200.lb.lb = ip_1200.dpoi_index;
-
-    FIB_TEST(fib_test_validate_entry(lfe,
-    				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-    				     1,
-    				     &ip_o_1200),
-    	     "2.2.2.2.4/32 LB 1 buckets via: label 1200 EOS");
-    lfe = fib_table_lookup(fib_index, &pfx_1200);
-    FIB_TEST(fib_test_validate_entry(lfe,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &bucket_drop),
-	     "2.2.2.4/32 LB 1 buckets via: ip4-DROP");
-
-    fib_table_entry_delete(fib_index, &pfx_2_2_2_4_s_32, FIB_SOURCE_API);
-
-    dpo_reset(&ip_1200);
-
-    /*
-     * cleanup
-     */
-    mpls_sw_interface_enable_disable(&mpls_main,
-                                     tm->hw[0]->sw_if_index,
-                                     0);
-
-    FIB_TEST(lb_count == pool_elts(load_balance_pool),
-	     "Load-balance resources freed %d of %d",
-             lb_count, pool_elts(load_balance_pool));
-
-    return (0);
-}
-
-static clib_error_t *
-fib_test (vlib_main_t * vm, 
-	  unformat_input_t * input,
-	  vlib_cli_command_t * cmd_arg)
-{
-    int res;
-
-    res = 0;
-    fib_test_mk_intf(4);
-
-    if (unformat (input, "ip"))
-    {
-	res += fib_test_v4();
-	res += fib_test_v6();
-    }
-    else if (unformat (input, "label"))
-    {
-	res += fib_test_label();
-    }
-    else if (unformat (input, "ae"))
-    {
-	res += fib_test_ae();
-    }
-    else if (unformat (input, "lfib"))
-    {
-	res += lfib_test();
-    }
-    else if (unformat (input, "walk"))
-    {
-	res += fib_test_walk();
-    }
-    else
-    {
-        /*
-         * These walk UT aren't run as part of the full suite, since the
-         * fib-walk process must be disabled in order for the tests to work
-         *
-         * fib_test_walk();
-         */
-	res += fib_test_v4();
-	res += fib_test_v6();
-	res += fib_test_ae();
-	res += fib_test_label();
-	res += lfib_test();
-    }
-
-    if (res)
-    {
-        return clib_error_return(0, "FIB Unit Test Failed");
-    }
-    else
-    {
-        return (NULL);
-    }
-}
-
-VLIB_CLI_COMMAND (test_fib_command, static) = {
-    .path = "test fib",
-    .short_help = "fib unit tests - DO NOT RUN ON A LIVE SYSTEM",
-    .function = fib_test,
-};
-
-clib_error_t *
-fib_test_init (vlib_main_t *vm)
-{
-    return 0;
-}
-
-VLIB_INIT_FUNCTION (fib_test_init);
diff --git a/vnet/vnet/fib/fib_types.c b/vnet/vnet/fib/fib_types.c
deleted file mode 100644
index b66e7194..00000000
--- a/vnet/vnet/fib/fib_types.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/ip/ip.h>
-
-#include <vnet/fib/fib_types.h>
-#include <vnet/fib/fib_internal.h>
-#include <vnet/mpls/mpls.h>
-
-/*
- * arrays of protocol and link names
- */
-static const char* fib_protocol_names[] = FIB_PROTOCOLS;
-static const char* vnet_link_names[] = VNET_LINKS;
-static const char* fib_forw_chain_names[] = FIB_FORW_CHAINS;
-
-u8 *
-format_fib_protocol (u8 * s, va_list ap)
-{
-    fib_protocol_t proto = va_arg(ap, int); // fib_protocol_t promotion
-
-    return (format (s, "%s", fib_protocol_names[proto]));
-}
-
-u8 *
-format_vnet_link (u8 * s, va_list ap)
-{
-    vnet_link_t link = va_arg(ap, int); // vnet_link_t promotion
-
-    return (format (s, "%s", vnet_link_names[link]));
-}
-
-u8 *
-format_fib_forw_chain_type (u8 * s, va_list * args)
-{
-    fib_forward_chain_type_t fct = va_arg(*args, int);
-
-    return (format (s, "%s", fib_forw_chain_names[fct]));
-}
-
-void
-fib_prefix_from_ip46_addr (const ip46_address_t *addr,
-			   fib_prefix_t *pfx)
-{
-    ASSERT(!ip46_address_is_zero(addr));
-
-    pfx->fp_proto = ((ip46_address_is_ip4(addr) ?
-		      FIB_PROTOCOL_IP4 :
-		      FIB_PROTOCOL_IP6));
-    pfx->fp_len = ((ip46_address_is_ip4(addr) ?
-		    32 : 128));
-    pfx->fp_addr = *addr;
-}
-
-void
-fib_prefix_from_mpls_label (mpls_label_t label,
-			    fib_prefix_t *pfx)
-{
-    pfx->fp_proto = FIB_PROTOCOL_MPLS;
-    pfx->fp_len = 21;
-    pfx->fp_label = label;
-    pfx->fp_eos = MPLS_NON_EOS;
-}
-
-int
-fib_prefix_cmp (const fib_prefix_t *p1,
-		const fib_prefix_t *p2)
-{
-    int res;
-
-    res = (p1->fp_proto - p2->fp_proto);
-
-    if (0 == res)
-    {
-	switch (p1->fp_proto)
-	{
-	case FIB_PROTOCOL_IP4:
-	case FIB_PROTOCOL_IP6:
-	    res = (p1->fp_len - p2->fp_len);
-
-	    if (0 == res)
-	    {
-		res = ip46_address_cmp(&p1->fp_addr, &p2->fp_addr);
-	    }
-	    break;
-	case FIB_PROTOCOL_MPLS:
-	    res = (p1->fp_label - p2->fp_label);
-
-	    if (0 == res)
-	    {
-		res = (p1->fp_eos - p2->fp_eos);
-	    }
-	    break;
-	}
-    }
-
-    return (res);
-}
-
-int
-fib_prefix_is_cover (const fib_prefix_t *p1,
-		     const fib_prefix_t *p2)
-{
-    switch (p1->fp_proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (ip4_destination_matches_route(&ip4_main,
-					      &p1->fp_addr.ip4,
-					      &p2->fp_addr.ip4,
-					      p1->fp_len));
-    case FIB_PROTOCOL_IP6:
-	return (ip6_destination_matches_route(&ip6_main,
-					      &p1->fp_addr.ip6,
-					      &p2->fp_addr.ip6,
-					      p1->fp_len));
-    case FIB_PROTOCOL_MPLS:
-	break;
-    }
-    return (0);
-}
-
-int
-fib_prefix_is_host (const fib_prefix_t *prefix)
-{
-    switch (prefix->fp_proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (prefix->fp_len == 32);
-    case FIB_PROTOCOL_IP6:
-	return (prefix->fp_len == 128);
-    case FIB_PROTOCOL_MPLS:
-	return (!0);
-    }
-    return (0);
-}
-
-u8 *
-format_fib_prefix (u8 * s, va_list * args)
-{
-    fib_prefix_t *fp = va_arg (*args, fib_prefix_t *);
-
-    /*
-     * protocol specific so it prints ::/0 correctly.
-     */
-    switch (fp->fp_proto)
-    {
-    case FIB_PROTOCOL_IP6:
-    {
-	ip6_address_t p6 = fp->fp_addr.ip6;
-
-	ip6_address_mask(&p6, &(ip6_main.fib_masks[fp->fp_len]));
-	s = format (s, "%U", format_ip6_address, &p6);
-	break;
-    }
-    case FIB_PROTOCOL_IP4:
-    {
-	ip4_address_t p4 = fp->fp_addr.ip4;
-	p4.as_u32 &= ip4_main.fib_masks[fp->fp_len];
-
-	s = format (s, "%U", format_ip4_address, &p4);
-	break;
-    }
-    case FIB_PROTOCOL_MPLS:
-	s = format (s, "%U:%U",
-		    format_mpls_unicast_label, fp->fp_label,
-		    format_mpls_eos_bit, fp->fp_eos);
-	break;
-    }
-    s = format (s, "/%d", fp->fp_len);
-
-    return (s);
-}
-
-int
-fib_route_path_cmp (const fib_route_path_t *rpath1,
-		    const fib_route_path_t *rpath2)
-{
-    int res;
-
-    res = ip46_address_cmp(&rpath1->frp_addr,
-			   &rpath2->frp_addr);
-
-    if (0 != res) return (res);
-
-    if (~0 != rpath1->frp_sw_if_index &&
-        ~0 != rpath2->frp_sw_if_index)
-    {
-        res = vnet_sw_interface_compare(vnet_get_main(),
-                                        rpath1->frp_sw_if_index,
-                                        rpath2->frp_sw_if_index);
-    }
-    else
-    {
-        res = rpath1->frp_sw_if_index - rpath2->frp_sw_if_index;
-    }
-
-    if (0 != res) return (res);
-
-    if (ip46_address_is_zero(&rpath1->frp_addr))
-    {
-	res = rpath1->frp_fib_index - rpath2->frp_fib_index;
-    }
-
-    return (res);
-}
-
-dpo_proto_t
-fib_proto_to_dpo (fib_protocol_t fib_proto)
-{
-    switch (fib_proto)
-    {
-    case FIB_PROTOCOL_IP6:
-        return (DPO_PROTO_IP6);
-    case FIB_PROTOCOL_IP4:
-        return (DPO_PROTO_IP4);
-    case FIB_PROTOCOL_MPLS:
-        return (DPO_PROTO_MPLS);
-    }
-    ASSERT(0);
-    return (0);
-}
-
-fib_protocol_t
-dpo_proto_to_fib (dpo_proto_t dpo_proto)
-{
-    switch (dpo_proto)
-    {
-    case DPO_PROTO_IP6:
-        return (FIB_PROTOCOL_IP6);
-    case DPO_PROTO_IP4:
-        return (FIB_PROTOCOL_IP4);
-    case DPO_PROTO_MPLS:
-        return (FIB_PROTOCOL_MPLS);
-    default:
-	break;
-    }
-    ASSERT(0);
-    return (0);
-}
-
-vnet_link_t
-fib_proto_to_link (fib_protocol_t proto)
-{
-    switch (proto)
-    {
-    case FIB_PROTOCOL_IP4:
-	return (VNET_LINK_IP4);
-    case FIB_PROTOCOL_IP6:
-	return (VNET_LINK_IP6);
-    case FIB_PROTOCOL_MPLS:
-	return (VNET_LINK_MPLS);
-    }
-    ASSERT(0);
-    return (0);
-}
-
-fib_forward_chain_type_t
-fib_forw_chain_type_from_dpo_proto (dpo_proto_t proto)
-{
-    switch (proto)
-    {
-    case DPO_PROTO_IP4:
-	return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
-    case DPO_PROTO_IP6:
-	return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
-    case DPO_PROTO_MPLS:
-	return (FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS);
-    case DPO_PROTO_ETHERNET:
-	return (FIB_FORW_CHAIN_TYPE_ETHERNET);
-    }
-    ASSERT(0);
-    return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
-}
-
-vnet_link_t
-fib_forw_chain_type_to_link_type (fib_forward_chain_type_t fct)
-{
-    switch (fct)
-    {
-    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
-	return (VNET_LINK_IP4);
-    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
-	return (VNET_LINK_IP6);
-    case FIB_FORW_CHAIN_TYPE_ETHERNET:
-	return (VNET_LINK_ETHERNET);
-    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
-	/*
-	 * insufficient information to to convert
-	 */
-	ASSERT(0);
-	break;
-    case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
-	return (VNET_LINK_MPLS);
-    }
-    return (VNET_LINK_IP4);
-}
-
-dpo_proto_t
-fib_forw_chain_type_to_dpo_proto (fib_forward_chain_type_t fct)
-{
-    switch (fct)
-    {
-    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
-	return (DPO_PROTO_IP4);
-    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
-	return (DPO_PROTO_IP6);
-    case FIB_FORW_CHAIN_TYPE_ETHERNET:
-	return (DPO_PROTO_ETHERNET);
-    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
-    case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
-	return (DPO_PROTO_MPLS);
-    }
-    return (DPO_PROTO_IP4);
-}
diff --git a/vnet/vnet/fib/fib_types.h b/vnet/vnet/fib/fib_types.h
deleted file mode 100644
index 0a15fef1..00000000
--- a/vnet/vnet/fib/fib_types.h
+++ /dev/null
@@ -1,340 +0,0 @@
- /*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __FIB_TYPES_H__
-#define __FIB_TYPES_H__
-
-#include <vlib/vlib.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vnet/mpls/packet.h>
-#include <vnet/dpo/dpo.h>
-
-/**
- * A typedef of a node index.
- * we make this typedef so the code becomes easier for a human to parse.
- */
-typedef u32 fib_node_index_t;
-#define FIB_NODE_INDEX_INVALID ((fib_node_index_t)(~0))
-
-/**
- * Protocol Type. packed so it consumes a u8 only
- */
-typedef enum fib_protocol_t_ {
-    FIB_PROTOCOL_IP4 = 0,
-    FIB_PROTOCOL_IP6,
-    FIB_PROTOCOL_MPLS,
-}  __attribute__ ((packed)) fib_protocol_t;
-
-#define FIB_PROTOCOLS {			\
-    [FIB_PROTOCOL_IP4] = "ipv4",	\
-    [FIB_PROTOCOL_IP6] = "ipv6",        \
-    [FIB_PROTOCOL_MPLS] = "MPLS",       \
-}
-
-/**
- * Definition outside of enum so it does not need to be included in non-defaulted
- * switch statements
- */
-#define FIB_PROTOCOL_MAX (FIB_PROTOCOL_MPLS + 1)
-
-/**
- * Not part of the enum so it does not have to be handled in switch statements
- */
-#define FIB_PROTOCOL_NONE (FIB_PROTOCOL_MAX+1)
-
-#define FOR_EACH_FIB_PROTOCOL(_item)    \
-    for (_item = FIB_PROTOCOL_IP4;      \
-	 _item <= FIB_PROTOCOL_MPLS;    \
-	 _item++)
-
-#define FOR_EACH_FIB_IP_PROTOCOL(_item)    \
-    for (_item = FIB_PROTOCOL_IP4;         \
-	 _item <= FIB_PROTOCOL_IP6;        \
-	 _item++)
-
-/**
- * @brief Convert from a protocol to a link type
- */
-vnet_link_t fib_proto_to_link (fib_protocol_t proto);
-
-/**
- * FIB output chain type. When a child object requests a forwarding contribution
- * from a parent, it does so for a particular scenario. This enumererates those
- * sceanrios
- */
-typedef enum fib_forward_chain_type_t_ {
-    /**
-     * Contribute an object that is to be used to forward IP4 packets
-     */
-    FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-    /**
-     * Contribute an object that is to be used to forward IP6 packets
-     */
-    FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
-    /**
-     * Contribute an object that is to be used to forward non-end-of-stack
-     * MPLS packets
-     */
-    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-    /**
-     * Contribute an object that is to be used to forward end-of-stack
-     * MPLS packets. This is a convenient ID for clients. A real EOS chain
-     * must be pay-load protocol specific. This
-     * option is converted into one of the other three internally.
-     */
-    FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-    /**
-     * Contribute an object that is to be used to forward Ethernet packets.
-     * This is last in the list since it is not valid for many FIB objects,
-     * and thus their array of per-chain-type DPOs can be sized smaller.
-     */
-    FIB_FORW_CHAIN_TYPE_ETHERNET,
-}  __attribute__ ((packed)) fib_forward_chain_type_t;
-
-#define FIB_FORW_CHAINS {					\
-    [FIB_FORW_CHAIN_TYPE_ETHERNET]      = "ethernet",     	\
-    [FIB_FORW_CHAIN_TYPE_UNICAST_IP4]   = "unicast-ip4",	\
-    [FIB_FORW_CHAIN_TYPE_UNICAST_IP6]   = "unicast-ip6",	\
-    [FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS]  = "mpls-neos",	        \
-    [FIB_FORW_CHAIN_TYPE_MPLS_EOS]      = "mpls-eos",	        \
-}
-
-#define FIB_FORW_CHAIN_NUM (FIB_FORW_CHAIN_TYPE_MPLS_ETHERNET+1)
-#define FIB_FORW_CHAIN_MPLS_NUM (FIB_FORW_CHAIN_TYPE_MPLS_EOS+1)
-
-#define FOR_EACH_FIB_FORW_CHAIN(_item)			  \
-    for (_item = FIB_FORW_CHAIN_TYPE_UNICAST_IP4;   	  \
-	 _item <= FIB_FORW_CHAIN_TYPE_ETHERNET;		  \
-	 _item++)
-
-#define FOR_EACH_FIB_FORW_MPLS_CHAIN(_item)		  \
-    for (_item = FIB_FORW_CHAIN_TYPE_UNICAST_IP4;   	  \
-	 _item <= FIB_FORW_CHAIN_TYPE_MPLS_EOS;		  \
-	 _item++)
-
-/**
- * @brief Convert from a chain type to the adjacencies link type
- */
-extern vnet_link_t fib_forw_chain_type_to_link_type(fib_forward_chain_type_t fct);
-
-/**
- * @brief Convert from a payload-protocol to a chain type.
- */
-extern fib_forward_chain_type_t fib_forw_chain_type_from_dpo_proto(dpo_proto_t proto);
-
-/**
- * @brief Convert from a chain type to the DPO proto it will install
- */
-extern dpo_proto_t fib_forw_chain_type_to_dpo_proto(fib_forward_chain_type_t fct);
-
-/**
- * Aggregrate type for a prefix
- */
-typedef struct fib_prefix_t_ {
-    /**
-     * The mask length
-     */
-    u16 fp_len;
-
-    /**
-     * protocol type
-     */
-    fib_protocol_t fp_proto;
-
-    /**
-     * Pad to keep the address 4 byte aligned
-     */
-    u8 ___fp___pad;
-
-    union {
-	/**
-	 * The address type is not deriveable from the fp_addr member.
-	 * If it's v4, then the first 3 u32s of the address will be 0.
-	 * v6 addresses (even v4 mapped ones) have at least 2 u32s assigned
-	 * to non-zero values. true. but when it's all zero, one cannot decide.
-	 */
-	ip46_address_t fp_addr;
-
-	struct {
-	    mpls_label_t fp_label;
-	    mpls_eos_bit_t fp_eos;
-	    /**
-	     * This protocol determines the payload protocol of packets
-	     * that will be forwarded by this entry once the label is popped.
-	     * For a non-eos entry it will be MPLS.
-	     */
-	    dpo_proto_t fp_payload_proto;
-	};
-    };
-} fib_prefix_t;
-
-STATIC_ASSERT(STRUCT_OFFSET_OF(fib_prefix_t, fp_addr) == 4,
-	      "FIB Prefix's address is 4 byte aligned.");
-
-/**
- * \brief Compare two prefixes for equality
- */
-extern int fib_prefix_cmp(const fib_prefix_t *p1,
-			  const fib_prefix_t *p2);
-
-/**
- * \brief Compare two prefixes for covering relationship
- *
- * \return non-zero if the first prefix is a cover for the second
- */
-extern int fib_prefix_is_cover(const fib_prefix_t *p1,
-			       const fib_prefix_t *p2);
-
-/**
- * \brief Return true is the prefix is a host prefix
- */
-extern int fib_prefix_is_host(const fib_prefix_t *p);
-
-
-/**
- * \brief Host prefix from ip
- */
-extern void fib_prefix_from_ip46_addr (const ip46_address_t *addr,
-			   fib_prefix_t *pfx);
-
-extern u8 * format_fib_prefix(u8 * s, va_list * args);
-extern u8 * format_fib_forw_chain_type(u8 * s, va_list * args);
-
-extern dpo_proto_t fib_proto_to_dpo(fib_protocol_t fib_proto);
-extern fib_protocol_t dpo_proto_to_fib(dpo_proto_t dpo_proto);
-
-/**
- * Enurmeration of special path/entry types
- */
-typedef enum fib_special_type_t_ {
-    /**
-     * Marker. Add new types after this one.
-     */
-    FIB_SPECIAL_TYPE_FIRST = 0,
-    /**
-     * Local/for-us paths
-     */
-    FIB_SPECIAL_TYPE_LOCAL = FIB_SPECIAL_TYPE_FIRST,
-    /**
-     * drop paths
-     */
-    FIB_SPECIAL_TYPE_DROP,
-    /**
-     * Marker. Add new types before this one, then update it.
-     */
-    FIB_SPECIAL_TYPE_LAST = FIB_SPECIAL_TYPE_DROP,
-} __attribute__ ((packed)) fib_special_type_t;
-
-/**
- * The maximum number of types
- */
-#define FIB_SPEICAL_TYPE_MAX (FIB_SPEICAL_TYPE_LAST + 1)
-
-#define FOR_EACH_FIB_SPEICAL_TYPE(_item)		\
-    for (_item = FIB_TYPE_SPEICAL_FIRST;		\
-	 _item <= FIB_SPEICAL_TYPE_LAST; _item++)
-
-extern u8 * format_fib_protocol(u8 * s, va_list ap);
-extern u8 * format_vnet_link(u8 *s, va_list ap);
-
-/**
- * Path flags from the control plane
- */
-typedef enum fib_route_path_flags_t_
-{
-    FIB_ROUTE_PATH_FLAG_NONE = 0,
-    /**
-     * Recursion constraint of via a host prefix
-     */
-    FIB_ROUTE_PATH_RESOLVE_VIA_HOST = (1 << 0),
-    /**
-     * Recursion constraint of via an attahced prefix
-     */
-    FIB_ROUTE_PATH_RESOLVE_VIA_ATTACHED = (1 << 1),
-} fib_route_path_flags_t;
-
-/**
- * @brief 
- * A representation of a path as described by a route producer.
- * These paramenters will determine the path 'type', of which there are:
- * 1) Attached-next-hop:
- *   a single peer on a link.
- *   It is 'attached' because it is in the same sub-net as the router, on a link
- *   directly connected to the route.
- *   It is 'next=hop' since the next-hop address of the peer is known.
- * 2) Attached:
- *  the next-hop is not known. but we can ARP for it.
- * 3) Recursive.
- *  The next-hop is known but the interface is not. So to find the adj to use
- *  we must recursively resolve the next-hop.
- * 3) deaggregate (deag)
- *  A further lookup is required.
- */
-typedef struct fib_route_path_t_ {
-    /**
-     * The protocol of the address below. We need this since the all
-     * zeros address is ambiguous.
-     */
-    fib_protocol_t frp_proto;
-
-    union {
-	/**
-	 * The next-hop address.
-	 * Will be NULL for attached paths.
-	 * Will be all zeros for attached-next-hop paths on a p2p interface
-	 * Will be all zeros for a deag path.
-	 */
-	ip46_address_t frp_addr;
-
-	/**
-	 * The MPLS local Label to reursively resolve through.
-	 * This is valid when the path type is MPLS.
-	 */
-	mpls_label_t frp_local_label;
-    };
-    /**
-     * The interface.
-     * Will be invalid for recursive paths.
-     */
-    u32 frp_sw_if_index;
-    /**
-     * The FIB index to lookup the nexthop
-     * Only valid for recursive paths.
-     */
-    u32 frp_fib_index;
-    /**
-     * [un]equal cost path weight
-     */
-    u32 frp_weight;
-    /**
-     * flags on the path
-     */
-    fib_route_path_flags_t frp_flags;
-    /**
-     * The outgoing MPLS label Stack. NULL implies no label.
-     */
-    mpls_label_t *frp_label_stack;
-} fib_route_path_t;
-
-/**
- * @brief 
- * A representation of a fib path for fib_path_encode to convey the information to the caller
- */
-typedef struct fib_route_path_encode_t_ {
-    fib_route_path_t rpath;
-    dpo_id_t dpo;
-} fib_route_path_encode_t;
-
-#endif
diff --git a/vnet/vnet/fib/fib_urpf_list.c b/vnet/vnet/fib/fib_urpf_list.c
deleted file mode 100644
index 263812ad..00000000
--- a/vnet/vnet/fib/fib_urpf_list.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/fib/fib_urpf_list.h>
-#include <vnet/adj/adj.h>
-
-/**
- * @brief pool of all fib_urpf_list
- */
-fib_urpf_list_t *fib_urpf_list_pool;
-
-u8 *
-format_fib_urpf_list (u8 *s, va_list args)
-{
-    fib_urpf_list_t *urpf;
-    index_t ui;
-    u32 *swi;
-
-    ui = va_arg(args, index_t);
-    urpf = fib_urpf_list_get(ui);
-
-    s = format(s, "uPRF-list:%d len:%d itfs:[",
-	       ui, vec_len(urpf->furpf_itfs));
-
-    vec_foreach(swi, urpf->furpf_itfs)
-    {
-	s = format(s, "%d, ", *swi);
-    }
-    s = format(s, "]");
-
-    return (s);
-}
-
-index_t
-fib_urpf_list_alloc_and_lock (void)
-{
-    fib_urpf_list_t *urpf;
-
-    pool_get(fib_urpf_list_pool, urpf);
-    memset(urpf, 0, sizeof(*urpf));
-
-    urpf->furpf_locks++;
-
-    return (urpf - fib_urpf_list_pool);
-}
-
-void
-fib_urpf_list_unlock (index_t ui)
-{
-    fib_urpf_list_t *urpf;
-
-    if (INDEX_INVALID == ui)
-	return;
-
-    urpf = fib_urpf_list_get(ui);
-
-    urpf->furpf_locks--;
-
-    if (0 == urpf->furpf_locks)
-    {
-	vec_free(urpf->furpf_itfs);
-	pool_put(fib_urpf_list_pool, urpf);
-    }
-}
-
-void
-fib_urpf_list_lock (index_t ui)
-{
-    fib_urpf_list_t *urpf;
-
-    urpf = fib_urpf_list_get(ui);
-
-    urpf->furpf_locks++;
-}
-
-/**
- * @brief Append another interface to the list.
- */
-void
-fib_urpf_list_append (index_t ui,
-		      u32 sw_if_index)
-{
-    fib_urpf_list_t *urpf;
-
-    urpf = fib_urpf_list_get(ui);
-
-    vec_add1(urpf->furpf_itfs, sw_if_index);
-}
-
-/**
- * @brief Combine to interface lists
- */
-void
-fib_urpf_list_combine (index_t ui1,
-		       index_t ui2)
-{
-    fib_urpf_list_t *urpf1, *urpf2;
-
-    urpf1 = fib_urpf_list_get(ui1);
-    urpf2 = fib_urpf_list_get(ui2);
-
-    vec_append(urpf1->furpf_itfs, urpf2->furpf_itfs);
-}
-
-/**
- * @brief Sort the interface indicies.
- * The sort is the first step in obtaining a unique list, so the order,
- * w.r.t. next-hop, interface,etc is not important. So a sort based on the
- * index is all we need.
- */
-static int
-fib_urpf_itf_cmp_for_sort (void * v1,
-			   void * v2)
-{
-    fib_node_index_t *i1 = v1, *i2 = v2;
-
-    return (*i2 < *i1);
-}
-
-/**
- * @brief Convert the uRPF list from the itf set obtained during the walk
- * to a unique list.
- */
-void
-fib_urpf_list_bake (index_t ui)
-{
-    fib_urpf_list_t *urpf;
-
-    urpf = fib_urpf_list_get(ui);
-
-    ASSERT(!(urpf->furpf_flags & FIB_URPF_LIST_BAKED));
-
-    if (vec_len(urpf->furpf_itfs) > 1)
-    {
-	u32 i,j;
-
-	/*
-	 * cat list | sort | uniq > rpf_list
-	 */
-	vec_sort_with_function(urpf->furpf_itfs, fib_urpf_itf_cmp_for_sort);
-
-	i = 0, j = 1;
-	while (j < vec_len(urpf->furpf_itfs))
-	{
-	    if (urpf->furpf_itfs[i] == urpf->furpf_itfs[j])
-	    {
-		/*
-		 * the itfacenct entries are the same.
-		 * search forward for a unique one
-		 */
-		while (urpf->furpf_itfs[i] == urpf->furpf_itfs[j] &&
-		       j < vec_len(urpf->furpf_itfs))
-		{
-		    j++;
-		}
-		if (j == vec_len(urpf->furpf_itfs))
-		{
-		    /*
-		     * ran off the end without finding a unique index.
-		     * we are done.
-		     */
-		    break;
-		}
-		else
-		{
-		    urpf->furpf_itfs[i+1] = urpf->furpf_itfs[j];
-		}
-	    }
-	    i++, j++;
-	}
-
-	/*
-	 * set the length of the vector to the number of unique itfs
-	 */
-	_vec_len(urpf->furpf_itfs) = i+1;
-    }
-
-    urpf->furpf_flags |= FIB_URPF_LIST_BAKED;
-}
-
-void
-fib_urpf_list_show_mem (void)
-{
-    fib_show_memory_usage("uRPF-list",
-			  pool_elts(fib_urpf_list_pool),
-			  pool_len(fib_urpf_list_pool),
-			  sizeof(fib_urpf_list_t));
-}
-
-static clib_error_t *
-show_fib_urpf_list_command (vlib_main_t * vm,
-			    unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-    index_t ui;
-
-    if (unformat (input, "%d", &ui))
-    {
-	/*
-	 * show one in detail
-	 */
-	if (!pool_is_free_index(fib_urpf_list_pool, ui))
-	{
-	    vlib_cli_output (vm, "%d@%U",
-			     ui,
-			     format_fib_urpf_list, ui);
-	}
-	else
-	{
-	    vlib_cli_output (vm, "uRPF %d invalid", ui);
-	}
-    }
-    else
-    {
-	/*
-	 * show all
-	 */
-	vlib_cli_output (vm, "FIB uRPF Entries:");
-	pool_foreach_index(ui, fib_urpf_list_pool,
-        ({
-	    vlib_cli_output (vm, "%d@%U",
-			     ui,
-			     format_fib_urpf_list, ui);
-	}));
-    }
-
-    return (NULL);
-}
-
-/* *INDENT-OFF* */
-/*?
- * The '<em>sh fib uRPF [index] </em>' command displays the uRPF lists
- *
- * @cliexpar
- * @cliexstart{show fib uRPF}
- * FIB uRPF Entries:
- *  0@uPRF-list:0 len:0 itfs:[]
- *  1@uPRF-list:1 len:2 itfs:[1, 2, ]
- *  2@uPRF-list:2 len:1 itfs:[3, ]
- *  3@uPRF-list:3 len:1 itfs:[9, ]
- * @cliexend
-?*/
-VLIB_CLI_COMMAND (show_fib_urpf_list, static) = {
-  .path = "show fib uRPF",
-  .function = show_fib_urpf_list_command,
-  .short_help = "show fib uRPF",
-};
-/* *INDENT-OFF* */
diff --git a/vnet/vnet/fib/fib_urpf_list.h b/vnet/vnet/fib/fib_urpf_list.h
deleted file mode 100644
index 09f47574..00000000
--- a/vnet/vnet/fib/fib_urpf_list.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief A unicast RPF list.
- * The uRPF list is the set of interfaces that a prefix can be reached through.
- * There are 3 levels of RPF check:
- *   - do we have any route to the source (i.e. it's not drop)
- *   - did the packet arrive on an interface that the source is reachable through
- *   - did the packet arrive from a peer that the source is reachable through
- * we don't support the last. But it could be done by storing adjs in the uPRF
- * list rather than interface indices.
- *
- * these conditions are checked against the list by:
- *   - the list is not empty
- *   - there is an interface in the list that is on the input interface.
- *   - there is an adj in the list whose MAC address matches the packet's
- *     source MAC and input interface.
- *
- * To speed the last two checks the interface list only needs to have the unique
- * interfaces present. If the uRPF check was instead implemented by forward
- * walking the DPO chain, then that walk would encounter a great deal of
- * non-adjacency objects (i.e. load-balances, mpls-labels, etc) and potentially
- * the same adjacency many times (esp. when UCMP is used).
- * To that end the uRPF list is a collapsed, unique interface only list.
- */
-
-#ifndef __FIB_URPF_LIST_H__
-#define __FIB_URPF_LIST_H__
-
-#include <vnet/fib/fib_types.h>
-#include <vnet/adj/adj.h>
-
-/**
- * @brief flags
- */
-typedef enum fib_urpf_list_flag_t_
-{
-    /**
-     * @brief Set to indicated that the uRPF list has already been baked.
-     * This is protection against it being baked more than once. These
-     * are not chunky fries - once is enough.
-     */
-    FIB_URPF_LIST_BAKED = (1 << 0),
-} fib_urpf_list_flag_t;
-
-typedef struct fib_urpf_list_t_
-{
-    /**
-     * The list of interfaces that comprise the allowed accepting interfaces
-     */
-    adj_index_t *furpf_itfs;
-
-    /**
-     * flags
-     */
-    fib_urpf_list_flag_t furpf_flags;
-
-    /**
-     * uRPF lists are shared amongst many entries so we require a locking
-     * mechanism.
-     */
-    u32 furpf_locks;
-} fib_urpf_list_t;
-
-extern index_t fib_urpf_list_alloc_and_lock(void);
-extern void fib_urpf_list_unlock(index_t urpf);
-extern void fib_urpf_list_lock(index_t urpf);
-
-extern void fib_urpf_list_append(index_t urpf, adj_index_t adj);
-extern void fib_urpf_list_combine(index_t urpf1, index_t urpf2);
-
-extern void fib_urpf_list_bake(index_t urpf);
-
-extern u8 *format_fib_urpf_list(u8 *s, va_list ap);
-
-extern void fib_urpf_list_show_mem(void);
-
-/**
- * @brief pool of all fib_urpf_list
- */
-extern fib_urpf_list_t *fib_urpf_list_pool;
-
-static inline fib_urpf_list_t *
-fib_urpf_list_get (index_t index)
-{
-    return (pool_elt_at_index(fib_urpf_list_pool, index));
-}
-
-/**
- * @brief Data-Plane function to check an input interface against an uRPF list
- *
- * @param ui The uRPF list index to check against. Get this from the load-balance
- *             object that is the result of the FIB lookup
- * @param sw_if_index The SW interface index to validate
- *
- * @return 1 if the interface is found, 0 otherwise
- */
-always_inline int
-fib_urpf_check (index_t ui, u32 sw_if_index)
-{
-    fib_urpf_list_t *urpf;
-    u32 *swi;
-
-    urpf = fib_urpf_list_get(ui);
-
-    vec_foreach(swi, urpf->furpf_itfs)
-    {
-	if (*swi == sw_if_index)
-	    return (1);
-    }
-
-    return (0);
-}
-
-/**
- * @brief Data-Plane function to check the size of an uRPF list, (i.e. the number
- *        of interfaces in the list).
- *
- * @param ui The uRPF list index to check against. Get this from the load-balance
- *             object that is the result of the FIB lookup
- *
- * @return the number of interfaces in the list
- */
-always_inline int
-fib_urpf_check_size (index_t ui)
-{
-    fib_urpf_list_t *urpf;
-
-    urpf = fib_urpf_list_get(ui);
-
-    return (vec_len(urpf->furpf_itfs));
-}
-
-#endif
diff --git a/vnet/vnet/fib/fib_walk.c b/vnet/vnet/fib/fib_walk.c
deleted file mode 100644
index 938f7b8c..00000000
--- a/vnet/vnet/fib/fib_walk.c
+++ /dev/null
@@ -1,1108 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/fib/fib_walk.h>
-#include <vnet/fib/fib_node_list.h>
-
-/**
- * The flags on a walk
- */
-typedef enum fib_walk_flags_t_
-{
-    /**
-     * A synchronous walk.
-     * This walk will run to completion, i.e. visit ALL the children.
-     * It is a depth first traversal of the graph.
-     */
-    FIB_WALK_FLAG_SYNC = (1 << 0),
-    /**
-     * An asynchronous walk.
-     * This walk will be scheduled to run in the background. It will thus visits
-     * the children at a later point in time.
-     * It is a depth first traversal of the graph.
-     */
-    FIB_WALK_FLAG_ASYNC = (1 << 1),
-    /**
-     * An indication that the walk is currently executing.
-     */
-    FIB_WALK_FLAG_EXECUTING = (1 << 2),
-} fib_walk_flags_t;
-
-/**
- * A representation of a graph walk from a parent object to its children
- */
-typedef struct fib_walk_t_
-{
-    /**
-     * FIB node linkage. This object is not in the FIB object graph,
-     * but it is present in other node's dependency lists, so it needs to
-     * be pointerable to.
-     */
-    fib_node_t fw_node;
-
-    /**
-     * the walk's flags
-     */
-    fib_walk_flags_t fw_flags;
-
-    /**
-     * Sibling index in the dependency list
-     */
-    u32 fw_dep_sibling;
-
-    /**
-     * Sibling index in the list of all walks
-     */
-    u32 fw_prio_sibling;
-
-    /**
-     * Pointer to the node whose dependants this walk is walking
-     */
-    fib_node_ptr_t fw_parent;
-
-    /**
-     * Number of nodes visited by this walk. saved for debugging purposes.
-     */
-    u32 fw_n_visits;
-
-    /**
-     * Time the walk started
-     */
-    f64 fw_start_time;
-
-    /**
-     * The reasons this walk is occuring.
-     * This is a vector ordered in time. The reasons and the front were started
-     * first, and so should be acted first when a node is visisted.
-     */
-    fib_node_back_walk_ctx_t *fw_ctx;
-} fib_walk_t;
-
-/**
- * @brief The pool of all walk objects
- */
-static fib_walk_t *fib_walk_pool;
-
-/**
- * @brief There's only one event type sent to the walk process
- */
-#define FIB_WALK_EVENT 0
-
-/**
- * Statistics maintained per-walk queue
- */
-typedef enum fib_walk_queue_stats_t_
-{
-    FIB_WALK_SCHEDULED,
-    FIB_WALK_COMPLETED,
-} fib_walk_queue_stats_t;
-#define FIB_WALK_QUEUE_STATS_NUM ((fib_walk_queue_stats_t)(FIB_WALK_COMPLETED+1))
-
-#define FIB_WALK_QUEUE_STATS {           \
-    [FIB_WALK_SCHEDULED] = "scheduled",  \
-    [FIB_WALK_COMPLETED] = "completed",  \
-}
-
-#define FOR_EACH_FIB_WALK_QUEUE_STATS(_wqs)   \
-    for ((_wqs) = FIB_WALK_SCHEDULED;         \
-	 (_wqs) < FIB_WALK_QUEUE_STATS_NUM;   \
-	 (_wqs)++)
-
-/**
- * The names of the walk stats
- */
-static const char * const fib_walk_queue_stats_names[] = FIB_WALK_QUEUE_STATS;
-/**
- * The names of the walk reasons
- */
-static const char * const fib_node_bw_reason_names[] = FIB_NODE_BW_REASONS;
-
-/**
- * A represenation of one queue of walk
- */
-typedef struct fib_walk_queue_t_
-{
-    /**
-     * Qeuee stats
-     */
-    u64 fwq_stats[FIB_WALK_QUEUE_STATS_NUM];
-
-    /**
-     * The node list which acts as the queue
-     */
-    fib_node_list_t fwq_queue;
-} fib_walk_queue_t;
-
-/**
- * A set of priority queues for outstanding walks
- */
-typedef struct fib_walk_queues_t_
-{
-    fib_walk_queue_t fwqs_queues[FIB_WALK_PRIORITY_NUM];
-} fib_walk_queues_t;
-
-/**
- * The global queues of outstanding walks
- */
-static fib_walk_queues_t fib_walk_queues;
-
-/**
- * The names of the walk priorities
- */
-static const char * const fib_walk_priority_names[] = FIB_WALK_PRIORITIES;
-
-/**
- * @brief Histogram stats on the lenths of each walk in elemenets visisted.
- * Store upto 1<<23 elements in increments of 1<<10
- */
-#define HISTOGRAM_VISITS_PER_WALK_MAX (1<<23)
-#define HISTOGRAM_VISITS_PER_WALK_INCR (1<<10)
-#define HISTOGRAM_VISITS_PER_WALK_N_BUCKETS \
-    (HISTOGRAM_VISITS_PER_WALK_MAX/HISTOGRAM_VISITS_PER_WALK_INCR)
-static u64 fib_walk_hist_vists_per_walk[HISTOGRAM_VISITS_PER_WALK_N_BUCKETS];
-
-/**
- * @brief History of state for the last 128 walks
- */
-#define HISTORY_N_WALKS 128
-#define MAX_HISTORY_REASONS 16
-static u32 history_last_walk_pos;
-typedef struct fib_walk_history_t_ {
-    u32 fwh_n_visits;
-    f64 fwh_duration;
-    f64 fwh_completed;
-    fib_node_ptr_t fwh_parent;
-    fib_walk_flags_t fwh_flags;
-    fib_node_bw_reason_flag_t fwh_reason[MAX_HISTORY_REASONS];
-} fib_walk_history_t;
-static fib_walk_history_t fib_walk_history[HISTORY_N_WALKS];
-
-u8*
-format_fib_walk_priority (u8 *s, va_list ap)
-{
-    fib_walk_priority_t prio = va_arg(ap, fib_walk_priority_t);
-
-    ASSERT(prio < FIB_WALK_PRIORITY_NUM);
-
-    return (format(s, "%s", fib_walk_priority_names[prio]));
-}
-static u8*
-format_fib_walk_queue_stats (u8 *s, va_list ap)
-{
-    fib_walk_queue_stats_t wqs = va_arg(ap, fib_walk_queue_stats_t);
-
-    ASSERT(wqs < FIB_WALK_QUEUE_STATS_NUM);
-
-    return (format(s, "%s", fib_walk_queue_stats_names[wqs]));
-}
-
-static index_t
-fib_walk_get_index (fib_walk_t *fwalk)
-{
-    return (fwalk - fib_walk_pool);
-}
-
-static fib_walk_t *
-fib_walk_get (index_t fwi)
-{
-    return (pool_elt_at_index(fib_walk_pool, fwi));
-}
-
-/*
- * not static so it can be used in the unit tests
- */
-u32
-fib_walk_queue_get_size (fib_walk_priority_t prio)
-{
-    return (fib_node_list_get_size(fib_walk_queues.fwqs_queues[prio].fwq_queue));
-}
-
-static fib_node_index_t
-fib_walk_queue_get_front (fib_walk_priority_t prio)
-{
-    fib_node_ptr_t wp;
-
-    fib_node_list_get_front(fib_walk_queues.fwqs_queues[prio].fwq_queue, &wp);
-
-    return (wp.fnp_index);
-}
-
-static void
-fib_walk_destroy (fib_walk_t *fwalk)
-{
-    u32 bucket, ii;
-
-    if (FIB_NODE_INDEX_INVALID != fwalk->fw_prio_sibling)
-    {
-	fib_node_list_elt_remove(fwalk->fw_prio_sibling);
-    }
-    fib_node_child_remove(fwalk->fw_parent.fnp_type,
-			  fwalk->fw_parent.fnp_index,
-			  fwalk->fw_dep_sibling);
-
-    /*
-     * add the stats to the continuous histogram collection.
-     */
-    bucket = (fwalk->fw_n_visits / HISTOGRAM_VISITS_PER_WALK_INCR);
-    bucket = (bucket >= HISTOGRAM_VISITS_PER_WALK_N_BUCKETS ?
-	      HISTOGRAM_VISITS_PER_WALK_N_BUCKETS - 1 :
-	      bucket);
-    fib_walk_hist_vists_per_walk[bucket]++;
-
-    /*
-     * save stats to the recent history
-     */
-
-    fib_walk_history[history_last_walk_pos].fwh_n_visits =
-	fwalk->fw_n_visits;
-    fib_walk_history[history_last_walk_pos].fwh_completed =
-	vlib_time_now(vlib_get_main());
-    fib_walk_history[history_last_walk_pos].fwh_duration =
-	fib_walk_history[history_last_walk_pos].fwh_completed -
-        fwalk->fw_start_time;
-    fib_walk_history[history_last_walk_pos].fwh_parent =
-	fwalk->fw_parent;
-    fib_walk_history[history_last_walk_pos].fwh_flags =
-	fwalk->fw_flags;
-
-    vec_foreach_index(ii, fwalk->fw_ctx)
-    {
-        if (ii < MAX_HISTORY_REASONS)
-        {
-            fib_walk_history[history_last_walk_pos].fwh_reason[ii] =
-                fwalk->fw_ctx[ii].fnbw_reason;
-        }
-    }
-
-    history_last_walk_pos = (history_last_walk_pos + 1) % HISTORY_N_WALKS;
-
-    fib_node_deinit(&fwalk->fw_node);
-    vec_free(fwalk->fw_ctx);
-    pool_put(fib_walk_pool, fwalk);
-}
-
-/**
- * return code when advancing a walk
- */
-typedef enum fib_walk_advance_rc_t_
-{
-    /**
-     * The walk is complete
-     */
-    FIB_WALK_ADVANCE_DONE,
-    /**
-     * the walk has more work
-     */
-    FIB_WALK_ADVANCE_MORE,
-    /**
-     * The walk merged with the one in front
-     */
-    FIB_WALK_ADVANCE_MERGE,
-} fib_walk_advance_rc_t;
-
-/**
- * @brief Advance the walk one element in its work list
- */
-static fib_walk_advance_rc_t
-fib_walk_advance (fib_node_index_t fwi)
-{
-    fib_node_back_walk_ctx_t *ctx, *old;
-    fib_node_back_walk_rc_t wrc;
-    fib_node_ptr_t sibling;
-    fib_walk_t *fwalk;
-    int more_elts;
-
-    /*
-     * this walk function is re-entrant - walks acan spawn walks.
-     * fib_walk_t objects come from a pool, so they can realloc. we need
-     * to retch from said pool at the appropriate times.
-     */
-    fwalk = fib_walk_get(fwi);
-
-    more_elts = fib_node_list_elt_get_next(fwalk->fw_dep_sibling, &sibling);
-
-    if (more_elts)
-    {
-        old = fwalk->fw_ctx;
-
-	vec_foreach(ctx, fwalk->fw_ctx)
-	{
-	    wrc = fib_node_back_walk_one(&sibling, ctx);
-
-	    fwalk = fib_walk_get(fwi);
-	    fwalk->fw_n_visits++;
-
-	    if (FIB_NODE_BACK_WALK_MERGE == wrc)
-	    {
-		/*
-		 * this walk has merged with the one further along the node's
-		 * dependecy list.
-		 */
-		return (FIB_WALK_ADVANCE_MERGE);
-	    }
-            if (old != fwalk->fw_ctx)
-            {
-                /*
-                 * nasty re-entrant addition of a walk has realloc'd the vector
-                 * break out
-                 */
-		return (FIB_WALK_ADVANCE_MERGE);
-	    }
-	}
-	/*
-	 * move foward to the next node to visit
-	 */
-	more_elts = fib_node_list_advance(fwalk->fw_dep_sibling);
-    }
-
-    if (more_elts)
-    {
-	return (FIB_WALK_ADVANCE_MORE);
-    }
-
-    return (FIB_WALK_ADVANCE_DONE);
-}
-
-/**
- * @breif Enurmerate the times of sleep between walks
- */
-typedef enum fib_walk_sleep_type_t_
-{
-    FIB_WALK_SHORT_SLEEP,
-    FIB_WALK_LONG_SLEEP,
-} fib_walk_sleep_type_t;
-
-#define FIB_WALK_N_SLEEP (FIB_WALK_LONG_SLEEP+1)
-
-/**
- * @brief Durations for the sleep types
- */
-static f64 fib_walk_sleep_duration[] = {
-    [FIB_WALK_LONG_SLEEP] = 1e-3,
-    [FIB_WALK_SHORT_SLEEP] = 1e-8,
-};
-
-/**
- * @brief The time quota for a walk. When more than this amount of time is
- * spent, the walk process will yield.
- */
-static f64 quota = 1e-4;
-
-/**
- * Histogram on the amount of work done (in msecs) in each walk
- */
-#define N_TIME_BUCKETS 128
-#define TIME_INCREMENTS (N_TIME_BUCKETS/2)
-static u64 fib_walk_work_time_taken[N_TIME_BUCKETS];
-
-/**
- * Histogram on the number of nodes visted in each quota
- */
-#define N_ELTS_BUCKETS 128
-static u32 fib_walk_work_nodes_visisted_incr = 2;
-static u64 fib_walk_work_nodes_visited[N_ELTS_BUCKETS];
-
-/**
- * Histogram of the sleep lengths
- */
-static u64 fib_walk_sleep_lengths[2];
-
-/**
- * @brief Service the queues
- * This is not declared static so that it can be unit tested - i know i know...
- */
-f64
-fib_walk_process_queues (vlib_main_t * vm,
-			 const f64 quota)
-{
-    f64 start_time, consumed_time;
-    fib_walk_sleep_type_t sleep;
-    fib_walk_priority_t prio;
-    fib_walk_advance_rc_t rc;
-    fib_node_index_t fwi;
-    fib_walk_t *fwalk;
-    u32 n_elts;
-    i32 bucket;
-
-    consumed_time = 0;
-    start_time = vlib_time_now(vm);
-    n_elts = 0;
-
-    FOR_EACH_FIB_WALK_PRIORITY(prio)
-    {
-	while (0 != fib_walk_queue_get_size(prio))
-	{
-	    fwi = fib_walk_queue_get_front(prio);
-
-	    /*
-	     * set this walk as executing
-	     */
-	    fwalk = fib_walk_get(fwi);
-	    fwalk->fw_flags |= FIB_WALK_FLAG_EXECUTING;
-
-	    do
-	    {
-		rc = fib_walk_advance(fwi);
-		n_elts++;
-		consumed_time = (vlib_time_now(vm) - start_time);
-	    } while ((consumed_time < quota) &&
-		     (FIB_WALK_ADVANCE_MORE == rc));
-
-	    /*
-	     * if this walk has no more work then pop it from the queue
-	     * and move on to the next.
-	     */
-	    if (FIB_WALK_ADVANCE_MORE != rc)
-	    {
-		fwalk = fib_walk_get(fwi);
-		fib_walk_destroy(fwalk);
-		fib_walk_queues.fwqs_queues[prio].fwq_stats[FIB_WALK_COMPLETED]++;
-	    }
-	    else
-	    {
-		/*
-		 * passed our work quota. sleep time.
-		 */
-		fwalk = fib_walk_get(fwi);
-		fwalk->fw_flags &= ~FIB_WALK_FLAG_EXECUTING;
-		sleep = FIB_WALK_SHORT_SLEEP;
-		goto that_will_do_for_now;
-	    }
-	}
-    }
-    /*
-     * got to the end of all the work
-     */
-    sleep = FIB_WALK_LONG_SLEEP;
-
-that_will_do_for_now:
-
-    /*
-     * collect the stats:
-     *  - for the number of nodes visisted we store 128 increments
-     *  - for the time consumed we store quota/TIME_INCREMENTS increments.
-     */
-    bucket = ((n_elts/fib_walk_work_nodes_visisted_incr) > N_ELTS_BUCKETS ?
-	      N_ELTS_BUCKETS-1 :
-	      n_elts/fib_walk_work_nodes_visisted_incr);
-    ++fib_walk_work_nodes_visited[bucket];
-
-    bucket = (consumed_time - quota) / (quota / TIME_INCREMENTS);
-    bucket += N_TIME_BUCKETS/2;
-    bucket = (bucket < 0 ? 0 : bucket);
-    bucket = (bucket > N_TIME_BUCKETS-1 ? N_TIME_BUCKETS-1 : bucket);
-    ++fib_walk_work_time_taken[bucket];
-
-    ++fib_walk_sleep_lengths[sleep];
-
-    return (fib_walk_sleep_duration[sleep]);
-}
-
-/**
- * @brief The 'fib-walk' process's main loop.
- */
-static uword
-fib_walk_process (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * f)
-{
-    f64 sleep_time;
-
-    sleep_time = fib_walk_sleep_duration[FIB_WALK_SHORT_SLEEP];
-
-    while (1)
-    {
-	vlib_process_wait_for_event_or_clock(vm, sleep_time);
-
-	/*
-	 * there may be lots of event queued between the processes,
-	 * but the walks we want to schedule are in the priority queues,
-	 * so we ignore the process events.
-	 */
-	vlib_process_get_events(vm, NULL);
-
-	sleep_time = fib_walk_process_queues(vm, quota);
-    }
-
-    /*
-     * Unreached
-     */
-    ASSERT(!"WTF");
-    return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (fib_walk_process_node,static) = {
-    .function = fib_walk_process,
-    .type = VLIB_NODE_TYPE_PROCESS,
-    .name = "fib-walk",
-};
-/* *INDENT-ON* */
-
-/**
- * @brief Allocate a new walk object
- */
-static fib_walk_t *
-fib_walk_alloc (fib_node_type_t parent_type,
-		fib_node_index_t parent_index,
-		fib_walk_flags_t flags,
-		fib_node_back_walk_ctx_t *ctx)
-{
-    fib_walk_t *fwalk;
-
-    pool_get(fib_walk_pool, fwalk);
-
-    fib_node_init(&fwalk->fw_node, FIB_NODE_TYPE_WALK);
-
-    fwalk->fw_flags = flags;
-    fwalk->fw_dep_sibling  = FIB_NODE_INDEX_INVALID;
-    fwalk->fw_prio_sibling = FIB_NODE_INDEX_INVALID;
-    fwalk->fw_parent.fnp_index = parent_index;
-    fwalk->fw_parent.fnp_type = parent_type;
-    fwalk->fw_ctx = NULL;
-    fwalk->fw_start_time = vlib_time_now(vlib_get_main());
-    fwalk->fw_n_visits = 0;
-
-    /*
-     * make a copy of the backwalk context so the depth count remains
-     * the same for each sibling visitsed. This is important in the case
-     * where a parent has a loop via one child, but all the others are not.
-     * if the looped child were visited first, the depth count would exceed, the
-     * max and the walk would terminate before it reached the other siblings.
-     */
-    vec_add1(fwalk->fw_ctx, *ctx);
-
-    return (fwalk);
-}
-
-/**
- * @brief Enqueue a walk onto the appropriate priority queue. Then signal
- * the background process there is work to do.
- */
-static index_t
-fib_walk_prio_queue_enquue (fib_walk_priority_t prio,
-			    fib_walk_t *fwalk)
-{
-    index_t sibling;
-
-    sibling = fib_node_list_push_front(fib_walk_queues.fwqs_queues[prio].fwq_queue,
-				       0,
-				       FIB_NODE_TYPE_WALK,
-				       fib_walk_get_index(fwalk));
-    fib_walk_queues.fwqs_queues[prio].fwq_stats[FIB_WALK_SCHEDULED]++;
-
-    /*
-     * poke the fib-walk process to perform the async walk.
-     * we are not passing it specific data, hence the last two args,
-     * the process will drain the queues
-     */
-    vlib_process_signal_event(vlib_get_main(),
-			      fib_walk_process_node.index,
-			      FIB_WALK_EVENT,
-			      FIB_WALK_EVENT);
-
-    return (sibling);
-}
-
-void
-fib_walk_async (fib_node_type_t parent_type,
-		fib_node_index_t parent_index,
-		fib_walk_priority_t prio,
-		fib_node_back_walk_ctx_t *ctx)
-{
-    fib_walk_t *fwalk;
-
-    if (FIB_NODE_GRAPH_MAX_DEPTH < ++ctx->fnbw_depth)
-    {
-	/*
-	 * The walk has reached the maximum depth. there is a loop in the graph.
-	 * bail.
-	 */
-	return;
-    }
-    if (0 == fib_node_get_n_children(parent_type,
-                                     parent_index))
-    {
-        /*
-         * no children to walk - quit now
-         */
-        return;
-    }
-    if (ctx->fnbw_flags & FIB_NODE_BW_FLAG_FORCE_SYNC)
-    {
-        /*
-         * the originator of the walk wanted it to be synchronous, but the
-         * parent object chose async - denied.
-         */
-        return (fib_walk_sync(parent_type, parent_index, ctx));
-    }
-
-
-    fwalk = fib_walk_alloc(parent_type,
-			   parent_index,
-			   FIB_WALK_FLAG_ASYNC,
-			   ctx);
-
-    fwalk->fw_dep_sibling = fib_node_child_add(parent_type,
-					       parent_index,
-					       FIB_NODE_TYPE_WALK,
-					       fib_walk_get_index(fwalk));
-
-    fwalk->fw_prio_sibling = fib_walk_prio_queue_enquue(prio, fwalk);
-}
-
-/**
- * @brief Back walk all the children of a FIB node.
- *
- * note this is a synchronous depth first walk. Children visited may propagate
- * the walk to thier children. Other children node types may not propagate,
- * synchronously but instead queue the walk for later async completion.
- */
-void
-fib_walk_sync (fib_node_type_t parent_type,
-	       fib_node_index_t parent_index,
-	       fib_node_back_walk_ctx_t *ctx)
-{
-    fib_walk_advance_rc_t rc;
-    fib_node_index_t fwi;
-    fib_walk_t *fwalk;
-
-    if (FIB_NODE_GRAPH_MAX_DEPTH < ++ctx->fnbw_depth)
-    {
-	/*
-	 * The walk has reached the maximum depth. there is a loop in the graph.
-	 * bail.
-	 */
-	return;
-    }
-    if (0 == fib_node_get_n_children(parent_type,
-                                     parent_index))
-    {
-        /*
-         * no children to walk - quit now
-         */
-        return;
-    }
-
-    fwalk = fib_walk_alloc(parent_type,
-			   parent_index,
-			   FIB_WALK_FLAG_SYNC,
-			   ctx);
-
-    fwalk->fw_dep_sibling = fib_node_child_add(parent_type,
-					       parent_index,
-					       FIB_NODE_TYPE_WALK,
-					       fib_walk_get_index(fwalk));
-    fwi = fib_walk_get_index(fwalk);
-
-    while (1)
-    {
-	/*
-	 * set this walk as executing
-	 */
-	fwalk->fw_flags |= FIB_WALK_FLAG_EXECUTING;
-
-	do
-	{
-	    rc = fib_walk_advance(fwi);
-	} while (FIB_WALK_ADVANCE_MORE == rc);
-
-
-	/*
-	 * this walk function is re-entrant - walks can spawn walks.
-	 * fib_walk_t objects come from a pool, so they can realloc. we need
-	 * to re-fetch from said pool at the appropriate times.
-	 */
-	fwalk = fib_walk_get(fwi);
-
-	if (FIB_WALK_ADVANCE_MERGE == rc)
-	{
-	    /*
-	     * this sync walk merged with an walk in front.
-	     * by reqeusting a sync walk the client wanted all children walked,
-	     * so we ditch the walk object in hand and continue with the one
-	     * we merged into
-	     */
-	    fib_node_ptr_t merged_walk;
-
-	    fib_node_list_elt_get_next(fwalk->fw_dep_sibling, &merged_walk);
-
-	    ASSERT(FIB_NODE_INDEX_INVALID != merged_walk.fnp_index);
-	    ASSERT(FIB_NODE_TYPE_WALK == merged_walk.fnp_type);
-
-	    fib_walk_destroy(fwalk);
-
-	    fwi = merged_walk.fnp_index;
-	    fwalk = fib_walk_get(fwi);
-
-	    if (FIB_WALK_FLAG_EXECUTING & fwalk->fw_flags)
-	    {
-		/*
-		 * we are executing a sync walk, and we have met with another
-		 * walk that is also executing. since only one walk executs at once
-		 * (there is no multi-threading) this implies we have met ourselves
-		 * and hence the is a loop in the graph.
-		 * This function is re-entrant, so the walk object we met is being
-		 * acted on in a stack frame below this one. We must therefore not
-		 * continue with it now, but let the stack unwind and along the
-		 * appropriate frame to read the depth count and bail.
-		 */
-		fwalk = NULL;
-		break;
-	    }
-	}
-	else
-	{
-	    /*
-	     * the walk reached the end of the depdency list.
-	     */
-	    break;
-	}
-    }
-
-    if (NULL != fwalk)
-    {
-	fib_walk_destroy(fwalk);
-    }
-}
-
-static fib_node_t *
-fib_walk_get_node (fib_node_index_t index)
-{
-    fib_walk_t *fwalk;
-
-    fwalk = fib_walk_get(index);
-
-    return (&(fwalk->fw_node));
-}
-
-/**
- * Walk objects are not parents, nor are they locked.
- * are no-ops
- */
-static void
-fib_walk_last_lock_gone (fib_node_t *node)
-{
-    ASSERT(0);
-}
-
-static fib_walk_t*
-fib_walk_get_from_node (fib_node_t *node)
-{
-    return ((fib_walk_t*)(((char*)node) -
-			  STRUCT_OFFSET_OF(fib_walk_t, fw_node)));
-}
-
-/**
- * @brief Another back walk has reach this walk.
- * Megre them so there is only one left. It is this node being
- * visited that will remain, so copy or merge the context onto it.
- */
-static fib_node_back_walk_rc_t
-fib_walk_back_walk_notify (fib_node_t *node,
-			   fib_node_back_walk_ctx_t *ctx)
-{
-    fib_node_back_walk_ctx_t *last;
-    fib_walk_t *fwalk;
-
-    fwalk = fib_walk_get_from_node(node);
-
-    /*
-     * check whether the walk context can be merged with the most recent.
-     * the most recent was the one last added and is thus at the back of the vector.
-     * we can merge walks if the reason for the walk is the same.
-     */
-    last = vec_end(fwalk->fw_ctx) - 1;
-
-    if (last->fnbw_reason == ctx->fnbw_reason)
-    {
-        /*
-         * copy the largest of the depth values. in the presence of a loop,
-         * the same walk will merge with itself. if we take the smaller depth
-         * then it will never end.
-         */
-        last->fnbw_depth = ((last->fnbw_depth >= ctx->fnbw_depth) ?
-                            last->fnbw_depth :
-                            ctx->fnbw_depth);
-    }
-    else
-    {
-        /*
-         * walks could not be merged, this means that the walk infront needs to
-         * perform different action to this one that has caught up. the one in
-         * front was scheduled first so append the new walk context to the back
-         * of the list.
-         */
-        vec_add1(fwalk->fw_ctx, *ctx);
-    }
-
-    return (FIB_NODE_BACK_WALK_MERGE);
-}
-
-/**
- * The FIB walk's graph node virtual function table
- */
-static const fib_node_vft_t fib_walk_vft = {
-    .fnv_get = fib_walk_get_node,
-    .fnv_last_lock = fib_walk_last_lock_gone,
-    .fnv_back_walk = fib_walk_back_walk_notify,
-};
-
-void
-fib_walk_module_init (void)
-{
-    fib_walk_priority_t prio;
-
-    FOR_EACH_FIB_WALK_PRIORITY(prio)
-    {
-	fib_walk_queues.fwqs_queues[prio].fwq_queue = fib_node_list_create();
-    }
-
-    fib_node_register_type(FIB_NODE_TYPE_WALK, &fib_walk_vft);
-}
-
-static u8*
-format_fib_walk (u8* s, va_list ap)
-{
-    fib_node_index_t fwi = va_arg(ap, fib_node_index_t);
-    fib_walk_t *fwalk;
-
-    fwalk = fib_walk_get(fwi);
-
-    return (format(s, "  parent:{%s:%d} visits:%d flags:%d",
-		   fib_node_type_get_name(fwalk->fw_parent.fnp_type),
-		   fwalk->fw_parent.fnp_index,
-		   fwalk->fw_n_visits,
-		   fwalk->fw_flags));
-}
-
-static clib_error_t *
-fib_walk_show (vlib_main_t * vm,
-	       unformat_input_t * input,
-	       vlib_cli_command_t * cmd)
-{
-    fib_walk_queue_stats_t wqs;
-    fib_walk_priority_t prio;
-    fib_node_ptr_t sibling;
-    fib_node_index_t fwi;
-    fib_walk_t *fwalk;
-    int more_elts, ii;
-    u8 *s = NULL;
-
-#define USEC 1000000
-    vlib_cli_output(vm, "FIB Walk Quota = %.2fusec:", quota * USEC);
-    vlib_cli_output(vm, "FIB Walk queues:");
-
-    FOR_EACH_FIB_WALK_PRIORITY(prio)
-    {
-	vlib_cli_output(vm, " %U priority queue:",
-			format_fib_walk_priority, prio);
-	vlib_cli_output(vm, "  Stats: ");
-
-	FOR_EACH_FIB_WALK_QUEUE_STATS(wqs)
-	{
-	    vlib_cli_output(vm, "    %U:%d",
-			    format_fib_walk_queue_stats, wqs,
-			    fib_walk_queues.fwqs_queues[prio].fwq_stats[wqs]);
-	}
-	vlib_cli_output(vm, "  Occupancy:%d",
-			fib_node_list_get_size(
-			    fib_walk_queues.fwqs_queues[prio].fwq_queue));
-
-	more_elts = fib_node_list_get_front(
-			fib_walk_queues.fwqs_queues[prio].fwq_queue,
-			&sibling);
-
-	while (more_elts)
-	{
-	    ASSERT(FIB_NODE_INDEX_INVALID != sibling.fnp_index);
-	    ASSERT(FIB_NODE_TYPE_WALK == sibling.fnp_type);
-
-	    fwi = sibling.fnp_index;
-	    fwalk = fib_walk_get(fwi);
-
-	    vlib_cli_output(vm, "  %U", format_fib_walk, fwi);
-
-	    more_elts = fib_node_list_elt_get_next(fwalk->fw_prio_sibling,
-						   &sibling);
-	}
-    }
-
-    vlib_cli_output(vm, "Histogram Statistics:");
-    vlib_cli_output(vm, " Number of Elements visit per-quota:");
-    for (ii = 0; ii < N_ELTS_BUCKETS; ii++)
-    {
-	if (0 != fib_walk_work_nodes_visited[ii])
-	    s = format(s, "%d:%d ",
-		       (ii * fib_walk_work_nodes_visisted_incr),
-		       fib_walk_work_nodes_visited[ii]);
-    }
-    vlib_cli_output(vm, "  %v", s);
-    vec_free(s);
-
-    vlib_cli_output(vm, " Time consumed per-quota (Quota=%f usec):", quota*USEC);
-    s = format(s, "0:%d ", fib_walk_work_time_taken[0]);
-    for (ii = 1; ii < N_TIME_BUCKETS; ii++)
-    {
-	if (0 != fib_walk_work_time_taken[ii])
-	    s = format(s, "%d:%d ", (u32)((((ii - N_TIME_BUCKETS/2) *
-					   (quota / TIME_INCREMENTS)) + quota) *
-					 USEC),
-		       fib_walk_work_time_taken[ii]);
-    }
-    vlib_cli_output(vm, "  %v", s);
-    vec_free(s);
-
-    vlib_cli_output(vm, " Sleep Types:");
-    vlib_cli_output(vm, "  Short  Long:");
-    vlib_cli_output(vm, "  %d %d:",
-		    fib_walk_sleep_lengths[FIB_WALK_SHORT_SLEEP],
-		    fib_walk_sleep_lengths[FIB_WALK_LONG_SLEEP]);
-
-    vlib_cli_output(vm, " Number of Elements visited per-walk:");
-    for (ii = 0; ii < HISTOGRAM_VISITS_PER_WALK_N_BUCKETS; ii++)
-    {
-	if (0 != fib_walk_hist_vists_per_walk[ii])
-	    s = format(s, "%d:%d ",
-		       ii*HISTOGRAM_VISITS_PER_WALK_INCR,
-		       fib_walk_hist_vists_per_walk[ii]);
-    }
-    vlib_cli_output(vm, "  %v", s);
-    vec_free(s);
-
-
-    vlib_cli_output(vm, "Brief History (last %d walks):", HISTORY_N_WALKS);
-    ii = history_last_walk_pos - 1;
-    if (ii < 0)
-        ii = HISTORY_N_WALKS - 1;
-
-    while (ii != history_last_walk_pos)
-    {
-	if (0 != fib_walk_history[ii].fwh_reason[0])
-	{
-            fib_node_back_walk_reason_t reason;
-            u8 *s = NULL;
-            u32 jj;
-
-	    s = format(s, "[@%d]: %s:%d visits:%d duration:%.2f completed:%.2f ",
-                       ii, fib_node_type_get_name(fib_walk_history[ii].fwh_parent.fnp_type),
-                       fib_walk_history[ii].fwh_parent.fnp_index,
-                       fib_walk_history[ii].fwh_n_visits,
-                       fib_walk_history[ii].fwh_duration,
-                       fib_walk_history[ii].fwh_completed);
-            if (FIB_WALK_FLAG_SYNC & fib_walk_history[ii].fwh_flags)
-                s = format(s, "sync, ");
-            if (FIB_WALK_FLAG_ASYNC & fib_walk_history[ii].fwh_flags)
-                s = format(s, "async, ");
-
-            s = format(s, "reason:");
-            jj = 0;
-            while (0 != fib_walk_history[ii].fwh_reason[jj])
-            {
-                FOR_EACH_FIB_NODE_BW_REASON(reason) {
-                    if ((1<<reason) & fib_walk_history[ii].fwh_reason[jj]) {
-                        s = format (s, "%s,", fib_node_bw_reason_names[reason]);
-                    }
-                }
-                jj++;
-            }
-            vlib_cli_output(vm, "%v", s);
-	}
-
-        ii--;
-        if (ii < 0)
-            ii = HISTORY_N_WALKS - 1;
-    }
-
-    return (NULL);
-}
-
-VLIB_CLI_COMMAND (fib_walk_show_command, static) = {
-    .path = "show fib walk",
-    .short_help = "show fib walk",
-    .function = fib_walk_show,
-};
-
-static clib_error_t *
-fib_walk_set_quota (vlib_main_t * vm,
-		    unformat_input_t * input,
-		    vlib_cli_command_t * cmd)
-{
-    clib_error_t * error = NULL;
-    f64 new_quota;
-
-    if (unformat (input, "%f", &new_quota))
-    {
-	quota = new_quota;
-    }
-    else
-    {
-	error = clib_error_return(0 , "Pass a float value");
-    }
-
-    return (error);
-}
-
-VLIB_CLI_COMMAND (fib_walk_set_quota_command, static) = {
-    .path = "set fib walk quota",
-    .short_help = "set fib walk quota",
-    .function = fib_walk_set_quota,
-};
-
-static clib_error_t *
-fib_walk_set_histogram_elements_size (vlib_main_t * vm,
-				      unformat_input_t * input,
-				      vlib_cli_command_t * cmd)
-{
-    clib_error_t * error = NULL;
-    u32 new;
-
-    if (unformat (input, "%d", &new))
-    {
-	fib_walk_work_nodes_visisted_incr = new;
-    }
-    else
-    {
-	error = clib_error_return(0 , "Pass an int value");
-    }
-
-    return (error);
-}
-
-VLIB_CLI_COMMAND (fib_walk_set_histogram_elements_size_command, static) = {
-    .path = "set fib walk histogram elements size",
-    .short_help = "set fib walk histogram elements size",
-    .function = fib_walk_set_histogram_elements_size,
-};
-
-static clib_error_t *
-fib_walk_clear (vlib_main_t * vm,
-		unformat_input_t * input,
-		vlib_cli_command_t * cmd)
-{
-    memset(fib_walk_hist_vists_per_walk, 0, sizeof(fib_walk_hist_vists_per_walk));
-    memset(fib_walk_history, 0, sizeof(fib_walk_history));
-    memset(fib_walk_work_time_taken, 0, sizeof(fib_walk_work_time_taken));
-    memset(fib_walk_work_nodes_visited, 0, sizeof(fib_walk_work_nodes_visited));
-    memset(fib_walk_sleep_lengths, 0, sizeof(fib_walk_sleep_lengths));
-
-    return (NULL);
-}
-
-VLIB_CLI_COMMAND (fib_walk_clear_command, static) = {
-    .path = "clear fib walk",
-    .short_help = "clear fib walk",
-    .function = fib_walk_clear,
-};
diff --git a/vnet/vnet/fib/fib_walk.h b/vnet/vnet/fib/fib_walk.h
deleted file mode 100644
index 7413d8a2..00000000
--- a/vnet/vnet/fib/fib_walk.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __FIB_WALK_H__
-#define __FIB_WALK_H__
-
-#include <vnet/fib/fib_node.h>
-
-/**
- * @brief Walk priorities.
- * Strict priorities. All walks a priority n are completed before n+1 is started.
- * Increasing numerical value implies decreasing priority.
- */
-typedef enum fib_walk_priority_t_
-{
-    FIB_WALK_PRIORITY_HIGH = 0,
-    FIB_WALK_PRIORITY_LOW  = 1,
-} fib_walk_priority_t;
-
-#define FIB_WALK_PRIORITY_NUM ((fib_walk_priority_t)(FIB_WALK_PRIORITY_LOW+1))
-
-#define FIB_WALK_PRIORITIES {           \
-    [FIB_WALK_PRIORITY_HIGH] = "high",  \
-    [FIB_WALK_PRIORITY_LOW]  = "low",   \
-}
-
-#define FOR_EACH_FIB_WALK_PRIORITY(_prio)         \
-    for ((_prio) = FIB_WALK_PRIORITY_HIGH;        \
-         (_prio) < FIB_WALK_PRIORITY_NUM;         \
-         (_prio)++)
-
-extern void fib_walk_module_init(void);
-
-extern void fib_walk_async(fib_node_type_t parent_type,
-                           fib_node_index_t parent_index,
-                           fib_walk_priority_t prio,
-                           fib_node_back_walk_ctx_t *ctx);
-
-extern void fib_walk_sync(fib_node_type_t parent_type,
-                          fib_node_index_t parent_index,
-                          fib_node_back_walk_ctx_t *ctx);
-
-extern u8* format_fib_walk_priority(u8 *s, va_list ap);
-
-#endif
-
diff --git a/vnet/vnet/fib/ip4_fib.c b/vnet/vnet/fib/ip4_fib.c
deleted file mode 100644
index f6ebce00..00000000
--- a/vnet/vnet/fib/ip4_fib.c
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/fib_entry.h>
-#include <vnet/fib/ip4_fib.h>
-
-/*
- * A table of pefixes to be added to tables and the sources for them
- */
-typedef struct ip4_fib_table_special_prefix_t_ {
-    fib_prefix_t ift_prefix;
-    fib_source_t ift_source;
-    fib_entry_flag_t ift_flag;
-} ip4_fib_table_special_prefix_t;
-
-static const ip4_fib_table_special_prefix_t ip4_specials[] = {
-    {
-	/* 0.0.0.0/0*/
-	.ift_prefix = {
-	    .fp_addr = {
-		.ip4.data_u32 = 0,
-	    },
-	    .fp_len  = 0,
-	    .fp_proto = FIB_PROTOCOL_IP4,
-	},
-	.ift_source = FIB_SOURCE_DEFAULT_ROUTE,
-	.ift_flag   = FIB_ENTRY_FLAG_DROP,
-    },
-    {
-	/* 0.0.0.0/32*/
-	.ift_prefix = {
-	    .fp_addr = {
-		.ip4.data_u32 = 0,
-	    },
-	    .fp_len  = 32,
-	    .fp_proto = FIB_PROTOCOL_IP4,
-	},
-	.ift_source = FIB_SOURCE_DEFAULT_ROUTE,
-	.ift_flag   = FIB_ENTRY_FLAG_DROP,
-    },
-    {
-	/*
-	 * 240.0.0.0/4
-	 * drop class E
-	 */
-	.ift_prefix = {
-	    .fp_addr = {
-		.ip4.data_u32 = 0xf0000000,
-	    },
-	    .fp_len   = 4,
-	    .fp_proto = FIB_PROTOCOL_IP4,
-	},
-	.ift_source = FIB_SOURCE_SPECIAL,
-	.ift_flag   = FIB_ENTRY_FLAG_DROP,
-
-    },
-    {
-	/*
-	 * 224.0.0.0/4
-	 * drop all mcast
-	 */
-	.ift_prefix = {
-	    .fp_addr = {
-		.ip4.data_u32 = 0xe0000000,
-	    },
-	    .fp_len   = 4,
-	    .fp_proto = FIB_PROTOCOL_IP4,
-	},
-	.ift_source = FIB_SOURCE_SPECIAL,
-	.ift_flag    = FIB_ENTRY_FLAG_DROP,
-    },
-    {
-	/*
-	 * 255.255.255.255/32
-	 * drop, but we'll allow it to be usurped by the likes of DHCP
-	 */
-	.ift_prefix = {
-	    .fp_addr = {
-		.ip4.data_u32 = 0xffffffff,
-	    },
-	    .fp_len   = 32,
-	    .fp_proto = FIB_PROTOCOL_IP4,
-	},
-	.ift_source = FIB_SOURCE_DEFAULT_ROUTE,
-	.ift_flag   = FIB_ENTRY_FLAG_DROP,
-    }
-};
-
-
-static u32
-ip4_create_fib_with_table_id (u32 table_id)
-{
-    fib_table_t *fib_table;
-
-    pool_get_aligned(ip4_main.fibs, fib_table, CLIB_CACHE_LINE_BYTES);
-    memset(fib_table, 0, sizeof(*fib_table));
-
-    fib_table->ft_proto = FIB_PROTOCOL_IP4;
-    fib_table->ft_index =
-	fib_table->v4.index =
-	    (fib_table - ip4_main.fibs);
-
-    hash_set (ip4_main.fib_index_by_table_id, table_id, fib_table->ft_index);
-
-    fib_table->ft_table_id =
-	fib_table->v4.table_id =
-	    table_id;
-    fib_table->ft_flow_hash_config = 
-	fib_table->v4.flow_hash_config =
-	    IP_FLOW_HASH_DEFAULT;
-    fib_table->v4.fwd_classify_table_index = ~0;
-    fib_table->v4.rev_classify_table_index = ~0;
-    
-    fib_table_lock(fib_table->ft_index, FIB_PROTOCOL_IP4);
-
-    ip4_mtrie_init(&fib_table->v4.mtrie);
-
-    /*
-     * add the special entries into the new FIB
-     */
-    int ii;
-
-    for (ii = 0; ii < ARRAY_LEN(ip4_specials); ii++)
-    {
-	fib_prefix_t prefix = ip4_specials[ii].ift_prefix;
-
-	prefix.fp_addr.ip4.data_u32 =
-	    clib_host_to_net_u32(prefix.fp_addr.ip4.data_u32);
-
-	fib_table_entry_special_add(fib_table->ft_index,
-				    &prefix,
-				    ip4_specials[ii].ift_source,
-				    ip4_specials[ii].ift_flag,
-				    ADJ_INDEX_INVALID);
-    }
-
-    return (fib_table->ft_index);
-}
-
-void
-ip4_fib_table_destroy (ip4_fib_t *fib)
-{
-    fib_table_t *fib_table = (fib_table_t*)fib;
-    int ii;
-
-    /*
-     * remove all the specials we added when the table was created.
-     */
-    for (ii = 0; ii < ARRAY_LEN(ip4_specials); ii++)
-    {
-	fib_prefix_t prefix = ip4_specials[ii].ift_prefix;
-
-	prefix.fp_addr.ip4.data_u32 =
-	    clib_host_to_net_u32(prefix.fp_addr.ip4.data_u32);
-
-	fib_table_entry_special_remove(fib_table->ft_index,
-				       &prefix,
-				       ip4_specials[ii].ift_source);
-    }
-
-    /*
-     * validate no more routes.
-     */
-    ASSERT(0 == fib_table->ft_total_route_counts);
-    FOR_EACH_FIB_SOURCE(ii)
-    {
-	ASSERT(0 == fib_table->ft_src_route_counts[ii]);
-    }
-
-    if (~0 != fib_table->ft_table_id)
-    {
-	hash_unset (ip4_main.fib_index_by_table_id, fib_table->ft_table_id);
-    }
-    pool_put(ip4_main.fibs, fib_table);
-}
-
-
-u32
-ip4_fib_table_find_or_create_and_lock (u32 table_id)
-{
-    u32 index;
-
-    index = ip4_fib_index_from_table_id(table_id);
-    if (~0 == index)
-	return ip4_create_fib_with_table_id(table_id);
-
-    fib_table_lock(index, FIB_PROTOCOL_IP4);
-
-    return (index);
-}
-
-u32
-ip4_fib_table_create_and_lock (void)
-{
-    return (ip4_create_fib_with_table_id(~0));
-}
-
-u32
-ip4_fib_table_get_index_for_sw_if_index (u32 sw_if_index)
-{
-    if (sw_if_index >= vec_len(ip4_main.fib_index_by_sw_if_index))
-    {
-	/*
-	 * This is the case for interfaces that are not yet mapped to
-	 * a IP table
-	 */
-	return (~0);
-    }
-    return (ip4_main.fib_index_by_sw_if_index[sw_if_index]);
-}
-
-flow_hash_config_t
-ip4_fib_table_get_flow_hash_config (u32 fib_index)
-{
-    return (ip4_fib_get(fib_index)->flow_hash_config);
-}
-
-/*
- * ip4_fib_table_lookup_exact_match
- *
- * Exact match prefix lookup
- */
-fib_node_index_t
-ip4_fib_table_lookup_exact_match (const ip4_fib_t *fib,
-				  const ip4_address_t *addr,
-				  u32 len)
-{
-    uword * hash, * result;
-    u32 key;
-
-    hash = fib->fib_entry_by_dst_address[len];
-    key  = (addr->data_u32 & ip4_main.fib_masks[len]);
-
-    result = hash_get(hash, key);
-
-    if (NULL != result) {
-	return (result[0]);
-    }
-    return (FIB_NODE_INDEX_INVALID);
-}
-
-/*
- * ip4_fib_table_lookup_adj
- *
- * Longest prefix match
- */
-index_t
-ip4_fib_table_lookup_lb (ip4_fib_t *fib,
-			 const ip4_address_t *addr)
-{
-    fib_node_index_t fei;
-
-    fei = ip4_fib_table_lookup(fib, addr, 32);
-
-    if (FIB_NODE_INDEX_INVALID != fei)
-    {
-	const dpo_id_t *dpo;
-
-	dpo = fib_entry_contribute_ip_forwarding(fei);
-
-	return (dpo->dpoi_index);
-    }
-    return (INDEX_INVALID);
-}
-
-/*
- * ip4_fib_table_lookup
- *
- * Longest prefix match
- */
-fib_node_index_t
-ip4_fib_table_lookup (const ip4_fib_t *fib,
-		      const ip4_address_t *addr,
-		      u32 len)
-{
-    uword * hash, * result;
-    i32 mask_len;
-    u32 key;
-
-    for (mask_len = len; mask_len >= 0; mask_len--)
-    {
-	hash = fib->fib_entry_by_dst_address[mask_len];
-	key = (addr->data_u32 & ip4_main.fib_masks[mask_len]);
-
-	result = hash_get (hash, key);
-
-	if (NULL != result) {
-	    return (result[0]);
-	}
-    }
-    return (FIB_NODE_INDEX_INVALID);
-}
-
-void
-ip4_fib_table_entry_insert (ip4_fib_t *fib,
-			    const ip4_address_t *addr,
-			    u32 len,
-			    fib_node_index_t fib_entry_index)
-{
-    uword * hash, * result;
-    u32 key;
-
-    key = (addr->data_u32 & ip4_main.fib_masks[len]);
-    hash = fib->fib_entry_by_dst_address[len];
-    result = hash_get (hash, key);
-
-    if (NULL == result) {
-	/*
-	 * adding a new entry
-	 */
-	if (NULL == hash) {
-	    hash = hash_create (32 /* elts */, sizeof (uword));
-	    hash_set_flags (hash, HASH_FLAG_NO_AUTO_SHRINK);
-	}
-	hash = hash_set(hash, key, fib_entry_index);
-	fib->fib_entry_by_dst_address[len] = hash;
-    }
-    else
-    {
-	ASSERT(0);
-    }
-}
-
-void
-ip4_fib_table_entry_remove (ip4_fib_t *fib,
-			    const ip4_address_t *addr,
-			    u32 len)
-{
-    uword * hash, * result;
-    u32 key;
-
-    key = (addr->data_u32 & ip4_main.fib_masks[len]);
-    hash = fib->fib_entry_by_dst_address[len];
-    result = hash_get (hash, key);
-
-    if (NULL == result)
-    {
-	/*
-	 * removing a non-existant entry. i'll allow it.
-	 */
-    }
-    else 
-    {
-	hash_unset(hash, key);
-    }
-
-    fib->fib_entry_by_dst_address[len] = hash;
-}
-
-void
-ip4_fib_table_fwding_dpo_update (ip4_fib_t *fib,
-				 const ip4_address_t *addr,
-				 u32 len,
-				 const dpo_id_t *dpo)
-{
-    ip4_fib_mtrie_add_del_route(fib, *addr, len, dpo->dpoi_index, 0); // ADD
-}
-
-void
-ip4_fib_table_fwding_dpo_remove (ip4_fib_t *fib,
-				 const ip4_address_t *addr,
-				 u32 len,
-				 const dpo_id_t *dpo)
-{
-    ip4_fib_mtrie_add_del_route(fib, *addr, len, dpo->dpoi_index, 1); // DELETE
-}
-
-static void
-ip4_fib_table_show_all (ip4_fib_t *fib,
-			vlib_main_t * vm)
-{
-    fib_node_index_t *fib_entry_indicies;
-    fib_node_index_t *fib_entry_index;
-    int i;
-
-    fib_entry_indicies = NULL;
-
-    for (i = 0; i < ARRAY_LEN (fib->fib_entry_by_dst_address); i++)
-    {
-	uword * hash = fib->fib_entry_by_dst_address[i];
-
-	if (NULL != hash)
-	{
-	    hash_pair_t * p;
-
-	    hash_foreach_pair (p, hash,
-	    ({
-		vec_add1(fib_entry_indicies, p->value[0]);
-	    }));
-	}
-    }
-
-    vec_sort_with_function(fib_entry_indicies, fib_entry_cmp_for_sort);
-
-    vec_foreach(fib_entry_index, fib_entry_indicies)
-    {
-	vlib_cli_output(vm, "%U",
-                        format_fib_entry,
-                        *fib_entry_index,
-                        FIB_ENTRY_FORMAT_BRIEF);
-    }
-
-    vec_free(fib_entry_indicies);
-}
-
-static void
-ip4_fib_table_show_one (ip4_fib_t *fib,
-			vlib_main_t * vm,
-			ip4_address_t *address,
-			u32 mask_len)
-{    
-    vlib_cli_output(vm, "%U",
-                    format_fib_entry,
-                    ip4_fib_table_lookup(fib, address, mask_len),
-                    FIB_ENTRY_FORMAT_DETAIL);
-}
-
-static clib_error_t *
-ip4_show_fib (vlib_main_t * vm,
-	      unformat_input_t * input,
-	      vlib_cli_command_t * cmd)
-{
-    ip4_main_t * im4 = &ip4_main;
-    fib_table_t * fib_table;
-    int verbose, matching, mtrie;
-    ip4_address_t matching_address;
-    u32 matching_mask = 32;
-    int i, table_id = -1, fib_index = ~0;
-
-    verbose = 1;
-    matching = 0;
-    mtrie = 0;
-    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-	if (unformat (input, "brief") || unformat (input, "summary")
-	    || unformat (input, "sum"))
-	    verbose = 0;
-
-	else if (unformat (input, "mtrie"))
-	    mtrie = 1;
-
-	else if (unformat (input, "%U/%d",
-			   unformat_ip4_address, &matching_address, &matching_mask))
-	    matching = 1;
-
-	else if (unformat (input, "%U", unformat_ip4_address, &matching_address))
-	    matching = 1;
-
-	else if (unformat (input, "table %d", &table_id))
-	    ;
-	else if (unformat (input, "index %d", &fib_index))
-	    ;
-	else
-	    break;
-    }
-
-    pool_foreach (fib_table, im4->fibs,
-    ({
-	ip4_fib_t *fib = &fib_table->v4;
-
-	if (table_id >= 0 && table_id != (int)fib->table_id)
-	    continue;
-	if (fib_index != ~0 && fib_index != (int)fib->index)
-	    continue;
-
-	vlib_cli_output (vm, "%U, fib_index %d, flow hash: %U", 
-			 format_fib_table_name, fib->index, FIB_PROTOCOL_IP4,
-			 fib->index,
-			 format_ip_flow_hash_config, fib->flow_hash_config);
-
-	/* Show summary? */
-	if (! verbose)
-	{
-	    vlib_cli_output (vm, "%=20s%=16s", "Prefix length", "Count");
-	    for (i = 0; i < ARRAY_LEN (fib->fib_entry_by_dst_address); i++)
-	    {
-		uword * hash = fib->fib_entry_by_dst_address[i];
-		uword n_elts = hash_elts (hash);
-		if (n_elts > 0)
-		    vlib_cli_output (vm, "%20d%16d", i, n_elts);
-	    }
-	    continue;
-	}
-
-	if (!matching)
-	{
-	    ip4_fib_table_show_all(fib, vm);
-	}
-	else
-	{
-	    ip4_fib_table_show_one(fib, vm, &matching_address, matching_mask);
-	}
-
-	if (mtrie)
-	    vlib_cli_output (vm, "%U", format_ip4_fib_mtrie, &fib->mtrie);
-    }));
-
-    return 0;
-}
-
-/*?
- * This command displays the IPv4 FIB Tables (VRF Tables) and the route
- * entries for each table.
- *
- * @note This command will run for a long time when the FIB tables are
- * comprised of millions of entries. For those senarios, consider displaying
- * a single table or summary mode.
- *
- * @cliexpar
- * Example of how to display all the IPv4 FIB tables:
- * @cliexstart{show ip fib}
- * ipv4-VRF:0, fib_index 0, flow hash: src dst sport dport proto
- * 0.0.0.0/0
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:0 buckets:1 uRPF:0 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 0.0.0.0/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:1 buckets:1 uRPF:1 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 6.0.1.2/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:30 buckets:1 uRPF:29 to:[0:0]]
- *     [0] [@3]: arp-ipv4: via 6.0.0.1 af_packet0
- * 7.0.0.1/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:31 buckets:4 uRPF:30 to:[0:0]]
- *     [0] [@3]: arp-ipv4: via 6.0.0.2 af_packet0
- *     [1] [@3]: arp-ipv4: via 6.0.0.2 af_packet0
- *     [2] [@3]: arp-ipv4: via 6.0.0.2 af_packet0
- *     [3] [@3]: arp-ipv4: via 6.0.0.1 af_packet0
- * 224.0.0.0/8
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:3 buckets:1 uRPF:3 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 240.0.0.0/8
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:2 buckets:1 uRPF:2 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 255.255.255.255/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:4 buckets:1 uRPF:4 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * ipv4-VRF:7, fib_index 1, flow hash: src dst sport dport proto
- * 0.0.0.0/0
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:12 buckets:1 uRPF:11 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 0.0.0.0/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:13 buckets:1 uRPF:12 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 172.16.1.0/24
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:17 buckets:1 uRPF:16 to:[0:0]]
- *     [0] [@4]: ipv4-glean: af_packet0
- * 172.16.1.1/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:18 buckets:1 uRPF:17 to:[1:84]]
- *     [0] [@2]: dpo-receive: 172.16.1.1 on af_packet0
- * 172.16.1.2/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:21 buckets:1 uRPF:20 to:[0:0]]
- *     [0] [@5]: ipv4 via 172.16.1.2 af_packet0: IP4: 02:fe:9e:70:7a:2b -> 26:a5:f6:9c:3a:36
- * 172.16.2.0/24
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:19 buckets:1 uRPF:18 to:[0:0]]
- *     [0] [@4]: ipv4-glean: af_packet1
- * 172.16.2.1/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:20 buckets:1 uRPF:19 to:[0:0]]
- *     [0] [@2]: dpo-receive: 172.16.2.1 on af_packet1
- * 224.0.0.0/8
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:15 buckets:1 uRPF:14 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 240.0.0.0/8
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:14 buckets:1 uRPF:13 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 255.255.255.255/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:16 buckets:1 uRPF:15 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * @cliexend
- * Example of how to display a single IPv4 FIB table:
- * @cliexstart{show ip fib table 7}
- * ipv4-VRF:7, fib_index 1, flow hash: src dst sport dport proto
- * 0.0.0.0/0
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:12 buckets:1 uRPF:11 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 0.0.0.0/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:13 buckets:1 uRPF:12 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 172.16.1.0/24
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:17 buckets:1 uRPF:16 to:[0:0]]
- *     [0] [@4]: ipv4-glean: af_packet0
- * 172.16.1.1/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:18 buckets:1 uRPF:17 to:[1:84]]
- *     [0] [@2]: dpo-receive: 172.16.1.1 on af_packet0
- * 172.16.1.2/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:21 buckets:1 uRPF:20 to:[0:0]]
- *     [0] [@5]: ipv4 via 172.16.1.2 af_packet0: IP4: 02:fe:9e:70:7a:2b -> 26:a5:f6:9c:3a:36
- * 172.16.2.0/24
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:19 buckets:1 uRPF:18 to:[0:0]]
- *     [0] [@4]: ipv4-glean: af_packet1
- * 172.16.2.1/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:20 buckets:1 uRPF:19 to:[0:0]]
- *     [0] [@2]: dpo-receive: 172.16.2.1 on af_packet1
- * 224.0.0.0/8
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:15 buckets:1 uRPF:14 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 240.0.0.0/8
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:14 buckets:1 uRPF:13 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 255.255.255.255/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:16 buckets:1 uRPF:15 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * @cliexend
- * Example of how to display a summary of all IPv4 FIB tables:
- * @cliexstart{show ip fib summary}
- * ipv4-VRF:0, fib_index 0, flow hash: src dst sport dport proto
- *     Prefix length         Count
- *                    0               1
- *                    8               2
- *                   32               4
- * ipv4-VRF:7, fib_index 1, flow hash: src dst sport dport proto
- *     Prefix length         Count
- *                    0               1
- *                    8               2
- *                   24               2
- *                   32               4
- * @cliexend
- ?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ip4_show_fib_command, static) = {
-    .path = "show ip fib",
-    .short_help = "show ip fib [summary] [table <table-id>] [index <fib-id>] [<ip4-addr>[/<mask>]] [mtrie]",
-    .function = ip4_show_fib,
-};
-/* *INDENT-ON* */
diff --git a/vnet/vnet/fib/ip4_fib.h b/vnet/vnet/fib/ip4_fib.h
deleted file mode 100644
index cf312cdc..00000000
--- a/vnet/vnet/fib/ip4_fib.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @brief The IPv4 FIB
- *
- * FIBs are composed of two prefix data-bases (akak tables). The non-forwarding
- * table contains all the routes that the control plane has programmed, the
- * forwarding table contains the sub-set of those routes that can be used to
- * forward packets.
- * In the IPv4 FIB the non-forwarding table is an array of hash tables indexed
- * by mask length, the forwarding table is an mtrie
- *
- * This IPv4 FIB is used by the protocol independent FIB. So directly using
- * this APIs in client code is not encouraged. However, this IPv4 FIB can be
- * used if all the client wants is an IPv4 prefix data-base
- */
-
-#ifndef __IP4_FIB_H__
-#define __IP4_FIB_H__
-
-#include <vlib/vlib.h>
-#include <vnet/ip/ip.h>
-#include <vnet/fib/fib_entry.h>
-#include <vnet/fib/fib_table.h>
-
-extern fib_node_index_t ip4_fib_table_lookup(const ip4_fib_t *fib,
-					     const ip4_address_t *addr,
-					     u32 len);
-extern fib_node_index_t ip4_fib_table_lookup_exact_match(const ip4_fib_t *fib,
-							 const ip4_address_t *addr,
-							 u32 len);
-
-extern void ip4_fib_table_entry_remove(ip4_fib_t *fib,
-				       const ip4_address_t *addr,
-				       u32 len);
-
-extern void ip4_fib_table_entry_insert(ip4_fib_t *fib,
-				       const ip4_address_t *addr,
-				       u32 len,
-				       fib_node_index_t fib_entry_index);
-extern void ip4_fib_table_destroy(ip4_fib_t *fib);
-
-extern void ip4_fib_table_fwding_dpo_update(ip4_fib_t *fib,
-					    const ip4_address_t *addr,
-					    u32 len,
-					    const dpo_id_t *dpo);
-
-extern void ip4_fib_table_fwding_dpo_remove(ip4_fib_t *fib,
-					    const ip4_address_t *addr,
-					    u32 len,
-					    const dpo_id_t *dpo);
-extern u32 ip4_fib_table_lookup_lb (ip4_fib_t *fib,
-				    const ip4_address_t * dst);
-
-/**
- * @brief Get the FIB at the given index
- */
-static inline ip4_fib_t *
-ip4_fib_get (u32 index)
-{
-    return (&(pool_elt_at_index(ip4_main.fibs, index)->v4));
-}
-
-always_inline u32
-ip4_fib_lookup (ip4_main_t * im, u32 sw_if_index, ip4_address_t * dst)
-{
-    return (ip4_fib_table_lookup_lb(
-		ip4_fib_get(vec_elt (im->fib_index_by_sw_if_index, sw_if_index)),
-		dst));
-}
-
-/**
- * @brief Get or create an IPv4 fib.
- *
- * Get or create an IPv4 fib with the provided table ID.
- *
- * @param table_id
- *      When set to \c ~0, an arbitrary and unused fib ID is picked
- *      and can be retrieved with \c ret->table_id.
- *      Otherwise, the fib ID to be used to retrieve or create the desired fib.
- * @returns A pointer to the retrieved or created fib.
- *
- */
-extern u32 ip4_fib_table_find_or_create_and_lock(u32 table_id);
-extern u32 ip4_fib_table_create_and_lock(void);
-
-
-static inline 
-u32 ip4_fib_index_from_table_id (u32 table_id)
-{
-  ip4_main_t * im = &ip4_main;
-  uword * p;
-
-  p = hash_get (im->fib_index_by_table_id, table_id);
-  if (!p)
-    return ~0;
-
-  return p[0];
-}
-
-extern u32 ip4_fib_table_get_index_for_sw_if_index(u32 sw_if_index);
-
-extern flow_hash_config_t ip4_fib_table_get_flow_hash_config(u32 fib_index);
-
-
-always_inline index_t
-ip4_fib_forwarding_lookup (u32 fib_index,
-                           const ip4_address_t * addr)
-{
-    ip4_fib_mtrie_leaf_t leaf;
-    ip4_fib_mtrie_t * mtrie;
-
-    mtrie = &ip4_fib_get(fib_index)->mtrie;
-
-    leaf = IP4_FIB_MTRIE_LEAF_ROOT;
-    leaf = ip4_fib_mtrie_lookup_step (mtrie, leaf, addr, 0);
-    leaf = ip4_fib_mtrie_lookup_step (mtrie, leaf, addr, 1);
-    leaf = ip4_fib_mtrie_lookup_step (mtrie, leaf, addr, 2);
-    leaf = ip4_fib_mtrie_lookup_step (mtrie, leaf, addr, 3);
-
-    /* Handle default route. */
-    leaf = (leaf == IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie->default_leaf : leaf);
-    
-    return (ip4_fib_mtrie_leaf_get_adj_index(leaf));
-}
-
-
-#endif
-
diff --git a/vnet/vnet/fib/ip6_fib.c b/vnet/vnet/fib/ip6_fib.c
deleted file mode 100644
index d5b9bdcb..00000000
--- a/vnet/vnet/fib/ip6_fib.c
+++ /dev/null
@@ -1,784 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/fib/fib_table.h>
-
-static void
-vnet_ip6_fib_init (u32 fib_index)
-{
-    fib_prefix_t pfx = {
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_len = 0,
-	.fp_addr = {
-	    .ip6 = {
-		{ 0, 0, },
-	    },
-	}
-    };
-
-    /*
-     * Add the default route.
-     */
-    fib_table_entry_special_add(fib_index,
-				&pfx,
-				FIB_SOURCE_DEFAULT_ROUTE,
-				FIB_ENTRY_FLAG_DROP,
-				ADJ_INDEX_INVALID);
-
-    /*
-     * Add ff02::1:ff00:0/104 via local route for all tables.
-     *  This is required for neighbor discovery to work.
-     */
-    ip6_set_solicited_node_multicast_address(&pfx.fp_addr.ip6, 0);
-    pfx.fp_len = 104;
-    fib_table_entry_special_add(fib_index,
-				&pfx,
-				FIB_SOURCE_SPECIAL,
-				FIB_ENTRY_FLAG_LOCAL,
-				ADJ_INDEX_INVALID);
-
-    /*
-     * Add all-routers multicast address via local route for all tables
-     */
-    ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6,
-					IP6_MULTICAST_SCOPE_link_local,
-					IP6_MULTICAST_GROUP_ID_all_routers);
-    pfx.fp_len = 128;
-    fib_table_entry_special_add(fib_index,
-				&pfx,
-				FIB_SOURCE_SPECIAL,
-				FIB_ENTRY_FLAG_LOCAL,
-				ADJ_INDEX_INVALID);
-
-    /*
-     * Add all-nodes multicast address via local route for all tables
-     */
-    ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6,
-					IP6_MULTICAST_SCOPE_link_local,
-					IP6_MULTICAST_GROUP_ID_all_hosts);
-    pfx.fp_len = 128;
-    fib_table_entry_special_add(fib_index,
-				&pfx,
-				FIB_SOURCE_SPECIAL,
-				FIB_ENTRY_FLAG_LOCAL,
-				ADJ_INDEX_INVALID);
-
-    /*
-     *  Add all-mldv2  multicast address via local route for all tables
-     */
-    ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6,
-					IP6_MULTICAST_SCOPE_link_local,
-					IP6_MULTICAST_GROUP_ID_mldv2_routers);
-    pfx.fp_len = 128;
-    fib_table_entry_special_add(fib_index,
-				&pfx,
-				FIB_SOURCE_SPECIAL,
-				FIB_ENTRY_FLAG_LOCAL,
-				ADJ_INDEX_INVALID);
-
-    /*
-     * all link local for us
-     */
-    pfx.fp_addr.ip6.as_u64[0] = clib_host_to_net_u64 (0xFE80000000000000ULL);
-    pfx.fp_addr.ip6.as_u64[1] = 0;
-    pfx.fp_len = 10;
-    fib_table_entry_special_add(fib_index,
-				&pfx,
-				FIB_SOURCE_SPECIAL,
-				FIB_ENTRY_FLAG_LOCAL,
-				ADJ_INDEX_INVALID);
-}
-
-static u32
-create_fib_with_table_id (u32 table_id)
-{
-    fib_table_t *fib_table;
-
-    pool_get_aligned(ip6_main.fibs, fib_table, CLIB_CACHE_LINE_BYTES);
-    memset(fib_table, 0, sizeof(*fib_table));
-
-    fib_table->ft_proto = FIB_PROTOCOL_IP6;
-    fib_table->ft_index =
-	fib_table->v6.index =
-	    (fib_table - ip6_main.fibs);
-
-    hash_set(ip6_main.fib_index_by_table_id, table_id, fib_table->ft_index);
-
-    fib_table->ft_table_id =
-	fib_table->v6.table_id =
-	    table_id;
-    fib_table->ft_flow_hash_config = 
-	fib_table->v6.flow_hash_config =
-	    IP_FLOW_HASH_DEFAULT;
-
-    vnet_ip6_fib_init(fib_table->ft_index);
-    fib_table_lock(fib_table->ft_index, FIB_PROTOCOL_IP6);
-
-    return (fib_table->ft_index);
-}
-
-u32
-ip6_fib_table_find_or_create_and_lock (u32 table_id)
-{
-    uword * p;
-
-    p = hash_get (ip6_main.fib_index_by_table_id, table_id);
-    if (NULL == p)
-	return create_fib_with_table_id(table_id);
-    
-    fib_table_lock(p[0], FIB_PROTOCOL_IP6);
-
-    return (p[0]);
-}
-
-u32
-ip6_fib_table_create_and_lock (void)
-{
-    return (create_fib_with_table_id(~0));
-}
-
-void
-ip6_fib_table_destroy (u32 fib_index)
-{
-    fib_prefix_t pfx = {
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_len = 0,
-	.fp_addr = {
-	    .ip6 = {
-		{ 0, 0, },
-	    },
-	}
-    };
-
-    /*
-     * the default route.
-     */
-    fib_table_entry_special_remove(fib_index,
-				   &pfx,
-				   FIB_SOURCE_DEFAULT_ROUTE);
-
-
-    /*
-     * ff02::1:ff00:0/104
-     */
-    ip6_set_solicited_node_multicast_address(&pfx.fp_addr.ip6, 0);
-    pfx.fp_len = 104;
-    fib_table_entry_special_remove(fib_index,
-				   &pfx,
-				   FIB_SOURCE_SPECIAL);
-
-    /*
-     * all-routers multicast address
-     */
-    ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6,
-					IP6_MULTICAST_SCOPE_link_local,
-					IP6_MULTICAST_GROUP_ID_all_routers);
-    pfx.fp_len = 128;
-    fib_table_entry_special_remove(fib_index,
-				   &pfx,
-				   FIB_SOURCE_SPECIAL);
-
-    /*
-     * all-nodes multicast address
-     */
-    ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6,
-					IP6_MULTICAST_SCOPE_link_local,
-					IP6_MULTICAST_GROUP_ID_all_hosts);
-    pfx.fp_len = 128;
-    fib_table_entry_special_remove(fib_index,
-				   &pfx,
-				   FIB_SOURCE_SPECIAL);
-
-    /*
-     * all-mldv2 multicast address
-     */
-    ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6,
-					IP6_MULTICAST_SCOPE_link_local,
-					IP6_MULTICAST_GROUP_ID_mldv2_routers);
-    pfx.fp_len = 128;
-    fib_table_entry_special_remove(fib_index,
-				   &pfx,
-				   FIB_SOURCE_SPECIAL);
-
-    /*
-     * all link local 
-     */
-    pfx.fp_addr.ip6.as_u64[0] = clib_host_to_net_u64 (0xFE80000000000000ULL);
-    pfx.fp_addr.ip6.as_u64[1] = 0;
-    pfx.fp_len = 10;
-    fib_table_entry_special_remove(fib_index,
-				   &pfx,
-				   FIB_SOURCE_SPECIAL);
-
-    fib_table_t *fib_table = fib_table_get(fib_index, FIB_PROTOCOL_IP6);
-    fib_source_t source;
-    
-     /*
-     * validate no more routes.
-     */
-    ASSERT(0 == fib_table->ft_total_route_counts);
-    FOR_EACH_FIB_SOURCE(source)
-    {
-	ASSERT(0 == fib_table->ft_src_route_counts[source]);
-    }
-
-    if (~0 != fib_table->ft_table_id)
-    {
-	hash_unset (ip6_main.fib_index_by_table_id, fib_table->ft_table_id);
-    }
-    pool_put(ip6_main.fibs, fib_table);
-}
-
-fib_node_index_t
-ip6_fib_table_lookup (u32 fib_index,
-		      const ip6_address_t *addr,
-		      u32 len)
-{
-    const ip6_fib_table_instance_t *table;
-    BVT(clib_bihash_kv) kv, value;
-    int i, n_p, rv;
-    u64 fib;
-
-    table = &ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING];
-    n_p = vec_len (table->prefix_lengths_in_search_order);
-
-    kv.key[0] = addr->as_u64[0];
-    kv.key[1] = addr->as_u64[1];
-    fib = ((u64)((fib_index))<<32);
-
-    /*
-     * start search from a mask length same length or shorter.
-     * we don't want matches longer than the mask passed
-     */
-    i = 0;
-    while (i < n_p && table->prefix_lengths_in_search_order[i] > len)
-    {
-        i++;
-    }
-
-    for (; i < n_p; i++)
-    {
-	int dst_address_length = table->prefix_lengths_in_search_order[i];
-	ip6_address_t * mask = &ip6_main.fib_masks[dst_address_length];
-      
-	ASSERT(dst_address_length >= 0 && dst_address_length <= 128);
-	//As lengths are decreasing, masks are increasingly specific.
-	kv.key[0] &= mask->as_u64[0];
-	kv.key[1] &= mask->as_u64[1];
-	kv.key[2] = fib | dst_address_length;
-      
-	rv = BV(clib_bihash_search_inline_2)(&table->ip6_hash, &kv, &value);
-	if (rv == 0)
-	    return value.value;
-    }
-
-    return (FIB_NODE_INDEX_INVALID);
-}
-
-fib_node_index_t
-ip6_fib_table_lookup_exact_match (u32 fib_index,
-				  const ip6_address_t *addr,
-				  u32 len)
-{
-    const ip6_fib_table_instance_t *table;
-    BVT(clib_bihash_kv) kv, value;
-    ip6_address_t *mask;
-    u64 fib;
-    int rv;
-
-    table = &ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING];
-    mask = &ip6_main.fib_masks[len];
-    fib = ((u64)((fib_index))<<32);
-
-    kv.key[0] = addr->as_u64[0] & mask->as_u64[0];
-    kv.key[1] = addr->as_u64[1] & mask->as_u64[1];
-    kv.key[2] = fib | len;
-      
-    rv = BV(clib_bihash_search_inline_2)(&table->ip6_hash, &kv, &value);
-    if (rv == 0)
-	return value.value;
-
-    return (FIB_NODE_INDEX_INVALID);
-}
-
-static void
-compute_prefix_lengths_in_search_order (ip6_fib_table_instance_t *table)
-{
-    int i;
-    vec_reset_length (table->prefix_lengths_in_search_order);
-    /* Note: bitmap reversed so this is in fact a longest prefix match */
-    clib_bitmap_foreach (i, table->non_empty_dst_address_length_bitmap,
-    ({
-	int dst_address_length = 128 - i;
-	vec_add1(table->prefix_lengths_in_search_order, dst_address_length);
-    }));
-}
-
-void
-ip6_fib_table_entry_remove (u32 fib_index,
-			    const ip6_address_t *addr,
-			    u32 len)
-{
-    ip6_fib_table_instance_t *table;
-    BVT(clib_bihash_kv) kv;
-    ip6_address_t *mask;
-    u64 fib;
-
-    table = &ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING];
-    mask = &ip6_main.fib_masks[len];
-    fib = ((u64)((fib_index))<<32);
-
-    kv.key[0] = addr->as_u64[0] & mask->as_u64[0];
-    kv.key[1] = addr->as_u64[1] & mask->as_u64[1];
-    kv.key[2] = fib | len;
-
-    BV(clib_bihash_add_del)(&table->ip6_hash, &kv, 0);
-
-    /* refcount accounting */
-    ASSERT (table->dst_address_length_refcounts[len] > 0);
-    if (--table->dst_address_length_refcounts[len] == 0)
-    {
-	table->non_empty_dst_address_length_bitmap =
-            clib_bitmap_set (table->non_empty_dst_address_length_bitmap, 
-                             128 - len, 0);
-	compute_prefix_lengths_in_search_order (table);
-    }
-}
-
-void
-ip6_fib_table_entry_insert (u32 fib_index,
-			    const ip6_address_t *addr,
-			    u32 len,
-			    fib_node_index_t fib_entry_index)
-{
-    ip6_fib_table_instance_t *table;
-    BVT(clib_bihash_kv) kv;
-    ip6_address_t *mask;
-    u64 fib;
-
-    table = &ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING];
-    mask = &ip6_main.fib_masks[len];
-    fib = ((u64)((fib_index))<<32);
-
-    kv.key[0] = addr->as_u64[0] & mask->as_u64[0];
-    kv.key[1] = addr->as_u64[1] & mask->as_u64[1];
-    kv.key[2] = fib | len;
-    kv.value = fib_entry_index;
-
-    BV(clib_bihash_add_del)(&table->ip6_hash, &kv, 1);
-
-    table->dst_address_length_refcounts[len]++;
-
-    table->non_empty_dst_address_length_bitmap =
-        clib_bitmap_set (table->non_empty_dst_address_length_bitmap, 
-			 128 - len, 1);
-    compute_prefix_lengths_in_search_order (table);
-}
-
-u32 
-ip6_fib_table_fwding_lookup (ip6_main_t * im,
-                             u32 fib_index,
-                             const ip6_address_t * dst)
-{
-    const ip6_fib_table_instance_t *table;
-    int i, len;
-    int rv;
-    BVT(clib_bihash_kv) kv, value;
-    u64 fib;
-
-    table = &ip6_main.ip6_table[IP6_FIB_TABLE_FWDING];
-    len = vec_len (table->prefix_lengths_in_search_order);
-
-    kv.key[0] = dst->as_u64[0];
-    kv.key[1] = dst->as_u64[1];
-    fib = ((u64)((fib_index))<<32);
-
-    for (i = 0; i < len; i++)
-    {
-	int dst_address_length = table->prefix_lengths_in_search_order[i];
-	ip6_address_t * mask = &ip6_main.fib_masks[dst_address_length];
-      
-	ASSERT(dst_address_length >= 0 && dst_address_length <= 128);
-	//As lengths are decreasing, masks are increasingly specific.
-	kv.key[0] &= mask->as_u64[0];
-	kv.key[1] &= mask->as_u64[1];
-	kv.key[2] = fib | dst_address_length;
-      
-	rv = BV(clib_bihash_search_inline_2)(&table->ip6_hash, &kv, &value);
-	if (rv == 0)
-	    return value.value;
-    }
-
-    /* default route is always present */
-    ASSERT(0);
-    return 0;
-}
-
-u32 ip6_fib_table_fwding_lookup_with_if_index (ip6_main_t * im,
-					       u32 sw_if_index,
-					       const ip6_address_t * dst)
-{
-    u32 fib_index = vec_elt (im->fib_index_by_sw_if_index, sw_if_index);
-    return ip6_fib_table_fwding_lookup(im, fib_index, dst);
-}
-
-flow_hash_config_t
-ip6_fib_table_get_flow_hash_config (u32 fib_index)
-{
-    return (ip6_fib_get(fib_index)->flow_hash_config);
-}
-
-u32
-ip6_fib_table_get_index_for_sw_if_index (u32 sw_if_index)
-{
-    if (sw_if_index >= vec_len(ip6_main.fib_index_by_sw_if_index))
-    {
-	/*
-	 * This is the case for interfaces that are not yet mapped to
-	 * a IP table
-	 */
-	return (~0);
-    }
-    return (ip6_main.fib_index_by_sw_if_index[sw_if_index]);
-}
-
-void
-ip6_fib_table_fwding_dpo_update (u32 fib_index,
-				 const ip6_address_t *addr,
-				 u32 len,
-				 const dpo_id_t *dpo)
-{
-    ip6_fib_table_instance_t *table;
-    BVT(clib_bihash_kv) kv;
-    ip6_address_t *mask;
-    u64 fib;
-
-    table = &ip6_main.ip6_table[IP6_FIB_TABLE_FWDING];
-    mask = &ip6_main.fib_masks[len];
-    fib = ((u64)((fib_index))<<32);
-
-    kv.key[0] = addr->as_u64[0] & mask->as_u64[0];
-    kv.key[1] = addr->as_u64[1] & mask->as_u64[1];
-    kv.key[2] = fib | len;
-    kv.value = dpo->dpoi_index;
-
-    BV(clib_bihash_add_del)(&table->ip6_hash, &kv, 1);
-
-    table->dst_address_length_refcounts[len]++;
-
-    table->non_empty_dst_address_length_bitmap =
-        clib_bitmap_set (table->non_empty_dst_address_length_bitmap, 
-			 128 - len, 1);
-    compute_prefix_lengths_in_search_order (table);
-}
-
-void
-ip6_fib_table_fwding_dpo_remove (u32 fib_index,
-				 const ip6_address_t *addr,
-				 u32 len,
-				 const dpo_id_t *dpo)
-{
-    ip6_fib_table_instance_t *table;
-    BVT(clib_bihash_kv) kv;
-    ip6_address_t *mask;
-    u64 fib;
-
-    table = &ip6_main.ip6_table[IP6_FIB_TABLE_FWDING];
-    mask = &ip6_main.fib_masks[len];
-    fib = ((u64)((fib_index))<<32);
-
-    kv.key[0] = addr->as_u64[0] & mask->as_u64[0];
-    kv.key[1] = addr->as_u64[1] & mask->as_u64[1];
-    kv.key[2] = fib | len;
-    kv.value = dpo->dpoi_index;
-
-    BV(clib_bihash_add_del)(&table->ip6_hash, &kv, 0);
-
-    /* refcount accounting */
-    ASSERT (table->dst_address_length_refcounts[len] > 0);
-    if (--table->dst_address_length_refcounts[len] == 0)
-    {
-	table->non_empty_dst_address_length_bitmap =
-            clib_bitmap_set (table->non_empty_dst_address_length_bitmap, 
-                             128 - len, 0);
-	compute_prefix_lengths_in_search_order (table);
-    }
-}
-
-typedef struct ip6_fib_show_ctx_t_ {
-    u32 fib_index;
-    fib_node_index_t *entries;
-} ip6_fib_show_ctx_t;
-
-static void
-ip6_fib_table_collect_entries (clib_bihash_kv_24_8_t * kvp,
-			       void *arg)
-{
-    ip6_fib_show_ctx_t *ctx = arg;
-
-    if ((kvp->key[2] >> 32) == ctx->fib_index)
-    {
-	vec_add1(ctx->entries, kvp->value);
-    }
-}
-
-static void
-ip6_fib_table_show_all (ip6_fib_t *fib,
-			vlib_main_t * vm)
-{
-    fib_node_index_t *fib_entry_index;
-    ip6_fib_show_ctx_t ctx = {
-	.fib_index = fib->index,
-	.entries = NULL,
-    };
-    ip6_main_t *im = &ip6_main;
-
-    BV(clib_bihash_foreach_key_value_pair)(&im->ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash,
-					   ip6_fib_table_collect_entries,
-					   &ctx);
-
-    vec_sort_with_function(ctx.entries, fib_entry_cmp_for_sort);
-
-    vec_foreach(fib_entry_index, ctx.entries)
-    {
-	vlib_cli_output(vm, "%U",
-                        format_fib_entry,
-                        *fib_entry_index,
-                        FIB_ENTRY_FORMAT_BRIEF);
-    }
-
-    vec_free(ctx.entries);
-}
-
-static void
-ip6_fib_table_show_one (ip6_fib_t *fib,
-			vlib_main_t * vm,
-			ip6_address_t *address,
-			u32 mask_len)
-{
-    vlib_cli_output(vm, "%U",
-                    format_fib_entry,
-                    ip6_fib_table_lookup(fib->index, address, mask_len),
-                    FIB_ENTRY_FORMAT_DETAIL);
-}
-
-typedef struct {
-  u32 fib_index;
-  u64 count_by_prefix_length[129];
-} count_routes_in_fib_at_prefix_length_arg_t;
-
-static void count_routes_in_fib_at_prefix_length 
-(BVT(clib_bihash_kv) * kvp, void *arg)
-{
-  count_routes_in_fib_at_prefix_length_arg_t * ap = arg;
-  int mask_width;
-
-  if ((kvp->key[2]>>32) != ap->fib_index)
-    return;
-
-  mask_width = kvp->key[2] & 0xFF;
-
-  ap->count_by_prefix_length[mask_width]++;
-}
-
-static clib_error_t *
-ip6_show_fib (vlib_main_t * vm,
-	      unformat_input_t * input,
-	      vlib_cli_command_t * cmd)
-{
-    count_routes_in_fib_at_prefix_length_arg_t _ca, *ca = &_ca;
-    ip6_main_t * im6 = &ip6_main;
-    fib_table_t *fib_table;
-    ip6_fib_t * fib;
-    int verbose, matching;
-    ip6_address_t matching_address;
-    u32 mask_len  = 128;
-    int table_id = -1, fib_index = ~0;
-
-    verbose = 1;
-    matching = 0;
-
-    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-	if (unformat (input, "brief")   ||
-	    unformat (input, "summary") ||
-	    unformat (input, "sum"))
-	    verbose = 0;
-
-	else if (unformat (input, "%U/%d",
-			   unformat_ip6_address, &matching_address, &mask_len))
-	    matching = 1;
-
-	else if (unformat (input, "%U", unformat_ip6_address, &matching_address))
-	    matching = 1;
-
-	else if (unformat (input, "table %d", &table_id))
-	    ;
-	else if (unformat (input, "index %d", &fib_index))
-	    ;
-	else
-	    break;
-    }
-
-    pool_foreach (fib_table, im6->fibs,
-    ({
-	fib = &(fib_table->v6);
-	if (table_id >= 0 && table_id != (int)fib->table_id)
-	    continue;
-	if (fib_index != ~0 && fib_index != (int)fib->index)
-	    continue;
-
-	vlib_cli_output (vm, "%s, fib_index %d, flow hash: %U", 
-			 fib_table->ft_desc, fib->index,
-			 format_ip_flow_hash_config, fib->flow_hash_config);
-
-	/* Show summary? */
-	if (! verbose)
-	{
-	    BVT(clib_bihash) * h = &im6->ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash;
-	    int len;
-
-	    vlib_cli_output (vm, "%=20s%=16s", "Prefix length", "Count");
-
-	    memset (ca, 0, sizeof(*ca));
-	    ca->fib_index = fib->index;
-
-	    BV(clib_bihash_foreach_key_value_pair)
-		(h, count_routes_in_fib_at_prefix_length, ca);
-
-	    for (len = 128; len >= 0; len--)
-            {
-		if (ca->count_by_prefix_length[len])
-		    vlib_cli_output (vm, "%=20d%=16lld", 
-				     len, ca->count_by_prefix_length[len]);
-            }
-	    continue;
-	}
-
-	if (!matching)
-	{
-	    ip6_fib_table_show_all(fib, vm);
-	}
-	else
-	{
-	    ip6_fib_table_show_one(fib, vm, &matching_address, mask_len);
-	}
-    }));
-
-    return 0;
-}
-
-/*?
- * This command displays the IPv6 FIB Tables (VRF Tables) and the route
- * entries for each table.
- *
- * @note This command will run for a long time when the FIB tables are
- * comprised of millions of entries. For those senarios, consider displaying
- * in summary mode.
- *
- * @cliexpar
- * @parblock
- * Example of how to display all the IPv6 FIB tables:
- * @cliexstart{show ip6 fib}
- * ipv6-VRF:0, fib_index 0, flow hash: src dst sport dport proto
- * @::/0
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:5 buckets:1 uRPF:5 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * fe80::/10
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:10 buckets:1 uRPF:10 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ff02::1/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:8 buckets:1 uRPF:8 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ff02::2/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:7 buckets:1 uRPF:7 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ff02::16/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:9 buckets:1 uRPF:9 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ff02::1:ff00:0/104
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:6 buckets:1 uRPF:6 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ipv6-VRF:8, fib_index 1, flow hash: src dst sport dport proto
- * @::/0
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:21 buckets:1 uRPF:20 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * @::a:1:1:0:4/126
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:27 buckets:1 uRPF:26 to:[0:0]]
- *     [0] [@4]: ipv6-glean: af_packet0
- * @::a:1:1:0:7/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:28 buckets:1 uRPF:27 to:[0:0]]
- *     [0] [@2]: dpo-receive: @::a:1:1:0:7 on af_packet0
- * fe80::/10
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:26 buckets:1 uRPF:25 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * fe80::fe:3eff:fe3e:9222/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:29 buckets:1 uRPF:28 to:[0:0]]
- *     [0] [@2]: dpo-receive: fe80::fe:3eff:fe3e:9222 on af_packet0
- * ff02::1/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:24 buckets:1 uRPF:23 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ff02::2/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:23 buckets:1 uRPF:22 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ff02::16/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:25 buckets:1 uRPF:24 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ff02::1:ff00:0/104
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:22 buckets:1 uRPF:21 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * @cliexend
- *
- * Example of how to display a summary of all IPv6 FIB tables:
- * @cliexstart{show ip6 fib summary}
- * ipv6-VRF:0, fib_index 0, flow hash: src dst sport dport proto
- *     Prefix length         Count
- *          128                3
- *          104                1
- *          10                 1
- *           0                 1
- * ipv6-VRF:8, fib_index 1, flow hash: src dst sport dport proto
- *     Prefix length         Count
- *          128                5
- *          126                1
- *          104                1
- *          10                 1
- *           0                 1
- * @cliexend
- * @endparblock
- ?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ip6_show_fib_command, static) = {
-    .path = "show ip6 fib",
-    .short_help = "show ip6 fib [summary] [table <table-id>] [index <fib-id>] [<ip6-addr>[/<width>]]",
-    .function = ip6_show_fib,
-};
-/* *INDENT-ON* */
diff --git a/vnet/vnet/fib/ip6_fib.h b/vnet/vnet/fib/ip6_fib.h
deleted file mode 100644
index f6af993a..00000000
--- a/vnet/vnet/fib/ip6_fib.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __IP6_FIB_H__
-#define __IP6_FIB_H__
-
-#include <vlib/vlib.h>
-#include <vnet/ip/format.h>
-#include <vnet/fib/fib_entry.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/ip/lookup.h>
-#include <vnet/dpo/load_balance.h>
-
-extern fib_node_index_t ip6_fib_table_lookup(u32 fib_index,
-					     const ip6_address_t *addr,
-					     u32 len);
-extern fib_node_index_t ip6_fib_table_lookup_exact_match(u32 fib_index,
-							 const ip6_address_t *addr,
-							 u32 len);
-
-extern void ip6_fib_table_entry_remove(u32 fib_index,
-				       const ip6_address_t *addr,
-				       u32 len);
-
-extern void ip6_fib_table_entry_insert(u32 fib_index,
-				       const ip6_address_t *addr,
-				       u32 len,
-				       fib_node_index_t fib_entry_index);
-extern void ip6_fib_table_destroy(u32 fib_index);
-
-extern void ip6_fib_table_fwding_dpo_update(u32 fib_index,
-					    const ip6_address_t *addr,
-					    u32 len,
-					    const dpo_id_t *dpo);
-
-extern void ip6_fib_table_fwding_dpo_remove(u32 fib_index,
-					    const ip6_address_t *addr,
-					    u32 len,
-					    const dpo_id_t *dpo);
-
-u32 ip6_fib_table_fwding_lookup_with_if_index(ip6_main_t * im,
-					      u32 sw_if_index,
-					      const ip6_address_t * dst);
-u32 ip6_fib_table_fwding_lookup(ip6_main_t * im,
-				u32 fib_index, 
-				const ip6_address_t * dst);
-
-/**
- * @biref return the DPO that the LB stacks on.
- */
-always_inline u32
-ip6_src_lookup_for_packet (ip6_main_t * im,
-                           vlib_buffer_t * b,
-                           ip6_header_t * i)
-{
-    if (vnet_buffer (b)->ip.adj_index[VLIB_RX] == ~0)
-    {
-        const dpo_id_t *dpo;
-        index_t lbi;
-
-        lbi = ip6_fib_table_fwding_lookup_with_if_index(
-                  im,
-                  vnet_buffer (b)->sw_if_index[VLIB_RX],
-                  &i->src_address);
-
-        dpo = load_balance_get_bucket_i(load_balance_get(lbi), 0);
-
-        if (dpo_is_adj(dpo))
-        {
-            vnet_buffer (b)->ip.adj_index[VLIB_RX] = dpo->dpoi_index;
-        }
-    }
-    return vnet_buffer (b)->ip.adj_index[VLIB_RX];
-}
-
-/**
- * \brief Get or create an IPv6 fib.
- *
- * Get or create an IPv4 fib with the provided table ID.
- *
- * \param im
- *      ip4_main pointer.
- * \param table_id
- *      When set to \c ~0, an arbitrary and unused fib ID is picked
- *      and can be retrieved with \c ret->table_id.
- *      Otherwise, the fib ID to be used to retrieve or create the desired fib.
- * \returns A pointer to the retrieved or created fib.
- *
- */
-extern u32 ip6_fib_table_find_or_create_and_lock(u32 table_id);
-extern u32 ip6_fib_table_create_and_lock(void);
-
-static inline ip6_fib_t *
-ip6_fib_get (fib_node_index_t index)
-{
-    ASSERT(!pool_is_free_index(ip6_main.fibs, index));
-    return (&pool_elt_at_index (ip6_main.fibs, index)->v6);
-}
-
-static inline 
-u32 ip6_fib_index_from_table_id (u32 table_id)
-{
-  ip6_main_t * im = &ip6_main;
-  uword * p;
-
-  p = hash_get (im->fib_index_by_table_id, table_id);
-  if (!p)
-    return ~0;
-
-  return p[0];
-}
-
-extern u32 ip6_fib_table_get_index_for_sw_if_index(u32 sw_if_index);
-
-extern flow_hash_config_t ip6_fib_table_get_flow_hash_config(u32 fib_index);
-
-#endif
-
diff --git a/vnet/vnet/fib/mpls_fib.c b/vnet/vnet/fib/mpls_fib.c
deleted file mode 100644
index 6a9b1ac2..00000000
--- a/vnet/vnet/fib/mpls_fib.c
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * mpls_fib.h: The Label/MPLS FIB
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * An MPLS_FIB table;
- *
- * The entries in the table are programmed wtih one or more MOIs. These MOIs
- * may result in different forwarding actions for end-of-stack (EOS) and non-EOS
- * packets. Whether the two actions are the same more often than they are
- * different, or vice versa, is a function of the deployment in which the router
- * is used and thus not predictable.
- * The desgin choice to make with an MPLS_FIB table is:
- *  1 - 20 bit key: label only.
- *      When the EOS and non-EOS actions differ the result is a 'EOS-choice' object.
- *  2 - 21 bit key: label and EOS-bit.
- *      The result is then the specific action based on EOS-bit.
- *
- * 20 bit key:
- *   Advantages:
- *    - lower memory overhead, since there are few DB entries.
- *   Disadvantages:
- *    - slower DP performance in the case the chains differ, as more objects are
- *      encounterd in the switch path
- *
- * 21 bit key:
- *   Advantages:
- *    - faster DP performance
- *   Disadvantages
- *    - increased memory footprint.
- *
- * Switching between schemes based on observed/measured action similarity is not
- * considered on the grounds of complexity and flip-flopping.
- *
- * VPP mantra - favour performance over memory. We choose a 21 bit key.  
- */
-
-#include <vnet/fib/fib_table.h>
-#include <vnet/dpo/load_balance.h>
-#include <vnet/dpo/drop_dpo.h>
-#include <vnet/dpo/punt_dpo.h>
-#include <vnet/dpo/lookup_dpo.h>
-#include <vnet/mpls/mpls.h>
-
-/**
- * All lookups in an MPLS_FIB table must result in a DPO of type load-balance.
- * This is the default result which links to drop
- */
-static index_t mpls_fib_drop_dpo_index = INDEX_INVALID;
-
-/**
- * FIXME
- */
-#define MPLS_FLOW_HASH_DEFAULT 0
-
-static inline u32
-mpls_fib_entry_mk_key (mpls_label_t label,
-		       mpls_eos_bit_t eos)
-{
-    ASSERT(eos <= 1);
-    return (label << 1 | eos);
-}
-
-u32
-mpls_fib_index_from_table_id (u32 table_id)
-{
-    mpls_main_t *mm = &mpls_main;
-    uword * p;
-
-    p = hash_get (mm->fib_index_by_table_id, table_id);
-    if (!p)
-	return FIB_NODE_INDEX_INVALID;
-
-    return p[0];
-}
-
-static u32
-mpls_fib_create_with_table_id (u32 table_id)
-{
-    dpo_id_t dpo = DPO_INVALID;
-    fib_table_t *fib_table;
-    mpls_eos_bit_t eos;
-    mpls_fib_t *mf;
-    int i;
-
-    pool_get_aligned(mpls_main.fibs, fib_table, CLIB_CACHE_LINE_BYTES);
-    memset(fib_table, 0, sizeof(*fib_table));
-
-    fib_table->ft_proto = FIB_PROTOCOL_MPLS;
-    fib_table->ft_index =
-	(fib_table - mpls_main.fibs);
-
-    hash_set (mpls_main.fib_index_by_table_id, table_id, fib_table->ft_index);
-
-    fib_table->ft_table_id =
-	table_id;
-    fib_table->ft_flow_hash_config = 
-	MPLS_FLOW_HASH_DEFAULT;
-    fib_table->v4.fwd_classify_table_index = ~0;
-    fib_table->v4.rev_classify_table_index = ~0;
-    
-    fib_table_lock(fib_table->ft_index, FIB_PROTOCOL_MPLS);
-
-    if (INDEX_INVALID == mpls_fib_drop_dpo_index)
-    {
-	mpls_fib_drop_dpo_index = load_balance_create(1, DPO_PROTO_MPLS, 0);
-	load_balance_set_bucket(mpls_fib_drop_dpo_index,
-				0,
-                                drop_dpo_get(DPO_PROTO_MPLS));
-    }
-
-    mf = &fib_table->mpls;
-    mf->mf_entries = hash_create(0, sizeof(fib_node_index_t));
-    for (i = 0; i < MPLS_FIB_DB_SIZE; i++)
-    {
-	/*
-	 * initialise each DPO in the data-path lookup table
-	 * to be the special MPLS drop
-	 */
-	mf->mf_lbs[i] = mpls_fib_drop_dpo_index;
-    }
-
-    /*
-     * non-default forwarding for the special labels.
-     */
-    fib_prefix_t prefix = {
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_payload_proto = DPO_PROTO_MPLS,
-    };
-
-    /*
-     * PUNT the router alert, both EOS and non-eos
-     */
-    prefix.fp_label = MPLS_IETF_ROUTER_ALERT_LABEL;
-    FOR_EACH_MPLS_EOS_BIT(eos)
-    {
-	prefix.fp_eos = eos;
-        fib_table_entry_special_dpo_add(fib_table->ft_index,
-					&prefix,
-					FIB_SOURCE_SPECIAL,
-					FIB_ENTRY_FLAG_EXCLUSIVE,
-					punt_dpo_get(DPO_PROTO_MPLS));
-    }
-
-    /*
-     * IPv4 explicit NULL EOS lookup in the interface's IPv4 table
-     */
-    prefix.fp_label = MPLS_IETF_IPV4_EXPLICIT_NULL_LABEL;
-    prefix.fp_payload_proto = DPO_PROTO_IP4;
-    prefix.fp_eos = MPLS_EOS;
-
-    lookup_dpo_add_or_lock_w_fib_index(0, // unused
-                                       DPO_PROTO_IP4,
-                                       LOOKUP_INPUT_DST_ADDR,
-                                       LOOKUP_TABLE_FROM_INPUT_INTERFACE,
-                                       &dpo);
-    fib_table_entry_special_dpo_add(fib_table->ft_index,
-				    &prefix,
-				    FIB_SOURCE_SPECIAL,
-				    FIB_ENTRY_FLAG_EXCLUSIVE,
-                                    &dpo);
-
-    prefix.fp_payload_proto = DPO_PROTO_MPLS;
-    prefix.fp_eos = MPLS_NON_EOS;
-
-    lookup_dpo_add_or_lock_w_fib_index(0, //unsued
-                                       DPO_PROTO_MPLS,
-                                       LOOKUP_INPUT_DST_ADDR,
-                                       LOOKUP_TABLE_FROM_INPUT_INTERFACE,
-                                       &dpo);
-    fib_table_entry_special_dpo_add(fib_table->ft_index,
-				    &prefix,
-				    FIB_SOURCE_SPECIAL,
-				    FIB_ENTRY_FLAG_EXCLUSIVE,
-                                    &dpo);
-
-    /*
-     * IPv6 explicit NULL EOS lookup in the interface's IPv6 table
-     */
-    prefix.fp_label = MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL;
-    prefix.fp_payload_proto = DPO_PROTO_IP6;
-    prefix.fp_eos = MPLS_EOS;
-
-    lookup_dpo_add_or_lock_w_fib_index(0, //unused
-                                       DPO_PROTO_IP6,
-                                       LOOKUP_INPUT_DST_ADDR,
-                                       LOOKUP_TABLE_FROM_INPUT_INTERFACE,
-                                       &dpo);
-    fib_table_entry_special_dpo_add(fib_table->ft_index,
-				    &prefix,
-				    FIB_SOURCE_SPECIAL,
-				    FIB_ENTRY_FLAG_EXCLUSIVE,
-                                    &dpo);
-
-    prefix.fp_payload_proto = DPO_PROTO_MPLS;
-    prefix.fp_eos = MPLS_NON_EOS;
-    lookup_dpo_add_or_lock_w_fib_index(0, // unsued
-                                       DPO_PROTO_MPLS,
-                                       LOOKUP_INPUT_DST_ADDR,
-                                       LOOKUP_TABLE_FROM_INPUT_INTERFACE,
-                                       &dpo);
-    fib_table_entry_special_dpo_add(fib_table->ft_index,
-				    &prefix,
-				    FIB_SOURCE_SPECIAL,
-				    FIB_ENTRY_FLAG_EXCLUSIVE,
-                                    &dpo);
-
-    return (fib_table->ft_index);
-}
-
-u32
-mpls_fib_table_find_or_create_and_lock (u32 table_id)
-{
-    u32 index;
-
-    index = mpls_fib_index_from_table_id(table_id);
-    if (~0 == index)
-	return mpls_fib_create_with_table_id(table_id);
-
-    fib_table_lock(index, FIB_PROTOCOL_MPLS);
-
-    return (index);
-}
-u32
-mpls_fib_table_create_and_lock (void)
-{
-    return (mpls_fib_create_with_table_id(~0));
-}
-
-void
-mpls_fib_table_destroy (mpls_fib_t *mf)
-{
-    fib_table_t *fib_table = (fib_table_t*)mf;
-    fib_prefix_t prefix = {
-	.fp_proto = FIB_PROTOCOL_MPLS,
-    };
-    mpls_label_t special_labels[] = {
-	MPLS_IETF_ROUTER_ALERT_LABEL,
-	MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL,
-	MPLS_IETF_IPV4_EXPLICIT_NULL_LABEL,
-    };
-    mpls_eos_bit_t eos;
-    u32 ii;
-
-    for (ii = 0; ii < ARRAY_LEN(special_labels); ii++)
-    {
-	FOR_EACH_MPLS_EOS_BIT(eos)
-	{
-	    prefix.fp_label = special_labels[ii];
-	    prefix.fp_eos   = eos;
-
-	    fib_table_entry_delete(fib_table->ft_index,
-				   &prefix,
-				   FIB_SOURCE_SPECIAL);
-	}
-    }
-    if (~0 != fib_table->ft_table_id)
-    {
-	hash_unset(mpls_main.fib_index_by_table_id,
-		   fib_table->ft_table_id);
-    }
-    hash_delete(mf->mf_entries);
-
-    pool_put(mpls_main.fibs, fib_table);
-}
-
-fib_node_index_t
-mpls_fib_table_lookup (const mpls_fib_t *mf,
-		       mpls_label_t label,
-		       mpls_eos_bit_t eos)
-{
-    uword *p;
-
-    p = hash_get(mf->mf_entries, mpls_fib_entry_mk_key(label, eos));
-
-    if (NULL == p)
-	return FIB_NODE_INDEX_INVALID;
-
-    return p[0];
-}
-
-void
-mpls_fib_table_entry_insert (mpls_fib_t *mf,
-			     mpls_label_t label,
-			     mpls_eos_bit_t eos,
-			     fib_node_index_t lfei)
-{
-    hash_set(mf->mf_entries, mpls_fib_entry_mk_key(label, eos), lfei);
-}
-
-void
-mpls_fib_table_entry_remove (mpls_fib_t *mf,
-			     mpls_label_t label,
-			     mpls_eos_bit_t eos)
-{
-    hash_unset(mf->mf_entries, mpls_fib_entry_mk_key(label, eos));
-}
-
-void
-mpls_fib_forwarding_table_update (mpls_fib_t *mf,
-				  mpls_label_t label,
-				  mpls_eos_bit_t eos,
-				  const dpo_id_t *dpo)
-{
-    mpls_label_t key;
-
-    ASSERT(DPO_LOAD_BALANCE == dpo->dpoi_type);
-
-    key = mpls_fib_entry_mk_key(label, eos);
-
-    mf->mf_lbs[key] = dpo->dpoi_index;
-}
-
-void
-mpls_fib_forwarding_table_reset (mpls_fib_t *mf,
-				 mpls_label_t label,
-				 mpls_eos_bit_t eos)
-{
-    mpls_label_t key;
-
-    key = mpls_fib_entry_mk_key(label, eos);
-
-    mf->mf_lbs[key] = mpls_fib_drop_dpo_index;
-}
-
-flow_hash_config_t
-mpls_fib_table_get_flow_hash_config (u32 fib_index)
-{
-    // FIXME.
-    return (0);
-}
-
-static void
-mpls_fib_table_show_all (const mpls_fib_t *mpls_fib,
-			 vlib_main_t * vm)
-{
-    fib_node_index_t lfei, *lfeip, *lfeis = NULL;
-    mpls_label_t key;
-
-    hash_foreach(key, lfei, mpls_fib->mf_entries,
-    ({
-	vec_add1(lfeis, lfei);
-    }));
-
-    vec_sort_with_function(lfeis, fib_entry_cmp_for_sort);
-
-    vec_foreach(lfeip, lfeis)
-    {
-	vlib_cli_output (vm, "%U",
-			 format_fib_entry, *lfeip,
-			 FIB_ENTRY_FORMAT_DETAIL);
-    }
-    vec_free(lfeis);
-}
-
-static void
-mpls_fib_table_show_one (const mpls_fib_t *mpls_fib,
-			 mpls_label_t label,
-			 vlib_main_t * vm)
-{    
-    fib_node_index_t lfei;
-    mpls_eos_bit_t eos;
-
-    FOR_EACH_MPLS_EOS_BIT(eos)
-    {    
-	lfei = mpls_fib_table_lookup(mpls_fib, label, eos);
-
-	if (FIB_NODE_INDEX_INVALID != lfei)
-	{
-	    vlib_cli_output (vm, "%U", 
-			     format_fib_entry, lfei, FIB_ENTRY_FORMAT_DETAIL);
-	}
-    }
-}
-
-static clib_error_t *
-mpls_fib_show (vlib_main_t * vm,
-	       unformat_input_t * input,
-	       vlib_cli_command_t * cmd)
-{
-    fib_table_t * fib_table;
-    mpls_label_t label;
-    int table_id;
-
-    table_id = -1;
-    label = MPLS_LABEL_INVALID;
-
-    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-	/* if (unformat (input, "brief") || unformat (input, "summary") */
-	/*     || unformat (input, "sum")) */
-	/*     verbose = 0; */
-
-	if (unformat (input, "%d", &label))
-	    continue;
-	else if (unformat (input, "table %d", &table_id))
-	    ;
-	else
-	    break;
-    }
-
-    pool_foreach (fib_table, mpls_main.fibs,
-    ({
-	if (table_id >= 0 && table_id != fib_table->ft_table_id)
-	    continue;
-
-	vlib_cli_output (vm, "%v, fib_index %d",
-			 fib_table->ft_desc, mpls_main.fibs - fib_table);
-
-	if (MPLS_LABEL_INVALID == label)
-	{
-	    mpls_fib_table_show_all(&(fib_table->mpls), vm);
-	}
-	else
-	{
-	    mpls_fib_table_show_one(&(fib_table->mpls), label, vm);
-	}
-    }));
-
-    return 0;
-}
-
-VLIB_CLI_COMMAND (mpls_fib_show_command, static) = {
-    .path = "show mpls fib",
-    .short_help = "show mpls fib [summary] [table <n>]",
-    .function = mpls_fib_show,
-};
diff --git a/vnet/vnet/fib/mpls_fib.h b/vnet/vnet/fib/mpls_fib.h
deleted file mode 100644
index 93ae4623..00000000
--- a/vnet/vnet/fib/mpls_fib.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * mpls_fib.h: The Label/MPLS FIB
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __MPLS_FIB_TABLE_H__
-#define __MPLS_FIB_TABLE_H__
-
-#include <vnet/vnet.h>
-#include <vnet/mpls/mpls.h>
-#include <vnet/fib/fib_types.h>
-#include <vnet/dpo/dpo.h>
-#include <vnet/mpls/mpls.h>
-#include <vnet/fib/fib_table.h>
-
-static inline mpls_fib_t*
-mpls_fib_get (fib_node_index_t index)
-{
-    if (!pool_is_free_index(mpls_main.fibs, index))
-	return (&(pool_elt_at_index(mpls_main.fibs, index)->mpls));
-    return (NULL);
-}
-
-extern u32 mpls_fib_table_find_or_create_and_lock(u32 table_id);
-extern u32 mpls_fib_table_create_and_lock(void);
-// extern mpls_fib_t * mpls_fib_find(u32 table_id);
-extern u32 mpls_fib_index_from_table_id(u32 table_id);
-
-extern u8 *format_mpls_fib_table_name(u8 * s, va_list * args);
-
-extern fib_node_index_t mpls_fib_table_entry_add_from_ip_fib_entry (
-    u32 table_id,
-    mpls_label_t label,
-    mpls_eos_bit_t eos,
-    fib_node_index_t fib_entry_index);
-
-
-extern fib_node_index_t mpls_fib_table_lookup(const mpls_fib_t *mf,
-					      mpls_label_t label,
-					      mpls_eos_bit_t eos);
-
-extern void mpls_fib_table_entry_remove(mpls_fib_t *mf,
-					mpls_label_t label,
-					mpls_eos_bit_t eos);
-extern void mpls_fib_table_entry_insert(mpls_fib_t *mf,
-					mpls_label_t label,
-					mpls_eos_bit_t eos,
-					fib_node_index_t fei);
-extern void mpls_fib_table_destroy(mpls_fib_t *mf);
-
-
-
-extern void mpls_fib_forwarding_table_update(mpls_fib_t *mf,
-					     mpls_label_t label,
-					     mpls_eos_bit_t eos,
-					     const dpo_id_t *dpo);
-extern void mpls_fib_forwarding_table_reset(mpls_fib_t *mf,
-					    mpls_label_t label,
-					    mpls_eos_bit_t eos);
-
-/**
- * @brief
- *  Lookup a label and EOS bit in the MPLS_FIB table to retrieve the
- *  load-balance index to be used for packet forwarding.
- */
-static inline index_t
-mpls_fib_table_forwarding_lookup (u32 mpls_fib_index,
-				  const mpls_unicast_header_t *hdr)
-{
-    mpls_label_t label;
-    mpls_fib_t *mf;
-    u32 key;
-
-    label = clib_net_to_host_u32(hdr->label_exp_s_ttl);
-    key = (vnet_mpls_uc_get_label(label) << 1) | vnet_mpls_uc_get_s(label);
-
-    mf = mpls_fib_get(mpls_fib_index);
-
-    return (mf->mf_lbs[key]);
-}
-
-static inline u32
-mpls_fib_table_get_index_for_sw_if_index (u32 sw_if_index)
-{
-    mpls_main_t *mm = &mpls_main;
-
-    ASSERT(vec_len(mm->fib_index_by_sw_if_index) > sw_if_index);
-
-    return (mm->fib_index_by_sw_if_index[sw_if_index]);
-}
-
-extern flow_hash_config_t mpls_fib_table_get_flow_hash_config(u32 fib_index);
-
-#endif
diff --git a/vnet/vnet/flow/flow_report.c b/vnet/vnet/flow/flow_report.c
deleted file mode 100644
index c78a78a9..00000000
--- a/vnet/vnet/flow/flow_report.c
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * flow_report.c
- */
-#include <vnet/flow/flow_report.h>
-#include <vnet/api_errno.h>
-
-flow_report_main_t flow_report_main;
-
-static_always_inline u8 stream_index_valid (u32 index)
-{
-  flow_report_main_t * frm = &flow_report_main;
-  return index < vec_len(frm->streams) &&
-         frm->streams[index].domain_id != ~0;
-}
-
-static_always_inline flow_report_stream_t * add_stream (void)
-{
-  flow_report_main_t * frm = &flow_report_main;
-  u32 i;
-  for (i = 0; i < vec_len(frm->streams); i++)
-    if (!stream_index_valid(i))
-      return &frm->streams[i];
-  u32 index = vec_len(frm->streams);
-  vec_validate(frm->streams, index);
-  return &frm->streams[index];
-}
-
-static_always_inline void delete_stream (u32 index)
-{
-  flow_report_main_t * frm = &flow_report_main;
-  ASSERT (index < vec_len(frm->streams));
-  ASSERT (frm->streams[index].domain_id != ~0);
-  frm->streams[index].domain_id = ~0;
-}
-
-static i32 find_stream (u32 domain_id, u16 src_port)
-{
-  flow_report_main_t * frm = &flow_report_main;
-  flow_report_stream_t * stream;
-  u32 i;
-  for (i = 0; i < vec_len(frm->streams); i++)
-    if (stream_index_valid(i)) {
-      stream = &frm->streams[i];
-      if (domain_id == stream->domain_id) {
-        if (src_port != stream->src_port)
-          return -2;
-        return i;
-      } else if (src_port == stream->src_port) {
-        return -2;
-      }
-    }
-  return -1;
-}
-
-int send_template_packet (flow_report_main_t *frm, 
-                          flow_report_t *fr,
-                          u32 * buffer_indexp)
-{
-  u32 bi0;
-  vlib_buffer_t * b0;
-  ip4_ipfix_template_packet_t * tp;
-  ipfix_message_header_t * h;
-  ip4_header_t * ip;
-  udp_header_t * udp;
-  vlib_main_t * vm = frm->vlib_main;
-  flow_report_stream_t * stream;
-  vlib_buffer_free_list_t *fl;
-
-  ASSERT (buffer_indexp);
-
-  if (fr->update_rewrite || fr->rewrite == 0)
-    {
-      if (frm->ipfix_collector.as_u32 == 0 
-          || frm->src_address.as_u32 == 0)
-        {
-          clib_warning ("no collector: disabling flow collector process");
-          vlib_node_set_state (frm->vlib_main, flow_report_process_node.index,
-                               VLIB_NODE_STATE_DISABLED);
-          return -1;
-        }
-      vec_free (fr->rewrite);
-      fr->update_rewrite = 1;
-    }
-
-  if (fr->update_rewrite)
-    {
-      fr->rewrite = fr->rewrite_callback (frm, fr,
-                                          &frm->ipfix_collector,
-                                          &frm->src_address,
-                                          frm->collector_port);
-      fr->update_rewrite = 0;
-    }
-
-  if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
-    return -1;
-  
-  b0 = vlib_get_buffer (vm, bi0);
-
-  /* Initialize the buffer */
-  fl = vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-  vlib_buffer_init_for_free_list (b0, fl);
-  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
-
-  ASSERT (vec_len (fr->rewrite) < VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES);
-    
-  clib_memcpy (b0->data, fr->rewrite, vec_len (fr->rewrite));
-  b0->current_data = 0;
-  b0->current_length = vec_len (fr->rewrite);
-  b0->flags |= (VLIB_BUFFER_TOTAL_LENGTH_VALID | VLIB_BUFFER_FLOW_REPORT);
-  vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
-  vnet_buffer (b0)->sw_if_index[VLIB_TX] = frm->fib_index;
-
-  tp = vlib_buffer_get_current (b0);
-  ip = (ip4_header_t *) &tp->ip4;
-  udp = (udp_header_t *) (ip+1);
-  h = (ipfix_message_header_t *)(udp+1);
-
-  /* FIXUP: message header export_time */ 
-  h->export_time = (u32) 
-    (((f64)frm->unix_time_0) + 
-     (vlib_time_now(frm->vlib_main) - frm->vlib_time_0));
-  h->export_time = clib_host_to_net_u32(h->export_time);
-
-  stream = &frm->streams[fr->stream_index];
-
-  /* FIXUP: message header sequence_number. Templates do not increase it */
-  h->sequence_number = clib_host_to_net_u32(stream->sequence_number);
-
-  /* FIXUP: udp length */
-  udp->length = clib_host_to_net_u16 (b0->current_length - sizeof (*ip));
-
-  if (frm->udp_checksum)
-    {
-      /* RFC 7011 section 10.3.2. */
-      udp->checksum = ip4_tcp_udp_compute_checksum (vm, b0, ip);
-      if (udp->checksum == 0)
-        udp->checksum = 0xffff;
-    }
-
-  *buffer_indexp = bi0;
-
-  fr->last_template_sent = vlib_time_now (vm);
-
-  return 0;
-}
-
-static uword
-flow_report_process (vlib_main_t * vm,
-                     vlib_node_runtime_t * rt,
-                     vlib_frame_t * f)
-{
-  flow_report_main_t * frm = &flow_report_main;
-  flow_report_t * fr;
-  u32 ip4_lookup_node_index;
-  vlib_node_t * ip4_lookup_node;
-  vlib_frame_t * nf = 0;
-  u32 template_bi;
-  u32 * to_next;
-  int send_template;
-  f64 now;
-  int rv;
-  uword event_type;
-  uword *event_data = 0;
-
-  /* Wait for Godot... */
-  vlib_process_wait_for_event_or_clock (vm, 1e9);
-  event_type = vlib_process_get_events (vm, &event_data);
-  if (event_type != 1)
-      clib_warning ("bogus kickoff event received, %d", event_type);
-  vec_reset_length (event_data);
-
-  /* Enqueue pkts to ip4-lookup */
-  ip4_lookup_node = vlib_get_node_by_name (vm, (u8 *) "ip4-lookup");
-  ip4_lookup_node_index = ip4_lookup_node->index;
-
-  while (1) 
-    {
-      vlib_process_wait_for_event_or_clock (vm, 5.0);
-      event_type = vlib_process_get_events (vm, &event_data);
-      vec_reset_length (event_data);
-      
-      vec_foreach (fr, frm->reports)
-        {
-          now = vlib_time_now (vm);
-
-          /* Need to send a template packet? */
-          send_template =
-              now > (fr->last_template_sent + frm->template_interval);
-          send_template += fr->last_template_sent == 0;
-          template_bi = ~0;
-	  rv = 0;
-
-          if (send_template)
-            rv = send_template_packet (frm, fr, &template_bi);
-
-          if (rv < 0)
-            continue;
-
-          nf = vlib_get_frame_to_node (vm, ip4_lookup_node_index);
-          nf->n_vectors = 0;
-          to_next = vlib_frame_vector_args (nf);
-
-          if (template_bi != ~0)
-            {
-              to_next[0] = template_bi;
-              to_next++;
-              nf->n_vectors++;
-            }
-      
-          nf = fr->flow_data_callback (frm, fr, 
-                                       nf, to_next, ip4_lookup_node_index);
-          if (nf)
-            vlib_put_frame_to_node (vm, ip4_lookup_node_index, nf);
-        }
-    }
-
-  return 0; /* not so much */
-}
-
-VLIB_REGISTER_NODE (flow_report_process_node) = {
-    .function = flow_report_process,
-    .type = VLIB_NODE_TYPE_PROCESS,
-    .name = "flow-report-process",
-};
-
-int vnet_flow_report_add_del (flow_report_main_t *frm, 
-                              vnet_flow_report_add_del_args_t *a)
-{
-  int i;
-  int found_index = ~0;
-  flow_report_t *fr;
-  flow_report_stream_t * stream;
-  u32 si;
-  
-  si = find_stream(a->domain_id, a->src_port);
-  if (si == -2)
-    return VNET_API_ERROR_INVALID_VALUE;
-  if (si == -1 && a->is_add == 0)
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-  for (i = 0; i < vec_len(frm->reports); i++)
-    {
-      fr = vec_elt_at_index (frm->reports, i);
-      if (fr->opaque.as_uword == a->opaque.as_uword
-          && fr->rewrite_callback == a->rewrite_callback
-          && fr->flow_data_callback == a->flow_data_callback)
-        {
-          found_index = i;
-          break;
-        }
-    }
-
-  if (a->is_add == 0)
-    {
-      if (found_index != ~0)
-        {
-          vec_delete (frm->reports, 1, found_index);
-          stream = &frm->streams[si];
-          stream->n_reports--;
-          if (stream->n_reports == 0)
-            delete_stream(si);
-          return 0;
-        }
-      return VNET_API_ERROR_NO_SUCH_ENTRY;
-    }
-
-  if (found_index != ~0)
-    return VNET_API_ERROR_VALUE_EXIST;
-
-  if (si == -1)
-    {
-      stream = add_stream();
-      stream->domain_id = a->domain_id;
-      stream->src_port = a->src_port;
-      stream->sequence_number = 0;
-      stream->n_reports = 0;
-      si = stream - frm->streams;
-    }
-  else
-    stream = &frm->streams[si];
-
-  stream->n_reports++;
-
-  vec_add2 (frm->reports, fr, 1);
-
-  fr->stream_index = si;
-  fr->template_id = 256 + stream->next_template_no;
-  stream->next_template_no = (stream->next_template_no + 1) % (65536 - 256);
-  fr->update_rewrite = 1;
-  fr->opaque = a->opaque;
-  fr->rewrite_callback = a->rewrite_callback;
-  fr->flow_data_callback = a->flow_data_callback;
-  
-  return 0;
-}
-
-clib_error_t * flow_report_add_del_error_to_clib_error (int error)
-{
-    switch (error)
-      {
-      case 0:
-	return 0;
-      case VNET_API_ERROR_NO_SUCH_ENTRY:
-        return clib_error_return (0, "Flow report not found");
-      case VNET_API_ERROR_VALUE_EXIST:
-        return clib_error_return (0, "Flow report already exists");
-      case VNET_API_ERROR_INVALID_VALUE:
-        return clib_error_return (0, "Expecting either still unused values "
-                                     "for both domain_id and src_port "
-                                     "or already used values for both fields");
-      default:
-        return clib_error_return (0, "vnet_flow_report_add_del returned %d",
-                                  error);
-      }
-}
-
-void vnet_flow_reports_reset (flow_report_main_t * frm)
-{
-  flow_report_t *fr;
-  u32 i;
-
-  for (i = 0; i < vec_len(frm->streams); i++)
-    if (stream_index_valid(i))
-      frm->streams[i].sequence_number = 0;
-
-  vec_foreach (fr, frm->reports)
-    {
-      fr->update_rewrite = 1;
-      fr->last_template_sent = 0;
-    }
-}
-
-void vnet_stream_reset (flow_report_main_t * frm, u32 stream_index)
-{
-  flow_report_t *fr;
-
-  frm->streams[stream_index].sequence_number = 0;
-
-  vec_foreach (fr, frm->reports)
-    if (frm->reports->stream_index == stream_index) {
-      fr->update_rewrite = 1;
-      fr->last_template_sent = 0;
-    }
-}
-
-int vnet_stream_change (flow_report_main_t * frm,
-                        u32 old_domain_id, u16 old_src_port,
-                        u32 new_domain_id, u16 new_src_port)
-{
-  i32 stream_index = find_stream (old_domain_id, old_src_port);
-  if (stream_index < 0)
-    return 1;
-  flow_report_stream_t * stream = &frm->streams[stream_index];
-  stream->domain_id = new_domain_id;
-  stream->src_port = new_src_port;
-  if (old_domain_id != new_domain_id || old_src_port != new_src_port)
-    vnet_stream_reset (frm, stream_index);
-  return 0;
-}
-
-static clib_error_t *
-set_ipfix_exporter_command_fn (vlib_main_t * vm,
-                               unformat_input_t * input,
-                               vlib_cli_command_t * cmd)
-{
-  flow_report_main_t * frm = &flow_report_main;
-  ip4_address_t collector, src;
-  u16 collector_port = UDP_DST_PORT_ipfix;
-  u32 fib_id;
-  u32 fib_index = ~0;
-  
-  collector.as_u32 = 0;
-  src.as_u32 = 0;
-  u32 path_mtu = 512; // RFC 7011 section 10.3.3.
-  u32 template_interval = 20;
-  u8 udp_checksum = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "collector %U", unformat_ip4_address, &collector))
-      ;
-    else if (unformat (input, "port %u", &collector_port))
-      ;
-    else if (unformat (input, "src %U", unformat_ip4_address, &src))
-      ;
-    else if (unformat (input, "fib-id %u", &fib_id))
-      {
-        ip4_main_t * im = &ip4_main;
-        uword * p = hash_get (im->fib_index_by_table_id, fib_id);
-        if (! p)
-          return clib_error_return (0, "fib ID %d doesn't exist\n",
-                                    fib_id);
-        fib_index = p[0];
-      }
-    else if (unformat (input, "path-mtu %u", &path_mtu))
-      ;
-    else if (unformat (input, "template-interval %u", &template_interval))
-      ;
-    else if (unformat (input, "udp-checksum"))
-      udp_checksum = 1;
-    else
-      break;
-  }
-  
-  if (collector.as_u32 == 0)
-    return clib_error_return (0, "collector address required");
-
-  if (src.as_u32 == 0)
-    return clib_error_return (0, "src address required");
-
-  if (path_mtu > 1450 /* vpp does not support fragmentation */)
-	return clib_error_return (0, "too big path-mtu value, maximum is 1450");
-
-  if (path_mtu < 68)
-	return clib_error_return (0, "too small path-mtu value, minimum is 68");
-
-  /* Reset report streams if we are reconfiguring IP addresses */
-  if (frm->ipfix_collector.as_u32 != collector.as_u32 ||
-      frm->src_address.as_u32 != src.as_u32 ||
-      frm->collector_port != collector_port)
-    vnet_flow_reports_reset(frm);
-
-  frm->ipfix_collector.as_u32 = collector.as_u32;
-  frm->collector_port = collector_port;
-  frm->src_address.as_u32 = src.as_u32;
-  frm->fib_index = fib_index;
-  frm->path_mtu = path_mtu;
-  frm->template_interval = template_interval;
-  frm->udp_checksum = udp_checksum;
-  
-  vlib_cli_output (vm, "Collector %U, src address %U, "
-		           "fib index %d, path MTU %u, "
-		           "template resend interval %us, "
-		           "udp checksum %s",
-                   format_ip4_address, &frm->ipfix_collector,
-                   format_ip4_address, &frm->src_address,
-                   fib_index, path_mtu, template_interval,
-                   udp_checksum ? "enabled" : "disabled");
-
-  /* Turn on the flow reporting process */
-  vlib_process_signal_event (vm, flow_report_process_node.index,
-                             1, 0);
-  return 0;
-}
-
-VLIB_CLI_COMMAND (set_ipfix_exporter_command, static) = {
-    .path = "set ipfix exporter",
-    .short_help = "set ipfix exporter "
-                  "collector <ip4-address> [port <port>] "
-                  "src <ip4-address> [fib-id <fib-id>] "
-                  "[path-mtu <path-mtu>] "
-                  "[template-interval <template-interval>]",
-                  "[udp-checksum]",
-    .function = set_ipfix_exporter_command_fn,
-};
-
-
-static clib_error_t *
-ipfix_flush_command_fn (vlib_main_t * vm,
-                        unformat_input_t * input,
-                        vlib_cli_command_t * cmd)
-{
-  /* poke the flow reporting process */
-  vlib_process_signal_event (vm, flow_report_process_node.index,
-                             1, 0);
-  return 0;
-}
-
-VLIB_CLI_COMMAND (ipfix_flush_command, static) = {
-    .path = "ipfix flush",
-    .short_help = "flush the current ipfix data [for make test]",
-    .function = ipfix_flush_command_fn,
-};
-
-static clib_error_t * 
-flow_report_init (vlib_main_t *vm)
-{
-  flow_report_main_t * frm = &flow_report_main;
-
-  frm->vlib_main = vm;
-  frm->vnet_main = vnet_get_main();
-  frm->unix_time_0 = time(0);
-  frm->vlib_time_0 = vlib_time_now(frm->vlib_main);
-  frm->fib_index = ~0;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (flow_report_init)
diff --git a/vnet/vnet/flow/flow_report.h b/vnet/vnet/flow/flow_report.h
deleted file mode 100644
index 4e764377..00000000
--- a/vnet/vnet/flow/flow_report.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_vnet_flow_report_h__
-#define __included_vnet_flow_report_h__
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/ip/ip_packet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vnet/ip/udp.h>
-#include <vlib/cli.h>
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/cache.h>
-
-#include <vnet/flow/ipfix_packet.h>
-
-/* Used to build the rewrite */
-typedef struct {
-  ip4_header_t ip4;
-  udp_header_t udp;
-  ipfix_template_packet_t ipfix;
-} ip4_ipfix_template_packet_t;
-
-struct flow_report_main;
-struct flow_report;
-
-typedef u8 * (vnet_flow_rewrite_callback_t)(struct flow_report_main *, 
-                                            struct flow_report *,
-                                            ip4_address_t *,
-                                            ip4_address_t *,
-                                            u16);
-
-typedef vlib_frame_t * (vnet_flow_data_callback_t) (struct flow_report_main *, 
-                                                    struct flow_report *,
-                                                    vlib_frame_t *, u32 *, 
-                                                    u32);
-
-typedef union {
-  void * as_ptr;
-  uword as_uword;
-} opaque_t;
-
-typedef struct {
-  u32 domain_id;
-  u32 sequence_number;
-  u16 src_port;
-  u16 n_reports;
-  u16 next_template_no;
-} flow_report_stream_t;
-
-typedef struct flow_report {
-  /* ipfix rewrite, set by callback */
-  u8 * rewrite;
-  u16 template_id;
-  u32 stream_index;
-  f64 last_template_sent;
-  int update_rewrite;
-
-  /* Bitmap of fields to send */
-  uword * fields_to_send;
-
-  /* Opaque data */
-  opaque_t opaque;
-
-  /* build-the-rewrite callback */
-  vnet_flow_rewrite_callback_t *rewrite_callback;
-
-  /* Send-flow-data callback */
-  vnet_flow_data_callback_t *flow_data_callback;
-} flow_report_t;
-
-typedef struct flow_report_main {
-  flow_report_t * reports;
-  flow_report_stream_t * streams;
-
-  /* ipfix collector ip address, port, our ip address, fib index */
-  ip4_address_t ipfix_collector;
-  u16 collector_port;
-  ip4_address_t src_address;
-  u32 fib_index;
-
-  /* Path MTU */
-  u32 path_mtu;
-
-  /* time interval in seconds after which to resend templates */
-  u32 template_interval;
-
-  /* UDP checksum calculation enable flag */
-  u8 udp_checksum;
-
-  /* time scale transform. Joy. */
-  u32 unix_time_0;
-  f64 vlib_time_0;
-
-  /* convenience variables */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-} flow_report_main_t;
-
-extern flow_report_main_t flow_report_main;
-
-extern vlib_node_registration_t flow_report_process_node;
-
-int vnet_flow_report_enable_disable (u32 sw_if_index, u32 table_index,
-                                       int enable_disable);
-typedef struct {
-  vnet_flow_data_callback_t *flow_data_callback;
-  vnet_flow_rewrite_callback_t *rewrite_callback;
-  opaque_t opaque;
-  int is_add;
-  u32 domain_id;
-  u16 src_port;
-} vnet_flow_report_add_del_args_t;  
-
-int vnet_flow_report_add_del (flow_report_main_t *frm, 
-                              vnet_flow_report_add_del_args_t *a);
-
-clib_error_t * flow_report_add_del_error_to_clib_error (int error);
-
-void vnet_flow_reports_reset (flow_report_main_t * frm);
-
-void vnet_stream_reset (flow_report_main_t * frm, u32 stream_index);
-
-int vnet_stream_change (flow_report_main_t * frm,
-                        u32 old_domain_id, u16 old_src_port,
-                        u32 new_domain_id, u16 new_src_port);
-
-#endif /* __included_vnet_flow_report_h__ */
diff --git a/vnet/vnet/flow/flow_report_classify.c b/vnet/vnet/flow/flow_report_classify.c
deleted file mode 100644
index cb8fe069..00000000
--- a/vnet/vnet/flow/flow_report_classify.c
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/flow/flow_report.h>
-#include <vnet/flow/flow_report_classify.h>
-#include <vnet/api_errno.h>
-
-/* Common prefix of tcp and udp headers
- * containing only source and destination port fields */
-typedef struct {
-  u16 src_port, dst_port;
-} tcpudp_header_t;
-
-flow_report_classify_main_t flow_report_classify_main;
-
-u8 * ipfix_classify_template_rewrite (flow_report_main_t * frm,
-                                      flow_report_t * fr,
-                                      ip4_address_t * collector_address,
-                                      ip4_address_t * src_address,
-                                      u16 collector_port)
-{
-  flow_report_classify_main_t * fcm = &flow_report_classify_main;
-  vnet_classify_table_t * tblp;
-  vnet_classify_main_t * vcm = &vnet_classify_main;
-  u32 flow_table_index = fr->opaque.as_uword;
-  u8 * ip_start;
-  ip4_header_t * ip;
-  ip6_header_t * ip6;
-  tcpudp_header_t * tcpudp;
-  udp_header_t * udp;
-  ipfix_message_header_t * h;
-  ipfix_set_header_t * s;
-  ipfix_template_header_t * t;
-  ipfix_field_specifier_t * f;
-  ipfix_field_specifier_t * first_field;
-  u8 * rewrite = 0;
-  ip4_ipfix_template_packet_t * tp;
-  i32 l3_offset = -2;  /* sizeof (ethernet_header_t) - sizeof (u32x4) */
-  u32 field_count = 0;
-  u32 field_index = 0;
-  flow_report_stream_t * stream;
-  u8 ip_version;
-  u8 transport_protocol;
-
-  stream = &frm->streams[fr->stream_index];
-
-  ipfix_classify_table_t * table = &fcm->tables[flow_table_index];
-
-  ip_version = table->ip_version;
-  transport_protocol = table->transport_protocol;
-
-  tblp = pool_elt_at_index (vcm->tables, table->classify_table_index);
-
-  /* 
-   * Mumble, assumes that we're not classifying on L2 or first 2 octets
-   * of L3..
-   */
-
-  /* Determine field count */
-  ip_start = ((u8 *)(tblp->mask)) + l3_offset;
-#define _(field,mask,item,length)                                       \
-  if (memcmp(&field, &mask, length) == 0)                               \
-    {                                                                   \
-      field_count++;                                                    \
-                                                                        \
-      fr->fields_to_send = clib_bitmap_set (fr->fields_to_send,         \
-                                            field_index, 1);            \
-    }                                                                   \
-  field_index++;
-  foreach_ipfix_field;
-#undef _
-
-  /* Add packetTotalCount manually */
-  field_count += 1;
-
-  /* $$$ enterprise fields, at some later date */
-
-  /* allocate rewrite space */
-  vec_validate_aligned (rewrite, 
-                        sizeof (ip4_ipfix_template_packet_t) 
-                        + field_count * sizeof (ipfix_field_specifier_t) - 1,
-                        CLIB_CACHE_LINE_BYTES);
-
-  tp = (ip4_ipfix_template_packet_t *) rewrite;
-  ip = (ip4_header_t *) &tp->ip4;
-  udp = (udp_header_t *) (ip+1);
-  h = (ipfix_message_header_t *)(udp+1);
-  s = (ipfix_set_header_t *)(h+1);
-  t = (ipfix_template_header_t *)(s+1);
-  first_field = f = (ipfix_field_specifier_t *)(t+1);
-
-  ip->ip_version_and_header_length = 0x45;
-  ip->ttl = 254;
-  ip->protocol = IP_PROTOCOL_UDP;
-  ip->src_address.as_u32 = src_address->as_u32;
-  ip->dst_address.as_u32 = collector_address->as_u32;
-  udp->src_port = clib_host_to_net_u16 (stream->src_port);
-  udp->dst_port = clib_host_to_net_u16 (collector_port);
-  udp->length = clib_host_to_net_u16 (vec_len(rewrite) - sizeof (*ip));
-
-  /* FIXUP: message header export_time */ 
-  /* FIXUP: message header sequence_number */
-  h->domain_id = clib_host_to_net_u32 (stream->domain_id);
-
-  /* Take another trip through the mask and build the template */
-  ip_start = ((u8 *)(tblp->mask)) + l3_offset;
-#define _(field,mask,item,length)                               \
-  if (memcmp(&field, &mask, length) == 0)                       \
-    {                                                           \
-      f->e_id_length = ipfix_e_id_length (0 /* enterprise */,   \
-                                          item, length);        \
-      f++;                                                      \
-    }
-  foreach_ipfix_field;
-#undef _
-
-  /* Add packetTotalCount manually */
-  f->e_id_length = ipfix_e_id_length (0 /* enterprise */, packetTotalCount, 8);
-  f++;
-
-  /* Back to the template packet... */
-  ip = (ip4_header_t *) &tp->ip4;
-  udp = (udp_header_t *) (ip+1);
-  
-  ASSERT (f - first_field);
-  /* Field count in this template */
-  t->id_count = ipfix_id_count (fr->template_id, f - first_field);
-
-  /* set length in octets*/
-  s->set_id_length = ipfix_set_id_length (2 /* set_id */, (u8 *) f - (u8 *)s);
-
-  /* message length in octets */
-  h->version_length = version_length ((u8 *)f - (u8 *)h);
-
-  ip->length = clib_host_to_net_u16 ((u8 *)f - (u8 *)ip);
-  ip->checksum = ip4_header_checksum (ip);
-
-  return rewrite;
-}
-
-vlib_frame_t * ipfix_classify_send_flows (flow_report_main_t * frm,
-                                          flow_report_t * fr,
-                                          vlib_frame_t * f,
-                                          u32 * to_next,
-                                          u32 node_index)
-{
-  flow_report_classify_main_t * fcm = &flow_report_classify_main;
-  vnet_classify_main_t * vcm = &vnet_classify_main;
-  u32 flow_table_index = fr->opaque.as_uword;
-  vnet_classify_table_t * t;
-  vnet_classify_bucket_t * b;
-  vnet_classify_entry_t * v, * save_v;
-  vlib_buffer_t *b0 = 0;
-  u32 next_offset = 0;
-  u32 record_offset = 0;
-  u32 bi0 = ~0;
-  int i, j, k;
-  ip4_ipfix_template_packet_t * tp;
-  ipfix_message_header_t * h = 0;
-  ipfix_set_header_t * s = 0;
-  u8 * ip_start;
-  ip4_header_t * ip;
-  ip6_header_t * ip6;
-  tcpudp_header_t * tcpudp;
-  udp_header_t * udp;
-  int field_index;
-  u32 records_this_buffer;
-  u16 new_l0, old_l0;
-  ip_csum_t sum0;
-  vlib_main_t * vm = frm->vlib_main;
-  flow_report_stream_t * stream;
-  u8 ip_version;
-  u8 transport_protocol;
-
-  stream = &frm->streams[fr->stream_index];
-
-  ipfix_classify_table_t * table = &fcm->tables[flow_table_index];
-
-  ip_version = table->ip_version;
-  transport_protocol = table->transport_protocol;
-
-  t = pool_elt_at_index (vcm->tables, table->classify_table_index);
-  
-  while (__sync_lock_test_and_set (t->writer_lock, 1))
-    ; 
-  
-  for (i = 0; i < t->nbuckets; i++)
-    {
-      b = &t->buckets [i];
-      if (b->offset == 0)
-        continue;
-      
-      save_v = vnet_classify_get_entry (t, b->offset);
-      for (j = 0; j < (1<<b->log2_pages); j++)
-        {
-          for (k = 0; k < t->entries_per_page; k++)
-            {
-              v = vnet_classify_entry_at_index 
-                (t, save_v, j*t->entries_per_page + k);
-              
-              if (vnet_classify_entry_is_free (v))
-                continue;
-              
-              /* OK, we have something to send... */
-              if (PREDICT_FALSE (b0 == 0))
-                {
-                  if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
-                    goto flush;
-                  b0 = vlib_get_buffer (vm, bi0);
-                  
-                  u32 copy_len = sizeof(ip4_header_t) +
-                                 sizeof(udp_header_t) +
-                                 sizeof(ipfix_message_header_t);
-                  clib_memcpy (b0->data, fr->rewrite, copy_len);
-                  b0->current_data = 0;
-                  b0->current_length = copy_len;
-                  b0->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
-                  vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
-                  vnet_buffer (b0)->sw_if_index[VLIB_TX] = frm->fib_index;
-                  
-                  tp = vlib_buffer_get_current (b0);
-                  ip = (ip4_header_t *) &tp->ip4;
-                  udp = (udp_header_t *) (ip+1);
-                  h = (ipfix_message_header_t *)(udp+1);
-                  s = (ipfix_set_header_t *)(h+1);
-                  
-                  /* FIXUP: message header export_time */ 
-                  h->export_time = (u32) 
-                    (((f64)frm->unix_time_0) + 
-                     (vlib_time_now(frm->vlib_main) - frm->vlib_time_0));
-                  h->export_time = clib_host_to_net_u32(h->export_time);
-                  
-                  /* FIXUP: message header sequence_number */
-                  h->sequence_number = stream->sequence_number;
-                  h->sequence_number = clib_host_to_net_u32 (h->sequence_number);
-
-                  next_offset = (u32) (((u8 *)(s+1)) - (u8 *)tp);
-                  record_offset = next_offset;
-                  records_this_buffer = 0;
-                }
-
-              field_index = 0;
-              ip_start = ((u8 *)v->key) - 2;
-#define _(field,mask,item,length)                                       \
-              if (clib_bitmap_get (fr->fields_to_send, field_index))    \
-                {                                                       \
-                  clib_memcpy (b0->data + next_offset, &field,          \
-                          length);                                      \
-                  next_offset += length;                                \
-                }                                                       \
-              field_index++;
-              foreach_ipfix_field;
-#undef _
-
-              /* Add packetTotalCount manually */
-              {
-                u64 packets = clib_host_to_net_u64 (v->hits);
-                clib_memcpy (b0->data + next_offset, &packets, sizeof (packets));
-                next_offset += sizeof (packets);
-              }
-              records_this_buffer++;
-              stream->sequence_number++;
-              
-              /* Next record will have the same size as this record */
-              u32 next_record_size = next_offset - record_offset;
-              record_offset = next_offset;
-
-              if (next_offset + next_record_size > frm->path_mtu)
-                {
-                  s->set_id_length = ipfix_set_id_length (fr->template_id,
-                                                          next_offset - 
-                                                          (sizeof (*ip) + sizeof (*udp) +
-                                                           sizeof (*h)));
-                  h->version_length = version_length (next_offset -
-                                                      (sizeof (*ip) + sizeof (*udp)));
-                  b0->current_length = next_offset;
-                  b0->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
-                  
-                  tp = vlib_buffer_get_current (b0);
-                  ip = (ip4_header_t *) &tp->ip4;
-                  udp = (udp_header_t *) (ip+1);
-                  
-                  sum0 = ip->checksum;
-                  old_l0 = ip->length;
-                  new_l0 = 
-                    clib_host_to_net_u16 ((u16)next_offset);
-                  
-                  sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
-                                         length /* changed member */);
-                  
-                  ip->checksum = ip_csum_fold (sum0);
-                  ip->length = new_l0;
-                  udp->length = 
-                      clib_host_to_net_u16 (b0->current_length - sizeof (*ip));
-
-                  if (frm->udp_checksum)
-                    {
-                      /* RFC 7011 section 10.3.2. */
-                      udp->checksum = ip4_tcp_udp_compute_checksum (vm, b0, ip);
-                      if (udp->checksum == 0)
-                        udp->checksum = 0xffff;
-                    }
-
-                  ASSERT (ip->checksum == ip4_header_checksum (ip));
-
-                  to_next[0] = bi0;
-                  f->n_vectors++;
-                  to_next++;
-                  
-                  if (f->n_vectors == VLIB_FRAME_SIZE)
-                    {
-                      vlib_put_frame_to_node (vm, node_index, f);
-                      f = vlib_get_frame_to_node (vm, node_index);
-                      f->n_vectors = 0;
-                      to_next = vlib_frame_vector_args (f);
-                    }
-                  b0 = 0;
-                  bi0 = ~0;
-                }
-            }
-        }
-    }
-  
- flush:
-  if (b0)
-    {
-        s->set_id_length = ipfix_set_id_length (fr->template_id,
-                                                next_offset - 
-                                                (sizeof (*ip) + sizeof (*udp) +
-                                                 sizeof (*h)));
-        h->version_length = version_length (next_offset -
-                                            (sizeof (*ip) + sizeof (*udp)));
-      b0->current_length = next_offset;
-      b0->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
-      
-      tp = vlib_buffer_get_current (b0);
-      ip = (ip4_header_t *) &tp->ip4;
-      udp = (udp_header_t *) (ip+1);
-      
-      sum0 = ip->checksum;
-      old_l0 = ip->length;
-      new_l0 = clib_host_to_net_u16 ((u16)next_offset);
-      
-      sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
-                             length /* changed member */);
-      
-      ip->checksum = ip_csum_fold (sum0);
-      ip->length = new_l0;
-      udp->length = clib_host_to_net_u16 (b0->current_length - sizeof (*ip));
-
-      if (frm->udp_checksum)
-        {
-          /* RFC 7011 section 10.3.2. */
-          udp->checksum = ip4_tcp_udp_compute_checksum (vm, b0, ip);
-          if (udp->checksum == 0)
-          udp->checksum = 0xffff;
-        }
-
-      ASSERT (ip->checksum == ip4_header_checksum (ip));
-      
-      to_next[0] = bi0;
-      f->n_vectors++;
-      
-      b0 = 0;
-      bi0 = ~0;
-    }
-  
-  *(t->writer_lock) = 0;
-  return f;
-}
-
-static clib_error_t *
-ipfix_classify_table_add_del_command_fn (vlib_main_t * vm,
-                                         unformat_input_t * input,
-                                         vlib_cli_command_t * cmd)
-{
-  flow_report_classify_main_t *fcm = &flow_report_classify_main;
-  flow_report_main_t *frm = &flow_report_main;
-  vnet_flow_report_add_del_args_t args;
-  ipfix_classify_table_t * table;
-  int rv;
-  int is_add = -1;
-  u32 classify_table_index = ~0;
-  u8 ip_version = 0;
-  u8 transport_protocol = 255;
-  clib_error_t * error = 0;
-
-  if (fcm->src_port == 0)
-    clib_error_return (0, "call 'set ipfix classify stream' first");
-
-  memset (&args, 0, sizeof (args));
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "add"))
-      is_add = 1;
-    else if (unformat (input, "del"))
-      is_add = 0;
-    else if (unformat (input, "%d", &classify_table_index))
-      ;
-    else if (unformat (input, "ip4"))
-      ip_version = 4;
-    else if (unformat (input, "ip6"))
-      ip_version = 6;
-    else if (unformat (input, "tcp"))
-      transport_protocol = 6;
-    else if (unformat (input, "udp"))
-      transport_protocol = 17;
-    else
-      return clib_error_return (0, "unknown input `%U'",
-                                format_unformat_error, input);
-  }
-
-  if (is_add == -1)
-    return clib_error_return (0, "expecting: add|del");
-  if (classify_table_index == ~0)
-    return clib_error_return (0, "classifier table not specified");
-  if (ip_version == 0)
-    return clib_error_return (0, "IP version not specified");
-
-  table = 0;
-  int i;
-  for (i = 0; i < vec_len(fcm->tables); i++)
-    if (ipfix_classify_table_index_valid(i))
-      if (fcm->tables[i].classify_table_index == classify_table_index) {
-        table = &fcm->tables[i];
-        break;
-      }
-
-  if (is_add) {
-    if (table)
-      return clib_error_return (0, "Specified classifier table already used");
-    table = ipfix_classify_add_table();
-    table->classify_table_index = classify_table_index;
-  } else {
-    if (!table)
-      return clib_error_return (0, "Specified classifier table not registered");
-  }
-
-  table->ip_version = ip_version;
-  table->transport_protocol = transport_protocol;
-
-  args.opaque.as_uword = table - fcm->tables;
-  args.rewrite_callback = ipfix_classify_template_rewrite;
-  args.flow_data_callback = ipfix_classify_send_flows;
-  args.is_add = is_add;
-  args.domain_id = fcm->domain_id;
-  args.src_port = fcm->src_port;
-
-  rv = vnet_flow_report_add_del (frm, &args);
-
-  error = flow_report_add_del_error_to_clib_error(rv);
-
-  /* If deleting, or add failed */
-  if (is_add == 0 || (rv && is_add))
-    ipfix_classify_delete_table (table - fcm->tables);
-
-  return error;
-}
-
-VLIB_CLI_COMMAND (ipfix_classify_table_add_del_command, static) = {
-  .path = "ipfix classify table",
-  .short_help = "ipfix classify table add|del <table-index>",
-  .function = ipfix_classify_table_add_del_command_fn,
-};
-
-static clib_error_t *
-set_ipfix_classify_stream_command_fn (vlib_main_t * vm,
-                                      unformat_input_t * input,
-                                      vlib_cli_command_t * cmd)
-{
-  flow_report_classify_main_t *fcm = &flow_report_classify_main;
-  flow_report_main_t *frm = &flow_report_main;
-  u32 domain_id = 1;
-  u32 src_port = UDP_DST_PORT_ipfix;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "domain %d", &domain_id))
-      ;
-    else if (unformat (input, "src-port %d", &src_port))
-      ;
-    else
-      return clib_error_return (0, "unknown input `%U'",
-                                format_unformat_error, input);
-  }
-
-  if (fcm->src_port != 0 &&
-      (fcm->domain_id != domain_id ||
-       fcm->src_port != (u16)src_port)) {
-    int rv = vnet_stream_change (frm, fcm->domain_id, fcm->src_port,
-                                 domain_id, (u16)src_port);
-    ASSERT (rv == 0);
-  }
-
-  fcm->domain_id = domain_id;
-  fcm->src_port = (u16)src_port;
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (set_ipfix_classify_stream_command, static) = {
-  .path = "set ipfix classify stream",
-  .short_help = "set ipfix classify stream"
-                "[domain <domain-id>] [src-port <src-port>]",
-  .function = set_ipfix_classify_stream_command_fn,
-};
-
-static clib_error_t *
-flow_report_classify_init (vlib_main_t *vm)
-{
-  clib_error_t * error;
-
-  if ((error = vlib_call_init_function (vm, flow_report_init)))
-    return error;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (flow_report_classify_init);
diff --git a/vnet/vnet/flow/flow_report_classify.h b/vnet/vnet/flow/flow_report_classify.h
deleted file mode 100644
index 77d98b58..00000000
--- a/vnet/vnet/flow/flow_report_classify.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_flow_report_classify_h__
-#define __included_flow_report_classify_h__
-
-#define foreach_ipfix_ip4_field                                             \
-_(ip->src_address.as_u32, ((u32[]){0xFFFFFFFF}), sourceIPv4Address, 4)      \
-_(ip->dst_address.as_u32, ((u32[]){0xFFFFFFFF}), destinationIPv4Address, 4) \
-_(ip->protocol, ((u8[]){0xFF}), protocolIdentifier, 1)
-
-#define foreach_ipfix_ip6_field                                             \
-_(ip6->src_address.as_u8,                                                   \
-  ((u32[]){0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}),                   \
-  sourceIPv6Address, 16)                                                    \
-_(ip6->dst_address.as_u8,                                                   \
-  ((u32[]){0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}),                   \
-  destinationIPv6Address, 16)                                               \
-_(ip6->protocol, ((u8[]){0xFF}), protocolIdentifier, 1)
-
-#define foreach_ipfix_tcpudp_field                                          \
-_(tcpudp->src_port, ((u16[]){0xFFFF}), sourceTransportPort, 2)              \
-_(tcpudp->dst_port, ((u16[]){0xFFFF}), destinationTransportPort, 2)
-
-#define foreach_ipfix_tcp_field                                             \
-_(tcpudp->src_port, ((u16[]){0xFFFF}), tcpSourcePort, 2)                    \
-_(tcpudp->dst_port, ((u16[]){0xFFFF}), tcpDestinationPort, 2)
-
-#define foreach_ipfix_udp_field                                             \
-_(tcpudp->src_port, ((u16[]){0xFFFF}), udpSourcePort, 2)                    \
-_(tcpudp->dst_port, ((u16[]){0xFFFF}), udpDestinationPort, 2)
-
-#define foreach_ipfix_transport_protocol_field                              \
-  switch (transport_protocol) {                                             \
-    case 255:                                                               \
-      foreach_ipfix_tcpudp_field;                                           \
-      break;                                                                \
-    case 6:                                                                 \
-      foreach_ipfix_tcp_field;                                              \
-      break;                                                                \
-    case 17:                                                                \
-      foreach_ipfix_udp_field;                                              \
-      break;                                                                \
-  }
-
-#define foreach_ipfix_field                                                 \
-  if (ip_version == 4) {                                                    \
-    ip = (ip4_header_t *)ip_start;                                          \
-    tcpudp = (tcpudp_header_t *)(ip+1);                                     \
-    foreach_ipfix_ip4_field;                                                \
-  } else {                                                                  \
-    ip6 = (ip6_header_t *)ip_start;                                         \
-    tcpudp = (tcpudp_header_t *)(ip6+1);                                    \
-    foreach_ipfix_ip6_field;                                                \
-  }                                                                         \
-  foreach_ipfix_transport_protocol_field
-
-typedef struct {
-  u32 classify_table_index;
-  u8 ip_version;
-  u8 transport_protocol;
-} ipfix_classify_table_t;
-
-typedef struct {
-  u32 domain_id;
-  u16 src_port;
-  ipfix_classify_table_t * tables;
-} flow_report_classify_main_t;
-
-extern flow_report_classify_main_t flow_report_classify_main;
-
-static_always_inline u8 ipfix_classify_table_index_valid (u32 index)
-{
-  flow_report_classify_main_t * fcm = &flow_report_classify_main;
-  return index < vec_len(fcm->tables) &&
-         fcm->tables[index].classify_table_index != ~0;
-}
-
-static_always_inline ipfix_classify_table_t * ipfix_classify_add_table (void)
-{
-  flow_report_classify_main_t * fcm = &flow_report_classify_main;
-  u32 i;
-  for (i = 0; i < vec_len(fcm->tables); i++)
-    if (!ipfix_classify_table_index_valid(i))
-      return &fcm->tables[i];
-  u32 index = vec_len(fcm->tables);
-  vec_validate(fcm->tables, index);
-  return &fcm->tables[index];
-}
-
-static_always_inline void ipfix_classify_delete_table (u32 index)
-{
-  flow_report_classify_main_t * fcm = &flow_report_classify_main;
-  ASSERT (index < vec_len(fcm->tables));
-  ASSERT (fcm->tables[index].classify_table_index != ~0);
-  fcm->tables[index].classify_table_index = ~0;
-}
-
-u8 * ipfix_classify_template_rewrite (flow_report_main_t * frm,
-                                      flow_report_t * fr,
-                                      ip4_address_t * collector_address,
-                                      ip4_address_t * src_address,
-                                      u16 collector_port);
-
-vlib_frame_t * ipfix_classify_send_flows (flow_report_main_t * frm,
-                                          flow_report_t * fr,
-                                          vlib_frame_t * f,
-                                          u32 * to_next,
-                                          u32 node_index);
-
-#endif /* __included_flow_report_classify_h__ */
diff --git a/vnet/vnet/flow/ipfix_info_elements.h b/vnet/vnet/flow/ipfix_info_elements.h
deleted file mode 100644
index 5d7e935d..00000000
--- a/vnet/vnet/flow/ipfix_info_elements.h
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_ipfix_info_elements_h__
-#define __included_ipfix_info_elements_h__
-
-#define foreach_ipfix_info_element_t                                    \
-_(octetDeltaCount, 1, u64)                                              \
-_(packetDeltaCount, 2, u64)                                             \
-_(deltaFlowCount, 3, u64)                                               \
-_(protocolIdentifier, 4, u8)                                            \
-_(ipClassOfService, 5, u8)                                              \
-_(tcpControlBits, 6, u16)                                               \
-_(sourceTransportPort, 7, u16)                                          \
-_(sourceIPv4Address, 8, ip4_address_t)                                  \
-_(sourceIPv4PrefixLength, 9, u8)                                        \
-_(ingressInterface, 10, u32)                                            \
-_(destinationTransportPort, 11, u16)                                    \
-_(destinationIPv4Address, 12, ip4_address_t)                            \
-_(destinationIPv4PrefixLength, 13, u8)                                  \
-_(egressInterface, 14, u32)                                             \
-_(ipNextHopIPv4Address, 15, ip4_address_t)                              \
-_(bgpSourceAsNumber, 16, u32)                                           \
-_(bgpDestinationAsNumber, 17, u32)                                      \
-_(bgpNextHopIPv4Address, 18, ip4_address_t)                             \
-_(postMCastPacketDeltaCount, 19, u64)                                   \
-_(postMCastOctetDeltaCount, 20, u64)                                    \
-_(flowEndSysUpTime, 21, u32)                                            \
-_(flowStartSysUpTime, 22, u32)                                          \
-_(postOctetDeltaCount, 23, u64)                                         \
-_(postPacketDeltaCount, 24, u64)                                        \
-_(minimumIpTotalLength, 25, u64)                                        \
-_(maximumIpTotalLength, 26, u64)                                        \
-_(sourceIPv6Address, 27, ip6_address_t)                                 \
-_(destinationIPv6Address, 28, ip6_address_t)                            \
-_(sourceIPv6PrefixLength, 29, u8)                                       \
-_(destinationIPv6PrefixLength, 30, u8)                                  \
-_(flowLabelIPv6, 31, u32)                                               \
-_(icmpTypeCodeIPv4, 32, u16)                                            \
-_(igmpType, 33, u8)                                                     \
-_(samplingInterval, 34, u32)                                            \
-_(samplingAlgorithm, 35, u8)                                            \
-_(flowActiveTimeout, 36, u16)                                           \
-_(flowIdleTimeout, 37, u16)                                             \
-_(engineType, 38, u8)                                                   \
-_(engineId, 39, u8)                                                     \
-_(exportedOctetTotalCount, 40, u64)                                     \
-_(exportedMessageTotalCount, 41, u64)                                   \
-_(exportedFlowRecordTotalCount, 42, u64)                                \
-_(ipv4RouterSc, 43, ip4_address_t)                                      \
-_(sourceIPv4Prefix, 44, ip4_address_t)                                  \
-_(destinationIPv4Prefix, 45, ip4_address_t)                             \
-_(mplsTopLabelType, 46, u8)                                             \
-_(mplsTopLabelIPv4Address, 47, ip4_address_t)                           \
-_(samplerId, 48, u8)                                                    \
-_(samplerMode, 49, u8)                                                  \
-_(samplerRandomInterval, 50, u32)                                       \
-_(classId, 51, u8)                                                      \
-_(minimumTTL, 52, u8)                                                   \
-_(maximumTTL, 53, u8)                                                   \
-_(fragmentIdentification, 54, u32)                                      \
-_(postIpClassOfService, 55, u8)                                         \
-_(sourceMacAddress, 56, macAddress)                                     \
-_(postDestinationMacAddress, 57, macAddress)                            \
-_(vlanId, 58, u16)                                                      \
-_(postVlanId, 59, u16)                                                  \
-_(ipVersion, 60, u8)                                                    \
-_(flowDirection, 61, u8)                                                \
-_(ipNextHopIPv6Address, 62, ip6_address_t)                              \
-_(bgpNextHopIPv6Address, 63, ip6_address_t)                             \
-_(ipv6ExtensionHeaders, 64, u32)                                        \
-_(mplsTopLabelStackSection, 70, octetArray)                             \
-_(mplsLabelStackSection2, 71, octetArray)                               \
-_(mplsLabelStackSection3, 72, octetArray)                               \
-_(mplsLabelStackSection4, 73, octetArray)                               \
-_(mplsLabelStackSection5, 74, octetArray)                               \
-_(mplsLabelStackSection6, 75, octetArray)                               \
-_(mplsLabelStackSection7, 76, octetArray)                               \
-_(mplsLabelStackSection8, 77, octetArray)                               \
-_(mplsLabelStackSection9, 78, octetArray)                               \
-_(mplsLabelStackSection10, 79, octetArray)                              \
-_(destinationMacAddress, 80, macAddress)                                \
-_(postSourceMacAddress, 81, macAddress)                                 \
-_(interfaceName, 82, string)                                            \
-_(interfaceDescription, 83, string)                                     \
-_(samplerName, 84, string)                                              \
-_(octetTotalCount, 85, u64)                                             \
-_(packetTotalCount, 86, u64)                                            \
-_(flagsAndSamplerId, 87, u32)                                           \
-_(fragmentOffset, 88, u16)                                              \
-_(forwardingStatus, 89, u32)                                            \
-_(mplsVpnRouteDistinguisher, 90, octetArray)                            \
-_(mplsTopLabelPrefixLength, 91, u8)                                     \
-_(srcTrafficIndex, 92, u32)                                             \
-_(dstTrafficIndex, 93, u32)                                             \
-_(applicationDescription, 94, string)                                   \
-_(applicationId, 95, octetArray)                                        \
-_(applicationName, 96, string)                                          \
-_(Assigned, 97, for NetFlow v9 compatibility	)                       \
-_(postIpDiffServCodePoint, 98, u8)                                      \
-_(multicastReplicationFactor, 99, u32)                                  \
-_(className, 100, string)                                               \
-_(classificationEngineId, 101, u8)                                      \
-_(layer2packetSectionOffset, 102, u16)                                  \
-_(layer2packetSectionSize, 103, u16)                                    \
-_(layer2packetSectionData, 104, octetArray)                             \
-_(bgpNextAdjacentAsNumber, 128, u32)                                    \
-_(bgpPrevAdjacentAsNumber, 129, u32)                                    \
-_(exporterIPv4Address, 130, ip4_address_t)                              \
-_(exporterIPv6Address, 131, ip6_address_t)                              \
-_(droppedOctetDeltaCount, 132, u64)                                     \
-_(droppedPacketDeltaCount, 133, u64)                                    \
-_(droppedOctetTotalCount, 134, u64)                                     \
-_(droppedPacketTotalCount, 135, u64)                                    \
-_(flowEndReason, 136, u8)                                               \
-_(commonPropertiesId, 137, u64)                                         \
-_(observationPointId, 138, u64)                                         \
-_(icmpTypeCodeIPv6, 139, u16)                                           \
-_(mplsTopLabelIPv6Address, 140, ip6_address_t)                          \
-_(lineCardId, 141, u32)                                                 \
-_(portId, 142, u32)                                                     \
-_(meteringProcessId, 143, u32)                                          \
-_(exportingProcessId, 144, u32)                                         \
-_(templateId, 145, u16)                                                 \
-_(wlanChannelId, 146, u8)                                               \
-_(wlanSSID, 147, string)                                                \
-_(flowId, 148, u64)                                                     \
-_(observationDomainId, 149, u32)                                        \
-_(flowStartSeconds, 150, dateTimeSeconds)                               \
-_(flowEndSeconds, 151, dateTimeSeconds)                                 \
-_(flowStartMilliseconds, 152, dateTimeMilliseconds)                     \
-_(flowEndMilliseconds, 153, dateTimeMilliseconds)                       \
-_(flowStartMicroseconds, 154, dateTimeMicroseconds)                     \
-_(flowEndMicroseconds, 155, dateTimeMicroseconds)                       \
-_(flowStartNanoseconds, 156, dateTimeNanoseconds)                       \
-_(flowEndNanoseconds, 157, dateTimeNanoseconds)                         \
-_(flowStartDeltaMicroseconds, 158, u32)                                 \
-_(flowEndDeltaMicroseconds, 159, u32)                                   \
-_(systemInitTimeMilliseconds, 160, dateTimeMilliseconds)                \
-_(flowDurationMilliseconds, 161, u32)                                   \
-_(flowDurationMicroseconds, 162, u32)                                   \
-_(observedFlowTotalCount, 163, u64)                                     \
-_(ignoredPacketTotalCount, 164, u64)                                    \
-_(ignoredOctetTotalCount, 165, u64)                                     \
-_(notSentFlowTotalCount, 166, u64)                                      \
-_(notSentPacketTotalCount, 167, u64)                                    \
-_(notSentOctetTotalCount, 168, u64)                                     \
-_(destinationIPv6Prefix, 169, ip6_address_t)                            \
-_(sourceIPv6Prefix, 170, ip6_address_t)                                 \
-_(postOctetTotalCount, 171, u64)                                        \
-_(postPacketTotalCount, 172, u64)                                       \
-_(flowKeyIndicator, 173, u64)                                           \
-_(postMCastPacketTotalCount, 174, u64)                                  \
-_(postMCastOctetTotalCount, 175, u64)                                   \
-_(icmpTypeIPv4, 176, u8)                                                \
-_(icmpCodeIPv4, 177, u8)                                                \
-_(icmpTypeIPv6, 178, u8)                                                \
-_(icmpCodeIPv6, 179, u8)                                                \
-_(udpSourcePort, 180, u16)                                              \
-_(udpDestinationPort, 181, u16)                                         \
-_(tcpSourcePort, 182, u16)                                              \
-_(tcpDestinationPort, 183, u16)                                         \
-_(tcpSequenceNumber, 184, u32)                                          \
-_(tcpAcknowledgementNumber, 185, u32)                                   \
-_(tcpWindowSize, 186, u16)                                              \
-_(tcpUrgentPointer, 187, u16)                                           \
-_(tcpHeaderLength, 188, u8)                                             \
-_(ipHeaderLength, 189, u8)                                              \
-_(totalLengthIPv4, 190, u16)                                            \
-_(payloadLengthIPv6, 191, u16)                                          \
-_(ipTTL, 192, u8)                                                       \
-_(nextHeaderIPv6, 193, u8)                                              \
-_(mplsPayloadLength, 194, u32)                                          \
-_(ipDiffServCodePoint, 195, u8)                                         \
-_(ipPrecedence, 196, u8)                                                \
-_(fragmentFlags, 197, u8)                                               \
-_(octetDeltaSumOfSquares, 198, u64)                                     \
-_(octetTotalSumOfSquares, 199, u64)                                     \
-_(mplsTopLabelTTL, 200, u8)                                             \
-_(mplsLabelStackLength, 201, u32)                                       \
-_(mplsLabelStackDepth, 202, u32)                                        \
-_(mplsTopLabelExp, 203, u8)                                             \
-_(ipPayloadLength, 204, u32)                                            \
-_(udpMessageLength, 205, u16)                                           \
-_(isMulticast, 206, u8)                                                 \
-_(ipv4IHL, 207, u8)                                                     \
-_(ipv4Options, 208, u32)                                                \
-_(tcpOptions, 209, u64)                                                 \
-_(paddingOctets, 210, octetArray)                                       \
-_(collectorIPv4Address, 211, ip4_address_t)                             \
-_(collectorIPv6Address, 212, ip6_address_t)                             \
-_(exportInterface, 213, u32)                                            \
-_(exportProtocolVersion, 214, u8)                                       \
-_(exportTransportProtocol, 215, u8)                                     \
-_(collectorTransportPort, 216, u16)                                     \
-_(exporterTransportPort, 217, u16)                                      \
-_(tcpSynTotalCount, 218, u64)                                           \
-_(tcpFinTotalCount, 219, u64)                                           \
-_(tcpRstTotalCount, 220, u64)                                           \
-_(tcpPshTotalCount, 221, u64)                                           \
-_(tcpAckTotalCount, 222, u64)                                           \
-_(tcpUrgTotalCount, 223, u64)                                           \
-_(ipTotalLength, 224, u64)                                              \
-_(postNATSourceIPv4Address, 225, ip4_address_t)                         \
-_(postNATDestinationIPv4Address, 226, ip4_address_t)                    \
-_(postNAPTSourceTransportPort, 227, u16)                                \
-_(postNAPTDestinationTransportPort, 228, u16)                           \
-_(natOriginatingAddressRealm, 229, u8)                                  \
-_(natEvent, 230, u8)                                                    \
-_(initiatorOctets, 231, u64)                                            \
-_(responderOctets, 232, u64)                                            \
-_(firewallEvent, 233, u8)                                               \
-_(ingressVRFID, 234, u32)                                               \
-_(egressVRFID, 235, u32)                                                \
-_(VRFname, 236, string)                                                 \
-_(postMplsTopLabelExp, 237, u8)                                         \
-_(tcpWindowScale, 238, u16)                                             \
-_(biflowDirection, 239, u8)                                             \
-_(ethernetHeaderLength, 240, u8)                                        \
-_(ethernetPayloadLength, 241, u16)                                      \
-_(ethernetTotalLength, 242, u16)                                        \
-_(dot1qVlanId, 243, u16)                                                \
-_(dot1qPriority, 244, u8)                                               \
-_(dot1qCustomerVlanId, 245, u16)                                        \
-_(dot1qCustomerPriority, 246, u8)                                       \
-_(metroEvcId, 247, string)                                              \
-_(metroEvcType, 248, u8)                                                \
-_(pseudoWireId, 249, u32)                                               \
-_(pseudoWireType, 250, u16)                                             \
-_(pseudoWireControlWord, 251, u32)                                      \
-_(ingressPhysicalInterface, 252, u32)                                   \
-_(egressPhysicalInterface, 253, u32)                                    \
-_(postDot1qVlanId, 254, u16)                                            \
-_(postDot1qCustomerVlanId, 255, u16)                                    \
-_(ethernetType, 256, u16)                                               \
-_(postIpPrecedence, 257, u8)                                            \
-_(collectionTimeMilliseconds, 258, dateTimeMilliseconds)                \
-_(exportSctpStreamId, 259, u16)                                         \
-_(maxExportSeconds, 260, dateTimeSeconds)                               \
-_(maxFlowEndSeconds, 261, dateTimeSeconds)                              \
-_(messageMD5Checksum, 262, octetArray)                                  \
-_(messageScope, 263, u8)                                                \
-_(minExportSeconds, 264, dateTimeSeconds)                               \
-_(minFlowStartSeconds, 265, dateTimeSeconds)                            \
-_(opaqueOctets, 266, octetArray)                                        \
-_(sessionScope, 267, u8)                                                \
-_(maxFlowEndMicroseconds, 268, dateTimeMicroseconds)                    \
-_(maxFlowEndMilliseconds, 269, dateTimeMilliseconds)                    \
-_(maxFlowEndNanoseconds, 270, dateTimeNanoseconds)                      \
-_(minFlowStartMicroseconds, 271, dateTimeMicroseconds)                  \
-_(minFlowStartMilliseconds, 272, dateTimeMilliseconds)                  \
-_(minFlowStartNanoseconds, 273, dateTimeNanoseconds)                    \
-_(collectorCertificate, 274, octetArray)                                \
-_(exporterCertificate, 275, octetArray)                                 \
-_(dataRecordsReliability, 276, boolean)                                 \
-_(observationPointType, 277, u8)                                        \
-_(newConnectionDeltaCount, 278, u32)                                    \
-_(connectionSumDurationSeconds, 279, u64)                               \
-_(connectionTransactionId, 280, u64)                                    \
-_(postNATSourceIPv6Address, 281, ip6_address_t)                         \
-_(postNATDestinationIPv6Address, 282, ip6_address_t)                    \
-_(natPoolId, 283, u32)                                                  \
-_(natPoolName, 284, string)                                             \
-_(anonymizationFlags, 285, u16)                                         \
-_(anonymizationTechnique, 286, u16)                                     \
-_(informationElementIndex, 287, u16)                                    \
-_(p2pTechnology, 288, string)                                           \
-_(tunnelTechnology, 289, string)                                        \
-_(encryptedTechnology, 290, string)                                     \
-_(basicList, 291, basicList)                                            \
-_(subTemplateList, 292, subTemplateList)                                \
-_(subTemplateMultiList, 293, subTemplateMultiList)                      \
-_(bgpValidityState, 294, u8)                                            \
-_(IPSecSPI, 295, u32)                                                   \
-_(greKey, 296, u32)                                                     \
-_(natType, 297, u8)                                                     \
-_(initiatorPackets, 298, u64)                                           \
-_(responderPackets, 299, u64)                                           \
-_(observationDomainName, 300, string)                                   \
-_(selectionSequenceId, 301, u64)                                        \
-_(selectorId, 302, u64)                                                 \
-_(informationElementId, 303, u16)                                       \
-_(selectorAlgorithm, 304, u16)                                          \
-_(samplingPacketInterval, 305, u32)                                     \
-_(samplingPacketSpace, 306, u32)                                        \
-_(samplingTimeInterval, 307, u32)                                       \
-_(samplingTimeSpace, 308, u32)                                          \
-_(samplingSize, 309, u32)                                               \
-_(samplingPopulation, 310, u32)                                         \
-_(samplingProbability, 311, float64)                                    \
-_(dataLinkFrameSize, 312, u16)                                          \
-_(ipHeaderPacketSection, 313, octetArray)                               \
-_(ipPayloadPacketSection, 314, octetArray)                              \
-_(dataLinkFrameSection, 315, octetArray)                                \
-_(mplsLabelStackSection, 316, octetArray)                               \
-_(mplsPayloadPacketSection, 317, octetArray)                            \
-_(selectorIdTotalPktsObserved, 318, u64)                                \
-_(selectorIdTotalPktsSelected, 319, u64)                                \
-_(absoluteError, 320, float64)                                          \
-_(relativeError, 321, float64)                                          \
-_(observationTimeSeconds, 322, dateTimeSeconds)                         \
-_(observationTimeMilliseconds, 323, dateTimeMilliseconds)               \
-_(observationTimeMicroseconds, 324, dateTimeMicroseconds)               \
-_(observationTimeNanoseconds, 325, dateTimeNanoseconds)                 \
-_(digestHashValue, 326, u64)                                            \
-_(hashIPPayloadOffset, 327, u64)                                        \
-_(hashIPPayloadSize, 328, u64)                                          \
-_(hashOutputRangeMin, 329, u64)                                         \
-_(hashOutputRangeMax, 330, u64)                                         \
-_(hashSelectedRangeMin, 331, u64)                                       \
-_(hashSelectedRangeMax, 332, u64)                                       \
-_(hashDigestOutput, 333, boolean)                                       \
-_(hashInitialiserValue, 334, u64)                                       \
-_(selectorName, 335, string)                                            \
-_(upperCILimit, 336, float64)                                           \
-_(lowerCILimit, 337, float64)                                           \
-_(confidenceLevel, 338, float64)                                        \
-_(informationElementDataType, 339, u8)                                  \
-_(informationElementDescription, 340, string)                           \
-_(informationElementName, 341, string)                                  \
-_(informationElementRangeBegin, 342, u64)                               \
-_(informationElementRangeEnd, 343, u64)                                 \
-_(informationElementSemantics, 344, u8)                                 \
-_(informationElementUnits, 345, u16)                                    \
-_(privateEnterpriseNumber, 346, u32)                                    \
-_(virtualStationInterfaceId, 347, octetArray)                           \
-_(virtualStationInterfaceName, 348, string)                             \
-_(virtualStationUUID, 349, octetArray)                                  \
-_(virtualStationName, 350, string)                                      \
-_(layer2SegmentId, 351, u64)                                            \
-_(layer2OctetDeltaCount, 352, u64)                                      \
-_(layer2OctetTotalCount, 353, u64)                                      \
-_(ingressUnicastPacketTotalCount, 354, u64)                             \
-_(ingressMulticastPacketTotalCount, 355, u64)                           \
-_(ingressBroadcastPacketTotalCount, 356, u64)                           \
-_(egressUnicastPacketTotalCount, 357, u64)                              \
-_(egressBroadcastPacketTotalCount, 358, u64)                            \
-_(monitoringIntervalStartMilliSeconds, 359, dateTimeMilliseconds)       \
-_(monitoringIntervalEndMilliSeconds, 360, dateTimeMilliseconds)         \
-_(portRangeStart, 361, u16)                                             \
-_(portRangeEnd, 362, u16)                                               \
-_(portRangeStepSize, 363, u16)                                          \
-_(portRangeNumPorts, 364, u16)                                          \
-_(staMacAddress, 365, macAddress)                                       \
-_(staIPv4Address, 366, ip4_address_t)                                   \
-_(wtpMacAddress, 367, macAddress )                                      \
-_(ingressInterfaceType, 368, u32)                                       \
-_(egressInterfaceType, 369, u32)                                        \
-_(rtpSequenceNumber, 370, u16)                                          \
-_(userName, 371, string)                                                \
-_(applicationCategoryName, 372, string)                                 \
-_(applicationSubCategoryName, 373, string)                              \
-_(applicationGroupName, 374, string)                                    \
-_(originalFlowsPresent, 375, u64)                                       \
-_(originalFlowsInitiated, 376, u64)                                     \
-_(originalFlowsCompleted, 377, u64)                                     \
-_(distinctCountOfSourceIPAddress, 378, u64)                             \
-_(distinctCountOfDestinationIPAddress, 379, u64)                        \
-_(distinctCountOfSourceIPv4Address, 380, u32)                           \
-_(distinctCountOfDestinationIPv4Address, 381, u32)                      \
-_(distinctCountOfSourceIPv6Address, 382, u64)                           \
-_(distinctCountOfDestinationIPv6Address, 383, u64)                      \
-_(valueDistributionMethod, 384, u8)                                     \
-_(rfc3550JitterMilliseconds, 385, u32)                                  \
-_(rfc3550JitterMicroseconds, 386, u32)                                  \
-_(rfc3550JitterNanoseconds, 387, u32)                                   \
-_(dot1qDEI, 388, boolean)                                               \
-_(dot1qCustomerDEI, 389, boolean)                                       \
-_(flowSelectorAlgorithm, 390, u16)                                      \
-_(flowSelectedOctetDeltaCount, 391, u64)                                \
-_(flowSelectedPacketDeltaCount, 392, u64)                               \
-_(flowSelectedFlowDeltaCount, 393, u64)                                 \
-_(selectorIDTotalFlowsObserved, 394, u64)                               \
-_(selectorIDTotalFlowsSelected, 395, u64)                               \
-_(samplingFlowInterval, 396, u64)                                       \
-_(samplingFlowSpacing, 397, u64)                                        \
-_(flowSamplingTimeInterval, 398, u64)                                   \
-_(flowSamplingTimeSpacing, 399, u64)                                    \
-_(hashFlowDomain, 400, u16)                                             \
-_(transportOctetDeltaCount, 401, u64)                                   \
-_(transportPacketDeltaCount, 402, u64)                                  \
-_(originalExporterIPv4Address, 403, ip4_address_t)                      \
-_(originalExporterIPv6Address, 404, ip6_address_t)                      \
-_(originalObservationDomainId, 405, u32)                                \
-_(intermediateProcessId, 406, u32)                                      \
-_(ignoredDataRecordTotalCount, 407, u64)                                \
-_(dataLinkFrameType, 408, u16)                                          \
-_(sectionOffset, 409, u16)                                              \
-_(sectionExportedOctets, 410, u16)                                      \
-_(dot1qServiceInstanceTag, 411, octetArray)                             \
-_(dot1qServiceInstanceId, 412, u32)                                     \
-_(dot1qServiceInstancePriority, 413, u8)                                \
-_(dot1qCustomerSourceMacAddress, 414, macAddress)                       \
-_(dot1qCustomerDestinationMacAddress, 415, macAddress)                  \
-_(postLayer2OctetDeltaCount, 417, u64)                                  \
-_(postMCastLayer2OctetDeltaCount, 418, u64)                             \
-_(postLayer2OctetTotalCount, 420, u64)                                  \
-_(postMCastLayer2OctetTotalCount, 421, u64)                             \
-_(minimumLayer2TotalLength, 422, u64)                                   \
-_(maximumLayer2TotalLength, 423, u64)                                   \
-_(droppedLayer2OctetDeltaCount, 424, u64)                               \
-_(droppedLayer2OctetTotalCount, 425, u64)                               \
-_(ignoredLayer2OctetTotalCount, 426, u64)                               \
-_(notSentLayer2OctetTotalCount, 427, u64)                               \
-_(layer2OctetDeltaSumOfSquares, 428, u64)                               \
-_(layer2OctetTotalSumOfSquares, 429, u64)                               \
-_(layer2FrameDeltaCount, 430, u64)                                      \
-_(layer2FrameTotalCount, 431, u64)                                      \
-_(pseudoWireDestinationIPv4Address, 432, ip4_address_t)                 \
-_(ignoredLayer2FrameTotalCount, 433, u64)
-
-typedef enum {
-#define _(n,v,t) n = v,
-  foreach_ipfix_info_element_t
-#undef _
-} ipfix_info_element_id_t;
-
-#endif /* __included_ipfix_info_elements_h__ */
diff --git a/vnet/vnet/flow/ipfix_packet.h b/vnet/vnet/flow/ipfix_packet.h
deleted file mode 100644
index 32979619..00000000
--- a/vnet/vnet/flow/ipfix_packet.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_ipfix_packet_h__
-#define __included_ipfix_packet_h__
-
-#include <vnet/flow/ipfix_info_elements.h>
-
-/* From RFC-7011:
- * https://tools.ietf.org/html/rfc7011
- */
-
-typedef struct {
-  u32 version_length;
-  u32 export_time;
-  u32 sequence_number;
-  u32 domain_id;
-} ipfix_message_header_t;
-
-static inline u32 version_length (u16 length)
-{
-  return clib_host_to_net_u32 (0x000a0000 | length);
-}
-
-
-/*
- *   The Field Specifier format is shown in Figure G.
- *
- *     0                   1                   2                   3
- *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |E|  Information Element ident. |        Field Length           |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |                      Enterprise Number                        |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- *                     Figure G: Field Specifier Format
- *
- *   Where:
- *
- *   E
- *
- *      Enterprise bit.  This is the first bit of the Field Specifier.  If
- *      this bit is zero, the Information Element identifier identifies an
- *      Information Element in [IANA-IPFIX], and the four-octet Enterprise
- *      Number field MUST NOT be present.  If this bit is one, the
- *      Information Element identifier identifies an enterprise-specific
- *      Information Element, and the Enterprise Number field MUST be
- *      present.
- */
-
-typedef struct {
-  u32 e_id_length;
-  u32 enterprise;
-} ipfix_enterprise_field_specifier_t;
-
-typedef struct {
-  u32 e_id_length;
-} ipfix_field_specifier_t;
-
-static inline u32 ipfix_e_id_length (int e, u16 id, u16 length)
-{
-  u32 value;
-  value = (e<<31) | ((id&0x7FFF) <<16) | length;
-  return clib_host_to_net_u32 (value);
-}
-
-/* 
- *   Every Set contains a common header.  This header is defined in
- *   Figure I.
- *
- *      0                   1                   2                   3
- *      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |          Set ID               |          Length               |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- *                        Figure I: Set Header Format
- *
- *   Each Set Header field is exported in network format.  The fields are
- *   defined as follows:
- *
- *   Set ID
- *
- *      Identifies the Set.  A value of 2 is reserved for Template Sets.
- *      A value of 3 is reserved for Options Template Sets.  Values from 4
- *      to 255 are reserved for future use.  Values 256 and above are used
- *      for Data Sets.  The Set ID values of 0 and 1 are not used, for
- *      historical reasons [RFC3954].
- *
- *   Length
- *
- *      Total length of the Set, in octets, including the Set Header, all
- *      records, and the optional padding.  Because an individual Set MAY
- *      contain multiple records, the Length value MUST be used to
- *      determine the position of the next Set.
- */
-
-typedef struct {
-  u32 set_id_length;
-} ipfix_set_header_t;
-
-static inline u32 ipfix_set_id_length (u16 set_id, u16 length)
-{
-  return clib_host_to_net_u32 ((set_id<<16) | length);
-}
-
-/* 
- *   The format of the Template Record is shown in Figure J.  It consists
- *   of a Template Record Header and one or more Field Specifiers.  Field
- *   Specifiers are defined in Figure G above.
- *
- *           +--------------------------------------------------+
- *           | Template Record Header                           |
- *           +--------------------------------------------------+
- *           | Field Specifier                                  |
- *           +--------------------------------------------------+
- *           | Field Specifier                                  |
- *           +--------------------------------------------------+
- *            ...
- *           +--------------------------------------------------+
- *           | Field Specifier                                  |
- *           +--------------------------------------------------+
- *
- *                     Figure J: Template Record Format
- *
- *   The format of the Template Record Header is shown in Figure K.
- *
- *     0                   1                   2                   3
- *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |      Template ID (> 255)      |         Field Count           |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- *                  Figure K: Template Record Header Format
- *
- *   The Template Record Header Field definitions are as follows:
- *
- *   Template ID
- *
- *      Each Template Record is given a unique Template ID in the range
- *      256 to 65535.  This uniqueness is local to the Transport Session
- *      and Observation Domain that generated the Template ID.  Since
- *      Template IDs are used as Set IDs in the Sets they describe (see
- *      Section 3.4.3), values 0-255 are reserved for special Set types
- *      (e.g., Template Sets themselves), and Templates and Options
- *      Templates (see Section 3.4.2) cannot share Template IDs within a
- *      Transport Session and Observation Domain.  There are no
- *      constraints regarding the order of the Template ID allocation.  As
- *      Exporting Processes are free to allocate Template IDs as they see
- *      fit, Collecting Processes MUST NOT assume incremental Template
- *      IDs, or anything about the contents of a Template based on its
- *      Template ID alone.
- *
- *   Field Count
- *
- *      Number of fields in this Template Record.
- */
-
-typedef struct {
-  u32 id_count;
-} ipfix_template_header_t;
-
-static inline u32 ipfix_id_count (u16 id, u16 count)
-{
-  return clib_host_to_net_u32 ((id<<16) | count);
-}
-
-/* Template packet */
-typedef struct {
-  ipfix_message_header_t h;
-  ipfix_set_header_t s;
-  ipfix_template_header_t t;
-  ipfix_field_specifier_t fields[0];
-} ipfix_template_packet_t;
-
-#endif /* __included_ipfix_packet_h__ */
diff --git a/vnet/vnet/global_funcs.h b/vnet/vnet/global_funcs.h
deleted file mode 100644
index 92a5c04d..00000000
--- a/vnet/vnet/global_funcs.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * global_funcs.h: global data structure access functions
- */
-
-#ifndef included_vnet_global_funcs_h_
-#define included_vnet_global_funcs_h_
-
-vnet_main_t *vnet_get_main (void);
-
-#endif /* included_vnet_global_funcs_h_ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/gre/error.def b/vnet/vnet/gre/error.def
deleted file mode 100644
index 161ecc1d..00000000
--- a/vnet/vnet/gre/error.def
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * gre_error.def: gre errors
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-gre_error (NONE, "no error")
-gre_error (UNKNOWN_PROTOCOL, "unknown protocol")
-gre_error (UNSUPPORTED_VERSION, "unsupported version")
-gre_error (PKTS_DECAP, "GRE input packets decapsulated")
-gre_error (PKTS_ENCAP, "GRE output packets encapsulated")
-gre_error (NO_SUCH_TUNNEL, "GRE input packets dropped due to missing tunnel")
diff --git a/vnet/vnet/gre/gre.api b/vnet/vnet/gre/gre.api
deleted file mode 100644
index 28f6dbc9..00000000
--- a/vnet/vnet/gre/gre.api
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-define gre_add_del_tunnel
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 is_ipv6;
-  u8 teb;
-  u8 src_address[16];
-  u8 dst_address[16];
-  u32 outer_fib_id;
-};
-
-define gre_add_del_tunnel_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-};
-
-define gre_tunnel_dump
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-};
-
-define gre_tunnel_details
-{
-  u32 context;
-  u32 sw_if_index;
-  u8 is_ipv6;
-  u8 teb;
-  u8 src_address[16];
-  u8 dst_address[16];
-  u32 outer_fib_id;
-};
-
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/gre/gre.c b/vnet/vnet/gre/gre.c
deleted file mode 100644
index 0faed13e..00000000
--- a/vnet/vnet/gre/gre.c
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
- * gre.c: gre
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/gre/gre.h>
-#include <vnet/adj/adj_midchain.h>
-
-gre_main_t gre_main;
-
-typedef struct {
-  union {
-    ip4_and_gre_header_t ip4_and_gre;
-    u64 as_u64[3];
-  };
-} ip4_and_gre_union_t;
-
-
-/* Packet trace structure */
-typedef struct {
-  /* Tunnel-id / index in tunnel vector */
-  u32 tunnel_id;
-
-  /* pkt length */
-  u32 length;
-
-  /* tunnel ip4 addresses */
-  ip4_address_t src;
-  ip4_address_t dst;
-} gre_tx_trace_t;
-
-u8 * format_gre_tx_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  gre_tx_trace_t * t = va_arg (*args, gre_tx_trace_t *);
-
-  s = format (s, "GRE: tunnel %d len %d src %U dst %U",
-	      t->tunnel_id, clib_net_to_host_u16 (t->length),
-	      format_ip4_address, &t->src.as_u8,
-	      format_ip4_address, &t->dst.as_u8);
-  return s;
-}
-
-u8 * format_gre_protocol (u8 * s, va_list * args)
-{
-  gre_protocol_t p = va_arg (*args, u32);
-  gre_main_t * gm = &gre_main;
-  gre_protocol_info_t * pi = gre_get_protocol_info (gm, p);
-
-  if (pi)
-    s = format (s, "%s", pi->name);
-  else
-    s = format (s, "0x%04x", p);
-
-  return s;
-}
-
-u8 * format_gre_header_with_length (u8 * s, va_list * args)
-{
-  gre_main_t * gm = &gre_main;
-  gre_header_t * h = va_arg (*args, gre_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-  gre_protocol_t p = clib_net_to_host_u16 (h->protocol);
-  uword indent, header_bytes;
-
-  header_bytes = sizeof (h[0]);
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    return format (s, "gre header truncated");
-
-  indent = format_get_indent (s);
-
-  s = format (s, "GRE %U", format_gre_protocol, p);
-
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    {
-      gre_protocol_info_t * pi = gre_get_protocol_info (gm, p);
-      vlib_node_t * node = vlib_get_node (gm->vlib_main, pi->node_index);
-      if (node->format_buffer)
-	s = format (s, "\n%U%U",
-		    format_white_space, indent,
-		    node->format_buffer, (void *) (h + 1),
-		    max_header_bytes - header_bytes);
-    }
-
-  return s;
-}
-
-u8 * format_gre_header (u8 * s, va_list * args)
-{
-  gre_header_t * h = va_arg (*args, gre_header_t *);
-  return format (s, "%U", format_gre_header_with_length, h, 0);
-}
-
-/* Returns gre protocol as an int in host byte order. */
-uword
-unformat_gre_protocol_host_byte_order (unformat_input_t * input,
-				       va_list * args)
-{
-  u16 * result = va_arg (*args, u16 *);
-  gre_main_t * gm = &gre_main;
-  int i;
-
-  /* Named type. */
-  if (unformat_user (input, unformat_vlib_number_by_name,
-		     gm->protocol_info_by_name, &i))
-    {
-      gre_protocol_info_t * pi = vec_elt_at_index (gm->protocol_infos, i);
-      *result = pi->protocol;
-      return 1;
-    }
-
-  return 0;
-}
-
-uword
-unformat_gre_protocol_net_byte_order (unformat_input_t * input,
-				      va_list * args)
-{
-  u16 * result = va_arg (*args, u16 *);
-  if (! unformat_user (input, unformat_gre_protocol_host_byte_order, result))
-    return 0;
-  *result = clib_host_to_net_u16 ((u16) *result);
-  return 1;
-}
-
-uword
-unformat_gre_header (unformat_input_t * input, va_list * args)
-{
-  u8 ** result = va_arg (*args, u8 **);
-  gre_header_t _h, * h = &_h;
-  u16 p;
-
-  if (! unformat (input, "%U",
-		  unformat_gre_protocol_host_byte_order, &p))
-    return 0;
-
-  h->protocol = clib_host_to_net_u16 (p);
-
-  /* Add header to result. */
-  {
-    void * p;
-    u32 n_bytes = sizeof (h[0]);
-
-    vec_add2 (*result, p, n_bytes);
-    clib_memcpy (p, h, n_bytes);
-  }
-
-  return 1;
-}
-
-static int
-gre_proto_from_vnet_link (vnet_link_t link)
-{
-    switch (link)
-    {
-    case VNET_LINK_IP4:
-        return (GRE_PROTOCOL_ip4);
-    case VNET_LINK_IP6:
-        return (GRE_PROTOCOL_ip6);
-    case VNET_LINK_MPLS:
-        return (GRE_PROTOCOL_mpls_unicast);
-    case VNET_LINK_ETHERNET:
-        return (GRE_PROTOCOL_teb);
-    case VNET_LINK_ARP:
-        return (GRE_PROTOCOL_arp);
-    }
-    ASSERT(0);
-    return (GRE_PROTOCOL_ip4);
-}
-
-static u8*
-gre_build_rewrite (vnet_main_t * vnm,
-		   u32 sw_if_index,
-		   vnet_link_t link_type,
-		   const void *dst_address)
-{
-  gre_main_t * gm = &gre_main;
-  ip4_and_gre_header_t * h;
-  u8* rewrite = NULL;
-  gre_tunnel_t *t;
-  u32 ti;
-
-  ti = gm->tunnel_index_by_sw_if_index[sw_if_index];
-
-  if (~0 == ti)
-      /* not one of ours */
-      return (0);
-
-  t = pool_elt_at_index(gm->tunnels, ti);
-
-  vec_validate(rewrite, sizeof(*h)-1);
-  h = (ip4_and_gre_header_t*)rewrite;
-  h->gre.protocol = clib_host_to_net_u16(gre_proto_from_vnet_link(link_type));
-
-  h->ip4.ip_version_and_header_length = 0x45;
-  h->ip4.ttl = 254;
-  h->ip4.protocol = IP_PROTOCOL_GRE;
-  /* fixup ip4 header length and checksum after-the-fact */
-  h->ip4.src_address.as_u32 = t->tunnel_src.as_u32;
-  h->ip4.dst_address.as_u32 = t->tunnel_dst.as_u32;
-  h->ip4.checksum = ip4_header_checksum (&h->ip4);
-
-  return (rewrite);
-}
-
-void
-gre_fixup (vlib_main_t *vm,
-	   ip_adjacency_t *adj,
-	   vlib_buffer_t *b0)
-{
-    ip4_header_t * ip0;
-
-    ip0 = vlib_buffer_get_current (b0);
-
-    /* Fixup the checksum and len fields in the GRE tunnel encap
-     * that was applied at the midchain node */
-    ip0->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
-    ip0->checksum = ip4_header_checksum (ip0);
-}
-
-void
-gre_update_adj (vnet_main_t * vnm,
-		u32 sw_if_index,
-		adj_index_t ai)
-{
-    adj_nbr_midchain_update_rewrite (ai, gre_fixup, 
-				     ADJ_MIDCHAIN_FLAG_NONE,
-				     gre_build_rewrite(vnm, sw_if_index,
-						       adj_get_link_type(ai),
-						       NULL));
-
-    gre_tunnel_stack(ai);
-}
-
-/**
- * @brief TX function. Only called L2. L3 traffic uses the adj-midchains
- */
-static uword
-gre_interface_tx_inline (vlib_main_t * vm,
-                         vlib_node_runtime_t * node,
-                         vlib_frame_t * frame)
-{
-  gre_main_t * gm = &gre_main;
-  u32 next_index;
-  u32 * from, * to_next, n_left_from, n_left_to_next;
-  vnet_interface_output_runtime_t * rd = (void *) node->runtime_data;
-  const gre_tunnel_t *gt = pool_elt_at_index (gm->tunnels, rd->dev_instance);
-
-  /* Vector of buffer / pkt indices we're supposed to process */
-  from = vlib_frame_vector_args (frame);
-
-  /* Number of buffers / pkts */
-  n_left_from = frame->n_vectors;
-
-  /* Speculatively send the first buffer to the last disposition we used */
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      /* set up to enqueue to our disposition with index = next_index */
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /*
-       * FIXME DUAL LOOP
-       */
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t * b0;
-	  u32 bi0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer(vm, bi0);
-
-	  vnet_buffer(b0)->ip.adj_index[VLIB_TX] = gt->l2_adj_index;
-
-	  if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      gre_tx_trace_t *tr = vlib_add_trace (vm, node,
-						   b0, sizeof (*tr));
-	      tr->tunnel_id = gt - gm->tunnels;
-	      tr->length = vlib_buffer_length_in_chain (vm, b0);
-	      tr->src.as_u32 = gt->tunnel_src.as_u32;
-	      tr->dst.as_u32 = gt->tunnel_src.as_u32;
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, gt->l2_tx_arc);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, gre_input_node.index,
-			       GRE_ERROR_PKTS_ENCAP, frame->n_vectors);
-
-  return frame->n_vectors;
-}
-
-static uword
-gre_interface_tx (vlib_main_t * vm,
-                  vlib_node_runtime_t * node,
-                  vlib_frame_t * frame)
-{
-    return (gre_interface_tx_inline (vm, node, frame));
-}
-
-static uword
-gre_teb_interface_tx (vlib_main_t * vm,
-                      vlib_node_runtime_t * node,
-                      vlib_frame_t * frame)
-{
-    return (gre_interface_tx_inline (vm, node, frame));
-}
-
-static u8 * format_gre_tunnel_name (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  return format (s, "gre%d", dev_instance);
-}
-
-static u8 * format_gre_tunnel_teb_name (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  return format (s, "teb-gre%d", dev_instance);
-}
-
-static u8 * format_gre_device (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  CLIB_UNUSED (int verbose) = va_arg (*args, int);
-
-  s = format (s, "GRE tunnel: id %d\n", dev_instance);
-  return s;
-}
-
-VNET_DEVICE_CLASS (gre_device_class) = {
-  .name = "GRE tunnel device",
-  .format_device_name = format_gre_tunnel_name,
-  .format_device = format_gre_device,
-  .format_tx_trace = format_gre_tx_trace,
-  .tx_function = gre_interface_tx,
-  .admin_up_down_function = gre_interface_admin_up_down,
-#ifdef SOON
-  .clear counter = 0;
-#endif
-};
-
-VLIB_DEVICE_TX_FUNCTION_MULTIARCH (gre_device_class,
-				   gre_interface_tx)
-
-VNET_DEVICE_CLASS (gre_device_teb_class) = {
-  .name = "GRE TEB tunnel device",
-  .format_device_name = format_gre_tunnel_teb_name,
-  .format_device = format_gre_device,
-  .format_tx_trace = format_gre_tx_trace,
-  .tx_function = gre_teb_interface_tx,
-  .admin_up_down_function = gre_interface_admin_up_down,
-#ifdef SOON
-  .clear counter = 0;
-#endif
-};
-
-VLIB_DEVICE_TX_FUNCTION_MULTIARCH (gre_device_teb_class,
-				   gre_teb_interface_tx)
-
-VNET_HW_INTERFACE_CLASS (gre_hw_interface_class) = {
-  .name = "GRE",
-  .format_header = format_gre_header_with_length,
-  .unformat_header = unformat_gre_header,
-  .build_rewrite = gre_build_rewrite,
-  .update_adjacency = gre_update_adj,
-  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
-};
-
-static void add_protocol (gre_main_t * gm,
-			  gre_protocol_t protocol,
-			  char * protocol_name)
-{
-  gre_protocol_info_t * pi;
-  u32 i;
-
-  vec_add2 (gm->protocol_infos, pi, 1);
-  i = pi - gm->protocol_infos;
-
-  pi->name = protocol_name;
-  pi->protocol = protocol;
-  pi->next_index = pi->node_index = ~0;
-
-  hash_set (gm->protocol_info_by_protocol, protocol, i);
-  hash_set_mem (gm->protocol_info_by_name, pi->name, i);
-}
-
-static clib_error_t * gre_init (vlib_main_t * vm)
-{
-  gre_main_t * gm = &gre_main;
-  clib_error_t * error;
-  ip_main_t * im = &ip_main;
-  ip_protocol_info_t * pi;
-
-  memset (gm, 0, sizeof (gm[0]));
-  gm->vlib_main = vm;
-  gm->vnet_main = vnet_get_main();
-
-  if ((error = vlib_call_init_function (vm, ip_main_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip4_lookup_init)))
-    return error;
-
-  /* Set up the ip packet generator */
-  pi = ip_get_protocol_info (im, IP_PROTOCOL_GRE);
-  pi->format_header = format_gre_header;
-  pi->unformat_pg_edit = unformat_pg_gre_header;
-
-  gm->protocol_info_by_name = hash_create_string (0, sizeof (uword));
-  gm->protocol_info_by_protocol = hash_create (0, sizeof (uword));
-  gm->tunnel_by_key = hash_create (0, sizeof (uword));
-
-#define _(n,s) add_protocol (gm, GRE_PROTOCOL_##s, #s);
-  foreach_gre_protocol
-#undef _
-
-  return vlib_call_init_function (vm, gre_input_init);
-}
-
-VLIB_INIT_FUNCTION (gre_init);
-
-gre_main_t * gre_get_main (vlib_main_t * vm)
-{
-  vlib_call_init_function (vm, gre_init);
-  return &gre_main;
-}
-
diff --git a/vnet/vnet/gre/gre.h b/vnet/vnet/gre/gre.h
deleted file mode 100644
index b6544b9b..00000000
--- a/vnet/vnet/gre/gre.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * gre.h: types/functions for gre.
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_gre_h
-#define included_gre_h
-
-#include <vnet/vnet.h>
-#include <vnet/gre/packet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ip/ip4.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ip/format.h>
-#include <vnet/adj/adj_types.h>
-
-extern vnet_hw_interface_class_t gre_hw_interface_class;
-
-typedef enum {
-#define gre_error(n,s) GRE_ERROR_##n,
-#include <vnet/gre/error.def>
-#undef gre_error
-  GRE_N_ERROR,
-} gre_error_t;
-
-/**
- * A GRE payload protocol registration
- */
-typedef struct {
-  /** Name (a c string). */
-  char * name;
-
-  /** GRE protocol type in host byte order. */
-  gre_protocol_t protocol;
-
-  /** Node which handles this type. */
-  u32 node_index;
-
-  /** Next index for this type. */
-  u32 next_index;
-} gre_protocol_info_t;
-
-/**
- * @brief The GRE tunnel type
- */
-typedef enum gre_tunnel_tyoe_t_
-{
-  /**
-   * L3 GRE (i.e. this tunnel is in L3 mode)
-   */
-  GRE_TUNNEL_TYPE_L3,
-  /**
-   * Transparent Ethernet Bridging - the tunnel is in L2 mode
-   */
-  GRE_TUNNEL_TYPE_TEB,
-} gre_tunnel_type_t;
-
-#define GRE_TUNNEL_TYPE_NAMES {    \
-    [GRE_TUNNEL_TYPE_L3] = "L3",   \
-    [GRE_TUNNEL_TYPE_TEB] = "TEB", \
-}
-
-#define GRE_TUNNEL_N_TYPES ((gre_tunnel_type_t)GRE_TUNNEL_TYPE_TEB+1)
-
-/**
- * @brief A representation of a GRE tunnel
- */
-typedef struct {
-  /**
-   * Linkage into the FIB object graph
-   */
-  fib_node_t node;
-
-  /**
-   * The tunnel's source/local address
-   */
-  ip4_address_t tunnel_src;
-  /**
-   * The tunnel's destination/remote address
-   */
-  ip4_address_t tunnel_dst;
-  /**
-   * The FIB in which the src.dst address are present
-   */
-  u32 outer_fib_index;
-  u32 hw_if_index;
-  u32 sw_if_index;
-  gre_tunnel_type_t type;
-
-  /**
-   * The FIB entry sourced by the tunnel for its destination prefix
-   */
-  fib_node_index_t fib_entry_index;
-
-  /**
-   * The tunnel is a child of the FIB entry for its desintion. This is
-   * so it receives updates when the forwarding information for that entry
-   * changes.
-   * The tunnels sibling index on the FIB entry's dependency list.
-   */
-  u32 sibling_index;
-
-  /**
-   * on a L2 tunnel this is the VLIB arc from the L2-tx to the l2-midchain
-   */
-  u32 l2_tx_arc;
-
-  /**
-   * an L2 tunnel always rquires an L2 midchain. cache here for DP.
-   */
-  adj_index_t l2_adj_index;
-} gre_tunnel_t;
-
-/**
- * @brief GRE related global data
- */
-typedef struct {
-  /**
-   * pool of tunnel instances
-   */
-  gre_tunnel_t *tunnels;
-
-  /**
-   * GRE payload protocol registrations
-   */
-  gre_protocol_info_t * protocol_infos;
-
-  /**
-   *  Hash tables mapping name/protocol to protocol info index.
-   */
-  uword * protocol_info_by_name, * protocol_info_by_protocol;
-  /**
-   * Hash mapping src/dst addr pair to tunnel
-   */
-  uword * tunnel_by_key;
-
-  /**
-   * Free vlib hw_if_indices.
-   * A free list per-tunnel type since the interfaces ctreated are fo different
-   * types and we cannot change the type.
-   */
-  u32 * free_gre_tunnel_hw_if_indices[GRE_TUNNEL_N_TYPES];
-
-  /**
-   * Mapping from sw_if_index to tunnel index
-   */
-  u32 * tunnel_index_by_sw_if_index;
-
-  /* convenience */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-} gre_main_t;
-
-/**
- * @brief IPv4 and GRE header.
- */
-typedef CLIB_PACKED (struct {
-  ip4_header_t ip4;
-  gre_header_t gre;
-}) ip4_and_gre_header_t;
-
-always_inline gre_protocol_info_t *
-gre_get_protocol_info (gre_main_t * em, gre_protocol_t protocol)
-{
-  uword * p = hash_get (em->protocol_info_by_protocol, protocol);
-  return p ? vec_elt_at_index (em->protocol_infos, p[0]) : 0;
-}
-
-gre_main_t gre_main;
-
-/* Register given node index to take input for given gre type. */
-void
-gre_register_input_type (vlib_main_t * vm,
-			 gre_protocol_t protocol,
-			 u32 node_index);
-
-extern  clib_error_t * gre_interface_admin_up_down (vnet_main_t * vnm,
-						    u32 hw_if_index,
-						    u32 flags);
-
-extern void gre_tunnel_stack (adj_index_t ai);
-extern void gre_update_adj (vnet_main_t * vnm,
-                            u32 sw_if_index,
-                            adj_index_t ai);
-
-format_function_t format_gre_protocol;
-format_function_t format_gre_header;
-format_function_t format_gre_header_with_length;
-
-extern vlib_node_registration_t gre_input_node;
-extern vnet_device_class_t gre_device_class;
-extern vnet_device_class_t gre_device_teb_class;
-
-/* Parse gre protocol as 0xXXXX or protocol name.
-   In either host or network byte order. */
-unformat_function_t unformat_gre_protocol_host_byte_order;
-unformat_function_t unformat_gre_protocol_net_byte_order;
-
-/* Parse gre header. */
-unformat_function_t unformat_gre_header;
-unformat_function_t unformat_pg_gre_header;
-
-void
-gre_register_input_protocol (vlib_main_t * vm,
-			     gre_protocol_t protocol,
-			     u32 node_index);
-
-/* manually added to the interface output node in gre.c */
-#define GRE_OUTPUT_NEXT_LOOKUP	1
-
-typedef struct {
-  u8 is_add;
-
-  ip4_address_t src, dst;
-  u32 outer_fib_id;
-  u8 teb;
-} vnet_gre_add_del_tunnel_args_t;
-
-int vnet_gre_add_del_tunnel
-  (vnet_gre_add_del_tunnel_args_t *a, u32 * sw_if_indexp);
-
-#endif /* included_gre_h */
diff --git a/vnet/vnet/gre/gre_api.c b/vnet/vnet/gre/gre_api.c
deleted file mode 100644
index 333838c0..00000000
--- a/vnet/vnet/gre/gre_api.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- *------------------------------------------------------------------
- * gre_api.c - gre api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-
-#include <vnet/gre/gre.h>
-#include <vnet/fib/fib_table.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                             \
-_(GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel)               \
-_(GRE_TUNNEL_DUMP, gre_tunnel_dump)
-
-static void vl_api_gre_add_del_tunnel_t_handler
-  (vl_api_gre_add_del_tunnel_t * mp)
-{
-  vl_api_gre_add_del_tunnel_reply_t *rmp;
-  int rv = 0;
-  vnet_gre_add_del_tunnel_args_t _a, *a = &_a;
-  u32 outer_fib_id;
-  uword *p;
-  ip4_main_t *im = &ip4_main;
-  u32 sw_if_index = ~0;
-
-  p = hash_get (im->fib_index_by_table_id, ntohl (mp->outer_fib_id));
-  if (!p)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_FIB;
-      goto out;
-    }
-  outer_fib_id = p[0];
-
-  /* Check src & dst are different */
-  if ((mp->is_ipv6 && memcmp (mp->src_address, mp->dst_address, 16) == 0) ||
-      (!mp->is_ipv6 && memcmp (mp->src_address, mp->dst_address, 4) == 0))
-    {
-      rv = VNET_API_ERROR_SAME_SRC_DST;
-      goto out;
-    }
-  memset (a, 0, sizeof (*a));
-
-  a->is_add = mp->is_add;
-  a->teb = mp->teb;
-
-  /* ip addresses sent in network byte order */
-  clib_memcpy (&(a->src), mp->src_address, 4);
-  clib_memcpy (&(a->dst), mp->dst_address, 4);
-
-  a->outer_fib_id = outer_fib_id;
-  rv = vnet_gre_add_del_tunnel (a, &sw_if_index);
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_GRE_ADD_DEL_TUNNEL_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void send_gre_tunnel_details
-  (gre_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_gre_tunnel_details_t *rmp;
-  ip4_main_t *im = &ip4_main;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_GRE_TUNNEL_DETAILS);
-  clib_memcpy (rmp->src_address, &(t->tunnel_src), 4);
-  clib_memcpy (rmp->dst_address, &(t->tunnel_dst), 4);
-  rmp->outer_fib_id = htonl (im->fibs[t->outer_fib_index].ft_table_id);
-  rmp->teb = (GRE_TUNNEL_TYPE_TEB == t->type);
-  rmp->sw_if_index = htonl (t->sw_if_index);
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_gre_tunnel_dump_t_handler (vl_api_gre_tunnel_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  gre_main_t *gm = &gre_main;
-  gre_tunnel_t *t;
-  u32 sw_if_index;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  if (~0 == sw_if_index)
-    {
-      /* *INDENT-OFF* */
-      pool_foreach (t, gm->tunnels,
-      ({
-        send_gre_tunnel_details(t, q, mp->context);
-      }));
-      /* *INDENT-ON* */
-    }
-  else
-    {
-      if ((sw_if_index >= vec_len (gm->tunnel_index_by_sw_if_index)) ||
-	  (~0 == gm->tunnel_index_by_sw_if_index[sw_if_index]))
-	{
-	  return;
-	}
-      t = &gm->tunnels[gm->tunnel_index_by_sw_if_index[sw_if_index]];
-      send_gre_tunnel_details (t, q, mp->context);
-    }
-}
-
-/*
- * gre_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_gre;
-#undef _
-}
-
-static clib_error_t *
-gre_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (gre_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/gre/interface.c b/vnet/vnet/gre/interface.c
deleted file mode 100644
index d624587d..00000000
--- a/vnet/vnet/gre/interface.c
+++ /dev/null
@@ -1,606 +0,0 @@
-/*
- * gre_interface.c: gre interfaces
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/gre/gre.h>
-#include <vnet/ip/format.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/adj/adj_midchain.h>
-#include <vnet/adj/adj_nbr.h>
-#include <vnet/mpls/mpls.h>
-
-static const char *gre_tunnel_type_names[] = GRE_TUNNEL_TYPE_NAMES;
-
-static inline u64
-gre_mk_key (const ip4_address_t *src,
-            const ip4_address_t *dst,
-            u32 out_fib_index)
-{
-  // FIXME. the fib index should be part of the key
-  return ((u64)src->as_u32 << 32 | (u64)dst->as_u32);
-}
-
-static u8 *
-format_gre_tunnel_type (u8 * s, va_list * args)
-{
-  gre_tunnel_type_t type = va_arg (*args, gre_tunnel_type_t);
-
-  return (format(s, "%s", gre_tunnel_type_names[type]));
-}
-
-static u8 *
-format_gre_tunnel (u8 * s, va_list * args)
-{
-  gre_tunnel_t * t = va_arg (*args, gre_tunnel_t *);
-  gre_main_t * gm = &gre_main;
-
-  s = format (s,
-              "[%d] %U (src) %U (dst) payload %U outer_fib_index %d",
-              t - gm->tunnels,
-              format_ip4_address, &t->tunnel_src,
-              format_ip4_address, &t->tunnel_dst,
-              format_gre_tunnel_type, t->type,
-              t->outer_fib_index);
-
-  return s;
-}
-
-static gre_tunnel_t *
-gre_tunnel_db_find (const ip4_address_t *src,
-                    const ip4_address_t *dst,
-                    u32 out_fib_index)
-{
-  gre_main_t * gm = &gre_main;
-  uword * p;
-  u64 key;
-
-  key = gre_mk_key(src, dst, out_fib_index);
-
-  p = hash_get (gm->tunnel_by_key, key);
-
-  if (NULL == p)
-    return (NULL);
-
-  return (pool_elt_at_index (gm->tunnels, p[0]));
-}
-
-static void
-gre_tunnel_db_add (const gre_tunnel_t *t)
-{
-  gre_main_t * gm = &gre_main;
-  u64 key;
-
-  key = gre_mk_key(&t->tunnel_src, &t->tunnel_dst, t->outer_fib_index);
-  hash_set (gm->tunnel_by_key, key, t - gm->tunnels);
-}
-
-static void
-gre_tunnel_db_remove (const gre_tunnel_t *t)
-{
-  gre_main_t * gm = &gre_main;
-  u64 key;
-
-  key = gre_mk_key(&t->tunnel_src, &t->tunnel_dst, t->outer_fib_index);
-  hash_unset (gm->tunnel_by_key, key);
-}
-
-static gre_tunnel_t *
-gre_tunnel_from_fib_node (fib_node_t *node)
-{
-#if (CLIB_DEBUG > 0)
-    ASSERT(FIB_NODE_TYPE_GRE_TUNNEL == node->fn_type);
-#endif
-    return ((gre_tunnel_t*) (((char*)node) -
-                             STRUCT_OFFSET_OF(gre_tunnel_t, node)));
-}
-
-/**
- * gre_tunnel_stack
- *
- * 'stack' (resolve the recursion for) the tunnel's midchain adjacency
- */
-void
-gre_tunnel_stack (adj_index_t ai)
-{
-    gre_main_t * gm = &gre_main;
-    ip_adjacency_t *adj;
-    gre_tunnel_t *gt;
-    u32 sw_if_index;
-
-    adj = adj_get(ai);
-    sw_if_index = adj->rewrite_header.sw_if_index;
-
-    if ((vec_len(gm->tunnel_index_by_sw_if_index) < sw_if_index) ||
-	(~0 == gm->tunnel_index_by_sw_if_index[sw_if_index]))
-	return;
-
-    gt = pool_elt_at_index(gm->tunnels,
-			   gm->tunnel_index_by_sw_if_index[sw_if_index]);
-
-    /*
-     * find the adjacency that is contributed by the FIB entry
-     * that this tunnel resovles via, and use it as the next adj
-     * in the midchain
-     */
-    if (vnet_hw_interface_get_flags(vnet_get_main(),
-				    gt->hw_if_index) &
-	VNET_HW_INTERFACE_FLAG_LINK_UP)
-    {
-	adj_nbr_midchain_stack(
-	    ai,
-	    fib_entry_contribute_ip_forwarding(gt->fib_entry_index));
-    }
-    else
-    {
-	adj_nbr_midchain_unstack(ai);
-    }
-}
-
-/**
- * @brief Call back when restacking all adjacencies on a GRE interface
- */
-static adj_walk_rc_t
-gre_adj_walk_cb (adj_index_t ai,
-		 void *ctx)
-{
-    gre_tunnel_stack(ai);
-
-    return (ADJ_WALK_RC_CONTINUE);
-}
-
-static void
-gre_tunnel_restack (gre_tunnel_t *gt)
-{
-    fib_protocol_t proto;
-
-    /*
-     * walk all the adjacencies on th GRE interface and restack them
-     */
-    FOR_EACH_FIB_IP_PROTOCOL(proto)
-    {
-	adj_nbr_walk(gt->sw_if_index,
-		     proto,
-		     gre_adj_walk_cb,
-		     NULL);
-    }
-}
-
-/**
- * Function definition to backwalk a FIB node
- */
-static fib_node_back_walk_rc_t
-gre_tunnel_back_walk (fib_node_t *node,
-		      fib_node_back_walk_ctx_t *ctx)
-{
-    gre_tunnel_restack(gre_tunnel_from_fib_node(node));
-
-    return (FIB_NODE_BACK_WALK_CONTINUE);
-}
-
-/**
- * Function definition to get a FIB node from its index
- */
-static fib_node_t*
-gre_tunnel_fib_node_get (fib_node_index_t index)
-{
-    gre_tunnel_t * gt;
-    gre_main_t * gm;
-
-    gm  = &gre_main;
-    gt = pool_elt_at_index(gm->tunnels, index);
-
-    return (&gt->node);
-}
-
-/**
- * Function definition to inform the FIB node that its last lock has gone.
- */
-static void
-gre_tunnel_last_lock_gone (fib_node_t *node)
-{
-    /*
-     * The MPLS GRE tunnel is a root of the graph. As such
-     * it never has children and thus is never locked.
-     */
-    ASSERT(0);
-}
-
-/*
- * Virtual function table registered by MPLS GRE tunnels
- * for participation in the FIB object graph.
- */
-const static fib_node_vft_t gre_vft = {
-    .fnv_get = gre_tunnel_fib_node_get,
-    .fnv_last_lock = gre_tunnel_last_lock_gone,
-    .fnv_back_walk = gre_tunnel_back_walk,
-};
-
-static int 
-vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t *a,
-                     u32 * sw_if_indexp)
-{
-  gre_main_t * gm = &gre_main;
-  vnet_main_t * vnm = gm->vnet_main;
-  ip4_main_t * im = &ip4_main;
-  gre_tunnel_t * t;
-  vnet_hw_interface_t * hi;
-  u32 hw_if_index, sw_if_index;
-  u32 outer_fib_index;
-  u8 address[6];
-  clib_error_t *error;
-
-  outer_fib_index = ip4_fib_index_from_table_id(a->outer_fib_id);
-
-  if (~0 == outer_fib_index)
-    return VNET_API_ERROR_NO_SUCH_FIB;
-
-  t = gre_tunnel_db_find(&a->src, &a->dst, a->outer_fib_id);
-
-  if (NULL != t)
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  pool_get_aligned (gm->tunnels, t, CLIB_CACHE_LINE_BYTES);
-  memset (t, 0, sizeof (*t));
-  fib_node_init(&t->node, FIB_NODE_TYPE_GRE_TUNNEL);
-
-  if (a->teb)
-      t->type = GRE_TUNNEL_TYPE_TEB;
-  else
-      t->type = GRE_TUNNEL_TYPE_L3;
-
-  if (vec_len (gm->free_gre_tunnel_hw_if_indices[t->type]) > 0) {
-      vnet_interface_main_t * im = &vnm->interface_main;
-
-      hw_if_index = gm->free_gre_tunnel_hw_if_indices[t->type]
-          [vec_len (gm->free_gre_tunnel_hw_if_indices[t->type])-1];
-      _vec_len (gm->free_gre_tunnel_hw_if_indices[t->type]) -= 1;
-
-      hi = vnet_get_hw_interface (vnm, hw_if_index);
-      hi->dev_instance = t - gm->tunnels;
-      hi->hw_instance = hi->dev_instance;
-
-      /* clear old stats of freed tunnel before reuse */
-      sw_if_index = hi->sw_if_index;
-      vnet_interface_counter_lock(im);
-      vlib_zero_combined_counter
-          (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_TX], sw_if_index);
-      vlib_zero_combined_counter
-          (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_RX], sw_if_index);
-      vlib_zero_simple_counter
-          (&im->sw_if_counters[VNET_INTERFACE_COUNTER_DROP], sw_if_index);
-        vnet_interface_counter_unlock(im);
-      if (GRE_TUNNEL_TYPE_TEB == t->type)
-      {
-          t->l2_tx_arc = vlib_node_add_named_next(vlib_get_main(),
-                                                  hi->tx_node_index,
-                                                  "adj-l2-midchain");
-      }
-    } else {
-      if (GRE_TUNNEL_TYPE_TEB == t->type)
-      {
-        /* Default MAC address (d00b:eed0:0000 + sw_if_index) */
-        memset (address, 0, sizeof (address));
-        address[0] = 0xd0;
-        address[1] = 0x0b;
-        address[2] = 0xee;
-        address[3] = 0xd0;
-        address[4] = t - gm->tunnels;
-
-        error = ethernet_register_interface(vnm,
-					    gre_device_teb_class.index,
-					    t - gm->tunnels, address,
-					    &hw_if_index,
-					    0);
-
-        if (error)
-        {
-          clib_error_report (error);
-          return VNET_API_ERROR_INVALID_REGISTRATION;
-        }
-	hi = vnet_get_hw_interface (vnm, hw_if_index);
-
-	t->l2_tx_arc = vlib_node_add_named_next(vlib_get_main(),
-						hi->tx_node_index,
-						"adj-l2-midchain");
-      } else {
-	hw_if_index = vnet_register_interface(vnm,
-					      gre_device_class.index,
-					      t - gm->tunnels,
-					      gre_hw_interface_class.index,
-					      t - gm->tunnels);
-      }
-      hi = vnet_get_hw_interface (vnm, hw_if_index);
-      sw_if_index = hi->sw_if_index;
-    }
-
-  t->hw_if_index = hw_if_index;
-  t->outer_fib_index = outer_fib_index;
-  t->sw_if_index = sw_if_index;
-  t->l2_adj_index = ADJ_INDEX_INVALID;
-
-  vec_validate_init_empty (gm->tunnel_index_by_sw_if_index, sw_if_index, ~0);
-  gm->tunnel_index_by_sw_if_index[sw_if_index] = t - gm->tunnels;
-
-  vec_validate (im->fib_index_by_sw_if_index, sw_if_index);
-
-  hi->min_packet_bytes = 64 + sizeof (gre_header_t) + sizeof (ip4_header_t);
-  hi->per_packet_overhead_bytes =
-      /* preamble */ 8 + /* inter frame gap */ 12;
-
-  /* Standard default gre MTU. */
-  hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] = 9000;
-
-  clib_memcpy (&t->tunnel_src, &a->src, sizeof (t->tunnel_src));
-  clib_memcpy (&t->tunnel_dst, &a->dst, sizeof (t->tunnel_dst));
-
-  gre_tunnel_db_add(t);
-
-  /*
-   * source the FIB entry for the tunnel's destination
-   * and become a child thereof. The tunnel will then get poked
-   * when the forwarding for the entry updates, and the tunnel can
-   * re-stack accordingly
-   */
-  const fib_prefix_t tun_dst_pfx = {
-      .fp_len = 32,
-      .fp_proto = FIB_PROTOCOL_IP4,
-      .fp_addr = {
-          .ip4 = t->tunnel_dst,
-      }
-  };
-
-  t->fib_entry_index =
-      fib_table_entry_special_add(outer_fib_index,
-                                  &tun_dst_pfx,
-                                  FIB_SOURCE_RR,
-                                  FIB_ENTRY_FLAG_NONE,
-                                  ADJ_INDEX_INVALID);
-  t->sibling_index =
-      fib_entry_child_add(t->fib_entry_index,
-                          FIB_NODE_TYPE_GRE_TUNNEL,
-                          t - gm->tunnels);
-
-  clib_memcpy (&t->tunnel_src, &a->src, sizeof (t->tunnel_src));
-  clib_memcpy (&t->tunnel_dst, &a->dst, sizeof (t->tunnel_dst));
-
-  if (GRE_TUNNEL_TYPE_TEB == t->type)
-  {
-      t->l2_adj_index = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-					    VNET_LINK_ETHERNET,
-					    &zero_addr,
-					    sw_if_index);
-      gre_update_adj(vnm, t->sw_if_index, t->l2_adj_index);
-  }
-
-  if (sw_if_indexp)
-    *sw_if_indexp = sw_if_index;
-
-  return 0;
-}
-
-static int 
-vnet_gre_tunnel_delete (vnet_gre_add_del_tunnel_args_t *a,
-                        u32 * sw_if_indexp)
-{
-  gre_main_t * gm = &gre_main;
-  vnet_main_t * vnm = gm->vnet_main;
-  gre_tunnel_t * t;
-  u32 sw_if_index;
-
-  t = gre_tunnel_db_find(&a->src, &a->dst, a->outer_fib_id);
-
-  if (NULL == t)
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-  sw_if_index = t->sw_if_index;
-  vnet_sw_interface_set_flags (vnm, sw_if_index, 0 /* down */);
-  /* make sure tunnel is removed from l2 bd or xconnect */
-  set_int_l2_mode(gm->vlib_main, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0);
-  vec_add1 (gm->free_gre_tunnel_hw_if_indices[t->type], t->hw_if_index);
-  gm->tunnel_index_by_sw_if_index[sw_if_index] = ~0;
-
-  if (GRE_TUNNEL_TYPE_TEB == t->type)
-    adj_unlock(t->l2_adj_index);
-
-  if (t->l2_adj_index != ADJ_INDEX_INVALID)
-      adj_unlock(t->l2_adj_index);
-
-  fib_entry_child_remove(t->fib_entry_index,
-                         t->sibling_index);
-  fib_table_entry_delete_index(t->fib_entry_index,
-                               FIB_SOURCE_RR);
-
-  gre_tunnel_db_remove(t);
-  fib_node_deinit(&t->node);
-  pool_put (gm->tunnels, t);
-
-  if (sw_if_indexp)
-    *sw_if_indexp = sw_if_index;
-
-  return 0;
-}
-
-int
-vnet_gre_add_del_tunnel (vnet_gre_add_del_tunnel_args_t *a,
-                         u32 * sw_if_indexp)
-{
-  if (a->is_add)
-    return (vnet_gre_tunnel_add(a, sw_if_indexp));
-  else
-    return (vnet_gre_tunnel_delete(a, sw_if_indexp));
-}
-
-clib_error_t *
-gre_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
-{
-  gre_main_t * gm = &gre_main;
-  vnet_hw_interface_t * hi;
-  gre_tunnel_t *t;
-  u32 ti;
-
-  hi = vnet_get_hw_interface (vnm, hw_if_index);
-
-  if (NULL == gm->tunnel_index_by_sw_if_index ||
-      hi->sw_if_index >= vec_len(gm->tunnel_index_by_sw_if_index))
-      return (NULL);
-
-  ti = gm->tunnel_index_by_sw_if_index[hi->sw_if_index];
-
-  if (~0 == ti)
-      /* not one of ours */
-      return (NULL);
-
-  t = pool_elt_at_index(gm->tunnels, ti);
-
-  if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
-    vnet_hw_interface_set_flags (vnm, hw_if_index, VNET_HW_INTERFACE_FLAG_LINK_UP);
-  else
-    vnet_hw_interface_set_flags (vnm, hw_if_index, 0 /* down */);
-
-  gre_tunnel_restack(t);
-
-  return /* no error */ 0;
-}
-
-static clib_error_t *
-create_gre_tunnel_command_fn (vlib_main_t * vm,
-		 unformat_input_t * input,
-		 vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, * line_input = &_line_input;
-  vnet_gre_add_del_tunnel_args_t _a, * a = &_a;
-  ip4_address_t src, dst;
-  u32 outer_fib_id = 0;
-  u8 teb = 0;
-  int rv;
-  u32 num_m_args = 0;
-  u8 is_add = 1;
-  u32 sw_if_index;
-
-  /* Get a line of input. */
-  if (! unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (line_input, "del"))
-      is_add = 0;
-    else if (unformat (line_input, "src %U", unformat_ip4_address, &src))
-      num_m_args++;
-    else if (unformat (line_input, "dst %U", unformat_ip4_address, &dst))
-      num_m_args++;
-    else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id))
-      ;
-    else if (unformat (line_input, "teb"))
-      teb = 1;
-    else
-      return clib_error_return (0, "unknown input `%U'",
-                                format_unformat_error, input);
-  }
-  unformat_free (line_input);
-
-  if (num_m_args < 2)
-      return clib_error_return (0, "mandatory argument(s) missing");
-
-  if (memcmp (&src, &dst, sizeof(src)) == 0)
-      return clib_error_return (0, "src and dst are identical");
-
-  memset (a, 0, sizeof (*a));
-  a->outer_fib_id = outer_fib_id;
-  a->teb = teb;
-  clib_memcpy(&a->src, &src, sizeof(src));
-  clib_memcpy(&a->dst, &dst, sizeof(dst));
-
-  if (is_add)
-    rv = vnet_gre_tunnel_add(a, &sw_if_index);
-  else
-    rv = vnet_gre_tunnel_delete(a, &sw_if_index);
-
-  switch(rv)
-    {
-    case 0:
-      vlib_cli_output(vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main(), sw_if_index);
-      break;
-    case VNET_API_ERROR_INVALID_VALUE:
-      return clib_error_return (0, "GRE tunnel already exists...");
-    case VNET_API_ERROR_NO_SUCH_FIB:
-      return clib_error_return (0, "outer fib ID %d doesn't exist\n",
-                                outer_fib_id);
-    default:
-      return clib_error_return (0, "vnet_gre_add_del_tunnel returned %d", rv);
-    }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (create_gre_tunnel_command, static) = {
-  .path = "create gre tunnel",
-  .short_help = "create gre tunnel src <addr> dst <addr> "
-                "[outer-fib-id <fib>] [teb] [del]",
-  .function = create_gre_tunnel_command_fn,
-};
-
-static clib_error_t *
-show_gre_tunnel_command_fn (vlib_main_t * vm,
-                            unformat_input_t * input,
-                            vlib_cli_command_t * cmd)
-{
-  gre_main_t * gm = &gre_main;
-  gre_tunnel_t * t;
-  u32 ti = ~0;
-
-  if (pool_elts (gm->tunnels) == 0)
-    vlib_cli_output (vm, "No GRE tunnels configured...");
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%d", &ti))
-        ;
-      else
-        break;
-    }
-
-  if (~0 == ti)
-    {
-      pool_foreach (t, gm->tunnels,
-      ({
-          vlib_cli_output (vm, "%U", format_gre_tunnel, t);
-      }));
-    }
-  else
-  {
-      t = pool_elt_at_index(gm->tunnels, ti);
-
-      vlib_cli_output (vm, "%U", format_gre_tunnel, t);
-  }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (show_gre_tunnel_command, static) = {
-    .path = "show gre tunnel",
-    .function = show_gre_tunnel_command_fn,
-};
-
-/* force inclusion from application's main.c */
-clib_error_t *gre_interface_init (vlib_main_t *vm)
-{
-  fib_node_register_type(FIB_NODE_TYPE_GRE_TUNNEL, &gre_vft);
-
-  return 0;
-}
-VLIB_INIT_FUNCTION(gre_interface_init);
diff --git a/vnet/vnet/gre/node.c b/vnet/vnet/gre/node.c
deleted file mode 100644
index 86f7a6ee..00000000
--- a/vnet/vnet/gre/node.c
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- * node.c: gre packet processing
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/gre/gre.h>
-#include <vnet/mpls/mpls.h>
-#include <vppinfra/sparse_vec.h>
-
-#define foreach_gre_input_next			\
-_(PUNT, "error-punt")                           \
-_(DROP, "error-drop")                           \
-_(ETHERNET_INPUT, "ethernet-input")             \
-_(IP4_INPUT, "ip4-input")                       \
-_(IP6_INPUT, "ip6-input")			\
-_(MPLS_INPUT, "mpls-input")
-
-typedef enum {
-#define _(s,n) GRE_INPUT_NEXT_##s,
-  foreach_gre_input_next
-#undef _
-  GRE_INPUT_N_NEXT,
-} gre_input_next_t;
-
-typedef struct {
-  u32 tunnel_id;
-  u32 length;
-  ip4_address_t src;
-  ip4_address_t dst;
-} gre_rx_trace_t;
-
-u8 * format_gre_rx_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  gre_rx_trace_t * t = va_arg (*args, gre_rx_trace_t *);
-    
-  s = format (s, "GRE: tunnel %d len %d src %U dst %U",
-              t->tunnel_id, clib_net_to_host_u16(t->length),
-              format_ip4_address, &t->src.as_u8,
-              format_ip4_address, &t->dst.as_u8);
-  return s;
-}
-
-typedef struct {
-  /* Sparse vector mapping gre protocol in network byte order
-     to next index. */
-  u16 * next_by_protocol;
-} gre_input_runtime_t;
-
-static uword
-gre_input (vlib_main_t * vm,
-	   vlib_node_runtime_t * node,
-	   vlib_frame_t * from_frame)
-{
-  gre_main_t * gm = &gre_main;
-  gre_input_runtime_t * rt = (void *) node->runtime_data;
-  __attribute__((unused)) u32 n_left_from, next_index, * from, * to_next;
-  u64 cached_tunnel_key = (u64) ~0;
-  u32 cached_tunnel_sw_if_index = 0, tunnel_sw_if_index = 0;
-
-  u32 cpu_index = os_get_cpu_number();
-  u32 len;
-  vnet_interface_main_t *im = &gm->vnet_main->interface_main;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t * b0, * b1;
-	  gre_header_t * h0, * h1;
-          u16 version0, version1;
-          int verr0, verr1;
-	  u32 i0, i1, next0, next1, protocol0, protocol1;
-          ip4_header_t *ip0, *ip1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * p2, * p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, sizeof (h0[0]), LOAD);
-	    CLIB_PREFETCH (p3->data, sizeof (h1[0]), LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-          /* ip4_local hands us the ip header, not the gre header */
-          ip0 = vlib_buffer_get_current (b0);
-          ip1 = vlib_buffer_get_current (b1);
-
-          /* Save src + dst ip4 address, e.g. for mpls-o-gre */
-          vnet_buffer(b0)->gre.src = ip0->src_address.as_u32;
-          vnet_buffer(b0)->gre.dst = ip0->dst_address.as_u32;
-          vnet_buffer(b1)->gre.src = ip1->src_address.as_u32;
-          vnet_buffer(b1)->gre.dst = ip1->dst_address.as_u32;
-
-          vlib_buffer_advance (b0, sizeof (*ip0));
-          vlib_buffer_advance (b1, sizeof (*ip1));
-
-	  h0 = vlib_buffer_get_current (b0);
-	  h1 = vlib_buffer_get_current (b1);
-
-	  /* Index sparse array with network byte order. */
-	  protocol0 = h0->protocol;
-	  protocol1 = h1->protocol;
-	  sparse_vec_index2 (rt->next_by_protocol, protocol0, protocol1,
-                             &i0, &i1);
-          next0 = vec_elt(rt->next_by_protocol, i0);
-          next1 = vec_elt(rt->next_by_protocol, i1);
-
-	  b0->error = node->errors[i0 == SPARSE_VEC_INVALID_INDEX ? GRE_ERROR_UNKNOWN_PROTOCOL : GRE_ERROR_NONE];
-	  b1->error = node->errors[i1 == SPARSE_VEC_INVALID_INDEX ? GRE_ERROR_UNKNOWN_PROTOCOL : GRE_ERROR_NONE];
-          
-          version0 = clib_net_to_host_u16 (h0->flags_and_version);
-          verr0 =  version0 & GRE_VERSION_MASK;
-          version1 = clib_net_to_host_u16 (h1->flags_and_version);
-          verr1 =  version1 & GRE_VERSION_MASK;
-
-          b0->error = verr0 ? node->errors[GRE_ERROR_UNSUPPORTED_VERSION]
-              : b0->error;
-          next0 = verr0 ? GRE_INPUT_NEXT_DROP : next0;
-          b1->error = verr1 ? node->errors[GRE_ERROR_UNSUPPORTED_VERSION]
-              : b1->error;
-          next1 = verr1 ? GRE_INPUT_NEXT_DROP : next1;
-
-
-          /* RPF check for ip4/ip6 input */
-          if (PREDICT_TRUE(next0 == GRE_INPUT_NEXT_IP4_INPUT
-			   || next0 == GRE_INPUT_NEXT_IP6_INPUT
-			   || next0 == GRE_INPUT_NEXT_ETHERNET_INPUT
-			   || next0 == GRE_INPUT_NEXT_MPLS_INPUT))
-            {
-              u64 key = ((u64)(vnet_buffer(b0)->gre.dst) << 32) |
-                         (u64)(vnet_buffer(b0)->gre.src);
-
-              if (cached_tunnel_key != key)
-                {
-                  vnet_hw_interface_t * hi;
-                  gre_tunnel_t * t;
-                  uword * p;
-
-                  p = hash_get (gm->tunnel_by_key, key);
-                  if (!p)
-                    {
-                      next0 = GRE_INPUT_NEXT_DROP;
-                      b0->error = node->errors[GRE_ERROR_NO_SUCH_TUNNEL];
-                      goto drop0;
-                    }
-                  t = pool_elt_at_index (gm->tunnels, p[0]);
-                  hi = vnet_get_hw_interface (gm->vnet_main,
-                            t->hw_if_index);
-                  tunnel_sw_if_index = hi->sw_if_index;
-
-                  cached_tunnel_sw_if_index = tunnel_sw_if_index;
-                }
-              else
-                {
-                  tunnel_sw_if_index = cached_tunnel_sw_if_index;
-                }
-            }
-          else
-            {
-		next0 = GRE_INPUT_NEXT_DROP;
-                goto drop0;
-            }
-          len = vlib_buffer_length_in_chain (vm, b0);
-          vlib_increment_combined_counter (im->combined_sw_if_counters
-                                           + VNET_INTERFACE_COUNTER_RX,
-                                           cpu_index,
-                                           tunnel_sw_if_index,
-                                           1 /* packets */,
-                                           len /* bytes */);
-
-          vnet_buffer(b0)->sw_if_index[VLIB_RX] = tunnel_sw_if_index;
-
-drop0:
-          if (PREDICT_TRUE(next1 == GRE_INPUT_NEXT_IP4_INPUT
-			   || next1 == GRE_INPUT_NEXT_IP6_INPUT
-			   || next1 == GRE_INPUT_NEXT_ETHERNET_INPUT
-			   || next1 == GRE_INPUT_NEXT_MPLS_INPUT))
-            {
-              u64 key = ((u64)(vnet_buffer(b1)->gre.dst) << 32) |
-                         (u64)(vnet_buffer(b1)->gre.src);
-
-              if (cached_tunnel_key != key)
-                {
-                  vnet_hw_interface_t * hi;
-                  gre_tunnel_t * t;
-                  uword * p;
-
-                  p = hash_get (gm->tunnel_by_key, key);
-                  if (!p)
-                    {
-                      next1 = GRE_INPUT_NEXT_DROP;
-                      b1->error = node->errors[GRE_ERROR_NO_SUCH_TUNNEL];
-                      goto drop1;
-                    }
-                  t = pool_elt_at_index (gm->tunnels, p[0]);
-                  hi = vnet_get_hw_interface (gm->vnet_main,
-                            t->hw_if_index);
-                  tunnel_sw_if_index = hi->sw_if_index;
-
-                  cached_tunnel_sw_if_index = tunnel_sw_if_index;
-                }
-              else
-                {
-                  tunnel_sw_if_index = cached_tunnel_sw_if_index;
-                }
-            }
-          else
-            {
-		next1 = GRE_INPUT_NEXT_DROP;
-                goto drop1;
-            }
-          len = vlib_buffer_length_in_chain (vm, b1);
-          vlib_increment_combined_counter (im->combined_sw_if_counters
-                                           + VNET_INTERFACE_COUNTER_RX,
-                                           cpu_index,
-                                           tunnel_sw_if_index,
-                                           1 /* packets */,
-                                           len /* bytes */);
-
-          vnet_buffer(b1)->sw_if_index[VLIB_RX] = tunnel_sw_if_index;
-
-drop1:
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-            {
-              gre_rx_trace_t *tr = vlib_add_trace (vm, node,
-                                                   b0, sizeof (*tr));
-              tr->tunnel_id = tunnel_sw_if_index;
-              tr->length = ip0->length;
-              tr->src.as_u32 = ip0->src_address.as_u32;
-              tr->dst.as_u32 = ip0->dst_address.as_u32;
-            }
-
-          if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
-            {
-              gre_rx_trace_t *tr = vlib_add_trace (vm, node,
-                                                   b1, sizeof (*tr));
-              tr->tunnel_id = tunnel_sw_if_index;
-              tr->length = ip1->length;
-              tr->src.as_u32 = ip1->src_address.as_u32;
-              tr->dst.as_u32 = ip1->dst_address.as_u32;
-            }
-
-          vlib_buffer_advance (b0, sizeof (*h0));
-          vlib_buffer_advance (b1, sizeof (*h1));
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-    
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t * b0;
-	  gre_header_t * h0;
-          ip4_header_t * ip0;
-          u16 version0;
-          int verr0;
-	  u32 i0, next0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-          ip0 = vlib_buffer_get_current (b0);
-
-          vnet_buffer(b0)->gre.src = ip0->src_address.as_u32;
-          vnet_buffer(b0)->gre.dst = ip0->dst_address.as_u32;
-
-          vlib_buffer_advance (b0, sizeof (*ip0));
-
-	  h0 = vlib_buffer_get_current (b0);
-
-	  i0 = sparse_vec_index (rt->next_by_protocol, h0->protocol);
-          next0 = vec_elt(rt->next_by_protocol, i0);
-
-	  b0->error = 
-              node->errors[i0 == SPARSE_VEC_INVALID_INDEX 
-                           ? GRE_ERROR_UNKNOWN_PROTOCOL : GRE_ERROR_NONE];
-	  
-          version0 = clib_net_to_host_u16 (h0->flags_and_version);
-          verr0 =  version0 & GRE_VERSION_MASK;
-          b0->error = verr0 ? node->errors[GRE_ERROR_UNSUPPORTED_VERSION] 
-              : b0->error;
-          next0 = verr0 ? GRE_INPUT_NEXT_DROP : next0;
-
-
-          /* For IP payload we need to find source interface
-             so we can increase counters and help forward node to
-             pick right FIB */
-          /* RPF check for ip4/ip6 input */
-          if (PREDICT_TRUE(next0 == GRE_INPUT_NEXT_IP4_INPUT
-			   || next0 == GRE_INPUT_NEXT_IP6_INPUT
-			   || next0 == GRE_INPUT_NEXT_ETHERNET_INPUT
-			   || next0 == GRE_INPUT_NEXT_MPLS_INPUT))
-            {
-              u64 key = ((u64)(vnet_buffer(b0)->gre.dst) << 32) |
-                         (u64)(vnet_buffer(b0)->gre.src);
-
-              if (cached_tunnel_key != key)
-                {
-                  vnet_hw_interface_t * hi;
-                  gre_tunnel_t * t;
-                  uword * p;
-
-                  p = hash_get (gm->tunnel_by_key, key);
-                  if (!p)
-                    {
-                      next0 = GRE_INPUT_NEXT_DROP;
-                      b0->error = node->errors[GRE_ERROR_NO_SUCH_TUNNEL];
-                      goto drop;
-                    }
-                  t = pool_elt_at_index (gm->tunnels, p[0]);
-                  hi = vnet_get_hw_interface (gm->vnet_main,
-                            t->hw_if_index);
-                  tunnel_sw_if_index = hi->sw_if_index;
-
-                  cached_tunnel_sw_if_index = tunnel_sw_if_index;
-                }
-              else
-                {
-                  tunnel_sw_if_index = cached_tunnel_sw_if_index;
-                }
-            }
-          else
-            {
-		next0 = GRE_INPUT_NEXT_DROP;
-                goto drop;
-            }
-          len = vlib_buffer_length_in_chain (vm, b0);
-          vlib_increment_combined_counter (im->combined_sw_if_counters
-                                           + VNET_INTERFACE_COUNTER_RX,
-                                           cpu_index,
-                                           tunnel_sw_if_index,
-                                           1 /* packets */,
-                                           len /* bytes */);
-
-          vnet_buffer(b0)->sw_if_index[VLIB_RX] = tunnel_sw_if_index;
-
-drop:
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
-            {
-              gre_rx_trace_t *tr = vlib_add_trace (vm, node, 
-                                                   b0, sizeof (*tr));
-              tr->tunnel_id = tunnel_sw_if_index;
-              tr->length = ip0->length;
-              tr->src.as_u32 = ip0->src_address.as_u32;
-              tr->dst.as_u32 = ip0->dst_address.as_u32;
-            }
-
-          vlib_buffer_advance (b0, sizeof (*h0));
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, gre_input_node.index,
-                               GRE_ERROR_PKTS_DECAP, from_frame->n_vectors);
-  return from_frame->n_vectors;
-}
-
-static char * gre_error_strings[] = {
-#define gre_error(n,s) s,
-#include "error.def"
-#undef gre_error
-};
-
-VLIB_REGISTER_NODE (gre_input_node) = {
-  .function = gre_input,
-  .name = "gre-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .runtime_data_bytes = sizeof (gre_input_runtime_t),
-
-  .n_errors = GRE_N_ERROR,
-  .error_strings = gre_error_strings,
-
-  .n_next_nodes = GRE_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [GRE_INPUT_NEXT_##s] = n,
-    foreach_gre_input_next
-#undef _
-  },
-
-  .format_buffer = format_gre_header_with_length,
-  .format_trace = format_gre_rx_trace,
-  .unformat_buffer = unformat_gre_header,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (gre_input_node, gre_input)
-
-void
-gre_register_input_protocol (vlib_main_t * vm,
-			     gre_protocol_t protocol,
-			     u32 node_index)
-{
-  gre_main_t * em = &gre_main;
-  gre_protocol_info_t * pi;
-  gre_input_runtime_t * rt;
-  u16 * n;
-
-  {
-    clib_error_t * error = vlib_call_init_function (vm, gre_input_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  pi = gre_get_protocol_info (em, protocol);
-  pi->node_index = node_index;
-  pi->next_index = vlib_node_add_next (vm, 
-				       gre_input_node.index,
-				       node_index);
-
-  /* Setup gre protocol -> next index sparse vector mapping. */
-  rt = vlib_node_get_runtime_data (vm, gre_input_node.index);
-  n = sparse_vec_validate (rt->next_by_protocol, 
-                           clib_host_to_net_u16 (protocol));
-  n[0] = pi->next_index;
-}
-
-static void
-gre_setup_node (vlib_main_t * vm, u32 node_index)
-{
-  vlib_node_t * n = vlib_get_node (vm, node_index);
-  pg_node_t * pn = pg_get_node (node_index);
-
-  n->format_buffer = format_gre_header_with_length;
-  n->unformat_buffer = unformat_gre_header;
-  pn->unformat_edit = unformat_pg_gre_header;
-}
-
-static clib_error_t * gre_input_init (vlib_main_t * vm)
-{
-  gre_input_runtime_t * rt;
-  vlib_node_t *ethernet_input, *ip4_input, *ip6_input, *mpls_unicast_input;
-
-  {
-    clib_error_t * error; 
-    error = vlib_call_init_function (vm, gre_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  gre_setup_node (vm, gre_input_node.index);
-
-  rt = vlib_node_get_runtime_data (vm, gre_input_node.index);
-
-  rt->next_by_protocol = sparse_vec_new
-    (/* elt bytes */ sizeof (rt->next_by_protocol[0]),
-     /* bits in index */ BITS (((gre_header_t *) 0)->protocol));
-
-  /* These could be moved to the supported protocol input node defn's */
-  ethernet_input = vlib_get_node_by_name (vm, (u8 *)"ethernet-input");
-  ASSERT(ethernet_input);
-  ip4_input = vlib_get_node_by_name (vm, (u8 *)"ip4-input");
-  ASSERT(ip4_input);
-  ip6_input = vlib_get_node_by_name (vm, (u8 *)"ip6-input");
-  ASSERT(ip6_input);
-  mpls_unicast_input = vlib_get_node_by_name (vm, (u8 *)"mpls-input");
-  ASSERT(mpls_unicast_input);
-
-  gre_register_input_protocol (vm, GRE_PROTOCOL_teb,
-                               ethernet_input->index);
-
-  gre_register_input_protocol (vm, GRE_PROTOCOL_ip4, 
-                               ip4_input->index);
-
-  gre_register_input_protocol (vm, GRE_PROTOCOL_ip6, 
-                               ip6_input->index);
-
-  gre_register_input_protocol (vm, GRE_PROTOCOL_mpls_unicast,
-                               mpls_unicast_input->index);
-
-  ip4_register_protocol (IP_PROTOCOL_GRE, gre_input_node.index);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (gre_input_init);
diff --git a/vnet/vnet/gre/packet.h b/vnet/vnet/gre/packet.h
deleted file mode 100644
index cc2ccda9..00000000
--- a/vnet/vnet/gre/packet.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef included_vnet_gre_packet_h
-#define included_vnet_gre_packet_h
-
-/*
- * GRE packet format
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define foreach_gre_protocol			\
-_ (0x0800, ip4)                                 \
-_ (0x86DD, ip6)                                 \
-_ (0x6558, teb)                                 \
-_ (0x0806, arp)					\
-_ (0x8847, mpls_unicast)			\
-_ (0x894F, nsh)
-
-typedef enum {
-#define _(n,f) GRE_PROTOCOL_##f = n,
-  foreach_gre_protocol
-#undef _
-} gre_protocol_t;
-
-typedef struct {
-  /* flags and version */
-  u16 flags_and_version;
-  /* unimplemented at the moment */
-#define GRE_FLAGS_CHECKSUM (1 << 15)
-
-  /* deprecated, according to rfc2784 */
-#define GRE_FLAGS_ROUTING (1 << 14)
-#define GRE_FLAGS_KEY (1 << 13)
-#define GRE_FLAGS_SEQUENCE (1 << 12)
-#define GRE_FLAGS_STRICT_SOURCE_ROUTE (1 << 11)
-
-  /* version 1 is PPTP which we don't support */
-#define GRE_SUPPORTED_VERSION 0
-#define GRE_VERSION_MASK 0x7
-
-  /* 0x800 for ip4, etc. */
-  u16 protocol;
-} gre_header_t;
-
-#endif /* included_vnet_gre_packet_h */
diff --git a/vnet/vnet/gre/pg.c b/vnet/vnet/gre/pg.c
deleted file mode 100644
index cc065d3b..00000000
--- a/vnet/vnet/gre/pg.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * hdlc_pg.c: packet generator gre interface
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/gre/gre.h>
-
-typedef struct {
-  pg_edit_t flags_and_version;
-  pg_edit_t protocol;
-} pg_gre_header_t;
-
-static inline void
-pg_gre_header_init (pg_gre_header_t * e)
-{
-  pg_edit_init (&e->flags_and_version, gre_header_t, flags_and_version);
-  pg_edit_init (&e->protocol, gre_header_t, protocol);
-}
-
-uword
-unformat_pg_gre_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t * s = va_arg (*args, pg_stream_t *);
-  pg_gre_header_t * h;
-  u32 group_index, error;
-  
-  h = pg_create_edit_group (s, sizeof (h[0]), sizeof (gre_header_t),
-			    &group_index);
-  pg_gre_header_init (h);
-
-  pg_edit_set_fixed (&h->flags_and_version, 0);
-
-  error = 1;
-  if (! unformat (input, "%U",
-		  unformat_pg_edit,
-                  unformat_gre_protocol_net_byte_order, &h->protocol))
-    goto done;
-
-  {
-    gre_main_t * pm = &gre_main;
-    gre_protocol_info_t * pi = 0;
-    pg_node_t * pg_node = 0;
-
-    if (h->protocol.type == PG_EDIT_FIXED)
-      {
-	u16 t = *(u16 *) h->protocol.values[PG_EDIT_LO];
-	pi = gre_get_protocol_info (pm, clib_net_to_host_u16 (t));
-	if (pi && pi->node_index != ~0)
-	  pg_node = pg_get_node (pi->node_index);
-      }
-
-    if (pg_node && pg_node->unformat_edit
-	&& unformat_user (input, pg_node->unformat_edit, s))
-      ;
-  }
-
-  error = 0;
- done:
-  if (error)
-    pg_free_edit_group (s);
-  return error == 0;
-}
-
diff --git a/vnet/vnet/handoff.c b/vnet/vnet/handoff.c
deleted file mode 100644
index 9f3c93b4..00000000
--- a/vnet/vnet/handoff.c
+++ /dev/null
@@ -1,594 +0,0 @@
-
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vppinfra/xxhash.h>
-#include <vlib/threads.h>
-#include <vnet/handoff.h>
-#include <vnet/feature/feature.h>
-
-typedef struct
-{
-  uword *workers_bitmap;
-  u32 *workers;
-} per_inteface_handoff_data_t;
-
-typedef struct
-{
-  u32 cached_next_index;
-  u32 num_workers;
-  u32 first_worker_index;
-
-  per_inteface_handoff_data_t *if_data;
-
-  /* Worker handoff index */
-  u32 frame_queue_index;
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-
-    u64 (*hash_fn) (ethernet_header_t *);
-} handoff_main_t;
-
-handoff_main_t handoff_main;
-vlib_node_registration_t handoff_dispatch_node;
-
-typedef struct
-{
-  u32 sw_if_index;
-  u32 next_worker_index;
-  u32 buffer_index;
-} worker_handoff_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_worker_handoff_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  worker_handoff_trace_t *t = va_arg (*args, worker_handoff_trace_t *);
-
-  s =
-    format (s, "worker-handoff: sw_if_index %d, next_worker %d, buffer 0x%x",
-	    t->sw_if_index, t->next_worker_index, t->buffer_index);
-  return s;
-}
-
-vlib_node_registration_t handoff_node;
-
-static uword
-worker_handoff_node_fn (vlib_main_t * vm,
-			vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  handoff_main_t *hm = &handoff_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  u32 n_left_from, *from;
-  static __thread vlib_frame_queue_elt_t **handoff_queue_elt_by_worker_index;
-  static __thread vlib_frame_queue_t **congested_handoff_queue_by_worker_index
-    = 0;
-  vlib_frame_queue_elt_t *hf = 0;
-  int i;
-  u32 n_left_to_next_worker = 0, *to_next_worker = 0;
-  u32 next_worker_index = 0;
-  u32 current_worker_index = ~0;
-
-  if (PREDICT_FALSE (handoff_queue_elt_by_worker_index == 0))
-    {
-      vec_validate (handoff_queue_elt_by_worker_index, tm->n_vlib_mains - 1);
-
-      vec_validate_init_empty (congested_handoff_queue_by_worker_index,
-			       hm->first_worker_index + hm->num_workers - 1,
-			       (vlib_frame_queue_t *) (~0));
-    }
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      u32 sw_if_index0;
-      u32 hash;
-      u64 hash_key;
-      per_inteface_handoff_data_t *ihd0;
-      u32 index0;
-
-      bi0 = from[0];
-      from += 1;
-      n_left_from -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      ASSERT (hm->if_data);
-      ihd0 = vec_elt_at_index (hm->if_data, sw_if_index0);
-
-      next_worker_index = hm->first_worker_index;
-
-      /*
-       * Force unknown traffic onto worker 0,
-       * and into ethernet-input. $$$$ add more hashes.
-       */
-
-      /* Compute ingress LB hash */
-      hash_key = hm->hash_fn ((ethernet_header_t *) b0->data);
-      hash = (u32) clib_xxhash (hash_key);
-
-      /* if input node did not specify next index, then packet
-         should go to eternet-input */
-      if (PREDICT_FALSE ((b0->flags & BUFFER_HANDOFF_NEXT_VALID) == 0))
-	vnet_buffer (b0)->handoff.next_index =
-	  HANDOFF_DISPATCH_NEXT_ETHERNET_INPUT;
-      else if (vnet_buffer (b0)->handoff.next_index ==
-	       HANDOFF_DISPATCH_NEXT_IP4_INPUT
-	       || vnet_buffer (b0)->handoff.next_index ==
-	       HANDOFF_DISPATCH_NEXT_IP6_INPUT
-	       || vnet_buffer (b0)->handoff.next_index ==
-	       HANDOFF_DISPATCH_NEXT_MPLS_INPUT)
-	vlib_buffer_advance (b0, (sizeof (ethernet_header_t)));
-
-      if (PREDICT_TRUE (is_pow2 (vec_len (ihd0->workers))))
-	index0 = hash & (vec_len (ihd0->workers) - 1);
-      else
-	index0 = hash % vec_len (ihd0->workers);
-
-      next_worker_index += ihd0->workers[index0];
-
-      if (next_worker_index != current_worker_index)
-	{
-	  if (hf)
-	    hf->n_vectors = VLIB_FRAME_SIZE - n_left_to_next_worker;
-
-	  hf = vlib_get_worker_handoff_queue_elt (hm->frame_queue_index,
-						  next_worker_index,
-						  handoff_queue_elt_by_worker_index);
-
-	  n_left_to_next_worker = VLIB_FRAME_SIZE - hf->n_vectors;
-	  to_next_worker = &hf->buffer_index[hf->n_vectors];
-	  current_worker_index = next_worker_index;
-	}
-
-      /* enqueue to correct worker thread */
-      to_next_worker[0] = bi0;
-      to_next_worker++;
-      n_left_to_next_worker--;
-
-      if (n_left_to_next_worker == 0)
-	{
-	  hf->n_vectors = VLIB_FRAME_SIZE;
-	  vlib_put_frame_queue_elt (hf);
-	  current_worker_index = ~0;
-	  handoff_queue_elt_by_worker_index[next_worker_index] = 0;
-	  hf = 0;
-	}
-
-      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			 && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	{
-	  worker_handoff_trace_t *t =
-	    vlib_add_trace (vm, node, b0, sizeof (*t));
-	  t->sw_if_index = sw_if_index0;
-	  t->next_worker_index = next_worker_index - hm->first_worker_index;
-	  t->buffer_index = bi0;
-	}
-
-    }
-
-  if (hf)
-    hf->n_vectors = VLIB_FRAME_SIZE - n_left_to_next_worker;
-
-  /* Ship frames to the worker nodes */
-  for (i = 0; i < vec_len (handoff_queue_elt_by_worker_index); i++)
-    {
-      if (handoff_queue_elt_by_worker_index[i])
-	{
-	  hf = handoff_queue_elt_by_worker_index[i];
-	  /*
-	   * It works better to let the handoff node
-	   * rate-adapt, always ship the handoff queue element.
-	   */
-	  if (1 || hf->n_vectors == hf->last_n_vectors)
-	    {
-	      vlib_put_frame_queue_elt (hf);
-	      handoff_queue_elt_by_worker_index[i] = 0;
-	    }
-	  else
-	    hf->last_n_vectors = hf->n_vectors;
-	}
-      congested_handoff_queue_by_worker_index[i] =
-	(vlib_frame_queue_t *) (~0);
-    }
-  hf = 0;
-  current_worker_index = ~0;
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (worker_handoff_node) = {
-  .function = worker_handoff_node_fn,
-  .name = "worker-handoff",
-  .vector_size = sizeof (u32),
-  .format_trace = format_worker_handoff_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_next_nodes = 1,
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (worker_handoff_node, worker_handoff_node_fn)
-/* *INDENT-ON* */
-
-int
-interface_handoff_enable_disable (vlib_main_t * vm, u32 sw_if_index,
-				  uword * bitmap, int enable_disable)
-{
-  handoff_main_t *hm = &handoff_main;
-  vnet_sw_interface_t *sw;
-  vnet_main_t *vnm = vnet_get_main ();
-  per_inteface_handoff_data_t *d;
-  int i, rv = 0;
-
-  if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-  sw = vnet_get_sw_interface (vnm, sw_if_index);
-  if (sw->type != VNET_SW_INTERFACE_TYPE_HARDWARE)
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-  if (clib_bitmap_last_set (bitmap) >= hm->num_workers)
-    return VNET_API_ERROR_INVALID_WORKER;
-
-  if (hm->frame_queue_index == ~0)
-    hm->frame_queue_index =
-      vlib_frame_queue_main_init (handoff_dispatch_node.index, 0);
-
-  vec_validate (hm->if_data, sw_if_index);
-  d = vec_elt_at_index (hm->if_data, sw_if_index);
-
-  vec_free (d->workers);
-  vec_free (d->workers_bitmap);
-
-  if (enable_disable)
-    {
-      d->workers_bitmap = bitmap;
-      /* *INDENT-OFF* */
-      clib_bitmap_foreach (i, bitmap,
-	({
-	  vec_add1(d->workers, i);
-	}));
-      /* *INDENT-ON* */
-    }
-
-  vnet_feature_enable_disable ("device-input", "worker-handoff",
-			       sw_if_index, enable_disable, 0, 0);
-  return rv;
-}
-
-static clib_error_t *
-set_interface_handoff_command_fn (vlib_main_t * vm,
-				  unformat_input_t * input,
-				  vlib_cli_command_t * cmd)
-{
-  handoff_main_t *hm = &handoff_main;
-  u32 sw_if_index = ~0;
-  int enable_disable = 1;
-  uword *bitmap = 0;
-  u32 sym = ~0;
-
-  int rv = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "disable"))
-	enable_disable = 0;
-      else if (unformat (input, "workers %U", unformat_bitmap_list, &bitmap))
-	;
-      else if (unformat (input, "%U", unformat_vnet_sw_interface,
-			 vnet_get_main (), &sw_if_index))
-	;
-      else if (unformat (input, "symmetrical"))
-	sym = 1;
-      else if (unformat (input, "asymmetrical"))
-	sym = 0;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "Please specify an interface...");
-
-  if (bitmap == 0)
-    return clib_error_return (0, "Please specify list of workers...");
-
-  rv =
-    interface_handoff_enable_disable (vm, sw_if_index, bitmap,
-				      enable_disable);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case VNET_API_ERROR_INVALID_SW_IF_INDEX:
-      return clib_error_return (0, "Invalid interface");
-      break;
-
-    case VNET_API_ERROR_INVALID_WORKER:
-      return clib_error_return (0, "Invalid worker(s)");
-      break;
-
-    case VNET_API_ERROR_UNIMPLEMENTED:
-      return clib_error_return (0,
-				"Device driver doesn't support redirection");
-      break;
-
-    default:
-      return clib_error_return (0, "unknown return value %d", rv);
-    }
-
-  if (sym == 1)
-    hm->hash_fn = eth_get_sym_key;
-  else if (sym == 0)
-    hm->hash_fn = eth_get_key;
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_handoff_command, static) = {
-  .path = "set interface handoff",
-  .short_help =
-  "set interface handoff <interface-name> workers <workers-list> [symmetrical|asymmetrical]",
-  .function = set_interface_handoff_command_fn,
-};
-/* *INDENT-ON* */
-
-typedef struct
-{
-  u32 buffer_index;
-  u32 next_index;
-  u32 sw_if_index;
-} handoff_dispatch_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_handoff_dispatch_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  handoff_dispatch_trace_t *t = va_arg (*args, handoff_dispatch_trace_t *);
-
-  s = format (s, "handoff-dispatch: sw_if_index %d next_index %d buffer 0x%x",
-	      t->sw_if_index, t->next_index, t->buffer_index);
-  return s;
-}
-
-#define foreach_handoff_dispatch_error \
-_(EXAMPLE, "example packets")
-
-typedef enum
-{
-#define _(sym,str) HANDOFF_DISPATCH_ERROR_##sym,
-  foreach_handoff_dispatch_error
-#undef _
-    HANDOFF_DISPATCH_N_ERROR,
-} handoff_dispatch_error_t;
-
-static char *handoff_dispatch_error_strings[] = {
-#define _(sym,string) string,
-  foreach_handoff_dispatch_error
-#undef _
-};
-
-static uword
-handoff_dispatch_node_fn (vlib_main_t * vm,
-			  vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  handoff_dispatch_next_t next_index;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-	  u32 sw_if_index0, sw_if_index1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  next0 = vnet_buffer (b0)->handoff.next_index;
-	  next1 = vnet_buffer (b1)->handoff.next_index;
-
-	  if (PREDICT_FALSE (vm->trace_main.trace_active_hint))
-	    {
-	      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-		{
-		  vlib_trace_buffer (vm, node, next0, b0,	/* follow_chain */
-				     0);
-		  handoff_dispatch_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-		  t->sw_if_index = sw_if_index0;
-		  t->next_index = next0;
-		  t->buffer_index = bi0;
-		}
-	      if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
-		{
-		  vlib_trace_buffer (vm, node, next1, b1,	/* follow_chain */
-				     0);
-		  handoff_dispatch_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-		  t->sw_if_index = sw_if_index1;
-		  t->next_index = next1;
-		  t->buffer_index = bi1;
-		}
-	    }
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 sw_if_index0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  next0 = vnet_buffer (b0)->handoff.next_index;
-
-	  if (PREDICT_FALSE (vm->trace_main.trace_active_hint))
-	    {
-	      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-		{
-		  vlib_trace_buffer (vm, node, next0, b0,	/* follow_chain */
-				     0);
-		  handoff_dispatch_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-		  t->sw_if_index = sw_if_index0;
-		  t->next_index = next0;
-		  t->buffer_index = bi0;
-		}
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (handoff_dispatch_node) = {
-  .function = handoff_dispatch_node_fn,
-  .name = "handoff-dispatch",
-  .vector_size = sizeof (u32),
-  .format_trace = format_handoff_dispatch_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .flags = VLIB_NODE_FLAG_IS_HANDOFF,
-
-  .n_errors = ARRAY_LEN(handoff_dispatch_error_strings),
-  .error_strings = handoff_dispatch_error_strings,
-
-  .n_next_nodes = HANDOFF_DISPATCH_N_NEXT,
-
-  .next_nodes = {
-        [HANDOFF_DISPATCH_NEXT_DROP] = "error-drop",
-        [HANDOFF_DISPATCH_NEXT_ETHERNET_INPUT] = "ethernet-input",
-        [HANDOFF_DISPATCH_NEXT_IP4_INPUT] = "ip4-input-no-checksum",
-        [HANDOFF_DISPATCH_NEXT_IP6_INPUT] = "ip6-input",
-        [HANDOFF_DISPATCH_NEXT_MPLS_INPUT] = "mpls-input",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (handoff_dispatch_node, handoff_dispatch_node_fn)
-/* *INDENT-ON* */
-
-clib_error_t *
-handoff_init (vlib_main_t * vm)
-{
-  handoff_main_t *hm = &handoff_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  clib_error_t *error;
-  uword *p;
-
-  if ((error = vlib_call_init_function (vm, threads_init)))
-    return error;
-
-  vlib_thread_registration_t *tr;
-  /* Only the standard vnet worker threads are supported */
-  p = hash_get_mem (tm->thread_registrations_by_name, "workers");
-  if (p)
-    {
-      tr = (vlib_thread_registration_t *) p[0];
-      if (tr)
-	{
-	  hm->num_workers = tr->count;
-	  hm->first_worker_index = tr->first_index;
-	}
-    }
-
-  hm->hash_fn = eth_get_key;
-
-  hm->vlib_main = vm;
-  hm->vnet_main = &vnet_main;
-
-  hm->frame_queue_index = ~0;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (handoff_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/handoff.h b/vnet/vnet/handoff.h
deleted file mode 100644
index 815206a9..00000000
--- a/vnet/vnet/handoff.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_vnet_handoff_h
-#define included_vnet_handoff_h
-
-#include <vlib/vlib.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vnet/mpls/packet.h>
-
-typedef enum
-{
-  HANDOFF_DISPATCH_NEXT_IP4_INPUT,
-  HANDOFF_DISPATCH_NEXT_IP6_INPUT,
-  HANDOFF_DISPATCH_NEXT_MPLS_INPUT,
-  HANDOFF_DISPATCH_NEXT_ETHERNET_INPUT,
-  HANDOFF_DISPATCH_NEXT_DROP,
-  HANDOFF_DISPATCH_N_NEXT,
-} handoff_dispatch_next_t;
-
-
-static inline u64
-ipv4_get_key (ip4_header_t * ip)
-{
-  u64 hash_key;
-
-  hash_key = *((u64 *) (&ip->address_pair)) ^ ip->protocol;
-
-  return hash_key;
-}
-
-static inline u64
-ipv6_get_key (ip6_header_t * ip)
-{
-  u64 hash_key;
-
-  hash_key = ip->src_address.as_u64[0] ^
-    rotate_left (ip->src_address.as_u64[1], 13) ^
-    rotate_left (ip->dst_address.as_u64[0], 26) ^
-    rotate_left (ip->dst_address.as_u64[1], 39) ^ ip->protocol;
-
-  return hash_key;
-}
-
-#define MPLS_BOTTOM_OF_STACK_BIT_MASK   0x00000100U
-#define MPLS_LABEL_MASK                 0xFFFFF000U
-
-static inline u64
-mpls_get_key (mpls_unicast_header_t * m)
-{
-  u64 hash_key;
-  u8 ip_ver;
-
-
-  /* find the bottom of the MPLS label stack. */
-  if (PREDICT_TRUE (m->label_exp_s_ttl &
-		    clib_net_to_host_u32 (MPLS_BOTTOM_OF_STACK_BIT_MASK)))
-    {
-      goto bottom_lbl_found;
-    }
-  m++;
-
-  if (PREDICT_TRUE (m->label_exp_s_ttl &
-		    clib_net_to_host_u32 (MPLS_BOTTOM_OF_STACK_BIT_MASK)))
-    {
-      goto bottom_lbl_found;
-    }
-  m++;
-
-  if (m->label_exp_s_ttl &
-      clib_net_to_host_u32 (MPLS_BOTTOM_OF_STACK_BIT_MASK))
-    {
-      goto bottom_lbl_found;
-    }
-  m++;
-
-  if (m->label_exp_s_ttl &
-      clib_net_to_host_u32 (MPLS_BOTTOM_OF_STACK_BIT_MASK))
-    {
-      goto bottom_lbl_found;
-    }
-  m++;
-
-  if (m->label_exp_s_ttl &
-      clib_net_to_host_u32 (MPLS_BOTTOM_OF_STACK_BIT_MASK))
-    {
-      goto bottom_lbl_found;
-    }
-
-  /* the bottom label was not found - use the last label */
-  hash_key = m->label_exp_s_ttl & clib_net_to_host_u32 (MPLS_LABEL_MASK);
-
-  return hash_key;
-
-bottom_lbl_found:
-  m++;
-  ip_ver = (*((u8 *) m) >> 4);
-
-  /* find out if it is IPV4 or IPV6 header */
-  if (PREDICT_TRUE (ip_ver == 4))
-    {
-      hash_key = ipv4_get_key ((ip4_header_t *) m);
-    }
-  else if (PREDICT_TRUE (ip_ver == 6))
-    {
-      hash_key = ipv6_get_key ((ip6_header_t *) m);
-    }
-  else
-    {
-      /* use the bottom label */
-      hash_key =
-	(m - 1)->label_exp_s_ttl & clib_net_to_host_u32 (MPLS_LABEL_MASK);
-    }
-
-  return hash_key;
-
-}
-
-static inline u64
-eth_get_sym_key (ethernet_header_t * h0)
-{
-  u64 hash_key;
-
-  if (PREDICT_TRUE (h0->type) == clib_host_to_net_u16 (ETHERNET_TYPE_IP4))
-    {
-      ip4_header_t *ip = (ip4_header_t *) (h0 + 1);
-      hash_key =
-	(u64) (ip->src_address.as_u32 ^
-	       ip->dst_address.as_u32 ^ ip->protocol);
-    }
-  else if (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_IP6))
-    {
-      ip6_header_t *ip = (ip6_header_t *) (h0 + 1);
-      hash_key = (u64) (ip->src_address.as_u64[0] ^
-			ip->src_address.as_u64[1] ^
-			ip->dst_address.as_u64[0] ^
-			ip->dst_address.as_u64[1] ^ ip->protocol);
-    }
-  else if (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST))
-    {
-      hash_key = mpls_get_key ((mpls_unicast_header_t *) (h0 + 1));
-    }
-  else
-    if (PREDICT_FALSE
-	((h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_VLAN))
-	 || (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_DOT1AD))))
-    {
-      ethernet_vlan_header_t *outer = (ethernet_vlan_header_t *) (h0 + 1);
-
-      outer = (outer->type == clib_host_to_net_u16 (ETHERNET_TYPE_VLAN)) ?
-	outer + 1 : outer;
-      if (PREDICT_TRUE (outer->type) ==
-	  clib_host_to_net_u16 (ETHERNET_TYPE_IP4))
-	{
-	  ip4_header_t *ip = (ip4_header_t *) (outer + 1);
-	  hash_key =
-	    (u64) (ip->src_address.as_u32 ^
-		   ip->dst_address.as_u32 ^ ip->protocol);
-	}
-      else if (outer->type == clib_host_to_net_u16 (ETHERNET_TYPE_IP6))
-	{
-	  ip6_header_t *ip = (ip6_header_t *) (outer + 1);
-	  hash_key =
-	    (u64) (ip->src_address.as_u64[0] ^ ip->src_address.as_u64[1] ^
-		   ip->dst_address.as_u64[0] ^
-		   ip->dst_address.as_u64[1] ^ ip->protocol);
-	}
-      else if (outer->type ==
-	       clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST))
-	{
-	  hash_key = mpls_get_key ((mpls_unicast_header_t *) (outer + 1));
-	}
-      else
-	{
-	  hash_key = outer->type;
-	}
-    }
-  else
-    {
-      hash_key = 0;
-    }
-
-  return hash_key;
-}
-
-static inline u64
-eth_get_key (ethernet_header_t * h0)
-{
-  u64 hash_key;
-
-  if (PREDICT_TRUE (h0->type) == clib_host_to_net_u16 (ETHERNET_TYPE_IP4))
-    {
-      hash_key = ipv4_get_key ((ip4_header_t *) (h0 + 1));
-    }
-  else if (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_IP6))
-    {
-      hash_key = ipv6_get_key ((ip6_header_t *) (h0 + 1));
-    }
-  else if (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST))
-    {
-      hash_key = mpls_get_key ((mpls_unicast_header_t *) (h0 + 1));
-    }
-  else if ((h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_VLAN)) ||
-	   (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_DOT1AD)))
-    {
-      ethernet_vlan_header_t *outer = (ethernet_vlan_header_t *) (h0 + 1);
-
-      outer = (outer->type == clib_host_to_net_u16 (ETHERNET_TYPE_VLAN)) ?
-	outer + 1 : outer;
-      if (PREDICT_TRUE (outer->type) ==
-	  clib_host_to_net_u16 (ETHERNET_TYPE_IP4))
-	{
-	  hash_key = ipv4_get_key ((ip4_header_t *) (outer + 1));
-	}
-      else if (outer->type == clib_host_to_net_u16 (ETHERNET_TYPE_IP6))
-	{
-	  hash_key = ipv6_get_key ((ip6_header_t *) (outer + 1));
-	}
-      else if (outer->type ==
-	       clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST))
-	{
-	  hash_key = mpls_get_key ((mpls_unicast_header_t *) (outer + 1));
-	}
-      else
-	{
-	  hash_key = outer->type;
-	}
-    }
-  else
-    {
-      hash_key = 0;
-    }
-
-  return hash_key;
-}
-
-#endif /* included_vnet_handoff_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/hdlc/error.def b/vnet/vnet/hdlc/error.def
deleted file mode 100644
index 16e001bb..00000000
--- a/vnet/vnet/hdlc/error.def
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * hdlc_error.def: hdlc errors
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-hdlc_error (NONE, "no error")
-hdlc_error (UNKNOWN_PROTOCOL, "unknown hdlc protocol")
-hdlc_error (UNKNOWN_ADDRESS_CONTROL, "address, control != 0x0f00")
diff --git a/vnet/vnet/hdlc/hdlc.c b/vnet/vnet/hdlc/hdlc.c
deleted file mode 100644
index 174085ac..00000000
--- a/vnet/vnet/hdlc/hdlc.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * hdlc.c: hdlc
- *
- * Copyright (c) 2010 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/hdlc/hdlc.h>
-
-/* Global main structure. */
-hdlc_main_t hdlc_main;
-
-u8 * format_hdlc_protocol (u8 * s, va_list * args)
-{
-  hdlc_protocol_t p = va_arg (*args, u32);
-  hdlc_main_t * pm = &hdlc_main;
-  hdlc_protocol_info_t * pi = hdlc_get_protocol_info (pm, p);
-
-  if (pi)
-    s = format (s, "%s", pi->name);
-  else
-    s = format (s, "0x%04x", p);
-
-  return s;
-}
-
-u8 * format_hdlc_header_with_length (u8 * s, va_list * args)
-{
-  hdlc_main_t * pm = &hdlc_main;
-  hdlc_header_t * h = va_arg (*args, hdlc_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-  hdlc_protocol_t p = clib_net_to_host_u16 (h->protocol);
-  uword indent, header_bytes;
-
-  header_bytes = sizeof (h[0]);
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    return format (s, "hdlc header truncated");
-
-  indent = format_get_indent (s);
-
-  s = format (s, "HDLC %U", format_hdlc_protocol, p);
-
-  if (h->address != 0xff)
-    s = format (s, ", address 0x%02x", h->address);
-  if (h->control != 0x03)
-    s = format (s, ", control 0x%02x", h->control);
-
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    {
-      hdlc_protocol_info_t * pi = hdlc_get_protocol_info (pm, p);
-      vlib_node_t * node = vlib_get_node (pm->vlib_main, pi->node_index);
-      if (node->format_buffer)
-	s = format (s, "\n%U%U",
-		    format_white_space, indent,
-		    node->format_buffer, (void *) (h + 1),
-		    max_header_bytes - header_bytes);
-    }
-
-  return s;
-}
-
-u8 * format_hdlc_header (u8 * s, va_list * args)
-{
-  hdlc_header_t * h = va_arg (*args, hdlc_header_t *);
-  return format (s, "%U", format_hdlc_header_with_length, h, 0);
-}
-
-/* Returns hdlc protocol as an int in host byte order. */
-uword
-unformat_hdlc_protocol_host_byte_order (unformat_input_t * input,
-				       va_list * args)
-{
-  u16 * result = va_arg (*args, u16 *);
-  hdlc_main_t * pm = &hdlc_main;
-  int p, i;
-
-  /* Numeric type. */
-  if (unformat (input, "0x%x", &p)
-      || unformat (input, "%d", &p))
-    {
-      if (p >= (1 << 16))
-	return 0;
-      *result = p;
-      return 1;
-    }
-
-  /* Named type. */
-  if (unformat_user (input, unformat_vlib_number_by_name,
-		     pm->protocol_info_by_name, &i))
-    {
-      hdlc_protocol_info_t * pi = vec_elt_at_index (pm->protocol_infos, i);
-      *result = pi->protocol;
-      return 1;
-    }
-
-  return 0;
-}
-
-uword
-unformat_hdlc_protocol_net_byte_order (unformat_input_t * input,
-				      va_list * args)
-{
-  u16 * result = va_arg (*args, u16 *);
-  if (! unformat_user (input, unformat_hdlc_protocol_host_byte_order, result))
-    return 0;
-  *result = clib_host_to_net_u16 ((u16) *result);
-  return 1;
-}
-
-uword
-unformat_hdlc_header (unformat_input_t * input, va_list * args)
-{
-  u8 ** result = va_arg (*args, u8 **);
-  hdlc_header_t _h, * h = &_h;
-  u16 p;
-
-  if (! unformat (input, "%U",
-		  unformat_hdlc_protocol_host_byte_order, &p))
-    return 0;
-
-  h->address = 0xff;
-  h->control = 0x03;
-  h->protocol = clib_host_to_net_u16 (p);
-
-  /* Add header to result. */
-  {
-    void * p;
-    u32 n_bytes = sizeof (h[0]);
-
-    vec_add2 (*result, p, n_bytes);
-    clib_memcpy (p, h, n_bytes);
-  }
-  
-  return 1;
-}
-
-static u8*
-hdlc_build_rewrite (vnet_main_t * vnm,
-		    u32 sw_if_index,
-		    vnet_link_t link_type,
-		    const void *dst_address)
-{
-  hdlc_header_t * h;
-  u8* rewrite = NULL;
-  hdlc_protocol_t protocol;
-
-  switch (link_type) {
-#define _(a,b) case VNET_LINK_##a: protocol = HDLC_PROTOCOL_##b; break
-    _ (IP4, ip4);
-    _ (IP6, ip6);
-    _ (MPLS, mpls_unicast);
-#undef _
-  default:
-      return (NULL);
-  }
-
-  vec_validate(rewrite, sizeof(*h)-1);
-  h = (hdlc_header_t *)rewrite;
-  h->address = 0x0f;
-  h->control = 0x00;
-  h->protocol = clib_host_to_net_u16 (protocol);
-		     
-  return (rewrite);
-}
-
-VNET_HW_INTERFACE_CLASS (hdlc_hw_interface_class) = {
-  .name = "HDLC",
-  .format_header = format_hdlc_header_with_length,
-  .unformat_header = unformat_hdlc_header,
-  .build_rewrite = hdlc_build_rewrite,
-  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
-};
-
-static void add_protocol (hdlc_main_t * pm,
-			  hdlc_protocol_t protocol,
-			  char * protocol_name)
-{
-  hdlc_protocol_info_t * pi;
-  u32 i;
-
-  vec_add2 (pm->protocol_infos, pi, 1);
-  i = pi - pm->protocol_infos;
-
-  pi->name = protocol_name;
-  pi->protocol = protocol;
-  pi->next_index = pi->node_index = ~0;
-
-  hash_set (pm->protocol_info_by_protocol, protocol, i);
-  hash_set_mem (pm->protocol_info_by_name, pi->name, i);
-}
-
-static clib_error_t * hdlc_init (vlib_main_t * vm)
-{
-  hdlc_main_t * pm = &hdlc_main;
-
-  memset (pm, 0, sizeof (pm[0]));
-  pm->vlib_main = vm;
-
-  pm->protocol_info_by_name = hash_create_string (0, sizeof (uword));
-  pm->protocol_info_by_protocol = hash_create (0, sizeof (uword));
-
-#define _(n,s) add_protocol (pm, HDLC_PROTOCOL_##s, #s);
-  foreach_hdlc_protocol
-#undef _
-
-  return vlib_call_init_function (vm, hdlc_input_init);
-}
-
-VLIB_INIT_FUNCTION (hdlc_init);
-
-hdlc_main_t * hdlc_get_main (vlib_main_t * vm)
-{
-  vlib_call_init_function (vm, hdlc_init);
-  return &hdlc_main;
-}
-
diff --git a/vnet/vnet/hdlc/hdlc.h b/vnet/vnet/hdlc/hdlc.h
deleted file mode 100644
index 73b15c2f..00000000
--- a/vnet/vnet/hdlc/hdlc.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * hdlc.h: types/functions for hdlc.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_hdlc_h
-#define included_hdlc_h
-
-#include <vnet/vnet.h>
-#include <vnet/hdlc/packet.h>
-#include <vnet/pg/pg.h>
-
-extern vnet_hw_interface_class_t hdlc_hw_interface_class;
-
-typedef enum {
-#define hdlc_error(n,s) HDLC_ERROR_##n,
-#include <vnet/hdlc/error.def>
-#undef hdlc_error
-  HDLC_N_ERROR,
-} hdlc_error_t;
-
-typedef struct {
-  /* Name (a c string). */
-  char * name;
-
-  /* HDLC protocol type in host byte order. */
-  hdlc_protocol_t protocol;
-
-  /* Node which handles this type. */
-  u32 node_index;
-
-  /* Next index for this type. */
-  u32 next_index;
-} hdlc_protocol_info_t;
-
-typedef struct {
-  vlib_main_t * vlib_main;
-
-  hdlc_protocol_info_t * protocol_infos;
-
-  /* Hash tables mapping name/protocol to protocol info index. */
-  uword * protocol_info_by_name, * protocol_info_by_protocol;
-} hdlc_main_t;
-
-always_inline hdlc_protocol_info_t *
-hdlc_get_protocol_info (hdlc_main_t * em, hdlc_protocol_t protocol)
-{
-  uword * p = hash_get (em->protocol_info_by_protocol, protocol);
-  return p ? vec_elt_at_index (em->protocol_infos, p[0]) : 0;
-}
-
-extern hdlc_main_t hdlc_main;
-
-/* Register given node index to take input for given hdlc type. */
-void
-hdlc_register_input_type (vlib_main_t * vm,
-			 hdlc_protocol_t protocol,
-			 u32 node_index);
-
-void hdlc_set_adjacency (vnet_rewrite_header_t * rw,
-			uword max_data_bytes,
-			hdlc_protocol_t protocol);
-
-format_function_t format_hdlc_protocol;
-format_function_t format_hdlc_header;
-format_function_t format_hdlc_header_with_length;
-
-/* Parse hdlc protocol as 0xXXXX or protocol name.
-   In either host or network byte order. */
-unformat_function_t unformat_hdlc_protocol_host_byte_order;
-unformat_function_t unformat_hdlc_protocol_net_byte_order;
-
-/* Parse hdlc header. */
-unformat_function_t unformat_hdlc_header;
-unformat_function_t unformat_pg_hdlc_header;
-
-always_inline void
-hdlc_setup_node (vlib_main_t * vm, u32 node_index)
-{
-  vlib_node_t * n = vlib_get_node (vm, node_index);
-  pg_node_t * pn = pg_get_node (node_index);
-
-  n->format_buffer = format_hdlc_header_with_length;
-  n->unformat_buffer = unformat_hdlc_header;
-  pn->unformat_edit = unformat_pg_hdlc_header;
-}
-
-void
-hdlc_register_input_protocol (vlib_main_t * vm,
-			     hdlc_protocol_t protocol,
-			     u32 node_index);
-
-#endif /* included_hdlc_h */
diff --git a/vnet/vnet/hdlc/node.c b/vnet/vnet/hdlc/node.c
deleted file mode 100644
index 4fe0296a..00000000
--- a/vnet/vnet/hdlc/node.c
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * hdlc_node.c: hdlc packet processing
- *
- * Copyright (c) 2010 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/hdlc/hdlc.h>
-#include <vppinfra/sparse_vec.h>
-
-#define foreach_hdlc_input_next			\
-  _ (PUNT, "error-punt")			\
-  _ (DROP, "error-drop")
-
-typedef enum {
-#define _(s,n) HDLC_INPUT_NEXT_##s,
-  foreach_hdlc_input_next
-#undef _
-  HDLC_INPUT_N_NEXT,
-} hdlc_input_next_t;
-
-typedef struct {
-  u8 packet_data[32];
-} hdlc_input_trace_t;
-
-static u8 * format_hdlc_input_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  hdlc_input_trace_t * t = va_arg (*va, hdlc_input_trace_t *);
-
-  s = format (s, "%U", format_hdlc_header, t->packet_data);
-
-  return s;
-}
-
-typedef struct {
-  /* Sparse vector mapping hdlc protocol in network byte order
-     to next index. */
-  u16 * next_by_protocol;
-
-  u32 * sparse_index_by_next_index;
-} hdlc_input_runtime_t;
-
-static uword
-hdlc_input (vlib_main_t * vm,
-	   vlib_node_runtime_t * node,
-	   vlib_frame_t * from_frame)
-{
-  hdlc_input_runtime_t * rt = (void *) node->runtime_data;
-  u32 n_left_from, next_index, i_next, * from, * to_next;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node,
-				   from,
-				   n_left_from,
-				   sizeof (from[0]),
-				   sizeof (hdlc_input_trace_t));
-
-  next_index = node->cached_next_index;
-  i_next = vec_elt (rt->sparse_index_by_next_index, next_index);
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t * b0, * b1;
-	  hdlc_header_t * h0, * h1;
-	  u32 i0, i1, len0, len1, protocol0, protocol1, enqueue_code;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * b2, * b3;
-
-	    b2 = vlib_get_buffer (vm, from[2]);
-	    b3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (b2, LOAD);
-	    vlib_prefetch_buffer_header (b3, LOAD);
-
-	    CLIB_PREFETCH (b2->data, sizeof (h0[0]), LOAD);
-	    CLIB_PREFETCH (b3->data, sizeof (h1[0]), LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  h0 = (void *) (b0->data + b0->current_data);
-	  h1 = (void *) (b1->data + b1->current_data);
-
-	  protocol0 = h0->protocol;
-	  protocol1 = h1->protocol;
-
-	  /* Add padding bytes for OSI protocols. */
-	  len0 = sizeof (h0[0]);
-	  len1 = sizeof (h1[0]);
-	  
-	  len0 += protocol0 == clib_host_to_net_u16 (HDLC_PROTOCOL_osi);
-	  len1 += protocol1 == clib_host_to_net_u16 (HDLC_PROTOCOL_osi);
-
-	  b0->current_data += len0;
-	  b1->current_data += len1;
-
-	  b0->current_length -= len0;
-	  b1->current_length -= len1;
-
-	  /* Index sparse array with network byte order. */
-	  sparse_vec_index2 (rt->next_by_protocol, protocol0, protocol1, &i0, &i1);
-
-	  b0->error = node->errors[i0 == SPARSE_VEC_INVALID_INDEX ? HDLC_ERROR_UNKNOWN_PROTOCOL : HDLC_ERROR_NONE];
-	  b1->error = node->errors[i1 == SPARSE_VEC_INVALID_INDEX ? HDLC_ERROR_UNKNOWN_PROTOCOL : HDLC_ERROR_NONE];
-
-	  enqueue_code = (i0 != i_next) + 2*(i1 != i_next);
-
-	  if (PREDICT_FALSE (enqueue_code != 0))
-	    {
-	      switch (enqueue_code)
-		{
-		case 1:
-		  /* A B A */
-		  to_next[-2] = bi1;
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node, vec_elt (rt->next_by_protocol, i0), bi0);
-		  break;
-
-		case 2:
-		  /* A A B */
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node, vec_elt (rt->next_by_protocol, i1), bi1);
-		  break;
-
-		case 3:
-		  /* A B B or A B C */
-		  to_next -= 2;
-		  n_left_to_next += 2;
-		  vlib_set_next_frame_buffer (vm, node, vec_elt (rt->next_by_protocol, i0), bi0);
-		  vlib_set_next_frame_buffer (vm, node, vec_elt (rt->next_by_protocol, i1), bi1);
-		  if (i0 == i1)
-		    {
-		      vlib_put_next_frame (vm, node, next_index,
-					   n_left_to_next);
-		      i_next = i1;
-		      next_index = vec_elt (rt->next_by_protocol, i_next);
-		      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-		    }
-		}
-	    }
-	}
-    
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t * b0;
-	  hdlc_header_t * h0;
-	  u32 i0, len0, protocol0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  h0 = (void *) (b0->data + b0->current_data);
-
-	  protocol0 = h0->protocol;
-
-	  /* Add padding bytes for OSI protocols. */
-	  len0 = sizeof (h0[0]);
-	  len0 += protocol0 == clib_host_to_net_u16 (HDLC_PROTOCOL_osi);
-
-	  b0->current_data += len0;
-	  b0->current_length -= len0;
-
-	  i0 = sparse_vec_index (rt->next_by_protocol, protocol0);
-
-	  b0->error = node->errors[i0 == SPARSE_VEC_INVALID_INDEX ? HDLC_ERROR_UNKNOWN_PROTOCOL : HDLC_ERROR_NONE];
-	  
-	  /* Sent packet to wrong next? */
-	  if (PREDICT_FALSE (i0 != i_next))
-	    {
-	      /* Return old frame; remove incorrectly enqueued packet. */
-	      vlib_put_next_frame (vm, node, next_index, n_left_to_next + 1);
-
-	      /* Send to correct next. */
-	      i_next = i0;
-	      next_index = vec_elt (rt->next_by_protocol, i_next);
-	      vlib_get_next_frame (vm, node, next_index,
-				   to_next, n_left_to_next);
-
-	      to_next[0] = bi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-static char * hdlc_error_strings[] = {
-#define hdlc_error(n,s) s,
-#include "error.def"
-#undef hdlc_error
-};
-
-VLIB_REGISTER_NODE (hdlc_input_node) = {
-  .function = hdlc_input,
-  .name = "hdlc-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .runtime_data_bytes = sizeof (hdlc_input_runtime_t),
-
-  .n_errors = HDLC_N_ERROR,
-  .error_strings = hdlc_error_strings,
-
-  .n_next_nodes = HDLC_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [HDLC_INPUT_NEXT_##s] = n,
-    foreach_hdlc_input_next
-#undef _
-  },
-
-  .format_buffer = format_hdlc_header_with_length,
-  .format_trace = format_hdlc_input_trace,
-  .unformat_buffer = unformat_hdlc_header,
-};
-
-static clib_error_t * hdlc_input_init (vlib_main_t * vm)
-{
-  hdlc_input_runtime_t * rt;
-
-  {
-    clib_error_t * error = vlib_call_init_function (vm, hdlc_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  hdlc_setup_node (vm, hdlc_input_node.index);
-
-  rt = vlib_node_get_runtime_data (vm, hdlc_input_node.index);
-
-  rt->next_by_protocol = sparse_vec_new
-    (/* elt bytes */ sizeof (rt->next_by_protocol[0]),
-     /* bits in index */ BITS (((hdlc_header_t *) 0)->protocol));
-
-  vec_validate (rt->sparse_index_by_next_index, HDLC_INPUT_NEXT_DROP);
-  vec_validate (rt->sparse_index_by_next_index, HDLC_INPUT_NEXT_PUNT);
-  rt->sparse_index_by_next_index[HDLC_INPUT_NEXT_DROP]
-    = SPARSE_VEC_INVALID_INDEX;
-  rt->sparse_index_by_next_index[HDLC_INPUT_NEXT_PUNT]
-    = SPARSE_VEC_INVALID_INDEX;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (hdlc_input_init);
-
-void
-hdlc_register_input_protocol (vlib_main_t * vm,
-			     hdlc_protocol_t protocol,
-			     u32 node_index)
-{
-  hdlc_main_t * em = &hdlc_main;
-  hdlc_protocol_info_t * pi;
-  hdlc_input_runtime_t * rt;
-  u16 * n;
-  u32 i;
-
-  {
-    clib_error_t * error = vlib_call_init_function (vm, hdlc_input_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  pi = hdlc_get_protocol_info (em, protocol);
-  pi->node_index = node_index;
-  pi->next_index = vlib_node_add_next (vm, 
-				       hdlc_input_node.index,
-				       node_index);
-
-  /* Setup hdlc protocol -> next index sparse vector mapping. */
-  rt = vlib_node_get_runtime_data (vm, hdlc_input_node.index);
-  n = sparse_vec_validate (rt->next_by_protocol, clib_host_to_net_u16 (protocol));
-  n[0] = pi->next_index;
-
-  /* Rebuild next index -> sparse index inverse mapping when sparse vector
-     is updated. */
-  vec_validate (rt->sparse_index_by_next_index, pi->next_index);
-  for (i = 1; i < vec_len (rt->next_by_protocol); i++)
-    rt->sparse_index_by_next_index[rt->next_by_protocol[i]] = i;
-}
diff --git a/vnet/vnet/hdlc/packet.h b/vnet/vnet/hdlc/packet.h
deleted file mode 100644
index 45e5496f..00000000
--- a/vnet/vnet/hdlc/packet.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vnet_hdlc_packet_h
-#define included_vnet_hdlc_packet_h
-
-/*
- * HDLC packet format
- *
- * Copyright (c) 2009 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#define foreach_hdlc_protocol			\
-  _ (0x0800, ip4)				\
-  _ (0x2000, cdp)				\
-  _ (0x8035, slarp)				\
-  _ (0x8847, mpls_unicast)			\
-  _ (0x8848, mpls_multicast)			\
-  _ (0x86dd, ip6)				\
-  _ (0xfefe, osi)
-
-typedef enum {
-#define _(n,f) HDLC_PROTOCOL_##f = n,
-  foreach_hdlc_protocol
-#undef _
-} hdlc_protocol_t;
-
-typedef struct {
-  /* Set to 0x0f for unicast; 0x8f for broadcast. */
-  u8 address;
-
-  /* Always zero. */
-  u8 control;
-
-  /* Layer 3 protocol for this packet. */
-  u16 protocol;
-
-  /* Layer 3 payload. */
-  u8 payload[0];
-} hdlc_header_t;
-
-#endif /* included_vnet_hdlc_packet_h */
diff --git a/vnet/vnet/hdlc/pg.c b/vnet/vnet/hdlc/pg.c
deleted file mode 100644
index b8e67022..00000000
--- a/vnet/vnet/hdlc/pg.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * hdlc_pg.c: packet generator hdlc interface
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/hdlc/hdlc.h>
-
-typedef struct {
-  pg_edit_t address;
-  pg_edit_t control;
-  pg_edit_t protocol;
-} pg_hdlc_header_t;
-
-static inline void
-pg_hdlc_header_init (pg_hdlc_header_t * e)
-{
-  pg_edit_init (&e->address, hdlc_header_t, address);
-  pg_edit_init (&e->control, hdlc_header_t, control);
-  pg_edit_init (&e->protocol, hdlc_header_t, protocol);
-}
-
-uword
-unformat_pg_hdlc_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t * s = va_arg (*args, pg_stream_t *);
-  pg_hdlc_header_t * h;
-  u32 group_index, error;
-  
-  h = pg_create_edit_group (s, sizeof (h[0]), sizeof (hdlc_header_t),
-			    &group_index);
-  pg_hdlc_header_init (h);
-
-  pg_edit_set_fixed (&h->address, 0x0f);
-  pg_edit_set_fixed (&h->control, 0x00);
-
-  error = 1;
-  if (! unformat (input, "%U",
-		  unformat_pg_edit,
-		    unformat_hdlc_protocol_net_byte_order, &h->protocol))
-    goto done;
-
-  {
-    hdlc_main_t * pm = &hdlc_main;
-    hdlc_protocol_info_t * pi = 0;
-    pg_node_t * pg_node = 0;
-
-    if (h->protocol.type == PG_EDIT_FIXED)
-      {
-	u16 t = *(u16 *) h->protocol.values[PG_EDIT_LO];
-	pi = hdlc_get_protocol_info (pm, clib_net_to_host_u16 (t));
-	if (pi && pi->node_index != ~0)
-	  pg_node = pg_get_node (pi->node_index);
-      }
-
-    if (pg_node && pg_node->unformat_edit
-	&& unformat_user (input, pg_node->unformat_edit, s))
-      ;
-
-    else if (! unformat_user (input, unformat_pg_payload, s))
-      goto done;
-  }
-
-  error = 0;
- done:
-  if (error)
-    pg_free_edit_group (s);
-  return error == 0;
-}
-
diff --git a/vnet/vnet/interface.api b/vnet/vnet/interface.api
deleted file mode 100644
index 752e79c5..00000000
--- a/vnet/vnet/interface.api
+++ /dev/null
@@ -1,339 +0,0 @@
-/** \brief Set flags on the interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - index of the interface to set flags on
-    @param admin_up_down - set the admin state, 1 = up, 0 = down
-    @param link_up_down - Oper state sent on change event, not used in config.
-    @param deleted - interface was deleted
-*/
-define sw_interface_set_flags
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  /* 1 = up, 0 = down */
-  u8 admin_up_down;
-  u8 link_up_down;
-  u8 deleted;
-};
-
-/** \brief Reply to sw_interface_set_flags 
-    @param context - sender context which was passed in the request
-    @param retval - return code of the set flags request
-*/
-define sw_interface_set_flags_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Set interface MTU
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - index of the interface to set MTU on
-    @param mtu - MTU
-*/
-define sw_interface_set_mtu
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u16 mtu;
-};
-
-/** \brief Reply to sw_interface_set_mtu
-    @param context - sender context which was passed in the request
-    @param retval - return code of the set flags request
-*/
-define sw_interface_set_mtu_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Register for interface events
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param enable_disable - 1 => register for events, 0 => cancel registration
-    @param pid - sender's pid
-*/
-define want_interface_events
-{
-  u32 client_index;
-  u32 context;
-  u32 enable_disable;
-  u32 pid;
-};
-
-/** \brief Reply for interface events registration
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define want_interface_events_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Interface details structure (fix this) 
-    @param sw_if_index - index of the interface
-    @param sup_sw_if_index - index of parent interface if any, else same as sw_if_index  
-    @param l2_address_length - length of the interface's l2 address
-    @param pid - the interface's l2 address
-    @param interface_name - name of the interface
-    @param link_duplex - 1 if half duplex, 2 if full duplex
-    @param link_speed - 1 = 10M, 2 = 100M, 4 = 1G, 8 = 10G, 16 = 40G, 32 = 100G
-    @param link_MTU - max. transmittion unit 
-    @param sub_if_id - A number 0-N to uniquely identify this subif on super if
-    @param sub_dot1ad -  0 = dot1q, 1=dot1ad
-    @param sub_number_of_tags - Number of tags (0 - 2)
-    @param sub_outer_vlan_id
-    @param sub_inner_vlan_id
-    @param sub_exact_match
-    @param sub_default
-    @param sub_outer_vlan_id_any
-    @param sub_inner_vlan_id_any
-    @param vtr_op - vlan tag rewrite operation
-    @param vtr_push_dot1q
-    @param vtr_tag1
-    @param vtr_tag2
-*/
-define sw_interface_details
-{
-  u32 context;
-  u32 sw_if_index;
-
-  /* index of sup interface (e.g. hw interface).
-     equal to sw_if_index for super hw interface. */
-  u32 sup_sw_if_index;
-
-  /* Layer 2 address, if applicable */
-  u32 l2_address_length;
-  u8 l2_address[8];
-
-  /* Interface name */
-  u8 interface_name[64];
-
-  /* 1 = up, 0 = down */
-  u8 admin_up_down;
-  u8 link_up_down;
-
-  /* 1 = half duplex, 2 = full duplex */
-  u8 link_duplex;
-
-  /* 1 = 10M, 2 = 100M, 4 = 1G, 8 = 10G, 16 = 40G, 32 = 100G */
-  u8 link_speed;
-
-  /* MTU */
-  u16 link_mtu;
-
-  /* Subinterface ID. A number 0-N to uniquely identify this subinterface under the super interface */
-  u32 sub_id;
-
-  /* 0 = dot1q, 1=dot1ad */
-  u8 sub_dot1ad;
-
-  /* Number of tags 0-2 */
-  u8 sub_number_of_tags;
-  u16 sub_outer_vlan_id;
-  u16 sub_inner_vlan_id;
-  u8 sub_exact_match;
-  u8 sub_default;
-  u8 sub_outer_vlan_id_any;
-  u8 sub_inner_vlan_id_any;
-
-  /* vlan tag rewrite state */
-  u32 vtr_op;
-  u32 vtr_push_dot1q;		// ethertype of first pushed tag is dot1q/dot1ad
-  u32 vtr_tag1;			// first pushed tag
-  u32 vtr_tag2;			// second pushed tag
-  u8 tag[64];
-};
-
-/* works */
-define sw_interface_dump
-{
-  u32 client_index;
-  u32 context;
-  u8 name_filter_valid;
-  u8 name_filter[49];
-};
-
-/** \brief Set or delete one or all ip addresses on a specified interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - index of the interface to add/del addresses 
-    @param is_add - add address if non-zero, else delete
-    @param is_ipv6 - if non-zero the address is ipv6, else ipv4
-    @param del_all - if non-zero delete all addresses on the interface
-    @param address_length - address length in bytes, 4 for ip4, 16 for ip6
-    @param address - array of address bytes
-*/
-define sw_interface_add_del_address
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 is_add;
-  u8 is_ipv6;
-  u8 del_all;
-  u8 address_length;
-  u8 address[16];
-};
-
-/** \brief Reply to sw_interface_add_del_address
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define sw_interface_add_del_address_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Associate the specified interface with a fib table
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - index of the interface
-    @param is_ipv6 - if non-zero ipv6, else ipv4
-    @param vrf_id - fib table/vrd id to associate the interface with
-*/
-define sw_interface_set_table
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 is_ipv6;
-  u32 vrf_id;
-};
-
-/** \brief Reply to sw_interface_set_table
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define sw_interface_set_table_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Get VRF id assigned to interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - index of the interface
-*/
-define sw_interface_get_table
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 is_ipv6;
-};
-
-/** \brief Reply to get_sw_interface_vrf
-    @param context - sender context which was passed in the request
-    @param vrf_id - VRF id assigned to the interface
-*/
-define sw_interface_get_table_reply
-{
-  u32 context;
-  i32 retval;
-  u32 vrf_id;
-};
-
-/** \brief Stats counters structure 
-    @param vnet_counter_type- such as ip4, ip6, punts, etc
-    @param is_combined - rx & tx total (all types) counts   
-    @param first_sw_if_index - first sw index in block of index, counts
-    @param count - number of interfaces this stats block includes counters for
-    @param data - contiguous block of vlib_counter_t structures 
-*/
-define vnet_interface_counters
-{
-  /* enums - plural - in vnet/interface.h */
-  u8 vnet_counter_type;
-  u8 is_combined;
-  u32 first_sw_if_index;
-  u32 count;
-  u8 data[count];
-};
-
-/** \brief Set unnumbered interface add / del request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface with an IP address
-    @param unnumbered_sw_if_index - interface which will use the address
-    @param is_add - if non-zero set the association, else unset it
-*/
-define sw_interface_set_unnumbered
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;		/* use this intfc address */
-  u32 unnumbered_sw_if_index;	/* on this interface */
-  u8 is_add;
-};
-
-/** \brief Set unnumbered interface add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define sw_interface_set_unnumbered_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Clear interface statistics
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - index of the interface to clear statistics
-*/
-define sw_interface_clear_stats
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-};
-
-/** \brief Reply to sw_interface_clear_stats 
-    @param context - sender context which was passed in the request
-    @param retval - return code of the set flags request
-*/
-define sw_interface_clear_stats_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Set / clear software interface tag
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - the interface
-    @param add_del - 1 = add, 0 = delete
-    @param tag - an ascii tag
-*/
-define sw_interface_tag_add_del 
-{
-    u32 client_index;
-    u32 context;
-    u8 is_add;
-    u32 sw_if_index;
-    u8 tag[64];
-};
-
-/** \brief Reply to set / clear software interface tag
-    @param context - sender context which was passed in the request
-    @param retval - return code for the request
-*/
-define sw_interface_tag_add_del_reply
-{
-    u32 context;
-    i32 retval;
-};
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
-
diff --git a/vnet/vnet/interface.c b/vnet/vnet/interface.c
deleted file mode 100644
index 78610ed4..00000000
--- a/vnet/vnet/interface.c
+++ /dev/null
@@ -1,1398 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * interface.c: VNET interfaces/sub-interfaces
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/plugin/plugin.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/adj/adj.h>
-
-#define VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE (1 << 0)
-#define VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE (1 << 1)
-
-static clib_error_t *vnet_hw_interface_set_flags_helper (vnet_main_t * vnm,
-							 u32 hw_if_index,
-							 u32 flags,
-							 u32 helper_flags);
-
-static clib_error_t *vnet_sw_interface_set_flags_helper (vnet_main_t * vnm,
-							 u32 sw_if_index,
-							 u32 flags,
-							 u32 helper_flags);
-
-static clib_error_t *vnet_hw_interface_set_class_helper (vnet_main_t * vnm,
-							 u32 hw_if_index,
-							 u32 hw_class_index,
-							 u32 redistribute);
-
-typedef struct
-{
-  /* Either sw or hw interface index. */
-  u32 sw_hw_if_index;
-
-  /* Flags. */
-  u32 flags;
-} vnet_sw_hw_interface_state_t;
-
-static void
-serialize_vec_vnet_sw_hw_interface_state (serialize_main_t * m, va_list * va)
-{
-  vnet_sw_hw_interface_state_t *s =
-    va_arg (*va, vnet_sw_hw_interface_state_t *);
-  u32 n = va_arg (*va, u32);
-  u32 i;
-  for (i = 0; i < n; i++)
-    {
-      serialize_integer (m, s[i].sw_hw_if_index,
-			 sizeof (s[i].sw_hw_if_index));
-      serialize_integer (m, s[i].flags, sizeof (s[i].flags));
-    }
-}
-
-static void
-unserialize_vec_vnet_sw_hw_interface_state (serialize_main_t * m,
-					    va_list * va)
-{
-  vnet_sw_hw_interface_state_t *s =
-    va_arg (*va, vnet_sw_hw_interface_state_t *);
-  u32 n = va_arg (*va, u32);
-  u32 i;
-  for (i = 0; i < n; i++)
-    {
-      unserialize_integer (m, &s[i].sw_hw_if_index,
-			   sizeof (s[i].sw_hw_if_index));
-      unserialize_integer (m, &s[i].flags, sizeof (s[i].flags));
-    }
-}
-
-static void
-serialize_vnet_sw_hw_interface_set_flags (serialize_main_t * m, va_list * va)
-{
-  vnet_sw_hw_interface_state_t *s =
-    va_arg (*va, vnet_sw_hw_interface_state_t *);
-  serialize (m, serialize_vec_vnet_sw_hw_interface_state, s, 1);
-}
-
-static void
-unserialize_vnet_sw_interface_set_flags (serialize_main_t * m, va_list * va)
-{
-  CLIB_UNUSED (mc_main_t * mc) = va_arg (*va, mc_main_t *);
-  vnet_sw_hw_interface_state_t s;
-
-  unserialize (m, unserialize_vec_vnet_sw_hw_interface_state, &s, 1);
-
-  vnet_sw_interface_set_flags_helper
-    (vnet_get_main (), s.sw_hw_if_index, s.flags,
-     /* helper_flags no redistribution */ 0);
-}
-
-static void
-unserialize_vnet_hw_interface_set_flags (serialize_main_t * m, va_list * va)
-{
-  CLIB_UNUSED (mc_main_t * mc) = va_arg (*va, mc_main_t *);
-  vnet_sw_hw_interface_state_t s;
-
-  unserialize (m, unserialize_vec_vnet_sw_hw_interface_state, &s, 1);
-
-  vnet_hw_interface_set_flags_helper
-    (vnet_get_main (), s.sw_hw_if_index, s.flags,
-     /* helper_flags no redistribution */ 0);
-}
-
-MC_SERIALIZE_MSG (vnet_sw_interface_set_flags_msg, static) =
-{
-.name = "vnet_sw_interface_set_flags",.serialize =
-    serialize_vnet_sw_hw_interface_set_flags,.unserialize =
-    unserialize_vnet_sw_interface_set_flags,};
-
-MC_SERIALIZE_MSG (vnet_hw_interface_set_flags_msg, static) =
-{
-.name = "vnet_hw_interface_set_flags",.serialize =
-    serialize_vnet_sw_hw_interface_set_flags,.unserialize =
-    unserialize_vnet_hw_interface_set_flags,};
-
-void
-serialize_vnet_interface_state (serialize_main_t * m, va_list * va)
-{
-  vnet_main_t *vnm = va_arg (*va, vnet_main_t *);
-  vnet_sw_hw_interface_state_t *sts = 0, *st;
-  vnet_sw_interface_t *sif;
-  vnet_hw_interface_t *hif;
-  vnet_interface_main_t *im = &vnm->interface_main;
-
-  /* Serialize hardware interface classes since they may have changed.
-     Must do this before sending up/down flags. */
-  /* *INDENT-OFF* */
-  pool_foreach (hif, im->hw_interfaces, ({
-    vnet_hw_interface_class_t * hw_class = vnet_get_hw_interface_class (vnm, hif->hw_class_index);
-    serialize_cstring (m, hw_class->name);
-  }));
-  /* *INDENT-ON* */
-
-  /* Send sw/hw interface state when non-zero. */
-  /* *INDENT-OFF* */
-  pool_foreach (sif, im->sw_interfaces, ({
-    if (sif->flags != 0)
-      {
-	vec_add2 (sts, st, 1);
-	st->sw_hw_if_index = sif->sw_if_index;
-	st->flags = sif->flags;
-      }
-  }));
-  /* *INDENT-ON* */
-
-  vec_serialize (m, sts, serialize_vec_vnet_sw_hw_interface_state);
-
-  if (sts)
-    _vec_len (sts) = 0;
-
-  /* *INDENT-OFF* */
-  pool_foreach (hif, im->hw_interfaces, ({
-    if (hif->flags != 0)
-      {
-	vec_add2 (sts, st, 1);
-	st->sw_hw_if_index = hif->hw_if_index;
-	st->flags = hif->flags;
-      }
-  }));
-  /* *INDENT-ON* */
-
-  vec_serialize (m, sts, serialize_vec_vnet_sw_hw_interface_state);
-
-  vec_free (sts);
-}
-
-void
-unserialize_vnet_interface_state (serialize_main_t * m, va_list * va)
-{
-  vnet_main_t *vnm = va_arg (*va, vnet_main_t *);
-  vnet_sw_hw_interface_state_t *sts = 0, *st;
-
-  /* First set interface hardware class. */
-  {
-    vnet_interface_main_t *im = &vnm->interface_main;
-    vnet_hw_interface_t *hif;
-    char *class_name;
-    uword *p;
-    clib_error_t *error;
-
-    /* *INDENT-OFF* */
-    pool_foreach (hif, im->hw_interfaces, ({
-      unserialize_cstring (m, &class_name);
-      p = hash_get_mem (im->hw_interface_class_by_name, class_name);
-      ASSERT (p != 0);
-      error = vnet_hw_interface_set_class_helper (vnm, hif->hw_if_index, p[0], /* redistribute */ 0);
-      if (error)
-	clib_error_report (error);
-      vec_free (class_name);
-    }));
-    /* *INDENT-ON* */
-  }
-
-  vec_unserialize (m, &sts, unserialize_vec_vnet_sw_hw_interface_state);
-  vec_foreach (st, sts)
-    vnet_sw_interface_set_flags_helper (vnm, st->sw_hw_if_index, st->flags,
-					/* no distribute */ 0);
-  vec_free (sts);
-
-  vec_unserialize (m, &sts, unserialize_vec_vnet_sw_hw_interface_state);
-  vec_foreach (st, sts)
-    vnet_hw_interface_set_flags_helper (vnm, st->sw_hw_if_index, st->flags,
-					/* no distribute */ 0);
-  vec_free (sts);
-}
-
-static clib_error_t *
-call_elf_section_interface_callbacks (vnet_main_t * vnm, u32 if_index,
-				      u32 flags,
-				      _vnet_interface_function_list_elt_t **
-				      elts)
-{
-  _vnet_interface_function_list_elt_t *elt;
-  vnet_interface_function_priority_t prio;
-  clib_error_t *error = 0;
-
-  for (prio = VNET_ITF_FUNC_PRIORITY_LOW;
-       prio <= VNET_ITF_FUNC_PRIORITY_HIGH; prio++)
-    {
-      elt = elts[prio];
-
-      while (elt)
-	{
-	  error = elt->fp (vnm, if_index, flags);
-	  if (error)
-	    return error;
-	  elt = elt->next_interface_function;
-	}
-    }
-  return error;
-}
-
-static clib_error_t *
-call_hw_interface_add_del_callbacks (vnet_main_t * vnm, u32 hw_if_index,
-				     u32 is_create)
-{
-  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
-  vnet_hw_interface_class_t *hw_class =
-    vnet_get_hw_interface_class (vnm, hi->hw_class_index);
-  vnet_device_class_t *dev_class =
-    vnet_get_device_class (vnm, hi->dev_class_index);
-  clib_error_t *error = 0;
-
-  if (hw_class->interface_add_del_function
-      && (error =
-	  hw_class->interface_add_del_function (vnm, hw_if_index, is_create)))
-    return error;
-
-  if (dev_class->interface_add_del_function
-      && (error =
-	  dev_class->interface_add_del_function (vnm, hw_if_index,
-						 is_create)))
-    return error;
-
-  error = call_elf_section_interface_callbacks
-    (vnm, hw_if_index, is_create, vnm->hw_interface_add_del_functions);
-
-  return error;
-}
-
-static clib_error_t *
-call_sw_interface_add_del_callbacks (vnet_main_t * vnm, u32 sw_if_index,
-				     u32 is_create)
-{
-  return call_elf_section_interface_callbacks
-    (vnm, sw_if_index, is_create, vnm->sw_interface_add_del_functions);
-}
-
-#define VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE (1 << 0)
-#define VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE (1 << 1)
-
-static clib_error_t *
-vnet_hw_interface_set_flags_helper (vnet_main_t * vnm, u32 hw_if_index,
-				    u32 flags, u32 helper_flags)
-{
-  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
-  vnet_hw_interface_class_t *hw_class =
-    vnet_get_hw_interface_class (vnm, hi->hw_class_index);
-  vnet_device_class_t *dev_class =
-    vnet_get_device_class (vnm, hi->dev_class_index);
-  vlib_main_t *vm = vnm->vlib_main;
-  u32 mask;
-  clib_error_t *error = 0;
-  u32 is_create =
-    (helper_flags & VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE) != 0;
-
-  mask =
-    (VNET_HW_INTERFACE_FLAG_LINK_UP | VNET_HW_INTERFACE_FLAG_DUPLEX_MASK |
-     VNET_HW_INTERFACE_FLAG_SPEED_MASK);
-  flags &= mask;
-
-  /* Call hardware interface add/del callbacks. */
-  if (is_create)
-    call_hw_interface_add_del_callbacks (vnm, hw_if_index, is_create);
-
-  /* Already in the desired state? */
-  if (!is_create && (hi->flags & mask) == flags)
-    goto done;
-
-  /* Some interface classes do not redistribute (e.g. are local). */
-  if (!dev_class->redistribute)
-    helper_flags &= ~VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE;
-
-  if (vm->mc_main
-      && (helper_flags & VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE))
-    {
-      vnet_sw_hw_interface_state_t s;
-      s.sw_hw_if_index = hw_if_index;
-      s.flags = flags;
-      mc_serialize (vm->mc_main, &vnet_hw_interface_set_flags_msg, &s);
-    }
-
-  if ((hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) !=
-      (flags & VNET_HW_INTERFACE_FLAG_LINK_UP))
-    {
-      /* Do hardware class (e.g. ethernet). */
-      if (hw_class->link_up_down_function
-	  && (error = hw_class->link_up_down_function (vnm, hw_if_index,
-						       flags)))
-	goto done;
-
-      error = call_elf_section_interface_callbacks
-	(vnm, hw_if_index, flags, vnm->hw_interface_link_up_down_functions);
-
-      if (error)
-	goto done;
-    }
-
-  hi->flags &= ~mask;
-  hi->flags |= flags;
-
-done:
-  return error;
-}
-
-static clib_error_t *
-vnet_sw_interface_set_flags_helper (vnet_main_t * vnm, u32 sw_if_index,
-				    u32 flags, u32 helper_flags)
-{
-  vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index);
-  vlib_main_t *vm = vnm->vlib_main;
-  u32 mask;
-  clib_error_t *error = 0;
-  u32 is_create =
-    (helper_flags & VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE) != 0;
-  u32 old_flags;
-
-  mask = VNET_SW_INTERFACE_FLAG_ADMIN_UP | VNET_SW_INTERFACE_FLAG_PUNT;
-  flags &= mask;
-
-  if (is_create)
-    {
-      error =
-	call_sw_interface_add_del_callbacks (vnm, sw_if_index, is_create);
-      if (error)
-	goto done;
-
-      if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
-	{
-	  /* Notify everyone when the interface is created as admin up */
-	  error = call_elf_section_interface_callbacks (vnm, sw_if_index,
-							flags,
-							vnm->
-							sw_interface_admin_up_down_functions);
-	  if (error)
-	    goto done;
-	}
-    }
-  else
-    {
-      vnet_sw_interface_t *si_sup = si;
-
-      /* Check that super interface is in correct state. */
-      if (si->type == VNET_SW_INTERFACE_TYPE_SUB)
-	{
-	  si_sup = vnet_get_sw_interface (vnm, si->sup_sw_if_index);
-
-	  /* Check to see if we're bringing down the soft interface and if it's parent is up */
-	  if ((flags != (si_sup->flags & mask)) &&
-	      (!((flags == 0)
-		 && ((si_sup->flags & mask) ==
-		     VNET_SW_INTERFACE_FLAG_ADMIN_UP))))
-	    {
-	      error = clib_error_return (0, "super-interface %U must be %U",
-					 format_vnet_sw_interface_name, vnm,
-					 si_sup,
-					 format_vnet_sw_interface_flags,
-					 flags);
-	      goto done;
-	    }
-	}
-
-      /* Donot change state for slave link of bonded interfaces */
-      if (si->flags & VNET_SW_INTERFACE_FLAG_BOND_SLAVE)
-	{
-	  error = clib_error_return
-	    (0, "not allowed as %U belong to a BondEthernet interface",
-	     format_vnet_sw_interface_name, vnm, si);
-	  goto done;
-	}
-
-      /* Already in the desired state? */
-      if ((si->flags & mask) == flags)
-	goto done;
-
-      /* Sub-interfaces of hardware interfaces that do no redistribute,
-         do not redistribute themselves. */
-      if (si_sup->type == VNET_SW_INTERFACE_TYPE_HARDWARE)
-	{
-	  vnet_hw_interface_t *hi =
-	    vnet_get_hw_interface (vnm, si_sup->hw_if_index);
-	  vnet_device_class_t *dev_class =
-	    vnet_get_device_class (vnm, hi->dev_class_index);
-	  if (!dev_class->redistribute)
-	    helper_flags &=
-	      ~VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE;
-	}
-
-      if (vm->mc_main
-	  && (helper_flags &
-	      VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE))
-	{
-	  vnet_sw_hw_interface_state_t s;
-	  s.sw_hw_if_index = sw_if_index;
-	  s.flags = flags;
-	  mc_serialize (vm->mc_main, &vnet_sw_interface_set_flags_msg, &s);
-	}
-
-      /* set the flags now before invoking the registered clients
-       * so that the state they query is consistent with the state here notified */
-      old_flags = si->flags;
-      si->flags &= ~mask;
-      si->flags |= flags;
-      if ((flags | old_flags) & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
-	error = call_elf_section_interface_callbacks
-	  (vnm, sw_if_index, flags,
-	   vnm->sw_interface_admin_up_down_functions);
-      si->flags = old_flags;
-
-      if (error)
-	goto done;
-
-      if (si->type == VNET_SW_INTERFACE_TYPE_HARDWARE)
-	{
-	  vnet_hw_interface_t *hi =
-	    vnet_get_hw_interface (vnm, si->hw_if_index);
-	  vnet_hw_interface_class_t *hw_class =
-	    vnet_get_hw_interface_class (vnm, hi->hw_class_index);
-	  vnet_device_class_t *dev_class =
-	    vnet_get_device_class (vnm, hi->dev_class_index);
-
-	  /* save the si admin up flag */
-	  old_flags = si->flags;
-
-	  /* update si admin up flag in advance if we are going admin down */
-	  if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
-	    si->flags &= ~VNET_SW_INTERFACE_FLAG_ADMIN_UP;
-
-	  if (dev_class->admin_up_down_function
-	      && (error = dev_class->admin_up_down_function (vnm,
-							     si->hw_if_index,
-							     flags)))
-	    {
-	      /* restore si admin up flag to it's original state on errors */
-	      si->flags = old_flags;
-	      goto done;
-	    }
-
-	  if (hw_class->admin_up_down_function
-	      && (error = hw_class->admin_up_down_function (vnm,
-							    si->hw_if_index,
-							    flags)))
-	    {
-	      /* restore si admin up flag to it's original state on errors */
-	      si->flags = old_flags;
-	      goto done;
-	    }
-
-	  /* Admin down implies link down. */
-	  if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
-	      && (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP))
-	    vnet_hw_interface_set_flags_helper (vnm, si->hw_if_index,
-						hi->flags &
-						~VNET_HW_INTERFACE_FLAG_LINK_UP,
-						helper_flags);
-	}
-    }
-
-  si->flags &= ~mask;
-  si->flags |= flags;
-
-done:
-  return error;
-}
-
-clib_error_t *
-vnet_hw_interface_set_flags (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
-{
-  return vnet_hw_interface_set_flags_helper
-    (vnm, hw_if_index, flags,
-     VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE);
-}
-
-clib_error_t *
-vnet_sw_interface_set_flags (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
-{
-  return vnet_sw_interface_set_flags_helper
-    (vnm, sw_if_index, flags,
-     VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE);
-}
-
-static u32
-vnet_create_sw_interface_no_callbacks (vnet_main_t * vnm,
-				       vnet_sw_interface_t * template)
-{
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vnet_sw_interface_t *sw;
-  u32 sw_if_index;
-
-  pool_get (im->sw_interfaces, sw);
-  sw_if_index = sw - im->sw_interfaces;
-
-  sw[0] = template[0];
-
-  sw->flags = 0;
-  sw->sw_if_index = sw_if_index;
-  if (sw->type == VNET_SW_INTERFACE_TYPE_HARDWARE)
-    sw->sup_sw_if_index = sw->sw_if_index;
-
-  /* Allocate counters for this interface. */
-  {
-    u32 i;
-
-    vnet_interface_counter_lock (im);
-
-    for (i = 0; i < vec_len (im->sw_if_counters); i++)
-      {
-	vlib_validate_simple_counter (&im->sw_if_counters[i], sw_if_index);
-	vlib_zero_simple_counter (&im->sw_if_counters[i], sw_if_index);
-      }
-
-    for (i = 0; i < vec_len (im->combined_sw_if_counters); i++)
-      {
-	vlib_validate_combined_counter (&im->combined_sw_if_counters[i],
-					sw_if_index);
-	vlib_zero_combined_counter (&im->combined_sw_if_counters[i],
-				    sw_if_index);
-      }
-
-    vnet_interface_counter_unlock (im);
-  }
-
-  return sw_if_index;
-}
-
-clib_error_t *
-vnet_create_sw_interface (vnet_main_t * vnm, vnet_sw_interface_t * template,
-			  u32 * sw_if_index)
-{
-  clib_error_t *error;
-  vnet_hw_interface_t *hi;
-  vnet_device_class_t *dev_class;
-
-  hi = vnet_get_sup_hw_interface (vnm, template->sup_sw_if_index);
-  dev_class = vnet_get_device_class (vnm, hi->dev_class_index);
-
-  if (template->type == VNET_SW_INTERFACE_TYPE_SUB &&
-      dev_class->subif_add_del_function)
-    {
-      error = dev_class->subif_add_del_function (vnm, hi->hw_if_index,
-						 (struct vnet_sw_interface_t
-						  *) template, 1);
-      if (error)
-	return error;
-    }
-
-  *sw_if_index = vnet_create_sw_interface_no_callbacks (vnm, template);
-  error = vnet_sw_interface_set_flags_helper
-    (vnm, *sw_if_index, template->flags,
-     VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE);
-
-  if (error)
-    {
-      /* undo the work done by vnet_create_sw_interface_no_callbacks() */
-      vnet_interface_main_t *im = &vnm->interface_main;
-      vnet_sw_interface_t *sw =
-	pool_elt_at_index (im->sw_interfaces, *sw_if_index);
-      pool_put (im->sw_interfaces, sw);
-    }
-
-  return error;
-}
-
-void
-vnet_delete_sw_interface (vnet_main_t * vnm, u32 sw_if_index)
-{
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vnet_sw_interface_t *sw =
-    pool_elt_at_index (im->sw_interfaces, sw_if_index);
-
-  /* Make sure the interface is in L3 mode (removed from L2 BD or XConnect) */
-  vlib_main_t *vm = vlib_get_main ();
-  l2_input_config_t *config;
-  config = vec_elt_at_index (l2input_main.configs, sw_if_index);
-  if (config->xconnect)
-    set_int_l2_mode (vm, vnm, MODE_L3, config->output_sw_if_index, 0, 0, 0,
-		     0);
-  if (config->xconnect || config->bridge)
-    set_int_l2_mode (vm, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0);
-
-  /* Bring down interface in case it is up. */
-  if (sw->flags != 0)
-    vnet_sw_interface_set_flags (vnm, sw_if_index, /* flags */ 0);
-
-  call_sw_interface_add_del_callbacks (vnm, sw_if_index, /* is_create */ 0);
-
-  pool_put (im->sw_interfaces, sw);
-}
-
-static void
-setup_tx_node (vlib_main_t * vm,
-	       u32 node_index, vnet_device_class_t * dev_class)
-{
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-
-  n->function = dev_class->tx_function;
-  n->format_trace = dev_class->format_tx_trace;
-
-  vlib_register_errors (vm, node_index,
-			dev_class->tx_function_n_errors,
-			dev_class->tx_function_error_strings);
-}
-
-static void
-setup_output_node (vlib_main_t * vm,
-		   u32 node_index, vnet_hw_interface_class_t * hw_class)
-{
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  n->format_buffer = hw_class->format_header;
-  n->unformat_buffer = hw_class->unformat_header;
-}
-
-/* Register an interface instance. */
-u32
-vnet_register_interface (vnet_main_t * vnm,
-			 u32 dev_class_index,
-			 u32 dev_instance,
-			 u32 hw_class_index, u32 hw_instance)
-{
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vnet_hw_interface_t *hw;
-  vnet_device_class_t *dev_class =
-    vnet_get_device_class (vnm, dev_class_index);
-  vnet_hw_interface_class_t *hw_class =
-    vnet_get_hw_interface_class (vnm, hw_class_index);
-  vlib_main_t *vm = vnm->vlib_main;
-  vnet_feature_config_main_t *fcm;
-  vnet_config_main_t *cm;
-  u32 hw_index, i;
-  char *tx_node_name, *output_node_name;
-
-  pool_get (im->hw_interfaces, hw);
-
-  hw_index = hw - im->hw_interfaces;
-  hw->hw_if_index = hw_index;
-
-  if (dev_class->format_device_name)
-    hw->name = format (0, "%U", dev_class->format_device_name, dev_instance);
-  else if (hw_class->format_interface_name)
-    hw->name = format (0, "%U", hw_class->format_interface_name,
-		       dev_instance);
-  else
-    hw->name = format (0, "%s%x", hw_class->name, dev_instance);
-
-  if (!im->hw_interface_by_name)
-    im->hw_interface_by_name = hash_create_vec ( /* size */ 0,
-						sizeof (hw->name[0]),
-						sizeof (uword));
-
-  hash_set_mem (im->hw_interface_by_name, hw->name, hw_index);
-
-  /* Make hardware interface point to software interface. */
-  {
-    vnet_sw_interface_t sw = {
-      .type = VNET_SW_INTERFACE_TYPE_HARDWARE,
-      .flood_class = VNET_FLOOD_CLASS_NORMAL,
-      .hw_if_index = hw_index
-    };
-    hw->sw_if_index = vnet_create_sw_interface_no_callbacks (vnm, &sw);
-  }
-
-  hw->dev_class_index = dev_class_index;
-  hw->dev_instance = dev_instance;
-  hw->hw_class_index = hw_class_index;
-  hw->hw_instance = hw_instance;
-
-  hw->max_rate_bits_per_sec = 0;
-  hw->min_packet_bytes = 0;
-  hw->per_packet_overhead_bytes = 0;
-  hw->max_l3_packet_bytes[VLIB_RX] = ~0;
-  hw->max_l3_packet_bytes[VLIB_TX] = ~0;
-
-  tx_node_name = (char *) format (0, "%v-tx", hw->name);
-  output_node_name = (char *) format (0, "%v-output", hw->name);
-
-  /* If we have previously deleted interface nodes, re-use them. */
-  if (vec_len (im->deleted_hw_interface_nodes) > 0)
-    {
-      vnet_hw_interface_nodes_t *hn;
-      vnet_interface_output_runtime_t *rt;
-      vlib_node_t *node;
-      vlib_node_runtime_t *nrt;
-
-      hn = vec_end (im->deleted_hw_interface_nodes) - 1;
-
-      hw->tx_node_index = hn->tx_node_index;
-      hw->output_node_index = hn->output_node_index;
-
-      vlib_node_rename (vm, hw->tx_node_index, "%v", tx_node_name);
-      vlib_node_rename (vm, hw->output_node_index, "%v", output_node_name);
-
-      rt = vlib_node_get_runtime_data (vm, hw->output_node_index);
-      ASSERT (rt->is_deleted == 1);
-      rt->is_deleted = 0;
-      rt->hw_if_index = hw_index;
-      rt->sw_if_index = hw->sw_if_index;
-      rt->dev_instance = hw->dev_instance;
-
-      rt = vlib_node_get_runtime_data (vm, hw->tx_node_index);
-      rt->hw_if_index = hw_index;
-      rt->sw_if_index = hw->sw_if_index;
-      rt->dev_instance = hw->dev_instance;
-
-      /* The new class may differ from the old one.
-       * Functions have to be updated. */
-      node = vlib_get_node (vm, hw->output_node_index);
-      node->function = dev_class->flatten_output_chains ?
-	vnet_interface_output_node_flatten_multiarch_select () :
-	vnet_interface_output_node_multiarch_select ();
-      node->format_trace = format_vnet_interface_output_trace;
-      nrt = vlib_node_get_runtime (vm, hw->output_node_index);
-      nrt->function = node->function;
-
-      node = vlib_get_node (vm, hw->tx_node_index);
-      node->function = dev_class->tx_function;
-      node->format_trace = dev_class->format_tx_trace;
-      nrt = vlib_node_get_runtime (vm, hw->tx_node_index);
-      nrt->function = node->function;
-
-      vlib_worker_thread_node_runtime_update ();
-      _vec_len (im->deleted_hw_interface_nodes) -= 1;
-    }
-  else
-    {
-      vlib_node_registration_t r;
-      vnet_interface_output_runtime_t rt = {
-	.hw_if_index = hw_index,
-	.sw_if_index = hw->sw_if_index,
-	.dev_instance = hw->dev_instance,
-	.is_deleted = 0,
-      };
-
-      memset (&r, 0, sizeof (r));
-      r.type = VLIB_NODE_TYPE_INTERNAL;
-      r.runtime_data = &rt;
-      r.runtime_data_bytes = sizeof (rt);
-      r.scalar_size = 0;
-      r.vector_size = sizeof (u32);
-
-      r.flags = VLIB_NODE_FLAG_IS_OUTPUT;
-      r.name = tx_node_name;
-      r.function = dev_class->tx_function;
-
-      hw->tx_node_index = vlib_register_node (vm, &r);
-
-      vlib_node_add_named_next_with_slot (vm, hw->tx_node_index,
-					  "error-drop",
-					  VNET_INTERFACE_TX_NEXT_DROP);
-
-      r.flags = 0;
-      r.name = output_node_name;
-      r.function = dev_class->flatten_output_chains ?
-	vnet_interface_output_node_flatten_multiarch_select () :
-	vnet_interface_output_node_multiarch_select ();
-      r.format_trace = format_vnet_interface_output_trace;
-
-      {
-	static char *e[] = {
-	  "interface is down",
-	  "interface is deleted",
-	};
-
-	r.n_errors = ARRAY_LEN (e);
-	r.error_strings = e;
-      }
-      hw->output_node_index = vlib_register_node (vm, &r);
-
-      vlib_node_add_named_next_with_slot (vm, hw->output_node_index,
-					  "error-drop",
-					  VNET_INTERFACE_OUTPUT_NEXT_DROP);
-      vlib_node_add_next_with_slot (vm, hw->output_node_index,
-				    hw->tx_node_index,
-				    VNET_INTERFACE_OUTPUT_NEXT_TX);
-
-      /* add interface to the list of "output-interface" feature arc start nodes
-         and clone nexts from 1st interface if it exists */
-      fcm = vnet_feature_get_config_main (im->output_feature_arc_index);
-      cm = &fcm->config_main;
-      i = vec_len (cm->start_node_indices);
-      vec_validate (cm->start_node_indices, i);
-      cm->start_node_indices[i] = hw->output_node_index;
-      if (hw_index)
-	{
-	  /* copy nexts from 1st interface */
-	  vnet_hw_interface_t *first_hw;
-	  vlib_node_t *first_node;
-
-	  first_hw = vnet_get_hw_interface (vnm, /* hw_if_index */ 0);
-	  first_node = vlib_get_node (vm, first_hw->output_node_index);
-
-	  /* 1st 2 nexts are already added above */
-	  for (i = 2; i < vec_len (first_node->next_nodes); i++)
-	    vlib_node_add_next_with_slot (vm, hw->output_node_index,
-					  first_node->next_nodes[i], i);
-	}
-    }
-
-  setup_output_node (vm, hw->output_node_index, hw_class);
-  setup_tx_node (vm, hw->tx_node_index, dev_class);
-
-  /* Call all up/down callbacks with zero flags when interface is created. */
-  vnet_sw_interface_set_flags_helper (vnm, hw->sw_if_index, /* flags */ 0,
-				      VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE);
-  vnet_hw_interface_set_flags_helper (vnm, hw_index, /* flags */ 0,
-				      VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE);
-
-  return hw_index;
-}
-
-void
-vnet_delete_hw_interface (vnet_main_t * vnm, u32 hw_if_index)
-{
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  vlib_main_t *vm = vnm->vlib_main;
-
-  /* If it is up, mark it down. */
-  if (hw->flags != 0)
-    vnet_hw_interface_set_flags (vnm, hw_if_index, /* flags */ 0);
-
-  /* Call delete callbacks. */
-  call_hw_interface_add_del_callbacks (vnm, hw_if_index, /* is_create */ 0);
-
-  /* Delete software interface corresponding to hardware interface. */
-  vnet_delete_sw_interface (vnm, hw->sw_if_index);
-
-  /* Delete any sub-interfaces. */
-  {
-    u32 id, sw_if_index;
-    /* *INDENT-OFF* */
-    hash_foreach (id, sw_if_index, hw->sub_interface_sw_if_index_by_id, ({
-      vnet_delete_sw_interface (vnm, sw_if_index);
-    }));
-    /* *INDENT-ON* */
-  }
-
-  {
-    vnet_hw_interface_nodes_t *dn;
-    vnet_interface_output_runtime_t *rt =
-      vlib_node_get_runtime_data (vm, hw->output_node_index);
-
-    /* Mark node runtime as deleted so output node (if called) will drop packets. */
-    rt->is_deleted = 1;
-
-    vlib_node_rename (vm, hw->output_node_index,
-		      "interface-%d-output-deleted", hw_if_index);
-    vlib_node_rename (vm, hw->tx_node_index, "interface-%d-tx-deleted",
-		      hw_if_index);
-    vec_add2 (im->deleted_hw_interface_nodes, dn, 1);
-    dn->tx_node_index = hw->tx_node_index;
-    dn->output_node_index = hw->output_node_index;
-  }
-
-  hash_unset_mem (im->hw_interface_by_name, hw->name);
-  vec_free (hw->name);
-
-  pool_put (im->hw_interfaces, hw);
-}
-
-void
-vnet_hw_interface_walk_sw (vnet_main_t * vnm,
-			   u32 hw_if_index,
-			   vnet_hw_sw_interface_walk_t fn, void *ctx)
-{
-  vnet_hw_interface_t *hi;
-  u32 id, sw_if_index;
-
-  hi = vnet_get_hw_interface (vnm, hw_if_index);
-  /* the super first, then the and sub interfaces */
-  fn (vnm, hi->sw_if_index, ctx);
-
-  /* *INDENT-OFF* */
-  hash_foreach (id, sw_if_index,
-                hi->sub_interface_sw_if_index_by_id,
-  ({
-    fn (vnm, sw_if_index, ctx);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-serialize_vnet_hw_interface_set_class (serialize_main_t * m, va_list * va)
-{
-  u32 hw_if_index = va_arg (*va, u32);
-  char *hw_class_name = va_arg (*va, char *);
-  serialize_integer (m, hw_if_index, sizeof (hw_if_index));
-  serialize_cstring (m, hw_class_name);
-}
-
-static void
-unserialize_vnet_hw_interface_set_class (serialize_main_t * m, va_list * va)
-{
-  CLIB_UNUSED (mc_main_t * mc) = va_arg (*va, mc_main_t *);
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 hw_if_index;
-  char *hw_class_name;
-  uword *p;
-  clib_error_t *error;
-
-  unserialize_integer (m, &hw_if_index, sizeof (hw_if_index));
-  unserialize_cstring (m, &hw_class_name);
-  p =
-    hash_get (vnm->interface_main.hw_interface_class_by_name, hw_class_name);
-  ASSERT (p != 0);
-  error = vnet_hw_interface_set_class_helper (vnm, hw_if_index, p[0],
-					      /* redistribute */ 0);
-  if (error)
-    clib_error_report (error);
-}
-
-MC_SERIALIZE_MSG (vnet_hw_interface_set_class_msg, static) =
-{
-.name = "vnet_hw_interface_set_class",.serialize =
-    serialize_vnet_hw_interface_set_class,.unserialize =
-    unserialize_vnet_hw_interface_set_class,};
-
-void
-vnet_hw_interface_init_for_class (vnet_main_t * vnm, u32 hw_if_index,
-				  u32 hw_class_index, u32 hw_instance)
-{
-  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
-  vnet_hw_interface_class_t *hc =
-    vnet_get_hw_interface_class (vnm, hw_class_index);
-
-  hi->hw_class_index = hw_class_index;
-  hi->hw_instance = hw_instance;
-  setup_output_node (vnm->vlib_main, hi->output_node_index, hc);
-}
-
-static clib_error_t *
-vnet_hw_interface_set_class_helper (vnet_main_t * vnm, u32 hw_if_index,
-				    u32 hw_class_index, u32 redistribute)
-{
-  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
-  vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, hi->sw_if_index);
-  vnet_hw_interface_class_t *old_class =
-    vnet_get_hw_interface_class (vnm, hi->hw_class_index);
-  vnet_hw_interface_class_t *new_class =
-    vnet_get_hw_interface_class (vnm, hw_class_index);
-  vnet_device_class_t *dev_class =
-    vnet_get_device_class (vnm, hi->dev_class_index);
-  clib_error_t *error = 0;
-
-  /* New class equals old class?  Nothing to do. */
-  if (hi->hw_class_index == hw_class_index)
-    return 0;
-
-  /* No need (and incorrect since admin up flag may be set) to do error checking when
-     receiving unserialize message. */
-  if (redistribute)
-    {
-      if (si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
-	return clib_error_return (0,
-				  "%v must be admin down to change class from %s to %s",
-				  hi->name, old_class->name, new_class->name);
-
-      /* Make sure interface supports given class. */
-      if ((new_class->is_valid_class_for_interface
-	   && !new_class->is_valid_class_for_interface (vnm, hw_if_index,
-							hw_class_index))
-	  || (dev_class->is_valid_class_for_interface
-	      && !dev_class->is_valid_class_for_interface (vnm, hw_if_index,
-							   hw_class_index)))
-	return clib_error_return (0,
-				  "%v class cannot be changed from %s to %s",
-				  hi->name, old_class->name, new_class->name);
-
-      if (vnm->vlib_main->mc_main)
-	{
-	  mc_serialize (vnm->vlib_main->mc_main,
-			&vnet_hw_interface_set_class_msg, hw_if_index,
-			new_class->name);
-	  return 0;
-	}
-    }
-
-  if (old_class->hw_class_change)
-    old_class->hw_class_change (vnm, hw_if_index, old_class->index,
-				new_class->index);
-
-  vnet_hw_interface_init_for_class (vnm, hw_if_index, new_class->index,
-				    /* instance */ ~0);
-
-  if (new_class->hw_class_change)
-    new_class->hw_class_change (vnm, hw_if_index, old_class->index,
-				new_class->index);
-
-  if (dev_class->hw_class_change)
-    dev_class->hw_class_change (vnm, hw_if_index, new_class->index);
-
-  return error;
-}
-
-clib_error_t *
-vnet_hw_interface_set_class (vnet_main_t * vnm, u32 hw_if_index,
-			     u32 hw_class_index)
-{
-  return vnet_hw_interface_set_class_helper (vnm, hw_if_index, hw_class_index,
-					     /* redistribute */ 1);
-}
-
-static int
-vnet_hw_interface_rx_redirect_to_node_helper (vnet_main_t * vnm,
-					      u32 hw_if_index,
-					      u32 node_index,
-					      u32 redistribute)
-{
-  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
-  vnet_device_class_t *dev_class = vnet_get_device_class
-    (vnm, hi->dev_class_index);
-
-  if (redistribute)
-    {
-      /* $$$$ fixme someday maybe */
-      ASSERT (vnm->vlib_main->mc_main == 0);
-    }
-  if (dev_class->rx_redirect_to_node)
-    {
-      dev_class->rx_redirect_to_node (vnm, hw_if_index, node_index);
-      return 0;
-    }
-
-  return VNET_API_ERROR_UNIMPLEMENTED;
-}
-
-int
-vnet_hw_interface_rx_redirect_to_node (vnet_main_t * vnm, u32 hw_if_index,
-				       u32 node_index)
-{
-  return vnet_hw_interface_rx_redirect_to_node_helper (vnm, hw_if_index,
-						       node_index,
-						       1 /* redistribute */ );
-}
-
-word
-vnet_sw_interface_compare (vnet_main_t * vnm,
-			   uword sw_if_index0, uword sw_if_index1)
-{
-  vnet_sw_interface_t *sup0 = vnet_get_sup_sw_interface (vnm, sw_if_index0);
-  vnet_sw_interface_t *sup1 = vnet_get_sup_sw_interface (vnm, sw_if_index1);
-  vnet_hw_interface_t *h0 = vnet_get_hw_interface (vnm, sup0->hw_if_index);
-  vnet_hw_interface_t *h1 = vnet_get_hw_interface (vnm, sup1->hw_if_index);
-
-  if (h0 != h1)
-    return vec_cmp (h0->name, h1->name);
-  return (word) h0->hw_instance - (word) h1->hw_instance;
-}
-
-word
-vnet_hw_interface_compare (vnet_main_t * vnm,
-			   uword hw_if_index0, uword hw_if_index1)
-{
-  vnet_hw_interface_t *h0 = vnet_get_hw_interface (vnm, hw_if_index0);
-  vnet_hw_interface_t *h1 = vnet_get_hw_interface (vnm, hw_if_index1);
-
-  if (h0 != h1)
-    return vec_cmp (h0->name, h1->name);
-  return (word) h0->hw_instance - (word) h1->hw_instance;
-}
-
-int
-vnet_sw_interface_is_p2p (vnet_main_t * vnm, u32 sw_if_index)
-{
-  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  vnet_hw_interface_class_t *hc =
-    vnet_get_hw_interface_class (vnm, hw->hw_class_index);
-
-  return (hc->flags & VNET_HW_INTERFACE_CLASS_FLAG_P2P);
-}
-
-clib_error_t *
-vnet_interface_init (vlib_main_t * vm)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vlib_buffer_t *b = 0;
-  vnet_buffer_opaque_t *o = 0;
-
-  /*
-   * Keep people from shooting themselves in the foot.
-   */
-  if (sizeof (b->opaque) != sizeof (vnet_buffer_opaque_t))
-    {
-#define _(a) if (sizeof(o->a) > sizeof (o->unused))                     \
-      clib_warning                                                      \
-        ("FATAL: size of opaque union subtype %s is %d (max %d)",       \
-         #a, sizeof(o->a), sizeof (o->unused));
-      foreach_buffer_opaque_union_subtype;
-#undef _
-
-      return clib_error_return
-	(0, "FATAL: size of vlib buffer opaque %d, size of vnet opaque %d",
-	 sizeof (b->opaque), sizeof (vnet_buffer_opaque_t));
-    }
-
-  im->sw_if_counter_lock = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
-						   CLIB_CACHE_LINE_BYTES);
-  im->sw_if_counter_lock[0] = 1;	/* should be no need */
-
-  vec_validate (im->sw_if_counters, VNET_N_SIMPLE_INTERFACE_COUNTER - 1);
-  im->sw_if_counters[VNET_INTERFACE_COUNTER_DROP].name = "drops";
-  im->sw_if_counters[VNET_INTERFACE_COUNTER_PUNT].name = "punts";
-  im->sw_if_counters[VNET_INTERFACE_COUNTER_IP4].name = "ip4";
-  im->sw_if_counters[VNET_INTERFACE_COUNTER_IP6].name = "ip6";
-  im->sw_if_counters[VNET_INTERFACE_COUNTER_RX_NO_BUF].name = "rx-no-buf";
-  im->sw_if_counters[VNET_INTERFACE_COUNTER_RX_MISS].name = "rx-miss";
-  im->sw_if_counters[VNET_INTERFACE_COUNTER_RX_ERROR].name = "rx-error";
-  im->sw_if_counters[VNET_INTERFACE_COUNTER_TX_ERROR].name = "tx-error";
-
-  vec_validate (im->combined_sw_if_counters,
-		VNET_N_COMBINED_INTERFACE_COUNTER - 1);
-  im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_RX].name = "rx";
-  im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_TX].name = "tx";
-
-  im->sw_if_counter_lock[0] = 0;
-
-  im->device_class_by_name = hash_create_string ( /* size */ 0,
-						 sizeof (uword));
-  {
-    vnet_device_class_t *c;
-
-    c = vnm->device_class_registrations;
-
-    while (c)
-      {
-	c->index = vec_len (im->device_classes);
-	hash_set_mem (im->device_class_by_name, c->name, c->index);
-	vec_add1 (im->device_classes, c[0]);
-	c = c->next_class_registration;
-      }
-  }
-
-  im->hw_interface_class_by_name = hash_create_string ( /* size */ 0,
-						       sizeof (uword));
-
-  im->sw_if_index_by_sup_and_sub = hash_create_mem (0, sizeof (u64),
-						    sizeof (uword));
-  {
-    vnet_hw_interface_class_t *c;
-
-    c = vnm->hw_interface_class_registrations;
-
-    while (c)
-      {
-	c->index = vec_len (im->hw_interface_classes);
-	hash_set_mem (im->hw_interface_class_by_name, c->name, c->index);
-
-	if (NULL == c->build_rewrite)
-	  c->build_rewrite = default_build_rewrite;
-	if (NULL == c->update_adjacency)
-	  c->update_adjacency = default_update_adjacency;
-
-	vec_add1 (im->hw_interface_classes, c[0]);
-	c = c->next_class_registration;
-      }
-  }
-
-  {
-    clib_error_t *error;
-
-    if ((error = vlib_call_init_function (vm, vnet_interface_cli_init)))
-      return error;
-
-    return error;
-  }
-  vnm->interface_tag_by_sw_if_index = hash_create (0, sizeof (uword));
-}
-
-VLIB_INIT_FUNCTION (vnet_interface_init);
-
-/* Kludge to renumber interface names [only!] */
-int
-vnet_interface_name_renumber (u32 sw_if_index, u32 new_show_dev_instance)
-{
-  int rv;
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
-
-  vnet_device_class_t *dev_class = vnet_get_device_class
-    (vnm, hi->dev_class_index);
-
-  if (dev_class->name_renumber == 0 || dev_class->format_device_name == 0)
-    return VNET_API_ERROR_UNIMPLEMENTED;
-
-  rv = dev_class->name_renumber (hi, new_show_dev_instance);
-
-  if (rv)
-    return rv;
-
-  hash_unset_mem (im->hw_interface_by_name, hi->name);
-  vec_free (hi->name);
-  /* Use the mapping we set up to call it Ishmael */
-  hi->name = format (0, "%U", dev_class->format_device_name,
-		     hi->dev_instance);
-
-  hash_set_mem (im->hw_interface_by_name, hi->name, hi->hw_if_index);
-  return rv;
-}
-
-clib_error_t *
-vnet_rename_interface (vnet_main_t * vnm, u32 hw_if_index, char *new_name)
-{
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vlib_main_t *vm = vnm->vlib_main;
-  vnet_hw_interface_t *hw;
-  u8 *old_name;
-  clib_error_t *error = 0;
-
-  hw = vnet_get_hw_interface (vnm, hw_if_index);
-  if (!hw)
-    {
-      return clib_error_return (0,
-				"unable to find hw interface for index %u",
-				hw_if_index);
-    }
-
-  old_name = hw->name;
-
-  /* set new hw->name */
-  hw->name = format (0, "%s", new_name);
-
-  /* remove the old name to hw_if_index mapping and install the new one */
-  hash_unset_mem (im->hw_interface_by_name, old_name);
-  hash_set_mem (im->hw_interface_by_name, hw->name, hw_if_index);
-
-  /* rename tx/output nodes */
-  vlib_node_rename (vm, hw->tx_node_index, "%v-tx", hw->name);
-  vlib_node_rename (vm, hw->output_node_index, "%v-output", hw->name);
-
-  /* free the old name vector */
-  vec_free (old_name);
-
-  return error;
-}
-
-static clib_error_t *
-vnet_hw_interface_change_mac_address_helper (vnet_main_t * vnm,
-					     u32 hw_if_index, u64 mac_address)
-{
-  clib_error_t *error = 0;
-  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
-
-  if (hi->hw_address)
-    {
-      vnet_device_class_t *dev_class =
-	vnet_get_device_class (vnm, hi->dev_class_index);
-      if (dev_class->mac_addr_change_function)
-	{
-	  error =
-	    dev_class->mac_addr_change_function (hi, (char *) &mac_address);
-	}
-      if (!error)
-	{
-	  vnet_hw_interface_class_t *hw_class;
-
-	  hw_class = vnet_get_hw_interface_class (vnm, hi->hw_class_index);
-
-	  if (NULL != hw_class->mac_addr_change_function)
-	    hw_class->mac_addr_change_function (hi, (char *) &mac_address);
-	}
-      else
-	{
-	  error =
-	    clib_error_return (0,
-			       "MAC Address Change is not supported on this interface");
-	}
-    }
-  else
-    {
-      error =
-	clib_error_return (0,
-			   "mac address change is not supported for interface index %u",
-			   hw_if_index);
-    }
-  return error;
-}
-
-clib_error_t *
-vnet_hw_interface_change_mac_address (vnet_main_t * vnm, u32 hw_if_index,
-				      u64 mac_address)
-{
-  return vnet_hw_interface_change_mac_address_helper
-    (vnm, hw_if_index, mac_address);
-}
-
-vnet_l3_packet_type_t
-vnet_link_to_l3_proto (vnet_link_t link)
-{
-  switch (link)
-    {
-    case VNET_LINK_IP4:
-      return (VNET_L3_PACKET_TYPE_IP4);
-    case VNET_LINK_IP6:
-      return (VNET_L3_PACKET_TYPE_IP6);
-    case VNET_LINK_MPLS:
-      return (VNET_L3_PACKET_TYPE_MPLS_UNICAST);
-    case VNET_LINK_ARP:
-      return (VNET_L3_PACKET_TYPE_ARP);
-    case VNET_LINK_ETHERNET:
-      ASSERT (0);
-      break;
-    }
-  ASSERT (0);
-  return (0);
-}
-
-u8 *
-default_build_rewrite (vnet_main_t * vnm,
-		       u32 sw_if_index,
-		       vnet_link_t link_type, const void *dst_address)
-{
-  return (NULL);
-}
-
-void
-default_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
-{
-  u8 *rewrite;
-
-  rewrite = vnet_build_rewrite_for_sw_interface (vnm, sw_if_index,
-						 adj_get_link_type (ai),
-						 NULL);
-
-  adj_nbr_update_rewrite (ai, ADJ_NBR_REWRITE_FLAG_COMPLETE, rewrite);
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/interface.h b/vnet/vnet/interface.h
deleted file mode 100644
index d42e5fda..00000000
--- a/vnet/vnet/interface.h
+++ /dev/null
@@ -1,658 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * interface.h: VNET interfaces/sub-interfaces
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vnet_interface_h
-#define included_vnet_interface_h
-
-#include <vnet/unix/pcap.h>
-#include <vnet/l3_types.h>
-
-struct vnet_main_t;
-struct vnet_hw_interface_t;
-struct vnet_sw_interface_t;
-struct ip46_address_t;
-
-/* Interface up/down callback. */
-typedef clib_error_t *(vnet_interface_function_t)
-  (struct vnet_main_t * vnm, u32 if_index, u32 flags);
-
-/* Sub-interface add/del callback. */
-typedef clib_error_t *(vnet_subif_add_del_function_t)
-  (struct vnet_main_t * vnm, u32 if_index,
-   struct vnet_sw_interface_t * template, int is_add);
-
-/* Interface set mac address callback. */
-typedef clib_error_t *(vnet_interface_set_mac_address_function_t)
-  (struct vnet_hw_interface_t * hi, char *address);
-
-typedef enum vnet_interface_function_priority_t_
-{
-  VNET_ITF_FUNC_PRIORITY_LOW,
-  VNET_ITF_FUNC_PRIORITY_HIGH,
-} vnet_interface_function_priority_t;
-#define VNET_ITF_FUNC_N_PRIO ((vnet_interface_function_priority_t)VNET_ITF_FUNC_PRIORITY_HIGH+1)
-
-typedef struct _vnet_interface_function_list_elt
-{
-  struct _vnet_interface_function_list_elt *next_interface_function;
-  clib_error_t *(*fp) (struct vnet_main_t * vnm, u32 if_index, u32 flags);
-} _vnet_interface_function_list_elt_t;
-
-#define _VNET_INTERFACE_FUNCTION_DECL(f,tag)                            \
-                                                                        \
-static void __vnet_interface_function_init_##tag##_##f (void)           \
-    __attribute__((__constructor__)) ;                                  \
-                                                                        \
-static void __vnet_interface_function_init_##tag##_##f (void)           \
-{                                                                       \
- vnet_main_t * vnm = vnet_get_main();                                   \
- static _vnet_interface_function_list_elt_t init_function;              \
- init_function.next_interface_function =                                \
-   vnm->tag##_functions[VNET_ITF_FUNC_PRIORITY_LOW];                    \
- vnm->tag##_functions[VNET_ITF_FUNC_PRIORITY_LOW] = &init_function;     \
- init_function.fp = (void *) &f;                                        \
-}
-
-#define _VNET_INTERFACE_FUNCTION_DECL_PRIO(f,tag,p)                    \
-                                                                        \
-static void __vnet_interface_function_init_##tag##_##f (void)           \
-    __attribute__((__constructor__)) ;                                  \
-                                                                        \
-static void __vnet_interface_function_init_##tag##_##f (void)           \
-{                                                                       \
- vnet_main_t * vnm = vnet_get_main();                                   \
- static _vnet_interface_function_list_elt_t init_function;              \
- init_function.next_interface_function = vnm->tag##_functions[p];       \
- vnm->tag##_functions[p] = &init_function;                              \
- init_function.fp = (void *) &f;                                        \
-}
-
-#define VNET_HW_INTERFACE_ADD_DEL_FUNCTION(f)			\
-  _VNET_INTERFACE_FUNCTION_DECL(f,hw_interface_add_del)
-#define VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION(f)		\
-  _VNET_INTERFACE_FUNCTION_DECL(f,hw_interface_link_up_down)
-#define VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION_PRIO(f,p)        \
-  _VNET_INTERFACE_FUNCTION_DECL_PRIO(f,hw_interface_link_up_down,p)
-#define VNET_SW_INTERFACE_ADD_DEL_FUNCTION(f)			\
-  _VNET_INTERFACE_FUNCTION_DECL(f,sw_interface_add_del)
-#define VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION(f)		\
-  _VNET_INTERFACE_FUNCTION_DECL(f,sw_interface_admin_up_down)
-#define VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION_PRIO(f,p)     	\
-  _VNET_INTERFACE_FUNCTION_DECL_PRIO(f,sw_interface_admin_up_down, p)
-
-/* A class of hardware interface devices. */
-typedef struct _vnet_device_class
-{
-  /* Index into main vector. */
-  u32 index;
-
-  /* Device name (e.g. "FOOBAR 1234a"). */
-  char *name;
-
-  /* Function to call when hardware interface is added/deleted. */
-  vnet_interface_function_t *interface_add_del_function;
-
-  /* Function to bring device administratively up/down. */
-  vnet_interface_function_t *admin_up_down_function;
-
-  /* Function to call when sub-interface is added/deleted */
-  vnet_subif_add_del_function_t *subif_add_del_function;
-
-  /* Redistribute flag changes/existence of this interface class. */
-  u32 redistribute;
-
-  /* Transmit function. */
-  vlib_node_function_t *tx_function;
-
-  /* Error strings indexed by error code for this node. */
-  char **tx_function_error_strings;
-
-  /* Number of error codes used by this node. */
-  u32 tx_function_n_errors;
-
-  /* Renumber device name [only!] support, a control-plane kludge */
-  int (*name_renumber) (struct vnet_hw_interface_t * hi,
-			u32 new_dev_instance);
-
-  /* Format device instance as name. */
-  format_function_t *format_device_name;
-
-  /* Parse function for device name. */
-  unformat_function_t *unformat_device_name;
-
-  /* Format device verbosely for this class. */
-  format_function_t *format_device;
-
-  /* Trace buffer format for TX function. */
-  format_function_t *format_tx_trace;
-
-  /* Function to clear hardware counters for device. */
-  void (*clear_counters) (u32 dev_class_instance);
-
-    uword (*is_valid_class_for_interface) (struct vnet_main_t * vnm,
-					   u32 hw_if_index,
-					   u32 hw_class_index);
-
-  /* Called when hardware class of an interface changes. */
-  void (*hw_class_change) (struct vnet_main_t * vnm,
-			   u32 hw_if_index, u32 new_hw_class_index);
-
-  /* Called to redirect traffic from a specific interface instance */
-  void (*rx_redirect_to_node) (struct vnet_main_t * vnm,
-			       u32 hw_if_index, u32 node_index);
-
-  /* Link-list of all device classes set up by constructors created below */
-  struct _vnet_device_class *next_class_registration;
-
-  /* Splice vnet_interface_output_node into TX path */
-  u8 flatten_output_chains;
-
-  /* Function to set mac address. */
-  vnet_interface_set_mac_address_function_t *mac_addr_change_function;
-} vnet_device_class_t;
-
-#define VNET_DEVICE_CLASS(x,...)                                        \
-  __VA_ARGS__ vnet_device_class_t x;                                    \
-static void __vnet_add_device_class_registration_##x (void)             \
-    __attribute__((__constructor__)) ;                                  \
-static void __vnet_add_device_class_registration_##x (void)             \
-{                                                                       \
-    vnet_main_t * vnm = vnet_get_main();                                \
-    x.next_class_registration = vnm->device_class_registrations;        \
-    vnm->device_class_registrations = &x;                               \
-}                                                                       \
-__VA_ARGS__ vnet_device_class_t x
-
-#define VLIB_DEVICE_TX_FUNCTION_CLONE_TEMPLATE(arch, fn, tgt)		\
-  uword									\
-  __attribute__ ((flatten))						\
-  __attribute__ ((target (tgt)))					\
-  CLIB_CPU_OPTIMIZED							\
-  fn ## _ ## arch ( vlib_main_t * vm,					\
-                   vlib_node_runtime_t * node,				\
-                   vlib_frame_t * frame)				\
-  { return fn (vm, node, frame); }
-
-#define VLIB_DEVICE_TX_FUNCTION_MULTIARCH_CLONE(fn)			\
-  foreach_march_variant(VLIB_DEVICE_TX_FUNCTION_CLONE_TEMPLATE, fn)
-
-#if CLIB_DEBUG > 0
-#define VLIB_MULTIARCH_CLONE_AND_SELECT_FN(fn,...)
-#define VLIB_DEVICE_TX_FUNCTION_MULTIARCH(dev, fn)
-#else
-#define VLIB_DEVICE_TX_FUNCTION_MULTIARCH(dev, fn)			\
-  VLIB_DEVICE_TX_FUNCTION_MULTIARCH_CLONE(fn)				\
-  CLIB_MULTIARCH_SELECT_FN(fn, static inline)				\
-  static void __attribute__((__constructor__))				\
-  __vlib_device_tx_function_multiarch_select_##dev (void)		\
-  { dev.tx_function = fn ## _multiarch_select(); }
-#endif
-
-/**
- * Link Type: A description of the protocol of packets on the link.
- * On an ethernet link this maps directly into the ethertype. On a GRE tunnel
- * it maps to the GRE-proto, etc for other lnk types.
- */
-typedef enum vnet_link_t_
-{
-#if CLIB_DEBUG > 0
-  VNET_LINK_IP4 = 1,
-#else
-  VNET_LINK_IP4 = 0,
-#endif
-  VNET_LINK_IP6,
-  VNET_LINK_MPLS,
-  VNET_LINK_ETHERNET,
-  VNET_LINK_ARP,
-} __attribute__ ((packed)) vnet_link_t;
-
-#define VNET_LINKS {                   \
-    [VNET_LINK_ETHERNET] = "ethernet", \
-    [VNET_LINK_IP4] = "ipv4",          \
-    [VNET_LINK_IP6] = "ipv6",          \
-    [VNET_LINK_MPLS] = "mpls",         \
-    [VNET_LINK_ARP] = "arp",	       \
-}
-
-/**
- * @brief Number of link types. Not part of the enum so it does not have to be included in
- * switch statements
- */
-#define VNET_LINK_NUM (VNET_LINK_ARP+1)
-
-/**
- * @brief Convert a link to to an Ethertype
- */
-extern vnet_l3_packet_type_t vnet_link_to_l3_proto (vnet_link_t link);
-
-/**
- * @brief Attributes assignable to a HW interface Class.
- */
-typedef enum vnet_hw_interface_class_flags_t_
-{
-  /**
-   * @brief a point 2 point interface
-   */
-  VNET_HW_INTERFACE_CLASS_FLAG_P2P = (1 << 0),
-} vnet_hw_interface_class_flags_t;
-
-/* Layer-2 (e.g. Ethernet) interface class. */
-typedef struct _vnet_hw_interface_class
-{
-  /* Index into main vector. */
-  u32 index;
-
-  /* Class name (e.g. "Ethernet"). */
-  char *name;
-
-  /* Flags */
-  vnet_hw_interface_class_flags_t flags;
-
-  /* Function to call when hardware interface is added/deleted. */
-  vnet_interface_function_t *interface_add_del_function;
-
-  /* Function to bring interface administratively up/down. */
-  vnet_interface_function_t *admin_up_down_function;
-
-  /* Function to call when link state changes. */
-  vnet_interface_function_t *link_up_down_function;
-
-  /* Function to call when link MAC changes. */
-  vnet_interface_set_mac_address_function_t *mac_addr_change_function;
-
-  /* Format function to display interface name. */
-  format_function_t *format_interface_name;
-
-  /* Format function to display interface address. */
-  format_function_t *format_address;
-
-  /* Format packet header for this interface class. */
-  format_function_t *format_header;
-
-  /* Format device verbosely for this class. */
-  format_function_t *format_device;
-
-  /* Parser for hardware (e.g. ethernet) address. */
-  unformat_function_t *unformat_hw_address;
-
-  /* Parser for packet header for e.g. rewrite string. */
-  unformat_function_t *unformat_header;
-
-  /* Builds a rewrite string for the interface to the destination
-   * for the payload/link type. */
-  u8 *(*build_rewrite) (struct vnet_main_t * vnm,
-			u32 sw_if_index,
-			vnet_link_t link_type, const void *dst_hw_address);
-
-  /* Update an adjacecny added by FIB (as opposed to via the
-   * neighbour resolution protocol). */
-  void (*update_adjacency) (struct vnet_main_t * vnm,
-			    u32 sw_if_index, u32 adj_index);
-
-    uword (*is_valid_class_for_interface) (struct vnet_main_t * vnm,
-					   u32 hw_if_index,
-					   u32 hw_class_index);
-
-  /* Called when hw interface class is changed and old hardware instance
-     may want to be deleted. */
-  void (*hw_class_change) (struct vnet_main_t * vnm, u32 hw_if_index,
-			   u32 old_class_index, u32 new_class_index);
-
-  /* List of hw interface classes, built by constructors */
-  struct _vnet_hw_interface_class *next_class_registration;
-
-} vnet_hw_interface_class_t;
-
-/**
- * @brief Return a complete, zero-length (aka dummy) rewrite
- */
-extern u8 *default_build_rewrite (struct vnet_main_t *vnm,
-				  u32 sw_if_index,
-				  vnet_link_t link_type,
-				  const void *dst_hw_address);
-
-/**
- * @brief Default adjacency update function
- */
-extern void default_update_adjacency (struct vnet_main_t *vnm,
-				      u32 sw_if_index, u32 adj_index);
-
-#define VNET_HW_INTERFACE_CLASS(x,...)                                  \
-  __VA_ARGS__ vnet_hw_interface_class_t x;                              \
-static void __vnet_add_hw_interface_class_registration_##x (void)       \
-    __attribute__((__constructor__)) ;                                  \
-static void __vnet_add_hw_interface_class_registration_##x (void)       \
-{                                                                       \
-    vnet_main_t * vnm = vnet_get_main();                                \
-    x.next_class_registration = vnm->hw_interface_class_registrations;  \
-    vnm->hw_interface_class_registrations = &x;                         \
-}                                                                       \
-__VA_ARGS__ vnet_hw_interface_class_t x
-
-/* Hardware-interface.  This corresponds to a physical wire
-   that packets flow over. */
-typedef struct vnet_hw_interface_t
-{
-  /* Interface name. */
-  u8 *name;
-
-  u32 flags;
-  /* Hardware link state is up. */
-#define VNET_HW_INTERFACE_FLAG_LINK_UP		(1 << 0)
-  /* Hardware duplex state */
-#define VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT	1
-#define VNET_HW_INTERFACE_FLAG_HALF_DUPLEX	(1 << 1)
-#define VNET_HW_INTERFACE_FLAG_FULL_DUPLEX	(1 << 2)
-#define VNET_HW_INTERFACE_FLAG_DUPLEX_MASK	\
-  (VNET_HW_INTERFACE_FLAG_HALF_DUPLEX |		\
-   VNET_HW_INTERFACE_FLAG_FULL_DUPLEX)
-
-  /* Hardware link speed */
-#define VNET_HW_INTERFACE_FLAG_SPEED_SHIFT	3
-#define VNET_HW_INTERFACE_FLAG_SPEED_10M	(1 << 3)
-#define VNET_HW_INTERFACE_FLAG_SPEED_100M	(1 << 4)
-#define VNET_HW_INTERFACE_FLAG_SPEED_1G		(1 << 5)
-#define VNET_HW_INTERFACE_FLAG_SPEED_10G	(1 << 6)
-#define VNET_HW_INTERFACE_FLAG_SPEED_40G	(1 << 7)
-#define VNET_HW_INTERFACE_FLAG_SPEED_100G	(1 << 8)
-#define VNET_HW_INTERFACE_FLAG_SPEED_MASK	\
-  (VNET_HW_INTERFACE_FLAG_SPEED_10M |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_100M |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_1G |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_10G |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_40G |		\
-   VNET_HW_INTERFACE_FLAG_SPEED_100G)
-
-  /* l2output node flags */
-#define VNET_HW_INTERFACE_FLAG_L2OUTPUT_SHIFT	9
-#define VNET_HW_INTERFACE_FLAG_L2OUTPUT_MAPPED	(1 << 9)
-
-  /* Hardware address as vector.  Zero (e.g. zero-length vector) if no
-     address for this class (e.g. PPP). */
-  u8 *hw_address;
-
-  /* Interface is up as far as software is concerned. */
-  /* NAME.{output,tx} nodes for this interface. */
-  u32 output_node_index, tx_node_index;
-
-  /* (dev_class, dev_instance) uniquely identifies hw interface. */
-  u32 dev_class_index;
-  u32 dev_instance;
-
-  /* (hw_class, hw_instance) uniquely identifies hw interface. */
-  u32 hw_class_index;
-  u32 hw_instance;
-
-  /* Hardware index for this hardware interface. */
-  u32 hw_if_index;
-
-  /* Software index for this hardware interface. */
-  u32 sw_if_index;
-
-  /* Maximum transmit rate for this interface in bits/sec. */
-  f64 max_rate_bits_per_sec;
-
-  /* Smallest packet size supported by this interface. */
-  u32 min_supported_packet_bytes;
-
-  /* Largest packet size supported by this interface. */
-  u32 max_supported_packet_bytes;
-
-  /* Smallest packet size for this interface. */
-  u32 min_packet_bytes;
-
-  /* Largest packet size for this interface. */
-  u32 max_packet_bytes;
-
-  /* Number of extra bytes that go on the wire.
-     Packet length on wire
-     = max (length + per_packet_overhead_bytes, min_packet_bytes). */
-  u32 per_packet_overhead_bytes;
-
-  /* Receive and transmit layer 3 packet size limits (MRU/MTU). */
-  u32 max_l3_packet_bytes[VLIB_N_RX_TX];
-
-  /* Hash table mapping sub interface id to sw_if_index. */
-  uword *sub_interface_sw_if_index_by_id;
-
-  /* Count of number of L2 subinterfaces */
-  u32 l2_if_count;
-
-  /* Bonded interface info -
-     0       - not a bonded interface nor a slave
-     ~0      - slave to a bonded interface
-     others  - A bonded interface with a pointer to bitmap for all slaves */
-  uword *bond_info;
-#define VNET_HW_INTERFACE_BOND_INFO_NONE ((uword *) 0)
-#define VNET_HW_INTERFACE_BOND_INFO_SLAVE ((uword *) ~0)
-
-} vnet_hw_interface_t;
-
-extern vnet_device_class_t vnet_local_interface_device_class;
-
-typedef enum
-{
-  /* A hw interface. */
-  VNET_SW_INTERFACE_TYPE_HARDWARE,
-
-  /* A sub-interface. */
-  VNET_SW_INTERFACE_TYPE_SUB,
-} vnet_sw_interface_type_t;
-
-typedef struct
-{
-  /*
-   * Subinterface ID. A number 0-N to uniquely identify
-   * this subinterface under the main (parent?) interface
-   */
-  u32 id;
-
-  /* Classification data. Used to associate packet header with subinterface. */
-  struct
-  {
-    u16 outer_vlan_id;
-    u16 inner_vlan_id;
-    union
-    {
-      u16 raw_flags;
-      struct
-      {
-	u16 no_tags:1;
-	u16 one_tag:1;
-	u16 two_tags:1;
-	u16 dot1ad:1;		/* 0 = dot1q, 1=dot1ad */
-	u16 exact_match:1;
-	u16 default_sub:1;
-	u16 outer_vlan_id_any:1;
-	u16 inner_vlan_id_any:1;
-      } flags;
-    };
-  } eth;
-} vnet_sub_interface_t;
-
-typedef enum
-{
-  /* Always flood */
-  VNET_FLOOD_CLASS_NORMAL,
-  VNET_FLOOD_CLASS_TUNNEL_MASTER,
-  /* Does not flood when tunnel master is in the same L2 BD */
-  VNET_FLOOD_CLASS_TUNNEL_NORMAL
-} vnet_flood_class_t;
-
-/* Software-interface.  This corresponds to a Ethernet VLAN, ATM vc, a
-   tunnel, etc.  Configuration (e.g. IP address) gets attached to
-   software interface. */
-typedef struct
-{
-  vnet_sw_interface_type_t type:16;
-
-  u16 flags;
-  /* Interface is "up" meaning adminstratively up.
-     Up in the sense of link state being up is maintained by hardware interface. */
-#define VNET_SW_INTERFACE_FLAG_ADMIN_UP (1 << 0)
-
-  /* Interface is disabled for forwarding: punt all traffic to slow-path. */
-#define VNET_SW_INTERFACE_FLAG_PUNT (1 << 1)
-
-#define VNET_SW_INTERFACE_FLAG_PROXY_ARP (1 << 2)
-
-#define VNET_SW_INTERFACE_FLAG_UNNUMBERED (1 << 3)
-
-#define VNET_SW_INTERFACE_FLAG_BOND_SLAVE (1 << 4)
-
-  /* Index for this interface. */
-  u32 sw_if_index;
-
-  /* Software interface index of super-interface;
-     equal to sw_if_index if this interface is not a
-     sub-interface. */
-  u32 sup_sw_if_index;
-
-  /* this swif is unnumbered, use addresses on unnumbered_sw_if_index... */
-  u32 unnumbered_sw_if_index;
-
-  u32 link_speed;
-
-  union
-  {
-    /* VNET_SW_INTERFACE_TYPE_HARDWARE. */
-    u32 hw_if_index;
-
-    /* VNET_SW_INTERFACE_TYPE_SUB. */
-    vnet_sub_interface_t sub;
-  };
-
-  vnet_flood_class_t flood_class;
-} vnet_sw_interface_t;
-
-typedef enum
-{
-  /* Simple counters. */
-  VNET_INTERFACE_COUNTER_DROP = 0,
-  VNET_INTERFACE_COUNTER_PUNT = 1,
-  VNET_INTERFACE_COUNTER_IP4 = 2,
-  VNET_INTERFACE_COUNTER_IP6 = 3,
-  VNET_INTERFACE_COUNTER_RX_NO_BUF = 4,
-  VNET_INTERFACE_COUNTER_RX_MISS = 5,
-  VNET_INTERFACE_COUNTER_RX_ERROR = 6,
-  VNET_INTERFACE_COUNTER_TX_ERROR = 7,
-  VNET_INTERFACE_COUNTER_MPLS = 8,
-  VNET_N_SIMPLE_INTERFACE_COUNTER = 9,
-  /* Combined counters. */
-  VNET_INTERFACE_COUNTER_RX = 0,
-  VNET_INTERFACE_COUNTER_TX = 1,
-  VNET_N_COMBINED_INTERFACE_COUNTER = 2,
-} vnet_interface_counter_type_t;
-
-typedef struct
-{
-  u32 output_node_index;
-  u32 tx_node_index;
-} vnet_hw_interface_nodes_t;
-
-typedef struct
-{
-  /* Hardware interfaces. */
-  vnet_hw_interface_t *hw_interfaces;
-
-  /* Hash table mapping HW interface name to index. */
-  uword *hw_interface_by_name;
-
-  /* Vectors if hardware interface classes and device classes. */
-  vnet_hw_interface_class_t *hw_interface_classes;
-  vnet_device_class_t *device_classes;
-
-  /* Hash table mapping name to hw interface/device class. */
-  uword *hw_interface_class_by_name;
-  uword *device_class_by_name;
-
-  /* Software interfaces. */
-  vnet_sw_interface_t *sw_interfaces;
-
-  /* Hash table mapping sub intfc sw_if_index by sup sw_if_index and sub id */
-  uword *sw_if_index_by_sup_and_sub;
-
-  /* Software interface counters both simple and combined
-     packet and byte counters. */
-  volatile u32 *sw_if_counter_lock;
-  vlib_simple_counter_main_t *sw_if_counters;
-  vlib_combined_counter_main_t *combined_sw_if_counters;
-
-  vnet_hw_interface_nodes_t *deleted_hw_interface_nodes;
-
-  /* pcap drop tracing */
-  int drop_pcap_enable;
-  pcap_main_t pcap_main;
-  u8 *pcap_filename;
-  u32 pcap_sw_if_index;
-  u32 pcap_pkts_to_capture;
-  uword *pcap_drop_filter_hash;
-
-  /* feature_arc_index */
-  u8 output_feature_arc_index;
-} vnet_interface_main_t;
-
-static inline void
-vnet_interface_counter_lock (vnet_interface_main_t * im)
-{
-  if (im->sw_if_counter_lock)
-    while (__sync_lock_test_and_set (im->sw_if_counter_lock, 1))
-      /* zzzz */ ;
-}
-
-static inline void
-vnet_interface_counter_unlock (vnet_interface_main_t * im)
-{
-  if (im->sw_if_counter_lock)
-    *im->sw_if_counter_lock = 0;
-}
-
-void vnet_pcap_drop_trace_filter_add_del (u32 error_index, int is_add);
-
-int vnet_interface_name_renumber (u32 sw_if_index, u32 new_show_dev_instance);
-
-#endif /* included_vnet_interface_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/interface_api.c b/vnet/vnet/interface_api.c
deleted file mode 100644
index 42fd14ee..00000000
--- a/vnet/vnet/interface_api.c
+++ /dev/null
@@ -1,725 +0,0 @@
-/*
- *------------------------------------------------------------------
- * interface_api.c - vnet interface api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/l2/l2_vtr.h>
-#include <vnet/vnet_msg_enum.h>
-#include <vnet/fib/fib_api.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                                     \
-_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags)               \
-_(SW_INTERFACE_SET_MTU, sw_interface_set_mtu)                   \
-_(WANT_INTERFACE_EVENTS, want_interface_events)                 \
-_(SW_INTERFACE_DUMP, sw_interface_dump)                         \
-_(SW_INTERFACE_DETAILS, sw_interface_details)                   \
-_(SW_INTERFACE_ADD_DEL_ADDRESS, sw_interface_add_del_address)   \
-_(SW_INTERFACE_SET_TABLE, sw_interface_set_table)               \
-_(SW_INTERFACE_GET_TABLE, sw_interface_get_table)               \
-_(SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered)     \
-_(SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats)           \
-_(SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del)
-
-static void
-vl_api_sw_interface_set_flags_t_handler (vl_api_sw_interface_set_flags_t * mp)
-{
-  vl_api_sw_interface_set_flags_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  int rv = 0;
-  clib_error_t *error;
-  u16 flags;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  flags = mp->admin_up_down ? VNET_SW_INTERFACE_FLAG_ADMIN_UP : 0;
-
-  error = vnet_sw_interface_set_flags (vnm, ntohl (mp->sw_if_index), flags);
-  if (error)
-    {
-      rv = -1;
-      clib_error_report (error);
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_FLAGS_REPLY);
-}
-
-static void
-vl_api_sw_interface_set_mtu_t_handler (vl_api_sw_interface_set_mtu_t * mp)
-{
-  vl_api_sw_interface_set_mtu_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 flags = ETHERNET_INTERFACE_FLAG_MTU;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  u16 mtu = ntohs (mp->mtu);
-  ethernet_main_t *em = &ethernet_main;
-  int rv = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, sw_if_index);
-  ethernet_interface_t *eif = ethernet_get_interface (em, sw_if_index);
-
-  if (!eif)
-    {
-      rv = VNET_API_ERROR_FEATURE_DISABLED;
-      goto bad_sw_if_index;
-    }
-
-  if (mtu < hi->min_supported_packet_bytes)
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto bad_sw_if_index;
-    }
-
-  if (mtu > hi->max_supported_packet_bytes)
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto bad_sw_if_index;
-    }
-
-  if (hi->max_packet_bytes != mtu)
-    {
-      hi->max_packet_bytes = mtu;
-      ethernet_set_flags (vnm, sw_if_index, flags);
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_MTU_REPLY);
-}
-
-static void
-send_sw_interface_details (vpe_api_main_t * am,
-			   unix_shared_memory_queue_t * q,
-			   vnet_sw_interface_t * swif,
-			   u8 * interface_name, u32 context)
-{
-  vl_api_sw_interface_details_t *mp;
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_hw_interface_t *hi;
-  u8 *tag;
-
-  hi = vnet_get_sup_hw_interface (am->vnet_main, swif->sw_if_index);
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_DETAILS);
-  mp->sw_if_index = ntohl (swif->sw_if_index);
-  mp->sup_sw_if_index = ntohl (swif->sup_sw_if_index);
-  mp->admin_up_down = (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? 1 : 0;
-  mp->link_up_down = (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? 1 : 0;
-  mp->link_duplex = ((hi->flags & VNET_HW_INTERFACE_FLAG_DUPLEX_MASK) >>
-		     VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT);
-  mp->link_speed = ((hi->flags & VNET_HW_INTERFACE_FLAG_SPEED_MASK) >>
-		    VNET_HW_INTERFACE_FLAG_SPEED_SHIFT);
-  mp->link_mtu = ntohs (hi->max_packet_bytes);
-  mp->context = context;
-
-  strncpy ((char *) mp->interface_name,
-	   (char *) interface_name, ARRAY_LEN (mp->interface_name) - 1);
-
-  /* Send the L2 address for ethernet physical intfcs */
-  if (swif->sup_sw_if_index == swif->sw_if_index
-      && hi->hw_class_index == ethernet_hw_interface_class.index)
-    {
-      ethernet_main_t *em = ethernet_get_main (am->vlib_main);
-      ethernet_interface_t *ei;
-
-      ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
-      ASSERT (sizeof (mp->l2_address) >= sizeof (ei->address));
-      clib_memcpy (mp->l2_address, ei->address, sizeof (ei->address));
-      mp->l2_address_length = ntohl (sizeof (ei->address));
-    }
-  else if (swif->sup_sw_if_index != swif->sw_if_index)
-    {
-      vnet_sub_interface_t *sub = &swif->sub;
-      mp->sub_id = ntohl (sub->id);
-      mp->sub_dot1ad = sub->eth.flags.dot1ad;
-      mp->sub_number_of_tags =
-	sub->eth.flags.one_tag + sub->eth.flags.two_tags * 2;
-      mp->sub_outer_vlan_id = ntohs (sub->eth.outer_vlan_id);
-      mp->sub_inner_vlan_id = ntohs (sub->eth.inner_vlan_id);
-      mp->sub_exact_match = sub->eth.flags.exact_match;
-      mp->sub_default = sub->eth.flags.default_sub;
-      mp->sub_outer_vlan_id_any = sub->eth.flags.outer_vlan_id_any;
-      mp->sub_inner_vlan_id_any = sub->eth.flags.inner_vlan_id_any;
-
-      /* vlan tag rewrite data */
-      u32 vtr_op = L2_VTR_DISABLED;
-      u32 vtr_push_dot1q = 0, vtr_tag1 = 0, vtr_tag2 = 0;
-
-      if (l2vtr_get (am->vlib_main, am->vnet_main, swif->sw_if_index,
-		     &vtr_op, &vtr_push_dot1q, &vtr_tag1, &vtr_tag2) != 0)
-	{
-	  // error - default to disabled
-	  mp->vtr_op = ntohl (L2_VTR_DISABLED);
-	  clib_warning ("cannot get vlan tag rewrite for sw_if_index %d",
-			swif->sw_if_index);
-	}
-      else
-	{
-	  mp->vtr_op = ntohl (vtr_op);
-	  mp->vtr_push_dot1q = ntohl (vtr_push_dot1q);
-	  mp->vtr_tag1 = ntohl (vtr_tag1);
-	  mp->vtr_tag2 = ntohl (vtr_tag2);
-	}
-    }
-
-  tag = vnet_get_sw_interface_tag (vnm, swif->sw_if_index);
-  if (tag)
-    strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_sw_interface_dump_t_handler (vl_api_sw_interface_dump_t * mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vnet_sw_interface_t *swif;
-  vnet_interface_main_t *im = &am->vnet_main->interface_main;
-  u8 *filter_string = 0, *name_string = 0;
-  unix_shared_memory_queue_t *q;
-  char *strcasestr (char *, char *);	/* lnx hdr file botch */
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-
-  if (q == 0)
-    return;
-
-  if (mp->name_filter_valid)
-    {
-      mp->name_filter[ARRAY_LEN (mp->name_filter) - 1] = 0;
-      filter_string = format (0, "%s%c", mp->name_filter, 0);
-    }
-
-  /* *INDENT-OFF* */
-  pool_foreach (swif, im->sw_interfaces,
-  ({
-    name_string = format (name_string, "%U%c",
-                          format_vnet_sw_interface_name,
-                          am->vnet_main, swif, 0);
-
-    if (mp->name_filter_valid == 0 ||
-        strcasestr((char *) name_string, (char *) filter_string)) {
-
-      send_sw_interface_details (am, q, swif, name_string, mp->context);
-    }
-    _vec_len (name_string) = 0;
-  }));
-  /* *INDENT-ON* */
-
-  vec_free (name_string);
-  vec_free (filter_string);
-}
-
-static void
-  vl_api_sw_interface_add_del_address_t_handler
-  (vl_api_sw_interface_add_del_address_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_sw_interface_add_del_address_reply_t *rmp;
-  int rv = 0;
-  u32 is_del;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  is_del = mp->is_add == 0;
-
-  if (mp->del_all)
-    ip_del_all_interface_addresses (vm, ntohl (mp->sw_if_index));
-  else if (mp->is_ipv6)
-    ip6_add_del_interface_address (vm, ntohl (mp->sw_if_index),
-				   (void *) mp->address,
-				   mp->address_length, is_del);
-  else
-    ip4_add_del_interface_address (vm, ntohl (mp->sw_if_index),
-				   (void *) mp->address,
-				   mp->address_length, is_del);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_ADD_DEL_ADDRESS_REPLY);
-}
-
-void stats_dslock_with_hint (int hint, int tag) __attribute__ ((weak));
-void
-stats_dslock_with_hint (int hint, int tag)
-{
-}
-
-void stats_dsunlock (void) __attribute__ ((weak));
-void
-stats_dsunlock (void)
-{
-}
-
-static void
-vl_api_sw_interface_set_table_t_handler (vl_api_sw_interface_set_table_t * mp)
-{
-  int rv = 0;
-  u32 table_id = ntohl (mp->vrf_id);
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  vl_api_sw_interface_set_table_reply_t *rmp;
-  u32 fib_index;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  stats_dslock_with_hint (1 /* release hint */ , 4 /* tag */ );
-
-  if (mp->is_ipv6)
-    {
-      fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6,
-						     table_id);
-
-      vec_validate (ip6_main.fib_index_by_sw_if_index, sw_if_index);
-      ip6_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
-    }
-  else
-    {
-
-      fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4,
-						     table_id);
-
-      vec_validate (ip4_main.fib_index_by_sw_if_index, sw_if_index);
-      ip4_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
-    }
-  stats_dsunlock ();
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_TABLE_REPLY);
-}
-
-static void
-send_sw_interface_get_table_reply (unix_shared_memory_queue_t * q,
-				   u32 context, int retval, u32 vrf_id)
-{
-  vl_api_sw_interface_get_table_reply_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_GET_TABLE_REPLY);
-  mp->context = context;
-  mp->retval = htonl (retval);
-  mp->vrf_id = htonl (vrf_id);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_sw_interface_get_table_t_handler (vl_api_sw_interface_get_table_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  fib_table_t *fib_table = 0;
-  u32 sw_if_index = ~0;
-  u32 fib_index = ~0;
-  u32 table_id = ~0;
-  fib_protocol_t fib_proto = FIB_PROTOCOL_IP4;
-  int rv = 0;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  if (mp->is_ipv6)
-    fib_proto = FIB_PROTOCOL_IP6;
-
-  fib_index = fib_table_get_index_for_sw_if_index (fib_proto, sw_if_index);
-  if (fib_index != ~0)
-    {
-      fib_table = fib_table_get (fib_index, fib_proto);
-      table_id = fib_table->ft_table_id;
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  send_sw_interface_get_table_reply (q, mp->context, rv, table_id);
-}
-
-static void vl_api_sw_interface_set_unnumbered_t_handler
-  (vl_api_sw_interface_set_unnumbered_t * mp)
-{
-  vl_api_sw_interface_set_unnumbered_reply_t *rmp;
-  int rv = 0;
-  vnet_sw_interface_t *si;
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index, unnumbered_sw_if_index;
-
-  sw_if_index = ntohl (mp->sw_if_index);
-  unnumbered_sw_if_index = ntohl (mp->unnumbered_sw_if_index);
-
-  /*
-   * The API message field names are backwards from
-   * the underlying data structure names.
-   * It's not worth changing them now.
-   */
-  if (pool_is_free_index (vnm->interface_main.sw_interfaces,
-			  unnumbered_sw_if_index))
-    {
-      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-      goto done;
-    }
-
-  /* Only check the "use loop0" field when setting the binding */
-  if (mp->is_add &&
-      pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
-    {
-      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX_2;
-      goto done;
-    }
-
-  si = vnet_get_sw_interface (vnm, unnumbered_sw_if_index);
-
-  if (mp->is_add)
-    {
-      si->flags |= VNET_SW_INTERFACE_FLAG_UNNUMBERED;
-      si->unnumbered_sw_if_index = sw_if_index;
-      ip4_sw_interface_enable_disable (unnumbered_sw_if_index, 1);
-      ip6_sw_interface_enable_disable (unnumbered_sw_if_index, 1);
-    }
-  else
-    {
-      si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED);
-      si->unnumbered_sw_if_index = (u32) ~ 0;
-      ip4_sw_interface_enable_disable (unnumbered_sw_if_index, 0);
-      ip6_sw_interface_enable_disable (unnumbered_sw_if_index, 0);
-    }
-
-done:
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_UNNUMBERED_REPLY);
-}
-
-static void
-vl_api_sw_interface_clear_stats_t_handler (vl_api_sw_interface_clear_stats_t *
-					   mp)
-{
-  vl_api_sw_interface_clear_stats_reply_t *rmp;
-
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vlib_simple_counter_main_t *sm;
-  vlib_combined_counter_main_t *cm;
-  static vnet_main_t **my_vnet_mains;
-  int i, j, n_counters;
-  int rv = 0;
-
-  if (mp->sw_if_index != ~0)
-    VALIDATE_SW_IF_INDEX (mp);
-
-  vec_reset_length (my_vnet_mains);
-
-  for (i = 0; i < vec_len (vnet_mains); i++)
-    {
-      if (vnet_mains[i])
-	vec_add1 (my_vnet_mains, vnet_mains[i]);
-    }
-
-  if (vec_len (vnet_mains) == 0)
-    vec_add1 (my_vnet_mains, vnm);
-
-  n_counters = vec_len (im->combined_sw_if_counters);
-
-  for (j = 0; j < n_counters; j++)
-    {
-      for (i = 0; i < vec_len (my_vnet_mains); i++)
-	{
-	  im = &my_vnet_mains[i]->interface_main;
-	  cm = im->combined_sw_if_counters + j;
-	  if (mp->sw_if_index == (u32) ~ 0)
-	    vlib_clear_combined_counters (cm);
-	  else
-	    vlib_zero_combined_counter (cm, ntohl (mp->sw_if_index));
-	}
-    }
-
-  n_counters = vec_len (im->sw_if_counters);
-
-  for (j = 0; j < n_counters; j++)
-    {
-      for (i = 0; i < vec_len (my_vnet_mains); i++)
-	{
-	  im = &my_vnet_mains[i]->interface_main;
-	  sm = im->sw_if_counters + j;
-	  if (mp->sw_if_index == (u32) ~ 0)
-	    vlib_clear_simple_counters (sm);
-	  else
-	    vlib_zero_simple_counter (sm, ntohl (mp->sw_if_index));
-	}
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_CLEAR_STATS_REPLY);
-}
-
-#define API_LINK_STATE_EVENT 1
-#define API_ADMIN_UP_DOWN_EVENT 2
-
-static int
-event_data_cmp (void *a1, void *a2)
-{
-  uword *e1 = a1;
-  uword *e2 = a2;
-
-  return (word) e1[0] - (word) e2[0];
-}
-
-static void
-send_sw_interface_flags (vpe_api_main_t * am,
-			 unix_shared_memory_queue_t * q,
-			 vnet_sw_interface_t * swif)
-{
-  vl_api_sw_interface_set_flags_t *mp;
-  vnet_main_t *vnm = am->vnet_main;
-
-  vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm,
-						       swif->sw_if_index);
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_FLAGS);
-  mp->sw_if_index = ntohl (swif->sw_if_index);
-
-  mp->admin_up_down = (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? 1 : 0;
-  mp->link_up_down = (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? 1 : 0;
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static uword
-link_state_process (vlib_main_t * vm,
-		    vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  vpe_api_main_t *vam = &vpe_api_main;
-  vnet_main_t *vnm = vam->vnet_main;
-  vnet_sw_interface_t *swif;
-  uword *event_data = 0;
-  vpe_client_registration_t *reg;
-  int i;
-  u32 prev_sw_if_index;
-  unix_shared_memory_queue_t *q;
-
-  vam->link_state_process_up = 1;
-
-  while (1)
-    {
-      vlib_process_wait_for_event (vm);
-
-      /* Unified list of changed link or admin state sw_if_indices */
-      vlib_process_get_events_with_type
-	(vm, &event_data, API_LINK_STATE_EVENT);
-      vlib_process_get_events_with_type
-	(vm, &event_data, API_ADMIN_UP_DOWN_EVENT);
-
-      /* Sort, so we can eliminate duplicates */
-      vec_sort_with_function (event_data, event_data_cmp);
-
-      prev_sw_if_index = ~0;
-
-      for (i = 0; i < vec_len (event_data); i++)
-	{
-	  /* Only one message per swif */
-	  if (prev_sw_if_index == event_data[i])
-	    continue;
-	  prev_sw_if_index = event_data[i];
-
-          /* *INDENT-OFF* */
-          pool_foreach(reg, vam->interface_events_registrations,
-          ({
-            q = vl_api_client_index_to_input_queue (reg->client_index);
-            if (q)
-              {
-                /* sw_interface may be deleted already */
-                if (!pool_is_free_index (vnm->interface_main.sw_interfaces,
-                                         event_data[i]))
-                  {
-                    swif = vnet_get_sw_interface (vnm, event_data[i]);
-                    send_sw_interface_flags (vam, q, swif);
-                  }
-              }
-          }));
-          /* *INDENT-ON* */
-	}
-      vec_reset_length (event_data);
-    }
-
-  return 0;
-}
-
-static clib_error_t *link_up_down_function (vnet_main_t * vm, u32 hw_if_index,
-					    u32 flags);
-static clib_error_t *admin_up_down_function (vnet_main_t * vm,
-					     u32 hw_if_index, u32 flags);
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (link_state_process_node,static) = {
-  .function = link_state_process,
-  .type = VLIB_NODE_TYPE_PROCESS,
-  .name = "vpe-link-state-process",
-};
-/* *INDENT-ON* */
-
-VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (admin_up_down_function);
-VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (link_up_down_function);
-
-static clib_error_t *
-link_up_down_function (vnet_main_t * vm, u32 hw_if_index, u32 flags)
-{
-  vpe_api_main_t *vam = &vpe_api_main;
-  vnet_hw_interface_t *hi = vnet_get_hw_interface (vm, hw_if_index);
-
-  if (vam->link_state_process_up)
-    vlib_process_signal_event (vam->vlib_main,
-			       link_state_process_node.index,
-			       API_LINK_STATE_EVENT, hi->sw_if_index);
-  return 0;
-}
-
-static clib_error_t *
-admin_up_down_function (vnet_main_t * vm, u32 sw_if_index, u32 flags)
-{
-  vpe_api_main_t *vam = &vpe_api_main;
-
-  /*
-   * Note: it's perfectly fair to set a subif admin up / admin down.
-   * Note the subtle distinction between this routine and the previous
-   * routine.
-   */
-  if (vam->link_state_process_up)
-    vlib_process_signal_event (vam->vlib_main,
-			       link_state_process_node.index,
-			       API_ADMIN_UP_DOWN_EVENT, sw_if_index);
-  return 0;
-}
-
-static void vl_api_sw_interface_tag_add_del_t_handler
-  (vl_api_sw_interface_tag_add_del_t * mp)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vl_api_sw_interface_tag_add_del_reply_t *rmp;
-  int rv = 0;
-  u8 *tag;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  if (mp->is_add)
-    {
-      if (mp->tag[0] == 0)
-	{
-	  rv = VNET_API_ERROR_INVALID_VALUE;
-	  goto out;
-	}
-
-      mp->tag[ARRAY_LEN (mp->tag) - 1] = 0;
-      tag = format (0, "%s%c", mp->tag, 0);
-      vnet_set_sw_interface_tag (vnm, tag, sw_if_index);
-    }
-  else
-    vnet_clear_sw_interface_tag (vnm, sw_if_index);
-
-  BAD_SW_IF_INDEX_LABEL;
-out:
-  REPLY_MACRO (VL_API_SW_INTERFACE_TAG_ADD_DEL_REPLY);
-}
-
-static void
-vl_api_sw_interface_details_t_handler (vl_api_sw_interface_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-/*
- * vpe_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/interface.api.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_interface;
-#undef _
-}
-
-pub_sub_handler (interface_events, INTERFACE_EVENTS);
-
-static clib_error_t *
-interface_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (interface_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/interface_cli.c b/vnet/vnet/interface_cli.c
deleted file mode 100644
index 7dbee867..00000000
--- a/vnet/vnet/interface_cli.c
+++ /dev/null
@@ -1,1165 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * interface_cli.c: interface CLI
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file
- * Interface CLI.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vppinfra/bitmap.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/ip6_fib.h>
-
-static int
-compare_interface_names (void *a1, void *a2)
-{
-  u32 *hi1 = a1;
-  u32 *hi2 = a2;
-
-  return vnet_hw_interface_compare (vnet_get_main (), *hi1, *hi2);
-}
-
-static clib_error_t *
-show_or_clear_hw_interfaces (vlib_main_t * vm,
-			     unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  clib_error_t *error = 0;
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vnet_hw_interface_t *hi;
-  u32 hw_if_index, *hw_if_indices = 0;
-  int i, verbose = -1, is_show, show_bond = 0;
-
-  is_show = strstr (cmd->path, "show") != 0;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      /* See if user wants to show a specific interface. */
-      if (unformat
-	  (input, "%U", unformat_vnet_hw_interface, vnm, &hw_if_index))
-	vec_add1 (hw_if_indices, hw_if_index);
-
-      /* See if user wants to show an interface with a specific hw_if_index. */
-      else if (unformat (input, "%u", &hw_if_index))
-	vec_add1 (hw_if_indices, hw_if_index);
-
-      else if (unformat (input, "verbose"))
-	verbose = 1;		/* this is also the default */
-
-      else if (unformat (input, "detail"))
-	verbose = 2;
-
-      else if (unformat (input, "brief"))
-	verbose = 0;
-
-      else if (unformat (input, "bond"))
-	{
-	  show_bond = 1;
-	  if (verbose < 0)
-	    verbose = 0;	/* default to brief for link bonding */
-	}
-
-      else
-	{
-	  error = clib_error_return (0, "unknown input `%U'",
-				     format_unformat_error, input);
-	  goto done;
-	}
-    }
-
-  /* Gather interfaces. */
-  if (vec_len (hw_if_indices) == 0)
-    pool_foreach (hi, im->hw_interfaces,
-		  vec_add1 (hw_if_indices, hi - im->hw_interfaces));
-
-  if (verbose < 0)
-    verbose = 1;		/* default to verbose (except bond) */
-
-  if (is_show)
-    {
-      /* Sort by name. */
-      vec_sort_with_function (hw_if_indices, compare_interface_names);
-
-      vlib_cli_output (vm, "%U\n", format_vnet_hw_interface, vnm, 0, verbose);
-      for (i = 0; i < vec_len (hw_if_indices); i++)
-	{
-	  hi = vnet_get_hw_interface (vnm, hw_if_indices[i]);
-	  if (show_bond == 0)	/* show all interfaces */
-	    vlib_cli_output (vm, "%U\n", format_vnet_hw_interface, vnm,
-			     hi, verbose);
-	  else if ((hi->bond_info) &&
-		   (hi->bond_info != VNET_HW_INTERFACE_BOND_INFO_SLAVE))
-	    {			/* show only bonded interface and all its slave interfaces */
-	      int hw_idx;
-	      vnet_hw_interface_t *shi;
-	      vlib_cli_output (vm, "%U\n", format_vnet_hw_interface, vnm,
-			       hi, verbose);
-
-              /* *INDENT-OFF* */
-	      clib_bitmap_foreach (hw_idx, hi->bond_info,
-              ({
-                shi = vnet_get_hw_interface(vnm, hw_idx);
-                vlib_cli_output (vm, "%U\n",
-                                 format_vnet_hw_interface, vnm, shi, verbose);
-              }));
-              /* *INDENT-ON* */
-	    }
-	}
-    }
-  else
-    {
-      for (i = 0; i < vec_len (hw_if_indices); i++)
-	{
-	  vnet_device_class_t *dc;
-
-	  hi = vnet_get_hw_interface (vnm, hw_if_indices[i]);
-	  dc = vec_elt_at_index (im->device_classes, hi->dev_class_index);
-
-	  if (dc->clear_counters)
-	    dc->clear_counters (hi->dev_instance);
-	}
-    }
-
-done:
-  vec_free (hw_if_indices);
-  return error;
-}
-
-/* *INDENT-OFF* */
-/*?
- * Displays various information about the state of the current terminal
- * session.
- *
- * @cliexpar
- * @cliexstart{show hardware}
- * Name                Link  Hardware
- * GigabitEthernet2/0/0               up   GigabitEthernet2/0/0
- * Ethernet address 00:50:56:b7:7c:83
- * Intel 82545em_copper
- *   link up, media 1000T full-duplex, master,
- *   0 unprocessed, 384 total buffers on rx queue 0 ring
- *   237 buffers in driver rx cache
- *   rx total packets                                    1816
- *   rx total bytes                                    181084
- *   rx good packets                                     1816
- *   rx good bytes                                     181084
- *   rx 65 127 byte packets                              1586
- *   rx 256 511 byte packets                              230
- *   tx total packets                                     346
- *   tx total bytes                                     90224
- *   tx good packets                                      346
- *   tx good bytes                                      88840
- *   tx 64 byte packets                                     1
- *   tx 65 127 byte packets                               115
- *   tx 256 511 byte packets                              230
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND (show_hw_interfaces_command, static) = {
-  .path = "show hardware-interfaces",
-  .short_help = "show hardware-interfaces [brief|verbose|detail] [bond] [<if-name1> <if-name2> ...]",
-  .function = show_or_clear_hw_interfaces,
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (clear_hw_interface_counters_command, static) = {
-  .path = "clear hardware-interfaces",
-  .short_help = "Clear hardware interfaces statistics",
-  .function = show_or_clear_hw_interfaces,
-};
-/* *INDENT-ON* */
-
-static int
-sw_interface_name_compare (void *a1, void *a2)
-{
-  vnet_sw_interface_t *si1 = a1;
-  vnet_sw_interface_t *si2 = a2;
-
-  return vnet_sw_interface_compare (vnet_get_main (),
-				    si1->sw_if_index, si2->sw_if_index);
-}
-
-static clib_error_t *
-show_sw_interfaces (vlib_main_t * vm,
-		    unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  clib_error_t *error = 0;
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vnet_sw_interface_t *si, *sorted_sis = 0;
-  u32 sw_if_index = ~(u32) 0;
-  u8 show_addresses = 0;
-  u8 show_features = 0;
-  u8 show_tag = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      /* See if user wants to show specific interface */
-      if (unformat
-	  (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
-	{
-	  si = pool_elt_at_index (im->sw_interfaces, sw_if_index);
-	  vec_add1 (sorted_sis, si[0]);
-	}
-      else if (unformat (input, "address") || unformat (input, "addr"))
-	show_addresses = 1;
-      else if (unformat (input, "features") || unformat (input, "feat"))
-	show_features = 1;
-      else if (unformat (input, "tag"))
-	show_tag = 1;
-      else
-	{
-	  error = clib_error_return (0, "unknown input `%U'",
-				     format_unformat_error, input);
-	  goto done;
-	}
-    }
-
-  if (show_features || show_tag)
-    {
-      if (sw_if_index == ~(u32) 0)
-	return clib_error_return (0, "Interface not specified...");
-    }
-
-  if (show_features)
-    {
-      vnet_interface_features_show (vm, sw_if_index);
-      return 0;
-    }
-  if (show_tag)
-    {
-      u8 *tag;
-      tag = vnet_get_sw_interface_tag (vnm, sw_if_index);
-      vlib_cli_output (vm, "%U: %s",
-		       format_vnet_sw_if_index_name, vnm, sw_if_index,
-		       tag ? (char *) tag : "(none)");
-      return 0;
-    }
-
-  if (!show_addresses)
-    vlib_cli_output (vm, "%U\n", format_vnet_sw_interface, vnm, 0);
-
-  if (vec_len (sorted_sis) == 0)	/* Get all interfaces */
-    {
-      /* Gather interfaces. */
-      sorted_sis =
-	vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces));
-      _vec_len (sorted_sis) = 0;
-      pool_foreach (si, im->sw_interfaces, (
-					     {
-					     vec_add1 (sorted_sis, si[0]);
-					     }
-		    ));
-
-      /* Sort by name. */
-      vec_sort_with_function (sorted_sis, sw_interface_name_compare);
-    }
-
-  if (show_addresses)
-    {
-      vec_foreach (si, sorted_sis)
-      {
-	l2input_main_t *l2m = &l2input_main;
-	ip4_main_t *im4 = &ip4_main;
-	ip6_main_t *im6 = &ip6_main;
-	ip_lookup_main_t *lm4 = &im4->lookup_main;
-	ip_lookup_main_t *lm6 = &im6->lookup_main;
-	ip_interface_address_t *ia = 0;
-	ip4_address_t *r4;
-	ip6_address_t *r6;
-	u32 fib_index4 = 0, fib_index6 = 0;
-	ip4_fib_t *fib4;
-	ip6_fib_t *fib6;
-	l2_input_config_t *config;
-
-	if (vec_len (im4->fib_index_by_sw_if_index) > si->sw_if_index)
-	  fib_index4 = vec_elt (im4->fib_index_by_sw_if_index,
-				si->sw_if_index);
-
-	if (vec_len (im6->fib_index_by_sw_if_index) > si->sw_if_index)
-	  fib_index6 = vec_elt (im6->fib_index_by_sw_if_index,
-				si->sw_if_index);
-
-	fib4 = ip4_fib_get (fib_index4);
-	fib6 = ip6_fib_get (fib_index6);
-
-	if (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
-	  vlib_cli_output
-	    (vm, "%U (%s): \n  unnumbered, use %U",
-	     format_vnet_sw_if_index_name,
-	     vnm, si->sw_if_index,
-	     (si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? "up" : "dn",
-	     format_vnet_sw_if_index_name, vnm, si->unnumbered_sw_if_index);
-
-	else
-	  {
-	    vlib_cli_output (vm, "%U (%s):",
-			     format_vnet_sw_if_index_name,
-			     vnm, si->sw_if_index,
-			     (si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
-			     ? "up" : "dn");
-	  }
-
-	/* Display any L2 addressing info */
-	vec_validate (l2m->configs, si->sw_if_index);
-	config = vec_elt_at_index (l2m->configs, si->sw_if_index);
-	if (config->bridge)
-	  {
-	    u32 bd_id = l2input_main.bd_configs[config->bd_index].bd_id;
-	    vlib_cli_output (vm, "  l2 bridge bd_id %d%s%d", bd_id,
-			     config->bvi ? " bvi shg " : " shg ",
-			     config->shg);
-	  }
-	else if (config->xconnect)
-	  {
-	    vlib_cli_output (vm, "  l2 xconnect %U",
-			     format_vnet_sw_if_index_name,
-			     vnm, config->output_sw_if_index);
-	  }
-
-	/* Display any IP4 addressing info */
-          /* *INDENT-OFF* */
-	  foreach_ip_interface_address (lm4, ia, si->sw_if_index,
-					1 /* honor unnumbered */,
-	  ({
-            r4 = ip_interface_address_get_address (lm4, ia);
-            if (fib4->table_id)
-              {
-                vlib_cli_output (vm, "  %U/%d table %d",
-                                 format_ip4_address, r4,
-                                 ia->address_length,
-                                 fib4->table_id);
-              }
-            else
-              {
-                vlib_cli_output (vm, "  %U/%d",
-                                 format_ip4_address, r4,
-                                 ia->address_length);
-              }
-          }));
-          /* *INDENT-ON* */
-
-	/* Display any IP6 addressing info */
-          /* *INDENT-OFF* */
-          foreach_ip_interface_address (lm6, ia, si->sw_if_index,
-                                        1 /* honor unnumbered */,
-          ({
-            r6 = ip_interface_address_get_address (lm6, ia);
-            if (fib6->table_id)
-              {
-                vlib_cli_output (vm, "  %U/%d table %d",
-                                 format_ip6_address, r6,
-                                 ia->address_length,
-                                 fib6->table_id);
-              }
-            else
-              {
-                vlib_cli_output (vm, "  %U/%d",
-                                 format_ip6_address, r6,
-                                 ia->address_length);
-              }
-          }));
-          /* *INDENT-ON* */
-      }
-    }
-  else
-    {
-      vec_foreach (si, sorted_sis)
-      {
-	vlib_cli_output (vm, "%U\n", format_vnet_sw_interface, vnm, si);
-      }
-    }
-
-done:
-  vec_free (sorted_sis);
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_sw_interfaces_command, static) = {
-  .path = "show interfaces",
-  .short_help = "show interfaces [address|addr|features|feat] [<if-name1> <if-name2> ...]",
-  .function = show_sw_interfaces,
-};
-/* *INDENT-ON* */
-
-/* Root of all interface commands. */
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vnet_cli_interface_command, static) = {
-  .path = "interface",
-  .short_help = "Interface commands",
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vnet_cli_set_interface_command, static) = {
-  .path = "set interface",
-  .short_help = "Interface commands",
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-clear_interface_counters (vlib_main_t * vm,
-			  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vlib_simple_counter_main_t *sm;
-  vlib_combined_counter_main_t *cm;
-  static vnet_main_t **my_vnet_mains;
-  int i, j, n_counters;
-
-  vec_reset_length (my_vnet_mains);
-
-  for (i = 0; i < vec_len (vnet_mains); i++)
-    {
-      if (vnet_mains[i])
-	vec_add1 (my_vnet_mains, vnet_mains[i]);
-    }
-
-  if (vec_len (vnet_mains) == 0)
-    vec_add1 (my_vnet_mains, vnm);
-
-  n_counters = vec_len (im->combined_sw_if_counters);
-
-  for (j = 0; j < n_counters; j++)
-    {
-      for (i = 0; i < vec_len (my_vnet_mains); i++)
-	{
-	  im = &my_vnet_mains[i]->interface_main;
-	  cm = im->combined_sw_if_counters + j;
-	  vlib_clear_combined_counters (cm);
-	}
-    }
-
-  n_counters = vec_len (im->sw_if_counters);
-
-  for (j = 0; j < n_counters; j++)
-    {
-      for (i = 0; i < vec_len (my_vnet_mains); i++)
-	{
-	  im = &my_vnet_mains[i]->interface_main;
-	  sm = im->sw_if_counters + j;
-	  vlib_clear_simple_counters (sm);
-	}
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (clear_interface_counters_command, static) = {
-  .path = "clear interfaces",
-  .short_help = "Clear interfaces statistics",
-  .function = clear_interface_counters,
-};
-/* *INDENT-ON* */
-
-/**
- * Parse subinterface names.
- *
- * The following subinterface syntax is supported. The first two are for
- * backwards compatability:
- *
- * <intf-name> <id>
- *     - a subinterface with the name <intf-name>.<id>. The subinterface
- *       is a single dot1q vlan with vlan id <id> and exact-match semantics.
- *
- * <intf-name> <min_id>-<max_id>
- *     - a set of the above subinterfaces, repeating for each id
- *       in the range <min_id> to <max_id>
- *
- * In the following, exact-match semantics (i.e. the number of vlan tags on the
- * packet must match the number of tags in the configuration) are used only if
- * the keyword exact-match is present. Non-exact match is the default.
- *
- * <intf-name> <id> dot1q <outer_id> [exact-match]
- *     - a subinterface with the name <intf-name>.<id>. The subinterface
- *       is a single dot1q vlan with vlan id <outer_id>.
- *
- * <intf-name> <id> dot1q any [exact-match]
- *     - a subinterface with the name <intf-name>.<id>. The subinterface
- *       is a single dot1q vlan with any vlan id.
- *
- * <intf-name> <id> dot1q <outer_id> inner-dot1q <inner_id> [exact-match]
- *     - a subinterface with the name <intf-name>.<id>. The subinterface
- *       is a double dot1q vlan with outer vlan id <outer_id> and inner vlan id
- *       <inner_id>.
- *
- * <intf-name> <id> dot1q <outer_id> inner-dot1q any [exact-match]
- *     - a subinterface with the name <intf-name>.<id>. The subinterface
- *       is a double dot1q vlan with outer vlan id <id> and any inner vlan id.
- *
- * <intf-name> <id> dot1q any inner-dot1q any [exact-match]
- *
- *     - a subinterface with the name <intf-name>.<id>. The subinterface
- *       is a double dot1q vlan with any outer vlan id and any inner vlan id.
- *
- * For each of the above CLI, there is a duplicate that uses the keyword
- * "dot1ad" in place of the first "dot1q". These interfaces use ethertype
- * 0x88ad in place of 0x8100 for the outer ethertype. Note that for double-
- * tagged packets the inner ethertype is always 0x8100. Also note that
- * the dot1q and dot1ad naming spaces are independent, so it is legal to
- * have both "Gig3/0/0.1 dot1q 100" and "Gig3/0/0.2 dot1ad 100". For example:
- *
- * <intf-name> <id> dot1ad <outer_id> inner-dot1q <inner_id> [exact-match]
- *     - a subinterface with the name <intf-name>.<id>. The subinterface
- *       is a double dot1ad vlan with outer vlan id <outer_id> and inner vlan
- *       id <inner_id>.
- *
- * <intf-name> <id> untagged
- *     - a subinterface with the name <intf-name>.<id>. The subinterface
- *       has no vlan tags. Only one can be specified per interface.
- *
- * <intf-name> <id> default
- *     - a subinterface with the name <intf-name>.<id>. This is associated
- *       with a packet that did not match any other configured subinterface
- *       on this interface. Only one can be specified per interface.
- */
-
-static clib_error_t *
-parse_vlan_sub_interfaces (unformat_input_t * input,
-			   vnet_sw_interface_t * template)
-{
-  clib_error_t *error = 0;
-  u32 inner_vlan, outer_vlan;
-
-  if (unformat (input, "any inner-dot1q any"))
-    {
-      template->sub.eth.flags.two_tags = 1;
-      template->sub.eth.flags.outer_vlan_id_any = 1;
-      template->sub.eth.flags.inner_vlan_id_any = 1;
-    }
-  else if (unformat (input, "any"))
-    {
-      template->sub.eth.flags.one_tag = 1;
-      template->sub.eth.flags.outer_vlan_id_any = 1;
-    }
-  else if (unformat (input, "%d inner-dot1q any", &outer_vlan))
-    {
-      template->sub.eth.flags.two_tags = 1;
-      template->sub.eth.flags.inner_vlan_id_any = 1;
-      template->sub.eth.outer_vlan_id = outer_vlan;
-    }
-  else if (unformat (input, "%d inner-dot1q %d", &outer_vlan, &inner_vlan))
-    {
-      template->sub.eth.flags.two_tags = 1;
-      template->sub.eth.outer_vlan_id = outer_vlan;
-      template->sub.eth.inner_vlan_id = inner_vlan;
-    }
-  else if (unformat (input, "%d", &outer_vlan))
-    {
-      template->sub.eth.flags.one_tag = 1;
-      template->sub.eth.outer_vlan_id = outer_vlan;
-    }
-  else
-    {
-      error = clib_error_return (0, "expected dot1q config, got `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  if (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "exact-match"))
-	{
-	  template->sub.eth.flags.exact_match = 1;
-	}
-    }
-
-done:
-  return error;
-}
-
-static clib_error_t *
-create_sub_interfaces (vlib_main_t * vm,
-		       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 hw_if_index, sw_if_index;
-  vnet_hw_interface_t *hi;
-  u32 id, id_min, id_max;
-  vnet_sw_interface_t template;
-
-  hw_if_index = ~0;
-  if (!unformat_user (input, unformat_vnet_hw_interface, vnm, &hw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  memset (&template, 0, sizeof (template));
-  template.sub.eth.raw_flags = 0;
-
-  if (unformat (input, "%d default", &id_min))
-    {
-      id_max = id_min;
-      template.sub.eth.flags.default_sub = 1;
-    }
-  else if (unformat (input, "%d untagged", &id_min))
-    {
-      id_max = id_min;
-      template.sub.eth.flags.no_tags = 1;
-      template.sub.eth.flags.exact_match = 1;
-    }
-  else if (unformat (input, "%d dot1q", &id_min))
-    {
-      /* parse dot1q config */
-      id_max = id_min;
-      error = parse_vlan_sub_interfaces (input, &template);
-      if (error)
-	goto done;
-    }
-  else if (unformat (input, "%d dot1ad", &id_min))
-    {
-      /* parse dot1ad config */
-      id_max = id_min;
-      template.sub.eth.flags.dot1ad = 1;
-      error = parse_vlan_sub_interfaces (input, &template);
-      if (error)
-	goto done;
-    }
-  else if (unformat (input, "%d-%d", &id_min, &id_max))
-    {
-      template.sub.eth.flags.one_tag = 1;
-      template.sub.eth.flags.exact_match = 1;
-      if (id_min > id_max)
-	goto id_error;
-    }
-  else if (unformat (input, "%d", &id_min))
-    {
-      id_max = id_min;
-      template.sub.eth.flags.one_tag = 1;
-      template.sub.eth.outer_vlan_id = id_min;
-      template.sub.eth.flags.exact_match = 1;
-    }
-  else
-    {
-    id_error:
-      error = clib_error_return (0, "expected ID or ID MIN-MAX, got `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  hi = vnet_get_hw_interface (vnm, hw_if_index);
-
-  if (hi->bond_info == VNET_HW_INTERFACE_BOND_INFO_SLAVE)
-    {
-      error =
-	clib_error_return (0,
-			   "not allowed as %v belong to a BondEthernet interface",
-			   hi->name);
-      goto done;
-    }
-
-  for (id = id_min; id <= id_max; id++)
-    {
-      uword *p;
-      vnet_interface_main_t *im = &vnm->interface_main;
-      u64 sup_and_sub_key = ((u64) (hi->sw_if_index) << 32) | (u64) id;
-      u64 *kp;
-
-      p = hash_get_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key);
-      if (p)
-	{
-	  if (CLIB_DEBUG > 0)
-	    clib_warning ("sup sw_if_index %d, sub id %d already exists\n",
-			  hi->sw_if_index, id);
-	  continue;
-	}
-
-      kp = clib_mem_alloc (sizeof (*kp));
-      *kp = sup_and_sub_key;
-
-      template.type = VNET_SW_INTERFACE_TYPE_SUB;
-      template.flood_class = VNET_FLOOD_CLASS_NORMAL;
-      template.sup_sw_if_index = hi->sw_if_index;
-      template.sub.id = id;
-      if (id_min < id_max)
-	template.sub.eth.outer_vlan_id = id;
-
-      error = vnet_create_sw_interface (vnm, &template, &sw_if_index);
-      if (error)
-	goto done;
-
-      hash_set (hi->sub_interface_sw_if_index_by_id, id, sw_if_index);
-      hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, sw_if_index);
-      vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name,
-		       vnet_get_main (), sw_if_index);
-    }
-
-done:
-  return error;
-}
-
-/* *INDENT-OFF* */
-/*?
- * Create vlan subinterfaces
- *
- * @cliexpar
- * @cliexstart{create sub-interfaces}
- *
- * To create a vlan subinterface 11 to process packets on 802.1q VLAN id 11, use:
- *
- *  vpp# create sub GigabitEthernet2/0/0 11
- *
- * This shorthand is equivalent to:
- *  vpp# create sub GigabitEthernet2/0/0 11 dot1q 11 exact-match
- *
- * You can specify a subinterface number that is different from the vlan id:
- *  vpp# create sub GigabitEthernet2/0/0 11 dot1q 100
- *
- * You can create qinq and q-in-any interfaces:
- *  vpp# create sub GigabitEthernet2/0/0 11 dot1q 100 inner-dot1q 200
- *  vpp# create sub GigabitEthernet2/0/0 12 dot1q 100 inner-dot1q any
- *
- * You can also create dot1ad interfaces:
- *  vpp# create sub GigabitEthernet2/0/0 11 dot1ad 11
- *  vpp# create sub GigabitEthernet2/0/0 12 dot1q 100 inner-dot1q 200
- *
- * Subinterfaces can be configured as either exact-match or non-exact match.
- * Non-exact match is the CLI default. If exact-match is specified,
- * packets must have the same number of vlan tags as the configuration.
- * For non-exact-match, packets must at least that number of tags.
- * L3 (routed) interfaces must be configured as exact-match.
- * L2 interfaces are typically configured as non-exact-match.
- *
- * For example, a packet with outer vlan 100 and inner 200 would match this interface:
- *  vpp# create sub GigabitEthernet2/0/0 5 dot1q 100
- *
- * but would not match this interface:
- *  vpp# create sub GigabitEthernet2/0/0 5 dot1q 100 exact-match
- *
- * There are two special subinterfaces that can be configured. Subinterface untagged has no vlan tags:
- *  vpp# create sub GigabitEthernet2/0/0 5 untagged
- *
- * The subinterface default matches any packet that does not match any other subinterface:
- *  vpp# create sub GigabitEthernet2/0/0 7 default
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND (create_sub_interfaces_command, static) = {
-  .path = "create sub-interfaces",
-  .short_help = "create sub-interfaces <nn>[-<nn>] [dot1q|dot1ad|default|untagged]",
-  .function = create_sub_interfaces,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_state (vlib_main_t * vm,
-	   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error;
-  u32 sw_if_index, flags;
-
-  sw_if_index = ~0;
-  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  if (!unformat (input, "%U", unformat_vnet_sw_interface_flags, &flags))
-    {
-      error = clib_error_return (0, "unknown flags `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  error = vnet_sw_interface_set_flags (vnm, sw_if_index, flags);
-  if (error)
-    goto done;
-
-done:
-  return error;
-}
-
-
-/* *INDENT-OFF* */
-/*?
- * Interface admin up/down
- *
- * @cliexpar
- * @cliexstart{set interface state}
- *  vpp# set interface state GigabitEthernet2/0/0 up
- *  vpp# set interface state GigabitEthernet2/0/0 down
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND (set_state_command, static) = {
-  .path = "set interface state",
-  .short_help = "Set interface state",
-  .function = set_state,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_unnumbered (vlib_main_t * vm,
-		unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 unnumbered_sw_if_index;
-  u32 inherit_from_sw_if_index;
-  vnet_sw_interface_t *si;
-  int is_set = 0;
-  int is_del = 0;
-
-  if (unformat (input, "%U use %U",
-		unformat_vnet_sw_interface, vnm, &unnumbered_sw_if_index,
-		unformat_vnet_sw_interface, vnm, &inherit_from_sw_if_index))
-    is_set = 1;
-  else if (unformat (input, "del %U",
-		     unformat_vnet_sw_interface, vnm,
-		     &unnumbered_sw_if_index))
-    is_del = 1;
-  else
-    return clib_error_return (0, "parse error '%U'",
-			      format_unformat_error, input);
-
-  si = vnet_get_sw_interface (vnm, unnumbered_sw_if_index);
-  if (is_del)
-    {
-      si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED);
-      si->unnumbered_sw_if_index = (u32) ~ 0;
-      ip4_sw_interface_enable_disable (unnumbered_sw_if_index, 0);
-      ip6_sw_interface_enable_disable (unnumbered_sw_if_index, 0);
-    }
-  else if (is_set)
-    {
-      si->flags |= VNET_SW_INTERFACE_FLAG_UNNUMBERED;
-      si->unnumbered_sw_if_index = inherit_from_sw_if_index;
-      ip4_sw_interface_enable_disable (unnumbered_sw_if_index, 1);
-      ip6_sw_interface_enable_disable (unnumbered_sw_if_index, 1);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_unnumbered_command, static) = {
-  .path = "set interface unnumbered",
-  .short_help = "set interface unnumbered [<intfc> use <intfc> | del <intfc>]",
-  .function = set_unnumbered,
-};
-/* *INDENT-ON* */
-
-
-
-static clib_error_t *
-set_hw_class (vlib_main_t * vm,
-	      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  clib_error_t *error;
-  u32 hw_if_index, hw_class_index;
-
-  hw_if_index = ~0;
-  if (!unformat_user (input, unformat_vnet_hw_interface, vnm, &hw_if_index))
-    {
-      error = clib_error_return (0, "unknown hardware interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  if (!unformat_user (input, unformat_hash_string,
-		      im->hw_interface_class_by_name, &hw_class_index))
-    {
-      error = clib_error_return (0, "unknown hardware class `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  error = vnet_hw_interface_set_class (vnm, hw_if_index, hw_class_index);
-  if (error)
-    goto done;
-
-done:
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_hw_class_command, static) = {
-  .path = "set interface hw-class",
-  .short_help = "Set interface hardware class",
-  .function = set_hw_class,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-vnet_interface_cli_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (vnet_interface_cli_init);
-
-static clib_error_t *
-renumber_interface_command_fn (vlib_main_t * vm,
-			       unformat_input_t * input,
-			       vlib_cli_command_t * cmd)
-{
-  u32 hw_if_index;
-  u32 new_dev_instance;
-  vnet_main_t *vnm = vnet_get_main ();
-  int rv;
-
-  if (!unformat_user (input, unformat_vnet_hw_interface, vnm, &hw_if_index))
-    return clib_error_return (0, "unknown hardware interface `%U'",
-			      format_unformat_error, input);
-
-  if (!unformat (input, "%d", &new_dev_instance))
-    return clib_error_return (0, "new dev instance missing");
-
-  rv = vnet_interface_name_renumber (hw_if_index, new_dev_instance);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    default:
-      return clib_error_return (0, "vnet_interface_name_renumber returned %d",
-				rv);
-
-    }
-
-  return 0;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (renumber_interface_command, static) = {
-  .path = "renumber interface",
-  .short_help = "renumber interface <if-name> <new-dev-instance>",
-  .function = renumber_interface_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-promiscuous_cmd (vlib_main_t * vm,
-		 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 hw_if_index;
-  u32 flags = ETHERNET_INTERFACE_FLAG_ACCEPT_ALL;
-  ethernet_main_t *em = &ethernet_main;
-  ethernet_interface_t *eif;
-
-  if (unformat (input, "on %U",
-		unformat_vnet_hw_interface, vnm, &hw_if_index))
-    ;
-  else if (unformat (input, "off %U",
-		     unformat_ethernet_interface, vnm, &hw_if_index))
-    flags = 0;
-  else
-    return clib_error_return (0, "unknown input `%U'",
-			      format_unformat_error, input);
-
-  eif = ethernet_get_interface (em, hw_if_index);
-  if (!eif)
-    return clib_error_return (0, "not supported");
-
-  ethernet_set_flags (vnm, hw_if_index, flags);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_promiscuous_cmd, static) = {
-  .path = "set interface promiscuous",
-  .short_help = "set interface promiscuous [on | off] <intfc>",
-  .function = promiscuous_cmd,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-mtu_cmd (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 hw_if_index, mtu;
-  u32 flags = ETHERNET_INTERFACE_FLAG_MTU;
-  ethernet_main_t *em = &ethernet_main;
-
-  if (unformat (input, "%d %U", &mtu,
-		unformat_vnet_hw_interface, vnm, &hw_if_index))
-    {
-      vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
-      ethernet_interface_t *eif = ethernet_get_interface (em, hw_if_index);
-
-      if (!eif)
-	return clib_error_return (0, "not supported");
-
-      if (mtu < hi->min_supported_packet_bytes)
-	return clib_error_return (0, "Invalid mtu (%d): "
-				  "must be >= min pkt bytes (%d)", mtu,
-				  hi->min_supported_packet_bytes);
-
-      if (mtu > hi->max_supported_packet_bytes)
-	return clib_error_return (0, "Invalid mtu (%d): must be <= (%d)", mtu,
-				  hi->max_supported_packet_bytes);
-
-      if (hi->max_packet_bytes != mtu)
-	{
-	  hi->max_packet_bytes = mtu;
-	  ethernet_set_flags (vnm, hw_if_index, flags);
-	}
-    }
-  else
-    return clib_error_return (0, "unknown input `%U'",
-			      format_unformat_error, input);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_mtu_cmd, static) = {
-  .path = "set interface mtu",
-  .short_help = "set interface mtu <value> <intfc>",
-  .function = mtu_cmd,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_interface_mac_address (vlib_main_t * vm, unformat_input_t * input,
-			   vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index = ~0;
-  u64 mac = 0;
-
-  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-  if (!unformat_user (input, unformat_ethernet_address, &mac))
-    {
-      error = clib_error_return (0, "expected mac address `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-  error = vnet_hw_interface_change_mac_address (vnm, sw_if_index, mac);
-done:
-  return error;
-}
-
-/*?
- * The '<em>set interface mac address </em>' command allows to set MAC address of given interface.
- * In case of NIC interfaces the one has to support MAC address change. A side effect of MAC address
- * change are changes of MAC addresses in FIB tables (ipv4 and ipv6).
- *
- * @cliexpar
- * @parblock
- * Example of how to change MAC Address of interface:
- * @cliexcmd{set interface mac address GigabitEthernet0/8/0 aa:bb:cc:dd:ee:01}
- * @cliexcmd{set interface mac address host-vpp0 aa:bb:cc:dd:ee:02}
- * @cliexcmd{set interface mac address tap-0 aa:bb:cc:dd:ee:03}
- * @cliexcmd{set interface mac address pg0 aa:bb:cc:dd:ee:04}
- * @endparblock
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_mac_address_cmd, static) = {
-  .path = "set interface mac address",
-  .short_help = "set interface mac address <intfc> <mac-address>",
-  .function = set_interface_mac_address,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_tag (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index = ~0;
-  u8 *tag = 0;
-
-  if (!unformat (input, "%U %s", unformat_vnet_sw_interface,
-		 vnm, &sw_if_index, &tag))
-    return clib_error_return (0, "unknown input `%U'",
-			      format_unformat_error, input);
-
-  vnet_set_sw_interface_tag (vnm, tag, sw_if_index);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_tag_command, static) = {
-  .path = "set interface tag",
-  .short_help = "set interface tag <intfc> <tag>",
-  .function = set_tag,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-clear_tag (vlib_main_t * vm, unformat_input_t * input,
-	   vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index = ~0;
-
-  if (!unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
-    return clib_error_return (0, "unknown input `%U'",
-			      format_unformat_error, input);
-
-  vnet_clear_sw_interface_tag (vnm, sw_if_index);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (clear_tag_command, static) = {
-  .path = "clear interface tag",
-  .short_help = "clear interface tag <intfc>",
-  .function = clear_tag,
-};
-/* *INDENT-ON* */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/interface_format.c b/vnet/vnet/interface_format.c
deleted file mode 100644
index b3a30622..00000000
--- a/vnet/vnet/interface_format.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * interface_format.c: interface formatting
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vppinfra/bitmap.h>
-
-u8 *
-format_vnet_sw_interface_flags (u8 * s, va_list * args)
-{
-  u32 flags = va_arg (*args, u32);
-
-  if (flags & VNET_SW_INTERFACE_FLAG_BOND_SLAVE)
-    s = format (s, "bond-slave");
-  else
-    {
-      s = format (s, "%s",
-		  (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? "up" : "down");
-      if (flags & VNET_SW_INTERFACE_FLAG_PUNT)
-	s = format (s, "/punt");
-    }
-
-  return s;
-}
-
-u8 *
-format_vnet_hw_interface (u8 * s, va_list * args)
-{
-  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
-  vnet_hw_interface_t *hi = va_arg (*args, vnet_hw_interface_t *);
-  vnet_hw_interface_class_t *hw_class;
-  vnet_device_class_t *dev_class;
-  int verbose = va_arg (*args, int);
-  uword indent;
-
-  if (!hi)
-    return format (s, "%=32s%=6s%=8s%s", "Name", "Idx", "Link", "Hardware");
-
-  indent = format_get_indent (s);
-
-  s = format (s, "%-32v%=6d", hi->name, hi->hw_if_index);
-
-  if (hi->bond_info == VNET_HW_INTERFACE_BOND_INFO_SLAVE)
-    s = format (s, "%=8s", "slave");
-  else
-    s = format (s, "%=8s",
-		hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP ? "up" : "down");
-
-  hw_class = vnet_get_hw_interface_class (vnm, hi->hw_class_index);
-  dev_class = vnet_get_device_class (vnm, hi->dev_class_index);
-
-  if (hi->bond_info && (hi->bond_info != VNET_HW_INTERFACE_BOND_INFO_SLAVE))
-    {
-      int hw_idx;
-      s = format (s, "Slave-Idx:");
-      clib_bitmap_foreach (hw_idx, hi->bond_info, s =
-			   format (s, " %d", hw_idx));
-    }
-  else if (dev_class->format_device_name)
-    s = format (s, "%U", dev_class->format_device_name, hi->dev_instance);
-  else
-    s = format (s, "%s%d", dev_class->name, hi->dev_instance);
-
-  if (verbose)
-    {
-      if (hw_class->format_device)
-	s = format (s, "\n%U%U",
-		    format_white_space, indent + 2,
-		    hw_class->format_device, hi->hw_if_index, verbose);
-      else
-	{
-	  s = format (s, "\n%U%s",
-		      format_white_space, indent + 2, hw_class->name);
-	  if (hw_class->format_address && vec_len (hi->hw_address) > 0)
-	    s =
-	      format (s, " address %U", hw_class->format_address,
-		      hi->hw_address);
-	}
-
-      if (dev_class->format_device)
-	s = format (s, "\n%U%U",
-		    format_white_space, indent + 2,
-		    dev_class->format_device, hi->dev_instance, verbose);
-    }
-
-  return s;
-}
-
-u8 *
-format_vnet_sw_interface_name (u8 * s, va_list * args)
-{
-  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
-  vnet_sw_interface_t *si = va_arg (*args, vnet_sw_interface_t *);
-  vnet_sw_interface_t *si_sup =
-    vnet_get_sup_sw_interface (vnm, si->sw_if_index);
-  vnet_hw_interface_t *hi_sup;
-
-  ASSERT (si_sup->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
-  hi_sup = vnet_get_hw_interface (vnm, si_sup->hw_if_index);
-
-  s = format (s, "%v", hi_sup->name);
-
-  if (si->type != VNET_SW_INTERFACE_TYPE_HARDWARE)
-    s = format (s, ".%d", si->sub.id);
-
-  return s;
-}
-
-u8 *
-format_vnet_sw_if_index_name (u8 * s, va_list * args)
-{
-  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
-  u32 sw_if_index = va_arg (*args, u32);
-  return format (s, "%U",
-		 format_vnet_sw_interface_name, vnm,
-		 vnet_get_sw_interface (vnm, sw_if_index));
-}
-
-u8 *
-format_vnet_sw_interface_cntrs (u8 * s, vnet_interface_main_t * im,
-				vnet_sw_interface_t * si)
-{
-  uword indent, n_printed;
-  int i, j, n_counters;
-  static vnet_main_t **my_vnet_mains;
-
-  vec_reset_length (my_vnet_mains);
-
-  indent = format_get_indent (s);
-  n_printed = 0;
-
-  {
-    vlib_combined_counter_main_t *cm;
-    vlib_counter_t v, vtotal;
-    u8 *n = 0;
-
-    for (i = 0; i < vec_len (vnet_mains); i++)
-      {
-	if (vnet_mains[i])
-	  vec_add1 (my_vnet_mains, vnet_mains[i]);
-      }
-
-    if (vec_len (my_vnet_mains) == 0)
-      vec_add1 (my_vnet_mains, &vnet_main);
-
-    /* Each vnet_main_t has its own copy of the interface counters */
-    n_counters = vec_len (im->combined_sw_if_counters);
-
-    /* rx, tx counters... */
-    for (j = 0; j < n_counters; j++)
-      {
-	vtotal.packets = 0;
-	vtotal.bytes = 0;
-
-	for (i = 0; i < vec_len (my_vnet_mains); i++)
-	  {
-	    im = &my_vnet_mains[i]->interface_main;
-	    cm = im->combined_sw_if_counters + j;
-	    vlib_get_combined_counter (cm, si->sw_if_index, &v);
-	    vtotal.packets += v.packets;
-	    vtotal.bytes += v.bytes;
-	  }
-
-	/* Only display non-zero counters. */
-	if (vtotal.packets == 0)
-	  continue;
-
-	if (n_printed > 0)
-	  s = format (s, "\n%U", format_white_space, indent);
-	n_printed += 2;
-
-	if (n)
-	  _vec_len (n) = 0;
-	n = format (n, "%s packets", cm->name);
-	s = format (s, "%-16v%16Ld", n, vtotal.packets);
-
-	_vec_len (n) = 0;
-	n = format (n, "%s bytes", cm->name);
-	s = format (s, "\n%U%-16v%16Ld",
-		    format_white_space, indent, n, vtotal.bytes);
-      }
-    vec_free (n);
-  }
-
-  {
-    vlib_simple_counter_main_t *cm;
-    u64 v, vtotal;
-
-    n_counters = vec_len (im->sw_if_counters);
-
-    for (j = 0; j < n_counters; j++)
-      {
-	vtotal = 0;
-
-	for (i = 0; i < vec_len (my_vnet_mains); i++)
-	  {
-	    im = &my_vnet_mains[i]->interface_main;
-	    cm = im->sw_if_counters + j;
-
-	    v = vlib_get_simple_counter (cm, si->sw_if_index);
-	    vtotal += v;
-	  }
-
-	/* Only display non-zero counters. */
-	if (vtotal == 0)
-	  continue;
-
-	if (n_printed > 0)
-	  s = format (s, "\n%U", format_white_space, indent);
-	n_printed += 1;
-
-	s = format (s, "%-16s%16Ld", cm->name, vtotal);
-      }
-  }
-
-  return s;
-}
-
-u8 *
-format_vnet_sw_interface (u8 * s, va_list * args)
-{
-  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
-  vnet_sw_interface_t *si = va_arg (*args, vnet_sw_interface_t *);
-  vnet_interface_main_t *im = &vnm->interface_main;
-
-  if (!si)
-    return format (s, "%=32s%=5s%=16s%=16s%=16s",
-		   "Name", "Idx", "State", "Counter", "Count");
-
-  s = format (s, "%-32U%=5d%=16U",
-	      format_vnet_sw_interface_name, vnm, si, si->sw_if_index,
-	      format_vnet_sw_interface_flags, si->flags);
-
-  s = format_vnet_sw_interface_cntrs (s, im, si);
-
-  return s;
-}
-
-u8 *
-format_vnet_sw_interface_name_override (u8 * s, va_list * args)
-{
-  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
-  vnet_sw_interface_t *si = va_arg (*args, vnet_sw_interface_t *);
-  /* caller supplied display name for this interface */
-  u8 *name = va_arg (*args, u8 *);
-  vnet_interface_main_t *im = &vnm->interface_main;
-
-
-  if (!si)
-    return format (s, "%=32s%=5s%=16s%=16s%=16s",
-		   "Name", "Idx", "State", "Counter", "Count");
-
-  s = format (s, "%-32v%=5d%=16U",
-	      name, si->sw_if_index,
-	      format_vnet_sw_interface_flags, si->flags);
-
-  s = format_vnet_sw_interface_cntrs (s, im, si);
-
-  return s;
-}
-
-uword
-unformat_vnet_hw_interface (unformat_input_t * input, va_list * args)
-{
-  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
-  u32 *hw_if_index = va_arg (*args, u32 *);
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vnet_device_class_t *c;
-
-  /* Try per device class functions first. */
-  vec_foreach (c, im->device_classes)
-  {
-    if (c->unformat_device_name
-	&& unformat_user (input, c->unformat_device_name, hw_if_index))
-      return 1;
-  }
-
-  return unformat_user (input, unformat_hash_vec_string,
-			im->hw_interface_by_name, hw_if_index);
-}
-
-uword
-unformat_vnet_sw_interface (unformat_input_t * input, va_list * args)
-{
-  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
-  u32 *result = va_arg (*args, u32 *);
-  vnet_hw_interface_t *hi;
-  u32 hw_if_index, id, id_specified;
-  u8 *if_name = 0;
-  uword *p, error = 0;
-
-  id = ~0;
-  if (unformat (input, "%_%v.%d%_", &if_name, &id)
-      && ((p = hash_get (vnm->interface_main.hw_interface_by_name, if_name))))
-    {
-      hw_if_index = p[0];
-      id_specified = 1;
-    }
-  else
-    if (unformat (input, "%U", unformat_vnet_hw_interface, vnm, &hw_if_index))
-    id_specified = 0;
-  else
-    goto done;
-
-  hi = vnet_get_hw_interface (vnm, hw_if_index);
-  if (!id_specified)
-    {
-      *result = hi->sw_if_index;
-    }
-  else
-    {
-      if (!(p = hash_get (hi->sub_interface_sw_if_index_by_id, id)))
-	return 0;
-      *result = p[0];
-    }
-  error = 1;
-done:
-  vec_free (if_name);
-  return error;
-}
-
-uword
-unformat_vnet_sw_interface_flags (unformat_input_t * input, va_list * args)
-{
-  u32 *result = va_arg (*args, u32 *);
-  u32 flags = 0;
-
-  if (unformat (input, "up"))
-    flags |= VNET_SW_INTERFACE_FLAG_ADMIN_UP;
-  else if (unformat (input, "down"))
-    flags &= ~VNET_SW_INTERFACE_FLAG_ADMIN_UP;
-  else if (unformat (input, "punt"))
-    flags |= VNET_SW_INTERFACE_FLAG_PUNT;
-  else if (unformat (input, "enable"))
-    flags &= ~VNET_SW_INTERFACE_FLAG_PUNT;
-  else
-    return 0;
-
-  *result = flags;
-  return 1;
-}
-
-uword
-unformat_vnet_hw_interface_flags (unformat_input_t * input, va_list * args)
-{
-  u32 *result = va_arg (*args, u32 *);
-  u32 flags = 0;
-
-  if (unformat (input, "up"))
-    flags |= VNET_HW_INTERFACE_FLAG_LINK_UP;
-  else if (unformat (input, "down"))
-    flags &= ~VNET_HW_INTERFACE_FLAG_LINK_UP;
-  else
-    return 0;
-
-  *result = flags;
-  return 1;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/interface_funcs.h b/vnet/vnet/interface_funcs.h
deleted file mode 100644
index b84d151c..00000000
--- a/vnet/vnet/interface_funcs.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * interface_funcs.h: VNET interfaces/sub-interfaces exported functions
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vnet_interface_funcs_h
-#define included_vnet_interface_funcs_h
-
-always_inline vnet_hw_interface_t *
-vnet_get_hw_interface (vnet_main_t * vnm, u32 hw_if_index)
-{
-  return pool_elt_at_index (vnm->interface_main.hw_interfaces, hw_if_index);
-}
-
-always_inline vnet_sw_interface_t *
-vnet_get_sw_interface (vnet_main_t * vnm, u32 sw_if_index)
-{
-  return pool_elt_at_index (vnm->interface_main.sw_interfaces, sw_if_index);
-}
-
-always_inline vnet_sw_interface_t *
-vnet_get_hw_sw_interface (vnet_main_t * vnm, u32 hw_if_index)
-{
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, hw->sw_if_index);
-  ASSERT (sw->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
-  return sw;
-}
-
-always_inline vnet_sw_interface_t *
-vnet_get_sup_sw_interface (vnet_main_t * vnm, u32 sw_if_index)
-{
-  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, sw_if_index);
-  if (sw->type == VNET_SW_INTERFACE_TYPE_SUB)
-    sw = vnet_get_sw_interface (vnm, sw->sup_sw_if_index);
-  return sw;
-}
-
-always_inline vnet_hw_interface_t *
-vnet_get_sup_hw_interface (vnet_main_t * vnm, u32 sw_if_index)
-{
-  vnet_sw_interface_t *sw = vnet_get_sup_sw_interface (vnm, sw_if_index);
-  ASSERT (sw->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
-  return vnet_get_hw_interface (vnm, sw->hw_if_index);
-}
-
-always_inline vnet_hw_interface_class_t *
-vnet_get_hw_interface_class (vnet_main_t * vnm, u32 hw_class_index)
-{
-  return vec_elt_at_index (vnm->interface_main.hw_interface_classes,
-			   hw_class_index);
-}
-
-always_inline vnet_device_class_t *
-vnet_get_device_class (vnet_main_t * vnm, u32 dev_class_index)
-{
-  return vec_elt_at_index (vnm->interface_main.device_classes,
-			   dev_class_index);
-}
-
-static inline u8 *
-vnet_get_sw_interface_tag (vnet_main_t * vnm, u32 sw_if_index)
-{
-  uword *p;
-  p = hash_get (vnm->interface_tag_by_sw_if_index, sw_if_index);
-  if (p)
-    return ((u8 *) p[0]);
-  return 0;
-}
-
-static inline void
-vnet_set_sw_interface_tag (vnet_main_t * vnm, u8 * tag, u32 sw_if_index)
-{
-  uword *p;
-  p = hash_get (vnm->interface_tag_by_sw_if_index, sw_if_index);
-  if (p)
-    {
-      u8 *oldtag = (u8 *) p[0];
-      hash_unset (vnm->interface_tag_by_sw_if_index, sw_if_index);
-      vec_free (oldtag);
-    }
-
-  hash_set (vnm->interface_tag_by_sw_if_index, sw_if_index, tag);
-}
-
-static inline void
-vnet_clear_sw_interface_tag (vnet_main_t * vnm, u32 sw_if_index)
-{
-  uword *p;
-  p = hash_get (vnm->interface_tag_by_sw_if_index, sw_if_index);
-  if (p)
-    {
-      u8 *oldtag = (u8 *) p[0];
-      hash_unset (vnm->interface_tag_by_sw_if_index, sw_if_index);
-      vec_free (oldtag);
-    }
-}
-
-/**
- * Call back walk type for walking SW indices on a HW interface
- */
-typedef void (*vnet_hw_sw_interface_walk_t) (vnet_main_t * vnm,
-					     u32 sw_if_index, void *ctx);
-
-/**
- * @brief
- * Walk the SW interfaces on a HW interface - this is the super
- * interface and any sub-interfaces.
- */
-void vnet_hw_interface_walk_sw (vnet_main_t * vnm,
-				u32 hw_if_index,
-				vnet_hw_sw_interface_walk_t fn, void *ctx);
-
-/* Register a hardware interface instance. */
-u32 vnet_register_interface (vnet_main_t * vnm,
-			     u32 dev_class_index,
-			     u32 dev_instance,
-			     u32 hw_class_index, u32 hw_instance);
-
-/* Creates a software interface given template. */
-clib_error_t *vnet_create_sw_interface (vnet_main_t * vnm,
-					vnet_sw_interface_t * template,
-					u32 * sw_if_index);
-
-void vnet_delete_hw_interface (vnet_main_t * vnm, u32 hw_if_index);
-void vnet_delete_sw_interface (vnet_main_t * vnm, u32 sw_if_index);
-int vnet_sw_interface_is_p2p (vnet_main_t * vnm, u32 sw_if_index);
-
-always_inline uword
-vnet_sw_interface_get_flags (vnet_main_t * vnm, u32 sw_if_index)
-{
-  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, sw_if_index);
-  return sw->flags;
-}
-
-always_inline uword
-vnet_sw_interface_is_admin_up (vnet_main_t * vnm, u32 sw_if_index)
-{
-  return (vnet_sw_interface_get_flags (vnm, sw_if_index) &
-	  VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
-}
-
-always_inline uword
-vnet_hw_interface_get_flags (vnet_main_t * vnm, u32 hw_if_index)
-{
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  return hw->flags;
-}
-
-always_inline uword
-vnet_hw_interface_get_mtu (vnet_main_t * vnm, u32 hw_if_index,
-			   vlib_rx_or_tx_t dir)
-{
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  return hw->max_l3_packet_bytes[dir];
-}
-
-always_inline uword
-vnet_sw_interface_get_mtu (vnet_main_t * vnm, u32 sw_if_index,
-			   vlib_rx_or_tx_t dir)
-{
-  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  return (hw->max_l3_packet_bytes[dir]);
-}
-
-always_inline uword
-vnet_hw_interface_is_link_up (vnet_main_t * vnm, u32 hw_if_index)
-{
-  return (vnet_hw_interface_get_flags (vnm, hw_if_index) &
-	  VNET_HW_INTERFACE_FLAG_LINK_UP) != 0;
-}
-
-always_inline vlib_frame_t *
-vnet_get_frame_to_sw_interface (vnet_main_t * vnm, u32 sw_if_index)
-{
-  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  return vlib_get_frame_to_node (vnm->vlib_main, hw->output_node_index);
-}
-
-always_inline void
-vnet_put_frame_to_sw_interface (vnet_main_t * vnm, u32 sw_if_index,
-				vlib_frame_t * f)
-{
-  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  return vlib_put_frame_to_node (vnm->vlib_main, hw->output_node_index, f);
-}
-
-/* Change interface flags (e.g. up, down, enable, disable). */
-clib_error_t *vnet_hw_interface_set_flags (vnet_main_t * vnm, u32 hw_if_index,
-					   u32 flags);
-
-/* Change interface flags (e.g. up, down, enable, disable). */
-clib_error_t *vnet_sw_interface_set_flags (vnet_main_t * vnm, u32 sw_if_index,
-					   u32 flags);
-
-/* Change interface class. */
-clib_error_t *vnet_hw_interface_set_class (vnet_main_t * vnm, u32 hw_if_index,
-					   u32 new_hw_class_index);
-
-/* Redirect rx pkts to node */
-int vnet_hw_interface_rx_redirect_to_node (vnet_main_t * vnm, u32 hw_if_index,
-					   u32 node_index);
-
-void vnet_hw_interface_init_for_class (vnet_main_t * vnm, u32 hw_if_index,
-				       u32 hw_class_index, u32 hw_instance);
-
-/* Rename interface */
-clib_error_t *vnet_rename_interface (vnet_main_t * vnm, u32 hw_if_index,
-				     char *new_name);
-
-/* Change interface mac address*/
-clib_error_t *vnet_hw_interface_change_mac_address (vnet_main_t * vnm,
-						    u32 hw_if_index,
-						    u64 mac_address);
-
-/* Formats sw/hw interface. */
-format_function_t format_vnet_hw_interface;
-format_function_t format_vnet_sw_interface;
-format_function_t format_vnet_sw_interface_name;
-format_function_t format_vnet_sw_interface_name_override;
-format_function_t format_vnet_sw_if_index_name;
-format_function_t format_vnet_sw_interface_flags;
-
-/* Parses sw/hw interface name -> index. */
-unformat_function_t unformat_vnet_sw_interface;
-unformat_function_t unformat_vnet_hw_interface;
-
-/* Parses interface flags (up, down, enable, disable, etc.) */
-unformat_function_t unformat_vnet_hw_interface_flags;
-unformat_function_t unformat_vnet_sw_interface_flags;
-
-/* Node runtime for interface output function. */
-typedef struct
-{
-  u32 hw_if_index;
-  u32 sw_if_index;
-  u32 dev_instance;
-  u32 is_deleted;
-} vnet_interface_output_runtime_t;
-
-/* Interface output functions. */
-void *vnet_interface_output_node_multiarch_select (void);
-void *vnet_interface_output_node_flatten_multiarch_select (void);
-
-word vnet_sw_interface_compare (vnet_main_t * vnm, uword sw_if_index0,
-				uword sw_if_index1);
-word vnet_hw_interface_compare (vnet_main_t * vnm, uword hw_if_index0,
-				uword hw_if_index1);
-
-typedef enum
-{
-  VNET_INTERFACE_OUTPUT_NEXT_DROP,
-  VNET_INTERFACE_OUTPUT_NEXT_TX,
-} vnet_interface_output_next_t;
-
-typedef enum
-{
-  VNET_INTERFACE_TX_NEXT_DROP,
-  VNET_INTERFACE_TX_N_NEXT,
-} vnet_interface_tx_next_t;
-
-#define VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT VNET_INTERFACE_TX_N_NEXT
-
-typedef enum
-{
-  VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DOWN,
-  VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DELETED,
-} vnet_interface_output_error_t;
-
-/* Format for interface output traces. */
-u8 *format_vnet_interface_output_trace (u8 * s, va_list * va);
-
-serialize_function_t serialize_vnet_interface_state,
-  unserialize_vnet_interface_state;
-
-#endif /* included_vnet_interface_funcs_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/interface_output.c b/vnet/vnet/interface_output.c
deleted file mode 100644
index 475b0b93..00000000
--- a/vnet/vnet/interface_output.c
+++ /dev/null
@@ -1,1404 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * interface_output.c: interface output node
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/feature/feature.h>
-
-typedef struct
-{
-  u32 sw_if_index;
-  u8 data[128 - sizeof (u32)];
-}
-interface_output_trace_t;
-
-u8 *
-format_vnet_interface_output_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  vlib_node_t *node = va_arg (*va, vlib_node_t *);
-  interface_output_trace_t *t = va_arg (*va, interface_output_trace_t *);
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_sw_interface_t *si;
-  uword indent;
-
-  if (t->sw_if_index != (u32) ~ 0)
-    {
-      indent = format_get_indent (s);
-
-      if (pool_is_free_index
-	  (vnm->interface_main.sw_interfaces, t->sw_if_index))
-	{
-	  /* the interface may have been deleted by the time the trace is printed */
-	  s = format (s, "sw_if_index: %d\n%U%U",
-		      t->sw_if_index,
-		      format_white_space, indent,
-		      node->format_buffer ? node->
-		      format_buffer : format_hex_bytes, t->data,
-		      sizeof (t->data));
-	}
-      else
-	{
-	  si = vnet_get_sw_interface (vnm, t->sw_if_index);
-
-	  s = format (s, "%U\n%U%U",
-		      format_vnet_sw_interface_name, vnm, si,
-		      format_white_space, indent,
-		      node->format_buffer ? node->
-		      format_buffer : format_hex_bytes, t->data,
-		      sizeof (t->data));
-	}
-    }
-  return s;
-}
-
-static void
-vnet_interface_output_trace (vlib_main_t * vm,
-			     vlib_node_runtime_t * node,
-			     vlib_frame_t * frame, uword n_buffers)
-{
-  u32 n_left, *from;
-
-  n_left = n_buffers;
-  from = vlib_frame_args (frame);
-
-  while (n_left >= 4)
-    {
-      u32 bi0, bi1;
-      vlib_buffer_t *b0, *b1;
-      interface_output_trace_t *t0, *t1;
-
-      /* Prefetch next iteration. */
-      vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
-      vlib_prefetch_buffer_with_index (vm, from[3], LOAD);
-
-      bi0 = from[0];
-      bi1 = from[1];
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-	  t0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	  clib_memcpy (t0->data, vlib_buffer_get_current (b0),
-		       sizeof (t0->data));
-	}
-      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
-	  t1->sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_TX];
-	  clib_memcpy (t1->data, vlib_buffer_get_current (b1),
-		       sizeof (t1->data));
-	}
-      from += 2;
-      n_left -= 2;
-    }
-
-  while (n_left >= 1)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      interface_output_trace_t *t0;
-
-      bi0 = from[0];
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-	  t0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	  clib_memcpy (t0->data, vlib_buffer_get_current (b0),
-		       sizeof (t0->data));
-	}
-      from += 1;
-      n_left -= 1;
-    }
-}
-
-static never_inline u32
-slow_path (vlib_main_t * vm,
-	   u32 bi,
-	   vlib_buffer_t * b,
-	   u32 n_left_to_tx, u32 * to_tx, u32 * n_slow_bytes_result)
-{
-  /* We've already enqueued a single buffer. */
-  u32 n_buffers = 0;
-  u32 n_slow_bytes = 0;
-
-  while (n_left_to_tx > 0)
-    {
-      to_tx[0] = bi;
-      to_tx += 1;
-      n_left_to_tx -= 1;
-      n_buffers += 1;
-      n_slow_bytes += vlib_buffer_length_in_chain (vm, b);
-
-      /* Be grumpy about zero length buffers for benefit of
-         driver tx function. */
-      ASSERT (b->current_length > 0);
-
-      if (!(b->flags & VLIB_BUFFER_NEXT_PRESENT))
-	break;
-
-      bi = b->next_buffer;
-      b = vlib_get_buffer (vm, bi);
-    }
-
-  /* Ran out of space in next frame trying to enqueue buffers? */
-  if (b->flags & VLIB_BUFFER_NEXT_PRESENT)
-    return 0;
-
-  *n_slow_bytes_result = n_slow_bytes;
-  return n_buffers;
-}
-
-/*
- * Increment TX stats. Roll up consecutive increments to the same sw_if_index
- * into one increment.
- */
-static_always_inline void
-incr_output_stats (vnet_main_t * vnm,
-		   u32 cpu_index,
-		   u32 length,
-		   u32 sw_if_index,
-		   u32 * last_sw_if_index, u32 * n_packets, u32 * n_bytes)
-{
-  vnet_interface_main_t *im;
-
-  if (PREDICT_TRUE (sw_if_index == *last_sw_if_index))
-    {
-      *n_packets += 1;
-      *n_bytes += length;
-    }
-  else
-    {
-      if (PREDICT_TRUE (*last_sw_if_index != ~0))
-	{
-	  im = &vnm->interface_main;
-
-	  vlib_increment_combined_counter (im->combined_sw_if_counters
-					   + VNET_INTERFACE_COUNTER_TX,
-					   cpu_index,
-					   *last_sw_if_index,
-					   *n_packets, *n_bytes);
-	}
-      *last_sw_if_index = sw_if_index;
-      *n_packets = 1;
-      *n_bytes = length;
-    }
-}
-
-
-/* Interface output functions. */
-uword
-vnet_interface_output_node_flatten (vlib_main_t * vm,
-				    vlib_node_runtime_t * node,
-				    vlib_frame_t * frame)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_output_runtime_t *rt = (void *) node->runtime_data;
-  vnet_sw_interface_t *si;
-  vnet_hw_interface_t *hi;
-  u32 n_left_to_tx, *from, *from_end, *to_tx;
-  u32 n_bytes, n_buffers, n_packets;
-  u32 last_sw_if_index;
-  u32 cpu_index = vm->cpu_index;
-
-  n_buffers = frame->n_vectors;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vnet_interface_output_trace (vm, node, frame, n_buffers);
-
-  from = vlib_frame_args (frame);
-
-  if (rt->is_deleted)
-    return vlib_error_drop_buffers (vm, node, from,
-				    /* buffer stride */ 1,
-				    n_buffers,
-				    VNET_INTERFACE_OUTPUT_NEXT_DROP,
-				    node->node_index,
-				    VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DELETED);
-
-  si = vnet_get_sw_interface (vnm, rt->sw_if_index);
-  hi = vnet_get_sup_hw_interface (vnm, rt->sw_if_index);
-  if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ||
-      !(hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP))
-    {
-      vlib_simple_counter_main_t *cm;
-
-      cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
-			     VNET_INTERFACE_COUNTER_TX_ERROR);
-      vlib_increment_simple_counter (cm, cpu_index,
-				     rt->sw_if_index, n_buffers);
-      return vlib_error_drop_buffers (vm, node, from,
-				      /* buffer stride */ 1,
-				      n_buffers,
-				      VNET_INTERFACE_OUTPUT_NEXT_DROP,
-				      node->node_index,
-				      VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DOWN);
-    }
-
-  from_end = from + n_buffers;
-
-  /* Total byte count of all buffers. */
-  n_bytes = 0;
-  n_packets = 0;
-  last_sw_if_index = ~0;
-
-  while (from < from_end)
-    {
-      /* Get new next frame since previous incomplete frame may have less
-         than VNET_FRAME_SIZE vectors in it. */
-      vlib_get_new_next_frame (vm, node, VNET_INTERFACE_OUTPUT_NEXT_TX,
-			       to_tx, n_left_to_tx);
-
-      while (from + 4 <= from_end && n_left_to_tx >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-
-	  /* Prefetch next iteration. */
-	  vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
-	  vlib_prefetch_buffer_with_index (vm, from[3], LOAD);
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_tx[0] = bi0;
-	  to_tx[1] = bi1;
-	  from += 2;
-	  to_tx += 2;
-	  n_left_to_tx -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  /* Be grumpy about zero length buffers for benefit of
-	     driver tx function. */
-	  ASSERT (b0->current_length > 0);
-	  ASSERT (b1->current_length > 0);
-
-	  if (PREDICT_FALSE
-	      ((b0->flags | b1->flags) & VLIB_BUFFER_NEXT_PRESENT))
-	    {
-	      u32 n_buffers, n_slow_bytes, i;
-
-	      /* Undo. */
-	      from -= 2;
-	      to_tx -= 2;
-	      n_left_to_tx += 2;
-
-	      /* Do slow path two times. */
-	      for (i = 0; i < 2; i++)
-		{
-		  u32 bi = i ? bi1 : bi0;
-		  vlib_buffer_t *b = i ? b1 : b0;
-
-		  n_buffers = slow_path (vm, bi, b,
-					 n_left_to_tx, to_tx, &n_slow_bytes);
-
-		  /* Not enough room for single packet? */
-		  if (n_buffers == 0)
-		    goto put;
-
-		  from += 1;
-		  to_tx += n_buffers;
-		  n_left_to_tx -= n_buffers;
-		  incr_output_stats (vnm, cpu_index, n_slow_bytes,
-				     vnet_buffer (b)->sw_if_index[VLIB_TX],
-				     &last_sw_if_index, &n_packets, &n_bytes);
-		}
-	    }
-	  else
-	    {
-	      incr_output_stats (vnm, cpu_index,
-				 vlib_buffer_length_in_chain (vm, b0),
-				 vnet_buffer (b0)->sw_if_index[VLIB_TX],
-				 &last_sw_if_index, &n_packets, &n_bytes);
-	      incr_output_stats (vnm, cpu_index,
-				 vlib_buffer_length_in_chain (vm, b0),
-				 vnet_buffer (b1)->sw_if_index[VLIB_TX],
-				 &last_sw_if_index, &n_packets, &n_bytes);
-	    }
-	}
-
-      while (from + 1 <= from_end && n_left_to_tx >= 1)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-
-	  bi0 = from[0];
-	  to_tx[0] = bi0;
-	  from += 1;
-	  to_tx += 1;
-	  n_left_to_tx -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  /* Be grumpy about zero length buffers for benefit of
-	     driver tx function. */
-	  ASSERT (b0->current_length > 0);
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_NEXT_PRESENT))
-	    {
-	      u32 n_buffers, n_slow_bytes;
-
-	      /* Undo. */
-	      from -= 1;
-	      to_tx -= 1;
-	      n_left_to_tx += 1;
-
-	      n_buffers = slow_path (vm, bi0, b0,
-				     n_left_to_tx, to_tx, &n_slow_bytes);
-
-	      /* Not enough room for single packet? */
-	      if (n_buffers == 0)
-		goto put;
-
-	      from += 1;
-	      to_tx += n_buffers;
-	      n_left_to_tx -= n_buffers;
-	    }
-	  incr_output_stats (vnm, cpu_index,
-			     vlib_buffer_length_in_chain (vm, b0),
-			     vnet_buffer (b0)->sw_if_index[VLIB_TX],
-			     &last_sw_if_index, &n_packets, &n_bytes);
-	}
-
-    put:
-      vlib_put_next_frame (vm, node, VNET_INTERFACE_OUTPUT_NEXT_TX,
-			   n_left_to_tx);
-    }
-
-  /* Final update of interface stats. */
-  incr_output_stats (vnm, cpu_index, 0, ~0,	/* ~0 will flush stats */
-		     &last_sw_if_index, &n_packets, &n_bytes);
-
-  return n_buffers;
-}
-
-VLIB_NODE_FUNCTION_MULTIARCH_CLONE (vnet_interface_output_node_flatten);
-CLIB_MULTIARCH_SELECT_FN (vnet_interface_output_node_flatten);
-
-uword
-vnet_interface_output_node (vlib_main_t * vm,
-			    vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_output_runtime_t *rt = (void *) node->runtime_data;
-  vnet_sw_interface_t *si;
-  vnet_hw_interface_t *hi;
-  u32 n_left_to_tx, *from, *from_end, *to_tx;
-  u32 n_bytes, n_buffers, n_packets;
-  u32 n_bytes_b0, n_bytes_b1;
-  u32 cpu_index = vm->cpu_index;
-  vnet_interface_main_t *im = &vnm->interface_main;
-  u32 next_index = VNET_INTERFACE_OUTPUT_NEXT_TX;
-  u32 current_config_index = ~0;
-  u8 arc = im->output_feature_arc_index;
-
-  n_buffers = frame->n_vectors;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vnet_interface_output_trace (vm, node, frame, n_buffers);
-
-  from = vlib_frame_args (frame);
-
-  if (rt->is_deleted)
-    return vlib_error_drop_buffers (vm, node, from,
-				    /* buffer stride */ 1,
-				    n_buffers,
-				    VNET_INTERFACE_OUTPUT_NEXT_DROP,
-				    node->node_index,
-				    VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DELETED);
-
-  si = vnet_get_sw_interface (vnm, rt->sw_if_index);
-  hi = vnet_get_sup_hw_interface (vnm, rt->sw_if_index);
-  if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ||
-      !(hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP))
-    {
-      vlib_simple_counter_main_t *cm;
-
-      cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
-			     VNET_INTERFACE_COUNTER_TX_ERROR);
-      vlib_increment_simple_counter (cm, cpu_index,
-				     rt->sw_if_index, n_buffers);
-
-      return vlib_error_drop_buffers (vm, node, from,
-				      /* buffer stride */ 1,
-				      n_buffers,
-				      VNET_INTERFACE_OUTPUT_NEXT_DROP,
-				      node->node_index,
-				      VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DOWN);
-    }
-
-  from_end = from + n_buffers;
-
-  /* Total byte count of all buffers. */
-  n_bytes = 0;
-  n_packets = 0;
-
-  /* interface-output feature arc handling */
-  if (PREDICT_FALSE (vnet_have_features (arc, rt->sw_if_index)))
-    {
-      vnet_feature_config_main_t *fcm;
-      fcm = vnet_feature_get_config_main (arc);
-      current_config_index = vnet_get_feature_config_index (arc,
-							    rt->sw_if_index);
-      vnet_get_config_data (&fcm->config_main, &current_config_index,
-			    &next_index, 0);
-    }
-
-  while (from < from_end)
-    {
-      /* Get new next frame since previous incomplete frame may have less
-         than VNET_FRAME_SIZE vectors in it. */
-      vlib_get_new_next_frame (vm, node, next_index, to_tx, n_left_to_tx);
-
-      while (from + 4 <= from_end && n_left_to_tx >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 tx_swif0, tx_swif1;
-
-	  /* Prefetch next iteration. */
-	  vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
-	  vlib_prefetch_buffer_with_index (vm, from[3], LOAD);
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_tx[0] = bi0;
-	  to_tx[1] = bi1;
-	  from += 2;
-	  to_tx += 2;
-	  n_left_to_tx -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  /* Be grumpy about zero length buffers for benefit of
-	     driver tx function. */
-	  ASSERT (b0->current_length > 0);
-	  ASSERT (b1->current_length > 0);
-
-	  n_bytes_b0 = vlib_buffer_length_in_chain (vm, b0);
-	  n_bytes_b1 = vlib_buffer_length_in_chain (vm, b1);
-	  tx_swif0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	  tx_swif1 = vnet_buffer (b1)->sw_if_index[VLIB_TX];
-
-	  n_bytes += n_bytes_b0 + n_bytes_b1;
-	  n_packets += 2;
-
-	  if (PREDICT_FALSE (current_config_index != ~0))
-	    {
-	      b0->feature_arc_index = arc;
-	      b1->feature_arc_index = arc;
-	      b0->current_config_index = current_config_index;
-	      b1->current_config_index = current_config_index;
-	    }
-
-	  if (PREDICT_FALSE (tx_swif0 != rt->sw_if_index))
-	    {
-	      /* update vlan subif tx counts, if required */
-	      vlib_increment_combined_counter (im->combined_sw_if_counters +
-					       VNET_INTERFACE_COUNTER_TX,
-					       cpu_index, tx_swif0, 1,
-					       n_bytes_b0);
-	    }
-
-	  /* update vlan subif tx counts, if required */
-	  if (PREDICT_FALSE (tx_swif1 != rt->sw_if_index))
-	    {
-
-	      vlib_increment_combined_counter (im->combined_sw_if_counters +
-					       VNET_INTERFACE_COUNTER_TX,
-					       cpu_index, tx_swif1, 1,
-					       n_bytes_b1);
-	    }
-	}
-
-      while (from + 1 <= from_end && n_left_to_tx >= 1)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 tx_swif0;
-
-	  bi0 = from[0];
-	  to_tx[0] = bi0;
-	  from += 1;
-	  to_tx += 1;
-	  n_left_to_tx -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  /* Be grumpy about zero length buffers for benefit of
-	     driver tx function. */
-	  ASSERT (b0->current_length > 0);
-
-	  n_bytes_b0 = vlib_buffer_length_in_chain (vm, b0);
-	  tx_swif0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	  n_bytes += n_bytes_b0;
-	  n_packets += 1;
-
-	  if (PREDICT_FALSE (current_config_index != ~0))
-	    {
-	      b0->feature_arc_index = arc;
-	      b0->current_config_index = current_config_index;
-	    }
-
-	  if (PREDICT_FALSE (tx_swif0 != rt->sw_if_index))
-	    {
-
-	      vlib_increment_combined_counter (im->combined_sw_if_counters +
-					       VNET_INTERFACE_COUNTER_TX,
-					       cpu_index, tx_swif0, 1,
-					       n_bytes_b0);
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_tx);
-    }
-
-  /* Update main interface stats. */
-  vlib_increment_combined_counter (im->combined_sw_if_counters
-				   + VNET_INTERFACE_COUNTER_TX,
-				   cpu_index,
-				   rt->sw_if_index, n_packets, n_bytes);
-  return n_buffers;
-}
-
-VLIB_NODE_FUNCTION_MULTIARCH_CLONE (vnet_interface_output_node);
-CLIB_MULTIARCH_SELECT_FN (vnet_interface_output_node);
-
-/* Use buffer's sw_if_index[VNET_TX] to choose output interface. */
-static uword
-vnet_per_buffer_interface_output (vlib_main_t * vm,
-				  vlib_node_runtime_t * node,
-				  vlib_frame_t * frame)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 n_left_to_next, *from, *to_next;
-  u32 n_left_from, next_index;
-
-  n_left_from = frame->n_vectors;
-
-  from = vlib_frame_args (frame);
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1, next0, next1;
-	  vlib_buffer_t *b0, *b1;
-	  vnet_hw_interface_t *hi0, *hi1;
-
-	  /* Prefetch next iteration. */
-	  vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
-	  vlib_prefetch_buffer_with_index (vm, from[3], LOAD);
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  hi0 =
-	    vnet_get_sup_hw_interface (vnm,
-				       vnet_buffer (b0)->sw_if_index
-				       [VLIB_TX]);
-	  hi1 =
-	    vnet_get_sup_hw_interface (vnm,
-				       vnet_buffer (b1)->sw_if_index
-				       [VLIB_TX]);
-
-	  next0 = hi0->hw_if_index;
-	  next1 = hi1->hw_if_index;
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, bi1, next0,
-					   next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, next0;
-	  vlib_buffer_t *b0;
-	  vnet_hw_interface_t *hi0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  n_left_from -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  hi0 =
-	    vnet_get_sup_hw_interface (vnm,
-				       vnet_buffer (b0)->sw_if_index
-				       [VLIB_TX]);
-
-	  next0 = hi0->hw_if_index;
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-always_inline u32
-counter_index (vlib_main_t * vm, vlib_error_t e)
-{
-  vlib_node_t *n;
-  u32 ci, ni;
-
-  ni = vlib_error_get_node (e);
-  n = vlib_get_node (vm, ni);
-
-  ci = vlib_error_get_code (e);
-  ASSERT (ci < n->n_errors);
-
-  ci += n->error_heap_index;
-
-  return ci;
-}
-
-static u8 *
-format_vnet_error_trace (u8 * s, va_list * va)
-{
-  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  vlib_error_t *e = va_arg (*va, vlib_error_t *);
-  vlib_node_t *error_node;
-  vlib_error_main_t *em = &vm->error_main;
-  u32 i;
-
-  error_node = vlib_get_node (vm, vlib_error_get_node (e[0]));
-  i = counter_index (vm, e[0]);
-  s = format (s, "%v: %s", error_node->name, em->error_strings_heap[i]);
-
-  return s;
-}
-
-static void
-trace_errors_with_buffers (vlib_main_t * vm,
-			   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left, *buffers;
-
-  buffers = vlib_frame_vector_args (frame);
-  n_left = frame->n_vectors;
-
-  while (n_left >= 4)
-    {
-      u32 bi0, bi1;
-      vlib_buffer_t *b0, *b1;
-      vlib_error_t *t0, *t1;
-
-      /* Prefetch next iteration. */
-      vlib_prefetch_buffer_with_index (vm, buffers[2], LOAD);
-      vlib_prefetch_buffer_with_index (vm, buffers[3], LOAD);
-
-      bi0 = buffers[0];
-      bi1 = buffers[1];
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-	  t0[0] = b0->error;
-	}
-      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
-	  t1[0] = b1->error;
-	}
-      buffers += 2;
-      n_left -= 2;
-    }
-
-  while (n_left >= 1)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      vlib_error_t *t0;
-
-      bi0 = buffers[0];
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-	  t0[0] = b0->error;
-	}
-      buffers += 1;
-      n_left -= 1;
-    }
-}
-
-static u8 *
-validate_error (vlib_main_t * vm, vlib_error_t * e, u32 index)
-{
-  uword node_index = vlib_error_get_node (e[0]);
-  uword code = vlib_error_get_code (e[0]);
-  vlib_node_t *n;
-
-  if (node_index >= vec_len (vm->node_main.nodes))
-    return format (0, "[%d], node index out of range 0x%x, error 0x%x",
-		   index, node_index, e[0]);
-
-  n = vlib_get_node (vm, node_index);
-  if (code >= n->n_errors)
-    return format (0, "[%d], code %d out of range for node %v",
-		   index, code, n->name);
-
-  return 0;
-}
-
-static u8 *
-validate_error_frame (vlib_main_t * vm,
-		      vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  u32 *buffers = vlib_frame_args (f);
-  vlib_buffer_t *b;
-  u8 *msg = 0;
-  uword i;
-
-  for (i = 0; i < f->n_vectors; i++)
-    {
-      b = vlib_get_buffer (vm, buffers[i]);
-      msg = validate_error (vm, &b->error, i);
-      if (msg)
-	return msg;
-    }
-
-  return msg;
-}
-
-typedef enum
-{
-  VNET_ERROR_DISPOSITION_DROP,
-  VNET_ERROR_DISPOSITION_PUNT,
-  VNET_ERROR_N_DISPOSITION,
-} vnet_error_disposition_t;
-
-always_inline void
-do_packet (vlib_main_t * vm, vlib_error_t a)
-{
-  vlib_error_main_t *em = &vm->error_main;
-  u32 i = counter_index (vm, a);
-  em->counters[i] += 1;
-  vlib_error_elog_count (vm, i, 1);
-}
-
-static_always_inline uword
-process_drop_punt (vlib_main_t * vm,
-		   vlib_node_runtime_t * node,
-		   vlib_frame_t * frame, vnet_error_disposition_t disposition)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_error_main_t *em = &vm->error_main;
-  u32 *buffers, *first_buffer;
-  vlib_error_t current_error;
-  u32 current_counter_index, n_errors_left;
-  u32 current_sw_if_index, n_errors_current_sw_if_index;
-  u64 current_counter;
-  vlib_simple_counter_main_t *cm;
-  u32 cpu_index = vm->cpu_index;
-
-  static vlib_error_t memory[VNET_ERROR_N_DISPOSITION];
-  static char memory_init[VNET_ERROR_N_DISPOSITION];
-
-  buffers = vlib_frame_args (frame);
-  first_buffer = buffers;
-
-  {
-    vlib_buffer_t *b = vlib_get_buffer (vm, first_buffer[0]);
-
-    if (!memory_init[disposition])
-      {
-	memory_init[disposition] = 1;
-	memory[disposition] = b->error;
-      }
-
-    current_sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_RX];
-    n_errors_current_sw_if_index = 0;
-  }
-
-  current_error = memory[disposition];
-  current_counter_index = counter_index (vm, memory[disposition]);
-  current_counter = em->counters[current_counter_index];
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    trace_errors_with_buffers (vm, node, frame);
-
-  n_errors_left = frame->n_vectors;
-  cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
-			 (disposition == VNET_ERROR_DISPOSITION_PUNT
-			  ? VNET_INTERFACE_COUNTER_PUNT
-			  : VNET_INTERFACE_COUNTER_DROP));
-
-  while (n_errors_left >= 2)
-    {
-      vlib_buffer_t *b0, *b1;
-      vnet_sw_interface_t *sw_if0, *sw_if1;
-      vlib_error_t e0, e1;
-      u32 bi0, bi1;
-      u32 sw_if_index0, sw_if_index1;
-
-      bi0 = buffers[0];
-      bi1 = buffers[1];
-
-      buffers += 2;
-      n_errors_left -= 2;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      e0 = b0->error;
-      e1 = b1->error;
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-
-      /* Speculate that sw_if_index == sw_if_index[01]. */
-      n_errors_current_sw_if_index += 2;
-
-      /* Speculatively assume all 2 (node, code) pairs are equal
-         to current (node, code). */
-      current_counter += 2;
-
-      if (PREDICT_FALSE (e0 != current_error
-			 || e1 != current_error
-			 || sw_if_index0 != current_sw_if_index
-			 || sw_if_index1 != current_sw_if_index))
-	{
-	  current_counter -= 2;
-	  n_errors_current_sw_if_index -= 2;
-
-	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
-	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index1, 1);
-
-	  /* Increment super-interface drop/punt counters for
-	     sub-interfaces. */
-	  sw_if0 = vnet_get_sw_interface (vnm, sw_if_index0);
-	  vlib_increment_simple_counter
-	    (cm, cpu_index, sw_if0->sup_sw_if_index,
-	     sw_if0->sup_sw_if_index != sw_if_index0);
-
-	  sw_if1 = vnet_get_sw_interface (vnm, sw_if_index1);
-	  vlib_increment_simple_counter
-	    (cm, cpu_index, sw_if1->sup_sw_if_index,
-	     sw_if1->sup_sw_if_index != sw_if_index1);
-
-	  em->counters[current_counter_index] = current_counter;
-	  do_packet (vm, e0);
-	  do_packet (vm, e1);
-
-	  /* For 2 repeated errors, change current error. */
-	  if (e0 == e1 && e1 != current_error)
-	    {
-	      current_error = e0;
-	      current_counter_index = counter_index (vm, e0);
-	    }
-	  current_counter = em->counters[current_counter_index];
-	}
-    }
-
-  while (n_errors_left >= 1)
-    {
-      vlib_buffer_t *b0;
-      vnet_sw_interface_t *sw_if0;
-      vlib_error_t e0;
-      u32 bi0, sw_if_index0;
-
-      bi0 = buffers[0];
-
-      buffers += 1;
-      n_errors_left -= 1;
-      current_counter += 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      e0 = b0->error;
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-
-      /* Increment drop/punt counters. */
-      vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
-
-      /* Increment super-interface drop/punt counters for sub-interfaces. */
-      sw_if0 = vnet_get_sw_interface (vnm, sw_if_index0);
-      vlib_increment_simple_counter (cm, cpu_index, sw_if0->sup_sw_if_index,
-				     sw_if0->sup_sw_if_index != sw_if_index0);
-
-      if (PREDICT_FALSE (e0 != current_error))
-	{
-	  current_counter -= 1;
-
-	  vlib_error_elog_count (vm, current_counter_index,
-				 (current_counter
-				  - em->counters[current_counter_index]));
-
-	  em->counters[current_counter_index] = current_counter;
-
-	  do_packet (vm, e0);
-	  current_error = e0;
-	  current_counter_index = counter_index (vm, e0);
-	  current_counter = em->counters[current_counter_index];
-	}
-    }
-
-  if (n_errors_current_sw_if_index > 0)
-    {
-      vnet_sw_interface_t *si;
-
-      vlib_increment_simple_counter (cm, cpu_index, current_sw_if_index,
-				     n_errors_current_sw_if_index);
-
-      si = vnet_get_sw_interface (vnm, current_sw_if_index);
-      if (si->sup_sw_if_index != current_sw_if_index)
-	vlib_increment_simple_counter (cm, cpu_index, si->sup_sw_if_index,
-				       n_errors_current_sw_if_index);
-    }
-
-  vlib_error_elog_count (vm, current_counter_index,
-			 (current_counter
-			  - em->counters[current_counter_index]));
-
-  /* Return cached counter. */
-  em->counters[current_counter_index] = current_counter;
-
-  /* Save memory for next iteration. */
-  memory[disposition] = current_error;
-
-  if (disposition == VNET_ERROR_DISPOSITION_DROP || !vm->os_punt_frame)
-    {
-      vlib_buffer_free (vm, first_buffer, frame->n_vectors);
-
-      /* If there is no punt function, free the frame as well. */
-      if (disposition == VNET_ERROR_DISPOSITION_PUNT && !vm->os_punt_frame)
-	vlib_frame_free (vm, node, frame);
-    }
-  else
-    vm->os_punt_frame (vm, node, frame);
-
-  return frame->n_vectors;
-}
-
-static inline void
-pcap_drop_trace (vlib_main_t * vm,
-		 vnet_interface_main_t * im, vlib_frame_t * f)
-{
-  u32 *from;
-  u32 n_left = f->n_vectors;
-  vlib_buffer_t *b0, *p1;
-  u32 bi0;
-  i16 save_current_data;
-  u16 save_current_length;
-
-  from = vlib_frame_vector_args (f);
-
-  while (n_left > 0)
-    {
-      if (PREDICT_TRUE (n_left > 1))
-	{
-	  p1 = vlib_get_buffer (vm, from[1]);
-	  vlib_prefetch_buffer_header (p1, LOAD);
-	}
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      from++;
-      n_left--;
-
-      /* See if we're pointedly ignoring this specific error */
-      if (im->pcap_drop_filter_hash
-	  && hash_get (im->pcap_drop_filter_hash, b0->error))
-	continue;
-
-      /* Trace all drops, or drops received on a specific interface */
-      if (im->pcap_sw_if_index == 0 ||
-	  im->pcap_sw_if_index == vnet_buffer (b0)->sw_if_index[VLIB_RX])
-	{
-	  save_current_data = b0->current_data;
-	  save_current_length = b0->current_length;
-
-	  /*
-	   * Typically, we'll need to rewind the buffer
-	   */
-	  if (b0->current_data > 0)
-	    vlib_buffer_advance (b0, (word) - b0->current_data);
-
-	  pcap_add_buffer (&im->pcap_main, vm, bi0, 512);
-
-	  b0->current_data = save_current_data;
-	  b0->current_length = save_current_length;
-	}
-    }
-}
-
-void
-vnet_pcap_drop_trace_filter_add_del (u32 error_index, int is_add)
-{
-  vnet_interface_main_t *im = &vnet_get_main ()->interface_main;
-
-  if (im->pcap_drop_filter_hash == 0)
-    im->pcap_drop_filter_hash = hash_create (0, sizeof (uword));
-
-  if (is_add)
-    hash_set (im->pcap_drop_filter_hash, error_index, 1);
-  else
-    hash_unset (im->pcap_drop_filter_hash, error_index);
-}
-
-static uword
-process_drop (vlib_main_t * vm,
-	      vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  vnet_interface_main_t *im = &vnet_get_main ()->interface_main;
-
-  if (PREDICT_FALSE (im->drop_pcap_enable))
-    pcap_drop_trace (vm, im, frame);
-
-  return process_drop_punt (vm, node, frame, VNET_ERROR_DISPOSITION_DROP);
-}
-
-static uword
-process_punt (vlib_main_t * vm,
-	      vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return process_drop_punt (vm, node, frame, VNET_ERROR_DISPOSITION_PUNT);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (drop_buffers,static) = {
-  .function = process_drop,
-  .name = "error-drop",
-  .flags = VLIB_NODE_FLAG_IS_DROP,
-  .vector_size = sizeof (u32),
-  .format_trace = format_vnet_error_trace,
-  .validate_frame = validate_error_frame,
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (drop_buffers, process_drop);
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (punt_buffers,static) = {
-  .function = process_punt,
-  .flags = (VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH
-	    | VLIB_NODE_FLAG_IS_PUNT),
-  .name = "error-punt",
-  .vector_size = sizeof (u32),
-  .format_trace = format_vnet_error_trace,
-  .validate_frame = validate_error_frame,
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (punt_buffers, process_punt);
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (vnet_per_buffer_interface_output_node,static) = {
-  .function = vnet_per_buffer_interface_output,
-  .name = "interface-output",
-  .vector_size = sizeof (u32),
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (vnet_per_buffer_interface_output_node,
-			      vnet_per_buffer_interface_output);
-
-static uword
-interface_tx_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-		      vlib_frame_t * from_frame)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 last_sw_if_index = ~0;
-  vlib_frame_t *to_frame = 0;
-  vnet_hw_interface_t *hw = 0;
-  u32 *from, *to_next = 0;
-  u32 n_left_from;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-  while (n_left_from > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      u32 sw_if_index0;
-
-      bi0 = from[0];
-      from++;
-      n_left_from--;
-      b0 = vlib_get_buffer (vm, bi0);
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-
-      if (PREDICT_FALSE ((last_sw_if_index != sw_if_index0) || to_frame == 0))
-	{
-	  if (to_frame)
-	    {
-	      hw = vnet_get_sup_hw_interface (vnm, last_sw_if_index);
-	      vlib_put_frame_to_node (vm, hw->tx_node_index, to_frame);
-	    }
-	  last_sw_if_index = sw_if_index0;
-	  hw = vnet_get_sup_hw_interface (vnm, sw_if_index0);
-	  to_frame = vlib_get_frame_to_node (vm, hw->tx_node_index);
-	  to_next = vlib_frame_vector_args (to_frame);
-	}
-
-      to_next[0] = bi0;
-      to_next++;
-      to_frame->n_vectors++;
-    }
-  vlib_put_frame_to_node (vm, hw->tx_node_index, to_frame);
-  return from_frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (interface_tx, static) = {
-  .function = interface_tx_node_fn,
-  .name = "interface-tx",
-  .vector_size = sizeof (u32),
-  .n_next_nodes = 1,
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-};
-
-VNET_FEATURE_ARC_INIT (interface_output, static) =
-{
-  .arc_name  = "interface-output",
-  .start_nodes = VNET_FEATURES (0),
-  .end_node = "interface-tx",
-  .arc_index_ptr = &vnet_main.interface_main.output_feature_arc_index,
-};
-
-VNET_FEATURE_INIT (span_tx, static) = {
-  .arc_name = "interface-output",
-  .node_name = "span-output",
-  .runs_before = VNET_FEATURES ("interface-tx"),
-};
-
-VNET_FEATURE_INIT (interface_tx, static) = {
-  .arc_name = "interface-output",
-  .node_name = "interface-tx",
-  .runs_before = 0,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-vnet_per_buffer_interface_output_hw_interface_add_del (vnet_main_t * vnm,
-						       u32 hw_if_index,
-						       u32 is_create)
-{
-  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
-  u32 next_index;
-
-  next_index = vlib_node_add_next_with_slot
-    (vnm->vlib_main, vnet_per_buffer_interface_output_node.index,
-     hi->output_node_index,
-     /* next_index */ hw_if_index);
-
-  ASSERT (next_index == hw_if_index);
-
-  return 0;
-}
-
-VNET_HW_INTERFACE_ADD_DEL_FUNCTION
-  (vnet_per_buffer_interface_output_hw_interface_add_del);
-
-static clib_error_t *
-pcap_drop_trace_command_fn (vlib_main_t * vm,
-			    unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  u8 *filename;
-  u32 max;
-  int matched = 0;
-  clib_error_t *error = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "on"))
-	{
-	  if (im->drop_pcap_enable == 0)
-	    {
-	      if (im->pcap_filename == 0)
-		im->pcap_filename = format (0, "/tmp/drop.pcap%c", 0);
-
-	      memset (&im->pcap_main, 0, sizeof (im->pcap_main));
-	      im->pcap_main.file_name = (char *) im->pcap_filename;
-	      im->pcap_main.n_packets_to_capture = 100;
-	      if (im->pcap_pkts_to_capture)
-		im->pcap_main.n_packets_to_capture = im->pcap_pkts_to_capture;
-
-	      im->pcap_main.packet_type = PCAP_PACKET_TYPE_ethernet;
-	      im->drop_pcap_enable = 1;
-	      matched = 1;
-	      vlib_cli_output (vm, "pcap drop capture on...");
-	    }
-	  else
-	    {
-	      vlib_cli_output (vm, "pcap drop capture already on...");
-	    }
-	  matched = 1;
-	}
-      else if (unformat (input, "off"))
-	{
-	  matched = 1;
-
-	  if (im->drop_pcap_enable)
-	    {
-	      vlib_cli_output (vm, "captured %d pkts...",
-			       im->pcap_main.n_packets_captured);
-	      if (im->pcap_main.n_packets_captured)
-		{
-		  im->pcap_main.n_packets_to_capture =
-		    im->pcap_main.n_packets_captured;
-		  error = pcap_write (&im->pcap_main);
-		  if (error)
-		    clib_error_report (error);
-		  else
-		    vlib_cli_output (vm, "saved to %s...", im->pcap_filename);
-		}
-	    }
-	  else
-	    {
-	      vlib_cli_output (vm, "pcap drop capture already off...");
-	    }
-
-	  im->drop_pcap_enable = 0;
-	}
-      else if (unformat (input, "max %d", &max))
-	{
-	  im->pcap_pkts_to_capture = max;
-	  matched = 1;
-	}
-
-      else if (unformat (input, "intfc %U",
-			 unformat_vnet_sw_interface, vnm,
-			 &im->pcap_sw_if_index))
-	matched = 1;
-      else if (unformat (input, "intfc any"))
-	{
-	  im->pcap_sw_if_index = 0;
-	  matched = 1;
-	}
-      else if (unformat (input, "file %s", &filename))
-	{
-	  u8 *chroot_filename;
-	  /* Brain-police user path input */
-	  if (strstr ((char *) filename, "..")
-	      || index ((char *) filename, '/'))
-	    {
-	      vlib_cli_output (vm, "illegal characters in filename '%s'",
-			       filename);
-	      continue;
-	    }
-
-	  chroot_filename = format (0, "/tmp/%s%c", filename, 0);
-	  vec_free (filename);
-
-	  if (im->pcap_filename)
-	    vec_free (im->pcap_filename);
-	  vec_add1 (filename, 0);
-	  im->pcap_filename = chroot_filename;
-	  matched = 1;
-	}
-      else if (unformat (input, "status"))
-	{
-	  if (im->drop_pcap_enable == 0)
-	    {
-	      vlib_cli_output (vm, "pcap drop capture is off...");
-	      continue;
-	    }
-
-	  vlib_cli_output (vm, "pcap drop capture: %d of %d pkts...",
-			   im->pcap_main.n_packets_captured,
-			   im->pcap_main.n_packets_to_capture);
-	  matched = 1;
-	}
-
-      else
-	break;
-    }
-
-  if (matched == 0)
-    return clib_error_return (0, "unknown input `%U'",
-			      format_unformat_error, input);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (pcap_trace_command, static) = {
-  .path = "pcap drop trace",
-  .short_help =
-  "pcap drop trace on off max <nn> intfc <intfc> file <name> status",
-  .function = pcap_drop_trace_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/dir.dox b/vnet/vnet/ip/dir.dox
deleted file mode 100644
index a4eb7337..00000000
--- a/vnet/vnet/ip/dir.dox
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* Doxygen directory documentation */
-
-/**
-@dir
-@brief Layer 3 IP Code.
-
-This directory contains the source code for IP routing.
-
-*/
-/*? %%clicmd:group_label Layer 3 IP CLI %% ?*/
diff --git a/vnet/vnet/ip/format.c b/vnet/vnet/ip/format.c
deleted file mode 100644
index be1c4fd3..00000000
--- a/vnet/vnet/ip/format.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip_format.c: ip generic (4 or 6) formatting
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-
-/* Format IP protocol. */
-u8 *
-format_ip_protocol (u8 * s, va_list * args)
-{
-  ip_protocol_t protocol = va_arg (*args, ip_protocol_t);
-  ip_main_t *im = &ip_main;
-  ip_protocol_info_t *pi = ip_get_protocol_info (im, protocol);
-
-  if (pi)
-    return format (s, "%s", pi->name);
-  else
-    return format (s, "unknown %d", protocol);
-}
-
-uword
-unformat_ip_protocol (unformat_input_t * input, va_list * args)
-{
-  u8 *result = va_arg (*args, u8 *);
-  ip_main_t *im = &ip_main;
-  ip_protocol_info_t *pi;
-  int i;
-
-  if (!unformat_user (input, unformat_vlib_number_by_name,
-		      im->protocol_info_by_name, &i))
-    return 0;
-
-  pi = vec_elt_at_index (im->protocol_infos, i);
-  *result = pi->protocol;
-  return 1;
-}
-
-u8 *
-format_tcp_udp_port (u8 * s, va_list * args)
-{
-  int port = va_arg (*args, int);
-  ip_main_t *im = &ip_main;
-  tcp_udp_port_info_t *pi;
-
-  pi = ip_get_tcp_udp_port_info (im, port);
-  if (pi)
-    s = format (s, "%s", pi->name);
-  else
-    s = format (s, "%d", clib_net_to_host_u16 (port));
-
-  return s;
-}
-
-uword
-unformat_tcp_udp_port (unformat_input_t * input, va_list * args)
-{
-  u16 *result = va_arg (*args, u16 *);
-  ip_main_t *im = &ip_main;
-  tcp_udp_port_info_t *pi;
-  u32 i, port;
-
-
-  if (unformat_user (input, unformat_vlib_number_by_name,
-		     im->port_info_by_name, &i))
-    {
-      pi = vec_elt_at_index (im->port_infos, i);
-      port = pi->port;
-    }
-  else if (unformat_user (input, unformat_vlib_number, &port)
-	   && port < (1 << 16))
-    port = clib_host_to_net_u16 (port);
-
-  else
-    return 0;
-
-  *result = port;
-  return 1;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/format.h b/vnet/vnet/ip/format.h
deleted file mode 100644
index c35f0f4b..00000000
--- a/vnet/vnet/ip/format.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/format.h: ip 4 and/or 6 formatting
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_ip_format_h
-#define included_ip_format_h
-
-/* IP4 or IP6. */
-
-format_function_t format_ip_protocol;
-unformat_function_t unformat_ip_protocol;
-
-format_function_t format_tcp_udp_port;
-unformat_function_t unformat_tcp_udp_port;
-
-typedef enum format_ip_adjacency_flags_t_
-{
-  FORMAT_IP_ADJACENCY_NONE,
-  FORMAT_IP_ADJACENCY_BRIEF = FORMAT_IP_ADJACENCY_NONE,
-  FORMAT_IP_ADJACENCY_DETAIL = (1 << 0),
-} format_ip_adjacency_flags_t;
-
-format_function_t format_ip_adjacency;
-format_function_t format_ip_adjacency_packet_data;
-
-format_function_t format_ip46_address;
-
-typedef enum
-{
-  IP46_TYPE_ANY,
-  IP46_TYPE_IP4,
-  IP46_TYPE_IP6
-} ip46_type_t;
-/* unformat_ip46_address expects arguments (ip46_address_t *, ip46_type_t)
- * The type argument is used to enforce a particular IP version. */
-unformat_function_t unformat_ip46_address;
-
-/* IP4 */
-
-/* Parse an IP4 address %d.%d.%d.%d. */
-unformat_function_t unformat_ip4_address;
-
-/* Format an IP4 address. */
-format_function_t format_ip4_address;
-format_function_t format_ip4_address_and_length;
-
-/* Parse an IP4 header. */
-unformat_function_t unformat_ip4_header;
-
-/* Format an IP4 header. */
-format_function_t format_ip4_header;
-
-/* Parse an IP packet matching pattern. */
-unformat_function_t unformat_ip4_match;
-
-unformat_function_t unformat_pg_ip4_header;
-
-/* IP6 */
-unformat_function_t unformat_ip6_address;
-format_function_t format_ip6_address;
-format_function_t format_ip6_address_and_length;
-unformat_function_t unformat_ip6_header;
-format_function_t format_ip6_header;
-unformat_function_t unformat_pg_ip6_header;
-
-/* Format a TCP/UDP headers. */
-format_function_t format_tcp_header, format_udp_header;
-
-unformat_function_t unformat_pg_tcp_header, unformat_pg_udp_header;
-
-#endif /* included_ip_format_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/icmp4.c b/vnet/vnet/ip/icmp4.c
deleted file mode 100644
index c3afff72..00000000
--- a/vnet/vnet/ip/icmp4.c
+++ /dev/null
@@ -1,784 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/icmp4.c: ipv4 icmp
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/ip/ip.h>
-#include <vnet/pg/pg.h>
-
-
-static char *icmp_error_strings[] = {
-#define _(f,s) s,
-  foreach_icmp4_error
-#undef _
-};
-
-static u8 *
-format_ip4_icmp_type_and_code (u8 * s, va_list * args)
-{
-  icmp4_type_t type = va_arg (*args, int);
-  u8 code = va_arg (*args, int);
-  char *t = 0;
-
-#define _(n,f) case n: t = #f; break;
-
-  switch (type)
-    {
-      foreach_icmp4_type;
-
-    default:
-      break;
-    }
-
-#undef _
-
-  if (!t)
-    return format (s, "unknown 0x%x", type);
-
-  s = format (s, "%s", t);
-
-  t = 0;
-  switch ((type << 8) | code)
-    {
-#define _(a,n,f) case (ICMP4_##a << 8) | (n): t = #f; break;
-
-      foreach_icmp4_code;
-
-#undef _
-    }
-
-  if (t)
-    s = format (s, " %s", t);
-
-  return s;
-}
-
-static u8 *
-format_ip4_icmp_header (u8 * s, va_list * args)
-{
-  icmp46_header_t *icmp = va_arg (*args, icmp46_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-
-  /* Nothing to do. */
-  if (max_header_bytes < sizeof (icmp[0]))
-    return format (s, "ICMP header truncated");
-
-  s = format (s, "ICMP %U checksum 0x%x",
-	      format_ip4_icmp_type_and_code, icmp->type, icmp->code,
-	      clib_net_to_host_u16 (icmp->checksum));
-
-  return s;
-}
-
-static u8 *
-format_icmp_input_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  icmp_input_trace_t *t = va_arg (*va, icmp_input_trace_t *);
-
-  s = format (s, "%U",
-	      format_ip4_header, t->packet_data, sizeof (t->packet_data));
-
-  return s;
-}
-
-typedef enum
-{
-  ICMP_INPUT_NEXT_ERROR,
-  ICMP_INPUT_N_NEXT,
-} icmp_input_next_t;
-
-typedef struct
-{
-  uword *type_and_code_by_name;
-
-  uword *type_by_name;
-
-  /* Vector dispatch table indexed by [icmp type]. */
-  u8 ip4_input_next_index_by_type[256];
-} icmp4_main_t;
-
-icmp4_main_t icmp4_main;
-
-static uword
-ip4_icmp_input (vlib_main_t * vm,
-		vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  icmp4_main_t *im = &icmp4_main;
-  uword n_packets = frame->n_vectors;
-  u32 *from, *to_next;
-  u32 n_left_from, n_left_to_next, next;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = n_packets;
-  next = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-				   /* stride */ 1,
-				   sizeof (icmp_input_trace_t));
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip4_header_t *ip0;
-	  icmp46_header_t *icmp0;
-	  icmp4_type_t type0;
-	  u32 bi0, next0;
-
-	  if (PREDICT_TRUE (n_left_from > 2))
-	    {
-	      vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
-	      p0 = vlib_get_buffer (vm, from[1]);
-	      ip0 = vlib_buffer_get_current (p0);
-	      CLIB_PREFETCH (ip0, CLIB_CACHE_LINE_BYTES, LOAD);
-	    }
-
-	  bi0 = to_next[0] = from[0];
-
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, bi0);
-	  ip0 = vlib_buffer_get_current (p0);
-	  icmp0 = ip4_next_header (ip0);
-	  type0 = icmp0->type;
-	  next0 = im->ip4_input_next_index_by_type[type0];
-
-	  p0->error = node->errors[ICMP4_ERROR_UNKNOWN_TYPE];
-	  if (PREDICT_FALSE (next0 != next))
-	    {
-	      vlib_put_next_frame (vm, node, next, n_left_to_next + 1);
-	      next = next0;
-	      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
-	      to_next[0] = bi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_icmp_input_node,static) = {
-  .function = ip4_icmp_input,
-  .name = "ip4-icmp-input",
-
-  .vector_size = sizeof (u32),
-
-  .format_trace = format_icmp_input_trace,
-
-  .n_errors = ARRAY_LEN (icmp_error_strings),
-  .error_strings = icmp_error_strings,
-
-  .n_next_nodes = 1,
-  .next_nodes = {
-    [ICMP_INPUT_NEXT_ERROR] = "error-punt",
-  },
-};
-/* *INDENT-ON* */
-
-static uword
-ip4_icmp_echo_request (vlib_main_t * vm,
-		       vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  uword n_packets = frame->n_vectors;
-  u32 *from, *to_next;
-  u32 n_left_from, n_left_to_next, next;
-  ip4_main_t *i4m = &ip4_main;
-  u16 *fragment_ids, *fid;
-  u8 host_config_ttl = i4m->host_config.ttl;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = n_packets;
-  next = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-				   /* stride */ 1,
-				   sizeof (icmp_input_trace_t));
-
-  /* Get random fragment IDs for replies. */
-  fid = fragment_ids = clib_random_buffer_get_data (&vm->random_buffer,
-						    n_packets *
-						    sizeof (fragment_ids[0]));
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
-
-      while (n_left_from > 2 && n_left_to_next > 2)
-	{
-	  vlib_buffer_t *p0, *p1;
-	  ip4_header_t *ip0, *ip1;
-	  icmp46_header_t *icmp0, *icmp1;
-	  u32 bi0, src0, dst0;
-	  u32 bi1, src1, dst1;
-	  ip_csum_t sum0, sum1;
-
-	  bi0 = to_next[0] = from[0];
-	  bi1 = to_next[1] = from[1];
-
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, bi0);
-	  p1 = vlib_get_buffer (vm, bi1);
-	  ip0 = vlib_buffer_get_current (p0);
-	  ip1 = vlib_buffer_get_current (p1);
-	  icmp0 = ip4_next_header (ip0);
-	  icmp1 = ip4_next_header (ip1);
-
-	  vnet_buffer (p0)->sw_if_index[VLIB_RX] =
-	    vnet_main.local_interface_sw_if_index;
-	  vnet_buffer (p1)->sw_if_index[VLIB_RX] =
-	    vnet_main.local_interface_sw_if_index;
-
-	  /* Update ICMP checksum. */
-	  sum0 = icmp0->checksum;
-	  sum1 = icmp1->checksum;
-
-	  ASSERT (icmp0->type == ICMP4_echo_request);
-	  ASSERT (icmp1->type == ICMP4_echo_request);
-	  sum0 = ip_csum_update (sum0, ICMP4_echo_request, ICMP4_echo_reply,
-				 icmp46_header_t, type);
-	  sum1 = ip_csum_update (sum1, ICMP4_echo_request, ICMP4_echo_reply,
-				 icmp46_header_t, type);
-	  icmp0->type = ICMP4_echo_reply;
-	  icmp1->type = ICMP4_echo_reply;
-
-	  icmp0->checksum = ip_csum_fold (sum0);
-	  icmp1->checksum = ip_csum_fold (sum1);
-
-	  src0 = ip0->src_address.data_u32;
-	  src1 = ip1->src_address.data_u32;
-	  dst0 = ip0->dst_address.data_u32;
-	  dst1 = ip1->dst_address.data_u32;
-
-	  /* Swap source and destination address.
-	     Does not change checksum. */
-	  ip0->src_address.data_u32 = dst0;
-	  ip1->src_address.data_u32 = dst1;
-	  ip0->dst_address.data_u32 = src0;
-	  ip1->dst_address.data_u32 = src1;
-
-	  /* Update IP checksum. */
-	  sum0 = ip0->checksum;
-	  sum1 = ip1->checksum;
-
-	  sum0 = ip_csum_update (sum0, ip0->ttl, host_config_ttl,
-				 ip4_header_t, ttl);
-	  sum1 = ip_csum_update (sum1, ip1->ttl, host_config_ttl,
-				 ip4_header_t, ttl);
-	  ip0->ttl = host_config_ttl;
-	  ip1->ttl = host_config_ttl;
-
-	  /* New fragment id. */
-	  sum0 = ip_csum_update (sum0, ip0->fragment_id, fid[0],
-				 ip4_header_t, fragment_id);
-	  sum1 = ip_csum_update (sum1, ip1->fragment_id, fid[1],
-				 ip4_header_t, fragment_id);
-	  ip0->fragment_id = fid[0];
-	  ip1->fragment_id = fid[1];
-	  fid += 2;
-
-	  ip0->checksum = ip_csum_fold (sum0);
-	  ip1->checksum = ip_csum_fold (sum1);
-
-	  ASSERT (ip0->checksum == ip4_header_checksum (ip0));
-	  ASSERT (ip1->checksum == ip4_header_checksum (ip1));
-
-	  p0->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
-	  p1->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip4_header_t *ip0;
-	  icmp46_header_t *icmp0;
-	  u32 bi0, src0, dst0;
-	  ip_csum_t sum0;
-
-	  bi0 = to_next[0] = from[0];
-
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, bi0);
-	  ip0 = vlib_buffer_get_current (p0);
-	  icmp0 = ip4_next_header (ip0);
-
-	  vnet_buffer (p0)->sw_if_index[VLIB_RX] =
-	    vnet_main.local_interface_sw_if_index;
-
-	  /* Update ICMP checksum. */
-	  sum0 = icmp0->checksum;
-
-	  ASSERT (icmp0->type == ICMP4_echo_request);
-	  sum0 = ip_csum_update (sum0, ICMP4_echo_request, ICMP4_echo_reply,
-				 icmp46_header_t, type);
-	  icmp0->type = ICMP4_echo_reply;
-	  icmp0->checksum = ip_csum_fold (sum0);
-
-	  src0 = ip0->src_address.data_u32;
-	  dst0 = ip0->dst_address.data_u32;
-	  ip0->src_address.data_u32 = dst0;
-	  ip0->dst_address.data_u32 = src0;
-
-	  /* Update IP checksum. */
-	  sum0 = ip0->checksum;
-
-	  sum0 = ip_csum_update (sum0, ip0->ttl, host_config_ttl,
-				 ip4_header_t, ttl);
-	  ip0->ttl = host_config_ttl;
-
-	  sum0 = ip_csum_update (sum0, ip0->fragment_id, fid[0],
-				 ip4_header_t, fragment_id);
-	  ip0->fragment_id = fid[0];
-	  fid += 1;
-
-	  ip0->checksum = ip_csum_fold (sum0);
-
-	  ASSERT (ip0->checksum == ip4_header_checksum (ip0));
-
-	  p0->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
-	}
-
-      vlib_put_next_frame (vm, node, next, n_left_to_next);
-    }
-
-  vlib_error_count (vm, ip4_icmp_input_node.index,
-		    ICMP4_ERROR_ECHO_REPLIES_SENT, frame->n_vectors);
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_icmp_echo_request_node,static) = {
-  .function = ip4_icmp_echo_request,
-  .name = "ip4-icmp-echo-request",
-
-  .vector_size = sizeof (u32),
-
-  .format_trace = format_icmp_input_trace,
-
-  .n_next_nodes = 1,
-  .next_nodes = {
-    [0] = "ip4-load-balance",
-  },
-};
-/* *INDENT-ON* */
-
-typedef enum
-{
-  IP4_ICMP_ERROR_NEXT_DROP,
-  IP4_ICMP_ERROR_NEXT_LOOKUP,
-  IP4_ICMP_ERROR_N_NEXT,
-} ip4_icmp_error_next_t;
-
-void
-icmp4_error_set_vnet_buffer (vlib_buffer_t * b, u8 type, u8 code, u32 data)
-{
-  vnet_buffer (b)->ip.icmp.type = type;
-  vnet_buffer (b)->ip.icmp.code = code;
-  vnet_buffer (b)->ip.icmp.data = data;
-}
-
-static u8
-icmp4_icmp_type_to_error (u8 type)
-{
-  switch (type)
-    {
-    case ICMP4_destination_unreachable:
-      return ICMP4_ERROR_DEST_UNREACH_SENT;
-    case ICMP4_time_exceeded:
-      return ICMP4_ERROR_TTL_EXPIRE_SENT;
-    case ICMP4_parameter_problem:
-      return ICMP4_ERROR_PARAM_PROBLEM_SENT;
-    default:
-      return ICMP4_ERROR_DROP;
-    }
-}
-
-static uword
-ip4_icmp_error (vlib_main_t * vm,
-		vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 *from, *to_next;
-  uword n_left_from, n_left_to_next;
-  ip4_icmp_error_next_t next_index;
-  ip4_main_t *im = &ip4_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-				   /* stride */ 1,
-				   sizeof (icmp_input_trace_t));
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0 = from[0];
-	  u32 next0 = IP4_ICMP_ERROR_NEXT_LOOKUP;
-	  u8 error0 = ICMP4_ERROR_NONE;
-	  vlib_buffer_t *p0;
-	  ip4_header_t *ip0, *out_ip0;
-	  icmp46_header_t *icmp0;
-	  u32 sw_if_index0, if_add_index0;
-	  ip_csum_t sum;
-
-	  /* Speculatively enqueue p0 to the current next frame */
-	  to_next[0] = pi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip0 = vlib_buffer_get_current (p0);
-	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
-
-	  /*
-	   * RFC1812 says to keep as much of the original packet as
-	   * possible within the minimum MTU (576). We cheat "a little"
-	   * here by keeping whatever fits in the first buffer, to be more
-	   * efficient
-	   */
-	  if (PREDICT_FALSE (p0->total_length_not_including_first_buffer))
-	    {
-	      /* clear current_length of all other buffers in chain */
-	      vlib_buffer_t *b = p0;
-	      p0->total_length_not_including_first_buffer = 0;
-	      while (b->flags & VLIB_BUFFER_NEXT_PRESENT)
-		{
-		  b = vlib_get_buffer (vm, b->next_buffer);
-		  b->current_length = 0;
-		}
-	    }
-	  p0->current_length =
-	    p0->current_length > 576 ? 576 : p0->current_length;
-
-	  /* Add IP header and ICMPv4 header including a 4 byte data field */
-	  vlib_buffer_advance (p0,
-			       -sizeof (ip4_header_t) -
-			       sizeof (icmp46_header_t) - 4);
-	  out_ip0 = vlib_buffer_get_current (p0);
-	  icmp0 = (icmp46_header_t *) & out_ip0[1];
-
-	  /* Fill ip header fields */
-	  out_ip0->ip_version_and_header_length = 0x45;
-	  out_ip0->tos = 0;
-	  out_ip0->length = clib_host_to_net_u16 (p0->current_length);
-	  out_ip0->fragment_id = 0;
-	  out_ip0->flags_and_fragment_offset = 0;
-	  out_ip0->ttl = 0xff;
-	  out_ip0->protocol = IP_PROTOCOL_ICMP;
-	  out_ip0->dst_address = ip0->src_address;
-	  if_add_index0 = ~0;
-	  if (PREDICT_TRUE (vec_len (lm->if_address_pool_index_by_sw_if_index)
-			    > sw_if_index0))
-	    if_add_index0 =
-	      lm->if_address_pool_index_by_sw_if_index[sw_if_index0];
-	  if (PREDICT_TRUE (if_add_index0 != ~0))
-	    {
-	      ip_interface_address_t *if_add =
-		pool_elt_at_index (lm->if_address_pool, if_add_index0);
-	      ip4_address_t *if_ip =
-		ip_interface_address_get_address (lm, if_add);
-	      out_ip0->src_address = *if_ip;
-	    }
-	  else
-	    {
-	      /* interface has no IP4 address - should not happen */
-	      next0 = IP4_ICMP_ERROR_NEXT_DROP;
-	      error0 = ICMP4_ERROR_DROP;
-	    }
-	  out_ip0->checksum = ip4_header_checksum (out_ip0);
-
-	  /* Fill icmp header fields */
-	  icmp0->type = vnet_buffer (p0)->ip.icmp.type;
-	  icmp0->code = vnet_buffer (p0)->ip.icmp.code;
-	  *((u32 *) (icmp0 + 1)) =
-	    clib_host_to_net_u32 (vnet_buffer (p0)->ip.icmp.data);
-	  icmp0->checksum = 0;
-	  sum =
-	    ip_incremental_checksum (0, icmp0,
-				     p0->current_length -
-				     sizeof (ip4_header_t));
-	  icmp0->checksum = ~ip_csum_fold (sum);
-
-	  /* Update error status */
-	  if (error0 == ICMP4_ERROR_NONE)
-	    error0 = icmp4_icmp_type_to_error (icmp0->type);
-	  vlib_error_count (vm, node->node_index, error0, 1);
-
-	  /* Verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_icmp_error_node) = {
-  .function = ip4_icmp_error,
-  .name = "ip4-icmp-error",
-  .vector_size = sizeof (u32),
-
-  .n_errors = ARRAY_LEN (icmp_error_strings),
-  .error_strings = icmp_error_strings,
-
-  .n_next_nodes = IP4_ICMP_ERROR_N_NEXT,
-  .next_nodes = {
-    [IP4_ICMP_ERROR_NEXT_DROP] = "error-drop",
-    [IP4_ICMP_ERROR_NEXT_LOOKUP] = "ip4-lookup",
-  },
-
-  .format_trace = format_icmp_input_trace,
-};
-/* *INDENT-ON* */
-
-
-static uword
-unformat_icmp_type_and_code (unformat_input_t * input, va_list * args)
-{
-  icmp46_header_t *h = va_arg (*args, icmp46_header_t *);
-  icmp4_main_t *cm = &icmp4_main;
-  u32 i;
-
-  if (unformat_user (input, unformat_vlib_number_by_name,
-		     cm->type_and_code_by_name, &i))
-    {
-      h->type = (i >> 8) & 0xff;
-      h->code = (i >> 0) & 0xff;
-    }
-  else if (unformat_user (input, unformat_vlib_number_by_name,
-			  cm->type_by_name, &i))
-    {
-      h->type = i;
-      h->code = 0;
-    }
-  else
-    return 0;
-
-  return 1;
-}
-
-static void
-icmp4_pg_edit_function (pg_main_t * pg,
-			pg_stream_t * s,
-			pg_edit_group_t * g, u32 * packets, u32 n_packets)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  u32 ip_offset, icmp_offset;
-
-  icmp_offset = g->start_byte_offset;
-  ip_offset = (g - 1)->start_byte_offset;
-
-  while (n_packets >= 1)
-    {
-      vlib_buffer_t *p0;
-      ip4_header_t *ip0;
-      icmp46_header_t *icmp0;
-      u32 len0;
-
-      p0 = vlib_get_buffer (vm, packets[0]);
-      n_packets -= 1;
-      packets += 1;
-
-      ASSERT (p0->current_data == 0);
-      ip0 = (void *) (p0->data + ip_offset);
-      icmp0 = (void *) (p0->data + icmp_offset);
-      len0 = clib_net_to_host_u16 (ip0->length) - ip4_header_bytes (ip0);
-      icmp0->checksum =
-	~ip_csum_fold (ip_incremental_checksum (0, icmp0, len0));
-    }
-}
-
-typedef struct
-{
-  pg_edit_t type, code;
-  pg_edit_t checksum;
-} pg_icmp46_header_t;
-
-always_inline void
-pg_icmp_header_init (pg_icmp46_header_t * p)
-{
-  /* Initialize fields that are not bit fields in the IP header. */
-#define _(f) pg_edit_init (&p->f, icmp46_header_t, f);
-  _(type);
-  _(code);
-  _(checksum);
-#undef _
-}
-
-static uword
-unformat_pg_icmp_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t *s = va_arg (*args, pg_stream_t *);
-  pg_icmp46_header_t *p;
-  u32 group_index;
-
-  p = pg_create_edit_group (s, sizeof (p[0]), sizeof (icmp46_header_t),
-			    &group_index);
-  pg_icmp_header_init (p);
-
-  p->checksum.type = PG_EDIT_UNSPECIFIED;
-
-  {
-    icmp46_header_t tmp;
-
-    if (!unformat (input, "ICMP %U", unformat_icmp_type_and_code, &tmp))
-      goto error;
-
-    pg_edit_set_fixed (&p->type, tmp.type);
-    pg_edit_set_fixed (&p->code, tmp.code);
-  }
-
-  /* Parse options. */
-  while (1)
-    {
-      if (unformat (input, "checksum %U",
-		    unformat_pg_edit, unformat_pg_number, &p->checksum))
-	;
-
-      /* Can't parse input: try next protocol level. */
-      else
-	break;
-    }
-
-  if (!unformat_user (input, unformat_pg_payload, s))
-    goto error;
-
-  if (p->checksum.type == PG_EDIT_UNSPECIFIED)
-    {
-      pg_edit_group_t *g = pg_stream_get_group (s, group_index);
-      g->edit_function = icmp4_pg_edit_function;
-      g->edit_function_opaque = 0;
-    }
-
-  return 1;
-
-error:
-  /* Free up any edits we may have added. */
-  pg_free_edit_group (s);
-  return 0;
-}
-
-void
-ip4_icmp_register_type (vlib_main_t * vm, icmp4_type_t type, u32 node_index)
-{
-  icmp4_main_t *im = &icmp4_main;
-
-  ASSERT ((int) type < ARRAY_LEN (im->ip4_input_next_index_by_type));
-  im->ip4_input_next_index_by_type[type]
-    = vlib_node_add_next (vm, ip4_icmp_input_node.index, node_index);
-}
-
-static clib_error_t *
-icmp4_init (vlib_main_t * vm)
-{
-  ip_main_t *im = &ip_main;
-  ip_protocol_info_t *pi;
-  icmp4_main_t *cm = &icmp4_main;
-  clib_error_t *error;
-
-  error = vlib_call_init_function (vm, ip_main_init);
-
-  if (error)
-    return error;
-
-  pi = ip_get_protocol_info (im, IP_PROTOCOL_ICMP);
-  pi->format_header = format_ip4_icmp_header;
-  pi->unformat_pg_edit = unformat_pg_icmp_header;
-
-  cm->type_by_name = hash_create_string (0, sizeof (uword));
-#define _(n,t) hash_set_mem (cm->type_by_name, #t, (n));
-  foreach_icmp4_type;
-#undef _
-
-  cm->type_and_code_by_name = hash_create_string (0, sizeof (uword));
-#define _(a,n,t) hash_set_mem (cm->type_by_name, #t, (n) | (ICMP4_##a << 8));
-  foreach_icmp4_code;
-#undef _
-
-  memset (cm->ip4_input_next_index_by_type,
-	  ICMP_INPUT_NEXT_ERROR, sizeof (cm->ip4_input_next_index_by_type));
-
-  ip4_icmp_register_type (vm, ICMP4_echo_request,
-			  ip4_icmp_echo_request_node.index);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (icmp4_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/icmp4.h b/vnet/vnet/ip/icmp4.h
deleted file mode 100644
index ae805148..00000000
--- a/vnet/vnet/ip/icmp4.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vnet_icmp4_h
-#define included_vnet_icmp4_h
-
-#define foreach_icmp4_error                                             \
-  _ (NONE, "valid packets")                                             \
-  _ (UNKNOWN_TYPE, "unknown type")                                      \
-  _ (INVALID_CODE_FOR_TYPE, "invalid code for type")                    \
-  _ (INVALID_HOP_LIMIT_FOR_TYPE, "hop_limit != 255")                    \
-  _ (LENGTH_TOO_SMALL_FOR_TYPE, "payload length too small for type")    \
-  _ (OPTIONS_WITH_ODD_LENGTH,                                           \
-     "total option length not multiple of 8 bytes")                     \
-  _ (OPTION_WITH_ZERO_LENGTH, "option has zero length")                 \
-  _ (ECHO_REPLIES_SENT, "echo replies sent")                            \
-  _ (DST_LOOKUP_MISS, "icmp6 dst address lookup misses")                \
-  _ (DEST_UNREACH_SENT, "destination unreachable response sent")	\
-  _ (TTL_EXPIRE_SENT, "hop limit exceeded response sent")		\
-  _ (PARAM_PROBLEM_SENT, "parameter problem response sent")		\
-  _ (DROP, "error message dropped")
-
-typedef enum
-{
-#define _(f,s) ICMP4_ERROR_##f,
-  foreach_icmp4_error
-#undef _
-} icmp4_error_t;
-
-typedef struct
-{
-  u8 packet_data[64];
-} icmp_input_trace_t;
-
-format_function_t format_icmp4_input_trace;
-void ip4_icmp_register_type (vlib_main_t * vm, icmp4_type_t type,
-			     u32 node_index);
-void icmp4_error_set_vnet_buffer (vlib_buffer_t * b, u8 type, u8 code,
-				  u32 data);
-
-#endif /* included_vnet_icmp4_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/icmp46_packet.h b/vnet/vnet/ip/icmp46_packet.h
deleted file mode 100644
index a86cbd57..00000000
--- a/vnet/vnet/ip/icmp46_packet.h
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * icmp46_packet.h: ip4/ip6 icmp packet format
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vnet_icmp46_packet_h
-#define included_vnet_icmp46_packet_h
-
-#include <vnet/ethernet/packet.h>
-#include <vnet/ip/ip6_packet.h>
-
-#define foreach_icmp4_type			\
-  _ (0, echo_reply)				\
-  _ (3, destination_unreachable)		\
-  _ (4, source_quench)				\
-  _ (5, redirect)				\
-  _ (6, alternate_host_address)			\
-  _ (8, echo_request)				\
-  _ (9, router_advertisement)			\
-  _ (10, router_solicitation)			\
-  _ (11, time_exceeded)				\
-  _ (12, parameter_problem)			\
-  _ (13, timestamp_request)			\
-  _ (14, timestamp_reply)			\
-  _ (15, information_request)			\
-  _ (16, information_reply)			\
-  _ (17, address_mask_request)			\
-  _ (18, address_mask_reply)			\
-  _ (30, traceroute)				\
-  _ (31, datagram_conversion_error)		\
-  _ (32, mobile_host_redirect)			\
-  _ (33, ip6_where_are_you)			\
-  _ (34, ip6_i_am_here)				\
-  _ (35, mobile_registration_request)		\
-  _ (36, mobile_registration_reply)		\
-  _ (37, domain_name_request)			\
-  _ (38, domain_name_reply)			\
-  _ (39, skip)					\
-  _ (40, photuris)
-
-#define icmp_no_code 0
-
-#define foreach_icmp4_code						\
-  _ (destination_unreachable, 0, destination_unreachable_net)		\
-  _ (destination_unreachable, 1, destination_unreachable_host)		\
-  _ (destination_unreachable, 2, protocol_unreachable)			\
-  _ (destination_unreachable, 3, port_unreachable)			\
-  _ (destination_unreachable, 4, fragmentation_needed_and_dont_fragment_set) \
-  _ (destination_unreachable, 5, source_route_failed)			\
-  _ (destination_unreachable, 6, destination_network_unknown)		\
-  _ (destination_unreachable, 7, destination_host_unknown)		\
-  _ (destination_unreachable, 8, source_host_isolated)			\
-  _ (destination_unreachable, 9, network_administratively_prohibited)	\
-  _ (destination_unreachable, 10, host_administratively_prohibited)	\
-  _ (destination_unreachable, 11, network_unreachable_for_type_of_service) \
-  _ (destination_unreachable, 12, host_unreachable_for_type_of_service)	\
-  _ (destination_unreachable, 13, communication_administratively_prohibited) \
-  _ (destination_unreachable, 14, host_precedence_violation)		\
-  _ (destination_unreachable, 15, precedence_cutoff_in_effect)		\
-  _ (redirect, 0, network_redirect)					\
-  _ (redirect, 1, host_redirect)					\
-  _ (redirect, 2, type_of_service_and_network_redirect)			\
-  _ (redirect, 3, type_of_service_and_host_redirect)			\
-  _ (router_advertisement, 0, normal_router_advertisement)		\
-  _ (router_advertisement, 16, does_not_route_common_traffic)		\
-  _ (time_exceeded, 0, ttl_exceeded_in_transit)				\
-  _ (time_exceeded, 1, fragment_reassembly_time_exceeded)		\
-  _ (parameter_problem, 0, pointer_indicates_error)			\
-  _ (parameter_problem, 1, missing_required_option)			\
-  _ (parameter_problem, 2, bad_length)
-
-/* ICMPv6 */
-#define foreach_icmp6_type			\
-  _ (1, destination_unreachable)		\
-  _ (2, packet_too_big)				\
-  _ (3, time_exceeded)				\
-  _ (4, parameter_problem)			\
-  _ (128, echo_request)				\
-  _ (129, echo_reply)				\
-  _ (130, multicast_listener_request)		\
-  _ (131, multicast_listener_report)		\
-  _ (132, multicast_listener_done)		\
-  _ (133, router_solicitation)			\
-  _ (134, router_advertisement)			\
-  _ (135, neighbor_solicitation)		\
-  _ (136, neighbor_advertisement)		\
-  _ (137, redirect)				\
-  _ (138, router_renumbering)			\
-  _ (139, node_information_request)		\
-  _ (140, node_information_response)		\
-  _ (141, inverse_neighbor_solicitation)	\
-  _ (142, inverse_neighbor_advertisement)	\
-  _ (143, multicast_listener_report_v2)		\
-  _ (144, home_agent_address_discovery_request)	\
-  _ (145, home_agent_address_discovery_reply)	\
-  _ (146, mobile_prefix_solicitation)		\
-  _ (147, mobile_prefix_advertisement)		\
-  _ (148, certification_path_solicitation)	\
-  _ (149, certification_path_advertisement)	\
-  _ (151, multicast_router_advertisement)	\
-  _ (152, multicast_router_solicitation)	\
-  _ (153, multicast_router_termination)		\
-  _ (154, fmipv6_messages)
-
-#define foreach_icmp6_code						\
-  _ (destination_unreachable, 0, no_route_to_destination)		\
-  _ (destination_unreachable, 1, destination_administratively_prohibited) \
-  _ (destination_unreachable, 2, beyond_scope_of_source_address)	\
-  _ (destination_unreachable, 3, address_unreachable)			\
-  _ (destination_unreachable, 4, port_unreachable)			\
-  _ (destination_unreachable, 5, source_address_failed_policy)		\
-  _ (destination_unreachable, 6, reject_route_to_destination)		\
-  _ (time_exceeded, 0, ttl_exceeded_in_transit)				\
-  _ (time_exceeded, 1, fragment_reassembly_time_exceeded)		\
-  _ (parameter_problem, 0, erroneous_header_field)			\
-  _ (parameter_problem, 1, unrecognized_next_header)			\
-  _ (parameter_problem, 2, unrecognized_option)				\
-  _ (router_renumbering, 0, command)					\
-  _ (router_renumbering, 1, result)					\
-  _ (node_information_request, 0, data_contains_ip6_address)		\
-  _ (node_information_request, 1, data_contains_name)			\
-  _ (node_information_request, 2, data_contains_ip4_address)		\
-  _ (node_information_response, 0, success)				\
-  _ (node_information_response, 1, failed)				\
-  _ (node_information_response, 2, unknown_request)
-
-typedef enum
-{
-#define _(n,f) ICMP4_##f = n,
-  foreach_icmp4_type
-#undef _
-} icmp4_type_t;
-
-typedef enum
-{
-#define _(t,n,f) ICMP4_##t##_##f = n,
-  foreach_icmp4_code
-#undef _
-} icmp4_code_t;
-
-typedef enum
-{
-#define _(n,f) ICMP6_##f = n,
-  foreach_icmp6_type
-#undef _
-} icmp6_type_t;
-
-typedef enum
-{
-#define _(t,n,f) ICMP6_##t##_##f = n,
-  foreach_icmp6_code
-#undef _
-} icmp6_code_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     u8 type;
-		     u8 code;
-		     /* IP checksum of icmp header plus data which follows. */
-		     u16 checksum;
-		     }) icmp46_header_t;
-
-/* ip6 neighbor discovery */
-#define foreach_icmp6_neighbor_discovery_option	\
-  _ (1, source_link_layer_address)		\
-  _ (2, target_link_layer_address)		\
-  _ (3, prefix_information)			\
-  _ (4, redirected_header)			\
-  _ (5, mtu)					\
-  _ (6, nbma_shortcut_limit)			\
-  _ (7, advertisement_interval)			\
-  _ (8, home_agent_information)			\
-  _ (9, source_address_list)			\
-  _ (10, target_address_list)			\
-  _ (11, cryptographically_generated_address)	\
-  _ (12, rsa_signature)				\
-  _ (13, timestamp)				\
-  _ (14, nonce)					\
-  _ (15, trust_anchor)				\
-  _ (16, certificate)				\
-  _ (17, ip_address_and_prefix)			\
-  _ (18, new_router_prefix_information)		\
-  _ (19, mobile_link_layer_address)		\
-  _ (20, neighbor_advertisement_acknowledgment)	\
-  _ (23, map)					\
-  _ (24, route_information)			\
-  _ (25, recursive_dns_server)			\
-  _ (26, ra_flags_extension)			\
-  _ (27, handover_key_request)			\
-  _ (28, handover_key_reply)			\
-  _ (29, handover_assist_information)		\
-  _ (30, mobile_node_identifier)		\
-  _ (31, dns_search_list)			\
-  _ (138, card_request)				\
-  _ (139, card_reply)
-
-typedef enum icmp6_neighbor_discovery_option_type
-{
-#define _(n,f) ICMP6_NEIGHBOR_DISCOVERY_OPTION_##f = n,
-  foreach_icmp6_neighbor_discovery_option
-#undef _
-} icmp6_neighbor_discovery_option_type_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     /* Option type. */
-		     u8 type;
-		     /* Length of this header plus option data in 8 byte units. */
-		     u8 n_data_u64s;
-		     /* Option data follows. */
-		     u8 data[0];
-		     }) icmp6_neighbor_discovery_option_header_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     icmp6_neighbor_discovery_option_header_t header;
-		     u8 dst_address_length;
-		     u8 flags;
-#define ICMP6_NEIGHBOR_DISCOVERY_PREFIX_INFORMATION_FLAG_ON_LINK (1 << 7)
-#define ICMP6_NEIGHBOR_DISCOVERY_PREFIX_INFORMATION_AUTO (1 << 6)
-		     u32 valid_time;
-		     u32 preferred_time;
-		     u32 unused; ip6_address_t dst_address;
-		     }) icmp6_neighbor_discovery_prefix_information_option_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     u8 type;
-		     u8 aux_data_len_u32s;
-		     u16 num_sources;
-		     ip6_address_t mcast_addr; ip6_address_t source_addr[0];
-		     }) icmp6_multicast_address_record_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     ip6_hop_by_hop_ext_t ext_hdr;
-		     ip6_router_alert_option_t alert;
-		     ip6_padN_option_t pad;
-		     icmp46_header_t icmp;
-		     u16 rsvd;
-		     u16 num_addr_records;
-		     icmp6_multicast_address_record_t records[0];
-		     }) icmp6_multicast_listener_report_header_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     icmp6_neighbor_discovery_option_header_t header;
-		     u8 reserved[6];
-		     /* IP6 header plus payload follows. */
-		     u8 data[0];
-		     }) icmp6_neighbor_discovery_redirected_header_option_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     icmp6_neighbor_discovery_option_header_t header;
-		     u16 unused; u32 mtu;
-		     }) icmp6_neighbor_discovery_mtu_option_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     icmp6_neighbor_discovery_option_header_t header;
-		     u8 ethernet_address[6];
-		     })
-  icmp6_neighbor_discovery_ethernet_link_layer_address_option_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     icmp6_neighbor_discovery_option_header_t header;
-		     u8 max_l2_address[6 + 8];
-		     })
-  icmp6_neighbor_discovery_max_link_layer_address_option_t;
-
-/* Generic neighbor discover header.  Used for router solicitations,
-   etc. */
-typedef CLIB_PACKED (struct
-		     {
-		     icmp46_header_t icmp; u32 reserved_must_be_zero;
-		     }) icmp6_neighbor_discovery_header_t;
-
-/* Router advertisement packet formats. */
-typedef CLIB_PACKED (struct
-		     {
-		     icmp46_header_t icmp;
-		     /* Current hop limit to use for outgoing packets. */
-		     u8 current_hop_limit;
-		     u8 flags;
-#define ICMP6_ROUTER_DISCOVERY_FLAG_ADDRESS_CONFIG_VIA_DHCP (1 << 7)
-#define ICMP6_ROUTER_DISCOVERY_FLAG_OTHER_CONFIG_VIA_DHCP (1 << 6)
-		     /* Zero means unspecified. */
-		     u16 router_lifetime_in_sec;
-		     /* Zero means unspecified. */
-		     u32 neighbor_reachable_time_in_msec;
-		     /* Zero means unspecified. */
-		     u32
-		     time_in_msec_between_retransmitted_neighbor_solicitations;
-		     /* Options that may follow: source_link_layer_address, mtu, prefix_information. */
-		     }) icmp6_router_advertisement_header_t;
-
-/* Neighbor solicitation/advertisement header. */
-typedef CLIB_PACKED (struct
-		     {
-		     icmp46_header_t icmp;
-		     /* Zero for solicitation; flags for advertisement. */
-		     u32 advertisement_flags;
-		     /* Set when sent by a router. */
-#define ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_ROUTER (1 << 31)
-		     /* Set when response to solicitation. */
-#define ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_SOLICITED (1 << 30)
-#define ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_OVERRIDE (1 << 29)
-		     ip6_address_t target_address;
-		     /* Options that may follow: source_link_layer_address
-		        (for solicitation) target_link_layer_address (for advertisement). */
-		     }) icmp6_neighbor_solicitation_or_advertisement_header_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     icmp46_header_t icmp;
-		     u32 reserved_must_be_zero;
-		     /* Better next hop to use for given destination. */
-		     ip6_address_t better_next_hop_address;
-		     ip6_address_t dst_address;
-		     /* Options that may follow: target_link_layer_address,
-		        redirected_header. */
-		     }) icmp6_redirect_header_t;
-
-/* Solicitation/advertisement packet format for ethernet. */
-typedef CLIB_PACKED (struct
-		     {
-		     ip6_header_t ip;
-		     icmp6_neighbor_solicitation_or_advertisement_header_t
-		     neighbor;
-		     icmp6_neighbor_discovery_ethernet_link_layer_address_option_t
-		     link_layer_option;
-		     }) icmp6_neighbor_solicitation_header_t;
-
-/* Router solicitation packet format for ethernet. */
-typedef CLIB_PACKED (struct
-		     {
-		     ip6_header_t ip;
-		     icmp6_neighbor_discovery_header_t neighbor;
-		     icmp6_neighbor_discovery_ethernet_link_layer_address_option_t
-		     link_layer_option;
-		     }) icmp6_router_solicitation_header_t;
-
-/* router advertisement packet format for ethernet. */
-typedef CLIB_PACKED (struct
-		     {
-		     ip6_header_t ip;
-		     icmp6_router_advertisement_header_t router;
-		     icmp6_neighbor_discovery_ethernet_link_layer_address_option_t
-		     link_layer_option;
-		     icmp6_neighbor_discovery_mtu_option_t mtu_option;
-		     icmp6_neighbor_discovery_prefix_information_option_t
-		     prefix[0];
-		     }) icmp6_router_advertisement_packet_t;
-
-/* multicast listener report packet format for ethernet. */
-typedef CLIB_PACKED (struct
-		     {
-		     ip6_header_t ip;
-		     icmp6_multicast_listener_report_header_t report_hdr;
-		     }) icmp6_multicast_listener_report_packet_t;
-
-#endif /* included_vnet_icmp46_packet_h */
diff --git a/vnet/vnet/ip/icmp6.c b/vnet/vnet/ip/icmp6.c
deleted file mode 100644
index 70696d0c..00000000
--- a/vnet/vnet/ip/icmp6.c
+++ /dev/null
@@ -1,882 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/icmp6.c: ip6 icmp
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/ip/ip.h>
-#include <vnet/pg/pg.h>
-
-static u8 *
-format_ip6_icmp_type_and_code (u8 * s, va_list * args)
-{
-  icmp6_type_t type = va_arg (*args, int);
-  u8 code = va_arg (*args, int);
-  char *t = 0;
-
-#define _(n,f) case n: t = #f; break;
-
-  switch (type)
-    {
-      foreach_icmp6_type;
-
-    default:
-      break;
-    }
-
-#undef _
-
-  if (!t)
-    return format (s, "unknown 0x%x", type);
-
-  s = format (s, "%s", t);
-
-  t = 0;
-  switch ((type << 8) | code)
-    {
-#define _(a,n,f) case (ICMP6_##a << 8) | (n): t = #f; break;
-
-      foreach_icmp6_code;
-
-#undef _
-    }
-
-  if (t)
-    s = format (s, " %s", t);
-
-  return s;
-}
-
-static u8 *
-format_icmp6_header (u8 * s, va_list * args)
-{
-  icmp46_header_t *icmp = va_arg (*args, icmp46_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-
-  /* Nothing to do. */
-  if (max_header_bytes < sizeof (icmp[0]))
-    return format (s, "ICMP header truncated");
-
-  s = format (s, "ICMP %U checksum 0x%x",
-	      format_ip6_icmp_type_and_code, icmp->type, icmp->code,
-	      clib_net_to_host_u16 (icmp->checksum));
-
-  if (max_header_bytes >=
-      sizeof (icmp6_neighbor_solicitation_or_advertisement_header_t) &&
-      (icmp->type == ICMP6_neighbor_solicitation ||
-       icmp->type == ICMP6_neighbor_advertisement))
-    {
-      icmp6_neighbor_solicitation_or_advertisement_header_t *icmp6_nd =
-	(icmp6_neighbor_solicitation_or_advertisement_header_t *) icmp;
-      s = format (s, "\n    target address %U",
-		  format_ip6_address, &icmp6_nd->target_address);
-    }
-
-  return s;
-}
-
-u8 *
-format_icmp6_input_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  icmp6_input_trace_t *t = va_arg (*va, icmp6_input_trace_t *);
-
-  s = format (s, "%U",
-	      format_ip6_header, t->packet_data, sizeof (t->packet_data));
-
-  return s;
-}
-
-static char *icmp_error_strings[] = {
-#define _(f,s) s,
-  foreach_icmp6_error
-#undef _
-};
-
-typedef enum
-{
-  ICMP_INPUT_NEXT_DROP,
-  ICMP_INPUT_N_NEXT,
-} icmp_input_next_t;
-
-typedef struct
-{
-  uword *type_and_code_by_name;
-
-  uword *type_by_name;
-
-  /* Vector dispatch table indexed by [icmp type]. */
-  u8 input_next_index_by_type[256];
-
-  /* Max valid code indexed by icmp type. */
-  u8 max_valid_code_by_type[256];
-
-  /* hop_limit must be >= this value for this icmp type. */
-  u8 min_valid_hop_limit_by_type[256];
-
-  u8 min_valid_length_by_type[256];
-} icmp6_main_t;
-
-icmp6_main_t icmp6_main;
-
-static uword
-ip6_icmp_input (vlib_main_t * vm,
-		vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  icmp6_main_t *im = &icmp6_main;
-  u32 *from, *to_next;
-  u32 n_left_from, n_left_to_next, next_index;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-				   /* stride */ 1,
-				   sizeof (icmp6_input_trace_t));
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *b0;
-	  ip6_header_t *ip0;
-	  icmp46_header_t *icmp0;
-	  icmp6_type_t type0;
-	  u32 bi0, next0, error0, len0;
-
-	  bi0 = to_next[0] = from[0];
-
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  ip0 = vlib_buffer_get_current (b0);
-	  icmp0 = ip6_next_header (ip0);
-	  type0 = icmp0->type;
-
-	  error0 = ICMP6_ERROR_NONE;
-
-	  next0 = im->input_next_index_by_type[type0];
-	  error0 =
-	    next0 == ICMP_INPUT_NEXT_DROP ? ICMP6_ERROR_UNKNOWN_TYPE : error0;
-
-	  /* Check code is valid for type. */
-	  error0 =
-	    icmp0->code >
-	    im->max_valid_code_by_type[type0] ?
-	    ICMP6_ERROR_INVALID_CODE_FOR_TYPE : error0;
-
-	  /* Checksum is already validated by ip6_local node so we don't need to check that. */
-
-	  /* Check that hop limit == 255 for certain types. */
-	  error0 =
-	    ip0->hop_limit <
-	    im->min_valid_hop_limit_by_type[type0] ?
-	    ICMP6_ERROR_INVALID_HOP_LIMIT_FOR_TYPE : error0;
-
-	  len0 = clib_net_to_host_u16 (ip0->payload_length);
-	  error0 =
-	    len0 <
-	    im->min_valid_length_by_type[type0] ?
-	    ICMP6_ERROR_LENGTH_TOO_SMALL_FOR_TYPE : error0;
-
-	  b0->error = node->errors[error0];
-
-	  next0 = error0 != ICMP6_ERROR_NONE ? ICMP_INPUT_NEXT_DROP : next0;
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_icmp_input_node) = {
-  .function = ip6_icmp_input,
-  .name = "ip6-icmp-input",
-
-  .vector_size = sizeof (u32),
-
-  .format_trace = format_icmp6_input_trace,
-
-  .n_errors = ARRAY_LEN (icmp_error_strings),
-  .error_strings = icmp_error_strings,
-
-  .n_next_nodes = 1,
-  .next_nodes = {
-    [ICMP_INPUT_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-typedef enum
-{
-  ICMP6_ECHO_REQUEST_NEXT_LOOKUP,
-  ICMP6_ECHO_REQUEST_NEXT_OUTPUT,
-  ICMP6_ECHO_REQUEST_N_NEXT,
-} icmp6_echo_request_next_t;
-
-static uword
-ip6_icmp_echo_request (vlib_main_t * vm,
-		       vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 *from, *to_next;
-  u32 n_left_from, n_left_to_next, next_index;
-  ip6_main_t *im = &ip6_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-				   /* stride */ 1,
-				   sizeof (icmp6_input_trace_t));
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 2 && n_left_to_next > 2)
-	{
-	  vlib_buffer_t *p0, *p1;
-	  ip6_header_t *ip0, *ip1;
-	  icmp46_header_t *icmp0, *icmp1;
-	  ip6_address_t tmp0, tmp1;
-	  ip_csum_t sum0, sum1;
-	  u32 bi0, bi1;
-	  u32 fib_index0, fib_index1;
-	  u32 next0 = ICMP6_ECHO_REQUEST_NEXT_LOOKUP;
-	  u32 next1 = ICMP6_ECHO_REQUEST_NEXT_LOOKUP;
-
-	  bi0 = to_next[0] = from[0];
-	  bi1 = to_next[1] = from[1];
-
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, bi0);
-	  p1 = vlib_get_buffer (vm, bi1);
-	  ip0 = vlib_buffer_get_current (p0);
-	  ip1 = vlib_buffer_get_current (p1);
-	  icmp0 = ip6_next_header (ip0);
-	  icmp1 = ip6_next_header (ip1);
-
-	  /* Check icmp type to echo reply and update icmp checksum. */
-	  sum0 = icmp0->checksum;
-	  sum1 = icmp1->checksum;
-
-	  ASSERT (icmp0->type == ICMP6_echo_request);
-	  ASSERT (icmp1->type == ICMP6_echo_request);
-	  sum0 = ip_csum_update (sum0, ICMP6_echo_request, ICMP6_echo_reply,
-				 icmp46_header_t, type);
-	  sum1 = ip_csum_update (sum1, ICMP6_echo_request, ICMP6_echo_reply,
-				 icmp46_header_t, type);
-
-	  icmp0->checksum = ip_csum_fold (sum0);
-	  icmp1->checksum = ip_csum_fold (sum1);
-
-	  icmp0->type = ICMP6_echo_reply;
-	  icmp1->type = ICMP6_echo_reply;
-
-	  /* Swap source and destination address. */
-	  tmp0 = ip0->src_address;
-	  tmp1 = ip1->src_address;
-
-	  ip0->src_address = ip0->dst_address;
-	  ip1->src_address = ip1->dst_address;
-
-	  ip0->dst_address = tmp0;
-	  ip1->dst_address = tmp1;
-
-	  /* New hop count. */
-	  ip0->hop_limit = im->host_config.ttl;
-	  ip1->hop_limit = im->host_config.ttl;
-
-	  if (ip6_address_is_link_local_unicast (&ip0->dst_address))
-	    {
-	      ethernet_header_t *eth0;
-	      u8 tmp_mac[6];
-	      /* For link local, reuse current MAC header by sawpping
-	       *  SMAC to DMAC instead of IP6 lookup since link local
-	       *  is not in the IP6 FIB */
-	      vlib_buffer_reset (p0);
-	      eth0 = vlib_buffer_get_current (p0);
-	      clib_memcpy (tmp_mac, eth0->dst_address, 6);
-	      clib_memcpy (eth0->dst_address, eth0->src_address, 6);
-	      clib_memcpy (eth0->src_address, tmp_mac, 6);
-	      vnet_buffer (p0)->sw_if_index[VLIB_TX] =
-		vnet_buffer (p0)->sw_if_index[VLIB_RX];
-	      next0 = ICMP6_ECHO_REQUEST_NEXT_OUTPUT;
-	    }
-	  else
-	    {
-	      /* Determine the correct lookup fib indices... */
-	      fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
-				    vnet_buffer (p0)->sw_if_index[VLIB_RX]);
-	      vnet_buffer (p0)->sw_if_index[VLIB_TX] = fib_index0;
-	    }
-
-	  if (ip6_address_is_link_local_unicast (&ip1->dst_address))
-	    {
-	      ethernet_header_t *eth1;
-	      u8 tmp_mac[6];
-	      /* For link local, reuse current MAC header by sawpping
-	       *  SMAC to DMAC instead of IP6 lookup since link local
-	       *  is not in the IP6 FIB */
-	      vlib_buffer_reset (p1);
-	      eth1 = vlib_buffer_get_current (p1);
-	      clib_memcpy (tmp_mac, eth1->dst_address, 6);
-	      clib_memcpy (eth1->dst_address, eth1->src_address, 6);
-	      clib_memcpy (eth1->src_address, tmp_mac, 6);
-	      vnet_buffer (p1)->sw_if_index[VLIB_TX] =
-		vnet_buffer (p1)->sw_if_index[VLIB_RX];
-	      next1 = ICMP6_ECHO_REQUEST_NEXT_OUTPUT;
-	    }
-	  else
-	    {
-	      /* Determine the correct lookup fib indices... */
-	      fib_index1 = vec_elt (im->fib_index_by_sw_if_index,
-				    vnet_buffer (p1)->sw_if_index[VLIB_RX]);
-	      vnet_buffer (p1)->sw_if_index[VLIB_TX] = fib_index1;
-	    }
-
-	  vnet_buffer (p0)->sw_if_index[VLIB_RX]
-	    = vnet_main.local_interface_sw_if_index;
-	  vnet_buffer (p1)->sw_if_index[VLIB_RX]
-	    = vnet_main.local_interface_sw_if_index;
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  /* if next0==next1==next_index then nothing special needs to be done */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip6_header_t *ip0;
-	  icmp46_header_t *icmp0;
-	  u32 bi0;
-	  ip6_address_t tmp0;
-	  ip_csum_t sum0;
-	  u32 fib_index0;
-	  u32 next0 = ICMP6_ECHO_REQUEST_NEXT_LOOKUP;
-
-	  bi0 = to_next[0] = from[0];
-
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, bi0);
-	  ip0 = vlib_buffer_get_current (p0);
-	  icmp0 = ip6_next_header (ip0);
-
-	  /* Check icmp type to echo reply and update icmp checksum. */
-	  sum0 = icmp0->checksum;
-
-	  ASSERT (icmp0->type == ICMP6_echo_request);
-	  sum0 = ip_csum_update (sum0, ICMP6_echo_request, ICMP6_echo_reply,
-				 icmp46_header_t, type);
-
-	  icmp0->checksum = ip_csum_fold (sum0);
-
-	  icmp0->type = ICMP6_echo_reply;
-
-	  /* Swap source and destination address. */
-	  tmp0 = ip0->src_address;
-	  ip0->src_address = ip0->dst_address;
-	  ip0->dst_address = tmp0;
-
-	  ip0->hop_limit = im->host_config.ttl;
-
-	  if (ip6_address_is_link_local_unicast (&ip0->dst_address))
-	    {
-	      ethernet_header_t *eth0;
-	      u8 tmp_mac[6];
-	      /* For link local, reuse current MAC header by sawpping
-	       *  SMAC to DMAC instead of IP6 lookup since link local
-	       *  is not in the IP6 FIB */
-	      vlib_buffer_reset (p0);
-	      eth0 = vlib_buffer_get_current (p0);
-	      clib_memcpy (tmp_mac, eth0->dst_address, 6);
-	      clib_memcpy (eth0->dst_address, eth0->src_address, 6);
-	      clib_memcpy (eth0->src_address, tmp_mac, 6);
-	      vnet_buffer (p0)->sw_if_index[VLIB_TX] =
-		vnet_buffer (p0)->sw_if_index[VLIB_RX];
-	      next0 = ICMP6_ECHO_REQUEST_NEXT_OUTPUT;
-	    }
-	  else
-	    {
-	      fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
-				    vnet_buffer (p0)->sw_if_index[VLIB_RX]);
-	      vnet_buffer (p0)->sw_if_index[VLIB_TX] = fib_index0;
-	    }
-	  vnet_buffer (p0)->sw_if_index[VLIB_RX]
-	    = vnet_main.local_interface_sw_if_index;
-
-	  /* Verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_error_count (vm, ip6_icmp_input_node.index,
-		    ICMP6_ERROR_ECHO_REPLIES_SENT, frame->n_vectors);
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_icmp_echo_request_node,static) = {
-  .function = ip6_icmp_echo_request,
-  .name = "ip6-icmp-echo-request",
-
-  .vector_size = sizeof (u32),
-
-  .format_trace = format_icmp6_input_trace,
-
-  .n_next_nodes = ICMP6_ECHO_REQUEST_N_NEXT,
-  .next_nodes = {
-    [ICMP6_ECHO_REQUEST_NEXT_LOOKUP] = "ip6-lookup",
-    [ICMP6_ECHO_REQUEST_NEXT_OUTPUT] = "interface-output",
-  },
-};
-/* *INDENT-ON* */
-
-typedef enum
-{
-  IP6_ICMP_ERROR_NEXT_DROP,
-  IP6_ICMP_ERROR_NEXT_LOOKUP,
-  IP6_ICMP_ERROR_N_NEXT,
-} ip6_icmp_error_next_t;
-
-void
-icmp6_error_set_vnet_buffer (vlib_buffer_t * b, u8 type, u8 code, u32 data)
-{
-  vnet_buffer (b)->ip.icmp.type = type;
-  vnet_buffer (b)->ip.icmp.code = code;
-  vnet_buffer (b)->ip.icmp.data = data;
-}
-
-static u8
-icmp6_icmp_type_to_error (u8 type)
-{
-  switch (type)
-    {
-    case ICMP6_destination_unreachable:
-      return ICMP6_ERROR_DEST_UNREACH_SENT;
-    case ICMP6_packet_too_big:
-      return ICMP6_ERROR_PACKET_TOO_BIG_SENT;
-    case ICMP6_time_exceeded:
-      return ICMP6_ERROR_TTL_EXPIRE_SENT;
-    case ICMP6_parameter_problem:
-      return ICMP6_ERROR_PARAM_PROBLEM_SENT;
-    default:
-      return ICMP6_ERROR_DROP;
-    }
-}
-
-static uword
-ip6_icmp_error (vlib_main_t * vm,
-		vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 *from, *to_next;
-  uword n_left_from, n_left_to_next;
-  ip6_icmp_error_next_t next_index;
-  ip6_main_t *im = &ip6_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-				   /* stride */ 1,
-				   sizeof (icmp6_input_trace_t));
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0 = from[0];
-	  u32 next0 = IP6_ICMP_ERROR_NEXT_LOOKUP;
-	  u8 error0 = ICMP6_ERROR_NONE;
-	  vlib_buffer_t *p0;
-	  ip6_header_t *ip0, *out_ip0;
-	  icmp46_header_t *icmp0;
-	  u32 sw_if_index0, if_add_index0;
-	  int bogus_length;
-
-	  /* Speculatively enqueue p0 to the current next frame */
-	  to_next[0] = pi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip0 = vlib_buffer_get_current (p0);
-	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
-
-	  /* RFC4443 says to keep as much of the original packet as possible
-	   * within the minimum MTU. We cheat "a little" here by keeping whatever fits
-	   * in the first buffer, to be more efficient */
-	  if (PREDICT_FALSE (p0->total_length_not_including_first_buffer))
-	    {			/* clear current_length of all other buffers in chain */
-	      vlib_buffer_t *b = p0;
-	      p0->total_length_not_including_first_buffer = 0;
-	      while (b->flags & VLIB_BUFFER_NEXT_PRESENT)
-		{
-		  b = vlib_get_buffer (vm, b->next_buffer);
-		  b->current_length = 0;
-		}
-	    }
-	  p0->current_length =
-	    p0->current_length > 1280 ? 1280 : p0->current_length;
-
-	  /* Add IP header and ICMPv6 header including a 4 byte data field */
-	  vlib_buffer_advance (p0,
-			       -sizeof (ip6_header_t) -
-			       sizeof (icmp46_header_t) - 4);
-	  out_ip0 = vlib_buffer_get_current (p0);
-	  icmp0 = (icmp46_header_t *) & out_ip0[1];
-
-	  /* Fill ip header fields */
-	  out_ip0->ip_version_traffic_class_and_flow_label =
-	    clib_host_to_net_u32 (0x6 << 28);
-
-	  out_ip0->payload_length =
-	    clib_host_to_net_u16 (p0->current_length - sizeof (ip6_header_t));
-	  out_ip0->protocol = IP_PROTOCOL_ICMP6;
-	  out_ip0->hop_limit = 0xff;
-	  out_ip0->dst_address = ip0->src_address;
-	  if_add_index0 =
-	    lm->if_address_pool_index_by_sw_if_index[sw_if_index0];
-	  if (PREDICT_TRUE (if_add_index0 != ~0))
-	    {
-	      ip_interface_address_t *if_add =
-		pool_elt_at_index (lm->if_address_pool, if_add_index0);
-	      ip6_address_t *if_ip =
-		ip_interface_address_get_address (lm, if_add);
-	      out_ip0->src_address = *if_ip;
-	    }
-	  else			/* interface has no IP6 address - should not happen */
-	    {
-	      next0 = IP6_ICMP_ERROR_NEXT_DROP;
-	      error0 = ICMP6_ERROR_DROP;
-	    }
-
-	  /* Fill icmp header fields */
-	  icmp0->type = vnet_buffer (p0)->ip.icmp.type;
-	  icmp0->code = vnet_buffer (p0)->ip.icmp.code;
-	  *((u32 *) (icmp0 + 1)) =
-	    clib_host_to_net_u32 (vnet_buffer (p0)->ip.icmp.data);
-	  icmp0->checksum = 0;
-	  icmp0->checksum =
-	    ip6_tcp_udp_icmp_compute_checksum (vm, p0, out_ip0,
-					       &bogus_length);
-
-
-
-	  /* Update error status */
-	  if (error0 == ICMP6_ERROR_NONE)
-	    error0 = icmp6_icmp_type_to_error (icmp0->type);
-	  vlib_error_count (vm, node->node_index, error0, 1);
-
-	  /* Verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_icmp_error_node) = {
-  .function = ip6_icmp_error,
-  .name = "ip6-icmp-error",
-  .vector_size = sizeof (u32),
-
-  .n_errors = ARRAY_LEN (icmp_error_strings),
-  .error_strings = icmp_error_strings,
-
-  .n_next_nodes = IP6_ICMP_ERROR_N_NEXT,
-  .next_nodes = {
-    [IP6_ICMP_ERROR_NEXT_DROP] = "error-drop",
-    [IP6_ICMP_ERROR_NEXT_LOOKUP] = "ip6-lookup",
-  },
-
-  .format_trace = format_icmp6_input_trace,
-};
-/* *INDENT-ON* */
-
-
-static uword
-unformat_icmp_type_and_code (unformat_input_t * input, va_list * args)
-{
-  icmp46_header_t *h = va_arg (*args, icmp46_header_t *);
-  icmp6_main_t *cm = &icmp6_main;
-  u32 i;
-
-  if (unformat_user (input, unformat_vlib_number_by_name,
-		     cm->type_and_code_by_name, &i))
-    {
-      h->type = (i >> 8) & 0xff;
-      h->code = (i >> 0) & 0xff;
-    }
-  else if (unformat_user (input, unformat_vlib_number_by_name,
-			  cm->type_by_name, &i))
-    {
-      h->type = i;
-      h->code = 0;
-    }
-  else
-    return 0;
-
-  return 1;
-}
-
-static void
-icmp6_pg_edit_function (pg_main_t * pg,
-			pg_stream_t * s,
-			pg_edit_group_t * g, u32 * packets, u32 n_packets)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  u32 ip_offset, icmp_offset;
-  int bogus_length;
-
-  icmp_offset = g->start_byte_offset;
-  ip_offset = (g - 1)->start_byte_offset;
-
-  while (n_packets >= 1)
-    {
-      vlib_buffer_t *p0;
-      ip6_header_t *ip0;
-      icmp46_header_t *icmp0;
-
-      p0 = vlib_get_buffer (vm, packets[0]);
-      n_packets -= 1;
-      packets += 1;
-
-      ASSERT (p0->current_data == 0);
-      ip0 = (void *) (p0->data + ip_offset);
-      icmp0 = (void *) (p0->data + icmp_offset);
-
-      icmp0->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, p0, ip0,
-							   &bogus_length);
-      ASSERT (bogus_length == 0);
-    }
-}
-
-typedef struct
-{
-  pg_edit_t type, code;
-  pg_edit_t checksum;
-} pg_icmp46_header_t;
-
-always_inline void
-pg_icmp_header_init (pg_icmp46_header_t * p)
-{
-  /* Initialize fields that are not bit fields in the IP header. */
-#define _(f) pg_edit_init (&p->f, icmp46_header_t, f);
-  _(type);
-  _(code);
-  _(checksum);
-#undef _
-}
-
-static uword
-unformat_pg_icmp_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t *s = va_arg (*args, pg_stream_t *);
-  pg_icmp46_header_t *p;
-  u32 group_index;
-
-  p = pg_create_edit_group (s, sizeof (p[0]), sizeof (icmp46_header_t),
-			    &group_index);
-  pg_icmp_header_init (p);
-
-  p->checksum.type = PG_EDIT_UNSPECIFIED;
-
-  {
-    icmp46_header_t tmp;
-
-    if (!unformat (input, "ICMP %U", unformat_icmp_type_and_code, &tmp))
-      goto error;
-
-    pg_edit_set_fixed (&p->type, tmp.type);
-    pg_edit_set_fixed (&p->code, tmp.code);
-  }
-
-  /* Parse options. */
-  while (1)
-    {
-      if (unformat (input, "checksum %U",
-		    unformat_pg_edit, unformat_pg_number, &p->checksum))
-	;
-
-      /* Can't parse input: try next protocol level. */
-      else
-	break;
-    }
-
-  if (!unformat_user (input, unformat_pg_payload, s))
-    goto error;
-
-  if (p->checksum.type == PG_EDIT_UNSPECIFIED)
-    {
-      pg_edit_group_t *g = pg_stream_get_group (s, group_index);
-      g->edit_function = icmp6_pg_edit_function;
-      g->edit_function_opaque = 0;
-    }
-
-  return 1;
-
-error:
-  /* Free up any edits we may have added. */
-  pg_free_edit_group (s);
-  return 0;
-}
-
-void
-icmp6_register_type (vlib_main_t * vm, icmp6_type_t type, u32 node_index)
-{
-  icmp6_main_t *im = &icmp6_main;
-
-  ASSERT ((int) type < ARRAY_LEN (im->input_next_index_by_type));
-  im->input_next_index_by_type[type]
-    = vlib_node_add_next (vm, ip6_icmp_input_node.index, node_index);
-}
-
-static clib_error_t *
-icmp6_init (vlib_main_t * vm)
-{
-  ip_main_t *im = &ip_main;
-  ip_protocol_info_t *pi;
-  icmp6_main_t *cm = &icmp6_main;
-  clib_error_t *error;
-
-  error = vlib_call_init_function (vm, ip_main_init);
-
-  if (error)
-    return error;
-
-  pi = ip_get_protocol_info (im, IP_PROTOCOL_ICMP6);
-  pi->format_header = format_icmp6_header;
-  pi->unformat_pg_edit = unformat_pg_icmp_header;
-
-  cm->type_by_name = hash_create_string (0, sizeof (uword));
-#define _(n,t) hash_set_mem (cm->type_by_name, #t, (n));
-  foreach_icmp6_type;
-#undef _
-
-  cm->type_and_code_by_name = hash_create_string (0, sizeof (uword));
-#define _(a,n,t) hash_set_mem (cm->type_by_name, #t, (n) | (ICMP6_##a << 8));
-  foreach_icmp6_code;
-#undef _
-
-  memset (cm->input_next_index_by_type,
-	  ICMP_INPUT_NEXT_DROP, sizeof (cm->input_next_index_by_type));
-  memset (cm->max_valid_code_by_type, 0, sizeof (cm->max_valid_code_by_type));
-
-#define _(a,n,t) cm->max_valid_code_by_type[ICMP6_##a] = clib_max (cm->max_valid_code_by_type[ICMP6_##a], n);
-  foreach_icmp6_code;
-#undef _
-
-  memset (cm->min_valid_hop_limit_by_type, 0,
-	  sizeof (cm->min_valid_hop_limit_by_type));
-  cm->min_valid_hop_limit_by_type[ICMP6_router_solicitation] = 255;
-  cm->min_valid_hop_limit_by_type[ICMP6_router_advertisement] = 255;
-  cm->min_valid_hop_limit_by_type[ICMP6_neighbor_solicitation] = 255;
-  cm->min_valid_hop_limit_by_type[ICMP6_neighbor_advertisement] = 255;
-  cm->min_valid_hop_limit_by_type[ICMP6_redirect] = 255;
-
-  memset (cm->min_valid_length_by_type, sizeof (icmp46_header_t),
-	  sizeof (cm->min_valid_length_by_type));
-  cm->min_valid_length_by_type[ICMP6_router_solicitation] =
-    sizeof (icmp6_neighbor_discovery_header_t);
-  cm->min_valid_length_by_type[ICMP6_router_advertisement] =
-    sizeof (icmp6_router_advertisement_header_t);
-  cm->min_valid_length_by_type[ICMP6_neighbor_solicitation] =
-    sizeof (icmp6_neighbor_solicitation_or_advertisement_header_t);
-  cm->min_valid_length_by_type[ICMP6_neighbor_advertisement] =
-    sizeof (icmp6_neighbor_solicitation_or_advertisement_header_t);
-  cm->min_valid_length_by_type[ICMP6_redirect] =
-    sizeof (icmp6_redirect_header_t);
-
-  icmp6_register_type (vm, ICMP6_echo_request,
-		       ip6_icmp_echo_request_node.index);
-
-  return vlib_call_init_function (vm, ip6_neighbor_init);
-}
-
-VLIB_INIT_FUNCTION (icmp6_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/icmp6.h b/vnet/vnet/ip/icmp6.h
deleted file mode 100644
index a426512e..00000000
--- a/vnet/vnet/ip/icmp6.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vnet_icmp6_h
-#define included_vnet_icmp6_h
-
-#define foreach_icmp6_error                                             \
-  _ (NONE, "valid packets")                                             \
-  _ (UNKNOWN_TYPE, "unknown type")                                      \
-  _ (INVALID_CODE_FOR_TYPE, "invalid code for type")                    \
-  _ (INVALID_HOP_LIMIT_FOR_TYPE, "hop_limit != 255")                    \
-  _ (LENGTH_TOO_SMALL_FOR_TYPE, "payload length too small for type")    \
-  _ (OPTIONS_WITH_ODD_LENGTH,                                           \
-     "total option length not multiple of 8 bytes")                     \
-  _ (OPTION_WITH_ZERO_LENGTH, "option has zero length")                 \
-  _ (ECHO_REPLIES_SENT, "echo replies sent")                            \
-  _ (NEIGHBOR_SOLICITATION_SOURCE_NOT_ON_LINK,                          \
-     "neighbor solicitations from source not on link")                  \
-  _ (NEIGHBOR_SOLICITATION_SOURCE_UNKNOWN,                              \
-     "neighbor solicitations for unknown targets")                      \
-  _ (NEIGHBOR_ADVERTISEMENTS_TX, "neighbor advertisements sent")        \
-  _ (NEIGHBOR_ADVERTISEMENTS_RX, "neighbor advertisements received")    \
-  _ (ROUTER_SOLICITATION_SOURCE_NOT_ON_LINK,                            \
-     "router solicitations from source not on link")                    \
-  _ (ROUTER_SOLICITATION_UNSUPPORTED_INTF,                              \
-     "neighbor discovery unsupported  interface")                       \
-  _ (ROUTER_SOLICITATION_RADV_NOT_CONFIG,                               \
-     "neighbor discovery not configured")                               \
-  _ (ROUTER_SOLICITATION_DEST_UNKNOWN,                                  \
-     "router solicitations for unknown destination")                    \
-  _ (ROUTER_SOLICITATION_SOURCE_UNKNOWN,                                \
-     "router solicitations for unknown source")                         \
-  _ (ROUTER_ADVERTISEMENT_SOURCE_NOT_LINK_LOCAL,                        \
-     "router advertisement source not link local")                      \
-  _ (ROUTER_ADVERTISEMENTS_TX, "router advertisements sent")            \
-  _ (ROUTER_ADVERTISEMENTS_RX, "router advertisements received")        \
-  _ (DST_LOOKUP_MISS, "icmp6 dst address lookup misses")                \
-  _ (DEST_UNREACH_SENT, "destination unreachable response sent")	\
-  _ (PACKET_TOO_BIG_SENT, "packet too big response sent")		\
-  _ (TTL_EXPIRE_SENT, "hop limit exceeded response sent")		\
-  _ (PARAM_PROBLEM_SENT, "parameter Pproblem response sent")		\
-  _ (DROP, "error message dropped")
-
-
-typedef enum
-{
-#define _(f,s) ICMP6_ERROR_##f,
-  foreach_icmp6_error
-#undef _
-} icmp6_error_t;
-
-typedef struct
-{
-  u8 packet_data[64];
-} icmp6_input_trace_t;
-
-format_function_t format_icmp6_input_trace;
-void icmp6_register_type (vlib_main_t * vm, icmp6_type_t type,
-			  u32 node_index);
-void icmp6_error_set_vnet_buffer (vlib_buffer_t * b, u8 type, u8 code,
-				  u32 data);
-
-extern vlib_node_registration_t ip6_icmp_input_node;
-
-#endif /* included_vnet_icmp6_h */
-
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/igmp_packet.h b/vnet/vnet/ip/igmp_packet.h
deleted file mode 100644
index 503259ec..00000000
--- a/vnet/vnet/ip/igmp_packet.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * igmp_packet.h: igmp packet format
- *
- * Copyright (c) 2011 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vnet_igmp_packet_h
-#define included_vnet_igmp_packet_h
-
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-
-#define foreach_igmp_type			\
-  _ (0x11, membership_query)			\
-  _ (0x12, membership_report_v1)		\
-  _ (0x13, dvmrp)				\
-  _ (0x14, pim_v1)				\
-  _ (0x15, cisco_trace)				\
-  _ (0x16, membership_report_v2)		\
-  _ (0x17, leave_group_v2)			\
-  _ (0x1e, traceroute_response)			\
-  _ (0x1f, traceroute_request)			\
-  _ (0x22, membership_report_v3)		\
-  _ (0x30, router_advertisement)		\
-  _ (0x31, router_solicitation)			\
-  _ (0x32, router_termination)
-
-typedef enum
-{
-#define _(n,f) IGMP_TYPE_##f = n,
-  foreach_igmp_type
-#undef _
-} igmp_type_t;
-
-typedef struct
-{
-  igmp_type_t type:8;
-
-  u8 code;
-
-  u16 checksum;
-} igmp_header_t;
-
-typedef struct
-{
-  /* membership_query, version <= 2 reports. */
-  igmp_header_t header;
-
-  /* Multicast destination address. */
-  ip4_address_t dst;
-} igmp_message_t;
-
-#define foreach_igmp_membership_group_v3_type	\
-  _ (1, mode_is_filter_include)			\
-  _ (2, mode_is_filter_exclude)			\
-  _ (3, change_to_filter_include)		\
-  _ (4, change_to_filter_exclude)		\
-  _ (5, allow_new_sources)			\
-  _ (6, block_old_sources)
-
-typedef enum
-{
-#define _(n,f) IGMP_MEMBERSHIP_GROUP_##f = n,
-  foreach_igmp_membership_group_v3_type
-#undef _
-} igmp_membership_group_v3_type_t;
-
-typedef struct
-{
-  igmp_membership_group_v3_type_t type:8;
-
-  /* Number of 32 bit words of aux data after source addresses. */
-  u8 n_aux_u32s;
-
-  /* Number of source addresses that follow. */
-  u16 n_src_addresses;
-
-  /* Destination multicast address. */
-  ip4_address_t dst_address;
-
-  ip4_address_t src_addresses[0];
-} igmp_membership_group_v3_t;
-
-always_inline igmp_membership_group_v3_t *
-igmp_membership_group_v3_next (igmp_membership_group_v3_t * g)
-{
-  return ((void *) g
-	  + g->n_src_addresses * sizeof (g->src_addresses[0])
-	  + g->n_aux_u32s * sizeof (u32));
-}
-
-typedef struct
-{
-  /* Type 0x22. */
-  igmp_header_t header;
-
-  u16 unused;
-
-  /* Number of groups which follow. */
-  u16 n_groups;
-
-  igmp_membership_group_v3_t groups[0];
-} igmp_membership_report_v3_t;
-
-/* IP6 flavor of IGMP is called MLD which is embedded in ICMP6. */
-typedef struct
-{
-  /* Preceeded by ICMP v6 header. */
-  u16 max_response_delay_in_milliseconds;
-  u16 reserved;
-  ip6_address_t dst;
-} mld_header_t;
-
-#endif /* included_vnet_igmp_packet_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip.api b/vnet/vnet/ip/ip.api
deleted file mode 100644
index c811e465..00000000
--- a/vnet/vnet/ip/ip.api
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \file
-
-    This file defines vpp IP control-plane API messages which are generally
-    called through a shared memory interface. 
-*/
-
-/** \brief Dump IP fib table
-    @param client_index - opaque cookie to identify the sender
-*/
-define ip_fib_dump
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief FIB path
-    @param sw_if_index - index of the interface
-    @param weight - The weight, for UCMP
-    @param is_local - local if non-zero, else remote
-    @param is_drop - Drop the packet
-    @param is_unreach - Drop the packet and rate limit send ICMP unreachable
-    @param is_prohibit - Drop the packet and rate limit send ICMP prohibited
-    @param afi - the afi of the next hop, IP46_TYPE_IP4=1, IP46_TYPE_IP6=2
-    @param next_hop[16] - the next hop address
-
-    WARNING: this type is replicated, pending cleanup completion
-*/
-typeonly manual_print manual_endian define fib_path
-{
-  u32 sw_if_index;
-  u32 weight;
-  u8 is_local;
-  u8 is_drop;
-  u8 is_unreach;
-  u8 is_prohibit;
-  u8 afi;
-  u8 next_hop[16];
-};
-
-/** \brief IP FIB table response
-    @param table_id - IP fib table id
-    @address_length - mask length
-    @address - ip4 prefix
-    @param count - the number of fib_path in path
-    @param path  - array of of fib_path structures
-*/
-manual_endian manual_print define ip_fib_details
-{
-  u32 context;
-  u32 table_id;
-  u8  address_length;
-  u8  address[4];
-  u32 count;
-  vl_api_fib_path_t path[count];
-};
-
-/** \brief Dump IP6 fib table
-    @param client_index - opaque cookie to identify the sender
-*/
-define ip6_fib_dump
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief IP6 FIB table response
-    @param table_id - IP6 fib table id
-    @address_length - mask length
-    @address - ip6 prefix
-    @param count - the number of fib_path in path
-    @param path  - array of of fib_path structures
-*/
-manual_endian manual_print define ip6_fib_details
-{
-  u32 context;
-  u32 table_id;
-  u8  address_length;
-  u8  address[16];
-  u32 count;
-  vl_api_fib_path_t path[count];
-};
-
-/** \brief Dump IP neighboors
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - the interface to dump neighboors
-    @param is_ipv6 - [1|0] to indicate if address family is ipv[6|4]
-*/
-define ip_neighbor_dump
-{
-    u32 client_index;
-    u32 context;
-    u32 sw_if_index;
-    u8  is_ipv6;
-};
-
-/** \brief IP neighboors dump response
-    @param context - sender context which was passed in the request
-    @param is_static - [1|0] to indicate if neighbor is statically configured
-    @param is_ipv6 - [1|0] to indicate if address family is ipv[6|4]
-*/
-define ip_neighbor_details {
-    u32 context;
-    u32 is_static;
-    u8  is_ipv6;
-    u8  mac_address[6];
-    u8  ip_address[16];
-};
-
-/** \brief IP neighbor add / del request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param vrf_id - vrf_id, only for IP4
-    @param sw_if_index - interface used to reach neighbor
-    @param is_add - 1 to add neighbor, 0 to delete
-    @param is_ipv6 - 1 for IPv6 neighbor, 0 for IPv4
-    @param is_static - 
-    @param mac_address - l2 address of the neighbor
-    @param dst_address - ip4 or ip6 address of the neighbor
-*/
-define ip_neighbor_add_del
-{
-  u32 client_index;
-  u32 context;
-  u32 vrf_id;			/* only makes sense for ip4 */
-  u32 sw_if_index;
-  /* 1 = add, 0 = delete */
-  u8 is_add;
-  u8 is_ipv6;
-  u8 is_static;
-  u8 mac_address[6];
-  u8 dst_address[16];
-};
-
-/** \brief Reply for IP Neighbor add / delete request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ip_neighbor_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Set the ip flow hash config for a fib request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param vrf_id - vrf/fib id
-    @param is_ipv6 - if non-zero the fib is ip6, else ip4
-    @param src - if non-zero include src in flow hash
-    @param dst - if non-zero include dst in flow hash
-    @param sport - if non-zero include sport in flow hash
-    @param dport - if non-zero include dport in flow hash
-    @param proto -if non-zero include proto in flow hash
-    @param reverse - if non-zero include reverse in flow hash
-*/
-define set_ip_flow_hash
-{
-  u32 client_index;
-  u32 context;
-  u32 vrf_id;
-  u8 is_ipv6;
-  u8 src;
-  u8 dst;
-  u8 sport;
-  u8 dport;
-  u8 proto;
-  u8 reverse;
-};
-
-/** \brief Set the ip flow hash config for a fib response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define set_ip_flow_hash_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IPv6 router advertisement config request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param suppress -
-    @param managed -
-    @param other -
-    @param ll_option -
-    @param send_unicast -
-    @param cease -
-    @param is_no -
-    @param default_router -
-    @param max_interval -
-    @param min_interval -
-    @param lifetime -
-    @param initial_count -
-    @param initial_interval -
-*/
-define sw_interface_ip6nd_ra_config
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 suppress;
-  u8 managed;
-  u8 other;
-  u8 ll_option;
-  u8 send_unicast;
-  u8 cease;
-  u8 is_no;
-  u8 default_router;
-  u32 max_interval;
-  u32 min_interval;
-  u32 lifetime;
-  u32 initial_count;
-  u32 initial_interval;
-};
-
-/** \brief IPv6 router advertisement config response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define sw_interface_ip6nd_ra_config_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IPv6 router advertisement prefix config request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - 
-    @param address[] -
-    @param address_length -
-    @param use_default -
-    @param no_advertise -
-    @param off_link -
-    @param no_autoconfig -
-    @param no_onlink -
-    @param is_no -
-    @param val_lifetime -
-    @param pref_lifetime -
-*/
-define sw_interface_ip6nd_ra_prefix
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 address[16];
-  u8 address_length;
-  u8 use_default;
-  u8 no_advertise;
-  u8 off_link;
-  u8 no_autoconfig;
-  u8 no_onlink;
-  u8 is_no;
-  u32 val_lifetime;
-  u32 pref_lifetime;
-};
-
-/** \brief IPv6 router advertisement prefix config response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define sw_interface_ip6nd_ra_prefix_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IPv6 interface enable / disable request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface used to reach neighbor
-    @param enable - if non-zero enable ip6 on interface, else disable
-*/
-define sw_interface_ip6_enable_disable
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 enable;			/* set to true if enable */
-};
-
-/** \brief IPv6 interface enable / disable response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define sw_interface_ip6_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IPv6 set link local address on interface request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface to set link local on
-    @param address[] - the new link local address
-    @param address_length - link local address length
-*/
-define sw_interface_ip6_set_link_local_address
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 address[16];
-  u8 address_length;
-};
-
-/** \brief IPv6 set link local address on interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - error code for the request
-*/
-define sw_interface_ip6_set_link_local_address_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Add / del route request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - software index of the new vlan's parent interface
-    @param vrf_id - fib table /vrf associated with the route
-    @param lookup_in_vrf - 
-    @param classify_table_index - 
-    @param create_vrf_if_needed - 
-    @param is_add - 1 if adding the route, 0 if deleting
-    @param is_drop - Drop the packet
-    @param is_unreach - Drop the packet and rate limit send ICMP unreachable
-    @param is_prohibit - Drop the packet and rate limit send ICMP prohibited
-    @param is_ipv6 - 0 if an ip4 route, else ip6
-    @param is_local - 
-    @param is_classify - 
-    @param is_multipath - Set to 1 if this is a multipath route, else 0
-    @param not_last - Is last or not last msg in group of multiple add/del msgs
-    @param next_hop_weight - 
-    @param dst_address_length - 
-    @param dst_address[16] - 
-    @param next_hop_address[16] - 
-    @param next_hop_n_out_labels - the number of labels in the label stack
-    @param next_hop_out_label_stack - the next-hop output label stack, outer most first
-    @param next_hop_via_label - The next-hop is a resolved via a local label
-*/
-define ip_add_del_route
-{
-  u32 client_index;
-  u32 context;
-  u32 next_hop_sw_if_index;
-  u32 table_id;
-  u32 classify_table_index;
-  u32 next_hop_table_id;
-  u8 create_vrf_if_needed;
-  u8 is_add;
-  u8 is_drop;
-  u8 is_unreach;
-  u8 is_prohibit;
-  u8 is_ipv6;
-  u8 is_local;
-  u8 is_classify;
-  u8 is_multipath;
-  u8 is_resolve_host;
-  u8 is_resolve_attached;
-  /* Is last/not-last message in group of multiple add/del messages. */
-  u8 not_last;
-  u8 next_hop_weight;
-  u8 dst_address_length;
-  u8 dst_address[16];
-  u8 next_hop_address[16];
-  u8 next_hop_n_out_labels;
-  u32 next_hop_via_label;
-  u32 next_hop_out_label_stack[next_hop_n_out_labels];
-};
-
-/** \brief Reply for add / del route request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ip_add_del_route_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-define ip_address_details
-{
-  u32 client_index;
-  u32 context;
-  u8 ip[16];
-  u8 prefix_length;
-};
-
-define ip_address_dump
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 is_ipv6;
-};
-
-define ip_details
-{
-  u32 sw_if_index;
-  u32 context;
-};
-
-define ip_dump
-{
-  u32 client_index;
-  u32 context;
-  u8 is_ipv6;
-};
-
-
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip.h b/vnet/vnet/ip/ip.h
deleted file mode 100644
index 02a1a963..00000000
--- a/vnet/vnet/ip/ip.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip.h: ip generic (4 or 6) main
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_ip_main_h
-#define included_ip_main_h
-
-#include <vppinfra/hash.h>
-#include <vppinfra/heap.h>	/* adjacency heap */
-#include <vppinfra/ptclosure.h>
-
-#include <vnet/vnet.h>
-
-#include <vnet/ip/format.h>
-#include <vnet/ip/ip_packet.h>
-#include <vnet/ip/lookup.h>
-
-#include <vnet/ip/tcp_packet.h>
-#include <vnet/ip/udp_packet.h>
-#include <vnet/ip/icmp46_packet.h>
-
-#include <vnet/ip/ip4.h>
-#include <vnet/ip/ip4_error.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/icmp4.h>
-
-#include <vnet/ip/ip6.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vnet/ip/ip6_error.h>
-#include <vnet/ip/icmp6.h>
-#include <vnet/classify/vnet_classify.h>
-
-/* Per protocol info. */
-typedef struct
-{
-  /* Protocol name (also used as hash key). */
-  u8 *name;
-
-  /* Protocol number. */
-  ip_protocol_t protocol;
-
-  /* Format function for this IP protocol. */
-  format_function_t *format_header;
-
-  /* Parser for header. */
-  unformat_function_t *unformat_header;
-
-  /* Parser for per-protocol matches. */
-  unformat_function_t *unformat_match;
-
-  /* Parser for packet generator edits for this protocol. */
-  unformat_function_t *unformat_pg_edit;
-} ip_protocol_info_t;
-
-/* Per TCP/UDP port info. */
-typedef struct
-{
-  /* Port name (used as hash key). */
-  u8 *name;
-
-  /* UDP/TCP port number in network byte order. */
-  u16 port;
-
-  /* Port specific format function. */
-  format_function_t *format_header;
-
-  /* Parser for packet generator edits for this protocol. */
-  unformat_function_t *unformat_pg_edit;
-} tcp_udp_port_info_t;
-
-typedef struct
-{
-  /* Per IP protocol info. */
-  ip_protocol_info_t *protocol_infos;
-
-  /* Protocol info index hashed by 8 bit IP protocol. */
-  uword *protocol_info_by_protocol;
-
-  /* Hash table mapping IP protocol name (see protocols.def)
-     to protocol number. */
-  uword *protocol_info_by_name;
-
-  /* Per TCP/UDP port info. */
-  tcp_udp_port_info_t *port_infos;
-
-  /* Hash table from network-byte-order port to port info index. */
-  uword *port_info_by_port;
-
-  /* Hash table mapping TCP/UDP name to port info index. */
-  uword *port_info_by_name;
-} ip_main_t;
-
-extern ip_main_t ip_main;
-
-clib_error_t *ip_main_init (vlib_main_t * vm);
-
-static inline ip_protocol_info_t *
-ip_get_protocol_info (ip_main_t * im, u32 protocol)
-{
-  uword *p;
-
-  p = hash_get (im->protocol_info_by_protocol, protocol);
-  return p ? vec_elt_at_index (im->protocol_infos, p[0]) : 0;
-}
-
-static inline tcp_udp_port_info_t *
-ip_get_tcp_udp_port_info (ip_main_t * im, u32 port)
-{
-  uword *p;
-
-  p = hash_get (im->port_info_by_port, port);
-  return p ? vec_elt_at_index (im->port_infos, p[0]) : 0;
-}
-
-always_inline ip_csum_t
-ip_incremental_checksum_buffer (vlib_main_t * vm,
-				vlib_buffer_t * first_buffer,
-				u32 first_buffer_offset,
-				u32 n_bytes_to_checksum, ip_csum_t sum)
-{
-  vlib_buffer_t *b = first_buffer;
-  u32 n_bytes_left = n_bytes_to_checksum;
-  ASSERT (b->current_length >= first_buffer_offset);
-  void *h;
-  u32 n;
-
-  n = clib_min (n_bytes_left, b->current_length);
-  h = vlib_buffer_get_current (b) + first_buffer_offset;
-  sum = ip_incremental_checksum (sum, h, n);
-  if (PREDICT_FALSE (b->flags & VLIB_BUFFER_NEXT_PRESENT))
-    {
-      while (1)
-	{
-	  n_bytes_left -= n;
-	  if (n_bytes_left == 0)
-	    break;
-	  b = vlib_get_buffer (vm, b->next_buffer);
-	  n = clib_min (n_bytes_left, b->current_length);
-	  h = vlib_buffer_get_current (b);
-	  sum = ip_incremental_checksum (sum, h, n);
-	}
-    }
-
-  return sum;
-}
-
-void ip_del_all_interface_addresses (vlib_main_t * vm, u32 sw_if_index);
-
-extern vlib_node_registration_t ip4_inacl_node;
-extern vlib_node_registration_t ip6_inacl_node;
-
-#endif /* included_ip_main_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip4.h b/vnet/vnet/ip/ip4.h
deleted file mode 100644
index 0331c445..00000000
--- a/vnet/vnet/ip/ip4.h
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip4.h: ip4 main include file
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_ip_ip4_h
-#define included_ip_ip4_h
-
-#include <vnet/ip/ip4_mtrie.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/lookup.h>
-#include <vnet/feature/feature.h>
-
-typedef struct ip4_fib_t
-{
-  /* Hash table for each prefix length mapping. */
-  uword *fib_entry_by_dst_address[33];
-
-  /* Mtrie for fast lookups.  Hash is used to maintain overlapping prefixes. */
-  ip4_fib_mtrie_t mtrie;
-
-  /* Table ID (hash key) for this FIB. */
-  u32 table_id;
-
-  /* Index into FIB vector. */
-  u32 index;
-
-  /* flow hash configuration */
-  flow_hash_config_t flow_hash_config;
-
-  /* N-tuple classifier indices */
-  u32 fwd_classify_table_index;
-  u32 rev_classify_table_index;
-
-} ip4_fib_t;
-
-struct ip4_main_t;
-
-typedef void (ip4_add_del_interface_address_function_t)
-  (struct ip4_main_t * im,
-   uword opaque,
-   u32 sw_if_index,
-   ip4_address_t * address,
-   u32 address_length, u32 if_address_index, u32 is_del);
-
-typedef struct
-{
-  ip4_add_del_interface_address_function_t *function;
-  uword function_opaque;
-} ip4_add_del_interface_address_callback_t;
-
-/**
- * @brief IPv4 main type.
- *
- * State of IPv4 VPP processing including:
- * - FIBs
- * - Feature indices used in feature topological sort
- * - Feature node run time references
- */
-
-typedef struct ip4_main_t
-{
-  ip_lookup_main_t lookup_main;
-
-  /** Vector of FIBs. */
-  struct fib_table_t_ *fibs;
-
-  u32 fib_masks[33];
-
-  /** Table index indexed by software interface. */
-  u32 *fib_index_by_sw_if_index;
-
-  /* IP4 enabled count by software interface */
-  u8 *ip_enabled_by_sw_if_index;
-
-  /** Hash table mapping table id to fib index.
-     ID space is not necessarily dense; index space is dense. */
-  uword *fib_index_by_table_id;
-
-  /** Functions to call when interface address changes. */
-    ip4_add_del_interface_address_callback_t
-    * add_del_interface_address_callbacks;
-
-  /** Template used to generate IP4 ARP packets. */
-  vlib_packet_template_t ip4_arp_request_packet_template;
-
-  /** Seed for Jenkins hash used to compute ip4 flow hash. */
-  u32 flow_hash_seed;
-
-  /** @brief Template information for VPP generated packets */
-  struct
-  {
-    /** TTL to use for host generated packets. */
-    u8 ttl;
-
-    /** TOS byte to use for host generated packets. */
-    u8 tos;
-
-    u8 pad[2];
-  } host_config;
-} ip4_main_t;
-
-/** Global ip4 main structure. */
-extern ip4_main_t ip4_main;
-
-/** Global ip4 input node.  Errors get attached to ip4 input node. */
-extern vlib_node_registration_t ip4_input_node;
-extern vlib_node_registration_t ip4_lookup_node;
-extern vlib_node_registration_t ip4_rewrite_node;
-extern vlib_node_registration_t ip4_rewrite_local_node;
-extern vlib_node_registration_t ip4_arp_node;
-extern vlib_node_registration_t ip4_glean_node;
-extern vlib_node_registration_t ip4_midchain_node;
-
-always_inline uword
-ip4_destination_matches_route (const ip4_main_t * im,
-			       const ip4_address_t * key,
-			       const ip4_address_t * dest, uword dest_length)
-{
-  return 0 == ((key->data_u32 ^ dest->data_u32) & im->fib_masks[dest_length]);
-}
-
-always_inline uword
-ip4_destination_matches_interface (ip4_main_t * im,
-				   ip4_address_t * key,
-				   ip_interface_address_t * ia)
-{
-  ip4_address_t *a = ip_interface_address_get_address (&im->lookup_main, ia);
-  return ip4_destination_matches_route (im, key, a, ia->address_length);
-}
-
-/* As above but allows for unaligned destinations (e.g. works right from IP header of packet). */
-always_inline uword
-ip4_unaligned_destination_matches_route (ip4_main_t * im,
-					 ip4_address_t * key,
-					 ip4_address_t * dest,
-					 uword dest_length)
-{
-  return 0 ==
-    ((clib_mem_unaligned (&key->data_u32, u32) ^ dest->
-      data_u32) & im->fib_masks[dest_length]);
-}
-
-always_inline int
-ip4_src_address_for_packet (ip_lookup_main_t * lm,
-			    u32 sw_if_index, ip4_address_t * src)
-{
-  u32 if_add_index = lm->if_address_pool_index_by_sw_if_index[sw_if_index];
-  if (PREDICT_TRUE (if_add_index != ~0))
-    {
-      ip_interface_address_t *if_add =
-	pool_elt_at_index (lm->if_address_pool, if_add_index);
-      ip4_address_t *if_ip = ip_interface_address_get_address (lm, if_add);
-      *src = *if_ip;
-      return 0;
-    }
-  else
-    {
-      ASSERT (0);
-      src->as_u32 = 0;
-    }
-  return (!0);
-}
-
-/* Find interface address which matches destination. */
-always_inline ip4_address_t *
-ip4_interface_address_matching_destination (ip4_main_t * im,
-					    ip4_address_t * dst,
-					    u32 sw_if_index,
-					    ip_interface_address_t **
-					    result_ia)
-{
-  ip_lookup_main_t *lm = &im->lookup_main;
-  ip_interface_address_t *ia;
-  ip4_address_t *result = 0;
-
-  /* *INDENT-OFF* */
-  foreach_ip_interface_address (lm, ia, sw_if_index,
-                                1 /* honor unnumbered */,
-  ({
-    ip4_address_t * a = ip_interface_address_get_address (lm, ia);
-    if (ip4_destination_matches_route (im, dst, a, ia->address_length))
-      {
-	result = a;
-	break;
-      }
-  }));
-  /* *INDENT-ON* */
-  if (result_ia)
-    *result_ia = result ? ia : 0;
-  return result;
-}
-
-ip4_address_t *ip4_interface_first_address (ip4_main_t * im, u32 sw_if_index,
-					    ip_interface_address_t **
-					    result_ia);
-
-clib_error_t *ip4_add_del_interface_address (vlib_main_t * vm,
-					     u32 sw_if_index,
-					     ip4_address_t * address,
-					     u32 address_length, u32 is_del);
-
-void ip4_sw_interface_enable_disable (u32 sw_if_index, u32 is_enable);
-
-int ip4_address_compare (ip4_address_t * a1, ip4_address_t * a2);
-
-/* Send an ARP request to see if given destination is reachable on given interface. */
-clib_error_t *ip4_probe_neighbor (vlib_main_t * vm, ip4_address_t * dst,
-				  u32 sw_if_index);
-
-clib_error_t *ip4_set_arp_limit (u32 arp_limit);
-
-uword
-ip4_udp_register_listener (vlib_main_t * vm,
-			   u16 dst_port, u32 next_node_index);
-
-void
-ip4_icmp_register_type (vlib_main_t * vm, icmp4_type_t type, u32 node_index);
-
-u16 ip4_tcp_udp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0,
-				  ip4_header_t * ip0);
-
-void ip4_register_protocol (u32 protocol, u32 node_index);
-
-serialize_function_t serialize_vnet_ip4_main, unserialize_vnet_ip4_main;
-
-int vnet_set_ip4_flow_hash (u32 table_id,
-			    flow_hash_config_t flow_hash_config);
-
-void ip4_mtrie_init (ip4_fib_mtrie_t * m);
-
-int vnet_set_ip4_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
-				 u32 table_index);
-
-/* Compute flow hash.  We'll use it to select which adjacency to use for this
-   flow.  And other things. */
-always_inline u32
-ip4_compute_flow_hash (const ip4_header_t * ip,
-		       flow_hash_config_t flow_hash_config)
-{
-  tcp_header_t *tcp = (void *) (ip + 1);
-  u32 a, b, c, t1, t2;
-  uword is_tcp_udp = (ip->protocol == IP_PROTOCOL_TCP
-		      || ip->protocol == IP_PROTOCOL_UDP);
-
-  t1 = (flow_hash_config & IP_FLOW_HASH_SRC_ADDR)
-    ? ip->src_address.data_u32 : 0;
-  t2 = (flow_hash_config & IP_FLOW_HASH_DST_ADDR)
-    ? ip->dst_address.data_u32 : 0;
-
-  a = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ? t2 : t1;
-  b = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ? t1 : t2;
-  b ^= (flow_hash_config & IP_FLOW_HASH_PROTO) ? ip->protocol : 0;
-
-  t1 = is_tcp_udp ? tcp->ports.src : 0;
-  t2 = is_tcp_udp ? tcp->ports.dst : 0;
-
-  t1 = (flow_hash_config & IP_FLOW_HASH_SRC_PORT) ? t1 : 0;
-  t2 = (flow_hash_config & IP_FLOW_HASH_DST_PORT) ? t2 : 0;
-
-  c = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ?
-    (t1 << 16) | t2 : (t2 << 16) | t1;
-
-  hash_v3_mix32 (a, b, c);
-  hash_v3_finalize32 (a, b, c);
-
-  return c;
-}
-
-void
-ip4_forward_next_trace (vlib_main_t * vm,
-			vlib_node_runtime_t * node,
-			vlib_frame_t * frame,
-			vlib_rx_or_tx_t which_adj_index);
-
-u8 *format_ip4_forward_next_trace (u8 * s, va_list * args);
-
-u32 ip4_tcp_udp_validate_checksum (vlib_main_t * vm, vlib_buffer_t * p0);
-
-#endif /* included_ip_ip4_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip46_cli.c b/vnet/vnet/ip/ip46_cli.c
deleted file mode 100644
index ce1ffa62..00000000
--- a/vnet/vnet/ip/ip46_cli.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip4_cli.c: ip4 commands
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-
-/**
- * @file
- * @brief Set IP Address.
- *
- * Configure an IPv4 or IPv6 address for on an interface.
- */
-
-
-int
-ip4_address_compare (ip4_address_t * a1, ip4_address_t * a2)
-{
-  return clib_net_to_host_u32 (a1->data_u32) -
-    clib_net_to_host_u32 (a2->data_u32);
-}
-
-int
-ip6_address_compare (ip6_address_t * a1, ip6_address_t * a2)
-{
-  int i;
-  for (i = 0; i < ARRAY_LEN (a1->as_u16); i++)
-    {
-      int cmp =
-	clib_net_to_host_u16 (a1->as_u16[i]) -
-	clib_net_to_host_u16 (a2->as_u16[i]);
-      if (cmp != 0)
-	return cmp;
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_ip_command, static) = {
-  .path = "set interface ip",
-  .short_help = "IP4/IP6 commands",
-};
-/* *INDENT-ON* */
-
-void
-ip_del_all_interface_addresses (vlib_main_t * vm, u32 sw_if_index)
-{
-  ip4_main_t *im4 = &ip4_main;
-  ip4_address_t *ip4_addrs = 0;
-  u32 *ip4_masks = 0;
-  ip6_main_t *im6 = &ip6_main;
-  ip6_address_t *ip6_addrs = 0;
-  u32 *ip6_masks = 0;
-  ip_interface_address_t *ia;
-  int i;
-
-  /* *INDENT-OFF* */
-  foreach_ip_interface_address (&im4->lookup_main, ia, sw_if_index,
-                                0 /* honor unnumbered */,
-  ({
-    ip4_address_t * x = (ip4_address_t *)
-      ip_interface_address_get_address (&im4->lookup_main, ia);
-    vec_add1 (ip4_addrs, x[0]);
-    vec_add1 (ip4_masks, ia->address_length);
-  }));
-  /* *INDENT-ON* */
-
-  /* *INDENT-OFF* */
-  foreach_ip_interface_address (&im6->lookup_main, ia, sw_if_index,
-                                0 /* honor unnumbered */,
-  ({
-    ip6_address_t * x = (ip6_address_t *)
-      ip_interface_address_get_address (&im6->lookup_main, ia);
-    vec_add1 (ip6_addrs, x[0]);
-    vec_add1 (ip6_masks, ia->address_length);
-  }));
-  /* *INDENT-ON* */
-
-  for (i = 0; i < vec_len (ip4_addrs); i++)
-    ip4_add_del_interface_address (vm, sw_if_index, &ip4_addrs[i],
-				   ip4_masks[i], 1 /* is_del */ );
-  for (i = 0; i < vec_len (ip6_addrs); i++)
-    ip6_add_del_interface_address (vm, sw_if_index, &ip6_addrs[i],
-				   ip6_masks[i], 1 /* is_del */ );
-
-  vec_free (ip4_addrs);
-  vec_free (ip4_masks);
-  vec_free (ip6_addrs);
-  vec_free (ip6_masks);
-}
-
-static clib_error_t *
-ip_address_delete_cleanup (vnet_main_t * vnm, u32 hw_if_index, u32 is_create)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vnet_hw_interface_t *hw;
-
-  if (is_create)
-    return 0;
-
-  hw = vnet_get_hw_interface (vnm, hw_if_index);
-
-  ip_del_all_interface_addresses (vm, hw->sw_if_index);
-  return 0;
-}
-
-VNET_HW_INTERFACE_ADD_DEL_FUNCTION (ip_address_delete_cleanup);
-
-static clib_error_t *
-add_del_ip_address (vlib_main_t * vm,
-		    unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip4_address_t a4;
-  ip6_address_t a6;
-  clib_error_t *error = 0;
-  u32 sw_if_index, length, is_del;
-
-  sw_if_index = ~0;
-  is_del = 0;
-
-  if (unformat (input, "del"))
-    is_del = 1;
-
-  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  if (is_del && unformat (input, "all"))
-    ip_del_all_interface_addresses (vm, sw_if_index);
-  else if (unformat (input, "%U/%d", unformat_ip4_address, &a4, &length))
-    error = ip4_add_del_interface_address (vm, sw_if_index, &a4, length,
-					   is_del);
-  else if (unformat (input, "%U/%d", unformat_ip6_address, &a6, &length))
-    error = ip6_add_del_interface_address (vm, sw_if_index, &a6, length,
-					   is_del);
-  else
-    {
-      error = clib_error_return (0, "expected IP4/IP6 address/length `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-
-done:
-  return error;
-}
-
-/*?
- * Add an IP Address to an interface or remove and IP Address from an interface.
- * The IP Address can be an IPv4 or an IPv6 address. Interfaces may have multiple
- * IPv4 and IPv6 addresses. There is no concept of primary vs. secondary
- * interface addresses; they're just addresses.
- *
- * To display the addresses associated with a given interface, use the command
- * '<em>show interface address <interface></em>'.
- *
- * Note that the debug CLI does not enforce classful mask-width / addressing
- * constraints.
- *
- * @cliexpar
- * @parblock
- * An example of how to add an IPv4 address to an interface:
- * @cliexcmd{set interface ip address GigabitEthernet2/0/0 172.16.2.12/24}
- *
- * An example of how to add an IPv6 address to an interface:
- * @cliexcmd{set interface ip address GigabitEthernet2/0/0 @::a:1:1:0:7/126}
- *
- * To delete a specific interface ip address:
- * @cliexcmd{set interface ip address GigabitEthernet2/0/0 172.16.2.12/24 del}
- *
- * To delete all interfaces addresses (IPv4 and IPv6):
- * @cliexcmd{set interface ip address GigabitEthernet2/0/0 del all}
- * @endparblock
- ?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_ip_address_command, static) = {
-  .path = "set interface ip address",
-  .function = add_del_ip_address,
-  .short_help = "set interface ip address <interface> [<ip-addr>/<mask> [del]] | [del all]",
-};
-/* *INDENT-ON* */
-
-/* Dummy init function to get us linked in. */
-static clib_error_t *
-ip4_cli_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ip4_cli_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip4_error.h b/vnet/vnet/ip/ip4_error.h
deleted file mode 100644
index 95d12ec2..00000000
--- a/vnet/vnet/ip/ip4_error.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip4_error.h: ip4 fast path errors
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_ip_ip4_error_h
-#define included_ip_ip4_error_h
-
-#define foreach_ip4_error						\
-  /* Must be first. */							\
-  _ (NONE, "valid ip4 packets")						\
-									\
-  /* Errors signalled by ip4-input */					\
-  _ (TOO_SHORT, "ip4 length < 20 bytes")				\
-  _ (BAD_LENGTH, "ip4 length > l2 length")				\
-  _ (BAD_CHECKSUM, "bad ip4 checksum")					\
-  _ (VERSION, "ip4 version != 4")					\
-  _ (OPTIONS, "ip4 options present")					\
-  _ (FRAGMENT_OFFSET_ONE, "ip4 fragment offset == 1")			\
-  _ (TIME_EXPIRED, "ip4 ttl <= 1")					\
-									\
-  /* Errors signalled by ip4-rewrite. */				\
-  _ (MTU_EXCEEDED, "ip4 MTU exceeded and DF set")			\
-  _ (DST_LOOKUP_MISS, "ip4 destination lookup miss")			\
-  _ (SRC_LOOKUP_MISS, "ip4 source lookup miss")				\
-  _ (ADJACENCY_DROP, "ip4 adjacency drop")				\
-  _ (ADJACENCY_PUNT, "ip4 adjacency punt")				\
-									\
-  /* Errors signalled by ip4-local. */					\
-  _ (UNKNOWN_PROTOCOL, "unknown ip protocol")				\
-  _ (TCP_CHECKSUM, "bad tcp checksum")					\
-  _ (UDP_CHECKSUM, "bad udp checksum")					\
-  _ (UDP_LENGTH, "inconsistent udp/ip lengths")				\
-									\
-  /* Errors signalled by ip4-source-check. */				\
-  _ (UNICAST_SOURCE_CHECK_FAILS, "ip4 unicast source check fails")	\
-                                                                        \
-  /* Spoofed packets in ip4-rewrite-local */                            \
-  _(SPOOFED_LOCAL_PACKETS, "ip4 spoofed local-address packet drops")    \
-                                                                        \
-  /* Errors singalled by ip4-inacl */                                   \
-  _ (INACL_TABLE_MISS, "input ACL table-miss drops")                    \
-  _ (INACL_SESSION_DENY, "input ACL session deny drops")
-
-typedef enum
-{
-#define _(sym,str) IP4_ERROR_##sym,
-  foreach_ip4_error
-#undef _
-    IP4_N_ERROR,
-} ip4_error_t;
-
-#endif /* included_ip_ip4_error_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip4_format.c b/vnet/vnet/ip/ip4_format.c
deleted file mode 100644
index c803e065..00000000
--- a/vnet/vnet/ip/ip4_format.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip4_format.c: ip4 formatting
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-
-/* Format an IP4 address. */
-u8 *
-format_ip4_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
-}
-
-/* Format an IP4 route destination and length. */
-u8 *
-format_ip4_address_and_length (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  u8 l = va_arg (*args, u32);
-  return format (s, "%U/%d", format_ip4_address, a, l);
-}
-
-/* Parse an IP4 address %d.%d.%d.%d. */
-uword
-unformat_ip4_address (unformat_input_t * input, va_list * args)
-{
-  u8 *result = va_arg (*args, u8 *);
-  unsigned a[4];
-
-  if (!unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]))
-    return 0;
-
-  if (a[0] >= 256 || a[1] >= 256 || a[2] >= 256 || a[3] >= 256)
-    return 0;
-
-  result[0] = a[0];
-  result[1] = a[1];
-  result[2] = a[2];
-  result[3] = a[3];
-
-  return 1;
-}
-
-/* Format an IP4 header. */
-u8 *
-format_ip4_header (u8 * s, va_list * args)
-{
-  ip4_header_t *ip = va_arg (*args, ip4_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-  u32 ip_version, header_bytes;
-  uword indent;
-
-  /* Nothing to do. */
-  if (max_header_bytes < sizeof (ip[0]))
-    return format (s, "IP header truncated");
-
-  indent = format_get_indent (s);
-  indent += 2;
-
-  ip_version = (ip->ip_version_and_header_length >> 4);
-  header_bytes = (ip->ip_version_and_header_length & 0xf) * sizeof (u32);
-
-  s = format (s, "%U: %U -> %U",
-	      format_ip_protocol, ip->protocol,
-	      format_ip4_address, ip->src_address.data,
-	      format_ip4_address, ip->dst_address.data);
-
-  /* Show IP version and header length only with unexpected values. */
-  if (ip_version != 4 || header_bytes != sizeof (ip4_header_t))
-    s = format (s, "\n%Uversion %d, header length %d",
-		format_white_space, indent, ip_version, header_bytes);
-
-  s = format (s, "\n%Utos 0x%02x, ttl %d, length %d, checksum 0x%04x",
-	      format_white_space, indent,
-	      ip->tos, ip->ttl,
-	      clib_net_to_host_u16 (ip->length),
-	      clib_net_to_host_u16 (ip->checksum));
-
-  /* Check and report invalid checksums. */
-  {
-    u16 c = ip4_header_checksum (ip);
-    if (c != ip->checksum)
-      s = format (s, " (should be 0x%04x)", clib_net_to_host_u16 (c));
-  }
-
-  {
-    u32 f = clib_net_to_host_u16 (ip->flags_and_fragment_offset);
-    u32 o;
-
-    s = format (s, "\n%Ufragment id 0x%04x",
-		format_white_space, indent,
-		clib_net_to_host_u16 (ip->fragment_id));
-
-    /* Fragment offset. */
-    o = 8 * (f & 0x1fff);
-    f ^= o;
-    if (o != 0)
-      s = format (s, " offset %d", o);
-
-    if (f != 0)
-      {
-	s = format (s, ", flags ");
-#define _(l) if (f & IP4_HEADER_FLAG_##l) s = format (s, #l);
-	_(MORE_FRAGMENTS);
-	_(DONT_FRAGMENT);
-	_(CONGESTION);
-#undef _
-      }
-  }
-
-  /* Recurse into next protocol layer. */
-  if (max_header_bytes != 0 && header_bytes < max_header_bytes)
-    {
-      ip_main_t *im = &ip_main;
-      ip_protocol_info_t *pi = ip_get_protocol_info (im, ip->protocol);
-
-      if (pi && pi->format_header)
-	s = format (s, "\n%U%U",
-		    format_white_space, indent - 2, pi->format_header,
-		    /* next protocol header */ (void *) ip + header_bytes,
-		    max_header_bytes - header_bytes);
-    }
-
-  return s;
-}
-
-/* Parse an IP4 header. */
-uword
-unformat_ip4_header (unformat_input_t * input, va_list * args)
-{
-  u8 **result = va_arg (*args, u8 **);
-  ip4_header_t *ip;
-  int old_length;
-
-  /* Allocate space for IP header. */
-  {
-    void *p;
-
-    old_length = vec_len (*result);
-    vec_add2 (*result, p, sizeof (ip4_header_t));
-    ip = p;
-  }
-
-  memset (ip, 0, sizeof (ip[0]));
-  ip->ip_version_and_header_length = IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
-
-  if (!unformat (input, "%U: %U -> %U",
-		 unformat_ip_protocol, &ip->protocol,
-		 unformat_ip4_address, &ip->src_address,
-		 unformat_ip4_address, &ip->dst_address))
-    return 0;
-
-  /* Parse options. */
-  while (1)
-    {
-      int i, j;
-
-      if (unformat (input, "tos %U", unformat_vlib_number, &i))
-	ip->tos = i;
-
-      else if (unformat (input, "ttl %U", unformat_vlib_number, &i))
-	ip->ttl = i;
-
-      else if (unformat (input, "fragment id %U offset %U",
-			 unformat_vlib_number, &i, unformat_vlib_number, &j))
-	{
-	  ip->fragment_id = clib_host_to_net_u16 (i);
-	  ip->flags_and_fragment_offset |=
-	    clib_host_to_net_u16 ((i / 8) & 0x1fff);
-	}
-
-      /* Flags. */
-      else if (unformat (input, "mf") || unformat (input, "MF"))
-	ip->flags_and_fragment_offset |=
-	  clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS);
-
-      else if (unformat (input, "df") || unformat (input, "DF"))
-	ip->flags_and_fragment_offset |=
-	  clib_host_to_net_u16 (IP4_HEADER_FLAG_DONT_FRAGMENT);
-
-      else if (unformat (input, "ce") || unformat (input, "CE"))
-	ip->flags_and_fragment_offset |=
-	  clib_host_to_net_u16 (IP4_HEADER_FLAG_CONGESTION);
-
-      /* Can't parse input: try next protocol level. */
-      else
-	break;
-    }
-
-  /* Fill in checksum. */
-  ip->checksum = ip4_header_checksum (ip);
-
-  /* Recurse into next protocol layer. */
-  {
-    ip_main_t *im = &ip_main;
-    ip_protocol_info_t *pi = ip_get_protocol_info (im, ip->protocol);
-
-    if (pi && pi->unformat_header)
-      {
-	if (!unformat_user (input, pi->unformat_header, result))
-	  return 0;
-
-	/* Result may have moved. */
-	ip = (void *) *result + old_length;
-      }
-  }
-
-  /* Fill in IP length. */
-  ip->length = clib_host_to_net_u16 (vec_len (*result) - old_length);
-
-  return 1;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip4_forward.c b/vnet/vnet/ip/ip4_forward.c
deleted file mode 100644
index 6e91b9e9..00000000
--- a/vnet/vnet/ip/ip4_forward.c
+++ /dev/null
@@ -1,3345 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip4_forward.c: IP v4 forwarding
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>	/* for ethernet_header_t */
-#include <vnet/ethernet/arp_packet.h>	/* for ethernet_arp_header_t */
-#include <vnet/ppp/ppp.h>
-#include <vnet/srp/srp.h>	/* for srp_hw_interface_class */
-#include <vnet/api_errno.h>	/* for API error numbers */
-#include <vnet/fib/fib_table.h>	/* for FIB table and entry creation */
-#include <vnet/fib/fib_entry.h>	/* for FIB table and entry creation */
-#include <vnet/fib/fib_urpf_list.h>	/* for FIB uRPF check */
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/dpo/load_balance.h>
-#include <vnet/dpo/classify_dpo.h>
-
-/**
- * @file
- * @brief IPv4 Forwarding.
- *
- * This file contains the source code for IPv4 forwarding.
- */
-
-void
-ip4_forward_next_trace (vlib_main_t * vm,
-			vlib_node_runtime_t * node,
-			vlib_frame_t * frame,
-			vlib_rx_or_tx_t which_adj_index);
-
-always_inline uword
-ip4_lookup_inline (vlib_main_t * vm,
-		   vlib_node_runtime_t * node,
-		   vlib_frame_t * frame,
-		   int lookup_for_responses_to_locally_received_packets)
-{
-  ip4_main_t *im = &ip4_main;
-  vlib_combined_counter_main_t *cm = &load_balance_main.lbm_to_counters;
-  u32 n_left_from, n_left_to_next, *from, *to_next;
-  ip_lookup_next_t next;
-  u32 cpu_index = os_get_cpu_number ();
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
-
-      while (n_left_from >= 8 && n_left_to_next >= 4)
-	{
-	  vlib_buffer_t *p0, *p1, *p2, *p3;
-	  ip4_header_t *ip0, *ip1, *ip2, *ip3;
-	  __attribute__ ((unused)) tcp_header_t *tcp0, *tcp1, *tcp2, *tcp3;
-	  ip_lookup_next_t next0, next1, next2, next3;
-	  const load_balance_t *lb0, *lb1, *lb2, *lb3;
-	  ip4_fib_mtrie_t *mtrie0, *mtrie1, *mtrie2, *mtrie3;
-	  ip4_fib_mtrie_leaf_t leaf0, leaf1, leaf2, leaf3;
-	  ip4_address_t *dst_addr0, *dst_addr1, *dst_addr2, *dst_addr3;
-	  __attribute__ ((unused)) u32 pi0, fib_index0, lb_index0,
-	    is_tcp_udp0;
-	  __attribute__ ((unused)) u32 pi1, fib_index1, lb_index1,
-	    is_tcp_udp1;
-	  __attribute__ ((unused)) u32 pi2, fib_index2, lb_index2,
-	    is_tcp_udp2;
-	  __attribute__ ((unused)) u32 pi3, fib_index3, lb_index3,
-	    is_tcp_udp3;
-	  flow_hash_config_t flow_hash_config0, flow_hash_config1;
-	  flow_hash_config_t flow_hash_config2, flow_hash_config3;
-	  u32 hash_c0, hash_c1, hash_c2, hash_c3;
-	  const dpo_id_t *dpo0, *dpo1, *dpo2, *dpo3;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p4, *p5, *p6, *p7;
-
-	    p4 = vlib_get_buffer (vm, from[4]);
-	    p5 = vlib_get_buffer (vm, from[5]);
-	    p6 = vlib_get_buffer (vm, from[6]);
-	    p7 = vlib_get_buffer (vm, from[7]);
-
-	    vlib_prefetch_buffer_header (p4, LOAD);
-	    vlib_prefetch_buffer_header (p5, LOAD);
-	    vlib_prefetch_buffer_header (p6, LOAD);
-	    vlib_prefetch_buffer_header (p7, LOAD);
-
-	    CLIB_PREFETCH (p4->data, sizeof (ip0[0]), LOAD);
-	    CLIB_PREFETCH (p5->data, sizeof (ip0[0]), LOAD);
-	    CLIB_PREFETCH (p6->data, sizeof (ip0[0]), LOAD);
-	    CLIB_PREFETCH (p7->data, sizeof (ip0[0]), LOAD);
-	  }
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-	  pi2 = to_next[2] = from[2];
-	  pi3 = to_next[3] = from[3];
-
-	  from += 4;
-	  to_next += 4;
-	  n_left_to_next -= 4;
-	  n_left_from -= 4;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-	  p2 = vlib_get_buffer (vm, pi2);
-	  p3 = vlib_get_buffer (vm, pi3);
-
-	  ip0 = vlib_buffer_get_current (p0);
-	  ip1 = vlib_buffer_get_current (p1);
-	  ip2 = vlib_buffer_get_current (p2);
-	  ip3 = vlib_buffer_get_current (p3);
-
-	  dst_addr0 = &ip0->dst_address;
-	  dst_addr1 = &ip1->dst_address;
-	  dst_addr2 = &ip2->dst_address;
-	  dst_addr3 = &ip3->dst_address;
-
-	  fib_index0 =
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (p0)->sw_if_index[VLIB_RX]);
-	  fib_index1 =
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (p1)->sw_if_index[VLIB_RX]);
-	  fib_index2 =
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (p2)->sw_if_index[VLIB_RX]);
-	  fib_index3 =
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (p3)->sw_if_index[VLIB_RX]);
-	  fib_index0 =
-	    (vnet_buffer (p0)->sw_if_index[VLIB_TX] ==
-	     (u32) ~ 0) ? fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
-	  fib_index1 =
-	    (vnet_buffer (p1)->sw_if_index[VLIB_TX] ==
-	     (u32) ~ 0) ? fib_index1 : vnet_buffer (p1)->sw_if_index[VLIB_TX];
-	  fib_index2 =
-	    (vnet_buffer (p2)->sw_if_index[VLIB_TX] ==
-	     (u32) ~ 0) ? fib_index2 : vnet_buffer (p2)->sw_if_index[VLIB_TX];
-	  fib_index3 =
-	    (vnet_buffer (p3)->sw_if_index[VLIB_TX] ==
-	     (u32) ~ 0) ? fib_index3 : vnet_buffer (p3)->sw_if_index[VLIB_TX];
-
-
-	  if (!lookup_for_responses_to_locally_received_packets)
-	    {
-	      mtrie0 = &ip4_fib_get (fib_index0)->mtrie;
-	      mtrie1 = &ip4_fib_get (fib_index1)->mtrie;
-	      mtrie2 = &ip4_fib_get (fib_index2)->mtrie;
-	      mtrie3 = &ip4_fib_get (fib_index3)->mtrie;
-
-	      leaf0 = leaf1 = leaf2 = leaf3 = IP4_FIB_MTRIE_LEAF_ROOT;
-
-	      leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 0);
-	      leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, dst_addr1, 0);
-	      leaf2 = ip4_fib_mtrie_lookup_step (mtrie2, leaf2, dst_addr2, 0);
-	      leaf3 = ip4_fib_mtrie_lookup_step (mtrie3, leaf3, dst_addr3, 0);
-	    }
-
-	  tcp0 = (void *) (ip0 + 1);
-	  tcp1 = (void *) (ip1 + 1);
-	  tcp2 = (void *) (ip2 + 1);
-	  tcp3 = (void *) (ip3 + 1);
-
-	  is_tcp_udp0 = (ip0->protocol == IP_PROTOCOL_TCP
-			 || ip0->protocol == IP_PROTOCOL_UDP);
-	  is_tcp_udp1 = (ip1->protocol == IP_PROTOCOL_TCP
-			 || ip1->protocol == IP_PROTOCOL_UDP);
-	  is_tcp_udp2 = (ip2->protocol == IP_PROTOCOL_TCP
-			 || ip2->protocol == IP_PROTOCOL_UDP);
-	  is_tcp_udp3 = (ip1->protocol == IP_PROTOCOL_TCP
-			 || ip1->protocol == IP_PROTOCOL_UDP);
-
-	  if (!lookup_for_responses_to_locally_received_packets)
-	    {
-	      leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 1);
-	      leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, dst_addr1, 1);
-	      leaf2 = ip4_fib_mtrie_lookup_step (mtrie2, leaf2, dst_addr2, 1);
-	      leaf3 = ip4_fib_mtrie_lookup_step (mtrie3, leaf3, dst_addr3, 1);
-	    }
-
-	  if (!lookup_for_responses_to_locally_received_packets)
-	    {
-	      leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 2);
-	      leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, dst_addr1, 2);
-	      leaf2 = ip4_fib_mtrie_lookup_step (mtrie2, leaf2, dst_addr2, 2);
-	      leaf3 = ip4_fib_mtrie_lookup_step (mtrie3, leaf3, dst_addr3, 2);
-	    }
-
-	  if (!lookup_for_responses_to_locally_received_packets)
-	    {
-	      leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 3);
-	      leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, dst_addr1, 3);
-	      leaf2 = ip4_fib_mtrie_lookup_step (mtrie2, leaf2, dst_addr2, 3);
-	      leaf3 = ip4_fib_mtrie_lookup_step (mtrie3, leaf3, dst_addr3, 3);
-	    }
-
-	  if (lookup_for_responses_to_locally_received_packets)
-	    {
-	      lb_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_RX];
-	      lb_index1 = vnet_buffer (p1)->ip.adj_index[VLIB_RX];
-	      lb_index2 = vnet_buffer (p2)->ip.adj_index[VLIB_RX];
-	      lb_index3 = vnet_buffer (p3)->ip.adj_index[VLIB_RX];
-	    }
-	  else
-	    {
-	      /* Handle default route. */
-	      leaf0 =
-		(leaf0 ==
-		 IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie0->default_leaf : leaf0);
-	      leaf1 =
-		(leaf1 ==
-		 IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie1->default_leaf : leaf1);
-	      leaf2 =
-		(leaf2 ==
-		 IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie2->default_leaf : leaf2);
-	      leaf3 =
-		(leaf3 ==
-		 IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie3->default_leaf : leaf3);
-	      lb_index0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
-	      lb_index1 = ip4_fib_mtrie_leaf_get_adj_index (leaf1);
-	      lb_index2 = ip4_fib_mtrie_leaf_get_adj_index (leaf2);
-	      lb_index3 = ip4_fib_mtrie_leaf_get_adj_index (leaf3);
-	    }
-
-	  lb0 = load_balance_get (lb_index0);
-	  lb1 = load_balance_get (lb_index1);
-	  lb2 = load_balance_get (lb_index2);
-	  lb3 = load_balance_get (lb_index3);
-
-	  /* Use flow hash to compute multipath adjacency. */
-	  hash_c0 = vnet_buffer (p0)->ip.flow_hash = 0;
-	  hash_c1 = vnet_buffer (p1)->ip.flow_hash = 0;
-	  hash_c2 = vnet_buffer (p2)->ip.flow_hash = 0;
-	  hash_c3 = vnet_buffer (p3)->ip.flow_hash = 0;
-	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
-	    {
-	      flow_hash_config0 = lb0->lb_hash_config;
-	      hash_c0 = vnet_buffer (p0)->ip.flow_hash =
-		ip4_compute_flow_hash (ip0, flow_hash_config0);
-	    }
-	  if (PREDICT_FALSE (lb1->lb_n_buckets > 1))
-	    {
-	      flow_hash_config1 = lb1->lb_hash_config;
-	      hash_c1 = vnet_buffer (p1)->ip.flow_hash =
-		ip4_compute_flow_hash (ip1, flow_hash_config1);
-	    }
-	  if (PREDICT_FALSE (lb2->lb_n_buckets > 1))
-	    {
-	      flow_hash_config2 = lb2->lb_hash_config;
-	      hash_c2 = vnet_buffer (p2)->ip.flow_hash =
-		ip4_compute_flow_hash (ip2, flow_hash_config2);
-	    }
-	  if (PREDICT_FALSE (lb3->lb_n_buckets > 1))
-	    {
-	      flow_hash_config3 = lb3->lb_hash_config;
-	      hash_c3 = vnet_buffer (p3)->ip.flow_hash =
-		ip4_compute_flow_hash (ip3, flow_hash_config3);
-	    }
-
-	  ASSERT (lb0->lb_n_buckets > 0);
-	  ASSERT (is_pow2 (lb0->lb_n_buckets));
-	  ASSERT (lb1->lb_n_buckets > 0);
-	  ASSERT (is_pow2 (lb1->lb_n_buckets));
-	  ASSERT (lb2->lb_n_buckets > 0);
-	  ASSERT (is_pow2 (lb2->lb_n_buckets));
-	  ASSERT (lb3->lb_n_buckets > 0);
-	  ASSERT (is_pow2 (lb3->lb_n_buckets));
-
-	  dpo0 = load_balance_get_bucket_i (lb0,
-					    (hash_c0 &
-					     (lb0->lb_n_buckets_minus_1)));
-	  dpo1 = load_balance_get_bucket_i (lb1,
-					    (hash_c1 &
-					     (lb1->lb_n_buckets_minus_1)));
-	  dpo2 = load_balance_get_bucket_i (lb2,
-					    (hash_c2 &
-					     (lb2->lb_n_buckets_minus_1)));
-	  dpo3 = load_balance_get_bucket_i (lb3,
-					    (hash_c3 &
-					     (lb3->lb_n_buckets_minus_1)));
-
-	  next0 = dpo0->dpoi_next_node;
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-	  next1 = dpo1->dpoi_next_node;
-	  vnet_buffer (p1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
-	  next2 = dpo2->dpoi_next_node;
-	  vnet_buffer (p2)->ip.adj_index[VLIB_TX] = dpo2->dpoi_index;
-	  next3 = dpo3->dpoi_next_node;
-	  vnet_buffer (p3)->ip.adj_index[VLIB_TX] = dpo3->dpoi_index;
-
-	  vlib_increment_combined_counter
-	    (cm, cpu_index, lb_index0, 1,
-	     vlib_buffer_length_in_chain (vm, p0)
-	     + sizeof (ethernet_header_t));
-	  vlib_increment_combined_counter
-	    (cm, cpu_index, lb_index1, 1,
-	     vlib_buffer_length_in_chain (vm, p1)
-	     + sizeof (ethernet_header_t));
-	  vlib_increment_combined_counter
-	    (cm, cpu_index, lb_index2, 1,
-	     vlib_buffer_length_in_chain (vm, p2)
-	     + sizeof (ethernet_header_t));
-	  vlib_increment_combined_counter
-	    (cm, cpu_index, lb_index3, 1,
-	     vlib_buffer_length_in_chain (vm, p3)
-	     + sizeof (ethernet_header_t));
-
-	  vlib_validate_buffer_enqueue_x4 (vm, node, next,
-					   to_next, n_left_to_next,
-					   pi0, pi1, pi2, pi3,
-					   next0, next1, next2, next3);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip4_header_t *ip0;
-	  __attribute__ ((unused)) tcp_header_t *tcp0;
-	  ip_lookup_next_t next0;
-	  const load_balance_t *lb0;
-	  ip4_fib_mtrie_t *mtrie0;
-	  ip4_fib_mtrie_leaf_t leaf0;
-	  ip4_address_t *dst_addr0;
-	  __attribute__ ((unused)) u32 pi0, fib_index0, is_tcp_udp0, lbi0;
-	  flow_hash_config_t flow_hash_config0;
-	  const dpo_id_t *dpo0;
-	  u32 hash_c0;
-
-	  pi0 = from[0];
-	  to_next[0] = pi0;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  ip0 = vlib_buffer_get_current (p0);
-
-	  dst_addr0 = &ip0->dst_address;
-
-	  fib_index0 =
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (p0)->sw_if_index[VLIB_RX]);
-	  fib_index0 =
-	    (vnet_buffer (p0)->sw_if_index[VLIB_TX] ==
-	     (u32) ~ 0) ? fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
-
-	  if (!lookup_for_responses_to_locally_received_packets)
-	    {
-	      mtrie0 = &ip4_fib_get (fib_index0)->mtrie;
-
-	      leaf0 = IP4_FIB_MTRIE_LEAF_ROOT;
-
-	      leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 0);
-	    }
-
-	  tcp0 = (void *) (ip0 + 1);
-
-	  is_tcp_udp0 = (ip0->protocol == IP_PROTOCOL_TCP
-			 || ip0->protocol == IP_PROTOCOL_UDP);
-
-	  if (!lookup_for_responses_to_locally_received_packets)
-	    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 1);
-
-	  if (!lookup_for_responses_to_locally_received_packets)
-	    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 2);
-
-	  if (!lookup_for_responses_to_locally_received_packets)
-	    leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, dst_addr0, 3);
-
-	  if (lookup_for_responses_to_locally_received_packets)
-	    lbi0 = vnet_buffer (p0)->ip.adj_index[VLIB_RX];
-	  else
-	    {
-	      /* Handle default route. */
-	      leaf0 =
-		(leaf0 ==
-		 IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie0->default_leaf : leaf0);
-	      lbi0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
-	    }
-
-	  lb0 = load_balance_get (lbi0);
-
-	  /* Use flow hash to compute multipath adjacency. */
-	  hash_c0 = vnet_buffer (p0)->ip.flow_hash = 0;
-	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
-	    {
-	      flow_hash_config0 = lb0->lb_hash_config;
-
-	      hash_c0 = vnet_buffer (p0)->ip.flow_hash =
-		ip4_compute_flow_hash (ip0, flow_hash_config0);
-	    }
-
-	  ASSERT (lb0->lb_n_buckets > 0);
-	  ASSERT (is_pow2 (lb0->lb_n_buckets));
-
-	  dpo0 = load_balance_get_bucket_i (lb0,
-					    (hash_c0 &
-					     (lb0->lb_n_buckets_minus_1)));
-
-	  next0 = dpo0->dpoi_next_node;
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-
-	  vlib_increment_combined_counter
-	    (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, p0));
-
-	  from += 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  n_left_from -= 1;
-
-	  if (PREDICT_FALSE (next0 != next))
-	    {
-	      n_left_to_next += 1;
-	      vlib_put_next_frame (vm, node, next, n_left_to_next);
-	      next = next0;
-	      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
-	      to_next[0] = pi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next, n_left_to_next);
-    }
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
-
-  return frame->n_vectors;
-}
-
-/** @brief IPv4 lookup node.
-    @node ip4-lookup
-
-    This is the main IPv4 lookup dispatch node.
-
-    @param vm vlib_main_t corresponding to the current thread
-    @param node vlib_node_runtime_t
-    @param frame vlib_frame_t whose contents should be dispatched
-
-    @par Graph mechanics: buffer metadata, next index usage
-
-    @em Uses:
-    - <code>vnet_buffer(b)->sw_if_index[VLIB_RX]</code>
-        - Indicates the @c sw_if_index value of the interface that the
-	  packet was received on.
-    - <code>vnet_buffer(b)->sw_if_index[VLIB_TX]</code>
-        - When the value is @c ~0 then the node performs a longest prefix
-          match (LPM) for the packet destination address in the FIB attached
-          to the receive interface.
-        - Otherwise perform LPM for the packet destination address in the
-          indicated FIB. In this case <code>[VLIB_TX]</code> is a FIB index
-          value (0, 1, ...) and not a VRF id.
-
-    @em Sets:
-    - <code>vnet_buffer(b)->ip.adj_index[VLIB_TX]</code>
-        - The lookup result adjacency index.
-
-    <em>Next Index:</em>
-    - Dispatches the packet to the node index found in
-      ip_adjacency_t @c adj->lookup_next_index
-      (where @c adj is the lookup result adjacency).
-*/
-static uword
-ip4_lookup (vlib_main_t * vm,
-	    vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return ip4_lookup_inline (vm, node, frame,
-			    /* lookup_for_responses_to_locally_received_packets */
-			    0);
-
-}
-
-static u8 *format_ip4_lookup_trace (u8 * s, va_list * args);
-
-VLIB_REGISTER_NODE (ip4_lookup_node) =
-{
-.function = ip4_lookup,.name = "ip4-lookup",.vector_size =
-    sizeof (u32),.format_trace = format_ip4_lookup_trace,.n_next_nodes =
-    IP_LOOKUP_N_NEXT,.next_nodes = IP4_LOOKUP_NEXT_NODES,};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_lookup_node, ip4_lookup);
-
-always_inline uword
-ip4_load_balance (vlib_main_t * vm,
-		  vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  vlib_combined_counter_main_t *cm = &load_balance_main.lbm_via_counters;
-  u32 n_left_from, n_left_to_next, *from, *to_next;
-  ip_lookup_next_t next;
-  u32 cpu_index = os_get_cpu_number ();
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
-
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  ip_lookup_next_t next0, next1;
-	  const load_balance_t *lb0, *lb1;
-	  vlib_buffer_t *p0, *p1;
-	  u32 pi0, lbi0, hc0, pi1, lbi1, hc1;
-	  const ip4_header_t *ip0, *ip1;
-	  const dpo_id_t *dpo0, *dpo1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, STORE);
-	    vlib_prefetch_buffer_header (p3, STORE);
-
-	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), STORE);
-	    CLIB_PREFETCH (p3->data, sizeof (ip0[0]), STORE);
-	  }
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-
-	  ip0 = vlib_buffer_get_current (p0);
-	  ip1 = vlib_buffer_get_current (p1);
-	  lbi0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-	  lbi1 = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
-
-	  lb0 = load_balance_get (lbi0);
-	  lb1 = load_balance_get (lbi1);
-
-	  /*
-	   * this node is for via FIBs we can re-use the hash value from the
-	   * to node if present.
-	   * We don't want to use the same hash value at each level in the recursion
-	   * graph as that would lead to polarisation
-	   */
-	  hc0 = vnet_buffer (p0)->ip.flow_hash = 0;
-	  hc1 = vnet_buffer (p1)->ip.flow_hash = 0;
-
-	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
-	    {
-	      if (PREDICT_TRUE (vnet_buffer (p0)->ip.flow_hash))
-		{
-		  hc0 = vnet_buffer (p0)->ip.flow_hash =
-		    vnet_buffer (p0)->ip.flow_hash >> 1;
-		}
-	      else
-		{
-		  hc0 = vnet_buffer (p0)->ip.flow_hash =
-		    ip4_compute_flow_hash (ip0, hc0);
-		}
-	    }
-	  if (PREDICT_FALSE (lb1->lb_n_buckets > 1))
-	    {
-	      if (PREDICT_TRUE (vnet_buffer (p1)->ip.flow_hash))
-		{
-		  hc1 = vnet_buffer (p1)->ip.flow_hash =
-		    vnet_buffer (p1)->ip.flow_hash >> 1;
-		}
-	      else
-		{
-		  hc1 = vnet_buffer (p1)->ip.flow_hash =
-		    ip4_compute_flow_hash (ip1, hc1);
-		}
-	    }
-
-	  dpo0 =
-	    load_balance_get_bucket_i (lb0,
-				       hc0 & (lb0->lb_n_buckets_minus_1));
-	  dpo1 =
-	    load_balance_get_bucket_i (lb1,
-				       hc1 & (lb1->lb_n_buckets_minus_1));
-
-	  next0 = dpo0->dpoi_next_node;
-	  next1 = dpo1->dpoi_next_node;
-
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-	  vnet_buffer (p1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
-
-	  vlib_increment_combined_counter
-	    (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, p0));
-	  vlib_increment_combined_counter
-	    (cm, cpu_index, lbi1, 1, vlib_buffer_length_in_chain (vm, p1));
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next,
-					   to_next, n_left_to_next,
-					   pi0, pi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  ip_lookup_next_t next0;
-	  const load_balance_t *lb0;
-	  vlib_buffer_t *p0;
-	  u32 pi0, lbi0, hc0;
-	  const ip4_header_t *ip0;
-	  const dpo_id_t *dpo0;
-
-	  pi0 = from[0];
-	  to_next[0] = pi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  n_left_from -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  ip0 = vlib_buffer_get_current (p0);
-	  lbi0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-
-	  lb0 = load_balance_get (lbi0);
-
-	  hc0 = vnet_buffer (p0)->ip.flow_hash = 0;
-	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
-	    {
-	      if (PREDICT_TRUE (vnet_buffer (p0)->ip.flow_hash))
-		{
-		  hc0 = vnet_buffer (p0)->ip.flow_hash =
-		    vnet_buffer (p0)->ip.flow_hash >> 1;
-		}
-	      else
-		{
-		  hc0 = vnet_buffer (p0)->ip.flow_hash =
-		    ip4_compute_flow_hash (ip0, hc0);
-		}
-	    }
-
-	  dpo0 =
-	    load_balance_get_bucket_i (lb0,
-				       hc0 & (lb0->lb_n_buckets_minus_1));
-
-	  next0 = dpo0->dpoi_next_node;
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-
-	  vlib_increment_combined_counter
-	    (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, p0));
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next,
-					   to_next, n_left_to_next,
-					   pi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (ip4_load_balance_node) =
-{
-.function = ip4_load_balance,.name = "ip4-load-balance",.vector_size =
-    sizeof (u32),.sibling_of = "ip4-lookup",.format_trace =
-    format_ip4_lookup_trace,};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_load_balance_node, ip4_load_balance);
-
-/* get first interface address */
-ip4_address_t *
-ip4_interface_first_address (ip4_main_t * im, u32 sw_if_index,
-			     ip_interface_address_t ** result_ia)
-{
-  ip_lookup_main_t *lm = &im->lookup_main;
-  ip_interface_address_t *ia = 0;
-  ip4_address_t *result = 0;
-
-  foreach_ip_interface_address (lm, ia, sw_if_index,
-				1 /* honor unnumbered */ ,
-				(
-				  {
-				  ip4_address_t * a =
-				  ip_interface_address_get_address (lm, ia);
-				  result = a;
-				  break;
-				  }
-				));
-  if (result_ia)
-    *result_ia = result ? ia : 0;
-  return result;
-}
-
-static void
-ip4_add_interface_routes (u32 sw_if_index,
-			  ip4_main_t * im, u32 fib_index,
-			  ip_interface_address_t * a)
-{
-  ip_lookup_main_t *lm = &im->lookup_main;
-  ip4_address_t *address = ip_interface_address_get_address (lm, a);
-  fib_prefix_t pfx = {
-    .fp_len = a->address_length,
-    .fp_proto = FIB_PROTOCOL_IP4,
-    .fp_addr.ip4 = *address,
-  };
-
-  a->neighbor_probe_adj_index = ~0;
-
-  if (pfx.fp_len < 32)
-    {
-      fib_node_index_t fei;
-
-      fei = fib_table_entry_update_one_path (fib_index, &pfx, FIB_SOURCE_INTERFACE, (FIB_ENTRY_FLAG_CONNECTED | FIB_ENTRY_FLAG_ATTACHED), FIB_PROTOCOL_IP4, NULL,	/* No next-hop address */
-					     sw_if_index, ~0,	// invalid FIB index
-					     1, NULL,	// no out-label stack
-					     FIB_ROUTE_PATH_FLAG_NONE);
-      a->neighbor_probe_adj_index = fib_entry_get_adj (fei);
-    }
-
-  pfx.fp_len = 32;
-
-  if (sw_if_index < vec_len (lm->classify_table_index_by_sw_if_index))
-    {
-      u32 classify_table_index =
-	lm->classify_table_index_by_sw_if_index[sw_if_index];
-      if (classify_table_index != (u32) ~ 0)
-	{
-	  dpo_id_t dpo = DPO_INVALID;
-
-	  dpo_set (&dpo,
-		   DPO_CLASSIFY,
-		   DPO_PROTO_IP4,
-		   classify_dpo_create (DPO_PROTO_IP4, classify_table_index));
-
-	  fib_table_entry_special_dpo_add (fib_index,
-					   &pfx,
-					   FIB_SOURCE_CLASSIFY,
-					   FIB_ENTRY_FLAG_NONE, &dpo);
-	  dpo_reset (&dpo);
-	}
-    }
-
-  fib_table_entry_update_one_path (fib_index, &pfx, FIB_SOURCE_INTERFACE, (FIB_ENTRY_FLAG_CONNECTED | FIB_ENTRY_FLAG_LOCAL), FIB_PROTOCOL_IP4, &pfx.fp_addr, sw_if_index, ~0,	// invalid FIB index
-				   1, NULL,	// no out-label stack
-				   FIB_ROUTE_PATH_FLAG_NONE);
-}
-
-static void
-ip4_del_interface_routes (ip4_main_t * im,
-			  u32 fib_index,
-			  ip4_address_t * address, u32 address_length)
-{
-  fib_prefix_t pfx = {
-    .fp_len = address_length,
-    .fp_proto = FIB_PROTOCOL_IP4,
-    .fp_addr.ip4 = *address,
-  };
-
-  if (pfx.fp_len < 32)
-    {
-      fib_table_entry_delete (fib_index, &pfx, FIB_SOURCE_INTERFACE);
-    }
-
-  pfx.fp_len = 32;
-  fib_table_entry_delete (fib_index, &pfx, FIB_SOURCE_INTERFACE);
-}
-
-void
-ip4_sw_interface_enable_disable (u32 sw_if_index, u32 is_enable)
-{
-  ip4_main_t *im = &ip4_main;
-
-  vec_validate_init_empty (im->ip_enabled_by_sw_if_index, sw_if_index, 0);
-
-  /*
-   * enable/disable only on the 1<->0 transition
-   */
-  if (is_enable)
-    {
-      if (1 != ++im->ip_enabled_by_sw_if_index[sw_if_index])
-	return;
-    }
-  else
-    {
-      ASSERT (im->ip_enabled_by_sw_if_index[sw_if_index] > 0);
-      if (0 != --im->ip_enabled_by_sw_if_index[sw_if_index])
-	return;
-    }
-  vnet_feature_enable_disable ("ip4-unicast", "ip4-drop", sw_if_index,
-			       !is_enable, 0, 0);
-
-  vnet_feature_enable_disable ("ip4-multicast", "ip4-drop", sw_if_index,
-			       !is_enable, 0, 0);
-
-}
-
-static clib_error_t *
-ip4_add_del_interface_address_internal (vlib_main_t * vm,
-					u32 sw_if_index,
-					ip4_address_t * address,
-					u32 address_length, u32 is_del)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip4_main_t *im = &ip4_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-  clib_error_t *error = 0;
-  u32 if_address_index, elts_before;
-  ip4_address_fib_t ip4_af, *addr_fib = 0;
-
-  vec_validate (im->fib_index_by_sw_if_index, sw_if_index);
-  ip4_addr_fib_init (&ip4_af, address,
-		     vec_elt (im->fib_index_by_sw_if_index, sw_if_index));
-  vec_add1 (addr_fib, ip4_af);
-
-  /* FIXME-LATER
-   * there is no support for adj-fib handling in the presence of overlapping
-   * subnets on interfaces. Easy fix - disallow overlapping subnets, like
-   * most routers do.
-   */
-  if (!is_del)
-    {
-      /* When adding an address check that it does not conflict
-         with an existing address. */
-      ip_interface_address_t *ia;
-      foreach_ip_interface_address (&im->lookup_main, ia, sw_if_index,
-				    0 /* honor unnumbered */ ,
-				    (
-				      {
-				      ip4_address_t * x =
-				      ip_interface_address_get_address
-				      (&im->lookup_main, ia);
-				      if (ip4_destination_matches_route
-					  (im, address, x, ia->address_length)
-					  ||
-					  ip4_destination_matches_route (im,
-									 x,
-									 address,
-									 address_length))
-				      return
-				      clib_error_create
-				      ("failed to add %U which conflicts with %U for interface %U",
-				       format_ip4_address_and_length, address,
-				       address_length,
-				       format_ip4_address_and_length, x,
-				       ia->address_length,
-				       format_vnet_sw_if_index_name, vnm,
-				       sw_if_index);}
-				    ));
-    }
-
-  elts_before = pool_elts (lm->if_address_pool);
-
-  error = ip_interface_address_add_del
-    (lm, sw_if_index, addr_fib, address_length, is_del, &if_address_index);
-  if (error)
-    goto done;
-
-  ip4_sw_interface_enable_disable (sw_if_index, !is_del);
-
-  if (is_del)
-    ip4_del_interface_routes (im, ip4_af.fib_index, address, address_length);
-  else
-    ip4_add_interface_routes (sw_if_index,
-			      im, ip4_af.fib_index,
-			      pool_elt_at_index
-			      (lm->if_address_pool, if_address_index));
-
-  /* If pool did not grow/shrink: add duplicate address. */
-  if (elts_before != pool_elts (lm->if_address_pool))
-    {
-      ip4_add_del_interface_address_callback_t *cb;
-      vec_foreach (cb, im->add_del_interface_address_callbacks)
-	cb->function (im, cb->function_opaque, sw_if_index,
-		      address, address_length, if_address_index, is_del);
-    }
-
-done:
-  vec_free (addr_fib);
-  return error;
-}
-
-clib_error_t *
-ip4_add_del_interface_address (vlib_main_t * vm, u32 sw_if_index,
-			       ip4_address_t * address, u32 address_length,
-			       u32 is_del)
-{
-  return ip4_add_del_interface_address_internal
-    (vm, sw_if_index, address, address_length, is_del);
-}
-
-/* Built-in ip4 unicast rx feature path definition */
-/* *INDENT-OFF* */
-VNET_FEATURE_ARC_INIT (ip4_unicast, static) =
-{
-  .arc_name = "ip4-unicast",
-  .start_nodes = VNET_FEATURES ("ip4-input", "ip4-input-no-checksum"),
-  .end_node = "ip4-lookup",
-  .arc_index_ptr = &ip4_main.lookup_main.ucast_feature_arc_index,
-};
-
-VNET_FEATURE_INIT (ip4_flow_classify, static) =
-{
-  .arc_name = "ip4-unicast",
-  .node_name = "ip4-flow-classify",
-  .runs_before = VNET_FEATURES ("ip4-inacl"),
-};
-
-VNET_FEATURE_INIT (ip4_inacl, static) =
-{
-  .arc_name = "ip4-unicast",
-  .node_name = "ip4-inacl",
-  .runs_before = VNET_FEATURES ("ip4-source-check-via-rx"),
-};
-
-VNET_FEATURE_INIT (ip4_source_check_1, static) =
-{
-  .arc_name = "ip4-unicast",
-  .node_name = "ip4-source-check-via-rx",
-  .runs_before = VNET_FEATURES ("ip4-source-check-via-any"),
-};
-
-VNET_FEATURE_INIT (ip4_source_check_2, static) =
-{
-  .arc_name = "ip4-unicast",
-  .node_name = "ip4-source-check-via-any",
-  .runs_before = VNET_FEATURES ("ip4-policer-classify"),
-};
-
-VNET_FEATURE_INIT (ip4_source_and_port_range_check_rx, static) =
-{
-  .arc_name = "ip4-unicast",
-  .node_name = "ip4-source-and-port-range-check-rx",
-  .runs_before = VNET_FEATURES ("ip4-policer-classify"),
-};
-
-VNET_FEATURE_INIT (ip4_policer_classify, static) =
-{
-  .arc_name = "ip4-unicast",
-  .node_name = "ip4-policer-classify",
-  .runs_before = VNET_FEATURES ("ipsec-input-ip4"),
-};
-
-VNET_FEATURE_INIT (ip4_ipsec, static) =
-{
-  .arc_name = "ip4-unicast",
-  .node_name = "ipsec-input-ip4",
-  .runs_before = VNET_FEATURES ("vpath-input-ip4"),
-};
-
-VNET_FEATURE_INIT (ip4_vpath, static) =
-{
-  .arc_name = "ip4-unicast",
-  .node_name = "vpath-input-ip4",
-  .runs_before = VNET_FEATURES ("ip4-vxlan-bypass"),
-};
-
-VNET_FEATURE_INIT (ip4_vxlan_bypass, static) =
-{
-  .arc_name = "ip4-unicast",
-  .node_name = "ip4-vxlan-bypass",
-  .runs_before = VNET_FEATURES ("ip4-lookup"),
-};
-
-VNET_FEATURE_INIT (ip4_lookup, static) =
-{
-  .arc_name = "ip4-unicast",
-  .node_name = "ip4-lookup",
-  .runs_before = VNET_FEATURES ("ip4-drop"),
-};
-
-VNET_FEATURE_INIT (ip4_drop, static) =
-{
-  .arc_name = "ip4-unicast",
-  .node_name = "ip4-drop",
-  .runs_before = 0,	/* not before any other features */
-};
-
-
-/* Built-in ip4 multicast rx feature path definition */
-VNET_FEATURE_ARC_INIT (ip4_multicast, static) =
-{
-  .arc_name = "ip4-multicast",
-  .start_nodes = VNET_FEATURES ("ip4-input", "ip4-input-no-checksum"),
-  .end_node = "ip4-lookup-multicast",
-  .arc_index_ptr = &ip4_main.lookup_main.mcast_feature_arc_index,
-};
-
-VNET_FEATURE_INIT (ip4_vpath_mc, static) =
-{
-  .arc_name = "ip4-multicast",
-  .node_name = "vpath-input-ip4",
-  .runs_before = VNET_FEATURES ("ip4-lookup-multicast"),
-};
-
-VNET_FEATURE_INIT (ip4_lookup_mc, static) =
-{
-  .arc_name = "ip4-multicast",
-  .node_name = "ip4-lookup-multicast",
-  .runs_before = VNET_FEATURES ("ip4-drop"),
-};
-
-VNET_FEATURE_INIT (ip4_mc_drop, static) =
-{
-  .arc_name = "ip4-multicast",
-  .node_name = "ip4-drop",
-  .runs_before = 0,	/* last feature */
-};
-
-/* Source and port-range check ip4 tx feature path definition */
-VNET_FEATURE_ARC_INIT (ip4_output, static) =
-{
-  .arc_name = "ip4-output",
-  .start_nodes = VNET_FEATURES ("ip4-rewrite", "ip4-midchain"),
-  .end_node = "interface-output",
-  .arc_index_ptr = &ip4_main.lookup_main.output_feature_arc_index,
-};
-
-VNET_FEATURE_INIT (ip4_source_and_port_range_check_tx, static) =
-{
-  .arc_name = "ip4-output",
-  .node_name = "ip4-source-and-port-range-check-tx",
-  .runs_before = VNET_FEATURES ("ipsec-output-ip4"),
-};
-
-VNET_FEATURE_INIT (ip4_ipsec_output, static) =
-{
-  .arc_name = "ip4-output",
-  .node_name = "ipsec-output-ip4",
-  .runs_before = VNET_FEATURES ("interface-output"),
-};
-
-/* Built-in ip4 tx feature path definition */
-VNET_FEATURE_INIT (ip4_interface_output, static) =
-{
-  .arc_name = "ip4-output",
-  .node_name = "interface-output",
-  .runs_before = 0,	/* not before any other features */
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-ip4_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
-{
-  ip4_main_t *im = &ip4_main;
-
-  /* Fill in lookup tables with default table (0). */
-  vec_validate (im->fib_index_by_sw_if_index, sw_if_index);
-
-  vnet_feature_enable_disable ("ip4-unicast", "ip4-drop", sw_if_index,
-			       is_add, 0, 0);
-
-  vnet_feature_enable_disable ("ip4-multicast", "ip4-drop", sw_if_index,
-			       is_add, 0, 0);
-
-  return /* no error */ 0;
-}
-
-VNET_SW_INTERFACE_ADD_DEL_FUNCTION (ip4_sw_interface_add_del);
-
-/* Global IP4 main. */
-ip4_main_t ip4_main;
-
-clib_error_t *
-ip4_lookup_init (vlib_main_t * vm)
-{
-  ip4_main_t *im = &ip4_main;
-  clib_error_t *error;
-  uword i;
-
-  if ((error = vlib_call_init_function (vm, vnet_feature_init)))
-    return error;
-
-  for (i = 0; i < ARRAY_LEN (im->fib_masks); i++)
-    {
-      u32 m;
-
-      if (i < 32)
-	m = pow2_mask (i) << (32 - i);
-      else
-	m = ~0;
-      im->fib_masks[i] = clib_host_to_net_u32 (m);
-    }
-
-  ip_lookup_init (&im->lookup_main, /* is_ip6 */ 0);
-
-  /* Create FIB with index 0 and table id of 0. */
-  fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, 0);
-
-  {
-    pg_node_t *pn;
-    pn = pg_get_node (ip4_lookup_node.index);
-    pn->unformat_edit = unformat_pg_ip4_header;
-  }
-
-  {
-    ethernet_arp_header_t h;
-
-    memset (&h, 0, sizeof (h));
-
-    /* Set target ethernet address to all zeros. */
-    memset (h.ip4_over_ethernet[1].ethernet, 0,
-	    sizeof (h.ip4_over_ethernet[1].ethernet));
-
-#define _16(f,v) h.f = clib_host_to_net_u16 (v);
-#define _8(f,v) h.f = v;
-    _16 (l2_type, ETHERNET_ARP_HARDWARE_TYPE_ethernet);
-    _16 (l3_type, ETHERNET_TYPE_IP4);
-    _8 (n_l2_address_bytes, 6);
-    _8 (n_l3_address_bytes, 4);
-    _16 (opcode, ETHERNET_ARP_OPCODE_request);
-#undef _16
-#undef _8
-
-    vlib_packet_template_init (vm, &im->ip4_arp_request_packet_template,
-			       /* data */ &h,
-			       sizeof (h),
-			       /* alloc chunk size */ 8,
-			       "ip4 arp");
-  }
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (ip4_lookup_init);
-
-typedef struct
-{
-  /* Adjacency taken. */
-  u32 dpo_index;
-  u32 flow_hash;
-  u32 fib_index;
-
-  /* Packet data, possibly *after* rewrite. */
-  u8 packet_data[64 - 1 * sizeof (u32)];
-}
-ip4_forward_next_trace_t;
-
-u8 *
-format_ip4_forward_next_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip4_forward_next_trace_t *t = va_arg (*args, ip4_forward_next_trace_t *);
-  uword indent = format_get_indent (s);
-  s = format (s, "%U%U",
-	      format_white_space, indent,
-	      format_ip4_header, t->packet_data, sizeof (t->packet_data));
-  return s;
-}
-
-static u8 *
-format_ip4_lookup_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip4_forward_next_trace_t *t = va_arg (*args, ip4_forward_next_trace_t *);
-  uword indent = format_get_indent (s);
-
-  s = format (s, "fib %d dpo-idx %d flow hash: 0x%08x",
-	      t->fib_index, t->dpo_index, t->flow_hash);
-  s = format (s, "\n%U%U",
-	      format_white_space, indent,
-	      format_ip4_header, t->packet_data, sizeof (t->packet_data));
-  return s;
-}
-
-static u8 *
-format_ip4_rewrite_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip4_forward_next_trace_t *t = va_arg (*args, ip4_forward_next_trace_t *);
-  vnet_main_t *vnm = vnet_get_main ();
-  uword indent = format_get_indent (s);
-
-  s = format (s, "tx_sw_if_index %d dpo-idx %d : %U flow hash: 0x%08x",
-	      t->fib_index, t->dpo_index, format_ip_adjacency,
-	      t->dpo_index, FORMAT_IP_ADJACENCY_NONE, t->flow_hash);
-  s = format (s, "\n%U%U",
-	      format_white_space, indent,
-	      format_ip_adjacency_packet_data,
-	      vnm, t->dpo_index, t->packet_data, sizeof (t->packet_data));
-  return s;
-}
-
-/* Common trace function for all ip4-forward next nodes. */
-void
-ip4_forward_next_trace (vlib_main_t * vm,
-			vlib_node_runtime_t * node,
-			vlib_frame_t * frame, vlib_rx_or_tx_t which_adj_index)
-{
-  u32 *from, n_left;
-  ip4_main_t *im = &ip4_main;
-
-  n_left = frame->n_vectors;
-  from = vlib_frame_vector_args (frame);
-
-  while (n_left >= 4)
-    {
-      u32 bi0, bi1;
-      vlib_buffer_t *b0, *b1;
-      ip4_forward_next_trace_t *t0, *t1;
-
-      /* Prefetch next iteration. */
-      vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
-      vlib_prefetch_buffer_with_index (vm, from[3], LOAD);
-
-      bi0 = from[0];
-      bi1 = from[1];
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-	  t0->dpo_index = vnet_buffer (b0)->ip.adj_index[which_adj_index];
-	  t0->flow_hash = vnet_buffer (b0)->ip.flow_hash;
-	  t0->fib_index =
-	    (vnet_buffer (b0)->sw_if_index[VLIB_TX] !=
-	     (u32) ~ 0) ? vnet_buffer (b0)->sw_if_index[VLIB_TX] :
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (b0)->sw_if_index[VLIB_RX]);
-
-	  clib_memcpy (t0->packet_data,
-		       vlib_buffer_get_current (b0),
-		       sizeof (t0->packet_data));
-	}
-      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
-	  t1->dpo_index = vnet_buffer (b1)->ip.adj_index[which_adj_index];
-	  t1->flow_hash = vnet_buffer (b1)->ip.flow_hash;
-	  t1->fib_index =
-	    (vnet_buffer (b1)->sw_if_index[VLIB_TX] !=
-	     (u32) ~ 0) ? vnet_buffer (b1)->sw_if_index[VLIB_TX] :
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (b1)->sw_if_index[VLIB_RX]);
-	  clib_memcpy (t1->packet_data, vlib_buffer_get_current (b1),
-		       sizeof (t1->packet_data));
-	}
-      from += 2;
-      n_left -= 2;
-    }
-
-  while (n_left >= 1)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      ip4_forward_next_trace_t *t0;
-
-      bi0 = from[0];
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-	  t0->dpo_index = vnet_buffer (b0)->ip.adj_index[which_adj_index];
-	  t0->flow_hash = vnet_buffer (b0)->ip.flow_hash;
-	  t0->fib_index =
-	    (vnet_buffer (b0)->sw_if_index[VLIB_TX] !=
-	     (u32) ~ 0) ? vnet_buffer (b0)->sw_if_index[VLIB_TX] :
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (b0)->sw_if_index[VLIB_RX]);
-	  clib_memcpy (t0->packet_data, vlib_buffer_get_current (b0),
-		       sizeof (t0->packet_data));
-	}
-      from += 1;
-      n_left -= 1;
-    }
-}
-
-static uword
-ip4_drop_or_punt (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * frame, ip4_error_t error_code)
-{
-  u32 *buffers = vlib_frame_vector_args (frame);
-  uword n_packets = frame->n_vectors;
-
-  vlib_error_drop_buffers (vm, node, buffers,
-			   /* stride */ 1,
-			   n_packets,
-			   /* next */ 0,
-			   ip4_input_node.index, error_code);
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
-
-  return n_packets;
-}
-
-static uword
-ip4_drop (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return ip4_drop_or_punt (vm, node, frame, IP4_ERROR_ADJACENCY_DROP);
-}
-
-static uword
-ip4_punt (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return ip4_drop_or_punt (vm, node, frame, IP4_ERROR_ADJACENCY_PUNT);
-}
-
-VLIB_REGISTER_NODE (ip4_drop_node, static) =
-{
-  .function = ip4_drop,.name = "ip4-drop",.vector_size =
-    sizeof (u32),.format_trace = format_ip4_forward_next_trace,.n_next_nodes =
-    1,.next_nodes =
-  {
-  [0] = "error-drop",}
-,};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_drop_node, ip4_drop);
-
-VLIB_REGISTER_NODE (ip4_punt_node, static) =
-{
-  .function = ip4_punt,.name = "ip4-punt",.vector_size =
-    sizeof (u32),.format_trace = format_ip4_forward_next_trace,.n_next_nodes =
-    1,.next_nodes =
-  {
-  [0] = "error-punt",}
-,};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_punt_node, ip4_punt);
-
-/* Compute TCP/UDP/ICMP4 checksum in software. */
-u16
-ip4_tcp_udp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0,
-			      ip4_header_t * ip0)
-{
-  ip_csum_t sum0;
-  u32 ip_header_length, payload_length_host_byte_order;
-  u32 n_this_buffer, n_bytes_left;
-  u16 sum16;
-  void *data_this_buffer;
-
-  /* Initialize checksum with ip header. */
-  ip_header_length = ip4_header_bytes (ip0);
-  payload_length_host_byte_order =
-    clib_net_to_host_u16 (ip0->length) - ip_header_length;
-  sum0 =
-    clib_host_to_net_u32 (payload_length_host_byte_order +
-			  (ip0->protocol << 16));
-
-  if (BITS (uword) == 32)
-    {
-      sum0 =
-	ip_csum_with_carry (sum0,
-			    clib_mem_unaligned (&ip0->src_address, u32));
-      sum0 =
-	ip_csum_with_carry (sum0,
-			    clib_mem_unaligned (&ip0->dst_address, u32));
-    }
-  else
-    sum0 =
-      ip_csum_with_carry (sum0, clib_mem_unaligned (&ip0->src_address, u64));
-
-  n_bytes_left = n_this_buffer = payload_length_host_byte_order;
-  data_this_buffer = (void *) ip0 + ip_header_length;
-  if (n_this_buffer + ip_header_length > p0->current_length)
-    n_this_buffer =
-      p0->current_length >
-      ip_header_length ? p0->current_length - ip_header_length : 0;
-  while (1)
-    {
-      sum0 = ip_incremental_checksum (sum0, data_this_buffer, n_this_buffer);
-      n_bytes_left -= n_this_buffer;
-      if (n_bytes_left == 0)
-	break;
-
-      ASSERT (p0->flags & VLIB_BUFFER_NEXT_PRESENT);
-      p0 = vlib_get_buffer (vm, p0->next_buffer);
-      data_this_buffer = vlib_buffer_get_current (p0);
-      n_this_buffer = p0->current_length;
-    }
-
-  sum16 = ~ip_csum_fold (sum0);
-
-  return sum16;
-}
-
-u32
-ip4_tcp_udp_validate_checksum (vlib_main_t * vm, vlib_buffer_t * p0)
-{
-  ip4_header_t *ip0 = vlib_buffer_get_current (p0);
-  udp_header_t *udp0;
-  u16 sum16;
-
-  ASSERT (ip0->protocol == IP_PROTOCOL_TCP
-	  || ip0->protocol == IP_PROTOCOL_UDP);
-
-  udp0 = (void *) (ip0 + 1);
-  if (ip0->protocol == IP_PROTOCOL_UDP && udp0->checksum == 0)
-    {
-      p0->flags |= (IP_BUFFER_L4_CHECKSUM_COMPUTED
-		    | IP_BUFFER_L4_CHECKSUM_CORRECT);
-      return p0->flags;
-    }
-
-  sum16 = ip4_tcp_udp_compute_checksum (vm, p0, ip0);
-
-  p0->flags |= (IP_BUFFER_L4_CHECKSUM_COMPUTED
-		| ((sum16 == 0) << LOG2_IP_BUFFER_L4_CHECKSUM_CORRECT));
-
-  return p0->flags;
-}
-
-static uword
-ip4_local (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  ip4_main_t *im = &ip4_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-  ip_local_next_t next_index;
-  u32 *from, *to_next, n_left_from, n_left_to_next;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip4_input_node.index);
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  vlib_buffer_t *p0, *p1;
-	  ip4_header_t *ip0, *ip1;
-	  udp_header_t *udp0, *udp1;
-	  ip4_fib_mtrie_t *mtrie0, *mtrie1;
-	  ip4_fib_mtrie_leaf_t leaf0, leaf1;
-	  const dpo_id_t *dpo0, *dpo1;
-	  const load_balance_t *lb0, *lb1;
-	  u32 pi0, ip_len0, udp_len0, flags0, next0, fib_index0, lbi0;
-	  u32 pi1, ip_len1, udp_len1, flags1, next1, fib_index1, lbi1;
-	  i32 len_diff0, len_diff1;
-	  u8 error0, is_udp0, is_tcp_udp0, good_tcp_udp0, proto0;
-	  u8 error1, is_udp1, is_tcp_udp1, good_tcp_udp1, proto1;
-	  u8 enqueue_code;
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-
-	  ip0 = vlib_buffer_get_current (p0);
-	  ip1 = vlib_buffer_get_current (p1);
-
-	  vnet_buffer (p0)->ip.start_of_ip_header = p0->current_data;
-	  vnet_buffer (p1)->ip.start_of_ip_header = p1->current_data;
-
-	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
-				vnet_buffer (p0)->sw_if_index[VLIB_RX]);
-	  fib_index0 = (vnet_buffer (p0)->sw_if_index[VLIB_TX] == (u32) ~ 0) ?
-	    fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
-
-	  fib_index1 = vec_elt (im->fib_index_by_sw_if_index,
-				vnet_buffer (p1)->sw_if_index[VLIB_RX]);
-	  fib_index1 = (vnet_buffer (p1)->sw_if_index[VLIB_TX] == (u32) ~ 0) ?
-	    fib_index1 : vnet_buffer (p1)->sw_if_index[VLIB_TX];
-
-	  mtrie0 = &ip4_fib_get (fib_index0)->mtrie;
-	  mtrie1 = &ip4_fib_get (fib_index1)->mtrie;
-
-	  leaf0 = leaf1 = IP4_FIB_MTRIE_LEAF_ROOT;
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 0);
-	  leaf1 =
-	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 0);
-
-	  /* Treat IP frag packets as "experimental" protocol for now
-	     until support of IP frag reassembly is implemented */
-	  proto0 = ip4_is_fragment (ip0) ? 0xfe : ip0->protocol;
-	  proto1 = ip4_is_fragment (ip1) ? 0xfe : ip1->protocol;
-	  is_udp0 = proto0 == IP_PROTOCOL_UDP;
-	  is_udp1 = proto1 == IP_PROTOCOL_UDP;
-	  is_tcp_udp0 = is_udp0 || proto0 == IP_PROTOCOL_TCP;
-	  is_tcp_udp1 = is_udp1 || proto1 == IP_PROTOCOL_TCP;
-
-	  flags0 = p0->flags;
-	  flags1 = p1->flags;
-
-	  good_tcp_udp0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-	  good_tcp_udp1 = (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-
-	  udp0 = ip4_next_header (ip0);
-	  udp1 = ip4_next_header (ip1);
-
-	  /* Don't verify UDP checksum for packets with explicit zero checksum. */
-	  good_tcp_udp0 |= is_udp0 && udp0->checksum == 0;
-	  good_tcp_udp1 |= is_udp1 && udp1->checksum == 0;
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 1);
-	  leaf1 =
-	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 1);
-
-	  /* Verify UDP length. */
-	  ip_len0 = clib_net_to_host_u16 (ip0->length);
-	  ip_len1 = clib_net_to_host_u16 (ip1->length);
-	  udp_len0 = clib_net_to_host_u16 (udp0->length);
-	  udp_len1 = clib_net_to_host_u16 (udp1->length);
-
-	  len_diff0 = ip_len0 - udp_len0;
-	  len_diff1 = ip_len1 - udp_len1;
-
-	  len_diff0 = is_udp0 ? len_diff0 : 0;
-	  len_diff1 = is_udp1 ? len_diff1 : 0;
-
-	  if (PREDICT_FALSE (!(is_tcp_udp0 & is_tcp_udp1
-			       & good_tcp_udp0 & good_tcp_udp1)))
-	    {
-	      if (is_tcp_udp0)
-		{
-		  if (is_tcp_udp0
-		      && !(flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
-		    flags0 = ip4_tcp_udp_validate_checksum (vm, p0);
-		  good_tcp_udp0 =
-		    (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-		  good_tcp_udp0 |= is_udp0 && udp0->checksum == 0;
-		}
-	      if (is_tcp_udp1)
-		{
-		  if (is_tcp_udp1
-		      && !(flags1 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
-		    flags1 = ip4_tcp_udp_validate_checksum (vm, p1);
-		  good_tcp_udp1 =
-		    (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-		  good_tcp_udp1 |= is_udp1 && udp1->checksum == 0;
-		}
-	    }
-
-	  good_tcp_udp0 &= len_diff0 >= 0;
-	  good_tcp_udp1 &= len_diff1 >= 0;
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 2);
-	  leaf1 =
-	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 2);
-
-	  error0 = error1 = IP4_ERROR_UNKNOWN_PROTOCOL;
-
-	  error0 = len_diff0 < 0 ? IP4_ERROR_UDP_LENGTH : error0;
-	  error1 = len_diff1 < 0 ? IP4_ERROR_UDP_LENGTH : error1;
-
-	  ASSERT (IP4_ERROR_TCP_CHECKSUM + 1 == IP4_ERROR_UDP_CHECKSUM);
-	  error0 = (is_tcp_udp0 && !good_tcp_udp0
-		    ? IP4_ERROR_TCP_CHECKSUM + is_udp0 : error0);
-	  error1 = (is_tcp_udp1 && !good_tcp_udp1
-		    ? IP4_ERROR_TCP_CHECKSUM + is_udp1 : error1);
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 3);
-	  leaf1 =
-	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 3);
-	  leaf0 =
-	    (leaf0 ==
-	     IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie0->default_leaf : leaf0);
-	  leaf1 =
-	    (leaf1 ==
-	     IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie1->default_leaf : leaf1);
-
-	  vnet_buffer (p0)->ip.adj_index[VLIB_RX] = lbi0 =
-	    ip4_fib_mtrie_leaf_get_adj_index (leaf0);
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = lbi0;
-
-	  vnet_buffer (p1)->ip.adj_index[VLIB_RX] = lbi1 =
-	    ip4_fib_mtrie_leaf_get_adj_index (leaf1);
-	  vnet_buffer (p1)->ip.adj_index[VLIB_TX] = lbi1;
-
-	  lb0 = load_balance_get (lbi0);
-	  lb1 = load_balance_get (lbi1);
-	  dpo0 = load_balance_get_bucket_i (lb0, 0);
-	  dpo1 = load_balance_get_bucket_i (lb1, 0);
-
-	  /*
-	   * Must have a route to source otherwise we drop the packet.
-	   * ip4 broadcasts are accepted, e.g. to make dhcp client work
-	   *
-	   * The checks are:
-	   *  - the source is a recieve => it's from us => bogus, do this
-	   *    first since it sets a different error code.
-	   *  - uRPF check for any route to source - accept if passes.
-	   *  - allow packets destined to the broadcast address from unknown sources
-	   */
-	  error0 = ((error0 == IP4_ERROR_UNKNOWN_PROTOCOL &&
-		     dpo0->dpoi_type == DPO_RECEIVE) ?
-		    IP4_ERROR_SPOOFED_LOCAL_PACKETS : error0);
-	  error0 = ((error0 == IP4_ERROR_UNKNOWN_PROTOCOL &&
-		     !fib_urpf_check_size (lb0->lb_urpf) &&
-		     ip0->dst_address.as_u32 != 0xFFFFFFFF)
-		    ? IP4_ERROR_SRC_LOOKUP_MISS : error0);
-	  error1 = ((error1 == IP4_ERROR_UNKNOWN_PROTOCOL &&
-		     dpo1->dpoi_type == DPO_RECEIVE) ?
-		    IP4_ERROR_SPOOFED_LOCAL_PACKETS : error1);
-	  error1 = ((error1 == IP4_ERROR_UNKNOWN_PROTOCOL &&
-		     !fib_urpf_check_size (lb1->lb_urpf) &&
-		     ip1->dst_address.as_u32 != 0xFFFFFFFF)
-		    ? IP4_ERROR_SRC_LOOKUP_MISS : error1);
-
-	  next0 = lm->local_next_by_ip_protocol[proto0];
-	  next1 = lm->local_next_by_ip_protocol[proto1];
-
-	  next0 =
-	    error0 != IP4_ERROR_UNKNOWN_PROTOCOL ? IP_LOCAL_NEXT_DROP : next0;
-	  next1 =
-	    error1 != IP4_ERROR_UNKNOWN_PROTOCOL ? IP_LOCAL_NEXT_DROP : next1;
-
-	  p0->error = error0 ? error_node->errors[error0] : 0;
-	  p1->error = error1 ? error_node->errors[error1] : 0;
-
-	  enqueue_code = (next0 != next_index) + 2 * (next1 != next_index);
-
-	  if (PREDICT_FALSE (enqueue_code != 0))
-	    {
-	      switch (enqueue_code)
-		{
-		case 1:
-		  /* A B A */
-		  to_next[-2] = pi1;
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node, next0, pi0);
-		  break;
-
-		case 2:
-		  /* A A B */
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node, next1, pi1);
-		  break;
-
-		case 3:
-		  /* A B B or A B C */
-		  to_next -= 2;
-		  n_left_to_next += 2;
-		  vlib_set_next_frame_buffer (vm, node, next0, pi0);
-		  vlib_set_next_frame_buffer (vm, node, next1, pi1);
-		  if (next0 == next1)
-		    {
-		      vlib_put_next_frame (vm, node, next_index,
-					   n_left_to_next);
-		      next_index = next1;
-		      vlib_get_next_frame (vm, node, next_index, to_next,
-					   n_left_to_next);
-		    }
-		  break;
-		}
-	    }
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip4_header_t *ip0;
-	  udp_header_t *udp0;
-	  ip4_fib_mtrie_t *mtrie0;
-	  ip4_fib_mtrie_leaf_t leaf0;
-	  u32 pi0, next0, ip_len0, udp_len0, flags0, fib_index0, lbi0;
-	  i32 len_diff0;
-	  u8 error0, is_udp0, is_tcp_udp0, good_tcp_udp0, proto0;
-	  load_balance_t *lb0;
-	  const dpo_id_t *dpo0;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  ip0 = vlib_buffer_get_current (p0);
-
-	  vnet_buffer (p0)->ip.start_of_ip_header = p0->current_data;
-
-	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
-				vnet_buffer (p0)->sw_if_index[VLIB_RX]);
-	  fib_index0 = (vnet_buffer (p0)->sw_if_index[VLIB_TX] == (u32) ~ 0) ?
-	    fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
-
-	  mtrie0 = &ip4_fib_get (fib_index0)->mtrie;
-
-	  leaf0 = IP4_FIB_MTRIE_LEAF_ROOT;
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 0);
-
-	  /* Treat IP frag packets as "experimental" protocol for now
-	     until support of IP frag reassembly is implemented */
-	  proto0 = ip4_is_fragment (ip0) ? 0xfe : ip0->protocol;
-	  is_udp0 = proto0 == IP_PROTOCOL_UDP;
-	  is_tcp_udp0 = is_udp0 || proto0 == IP_PROTOCOL_TCP;
-
-	  flags0 = p0->flags;
-
-	  good_tcp_udp0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-
-	  udp0 = ip4_next_header (ip0);
-
-	  /* Don't verify UDP checksum for packets with explicit zero checksum. */
-	  good_tcp_udp0 |= is_udp0 && udp0->checksum == 0;
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 1);
-
-	  /* Verify UDP length. */
-	  ip_len0 = clib_net_to_host_u16 (ip0->length);
-	  udp_len0 = clib_net_to_host_u16 (udp0->length);
-
-	  len_diff0 = ip_len0 - udp_len0;
-
-	  len_diff0 = is_udp0 ? len_diff0 : 0;
-
-	  if (PREDICT_FALSE (!(is_tcp_udp0 & good_tcp_udp0)))
-	    {
-	      if (is_tcp_udp0)
-		{
-		  if (is_tcp_udp0
-		      && !(flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
-		    flags0 = ip4_tcp_udp_validate_checksum (vm, p0);
-		  good_tcp_udp0 =
-		    (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-		  good_tcp_udp0 |= is_udp0 && udp0->checksum == 0;
-		}
-	    }
-
-	  good_tcp_udp0 &= len_diff0 >= 0;
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 2);
-
-	  error0 = IP4_ERROR_UNKNOWN_PROTOCOL;
-
-	  error0 = len_diff0 < 0 ? IP4_ERROR_UDP_LENGTH : error0;
-
-	  ASSERT (IP4_ERROR_TCP_CHECKSUM + 1 == IP4_ERROR_UDP_CHECKSUM);
-	  error0 = (is_tcp_udp0 && !good_tcp_udp0
-		    ? IP4_ERROR_TCP_CHECKSUM + is_udp0 : error0);
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 3);
-	  leaf0 =
-	    (leaf0 ==
-	     IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie0->default_leaf : leaf0);
-
-	  lbi0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = lbi0;
-
-	  lb0 = load_balance_get (lbi0);
-	  dpo0 = load_balance_get_bucket_i (lb0, 0);
-
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] =
-	    vnet_buffer (p0)->ip.adj_index[VLIB_RX] = lbi0;
-
-	  error0 = ((error0 == IP4_ERROR_UNKNOWN_PROTOCOL &&
-		     dpo0->dpoi_type == DPO_RECEIVE) ?
-		    IP4_ERROR_SPOOFED_LOCAL_PACKETS : error0);
-	  error0 = ((error0 == IP4_ERROR_UNKNOWN_PROTOCOL &&
-		     !fib_urpf_check_size (lb0->lb_urpf) &&
-		     ip0->dst_address.as_u32 != 0xFFFFFFFF)
-		    ? IP4_ERROR_SRC_LOOKUP_MISS : error0);
-
-	  next0 = lm->local_next_by_ip_protocol[proto0];
-
-	  next0 =
-	    error0 != IP4_ERROR_UNKNOWN_PROTOCOL ? IP_LOCAL_NEXT_DROP : next0;
-
-	  p0->error = error0 ? error_node->errors[error0] : 0;
-
-	  if (PREDICT_FALSE (next0 != next_index))
-	    {
-	      n_left_to_next += 1;
-	      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-
-	      next_index = next0;
-	      vlib_get_next_frame (vm, node, next_index, to_next,
-				   n_left_to_next);
-	      to_next[0] = pi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (ip4_local_node, static) =
-{
-  .function = ip4_local,.name = "ip4-local",.vector_size =
-    sizeof (u32),.format_trace = format_ip4_forward_next_trace,.n_next_nodes =
-    IP_LOCAL_N_NEXT,.next_nodes =
-  {
-  [IP_LOCAL_NEXT_DROP] = "error-drop",
-      [IP_LOCAL_NEXT_PUNT] = "error-punt",
-      [IP_LOCAL_NEXT_UDP_LOOKUP] = "ip4-udp-lookup",
-      [IP_LOCAL_NEXT_ICMP] = "ip4-icmp-input",}
-,};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_local_node, ip4_local);
-
-void
-ip4_register_protocol (u32 protocol, u32 node_index)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  ip4_main_t *im = &ip4_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-
-  ASSERT (protocol < ARRAY_LEN (lm->local_next_by_ip_protocol));
-  lm->local_next_by_ip_protocol[protocol] =
-    vlib_node_add_next (vm, ip4_local_node.index, node_index);
-}
-
-static clib_error_t *
-show_ip_local_command_fn (vlib_main_t * vm,
-			  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  ip4_main_t *im = &ip4_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-  int i;
-
-  vlib_cli_output (vm, "Protocols handled by ip4_local");
-  for (i = 0; i < ARRAY_LEN (lm->local_next_by_ip_protocol); i++)
-    {
-      if (lm->local_next_by_ip_protocol[i] != IP_LOCAL_NEXT_PUNT)
-	vlib_cli_output (vm, "%d", i);
-    }
-  return 0;
-}
-
-
-
-/*?
- * Display the set of protocols handled by the local IPv4 stack.
- *
- * @cliexpar
- * Example of how to display local protocol table:
- * @cliexstart{show ip local}
- * Protocols handled by ip4_local
- * 1
- * 17
- * 47
- * @cliexend
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_ip_local, static) =
-{
-  .path = "show ip local",
-  .function = show_ip_local_command_fn,
-  .short_help = "show ip local",
-};
-/* *INDENT-ON* */
-
-always_inline uword
-ip4_arp_inline (vlib_main_t * vm,
-		vlib_node_runtime_t * node,
-		vlib_frame_t * frame, int is_glean)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip4_main_t *im = &ip4_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-  u32 *from, *to_next_drop;
-  uword n_left_from, n_left_to_next_drop, next_index;
-  static f64 time_last_seed_change = -1e100;
-  static u32 hash_seeds[3];
-  static uword hash_bitmap[256 / BITS (uword)];
-  f64 time_now;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
-
-  time_now = vlib_time_now (vm);
-  if (time_now - time_last_seed_change > 1e-3)
-    {
-      uword i;
-      u32 *r = clib_random_buffer_get_data (&vm->random_buffer,
-					    sizeof (hash_seeds));
-      for (i = 0; i < ARRAY_LEN (hash_seeds); i++)
-	hash_seeds[i] = r[i];
-
-      /* Mark all hash keys as been no-seen before. */
-      for (i = 0; i < ARRAY_LEN (hash_bitmap); i++)
-	hash_bitmap[i] = 0;
-
-      time_last_seed_change = time_now;
-    }
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  if (next_index == IP4_ARP_NEXT_DROP)
-    next_index = IP4_ARP_N_NEXT;	/* point to first interface */
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, IP4_ARP_NEXT_DROP,
-			   to_next_drop, n_left_to_next_drop);
-
-      while (n_left_from > 0 && n_left_to_next_drop > 0)
-	{
-	  u32 pi0, adj_index0, a0, b0, c0, m0, sw_if_index0, drop0;
-	  ip_adjacency_t *adj0;
-	  vlib_buffer_t *p0;
-	  ip4_header_t *ip0;
-	  uword bm0;
-
-	  pi0 = from[0];
-
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-	  adj0 = ip_get_adjacency (lm, adj_index0);
-	  ip0 = vlib_buffer_get_current (p0);
-
-	  a0 = hash_seeds[0];
-	  b0 = hash_seeds[1];
-	  c0 = hash_seeds[2];
-
-	  sw_if_index0 = adj0->rewrite_header.sw_if_index;
-	  vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0;
-
-	  if (is_glean)
-	    {
-	      /*
-	       * this is the Glean case, so we are ARPing for the
-	       * packet's destination
-	       */
-	      a0 ^= ip0->dst_address.data_u32;
-	    }
-	  else
-	    {
-	      a0 ^= adj0->sub_type.nbr.next_hop.ip4.data_u32;
-	    }
-	  b0 ^= sw_if_index0;
-
-	  hash_v3_finalize32 (a0, b0, c0);
-
-	  c0 &= BITS (hash_bitmap) - 1;
-	  c0 = c0 / BITS (uword);
-	  m0 = (uword) 1 << (c0 % BITS (uword));
-
-	  bm0 = hash_bitmap[c0];
-	  drop0 = (bm0 & m0) != 0;
-
-	  /* Mark it as seen. */
-	  hash_bitmap[c0] = bm0 | m0;
-
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next_drop[0] = pi0;
-	  to_next_drop += 1;
-	  n_left_to_next_drop -= 1;
-
-	  p0->error =
-	    node->errors[drop0 ? IP4_ARP_ERROR_DROP :
-			 IP4_ARP_ERROR_REQUEST_SENT];
-
-	  /*
-	   * the adj has been updated to a rewrite but the node the DPO that got
-	   * us here hasn't - yet. no big deal. we'll drop while we wait.
-	   */
-	  if (IP_LOOKUP_NEXT_REWRITE == adj0->lookup_next_index)
-	    continue;
-
-	  if (drop0)
-	    continue;
-
-	  /*
-	   * Can happen if the control-plane is programming tables
-	   * with traffic flowing; at least that's today's lame excuse.
-	   */
-	  if ((is_glean && adj0->lookup_next_index != IP_LOOKUP_NEXT_GLEAN) ||
-	      (!is_glean && adj0->lookup_next_index != IP_LOOKUP_NEXT_ARP))
-	    {
-	      p0->error = node->errors[IP4_ARP_ERROR_NON_ARP_ADJ];
-	    }
-	  else
-	    /* Send ARP request. */
-	    {
-	      u32 bi0 = 0;
-	      vlib_buffer_t *b0;
-	      ethernet_arp_header_t *h0;
-	      vnet_hw_interface_t *hw_if0;
-
-	      h0 =
-		vlib_packet_template_get_packet (vm,
-						 &im->ip4_arp_request_packet_template,
-						 &bi0);
-
-	      /* Add rewrite/encap string for ARP packet. */
-	      vnet_rewrite_one_header (adj0[0], h0,
-				       sizeof (ethernet_header_t));
-
-	      hw_if0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
-
-	      /* Src ethernet address in ARP header. */
-	      clib_memcpy (h0->ip4_over_ethernet[0].ethernet,
-			   hw_if0->hw_address,
-			   sizeof (h0->ip4_over_ethernet[0].ethernet));
-
-	      if (is_glean)
-		{
-		  /* The interface's source address is stashed in the Glean Adj */
-		  h0->ip4_over_ethernet[0].ip4 =
-		    adj0->sub_type.glean.receive_addr.ip4;
-
-		  /* Copy in destination address we are requesting. This is the
-		   * glean case, so it's the packet's destination.*/
-		  h0->ip4_over_ethernet[1].ip4.data_u32 =
-		    ip0->dst_address.data_u32;
-		}
-	      else
-		{
-		  /* Src IP address in ARP header. */
-		  if (ip4_src_address_for_packet (lm, sw_if_index0,
-						  &h0->
-						  ip4_over_ethernet[0].ip4))
-		    {
-		      /* No source address available */
-		      p0->error =
-			node->errors[IP4_ARP_ERROR_NO_SOURCE_ADDRESS];
-		      vlib_buffer_free (vm, &bi0, 1);
-		      continue;
-		    }
-
-		  /* Copy in destination address we are requesting from the
-		     incomplete adj */
-		  h0->ip4_over_ethernet[1].ip4.data_u32 =
-		    adj0->sub_type.nbr.next_hop.ip4.as_u32;
-		}
-
-	      vlib_buffer_copy_trace_flag (vm, p0, bi0);
-	      b0 = vlib_get_buffer (vm, bi0);
-	      vnet_buffer (b0)->sw_if_index[VLIB_TX] = sw_if_index0;
-
-	      vlib_buffer_advance (b0, -adj0->rewrite_header.data_bytes);
-
-	      vlib_set_next_frame_buffer (vm, node,
-					  adj0->rewrite_header.next_index,
-					  bi0);
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, IP4_ARP_NEXT_DROP, n_left_to_next_drop);
-    }
-
-  return frame->n_vectors;
-}
-
-static uword
-ip4_arp (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return (ip4_arp_inline (vm, node, frame, 0));
-}
-
-static uword
-ip4_glean (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return (ip4_arp_inline (vm, node, frame, 1));
-}
-
-static char *ip4_arp_error_strings[] = {
-  [IP4_ARP_ERROR_DROP] = "address overflow drops",
-  [IP4_ARP_ERROR_REQUEST_SENT] = "ARP requests sent",
-  [IP4_ARP_ERROR_NON_ARP_ADJ] = "ARPs to non-ARP adjacencies",
-  [IP4_ARP_ERROR_REPLICATE_DROP] = "ARP replication completed",
-  [IP4_ARP_ERROR_REPLICATE_FAIL] = "ARP replication failed",
-  [IP4_ARP_ERROR_NO_SOURCE_ADDRESS] = "no source address for ARP request",
-};
-
-VLIB_REGISTER_NODE (ip4_arp_node) =
-{
-  .function = ip4_arp,.name = "ip4-arp",.vector_size =
-    sizeof (u32),.format_trace = format_ip4_forward_next_trace,.n_errors =
-    ARRAY_LEN (ip4_arp_error_strings),.error_strings =
-    ip4_arp_error_strings,.n_next_nodes = IP4_ARP_N_NEXT,.next_nodes =
-  {
-  [IP4_ARP_NEXT_DROP] = "error-drop",}
-,};
-
-VLIB_REGISTER_NODE (ip4_glean_node) =
-{
-  .function = ip4_glean,.name = "ip4-glean",.vector_size =
-    sizeof (u32),.format_trace = format_ip4_forward_next_trace,.n_errors =
-    ARRAY_LEN (ip4_arp_error_strings),.error_strings =
-    ip4_arp_error_strings,.n_next_nodes = IP4_ARP_N_NEXT,.next_nodes =
-  {
-  [IP4_ARP_NEXT_DROP] = "error-drop",}
-,};
-
-#define foreach_notrace_ip4_arp_error           \
-_(DROP)                                         \
-_(REQUEST_SENT)                                 \
-_(REPLICATE_DROP)                               \
-_(REPLICATE_FAIL)
-
-clib_error_t *
-arp_notrace_init (vlib_main_t * vm)
-{
-  vlib_node_runtime_t *rt = vlib_node_get_runtime (vm, ip4_arp_node.index);
-
-  /* don't trace ARP request packets */
-#define _(a)                                    \
-    vnet_pcap_drop_trace_filter_add_del         \
-        (rt->errors[IP4_ARP_ERROR_##a],         \
-         1 /* is_add */);
-  foreach_notrace_ip4_arp_error;
-#undef _
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (arp_notrace_init);
-
-
-/* Send an ARP request to see if given destination is reachable on given interface. */
-clib_error_t *
-ip4_probe_neighbor (vlib_main_t * vm, ip4_address_t * dst, u32 sw_if_index)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip4_main_t *im = &ip4_main;
-  ethernet_arp_header_t *h;
-  ip4_address_t *src;
-  ip_interface_address_t *ia;
-  ip_adjacency_t *adj;
-  vnet_hw_interface_t *hi;
-  vnet_sw_interface_t *si;
-  vlib_buffer_t *b;
-  u32 bi = 0;
-
-  si = vnet_get_sw_interface (vnm, sw_if_index);
-
-  if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
-    {
-      return clib_error_return (0, "%U: interface %U down",
-				format_ip4_address, dst,
-				format_vnet_sw_if_index_name, vnm,
-				sw_if_index);
-    }
-
-  src =
-    ip4_interface_address_matching_destination (im, dst, sw_if_index, &ia);
-  if (!src)
-    {
-      vnm->api_errno = VNET_API_ERROR_NO_MATCHING_INTERFACE;
-      return clib_error_return
-	(0, "no matching interface address for destination %U (interface %U)",
-	 format_ip4_address, dst,
-	 format_vnet_sw_if_index_name, vnm, sw_if_index);
-    }
-
-  adj = ip_get_adjacency (&im->lookup_main, ia->neighbor_probe_adj_index);
-
-  h =
-    vlib_packet_template_get_packet (vm, &im->ip4_arp_request_packet_template,
-				     &bi);
-
-  hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
-
-  clib_memcpy (h->ip4_over_ethernet[0].ethernet, hi->hw_address,
-	       sizeof (h->ip4_over_ethernet[0].ethernet));
-
-  h->ip4_over_ethernet[0].ip4 = src[0];
-  h->ip4_over_ethernet[1].ip4 = dst[0];
-
-  b = vlib_get_buffer (vm, bi);
-  vnet_buffer (b)->sw_if_index[VLIB_RX] =
-    vnet_buffer (b)->sw_if_index[VLIB_TX] = sw_if_index;
-
-  /* Add encapsulation string for software interface (e.g. ethernet header). */
-  vnet_rewrite_one_header (adj[0], h, sizeof (ethernet_header_t));
-  vlib_buffer_advance (b, -adj->rewrite_header.data_bytes);
-
-  {
-    vlib_frame_t *f = vlib_get_frame_to_node (vm, hi->output_node_index);
-    u32 *to_next = vlib_frame_vector_args (f);
-    to_next[0] = bi;
-    f->n_vectors = 1;
-    vlib_put_frame_to_node (vm, hi->output_node_index, f);
-  }
-
-  return /* no error */ 0;
-}
-
-typedef enum
-{
-  IP4_REWRITE_NEXT_DROP,
-  IP4_REWRITE_NEXT_ICMP_ERROR,
-} ip4_rewrite_next_t;
-
-always_inline uword
-ip4_rewrite_inline (vlib_main_t * vm,
-		    vlib_node_runtime_t * node,
-		    vlib_frame_t * frame, int is_midchain)
-{
-  ip_lookup_main_t *lm = &ip4_main.lookup_main;
-  u32 *from = vlib_frame_vector_args (frame);
-  u32 n_left_from, n_left_to_next, *to_next, next_index;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip4_input_node.index);
-
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  u32 cpu_index = os_get_cpu_number ();
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  ip_adjacency_t *adj0, *adj1;
-	  vlib_buffer_t *p0, *p1;
-	  ip4_header_t *ip0, *ip1;
-	  u32 pi0, rw_len0, next0, error0, checksum0, adj_index0;
-	  u32 pi1, rw_len1, next1, error1, checksum1, adj_index1;
-	  u32 tx_sw_if_index0, tx_sw_if_index1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, STORE);
-	    vlib_prefetch_buffer_header (p3, STORE);
-
-	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), STORE);
-	    CLIB_PREFETCH (p3->data, sizeof (ip0[0]), STORE);
-	  }
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-
-	  adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-	  adj_index1 = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
-
-	  /* We should never rewrite a pkt using the MISS adjacency */
-	  ASSERT (adj_index0 && adj_index1);
-
-	  ip0 = vlib_buffer_get_current (p0);
-	  ip1 = vlib_buffer_get_current (p1);
-
-	  error0 = error1 = IP4_ERROR_NONE;
-	  next0 = next1 = IP4_REWRITE_NEXT_DROP;
-
-	  /* Decrement TTL & update checksum.
-	     Works either endian, so no need for byte swap. */
-	  if (PREDICT_TRUE (!(p0->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
-	    {
-	      i32 ttl0 = ip0->ttl;
-
-	      /* Input node should have reject packets with ttl 0. */
-	      ASSERT (ip0->ttl > 0);
-
-	      checksum0 = ip0->checksum + clib_host_to_net_u16 (0x0100);
-	      checksum0 += checksum0 >= 0xffff;
-
-	      ip0->checksum = checksum0;
-	      ttl0 -= 1;
-	      ip0->ttl = ttl0;
-
-	      /*
-	       * If the ttl drops below 1 when forwarding, generate
-	       * an ICMP response.
-	       */
-	      if (PREDICT_FALSE (ttl0 <= 0))
-		{
-		  error0 = IP4_ERROR_TIME_EXPIRED;
-		  vnet_buffer (p0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-		  icmp4_error_set_vnet_buffer (p0, ICMP4_time_exceeded,
-					       ICMP4_time_exceeded_ttl_exceeded_in_transit,
-					       0);
-		  next0 = IP4_REWRITE_NEXT_ICMP_ERROR;
-		}
-
-	      /* Verify checksum. */
-	      ASSERT (ip0->checksum == ip4_header_checksum (ip0));
-	    }
-	  else
-	    {
-	      p0->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
-	    }
-	  if (PREDICT_TRUE (!(p1->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
-	    {
-	      i32 ttl1 = ip1->ttl;
-
-	      /* Input node should have reject packets with ttl 0. */
-	      ASSERT (ip1->ttl > 0);
-
-	      checksum1 = ip1->checksum + clib_host_to_net_u16 (0x0100);
-	      checksum1 += checksum1 >= 0xffff;
-
-	      ip1->checksum = checksum1;
-	      ttl1 -= 1;
-	      ip1->ttl = ttl1;
-
-	      /*
-	       * If the ttl drops below 1 when forwarding, generate
-	       * an ICMP response.
-	       */
-	      if (PREDICT_FALSE (ttl1 <= 0))
-		{
-		  error1 = IP4_ERROR_TIME_EXPIRED;
-		  vnet_buffer (p1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-		  icmp4_error_set_vnet_buffer (p1, ICMP4_time_exceeded,
-					       ICMP4_time_exceeded_ttl_exceeded_in_transit,
-					       0);
-		  next1 = IP4_REWRITE_NEXT_ICMP_ERROR;
-		}
-
-	      /* Verify checksum. */
-	      ASSERT (ip0->checksum == ip4_header_checksum (ip0));
-	      ASSERT (ip1->checksum == ip4_header_checksum (ip1));
-	    }
-	  else
-	    {
-	      p1->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
-	    }
-
-	  /* Rewrite packet header and updates lengths. */
-	  adj0 = ip_get_adjacency (lm, adj_index0);
-	  adj1 = ip_get_adjacency (lm, adj_index1);
-
-	  /* Worth pipelining. No guarantee that adj0,1 are hot... */
-	  rw_len0 = adj0[0].rewrite_header.data_bytes;
-	  rw_len1 = adj1[0].rewrite_header.data_bytes;
-	  vnet_buffer (p0)->ip.save_rewrite_length = rw_len0;
-	  vnet_buffer (p1)->ip.save_rewrite_length = rw_len1;
-
-	  /* Check MTU of outgoing interface. */
-	  error0 =
-	    (vlib_buffer_length_in_chain (vm, p0) >
-	     adj0[0].
-	     rewrite_header.max_l3_packet_bytes ? IP4_ERROR_MTU_EXCEEDED :
-	     error0);
-	  error1 =
-	    (vlib_buffer_length_in_chain (vm, p1) >
-	     adj1[0].
-	     rewrite_header.max_l3_packet_bytes ? IP4_ERROR_MTU_EXCEEDED :
-	     error1);
-
-	  /*
-	   * We've already accounted for an ethernet_header_t elsewhere
-	   */
-	  if (PREDICT_FALSE (rw_len0 > sizeof (ethernet_header_t)))
-	    vlib_increment_combined_counter
-	      (&adjacency_counters, cpu_index, adj_index0,
-	       /* packet increment */ 0,
-	       /* byte increment */ rw_len0 - sizeof (ethernet_header_t));
-
-	  if (PREDICT_FALSE (rw_len1 > sizeof (ethernet_header_t)))
-	    vlib_increment_combined_counter
-	      (&adjacency_counters, cpu_index, adj_index1,
-	       /* packet increment */ 0,
-	       /* byte increment */ rw_len1 - sizeof (ethernet_header_t));
-
-	  /* Don't adjust the buffer for ttl issue; icmp-error node wants
-	   * to see the IP headerr */
-	  if (PREDICT_TRUE (error0 == IP4_ERROR_NONE))
-	    {
-	      next0 = adj0[0].rewrite_header.next_index;
-	      p0->current_data -= rw_len0;
-	      p0->current_length += rw_len0;
-	      tx_sw_if_index0 = adj0[0].rewrite_header.sw_if_index;
-	      vnet_buffer (p0)->sw_if_index[VLIB_TX] = tx_sw_if_index0;
-
-	      vnet_feature_arc_start (lm->output_feature_arc_index,
-				      tx_sw_if_index0, &next0, p0);
-	    }
-	  if (PREDICT_TRUE (error1 == IP4_ERROR_NONE))
-	    {
-	      next1 = adj1[0].rewrite_header.next_index;
-	      p1->current_data -= rw_len1;
-	      p1->current_length += rw_len1;
-
-	      tx_sw_if_index1 = adj1[0].rewrite_header.sw_if_index;
-	      vnet_buffer (p1)->sw_if_index[VLIB_TX] = tx_sw_if_index1;
-
-	      vnet_feature_arc_start (lm->output_feature_arc_index,
-				      tx_sw_if_index1, &next1, p1);
-	    }
-
-	  /* Guess we are only writing on simple Ethernet header. */
-	  vnet_rewrite_two_headers (adj0[0], adj1[0],
-				    ip0, ip1, sizeof (ethernet_header_t));
-
-	  if (is_midchain)
-	    {
-	      adj0->sub_type.midchain.fixup_func (vm, adj0, p0);
-	      adj1->sub_type.midchain.fixup_func (vm, adj1, p1);
-	    }
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, pi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  ip_adjacency_t *adj0;
-	  vlib_buffer_t *p0;
-	  ip4_header_t *ip0;
-	  u32 pi0, rw_len0, adj_index0, next0, error0, checksum0;
-	  u32 tx_sw_if_index0;
-
-	  pi0 = to_next[0] = from[0];
-
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-
-	  /* We should never rewrite a pkt using the MISS adjacency */
-	  ASSERT (adj_index0);
-
-	  adj0 = ip_get_adjacency (lm, adj_index0);
-
-	  ip0 = vlib_buffer_get_current (p0);
-
-	  error0 = IP4_ERROR_NONE;
-	  next0 = IP4_REWRITE_NEXT_DROP;	/* drop on error */
-
-	  /* Decrement TTL & update checksum. */
-	  if (PREDICT_TRUE (!(p0->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
-	    {
-	      i32 ttl0 = ip0->ttl;
-
-	      checksum0 = ip0->checksum + clib_host_to_net_u16 (0x0100);
-
-	      checksum0 += checksum0 >= 0xffff;
-
-	      ip0->checksum = checksum0;
-
-	      ASSERT (ip0->ttl > 0);
-
-	      ttl0 -= 1;
-
-	      ip0->ttl = ttl0;
-
-	      ASSERT (ip0->checksum == ip4_header_checksum (ip0));
-
-	      if (PREDICT_FALSE (ttl0 <= 0))
-		{
-		  /*
-		   * If the ttl drops below 1 when forwarding, generate
-		   * an ICMP response.
-		   */
-		  error0 = IP4_ERROR_TIME_EXPIRED;
-		  next0 = IP4_REWRITE_NEXT_ICMP_ERROR;
-		  vnet_buffer (p0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-		  icmp4_error_set_vnet_buffer (p0, ICMP4_time_exceeded,
-					       ICMP4_time_exceeded_ttl_exceeded_in_transit,
-					       0);
-		}
-	    }
-	  else
-	    {
-	      p0->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
-	    }
-
-	  /* Guess we are only writing on simple Ethernet header. */
-	  vnet_rewrite_one_header (adj0[0], ip0, sizeof (ethernet_header_t));
-
-	  /* Update packet buffer attributes/set output interface. */
-	  rw_len0 = adj0[0].rewrite_header.data_bytes;
-	  vnet_buffer (p0)->ip.save_rewrite_length = rw_len0;
-
-	  if (PREDICT_FALSE (rw_len0 > sizeof (ethernet_header_t)))
-	    vlib_increment_combined_counter
-	      (&adjacency_counters, cpu_index, adj_index0,
-	       /* packet increment */ 0,
-	       /* byte increment */ rw_len0 - sizeof (ethernet_header_t));
-
-	  /* Check MTU of outgoing interface. */
-	  error0 = (vlib_buffer_length_in_chain (vm, p0)
-		    > adj0[0].rewrite_header.max_l3_packet_bytes
-		    ? IP4_ERROR_MTU_EXCEEDED : error0);
-
-	  p0->error = error_node->errors[error0];
-
-	  /* Don't adjust the buffer for ttl issue; icmp-error node wants
-	   * to see the IP headerr */
-	  if (PREDICT_TRUE (error0 == IP4_ERROR_NONE))
-	    {
-	      p0->current_data -= rw_len0;
-	      p0->current_length += rw_len0;
-	      tx_sw_if_index0 = adj0[0].rewrite_header.sw_if_index;
-
-	      vnet_buffer (p0)->sw_if_index[VLIB_TX] = tx_sw_if_index0;
-	      next0 = adj0[0].rewrite_header.next_index;
-
-	      if (is_midchain)
-		{
-		  adj0->sub_type.midchain.fixup_func (vm, adj0, p0);
-		}
-
-	      vnet_feature_arc_start (lm->output_feature_arc_index,
-				      tx_sw_if_index0, &next0, p0);
-
-	    }
-
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  /* Need to do trace after rewrites to pick up new packet data. */
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
-
-  return frame->n_vectors;
-}
-
-
-/** @brief IPv4 rewrite node.
-    @node ip4-rewrite
-
-    This is the IPv4 transit-rewrite node: decrement TTL, fix the ipv4
-    header checksum, fetch the ip adjacency, check the outbound mtu,
-    apply the adjacency rewrite, and send pkts to the adjacency
-    rewrite header's rewrite_next_index.
-
-    @param vm vlib_main_t corresponding to the current thread
-    @param node vlib_node_runtime_t
-    @param frame vlib_frame_t whose contents should be dispatched
-
-    @par Graph mechanics: buffer metadata, next index usage
-
-    @em Uses:
-    - <code>vnet_buffer(b)->ip.adj_index[VLIB_TX]</code>
-        - the rewrite adjacency index
-    - <code>adj->lookup_next_index</code>
-        - Must be IP_LOOKUP_NEXT_REWRITE or IP_LOOKUP_NEXT_ARP, otherwise
-          the packet will be dropped.
-    - <code>adj->rewrite_header</code>
-        - Rewrite string length, rewrite string, next_index
-
-    @em Sets:
-    - <code>b->current_data, b->current_length</code>
-        - Updated net of applying the rewrite string
-
-    <em>Next Indices:</em>
-    - <code> adj->rewrite_header.next_index </code>
-      or @c error-drop
-*/
-static uword
-ip4_rewrite (vlib_main_t * vm,
-	     vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return ip4_rewrite_inline (vm, node, frame, 0);
-}
-
-static uword
-ip4_midchain (vlib_main_t * vm,
-	      vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return ip4_rewrite_inline (vm, node, frame, 1);
-}
-
-
-VLIB_REGISTER_NODE (ip4_rewrite_node) =
-{
-  .function = ip4_rewrite,.name = "ip4-rewrite",.vector_size =
-    sizeof (u32),.format_trace = format_ip4_rewrite_trace,.n_next_nodes =
-    2,.next_nodes =
-  {
-  [IP4_REWRITE_NEXT_DROP] = "error-drop",
-      [IP4_REWRITE_NEXT_ICMP_ERROR] = "ip4-icmp-error",}
-,};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_rewrite_node, ip4_rewrite);
-
-VLIB_REGISTER_NODE (ip4_midchain_node) =
-{
-.function = ip4_midchain,.name = "ip4-midchain",.vector_size =
-    sizeof (u32),.format_trace = format_ip4_forward_next_trace,.sibling_of =
-    "ip4-rewrite",};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_midchain_node, ip4_midchain);
-
-static clib_error_t *
-add_del_interface_table (vlib_main_t * vm,
-			 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index, table_id;
-
-  sw_if_index = ~0;
-
-  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  if (unformat (input, "%d", &table_id))
-    ;
-  else
-    {
-      error = clib_error_return (0, "expected table id `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  {
-    ip4_main_t *im = &ip4_main;
-    u32 fib_index;
-
-    fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4,
-						   table_id);
-
-    //
-    // FIXME-LATER
-    //  changing an interface's table has consequences for any connecteds
-    //  and adj-fibs already installed.
-    //
-    vec_validate (im->fib_index_by_sw_if_index, sw_if_index);
-    im->fib_index_by_sw_if_index[sw_if_index] = fib_index;
-  }
-
-done:
-  return error;
-}
-
-/*?
- * Place the indicated interface into the supplied IPv4 FIB table (also known
- * as a VRF). If the FIB table does not exist, this command creates it. To
- * display the current IPv4 FIB table, use the command '<em>show ip fib</em>'.
- * FIB table will only be displayed if a route has been added to the table, or
- * an IP Address is assigned to an interface in the table (which adds a route
- * automatically).
- *
- * @note IP addresses added after setting the interface IP table end up in
- * the indicated FIB table. If the IP address is added prior to adding the
- * interface to the FIB table, it will NOT be part of the FIB table. Predictable
- * but potentially counter-intuitive results occur if you provision interface
- * addresses in multiple FIBs. Upon RX, packets will be processed in the last
- * IP table ID provisioned. It might be marginally useful to evade source RPF
- * drops to put an interface address into multiple FIBs.
- *
- * @cliexpar
- * Example of how to add an interface to an IPv4 FIB table (where 2 is the table-id):
- * @cliexcmd{set interface ip table GigabitEthernet2/0/0 2}
- ?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_ip_table_command, static) =
-{
-  .path = "set interface ip table",
-  .function = add_del_interface_table,
-  .short_help = "set interface ip table <interface> <table-id>",
-};
-/* *INDENT-ON* */
-
-
-static uword
-ip4_lookup_multicast (vlib_main_t * vm,
-		      vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  ip4_main_t *im = &ip4_main;
-  vlib_combined_counter_main_t *cm = &load_balance_main.lbm_to_counters;
-  u32 n_left_from, n_left_to_next, *from, *to_next;
-  ip_lookup_next_t next;
-  u32 cpu_index = os_get_cpu_number ();
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  vlib_buffer_t *p0, *p1;
-	  u32 pi0, pi1, lb_index0, lb_index1, wrong_next;
-	  ip_lookup_next_t next0, next1;
-	  ip4_header_t *ip0, *ip1;
-	  u32 fib_index0, fib_index1;
-	  const dpo_id_t *dpo0, *dpo1;
-	  const load_balance_t *lb0, *lb1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), LOAD);
-	    CLIB_PREFETCH (p3->data, sizeof (ip0[0]), LOAD);
-	  }
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-
-	  ip0 = vlib_buffer_get_current (p0);
-	  ip1 = vlib_buffer_get_current (p1);
-
-	  fib_index0 =
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (p0)->sw_if_index[VLIB_RX]);
-	  fib_index1 =
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (p1)->sw_if_index[VLIB_RX]);
-	  fib_index0 =
-	    (vnet_buffer (p0)->sw_if_index[VLIB_TX] ==
-	     (u32) ~ 0) ? fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
-	  fib_index1 =
-	    (vnet_buffer (p1)->sw_if_index[VLIB_TX] ==
-	     (u32) ~ 0) ? fib_index1 : vnet_buffer (p1)->sw_if_index[VLIB_TX];
-
-	  lb_index0 = ip4_fib_table_lookup_lb (ip4_fib_get (fib_index0),
-					       &ip0->dst_address);
-	  lb_index1 = ip4_fib_table_lookup_lb (ip4_fib_get (fib_index1),
-					       &ip1->dst_address);
-
-	  lb0 = load_balance_get (lb_index0);
-	  lb1 = load_balance_get (lb_index1);
-
-	  ASSERT (lb0->lb_n_buckets > 0);
-	  ASSERT (is_pow2 (lb0->lb_n_buckets));
-	  ASSERT (lb1->lb_n_buckets > 0);
-	  ASSERT (is_pow2 (lb1->lb_n_buckets));
-
-	  vnet_buffer (p0)->ip.flow_hash = ip4_compute_flow_hash
-	    (ip0, lb0->lb_hash_config);
-
-	  vnet_buffer (p1)->ip.flow_hash = ip4_compute_flow_hash
-	    (ip1, lb1->lb_hash_config);
-
-	  dpo0 = load_balance_get_bucket_i (lb0,
-					    (vnet_buffer (p0)->ip.flow_hash &
-					     (lb0->lb_n_buckets_minus_1)));
-	  dpo1 = load_balance_get_bucket_i (lb1,
-					    (vnet_buffer (p1)->ip.flow_hash &
-					     (lb1->lb_n_buckets_minus_1)));
-
-	  next0 = dpo0->dpoi_next_node;
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-	  next1 = dpo1->dpoi_next_node;
-	  vnet_buffer (p1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
-
-	  if (1)		/* $$$$$$ HACK FIXME */
-	    vlib_increment_combined_counter
-	      (cm, cpu_index, lb_index0, 1,
-	       vlib_buffer_length_in_chain (vm, p0));
-	  if (1)		/* $$$$$$ HACK FIXME */
-	    vlib_increment_combined_counter
-	      (cm, cpu_index, lb_index1, 1,
-	       vlib_buffer_length_in_chain (vm, p1));
-
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  wrong_next = (next0 != next) + 2 * (next1 != next);
-	  if (PREDICT_FALSE (wrong_next != 0))
-	    {
-	      switch (wrong_next)
-		{
-		case 1:
-		  /* A B A */
-		  to_next[-2] = pi1;
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node, next0, pi0);
-		  break;
-
-		case 2:
-		  /* A A B */
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node, next1, pi1);
-		  break;
-
-		case 3:
-		  /* A B C */
-		  to_next -= 2;
-		  n_left_to_next += 2;
-		  vlib_set_next_frame_buffer (vm, node, next0, pi0);
-		  vlib_set_next_frame_buffer (vm, node, next1, pi1);
-		  if (next0 == next1)
-		    {
-		      /* A B B */
-		      vlib_put_next_frame (vm, node, next, n_left_to_next);
-		      next = next1;
-		      vlib_get_next_frame (vm, node, next, to_next,
-					   n_left_to_next);
-		    }
-		}
-	    }
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip4_header_t *ip0;
-	  u32 pi0, lb_index0;
-	  ip_lookup_next_t next0;
-	  u32 fib_index0;
-	  const dpo_id_t *dpo0;
-	  const load_balance_t *lb0;
-
-	  pi0 = from[0];
-	  to_next[0] = pi0;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  ip0 = vlib_buffer_get_current (p0);
-
-	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
-				vnet_buffer (p0)->sw_if_index[VLIB_RX]);
-	  fib_index0 = (vnet_buffer (p0)->sw_if_index[VLIB_TX] == (u32) ~ 0) ?
-	    fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
-
-	  lb_index0 = ip4_fib_table_lookup_lb (ip4_fib_get (fib_index0),
-					       &ip0->dst_address);
-
-	  lb0 = load_balance_get (lb_index0);
-
-	  ASSERT (lb0->lb_n_buckets > 0);
-	  ASSERT (is_pow2 (lb0->lb_n_buckets));
-
-	  vnet_buffer (p0)->ip.flow_hash = ip4_compute_flow_hash
-	    (ip0, lb0->lb_hash_config);
-
-	  dpo0 = load_balance_get_bucket_i (lb0,
-					    (vnet_buffer (p0)->ip.flow_hash &
-					     (lb0->lb_n_buckets_minus_1)));
-
-	  next0 = dpo0->dpoi_next_node;
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-
-	  if (1)		/* $$$$$$ HACK FIXME */
-	    vlib_increment_combined_counter
-	      (cm, cpu_index, lb_index0, 1,
-	       vlib_buffer_length_in_chain (vm, p0));
-
-	  from += 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  n_left_from -= 1;
-
-	  if (PREDICT_FALSE (next0 != next))
-	    {
-	      n_left_to_next += 1;
-	      vlib_put_next_frame (vm, node, next, n_left_to_next);
-	      next = next0;
-	      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
-	      to_next[0] = pi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next, n_left_to_next);
-    }
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
-
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (ip4_lookup_multicast_node, static) =
-{
-.function = ip4_lookup_multicast,.name =
-    "ip4-lookup-multicast",.vector_size = sizeof (u32),.sibling_of =
-    "ip4-lookup",.format_trace = format_ip4_lookup_trace,.n_next_nodes = 0,};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_lookup_multicast_node,
-			      ip4_lookup_multicast);
-
-VLIB_REGISTER_NODE (ip4_multicast_node, static) =
-{
-  .function = ip4_drop,.name = "ip4-multicast",.vector_size =
-    sizeof (u32),.format_trace = format_ip4_forward_next_trace,.n_next_nodes =
-    1,.next_nodes =
-  {
-  [0] = "error-drop",}
-,};
-
-int
-ip4_lookup_validate (ip4_address_t * a, u32 fib_index0)
-{
-  ip4_fib_mtrie_t *mtrie0;
-  ip4_fib_mtrie_leaf_t leaf0;
-  u32 lbi0;
-
-  mtrie0 = &ip4_fib_get (fib_index0)->mtrie;
-
-  leaf0 = IP4_FIB_MTRIE_LEAF_ROOT;
-  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, a, 0);
-  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, a, 1);
-  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, a, 2);
-  leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, a, 3);
-
-  /* Handle default route. */
-  leaf0 = (leaf0 == IP4_FIB_MTRIE_LEAF_EMPTY ? mtrie0->default_leaf : leaf0);
-
-  lbi0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
-
-  return lbi0 == ip4_fib_table_lookup_lb (ip4_fib_get (fib_index0), a);
-}
-
-static clib_error_t *
-test_lookup_command_fn (vlib_main_t * vm,
-			unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  ip4_fib_t *fib;
-  u32 table_id = 0;
-  f64 count = 1;
-  u32 n;
-  int i;
-  ip4_address_t ip4_base_address;
-  u64 errors = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "table %d", &table_id))
-	{
-	  /* Make sure the entry exists. */
-	  fib = ip4_fib_get (table_id);
-	  if ((fib) && (fib->index != table_id))
-	    return clib_error_return (0, "<fib-index> %d does not exist",
-				      table_id);
-	}
-      else if (unformat (input, "count %f", &count))
-	;
-
-      else if (unformat (input, "%U",
-			 unformat_ip4_address, &ip4_base_address))
-	;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-
-  n = count;
-
-  for (i = 0; i < n; i++)
-    {
-      if (!ip4_lookup_validate (&ip4_base_address, table_id))
-	errors++;
-
-      ip4_base_address.as_u32 =
-	clib_host_to_net_u32 (1 +
-			      clib_net_to_host_u32 (ip4_base_address.as_u32));
-    }
-
-  if (errors)
-    vlib_cli_output (vm, "%llu errors out of %d lookups\n", errors, n);
-  else
-    vlib_cli_output (vm, "No errors in %d lookups\n", n);
-
-  return 0;
-}
-
-/*?
- * Perform a lookup of an IPv4 Address (or range of addresses) in the
- * given FIB table to determine if there is a conflict with the
- * adjacency table. The fib-id can be determined by using the
- * '<em>show ip fib</em>' command. If fib-id is not entered, default value
- * of 0 is used.
- *
- * @todo This command uses fib-id, other commands use table-id (not
- * just a name, they are different indexes). Would like to change this
- * to table-id for consistency.
- *
- * @cliexpar
- * Example of how to run the test lookup command:
- * @cliexstart{test lookup 172.16.1.1 table 1 count 2}
- * No errors in 2 lookups
- * @cliexend
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lookup_test_command, static) =
-{
-  .path = "test lookup",
-  .short_help = "test lookup <ipv4-addr> [table <fib-id>] [count <nn>]",
-  .function = test_lookup_command_fn,
-};
-/* *INDENT-ON* */
-
-int
-vnet_set_ip4_flow_hash (u32 table_id, u32 flow_hash_config)
-{
-  ip4_main_t *im4 = &ip4_main;
-  ip4_fib_t *fib;
-  uword *p = hash_get (im4->fib_index_by_table_id, table_id);
-
-  if (p == 0)
-    return VNET_API_ERROR_NO_SUCH_FIB;
-
-  fib = ip4_fib_get (p[0]);
-
-  fib->flow_hash_config = flow_hash_config;
-  return 0;
-}
-
-static clib_error_t *
-set_ip_flow_hash_command_fn (vlib_main_t * vm,
-			     unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  int matched = 0;
-  u32 table_id = 0;
-  u32 flow_hash_config = 0;
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "table %d", &table_id))
-	matched = 1;
-#define _(a,v) \
-    else if (unformat (input, #a)) { flow_hash_config |= v; matched=1;}
-      foreach_flow_hash_bit
-#undef _
-	else
-	break;
-    }
-
-  if (matched == 0)
-    return clib_error_return (0, "unknown input `%U'",
-			      format_unformat_error, input);
-
-  rv = vnet_set_ip4_flow_hash (table_id, flow_hash_config);
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case VNET_API_ERROR_NO_SUCH_FIB:
-      return clib_error_return (0, "no such FIB table %d", table_id);
-
-    default:
-      clib_warning ("BUG: illegal flow hash config 0x%x", flow_hash_config);
-      break;
-    }
-
-  return 0;
-}
-
-/*?
- * Configure the set of IPv4 fields used by the flow hash.
- *
- * @cliexpar
- * Example of how to set the flow hash on a given table:
- * @cliexcmd{set ip flow-hash table 7 dst sport dport proto}
- * Example of display the configured flow hash:
- * @cliexstart{show ip fib}
- * ipv4-VRF:0, fib_index 0, flow hash: src dst sport dport proto
- * 0.0.0.0/0
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:0 buckets:1 uRPF:0 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 0.0.0.0/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:1 buckets:1 uRPF:1 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 224.0.0.0/8
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:3 buckets:1 uRPF:3 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 6.0.1.2/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:30 buckets:1 uRPF:29 to:[0:0]]
- *     [0] [@3]: arp-ipv4: via 6.0.0.1 af_packet0
- * 7.0.0.1/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:31 buckets:4 uRPF:30 to:[0:0]]
- *     [0] [@3]: arp-ipv4: via 6.0.0.2 af_packet0
- *     [1] [@3]: arp-ipv4: via 6.0.0.2 af_packet0
- *     [2] [@3]: arp-ipv4: via 6.0.0.2 af_packet0
- *     [3] [@3]: arp-ipv4: via 6.0.0.1 af_packet0
- * 240.0.0.0/8
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:2 buckets:1 uRPF:2 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 255.255.255.255/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:4 buckets:1 uRPF:4 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * ipv4-VRF:7, fib_index 1, flow hash: dst sport dport proto
- * 0.0.0.0/0
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:12 buckets:1 uRPF:11 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 0.0.0.0/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:13 buckets:1 uRPF:12 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 172.16.1.0/24
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:17 buckets:1 uRPF:16 to:[0:0]]
- *     [0] [@4]: ipv4-glean: af_packet0
- * 172.16.1.1/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:18 buckets:1 uRPF:17 to:[1:84]]
- *     [0] [@2]: dpo-receive: 172.16.1.1 on af_packet0
- * 172.16.1.2/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:21 buckets:1 uRPF:20 to:[0:0]]
- *     [0] [@5]: ipv4 via 172.16.1.2 af_packet0: IP4: 02:fe:9e:70:7a:2b -> 26:a5:f6:9c:3a:36
- * 172.16.2.0/24
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:19 buckets:1 uRPF:18 to:[0:0]]
- *     [0] [@4]: ipv4-glean: af_packet1
- * 172.16.2.1/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:20 buckets:1 uRPF:19 to:[0:0]]
- *     [0] [@2]: dpo-receive: 172.16.2.1 on af_packet1
- * 224.0.0.0/8
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:15 buckets:1 uRPF:14 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 240.0.0.0/8
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:14 buckets:1 uRPF:13 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * 255.255.255.255/32
- *   unicast-ip4-chain
- *   [@0]: dpo-load-balance: [index:16 buckets:1 uRPF:15 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * @cliexend
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_ip_flow_hash_command, static) =
-{
-  .path = "set ip flow-hash",
-  .short_help =
-  "set ip flow-hash table <table-id> [src] [dst] [sport] [dport] [proto] [reverse]",
-  .function = set_ip_flow_hash_command_fn,
-};
-/* *INDENT-ON* */
-
-int
-vnet_set_ip4_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
-			     u32 table_index)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  ip4_main_t *ipm = &ip4_main;
-  ip_lookup_main_t *lm = &ipm->lookup_main;
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  ip4_address_t *if_addr;
-
-  if (pool_is_free_index (im->sw_interfaces, sw_if_index))
-    return VNET_API_ERROR_NO_MATCHING_INTERFACE;
-
-  if (table_index != ~0 && pool_is_free_index (cm->tables, table_index))
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-  vec_validate (lm->classify_table_index_by_sw_if_index, sw_if_index);
-  lm->classify_table_index_by_sw_if_index[sw_if_index] = table_index;
-
-  if_addr = ip4_interface_first_address (ipm, sw_if_index, NULL);
-
-  if (NULL != if_addr)
-    {
-      fib_prefix_t pfx = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr.ip4 = *if_addr,
-      };
-      u32 fib_index;
-
-      fib_index = fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4,
-						       sw_if_index);
-
-
-      if (table_index != (u32) ~ 0)
-	{
-	  dpo_id_t dpo = DPO_INVALID;
-
-	  dpo_set (&dpo,
-		   DPO_CLASSIFY,
-		   DPO_PROTO_IP4,
-		   classify_dpo_create (DPO_PROTO_IP4, table_index));
-
-	  fib_table_entry_special_dpo_add (fib_index,
-					   &pfx,
-					   FIB_SOURCE_CLASSIFY,
-					   FIB_ENTRY_FLAG_NONE, &dpo);
-	  dpo_reset (&dpo);
-	}
-      else
-	{
-	  fib_table_entry_special_remove (fib_index,
-					  &pfx, FIB_SOURCE_CLASSIFY);
-	}
-    }
-
-  return 0;
-}
-
-static clib_error_t *
-set_ip_classify_command_fn (vlib_main_t * vm,
-			    unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-  u32 table_index = ~0;
-  int table_index_set = 0;
-  u32 sw_if_index = ~0;
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "table-index %d", &table_index))
-	table_index_set = 1;
-      else if (unformat (input, "intfc %U", unformat_vnet_sw_interface,
-			 vnet_get_main (), &sw_if_index))
-	;
-      else
-	break;
-    }
-
-  if (table_index_set == 0)
-    return clib_error_return (0, "classify table-index must be specified");
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "interface / subif must be specified");
-
-  rv = vnet_set_ip4_classify_intfc (vm, sw_if_index, table_index);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case VNET_API_ERROR_NO_MATCHING_INTERFACE:
-      return clib_error_return (0, "No such interface");
-
-    case VNET_API_ERROR_NO_SUCH_ENTRY:
-      return clib_error_return (0, "No such classifier table");
-    }
-  return 0;
-}
-
-/*?
- * Assign a classification table to an interface. The classification
- * table is created using the '<em>classify table</em>' and '<em>classify session</em>'
- * commands. Once the table is create, use this command to filter packets
- * on an interface.
- *
- * @cliexpar
- * Example of how to assign a classification table to an interface:
- * @cliexcmd{set ip classify intfc GigabitEthernet2/0/0 table-index 1}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_ip_classify_command, static) =
-{
-    .path = "set ip classify",
-    .short_help =
-    "set ip classify intfc <interface> table-index <classify-idx>",
-    .function = set_ip_classify_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip4_input.c b/vnet/vnet/ip/ip4_input.c
deleted file mode 100644
index 1cf5e0b8..00000000
--- a/vnet/vnet/ip/ip4_input.c
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip4_input.c: IP v4 input node
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ppp/ppp.h>
-#include <vnet/hdlc/hdlc.h>
-
-typedef struct
-{
-  u8 packet_data[64];
-} ip4_input_trace_t;
-
-static u8 *
-format_ip4_input_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  ip4_input_trace_t *t = va_arg (*va, ip4_input_trace_t *);
-
-  s = format (s, "%U",
-	      format_ip4_header, t->packet_data, sizeof (t->packet_data));
-
-  return s;
-}
-
-typedef enum
-{
-  IP4_INPUT_NEXT_DROP,
-  IP4_INPUT_NEXT_PUNT,
-  IP4_INPUT_NEXT_LOOKUP,
-  IP4_INPUT_NEXT_LOOKUP_MULTICAST,
-  IP4_INPUT_NEXT_ICMP_ERROR,
-  IP4_INPUT_N_NEXT,
-} ip4_input_next_t;
-
-/* Validate IP v4 packets and pass them either to forwarding code
-   or drop/punt exception packets. */
-always_inline uword
-ip4_input_inline (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * frame, int verify_checksum)
-{
-  ip4_main_t *im = &ip4_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  ip_lookup_main_t *lm = &im->lookup_main;
-  u32 n_left_from, *from, *to_next;
-  ip4_input_next_t next_index;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip4_input_node.index);
-  vlib_simple_counter_main_t *cm;
-  u32 cpu_index = os_get_cpu_number ();
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-				   /* stride */ 1,
-				   sizeof (ip4_input_trace_t));
-
-  cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
-			 VNET_INTERFACE_COUNTER_IP4);
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  vlib_buffer_t *p0, *p1;
-	  ip4_header_t *ip0, *ip1;
-	  u32 sw_if_index0, pi0, ip_len0, cur_len0, next0;
-	  u32 sw_if_index1, pi1, ip_len1, cur_len1, next1;
-	  i32 len_diff0, len_diff1;
-	  u8 error0, error1, arc0, arc1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), LOAD);
-	    CLIB_PREFETCH (p3->data, sizeof (ip1[0]), LOAD);
-	  }
-
-	  to_next[0] = pi0 = from[0];
-	  to_next[1] = pi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-
-	  ip0 = vlib_buffer_get_current (p0);
-	  ip1 = vlib_buffer_get_current (p1);
-
-	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
-	  sw_if_index1 = vnet_buffer (p1)->sw_if_index[VLIB_RX];
-
-	  error0 = error1 = IP4_ERROR_NONE;
-
-	  if (PREDICT_FALSE (ip4_address_is_multicast (&ip0->dst_address)))
-	    {
-	      arc0 = lm->mcast_feature_arc_index;
-	      next0 = IP4_INPUT_NEXT_LOOKUP_MULTICAST;
-	    }
-	  else
-	    {
-	      arc0 = lm->ucast_feature_arc_index;
-	      next0 = IP4_INPUT_NEXT_LOOKUP;
-	      if (PREDICT_FALSE (ip0->ttl < 1))
-		error0 = IP4_ERROR_TIME_EXPIRED;
-	    }
-
-	  if (PREDICT_FALSE (ip4_address_is_multicast (&ip1->dst_address)))
-	    {
-	      arc1 = lm->mcast_feature_arc_index;
-	      next1 = IP4_INPUT_NEXT_LOOKUP_MULTICAST;
-	    }
-	  else
-	    {
-	      arc1 = lm->ucast_feature_arc_index;
-	      next1 = IP4_INPUT_NEXT_LOOKUP;
-	      if (PREDICT_FALSE (ip1->ttl < 1))
-		error1 = IP4_ERROR_TIME_EXPIRED;
-	    }
-
-	  vnet_buffer (p0)->ip.adj_index[VLIB_RX] = ~0;
-	  vnet_buffer (p1)->ip.adj_index[VLIB_RX] = ~0;
-
-	  vnet_feature_arc_start (arc0, sw_if_index0, &next0, p0);
-	  vnet_feature_arc_start (arc1, sw_if_index1, &next1, p1);
-
-	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
-	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index1, 1);
-
-	  /* Punt packets with options or wrong version. */
-	  if (PREDICT_FALSE (ip0->ip_version_and_header_length != 0x45))
-	    error0 = (ip0->ip_version_and_header_length & 0xf) != 5 ?
-	      IP4_ERROR_OPTIONS : IP4_ERROR_VERSION;
-
-	  if (PREDICT_FALSE (ip1->ip_version_and_header_length != 0x45))
-	    error1 = (ip1->ip_version_and_header_length & 0xf) != 5 ?
-	      IP4_ERROR_OPTIONS : IP4_ERROR_VERSION;
-
-	  /* Verify header checksum. */
-	  if (verify_checksum)
-	    {
-	      ip_csum_t sum0, sum1;
-
-	      ip4_partial_header_checksum_x1 (ip0, sum0);
-	      ip4_partial_header_checksum_x1 (ip1, sum1);
-
-	      error0 = 0xffff != ip_csum_fold (sum0) ?
-		IP4_ERROR_BAD_CHECKSUM : error0;
-	      error1 = 0xffff != ip_csum_fold (sum1) ?
-		IP4_ERROR_BAD_CHECKSUM : error1;
-	    }
-
-	  /* Drop fragmentation offset 1 packets. */
-	  error0 = ip4_get_fragment_offset (ip0) == 1 ?
-	    IP4_ERROR_FRAGMENT_OFFSET_ONE : error0;
-	  error1 = ip4_get_fragment_offset (ip1) == 1 ?
-	    IP4_ERROR_FRAGMENT_OFFSET_ONE : error1;
-
-	  /* Verify lengths. */
-	  ip_len0 = clib_net_to_host_u16 (ip0->length);
-	  ip_len1 = clib_net_to_host_u16 (ip1->length);
-
-	  /* IP length must be at least minimal IP header. */
-	  error0 = ip_len0 < sizeof (ip0[0]) ? IP4_ERROR_TOO_SHORT : error0;
-	  error1 = ip_len1 < sizeof (ip1[0]) ? IP4_ERROR_TOO_SHORT : error1;
-
-	  cur_len0 = vlib_buffer_length_in_chain (vm, p0);
-	  cur_len1 = vlib_buffer_length_in_chain (vm, p1);
-
-	  len_diff0 = cur_len0 - ip_len0;
-	  len_diff1 = cur_len1 - ip_len1;
-
-	  error0 = len_diff0 < 0 ? IP4_ERROR_BAD_LENGTH : error0;
-	  error1 = len_diff1 < 0 ? IP4_ERROR_BAD_LENGTH : error1;
-
-	  p0->error = error_node->errors[error0];
-	  p1->error = error_node->errors[error1];
-
-	  if (PREDICT_FALSE (error0 != IP4_ERROR_NONE))
-	    {
-	      if (error0 == IP4_ERROR_TIME_EXPIRED)
-		{
-		  icmp4_error_set_vnet_buffer (p0, ICMP4_time_exceeded,
-					       ICMP4_time_exceeded_ttl_exceeded_in_transit,
-					       0);
-		  next0 = IP4_INPUT_NEXT_ICMP_ERROR;
-		}
-	      else
-		next0 = error0 != IP4_ERROR_OPTIONS ?
-		  IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
-	    }
-	  if (PREDICT_FALSE (error1 != IP4_ERROR_NONE))
-	    {
-	      if (error1 == IP4_ERROR_TIME_EXPIRED)
-		{
-		  icmp4_error_set_vnet_buffer (p1, ICMP4_time_exceeded,
-					       ICMP4_time_exceeded_ttl_exceeded_in_transit,
-					       0);
-		  next1 = IP4_INPUT_NEXT_ICMP_ERROR;
-		}
-	      else
-		next1 = error1 != IP4_ERROR_OPTIONS ?
-		  IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
-	    }
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, pi1, next0, next1);
-	}
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip4_header_t *ip0;
-	  u32 sw_if_index0, pi0, ip_len0, cur_len0, next0;
-	  i32 len_diff0;
-	  u8 error0, arc0;
-
-	  pi0 = from[0];
-	  to_next[0] = pi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip0 = vlib_buffer_get_current (p0);
-
-	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
-
-	  error0 = IP4_ERROR_NONE;
-
-	  if (PREDICT_FALSE (ip4_address_is_multicast (&ip0->dst_address)))
-	    {
-	      arc0 = lm->mcast_feature_arc_index;
-	      next0 = IP4_INPUT_NEXT_LOOKUP_MULTICAST;
-	    }
-	  else
-	    {
-	      arc0 = lm->ucast_feature_arc_index;
-	      next0 = IP4_INPUT_NEXT_LOOKUP;
-	      if (PREDICT_FALSE (ip0->ttl < 1))
-		error0 = IP4_ERROR_TIME_EXPIRED;
-	    }
-
-	  vnet_buffer (p0)->ip.adj_index[VLIB_RX] = ~0;
-	  vnet_feature_arc_start (arc0, sw_if_index0, &next0, p0);
-
-	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
-
-	  /* Punt packets with options or wrong version. */
-	  if (PREDICT_FALSE (ip0->ip_version_and_header_length != 0x45))
-	    error0 = (ip0->ip_version_and_header_length & 0xf) != 5 ?
-	      IP4_ERROR_OPTIONS : IP4_ERROR_VERSION;
-
-	  /* Verify header checksum. */
-	  if (verify_checksum)
-	    {
-	      ip_csum_t sum0;
-
-	      ip4_partial_header_checksum_x1 (ip0, sum0);
-	      error0 =
-		0xffff !=
-		ip_csum_fold (sum0) ? IP4_ERROR_BAD_CHECKSUM : error0;
-	    }
-
-	  /* Drop fragmentation offset 1 packets. */
-	  error0 =
-	    ip4_get_fragment_offset (ip0) ==
-	    1 ? IP4_ERROR_FRAGMENT_OFFSET_ONE : error0;
-
-	  /* Verify lengths. */
-	  ip_len0 = clib_net_to_host_u16 (ip0->length);
-
-	  /* IP length must be at least minimal IP header. */
-	  error0 = ip_len0 < sizeof (ip0[0]) ? IP4_ERROR_TOO_SHORT : error0;
-
-	  cur_len0 = vlib_buffer_length_in_chain (vm, p0);
-	  len_diff0 = cur_len0 - ip_len0;
-	  error0 = len_diff0 < 0 ? IP4_ERROR_BAD_LENGTH : error0;
-
-	  p0->error = error_node->errors[error0];
-	  if (PREDICT_FALSE (error0 != IP4_ERROR_NONE))
-	    {
-	      if (error0 == IP4_ERROR_TIME_EXPIRED)
-		{
-		  icmp4_error_set_vnet_buffer (p0, ICMP4_time_exceeded,
-					       ICMP4_time_exceeded_ttl_exceeded_in_transit,
-					       0);
-		  next0 = IP4_INPUT_NEXT_ICMP_ERROR;
-		}
-	      else
-		next0 = error0 != IP4_ERROR_OPTIONS ?
-		  IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/** \brief IPv4 input node.
-    @node ip4-input
-
-    This is the IPv4 input node: validates ip4 header checksums,
-    verifies ip header lengths, discards pkts with expired TTLs,
-    and sends pkts to the set of ip feature nodes configured on
-    the rx interface.
-
-    @param vm vlib_main_t corresponding to the current thread
-    @param node vlib_node_runtime_t
-    @param frame vlib_frame_t whose contents should be dispatched
-
-    @par Graph mechanics: buffer metadata, next index usage
-
-    @em Uses:
-    - vnet_feature_config_main_t cm corresponding to each pkt's dst address unicast /
-      multicast status.
-    - <code>b->current_config_index</code> corresponding to each pkt's
-      rx sw_if_index.
-         - This sets the per-packet graph trajectory, ensuring that
-           each packet visits the per-interface features in order.
-
-    - <code>vnet_buffer(b)->sw_if_index[VLIB_RX]</code>
-        - Indicates the @c sw_if_index value of the interface that the
-	  packet was received on.
-
-    @em Sets:
-    - <code>vnet_buffer(b)->ip.adj_index[VLIB_TX]</code>
-        - The lookup result adjacency index.
-
-    <em>Next Indices:</em>
-    - Dispatches pkts to the (first) feature node:
-      <code> vnet_get_config_data (... &next0 ...); </code>
-      or @c error-drop
-*/
-static uword
-ip4_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return ip4_input_inline (vm, node, frame, /* verify_checksum */ 1);
-}
-
-static uword
-ip4_input_no_checksum (vlib_main_t * vm,
-		       vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return ip4_input_inline (vm, node, frame, /* verify_checksum */ 0);
-}
-
-static char *ip4_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ip4_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_input_node) = {
-  .function = ip4_input,
-  .name = "ip4-input",
-  .vector_size = sizeof (u32),
-
-  .n_errors = IP4_N_ERROR,
-  .error_strings = ip4_error_strings,
-
-  .n_next_nodes = IP4_INPUT_N_NEXT,
-  .next_nodes = {
-    [IP4_INPUT_NEXT_DROP] = "error-drop",
-    [IP4_INPUT_NEXT_PUNT] = "error-punt",
-    [IP4_INPUT_NEXT_LOOKUP] = "ip4-lookup",
-    [IP4_INPUT_NEXT_LOOKUP_MULTICAST] = "ip4-lookup-multicast",
-    [IP4_INPUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-  },
-
-  .format_buffer = format_ip4_header,
-  .format_trace = format_ip4_input_trace,
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_input_node, ip4_input);
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_input_no_checksum_node,static) = {
-  .function = ip4_input_no_checksum,
-  .name = "ip4-input-no-checksum",
-  .vector_size = sizeof (u32),
-
-  .n_next_nodes = IP4_INPUT_N_NEXT,
-  .next_nodes = {
-    [IP4_INPUT_NEXT_DROP] = "error-drop",
-    [IP4_INPUT_NEXT_PUNT] = "error-punt",
-    [IP4_INPUT_NEXT_LOOKUP] = "ip4-lookup",
-    [IP4_INPUT_NEXT_LOOKUP_MULTICAST] = "ip4-lookup-multicast",
-    [IP4_INPUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-  },
-
-  .format_buffer = format_ip4_header,
-  .format_trace = format_ip4_input_trace,
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_input_no_checksum_node,
-			      ip4_input_no_checksum);
-
-static clib_error_t *
-ip4_init (vlib_main_t * vm)
-{
-  clib_error_t *error;
-
-  ethernet_register_input_type (vm, ETHERNET_TYPE_IP4, ip4_input_node.index);
-  ppp_register_input_protocol (vm, PPP_PROTOCOL_ip4, ip4_input_node.index);
-  hdlc_register_input_protocol (vm, HDLC_PROTOCOL_ip4, ip4_input_node.index);
-
-  {
-    pg_node_t *pn;
-    pn = pg_get_node (ip4_input_node.index);
-    pn->unformat_edit = unformat_pg_ip4_header;
-    pn = pg_get_node (ip4_input_no_checksum_node.index);
-    pn->unformat_edit = unformat_pg_ip4_header;
-  }
-
-  if ((error = vlib_call_init_function (vm, ip4_cli_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip4_source_check_init)))
-    return error;
-
-  if ((error = vlib_call_init_function
-       (vm, ip4_source_and_port_range_check_init)))
-    return error;
-
-  /* Set flow hash to something non-zero. */
-  ip4_main.flow_hash_seed = 0xdeadbeef;
-
-  /* Default TTL for packets we generate. */
-  ip4_main.host_config.ttl = 64;
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (ip4_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip4_mtrie.c b/vnet/vnet/ip/ip4_mtrie.c
deleted file mode 100644
index 6e3d0e80..00000000
--- a/vnet/vnet/ip/ip4_mtrie.c
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip4_fib.h: ip4 mtrie fib
- *
- * Copyright (c) 2012 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-#include <vnet/fib/fib_entry.h>
-
-static void
-ply_init (ip4_fib_mtrie_ply_t * p, ip4_fib_mtrie_leaf_t init,
-	  uword prefix_len)
-{
-  p->n_non_empty_leafs =
-    ip4_fib_mtrie_leaf_is_empty (init) ? 0 : ARRAY_LEN (p->leaves);
-  memset (p->dst_address_bits_of_leaves, prefix_len,
-	  sizeof (p->dst_address_bits_of_leaves));
-
-  /* Initialize leaves. */
-#ifdef CLIB_HAVE_VEC128
-  {
-    u32x4 *l, init_x4;
-
-#ifndef __ALTIVEC__
-    init_x4 = u32x4_splat (init);
-#else
-    {
-      u32x4_union_t y;
-      y.as_u32[0] = init;
-      y.as_u32[1] = init;
-      y.as_u32[2] = init;
-      y.as_u32[3] = init;
-      init_x4 = y.as_u32x4;
-    }
-#endif
-
-    for (l = p->leaves_as_u32x4;
-	 l < p->leaves_as_u32x4 + ARRAY_LEN (p->leaves_as_u32x4); l += 4)
-      {
-	l[0] = init_x4;
-	l[1] = init_x4;
-	l[2] = init_x4;
-	l[3] = init_x4;
-      }
-  }
-#else
-  {
-    u32 *l;
-
-    for (l = p->leaves; l < p->leaves + ARRAY_LEN (p->leaves); l += 4)
-      {
-	l[0] = init;
-	l[1] = init;
-	l[2] = init;
-	l[3] = init;
-      }
-  }
-#endif
-}
-
-static ip4_fib_mtrie_leaf_t
-ply_create (ip4_fib_mtrie_t * m, ip4_fib_mtrie_leaf_t init_leaf,
-	    uword prefix_len)
-{
-  ip4_fib_mtrie_ply_t *p;
-
-  /* Get cache aligned ply. */
-  pool_get_aligned (m->ply_pool, p, sizeof (p[0]));
-
-  ply_init (p, init_leaf, prefix_len);
-  return ip4_fib_mtrie_leaf_set_next_ply_index (p - m->ply_pool);
-}
-
-always_inline ip4_fib_mtrie_ply_t *
-get_next_ply_for_leaf (ip4_fib_mtrie_t * m, ip4_fib_mtrie_leaf_t l)
-{
-  uword n = ip4_fib_mtrie_leaf_get_next_ply_index (l);
-  /* It better not be the root ply. */
-  ASSERT (n != 0);
-  return pool_elt_at_index (m->ply_pool, n);
-}
-
-static void
-ply_free (ip4_fib_mtrie_t * m, ip4_fib_mtrie_ply_t * p)
-{
-  uword i, is_root;
-
-  is_root = p - m->ply_pool == 0;
-
-  for (i = 0; i < ARRAY_LEN (p->leaves); i++)
-    {
-      ip4_fib_mtrie_leaf_t l = p->leaves[i];
-      if (ip4_fib_mtrie_leaf_is_next_ply (l))
-	ply_free (m, get_next_ply_for_leaf (m, l));
-    }
-
-  if (is_root)
-    ply_init (p, IP4_FIB_MTRIE_LEAF_EMPTY, /* prefix_len */ 0);
-  else
-    pool_put (m->ply_pool, p);
-}
-
-void
-ip4_fib_free (ip4_fib_mtrie_t * m)
-{
-  ip4_fib_mtrie_ply_t *root_ply = pool_elt_at_index (m->ply_pool, 0);
-  ply_free (m, root_ply);
-}
-
-u32
-ip4_mtrie_lookup_address (ip4_fib_mtrie_t * m, ip4_address_t dst)
-{
-  ip4_fib_mtrie_ply_t *p = pool_elt_at_index (m->ply_pool, 0);
-  ip4_fib_mtrie_leaf_t l;
-
-  l = p->leaves[dst.as_u8[0]];
-  if (ip4_fib_mtrie_leaf_is_terminal (l))
-    return ip4_fib_mtrie_leaf_get_adj_index (l);
-
-  p = get_next_ply_for_leaf (m, l);
-  l = p->leaves[dst.as_u8[1]];
-  if (ip4_fib_mtrie_leaf_is_terminal (l))
-    return ip4_fib_mtrie_leaf_get_adj_index (l);
-
-  p = get_next_ply_for_leaf (m, l);
-  l = p->leaves[dst.as_u8[2]];
-  if (ip4_fib_mtrie_leaf_is_terminal (l))
-    return ip4_fib_mtrie_leaf_get_adj_index (l);
-
-  p = get_next_ply_for_leaf (m, l);
-  l = p->leaves[dst.as_u8[3]];
-
-  ASSERT (ip4_fib_mtrie_leaf_is_terminal (l));
-  return ip4_fib_mtrie_leaf_get_adj_index (l);
-}
-
-typedef struct
-{
-  ip4_address_t dst_address;
-  u32 dst_address_length;
-  u32 adj_index;
-} ip4_fib_mtrie_set_unset_leaf_args_t;
-
-static void
-set_ply_with_more_specific_leaf (ip4_fib_mtrie_t * m,
-				 ip4_fib_mtrie_ply_t * ply,
-				 ip4_fib_mtrie_leaf_t new_leaf,
-				 uword new_leaf_dst_address_bits)
-{
-  ip4_fib_mtrie_leaf_t old_leaf;
-  uword i;
-
-  ASSERT (ip4_fib_mtrie_leaf_is_terminal (new_leaf));
-  ASSERT (!ip4_fib_mtrie_leaf_is_empty (new_leaf));
-
-  for (i = 0; i < ARRAY_LEN (ply->leaves); i++)
-    {
-      old_leaf = ply->leaves[i];
-
-      /* Recurse into sub plies. */
-      if (!ip4_fib_mtrie_leaf_is_terminal (old_leaf))
-	{
-	  ip4_fib_mtrie_ply_t *sub_ply = get_next_ply_for_leaf (m, old_leaf);
-	  set_ply_with_more_specific_leaf (m, sub_ply, new_leaf,
-					   new_leaf_dst_address_bits);
-	}
-
-      /* Replace less specific terminal leaves with new leaf. */
-      else if (new_leaf_dst_address_bits >=
-	       ply->dst_address_bits_of_leaves[i])
-	{
-	  __sync_val_compare_and_swap (&ply->leaves[i], old_leaf, new_leaf);
-	  ASSERT (ply->leaves[i] == new_leaf);
-	  ply->dst_address_bits_of_leaves[i] = new_leaf_dst_address_bits;
-	  ply->n_non_empty_leafs += ip4_fib_mtrie_leaf_is_empty (old_leaf);
-	}
-    }
-}
-
-static void
-set_leaf (ip4_fib_mtrie_t * m,
-	  ip4_fib_mtrie_set_unset_leaf_args_t * a,
-	  u32 old_ply_index, u32 dst_address_byte_index)
-{
-  ip4_fib_mtrie_leaf_t old_leaf, new_leaf;
-  i32 n_dst_bits_next_plies;
-  u8 dst_byte;
-
-  ASSERT (a->dst_address_length > 0 && a->dst_address_length <= 32);
-  ASSERT (dst_address_byte_index < ARRAY_LEN (a->dst_address.as_u8));
-
-  n_dst_bits_next_plies =
-    a->dst_address_length - BITS (u8) * (dst_address_byte_index + 1);
-
-  dst_byte = a->dst_address.as_u8[dst_address_byte_index];
-
-  /* Number of bits next plies <= 0 => insert leaves this ply. */
-  if (n_dst_bits_next_plies <= 0)
-    {
-      uword i, n_dst_bits_this_ply, old_leaf_is_terminal;
-
-      n_dst_bits_this_ply = -n_dst_bits_next_plies;
-      ASSERT ((a->dst_address.as_u8[dst_address_byte_index] &
-	       pow2_mask (n_dst_bits_this_ply)) == 0);
-
-      for (i = dst_byte; i < dst_byte + (1 << n_dst_bits_this_ply); i++)
-	{
-	  ip4_fib_mtrie_ply_t *old_ply, *new_ply;
-
-	  old_ply = pool_elt_at_index (m->ply_pool, old_ply_index);
-
-	  old_leaf = old_ply->leaves[i];
-	  old_leaf_is_terminal = ip4_fib_mtrie_leaf_is_terminal (old_leaf);
-
-	  /* Is leaf to be inserted more specific? */
-	  if (a->dst_address_length >= old_ply->dst_address_bits_of_leaves[i])
-	    {
-	      new_leaf = ip4_fib_mtrie_leaf_set_adj_index (a->adj_index);
-
-	      if (old_leaf_is_terminal)
-		{
-		  old_ply->dst_address_bits_of_leaves[i] =
-		    a->dst_address_length;
-		  __sync_val_compare_and_swap (&old_ply->leaves[i], old_leaf,
-					       new_leaf);
-		  ASSERT (old_ply->leaves[i] == new_leaf);
-		  old_ply->n_non_empty_leafs +=
-		    ip4_fib_mtrie_leaf_is_empty (old_leaf);
-		  ASSERT (old_ply->n_non_empty_leafs <=
-			  ARRAY_LEN (old_ply->leaves));
-		}
-	      else
-		{
-		  /* Existing leaf points to another ply.  We need to place new_leaf into all
-		     more specific slots. */
-		  new_ply = get_next_ply_for_leaf (m, old_leaf);
-		  set_ply_with_more_specific_leaf (m, new_ply, new_leaf,
-						   a->dst_address_length);
-		}
-	    }
-
-	  else if (!old_leaf_is_terminal)
-	    {
-	      new_ply = get_next_ply_for_leaf (m, old_leaf);
-	      set_leaf (m, a, new_ply - m->ply_pool,
-			dst_address_byte_index + 1);
-	    }
-	}
-    }
-  else
-    {
-      ip4_fib_mtrie_ply_t *old_ply, *new_ply;
-
-      old_ply = pool_elt_at_index (m->ply_pool, old_ply_index);
-      old_leaf = old_ply->leaves[dst_byte];
-      if (ip4_fib_mtrie_leaf_is_terminal (old_leaf))
-	{
-	  new_leaf =
-	    ply_create (m, old_leaf,
-			old_ply->dst_address_bits_of_leaves[dst_byte]);
-	  new_ply = get_next_ply_for_leaf (m, new_leaf);
-
-	  /* Refetch since ply_create may move pool. */
-	  old_ply = pool_elt_at_index (m->ply_pool, old_ply_index);
-
-	  __sync_val_compare_and_swap (&old_ply->leaves[dst_byte], old_leaf,
-				       new_leaf);
-	  ASSERT (old_ply->leaves[dst_byte] == new_leaf);
-	  old_ply->dst_address_bits_of_leaves[dst_byte] = 0;
-
-	  old_ply->n_non_empty_leafs -=
-	    ip4_fib_mtrie_leaf_is_non_empty (old_leaf);
-	  ASSERT (old_ply->n_non_empty_leafs >= 0);
-
-	  /* Account for the ply we just created. */
-	  old_ply->n_non_empty_leafs += 1;
-	}
-      else
-	new_ply = get_next_ply_for_leaf (m, old_leaf);
-
-      set_leaf (m, a, new_ply - m->ply_pool, dst_address_byte_index + 1);
-    }
-}
-
-static uword
-unset_leaf (ip4_fib_mtrie_t * m,
-	    ip4_fib_mtrie_set_unset_leaf_args_t * a,
-	    ip4_fib_mtrie_ply_t * old_ply, u32 dst_address_byte_index)
-{
-  ip4_fib_mtrie_leaf_t old_leaf, del_leaf;
-  i32 n_dst_bits_next_plies;
-  i32 i, n_dst_bits_this_ply, old_leaf_is_terminal;
-  u8 dst_byte;
-
-  ASSERT (a->dst_address_length > 0 && a->dst_address_length <= 32);
-  ASSERT (dst_address_byte_index < ARRAY_LEN (a->dst_address.as_u8));
-
-  n_dst_bits_next_plies =
-    a->dst_address_length - BITS (u8) * (dst_address_byte_index + 1);
-
-  dst_byte = a->dst_address.as_u8[dst_address_byte_index];
-  if (n_dst_bits_next_plies < 0)
-    dst_byte &= ~pow2_mask (-n_dst_bits_next_plies);
-
-  n_dst_bits_this_ply =
-    n_dst_bits_next_plies <= 0 ? -n_dst_bits_next_plies : 0;
-  n_dst_bits_this_ply = clib_min (8, n_dst_bits_this_ply);
-
-  del_leaf = ip4_fib_mtrie_leaf_set_adj_index (a->adj_index);
-
-  for (i = dst_byte; i < dst_byte + (1 << n_dst_bits_this_ply); i++)
-    {
-      old_leaf = old_ply->leaves[i];
-      old_leaf_is_terminal = ip4_fib_mtrie_leaf_is_terminal (old_leaf);
-
-      if (old_leaf == del_leaf
-	  || (!old_leaf_is_terminal
-	      && unset_leaf (m, a, get_next_ply_for_leaf (m, old_leaf),
-			     dst_address_byte_index + 1)))
-	{
-	  old_ply->leaves[i] = IP4_FIB_MTRIE_LEAF_EMPTY;
-	  old_ply->dst_address_bits_of_leaves[i] = 0;
-
-	  /* No matter what we just deleted a non-empty leaf. */
-	  ASSERT (!ip4_fib_mtrie_leaf_is_empty (old_leaf));
-	  old_ply->n_non_empty_leafs -= 1;
-
-	  ASSERT (old_ply->n_non_empty_leafs >= 0);
-	  if (old_ply->n_non_empty_leafs == 0 && dst_address_byte_index > 0)
-	    {
-	      pool_put (m->ply_pool, old_ply);
-	      /* Old ply was deleted. */
-	      return 1;
-	    }
-	}
-    }
-
-  /* Old ply was not deleted. */
-  return 0;
-}
-
-void
-ip4_mtrie_init (ip4_fib_mtrie_t * m)
-{
-  ip4_fib_mtrie_leaf_t root;
-  memset (m, 0, sizeof (m[0]));
-  m->default_leaf = IP4_FIB_MTRIE_LEAF_EMPTY;
-  root = ply_create (m, IP4_FIB_MTRIE_LEAF_EMPTY,	/* dst_address_bits_of_leaves */
-		     0);
-  ASSERT (ip4_fib_mtrie_leaf_get_next_ply_index (root) == 0);
-}
-
-void
-ip4_fib_mtrie_add_del_route (ip4_fib_t * fib,
-			     ip4_address_t dst_address,
-			     u32 dst_address_length,
-			     u32 adj_index, u32 is_del)
-{
-  ip4_fib_mtrie_t *m = &fib->mtrie;
-  ip4_fib_mtrie_ply_t *root_ply;
-  ip4_fib_mtrie_set_unset_leaf_args_t a;
-  ip4_main_t *im = &ip4_main;
-
-  ASSERT (m->ply_pool != 0);
-
-  root_ply = pool_elt_at_index (m->ply_pool, 0);
-
-  /* Honor dst_address_length. Fib masks are in network byte order */
-  dst_address.as_u32 &= im->fib_masks[dst_address_length];
-  a.dst_address = dst_address;
-  a.dst_address_length = dst_address_length;
-  a.adj_index = adj_index;
-
-  if (!is_del)
-    {
-      if (dst_address_length == 0)
-	m->default_leaf = ip4_fib_mtrie_leaf_set_adj_index (adj_index);
-      else
-	set_leaf (m, &a, /* ply_index */ 0, /* dst_address_byte_index */ 0);
-    }
-  else
-    {
-      if (dst_address_length == 0)
-	m->default_leaf = IP4_FIB_MTRIE_LEAF_EMPTY;
-
-      else
-	{
-	  ip4_main_t *im = &ip4_main;
-	  uword i;
-
-	  unset_leaf (m, &a, root_ply, 0);
-
-	  /* Find next less specific route and insert into mtrie. */
-	  for (i = dst_address_length - 1; i >= 1; i--)
-	    {
-	      uword *p;
-	      index_t lbi;
-	      ip4_address_t key;
-
-	      if (!fib->fib_entry_by_dst_address[i])
-		continue;
-
-	      key.as_u32 = dst_address.as_u32 & im->fib_masks[i];
-	      p = hash_get (fib->fib_entry_by_dst_address[i], key.as_u32);
-	      if (p)
-		{
-		  lbi = fib_entry_contribute_ip_forwarding (p[0])->dpoi_index;
-		  if (INDEX_INVALID == lbi)
-		    continue;
-
-		  a.dst_address = key;
-		  a.adj_index = lbi;
-		  a.dst_address_length = i;
-
-		  set_leaf (m, &a, /* ply_index */ 0,
-			    /* dst_address_byte_index */ 0);
-		  break;
-		}
-	    }
-	}
-    }
-}
-
-/* Returns number of bytes of memory used by mtrie. */
-static uword
-mtrie_memory_usage (ip4_fib_mtrie_t * m, ip4_fib_mtrie_ply_t * p)
-{
-  uword bytes, i;
-
-  if (!p)
-    {
-      if (pool_is_free_index (m->ply_pool, 0))
-	return 0;
-      p = pool_elt_at_index (m->ply_pool, 0);
-    }
-
-  bytes = sizeof (p[0]);
-  for (i = 0; i < ARRAY_LEN (p->leaves); i++)
-    {
-      ip4_fib_mtrie_leaf_t l = p->leaves[i];
-      if (ip4_fib_mtrie_leaf_is_next_ply (l))
-	bytes += mtrie_memory_usage (m, get_next_ply_for_leaf (m, l));
-    }
-
-  return bytes;
-}
-
-static u8 *
-format_ip4_fib_mtrie_leaf (u8 * s, va_list * va)
-{
-  ip4_fib_mtrie_leaf_t l = va_arg (*va, ip4_fib_mtrie_leaf_t);
-
-  if (ip4_fib_mtrie_leaf_is_empty (l))
-    s = format (s, "miss");
-  else if (ip4_fib_mtrie_leaf_is_terminal (l))
-    s = format (s, "adj %d", ip4_fib_mtrie_leaf_get_adj_index (l));
-  else
-    s = format (s, "next ply %d", ip4_fib_mtrie_leaf_get_next_ply_index (l));
-  return s;
-}
-
-static u8 *
-format_ip4_fib_mtrie_ply (u8 * s, va_list * va)
-{
-  ip4_fib_mtrie_t *m = va_arg (*va, ip4_fib_mtrie_t *);
-  u32 base_address = va_arg (*va, u32);
-  u32 ply_index = va_arg (*va, u32);
-  u32 dst_address_byte_index = va_arg (*va, u32);
-  ip4_fib_mtrie_ply_t *p;
-  uword i, indent;
-
-  p = pool_elt_at_index (m->ply_pool, ply_index);
-  indent = format_get_indent (s);
-  s =
-    format (s, "ply index %d, %d non-empty leaves", ply_index,
-	    p->n_non_empty_leafs);
-  for (i = 0; i < ARRAY_LEN (p->leaves); i++)
-    {
-      ip4_fib_mtrie_leaf_t l = p->leaves[i];
-
-      if (!ip4_fib_mtrie_leaf_is_empty (l))
-	{
-	  u32 a, ia_length;
-	  ip4_address_t ia;
-
-	  a = base_address + (i << (24 - 8 * dst_address_byte_index));
-	  ia.as_u32 = clib_host_to_net_u32 (a);
-	  if (ip4_fib_mtrie_leaf_is_terminal (l))
-	    ia_length = p->dst_address_bits_of_leaves[i];
-	  else
-	    ia_length = 8 * (1 + dst_address_byte_index);
-	  s = format (s, "\n%U%20U %U",
-		      format_white_space, indent + 2,
-		      format_ip4_address_and_length, &ia, ia_length,
-		      format_ip4_fib_mtrie_leaf, l);
-
-	  if (ip4_fib_mtrie_leaf_is_next_ply (l))
-	    s = format (s, "\n%U%U",
-			format_white_space, indent + 2,
-			format_ip4_fib_mtrie_ply, m, a,
-			ip4_fib_mtrie_leaf_get_next_ply_index (l),
-			dst_address_byte_index + 1);
-	}
-    }
-
-  return s;
-}
-
-u8 *
-format_ip4_fib_mtrie (u8 * s, va_list * va)
-{
-  ip4_fib_mtrie_t *m = va_arg (*va, ip4_fib_mtrie_t *);
-
-  s = format (s, "%d plies, memory usage %U",
-	      pool_elts (m->ply_pool),
-	      format_memory_size, mtrie_memory_usage (m, 0));
-
-  if (pool_elts (m->ply_pool) > 0)
-    {
-      ip4_address_t base_address;
-      base_address.as_u32 = 0;
-      s =
-	format (s, "\n  %U", format_ip4_fib_mtrie_ply, m, base_address, 0, 0);
-    }
-
-  return s;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip4_mtrie.h b/vnet/vnet/ip/ip4_mtrie.h
deleted file mode 100644
index c0afc2cf..00000000
--- a/vnet/vnet/ip/ip4_mtrie.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip4_fib.h: ip4 mtrie fib
- *
- * Copyright (c) 2012 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_ip_ip4_fib_h
-#define included_ip_ip4_fib_h
-
-#include <vppinfra/cache.h>
-#include <vppinfra/vector.h>
-#include <vnet/ip/lookup.h>
-#include <vnet/ip/ip4_packet.h>	/* for ip4_address_t */
-
-/* ip4 fib leafs: 4 ply 8-8-8-8 mtrie.
-   1 + 2*adj_index for terminal leaves.
-   0 + 2*next_ply_index for non-terminals.
-   1 => empty (adjacency index of zero is special miss adjacency). */
-typedef u32 ip4_fib_mtrie_leaf_t;
-
-#define IP4_FIB_MTRIE_LEAF_EMPTY (1 + 2*0)
-#define IP4_FIB_MTRIE_LEAF_ROOT  (0 + 2*0)
-
-always_inline u32
-ip4_fib_mtrie_leaf_is_empty (ip4_fib_mtrie_leaf_t n)
-{
-  return n == IP4_FIB_MTRIE_LEAF_EMPTY;
-}
-
-always_inline u32
-ip4_fib_mtrie_leaf_is_non_empty (ip4_fib_mtrie_leaf_t n)
-{
-  return n != IP4_FIB_MTRIE_LEAF_EMPTY;
-}
-
-always_inline u32
-ip4_fib_mtrie_leaf_is_terminal (ip4_fib_mtrie_leaf_t n)
-{
-  return n & 1;
-}
-
-always_inline u32
-ip4_fib_mtrie_leaf_get_adj_index (ip4_fib_mtrie_leaf_t n)
-{
-  ASSERT (ip4_fib_mtrie_leaf_is_terminal (n));
-  return n >> 1;
-}
-
-always_inline ip4_fib_mtrie_leaf_t
-ip4_fib_mtrie_leaf_set_adj_index (u32 adj_index)
-{
-  ip4_fib_mtrie_leaf_t l;
-  l = 1 + 2 * adj_index;
-  ASSERT (ip4_fib_mtrie_leaf_get_adj_index (l) == adj_index);
-  return l;
-}
-
-always_inline u32
-ip4_fib_mtrie_leaf_is_next_ply (ip4_fib_mtrie_leaf_t n)
-{
-  return (n & 1) == 0;
-}
-
-always_inline u32
-ip4_fib_mtrie_leaf_get_next_ply_index (ip4_fib_mtrie_leaf_t n)
-{
-  ASSERT (ip4_fib_mtrie_leaf_is_next_ply (n));
-  return n >> 1;
-}
-
-always_inline ip4_fib_mtrie_leaf_t
-ip4_fib_mtrie_leaf_set_next_ply_index (u32 i)
-{
-  ip4_fib_mtrie_leaf_t l;
-  l = 0 + 2 * i;
-  ASSERT (ip4_fib_mtrie_leaf_get_next_ply_index (l) == i);
-  return l;
-}
-
-/* One ply of the 4 ply mtrie fib. */
-typedef struct
-{
-  union
-  {
-    ip4_fib_mtrie_leaf_t leaves[256];
-
-#ifdef CLIB_HAVE_VEC128
-    u32x4 leaves_as_u32x4[256 / 4];
-#endif
-  };
-
-  /* Prefix length for terminal leaves. */
-  u8 dst_address_bits_of_leaves[256];
-
-  /* Number of non-empty leafs (whether terminal or not). */
-  i32 n_non_empty_leafs;
-
-  /* Pad to cache line boundary. */
-  u8 pad[CLIB_CACHE_LINE_BYTES - 1 * sizeof (i32)];
-}
-ip4_fib_mtrie_ply_t;
-
-STATIC_ASSERT (0 == sizeof (ip4_fib_mtrie_ply_t) % CLIB_CACHE_LINE_BYTES,
-	       "IP4 Mtrie ply cache line");
-
-typedef struct
-{
-  /* Pool of plies.  Index zero is root ply. */
-  ip4_fib_mtrie_ply_t *ply_pool;
-
-  /* Special case leaf for default route 0.0.0.0/0. */
-  ip4_fib_mtrie_leaf_t default_leaf;
-} ip4_fib_mtrie_t;
-
-void ip4_fib_mtrie_init (ip4_fib_mtrie_t * m);
-
-struct ip4_fib_t;
-
-void ip4_fib_mtrie_add_del_route (struct ip4_fib_t *f,
-				  ip4_address_t dst_address,
-				  u32 dst_address_length,
-				  u32 adj_index, u32 is_del);
-
-/* Returns adjacency index. */
-u32 ip4_mtrie_lookup_address (ip4_fib_mtrie_t * m, ip4_address_t dst);
-
-format_function_t format_ip4_fib_mtrie;
-
-/* Lookup step.  Processes 1 byte of 4 byte ip4 address. */
-always_inline ip4_fib_mtrie_leaf_t
-ip4_fib_mtrie_lookup_step (ip4_fib_mtrie_t * m,
-			   ip4_fib_mtrie_leaf_t current_leaf,
-			   const ip4_address_t * dst_address,
-			   u32 dst_address_byte_index)
-{
-  ip4_fib_mtrie_leaf_t next_leaf;
-  ip4_fib_mtrie_ply_t *ply;
-  uword current_is_terminal = ip4_fib_mtrie_leaf_is_terminal (current_leaf);
-
-  ply = m->ply_pool + (current_is_terminal ? 0 : (current_leaf >> 1));
-  next_leaf = ply->leaves[dst_address->as_u8[dst_address_byte_index]];
-  next_leaf = current_is_terminal ? current_leaf : next_leaf;
-
-  return next_leaf;
-}
-
-#endif /* included_ip_ip4_fib_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip4_packet.h b/vnet/vnet/ip/ip4_packet.h
deleted file mode 100644
index 8da788b4..00000000
--- a/vnet/vnet/ip/ip4_packet.h
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip4/packet.h: ip4 packet format
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_ip4_packet_h
-#define included_ip4_packet_h
-
-#include <vnet/ip/ip_packet.h>	/* for ip_csum_t */
-#include <vnet/ip/tcp_packet.h>	/* for tcp_header_t */
-#include <vppinfra/byte_order.h>	/* for clib_net_to_host_u16 */
-
-/* IP4 address which can be accessed either as 4 bytes
-   or as a 32-bit number. */
-typedef union
-{
-  u8 data[4];
-  u32 data_u32;
-  /* Aliases. */
-  u8 as_u8[4];
-  u32 as_u32;
-} ip4_address_t;
-
-typedef struct
-{
-  /* IP address must be first for ip_interface_address_get_address() to work */
-  ip4_address_t ip4_addr;
-  u32 fib_index;
-} ip4_address_fib_t;
-
-always_inline void
-ip4_addr_fib_init (ip4_address_fib_t * addr_fib, ip4_address_t * address,
-		   u32 fib_index)
-{
-  clib_memcpy (&addr_fib->ip4_addr, address, sizeof (addr_fib->ip4_addr));
-  addr_fib->fib_index = fib_index;
-}
-
-/* (src,dst) pair of addresses as found in packet header. */
-typedef struct
-{
-  ip4_address_t src, dst;
-} ip4_address_pair_t;
-
-/* If address is a valid netmask, return length of mask. */
-always_inline uword
-ip4_address_netmask_length (ip4_address_t * a)
-{
-  uword result = 0;
-  uword i;
-  for (i = 0; i < ARRAY_LEN (a->as_u8); i++)
-    {
-      switch (a->as_u8[i])
-	{
-	case 0xff:
-	  result += 8;
-	  break;
-	case 0xfe:
-	  result += 7;
-	  goto done;
-	case 0xfc:
-	  result += 6;
-	  goto done;
-	case 0xf8:
-	  result += 5;
-	  goto done;
-	case 0xf0:
-	  result += 4;
-	  goto done;
-	case 0xe0:
-	  result += 3;
-	  goto done;
-	case 0xc0:
-	  result += 2;
-	  goto done;
-	case 0x80:
-	  result += 1;
-	  goto done;
-	case 0x00:
-	  result += 0;
-	  goto done;
-	default:
-	  /* Not a valid netmask mask. */
-	  return ~0;
-	}
-    }
-done:
-  return result;
-}
-
-typedef union
-{
-  struct
-  {
-    /* 4 bit packet length (in 32bit units) and version VVVVLLLL.
-       e.g. for packets w/ no options ip_version_and_header_length == 0x45. */
-    u8 ip_version_and_header_length;
-
-    /* Type of service. */
-    u8 tos;
-
-    /* Total layer 3 packet length including this header. */
-    u16 length;
-
-    /* Fragmentation ID. */
-    u16 fragment_id;
-
-    /* 3 bits of flags and 13 bits of fragment offset (in units
-       of 8 byte quantities). */
-    u16 flags_and_fragment_offset;
-#define IP4_HEADER_FLAG_MORE_FRAGMENTS (1 << 13)
-#define IP4_HEADER_FLAG_DONT_FRAGMENT (1 << 14)
-#define IP4_HEADER_FLAG_CONGESTION (1 << 15)
-
-    /* Time to live decremented by router at each hop. */
-    u8 ttl;
-
-    /* Next level protocol packet. */
-    u8 protocol;
-
-    /* Checksum. */
-    u16 checksum;
-
-    /* Source and destination address. */
-    union
-    {
-      struct
-      {
-	ip4_address_t src_address, dst_address;
-      };
-      ip4_address_pair_t address_pair;
-    };
-  };
-
-  /* For checksumming we'll want to access IP header in word sized chunks. */
-  /* For 64 bit machines. */
-  /* *INDENT-OFF* */
-  CLIB_PACKED (struct {
-    u64 checksum_data_64[2];
-    u32 checksum_data_64_32[1];
-  });
-  /* *INDENT-ON* */
-
-  /* For 32 bit machines. */
-  /* *INDENT-OFF* */
-  CLIB_PACKED (struct {
-    u32 checksum_data_32[5];
-  });
-  /* *INDENT-ON* */
-} ip4_header_t;
-
-/* Value of ip_version_and_header_length for packets w/o options. */
-#define IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS \
-  ((4 << 4) | (sizeof (ip4_header_t) / sizeof (u32)))
-
-always_inline int
-ip4_get_fragment_offset (ip4_header_t * i)
-{
-  return clib_net_to_host_u16 (i->flags_and_fragment_offset) & 0x1fff;
-}
-
-always_inline int
-ip4_get_fragment_more (ip4_header_t * i)
-{
-  return clib_net_to_host_u16 (i->flags_and_fragment_offset) &
-    IP4_HEADER_FLAG_MORE_FRAGMENTS;
-}
-
-always_inline int
-ip4_is_fragment (ip4_header_t * i)
-{
-  return (i->flags_and_fragment_offset &
-	  clib_net_to_host_u16 (0x1fff | IP4_HEADER_FLAG_MORE_FRAGMENTS));
-}
-
-always_inline int
-ip4_is_first_fragment (ip4_header_t * i)
-{
-  return (i->flags_and_fragment_offset &
-	  clib_net_to_host_u16 (0x1fff | IP4_HEADER_FLAG_MORE_FRAGMENTS)) ==
-    clib_net_to_host_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS);
-}
-
-/* Fragment offset in bytes. */
-always_inline int
-ip4_get_fragment_offset_bytes (ip4_header_t * i)
-{
-  return 8 * ip4_get_fragment_offset (i);
-}
-
-always_inline int
-ip4_header_bytes (ip4_header_t * i)
-{
-  return sizeof (u32) * (i->ip_version_and_header_length & 0xf);
-}
-
-always_inline void *
-ip4_next_header (ip4_header_t * i)
-{
-  return (void *) i + ip4_header_bytes (i);
-}
-
-always_inline u16
-ip4_header_checksum (ip4_header_t * i)
-{
-  u16 save, csum;
-  ip_csum_t sum;
-
-  save = i->checksum;
-  i->checksum = 0;
-  sum = ip_incremental_checksum (0, i, ip4_header_bytes (i));
-  csum = ~ip_csum_fold (sum);
-
-  i->checksum = save;
-
-  /* Make checksum agree for special case where either
-     0 or 0xffff would give same 1s complement sum. */
-  if (csum == 0 && save == 0xffff)
-    csum = save;
-
-  return csum;
-}
-
-static inline uword
-ip4_header_checksum_is_valid (ip4_header_t * i)
-{
-  return i->checksum == ip4_header_checksum (i);
-}
-
-#define ip4_partial_header_checksum_x1(ip0,sum0)			\
-do {									\
-  if (BITS (ip_csum_t) > 32)						\
-    {									\
-      sum0 = ip0->checksum_data_64[0];					\
-      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_64[1]);	\
-      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_64_32[0]);	\
-    }									\
-  else									\
-    {									\
-      sum0 = ip0->checksum_data_32[0];					\
-      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[1]);	\
-      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[2]);	\
-      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[3]);	\
-      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[4]);	\
-    }									\
-} while (0)
-
-#define ip4_partial_header_checksum_x2(ip0,ip1,sum0,sum1)		\
-do {									\
-  if (BITS (ip_csum_t) > 32)						\
-    {									\
-      sum0 = ip0->checksum_data_64[0];					\
-      sum1 = ip1->checksum_data_64[0];					\
-      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_64[1]);	\
-      sum1 = ip_csum_with_carry (sum1, ip1->checksum_data_64[1]);	\
-      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_64_32[0]);	\
-      sum1 = ip_csum_with_carry (sum1, ip1->checksum_data_64_32[0]);	\
-    }									\
-  else									\
-    {									\
-      sum0 = ip0->checksum_data_32[0];					\
-      sum1 = ip1->checksum_data_32[0];					\
-      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[1]);	\
-      sum1 = ip_csum_with_carry (sum1, ip1->checksum_data_32[1]);	\
-      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[2]);	\
-      sum1 = ip_csum_with_carry (sum1, ip1->checksum_data_32[2]);	\
-      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[3]);	\
-      sum1 = ip_csum_with_carry (sum1, ip1->checksum_data_32[3]);	\
-      sum0 = ip_csum_with_carry (sum0, ip0->checksum_data_32[4]);	\
-      sum1 = ip_csum_with_carry (sum1, ip1->checksum_data_32[4]);	\
-    }									\
-} while (0)
-
-always_inline uword
-ip4_address_is_multicast (ip4_address_t * a)
-{
-  return (a->data[0] & 0xf0) == 0xe0;
-}
-
-always_inline void
-ip4_multicast_address_set_for_group (ip4_address_t * a,
-				     ip_multicast_group_t g)
-{
-  ASSERT ((u32) g < (1 << 28));
-  a->as_u32 = clib_host_to_net_u32 ((0xe << 28) + g);
-}
-
-always_inline void
-ip4_multicast_ethernet_address (u8 * ethernet_address, ip4_address_t * a)
-{
-  u8 *d = a->as_u8;
-
-  ethernet_address[0] = 0x01;
-  ethernet_address[1] = 0x00;
-  ethernet_address[2] = 0x5e;
-  ethernet_address[3] = d[1] & 0x7f;
-  ethernet_address[4] = d[2];
-  ethernet_address[5] = d[3];
-}
-
-always_inline void
-ip4_tcp_reply_x1 (ip4_header_t * ip0, tcp_header_t * tcp0)
-{
-  u32 src0, dst0;
-
-  src0 = ip0->src_address.data_u32;
-  dst0 = ip0->dst_address.data_u32;
-  ip0->src_address.data_u32 = dst0;
-  ip0->dst_address.data_u32 = src0;
-
-  src0 = tcp0->ports.src;
-  dst0 = tcp0->ports.dst;
-  tcp0->ports.src = dst0;
-  tcp0->ports.dst = src0;
-}
-
-always_inline void
-ip4_tcp_reply_x2 (ip4_header_t * ip0, ip4_header_t * ip1,
-		  tcp_header_t * tcp0, tcp_header_t * tcp1)
-{
-  u32 src0, dst0, src1, dst1;
-
-  src0 = ip0->src_address.data_u32;
-  src1 = ip1->src_address.data_u32;
-  dst0 = ip0->dst_address.data_u32;
-  dst1 = ip1->dst_address.data_u32;
-  ip0->src_address.data_u32 = dst0;
-  ip1->src_address.data_u32 = dst1;
-  ip0->dst_address.data_u32 = src0;
-  ip1->dst_address.data_u32 = src1;
-
-  src0 = tcp0->ports.src;
-  src1 = tcp1->ports.src;
-  dst0 = tcp0->ports.dst;
-  dst1 = tcp1->ports.dst;
-  tcp0->ports.src = dst0;
-  tcp1->ports.src = dst1;
-  tcp0->ports.dst = src0;
-  tcp1->ports.dst = src1;
-}
-
-#endif /* included_ip4_packet_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip4_pg.c b/vnet/vnet/ip/ip4_pg.c
deleted file mode 100644
index 9697a3b9..00000000
--- a/vnet/vnet/ip/ip4_pg.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip4_pg: IP v4 packet-generator interface
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-#include <vnet/pg/pg.h>
-
-#define IP4_PG_EDIT_CHECKSUM (1 << 0)
-#define IP4_PG_EDIT_LENGTH (1 << 1)
-
-static_always_inline void
-compute_length_and_or_checksum (vlib_main_t * vm,
-				u32 * packets,
-				u32 n_packets,
-				u32 ip_header_offset, u32 flags)
-{
-  ASSERT (flags != 0);
-
-  while (n_packets >= 2)
-    {
-      u32 pi0, pi1;
-      vlib_buffer_t *p0, *p1;
-      ip4_header_t *ip0, *ip1;
-      ip_csum_t sum0, sum1;
-
-      pi0 = packets[0];
-      pi1 = packets[1];
-      p0 = vlib_get_buffer (vm, pi0);
-      p1 = vlib_get_buffer (vm, pi1);
-      n_packets -= 2;
-      packets += 2;
-
-      ip0 = (void *) (p0->data + ip_header_offset);
-      ip1 = (void *) (p1->data + ip_header_offset);
-
-      if (flags & IP4_PG_EDIT_LENGTH)
-	{
-	  ip0->length =
-	    clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, p0) -
-				  ip_header_offset);
-	  ip1->length =
-	    clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, p1) -
-				  ip_header_offset);
-	}
-
-      if (flags & IP4_PG_EDIT_CHECKSUM)
-	{
-	  ASSERT (ip4_header_bytes (ip0) == sizeof (ip0[0]));
-	  ASSERT (ip4_header_bytes (ip1) == sizeof (ip1[0]));
-
-	  ip0->checksum = 0;
-	  ip1->checksum = 0;
-
-	  ip4_partial_header_checksum_x2 (ip0, ip1, sum0, sum1);
-	  ip0->checksum = ~ip_csum_fold (sum0);
-	  ip1->checksum = ~ip_csum_fold (sum1);
-
-	  ASSERT (ip0->checksum == ip4_header_checksum (ip0));
-	  ASSERT (ip1->checksum == ip4_header_checksum (ip1));
-	}
-    }
-
-  while (n_packets >= 1)
-    {
-      u32 pi0;
-      vlib_buffer_t *p0;
-      ip4_header_t *ip0;
-      ip_csum_t sum0;
-
-      pi0 = packets[0];
-      p0 = vlib_get_buffer (vm, pi0);
-      n_packets -= 1;
-      packets += 1;
-
-      ip0 = (void *) (p0->data + ip_header_offset);
-
-      if (flags & IP4_PG_EDIT_LENGTH)
-	ip0->length =
-	  clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, p0) -
-				ip_header_offset);
-
-      if (flags & IP4_PG_EDIT_CHECKSUM)
-	{
-	  ASSERT (ip4_header_bytes (ip0) == sizeof (ip0[0]));
-
-	  ip0->checksum = 0;
-
-	  ip4_partial_header_checksum_x1 (ip0, sum0);
-	  ip0->checksum = ~ip_csum_fold (sum0);
-
-	  ASSERT (ip0->checksum == ip4_header_checksum (ip0));
-	}
-    }
-}
-
-static void
-ip4_pg_edit_function (pg_main_t * pg,
-		      pg_stream_t * s,
-		      pg_edit_group_t * g, u32 * packets, u32 n_packets)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  u32 ip_offset;
-
-  ip_offset = g->start_byte_offset;
-
-  switch (g->edit_function_opaque)
-    {
-    case IP4_PG_EDIT_LENGTH:
-      compute_length_and_or_checksum (vm, packets, n_packets, ip_offset,
-				      IP4_PG_EDIT_LENGTH);
-      break;
-
-    case IP4_PG_EDIT_CHECKSUM:
-      compute_length_and_or_checksum (vm, packets, n_packets, ip_offset,
-				      IP4_PG_EDIT_CHECKSUM);
-      break;
-
-    case IP4_PG_EDIT_LENGTH | IP4_PG_EDIT_CHECKSUM:
-      compute_length_and_or_checksum (vm, packets, n_packets, ip_offset,
-				      IP4_PG_EDIT_LENGTH
-				      | IP4_PG_EDIT_CHECKSUM);
-      break;
-
-    default:
-      ASSERT (0);
-      break;
-    }
-}
-
-typedef struct
-{
-  pg_edit_t ip_version, header_length;
-  pg_edit_t tos;
-  pg_edit_t length;
-
-  pg_edit_t fragment_id, fragment_offset;
-
-  /* Flags together with fragment offset. */
-  pg_edit_t mf_flag, df_flag, ce_flag;
-
-  pg_edit_t ttl;
-
-  pg_edit_t protocol;
-
-  pg_edit_t checksum;
-
-  pg_edit_t src_address, dst_address;
-} pg_ip4_header_t;
-
-static inline void
-pg_ip4_header_init (pg_ip4_header_t * p)
-{
-  /* Initialize fields that are not bit fields in the IP header. */
-#define _(f) pg_edit_init (&p->f, ip4_header_t, f);
-  _(tos);
-  _(length);
-  _(fragment_id);
-  _(ttl);
-  _(protocol);
-  _(checksum);
-  _(src_address);
-  _(dst_address);
-#undef _
-
-  /* Initialize bit fields. */
-  pg_edit_init_bitfield (&p->header_length, ip4_header_t,
-			 ip_version_and_header_length, 0, 4);
-  pg_edit_init_bitfield (&p->ip_version, ip4_header_t,
-			 ip_version_and_header_length, 4, 4);
-
-  pg_edit_init_bitfield (&p->fragment_offset, ip4_header_t,
-			 flags_and_fragment_offset, 0, 13);
-  pg_edit_init_bitfield (&p->mf_flag, ip4_header_t,
-			 flags_and_fragment_offset, 13, 1);
-  pg_edit_init_bitfield (&p->df_flag, ip4_header_t,
-			 flags_and_fragment_offset, 14, 1);
-  pg_edit_init_bitfield (&p->ce_flag, ip4_header_t,
-			 flags_and_fragment_offset, 15, 1);
-}
-
-uword
-unformat_pg_ip4_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t *s = va_arg (*args, pg_stream_t *);
-  pg_ip4_header_t *p;
-  u32 group_index;
-
-  p = pg_create_edit_group (s, sizeof (p[0]), sizeof (ip4_header_t),
-			    &group_index);
-  pg_ip4_header_init (p);
-
-  /* Defaults. */
-  pg_edit_set_fixed (&p->ip_version, 4);
-  pg_edit_set_fixed (&p->header_length, sizeof (ip4_header_t) / sizeof (u32));
-
-  pg_edit_set_fixed (&p->tos, 0);
-  pg_edit_set_fixed (&p->ttl, 64);
-
-  pg_edit_set_fixed (&p->fragment_id, 0);
-  pg_edit_set_fixed (&p->fragment_offset, 0);
-  pg_edit_set_fixed (&p->mf_flag, 0);
-  pg_edit_set_fixed (&p->df_flag, 0);
-  pg_edit_set_fixed (&p->ce_flag, 0);
-
-  p->length.type = PG_EDIT_UNSPECIFIED;
-  p->checksum.type = PG_EDIT_UNSPECIFIED;
-
-  if (unformat (input, "%U: %U -> %U",
-		unformat_pg_edit,
-		unformat_ip_protocol, &p->protocol,
-		unformat_pg_edit,
-		unformat_ip4_address, &p->src_address,
-		unformat_pg_edit, unformat_ip4_address, &p->dst_address))
-    goto found;
-
-  if (!unformat (input, "%U:",
-		 unformat_pg_edit, unformat_ip_protocol, &p->protocol))
-    goto error;
-
-found:
-  /* Parse options. */
-  while (1)
-    {
-      if (unformat (input, "version %U",
-		    unformat_pg_edit, unformat_pg_number, &p->ip_version))
-	;
-
-      else if (unformat (input, "header-length %U",
-			 unformat_pg_edit,
-			 unformat_pg_number, &p->header_length))
-	;
-
-      else if (unformat (input, "tos %U",
-			 unformat_pg_edit, unformat_pg_number, &p->tos))
-	;
-
-      else if (unformat (input, "length %U",
-			 unformat_pg_edit, unformat_pg_number, &p->length))
-	;
-
-      else if (unformat (input, "checksum %U",
-			 unformat_pg_edit, unformat_pg_number, &p->checksum))
-	;
-
-      else if (unformat (input, "ttl %U",
-			 unformat_pg_edit, unformat_pg_number, &p->ttl))
-	;
-
-      else if (unformat (input, "fragment id %U offset %U",
-			 unformat_pg_edit,
-			 unformat_pg_number, &p->fragment_id,
-			 unformat_pg_edit,
-			 unformat_pg_number, &p->fragment_offset))
-	{
-	  int i;
-	  for (i = 0; i < ARRAY_LEN (p->fragment_offset.values); i++)
-	    pg_edit_set_value (&p->fragment_offset, i,
-			       pg_edit_get_value (&p->fragment_offset,
-						  i) / 8);
-
-	}
-
-      /* Flags. */
-      else if (unformat (input, "mf") || unformat (input, "MF"))
-	pg_edit_set_fixed (&p->mf_flag, 1);
-
-      else if (unformat (input, "df") || unformat (input, "DF"))
-	pg_edit_set_fixed (&p->df_flag, 1);
-
-      else if (unformat (input, "ce") || unformat (input, "CE"))
-	pg_edit_set_fixed (&p->ce_flag, 1);
-
-      /* Can't parse input: try next protocol level. */
-      else
-	break;
-    }
-
-  {
-    ip_main_t *im = &ip_main;
-    ip_protocol_t protocol;
-    ip_protocol_info_t *pi;
-
-    pi = 0;
-    if (p->protocol.type == PG_EDIT_FIXED)
-      {
-	protocol = pg_edit_get_value (&p->protocol, PG_EDIT_LO);
-	pi = ip_get_protocol_info (im, protocol);
-      }
-
-    if (pi && pi->unformat_pg_edit
-	&& unformat_user (input, pi->unformat_pg_edit, s))
-      ;
-
-    else if (!unformat_user (input, unformat_pg_payload, s))
-      goto error;
-
-    if (p->length.type == PG_EDIT_UNSPECIFIED
-	&& s->min_packet_bytes == s->max_packet_bytes
-	&& group_index + 1 < vec_len (s->edit_groups))
-      {
-	pg_edit_set_fixed (&p->length,
-			   pg_edit_group_n_bytes (s, group_index));
-      }
-
-    /* Compute IP header checksum if all edits are fixed. */
-    if (p->checksum.type == PG_EDIT_UNSPECIFIED)
-      {
-	ip4_header_t fixed_header, fixed_mask, cmp_mask;
-
-	/* See if header is all fixed and specified except for
-	   checksum field. */
-	memset (&cmp_mask, ~0, sizeof (cmp_mask));
-	cmp_mask.checksum = 0;
-
-	pg_edit_group_get_fixed_packet_data (s, group_index,
-					     &fixed_header, &fixed_mask);
-	if (!memcmp (&fixed_mask, &cmp_mask, sizeof (cmp_mask)))
-	  pg_edit_set_fixed (&p->checksum,
-			     clib_net_to_host_u16 (ip4_header_checksum
-						   (&fixed_header)));
-      }
-
-    p = pg_get_edit_group (s, group_index);
-    if (p->length.type == PG_EDIT_UNSPECIFIED
-	|| p->checksum.type == PG_EDIT_UNSPECIFIED)
-      {
-	pg_edit_group_t *g = pg_stream_get_group (s, group_index);
-	g->edit_function = ip4_pg_edit_function;
-	g->edit_function_opaque = 0;
-	if (p->length.type == PG_EDIT_UNSPECIFIED)
-	  g->edit_function_opaque |= IP4_PG_EDIT_LENGTH;
-	if (p->checksum.type == PG_EDIT_UNSPECIFIED)
-	  g->edit_function_opaque |= IP4_PG_EDIT_CHECKSUM;
-      }
-
-    return 1;
-  }
-
-error:
-  /* Free up any edits we may have added. */
-  pg_free_edit_group (s);
-  return 0;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip4_source_and_port_range_check.c b/vnet/vnet/ip/ip4_source_and_port_range_check.c
deleted file mode 100644
index ae836a11..00000000
--- a/vnet/vnet/ip/ip4_source_and_port_range_check.c
+++ /dev/null
@@ -1,1415 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *	   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/ip/ip.h>
-#include <vnet/ip/ip_source_and_port_range_check.h>
-#include <vnet/dpo/load_balance.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/ip4_fib.h>
-
-/**
- * @file
- * @brief IPv4 Source and Port Range Checking.
- *
- * This file contains the source code for IPv4 source and port range
- * checking.
- */
-
-
-/**
- * @brief The pool of range chack DPOs
- */
-static protocol_port_range_dpo_t *ppr_dpo_pool;
-
-/**
- * @brief Dynamically registered DPO type
- */
-static dpo_type_t ppr_dpo_type;
-
-vlib_node_registration_t ip4_source_port_and_range_check_rx;
-vlib_node_registration_t ip4_source_port_and_range_check_tx;
-
-#define foreach_ip4_source_and_port_range_check_error			\
-  _(CHECK_FAIL, "ip4 source and port range check bad packets")	\
-  _(CHECK_OK, "ip4 source and port range check good packets")
-
-typedef enum
-{
-#define _(sym,str) IP4_SOURCE_AND_PORT_RANGE_CHECK_ERROR_##sym,
-  foreach_ip4_source_and_port_range_check_error
-#undef _
-    IP4_SOURCE_AND_PORT_RANGE_CHECK_N_ERROR,
-} ip4_source_and_port_range_check_error_t;
-
-static char *ip4_source_and_port_range_check_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ip4_source_and_port_range_check_error
-#undef _
-};
-
-typedef struct
-{
-  u32 pass;
-  u32 bypass;
-  u32 is_tcp;
-  ip4_address_t src_addr;
-  u16 port;
-  u32 fib_index;
-} ip4_source_and_port_range_check_trace_t;
-
-static u8 *
-format_ip4_source_and_port_range_check_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  ip4_source_and_port_range_check_trace_t *t =
-    va_arg (*va, ip4_source_and_port_range_check_trace_t *);
-
-  if (t->bypass)
-    s = format (s, "PASS (bypass case)");
-  else
-    s = format (s, "fib %d src ip %U %s dst port %d: %s",
-		t->fib_index, format_ip4_address, &t->src_addr,
-		t->is_tcp ? "TCP" : "UDP", (u32) t->port,
-		(t->pass == 1) ? "PASS" : "FAIL");
-  return s;
-}
-
-typedef enum
-{
-  IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP,
-  IP4_SOURCE_AND_PORT_RANGE_CHECK_N_NEXT,
-} ip4_source_and_port_range_check_next_t;
-
-
-static inline u32
-check_adj_port_range_x1 (const protocol_port_range_dpo_t * ppr_dpo,
-			 u16 dst_port, u32 next)
-{
-  u16x8vec_t key;
-  u16x8vec_t diff1;
-  u16x8vec_t diff2;
-  u16x8vec_t sum, sum_equal_diff2;
-  u16 sum_nonzero, sum_equal, winner_mask;
-  int i;
-
-  if (NULL == ppr_dpo || dst_port == 0)
-    return IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP;
-
-  /* Make the obvious screw-case work. A variant also works w/ no MMX */
-  if (PREDICT_FALSE (dst_port == 65535))
-    {
-      int j;
-
-      for (i = 0;
-	   i < VLIB_BUFFER_PRE_DATA_SIZE / sizeof (protocol_port_range_t);
-	   i++)
-	{
-	  for (j = 0; j < 8; j++)
-	    if (ppr_dpo->blocks[i].low.as_u16[j] == 65535)
-	      return next;
-	}
-      return IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP;
-    }
-
-  key.as_u16x8 = u16x8_splat (dst_port);
-
-  for (i = 0; i < ppr_dpo->n_used_blocks; i++)
-    {
-      diff1.as_u16x8 =
-	u16x8_sub_saturate (ppr_dpo->blocks[i].low.as_u16x8, key.as_u16x8);
-      diff2.as_u16x8 =
-	u16x8_sub_saturate (ppr_dpo->blocks[i].hi.as_u16x8, key.as_u16x8);
-      sum.as_u16x8 = u16x8_add (diff1.as_u16x8, diff2.as_u16x8);
-      sum_equal_diff2.as_u16x8 =
-	u16x8_is_equal (sum.as_u16x8, diff2.as_u16x8);
-      sum_nonzero = ~u16x8_zero_byte_mask (sum.as_u16x8);
-      sum_equal = ~u16x8_zero_byte_mask (sum_equal_diff2.as_u16x8);
-      winner_mask = sum_nonzero & sum_equal;
-      if (winner_mask)
-	return next;
-    }
-  return IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP;
-}
-
-always_inline protocol_port_range_dpo_t *
-protocol_port_range_dpo_get (index_t index)
-{
-  return (pool_elt_at_index (ppr_dpo_pool, index));
-}
-
-always_inline uword
-ip4_source_and_port_range_check_inline (vlib_main_t * vm,
-					vlib_node_runtime_t * node,
-					vlib_frame_t * frame, int is_tx)
-{
-  ip4_main_t *im = &ip4_main;
-  u32 n_left_from, *from, *to_next;
-  u32 next_index;
-  vlib_node_runtime_t *error_node = node;
-  u32 good_packets = 0;
-  int i;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-
-      /*     while (n_left_from >= 4 && n_left_to_next >= 2) */
-      /*       { */
-      /*         vlib_buffer_t *b0, *b1; */
-      /*         ip4_header_t *ip0, *ip1; */
-      /*         ip4_fib_mtrie_t *mtrie0, *mtrie1; */
-      /*         ip4_fib_mtrie_leaf_t leaf0, leaf1; */
-      /*         ip_source_and_port_range_check_config_t *c0, *c1; */
-      /*         ip_adjacency_t *adj0 = 0, *adj1 = 0; */
-      /*         u32 bi0, next0, adj_index0, pass0, save_next0, fib_index0; */
-      /*         u32 bi1, next1, adj_index1, pass1, save_next1, fib_index1; */
-      /*         udp_header_t *udp0, *udp1; */
-
-      /*         /\* Prefetch next iteration. *\/ */
-      /*         { */
-      /*           vlib_buffer_t *p2, *p3; */
-
-      /*           p2 = vlib_get_buffer (vm, from[2]); */
-      /*           p3 = vlib_get_buffer (vm, from[3]); */
-
-      /*           vlib_prefetch_buffer_header (p2, LOAD); */
-      /*           vlib_prefetch_buffer_header (p3, LOAD); */
-
-      /*           CLIB_PREFETCH (p2->data, sizeof (ip0[0]), LOAD); */
-      /*           CLIB_PREFETCH (p3->data, sizeof (ip1[0]), LOAD); */
-      /*         } */
-
-      /*         bi0 = to_next[0] = from[0]; */
-      /*         bi1 = to_next[1] = from[1]; */
-      /*         from += 2; */
-      /*         to_next += 2; */
-      /*         n_left_from -= 2; */
-      /*         n_left_to_next -= 2; */
-
-      /*         b0 = vlib_get_buffer (vm, bi0); */
-      /*         b1 = vlib_get_buffer (vm, bi1); */
-
-      /*         fib_index0 = */
-      /*           vec_elt (im->fib_index_by_sw_if_index, */
-      /*                 vnet_buffer (b0)->sw_if_index[VLIB_RX]); */
-      /*         fib_index1 = */
-      /*           vec_elt (im->fib_index_by_sw_if_index, */
-      /*                 vnet_buffer (b1)->sw_if_index[VLIB_RX]); */
-
-      /*         ip0 = vlib_buffer_get_current (b0); */
-      /*         ip1 = vlib_buffer_get_current (b1); */
-
-      /*         if (is_tx) */
-      /*           { */
-      /*             c0 = vnet_get_config_data (&tx_cm->config_main, */
-      /*                                     &b0->current_config_index, */
-      /*                                     &next0, sizeof (c0[0])); */
-      /*             c1 = vnet_get_config_data (&tx_cm->config_main, */
-      /*                                     &b1->current_config_index, */
-      /*                                     &next1, sizeof (c1[0])); */
-      /*           } */
-      /*         else */
-      /*           { */
-      /*             c0 = vnet_get_config_data (&rx_cm->config_main, */
-      /*                                     &b0->current_config_index, */
-      /*                                     &next0, sizeof (c0[0])); */
-      /*             c1 = vnet_get_config_data (&rx_cm->config_main, */
-      /*                                     &b1->current_config_index, */
-      /*                                     &next1, sizeof (c1[0])); */
-      /*           } */
-
-      /*         /\* we can't use the default VRF here... *\/ */
-      /*         for (i = 0; i < IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS; i++) */
-      /*           { */
-      /*             ASSERT (c0->fib_index[i] && c1->fib_index[i]); */
-      /*           } */
-
-
-      /*         if (is_tx) */
-      /*           { */
-      /*             if (ip0->protocol == IP_PROTOCOL_UDP) */
-      /*            fib_index0 = */
-      /*              c0->fib_index */
-      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN]; */
-      /*             if (ip0->protocol == IP_PROTOCOL_TCP) */
-      /*            fib_index0 = */
-      /*              c0->fib_index */
-      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN]; */
-      /*           } */
-      /*         else */
-      /*           { */
-      /*             if (ip0->protocol == IP_PROTOCOL_UDP) */
-      /*            fib_index0 = */
-      /*              c0->fib_index */
-      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT]; */
-      /*             if (ip0->protocol == IP_PROTOCOL_TCP) */
-      /*            fib_index0 = */
-      /*              c0->fib_index */
-      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT]; */
-      /*           } */
-
-      /*         if (PREDICT_TRUE (fib_index0 != ~0)) */
-      /*           { */
-
-      /*             mtrie0 = &vec_elt_at_index (im->fibs, fib_index0)->mtrie; */
-
-      /*             leaf0 = IP4_FIB_MTRIE_LEAF_ROOT; */
-
-      /*             leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, */
-      /*                                             &ip0->src_address, 0); */
-
-      /*             leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, */
-      /*                                             &ip0->src_address, 1); */
-
-      /*             leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, */
-      /*                                             &ip0->src_address, 2); */
-
-      /*             leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, */
-      /*                                             &ip0->src_address, 3); */
-
-      /*             adj_index0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0); */
-
-      /*             ASSERT (adj_index0 == ip4_fib_lookup_with_table (im, fib_index0, */
-      /*                                                           &ip0->src_address, */
-      /*                                                           0 */
-      /*                                                           /\* use dflt rt *\/ */
-      /*                  )); */
-      /*             adj0 = ip_get_adjacency (lm, adj_index0); */
-      /*           } */
-
-      /*         if (is_tx) */
-      /*           { */
-      /*             if (ip1->protocol == IP_PROTOCOL_UDP) */
-      /*            fib_index1 = */
-      /*              c1->fib_index */
-      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN]; */
-      /*             if (ip1->protocol == IP_PROTOCOL_TCP) */
-      /*            fib_index1 = */
-      /*              c1->fib_index */
-      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN]; */
-      /*           } */
-      /*         else */
-      /*           { */
-      /*             if (ip1->protocol == IP_PROTOCOL_UDP) */
-      /*            fib_index1 = */
-      /*              c1->fib_index */
-      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT]; */
-      /*             if (ip1->protocol == IP_PROTOCOL_TCP) */
-      /*            fib_index1 = */
-      /*              c1->fib_index */
-      /*              [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT]; */
-      /*           } */
-
-      /*         if (PREDICT_TRUE (fib_index1 != ~0)) */
-      /*           { */
-
-      /*             mtrie1 = &vec_elt_at_index (im->fibs, fib_index1)->mtrie; */
-
-      /*             leaf1 = IP4_FIB_MTRIE_LEAF_ROOT; */
-
-      /*             leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, */
-      /*                                             &ip1->src_address, 0); */
-
-      /*             leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, */
-      /*                                             &ip1->src_address, 1); */
-
-      /*             leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, */
-      /*                                             &ip1->src_address, 2); */
-
-      /*             leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1, */
-      /*                                             &ip1->src_address, 3); */
-
-      /*             adj_index1 = ip4_fib_mtrie_leaf_get_adj_index (leaf1); */
-
-      /*             ASSERT (adj_index1 == ip4_fib_lookup_with_table (im, fib_index1, */
-      /*                                                           &ip1->src_address, */
-      /*                                                           0)); */
-      /*             adj1 = ip_get_adjacency (lm, adj_index1); */
-      /*           } */
-
-      /*         pass0 = 0; */
-      /*         pass0 |= adj0 == 0; */
-      /*         pass0 |= ip4_address_is_multicast (&ip0->src_address); */
-      /*         pass0 |= */
-      /*           ip0->src_address.as_u32 == clib_host_to_net_u32 (0xFFFFFFFF); */
-      /*         pass0 |= (ip0->protocol != IP_PROTOCOL_UDP) */
-      /*           && (ip0->protocol != IP_PROTOCOL_TCP); */
-
-      /*         pass1 = 0; */
-      /*         pass1 |= adj1 == 0; */
-      /*         pass1 |= ip4_address_is_multicast (&ip1->src_address); */
-      /*         pass1 |= */
-      /*           ip1->src_address.as_u32 == clib_host_to_net_u32 (0xFFFFFFFF); */
-      /*         pass1 |= (ip1->protocol != IP_PROTOCOL_UDP) */
-      /*           && (ip1->protocol != IP_PROTOCOL_TCP); */
-
-      /*         save_next0 = next0; */
-      /*         udp0 = ip4_next_header (ip0); */
-      /*         save_next1 = next1; */
-      /*         udp1 = ip4_next_header (ip1); */
-
-      /*         if (PREDICT_TRUE (pass0 == 0)) */
-      /*           { */
-      /*             good_packets++; */
-      /*             next0 = check_adj_port_range_x1 */
-      /*            (adj0, clib_net_to_host_u16 (udp0->dst_port), next0); */
-      /*             good_packets -= (save_next0 != next0); */
-      /*             b0->error = error_node->errors */
-      /*            [IP4_SOURCE_AND_PORT_RANGE_CHECK_ERROR_CHECK_FAIL]; */
-      /*           } */
-
-      /*         if (PREDICT_TRUE (pass1 == 0)) */
-      /*           { */
-      /*             good_packets++; */
-      /*             next1 = check_adj_port_range_x1 */
-      /*            (adj1, clib_net_to_host_u16 (udp1->dst_port), next1); */
-      /*             good_packets -= (save_next1 != next1); */
-      /*             b1->error = error_node->errors */
-      /*            [IP4_SOURCE_AND_PORT_RANGE_CHECK_ERROR_CHECK_FAIL]; */
-      /*           } */
-
-      /*         if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) */
-      /*                         && (b0->flags & VLIB_BUFFER_IS_TRACED))) */
-      /*           { */
-      /*             ip4_source_and_port_range_check_trace_t *t = */
-      /*            vlib_add_trace (vm, node, b0, sizeof (*t)); */
-      /*             t->pass = next0 == save_next0; */
-      /*             t->bypass = pass0; */
-      /*             t->fib_index = fib_index0; */
-      /*             t->src_addr.as_u32 = ip0->src_address.as_u32; */
-      /*             t->port = (pass0 == 0) ? */
-      /*            clib_net_to_host_u16 (udp0->dst_port) : 0; */
-      /*             t->is_tcp = ip0->protocol == IP_PROTOCOL_TCP; */
-      /*           } */
-
-      /*         if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) */
-      /*                         && (b1->flags & VLIB_BUFFER_IS_TRACED))) */
-      /*           { */
-      /*             ip4_source_and_port_range_check_trace_t *t = */
-      /*            vlib_add_trace (vm, node, b1, sizeof (*t)); */
-      /*             t->pass = next1 == save_next1; */
-      /*             t->bypass = pass1; */
-      /*             t->fib_index = fib_index1; */
-      /*             t->src_addr.as_u32 = ip1->src_address.as_u32; */
-      /*             t->port = (pass1 == 0) ? */
-      /*            clib_net_to_host_u16 (udp1->dst_port) : 0; */
-      /*             t->is_tcp = ip1->protocol == IP_PROTOCOL_TCP; */
-      /*           } */
-
-      /*         vlib_validate_buffer_enqueue_x2 (vm, node, next_index, */
-      /*                                       to_next, n_left_to_next, */
-      /*                                       bi0, bi1, next0, next1); */
-      /*       } */
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *b0;
-	  ip4_header_t *ip0;
-	  ip_source_and_port_range_check_config_t *c0;
-	  u32 bi0, next0, lb_index0, pass0, save_next0, fib_index0;
-	  udp_header_t *udp0;
-	  const protocol_port_range_dpo_t *ppr_dpo0 = NULL;
-	  const dpo_id_t *dpo;
-	  u32 sw_if_index0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-
-	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index, sw_if_index0);
-
-	  if (is_tx)
-	    vlib_buffer_advance (b0, sizeof (ethernet_header_t));
-
-	  ip0 = vlib_buffer_get_current (b0);
-
-	  c0 = vnet_feature_next_with_data (sw_if_index0, &next0,
-					    b0, sizeof (c0[0]));
-
-	  /* we can't use the default VRF here... */
-	  for (i = 0; i < IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS; i++)
-	    {
-	      ASSERT (c0->fib_index[i]);
-	    }
-
-
-	  if (is_tx)
-	    {
-	      if (ip0->protocol == IP_PROTOCOL_UDP)
-		fib_index0 =
-		  c0->fib_index
-		  [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN];
-	      if (ip0->protocol == IP_PROTOCOL_TCP)
-		fib_index0 =
-		  c0->fib_index
-		  [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN];
-	    }
-	  else
-	    {
-	      if (ip0->protocol == IP_PROTOCOL_UDP)
-		fib_index0 =
-		  c0->fib_index
-		  [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT];
-	      if (ip0->protocol == IP_PROTOCOL_TCP)
-		fib_index0 =
-		  c0->fib_index
-		  [IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT];
-	    }
-
-	  if (fib_index0 != ~0)
-	    {
-	      lb_index0 = ip4_fib_forwarding_lookup (fib_index0,
-						     &ip0->src_address);
-
-	      dpo =
-		load_balance_get_bucket_i (load_balance_get (lb_index0), 0);
-
-	      if (ppr_dpo_type == dpo->dpoi_type)
-		{
-		  ppr_dpo0 = protocol_port_range_dpo_get (dpo->dpoi_index);
-		}
-	      /*
-	       * else the lookup hit an enty that was no inserted
-	       * by this range checker, which is the default route
-	       */
-	    }
-	  /*
-	   * $$$ which (src,dst) categories should we always pass?
-	   */
-	  pass0 = 0;
-	  pass0 |= ip4_address_is_multicast (&ip0->src_address);
-	  pass0 |=
-	    ip0->src_address.as_u32 == clib_host_to_net_u32 (0xFFFFFFFF);
-	  pass0 |= (ip0->protocol != IP_PROTOCOL_UDP)
-	    && (ip0->protocol != IP_PROTOCOL_TCP);
-
-	  save_next0 = next0;
-	  udp0 = ip4_next_header (ip0);
-
-	  if (PREDICT_TRUE (pass0 == 0))
-	    {
-	      good_packets++;
-	      next0 = check_adj_port_range_x1
-		(ppr_dpo0, clib_net_to_host_u16 (udp0->dst_port), next0);
-	      good_packets -= (save_next0 != next0);
-	      b0->error = error_node->errors
-		[IP4_SOURCE_AND_PORT_RANGE_CHECK_ERROR_CHECK_FAIL];
-	    }
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      ip4_source_and_port_range_check_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->pass = next0 == save_next0;
-	      t->bypass = pass0;
-	      t->fib_index = fib_index0;
-	      t->src_addr.as_u32 = ip0->src_address.as_u32;
-	      t->port = (pass0 == 0) ?
-		clib_net_to_host_u16 (udp0->dst_port) : 0;
-	      t->is_tcp = ip0->protocol == IP_PROTOCOL_TCP;
-	    }
-
-	  if (is_tx)
-	    vlib_buffer_advance (b0, -sizeof (ethernet_header_t));
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  if (is_tx)
-    vlib_node_increment_counter (vm, ip4_source_port_and_range_check_tx.index,
-				 IP4_SOURCE_AND_PORT_RANGE_CHECK_ERROR_CHECK_OK,
-				 good_packets);
-  else
-    vlib_node_increment_counter (vm, ip4_source_port_and_range_check_rx.index,
-				 IP4_SOURCE_AND_PORT_RANGE_CHECK_ERROR_CHECK_OK,
-				 good_packets);
-  return frame->n_vectors;
-}
-
-static uword
-ip4_source_and_port_range_check_rx (vlib_main_t * vm,
-				    vlib_node_runtime_t * node,
-				    vlib_frame_t * frame)
-{
-  return ip4_source_and_port_range_check_inline (vm, node, frame,
-						 0 /* !is_tx */ );
-}
-
-static uword
-ip4_source_and_port_range_check_tx (vlib_main_t * vm,
-				    vlib_node_runtime_t * node,
-				    vlib_frame_t * frame)
-{
-  return ip4_source_and_port_range_check_inline (vm, node, frame,
-						 1 /* is_tx */ );
-}
-
-/* Note: Calling same function for both RX and TX nodes
-   as always checking dst_port, although
-   if this changes can easily make new function
-*/
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_source_port_and_range_check_rx) = {
-  .function = ip4_source_and_port_range_check_rx,
-  .name = "ip4-source-and-port-range-check-rx",
-  .vector_size = sizeof (u32),
-
-  .n_errors = ARRAY_LEN(ip4_source_and_port_range_check_error_strings),
-  .error_strings = ip4_source_and_port_range_check_error_strings,
-
-  .n_next_nodes = IP4_SOURCE_AND_PORT_RANGE_CHECK_N_NEXT,
-  .next_nodes = {
-    [IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP] = "error-drop",
-  },
-
-  .format_buffer = format_ip4_header,
-  .format_trace = format_ip4_source_and_port_range_check_trace,
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_source_port_and_range_check_tx) = {
-  .function = ip4_source_and_port_range_check_tx,
-  .name = "ip4-source-and-port-range-check-tx",
-  .vector_size = sizeof (u32),
-
-  .n_errors = ARRAY_LEN(ip4_source_and_port_range_check_error_strings),
-  .error_strings = ip4_source_and_port_range_check_error_strings,
-
-  .n_next_nodes = IP4_SOURCE_AND_PORT_RANGE_CHECK_N_NEXT,
-  .next_nodes = {
-    [IP4_SOURCE_AND_PORT_RANGE_CHECK_NEXT_DROP] = "error-drop",
-  },
-
-  .format_buffer = format_ip4_header,
-  .format_trace = format_ip4_source_and_port_range_check_trace,
-};
-/* *INDENT-ON* */
-
-int
-set_ip_source_and_port_range_check (vlib_main_t * vm,
-				    u32 * fib_index,
-				    u32 sw_if_index, u32 is_add)
-{
-  ip_source_and_port_range_check_config_t config;
-  int rv = 0;
-  int i;
-
-  for (i = 0; i < IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS; i++)
-    {
-      config.fib_index[i] = fib_index[i];
-    }
-
-  /* For OUT we are in the RX path */
-  if ((fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT] != ~0) ||
-      (fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT] != ~0))
-    {
-      vnet_feature_enable_disable ("ip4-unicast",
-				   "ip4-source-and-port-range-check-rx",
-				   sw_if_index, is_add, &config,
-				   sizeof (config));
-    }
-
-  /* For IN we are in the TX path */
-  if ((fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN] != ~0) ||
-      (fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN] != ~0))
-    {
-      vnet_feature_enable_disable ("ip4-output",
-				   "ip4-source-and-port-range-check-tx",
-				   sw_if_index, is_add, &config,
-				   sizeof (config));
-    }
-  return rv;
-}
-
-static clib_error_t *
-set_ip_source_and_port_range_check_fn (vlib_main_t * vm,
-				       unformat_input_t * input,
-				       vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip4_main_t *im = &ip4_main;
-  clib_error_t *error = 0;
-  u8 is_add = 1;
-  u32 sw_if_index = ~0;
-  u32 vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS];
-  u32 fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS];
-  int vrf_set = 0;
-  uword *p;
-  int rv = 0;
-  int i;
-
-  sw_if_index = ~0;
-  for (i = 0; i < IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS; i++)
-    {
-      fib_index[i] = ~0;
-      vrf_id[i] = ~0;
-    }
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%U", unformat_vnet_sw_interface, vnm,
-		    &sw_if_index))
-	;
-      else
-	if (unformat
-	    (input, "tcp-out-vrf %d",
-	     &vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT]))
-	vrf_set = 1;
-      else
-	if (unformat
-	    (input, "udp-out-vrf %d",
-	     &vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT]))
-	vrf_set = 1;
-      else
-	if (unformat
-	    (input, "tcp-in-vrf %d",
-	     &vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN]))
-	vrf_set = 1;
-      else
-	if (unformat
-	    (input, "udp-in-vrf %d",
-	     &vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN]))
-	vrf_set = 1;
-      else if (unformat (input, "del"))
-	is_add = 0;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "Interface required but not specified");
-
-  if (!vrf_set)
-    return clib_error_return (0,
-			      "TCP or UDP VRF ID required but not specified");
-
-  for (i = 0; i < IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS; i++)
-    {
-
-      if (vrf_id[i] == 0)
-	return clib_error_return (0,
-				  "TCP, UDP VRF ID should not be 0 (default). Should be distinct VRF for this purpose. ");
-
-      if (vrf_id[i] != ~0)
-	{
-	  p = hash_get (im->fib_index_by_table_id, vrf_id[i]);
-
-	  if (p == 0)
-	    return clib_error_return (0, "Invalid VRF ID %d", vrf_id[i]);
-
-	  fib_index[i] = p[0];
-	}
-    }
-  rv =
-    set_ip_source_and_port_range_check (vm, fib_index, sw_if_index, is_add);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    default:
-      return clib_error_return
-	(0,
-	 "set source and port-range on interface returned an unexpected value: %d",
-	 rv);
-    }
-  return error;
-}
-
-/*?
- * Add the 'ip4-source-and-port-range-check-rx' or
- * 'ip4-source-and-port-range-check-tx' graph node for a given
- * interface. 'tcp-out-vrf' and 'udp-out-vrf' will add to
- * the RX path. 'tcp-in-vrf' and 'udp-in-vrf' will add to
- * the TX path. A graph node will be inserted into the chain when
- * the range check is added to the first interface. It will not
- * be removed from when range check is removed from the last
- * interface.
- *
- * By adding the range check graph node to the interface, incoming
- * or outgoing TCP/UDP packets will be validated using the
- * provided IPv4 FIB table (VRF).
- *
- * @note 'ip4-source-and-port-range-check-rx' and
- * 'ip4-source-and-port-range-check-tx' strings are too long, so
- * they are truncated on the 'show vlib graph' output.
- *
- * @todo This content needs to be validated and potentially more detail added.
- *
- * @cliexpar
- * @parblock
- * Example of graph node before range checking is enabled:
- * @cliexstart{show vlib graph ip4-source-and-port-range-check-tx}
- *            Name                      Next                    Previous
- * ip4-source-and-port-range-      error-drop [0]
- * @cliexend
- *
- * Example of how to enable range checking on TX:
- * @cliexcmd{set interface ip source-and-port-range-check GigabitEthernet2/0/0 udp-in-vrf 7}
- *
- * Example of graph node after range checking is enabled:
- * @cliexstart{show vlib graph ip4-source-and-port-range-check-tx}
- *            Name                      Next                    Previous
- * ip4-source-and-port-range-      error-drop [0]              ip4-rewrite
- *                              interface-output [1]
- * @cliexend
- *
- * Example of how to display the features enabed on an interface:
- * @cliexstart{show ip interface features GigabitEthernet2/0/0}
- * IP feature paths configured on GigabitEthernet2/0/0...
- *
- * ipv4 unicast:
- *   ip4-source-and-port-range-check-rx
- *   ip4-lookup
- *
- * ipv4 multicast:
- *   ip4-lookup-multicast
- *
- * ipv4 multicast:
- *   interface-output
- *
- * ipv6 unicast:
- *   ip6-lookup
- *
- * ipv6 multicast:
- *   ip6-lookup
- *
- * ipv6 multicast:
- *   interface-output
- * @cliexend
- * @endparblock
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_ip_source_and_port_range_check_command, static) = {
-  .path = "set interface ip source-and-port-range-check",
-  .function = set_ip_source_and_port_range_check_fn,
-  .short_help = "set interface ip source-and-port-range-check <interface> [tcp-out-vrf <table-id>] [udp-out-vrf <table-id>] [tcp-in-vrf <table-id>] [udp-in-vrf <table-id>] [del]",
-};
-/* *INDENT-ON* */
-
-static u8 *
-format_ppr_dpo (u8 * s, va_list * args)
-{
-  index_t index = va_arg (*args, index_t);
-  CLIB_UNUSED (u32 indent) = va_arg (*args, u32);
-
-  protocol_port_range_dpo_t *ppr_dpo;
-  int i, j;
-  int printed = 0;
-
-  ppr_dpo = protocol_port_range_dpo_get (index);
-
-  s = format (s, "allow ");
-
-  for (i = 0; i < ppr_dpo->n_used_blocks; i++)
-    {
-      for (j = 0; j < 8; j++)
-	{
-	  if (ppr_dpo->blocks[i].low.as_u16[j])
-	    {
-	      if (printed)
-		s = format (s, ", ");
-	      if (ppr_dpo->blocks[i].hi.as_u16[j] >
-		  (ppr_dpo->blocks[i].low.as_u16[j] + 1))
-		s =
-		  format (s, "%d-%d", (u32) ppr_dpo->blocks[i].low.as_u16[j],
-			  (u32) ppr_dpo->blocks[i].hi.as_u16[j] - 1);
-	      else
-		s = format (s, "%d", ppr_dpo->blocks[i].low.as_u16[j]);
-	      printed = 1;
-	    }
-	}
-    }
-  return s;
-}
-
-static void
-ppr_dpo_lock (dpo_id_t * dpo)
-{
-}
-
-static void
-ppr_dpo_unlock (dpo_id_t * dpo)
-{
-}
-
-const static dpo_vft_t ppr_vft = {
-  .dv_lock = ppr_dpo_lock,
-  .dv_unlock = ppr_dpo_unlock,
-  .dv_format = format_ppr_dpo,
-};
-
-const static char *const ppr_ip4_nodes[] = {
-  "ip4-source-and-port-range-check-rx",
-  NULL,
-};
-
-const static char *const *const ppr_nodes[DPO_PROTO_NUM] = {
-  [DPO_PROTO_IP4] = ppr_ip4_nodes,
-};
-
-clib_error_t *
-ip4_source_and_port_range_check_init (vlib_main_t * vm)
-{
-  source_range_check_main_t *srm = &source_range_check_main;
-
-  srm->vlib_main = vm;
-  srm->vnet_main = vnet_get_main ();
-
-  ppr_dpo_type = dpo_register_new_type (&ppr_vft, ppr_nodes);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ip4_source_and_port_range_check_init);
-
-protocol_port_range_dpo_t *
-protocol_port_range_dpo_alloc (void)
-{
-  protocol_port_range_dpo_t *ppr_dpo;
-
-  pool_get_aligned (ppr_dpo_pool, ppr_dpo, CLIB_CACHE_LINE_BYTES);
-  memset (ppr_dpo, 0, sizeof (*ppr_dpo));
-
-  ppr_dpo->n_free_ranges = N_PORT_RANGES_PER_DPO;
-
-  return (ppr_dpo);
-}
-
-
-static int
-add_port_range_adjacency (u32 fib_index,
-			  ip4_address_t * address,
-			  u32 length, u16 * low_ports, u16 * high_ports)
-{
-  protocol_port_range_dpo_t *ppr_dpo;
-  dpo_id_t dpop = DPO_INVALID;
-  int i, j, k;
-
-  fib_node_index_t fei;
-  fib_prefix_t pfx = {
-    .fp_proto = FIB_PROTOCOL_IP4,
-    .fp_len = length,
-    .fp_addr = {
-		.ip4 = *address,
-		},
-  };
-
-  /*
-   * check to see if we have already sourced this prefix
-   */
-  fei = fib_table_lookup_exact_match (fib_index, &pfx);
-
-  if (FIB_NODE_INDEX_INVALID == fei)
-    {
-      /*
-       * this is a first time add for this prefix.
-       */
-      ppr_dpo = protocol_port_range_dpo_alloc ();
-    }
-  else
-    {
-      /*
-       * the prefix is already there.
-       * check it was sourced by us, and if so get the ragne DPO from it.
-       */
-      dpo_id_t dpo = DPO_INVALID;
-      const dpo_id_t *bucket;
-
-      if (fib_entry_get_dpo_for_source (fei, FIB_SOURCE_SPECIAL, &dpo))
-	{
-	  /*
-	   * there is existing state. we'll want to add the new ranges to it
-	   */
-	  bucket =
-	    load_balance_get_bucket_i (load_balance_get (dpo.dpoi_index), 0);
-	  ppr_dpo = protocol_port_range_dpo_get (bucket->dpoi_index);
-	  dpo_reset (&dpo);
-	}
-      else
-	{
-	  /*
-	   * there is no PPR state associated with this prefix,
-	   * so we'll need a new DPO
-	   */
-	  ppr_dpo = protocol_port_range_dpo_alloc ();
-	}
-    }
-
-  if (vec_len (low_ports) > ppr_dpo->n_free_ranges)
-    return VNET_API_ERROR_EXCEEDED_NUMBER_OF_RANGES_CAPACITY;
-
-  j = k = 0;
-
-  for (i = 0; i < vec_len (low_ports); i++)
-    {
-      for (; j < N_BLOCKS_PER_DPO; j++)
-	{
-	  for (; k < 8; k++)
-	    {
-	      if (ppr_dpo->blocks[j].low.as_u16[k] == 0)
-		{
-		  ppr_dpo->blocks[j].low.as_u16[k] = low_ports[i];
-		  ppr_dpo->blocks[j].hi.as_u16[k] = high_ports[i];
-		  goto doublebreak;
-		}
-	    }
-	}
-    doublebreak:;
-    }
-  ppr_dpo->n_used_blocks = j + 1;
-
-  /*
-   * add or update the entry in the FIB
-   */
-  dpo_set (&dpop, ppr_dpo_type, DPO_PROTO_IP4, (ppr_dpo - ppr_dpo_pool));
-
-  if (FIB_NODE_INDEX_INVALID == fei)
-    {
-      fib_table_entry_special_dpo_add (fib_index,
-				       &pfx,
-				       FIB_SOURCE_SPECIAL,
-				       FIB_ENTRY_FLAG_NONE, &dpop);
-    }
-  else
-    {
-      fib_entry_special_update (fei,
-				FIB_SOURCE_SPECIAL,
-				FIB_ENTRY_FLAG_NONE, &dpop);
-    }
-
-  return 0;
-}
-
-static int
-remove_port_range_adjacency (u32 fib_index,
-			     ip4_address_t * address,
-			     u32 length, u16 * low_ports, u16 * high_ports)
-{
-  protocol_port_range_dpo_t *ppr_dpo;
-  fib_node_index_t fei;
-  int i, j, k;
-
-  fib_prefix_t pfx = {
-    .fp_proto = FIB_PROTOCOL_IP4,
-    .fp_len = length,
-    .fp_addr = {
-		.ip4 = *address,
-		},
-  };
-
-  /*
-   * check to see if we have sourced this prefix
-   */
-  fei = fib_table_lookup_exact_match (fib_index, &pfx);
-
-  if (FIB_NODE_INDEX_INVALID == fei)
-    {
-      /*
-       * not one of ours
-       */
-      return VNET_API_ERROR_INCORRECT_ADJACENCY_TYPE;
-    }
-  else
-    {
-      /*
-       * the prefix is already there.
-       * check it was sourced by us
-       */
-      dpo_id_t dpo = DPO_INVALID;
-      const dpo_id_t *bucket;
-
-      if (fib_entry_get_dpo_for_source (fei, FIB_SOURCE_SPECIAL, &dpo))
-	{
-	  /*
-	   * there is existing state. we'll want to add the new ranges to it
-	   */
-	  bucket =
-	    load_balance_get_bucket_i (load_balance_get (dpo.dpoi_index), 0);
-	  ppr_dpo = protocol_port_range_dpo_get (bucket->dpoi_index);
-	  dpo_reset (&dpo);
-	}
-      else
-	{
-	  /*
-	   * not one of ours
-	   */
-	  return VNET_API_ERROR_INCORRECT_ADJACENCY_TYPE;
-	}
-    }
-
-  for (i = 0; i < vec_len (low_ports); i++)
-    {
-      for (j = 0; j < N_BLOCKS_PER_DPO; j++)
-	{
-	  for (k = 0; k < 8; k++)
-	    {
-	      if (low_ports[i] == ppr_dpo->blocks[j].low.as_u16[k] &&
-		  high_ports[i] == ppr_dpo->blocks[j].hi.as_u16[k])
-		{
-		  ppr_dpo->blocks[j].low.as_u16[k] =
-		    ppr_dpo->blocks[j].hi.as_u16[k] = 0;
-		  goto doublebreak;
-		}
-	    }
-	}
-    doublebreak:;
-    }
-
-  ppr_dpo->n_free_ranges = 0;
-
-  /* Have we deleted all ranges yet? */
-  for (i = 0; i < N_BLOCKS_PER_DPO; i++)
-    {
-      for (j = 0; j < 8; j++)
-	{
-	  if (ppr_dpo->blocks[j].low.as_u16[i] == 0)
-	    ppr_dpo->n_free_ranges++;
-	}
-    }
-
-  if (N_PORT_RANGES_PER_DPO == ppr_dpo->n_free_ranges)
-    {
-      /* Yes, lose the adjacency... */
-      fib_table_entry_special_remove (fib_index, &pfx, FIB_SOURCE_SPECIAL);
-    }
-  else
-    {
-      /*
-       * compact the ranges down to a contiguous block
-       */
-      // FIXME. TODO.
-    }
-
-  return 0;
-}
-
-// This will be moved to another file and implemented post API freeze.
-int
-ip6_source_and_port_range_check_add_del (ip6_address_t * address,
-					 u32 length,
-					 u32 vrf_id,
-					 u16 * low_ports,
-					 u16 * high_ports, int is_add)
-{
-  return 0;
-}
-
-int
-ip4_source_and_port_range_check_add_del (ip4_address_t * address,
-					 u32 length,
-					 u32 vrf_id,
-					 u16 * low_ports,
-					 u16 * high_ports, int is_add)
-{
-  u32 fib_index;
-
-  fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, vrf_id);
-
-  if (is_add == 0)
-    {
-      remove_port_range_adjacency (fib_index, address, length,
-				   low_ports, high_ports);
-    }
-  else
-    {
-      add_port_range_adjacency (fib_index, address, length,
-				low_ports, high_ports);
-    }
-
-  return 0;
-}
-
-static clib_error_t *
-ip_source_and_port_range_check_command_fn (vlib_main_t * vm,
-					   unformat_input_t * input,
-					   vlib_cli_command_t * cmd)
-{
-  u16 *low_ports = 0;
-  u16 *high_ports = 0;
-  u16 this_low;
-  u16 this_hi;
-  ip4_address_t ip4_addr;
-  ip6_address_t ip6_addr;	//This function will be moved to generic impl when v6 done.
-  u32 length;
-  u32 tmp, tmp2;
-  u32 vrf_id = ~0;
-  int is_add = 1, ip_ver = ~0;
-  int rv;
-
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%U/%d", unformat_ip4_address, &ip4_addr, &length))
-	ip_ver = 4;
-      else
-	if (unformat
-	    (input, "%U/%d", unformat_ip6_address, &ip6_addr, &length))
-	ip_ver = 6;
-      else if (unformat (input, "vrf %d", &vrf_id))
-	;
-      else if (unformat (input, "del"))
-	is_add = 0;
-      else if (unformat (input, "port %d", &tmp))
-	{
-	  if (tmp == 0 || tmp > 65535)
-	    return clib_error_return (0, "port %d out of range", tmp);
-	  this_low = tmp;
-	  this_hi = this_low + 1;
-	  vec_add1 (low_ports, this_low);
-	  vec_add1 (high_ports, this_hi);
-	}
-      else if (unformat (input, "range %d - %d", &tmp, &tmp2))
-	{
-	  if (tmp > tmp2)
-	    return clib_error_return (0, "ports %d and %d out of order",
-				      tmp, tmp2);
-	  if (tmp == 0 || tmp > 65535)
-	    return clib_error_return (0, "low port %d out of range", tmp);
-	  if (tmp2 == 0 || tmp2 > 65535)
-	    return clib_error_return (0, "high port %d out of range", tmp2);
-	  this_low = tmp;
-	  this_hi = tmp2 + 1;
-	  vec_add1 (low_ports, this_low);
-	  vec_add1 (high_ports, this_hi);
-	}
-      else
-	break;
-    }
-
-  if (ip_ver == ~0)
-    return clib_error_return (0, " <address>/<mask> not specified");
-
-  if (vrf_id == ~0)
-    return clib_error_return (0, " VRF ID required, not specified");
-
-  if (vec_len (low_ports) == 0)
-    return clib_error_return (0,
-			      " Both VRF ID and range/port must be set for a protocol.");
-
-  if (vrf_id == 0)
-    return clib_error_return (0, " VRF ID can not be 0 (default).");
-
-
-  if (ip_ver == 4)
-    rv = ip4_source_and_port_range_check_add_del
-      (&ip4_addr, length, vrf_id, low_ports, high_ports, is_add);
-  else
-    return clib_error_return (0, " IPv6 in subsequent patch");
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case VNET_API_ERROR_INCORRECT_ADJACENCY_TYPE:
-      return clib_error_return
-	(0, " Incorrect adjacency for add/del operation");
-
-    case VNET_API_ERROR_EXCEEDED_NUMBER_OF_PORTS_CAPACITY:
-      return clib_error_return (0, " Too many ports in add/del operation");
-
-    case VNET_API_ERROR_EXCEEDED_NUMBER_OF_RANGES_CAPACITY:
-      return clib_error_return
-	(0, " Too many ranges requested for add operation");
-
-    default:
-      return clib_error_return (0, " returned an unexpected value: %d", rv);
-    }
-
-  return 0;
-}
-
-/*?
- * This command adds an IP Subnet and range of ports to be validated
- * by an IP FIB table (VRF).
- *
- * @todo This is incomplete. This needs a detailed description and a
- * practical example.
- *
- * @cliexpar
- * Example of how to add an IPv4 subnet and single port to an IPv4 FIB table:
- * @cliexcmd{set ip source-and-port-range-check vrf 7 172.16.1.0/24 port 23}
- * Example of how to add an IPv4 subnet and range of ports to an IPv4 FIB table:
- * @cliexcmd{set ip source-and-port-range-check vrf 7 172.16.1.0/24 range 23 - 100}
- * Example of how to delete an IPv4 subnet and single port from an IPv4 FIB table:
- * @cliexcmd{set ip source-and-port-range-check vrf 7 172.16.1.0/24 port 23 del}
- * Example of how to delete an IPv4 subnet and range of ports from an IPv4 FIB table:
- * @cliexcmd{set ip source-and-port-range-check vrf 7 172.16.1.0/24 range 23 - 100 del}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ip_source_and_port_range_check_command, static) = {
-  .path = "set ip source-and-port-range-check",
-  .function = ip_source_and_port_range_check_command_fn,
-  .short_help =
-  "set ip source-and-port-range-check vrf <table-id> <ip-addr>/<mask> {port nn | range <nn> - <nn>} [del]",
-};
-/* *INDENT-ON* */
-
-
-static clib_error_t *
-show_source_and_port_range_check_fn (vlib_main_t * vm,
-				     unformat_input_t * input,
-				     vlib_cli_command_t * cmd)
-{
-  protocol_port_range_dpo_t *ppr_dpo;
-  u32 fib_index;
-  u8 addr_set = 0;
-  u32 vrf_id = ~0;
-  int rv, i, j;
-  u32 port = 0;
-  fib_prefix_t pfx = {
-    .fp_proto = FIB_PROTOCOL_IP4,
-    .fp_len = 32,
-  };
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%U", unformat_ip4_address, &pfx.fp_addr.ip4))
-	addr_set = 1;
-      else if (unformat (input, "vrf %d", &vrf_id))
-	;
-      else if (unformat (input, "port %d", &port))
-	;
-      else
-	break;
-    }
-
-  if (addr_set == 0)
-    return clib_error_return (0, "<address> not specified");
-
-  if (vrf_id == ~0)
-    return clib_error_return (0, "VRF ID required, not specified");
-
-  fib_index = fib_table_find (FIB_PROTOCOL_IP4, vrf_id);
-  if (~0 == fib_index)
-    return clib_error_return (0, "VRF %d not found", vrf_id);
-
-  /*
-   * find the longest prefix match on the address requested,
-   * check it was sourced by us
-   */
-  dpo_id_t dpo = DPO_INVALID;
-  const dpo_id_t *bucket;
-
-  if (!fib_entry_get_dpo_for_source (fib_table_lookup (fib_index, &pfx),
-				     FIB_SOURCE_SPECIAL, &dpo))
-    {
-      /*
-       * not one of ours
-       */
-      vlib_cli_output (vm, "%U: src address drop", format_ip4_address,
-		       &pfx.fp_addr.ip4);
-      return 0;
-    }
-
-  bucket = load_balance_get_bucket_i (load_balance_get (dpo.dpoi_index), 0);
-  ppr_dpo = protocol_port_range_dpo_get (bucket->dpoi_index);
-  dpo_reset (&dpo);
-
-  if (port)
-    {
-      rv = check_adj_port_range_x1 (ppr_dpo, (u16) port, 1234);
-      if (rv == 1234)
-	vlib_cli_output (vm, "%U port %d PASS", format_ip4_address,
-			 &pfx.fp_addr.ip4, port);
-      else
-	vlib_cli_output (vm, "%U port %d FAIL", format_ip4_address,
-			 &pfx.fp_addr.ip4, port);
-      return 0;
-    }
-  else
-    {
-      u8 *s;
-
-      s = format (0, "%U: ", format_ip4_address, &pfx.fp_addr.ip4);
-
-      for (i = 0; i < N_BLOCKS_PER_DPO; i++)
-	{
-	  for (j = 0; j < 8; j++)
-	    {
-	      if (ppr_dpo->blocks[i].low.as_u16[j])
-		s = format (s, "%d - %d ",
-			    (u32) ppr_dpo->blocks[i].low.as_u16[j],
-			    (u32) ppr_dpo->blocks[i].hi.as_u16[j]);
-	    }
-	}
-      vlib_cli_output (vm, "%s", s);
-      vec_free (s);
-    }
-
-  return 0;
-}
-
-/*?
- * Display the range of ports being validated by an IPv4 FIB for a given
- * IP or subnet, or test if a given IP and port are being validated.
- *
- * @todo This is incomplete. This needs a detailed description and a
- * practical example.
- *
- * @cliexpar
- * Example of how to display the set of ports being validated for a given
- * IPv4 subnet:
- * @cliexstart{show ip source-and-port-range-check vrf 7 172.16.2.0}
- * 172.16.2.0: 23 - 101
- * @cliexend
- * Example of how to test to determine of a given Pv4 address and port
- * are being validated:
- * @cliexstart{show ip source-and-port-range-check vrf 7 172.16.2.2 port 23}
- * 172.16.2.2 port 23 PASS
- * @cliexend
- * @cliexstart{show ip source-and-port-range-check vrf 7 172.16.2.2 port 250}
- * 172.16.2.2 port 250 FAIL
- * @cliexend
- ?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_source_and_port_range_check, static) = {
-  .path = "show ip source-and-port-range-check",
-  .function = show_source_and_port_range_check_fn,
-  .short_help =
-  "show ip source-and-port-range-check vrf <table-id> <ip-addr> [port <n>]",
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip4_source_check.c b/vnet/vnet/ip/ip4_source_check.c
deleted file mode 100644
index d461cc88..00000000
--- a/vnet/vnet/ip/ip4_source_check.c
+++ /dev/null
@@ -1,573 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip4_source_check.c: IP v4 check source address (unicast RPF check)
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/fib_urpf_list.h>
-#include <vnet/dpo/load_balance.h>
-
-/**
- * @file
- * @brief IPv4 Unicast Source Check.
- *
- * This file contains the IPv4 interface unicast source check.
- */
-
-
-typedef struct
-{
-  u8 packet_data[64];
-  index_t urpf;
-} ip4_source_check_trace_t;
-
-static u8 *
-format_ip4_source_check_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  ip4_source_check_trace_t *t = va_arg (*va, ip4_source_check_trace_t *);
-
-  s = format (s, "%U",
-	      format_ip4_header, t->packet_data, sizeof (t->packet_data));
-
-  return s;
-}
-
-typedef enum
-{
-  IP4_SOURCE_CHECK_NEXT_DROP,
-  IP4_SOURCE_CHECK_N_NEXT,
-} ip4_source_check_next_t;
-
-typedef enum
-{
-  IP4_SOURCE_CHECK_REACHABLE_VIA_RX,
-  IP4_SOURCE_CHECK_REACHABLE_VIA_ANY,
-} ip4_source_check_type_t;
-
-typedef union
-{
-  u32 fib_index;
-} ip4_source_check_config_t;
-
-always_inline uword
-ip4_source_check_inline (vlib_main_t * vm,
-			 vlib_node_runtime_t * node,
-			 vlib_frame_t * frame,
-			 ip4_source_check_type_t source_check_type)
-{
-  u32 n_left_from, *from, *to_next;
-  u32 next_index;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip4_input_node.index);
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-				   /* stride */ 1,
-				   sizeof (ip4_source_check_trace_t));
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  vlib_buffer_t *p0, *p1;
-	  ip4_header_t *ip0, *ip1;
-	  ip4_fib_mtrie_t *mtrie0, *mtrie1;
-	  ip4_fib_mtrie_leaf_t leaf0, leaf1;
-	  ip4_source_check_config_t *c0, *c1;
-	  const load_balance_t *lb0, *lb1;
-	  u32 pi0, next0, pass0, lb_index0;
-	  u32 pi1, next1, pass1, lb_index1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), LOAD);
-	    CLIB_PREFETCH (p3->data, sizeof (ip1[0]), LOAD);
-	  }
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-
-	  ip0 = vlib_buffer_get_current (p0);
-	  ip1 = vlib_buffer_get_current (p1);
-
-	  c0 =
-	    vnet_feature_next_with_data (vnet_buffer (p0)->sw_if_index
-					 [VLIB_RX], &next0, p0,
-					 sizeof (c0[0]));
-	  c1 =
-	    vnet_feature_next_with_data (vnet_buffer (p1)->sw_if_index
-					 [VLIB_RX], &next1, p1,
-					 sizeof (c1[0]));
-
-	  mtrie0 = &ip4_fib_get (c0->fib_index)->mtrie;
-	  mtrie1 = &ip4_fib_get (c1->fib_index)->mtrie;
-
-	  leaf0 = leaf1 = IP4_FIB_MTRIE_LEAF_ROOT;
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 0);
-	  leaf1 =
-	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 0);
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 1);
-	  leaf1 =
-	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 1);
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 2);
-	  leaf1 =
-	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 2);
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 3);
-	  leaf1 =
-	    ip4_fib_mtrie_lookup_step (mtrie1, leaf1, &ip1->src_address, 3);
-
-	  lb_index0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
-	  lb_index1 = ip4_fib_mtrie_leaf_get_adj_index (leaf1);
-
-	  lb0 = load_balance_get (lb_index0);
-	  lb1 = load_balance_get (lb_index1);
-
-	  /* Pass multicast. */
-	  pass0 = ip4_address_is_multicast (&ip0->src_address)
-	    || ip0->src_address.as_u32 == clib_host_to_net_u32 (0xFFFFFFFF);
-	  pass1 = ip4_address_is_multicast (&ip1->src_address)
-	    || ip1->src_address.as_u32 == clib_host_to_net_u32 (0xFFFFFFFF);
-
-	  if (IP4_SOURCE_CHECK_REACHABLE_VIA_RX == source_check_type)
-	    {
-	      pass0 |= fib_urpf_check (lb0->lb_urpf,
-				       vnet_buffer (p0)->sw_if_index
-				       [VLIB_RX]);
-	      pass1 |=
-		fib_urpf_check (lb1->lb_urpf,
-				vnet_buffer (p1)->sw_if_index[VLIB_RX]);
-	    }
-	  else
-	    {
-	      pass0 |= fib_urpf_check_size (lb0->lb_urpf);
-	      pass1 |= fib_urpf_check_size (lb1->lb_urpf);
-	    }
-	  next0 = (pass0 ? next0 : IP4_SOURCE_CHECK_NEXT_DROP);
-	  next1 = (pass1 ? next1 : IP4_SOURCE_CHECK_NEXT_DROP);
-
-	  p0->error =
-	    error_node->errors[IP4_ERROR_UNICAST_SOURCE_CHECK_FAILS];
-	  p1->error =
-	    error_node->errors[IP4_ERROR_UNICAST_SOURCE_CHECK_FAILS];
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, pi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip4_header_t *ip0;
-	  ip4_fib_mtrie_t *mtrie0;
-	  ip4_fib_mtrie_leaf_t leaf0;
-	  ip4_source_check_config_t *c0;
-	  u32 pi0, next0, pass0, lb_index0;
-	  const load_balance_t *lb0;
-
-	  pi0 = from[0];
-	  to_next[0] = pi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip0 = vlib_buffer_get_current (p0);
-
-	  c0 =
-	    vnet_feature_next_with_data (vnet_buffer (p0)->sw_if_index
-					 [VLIB_RX], &next0, p0,
-					 sizeof (c0[0]));
-
-	  mtrie0 = &ip4_fib_get (c0->fib_index)->mtrie;
-
-	  leaf0 = IP4_FIB_MTRIE_LEAF_ROOT;
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 0);
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 1);
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 2);
-
-	  leaf0 =
-	    ip4_fib_mtrie_lookup_step (mtrie0, leaf0, &ip0->src_address, 3);
-
-	  lb_index0 = ip4_fib_mtrie_leaf_get_adj_index (leaf0);
-
-	  lb0 = load_balance_get (lb_index0);
-
-	  /* Pass multicast. */
-	  pass0 = ip4_address_is_multicast (&ip0->src_address)
-	    || ip0->src_address.as_u32 == clib_host_to_net_u32 (0xFFFFFFFF);
-
-	  if (IP4_SOURCE_CHECK_REACHABLE_VIA_RX == source_check_type)
-	    {
-	      pass0 |= fib_urpf_check (lb0->lb_urpf,
-				       vnet_buffer (p0)->sw_if_index
-				       [VLIB_RX]);
-	    }
-	  else
-	    {
-	      pass0 |= fib_urpf_check_size (lb0->lb_urpf);
-	    }
-
-	  next0 = (pass0 ? next0 : IP4_SOURCE_CHECK_NEXT_DROP);
-	  p0->error =
-	    error_node->errors[IP4_ERROR_UNICAST_SOURCE_CHECK_FAILS];
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-static uword
-ip4_source_check_reachable_via_any (vlib_main_t * vm,
-				    vlib_node_runtime_t * node,
-				    vlib_frame_t * frame)
-{
-  return ip4_source_check_inline (vm, node, frame,
-				  IP4_SOURCE_CHECK_REACHABLE_VIA_ANY);
-}
-
-static uword
-ip4_source_check_reachable_via_rx (vlib_main_t * vm,
-				   vlib_node_runtime_t * node,
-				   vlib_frame_t * frame)
-{
-  return ip4_source_check_inline (vm, node, frame,
-				  IP4_SOURCE_CHECK_REACHABLE_VIA_RX);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_check_source_reachable_via_any) = {
-  .function = ip4_source_check_reachable_via_any,
-  .name = "ip4-source-check-via-any",
-  .vector_size = sizeof (u32),
-
-  .n_next_nodes = IP4_SOURCE_CHECK_N_NEXT,
-  .next_nodes = {
-    [IP4_SOURCE_CHECK_NEXT_DROP] = "error-drop",
-  },
-
-  .format_buffer = format_ip4_header,
-  .format_trace = format_ip4_source_check_trace,
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_check_source_reachable_via_any,
-			      ip4_source_check_reachable_via_any);
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_check_source_reachable_via_rx) = {
-  .function = ip4_source_check_reachable_via_rx,
-  .name = "ip4-source-check-via-rx",
-  .vector_size = sizeof (u32),
-
-  .n_next_nodes = IP4_SOURCE_CHECK_N_NEXT,
-  .next_nodes = {
-    [IP4_SOURCE_CHECK_NEXT_DROP] = "error-drop",
-  },
-
-  .format_buffer = format_ip4_header,
-  .format_trace = format_ip4_source_check_trace,
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_check_source_reachable_via_rx,
-			      ip4_source_check_reachable_via_rx);
-
-static clib_error_t *
-set_ip_source_check (vlib_main_t * vm,
-		     unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  vnet_main_t *vnm = vnet_get_main ();
-  ip4_main_t *im = &ip4_main;
-  clib_error_t *error = 0;
-  u32 sw_if_index, is_del;
-  ip4_source_check_config_t config;
-  char *feature_name = "ip4-source-check-via-rx";
-
-  sw_if_index = ~0;
-  is_del = 0;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat_user
-	  (line_input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-	;
-      else if (unformat (line_input, "del"))
-	is_del = 1;
-      else if (unformat (line_input, "loose"))
-	feature_name = "ip4-source-check-via-any";
-      else
-	{
-	  error = unformat_parse_error (line_input);
-	  goto done;
-	}
-    }
-
-  if (~0 == sw_if_index)
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, line_input);
-      goto done;
-    }
-
-  config.fib_index = im->fib_index_by_sw_if_index[sw_if_index];
-  vnet_feature_enable_disable ("ip4-unicast", feature_name, sw_if_index,
-			       is_del == 0, &config, sizeof (config));
-done:
-  return error;
-}
-
-/*?
- * This command adds the 'ip4-source-check-via-rx' graph node for
- * a given interface. By adding the IPv4 source check graph node to
- * an interface, the code verifies that the source address of incoming
- * unicast packets are reachable over the incoming interface. Two flavours
- * are supported (the default is strict):
- * - loose: accept ingress packet if there is a route to reach the source
- * - strict: accept ingress packet if it arrived on an interface which
- *          the route to the source uses. i.e. an interface that the source
- *          is reachable via.
- *
- * @cliexpar
- * @parblock
- * Example of graph node before range checking is enabled:
- * @cliexstart{show vlib graph ip4-source-check-via-rx}
- *            Name                      Next                    Previous
- * ip4-source-check-via-rx         error-drop [0]
- * @cliexend
- *
- * Example of how to enable unicast source checking on an interface:
- * @cliexcmd{set interface ip source-check GigabitEthernet2/0/0 loose}
- *
- * Example of graph node after range checking is enabled:
- * @cliexstart{show vlib graph ip4-source-check-via-rx}
- *            Name                      Next                    Previous
- * ip4-source-check-via-rx         error-drop [0]         ip4-input-no-checksum
- *                           ip4-source-and-port-range-         ip4-input
- * @cliexend
- *
- * Example of how to display the feature enabed on an interface:
- * @cliexstart{show ip interface features GigabitEthernet2/0/0}
- * IP feature paths configured on GigabitEthernet2/0/0...
- *
- * ipv4 unicast:
- *   ip4-source-check-via-rx
- *   ip4-lookup
- *
- * ipv4 multicast:
- *   ip4-lookup-multicast
- *
- * ipv4 multicast:
- *   interface-output
- *
- * ipv6 unicast:
- *   ip6-lookup
- *
- * ipv6 multicast:
- *   ip6-lookup
- *
- * ipv6 multicast:
- *   interface-output
- * @cliexend
- *
- * Example of how to disable unicast source checking on an interface:
- * @cliexcmd{set interface ip source-check GigabitEthernet2/0/0 del}
- * @endparblock
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_ip_source_check_command, static) = {
-  .path = "set interface ip source-check",
-  .function = set_ip_source_check,
-  .short_help = "set interface ip source-check <interface> [strict|loose] [del]",
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-ip_source_check_accept (vlib_main_t * vm,
-			unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  fib_prefix_t pfx = {
-    .fp_proto = FIB_PROTOCOL_IP4,
-  };
-  clib_error_t *error = NULL;
-  u32 table_id, is_add, fib_index;
-
-  is_add = 1;
-  table_id = ~0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "table %d", &table_id))
-	;
-      else if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "add"))
-	is_add = 1;
-      else if (unformat (line_input, "%U/%d",
-			 unformat_ip4_address, &pfx.fp_addr.ip4, &pfx.fp_len))
-	pfx.fp_proto = FIB_PROTOCOL_IP4;
-      else
-	{
-	  error = unformat_parse_error (line_input);
-	  goto done;
-	}
-    }
-
-  if (~0 != table_id)
-    {
-      fib_index = fib_table_id_find_fib_index (pfx.fp_proto, table_id);
-      if (~0 == fib_index)
-	{
-	  error = clib_error_return (0, "Nonexistent table id %d", table_id);
-	  goto done;
-	}
-    }
-  else
-    {
-      fib_index = 0;
-    }
-
-  if (is_add)
-    {
-      fib_table_entry_special_add (fib_index,
-				   &pfx,
-				   FIB_SOURCE_URPF_EXEMPT,
-				   FIB_ENTRY_FLAG_DROP, ADJ_INDEX_INVALID);
-    }
-  else
-    {
-      fib_table_entry_special_remove (fib_index,
-				      &pfx, FIB_SOURCE_URPF_EXEMPT);
-    }
-
-done:
-  return (error);
-}
-
-/*?
- * Add an exemption for a prefix to pass the Unicast Reverse Path
- * Forwarding (uRPF) loose check. This is for testing purposes only.
- * If the '<em>table</em>' is not enter it is defaulted to 0. Default
- * is to '<em>add</em>'. VPP always performs a loose uRPF check for
- * for-us traffic.
- *
- * @cliexpar
- * Example of how to add a uRPF exception to a FIB table to pass the
- * loose RPF tests:
- * @cliexcmd{ip urpf-accept table 7 add}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ip_source_check_accept_command, static) = {
-  .path = "ip urpf-accept",
-  .function = ip_source_check_accept,
-  .short_help = "ip urpf-accept [table <table-id>] [add|del]",
-};
-/* *INDENT-ON* */
-
-
-/* Dummy init function to get us linked in. */
-clib_error_t *
-ip4_source_check_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ip4_source_check_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip4_test.c b/vnet/vnet/ip/ip4_test.c
deleted file mode 100644
index 45d17113..00000000
--- a/vnet/vnet/ip/ip4_test.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-
-/**
- * @file
- * @brief IPv4 FIB Tester.
- *
- * Not compiled in by default. IPv4 FIB tester. Add, probe, delete a bunch of
- * random routes / masks and make sure that the mtrie agrees with
- * the hash-table FIB.
- *
- * Manipulate the FIB by means of the debug CLI commands, to minimize
- * the chances of doing something idiotic.
- */
-
-/*
- * These routines need to be redeclared non-static elsewhere.
- *
- * Also: rename ip_route() -> vnet_ip_route_cmd() and add the usual
- * test_route_init() call to main.c
- */
-clib_error_t *vnet_ip_route_cmd (vlib_main_t * vm,
-				 unformat_input_t * input,
-				 vlib_cli_command_t * cmd_arg);
-
-int ip4_lookup_validate (ip4_address_t * a, u32 fib_index0);
-
-ip4_fib_t *find_fib_by_table_index_or_id (ip4_main_t * im,
-					  u32 table_index_or_id, u32 flags);
-
-/* Routes to insert/delete/probe in FIB */
-typedef struct
-{
-  ip4_address_t address;
-  u32 mask_width;
-  u32 interface_id;		/* not an xx_if_index */
-} test_route_t;
-
-typedef struct
-{
-  /* Test routes in use */
-  test_route_t *route_pool;
-
-  /* Number of fake ethernets created */
-  u32 test_interfaces_created;
-} test_main_t;
-
-test_main_t test_main;
-
-/* fake ethernet device class, distinct from "fake-ethX" */
-static u8 *
-format_test_interface_name (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  return format (s, "test-eth%d", dev_instance);
-}
-
-static uword
-dummy_interface_tx (vlib_main_t * vm,
-		    vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  clib_warning ("you shouldn't be here, leaking buffers...");
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (test_interface_device_class,static) = {
-  .name = "Test interface",
-  .format_device_name = format_test_interface_name,
-  .tx_function = dummy_interface_tx,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-thrash (vlib_main_t * vm,
-	unformat_input_t * main_input, vlib_cli_command_t * cmd_arg)
-{
-  u32 seed = 0xdeaddabe;
-  u32 niter = 10;
-  u32 nroutes = 10;
-  u32 ninterfaces = 4;
-  f64 min_mask_bits = 7.0;
-  f64 max_mask_bits = 32.0;
-  u32 table_id = 11;		/* my amp goes to 11 (use fib 11) */
-  u32 table_index;
-  int iter, i;
-  u8 *cmd;
-  test_route_t *tr;
-  test_main_t *tm = &test_main;
-  ip4_main_t *im = &ip4_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  unformat_input_t cmd_input;
-  f64 rf;
-  u32 *masks = 0;
-  u32 tmp;
-  u32 hw_if_index;
-  clib_error_t *error = 0;
-  uword *p;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 hw_address[6];
-  ip4_fib_t *fib;
-  int verbose = 0;
-
-  /* Precompute mask width -> mask vector */
-  tmp = (u32) ~ 0;
-  vec_validate (masks, 32);
-  for (i = 32; i > 0; i--)
-    {
-      masks[i] = tmp;
-      tmp <<= 1;
-    }
-
-  if (unformat_user (main_input, unformat_line_input, line_input))
-    {
-      while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-	{
-	  if (unformat (line_input, "seed %d", &seed))
-	    ;
-	  else if (unformat (line_input, "niter %d", &niter))
-	    ;
-	  else if (unformat (line_input, "nroutes %d", &nroutes))
-	    ;
-	  else if (unformat (line_input, "ninterfaces %d", &ninterfaces))
-	    ;
-	  else if (unformat (line_input, "min-mask-bits %d", &tmp))
-	    min_mask_bits = (f64) tmp;
-	  else if (unformat (line_input, "max-mask-bits %d", &tmp))
-	    max_mask_bits = (f64) tmp;
-	  else if (unformat (line_input, "verbose"))
-	    verbose = 1;
-	  else
-	    return clib_error_return (0, "unknown input `%U'",
-				      format_unformat_error, line_input);
-	}
-    }
-
-  /* Find or create FIB table 11 */
-  fib = ip4_fib_find_or_create_fib_by_table_id (table_id);
-
-  for (i = tm->test_interfaces_created; i < ninterfaces; i++)
-    {
-      vnet_hw_interface_t *hw;
-      memset (hw_address, 0, sizeof (hw_address));
-      hw_address[0] = 0xd0;
-      hw_address[1] = 0x0f;
-      hw_address[5] = i;
-
-      error = ethernet_register_interface
-	(vnm, test_interface_device_class.index, i /* instance */ ,
-	 hw_address, &hw_if_index,
-	 /* flag change */ 0);
-
-      /* Fake interfaces use FIB table 11 */
-      hw = vnet_get_hw_interface (vnm, hw_if_index);
-      vec_validate (im->fib_index_by_sw_if_index, hw->sw_if_index);
-      im->fib_index_by_sw_if_index[hw->sw_if_index] = fib->index;
-      ip4_sw_interface_enable_disable (sw_if_index, 1);
-    }
-
-  tm->test_interfaces_created = ninterfaces;
-
-  /* Find fib index corresponding to FIB id 11 */
-  p = hash_get (im->fib_index_by_table_id, table_id);
-  if (p == 0)
-    {
-      vlib_cli_output (vm, "Couldn't map fib id %d to fib index\n", table_id);
-      return 0;
-    }
-  table_index = p[0];
-
-  for (iter = 0; iter < niter; iter++)
-    {
-      /* Pick random routes to install */
-      for (i = 0; i < nroutes; i++)
-	{
-	  int j;
-
-	  pool_get (tm->route_pool, tr);
-	  memset (tr, 0, sizeof (*tr));
-
-	again:
-	  rf = random_f64 (&seed);
-	  tr->mask_width = (u32) (min_mask_bits
-				  + rf * (max_mask_bits - min_mask_bits));
-	  tmp = random_u32 (&seed);
-	  tmp &= masks[tr->mask_width];
-	  tr->address.as_u32 = clib_host_to_net_u32 (tmp);
-
-	  /* We can't add the same address/mask twice... */
-	  for (j = 0; j < i; j++)
-	    {
-	      test_route_t *prev;
-	      prev = pool_elt_at_index (tm->route_pool, j);
-	      if ((prev->address.as_u32 == tr->address.as_u32)
-		  && (prev->mask_width == tr->mask_width))
-		goto again;
-	    }
-
-	  rf = random_f64 (&seed);
-	  tr->interface_id = (u32) (rf * ninterfaces);
-	}
-
-      /* Add them */
-      for (i = 0; i < nroutes; i++)
-	{
-	  tr = pool_elt_at_index (tm->route_pool, i);
-	  cmd = format (0, "add table %d %U/%d via test-eth%d",
-			table_id,
-			format_ip4_address, &tr->address,
-			tr->mask_width, tr->interface_id);
-	  vec_add1 (cmd, 0);
-	  if (verbose)
-	    fformat (stderr, "ip route %s\n", cmd);
-	  unformat_init_string (&cmd_input, (char *) cmd, vec_len (cmd) - 1);
-	  error = vnet_ip_route_cmd (vm, &cmd_input, cmd_arg);
-	  if (error)
-	    clib_error_report (error);
-	  unformat_free (&cmd_input);
-	  vec_free (cmd);
-	}
-      /* Probe them */
-      for (i = 0; i < nroutes; i++)
-	{
-	  tr = pool_elt_at_index (tm->route_pool, i);
-	  if (!ip4_lookup_validate (&tr->address, table_index))
-	    {
-	      if (verbose)
-		fformat (stderr, "test lookup table %d %U\n",
-			 table_index, format_ip4_address, &tr->address);
-
-	      fformat (stderr, "FAIL-after-insert: %U/%d\n",
-		       format_ip4_address, &tr->address, tr->mask_width);
-	    }
-	}
-
-      /* Delete them */
-      for (i = 0; i < nroutes; i++)
-	{
-	  int j;
-	  tr = pool_elt_at_index (tm->route_pool, i);
-	  if (0)
-	    cmd = format (0, "del table %d %U/%d via test-eth%d",
-			  table_id,
-			  format_ip4_address, &tr->address,
-			  tr->mask_width, tr->interface_id);
-	  else
-	    cmd = format (0, "del table %d %U/%d",
-			  table_id,
-			  format_ip4_address, &tr->address, tr->mask_width);
-	  vec_add1 (cmd, 0);
-	  if (verbose)
-	    fformat (stderr, "ip route %s\n", cmd);
-	  unformat_init_string (&cmd_input, (char *) cmd, vec_len (cmd) - 1);
-	  error = vnet_ip_route_cmd (vm, &cmd_input, cmd_arg);
-	  if (error)
-	    clib_error_report (error);
-	  unformat_free (&cmd_input);
-	  vec_free (cmd);
-
-	  /* Make sure all undeleted routes still work */
-	  for (j = i + 1; j < nroutes; j++)
-	    {
-	      test_route_t *rr;	/* remaining route */
-	      rr = pool_elt_at_index (tm->route_pool, j);
-	      if (!ip4_lookup_validate (&rr->address, table_index))
-		{
-		  if (verbose)
-		    fformat (stderr, "test lookup table %d %U\n",
-			     table_index, format_ip4_address, &rr->address);
-
-		  fformat (stderr, "FAIL: %U/%d AWOL\n",
-			   format_ip4_address, &rr->address, rr->mask_width);
-		  fformat (stderr, " iter %d after %d of %d deletes\n",
-			   iter, i, nroutes);
-		  fformat (stderr, " last route deleted %U/%d\n",
-			   format_ip4_address, &tr->address, tr->mask_width);
-		}
-	    }
-	}
-
-      pool_free (tm->route_pool);
-    }
-  return 0;
-}
-
-/*?
- * This command in not in the build by default. It is an internal
- * command used to test the route functonality.
- *
- * Create test routes on IPv4 FIB table 11. Table will be created if it
- * does not exist.
- *
- * There are several optional attributes:
- * - If not provided, <seed> defaults to 0xdeaddabe.
- * - If not provided, <num-iter> defaults to 10.
- * - If not provided, <num-iface> defaults to 4.
- * - If not provided, <min-mask> defaults to 7.0.
- * - If not provided, <max-mask> defaults to 32.0.
- *
- * @cliexpar
- * Example of how to run:
- * @cliexcmd{test route}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (test_route_command, static) = {
-    .path = "test route",
-    .short_help = "test route [seed <seed-num>] [niter <num-iter>] [ninterfaces <num-iface>] [min-mask-bits <min-mask>] [max-mask-bits <max-mask>] [verbose]",    .function = thrash,
-    .function = thrash,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-test_route_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (test_route_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip6.h b/vnet/vnet/ip/ip6.h
deleted file mode 100644
index 586b7c1b..00000000
--- a/vnet/vnet/ip/ip6.h
+++ /dev/null
@@ -1,476 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip6.h: ip6 main include file
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_ip_ip6_h
-#define included_ip_ip6_h
-
-#include <vlib/mc.h>
-#include <vlib/buffer.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vnet/ip/ip6_hop_by_hop_packet.h>
-#include <vnet/ip/lookup.h>
-#include <stdbool.h>
-#include <vppinfra/bihash_24_8.h>
-#include <vppinfra/bihash_template.h>
-
-/*
- * Default size of the ip6 fib hash table
- */
-#define IP6_FIB_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
-#define IP6_FIB_DEFAULT_HASH_MEMORY_SIZE (32<<20)
-
-typedef struct
-{
-  ip6_address_t addr;
-  u32 dst_address_length;
-  u32 vrf_index;
-} ip6_fib_key_t;
-
-typedef struct
-{
-  /* Table ID (hash key) for this FIB. */
-  u32 table_id;
-
-  /* Index into FIB vector. */
-  u32 index;
-
-  /* flow hash configuration */
-  flow_hash_config_t flow_hash_config;
-} ip6_fib_t;
-
-struct ip6_main_t;
-
-typedef void (ip6_add_del_interface_address_function_t)
-  (struct ip6_main_t * im,
-   uword opaque,
-   u32 sw_if_index,
-   ip6_address_t * address,
-   u32 address_length, u32 if_address_index, u32 is_del);
-
-typedef struct
-{
-  ip6_add_del_interface_address_function_t *function;
-  uword function_opaque;
-} ip6_add_del_interface_address_callback_t;
-
-/**
- * Enumeration of the FIB table instance types
- */
-typedef enum ip6_fib_table_instance_type_t_
-{
-    /**
-     * This table stores the routes that are used to forward traffic.
-     * The key is the prefix, the result the adjacnecy to forward on.
-     */
-  IP6_FIB_TABLE_FWDING,
-    /**
-     * The table that stores ALL routes learned by the DP.
-     * Some of these routes may not be ready to install in forwarding
-     * at a given time.
-     * The key in this table is the prefix, the result is the fib_entry_t
-     */
-  IP6_FIB_TABLE_NON_FWDING,
-} ip6_fib_table_instance_type_t;
-
-#define IP6_FIB_NUM_TABLES (IP6_FIB_TABLE_NON_FWDING+1)
-
-/**
- * A represenation of a single IP6 table
- */
-typedef struct ip6_fib_table_instance_t_
-{
-  /* The hash table */
-  BVT (clib_bihash) ip6_hash;
-
-  /* bitmap / refcounts / vector of mask widths to search */
-  uword *non_empty_dst_address_length_bitmap;
-  u8 *prefix_lengths_in_search_order;
-  i32 dst_address_length_refcounts[129];
-} ip6_fib_table_instance_t;
-
-typedef struct ip6_main_t
-{
-  /**
-   * The two FIB tables; fwding and non-fwding
-   */
-  ip6_fib_table_instance_t ip6_table[IP6_FIB_NUM_TABLES];
-
-  ip_lookup_main_t lookup_main;
-
-  /* Pool of FIBs. */
-  struct fib_table_t_ *fibs;
-
-  /* Network byte orders subnet mask for each prefix length */
-  ip6_address_t fib_masks[129];
-
-  /* Table index indexed by software interface. */
-  u32 *fib_index_by_sw_if_index;
-
-  /* IP6 enabled count by software interface */
-  u8 *ip_enabled_by_sw_if_index;
-
-  /* Hash table mapping table id to fib index.
-     ID space is not necessarily dense; index space is dense. */
-  uword *fib_index_by_table_id;
-
-  /* Hash table mapping interface rewrite adjacency index by sw if index. */
-  uword *interface_route_adj_index_by_sw_if_index;
-
-  /* Functions to call when interface address changes. */
-    ip6_add_del_interface_address_callback_t
-    * add_del_interface_address_callbacks;
-
-  /* Template used to generate IP6 neighbor solicitation packets. */
-  vlib_packet_template_t discover_neighbor_packet_template;
-
-  /* ip6 lookup table config parameters */
-  u32 lookup_table_nbuckets;
-  uword lookup_table_size;
-
-  /* Seed for Jenkins hash used to compute ip6 flow hash. */
-  u32 flow_hash_seed;
-
-  struct
-  {
-    /* TTL to use for host generated packets. */
-    u8 ttl;
-
-    u8 pad[3];
-  } host_config;
-
-  /* HBH processing enabled? */
-  u8 hbh_enabled;
-} ip6_main_t;
-
-/* Global ip6 main structure. */
-extern ip6_main_t ip6_main;
-
-/* Global ip6 input node.  Errors get attached to ip6 input node. */
-extern vlib_node_registration_t ip6_input_node;
-extern vlib_node_registration_t ip6_rewrite_node;
-extern vlib_node_registration_t ip6_rewrite_local_node;
-extern vlib_node_registration_t ip6_discover_neighbor_node;
-extern vlib_node_registration_t ip6_glean_node;
-extern vlib_node_registration_t ip6_midchain_node;
-
-extern vlib_node_registration_t ip6_icmp_neighbor_discovery_event_node;
-
-/* ipv6 neighbor discovery - timer/event types */
-typedef enum
-{
-  ICMP6_ND_EVENT_INIT,
-} ip6_icmp_neighbor_discovery_event_type_t;
-
-typedef union
-{
-  u32 add_del_swindex;
-  struct
-  {
-    u32 up_down_swindex;
-    u32 fib_index;
-  } up_down_event;
-} ip6_icmp_neighbor_discovery_event_data_t;
-
-always_inline uword
-ip6_destination_matches_route (const ip6_main_t * im,
-			       const ip6_address_t * key,
-			       const ip6_address_t * dest, uword dest_length)
-{
-  int i;
-  for (i = 0; i < ARRAY_LEN (key->as_uword); i++)
-    {
-      if ((key->as_uword[i] ^ dest->as_uword[i]) & im->
-	  fib_masks[dest_length].as_uword[i])
-	return 0;
-    }
-  return 1;
-}
-
-always_inline uword
-ip6_destination_matches_interface (ip6_main_t * im,
-				   ip6_address_t * key,
-				   ip_interface_address_t * ia)
-{
-  ip6_address_t *a = ip_interface_address_get_address (&im->lookup_main, ia);
-  return ip6_destination_matches_route (im, key, a, ia->address_length);
-}
-
-/* As above but allows for unaligned destinations (e.g. works right from IP header of packet). */
-always_inline uword
-ip6_unaligned_destination_matches_route (ip6_main_t * im,
-					 ip6_address_t * key,
-					 ip6_address_t * dest,
-					 uword dest_length)
-{
-  int i;
-  for (i = 0; i < ARRAY_LEN (key->as_uword); i++)
-    {
-      if ((clib_mem_unaligned (&key->as_uword[i], uword) ^ dest->as_uword[i])
-	  & im->fib_masks[dest_length].as_uword[i])
-	return 0;
-    }
-  return 1;
-}
-
-always_inline int
-ip6_src_address_for_packet (ip_lookup_main_t * lm,
-			    u32 sw_if_index, ip6_address_t * src)
-{
-  u32 if_add_index = lm->if_address_pool_index_by_sw_if_index[sw_if_index];
-  if (PREDICT_TRUE (if_add_index != ~0))
-    {
-      ip_interface_address_t *if_add =
-	pool_elt_at_index (lm->if_address_pool, if_add_index);
-      ip6_address_t *if_ip = ip_interface_address_get_address (lm, if_add);
-      *src = *if_ip;
-      return (0);
-    }
-  else
-    {
-      src->as_u64[0] = 0;
-      src->as_u64[1] = 0;
-    }
-  return (!0);
-}
-
-/* Find interface address which matches destination. */
-always_inline ip6_address_t *
-ip6_interface_address_matching_destination (ip6_main_t * im,
-					    ip6_address_t * dst,
-					    u32 sw_if_index,
-					    ip_interface_address_t **
-					    result_ia)
-{
-  ip_lookup_main_t *lm = &im->lookup_main;
-  ip_interface_address_t *ia;
-  ip6_address_t *result = 0;
-
-  /* *INDENT-OFF* */
-  foreach_ip_interface_address (lm, ia, sw_if_index,
-                                1 /* honor unnumbered */,
-  ({
-    ip6_address_t * a = ip_interface_address_get_address (lm, ia);
-    if (ip6_destination_matches_route (im, dst, a, ia->address_length))
-      {
-	result = a;
-	break;
-      }
-  }));
-  /* *INDENT-ON* */
-  if (result_ia)
-    *result_ia = result ? ia : 0;
-  return result;
-}
-
-clib_error_t *ip6_add_del_interface_address (vlib_main_t * vm,
-					     u32 sw_if_index,
-					     ip6_address_t * address,
-					     u32 address_length, u32 is_del);
-void ip6_sw_interface_enable_disable (u32 sw_if_index, u32 is_enable);
-
-int ip6_address_compare (ip6_address_t * a1, ip6_address_t * a2);
-
-clib_error_t *ip6_probe_neighbor (vlib_main_t * vm, ip6_address_t * dst,
-				  u32 sw_if_index);
-
-clib_error_t *ip6_set_neighbor_limit (u32 neighbor_limit);
-
-uword
-ip6_udp_register_listener (vlib_main_t * vm,
-			   u16 dst_port, u32 next_node_index);
-
-u16 ip6_tcp_udp_icmp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0,
-				       ip6_header_t * ip0,
-				       int *bogus_lengthp);
-
-void ip6_register_protocol (u32 protocol, u32 node_index);
-
-serialize_function_t serialize_vnet_ip6_main, unserialize_vnet_ip6_main;
-
-void ip6_ethernet_update_adjacency (vnet_main_t * vnm,
-				    u32 sw_if_index, u32 ai);
-
-int
-vnet_set_ip6_ethernet_neighbor (vlib_main_t * vm,
-				u32 sw_if_index,
-				ip6_address_t * a,
-				u8 * link_layer_address,
-				uword n_bytes_link_layer_address,
-				int is_static);
-int
-vnet_unset_ip6_ethernet_neighbor (vlib_main_t * vm,
-				  u32 sw_if_index,
-				  ip6_address_t * a,
-				  u8 * link_layer_address,
-				  uword n_bytes_link_layer_address);
-
-void
-ip6_link_local_address_from_ethernet_mac_address (ip6_address_t * ip,
-						  u8 * mac);
-
-void
-ip6_ethernet_mac_address_from_link_local_address (u8 * mac,
-						  ip6_address_t * ip);
-
-int vnet_set_ip6_flow_hash (u32 table_id,
-			    flow_hash_config_t flow_hash_config);
-
-int
-ip6_neighbor_ra_config (vlib_main_t * vm, u32 sw_if_index,
-			u8 suppress, u8 managed, u8 other,
-			u8 ll_option, u8 send_unicast, u8 cease,
-			u8 use_lifetime, u32 lifetime,
-			u32 initial_count, u32 initial_interval,
-			u32 max_interval, u32 min_interval, u8 is_no);
-
-int
-ip6_neighbor_ra_prefix (vlib_main_t * vm, u32 sw_if_index,
-			ip6_address_t * prefix_addr, u8 prefix_len,
-			u8 use_default, u32 val_lifetime, u32 pref_lifetime,
-			u8 no_advertise, u8 off_link, u8 no_autoconfig,
-			u8 no_onlink, u8 is_no);
-
-
-clib_error_t *enable_ip6_interface (vlib_main_t * vm, u32 sw_if_index);
-
-clib_error_t *disable_ip6_interface (vlib_main_t * vm, u32 sw_if_index);
-
-int ip6_interface_enabled (vlib_main_t * vm, u32 sw_if_index);
-
-clib_error_t *set_ip6_link_local_address (vlib_main_t * vm,
-					  u32 sw_if_index,
-					  ip6_address_t * address,
-					  u8 address_length);
-
-void vnet_register_ip6_neighbor_resolution_event (vnet_main_t * vnm,
-						  void *address_arg,
-						  uword node_index,
-						  uword type_opaque,
-						  uword data);
-
-int vnet_add_del_ip6_nd_change_event (vnet_main_t * vnm,
-				      void *data_callback,
-				      u32 pid,
-				      void *address_arg,
-				      uword node_index,
-				      uword type_opaque,
-				      uword data, int is_add);
-
-int vnet_ip6_nd_term (vlib_main_t * vm,
-		      vlib_node_runtime_t * node,
-		      vlib_buffer_t * p0,
-		      ethernet_header_t * eth,
-		      ip6_header_t * ip,
-		      u32 sw_if_index, u16 bd_index, u8 shg);
-
-int vnet_set_ip6_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
-				 u32 table_index);
-extern vlib_node_registration_t ip6_lookup_node;
-
-/* Compute flow hash.  We'll use it to select which Sponge to use for this
-   flow.  And other things. */
-always_inline u32
-ip6_compute_flow_hash (const ip6_header_t * ip,
-		       flow_hash_config_t flow_hash_config)
-{
-  tcp_header_t *tcp = (void *) (ip + 1);
-  u64 a, b, c;
-  u64 t1, t2;
-  uword is_tcp_udp = (ip->protocol == IP_PROTOCOL_TCP
-		      || ip->protocol == IP_PROTOCOL_UDP);
-
-  t1 = (ip->src_address.as_u64[0] ^ ip->src_address.as_u64[1]);
-  t1 = (flow_hash_config & IP_FLOW_HASH_SRC_ADDR) ? t1 : 0;
-
-  t2 = (ip->dst_address.as_u64[0] ^ ip->dst_address.as_u64[1]);
-  t2 = (flow_hash_config & IP_FLOW_HASH_DST_ADDR) ? t2 : 0;
-
-  a = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ? t2 : t1;
-  b = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ? t1 : t2;
-  b ^= (flow_hash_config & IP_FLOW_HASH_PROTO) ? ip->protocol : 0;
-
-  t1 = is_tcp_udp ? tcp->ports.src : 0;
-  t2 = is_tcp_udp ? tcp->ports.dst : 0;
-
-  t1 = (flow_hash_config & IP_FLOW_HASH_SRC_PORT) ? t1 : 0;
-  t2 = (flow_hash_config & IP_FLOW_HASH_DST_PORT) ? t2 : 0;
-
-  c = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ?
-    ((t1 << 16) | t2) : ((t2 << 16) | t1);
-
-  hash_mix64 (a, b, c);
-  return (u32) c;
-}
-
-/*
- * Hop-by-Hop handling
- */
-typedef struct
-{
-  /* Array of function pointers to HBH option handling routines */
-  int (*options[256]) (vlib_buffer_t * b, ip6_header_t * ip,
-		       ip6_hop_by_hop_option_t * opt);
-  u8 *(*trace[256]) (u8 * s, ip6_hop_by_hop_option_t * opt);
-  uword next_override;
-} ip6_hop_by_hop_main_t;
-
-extern ip6_hop_by_hop_main_t ip6_hop_by_hop_main;
-
-int ip6_hbh_register_option (u8 option,
-			     int options (vlib_buffer_t * b,
-					  ip6_header_t * ip,
-					  ip6_hop_by_hop_option_t * opt),
-			     u8 * trace (u8 * s,
-					 ip6_hop_by_hop_option_t * opt));
-int ip6_hbh_unregister_option (u8 option);
-void ip6_hbh_set_next_override (uword next);
-
-/* Flag used by IOAM code. Classifier sets it pop-hop-by-hop checks it */
-#define OI_DECAP   0x80000000
-
-#endif /* included_ip_ip6_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip6_error.h b/vnet/vnet/ip/ip6_error.h
deleted file mode 100644
index a2807169..00000000
--- a/vnet/vnet/ip/ip6_error.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip6_error.h: ip6 fast path errors
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_ip_ip6_error_h
-#define included_ip_ip6_error_h
-
-#define foreach_ip6_error                                               \
-  /* Must be first. */                                                  \
-  _ (NONE, "valid ip6 packets")                                         \
-                                                                        \
-  /* Errors signalled by ip6-input */                                   \
-  _ (TOO_SHORT, "ip6 length < 40 bytes")                                \
-  _ (BAD_LENGTH, "ip6 length > l2 length")                              \
-  _ (VERSION, "ip6 version != 6")                                       \
-  _ (TIME_EXPIRED, "ip6 ttl <= 1")                                      \
-                                                                        \
-  /* Errors signalled by ip6-rewrite. */                                \
-  _ (MTU_EXCEEDED, "ip6 MTU exceeded")                                  \
-  _ (DST_LOOKUP_MISS, "ip6 destination lookup miss")                    \
-  _ (SRC_LOOKUP_MISS, "ip6 source lookup miss")                         \
-  _ (ADJACENCY_DROP, "ip6 adjacency drop")                              \
-  _ (ADJACENCY_PUNT, "ip6 adjacency punt")                              \
-                                                                        \
-  /* Errors signalled by ip6-local. */                                  \
-  _ (UNKNOWN_PROTOCOL, "unknown ip protocol")                           \
-  _ (UDP_CHECKSUM, "bad udp checksum")                                  \
-  _ (ICMP_CHECKSUM, "bad icmp checksum")                                \
-  _ (UDP_LENGTH, "inconsistent udp/ip lengths")                         \
-                                                                        \
-  /* Errors signalled by udp6-lookup. */				\
-  _ (UNKNOWN_UDP_PORT, "no listener for udp port")                      \
-                                                                        \
-  /* Spoofed packets in ip6-rewrite-local */                            \
-  _(SPOOFED_LOCAL_PACKETS, "ip4 spoofed local-address packet drops")    \
-                                                                        \
- /* Erros singalled by ip6-inacl */                                     \
-  _ (INACL_TABLE_MISS, "input ACL table-miss drops")                    \
-  _ (INACL_SESSION_DENY, "input ACL session deny drops")
-
-typedef enum
-{
-#define _(sym,str) IP6_ERROR_##sym,
-  foreach_ip6_error
-#undef _
-    IP6_N_ERROR,
-} ip6_error_t;
-
-#endif /* included_ip_ip6_error_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip6_format.c b/vnet/vnet/ip/ip6_format.c
deleted file mode 100644
index 56899b73..00000000
--- a/vnet/vnet/ip/ip6_format.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip6_format.c: ip6 formatting
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-
-/* Format an IP6 address. */
-u8 *
-format_ip6_address (u8 * s, va_list * args)
-{
-  ip6_address_t *a = va_arg (*args, ip6_address_t *);
-  u32 max_zero_run = 0, this_zero_run = 0;
-  int max_zero_run_index = -1, this_zero_run_index = 0;
-  int in_zero_run = 0, i;
-  int last_double_colon = 0;
-
-  /* Ugh, this is a pain. Scan forward looking for runs of 0's */
-  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
-    {
-      if (a->as_u16[i] == 0)
-	{
-	  if (in_zero_run)
-	    this_zero_run++;
-	  else
-	    {
-	      in_zero_run = 1;
-	      this_zero_run = 1;
-	      this_zero_run_index = i;
-	    }
-	}
-      else
-	{
-	  if (in_zero_run)
-	    {
-	      /* offer to compress the biggest run of > 1 zero */
-	      if (this_zero_run > max_zero_run && this_zero_run > 1)
-		{
-		  max_zero_run_index = this_zero_run_index;
-		  max_zero_run = this_zero_run;
-		}
-	    }
-	  in_zero_run = 0;
-	  this_zero_run = 0;
-	}
-    }
-
-  if (in_zero_run)
-    {
-      if (this_zero_run > max_zero_run && this_zero_run > 1)
-	{
-	  max_zero_run_index = this_zero_run_index;
-	  max_zero_run = this_zero_run;
-	}
-    }
-
-  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
-    {
-      if (i == max_zero_run_index)
-	{
-	  s = format (s, "::");
-	  i += max_zero_run - 1;
-	  last_double_colon = 1;
-	}
-      else
-	{
-	  s = format (s, "%s%x",
-		      (last_double_colon || i == 0) ? "" : ":",
-		      clib_net_to_host_u16 (a->as_u16[i]));
-	  last_double_colon = 0;
-	}
-    }
-
-  return s;
-}
-
-/* Format an IP6 route destination and length. */
-u8 *
-format_ip6_address_and_length (u8 * s, va_list * args)
-{
-  ip6_address_t *a = va_arg (*args, ip6_address_t *);
-  u8 l = va_arg (*args, u32);
-  return format (s, "%U/%d", format_ip6_address, a, l);
-}
-
-/* Parse an IP6 address. */
-uword
-unformat_ip6_address (unformat_input_t * input, va_list * args)
-{
-  ip6_address_t *result = va_arg (*args, ip6_address_t *);
-  u16 hex_quads[8];
-  uword hex_quad, n_hex_quads, hex_digit, n_hex_digits;
-  uword c, n_colon, double_colon_index;
-
-  n_hex_quads = hex_quad = n_hex_digits = n_colon = 0;
-  double_colon_index = ARRAY_LEN (hex_quads);
-  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
-    {
-      hex_digit = 16;
-      if (c >= '0' && c <= '9')
-	hex_digit = c - '0';
-      else if (c >= 'a' && c <= 'f')
-	hex_digit = c + 10 - 'a';
-      else if (c >= 'A' && c <= 'F')
-	hex_digit = c + 10 - 'A';
-      else if (c == ':' && n_colon < 2)
-	n_colon++;
-      else
-	{
-	  unformat_put_input (input);
-	  break;
-	}
-
-      /* Too many hex quads. */
-      if (n_hex_quads >= ARRAY_LEN (hex_quads))
-	return 0;
-
-      if (hex_digit < 16)
-	{
-	  hex_quad = (hex_quad << 4) | hex_digit;
-
-	  /* Hex quad must fit in 16 bits. */
-	  if (n_hex_digits >= 4)
-	    return 0;
-
-	  n_colon = 0;
-	  n_hex_digits++;
-	}
-
-      /* Save position of :: */
-      if (n_colon == 2)
-	{
-	  /* More than one :: ? */
-	  if (double_colon_index < ARRAY_LEN (hex_quads))
-	    return 0;
-	  double_colon_index = n_hex_quads;
-	}
-
-      if (n_colon > 0 && n_hex_digits > 0)
-	{
-	  hex_quads[n_hex_quads++] = hex_quad;
-	  hex_quad = 0;
-	  n_hex_digits = 0;
-	}
-    }
-
-  if (n_hex_digits > 0)
-    hex_quads[n_hex_quads++] = hex_quad;
-
-  {
-    word i;
-
-    /* Expand :: to appropriate number of zero hex quads. */
-    if (double_colon_index < ARRAY_LEN (hex_quads))
-      {
-	word n_zero = ARRAY_LEN (hex_quads) - n_hex_quads;
-
-	for (i = n_hex_quads - 1; i >= (signed) double_colon_index; i--)
-	  hex_quads[n_zero + i] = hex_quads[i];
-
-	for (i = 0; i < n_zero; i++)
-	  {
-	    ASSERT ((double_colon_index + i) < ARRAY_LEN (hex_quads));
-	    hex_quads[double_colon_index + i] = 0;
-	  }
-
-	n_hex_quads = ARRAY_LEN (hex_quads);
-      }
-
-    /* Too few hex quads given. */
-    if (n_hex_quads < ARRAY_LEN (hex_quads))
-      return 0;
-
-    for (i = 0; i < ARRAY_LEN (hex_quads); i++)
-      result->as_u16[i] = clib_host_to_net_u16 (hex_quads[i]);
-
-    return 1;
-  }
-}
-
-/* Format an IP6 header. */
-u8 *
-format_ip6_header (u8 * s, va_list * args)
-{
-  ip6_header_t *ip = va_arg (*args, ip6_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-  u32 i, ip_version, traffic_class, flow_label;
-  uword indent;
-
-  /* Nothing to do. */
-  if (max_header_bytes < sizeof (ip[0]))
-    return format (s, "IP header truncated");
-
-  indent = format_get_indent (s);
-  indent += 2;
-
-  s = format (s, "%U: %U -> %U",
-	      format_ip_protocol, ip->protocol,
-	      format_ip6_address, &ip->src_address,
-	      format_ip6_address, &ip->dst_address);
-
-  i = clib_net_to_host_u32 (ip->ip_version_traffic_class_and_flow_label);
-  ip_version = (i >> 28);
-  traffic_class = (i >> 20) & 0xff;
-  flow_label = i & pow2_mask (20);
-
-  if (ip_version != 6)
-    s = format (s, "\n%Uversion %d", format_white_space, indent, ip_version);
-
-  s =
-    format (s,
-	    "\n%Utos 0x%02x, flow label 0x%x, hop limit %d, payload length %d",
-	    format_white_space, indent, traffic_class, flow_label,
-	    ip->hop_limit, clib_net_to_host_u16 (ip->payload_length));
-
-  /* Recurse into next protocol layer. */
-  if (max_header_bytes != 0 && sizeof (ip[0]) < max_header_bytes)
-    {
-      ip_main_t *im = &ip_main;
-      ip_protocol_info_t *pi = ip_get_protocol_info (im, ip->protocol);
-
-      if (pi && pi->format_header)
-	s = format (s, "\n%U%U",
-		    format_white_space, indent - 2, pi->format_header,
-		    /* next protocol header */ (void *) (ip + 1),
-		    max_header_bytes - sizeof (ip[0]));
-    }
-
-  return s;
-}
-
-/* Parse an IP6 header. */
-uword
-unformat_ip6_header (unformat_input_t * input, va_list * args)
-{
-  u8 **result = va_arg (*args, u8 **);
-  ip6_header_t *ip;
-  int old_length;
-
-  /* Allocate space for IP header. */
-  {
-    void *p;
-
-    old_length = vec_len (*result);
-    vec_add2 (*result, p, sizeof (ip[0]));
-    ip = p;
-  }
-
-  memset (ip, 0, sizeof (ip[0]));
-  ip->ip_version_traffic_class_and_flow_label =
-    clib_host_to_net_u32 (6 << 28);
-
-  if (!unformat (input, "%U: %U -> %U",
-		 unformat_ip_protocol, &ip->protocol,
-		 unformat_ip6_address, &ip->src_address,
-		 unformat_ip6_address, &ip->dst_address))
-    return 0;
-
-  /* Parse options. */
-  while (1)
-    {
-      int i;
-
-      if (unformat (input, "tos %U", unformat_vlib_number, &i))
-	ip->ip_version_traffic_class_and_flow_label |=
-	  clib_host_to_net_u32 ((i & 0xff) << 20);
-
-      else if (unformat (input, "hop-limit %U", unformat_vlib_number, &i))
-	ip->hop_limit = i;
-
-      /* Can't parse input: try next protocol level. */
-      else
-	break;
-    }
-
-  /* Recurse into next protocol layer. */
-  {
-    ip_main_t *im = &ip_main;
-    ip_protocol_info_t *pi = ip_get_protocol_info (im, ip->protocol);
-
-    if (pi && pi->unformat_header)
-      {
-	if (!unformat_user (input, pi->unformat_header, result))
-	  return 0;
-
-	/* Result may have moved. */
-	ip = (void *) *result + old_length;
-      }
-  }
-
-  ip->payload_length =
-    clib_host_to_net_u16 (vec_len (*result) - (old_length + sizeof (ip[0])));
-
-  return 1;
-}
-
-/* Parse an IP46 address. */
-uword
-unformat_ip46_address (unformat_input_t * input, va_list * args)
-{
-  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
-  ip46_type_t type = va_arg (*args, ip46_type_t);
-  if ((type != IP46_TYPE_IP6) &&
-      unformat (input, "%U", unformat_ip4_address, &ip46->ip4))
-    {
-      ip46_address_mask_ip4 (ip46);
-      return 1;
-    }
-  else if ((type != IP46_TYPE_IP4) &&
-	   unformat (input, "%U", unformat_ip6_address, &ip46->ip6))
-    {
-      return 1;
-    }
-  return 0;
-}
-
-/* Format an IP46 address. */
-u8 *
-format_ip46_address (u8 * s, va_list * args)
-{
-  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
-  ip46_type_t type = va_arg (*args, ip46_type_t);
-  int is_ip4 = 1;
-
-  switch (type)
-    {
-    case IP46_TYPE_ANY:
-      is_ip4 = ip46_address_is_ip4 (ip46);
-      break;
-    case IP46_TYPE_IP4:
-      is_ip4 = 1;
-      break;
-    case IP46_TYPE_IP6:
-      is_ip4 = 0;
-      break;
-    }
-
-  return is_ip4 ?
-    format (s, "%U", format_ip4_address, &ip46->ip4) :
-    format (s, "%U", format_ip6_address, &ip46->ip6);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip6_forward.c b/vnet/vnet/ip/ip6_forward.c
deleted file mode 100644
index b5c79552..00000000
--- a/vnet/vnet/ip/ip6_forward.c
+++ /dev/null
@@ -1,3402 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip6_forward.c: IP v6 forwarding
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>	/* for ethernet_header_t */
-#include <vnet/srp/srp.h>	/* for srp_hw_interface_class */
-#include <vppinfra/cache.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/dpo/load_balance.h>
-#include <vnet/dpo/classify_dpo.h>
-
-#include <vppinfra/bihash_template.c>
-
-/**
- * @file
- * @brief IPv6 Forwarding.
- *
- * This file contains the source code for IPv6 forwarding.
- */
-
-void
-ip6_forward_next_trace (vlib_main_t * vm,
-			vlib_node_runtime_t * node,
-			vlib_frame_t * frame,
-			vlib_rx_or_tx_t which_adj_index);
-
-always_inline uword
-ip6_lookup_inline (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  ip6_main_t *im = &ip6_main;
-  vlib_combined_counter_main_t *cm = &load_balance_main.lbm_to_counters;
-  u32 n_left_from, n_left_to_next, *from, *to_next;
-  ip_lookup_next_t next;
-  u32 cpu_index = os_get_cpu_number ();
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  vlib_buffer_t *p0, *p1;
-	  u32 pi0, pi1, lbi0, lbi1, wrong_next;
-	  ip_lookup_next_t next0, next1;
-	  ip6_header_t *ip0, *ip1;
-	  ip6_address_t *dst_addr0, *dst_addr1;
-	  u32 fib_index0, fib_index1;
-	  u32 flow_hash_config0, flow_hash_config1;
-	  const dpo_id_t *dpo0, *dpo1;
-	  const load_balance_t *lb0, *lb1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), LOAD);
-	    CLIB_PREFETCH (p3->data, sizeof (ip0[0]), LOAD);
-	  }
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-
-	  ip0 = vlib_buffer_get_current (p0);
-	  ip1 = vlib_buffer_get_current (p1);
-
-	  dst_addr0 = &ip0->dst_address;
-	  dst_addr1 = &ip1->dst_address;
-
-	  fib_index0 =
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (p0)->sw_if_index[VLIB_RX]);
-	  fib_index1 =
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (p1)->sw_if_index[VLIB_RX]);
-
-	  fib_index0 = (vnet_buffer (p0)->sw_if_index[VLIB_TX] == (u32) ~ 0) ?
-	    fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
-	  fib_index1 = (vnet_buffer (p1)->sw_if_index[VLIB_TX] == (u32) ~ 0) ?
-	    fib_index1 : vnet_buffer (p1)->sw_if_index[VLIB_TX];
-
-	  lbi0 = ip6_fib_table_fwding_lookup (im, fib_index0, dst_addr0);
-	  lbi1 = ip6_fib_table_fwding_lookup (im, fib_index1, dst_addr1);
-
-	  lb0 = load_balance_get (lbi0);
-	  lb1 = load_balance_get (lbi1);
-
-	  vnet_buffer (p0)->ip.flow_hash = vnet_buffer (p1)->ip.flow_hash = 0;
-
-	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
-	    {
-	      flow_hash_config0 = lb0->lb_hash_config;
-	      vnet_buffer (p0)->ip.flow_hash =
-		ip6_compute_flow_hash (ip0, flow_hash_config0);
-	    }
-	  if (PREDICT_FALSE (lb1->lb_n_buckets > 1))
-	    {
-	      flow_hash_config1 = lb1->lb_hash_config;
-	      vnet_buffer (p1)->ip.flow_hash =
-		ip6_compute_flow_hash (ip1, flow_hash_config1);
-	    }
-
-	  ASSERT (lb0->lb_n_buckets > 0);
-	  ASSERT (lb1->lb_n_buckets > 0);
-	  ASSERT (is_pow2 (lb0->lb_n_buckets));
-	  ASSERT (is_pow2 (lb1->lb_n_buckets));
-	  dpo0 = load_balance_get_bucket_i (lb0,
-					    (vnet_buffer (p0)->ip.flow_hash &
-					     lb0->lb_n_buckets_minus_1));
-	  dpo1 = load_balance_get_bucket_i (lb1,
-					    (vnet_buffer (p1)->ip.flow_hash &
-					     lb1->lb_n_buckets_minus_1));
-
-	  next0 = dpo0->dpoi_next_node;
-	  next1 = dpo1->dpoi_next_node;
-
-	  /* Only process the HBH Option Header if explicitly configured to do so */
-	  if (PREDICT_FALSE
-	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-	    {
-	      next0 = (dpo_is_adj (dpo0) && im->hbh_enabled) ?
-		(ip_lookup_next_t) IP6_LOOKUP_NEXT_HOP_BY_HOP : next0;
-	    }
-	  if (PREDICT_FALSE
-	      (ip1->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-	    {
-	      next1 = (dpo_is_adj (dpo1) && im->hbh_enabled) ?
-		(ip_lookup_next_t) IP6_LOOKUP_NEXT_HOP_BY_HOP : next1;
-	    }
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-	  vnet_buffer (p1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
-
-	  vlib_increment_combined_counter
-	    (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, p0));
-	  vlib_increment_combined_counter
-	    (cm, cpu_index, lbi1, 1, vlib_buffer_length_in_chain (vm, p1));
-
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  wrong_next = (next0 != next) + 2 * (next1 != next);
-	  if (PREDICT_FALSE (wrong_next != 0))
-	    {
-	      switch (wrong_next)
-		{
-		case 1:
-		  /* A B A */
-		  to_next[-2] = pi1;
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node, next0, pi0);
-		  break;
-
-		case 2:
-		  /* A A B */
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node, next1, pi1);
-		  break;
-
-		case 3:
-		  /* A B C */
-		  to_next -= 2;
-		  n_left_to_next += 2;
-		  vlib_set_next_frame_buffer (vm, node, next0, pi0);
-		  vlib_set_next_frame_buffer (vm, node, next1, pi1);
-		  if (next0 == next1)
-		    {
-		      /* A B B */
-		      vlib_put_next_frame (vm, node, next, n_left_to_next);
-		      next = next1;
-		      vlib_get_next_frame (vm, node, next, to_next,
-					   n_left_to_next);
-		    }
-		}
-	    }
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip6_header_t *ip0;
-	  u32 pi0, lbi0;
-	  ip_lookup_next_t next0;
-	  load_balance_t *lb0;
-	  ip6_address_t *dst_addr0;
-	  u32 fib_index0, flow_hash_config0;
-	  const dpo_id_t *dpo0;
-
-	  pi0 = from[0];
-	  to_next[0] = pi0;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  ip0 = vlib_buffer_get_current (p0);
-
-	  dst_addr0 = &ip0->dst_address;
-
-	  fib_index0 =
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (p0)->sw_if_index[VLIB_RX]);
-	  fib_index0 =
-	    (vnet_buffer (p0)->sw_if_index[VLIB_TX] ==
-	     (u32) ~ 0) ? fib_index0 : vnet_buffer (p0)->sw_if_index[VLIB_TX];
-
-	  flow_hash_config0 = ip6_fib_get (fib_index0)->flow_hash_config;
-
-	  lbi0 = ip6_fib_table_fwding_lookup (im, fib_index0, dst_addr0);
-
-	  lb0 = load_balance_get (lbi0);
-
-	  vnet_buffer (p0)->ip.flow_hash = 0;
-
-	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
-	    {
-	      flow_hash_config0 = lb0->lb_hash_config;
-	      vnet_buffer (p0)->ip.flow_hash =
-		ip6_compute_flow_hash (ip0, flow_hash_config0);
-	    }
-
-	  ASSERT (lb0->lb_n_buckets > 0);
-	  ASSERT (is_pow2 (lb0->lb_n_buckets));
-	  dpo0 = load_balance_get_bucket_i (lb0,
-					    (vnet_buffer (p0)->ip.flow_hash &
-					     lb0->lb_n_buckets_minus_1));
-	  next0 = dpo0->dpoi_next_node;
-
-	  /* Only process the HBH Option Header if explicitly configured to do so */
-	  if (PREDICT_FALSE
-	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-	    {
-	      next0 = (dpo_is_adj (dpo0) && im->hbh_enabled) ?
-		(ip_lookup_next_t) IP6_LOOKUP_NEXT_HOP_BY_HOP : next0;
-	    }
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-
-	  vlib_increment_combined_counter
-	    (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, p0));
-
-	  from += 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  n_left_from -= 1;
-
-	  if (PREDICT_FALSE (next0 != next))
-	    {
-	      n_left_to_next += 1;
-	      vlib_put_next_frame (vm, node, next, n_left_to_next);
-	      next = next0;
-	      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
-	      to_next[0] = pi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next, n_left_to_next);
-    }
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    ip6_forward_next_trace (vm, node, frame, VLIB_TX);
-
-  return frame->n_vectors;
-}
-
-static void
-ip6_add_interface_routes (vnet_main_t * vnm, u32 sw_if_index,
-			  ip6_main_t * im, u32 fib_index,
-			  ip_interface_address_t * a)
-{
-  ip_lookup_main_t *lm = &im->lookup_main;
-  ip6_address_t *address = ip_interface_address_get_address (lm, a);
-  fib_prefix_t pfx = {
-    .fp_len = a->address_length,
-    .fp_proto = FIB_PROTOCOL_IP6,
-    .fp_addr.ip6 = *address,
-  };
-
-  a->neighbor_probe_adj_index = ~0;
-  if (a->address_length < 128)
-    {
-      fib_node_index_t fei;
-
-      fei = fib_table_entry_update_one_path (fib_index, &pfx, FIB_SOURCE_INTERFACE, (FIB_ENTRY_FLAG_CONNECTED | FIB_ENTRY_FLAG_ATTACHED), FIB_PROTOCOL_IP6, NULL,	/* No next-hop address */
-					     sw_if_index, ~0,	// invalid FIB index
-					     1, NULL,	// no label stack
-					     FIB_ROUTE_PATH_FLAG_NONE);
-      a->neighbor_probe_adj_index = fib_entry_get_adj (fei);
-    }
-
-  pfx.fp_len = 128;
-  if (sw_if_index < vec_len (lm->classify_table_index_by_sw_if_index))
-    {
-      u32 classify_table_index =
-	lm->classify_table_index_by_sw_if_index[sw_if_index];
-      if (classify_table_index != (u32) ~ 0)
-	{
-	  dpo_id_t dpo = DPO_INVALID;
-
-	  dpo_set (&dpo,
-		   DPO_CLASSIFY,
-		   DPO_PROTO_IP6,
-		   classify_dpo_create (DPO_PROTO_IP6, classify_table_index));
-
-	  fib_table_entry_special_dpo_add (fib_index,
-					   &pfx,
-					   FIB_SOURCE_CLASSIFY,
-					   FIB_ENTRY_FLAG_NONE, &dpo);
-	  dpo_reset (&dpo);
-	}
-    }
-
-  fib_table_entry_update_one_path (fib_index, &pfx, FIB_SOURCE_INTERFACE, (FIB_ENTRY_FLAG_CONNECTED | FIB_ENTRY_FLAG_LOCAL), FIB_PROTOCOL_IP6, &pfx.fp_addr, sw_if_index, ~0,	// invalid FIB index
-				   1, NULL, FIB_ROUTE_PATH_FLAG_NONE);
-}
-
-static void
-ip6_del_interface_routes (ip6_main_t * im,
-			  u32 fib_index,
-			  ip6_address_t * address, u32 address_length)
-{
-  fib_prefix_t pfx = {
-    .fp_len = address_length,
-    .fp_proto = FIB_PROTOCOL_IP6,
-    .fp_addr.ip6 = *address,
-  };
-
-  if (pfx.fp_len < 128)
-    {
-      fib_table_entry_delete (fib_index, &pfx, FIB_SOURCE_INTERFACE);
-
-    }
-
-  pfx.fp_len = 128;
-  fib_table_entry_delete (fib_index, &pfx, FIB_SOURCE_INTERFACE);
-}
-
-void
-ip6_sw_interface_enable_disable (u32 sw_if_index, u32 is_enable)
-{
-  ip6_main_t *im = &ip6_main;
-
-  vec_validate_init_empty (im->ip_enabled_by_sw_if_index, sw_if_index, 0);
-
-  /*
-   * enable/disable only on the 1<->0 transition
-   */
-  if (is_enable)
-    {
-      if (1 != ++im->ip_enabled_by_sw_if_index[sw_if_index])
-	return;
-    }
-  else
-    {
-      ASSERT (im->ip_enabled_by_sw_if_index[sw_if_index] > 0);
-      if (0 != --im->ip_enabled_by_sw_if_index[sw_if_index])
-	return;
-    }
-
-  vnet_feature_enable_disable ("ip6-unicast", "ip6-lookup", sw_if_index,
-			       is_enable, 0, 0);
-
-  vnet_feature_enable_disable ("ip6-multicast", "ip6-lookup", sw_if_index,
-			       is_enable, 0, 0);
-
-}
-
-/* get first interface address */
-ip6_address_t *
-ip6_interface_first_address (ip6_main_t * im,
-			     u32 sw_if_index,
-			     ip_interface_address_t ** result_ia)
-{
-  ip_lookup_main_t *lm = &im->lookup_main;
-  ip_interface_address_t *ia = 0;
-  ip6_address_t *result = 0;
-
-  /* *INDENT-OFF* */
-  foreach_ip_interface_address (lm, ia, sw_if_index,
-                                1 /* honor unnumbered */,
-  ({
-    ip6_address_t * a = ip_interface_address_get_address (lm, ia);
-    result = a;
-    break;
-  }));
-  /* *INDENT-ON* */
-  if (result_ia)
-    *result_ia = result ? ia : 0;
-  return result;
-}
-
-clib_error_t *
-ip6_add_del_interface_address (vlib_main_t * vm,
-			       u32 sw_if_index,
-			       ip6_address_t * address,
-			       u32 address_length, u32 is_del)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_main_t *im = &ip6_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-  clib_error_t *error;
-  u32 if_address_index;
-  ip6_address_fib_t ip6_af, *addr_fib = 0;
-
-  vec_validate (im->fib_index_by_sw_if_index, sw_if_index);
-  ip6_addr_fib_init (&ip6_af, address,
-		     vec_elt (im->fib_index_by_sw_if_index, sw_if_index));
-  vec_add1 (addr_fib, ip6_af);
-
-  {
-    uword elts_before = pool_elts (lm->if_address_pool);
-
-    error = ip_interface_address_add_del
-      (lm, sw_if_index, addr_fib, address_length, is_del, &if_address_index);
-    if (error)
-      goto done;
-
-    /* Pool did not grow: add duplicate address. */
-    if (elts_before == pool_elts (lm->if_address_pool))
-      goto done;
-  }
-
-  ip6_sw_interface_enable_disable (sw_if_index, !is_del);
-
-  if (is_del)
-    ip6_del_interface_routes (im, ip6_af.fib_index, address, address_length);
-  else
-    ip6_add_interface_routes (vnm, sw_if_index,
-			      im, ip6_af.fib_index,
-			      pool_elt_at_index (lm->if_address_pool,
-						 if_address_index));
-
-  {
-    ip6_add_del_interface_address_callback_t *cb;
-    vec_foreach (cb, im->add_del_interface_address_callbacks)
-      cb->function (im, cb->function_opaque, sw_if_index,
-		    address, address_length, if_address_index, is_del);
-  }
-
-done:
-  vec_free (addr_fib);
-  return error;
-}
-
-clib_error_t *
-ip6_sw_interface_admin_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
-{
-  ip6_main_t *im = &ip6_main;
-  ip_interface_address_t *ia;
-  ip6_address_t *a;
-  u32 is_admin_up, fib_index;
-
-  /* Fill in lookup tables with default table (0). */
-  vec_validate (im->fib_index_by_sw_if_index, sw_if_index);
-
-  vec_validate_init_empty (im->
-			   lookup_main.if_address_pool_index_by_sw_if_index,
-			   sw_if_index, ~0);
-
-  is_admin_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
-
-  fib_index = vec_elt (im->fib_index_by_sw_if_index, sw_if_index);
-
-  /* *INDENT-OFF* */
-  foreach_ip_interface_address (&im->lookup_main, ia, sw_if_index,
-                                0 /* honor unnumbered */,
-  ({
-    a = ip_interface_address_get_address (&im->lookup_main, ia);
-    if (is_admin_up)
-      ip6_add_interface_routes (vnm, sw_if_index,
-				im, fib_index,
-				ia);
-    else
-      ip6_del_interface_routes (im, fib_index,
-				a, ia->address_length);
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (ip6_sw_interface_admin_up_down);
-
-/* Built-in ip6 unicast rx feature path definition */
-/* *INDENT-OFF* */
-VNET_FEATURE_ARC_INIT (ip6_unicast, static) =
-{
-  .arc_name  = "ip6-unicast",
-  .start_nodes = VNET_FEATURES ("ip6-input"),
-  .arc_index_ptr = &ip6_main.lookup_main.ucast_feature_arc_index,
-};
-
-VNET_FEATURE_INIT (ip6_flow_classify, static) =
-{
-  .arc_name = "ip6-unicast",
-  .node_name = "ip6-flow-classify",
-  .runs_before = VNET_FEATURES ("ip6-inacl"),
-};
-
-VNET_FEATURE_INIT (ip6_inacl, static) =
-{
-  .arc_name = "ip6-unicast",
-  .node_name = "ip6-inacl",
-  .runs_before = VNET_FEATURES ("ip6-policer-classify"),
-};
-
-VNET_FEATURE_INIT (ip6_policer_classify, static) =
-{
-  .arc_name = "ip6-unicast",
-  .node_name = "ip6-policer-classify",
-  .runs_before = VNET_FEATURES ("ipsec-input-ip6"),
-};
-
-VNET_FEATURE_INIT (ip6_ipsec, static) =
-{
-  .arc_name = "ip6-unicast",
-  .node_name = "ipsec-input-ip6",
-  .runs_before = VNET_FEATURES ("l2tp-decap"),
-};
-
-VNET_FEATURE_INIT (ip6_l2tp, static) =
-{
-  .arc_name = "ip6-unicast",
-  .node_name = "l2tp-decap",
-  .runs_before = VNET_FEATURES ("vpath-input-ip6"),
-};
-
-VNET_FEATURE_INIT (ip6_vpath, static) =
-{
-  .arc_name = "ip6-unicast",
-  .node_name = "vpath-input-ip6",
-  .runs_before = VNET_FEATURES ("ip6-lookup"),
-};
-
-VNET_FEATURE_INIT (ip6_lookup, static) =
-{
-  .arc_name = "ip6-unicast",
-  .node_name = "ip6-lookup",
-  .runs_before = VNET_FEATURES ("ip6-drop"),
-};
-
-VNET_FEATURE_INIT (ip6_drop, static) =
-{
-  .arc_name = "ip6-unicast",
-  .node_name = "ip6-drop",
-  .runs_before = 0,  /*last feature*/
-};
-
-/* Built-in ip6 multicast rx feature path definition (none now) */
-VNET_FEATURE_ARC_INIT (ip6_multicast, static) =
-{
-  .arc_name  = "ip6-multicast",
-  .start_nodes = VNET_FEATURES ("ip6-input"),
-  .arc_index_ptr = &ip6_main.lookup_main.mcast_feature_arc_index,
-};
-
-VNET_FEATURE_INIT (ip6_vpath_mc, static) = {
-  .arc_name = "ip6-multicast",
-  .node_name = "vpath-input-ip6",
-  .runs_before = VNET_FEATURES ("ip6-lookup"),
-};
-
-VNET_FEATURE_INIT (ip6_mc_lookup, static) = {
-  .arc_name = "ip6-multicast",
-  .node_name = "ip6-lookup",
-  .runs_before = VNET_FEATURES ("ip6-drop"),
-};
-
-VNET_FEATURE_INIT (ip6_drop_mc, static) = {
-  .arc_name = "ip6-multicast",
-  .node_name = "ip6-drop",
-  .runs_before = 0, /* last feature */
-};
-
-/* Built-in ip4 tx feature path definition */
-VNET_FEATURE_ARC_INIT (ip6_output, static) =
-{
-  .arc_name  = "ip6-output",
-  .start_nodes = VNET_FEATURES ("ip6-rewrite", "ip6-midchain"),
-  .arc_index_ptr = &ip6_main.lookup_main.output_feature_arc_index,
-};
-
-VNET_FEATURE_INIT (ip6_ipsec_output, static) = {
-  .arc_name = "ip6-output",
-  .node_name = "ipsec-output-ip6",
-  .runs_before = VNET_FEATURES ("interface-output"),
-};
-
-VNET_FEATURE_INIT (ip6_interface_output, static) = {
-  .arc_name = "ip6-output",
-  .node_name = "interface-output",
-  .runs_before = 0, /* not before any other features */
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-ip6_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
-{
-  vnet_feature_enable_disable ("ip6-unicast", "ip6-drop", sw_if_index,
-			       is_add, 0, 0);
-
-  vnet_feature_enable_disable ("ip6-multicast", "ip6-drop", sw_if_index,
-			       is_add, 0, 0);
-
-  vnet_feature_enable_disable ("ip6-output", "interface-output", sw_if_index,
-			       is_add, 0, 0);
-
-  return /* no error */ 0;
-}
-
-VNET_SW_INTERFACE_ADD_DEL_FUNCTION (ip6_sw_interface_add_del);
-
-static uword
-ip6_lookup (vlib_main_t * vm,
-	    vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return ip6_lookup_inline (vm, node, frame);
-}
-
-static u8 *format_ip6_lookup_trace (u8 * s, va_list * args);
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_lookup_node) =
-{
-  .function = ip6_lookup,
-  .name = "ip6-lookup",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip6_lookup_trace,
-  .n_next_nodes = IP6_LOOKUP_N_NEXT,
-  .next_nodes = IP6_LOOKUP_NEXT_NODES,
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_lookup_node, ip6_lookup);
-
-always_inline uword
-ip6_load_balance (vlib_main_t * vm,
-		  vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  vlib_combined_counter_main_t *cm = &load_balance_main.lbm_via_counters;
-  u32 n_left_from, n_left_to_next, *from, *to_next;
-  ip_lookup_next_t next;
-  u32 cpu_index = os_get_cpu_number ();
-  ip6_main_t *im = &ip6_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    ip6_forward_next_trace (vm, node, frame, VLIB_TX);
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next, to_next, n_left_to_next);
-
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  ip_lookup_next_t next0, next1;
-	  const load_balance_t *lb0, *lb1;
-	  vlib_buffer_t *p0, *p1;
-	  u32 pi0, lbi0, hc0, pi1, lbi1, hc1;
-	  const ip6_header_t *ip0, *ip1;
-	  const dpo_id_t *dpo0, *dpo1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, STORE);
-	    vlib_prefetch_buffer_header (p3, STORE);
-
-	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), STORE);
-	    CLIB_PREFETCH (p3->data, sizeof (ip0[0]), STORE);
-	  }
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-
-	  ip0 = vlib_buffer_get_current (p0);
-	  ip1 = vlib_buffer_get_current (p1);
-	  lbi0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-	  lbi1 = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
-
-	  lb0 = load_balance_get (lbi0);
-	  lb1 = load_balance_get (lbi1);
-
-	  /*
-	   * this node is for via FIBs we can re-use the hash value from the
-	   * to node if present.
-	   * We don't want to use the same hash value at each level in the recursion
-	   * graph as that would lead to polarisation
-	   */
-	  hc0 = vnet_buffer (p0)->ip.flow_hash = 0;
-	  hc1 = vnet_buffer (p1)->ip.flow_hash = 0;
-
-	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
-	    {
-	      if (PREDICT_TRUE (vnet_buffer (p0)->ip.flow_hash))
-		{
-		  hc0 = vnet_buffer (p0)->ip.flow_hash =
-		    vnet_buffer (p0)->ip.flow_hash >> 1;
-		}
-	      else
-		{
-		  hc0 = vnet_buffer (p0)->ip.flow_hash =
-		    ip6_compute_flow_hash (ip0, hc0);
-		}
-	    }
-	  if (PREDICT_FALSE (lb1->lb_n_buckets > 1))
-	    {
-	      if (PREDICT_TRUE (vnet_buffer (p1)->ip.flow_hash))
-		{
-		  hc1 = vnet_buffer (p1)->ip.flow_hash =
-		    vnet_buffer (p1)->ip.flow_hash >> 1;
-		}
-	      else
-		{
-		  hc1 = vnet_buffer (p1)->ip.flow_hash =
-		    ip6_compute_flow_hash (ip1, hc1);
-		}
-	    }
-
-	  dpo0 =
-	    load_balance_get_bucket_i (lb0,
-				       hc0 & (lb0->lb_n_buckets_minus_1));
-	  dpo1 =
-	    load_balance_get_bucket_i (lb1,
-				       hc1 & (lb1->lb_n_buckets_minus_1));
-
-	  next0 = dpo0->dpoi_next_node;
-	  next1 = dpo1->dpoi_next_node;
-
-	  /* Only process the HBH Option Header if explicitly configured to do so */
-	  if (PREDICT_FALSE
-	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-	    {
-	      next0 = (dpo_is_adj (dpo0) && im->hbh_enabled) ?
-		(ip_lookup_next_t) IP6_LOOKUP_NEXT_HOP_BY_HOP : next0;
-	    }
-	  /* Only process the HBH Option Header if explicitly configured to do so */
-	  if (PREDICT_FALSE
-	      (ip1->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-	    {
-	      next1 = (dpo_is_adj (dpo1) && im->hbh_enabled) ?
-		(ip_lookup_next_t) IP6_LOOKUP_NEXT_HOP_BY_HOP : next1;
-	    }
-
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-	  vnet_buffer (p1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
-
-	  vlib_increment_combined_counter
-	    (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, p0));
-	  vlib_increment_combined_counter
-	    (cm, cpu_index, lbi1, 1, vlib_buffer_length_in_chain (vm, p1));
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next,
-					   to_next, n_left_to_next,
-					   pi0, pi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  ip_lookup_next_t next0;
-	  const load_balance_t *lb0;
-	  vlib_buffer_t *p0;
-	  u32 pi0, lbi0, hc0;
-	  const ip6_header_t *ip0;
-	  const dpo_id_t *dpo0;
-
-	  pi0 = from[0];
-	  to_next[0] = pi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  n_left_from -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  ip0 = vlib_buffer_get_current (p0);
-	  lbi0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-
-	  lb0 = load_balance_get (lbi0);
-
-	  hc0 = vnet_buffer (p0)->ip.flow_hash = 0;
-	  if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
-	    {
-	      if (PREDICT_TRUE (vnet_buffer (p0)->ip.flow_hash))
-		{
-		  hc0 = vnet_buffer (p0)->ip.flow_hash =
-		    vnet_buffer (p0)->ip.flow_hash >> 1;
-		}
-	      else
-		{
-		  hc0 = vnet_buffer (p0)->ip.flow_hash =
-		    ip6_compute_flow_hash (ip0, hc0);
-		}
-	    }
-	  dpo0 =
-	    load_balance_get_bucket_i (lb0,
-				       hc0 & (lb0->lb_n_buckets_minus_1));
-
-	  next0 = dpo0->dpoi_next_node;
-	  vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-
-	  /* Only process the HBH Option Header if explicitly configured to do so */
-	  if (PREDICT_FALSE
-	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-	    {
-	      next0 = (dpo_is_adj (dpo0) && im->hbh_enabled) ?
-		(ip_lookup_next_t) IP6_LOOKUP_NEXT_HOP_BY_HOP : next0;
-	    }
-
-	  vlib_increment_combined_counter
-	    (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, p0));
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next,
-					   to_next, n_left_to_next,
-					   pi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_load_balance_node) =
-{
-  .function = ip6_load_balance,
-  .name = "ip6-load-balance",
-  .vector_size = sizeof (u32),
-  .sibling_of = "ip6-lookup",
-  .format_trace = format_ip6_lookup_trace,
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_load_balance_node, ip6_load_balance);
-
-typedef struct
-{
-  /* Adjacency taken. */
-  u32 adj_index;
-  u32 flow_hash;
-  u32 fib_index;
-
-  /* Packet data, possibly *after* rewrite. */
-  u8 packet_data[128 - 1 * sizeof (u32)];
-}
-ip6_forward_next_trace_t;
-
-static u8 *
-format_ip6_forward_next_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip6_forward_next_trace_t *t = va_arg (*args, ip6_forward_next_trace_t *);
-  uword indent = format_get_indent (s);
-
-  s = format (s, "%U%U",
-	      format_white_space, indent,
-	      format_ip6_header, t->packet_data, sizeof (t->packet_data));
-  return s;
-}
-
-static u8 *
-format_ip6_lookup_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip6_forward_next_trace_t *t = va_arg (*args, ip6_forward_next_trace_t *);
-  uword indent = format_get_indent (s);
-
-  s = format (s, "fib %d dpo-idx %d flow hash: 0x%08x",
-	      t->fib_index, t->adj_index, t->flow_hash);
-  s = format (s, "\n%U%U",
-	      format_white_space, indent,
-	      format_ip6_header, t->packet_data, sizeof (t->packet_data));
-  return s;
-}
-
-
-static u8 *
-format_ip6_rewrite_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip6_forward_next_trace_t *t = va_arg (*args, ip6_forward_next_trace_t *);
-  vnet_main_t *vnm = vnet_get_main ();
-  uword indent = format_get_indent (s);
-
-  s = format (s, "tx_sw_if_index %d adj-idx %d : %U flow hash: 0x%08x",
-	      t->fib_index, t->adj_index, format_ip_adjacency,
-	      t->adj_index, FORMAT_IP_ADJACENCY_NONE, t->flow_hash);
-  s = format (s, "\n%U%U",
-	      format_white_space, indent,
-	      format_ip_adjacency_packet_data,
-	      vnm, t->adj_index, t->packet_data, sizeof (t->packet_data));
-  return s;
-}
-
-/* Common trace function for all ip6-forward next nodes. */
-void
-ip6_forward_next_trace (vlib_main_t * vm,
-			vlib_node_runtime_t * node,
-			vlib_frame_t * frame, vlib_rx_or_tx_t which_adj_index)
-{
-  u32 *from, n_left;
-  ip6_main_t *im = &ip6_main;
-
-  n_left = frame->n_vectors;
-  from = vlib_frame_vector_args (frame);
-
-  while (n_left >= 4)
-    {
-      u32 bi0, bi1;
-      vlib_buffer_t *b0, *b1;
-      ip6_forward_next_trace_t *t0, *t1;
-
-      /* Prefetch next iteration. */
-      vlib_prefetch_buffer_with_index (vm, from[2], LOAD);
-      vlib_prefetch_buffer_with_index (vm, from[3], LOAD);
-
-      bi0 = from[0];
-      bi1 = from[1];
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-	  t0->adj_index = vnet_buffer (b0)->ip.adj_index[which_adj_index];
-	  t0->flow_hash = vnet_buffer (b0)->ip.flow_hash;
-	  t0->fib_index =
-	    (vnet_buffer (b0)->sw_if_index[VLIB_TX] !=
-	     (u32) ~ 0) ? vnet_buffer (b0)->sw_if_index[VLIB_TX] :
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (b0)->sw_if_index[VLIB_RX]);
-
-	  clib_memcpy (t0->packet_data,
-		       vlib_buffer_get_current (b0),
-		       sizeof (t0->packet_data));
-	}
-      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
-	  t1->adj_index = vnet_buffer (b1)->ip.adj_index[which_adj_index];
-	  t1->flow_hash = vnet_buffer (b1)->ip.flow_hash;
-	  t1->fib_index =
-	    (vnet_buffer (b1)->sw_if_index[VLIB_TX] !=
-	     (u32) ~ 0) ? vnet_buffer (b1)->sw_if_index[VLIB_TX] :
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (b1)->sw_if_index[VLIB_RX]);
-
-	  clib_memcpy (t1->packet_data,
-		       vlib_buffer_get_current (b1),
-		       sizeof (t1->packet_data));
-	}
-      from += 2;
-      n_left -= 2;
-    }
-
-  while (n_left >= 1)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      ip6_forward_next_trace_t *t0;
-
-      bi0 = from[0];
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-	  t0->adj_index = vnet_buffer (b0)->ip.adj_index[which_adj_index];
-	  t0->flow_hash = vnet_buffer (b0)->ip.flow_hash;
-	  t0->fib_index =
-	    (vnet_buffer (b0)->sw_if_index[VLIB_TX] !=
-	     (u32) ~ 0) ? vnet_buffer (b0)->sw_if_index[VLIB_TX] :
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (b0)->sw_if_index[VLIB_RX]);
-
-	  clib_memcpy (t0->packet_data,
-		       vlib_buffer_get_current (b0),
-		       sizeof (t0->packet_data));
-	}
-      from += 1;
-      n_left -= 1;
-    }
-}
-
-static uword
-ip6_drop_or_punt (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * frame, ip6_error_t error_code)
-{
-  u32 *buffers = vlib_frame_vector_args (frame);
-  uword n_packets = frame->n_vectors;
-
-  vlib_error_drop_buffers (vm, node, buffers,
-			   /* stride */ 1,
-			   n_packets,
-			   /* next */ 0,
-			   ip6_input_node.index, error_code);
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    ip6_forward_next_trace (vm, node, frame, VLIB_TX);
-
-  return n_packets;
-}
-
-static uword
-ip6_drop (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return ip6_drop_or_punt (vm, node, frame, IP6_ERROR_ADJACENCY_DROP);
-}
-
-static uword
-ip6_punt (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return ip6_drop_or_punt (vm, node, frame, IP6_ERROR_ADJACENCY_PUNT);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_drop_node, static) =
-{
-  .function = ip6_drop,
-  .name = "ip6-drop",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip6_forward_next_trace,
-  .n_next_nodes = 1,
-  .next_nodes =
-  {
-    [0] = "error-drop",},
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_drop_node, ip6_drop);
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_punt_node, static) =
-{
-  .function = ip6_punt,
-  .name = "ip6-punt",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip6_forward_next_trace,
-  .n_next_nodes = 1,
-  .next_nodes =
-  {
-    [0] = "error-punt",},
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_punt_node, ip6_punt);
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_multicast_node, static) =
-{
-  .function = ip6_drop,
-  .name = "ip6-multicast",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip6_forward_next_trace,
-  .n_next_nodes = 1,
-  .next_nodes =
-  {
-    [0] = "error-drop",
-  },
-};
-
-/* *INDENT-ON* */
-
-/* Compute TCP/UDP/ICMP6 checksum in software. */
-u16
-ip6_tcp_udp_icmp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0,
-				   ip6_header_t * ip0, int *bogus_lengthp)
-{
-  ip_csum_t sum0;
-  u16 sum16, payload_length_host_byte_order;
-  u32 i, n_this_buffer, n_bytes_left;
-  u32 headers_size = sizeof (ip0[0]);
-  void *data_this_buffer;
-
-  ASSERT (bogus_lengthp);
-  *bogus_lengthp = 0;
-
-  /* Initialize checksum with ip header. */
-  sum0 = ip0->payload_length + clib_host_to_net_u16 (ip0->protocol);
-  payload_length_host_byte_order = clib_net_to_host_u16 (ip0->payload_length);
-  data_this_buffer = (void *) (ip0 + 1);
-
-  for (i = 0; i < ARRAY_LEN (ip0->src_address.as_uword); i++)
-    {
-      sum0 = ip_csum_with_carry (sum0,
-				 clib_mem_unaligned (&ip0->
-						     src_address.as_uword[i],
-						     uword));
-      sum0 =
-	ip_csum_with_carry (sum0,
-			    clib_mem_unaligned (&ip0->dst_address.as_uword[i],
-						uword));
-    }
-
-  /* some icmp packets may come with a "router alert" hop-by-hop extension header (e.g., mldv2 packets) */
-  if (PREDICT_FALSE (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-    {
-      u32 skip_bytes;
-      ip6_hop_by_hop_ext_t *ext_hdr =
-	(ip6_hop_by_hop_ext_t *) data_this_buffer;
-
-      /* validate really icmp6 next */
-      ASSERT (ext_hdr->next_hdr == IP_PROTOCOL_ICMP6);
-
-      skip_bytes = 8 * (1 + ext_hdr->n_data_u64s);
-      data_this_buffer = (void *) ((u8 *) data_this_buffer + skip_bytes);
-
-      payload_length_host_byte_order -= skip_bytes;
-      headers_size += skip_bytes;
-    }
-
-  n_bytes_left = n_this_buffer = payload_length_host_byte_order;
-  if (p0 && n_this_buffer + headers_size > p0->current_length)
-    n_this_buffer =
-      p0->current_length >
-      headers_size ? p0->current_length - headers_size : 0;
-  while (1)
-    {
-      sum0 = ip_incremental_checksum (sum0, data_this_buffer, n_this_buffer);
-      n_bytes_left -= n_this_buffer;
-      if (n_bytes_left == 0)
-	break;
-
-      if (!(p0->flags & VLIB_BUFFER_NEXT_PRESENT))
-	{
-	  *bogus_lengthp = 1;
-	  return 0xfefe;
-	}
-      p0 = vlib_get_buffer (vm, p0->next_buffer);
-      data_this_buffer = vlib_buffer_get_current (p0);
-      n_this_buffer = p0->current_length;
-    }
-
-  sum16 = ~ip_csum_fold (sum0);
-
-  return sum16;
-}
-
-u32
-ip6_tcp_udp_icmp_validate_checksum (vlib_main_t * vm, vlib_buffer_t * p0)
-{
-  ip6_header_t *ip0 = vlib_buffer_get_current (p0);
-  udp_header_t *udp0;
-  u16 sum16;
-  int bogus_length;
-
-  /* some icmp packets may come with a "router alert" hop-by-hop extension header (e.g., mldv2 packets) */
-  ASSERT (ip0->protocol == IP_PROTOCOL_TCP
-	  || ip0->protocol == IP_PROTOCOL_ICMP6
-	  || ip0->protocol == IP_PROTOCOL_UDP
-	  || ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS);
-
-  udp0 = (void *) (ip0 + 1);
-  if (ip0->protocol == IP_PROTOCOL_UDP && udp0->checksum == 0)
-    {
-      p0->flags |= (IP_BUFFER_L4_CHECKSUM_COMPUTED
-		    | IP_BUFFER_L4_CHECKSUM_CORRECT);
-      return p0->flags;
-    }
-
-  sum16 = ip6_tcp_udp_icmp_compute_checksum (vm, p0, ip0, &bogus_length);
-
-  p0->flags |= (IP_BUFFER_L4_CHECKSUM_COMPUTED
-		| ((sum16 == 0) << LOG2_IP_BUFFER_L4_CHECKSUM_CORRECT));
-
-  return p0->flags;
-}
-
-/* ip6_locate_header
- *
- * This function is to search for the header specified by the find_hdr number.
- *   1. If the find_hdr < 0 then it finds and returns the protocol number and
- *   offset stored in *offset of the transport or ESP header in the chain if
- *   found.
- *   2. If a header with find_hdr > 0 protocol number is found then the
- *      offset is stored in *offset and protocol number of the header is
- *      returned.
- *   3. If find_hdr header is not found or packet is malformed or
- *      it is a non-first fragment -1 is returned.
- */
-always_inline int
-ip6_locate_header (vlib_buffer_t * p0,
-		   ip6_header_t * ip0, int find_hdr, u32 * offset)
-{
-  u8 next_proto = ip0->protocol;
-  u8 *next_header;
-  u8 done = 0;
-  u32 cur_offset;
-  u8 *temp_nxthdr = 0;
-  u32 exthdr_len = 0;
-
-  next_header = ip6_next_header (ip0);
-  cur_offset = sizeof (ip6_header_t);
-  while (1)
-    {
-      done = (next_proto == find_hdr);
-      if (PREDICT_FALSE
-	  (next_header >=
-	   (u8 *) vlib_buffer_get_current (p0) + p0->current_length))
-	{
-	  //A malicious packet could set an extension header with a too big size
-	  return (-1);
-	}
-      if (done)
-	break;
-      if ((!ip6_ext_hdr (next_proto)) || next_proto == IP_PROTOCOL_IP6_NONXT)
-	{
-	  if (find_hdr < 0)
-	    break;
-	  return -1;
-	}
-      if (next_proto == IP_PROTOCOL_IPV6_FRAGMENTATION)
-	{
-	  ip6_frag_hdr_t *frag_hdr = (ip6_frag_hdr_t *) next_header;
-	  u16 frag_off = ip6_frag_hdr_offset (frag_hdr);
-	  /* Non first fragment return -1 */
-	  if (frag_off)
-	    return (-1);
-	  exthdr_len = sizeof (ip6_frag_hdr_t);
-	  temp_nxthdr = next_header + exthdr_len;
-	}
-      else if (next_proto == IP_PROTOCOL_IPSEC_AH)
-	{
-	  exthdr_len =
-	    ip6_ext_authhdr_len (((ip6_ext_header_t *) next_header));
-	  temp_nxthdr = next_header + exthdr_len;
-	}
-      else
-	{
-	  exthdr_len =
-	    ip6_ext_header_len (((ip6_ext_header_t *) next_header));
-	  temp_nxthdr = next_header + exthdr_len;
-	}
-      next_proto = ((ip6_ext_header_t *) next_header)->next_hdr;
-      next_header = temp_nxthdr;
-      cur_offset += exthdr_len;
-    }
-
-  *offset = cur_offset;
-  return (next_proto);
-}
-
-static uword
-ip6_local (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  ip6_main_t *im = &ip6_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-  ip_local_next_t next_index;
-  u32 *from, *to_next, n_left_from, n_left_to_next;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip6_input_node.index);
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    ip6_forward_next_trace (vm, node, frame, VLIB_TX);
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  vlib_buffer_t *p0, *p1;
-	  ip6_header_t *ip0, *ip1;
-	  udp_header_t *udp0, *udp1;
-	  u32 pi0, ip_len0, udp_len0, flags0, next0;
-	  u32 pi1, ip_len1, udp_len1, flags1, next1;
-	  i32 len_diff0, len_diff1;
-	  u8 error0, type0, good_l4_checksum0;
-	  u8 error1, type1, good_l4_checksum1;
-	  u32 udp_offset0, udp_offset1;
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-
-	  ip0 = vlib_buffer_get_current (p0);
-	  ip1 = vlib_buffer_get_current (p1);
-
-	  type0 = lm->builtin_protocol_by_ip_protocol[ip0->protocol];
-	  type1 = lm->builtin_protocol_by_ip_protocol[ip1->protocol];
-
-	  next0 = lm->local_next_by_ip_protocol[ip0->protocol];
-	  next1 = lm->local_next_by_ip_protocol[ip1->protocol];
-
-	  flags0 = p0->flags;
-	  flags1 = p1->flags;
-
-	  good_l4_checksum0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-	  good_l4_checksum1 = (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-	  len_diff0 = 0;
-	  len_diff1 = 0;
-
-	  /* Skip HBH local processing */
-	  if (PREDICT_FALSE
-	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-	    {
-	      ip6_hop_by_hop_ext_t *ext_hdr =
-		(ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
-	      next0 = lm->local_next_by_ip_protocol[ext_hdr->next_hdr];
-	      type0 = lm->builtin_protocol_by_ip_protocol[ext_hdr->next_hdr];
-	    }
-	  if (PREDICT_FALSE
-	      (ip1->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-	    {
-	      ip6_hop_by_hop_ext_t *ext_hdr =
-		(ip6_hop_by_hop_ext_t *) ip6_next_header (ip1);
-	      next1 = lm->local_next_by_ip_protocol[ext_hdr->next_hdr];
-	      type1 = lm->builtin_protocol_by_ip_protocol[ext_hdr->next_hdr];
-	    }
-	  if (PREDICT_TRUE (IP_PROTOCOL_UDP == ip6_locate_header (p0, ip0,
-								  IP_PROTOCOL_UDP,
-								  &udp_offset0)))
-	    {
-	      udp0 = (udp_header_t *) ((u8 *) ip0 + udp_offset0);
-	      /* Don't verify UDP checksum for packets with explicit zero checksum. */
-	      good_l4_checksum0 |= type0 == IP_BUILTIN_PROTOCOL_UDP
-		&& udp0->checksum == 0;
-	      /* Verify UDP length. */
-	      ip_len0 = clib_net_to_host_u16 (ip0->payload_length);
-	      udp_len0 = clib_net_to_host_u16 (udp0->length);
-	      len_diff0 = ip_len0 - udp_len0;
-	    }
-	  if (PREDICT_TRUE (IP_PROTOCOL_UDP == ip6_locate_header (p1, ip1,
-								  IP_PROTOCOL_UDP,
-								  &udp_offset1)))
-	    {
-	      udp1 = (udp_header_t *) ((u8 *) ip1 + udp_offset1);
-	      /* Don't verify UDP checksum for packets with explicit zero checksum. */
-	      good_l4_checksum1 |= type1 == IP_BUILTIN_PROTOCOL_UDP
-		&& udp1->checksum == 0;
-	      /* Verify UDP length. */
-	      ip_len1 = clib_net_to_host_u16 (ip1->payload_length);
-	      udp_len1 = clib_net_to_host_u16 (udp1->length);
-	      len_diff1 = ip_len1 - udp_len1;
-	    }
-
-	  good_l4_checksum0 |= type0 == IP_BUILTIN_PROTOCOL_UNKNOWN;
-	  good_l4_checksum1 |= type1 == IP_BUILTIN_PROTOCOL_UNKNOWN;
-
-	  len_diff0 = type0 == IP_BUILTIN_PROTOCOL_UDP ? len_diff0 : 0;
-	  len_diff1 = type1 == IP_BUILTIN_PROTOCOL_UDP ? len_diff1 : 0;
-
-	  if (PREDICT_FALSE (type0 != IP_BUILTIN_PROTOCOL_UNKNOWN
-			     && !good_l4_checksum0
-			     && !(flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED)))
-	    {
-	      flags0 = ip6_tcp_udp_icmp_validate_checksum (vm, p0);
-	      good_l4_checksum0 =
-		(flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-	    }
-	  if (PREDICT_FALSE (type1 != IP_BUILTIN_PROTOCOL_UNKNOWN
-			     && !good_l4_checksum1
-			     && !(flags1 & IP_BUFFER_L4_CHECKSUM_COMPUTED)))
-	    {
-	      flags1 = ip6_tcp_udp_icmp_validate_checksum (vm, p1);
-	      good_l4_checksum1 =
-		(flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-	    }
-
-	  error0 = error1 = IP6_ERROR_UNKNOWN_PROTOCOL;
-
-	  error0 = len_diff0 < 0 ? IP6_ERROR_UDP_LENGTH : error0;
-	  error1 = len_diff1 < 0 ? IP6_ERROR_UDP_LENGTH : error1;
-
-	  ASSERT (IP6_ERROR_UDP_CHECKSUM + IP_BUILTIN_PROTOCOL_UDP ==
-		  IP6_ERROR_UDP_CHECKSUM);
-	  ASSERT (IP6_ERROR_UDP_CHECKSUM + IP_BUILTIN_PROTOCOL_ICMP ==
-		  IP6_ERROR_ICMP_CHECKSUM);
-	  error0 =
-	    (!good_l4_checksum0 ? IP6_ERROR_UDP_CHECKSUM + type0 : error0);
-	  error1 =
-	    (!good_l4_checksum1 ? IP6_ERROR_UDP_CHECKSUM + type1 : error1);
-
-	  /* Drop packets from unroutable hosts. */
-	  /* If this is a neighbor solicitation (ICMP), skip source RPF check */
-	  if (error0 == IP6_ERROR_UNKNOWN_PROTOCOL &&
-	      type0 != IP_BUILTIN_PROTOCOL_ICMP &&
-	      !ip6_address_is_link_local_unicast (&ip0->src_address))
-	    {
-	      u32 src_adj_index0 = ip6_src_lookup_for_packet (im, p0, ip0);
-	      error0 = (ADJ_INDEX_INVALID == src_adj_index0
-			? IP6_ERROR_SRC_LOOKUP_MISS : error0);
-	    }
-	  if (error1 == IP6_ERROR_UNKNOWN_PROTOCOL &&
-	      type1 != IP_BUILTIN_PROTOCOL_ICMP &&
-	      !ip6_address_is_link_local_unicast (&ip1->src_address))
-	    {
-	      u32 src_adj_index1 = ip6_src_lookup_for_packet (im, p1, ip1);
-	      error1 = (ADJ_INDEX_INVALID == src_adj_index1
-			? IP6_ERROR_SRC_LOOKUP_MISS : error1);
-	    }
-
-	  next0 =
-	    error0 != IP6_ERROR_UNKNOWN_PROTOCOL ? IP_LOCAL_NEXT_DROP : next0;
-	  next1 =
-	    error1 != IP6_ERROR_UNKNOWN_PROTOCOL ? IP_LOCAL_NEXT_DROP : next1;
-
-	  p0->error = error_node->errors[error0];
-	  p1->error = error_node->errors[error1];
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, pi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip6_header_t *ip0;
-	  udp_header_t *udp0;
-	  u32 pi0, ip_len0, udp_len0, flags0, next0;
-	  i32 len_diff0;
-	  u8 error0, type0, good_l4_checksum0;
-	  u32 udp_offset0;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  ip0 = vlib_buffer_get_current (p0);
-
-	  type0 = lm->builtin_protocol_by_ip_protocol[ip0->protocol];
-	  next0 = lm->local_next_by_ip_protocol[ip0->protocol];
-
-	  flags0 = p0->flags;
-
-	  good_l4_checksum0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-	  len_diff0 = 0;
-
-	  /* Skip HBH local processing */
-	  if (PREDICT_FALSE
-	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-	    {
-	      ip6_hop_by_hop_ext_t *ext_hdr =
-		(ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
-	      next0 = lm->local_next_by_ip_protocol[ext_hdr->next_hdr];
-	      type0 = lm->builtin_protocol_by_ip_protocol[ext_hdr->next_hdr];
-	    }
-	  if (PREDICT_TRUE (IP_PROTOCOL_UDP == ip6_locate_header (p0, ip0,
-								  IP_PROTOCOL_UDP,
-								  &udp_offset0)))
-	    {
-	      udp0 = (udp_header_t *) ((u8 *) ip0 + udp_offset0);
-	      /* Don't verify UDP checksum for packets with explicit zero checksum. */
-	      good_l4_checksum0 |= type0 == IP_BUILTIN_PROTOCOL_UDP
-		&& udp0->checksum == 0;
-	      /* Verify UDP length. */
-	      ip_len0 = clib_net_to_host_u16 (ip0->payload_length);
-	      udp_len0 = clib_net_to_host_u16 (udp0->length);
-	      len_diff0 = ip_len0 - udp_len0;
-	    }
-
-	  good_l4_checksum0 |= type0 == IP_BUILTIN_PROTOCOL_UNKNOWN;
-	  len_diff0 = type0 == IP_BUILTIN_PROTOCOL_UDP ? len_diff0 : 0;
-
-	  if (PREDICT_FALSE (type0 != IP_BUILTIN_PROTOCOL_UNKNOWN
-			     && !good_l4_checksum0
-			     && !(flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED)))
-	    {
-	      flags0 = ip6_tcp_udp_icmp_validate_checksum (vm, p0);
-	      good_l4_checksum0 =
-		(flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-	    }
-
-	  error0 = IP6_ERROR_UNKNOWN_PROTOCOL;
-
-	  error0 = len_diff0 < 0 ? IP6_ERROR_UDP_LENGTH : error0;
-
-	  ASSERT (IP6_ERROR_UDP_CHECKSUM + IP_BUILTIN_PROTOCOL_UDP ==
-		  IP6_ERROR_UDP_CHECKSUM);
-	  ASSERT (IP6_ERROR_UDP_CHECKSUM + IP_BUILTIN_PROTOCOL_ICMP ==
-		  IP6_ERROR_ICMP_CHECKSUM);
-	  error0 =
-	    (!good_l4_checksum0 ? IP6_ERROR_UDP_CHECKSUM + type0 : error0);
-
-	  /* If this is a neighbor solicitation (ICMP), skip source RPF check */
-	  if (error0 == IP6_ERROR_UNKNOWN_PROTOCOL &&
-	      type0 != IP_BUILTIN_PROTOCOL_ICMP &&
-	      !ip6_address_is_link_local_unicast (&ip0->src_address))
-	    {
-	      u32 src_adj_index0 = ip6_src_lookup_for_packet (im, p0, ip0);
-	      error0 = (ADJ_INDEX_INVALID == src_adj_index0
-			? IP6_ERROR_SRC_LOOKUP_MISS : error0);
-	    }
-
-	  next0 =
-	    error0 != IP6_ERROR_UNKNOWN_PROTOCOL ? IP_LOCAL_NEXT_DROP : next0;
-
-	  p0->error = error_node->errors[error0];
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_local_node, static) =
-{
-  .function = ip6_local,
-  .name = "ip6-local",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip6_forward_next_trace,
-  .n_next_nodes = IP_LOCAL_N_NEXT,
-  .next_nodes =
-  {
-    [IP_LOCAL_NEXT_DROP] = "error-drop",
-    [IP_LOCAL_NEXT_PUNT] = "error-punt",
-    [IP_LOCAL_NEXT_UDP_LOOKUP] = "ip6-udp-lookup",
-    [IP_LOCAL_NEXT_ICMP] = "ip6-icmp-input",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_local_node, ip6_local);
-
-void
-ip6_register_protocol (u32 protocol, u32 node_index)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  ip6_main_t *im = &ip6_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-
-  ASSERT (protocol < ARRAY_LEN (lm->local_next_by_ip_protocol));
-  lm->local_next_by_ip_protocol[protocol] =
-    vlib_node_add_next (vm, ip6_local_node.index, node_index);
-}
-
-typedef enum
-{
-  IP6_DISCOVER_NEIGHBOR_NEXT_DROP,
-  IP6_DISCOVER_NEIGHBOR_NEXT_REPLY_TX,
-  IP6_DISCOVER_NEIGHBOR_N_NEXT,
-} ip6_discover_neighbor_next_t;
-
-typedef enum
-{
-  IP6_DISCOVER_NEIGHBOR_ERROR_DROP,
-  IP6_DISCOVER_NEIGHBOR_ERROR_REQUEST_SENT,
-  IP6_DISCOVER_NEIGHBOR_ERROR_NO_SOURCE_ADDRESS,
-} ip6_discover_neighbor_error_t;
-
-static uword
-ip6_discover_neighbor_inline (vlib_main_t * vm,
-			      vlib_node_runtime_t * node,
-			      vlib_frame_t * frame, int is_glean)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_main_t *im = &ip6_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-  u32 *from, *to_next_drop;
-  uword n_left_from, n_left_to_next_drop;
-  static f64 time_last_seed_change = -1e100;
-  static u32 hash_seeds[3];
-  static uword hash_bitmap[256 / BITS (uword)];
-  f64 time_now;
-  int bogus_length;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    ip6_forward_next_trace (vm, node, frame, VLIB_TX);
-
-  time_now = vlib_time_now (vm);
-  if (time_now - time_last_seed_change > 1e-3)
-    {
-      uword i;
-      u32 *r = clib_random_buffer_get_data (&vm->random_buffer,
-					    sizeof (hash_seeds));
-      for (i = 0; i < ARRAY_LEN (hash_seeds); i++)
-	hash_seeds[i] = r[i];
-
-      /* Mark all hash keys as been not-seen before. */
-      for (i = 0; i < ARRAY_LEN (hash_bitmap); i++)
-	hash_bitmap[i] = 0;
-
-      time_last_seed_change = time_now;
-    }
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, IP6_DISCOVER_NEIGHBOR_NEXT_DROP,
-			   to_next_drop, n_left_to_next_drop);
-
-      while (n_left_from > 0 && n_left_to_next_drop > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip6_header_t *ip0;
-	  u32 pi0, adj_index0, a0, b0, c0, m0, sw_if_index0, drop0;
-	  uword bm0;
-	  ip_adjacency_t *adj0;
-	  vnet_hw_interface_t *hw_if0;
-	  u32 next0;
-
-	  pi0 = from[0];
-
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-
-	  ip0 = vlib_buffer_get_current (p0);
-
-	  adj0 = ip_get_adjacency (lm, adj_index0);
-
-	  if (!is_glean)
-	    {
-	      ip0->dst_address.as_u64[0] =
-		adj0->sub_type.nbr.next_hop.ip6.as_u64[0];
-	      ip0->dst_address.as_u64[1] =
-		adj0->sub_type.nbr.next_hop.ip6.as_u64[1];
-	    }
-
-	  a0 = hash_seeds[0];
-	  b0 = hash_seeds[1];
-	  c0 = hash_seeds[2];
-
-	  sw_if_index0 = adj0->rewrite_header.sw_if_index;
-	  vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0;
-
-	  a0 ^= sw_if_index0;
-	  b0 ^= ip0->dst_address.as_u32[0];
-	  c0 ^= ip0->dst_address.as_u32[1];
-
-	  hash_v3_mix32 (a0, b0, c0);
-
-	  b0 ^= ip0->dst_address.as_u32[2];
-	  c0 ^= ip0->dst_address.as_u32[3];
-
-	  hash_v3_finalize32 (a0, b0, c0);
-
-	  c0 &= BITS (hash_bitmap) - 1;
-	  c0 = c0 / BITS (uword);
-	  m0 = (uword) 1 << (c0 % BITS (uword));
-
-	  bm0 = hash_bitmap[c0];
-	  drop0 = (bm0 & m0) != 0;
-
-	  /* Mark it as seen. */
-	  hash_bitmap[c0] = bm0 | m0;
-
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next_drop[0] = pi0;
-	  to_next_drop += 1;
-	  n_left_to_next_drop -= 1;
-
-	  hw_if0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
-
-	  /* If the interface is link-down, drop the pkt */
-	  if (!(hw_if0->flags & VNET_HW_INTERFACE_FLAG_LINK_UP))
-	    drop0 = 1;
-
-	  p0->error =
-	    node->errors[drop0 ? IP6_DISCOVER_NEIGHBOR_ERROR_DROP
-			 : IP6_DISCOVER_NEIGHBOR_ERROR_REQUEST_SENT];
-	  if (drop0)
-	    continue;
-
-	  /*
-	   * the adj has been updated to a rewrite but the node the DPO that got
-	   * us here hasn't - yet. no big deal. we'll drop while we wait.
-	   */
-	  if (IP_LOOKUP_NEXT_REWRITE == adj0->lookup_next_index)
-	    continue;
-
-	  {
-	    u32 bi0 = 0;
-	    icmp6_neighbor_solicitation_header_t *h0;
-	    vlib_buffer_t *b0;
-
-	    h0 = vlib_packet_template_get_packet
-	      (vm, &im->discover_neighbor_packet_template, &bi0);
-
-	    /*
-	     * Build ethernet header.
-	     * Choose source address based on destination lookup
-	     * adjacency.
-	     */
-	    if (ip6_src_address_for_packet (lm,
-					    sw_if_index0,
-					    &h0->ip.src_address))
-	      {
-		/* There is no address on the interface */
-		p0->error =
-		  node->errors[IP6_DISCOVER_NEIGHBOR_ERROR_NO_SOURCE_ADDRESS];
-		vlib_buffer_free (vm, &bi0, 1);
-		continue;
-	      }
-
-	    /*
-	     * Destination address is a solicited node multicast address.
-	     * We need to fill in
-	     * the low 24 bits with low 24 bits of target's address.
-	     */
-	    h0->ip.dst_address.as_u8[13] = ip0->dst_address.as_u8[13];
-	    h0->ip.dst_address.as_u8[14] = ip0->dst_address.as_u8[14];
-	    h0->ip.dst_address.as_u8[15] = ip0->dst_address.as_u8[15];
-
-	    h0->neighbor.target_address = ip0->dst_address;
-
-	    clib_memcpy (h0->link_layer_option.ethernet_address,
-			 hw_if0->hw_address, vec_len (hw_if0->hw_address));
-
-	    /* $$$$ appears we need this; why is the checksum non-zero? */
-	    h0->neighbor.icmp.checksum = 0;
-	    h0->neighbor.icmp.checksum =
-	      ip6_tcp_udp_icmp_compute_checksum (vm, 0, &h0->ip,
-						 &bogus_length);
-
-	    ASSERT (bogus_length == 0);
-
-	    vlib_buffer_copy_trace_flag (vm, p0, bi0);
-	    b0 = vlib_get_buffer (vm, bi0);
-	    vnet_buffer (b0)->sw_if_index[VLIB_TX]
-	      = vnet_buffer (p0)->sw_if_index[VLIB_TX];
-
-	    /* Add rewrite/encap string. */
-	    vnet_rewrite_one_header (adj0[0], h0, sizeof (ethernet_header_t));
-	    vlib_buffer_advance (b0, -adj0->rewrite_header.data_bytes);
-
-	    next0 = IP6_DISCOVER_NEIGHBOR_NEXT_REPLY_TX;
-
-	    vlib_set_next_frame_buffer (vm, node, next0, bi0);
-	  }
-	}
-
-      vlib_put_next_frame (vm, node, IP6_DISCOVER_NEIGHBOR_NEXT_DROP,
-			   n_left_to_next_drop);
-    }
-
-  return frame->n_vectors;
-}
-
-static uword
-ip6_discover_neighbor (vlib_main_t * vm,
-		       vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return (ip6_discover_neighbor_inline (vm, node, frame, 0));
-}
-
-static uword
-ip6_glean (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return (ip6_discover_neighbor_inline (vm, node, frame, 1));
-}
-
-static char *ip6_discover_neighbor_error_strings[] = {
-  [IP6_DISCOVER_NEIGHBOR_ERROR_DROP] = "address overflow drops",
-  [IP6_DISCOVER_NEIGHBOR_ERROR_REQUEST_SENT] = "neighbor solicitations sent",
-  [IP6_DISCOVER_NEIGHBOR_ERROR_NO_SOURCE_ADDRESS]
-    = "no source address for ND solicitation",
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_discover_neighbor_node) =
-{
-  .function = ip6_discover_neighbor,
-  .name = "ip6-discover-neighbor",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip6_forward_next_trace,
-  .n_errors = ARRAY_LEN (ip6_discover_neighbor_error_strings),
-  .error_strings = ip6_discover_neighbor_error_strings,
-  .n_next_nodes = IP6_DISCOVER_NEIGHBOR_N_NEXT,
-  .next_nodes =
-  {
-    [IP6_DISCOVER_NEIGHBOR_NEXT_DROP] = "error-drop",
-    [IP6_DISCOVER_NEIGHBOR_NEXT_REPLY_TX] = "interface-output",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_glean_node) =
-{
-  .function = ip6_glean,
-  .name = "ip6-glean",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip6_forward_next_trace,
-  .n_errors = ARRAY_LEN (ip6_discover_neighbor_error_strings),
-  .error_strings = ip6_discover_neighbor_error_strings,
-  .n_next_nodes = IP6_DISCOVER_NEIGHBOR_N_NEXT,
-  .next_nodes =
-  {
-    [IP6_DISCOVER_NEIGHBOR_NEXT_DROP] = "error-drop",
-    [IP6_DISCOVER_NEIGHBOR_NEXT_REPLY_TX] = "interface-output",
-  },
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-ip6_probe_neighbor (vlib_main_t * vm, ip6_address_t * dst, u32 sw_if_index)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_main_t *im = &ip6_main;
-  icmp6_neighbor_solicitation_header_t *h;
-  ip6_address_t *src;
-  ip_interface_address_t *ia;
-  ip_adjacency_t *adj;
-  vnet_hw_interface_t *hi;
-  vnet_sw_interface_t *si;
-  vlib_buffer_t *b;
-  u32 bi = 0;
-  int bogus_length;
-
-  si = vnet_get_sw_interface (vnm, sw_if_index);
-
-  if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
-    {
-      return clib_error_return (0, "%U: interface %U down",
-				format_ip6_address, dst,
-				format_vnet_sw_if_index_name, vnm,
-				sw_if_index);
-    }
-
-  src =
-    ip6_interface_address_matching_destination (im, dst, sw_if_index, &ia);
-  if (!src)
-    {
-      vnm->api_errno = VNET_API_ERROR_NO_MATCHING_INTERFACE;
-      return clib_error_return
-	(0, "no matching interface address for destination %U (interface %U)",
-	 format_ip6_address, dst,
-	 format_vnet_sw_if_index_name, vnm, sw_if_index);
-    }
-
-  h =
-    vlib_packet_template_get_packet (vm,
-				     &im->discover_neighbor_packet_template,
-				     &bi);
-
-  hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
-
-  /* Destination address is a solicited node multicast address.  We need to fill in
-     the low 24 bits with low 24 bits of target's address. */
-  h->ip.dst_address.as_u8[13] = dst->as_u8[13];
-  h->ip.dst_address.as_u8[14] = dst->as_u8[14];
-  h->ip.dst_address.as_u8[15] = dst->as_u8[15];
-
-  h->ip.src_address = src[0];
-  h->neighbor.target_address = dst[0];
-
-  clib_memcpy (h->link_layer_option.ethernet_address, hi->hw_address,
-	       vec_len (hi->hw_address));
-
-  h->neighbor.icmp.checksum =
-    ip6_tcp_udp_icmp_compute_checksum (vm, 0, &h->ip, &bogus_length);
-  ASSERT (bogus_length == 0);
-
-  b = vlib_get_buffer (vm, bi);
-  vnet_buffer (b)->sw_if_index[VLIB_RX] =
-    vnet_buffer (b)->sw_if_index[VLIB_TX] = sw_if_index;
-
-  /* Add encapsulation string for software interface (e.g. ethernet header). */
-  adj = ip_get_adjacency (&im->lookup_main, ia->neighbor_probe_adj_index);
-  vnet_rewrite_one_header (adj[0], h, sizeof (ethernet_header_t));
-  vlib_buffer_advance (b, -adj->rewrite_header.data_bytes);
-
-  {
-    vlib_frame_t *f = vlib_get_frame_to_node (vm, hi->output_node_index);
-    u32 *to_next = vlib_frame_vector_args (f);
-    to_next[0] = bi;
-    f->n_vectors = 1;
-    vlib_put_frame_to_node (vm, hi->output_node_index, f);
-  }
-
-  return /* no error */ 0;
-}
-
-typedef enum
-{
-  IP6_REWRITE_NEXT_DROP,
-  IP6_REWRITE_NEXT_ICMP_ERROR,
-} ip6_rewrite_next_t;
-
-always_inline uword
-ip6_rewrite_inline (vlib_main_t * vm,
-		    vlib_node_runtime_t * node,
-		    vlib_frame_t * frame, int is_midchain)
-{
-  ip_lookup_main_t *lm = &ip6_main.lookup_main;
-  u32 *from = vlib_frame_vector_args (frame);
-  u32 n_left_from, n_left_to_next, *to_next, next_index;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip6_input_node.index);
-
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  u32 cpu_index = os_get_cpu_number ();
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  ip_adjacency_t *adj0, *adj1;
-	  vlib_buffer_t *p0, *p1;
-	  ip6_header_t *ip0, *ip1;
-	  u32 pi0, rw_len0, next0, error0, adj_index0;
-	  u32 pi1, rw_len1, next1, error1, adj_index1;
-	  u32 tx_sw_if_index0, tx_sw_if_index1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->pre_data, 32, STORE);
-	    CLIB_PREFETCH (p3->pre_data, 32, STORE);
-
-	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), STORE);
-	    CLIB_PREFETCH (p3->data, sizeof (ip0[0]), STORE);
-	  }
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-
-	  adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-	  adj_index1 = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
-
-	  /* We should never rewrite a pkt using the MISS adjacency */
-	  ASSERT (adj_index0 && adj_index1);
-
-	  ip0 = vlib_buffer_get_current (p0);
-	  ip1 = vlib_buffer_get_current (p1);
-
-	  error0 = error1 = IP6_ERROR_NONE;
-	  next0 = next1 = IP6_REWRITE_NEXT_DROP;
-
-	  if (PREDICT_TRUE (!(p0->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
-	    {
-	      i32 hop_limit0 = ip0->hop_limit;
-
-	      /* Input node should have reject packets with hop limit 0. */
-	      ASSERT (ip0->hop_limit > 0);
-
-	      hop_limit0 -= 1;
-
-	      ip0->hop_limit = hop_limit0;
-
-	      /*
-	       * If the hop count drops below 1 when forwarding, generate
-	       * an ICMP response.
-	       */
-	      if (PREDICT_FALSE (hop_limit0 <= 0))
-		{
-		  error0 = IP6_ERROR_TIME_EXPIRED;
-		  next0 = IP6_REWRITE_NEXT_ICMP_ERROR;
-		  vnet_buffer (p0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-		  icmp6_error_set_vnet_buffer (p0, ICMP6_time_exceeded,
-					       ICMP6_time_exceeded_ttl_exceeded_in_transit,
-					       0);
-		}
-	    }
-	  else
-	    {
-	      p0->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
-	    }
-	  if (PREDICT_TRUE (!(p1->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
-	    {
-	      i32 hop_limit1 = ip1->hop_limit;
-
-	      /* Input node should have reject packets with hop limit 0. */
-	      ASSERT (ip1->hop_limit > 0);
-
-	      hop_limit1 -= 1;
-
-	      ip1->hop_limit = hop_limit1;
-
-	      /*
-	       * If the hop count drops below 1 when forwarding, generate
-	       * an ICMP response.
-	       */
-	      if (PREDICT_FALSE (hop_limit1 <= 0))
-		{
-		  error1 = IP6_ERROR_TIME_EXPIRED;
-		  next1 = IP6_REWRITE_NEXT_ICMP_ERROR;
-		  vnet_buffer (p1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-		  icmp6_error_set_vnet_buffer (p1, ICMP6_time_exceeded,
-					       ICMP6_time_exceeded_ttl_exceeded_in_transit,
-					       0);
-		}
-	    }
-	  else
-	    {
-	      p1->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
-	    }
-	  adj0 = ip_get_adjacency (lm, adj_index0);
-	  adj1 = ip_get_adjacency (lm, adj_index1);
-
-	  rw_len0 = adj0[0].rewrite_header.data_bytes;
-	  rw_len1 = adj1[0].rewrite_header.data_bytes;
-	  vnet_buffer (p0)->ip.save_rewrite_length = rw_len0;
-	  vnet_buffer (p1)->ip.save_rewrite_length = rw_len1;
-
-	  vlib_increment_combined_counter (&adjacency_counters,
-					   cpu_index, adj_index0,
-					   /* packet increment */ 0,
-					   /* byte increment */ rw_len0);
-	  vlib_increment_combined_counter (&adjacency_counters,
-					   cpu_index, adj_index1,
-					   /* packet increment */ 0,
-					   /* byte increment */ rw_len1);
-
-	  /* Check MTU of outgoing interface. */
-	  error0 =
-	    (vlib_buffer_length_in_chain (vm, p0) >
-	     adj0[0].
-	     rewrite_header.max_l3_packet_bytes ? IP6_ERROR_MTU_EXCEEDED :
-	     error0);
-	  error1 =
-	    (vlib_buffer_length_in_chain (vm, p1) >
-	     adj1[0].
-	     rewrite_header.max_l3_packet_bytes ? IP6_ERROR_MTU_EXCEEDED :
-	     error1);
-
-	  /* Don't adjust the buffer for hop count issue; icmp-error node
-	   * wants to see the IP headerr */
-	  if (PREDICT_TRUE (error0 == IP6_ERROR_NONE))
-	    {
-	      p0->current_data -= rw_len0;
-	      p0->current_length += rw_len0;
-
-	      tx_sw_if_index0 = adj0[0].rewrite_header.sw_if_index;
-	      vnet_buffer (p0)->sw_if_index[VLIB_TX] = tx_sw_if_index0;
-	      next0 = adj0[0].rewrite_header.next_index;
-
-	      vnet_feature_arc_start (lm->output_feature_arc_index,
-				      tx_sw_if_index0, &next0, p0);
-	    }
-	  if (PREDICT_TRUE (error1 == IP6_ERROR_NONE))
-	    {
-	      p1->current_data -= rw_len1;
-	      p1->current_length += rw_len1;
-
-	      tx_sw_if_index1 = adj1[0].rewrite_header.sw_if_index;
-	      vnet_buffer (p1)->sw_if_index[VLIB_TX] = tx_sw_if_index1;
-	      next1 = adj1[0].rewrite_header.next_index;
-
-	      vnet_feature_arc_start (lm->output_feature_arc_index,
-				      tx_sw_if_index1, &next1, p1);
-	    }
-
-	  /* Guess we are only writing on simple Ethernet header. */
-	  vnet_rewrite_two_headers (adj0[0], adj1[0],
-				    ip0, ip1, sizeof (ethernet_header_t));
-
-	  if (is_midchain)
-	    {
-	      adj0->sub_type.midchain.fixup_func (vm, adj0, p0);
-	      adj1->sub_type.midchain.fixup_func (vm, adj1, p1);
-	    }
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, pi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  ip_adjacency_t *adj0;
-	  vlib_buffer_t *p0;
-	  ip6_header_t *ip0;
-	  u32 pi0, rw_len0;
-	  u32 adj_index0, next0, error0;
-	  u32 tx_sw_if_index0;
-
-	  pi0 = to_next[0] = from[0];
-
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-
-	  /* We should never rewrite a pkt using the MISS adjacency */
-	  ASSERT (adj_index0);
-
-	  adj0 = ip_get_adjacency (lm, adj_index0);
-
-	  ip0 = vlib_buffer_get_current (p0);
-
-	  error0 = IP6_ERROR_NONE;
-	  next0 = IP6_REWRITE_NEXT_DROP;
-
-	  /* Check hop limit */
-	  if (PREDICT_TRUE (!(p0->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
-	    {
-	      i32 hop_limit0 = ip0->hop_limit;
-
-	      ASSERT (ip0->hop_limit > 0);
-
-	      hop_limit0 -= 1;
-
-	      ip0->hop_limit = hop_limit0;
-
-	      if (PREDICT_FALSE (hop_limit0 <= 0))
-		{
-		  /*
-		   * If the hop count drops below 1 when forwarding, generate
-		   * an ICMP response.
-		   */
-		  error0 = IP6_ERROR_TIME_EXPIRED;
-		  next0 = IP6_REWRITE_NEXT_ICMP_ERROR;
-		  vnet_buffer (p0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-		  icmp6_error_set_vnet_buffer (p0, ICMP6_time_exceeded,
-					       ICMP6_time_exceeded_ttl_exceeded_in_transit,
-					       0);
-		}
-	    }
-	  else
-	    {
-	      p0->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
-	    }
-
-	  /* Guess we are only writing on simple Ethernet header. */
-	  vnet_rewrite_one_header (adj0[0], ip0, sizeof (ethernet_header_t));
-
-	  /* Update packet buffer attributes/set output interface. */
-	  rw_len0 = adj0[0].rewrite_header.data_bytes;
-	  vnet_buffer (p0)->ip.save_rewrite_length = rw_len0;
-
-	  vlib_increment_combined_counter (&adjacency_counters,
-					   cpu_index, adj_index0,
-					   /* packet increment */ 0,
-					   /* byte increment */ rw_len0);
-
-	  /* Check MTU of outgoing interface. */
-	  error0 =
-	    (vlib_buffer_length_in_chain (vm, p0) >
-	     adj0[0].
-	     rewrite_header.max_l3_packet_bytes ? IP6_ERROR_MTU_EXCEEDED :
-	     error0);
-
-	  /* Don't adjust the buffer for hop count issue; icmp-error node
-	   * wants to see the IP headerr */
-	  if (PREDICT_TRUE (error0 == IP6_ERROR_NONE))
-	    {
-	      p0->current_data -= rw_len0;
-	      p0->current_length += rw_len0;
-
-	      tx_sw_if_index0 = adj0[0].rewrite_header.sw_if_index;
-
-	      vnet_buffer (p0)->sw_if_index[VLIB_TX] = tx_sw_if_index0;
-	      next0 = adj0[0].rewrite_header.next_index;
-
-	      vnet_feature_arc_start (lm->output_feature_arc_index,
-				      tx_sw_if_index0, &next0, p0);
-	    }
-
-	  if (is_midchain)
-	    {
-	      adj0->sub_type.midchain.fixup_func (vm, adj0, p0);
-	    }
-
-	  p0->error = error_node->errors[error0];
-
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  /* Need to do trace after rewrites to pick up new packet data. */
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    ip6_forward_next_trace (vm, node, frame, VLIB_TX);
-
-  return frame->n_vectors;
-}
-
-static uword
-ip6_rewrite (vlib_main_t * vm,
-	     vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return ip6_rewrite_inline (vm, node, frame,
-			     /* midchain */ 0);
-}
-
-static uword
-ip6_midchain (vlib_main_t * vm,
-	      vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return ip6_rewrite_inline (vm, node, frame,
-			     /* midchain */ 1);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_midchain_node) =
-{
-  .function = ip6_midchain,
-  .name = "ip6-midchain",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip6_forward_next_trace,
-  .sibling_of = "ip6-rewrite",
-  };
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_midchain_node, ip6_midchain);
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_rewrite_node) =
-{
-  .function = ip6_rewrite,
-  .name = "ip6-rewrite",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip6_rewrite_trace,
-  .n_next_nodes = 2,
-  .next_nodes =
-  {
-    [IP6_REWRITE_NEXT_DROP] = "error-drop",
-    [IP6_REWRITE_NEXT_ICMP_ERROR] = "ip6-icmp-error",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_rewrite_node, ip6_rewrite);
-
-/*
- * Hop-by-Hop handling
- */
-
-ip6_hop_by_hop_main_t ip6_hop_by_hop_main;
-
-#define foreach_ip6_hop_by_hop_error \
-_(PROCESSED, "pkts with ip6 hop-by-hop options") \
-_(FORMAT, "incorrectly formatted hop-by-hop options") \
-_(UNKNOWN_OPTION, "unknown ip6 hop-by-hop options")
-
-typedef enum
-{
-#define _(sym,str) IP6_HOP_BY_HOP_ERROR_##sym,
-  foreach_ip6_hop_by_hop_error
-#undef _
-    IP6_HOP_BY_HOP_N_ERROR,
-} ip6_hop_by_hop_error_t;
-
-/*
- * Primary h-b-h handler trace support
- * We work pretty hard on the problem for obvious reasons
- */
-typedef struct
-{
-  u32 next_index;
-  u32 trace_len;
-  u8 option_data[256];
-} ip6_hop_by_hop_trace_t;
-
-vlib_node_registration_t ip6_hop_by_hop_node;
-
-static char *ip6_hop_by_hop_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ip6_hop_by_hop_error
-#undef _
-};
-
-static u8 *
-format_ip6_hop_by_hop_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip6_hop_by_hop_trace_t *t = va_arg (*args, ip6_hop_by_hop_trace_t *);
-  ip6_hop_by_hop_header_t *hbh0;
-  ip6_hop_by_hop_option_t *opt0, *limit0;
-  ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main;
-
-  u8 type0;
-
-  hbh0 = (ip6_hop_by_hop_header_t *) t->option_data;
-
-  s = format (s, "IP6_HOP_BY_HOP: next index %d len %d traced %d",
-	      t->next_index, (hbh0->length + 1) << 3, t->trace_len);
-
-  opt0 = (ip6_hop_by_hop_option_t *) (hbh0 + 1);
-  limit0 = (ip6_hop_by_hop_option_t *) ((u8 *) hbh0) + t->trace_len;
-
-  while (opt0 < limit0)
-    {
-      type0 = opt0->type;
-      switch (type0)
-	{
-	case 0:		/* Pad, just stop */
-	  opt0 = (ip6_hop_by_hop_option_t *) ((u8 *) opt0) + 1;
-	  break;
-
-	default:
-	  if (hm->trace[type0])
-	    {
-	      s = (*hm->trace[type0]) (s, opt0);
-	    }
-	  else
-	    {
-	      s =
-		format (s, "\n    unrecognized option %d length %d", type0,
-			opt0->length);
-	    }
-	  opt0 =
-	    (ip6_hop_by_hop_option_t *) (((u8 *) opt0) + opt0->length +
-					 sizeof (ip6_hop_by_hop_option_t));
-	  break;
-	}
-    }
-  return s;
-}
-
-always_inline u8
-ip6_scan_hbh_options (vlib_buffer_t * b0,
-		      ip6_header_t * ip0,
-		      ip6_hop_by_hop_header_t * hbh0,
-		      ip6_hop_by_hop_option_t * opt0,
-		      ip6_hop_by_hop_option_t * limit0, u32 * next0)
-{
-  ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main;
-  u8 type0;
-  u8 error0 = 0;
-
-  while (opt0 < limit0)
-    {
-      type0 = opt0->type;
-      switch (type0)
-	{
-	case 0:		/* Pad1 */
-	  opt0 = (ip6_hop_by_hop_option_t *) ((u8 *) opt0) + 1;
-	  continue;
-	case 1:		/* PadN */
-	  break;
-	default:
-	  if (hm->options[type0])
-	    {
-	      if ((*hm->options[type0]) (b0, ip0, opt0) < 0)
-		{
-		  error0 = IP6_HOP_BY_HOP_ERROR_FORMAT;
-		  return (error0);
-		}
-	    }
-	  else
-	    {
-	      /* Unrecognized mandatory option, check the two high order bits */
-	      switch (opt0->type & HBH_OPTION_TYPE_HIGH_ORDER_BITS)
-		{
-		case HBH_OPTION_TYPE_SKIP_UNKNOWN:
-		  break;
-		case HBH_OPTION_TYPE_DISCARD_UNKNOWN:
-		  error0 = IP6_HOP_BY_HOP_ERROR_UNKNOWN_OPTION;
-		  *next0 = IP_LOOKUP_NEXT_DROP;
-		  break;
-		case HBH_OPTION_TYPE_DISCARD_UNKNOWN_ICMP:
-		  error0 = IP6_HOP_BY_HOP_ERROR_UNKNOWN_OPTION;
-		  *next0 = IP_LOOKUP_NEXT_ICMP_ERROR;
-		  icmp6_error_set_vnet_buffer (b0, ICMP6_parameter_problem,
-					       ICMP6_parameter_problem_unrecognized_option,
-					       (u8 *) opt0 - (u8 *) ip0);
-		  break;
-		case HBH_OPTION_TYPE_DISCARD_UNKNOWN_ICMP_NOT_MCAST:
-		  error0 = IP6_HOP_BY_HOP_ERROR_UNKNOWN_OPTION;
-		  if (!ip6_address_is_multicast (&ip0->dst_address))
-		    {
-		      *next0 = IP_LOOKUP_NEXT_ICMP_ERROR;
-		      icmp6_error_set_vnet_buffer (b0,
-						   ICMP6_parameter_problem,
-						   ICMP6_parameter_problem_unrecognized_option,
-						   (u8 *) opt0 - (u8 *) ip0);
-		    }
-		  else
-		    {
-		      *next0 = IP_LOOKUP_NEXT_DROP;
-		    }
-		  break;
-		}
-	      return (error0);
-	    }
-	}
-      opt0 =
-	(ip6_hop_by_hop_option_t *) (((u8 *) opt0) + opt0->length +
-				     sizeof (ip6_hop_by_hop_option_t));
-    }
-  return (error0);
-}
-
-/*
- * Process the Hop-by-Hop Options header
- */
-static uword
-ip6_hop_by_hop (vlib_main_t * vm,
-		vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip6_hop_by_hop_node.index);
-  ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main;
-  u32 n_left_from, *from, *to_next;
-  ip_lookup_next_t next_index;
-  ip6_main_t *im = &ip6_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-	  ip6_header_t *ip0, *ip1;
-	  ip6_hop_by_hop_header_t *hbh0, *hbh1;
-	  ip6_hop_by_hop_option_t *opt0, *limit0, *opt1, *limit1;
-	  u8 error0 = 0, error1 = 0;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
-	    CLIB_PREFETCH (p3->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
-	  }
-
-	  /* Speculatively enqueue b0, b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  /* Default use the next_index from the adjacency. A HBH option rarely redirects to a different node */
-	  u32 adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
-	  ip_adjacency_t *adj0 = ip_get_adjacency (lm, adj_index0);
-	  u32 adj_index1 = vnet_buffer (b1)->ip.adj_index[VLIB_TX];
-	  ip_adjacency_t *adj1 = ip_get_adjacency (lm, adj_index1);
-
-	  /* Default use the next_index from the adjacency. A HBH option rarely redirects to a different node */
-	  next0 = adj0->lookup_next_index;
-	  next1 = adj1->lookup_next_index;
-
-	  ip0 = vlib_buffer_get_current (b0);
-	  ip1 = vlib_buffer_get_current (b1);
-	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
-	  hbh1 = (ip6_hop_by_hop_header_t *) (ip1 + 1);
-	  opt0 = (ip6_hop_by_hop_option_t *) (hbh0 + 1);
-	  opt1 = (ip6_hop_by_hop_option_t *) (hbh1 + 1);
-	  limit0 =
-	    (ip6_hop_by_hop_option_t *) ((u8 *) hbh0 +
-					 ((hbh0->length + 1) << 3));
-	  limit1 =
-	    (ip6_hop_by_hop_option_t *) ((u8 *) hbh1 +
-					 ((hbh1->length + 1) << 3));
-
-	  /*
-	   * Basic validity checks
-	   */
-	  if ((hbh0->length + 1) << 3 >
-	      clib_net_to_host_u16 (ip0->payload_length))
-	    {
-	      error0 = IP6_HOP_BY_HOP_ERROR_FORMAT;
-	      next0 = IP_LOOKUP_NEXT_DROP;
-	      goto outdual;
-	    }
-	  /* Scan the set of h-b-h options, process ones that we understand */
-	  error0 = ip6_scan_hbh_options (b0, ip0, hbh0, opt0, limit0, &next0);
-
-	  if ((hbh1->length + 1) << 3 >
-	      clib_net_to_host_u16 (ip1->payload_length))
-	    {
-	      error1 = IP6_HOP_BY_HOP_ERROR_FORMAT;
-	      next1 = IP_LOOKUP_NEXT_DROP;
-	      goto outdual;
-	    }
-	  /* Scan the set of h-b-h options, process ones that we understand */
-	  error1 = ip6_scan_hbh_options (b1, ip1, hbh1, opt1, limit1, &next1);
-
-	outdual:
-	  /* Has the classifier flagged this buffer for special treatment? */
-	  if (PREDICT_FALSE
-	      ((error0 == 0)
-	       && (vnet_buffer (b0)->l2_classify.opaque_index & OI_DECAP)))
-	    next0 = hm->next_override;
-
-	  /* Has the classifier flagged this buffer for special treatment? */
-	  if (PREDICT_FALSE
-	      ((error1 == 0)
-	       && (vnet_buffer (b1)->l2_classify.opaque_index & OI_DECAP)))
-	    next1 = hm->next_override;
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  ip6_hop_by_hop_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  u32 trace_len = (hbh0->length + 1) << 3;
-		  t->next_index = next0;
-		  /* Capture the h-b-h option verbatim */
-		  trace_len =
-		    trace_len <
-		    ARRAY_LEN (t->option_data) ? trace_len :
-		    ARRAY_LEN (t->option_data);
-		  t->trace_len = trace_len;
-		  clib_memcpy (t->option_data, hbh0, trace_len);
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  ip6_hop_by_hop_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  u32 trace_len = (hbh1->length + 1) << 3;
-		  t->next_index = next1;
-		  /* Capture the h-b-h option verbatim */
-		  trace_len =
-		    trace_len <
-		    ARRAY_LEN (t->option_data) ? trace_len :
-		    ARRAY_LEN (t->option_data);
-		  t->trace_len = trace_len;
-		  clib_memcpy (t->option_data, hbh1, trace_len);
-		}
-
-	    }
-
-	  b0->error = error_node->errors[error0];
-	  b1->error = error_node->errors[error1];
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, bi1, next0,
-					   next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  ip6_header_t *ip0;
-	  ip6_hop_by_hop_header_t *hbh0;
-	  ip6_hop_by_hop_option_t *opt0, *limit0;
-	  u8 error0 = 0;
-
-	  /* Speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  /*
-	   * Default use the next_index from the adjacency.
-	   * A HBH option rarely redirects to a different node
-	   */
-	  u32 adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
-	  ip_adjacency_t *adj0 = ip_get_adjacency (lm, adj_index0);
-	  next0 = adj0->lookup_next_index;
-
-	  ip0 = vlib_buffer_get_current (b0);
-	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
-	  opt0 = (ip6_hop_by_hop_option_t *) (hbh0 + 1);
-	  limit0 =
-	    (ip6_hop_by_hop_option_t *) ((u8 *) hbh0 +
-					 ((hbh0->length + 1) << 3));
-
-	  /*
-	   * Basic validity checks
-	   */
-	  if ((hbh0->length + 1) << 3 >
-	      clib_net_to_host_u16 (ip0->payload_length))
-	    {
-	      error0 = IP6_HOP_BY_HOP_ERROR_FORMAT;
-	      next0 = IP_LOOKUP_NEXT_DROP;
-	      goto out0;
-	    }
-
-	  /* Scan the set of h-b-h options, process ones that we understand */
-	  error0 = ip6_scan_hbh_options (b0, ip0, hbh0, opt0, limit0, &next0);
-
-	out0:
-	  /* Has the classifier flagged this buffer for special treatment? */
-	  if (PREDICT_FALSE
-	      ((error0 == 0)
-	       && (vnet_buffer (b0)->l2_classify.opaque_index & OI_DECAP)))
-	    next0 = hm->next_override;
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ip6_hop_by_hop_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      u32 trace_len = (hbh0->length + 1) << 3;
-	      t->next_index = next0;
-	      /* Capture the h-b-h option verbatim */
-	      trace_len =
-		trace_len <
-		ARRAY_LEN (t->option_data) ? trace_len :
-		ARRAY_LEN (t->option_data);
-	      t->trace_len = trace_len;
-	      clib_memcpy (t->option_data, hbh0, trace_len);
-	    }
-
-	  b0->error = error_node->errors[error0];
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_hop_by_hop_node) =
-{
-  .function = ip6_hop_by_hop,
-  .name = "ip6-hop-by-hop",
-  .sibling_of = "ip6-lookup",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip6_hop_by_hop_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .n_errors = ARRAY_LEN (ip6_hop_by_hop_error_strings),
-  .error_strings = ip6_hop_by_hop_error_strings,
-  .n_next_nodes = 0,
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_hop_by_hop_node, ip6_hop_by_hop);
-
-static clib_error_t *
-ip6_hop_by_hop_init (vlib_main_t * vm)
-{
-  ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main;
-  memset (hm->options, 0, sizeof (hm->options));
-  memset (hm->trace, 0, sizeof (hm->trace));
-  hm->next_override = IP6_LOOKUP_NEXT_POP_HOP_BY_HOP;
-  return (0);
-}
-
-VLIB_INIT_FUNCTION (ip6_hop_by_hop_init);
-
-void
-ip6_hbh_set_next_override (uword next)
-{
-  ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main;
-
-  hm->next_override = next;
-}
-
-int
-ip6_hbh_register_option (u8 option,
-			 int options (vlib_buffer_t * b, ip6_header_t * ip,
-				      ip6_hop_by_hop_option_t * opt),
-			 u8 * trace (u8 * s, ip6_hop_by_hop_option_t * opt))
-{
-  ip6_main_t *im = &ip6_main;
-  ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main;
-
-  ASSERT (option < ARRAY_LEN (hm->options));
-
-  /* Already registered */
-  if (hm->options[option])
-    return (-1);
-
-  hm->options[option] = options;
-  hm->trace[option] = trace;
-
-  /* Set global variable */
-  im->hbh_enabled = 1;
-
-  return (0);
-}
-
-int
-ip6_hbh_unregister_option (u8 option)
-{
-  ip6_main_t *im = &ip6_main;
-  ip6_hop_by_hop_main_t *hm = &ip6_hop_by_hop_main;
-
-  ASSERT (option < ARRAY_LEN (hm->options));
-
-  /* Not registered */
-  if (!hm->options[option])
-    return (-1);
-
-  hm->options[option] = NULL;
-  hm->trace[option] = NULL;
-
-  /* Disable global knob if this was the last option configured */
-  int i;
-  bool found = false;
-  for (i = 0; i < 256; i++)
-    {
-      if (hm->options[option])
-	{
-	  found = true;
-	  break;
-	}
-    }
-  if (!found)
-    im->hbh_enabled = 0;
-
-  return (0);
-}
-
-/* Global IP6 main. */
-ip6_main_t ip6_main;
-
-static clib_error_t *
-ip6_lookup_init (vlib_main_t * vm)
-{
-  ip6_main_t *im = &ip6_main;
-  clib_error_t *error;
-  uword i;
-
-  if ((error = vlib_call_init_function (vm, vnet_feature_init)))
-    return error;
-
-  for (i = 0; i < ARRAY_LEN (im->fib_masks); i++)
-    {
-      u32 j, i0, i1;
-
-      i0 = i / 32;
-      i1 = i % 32;
-
-      for (j = 0; j < i0; j++)
-	im->fib_masks[i].as_u32[j] = ~0;
-
-      if (i1)
-	im->fib_masks[i].as_u32[i0] =
-	  clib_host_to_net_u32 (pow2_mask (i1) << (32 - i1));
-    }
-
-  ip_lookup_init (&im->lookup_main, /* is_ip6 */ 1);
-
-  if (im->lookup_table_nbuckets == 0)
-    im->lookup_table_nbuckets = IP6_FIB_DEFAULT_HASH_NUM_BUCKETS;
-
-  im->lookup_table_nbuckets = 1 << max_log2 (im->lookup_table_nbuckets);
-
-  if (im->lookup_table_size == 0)
-    im->lookup_table_size = IP6_FIB_DEFAULT_HASH_MEMORY_SIZE;
-
-  BV (clib_bihash_init) (&(im->ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash),
-			 "ip6 FIB fwding table",
-			 im->lookup_table_nbuckets, im->lookup_table_size);
-  BV (clib_bihash_init) (&im->ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash,
-			 "ip6 FIB non-fwding table",
-			 im->lookup_table_nbuckets, im->lookup_table_size);
-
-  /* Create FIB with index 0 and table id of 0. */
-  fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, 0);
-
-  {
-    pg_node_t *pn;
-    pn = pg_get_node (ip6_lookup_node.index);
-    pn->unformat_edit = unformat_pg_ip6_header;
-  }
-
-  /* Unless explicitly configured, don't process HBH options */
-  im->hbh_enabled = 0;
-
-  {
-    icmp6_neighbor_solicitation_header_t p;
-
-    memset (&p, 0, sizeof (p));
-
-    p.ip.ip_version_traffic_class_and_flow_label =
-      clib_host_to_net_u32 (0x6 << 28);
-    p.ip.payload_length =
-      clib_host_to_net_u16 (sizeof (p) -
-			    STRUCT_OFFSET_OF
-			    (icmp6_neighbor_solicitation_header_t, neighbor));
-    p.ip.protocol = IP_PROTOCOL_ICMP6;
-    p.ip.hop_limit = 255;
-    ip6_set_solicited_node_multicast_address (&p.ip.dst_address, 0);
-
-    p.neighbor.icmp.type = ICMP6_neighbor_solicitation;
-
-    p.link_layer_option.header.type =
-      ICMP6_NEIGHBOR_DISCOVERY_OPTION_source_link_layer_address;
-    p.link_layer_option.header.n_data_u64s =
-      sizeof (p.link_layer_option) / sizeof (u64);
-
-    vlib_packet_template_init (vm,
-			       &im->discover_neighbor_packet_template,
-			       &p, sizeof (p),
-			       /* alloc chunk size */ 8,
-			       "ip6 neighbor discovery");
-  }
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (ip6_lookup_init);
-
-static clib_error_t *
-add_del_ip6_interface_table (vlib_main_t * vm,
-			     unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index, table_id;
-
-  sw_if_index = ~0;
-
-  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  if (unformat (input, "%d", &table_id))
-    ;
-  else
-    {
-      error = clib_error_return (0, "expected table id `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  {
-    u32 fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6,
-						       table_id);
-
-    vec_validate (ip6_main.fib_index_by_sw_if_index, sw_if_index);
-    ip6_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
-  }
-
-
-done:
-  return error;
-}
-
-/*?
- * Place the indicated interface into the supplied IPv6 FIB table (also known
- * as a VRF). If the FIB table does not exist, this command creates it. To
- * display the current IPv6 FIB table, use the command '<em>show ip6 fib</em>'.
- * FIB table will only be displayed if a route has been added to the table, or
- * an IP Address is assigned to an interface in the table (which adds a route
- * automatically).
- *
- * @note IP addresses added after setting the interface IP table end up in
- * the indicated FIB table. If the IP address is added prior to adding the
- * interface to the FIB table, it will NOT be part of the FIB table. Predictable
- * but potentially counter-intuitive results occur if you provision interface
- * addresses in multiple FIBs. Upon RX, packets will be processed in the last
- * IP table ID provisioned. It might be marginally useful to evade source RPF
- * drops to put an interface address into multiple FIBs.
- *
- * @cliexpar
- * Example of how to add an interface to an IPv6 FIB table (where 2 is the table-id):
- * @cliexcmd{set interface ip6 table GigabitEthernet2/0/0 2}
- ?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_ip6_table_command, static) =
-{
-  .path = "set interface ip6 table",
-  .function = add_del_ip6_interface_table,
-  .short_help = "set interface ip6 table <interface> <table-id>"
-};
-/* *INDENT-ON* */
-
-void
-ip6_link_local_address_from_ethernet_mac_address (ip6_address_t * ip,
-						  u8 * mac)
-{
-  ip->as_u64[0] = clib_host_to_net_u64 (0xFE80000000000000ULL);
-  /* Invert the "u" bit */
-  ip->as_u8[8] = mac[0] ^ (1 << 1);
-  ip->as_u8[9] = mac[1];
-  ip->as_u8[10] = mac[2];
-  ip->as_u8[11] = 0xFF;
-  ip->as_u8[12] = 0xFE;
-  ip->as_u8[13] = mac[3];
-  ip->as_u8[14] = mac[4];
-  ip->as_u8[15] = mac[5];
-}
-
-void
-ip6_ethernet_mac_address_from_link_local_address (u8 * mac,
-						  ip6_address_t * ip)
-{
-  /* Invert the previously inverted "u" bit */
-  mac[0] = ip->as_u8[8] ^ (1 << 1);
-  mac[1] = ip->as_u8[9];
-  mac[2] = ip->as_u8[10];
-  mac[3] = ip->as_u8[13];
-  mac[4] = ip->as_u8[14];
-  mac[5] = ip->as_u8[15];
-}
-
-static clib_error_t *
-test_ip6_link_command_fn (vlib_main_t * vm,
-			  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  u8 mac[6];
-  ip6_address_t _a, *a = &_a;
-
-  if (unformat (input, "%U", unformat_ethernet_address, mac))
-    {
-      ip6_link_local_address_from_ethernet_mac_address (a, mac);
-      vlib_cli_output (vm, "Link local address: %U", format_ip6_address, a);
-      ip6_ethernet_mac_address_from_link_local_address (mac, a);
-      vlib_cli_output (vm, "Original MAC address: %U",
-		       format_ethernet_address, mac);
-    }
-
-  return 0;
-}
-
-/*?
- * This command converts the given MAC Address into an IPv6 link-local
- * address.
- *
- * @cliexpar
- * Example of how to create an IPv6 link-local address:
- * @cliexstart{test ip6 link 16:d9:e0:91:79:86}
- * Link local address: fe80::14d9:e0ff:fe91:7986
- * Original MAC address: 16:d9:e0:91:79:86
- * @cliexend
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (test_link_command, static) =
-{
-  .path = "test ip6 link",
-  .function = test_ip6_link_command_fn,
-  .short_help = "test ip6 link <mac-address>",
-};
-/* *INDENT-ON* */
-
-int
-vnet_set_ip6_flow_hash (u32 table_id, u32 flow_hash_config)
-{
-  ip6_main_t *im6 = &ip6_main;
-  ip6_fib_t *fib;
-  uword *p = hash_get (im6->fib_index_by_table_id, table_id);
-
-  if (p == 0)
-    return -1;
-
-  fib = ip6_fib_get (p[0]);
-
-  fib->flow_hash_config = flow_hash_config;
-  return 1;
-}
-
-static clib_error_t *
-set_ip6_flow_hash_command_fn (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cmd)
-{
-  int matched = 0;
-  u32 table_id = 0;
-  u32 flow_hash_config = 0;
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "table %d", &table_id))
-	matched = 1;
-#define _(a,v) \
-    else if (unformat (input, #a)) { flow_hash_config |= v; matched=1;}
-      foreach_flow_hash_bit
-#undef _
-	else
-	break;
-    }
-
-  if (matched == 0)
-    return clib_error_return (0, "unknown input `%U'",
-			      format_unformat_error, input);
-
-  rv = vnet_set_ip6_flow_hash (table_id, flow_hash_config);
-  switch (rv)
-    {
-    case 1:
-      break;
-
-    case -1:
-      return clib_error_return (0, "no such FIB table %d", table_id);
-
-    default:
-      clib_warning ("BUG: illegal flow hash config 0x%x", flow_hash_config);
-      break;
-    }
-
-  return 0;
-}
-
-/*?
- * Configure the set of IPv6 fields used by the flow hash.
- *
- * @cliexpar
- * @parblock
- * Example of how to set the flow hash on a given table:
- * @cliexcmd{set ip6 flow-hash table 8 dst sport dport proto}
- *
- * Example of display the configured flow hash:
- * @cliexstart{show ip6 fib}
- * ipv6-VRF:0, fib_index 0, flow hash: src dst sport dport proto
- * @::/0
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:5 buckets:1 uRPF:5 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * fe80::/10
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:10 buckets:1 uRPF:10 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ff02::1/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:8 buckets:1 uRPF:8 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ff02::2/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:7 buckets:1 uRPF:7 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ff02::16/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:9 buckets:1 uRPF:9 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ff02::1:ff00:0/104
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:6 buckets:1 uRPF:6 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ipv6-VRF:8, fib_index 1, flow hash: dst sport dport proto
- * @::/0
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:21 buckets:1 uRPF:20 to:[0:0]]
- *     [0] [@0]: dpo-drop ip6
- * @::a:1:1:0:4/126
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:27 buckets:1 uRPF:26 to:[0:0]]
- *     [0] [@4]: ipv6-glean: af_packet0
- * @::a:1:1:0:7/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:28 buckets:1 uRPF:27 to:[0:0]]
- *     [0] [@2]: dpo-receive: @::a:1:1:0:7 on af_packet0
- * fe80::/10
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:26 buckets:1 uRPF:25 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * fe80::fe:3eff:fe3e:9222/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:29 buckets:1 uRPF:28 to:[0:0]]
- *     [0] [@2]: dpo-receive: fe80::fe:3eff:fe3e:9222 on af_packet0
- * ff02::1/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:24 buckets:1 uRPF:23 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ff02::2/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:23 buckets:1 uRPF:22 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ff02::16/128
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:25 buckets:1 uRPF:24 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * ff02::1:ff00:0/104
- *   unicast-ip6-chain
- *   [@0]: dpo-load-balance: [index:22 buckets:1 uRPF:21 to:[0:0]]
- *     [0] [@2]: dpo-receive
- * @cliexend
- * @endparblock
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_ip6_flow_hash_command, static) =
-{
-  .path = "set ip6 flow-hash",
-  .short_help =
-  "set ip6 flow-hash table <table-id> [src] [dst] [sport] [dport] [proto] [reverse]",
-  .function = set_ip6_flow_hash_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-show_ip6_local_command_fn (vlib_main_t * vm,
-			   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  ip6_main_t *im = &ip6_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-  int i;
-
-  vlib_cli_output (vm, "Protocols handled by ip6_local");
-  for (i = 0; i < ARRAY_LEN (lm->local_next_by_ip_protocol); i++)
-    {
-      if (lm->local_next_by_ip_protocol[i] != IP_LOCAL_NEXT_PUNT)
-	vlib_cli_output (vm, "%d", i);
-    }
-  return 0;
-}
-
-
-
-/*?
- * Display the set of protocols handled by the local IPv6 stack.
- *
- * @cliexpar
- * Example of how to display local protocol table:
- * @cliexstart{show ip6 local}
- * Protocols handled by ip6_local
- * 17
- * 43
- * 58
- * 115
- * @cliexend
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_ip6_local, static) =
-{
-  .path = "show ip6 local",
-  .function = show_ip6_local_command_fn,
-  .short_help = "show ip6 local",
-};
-/* *INDENT-ON* */
-
-int
-vnet_set_ip6_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
-			     u32 table_index)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  ip6_main_t *ipm = &ip6_main;
-  ip_lookup_main_t *lm = &ipm->lookup_main;
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  ip6_address_t *if_addr;
-
-  if (pool_is_free_index (im->sw_interfaces, sw_if_index))
-    return VNET_API_ERROR_NO_MATCHING_INTERFACE;
-
-  if (table_index != ~0 && pool_is_free_index (cm->tables, table_index))
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-  vec_validate (lm->classify_table_index_by_sw_if_index, sw_if_index);
-  lm->classify_table_index_by_sw_if_index[sw_if_index] = table_index;
-
-  if_addr = ip6_interface_first_address (ipm, sw_if_index, NULL);
-
-  if (NULL != if_addr)
-    {
-      fib_prefix_t pfx = {
-	.fp_len = 128,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr.ip6 = *if_addr,
-      };
-      u32 fib_index;
-
-      fib_index = fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4,
-						       sw_if_index);
-
-
-      if (table_index != (u32) ~ 0)
-	{
-	  dpo_id_t dpo = DPO_INVALID;
-
-	  dpo_set (&dpo,
-		   DPO_CLASSIFY,
-		   DPO_PROTO_IP6,
-		   classify_dpo_create (DPO_PROTO_IP6, table_index));
-
-	  fib_table_entry_special_dpo_add (fib_index,
-					   &pfx,
-					   FIB_SOURCE_CLASSIFY,
-					   FIB_ENTRY_FLAG_NONE, &dpo);
-	  dpo_reset (&dpo);
-	}
-      else
-	{
-	  fib_table_entry_special_remove (fib_index,
-					  &pfx, FIB_SOURCE_CLASSIFY);
-	}
-    }
-
-  return 0;
-}
-
-static clib_error_t *
-set_ip6_classify_command_fn (vlib_main_t * vm,
-			     unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  u32 table_index = ~0;
-  int table_index_set = 0;
-  u32 sw_if_index = ~0;
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "table-index %d", &table_index))
-	table_index_set = 1;
-      else if (unformat (input, "intfc %U", unformat_vnet_sw_interface,
-			 vnet_get_main (), &sw_if_index))
-	;
-      else
-	break;
-    }
-
-  if (table_index_set == 0)
-    return clib_error_return (0, "classify table-index must be specified");
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "interface / subif must be specified");
-
-  rv = vnet_set_ip6_classify_intfc (vm, sw_if_index, table_index);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case VNET_API_ERROR_NO_MATCHING_INTERFACE:
-      return clib_error_return (0, "No such interface");
-
-    case VNET_API_ERROR_NO_SUCH_ENTRY:
-      return clib_error_return (0, "No such classifier table");
-    }
-  return 0;
-}
-
-/*?
- * Assign a classification table to an interface. The classification
- * table is created using the '<em>classify table</em>' and '<em>classify session</em>'
- * commands. Once the table is create, use this command to filter packets
- * on an interface.
- *
- * @cliexpar
- * Example of how to assign a classification table to an interface:
- * @cliexcmd{set ip6 classify intfc GigabitEthernet2/0/0 table-index 1}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_ip6_classify_command, static) =
-{
-  .path = "set ip6 classify",
-  .short_help =
-  "set ip6 classify intfc <interface> table-index <classify-idx>",
-  .function = set_ip6_classify_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-ip6_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  ip6_main_t *im = &ip6_main;
-  uword heapsize = 0;
-  u32 tmp;
-  u32 nbuckets = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "hash-buckets %d", &tmp))
-	nbuckets = tmp;
-      else if (unformat (input, "heap-size %dm", &tmp))
-	heapsize = ((u64) tmp) << 20;
-      else if (unformat (input, "heap-size %dM", &tmp))
-	heapsize = ((u64) tmp) << 20;
-      else if (unformat (input, "heap-size %dg", &tmp))
-	heapsize = ((u64) tmp) << 30;
-      else if (unformat (input, "heap-size %dG", &tmp))
-	heapsize = ((u64) tmp) << 30;
-      else
-	return clib_error_return (0, "unknown input '%U'",
-				  format_unformat_error, input);
-    }
-
-  im->lookup_table_nbuckets = nbuckets;
-  im->lookup_table_size = heapsize;
-
-  return 0;
-}
-
-VLIB_EARLY_CONFIG_FUNCTION (ip6_config, "ip6");
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip6_hop_by_hop.c b/vnet/vnet/ip/ip6_hop_by_hop.c
deleted file mode 100644
index 3a820b3c..00000000
--- a/vnet/vnet/ip/ip6_hop_by_hop.c
+++ /dev/null
@@ -1,1194 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-
-#include <vnet/ip/ip.h>
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-
-#include <vnet/ip/ip6_hop_by_hop.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/classify/vnet_classify.h>
-
-/**
- * @file
- * @brief In-band OAM (iOAM).
- *
- * In-band OAM (iOAM) is an implementation study to record operational
- * information in the packet while the packet traverses a path between
- * two points in the network.
- *
- * VPP can function as in-band OAM encapsulating, transit and
- * decapsulating node. In this version of VPP in-band OAM data is
- * transported as options in an IPv6 hop-by-hop extension header. Hence
- * in-band OAM can be enabled for IPv6 traffic.
- */
-
-ip6_hop_by_hop_ioam_main_t ip6_hop_by_hop_ioam_main;
-
-#define foreach_ip6_hbyh_ioam_input_next	\
-  _(IP6_REWRITE, "ip6-rewrite")			\
-  _(IP6_LOOKUP, "ip6-lookup")			\
-  _(DROP, "error-drop")
-
-typedef enum
-{
-#define _(s,n) IP6_HBYH_IOAM_INPUT_NEXT_##s,
-  foreach_ip6_hbyh_ioam_input_next
-#undef _
-    IP6_HBYH_IOAM_INPUT_N_NEXT,
-} ip6_hbyh_ioam_input_next_t;
-
-
-u32
-ioam_flow_add (u8 encap, u8 * flow_name)
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-  flow_data_t *flow = 0;
-  u32 index = 0;
-  u8 i;
-
-  pool_get (hm->flows, flow);
-  memset (flow, 0, sizeof (flow_data_t));
-
-  index = flow - hm->flows;
-  strncpy ((char *) flow->flow_name, (char *) flow_name, 31);
-
-  if (!encap)
-    IOAM_SET_DECAP (index);
-
-  for (i = 0; i < 255; i++)
-    {
-      if (hm->flow_handler[i])
-	flow->ctx[i] = hm->flow_handler[i] (index, 1);
-    }
-  return (index);
-}
-
-static uword
-unformat_opaque_ioam (unformat_input_t * input, va_list * args)
-{
-  u64 *opaquep = va_arg (*args, u64 *);
-  u8 *flow_name = NULL;
-  uword ret = 0;
-
-  if (unformat (input, "ioam-encap %s", &flow_name))
-    {
-      *opaquep = ioam_flow_add (1, flow_name);
-      ret = 1;
-    }
-  else if (unformat (input, "ioam-decap %s", &flow_name))
-    {
-      *opaquep = ioam_flow_add (0, flow_name);
-      ret = 1;
-    }
-
-  vec_free (flow_name);
-  return ret;
-}
-
-u8 *
-get_flow_name_from_flow_ctx (u32 flow_ctx)
-{
-  flow_data_t *flow = NULL;
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-  u32 index;
-
-  index = IOAM_MASK_DECAP_BIT (flow_ctx);
-
-  if (pool_is_free_index (hm->flows, index))
-    return NULL;
-
-  flow = pool_elt_at_index (hm->flows, index);
-  return (flow->flow_name);
-}
-
-/* The main h-b-h tracer will be invoked, no need to do much here */
-int
-ip6_hbh_add_register_option (u8 option,
-			     u8 size,
-			     int rewrite_options (u8 * rewrite_string,
-						  u8 * rewrite_size))
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-
-  ASSERT (option < ARRAY_LEN (hm->add_options));
-
-  /* Already registered */
-  if (hm->add_options[option])
-    return (-1);
-
-  hm->add_options[option] = rewrite_options;
-  hm->options_size[option] = size;
-
-  return (0);
-}
-
-int
-ip6_hbh_add_unregister_option (u8 option)
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-
-  ASSERT (option < ARRAY_LEN (hm->add_options));
-
-  /* Not registered */
-  if (!hm->add_options[option])
-    return (-1);
-
-  hm->add_options[option] = NULL;
-  hm->options_size[option] = 0;
-  return (0);
-}
-
-/* Config handler registration */
-int
-ip6_hbh_config_handler_register (u8 option,
-				 int config_handler (void *data, u8 disable))
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-
-  ASSERT (option < ARRAY_LEN (hm->config_handler));
-
-  /* Already registered  */
-  if (hm->config_handler[option])
-    return (VNET_API_ERROR_INVALID_REGISTRATION);
-
-  hm->config_handler[option] = config_handler;
-
-  return (0);
-}
-
-int
-ip6_hbh_config_handler_unregister (u8 option)
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-
-  ASSERT (option < ARRAY_LEN (hm->config_handler));
-
-  /* Not registered */
-  if (!hm->config_handler[option])
-    return (VNET_API_ERROR_INVALID_REGISTRATION);
-
-  hm->config_handler[option] = NULL;
-  return (0);
-}
-
-/* Flow handler registration */
-int
-ip6_hbh_flow_handler_register (u8 option,
-			       u32 ioam_flow_handler (u32 flow_ctx, u8 add))
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-
-  ASSERT (option < ARRAY_LEN (hm->flow_handler));
-
-  /* Already registered */
-  if (hm->flow_handler[option])
-    return (VNET_API_ERROR_INVALID_REGISTRATION);
-
-  hm->flow_handler[option] = ioam_flow_handler;
-
-  return (0);
-}
-
-int
-ip6_hbh_flow_handler_unregister (u8 option)
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-
-  ASSERT (option < ARRAY_LEN (hm->flow_handler));
-
-  /* Not registered */
-  if (!hm->flow_handler[option])
-    return (VNET_API_ERROR_INVALID_REGISTRATION);
-
-  hm->flow_handler[option] = NULL;
-  return (0);
-}
-
-typedef struct
-{
-  u32 next_index;
-} ip6_add_hop_by_hop_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_ip6_add_hop_by_hop_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip6_add_hop_by_hop_trace_t *t = va_arg (*args,
-					  ip6_add_hop_by_hop_trace_t *);
-
-  s = format (s, "IP6_ADD_HOP_BY_HOP: next index %d", t->next_index);
-  return s;
-}
-
-vlib_node_registration_t ip6_add_hop_by_hop_node;
-
-#define foreach_ip6_add_hop_by_hop_error \
-_(PROCESSED, "Pkts w/ added ip6 hop-by-hop options")
-
-typedef enum
-{
-#define _(sym,str) IP6_ADD_HOP_BY_HOP_ERROR_##sym,
-  foreach_ip6_add_hop_by_hop_error
-#undef _
-    IP6_ADD_HOP_BY_HOP_N_ERROR,
-} ip6_add_hop_by_hop_error_t;
-
-static char *ip6_add_hop_by_hop_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ip6_add_hop_by_hop_error
-#undef _
-};
-
-static uword
-ip6_add_hop_by_hop_node_fn (vlib_main_t * vm,
-			    vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-  u32 n_left_from, *from, *to_next;
-  ip_lookup_next_t next_index;
-  u32 processed = 0;
-  u8 *rewrite = hm->rewrite;
-  u32 rewrite_length = vec_len (rewrite);
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-	  ip6_header_t *ip0, *ip1;
-	  ip6_hop_by_hop_header_t *hbh0, *hbh1;
-	  u64 *copy_src0, *copy_dst0, *copy_src1, *copy_dst1;
-	  u16 new_l0, new_l1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data - rewrite_length,
-			   2 * CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data - rewrite_length,
-			   2 * CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  /* $$$$$ Dual loop: process 2 x packets here $$$$$ */
-	  ip0 = vlib_buffer_get_current (b0);
-	  ip1 = vlib_buffer_get_current (b1);
-
-	  /* Copy the ip header left by the required amount */
-	  copy_dst0 = (u64 *) (((u8 *) ip0) - rewrite_length);
-	  copy_dst1 = (u64 *) (((u8 *) ip1) - rewrite_length);
-	  copy_src0 = (u64 *) ip0;
-	  copy_src1 = (u64 *) ip1;
-
-	  copy_dst0[0] = copy_src0[0];
-	  copy_dst0[1] = copy_src0[1];
-	  copy_dst0[2] = copy_src0[2];
-	  copy_dst0[3] = copy_src0[3];
-	  copy_dst0[4] = copy_src0[4];
-
-	  copy_dst1[0] = copy_src1[0];
-	  copy_dst1[1] = copy_src1[1];
-	  copy_dst1[2] = copy_src1[2];
-	  copy_dst1[3] = copy_src1[3];
-	  copy_dst1[4] = copy_src1[4];
-
-	  vlib_buffer_advance (b0, -(word) rewrite_length);
-	  vlib_buffer_advance (b1, -(word) rewrite_length);
-	  ip0 = vlib_buffer_get_current (b0);
-	  ip1 = vlib_buffer_get_current (b1);
-
-	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
-	  hbh1 = (ip6_hop_by_hop_header_t *) (ip1 + 1);
-	  /* $$$ tune, rewrite_length is a multiple of 8 */
-	  clib_memcpy (hbh0, rewrite, rewrite_length);
-	  clib_memcpy (hbh1, rewrite, rewrite_length);
-	  /* Patch the protocol chain, insert the h-b-h (type 0) header */
-	  hbh0->protocol = ip0->protocol;
-	  hbh1->protocol = ip1->protocol;
-	  ip0->protocol = 0;
-	  ip1->protocol = 0;
-	  new_l0 =
-	    clib_net_to_host_u16 (ip0->payload_length) + rewrite_length;
-	  new_l1 =
-	    clib_net_to_host_u16 (ip1->payload_length) + rewrite_length;
-	  ip0->payload_length = clib_host_to_net_u16 (new_l0);
-	  ip1->payload_length = clib_host_to_net_u16 (new_l1);
-
-	  /* Populate the (first) h-b-h list elt */
-	  next0 = IP6_HBYH_IOAM_INPUT_NEXT_IP6_LOOKUP;
-	  next1 = IP6_HBYH_IOAM_INPUT_NEXT_IP6_LOOKUP;
-
-
-	  /* $$$$$ End of processing 2 x packets $$$$$ */
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  ip6_add_hop_by_hop_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->next_index = next0;
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  ip6_add_hop_by_hop_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  t->next_index = next1;
-		}
-	    }
-	  processed += 2;
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  ip6_header_t *ip0;
-	  ip6_hop_by_hop_header_t *hbh0;
-	  u64 *copy_src0, *copy_dst0;
-	  u16 new_l0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  ip0 = vlib_buffer_get_current (b0);
-
-	  /* Copy the ip header left by the required amount */
-	  copy_dst0 = (u64 *) (((u8 *) ip0) - rewrite_length);
-	  copy_src0 = (u64 *) ip0;
-
-	  copy_dst0[0] = copy_src0[0];
-	  copy_dst0[1] = copy_src0[1];
-	  copy_dst0[2] = copy_src0[2];
-	  copy_dst0[3] = copy_src0[3];
-	  copy_dst0[4] = copy_src0[4];
-	  vlib_buffer_advance (b0, -(word) rewrite_length);
-	  ip0 = vlib_buffer_get_current (b0);
-
-	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
-	  /* $$$ tune, rewrite_length is a multiple of 8 */
-	  clib_memcpy (hbh0, rewrite, rewrite_length);
-	  /* Patch the protocol chain, insert the h-b-h (type 0) header */
-	  hbh0->protocol = ip0->protocol;
-	  ip0->protocol = 0;
-	  new_l0 =
-	    clib_net_to_host_u16 (ip0->payload_length) + rewrite_length;
-	  ip0->payload_length = clib_host_to_net_u16 (new_l0);
-
-	  /* Populate the (first) h-b-h list elt */
-	  next0 = IP6_HBYH_IOAM_INPUT_NEXT_IP6_LOOKUP;
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      ip6_add_hop_by_hop_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->next_index = next0;
-	    }
-
-	  processed++;
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, ip6_add_hop_by_hop_node.index,
-			       IP6_ADD_HOP_BY_HOP_ERROR_PROCESSED, processed);
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_add_hop_by_hop_node) =	/* *INDENT-OFF* */
-{
-  .function = ip6_add_hop_by_hop_node_fn,.name =
-    "ip6-add-hop-by-hop",.vector_size = sizeof (u32),.format_trace =
-    format_ip6_add_hop_by_hop_trace,.type =
-    VLIB_NODE_TYPE_INTERNAL,.n_errors =
-    ARRAY_LEN (ip6_add_hop_by_hop_error_strings),.error_strings =
-    ip6_add_hop_by_hop_error_strings,
-    /* See ip/lookup.h */
-    .n_next_nodes = IP6_HBYH_IOAM_INPUT_N_NEXT,.next_nodes =
-  {
-#define _(s,n) [IP6_HBYH_IOAM_INPUT_NEXT_##s] = n,
-    foreach_ip6_hbyh_ioam_input_next
-#undef _
-  }
-,};
-/* *INDENT-ON* */
-
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_add_hop_by_hop_node,
-			      ip6_add_hop_by_hop_node_fn);
-/* The main h-b-h tracer was already invoked, no need to do much here */
-typedef struct
-{
-  u32 next_index;
-} ip6_pop_hop_by_hop_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_ip6_pop_hop_by_hop_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip6_pop_hop_by_hop_trace_t *t =
-    va_arg (*args, ip6_pop_hop_by_hop_trace_t *);
-
-  s = format (s, "IP6_POP_HOP_BY_HOP: next index %d", t->next_index);
-  return s;
-}
-
-int
-ip6_hbh_pop_register_option (u8 option,
-			     int options (vlib_buffer_t * b,
-					  ip6_header_t * ip,
-					  ip6_hop_by_hop_option_t * opt))
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-
-  ASSERT (option < ARRAY_LEN (hm->pop_options));
-
-  /* Already registered */
-  if (hm->pop_options[option])
-    return (-1);
-
-  hm->pop_options[option] = options;
-
-  return (0);
-}
-
-int
-ip6_hbh_pop_unregister_option (u8 option)
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-
-  ASSERT (option < ARRAY_LEN (hm->pop_options));
-
-  /* Not registered */
-  if (!hm->pop_options[option])
-    return (-1);
-
-  hm->pop_options[option] = NULL;
-  return (0);
-}
-
-vlib_node_registration_t ip6_pop_hop_by_hop_node;
-
-#define foreach_ip6_pop_hop_by_hop_error                \
-_(PROCESSED, "Pkts w/ removed ip6 hop-by-hop options")  \
-_(NO_HOHO, "Pkts w/ no ip6 hop-by-hop options")         \
-_(OPTION_FAILED, "ip6 pop hop-by-hop failed to process")
-
-typedef enum
-{
-#define _(sym,str) IP6_POP_HOP_BY_HOP_ERROR_##sym,
-  foreach_ip6_pop_hop_by_hop_error
-#undef _
-    IP6_POP_HOP_BY_HOP_N_ERROR,
-} ip6_pop_hop_by_hop_error_t;
-
-static char *ip6_pop_hop_by_hop_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ip6_pop_hop_by_hop_error
-#undef _
-};
-
-static inline void
-ioam_pop_hop_by_hop_processing (vlib_main_t * vm,
-				ip6_header_t * ip0,
-				ip6_hop_by_hop_header_t * hbh0,
-				vlib_buffer_t * b)
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-  ip6_hop_by_hop_option_t *opt0, *limit0;
-  u8 type0;
-
-  if (!hbh0 || !ip0)
-    return;
-
-  opt0 = (ip6_hop_by_hop_option_t *) (hbh0 + 1);
-  limit0 = (ip6_hop_by_hop_option_t *)
-    ((u8 *) hbh0 + ((hbh0->length + 1) << 3));
-
-  /* Scan the set of h-b-h options, process ones that we understand */
-  while (opt0 < limit0)
-    {
-      type0 = opt0->type;
-      switch (type0)
-	{
-	case 0:		/* Pad1 */
-	  opt0 = (ip6_hop_by_hop_option_t *) ((u8 *) opt0) + 1;
-	  continue;
-	case 1:		/* PadN */
-	  break;
-	default:
-	  if (hm->pop_options[type0])
-	    {
-	      if ((*hm->pop_options[type0]) (b, ip0, opt0) < 0)
-		{
-		  vlib_node_increment_counter (vm,
-					       ip6_pop_hop_by_hop_node.index,
-					       IP6_POP_HOP_BY_HOP_ERROR_OPTION_FAILED,
-					       1);
-		}
-	    }
-	}
-      opt0 =
-	(ip6_hop_by_hop_option_t *) (((u8 *) opt0) + opt0->length +
-				     sizeof (ip6_hop_by_hop_option_t));
-    }
-}
-
-static uword
-ip6_pop_hop_by_hop_node_fn (vlib_main_t * vm,
-			    vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  ip6_main_t *im = &ip6_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-  u32 n_left_from, *from, *to_next;
-  ip_lookup_next_t next_index;
-  u32 processed = 0;
-  u32 no_header = 0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-	  u32 adj_index0, adj_index1;
-	  ip6_header_t *ip0, *ip1;
-	  ip_adjacency_t *adj0, *adj1;
-	  ip6_hop_by_hop_header_t *hbh0, *hbh1;
-	  u64 *copy_dst0, *copy_src0, *copy_dst1, *copy_src1;
-	  u16 new_l0, new_l1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  /* $$$$$ Dual loop: process 2 x packets here $$$$$ */
-	  ip0 = vlib_buffer_get_current (b0);
-	  ip1 = vlib_buffer_get_current (b1);
-	  adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
-	  adj_index1 = vnet_buffer (b1)->ip.adj_index[VLIB_TX];
-	  adj0 = ip_get_adjacency (lm, adj_index0);
-	  adj1 = ip_get_adjacency (lm, adj_index1);
-
-	  next0 = adj0->lookup_next_index;
-	  next1 = adj1->lookup_next_index;
-
-	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
-	  hbh1 = (ip6_hop_by_hop_header_t *) (ip1 + 1);
-
-	  ioam_pop_hop_by_hop_processing (vm, ip0, hbh0, b0);
-	  ioam_pop_hop_by_hop_processing (vm, ip1, hbh1, b1);
-
-	  vlib_buffer_advance (b0, (hbh0->length + 1) << 3);
-	  vlib_buffer_advance (b1, (hbh1->length + 1) << 3);
-
-	  new_l0 = clib_net_to_host_u16 (ip0->payload_length) -
-	    ((hbh0->length + 1) << 3);
-	  new_l1 = clib_net_to_host_u16 (ip1->payload_length) -
-	    ((hbh1->length + 1) << 3);
-
-	  ip0->payload_length = clib_host_to_net_u16 (new_l0);
-	  ip1->payload_length = clib_host_to_net_u16 (new_l1);
-
-	  ip0->protocol = hbh0->protocol;
-	  ip1->protocol = hbh1->protocol;
-
-	  copy_src0 = (u64 *) ip0;
-	  copy_src1 = (u64 *) ip1;
-	  copy_dst0 = copy_src0 + (hbh0->length + 1);
-	  copy_dst0[4] = copy_src0[4];
-	  copy_dst0[3] = copy_src0[3];
-	  copy_dst0[2] = copy_src0[2];
-	  copy_dst0[1] = copy_src0[1];
-	  copy_dst0[0] = copy_src0[0];
-	  copy_dst1 = copy_src1 + (hbh1->length + 1);
-	  copy_dst1[4] = copy_src1[4];
-	  copy_dst1[3] = copy_src1[3];
-	  copy_dst1[2] = copy_src1[2];
-	  copy_dst1[1] = copy_src1[1];
-	  copy_dst1[0] = copy_src1[0];
-	  processed += 2;
-	  /* $$$$$ End of processing 2 x packets $$$$$ */
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  ip6_pop_hop_by_hop_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->next_index = next0;
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  ip6_pop_hop_by_hop_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  t->next_index = next1;
-		}
-	    }
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 adj_index0;
-	  ip6_header_t *ip0;
-	  ip_adjacency_t *adj0;
-	  ip6_hop_by_hop_header_t *hbh0;
-	  u64 *copy_dst0, *copy_src0;
-	  u16 new_l0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  ip0 = vlib_buffer_get_current (b0);
-	  adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
-	  adj0 = ip_get_adjacency (lm, adj_index0);
-
-	  /* Default use the next_index from the adjacency. */
-	  next0 = adj0->lookup_next_index;
-
-	  /* Perfectly normal to end up here w/ out h-b-h header */
-	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
-
-	  /* TODO:Temporarily doing it here.. do this validation in end_of_path_cb */
-	  ioam_pop_hop_by_hop_processing (vm, ip0, hbh0, b0);
-	  /* Pop the trace data */
-	  vlib_buffer_advance (b0, (hbh0->length + 1) << 3);
-	  new_l0 = clib_net_to_host_u16 (ip0->payload_length) -
-	    ((hbh0->length + 1) << 3);
-	  ip0->payload_length = clib_host_to_net_u16 (new_l0);
-	  ip0->protocol = hbh0->protocol;
-	  copy_src0 = (u64 *) ip0;
-	  copy_dst0 = copy_src0 + (hbh0->length + 1);
-	  copy_dst0[4] = copy_src0[4];
-	  copy_dst0[3] = copy_src0[3];
-	  copy_dst0[2] = copy_src0[2];
-	  copy_dst0[1] = copy_src0[1];
-	  copy_dst0[0] = copy_src0[0];
-	  processed++;
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      ip6_pop_hop_by_hop_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->next_index = next0;
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, ip6_pop_hop_by_hop_node.index,
-			       IP6_POP_HOP_BY_HOP_ERROR_PROCESSED, processed);
-  vlib_node_increment_counter (vm, ip6_pop_hop_by_hop_node.index,
-			       IP6_POP_HOP_BY_HOP_ERROR_NO_HOHO, no_header);
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_pop_hop_by_hop_node) =
-{
-  .function = ip6_pop_hop_by_hop_node_fn,.name =
-    "ip6-pop-hop-by-hop",.vector_size = sizeof (u32),.format_trace =
-    format_ip6_pop_hop_by_hop_trace,.type =
-    VLIB_NODE_TYPE_INTERNAL,.sibling_of = "ip6-lookup",.n_errors =
-    ARRAY_LEN (ip6_pop_hop_by_hop_error_strings),.error_strings =
-    ip6_pop_hop_by_hop_error_strings,
-    /* See ip/lookup.h */
-.n_next_nodes = 0,};
-
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_pop_hop_by_hop_node,
-			      ip6_pop_hop_by_hop_node_fn);
-static clib_error_t *
-ip6_hop_by_hop_ioam_init (vlib_main_t * vm)
-{
-  clib_error_t *error;
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-
-  if ((error = vlib_call_init_function (vm, ip_main_init)))
-    return (error);
-
-  if ((error = vlib_call_init_function (vm, ip6_lookup_init)))
-    return error;
-
-  hm->vlib_main = vm;
-  hm->vnet_main = vnet_get_main ();
-  hm->unix_time_0 = (u32) time (0);	/* Store starting time */
-  hm->vlib_time_0 = vlib_time_now (vm);
-  hm->ioam_flag = IOAM_HBYH_MOD;
-  memset (hm->add_options, 0, sizeof (hm->add_options));
-  memset (hm->pop_options, 0, sizeof (hm->pop_options));
-  memset (hm->options_size, 0, sizeof (hm->options_size));
-
-  vnet_classify_register_unformat_opaque_index_fn (unformat_opaque_ioam);
-
-  return (0);
-}
-
-VLIB_INIT_FUNCTION (ip6_hop_by_hop_ioam_init);
-
-int
-ip6_ioam_set_rewrite (u8 ** rwp, int has_trace_option,
-		      int has_pot_option, int has_seqno_option)
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-  u8 *rewrite = NULL;
-  u32 size, rnd_size;
-  ip6_hop_by_hop_header_t *hbh;
-  u8 *current;
-  u8 *trace_data_size = NULL;
-  u8 *pot_data_size = NULL;
-
-  vec_free (*rwp);
-
-  if (has_trace_option == 0 && has_pot_option == 0)
-    return -1;
-
-  /* Work out how much space we need */
-  size = sizeof (ip6_hop_by_hop_header_t);
-
-  //if (has_trace_option && hm->get_sizeof_options[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] != 0)
-  if (has_trace_option
-      && hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] != 0)
-    {
-      size += hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST];
-    }
-  if (has_pot_option
-      && hm->add_options[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] != 0)
-    {
-      size += hm->options_size[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT];
-    }
-
-  if (has_seqno_option)
-    {
-      size += hm->options_size[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE];
-    }
-
-  /* Round to a multiple of 8 octets */
-  rnd_size = (size + 7) & ~7;
-
-  /* allocate it, zero-fill / pad by construction */
-  vec_validate (rewrite, rnd_size - 1);
-
-  hbh = (ip6_hop_by_hop_header_t *) rewrite;
-  /* Length of header in 8 octet units, not incl first 8 octets */
-  hbh->length = (rnd_size >> 3) - 1;
-  current = (u8 *) (hbh + 1);
-
-  if (has_trace_option
-      && hm->add_options[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] != 0)
-    {
-      if (0 != (hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST]))
-	{
-	  trace_data_size =
-	    &hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST];
-	  if (0 ==
-	      hm->add_options[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] (current,
-								     trace_data_size))
-	    current += *trace_data_size;
-	}
-    }
-  if (has_pot_option
-      && hm->add_options[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] != 0)
-    {
-      pot_data_size =
-	&hm->options_size[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT];
-      if (0 ==
-	  hm->add_options[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] (current,
-								  pot_data_size))
-	current += *pot_data_size;
-    }
-
-  if (has_seqno_option &&
-      (hm->add_options[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE] != 0))
-    {
-      if (0 == hm->add_options[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE] (current,
-								   &
-								   (hm->options_size
-								    [HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE])))
-	current += hm->options_size[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE];
-    }
-
-  *rwp = rewrite;
-  return 0;
-}
-
-clib_error_t *
-clear_ioam_rewrite_fn (void)
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-
-  vec_free (hm->rewrite);
-  hm->rewrite = 0;
-  hm->has_trace_option = 0;
-  hm->has_pot_option = 0;
-  hm->has_seqno_option = 0;
-  hm->has_analyse_option = 0;
-  if (hm->config_handler[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST])
-    hm->config_handler[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] (NULL, 1);
-
-  if (hm->config_handler[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT])
-    hm->config_handler[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] (NULL, 1);
-
-  if (hm->config_handler[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE])
-    {
-      hm->config_handler[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE] ((void *)
-							     &hm->has_analyse_option,
-							     1);
-    }
-
-  return 0;
-}
-
-clib_error_t *
-clear_ioam_rewrite_command_fn (vlib_main_t * vm,
-			       unformat_input_t * input,
-			       vlib_cli_command_t * cmd)
-{
-  return (clear_ioam_rewrite_fn ());
-}
-
-/*?
- * This command clears all the In-band OAM (iOAM) features enabled by
- * the '<em>set ioam rewrite</em>' command. Use '<em>show ioam summary</em>' to
- * verify the configured settings cleared.
- *
- * @cliexpar
- * Example of how to clear iOAM features:
- * @cliexcmd{clear ioam rewrite}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ip6_clear_ioam_rewrite_cmd, static) = {
-  .path = "clear ioam rewrite",
-  .short_help = "clear ioam rewrite",
-  .function = clear_ioam_rewrite_command_fn,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-ip6_ioam_enable (int has_trace_option, int has_pot_option,
-		 int has_seqno_option, int has_analyse_option)
-{
-  int rv;
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-  rv = ip6_ioam_set_rewrite (&hm->rewrite, has_trace_option,
-			     has_pot_option, has_seqno_option);
-
-  switch (rv)
-    {
-    case 0:
-      if (has_trace_option)
-	{
-	  hm->has_trace_option = has_trace_option;
-	  if (hm->config_handler[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST])
-	    hm->config_handler[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] (NULL,
-								      0);
-	}
-
-      if (has_pot_option)
-	{
-	  hm->has_pot_option = has_pot_option;
-	  if (hm->config_handler[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT])
-	    hm->config_handler[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] (NULL,
-								       0);
-	}
-      hm->has_analyse_option = has_analyse_option;
-      if (has_seqno_option)
-	{
-	  hm->has_seqno_option = has_seqno_option;
-	  if (hm->config_handler[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE])
-	    {
-	      hm->config_handler[HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE] ((void *)
-								     &has_analyse_option,
-								     0);
-	    }
-	}
-      break;
-
-    default:
-      return clib_error_return_code (0, rv, 0,
-				     "ip6_ioam_set_rewrite returned %d", rv);
-    }
-
-  return 0;
-}
-
-
-static clib_error_t *
-ip6_set_ioam_rewrite_command_fn (vlib_main_t * vm,
-				 unformat_input_t * input,
-				 vlib_cli_command_t * cmd)
-{
-  int has_trace_option = 0;
-  int has_pot_option = 0;
-  int has_seqno_option = 0;
-  int has_analyse_option = 0;
-  clib_error_t *rv = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "trace"))
-	has_trace_option = 1;
-      else if (unformat (input, "pot"))
-	has_pot_option = 1;
-      else if (unformat (input, "seqno"))
-	has_seqno_option = 1;
-      else if (unformat (input, "analyse"))
-	has_analyse_option = 1;
-      else
-	break;
-    }
-
-
-  rv = ip6_ioam_enable (has_trace_option, has_pot_option,
-			has_seqno_option, has_analyse_option);
-
-  return rv;
-}
-
-/*?
- * This command is used to enable In-band OAM (iOAM) features on IPv6.
- * '<em>trace</em>' is used to enable iOAM trace feature. '<em>pot</em>' is used to
- * enable the Proof Of Transit feature. '<em>ppc</em>' is used to indicate the
- * Per Packet Counter feature for Edge to Edge processing. '<em>ppc</em>' is
- * used to indicate if this node is an '<em>encap</em>' node (iOAM edge node
- * where packet enters iOAM domain), a '<em>decap</em>' node (iOAM edge node
- * where packet leaves iOAM domain) or '<em>none</em>' (iOAM node where packet
- * is in-transit through the iOAM domain). '<em>ppc</em>' can only be set if
- * '<em>trace</em>' or '<em>pot</em>' is enabled.
- *
- * Use '<em>clear ioam rewrite</em>' to disable all features enabled by this
- * command. Use '<em>show ioam summary</em>' to verify the configured settings.
- *
- * @cliexpar
- * Example of how to enable trace and pot with ppc set to encap:
- * @cliexcmd{set ioam rewrite trace pot ppc encap}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ip6_set_ioam_rewrite_cmd, static) = {
-  .path = "set ioam rewrite",
-  .short_help = "set ioam [trace] [pot] [seqno] [analyse]",
-  .function = ip6_set_ioam_rewrite_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-ip6_show_ioam_summary_cmd_fn (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cmd)
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-  u8 *s = 0;
-
-
-  if (!is_zero_ip6_address (&hm->adj))
-    {
-      s = format (s, "              REWRITE FLOW CONFIGS - \n");
-      s = format (s, "               Destination Address : %U\n",
-		  format_ip6_address, &hm->adj, sizeof (ip6_address_t));
-      s =
-	format (s, "                    Flow operation : %d (%s)\n",
-		hm->ioam_flag,
-		(hm->ioam_flag ==
-		 IOAM_HBYH_ADD) ? "Add" : ((hm->ioam_flag ==
-					    IOAM_HBYH_MOD) ? "Mod" : "Pop"));
-    }
-  else
-    {
-      s = format (s, "              REWRITE FLOW CONFIGS - Not configured\n");
-    }
-
-
-  s = format (s, "                        TRACE OPTION - %d (%s)\n",
-	      hm->has_trace_option,
-	      (hm->has_trace_option ? "Enabled" : "Disabled"));
-  if (hm->has_trace_option)
-    s =
-      format (s,
-	      "Try 'show ioam trace and show ioam-trace profile' for more information\n");
-
-
-  s = format (s, "                        POT OPTION - %d (%s)\n",
-	      hm->has_pot_option,
-	      (hm->has_pot_option ? "Enabled" : "Disabled"));
-  if (hm->has_pot_option)
-    s =
-      format (s,
-	      "Try 'show ioam pot and show pot profile' for more information\n");
-
-  s = format (s, "         EDGE TO EDGE - SeqNo OPTION - %d (%s)\n",
-	      hm->has_seqno_option,
-	      hm->has_seqno_option ? "Enabled" : "Disabled");
-  if (hm->has_seqno_option)
-    s = format (s, "Try 'show ioam e2e' for more information\n");
-
-  s = format (s, "         iOAM Analyse OPTION - %d (%s)\n",
-	      hm->has_analyse_option,
-	      hm->has_analyse_option ? "Enabled" : "Disabled");
-
-  vlib_cli_output (vm, "%v", s);
-  vec_free (s);
-  return 0;
-}
-
-/*?
- * This command displays the current configuration data for In-band
- * OAM (iOAM).
- *
- * @cliexpar
- * Example to show the iOAM configuration:
- * @cliexstart{show ioam summary}
- *               REWRITE FLOW CONFIGS -
- *                Destination Address : ff02::1
- *                     Flow operation : 2 (Pop)
- *                         TRACE OPTION - 1 (Enabled)
- * Try 'show ioam trace and show ioam-trace profile' for more information
- *                         POT OPTION - 1 (Enabled)
- * Try 'show ioam pot and show pot profile' for more information
- *          EDGE TO EDGE - PPC OPTION - 1 (Encap)
- * @cliexend
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ip6_show_ioam_run_cmd, static) = {
-  .path = "show ioam summary",
-  .short_help = "show ioam summary",
-  .function = ip6_show_ioam_summary_cmd_fn,
-};
-/* *INDENT-ON* */
-
-void
-vnet_register_ioam_end_of_path_callback (void *cb)
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-
-  hm->ioam_end_of_path_cb = cb;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip6_hop_by_hop.h b/vnet/vnet/ip/ip6_hop_by_hop.h
deleted file mode 100644
index acfaa37e..00000000
--- a/vnet/vnet/ip/ip6_hop_by_hop.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_ip6_hop_by_hop_ioam_h__
-#define __included_ip6_hop_by_hop_ioam_h__
-
-#include <vnet/ip/ip6_hop_by_hop_packet.h>
-#include <vnet/ip/ip.h>
-
-
-#define MAX_IP6_HBH_OPTION      256
-
-/* To determine whether a node is decap MS bit is set */
-#define IOAM_DECAP_BIT 0x80000000
-
-#define IOAM_DEAP_ENABLED(opaque_data) (opaque_data & IOAM_DECAP_BIT)
-
-#define IOAM_SET_DECAP(opaque_data) \
-    (opaque_data |= IOAM_DECAP_BIT)
-
-#define IOAM_MASK_DECAP_BIT(x) (x & ~IOAM_DECAP_BIT)
-
-/*
- * Stores the run time flow data of hbh options
- */
-typedef struct
-{
-  u32 ctx[MAX_IP6_HBH_OPTION];
-  u8 flow_name[64];
-} flow_data_t;
-
-typedef struct
-{
-  /* The current rewrite we're using */
-  u8 *rewrite;
-
-  /* Trace data processing callback */
-  void *ioam_end_of_path_cb;
-  /* Configuration data */
-  /* Adjacency */
-  ip6_address_t adj;
-#define IOAM_HBYH_ADD  0
-#define IOAM_HBYH_MOD  1
-#define IOAM_HBYH_POP  2
-  u8 ioam_flag;
-  /* time scale transform. Joy. */
-  u32 unix_time_0;
-  f64 vlib_time_0;
-
-
-  /* Trace option */
-  u8 has_trace_option;
-
-  /* Pot option */
-  u8 has_pot_option;
-
-  /* Per Packet Counter option */
-  u8 has_seqno_option;
-
-  /* Enabling analyis of iOAM data on decap node */
-  u8 has_analyse_option;
-
-  /* Array of function pointers to ADD and POP HBH option handling routines */
-  u8 options_size[MAX_IP6_HBH_OPTION];
-  int (*add_options[MAX_IP6_HBH_OPTION]) (u8 * rewrite_string,
-					  u8 * rewrite_size);
-  int (*pop_options[MAX_IP6_HBH_OPTION]) (vlib_buffer_t * b,
-					  ip6_header_t * ip,
-					  ip6_hop_by_hop_option_t * opt);
-  int (*get_sizeof_options[MAX_IP6_HBH_OPTION]) (u32 * rewrite_size);
-  int (*config_handler[MAX_IP6_HBH_OPTION]) (void *data, u8 disable);
-
-  /* Array of function pointers to handle hbh options being used with classifier */
-    u32 (*flow_handler[MAX_IP6_HBH_OPTION]) (u32 flow_ctx, u8 add);
-  flow_data_t *flows;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} ip6_hop_by_hop_ioam_main_t;
-
-extern ip6_hop_by_hop_ioam_main_t ip6_hop_by_hop_ioam_main;
-
-extern u8 *format_path_map (u8 * s, va_list * args);
-
-extern clib_error_t *ip6_ioam_enable (int has_trace_option,
-				      int has_pot_option,
-				      int has_seqno_option,
-				      int has_analyse_option);
-
-extern int ip6_ioam_set_destination (ip6_address_t * addr, u32 mask_width,
-				     u32 vrf_id, int is_add, int is_pop,
-				     int is_none);
-
-extern clib_error_t *clear_ioam_rewrite_fn (void);
-
-static inline u8
-is_zero_ip4_address (ip4_address_t * a)
-{
-  return (a->as_u32 == 0);
-}
-
-static inline void
-copy_ip6_address (ip6_address_t * dst, ip6_address_t * src)
-{
-  dst->as_u64[0] = src->as_u64[0];
-  dst->as_u64[1] = src->as_u64[1];
-}
-
-static inline void
-set_zero_ip6_address (ip6_address_t * a)
-{
-  a->as_u64[0] = 0;
-  a->as_u64[1] = 0;
-}
-
-static inline u8
-cmp_ip6_address (ip6_address_t * a1, ip6_address_t * a2)
-{
-  return ((a1->as_u64[0] == a2->as_u64[0])
-	  && (a1->as_u64[1] == a2->as_u64[1]));
-}
-
-static inline u8
-is_zero_ip6_address (ip6_address_t * a)
-{
-  return ((a->as_u64[0] == 0) && (a->as_u64[1] == 0));
-}
-
-int ip6_hbh_add_register_option (u8 option,
-				 u8 size,
-				 int rewrite_options (u8 * rewrite_string,
-						      u8 * size));
-int ip6_hbh_add_unregister_option (u8 option);
-
-int ip6_hbh_pop_register_option (u8 option,
-				 int options (vlib_buffer_t * b,
-					      ip6_header_t * ip,
-					      ip6_hop_by_hop_option_t * opt));
-int ip6_hbh_pop_unregister_option (u8 option);
-
-int
-ip6_hbh_get_sizeof_register_option (u8 option,
-				    int get_sizeof_hdr_options (u32 *
-								rewrite_size));
-
-int
-ip6_ioam_set_rewrite (u8 ** rwp, int has_trace_option,
-		      int has_pot_option, int has_seq_no);
-
-int
-ip6_hbh_config_handler_register (u8 option,
-				 int config_handler (void *data, u8 disable));
-
-int ip6_hbh_config_handler_unregister (u8 option);
-
-int ip6_hbh_flow_handler_register (u8 option,
-				   u32 ioam_flow_handler (u32 flow_ctx,
-							  u8 add));
-
-int ip6_hbh_flow_handler_unregister (u8 option);
-
-u8 *get_flow_name_from_flow_ctx (u32 flow_ctx);
-
-static inline flow_data_t *
-get_flow (u32 index)
-{
-  flow_data_t *flow = NULL;
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-
-  if (pool_is_free_index (hm->flows, index))
-    return NULL;
-
-  flow = pool_elt_at_index (hm->flows, index);
-  return flow;
-}
-
-static inline u32
-get_flow_data_from_flow_ctx (u32 flow_ctx, u8 option)
-{
-  flow_data_t *flow = NULL;
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-  u32 index;
-
-  index = IOAM_MASK_DECAP_BIT (flow_ctx);
-  //flow = pool_elt_at_index (hm->flows, index);
-  flow = &hm->flows[index];
-  return (flow->ctx[option]);
-}
-
-static inline u8
-is_seqno_enabled (void)
-{
-  return (ip6_hop_by_hop_ioam_main.has_seqno_option);
-}
-
-int ip6_trace_profile_setup ();
-#endif /* __included_ip6_hop_by_hop_ioam_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip6_hop_by_hop_packet.h b/vnet/vnet/ip/ip6_hop_by_hop_packet.h
deleted file mode 100644
index 543ba8b0..00000000
--- a/vnet/vnet/ip/ip6_hop_by_hop_packet.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_ip6_hop_by_hop_packet_h__
-#define __included_ip6_hop_by_hop_packet_h__
-
-typedef struct
-{
-  /* Protocol for next header */
-  u8 protocol;
-  /*
-   * Length of hop_by_hop header in 8 octet units,
-   * not including the first 8 octets
-   */
-  u8 length;
-} ip6_hop_by_hop_header_t;
-
-typedef struct
-{
-  /* Option Type */
-#define HBH_OPTION_TYPE_SKIP_UNKNOWN (0x00)
-#define HBH_OPTION_TYPE_DISCARD_UNKNOWN (0x40)
-#define HBH_OPTION_TYPE_DISCARD_UNKNOWN_ICMP (0x80)
-#define HBH_OPTION_TYPE_DISCARD_UNKNOWN_ICMP_NOT_MCAST (0xc0)
-#define HBH_OPTION_TYPE_HIGH_ORDER_BITS (0xc0)
-#define HBH_OPTION_TYPE_DATA_CHANGE_ENROUTE (1<<5)
-  u8 type;
-  /* Length in octets of the option data field */
-  u8 length;
-} ip6_hop_by_hop_option_t;
-
-/* $$$$ IANA banana constants */
-#define HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST 59	/* Third highest bit set (change en-route) */
-#define HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT 60	/* Third highest bit set (change en-route) */
-#define HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE 29
-
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED(struct {
-  ip6_hop_by_hop_option_t hdr;
-  u8 e2e_type;
-  u8 reserved;
-  u32 e2e_data;
-}) ioam_e2e_option_t;
-/* *INDENT-ON* */
-
-#endif /* __included_ip6_hop_by_hop_packet_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip6_input.c b/vnet/vnet/ip/ip6_input.c
deleted file mode 100644
index bbc2ceba..00000000
--- a/vnet/vnet/ip/ip6_input.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip6_input.c: IP v6 input node
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ppp/ppp.h>
-#include <vnet/hdlc/hdlc.h>
-
-typedef struct
-{
-  u8 packet_data[64];
-} ip6_input_trace_t;
-
-static u8 *
-format_ip6_input_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  ip6_input_trace_t *t = va_arg (*va, ip6_input_trace_t *);
-
-  s = format (s, "%U",
-	      format_ip6_header, t->packet_data, sizeof (t->packet_data));
-
-  return s;
-}
-
-typedef enum
-{
-  IP6_INPUT_NEXT_DROP,
-  IP6_INPUT_NEXT_LOOKUP,
-  IP6_INPUT_NEXT_ICMP_ERROR,
-  IP6_INPUT_N_NEXT,
-} ip6_input_next_t;
-
-/* Validate IP v6 packets and pass them either to forwarding code
-   or drop exception packets. */
-static uword
-ip6_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_main_t *im = &ip6_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-  u32 n_left_from, *from, *to_next;
-  ip6_input_next_t next_index;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip6_input_node.index);
-  vlib_simple_counter_main_t *cm;
-  u32 cpu_index = os_get_cpu_number ();
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-				   /* stride */ 1,
-				   sizeof (ip6_input_trace_t));
-
-  cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
-			 VNET_INTERFACE_COUNTER_IP6);
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  vlib_buffer_t *p0, *p1;
-	  ip6_header_t *ip0, *ip1;
-	  u32 pi0, sw_if_index0, next0 = 0;
-	  u32 pi1, sw_if_index1, next1 = 0;
-	  u8 error0, error1, arc0, arc1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, sizeof (ip0[0]), LOAD);
-	    CLIB_PREFETCH (p3->data, sizeof (ip1[0]), LOAD);
-	  }
-
-	  pi0 = from[0];
-	  pi1 = from[1];
-
-	  to_next[0] = pi0;
-	  to_next[1] = pi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-
-	  ip0 = vlib_buffer_get_current (p0);
-	  ip1 = vlib_buffer_get_current (p1);
-
-	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
-	  sw_if_index1 = vnet_buffer (p1)->sw_if_index[VLIB_RX];
-
-	  arc0 =
-	    ip6_address_is_multicast (&ip0->dst_address) ?
-	    lm->mcast_feature_arc_index : lm->ucast_feature_arc_index;
-	  arc1 =
-	    ip6_address_is_multicast (&ip1->dst_address) ?
-	    lm->mcast_feature_arc_index : lm->ucast_feature_arc_index;
-
-	  vnet_buffer (p0)->ip.adj_index[VLIB_RX] = ~0;
-	  vnet_buffer (p1)->ip.adj_index[VLIB_RX] = ~0;
-
-	  vnet_feature_arc_start (arc0, sw_if_index0, &next0, p0);
-	  vnet_feature_arc_start (arc1, sw_if_index1, &next1, p1);
-
-	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
-	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index1, 1);
-
-	  error0 = error1 = IP6_ERROR_NONE;
-
-	  /* Version != 6?  Drop it. */
-	  error0 =
-	    (clib_net_to_host_u32
-	     (ip0->ip_version_traffic_class_and_flow_label) >> 28) !=
-	    6 ? IP6_ERROR_VERSION : error0;
-	  error1 =
-	    (clib_net_to_host_u32
-	     (ip1->ip_version_traffic_class_and_flow_label) >> 28) !=
-	    6 ? IP6_ERROR_VERSION : error1;
-
-	  /* hop limit < 1? Drop it.  for link-local broadcast packets,
-	   * like dhcpv6 packets from client has hop-limit 1, which should not
-	   * be dropped.
-	   */
-	  error0 = ip0->hop_limit < 1 ? IP6_ERROR_TIME_EXPIRED : error0;
-	  error1 = ip1->hop_limit < 1 ? IP6_ERROR_TIME_EXPIRED : error1;
-
-	  /* L2 length must be at least minimal IP header. */
-	  error0 =
-	    p0->current_length <
-	    sizeof (ip0[0]) ? IP6_ERROR_TOO_SHORT : error0;
-	  error1 =
-	    p1->current_length <
-	    sizeof (ip1[0]) ? IP6_ERROR_TOO_SHORT : error1;
-
-	  if (PREDICT_FALSE (error0 != IP6_ERROR_NONE))
-	    {
-	      if (error0 == IP6_ERROR_TIME_EXPIRED)
-		{
-		  icmp6_error_set_vnet_buffer (p0, ICMP6_time_exceeded,
-					       ICMP6_time_exceeded_ttl_exceeded_in_transit,
-					       0);
-		  next0 = IP6_INPUT_NEXT_ICMP_ERROR;
-		}
-	      else
-		{
-		  next0 = IP6_INPUT_NEXT_DROP;
-		}
-	    }
-	  if (PREDICT_FALSE (error1 != IP6_ERROR_NONE))
-	    {
-	      if (error1 == IP6_ERROR_TIME_EXPIRED)
-		{
-		  icmp6_error_set_vnet_buffer (p1, ICMP6_time_exceeded,
-					       ICMP6_time_exceeded_ttl_exceeded_in_transit,
-					       0);
-		  next1 = IP6_INPUT_NEXT_ICMP_ERROR;
-		}
-	      else
-		{
-		  next1 = IP6_INPUT_NEXT_DROP;
-		}
-	    }
-
-	  p0->error = error_node->errors[error0];
-	  p1->error = error_node->errors[error1];
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, pi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip6_header_t *ip0;
-	  u32 pi0, sw_if_index0, next0 = 0;
-	  u8 error0, arc0;
-
-	  pi0 = from[0];
-	  to_next[0] = pi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip0 = vlib_buffer_get_current (p0);
-
-	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
-	  arc0 =
-	    ip6_address_is_multicast (&ip0->dst_address) ?
-	    lm->mcast_feature_arc_index : lm->ucast_feature_arc_index;
-	  vnet_buffer (p0)->ip.adj_index[VLIB_RX] = ~0;
-	  vnet_feature_arc_start (arc0, sw_if_index0, &next0, p0);
-
-	  vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
-	  error0 = IP6_ERROR_NONE;
-
-	  /* Version != 6?  Drop it. */
-	  error0 =
-	    (clib_net_to_host_u32
-	     (ip0->ip_version_traffic_class_and_flow_label) >> 28) !=
-	    6 ? IP6_ERROR_VERSION : error0;
-
-	  /* hop limit < 1? Drop it. for link-local broadcast packets,
-	   * like dhcpv6 packets from client has hop-limit 1, which should not
-	   * be dropped.
-	   */
-	  error0 = ip0->hop_limit < 1 ? IP6_ERROR_TIME_EXPIRED : error0;
-
-	  /* L2 length must be at least minimal IP header. */
-	  error0 =
-	    p0->current_length <
-	    sizeof (ip0[0]) ? IP6_ERROR_TOO_SHORT : error0;
-
-	  if (PREDICT_FALSE (error0 != IP6_ERROR_NONE))
-	    {
-	      if (error0 == IP6_ERROR_TIME_EXPIRED)
-		{
-		  icmp6_error_set_vnet_buffer (p0, ICMP6_time_exceeded,
-					       ICMP6_time_exceeded_ttl_exceeded_in_transit,
-					       0);
-		  next0 = IP6_INPUT_NEXT_ICMP_ERROR;
-		}
-	      else
-		{
-		  next0 = IP6_INPUT_NEXT_DROP;
-		}
-	    }
-	  p0->error = error_node->errors[error0];
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-static char *ip6_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ip6_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_input_node) = {
-  .function = ip6_input,
-  .name = "ip6-input",
-  .vector_size = sizeof (u32),
-
-  .n_errors = IP6_N_ERROR,
-  .error_strings = ip6_error_strings,
-
-  .n_next_nodes = IP6_INPUT_N_NEXT,
-  .next_nodes = {
-    [IP6_INPUT_NEXT_DROP] = "error-drop",
-    [IP6_INPUT_NEXT_LOOKUP] = "ip6-lookup",
-    [IP6_INPUT_NEXT_ICMP_ERROR] = "ip6-icmp-error",
-  },
-
-  .format_buffer = format_ip6_header,
-  .format_trace = format_ip6_input_trace,
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_input_node, ip6_input)
-     static clib_error_t *ip6_init (vlib_main_t * vm)
-{
-  ethernet_register_input_type (vm, ETHERNET_TYPE_IP6, ip6_input_node.index);
-  ppp_register_input_protocol (vm, PPP_PROTOCOL_ip6, ip6_input_node.index);
-  hdlc_register_input_protocol (vm, HDLC_PROTOCOL_ip6, ip6_input_node.index);
-
-  {
-    pg_node_t *pn;
-    pn = pg_get_node (ip6_input_node.index);
-    pn->unformat_edit = unformat_pg_ip6_header;
-  }
-
-  /* Set flow hash to something non-zero. */
-  ip6_main.flow_hash_seed = 0xdeadbeef;
-
-  /* Default hop limit for packets we generate. */
-  ip6_main.host_config.ttl = 64;
-
-  return /* no error */ 0;
-}
-
-VLIB_INIT_FUNCTION (ip6_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip6_neighbor.c b/vnet/vnet/ip/ip6_neighbor.c
deleted file mode 100644
index 5a1c9e86..00000000
--- a/vnet/vnet/ip/ip6_neighbor.c
+++ /dev/null
@@ -1,4088 +0,0 @@
-/*
- * ip/ip6_neighbor.c: IP6 neighbor handling
- *
- * Copyright (c) 2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/ip/ip.h>
-#include <vnet/ip/ip6_neighbor.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vppinfra/mhash.h>
-#include <vppinfra/md5.h>
-#include <vnet/adj/adj.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/ip6_fib.h>
-
-/**
- * @file
- * @brief IPv6 Neighbor Adjacency and Neighbor Discovery.
- *
- * The files contains the API and CLI code for managing IPv6 neighbor
- * adjacency tables and neighbor discovery logic.
- */
-
-/* can't use sizeof link_layer_address, that's 8 */
-#define ETHER_MAC_ADDR_LEN 6
-
-/* advertised prefix option */
-typedef struct
-{
-  /* basic advertised information */
-  ip6_address_t prefix;
-  u8 prefix_len;
-  int adv_on_link_flag;
-  int adv_autonomous_flag;
-  u32 adv_valid_lifetime_in_secs;
-  u32 adv_pref_lifetime_in_secs;
-
-  /* advertised values are computed from these times if decrementing */
-  f64 valid_lifetime_expires;
-  f64 pref_lifetime_expires;
-
-  /* local information */
-  int enabled;
-  int deprecated_prefix_flag;
-  int decrement_lifetime_flag;
-
-#define MIN_ADV_VALID_LIFETIME 7203	/* seconds */
-#define DEF_ADV_VALID_LIFETIME  2592000
-#define DEF_ADV_PREF_LIFETIME 604800
-
-  /* extensions are added here, mobile, DNS etc.. */
-} ip6_radv_prefix_t;
-
-
-typedef struct
-{
-  /* group information */
-  u8 type;
-  ip6_address_t mcast_address;
-  u16 num_sources;
-  ip6_address_t *mcast_source_address_pool;
-} ip6_mldp_group_t;
-
-/* configured router advertisement information per ipv6 interface */
-typedef struct
-{
-
-  /* advertised config information, zero means unspecified  */
-  u8 curr_hop_limit;
-  int adv_managed_flag;
-  int adv_other_flag;
-  u16 adv_router_lifetime_in_sec;
-  u32 adv_neighbor_reachable_time_in_msec;
-  u32 adv_time_in_msec_between_retransmitted_neighbor_solicitations;
-
-  /* mtu option */
-  u32 adv_link_mtu;
-
-  /* source link layer option */
-  u8 link_layer_address[8];
-  u8 link_layer_addr_len;
-
-  /* prefix option */
-  ip6_radv_prefix_t *adv_prefixes_pool;
-
-  /* Hash table mapping address to index in interface advertised  prefix pool. */
-  mhash_t address_to_prefix_index;
-
-  /* MLDP  group information */
-  ip6_mldp_group_t *mldp_group_pool;
-
-  /* Hash table mapping address to index in mldp address pool. */
-  mhash_t address_to_mldp_index;
-
-  /* local information */
-  u32 sw_if_index;
-  u32 fib_index;
-  int send_radv;		/* radv on/off on this interface -  set by config */
-  int cease_radv;		/* we are ceasing  to send  - set byf config */
-  int send_unicast;
-  int adv_link_layer_address;
-  int prefix_option;
-  int failed_device_check;
-  int all_routers_mcast;
-  u32 seed;
-  u64 randomizer;
-  int ref_count;
-  adj_index_t all_nodes_adj_index;
-  adj_index_t all_routers_adj_index;
-  adj_index_t all_mldv2_routers_adj_index;
-
-  /* timing information */
-#define DEF_MAX_RADV_INTERVAL 200
-#define DEF_MIN_RADV_INTERVAL .75 * DEF_MAX_RADV_INTERVAL
-#define DEF_CURR_HOP_LIMIT  64
-#define DEF_DEF_RTR_LIFETIME   3 * DEF_MAX_RADV_INTERVAL
-#define MAX_DEF_RTR_LIFETIME   9000
-
-#define MAX_INITIAL_RTR_ADVERT_INTERVAL   16	/* seconds */
-#define MAX_INITIAL_RTR_ADVERTISEMENTS        3	/*transmissions */
-#define MIN_DELAY_BETWEEN_RAS                              3	/* seconds */
-#define MAX_DELAY_BETWEEN_RAS                    1800	/* seconds */
-#define MAX_RA_DELAY_TIME                                          .5	/* seconds */
-
-  f64 max_radv_interval;
-  f64 min_radv_interval;
-  f64 min_delay_between_radv;
-  f64 max_delay_between_radv;
-  f64 max_rtr_default_lifetime;
-
-  f64 last_radv_time;
-  f64 last_multicast_time;
-  f64 next_multicast_time;
-
-
-  u32 initial_adverts_count;
-  f64 initial_adverts_interval;
-  u32 initial_adverts_sent;
-
-  /* stats */
-  u32 n_advertisements_sent;
-  u32 n_solicitations_rcvd;
-  u32 n_solicitations_dropped;
-
-  /* Link local address to use (defaults to underlying physical for logical interfaces */
-  ip6_address_t link_local_address;
-  u8 link_local_prefix_len;
-
-} ip6_radv_t;
-
-typedef struct
-{
-  u32 next_index;
-  uword node_index;
-  uword type_opaque;
-  uword data;
-  /* Used for nd event notification only */
-  void *data_callback;
-  u32 pid;
-} pending_resolution_t;
-
-
-typedef struct
-{
-  /* Hash tables mapping name to opcode. */
-  uword *opcode_by_name;
-
-  /* lite beer "glean" adjacency handling */
-  mhash_t pending_resolutions_by_address;
-  pending_resolution_t *pending_resolutions;
-
-  /* Mac address change notification */
-  mhash_t mac_changes_by_address;
-  pending_resolution_t *mac_changes;
-
-  u32 *neighbor_input_next_index_by_hw_if_index;
-
-  ip6_neighbor_t *neighbor_pool;
-
-  mhash_t neighbor_index_by_key;
-
-  u32 *if_radv_pool_index_by_sw_if_index;
-
-  ip6_radv_t *if_radv_pool;
-
-  /* Neighbor attack mitigation */
-  u32 limit_neighbor_cache_size;
-  u32 neighbor_delete_rotor;
-
-} ip6_neighbor_main_t;
-
-static ip6_neighbor_main_t ip6_neighbor_main;
-static ip6_address_t ip6a_zero;	/* ip6 address 0 */
-
-static u8 *
-format_ip6_neighbor_ip6_entry (u8 * s, va_list * va)
-{
-  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
-  ip6_neighbor_t *n = va_arg (*va, ip6_neighbor_t *);
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_sw_interface_t *si;
-  u8 *flags = 0;
-
-  if (!n)
-    return format (s, "%=12s%=20s%=6s%=20s%=40s", "Time", "Address", "Flags",
-		   "Link layer", "Interface");
-
-  if (n->flags & IP6_NEIGHBOR_FLAG_DYNAMIC)
-    flags = format (flags, "D");
-
-  if (n->flags & IP6_NEIGHBOR_FLAG_STATIC)
-    flags = format (flags, "S");
-
-  si = vnet_get_sw_interface (vnm, n->key.sw_if_index);
-  s = format (s, "%=12U%=20U%=6s%=20U%=40U",
-	      format_vlib_cpu_time, vm, n->cpu_time_last_updated,
-	      format_ip6_address, &n->key.ip6_address,
-	      flags ? (char *) flags : "",
-	      format_ethernet_address, n->link_layer_address,
-	      format_vnet_sw_interface_name, vnm, si);
-
-  vec_free (flags);
-  return s;
-}
-
-static clib_error_t *
-ip6_neighbor_sw_interface_up_down (vnet_main_t * vnm,
-				   u32 sw_if_index, u32 flags)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  ip6_neighbor_t *n;
-
-  if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
-    {
-      u32 i, *to_delete = 0;
-
-      /* *INDENT-OFF* */
-      pool_foreach (n, nm->neighbor_pool,
-      ({
-	if (n->key.sw_if_index == sw_if_index)
-	  vec_add1 (to_delete, n - nm->neighbor_pool);
-      }));
-      /* *INDENT-ON* */
-
-      for (i = 0; i < vec_len (to_delete); i++)
-	{
-	  n = pool_elt_at_index (nm->neighbor_pool, to_delete[i]);
-	  mhash_unset (&nm->neighbor_index_by_key, &n->key, 0);
-	  fib_table_entry_delete_index (n->fib_entry_index, FIB_SOURCE_ADJ);
-	  pool_put (nm->neighbor_pool, n);
-	}
-
-      vec_free (to_delete);
-    }
-
-  return 0;
-}
-
-VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (ip6_neighbor_sw_interface_up_down);
-
-static void
-unset_random_neighbor_entry (void)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vnm->vlib_main;
-  ip6_neighbor_t *e;
-  u32 index;
-
-  index = pool_next_index (nm->neighbor_pool, nm->neighbor_delete_rotor);
-  nm->neighbor_delete_rotor = index;
-
-  /* Try again from elt 0, could happen if an intfc goes down */
-  if (index == ~0)
-    {
-      index = pool_next_index (nm->neighbor_pool, nm->neighbor_delete_rotor);
-      nm->neighbor_delete_rotor = index;
-    }
-
-  /* Nothing left in the pool */
-  if (index == ~0)
-    return;
-
-  e = pool_elt_at_index (nm->neighbor_pool, index);
-
-  vnet_unset_ip6_ethernet_neighbor (vm, e->key.sw_if_index,
-				    &e->key.ip6_address,
-				    e->link_layer_address,
-				    ETHER_MAC_ADDR_LEN);
-}
-
-typedef struct
-{
-  u8 is_add;
-  u8 is_static;
-  u8 link_layer_address[6];
-  u32 sw_if_index;
-  ip6_address_t addr;
-} ip6_neighbor_set_unset_rpc_args_t;
-
-static void ip6_neighbor_set_unset_rpc_callback
-  (ip6_neighbor_set_unset_rpc_args_t * a);
-
-static void set_unset_ip6_neighbor_rpc
-  (vlib_main_t * vm,
-   u32 sw_if_index,
-   ip6_address_t * a, u8 * link_layer_addreess, int is_add, int is_static)
-{
-  ip6_neighbor_set_unset_rpc_args_t args;
-  void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
-
-  args.sw_if_index = sw_if_index;
-  args.is_add = is_add;
-  args.is_static = is_static;
-  clib_memcpy (&args.addr, a, sizeof (*a));
-  clib_memcpy (args.link_layer_address, link_layer_addreess, 6);
-
-  vl_api_rpc_call_main_thread (ip6_neighbor_set_unset_rpc_callback,
-			       (u8 *) & args, sizeof (args));
-}
-
-static void
-ip6_nbr_probe (ip_adjacency_t * adj)
-{
-  icmp6_neighbor_solicitation_header_t *h;
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_main_t *im = &ip6_main;
-  ip_interface_address_t *ia;
-  ip6_address_t *dst, *src;
-  vnet_hw_interface_t *hi;
-  vnet_sw_interface_t *si;
-  vlib_buffer_t *b;
-  int bogus_length;
-  vlib_main_t *vm;
-  u32 bi = 0;
-
-  vm = vlib_get_main ();
-
-  si = vnet_get_sw_interface (vnm, adj->rewrite_header.sw_if_index);
-  dst = &adj->sub_type.nbr.next_hop.ip6;
-
-  if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
-    {
-      return;
-    }
-  src = ip6_interface_address_matching_destination (im, dst,
-						    adj->rewrite_header.
-						    sw_if_index, &ia);
-  if (!src)
-    {
-      return;
-    }
-
-  h = vlib_packet_template_get_packet (vm,
-				       &im->discover_neighbor_packet_template,
-				       &bi);
-
-  hi = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index);
-
-  h->ip.dst_address.as_u8[13] = dst->as_u8[13];
-  h->ip.dst_address.as_u8[14] = dst->as_u8[14];
-  h->ip.dst_address.as_u8[15] = dst->as_u8[15];
-  h->ip.src_address = src[0];
-  h->neighbor.target_address = dst[0];
-
-  clib_memcpy (h->link_layer_option.ethernet_address,
-	       hi->hw_address, vec_len (hi->hw_address));
-
-  h->neighbor.icmp.checksum =
-    ip6_tcp_udp_icmp_compute_checksum (vm, 0, &h->ip, &bogus_length);
-  ASSERT (bogus_length == 0);
-
-  b = vlib_get_buffer (vm, bi);
-  vnet_buffer (b)->sw_if_index[VLIB_RX] =
-    vnet_buffer (b)->sw_if_index[VLIB_TX] = adj->rewrite_header.sw_if_index;
-
-  /* Add encapsulation string for software interface (e.g. ethernet header). */
-  vnet_rewrite_one_header (adj[0], h, sizeof (ethernet_header_t));
-  vlib_buffer_advance (b, -adj->rewrite_header.data_bytes);
-
-  {
-    vlib_frame_t *f = vlib_get_frame_to_node (vm, hi->output_node_index);
-    u32 *to_next = vlib_frame_vector_args (f);
-    to_next[0] = bi;
-    f->n_vectors = 1;
-    vlib_put_frame_to_node (vm, hi->output_node_index, f);
-  }
-}
-
-static void
-ip6_nd_mk_complete (adj_index_t ai, ip6_neighbor_t * nbr)
-{
-  adj_nbr_update_rewrite (ai, ADJ_NBR_REWRITE_FLAG_COMPLETE,
-			  ethernet_build_rewrite (vnet_get_main (),
-						  nbr->key.sw_if_index,
-						  adj_get_link_type (ai),
-						  nbr->link_layer_address));
-}
-
-static void
-ip6_nd_mk_incomplete (adj_index_t ai)
-{
-  ip_adjacency_t *adj = adj_get (ai);
-
-  adj_nbr_update_rewrite (ai,
-			  ADJ_NBR_REWRITE_FLAG_INCOMPLETE,
-			  ethernet_build_rewrite (vnet_get_main (),
-						  adj->rewrite_header.
-						  sw_if_index,
-						  adj_get_link_type (ai),
-						  VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST));
-}
-
-#define IP6_NBR_MK_KEY(k, sw_if_index, addr) \
-{					     \
-    k.sw_if_index = sw_if_index;	     \
-    k.ip6_address = *addr;		     \
-    k.pad = 0;				     \
-}
-
-static ip6_neighbor_t *
-ip6_nd_find (u32 sw_if_index, const ip6_address_t * addr)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  ip6_neighbor_t *n = NULL;
-  ip6_neighbor_key_t k;
-  uword *p;
-
-  IP6_NBR_MK_KEY (k, sw_if_index, addr);
-
-  p = mhash_get (&nm->neighbor_index_by_key, &k);
-  if (p)
-    {
-      n = pool_elt_at_index (nm->neighbor_pool, p[0]);
-    }
-
-  return (n);
-}
-
-static adj_walk_rc_t
-ip6_nd_mk_complete_walk (adj_index_t ai, void *ctx)
-{
-  ip6_neighbor_t *nbr = ctx;
-
-  ip6_nd_mk_complete (ai, nbr);
-
-  return (ADJ_WALK_RC_CONTINUE);
-}
-
-static adj_walk_rc_t
-ip6_nd_mk_incomplete_walk (adj_index_t ai, void *ctx)
-{
-  ip6_nd_mk_incomplete (ai);
-
-  return (ADJ_WALK_RC_CONTINUE);
-}
-
-void
-ip6_ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
-{
-  ip6_neighbor_t *nbr;
-  ip_adjacency_t *adj;
-
-  adj = adj_get (ai);
-
-  nbr = ip6_nd_find (sw_if_index, &adj->sub_type.nbr.next_hop.ip6);
-
-  if (NULL != nbr)
-    {
-      adj_nbr_walk_nh6 (sw_if_index, &nbr->key.ip6_address,
-			ip6_nd_mk_complete_walk, nbr);
-    }
-  else
-    {
-      /*
-       * no matching ND entry.
-       * construct the rewrite required to for an ND packet, and stick
-       * that in the adj's pipe to smoke.
-       */
-      adj_nbr_update_rewrite (ai,
-			      ADJ_NBR_REWRITE_FLAG_INCOMPLETE,
-			      ethernet_build_rewrite (vnm,
-						      sw_if_index,
-						      VNET_LINK_IP6,
-						      VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST));
-
-      /*
-       * since the FIB has added this adj for a route, it makes sense it may
-       * want to forward traffic sometime soon. Let's send a speculative ND.
-       * just one. If we were to do periodically that wouldn't be bad either,
-       * but that's more code than i'm prepared to write at this time for
-       * relatively little reward.
-       */
-      ip6_nbr_probe (adj);
-    }
-}
-
-int
-vnet_set_ip6_ethernet_neighbor (vlib_main_t * vm,
-				u32 sw_if_index,
-				ip6_address_t * a,
-				u8 * link_layer_address,
-				uword n_bytes_link_layer_address,
-				int is_static)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  ip6_neighbor_key_t k;
-  ip6_neighbor_t *n = 0;
-  int make_new_nd_cache_entry = 1;
-  uword *p;
-  u32 next_index;
-  pending_resolution_t *pr, *mc;
-
-  if (os_get_cpu_number ())
-    {
-      set_unset_ip6_neighbor_rpc (vm, sw_if_index, a, link_layer_address,
-				  1 /* set new neighbor */ , is_static);
-      return 0;
-    }
-
-  k.sw_if_index = sw_if_index;
-  k.ip6_address = a[0];
-  k.pad = 0;
-
-  p = mhash_get (&nm->neighbor_index_by_key, &k);
-  if (p)
-    {
-      n = pool_elt_at_index (nm->neighbor_pool, p[0]);
-      /* Refuse to over-write static neighbor entry. */
-      if (!is_static && (n->flags & IP6_NEIGHBOR_FLAG_STATIC))
-	return -2;
-      make_new_nd_cache_entry = 0;
-    }
-
-  if (make_new_nd_cache_entry)
-    {
-      fib_prefix_t pfx = {
-	.fp_len = 128,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr = {
-		    .ip6 = k.ip6_address,
-		    }
-	,
-      };
-      u32 fib_index;
-
-      pool_get (nm->neighbor_pool, n);
-      mhash_set (&nm->neighbor_index_by_key, &k, n - nm->neighbor_pool,
-		 /* old value */ 0);
-      n->key = k;
-
-      clib_memcpy (n->link_layer_address,
-		   link_layer_address, n_bytes_link_layer_address);
-
-      /*
-       * create the adj-fib. the entry in the FIB table for and to the peer.
-       */
-      fib_index = ip6_main.fib_index_by_sw_if_index[n->key.sw_if_index];
-      n->fib_entry_index = fib_table_entry_update_one_path (fib_index, &pfx, FIB_SOURCE_ADJ, FIB_ENTRY_FLAG_NONE, FIB_PROTOCOL_IP6, &pfx.fp_addr, n->key.sw_if_index, ~0, 1, NULL,	// no label stack
-							    FIB_ROUTE_PATH_FLAG_NONE);
-    }
-  else
-    {
-      /*
-       * prevent a DoS attack from the data-plane that
-       * spams us with no-op updates to the MAC address
-       */
-      if (0 == memcmp (n->link_layer_address,
-		       link_layer_address, n_bytes_link_layer_address))
-	return -1;
-
-      clib_memcpy (n->link_layer_address,
-		   link_layer_address, n_bytes_link_layer_address);
-    }
-
-  /* Update time stamp and flags. */
-  n->cpu_time_last_updated = clib_cpu_time_now ();
-  if (is_static)
-    n->flags |= IP6_NEIGHBOR_FLAG_STATIC;
-  else
-    n->flags |= IP6_NEIGHBOR_FLAG_DYNAMIC;
-
-  adj_nbr_walk_nh6 (sw_if_index,
-		    &n->key.ip6_address, ip6_nd_mk_complete_walk, n);
-
-  /* Customer(s) waiting for this address to be resolved? */
-  p = mhash_get (&nm->pending_resolutions_by_address, a);
-  if (p)
-    {
-      next_index = p[0];
-
-      while (next_index != (u32) ~ 0)
-	{
-	  pr = pool_elt_at_index (nm->pending_resolutions, next_index);
-	  vlib_process_signal_event (vm, pr->node_index,
-				     pr->type_opaque, pr->data);
-	  next_index = pr->next_index;
-	  pool_put (nm->pending_resolutions, pr);
-	}
-
-      mhash_unset (&nm->pending_resolutions_by_address, a, 0);
-    }
-
-  /* Customer(s) requesting ND event for this address? */
-  p = mhash_get (&nm->mac_changes_by_address, a);
-  if (p)
-    {
-      next_index = p[0];
-
-      while (next_index != (u32) ~ 0)
-	{
-	  int (*fp) (u32, u8 *, u32, ip6_address_t *);
-	  int rv = 1;
-	  mc = pool_elt_at_index (nm->mac_changes, next_index);
-	  fp = mc->data_callback;
-
-	  /* Call the user's data callback, return 1 to suppress dup events */
-	  if (fp)
-	    rv =
-	      (*fp) (mc->data, link_layer_address, sw_if_index, &ip6a_zero);
-	  /*
-	   * Signal the resolver process, as long as the user
-	   * says they want to be notified
-	   */
-	  if (rv == 0)
-	    vlib_process_signal_event (vm, mc->node_index,
-				       mc->type_opaque, mc->data);
-	  next_index = mc->next_index;
-	}
-    }
-
-  return 0;
-}
-
-int
-vnet_unset_ip6_ethernet_neighbor (vlib_main_t * vm,
-				  u32 sw_if_index,
-				  ip6_address_t * a,
-				  u8 * link_layer_address,
-				  uword n_bytes_link_layer_address)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  ip6_neighbor_key_t k;
-  ip6_neighbor_t *n;
-  uword *p;
-  int rv = 0;
-
-  if (os_get_cpu_number ())
-    {
-      set_unset_ip6_neighbor_rpc (vm, sw_if_index, a, link_layer_address,
-				  0 /* unset */ , 0);
-      return 0;
-    }
-
-  k.sw_if_index = sw_if_index;
-  k.ip6_address = a[0];
-  k.pad = 0;
-
-  p = mhash_get (&nm->neighbor_index_by_key, &k);
-  if (p == 0)
-    {
-      rv = -1;
-      goto out;
-    }
-
-  n = pool_elt_at_index (nm->neighbor_pool, p[0]);
-  mhash_unset (&nm->neighbor_index_by_key, &n->key, 0);
-
-  adj_nbr_walk_nh6 (sw_if_index,
-		    &n->key.ip6_address, ip6_nd_mk_incomplete_walk, NULL);
-
-  fib_table_entry_delete_index (n->fib_entry_index, FIB_SOURCE_ADJ);
-  pool_put (nm->neighbor_pool, n);
-
-out:
-  return rv;
-}
-
-static void ip6_neighbor_set_unset_rpc_callback
-  (ip6_neighbor_set_unset_rpc_args_t * a)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  if (a->is_add)
-    vnet_set_ip6_ethernet_neighbor (vm, a->sw_if_index, &a->addr,
-				    a->link_layer_address, 6, a->is_static);
-  else
-    vnet_unset_ip6_ethernet_neighbor (vm, a->sw_if_index, &a->addr,
-				      a->link_layer_address, 6);
-}
-
-static int
-ip6_neighbor_sort (void *a1, void *a2)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_neighbor_t *n1 = a1, *n2 = a2;
-  int cmp;
-  cmp = vnet_sw_interface_compare (vnm, n1->key.sw_if_index,
-				   n2->key.sw_if_index);
-  if (!cmp)
-    cmp = ip6_address_compare (&n1->key.ip6_address, &n2->key.ip6_address);
-  return cmp;
-}
-
-ip6_neighbor_t *
-ip6_neighbors_entries (u32 sw_if_index)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  ip6_neighbor_t *n, *ns = 0;
-
-  /* *INDENT-OFF* */
-  pool_foreach (n, nm->neighbor_pool,
-  ({
-    if (sw_if_index != ~0 && n->key.sw_if_index != sw_if_index)
-      continue;
-    vec_add1 (ns, n[0]);
-  }));
-  /* *INDENT-ON* */
-
-  if (ns)
-    vec_sort_with_function (ns, ip6_neighbor_sort);
-  return ns;
-}
-
-static clib_error_t *
-show_ip6_neighbors (vlib_main_t * vm,
-		    unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_neighbor_t *n, *ns;
-  clib_error_t *error = 0;
-  u32 sw_if_index;
-
-  /* Filter entries by interface if given. */
-  sw_if_index = ~0;
-  (void) unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index);
-
-  ns = ip6_neighbors_entries (sw_if_index);
-  if (ns)
-    {
-      vlib_cli_output (vm, "%U", format_ip6_neighbor_ip6_entry, vm, 0);
-      vec_foreach (n, ns)
-      {
-	vlib_cli_output (vm, "%U", format_ip6_neighbor_ip6_entry, vm, n);
-      }
-      vec_free (ns);
-    }
-
-  return error;
-}
-
-/*?
- * This command is used to display the adjacent IPv6 hosts found via
- * neighbor discovery. Optionally, limit the output to the specified
- * interface.
- *
- * @cliexpar
- * Example of how to display the IPv6 neighbor adjacency table:
- * @cliexstart{show ip6 neighbors}
- *     Time           Address       Flags     Link layer                     Interface
- *      34.0910     ::a:1:1:0:7            02:fe:6a:07:39:6f                GigabitEthernet2/0/0
- *     173.2916     ::b:5:1:c:2            02:fe:50:62:3a:94                GigabitEthernet2/0/0
- *     886.6654     ::1:1:c:0:9       S    02:fe:e4:45:27:5b                GigabitEthernet3/0/0
- * @cliexend
- * Example of how to display the IPv6 neighbor adjacency table for given interface:
- * @cliexstart{show ip6 neighbors GigabitEthernet2/0/0}
- *     Time           Address       Flags     Link layer                     Interface
- *      34.0910     ::a:1:1:0:7            02:fe:6a:07:39:6f                GigabitEthernet2/0/0
- *     173.2916     ::b:5:1:c:2            02:fe:50:62:3a:94                GigabitEthernet2/0/0
- * @cliexend
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_ip6_neighbors_command, static) = {
-  .path = "show ip6 neighbors",
-  .function = show_ip6_neighbors,
-  .short_help = "show ip6 neighbors [<interface>]",
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_ip6_neighbor (vlib_main_t * vm,
-		  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_address_t addr;
-  u8 mac_address[6];
-  int addr_valid = 0;
-  int is_del = 0;
-  int is_static = 0;
-  u32 sw_if_index;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      /* intfc, ip6-address, mac-address */
-      if (unformat (input, "%U %U %U",
-		    unformat_vnet_sw_interface, vnm, &sw_if_index,
-		    unformat_ip6_address, &addr,
-		    unformat_ethernet_address, mac_address))
-	addr_valid = 1;
-
-      else if (unformat (input, "delete") || unformat (input, "del"))
-	is_del = 1;
-      else if (unformat (input, "static"))
-	is_static = 1;
-      else
-	break;
-    }
-
-  if (!addr_valid)
-    return clib_error_return (0, "Missing interface, ip6 or hw address");
-
-  if (!is_del)
-    vnet_set_ip6_ethernet_neighbor (vm, sw_if_index, &addr,
-				    mac_address, sizeof (mac_address),
-				    is_static);
-  else
-    vnet_unset_ip6_ethernet_neighbor (vm, sw_if_index, &addr,
-				      mac_address, sizeof (mac_address));
-  return 0;
-}
-
-/*?
- * This command is used to manually add an entry to the IPv6 neighbor
- * adjacency table. Optionally, the entry can be added as static. It is
- * also used to remove an entry from the table. Use the '<em>show ip6
- * neighbors</em>' command to display all learned and manually entered entries.
- *
- * @cliexpar
- * Example of how to add a static entry to the IPv6 neighbor adjacency table:
- * @cliexcmd{set ip6 neighbor GigabitEthernet2/0/0 ::1:1:c:0:9 02:fe:e4:45:27:5b static}
- * Example of how to delete an entry from the IPv6 neighbor adjacency table:
- * @cliexcmd{set ip6 neighbor del GigabitEthernet2/0/0 ::1:1:c:0:9 02:fe:e4:45:27:5b}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_ip6_neighbor_command, static) =
-{
-  .path = "set ip6 neighbor",
-  .function = set_ip6_neighbor,
-  .short_help = "set ip6 neighbor [del] <interface> <ip6-address> <mac-address> [static]",
-};
-/* *INDENT-ON* */
-
-typedef enum
-{
-  ICMP6_NEIGHBOR_SOLICITATION_NEXT_DROP,
-  ICMP6_NEIGHBOR_SOLICITATION_NEXT_REPLY,
-  ICMP6_NEIGHBOR_SOLICITATION_N_NEXT,
-} icmp6_neighbor_solicitation_or_advertisement_next_t;
-
-static_always_inline uword
-icmp6_neighbor_solicitation_or_advertisement (vlib_main_t * vm,
-					      vlib_node_runtime_t * node,
-					      vlib_frame_t * frame,
-					      uword is_solicitation)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_main_t *im = &ip6_main;
-  uword n_packets = frame->n_vectors;
-  u32 *from, *to_next;
-  u32 n_left_from, n_left_to_next, next_index, n_advertisements_sent;
-  icmp6_neighbor_discovery_option_type_t option_type;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip6_icmp_input_node.index);
-  int bogus_length;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = n_packets;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-				   /* stride */ 1,
-				   sizeof (icmp6_input_trace_t));
-
-  option_type =
-    (is_solicitation
-     ? ICMP6_NEIGHBOR_DISCOVERY_OPTION_source_link_layer_address
-     : ICMP6_NEIGHBOR_DISCOVERY_OPTION_target_link_layer_address);
-  n_advertisements_sent = 0;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip6_header_t *ip0;
-	  icmp6_neighbor_solicitation_or_advertisement_header_t *h0;
-	  icmp6_neighbor_discovery_ethernet_link_layer_address_option_t *o0;
-	  u32 bi0, options_len0, sw_if_index0, next0, error0;
-	  u32 ip6_sadd_link_local, ip6_sadd_unspecified;
-	  int is_rewrite0;
-	  u32 ni0;
-
-	  bi0 = to_next[0] = from[0];
-
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, bi0);
-	  ip0 = vlib_buffer_get_current (p0);
-	  h0 = ip6_next_header (ip0);
-	  options_len0 =
-	    clib_net_to_host_u16 (ip0->payload_length) - sizeof (h0[0]);
-
-	  error0 = ICMP6_ERROR_NONE;
-	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
-	  ip6_sadd_link_local =
-	    ip6_address_is_link_local_unicast (&ip0->src_address);
-	  ip6_sadd_unspecified =
-	    ip6_address_is_unspecified (&ip0->src_address);
-
-	  /* Check that source address is unspecified, link-local or else on-link. */
-	  if (!ip6_sadd_unspecified && !ip6_sadd_link_local)
-	    {
-	      u32 src_adj_index0 = ip6_src_lookup_for_packet (im, p0, ip0);
-
-	      if (ADJ_INDEX_INVALID != src_adj_index0)
-		{
-		  ip_adjacency_t *adj0 =
-		    ip_get_adjacency (&im->lookup_main, src_adj_index0);
-
-		  /* Allow all realistic-looking rewrite adjacencies to pass */
-		  ni0 = adj0->lookup_next_index;
-		  is_rewrite0 = (ni0 >= IP_LOOKUP_NEXT_ARP) &&
-		    (ni0 < IP6_LOOKUP_N_NEXT);
-
-		  error0 = ((adj0->rewrite_header.sw_if_index != sw_if_index0
-			     || !is_rewrite0)
-			    ?
-			    ICMP6_ERROR_NEIGHBOR_SOLICITATION_SOURCE_NOT_ON_LINK
-			    : error0);
-		}
-	      else
-		{
-		  error0 =
-		    ICMP6_ERROR_NEIGHBOR_SOLICITATION_SOURCE_NOT_ON_LINK;
-		}
-	    }
-
-	  o0 = (void *) (h0 + 1);
-	  o0 = ((options_len0 == 8 && o0->header.type == option_type
-		 && o0->header.n_data_u64s == 1) ? o0 : 0);
-
-	  /* If src address unspecified or link local, donot learn neighbor MAC */
-	  if (PREDICT_TRUE (error0 == ICMP6_ERROR_NONE && o0 != 0 &&
-			    !ip6_sadd_unspecified && !ip6_sadd_link_local))
-	    {
-	      ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-	      if (nm->limit_neighbor_cache_size &&
-		  pool_elts (nm->neighbor_pool) >=
-		  nm->limit_neighbor_cache_size)
-		unset_random_neighbor_entry ();
-	      vnet_set_ip6_ethernet_neighbor (vm, sw_if_index0,
-					      is_solicitation ?
-					      &ip0->src_address :
-					      &h0->target_address,
-					      o0->ethernet_address,
-					      sizeof (o0->ethernet_address),
-					      0);
-	    }
-
-	  if (is_solicitation && error0 == ICMP6_ERROR_NONE)
-	    {
-	      /* Check that target address is local to this router. */
-	      fib_node_index_t fei;
-	      u32 fib_index;
-
-	      fib_index =
-		ip6_fib_table_get_index_for_sw_if_index (sw_if_index0);
-
-	      if (~0 == fib_index)
-		{
-		  error0 = ICMP6_ERROR_NEIGHBOR_SOLICITATION_SOURCE_UNKNOWN;
-		}
-	      else
-		{
-		  fei = ip6_fib_table_lookup_exact_match (fib_index,
-							  &h0->target_address,
-							  128);
-
-		  if (FIB_NODE_INDEX_INVALID == fei ||
-		      !(FIB_ENTRY_FLAG_LOCAL &
-			fib_entry_get_flags_for_source (fei,
-							FIB_SOURCE_INTERFACE)))
-		    {
-		      error0 =
-			ICMP6_ERROR_NEIGHBOR_SOLICITATION_SOURCE_UNKNOWN;
-		    }
-		}
-	    }
-
-	  if (is_solicitation)
-	    next0 = (error0 != ICMP6_ERROR_NONE
-		     ? ICMP6_NEIGHBOR_SOLICITATION_NEXT_DROP
-		     : ICMP6_NEIGHBOR_SOLICITATION_NEXT_REPLY);
-	  else
-	    {
-	      next0 = 0;
-	      error0 = error0 == ICMP6_ERROR_NONE ?
-		ICMP6_ERROR_NEIGHBOR_ADVERTISEMENTS_RX : error0;
-	    }
-
-	  if (is_solicitation && error0 == ICMP6_ERROR_NONE)
-	    {
-	      vnet_sw_interface_t *sw_if0;
-	      ethernet_interface_t *eth_if0;
-	      ethernet_header_t *eth0;
-
-	      /* dst address is either source address or the all-nodes mcast addr */
-	      if (!ip6_sadd_unspecified)
-		ip0->dst_address = ip0->src_address;
-	      else
-		ip6_set_reserved_multicast_address (&ip0->dst_address,
-						    IP6_MULTICAST_SCOPE_link_local,
-						    IP6_MULTICAST_GROUP_ID_all_hosts);
-
-	      ip0->src_address = h0->target_address;
-	      ip0->hop_limit = 255;
-	      h0->icmp.type = ICMP6_neighbor_advertisement;
-
-	      sw_if0 = vnet_get_sup_sw_interface (vnm, sw_if_index0);
-	      ASSERT (sw_if0->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
-	      eth_if0 =
-		ethernet_get_interface (&ethernet_main, sw_if0->hw_if_index);
-	      if (eth_if0 && o0)
-		{
-		  clib_memcpy (o0->ethernet_address, eth_if0->address, 6);
-		  o0->header.type =
-		    ICMP6_NEIGHBOR_DISCOVERY_OPTION_target_link_layer_address;
-		}
-
-	      h0->advertisement_flags = clib_host_to_net_u32
-		(ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_SOLICITED
-		 | ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_OVERRIDE);
-
-	      h0->icmp.checksum = 0;
-	      h0->icmp.checksum =
-		ip6_tcp_udp_icmp_compute_checksum (vm, p0, ip0,
-						   &bogus_length);
-	      ASSERT (bogus_length == 0);
-
-	      /* Reuse current MAC header, copy SMAC to DMAC and
-	       * interface MAC to SMAC */
-	      vlib_buffer_advance (p0, -ethernet_buffer_header_size (p0));
-	      eth0 = vlib_buffer_get_current (p0);
-	      clib_memcpy (eth0->dst_address, eth0->src_address, 6);
-	      if (eth_if0)
-		clib_memcpy (eth0->src_address, eth_if0->address, 6);
-
-	      /* Setup input and output sw_if_index for packet */
-	      ASSERT (vnet_buffer (p0)->sw_if_index[VLIB_RX] == sw_if_index0);
-	      vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0;
-	      vnet_buffer (p0)->sw_if_index[VLIB_RX] =
-		vnet_main.local_interface_sw_if_index;
-
-	      n_advertisements_sent++;
-	    }
-
-	  p0->error = error_node->errors[error0];
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  /* Account for advertisements sent. */
-  vlib_error_count (vm, error_node->node_index,
-		    ICMP6_ERROR_NEIGHBOR_ADVERTISEMENTS_TX,
-		    n_advertisements_sent);
-
-  return frame->n_vectors;
-}
-
-/* for "syslogging" - use elog for now */
-#define foreach_log_level	     \
-  _ (DEBUG, "DEBUG")                         \
-  _ (INFO, "INFORMATION")	     \
-  _ (NOTICE, "NOTICE")		     \
-  _ (WARNING, "WARNING")	     \
-  _ (ERR, "ERROR")				      \
-  _ (CRIT, "CRITICAL")			      \
-  _ (ALERT, "ALERT")			      \
-  _ (EMERG,  "EMERGENCY")
-
-typedef enum
-{
-#define _(f,s) LOG_##f,
-  foreach_log_level
-#undef _
-} log_level_t;
-
-static char *log_level_strings[] = {
-#define _(f,s) s,
-  foreach_log_level
-#undef _
-};
-
-static int logmask = 1 << LOG_DEBUG;
-
-static void
-ip6_neighbor_syslog (vlib_main_t * vm, int priority, char *fmt, ...)
-{
-  /* just use elog for now */
-  u8 *what;
-  va_list va;
-
-  if ((priority > LOG_EMERG) || !(logmask & (1 << priority)))
-    return;
-
-  va_start (va, fmt);
-  if (fmt)
-    {
-      what = va_format (0, fmt, &va);
-
-      ELOG_TYPE_DECLARE (e) =
-      {
-      .format = "ip6 nd:  (%s): %s",.format_args = "T4T4",};
-      struct
-      {
-	u32 s[2];
-      } *ed;
-      ed = ELOG_DATA (&vm->elog_main, e);
-      ed->s[0] = elog_string (&vm->elog_main, log_level_strings[priority]);
-      ed->s[1] = elog_string (&vm->elog_main, (char *) what);
-    }
-  va_end (va);
-  return;
-}
-
-/* ipv6 neighbor discovery - router advertisements */
-typedef enum
-{
-  ICMP6_ROUTER_SOLICITATION_NEXT_DROP,
-  ICMP6_ROUTER_SOLICITATION_NEXT_REPLY_RW,
-  ICMP6_ROUTER_SOLICITATION_NEXT_REPLY_TX,
-  ICMP6_ROUTER_SOLICITATION_N_NEXT,
-} icmp6_router_solicitation_or_advertisement_next_t;
-
-static_always_inline uword
-icmp6_router_solicitation (vlib_main_t * vm,
-			   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_main_t *im = &ip6_main;
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  uword n_packets = frame->n_vectors;
-  u32 *from, *to_next;
-  u32 n_left_from, n_left_to_next, next_index;
-  u32 n_advertisements_sent = 0;
-  int bogus_length;
-
-  icmp6_neighbor_discovery_option_type_t option_type;
-
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip6_icmp_input_node.index);
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = n_packets;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-				   /* stride */ 1,
-				   sizeof (icmp6_input_trace_t));
-
-  /* source may append his LL address */
-  option_type = ICMP6_NEIGHBOR_DISCOVERY_OPTION_source_link_layer_address;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip6_header_t *ip0;
-	  ip6_radv_t *radv_info = 0;
-
-	  icmp6_neighbor_discovery_header_t *h0;
-	  icmp6_neighbor_discovery_ethernet_link_layer_address_option_t *o0;
-
-	  u32 bi0, options_len0, sw_if_index0, next0, error0;
-	  u32 is_solicitation = 1, is_dropped = 0;
-	  u32 is_unspecified, is_link_local;
-
-	  bi0 = to_next[0] = from[0];
-
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, bi0);
-	  ip0 = vlib_buffer_get_current (p0);
-	  h0 = ip6_next_header (ip0);
-	  options_len0 =
-	    clib_net_to_host_u16 (ip0->payload_length) - sizeof (h0[0]);
-	  is_unspecified = ip6_address_is_unspecified (&ip0->src_address);
-	  is_link_local =
-	    ip6_address_is_link_local_unicast (&ip0->src_address);
-
-	  error0 = ICMP6_ERROR_NONE;
-	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
-
-	  /* check if solicitation  (not from nd_timer node) */
-	  if (ip6_address_is_unspecified (&ip0->dst_address))
-	    is_solicitation = 0;
-
-	  /* Check that source address is unspecified, link-local or else on-link. */
-	  if (!is_unspecified && !is_link_local)
-	    {
-	      u32 src_adj_index0 = ip6_src_lookup_for_packet (im, p0, ip0);
-
-	      if (ADJ_INDEX_INVALID != src_adj_index0)
-		{
-		  ip_adjacency_t *adj0 = ip_get_adjacency (&im->lookup_main,
-							   src_adj_index0);
-
-		  error0 = (adj0->rewrite_header.sw_if_index != sw_if_index0
-			    ?
-			    ICMP6_ERROR_ROUTER_SOLICITATION_SOURCE_NOT_ON_LINK
-			    : error0);
-		}
-	      else
-		{
-		  error0 = ICMP6_ERROR_ROUTER_SOLICITATION_SOURCE_NOT_ON_LINK;
-		}
-	    }
-
-	  /* check for source LL option and process */
-	  o0 = (void *) (h0 + 1);
-	  o0 = ((options_len0 == 8
-		 && o0->header.type == option_type
-		 && o0->header.n_data_u64s == 1) ? o0 : 0);
-
-	  /* if src address unspecified IGNORE any options */
-	  if (PREDICT_TRUE (error0 == ICMP6_ERROR_NONE && o0 != 0 &&
-			    !is_unspecified && !is_link_local))
-	    {
-	      ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-	      if (nm->limit_neighbor_cache_size &&
-		  pool_elts (nm->neighbor_pool) >=
-		  nm->limit_neighbor_cache_size)
-		unset_random_neighbor_entry ();
-
-	      vnet_set_ip6_ethernet_neighbor (vm, sw_if_index0,
-					      &ip0->src_address,
-					      o0->ethernet_address,
-					      sizeof (o0->ethernet_address),
-					      0);
-	    }
-
-	  /* default is to drop */
-	  next0 = ICMP6_ROUTER_SOLICITATION_NEXT_DROP;
-
-	  if (error0 == ICMP6_ERROR_NONE)
-	    {
-	      vnet_sw_interface_t *sw_if0;
-	      ethernet_interface_t *eth_if0;
-	      u32 adj_index0;
-
-	      sw_if0 = vnet_get_sup_sw_interface (vnm, sw_if_index0);
-	      ASSERT (sw_if0->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
-	      eth_if0 =
-		ethernet_get_interface (&ethernet_main, sw_if0->hw_if_index);
-
-	      /* only support ethernet interface type for now */
-	      error0 =
-		(!eth_if0) ? ICMP6_ERROR_ROUTER_SOLICITATION_UNSUPPORTED_INTF
-		: error0;
-
-	      if (error0 == ICMP6_ERROR_NONE)
-		{
-		  u32 ri;
-
-		  /* adjust the sizeof the buffer to just include the ipv6 header */
-		  p0->current_length -=
-		    (options_len0 +
-		     sizeof (icmp6_neighbor_discovery_header_t));
-
-		  /* look up the radv_t information for this interface */
-		  vec_validate_init_empty
-		    (nm->if_radv_pool_index_by_sw_if_index, sw_if_index0, ~0);
-
-		  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index0];
-
-		  if (ri != ~0)
-		    radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
-
-		  error0 =
-		    ((!radv_info) ?
-		     ICMP6_ERROR_ROUTER_SOLICITATION_RADV_NOT_CONFIG :
-		     error0);
-
-		  if (error0 == ICMP6_ERROR_NONE)
-		    {
-		      f64 now = vlib_time_now (vm);
-
-		      /* for solicited adverts - need to rate limit */
-		      if (is_solicitation)
-			{
-			  if ((now - radv_info->last_radv_time) <
-			      MIN_DELAY_BETWEEN_RAS)
-			    is_dropped = 1;
-			  else
-			    radv_info->last_radv_time = now;
-			}
-
-		      /* send now  */
-		      icmp6_router_advertisement_header_t rh;
-
-		      rh.icmp.type = ICMP6_router_advertisement;
-		      rh.icmp.code = 0;
-		      rh.icmp.checksum = 0;
-
-		      rh.current_hop_limit = radv_info->curr_hop_limit;
-		      rh.router_lifetime_in_sec =
-			clib_host_to_net_u16
-			(radv_info->adv_router_lifetime_in_sec);
-		      rh.
-			time_in_msec_between_retransmitted_neighbor_solicitations
-			=
-			clib_host_to_net_u32 (radv_info->
-					      adv_time_in_msec_between_retransmitted_neighbor_solicitations);
-		      rh.neighbor_reachable_time_in_msec =
-			clib_host_to_net_u32 (radv_info->
-					      adv_neighbor_reachable_time_in_msec);
-
-		      rh.flags =
-			(radv_info->adv_managed_flag) ?
-			ICMP6_ROUTER_DISCOVERY_FLAG_ADDRESS_CONFIG_VIA_DHCP :
-			0;
-		      rh.flags |=
-			((radv_info->adv_other_flag) ?
-			 ICMP6_ROUTER_DISCOVERY_FLAG_OTHER_CONFIG_VIA_DHCP :
-			 0);
-
-
-		      u16 payload_length =
-			sizeof (icmp6_router_advertisement_header_t);
-
-		      vlib_buffer_add_data (vm,
-					    p0->free_list_index,
-					    bi0,
-					    (void *) &rh,
-					    sizeof
-					    (icmp6_router_advertisement_header_t));
-
-		      if (radv_info->adv_link_layer_address)
-			{
-			  icmp6_neighbor_discovery_ethernet_link_layer_address_option_t
-			    h;
-
-			  h.header.type =
-			    ICMP6_NEIGHBOR_DISCOVERY_OPTION_source_link_layer_address;
-			  h.header.n_data_u64s = 1;
-
-			  /* copy ll address */
-			  clib_memcpy (&h.ethernet_address[0],
-				       eth_if0->address, 6);
-
-			  vlib_buffer_add_data (vm,
-						p0->free_list_index,
-						bi0,
-						(void *) &h,
-						sizeof
-						(icmp6_neighbor_discovery_ethernet_link_layer_address_option_t));
-
-			  payload_length +=
-			    sizeof
-			    (icmp6_neighbor_discovery_ethernet_link_layer_address_option_t);
-			}
-
-		      /* add MTU option */
-		      if (radv_info->adv_link_mtu)
-			{
-			  icmp6_neighbor_discovery_mtu_option_t h;
-
-			  h.unused = 0;
-			  h.mtu =
-			    clib_host_to_net_u32 (radv_info->adv_link_mtu);
-			  h.header.type = ICMP6_NEIGHBOR_DISCOVERY_OPTION_mtu;
-			  h.header.n_data_u64s = 1;
-
-			  payload_length +=
-			    sizeof (icmp6_neighbor_discovery_mtu_option_t);
-
-			  vlib_buffer_add_data (vm,
-						p0->free_list_index,
-						bi0,
-						(void *) &h,
-						sizeof
-						(icmp6_neighbor_discovery_mtu_option_t));
-			}
-
-		      /* add advertised prefix options  */
-		      ip6_radv_prefix_t *pr_info;
-
-		      /* *INDENT-OFF* */
-		      pool_foreach (pr_info, radv_info->adv_prefixes_pool,
-                      ({
-                        if(pr_info->enabled &&
-                           (!pr_info->decrement_lifetime_flag
-                            || (pr_info->pref_lifetime_expires >0)))
-                          {
-                            /* advertise this prefix */
-                            icmp6_neighbor_discovery_prefix_information_option_t h;
-
-                            h.header.type = ICMP6_NEIGHBOR_DISCOVERY_OPTION_prefix_information;
-                            h.header.n_data_u64s  =  (sizeof(icmp6_neighbor_discovery_prefix_information_option_t) >> 3);
-
-                            h.dst_address_length  = pr_info->prefix_len;
-
-                            h.flags  = (pr_info->adv_on_link_flag) ? ICMP6_NEIGHBOR_DISCOVERY_PREFIX_INFORMATION_FLAG_ON_LINK : 0;
-                            h.flags |= (pr_info->adv_autonomous_flag) ?  ICMP6_NEIGHBOR_DISCOVERY_PREFIX_INFORMATION_AUTO :  0;
-
-                            if(radv_info->cease_radv && pr_info->deprecated_prefix_flag)
-                              {
-                                h.valid_time = clib_host_to_net_u32(MIN_ADV_VALID_LIFETIME);
-                                h.preferred_time  = 0;
-                              }
-                            else
-                              {
-                                if(pr_info->decrement_lifetime_flag)
-                                  {
-                                    pr_info->adv_valid_lifetime_in_secs = ((pr_info->valid_lifetime_expires  > now)) ?
-                                      (pr_info->valid_lifetime_expires  - now) : 0;
-
-                                    pr_info->adv_pref_lifetime_in_secs = ((pr_info->pref_lifetime_expires  > now)) ?
-                                      (pr_info->pref_lifetime_expires  - now) : 0;
-                                  }
-
-                                h.valid_time = clib_host_to_net_u32(pr_info->adv_valid_lifetime_in_secs);
-                                h.preferred_time  = clib_host_to_net_u32(pr_info->adv_pref_lifetime_in_secs) ;
-                              }
-                            h.unused  = 0;
-
-                            clib_memcpy(&h.dst_address, &pr_info->prefix,  sizeof(ip6_address_t));
-
-                            payload_length += sizeof( icmp6_neighbor_discovery_prefix_information_option_t);
-
-                            vlib_buffer_add_data (vm,
-                                                  p0->free_list_index,
-                                                  bi0,
-                                                  (void *)&h, sizeof(icmp6_neighbor_discovery_prefix_information_option_t));
-
-                          }
-                      }));
-		      /* *INDENT-ON* */
-
-		      /* add additional options before here */
-
-		      /* finish building the router advertisement... */
-		      if (!is_unspecified && radv_info->send_unicast)
-			{
-			  ip0->dst_address = ip0->src_address;
-			}
-		      else
-			{
-			  /* target address is all-nodes mcast addr */
-			  ip6_set_reserved_multicast_address
-			    (&ip0->dst_address,
-			     IP6_MULTICAST_SCOPE_link_local,
-			     IP6_MULTICAST_GROUP_ID_all_hosts);
-			}
-
-		      /* source address MUST be the link-local address */
-		      ip0->src_address = radv_info->link_local_address;
-
-		      ip0->hop_limit = 255;
-		      ip0->payload_length =
-			clib_host_to_net_u16 (payload_length);
-
-		      icmp6_router_advertisement_header_t *rh0 =
-			(icmp6_router_advertisement_header_t *) (ip0 + 1);
-		      rh0->icmp.checksum =
-			ip6_tcp_udp_icmp_compute_checksum (vm, p0, ip0,
-							   &bogus_length);
-		      ASSERT (bogus_length == 0);
-
-		      /* setup output if and adjacency */
-		      vnet_buffer (p0)->sw_if_index[VLIB_RX] =
-			vnet_main.local_interface_sw_if_index;
-
-		      if (is_solicitation)
-			{
-			  ethernet_header_t *eth0;
-			  /* Reuse current MAC header, copy SMAC to DMAC and
-			   * interface MAC to SMAC */
-			  vlib_buffer_reset (p0);
-			  eth0 = vlib_buffer_get_current (p0);
-			  clib_memcpy (eth0->dst_address, eth0->src_address,
-				       6);
-			  clib_memcpy (eth0->src_address, eth_if0->address,
-				       6);
-			  next0 =
-			    is_dropped ? next0 :
-			    ICMP6_ROUTER_SOLICITATION_NEXT_REPLY_TX;
-			  vnet_buffer (p0)->sw_if_index[VLIB_TX] =
-			    sw_if_index0;
-			}
-		      else
-			{
-			  adj_index0 = radv_info->all_nodes_adj_index;
-			  if (adj_index0 == 0)
-			    error0 = ICMP6_ERROR_DST_LOOKUP_MISS;
-			  else
-			    {
-			      ip_adjacency_t *adj0 =
-				ip_get_adjacency (&im->lookup_main,
-						  adj_index0);
-			      error0 =
-				((adj0->rewrite_header.sw_if_index !=
-				  sw_if_index0
-				  || adj0->lookup_next_index !=
-				  IP_LOOKUP_NEXT_REWRITE) ?
-				 ICMP6_ERROR_ROUTER_SOLICITATION_DEST_UNKNOWN
-				 : error0);
-			      next0 =
-				is_dropped ? next0 :
-				ICMP6_ROUTER_SOLICITATION_NEXT_REPLY_RW;
-			      vnet_buffer (p0)->ip.adj_index[VLIB_TX] =
-				adj_index0;
-			    }
-			}
-		      p0->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
-
-		      radv_info->n_solicitations_dropped += is_dropped;
-		      radv_info->n_solicitations_rcvd += is_solicitation;
-
-		      if ((error0 == ICMP6_ERROR_NONE) && !is_dropped)
-			{
-			  radv_info->n_advertisements_sent++;
-			  n_advertisements_sent++;
-			}
-		    }
-		}
-	    }
-
-	  p0->error = error_node->errors[error0];
-
-	  if (error0 != ICMP6_ERROR_NONE)
-	    vlib_error_count (vm, error_node->node_index, error0, 1);
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  /* Account for router advertisements sent. */
-  vlib_error_count (vm, error_node->node_index,
-		    ICMP6_ERROR_ROUTER_ADVERTISEMENTS_TX,
-		    n_advertisements_sent);
-
-  return frame->n_vectors;
-}
-
- /* validate advertised info for consistancy (see RFC-4861 section 6.2.7) - log any inconsistencies, packet will always  be dropped  */
-static_always_inline uword
-icmp6_router_advertisement (vlib_main_t * vm,
-			    vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  uword n_packets = frame->n_vectors;
-  u32 *from, *to_next;
-  u32 n_left_from, n_left_to_next, next_index;
-  u32 n_advertisements_rcvd = 0;
-
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip6_icmp_input_node.index);
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = n_packets;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-				   /* stride */ 1,
-				   sizeof (icmp6_input_trace_t));
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *p0;
-	  ip6_header_t *ip0;
-	  ip6_radv_t *radv_info = 0;
-	  icmp6_router_advertisement_header_t *h0;
-	  u32 bi0, options_len0, sw_if_index0, next0, error0;
-
-	  bi0 = to_next[0] = from[0];
-
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, bi0);
-	  ip0 = vlib_buffer_get_current (p0);
-	  h0 = ip6_next_header (ip0);
-	  options_len0 =
-	    clib_net_to_host_u16 (ip0->payload_length) - sizeof (h0[0]);
-
-	  error0 = ICMP6_ERROR_NONE;
-	  sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
-
-	  /* Check that source address is link-local */
-	  error0 = (!ip6_address_is_link_local_unicast (&ip0->src_address)) ?
-	    ICMP6_ERROR_ROUTER_ADVERTISEMENT_SOURCE_NOT_LINK_LOCAL : error0;
-
-	  /* default is to drop */
-	  next0 = ICMP6_ROUTER_SOLICITATION_NEXT_DROP;
-
-	  n_advertisements_rcvd++;
-
-	  if (error0 == ICMP6_ERROR_NONE)
-	    {
-	      vnet_sw_interface_t *sw_if0;
-	      ethernet_interface_t *eth_if0;
-
-	      sw_if0 = vnet_get_sup_sw_interface (vnm, sw_if_index0);
-	      ASSERT (sw_if0->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
-	      eth_if0 =
-		ethernet_get_interface (&ethernet_main, sw_if0->hw_if_index);
-
-	      /* only support ethernet interface type for now */
-	      error0 =
-		(!eth_if0) ? ICMP6_ERROR_ROUTER_SOLICITATION_UNSUPPORTED_INTF
-		: error0;
-
-	      if (error0 == ICMP6_ERROR_NONE)
-		{
-		  u32 ri;
-
-		  /* look up the radv_t information for this interface */
-		  vec_validate_init_empty
-		    (nm->if_radv_pool_index_by_sw_if_index, sw_if_index0, ~0);
-
-		  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index0];
-
-		  if (ri != ~0)
-		    radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
-
-		  error0 =
-		    ((!radv_info) ?
-		     ICMP6_ERROR_ROUTER_SOLICITATION_RADV_NOT_CONFIG :
-		     error0);
-
-		  if (error0 == ICMP6_ERROR_NONE)
-		    {
-		      /* validate advertised information */
-		      if ((h0->current_hop_limit && radv_info->curr_hop_limit)
-			  && (h0->current_hop_limit !=
-			      radv_info->curr_hop_limit))
-			{
-			  ip6_neighbor_syslog (vm, LOG_WARNING,
-					       "our AdvCurHopLimit on %U doesn't agree with %U",
-					       format_vnet_sw_if_index_name,
-					       vnm, sw_if_index0,
-					       format_ip6_address,
-					       &ip0->src_address);
-			}
-
-		      if ((h0->flags &
-			   ICMP6_ROUTER_DISCOVERY_FLAG_ADDRESS_CONFIG_VIA_DHCP)
-			  != radv_info->adv_managed_flag)
-			{
-			  ip6_neighbor_syslog (vm, LOG_WARNING,
-					       "our AdvManagedFlag on %U doesn't agree with %U",
-					       format_vnet_sw_if_index_name,
-					       vnm, sw_if_index0,
-					       format_ip6_address,
-					       &ip0->src_address);
-			}
-
-		      if ((h0->flags &
-			   ICMP6_ROUTER_DISCOVERY_FLAG_OTHER_CONFIG_VIA_DHCP)
-			  != radv_info->adv_other_flag)
-			{
-			  ip6_neighbor_syslog (vm, LOG_WARNING,
-					       "our AdvOtherConfigFlag on %U doesn't agree with %U",
-					       format_vnet_sw_if_index_name,
-					       vnm, sw_if_index0,
-					       format_ip6_address,
-					       &ip0->src_address);
-			}
-
-		      if ((h0->
-			   time_in_msec_between_retransmitted_neighbor_solicitations
-			   && radv_info->
-			   adv_time_in_msec_between_retransmitted_neighbor_solicitations)
-			  && (h0->
-			      time_in_msec_between_retransmitted_neighbor_solicitations
-			      !=
-			      clib_host_to_net_u32 (radv_info->
-						    adv_time_in_msec_between_retransmitted_neighbor_solicitations)))
-			{
-			  ip6_neighbor_syslog (vm, LOG_WARNING,
-					       "our AdvRetransTimer on %U doesn't agree with %U",
-					       format_vnet_sw_if_index_name,
-					       vnm, sw_if_index0,
-					       format_ip6_address,
-					       &ip0->src_address);
-			}
-
-		      if ((h0->neighbor_reachable_time_in_msec &&
-			   radv_info->adv_neighbor_reachable_time_in_msec) &&
-			  (h0->neighbor_reachable_time_in_msec !=
-			   clib_host_to_net_u32
-			   (radv_info->adv_neighbor_reachable_time_in_msec)))
-			{
-			  ip6_neighbor_syslog (vm, LOG_WARNING,
-					       "our AdvReachableTime on %U doesn't agree with %U",
-					       format_vnet_sw_if_index_name,
-					       vnm, sw_if_index0,
-					       format_ip6_address,
-					       &ip0->src_address);
-			}
-
-		      /* check for MTU or prefix options or .. */
-		      u8 *opt_hdr = (u8 *) (h0 + 1);
-		      while (options_len0 > 0)
-			{
-			  icmp6_neighbor_discovery_option_header_t *o0 =
-			    (icmp6_neighbor_discovery_option_header_t *)
-			    opt_hdr;
-			  int opt_len = o0->n_data_u64s << 3;
-			  icmp6_neighbor_discovery_option_type_t option_type =
-			    o0->type;
-
-			  if (options_len0 < 2)
-			    {
-			      ip6_neighbor_syslog (vm, LOG_ERR,
-						   "malformed RA packet on %U from %U",
-						   format_vnet_sw_if_index_name,
-						   vnm, sw_if_index0,
-						   format_ip6_address,
-						   &ip0->src_address);
-			      break;
-			    }
-
-			  if (opt_len == 0)
-			    {
-			      ip6_neighbor_syslog (vm, LOG_ERR,
-						   " zero length option in RA on %U from %U",
-						   format_vnet_sw_if_index_name,
-						   vnm, sw_if_index0,
-						   format_ip6_address,
-						   &ip0->src_address);
-			      break;
-			    }
-			  else if (opt_len > options_len0)
-			    {
-			      ip6_neighbor_syslog (vm, LOG_ERR,
-						   "option length in RA packet  greater than total length on %U from %U",
-						   format_vnet_sw_if_index_name,
-						   vnm, sw_if_index0,
-						   format_ip6_address,
-						   &ip0->src_address);
-			      break;
-			    }
-
-			  options_len0 -= opt_len;
-			  opt_hdr += opt_len;
-
-			  switch (option_type)
-			    {
-			    case ICMP6_NEIGHBOR_DISCOVERY_OPTION_mtu:
-			      {
-				icmp6_neighbor_discovery_mtu_option_t *h =
-				  (icmp6_neighbor_discovery_mtu_option_t
-				   *) (o0);
-
-				if (opt_len < sizeof (*h))
-				  break;
-
-				if ((h->mtu && radv_info->adv_link_mtu) &&
-				    (h->mtu !=
-				     clib_host_to_net_u32
-				     (radv_info->adv_link_mtu)))
-				  {
-				    ip6_neighbor_syslog (vm, LOG_WARNING,
-							 "our AdvLinkMTU on %U doesn't agree with %U",
-							 format_vnet_sw_if_index_name,
-							 vnm, sw_if_index0,
-							 format_ip6_address,
-							 &ip0->src_address);
-				  }
-			      }
-			      break;
-
-			    case ICMP6_NEIGHBOR_DISCOVERY_OPTION_prefix_information:
-			      {
-				icmp6_neighbor_discovery_prefix_information_option_t
-				  * h =
-				  (icmp6_neighbor_discovery_prefix_information_option_t
-				   *) (o0);
-
-				/* validate advertised prefix options  */
-				ip6_radv_prefix_t *pr_info;
-				u32 preferred, valid;
-
-				if (opt_len < sizeof (*h))
-				  break;
-
-				preferred =
-				  clib_net_to_host_u32 (h->preferred_time);
-				valid = clib_net_to_host_u32 (h->valid_time);
-
-				/* look for matching prefix - if we our advertising it, it better be consistant */
-				/* *INDENT-OFF* */
-				pool_foreach (pr_info, radv_info->adv_prefixes_pool,
-                                ({
-
-                                  ip6_address_t mask;
-                                  ip6_address_mask_from_width(&mask, pr_info->prefix_len);
-
-                                  if(pr_info->enabled &&
-                                     (pr_info->prefix_len == h->dst_address_length) &&
-                                     ip6_address_is_equal_masked (&pr_info->prefix,  &h->dst_address, &mask))
-                                    {
-                                      /* found it */
-                                      if(!pr_info->decrement_lifetime_flag &&
-                                         valid != pr_info->adv_valid_lifetime_in_secs)
-                                        {
-                                          ip6_neighbor_syslog(vm,  LOG_WARNING,
-                                                              "our ADV validlifetime on  %U for %U does not  agree with %U",
-                                                              format_vnet_sw_if_index_name, vnm, sw_if_index0,format_ip6_address, &pr_info->prefix,
-                                                              format_ip6_address, &h->dst_address);
-                                        }
-                                      if(!pr_info->decrement_lifetime_flag &&
-                                         preferred != pr_info->adv_pref_lifetime_in_secs)
-                                        {
-                                          ip6_neighbor_syslog(vm,  LOG_WARNING,
-                                                              "our ADV preferredlifetime on  %U for %U does not  agree with %U",
-                                                              format_vnet_sw_if_index_name, vnm, sw_if_index0,format_ip6_address, &pr_info->prefix,
-                                                              format_ip6_address, &h->dst_address);
-                                        }
-                                    }
-                                  break;
-                                }));
-				/* *INDENT-ON* */
-				break;
-			      }
-			    default:
-			      /* skip this one */
-			      break;
-			    }
-			}
-		    }
-		}
-	    }
-
-	  p0->error = error_node->errors[error0];
-
-	  if (error0 != ICMP6_ERROR_NONE)
-	    vlib_error_count (vm, error_node->node_index, error0, 1);
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  /* Account for router advertisements sent. */
-  vlib_error_count (vm, error_node->node_index,
-		    ICMP6_ERROR_ROUTER_ADVERTISEMENTS_RX,
-		    n_advertisements_rcvd);
-
-  return frame->n_vectors;
-}
-
-/* create and initialize router advertisement parameters with default values for this intfc */
-static u32
-ip6_neighbor_sw_interface_add_del (vnet_main_t * vnm,
-				   u32 sw_if_index, u32 is_add)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  ip6_radv_t *a = 0;
-  u32 ri = ~0;
-  vnet_sw_interface_t *sw_if0;
-  ethernet_interface_t *eth_if0 = 0;
-
-  /* lookup radv container  - ethernet interfaces only */
-  sw_if0 = vnet_get_sup_sw_interface (vnm, sw_if_index);
-  if (sw_if0->type == VNET_SW_INTERFACE_TYPE_HARDWARE)
-    eth_if0 = ethernet_get_interface (&ethernet_main, sw_if0->hw_if_index);
-
-  if (!eth_if0)
-    return ri;
-
-  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index, sw_if_index,
-			   ~0);
-  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
-
-  if (ri != ~0)
-    {
-      a = pool_elt_at_index (nm->if_radv_pool, ri);
-
-      if (!is_add)
-	{
-	  u32 i, *to_delete = 0;
-	  ip6_radv_prefix_t *p;
-	  ip6_mldp_group_t *m;
-
-	  /* remove adjacencies */
-	  adj_unlock (a->all_nodes_adj_index);
-	  adj_unlock (a->all_routers_adj_index);
-	  adj_unlock (a->all_mldv2_routers_adj_index);
-
-	  /* clean up prefix_pool */
-	  /* *INDENT-OFF* */
-	  pool_foreach (p, a->adv_prefixes_pool,
-          ({
-            vec_add1 (to_delete, p  -  a->adv_prefixes_pool);
-          }));
-	  /* *INDENT-ON* */
-
-	  for (i = 0; i < vec_len (to_delete); i++)
-	    {
-	      p = pool_elt_at_index (a->adv_prefixes_pool, to_delete[i]);
-	      mhash_unset (&a->address_to_prefix_index, &p->prefix, 0);
-	      pool_put (a->adv_prefixes_pool, p);
-	    }
-
-	  vec_free (to_delete);
-	  to_delete = 0;
-
-	  /* clean up mldp group pool */
-	  /* *INDENT-OFF* */
-	  pool_foreach (m, a->mldp_group_pool,
-          ({
-            vec_add1 (to_delete, m  -  a->mldp_group_pool);
-          }));
-	  /* *INDENT-ON* */
-
-	  for (i = 0; i < vec_len (to_delete); i++)
-	    {
-	      m = pool_elt_at_index (a->mldp_group_pool, to_delete[i]);
-	      mhash_unset (&a->address_to_mldp_index, &m->mcast_address, 0);
-	      pool_put (a->mldp_group_pool, m);
-	    }
-
-	  vec_free (to_delete);
-
-	  pool_put (nm->if_radv_pool, a);
-	  nm->if_radv_pool_index_by_sw_if_index[sw_if_index] = ~0;
-	  ri = ~0;
-	}
-    }
-  else
-    {
-      if (is_add)
-	{
-	  vnet_hw_interface_t *hw_if0;
-
-	  hw_if0 = vnet_get_sup_hw_interface (vnm, sw_if_index);
-
-	  pool_get (nm->if_radv_pool, a);
-
-	  ri = a - nm->if_radv_pool;
-	  nm->if_radv_pool_index_by_sw_if_index[sw_if_index] = ri;
-
-	  /* initialize default values (most of which are zero) */
-	  memset (a, 0, sizeof (a[0]));
-
-	  a->sw_if_index = sw_if_index;
-	  a->fib_index = ~0;
-	  a->max_radv_interval = DEF_MAX_RADV_INTERVAL;
-	  a->min_radv_interval = DEF_MIN_RADV_INTERVAL;
-	  a->curr_hop_limit = DEF_CURR_HOP_LIMIT;
-	  a->adv_router_lifetime_in_sec = DEF_DEF_RTR_LIFETIME;
-
-	  a->adv_link_layer_address = 1;	/* send ll address source address option */
-
-	  a->min_delay_between_radv = MIN_DELAY_BETWEEN_RAS;
-	  a->max_delay_between_radv = MAX_DELAY_BETWEEN_RAS;
-	  a->max_rtr_default_lifetime = MAX_DEF_RTR_LIFETIME;
-	  a->seed = (u32) clib_cpu_time_now ();
-	  (void) random_u32 (&a->seed);
-	  a->randomizer = clib_cpu_time_now ();
-	  (void) random_u64 (&a->randomizer);
-
-	  a->initial_adverts_count = MAX_INITIAL_RTR_ADVERTISEMENTS;
-	  a->initial_adverts_sent = a->initial_adverts_count - 1;
-	  a->initial_adverts_interval = MAX_INITIAL_RTR_ADVERT_INTERVAL;
-
-	  /* deafult is to send */
-	  a->send_radv = 1;
-
-	  /* fill in radv_info for this interface that will be needed later */
-	  a->adv_link_mtu = hw_if0->max_l3_packet_bytes[VLIB_RX];
-
-	  clib_memcpy (a->link_layer_address, eth_if0->address, 6);
-
-	  /* fill in default link-local address  (this may be overridden) */
-	  ip6_link_local_address_from_ethernet_address
-	    (&a->link_local_address, eth_if0->address);
-	  a->link_local_prefix_len = 64;
-
-	  mhash_init (&a->address_to_prefix_index, sizeof (uword),
-		      sizeof (ip6_address_t));
-	  mhash_init (&a->address_to_mldp_index, sizeof (uword),
-		      sizeof (ip6_address_t));
-
-	  {
-	    u8 link_layer_address[6] = { 0x33, 0x33, 0x00, 0x00, 0x00,
-	      IP6_MULTICAST_GROUP_ID_all_hosts
-	    };
-
-	    a->all_nodes_adj_index =
-	      adj_rewrite_add_and_lock (FIB_PROTOCOL_IP6, VNET_LINK_IP6,
-					sw_if_index, link_layer_address);
-	  }
-
-	  {
-	    u8 link_layer_address[6] = { 0x33, 0x33, 0x00, 0x00, 0x00,
-	      IP6_MULTICAST_GROUP_ID_all_routers
-	    };
-
-	    a->all_routers_adj_index =
-	      adj_rewrite_add_and_lock (FIB_PROTOCOL_IP6, VNET_LINK_IP6,
-					sw_if_index, link_layer_address);
-	  }
-
-	  {
-	    u8 link_layer_address[6] = { 0x33, 0x33, 0x00, 0x00, 0x00,
-	      IP6_MULTICAST_GROUP_ID_mldv2_routers
-	    };
-
-	    a->all_mldv2_routers_adj_index =
-	      adj_rewrite_add_and_lock (FIB_PROTOCOL_IP6,
-					VNET_LINK_IP6,
-					sw_if_index, link_layer_address);
-	  }
-
-	  /* add multicast groups we will always be reporting  */
-	  ip6_address_t addr;
-	  ip6_mldp_group_t *mcast_group_info;
-
-	  ip6_set_reserved_multicast_address (&addr,
-					      IP6_MULTICAST_SCOPE_link_local,
-					      IP6_MULTICAST_GROUP_ID_all_hosts);
-
-	  /* lookup  mldp info for this interface */
-
-	  uword *p = mhash_get (&a->address_to_mldp_index, &addr);
-	  mcast_group_info =
-	    p ? pool_elt_at_index (a->mldp_group_pool, p[0]) : 0;
-
-	  /* add address */
-	  if (!mcast_group_info)
-	    {
-	      /* add */
-	      u32 mi;
-	      pool_get (a->mldp_group_pool, mcast_group_info);
-
-	      mi = mcast_group_info - a->mldp_group_pool;
-	      mhash_set (&a->address_to_mldp_index, &addr, mi,	/* old_value */
-			 0);
-
-	      mcast_group_info->type = 4;
-	      mcast_group_info->mcast_source_address_pool = 0;
-	      mcast_group_info->num_sources = 0;
-	      clib_memcpy (&mcast_group_info->mcast_address, &addr,
-			   sizeof (ip6_address_t));
-	    }
-
-	  ip6_set_reserved_multicast_address (&addr,
-					      IP6_MULTICAST_SCOPE_link_local,
-					      IP6_MULTICAST_GROUP_ID_all_routers);
-
-	  p = mhash_get (&a->address_to_mldp_index, &addr);
-	  mcast_group_info =
-	    p ? pool_elt_at_index (a->mldp_group_pool, p[0]) : 0;
-
-	  if (!mcast_group_info)
-	    {
-	      /* add */
-	      u32 mi;
-	      pool_get (a->mldp_group_pool, mcast_group_info);
-
-	      mi = mcast_group_info - a->mldp_group_pool;
-	      mhash_set (&a->address_to_mldp_index, &addr, mi,	/* old_value */
-			 0);
-
-	      mcast_group_info->type = 4;
-	      mcast_group_info->mcast_source_address_pool = 0;
-	      mcast_group_info->num_sources = 0;
-	      clib_memcpy (&mcast_group_info->mcast_address, &addr,
-			   sizeof (ip6_address_t));
-	    }
-
-	  ip6_set_reserved_multicast_address (&addr,
-					      IP6_MULTICAST_SCOPE_link_local,
-					      IP6_MULTICAST_GROUP_ID_mldv2_routers);
-
-	  p = mhash_get (&a->address_to_mldp_index, &addr);
-	  mcast_group_info =
-	    p ? pool_elt_at_index (a->mldp_group_pool, p[0]) : 0;
-
-	  if (!mcast_group_info)
-	    {
-	      /* add */
-	      u32 mi;
-	      pool_get (a->mldp_group_pool, mcast_group_info);
-
-	      mi = mcast_group_info - a->mldp_group_pool;
-	      mhash_set (&a->address_to_mldp_index, &addr, mi,	/* old_value */
-			 0);
-
-	      mcast_group_info->type = 4;
-	      mcast_group_info->mcast_source_address_pool = 0;
-	      mcast_group_info->num_sources = 0;
-	      clib_memcpy (&mcast_group_info->mcast_address, &addr,
-			   sizeof (ip6_address_t));
-	    }
-	}
-    }
-  return ri;
-}
-
-/* send an mldpv2 report  */
-static void
-ip6_neighbor_send_mldpv2_report (u32 sw_if_index)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vnm->vlib_main;
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  vnet_sw_interface_t *sw_if0;
-  ethernet_interface_t *eth_if0;
-  u32 ri;
-  int bogus_length;
-
-  ip6_radv_t *radv_info;
-  u16 payload_length;
-  vlib_buffer_t *b0;
-  ip6_header_t *ip0;
-  u32 *to_next;
-  vlib_frame_t *f;
-  u32 bo0;
-  u32 n_to_alloc = 1;
-  u32 n_allocated;
-
-  icmp6_multicast_listener_report_header_t *rh0;
-  icmp6_multicast_listener_report_packet_t *rp0;
-
-  sw_if0 = vnet_get_sup_sw_interface (vnm, sw_if_index);
-  ASSERT (sw_if0->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
-  eth_if0 = ethernet_get_interface (&ethernet_main, sw_if0->hw_if_index);
-
-  if (!eth_if0 || !vnet_sw_interface_is_admin_up (vnm, sw_if_index))
-    return;
-
-  /* look up the radv_t  information for this interface */
-  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index, sw_if_index,
-			   ~0);
-
-  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
-
-  if (ri == ~0)
-    return;
-
-  /* send report now - build a mldpv2 report packet  */
-  n_allocated = vlib_buffer_alloc_from_free_list (vm,
-						  &bo0,
-						  n_to_alloc,
-						  VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-  if (PREDICT_FALSE (n_allocated == 0))
-    {
-      clib_warning ("buffer allocation failure");
-      return;
-    }
-
-  b0 = vlib_get_buffer (vm, bo0);
-
-  /* adjust the sizeof the buffer to just include the ipv6 header */
-  b0->current_length = sizeof (icmp6_multicast_listener_report_packet_t);
-
-  payload_length = sizeof (icmp6_multicast_listener_report_header_t);
-
-  b0->error = ICMP6_ERROR_NONE;
-
-  rp0 = vlib_buffer_get_current (b0);
-  ip0 = (ip6_header_t *) & rp0->ip;
-  rh0 = (icmp6_multicast_listener_report_header_t *) & rp0->report_hdr;
-
-  memset (rp0, 0x0, sizeof (icmp6_multicast_listener_report_packet_t));
-
-  ip0->ip_version_traffic_class_and_flow_label =
-    clib_host_to_net_u32 (0x6 << 28);
-
-  ip0->protocol = IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS;
-  /* for DEBUG - vnet driver won't seem to emit router alerts */
-  /* ip0->protocol = IP_PROTOCOL_ICMP6; */
-  ip0->hop_limit = 1;
-
-  rh0->icmp.type = ICMP6_multicast_listener_report_v2;
-
-  /* source address MUST be the link-local address */
-  radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
-  ip0->src_address = radv_info->link_local_address;
-
-  /* destination is all mldpv2 routers */
-  ip6_set_reserved_multicast_address (&ip0->dst_address,
-				      IP6_MULTICAST_SCOPE_link_local,
-				      IP6_MULTICAST_GROUP_ID_mldv2_routers);
-
-  /* add reports here */
-  ip6_mldp_group_t *m;
-  int num_addr_records = 0;
-  icmp6_multicast_address_record_t rr;
-
-  /* fill in the hop-by-hop extension header (router alert) info */
-  rh0->ext_hdr.next_hdr = IP_PROTOCOL_ICMP6;
-  rh0->ext_hdr.n_data_u64s = 0;
-
-  rh0->alert.type = IP6_MLDP_ALERT_TYPE;
-  rh0->alert.len = 2;
-  rh0->alert.value = 0;
-
-  rh0->pad.type = 1;
-  rh0->pad.len = 0;
-
-  rh0->icmp.checksum = 0;
-
-  /* *INDENT-OFF* */
-  pool_foreach (m, radv_info->mldp_group_pool,
-  ({
-    rr.type = m->type;
-    rr.aux_data_len_u32s = 0;
-    rr.num_sources = clib_host_to_net_u16 (m->num_sources);
-    clib_memcpy(&rr.mcast_addr, &m->mcast_address, sizeof(ip6_address_t));
-
-    num_addr_records++;
-
-    vlib_buffer_add_data
-      (vm, b0->free_list_index, bo0,
-       (void *)&rr, sizeof(icmp6_multicast_address_record_t));
-
-    payload_length += sizeof( icmp6_multicast_address_record_t);
-  }));
-  /* *INDENT-ON* */
-
-  rh0->rsvd = 0;
-  rh0->num_addr_records = clib_host_to_net_u16 (num_addr_records);
-
-  /* update lengths */
-  ip0->payload_length = clib_host_to_net_u16 (payload_length);
-
-  rh0->icmp.checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b0, ip0,
-							  &bogus_length);
-  ASSERT (bogus_length == 0);
-
-  /*
-   * OK to override w/ no regard for actual FIB, because
-   * ip6-rewrite only looks at the adjacency.
-   */
-  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
-    vnet_main.local_interface_sw_if_index;
-
-  vnet_buffer (b0)->ip.adj_index[VLIB_TX] =
-    radv_info->all_mldv2_routers_adj_index;
-  b0->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
-
-  vlib_node_t *node = vlib_get_node_by_name (vm, (u8 *) "ip6-rewrite");
-
-  f = vlib_get_frame_to_node (vm, node->index);
-  to_next = vlib_frame_vector_args (f);
-  to_next[0] = bo0;
-  f->n_vectors = 1;
-
-  vlib_put_frame_to_node (vm, node->index, f);
-  return;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_icmp_router_solicitation_node,static) =
-{
-  .function = icmp6_router_solicitation,
-  .name = "icmp6-router-solicitation",
-
-  .vector_size = sizeof (u32),
-
-  .format_trace = format_icmp6_input_trace,
-
-  .n_next_nodes = ICMP6_ROUTER_SOLICITATION_N_NEXT,
-  .next_nodes = {
-    [ICMP6_ROUTER_SOLICITATION_NEXT_DROP] = "error-drop",
-    [ICMP6_ROUTER_SOLICITATION_NEXT_REPLY_RW] = "ip6-rewrite",
-    [ICMP6_ROUTER_SOLICITATION_NEXT_REPLY_TX] = "interface-output",
-  },
-};
-/* *INDENT-ON* */
-
-/* send a RA or update the timer info etc.. */
-static uword
-ip6_neighbor_process_timer_event (vlib_main_t * vm,
-				  vlib_node_runtime_t * node,
-				  vlib_frame_t * frame)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  ip6_radv_t *radv_info;
-  vlib_frame_t *f = 0;
-  u32 n_this_frame = 0;
-  u32 n_left_to_next = 0;
-  u32 *to_next = 0;
-  u32 bo0;
-  icmp6_router_solicitation_header_t *h0;
-  vlib_buffer_t *b0;
-  f64 now = vlib_time_now (vm);
-
-  /* Interface ip6 radv info list */
-  /* *INDENT-OFF* */
-  pool_foreach (radv_info, nm->if_radv_pool,
-  ({
-    if( !vnet_sw_interface_is_admin_up (vnm, radv_info->sw_if_index))
-      {
-        radv_info->initial_adverts_sent = radv_info->initial_adverts_count-1;
-        radv_info->next_multicast_time = now;
-        radv_info->last_multicast_time = now;
-        radv_info->last_radv_time = 0;
-        radv_info->all_routers_mcast = 0;
-        continue;
-      }
-
-    /* Make sure that we've joined the all-routers multicast group */
-    if(!radv_info->all_routers_mcast)
-      {
-        /* send MDLP_REPORT_EVENT message */
-        ip6_neighbor_send_mldpv2_report(radv_info->sw_if_index);
-        radv_info->all_routers_mcast = 1;
-      }
-
-    /* is it time to send a multicast  RA on this interface? */
-    if(radv_info->send_radv && (now >=  radv_info->next_multicast_time))
-      {
-        u32 n_to_alloc = 1;
-        u32 n_allocated;
-
-        f64 rfn = (radv_info->max_radv_interval - radv_info->min_radv_interval) *
-          random_f64 (&radv_info->seed) + radv_info->min_radv_interval;
-
-        /* multicast send - compute next multicast send time */
-        if( radv_info->initial_adverts_sent > 0)
-          {
-            radv_info->initial_adverts_sent--;
-            if(rfn > radv_info-> initial_adverts_interval)
-              rfn =  radv_info-> initial_adverts_interval;
-
-            /* check to see if we are ceasing to send */
-            if( radv_info->initial_adverts_sent  == 0)
-              if(radv_info->cease_radv)
-                radv_info->send_radv = 0;
-          }
-
-        radv_info->next_multicast_time =  rfn + now;
-        radv_info->last_multicast_time = now;
-
-        /* send advert now - build a "solicted" router advert with unspecified source address */
-        n_allocated = vlib_buffer_alloc_from_free_list
-          (vm, &bo0, n_to_alloc, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-
-        if (PREDICT_FALSE(n_allocated == 0))
-          {
-            clib_warning ("buffer allocation failure");
-            continue;
-          }
-        b0 = vlib_get_buffer (vm, bo0);
-        b0->current_length = sizeof( icmp6_router_solicitation_header_t);
-        b0->error = ICMP6_ERROR_NONE;
-        vnet_buffer (b0)->sw_if_index[VLIB_RX] = radv_info->sw_if_index;
-
-        h0 =  vlib_buffer_get_current (b0);
-
-        memset (h0, 0, sizeof (icmp6_router_solicitation_header_t));
-
-        h0->ip.ip_version_traffic_class_and_flow_label = clib_host_to_net_u32 (0x6 << 28);
-        h0->ip.payload_length = clib_host_to_net_u16 (sizeof (icmp6_router_solicitation_header_t)
-                                                      - STRUCT_OFFSET_OF (icmp6_router_solicitation_header_t, neighbor));
-        h0->ip.protocol = IP_PROTOCOL_ICMP6;
-        h0->ip.hop_limit = 255;
-
-        /* set src/dst address as "unspecified" this marks this packet as internally generated rather than recieved */
-        h0->ip.src_address.as_u64[0] = 0;
-        h0->ip.src_address.as_u64[1] = 0;
-
-        h0->ip.dst_address.as_u64[0] = 0;
-        h0->ip.dst_address.as_u64[1] = 0;
-
-        h0->neighbor.icmp.type = ICMP6_router_solicitation;
-
-        if (PREDICT_FALSE(f == 0))
-          {
-            f = vlib_get_frame_to_node (vm, ip6_icmp_router_solicitation_node.index);
-            to_next = vlib_frame_vector_args (f);
-            n_left_to_next = VLIB_FRAME_SIZE;
-            n_this_frame = 0;
-          }
-
-        n_this_frame++;
-        n_left_to_next--;
-        to_next[0] = bo0;
-        to_next += 1;
-
-        if (PREDICT_FALSE(n_left_to_next == 0))
-          {
-            f->n_vectors = n_this_frame;
-            vlib_put_frame_to_node (vm, ip6_icmp_router_solicitation_node.index, f);
-            f = 0;
-          }
-      }
-  }));
-  /* *INDENT-ON* */
-
-  if (f)
-    {
-      ASSERT (n_this_frame);
-      f->n_vectors = n_this_frame;
-      vlib_put_frame_to_node (vm, ip6_icmp_router_solicitation_node.index, f);
-    }
-  return 0;
-}
-
-static uword
-ip6_icmp_neighbor_discovery_event_process (vlib_main_t * vm,
-					   vlib_node_runtime_t * node,
-					   vlib_frame_t * frame)
-{
-  uword event_type;
-  ip6_icmp_neighbor_discovery_event_data_t *event_data;
-
-  /* init code here */
-
-  while (1)
-    {
-      vlib_process_wait_for_event_or_clock (vm, 1. /* seconds */ );
-
-      event_data = vlib_process_get_event_data (vm, &event_type);
-
-      if (!event_data)
-	{
-	  /* No events found: timer expired. */
-	  /* process interface list and send RAs as appropriate, update timer info */
-	  ip6_neighbor_process_timer_event (vm, node, frame);
-	}
-      else
-	{
-	  switch (event_type)
-	    {
-
-	    case ICMP6_ND_EVENT_INIT:
-	      break;
-
-	    case ~0:
-	      break;
-
-	    default:
-	      ASSERT (0);
-	    }
-
-	  if (event_data)
-	    _vec_len (event_data) = 0;
-	}
-    }
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_icmp_router_advertisement_node,static) =
-{
-  .function = icmp6_router_advertisement,
-  .name = "icmp6-router-advertisement",
-
-  .vector_size = sizeof (u32),
-
-  .format_trace = format_icmp6_input_trace,
-
-  .n_next_nodes = 1,
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-vlib_node_registration_t ip6_icmp_neighbor_discovery_event_node = {
-
-  .function = ip6_icmp_neighbor_discovery_event_process,
-  .name = "ip6-icmp-neighbor-discovery-event-process",
-  .type = VLIB_NODE_TYPE_PROCESS,
-};
-
-static uword
-icmp6_neighbor_solicitation (vlib_main_t * vm,
-			     vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return icmp6_neighbor_solicitation_or_advertisement (vm, node, frame,
-						       /* is_solicitation */
-						       1);
-}
-
-static uword
-icmp6_neighbor_advertisement (vlib_main_t * vm,
-			      vlib_node_runtime_t * node,
-			      vlib_frame_t * frame)
-{
-  return icmp6_neighbor_solicitation_or_advertisement (vm, node, frame,
-						       /* is_solicitation */
-						       0);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_icmp_neighbor_solicitation_node,static) =
-{
-  .function = icmp6_neighbor_solicitation,
-  .name = "icmp6-neighbor-solicitation",
-
-  .vector_size = sizeof (u32),
-
-  .format_trace = format_icmp6_input_trace,
-
-  .n_next_nodes = ICMP6_NEIGHBOR_SOLICITATION_N_NEXT,
-  .next_nodes = {
-    [ICMP6_NEIGHBOR_SOLICITATION_NEXT_DROP] = "error-drop",
-    [ICMP6_NEIGHBOR_SOLICITATION_NEXT_REPLY] = "interface-output",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_icmp_neighbor_advertisement_node,static) =
-{
-  .function = icmp6_neighbor_advertisement,
-  .name = "icmp6-neighbor-advertisement",
-
-  .vector_size = sizeof (u32),
-
-  .format_trace = format_icmp6_input_trace,
-
-  .n_next_nodes = 1,
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/* API support functions */
-int
-ip6_neighbor_ra_config (vlib_main_t * vm, u32 sw_if_index,
-			u8 suppress, u8 managed, u8 other,
-			u8 ll_option, u8 send_unicast, u8 cease,
-			u8 use_lifetime, u32 lifetime,
-			u32 initial_count, u32 initial_interval,
-			u32 max_interval, u32 min_interval, u8 is_no)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  int error;
-  u32 ri;
-
-  /* look up the radv_t  information for this interface */
-  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index, sw_if_index,
-			   ~0);
-  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
-  error = (ri != ~0) ? 0 : VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-  if (!error)
-    {
-
-      ip6_radv_t *radv_info;
-      radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
-
-      if ((max_interval != 0) && (min_interval == 0))
-	min_interval = .75 * max_interval;
-
-      max_interval =
-	(max_interval !=
-	 0) ? ((is_no) ? DEF_MAX_RADV_INTERVAL : max_interval) :
-	radv_info->max_radv_interval;
-      min_interval =
-	(min_interval !=
-	 0) ? ((is_no) ? DEF_MIN_RADV_INTERVAL : min_interval) :
-	radv_info->min_radv_interval;
-      lifetime =
-	(use_lifetime !=
-	 0) ? ((is_no) ? DEF_DEF_RTR_LIFETIME : lifetime) :
-	radv_info->adv_router_lifetime_in_sec;
-
-      if (lifetime)
-	{
-	  if (lifetime > MAX_DEF_RTR_LIFETIME)
-	    lifetime = MAX_DEF_RTR_LIFETIME;
-
-	  if (lifetime <= max_interval)
-	    return VNET_API_ERROR_INVALID_VALUE;
-	}
-
-      if (min_interval != 0)
-	{
-	  if ((min_interval > .75 * max_interval) || (min_interval < 3))
-	    return VNET_API_ERROR_INVALID_VALUE;
-	}
-
-      if ((initial_count > MAX_INITIAL_RTR_ADVERTISEMENTS) ||
-	  (initial_interval > MAX_INITIAL_RTR_ADVERT_INTERVAL))
-	return VNET_API_ERROR_INVALID_VALUE;
-
-      /*
-         if "flag" is set and is_no is true then restore default value else set value corresponding to "flag"
-         if "flag" is clear  don't change corresponding value
-       */
-      radv_info->send_radv =
-	(suppress != 0) ? ((is_no != 0) ? 1 : 0) : radv_info->send_radv;
-      radv_info->adv_managed_flag =
-	(managed != 0) ? ((is_no) ? 0 : 1) : radv_info->adv_managed_flag;
-      radv_info->adv_other_flag =
-	(other != 0) ? ((is_no) ? 0 : 1) : radv_info->adv_other_flag;
-      radv_info->adv_link_layer_address =
-	(ll_option !=
-	 0) ? ((is_no) ? 1 : 0) : radv_info->adv_link_layer_address;
-      radv_info->send_unicast =
-	(send_unicast != 0) ? ((is_no) ? 0 : 1) : radv_info->send_unicast;
-      radv_info->cease_radv =
-	(cease != 0) ? ((is_no) ? 0 : 1) : radv_info->cease_radv;
-
-      radv_info->min_radv_interval = min_interval;
-      radv_info->max_radv_interval = max_interval;
-      radv_info->adv_router_lifetime_in_sec = lifetime;
-
-      radv_info->initial_adverts_count =
-	(initial_count !=
-	 0) ? ((is_no) ? MAX_INITIAL_RTR_ADVERTISEMENTS : initial_count) :
-	radv_info->initial_adverts_count;
-      radv_info->initial_adverts_interval =
-	(initial_interval !=
-	 0) ? ((is_no) ? MAX_INITIAL_RTR_ADVERT_INTERVAL : initial_interval) :
-	radv_info->initial_adverts_interval;
-
-      /* restart */
-      if ((cease != 0) && (is_no))
-	radv_info->send_radv = 1;
-
-      radv_info->initial_adverts_sent = radv_info->initial_adverts_count - 1;
-      radv_info->next_multicast_time = vlib_time_now (vm);
-      radv_info->last_multicast_time = vlib_time_now (vm);
-      radv_info->last_radv_time = 0;
-    }
-  return (error);
-}
-
-int
-ip6_neighbor_ra_prefix (vlib_main_t * vm, u32 sw_if_index,
-			ip6_address_t * prefix_addr, u8 prefix_len,
-			u8 use_default, u32 val_lifetime, u32 pref_lifetime,
-			u8 no_advertise, u8 off_link, u8 no_autoconfig,
-			u8 no_onlink, u8 is_no)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  int error;
-
-  u32 ri;
-
-  /* look up the radv_t  information for this interface */
-  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index, sw_if_index,
-			   ~0);
-
-  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
-
-  error = (ri != ~0) ? 0 : VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-  if (!error)
-    {
-      f64 now = vlib_time_now (vm);
-      ip6_radv_t *radv_info;
-      radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
-
-      /* prefix info add, delete or update */
-      ip6_radv_prefix_t *prefix;
-
-      /* lookup  prefix info for this  address on this interface */
-      uword *p = mhash_get (&radv_info->address_to_prefix_index, prefix_addr);
-
-      prefix = p ? pool_elt_at_index (radv_info->adv_prefixes_pool, p[0]) : 0;
-
-      if (is_no)
-	{
-	  /* delete */
-	  if (!prefix)
-	    return VNET_API_ERROR_INVALID_VALUE;	/* invalid prefix */
-
-	  if (prefix->prefix_len != prefix_len)
-	    return VNET_API_ERROR_INVALID_VALUE_2;
-
-	  /* FIXME - Should the DP do this or the CP ? */
-	  /* do specific delete processing here before returning */
-	  /* try to remove from routing table */
-
-	  mhash_unset (&radv_info->address_to_prefix_index, prefix_addr,
-		       /* old_value */ 0);
-	  pool_put (radv_info->adv_prefixes_pool, prefix);
-
-	  radv_info->initial_adverts_sent =
-	    radv_info->initial_adverts_count - 1;
-	  radv_info->next_multicast_time = vlib_time_now (vm);
-	  radv_info->last_multicast_time = vlib_time_now (vm);
-	  radv_info->last_radv_time = 0;
-	  return (error);
-	}
-
-      /* adding or changing */
-      if (!prefix)
-	{
-	  /* add */
-	  u32 pi;
-	  pool_get (radv_info->adv_prefixes_pool, prefix);
-	  pi = prefix - radv_info->adv_prefixes_pool;
-	  mhash_set (&radv_info->address_to_prefix_index, prefix_addr, pi,
-		     /* old_value */ 0);
-
-	  memset (prefix, 0x0, sizeof (ip6_radv_prefix_t));
-
-	  prefix->prefix_len = prefix_len;
-	  clib_memcpy (&prefix->prefix, prefix_addr, sizeof (ip6_address_t));
-
-	  /* initialize default values */
-	  prefix->adv_on_link_flag = 1;	/* L bit set */
-	  prefix->adv_autonomous_flag = 1;	/* A bit set */
-	  prefix->adv_valid_lifetime_in_secs = DEF_ADV_VALID_LIFETIME;
-	  prefix->adv_pref_lifetime_in_secs = DEF_ADV_PREF_LIFETIME;
-	  prefix->enabled = 1;
-	  prefix->decrement_lifetime_flag = 1;
-	  prefix->deprecated_prefix_flag = 1;
-
-	  if (off_link == 0)
-	    {
-	      /* FIXME - Should the DP do this or the CP ? */
-	      /* insert prefix into routing table as a connected prefix */
-	    }
-
-	  if (use_default)
-	    goto restart;
-	}
-      else
-	{
-
-	  if (prefix->prefix_len != prefix_len)
-	    return VNET_API_ERROR_INVALID_VALUE_2;
-
-	  if (off_link != 0)
-	    {
-	      /* FIXME - Should the DP do this or the CP ? */
-	      /* remove from routing table if already there */
-	    }
-	}
-
-      if ((val_lifetime == ~0) || (pref_lifetime == ~0))
-	{
-	  prefix->adv_valid_lifetime_in_secs = ~0;
-	  prefix->adv_pref_lifetime_in_secs = ~0;
-	  prefix->decrement_lifetime_flag = 0;
-	}
-      else
-	{
-	  prefix->adv_valid_lifetime_in_secs = val_lifetime;;
-	  prefix->adv_pref_lifetime_in_secs = pref_lifetime;
-	}
-
-      /* copy  remaining */
-      prefix->enabled = !(no_advertise != 0);
-      prefix->adv_on_link_flag = !((off_link != 0) || (no_onlink != 0));
-      prefix->adv_autonomous_flag = !(no_autoconfig != 0);
-
-    restart:
-      /* restart */
-      /* fill in the expiration times  */
-      prefix->valid_lifetime_expires =
-	now + prefix->adv_valid_lifetime_in_secs;
-      prefix->pref_lifetime_expires = now + prefix->adv_pref_lifetime_in_secs;
-
-      radv_info->initial_adverts_sent = radv_info->initial_adverts_count - 1;
-      radv_info->next_multicast_time = vlib_time_now (vm);
-      radv_info->last_multicast_time = vlib_time_now (vm);
-      radv_info->last_radv_time = 0;
-    }
-  return (error);
-}
-
-clib_error_t *
-ip6_neighbor_cmd (vlib_main_t * vm, unformat_input_t * main_input,
-		  vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  clib_error_t *error = 0;
-  u8 is_no = 0;
-  u8 suppress = 0, managed = 0, other = 0;
-  u8 suppress_ll_option = 0, send_unicast = 0, cease = 0;
-  u8 use_lifetime = 0;
-  u32 sw_if_index, ra_lifetime = 0, ra_initial_count =
-    0, ra_initial_interval = 0;
-  u32 ra_max_interval = 0, ra_min_interval = 0;
-
-  unformat_input_t _line_input, *line_input = &_line_input;
-  vnet_sw_interface_t *sw_if0;
-
-  int add_radv_info = 1;
-  __attribute__ ((unused)) ip6_radv_t *radv_info = 0;
-  ip6_address_t ip6_addr;
-  u32 addr_len;
-
-
-  /* Get a line of input. */
-  if (!unformat_user (main_input, unformat_line_input, line_input))
-    return 0;
-
-  /* get basic radv info for this interface */
-  if (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-
-      if (unformat_user (line_input,
-			 unformat_vnet_sw_interface, vnm, &sw_if_index))
-	{
-	  u32 ri;
-	  ethernet_interface_t *eth_if0 = 0;
-
-	  sw_if0 = vnet_get_sup_sw_interface (vnm, sw_if_index);
-	  if (sw_if0->type == VNET_SW_INTERFACE_TYPE_HARDWARE)
-	    eth_if0 =
-	      ethernet_get_interface (&ethernet_main, sw_if0->hw_if_index);
-
-	  if (!eth_if0)
-	    {
-	      error =
-		clib_error_return (0, "Interface must be of ethernet type");
-	      goto done;
-	    }
-
-	  /* look up the radv_t  information for this interface */
-	  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index,
-				   sw_if_index, ~0);
-
-	  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
-
-	  if (ri != ~0)
-	    {
-	      radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
-	    }
-	  else
-	    {
-	      error = clib_error_return (0, "unknown interface %U'",
-					 format_unformat_error, line_input);
-	      goto done;
-	    }
-	}
-      else
-	{
-	  error = clib_error_return (0, "invalid interface name %U'",
-				     format_unformat_error, line_input);
-	  goto done;
-	}
-    }
-
-  /* get the rest of the command */
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "no"))
-	is_no = 1;
-      else if (unformat (line_input, "prefix %U/%d",
-			 unformat_ip6_address, &ip6_addr, &addr_len))
-	{
-	  add_radv_info = 0;
-	  break;
-	}
-      else if (unformat (line_input, "ra-managed-config-flag"))
-	{
-	  managed = 1;
-	  break;
-	}
-      else if (unformat (line_input, "ra-other-config-flag"))
-	{
-	  other = 1;
-	  break;
-	}
-      else if (unformat (line_input, "ra-suppress") ||
-	       unformat (line_input, "ra-surpress"))
-	{
-	  suppress = 1;
-	  break;
-	}
-      else if (unformat (line_input, "ra-suppress-link-layer") ||
-	       unformat (line_input, "ra-surpress-link-layer"))
-	{
-	  suppress_ll_option = 1;
-	  break;
-	}
-      else if (unformat (line_input, "ra-send-unicast"))
-	{
-	  send_unicast = 1;
-	  break;
-	}
-      else if (unformat (line_input, "ra-lifetime"))
-	{
-	  if (!unformat (line_input, "%d", &ra_lifetime))
-	    return (error = unformat_parse_error (line_input));
-	  use_lifetime = 1;
-	  break;
-	}
-      else if (unformat (line_input, "ra-initial"))
-	{
-	  if (!unformat
-	      (line_input, "%d %d", &ra_initial_count, &ra_initial_interval))
-	    return (error = unformat_parse_error (line_input));
-	  break;
-	}
-      else if (unformat (line_input, "ra-interval"))
-	{
-	  if (!unformat (line_input, "%d", &ra_max_interval))
-	    return (error = unformat_parse_error (line_input));
-
-	  if (!unformat (line_input, "%d", &ra_min_interval))
-	    ra_min_interval = 0;
-	  break;
-	}
-      else if (unformat (line_input, "ra-cease"))
-	{
-	  cease = 1;
-	  break;
-	}
-      else
-	return (unformat_parse_error (line_input));
-    }
-
-  if (add_radv_info)
-    {
-      ip6_neighbor_ra_config (vm, sw_if_index,
-			      suppress, managed, other,
-			      suppress_ll_option, send_unicast, cease,
-			      use_lifetime, ra_lifetime,
-			      ra_initial_count, ra_initial_interval,
-			      ra_max_interval, ra_min_interval, is_no);
-    }
-  else
-    {
-      u32 valid_lifetime_in_secs = 0;
-      u32 pref_lifetime_in_secs = 0;
-      u8 use_prefix_default_values = 0;
-      u8 no_advertise = 0;
-      u8 off_link = 0;
-      u8 no_autoconfig = 0;
-      u8 no_onlink = 0;
-
-      /* get the rest of the command */
-      while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-	{
-	  if (unformat (line_input, "default"))
-	    {
-	      use_prefix_default_values = 1;
-	      break;
-	    }
-	  else if (unformat (line_input, "infinite"))
-	    {
-	      valid_lifetime_in_secs = ~0;
-	      pref_lifetime_in_secs = ~0;
-	      break;
-	    }
-	  else if (unformat (line_input, "%d %d", &valid_lifetime_in_secs,
-			     &pref_lifetime_in_secs))
-	    break;
-	  else
-	    break;
-	}
-
-
-      /* get the rest of the command */
-      while (!use_prefix_default_values &&
-	     unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-	{
-	  if (unformat (line_input, "no-advertise"))
-	    no_advertise = 1;
-	  else if (unformat (line_input, "off-link"))
-	    off_link = 1;
-	  else if (unformat (line_input, "no-autoconfig"))
-	    no_autoconfig = 1;
-	  else if (unformat (line_input, "no-onlink"))
-	    no_onlink = 1;
-	  else
-	    return (unformat_parse_error (line_input));
-	}
-
-      ip6_neighbor_ra_prefix (vm, sw_if_index,
-			      &ip6_addr, addr_len,
-			      use_prefix_default_values,
-			      valid_lifetime_in_secs,
-			      pref_lifetime_in_secs,
-			      no_advertise,
-			      off_link, no_autoconfig, no_onlink, is_no);
-    }
-
-  unformat_free (line_input);
-
-done:
-  return error;
-}
-
-static void
-ip6_print_addrs (vlib_main_t * vm, u32 * addrs)
-{
-  ip_lookup_main_t *lm = &ip6_main.lookup_main;
-  u32 i;
-
-  for (i = 0; i < vec_len (addrs); i++)
-    {
-      ip_interface_address_t *a =
-	pool_elt_at_index (lm->if_address_pool, addrs[i]);
-      ip6_address_t *address = ip_interface_address_get_address (lm, a);
-
-      vlib_cli_output (vm, "\t\t%U/%d",
-		       format_ip6_address, address, a->address_length);
-    }
-}
-
-static clib_error_t *
-show_ip6_interface_cmd (vlib_main_t * vm,
-			unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  clib_error_t *error = 0;
-  u32 sw_if_index;
-
-  sw_if_index = ~0;
-
-  if (unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      u32 ri;
-
-      /* look up the radv_t  information for this interface */
-      vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index,
-			       sw_if_index, ~0);
-
-      ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
-
-      if (ri != ~0)
-	{
-	  ip_lookup_main_t *lm = &ip6_main.lookup_main;
-	  ip6_radv_t *radv_info;
-	  radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
-
-	  vlib_cli_output (vm, "%U is admin %s\n",
-			   format_vnet_sw_interface_name, vnm,
-			   vnet_get_sw_interface (vnm, sw_if_index),
-			   (vnet_sw_interface_is_admin_up (vnm, sw_if_index) ?
-			    "up" : "down"));
-
-	  u32 ai;
-	  u32 *link_scope = 0, *global_scope = 0;
-	  u32 *local_scope = 0, *unknown_scope = 0;
-	  ip_interface_address_t *a;
-
-	  vec_validate_init_empty (lm->if_address_pool_index_by_sw_if_index,
-				   sw_if_index, ~0);
-	  ai = lm->if_address_pool_index_by_sw_if_index[sw_if_index];
-
-	  while (ai != (u32) ~ 0)
-	    {
-	      a = pool_elt_at_index (lm->if_address_pool, ai);
-	      ip6_address_t *address =
-		ip_interface_address_get_address (lm, a);
-
-	      if (ip6_address_is_link_local_unicast (address))
-		vec_add1 (link_scope, ai);
-	      else if (ip6_address_is_global_unicast (address))
-		vec_add1 (global_scope, ai);
-	      else if (ip6_address_is_local_unicast (address))
-		vec_add1 (local_scope, ai);
-	      else
-		vec_add1 (unknown_scope, ai);
-
-	      ai = a->next_this_sw_interface;
-	    }
-
-	  if (vec_len (link_scope))
-	    {
-	      vlib_cli_output (vm, "\tLink-local address(es):\n");
-	      ip6_print_addrs (vm, link_scope);
-	      vec_free (link_scope);
-	    }
-
-	  if (vec_len (local_scope))
-	    {
-	      vlib_cli_output (vm, "\tLocal unicast address(es):\n");
-	      ip6_print_addrs (vm, local_scope);
-	      vec_free (local_scope);
-	    }
-
-	  if (vec_len (global_scope))
-	    {
-	      vlib_cli_output (vm, "\tGlobal unicast address(es):\n");
-	      ip6_print_addrs (vm, global_scope);
-	      vec_free (global_scope);
-	    }
-
-	  if (vec_len (unknown_scope))
-	    {
-	      vlib_cli_output (vm, "\tOther-scope address(es):\n");
-	      ip6_print_addrs (vm, unknown_scope);
-	      vec_free (unknown_scope);
-	    }
-
-	  vlib_cli_output (vm, "\tJoined group address(es):\n");
-	  ip6_mldp_group_t *m;
-	  /* *INDENT-OFF* */
-	  pool_foreach (m, radv_info->mldp_group_pool,
-          ({
-            vlib_cli_output (vm, "\t\t%U\n", format_ip6_address,
-                             &m->mcast_address);
-          }));
-	  /* *INDENT-ON* */
-
-	  vlib_cli_output (vm, "\tAdvertised Prefixes:\n");
-	  ip6_radv_prefix_t *p;
-	  /* *INDENT-OFF* */
-	  pool_foreach (p, radv_info->adv_prefixes_pool,
-          ({
-            vlib_cli_output (vm, "\t\tprefix %U,  length %d\n",
-                             format_ip6_address, &p->prefix, p->prefix_len);
-          }));
-	  /* *INDENT-ON* */
-
-	  vlib_cli_output (vm, "\tMTU is %d\n", radv_info->adv_link_mtu);
-	  vlib_cli_output (vm, "\tICMP error messages are unlimited\n");
-	  vlib_cli_output (vm, "\tICMP redirects are disabled\n");
-	  vlib_cli_output (vm, "\tICMP unreachables are not sent\n");
-	  vlib_cli_output (vm, "\tND DAD is disabled\n");
-	  //vlib_cli_output (vm, "\tND reachable time is %d milliseconds\n",);
-	  vlib_cli_output (vm, "\tND advertised reachable time is %d\n",
-			   radv_info->adv_neighbor_reachable_time_in_msec);
-	  vlib_cli_output (vm,
-			   "\tND advertised retransmit interval is %d (msec)\n",
-			   radv_info->
-			   adv_time_in_msec_between_retransmitted_neighbor_solicitations);
-
-	  u32 ra_interval = radv_info->max_radv_interval;
-	  u32 ra_interval_min = radv_info->min_radv_interval;
-	  vlib_cli_output (vm,
-			   "\tND router advertisements are sent every %d seconds (min interval is %d)\n",
-			   ra_interval, ra_interval_min);
-	  vlib_cli_output (vm,
-			   "\tND router advertisements live for %d seconds\n",
-			   radv_info->adv_router_lifetime_in_sec);
-	  vlib_cli_output (vm,
-			   "\tHosts %s stateless autoconfig for addresses\n",
-			   (radv_info->adv_managed_flag) ? "use" :
-			   " don't use");
-	  vlib_cli_output (vm, "\tND router advertisements sent %d\n",
-			   radv_info->n_advertisements_sent);
-	  vlib_cli_output (vm, "\tND router solicitations received %d\n",
-			   radv_info->n_solicitations_rcvd);
-	  vlib_cli_output (vm, "\tND router solicitations dropped %d\n",
-			   radv_info->n_solicitations_dropped);
-	}
-      else
-	{
-	  error = clib_error_return (0, "IPv6 not enabled on interface",
-				     format_unformat_error, input);
-
-	}
-    }
-  return error;
-}
-
-/*?
- * This command is used to display various IPv6 attributes on a given
- * interface.
- *
- * @cliexpar
- * Example of how to display IPv6 settings:
- * @cliexstart{show ip6 interface GigabitEthernet2/0/0}
- * GigabitEthernet2/0/0 is admin up
- *         Link-local address(es):
- *                 fe80::ab8/64
- *         Joined group address(es):
- *                 ff02::1
- *                 ff02::2
- *                 ff02::16
- *                 ff02::1:ff00:ab8
- *         Advertised Prefixes:
- *                 prefix fe80::fe:28ff:fe9c:75b3,  length 64
- *         MTU is 1500
- *         ICMP error messages are unlimited
- *         ICMP redirects are disabled
- *         ICMP unreachables are not sent
- *         ND DAD is disabled
- *         ND advertised reachable time is 0
- *         ND advertised retransmit interval is 0 (msec)
- *         ND router advertisements are sent every 200 seconds (min interval is 150)
- *         ND router advertisements live for 600 seconds
- *         Hosts use stateless autoconfig for addresses
- *         ND router advertisements sent 19336
- *         ND router solicitations received 0
- *         ND router solicitations dropped 0
- * @cliexend
- * Example of output if IPv6 is not enabled on the interface:
- * @cliexstart{show ip6 interface GigabitEthernet2/0/0}
- * show ip6 interface: IPv6 not enabled on interface
- * @cliexend
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_ip6_interface_command, static) =
-{
-  .path = "show ip6 interface",
-  .function = show_ip6_interface_cmd,
-  .short_help = "show ip6 interface <interface>",
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-disable_ip6_interface (vlib_main_t * vm, u32 sw_if_index)
-{
-  clib_error_t *error = 0;
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  u32 ri;
-
-  /* look up the radv_t  information for this interface */
-  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index, sw_if_index,
-			   ~0);
-  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
-
-  /* if not created - do nothing */
-  if (ri != ~0)
-    {
-      vnet_main_t *vnm = vnet_get_main ();
-      ip6_radv_t *radv_info;
-
-      radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
-
-      /* check radv_info ref count for other ip6 addresses on this interface */
-      if (radv_info->ref_count == 0)
-	{
-	  /* essentially "disables" ipv6 on this interface */
-	  error = ip6_add_del_interface_address (vm, sw_if_index,
-						 &radv_info->
-						 link_local_address,
-						 radv_info->
-						 link_local_prefix_len,
-						 1 /* is_del */ );
-
-	  ip6_neighbor_sw_interface_add_del (vnm, sw_if_index,
-					     0 /* is_add */ );
-	}
-    }
-  return error;
-}
-
-int
-ip6_interface_enabled (vlib_main_t * vm, u32 sw_if_index)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  u32 ri = ~0;
-
-  /* look up the radv_t  information for this interface */
-  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index, sw_if_index,
-			   ~0);
-
-  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
-
-  return ri != ~0;
-}
-
-clib_error_t *
-enable_ip6_interface (vlib_main_t * vm, u32 sw_if_index)
-{
-  clib_error_t *error = 0;
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  u32 ri;
-  int is_add = 1;
-
-  /* look up the radv_t  information for this interface */
-  vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index, sw_if_index,
-			   ~0);
-
-  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
-
-  /* if not created yet */
-  if (ri == ~0)
-    {
-      vnet_main_t *vnm = vnet_get_main ();
-      vnet_sw_interface_t *sw_if0;
-
-      sw_if0 = vnet_get_sup_sw_interface (vnm, sw_if_index);
-      if (sw_if0->type == VNET_SW_INTERFACE_TYPE_HARDWARE)
-	{
-	  ethernet_interface_t *eth_if0;
-
-	  eth_if0 =
-	    ethernet_get_interface (&ethernet_main, sw_if0->hw_if_index);
-	  if (eth_if0)
-	    {
-	      /* create radv_info. for this interface.  This holds all the info needed for router adverts */
-	      ri =
-		ip6_neighbor_sw_interface_add_del (vnm, sw_if_index, is_add);
-
-	      if (ri != ~0)
-		{
-		  ip6_radv_t *radv_info;
-		  ip6_address_t link_local_address;
-
-		  radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
-
-		  ip6_link_local_address_from_ethernet_mac_address
-		    (&link_local_address, eth_if0->address);
-
-		  sw_if0 = vnet_get_sw_interface (vnm, sw_if_index);
-		  if (sw_if0->type == VNET_SW_INTERFACE_TYPE_SUB)
-		    {
-		      /* make up  an interface id */
-		      md5_context_t m;
-		      u8 digest[16];
-
-		      link_local_address.as_u64[0] = radv_info->randomizer;
-
-		      md5_init (&m);
-		      md5_add (&m, &link_local_address, 16);
-		      md5_finish (&m, digest);
-
-		      clib_memcpy (&link_local_address, digest, 16);
-
-		      radv_info->randomizer = link_local_address.as_u64[0];
-
-		      link_local_address.as_u64[0] =
-			clib_host_to_net_u64 (0xFE80000000000000ULL);
-		      /* clear u bit */
-		      link_local_address.as_u8[8] &= 0xfd;
-		    }
-
-		  /* essentially "enables" ipv6 on this interface */
-		  error = ip6_add_del_interface_address (vm, sw_if_index,
-							 &link_local_address,
-							 128
-							 /* address width */ ,
-							 0 /* is_del */ );
-
-		  if (error)
-		    ip6_neighbor_sw_interface_add_del (vnm, sw_if_index,
-						       !is_add);
-		  else
-		    {
-		      radv_info->link_local_address = link_local_address;
-		      radv_info->link_local_prefix_len = 64;
-		    }
-		}
-	    }
-	}
-    }
-  return error;
-}
-
-static clib_error_t *
-enable_ip6_interface_cmd (vlib_main_t * vm,
-			  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index;
-
-  sw_if_index = ~0;
-
-  if (unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      enable_ip6_interface (vm, sw_if_index);
-    }
-  else
-    {
-      error = clib_error_return (0, "unknown interface\n'",
-				 format_unformat_error, input);
-
-    }
-  return error;
-}
-
-/*?
- * This command is used to enable IPv6 on a given interface.
- *
- * @cliexpar
- * Example of how enable IPv6 on a given interface:
- * @cliexcmd{enable ip6 interface GigabitEthernet2/0/0}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (enable_ip6_interface_command, static) =
-{
-  .path = "enable ip6 interface",
-  .function = enable_ip6_interface_cmd,
-  .short_help = "enable ip6 interface <interface>",
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-disable_ip6_interface_cmd (vlib_main_t * vm,
-			   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index;
-
-  sw_if_index = ~0;
-
-  if (unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = disable_ip6_interface (vm, sw_if_index);
-    }
-  else
-    {
-      error = clib_error_return (0, "unknown interface\n'",
-				 format_unformat_error, input);
-
-    }
-  return error;
-}
-
-/*?
- * This command is used to disable IPv6 on a given interface.
- *
- * @cliexpar
- * Example of how disable IPv6 on a given interface:
- * @cliexcmd{disable ip6 interface GigabitEthernet2/0/0}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (disable_ip6_interface_command, static) =
-{
-  .path = "disable ip6 interface",
-  .function = disable_ip6_interface_cmd,
-  .short_help = "disable ip6 interface <interface>",
-};
-/* *INDENT-ON* */
-
-/*?
- * This command is used to configure the neighbor discovery
- * parameters on a given interface. Use the '<em>show ip6 interface</em>'
- * command to display some of the current neighbor discovery parameters
- * on a given interface. This command has three formats:
- *
- *
- * <b>Format 1 - Router Advertisement Options:</b> (Only one can be entered in a single command)
- *
- * '<em><b>ip6 nd <interface> [no] [ra-managed-config-flag] | [ra-other-config-flag] | [ra-suppress] | [ra-suppress-link-layer] | [ra-send-unicast] | [ra-lifetime <lifetime>] | [ra-initial <cnt> <interval>] | [ra-interval <max-interval> [<min-interval>]] | [ra-cease]</b></em>'
- *
- * Where:
- *
- * <em>[no] ra-managed-config-flag</em> - Advertises in ICMPv6
- * router-advertisement messages to use stateful address
- * auto-configuration to obtain address information (sets the M-bit).
- * Default is the M-bit is not set and the '<em>no</em>' option
- * returns it to this default state.
- *
- * <em>[no] ra-other-config-flag</em> - Indicates in ICMPv6
- * router-advertisement messages that hosts use stateful auto
- * configuration to obtain nonaddress related information (sets
- * the O-bit). Default is the O-bit is not set and the '<em>no</em>'
- * option returns it to this default state.
- *
- * <em>[no] ra-suppress</em> - Disables sending ICMPv6 router-advertisement
- * messages. The '<em>no</em>' option implies to enable sending ICMPv6
- * router-advertisement messages.
- *
- * <em>[no] ra-suppress-link-layer</em> - Indicates not to include the
- * optional source link-layer address in the ICMPv6 router-advertisement
- * messages. Default is to include the optional source link-layer address
- * and the '<em>no</em>' option returns it to this default state.
- *
- * <em>[no] ra-send-unicast</em> - Use the source address of the
- * router-solicitation message if availiable. The default is to use
- * multicast address of all nodes, and the '<em>no</em>' option returns
- * it to this default state.
- *
- * <em>[no] ra-lifetime <lifetime></em> - Advertises the lifetime of a
- * default router in ICMPv6 router-advertisement messages. The range is
- * from 0 to 9000 seconds. '<em><lifetime></em>' must be greater than
- * '<em><max-interval></em>'. The default value is 600 seconds and the
- * '<em>no</em>' option returns it to this default value.
- *
- * <em>[no] ra-initial <cnt> <interval></em> - Number of initial ICMPv6
- * router-advertisement messages sent and the interval between each
- * message. Range for count is 1 - 3 and default is 3. Range for interval
- * is 1 to 16 seconds, and default is 16 seconds. The '<em>no</em>' option
- * returns both to their default value.
- *
- * <em>[no] ra-interval <max-interval> [<min-interval>]</em> - Configures the
- * interval between sending ICMPv6 router-advertisement messages. The
- * range for max-interval is from 4 to 200 seconds. min-interval can not
- * be more than 75% of max-interval. If not set, min-interval will be
- * set to 75% of max-interval. The range for min-interval is from 3 to
- * 150 seconds.  The '<em>no</em>' option returns both to their default
- * value.
- *
- * <em>[no] ra-cease</em> - Cease sending ICMPv6 router-advertisement messages.
- * The '<em>no</em>' options implies to start (or restart) sending
- * ICMPv6 router-advertisement messages.
- *
- *
- * <b>Format 2 - Prefix Options:</b>
- *
- * '<em><b>ip6 nd <interface> [no] prefix <ip6-address>/<width> [<valid-lifetime> <pref-lifetime> | infinite] [no-advertise] [off-link] [no-autoconfig] [no-onlink]</b></em>'
- *
- * Where:
- *
- * <em>no</em> - All additional flags are ignored and the prefix is deleted.
- *
- * <em><valid-lifetime> <pref-lifetime></em> - '<em><valid-lifetime></em>' is the
- * length of time in seconds during what the prefix is valid for the purpose of
- * on-link determination. Range is 7203 to 2592000 seconds and default is 2592000
- * seconds (30 days). '<em><pref-lifetime></em>' is the prefered-lifetime and is the
- * length of time in seconds during what addresses generated from the prefix remain
- * preferred. Range is 0 to 604800 seconds and default is 604800 seconds (7 days).
- *
- * <em>infinite</em> - Both '<em><valid-lifetime></em>' and '<em><<pref-lifetime></em>'
- * are inifinte, no timeout.
- *
- * <em>no-advertise</em> - Do not send full router address in prefix
- * advertisement. Default is to advertise (i.e. - This flag is off by default).
- *
- * <em>off-link</em> - Prefix is off-link, clear L-bit in packet. Default is on-link
- * (i.e. - This flag is off and L-bit in packet is set by default and this prefix can
- * be used for on-link determination). '<em>no-onlink</em>' also controls the L-bit.
- *
- * <em>no-autoconfig</em> - Do not use prefix for autoconfiguration, clear A-bit in packet.
- * Default is autoconfig (i.e. - This flag is off and A-bit in packet is set by default.
- *
- * <em>no-onlink</em> - Do not use prefix for onlink determination, clear L-bit in packet.
- * Default is on-link (i.e. - This flag is off and L-bit in packet is set by default and
- * this prefix can be used for on-link determination). '<em>off-link</em>' also controls
- * the L-bit.
- *
- *
- * <b>Format 3: - Default of Prefix:</b>
- *
- * '<em><b>ip6 nd <interface> [no] prefix <ip6-address>/<width> default</b></em>'
- *
- * When a new prefix is added (or existing one is being overwritten) <em>default</em>
- * uses default values for the prefix. If <em>no</em> is used, the <em>default</em>
- * is ignored and the prefix is deleted.
- *
- *
- * @cliexpar
- * Example of how set a router advertisement option:
- * @cliexcmd{ip6 nd GigabitEthernet2/0/0 ra-interval 100 20}
- * Example of how to add a prefix:
- * @cliexcmd{ip6 nd GigabitEthernet2/0/0 prefix fe80::fe:28ff:fe9c:75b3/64 infinite no-advertise}
- * Example of how to delete a prefix:
- * @cliexcmd{ip6 nd GigabitEthernet2/0/0 no prefix fe80::fe:28ff:fe9c:75b3/64}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ip6_nd_command, static) =
-{
-  .path = "ip6 nd",
-  .short_help = "ip6 nd <interface> ...",
-  .function = ip6_neighbor_cmd,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-set_ip6_link_local_address (vlib_main_t * vm,
-			    u32 sw_if_index,
-			    ip6_address_t * address, u8 address_length)
-{
-  clib_error_t *error = 0;
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  u32 ri;
-  ip6_radv_t *radv_info;
-  vnet_main_t *vnm = vnet_get_main ();
-
-  if (!ip6_address_is_link_local_unicast (address))
-    {
-      vnm->api_errno = VNET_API_ERROR_ADDRESS_NOT_LINK_LOCAL;
-      return (error = clib_error_return (0, "address not link-local",
-					 format_unformat_error));
-    }
-
-  /* call enable ipv6  */
-  enable_ip6_interface (vm, sw_if_index);
-
-  ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
-
-  if (ri != ~0)
-    {
-      radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
-
-      /* save if link local address (overwrite default) */
-
-      /* delete the old one */
-      error = ip6_add_del_interface_address (vm, sw_if_index,
-					     &radv_info->link_local_address,
-					     radv_info->link_local_prefix_len
-					     /* address width */ ,
-					     1 /* is_del */ );
-
-      if (!error)
-	{
-	  /* add the new one */
-	  error = ip6_add_del_interface_address (vm, sw_if_index,
-						 address, address_length
-						 /* address width */ ,
-						 0 /* is_del */ );
-
-	  if (!error)
-	    {
-	      radv_info->link_local_address = *address;
-	      radv_info->link_local_prefix_len = address_length;
-	    }
-	}
-    }
-  else
-    {
-      vnm->api_errno = VNET_API_ERROR_IP6_NOT_ENABLED;
-      error = clib_error_return (0, "ip6 not enabled for interface",
-				 format_unformat_error);
-    }
-  return error;
-}
-
-clib_error_t *
-set_ip6_link_local_address_cmd (vlib_main_t * vm,
-				unformat_input_t * input,
-				vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index;
-  ip6_address_t ip6_addr;
-  u32 addr_len = 0;
-
-  if (unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      /* get the rest of the command */
-      while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-	{
-	  if (unformat (input, "%U/%d",
-			unformat_ip6_address, &ip6_addr, &addr_len))
-	    break;
-	  else
-	    return (unformat_parse_error (input));
-	}
-    }
-  error = set_ip6_link_local_address (vm, sw_if_index, &ip6_addr, addr_len);
-  return error;
-}
-
-/*?
- * This command is used to assign an IPv6 Link-local address to an
- * interface. This command will enable IPv6 on an interface if it
- * is not already enabled. Use the '<em>show ip6 interface</em>' command
- * to display the assigned Link-local address.
- *
- * @cliexpar
- * Example of how to assign an IPv6 Link-local address to an interface:
- * @cliexcmd{set ip6 link-local address GigabitEthernet2/0/0 FE80::AB8/64}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_ip6_link_local_address_command, static) =
-{
-  .path = "set ip6 link-local address",
-  .short_help = "set ip6 link-local address <interface> <ip6-address>/<width>",
-  .function = set_ip6_link_local_address_cmd,
-};
-/* *INDENT-ON* */
-
-/* callback when an interface address is added or deleted */
-static void
-ip6_neighbor_add_del_interface_address (ip6_main_t * im,
-					uword opaque,
-					u32 sw_if_index,
-					ip6_address_t * address,
-					u32 address_length,
-					u32 if_address_index, u32 is_delete)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  u32 ri;
-  vlib_main_t *vm = vnm->vlib_main;
-  ip6_radv_t *radv_info;
-  ip6_address_t a;
-  ip6_mldp_group_t *mcast_group_info;
-
-  /* create solicited node multicast address for this interface adddress */
-  ip6_set_solicited_node_multicast_address (&a, 0);
-
-  a.as_u8[0xd] = address->as_u8[0xd];
-  a.as_u8[0xe] = address->as_u8[0xe];
-  a.as_u8[0xf] = address->as_u8[0xf];
-
-  if (!is_delete)
-    {
-      /* try to  create radv_info - does nothing if ipv6 already enabled */
-      enable_ip6_interface (vm, sw_if_index);
-
-      /* look up the radv_t  information for this interface */
-      vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index,
-			       sw_if_index, ~0);
-      ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
-      if (ri != ~0)
-	{
-	  /* get radv_info */
-	  radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
-
-	  /* add address */
-	  if (!ip6_address_is_link_local_unicast (address))
-	    radv_info->ref_count++;
-
-	  /* lookup  prefix info for this  address on this interface */
-	  uword *p = mhash_get (&radv_info->address_to_mldp_index, &a);
-	  mcast_group_info =
-	    p ? pool_elt_at_index (radv_info->mldp_group_pool, p[0]) : 0;
-
-	  /* add -solicted node multicast address  */
-	  if (!mcast_group_info)
-	    {
-	      /* add */
-	      u32 mi;
-	      pool_get (radv_info->mldp_group_pool, mcast_group_info);
-
-	      mi = mcast_group_info - radv_info->mldp_group_pool;
-	      mhash_set (&radv_info->address_to_mldp_index, &a, mi,
-			 /* old_value */ 0);
-
-	      mcast_group_info->type = 4;
-	      mcast_group_info->mcast_source_address_pool = 0;
-	      mcast_group_info->num_sources = 0;
-	      clib_memcpy (&mcast_group_info->mcast_address, &a,
-			   sizeof (ip6_address_t));
-	    }
-	}
-    }
-  else
-    {
-
-      /* delete */
-      /* look up the radv_t  information for this interface */
-      vec_validate_init_empty (nm->if_radv_pool_index_by_sw_if_index,
-			       sw_if_index, ~0);
-      ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
-      if (ri != ~0)
-	{
-	  /* get radv_info */
-	  radv_info = pool_elt_at_index (nm->if_radv_pool, ri);
-
-	  /* lookup  prefix info for this  address on this interface */
-	  uword *p = mhash_get (&radv_info->address_to_mldp_index, &a);
-	  mcast_group_info =
-	    p ? pool_elt_at_index (radv_info->mldp_group_pool, p[0]) : 0;
-
-	  if (mcast_group_info)
-	    {
-	      mhash_unset (&radv_info->address_to_mldp_index, &a,
-			   /* old_value */ 0);
-	      pool_put (radv_info->mldp_group_pool, mcast_group_info);
-	    }
-
-	  /* if interface up send MLDP "report" */
-	  radv_info->all_routers_mcast = 0;
-
-	  /* add address */
-	  if (!ip6_address_is_link_local_unicast (address))
-	    radv_info->ref_count--;
-	}
-    }
-}
-
-clib_error_t *
-ip6_set_neighbor_limit (u32 neighbor_limit)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-
-  nm->limit_neighbor_cache_size = neighbor_limit;
-  return 0;
-}
-
-static clib_error_t *
-ip6_neighbor_init (vlib_main_t * vm)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  ip6_main_t *im = &ip6_main;
-
-  mhash_init (&nm->neighbor_index_by_key,
-	      /* value size */ sizeof (uword),
-	      /* key size */ sizeof (ip6_neighbor_key_t));
-
-  icmp6_register_type (vm, ICMP6_neighbor_solicitation,
-		       ip6_icmp_neighbor_solicitation_node.index);
-  icmp6_register_type (vm, ICMP6_neighbor_advertisement,
-		       ip6_icmp_neighbor_advertisement_node.index);
-  icmp6_register_type (vm, ICMP6_router_solicitation,
-		       ip6_icmp_router_solicitation_node.index);
-  icmp6_register_type (vm, ICMP6_router_advertisement,
-		       ip6_icmp_router_advertisement_node.index);
-
-  /* handler node for ip6 neighbor discovery events and timers */
-  vlib_register_node (vm, &ip6_icmp_neighbor_discovery_event_node);
-
-  /* add call backs */
-  ip6_add_del_interface_address_callback_t cb;
-  memset (&cb, 0x0, sizeof (ip6_add_del_interface_address_callback_t));
-
-  /* when an interface address changes... */
-  cb.function = ip6_neighbor_add_del_interface_address;
-  cb.function_opaque = 0;
-  vec_add1 (im->add_del_interface_address_callbacks, cb);
-
-  mhash_init (&nm->pending_resolutions_by_address,
-	      /* value size */ sizeof (uword),
-	      /* key size */ sizeof (ip6_address_t));
-
-  mhash_init (&nm->mac_changes_by_address,
-	      /* value size */ sizeof (uword),
-	      /* key size */ sizeof (ip6_address_t));
-
-  /* default, configurable */
-  nm->limit_neighbor_cache_size = 50000;
-
-#if 0
-  /* $$$$ Hack fix for today */
-  vec_validate_init_empty
-    (im->discover_neighbor_next_index_by_hw_if_index, 32, 0 /* drop */ );
-#endif
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ip6_neighbor_init);
-
-
-void
-vnet_register_ip6_neighbor_resolution_event (vnet_main_t * vnm,
-					     void *address_arg,
-					     uword node_index,
-					     uword type_opaque, uword data)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  ip6_address_t *address = address_arg;
-  uword *p;
-  pending_resolution_t *pr;
-
-  pool_get (nm->pending_resolutions, pr);
-
-  pr->next_index = ~0;
-  pr->node_index = node_index;
-  pr->type_opaque = type_opaque;
-  pr->data = data;
-
-  p = mhash_get (&nm->pending_resolutions_by_address, address);
-  if (p)
-    {
-      /* Insert new resolution at the head of the list */
-      pr->next_index = p[0];
-      mhash_unset (&nm->pending_resolutions_by_address, address, 0);
-    }
-
-  mhash_set (&nm->pending_resolutions_by_address, address,
-	     pr - nm->pending_resolutions, 0 /* old value */ );
-}
-
-int
-vnet_add_del_ip6_nd_change_event (vnet_main_t * vnm,
-				  void *data_callback,
-				  u32 pid,
-				  void *address_arg,
-				  uword node_index,
-				  uword type_opaque, uword data, int is_add)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  ip6_address_t *address = address_arg;
-  uword *p;
-  pending_resolution_t *mc;
-  void (*fp) (u32, u8 *) = data_callback;
-
-  if (is_add)
-    {
-      pool_get (nm->mac_changes, mc);
-
-      mc->next_index = ~0;
-      mc->node_index = node_index;
-      mc->type_opaque = type_opaque;
-      mc->data = data;
-      mc->data_callback = data_callback;
-      mc->pid = pid;
-
-      p = mhash_get (&nm->mac_changes_by_address, address);
-      if (p)
-	{
-	  /* Insert new resolution at the head of the list */
-	  mc->next_index = p[0];
-	  mhash_unset (&nm->mac_changes_by_address, address, 0);
-	}
-
-      mhash_set (&nm->mac_changes_by_address, address,
-		 mc - nm->mac_changes, 0);
-      return 0;
-    }
-  else
-    {
-      u32 index;
-      pending_resolution_t *mc_last = 0;
-
-      p = mhash_get (&nm->mac_changes_by_address, address);
-      if (p == 0)
-	return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-      index = p[0];
-
-      while (index != (u32) ~ 0)
-	{
-	  mc = pool_elt_at_index (nm->mac_changes, index);
-	  if (mc->node_index == node_index &&
-	      mc->type_opaque == type_opaque && mc->pid == pid)
-	    {
-	      /* Clients may need to clean up pool entries, too */
-	      if (fp)
-		(*fp) (mc->data, 0 /* no new mac addrs */ );
-	      if (index == p[0])
-		{
-		  mhash_unset (&nm->mac_changes_by_address, address, 0);
-		  if (mc->next_index != ~0)
-		    mhash_set (&nm->mac_changes_by_address, address,
-			       mc->next_index, 0);
-		  pool_put (nm->mac_changes, mc);
-		  return 0;
-		}
-	      else
-		{
-		  ASSERT (mc_last);
-		  mc_last->next_index = mc->next_index;
-		  pool_put (nm->mac_changes, mc);
-		  return 0;
-		}
-	    }
-	  mc_last = mc;
-	  index = mc->next_index;
-	}
-
-      return VNET_API_ERROR_NO_SUCH_ENTRY;
-    }
-}
-
-int
-vnet_ip6_nd_term (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_buffer_t * p0,
-		  ethernet_header_t * eth,
-		  ip6_header_t * ip, u32 sw_if_index, u16 bd_index, u8 shg)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  icmp6_neighbor_solicitation_or_advertisement_header_t *ndh;
-  pending_resolution_t *mc;
-  uword *p;
-
-  ndh = ip6_next_header (ip);
-  if (ndh->icmp.type != ICMP6_neighbor_solicitation &&
-      ndh->icmp.type != ICMP6_neighbor_advertisement)
-    return 0;
-
-  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&
-		     (p0->flags & VLIB_BUFFER_IS_TRACED)))
-    {
-      u8 *t0 = vlib_add_trace (vm, node, p0,
-			       sizeof (icmp6_input_trace_t));
-      clib_memcpy (t0, ip, sizeof (icmp6_input_trace_t));
-    }
-
-  /* Check if anyone want ND events for L2 BDs */
-  p = mhash_get (&nm->mac_changes_by_address, &ip6a_zero);
-  if (p && shg == 0 &&		/* Only SHG 0 interface which is more likely local */
-      !ip6_address_is_link_local_unicast (&ip->src_address))
-    {
-      u32 next_index = p[0];
-      while (next_index != (u32) ~ 0)
-	{
-	  int (*fp) (u32, u8 *, u32, ip6_address_t *);
-	  int rv = 1;
-	  mc = pool_elt_at_index (nm->mac_changes, next_index);
-	  fp = mc->data_callback;
-	  /* Call the callback, return 1 to suppress dup events */
-	  if (fp)
-	    rv = (*fp) (mc->data,
-			eth->src_address, sw_if_index, &ip->src_address);
-	  /* Signal the resolver process */
-	  if (rv == 0)
-	    vlib_process_signal_event (vm, mc->node_index,
-				       mc->type_opaque, mc->data);
-	  next_index = mc->next_index;
-	}
-    }
-
-  /* Check if MAC entry exsist for solicited target IP */
-  if (ndh->icmp.type == ICMP6_neighbor_solicitation)
-    {
-      icmp6_neighbor_discovery_ethernet_link_layer_address_option_t *opt;
-      l2_bridge_domain_t *bd_config;
-      u8 *macp;
-
-      opt = (void *) (ndh + 1);
-      if ((opt->header.type !=
-	   ICMP6_NEIGHBOR_DISCOVERY_OPTION_source_link_layer_address) ||
-	  (opt->header.n_data_u64s != 1))
-	return 0;		/* source link layer address option not present */
-
-      bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index);
-      macp =
-	(u8 *) hash_get_mem (bd_config->mac_by_ip6, &ndh->target_address);
-      if (macp)
-	{			/* found ip-mac entry, generate eighbor advertisement response */
-	  int bogus_length;
-	  vlib_node_runtime_t *error_node =
-	    vlib_node_get_runtime (vm, ip6_icmp_input_node.index);
-	  ip->dst_address = ip->src_address;
-	  ip->src_address = ndh->target_address;
-	  ip->hop_limit = 255;
-	  opt->header.type =
-	    ICMP6_NEIGHBOR_DISCOVERY_OPTION_target_link_layer_address;
-	  clib_memcpy (opt->ethernet_address, macp, 6);
-	  ndh->icmp.type = ICMP6_neighbor_advertisement;
-	  ndh->advertisement_flags = clib_host_to_net_u32
-	    (ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_SOLICITED |
-	     ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_OVERRIDE);
-	  ndh->icmp.checksum = 0;
-	  ndh->icmp.checksum =
-	    ip6_tcp_udp_icmp_compute_checksum (vm, p0, ip, &bogus_length);
-	  clib_memcpy (eth->dst_address, eth->src_address, 6);
-	  clib_memcpy (eth->src_address, macp, 6);
-	  vlib_error_count (vm, error_node->node_index,
-			    ICMP6_ERROR_NEIGHBOR_ADVERTISEMENTS_TX, 1);
-	  return 1;
-	}
-    }
-
-  return 0;
-
-}
-
-void
-ethernet_ndp_change_mac (u32 sw_if_index)
-{
-  ip6_neighbor_main_t *nm = &ip6_neighbor_main;
-  ip6_neighbor_t *n;
-
-  /* *INDENT-OFF* */
-  pool_foreach (n, nm->neighbor_pool,
-  ({
-    if (n->key.sw_if_index == sw_if_index)
-      {
-	adj_nbr_walk_nh6 (sw_if_index,
-			  &n->key.ip6_address,
-			  ip6_nd_mk_complete_walk, n);
-      }
-  }));
-  /* *INDENT-ON* */
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip6_neighbor.h b/vnet/vnet/ip/ip6_neighbor.h
deleted file mode 100644
index b2c9f48a..00000000
--- a/vnet/vnet/ip/ip6_neighbor.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *
- * ip6_neighboor.h: ip6 neighbor structures
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_ip6_neighbor_h
-#define included_ip6_neighbor_h
-
-#include <vnet/fib/fib_types.h>
-
-typedef struct
-{
-  ip6_address_t ip6_address;
-  u32 sw_if_index;
-  u32 pad;
-} ip6_neighbor_key_t;
-
-typedef struct
-{
-  ip6_neighbor_key_t key;
-  u8 link_layer_address[8];
-  u16 flags;
-#define IP6_NEIGHBOR_FLAG_STATIC (1 << 0)
-#define IP6_NEIGHBOR_FLAG_DYNAMIC  (2 << 0)
-  u64 cpu_time_last_updated;
-  fib_node_index_t fib_entry_index;
-} ip6_neighbor_t;
-
-ip6_neighbor_t *ip6_neighbors_entries (u32 sw_if_index);
-
-#endif /* included_ip6_neighbor_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip6_packet.h b/vnet/vnet/ip/ip6_packet.h
deleted file mode 100644
index 1e551c8b..00000000
--- a/vnet/vnet/ip/ip6_packet.h
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip6/packet.h: ip6 packet format
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_ip6_packet_h
-#define included_ip6_packet_h
-
-#include <vnet/ip/tcp_packet.h>
-#include <vnet/ip/ip4_packet.h>
-
-typedef union
-{
-  u8 as_u8[16];
-  u16 as_u16[8];
-  u32 as_u32[4];
-  u64 as_u64[2];
-  uword as_uword[16 / sizeof (uword)];
-}
-ip6_address_t;
-
-/* Packed so that the mhash key doesn't include uninitialized pad bytes */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  /* IP address must be first for ip_interface_address_get_address() to work */
-  ip6_address_t ip6_addr;
-  u32 fib_index;
-}) ip6_address_fib_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (union {
-  struct {
-    u32 pad[3];
-    ip4_address_t ip4;
-  };
-  ip6_address_t ip6;
-  u8 as_u8[16];
-  u64 as_u64[2];
-}) ip46_address_t;
-/* *INDENT-ON* */
-#define ip46_address_is_ip4(ip46)	(((ip46)->pad[0] | (ip46)->pad[1] | (ip46)->pad[2]) == 0)
-#define ip46_address_mask_ip4(ip46)	((ip46)->pad[0] = (ip46)->pad[1] = (ip46)->pad[2] = 0)
-#define ip46_address_set_ip4(ip46, ip)	(ip46_address_mask_ip4(ip46), (ip46)->ip4 = (ip)[0])
-#define ip46_address_reset(ip46)	((ip46)->as_u64[0] = (ip46)->as_u64[1] = 0)
-#define ip46_address_cmp(ip46_1, ip46_2) (memcmp(ip46_1, ip46_2, sizeof(*ip46_1)))
-#define ip46_address_is_zero(ip46)	(((ip46)->as_u64[0] == 0) && ((ip46)->as_u64[1] == 0))
-
-always_inline void
-ip46_from_addr_buf (u32 is_ipv6, u8 * buf, ip46_address_t * ip)
-{
-  if (is_ipv6)
-    ip->ip6 = *((ip6_address_t *) buf);
-  else
-    ip46_address_set_ip4 (ip, (ip4_address_t *) buf);
-}
-
-always_inline void
-ip6_addr_fib_init (ip6_address_fib_t * addr_fib, ip6_address_t * address,
-		   u32 fib_index)
-{
-  addr_fib->ip6_addr.as_u64[0] = address->as_u64[0];
-  addr_fib->ip6_addr.as_u64[1] = address->as_u64[1];
-  addr_fib->fib_index = fib_index;
-}
-
-/* Special addresses:
-   unspecified		::/128
-   loopback		::1/128
-   global unicast       2000::/3
-   unique local unicast fc00::/7
-   link local unicast	fe80::/10
-   multicast		ff00::/8
-   ietf reserved	everything else. */
-
-#define foreach_ip6_multicast_address_scope	\
-  _ (loopback, 0x1)				\
-  _ (link_local, 0x2)				\
-  _ (admin_local, 0x4)				\
-  _ (site_local, 0x5)				\
-  _ (organization_local, 0x8)			\
-  _ (global, 0xe)
-
-#define foreach_ip6_multicast_link_local_group_id	\
-  _ (all_hosts, 0x1)					\
-  _ (all_routers, 0x2)					\
-  _ (rip_routers, 0x9)					\
-  _ (eigrp_routers, 0xa)				\
-  _ (pim_routers, 0xd)                            \
- _ (mldv2_routers, 0x16)
-
-typedef enum
-{
-#define _(f,n) IP6_MULTICAST_SCOPE_##f = n,
-  foreach_ip6_multicast_address_scope
-#undef _
-} ip6_multicast_address_scope_t;
-
-typedef enum
-{
-#define _(f,n) IP6_MULTICAST_GROUP_ID_##f = n,
-  foreach_ip6_multicast_link_local_group_id
-#undef _
-} ip6_multicast_link_local_group_id_t;
-
-always_inline uword
-ip6_address_is_multicast (ip6_address_t * a)
-{
-  return a->as_u8[0] == 0xff;
-}
-
-always_inline uword
-ip46_address_is_multicast (ip46_address_t * a)
-{
-  return ip46_address_is_ip4 (a) ? ip4_address_is_multicast (&a->ip4) :
-    ip6_address_is_multicast (&a->ip6);
-}
-
-always_inline void
-ip6_set_reserved_multicast_address (ip6_address_t * a,
-				    ip6_multicast_address_scope_t scope,
-				    u16 id)
-{
-  a->as_u64[0] = a->as_u64[1] = 0;
-  a->as_u16[0] = clib_host_to_net_u16 (0xff00 | scope);
-  a->as_u16[7] = clib_host_to_net_u16 (id);
-}
-
-always_inline void
-ip6_set_solicited_node_multicast_address (ip6_address_t * a, u32 id)
-{
-  /* 0xff02::1:ffXX:XXXX. */
-  a->as_u64[0] = a->as_u64[1] = 0;
-  a->as_u16[0] = clib_host_to_net_u16 (0xff02);
-  a->as_u8[11] = 1;
-  ASSERT ((id >> 24) == 0);
-  id |= 0xff << 24;
-  a->as_u32[3] = clib_host_to_net_u32 (id);
-}
-
-always_inline void
-ip6_link_local_address_from_ethernet_address (ip6_address_t * a,
-					      u8 * ethernet_address)
-{
-  a->as_u64[0] = a->as_u64[1] = 0;
-  a->as_u16[0] = clib_host_to_net_u16 (0xfe80);
-  /* Always set locally administered bit (6). */
-  a->as_u8[0x8] = ethernet_address[0] | (1 << 6);
-  a->as_u8[0x9] = ethernet_address[1];
-  a->as_u8[0xa] = ethernet_address[2];
-  a->as_u8[0xb] = 0xff;
-  a->as_u8[0xc] = 0xfe;
-  a->as_u8[0xd] = ethernet_address[3];
-  a->as_u8[0xe] = ethernet_address[4];
-  a->as_u8[0xf] = ethernet_address[5];
-}
-
-always_inline void
-ip6_multicast_ethernet_address (u8 * ethernet_address, u32 group_id)
-{
-  ethernet_address[0] = 0x33;
-  ethernet_address[1] = 0x33;
-  ethernet_address[2] = ((group_id >> 24) & 0xff);
-  ethernet_address[3] = ((group_id >> 16) & 0xff);
-  ethernet_address[4] = ((group_id >> 8) & 0xff);
-  ethernet_address[5] = ((group_id >> 0) & 0xff);
-}
-
-always_inline uword
-ip6_address_is_equal (ip6_address_t * a, ip6_address_t * b)
-{
-  int i;
-  for (i = 0; i < ARRAY_LEN (a->as_uword); i++)
-    if (a->as_uword[i] != b->as_uword[i])
-      return 0;
-  return 1;
-}
-
-always_inline uword
-ip6_address_is_equal_masked (ip6_address_t * a, ip6_address_t * b,
-			     ip6_address_t * mask)
-{
-  int i;
-  for (i = 0; i < ARRAY_LEN (a->as_uword); i++)
-    {
-      uword a_masked, b_masked;
-      a_masked = a->as_uword[i] & mask->as_uword[i];
-      b_masked = b->as_uword[i] & mask->as_uword[i];
-
-      if (a_masked != b_masked)
-	return 0;
-    }
-  return 1;
-}
-
-always_inline void
-ip6_address_mask (ip6_address_t * a, ip6_address_t * mask)
-{
-  int i;
-  for (i = 0; i < ARRAY_LEN (a->as_uword); i++)
-    a->as_uword[i] &= mask->as_uword[i];
-}
-
-always_inline void
-ip6_address_set_zero (ip6_address_t * a)
-{
-  int i;
-  for (i = 0; i < ARRAY_LEN (a->as_uword); i++)
-    a->as_uword[i] = 0;
-}
-
-always_inline void
-ip6_address_mask_from_width (ip6_address_t * a, u32 width)
-{
-  int i, byte, bit, bitnum;
-  ASSERT (width <= 128);
-  memset (a, 0, sizeof (a[0]));
-  for (i = 0; i < width; i++)
-    {
-      bitnum = (7 - (i & 7));
-      byte = i / 8;
-      bit = 1 << bitnum;
-      a->as_u8[byte] |= bit;
-    }
-}
-
-always_inline uword
-ip6_address_is_zero (ip6_address_t * a)
-{
-  int i;
-  for (i = 0; i < ARRAY_LEN (a->as_uword); i++)
-    if (a->as_uword[i] != 0)
-      return 0;
-  return 1;
-}
-
-/* Check for unspecified address ::0 */
-always_inline uword
-ip6_address_is_unspecified (ip6_address_t * a)
-{
-  return ip6_address_is_zero (a);
-}
-
-/* Check for loopback address ::1 */
-always_inline uword
-ip6_address_is_loopback (ip6_address_t * a)
-{
-  uword is_loopback;
-  u8 save = a->as_u8[15];
-  a->as_u8[15] = save ^ 1;
-  is_loopback = ip6_address_is_zero (a);
-  a->as_u8[15] = save;
-  return is_loopback;
-}
-
-/* Check for link local unicast fe80::/10. */
-always_inline uword
-ip6_address_is_link_local_unicast (ip6_address_t * a)
-{
-  return a->as_u8[0] == 0xfe && (a->as_u8[1] & 0xc0) == 0x80;
-}
-
-/* Check for unique local unicast fc00::/7. */
-always_inline uword
-ip6_address_is_local_unicast (ip6_address_t * a)
-{
-  return (a->as_u8[0] & 0xfe) == 0xfc;
-}
-
-/* Check for unique global unicast 2000::/3. */
-always_inline uword
-ip6_address_is_global_unicast (ip6_address_t * a)
-{
-  return (a->as_u8[0] & 0xe0) == 0x20;
-}
-
-/* Check for solicited node multicast 0xff02::1:ff00:0/104 */
-always_inline uword
-ip6_is_solicited_node_multicast_address (ip6_address_t * a)
-{
-  return (a->as_u32[0] == clib_host_to_net_u32 (0xff020000)
-	  && a->as_u32[1] == 0
-	  && a->as_u32[2] == clib_host_to_net_u32 (1)
-	  && a->as_u8[12] == 0xff);
-}
-
-typedef struct
-{
-  /* 4 bit version, 8 bit traffic class and 20 bit flow label. */
-  u32 ip_version_traffic_class_and_flow_label;
-
-  /* Total packet length not including this header (but including
-     any extension headers if present). */
-  u16 payload_length;
-
-  /* Protocol for next header. */
-  u8 protocol;
-
-  /* Hop limit decremented by router at each hop. */
-  u8 hop_limit;
-
-  /* Source and destination address. */
-  ip6_address_t src_address, dst_address;
-} ip6_header_t;
-
-always_inline void *
-ip6_next_header (ip6_header_t * i)
-{
-  return (void *) (i + 1);
-}
-
-always_inline void
-ip6_copy_header (ip6_header_t * dst, const ip6_header_t * src)
-{
-  dst->ip_version_traffic_class_and_flow_label =
-    src->ip_version_traffic_class_and_flow_label;
-  dst->payload_length = src->payload_length;
-  dst->protocol = src->protocol;
-  dst->hop_limit = src->hop_limit;
-
-  dst->src_address.as_uword[0] = src->src_address.as_uword[0];
-  dst->src_address.as_uword[1] = src->src_address.as_uword[1];
-  dst->dst_address.as_uword[0] = src->dst_address.as_uword[0];
-  dst->dst_address.as_uword[1] = src->dst_address.as_uword[1];
-}
-
-always_inline void
-ip6_tcp_reply_x1 (ip6_header_t * ip0, tcp_header_t * tcp0)
-{
-  {
-    ip6_address_t src0, dst0;
-
-    src0 = ip0->src_address;
-    dst0 = ip0->dst_address;
-    ip0->src_address = dst0;
-    ip0->dst_address = src0;
-  }
-
-  {
-    u16 src0, dst0;
-
-    src0 = tcp0->ports.src;
-    dst0 = tcp0->ports.dst;
-    tcp0->ports.src = dst0;
-    tcp0->ports.dst = src0;
-  }
-}
-
-always_inline void
-ip6_tcp_reply_x2 (ip6_header_t * ip0, ip6_header_t * ip1,
-		  tcp_header_t * tcp0, tcp_header_t * tcp1)
-{
-  {
-    ip6_address_t src0, dst0, src1, dst1;
-
-    src0 = ip0->src_address;
-    src1 = ip1->src_address;
-    dst0 = ip0->dst_address;
-    dst1 = ip1->dst_address;
-    ip0->src_address = dst0;
-    ip1->src_address = dst1;
-    ip0->dst_address = src0;
-    ip1->dst_address = src1;
-  }
-
-  {
-    u16 src0, dst0, src1, dst1;
-
-    src0 = tcp0->ports.src;
-    src1 = tcp1->ports.src;
-    dst0 = tcp0->ports.dst;
-    dst1 = tcp1->ports.dst;
-    tcp0->ports.src = dst0;
-    tcp1->ports.src = dst1;
-    tcp0->ports.dst = src0;
-    tcp1->ports.dst = src1;
-  }
-}
-
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u8 data;
-}) ip6_pad1_option_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u8 type;
-  u8 len;
-  u8 data[0];
-}) ip6_padN_option_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-#define IP6_MLDP_ALERT_TYPE  0x5
-  u8 type;
-  u8 len;
-  u16 value;
-}) ip6_router_alert_option_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u8 next_hdr;
-  /* Length of this header plus option data in 8 byte units. */
-  u8 n_data_u64s;
-}) ip6_ext_header_t;
-
-always_inline u8 ip6_ext_hdr(u8 nexthdr)
-{
-  /*
-   * find out if nexthdr is an extension header or a protocol
-   */
-  return   (nexthdr == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS) ||
-    (nexthdr == IP_PROTOCOL_IP6_NONXT) ||
-    (nexthdr == IP_PROTOCOL_IPV6_FRAGMENTATION)  ||
-    (nexthdr == IP_PROTOCOL_IPSEC_AH)      ||
-    (nexthdr == IP_PROTOCOL_IPV6_ROUTE)      ||
-    (nexthdr == IP_PROTOCOL_IP6_DESTINATION_OPTIONS);
-}
-
-#define ip6_ext_header_len(p)  (((p)->n_data_u64s+1) << 3)
-#define ip6_ext_authhdr_len(p) (((p)->n_data_u64s+2) << 2)
-
-always_inline void *
-ip6_ext_next_header (ip6_ext_header_t *ext_hdr )
-{ return (void *)((u8 *) ext_hdr + ip6_ext_header_len(ext_hdr)); }
-
-typedef CLIB_PACKED (struct {
-  u8 next_hdr;
-  /* Length of this header plus option data in 8 byte units. */
-  u8 n_data_u64s;
-  u8 data[0];
-}) ip6_hop_by_hop_ext_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u8 next_hdr;
-  u8 rsv;
-  u16 fragment_offset_and_more;
-  u32 identification;
-}) ip6_frag_hdr_t;
-/* *INDENT-ON* */
-
-#define ip6_frag_hdr_offset(hdr) \
-  (clib_net_to_host_u16((hdr)->fragment_offset_and_more) >> 3)
-
-#define ip6_frag_hdr_more(hdr) \
-  (clib_net_to_host_u16((hdr)->fragment_offset_and_more) & 0x1)
-
-#define ip6_frag_hdr_offset_and_more(offset, more) \
-  clib_host_to_net_u16(((offset) << 3) + !!(more))
-
-#endif /* included_ip6_packet_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip6_pg.c b/vnet/vnet/ip/ip6_pg.c
deleted file mode 100644
index ba1e4ad9..00000000
--- a/vnet/vnet/ip/ip6_pg.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip6_pg: IP v4 packet-generator interface
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-#include <vnet/pg/pg.h>
-
-static void
-ip6_pg_edit_function (pg_main_t * pg,
-		      pg_stream_t * s,
-		      pg_edit_group_t * g, u32 * packets, u32 n_packets)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  u32 ip_header_offset = g->start_byte_offset;
-
-  while (n_packets >= 2)
-    {
-      u32 pi0, pi1;
-      vlib_buffer_t *p0, *p1;
-      ip6_header_t *ip0, *ip1;
-
-      pi0 = packets[0];
-      pi1 = packets[1];
-      p0 = vlib_get_buffer (vm, pi0);
-      p1 = vlib_get_buffer (vm, pi1);
-      n_packets -= 2;
-      packets += 2;
-
-      ip0 = (void *) (p0->data + ip_header_offset);
-      ip1 = (void *) (p1->data + ip_header_offset);
-
-      ip0->payload_length =
-	clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, p0) -
-			      ip_header_offset - sizeof (ip0[0]));
-      ip1->payload_length =
-	clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, p1) -
-			      ip_header_offset - sizeof (ip1[0]));
-    }
-
-  while (n_packets >= 1)
-    {
-      u32 pi0;
-      vlib_buffer_t *p0;
-      ip6_header_t *ip0;
-
-      pi0 = packets[0];
-      p0 = vlib_get_buffer (vm, pi0);
-      n_packets -= 1;
-      packets += 1;
-
-      ip0 = (void *) (p0->data + ip_header_offset);
-
-      ip0->payload_length =
-	clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, p0) -
-			      ip_header_offset - sizeof (ip0[0]));
-    }
-}
-
-typedef struct
-{
-  pg_edit_t ip_version;
-  pg_edit_t traffic_class;
-  pg_edit_t flow_label;
-  pg_edit_t payload_length;
-  pg_edit_t protocol;
-  pg_edit_t hop_limit;
-  pg_edit_t src_address, dst_address;
-} pg_ip6_header_t;
-
-static inline void
-pg_ip6_header_init (pg_ip6_header_t * p)
-{
-  /* Initialize fields that are not bit fields in the IP header. */
-#define _(f) pg_edit_init (&p->f, ip6_header_t, f);
-  _(payload_length);
-  _(hop_limit);
-  _(protocol);
-  _(src_address);
-  _(dst_address);
-#undef _
-
-  /* Initialize bit fields. */
-  pg_edit_init_bitfield (&p->ip_version, ip6_header_t,
-			 ip_version_traffic_class_and_flow_label, 28, 4);
-  pg_edit_init_bitfield (&p->traffic_class, ip6_header_t,
-			 ip_version_traffic_class_and_flow_label, 20, 8);
-  pg_edit_init_bitfield (&p->flow_label, ip6_header_t,
-			 ip_version_traffic_class_and_flow_label, 0, 20);
-}
-
-uword
-unformat_pg_ip6_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t *s = va_arg (*args, pg_stream_t *);
-  pg_ip6_header_t *p;
-  u32 group_index;
-
-  p = pg_create_edit_group (s, sizeof (p[0]), sizeof (ip6_header_t),
-			    &group_index);
-  pg_ip6_header_init (p);
-
-  /* Defaults. */
-  pg_edit_set_fixed (&p->ip_version, 6);
-  pg_edit_set_fixed (&p->traffic_class, 0);
-  pg_edit_set_fixed (&p->flow_label, 0);
-  pg_edit_set_fixed (&p->hop_limit, 64);
-
-  p->payload_length.type = PG_EDIT_UNSPECIFIED;
-
-  if (!unformat (input, "%U: %U -> %U",
-		 unformat_pg_edit,
-		 unformat_ip_protocol, &p->protocol,
-		 unformat_pg_edit,
-		 unformat_ip6_address, &p->src_address,
-		 unformat_pg_edit, unformat_ip6_address, &p->dst_address))
-    goto error;
-
-  /* Parse options. */
-  while (1)
-    {
-      if (unformat (input, "version %U",
-		    unformat_pg_edit, unformat_pg_number, &p->ip_version))
-	;
-
-      else if (unformat (input, "traffic-class %U",
-			 unformat_pg_edit,
-			 unformat_pg_number, &p->traffic_class))
-	;
-
-      else if (unformat (input, "length %U",
-			 unformat_pg_edit,
-			 unformat_pg_number, &p->payload_length))
-	;
-
-      else if (unformat (input, "hop-limit %U",
-			 unformat_pg_edit, unformat_pg_number, &p->hop_limit))
-	;
-
-      /* Can't parse input: try next protocol level. */
-      else
-	break;
-    }
-
-  {
-    ip_main_t *im = &ip_main;
-    ip_protocol_t protocol;
-    ip_protocol_info_t *pi;
-
-    pi = 0;
-    if (p->protocol.type == PG_EDIT_FIXED)
-      {
-	protocol = pg_edit_get_value (&p->protocol, PG_EDIT_LO);
-	pi = ip_get_protocol_info (im, protocol);
-      }
-
-    if (pi && pi->unformat_pg_edit
-	&& unformat_user (input, pi->unformat_pg_edit, s))
-      ;
-
-    else if (!unformat_user (input, unformat_pg_payload, s))
-      goto error;
-
-    if (p->payload_length.type == PG_EDIT_UNSPECIFIED
-	&& s->min_packet_bytes == s->max_packet_bytes
-	&& group_index + 1 < vec_len (s->edit_groups))
-      {
-	pg_edit_set_fixed (&p->payload_length,
-			   pg_edit_group_n_bytes (s,
-						  group_index) -
-			   sizeof (ip6_header_t));
-      }
-
-    p = pg_get_edit_group (s, group_index);
-    if (p->payload_length.type == PG_EDIT_UNSPECIFIED)
-      {
-	pg_edit_group_t *g = pg_stream_get_group (s, group_index);
-	g->edit_function = ip6_pg_edit_function;
-      }
-
-    return 1;
-  }
-
-error:
-  /* Free up any edits we may have added. */
-  pg_free_edit_group (s);
-  return 0;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip_api.c b/vnet/vnet/ip/ip_api.c
deleted file mode 100644
index cd9b7397..00000000
--- a/vnet/vnet/ip/ip_api.c
+++ /dev/null
@@ -1,1196 +0,0 @@
-/*
- *------------------------------------------------------------------
- * ip_api.c - vnet ip api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ip/ip6_neighbor.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/fib_api.h>
-#include <vnet/dpo/drop_dpo.h>
-#include <vnet/dpo/receive_dpo.h>
-#include <vnet/dpo/lookup_dpo.h>
-#include <vnet/dpo/classify_dpo.h>
-#include <vnet/dpo/ip_null_dpo.h>
-#include <vnet/ethernet/arp_packet.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_ip_api_msg                                              \
-_(IP_FIB_DUMP, ip_fib_dump)                                             \
-_(IP_FIB_DETAILS, ip_fib_details)                                       \
-_(IP6_FIB_DUMP, ip6_fib_dump)                                           \
-_(IP6_FIB_DETAILS, ip6_fib_details)                                     \
-_(IP_NEIGHBOR_DUMP, ip_neighbor_dump)                                   \
-_(IP_NEIGHBOR_DETAILS, ip_neighbor_details)                             \
-_(IP_ADDRESS_DUMP, ip_address_dump)                                     \
-_(IP_DUMP, ip_dump)                                                     \
-_(IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del)                             \
-_(IP_ADD_DEL_ROUTE, ip_add_del_route)                                   \
-_(SET_IP_FLOW_HASH,set_ip_flow_hash)                                    \
-_(SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config)           \
-_(SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix)           \
-_(SW_INTERFACE_IP6_ENABLE_DISABLE, sw_interface_ip6_enable_disable )    \
-_(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS, 				\
-  sw_interface_ip6_set_link_local_address)
-
-extern void stats_dslock_with_hint (int hint, int tag);
-extern void stats_dsunlock (void);
-
-static void
-send_ip_neighbor_details (u8 is_ipv6,
-			  u8 is_static,
-			  u8 * mac_address,
-			  u8 * ip_address,
-			  unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_ip_neighbor_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP_NEIGHBOR_DETAILS);
-  mp->context = context;
-  mp->is_ipv6 = is_ipv6;
-  mp->is_static = is_static;
-  memcpy (mp->mac_address, mac_address, 6);
-  memcpy (mp->ip_address, ip_address, (is_ipv6) ? 16 : 4);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_ip_neighbor_details_t_handler (vl_api_ip_neighbor_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-vl_api_ip_neighbor_dump_t_handler (vl_api_ip_neighbor_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  if (mp->is_ipv6)
-    {
-      ip6_neighbor_t *n, *ns;
-
-      ns = ip6_neighbors_entries (sw_if_index);
-      /* *INDENT-OFF* */
-      vec_foreach (n, ns)
-      {
-        send_ip_neighbor_details
-          (mp->is_ipv6, ((n->flags & IP6_NEIGHBOR_FLAG_STATIC) ? 1 : 0),
-           (u8 *) n->link_layer_address,
-           (u8 *) & (n->key.ip6_address.as_u8),
-           q, mp->context);
-      }
-      /* *INDENT-ON* */
-      vec_free (ns);
-    }
-  else
-    {
-      ethernet_arp_ip4_entry_t *n, *ns;
-
-      ns = ip4_neighbor_entries (sw_if_index);
-      /* *INDENT-OFF* */
-      vec_foreach (n, ns)
-      {
-        send_ip_neighbor_details (mp->is_ipv6,
-          ((n->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC) ? 1 : 0),
-          (u8*) n->ethernet_address,
-          (u8*) & (n->ip4_address.as_u8),
-          q, mp->context);
-      }
-      /* *INDENT-ON* */
-      vec_free (ns);
-    }
-}
-
-
-void
-copy_fib_next_hop (fib_route_path_encode_t * api_rpath, void *fp_arg)
-{
-  int is_ip4;
-  vl_api_fib_path_t *fp = (vl_api_fib_path_t *) fp_arg;
-
-  if (api_rpath->rpath.frp_proto == FIB_PROTOCOL_IP4)
-    fp->afi = IP46_TYPE_IP4;
-  else if (api_rpath->rpath.frp_proto == FIB_PROTOCOL_IP6)
-    fp->afi = IP46_TYPE_IP6;
-  else
-    {
-      is_ip4 = ip46_address_is_ip4 (&api_rpath->rpath.frp_addr);
-      if (is_ip4)
-	fp->afi = IP46_TYPE_IP4;
-      else
-	fp->afi = IP46_TYPE_IP6;
-    }
-  if (fp->afi == IP46_TYPE_IP4)
-    memcpy (fp->next_hop, &api_rpath->rpath.frp_addr.ip4,
-	    sizeof (api_rpath->rpath.frp_addr.ip4));
-  else
-    memcpy (fp->next_hop, &api_rpath->rpath.frp_addr.ip6,
-	    sizeof (api_rpath->rpath.frp_addr.ip6));
-}
-
-static void
-vl_api_ip_fib_details_t_handler (vl_api_ip_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-vl_api_ip_fib_details_t_endian (vl_api_ip_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-vl_api_ip_fib_details_t_print (vl_api_ip_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-send_ip_fib_details (vpe_api_main_t * am,
-		     unix_shared_memory_queue_t * q,
-		     u32 table_id, fib_prefix_t * pfx,
-		     fib_route_path_encode_t * api_rpaths, u32 context)
-{
-  vl_api_ip_fib_details_t *mp;
-  fib_route_path_encode_t *api_rpath;
-  vl_api_fib_path_t *fp;
-  int path_count;
-
-  path_count = vec_len (api_rpaths);
-  mp = vl_msg_api_alloc (sizeof (*mp) + path_count * sizeof (*fp));
-  if (!mp)
-    return;
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP_FIB_DETAILS);
-  mp->context = context;
-
-  mp->table_id = htonl (table_id);
-  mp->address_length = pfx->fp_len;
-  memcpy (mp->address, &pfx->fp_addr.ip4, sizeof (pfx->fp_addr.ip4));
-
-  mp->count = htonl (path_count);
-  fp = mp->path;
-  vec_foreach (api_rpath, api_rpaths)
-  {
-    memset (fp, 0, sizeof (*fp));
-    switch (api_rpath->dpo.dpoi_type)
-      {
-      case DPO_RECEIVE:
-	fp->is_local = true;
-	break;
-      case DPO_DROP:
-	fp->is_drop = true;
-	break;
-      case DPO_IP_NULL:
-	switch (api_rpath->dpo.dpoi_index)
-	  {
-	  case IP_NULL_ACTION_NONE:
-	    fp->is_drop = true;
-	    break;
-	  case IP_NULL_ACTION_SEND_ICMP_UNREACH:
-	    fp->is_unreach = true;
-	    break;
-	  case IP_NULL_ACTION_SEND_ICMP_PROHIBIT:
-	    fp->is_prohibit = true;
-	    break;
-	  default:
-	    break;
-	  }
-	break;
-      default:
-	break;
-      }
-    fp->weight = htonl (api_rpath->rpath.frp_weight);
-    fp->sw_if_index = htonl (api_rpath->rpath.frp_sw_if_index);
-    copy_fib_next_hop (api_rpath, fp);
-    fp++;
-  }
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_ip_fib_dump_t_handler (vl_api_ip_fib_dump_t * mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  unix_shared_memory_queue_t *q;
-  ip4_main_t *im = &ip4_main;
-  fib_table_t *fib_table;
-  fib_node_index_t lfei, *lfeip, *lfeis = NULL;
-  mpls_label_t key;
-  fib_prefix_t pfx;
-  u32 fib_index;
-  fib_route_path_encode_t *api_rpaths;
-  int i;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  /* *INDENT-OFF* */
-  pool_foreach (fib_table, im->fibs,
-  ({
-    for (i = 0; i < ARRAY_LEN (fib_table->v4.fib_entry_by_dst_address); i++)
-      {
-        hash_foreach(key, lfei, fib_table->v4.fib_entry_by_dst_address[i],
-        ({
-          vec_add1(lfeis, lfei);
-        }));
-      }
-  }));
-  /* *INDENT-ON* */
-
-  vec_sort_with_function (lfeis, fib_entry_cmp_for_sort);
-
-  vec_foreach (lfeip, lfeis)
-  {
-    fib_entry_get_prefix (*lfeip, &pfx);
-    fib_index = fib_entry_get_fib_index (*lfeip);
-    fib_table = fib_table_get (fib_index, pfx.fp_proto);
-    api_rpaths = NULL;
-    fib_entry_encode (*lfeip, &api_rpaths);
-    send_ip_fib_details (am, q,
-			 fib_table->ft_table_id, &pfx, api_rpaths,
-			 mp->context);
-    vec_free (api_rpaths);
-  }
-
-  vec_free (lfeis);
-}
-
-static void
-vl_api_ip6_fib_details_t_handler (vl_api_ip6_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-vl_api_ip6_fib_details_t_endian (vl_api_ip6_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-vl_api_ip6_fib_details_t_print (vl_api_ip6_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-send_ip6_fib_details (vpe_api_main_t * am,
-		      unix_shared_memory_queue_t * q,
-		      u32 table_id, fib_prefix_t * pfx,
-		      fib_route_path_encode_t * api_rpaths, u32 context)
-{
-  vl_api_ip6_fib_details_t *mp;
-  fib_route_path_encode_t *api_rpath;
-  vl_api_fib_path_t *fp;
-  int path_count;
-
-  path_count = vec_len (api_rpaths);
-  mp = vl_msg_api_alloc (sizeof (*mp) + path_count * sizeof (*fp));
-  if (!mp)
-    return;
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP6_FIB_DETAILS);
-  mp->context = context;
-
-  mp->table_id = htonl (table_id);
-  mp->address_length = pfx->fp_len;
-  memcpy (mp->address, &pfx->fp_addr.ip6, sizeof (pfx->fp_addr.ip6));
-
-  mp->count = htonl (path_count);
-  fp = mp->path;
-  vec_foreach (api_rpath, api_rpaths)
-  {
-    memset (fp, 0, sizeof (*fp));
-    switch (api_rpath->dpo.dpoi_type)
-      {
-      case DPO_RECEIVE:
-	fp->is_local = true;
-	break;
-      case DPO_DROP:
-	fp->is_drop = true;
-	break;
-      case DPO_IP_NULL:
-	switch (api_rpath->dpo.dpoi_index)
-	  {
-	  case IP_NULL_DPO_ACTION_NUM + IP_NULL_ACTION_NONE:
-	    fp->is_drop = true;
-	    break;
-	  case IP_NULL_DPO_ACTION_NUM + IP_NULL_ACTION_SEND_ICMP_UNREACH:
-	    fp->is_unreach = true;
-	    break;
-	  case IP_NULL_DPO_ACTION_NUM + IP_NULL_ACTION_SEND_ICMP_PROHIBIT:
-	    fp->is_prohibit = true;
-	    break;
-	  default:
-	    break;
-	  }
-	break;
-      default:
-	break;
-      }
-    fp->weight = htonl (api_rpath->rpath.frp_weight);
-    fp->sw_if_index = htonl (api_rpath->rpath.frp_sw_if_index);
-    copy_fib_next_hop (api_rpath, fp);
-    fp++;
-  }
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-typedef struct apt_ip6_fib_show_ctx_t_
-{
-  u32 fib_index;
-  fib_node_index_t *entries;
-} api_ip6_fib_show_ctx_t;
-
-static void
-api_ip6_fib_table_put_entries (clib_bihash_kv_24_8_t * kvp, void *arg)
-{
-  api_ip6_fib_show_ctx_t *ctx = arg;
-
-  if ((kvp->key[2] >> 32) == ctx->fib_index)
-    {
-      vec_add1 (ctx->entries, kvp->value);
-    }
-}
-
-static void
-api_ip6_fib_table_get_all (unix_shared_memory_queue_t * q,
-			   vl_api_ip6_fib_dump_t * mp,
-			   fib_table_t * fib_table)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  ip6_main_t *im6 = &ip6_main;
-  ip6_fib_t *fib = &fib_table->v6;
-  fib_node_index_t *fib_entry_index;
-  api_ip6_fib_show_ctx_t ctx = {
-    .fib_index = fib->index,.entries = NULL,
-  };
-  fib_route_path_encode_t *api_rpaths;
-  fib_prefix_t pfx;
-
-  BV (clib_bihash_foreach_key_value_pair)
-    ((BVT (clib_bihash) *) & im6->ip6_table[IP6_FIB_TABLE_NON_FWDING].
-     ip6_hash, api_ip6_fib_table_put_entries, &ctx);
-
-  vec_sort_with_function (ctx.entries, fib_entry_cmp_for_sort);
-
-  vec_foreach (fib_entry_index, ctx.entries)
-  {
-    fib_entry_get_prefix (*fib_entry_index, &pfx);
-    api_rpaths = NULL;
-    fib_entry_encode (*fib_entry_index, &api_rpaths);
-    send_ip6_fib_details (am, q,
-			  fib_table->ft_table_id,
-			  &pfx, api_rpaths, mp->context);
-    vec_free (api_rpaths);
-  }
-
-  vec_free (ctx.entries);
-}
-
-static void
-vl_api_ip6_fib_dump_t_handler (vl_api_ip6_fib_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  ip6_main_t *im6 = &ip6_main;
-  fib_table_t *fib_table;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  /* *INDENT-OFF* */
-  pool_foreach (fib_table, im6->fibs,
-  ({
-    api_ip6_fib_table_get_all(q, mp, fib_table);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_ip_neighbor_add_del_t_handler (vl_api_ip_neighbor_add_del_t * mp,
-				      vlib_main_t * vm)
-{
-  vl_api_ip_neighbor_add_del_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  int rv = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  stats_dslock_with_hint (1 /* release hint */ , 7 /* tag */ );
-
-  /*
-   * there's no validation here of the ND/ARP entry being added.
-   * The expectation is that the FIB will ensure that nothing bad
-   * will come of adding bogus entries.
-   */
-  if (mp->is_ipv6)
-    {
-      if (mp->is_add)
-	rv = vnet_set_ip6_ethernet_neighbor
-	  (vm, ntohl (mp->sw_if_index),
-	   (ip6_address_t *) (mp->dst_address),
-	   mp->mac_address, sizeof (mp->mac_address), mp->is_static);
-      else
-	rv = vnet_unset_ip6_ethernet_neighbor
-	  (vm, ntohl (mp->sw_if_index),
-	   (ip6_address_t *) (mp->dst_address),
-	   mp->mac_address, sizeof (mp->mac_address));
-    }
-  else
-    {
-      ethernet_arp_ip4_over_ethernet_address_t a;
-
-      clib_memcpy (&a.ethernet, mp->mac_address, 6);
-      clib_memcpy (&a.ip4, mp->dst_address, 4);
-
-      if (mp->is_add)
-	rv = vnet_arp_set_ip4_over_ethernet (vnm, ntohl (mp->sw_if_index),
-					     &a, mp->is_static);
-      else
-	rv =
-	  vnet_arp_unset_ip4_over_ethernet (vnm, ntohl (mp->sw_if_index), &a);
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  stats_dsunlock ();
-  REPLY_MACRO (VL_API_IP_NEIGHBOR_ADD_DEL_REPLY);
-}
-
-int
-add_del_route_t_handler (u8 is_multipath,
-			 u8 is_add,
-			 u8 is_drop,
-			 u8 is_unreach,
-			 u8 is_prohibit,
-			 u8 is_local,
-			 u8 is_classify,
-			 u32 classify_table_index,
-			 u8 is_resolve_host,
-			 u8 is_resolve_attached,
-			 u32 fib_index,
-			 const fib_prefix_t * prefix,
-			 u8 next_hop_proto_is_ip4,
-			 const ip46_address_t * next_hop,
-			 u32 next_hop_sw_if_index,
-			 u8 next_hop_fib_index,
-			 u32 next_hop_weight,
-			 mpls_label_t next_hop_via_label,
-			 mpls_label_t * next_hop_out_label_stack)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  fib_route_path_flags_t path_flags = FIB_ROUTE_PATH_FLAG_NONE;
-  fib_route_path_t path = {
-    .frp_proto = (next_hop_proto_is_ip4 ?
-		  FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6),
-    .frp_addr = (NULL == next_hop ? zero_addr : *next_hop),
-    .frp_sw_if_index = next_hop_sw_if_index,
-    .frp_fib_index = next_hop_fib_index,
-    .frp_weight = next_hop_weight,
-    .frp_label_stack = next_hop_out_label_stack,
-  };
-  fib_route_path_t *paths = NULL;
-
-  if (MPLS_LABEL_INVALID != next_hop_via_label)
-    {
-      path.frp_proto = FIB_PROTOCOL_MPLS;
-      path.frp_local_label = next_hop_via_label;
-    }
-  if (is_resolve_host)
-    path_flags |= FIB_ROUTE_PATH_RESOLVE_VIA_HOST;
-  if (is_resolve_attached)
-    path_flags |= FIB_ROUTE_PATH_RESOLVE_VIA_ATTACHED;
-
-  path.frp_flags = path_flags;
-
-  if (is_multipath)
-    {
-      stats_dslock_with_hint (1 /* release hint */ , 10 /* tag */ );
-
-
-      vec_add1 (paths, path);
-
-      if (is_add)
-	fib_table_entry_path_add2 (fib_index,
-				   prefix,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE, paths);
-      else
-	fib_table_entry_path_remove2 (fib_index,
-				      prefix, FIB_SOURCE_API, paths);
-
-      vec_free (paths);
-      stats_dsunlock ();
-      return 0;
-    }
-
-  stats_dslock_with_hint (1 /* release hint */ , 2 /* tag */ );
-
-  if (is_drop || is_local || is_classify || is_unreach || is_prohibit)
-    {
-      /*
-       * special route types that link directly to the adj
-       */
-      if (is_add)
-	{
-	  dpo_id_t dpo = DPO_INVALID;
-	  dpo_proto_t dproto;
-
-	  dproto = fib_proto_to_dpo (prefix->fp_proto);
-
-	  if (is_drop)
-	    ip_null_dpo_add_and_lock (dproto, IP_NULL_ACTION_NONE, &dpo);
-	  else if (is_local)
-	    receive_dpo_add_or_lock (dproto, ~0, NULL, &dpo);
-	  else if (is_unreach)
-	    ip_null_dpo_add_and_lock (dproto,
-				      IP_NULL_ACTION_SEND_ICMP_UNREACH, &dpo);
-	  else if (is_prohibit)
-	    ip_null_dpo_add_and_lock (dproto,
-				      IP_NULL_ACTION_SEND_ICMP_PROHIBIT,
-				      &dpo);
-	  else if (is_classify)
-	    {
-	      if (pool_is_free_index (cm->tables,
-				      ntohl (classify_table_index)))
-		{
-		  stats_dsunlock ();
-		  return VNET_API_ERROR_NO_SUCH_TABLE;
-		}
-
-	      dpo_set (&dpo, DPO_CLASSIFY, dproto,
-		       classify_dpo_create (dproto,
-					    ntohl (classify_table_index)));
-	    }
-	  else
-	    {
-	      stats_dsunlock ();
-	      return VNET_API_ERROR_NO_SUCH_TABLE;
-	    }
-
-	  fib_table_entry_special_dpo_update (fib_index,
-					      prefix,
-					      FIB_SOURCE_API,
-					      FIB_ENTRY_FLAG_EXCLUSIVE, &dpo);
-	  dpo_reset (&dpo);
-	}
-      else
-	{
-	  fib_table_entry_special_remove (fib_index, prefix, FIB_SOURCE_API);
-	}
-    }
-  else
-    {
-      if (is_add)
-	{
-	  vec_add1 (paths, path);
-	  fib_table_entry_update (fib_index,
-				  prefix,
-				  FIB_SOURCE_API, FIB_ENTRY_FLAG_NONE, paths);
-	  vec_free (paths);
-	}
-      else
-	{
-	  fib_table_entry_delete (fib_index, prefix, FIB_SOURCE_API);
-	}
-    }
-
-  stats_dsunlock ();
-  return (0);
-}
-
-int
-add_del_route_check (fib_protocol_t table_proto,
-		     u32 table_id,
-		     u32 next_hop_sw_if_index,
-		     fib_protocol_t next_hop_table_proto,
-		     u32 next_hop_table_id,
-		     u8 create_missing_tables,
-		     u32 * fib_index, u32 * next_hop_fib_index)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-
-  *fib_index = fib_table_find (table_proto, ntohl (table_id));
-  if (~0 == *fib_index)
-    {
-      if (create_missing_tables)
-	{
-	  *fib_index = fib_table_find_or_create_and_lock (table_proto,
-							  ntohl (table_id));
-	}
-      else
-	{
-	  /* No such VRF, and we weren't asked to create one */
-	  return VNET_API_ERROR_NO_SUCH_FIB;
-	}
-    }
-
-  if (~0 != ntohl (next_hop_sw_if_index))
-    {
-      if (pool_is_free_index (vnm->interface_main.sw_interfaces,
-			      ntohl (next_hop_sw_if_index)))
-	{
-	  return VNET_API_ERROR_NO_MATCHING_INTERFACE;
-	}
-    }
-  else
-    {
-      *next_hop_fib_index = fib_table_find (next_hop_table_proto,
-					    ntohl (next_hop_table_id));
-
-      if (~0 == *next_hop_fib_index)
-	{
-	  if (create_missing_tables)
-	    {
-	      *next_hop_fib_index =
-		fib_table_find_or_create_and_lock (next_hop_table_proto,
-						   ntohl (next_hop_table_id));
-	    }
-	  else
-	    {
-	      /* No such VRF, and we weren't asked to create one */
-	      return VNET_API_ERROR_NO_SUCH_FIB;
-	    }
-	}
-    }
-
-  return (0);
-}
-
-static int
-ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp)
-{
-  u32 fib_index, next_hop_fib_index;
-  mpls_label_t *label_stack = NULL;
-  int rv, ii, n_labels;;
-
-  rv = add_del_route_check (FIB_PROTOCOL_IP4,
-			    mp->table_id,
-			    mp->next_hop_sw_if_index,
-			    FIB_PROTOCOL_IP4,
-			    mp->next_hop_table_id,
-			    mp->create_vrf_if_needed,
-			    &fib_index, &next_hop_fib_index);
-
-  if (0 != rv)
-    return (rv);
-
-  fib_prefix_t pfx = {
-    .fp_len = mp->dst_address_length,
-    .fp_proto = FIB_PROTOCOL_IP4,
-  };
-  clib_memcpy (&pfx.fp_addr.ip4, mp->dst_address, sizeof (pfx.fp_addr.ip4));
-
-  ip46_address_t nh;
-  memset (&nh, 0, sizeof (nh));
-  memcpy (&nh.ip4, mp->next_hop_address, sizeof (nh.ip4));
-
-  n_labels = mp->next_hop_n_out_labels;
-  if (n_labels == 0)
-    ;
-  else if (1 == n_labels)
-    vec_add1 (label_stack, ntohl (mp->next_hop_out_label_stack[0]));
-  else
-    {
-      vec_validate (label_stack, n_labels - 1);
-      for (ii = 0; ii < n_labels; ii++)
-	label_stack[ii] = ntohl (mp->next_hop_out_label_stack[ii]);
-    }
-
-  return (add_del_route_t_handler (mp->is_multipath,
-				   mp->is_add,
-				   mp->is_drop,
-				   mp->is_unreach,
-				   mp->is_prohibit,
-				   mp->is_local,
-				   mp->is_classify,
-				   mp->classify_table_index,
-				   mp->is_resolve_host,
-				   mp->is_resolve_attached,
-				   fib_index, &pfx, 1,
-				   &nh,
-				   ntohl (mp->next_hop_sw_if_index),
-				   next_hop_fib_index,
-				   mp->next_hop_weight,
-				   ntohl (mp->next_hop_via_label),
-				   label_stack));
-}
-
-static int
-ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp)
-{
-  u32 fib_index, next_hop_fib_index;
-  mpls_label_t *label_stack = NULL;
-  int rv, ii, n_labels;;
-
-  rv = add_del_route_check (FIB_PROTOCOL_IP6,
-			    mp->table_id,
-			    mp->next_hop_sw_if_index,
-			    FIB_PROTOCOL_IP6,
-			    mp->next_hop_table_id,
-			    mp->create_vrf_if_needed,
-			    &fib_index, &next_hop_fib_index);
-
-  if (0 != rv)
-    return (rv);
-
-  fib_prefix_t pfx = {
-    .fp_len = mp->dst_address_length,
-    .fp_proto = FIB_PROTOCOL_IP6,
-  };
-  clib_memcpy (&pfx.fp_addr.ip6, mp->dst_address, sizeof (pfx.fp_addr.ip6));
-
-  ip46_address_t nh;
-  memset (&nh, 0, sizeof (nh));
-  memcpy (&nh.ip6, mp->next_hop_address, sizeof (nh.ip6));
-
-  n_labels = mp->next_hop_n_out_labels;
-  if (n_labels == 0)
-    ;
-  else if (1 == n_labels)
-    vec_add1 (label_stack, ntohl (mp->next_hop_out_label_stack[0]));
-  else
-    {
-      vec_validate (label_stack, n_labels - 1);
-      for (ii = 0; ii < n_labels; ii++)
-	label_stack[ii] = ntohl (mp->next_hop_out_label_stack[ii]);
-    }
-
-  return (add_del_route_t_handler (mp->is_multipath,
-				   mp->is_add,
-				   mp->is_drop,
-				   mp->is_unreach,
-				   mp->is_prohibit,
-				   mp->is_local,
-				   mp->is_classify,
-				   mp->classify_table_index,
-				   mp->is_resolve_host,
-				   mp->is_resolve_attached,
-				   fib_index, &pfx, 0,
-				   &nh, ntohl (mp->next_hop_sw_if_index),
-				   next_hop_fib_index,
-				   mp->next_hop_weight,
-				   ntohl (mp->next_hop_via_label),
-				   label_stack));
-}
-
-void
-vl_api_ip_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp)
-{
-  vl_api_ip_add_del_route_reply_t *rmp;
-  int rv;
-  vnet_main_t *vnm = vnet_get_main ();
-
-  vnm->api_errno = 0;
-
-  if (mp->is_ipv6)
-    rv = ip6_add_del_route_t_handler (mp);
-  else
-    rv = ip4_add_del_route_t_handler (mp);
-
-  rv = (rv == 0) ? vnm->api_errno : rv;
-
-  REPLY_MACRO (VL_API_IP_ADD_DEL_ROUTE_REPLY);
-}
-
-static void
-send_ip_details (vpe_api_main_t * am,
-		 unix_shared_memory_queue_t * q, u32 sw_if_index, u32 context)
-{
-  vl_api_ip_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP_DETAILS);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-send_ip_address_details (vpe_api_main_t * am,
-			 unix_shared_memory_queue_t * q,
-			 u8 * ip, u16 prefix_length, u8 is_ipv6, u32 context)
-{
-  vl_api_ip_address_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP_ADDRESS_DETAILS);
-
-  if (is_ipv6)
-    {
-      clib_memcpy (&mp->ip, ip, sizeof (mp->ip));
-    }
-  else
-    {
-      u32 *tp = (u32 *) mp->ip;
-      *tp = *(u32 *) ip;
-    }
-  mp->prefix_length = prefix_length;
-  mp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_ip_address_dump_t_handler (vl_api_ip_address_dump_t * mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  unix_shared_memory_queue_t *q;
-  ip6_address_t *r6;
-  ip4_address_t *r4;
-  ip6_main_t *im6 = &ip6_main;
-  ip4_main_t *im4 = &ip4_main;
-  ip_lookup_main_t *lm6 = &im6->lookup_main;
-  ip_lookup_main_t *lm4 = &im4->lookup_main;
-  ip_interface_address_t *ia = 0;
-  u32 sw_if_index = ~0;
-  int rv __attribute__ ((unused)) = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  if (mp->is_ipv6)
-    {
-      /* *INDENT-OFF* */
-      foreach_ip_interface_address (lm6, ia, sw_if_index,
-                                    1 /* honor unnumbered */,
-      ({
-        r6 = ip_interface_address_get_address (lm6, ia);
-        u16 prefix_length = ia->address_length;
-        send_ip_address_details(am, q, (u8*)r6, prefix_length, 1, mp->context);
-      }));
-      /* *INDENT-ON* */
-    }
-  else
-    {
-      /* *INDENT-OFF* */
-      foreach_ip_interface_address (lm4, ia, sw_if_index,
-                                    1 /* honor unnumbered */,
-      ({
-        r4 = ip_interface_address_get_address (lm4, ia);
-        u16 prefix_length = ia->address_length;
-        send_ip_address_details(am, q, (u8*)r4, prefix_length, 0, mp->context);
-      }));
-      /* *INDENT-ON* */
-    }
-  BAD_SW_IF_INDEX_LABEL;
-}
-
-static void
-vl_api_ip_dump_t_handler (vl_api_ip_dump_t * mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  unix_shared_memory_queue_t *q;
-  vnet_sw_interface_t *si, *sorted_sis;
-  u32 sw_if_index = ~0;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  /* Gather interfaces. */
-  sorted_sis = vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces));
-  _vec_len (sorted_sis) = 0;
-  /* *INDENT-OFF* */
-  pool_foreach (si, im->sw_interfaces,
-  ({
-    vec_add1 (sorted_sis, si[0]);
-  }));
-  /* *INDENT-ON* */
-
-  vec_foreach (si, sorted_sis)
-  {
-    if (!(si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED))
-      {
-	if (mp->is_ipv6 && !ip6_interface_enabled (vm, si->sw_if_index))
-	  {
-	    continue;
-	  }
-	sw_if_index = si->sw_if_index;
-	send_ip_details (am, q, sw_if_index, mp->context);
-      }
-  }
-}
-
-static void
-set_ip6_flow_hash (vl_api_set_ip_flow_hash_t * mp)
-{
-  vl_api_set_ip_flow_hash_reply_t *rmp;
-  int rv = VNET_API_ERROR_UNIMPLEMENTED;
-
-  clib_warning ("unimplemented...");
-
-  REPLY_MACRO (VL_API_SET_IP_FLOW_HASH_REPLY);
-}
-
-static void
-set_ip4_flow_hash (vl_api_set_ip_flow_hash_t * mp)
-{
-  vl_api_set_ip_flow_hash_reply_t *rmp;
-  int rv;
-  u32 table_id;
-  flow_hash_config_t flow_hash_config = 0;
-
-  table_id = ntohl (mp->vrf_id);
-
-#define _(a,b) if (mp->a) flow_hash_config |= b;
-  foreach_flow_hash_bit;
-#undef _
-
-  rv = vnet_set_ip4_flow_hash (table_id, flow_hash_config);
-
-  REPLY_MACRO (VL_API_SET_IP_FLOW_HASH_REPLY);
-}
-
-
-static void
-vl_api_set_ip_flow_hash_t_handler (vl_api_set_ip_flow_hash_t * mp)
-{
-  if (mp->is_ipv6 == 0)
-    set_ip4_flow_hash (mp);
-  else
-    set_ip6_flow_hash (mp);
-}
-
-static void
-  vl_api_sw_interface_ip6nd_ra_config_t_handler
-  (vl_api_sw_interface_ip6nd_ra_config_t * mp)
-{
-  vl_api_sw_interface_ip6nd_ra_config_reply_t *rmp;
-  vlib_main_t *vm = vlib_get_main ();
-  int rv = 0;
-  u8 is_no, suppress, managed, other, ll_option, send_unicast, cease,
-    default_router;
-
-  is_no = mp->is_no == 1;
-  suppress = mp->suppress == 1;
-  managed = mp->managed == 1;
-  other = mp->other == 1;
-  ll_option = mp->ll_option == 1;
-  send_unicast = mp->send_unicast == 1;
-  cease = mp->cease == 1;
-  default_router = mp->default_router == 1;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = ip6_neighbor_ra_config (vm, ntohl (mp->sw_if_index),
-			       suppress, managed, other,
-			       ll_option, send_unicast, cease,
-			       default_router, ntohl (mp->lifetime),
-			       ntohl (mp->initial_count),
-			       ntohl (mp->initial_interval),
-			       ntohl (mp->max_interval),
-			       ntohl (mp->min_interval), is_no);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_IP6ND_RA_CONFIG_REPLY);
-}
-
-static void
-  vl_api_sw_interface_ip6nd_ra_prefix_t_handler
-  (vl_api_sw_interface_ip6nd_ra_prefix_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_sw_interface_ip6nd_ra_prefix_reply_t *rmp;
-  int rv = 0;
-  u8 is_no, use_default, no_advertise, off_link, no_autoconfig, no_onlink;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  is_no = mp->is_no == 1;
-  use_default = mp->use_default == 1;
-  no_advertise = mp->no_advertise == 1;
-  off_link = mp->off_link == 1;
-  no_autoconfig = mp->no_autoconfig == 1;
-  no_onlink = mp->no_onlink == 1;
-
-  rv = ip6_neighbor_ra_prefix (vm, ntohl (mp->sw_if_index),
-			       (ip6_address_t *) mp->address,
-			       mp->address_length, use_default,
-			       ntohl (mp->val_lifetime),
-			       ntohl (mp->pref_lifetime), no_advertise,
-			       off_link, no_autoconfig, no_onlink, is_no);
-
-  BAD_SW_IF_INDEX_LABEL;
-  REPLY_MACRO (VL_API_SW_INTERFACE_IP6ND_RA_PREFIX_REPLY);
-}
-
-static void
-  vl_api_sw_interface_ip6_enable_disable_t_handler
-  (vl_api_sw_interface_ip6_enable_disable_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_sw_interface_ip6_enable_disable_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  int rv = 0;
-  clib_error_t *error;
-
-  vnm->api_errno = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  error =
-    (mp->enable == 1) ? enable_ip6_interface (vm,
-					      ntohl (mp->sw_if_index)) :
-    disable_ip6_interface (vm, ntohl (mp->sw_if_index));
-
-  if (error)
-    {
-      clib_error_report (error);
-      rv = VNET_API_ERROR_UNSPECIFIED;
-    }
-  else
-    {
-      rv = vnm->api_errno;
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY);
-}
-
-static void
-  vl_api_sw_interface_ip6_set_link_local_address_t_handler
-  (vl_api_sw_interface_ip6_set_link_local_address_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_sw_interface_ip6_set_link_local_address_reply_t *rmp;
-  int rv = 0;
-  clib_error_t *error;
-  vnet_main_t *vnm = vnet_get_main ();
-
-  vnm->api_errno = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  error = set_ip6_link_local_address (vm,
-				      ntohl (mp->sw_if_index),
-				      (ip6_address_t *) mp->address,
-				      mp->address_length);
-  if (error)
-    {
-      clib_error_report (error);
-      rv = VNET_API_ERROR_UNSPECIFIED;
-    }
-  else
-    {
-      rv = vnm->api_errno;
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_REPLY);
-}
-
-
-#define vl_msg_name_crc_list
-#include <vnet/ip/ip.api.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_ip;
-#undef _
-}
-
-static clib_error_t *
-ip_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_ip_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (ip_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip_checksum.c b/vnet/vnet/ip/ip_checksum.c
deleted file mode 100644
index 6a9cf657..00000000
--- a/vnet/vnet/ip/ip_checksum.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip4/ip_checksum.c: ip/tcp/udp checksums
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-
-ip_csum_t
-ip_incremental_checksum (ip_csum_t sum, void *_data, uword n_bytes)
-{
-  uword data = pointer_to_uword (_data);
-  ip_csum_t sum0, sum1;
-
-  sum0 = 0;
-  sum1 = sum;
-
-  /* Align data pointer to 64 bits. */
-#define _(t)					\
-do {						\
-  if (n_bytes >= sizeof (t)			\
-      && sizeof (t) < sizeof (ip_csum_t)	\
-      && (data % (2 * sizeof (t))) != 0)	\
-    {						\
-      sum0 += * uword_to_pointer (data, t *);	\
-      data += sizeof (t);			\
-      n_bytes -= sizeof (t);			\
-    }						\
-} while (0)
-
-  _(u8);
-  _(u16);
-  if (BITS (ip_csum_t) > 32)
-    _(u32);
-
-#undef _
-
-  {
-    ip_csum_t *d = uword_to_pointer (data, ip_csum_t *);
-
-    while (n_bytes >= 2 * sizeof (d[0]))
-      {
-	sum0 = ip_csum_with_carry (sum0, d[0]);
-	sum1 = ip_csum_with_carry (sum1, d[1]);
-	d += 2;
-	n_bytes -= 2 * sizeof (d[0]);
-      }
-
-    data = pointer_to_uword (d);
-  }
-
-#define _(t)								\
-do {									\
-  if (n_bytes >= sizeof (t) && sizeof (t) <= sizeof (ip_csum_t))	\
-    {									\
-      sum0 = ip_csum_with_carry (sum0, * uword_to_pointer (data, t *));	\
-      data += sizeof (t);						\
-      n_bytes -= sizeof (t);						\
-    }									\
-} while (0)
-
-  if (BITS (ip_csum_t) > 32)
-    _(u64);
-  _(u32);
-  _(u16);
-  _(u8);
-
-#undef _
-
-  /* Combine even and odd sums. */
-  sum0 = ip_csum_with_carry (sum0, sum1);
-
-  return sum0;
-}
-
-ip_csum_t
-ip_csum_and_memcpy (ip_csum_t sum, void *dst, void *src, uword n_bytes)
-{
-  uword n_left;
-  ip_csum_t sum0 = sum, sum1;
-  n_left = n_bytes;
-
-  if (n_left && (pointer_to_uword (dst) & sizeof (u8)))
-    {
-      u8 *d8, val;
-
-      d8 = dst;
-      val = ((u8 *) src)[0];
-      d8[0] = val;
-      dst += 1;
-      src += 1;
-      n_left -= 1;
-      sum0 =
-	ip_csum_with_carry (sum0, val << (8 * CLIB_ARCH_IS_LITTLE_ENDIAN));
-    }
-
-  while ((n_left >= sizeof (u16))
-	 && (pointer_to_uword (dst) & (sizeof (sum) - sizeof (u16))))
-    {
-      u16 *d16, *s16;
-
-      d16 = dst;
-      s16 = src;
-
-      d16[0] = clib_mem_unaligned (&s16[0], u16);
-
-      sum0 = ip_csum_with_carry (sum0, d16[0]);
-      dst += sizeof (u16);
-      src += sizeof (u16);
-      n_left -= sizeof (u16);
-    }
-
-  sum1 = 0;
-  while (n_left >= 2 * sizeof (sum))
-    {
-      ip_csum_t dst0, dst1;
-      ip_csum_t *dst_even, *src_even;
-
-      dst_even = dst;
-      src_even = src;
-      dst0 = clib_mem_unaligned (&src_even[0], ip_csum_t);
-      dst1 = clib_mem_unaligned (&src_even[1], ip_csum_t);
-
-      dst_even[0] = dst0;
-      dst_even[1] = dst1;
-
-      dst += 2 * sizeof (dst_even[0]);
-      src += 2 * sizeof (dst_even[0]);
-      n_left -= 2 * sizeof (dst_even[0]);
-
-      sum0 = ip_csum_with_carry (sum0, dst0);
-      sum1 = ip_csum_with_carry (sum1, dst1);
-    }
-
-  sum0 = ip_csum_with_carry (sum0, sum1);
-  while (n_left >= 1 * sizeof (sum))
-    {
-      ip_csum_t dst0, *dst_even, *src_even;
-
-      dst_even = dst;
-      src_even = src;
-
-      dst0 = clib_mem_unaligned (&src_even[0], ip_csum_t);
-
-      dst_even[0] = dst0;
-
-      dst += 1 * sizeof (sum);
-      src += 1 * sizeof (sum);
-      n_left -= 1 * sizeof (sum);
-
-      sum0 = ip_csum_with_carry (sum0, dst0);
-    }
-
-  while (n_left >= sizeof (u16))
-    {
-      u16 dst0, *dst_short, *src_short;
-
-      dst_short = dst;
-      src_short = src;
-
-      dst0 = clib_mem_unaligned (&src_short[0], u16);
-
-      dst_short[0] = dst0;
-
-      sum0 = ip_csum_with_carry (sum0, dst_short[0]);
-      dst += 1 * sizeof (dst0);
-      src += 1 * sizeof (dst0);
-      n_left -= 1 * sizeof (dst0);
-
-    }
-
-  if (n_left == 1)
-    {
-      u8 *d8, *s8, val;
-
-      d8 = dst;
-      s8 = src;
-
-      d8[0] = val = s8[0];
-      d8 += 1;
-      s8 += 1;
-      n_left -= 1;
-      sum0 = ip_csum_with_carry (sum0, val << (8 * CLIB_ARCH_IS_BIG_ENDIAN));
-    }
-
-  return sum0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip_frag.c b/vnet/vnet/ip/ip_frag.c
deleted file mode 100644
index ca062bfd..00000000
--- a/vnet/vnet/ip/ip_frag.c
+++ /dev/null
@@ -1,581 +0,0 @@
-/*---------------------------------------------------------------------------
- * Copyright (c) 2009-2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------
- */
-/*
- * IPv4 Fragmentation Node
- *
- *
- */
-
-#include "ip_frag.h"
-
-#include <vnet/ip/ip.h>
-
-
-typedef struct
-{
-  u8 ipv6;
-  u16 header_offset;
-  u16 mtu;
-  u8 next;
-  u16 n_fragments;
-} ip_frag_trace_t;
-
-static u8 *
-format_ip_frag_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip_frag_trace_t *t = va_arg (*args, ip_frag_trace_t *);
-  s = format (s, "IPv%s offset: %u mtu: %u fragments: %u",
-	      t->ipv6 ? "6" : "4", t->header_offset, t->mtu, t->n_fragments);
-  return s;
-}
-
-static u32 running_fragment_id;
-
-static void
-ip4_frag_do_fragment (vlib_main_t * vm, u32 pi, u32 ** buffer,
-		      ip_frag_error_t * error)
-{
-  vlib_buffer_t *p;
-  ip4_header_t *ip4;
-  u16 mtu, ptr, len, max, rem, offset, ip_frag_id, ip_frag_offset;
-  u8 *packet, more;
-
-  vec_add1 (*buffer, pi);
-  p = vlib_get_buffer (vm, pi);
-  offset = vnet_buffer (p)->ip_frag.header_offset;
-  mtu = vnet_buffer (p)->ip_frag.mtu;
-  packet = (u8 *) vlib_buffer_get_current (p);
-  ip4 = (ip4_header_t *) (packet + offset);
-
-  rem = clib_net_to_host_u16 (ip4->length) - sizeof (*ip4);
-  ptr = 0;
-  max = (mtu - sizeof (*ip4) - vnet_buffer (p)->ip_frag.header_offset) & ~0x7;
-
-  if (rem < (p->current_length - offset - sizeof (*ip4)))
-    {
-      *error = IP_FRAG_ERROR_MALFORMED;
-      return;
-    }
-
-  if (mtu < sizeof (*ip4))
-    {
-      *error = IP_FRAG_ERROR_CANT_FRAGMENT_HEADER;
-      return;
-    }
-
-  if (ip4->flags_and_fragment_offset &
-      clib_host_to_net_u16 (IP4_HEADER_FLAG_DONT_FRAGMENT))
-    {
-      *error = IP_FRAG_ERROR_DONT_FRAGMENT_SET;
-      return;
-    }
-
-  if (ip4_is_fragment (ip4))
-    {
-      ip_frag_id = ip4->fragment_id;
-      ip_frag_offset = ip4_get_fragment_offset (ip4);
-      more =
-	! !(ip4->flags_and_fragment_offset &
-	    clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS));
-    }
-  else
-    {
-      ip_frag_id = (++running_fragment_id);
-      ip_frag_offset = 0;
-      more = 0;
-    }
-
-  //Do the actual fragmentation
-  while (rem)
-    {
-      u32 bi;
-      vlib_buffer_t *b;
-      ip4_header_t *fip4;
-
-      len =
-	(rem >
-	 (mtu - sizeof (*ip4) -
-	  vnet_buffer (p)->ip_frag.header_offset)) ? max : rem;
-
-      if (ptr == 0)
-	{
-	  bi = pi;
-	  b = p;
-	  fip4 = (ip4_header_t *) (vlib_buffer_get_current (b) + offset);
-	}
-      else
-	{
-	  if (!vlib_buffer_alloc (vm, &bi, 1))
-	    {
-	      *error = IP_FRAG_ERROR_MEMORY;
-	      return;
-	    }
-	  vec_add1 (*buffer, bi);
-	  b = vlib_get_buffer (vm, bi);
-	  vnet_buffer (b)->sw_if_index[VLIB_RX] =
-	    vnet_buffer (p)->sw_if_index[VLIB_RX];
-	  vnet_buffer (b)->sw_if_index[VLIB_TX] =
-	    vnet_buffer (p)->sw_if_index[VLIB_TX];
-	  fip4 = (ip4_header_t *) (vlib_buffer_get_current (b) + offset);
-
-	  //Copy offset and ip4 header
-	  clib_memcpy (b->data, packet, offset + sizeof (*ip4));
-	  //Copy data
-	  clib_memcpy (((u8 *) (fip4)) + sizeof (*fip4),
-		       packet + offset + sizeof (*fip4) + ptr, len);
-	}
-      b->current_length = offset + len + sizeof (*fip4);
-
-      fip4->fragment_id = ip_frag_id;
-      fip4->flags_and_fragment_offset =
-	clib_host_to_net_u16 ((ptr >> 3) + ip_frag_offset);
-      fip4->flags_and_fragment_offset |=
-	clib_host_to_net_u16 (((len != rem) || more) << 13);
-      // ((len0 != rem0) || more0) << 13 is optimization for
-      // ((len0 != rem0) || more0) ? IP4_HEADER_FLAG_MORE_FRAGMENTS : 0
-      fip4->length = clib_host_to_net_u16 (len + sizeof (*fip4));
-      fip4->checksum = ip4_header_checksum (fip4);
-
-      if (vnet_buffer (p)->ip_frag.flags & IP_FRAG_FLAG_IP4_HEADER)
-	{
-	  //Encapsulating ipv4 header
-	  ip4_header_t *encap_header4 =
-	    (ip4_header_t *) vlib_buffer_get_current (b);
-	  encap_header4->length = clib_host_to_net_u16 (b->current_length);
-	  encap_header4->checksum = ip4_header_checksum (encap_header4);
-	}
-      else if (vnet_buffer (p)->ip_frag.flags & IP_FRAG_FLAG_IP6_HEADER)
-	{
-	  //Encapsulating ipv6 header
-	  ip6_header_t *encap_header6 =
-	    (ip6_header_t *) vlib_buffer_get_current (b);
-	  encap_header6->payload_length =
-	    clib_host_to_net_u16 (b->current_length -
-				  sizeof (*encap_header6));
-	}
-
-      rem -= len;
-      ptr += len;
-    }
-}
-
-void
-ip_frag_set_vnet_buffer (vlib_buffer_t * b, u16 offset, u16 mtu,
-			 u8 next_index, u8 flags)
-{
-  vnet_buffer (b)->ip_frag.header_offset = offset;
-  vnet_buffer (b)->ip_frag.mtu = mtu;
-  vnet_buffer (b)->ip_frag.next_index = next_index;
-  vnet_buffer (b)->ip_frag.flags = flags;
-}
-
-static uword
-ip4_frag (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip4_frag_node.index);
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  u32 frag_sent = 0, small_packets = 0;
-  u32 *buffer = 0;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0, *frag_from, frag_left;
-	  vlib_buffer_t *p0;
-	  ip_frag_error_t error0;
-	  ip4_frag_next_t next0;
-
-	  //Note: The packet is not enqueued now.
-	  //It is instead put in a vector where other fragments
-	  //will be put as well.
-	  pi0 = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  error0 = IP_FRAG_ERROR_NONE;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip4_frag_do_fragment (vm, pi0, &buffer, &error0);
-
-	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ip_frag_trace_t *tr =
-		vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->header_offset = vnet_buffer (p0)->ip_frag.header_offset;
-	      tr->mtu = vnet_buffer (p0)->ip_frag.mtu;
-	      tr->ipv6 = 0;
-	      tr->n_fragments = vec_len (buffer);
-	      tr->next = vnet_buffer (p0)->ip_frag.next_index;
-	    }
-
-	  if (error0 == IP_FRAG_ERROR_DONT_FRAGMENT_SET)
-	    {
-	      icmp4_error_set_vnet_buffer (p0, ICMP4_destination_unreachable,
-					   ICMP4_destination_unreachable_fragmentation_needed_and_dont_fragment_set,
-					   vnet_buffer (p0)->ip_frag.mtu);
-	      vlib_buffer_advance (p0,
-				   vnet_buffer (p0)->ip_frag.header_offset);
-	      next0 = IP4_FRAG_NEXT_ICMP_ERROR;
-	    }
-	  else
-	    next0 =
-	      (error0 ==
-	       IP_FRAG_ERROR_NONE) ? vnet_buffer (p0)->
-	      ip_frag.next_index : IP4_FRAG_NEXT_DROP;
-
-	  if (error0 == IP_FRAG_ERROR_NONE)
-	    {
-	      frag_sent += vec_len (buffer);
-	      small_packets += (vec_len (buffer) == 1);
-	    }
-	  else
-	    vlib_error_count (vm, ip4_frag_node.index, error0, 1);
-
-	  //Send fragments that were added in the frame
-	  frag_from = buffer;
-	  frag_left = vec_len (buffer);
-
-	  while (frag_left > 0)
-	    {
-	      while (frag_left > 0 && n_left_to_next > 0)
-		{
-		  u32 i;
-		  i = to_next[0] = frag_from[0];
-		  frag_from += 1;
-		  frag_left -= 1;
-		  to_next += 1;
-		  n_left_to_next -= 1;
-
-		  vlib_get_buffer (vm, i)->error = error_node->errors[error0];
-		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-						   to_next, n_left_to_next, i,
-						   next0);
-		}
-	      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-	      vlib_get_next_frame (vm, node, next_index, to_next,
-				   n_left_to_next);
-	    }
-	  vec_reset_length (buffer);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vec_free (buffer);
-
-  vlib_node_increment_counter (vm, ip4_frag_node.index,
-			       IP_FRAG_ERROR_FRAGMENT_SENT, frag_sent);
-  vlib_node_increment_counter (vm, ip4_frag_node.index,
-			       IP_FRAG_ERROR_SMALL_PACKET, small_packets);
-
-  return frame->n_vectors;
-}
-
-
-static void
-ip6_frag_do_fragment (vlib_main_t * vm, u32 pi, u32 ** buffer,
-		      ip_frag_error_t * error)
-{
-  vlib_buffer_t *p;
-  ip6_header_t *ip6_hdr;
-  ip6_frag_hdr_t *frag_hdr;
-  u8 *payload, *next_header;
-
-  p = vlib_get_buffer (vm, pi);
-
-  //Parsing the IPv6 headers
-  ip6_hdr =
-    vlib_buffer_get_current (p) + vnet_buffer (p)->ip_frag.header_offset;
-  payload = (u8 *) (ip6_hdr + 1);
-  next_header = &ip6_hdr->protocol;
-  if (*next_header == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS)
-    {
-      next_header = payload;
-      payload += payload[1] * 8;
-    }
-
-  if (*next_header == IP_PROTOCOL_IP6_DESTINATION_OPTIONS)
-    {
-      next_header = payload;
-      payload += payload[1] * 8;
-    }
-
-  if (*next_header == IP_PROTOCOL_IPV6_ROUTE)
-    {
-      next_header = payload;
-      payload += payload[1] * 8;
-    }
-
-  if (PREDICT_FALSE
-      (payload >= (u8 *) vlib_buffer_get_current (p) + p->current_length))
-    {
-      //A malicious packet could set an extension header with a too big size
-      //and make us modify another vlib_buffer
-      *error = IP_FRAG_ERROR_MALFORMED;
-      return;
-    }
-
-  u8 has_more;
-  u16 initial_offset;
-  if (*next_header == IP_PROTOCOL_IPV6_FRAGMENTATION)
-    {
-      //The fragmentation header is already there
-      frag_hdr = (ip6_frag_hdr_t *) payload;
-      has_more = ip6_frag_hdr_more (frag_hdr);
-      initial_offset = ip6_frag_hdr_offset (frag_hdr);
-    }
-  else
-    {
-      //Insert a fragmentation header in the packet
-      u8 nh = *next_header;
-      *next_header = IP_PROTOCOL_IPV6_FRAGMENTATION;
-      vlib_buffer_advance (p, -sizeof (*frag_hdr));
-      u8 *start = vlib_buffer_get_current (p);
-      memmove (start, start + sizeof (*frag_hdr),
-	       payload - (start + sizeof (*frag_hdr)));
-      frag_hdr = (ip6_frag_hdr_t *) (payload - sizeof (*frag_hdr));
-      frag_hdr->identification = ++running_fragment_id;
-      frag_hdr->next_hdr = nh;
-      frag_hdr->rsv = 0;
-      has_more = 0;
-      initial_offset = 0;
-    }
-  payload = (u8 *) (frag_hdr + 1);
-
-  u16 headers_len = payload - (u8 *) vlib_buffer_get_current (p);
-  u16 max_payload = vnet_buffer (p)->ip_frag.mtu - headers_len;
-  u16 rem = p->current_length - headers_len;
-  u16 ptr = 0;
-
-  if (max_payload < 8)
-    {
-      *error = IP_FRAG_ERROR_CANT_FRAGMENT_HEADER;
-      return;
-    }
-
-  while (rem)
-    {
-      u32 bi;
-      vlib_buffer_t *b;
-      u16 len = (rem > max_payload) ? (max_payload & ~0x7) : rem;
-      rem -= len;
-
-      if (ptr != 0)
-	{
-	  if (!vlib_buffer_alloc (vm, &bi, 1))
-	    {
-	      *error = IP_FRAG_ERROR_MEMORY;
-	      return;
-	    }
-	  b = vlib_get_buffer (vm, bi);
-	  vnet_buffer (b)->sw_if_index[VLIB_RX] =
-	    vnet_buffer (p)->sw_if_index[VLIB_RX];
-	  vnet_buffer (b)->sw_if_index[VLIB_TX] =
-	    vnet_buffer (p)->sw_if_index[VLIB_TX];
-	  clib_memcpy (vlib_buffer_get_current (b),
-		       vlib_buffer_get_current (p), headers_len);
-	  clib_memcpy (vlib_buffer_get_current (b) + headers_len,
-		       payload + ptr, len);
-	  frag_hdr =
-	    vlib_buffer_get_current (b) + headers_len - sizeof (*frag_hdr);
-	}
-      else
-	{
-	  bi = pi;
-	  b = vlib_get_buffer (vm, bi);
-	  //frag_hdr already set here
-	}
-
-      ip6_hdr =
-	vlib_buffer_get_current (b) + vnet_buffer (p)->ip_frag.header_offset;
-      frag_hdr->fragment_offset_and_more =
-	ip6_frag_hdr_offset_and_more (initial_offset + (ptr >> 3),
-				      (rem || has_more));
-      b->current_length = headers_len + len;
-      ip6_hdr->payload_length =
-	clib_host_to_net_u16 (b->current_length -
-			      vnet_buffer (p)->ip_frag.header_offset -
-			      sizeof (*ip6_hdr));
-
-      if (vnet_buffer (p)->ip_frag.flags & IP_FRAG_FLAG_IP4_HEADER)
-	{
-	  //Encapsulating ipv4 header
-	  ip4_header_t *encap_header4 =
-	    (ip4_header_t *) vlib_buffer_get_current (b);
-	  encap_header4->length = clib_host_to_net_u16 (b->current_length);
-	  encap_header4->checksum = ip4_header_checksum (encap_header4);
-	}
-      else if (vnet_buffer (p)->ip_frag.flags & IP_FRAG_FLAG_IP6_HEADER)
-	{
-	  //Encapsulating ipv6 header
-	  ip6_header_t *encap_header6 =
-	    (ip6_header_t *) vlib_buffer_get_current (b);
-	  encap_header6->payload_length =
-	    clib_host_to_net_u16 (b->current_length -
-				  sizeof (*encap_header6));
-	}
-
-      vec_add1 (*buffer, bi);
-
-      ptr += len;
-    }
-}
-
-static uword
-ip6_frag (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip6_frag_node.index);
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  u32 frag_sent = 0, small_packets = 0;
-  u32 *buffer = 0;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0, *frag_from, frag_left;
-	  vlib_buffer_t *p0;
-	  ip_frag_error_t error0;
-	  ip6_frag_next_t next0;
-
-	  pi0 = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  error0 = IP_FRAG_ERROR_NONE;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip6_frag_do_fragment (vm, pi0, &buffer, &error0);
-
-	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ip_frag_trace_t *tr =
-		vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->header_offset = vnet_buffer (p0)->ip_frag.header_offset;
-	      tr->mtu = vnet_buffer (p0)->ip_frag.mtu;
-	      tr->ipv6 = 1;
-	      tr->n_fragments = vec_len (buffer);
-	      tr->next = vnet_buffer (p0)->ip_frag.next_index;
-	    }
-
-	  next0 =
-	    (error0 ==
-	     IP_FRAG_ERROR_NONE) ? vnet_buffer (p0)->
-	    ip_frag.next_index : IP6_FRAG_NEXT_DROP;
-	  frag_sent += vec_len (buffer);
-	  small_packets += (vec_len (buffer) == 1);
-
-	  //Send fragments that were added in the frame
-	  frag_from = buffer;
-	  frag_left = vec_len (buffer);
-	  while (frag_left > 0)
-	    {
-	      while (frag_left > 0 && n_left_to_next > 0)
-		{
-		  u32 i;
-		  i = to_next[0] = frag_from[0];
-		  frag_from += 1;
-		  frag_left -= 1;
-		  to_next += 1;
-		  n_left_to_next -= 1;
-
-		  vlib_get_buffer (vm, i)->error = error_node->errors[error0];
-		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-						   to_next, n_left_to_next, i,
-						   next0);
-		}
-	      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-	      vlib_get_next_frame (vm, node, next_index, to_next,
-				   n_left_to_next);
-	    }
-	  vec_reset_length (buffer);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vec_free (buffer);
-  vlib_node_increment_counter (vm, ip6_frag_node.index,
-			       IP_FRAG_ERROR_FRAGMENT_SENT, frag_sent);
-  vlib_node_increment_counter (vm, ip6_frag_node.index,
-			       IP_FRAG_ERROR_SMALL_PACKET, small_packets);
-
-  return frame->n_vectors;
-}
-
-static char *ip4_frag_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ip_frag_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_frag_node) = {
-  .function = ip4_frag,
-  .name = IP4_FRAG_NODE_NAME,
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip_frag_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = IP_FRAG_N_ERROR,
-  .error_strings = ip4_frag_error_strings,
-
-  .n_next_nodes = IP4_FRAG_N_NEXT,
-  .next_nodes = {
-    [IP4_FRAG_NEXT_IP4_LOOKUP] = "ip4-lookup",
-    [IP4_FRAG_NEXT_IP6_LOOKUP] = "ip6-lookup",
-    [IP4_FRAG_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-    [IP4_FRAG_NEXT_DROP] = "error-drop"
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_frag_node) = {
-  .function = ip6_frag,
-  .name = IP6_FRAG_NODE_NAME,
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip_frag_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = IP_FRAG_N_ERROR,
-  .error_strings = ip4_frag_error_strings,
-
-  .n_next_nodes = IP6_FRAG_N_NEXT,
-  .next_nodes = {
-    [IP6_FRAG_NEXT_IP4_LOOKUP] = "ip4-lookup",
-    [IP6_FRAG_NEXT_IP6_LOOKUP] = "ip6-lookup",
-    [IP6_FRAG_NEXT_DROP] = "error-drop"
-  },
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip_frag.h b/vnet/vnet/ip/ip_frag.h
deleted file mode 100644
index 348f5a2f..00000000
--- a/vnet/vnet/ip/ip_frag.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*---------------------------------------------------------------------------
- * Copyright (c) 2009-2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------
- */
-/*
- * IPv4 and IPv6 Fragmentation Nodes
- *
- * A packet sent to those nodes require the following
- * buffer attributes to be set:
- * ip_frag.header_offset :
- *     Where to find the IPv4 (or IPv6) header in the packet. Previous
- *     bytes are left untouched and copied in every fragment. The fragments
- *     are then appended. This option is used for fragmented packets
- *     that are encapsulated.
- * ip_frag.mtu :
- *     Maximum size of IP packets, header included, but ignoring
- *     the 'ip_frag.header_offset' copied bytes.
- * ip_frag.next_index :
- *     One of ip_frag_next_t, indicating to which exit node the fragments
- *     should be sent to.
- *
- */
-
-#ifndef IP_FRAG_H
-#define IP_FRAG_H
-
-#include <vnet/vnet.h>
-
-#define IP_FRAG_FLAG_IP4_HEADER 0x01	//Encapsulating IPv4 header
-#define IP_FRAG_FLAG_IP6_HEADER 0x02	//Encapsulating IPv6 header
-
-#define IP4_FRAG_NODE_NAME "ip4-frag"
-#define IP6_FRAG_NODE_NAME "ip6-frag"
-
-extern vlib_node_registration_t ip4_frag_node;
-extern vlib_node_registration_t ip6_frag_node;
-
-typedef enum
-{
-  IP4_FRAG_NEXT_IP4_LOOKUP,
-  IP4_FRAG_NEXT_IP6_LOOKUP,
-  IP4_FRAG_NEXT_ICMP_ERROR,
-  IP4_FRAG_NEXT_DROP,
-  IP4_FRAG_N_NEXT
-} ip4_frag_next_t;
-
-typedef enum
-{
-  IP6_FRAG_NEXT_IP4_LOOKUP,
-  IP6_FRAG_NEXT_IP6_LOOKUP,
-  IP6_FRAG_NEXT_DROP,
-  IP6_FRAG_N_NEXT
-} ip6_frag_next_t;
-
-#define foreach_ip_frag_error				\
-  /* Must be first. */					\
- _(NONE, "packet fragmented")				\
- _(SMALL_PACKET, "packet smaller than MTU")             \
- _(FRAGMENT_SENT, "number of sent fragments")           \
- _(CANT_FRAGMENT_HEADER, "can't fragment header")	\
- _(DONT_FRAGMENT_SET, "can't fragment this packet")	\
- _(MALFORMED, "malformed packet")                       \
- _(MEMORY, "could not allocate buffer")                 \
- _(UNKNOWN, "unknown error")
-
-typedef enum
-{
-#define _(sym,str) IP_FRAG_ERROR_##sym,
-  foreach_ip_frag_error
-#undef _
-    IP_FRAG_N_ERROR,
-} ip_frag_error_t;
-
-void ip_frag_set_vnet_buffer (vlib_buffer_t * b, u16 offset, u16 mtu,
-			      u8 next_index, u8 flags);
-
-#endif /* ifndef IP_FRAG_H */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip_init.c b/vnet/vnet/ip/ip_init.c
deleted file mode 100644
index f7635b35..00000000
--- a/vnet/vnet/ip/ip_init.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip_init.c: ip generic initialization
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-
-ip_main_t ip_main;
-
-clib_error_t *
-ip_main_init (vlib_main_t * vm)
-{
-  ip_main_t *im = &ip_main;
-  clib_error_t *error = 0;
-
-  memset (im, 0, sizeof (im[0]));
-
-  {
-    ip_protocol_info_t *pi;
-    u32 i;
-
-#define ip_protocol(n,s)			\
-do {						\
-  vec_add2 (im->protocol_infos, pi, 1);		\
-  pi->protocol = n;				\
-  pi->name = (u8 *) #s;				\
-} while (0);
-
-#include "protocols.def"
-
-#undef ip_protocol
-
-    im->protocol_info_by_name = hash_create_string (0, sizeof (uword));
-    for (i = 0; i < vec_len (im->protocol_infos); i++)
-      {
-	pi = im->protocol_infos + i;
-
-	hash_set_mem (im->protocol_info_by_name, pi->name, i);
-	hash_set (im->protocol_info_by_protocol, pi->protocol, i);
-      }
-  }
-
-  {
-    tcp_udp_port_info_t *pi;
-    u32 i;
-    static char *port_names[] = {
-#define ip_port(s,n) #s,
-#include "ports.def"
-#undef ip_port
-    };
-    static u16 ports[] = {
-#define ip_port(s,n) n,
-#include "ports.def"
-#undef ip_port
-    };
-
-    vec_resize (im->port_infos, ARRAY_LEN (port_names));
-    im->port_info_by_name = hash_create_string (0, sizeof (uword));
-
-    for (i = 0; i < vec_len (im->port_infos); i++)
-      {
-	pi = im->port_infos + i;
-	pi->port = clib_host_to_net_u16 (ports[i]);
-	pi->name = (u8 *) port_names[i];
-	hash_set_mem (im->port_info_by_name, pi->name, i);
-	hash_set (im->port_info_by_port, pi->port, i);
-      }
-  }
-
-  if ((error = vlib_call_init_function (vm, vnet_main_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip4_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip6_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, icmp4_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, icmp6_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip6_hop_by_hop_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, udp_local_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, udp_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip_classify_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, input_acl_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, policer_classify_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, flow_classify_init)))
-    return error;
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (ip_main_init);
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip_input_acl.c b/vnet/vnet/ip/ip_input_acl.c
deleted file mode 100644
index b0b52ab1..00000000
--- a/vnet/vnet/ip/ip_input_acl.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/ip/ip.h>
-#include <vnet/classify/vnet_classify.h>
-#include <vnet/classify/input_acl.h>
-
-typedef struct
-{
-  u32 sw_if_index;
-  u32 next_index;
-  u32 table_index;
-  u32 offset;
-} ip_inacl_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_ip_inacl_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip_inacl_trace_t *t = va_arg (*args, ip_inacl_trace_t *);
-
-  s = format (s, "INACL: sw_if_index %d, next_index %d, table %d, offset %d",
-	      t->sw_if_index, t->next_index, t->table_index, t->offset);
-  return s;
-}
-
-vlib_node_registration_t ip4_inacl_node;
-vlib_node_registration_t ip6_inacl_node;
-
-#define foreach_ip_inacl_error                  \
-_(MISS, "input ACL misses")                     \
-_(HIT, "input ACL hits")                        \
-_(CHAIN_HIT, "input ACL hits after chain walk")
-
-typedef enum
-{
-#define _(sym,str) IP_INACL_ERROR_##sym,
-  foreach_ip_inacl_error
-#undef _
-    IP_INACL_N_ERROR,
-} ip_inacl_error_t;
-
-static char *ip_inacl_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ip_inacl_error
-#undef _
-};
-
-static inline uword
-ip_inacl_inline (vlib_main_t * vm,
-		 vlib_node_runtime_t * node, vlib_frame_t * frame, int is_ip4)
-{
-  u32 n_left_from, *from, *to_next;
-  acl_next_index_t next_index;
-  input_acl_main_t *am = &input_acl_main;
-  vnet_classify_main_t *vcm = am->vnet_classify_main;
-  f64 now = vlib_time_now (vm);
-  u32 hits = 0;
-  u32 misses = 0;
-  u32 chain_hits = 0;
-  input_acl_table_id_t tid;
-  vlib_node_runtime_t *error_node;
-  u32 n_next_nodes;
-
-  n_next_nodes = node->n_next_nodes;
-
-  if (is_ip4)
-    {
-      tid = INPUT_ACL_TABLE_IP4;
-      error_node = vlib_node_get_runtime (vm, ip4_input_node.index);
-    }
-  else
-    {
-      tid = INPUT_ACL_TABLE_IP6;
-      error_node = vlib_node_get_runtime (vm, ip6_input_node.index);
-    }
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  /* First pass: compute hashes */
-
-  while (n_left_from > 2)
-    {
-      vlib_buffer_t *b0, *b1;
-      u32 bi0, bi1;
-      u8 *h0, *h1;
-      u32 sw_if_index0, sw_if_index1;
-      u32 table_index0, table_index1;
-      vnet_classify_table_t *t0, *t1;
-
-      /* prefetch next iteration */
-      {
-	vlib_buffer_t *p1, *p2;
-
-	p1 = vlib_get_buffer (vm, from[1]);
-	p2 = vlib_get_buffer (vm, from[2]);
-
-	vlib_prefetch_buffer_header (p1, STORE);
-	CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE);
-	vlib_prefetch_buffer_header (p2, STORE);
-	CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-      }
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-
-      bi1 = from[1];
-      b1 = vlib_get_buffer (vm, bi1);
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      table_index0 =
-	am->classify_table_index_by_sw_if_index[tid][sw_if_index0];
-
-      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-      table_index1 =
-	am->classify_table_index_by_sw_if_index[tid][sw_if_index1];
-
-      t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-      t1 = pool_elt_at_index (vcm->tables, table_index1);
-
-      if (t0->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
-	h0 = (void *) vlib_buffer_get_current (b0) + t0->current_data_offset;
-      else
-	h0 = b0->data;
-
-      vnet_buffer (b0)->l2_classify.hash =
-	vnet_classify_hash_packet (t0, (u8 *) h0);
-
-      vnet_classify_prefetch_bucket (t0, vnet_buffer (b0)->l2_classify.hash);
-
-      if (t1->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
-	h1 = (void *) vlib_buffer_get_current (b1) + t1->current_data_offset;
-      else
-	h1 = b1->data;
-
-      vnet_buffer (b1)->l2_classify.hash =
-	vnet_classify_hash_packet (t1, (u8 *) h1);
-
-      vnet_classify_prefetch_bucket (t1, vnet_buffer (b1)->l2_classify.hash);
-
-      vnet_buffer (b0)->l2_classify.table_index = table_index0;
-
-      vnet_buffer (b1)->l2_classify.table_index = table_index1;
-
-      from += 2;
-      n_left_from -= 2;
-    }
-
-  while (n_left_from > 0)
-    {
-      vlib_buffer_t *b0;
-      u32 bi0;
-      u8 *h0;
-      u32 sw_if_index0;
-      u32 table_index0;
-      vnet_classify_table_t *t0;
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      table_index0 =
-	am->classify_table_index_by_sw_if_index[tid][sw_if_index0];
-
-      t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-      if (t0->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
-	h0 = (void *) vlib_buffer_get_current (b0) + t0->current_data_offset;
-      else
-	h0 = b0->data;
-
-      vnet_buffer (b0)->l2_classify.hash =
-	vnet_classify_hash_packet (t0, (u8 *) h0);
-
-      vnet_buffer (b0)->l2_classify.table_index = table_index0;
-      vnet_classify_prefetch_bucket (t0, vnet_buffer (b0)->l2_classify.hash);
-
-      from++;
-      n_left_from--;
-    }
-
-  next_index = node->cached_next_index;
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /* Not enough load/store slots to dual loop... */
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0 = ACL_NEXT_INDEX_DENY;
-	  u32 table_index0;
-	  vnet_classify_table_t *t0;
-	  vnet_classify_entry_t *e0;
-	  u64 hash0;
-	  u8 *h0;
-	  u8 error0;
-
-	  /* Stride 3 seems to work best */
-	  if (PREDICT_TRUE (n_left_from > 3))
-	    {
-	      vlib_buffer_t *p1 = vlib_get_buffer (vm, from[3]);
-	      vnet_classify_table_t *tp1;
-	      u32 table_index1;
-	      u64 phash1;
-
-	      table_index1 = vnet_buffer (p1)->l2_classify.table_index;
-
-	      if (PREDICT_TRUE (table_index1 != ~0))
-		{
-		  tp1 = pool_elt_at_index (vcm->tables, table_index1);
-		  phash1 = vnet_buffer (p1)->l2_classify.hash;
-		  vnet_classify_prefetch_entry (tp1, phash1);
-		}
-	    }
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  table_index0 = vnet_buffer (b0)->l2_classify.table_index;
-	  e0 = 0;
-	  t0 = 0;
-	  vnet_get_config_data (am->vnet_config_main[tid],
-				&b0->current_config_index, &next0,
-				/* # bytes of config data */ 0);
-
-	  vnet_buffer (b0)->l2_classify.opaque_index = ~0;
-
-	  if (PREDICT_TRUE (table_index0 != ~0))
-	    {
-	      hash0 = vnet_buffer (b0)->l2_classify.hash;
-	      t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-	      if (t0->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
-		h0 =
-		  (void *) vlib_buffer_get_current (b0) +
-		  t0->current_data_offset;
-	      else
-		h0 = b0->data;
-
-	      e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
-	      if (e0)
-		{
-		  vnet_buffer (b0)->l2_classify.opaque_index
-		    = e0->opaque_index;
-		  vlib_buffer_advance (b0, e0->advance);
-
-		  next0 = (e0->next_index < n_next_nodes) ?
-		    e0->next_index : next0;
-
-		  hits++;
-
-		  if (is_ip4)
-		    error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-		      IP4_ERROR_INACL_SESSION_DENY : IP4_ERROR_NONE;
-		  else
-		    error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-		      IP6_ERROR_INACL_SESSION_DENY : IP6_ERROR_NONE;
-		  b0->error = error_node->errors[error0];
-
-		  if (e0->action == CLASSIFY_ACTION_SET_IP4_FIB_INDEX ||
-		      e0->action == CLASSIFY_ACTION_SET_IP6_FIB_INDEX)
-		    vnet_buffer (b0)->sw_if_index[VLIB_TX] = e0->metadata;
-		}
-	      else
-		{
-		  while (1)
-		    {
-		      if (PREDICT_TRUE (t0->next_table_index != ~0))
-			t0 = pool_elt_at_index (vcm->tables,
-						t0->next_table_index);
-		      else
-			{
-			  next0 = (t0->miss_next_index < n_next_nodes) ?
-			    t0->miss_next_index : next0;
-
-			  misses++;
-
-			  if (is_ip4)
-			    error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-			      IP4_ERROR_INACL_TABLE_MISS : IP4_ERROR_NONE;
-			  else
-			    error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-			      IP6_ERROR_INACL_TABLE_MISS : IP6_ERROR_NONE;
-			  b0->error = error_node->errors[error0];
-			  break;
-			}
-
-		      if (t0->current_data_flag ==
-			  CLASSIFY_FLAG_USE_CURR_DATA)
-			h0 =
-			  (void *) vlib_buffer_get_current (b0) +
-			  t0->current_data_offset;
-		      else
-			h0 = b0->data;
-
-		      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
-		      e0 = vnet_classify_find_entry
-			(t0, (u8 *) h0, hash0, now);
-		      if (e0)
-			{
-			  vnet_buffer (b0)->l2_classify.opaque_index
-			    = e0->opaque_index;
-			  vlib_buffer_advance (b0, e0->advance);
-			  next0 = (e0->next_index < n_next_nodes) ?
-			    e0->next_index : next0;
-			  hits++;
-			  chain_hits++;
-
-			  if (is_ip4)
-			    error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-			      IP4_ERROR_INACL_SESSION_DENY : IP4_ERROR_NONE;
-			  else
-			    error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-			      IP6_ERROR_INACL_SESSION_DENY : IP6_ERROR_NONE;
-			  b0->error = error_node->errors[error0];
-
-			  if (e0->action == CLASSIFY_ACTION_SET_IP4_FIB_INDEX
-			      || e0->action ==
-			      CLASSIFY_ACTION_SET_IP6_FIB_INDEX)
-			    vnet_buffer (b0)->sw_if_index[VLIB_TX] =
-			      e0->metadata;
-			  break;
-			}
-		    }
-		}
-	    }
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      ip_inacl_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	      t->next_index = next0;
-	      t->table_index = t0 ? t0 - vcm->tables : ~0;
-	      t->offset = (e0 && t0) ? vnet_classify_get_offset (t0, e0) : ~0;
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, node->node_index,
-			       IP_INACL_ERROR_MISS, misses);
-  vlib_node_increment_counter (vm, node->node_index,
-			       IP_INACL_ERROR_HIT, hits);
-  vlib_node_increment_counter (vm, node->node_index,
-			       IP_INACL_ERROR_CHAIN_HIT, chain_hits);
-  return frame->n_vectors;
-}
-
-static uword
-ip4_inacl (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return ip_inacl_inline (vm, node, frame, 1 /* is_ip4 */ );
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_inacl_node) = {
-  .function = ip4_inacl,
-  .name = "ip4-inacl",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip_inacl_trace,
-  .n_errors = ARRAY_LEN(ip_inacl_error_strings),
-  .error_strings = ip_inacl_error_strings,
-
-  .n_next_nodes = ACL_NEXT_INDEX_N_NEXT,
-  .next_nodes = {
-    [ACL_NEXT_INDEX_DENY] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_inacl_node, ip4_inacl);
-
-static uword
-ip6_inacl (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return ip_inacl_inline (vm, node, frame, 0 /* is_ip4 */ );
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_inacl_node) = {
-  .function = ip6_inacl,
-  .name = "ip6-inacl",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip_inacl_trace,
-  .n_errors = ARRAY_LEN(ip_inacl_error_strings),
-  .error_strings = ip_inacl_error_strings,
-
-  .n_next_nodes = ACL_NEXT_INDEX_N_NEXT,
-  .next_nodes = {
-    [ACL_NEXT_INDEX_DENY] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_inacl_node, ip6_inacl);
-
-static clib_error_t *
-ip_inacl_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ip_inacl_init);
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip_packet.h b/vnet/vnet/ip/ip_packet.h
deleted file mode 100644
index d3f3de77..00000000
--- a/vnet/vnet/ip/ip_packet.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip_packet.h: packet format common between ip4 & ip6
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_ip_packet_h
-#define included_ip_packet_h
-
-#include <vppinfra/byte_order.h>
-#include <vppinfra/error.h>
-
-typedef enum ip_protocol
-{
-#define ip_protocol(n,s) IP_PROTOCOL_##s = n,
-#include "protocols.def"
-#undef ip_protocol
-} ip_protocol_t;
-
-/* TCP/UDP ports. */
-typedef enum
-{
-#define ip_port(s,n) IP_PORT_##s = n,
-#include "ports.def"
-#undef ip_port
-} ip_port_t;
-
-/* Classifies protocols into UDP, ICMP or other. */
-typedef enum
-{
-  IP_BUILTIN_PROTOCOL_UDP,
-  IP_BUILTIN_PROTOCOL_ICMP,
-  IP_BUILTIN_PROTOCOL_UNKNOWN,
-} ip_builtin_protocol_t;
-
-#define foreach_ip_builtin_multicast_group	\
-  _ (1, all_hosts_on_subnet)			\
-  _ (2, all_routers_on_subnet)			\
-  _ (4, dvmrp)					\
-  _ (5, ospf_all_routers)			\
-  _ (6, ospf_designated_routers)		\
-  _ (13, pim)					\
-  _ (18, vrrp)					\
-  _ (102, hsrp)					\
-  _ (22, igmp_v3)
-
-typedef enum
-{
-#define _(n,f) IP_MULTICAST_GROUP_##f = n,
-  foreach_ip_builtin_multicast_group
-#undef _
-} ip_multicast_group_t;
-
-/* IP checksum support. */
-
-/* Incremental checksum update. */
-typedef uword ip_csum_t;
-
-always_inline ip_csum_t
-ip_csum_with_carry (ip_csum_t sum, ip_csum_t x)
-{
-  ip_csum_t t = sum + x;
-  return t + (t < x);
-}
-
-/* Update checksum changing field at even byte offset from x -> 0. */
-always_inline ip_csum_t
-ip_csum_add_even (ip_csum_t c, ip_csum_t x)
-{
-  ip_csum_t d;
-
-  d = c - x;
-
-  /* Fold in carry from high bit. */
-  d -= d > c;
-
-  ASSERT (ip_csum_with_carry (d, x) == c);
-
-  return d;
-}
-
-/* Update checksum changing field at even byte offset from 0 -> x. */
-always_inline ip_csum_t
-ip_csum_sub_even (ip_csum_t c, ip_csum_t x)
-{
-  return ip_csum_with_carry (c, x);
-}
-
-always_inline ip_csum_t
-ip_csum_update_inline (ip_csum_t sum, ip_csum_t old, ip_csum_t new,
-		       u32 field_byte_offset, u32 field_n_bytes)
-{
-  /* For even 1-byte fields on big-endian and odd 1-byte fields on little endian
-     we need to shift byte into place for checksum. */
-  if ((field_n_bytes % 2)
-      && (field_byte_offset % 2) == CLIB_ARCH_IS_LITTLE_ENDIAN)
-    {
-      old = old << 8;
-      new = new << 8;
-    }
-  sum = ip_csum_sub_even (sum, old);
-  sum = ip_csum_add_even (sum, new);
-  return sum;
-}
-
-#define ip_csum_update(sum,old,new,type,field)			\
-  ip_csum_update_inline ((sum), (old), (new),			\
-			 STRUCT_OFFSET_OF (type, field),	\
-			 STRUCT_SIZE_OF (type, field))
-
-always_inline u16
-ip_csum_fold (ip_csum_t c)
-{
-  /* Reduce to 16 bits. */
-#if uword_bits == 64
-  c = (c & (ip_csum_t) 0xffffffff) + (c >> (ip_csum_t) 32);
-  c = (c & 0xffff) + (c >> 16);
-#endif
-
-  c = (c & 0xffff) + (c >> 16);
-  c = (c & 0xffff) + (c >> 16);
-
-  return c;
-}
-
-/* Copy data and checksum at the same time. */
-ip_csum_t ip_csum_and_memcpy (ip_csum_t sum, void *dst, void *src,
-			      uword n_bytes);
-
-always_inline u16
-ip_csum_and_memcpy_fold (ip_csum_t sum, void *dst)
-{
-  return ip_csum_fold (sum);
-}
-
-/* Checksum routine. */
-ip_csum_t ip_incremental_checksum (ip_csum_t sum, void *data, uword n_bytes);
-
-#endif /* included_ip_packet_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ip_source_and_port_range_check.h b/vnet/vnet/ip/ip_source_and_port_range_check.h
deleted file mode 100644
index fefe5ff1..00000000
--- a/vnet/vnet/ip/ip_source_and_port_range_check.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_ip_ip_source_and_port_range_check_h
-#define included_ip_ip_source_and_port_range_check_h
-
-
-typedef struct
-{
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} source_range_check_main_t;
-
-source_range_check_main_t source_range_check_main;
-
-typedef enum
-{
-  IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT,
-  IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT,
-  IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN,
-  IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN,
-  IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS,
-} ip_source_and_port_range_check_protocol_t;
-
-typedef struct
-{
-  u32 fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS];
-} ip_source_and_port_range_check_config_t;
-
-#define IP_SOURCE_AND_PORT_RANGE_CHECK_RANGE_LIMIT VLIB_BUFFER_PRE_DATA_SIZE/(2*sizeof(u16x8));
-
-typedef struct
-{
-  union
-  {
-    u16x8 as_u16x8;
-    u16 as_u16[8];
-  };
-} u16x8vec_t;
-
-typedef struct
-{
-  u16x8vec_t low;
-  u16x8vec_t hi;
-} protocol_port_range_t;
-
-/**
- * @brief The number of supported ranges per-data path object.
- * If more ranges are required, bump this number.
- */
-#define N_PORT_RANGES_PER_DPO  64
-#define N_RANGES_PER_BLOCK (sizeof(u16x8vec_t)/2)
-#define N_BLOCKS_PER_DPO (N_PORT_RANGES_PER_DPO/N_RANGES_PER_BLOCK)
-
-/**
- * @brief
- *  The object that is in the data-path to perform the check.
- *
- * Some trade-offs here; memory vs performance.
- *
- * performance:
- *  the principle factor is d-cache line misses/hits.
- *  so we want the data layout to minimise the d-cache misses. This
- *  means not following dependent reads. i.e. not doing
- *
- *   struct B {
- *     u16 n_ranges;
- *     range_t *ragnes; // vector of ranges.
- *   }
- *
- *   so to read ranges[0] we would first d-cache miss on the address
- *   of the object of type B, for which we would need to wait before we
- *   can get the address of B->ranges.
- *   So this layout is better:
- *
- *  struct B {
- *    u16 n_ranges;
- *    range_t ragnes[N];
- *  }
- *
- * memory:
- *  the latter layout above is more memory hungry. And N needs to be:
- *   1 - sized for the maximum required
- *   2 - fixed, so that objects of type B can be pool allocated and so
- *       'get'-able using an index.
- *       An option over fixed might be to allocate contiguous chunk from
- *       the pool (like we used to do for multi-path adjs).
- */
-typedef struct protocol_port_range_dpo_t_
-{
-  /**
-   * The number of blocks from the 'block' array below
-   * that have rnages configured. We keep this count so that in the data-path
-   * we can limit the loop to be only over the blocks we need
-   */
-  u16 n_used_blocks;
-
-  /**
-   * The total number of free ranges from all blocks.
-   * Used to prevent overrun of the ranges available.
-   */
-  u16 n_free_ranges;
-
-  /**
-   * the fixed size array of ranges
-   */
-  protocol_port_range_t blocks[N_BLOCKS_PER_DPO];
-} protocol_port_range_dpo_t;
-
-int ip4_source_and_port_range_check_add_del (ip4_address_t * address,
-					     u32 length,
-					     u32 vrf_id,
-					     u16 * low_ports,
-					     u16 * hi_ports, int is_add);
-
-// This will be moved to another file in another patch -- for API freeze
-int ip6_source_and_port_range_check_add_del (ip6_address_t * address,
-					     u32 length,
-					     u32 vrf_id,
-					     u16 * low_ports,
-					     u16 * hi_ports, int is_add);
-
-int set_ip_source_and_port_range_check (vlib_main_t * vm,
-					u32 * fib_index,
-					u32 sw_if_index, u32 is_add);
-
-#endif /* included ip_source_and_port_range_check_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/lookup.c b/vnet/vnet/ip/lookup.c
deleted file mode 100644
index 734a4cd7..00000000
--- a/vnet/vnet/ip/lookup.c
+++ /dev/null
@@ -1,967 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip_lookup.c: ip4/6 adjacency and lookup table managment
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-#include <vnet/adj/adj.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/mpls/mpls.h>
-#include <vnet/dpo/drop_dpo.h>
-#include <vnet/dpo/classify_dpo.h>
-#include <vnet/dpo/punt_dpo.h>
-#include <vnet/dpo/receive_dpo.h>
-#include <vnet/dpo/ip_null_dpo.h>
-
-/**
- * @file
- * @brief IPv4 and IPv6 adjacency and lookup table managment.
- *
- */
-
-clib_error_t *
-ip_interface_address_add_del (ip_lookup_main_t * lm,
-			      u32 sw_if_index,
-			      void *addr_fib,
-			      u32 address_length,
-			      u32 is_del, u32 * result_if_address_index)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ip_interface_address_t *a, *prev, *next;
-  uword *p = mhash_get (&lm->address_to_if_address_index, addr_fib);
-
-  vec_validate_init_empty (lm->if_address_pool_index_by_sw_if_index,
-			   sw_if_index, ~0);
-  a = p ? pool_elt_at_index (lm->if_address_pool, p[0]) : 0;
-
-  /* Verify given length. */
-  if ((a && (address_length != a->address_length)) || (address_length == 0))
-    {
-      vnm->api_errno = VNET_API_ERROR_ADDRESS_LENGTH_MISMATCH;
-      return clib_error_create
-	("%U wrong length (expected %d) for interface %U",
-	 lm->format_address_and_length, addr_fib,
-	 address_length, a ? a->address_length : -1,
-	 format_vnet_sw_if_index_name, vnm, sw_if_index);
-    }
-
-  if (is_del)
-    {
-      if (!a)
-	{
-	  vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index);
-	  vnm->api_errno = VNET_API_ERROR_ADDRESS_NOT_FOUND_FOR_INTERFACE;
-	  return clib_error_create ("%U not found for interface %U",
-				    lm->format_address_and_length,
-				    addr_fib, address_length,
-				    format_vnet_sw_interface_name, vnm, si);
-	}
-
-      if (a->prev_this_sw_interface != ~0)
-	{
-	  prev =
-	    pool_elt_at_index (lm->if_address_pool,
-			       a->prev_this_sw_interface);
-	  prev->next_this_sw_interface = a->next_this_sw_interface;
-	}
-      if (a->next_this_sw_interface != ~0)
-	{
-	  next =
-	    pool_elt_at_index (lm->if_address_pool,
-			       a->next_this_sw_interface);
-	  next->prev_this_sw_interface = a->prev_this_sw_interface;
-
-	  if (a->prev_this_sw_interface == ~0)
-	    lm->if_address_pool_index_by_sw_if_index[sw_if_index] =
-	      a->next_this_sw_interface;
-	}
-
-      if ((a->next_this_sw_interface == ~0)
-	  && (a->prev_this_sw_interface == ~0))
-	lm->if_address_pool_index_by_sw_if_index[sw_if_index] = ~0;
-
-      mhash_unset (&lm->address_to_if_address_index, addr_fib,
-		   /* old_value */ 0);
-      pool_put (lm->if_address_pool, a);
-
-      if (result_if_address_index)
-	*result_if_address_index = ~0;
-    }
-
-  else if (!a)
-    {
-      u32 pi;			/* previous index */
-      u32 ai;
-      u32 hi;			/* head index */
-
-      pool_get (lm->if_address_pool, a);
-      memset (a, ~0, sizeof (a[0]));
-      ai = a - lm->if_address_pool;
-
-      hi = pi = lm->if_address_pool_index_by_sw_if_index[sw_if_index];
-      prev = 0;
-      while (pi != (u32) ~ 0)
-	{
-	  prev = pool_elt_at_index (lm->if_address_pool, pi);
-	  pi = prev->next_this_sw_interface;
-	}
-      pi = prev ? prev - lm->if_address_pool : (u32) ~ 0;
-
-      a->address_key = mhash_set (&lm->address_to_if_address_index,
-				  addr_fib, ai, /* old_value */ 0);
-      a->address_length = address_length;
-      a->sw_if_index = sw_if_index;
-      a->flags = 0;
-      a->prev_this_sw_interface = pi;
-      a->next_this_sw_interface = ~0;
-      if (prev)
-	prev->next_this_sw_interface = ai;
-
-      lm->if_address_pool_index_by_sw_if_index[sw_if_index] =
-	(hi != ~0) ? hi : ai;
-      if (result_if_address_index)
-	*result_if_address_index = ai;
-    }
-  else
-    {
-      if (result_if_address_index)
-	*result_if_address_index = a - lm->if_address_pool;
-    }
-
-
-  return /* no error */ 0;
-}
-
-void
-ip_lookup_init (ip_lookup_main_t * lm, u32 is_ip6)
-{
-  /* ensure that adjacency is cacheline aligned and sized */
-  STATIC_ASSERT (STRUCT_OFFSET_OF (ip_adjacency_t, cacheline0) == 0,
-		 "Cache line marker must be 1st element in struct");
-  STATIC_ASSERT (STRUCT_OFFSET_OF (ip_adjacency_t, cacheline1) ==
-		 CLIB_CACHE_LINE_BYTES,
-		 "Data in cache line 0 is bigger than cache line size");
-
-  /* Preallocate three "special" adjacencies */
-  lm->adjacency_heap = adj_pool;
-
-  if (!lm->fib_result_n_bytes)
-    lm->fib_result_n_bytes = sizeof (uword);
-
-  lm->is_ip6 = is_ip6;
-  if (is_ip6)
-    {
-      lm->format_address_and_length = format_ip6_address_and_length;
-      mhash_init (&lm->address_to_if_address_index, sizeof (uword),
-		  sizeof (ip6_address_fib_t));
-    }
-  else
-    {
-      lm->format_address_and_length = format_ip4_address_and_length;
-      mhash_init (&lm->address_to_if_address_index, sizeof (uword),
-		  sizeof (ip4_address_fib_t));
-    }
-
-  {
-    int i;
-
-    /* Setup all IP protocols to be punted and builtin-unknown. */
-    for (i = 0; i < 256; i++)
-      {
-	lm->local_next_by_ip_protocol[i] = IP_LOCAL_NEXT_PUNT;
-	lm->builtin_protocol_by_ip_protocol[i] = IP_BUILTIN_PROTOCOL_UNKNOWN;
-      }
-
-    lm->local_next_by_ip_protocol[IP_PROTOCOL_UDP] = IP_LOCAL_NEXT_UDP_LOOKUP;
-    lm->local_next_by_ip_protocol[is_ip6 ? IP_PROTOCOL_ICMP6 :
-				  IP_PROTOCOL_ICMP] = IP_LOCAL_NEXT_ICMP;
-    lm->builtin_protocol_by_ip_protocol[IP_PROTOCOL_UDP] =
-      IP_BUILTIN_PROTOCOL_UDP;
-    lm->builtin_protocol_by_ip_protocol[is_ip6 ? IP_PROTOCOL_ICMP6 :
-					IP_PROTOCOL_ICMP] =
-      IP_BUILTIN_PROTOCOL_ICMP;
-  }
-}
-
-u8 *
-format_ip_flow_hash_config (u8 * s, va_list * args)
-{
-  flow_hash_config_t flow_hash_config = va_arg (*args, u32);
-
-#define _(n,v) if (flow_hash_config & v) s = format (s, "%s ", #n);
-  foreach_flow_hash_bit;
-#undef _
-
-  return s;
-}
-
-u8 *
-format_ip_lookup_next (u8 * s, va_list * args)
-{
-  ip_lookup_next_t n = va_arg (*args, ip_lookup_next_t);
-  char *t = 0;
-
-  switch (n)
-    {
-    default:
-      s = format (s, "unknown %d", n);
-      return s;
-
-    case IP_LOOKUP_NEXT_DROP:
-      t = "drop";
-      break;
-    case IP_LOOKUP_NEXT_PUNT:
-      t = "punt";
-      break;
-    case IP_LOOKUP_NEXT_ARP:
-      t = "arp";
-      break;
-    case IP_LOOKUP_NEXT_MIDCHAIN:
-      t = "midchain";
-      break;
-    case IP_LOOKUP_NEXT_GLEAN:
-      t = "glean";
-      break;
-    case IP_LOOKUP_NEXT_REWRITE:
-      break;
-    }
-
-  if (t)
-    vec_add (s, t, strlen (t));
-
-  return s;
-}
-
-u8 *
-format_ip_adjacency_packet_data (u8 * s, va_list * args)
-{
-  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
-  u32 adj_index = va_arg (*args, u32);
-  u8 *packet_data = va_arg (*args, u8 *);
-  u32 n_packet_data_bytes = va_arg (*args, u32);
-  ip_adjacency_t *adj = adj_get (adj_index);
-
-  switch (adj->lookup_next_index)
-    {
-    case IP_LOOKUP_NEXT_REWRITE:
-      s = format (s, "%U",
-		  format_vnet_rewrite_header,
-		  vnm->vlib_main, &adj->rewrite_header, packet_data,
-		  n_packet_data_bytes);
-      break;
-
-    default:
-      break;
-    }
-
-  return s;
-}
-
-static uword
-unformat_dpo (unformat_input_t * input, va_list * args)
-{
-  dpo_id_t *dpo = va_arg (*args, dpo_id_t *);
-  fib_protocol_t fp = va_arg (*args, int);
-  dpo_proto_t proto;
-
-  proto = fib_proto_to_dpo (fp);
-
-  if (unformat (input, "drop"))
-    dpo_copy (dpo, drop_dpo_get (proto));
-  else if (unformat (input, "punt"))
-    dpo_copy (dpo, punt_dpo_get (proto));
-  else if (unformat (input, "local"))
-    receive_dpo_add_or_lock (proto, ~0, NULL, dpo);
-  else if (unformat (input, "null-send-unreach"))
-    ip_null_dpo_add_and_lock (proto, IP_NULL_ACTION_SEND_ICMP_UNREACH, dpo);
-  else if (unformat (input, "null-send-prohibit"))
-    ip_null_dpo_add_and_lock (proto, IP_NULL_ACTION_SEND_ICMP_PROHIBIT, dpo);
-  else if (unformat (input, "null"))
-    ip_null_dpo_add_and_lock (proto, IP_NULL_ACTION_NONE, dpo);
-  else if (unformat (input, "classify"))
-    {
-      u32 classify_table_index;
-
-      if (!unformat (input, "%d", &classify_table_index))
-	{
-	  clib_warning ("classify adj must specify table index");
-	  return 0;
-	}
-
-      dpo_set (dpo, DPO_CLASSIFY, proto,
-	       classify_dpo_create (proto, classify_table_index));
-    }
-  else
-    return 0;
-
-  return 1;
-}
-
-const ip46_address_t zero_addr = {
-  .as_u64 = {
-	     0, 0},
-};
-
-u32
-fib_table_id_find_fib_index (fib_protocol_t proto, u32 table_id)
-{
-  ip4_main_t *im4 = &ip4_main;
-  ip6_main_t *im6 = &ip6_main;
-  uword *p;
-
-  switch (proto)
-    {
-    case FIB_PROTOCOL_IP4:
-      p = hash_get (im4->fib_index_by_table_id, table_id);
-      break;
-    case FIB_PROTOCOL_IP6:
-      p = hash_get (im6->fib_index_by_table_id, table_id);
-      break;
-    default:
-      p = NULL;
-      break;
-    }
-  if (NULL != p)
-    {
-      return (p[0]);
-    }
-  return (~0);
-}
-
-clib_error_t *
-vnet_ip_route_cmd (vlib_main_t * vm,
-		   unformat_input_t * main_input, vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  fib_route_path_t *rpaths = NULL, rpath;
-  dpo_id_t dpo = DPO_INVALID, *dpos = NULL;
-  fib_prefix_t *prefixs = NULL, pfx;
-  mpls_label_t out_label, via_label;
-  clib_error_t *error = NULL;
-  u32 table_id, is_del;
-  vnet_main_t *vnm;
-  u32 fib_index;
-  f64 count;
-  int i;
-
-  vnm = vnet_get_main ();
-  is_del = 0;
-  table_id = 0;
-  count = 1;
-  memset (&pfx, 0, sizeof (pfx));
-  out_label = via_label = MPLS_LABEL_INVALID;
-
-  /* Get a line of input. */
-  if (!unformat_user (main_input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      memset (&rpath, 0, sizeof (rpath));
-
-      if (unformat (line_input, "table %d", &table_id))
-	;
-      else if (unformat (line_input, "del"))
-	is_del = 1;
-      else if (unformat (line_input, "add"))
-	is_del = 0;
-      else if (unformat (line_input, "resolve-via-host"))
-	{
-	  if (vec_len (rpaths) == 0)
-	    {
-	      error = clib_error_return (0, "Paths then flags");
-	      goto done;
-	    }
-	  rpaths[vec_len (rpaths) - 1].frp_flags |=
-	    FIB_ROUTE_PATH_RESOLVE_VIA_HOST;
-	}
-      else if (unformat (line_input, "resolve-via-attached"))
-	{
-	  if (vec_len (rpaths) == 0)
-	    {
-	      error = clib_error_return (0, "Paths then flags");
-	      goto done;
-	    }
-	  rpaths[vec_len (rpaths) - 1].frp_flags |=
-	    FIB_ROUTE_PATH_RESOLVE_VIA_ATTACHED;
-	}
-      else if (unformat (line_input, "out-label %U",
-			 unformat_mpls_unicast_label, &out_label))
-	{
-	  if (vec_len (rpaths) == 0)
-	    {
-	      error = clib_error_return (0, "Paths then labels");
-	      goto done;
-	    }
-	  vec_add1 (rpaths[vec_len (rpaths) - 1].frp_label_stack, out_label);
-	}
-      else if (unformat (line_input, "via-label %U",
-			 unformat_mpls_unicast_label, &rpath.frp_local_label))
-	{
-	  rpath.frp_weight = 1;
-	  rpath.frp_proto = FIB_PROTOCOL_MPLS;
-	  rpath.frp_sw_if_index = ~0;
-	  vec_add1 (rpaths, rpath);
-	}
-      else if (unformat (line_input, "count %f", &count))
-	;
-
-      else if (unformat (line_input, "%U/%d",
-			 unformat_ip4_address, &pfx.fp_addr.ip4, &pfx.fp_len))
-	{
-	  pfx.fp_proto = FIB_PROTOCOL_IP4;
-	  vec_add1 (prefixs, pfx);
-	}
-      else if (unformat (line_input, "%U/%d",
-			 unformat_ip6_address, &pfx.fp_addr.ip6, &pfx.fp_len))
-	{
-	  pfx.fp_proto = FIB_PROTOCOL_IP6;
-	  vec_add1 (prefixs, pfx);
-	}
-      else if (unformat (line_input, "via %U %U weight %u",
-			 unformat_ip4_address,
-			 &rpath.frp_addr.ip4,
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index, &rpath.frp_weight))
-	{
-	  rpath.frp_proto = FIB_PROTOCOL_IP4;
-	  vec_add1 (rpaths, rpath);
-	}
-
-      else if (unformat (line_input, "via %U %U weight %u",
-			 unformat_ip6_address,
-			 &rpath.frp_addr.ip6,
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index, &rpath.frp_weight))
-	{
-	  rpath.frp_proto = FIB_PROTOCOL_IP6;
-	  vec_add1 (rpaths, rpath);
-	}
-
-      else if (unformat (line_input, "via %U %U",
-			 unformat_ip4_address,
-			 &rpath.frp_addr.ip4,
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index))
-	{
-	  rpath.frp_weight = 1;
-	  rpath.frp_proto = FIB_PROTOCOL_IP4;
-	  vec_add1 (rpaths, rpath);
-	}
-
-      else if (unformat (line_input, "via %U %U",
-			 unformat_ip6_address,
-			 &rpath.frp_addr.ip6,
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index))
-	{
-	  rpath.frp_weight = 1;
-	  rpath.frp_proto = FIB_PROTOCOL_IP6;
-	  vec_add1 (rpaths, rpath);
-	}
-      else if (unformat (line_input, "via %U next-hop-table %d",
-			 unformat_ip4_address,
-			 &rpath.frp_addr.ip4, &rpath.frp_fib_index))
-	{
-	  rpath.frp_weight = 1;
-	  rpath.frp_sw_if_index = ~0;
-	  rpath.frp_proto = FIB_PROTOCOL_IP4;
-	  vec_add1 (rpaths, rpath);
-	}
-      else if (unformat (line_input, "via %U next-hop-table %d",
-			 unformat_ip6_address,
-			 &rpath.frp_addr.ip6, &rpath.frp_fib_index))
-	{
-	  rpath.frp_weight = 1;
-	  rpath.frp_sw_if_index = ~0;
-	  rpath.frp_proto = FIB_PROTOCOL_IP6;
-	  vec_add1 (rpaths, rpath);
-	}
-      else if (unformat (line_input, "via %U",
-			 unformat_ip4_address, &rpath.frp_addr.ip4))
-	{
-	  /*
-	   * the recursive next-hops are by default in the same table
-	   * as the prefix
-	   */
-	  rpath.frp_fib_index = table_id;
-	  rpath.frp_weight = 1;
-	  rpath.frp_sw_if_index = ~0;
-	  rpath.frp_proto = FIB_PROTOCOL_IP4;
-	  vec_add1 (rpaths, rpath);
-	}
-      else if (unformat (line_input, "via %U",
-			 unformat_ip6_address, &rpath.frp_addr.ip6))
-	{
-	  rpath.frp_fib_index = table_id;
-	  rpath.frp_weight = 1;
-	  rpath.frp_sw_if_index = ~0;
-	  rpath.frp_proto = FIB_PROTOCOL_IP6;
-	  vec_add1 (rpaths, rpath);
-	}
-      else if (unformat (line_input,
-			 "lookup in table %d", &rpath.frp_fib_index))
-	{
-	  rpath.frp_proto = pfx.fp_proto;
-	  rpath.frp_sw_if_index = ~0;
-	  vec_add1 (rpaths, rpath);
-	}
-      else if (vec_len (prefixs) > 0 &&
-	       unformat (line_input, "via %U",
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index))
-	{
-	  rpath.frp_weight = 1;
-	  rpath.frp_proto = prefixs[0].fp_proto;
-	  vec_add1 (rpaths, rpath);
-	}
-      else if (vec_len (prefixs) > 0 &&
-	       unformat (line_input, "via %U",
-			 unformat_dpo, &dpo, prefixs[0].fp_proto))
-	{
-	  vec_add1 (dpos, dpo);
-	}
-      else
-	{
-	  error = unformat_parse_error (line_input);
-	  goto done;
-	}
-    }
-
-  unformat_free (line_input);
-
-  if (vec_len (prefixs) == 0)
-    {
-      error =
-	clib_error_return (0, "expected ip4/ip6 destination address/length.");
-      goto done;
-    }
-
-  if (!is_del && vec_len (rpaths) + vec_len (dpos) == 0)
-    {
-      error = clib_error_return (0, "expected paths.");
-      goto done;
-    }
-
-  if (~0 == table_id)
-    {
-      /*
-       * if no table_id is passed we will manipulate the default
-       */
-      fib_index = 0;
-    }
-  else
-    {
-      fib_index = fib_table_id_find_fib_index (prefixs[0].fp_proto, table_id);
-
-      if (~0 == fib_index)
-	{
-	  error = clib_error_return (0, "Nonexistent table id %d", table_id);
-	  goto done;
-	}
-    }
-
-  for (i = 0; i < vec_len (prefixs); i++)
-    {
-      if (is_del && 0 == vec_len (rpaths))
-	{
-	  fib_table_entry_delete (fib_index, &prefixs[i], FIB_SOURCE_CLI);
-	}
-      else if (!is_del && 1 == vec_len (dpos))
-	{
-	  fib_table_entry_special_dpo_add (fib_index,
-					   &prefixs[i],
-					   FIB_SOURCE_CLI,
-					   FIB_ENTRY_FLAG_EXCLUSIVE,
-					   &dpos[0]);
-	  dpo_reset (&dpos[0]);
-	}
-      else if (vec_len (dpos) > 0)
-	{
-	  error =
-	    clib_error_return (0,
-			       "Load-balancing over multiple special adjacencies is unsupported");
-	  goto done;
-	}
-      else if (0 < vec_len (rpaths))
-	{
-	  u32 k, j, n, incr;
-	  ip46_address_t dst = prefixs[i].fp_addr;
-	  f64 t[2];
-	  n = count;
-	  t[0] = vlib_time_now (vm);
-	  incr = 1 << ((FIB_PROTOCOL_IP4 == prefixs[0].fp_proto ? 32 : 128) -
-		       prefixs[i].fp_len);
-
-	  for (k = 0; k < n; k++)
-	    {
-	      for (j = 0; j < vec_len (rpaths); j++)
-		{
-		  u32 fi;
-		  /*
-		   * the CLI parsing stored table Ids, swap to FIB indicies
-		   */
-		  fi = fib_table_id_find_fib_index (prefixs[i].fp_proto,
-						    rpaths[i].frp_fib_index);
-
-		  if (~0 == fi)
-		    {
-		      error =
-			clib_error_return (0, "Via table %d does not exist",
-					   rpaths[i].frp_fib_index);
-		      goto done;
-		    }
-		  rpaths[i].frp_fib_index = fi;
-
-		  fib_prefix_t rpfx = {
-		    .fp_len = prefixs[i].fp_len,
-		    .fp_proto = prefixs[i].fp_proto,
-		    .fp_addr = dst,
-		  };
-
-		  if (is_del)
-		    fib_table_entry_path_remove2 (fib_index,
-						  &rpfx,
-						  FIB_SOURCE_CLI, &rpaths[j]);
-		  else
-		    fib_table_entry_path_add2 (fib_index,
-					       &rpfx,
-					       FIB_SOURCE_CLI,
-					       FIB_ENTRY_FLAG_NONE,
-					       &rpaths[j]);
-		}
-
-	      if (FIB_PROTOCOL_IP4 == prefixs[0].fp_proto)
-		{
-		  dst.ip4.as_u32 =
-		    clib_host_to_net_u32 (incr +
-					  clib_net_to_host_u32 (dst.
-								ip4.as_u32));
-		}
-	      else
-		{
-		  int bucket = (incr < 64 ? 0 : 1);
-		  dst.ip6.as_u64[bucket] =
-		    clib_host_to_net_u64 (incr +
-					  clib_net_to_host_u64 (dst.ip6.as_u64
-								[bucket]));
-
-		}
-	    }
-	  t[1] = vlib_time_now (vm);
-	  if (count > 1)
-	    vlib_cli_output (vm, "%.6e routes/sec", count / (t[1] - t[0]));
-	}
-      else
-	{
-	  error = clib_error_return (0, "Don't understand what you want...");
-	  goto done;
-	}
-    }
-
-
-done:
-  vec_free (dpos);
-  vec_free (prefixs);
-  vec_free (rpaths);
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vlib_cli_ip_command, static) = {
-  .path = "ip",
-  .short_help = "Internet protocol (IP) commands",
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vlib_cli_ip6_command, static) = {
-  .path = "ip6",
-  .short_help = "Internet protocol version 6 (IPv6) commands",
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vlib_cli_show_ip_command, static) = {
-  .path = "show ip",
-  .short_help = "Internet protocol (IP) show commands",
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vlib_cli_show_ip6_command, static) = {
-  .path = "show ip6",
-  .short_help = "Internet protocol version 6 (IPv6) show commands",
-};
-/* *INDENT-ON* */
-
-/*?
- * This command is used to add or delete IPv4 or IPv6 routes. All
- * IP Addresses ('<em><dst-ip-addr>/<width></em>',
- * '<em><next-hop-ip-addr></em>' and '<em><adj-hop-ip-addr></em>')
- * can be IPv4 or IPv6, but all must be of the same form in a single
- * command. To display the current set of routes, use the commands
- * '<em>show ip fib</em>' and '<em>show ip6 fib</em>'.
- *
- * @cliexpar
- * Example of how to add a straight forward static route:
- * @cliexcmd{ip route add 6.0.1.2/32 via 6.0.0.1 GigabitEthernet2/0/0}
- * Example of how to delete a straight forward static route:
- * @cliexcmd{ip route del 6.0.1.2/32 via 6.0.0.1 GigabitEthernet2/0/0}
- * Mainly for route add/del performance testing, one can add or delete
- * multiple routes by adding 'count N' to the previous item:
- * @cliexcmd{ip route add count 10 7.0.0.0/24 via 6.0.0.1 GigabitEthernet2/0/0}
- * Add multiple routes for the same destination to create equal-cost multipath:
- * @cliexcmd{ip route add 7.0.0.1/32 via 6.0.0.1 GigabitEthernet2/0/0}
- * @cliexcmd{ip route add 7.0.0.1/32 via 6.0.0.2 GigabitEthernet2/0/0}
- * For unequal-cost multipath, specify the desired weights. This
- * combination of weights results in 3/4 of the traffic following the
- * second path, 1/4 following the first path:
- * @cliexcmd{ip route add 7.0.0.1/32 via 6.0.0.1 GigabitEthernet2/0/0 weight 1}
- * @cliexcmd{ip route add 7.0.0.1/32 via 6.0.0.2 GigabitEthernet2/0/0 weight 3}
- * To add a route to a particular FIB table (VRF), use:
- * @cliexcmd{ip route add 172.16.24.0/24 table 7 via GigabitEthernet2/0/0}
- ?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ip_route_command, static) = {
-  .path = "ip route",
-  .short_help = "ip route [add|del] [count <n>] <dst-ip-addr>/<width> [table <table-id>] [via <next-hop-ip-addr> [<interface>] [weight <weight>]] | [via arp <interface> <adj-hop-ip-addr>] | [via drop|punt|local<id>|arp|classify <classify-idx>] [lookup in table <out-table-id>]",
-  .function = vnet_ip_route_cmd,
-  .is_mp_safe = 1,
-};
-/* *INDENT-ON* */
-
-/*
- * The next two routines address a longstanding script hemorrhoid.
- * Probing a v4 or v6 neighbor needs to appear to be synchronous,
- * or dependent route-adds will simply fail.
- */
-static clib_error_t *
-ip6_probe_neighbor_wait (vlib_main_t * vm, ip6_address_t * a, u32 sw_if_index,
-			 int retry_count)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *e;
-  int i;
-  int resolved = 0;
-  uword event_type;
-  uword *event_data = 0;
-
-  ASSERT (vlib_in_process_context (vm));
-
-  if (retry_count > 0)
-    vnet_register_ip6_neighbor_resolution_event
-      (vnm, a, vlib_get_current_process (vm)->node_runtime.node_index,
-       1 /* event */ , 0 /* data */ );
-
-  for (i = 0; i < retry_count; i++)
-    {
-      /* The interface may be down, etc. */
-      e = ip6_probe_neighbor (vm, a, sw_if_index);
-
-      if (e)
-	return e;
-
-      vlib_process_wait_for_event_or_clock (vm, 1.0);
-      event_type = vlib_process_get_events (vm, &event_data);
-      switch (event_type)
-	{
-	case 1:		/* resolved... */
-	  vlib_cli_output (vm, "Resolved %U", format_ip6_address, a);
-	  resolved = 1;
-	  goto done;
-
-	case ~0:		/* timeout */
-	  break;
-
-	default:
-	  clib_warning ("unknown event_type %d", event_type);
-	}
-      vec_reset_length (event_data);
-    }
-
-done:
-
-  if (!resolved)
-    return clib_error_return (0, "Resolution failed for %U",
-			      format_ip6_address, a);
-  return 0;
-}
-
-static clib_error_t *
-ip4_probe_neighbor_wait (vlib_main_t * vm, ip4_address_t * a, u32 sw_if_index,
-			 int retry_count)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *e;
-  int i;
-  int resolved = 0;
-  uword event_type;
-  uword *event_data = 0;
-
-  ASSERT (vlib_in_process_context (vm));
-
-  if (retry_count > 0)
-    vnet_register_ip4_arp_resolution_event
-      (vnm, a, vlib_get_current_process (vm)->node_runtime.node_index,
-       1 /* event */ , 0 /* data */ );
-
-  for (i = 0; i < retry_count; i++)
-    {
-      /* The interface may be down, etc. */
-      e = ip4_probe_neighbor (vm, a, sw_if_index);
-
-      if (e)
-	return e;
-
-      vlib_process_wait_for_event_or_clock (vm, 1.0);
-      event_type = vlib_process_get_events (vm, &event_data);
-      switch (event_type)
-	{
-	case 1:		/* resolved... */
-	  vlib_cli_output (vm, "Resolved %U", format_ip4_address, a);
-	  resolved = 1;
-	  goto done;
-
-	case ~0:		/* timeout */
-	  break;
-
-	default:
-	  clib_warning ("unknown event_type %d", event_type);
-	}
-      vec_reset_length (event_data);
-    }
-
-done:
-
-  vec_reset_length (event_data);
-
-  if (!resolved)
-    return clib_error_return (0, "Resolution failed for %U",
-			      format_ip4_address, a);
-  return 0;
-}
-
-static clib_error_t *
-probe_neighbor_address (vlib_main_t * vm,
-			unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ip4_address_t a4;
-  ip6_address_t a6;
-  clib_error_t *error = 0;
-  u32 sw_if_index = ~0;
-  int retry_count = 3;
-  int is_ip4 = 1;
-  int address_set = 0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat_user (line_input, unformat_vnet_sw_interface, vnm,
-			 &sw_if_index))
-	;
-      else if (unformat (line_input, "retry %d", &retry_count))
-	;
-
-      else if (unformat (line_input, "%U", unformat_ip4_address, &a4))
-	address_set++;
-      else if (unformat (line_input, "%U", unformat_ip6_address, &a6))
-	{
-	  address_set++;
-	  is_ip4 = 0;
-	}
-      else
-	return clib_error_return (0, "unknown input '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "Interface required, not set.");
-  if (address_set == 0)
-    return clib_error_return (0, "ip address required, not set.");
-  if (address_set > 1)
-    return clib_error_return (0, "Multiple ip addresses not supported.");
-
-  if (is_ip4)
-    error = ip4_probe_neighbor_wait (vm, &a4, sw_if_index, retry_count);
-  else
-    error = ip6_probe_neighbor_wait (vm, &a6, sw_if_index, retry_count);
-
-  return error;
-}
-
-/*?
- * The '<em>ip probe-neighbor</em>' command ARPs for IPv4 addresses or
- * attempts IPv6 neighbor discovery depending on the supplied IP address
- * format.
- *
- * @note This command will not immediately affect the indicated FIB; it
- * is not suitable for use in establishing a FIB entry prior to adding
- * recursive FIB entries. As in: don't use it in a script to probe a
- * gateway prior to adding a default route. It won't work. Instead,
- * configure a static ARP cache entry [see '<em>set ip arp</em>'], or
- * a static IPv6 neighbor [see '<em>set ip6 neighbor</em>'].
- *
- * @cliexpar
- * Example of probe for an IPv4 address:
- * @cliexcmd{ip probe-neighbor GigabitEthernet2/0/0 172.16.1.2}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ip_probe_neighbor_command, static) = {
-  .path = "ip probe-neighbor",
-  .function = probe_neighbor_address,
-  .short_help = "ip probe-neighbor <interface> <ip4-addr> | <ip6-addr> [retry nn]",
-  .is_mp_safe = 1,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/lookup.h b/vnet/vnet/ip/lookup.h
deleted file mode 100644
index 3dbd7b3b..00000000
--- a/vnet/vnet/ip/lookup.h
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/ip_lookup.h: ip (4 or 6) lookup structures, adjacencies, ...
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file
- * Definitions for all things IP (v4|v6) unicast and multicast lookup related.
- *
- * - Adjacency definitions and registration.
- * - Callbacks on route add.
- * - Callbacks on interface address change.
- */
-#ifndef included_ip_lookup_h
-#define included_ip_lookup_h
-
-#include <vnet/vnet.h>
-#include <vlib/buffer.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vnet/fib/fib_node.h>
-#include <vnet/dpo/dpo.h>
-#include <vnet/feature/feature.h>
-
-/** @brief Common (IP4/IP6) next index stored in adjacency. */
-typedef enum
-{
-  /** Adjacency to drop this packet. */
-  IP_LOOKUP_NEXT_DROP,
-  /** Adjacency to punt this packet. */
-  IP_LOOKUP_NEXT_PUNT,
-
-  /** This packet is for one of our own IP addresses. */
-  IP_LOOKUP_NEXT_LOCAL,
-
-  /** This packet matches an "incomplete adjacency" and packets
-     need to be passed to ARP to find rewrite string for
-     this destination. */
-  IP_LOOKUP_NEXT_ARP,
-
-  /** This packet matches an "interface route" and packets
-     need to be passed to ARP to find rewrite string for
-     this destination. */
-  IP_LOOKUP_NEXT_GLEAN,
-
-  /** This packet is to be rewritten and forwarded to the next
-     processing node.  This is typically the output interface but
-     might be another node for further output processing. */
-  IP_LOOKUP_NEXT_REWRITE,
-
-  /** This packets follow a load-balance */
-  IP_LOOKUP_NEXT_LOAD_BALANCE,
-
-  /** This packets follow a mid-chain adjacency */
-  IP_LOOKUP_NEXT_MIDCHAIN,
-
-  /** This packets needs to go to ICMP error */
-  IP_LOOKUP_NEXT_ICMP_ERROR,
-
-  IP_LOOKUP_N_NEXT,
-} ip_lookup_next_t;
-
-typedef enum
-{
-  IP4_LOOKUP_N_NEXT = IP_LOOKUP_N_NEXT,
-} ip4_lookup_next_t;
-
-typedef enum
-{
-  /* Hop-by-hop header handling */
-  IP6_LOOKUP_NEXT_HOP_BY_HOP = IP_LOOKUP_N_NEXT,
-  IP6_LOOKUP_NEXT_ADD_HOP_BY_HOP,
-  IP6_LOOKUP_NEXT_POP_HOP_BY_HOP,
-  IP6_LOOKUP_N_NEXT,
-} ip6_lookup_next_t;
-
-#define IP4_LOOKUP_NEXT_NODES {					\
-    [IP_LOOKUP_NEXT_DROP] = "ip4-drop",				\
-    [IP_LOOKUP_NEXT_PUNT] = "ip4-punt",				\
-    [IP_LOOKUP_NEXT_LOCAL] = "ip4-local",			\
-    [IP_LOOKUP_NEXT_ARP] = "ip4-arp",				\
-    [IP_LOOKUP_NEXT_GLEAN] = "ip4-glean",			\
-    [IP_LOOKUP_NEXT_REWRITE] = "ip4-rewrite",    		\
-    [IP_LOOKUP_NEXT_MIDCHAIN] = "ip4-midchain",		        \
-    [IP_LOOKUP_NEXT_LOAD_BALANCE] = "ip4-load-balance",		\
-    [IP_LOOKUP_NEXT_ICMP_ERROR] = "ip4-icmp-error",		\
-}
-
-#define IP6_LOOKUP_NEXT_NODES {					\
-    [IP_LOOKUP_NEXT_DROP] = "ip6-drop",				\
-    [IP_LOOKUP_NEXT_PUNT] = "ip6-punt",				\
-    [IP_LOOKUP_NEXT_LOCAL] = "ip6-local",			\
-    [IP_LOOKUP_NEXT_ARP] = "ip6-discover-neighbor",		\
-    [IP_LOOKUP_NEXT_GLEAN] = "ip6-glean",			\
-    [IP_LOOKUP_NEXT_REWRITE] = "ip6-rewrite",			\
-    [IP_LOOKUP_NEXT_MIDCHAIN] = "ip6-midchain",			\
-    [IP_LOOKUP_NEXT_LOAD_BALANCE] = "ip6-load-balance",		\
-    [IP_LOOKUP_NEXT_ICMP_ERROR] = "ip6-icmp-error",		\
-    [IP6_LOOKUP_NEXT_HOP_BY_HOP] = "ip6-hop-by-hop",		\
-    [IP6_LOOKUP_NEXT_ADD_HOP_BY_HOP] = "ip6-add-hop-by-hop",	\
-    [IP6_LOOKUP_NEXT_POP_HOP_BY_HOP] = "ip6-pop-hop-by-hop",	\
-}
-
-/** Flow hash configuration */
-#define IP_FLOW_HASH_SRC_ADDR (1<<0)
-#define IP_FLOW_HASH_DST_ADDR (1<<1)
-#define IP_FLOW_HASH_PROTO (1<<2)
-#define IP_FLOW_HASH_SRC_PORT (1<<3)
-#define IP_FLOW_HASH_DST_PORT (1<<4)
-#define IP_FLOW_HASH_REVERSE_SRC_DST (1<<5)
-
-/** Default: 5-tuple without the "reverse" bit */
-#define IP_FLOW_HASH_DEFAULT (0x1F)
-
-#define foreach_flow_hash_bit                   \
-_(src, IP_FLOW_HASH_SRC_ADDR)                   \
-_(dst, IP_FLOW_HASH_DST_ADDR)                   \
-_(sport, IP_FLOW_HASH_SRC_PORT)                 \
-_(dport, IP_FLOW_HASH_DST_PORT)                 \
-_(proto, IP_FLOW_HASH_PROTO)	                \
-_(reverse, IP_FLOW_HASH_REVERSE_SRC_DST)
-
-/**
- * A flow hash configuration is a mask of the flow hash options
- */
-typedef u32 flow_hash_config_t;
-
-/**
- * Forward delcartion
- */
-struct ip_adjacency_t_;
-
-/**
- * @brief A function type for post-rewrite fixups on midchain adjacency
- */
-typedef void (*adj_midchain_fixup_t) (vlib_main_t * vm,
-				      struct ip_adjacency_t_ * adj,
-				      vlib_buffer_t * b0);
-
-/**
- * @brief Flags on an IP adjacency
- */
-typedef enum ip_adjacency_flags_t_
-{
-    /**
-     * Currently a sync walk is active. Used to prevent re-entrant walking
-     */
-  IP_ADJ_SYNC_WALK_ACTIVE = (1 << 0),
-} ip_adjacency_flags_t;
-
-/** @brief IP unicast adjacency.
-    @note cache aligned.
-*/
-typedef struct ip_adjacency_t_
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-
-  /** Number of adjecencies in block.  Greater than 1 means multipath;
-     otherwise equal to 1. */
-  u16 n_adj;
-
-  /** Next hop after ip4-lookup. */
-  union
-  {
-    ip_lookup_next_t lookup_next_index:16;
-    u16 lookup_next_index_as_int;
-  };
-
-  /** Interface address index for this local/arp adjacency. */
-  u32 if_address_index;
-
-  /** Force re-lookup in a different FIB. ~0 => normal behavior */
-  u16 mcast_group_index;
-
-  /** Highest possible perf subgraph arc interposition, e.g. for ip6 ioam */
-  u16 saved_lookup_next_index;
-
-  /*
-   * link/ether-type
-   */
-  vnet_link_t ia_link;
-  u8 ia_nh_proto;
-
-  union
-  {
-    /**
-     * IP_LOOKUP_NEXT_ARP/IP_LOOKUP_NEXT_REWRITE
-     *
-     * neighbour adjacency sub-type;
-     */
-    struct
-    {
-      ip46_address_t next_hop;
-    } nbr;
-      /**
-       * IP_LOOKUP_NEXT_MIDCHAIN
-       *
-       * A nbr adj that is also recursive. Think tunnels.
-       * A nbr adj can transition to be of type MDICHAIN
-       * so be sure to leave the two structs with the next_hop
-       * fields aligned.
-       */
-    struct
-    {
-	  /**
-	   * The recursive next-hop
-	   */
-      ip46_address_t next_hop;
-	  /**
-	   * The node index of the tunnel's post rewrite/TX function.
-	   */
-      u32 tx_function_node;
-	  /**
-	   * The next DPO to use
-	   */
-      dpo_id_t next_dpo;
-	  /**
-	   * A function to perform the post-rewrite fixup
-	   */
-      adj_midchain_fixup_t fixup_func;
-    } midchain;
-      /**
-       * IP_LOOKUP_NEXT_GLEAN
-       *
-       * Glean the address to ARP for from the packet's destination
-       */
-    struct
-    {
-      ip46_address_t receive_addr;
-    } glean;
-  } sub_type;
-
-    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
-
-  /* Rewrite in second/third cache lines */
-    vnet_declare_rewrite (VLIB_BUFFER_PRE_DATA_SIZE);
-
-  /*
-   * member not accessed in the data plane are relgated to the
-   * remaining cachelines
-   */
-  fib_node_t ia_node;
-
-  /**
-   * Flags on the adjacency
-   */
-  ip_adjacency_flags_t ia_flags;
-
-} ip_adjacency_t;
-
-STATIC_ASSERT ((STRUCT_OFFSET_OF (ip_adjacency_t, cacheline0) == 0),
-	       "IP adjacency cachline 0 is not offset");
-STATIC_ASSERT ((STRUCT_OFFSET_OF (ip_adjacency_t, cacheline1) ==
-		CLIB_CACHE_LINE_BYTES),
-	       "IP adjacency cachline 1 is more than one cachline size offset");
-
-/* An all zeros address */
-extern const ip46_address_t zero_addr;
-
-/* IP multicast adjacency. */
-typedef struct
-{
-  /* Handle for this adjacency in adjacency heap. */
-  u32 heap_handle;
-
-  /* Number of adjecencies in block. */
-  u32 n_adj;
-
-  /* Rewrite string. */
-    vnet_declare_rewrite (64 - 2 * sizeof (u32));
-}
-ip_multicast_rewrite_t;
-
-typedef struct
-{
-  /* ip4-multicast-rewrite next index. */
-  u32 next_index;
-
-  u8 n_rewrite_bytes;
-
-  u8 rewrite_string[64 - 1 * sizeof (u32) - 1 * sizeof (u8)];
-}
-ip_multicast_rewrite_string_t;
-
-typedef struct
-{
-  ip_multicast_rewrite_t *rewrite_heap;
-
-  ip_multicast_rewrite_string_t *rewrite_strings;
-
-  /* Negative rewrite string index; >= 0 sw_if_index.
-     Sorted.  Used to hash. */
-  i32 **adjacency_id_vector;
-
-  uword *adjacency_by_id_vector;
-} ip_multicast_lookup_main_t;
-
-typedef struct
-{
-  /* Key for mhash; in fact, just a byte offset into mhash key vector. */
-  u32 address_key;
-
-  /* Interface which has this address. */
-  u32 sw_if_index;
-
-  /* Adjacency for neighbor probe (ARP) for this interface address. */
-  u32 neighbor_probe_adj_index;
-
-  /* Address (prefix) length for this interface. */
-  u16 address_length;
-
-  /* Will be used for something eventually.  Primary vs. secondary? */
-  u16 flags;
-
-  /* Next and previous pointers for doubly linked list of
-     addresses per software interface. */
-  u32 next_this_sw_interface;
-  u32 prev_this_sw_interface;
-} ip_interface_address_t;
-
-typedef enum
-{
-  IP_LOCAL_NEXT_DROP,
-  IP_LOCAL_NEXT_PUNT,
-  IP_LOCAL_NEXT_UDP_LOOKUP,
-  IP_LOCAL_NEXT_ICMP,
-  IP_LOCAL_N_NEXT,
-} ip_local_next_t;
-
-struct ip_lookup_main_t;
-
-typedef struct ip_lookup_main_t
-{
-  /* Adjacency heap. */
-  ip_adjacency_t *adjacency_heap;
-
-  /** load-balance  packet/byte counters indexed by LB index. */
-  vlib_combined_counter_main_t load_balance_counters;
-
-  /** Pool of addresses that are assigned to interfaces. */
-  ip_interface_address_t *if_address_pool;
-
-  /** Hash table mapping address to index in interface address pool. */
-  mhash_t address_to_if_address_index;
-
-  /** Head of doubly linked list of interface addresses for each software interface.
-     ~0 means this interface has no address. */
-  u32 *if_address_pool_index_by_sw_if_index;
-
-  /** First table index to use for this interface, ~0 => none */
-  u32 *classify_table_index_by_sw_if_index;
-
-  /** Feature arc indices */
-  u8 mcast_feature_arc_index;
-  u8 ucast_feature_arc_index;
-  u8 output_feature_arc_index;
-
-  /** Number of bytes in a fib result.  Must be at least
-     sizeof (uword).  First word is always adjacency index. */
-  u32 fib_result_n_bytes, fib_result_n_words;
-
-  format_function_t *format_fib_result;
-
-  /** 1 for ip6; 0 for ip4. */
-  u32 is_ip6;
-
-  /** Either format_ip4_address_and_length or format_ip6_address_and_length. */
-  format_function_t *format_address_and_length;
-
-  /** Special adjacency format functions */
-  format_function_t **special_adjacency_format_functions;
-
-  /** Table mapping ip protocol to ip[46]-local node next index. */
-  u8 local_next_by_ip_protocol[256];
-
-  /** IP_BUILTIN_PROTOCOL_{TCP,UDP,ICMP,OTHER} by protocol in IP header. */
-  u8 builtin_protocol_by_ip_protocol[256];
-} ip_lookup_main_t;
-
-always_inline ip_adjacency_t *
-ip_get_adjacency (ip_lookup_main_t * lm, u32 adj_index)
-{
-  ip_adjacency_t *adj;
-
-  adj = vec_elt_at_index (lm->adjacency_heap, adj_index);
-
-  return adj;
-}
-
-#define ip_prefetch_adjacency(lm,adj_index,type)		\
-do {								\
-  ip_adjacency_t * _adj = (lm)->adjacency_heap + (adj_index);	\
-  CLIB_PREFETCH (_adj, sizeof (_adj[0]), type);			\
-} while (0)
-
-/* Create new block of given number of contiguous adjacencies. */
-ip_adjacency_t *ip_add_adjacency (ip_lookup_main_t * lm,
-				  ip_adjacency_t * adj,
-				  u32 n_adj, u32 * adj_index_result);
-
-clib_error_t *ip_interface_address_add_del (ip_lookup_main_t * lm,
-					    u32 sw_if_index,
-					    void *address,
-					    u32 address_length,
-					    u32 is_del, u32 * result_index);
-
-u8 *format_ip_flow_hash_config (u8 * s, va_list * args);
-
-always_inline ip_interface_address_t *
-ip_get_interface_address (ip_lookup_main_t * lm, void *addr_fib)
-{
-  uword *p = mhash_get (&lm->address_to_if_address_index, addr_fib);
-  return p ? pool_elt_at_index (lm->if_address_pool, p[0]) : 0;
-}
-
-u32 fib_table_id_find_fib_index (fib_protocol_t proto, u32 table_id);
-
-always_inline void *
-ip_interface_address_get_address (ip_lookup_main_t * lm,
-				  ip_interface_address_t * a)
-{
-  return mhash_key_to_mem (&lm->address_to_if_address_index, a->address_key);
-}
-
-/* *INDENT-OFF* */
-#define foreach_ip_interface_address(lm,a,sw_if_index,loop,body)        \
-do {                                                                    \
-    vnet_main_t *_vnm = vnet_get_main();                                     \
-    u32 _sw_if_index = sw_if_index;                                     \
-    vnet_sw_interface_t *_swif;                                         \
-    _swif = vnet_get_sw_interface (_vnm, _sw_if_index);                 \
-                                                                        \
-    /*                                                                  \
-     * Loop => honor unnumbered interface addressing.                   \
-     */                                                                 \
-    if (loop && _swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)       \
-      _sw_if_index = _swif->unnumbered_sw_if_index;                     \
-    u32 _ia =                                                           \
-      (vec_len((lm)->if_address_pool_index_by_sw_if_index)              \
-       > (_sw_if_index))                                                \
-        ? vec_elt ((lm)->if_address_pool_index_by_sw_if_index,          \
-                   (_sw_if_index)) : (u32)~0;                           \
-    ip_interface_address_t * _a;                                        \
-    while (_ia != ~0)                                                   \
-    {                                                                   \
-        _a = pool_elt_at_index ((lm)->if_address_pool, _ia);            \
-        _ia = _a->next_this_sw_interface;                               \
-        (a) = _a;                                                       \
-        body;                                                           \
-    }                                                                   \
-} while (0)
-/* *INDENT-ON* */
-
-void ip_lookup_init (ip_lookup_main_t * lm, u32 ip_lookup_node_index);
-
-#endif /* included_ip_lookup_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ping.c b/vnet/vnet/ip/ping.c
deleted file mode 100644
index 68dbe759..00000000
--- a/vnet/vnet/ip/ping.c
+++ /dev/null
@@ -1,888 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/ip/ping.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/fib_entry.h>
-
-/**
- * @file
- * @brief IPv4 and IPv6 ICMP Ping.
- *
- * This file contains code to suppport IPv4 or IPv6 ICMP ECHO_REQUEST to
- * network hosts.
- *
- */
-
-
-u8 *
-format_icmp_echo_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  icmp_echo_trace_t *t = va_arg (*va, icmp_echo_trace_t *);
-
-  s = format (s, "ICMP echo id %d seq %d%s",
-	      clib_net_to_host_u16 (t->id),
-	      clib_net_to_host_u16 (t->seq), t->bound ? "" : " (unknown)");
-
-  return s;
-}
-
-/*
- * If we can find the ping run by an ICMP ID, then we send the signal
- * to the CLI process referenced by that ping run, alongside with
- * a freshly made copy of the packet.
- * I opted for a packet copy to keep the main packet processing path
- * the same as for all the other nodes.
- *
- */
-
-static int
-signal_ip46_icmp_reply_event (vlib_main_t * vm,
-			      u8 event_type, vlib_buffer_t * b0)
-{
-  ping_main_t *pm = &ping_main;
-  u16 net_icmp_id = 0;
-  u32 bi0_copy = 0;
-
-  switch (event_type)
-    {
-    case PING_RESPONSE_IP4:
-      {
-	icmp4_echo_request_header_t *h0 = vlib_buffer_get_current (b0);
-	net_icmp_id = h0->icmp_echo.id;
-      }
-      break;
-    case PING_RESPONSE_IP6:
-      {
-	icmp6_echo_request_header_t *h0 = vlib_buffer_get_current (b0);
-	net_icmp_id = h0->icmp_echo.id;
-      }
-      break;
-    default:
-      return 0;
-    }
-
-  uword *p = hash_get (pm->ping_run_by_icmp_id,
-		       clib_net_to_host_u16 (net_icmp_id));
-  if (!p)
-    return 0;
-
-  ping_run_t *pr = vec_elt_at_index (pm->ping_runs, p[0]);
-  if (vlib_buffer_alloc (vm, &bi0_copy, 1) == 1)
-    {
-      void *dst = vlib_buffer_get_current (vlib_get_buffer (vm, bi0_copy));
-      clib_memcpy (dst, vlib_buffer_get_current (b0), b0->current_length);
-    }
-  /* If buffer_alloc failed, bi0_copy == 0 - just signaling an event. */
-
-  vlib_process_signal_event (vm, pr->cli_process_id, event_type, bi0_copy);
-  return 1;
-}
-
-/*
- * Process ICMPv6 echo replies
- */
-static uword
-ip6_icmp_echo_reply_node_fn (vlib_main_t * vm,
-			     vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from;
-
-  from = vlib_frame_vector_args (frame);	/* array of buffer indices */
-  n_left_from = frame->n_vectors;	/* number of buffer indices */
-
-  while (n_left_from > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      u32 next0;
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-
-      next0 = signal_ip46_icmp_reply_event (vm, PING_RESPONSE_IP6, b0) ?
-	ICMP6_ECHO_REPLY_NEXT_DROP : ICMP6_ECHO_REPLY_NEXT_PUNT;
-
-      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	{
-	  icmp6_echo_request_header_t *h0 = vlib_buffer_get_current (b0);
-	  icmp_echo_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
-	  tr->id = h0->icmp_echo.id;
-	  tr->seq = h0->icmp_echo.seq;
-	  tr->bound = (next0 == ICMP6_ECHO_REPLY_NEXT_DROP);
-	}
-
-      /* push this pkt to the next graph node */
-      vlib_set_next_frame_buffer (vm, node, next0, bi0);
-
-      from += 1;
-      n_left_from -= 1;
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_icmp_echo_reply_node, static) =
-{
-  .function = ip6_icmp_echo_reply_node_fn,
-  .name = "ip6-icmp-echo-reply",
-  .vector_size = sizeof (u32),
-  .format_trace = format_icmp_echo_trace,
-  .n_next_nodes = ICMP6_ECHO_REPLY_N_NEXT,
-  .next_nodes = {
-    [ICMP6_ECHO_REPLY_NEXT_DROP] = "error-drop",
-    [ICMP6_ECHO_REPLY_NEXT_PUNT] = "error-punt",
-  },
-};
-/* *INDENT-ON* */
-
-/*
- * Process ICMPv4 echo replies
- */
-static uword
-ip4_icmp_echo_reply_node_fn (vlib_main_t * vm,
-			     vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from;
-
-  from = vlib_frame_vector_args (frame);	/* array of buffer indices */
-  n_left_from = frame->n_vectors;	/* number of buffer indices */
-
-  while (n_left_from > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      u32 next0;
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-
-      next0 = signal_ip46_icmp_reply_event (vm, PING_RESPONSE_IP4, b0) ?
-	ICMP4_ECHO_REPLY_NEXT_DROP : ICMP4_ECHO_REPLY_NEXT_PUNT;
-
-      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	{
-	  icmp4_echo_request_header_t *h0 = vlib_buffer_get_current (b0);
-	  icmp_echo_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
-	  tr->id = h0->icmp_echo.id;
-	  tr->seq = h0->icmp_echo.seq;
-	  tr->bound = (next0 == ICMP4_ECHO_REPLY_NEXT_DROP);
-	}
-
-      /* push this pkt to the next graph node */
-      vlib_set_next_frame_buffer (vm, node, next0, bi0);
-
-      from += 1;
-      n_left_from -= 1;
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_icmp_echo_reply_node, static) =
-{
-  .function = ip4_icmp_echo_reply_node_fn,
-  .name = "ip4-icmp-echo-reply",
-  .vector_size = sizeof (u32),
-  .format_trace = format_icmp_echo_trace,
-  .n_next_nodes = ICMP4_ECHO_REPLY_N_NEXT,
-  .next_nodes = {
-    [ICMP4_ECHO_REPLY_NEXT_DROP] = "error-drop",
-    [ICMP4_ECHO_REPLY_NEXT_PUNT] = "error-punt",
-  },
-};
-/* *INDENT-ON* */
-
-char *ip6_lookup_next_nodes[] = IP6_LOOKUP_NEXT_NODES;
-char *ip4_lookup_next_nodes[] = IP4_LOOKUP_NEXT_NODES;
-
-/* get first interface address */
-static ip6_address_t *
-ip6_interface_first_address (ip6_main_t * im, u32 sw_if_index)
-{
-  ip_lookup_main_t *lm = &im->lookup_main;
-  ip_interface_address_t *ia = 0;
-  ip6_address_t *result = 0;
-
-  /* *INDENT-OFF* */
-  foreach_ip_interface_address (lm, ia, sw_if_index,
-                                1 /* honor unnumbered */ ,
-  ({
-    ip6_address_t * a =
-      ip_interface_address_get_address (lm, ia);
-    result = a;
-    break;
-  }));
-  /* *INDENT-ON* */
-  return result;
-}
-
-/* Fill in the ICMP ECHO structure, return the safety-checked and possibly shrunk data_len */
-static u16
-init_icmp46_echo_request (icmp46_echo_request_t * icmp46_echo,
-			  u16 seq_host, u16 id_host, u16 data_len)
-{
-  int i;
-  icmp46_echo->seq = clib_host_to_net_u16 (seq_host);
-  icmp46_echo->id = clib_host_to_net_u16 (id_host);
-
-  for (i = 0; i < sizeof (icmp46_echo->data); i++)
-    {
-      icmp46_echo->data[i] = i % 256;
-    }
-
-  if (data_len > sizeof (icmp46_echo_request_t))
-    {
-      data_len = sizeof (icmp46_echo_request_t);
-    }
-  return data_len;
-}
-
-static send_ip46_ping_result_t
-send_ip6_ping (vlib_main_t * vm, ip6_main_t * im,
-	       u32 table_id, ip6_address_t * pa6,
-	       u32 sw_if_index, u16 seq_host, u16 id_host, u16 data_len,
-	       u8 verbose)
-{
-  icmp6_echo_request_header_t *h0;
-  u32 bi0 = 0;
-  int bogus_length = 0;
-  vlib_buffer_t *p0;
-  vlib_frame_t *f;
-  u32 *to_next;
-
-  if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
-    return SEND_PING_ALLOC_FAIL;
-
-  p0 = vlib_get_buffer (vm, bi0);
-
-  /*
-   * if the user did not provide a source interface, use the any interface
-   * that the destination resolves via.
-   */
-  if (~0 == sw_if_index)
-    {
-      fib_node_index_t fib_entry_index;
-      u32 fib_index;
-
-      fib_index = ip6_fib_index_from_table_id (table_id);
-
-      if (~0 == fib_index)
-	{
-	  vlib_buffer_free (vm, &bi0, 1);
-	  return SEND_PING_NO_TABLE;
-	}
-
-      fib_entry_index = ip6_fib_table_lookup (fib_index, pa6, 128);
-      sw_if_index = fib_entry_get_resolving_interface (fib_entry_index);
-      /*
-       * Set the TX interface to force ip-lookup to use its table ID
-       */
-      vnet_buffer (p0)->sw_if_index[VLIB_TX] = fib_index;
-    }
-  else
-    {
-      /*
-       * force an IP lookup in the table bound to the user's chosen
-       * source interface.
-       */
-      vnet_buffer (p0)->sw_if_index[VLIB_TX] =
-	ip6_fib_table_get_index_for_sw_if_index (sw_if_index);
-    }
-
-  if (~0 == sw_if_index)
-    {
-      vlib_buffer_free (vm, &bi0, 1);
-      return SEND_PING_NO_INTERFACE;
-    }
-
-  vnet_buffer (p0)->sw_if_index[VLIB_RX] = sw_if_index;
-
-  h0 = vlib_buffer_get_current (p0);
-
-  /* Fill in ip6 header fields */
-  h0->ip6.ip_version_traffic_class_and_flow_label =
-    clib_host_to_net_u32 (0x6 << 28);
-  h0->ip6.payload_length = 0;	/* Set below */
-  h0->ip6.protocol = IP_PROTOCOL_ICMP6;
-  h0->ip6.hop_limit = 255;
-  h0->ip6.dst_address = *pa6;
-  h0->ip6.src_address = *pa6;
-
-  /* Fill in the correct source now */
-  ip6_address_t *a = ip6_interface_first_address (im, sw_if_index);
-  h0->ip6.src_address = a[0];
-
-  /* Fill in icmp fields */
-  h0->icmp.type = ICMP6_echo_request;
-  h0->icmp.code = 0;
-  h0->icmp.checksum = 0;
-
-  data_len =
-    init_icmp46_echo_request (&h0->icmp_echo, seq_host, id_host, data_len);
-  h0->icmp_echo.time_sent = vlib_time_now (vm);
-
-  /* Fix up the lengths */
-  h0->ip6.payload_length =
-    clib_host_to_net_u16 (data_len + sizeof (icmp46_header_t));
-
-  p0->current_length = clib_net_to_host_u16 (h0->ip6.payload_length) +
-    STRUCT_OFFSET_OF (icmp6_echo_request_header_t, icmp);
-
-  /* Calculate the ICMP checksum */
-  h0->icmp.checksum = 0;
-  h0->icmp.checksum =
-    ip6_tcp_udp_icmp_compute_checksum (vm, 0, &h0->ip6, &bogus_length);
-
-  /* Enqueue the packet right now */
-  f = vlib_get_frame_to_node (vm, ip6_lookup_node.index);
-  to_next = vlib_frame_vector_args (f);
-  to_next[0] = bi0;
-  f->n_vectors = 1;
-  vlib_put_frame_to_node (vm, ip6_lookup_node.index, f);
-
-  return SEND_PING_OK;
-}
-
-static send_ip46_ping_result_t
-send_ip4_ping (vlib_main_t * vm,
-	       ip4_main_t * im,
-	       u32 table_id,
-	       ip4_address_t * pa4,
-	       u32 sw_if_index,
-	       u16 seq_host, u16 id_host, u16 data_len, u8 verbose)
-{
-  icmp4_echo_request_header_t *h0;
-  u32 bi0 = 0;
-  ip_lookup_main_t *lm = &im->lookup_main;
-  vlib_buffer_t *p0;
-  vlib_frame_t *f;
-  u32 *to_next;
-  u32 if_add_index0;
-
-  if (vlib_buffer_alloc (vm, &bi0, 1) != 1)
-    return SEND_PING_ALLOC_FAIL;
-
-  p0 = vlib_get_buffer (vm, bi0);
-
-  /*
-   * if the user did not provide a source interface, use the any interface
-   * that the destination resolves via.
-   */
-  if (~0 == sw_if_index)
-    {
-      fib_node_index_t fib_entry_index;
-      u32 fib_index;
-
-      fib_index = ip4_fib_index_from_table_id (table_id);
-
-      if (~0 == fib_index)
-	{
-	  vlib_buffer_free (vm, &bi0, 1);
-	  return SEND_PING_NO_TABLE;
-	}
-
-      fib_entry_index =
-	ip4_fib_table_lookup (ip4_fib_get (fib_index), pa4, 32);
-      sw_if_index = fib_entry_get_resolving_interface (fib_entry_index);
-      /*
-       * Set the TX interface to force ip-lookup to use the user's table ID
-       */
-      vnet_buffer (p0)->sw_if_index[VLIB_TX] = fib_index;
-    }
-  else
-    {
-      /*
-       * force an IP lookup in the table bound to the user's chosen
-       * source interface.
-       */
-      vnet_buffer (p0)->sw_if_index[VLIB_TX] =
-	ip4_fib_table_get_index_for_sw_if_index (sw_if_index);
-    }
-
-  if (~0 == sw_if_index)
-    {
-      vlib_buffer_free (vm, &bi0, 1);
-      return SEND_PING_NO_INTERFACE;
-    }
-
-  vnet_buffer (p0)->sw_if_index[VLIB_RX] = sw_if_index;
-
-  h0 = vlib_buffer_get_current (p0);
-
-  /* Fill in ip4 header fields */
-  h0->ip4.checksum = 0;
-  h0->ip4.ip_version_and_header_length = 0x45;
-  h0->ip4.tos = 0;
-  h0->ip4.length = 0;		/* Set below */
-  h0->ip4.fragment_id = 0;
-  h0->ip4.flags_and_fragment_offset = 0;
-  h0->ip4.ttl = 0xff;
-  h0->ip4.protocol = IP_PROTOCOL_ICMP;
-  h0->ip4.dst_address = *pa4;
-  h0->ip4.src_address = *pa4;
-
-  /* Fill in the correct source now */
-  if_add_index0 = lm->if_address_pool_index_by_sw_if_index[sw_if_index];
-  if (PREDICT_TRUE (if_add_index0 != ~0))
-    {
-      ip_interface_address_t *if_add =
-	pool_elt_at_index (lm->if_address_pool, if_add_index0);
-      ip4_address_t *if_ip = ip_interface_address_get_address (lm, if_add);
-      h0->ip4.src_address = *if_ip;
-      if (verbose)
-	{
-	  vlib_cli_output (vm, "Source address: %U",
-			   format_ip4_address, &h0->ip4.src_address);
-	}
-    }
-
-  /* Fill in icmp fields */
-  h0->icmp.type = ICMP4_echo_request;
-  h0->icmp.code = 0;
-  h0->icmp.checksum = 0;
-
-  data_len =
-    init_icmp46_echo_request (&h0->icmp_echo, seq_host, id_host, data_len);
-  h0->icmp_echo.time_sent = vlib_time_now (vm);
-
-  /* Fix up the lengths */
-  h0->ip4.length =
-    clib_host_to_net_u16 (data_len + sizeof (icmp46_header_t) +
-			  sizeof (ip4_header_t));
-
-  p0->current_length = clib_net_to_host_u16 (h0->ip4.length);
-
-  /* Calculate the IP and ICMP checksums */
-  h0->ip4.checksum = ip4_header_checksum (&(h0->ip4));
-  h0->icmp.checksum =
-    ~ip_csum_fold (ip_incremental_checksum (0, &(h0->icmp),
-					    p0->current_length -
-					    sizeof (ip4_header_t)));
-
-  /* Enqueue the packet right now */
-  f = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
-  to_next = vlib_frame_vector_args (f);
-  to_next[0] = bi0;
-  f->n_vectors = 1;
-  vlib_put_frame_to_node (vm, ip4_lookup_node.index, f);
-
-  return SEND_PING_OK;
-}
-
-
-static void
-print_ip6_icmp_reply (vlib_main_t * vm, u32 bi0)
-{
-  vlib_buffer_t *b0 = vlib_get_buffer (vm, bi0);
-  icmp6_echo_request_header_t *h0 = vlib_buffer_get_current (b0);
-  f64 rtt = vlib_time_now (vm) - h0->icmp_echo.time_sent;
-
-  vlib_cli_output (vm,
-		   "%d bytes from %U: icmp_seq=%d ttl=%d time=%.4f ms",
-		   clib_host_to_net_u16 (h0->ip6.payload_length),
-		   format_ip6_address,
-		   &h0->ip6.src_address,
-		   clib_host_to_net_u16 (h0->icmp_echo.seq),
-		   h0->ip6.hop_limit, rtt * 1000.0);
-}
-
-static void
-print_ip4_icmp_reply (vlib_main_t * vm, u32 bi0)
-{
-  vlib_buffer_t *b0 = vlib_get_buffer (vm, bi0);
-  icmp4_echo_request_header_t *h0 = vlib_buffer_get_current (b0);
-  f64 rtt = vlib_time_now (vm) - h0->icmp_echo.time_sent;
-  u32 rcvd_icmp_len =
-    clib_host_to_net_u16 (h0->ip4.length) -
-    (4 * (0xF & h0->ip4.ip_version_and_header_length));
-
-  vlib_cli_output (vm,
-		   "%d bytes from %U: icmp_seq=%d ttl=%d time=%.4f ms",
-		   rcvd_icmp_len,
-		   format_ip4_address,
-		   &h0->ip4.src_address,
-		   clib_host_to_net_u16 (h0->icmp_echo.seq),
-		   h0->ip4.ttl, rtt * 1000.0);
-}
-
-
-/*
- * Perform the ping run with the given parameters in the current CLI process.
- * Depending on whether pa4 or pa6 is set, runs IPv4 or IPv6 ping.
- * The amusing side effect is of course if both are set, then both pings are sent.
- * This behavior can be used to ping a dualstack host over IPv4 and IPv6 at once.
- */
-
-static void
-run_ping_ip46_address (vlib_main_t * vm, u32 table_id, ip4_address_t * pa4,
-		       ip6_address_t * pa6, u32 sw_if_index,
-		       f64 ping_interval, u32 ping_repeat, u32 data_len,
-		       u32 verbose)
-{
-  int i;
-  ping_main_t *pm = &ping_main;
-  uword curr_proc = vlib_current_process (vm);
-  u32 n_replies = 0;
-  u32 n_requests = 0;
-  ping_run_t *pr = 0;
-  u32 ping_run_index = 0;
-  u16 icmp_id;
-
-  static u32 rand_seed = 0;
-
-  if (PREDICT_FALSE (!rand_seed))
-    rand_seed = random_default_seed ();
-
-  icmp_id = random_u32 (&rand_seed) & 0xffff;
-
-  while (hash_get (pm->ping_run_by_icmp_id, icmp_id))
-    {
-      vlib_cli_output (vm, "ICMP ID collision at %d, incrementing", icmp_id);
-      icmp_id++;
-    }
-  pool_get (pm->ping_runs, pr);
-  ping_run_index = pr - pm->ping_runs;
-  pr->cli_process_id = curr_proc;
-  pr->icmp_id = icmp_id;
-  hash_set (pm->ping_run_by_icmp_id, icmp_id, ping_run_index);
-  for (i = 1; i <= ping_repeat; i++)
-    {
-      f64 sleep_interval;
-      f64 time_ping_sent = vlib_time_now (vm);
-      /* Reset pr: running ping in other process could have changed pm->ping_runs */
-      pr = vec_elt_at_index (pm->ping_runs, ping_run_index);
-      pr->curr_seq = i;
-      if (pa6 &&
-	  (SEND_PING_OK ==
-	   send_ip6_ping (vm, ping_main.ip6_main, table_id, pa6, sw_if_index,
-			  i, icmp_id, data_len, verbose)))
-	{
-	  n_requests++;
-	}
-      if (pa4 &&
-	  (SEND_PING_OK ==
-	   send_ip4_ping (vm, ping_main.ip4_main, table_id, pa4, sw_if_index,
-			  i, icmp_id, data_len, verbose)))
-	{
-	  n_requests++;
-	}
-      while ((i <= ping_repeat)
-	     &&
-	     ((sleep_interval =
-	       time_ping_sent + ping_interval - vlib_time_now (vm)) > 0.0))
-	{
-	  uword event_type, *event_data = 0;
-	  vlib_process_wait_for_event_or_clock (vm, sleep_interval);
-	  event_type = vlib_process_get_events (vm, &event_data);
-	  switch (event_type)
-	    {
-	    case ~0:		/* no events => timeout */
-	      break;
-	    case PING_RESPONSE_IP6:
-	      {
-		int i;
-		for (i = 0; i < vec_len (event_data); i++)
-		  {
-		    u32 bi0 = event_data[0];
-		    print_ip6_icmp_reply (vm, bi0);
-		    n_replies++;
-		    if (0 != bi0)
-		      {
-			vlib_buffer_free (vm, &bi0, 1);
-		      }
-		  }
-	      }
-	      break;
-	    case PING_RESPONSE_IP4:
-	      {
-		int i;
-		for (i = 0; i < vec_len (event_data); i++)
-		  {
-		    u32 bi0 = event_data[0];
-		    print_ip4_icmp_reply (vm, bi0);
-		    n_replies++;
-		    if (0 != bi0)
-		      {
-			vlib_buffer_free (vm, &bi0, 1);
-		      }
-		  }
-	      }
-	      break;
-	    default:
-	      /* someone pressed a key, abort */
-	      vlib_cli_output (vm, "Aborted due to a keypress.");
-	      i = 1 + ping_repeat;
-	      break;
-	    }
-	}
-    }
-  vlib_cli_output (vm, "\n");
-  {
-    float loss =
-      (0 ==
-       n_requests) ? 0 : 100.0 * ((float) n_requests -
-				  (float) n_replies) / (float) n_requests;
-    vlib_cli_output (vm,
-		     "Statistics: %u sent, %u received, %f%% packet loss\n",
-		     n_requests, n_replies, loss);
-    /* Reset pr: running ping in other process could have changed pm->ping_runs */
-    pr = vec_elt_at_index (pm->ping_runs, ping_run_index);
-    hash_unset (pm->ping_run_by_icmp_id, icmp_id);
-    pool_put (pm->ping_runs, pr);
-  }
-}
-
-
-
-
-
-static clib_error_t *
-ping_ip_address (vlib_main_t * vm,
-		 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  ip4_address_t a4;
-  ip6_address_t a6;
-  clib_error_t *error = 0;
-  u32 ping_repeat = 5;
-  u8 ping_ip4, ping_ip6;
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 data_len = PING_DEFAULT_DATA_LEN;
-  u32 verbose = 0;
-  f64 ping_interval = PING_DEFAULT_INTERVAL;
-  u32 sw_if_index, table_id;
-
-  table_id = 0;
-  ping_ip4 = ping_ip6 = 0;
-  sw_if_index = ~0;
-
-  if (unformat (input, "%U", unformat_ip4_address, &a4))
-    {
-      ping_ip4 = 1;
-    }
-  else if (unformat (input, "%U", unformat_ip6_address, &a6))
-    {
-      ping_ip6 = 1;
-    }
-  else if (unformat (input, "ipv4"))
-    {
-      if (unformat (input, "%U", unformat_ip4_address, &a4))
-	{
-	  ping_ip4 = 1;
-	}
-      else
-	{
-	  error =
-	    clib_error_return (0,
-			       "expecting IPv4 address but got `%U'",
-			       format_unformat_error, input);
-	}
-    }
-  else if (unformat (input, "ipv6"))
-    {
-      if (unformat (input, "%U", unformat_ip6_address, &a6))
-	{
-	  ping_ip6 = 1;
-	}
-      else
-	{
-	  error =
-	    clib_error_return (0,
-			       "expecting IPv6 address but got `%U'",
-			       format_unformat_error, input);
-	}
-    }
-  else
-    {
-      error =
-	clib_error_return (0,
-			   "expecting IP4/IP6 address `%U'. Usage: ping <addr> [source <intf>] [size <datasz>] [repeat <count>] [verbose]",
-			   format_unformat_error, input);
-      goto done;
-    }
-
-  /* allow for the second AF in the same ping */
-  if (!ping_ip4 && (unformat (input, "ipv4")))
-    {
-      if (unformat (input, "%U", unformat_ip4_address, &a4))
-	{
-	  ping_ip4 = 1;
-	}
-    }
-  else if (!ping_ip6 && (unformat (input, "ipv6")))
-    {
-      if (unformat (input, "%U", unformat_ip6_address, &a6))
-	{
-	  ping_ip6 = 1;
-	}
-    }
-
-  /* parse the rest of the parameters  in a cycle */
-  while (!unformat_eof (input, NULL))
-    {
-      if (unformat (input, "source"))
-	{
-	  if (!unformat_user
-	      (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-	    {
-	      error =
-		clib_error_return (0,
-				   "unknown interface `%U'",
-				   format_unformat_error, input);
-	      goto done;
-	    }
-	}
-      else if (unformat (input, "size"))
-	{
-	  if (!unformat (input, "%u", &data_len))
-	    {
-	      error =
-		clib_error_return (0,
-				   "expecting size but got `%U'",
-				   format_unformat_error, input);
-	      goto done;
-	    }
-	}
-      else if (unformat (input, "table-id"))
-	{
-	  if (!unformat (input, "du", &table_id))
-	    {
-	      error =
-		clib_error_return (0,
-				   "expecting table-id but got `%U'",
-				   format_unformat_error, input);
-	      goto done;
-	    }
-	}
-      else if (unformat (input, "interval"))
-	{
-	  if (!unformat (input, "%f", &ping_interval))
-	    {
-	      error =
-		clib_error_return (0,
-				   "expecting interval (floating point number) got `%U'",
-				   format_unformat_error, input);
-	      goto done;
-	    }
-	}
-      else if (unformat (input, "repeat"))
-	{
-	  if (!unformat (input, "%u", &ping_repeat))
-	    {
-	      error =
-		clib_error_return (0,
-				   "expecting repeat count but got `%U'",
-				   format_unformat_error, input);
-	      goto done;
-	    }
-	}
-      else if (unformat (input, "verbose"))
-	{
-	  verbose = 1;
-	}
-      else
-	{
-	  error = clib_error_return (0, "unknown input `%U'",
-				     format_unformat_error, input);
-	  goto done;
-	}
-    }
-
-  run_ping_ip46_address (vm, table_id, ping_ip4 ? &a4 : NULL,
-			 ping_ip6 ? &a6 : NULL, sw_if_index, ping_interval,
-			 ping_repeat, data_len, verbose);
-done:
-  return error;
-}
-
-/*?
- * This command sends an ICMP ECHO_REQUEST to network hosts. The address
- * can be an IPv4 or IPv6 address (or both at the same time).
- *
- * @cliexpar
- * @parblock
- * Example of how ping an IPv4 address:
- * @cliexstart{ping 172.16.1.2 source GigabitEthernet2/0/0 repeat 2}
- * 64 bytes from 172.16.1.2: icmp_seq=1 ttl=64 time=.1090 ms
- * 64 bytes from 172.16.1.2: icmp_seq=2 ttl=64 time=.0914 ms
- *
- * Statistics: 2 sent, 2 received, 0% packet loss
- * @cliexend
- *
- * Example of how ping both an IPv4 address and IPv6 address at the same time:
- * @cliexstart{ping 172.16.1.2 ipv6 fe80::24a5:f6ff:fe9c:3a36 source GigabitEthernet2/0/0 repeat 2 verbose}
- * Adjacency index: 10, sw_if_index: 1
- * Adj: ip6-discover-neighbor
- * Adj Interface: 0
- * Forced set interface: 1
- * Adjacency index: 0, sw_if_index: 4294967295
- * Adj: ip4-miss
- * Adj Interface: 0
- * Forced set interface: 1
- * Source address: 172.16.1.1
- * 64 bytes from 172.16.1.2: icmp_seq=1 ttl=64 time=.1899 ms
- * Adjacency index: 10, sw_if_index: 1
- * Adj: ip6-discover-neighbor
- * Adj Interface: 0
- * Forced set interface: 1
- * Adjacency index: 0, sw_if_index: 4294967295
- * Adj: ip4-miss
- * Adj Interface: 0
- * Forced set interface: 1
- * Source address: 172.16.1.1
- * 64 bytes from 172.16.1.2: icmp_seq=2 ttl=64 time=.0910 ms
- *
- * Statistics: 4 sent, 2 received, 50% packet loss
- * @cliexend
- * @endparblock
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ping_command, static) =
-{
-  .path = "ping",
-  .function = ping_ip_address,
-  .short_help = "ping {<ip-addr> | ipv4 <ip4-addr> | ipv6 <ip6-addr>}"
-  " [ipv4 <ip4-addr> | ipv6 <ip6-addr>] [source <interface>]"
-  " [size <pktsize>] [interval <sec>] [repeat <cnt>] [table-id <id>]"
-  " [verbose]",
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-ping_cli_init (vlib_main_t * vm)
-{
-  ping_main_t *pm = &ping_main;
-  pm->ip6_main = &ip6_main;
-  pm->ip4_main = &ip4_main;
-  icmp6_register_type (vm, ICMP6_echo_reply, ip6_icmp_echo_reply_node.index);
-  ip4_icmp_register_type (vm, ICMP4_echo_reply,
-			  ip4_icmp_echo_reply_node.index);
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ping_cli_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/ping.h b/vnet/vnet/ip/ping.h
deleted file mode 100644
index 8f41f45c..00000000
--- a/vnet/vnet/ip/ping.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vnet_ping_h
-#define included_vnet_ping_h
-
-
-#include <vnet/ip/ip.h>
-
-#include <vnet/ip/lookup.h>
-
-typedef enum
-{
-  PING_RESPONSE_IP6 = 42,
-  PING_RESPONSE_IP4,
-} ping_response_type_t;
-
-typedef enum
-{
-  SEND_PING_OK = 0,
-  SEND_PING_ALLOC_FAIL,
-  SEND_PING_NO_INTERFACE,
-  SEND_PING_NO_TABLE,
-} send_ip46_ping_result_t;
-
-/*
- * Currently running ping command.
- */
-typedef struct ping_run_t
-{
-  u16 icmp_id;
-  u16 curr_seq;
-  uword cli_process_id;
-} ping_run_t;
-
-typedef struct ping_main_t
-{
-  ip6_main_t *ip6_main;
-  ip4_main_t *ip4_main;
-  ping_run_t *ping_runs;
-  /* hash table to find back the CLI process for a reply */
-  // uword *cli_proc_by_icmp_id;
-  ping_run_t *ping_run_by_icmp_id;
-} ping_main_t;
-
-ping_main_t ping_main;
-
-#define PING_DEFAULT_DATA_LEN 60
-#define PING_DEFAULT_INTERVAL 1.0
-
-#define PING_MAXIMUM_DATA_SIZE 2000
-
-typedef CLIB_PACKED (struct
-		     {
-		     u16 id;
-		     u16 seq; f64 time_sent; u8 data[PING_MAXIMUM_DATA_SIZE];
-		     }) icmp46_echo_request_t;
-
-
-typedef CLIB_PACKED (struct
-		     {
-		     ip6_header_t ip6;
-		     icmp46_header_t icmp; icmp46_echo_request_t icmp_echo;
-		     }) icmp6_echo_request_header_t;
-
-typedef CLIB_PACKED (struct
-		     {
-		     ip4_header_t ip4;
-		     icmp46_header_t icmp; icmp46_echo_request_t icmp_echo;
-		     }) icmp4_echo_request_header_t;
-
-
-typedef struct
-{
-  u16 id;
-  u16 seq;
-  u8 bound;
-} icmp_echo_trace_t;
-
-
-
-
-typedef enum
-{
-  ICMP6_ECHO_REPLY_NEXT_DROP,
-  ICMP6_ECHO_REPLY_NEXT_PUNT,
-  ICMP6_ECHO_REPLY_N_NEXT,
-} icmp6_echo_reply_next_t;
-
-typedef enum
-{
-  ICMP4_ECHO_REPLY_NEXT_DROP,
-  ICMP4_ECHO_REPLY_NEXT_PUNT,
-  ICMP4_ECHO_REPLY_N_NEXT,
-} icmp4_echo_reply_next_t;
-
-#endif /* included_vnet_ping_h */
diff --git a/vnet/vnet/ip/ports.def b/vnet/vnet/ip/ports.def
deleted file mode 100644
index cdb754f5..00000000
--- a/vnet/vnet/ip/ports.def
+++ /dev/null
@@ -1,757 +0,0 @@
-/*
- * ip/ports.def: tcp/udp port definitions
- *
- * Eliot Dresselhaus
- * August, 2005
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
-PORT NUMBERS
-
-(last updated 18 October 2005) 
-
-The port numbers are divided into three ranges: the Well Known Ports,
-the Registered Ports, and the Dynamic and/or Private Ports.
-
-The Well Known Ports are those from 0 through 1023.
-
-The Registered Ports are those from 1024 through 49151
-
-The Dynamic and/or Private Ports are those from 49152 through 65535
-
-
-************************************************************************
-* PLEASE NOTE THE FOLLOWING:                                           *
-*                                                                      *
-* 1. UNASSIGNED PORT NUMBERS SHOULD NOT BE USED.  THE IANA WILL ASSIGN *
-* THE NUMBER FOR THE PORT AFTER YOUR APPLICATION HAS BEEN APPROVED.    *
-*                                                                      *
-* 2. ASSIGNMENT OF A PORT NUMBER DOES NOT IN ANY WAY IMPLY AN          *
-* ENDORSEMENT OF AN APPLICATION OR PRODUCT, AND THE FACT THAT NETWORK  *
-* TRAFFIC IS FLOWING TO OR FROM A REGISTERED PORT DOES NOT MEAN THAT   *
-* IT IS "GOOD" TRAFFIC. FIREWALL AND SYSTEM ADMINISTRATORS SHOULD      *
-* CHOOSE HOW TO CONFIGURE THEIR SYSTEMS BASED ON THEIR KNOWLEDGE OF    *
-* THE TRAFFIC IN QUESTION, NOT WHETHER THERE IS A PORT NUMBER          *
-* REGISTERED OR NOT.                                                   *
-************************************************************************
-
-
-WELL KNOWN PORT NUMBERS
-
-The Well Known Ports are assigned by the IANA and on most systems can
-only be used by system (or root) processes or by programs executed by
-privileged users.
-
-Ports are used in the TCP [RFC793] to name the ends of logical
-connections which carry long term conversations.  For the purpose of
-providing services to unknown callers, a service contact port is
-defined.  This list specifies the port used by the server process as
-its contact port.  The contact port is sometimes called the
-"well-known port".
-
-To the extent possible, these same port assignments are used with the
-UDP [RFC768].
-
-The range for assigned ports managed by the IANA is 0-1023.
-*/
-ip_port (TCPMUX, 1)
-ip_port (COMPRESS_NET_MANAGEMENT, 2)
-ip_port (COMPRESS_NET, 3)
-ip_port (RJE, 5)
-ip_port (ECHO, 7)
-ip_port (DISCARD, 9)
-ip_port (SYSTAT, 11)
-ip_port (DAYTIME, 13)
-ip_port (QOTD, 17)
-ip_port (MSP, 18)
-ip_port (CHARGEN, 19)
-ip_port (FTP_DATA, 20)
-ip_port (FTP, 21)
-ip_port (SSH, 22)
-ip_port (TELNET, 23)
-ip_port (SMTP, 25)
-ip_port (NSW_FE, 27)
-ip_port (MSG_ICP, 29)
-ip_port (MSG_AUTH, 31)
-ip_port (DSP, 33)
-ip_port (TIME, 37)
-ip_port (RAP, 38)
-ip_port (RLP, 39)
-ip_port (GRAPHICS, 41)
-ip_port (NAME, 42)
-ip_port (NAMESERVER, 42)
-ip_port (NICNAME, 43)
-ip_port (MPM_FLAGS, 44)
-ip_port (MPM, 45)
-ip_port (MPM_SND, 46)
-ip_port (NI_FTP, 47)
-ip_port (AUDITD, 48)
-ip_port (TACACS, 49)
-ip_port (RE_MAIL_CK, 50)
-ip_port (LA_MAINT, 51)
-ip_port (XNS_TIME, 52)
-ip_port (DNS, 53)
-ip_port (XNS_CH, 54)
-ip_port (ISI_GL, 55)
-ip_port (XNS_AUTH, 56)
-ip_port (XNS_MAIL, 58)
-ip_port (NI_MAIL, 61)
-ip_port (ACAS, 62)
-ip_port (WHOIS_PLUS_PLUS, 63)
-ip_port (COVIA, 64)
-ip_port (TACACS_DS, 65)
-ip_port (ORACLE_SQL_NET, 66)
-ip_port (BOOTPS, 67)
-ip_port (BOOTPC, 68)
-ip_port (TFTP, 69)
-ip_port (GOPHER, 70)
-ip_port (NETRJS_1, 71)
-ip_port (NETRJS_2, 72)
-ip_port (NETRJS_3, 73)
-ip_port (NETRJS_4, 74)
-ip_port (DEOS, 76)
-ip_port (VETTCP, 78)
-ip_port (FINGER, 79)
-ip_port (WWW, 80)
-ip_port (HOSTS2_NS, 81)
-ip_port (XFER, 82)
-ip_port (MIT_ML_DEV, 83)
-ip_port (CTF, 84)
-ip_port (MIT_ML_DEV1, 85)
-ip_port (MFCOBOL, 86)
-ip_port (KERBEROS, 88)
-ip_port (SU_MIT_TG, 89)
-ip_port (DNSIX, 90)
-ip_port (MIT_DOV, 91)
-ip_port (NPP, 92)
-ip_port (DCP, 93)
-ip_port (OBJCALL, 94)
-ip_port (SUPDUP, 95)
-ip_port (DIXIE, 96)
-ip_port (SWIFT_RVF, 97)
-ip_port (TACNEWS, 98)
-ip_port (METAGRAM, 99)
-ip_port (NEWACCT, 100)
-ip_port (HOSTNAME, 101)
-ip_port (ISO_TSAP, 102)
-ip_port (GPPITNP, 103)
-ip_port (ACR_NEMA, 104)
-ip_port (CSO, 105)
-ip_port (CSNET_NS, 105)
-ip_port (3COM_TSMUX, 106)
-ip_port (RTELNET, 107)
-ip_port (SNAGAS, 108)
-ip_port (POP2, 109)
-ip_port (POP3, 110)
-ip_port (SUNRPC, 111)
-ip_port (MCIDAS, 112)
-ip_port (IDENT, 113)
-ip_port (SFTP, 115)
-ip_port (ANSANOTIFY, 116)
-ip_port (UUCP_PATH, 117)
-ip_port (SQLSERV, 118)
-ip_port (NNTP, 119)
-ip_port (CFDPTKT, 120)
-ip_port (ERPC, 121)
-ip_port (SMAKYNET, 122)
-ip_port (NTP, 123)
-ip_port (ANSATRADER, 124)
-ip_port (LOCUS_MAP, 125)
-ip_port (NXEDIT, 126)
-ip_port (LOCUS_CON, 127)
-ip_port (GSS_XLICEN, 128)
-ip_port (PWDGEN, 129)
-ip_port (CISCO_FNA, 130)
-ip_port (CISCO_TNA, 131)
-ip_port (CISCO_SYS, 132)
-ip_port (STATSRV, 133)
-ip_port (INGRES_NET, 134)
-ip_port (EPMAP, 135)
-ip_port (PROFILE, 136)
-ip_port (NETBIOS_NS, 137)
-ip_port (NETBIOS_DGM, 138)
-ip_port (NETBIOS_SSN, 139)
-ip_port (EMFIS_DATA, 140)
-ip_port (EMFIS_CNTL, 141)
-ip_port (BL_IDM, 142)
-ip_port (IMAP, 143)
-ip_port (UMA, 144)
-ip_port (UAAC, 145)
-ip_port (ISO_TP0, 146)
-ip_port (ISO_IP, 147)
-ip_port (JARGON, 148)
-ip_port (AED_512, 149)
-ip_port (SQL_NET, 150)
-ip_port (HEMS, 151)
-ip_port (BFTP, 152)
-ip_port (SGMP, 153)
-ip_port (NETSC_PROD, 154)
-ip_port (NETSC_DEV, 155)
-ip_port (SQLSRV, 156)
-ip_port (KNET_CMP, 157)
-ip_port (PCMAIL_SRV, 158)
-ip_port (NSS_ROUTING, 159)
-ip_port (SGMP_TRAPS, 160)
-ip_port (SNMP, 161)
-ip_port (SNMPTRAP, 162)
-ip_port (CMIP_MAN, 163)
-ip_port (CMIP_AGENT, 164)
-ip_port (XNS_COURIER, 165)
-ip_port (S_NET, 166)
-ip_port (NAMP, 167)
-ip_port (RSVD, 168)
-ip_port (SEND, 169)
-ip_port (PRINT_SRV, 170)
-ip_port (MULTIPLEX, 171)
-ip_port (CL1, 172)
-ip_port (XYPLEX_MUX, 173)
-ip_port (MAILQ, 174)
-ip_port (VMNET, 175)
-ip_port (GENRAD_MUX, 176)
-ip_port (XDMCP, 177)
-ip_port (NEXTSTEP, 178)
-ip_port (BGP, 179)
-ip_port (RIS, 180)
-ip_port (UNIFY, 181)
-ip_port (AUDIT, 182)
-ip_port (OCBINDER, 183)
-ip_port (OCSERVER, 184)
-ip_port (REMOTE_KIS, 185)
-ip_port (KIS, 186)
-ip_port (ACI, 187)
-ip_port (MUMPS, 188)
-ip_port (QFT, 189)
-ip_port (GACP, 190)
-ip_port (PROSPERO, 191)
-ip_port (OSU_NMS, 192)
-ip_port (SRMP, 193)
-ip_port (IRC, 194)
-ip_port (DN6_NLM_AUD, 195)
-ip_port (DN6_SMM_RED, 196)
-ip_port (DLS, 197)
-ip_port (DLS_MON, 198)
-ip_port (SMUX, 199)
-ip_port (SRC, 200)
-ip_port (AT_RTMP, 201)
-ip_port (AT_NBP, 202)
-ip_port (AT_3, 203)
-ip_port (AT_ECHO, 204)
-ip_port (AT_5, 205)
-ip_port (AT_ZIS, 206)
-ip_port (AT_7, 207)
-ip_port (AT_8, 208)
-ip_port (QMTP, 209)
-ip_port (Z39_50, 210)
-ip_port (TI914CG, 211)
-ip_port (ANET, 212)
-ip_port (IPX, 213)
-ip_port (VMPWSCS, 214)
-ip_port (SOFTPC, 215)
-ip_port (CAILIC, 216)
-ip_port (DBASE, 217)
-ip_port (MPP, 218)
-ip_port (UARPS, 219)
-ip_port (IMAP3, 220)
-ip_port (FLN_SPX, 221)
-ip_port (RSH_SPX, 222)
-ip_port (CDC, 223)
-ip_port (MASQDIALER, 224)
-ip_port (DIRECT, 242)
-ip_port (SUR_MEAS, 243)
-ip_port (INBUSINESS, 244)
-ip_port (LINK, 245)
-ip_port (DSP3270, 246)
-ip_port (SUBNTBCST_TFTP, 247)
-ip_port (BHFHS, 248)
-ip_port (RAP1, 256)
-ip_port (SET, 257)
-ip_port (YAK_CHAT, 258)
-ip_port (ESRO_GEN, 259)
-ip_port (OPENPORT, 260)
-ip_port (NSIIOPS, 261)
-ip_port (ARCISDMS, 262)
-ip_port (HDAP, 263)
-ip_port (BGMP, 264)
-ip_port (X_BONE_CTL, 265)
-ip_port (SST, 266)
-ip_port (TD_SERVICE, 267)
-ip_port (TD_REPLICA, 268)
-ip_port (HTTP_MGMT, 280)
-ip_port (PERSONAL_LINK, 281)
-ip_port (CABLEPORT_AX, 282)
-ip_port (RESCAP, 283)
-ip_port (CORERJD, 284)
-ip_port (FXP, 286)
-ip_port (K_BLOCK, 287)
-ip_port (NOVASTORBAKCUP, 308)
-ip_port (ENTRUSTTIME, 309)
-ip_port (BHMDS, 310)
-ip_port (ASIP_WEBADMIN, 311)
-ip_port (VSLMP, 312)
-ip_port (MAGENTA_LOGIC, 313)
-ip_port (OPALIS_ROBOT, 314)
-ip_port (DPSI, 315)
-ip_port (DECAUTH, 316)
-ip_port (ZANNET, 317)
-ip_port (PKIX_TIMESTAMP, 318)
-ip_port (PTP_EVENT, 319)
-ip_port (PTP_GENERAL, 320)
-ip_port (PIP, 321)
-ip_port (RTSPS, 322)
-ip_port (TEXAR, 333)
-ip_port (PDAP, 344)
-ip_port (PAWSERV, 345)
-ip_port (ZSERV, 346)
-ip_port (FATSERV, 347)
-ip_port (CSI_SGWP, 348)
-ip_port (MFTP, 349)
-ip_port (MATIP_TYPE_A, 350)
-ip_port (MATIP_TYPE_B, 351)
-ip_port (BHOETTY, 351)
-ip_port (DTAG_STE_SB, 352)
-ip_port (BHOEDAP4, 352)
-ip_port (NDSAUTH, 353)
-ip_port (BH611, 354)
-ip_port (DATEX_ASN, 355)
-ip_port (CLOANTO_NET_1, 356)
-ip_port (BHEVENT, 357)
-ip_port (SHRINKWRAP, 358)
-ip_port (NSRMP, 359)
-ip_port (SCOI2ODIALOG, 360)
-ip_port (SEMANTIX, 361)
-ip_port (SRSSEND, 362)
-ip_port (RSVP_TUNNEL, 363)
-ip_port (AURORA_CMGR, 364)
-ip_port (DTK, 365)
-ip_port (ODMR, 366)
-ip_port (MORTGAGEWARE, 367)
-ip_port (QBIKGDP, 368)
-ip_port (RPC2PORTMAP, 369)
-ip_port (CODAAUTH2, 370)
-ip_port (CLEARCASE, 371)
-ip_port (ULISTPROC, 372)
-ip_port (LEGENT_1, 373)
-ip_port (LEGENT_2, 374)
-ip_port (HASSLE, 375)
-ip_port (NIP, 376)
-ip_port (TNETOS, 377)
-ip_port (DSETOS, 378)
-ip_port (IS99C, 379)
-ip_port (IS99S, 380)
-ip_port (HP_COLLECTOR, 381)
-ip_port (HP_MANAGED_NODE, 382)
-ip_port (HP_ALARM_MGR, 383)
-ip_port (ARNS, 384)
-ip_port (IBM_APP, 385)
-ip_port (ASA, 386)
-ip_port (AURP, 387)
-ip_port (UNIDATA_LDM, 388)
-ip_port (LDAP, 389)
-ip_port (UIS, 390)
-ip_port (SYNOTICS_RELAY, 391)
-ip_port (SYNOTICS_BROKER, 392)
-ip_port (META5, 393)
-ip_port (EMBL_NDT, 394)
-ip_port (NETCP, 395)
-ip_port (NETWARE_IP, 396)
-ip_port (MPTN, 397)
-ip_port (KRYPTOLAN, 398)
-ip_port (ISO_TSAP_C2, 399)
-ip_port (WORK_SOL, 400)
-ip_port (UPS, 401)
-ip_port (GENIE, 402)
-ip_port (DECAP, 403)
-ip_port (NCED, 404)
-ip_port (NCLD, 405)
-ip_port (IMSP, 406)
-ip_port (TIMBUKTU, 407)
-ip_port (PRM_SM, 408)
-ip_port (PRM_NM, 409)
-ip_port (DECLADEBUG, 410)
-ip_port (RMT, 411)
-ip_port (SYNOPTICS_TRAP, 412)
-ip_port (SMSP, 413)
-ip_port (INFOSEEK, 414)
-ip_port (BNET, 415)
-ip_port (SILVERPLATTER, 416)
-ip_port (ONMUX, 417)
-ip_port (HYPER_G, 418)
-ip_port (ARIEL1, 419)
-ip_port (SMPTE, 420)
-ip_port (ARIEL2, 421)
-ip_port (ARIEL3, 422)
-ip_port (OPC_JOB_START, 423)
-ip_port (OPC_JOB_TRACK, 424)
-ip_port (ICAD_EL, 425)
-ip_port (SMARTSDP, 426)
-ip_port (SVRLOC, 427)
-ip_port (OCS_CMU, 428)
-ip_port (OCS_AMU, 429)
-ip_port (UTMPSD, 430)
-ip_port (UTMPCD, 431)
-ip_port (IASD, 432)
-ip_port (NNSP, 433)
-ip_port (MOBILEIP_AGENT, 434)
-ip_port (MOBILIP_MN, 435)
-ip_port (DNA_CML, 436)
-ip_port (COMSCM, 437)
-ip_port (DSFGW, 438)
-ip_port (DASP, 439)
-ip_port (SGCP, 440)
-ip_port (DECVMS_SYSMGT, 441)
-ip_port (CVC_HOSTD, 442)
-ip_port (HTTPS, 443)
-ip_port (SNPP, 444)
-ip_port (MICROSOFT_DS, 445)
-ip_port (DDM_RDB, 446)
-ip_port (DDM_DFM, 447)
-ip_port (DDM_SSL, 448)
-ip_port (AS_SERVERMAP, 449)
-ip_port (TSERVER, 450)
-ip_port (SFS_SMP_NET, 451)
-ip_port (SFS_CONFIG, 452)
-ip_port (CREATIVESERVER, 453)
-ip_port (CONTENTSERVER, 454)
-ip_port (CREATIVEPARTNR, 455)
-ip_port (MACON_TCP, 456)
-ip_port (SCOHELP, 457)
-ip_port (APPLEQTC, 458)
-ip_port (AMPR_RCMD, 459)
-ip_port (SKRONK, 460)
-ip_port (DATASURFSRV, 461)
-ip_port (DATASURFSRVSEC, 462)
-ip_port (ALPES, 463)
-ip_port (KPASSWD, 464)
-ip_port (URD, 465)
-ip_port (DIGITAL_VRC, 466)
-ip_port (MYLEX_MAPD, 467)
-ip_port (PHOTURIS, 468)
-ip_port (RCP, 469)
-ip_port (SCX_PROXY, 470)
-ip_port (MONDEX, 471)
-ip_port (LJK_LOGIN, 472)
-ip_port (HYBRID_POP, 473)
-ip_port (TN_TL_W1, 474)
-ip_port (TCPNETHASPSRV, 475)
-ip_port (TN_TL_FD1, 476)
-ip_port (SS7NS, 477)
-ip_port (SPSC, 478)
-ip_port (IAFSERVER, 479)
-ip_port (IAFDBASE, 480)
-ip_port (PH, 481)
-ip_port (BGS_NSI, 482)
-ip_port (ULPNET, 483)
-ip_port (INTEGRA_SME, 484)
-ip_port (POWERBURST, 485)
-ip_port (AVIAN, 486)
-ip_port (SAFT, 487)
-ip_port (GSS_HTTP, 488)
-ip_port (NEST_PROTOCOL, 489)
-ip_port (MICOM_PFS, 490)
-ip_port (GO_LOGIN, 491)
-ip_port (TICF_1, 492)
-ip_port (TICF_2, 493)
-ip_port (POV_RAY, 494)
-ip_port (INTECOURIER, 495)
-ip_port (PIM_RP_DISC, 496)
-ip_port (DANTZ, 497)
-ip_port (SIAM, 498)
-ip_port (ISO_ILL, 499)
-ip_port (ISAKMP, 500)
-ip_port (STMF, 501)
-ip_port (ASA_APPL_PROTO, 502)
-ip_port (INTRINSA, 503)
-ip_port (CITADEL, 504)
-ip_port (MAILBOX_LM, 505)
-ip_port (OHIMSRV, 506)
-ip_port (CRS, 507)
-ip_port (XVTTP, 508)
-ip_port (SNARE, 509)
-ip_port (FCP, 510)
-ip_port (PASSGO, 511)
-ip_port (EXEC, 512)
-ip_port (LOGIN, 513)
-ip_port (SHELL, 514)
-ip_port (PRINTER, 515)
-ip_port (VIDEOTEX, 516)
-ip_port (TALK, 517)
-ip_port (NTALK, 518)
-ip_port (UTIME, 519)
-ip_port (EFS, 520)
-ip_port (RIPNG, 521)
-ip_port (ULP, 522)
-ip_port (IBM_DB2, 523)
-ip_port (NCP, 524)
-ip_port (TIMED, 525)
-ip_port (TEMPO, 526)
-ip_port (STX, 527)
-ip_port (CUSTIX, 528)
-ip_port (IRC_SERV, 529)
-ip_port (COURIER, 530)
-ip_port (CONFERENCE, 531)
-ip_port (NETNEWS, 532)
-ip_port (NETWALL, 533)
-ip_port (MM_ADMIN, 534)
-ip_port (IIOP, 535)
-ip_port (OPALIS_RDV, 536)
-ip_port (NMSP, 537)
-ip_port (GDOMAP, 538)
-ip_port (APERTUS_LDP, 539)
-ip_port (UUCP, 540)
-ip_port (UUCP_RLOGIN, 541)
-ip_port (COMMERCE, 542)
-ip_port (KLOGIN, 543)
-ip_port (KSHELL, 544)
-ip_port (APPLEQTCSRVR, 545)
-ip_port (DHCPV6_CLIENT, 546)
-ip_port (DHCPV6_SERVER, 547)
-ip_port (AFPOVERTCP, 548)
-ip_port (IDFP, 549)
-ip_port (NEW_RWHO, 550)
-ip_port (CYBERCASH, 551)
-ip_port (DEVSHR_NTS, 552)
-ip_port (PIRP, 553)
-ip_port (RTSP, 554)
-ip_port (DSF, 555)
-ip_port (REMOTEFS, 556)
-ip_port (OPENVMS_SYSIPC, 557)
-ip_port (SDNSKMP, 558)
-ip_port (TEEDTAP, 559)
-ip_port (RMONITOR, 560)
-ip_port (MONITOR, 561)
-ip_port (CHSHELL, 562)
-ip_port (NNTPS, 563)
-ip_port (9PFS, 564)
-ip_port (WHOAMI, 565)
-ip_port (STREETTALK, 566)
-ip_port (BANYAN_RPC, 567)
-ip_port (MS_SHUTTLE, 568)
-ip_port (MS_ROME, 569)
-ip_port (METER, 570)
-ip_port (METER1, 571)
-ip_port (SONAR, 572)
-ip_port (BANYAN_VIP, 573)
-ip_port (FTP_AGENT, 574)
-ip_port (VEMMI, 575)
-ip_port (IPCD, 576)
-ip_port (VNAS, 577)
-ip_port (IPDD, 578)
-ip_port (DECBSRV, 579)
-ip_port (SNTP_HEARTBEAT, 580)
-ip_port (BDP, 581)
-ip_port (SCC_SECURITY, 582)
-ip_port (PHILIPS_VC, 583)
-ip_port (KEYSERVER, 584)
-ip_port (IMAP4_SSL, 585)
-ip_port (PASSWORD_CHG, 586)
-ip_port (SUBMISSION, 587)
-ip_port (CAL, 588)
-ip_port (EYELINK, 589)
-ip_port (TNS_CML, 590)
-ip_port (HTTP_ALT, 591)
-ip_port (EUDORA_SET, 592)
-ip_port (HTTP_RPC_EPMAP, 593)
-ip_port (TPIP, 594)
-ip_port (CAB_PROTOCOL, 595)
-ip_port (SMSD, 596)
-ip_port (PTCNAMESERVICE, 597)
-ip_port (SCO_WEBSRVRMG3, 598)
-ip_port (ACP, 599)
-ip_port (IPCSERVER, 600)
-ip_port (SYSLOG_CONN, 601)
-ip_port (XMLRPC_BEEP, 602)
-ip_port (IDXP, 603)
-ip_port (TUNNEL, 604)
-ip_port (SOAP_BEEP, 605)
-ip_port (URM, 606)
-ip_port (NQS, 607)
-ip_port (SIFT_UFT, 608)
-ip_port (NPMP_TRAP, 609)
-ip_port (NPMP_LOCAL, 610)
-ip_port (NPMP_GUI, 611)
-ip_port (HMMP_IND, 612)
-ip_port (HMMP_OP, 613)
-ip_port (SSHELL, 614)
-ip_port (SCO_INETMGR, 615)
-ip_port (SCO_SYSMGR, 616)
-ip_port (SCO_DTMGR, 617)
-ip_port (DEI_ICDA, 618)
-ip_port (COMPAQ_EVM, 619)
-ip_port (SCO_WEBSRVRMGR, 620)
-ip_port (ESCP_IP, 621)
-ip_port (COLLABORATOR, 622)
-ip_port (ASF_RMCP, 623)
-ip_port (CRYPTOADMIN, 624)
-ip_port (DEC_DLM, 625)
-ip_port (ASIA, 626)
-ip_port (PASSGO_TIVOLI, 627)
-ip_port (QMQP, 628)
-ip_port (3COM_AMP3, 629)
-ip_port (RDA, 630)
-ip_port (IPP, 631)
-ip_port (BMPP, 632)
-ip_port (SERVSTAT, 633)
-ip_port (GINAD, 634)
-ip_port (RLZDBASE, 635)
-ip_port (LDAPS, 636)
-ip_port (LANSERVER, 637)
-ip_port (MCNS_SEC, 638)
-ip_port (MSDP, 639)
-ip_port (ENTRUST_SPS, 640)
-ip_port (REPCMD, 641)
-ip_port (ESRO_EMSDP, 642)
-ip_port (SANITY, 643)
-ip_port (DWR, 644)
-ip_port (PSSC, 645)
-ip_port (LDP, 646)
-ip_port (DHCP_FAILOVER, 647)
-ip_port (RRP, 648)
-ip_port (CADVIEW_3D, 649)
-ip_port (OBEX, 650)
-ip_port (IEEE_MMS, 651)
-ip_port (HELLO_PORT, 652)
-ip_port (REPSCMD, 653)
-ip_port (AODV, 654)
-ip_port (TINC, 655)
-ip_port (SPMP, 656)
-ip_port (RMC, 657)
-ip_port (TENFOLD, 658)
-ip_port (MAC_SRVR_ADMIN, 660)
-ip_port (HAP, 661)
-ip_port (PFTP, 662)
-ip_port (PURENOISE, 663)
-ip_port (ASF_SECURE_RMCP, 664)
-ip_port (SUN_DR, 665)
-ip_port (MDQS, 666)
-ip_port (DOOM, 666)
-ip_port (DISCLOSE, 667)
-ip_port (MECOMM, 668)
-ip_port (MEREGISTER, 669)
-ip_port (VACDSM_SWS, 670)
-ip_port (VACDSM_APP, 671)
-ip_port (VPPS_QUA, 672)
-ip_port (CIMPLEX, 673)
-ip_port (ACAP, 674)
-ip_port (DCTP, 675)
-ip_port (VPPS_VIA, 676)
-ip_port (VPP, 677)
-ip_port (GGF_NCP, 678)
-ip_port (MRM, 679)
-ip_port (ENTRUST_AAAS, 680)
-ip_port (ENTRUST_AAMS, 681)
-ip_port (XFR, 682)
-ip_port (CORBA_IIOP, 683)
-ip_port (CORBA_IIOP_SSL, 684)
-ip_port (MDC_PORTMAPPER, 685)
-ip_port (HCP_WISMAR, 686)
-ip_port (ASIPREGISTRY, 687)
-ip_port (REALM_RUSD, 688)
-ip_port (NMAP, 689)
-ip_port (VATP, 690)
-ip_port (MSEXCH_ROUTING, 691)
-ip_port (HYPERWAVE_ISP, 692)
-ip_port (CONNENDP, 693)
-ip_port (HA_CLUSTER, 694)
-ip_port (IEEE_MMS_SSL, 695)
-ip_port (RUSHD, 696)
-ip_port (UUIDGEN, 697)
-ip_port (OLSR, 698)
-ip_port (ACCESSNETWORK, 699)
-ip_port (EPP, 700)
-ip_port (LMP, 701)
-ip_port (IRIS_BEEP, 702)
-ip_port (ELCSD, 704)
-ip_port (AGENTX, 705)
-ip_port (SILC, 706)
-ip_port (BORLAND_DSJ, 707)
-ip_port (ENTRUST_KMSH, 709)
-ip_port (ENTRUST_ASH, 710)
-ip_port (CISCO_TDP, 711)
-ip_port (TBRPF, 712)
-ip_port (NETVIEWDM1, 729)
-ip_port (NETVIEWDM2, 730)
-ip_port (NETVIEWDM3, 731)
-ip_port (NETGW, 741)
-ip_port (NETRCS, 742)
-ip_port (FLEXLM, 744)
-ip_port (FUJITSU_DEV, 747)
-ip_port (RIS_CM, 748)
-ip_port (KERBEROS_ADM, 749)
-ip_port (RFILE, 750)
-ip_port (PUMP, 751)
-ip_port (QRH, 752)
-ip_port (RRH, 753)
-ip_port (TELL, 754)
-ip_port (NLOGIN, 758)
-ip_port (CON, 759)
-ip_port (NS, 760)
-ip_port (RXE, 761)
-ip_port (QUOTAD, 762)
-ip_port (CYCLESERV, 763)
-ip_port (OMSERV, 764)
-ip_port (WEBSTER, 765)
-ip_port (PHONEBOOK, 767)
-ip_port (VID, 769)
-ip_port (CADLOCK, 770)
-ip_port (RTIP, 771)
-ip_port (CYCLESERV2, 772)
-ip_port (SUBMIT, 773)
-ip_port (RPASSWD, 774)
-ip_port (ENTOMB, 775)
-ip_port (WPAGES, 776)
-ip_port (MULTILING_HTTP, 777)
-ip_port (WPGS, 780)
-ip_port (MDBS_DAEMON, 800)
-ip_port (DEVICE, 801)
-ip_port (FCP_UDP, 810)
-ip_port (ITM_MCELL_S, 828)
-ip_port (PKIX_3_CA_RA, 829)
-ip_port (DHCP_FAILOVER2, 847)
-ip_port (GDOI, 848)
-ip_port (ISCSI, 860)
-ip_port (RSYNC, 873)
-ip_port (ICLCNET_LOCATE, 886)
-ip_port (ICLCNET_SVINFO, 887)
-ip_port (ACCESSBUILDER, 888)
-ip_port (CDDBP, 888)
-ip_port (OMGINITIALREFS, 900)
-ip_port (SMPNAMERES, 901)
-ip_port (IDEAFARM_CHAT, 902)
-ip_port (IDEAFARM_CATCH, 903)
-ip_port (XACT_BACKUP, 911)
-ip_port (APEX_MESH, 912)
-ip_port (APEX_EDGE, 913)
-ip_port (FTPS_DATA, 989)
-ip_port (FTPS, 990)
-ip_port (NAS, 991)
-ip_port (TELNETS, 992)
-ip_port (IMAPS, 993)
-ip_port (IRCS, 994)
-ip_port (POP3S, 995)
-ip_port (VSINET, 996)
-ip_port (MAITRD, 997)
-ip_port (BUSBOY, 998)
-ip_port (GARCON, 999)
-ip_port (PUPROUTER, 999)
-ip_port (CADLOCK2, 1000)
-ip_port (SURF, 1010)
-
diff --git a/vnet/vnet/ip/protocols.def b/vnet/vnet/ip/protocols.def
deleted file mode 100644
index 77fab31d..00000000
--- a/vnet/vnet/ip/protocols.def
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Emacs editing mode -*-C-*-
-
-From http://www.iana.org/assignments/protocol-numbers
-
-PROTOCOL NUMBERS
-
-(last updated 18 October 2004)
-
-In the Internet Protocol version 4 (IPv4) [RFC791] there is a field,
-called "Protocol", to identify the next level protocol.  This is an 8
-bit field.  In Internet Protocol version 6 (IPv6) [RFC1883] this field
-is called the "Next Header" field.
-*/
-ip_protocol (0, IP6_HOP_BY_HOP_OPTIONS)
-ip_protocol (1, ICMP)
-ip_protocol (2, IGMP)
-ip_protocol (3, GGP)
-ip_protocol (4, IP_IN_IP)
-ip_protocol (5, ST)
-ip_protocol (6, TCP)
-ip_protocol (7, CBT)
-ip_protocol (8, EGP)
-ip_protocol (9, IGP)
-ip_protocol (10, BBN_RCC_MON)
-ip_protocol (11, NVP_II)
-ip_protocol (12, PUP)
-ip_protocol (13, ARGUS)
-ip_protocol (14, EMCON)
-ip_protocol (15, XNET)
-ip_protocol (16, CHAOS)
-ip_protocol (17, UDP)
-ip_protocol (18, MUX)
-ip_protocol (19, DCN_MEAS)
-ip_protocol (20, HMP)
-ip_protocol (21, PRM)
-ip_protocol (22, XNS_IDP)
-ip_protocol (23, TRUNK_1)
-ip_protocol (24, TRUNK_2)
-ip_protocol (25, LEAF_1)
-ip_protocol (26, LEAF_2)
-ip_protocol (27, RDP)
-ip_protocol (28, IRTP)
-ip_protocol (29, ISO_TP4)
-ip_protocol (30, NETBLT)
-ip_protocol (31, MFE_NSP)
-ip_protocol (32, MERIT_INP)
-ip_protocol (33, SEP)
-ip_protocol (34, 3PC)
-ip_protocol (35, IDPR)
-ip_protocol (36, XTP)
-ip_protocol (37, DDP)
-ip_protocol (38, IDPR_CMTP)
-ip_protocol (39, TP)
-ip_protocol (40, IL)
-ip_protocol (41, IPV6)
-ip_protocol (42, SDRP)
-ip_protocol (43, IPV6_ROUTE)
-ip_protocol (44, IPV6_FRAGMENTATION)
-ip_protocol (45, IDRP)
-ip_protocol (46, RSVP)
-ip_protocol (47, GRE)
-ip_protocol (48, MHRP)
-ip_protocol (49, BNA)
-ip_protocol (50, IPSEC_ESP)
-ip_protocol (51, IPSEC_AH)
-ip_protocol (52, I_NLSP)
-ip_protocol (53, SWIPE)
-ip_protocol (54, NARP)
-ip_protocol (55, MOBILE)
-ip_protocol (56, TLSP)
-ip_protocol (57, SKIP)
-ip_protocol (58, ICMP6)
-ip_protocol (59, IP6_NONXT)
-ip_protocol (60, IP6_DESTINATION_OPTIONS)
-ip_protocol (62, CFTP)
-ip_protocol (64, SAT_EXPAK)
-ip_protocol (65, KRYPTOLAN)
-ip_protocol (66, RVD)
-ip_protocol (67, IPPC)
-ip_protocol (69, SAT_MON)
-ip_protocol (70, VISA)
-ip_protocol (71, IPCV)
-ip_protocol (72, CPNX)
-ip_protocol (73, CPHB)
-ip_protocol (74, WSN)
-ip_protocol (75, PVP)
-ip_protocol (76, BR_SAT_MON)
-ip_protocol (77, SUN_ND)
-ip_protocol (78, WB_MON)
-ip_protocol (79, WB_EXPAK)
-ip_protocol (80, ISO_IP)
-ip_protocol (81, VMTP)
-ip_protocol (82, SECURE_VMTP)
-ip_protocol (83, VINES)
-ip_protocol (84, TTP)
-ip_protocol (85, NSFNET_IGP)
-ip_protocol (86, DGP)
-ip_protocol (87, TCF)
-ip_protocol (88, EIGRP)
-ip_protocol (89, OSPF)
-ip_protocol (90, SPRITE_RPC)
-ip_protocol (91, LARP)
-ip_protocol (92, MTP)
-ip_protocol (93, AX)
-ip_protocol (94, IPIP)
-ip_protocol (95, MICP)
-ip_protocol (96, SCC_SP)
-ip_protocol (97, ETHERIP)
-ip_protocol (98, ENCAP)
-ip_protocol (100, GMTP)
-ip_protocol (101, IFMP)
-ip_protocol (102, PNNI)
-ip_protocol (103, PIM)
-ip_protocol (104, ARIS)
-ip_protocol (105, SCPS)
-ip_protocol (106, QNX)
-ip_protocol (107, A)
-ip_protocol (108, IPCOMP)
-ip_protocol (109, SNP)
-ip_protocol (110, COMPAQ_PEER)
-ip_protocol (111, IPX_IN_IP)
-ip_protocol (112, VRRP)
-ip_protocol (113, PGM)
-ip_protocol (115, L2TP)
-ip_protocol (116, DDX)
-ip_protocol (117, IATP)
-ip_protocol (118, STP)
-ip_protocol (119, SRP)
-ip_protocol (120, UTI)
-ip_protocol (121, SMP)
-ip_protocol (122, SM)
-ip_protocol (123, PTP)
-ip_protocol (124, ISIS)
-ip_protocol (125, FIRE)
-ip_protocol (126, CRTP)
-ip_protocol (127, CRUDP)
-ip_protocol (128, SSCOPMCE)
-ip_protocol (129, IPLT)
-ip_protocol (130, SPS)
-ip_protocol (131, PIPE)
-ip_protocol (132, SCTP)
-ip_protocol (133, FC)
-ip_protocol (134, RSVP_E2E_IGNORE)
-ip_protocol (135, MOBILITY)
-ip_protocol (136, UDP_LITE)
-ip_protocol (137, MPLS_IN_IP)
-ip_protocol (255, RESERVED)
-
diff --git a/vnet/vnet/ip/punt.c b/vnet/vnet/ip/punt.c
deleted file mode 100644
index 9c735128..00000000
--- a/vnet/vnet/ip/punt.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @file
- * @brief Local TCP/IP stack punt infrastructure.
- *
- * Provides a set of VPP nodes togather with the relevant APIs and CLI
- * commands in order to adjust and dispatch packets from the VPP data plane
- * to the local TCP/IP stack
- */
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ip/udp.h>
-#include <vnet/ip/punt.h>
-
-#define foreach_punt_next \
-  _ (PUNT, "error-punt")
-
-typedef enum
-{
-#define _(s,n) PUNT_NEXT_##s,
-  foreach_punt_next
-#undef _
-    PUNT_N_NEXT,
-} punt_next_t;
-
-vlib_node_registration_t udp4_punt_node;
-vlib_node_registration_t udp6_punt_node;
-
-/** @brief IPv4/IPv6 UDP punt node main loop.
-
-    This is the main loop inline function for IPv4/IPv6 UDP punt
-    transition node.
-
-    @param vm vlib_main_t corresponding to the current thread
-    @param node vlib_node_runtime_t
-    @param frame vlib_frame_t whose contents should be dispatched
-    @param is_ipv4 indicates if called for IPv4 or IPv6 node
-*/
-always_inline uword
-udp46_punt_inline (vlib_main_t * vm,
-		   vlib_node_runtime_t * node,
-		   vlib_frame_t * from_frame, int is_ip4)
-{
-  u32 n_left_from, *from, *to_next;
-  word advance;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  /* udp[46]_lookup hands us the data payload, not the IP header */
-  if (is_ip4)
-    advance = -(sizeof (ip4_header_t) + sizeof (udp_header_t));
-  else
-    advance = -(sizeof (ip6_header_t) + sizeof (udp_header_t));
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, PUNT_NEXT_PUNT, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  vlib_buffer_advance (b0, advance);
-	  b0->error = node->errors[PUNT_ERROR_UDP_PORT];
-	}
-
-      vlib_put_next_frame (vm, node, PUNT_NEXT_PUNT, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-static char *punt_error_strings[] = {
-#define punt_error(n,s) s,
-#include "punt_error.def"
-#undef punt_error
-};
-
-/** @brief IPv4 UDP punt node.
-    @node ip4-udp-punt
-
-    This is the IPv4 UDP punt transition node. It is registered as a next
-    node for the "ip4-udp-lookup" handling UDP port(s) requested for punt.
-    The buffer's current data pointer is adjusted to the original packet
-    IPv4 header. All buffers are dispatched to "error-punt".
-
-    @param vm vlib_main_t corresponding to the current thread
-    @param node vlib_node_runtime_t
-    @param frame vlib_frame_t whose contents should be dispatched
-
-    @par Graph mechanics: next index usage
-
-    @em Sets:
-    - <code>vnet_buffer(b)->current_data</code>
-    - <code>vnet_buffer(b)->current_len</code>
-
-    <em>Next Index:</em>
-    - Dispatches the packet to the "error-punt" node
-*/
-static uword
-udp4_punt (vlib_main_t * vm,
-	   vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  return udp46_punt_inline (vm, node, from_frame, 1 /* is_ip4 */ );
-}
-
-/** @brief IPv6 UDP punt node.
-    @node ip6-udp-punt
-
-    This is the IPv6 UDP punt transition node. It is registered as a next
-    node for the "ip6-udp-lookup" handling UDP port(s) requested for punt.
-    The buffer's current data pointer is adjusted to the original packet
-    IPv6 header. All buffers are dispatched to "error-punt".
-
-    @param vm vlib_main_t corresponding to the current thread
-    @param node vlib_node_runtime_t
-    @param frame vlib_frame_t whose contents should be dispatched
-
-    @par Graph mechanics: next index usage
-
-    @em Sets:
-    - <code>vnet_buffer(b)->current_data</code>
-    - <code>vnet_buffer(b)->current_len</code>
-
-    <em>Next Index:</em>
-    - Dispatches the packet to the "error-punt" node
-*/
-static uword
-udp6_punt (vlib_main_t * vm,
-	   vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  return udp46_punt_inline (vm, node, from_frame, 0 /* is_ip4 */ );
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (udp4_punt_node) = {
-  .function = udp4_punt,
-  .name = "ip4-udp-punt",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .n_errors = PUNT_N_ERROR,
-  .error_strings = punt_error_strings,
-
-  .n_next_nodes = PUNT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [PUNT_NEXT_##s] = n,
-     foreach_punt_next
-#undef _
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (udp4_punt_node, udp4_punt);
-
-VLIB_REGISTER_NODE (udp6_punt_node) = {
-  .function = udp6_punt,
-  .name = "ip6-udp-punt",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .n_errors = PUNT_N_ERROR,
-  .error_strings = punt_error_strings,
-
-  .n_next_nodes = PUNT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [PUNT_NEXT_##s] = n,
-     foreach_punt_next
-#undef _
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (udp6_punt_node, udp6_punt);;
-
-/**
- * @brief Request IP traffic punt to the local TCP/IP stack.
- *
- * @em Note
- * - UDP is the only protocol supported in the current implementation
- * - When requesting UDP punt port number(s) must be specified
- * - All TCP traffic is currently punted to the host by default
- *
- * @param vm       vlib_main_t corresponding to the current thread
- * @param ipv      IP protcol version.
- *                 4 - IPv4, 6 - IPv6, ~0 for both IPv6 and IPv4
- * @param protocol 8-bits L4 protocol value
- *                 Only value of 17 (UDP) is currently supported
- * @param port     16-bits L4 (TCP/IP) port number when applicable
- *
- * @returns 0 on success, non-zero value otherwise
- */
-clib_error_t *
-vnet_punt_add_del (vlib_main_t * vm, u8 ipv, u8 protocol, u16 port,
-		   int is_add)
-{
-  /* For now we only support UDP punt */
-  if (protocol != IP_PROTOCOL_UDP)
-    return clib_error_return (0,
-			      "only UDP protocol (%d) is supported, got %d",
-			      IP_PROTOCOL_UDP, protocol);
-
-  if (ipv != (u8) ~ 0 && ipv != 4 && ipv != 6)
-    return clib_error_return (0, "IP version must be 4 or 6, got %d", ipv);
-
-  if (port == (u16) ~ 0)
-    {
-      if (ipv == 4 || ipv == (u8) ~ 0)
-	udp_punt_unknown (vm, 1, is_add);
-
-      if (ipv == 6 || ipv == (u8) ~ 0)
-	udp_punt_unknown (vm, 0, is_add);
-
-      return 0;
-    }
-
-  else if (is_add)
-    {
-      if (ipv == 4 || ipv == (u8) ~ 0)
-	udp_register_dst_port (vm, port, udp4_punt_node.index, 1);
-
-      if (ipv == 6 || ipv == (u8) ~ 0)
-	udp_register_dst_port (vm, port, udp6_punt_node.index, 0);
-
-      return 0;
-    }
-
-  else
-    return clib_error_return (0, "punt delete is not supported yet");
-}
-
-static clib_error_t *
-udp_punt_cli (vlib_main_t * vm,
-	      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  u32 udp_port;
-  int is_add = 1;
-  clib_error_t *error;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	is_add = 0;
-      if (unformat (input, "all"))
-	{
-	  /* punt both IPv6 and IPv4 when used in CLI */
-	  error = vnet_punt_add_del (vm, ~0, IP_PROTOCOL_UDP, ~0, is_add);
-	  if (error)
-	    clib_error_report (error);
-	}
-      else if (unformat (input, "%d", &udp_port))
-	{
-	  /* punt both IPv6 and IPv4 when used in CLI */
-	  error = vnet_punt_add_del (vm, ~0, IP_PROTOCOL_UDP,
-				     udp_port, is_add);
-	  if (error)
-	    clib_error_report (error);
-	}
-    }
-
-  return 0;
-}
-
-/*?
- * The set of '<em>set punt</em>' commands allows specific IP traffic to
- * be punted to the host TCP/IP stack
- *
- * @em Note
- * - UDP is the only protocol supported in the current implementation
- * - All TCP traffic is currently punted to the host by default
- *
- * @cliexpar
- * @parblock
- * Example of how to request NTP traffic to be punted
- * @cliexcmd{set punt udp 125}
- *
- * Example of how to request all 'unknown' UDP traffic to be punted
- * @cliexcmd{set punt udp all}
- *
- * Example of how to stop all 'unknown' UDP traffic to be punted
- * @cliexcmd{set punt udp del all}
- * @endparblock
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (punt_udp_command, static) = {
-  .path = "set punt udp",
-  .short_help = "set punt udp [del] <all | port-num1 [port-num2 ...]>",
-  .function = udp_punt_cli,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/punt.h b/vnet/vnet/ip/punt.h
deleted file mode 100644
index 09a9d4c5..00000000
--- a/vnet/vnet/ip/punt.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @file
- * @brief Definitions for punt infrastructure.
- */
-#ifndef included_punt_h
-#define included_punt_h
-
-typedef enum
-{
-#define punt_error(n,s) PUNT_ERROR_##n,
-#include <vnet/ip/punt_error.def>
-#undef punt_error
-  PUNT_N_ERROR,
-} punt_error_t;
-
-
-clib_error_t *vnet_punt_add_del (vlib_main_t * vm, u8 ipv,
-				 u8 protocol, u16 port, int is_add);
-
-#endif /* included_punt_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/punt_error.def b/vnet/vnet/ip/punt_error.def
deleted file mode 100644
index a76d7e7b..00000000
--- a/vnet/vnet/ip/punt_error.def
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * punt_error.def: punt errors
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-punt_error (NONE, "no error")
-punt_error (UDP_PORT, "udp port punt")
diff --git a/vnet/vnet/ip/tcp_packet.h b/vnet/vnet/ip/tcp_packet.h
deleted file mode 100644
index ed402403..00000000
--- a/vnet/vnet/ip/tcp_packet.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip4/tcp_packet.h: TCP packet format (see RFC 793)
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_tcp_packet_h
-#define included_tcp_packet_h
-
-/* TCP flags bit 0 first. */
-#define foreach_tcp_flag			\
-  _ (FIN)					\
-  _ (SYN)					\
-  _ (RST)					\
-  _ (PSH)					\
-  _ (ACK)					\
-  _ (URG)					\
-  _ (ECE)					\
-  _ (CWR)
-
-enum
-{
-#define _(f) TCP_FLAG_BIT_##f,
-  foreach_tcp_flag
-#undef _
-    TCP_N_FLAG_BITS,
-
-#define _(f) TCP_FLAG_##f = 1 << TCP_FLAG_BIT_##f,
-  foreach_tcp_flag
-#undef _
-};
-
-typedef struct
-{
-  /* Source and destination port. */
-  union
-  {
-    union
-    {
-      struct
-      {
-	u16 src, dst;
-      };
-      u32 src_and_dst;
-    } ports;
-    u16 src_port, dst_port;
-  };
-
-  /* Sequence and acknowledgment number. */
-  u32 seq_number, ack_number;
-
-  /* Size of TCP header in 32-bit units plus 4 reserved bits. */
-  u8 tcp_header_u32s_and_reserved;
-
-  /* see foreach_tcp_flag for enumation of tcp flags. */
-  u8 flags;
-
-  /* Current window advertised by sender.
-     This is the number of bytes sender is willing to receive
-     right now. */
-  u16 window;
-
-  /* Checksum of TCP pseudo header and data. */
-  u16 checksum;
-
-  u16 urgent_pointer;
-} tcp_header_t;
-
-always_inline int
-tcp_header_bytes (tcp_header_t * t)
-{
-  return (t->tcp_header_u32s_and_reserved >> 4) * sizeof (u32);
-}
-
-/* TCP options. */
-typedef enum tcp_option_type
-{
-  TCP_OPTION_END = 0,
-  TCP_OPTION_NOP = 1,
-  TCP_OPTION_MSS = 2,
-  TCP_OPTION_WINDOW_SCALE = 3,
-  TCP_OPTION_SACK_PERMITTED = 4,
-  TCP_OPTION_SACK_BLOCK = 5,
-  TCP_OPTION_TIME_STAMP = 8,
-} tcp_option_type_t;
-
-/* All except NOP and END have 1 byte length field. */
-typedef struct
-{
-  tcp_option_type_t type:8;
-
-  /* Length of this option in bytes. */
-  u8 length;
-} tcp_option_with_length_t;
-
-#endif /* included_tcp_packet_h */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/udp.h b/vnet/vnet/ip/udp.h
deleted file mode 100644
index 03c62e0b..00000000
--- a/vnet/vnet/ip/udp.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * ip/udp.h: udp protocol
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_udp_h
-#define included_udp_h
-
-#include <vnet/vnet.h>
-#include <vnet/ip/udp_packet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ip/ip4.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ip/format.h>
-
-typedef enum
-{
-#define udp_error(n,s) UDP_ERROR_##n,
-#include <vnet/ip/udp_error.def>
-#undef udp_error
-  UDP_N_ERROR,
-} udp_error_t;
-
-#define foreach_udp4_dst_port			\
-_ (67, dhcp_to_server)                          \
-_ (68, dhcp_to_client)                          \
-_ (500, ikev2)                                  \
-_ (3784, bfd4)                                   \
-_ (4341, lisp_gpe)                              \
-_ (4342, lisp_cp)                          	\
-_ (4739, ipfix)                                 \
-_ (4789, vxlan)					\
-_ (4789, vxlan6)				\
-_ (4790, vxlan_gpe)				\
-_ (6633, vpath_3)
-
-
-#define foreach_udp6_dst_port                   \
-_ (547, dhcpv6_to_server)                       \
-_ (546, dhcpv6_to_client)			\
-_ (3784, bfd6)                                   \
-_ (4341, lisp_gpe6)                             \
-_ (4342, lisp_cp6)                          	\
-_ (4790, vxlan6_gpe)      \
-_ (6633, vpath6_3)
-
-typedef enum
-{
-#define _(n,f) UDP_DST_PORT_##f = n,
-  foreach_udp4_dst_port foreach_udp6_dst_port
-#undef _
-} udp_dst_port_t;
-
-typedef enum
-{
-#define _(n,f) UDP6_DST_PORT_##f = n,
-  foreach_udp6_dst_port
-#undef _
-} udp6_dst_port_t;
-
-typedef struct
-{
-  /* Name (a c string). */
-  char *name;
-
-  /* GRE protocol type in host byte order. */
-  udp_dst_port_t dst_port;
-
-  /* Node which handles this type. */
-  u32 node_index;
-
-  /* Next index for this type. */
-  u32 next_index;
-} udp_dst_port_info_t;
-
-typedef enum
-{
-  UDP_IP6 = 0,
-  UDP_IP4,			/* the code is full of is_ip4... */
-  N_UDP_AF,
-} udp_af_t;
-
-typedef struct
-{
-  udp_dst_port_info_t *dst_port_infos[N_UDP_AF];
-
-  /* Hash tables mapping name/protocol to protocol info index. */
-  uword *dst_port_info_by_name[N_UDP_AF];
-  uword *dst_port_info_by_dst_port[N_UDP_AF];
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-} udp_main_t;
-
-always_inline udp_dst_port_info_t *
-udp_get_dst_port_info (udp_main_t * um, udp_dst_port_t dst_port, u8 is_ip4)
-{
-  uword *p = hash_get (um->dst_port_info_by_dst_port[is_ip4], dst_port);
-  return p ? vec_elt_at_index (um->dst_port_infos[is_ip4], p[0]) : 0;
-}
-
-format_function_t format_udp_header;
-format_function_t format_udp_rx_trace;
-
-unformat_function_t unformat_udp_header;
-
-void udp_register_dst_port (vlib_main_t * vm,
-			    udp_dst_port_t dst_port,
-			    u32 node_index, u8 is_ip4);
-
-void udp_punt_unknown (vlib_main_t * vm, u8 is_ip4, u8 is_add);
-
-always_inline void
-ip_udp_fixup_one (vlib_main_t * vm, vlib_buffer_t * b0, u8 is_ip4)
-{
-  u16 new_l0;
-  udp_header_t *udp0;
-
-  if (is_ip4)
-    {
-      ip4_header_t *ip0;
-      ip_csum_t sum0;
-      u16 old_l0 = 0;
-
-      ip0 = vlib_buffer_get_current (b0);
-
-      /* fix the <bleep>ing outer-IP checksum */
-      sum0 = ip0->checksum;
-      /* old_l0 always 0, see the rewrite setup */
-      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
-
-      sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
-			     length /* changed member */ );
-      ip0->checksum = ip_csum_fold (sum0);
-      ip0->length = new_l0;
-
-      /* Fix UDP length */
-      udp0 = (udp_header_t *) (ip0 + 1);
-      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
-				     - sizeof (*ip0));
-      udp0->length = new_l0;
-    }
-  else
-    {
-      ip6_header_t *ip0;
-      int bogus0;
-
-      ip0 = vlib_buffer_get_current (b0);
-
-      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
-				     - sizeof (*ip0));
-      ip0->payload_length = new_l0;
-
-      /* Fix UDP length */
-      udp0 = (udp_header_t *) (ip0 + 1);
-      udp0->length = new_l0;
-
-      udp0->checksum =
-	ip6_tcp_udp_icmp_compute_checksum (vm, b0, ip0, &bogus0);
-      ASSERT (bogus0 == 0);
-
-      if (udp0->checksum == 0)
-	udp0->checksum = 0xffff;
-    }
-}
-
-always_inline void
-ip_udp_encap_one (vlib_main_t * vm, vlib_buffer_t * b0, u8 * ec0, word ec_len,
-		  u8 is_ip4)
-{
-  vlib_buffer_advance (b0, -ec_len);
-
-  if (is_ip4)
-    {
-      ip4_header_t *ip0;
-
-      ip0 = vlib_buffer_get_current (b0);
-
-      /* Apply the encap string. */
-      clib_memcpy (ip0, ec0, ec_len);
-      ip_udp_fixup_one (vm, b0, 1);
-    }
-  else
-    {
-      ip6_header_t *ip0;
-
-      ip0 = vlib_buffer_get_current (b0);
-
-      /* Apply the encap string. */
-      clib_memcpy (ip0, ec0, ec_len);
-      ip_udp_fixup_one (vm, b0, 0);
-    }
-}
-
-always_inline void
-ip_udp_encap_two (vlib_main_t * vm, vlib_buffer_t * b0, vlib_buffer_t * b1,
-		  u8 * ec0, u8 * ec1, word ec_len, u8 is_v4)
-{
-  u16 new_l0, new_l1;
-  udp_header_t *udp0, *udp1;
-
-  ASSERT (_vec_len (ec0) == _vec_len (ec1));
-
-  vlib_buffer_advance (b0, -ec_len);
-  vlib_buffer_advance (b1, -ec_len);
-
-  if (is_v4)
-    {
-      ip4_header_t *ip0, *ip1;
-      ip_csum_t sum0, sum1;
-      u16 old_l0 = 0, old_l1 = 0;
-
-      ip0 = vlib_buffer_get_current (b0);
-      ip1 = vlib_buffer_get_current (b1);
-
-      /* Apply the encap string */
-      clib_memcpy (ip0, ec0, ec_len);
-      clib_memcpy (ip1, ec1, ec_len);
-
-      /* fix the <bleep>ing outer-IP checksum */
-      sum0 = ip0->checksum;
-      sum1 = ip1->checksum;
-
-      /* old_l0 always 0, see the rewrite setup */
-      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
-      new_l1 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1));
-
-      sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
-			     length /* changed member */ );
-      sum1 = ip_csum_update (sum1, old_l1, new_l1, ip4_header_t,
-			     length /* changed member */ );
-
-      ip0->checksum = ip_csum_fold (sum0);
-      ip1->checksum = ip_csum_fold (sum1);
-
-      ip0->length = new_l0;
-      ip1->length = new_l1;
-
-      /* Fix UDP length */
-      udp0 = (udp_header_t *) (ip0 + 1);
-      udp1 = (udp_header_t *) (ip1 + 1);
-
-      new_l0 =
-	clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0) -
-			      sizeof (*ip0));
-      new_l1 =
-	clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1) -
-			      sizeof (*ip1));
-      udp0->length = new_l0;
-      udp1->length = new_l1;
-    }
-  else
-    {
-      ip6_header_t *ip0, *ip1;
-      int bogus0, bogus1;
-
-      ip0 = vlib_buffer_get_current (b0);
-      ip1 = vlib_buffer_get_current (b1);
-
-      /* Apply the encap string. */
-      clib_memcpy (ip0, ec0, ec_len);
-      clib_memcpy (ip1, ec1, ec_len);
-
-      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
-				     - sizeof (*ip0));
-      new_l1 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1)
-				     - sizeof (*ip1));
-      ip0->payload_length = new_l0;
-      ip1->payload_length = new_l1;
-
-      /* Fix UDP length */
-      udp0 = (udp_header_t *) (ip0 + 1);
-      udp1 = (udp_header_t *) (ip1 + 1);
-
-      udp0->length = new_l0;
-      udp1->length = new_l1;
-
-      udp0->checksum =
-	ip6_tcp_udp_icmp_compute_checksum (vm, b0, ip0, &bogus0);
-      udp1->checksum =
-	ip6_tcp_udp_icmp_compute_checksum (vm, b1, ip1, &bogus1);
-      ASSERT (bogus0 == 0);
-      ASSERT (bogus1 == 0);
-
-      if (udp0->checksum == 0)
-	udp0->checksum = 0xffff;
-      if (udp1->checksum == 0)
-	udp1->checksum = 0xffff;
-    }
-}
-
-#endif /* included_udp_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/udp_error.def b/vnet/vnet/ip/udp_error.def
deleted file mode 100644
index bfdae0ac..00000000
--- a/vnet/vnet/ip/udp_error.def
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * udp_error.def: udp errors
- *
- * Copyright (c) 2013-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-udp_error (NONE, "no error")
-udp_error (NO_LISTENER, "no listener for dst port")
-udp_error (LENGTH_ERROR, "UDP packets with length errors")
-udp_error (PUNT, "no listener punt")
diff --git a/vnet/vnet/ip/udp_format.c b/vnet/vnet/ip/udp_format.c
deleted file mode 100644
index abdf561e..00000000
--- a/vnet/vnet/ip/udp_format.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/udp_format.c: udp formatting
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-
-/* Format UDP header. */
-u8 *
-format_udp_header (u8 * s, va_list * args)
-{
-  udp_header_t *udp = va_arg (*args, udp_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-  uword indent;
-  u32 header_bytes = sizeof (udp[0]);
-
-  /* Nothing to do. */
-  if (max_header_bytes < sizeof (udp[0]))
-    return format (s, "UDP header truncated");
-
-  indent = format_get_indent (s);
-  indent += 2;
-
-  s = format (s, "UDP: %d -> %d",
-	      clib_net_to_host_u16 (udp->src_port),
-	      clib_net_to_host_u16 (udp->dst_port));
-
-  s = format (s, "\n%Ulength %d, checksum 0x%04x",
-	      format_white_space, indent,
-	      clib_net_to_host_u16 (udp->length),
-	      clib_net_to_host_u16 (udp->checksum));
-
-  /* Recurse into next protocol layer. */
-  if (max_header_bytes != 0 && header_bytes < max_header_bytes)
-    {
-      ip_main_t *im = &ip_main;
-      tcp_udp_port_info_t *pi;
-
-      pi = ip_get_tcp_udp_port_info (im, udp->dst_port);
-
-      if (pi && pi->format_header)
-	s = format (s, "\n%U%U",
-		    format_white_space, indent - 2, pi->format_header,
-		    /* next protocol header */ (udp + 1),
-		    max_header_bytes - sizeof (udp[0]));
-    }
-
-  return s;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/udp_init.c b/vnet/vnet/ip/udp_init.c
deleted file mode 100644
index 1241ca4a..00000000
--- a/vnet/vnet/ip/udp_init.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/udp_init.c: udp initialization
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/ip/ip.h>
-
-clib_error_t *
-udp_init (vlib_main_t * vm)
-{
-  ip_main_t *im = &ip_main;
-  ip_protocol_info_t *pi;
-  clib_error_t *error;
-
-  error = vlib_call_init_function (vm, ip_main_init);
-
-  if (!error)
-    {
-      pi = ip_get_protocol_info (im, IP_PROTOCOL_UDP);
-      if (pi == 0)
-	return clib_error_return (0, "UDP protocol info AWOL");
-      pi->format_header = format_udp_header;
-      pi->unformat_pg_edit = unformat_pg_udp_header;
-    }
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (udp_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/udp_local.c b/vnet/vnet/ip/udp_local.c
deleted file mode 100644
index 13ab6e4f..00000000
--- a/vnet/vnet/ip/udp_local.c
+++ /dev/null
@@ -1,645 +0,0 @@
-/*
- * node.c: udp packet processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ip/udp.h>
-#include <vnet/ip/udp_packet.h>
-#include <vppinfra/sparse_vec.h>
-
-udp_main_t udp_main;
-
-#define foreach_udp_input_next                  \
-  _ (PUNT, "error-punt")                        \
-  _ (DROP, "error-drop")                        \
-  _ (ICMP4_ERROR, "ip4-icmp-error")             \
-  _ (ICMP6_ERROR, "ip6-icmp-error")
-
-typedef enum
-{
-#define _(s,n) UDP_INPUT_NEXT_##s,
-  foreach_udp_input_next
-#undef _
-    UDP_INPUT_N_NEXT,
-} udp_input_next_t;
-
-typedef struct
-{
-  u16 src_port;
-  u16 dst_port;
-  u8 bound;
-} udp_rx_trace_t;
-
-u8 *
-format_udp_rx_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  udp_rx_trace_t *t = va_arg (*args, udp_rx_trace_t *);
-
-  s = format (s, "UDP: src-port %d dst-port %d%s",
-	      clib_net_to_host_u16 (t->src_port),
-	      clib_net_to_host_u16 (t->dst_port),
-	      t->bound ? "" : " (no listener)");
-  return s;
-}
-
-typedef struct
-{
-  /* Sparse vector mapping udp dst_port in network byte order
-     to next index. */
-  u16 *next_by_dst_port;
-  u8 punt_unknown;
-} udp_input_runtime_t;
-
-vlib_node_registration_t udp4_input_node;
-vlib_node_registration_t udp6_input_node;
-
-always_inline uword
-udp46_input_inline (vlib_main_t * vm,
-		    vlib_node_runtime_t * node,
-		    vlib_frame_t * from_frame, int is_ip4)
-{
-  udp_input_runtime_t *rt = is_ip4 ?
-    (void *) vlib_node_get_runtime_data (vm, udp4_input_node.index)
-    : (void *) vlib_node_get_runtime_data (vm, udp6_input_node.index);
-  __attribute__ ((unused)) u32 n_left_from, next_index, *from, *to_next;
-  word n_no_listener = 0;
-  u8 punt_unknown = rt->punt_unknown;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  udp_header_t *h0 = 0, *h1 = 0;
-	  u32 i0, i1, dst_port0, dst_port1;
-	  u32 advance0, advance1;
-	  u32 error0, next0, error1, next1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, sizeof (h0[0]), LOAD);
-	    CLIB_PREFETCH (p3->data, sizeof (h1[0]), LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  /* ip4/6_local hands us the ip header, not the udp header */
-	  if (is_ip4)
-	    {
-	      advance0 = sizeof (ip4_header_t);
-	      advance1 = sizeof (ip4_header_t);
-	    }
-	  else
-	    {
-	      advance0 = sizeof (ip6_header_t);
-	      advance1 = sizeof (ip6_header_t);
-	    }
-
-	  if (PREDICT_FALSE (b0->current_length < advance0 + sizeof (*h0)))
-	    {
-	      error0 = UDP_ERROR_LENGTH_ERROR;
-	      next0 = UDP_INPUT_NEXT_DROP;
-	    }
-	  else
-	    {
-	      vlib_buffer_advance (b0, advance0);
-	      h0 = vlib_buffer_get_current (b0);
-	      error0 = next0 = 0;
-	      if (PREDICT_FALSE (clib_net_to_host_u16 (h0->length) >
-				 vlib_buffer_length_in_chain (vm, b0)))
-		{
-		  error0 = UDP_ERROR_LENGTH_ERROR;
-		  next0 = UDP_INPUT_NEXT_DROP;
-		}
-	    }
-
-	  if (PREDICT_FALSE (b1->current_length < advance1 + sizeof (*h1)))
-	    {
-	      error1 = UDP_ERROR_LENGTH_ERROR;
-	      next1 = UDP_INPUT_NEXT_DROP;
-	    }
-	  else
-	    {
-	      vlib_buffer_advance (b1, advance1);
-	      h1 = vlib_buffer_get_current (b1);
-	      error1 = next1 = 0;
-	      if (PREDICT_FALSE (clib_net_to_host_u16 (h1->length) >
-				 vlib_buffer_length_in_chain (vm, b1)))
-		{
-		  error1 = UDP_ERROR_LENGTH_ERROR;
-		  next1 = UDP_INPUT_NEXT_DROP;
-		}
-	    }
-
-	  /* Index sparse array with network byte order. */
-	  dst_port0 = (error0 == 0) ? h0->dst_port : 0;
-	  dst_port1 = (error1 == 0) ? h1->dst_port : 0;
-	  sparse_vec_index2 (rt->next_by_dst_port, dst_port0, dst_port1,
-			     &i0, &i1);
-	  next0 = (error0 == 0) ? vec_elt (rt->next_by_dst_port, i0) : next0;
-	  next1 = (error1 == 0) ? vec_elt (rt->next_by_dst_port, i1) : next1;
-
-	  if (PREDICT_FALSE (i0 == SPARSE_VEC_INVALID_INDEX))
-	    {
-	      // move the pointer back so icmp-error can find the
-	      // ip packet header
-	      vlib_buffer_advance (b0, -(word) advance0);
-
-	      if (PREDICT_FALSE (punt_unknown))
-		{
-		  b0->error = node->errors[UDP_ERROR_PUNT];
-		  next0 = UDP_INPUT_NEXT_PUNT;
-		}
-	      else if (is_ip4)
-		{
-		  icmp4_error_set_vnet_buffer (b0,
-					       ICMP4_destination_unreachable,
-					       ICMP4_destination_unreachable_port_unreachable,
-					       0);
-		  next0 = UDP_INPUT_NEXT_ICMP4_ERROR;
-		  n_no_listener++;
-		}
-	      else
-		{
-		  icmp6_error_set_vnet_buffer (b0,
-					       ICMP6_destination_unreachable,
-					       ICMP6_destination_unreachable_port_unreachable,
-					       0);
-		  next0 = UDP_INPUT_NEXT_ICMP6_ERROR;
-		  n_no_listener++;
-		}
-	    }
-	  else
-	    {
-	      b0->error = node->errors[UDP_ERROR_NONE];
-	      // advance to the payload
-	      vlib_buffer_advance (b0, sizeof (*h0));
-	    }
-
-	  if (PREDICT_FALSE (i1 == SPARSE_VEC_INVALID_INDEX))
-	    {
-	      // move the pointer back so icmp-error can find the
-	      // ip packet header
-	      vlib_buffer_advance (b1, -(word) advance1);
-
-	      if (PREDICT_FALSE (punt_unknown))
-		{
-		  b1->error = node->errors[UDP_ERROR_PUNT];
-		  next1 = UDP_INPUT_NEXT_PUNT;
-		}
-	      else if (is_ip4)
-		{
-		  icmp4_error_set_vnet_buffer (b1,
-					       ICMP4_destination_unreachable,
-					       ICMP4_destination_unreachable_port_unreachable,
-					       0);
-		  next1 = UDP_INPUT_NEXT_ICMP4_ERROR;
-		  n_no_listener++;
-		}
-	      else
-		{
-		  icmp6_error_set_vnet_buffer (b1,
-					       ICMP6_destination_unreachable,
-					       ICMP6_destination_unreachable_port_unreachable,
-					       0);
-		  next1 = UDP_INPUT_NEXT_ICMP6_ERROR;
-		  n_no_listener++;
-		}
-	    }
-	  else
-	    {
-	      b1->error = node->errors[UDP_ERROR_NONE];
-	      // advance to the payload
-	      vlib_buffer_advance (b1, sizeof (*h1));
-	    }
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      udp_rx_trace_t *tr = vlib_add_trace (vm, node,
-						   b0, sizeof (*tr));
-	      if (b0->error != node->errors[UDP_ERROR_LENGTH_ERROR])
-		{
-		  tr->src_port = h0 ? h0->src_port : 0;
-		  tr->dst_port = h0 ? h0->dst_port : 0;
-		  tr->bound = (next0 != UDP_INPUT_NEXT_ICMP4_ERROR &&
-			       next0 != UDP_INPUT_NEXT_ICMP6_ERROR);
-		}
-	    }
-	  if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      udp_rx_trace_t *tr = vlib_add_trace (vm, node,
-						   b1, sizeof (*tr));
-	      if (b1->error != node->errors[UDP_ERROR_LENGTH_ERROR])
-		{
-		  tr->src_port = h1 ? h1->src_port : 0;
-		  tr->dst_port = h1 ? h1->dst_port : 0;
-		  tr->bound = (next1 != UDP_INPUT_NEXT_ICMP4_ERROR &&
-			       next1 != UDP_INPUT_NEXT_ICMP6_ERROR);
-		}
-	    }
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  udp_header_t *h0 = 0;
-	  u32 i0, next0;
-	  u32 advance0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  /* ip4/6_local hands us the ip header, not the udp header */
-	  if (is_ip4)
-	    advance0 = sizeof (ip4_header_t);
-	  else
-	    advance0 = sizeof (ip6_header_t);
-
-	  if (PREDICT_FALSE (b0->current_length < advance0 + sizeof (*h0)))
-	    {
-	      b0->error = node->errors[UDP_ERROR_LENGTH_ERROR];
-	      next0 = UDP_INPUT_NEXT_DROP;
-	      goto trace_x1;
-	    }
-
-	  vlib_buffer_advance (b0, advance0);
-
-	  h0 = vlib_buffer_get_current (b0);
-
-	  if (PREDICT_TRUE (clib_net_to_host_u16 (h0->length) <=
-			    vlib_buffer_length_in_chain (vm, b0)))
-	    {
-	      i0 = sparse_vec_index (rt->next_by_dst_port, h0->dst_port);
-	      next0 = vec_elt (rt->next_by_dst_port, i0);
-
-	      if (PREDICT_FALSE (i0 == SPARSE_VEC_INVALID_INDEX))
-		{
-		  // move the pointer back so icmp-error can find the
-		  // ip packet header
-		  vlib_buffer_advance (b0, -(word) advance0);
-
-		  if (PREDICT_FALSE (punt_unknown))
-		    {
-		      b0->error = node->errors[UDP_ERROR_PUNT];
-		      next0 = UDP_INPUT_NEXT_PUNT;
-		    }
-		  else if (is_ip4)
-		    {
-		      icmp4_error_set_vnet_buffer (b0,
-						   ICMP4_destination_unreachable,
-						   ICMP4_destination_unreachable_port_unreachable,
-						   0);
-		      next0 = UDP_INPUT_NEXT_ICMP4_ERROR;
-		      n_no_listener++;
-		    }
-		  else
-		    {
-		      icmp6_error_set_vnet_buffer (b0,
-						   ICMP6_destination_unreachable,
-						   ICMP6_destination_unreachable_port_unreachable,
-						   0);
-		      next0 = UDP_INPUT_NEXT_ICMP6_ERROR;
-		      n_no_listener++;
-		    }
-		}
-	      else
-		{
-		  b0->error = node->errors[UDP_ERROR_NONE];
-		  // advance to the payload
-		  vlib_buffer_advance (b0, sizeof (*h0));
-		}
-	    }
-	  else
-	    {
-	      b0->error = node->errors[UDP_ERROR_LENGTH_ERROR];
-	      next0 = UDP_INPUT_NEXT_DROP;
-	    }
-
-	trace_x1:
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      udp_rx_trace_t *tr = vlib_add_trace (vm, node,
-						   b0, sizeof (*tr));
-	      if (b0->error != node->errors[UDP_ERROR_LENGTH_ERROR])
-		{
-		  tr->src_port = h0->src_port;
-		  tr->dst_port = h0->dst_port;
-		  tr->bound = (next0 != UDP_INPUT_NEXT_ICMP4_ERROR &&
-			       next0 != UDP_INPUT_NEXT_ICMP6_ERROR);
-		}
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_error_count (vm, node->node_index, UDP_ERROR_NO_LISTENER,
-		    n_no_listener);
-  return from_frame->n_vectors;
-}
-
-static char *udp_error_strings[] = {
-#define udp_error(n,s) s,
-#include "udp_error.def"
-#undef udp_error
-};
-
-static uword
-udp4_input (vlib_main_t * vm,
-	    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  return udp46_input_inline (vm, node, from_frame, 1 /* is_ip4 */ );
-}
-
-static uword
-udp6_input (vlib_main_t * vm,
-	    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  return udp46_input_inline (vm, node, from_frame, 0 /* is_ip4 */ );
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (udp4_input_node) = {
-  .function = udp4_input,
-  .name = "ip4-udp-lookup",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .runtime_data_bytes = sizeof (udp_input_runtime_t),
-
-  .n_errors = UDP_N_ERROR,
-  .error_strings = udp_error_strings,
-
-  .n_next_nodes = UDP_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [UDP_INPUT_NEXT_##s] = n,
-    foreach_udp_input_next
-#undef _
-  },
-
-  .format_buffer = format_udp_header,
-  .format_trace = format_udp_rx_trace,
-  .unformat_buffer = unformat_udp_header,
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (udp4_input_node, udp4_input);
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (udp6_input_node) = {
-  .function = udp6_input,
-  .name = "ip6-udp-lookup",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .runtime_data_bytes = sizeof (udp_input_runtime_t),
-
-  .n_errors = UDP_N_ERROR,
-  .error_strings = udp_error_strings,
-
-  .n_next_nodes = UDP_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [UDP_INPUT_NEXT_##s] = n,
-    foreach_udp_input_next
-#undef _
-  },
-
-  .format_buffer = format_udp_header,
-  .format_trace = format_udp_rx_trace,
-  .unformat_buffer = unformat_udp_header,
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (udp6_input_node, udp6_input);
-
-static void
-add_dst_port (udp_main_t * um,
-	      udp_dst_port_t dst_port, char *dst_port_name, u8 is_ip4)
-{
-  udp_dst_port_info_t *pi;
-  u32 i;
-
-  vec_add2 (um->dst_port_infos[is_ip4], pi, 1);
-  i = pi - um->dst_port_infos[is_ip4];
-
-  pi->name = dst_port_name;
-  pi->dst_port = dst_port;
-  pi->next_index = pi->node_index = ~0;
-
-  hash_set (um->dst_port_info_by_dst_port[is_ip4], dst_port, i);
-
-  if (pi->name)
-    hash_set_mem (um->dst_port_info_by_name[is_ip4], pi->name, i);
-}
-
-void
-udp_register_dst_port (vlib_main_t * vm,
-		       udp_dst_port_t dst_port, u32 node_index, u8 is_ip4)
-{
-  udp_main_t *um = &udp_main;
-  udp_dst_port_info_t *pi;
-  udp_input_runtime_t *rt;
-  u16 *n;
-
-  {
-    clib_error_t *error = vlib_call_init_function (vm, udp_local_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  pi = udp_get_dst_port_info (um, dst_port, is_ip4);
-  if (!pi)
-    {
-      add_dst_port (um, dst_port, 0, is_ip4);
-      pi = udp_get_dst_port_info (um, dst_port, is_ip4);
-      ASSERT (pi);
-    }
-
-  pi->node_index = node_index;
-  pi->next_index = vlib_node_add_next (vm,
-				       is_ip4 ? udp4_input_node.index
-				       : udp6_input_node.index, node_index);
-
-  /* Setup udp protocol -> next index sparse vector mapping. */
-  rt = vlib_node_get_runtime_data
-    (vm, is_ip4 ? udp4_input_node.index : udp6_input_node.index);
-  n = sparse_vec_validate (rt->next_by_dst_port,
-			   clib_host_to_net_u16 (dst_port));
-  n[0] = pi->next_index;
-}
-
-void
-udp_punt_unknown (vlib_main_t * vm, u8 is_ip4, u8 is_add)
-{
-  udp_input_runtime_t *rt;
-
-  {
-    clib_error_t *error = vlib_call_init_function (vm, udp_local_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  rt = vlib_node_get_runtime_data
-    (vm, is_ip4 ? udp4_input_node.index : udp6_input_node.index);
-
-  rt->punt_unknown = is_add;
-}
-
-/* Parse a UDP header. */
-uword
-unformat_udp_header (unformat_input_t * input, va_list * args)
-{
-  u8 **result = va_arg (*args, u8 **);
-  udp_header_t *udp;
-  __attribute__ ((unused)) int old_length;
-  u16 src_port, dst_port;
-
-  /* Allocate space for IP header. */
-  {
-    void *p;
-
-    old_length = vec_len (*result);
-    vec_add2 (*result, p, sizeof (ip4_header_t));
-    udp = p;
-  }
-
-  memset (udp, 0, sizeof (udp[0]));
-  if (unformat (input, "src-port %d dst-port %d", &src_port, &dst_port))
-    {
-      udp->src_port = clib_host_to_net_u16 (src_port);
-      udp->dst_port = clib_host_to_net_u16 (dst_port);
-      return 1;
-    }
-  return 0;
-}
-
-static void
-udp_setup_node (vlib_main_t * vm, u32 node_index)
-{
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  pg_node_t *pn = pg_get_node (node_index);
-
-  n->format_buffer = format_udp_header;
-  n->unformat_buffer = unformat_udp_header;
-  pn->unformat_edit = unformat_pg_udp_header;
-}
-
-clib_error_t *
-udp_local_init (vlib_main_t * vm)
-{
-  udp_input_runtime_t *rt;
-  udp_main_t *um = &udp_main;
-  int i;
-
-  {
-    clib_error_t *error;
-    error = vlib_call_init_function (vm, udp_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-
-  for (i = 0; i < 2; i++)
-    {
-      um->dst_port_info_by_name[i] = hash_create_string (0, sizeof (uword));
-      um->dst_port_info_by_dst_port[i] = hash_create (0, sizeof (uword));
-    }
-
-  udp_setup_node (vm, udp4_input_node.index);
-  udp_setup_node (vm, udp6_input_node.index);
-
-  rt = vlib_node_get_runtime_data (vm, udp4_input_node.index);
-
-  rt->next_by_dst_port = sparse_vec_new
-    ( /* elt bytes */ sizeof (rt->next_by_dst_port[0]),
-     /* bits in index */ BITS (((udp_header_t *) 0)->dst_port));
-
-  rt->punt_unknown = 0;
-
-#define _(n,s) add_dst_port (um, UDP_DST_PORT_##s, #s, 1 /* is_ip4 */);
-  foreach_udp4_dst_port
-#undef _
-    rt = vlib_node_get_runtime_data (vm, udp6_input_node.index);
-
-  rt->next_by_dst_port = sparse_vec_new
-    ( /* elt bytes */ sizeof (rt->next_by_dst_port[0]),
-     /* bits in index */ BITS (((udp_header_t *) 0)->dst_port));
-
-  rt->punt_unknown = 0;
-
-#define _(n,s) add_dst_port (um, UDP_DST_PORT_##s, #s, 0 /* is_ip4 */);
-  foreach_udp6_dst_port
-#undef _
-    ip4_register_protocol (IP_PROTOCOL_UDP, udp4_input_node.index);
-  /* Note: ip6 differs from ip4, UDP is hotwired to ip6-udp-lookup */
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (udp_local_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/udp_packet.h b/vnet/vnet/ip/udp_packet.h
deleted file mode 100644
index beea3059..00000000
--- a/vnet/vnet/ip/udp_packet.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip4/udp_packet.h: UDP packet format
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_udp_packet_h
-#define included_udp_packet_h
-
-typedef struct
-{
-  /* Source and destination port. */
-  u16 src_port, dst_port;
-
-  /* Length of UDP header plus payload. */
-  u16 length;
-
-  /* Checksum of UDP pseudo-header and data or
-     zero if checksum is disabled. */
-  u16 checksum;
-} udp_header_t;
-
-#endif /* included_udp_packet_h */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ip/udp_pg.c b/vnet/vnet/ip/udp_pg.c
deleted file mode 100644
index c9d8d38c..00000000
--- a/vnet/vnet/ip/udp_pg.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ip/udp_pg: UDP packet-generator interface
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/pg/pg.h>
-#include <vnet/ip/ip.h>		/* for unformat_udp_udp_port */
-
-#define UDP_PG_EDIT_LENGTH (1 << 0)
-#define UDP_PG_EDIT_CHECKSUM (1 << 1)
-
-always_inline void
-udp_pg_edit_function_inline (pg_main_t * pg,
-			     pg_stream_t * s,
-			     pg_edit_group_t * g,
-			     u32 * packets, u32 n_packets, u32 flags)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  u32 ip_offset, udp_offset;
-
-  udp_offset = g->start_byte_offset;
-  ip_offset = (g - 1)->start_byte_offset;
-
-  while (n_packets >= 1)
-    {
-      vlib_buffer_t *p0;
-      ip4_header_t *ip0;
-      udp_header_t *udp0;
-      u32 udp_len0;
-
-      p0 = vlib_get_buffer (vm, packets[0]);
-      n_packets -= 1;
-      packets += 1;
-
-      ip0 = (void *) (p0->data + ip_offset);
-      udp0 = (void *) (p0->data + udp_offset);
-      udp_len0 = clib_net_to_host_u16 (ip0->length) - sizeof (ip0[0]);
-
-      if (flags & UDP_PG_EDIT_LENGTH)
-	udp0->length =
-	  clib_net_to_host_u16 (vlib_buffer_length_in_chain (vm, p0)
-				- ip_offset);
-
-      /* Initialize checksum with header. */
-      if (flags & UDP_PG_EDIT_CHECKSUM)
-	{
-	  ip_csum_t sum0;
-
-	  sum0 = clib_mem_unaligned (&ip0->src_address, u64);
-
-	  sum0 = ip_csum_with_carry
-	    (sum0, clib_host_to_net_u32 (udp_len0 + (ip0->protocol << 16)));
-
-	  /* Invalidate possibly old checksum. */
-	  udp0->checksum = 0;
-
-	  sum0 =
-	    ip_incremental_checksum_buffer (vm, p0, udp_offset, udp_len0,
-					    sum0);
-
-	  sum0 = ~ip_csum_fold (sum0);
-
-	  /* Zero checksum means checksumming disabled. */
-	  sum0 = sum0 != 0 ? sum0 : 0xffff;
-
-	  udp0->checksum = sum0;
-	}
-    }
-}
-
-static void
-udp_pg_edit_function (pg_main_t * pg,
-		      pg_stream_t * s,
-		      pg_edit_group_t * g, u32 * packets, u32 n_packets)
-{
-  switch (g->edit_function_opaque)
-    {
-    case UDP_PG_EDIT_LENGTH:
-      udp_pg_edit_function_inline (pg, s, g, packets, n_packets,
-				   UDP_PG_EDIT_LENGTH);
-      break;
-
-    case UDP_PG_EDIT_CHECKSUM:
-      udp_pg_edit_function_inline (pg, s, g, packets, n_packets,
-				   UDP_PG_EDIT_CHECKSUM);
-      break;
-
-    case UDP_PG_EDIT_CHECKSUM | UDP_PG_EDIT_LENGTH:
-      udp_pg_edit_function_inline (pg, s, g, packets, n_packets,
-				   UDP_PG_EDIT_CHECKSUM | UDP_PG_EDIT_LENGTH);
-      break;
-
-    default:
-      ASSERT (0);
-      break;
-    }
-}
-
-typedef struct
-{
-  pg_edit_t src_port, dst_port;
-  pg_edit_t length;
-  pg_edit_t checksum;
-} pg_udp_header_t;
-
-static inline void
-pg_udp_header_init (pg_udp_header_t * p)
-{
-  /* Initialize fields that are not bit fields in the IP header. */
-#define _(f) pg_edit_init (&p->f, udp_header_t, f);
-  _(src_port);
-  _(dst_port);
-  _(length);
-  _(checksum);
-#undef _
-}
-
-uword
-unformat_pg_udp_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t *s = va_arg (*args, pg_stream_t *);
-  pg_udp_header_t *p;
-  u32 group_index;
-
-  p = pg_create_edit_group (s, sizeof (p[0]), sizeof (udp_header_t),
-			    &group_index);
-  pg_udp_header_init (p);
-
-  /* Defaults. */
-  p->checksum.type = PG_EDIT_UNSPECIFIED;
-  p->length.type = PG_EDIT_UNSPECIFIED;
-
-  if (!unformat (input, "UDP: %U -> %U",
-		 unformat_pg_edit,
-		 unformat_tcp_udp_port, &p->src_port,
-		 unformat_pg_edit, unformat_tcp_udp_port, &p->dst_port))
-    goto error;
-
-  /* Parse options. */
-  while (1)
-    {
-      if (unformat (input, "length %U",
-		    unformat_pg_edit, unformat_pg_number, &p->length))
-	;
-
-      else if (unformat (input, "checksum %U",
-			 unformat_pg_edit, unformat_pg_number, &p->checksum))
-	;
-
-      /* Can't parse input: try next protocol level. */
-      else
-	break;
-    }
-
-  {
-    ip_main_t *im = &ip_main;
-    u16 dst_port;
-    tcp_udp_port_info_t *pi;
-
-    pi = 0;
-    if (p->dst_port.type == PG_EDIT_FIXED)
-      {
-	dst_port = pg_edit_get_value (&p->dst_port, PG_EDIT_LO);
-	pi = ip_get_tcp_udp_port_info (im, dst_port);
-      }
-
-    if (pi && pi->unformat_pg_edit
-	&& unformat_user (input, pi->unformat_pg_edit, s))
-      ;
-
-    else if (!unformat_user (input, unformat_pg_payload, s))
-      goto error;
-
-    p = pg_get_edit_group (s, group_index);
-    if (p->checksum.type == PG_EDIT_UNSPECIFIED
-	|| p->length.type == PG_EDIT_UNSPECIFIED)
-      {
-	pg_edit_group_t *g = pg_stream_get_group (s, group_index);
-	g->edit_function = udp_pg_edit_function;
-	g->edit_function_opaque = 0;
-	if (p->checksum.type == PG_EDIT_UNSPECIFIED)
-	  g->edit_function_opaque |= UDP_PG_EDIT_CHECKSUM;
-	if (p->length.type == PG_EDIT_UNSPECIFIED)
-	  g->edit_function_opaque |= UDP_PG_EDIT_LENGTH;
-      }
-
-    return 1;
-  }
-
-error:
-  /* Free up any edits we may have added. */
-  pg_free_edit_group (s);
-  return 0;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec-gre/dir.dox b/vnet/vnet/ipsec-gre/dir.dox
deleted file mode 100644
index e6ffd10b..00000000
--- a/vnet/vnet/ipsec-gre/dir.dox
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- @dir vnet/vnet/ipsec-gre
- @brief L2-GRE over IPSec tunnel interface implementation
-*/
diff --git a/vnet/vnet/ipsec-gre/error.def b/vnet/vnet/ipsec-gre/error.def
deleted file mode 100644
index d84e8ed1..00000000
--- a/vnet/vnet/ipsec-gre/error.def
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief L2-GRE over IPSec errors.
- */
-
-
-ipsec_gre_error (NONE, "no error")
-ipsec_gre_error (UNKNOWN_PROTOCOL, "unknown protocol")
-ipsec_gre_error (UNSUPPORTED_VERSION, "unsupported version")
-ipsec_gre_error (PKTS_DECAP, "GRE input packets decapsulated")
-ipsec_gre_error (PKTS_ENCAP, "GRE output packets encapsulated")
-ipsec_gre_error (NO_SUCH_TUNNEL, "GRE input packets dropped due to missing tunnel")
diff --git a/vnet/vnet/ipsec-gre/interface.c b/vnet/vnet/ipsec-gre/interface.c
deleted file mode 100644
index 56832ee1..00000000
--- a/vnet/vnet/ipsec-gre/interface.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * gre_interface.c: gre interfaces
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief L2-GRE over IPSec tunnel interface.
- *
- * Creates ipsec-gre tunnel interface.
- * Provides a command line interface so humans can interact with VPP.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ipsec-gre/ipsec_gre.h>
-#include <vnet/ip/format.h>
-#include <vnet/ipsec/ipsec.h>
-
-#if DPDK_CRYPTO==1
-#include <vnet/devices/dpdk/ipsec/esp.h>
-#define ESP_NODE "dpdk-esp-encrypt"
-#else
-#include <vnet/ipsec/esp.h>
-#define ESP_NODE "esp-encrypt"
-#endif
-
-u8 *
-format_ipsec_gre_tunnel (u8 * s, va_list * args)
-{
-  ipsec_gre_tunnel_t *t = va_arg (*args, ipsec_gre_tunnel_t *);
-  ipsec_gre_main_t *gm = &ipsec_gre_main;
-
-  s = format (s,
-	      "[%d] %U (src) %U (dst) local-sa %d remote-sa %d",
-	      t - gm->tunnels,
-	      format_ip4_address, &t->tunnel_src,
-	      format_ip4_address, &t->tunnel_dst,
-	      t->local_sa_id, t->remote_sa_id);
-  return s;
-}
-
-static clib_error_t *
-show_ipsec_gre_tunnel_command_fn (vlib_main_t * vm,
-				  unformat_input_t * input,
-				  vlib_cli_command_t * cmd)
-{
-  ipsec_gre_main_t *igm = &ipsec_gre_main;
-  ipsec_gre_tunnel_t *t;
-
-  if (pool_elts (igm->tunnels) == 0)
-    vlib_cli_output (vm, "No IPSec GRE tunnels configured...");
-
-  /* *INDENT-OFF* */
-  pool_foreach (t, igm->tunnels,
-  ({
-    vlib_cli_output (vm, "%U", format_ipsec_gre_tunnel, t);
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_ipsec_gre_tunnel_command, static) = {
-    .path = "show ipsec gre tunnel",
-    .function = show_ipsec_gre_tunnel_command_fn,
-};
-/* *INDENT-ON* */
-
-/* force inclusion from application's main.c */
-clib_error_t *
-ipsec_gre_interface_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ipsec_gre_interface_init);
-
-/**
- * @brief Add or delete ipsec-gre tunnel interface.
- *
- * @param *a vnet_ipsec_gre_add_del_tunnel_args_t - tunnel interface parameters
- * @param *sw_if_indexp u32 - software interface index
- * @return int - 0 if success otherwise <code>VNET_API_ERROR_</code>
- */
-int
-vnet_ipsec_gre_add_del_tunnel (vnet_ipsec_gre_add_del_tunnel_args_t * a,
-			       u32 * sw_if_indexp)
-{
-  ipsec_gre_main_t *igm = &ipsec_gre_main;
-  vnet_main_t *vnm = igm->vnet_main;
-  ip4_main_t *im = &ip4_main;
-  ipsec_gre_tunnel_t *t;
-  vnet_hw_interface_t *hi;
-  u32 hw_if_index, sw_if_index;
-  u32 slot;
-  uword *p;
-  u64 key;
-  ipsec_add_del_ipsec_gre_tunnel_args_t args;
-
-  memset (&args, 0, sizeof (args));
-  args.is_add = a->is_add;
-  args.local_sa_id = a->lsa;
-  args.remote_sa_id = a->rsa;
-  args.local_ip.as_u32 = a->src.as_u32;
-  args.remote_ip.as_u32 = a->dst.as_u32;
-
-  key = (u64) a->src.as_u32 << 32 | (u64) a->dst.as_u32;
-  p = hash_get (igm->tunnel_by_key, key);
-
-  if (a->is_add)
-    {
-      /* check if same src/dst pair exists */
-      if (p)
-	return VNET_API_ERROR_INVALID_VALUE;
-
-      pool_get_aligned (igm->tunnels, t, CLIB_CACHE_LINE_BYTES);
-      memset (t, 0, sizeof (*t));
-
-      if (vec_len (igm->free_ipsec_gre_tunnel_hw_if_indices) > 0)
-	{
-	  vnet_interface_main_t *im = &vnm->interface_main;
-
-	  hw_if_index = igm->free_ipsec_gre_tunnel_hw_if_indices
-	    [vec_len (igm->free_ipsec_gre_tunnel_hw_if_indices) - 1];
-	  _vec_len (igm->free_ipsec_gre_tunnel_hw_if_indices) -= 1;
-
-	  hi = vnet_get_hw_interface (vnm, hw_if_index);
-	  hi->dev_instance = t - igm->tunnels;
-	  hi->hw_instance = hi->dev_instance;
-
-	  /* clear old stats of freed tunnel before reuse */
-	  sw_if_index = hi->sw_if_index;
-	  vnet_interface_counter_lock (im);
-	  vlib_zero_combined_counter
-	    (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_TX],
-	     sw_if_index);
-	  vlib_zero_combined_counter
-	    (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_RX],
-	     sw_if_index);
-	  vlib_zero_simple_counter
-	    (&im->sw_if_counters[VNET_INTERFACE_COUNTER_DROP], sw_if_index);
-	  vnet_interface_counter_unlock (im);
-	}
-      else
-	{
-	  hw_if_index = vnet_register_interface
-	    (vnm, ipsec_gre_device_class.index, t - igm->tunnels,
-	     ipsec_gre_hw_interface_class.index, t - igm->tunnels);
-	  hi = vnet_get_hw_interface (vnm, hw_if_index);
-	  sw_if_index = hi->sw_if_index;
-	}
-
-      t->hw_if_index = hw_if_index;
-      t->sw_if_index = sw_if_index;
-      t->local_sa_id = a->lsa;
-      t->remote_sa_id = a->rsa;
-      t->local_sa = ipsec_get_sa_index_by_sa_id (a->lsa);
-      t->remote_sa = ipsec_get_sa_index_by_sa_id (a->rsa);
-
-      ip4_sw_interface_enable_disable (sw_if_index, 1);
-
-      vec_validate_init_empty (igm->tunnel_index_by_sw_if_index,
-			       sw_if_index, ~0);
-      igm->tunnel_index_by_sw_if_index[sw_if_index] = t - igm->tunnels;
-
-      vec_validate (im->fib_index_by_sw_if_index, sw_if_index);
-
-      hi->min_packet_bytes = 64 + sizeof (gre_header_t) +
-	sizeof (ip4_header_t) + sizeof (esp_header_t) + sizeof (esp_footer_t);
-      hi->per_packet_overhead_bytes =
-	/* preamble */ 8 + /* inter frame gap */ 12;
-
-      /* Standard default gre MTU. */
-      hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] =
-	9000;
-
-      clib_memcpy (&t->tunnel_src, &a->src, sizeof (t->tunnel_src));
-      clib_memcpy (&t->tunnel_dst, &a->dst, sizeof (t->tunnel_dst));
-
-      hash_set (igm->tunnel_by_key, key, t - igm->tunnels);
-
-      slot = vlib_node_add_named_next_with_slot
-	(vnm->vlib_main, hi->tx_node_index, ESP_NODE,
-	 IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT);
-
-      ASSERT (slot == IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT);
-
-    }
-  else
-    {				/* !is_add => delete */
-      /* tunnel needs to exist */
-      if (!p)
-	return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-      t = pool_elt_at_index (igm->tunnels, p[0]);
-
-      sw_if_index = t->sw_if_index;
-      ip4_sw_interface_enable_disable (sw_if_index, 0);
-      vnet_sw_interface_set_flags (vnm, sw_if_index, 0 /* down */ );
-      /* make sure tunnel is removed from l2 bd or xconnect */
-      set_int_l2_mode (igm->vlib_main, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0);
-      vec_add1 (igm->free_ipsec_gre_tunnel_hw_if_indices, t->hw_if_index);
-      igm->tunnel_index_by_sw_if_index[sw_if_index] = ~0;
-
-      hash_unset (igm->tunnel_by_key, key);
-      pool_put (igm->tunnels, t);
-    }
-
-  if (sw_if_indexp)
-    *sw_if_indexp = sw_if_index;
-
-  return ipsec_add_del_ipsec_gre_tunnel (vnm, &args);
-}
-
-static clib_error_t *
-create_ipsec_gre_tunnel_command_fn (vlib_main_t * vm,
-				    unformat_input_t * input,
-				    vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 is_add = 1;
-  u32 num_m_args = 0;
-  ip4_address_t src, dst;
-  u32 lsa = 0, rsa = 0;
-  vnet_ipsec_gre_add_del_tunnel_args_t _a, *a = &_a;
-  int rv;
-  u32 sw_if_index;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "src %U", unformat_ip4_address, &src))
-	num_m_args++;
-      else if (unformat (line_input, "dst %U", unformat_ip4_address, &dst))
-	num_m_args++;
-      else if (unformat (line_input, "local-sa %d", &lsa))
-	num_m_args++;
-      else if (unformat (line_input, "remote-sa %d", &rsa))
-	num_m_args++;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  if (num_m_args < 4)
-    return clib_error_return (0, "mandatory argument(s) missing");
-
-  if (memcmp (&src, &dst, sizeof (src)) == 0)
-    return clib_error_return (0, "src and dst are identical");
-
-  memset (a, 0, sizeof (*a));
-  a->is_add = is_add;
-  a->lsa = lsa;
-  a->rsa = rsa;
-  clib_memcpy (&a->src, &src, sizeof (src));
-  clib_memcpy (&a->dst, &dst, sizeof (dst));
-
-  rv = vnet_ipsec_gre_add_del_tunnel (a, &sw_if_index);
-
-  switch (rv)
-    {
-    case 0:
-      vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name,
-		       vnet_get_main (), sw_if_index);
-      break;
-    case VNET_API_ERROR_INVALID_VALUE:
-      return clib_error_return (0, "GRE tunnel already exists...");
-    default:
-      return clib_error_return (0,
-				"vnet_ipsec_gre_add_del_tunnel returned %d",
-				rv);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (create_ipsec_gre_tunnel_command, static) = {
-  .path = "create ipsec gre tunnel",
-  .short_help = "create ipsec gre tunnel src <addr> dst <addr> "
-                "local-sa <id> remote-sa <id> [del]",
-  .function = create_ipsec_gre_tunnel_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
-* fd.io coding-style-patch-verification: ON
-*
-* Local Variables:
-* eval: (c-set-style "gnu")
-* End:
-*/
diff --git a/vnet/vnet/ipsec-gre/ipsec_gre.api b/vnet/vnet/ipsec-gre/ipsec_gre.api
deleted file mode 100644
index 793bca0a..00000000
--- a/vnet/vnet/ipsec-gre/ipsec_gre.api
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \brief Add / del ipsec gre tunnel request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param local_sa_id - local SA id
-    @param remote_sa_id - remote SA id
-    @param is_add - 1 if adding the tunnel, 0 if deleting
-    @param src_address - tunnel source address
-    @param dst_address - tunnel destination address
-*/
-define ipsec_gre_add_del_tunnel {
-    u32 client_index;
-    u32 context;
-    u32 local_sa_id;
-    u32 remote_sa_id;
-    u8 is_add;
-    u8 src_address[4];
-    u8 dst_address[4];
-};
-
-/** \brief Reply for add / del ipsec gre tunnel request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-    @param sw_if_index - software index of the new ipsec gre tunnel
-*/
-define ipsec_gre_add_del_tunnel_reply {
-    u32 context;
-    i32 retval;
-    u32 sw_if_index;
-};
-
-/** \brief Dump ipsec gre tunnel table
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param tunnel_index - gre tunnel identifier or -1 in case of all tunnels
-*/
-define ipsec_gre_tunnel_dump {
-    u32 client_index;
-    u32 context;
-    u32 sw_if_index;
-};
-
-/** \brief ipsec gre tunnel operational state response
-    @param context - returned sender context, to match reply w/ request
-    @param sw_if_index - software index of the ipsec gre tunnel
-    @param local_sa_id - local SA id
-    @param remote_sa_id - remote SA id
-    @param src_address - tunnel source address
-    @param dst_address - tunnel destination address
-*/
-define ipsec_gre_tunnel_details {
-    u32 context;
-    u32 sw_if_index;
-    u32 local_sa_id;
-    u32 remote_sa_id;
-    u8 src_address[4];
-    u8 dst_address[4];
-};
-
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
- 
\ No newline at end of file
diff --git a/vnet/vnet/ipsec-gre/ipsec_gre.c b/vnet/vnet/ipsec-gre/ipsec_gre.c
deleted file mode 100644
index a0b065ac..00000000
--- a/vnet/vnet/ipsec-gre/ipsec_gre.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief L2-GRE over IPSec packet processing.
- *
- * Add GRE header to thr packet and send it to the esp-encrypt node.
-*/
-
-#include <vnet/vnet.h>
-#include <vnet/ipsec-gre/ipsec_gre.h>
-
-ipsec_gre_main_t ipsec_gre_main;
-
-/**
- * @brief IPv4 and GRE header union.
- *
-*/
-typedef struct
-{
-  union
-  {
-    ip4_and_gre_header_t ip4_and_gre;
-    u64 as_u64[3];
-  };
-} ip4_and_gre_union_t;
-
-/**
- * @brief Packet trace.
- *
-*/
-typedef struct
-{
-  u32 tunnel_id; /**< Tunnel-id / index in tunnel vector */
-
-  u32 length; /**< pkt length */
-
-  ip4_address_t src; /**< tunnel src IPv4 address */
-  ip4_address_t dst; /**< tunnel dst IPv4 address */
-
-  u32 sa_id; /**< tunnel IPSec SA id */
-} ipsec_gre_tx_trace_t;
-
-u8 *
-format_ipsec_gre_tx_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ipsec_gre_tx_trace_t *t = va_arg (*args, ipsec_gre_tx_trace_t *);
-
-  s = format (s, "GRE: tunnel %d len %d src %U dst %U sa-id %d",
-	      t->tunnel_id, clib_net_to_host_u16 (t->length),
-	      format_ip4_address, &t->src.as_u8,
-	      format_ip4_address, &t->dst.as_u8, t->sa_id);
-  return s;
-}
-
-/**
- * @brief IPSec-GRE tunnel interface tx function.
- *
- * Add GRE header to the packet.
- *
- * @param vm vlib_main_t corresponding to the current thread.
- * @param node vlib_node_runtime_t data for this node.
- * @param frame vlib_frame_t whose contents should be dispatched.
- *
- * @par Graph mechanics: buffer metadata, next index usage
- *
- * <em>Uses:</em>
- * - <code>node->runtime_data</code>
- *     - Match tunnel by <code>rd->dev_instance</code> in IPSec-GRE tunnels
- *       pool.
- *
- * <em>Sets:</em>
- * - <code>vnet_buffer(b)->output_features.ipsec_sad_index</code>
- *     - Set IPSec Security Association for packet encryption.
- * - <code>vnet_buffer(b)->sw_if_index[VLIB_TX]</code>
- *     - Reset output sw_if_index.
- *
- * <em>Nexd Index:</em>
- * - Dispatches the packet to the esp-encrypt node.
-*/
-static uword
-ipsec_gre_interface_tx (vlib_main_t * vm,
-			vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  ipsec_gre_main_t *igm = &ipsec_gre_main;
-  u32 next_index;
-  u32 *from, *to_next, n_left_from, n_left_to_next;
-  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
-  ipsec_gre_tunnel_t *t = pool_elt_at_index (igm->tunnels, rd->dev_instance);
-
-  /* Vector of buffer / pkt indices we're supposed to process */
-  from = vlib_frame_vector_args (frame);
-
-  /* Number of buffers / pkts */
-  n_left_from = frame->n_vectors;
-
-  /* Speculatively send the first buffer to the last disposition we used */
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      /* set up to enqueue to our disposition with index = next_index */
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /*
-       * As long as we have enough pkts left to process two pkts
-       * and prefetch two pkts...
-       */
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  vlib_buffer_t *b0, *b1;
-	  ip4_header_t *ip0, *ip1;
-	  ip4_and_gre_union_t *h0, *h1;
-	  u32 bi0, next0, bi1, next1;
-	  __attribute__ ((unused)) u8 error0, error1;
-	  u16 gre_protocol0, gre_protocol1;
-
-	  /* Prefetch the next iteration */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    /*
-	     * Prefetch packet data. We expect to overwrite
-	     * the inbound L2 header with an ip header and a
-	     * gre header. Might want to prefetch the last line
-	     * of rewrite space as well; need profile data
-	     */
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-	  /* Pick up the next two buffer indices */
-	  bi0 = from[0];
-	  bi1 = from[1];
-
-	  /* Speculatively enqueue them where we sent the last buffer */
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  ip0 = vlib_buffer_get_current (b0);
-	  gre_protocol0 = clib_net_to_host_u16 (0x01);
-
-	  ip1 = vlib_buffer_get_current (b1);
-	  gre_protocol1 = clib_net_to_host_u16 (0x01);
-
-	  vlib_buffer_advance (b0, -sizeof (*h0));
-	  vlib_buffer_advance (b1, -sizeof (*h1));
-
-	  h0 = vlib_buffer_get_current (b0);
-	  h1 = vlib_buffer_get_current (b1);
-	  h0->as_u64[0] = 0;
-	  h0->as_u64[1] = 0;
-	  h0->as_u64[2] = 0;
-
-	  h1->as_u64[0] = 0;
-	  h1->as_u64[1] = 0;
-	  h1->as_u64[2] = 0;
-
-	  ip0 = &h0->ip4_and_gre.ip4;
-	  h0->ip4_and_gre.gre.protocol = gre_protocol0;
-	  ip0->ip_version_and_header_length = 0x45;
-	  ip0->ttl = 254;
-	  ip0->protocol = IP_PROTOCOL_GRE;
-
-	  ip1 = &h1->ip4_and_gre.ip4;
-	  h1->ip4_and_gre.gre.protocol = gre_protocol1;
-	  ip1->ip_version_and_header_length = 0x45;
-	  ip1->ttl = 254;
-	  ip1->protocol = IP_PROTOCOL_GRE;
-
-	  ip0->length =
-	    clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
-	  ip1->length =
-	    clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1));
-	  ip0->src_address.as_u32 = t->tunnel_src.as_u32;
-	  ip1->src_address.as_u32 = t->tunnel_src.as_u32;
-	  ip0->dst_address.as_u32 = t->tunnel_dst.as_u32;
-	  ip1->dst_address.as_u32 = t->tunnel_dst.as_u32;
-	  ip0->checksum = ip4_header_checksum (ip0);
-	  ip1->checksum = ip4_header_checksum (ip1);
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
-	    vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	  vnet_buffer (b1)->sw_if_index[VLIB_RX] =
-	    vnet_buffer (b1)->sw_if_index[VLIB_TX];
-
-	  vnet_buffer (b0)->ipsec.sad_index = t->local_sa;
-	  vnet_buffer (b1)->ipsec.sad_index = t->local_sa;
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-	  vnet_buffer (b1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-
-	  next0 = IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT;
-	  next1 = IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT;
-	  error0 = IPSEC_GRE_ERROR_NONE;
-	  error1 = IPSEC_GRE_ERROR_NONE;
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ipsec_gre_tx_trace_t *tr = vlib_add_trace (vm, node,
-							 b0, sizeof (*tr));
-	      tr->tunnel_id = t - igm->tunnels;
-	      tr->length = ip0->length;
-	      tr->src.as_u32 = ip0->src_address.as_u32;
-	      tr->dst.as_u32 = ip0->dst_address.as_u32;
-	      tr->sa_id = t->local_sa_id;
-	    }
-
-	  if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ipsec_gre_tx_trace_t *tr = vlib_add_trace (vm, node,
-							 b1, sizeof (*tr));
-	      tr->tunnel_id = t - igm->tunnels;
-	      tr->length = ip1->length;
-	      tr->src.as_u32 = ip1->src_address.as_u32;
-	      tr->dst.as_u32 = ip1->dst_address.as_u32;
-	      tr->sa_id = t->local_sa_id;
-	    }
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *b0;
-	  ip4_header_t *ip0;
-	  ip4_and_gre_union_t *h0;
-	  u32 bi0, next0;
-	  __attribute__ ((unused)) u8 error0;
-	  u16 gre_protocol0;
-
-	  bi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  gre_protocol0 = clib_net_to_host_u16 (0x01);
-
-	  vlib_buffer_advance (b0, -sizeof (*h0));
-
-	  h0 = vlib_buffer_get_current (b0);
-	  h0->as_u64[0] = 0;
-	  h0->as_u64[1] = 0;
-	  h0->as_u64[2] = 0;
-
-	  ip0 = &h0->ip4_and_gre.ip4;
-	  h0->ip4_and_gre.gre.protocol = gre_protocol0;
-	  ip0->ip_version_and_header_length = 0x45;
-	  ip0->ttl = 254;
-	  ip0->protocol = IP_PROTOCOL_GRE;
-	  ip0->length =
-	    clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
-	  ip0->src_address.as_u32 = t->tunnel_src.as_u32;
-	  ip0->dst_address.as_u32 = t->tunnel_dst.as_u32;
-	  ip0->checksum = ip4_header_checksum (ip0);
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
-	    vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	  vnet_buffer (b0)->ipsec.sad_index = t->local_sa;
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-
-	  next0 = IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT;
-	  error0 = IPSEC_GRE_ERROR_NONE;
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ipsec_gre_tx_trace_t *tr = vlib_add_trace (vm, node,
-							 b0, sizeof (*tr));
-	      tr->tunnel_id = t - igm->tunnels;
-	      tr->length = ip0->length;
-	      tr->src.as_u32 = ip0->src_address.as_u32;
-	      tr->dst.as_u32 = ip0->dst_address.as_u32;
-	      tr->sa_id = t->local_sa_id;
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, ipsec_gre_input_node.index,
-			       IPSEC_GRE_ERROR_PKTS_ENCAP, frame->n_vectors);
-
-  return frame->n_vectors;
-}
-
-static clib_error_t *
-ipsec_gre_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index,
-				   u32 flags)
-{
-  if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
-    vnet_hw_interface_set_flags (vnm, hw_if_index,
-				 VNET_HW_INTERFACE_FLAG_LINK_UP);
-  else
-    vnet_hw_interface_set_flags (vnm, hw_if_index, 0 /* down */ );
-
-  return /* no error */ 0;
-}
-
-static u8 *
-format_ipsec_gre_tunnel_name (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  return format (s, "ipsec-gre%d", dev_instance);
-}
-
-static u8 *
-format_ipsec_gre_device (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  CLIB_UNUSED (int verbose) = va_arg (*args, int);
-
-  s = format (s, "IPSEC-GRE tunnel: id %d\n", dev_instance);
-  return s;
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (ipsec_gre_device_class) = {
-  .name = "IPSec GRE tunnel device",
-  .format_device_name = format_ipsec_gre_tunnel_name,
-  .format_device = format_ipsec_gre_device,
-  .format_tx_trace = format_ipsec_gre_tx_trace,
-  .tx_function = ipsec_gre_interface_tx,
-  .admin_up_down_function = ipsec_gre_interface_admin_up_down,
-};
-
-VLIB_DEVICE_TX_FUNCTION_MULTIARCH (ipsec_gre_device_class,
-				   ipsec_gre_interface_tx)
-
-
-VNET_HW_INTERFACE_CLASS (ipsec_gre_hw_interface_class) = {
-  .name = "IPSEC-GRE",
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-ipsec_gre_init (vlib_main_t * vm)
-{
-  ipsec_gre_main_t *igm = &ipsec_gre_main;
-  clib_error_t *error;
-
-  memset (igm, 0, sizeof (igm[0]));
-  igm->vlib_main = vm;
-  igm->vnet_main = vnet_get_main ();
-
-  if ((error = vlib_call_init_function (vm, ip_main_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip4_lookup_init)))
-    return error;
-
-  igm->tunnel_by_key = hash_create (0, sizeof (uword));
-
-  return vlib_call_init_function (vm, ipsec_gre_input_init);
-}
-
-VLIB_INIT_FUNCTION (ipsec_gre_init);
-
-ipsec_gre_main_t *
-ipsec_gre_get_main (vlib_main_t * vm)
-{
-  vlib_call_init_function (vm, ipsec_gre_init);
-  return &ipsec_gre_main;
-}
-
-/*
-* fd.io coding-style-patch-verification: ON
-*
-* Local Variables:
-* eval: (c-set-style "gnu")
-* End:
-*/
diff --git a/vnet/vnet/ipsec-gre/ipsec_gre.h b/vnet/vnet/ipsec-gre/ipsec_gre.h
deleted file mode 100644
index a2ca64b6..00000000
--- a/vnet/vnet/ipsec-gre/ipsec_gre.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief L2-GRE over IPSec packet processing.
-*/
-
-#ifndef included_ipsec_gre_h
-#define included_ipsec_gre_h
-
-#include <vnet/vnet.h>
-#include <vnet/gre/packet.h>
-#include <vnet/gre/gre.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ip/ip4.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ip/format.h>
-
-extern vnet_hw_interface_class_t ipsec_gre_hw_interface_class;
-
-/**
- * @brief IPSec-GRE errors.
- *
-*/
-typedef enum
-{
-#define ipsec_gre_error(n,s) IPSEC_GRE_ERROR_##n,
-#include <vnet/ipsec-gre/error.def>
-#undef ipsec_gre_error
-  IPSEC_GRE_N_ERROR,
-} ipsec_gre_error_t;
-
-/**
- * @brief IPSec-GRE tunnel parameters.
- *
-*/
-typedef struct
-{
-  ip4_address_t tunnel_src; /**< tunnel IPv4 src address */
-  ip4_address_t tunnel_dst; /**< tunnel IPv4 dst address */
-  u32 local_sa;		    /**< local IPSec SA index */
-  u32 remote_sa;	    /**< remote IPSec SA index */
-  u32 local_sa_id;	    /**< local IPSec SA id */
-  u32 remote_sa_id;	    /**< remote IPSec SA id */
-  u32 hw_if_index;;	    /**< hardware interface index */
-  u32 sw_if_index;;	    /**< software interface index */
-} ipsec_gre_tunnel_t;
-
-/**
- * @brief IPSec-GRE state.
- *
-*/
-typedef struct
-{
-  ipsec_gre_tunnel_t *tunnels; /**< pool of tunnel instances */
-
-  uword *tunnel_by_key;	 /**< hash mapping src/dst addr pair to tunnel */
-
-  u32 *free_ipsec_gre_tunnel_hw_if_indices;  /**< free vlib hw_if_indices */
-
-  u32 *tunnel_index_by_sw_if_index;  /**< mapping from sw_if_index to tunnel
-                                          index */
-
-  vlib_main_t *vlib_main;  /**< convenience */
-  vnet_main_t *vnet_main;  /**< convenience */
-} ipsec_gre_main_t;
-
-ipsec_gre_main_t ipsec_gre_main;
-
-extern vlib_node_registration_t ipsec_gre_input_node;
-extern vnet_device_class_t ipsec_gre_device_class;
-
-/* manually added to the interface output node in ipsec_gre.c */
-#define IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT 1
-
-/**
- * @brief IPSec-GRE tunnel add/del arguments.
- *
-*/
-typedef struct
-{
-  u8 is_add; /**< 1 - add, 0 - delete */
-
-  ip4_address_t src; /**< tunnel IPv4 src address */
-  ip4_address_t dst; /**< tunnel IPv4 dst address */
-  u32 lsa;	     /**< local IPSec SA id */
-  u32 rsa;	     /**< remote IPSec SA id */
-} vnet_ipsec_gre_add_del_tunnel_args_t;
-
-int vnet_ipsec_gre_add_del_tunnel
-  (vnet_ipsec_gre_add_del_tunnel_args_t * a, u32 * sw_if_indexp);
-
-#endif /* included_ipsec_gre_h */
-
-/*
-* fd.io coding-style-patch-verification: ON
-*
-* Local Variables:
-* eval: (c-set-style "gnu")
-* End:
-*/
diff --git a/vnet/vnet/ipsec-gre/ipsec_gre_api.c b/vnet/vnet/ipsec-gre/ipsec_gre_api.c
deleted file mode 100644
index a7ea1490..00000000
--- a/vnet/vnet/ipsec-gre/ipsec_gre_api.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- *------------------------------------------------------------------
- * ipsec_gre_api.c - ipsec_gre api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/ipsec-gre/ipsec_gre.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                             \
-_(IPSEC_GRE_ADD_DEL_TUNNEL, ipsec_gre_add_del_tunnel)                   \
-_(IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump)
-
-static void
-vl_api_ipsec_gre_add_del_tunnel_t_handler (vl_api_ipsec_gre_add_del_tunnel_t *
-					   mp)
-{
-  vl_api_ipsec_gre_add_del_tunnel_reply_t *rmp;
-  int rv = 0;
-  vnet_ipsec_gre_add_del_tunnel_args_t _a, *a = &_a;
-  u32 sw_if_index = ~0;
-
-  /* Check src & dst are different */
-  if (memcmp (mp->src_address, mp->dst_address, 4) == 0)
-    {
-      rv = VNET_API_ERROR_SAME_SRC_DST;
-      goto out;
-    }
-
-  memset (a, 0, sizeof (*a));
-
-  /* ip addresses sent in network byte order */
-  clib_memcpy (&(a->src), mp->src_address, 4);
-  clib_memcpy (&(a->dst), mp->dst_address, 4);
-  a->is_add = mp->is_add;
-  a->lsa = ntohl (mp->local_sa_id);
-  a->rsa = ntohl (mp->remote_sa_id);
-
-  rv = vnet_ipsec_gre_add_del_tunnel (a, &sw_if_index);
-
-out:
-    /* *INDENT-OFF* */
-    REPLY_MACRO2(VL_API_GRE_ADD_DEL_TUNNEL_REPLY,
-    ({
-        rmp->sw_if_index = ntohl (sw_if_index);
-    }));
-    /* *INDENT-ON* */
-}
-
-static void send_ipsec_gre_tunnel_details
-  (ipsec_gre_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_ipsec_gre_tunnel_details_t *rmp;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_IPSEC_GRE_TUNNEL_DETAILS);
-  clib_memcpy (rmp->src_address, &(t->tunnel_src), 4);
-  clib_memcpy (rmp->dst_address, &(t->tunnel_dst), 4);
-  rmp->sw_if_index = htonl (t->sw_if_index);
-  rmp->local_sa_id = htonl (t->local_sa_id);
-  rmp->remote_sa_id = htonl (t->remote_sa_id);
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void vl_api_ipsec_gre_tunnel_dump_t_handler
-  (vl_api_ipsec_gre_tunnel_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  ipsec_gre_main_t *igm = &ipsec_gre_main;
-  ipsec_gre_tunnel_t *t;
-  u32 sw_if_index;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  if (~0 == sw_if_index)
-    {
-        /* *INDENT-OFF* */
-        pool_foreach (t, igm->tunnels,
-        ({
-            send_ipsec_gre_tunnel_details(t, q, mp->context);
-        }));
-        /* *INDENT-ON* */
-    }
-  else
-    {
-      if ((sw_if_index >= vec_len (igm->tunnel_index_by_sw_if_index)) ||
-	  (~0 == igm->tunnel_index_by_sw_if_index[sw_if_index]))
-	{
-	  return;
-	}
-      t = &igm->tunnels[igm->tunnel_index_by_sw_if_index[sw_if_index]];
-      send_ipsec_gre_tunnel_details (t, q, mp->context);
-    }
-}
-
-/*
- * ipsec_gre_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_ipsec_gre;
-#undef _
-}
-
-static clib_error_t *
-ipsec_gre_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (ipsec_gre_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec-gre/ipsec_gre_doc.md b/vnet/vnet/ipsec-gre/ipsec_gre_doc.md
deleted file mode 100644
index e1bb9cda..00000000
--- a/vnet/vnet/ipsec-gre/ipsec_gre_doc.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# VPP L2-GRE over IPsec implementation    {#ipsec_gre_doc}
-
-This is a memo intended to contain documentation of the VPP L2-GRE over IPsec implementation.
-Everything that is not directly obvious should come here.
-
-
-## L2-GRE over IPsec
-GRE encapsulate layer 2 traffic and IPSec encrypt what is encapsulated by GRE. The whole point of L2-GRE over IPSec is to tunnel layer 2 over GRE and IPSec by bridging the physical interface with IPSec-GRE tunnel interface.
-
-There are 2 dedicated nodes for encapsulation:
-* ipsec-gre<n>-tx - add GRE header
-* esp-encrypt - encrypt GRE packet to ESP packet
-
-There are 3 dedicated nodes for decapsulation:
-* ipsec-if-input - match IPSec SA by source IP address and SPI in ESP packet
-* esp-decrypt - decrypt ESP packet
-* ipsec-gre-input - remove GRE header
-
-
-### Configuration
-
-L2-GRE over IPsec support the following CLI configuration command:
-    create ipsec gre tunnel src <addr> dst <addr> local-sa <id> remote-sa <id> [del]
-
-src: tunnel source IPv4 address
-dst: tunnel destination IPv4 address
-local-sa: tunnel local IPSec Security Association
-remote-sa: tunnel remote IPSec Security Association
-del: delete IPSec-GRE tunnel
-
-L2-GRE over IPsec support the following API configuration command:
-    ipsec_gre_add_del_tunnel src <addr> dst <addr> local_sa <sa-id> remote_sa <sa-id> [del]
-
-src: tunnel source IPv4 address
-dst: tunnel destination IPv4 address
-local_sa: tunnel local IPSec Security Association
-remote_sa: tunnel remote IPSec Security Association
-del: delete IPSec-GRE tunnel
-
-
-### Configuration example
-
-Interface GigabitEthernet0/9/0 is in bridge with ipsec-gre0 tunnel interface, interface GigabitEthernet0/8/0 sending encapsulated and encrypted traffic.
-
-Configure IPv4 address on sending interface:
-set int ip address GigabitEthernet0/8/0 192.168.1.1/24
-
-Configure IPSec Security Associations:
-ipsec sa add 10 spi 1001 esp crypto-key 4a506a794f574265564551694d653768 crypto-alg aes-cbc-128 integ-key 4339314b55523947594d6d3547666b45764e6a58 integ-alg sha1-96
-ipsec sa add 20 spi 1000 esp crypto-key 49517065716d6235726c734a4372466c crypto-alg aes-cbc-128 integ-key 307439636a5542735133595835546f68534e4f64 integ-alg sha1-96
-
-Create IPSec-GRE tunnel:
-create ipsec gre tunnel src 192.168.1.1 dst 192.168.1.2 local-sa 10 remote-sa 20
-
-Set interfaces state:
-set int state GigabitEthernet0/8/0 up
-set int state GigabitEthernet0/9/0 up
-set int state ipsec-gre0 up
-
-Bridge physical interface with IPSec-GRE tunnel interface:
-set interface l2 bridge GigabitEthernet0/9/0 1
-set interface l2 bridge ipsec-gre0 1
-
-
-### Operational data
-
-L2-GRE over IPsec support the following CLI show command:
-    show ipsec gre tunnel
-
-L2-GRE over IPsec support the following API dump command:
-    ipsec_gre_tunnel_dump [sw_if_index <nn>]
-
-sw_if_index: software interface index of the IPSec-GRE tunnel interface
-
diff --git a/vnet/vnet/ipsec-gre/node.c b/vnet/vnet/ipsec-gre/node.c
deleted file mode 100644
index d20f248a..00000000
--- a/vnet/vnet/ipsec-gre/node.c
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief L2-GRE over IPSec packet processing.
- *
- * Removes GRE header from the packet and sends it to the l2-input node.
-*/
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ipsec-gre/ipsec_gre.h>
-#include <vppinfra/sparse_vec.h>
-
-#define foreach_ipsec_gre_input_next		\
-_(PUNT, "error-punt")                           \
-_(DROP, "error-drop")                           \
-_(L2_INPUT, "l2-input")
-
-typedef enum {
-#define _(s,n) IPSEC_GRE_INPUT_NEXT_##s,
-  foreach_ipsec_gre_input_next
-#undef _
-  IPSEC_GRE_INPUT_N_NEXT,
-} ipsec_gre_input_next_t;
-
-typedef struct {
-  u32 tunnel_id;
-  u32 length;
-  ip4_address_t src;
-  ip4_address_t dst;
-} ipsec_gre_rx_trace_t;
-
-u8 * format_ipsec_gre_rx_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ipsec_gre_rx_trace_t * t = va_arg (*args, ipsec_gre_rx_trace_t *);
-
-  s = format (s, "GRE: tunnel %d len %d src %U dst %U",
-              t->tunnel_id, clib_net_to_host_u16(t->length),
-              format_ip4_address, &t->src.as_u8,
-              format_ip4_address, &t->dst.as_u8);
-  return s;
-}
-
-/**
- * @brief L2-GRE over IPSec input node.
- * @node ipsec-gre-input
- *
- * This node remove GRE header.
- *
- * @param vm         vlib_main_t corresponding to the current thread.
- * @param node       vlib_node_runtime_t data for this node.
- * @param from_frame vlib_frame_t whose contents should be dispatched.
- *
- * @par Graph mechanics: buffer metadata, next index usage
- *
- * <em>Uses:</em>
- * - <code>ip->src_address</code> and <code>ip->dst_address</code>
- *     - Match tunnel by source and destination addresses in GRE IP header.
- *
- * <em>Sets:</em>
- * - <code>vnet_buffer(b)->gre.src</code>
- *     - Save tunnel source IPv4 address.
- * - <code>vnet_buffer(b)->gre.dst</code>
- *     - Save tunnel destination IPv4 address.
- * - <code>vnet_buffer(b)->sw_if_index[VLIB_RX]</code>
- *     - Set input sw_if_index to IPSec-GRE tunnel for learning.
- *
- * <em>Next Index:</em>
- * - Dispatches the packet to the l2-input node.
-*/
-static uword
-ipsec_gre_input (vlib_main_t * vm,
-                 vlib_node_runtime_t * node,
-                 vlib_frame_t * from_frame)
-{
-  ipsec_gre_main_t * igm = &ipsec_gre_main;
-  u32 n_left_from, next_index, * from, * to_next;
-  u64 cached_tunnel_key = (u64) ~0;
-  u32 cached_tunnel_sw_if_index = 0, tunnel_sw_if_index;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t * b0, * b1;
-	  gre_header_t * h0, * h1;
-          u16 version0, version1, protocol0, protocol1;
-          int verr0, verr1;
-	  u32 next0, next1;
-          ip4_header_t *ip0, *ip1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * p2, * p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, sizeof (h0[0]), LOAD);
-	    CLIB_PREFETCH (p3->data, sizeof (h1[0]), LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-          /* ip4_local hands us the ip header, not the gre header */
-          ip0 = vlib_buffer_get_current (b0);
-          ip1 = vlib_buffer_get_current (b1);
-
-          /* Save src + dst ip4 address */
-          vnet_buffer(b0)->gre.src = ip0->src_address.as_u32;
-          vnet_buffer(b0)->gre.dst = ip0->dst_address.as_u32;
-          vnet_buffer(b1)->gre.src = ip1->src_address.as_u32;
-          vnet_buffer(b1)->gre.dst = ip1->dst_address.as_u32;
-
-          vlib_buffer_advance (b0, sizeof (*ip0));
-          vlib_buffer_advance (b1, sizeof (*ip1));
-
-	  h0 = vlib_buffer_get_current (b0);
-	  h1 = vlib_buffer_get_current (b1);
-
-          protocol0 = clib_net_to_host_u16 (h0->protocol);
-          protocol1 = clib_net_to_host_u16 (h1->protocol);
-          if (PREDICT_TRUE(protocol0 == 0x0001))
-            {
-              next0 = IPSEC_GRE_INPUT_NEXT_L2_INPUT;
-              b0->error = node->errors[IPSEC_GRE_ERROR_NONE];
-            }
-          else
-            {
-              clib_warning("unknown GRE protocol: %d", protocol0);
-              b0->error = node->errors[IPSEC_GRE_ERROR_UNKNOWN_PROTOCOL];
-              next0 = IPSEC_GRE_INPUT_NEXT_DROP;
-            }
-          if (PREDICT_TRUE(protocol1 == 0x0001))
-            {
-              next1 = IPSEC_GRE_INPUT_NEXT_L2_INPUT;
-              b1->error = node->errors[IPSEC_GRE_ERROR_NONE];
-            }
-          else
-            {
-              clib_warning("unknown GRE protocol: %d", protocol1);
-              b1->error = node->errors[IPSEC_GRE_ERROR_UNKNOWN_PROTOCOL];
-              next1 = IPSEC_GRE_INPUT_NEXT_DROP;
-            }
-
-          version0 = clib_net_to_host_u16 (h0->flags_and_version);
-          verr0 =  version0 & GRE_VERSION_MASK;
-          version1 = clib_net_to_host_u16 (h1->flags_and_version);
-          verr1 =  version1 & GRE_VERSION_MASK;
-
-          b0->error = verr0 ? node->errors[IPSEC_GRE_ERROR_UNSUPPORTED_VERSION]
-              : b0->error;
-          next0 = verr0 ? IPSEC_GRE_INPUT_NEXT_DROP : next0;
-          b1->error = verr1 ? node->errors[IPSEC_GRE_ERROR_UNSUPPORTED_VERSION]
-              : b1->error;
-          next1 = verr1 ? IPSEC_GRE_INPUT_NEXT_DROP : next1;
-
-          /* For L2 payload set input sw_if_index to GRE tunnel for learning */
-          if (PREDICT_TRUE(next0 == IPSEC_GRE_INPUT_NEXT_L2_INPUT))
-            {
-              u64 key = ((u64)(vnet_buffer(b0)->gre.dst) << 32) |
-                         (u64)(vnet_buffer(b0)->gre.src);
-
-              if (cached_tunnel_key != key)
-                {
-                  vnet_hw_interface_t * hi;
-                  ipsec_gre_tunnel_t * t;
-                  uword * p;
-
-                  p = hash_get (igm->tunnel_by_key, key);
-                  if (!p)
-                    {
-                      next0 = IPSEC_GRE_INPUT_NEXT_DROP;
-                      b0->error = node->errors[IPSEC_GRE_ERROR_NO_SUCH_TUNNEL];
-                      goto drop0;
-                    }
-                  t = pool_elt_at_index (igm->tunnels, p[0]);
-                  hi = vnet_get_hw_interface (igm->vnet_main,
-                            t->hw_if_index);
-                  tunnel_sw_if_index = hi->sw_if_index;
-                  cached_tunnel_sw_if_index = tunnel_sw_if_index;
-                }
-              else
-                {
-                  tunnel_sw_if_index = cached_tunnel_sw_if_index;
-                }
-              vnet_buffer(b0)->sw_if_index[VLIB_RX] = tunnel_sw_if_index;
-            }
-
-drop0:
-          /* For L2 payload set input sw_if_index to GRE tunnel for learning */
-          if (PREDICT_TRUE(next1 == IPSEC_GRE_INPUT_NEXT_L2_INPUT))
-            {
-              u64 key = ((u64)(vnet_buffer(b1)->gre.dst) << 32) |
-                         (u64)(vnet_buffer(b1)->gre.src);
-
-              if (cached_tunnel_key != key)
-                {
-                  vnet_hw_interface_t * hi;
-                  ipsec_gre_tunnel_t * t;
-                  uword * p;
-
-                  p = hash_get (igm->tunnel_by_key, key);
-                  if (!p)
-                    {
-                      next1 = IPSEC_GRE_INPUT_NEXT_DROP;
-                      b1->error = node->errors[IPSEC_GRE_ERROR_NO_SUCH_TUNNEL];
-                      goto drop1;
-                    }
-                  t = pool_elt_at_index (igm->tunnels, p[0]);
-                  hi = vnet_get_hw_interface (igm->vnet_main,
-                            t->hw_if_index);
-                  tunnel_sw_if_index = hi->sw_if_index;
-                  cached_tunnel_sw_if_index = tunnel_sw_if_index;
-                }
-              else
-                {
-                  tunnel_sw_if_index = cached_tunnel_sw_if_index;
-                }
-              vnet_buffer(b1)->sw_if_index[VLIB_RX] = tunnel_sw_if_index;
-            }
-
-drop1:
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-            {
-              ipsec_gre_rx_trace_t *tr = vlib_add_trace (vm, node,
-                                                   b0, sizeof (*tr));
-              tr->tunnel_id = ~0;
-              tr->length = ip0->length;
-              tr->src.as_u32 = ip0->src_address.as_u32;
-              tr->dst.as_u32 = ip0->dst_address.as_u32;
-            }
-
-          if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
-            {
-              ipsec_gre_rx_trace_t *tr = vlib_add_trace (vm, node,
-                                                   b1, sizeof (*tr));
-              tr->tunnel_id = ~0;
-              tr->length = ip1->length;
-              tr->src.as_u32 = ip1->src_address.as_u32;
-              tr->dst.as_u32 = ip1->dst_address.as_u32;
-            }
-
-          vlib_buffer_advance (b0, sizeof (*h0));
-          vlib_buffer_advance (b1, sizeof (*h1));
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t * b0;
-	  gre_header_t * h0;
-          ip4_header_t * ip0;
-          u16 version0, protocol0;
-          int verr0;
-	  u32 next0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-          ip0 = vlib_buffer_get_current (b0);
-
-          vnet_buffer(b0)->gre.src = ip0->src_address.as_u32;
-          vnet_buffer(b0)->gre.dst = ip0->dst_address.as_u32;
-
-          vlib_buffer_advance (b0, sizeof (*ip0));
-
-	  h0 = vlib_buffer_get_current (b0);
-
-          protocol0 = clib_net_to_host_u16 (h0->protocol);
-          if (PREDICT_TRUE(protocol0 == 0x0001))
-            {
-              next0 = IPSEC_GRE_INPUT_NEXT_L2_INPUT;
-              b0->error = node->errors[IPSEC_GRE_ERROR_NONE];
-            }
-          else
-            {
-              clib_warning("unknown GRE protocol: %d", protocol0);
-              b0->error = node->errors[IPSEC_GRE_ERROR_UNKNOWN_PROTOCOL];
-              next0 = IPSEC_GRE_INPUT_NEXT_DROP;
-            }
-
-          version0 = clib_net_to_host_u16 (h0->flags_and_version);
-          verr0 =  version0 & GRE_VERSION_MASK;
-          b0->error = verr0 ? node->errors[IPSEC_GRE_ERROR_UNSUPPORTED_VERSION]
-              : b0->error;
-          next0 = verr0 ? IPSEC_GRE_INPUT_NEXT_DROP : next0;
-
-          /* For L2 payload set input sw_if_index to GRE tunnel for learning */
-          if (PREDICT_FALSE(next0 == IPSEC_GRE_INPUT_NEXT_L2_INPUT))
-            {
-              u64 key = ((u64)(vnet_buffer(b0)->gre.dst) << 32) |
-                         (u64)(vnet_buffer(b0)->gre.src);
-
-              if (cached_tunnel_key != key)
-                {
-                  vnet_hw_interface_t * hi;
-                  ipsec_gre_tunnel_t * t;
-                  uword * p;
-
-                  p = hash_get (igm->tunnel_by_key, key);
-                  if (!p)
-                    {
-                      next0 = IPSEC_GRE_INPUT_NEXT_DROP;
-                      b0->error = node->errors[IPSEC_GRE_ERROR_NO_SUCH_TUNNEL];
-                      goto drop;
-                    }
-                  t = pool_elt_at_index (igm->tunnels, p[0]);
-                  hi = vnet_get_hw_interface (igm->vnet_main,
-                            t->hw_if_index);
-                  tunnel_sw_if_index = hi->sw_if_index;
-                  cached_tunnel_sw_if_index = tunnel_sw_if_index;
-                }
-              else
-                {
-                  tunnel_sw_if_index = cached_tunnel_sw_if_index;
-                }
-              vnet_buffer(b0)->sw_if_index[VLIB_RX] = tunnel_sw_if_index;
-            }
-
-drop:
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-            {
-              ipsec_gre_rx_trace_t *tr = vlib_add_trace (vm, node,
-                                                   b0, sizeof (*tr));
-              tr->tunnel_id = ~0;
-              tr->length = ip0->length;
-              tr->src.as_u32 = ip0->src_address.as_u32;
-              tr->dst.as_u32 = ip0->dst_address.as_u32;
-            }
-
-          vlib_buffer_advance (b0, sizeof (*h0));
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, ipsec_gre_input_node.index,
-                               IPSEC_GRE_ERROR_PKTS_DECAP, from_frame->n_vectors);
-  return from_frame->n_vectors;
-}
-
-static char * ipsec_gre_error_strings[] = {
-#define ipsec_gre_error(n,s) s,
-#include "error.def"
-#undef ipsec_gre_error
-};
-
-VLIB_REGISTER_NODE (ipsec_gre_input_node) = {
-  .function = ipsec_gre_input,
-  .name = "ipsec-gre-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .n_errors = IPSEC_GRE_N_ERROR,
-  .error_strings = ipsec_gre_error_strings,
-
-  .n_next_nodes = IPSEC_GRE_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [IPSEC_GRE_INPUT_NEXT_##s] = n,
-    foreach_ipsec_gre_input_next
-#undef _
-  },
-
-  .format_trace = format_ipsec_gre_rx_trace,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ipsec_gre_input_node, ipsec_gre_input)
-
-static clib_error_t * ipsec_gre_input_init (vlib_main_t * vm)
-{
-  {
-    clib_error_t * error;
-    error = vlib_call_init_function (vm, ipsec_gre_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ipsec_gre_input_init);
diff --git a/vnet/vnet/ipsec/esp.h b/vnet/vnet/ipsec/esp.h
deleted file mode 100644
index 50cac806..00000000
--- a/vnet/vnet/ipsec/esp.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __ESP_H__
-#define __ESP_H__
-
-#include <openssl/hmac.h>
-#include <openssl/rand.h>
-#include <openssl/evp.h>
-
-typedef struct
-{
-  u32 spi;
-  u32 seq;
-  u8 data[0];
-} esp_header_t;
-
-typedef struct
-{
-  u8 pad_length;
-  u8 next_header;
-} esp_footer_t;
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  ip4_header_t ip4;
-  esp_header_t esp;
-}) ip4_and_esp_header_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  ip6_header_t ip6;
-  esp_header_t esp;
-}) ip6_and_esp_header_t;
-/* *INDENT-ON* */
-
-typedef struct
-{
-  const EVP_CIPHER *type;
-} esp_crypto_alg_t;
-
-typedef struct
-{
-  const EVP_MD *md;
-  u8 trunc_size;
-} esp_integ_alg_t;
-
-typedef struct
-{
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  EVP_CIPHER_CTX encrypt_ctx;
-    CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
-  EVP_CIPHER_CTX decrypt_ctx;
-    CLIB_CACHE_LINE_ALIGN_MARK (cacheline2);
-  HMAC_CTX hmac_ctx;
-  ipsec_crypto_alg_t last_encrypt_alg;
-  ipsec_crypto_alg_t last_decrypt_alg;
-  ipsec_integ_alg_t last_integ_alg;
-} esp_main_per_thread_data_t;
-
-typedef struct
-{
-  esp_crypto_alg_t *esp_crypto_algs;
-  esp_integ_alg_t *esp_integ_algs;
-  esp_main_per_thread_data_t *per_thread_data;
-} esp_main_t;
-
-esp_main_t esp_main;
-
-#define ESP_WINDOW_SIZE		(64)
-#define ESP_SEQ_MAX 		(4294967295UL)
-
-
-always_inline int
-esp_replay_check (ipsec_sa_t * sa, u32 seq)
-{
-  u32 diff;
-
-  if (PREDICT_TRUE (seq > sa->last_seq))
-    return 0;
-
-  diff = sa->last_seq - seq;
-
-  if (ESP_WINDOW_SIZE > diff)
-    return (sa->replay_window & (1ULL << diff)) ? 1 : 0;
-  else
-    return 1;
-
-  return 0;
-}
-
-always_inline int
-esp_replay_check_esn (ipsec_sa_t * sa, u32 seq)
-{
-  u32 tl = sa->last_seq;
-  u32 th = sa->last_seq_hi;
-  u32 diff = tl - seq;
-
-  if (PREDICT_TRUE (tl >= (ESP_WINDOW_SIZE - 1)))
-    {
-      if (seq >= (tl - ESP_WINDOW_SIZE + 1))
-	{
-	  sa->seq_hi = th;
-	  if (seq <= tl)
-	    return (sa->replay_window & (1ULL << diff)) ? 1 : 0;
-	  else
-	    return 0;
-	}
-      else
-	{
-	  sa->seq_hi = th + 1;
-	  return 0;
-	}
-    }
-  else
-    {
-      if (seq >= (tl - ESP_WINDOW_SIZE + 1))
-	{
-	  sa->seq_hi = th - 1;
-	  return (sa->replay_window & (1ULL << diff)) ? 1 : 0;
-	}
-      else
-	{
-	  sa->seq_hi = th;
-	  if (seq <= tl)
-	    return (sa->replay_window & (1ULL << diff)) ? 1 : 0;
-	  else
-	    return 0;
-	}
-    }
-
-  return 0;
-}
-
-/* TODO seq increment should be atomic to be accessed by multiple workers */
-always_inline void
-esp_replay_advance (ipsec_sa_t * sa, u32 seq)
-{
-  u32 pos;
-
-  if (seq > sa->last_seq)
-    {
-      pos = seq - sa->last_seq;
-      if (pos < ESP_WINDOW_SIZE)
-	sa->replay_window = ((sa->replay_window) << pos) | 1;
-      else
-	sa->replay_window = 1;
-      sa->last_seq = seq;
-    }
-  else
-    {
-      pos = sa->last_seq - seq;
-      sa->replay_window |= (1ULL << pos);
-    }
-}
-
-always_inline void
-esp_replay_advance_esn (ipsec_sa_t * sa, u32 seq)
-{
-  int wrap = sa->seq_hi - sa->last_seq_hi;
-  u32 pos;
-
-  if (wrap == 0 && seq > sa->last_seq)
-    {
-      pos = seq - sa->last_seq;
-      if (pos < ESP_WINDOW_SIZE)
-	sa->replay_window = ((sa->replay_window) << pos) | 1;
-      else
-	sa->replay_window = 1;
-      sa->last_seq = seq;
-    }
-  else if (wrap > 0)
-    {
-      pos = ~seq + sa->last_seq + 1;
-      if (pos < ESP_WINDOW_SIZE)
-	sa->replay_window = ((sa->replay_window) << pos) | 1;
-      else
-	sa->replay_window = 1;
-      sa->last_seq = seq;
-      sa->last_seq_hi = sa->seq_hi;
-    }
-  else if (wrap < 0)
-    {
-      pos = ~seq + sa->last_seq + 1;
-      sa->replay_window |= (1ULL << pos);
-    }
-  else
-    {
-      pos = sa->last_seq - seq;
-      sa->replay_window |= (1ULL << pos);
-    }
-}
-
-always_inline int
-esp_seq_advance (ipsec_sa_t * sa)
-{
-  if (PREDICT_TRUE (sa->use_esn))
-    {
-      if (PREDICT_FALSE (sa->seq == ESP_SEQ_MAX))
-	{
-	  if (PREDICT_FALSE
-	      (sa->use_anti_replay && sa->seq_hi == ESP_SEQ_MAX))
-	    return 1;
-	  sa->seq_hi++;
-	}
-      sa->seq++;
-    }
-  else
-    {
-      if (PREDICT_FALSE (sa->use_anti_replay && sa->seq == ESP_SEQ_MAX))
-	return 1;
-      sa->seq++;
-    }
-
-  return 0;
-}
-
-always_inline void
-esp_init ()
-{
-  esp_main_t *em = &esp_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-
-  memset (em, 0, sizeof (em[0]));
-
-  vec_validate (em->esp_crypto_algs, IPSEC_CRYPTO_N_ALG - 1);
-  em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_CBC_128].type = EVP_aes_128_cbc ();
-  em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_CBC_192].type = EVP_aes_192_cbc ();
-  em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_CBC_256].type = EVP_aes_256_cbc ();
-
-  vec_validate (em->esp_integ_algs, IPSEC_INTEG_N_ALG - 1);
-  esp_integ_alg_t *i;
-
-  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA1_96];
-  i->md = EVP_sha1 ();
-  i->trunc_size = 12;
-
-  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_256_96];
-  i->md = EVP_sha256 ();
-  i->trunc_size = 12;
-
-  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_256_128];
-  i->md = EVP_sha256 ();
-  i->trunc_size = 16;
-
-  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_384_192];
-  i->md = EVP_sha384 ();
-  i->trunc_size = 24;
-
-  i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_512_256];
-  i->md = EVP_sha512 ();
-  i->trunc_size = 32;
-
-  vec_validate_aligned (em->per_thread_data, tm->n_vlib_mains - 1,
-			CLIB_CACHE_LINE_BYTES);
-  int thread_id;
-
-  for (thread_id = 0; thread_id < tm->n_vlib_mains - 1; thread_id++)
-    {
-      EVP_CIPHER_CTX_init (&(em->per_thread_data[thread_id].encrypt_ctx));
-      EVP_CIPHER_CTX_init (&(em->per_thread_data[thread_id].decrypt_ctx));
-      HMAC_CTX_init (&(em->per_thread_data[thread_id].hmac_ctx));
-    }
-}
-
-always_inline unsigned int
-hmac_calc (ipsec_integ_alg_t alg,
-	   u8 * key,
-	   int key_len,
-	   u8 * data, int data_len, u8 * signature, u8 use_esn, u32 seq_hi)
-{
-  esp_main_t *em = &esp_main;
-  u32 cpu_index = os_get_cpu_number ();
-  HMAC_CTX *ctx = &(em->per_thread_data[cpu_index].hmac_ctx);
-  const EVP_MD *md = NULL;
-  unsigned int len;
-
-  ASSERT (alg < IPSEC_INTEG_N_ALG);
-
-  if (PREDICT_FALSE (em->esp_integ_algs[alg].md == 0))
-    return 0;
-
-  if (PREDICT_FALSE (alg != em->per_thread_data[cpu_index].last_integ_alg))
-    {
-      md = em->esp_integ_algs[alg].md;
-      em->per_thread_data[cpu_index].last_integ_alg = alg;
-    }
-
-  HMAC_Init (ctx, key, key_len, md);
-
-  HMAC_Update (ctx, data, data_len);
-
-  if (PREDICT_TRUE (use_esn))
-    HMAC_Update (ctx, (u8 *) & seq_hi, sizeof (seq_hi));
-  HMAC_Final (ctx, signature, &len);
-
-  return em->esp_integ_algs[alg].trunc_size;
-}
-
-#endif /* __ESP_H__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/esp_decrypt.c b/vnet/vnet/ipsec/esp_decrypt.c
deleted file mode 100644
index e69cd851..00000000
--- a/vnet/vnet/ipsec/esp_decrypt.c
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- * esp_decrypt.c : IPSec ESP decrypt node
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-
-#include <vnet/ipsec/ipsec.h>
-#include <vnet/ipsec/esp.h>
-
-#define foreach_esp_decrypt_next                \
-_(DROP, "error-drop")                           \
-_(IP4_INPUT, "ip4-input")                       \
-_(IP6_INPUT, "ip6-input")                       \
-_(IPSEC_GRE_INPUT, "ipsec-gre-input")
-
-#define _(v, s) ESP_DECRYPT_NEXT_##v,
-typedef enum
-{
-  foreach_esp_decrypt_next
-#undef _
-    ESP_DECRYPT_N_NEXT,
-} esp_decrypt_next_t;
-
-
-#define foreach_esp_decrypt_error                   \
- _(RX_PKTS, "ESP pkts received")                    \
- _(NO_BUFFER, "No buffer (packed dropped)")         \
- _(DECRYPTION_FAILED, "ESP decryption failed")      \
- _(INTEG_ERROR, "Integrity check failed")           \
- _(REPLAY, "SA replayed packet")                    \
- _(NOT_IP, "Not IP packet (dropped)")
-
-
-typedef enum
-{
-#define _(sym,str) ESP_DECRYPT_ERROR_##sym,
-  foreach_esp_decrypt_error
-#undef _
-    ESP_DECRYPT_N_ERROR,
-} esp_decrypt_error_t;
-
-static char *esp_decrypt_error_strings[] = {
-#define _(sym,string) string,
-  foreach_esp_decrypt_error
-#undef _
-};
-
-typedef struct
-{
-  ipsec_crypto_alg_t crypto_alg;
-  ipsec_integ_alg_t integ_alg;
-} esp_decrypt_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_esp_decrypt_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  esp_decrypt_trace_t *t = va_arg (*args, esp_decrypt_trace_t *);
-
-  s = format (s, "esp: crypto %U integrity %U",
-	      format_ipsec_crypto_alg, t->crypto_alg,
-	      format_ipsec_integ_alg, t->integ_alg);
-  return s;
-}
-
-always_inline void
-esp_decrypt_aes_cbc (ipsec_crypto_alg_t alg,
-		     u8 * in, u8 * out, size_t in_len, u8 * key, u8 * iv)
-{
-  esp_main_t *em = &esp_main;
-  u32 cpu_index = os_get_cpu_number ();
-  EVP_CIPHER_CTX *ctx = &(em->per_thread_data[cpu_index].decrypt_ctx);
-  const EVP_CIPHER *cipher = NULL;
-  int out_len;
-
-  ASSERT (alg < IPSEC_CRYPTO_N_ALG);
-
-  if (PREDICT_FALSE (em->esp_crypto_algs[alg].type == 0))
-    return;
-
-  if (PREDICT_FALSE (alg != em->per_thread_data[cpu_index].last_decrypt_alg))
-    {
-      cipher = em->esp_crypto_algs[alg].type;
-      em->per_thread_data[cpu_index].last_decrypt_alg = alg;
-    }
-
-  EVP_DecryptInit_ex (ctx, cipher, NULL, key, iv);
-
-  EVP_DecryptUpdate (ctx, out, &out_len, in, in_len);
-  EVP_DecryptFinal_ex (ctx, out + out_len, &out_len);
-}
-
-static uword
-esp_decrypt_node_fn (vlib_main_t * vm,
-		     vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  u32 n_left_from, *from, next_index, *to_next;
-  ipsec_main_t *im = &ipsec_main;
-  esp_main_t *em = &esp_main;
-  u32 *recycle = 0;
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-  u32 cpu_index = os_get_cpu_number ();
-
-  ipsec_alloc_empty_buffers (vm, im);
-
-  u32 *empty_buffers = im->empty_buffers[cpu_index];
-
-  if (PREDICT_FALSE (vec_len (empty_buffers) < n_left_from))
-    {
-      vlib_node_increment_counter (vm, esp_decrypt_node.index,
-				   ESP_DECRYPT_ERROR_NO_BUFFER, n_left_from);
-      goto free_buffers_and_exit;
-    }
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 i_bi0, o_bi0 = (u32) ~ 0, next0;
-	  vlib_buffer_t *i_b0;
-	  vlib_buffer_t *o_b0 = 0;
-	  esp_header_t *esp0;
-	  ipsec_sa_t *sa0;
-	  u32 sa_index0 = ~0;
-	  u32 seq;
-	  ip4_header_t *ih4 = 0, *oh4 = 0;
-	  ip6_header_t *ih6 = 0, *oh6 = 0;
-	  u8 tunnel_mode = 1;
-	  u8 transport_ip6 = 0;
-
-
-	  i_bi0 = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  next0 = ESP_DECRYPT_NEXT_DROP;
-
-	  i_b0 = vlib_get_buffer (vm, i_bi0);
-	  esp0 = vlib_buffer_get_current (i_b0);
-
-	  sa_index0 = vnet_buffer (i_b0)->ipsec.sad_index;
-	  sa0 = pool_elt_at_index (im->sad, sa_index0);
-
-	  seq = clib_host_to_net_u32 (esp0->seq);
-
-	  /* anti-replay check */
-	  if (sa0->use_anti_replay)
-	    {
-	      int rv = 0;
-
-	      if (PREDICT_TRUE (sa0->use_esn))
-		rv = esp_replay_check_esn (sa0, seq);
-	      else
-		rv = esp_replay_check (sa0, seq);
-
-	      if (PREDICT_FALSE (rv))
-		{
-		  clib_warning ("anti-replay SPI %u seq %u", sa0->spi, seq);
-		  vlib_node_increment_counter (vm, esp_decrypt_node.index,
-					       ESP_DECRYPT_ERROR_REPLAY, 1);
-		  o_bi0 = i_bi0;
-		  to_next[0] = o_bi0;
-		  to_next += 1;
-		  goto trace;
-		}
-	    }
-
-	  if (PREDICT_TRUE (sa0->integ_alg != IPSEC_INTEG_ALG_NONE))
-	    {
-	      u8 sig[64];
-	      int icv_size = em->esp_integ_algs[sa0->integ_alg].trunc_size;
-	      memset (sig, 0, sizeof (sig));
-	      u8 *icv =
-		vlib_buffer_get_current (i_b0) + i_b0->current_length -
-		icv_size;
-	      i_b0->current_length -= icv_size;
-
-	      hmac_calc (sa0->integ_alg, sa0->integ_key, sa0->integ_key_len,
-			 (u8 *) esp0, i_b0->current_length, sig, sa0->use_esn,
-			 sa0->seq_hi);
-
-	      if (PREDICT_FALSE (memcmp (icv, sig, icv_size)))
-		{
-		  vlib_node_increment_counter (vm, esp_decrypt_node.index,
-					       ESP_DECRYPT_ERROR_INTEG_ERROR,
-					       1);
-		  o_bi0 = i_bi0;
-		  to_next[0] = o_bi0;
-		  to_next += 1;
-		  goto trace;
-		}
-	    }
-
-	  if (PREDICT_TRUE (sa0->use_anti_replay))
-	    {
-	      if (PREDICT_TRUE (sa0->use_esn))
-		esp_replay_advance_esn (sa0, seq);
-	      else
-		esp_replay_advance (sa0, seq);
-	    }
-
-	  /* grab free buffer */
-	  uword last_empty_buffer = vec_len (empty_buffers) - 1;
-	  o_bi0 = empty_buffers[last_empty_buffer];
-	  to_next[0] = o_bi0;
-	  to_next += 1;
-	  o_b0 = vlib_get_buffer (vm, o_bi0);
-	  vlib_prefetch_buffer_with_index (vm,
-					   empty_buffers[last_empty_buffer -
-							 1], STORE);
-	  _vec_len (empty_buffers) = last_empty_buffer;
-
-	  /* add old buffer to the recycle list */
-	  vec_add1 (recycle, i_bi0);
-
-	  if (sa0->crypto_alg >= IPSEC_CRYPTO_ALG_AES_CBC_128 &&
-	      sa0->crypto_alg <= IPSEC_CRYPTO_ALG_AES_CBC_256)
-	    {
-	      const int BLOCK_SIZE = 16;
-	      const int IV_SIZE = 16;
-	      esp_footer_t *f0;
-	      u8 ip_hdr_size = 0;
-
-	      int blocks =
-		(i_b0->current_length - sizeof (esp_header_t) -
-		 IV_SIZE) / BLOCK_SIZE;
-
-	      o_b0->current_data = sizeof (ethernet_header_t);
-
-	      /* transport mode */
-	      if (PREDICT_FALSE (!sa0->is_tunnel && !sa0->is_tunnel_ip6))
-		{
-		  tunnel_mode = 0;
-		  ih4 =
-		    (ip4_header_t *) (i_b0->data +
-				      sizeof (ethernet_header_t));
-		  if (PREDICT_TRUE
-		      ((ih4->ip_version_and_header_length & 0xF0) != 0x40))
-		    {
-		      if (PREDICT_TRUE
-			  ((ih4->ip_version_and_header_length & 0xF0) ==
-			   0x60))
-			{
-			  transport_ip6 = 1;
-			  ip_hdr_size = sizeof (ip6_header_t);
-			  ih6 =
-			    (ip6_header_t *) (i_b0->data +
-					      sizeof (ethernet_header_t));
-			  oh6 = vlib_buffer_get_current (o_b0);
-			}
-		      else
-			{
-			  vlib_node_increment_counter (vm,
-						       esp_decrypt_node.index,
-						       ESP_DECRYPT_ERROR_NOT_IP,
-						       1);
-			  o_b0 = 0;
-			  goto trace;
-			}
-		    }
-		  else
-		    {
-		      oh4 = vlib_buffer_get_current (o_b0);
-		      ip_hdr_size = sizeof (ip4_header_t);
-		    }
-		}
-
-	      esp_decrypt_aes_cbc (sa0->crypto_alg,
-				   esp0->data + IV_SIZE,
-				   (u8 *) vlib_buffer_get_current (o_b0) +
-				   ip_hdr_size, BLOCK_SIZE * blocks,
-				   sa0->crypto_key, esp0->data);
-
-	      o_b0->current_length = (blocks * 16) - 2 + ip_hdr_size;
-	      o_b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
-	      f0 =
-		(esp_footer_t *) ((u8 *) vlib_buffer_get_current (o_b0) +
-				  o_b0->current_length);
-	      o_b0->current_length -= f0->pad_length;
-
-	      /* tunnel mode */
-	      if (PREDICT_TRUE (tunnel_mode))
-		{
-		  if (PREDICT_TRUE (f0->next_header == IP_PROTOCOL_IP_IN_IP))
-		    {
-		      next0 = ESP_DECRYPT_NEXT_IP4_INPUT;
-		      oh4 = vlib_buffer_get_current (o_b0);
-		    }
-		  else if (f0->next_header == IP_PROTOCOL_IPV6)
-		    next0 = ESP_DECRYPT_NEXT_IP6_INPUT;
-		  else
-		    {
-		      clib_warning ("next header: 0x%x", f0->next_header);
-		      vlib_node_increment_counter (vm, esp_decrypt_node.index,
-						   ESP_DECRYPT_ERROR_DECRYPTION_FAILED,
-						   1);
-		      o_b0 = 0;
-		      goto trace;
-		    }
-		}
-	      /* transport mode */
-	      else
-		{
-		  if (PREDICT_FALSE (transport_ip6))
-		    {
-		      next0 = ESP_DECRYPT_NEXT_IP6_INPUT;
-		      oh6->ip_version_traffic_class_and_flow_label =
-			ih6->ip_version_traffic_class_and_flow_label;
-		      oh6->protocol = f0->next_header;
-		      oh6->hop_limit = ih6->hop_limit;
-		      oh6->src_address.as_u64[0] = ih6->src_address.as_u64[0];
-		      oh6->src_address.as_u64[1] = ih6->src_address.as_u64[1];
-		      oh6->dst_address.as_u64[0] = ih6->dst_address.as_u64[0];
-		      oh6->dst_address.as_u64[1] = ih6->dst_address.as_u64[1];
-		      oh6->payload_length =
-			clib_host_to_net_u16 (vlib_buffer_length_in_chain
-					      (vm,
-					       o_b0) - sizeof (ip6_header_t));
-		    }
-		  else
-		    {
-		      next0 = ESP_DECRYPT_NEXT_IP4_INPUT;
-		      oh4->ip_version_and_header_length = 0x45;
-		      oh4->tos = ih4->tos;
-		      oh4->fragment_id = 0;
-		      oh4->flags_and_fragment_offset = 0;
-		      oh4->ttl = ih4->ttl;
-		      oh4->protocol = f0->next_header;
-		      oh4->src_address.as_u32 = ih4->src_address.as_u32;
-		      oh4->dst_address.as_u32 = ih4->dst_address.as_u32;
-		      oh4->length =
-			clib_host_to_net_u16 (vlib_buffer_length_in_chain
-					      (vm, o_b0));
-		      oh4->checksum = ip4_header_checksum (oh4);
-		    }
-		}
-
-	      /* for IPSec-GRE tunnel next node is ipsec-gre-input */
-	      if (PREDICT_FALSE
-		  ((vnet_buffer (i_b0)->ipsec.flags) &
-		   IPSEC_FLAG_IPSEC_GRE_TUNNEL))
-		next0 = ESP_DECRYPT_NEXT_IPSEC_GRE_INPUT;
-
-	      vnet_buffer (o_b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-	    }
-
-	trace:
-	  if (PREDICT_FALSE (i_b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      if (o_b0)
-		{
-		  o_b0->flags |= VLIB_BUFFER_IS_TRACED;
-		  o_b0->trace_index = i_b0->trace_index;
-		  esp_decrypt_trace_t *tr =
-		    vlib_add_trace (vm, node, o_b0, sizeof (*tr));
-		  tr->crypto_alg = sa0->crypto_alg;
-		  tr->integ_alg = sa0->integ_alg;
-		}
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, o_bi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, esp_decrypt_node.index,
-			       ESP_DECRYPT_ERROR_RX_PKTS,
-			       from_frame->n_vectors);
-
-free_buffers_and_exit:
-  if (recycle)
-    vlib_buffer_free (vm, recycle, vec_len (recycle));
-  vec_free (recycle);
-  return from_frame->n_vectors;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (esp_decrypt_node) = {
-  .function = esp_decrypt_node_fn,
-  .name = "esp-decrypt",
-  .vector_size = sizeof (u32),
-  .format_trace = format_esp_decrypt_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(esp_decrypt_error_strings),
-  .error_strings = esp_decrypt_error_strings,
-
-  .n_next_nodes = ESP_DECRYPT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [ESP_DECRYPT_NEXT_##s] = n,
-    foreach_esp_decrypt_next
-#undef _
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (esp_decrypt_node, esp_decrypt_node_fn)
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/esp_encrypt.c b/vnet/vnet/ipsec/esp_encrypt.c
deleted file mode 100644
index 7b7f9b9c..00000000
--- a/vnet/vnet/ipsec/esp_encrypt.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * esp_encrypt.c : IPSec ESP encrypt node
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-
-#include <vnet/ipsec/ipsec.h>
-#include <vnet/ipsec/esp.h>
-
-
-#define foreach_esp_encrypt_next                   \
-_(DROP, "error-drop")                              \
-_(IP4_LOOKUP, "ip4-lookup")                        \
-_(IP6_LOOKUP, "ip6-lookup")                        \
-_(INTERFACE_OUTPUT, "interface-output")
-
-#define _(v, s) ESP_ENCRYPT_NEXT_##v,
-typedef enum
-{
-  foreach_esp_encrypt_next
-#undef _
-    ESP_ENCRYPT_N_NEXT,
-} esp_encrypt_next_t;
-
-#define foreach_esp_encrypt_error                   \
- _(RX_PKTS, "ESP pkts received")                    \
- _(NO_BUFFER, "No buffer (packet dropped)")         \
- _(DECRYPTION_FAILED, "ESP encryption failed")      \
- _(SEQ_CYCLED, "sequence number cycled")
-
-
-typedef enum
-{
-#define _(sym,str) ESP_ENCRYPT_ERROR_##sym,
-  foreach_esp_encrypt_error
-#undef _
-    ESP_ENCRYPT_N_ERROR,
-} esp_encrypt_error_t;
-
-static char *esp_encrypt_error_strings[] = {
-#define _(sym,string) string,
-  foreach_esp_encrypt_error
-#undef _
-};
-
-vlib_node_registration_t esp_encrypt_node;
-
-typedef struct
-{
-  u32 spi;
-  u32 seq;
-  ipsec_crypto_alg_t crypto_alg;
-  ipsec_integ_alg_t integ_alg;
-} esp_encrypt_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_esp_encrypt_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  esp_encrypt_trace_t *t = va_arg (*args, esp_encrypt_trace_t *);
-
-  s = format (s, "esp: spi %u seq %u crypto %U integrity %U",
-	      t->spi, t->seq,
-	      format_ipsec_crypto_alg, t->crypto_alg,
-	      format_ipsec_integ_alg, t->integ_alg);
-  return s;
-}
-
-always_inline void
-esp_encrypt_aes_cbc (ipsec_crypto_alg_t alg,
-		     u8 * in, u8 * out, size_t in_len, u8 * key, u8 * iv)
-{
-  esp_main_t *em = &esp_main;
-  u32 cpu_index = os_get_cpu_number ();
-  EVP_CIPHER_CTX *ctx = &(em->per_thread_data[cpu_index].encrypt_ctx);
-  const EVP_CIPHER *cipher = NULL;
-  int out_len;
-
-  ASSERT (alg < IPSEC_CRYPTO_N_ALG);
-
-  if (PREDICT_FALSE (em->esp_crypto_algs[alg].type == IPSEC_CRYPTO_ALG_NONE))
-    return;
-
-  if (PREDICT_FALSE (alg != em->per_thread_data[cpu_index].last_encrypt_alg))
-    {
-      cipher = em->esp_crypto_algs[alg].type;
-      em->per_thread_data[cpu_index].last_encrypt_alg = alg;
-    }
-
-  EVP_EncryptInit_ex (ctx, cipher, NULL, key, iv);
-
-  EVP_EncryptUpdate (ctx, out, &out_len, in, in_len);
-  EVP_EncryptFinal_ex (ctx, out + out_len, &out_len);
-}
-
-static uword
-esp_encrypt_node_fn (vlib_main_t * vm,
-		     vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  u32 n_left_from, *from, *to_next = 0, next_index;
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-  ipsec_main_t *im = &ipsec_main;
-  u32 *recycle = 0;
-  u32 cpu_index = os_get_cpu_number ();
-
-  ipsec_alloc_empty_buffers (vm, im);
-
-  u32 *empty_buffers = im->empty_buffers[cpu_index];
-
-  if (PREDICT_FALSE (vec_len (empty_buffers) < n_left_from))
-    {
-      vlib_node_increment_counter (vm, esp_encrypt_node.index,
-				   ESP_ENCRYPT_ERROR_NO_BUFFER, n_left_from);
-      clib_warning ("no enough empty buffers. discarding frame");
-      goto free_buffers_and_exit;
-    }
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 i_bi0, o_bi0, next0;
-	  vlib_buffer_t *i_b0, *o_b0 = 0;
-	  u32 sa_index0;
-	  ipsec_sa_t *sa0;
-	  ip4_and_esp_header_t *ih0, *oh0 = 0;
-	  ip6_and_esp_header_t *ih6_0, *oh6_0 = 0;
-	  uword last_empty_buffer;
-	  esp_header_t *o_esp0;
-	  esp_footer_t *f0;
-	  u8 is_ipv6;
-	  u8 ip_hdr_size;
-	  u8 next_hdr_type;
-	  u32 ip_proto = 0;
-	  u8 transport_mode = 0;
-
-	  i_bi0 = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  next0 = ESP_ENCRYPT_NEXT_DROP;
-
-	  i_b0 = vlib_get_buffer (vm, i_bi0);
-	  sa_index0 = vnet_buffer (i_b0)->ipsec.sad_index;
-	  sa0 = pool_elt_at_index (im->sad, sa_index0);
-
-	  if (PREDICT_FALSE (esp_seq_advance (sa0)))
-	    {
-	      clib_warning ("sequence number counter has cycled SPI %u",
-			    sa0->spi);
-	      vlib_node_increment_counter (vm, esp_encrypt_node.index,
-					   ESP_ENCRYPT_ERROR_SEQ_CYCLED, 1);
-	      //TODO: rekey SA
-	      o_bi0 = i_bi0;
-	      to_next[0] = o_bi0;
-	      to_next += 1;
-	      goto trace;
-	    }
-
-	  /* grab free buffer */
-	  last_empty_buffer = vec_len (empty_buffers) - 1;
-	  o_bi0 = empty_buffers[last_empty_buffer];
-	  o_b0 = vlib_get_buffer (vm, o_bi0);
-	  o_b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
-	  o_b0->current_data = sizeof (ethernet_header_t);
-	  ih0 = vlib_buffer_get_current (i_b0);
-	  vlib_prefetch_buffer_with_index (vm,
-					   empty_buffers[last_empty_buffer -
-							 1], STORE);
-	  _vec_len (empty_buffers) = last_empty_buffer;
-	  to_next[0] = o_bi0;
-	  to_next += 1;
-
-	  /* add old buffer to the recycle list */
-	  vec_add1 (recycle, i_bi0);
-
-	  /* is ipv6 */
-	  if (PREDICT_FALSE
-	      ((ih0->ip4.ip_version_and_header_length & 0xF0) == 0x60))
-	    {
-	      is_ipv6 = 1;
-	      ih6_0 = vlib_buffer_get_current (i_b0);
-	      ip_hdr_size = sizeof (ip6_header_t);
-	      next_hdr_type = IP_PROTOCOL_IPV6;
-	      oh6_0 = vlib_buffer_get_current (o_b0);
-	      o_esp0 = vlib_buffer_get_current (o_b0) + sizeof (ip6_header_t);
-
-	      oh6_0->ip6.ip_version_traffic_class_and_flow_label =
-		ih6_0->ip6.ip_version_traffic_class_and_flow_label;
-	      oh6_0->ip6.protocol = IP_PROTOCOL_IPSEC_ESP;
-	      oh6_0->ip6.hop_limit = 254;
-	      oh6_0->ip6.src_address.as_u64[0] =
-		ih6_0->ip6.src_address.as_u64[0];
-	      oh6_0->ip6.src_address.as_u64[1] =
-		ih6_0->ip6.src_address.as_u64[1];
-	      oh6_0->ip6.dst_address.as_u64[0] =
-		ih6_0->ip6.dst_address.as_u64[0];
-	      oh6_0->ip6.dst_address.as_u64[1] =
-		ih6_0->ip6.dst_address.as_u64[1];
-	      oh6_0->esp.spi = clib_net_to_host_u32 (sa0->spi);
-	      oh6_0->esp.seq = clib_net_to_host_u32 (sa0->seq);
-	      ip_proto = ih6_0->ip6.protocol;
-
-	      next0 = ESP_ENCRYPT_NEXT_IP6_LOOKUP;
-	    }
-	  else
-	    {
-	      is_ipv6 = 0;
-	      ip_hdr_size = sizeof (ip4_header_t);
-	      next_hdr_type = IP_PROTOCOL_IP_IN_IP;
-	      oh0 = vlib_buffer_get_current (o_b0);
-	      o_esp0 = vlib_buffer_get_current (o_b0) + sizeof (ip4_header_t);
-
-	      oh0->ip4.ip_version_and_header_length = 0x45;
-	      oh0->ip4.tos = ih0->ip4.tos;
-	      oh0->ip4.fragment_id = 0;
-	      oh0->ip4.flags_and_fragment_offset = 0;
-	      oh0->ip4.ttl = 254;
-	      oh0->ip4.protocol = IP_PROTOCOL_IPSEC_ESP;
-	      oh0->ip4.src_address.as_u32 = ih0->ip4.src_address.as_u32;
-	      oh0->ip4.dst_address.as_u32 = ih0->ip4.dst_address.as_u32;
-	      oh0->esp.spi = clib_net_to_host_u32 (sa0->spi);
-	      oh0->esp.seq = clib_net_to_host_u32 (sa0->seq);
-	      ip_proto = ih0->ip4.protocol;
-
-	      next0 = ESP_ENCRYPT_NEXT_IP4_LOOKUP;
-	    }
-
-	  if (PREDICT_TRUE
-	      (!is_ipv6 && sa0->is_tunnel && !sa0->is_tunnel_ip6))
-	    {
-	      oh0->ip4.src_address.as_u32 = sa0->tunnel_src_addr.ip4.as_u32;
-	      oh0->ip4.dst_address.as_u32 = sa0->tunnel_dst_addr.ip4.as_u32;
-
-	      vnet_buffer (o_b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-	    }
-	  else if (is_ipv6 && sa0->is_tunnel && sa0->is_tunnel_ip6)
-	    {
-	      oh6_0->ip6.src_address.as_u64[0] =
-		sa0->tunnel_src_addr.ip6.as_u64[0];
-	      oh6_0->ip6.src_address.as_u64[1] =
-		sa0->tunnel_src_addr.ip6.as_u64[1];
-	      oh6_0->ip6.dst_address.as_u64[0] =
-		sa0->tunnel_dst_addr.ip6.as_u64[0];
-	      oh6_0->ip6.dst_address.as_u64[1] =
-		sa0->tunnel_dst_addr.ip6.as_u64[1];
-
-	      vnet_buffer (o_b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-	    }
-	  else
-	    {
-	      next_hdr_type = ip_proto;
-	      if (vnet_buffer (i_b0)->sw_if_index[VLIB_TX] != ~0)
-		{
-		  transport_mode = 1;
-		  ethernet_header_t *ieh0, *oeh0;
-		  ieh0 =
-		    (ethernet_header_t *) ((u8 *)
-					   vlib_buffer_get_current (i_b0) -
-					   sizeof (ethernet_header_t));
-		  oeh0 = (ethernet_header_t *) o_b0->data;
-		  clib_memcpy (oeh0, ieh0, sizeof (ethernet_header_t));
-		  next0 = ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT;
-		  vnet_buffer (o_b0)->sw_if_index[VLIB_TX] =
-		    vnet_buffer (i_b0)->sw_if_index[VLIB_TX];
-		}
-	      vlib_buffer_advance (i_b0, ip_hdr_size);
-	    }
-
-	  ASSERT (sa0->crypto_alg < IPSEC_CRYPTO_N_ALG);
-
-	  if (PREDICT_TRUE (sa0->crypto_alg != IPSEC_CRYPTO_ALG_NONE))
-	    {
-
-	      const int BLOCK_SIZE = 16;
-	      const int IV_SIZE = 16;
-	      int blocks = 1 + (i_b0->current_length + 1) / BLOCK_SIZE;
-
-	      /* pad packet in input buffer */
-	      u8 pad_bytes = BLOCK_SIZE * blocks - 2 - i_b0->current_length;
-	      u8 i;
-	      u8 *padding =
-		vlib_buffer_get_current (i_b0) + i_b0->current_length;
-	      i_b0->current_length = BLOCK_SIZE * blocks;
-	      for (i = 0; i < pad_bytes; ++i)
-		{
-		  padding[i] = i + 1;
-		}
-	      f0 = vlib_buffer_get_current (i_b0) + i_b0->current_length - 2;
-	      f0->pad_length = pad_bytes;
-	      f0->next_header = next_hdr_type;
-
-	      o_b0->current_length = ip_hdr_size + sizeof (esp_header_t) +
-		BLOCK_SIZE * blocks + IV_SIZE;
-
-	      vnet_buffer (o_b0)->sw_if_index[VLIB_RX] =
-		vnet_buffer (i_b0)->sw_if_index[VLIB_RX];
-
-	      u8 iv[16];
-	      RAND_bytes (iv, sizeof (iv));
-
-	      clib_memcpy ((u8 *) vlib_buffer_get_current (o_b0) +
-			   ip_hdr_size + sizeof (esp_header_t), iv, 16);
-
-	      esp_encrypt_aes_cbc (sa0->crypto_alg,
-				   (u8 *) vlib_buffer_get_current (i_b0),
-				   (u8 *) vlib_buffer_get_current (o_b0) +
-				   ip_hdr_size + sizeof (esp_header_t) +
-				   IV_SIZE, BLOCK_SIZE * blocks,
-				   sa0->crypto_key, iv);
-	    }
-
-	  o_b0->current_length += hmac_calc (sa0->integ_alg, sa0->integ_key,
-					     sa0->integ_key_len,
-					     (u8 *) o_esp0,
-					     o_b0->current_length -
-					     ip_hdr_size,
-					     vlib_buffer_get_current (o_b0) +
-					     o_b0->current_length,
-					     sa0->use_esn, sa0->seq_hi);
-
-
-	  if (PREDICT_FALSE (is_ipv6))
-	    {
-	      oh6_0->ip6.payload_length =
-		clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, o_b0) -
-				      sizeof (ip6_header_t));
-	    }
-	  else
-	    {
-	      oh0->ip4.length =
-		clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, o_b0));
-	      oh0->ip4.checksum = ip4_header_checksum (&oh0->ip4);
-	    }
-
-	  if (transport_mode)
-	    vlib_buffer_reset (o_b0);
-
-	trace:
-	  if (PREDICT_FALSE (i_b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      if (o_b0)
-		{
-		  o_b0->flags |= VLIB_BUFFER_IS_TRACED;
-		  o_b0->trace_index = i_b0->trace_index;
-		  esp_encrypt_trace_t *tr =
-		    vlib_add_trace (vm, node, o_b0, sizeof (*tr));
-		  tr->spi = sa0->spi;
-		  tr->seq = sa0->seq - 1;
-		  tr->crypto_alg = sa0->crypto_alg;
-		  tr->integ_alg = sa0->integ_alg;
-		}
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next, o_bi0,
-					   next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, esp_encrypt_node.index,
-			       ESP_ENCRYPT_ERROR_RX_PKTS,
-			       from_frame->n_vectors);
-
-free_buffers_and_exit:
-  if (recycle)
-    vlib_buffer_free (vm, recycle, vec_len (recycle));
-  vec_free (recycle);
-  return from_frame->n_vectors;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (esp_encrypt_node) = {
-  .function = esp_encrypt_node_fn,
-  .name = "esp-encrypt",
-  .vector_size = sizeof (u32),
-  .format_trace = format_esp_encrypt_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(esp_encrypt_error_strings),
-  .error_strings = esp_encrypt_error_strings,
-
-  .n_next_nodes = ESP_ENCRYPT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [ESP_ENCRYPT_NEXT_##s] = n,
-    foreach_esp_encrypt_next
-#undef _
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (esp_encrypt_node, esp_encrypt_node_fn)
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ikev2.c b/vnet/vnet/ipsec/ikev2.c
deleted file mode 100644
index 5a6c3674..00000000
--- a/vnet/vnet/ipsec/ikev2.c
+++ /dev/null
@@ -1,2186 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-#include <vnet/ip/udp.h>
-#include <vnet/ipsec/ipsec.h>
-#include <vnet/ipsec/ikev2.h>
-#include <vnet/ipsec/ikev2_priv.h>
-
-static int ikev2_delete_tunnel_interface (vnet_main_t * vnm,
-					  ikev2_sa_t * sa,
-					  ikev2_child_sa_t * child);
-
-#define ikev2_set_state(sa, v) do { \
-    (sa)->state = v; \
-    clib_warning("sa state changed to " #v); \
-  } while(0);
-
-typedef struct
-{
-  u32 next_index;
-  u32 sw_if_index;
-} ikev2_trace_t;
-
-static u8 *
-format_ikev2_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ikev2_trace_t *t = va_arg (*args, ikev2_trace_t *);
-
-  s = format (s, "ikev2: sw_if_index %d, next index %d",
-	      t->sw_if_index, t->next_index);
-  return s;
-}
-
-static vlib_node_registration_t ikev2_node;
-
-#define foreach_ikev2_error \
-_(PROCESSED, "IKEv2 packets processed") \
-_(IKE_SA_INIT_RETRANSMIT, "IKE_SA_INIT retransmit ") \
-_(IKE_SA_INIT_IGNORE, "IKE_SA_INIT ignore (IKE SA already auth)") \
-_(IKE_REQ_RETRANSMIT, "IKE request retransmit") \
-_(IKE_REQ_IGNORE, "IKE request ignore (old msgid)") \
-_(NOT_IKEV2, "Non IKEv2 packets received")
-
-typedef enum
-{
-#define _(sym,str) IKEV2_ERROR_##sym,
-  foreach_ikev2_error
-#undef _
-    IKEV2_N_ERROR,
-} ikev2_error_t;
-
-static char *ikev2_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ikev2_error
-#undef _
-};
-
-typedef enum
-{
-  IKEV2_NEXT_IP4_LOOKUP,
-  IKEV2_NEXT_ERROR_DROP,
-  IKEV2_N_NEXT,
-} ikev2_next_t;
-
-static ikev2_sa_transform_t *
-ikev2_find_transform_data (ikev2_sa_transform_t * t)
-{
-  ikev2_main_t *km = &ikev2_main;
-  ikev2_sa_transform_t *td;
-
-  vec_foreach (td, km->supported_transforms)
-  {
-    if (td->type != t->type)
-      continue;
-
-    if (td->transform_id != t->transform_id)
-      continue;
-
-    if (td->type == IKEV2_TRANSFORM_TYPE_ENCR)
-      {
-	if (vec_len (t->attrs) != 4 || t->attrs[0] != 0x80
-	    || t->attrs[1] != 14)
-	  continue;
-
-	if (((t->attrs[2] << 8 | t->attrs[3]) / 8) != td->key_len)
-	  continue;
-      }
-    return td;
-  }
-  return 0;
-}
-
-static ikev2_sa_proposal_t *
-ikev2_select_proposal (ikev2_sa_proposal_t * proposals,
-		       ikev2_protocol_id_t prot_id)
-{
-  ikev2_sa_proposal_t *rv = 0;
-  ikev2_sa_proposal_t *proposal;
-  ikev2_sa_transform_t *transform, *new_t;
-  u8 mandatory_bitmap, optional_bitmap;
-
-  if (prot_id == IKEV2_PROTOCOL_IKE)
-    {
-      mandatory_bitmap = (1 << IKEV2_TRANSFORM_TYPE_ENCR) |
-	(1 << IKEV2_TRANSFORM_TYPE_PRF) |
-	(1 << IKEV2_TRANSFORM_TYPE_INTEG) | (1 << IKEV2_TRANSFORM_TYPE_DH);
-      optional_bitmap = mandatory_bitmap;
-    }
-  else if (prot_id == IKEV2_PROTOCOL_ESP)
-    {
-      mandatory_bitmap = (1 << IKEV2_TRANSFORM_TYPE_ENCR) |
-	(1 << IKEV2_TRANSFORM_TYPE_ESN);
-      optional_bitmap = mandatory_bitmap |
-	(1 << IKEV2_TRANSFORM_TYPE_INTEG) | (1 << IKEV2_TRANSFORM_TYPE_DH);
-    }
-  else if (prot_id == IKEV2_PROTOCOL_AH)
-    {
-      mandatory_bitmap = (1 << IKEV2_TRANSFORM_TYPE_INTEG) |
-	(1 << IKEV2_TRANSFORM_TYPE_ESN);
-      optional_bitmap = mandatory_bitmap | (1 << IKEV2_TRANSFORM_TYPE_DH);
-    }
-  else
-    return 0;
-
-  vec_add2 (rv, proposal, 1);
-
-  vec_foreach (proposal, proposals)
-  {
-    u8 bitmap = 0;
-    if (proposal->protocol_id != prot_id)
-      continue;
-
-    vec_foreach (transform, proposal->transforms)
-    {
-      if ((1 << transform->type) & bitmap)
-	continue;
-
-      if (ikev2_find_transform_data (transform))
-	{
-	  bitmap |= 1 << transform->type;
-	  vec_add2 (rv->transforms, new_t, 1);
-	  clib_memcpy (new_t, transform, sizeof (*new_t));
-	  new_t->attrs = vec_dup (transform->attrs);
-	}
-    }
-
-    clib_warning ("bitmap is %x mandatory is %x optional is %x",
-		  bitmap, mandatory_bitmap, optional_bitmap);
-
-    if ((bitmap & mandatory_bitmap) == mandatory_bitmap &&
-	(bitmap & ~optional_bitmap) == 0)
-      {
-	rv->proposal_num = proposal->proposal_num;
-	rv->protocol_id = proposal->protocol_id;
-	RAND_bytes ((u8 *) & rv->spi, sizeof (rv->spi));
-	goto done;
-      }
-    else
-      {
-	vec_free (rv->transforms);
-      }
-  }
-
-  vec_free (rv);
-done:
-  return rv;
-}
-
-ikev2_sa_transform_t *
-ikev2_sa_get_td_for_type (ikev2_sa_proposal_t * p,
-			  ikev2_transform_type_t type)
-{
-  ikev2_sa_transform_t *t;
-
-  if (!p)
-    return 0;
-
-  vec_foreach (t, p->transforms)
-  {
-    if (t->type == type)
-      return ikev2_find_transform_data (t);
-  }
-  return 0;
-}
-
-ikev2_child_sa_t *
-ikev2_sa_get_child (ikev2_sa_t * sa, u32 spi, ikev2_protocol_id_t prot_id)
-{
-  ikev2_child_sa_t *c;
-  vec_foreach (c, sa->childs)
-  {
-    if (c->i_proposals[0].spi == spi
-	&& c->i_proposals[0].protocol_id == prot_id)
-      return c;
-  }
-
-  return 0;
-}
-
-void
-ikev2_sa_free_proposal_vector (ikev2_sa_proposal_t ** v)
-{
-  ikev2_sa_proposal_t *p;
-  ikev2_sa_transform_t *t;
-
-  if (!*v)
-    return;
-
-  vec_foreach (p, *v)
-  {
-    vec_foreach (t, p->transforms)
-    {
-      vec_free (t->attrs);
-    }
-    vec_free (p->transforms);
-  }
-  vec_free (*v);
-};
-
-static void
-ikev2_sa_free_all_child_sa (ikev2_child_sa_t ** childs)
-{
-  ikev2_child_sa_t *c;
-  vec_foreach (c, *childs)
-  {
-    ikev2_sa_free_proposal_vector (&c->r_proposals);
-    ikev2_sa_free_proposal_vector (&c->i_proposals);
-    vec_free (c->sk_ai);
-    vec_free (c->sk_ar);
-    vec_free (c->sk_ei);
-    vec_free (c->sk_er);
-  }
-
-  vec_free (*childs);
-}
-
-static void
-ikev2_sa_del_child_sa (ikev2_sa_t * sa, ikev2_child_sa_t * child)
-{
-  ikev2_sa_free_proposal_vector (&child->r_proposals);
-  ikev2_sa_free_proposal_vector (&child->i_proposals);
-  vec_free (child->sk_ai);
-  vec_free (child->sk_ar);
-  vec_free (child->sk_ei);
-  vec_free (child->sk_er);
-
-  vec_del1 (sa->childs, child - sa->childs);
-}
-
-static void
-ikev2_sa_free_all_vec (ikev2_sa_t * sa)
-{
-  vec_free (sa->i_nonce);
-  vec_free (sa->i_dh_data);
-  vec_free (sa->dh_shared_key);
-
-  ikev2_sa_free_proposal_vector (&sa->r_proposals);
-  ikev2_sa_free_proposal_vector (&sa->i_proposals);
-
-  vec_free (sa->sk_d);
-  vec_free (sa->sk_ai);
-  vec_free (sa->sk_ar);
-  vec_free (sa->sk_ei);
-  vec_free (sa->sk_er);
-  vec_free (sa->sk_pi);
-  vec_free (sa->sk_pr);
-
-  vec_free (sa->i_id.data);
-  vec_free (sa->i_auth.data);
-  vec_free (sa->r_id.data);
-  vec_free (sa->r_auth.data);
-  if (sa->r_auth.key)
-    EVP_PKEY_free (sa->r_auth.key);
-
-  vec_free (sa->del);
-
-  ikev2_sa_free_all_child_sa (&sa->childs);
-}
-
-static void
-ikev2_delete_sa (ikev2_sa_t * sa)
-{
-  ikev2_main_t *km = &ikev2_main;
-  u32 cpu_index = os_get_cpu_number ();
-  uword *p;
-
-  ikev2_sa_free_all_vec (sa);
-
-  p = hash_get (km->per_thread_data[cpu_index].sa_by_rspi, sa->rspi);
-  if (p)
-    {
-      hash_unset (km->per_thread_data[cpu_index].sa_by_rspi, sa->rspi);
-      pool_put (km->per_thread_data[cpu_index].sas, sa);
-    }
-}
-
-static void
-ikev2_generate_sa_init_data (ikev2_sa_t * sa)
-{
-  ikev2_sa_transform_t *t = 0, *t2;
-  ikev2_main_t *km = &ikev2_main;
-
-  if (sa->dh_group == IKEV2_TRANSFORM_DH_TYPE_NONE)
-    {
-      return;
-    }
-
-  /* check if received DH group is on our list of supported groups */
-  vec_foreach (t2, km->supported_transforms)
-  {
-    if (t2->type == IKEV2_TRANSFORM_TYPE_DH && sa->dh_group == t2->dh_type)
-      {
-	t = t2;
-	break;
-      }
-  }
-
-  if (!t)
-    {
-      clib_warning ("unknown dh data group %u (data len %u)", sa->dh_group,
-		    vec_len (sa->i_dh_data));
-      sa->dh_group = IKEV2_TRANSFORM_DH_TYPE_NONE;
-      return;
-    }
-
-  /* generate rspi */
-  RAND_bytes ((u8 *) & sa->rspi, 8);
-
-  /* generate nonce */
-  sa->r_nonce = vec_new (u8, IKEV2_NONCE_SIZE);
-  RAND_bytes ((u8 *) sa->r_nonce, IKEV2_NONCE_SIZE);
-
-  /* generate dh keys */
-  ikev2_generate_dh (sa, t);
-}
-
-static void
-ikev2_calc_keys (ikev2_sa_t * sa)
-{
-  u8 *tmp;
-  /* calculate SKEYSEED = prf(Ni | Nr, g^ir) */
-  u8 *skeyseed = 0;
-  u8 *s = 0;
-  ikev2_sa_transform_t *tr_encr, *tr_prf, *tr_integ;
-  tr_encr =
-    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
-  tr_prf =
-    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_PRF);
-  tr_integ =
-    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
-
-  vec_append (s, sa->i_nonce);
-  vec_append (s, sa->r_nonce);
-  skeyseed = ikev2_calc_prf (tr_prf, s, sa->dh_shared_key);
-
-  /* Calculate S = Ni | Nr | SPIi | SPIr */
-  u64 *spi;
-  vec_add2 (s, tmp, 2 * sizeof (*spi));
-  spi = (u64 *) tmp;
-  spi[0] = clib_host_to_net_u64 (sa->ispi);
-  spi[1] = clib_host_to_net_u64 (sa->rspi);
-
-  /* calculate PRFplus */
-  u8 *keymat;
-  int len = tr_prf->key_trunc +	/* SK_d */
-    tr_integ->key_len * 2 +	/* SK_ai, SK_ar */
-    tr_encr->key_len * 2 +	/* SK_ei, SK_er */
-    tr_prf->key_len * 2;	/* SK_pi, SK_pr */
-
-  keymat = ikev2_calc_prfplus (tr_prf, skeyseed, s, len);
-  vec_free (skeyseed);
-  vec_free (s);
-
-  int pos = 0;
-
-  /* SK_d */
-  sa->sk_d = vec_new (u8, tr_prf->key_trunc);
-  clib_memcpy (sa->sk_d, keymat + pos, tr_prf->key_trunc);
-  pos += tr_prf->key_trunc;
-
-  /* SK_ai */
-  sa->sk_ai = vec_new (u8, tr_integ->key_len);
-  clib_memcpy (sa->sk_ai, keymat + pos, tr_integ->key_len);
-  pos += tr_integ->key_len;
-
-  /* SK_ar */
-  sa->sk_ar = vec_new (u8, tr_integ->key_len);
-  clib_memcpy (sa->sk_ar, keymat + pos, tr_integ->key_len);
-  pos += tr_integ->key_len;
-
-  /* SK_ei */
-  sa->sk_ei = vec_new (u8, tr_encr->key_len);
-  clib_memcpy (sa->sk_ei, keymat + pos, tr_encr->key_len);
-  pos += tr_encr->key_len;
-
-  /* SK_er */
-  sa->sk_er = vec_new (u8, tr_encr->key_len);
-  clib_memcpy (sa->sk_er, keymat + pos, tr_encr->key_len);
-  pos += tr_encr->key_len;
-
-  /* SK_pi */
-  sa->sk_pi = vec_new (u8, tr_prf->key_len);
-  clib_memcpy (sa->sk_pi, keymat + pos, tr_prf->key_len);
-  pos += tr_prf->key_len;
-
-  /* SK_pr */
-  sa->sk_pr = vec_new (u8, tr_prf->key_len);
-  clib_memcpy (sa->sk_pr, keymat + pos, tr_prf->key_len);
-  pos += tr_prf->key_len;
-
-  vec_free (keymat);
-}
-
-static void
-ikev2_calc_child_keys (ikev2_sa_t * sa, ikev2_child_sa_t * child)
-{
-  u8 *s = 0;
-  ikev2_sa_transform_t *tr_prf, *ctr_encr, *ctr_integ;
-  tr_prf =
-    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_PRF);
-  ctr_encr =
-    ikev2_sa_get_td_for_type (child->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
-  ctr_integ =
-    ikev2_sa_get_td_for_type (child->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
-
-  vec_append (s, sa->i_nonce);
-  vec_append (s, sa->r_nonce);
-  /* calculate PRFplus */
-  u8 *keymat;
-  int len = ctr_encr->key_len * 2 + ctr_integ->key_len * 2;
-
-  keymat = ikev2_calc_prfplus (tr_prf, sa->sk_d, s, len);
-
-  int pos = 0;
-
-  /* SK_ei */
-  child->sk_ei = vec_new (u8, ctr_encr->key_len);
-  clib_memcpy (child->sk_ei, keymat + pos, ctr_encr->key_len);
-  pos += ctr_encr->key_len;
-
-  /* SK_ai */
-  child->sk_ai = vec_new (u8, ctr_integ->key_len);
-  clib_memcpy (child->sk_ai, keymat + pos, ctr_integ->key_len);
-  pos += ctr_integ->key_len;
-
-  /* SK_er */
-  child->sk_er = vec_new (u8, ctr_encr->key_len);
-  clib_memcpy (child->sk_er, keymat + pos, ctr_encr->key_len);
-  pos += ctr_encr->key_len;
-
-  /* SK_ar */
-  child->sk_ar = vec_new (u8, ctr_integ->key_len);
-  clib_memcpy (child->sk_ar, keymat + pos, ctr_integ->key_len);
-  pos += ctr_integ->key_len;
-
-  ASSERT (pos == len);
-
-  vec_free (keymat);
-}
-
-static void
-ikev2_process_sa_init_req (vlib_main_t * vm, ikev2_sa_t * sa,
-			   ike_header_t * ike)
-{
-  int p = 0;
-  u32 len = clib_net_to_host_u32 (ike->length);
-  u8 payload = ike->nextpayload;
-
-  clib_warning ("ispi %lx rspi %lx nextpayload %x version %x "
-		"exchange %x flags %x msgid %x length %u",
-		clib_net_to_host_u64 (ike->ispi),
-		clib_net_to_host_u64 (ike->rspi),
-		payload, ike->version,
-		ike->exchange, ike->flags,
-		clib_net_to_host_u32 (ike->msgid), len);
-
-  sa->ispi = clib_net_to_host_u64 (ike->ispi);
-
-  /* store whole IKE payload - needed for PSK auth */
-  vec_free (sa->last_sa_init_req_packet_data);
-  vec_add (sa->last_sa_init_req_packet_data, ike, len);
-
-  while (p < len && payload != IKEV2_PAYLOAD_NONE)
-    {
-      ike_payload_header_t *ikep = (ike_payload_header_t *) & ike->payload[p];
-      u32 plen = clib_net_to_host_u16 (ikep->length);
-
-      if (plen < sizeof (ike_payload_header_t))
-	return;
-
-      if (payload == IKEV2_PAYLOAD_SA)
-	{
-	  ikev2_sa_free_proposal_vector (&sa->i_proposals);
-	  sa->i_proposals = ikev2_parse_sa_payload (ikep);
-	}
-      else if (payload == IKEV2_PAYLOAD_KE)
-	{
-	  ike_ke_payload_header_t *ke = (ike_ke_payload_header_t *) ikep;
-	  sa->dh_group = clib_net_to_host_u16 (ke->dh_group);
-	  vec_free (sa->i_dh_data);
-	  vec_add (sa->i_dh_data, ke->payload, plen - sizeof (*ke));
-	}
-      else if (payload == IKEV2_PAYLOAD_NONCE)
-	{
-	  vec_free (sa->i_nonce);
-	  vec_add (sa->i_nonce, ikep->payload, plen - sizeof (*ikep));
-	}
-      else if (payload == IKEV2_PAYLOAD_NOTIFY)
-	{
-	  ikev2_notify_t *n = ikev2_parse_notify_payload (ikep);
-	  vec_free (n);
-	}
-      else if (payload == IKEV2_PAYLOAD_VENDOR)
-	{
-	  ikev2_parse_vendor_payload (ikep);
-	}
-      else
-	{
-	  clib_warning ("unknown payload %u flags %x length %u", payload,
-			ikep->flags, plen);
-	  if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
-	    {
-	      ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
-	      sa->unsupported_cp = payload;
-	      return;
-	    }
-	}
-
-      payload = ikep->nextpayload;
-      p += plen;
-    }
-
-  ikev2_set_state (sa, IKEV2_STATE_SA_INIT);
-}
-
-static u8 *
-ikev2_decrypt_sk_payload (ikev2_sa_t * sa, ike_header_t * ike, u8 * payload)
-{
-  int p = 0;
-  u8 last_payload = 0;
-  u8 *hmac = 0;
-  u32 len = clib_net_to_host_u32 (ike->length);
-  ike_payload_header_t *ikep = 0;
-  u32 plen = 0;
-  ikev2_sa_transform_t *tr_integ;
-  tr_integ =
-    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
-
-  while (p < len &&
-	 *payload != IKEV2_PAYLOAD_NONE && last_payload != IKEV2_PAYLOAD_SK)
-    {
-      ikep = (ike_payload_header_t *) & ike->payload[p];
-      plen = clib_net_to_host_u16 (ikep->length);
-
-      if (plen < sizeof (*ikep))
-	return 0;
-
-      if (*payload == IKEV2_PAYLOAD_SK)
-	{
-	  clib_warning ("received IKEv2 payload SK, len %u", plen - 4);
-	  last_payload = *payload;
-	}
-      else
-	{
-	  clib_warning ("unknown payload %u flags %x length %u", payload,
-			ikep->flags, plen);
-	  if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
-	    {
-	      sa->unsupported_cp = *payload;
-	      return 0;
-	    }
-	}
-
-      *payload = ikep->nextpayload;
-      p += plen;
-    }
-
-  if (last_payload != IKEV2_PAYLOAD_SK)
-    {
-      clib_warning ("Last payload must be SK");
-      return 0;
-    }
-
-  hmac = ikev2_calc_integr (tr_integ, sa->sk_ai, (u8 *) ike,
-			    len - tr_integ->key_trunc);
-
-  plen = plen - sizeof (*ikep) - tr_integ->key_trunc;
-
-  if (memcmp (hmac, &ikep->payload[plen], tr_integ->key_trunc))
-    {
-      clib_warning ("message integrity check failed");
-      vec_free (hmac);
-      return 0;
-    }
-  vec_free (hmac);
-
-  return ikev2_decrypt_data (sa, ikep->payload, plen);
-}
-
-static void
-ikev2_initial_contact_cleanup (ikev2_sa_t * sa)
-{
-  ikev2_main_t *km = &ikev2_main;
-  ikev2_sa_t *tmp;
-  u32 i, *delete = 0;
-  ikev2_child_sa_t *c;
-  u32 cpu_index = os_get_cpu_number ();
-
-  if (!sa->initial_contact)
-    return;
-
-  /* find old IKE SAs with the same authenticated identity */
-  /* *INDENT-OFF* */
-  pool_foreach (tmp, km->per_thread_data[cpu_index].sas, ({
-        if (tmp->i_id.type != sa->i_id.type ||
-            vec_len(tmp->i_id.data) != vec_len(sa->i_id.data) ||
-            memcmp(sa->i_id.data, tmp->i_id.data, vec_len(sa->i_id.data)))
-          continue;
-
-        if (sa->rspi != tmp->rspi)
-          vec_add1(delete, tmp - km->per_thread_data[cpu_index].sas);
-  }));
-  /* *INDENT-ON* */
-
-  for (i = 0; i < vec_len (delete); i++)
-    {
-      tmp = pool_elt_at_index (km->per_thread_data[cpu_index].sas, delete[i]);
-      vec_foreach (c, tmp->childs)
-	ikev2_delete_tunnel_interface (km->vnet_main, tmp, c);
-      ikev2_delete_sa (tmp);
-    }
-
-  vec_free (delete);
-  sa->initial_contact = 0;
-}
-
-static void
-ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike)
-{
-  ikev2_child_sa_t *first_child_sa;
-  int p = 0;
-  u32 len = clib_net_to_host_u32 (ike->length);
-  u8 payload = ike->nextpayload;
-  u8 *plaintext = 0;
-
-  ike_payload_header_t *ikep;
-  u32 plen;
-
-  clib_warning ("ispi %lx rspi %lx nextpayload %x version %x "
-		"exchange %x flags %x msgid %x length %u",
-		clib_net_to_host_u64 (ike->ispi),
-		clib_net_to_host_u64 (ike->rspi),
-		payload, ike->version,
-		ike->exchange, ike->flags,
-		clib_net_to_host_u32 (ike->msgid), len);
-
-  ikev2_calc_keys (sa);
-
-  plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload);
-
-  if (!plaintext)
-    {
-      if (sa->unsupported_cp)
-	ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
-      goto cleanup_and_exit;
-    }
-
-  /* create 1st child SA */
-  ikev2_sa_free_all_child_sa (&sa->childs);
-  vec_add2 (sa->childs, first_child_sa, 1);
-
-
-  /* process encrypted payload */
-  p = 0;
-  while (p < vec_len (plaintext) && payload != IKEV2_PAYLOAD_NONE)
-    {
-      ikep = (ike_payload_header_t *) & plaintext[p];
-      plen = clib_net_to_host_u16 (ikep->length);
-
-      if (plen < sizeof (ike_payload_header_t))
-	goto cleanup_and_exit;
-
-      if (payload == IKEV2_PAYLOAD_SA)	/* 33 */
-	{
-	  clib_warning ("received payload SA, len %u", plen - sizeof (*ikep));
-	  ikev2_sa_free_proposal_vector (&first_child_sa->i_proposals);
-	  first_child_sa->i_proposals = ikev2_parse_sa_payload (ikep);
-	}
-      else if (payload == IKEV2_PAYLOAD_IDI)	/* 35 */
-	{
-	  ike_id_payload_header_t *id = (ike_id_payload_header_t *) ikep;
-
-	  sa->i_id.type = id->id_type;
-	  vec_free (sa->i_id.data);
-	  vec_add (sa->i_id.data, id->payload, plen - sizeof (*id));
-
-	  clib_warning ("received payload IDi, len %u id_type %u",
-			plen - sizeof (*id), id->id_type);
-	}
-      else if (payload == IKEV2_PAYLOAD_AUTH)	/* 39 */
-	{
-	  ike_auth_payload_header_t *a = (ike_auth_payload_header_t *) ikep;
-
-	  sa->i_auth.method = a->auth_method;
-	  vec_free (sa->i_auth.data);
-	  vec_add (sa->i_auth.data, a->payload, plen - sizeof (*a));
-
-	  clib_warning ("received payload AUTH, len %u auth_type %u",
-			plen - sizeof (*a), a->auth_method);
-	}
-      else if (payload == IKEV2_PAYLOAD_NOTIFY)	/* 41 */
-	{
-	  ikev2_notify_t *n = ikev2_parse_notify_payload (ikep);
-	  if (n->msg_type == IKEV2_NOTIFY_MSG_INITIAL_CONTACT)
-	    {
-	      sa->initial_contact = 1;
-	    }
-	  vec_free (n);
-	}
-      else if (payload == IKEV2_PAYLOAD_VENDOR)	/* 43 */
-	{
-	  ikev2_parse_vendor_payload (ikep);
-	}
-      else if (payload == IKEV2_PAYLOAD_TSI)	/* 44 */
-	{
-	  clib_warning ("received payload TSi, len %u",
-			plen - sizeof (*ikep));
-
-	  vec_free (first_child_sa->tsi);
-	  first_child_sa->tsi = ikev2_parse_ts_payload (ikep);
-	}
-      else if (payload == IKEV2_PAYLOAD_TSR)	/* 45 */
-	{
-	  clib_warning ("received payload TSr, len %u",
-			plen - sizeof (*ikep));
-
-	  vec_free (first_child_sa->tsr);
-	  first_child_sa->tsr = ikev2_parse_ts_payload (ikep);
-	}
-      else
-	{
-	  clib_warning ("unknown payload %u flags %x length %u data %u",
-			payload, ikep->flags, plen - 4,
-			format_hex_bytes, ikep->payload, plen - 4);
-
-	  if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
-	    {
-	      ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
-	      sa->unsupported_cp = payload;
-	      return;
-	    }
-	}
-
-      payload = ikep->nextpayload;
-      p += plen;
-    }
-
-cleanup_and_exit:
-  vec_free (plaintext);
-}
-
-static void
-ikev2_process_informational_req (vlib_main_t * vm, ikev2_sa_t * sa,
-				 ike_header_t * ike)
-{
-  int p = 0;
-  u32 len = clib_net_to_host_u32 (ike->length);
-  u8 payload = ike->nextpayload;
-  u8 *plaintext = 0;
-
-  ike_payload_header_t *ikep;
-  u32 plen;
-
-  clib_warning ("ispi %lx rspi %lx nextpayload %x version %x "
-		"exchange %x flags %x msgid %x length %u",
-		clib_net_to_host_u64 (ike->ispi),
-		clib_net_to_host_u64 (ike->rspi),
-		payload, ike->version,
-		ike->exchange, ike->flags,
-		clib_net_to_host_u32 (ike->msgid), len);
-
-  plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload);
-
-  if (!plaintext)
-    goto cleanup_and_exit;
-
-  /* process encrypted payload */
-  p = 0;
-  while (p < vec_len (plaintext) && payload != IKEV2_PAYLOAD_NONE)
-    {
-      ikep = (ike_payload_header_t *) & plaintext[p];
-      plen = clib_net_to_host_u16 (ikep->length);
-
-      if (plen < sizeof (ike_payload_header_t))
-	goto cleanup_and_exit;
-
-      if (payload == IKEV2_PAYLOAD_NOTIFY)	/* 41 */
-	{
-	  ikev2_notify_t *n = ikev2_parse_notify_payload (ikep);
-	  if (n->msg_type == IKEV2_NOTIFY_MSG_AUTHENTICATION_FAILED)
-	    ikev2_set_state (sa, IKEV2_STATE_AUTH_FAILED);
-	  vec_free (n);
-	}
-      else if (payload == IKEV2_PAYLOAD_DELETE)	/* 42 */
-	{
-	  sa->del = ikev2_parse_delete_payload (ikep);
-	}
-      else if (payload == IKEV2_PAYLOAD_VENDOR)	/* 43 */
-	{
-	  ikev2_parse_vendor_payload (ikep);
-	}
-      else
-	{
-	  clib_warning ("unknown payload %u flags %x length %u data %u",
-			payload, ikep->flags, plen - 4,
-			format_hex_bytes, ikep->payload, plen - 4);
-
-	  if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
-	    {
-	      sa->unsupported_cp = payload;
-	      return;
-	    }
-	}
-
-      payload = ikep->nextpayload;
-      p += plen;
-    }
-
-cleanup_and_exit:
-  vec_free (plaintext);
-}
-
-static void
-ikev2_process_create_child_sa_req (vlib_main_t * vm, ikev2_sa_t * sa,
-				   ike_header_t * ike)
-{
-  int p = 0;
-  u32 len = clib_net_to_host_u32 (ike->length);
-  u8 payload = ike->nextpayload;
-  u8 *plaintext = 0;
-  u8 rekeying = 0;
-  u8 i_nonce[IKEV2_NONCE_SIZE];
-
-  ike_payload_header_t *ikep;
-  u32 plen;
-  ikev2_notify_t *n = 0;
-  ikev2_ts_t *tsi = 0;
-  ikev2_ts_t *tsr = 0;
-  ikev2_sa_proposal_t *proposal = 0;
-  ikev2_child_sa_t *child_sa;
-
-  clib_warning ("ispi %lx rspi %lx nextpayload %x version %x "
-		"exchange %x flags %x msgid %x length %u",
-		clib_net_to_host_u64 (ike->ispi),
-		clib_net_to_host_u64 (ike->rspi),
-		payload, ike->version,
-		ike->exchange, ike->flags,
-		clib_net_to_host_u32 (ike->msgid), len);
-
-  plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload);
-
-  if (!plaintext)
-    goto cleanup_and_exit;
-
-  /* process encrypted payload */
-  p = 0;
-  while (p < vec_len (plaintext) && payload != IKEV2_PAYLOAD_NONE)
-    {
-      ikep = (ike_payload_header_t *) & plaintext[p];
-      plen = clib_net_to_host_u16 (ikep->length);
-
-      if (plen < sizeof (ike_payload_header_t))
-	goto cleanup_and_exit;
-
-      else if (payload == IKEV2_PAYLOAD_SA)
-	{
-	  proposal = ikev2_parse_sa_payload (ikep);
-	}
-      else if (payload == IKEV2_PAYLOAD_NOTIFY)
-	{
-	  n = ikev2_parse_notify_payload (ikep);
-	  if (n->msg_type == IKEV2_NOTIFY_MSG_REKEY_SA)
-	    {
-	      rekeying = 1;
-	    }
-	}
-      else if (payload == IKEV2_PAYLOAD_DELETE)
-	{
-	  sa->del = ikev2_parse_delete_payload (ikep);
-	}
-      else if (payload == IKEV2_PAYLOAD_VENDOR)
-	{
-	  ikev2_parse_vendor_payload (ikep);
-	}
-      else if (payload == IKEV2_PAYLOAD_NONCE)
-	{
-	  clib_memcpy (i_nonce, ikep->payload, plen - sizeof (*ikep));
-	}
-      else if (payload == IKEV2_PAYLOAD_TSI)
-	{
-	  tsi = ikev2_parse_ts_payload (ikep);
-	}
-      else if (payload == IKEV2_PAYLOAD_TSR)
-	{
-	  tsr = ikev2_parse_ts_payload (ikep);
-	}
-      else
-	{
-	  clib_warning ("unknown payload %u flags %x length %u data %u",
-			payload, ikep->flags, plen - 4,
-			format_hex_bytes, ikep->payload, plen - 4);
-
-	  if (ikep->flags & IKEV2_PAYLOAD_FLAG_CRITICAL)
-	    {
-	      sa->unsupported_cp = payload;
-	      return;
-	    }
-	}
-
-      payload = ikep->nextpayload;
-      p += plen;
-    }
-
-  if (rekeying)
-    {
-      ikev2_rekey_t *rekey;
-      child_sa = ikev2_sa_get_child (sa, n->spi, n->protocol_id);
-      if (!child_sa)
-	{
-	  clib_warning ("child SA spi %lx not found", n->spi);
-	  goto cleanup_and_exit;
-	}
-      vec_add2 (sa->rekey, rekey, 1);
-      rekey->protocol_id = n->protocol_id;
-      rekey->spi = n->spi;
-      rekey->i_proposal = proposal;
-      rekey->r_proposal =
-	ikev2_select_proposal (proposal, IKEV2_PROTOCOL_ESP);
-      rekey->tsi = tsi;
-      rekey->tsr = tsr;
-      /* update Ni */
-      vec_free (sa->i_nonce);
-      vec_add (sa->i_nonce, i_nonce, IKEV2_NONCE_SIZE);
-      /* generate new Nr */
-      vec_free (sa->r_nonce);
-      sa->r_nonce = vec_new (u8, IKEV2_NONCE_SIZE);
-      RAND_bytes ((u8 *) sa->r_nonce, IKEV2_NONCE_SIZE);
-    }
-
-cleanup_and_exit:
-  vec_free (plaintext);
-  vec_free (n);
-}
-
-static u8 *
-ikev2_sa_generate_authmsg (ikev2_sa_t * sa, int is_responder)
-{
-  u8 *authmsg = 0;
-  u8 *data;
-  u8 *nonce;
-  ikev2_id_t *id;
-  u8 *key;
-  u8 *packet_data;
-  ikev2_sa_transform_t *tr_prf;
-
-  tr_prf =
-    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_PRF);
-
-  if (is_responder)
-    {
-      id = &sa->r_id;
-      key = sa->sk_pr;
-      nonce = sa->i_nonce;
-      packet_data = sa->last_sa_init_res_packet_data;
-    }
-  else
-    {
-      id = &sa->i_id;
-      key = sa->sk_pi;
-      nonce = sa->r_nonce;
-      packet_data = sa->last_sa_init_req_packet_data;
-    }
-
-  data = vec_new (u8, 4);
-  data[0] = id->type;
-  vec_append (data, id->data);
-
-  u8 *id_hash = ikev2_calc_prf (tr_prf, key, data);
-  vec_append (authmsg, packet_data);
-  vec_append (authmsg, nonce);
-  vec_append (authmsg, id_hash);
-  vec_free (id_hash);
-  vec_free (data);
-
-  return authmsg;
-}
-
-static int
-ikev2_ts_cmp (ikev2_ts_t * ts1, ikev2_ts_t * ts2)
-{
-  if (ts1->ts_type == ts2->ts_type && ts1->protocol_id == ts2->protocol_id &&
-      ts1->start_port == ts2->start_port && ts1->end_port == ts2->end_port &&
-      ts1->start_addr.as_u32 == ts2->start_addr.as_u32 &&
-      ts1->end_addr.as_u32 == ts2->end_addr.as_u32)
-    return 1;
-
-  return 0;
-}
-
-static void
-ikev2_sa_match_ts (ikev2_sa_t * sa)
-{
-  ikev2_main_t *km = &ikev2_main;
-  ikev2_profile_t *p;
-  ikev2_ts_t *ts, *tsi = 0, *tsr = 0;
-
-  /* *INDENT-OFF* */
-  pool_foreach (p, km->profiles, ({
-
-    /* check id */
-    if (p->rem_id.type != sa->i_id.type ||
-        vec_len(p->rem_id.data) != vec_len(sa->i_id.data) ||
-        memcmp(p->rem_id.data, sa->i_id.data, vec_len(p->rem_id.data)))
-      continue;
-
-    vec_foreach(ts, sa->childs[0].tsi)
-      {
-        if (ikev2_ts_cmp(&p->rem_ts, ts))
-          {
-            tsi = vec_dup(ts);
-            break;
-          }
-      }
-
-    vec_foreach(ts, sa->childs[0].tsr)
-      {
-        if (ikev2_ts_cmp(&p->loc_ts, ts))
-          {
-            tsr = vec_dup(ts);
-            break;
-          }
-      }
-
-    break;
-  }));
-  /* *INDENT-ON* */
-
-  if (tsi && tsr)
-    {
-      vec_free (sa->childs[0].tsi);
-      vec_free (sa->childs[0].tsr);
-      sa->childs[0].tsi = tsi;
-      sa->childs[0].tsr = tsr;
-    }
-  else
-    {
-      vec_free (tsi);
-      vec_free (tsr);
-      ikev2_set_state (sa, IKEV2_STATE_TS_UNACCEPTABLE);
-    }
-}
-
-static void
-ikev2_sa_auth (ikev2_sa_t * sa)
-{
-  ikev2_main_t *km = &ikev2_main;
-  ikev2_profile_t *p, *sel_p = 0;
-  u8 *authmsg, *key_pad, *psk = 0, *auth = 0;
-  ikev2_sa_transform_t *tr_prf;
-
-  tr_prf =
-    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_PRF);
-
-  /* only shared key and rsa signature */
-  if (!(sa->i_auth.method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC ||
-	sa->i_auth.method == IKEV2_AUTH_METHOD_RSA_SIG))
-    {
-      clib_warning ("unsupported authentication method %u",
-		    sa->i_auth.method);
-      ikev2_set_state (sa, IKEV2_STATE_AUTH_FAILED);
-      return;
-    }
-
-  key_pad = format (0, "%s", IKEV2_KEY_PAD);
-  authmsg = ikev2_sa_generate_authmsg (sa, 0);
-
-  /* *INDENT-OFF* */
-  pool_foreach (p, km->profiles, ({
-
-    /* check id */
-    if (p->rem_id.type != sa->i_id.type ||
-        vec_len(p->rem_id.data) != vec_len(sa->i_id.data) ||
-        memcmp(p->rem_id.data, sa->i_id.data, vec_len(p->rem_id.data)))
-      continue;
-
-    if (sa->i_auth.method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC)
-      {
-        if (!p->auth.data ||
-             p->auth.method != IKEV2_AUTH_METHOD_SHARED_KEY_MIC)
-          continue;
-
-        psk = ikev2_calc_prf(tr_prf, p->auth.data, key_pad);
-        auth = ikev2_calc_prf(tr_prf, psk, authmsg);
-
-        if (!memcmp(auth, sa->i_auth.data, vec_len(sa->i_auth.data)))
-          {
-            ikev2_set_state(sa, IKEV2_STATE_AUTHENTICATED);
-            vec_free(auth);
-            sel_p = p;
-            break;
-          }
-
-      }
-    else if (sa->i_auth.method == IKEV2_AUTH_METHOD_RSA_SIG)
-      {
-        if (p->auth.method != IKEV2_AUTH_METHOD_RSA_SIG)
-          continue;
-
-        if (ikev2_verify_sign(p->auth.key, sa->i_auth.data, authmsg) == 1)
-          {
-            ikev2_set_state(sa, IKEV2_STATE_AUTHENTICATED);
-            sel_p = p;
-            break;
-          }
-      }
-
-    vec_free(auth);
-    vec_free(psk);
-  }));
-  /* *INDENT-ON* */
-
-  vec_free (authmsg);
-
-  if (sa->state == IKEV2_STATE_AUTHENTICATED)
-    {
-      vec_free (sa->r_id.data);
-      sa->r_id.data = vec_dup (sel_p->loc_id.data);
-      sa->r_id.type = sel_p->loc_id.type;
-
-      /* generate our auth data */
-      authmsg = ikev2_sa_generate_authmsg (sa, 1);
-      if (sel_p->auth.method == IKEV2_AUTH_METHOD_SHARED_KEY_MIC)
-	{
-	  sa->r_auth.data = ikev2_calc_prf (tr_prf, psk, authmsg);
-	  sa->r_auth.method = IKEV2_AUTH_METHOD_SHARED_KEY_MIC;
-	}
-      else if (sel_p->auth.method == IKEV2_AUTH_METHOD_RSA_SIG)
-	{
-	  sa->r_auth.data = ikev2_calc_sign (km->pkey, authmsg);
-	  sa->r_auth.method = IKEV2_AUTH_METHOD_RSA_SIG;
-	}
-      vec_free (authmsg);
-
-      /* select transforms for 1st child sa */
-      ikev2_sa_free_proposal_vector (&sa->childs[0].r_proposals);
-      sa->childs[0].r_proposals =
-	ikev2_select_proposal (sa->childs[0].i_proposals, IKEV2_PROTOCOL_ESP);
-    }
-  else
-    {
-      ikev2_set_state (sa, IKEV2_STATE_AUTH_FAILED);
-    }
-  vec_free (psk);
-  vec_free (key_pad);
-}
-
-static int
-ikev2_create_tunnel_interface (vnet_main_t * vnm, ikev2_sa_t * sa,
-			       ikev2_child_sa_t * child)
-{
-  ipsec_add_del_tunnel_args_t a;
-  ikev2_sa_transform_t *tr;
-  u8 encr_type = 0;
-
-  if (!child->r_proposals)
-    {
-      ikev2_set_state (sa, IKEV2_STATE_NO_PROPOSAL_CHOSEN);
-      return 1;
-    }
-
-  memset (&a, 0, sizeof (a));
-  a.is_add = 1;
-  a.local_ip.as_u32 = sa->raddr.as_u32;
-  a.remote_ip.as_u32 = sa->iaddr.as_u32;
-  a.local_spi = child->i_proposals[0].spi;
-  a.remote_spi = child->r_proposals[0].spi;
-  a.anti_replay = 1;
-
-  tr =
-    ikev2_sa_get_td_for_type (child->r_proposals, IKEV2_TRANSFORM_TYPE_ESN);
-  if (tr)
-    a.esn = tr->esn_type;
-  else
-    a.esn = 0;
-
-  tr =
-    ikev2_sa_get_td_for_type (child->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
-  if (tr)
-    {
-      if (tr->encr_type == IKEV2_TRANSFORM_ENCR_TYPE_AES_CBC && tr->key_len)
-	{
-	  switch (tr->key_len)
-	    {
-	    case 16:
-	      encr_type = IPSEC_CRYPTO_ALG_AES_CBC_128;
-	      break;
-	    case 24:
-	      encr_type = IPSEC_CRYPTO_ALG_AES_CBC_192;
-	      break;
-	    case 32:
-	      encr_type = IPSEC_CRYPTO_ALG_AES_CBC_256;
-	      break;
-	    default:
-	      ikev2_set_state (sa, IKEV2_STATE_NO_PROPOSAL_CHOSEN);
-	      return 1;
-	      break;
-	    }
-	}
-      else
-	{
-	  ikev2_set_state (sa, IKEV2_STATE_NO_PROPOSAL_CHOSEN);
-	  return 1;
-	}
-    }
-  else
-    {
-      ikev2_set_state (sa, IKEV2_STATE_NO_PROPOSAL_CHOSEN);
-      return 1;
-    }
-
-  tr =
-    ikev2_sa_get_td_for_type (child->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
-  if (tr)
-    {
-      if (tr->integ_type != IKEV2_TRANSFORM_INTEG_TYPE_AUTH_HMAC_SHA1_96)
-	{
-	  ikev2_set_state (sa, IKEV2_STATE_NO_PROPOSAL_CHOSEN);
-	  return 1;
-	}
-    }
-  else
-    {
-      ikev2_set_state (sa, IKEV2_STATE_NO_PROPOSAL_CHOSEN);
-      return 1;
-    }
-
-  ikev2_calc_child_keys (sa, child);
-
-  a.integ_alg = IPSEC_INTEG_ALG_SHA1_96;
-  a.local_integ_key_len = vec_len (child->sk_ar);
-  clib_memcpy (a.local_integ_key, child->sk_ar, a.local_integ_key_len);
-  a.remote_integ_key_len = vec_len (child->sk_ai);
-  clib_memcpy (a.remote_integ_key, child->sk_ai, a.remote_integ_key_len);
-
-  a.crypto_alg = encr_type;
-  a.local_crypto_key_len = vec_len (child->sk_er);
-  clib_memcpy (a.local_crypto_key, child->sk_er, a.local_crypto_key_len);
-  a.remote_crypto_key_len = vec_len (child->sk_ei);
-  clib_memcpy (a.remote_crypto_key, child->sk_ei, a.remote_crypto_key_len);
-
-  ipsec_add_del_tunnel_if (&a);
-
-  return 0;
-}
-
-static int
-ikev2_delete_tunnel_interface (vnet_main_t * vnm, ikev2_sa_t * sa,
-			       ikev2_child_sa_t * child)
-{
-  ipsec_add_del_tunnel_args_t a;
-
-  if (!vec_len (child->r_proposals))
-    return 0;
-
-  a.is_add = 0;
-  a.local_ip.as_u32 = sa->raddr.as_u32;
-  a.remote_ip.as_u32 = sa->iaddr.as_u32;
-  a.local_spi = child->i_proposals[0].spi;
-  a.remote_spi = child->r_proposals[0].spi;
-
-  ipsec_add_del_tunnel_if (&a);
-  return 0;
-}
-
-static u32
-ikev2_generate_resp (ikev2_sa_t * sa, ike_header_t * ike)
-{
-  v8 *integ = 0;
-  ike_payload_header_t *ph;
-  u16 plen;
-  u32 tlen = 0;
-
-  ikev2_sa_transform_t *tr_encr, *tr_integ;
-  tr_encr =
-    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
-  tr_integ =
-    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
-
-  ikev2_payload_chain_t *chain = 0;
-  ikev2_payload_new_chain (chain);
-
-  if (ike->exchange == IKEV2_EXCHANGE_SA_INIT)
-    {
-      if (sa->r_proposals == 0)
-	{
-	  ikev2_payload_add_notify (chain,
-				    IKEV2_NOTIFY_MSG_NO_PROPOSAL_CHOSEN, 0);
-	  ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
-	}
-      else if (sa->dh_group == IKEV2_TRANSFORM_DH_TYPE_NONE)
-	{
-	  u8 *data = vec_new (u8, 2);
-	  ikev2_sa_transform_t *tr_dh;
-	  tr_dh =
-	    ikev2_sa_get_td_for_type (sa->r_proposals,
-				      IKEV2_TRANSFORM_TYPE_DH);
-	  ASSERT (tr_dh && tr_dh->dh_type);
-
-	  data[0] = (tr_dh->dh_type >> 8) & 0xff;
-	  data[1] = (tr_dh->dh_type) & 0xff;
-
-	  ikev2_payload_add_notify (chain,
-				    IKEV2_NOTIFY_MSG_INVALID_KE_PAYLOAD,
-				    data);
-	  vec_free (data);
-	  ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
-	}
-      else if (sa->state == IKEV2_STATE_NOTIFY_AND_DELETE)
-	{
-	  u8 *data = vec_new (u8, 1);
-
-	  data[0] = sa->unsupported_cp;
-	  ikev2_payload_add_notify (chain,
-				    IKEV2_NOTIFY_MSG_UNSUPPORTED_CRITICAL_PAYLOAD,
-				    data);
-	  vec_free (data);
-	}
-      else
-	{
-	  ike->rspi = clib_host_to_net_u64 (sa->rspi);
-	  ikev2_payload_add_sa (chain, sa->r_proposals);
-	  ikev2_payload_add_ke (chain, sa->dh_group, sa->r_dh_data);
-	  ikev2_payload_add_nonce (chain, sa->r_nonce);
-	}
-    }
-  else if (ike->exchange == IKEV2_EXCHANGE_IKE_AUTH)
-    {
-      if (sa->state == IKEV2_STATE_AUTHENTICATED)
-	{
-	  ikev2_payload_add_id (chain, &sa->r_id, IKEV2_PAYLOAD_IDR);
-	  ikev2_payload_add_auth (chain, &sa->r_auth);
-	  ikev2_payload_add_sa (chain, sa->childs[0].r_proposals);
-	  ikev2_payload_add_ts (chain, sa->childs[0].tsi, IKEV2_PAYLOAD_TSI);
-	  ikev2_payload_add_ts (chain, sa->childs[0].tsr, IKEV2_PAYLOAD_TSR);
-	}
-      else if (sa->state == IKEV2_STATE_AUTH_FAILED)
-	{
-	  ikev2_payload_add_notify (chain,
-				    IKEV2_NOTIFY_MSG_AUTHENTICATION_FAILED,
-				    0);
-	  ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
-	}
-      else if (sa->state == IKEV2_STATE_TS_UNACCEPTABLE)
-	{
-	  ikev2_payload_add_notify (chain, IKEV2_NOTIFY_MSG_TS_UNACCEPTABLE,
-				    0);
-	  ikev2_payload_add_id (chain, &sa->r_id, IKEV2_PAYLOAD_IDR);
-	  ikev2_payload_add_auth (chain, &sa->r_auth);
-	}
-      else if (sa->state == IKEV2_STATE_NO_PROPOSAL_CHOSEN)
-	{
-	  ikev2_payload_add_notify (chain,
-				    IKEV2_NOTIFY_MSG_NO_PROPOSAL_CHOSEN, 0);
-	  ikev2_payload_add_id (chain, &sa->r_id, IKEV2_PAYLOAD_IDR);
-	  ikev2_payload_add_auth (chain, &sa->r_auth);
-	  ikev2_payload_add_ts (chain, sa->childs[0].tsi, IKEV2_PAYLOAD_TSI);
-	  ikev2_payload_add_ts (chain, sa->childs[0].tsr, IKEV2_PAYLOAD_TSR);
-	}
-      else if (sa->state == IKEV2_STATE_NOTIFY_AND_DELETE)
-	{
-	  u8 *data = vec_new (u8, 1);
-
-	  data[0] = sa->unsupported_cp;
-	  ikev2_payload_add_notify (chain,
-				    IKEV2_NOTIFY_MSG_UNSUPPORTED_CRITICAL_PAYLOAD,
-				    data);
-	  vec_free (data);
-	}
-      else
-	{
-	  ikev2_set_state (sa, IKEV2_STATE_DELETED);
-	  goto done;
-	}
-    }
-  else if (ike->exchange == IKEV2_EXCHANGE_INFORMATIONAL)
-    {
-      /* if pending delete */
-      if (sa->del)
-	{
-	  /* The response to a request that deletes the IKE SA is an empty
-	     INFORMATIONAL response. */
-	  if (sa->del[0].protocol_id == IKEV2_PROTOCOL_IKE)
-	    {
-	      ikev2_set_state (sa, IKEV2_STATE_NOTIFY_AND_DELETE);
-	    }
-	  /* The response to a request that deletes ESP or AH SAs will contain
-	     delete payloads for the paired SAs going in the other direction. */
-	  else
-	    {
-	      ikev2_payload_add_delete (chain, sa->del);
-	    }
-	  vec_free (sa->del);
-	  sa->del = 0;
-	}
-      /* received N(AUTHENTICATION_FAILED) */
-      else if (sa->state == IKEV2_STATE_AUTH_FAILED)
-	{
-	  ikev2_set_state (sa, IKEV2_STATE_DELETED);
-	  goto done;
-	}
-      /* received unsupported critical payload */
-      else if (sa->unsupported_cp)
-	{
-	  u8 *data = vec_new (u8, 1);
-
-	  data[0] = sa->unsupported_cp;
-	  ikev2_payload_add_notify (chain,
-				    IKEV2_NOTIFY_MSG_UNSUPPORTED_CRITICAL_PAYLOAD,
-				    data);
-	  vec_free (data);
-	  sa->unsupported_cp = 0;
-	}
-      /* else send empty response */
-    }
-  else if (ike->exchange == IKEV2_EXCHANGE_CREATE_CHILD_SA)
-    {
-      if (sa->rekey)
-	{
-	  ikev2_payload_add_sa (chain, sa->rekey[0].r_proposal);
-	  ikev2_payload_add_nonce (chain, sa->r_nonce);
-	  ikev2_payload_add_ts (chain, sa->rekey[0].tsi, IKEV2_PAYLOAD_TSI);
-	  ikev2_payload_add_ts (chain, sa->rekey[0].tsr, IKEV2_PAYLOAD_TSR);
-	  vec_del1 (sa->rekey, 0);
-	}
-      else if (sa->unsupported_cp)
-	{
-	  u8 *data = vec_new (u8, 1);
-
-	  data[0] = sa->unsupported_cp;
-	  ikev2_payload_add_notify (chain,
-				    IKEV2_NOTIFY_MSG_UNSUPPORTED_CRITICAL_PAYLOAD,
-				    data);
-	  vec_free (data);
-	  sa->unsupported_cp = 0;
-	}
-      else
-	{
-	  ikev2_payload_add_notify (chain, IKEV2_NOTIFY_MSG_NO_ADDITIONAL_SAS,
-				    0);
-	}
-    }
-
-  /* IKEv2 header */
-  ike->version = IKE_VERSION_2;
-  ike->flags = IKEV2_HDR_FLAG_RESPONSE;
-  ike->nextpayload = IKEV2_PAYLOAD_SK;
-  tlen = sizeof (*ike);
-
-
-  if (ike->exchange == IKEV2_EXCHANGE_SA_INIT)
-    {
-      tlen += vec_len (chain->data);
-      ike->nextpayload = chain->first_payload_type;
-      ike->length = clib_host_to_net_u32 (tlen);
-      clib_memcpy (ike->payload, chain->data, vec_len (chain->data));
-
-      /* store whole IKE payload - needed for PSK auth */
-      vec_free (sa->last_sa_init_res_packet_data);
-      vec_add (sa->last_sa_init_res_packet_data, ike, tlen);
-    }
-  else
-    {
-
-      ikev2_payload_chain_add_padding (chain, tr_encr->block_size);
-
-      /* SK payload */
-      plen = sizeof (*ph);
-      ph = (ike_payload_header_t *) & ike->payload[0];
-      ph->nextpayload = chain->first_payload_type;
-      ph->flags = 0;
-      int enc_len = ikev2_encrypt_data (sa, chain->data, ph->payload);
-      plen += enc_len;
-
-      /* add space for hmac */
-      plen += tr_integ->key_trunc;
-      tlen += plen;
-
-      /* payload and total length */
-      ph->length = clib_host_to_net_u16 (plen);
-      ike->length = clib_host_to_net_u32 (tlen);
-
-      /* calc integrity data for whole packet except hash itself */
-      integ = ikev2_calc_integr (tr_integ, sa->sk_ar, (u8 *) ike,
-				 tlen - tr_integ->key_trunc);
-
-      clib_memcpy (ike->payload + tlen - tr_integ->key_trunc - sizeof (*ike),
-		   integ, tr_integ->key_trunc);
-
-      /* store whole IKE payload - needed for retransmit */
-      vec_free (sa->last_res_packet_data);
-      vec_add (sa->last_res_packet_data, ike, tlen);
-    }
-
-done:
-  ikev2_payload_destroy_chain (chain);
-  vec_free (integ);
-  return tlen;
-}
-
-static int
-ikev2_retransmit_sa_init (ike_header_t * ike,
-			  ip4_address_t iaddr, ip4_address_t raddr)
-{
-  ikev2_main_t *km = &ikev2_main;
-  ikev2_sa_t *sa;
-  u32 cpu_index = os_get_cpu_number ();
-
-  /* *INDENT-OFF* */
-  pool_foreach (sa, km->per_thread_data[cpu_index].sas, ({
-    if (sa->ispi == clib_net_to_host_u64(ike->ispi) &&
-        sa->iaddr.as_u32 == iaddr.as_u32 &&
-        sa->raddr.as_u32 == raddr.as_u32)
-      {
-        int p = 0;
-        u32 len = clib_net_to_host_u32(ike->length);
-        u8 payload = ike->nextpayload;
-
-        while (p < len && payload!= IKEV2_PAYLOAD_NONE) {
-          ike_payload_header_t * ikep = (ike_payload_header_t *) &ike->payload[p];
-          u32 plen = clib_net_to_host_u16(ikep->length);
-
-          if (plen < sizeof(ike_payload_header_t))
-            return -1;
-
-          if (payload == IKEV2_PAYLOAD_NONCE)
-            {
-              if (!memcmp(sa->i_nonce, ikep->payload, plen - sizeof(*ikep)))
-                {
-                  /* req is retransmit */
-                  if (sa->state == IKEV2_STATE_SA_INIT)
-                    {
-                      ike_header_t * tmp;
-                      tmp = (ike_header_t*)sa->last_sa_init_res_packet_data;
-                      ike->ispi = tmp->ispi;
-                      ike->rspi = tmp->rspi;
-                      ike->nextpayload = tmp->nextpayload;
-                      ike->version = tmp->version;
-                      ike->exchange = tmp->exchange;
-                      ike->flags = tmp->flags;
-                      ike->msgid = tmp->msgid;
-                      ike->length = tmp->length;
-                      clib_memcpy(ike->payload, tmp->payload,
-                             clib_net_to_host_u32(tmp->length) - sizeof(*ike));
-                      clib_warning("IKE_SA_INIT retransmit from %U to %U",
-                                   format_ip4_address, &raddr,
-                                   format_ip4_address, &iaddr);
-                      return 1;
-                    }
-                  /* else ignore req */
-                  else
-                    {
-                      clib_warning("IKE_SA_INIT ignore from %U to %U",
-                                   format_ip4_address, &raddr,
-                                   format_ip4_address, &iaddr);
-                      return -1;
-                    }
-                }
-            }
-          payload = ikep->nextpayload;
-          p+=plen;
-        }
-      }
-  }));
-  /* *INDENT-ON* */
-
-  /* req is not retransmit */
-  return 0;
-}
-
-static int
-ikev2_retransmit_resp (ikev2_sa_t * sa, ike_header_t * ike)
-{
-  u32 msg_id = clib_net_to_host_u32 (ike->msgid);
-
-  /* new req */
-  if (msg_id > sa->last_msg_id)
-    {
-      sa->last_msg_id = msg_id;
-      return 0;
-    }
-  /* retransmitted req */
-  else if (msg_id == sa->last_msg_id)
-    {
-      ike_header_t *tmp;
-      tmp = (ike_header_t *) sa->last_res_packet_data;
-      ike->ispi = tmp->ispi;
-      ike->rspi = tmp->rspi;
-      ike->nextpayload = tmp->nextpayload;
-      ike->version = tmp->version;
-      ike->exchange = tmp->exchange;
-      ike->flags = tmp->flags;
-      ike->msgid = tmp->msgid;
-      ike->length = tmp->length;
-      clib_memcpy (ike->payload, tmp->payload,
-		   clib_net_to_host_u32 (tmp->length) - sizeof (*ike));
-      clib_warning ("IKE msgid %u retransmit from %U to %U",
-		    msg_id,
-		    format_ip4_address, &sa->raddr,
-		    format_ip4_address, &sa->iaddr);
-      return 1;
-    }
-  /* old req ignore */
-  else
-    {
-      clib_warning ("IKE msgid %u req ignore from %U to %U",
-		    msg_id,
-		    format_ip4_address, &sa->raddr,
-		    format_ip4_address, &sa->iaddr);
-      return -1;
-    }
-}
-
-static uword
-ikev2_node_fn (vlib_main_t * vm,
-	       vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  ikev2_next_t next_index;
-  ikev2_main_t *km = &ikev2_main;
-  u32 cpu_index = os_get_cpu_number ();
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0 = IKEV2_NEXT_ERROR_DROP;
-	  u32 sw_if_index0;
-	  ip4_header_t *ip40;
-	  udp_header_t *udp0;
-	  ike_header_t *ike0;
-	  ikev2_sa_t *sa0 = 0;
-	  ikev2_sa_t sa;	/* temporary store for SA */
-	  int len = 0;
-	  int r;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  ike0 = vlib_buffer_get_current (b0);
-	  vlib_buffer_advance (b0, -sizeof (*udp0));
-	  udp0 = vlib_buffer_get_current (b0);
-	  vlib_buffer_advance (b0, -sizeof (*ip40));
-	  ip40 = vlib_buffer_get_current (b0);
-
-	  if (ike0->version != IKE_VERSION_2)
-	    {
-	      vlib_node_increment_counter (vm, ikev2_node.index,
-					   IKEV2_ERROR_NOT_IKEV2, 1);
-	      goto dispatch0;
-	    }
-
-	  if (ike0->exchange == IKEV2_EXCHANGE_SA_INIT)
-	    {
-	      sa0 = &sa;
-	      memset (sa0, 0, sizeof (*sa0));
-
-	      if (ike0->rspi == 0)
-		{
-		  sa0->raddr.as_u32 = ip40->dst_address.as_u32;
-		  sa0->iaddr.as_u32 = ip40->src_address.as_u32;
-
-		  r = ikev2_retransmit_sa_init (ike0, sa0->iaddr, sa0->raddr);
-		  if (r == 1)
-		    {
-		      vlib_node_increment_counter (vm, ikev2_node.index,
-						   IKEV2_ERROR_IKE_SA_INIT_RETRANSMIT,
-						   1);
-		      len = clib_net_to_host_u32 (ike0->length);
-		      goto dispatch0;
-		    }
-		  else if (r == -1)
-		    {
-		      vlib_node_increment_counter (vm, ikev2_node.index,
-						   IKEV2_ERROR_IKE_SA_INIT_IGNORE,
-						   1);
-		      goto dispatch0;
-		    }
-
-		  ikev2_process_sa_init_req (vm, sa0, ike0);
-
-		  if (sa0->state == IKEV2_STATE_SA_INIT)
-		    {
-		      ikev2_sa_free_proposal_vector (&sa0->r_proposals);
-		      sa0->r_proposals =
-			ikev2_select_proposal (sa0->i_proposals,
-					       IKEV2_PROTOCOL_IKE);
-		      ikev2_generate_sa_init_data (sa0);
-		    }
-
-		  if (sa0->state == IKEV2_STATE_SA_INIT ||
-		      sa0->state == IKEV2_STATE_NOTIFY_AND_DELETE)
-		    {
-		      len = ikev2_generate_resp (sa0, ike0);
-		    }
-
-		  if (sa0->state == IKEV2_STATE_SA_INIT)
-		    {
-		      /* add SA to the pool */
-		      pool_get (km->per_thread_data[cpu_index].sas, sa0);
-		      clib_memcpy (sa0, &sa, sizeof (*sa0));
-		      hash_set (km->per_thread_data[cpu_index].sa_by_rspi,
-				sa0->rspi,
-				sa0 - km->per_thread_data[cpu_index].sas);
-		    }
-		  else
-		    {
-		      ikev2_sa_free_all_vec (sa0);
-		    }
-		}
-	    }
-	  else if (ike0->exchange == IKEV2_EXCHANGE_IKE_AUTH)
-	    {
-	      uword *p;
-	      p = hash_get (km->per_thread_data[cpu_index].sa_by_rspi,
-			    clib_net_to_host_u64 (ike0->rspi));
-	      if (p)
-		{
-		  sa0 = pool_elt_at_index (km->per_thread_data[cpu_index].sas,
-					   p[0]);
-
-		  r = ikev2_retransmit_resp (sa0, ike0);
-		  if (r == 1)
-		    {
-		      vlib_node_increment_counter (vm, ikev2_node.index,
-						   IKEV2_ERROR_IKE_REQ_RETRANSMIT,
-						   1);
-		      len = clib_net_to_host_u32 (ike0->length);
-		      goto dispatch0;
-		    }
-		  else if (r == -1)
-		    {
-		      vlib_node_increment_counter (vm, ikev2_node.index,
-						   IKEV2_ERROR_IKE_REQ_IGNORE,
-						   1);
-		      goto dispatch0;
-		    }
-
-		  ikev2_process_auth_req (vm, sa0, ike0);
-		  ikev2_sa_auth (sa0);
-		  if (sa0->state == IKEV2_STATE_AUTHENTICATED)
-		    {
-		      ikev2_initial_contact_cleanup (sa0);
-		      ikev2_sa_match_ts (sa0);
-		      if (sa0->state != IKEV2_STATE_TS_UNACCEPTABLE)
-			ikev2_create_tunnel_interface (km->vnet_main, sa0,
-						       &sa0->childs[0]);
-		    }
-		  len = ikev2_generate_resp (sa0, ike0);
-		}
-	    }
-	  else if (ike0->exchange == IKEV2_EXCHANGE_INFORMATIONAL)
-	    {
-	      uword *p;
-	      p = hash_get (km->per_thread_data[cpu_index].sa_by_rspi,
-			    clib_net_to_host_u64 (ike0->rspi));
-	      if (p)
-		{
-		  sa0 = pool_elt_at_index (km->per_thread_data[cpu_index].sas,
-					   p[0]);
-
-		  r = ikev2_retransmit_resp (sa0, ike0);
-		  if (r == 1)
-		    {
-		      vlib_node_increment_counter (vm, ikev2_node.index,
-						   IKEV2_ERROR_IKE_REQ_RETRANSMIT,
-						   1);
-		      len = clib_net_to_host_u32 (ike0->length);
-		      goto dispatch0;
-		    }
-		  else if (r == -1)
-		    {
-		      vlib_node_increment_counter (vm, ikev2_node.index,
-						   IKEV2_ERROR_IKE_REQ_IGNORE,
-						   1);
-		      goto dispatch0;
-		    }
-
-		  ikev2_process_informational_req (vm, sa0, ike0);
-		  if (sa0->del)
-		    {
-		      if (sa0->del[0].protocol_id != IKEV2_PROTOCOL_IKE)
-			{
-			  ikev2_delete_t *d, *tmp, *resp = 0;
-			  vec_foreach (d, sa0->del)
-			  {
-			    ikev2_child_sa_t *ch_sa;
-			    ch_sa = ikev2_sa_get_child (sa0, d->spi,
-							d->protocol_id);
-			    if (ch_sa)
-			      {
-				ikev2_delete_tunnel_interface (km->vnet_main,
-							       sa0, ch_sa);
-				vec_add2 (resp, tmp, 1);
-				tmp->protocol_id = d->protocol_id;
-				tmp->spi = ch_sa->r_proposals[0].spi;
-				ikev2_sa_del_child_sa (sa0, ch_sa);
-			      }
-			  }
-			  vec_free (sa0->del);
-			  sa0->del = resp;
-			}
-		    }
-		  len = ikev2_generate_resp (sa0, ike0);
-		}
-	    }
-	  else if (ike0->exchange == IKEV2_EXCHANGE_CREATE_CHILD_SA)
-	    {
-	      uword *p;
-	      p = hash_get (km->per_thread_data[cpu_index].sa_by_rspi,
-			    clib_net_to_host_u64 (ike0->rspi));
-	      if (p)
-		{
-		  sa0 = pool_elt_at_index (km->per_thread_data[cpu_index].sas,
-					   p[0]);
-
-		  r = ikev2_retransmit_resp (sa0, ike0);
-		  if (r == 1)
-		    {
-		      vlib_node_increment_counter (vm, ikev2_node.index,
-						   IKEV2_ERROR_IKE_REQ_RETRANSMIT,
-						   1);
-		      len = clib_net_to_host_u32 (ike0->length);
-		      goto dispatch0;
-		    }
-		  else if (r == -1)
-		    {
-		      vlib_node_increment_counter (vm, ikev2_node.index,
-						   IKEV2_ERROR_IKE_REQ_IGNORE,
-						   1);
-		      goto dispatch0;
-		    }
-
-		  ikev2_process_create_child_sa_req (vm, sa0, ike0);
-		  if (sa0->rekey)
-		    {
-		      if (sa0->rekey[0].protocol_id != IKEV2_PROTOCOL_IKE)
-			{
-			  ikev2_child_sa_t *child;
-			  vec_add2 (sa0->childs, child, 1);
-			  child->r_proposals = sa0->rekey[0].r_proposal;
-			  child->i_proposals = sa0->rekey[0].i_proposal;
-			  child->tsi = sa0->rekey[0].tsi;
-			  child->tsr = sa0->rekey[0].tsr;
-			  ikev2_create_tunnel_interface (km->vnet_main, sa0,
-							 child);
-			}
-		      len = ikev2_generate_resp (sa0, ike0);
-		    }
-		}
-	    }
-	  else
-	    {
-	      clib_warning ("IKEv2 exchange %u packet received from %U to %U",
-			    ike0->exchange,
-			    format_ip4_address, ip40->src_address.as_u8,
-			    format_ip4_address, ip40->dst_address.as_u8);
-	    }
-
-	dispatch0:
-	  /* if we are sending packet back, rewrite headers */
-	  if (len)
-	    {
-	      next0 = IKEV2_NEXT_IP4_LOOKUP;
-	      ip40->dst_address.as_u32 = sa0->iaddr.as_u32;
-	      ip40->src_address.as_u32 = sa0->raddr.as_u32;
-	      udp0->length =
-		clib_host_to_net_u16 (len + sizeof (udp_header_t));
-	      udp0->checksum = 0;
-	      b0->current_length =
-		len + sizeof (ip4_header_t) + sizeof (udp_header_t);
-	      ip40->length = clib_host_to_net_u16 (b0->current_length);
-	      ip40->checksum = ip4_header_checksum (ip40);
-	    }
-	  /* delete sa */
-	  if (sa0 && (sa0->state == IKEV2_STATE_DELETED ||
-		      sa0->state == IKEV2_STATE_NOTIFY_AND_DELETE))
-	    {
-	      ikev2_child_sa_t *c;
-
-	      vec_foreach (c, sa0->childs)
-		ikev2_delete_tunnel_interface (km->vnet_main, sa0, c);
-
-	      ikev2_delete_sa (sa0);
-	    }
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      ikev2_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = sw_if_index0;
-	      t->next_index = next0;
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, ikev2_node.index,
-			       IKEV2_ERROR_PROCESSED, frame->n_vectors);
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ikev2_node,static) = {
-  .function = ikev2_node_fn,
-  .name = "ikev2",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ikev2_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(ikev2_error_strings),
-  .error_strings = ikev2_error_strings,
-
-  .n_next_nodes = IKEV2_N_NEXT,
-
-  .next_nodes = {
-    [IKEV2_NEXT_IP4_LOOKUP] = "ip4-lookup",
-        [IKEV2_NEXT_ERROR_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-
-static ikev2_profile_t *
-ikev2_profile_index_by_name (u8 * name)
-{
-  ikev2_main_t *km = &ikev2_main;
-  uword *p;
-
-  p = mhash_get (&km->profile_index_by_name, name);
-  if (!p)
-    return 0;
-
-  return pool_elt_at_index (km->profiles, p[0]);
-}
-
-clib_error_t *
-ikev2_set_local_key (vlib_main_t * vm, u8 * file)
-{
-  ikev2_main_t *km = &ikev2_main;
-
-  km->pkey = ikev2_load_key_file (file);
-  if (km->pkey == NULL)
-    return clib_error_return (0, "load key '%s' failed", file);
-
-  return 0;
-}
-
-clib_error_t *
-ikev2_add_del_profile (vlib_main_t * vm, u8 * name, int is_add)
-{
-  ikev2_main_t *km = &ikev2_main;
-  ikev2_profile_t *p;
-
-  if (is_add)
-    {
-      if (ikev2_profile_index_by_name (name))
-	return clib_error_return (0, "policy %v already exists", name);
-
-      pool_get (km->profiles, p);
-      memset (p, 0, sizeof (*p));
-      p->name = vec_dup (name);
-      uword index = p - km->profiles;
-      mhash_set_mem (&km->profile_index_by_name, name, &index, 0);
-    }
-  else
-    {
-      p = ikev2_profile_index_by_name (name);
-      if (!p)
-	return clib_error_return (0, "policy %v does not exists", name);
-
-      vec_free (p->name);
-      pool_put (km->profiles, p);
-      mhash_unset (&km->profile_index_by_name, name, 0);
-    }
-  return 0;
-}
-
-clib_error_t *
-ikev2_set_profile_auth (vlib_main_t * vm, u8 * name, u8 auth_method,
-			u8 * auth_data, u8 data_hex_format)
-{
-  ikev2_profile_t *p;
-  clib_error_t *r;
-
-  p = ikev2_profile_index_by_name (name);
-
-  if (!p)
-    {
-      r = clib_error_return (0, "unknown profile %v", name);
-      return r;
-    }
-  vec_free (p->auth.data);
-  p->auth.method = auth_method;
-  p->auth.data = vec_dup (auth_data);
-  p->auth.hex = data_hex_format;
-
-  if (auth_method == IKEV2_AUTH_METHOD_RSA_SIG)
-    {
-      vec_add1 (p->auth.data, 0);
-      if (p->auth.key)
-	EVP_PKEY_free (p->auth.key);
-      p->auth.key = ikev2_load_cert_file (auth_data);
-      if (p->auth.key == NULL)
-	return clib_error_return (0, "load cert '%s' failed", auth_data);
-    }
-
-  return 0;
-}
-
-clib_error_t *
-ikev2_set_profile_id (vlib_main_t * vm, u8 * name, u8 id_type, u8 * data,
-		      int is_local)
-{
-  ikev2_profile_t *p;
-  clib_error_t *r;
-
-  if (id_type > IKEV2_ID_TYPE_ID_RFC822_ADDR
-      && id_type < IKEV2_ID_TYPE_ID_KEY_ID)
-    {
-      r = clib_error_return (0, "unsupported identity type %U",
-			     format_ikev2_id_type, id_type);
-      return r;
-    }
-
-  p = ikev2_profile_index_by_name (name);
-
-  if (!p)
-    {
-      r = clib_error_return (0, "unknown profile %v", name);
-      return r;
-    }
-
-  if (is_local)
-    {
-      vec_free (p->loc_id.data);
-      p->loc_id.type = id_type;
-      p->loc_id.data = vec_dup (data);
-    }
-  else
-    {
-      vec_free (p->rem_id.data);
-      p->rem_id.type = id_type;
-      p->rem_id.data = vec_dup (data);
-    }
-
-  return 0;
-}
-
-clib_error_t *
-ikev2_set_profile_ts (vlib_main_t * vm, u8 * name, u8 protocol_id,
-		      u16 start_port, u16 end_port, ip4_address_t start_addr,
-		      ip4_address_t end_addr, int is_local)
-{
-  ikev2_profile_t *p;
-  clib_error_t *r;
-
-  p = ikev2_profile_index_by_name (name);
-
-  if (!p)
-    {
-      r = clib_error_return (0, "unknown profile %v", name);
-      return r;
-    }
-
-  if (is_local)
-    {
-      p->loc_ts.start_addr.as_u32 = start_addr.as_u32;
-      p->loc_ts.end_addr.as_u32 = end_addr.as_u32;
-      p->loc_ts.start_port = start_port;
-      p->loc_ts.end_port = end_port;
-      p->loc_ts.protocol_id = protocol_id;
-      p->loc_ts.ts_type = 7;
-    }
-  else
-    {
-      p->rem_ts.start_addr.as_u32 = start_addr.as_u32;
-      p->rem_ts.end_addr.as_u32 = end_addr.as_u32;
-      p->rem_ts.start_port = start_port;
-      p->rem_ts.end_port = end_port;
-      p->rem_ts.protocol_id = protocol_id;
-      p->rem_ts.ts_type = 7;
-    }
-
-  return 0;
-}
-
-
-clib_error_t *
-ikev2_init (vlib_main_t * vm)
-{
-  ikev2_main_t *km = &ikev2_main;
-  clib_error_t *error;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  int thread_id;
-
-  memset (km, 0, sizeof (ikev2_main_t));
-  km->vnet_main = vnet_get_main ();
-  km->vlib_main = vm;
-
-  ikev2_crypto_init (km);
-
-  mhash_init_vec_string (&km->profile_index_by_name, sizeof (uword));
-
-  vec_validate (km->per_thread_data, tm->n_vlib_mains - 1);
-  for (thread_id = 0; thread_id < tm->n_vlib_mains - 1; thread_id++)
-    {
-      km->per_thread_data[thread_id].sa_by_rspi =
-	hash_create (0, sizeof (uword));
-    }
-
-  if ((error = vlib_call_init_function (vm, ikev2_cli_init)))
-    return error;
-
-  udp_register_dst_port (vm, 500, ikev2_node.index, 1);
-
-  return 0;
-}
-
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ikev2.h b/vnet/vnet/ipsec/ikev2.h
deleted file mode 100644
index 723fdde8..00000000
--- a/vnet/vnet/ipsec/ikev2.h
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_ikev2_h__
-#define __included_ikev2_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-
-#include <vppinfra/error.h>
-
-#define IKEV2_NONCE_SIZE  32
-
-#define IKEV2_KEY_PAD "Key Pad for IKEv2"
-
-typedef u8 v8;
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u64 ispi;
-  u64 rspi;
-  u8 nextpayload;
-  u8 version;
-  u8 exchange;
-  u8 flags;
-  u32 msgid; u32 length; u8 payload[0];
-}) ike_header_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     u8 nextpayload;
-		     u8 flags;
-		     u16 length;
-		     u16 dh_group;
-		     u8 reserved[2]; u8 payload[0];}) ike_ke_payload_header_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u8 nextpayload;
-  u8 flags;
-  u16 length; u8 payload[0];
-}) ike_payload_header_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u8 nextpayload;
-  u8 flags;
-  u16 length;
-  u8 auth_method;
-  u8 reserved[3];
-  u8 payload[0];
-}) ike_auth_payload_header_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u8 nextpayload;
-  u8 flags;
-  u16 length;
-  u8 id_type;
-  u8 reserved[3]; u8 payload[0];
-}) ike_id_payload_header_t;
-/* *INDENT-ON* */
-
-#define IKE_VERSION_2                    0x20
-
-#define IKEV2_EXCHANGE_SA_INIT           34
-#define IKEV2_EXCHANGE_IKE_AUTH          35
-#define IKEV2_EXCHANGE_CREATE_CHILD_SA   36
-#define IKEV2_EXCHANGE_INFORMATIONAL     37
-
-#define IKEV2_HDR_FLAG_INITIATOR         (1<<3)
-#define IKEV2_HDR_FLAG_VERSION           (1<<4)
-#define IKEV2_HDR_FLAG_RESPONSE          (1<<5)
-
-#define IKEV2_PAYLOAD_FLAG_CRITICAL      (1<<7)
-
-#define IKEV2_PAYLOAD_NONE      0
-#define IKEV2_PAYLOAD_SA        33
-#define IKEV2_PAYLOAD_KE        34
-#define IKEV2_PAYLOAD_IDI       35
-#define IKEV2_PAYLOAD_IDR       36
-#define IKEV2_PAYLOAD_AUTH      39
-#define IKEV2_PAYLOAD_NONCE     40
-#define IKEV2_PAYLOAD_NOTIFY    41
-#define IKEV2_PAYLOAD_DELETE    42
-#define IKEV2_PAYLOAD_VENDOR    43
-#define IKEV2_PAYLOAD_TSI       44
-#define IKEV2_PAYLOAD_TSR       45
-#define IKEV2_PAYLOAD_SK        46
-
-typedef enum
-{
-  IKEV2_PROTOCOL_IKE = 1,
-  IKEV2_PROTOCOL_AH = 2,
-  IKEV2_PROTOCOL_ESP = 3,
-} ikev2_protocol_id_t;
-
-#define foreach_ikev2_notify_msg_type \
-  _(    0, NONE)                                \
-  _(    1, UNSUPPORTED_CRITICAL_PAYLOAD)        \
-  _(    4, INVALID_IKE_SPI)                     \
-  _(    5, INVALID_MAJOR_VERSION)               \
-  _(    7, INVALID_SYNTAX)                      \
-  _(    8, INVALID_MESSAGE_ID)                  \
-  _(   11, INVALID_SPI)                         \
-  _(   14, NO_PROPOSAL_CHOSEN)                  \
-  _(   17, INVALID_KE_PAYLOAD)                  \
-  _(   24, AUTHENTICATION_FAILED)               \
-  _(   34, SINGLE_PAIR_REQUIRED)                \
-  _(   35, NO_ADDITIONAL_SAS)                   \
-  _(   36, INTERNAL_ADDRESS_FAILURE)            \
-  _(   37, FAILED_CP_REQUIRED)                  \
-  _(   38, TS_UNACCEPTABLE)                     \
-  _(   39, INVALID_SELECTORS)                   \
-  _(   40, UNACCEPTABLE_ADDRESSES)              \
-  _(   41, UNEXPECTED_NAT_DETECTED)             \
-  _(   42, USE_ASSIGNED_HoA)                    \
-  _(   43, TEMPORARY_FAILURE)                   \
-  _(   44, CHILD_SA_NOT_FOUND)                  \
-  _(   45, INVALID_GROUP_ID)                    \
-  _(   46, AUTHORIZATION_FAILED)                \
-  _(16384, INITIAL_CONTACT)                     \
-  _(16385, SET_WINDOW_SIZE)                     \
-  _(16386, ADDITIONAL_TS_POSSIBLE)              \
-  _(16387, IPCOMP_SUPPORTED)                    \
-  _(16388, NAT_DETECTION_SOURCE_IP)             \
-  _(16389, NAT_DETECTION_DESTINATION_IP)        \
-  _(16390, COOKIE)                              \
-  _(16391, USE_TRANSPORT_MODE)                  \
-  _(16392, HTTP_CERT_LOOKUP_SUPPORTED)          \
-  _(16393, REKEY_SA)                            \
-  _(16394, ESP_TFC_PADDING_NOT_SUPPORTED)       \
-  _(16395, NON_FIRST_FRAGMENTS_ALSO)            \
-  _(16396, MOBIKE_SUPPORTED)                    \
-  _(16397, ADDITIONAL_IP4_ADDRESS)              \
-  _(16398, ADDITIONAL_IP6_ADDRESS)              \
-  _(16399, NO_ADDITIONAL_ADDRESSES)             \
-  _(16400, UPDATE_SA_ADDRESSES)                 \
-  _(16401, COOKIE2)                             \
-  _(16402, NO_NATS_ALLOWED)                     \
-  _(16403, AUTH_LIFETIME)                       \
-  _(16404, MULTIPLE_AUTH_SUPPORTED)             \
-  _(16405, ANOTHER_AUTH_FOLLOWS)                \
-  _(16406, REDIRECT_SUPPORTED)                  \
-  _(16407, REDIRECT)                            \
-  _(16408, REDIRECTED_FROM)                     \
-  _(16409, TICKET_LT_OPAQUE)                    \
-  _(16410, TICKET_REQUEST)                      \
-  _(16411, TICKET_ACK)                          \
-  _(16412, TICKET_NACK)                         \
-  _(16413, TICKET_OPAQUE)                       \
-  _(16414, LINK_ID)                             \
-  _(16415, USE_WESP_MODE)                       \
-  _(16416, ROHC_SUPPORTED)                      \
-  _(16417, EAP_ONLY_AUTHENTICATION)             \
-  _(16418, CHILDLESS_IKEV2_SUPPORTED)           \
-  _(16419, QUICK_CRASH_DETECTION)               \
-  _(16420, IKEV2_MESSAGE_ID_SYNC_SUPPORTED)     \
-  _(16421, IPSEC_REPLAY_COUNTER_SYNC_SUPPORTED) \
-  _(16422, IKEV2_MESSAGE_ID_SYNC)               \
-  _(16423, IPSEC_REPLAY_COUNTER_SYNC)           \
-  _(16424, SECURE_PASSWORD_METHODS)             \
-  _(16425, PSK_PERSIST)                         \
-  _(16426, PSK_CONFIRM)                         \
-  _(16427, ERX_SUPPORTED)                       \
-  _(16428, IFOM_CAPABILITY)                     \
-  _(16429, SENDER_REQUEST_ID)                   \
-  _(16430, IKEV2_FRAGMENTATION_SUPPORTED)       \
-  _(16431, SIGNATURE_HASH_ALGORITHMS)
-
-
-typedef enum
-{
-#define _(v,f) IKEV2_NOTIFY_MSG_##f = v,
-  foreach_ikev2_notify_msg_type
-#undef _
-} ikev2_notify_msg_type_t;
-
-#define foreach_ikev2_transform_type       \
-  _(0, UNDEFINED, "undefinded") \
-  _(1, ENCR,  "encr")           \
-  _(2, PRF,   "prf")            \
-  _(3, INTEG, "integ")          \
-  _(4, DH,    "dh-group")       \
-  _(5, ESN,   "esn")
-
-typedef enum
-{
-#define _(v,f,s) IKEV2_TRANSFORM_TYPE_##f = v,
-  foreach_ikev2_transform_type
-#undef _
-  IKEV2_TRANSFORM_NUM_TYPES
-} ikev2_transform_type_t;
-
-
-#define foreach_ikev2_transform_encr_type     \
-  _(1 , DES_IV64,  "des-iv64") \
-  _(2 , DES,       "des")      \
-  _(3 , 3DES,      "3des")     \
-  _(4 , RC5,       "rc5")      \
-  _(5 , IDEA,      "idea")     \
-  _(6 , CAST,      "cast")     \
-  _(7 , BLOWFISH,  "blowfish") \
-  _(8 , 3IDEA,     "3idea")    \
-  _(9 , DES_IV32,  "des-iv32") \
-  _(11, NULL,      "null")     \
-  _(12, AES_CBC,   "aes-cbc")  \
-  _(13, AES_CTR,   "aes-ctr")
-
-typedef enum
-{
-#define _(v,f,str) IKEV2_TRANSFORM_ENCR_TYPE_##f = v,
-  foreach_ikev2_transform_encr_type
-#undef _
-} ikev2_transform_encr_type_t;
-
-#define foreach_ikev2_transform_prf_type   \
-  _(1, PRF_HMAC_MD5,      "hmac-md5")      \
-  _(2, PRF_HMAC_SHA1,     "hmac-sha1")     \
-  _(3, PRF_MAC_TIGER,     "mac-tiger")     \
-  _(4, PRF_AES128_XCBC,   "aes128-xcbc")   \
-  _(5, PRF_HMAC_SHA2_256, "hmac-sha2-256") \
-  _(6, PRF_HMAC_SHA2_384, "hmac-sha2-384") \
-  _(7, PRF_HMAC_SHA2_512, "hmac-sha2-512") \
-  _(8, PRF_AES128_CMAC,   "aes128-cmac")
-
-typedef enum
-{
-#define _(v,f,str) IKEV2_TRANSFORM_PRF_TYPE_##f = v,
-  foreach_ikev2_transform_prf_type
-#undef _
-} ikev2_transform_prf_type_t;
-
-#define foreach_ikev2_transform_integ_type           \
-  _(0,  NONE,                   "none")              \
-  _(1,  AUTH_HMAC_MD5_96,       "md5-96")            \
-  _(2,  AUTH_HMAC_SHA1_96,      "sha1-96")           \
-  _(3,  AUTH_DES_MAC,           "des-mac")           \
-  _(4,  AUTH_KPDK_MD5,          "kpdk-md5")          \
-  _(5,  AUTH_AES_XCBC_96,       "aes-xcbc-96")       \
-  _(6,  AUTH_HMAC_MD5_128,      "md5-128")           \
-  _(7,  AUTH_HMAC_SHA1_160,     "sha1-160")          \
-  _(8,  AUTH_AES_CMAC_96,       "cmac-96")           \
-  _(9,  AUTH_AES_128_GMAC,      "aes-128-gmac")      \
-  _(10, AUTH_AES_192_GMAC,      "aes-192-gmac")      \
-  _(11, AUTH_AES_256_GMAC,      "aes-256-gmac")      \
-  _(12, AUTH_HMAC_SHA2_256_128, "hmac-sha2-256-128") \
-  _(13, AUTH_HMAC_SHA2_384_192, "hmac-sha2-384-192") \
-  _(14, AUTH_HMAC_SHA2_512_256, "hmac-sha2-512-256")
-
-typedef enum
-{
-#define _(v,f, str) IKEV2_TRANSFORM_INTEG_TYPE_##f = v,
-  foreach_ikev2_transform_integ_type
-#undef _
-} ikev2_transform_integ_type_t;
-
-#if defined(OPENSSL_NO_CISCO_FECDH)
-#define foreach_ikev2_transform_dh_type \
-  _(0, NONE,           "none")          \
-  _(1, MODP_768,       "modp-768")      \
-  _(2, MODP_1024,      "modp-1024")     \
-  _(5, MODP_1536,      "modp-1536")     \
-  _(14, MODP_2048,     "modp-2048")     \
-  _(15, MODP_3072,     "modp-3072")     \
-  _(16, MODP_4096,     "modp-4096")     \
-  _(17, MODP_6144,     "modp-6144")     \
-  _(18, MODP_8192,     "modp-8192")     \
-  _(19, ECP_256,       "ecp-256")       \
-  _(20, ECP_384,       "ecp-384")       \
-  _(21, ECP_521,       "ecp-521")       \
-  _(22, MODP_1024_160, "modp-1024-160") \
-  _(23, MODP_2048_224, "modp-2048-224") \
-  _(24, MODP_2048_256, "modp-2048-256") \
-  _(25, ECP_192,       "ecp-192")       \
-  _(26, ECP_224,       "ecp-224")       \
-  _(27, BRAINPOOL_224, "brainpool-224") \
-  _(28, BRAINPOOL_256, "brainpool-256") \
-  _(29, BRAINPOOL_384, "brainpool-384") \
-  _(30, BRAINPOOL_512, "brainpool-512")
-#else
-#define foreach_ikev2_transform_dh_type \
-  _(0, NONE,           "none")          \
-  _(1, MODP_768,       "modp-768")      \
-  _(2, MODP_1024,      "modp-1024")     \
-  _(5, MODP_1536,      "modp-1536")     \
-  _(14, MODP_2048,     "modp-2048")     \
-  _(15, MODP_3072,     "modp-3072")     \
-  _(16, MODP_4096,     "modp-4096")     \
-  _(17, MODP_6144,     "modp-6144")     \
-  _(18, MODP_8192,     "modp-8192")     \
-  _(19, ECP_256,       "ecp-256")       \
-  _(20, ECP_384,       "ecp-384")       \
-  _(21, ECP_521,       "ecp-521")       \
-  _(22, MODP_1024_160, "modp-1024-160") \
-  _(23, MODP_2048_224, "modp-2048-224") \
-  _(24, MODP_2048_256, "modp-2048-256") \
-  _(25, ECP_192,       "ecp-192")
-#endif
-
-typedef enum
-{
-#define _(v,f, str) IKEV2_TRANSFORM_DH_TYPE_##f = v,
-  foreach_ikev2_transform_dh_type
-#undef _
-} ikev2_transform_dh_type_t;
-
-#define foreach_ikev2_transform_esn_type     \
-  _(0, NO_ESN, "no")       \
-  _(1, ESN,    "yes")
-
-typedef enum
-{
-#define _(v,f,str) IKEV2_TRANSFORM_ESN_TYPE_##f = v,
-  foreach_ikev2_transform_esn_type
-#undef _
-} ikev2_transform_esn_type_t;
-
-#define foreach_ikev2_auth_method \
- _( 1, RSA_SIG,        "rsa-sig")        \
- _( 2, SHARED_KEY_MIC, "shared-key-mic")
-
-typedef enum
-{
-#define _(v,f,s) IKEV2_AUTH_METHOD_##f = v,
-  foreach_ikev2_auth_method
-#undef _
-} ikev2_auth_method_t;
-
-#define foreach_ikev2_id_type \
- _( 1, ID_IPV4_ADDR,   "ip4-addr")    \
- _( 2, ID_FQDN,        "fqdn")        \
- _( 3, ID_RFC822_ADDR, "rfc822")      \
- _( 5, ID_IPV6_ADDR,   "ip6-addr")    \
- _( 9, ID_DER_ASN1_DN, "der-asn1-dn") \
- _(10, ID_DER_ASN1_GN, "der-asn1-gn") \
- _(11, ID_KEY_ID,      "key-id")
-
-typedef enum
-{
-#define _(v,f,s) IKEV2_ID_TYPE_##f = v,
-  foreach_ikev2_id_type
-#undef _
-} ikev2_id_type_t;
-
-clib_error_t *ikev2_init (vlib_main_t * vm);
-clib_error_t *ikev2_set_local_key (vlib_main_t * vm, u8 * file);
-clib_error_t *ikev2_add_del_profile (vlib_main_t * vm, u8 * name, int is_add);
-clib_error_t *ikev2_set_profile_auth (vlib_main_t * vm, u8 * name,
-				      u8 auth_method, u8 * data,
-				      u8 data_hex_format);
-clib_error_t *ikev2_set_profile_id (vlib_main_t * vm, u8 * name,
-				    u8 id_type, u8 * data, int is_local);
-clib_error_t *ikev2_set_profile_ts (vlib_main_t * vm, u8 * name,
-				    u8 protocol_id, u16 start_port,
-				    u16 end_port, ip4_address_t start_addr,
-				    ip4_address_t end_addr, int is_local);
-/* ikev2_format.c */
-u8 *format_ikev2_auth_method (u8 * s, va_list * args);
-u8 *format_ikev2_id_type (u8 * s, va_list * args);
-u8 *format_ikev2_transform_type (u8 * s, va_list * args);
-u8 *format_ikev2_notify_msg_type (u8 * s, va_list * args);
-u8 *format_ikev2_transform_encr_type (u8 * s, va_list * args);
-u8 *format_ikev2_transform_prf_type (u8 * s, va_list * args);
-u8 *format_ikev2_transform_integ_type (u8 * s, va_list * args);
-u8 *format_ikev2_transform_dh_type (u8 * s, va_list * args);
-u8 *format_ikev2_transform_esn_type (u8 * s, va_list * args);
-u8 *format_ikev2_sa_transform (u8 * s, va_list * args);
-
-uword unformat_ikev2_auth_method (unformat_input_t * input, va_list * args);
-uword unformat_ikev2_id_type (unformat_input_t * input, va_list * args);
-uword unformat_ikev2_transform_type (unformat_input_t * input,
-				     va_list * args);
-uword unformat_ikev2_transform_encr_type (unformat_input_t * input,
-					  va_list * args);
-uword unformat_ikev2_transform_prf_type (unformat_input_t * input,
-					 va_list * args);
-uword unformat_ikev2_transform_integ_type (unformat_input_t * input,
-					   va_list * args);
-uword unformat_ikev2_transform_dh_type (unformat_input_t * input,
-					va_list * args);
-uword unformat_ikev2_transform_esn_type (unformat_input_t * input,
-					 va_list * args);
-
-#endif /* __included_ikev2_h__ */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ikev2_cli.c b/vnet/vnet/ipsec/ikev2_cli.c
deleted file mode 100644
index 1369c187..00000000
--- a/vnet/vnet/ipsec/ikev2_cli.c
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-#include <vnet/ip/udp.h>
-#include <vnet/ipsec/ikev2.h>
-#include <vnet/ipsec/ikev2_priv.h>
-
-u8 *
-format_ikev2_id_type_and_data (u8 * s, va_list * args)
-{
-  ikev2_id_t *id = va_arg (*args, ikev2_id_t *);
-
-  if (id->type == 0 || vec_len (id->data) == 0)
-    return format (s, "none");
-
-  s = format (s, "%U", format_ikev2_id_type, id->type);
-
-  if (id->type == IKEV2_ID_TYPE_ID_FQDN ||
-      id->type == IKEV2_ID_TYPE_ID_RFC822_ADDR)
-    {
-      s = format (s, " %v", id->data);
-    }
-  else
-    {
-      s =
-	format (s, " %U", format_hex_bytes, &id->data,
-		(uword) (vec_len (id->data)));
-    }
-
-  return s;
-}
-
-
-static clib_error_t *
-show_ikev2_sa_command_fn (vlib_main_t * vm,
-			  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  ikev2_main_t *km = &ikev2_main;
-  ikev2_main_per_thread_data_t *tkm;
-  ikev2_sa_t *sa;
-  ikev2_ts_t *ts;
-  ikev2_child_sa_t *child;
-  ikev2_sa_transform_t *tr;
-
-  vec_foreach (tkm, km->per_thread_data)
-  {
-    /* *INDENT-OFF* */
-    pool_foreach (sa, tkm->sas, ({
-      u8 * s = 0;
-      vlib_cli_output(vm, " iip %U ispi %lx rip %U rspi %lx",
-                      format_ip4_address, &sa->iaddr, sa->ispi,
-                      format_ip4_address, &sa->raddr, sa->rspi);
-
-       tr = ikev2_sa_get_td_for_type(sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
-       s = format(s, "%U ", format_ikev2_sa_transform, tr);
-
-       tr = ikev2_sa_get_td_for_type(sa->r_proposals, IKEV2_TRANSFORM_TYPE_PRF);
-       s = format(s, "%U ", format_ikev2_sa_transform, tr);
-
-       tr = ikev2_sa_get_td_for_type(sa->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
-       s = format(s, "%U ", format_ikev2_sa_transform, tr);
-
-       tr = ikev2_sa_get_td_for_type(sa->r_proposals, IKEV2_TRANSFORM_TYPE_DH);
-       s = format(s, "%U ", format_ikev2_sa_transform, tr);
-
-      vlib_cli_output(vm, " %v", s);
-      vec_free(s);
-
-      vlib_cli_output(vm, "  nonce i:%U\n        r:%U",
-                      format_hex_bytes, sa->i_nonce,  vec_len(sa->i_nonce),
-                      format_hex_bytes, sa->r_nonce,  vec_len(sa->r_nonce));
-
-      vlib_cli_output(vm, "  SK_d    %U",
-                      format_hex_bytes, sa->sk_d,  vec_len(sa->sk_d));
-      vlib_cli_output(vm, "  SK_a  i:%U\n        r:%U",
-                      format_hex_bytes, sa->sk_ai, vec_len(sa->sk_ai),
-                      format_hex_bytes, sa->sk_ar, vec_len(sa->sk_ar));
-      vlib_cli_output(vm, "  SK_e  i:%U\n        r:%U",
-                      format_hex_bytes, sa->sk_ei, vec_len(sa->sk_ei),
-                      format_hex_bytes, sa->sk_er, vec_len(sa->sk_er));
-      vlib_cli_output(vm, "  SK_p  i:%U\n        r:%U",
-                      format_hex_bytes, sa->sk_pi, vec_len(sa->sk_pi),
-                      format_hex_bytes, sa->sk_pr, vec_len(sa->sk_pr));
-
-      vlib_cli_output(vm, "  identifier (i) %U",
-                      format_ikev2_id_type_and_data, &sa->i_id);
-      vlib_cli_output(vm, "  identifier (r) %U",
-                      format_ikev2_id_type_and_data, &sa->r_id);
-
-      vec_foreach(child, sa->childs)
-        {
-          vlib_cli_output(vm, "  child sa %u:", child - sa->childs);
-
-          tr = ikev2_sa_get_td_for_type(child->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
-          s = format(s, "%U ", format_ikev2_sa_transform, tr);
-
-          tr = ikev2_sa_get_td_for_type(child->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
-          s = format(s, "%U ", format_ikev2_sa_transform, tr);
-
-          tr = ikev2_sa_get_td_for_type(child->r_proposals, IKEV2_TRANSFORM_TYPE_ESN);
-          s = format(s, "%U ", format_ikev2_sa_transform, tr);
-
-          vlib_cli_output(vm, "    %v", s);
-          vec_free(s);
-
-          vlib_cli_output(vm, "    spi(i) %lx spi(r) %lx",
-                          child->i_proposals ? child->i_proposals[0].spi : 0,
-                          child->r_proposals ? child->r_proposals[0].spi : 0);
-
-          vlib_cli_output(vm, "    SK_e  i:%U\n          r:%U",
-                          format_hex_bytes, child->sk_ei, vec_len(child->sk_ei),
-                          format_hex_bytes, child->sk_er, vec_len(child->sk_er));
-          vlib_cli_output(vm, "    SK_a  i:%U\n          r:%U",
-                          format_hex_bytes, child->sk_ai, vec_len(child->sk_ai),
-                          format_hex_bytes, child->sk_ar, vec_len(child->sk_ar));
-          vlib_cli_output(vm, "    traffic selectors (i):");
-          vec_foreach(ts, child->tsi)
-            {
-              vlib_cli_output(vm, "      %u type %u protocol_id %u addr "
-                              "%U - %U port %u - %u",
-                              ts - child->tsi,
-                              ts->ts_type, ts->protocol_id,
-                              format_ip4_address, &ts->start_addr,
-                              format_ip4_address, &ts->end_addr,
-                              clib_net_to_host_u16( ts->start_port),
-                              clib_net_to_host_u16( ts->end_port));
-            }
-          vlib_cli_output(vm, "    traffic selectors (r):");
-          vec_foreach(ts, child->tsr)
-            {
-              vlib_cli_output(vm, "      %u type %u protocol_id %u addr "
-                              "%U - %U port %u - %u",
-                              ts - child->tsr,
-                              ts->ts_type, ts->protocol_id,
-                              format_ip4_address, &ts->start_addr,
-                              format_ip4_address, &ts->end_addr,
-                              clib_net_to_host_u16( ts->start_port),
-                              clib_net_to_host_u16( ts->end_port));
-            }
-        }
-      vlib_cli_output(vm, "");
-    }));
-    /* *INDENT-ON* */
-  }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_ikev2_sa_command, static) = {
-    .path = "show ikev2 sa",
-    .short_help = "show ikev2 sa",
-    .function = show_ikev2_sa_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-ikev2_profile_add_del_command_fn (vlib_main_t * vm,
-				  unformat_input_t * input,
-				  vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 *name = 0;
-  clib_error_t *r = 0;
-  u32 id_type;
-  u8 *data = 0;
-  u32 tmp1, tmp2, tmp3;
-  ip4_address_t ip4;
-  ip4_address_t end_addr;
-
-  const char *valid_chars = "a-zA-Z0-9_";
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "add %U", unformat_token, valid_chars, &name))
-	{
-	  r = ikev2_add_del_profile (vm, name, 1);
-	  goto done;
-	}
-      else
-	if (unformat
-	    (line_input, "del %U", unformat_token, valid_chars, &name))
-	{
-	  r = ikev2_add_del_profile (vm, name, 0);
-	  goto done;
-	}
-      else if (unformat (line_input, "set %U auth shared-key-mic string %v",
-			 unformat_token, valid_chars, &name, &data))
-	{
-	  r =
-	    ikev2_set_profile_auth (vm, name,
-				    IKEV2_AUTH_METHOD_SHARED_KEY_MIC, data,
-				    0);
-	  goto done;
-	}
-      else if (unformat (line_input, "set %U auth shared-key-mic hex %U",
-			 unformat_token, valid_chars, &name,
-			 unformat_hex_string, &data))
-	{
-	  r =
-	    ikev2_set_profile_auth (vm, name,
-				    IKEV2_AUTH_METHOD_SHARED_KEY_MIC, data,
-				    1);
-	  goto done;
-	}
-      else if (unformat (line_input, "set %U auth rsa-sig cert-file %v",
-			 unformat_token, valid_chars, &name, &data))
-	{
-	  r =
-	    ikev2_set_profile_auth (vm, name, IKEV2_AUTH_METHOD_RSA_SIG, data,
-				    0);
-	  goto done;
-	}
-      else if (unformat (line_input, "set %U id local %U %U",
-			 unformat_token, valid_chars, &name,
-			 unformat_ikev2_id_type, &id_type,
-			 unformat_ip4_address, &ip4))
-	{
-	  data = vec_new (u8, 4);
-	  clib_memcpy (data, ip4.as_u8, 4);
-	  r =
-	    ikev2_set_profile_id (vm, name, (u8) id_type, data, /*local */ 1);
-	  goto done;
-	}
-      else if (unformat (line_input, "set %U id local %U 0x%U",
-			 unformat_token, valid_chars, &name,
-			 unformat_ikev2_id_type, &id_type,
-			 unformat_hex_string, &data))
-	{
-	  r =
-	    ikev2_set_profile_id (vm, name, (u8) id_type, data, /*local */ 1);
-	  goto done;
-	}
-      else if (unformat (line_input, "set %U id local %U %v",
-			 unformat_token, valid_chars, &name,
-			 unformat_ikev2_id_type, &id_type, &data))
-	{
-	  r =
-	    ikev2_set_profile_id (vm, name, (u8) id_type, data, /*local */ 1);
-	  goto done;
-	}
-      else if (unformat (line_input, "set %U id remote %U %U",
-			 unformat_token, valid_chars, &name,
-			 unformat_ikev2_id_type, &id_type,
-			 unformat_ip4_address, &ip4))
-	{
-	  data = vec_new (u8, 4);
-	  clib_memcpy (data, ip4.as_u8, 4);
-	  r = ikev2_set_profile_id (vm, name, (u8) id_type, data,	/*remote */
-				    0);
-	  goto done;
-	}
-      else if (unformat (line_input, "set %U id remote %U 0x%U",
-			 unformat_token, valid_chars, &name,
-			 unformat_ikev2_id_type, &id_type,
-			 unformat_hex_string, &data))
-	{
-	  r = ikev2_set_profile_id (vm, name, (u8) id_type, data,	/*remote */
-				    0);
-	  goto done;
-	}
-      else if (unformat (line_input, "set %U id remote %U %v",
-			 unformat_token, valid_chars, &name,
-			 unformat_ikev2_id_type, &id_type, &data))
-	{
-	  r = ikev2_set_profile_id (vm, name, (u8) id_type, data,	/*remote */
-				    0);
-	  goto done;
-	}
-      else if (unformat (line_input, "set %U traffic-selector local "
-			 "ip-range %U - %U port-range %u - %u protocol %u",
-			 unformat_token, valid_chars, &name,
-			 unformat_ip4_address, &ip4,
-			 unformat_ip4_address, &end_addr,
-			 &tmp1, &tmp2, &tmp3))
-	{
-	  r =
-	    ikev2_set_profile_ts (vm, name, (u8) tmp3, (u16) tmp1, (u16) tmp2,
-				  ip4, end_addr, /*local */ 1);
-	  goto done;
-	}
-      else if (unformat (line_input, "set %U traffic-selector remote "
-			 "ip-range %U - %U port-range %u - %u protocol %u",
-			 unformat_token, valid_chars, &name,
-			 unformat_ip4_address, &ip4,
-			 unformat_ip4_address, &end_addr,
-			 &tmp1, &tmp2, &tmp3))
-	{
-	  r =
-	    ikev2_set_profile_ts (vm, name, (u8) tmp3, (u16) tmp1, (u16) tmp2,
-				  ip4, end_addr, /*remote */ 0);
-	  goto done;
-	}
-      else
-	break;
-    }
-
-  r = clib_error_return (0, "parse error: '%U'",
-			 format_unformat_error, line_input);
-
-done:
-  vec_free (name);
-  vec_free (data);
-  unformat_free (line_input);
-  return r;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ikev2_profile_add_del_command, static) = {
-    .path = "ikev2 profile",
-    .short_help =
-    "ikev2 profile [add|del] <id>\n"
-    "ikev2 profile set <id> auth [rsa-sig|shared-key-mic] [cert-file|string|hex]"
-    " <data>\n"
-    "ikev2 profile set <id> id <local|remote> <type> <data>\n"
-    "ikev2 profile set <id> traffic-selector <local|remote> ip-range "
-    "<start-addr> - <end-addr> port-range <start-port> - <end-port> "
-    "protocol <protocol-number>",
-    .function = ikev2_profile_add_del_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-show_ikev2_profile_command_fn (vlib_main_t * vm,
-			       unformat_input_t * input,
-			       vlib_cli_command_t * cmd)
-{
-  ikev2_main_t *km = &ikev2_main;
-  ikev2_profile_t *p;
-
-  /* *INDENT-OFF* */
-  pool_foreach (p, km->profiles, ({
-    vlib_cli_output(vm, "profile %v", p->name);
-
-    if (p->auth.data)
-      {
-        if (p->auth.hex)
-          vlib_cli_output(vm, "  auth-method %U auth data 0x%U",
-                          format_ikev2_auth_method, p->auth.method,
-                          format_hex_bytes, p->auth.data, vec_len(p->auth.data));
-        else
-          vlib_cli_output(vm, "  auth-method %U auth data %v",
-                   format_ikev2_auth_method, p->auth.method, p->auth.data);
-      }
-
-    if (p->loc_id.data)
-      {
-        if (p->loc_id.type == IKEV2_ID_TYPE_ID_IPV4_ADDR)
-          vlib_cli_output(vm, "  local id-type %U data %U",
-                          format_ikev2_id_type, p->loc_id.type,
-                          format_ip4_address, p->loc_id.data);
-        else if (p->loc_id.type == IKEV2_ID_TYPE_ID_KEY_ID)
-          vlib_cli_output(vm, "  local id-type %U data 0x%U",
-                          format_ikev2_id_type, p->loc_id.type,
-                          format_hex_bytes, p->loc_id.data,
-                          vec_len(p->loc_id.data));
-        else
-          vlib_cli_output(vm, "  local id-type %U data %v",
-                          format_ikev2_id_type, p->loc_id.type, p->loc_id.data);
-      }
-
-    if (p->rem_id.data)
-      {
-        if (p->rem_id.type == IKEV2_ID_TYPE_ID_IPV4_ADDR)
-          vlib_cli_output(vm, "  remote id-type %U data %U",
-                          format_ikev2_id_type, p->rem_id.type,
-                          format_ip4_address, p->rem_id.data);
-        else if (p->rem_id.type == IKEV2_ID_TYPE_ID_KEY_ID)
-          vlib_cli_output(vm, "  remote id-type %U data 0x%U",
-                          format_ikev2_id_type, p->rem_id.type,
-                          format_hex_bytes, p->rem_id.data,
-                          vec_len(p->rem_id.data));
-        else
-          vlib_cli_output(vm, "  remote id-type %U data %v",
-                          format_ikev2_id_type, p->rem_id.type, p->rem_id.data);
-      }
-
-    if (p->loc_ts.end_addr.as_u32)
-      vlib_cli_output(vm, "  local traffic-selector addr %U - %U port %u - %u"
-                      " protocol %u",
-                      format_ip4_address, &p->loc_ts.start_addr,
-                      format_ip4_address, &p->loc_ts.end_addr,
-                      p->loc_ts.start_port, p->loc_ts.end_port,
-                      p->loc_ts.protocol_id);
-
-    if (p->rem_ts.end_addr.as_u32)
-      vlib_cli_output(vm, "  remote traffic-selector addr %U - %U port %u - %u"
-                      " protocol %u",
-                      format_ip4_address, &p->rem_ts.start_addr,
-                      format_ip4_address, &p->rem_ts.end_addr,
-                      p->rem_ts.start_port, p->rem_ts.end_port,
-                      p->rem_ts.protocol_id);
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_ikev2_profile_command, static) = {
-    .path = "show ikev2 profile",
-    .short_help = "show ikev2 profile",
-    .function = show_ikev2_profile_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_ikev2_local_key_command_fn (vlib_main_t * vm,
-				unformat_input_t * input,
-				vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  clib_error_t *r = 0;
-  u8 *data = 0;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "%s", &data))
-	{
-	  r = ikev2_set_local_key (vm, data);
-	  goto done;
-	}
-      else
-	break;
-    }
-
-  r = clib_error_return (0, "parse error: '%U'",
-			 format_unformat_error, line_input);
-
-done:
-  vec_free (data);
-  unformat_free (line_input);
-  return r;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_ikev2_local_key_command, static) = {
-    .path = "set ikev2 local key",
-    .short_help =
-    "set ikev2 local key <file>",
-    .function = set_ikev2_local_key_command_fn,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-ikev2_cli_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ikev2_cli_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ikev2_crypto.c b/vnet/vnet/ipsec/ikev2_crypto.c
deleted file mode 100644
index 32927629..00000000
--- a/vnet/vnet/ipsec/ikev2_crypto.c
+++ /dev/null
@@ -1,765 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-#include <vnet/ip/udp.h>
-#include <vnet/ipsec/ikev2.h>
-#include <vnet/ipsec/ikev2_priv.h>
-#include <openssl/obj_mac.h>
-#include <openssl/ec.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/bn.h>
-
-/* from RFC7296 */
-static const char modp_dh_768_prime[] =
-  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
-  "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
-  "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
-  "E485B576625E7EC6F44C42E9A63A3620FFFFFFFFFFFFFFFF";
-static const char modp_dh_768_generator[] = "02";
-
-static const char modp_dh_1024_prime[] =
-  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
-  "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
-  "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
-  "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
-  "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381" "FFFFFFFFFFFFFFFF";
-static const char modp_dh_1024_generator[] = "02";
-
-/* from RFC3526 */
-static const char modp_dh_1536_prime[] =
-  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
-  "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
-  "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
-  "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
-  "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
-  "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F"
-  "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-  "670C354E4ABC9804F1746C08CA237327FFFFFFFFFFFFFFFF";
-static const char modp_dh_1536_generator[] = "02";
-
-static const char modp_dh_2048_prime[] =
-  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
-  "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
-  "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
-  "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
-  "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
-  "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F"
-  "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-  "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B"
-  "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9"
-  "DE2BCBF6955817183995497CEA956AE515D2261898FA0510"
-  "15728E5A8AACAA68FFFFFFFFFFFFFFFF";
-static const char modp_dh_2048_generator[] = "02";
-
-static const char modp_dh_3072_prime[] =
-  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
-  "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
-  "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
-  "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
-  "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
-  "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F"
-  "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-  "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B"
-  "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9"
-  "DE2BCBF6955817183995497CEA956AE515D2261898FA0510"
-  "15728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64"
-  "ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7"
-  "ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6B"
-  "F12FFA06D98A0864D87602733EC86A64521F2B18177B200C"
-  "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB31"
-  "43DB5BFCE0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF";
-static const char modp_dh_3072_generator[] = "02";
-
-static const char modp_dh_4096_prime[] =
-  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
-  "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
-  "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
-  "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
-  "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
-  "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F"
-  "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-  "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B"
-  "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9"
-  "DE2BCBF6955817183995497CEA956AE515D2261898FA0510"
-  "15728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64"
-  "ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7"
-  "ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6B"
-  "F12FFA06D98A0864D87602733EC86A64521F2B18177B200C"
-  "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB31"
-  "43DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7"
-  "88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA"
-  "2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6"
-  "287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED"
-  "1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9"
-  "93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199" "FFFFFFFFFFFFFFFF";
-static const char modp_dh_4096_generator[] = "02";
-
-static const char modp_dh_6144_prime[] =
-  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08"
-  "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B"
-  "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9"
-  "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6"
-  "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8"
-  "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-  "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C"
-  "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718"
-  "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D"
-  "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D"
-  "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226"
-  "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C"
-  "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC"
-  "E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26"
-  "99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB"
-  "04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2"
-  "233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127"
-  "D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934028492"
-  "36C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BDF8FF9406"
-  "AD9E530EE5DB382F413001AEB06A53ED9027D831179727B0865A8918"
-  "DA3EDBEBCF9B14ED44CE6CBACED4BB1BDB7F1447E6CC254B33205151"
-  "2BD7AF426FB8F401378CD2BF5983CA01C64B92ECF032EA15D1721D03"
-  "F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E59E7C97F"
-  "BEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA"
-  "CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58B"
-  "B7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632"
-  "387FE8D76E3C0468043E8F663F4860EE12BF2D5B0B7474D6E694F91E"
-  "6DCC4024FFFFFFFFFFFFFFFF";
-static const char modp_dh_6144_generator[] = "02";
-
-static const char modp_dh_8192_prime[] =
-  "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
-  "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
-  "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
-  "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
-  "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
-  "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F"
-  "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-  "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B"
-  "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9"
-  "DE2BCBF6955817183995497CEA956AE515D2261898FA0510"
-  "15728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64"
-  "ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7"
-  "ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6B"
-  "F12FFA06D98A0864D87602733EC86A64521F2B18177B200C"
-  "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB31"
-  "43DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7"
-  "88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA"
-  "2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6"
-  "287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED"
-  "1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9"
-  "93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934028492"
-  "36C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BD"
-  "F8FF9406AD9E530EE5DB382F413001AEB06A53ED9027D831"
-  "179727B0865A8918DA3EDBEBCF9B14ED44CE6CBACED4BB1B"
-  "DB7F1447E6CC254B332051512BD7AF426FB8F401378CD2BF"
-  "5983CA01C64B92ECF032EA15D1721D03F482D7CE6E74FEF6"
-  "D55E702F46980C82B5A84031900B1C9E59E7C97FBEC7E8F3"
-  "23A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA"
-  "CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE328"
-  "06A1D58BB7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55C"
-  "DA56C9EC2EF29632387FE8D76E3C0468043E8F663F4860EE"
-  "12BF2D5B0B7474D6E694F91E6DBE115974A3926F12FEE5E4"
-  "38777CB6A932DF8CD8BEC4D073B931BA3BC832B68D9DD300"
-  "741FA7BF8AFC47ED2576F6936BA424663AAB639C5AE4F568"
-  "3423B4742BF1C978238F16CBE39D652DE3FDB8BEFC848AD9"
-  "22222E04A4037C0713EB57A81A23F0C73473FC646CEA306B"
-  "4BCBC8862F8385DDFA9D4B7FA2C087E879683303ED5BDD3A"
-  "062B3CF5B3A278A66D2A13F83F44F82DDF310EE074AB6A36"
-  "4597E899A0255DC164F31CC50846851DF9AB48195DED7EA1"
-  "B1D510BD7EE74D73FAF36BC31ECFA268359046F4EB879F92"
-  "4009438B481C6CD7889A002ED5EE382BC9190DA6FC026E47"
-  "9558E4475677E9AA9E3050E2765694DFC81F56E880B96E71"
-  "60C980DD98EDD3DFFFFFFFFFFFFFFFFF";
-static const char modp_dh_8192_generator[] = "02";
-
-/* from RFC5114 */
-static const char modp_dh_1024_160_prime[] =
-  "B10B8F96A080E01DDE92DE5EAE5D54EC52C99FBCFB06A3C6"
-  "9A6A9DCA52D23B616073E28675A23D189838EF1E2EE652C0"
-  "13ECB4AEA906112324975C3CD49B83BFACCBDD7D90C4BD70"
-  "98488E9C219A73724EFFD6FAE5644738FAA31A4FF55BCCC0"
-  "A151AF5F0DC8B4BD45BF37DF365C1A65E68CFDA76D4DA708" "DF1FB2BC2E4A4371";
-static const char modp_dh_1024_160_generator[] =
-  "A4D1CBD5C3FD34126765A442EFB99905F8104DD258AC507F"
-  "D6406CFF14266D31266FEA1E5C41564B777E690F5504F213"
-  "160217B4B01B886A5E91547F9E2749F4D7FBD7D3B9A92EE1"
-  "909D0D2263F80A76A6A24C087A091F531DBF0A0169B6A28A"
-  "D662A4D18E73AFA32D779D5918D08BC8858F4DCEF97C2A24" "855E6EEB22B3B2E5";
-
-static const char modp_dh_2048_224_prime[] =
-  "AD107E1E9123A9D0D660FAA79559C51FA20D64E5683B9FD1"
-  "B54B1597B61D0A75E6FA141DF95A56DBAF9A3C407BA1DF15"
-  "EB3D688A309C180E1DE6B85A1274A0A66D3F8152AD6AC212"
-  "9037C9EDEFDA4DF8D91E8FEF55B7394B7AD5B7D0B6C12207"
-  "C9F98D11ED34DBF6C6BA0B2C8BBC27BE6A00E0A0B9C49708"
-  "B3BF8A317091883681286130BC8985DB1602E714415D9330"
-  "278273C7DE31EFDC7310F7121FD5A07415987D9ADC0A486D"
-  "CDF93ACC44328387315D75E198C641A480CD86A1B9E587E8"
-  "BE60E69CC928B2B9C52172E413042E9B23F10B0E16E79763"
-  "C9B53DCF4BA80A29E3FB73C16B8E75B97EF363E2FFA31F71"
-  "CF9DE5384E71B81C0AC4DFFE0C10E64F";
-static const char modp_dh_2048_224_generator[] =
-  "AC4032EF4F2D9AE39DF30B5C8FFDAC506CDEBE7B89998CAF"
-  "74866A08CFE4FFE3A6824A4E10B9A6F0DD921F01A70C4AFA"
-  "AB739D7700C29F52C57DB17C620A8652BE5E9001A8D66AD7"
-  "C17669101999024AF4D027275AC1348BB8A762D0521BC98A"
-  "E247150422EA1ED409939D54DA7460CDB5F6C6B250717CBE"
-  "F180EB34118E98D119529A45D6F834566E3025E316A330EF"
-  "BB77A86F0C1AB15B051AE3D428C8F8ACB70A8137150B8EEB"
-  "10E183EDD19963DDD9E263E4770589EF6AA21E7F5F2FF381"
-  "B539CCE3409D13CD566AFBB48D6C019181E1BCFE94B30269"
-  "EDFE72FE9B6AA4BD7B5A0F1C71CFFF4C19C418E1F6EC0179"
-  "81BC087F2A7065B384B890D3191F2BFA";
-
-static const char modp_dh_2048_256_prime[] =
-  "87A8E61DB4B6663CFFBBD19C651959998CEEF608660DD0F2"
-  "5D2CEED4435E3B00E00DF8F1D61957D4FAF7DF4561B2AA30"
-  "16C3D91134096FAA3BF4296D830E9A7C209E0C6497517ABD"
-  "5A8A9D306BCF67ED91F9E6725B4758C022E0B1EF4275BF7B"
-  "6C5BFC11D45F9088B941F54EB1E59BB8BC39A0BF12307F5C"
-  "4FDB70C581B23F76B63ACAE1CAA6B7902D52526735488A0E"
-  "F13C6D9A51BFA4AB3AD8347796524D8EF6A167B5A41825D9"
-  "67E144E5140564251CCACB83E6B486F6B3CA3F7971506026"
-  "C0B857F689962856DED4010ABD0BE621C3A3960A54E710C3"
-  "75F26375D7014103A4B54330C198AF126116D2276E11715F"
-  "693877FAD7EF09CADB094AE91E1A1597";
-static const char modp_dh_2048_256_generator[] =
-  "3FB32C9B73134D0B2E77506660EDBD484CA7B18F21EF2054"
-  "07F4793A1A0BA12510DBC15077BE463FFF4FED4AAC0BB555"
-  "BE3A6C1B0C6B47B1BC3773BF7E8C6F62901228F8C28CBB18"
-  "A55AE31341000A650196F931C77A57F2DDF463E5E9EC144B"
-  "777DE62AAAB8A8628AC376D282D6ED3864E67982428EBC83"
-  "1D14348F6F2F9193B5045AF2767164E1DFC967C1FB3F2E55"
-  "A4BD1BFFE83B9C80D052B985D182EA0ADB2A3B7313D3FE14"
-  "C8484B1E052588B9B7D2BBD2DF016199ECD06E1557CD0915"
-  "B3353BBB64E0EC377FD028370DF92B52C7891428CDC67EB6"
-  "184B523D1DB246C32F63078490F00EF8D647D148D4795451"
-  "5E2327CFEF98C582664B4C0F6CC41659";
-
-v8 *
-ikev2_calc_prf (ikev2_sa_transform_t * tr, v8 * key, v8 * data)
-{
-  HMAC_CTX ctx;
-  v8 *prf;
-  unsigned int len = 0;
-
-  prf = vec_new (u8, tr->key_trunc);
-  HMAC_CTX_init (&ctx);
-  HMAC_Init_ex (&ctx, key, vec_len (key), tr->md, NULL);
-  HMAC_Update (&ctx, data, vec_len (data));
-  HMAC_Final (&ctx, prf, &len);
-  HMAC_CTX_cleanup (&ctx);
-
-  ASSERT (len == tr->key_trunc);
-
-  return prf;
-}
-
-u8 *
-ikev2_calc_prfplus (ikev2_sa_transform_t * tr, u8 * key, u8 * seed, int len)
-{
-  v8 *t = 0, *s = 0, *tmp = 0, *ret = 0;
-  u8 x = 0;
-
-  /* prf+ (K,S) = T1 | T2 | T3 | T4 | ...
-
-     where:
-     T1 = prf (K, S | 0x01)
-     T2 = prf (K, T1 | S | 0x02)
-     T3 = prf (K, T2 | S | 0x03)
-     T4 = prf (K, T3 | S | 0x04)
-   */
-
-  while (vec_len (ret) < len && x < 255)
-    {
-      if (t)
-	{
-	  vec_append (s, t);
-	  vec_free (t);
-	}
-
-      vec_append (s, seed);
-      vec_add2 (s, tmp, 1);
-      *tmp = x + 1;
-      t = ikev2_calc_prf (tr, key, s);
-      vec_append (ret, t);
-      vec_free (s);
-      x++;
-    }
-
-  vec_free (t);
-
-  if (x == 255)
-    {
-      vec_free (ret);
-    }
-
-  return ret;
-}
-
-v8 *
-ikev2_calc_integr (ikev2_sa_transform_t * tr, v8 * key, u8 * data, int len)
-{
-  v8 *r;
-  HMAC_CTX hctx;
-  unsigned int l;
-
-  ASSERT (tr->type == IKEV2_TRANSFORM_TYPE_INTEG);
-
-  r = vec_new (u8, tr->key_len);
-
-  /* verify integrity of data */
-  HMAC_CTX_init (&hctx);
-  HMAC_Init (&hctx, key, vec_len (key), tr->md);
-  HMAC_Update (&hctx, (const u8 *) data, len);
-  HMAC_Final (&hctx, r, &l);
-  HMAC_CTX_cleanup (&hctx);
-
-  ASSERT (l == tr->key_len);
-
-  return r;
-}
-
-v8 *
-ikev2_decrypt_data (ikev2_sa_t * sa, u8 * data, int len)
-{
-  EVP_CIPHER_CTX ctx;
-  v8 *r;
-  int out_len = 0, block_size;
-  ikev2_sa_transform_t *tr_encr;
-
-  tr_encr =
-    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
-  block_size = tr_encr->block_size;
-
-  /* check if data is multiplier of cipher block size */
-  if (len % block_size)
-    {
-      clib_warning ("wrong data length");
-      return 0;
-    }
-
-  EVP_CIPHER_CTX_init (&ctx);
-  r = vec_new (u8, len - block_size);
-  EVP_DecryptInit_ex (&ctx, tr_encr->cipher, NULL, sa->sk_ei, data);
-  EVP_DecryptUpdate (&ctx, r, &out_len, data + block_size, len - block_size);
-  EVP_DecryptFinal_ex (&ctx, r + out_len, &out_len);
-
-  /* remove padding */
-  _vec_len (r) -= r[vec_len (r) - 1] + 1;
-
-  EVP_CIPHER_CTX_cleanup (&ctx);
-  return r;
-}
-
-int
-ikev2_encrypt_data (ikev2_sa_t * sa, v8 * src, u8 * dst)
-{
-  EVP_CIPHER_CTX ctx;
-  int out_len;
-  int bs;
-  ikev2_sa_transform_t *tr_encr;
-
-  tr_encr =
-    ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
-  bs = tr_encr->block_size;
-
-  /* generate IV */
-  RAND_bytes (dst, bs);
-
-  EVP_CIPHER_CTX_init (&ctx);
-
-  EVP_EncryptInit_ex (&ctx, tr_encr->cipher, NULL, sa->sk_er, dst /* dst */ );
-  EVP_EncryptUpdate (&ctx, dst + bs, &out_len, src, vec_len (src));
-
-  EVP_CIPHER_CTX_cleanup (&ctx);
-
-  ASSERT (vec_len (src) == out_len);
-
-  return out_len + bs;
-}
-
-void
-ikev2_generate_dh (ikev2_sa_t * sa, ikev2_sa_transform_t * t)
-{
-  int r;
-
-  if (t->dh_group == IKEV2_DH_GROUP_MODP)
-    {
-      DH *dh = DH_new ();
-      BN_hex2bn (&dh->p, t->dh_p);
-      BN_hex2bn (&dh->g, t->dh_g);
-      DH_generate_key (dh);
-
-      sa->r_dh_data = vec_new (u8, t->key_len);
-      r = BN_bn2bin (dh->pub_key, sa->r_dh_data);
-      ASSERT (r == t->key_len);
-
-      BIGNUM *ex;
-      sa->dh_shared_key = vec_new (u8, t->key_len);
-      ex = BN_bin2bn (sa->i_dh_data, vec_len (sa->i_dh_data), NULL);
-      r = DH_compute_key (sa->dh_shared_key, ex, dh);
-      ASSERT (r == t->key_len);
-      BN_clear_free (ex);
-      DH_free (dh);
-    }
-  else if (t->dh_group == IKEV2_DH_GROUP_ECP)
-    {
-      EC_KEY *ec = EC_KEY_new_by_curve_name (t->nid);
-      ASSERT (ec);
-
-      EC_KEY_generate_key (ec);
-
-      const EC_POINT *r_point = EC_KEY_get0_public_key (ec);
-      const EC_GROUP *group = EC_KEY_get0_group (ec);
-      BIGNUM *x = NULL, *y = NULL;
-      BN_CTX *bn_ctx = BN_CTX_new ();
-      u16 x_off, y_off, len;
-      EC_POINT *i_point = EC_POINT_new (group);
-      EC_POINT *shared_point = EC_POINT_new (group);
-
-      x = BN_new ();
-      y = BN_new ();
-      len = t->key_len / 2;
-
-      EC_POINT_get_affine_coordinates_GFp (group, r_point, x, y, bn_ctx);
-      sa->r_dh_data = vec_new (u8, t->key_len);
-      x_off = len - BN_num_bytes (x);
-      memset (sa->r_dh_data, 0, x_off);
-      BN_bn2bin (x, sa->r_dh_data + x_off);
-      y_off = t->key_len - BN_num_bytes (y);
-      memset (sa->r_dh_data + len, 0, y_off - len);
-      BN_bn2bin (y, sa->r_dh_data + y_off);
-
-      x = BN_bin2bn (sa->i_dh_data, len, x);
-      y = BN_bin2bn (sa->i_dh_data + len, len, y);
-      EC_POINT_set_affine_coordinates_GFp (group, i_point, x, y, bn_ctx);
-      sa->dh_shared_key = vec_new (u8, t->key_len);
-      EC_POINT_mul (group, shared_point, NULL, i_point,
-		    EC_KEY_get0_private_key (ec), NULL);
-      EC_POINT_get_affine_coordinates_GFp (group, shared_point, x, y, bn_ctx);
-      x_off = len - BN_num_bytes (x);
-      memset (sa->dh_shared_key, 0, x_off);
-      BN_bn2bin (x, sa->dh_shared_key + x_off);
-      y_off = t->key_len - BN_num_bytes (y);
-      memset (sa->dh_shared_key + len, 0, y_off - len);
-      BN_bn2bin (y, sa->dh_shared_key + y_off);
-
-      EC_KEY_free (ec);
-      BN_free (x);
-      BN_free (y);
-      BN_CTX_free (bn_ctx);
-      EC_POINT_free (i_point);
-      EC_POINT_free (shared_point);
-    }
-}
-
-int
-ikev2_verify_sign (EVP_PKEY * pkey, u8 * sigbuf, u8 * data)
-{
-  EVP_MD_CTX md_ctx;
-
-  EVP_VerifyInit (&md_ctx, EVP_sha1 ());
-  EVP_VerifyUpdate (&md_ctx, data, vec_len (data));
-
-  return EVP_VerifyFinal (&md_ctx, sigbuf, vec_len (sigbuf), pkey);
-}
-
-u8 *
-ikev2_calc_sign (EVP_PKEY * pkey, u8 * data)
-{
-  EVP_MD_CTX md_ctx;
-  unsigned int sig_len = 0;
-  u8 *sign;
-
-  EVP_SignInit (&md_ctx, EVP_sha1 ());
-  EVP_SignUpdate (&md_ctx, data, vec_len (data));
-  /* get sign len */
-  EVP_SignFinal (&md_ctx, NULL, &sig_len, pkey);
-  sign = vec_new (u8, sig_len);
-  /* calc sign */
-  EVP_SignFinal (&md_ctx, sign, &sig_len, pkey);
-
-  return sign;
-}
-
-EVP_PKEY *
-ikev2_load_cert_file (u8 * file)
-{
-  FILE *fp;
-  X509 *x509;
-  EVP_PKEY *pkey = NULL;
-
-  fp = fopen ((char *) file, "r");
-  if (!fp)
-    {
-      clib_warning ("open %s failed", file);
-      goto end;
-    }
-
-  x509 = PEM_read_X509 (fp, NULL, NULL, NULL);
-  fclose (fp);
-  if (x509 == NULL)
-    {
-      clib_warning ("read cert %s failed", file);
-      goto end;
-    }
-
-  pkey = X509_get_pubkey (x509);
-  if (pkey == NULL)
-    clib_warning ("get pubkey %s failed", file);
-
-end:
-  return pkey;
-}
-
-EVP_PKEY *
-ikev2_load_key_file (u8 * file)
-{
-  FILE *fp;
-  EVP_PKEY *pkey = NULL;
-
-  fp = fopen ((char *) file, "r");
-  if (!fp)
-    {
-      clib_warning ("open %s failed", file);
-      goto end;
-    }
-
-  pkey = PEM_read_PrivateKey (fp, NULL, NULL, NULL);
-  fclose (fp);
-  if (pkey == NULL)
-    clib_warning ("read %s failed", file);
-
-end:
-  return pkey;
-}
-
-void
-ikev2_crypto_init (ikev2_main_t * km)
-{
-  ikev2_sa_transform_t *tr;
-
-  /* vector of supported transforms - in order of preference */
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_ENCR;
-  tr->encr_type = IKEV2_TRANSFORM_ENCR_TYPE_AES_CBC;
-  tr->key_len = 256 / 8;
-  tr->block_size = 128 / 8;
-  tr->cipher = EVP_aes_256_cbc ();
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_ENCR;
-  tr->encr_type = IKEV2_TRANSFORM_ENCR_TYPE_AES_CBC;
-  tr->key_len = 192 / 8;
-  tr->block_size = 128 / 8;
-  tr->cipher = EVP_aes_192_cbc ();
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_ENCR;
-  tr->encr_type = IKEV2_TRANSFORM_ENCR_TYPE_AES_CBC;
-  tr->key_len = 128 / 8;
-  tr->block_size = 128 / 8;
-  tr->cipher = EVP_aes_128_cbc ();
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_PRF;
-  tr->prf_type = IKEV2_TRANSFORM_PRF_TYPE_PRF_HMAC_SHA1;
-  tr->key_len = 160 / 8;
-  tr->key_trunc = 160 / 8;
-  tr->md = EVP_sha1 ();
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_INTEG;
-  tr->integ_type = IKEV2_TRANSFORM_INTEG_TYPE_AUTH_HMAC_SHA1_96;
-  tr->key_len = 160 / 8;
-  tr->key_trunc = 96 / 8;
-  tr->md = EVP_sha1 ();
-
-#if defined(OPENSSL_NO_CISCO_FECDH)
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_BRAINPOOL_512;
-  tr->key_len = (512 * 2) / 8;
-  tr->nid = NID_brainpoolP512r1;
-  tr->dh_group = IKEV2_DH_GROUP_ECP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_BRAINPOOL_384;
-  tr->key_len = (384 * 2) / 8;
-  tr->nid = NID_brainpoolP384r1;
-  tr->dh_group = IKEV2_DH_GROUP_ECP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_BRAINPOOL_256;
-  tr->key_len = (256 * 2) / 8;
-  tr->nid = NID_brainpoolP256r1;
-  tr->dh_group = IKEV2_DH_GROUP_ECP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_BRAINPOOL_224;
-  tr->key_len = (224 * 2) / 8;
-  tr->nid = NID_brainpoolP224r1;
-  tr->dh_group = IKEV2_DH_GROUP_ECP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_ECP_224;
-  tr->key_len = (224 * 2) / 8;
-  tr->nid = NID_secp224r1;
-  tr->dh_group = IKEV2_DH_GROUP_ECP;
-#endif
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_ECP_521;
-  tr->key_len = (528 * 2) / 8;
-  tr->nid = NID_secp521r1;
-  tr->dh_group = IKEV2_DH_GROUP_ECP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_ECP_384;
-  tr->key_len = (384 * 2) / 8;
-  tr->nid = NID_secp384r1;
-  tr->dh_group = IKEV2_DH_GROUP_ECP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_ECP_256;
-  tr->key_len = (256 * 2) / 8;
-  tr->nid = NID_X9_62_prime256v1;
-  tr->dh_group = IKEV2_DH_GROUP_ECP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_ECP_192;
-  tr->key_len = (192 * 2) / 8;
-  tr->nid = NID_X9_62_prime192v1;
-  tr->dh_group = IKEV2_DH_GROUP_ECP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_2048_256;
-  tr->key_len = 2048 / 8;
-  tr->dh_p = (const char *) &modp_dh_2048_256_prime;
-  tr->dh_g = (const char *) &modp_dh_2048_256_generator;
-  tr->dh_group = IKEV2_DH_GROUP_MODP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_2048_224;
-  tr->key_len = 2048 / 8;
-  tr->dh_p = (const char *) &modp_dh_2048_224_prime;
-  tr->dh_g = (const char *) &modp_dh_2048_224_generator;
-  tr->dh_group = IKEV2_DH_GROUP_MODP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_1024_160;
-  tr->key_len = 1024 / 8;
-  tr->dh_p = (const char *) &modp_dh_1024_160_prime;
-  tr->dh_g = (const char *) &modp_dh_1024_160_generator;
-  tr->dh_group = IKEV2_DH_GROUP_MODP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_8192;
-  tr->key_len = 8192 / 8;
-  tr->dh_p = (const char *) &modp_dh_8192_prime;
-  tr->dh_g = (const char *) &modp_dh_8192_generator;
-  tr->dh_group = IKEV2_DH_GROUP_MODP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_6144;
-  tr->key_len = 6144 / 8;
-  tr->dh_p = (const char *) &modp_dh_6144_prime;
-  tr->dh_g = (const char *) &modp_dh_6144_generator;
-  tr->dh_group = IKEV2_DH_GROUP_MODP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_4096;
-  tr->key_len = 4096 / 8;
-  tr->dh_p = (const char *) &modp_dh_4096_prime;
-  tr->dh_g = (const char *) &modp_dh_4096_generator;
-  tr->dh_group = IKEV2_DH_GROUP_MODP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_3072;
-  tr->key_len = 3072 / 8;
-  tr->dh_p = (const char *) &modp_dh_3072_prime;
-  tr->dh_g = (const char *) &modp_dh_3072_generator;
-  tr->dh_group = IKEV2_DH_GROUP_MODP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_2048;
-  tr->key_len = 2048 / 8;
-  tr->dh_p = (const char *) &modp_dh_2048_prime;
-  tr->dh_g = (const char *) &modp_dh_2048_generator;
-  tr->dh_group = IKEV2_DH_GROUP_MODP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_1536;
-  tr->key_len = 1536 / 8;
-  tr->dh_p = (const char *) &modp_dh_1536_prime;
-  tr->dh_g = (const char *) &modp_dh_1536_generator;
-  tr->dh_group = IKEV2_DH_GROUP_MODP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_1024;
-  tr->key_len = 1024 / 8;
-  tr->dh_p = (const char *) &modp_dh_1024_prime;
-  tr->dh_g = (const char *) &modp_dh_1024_generator;
-  tr->dh_group = IKEV2_DH_GROUP_MODP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_DH;
-  tr->dh_type = IKEV2_TRANSFORM_DH_TYPE_MODP_768;
-  tr->key_len = 768 / 8;
-  tr->dh_p = (const char *) &modp_dh_768_prime;
-  tr->dh_g = (const char *) &modp_dh_768_generator;
-  tr->dh_group = IKEV2_DH_GROUP_MODP;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_ESN;
-  tr->esn_type = IKEV2_TRANSFORM_ESN_TYPE_ESN;
-
-  vec_add2 (km->supported_transforms, tr, 1);
-  tr->type = IKEV2_TRANSFORM_TYPE_ESN;
-  tr->esn_type = IKEV2_TRANSFORM_ESN_TYPE_NO_ESN;
-}
-
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ikev2_format.c b/vnet/vnet/ipsec/ikev2_format.c
deleted file mode 100644
index 4d7a007f..00000000
--- a/vnet/vnet/ipsec/ikev2_format.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-#include <vnet/interface.h>
-
-#include <vnet/ipsec/ipsec.h>
-#include <vnet/ipsec/ikev2.h>
-#include <vnet/ipsec/ikev2_priv.h>
-
-u8 *
-format_ikev2_sa_transform (u8 * s, va_list * args)
-{
-  ikev2_sa_transform_t *tr = va_arg (*args, ikev2_sa_transform_t *);
-
-  if (!tr)
-    return s;
-
-  if (tr->type >= IKEV2_TRANSFORM_NUM_TYPES)
-    return s;
-
-  s = format (s, "%U:", format_ikev2_transform_type, tr->type);
-
-  switch (tr->type)
-    {
-    case IKEV2_TRANSFORM_TYPE_ENCR:
-      s = format (s, "%U", format_ikev2_transform_encr_type, tr->encr_type);
-      break;
-    case IKEV2_TRANSFORM_TYPE_PRF:
-      s = format (s, "%U", format_ikev2_transform_prf_type, tr->prf_type);
-      break;
-    case IKEV2_TRANSFORM_TYPE_INTEG:
-      s = format (s, "%U", format_ikev2_transform_integ_type, tr->integ_type);
-      break;
-    case IKEV2_TRANSFORM_TYPE_DH:
-      s = format (s, "%U", format_ikev2_transform_dh_type, tr->dh_type);
-      break;
-    case IKEV2_TRANSFORM_TYPE_ESN:
-      s = format (s, "%U", format_ikev2_transform_esn_type, tr->esn_type);
-      break;
-    default:
-      break;
-    }
-
-  if (tr->type == IKEV2_TRANSFORM_TYPE_ENCR &&
-      tr->encr_type == IKEV2_TRANSFORM_ENCR_TYPE_AES_CBC && tr->key_len)
-    s = format (s, "-%u", tr->key_len * 8);
-  else if (vec_len (tr->attrs) == 4 && tr->attrs[0] == 0x80
-	   && tr->attrs[1] == 0x0e)
-    s = format (s, "-%u", tr->attrs[2] * 256 + tr->attrs[3]);
-  else if (vec_len (tr->attrs))
-    s = format (s, "(unknown attr %U)", format_hex_bytes,
-		tr->attrs, vec_len (tr->attrs));
-
-  return s;
-}
-
-#define MACRO_FORMAT(lc)                                \
-u8 * format_ikev2_##lc (u8 * s, va_list * args)         \
-{                                                       \
-  u32 i = va_arg (*args, u32);                          \
-  char * t = 0;                                         \
-  switch (i) {                                          \
-        foreach_ikev2_##lc                              \
-      default:                                          \
-        return format (s, "unknown (%u)", i);           \
-    }                                                   \
-  s = format (s, "%s", t);                              \
-  return s;                                             \
-}
-
-#define MACRO_UNFORMAT(lc)                              \
-uword                                                   \
-unformat_ikev2_##lc (unformat_input_t * input,          \
-                     va_list * args)                    \
-{                                                       \
-  u32 * r = va_arg (*args, u32 *);                      \
-  if (0) ;                                              \
-  foreach_ikev2_##lc                                    \
-  else                                                  \
-    return 0;                                           \
-  return 1;                                             \
-}
-
-#define _(v,f,str) case IKEV2_AUTH_METHOD_##f: t = str; break;
-MACRO_FORMAT (auth_method)
-#undef _
-#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_AUTH_METHOD_##f;
-  MACRO_UNFORMAT (auth_method)
-#undef _
-#define _(v,f,str) case IKEV2_TRANSFORM_TYPE_##f: t = str; break;
-  MACRO_FORMAT (transform_type)
-#undef _
-#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_TRANSFORM_TYPE_##f;
-  MACRO_UNFORMAT (transform_type)
-#undef _
-#define _(v,f) case IKEV2_NOTIFY_MSG_##f: t = #f; break;
-  MACRO_FORMAT (notify_msg_type)
-#undef _
-#define _(v,f,str) case IKEV2_ID_TYPE_##f: t = str; break;
-  MACRO_FORMAT (id_type)
-#undef _
-#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_ID_TYPE_##f;
-  MACRO_UNFORMAT (id_type)
-#undef _
-#define _(v,f,str) case IKEV2_TRANSFORM_ENCR_TYPE_##f: t = str; break;
-  MACRO_FORMAT (transform_encr_type)
-#undef _
-#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_TRANSFORM_ENCR_TYPE_##f;
-  MACRO_UNFORMAT (transform_encr_type)
-#undef _
-#define _(v,f,str) case IKEV2_TRANSFORM_PRF_TYPE_##f: t = str; break;
-  MACRO_FORMAT (transform_prf_type)
-#undef _
-#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_TRANSFORM_PRF_TYPE_##f;
-  MACRO_UNFORMAT (transform_prf_type)
-#undef _
-#define _(v,f,str) case IKEV2_TRANSFORM_INTEG_TYPE_##f: t = str; break;
-  MACRO_FORMAT (transform_integ_type)
-#undef _
-#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_TRANSFORM_INTEG_TYPE_##f;
-  MACRO_UNFORMAT (transform_integ_type)
-#undef _
-#define _(v,f,str) case IKEV2_TRANSFORM_DH_TYPE_##f: t = str; break;
-  MACRO_FORMAT (transform_dh_type)
-#undef _
-#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_TRANSFORM_DH_TYPE_##f;
-  MACRO_UNFORMAT (transform_dh_type)
-#undef _
-#define _(v,f,str) case IKEV2_TRANSFORM_ESN_TYPE_##f: t = str; break;
-  MACRO_FORMAT (transform_esn_type)
-#undef _
-#define _(v,f,str) else if (unformat (input, str)) *r = IKEV2_TRANSFORM_ESN_TYPE_##f;
-  MACRO_UNFORMAT (transform_esn_type)
-#undef _
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ikev2_payload.c b/vnet/vnet/ipsec/ikev2_payload.c
deleted file mode 100644
index dd14812b..00000000
--- a/vnet/vnet/ipsec/ikev2_payload.c
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <ctype.h>
-
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-#include <vnet/interface.h>
-
-#include <vnet/ipsec/ipsec.h>
-#include <vnet/ipsec/ikev2.h>
-#include <vnet/ipsec/ikev2_priv.h>
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     u8 nextpayload;
-		     u8 flags;
-		     u16 length;
-		     u8 protocol_id;
-		     u8 spi_size;
-		     u16 msg_type;
-		     u8 payload[0];}) ike_notify_payload_header_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     u8 ts_type;
-		     u8 protocol_id;
-		     u16 selector_len;
-		     u16 start_port;
-		     u16 end_port;
-		     ip4_address_t start_addr;
-		     ip4_address_t end_addr;}) ikev2_ts_payload_entry_t;
-/* *INDENT-OFF* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-		     {
-		     u8 nextpayload;
-		     u8 flags;
-		     u16 length;
-		     u8 num_ts;
-		     u8 reserved[3];
-		     ikev2_ts_payload_entry_t ts[0];})
-  ike_ts_payload_header_t;
-/* *INDENT-OFF* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u8 last_or_more;
-  u8 reserved;
-  u16 proposal_len;
-  u8 proposal_num;
-  u8 protocol_id;
-  u8 spi_size;
-  u8 num_transforms; u32 spi[0];
-}) ike_sa_proposal_data_t;
-/* *INDENT-OFF* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u8 last_or_more;
-  u8 reserved;
-  u16 transform_len;
-  u8 transform_type;
-  u8 reserved2;
-  u16 transform_id;
-  u8 attributes[0];
-}) ike_sa_transform_data_t;
-/* *INDENT-OFF* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u8 nextpayload;
-  u8 flags;
-  u16 length;
-  u8 protocol_id;
-  u8 spi_size;
-  u16 num_of_spi;
-  u32 spi[0];
-}) ike_delete_payload_header_t;
-/* *INDENT-OFF* */
-
-static ike_payload_header_t *
-ikev2_payload_add_hdr (ikev2_payload_chain_t * c, u8 payload_type, int len)
-{
-  ike_payload_header_t *hdr =
-    (ike_payload_header_t *) & c->data[c->last_hdr_off];
-  u8 *tmp;
-
-  if (c->data)
-    hdr->nextpayload = payload_type;
-  else
-    c->first_payload_type = payload_type;
-
-  c->last_hdr_off = vec_len (c->data);
-  vec_add2 (c->data, tmp, len);
-  hdr = (ike_payload_header_t *) tmp;
-  memset (hdr, 0, len);
-
-  hdr->length = clib_host_to_net_u16 (len);
-
-  return hdr;
-}
-
-static void
-ikev2_payload_add_data (ikev2_payload_chain_t * c, u8 * data)
-{
-  u16 len;
-  ike_payload_header_t *hdr;
-
-  vec_append (c->data, data);
-  hdr = (ike_payload_header_t *) & c->data[c->last_hdr_off];
-  len = clib_net_to_host_u16 (hdr->length);
-  hdr->length = clib_host_to_net_u16 (len + vec_len (data));
-}
-
-void
-ikev2_payload_add_notify (ikev2_payload_chain_t * c, u16 msg_type, u8 * data)
-{
-  ike_notify_payload_header_t *n;
-
-  n =
-    (ike_notify_payload_header_t *) ikev2_payload_add_hdr (c,
-							   IKEV2_PAYLOAD_NOTIFY,
-							   sizeof (*n));
-  n->msg_type = clib_host_to_net_u16 (msg_type);
-  ikev2_payload_add_data (c, data);
-}
-
-void
-ikev2_payload_add_sa (ikev2_payload_chain_t * c,
-		      ikev2_sa_proposal_t * proposals)
-{
-  ike_payload_header_t *ph;
-  ike_sa_proposal_data_t *prop;
-  ike_sa_transform_data_t *tr;
-  ikev2_sa_proposal_t *p;
-  ikev2_sa_transform_t *t;
-
-  u8 *tmp;
-  u8 *pr_data = 0;
-  u8 *tr_data = 0;
-
-  ikev2_payload_add_hdr (c, IKEV2_PAYLOAD_SA, sizeof (*ph));
-
-  vec_foreach (p, proposals)
-  {
-    int spi_size = (p->protocol_id == IKEV2_PROTOCOL_ESP) ? 4 : 0;
-    pr_data = vec_new (u8, sizeof (ike_sa_proposal_data_t) + spi_size);
-    prop = (ike_sa_proposal_data_t *) pr_data;
-    prop->last_or_more = proposals - p + 1 < vec_len (proposals) ? 2 : 0;
-    prop->protocol_id = p->protocol_id;
-    prop->proposal_num = p->proposal_num;
-    prop->spi_size = spi_size;
-    prop->num_transforms = vec_len (p->transforms);
-
-    if (spi_size)
-      prop->spi[0] = clib_host_to_net_u32 (p->spi);
-
-    DBG_PLD ("proposal num %u protocol_id %u last_or_more %u spi_size %u%s%U",
-	     prop->proposal_num, prop->protocol_id, prop->last_or_more,
-	     prop->spi_size, prop->spi_size ? " spi_data " : "",
-	     format_hex_bytes, prop->spi, prop->spi_size);
-
-    vec_foreach (t, p->transforms)
-    {
-      vec_add2 (tr_data, tmp, sizeof (*tr) + vec_len (t->attrs));
-      tr = (ike_sa_transform_data_t *) tmp;
-      tr->last_or_more =
-	((t - p->transforms) + 1 < vec_len (p->transforms)) ? 3 : 0;
-      tr->transform_type = t->type;
-      tr->transform_id = clib_host_to_net_u16 (t->transform_id);
-      tr->transform_len =
-	clib_host_to_net_u16 (sizeof (*tr) + vec_len (t->attrs));
-
-      if (vec_len (t->attrs) > 0)
-	clib_memcpy (tr->attributes, t->attrs, vec_len (t->attrs));
-
-      DBG_PLD
-	("transform type %U transform_id %u last_or_more %u attr_size %u%s%U",
-	 format_ikev2_transform_type, tr->transform_type, t->transform_id,
-	 tr->last_or_more, vec_len (t->attrs),
-	 vec_len (t->attrs) ? " attrs " : "", format_hex_bytes,
-	 tr->attributes, vec_len (t->attrs));
-    }
-
-    prop->proposal_len =
-      clib_host_to_net_u16 (vec_len (tr_data) + vec_len (pr_data));
-    ikev2_payload_add_data (c, pr_data);
-    ikev2_payload_add_data (c, tr_data);
-    vec_free (pr_data);
-    vec_free (tr_data);
-  }
-}
-
-void
-ikev2_payload_add_ke (ikev2_payload_chain_t * c, u16 dh_group, u8 * dh_data)
-{
-  ike_ke_payload_header_t *ke;
-  ke = (ike_ke_payload_header_t *) ikev2_payload_add_hdr (c, IKEV2_PAYLOAD_KE,
-							  sizeof (*ke));
-
-  ke->dh_group = clib_host_to_net_u16 (dh_group);
-  ikev2_payload_add_data (c, dh_data);
-}
-
-void
-ikev2_payload_add_nonce (ikev2_payload_chain_t * c, u8 * nonce)
-{
-  ikev2_payload_add_hdr (c, IKEV2_PAYLOAD_NONCE,
-			 sizeof (ike_payload_header_t));
-  ikev2_payload_add_data (c, nonce);
-}
-
-void
-ikev2_payload_add_id (ikev2_payload_chain_t * c, ikev2_id_t * id, u8 type)
-{
-  ike_id_payload_header_t *idp;
-  idp =
-    (ike_id_payload_header_t *) ikev2_payload_add_hdr (c, type,
-						       sizeof (*idp));
-
-  idp->id_type = id->type;
-  ikev2_payload_add_data (c, id->data);
-}
-
-void
-ikev2_payload_add_delete (ikev2_payload_chain_t * c, ikev2_delete_t * d)
-{
-  ike_delete_payload_header_t *dp;
-  u16 num_of_spi = vec_len (d);
-  ikev2_delete_t *d2;
-  dp =
-    (ike_delete_payload_header_t *) ikev2_payload_add_hdr (c,
-							   IKEV2_PAYLOAD_DELETE,
-							   sizeof (*dp));
-
-  if (d[0].protocol_id == IKEV2_PROTOCOL_IKE)
-    {
-      dp->protocol_id = 1;
-    }
-  else
-    {
-      dp->protocol_id = d[0].protocol_id;
-      dp->spi_size = 4;
-      dp->num_of_spi = clib_host_to_net_u16 (num_of_spi);
-      vec_foreach (d2, d)
-      {
-	u8 *data = vec_new (u8, 4);
-	u32 spi = clib_host_to_net_u32 (d2->spi);
-	clib_memcpy (data, &spi, 4);
-	ikev2_payload_add_data (c, data);
-	vec_free (data);
-      }
-    }
-}
-
-void
-ikev2_payload_add_auth (ikev2_payload_chain_t * c, ikev2_auth_t * auth)
-{
-  ike_auth_payload_header_t *ap;
-  ap =
-    (ike_auth_payload_header_t *) ikev2_payload_add_hdr (c,
-							 IKEV2_PAYLOAD_AUTH,
-							 sizeof (*ap));
-
-  ap->auth_method = auth->method;
-  ikev2_payload_add_data (c, auth->data);
-}
-
-void
-ikev2_payload_add_ts (ikev2_payload_chain_t * c, ikev2_ts_t * ts, u8 type)
-{
-  ike_ts_payload_header_t *tsh;
-  ikev2_ts_t *ts2;
-  u8 *data = 0, *tmp;
-
-  tsh =
-    (ike_ts_payload_header_t *) ikev2_payload_add_hdr (c, type,
-						       sizeof (*tsh));
-  tsh->num_ts = vec_len (ts);
-
-  vec_foreach (ts2, ts)
-  {
-    ASSERT (ts2->ts_type == 7);	/*TS_IPV4_ADDR_RANGE */
-    ikev2_ts_payload_entry_t *entry;
-    vec_add2 (data, tmp, sizeof (*entry));
-    entry = (ikev2_ts_payload_entry_t *) tmp;
-    entry->ts_type = ts2->ts_type;
-    entry->protocol_id = ts2->protocol_id;
-    entry->selector_len = clib_host_to_net_u16 (16);
-    entry->start_port = clib_host_to_net_u16 (ts2->start_port);
-    entry->end_port = clib_host_to_net_u16 (ts2->end_port);
-    entry->start_addr.as_u32 = ts2->start_addr.as_u32;
-    entry->end_addr.as_u32 = ts2->end_addr.as_u32;
-  }
-
-  ikev2_payload_add_data (c, data);
-  vec_free (data);
-}
-
-void
-ikev2_payload_chain_add_padding (ikev2_payload_chain_t * c, int bs)
-{
-  u8 *tmp __attribute__ ((unused));
-  u8 pad_len = (vec_len (c->data) / bs + 1) * bs - vec_len (c->data);
-  vec_add2 (c->data, tmp, pad_len);
-  c->data[vec_len (c->data) - 1] = pad_len - 1;
-}
-
-ikev2_sa_proposal_t *
-ikev2_parse_sa_payload (ike_payload_header_t * ikep)
-{
-  ikev2_sa_proposal_t *v = 0;
-  ikev2_sa_proposal_t *proposal;
-  ikev2_sa_transform_t *transform;
-
-  u32 plen = clib_net_to_host_u16 (ikep->length);
-
-  ike_sa_proposal_data_t *sap;
-  int proposal_ptr = 0;
-
-  do
-    {
-      sap = (ike_sa_proposal_data_t *) & ikep->payload[proposal_ptr];
-      int i;
-      int transform_ptr;
-
-      DBG_PLD ("proposal num %u len %u last_or_more %u id %u "
-	       "spi_size %u num_transforms %u",
-	       sap->proposal_num, clib_net_to_host_u16 (sap->proposal_len),
-	       sap->last_or_more, sap->protocol_id, sap->spi_size,
-	       sap->num_transforms);
-
-      /* IKE proposal should not have SPI */
-      if (sap->protocol_id == IKEV2_PROTOCOL_IKE && sap->spi_size != 0)
-	goto data_corrupted;
-
-      /* IKE proposal should not have SPI */
-      if (sap->protocol_id == IKEV2_PROTOCOL_ESP && sap->spi_size != 4)
-	goto data_corrupted;
-
-      transform_ptr = proposal_ptr + sizeof (*sap) + sap->spi_size;
-
-      vec_add2 (v, proposal, 1);
-      proposal->proposal_num = sap->proposal_num;
-      proposal->protocol_id = sap->protocol_id;
-
-      if (sap->spi_size == 4)
-	{
-	  proposal->spi = clib_net_to_host_u32 (sap->spi[0]);
-	}
-
-      for (i = 0; i < sap->num_transforms; i++)
-	{
-	  ike_sa_transform_data_t *tr =
-	    (ike_sa_transform_data_t *) & ikep->payload[transform_ptr];
-	  u16 tlen = clib_net_to_host_u16 (tr->transform_len);
-
-	  if (tlen < sizeof (*tr))
-	    goto data_corrupted;
-
-	  vec_add2 (proposal->transforms, transform, 1);
-
-	  transform->type = tr->transform_type;
-	  transform->transform_id = clib_net_to_host_u16 (tr->transform_id);
-	  if (tlen > sizeof (*tr))
-	    vec_add (transform->attrs, tr->attributes, tlen - sizeof (*tr));
-
-	  DBG_PLD
-	    ("transform num %u len %u last_or_more %u type %U id %u%s%U", i,
-	     tlen, tr->last_or_more, format_ikev2_sa_transform, transform,
-	     clib_net_to_host_u16 (tr->transform_id),
-	     tlen > sizeof (*tr) ? " attrs " : "", format_hex_bytes,
-	     tr->attributes, tlen - sizeof (*tr));
-
-	  transform_ptr += tlen;
-	}
-
-      proposal_ptr += clib_net_to_host_u16 (sap->proposal_len);
-    }
-  while (proposal_ptr < (plen - sizeof (*ikep)) && sap->last_or_more == 2);
-
-  /* data validation */
-  if (proposal_ptr != (plen - sizeof (*ikep)) || sap->last_or_more)
-    goto data_corrupted;
-
-  return v;
-
-data_corrupted:
-  DBG_PLD ("SA payload data corrupted");
-  ikev2_sa_free_proposal_vector (&v);
-  return 0;
-}
-
-ikev2_ts_t *
-ikev2_parse_ts_payload (ike_payload_header_t * ikep)
-{
-  ike_ts_payload_header_t *tsp = (ike_ts_payload_header_t *) ikep;
-  ikev2_ts_t *r = 0, *ts;
-  u8 i;
-
-  for (i = 0; i < tsp->num_ts; i++)
-    {
-      if (tsp->ts[i].ts_type != 7)	/*  TS_IPV4_ADDR_RANGE */
-	{
-	  DBG_PLD ("unsupported TS type received (%u)", tsp->ts[i].ts_type);
-	  continue;
-	}
-
-      vec_add2 (r, ts, 1);
-      ts->ts_type = tsp->ts[i].ts_type;
-      ts->protocol_id = tsp->ts[i].protocol_id;
-      ts->start_port = tsp->ts[i].start_port;
-      ts->end_port = tsp->ts[i].end_port;
-      ts->start_addr.as_u32 = tsp->ts[i].start_addr.as_u32;
-      ts->end_addr.as_u32 = tsp->ts[i].end_addr.as_u32;
-    }
-  return r;
-}
-
-ikev2_notify_t *
-ikev2_parse_notify_payload (ike_payload_header_t * ikep)
-{
-  ike_notify_payload_header_t *n = (ike_notify_payload_header_t *) ikep;
-  u32 plen = clib_net_to_host_u16 (ikep->length);
-  ikev2_notify_t *r = 0;
-  u32 spi;
-
-  DBG_PLD ("msg_type %U len %u%s%U",
-	   format_ikev2_notify_msg_type, clib_net_to_host_u16 (n->msg_type),
-	   plen, plen > sizeof (*n) ? " data " : "",
-	   format_hex_bytes, n->payload, plen - sizeof (*n));
-
-  r = vec_new (ikev2_notify_t, 1);
-  r->msg_type = clib_net_to_host_u16 (n->msg_type);
-  r->protocol_id = n->protocol_id;
-
-  if (n->spi_size == 4)
-    {
-      clib_memcpy (&spi, n->payload, n->spi_size);
-      r->spi = clib_net_to_host_u32 (spi);
-      DBG_PLD ("spi %lx", r->spi);
-    }
-  else if (n->spi_size == 0)
-    {
-      r->spi = 0;
-    }
-  else
-    {
-      clib_warning ("invalid SPI Size %d", n->spi_size);
-    }
-
-  if (plen > (sizeof (*n) + n->spi_size))
-    {
-      vec_add (r->data, n->payload + n->spi_size,
-	       plen - sizeof (*n) - n->spi_size);
-    }
-
-  return r;
-}
-
-void
-ikev2_parse_vendor_payload (ike_payload_header_t * ikep)
-{
-  u32 plen = clib_net_to_host_u16 (ikep->length);
-  int i;
-  int is_string = 1;
-
-  for (i = 0; i < plen - 4; i++)
-    if (!isprint (ikep->payload[i]))
-      is_string = 0;
-
-  DBG_PLD ("len %u data %s:%U",
-	   plen,
-	   is_string ? "string" : "hex",
-	   is_string ? format_ascii_bytes : format_hex_bytes,
-	   ikep->payload, plen - sizeof (*ikep));
-}
-
-ikev2_delete_t *
-ikev2_parse_delete_payload (ike_payload_header_t * ikep)
-{
-  ike_delete_payload_header_t *d = (ike_delete_payload_header_t *) ikep;
-  u32 plen = clib_net_to_host_u16 (ikep->length);
-  ikev2_delete_t *r = 0, *del;
-  u16 num_of_spi = clib_net_to_host_u16 (d->num_of_spi);
-  u16 i = 0;
-
-  DBG_PLD ("protocol_id %u spi_size %u num_of_spi %u len %u%s%U",
-	   d->protocol_id, d->spi_size, num_of_spi,
-	   plen, plen > sizeof (d) ? " data " : "",
-	   format_hex_bytes, d->spi, plen - sizeof (*d));
-
-  if (d->protocol_id == IKEV2_PROTOCOL_IKE)
-    {
-      r = vec_new (ikev2_delete_t, 1);
-      r->protocol_id = 1;
-    }
-  else
-    {
-      r = vec_new (ikev2_delete_t, num_of_spi);
-      vec_foreach (del, r)
-      {
-	del->protocol_id = d->protocol_id;
-	del->spi = clib_net_to_host_u32 (d->spi[i++]);
-      }
-    }
-
-  return r;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ikev2_priv.h b/vnet/vnet/ipsec/ikev2_priv.h
deleted file mode 100644
index 9f67ad2a..00000000
--- a/vnet/vnet/ipsec/ikev2_priv.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_ikev2_priv_h__
-#define __included_ikev2_priv_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-
-#include <vnet/ipsec/ikev2.h>
-
-#include <vppinfra/hash.h>
-#include <vppinfra/elog.h>
-#include <vppinfra/error.h>
-
-#include <openssl/rand.h>
-#include <openssl/dh.h>
-#include <openssl/hmac.h>
-#include <openssl/evp.h>
-
-#define IKEV2_DEBUG_PAYLOAD 1
-
-#if IKEV2_DEBUG_PAYLOAD == 1
-#define DBG_PLD(my_args...) clib_warning(my_args)
-#else
-#define DBG_PLD(my_args...)
-#endif
-
-typedef enum
-{
-  IKEV2_STATE_UNKNOWN,
-  IKEV2_STATE_SA_INIT,
-  IKEV2_STATE_DELETED,
-  IKEV2_STATE_AUTH_FAILED,
-  IKEV2_STATE_AUTHENTICATED,
-  IKEV2_STATE_NOTIFY_AND_DELETE,
-  IKEV2_STATE_TS_UNACCEPTABLE,
-  IKEV2_STATE_NO_PROPOSAL_CHOSEN,
-} ikev2_state_t;
-
-typedef struct
-{
-  ikev2_auth_method_t method:8;
-  u8 *data;
-  u8 hex;			/* hex encoding of the shared secret */
-  EVP_PKEY *key;
-} ikev2_auth_t;
-
-typedef enum
-{
-  IKEV2_DH_GROUP_MODP = 0,
-  IKEV2_DH_GROUP_ECP = 1,
-} ikev2_dh_group_t;
-
-typedef struct
-{
-  ikev2_transform_type_t type;
-  union
-  {
-    u16 transform_id;
-    ikev2_transform_encr_type_t encr_type:16;
-    ikev2_transform_prf_type_t prf_type:16;
-    ikev2_transform_integ_type_t integ_type:16;
-    ikev2_transform_dh_type_t dh_type:16;
-    ikev2_transform_esn_type_t esn_type:16;
-  };
-  u8 *attrs;
-  u16 key_len;
-  u16 key_trunc;
-  u16 block_size;
-  u8 dh_group;
-  int nid;
-  const char *dh_p;
-  const char *dh_g;
-  const void *md;
-  const void *cipher;
-} ikev2_sa_transform_t;
-
-typedef struct
-{
-  u8 proposal_num;
-  ikev2_protocol_id_t protocol_id:8;
-  u32 spi;
-  ikev2_sa_transform_t *transforms;
-} ikev2_sa_proposal_t;
-
-typedef struct
-{
-  u8 ts_type;
-  u8 protocol_id;
-  u16 selector_len;
-  u16 start_port;
-  u16 end_port;
-  ip4_address_t start_addr;
-  ip4_address_t end_addr;
-} ikev2_ts_t;
-
-typedef struct
-{
-  ikev2_id_type_t type:8;
-  u8 *data;
-} ikev2_id_t;
-
-typedef struct
-{
-  /* sa proposals vectors */
-  ikev2_sa_proposal_t *i_proposals;
-  ikev2_sa_proposal_t *r_proposals;
-
-  /* Traffic Selectors */
-  ikev2_ts_t *tsi;
-  ikev2_ts_t *tsr;
-
-  /* keys */
-  u8 *sk_ai;
-  u8 *sk_ar;
-  u8 *sk_ei;
-  u8 *sk_er;
-} ikev2_child_sa_t;
-
-typedef struct
-{
-  u8 protocol_id;
-  u32 spi;			/*for ESP and AH SPI size is 4, for IKE size is 0 */
-} ikev2_delete_t;
-
-typedef struct
-{
-  u8 protocol_id;
-  u32 spi;
-  ikev2_sa_proposal_t *i_proposal;
-  ikev2_sa_proposal_t *r_proposal;
-  ikev2_ts_t *tsi;
-  ikev2_ts_t *tsr;
-} ikev2_rekey_t;
-
-typedef struct
-{
-  u16 msg_type;
-  u8 protocol_id;
-  u32 spi;
-  u8 *data;
-} ikev2_notify_t;
-
-
-typedef struct
-{
-  ikev2_state_t state;
-  u8 unsupported_cp;
-  u8 initial_contact;
-  ip4_address_t iaddr;
-  ip4_address_t raddr;
-  u64 ispi;
-  u64 rspi;
-  u8 *i_nonce;
-  u8 *r_nonce;
-
-  /* DH data */
-  u16 dh_group;
-  u8 *dh_shared_key;
-  u8 *i_dh_data;
-  u8 *r_dh_data;
-
-  /* sa proposals vectors */
-  ikev2_sa_proposal_t *i_proposals;
-  ikev2_sa_proposal_t *r_proposals;
-
-  /* keys */
-  u8 *sk_d;
-  u8 *sk_ai;
-  u8 *sk_ar;
-  u8 *sk_ei;
-  u8 *sk_er;
-  u8 *sk_pi;
-  u8 *sk_pr;
-
-  /* auth */
-  ikev2_auth_t i_auth;
-  ikev2_auth_t r_auth;
-
-  /* ID */
-  ikev2_id_t i_id;
-  ikev2_id_t r_id;
-
-  /* pending deletes */
-  ikev2_delete_t *del;
-
-  /* pending rekeyings */
-  ikev2_rekey_t *rekey;
-
-  /* packet data */
-  u8 *last_sa_init_req_packet_data;
-  u8 *last_sa_init_res_packet_data;
-
-  /* retransmit */
-  u32 last_msg_id;
-  u8 *last_res_packet_data;
-
-  ikev2_child_sa_t *childs;
-} ikev2_sa_t;
-
-typedef struct
-{
-  u8 *name;
-  u8 is_enabled;
-
-  ikev2_auth_t auth;
-  ikev2_id_t loc_id;
-  ikev2_id_t rem_id;
-  ikev2_ts_t loc_ts;
-  ikev2_ts_t rem_ts;
-} ikev2_profile_t;
-
-typedef struct
-{
-  /* pool of IKEv2 Security Associations */
-  ikev2_sa_t *sas;
-
-  /* hash */
-  uword *sa_by_rspi;
-} ikev2_main_per_thread_data_t;
-
-typedef struct
-{
-  /* pool of IKEv2 profiles */
-  ikev2_profile_t *profiles;
-
-  /* vector of supported transform types */
-  ikev2_sa_transform_t *supported_transforms;
-
-  /* hash */
-  mhash_t profile_index_by_name;
-
-  /* local private key */
-  EVP_PKEY *pkey;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-
-  ikev2_main_per_thread_data_t *per_thread_data;
-
-} ikev2_main_t;
-
-ikev2_main_t ikev2_main;
-
-void ikev2_sa_free_proposal_vector (ikev2_sa_proposal_t ** v);
-ikev2_sa_transform_t *ikev2_sa_get_td_for_type (ikev2_sa_proposal_t * p,
-						ikev2_transform_type_t type);
-
-/* ikev2_crypto.c */
-v8 *ikev2_calc_prf (ikev2_sa_transform_t * tr, v8 * key, v8 * data);
-u8 *ikev2_calc_prfplus (ikev2_sa_transform_t * tr, u8 * key, u8 * seed,
-			int len);
-v8 *ikev2_calc_integr (ikev2_sa_transform_t * tr, v8 * key, u8 * data,
-		       int len);
-v8 *ikev2_decrypt_data (ikev2_sa_t * sa, u8 * data, int len);
-int ikev2_encrypt_data (ikev2_sa_t * sa, v8 * src, u8 * dst);
-void ikev2_generate_dh (ikev2_sa_t * sa, ikev2_sa_transform_t * t);
-int ikev2_verify_sign (EVP_PKEY * pkey, u8 * sigbuf, u8 * data);
-u8 *ikev2_calc_sign (EVP_PKEY * pkey, u8 * data);
-EVP_PKEY *ikev2_load_cert_file (u8 * file);
-EVP_PKEY *ikev2_load_key_file (u8 * file);
-void ikev2_crypto_init (ikev2_main_t * km);
-
-/* ikev2_payload.c */
-typedef struct
-{
-  u8 first_payload_type;
-  u16 last_hdr_off;
-  u8 *data;
-} ikev2_payload_chain_t;
-
-#define ikev2_payload_new_chain(V) vec_validate (V, 0)
-#define ikev2_payload_destroy_chain(V) do { \
-  vec_free((V)->data);                 \
-  vec_free(V);                         \
-} while (0)
-
-void ikev2_payload_add_notify (ikev2_payload_chain_t * c, u16 msg_type,
-			       u8 * data);
-void ikev2_payload_add_sa (ikev2_payload_chain_t * c,
-			   ikev2_sa_proposal_t * proposals);
-void ikev2_payload_add_ke (ikev2_payload_chain_t * c, u16 dh_group,
-			   u8 * dh_data);
-void ikev2_payload_add_nonce (ikev2_payload_chain_t * c, u8 * nonce);
-void ikev2_payload_add_id (ikev2_payload_chain_t * c, ikev2_id_t * id,
-			   u8 type);
-void ikev2_payload_add_auth (ikev2_payload_chain_t * c, ikev2_auth_t * auth);
-void ikev2_payload_add_ts (ikev2_payload_chain_t * c, ikev2_ts_t * ts,
-			   u8 type);
-void ikev2_payload_add_delete (ikev2_payload_chain_t * c, ikev2_delete_t * d);
-void ikev2_payload_chain_add_padding (ikev2_payload_chain_t * c, int bs);
-void ikev2_parse_vendor_payload (ike_payload_header_t * ikep);
-ikev2_sa_proposal_t *ikev2_parse_sa_payload (ike_payload_header_t * ikep);
-ikev2_ts_t *ikev2_parse_ts_payload (ike_payload_header_t * ikep);
-ikev2_delete_t *ikev2_parse_delete_payload (ike_payload_header_t * ikep);
-ikev2_notify_t *ikev2_parse_notify_payload (ike_payload_header_t * ikep);
-
-#endif /* __included_ikev2_priv_h__ */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ipsec.api b/vnet/vnet/ipsec/ipsec.api
deleted file mode 100644
index 178bb757..00000000
--- a/vnet/vnet/ipsec/ipsec.api
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \brief IPsec: Add/delete Security Policy Database
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add SPD if non-zero, else delete
-    @param spd_id - SPD instance id (control plane allocated)
-*/
-
-define ipsec_spd_add_del
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u32 spd_id;
-};
-
-/** \brief Reply for IPsec: Add/delete Security Policy Database entry
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define ipsec_spd_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IPsec: Add/delete SPD from interface
-
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add security mode if non-zero, else delete
-    @param sw_if_index - index of the interface
-    @param spd_id - SPD instance id to use for lookups
-*/
-
-
-define ipsec_interface_add_del_spd
-{
-  u32 client_index;
-  u32 context;
-
-  u8 is_add;
-  u32 sw_if_index;
-  u32 spd_id;
-};
-
-/** \brief Reply for IPsec: Add/delete SPD from interface
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define ipsec_interface_add_del_spd_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IPsec: Add/delete Security Policy Database entry
-
-    See RFC 4301, 4.4.1.1 on how to match packet to selectors
-
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add SPD if non-zero, else delete
-    @param spd_id - SPD instance id (control plane allocated)
-    @param priority - priority of SPD entry (non-unique value).  Used to order SPD matching - higher priorities match before lower
-    @param is_outbound - entry applies to outbound traffic if non-zero, otherwise applies to inbound traffic
-    @param is_ipv6 - remote/local address are IPv6 if non-zero, else IPv4
-    @param remote_address_start - start of remote address range to match
-    @param remote_address_stop - end of remote address range to match
-    @param local_address_start - start of local address range to match
-    @param local_address_stop - end of local address range to match
-    @param protocol - protocol type to match [0 means any]
-    @param remote_port_start - start of remote port range to match ...
-    @param remote_port_stop - end of remote port range to match [0 to 65535 means ANY, 65535 to 0 means OPAQUE]
-    @param local_port_start - start of local port range to match ...
-    @param local_port_stop - end of remote port range to match [0 to 65535 means ANY, 65535 to 0 means OPAQUE]
-    @param policy - 0 = bypass (no IPsec processing), 1 = discard (discard packet with ICMP processing), 2 = resolve (send request to control plane for SA resolving, and discard without ICMP processing), 3 = protect (apply IPsec policy using following parameters)
-    @param sa_id - SAD instance id (control plane allocated)
-
-*/
-
-define ipsec_spd_add_del_entry
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-
-  u32 spd_id;
-  i32 priority;
-  u8 is_outbound;
-
-  // Selector
-  u8 is_ipv6;
-  u8 is_ip_any;
-  u8 remote_address_start[16];
-  u8 remote_address_stop[16];
-  u8 local_address_start[16];
-  u8 local_address_stop[16];
-
-  u8 protocol;
-
-  u16 remote_port_start;
-  u16 remote_port_stop;
-  u16 local_port_start;
-  u16 local_port_stop;
-
-  // Policy
-  u8 policy;
-  u32 sa_id;
-};
-
-/** \brief Reply for IPsec: Add/delete Security Policy Database entry
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define ipsec_spd_add_del_entry_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IPsec: Add/delete Security Association Database entry
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add SAD entry if non-zero, else delete
-
-    @param sad_id - sad id
-
-    @param spi - security parameter index
-
-    @param protocol - 0 = AH, 1 = ESP
-
-    @param crypto_algorithm - 0 = Null, 1 = AES-CBC-128, 2 = AES-CBC-192, 3 = AES-CBC-256, 4 = 3DES-CBC
-    @param crypto_key_length - length of crypto_key in bytes
-    @param crypto_key - crypto keying material
-
-    @param integrity_algorithm - 0 = None, 1 = MD5-96, 2 = SHA1-96, 3 = SHA-256, 4 = SHA-384, 5=SHA-512
-    @param integrity_key_length - length of integrity_key in bytes
-    @param integrity_key - integrity keying material
-
-    @param use_extended_sequence_number - use ESN when non-zero
-
-    @param is_tunnel - IPsec tunnel mode if non-zero, else transport mode
-    @param is_tunnel_ipv6 - IPsec tunnel mode is IPv6 if non-zero, else IPv4 tunnel only valid if is_tunnel is non-zero
-    @param tunnel_src_address - IPsec tunnel source address IPv6 if is_tunnel_ipv6 is non-zero, else IPv4. Only valid if is_tunnel is non-zero
-    @param tunnel_dst_address - IPsec tunnel destination address IPv6 if is_tunnel_ipv6 is non-zero, else IPv4. Only valid if is_tunnel is non-zero
-
-    To be added:
-     Anti-replay
-     IPsec tunnel address copy mode (to support GDOI)
- */
-
-define ipsec_sad_add_del_entry
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-
-  u32 sad_id;
-
-  u32 spi;
-
-  u8 protocol;
-
-  u8 crypto_algorithm;
-  u8 crypto_key_length;
-  u8 crypto_key[128];
-
-  u8 integrity_algorithm;
-  u8 integrity_key_length;
-  u8 integrity_key[128];
-
-  u8 use_extended_sequence_number;
-
-  u8 is_tunnel;
-  u8 is_tunnel_ipv6;
-  u8 tunnel_src_address[16];
-  u8 tunnel_dst_address[16];
-};
-
-/** \brief Reply for IPsec: Add/delete Security Association Database entry
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define ipsec_sad_add_del_entry_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IPsec: Update Security Association keys
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-
-    @param sa_id - sa id
-
-    @param crypto_key_length - length of crypto_key in bytes
-    @param crypto_key - crypto keying material
-
-    @param integrity_key_length - length of integrity_key in bytes
-    @param integrity_key - integrity keying material
-*/
-
-define ipsec_sa_set_key
-{
-  u32 client_index;
-  u32 context;
-
-  u32 sa_id;
-
-  u8 crypto_key_length;
-  u8 crypto_key[128];
-
-  u8 integrity_key_length;
-  u8 integrity_key[128];
-};
-
-/** \brief Reply for IPsec: Update Security Association keys
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define ipsec_sa_set_key_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IKEv2: Add/delete profile
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-
-    @param name - IKEv2 profile name
-    @param is_add - Add IKEv2 profile if non-zero, else delete
-*/
-define ikev2_profile_add_del
-{
-  u32 client_index;
-  u32 context;
-
-  u8 name[64];
-  u8 is_add;
-};
-
-/** \brief Reply for IKEv2: Add/delete profile
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_profile_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IKEv2: Set IKEv2 profile authentication method
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-
-    @param name - IKEv2 profile name
-    @param auth_method - IKEv2 authentication method (shared-key-mic/rsa-sig)
-    @param is_hex - Authentication data in hex format if non-zero, else string
-    @param data_len - Authentication data length
-    @param data - Authentication data (for rsa-sig cert file path)
-*/
-define ikev2_profile_set_auth
-{
-  u32 client_index;
-  u32 context;
-
-  u8 name[64];
-  u8 auth_method;
-  u8 is_hex;
-  u32 data_len;
-  u8 data[0];
-};
-
-/** \brief Reply for IKEv2: Set IKEv2 profile authentication method
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_profile_set_auth_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IKEv2: Set IKEv2 profile local/remote identification
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-
-    @param name - IKEv2 profile name
-    @param is_local - Identification is local if non-zero, else remote
-    @param id_type - Identification type
-    @param data_len - Identification data length
-    @param data - Identification data
-*/
-define ikev2_profile_set_id
-{
-  u32 client_index;
-  u32 context;
-
-  u8 name[64];
-  u8 is_local;
-  u8 id_type;
-  u32 data_len;
-  u8 data[0];
-};
-
-/** \brief Reply for IKEv2:
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_profile_set_id_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IKEv2: Set IKEv2 profile traffic selector parameters
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-
-    @param name - IKEv2 profile name
-    @param is_local - Traffic selector is local if non-zero, else remote
-    @param proto - Traffic selector IP protocol (if zero not relevant)
-    @param start_port - The smallest port number allowed by traffic selector
-    @param end_port - The largest port number allowed by traffic selector
-    @param start_addr - The smallest address included in traffic selector
-    @param end_addr - The largest address included in traffic selector
-*/
-define ikev2_profile_set_ts
-{
-  u32 client_index;
-  u32 context;
-
-  u8 name[64];
-  u8 is_local;
-  u8 proto;
-  u16 start_port;
-  u16 end_port;
-  u32 start_addr;
-  u32 end_addr;
-};
-
-/** \brief Reply for IKEv2: Set IKEv2 profile traffic selector parameters
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_profile_set_ts_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IKEv2: Set IKEv2 local RSA private key
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-
-    @param key_file - Key file absolute path
-*/
-define ikev2_set_local_key
-{
-  u32 client_index;
-  u32 context;
-
-  u8 key_file[256];
-};
-
-/** \brief Reply for IKEv2: Set IKEv2 local key
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_set_local_key_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Dump ipsec policy database data
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param spd_id - SPD instance id
-    @param sa_id - SA id, optional, set to ~0 to see all policies in SPD
-*/
-define ipsec_spd_dump {
-    u32 client_index;
-    u32 context;
-    u32 spd_id;
-    u32 sa_id;
-};
-
-/** \brief IPsec policy database response
-    @param context - sender context which was passed in the request
-    @param spd_id - SPD instance id
-    @param priority - numeric value to control policy evaluation order
-    @param is_outbound - [1|0] to indicate if direction is [out|in]bound
-    @param is_ipv6 - [1|0] to indicate if address family is ipv[6|4]
-    @param local_start_addr - first address in local traffic selector range
-    @param local_stop_addr - last address in local traffic selector range
-    @param local_start_port - first port in local traffic selector range
-    @param local_stop_port - last port in local traffic selector range
-    @param remote_start_addr - first address in remote traffic selector range
-    @param remote_stop_addr - last address in remote traffic selector range
-    @param remote_start_port - first port in remote traffic selector range
-    @param remote_stop_port - last port in remote traffic selector range
-    @param protocol - traffic selector protocol
-    @param policy - policy action
-    @param sa_id - SA id
-    @param bytes - byte count of packets matching this policy
-    @param packets - count of packets matching this policy
-*/
-
-define ipsec_spd_details {
-    u32 context;
-    u32 spd_id;
-    i32 priority;
-    u8 is_outbound;
-    u8 is_ipv6;
-    u8 local_start_addr[16];
-    u8 local_stop_addr[16];
-    u16 local_start_port;
-    u16 local_stop_port;
-    u8 remote_start_addr[16];
-    u8 remote_stop_addr[16];
-    u16 remote_start_port;
-    u16 remote_stop_port;
-    u8 protocol;
-    u8 policy;
-    u32 sa_id;
-    u64 bytes;
-    u64 packets;
-};
-
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
- 
\ No newline at end of file
diff --git a/vnet/vnet/ipsec/ipsec.c b/vnet/vnet/ipsec/ipsec.c
deleted file mode 100644
index ee85c402..00000000
--- a/vnet/vnet/ipsec/ipsec.c
+++ /dev/null
@@ -1,581 +0,0 @@
-/*
- * decap.c : IPSec tunnel support
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-#include <vnet/interface.h>
-
-#include <vnet/ipsec/ipsec.h>
-#include <vnet/ipsec/ikev2.h>
-
-#if DPDK_CRYPTO==1
-#include <vnet/devices/dpdk/ipsec/esp.h>
-#define ESP_NODE "dpdk-esp-encrypt"
-#else
-#include <vnet/ipsec/esp.h>
-#define ESP_NODE "esp-encrypt"
-#endif
-
-#if DPDK_CRYPTO==0
-/* dummy function */
-static int
-add_del_sa_sess (u32 sa_index, u8 is_add)
-{
-  return 0;
-}
-#endif
-
-u32
-ipsec_get_sa_index_by_sa_id (u32 sa_id)
-{
-  ipsec_main_t *im = &ipsec_main;
-  uword *p = hash_get (im->sa_index_by_sa_id, sa_id);
-  if (!p)
-    return ~0;
-
-  return p[0];
-}
-
-int
-ipsec_set_interface_spd (vlib_main_t * vm, u32 sw_if_index, u32 spd_id,
-			 int is_add)
-{
-  ipsec_main_t *im = &ipsec_main;
-  ip4_ipsec_config_t config;
-
-  u32 spd_index;
-  uword *p;
-
-  p = hash_get (im->spd_index_by_spd_id, spd_id);
-  if (!p)
-    return VNET_API_ERROR_SYSCALL_ERROR_1;	/* no such spd-id */
-
-  spd_index = p[0];
-
-  p = hash_get (im->spd_index_by_sw_if_index, sw_if_index);
-  if (p && is_add)
-    return VNET_API_ERROR_SYSCALL_ERROR_1;	/* spd already assigned */
-
-  if (is_add)
-    {
-      hash_set (im->spd_index_by_sw_if_index, sw_if_index, spd_index);
-    }
-  else
-    {
-      hash_unset (im->spd_index_by_sw_if_index, sw_if_index);
-    }
-
-  clib_warning ("sw_if_index %u spd_id %u spd_index %u",
-		sw_if_index, spd_id, spd_index);
-
-  /* enable IPsec on TX */
-  vnet_feature_enable_disable ("ip4-output", "ipsec-output-ip4", sw_if_index,
-			       is_add, 0, 0);
-  vnet_feature_enable_disable ("ip6-output", "ipsec-output-ip6", sw_if_index,
-			       is_add, 0, 0);
-
-  /* enable IPsec on RX */
-  vnet_feature_enable_disable ("ip4-unicast", "ipsec-input-ip4", sw_if_index,
-			       is_add, &config, sizeof (config));
-  vnet_feature_enable_disable ("ip6-unicast", "ipsec-input-ip6", sw_if_index,
-			       is_add, &config, sizeof (config));
-
-  return 0;
-}
-
-int
-ipsec_add_del_spd (vlib_main_t * vm, u32 spd_id, int is_add)
-{
-  ipsec_main_t *im = &ipsec_main;
-  ipsec_spd_t *spd = 0;
-  uword *p;
-  u32 spd_index, k, v;
-
-  p = hash_get (im->spd_index_by_spd_id, spd_id);
-  if (p && is_add)
-    return VNET_API_ERROR_INVALID_VALUE;
-  if (!p && !is_add)
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  if (!is_add)			/* delete */
-    {
-      spd_index = p[0];
-      spd = pool_elt_at_index (im->spds, spd_index);
-      if (!spd)
-	return VNET_API_ERROR_INVALID_VALUE;
-      /* *INDENT-OFF* */
-      hash_foreach (k, v, im->spd_index_by_sw_if_index, ({
-        if (v == spd_index)
-          ipsec_set_interface_spd(vm, k, spd_id, 0);
-      }));
-      /* *INDENT-ON* */
-      hash_unset (im->spd_index_by_spd_id, spd_id);
-      pool_free (spd->policies);
-      vec_free (spd->ipv4_outbound_policies);
-      vec_free (spd->ipv6_outbound_policies);
-      vec_free (spd->ipv4_inbound_protect_policy_indices);
-      vec_free (spd->ipv4_inbound_policy_discard_and_bypass_indices);
-      pool_put (im->spds, spd);
-    }
-  else				/* create new SPD */
-    {
-      pool_get (im->spds, spd);
-      memset (spd, 0, sizeof (*spd));
-      spd_index = spd - im->spds;
-      spd->id = spd_id;
-      hash_set (im->spd_index_by_spd_id, spd_id, spd_index);
-    }
-  return 0;
-}
-
-static int
-ipsec_spd_entry_sort (void *a1, void *a2)
-{
-  ipsec_main_t *im = &ipsec_main;
-  u32 *id1 = a1;
-  u32 *id2 = a2;
-  ipsec_spd_t *spd;
-  ipsec_policy_t *p1, *p2;
-
-  /* *INDENT-OFF* */
-  pool_foreach (spd, im->spds, ({
-    p1 = pool_elt_at_index(spd->policies, *id1);
-    p2 = pool_elt_at_index(spd->policies, *id2);
-    if (p1 && p2)
-      return p2->priority - p1->priority;
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-int
-ipsec_add_del_policy (vlib_main_t * vm, ipsec_policy_t * policy, int is_add)
-{
-  ipsec_main_t *im = &ipsec_main;
-  ipsec_spd_t *spd = 0;
-  ipsec_policy_t *vp;
-  uword *p;
-  u32 spd_index;
-
-  clib_warning ("policy-id %u priority %d is_outbound %u", policy->id,
-		policy->priority, policy->is_outbound);
-
-  if (policy->policy == IPSEC_POLICY_ACTION_PROTECT)
-    {
-      p = hash_get (im->sa_index_by_sa_id, policy->sa_id);
-      if (!p)
-	return VNET_API_ERROR_SYSCALL_ERROR_1;
-      policy->sa_index = p[0];
-    }
-
-  p = hash_get (im->spd_index_by_spd_id, policy->id);
-
-  if (!p)
-    return VNET_API_ERROR_SYSCALL_ERROR_1;
-
-  spd_index = p[0];
-  spd = pool_elt_at_index (im->spds, spd_index);
-  if (!spd)
-    return VNET_API_ERROR_SYSCALL_ERROR_1;
-
-  if (is_add)
-    {
-      u32 policy_index;
-
-      pool_get (spd->policies, vp);
-      clib_memcpy (vp, policy, sizeof (*vp));
-      policy_index = vp - spd->policies;
-
-      if (policy->is_outbound)
-	{
-	  if (policy->is_ipv6)
-	    {
-	      vec_add1 (spd->ipv6_outbound_policies, policy_index);
-	      clib_memcpy (vp, policy, sizeof (ipsec_policy_t));
-	      vec_sort_with_function (spd->ipv6_outbound_policies,
-				      ipsec_spd_entry_sort);
-	    }
-	  else
-	    {
-	      vec_add1 (spd->ipv4_outbound_policies, policy_index);
-	      clib_memcpy (vp, policy, sizeof (ipsec_policy_t));
-	      vec_sort_with_function (spd->ipv4_outbound_policies,
-				      ipsec_spd_entry_sort);
-	    }
-	}
-      else
-	{
-	  if (policy->is_ipv6)
-	    {
-	      if (policy->policy == IPSEC_POLICY_ACTION_PROTECT)
-		{
-		  vec_add1 (spd->ipv6_inbound_protect_policy_indices,
-			    policy_index);
-		  clib_memcpy (vp, policy, sizeof (ipsec_policy_t));
-		  vec_sort_with_function
-		    (spd->ipv6_inbound_protect_policy_indices,
-		     ipsec_spd_entry_sort);
-		}
-	      else
-		{
-		  vec_add1
-		    (spd->ipv6_inbound_policy_discard_and_bypass_indices,
-		     policy_index);
-		  clib_memcpy (vp, policy, sizeof (ipsec_policy_t));
-		  vec_sort_with_function
-		    (spd->ipv6_inbound_policy_discard_and_bypass_indices,
-		     ipsec_spd_entry_sort);
-		}
-	    }
-	  else
-	    {
-	      if (policy->policy == IPSEC_POLICY_ACTION_PROTECT)
-		{
-		  vec_add1 (spd->ipv4_inbound_protect_policy_indices,
-			    policy_index);
-		  clib_memcpy (vp, policy, sizeof (ipsec_policy_t));
-		  vec_sort_with_function
-		    (spd->ipv4_inbound_protect_policy_indices,
-		     ipsec_spd_entry_sort);
-		}
-	      else
-		{
-		  vec_add1
-		    (spd->ipv4_inbound_policy_discard_and_bypass_indices,
-		     policy_index);
-		  clib_memcpy (vp, policy, sizeof (ipsec_policy_t));
-		  vec_sort_with_function
-		    (spd->ipv4_inbound_policy_discard_and_bypass_indices,
-		     ipsec_spd_entry_sort);
-		}
-	    }
-	}
-
-    }
-  else
-    {
-      u32 i, j;
-      /* *INDENT-OFF* */
-      pool_foreach_index(i, spd->policies, ({
-        vp = pool_elt_at_index(spd->policies, i);
-        if (vp->priority != policy->priority)
-          continue;
-        if (vp->is_outbound != policy->is_outbound)
-          continue;
-        if (vp->policy != policy->policy)
-          continue;
-        if (vp->sa_id != policy->sa_id)
-          continue;
-        if (vp->protocol != policy->protocol)
-          continue;
-        if (vp->lport.start != policy->lport.start)
-          continue;
-        if (vp->lport.stop != policy->lport.stop)
-          continue;
-        if (vp->rport.start != policy->rport.start)
-          continue;
-        if (vp->rport.stop != policy->rport.stop)
-          continue;
-        if (vp->is_ipv6 != policy->is_ipv6)
-          continue;
-        if (policy->is_ipv6)
-          {
-            if (vp->laddr.start.ip6.as_u64[0] != policy->laddr.start.ip6.as_u64[0])
-              continue;
-            if (vp->laddr.start.ip6.as_u64[1] != policy->laddr.start.ip6.as_u64[1])
-              continue;
-            if (vp->laddr.stop.ip6.as_u64[0] != policy->laddr.stop.ip6.as_u64[0])
-              continue;
-            if (vp->laddr.stop.ip6.as_u64[1] != policy->laddr.stop.ip6.as_u64[1])
-              continue;
-            if (vp->raddr.start.ip6.as_u64[0] != policy->raddr.start.ip6.as_u64[0])
-              continue;
-            if (vp->raddr.start.ip6.as_u64[1] != policy->raddr.start.ip6.as_u64[1])
-              continue;
-            if (vp->raddr.stop.ip6.as_u64[0] != policy->raddr.stop.ip6.as_u64[0])
-              continue;
-           if (vp->laddr.stop.ip6.as_u64[1] != policy->laddr.stop.ip6.as_u64[1])
-              continue;
-           if (policy->is_outbound)
-             {
-               vec_foreach_index(j, spd->ipv6_outbound_policies) {
-                 if (vec_elt(spd->ipv6_outbound_policies, j) == i) {
-                   vec_del1 (spd->ipv6_outbound_policies, j);
-                   break;
-                 }
-               }
-             }
-           else
-             {
-               if (policy->policy == IPSEC_POLICY_ACTION_PROTECT)
-                 {
-                   vec_foreach_index(j, spd->ipv6_inbound_protect_policy_indices) {
-                     if (vec_elt(spd->ipv6_inbound_protect_policy_indices, j) == i) {
-                       vec_del1 (spd->ipv6_inbound_protect_policy_indices, j);
-                       break;
-                     }
-                   }
-                 }
-               else
-                 {
-                   vec_foreach_index(j, spd->ipv6_inbound_policy_discard_and_bypass_indices) {
-                     if (vec_elt(spd->ipv6_inbound_policy_discard_and_bypass_indices, j) == i) {
-                       vec_del1 (spd->ipv6_inbound_policy_discard_and_bypass_indices, j);
-                       break;
-                     }
-                   }
-                 }
-             }
-          }
-        else
-          {
-            if (vp->laddr.start.ip4.as_u32 != policy->laddr.start.ip4.as_u32)
-              continue;
-            if (vp->laddr.stop.ip4.as_u32 != policy->laddr.stop.ip4.as_u32)
-              continue;
-            if (vp->raddr.start.ip4.as_u32 != policy->raddr.start.ip4.as_u32)
-              continue;
-            if (vp->raddr.stop.ip4.as_u32 != policy->raddr.stop.ip4.as_u32)
-              continue;
-            if (policy->is_outbound)
-              {
-                vec_foreach_index(j, spd->ipv4_outbound_policies) {
-                  if (vec_elt(spd->ipv4_outbound_policies, j) == i) {
-                    vec_del1 (spd->ipv4_outbound_policies, j);
-                    break;
-                  }
-                }
-              }
-            else
-              {
-                if (policy->policy == IPSEC_POLICY_ACTION_PROTECT)
-                  {
-                    vec_foreach_index(j, spd->ipv4_inbound_protect_policy_indices) {
-                      if (vec_elt(spd->ipv4_inbound_protect_policy_indices, j) == i) {
-                        vec_del1 (spd->ipv4_inbound_protect_policy_indices, j);
-                        break;
-                      }
-                    }
-                  }
-                else
-                  {
-                    vec_foreach_index(j, spd->ipv4_inbound_policy_discard_and_bypass_indices) {
-                      if (vec_elt(spd->ipv4_inbound_policy_discard_and_bypass_indices, j) == i) {
-                        vec_del1 (spd->ipv4_inbound_policy_discard_and_bypass_indices, j);
-                        break;
-                    }
-                  }
-              }
-          }
-          pool_put (spd->policies, vp);
-          break;
-        }
-      }));
-      /* *INDENT-ON* */
-    }
-
-  return 0;
-}
-
-static u8
-ipsec_is_sa_used (u32 sa_index)
-{
-  ipsec_main_t *im = &ipsec_main;
-  ipsec_spd_t *spd;
-  ipsec_policy_t *p;
-  ipsec_tunnel_if_t *t;
-
-  /* *INDENT-OFF* */
-  pool_foreach(spd, im->spds, ({
-    pool_foreach(p, spd->policies, ({
-      if (p->policy == IPSEC_POLICY_ACTION_PROTECT)
-        {
-          if (p->sa_index == sa_index)
-            return 1;
-        }
-    }));
-  }));
-
-  pool_foreach(t, im->tunnel_interfaces, ({
-    if (t->input_sa_index == sa_index)
-      return 1;
-    if (t->output_sa_index == sa_index)
-      return 1;
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-int
-ipsec_add_del_sa (vlib_main_t * vm, ipsec_sa_t * new_sa, int is_add)
-{
-  ipsec_main_t *im = &ipsec_main;
-  ipsec_sa_t *sa = 0;
-  uword *p;
-  u32 sa_index;
-
-  clib_warning ("id %u spi %u", new_sa->id, new_sa->spi);
-
-  p = hash_get (im->sa_index_by_sa_id, new_sa->id);
-  if (p && is_add)
-    return VNET_API_ERROR_SYSCALL_ERROR_1;	/* already exists */
-  if (!p && !is_add)
-    return VNET_API_ERROR_SYSCALL_ERROR_1;
-
-  if (!is_add)			/* delete */
-    {
-      sa_index = p[0];
-      sa = pool_elt_at_index (im->sad, sa_index);
-      if (ipsec_is_sa_used (sa_index))
-	{
-	  clib_warning ("sa_id %u used in policy", sa->id);
-	  return VNET_API_ERROR_SYSCALL_ERROR_1;	/* sa used in policy */
-	}
-      hash_unset (im->sa_index_by_sa_id, sa->id);
-      add_del_sa_sess (sa_index, is_add);
-      pool_put (im->sad, sa);
-    }
-  else				/* create new SA */
-    {
-      pool_get (im->sad, sa);
-      clib_memcpy (sa, new_sa, sizeof (*sa));
-      sa_index = sa - im->sad;
-      hash_set (im->sa_index_by_sa_id, sa->id, sa_index);
-      if (add_del_sa_sess (sa_index, is_add) < 0)
-	return VNET_API_ERROR_SYSCALL_ERROR_1;
-    }
-  return 0;
-}
-
-int
-ipsec_set_sa_key (vlib_main_t * vm, ipsec_sa_t * sa_update)
-{
-  ipsec_main_t *im = &ipsec_main;
-  uword *p;
-  u32 sa_index;
-  ipsec_sa_t *sa = 0;
-
-  p = hash_get (im->sa_index_by_sa_id, sa_update->id);
-  if (!p)
-    return VNET_API_ERROR_SYSCALL_ERROR_1;	/* no such sa-id */
-
-  sa_index = p[0];
-  sa = pool_elt_at_index (im->sad, sa_index);
-
-  /* new crypto key */
-  if (0 < sa_update->crypto_key_len)
-    {
-      clib_memcpy (sa->crypto_key, sa_update->crypto_key,
-		   sa_update->crypto_key_len);
-      sa->crypto_key_len = sa_update->crypto_key_len;
-    }
-
-  /* new integ key */
-  if (0 < sa_update->integ_key_len)
-    {
-      clib_memcpy (sa->integ_key, sa_update->integ_key,
-		   sa_update->integ_key_len);
-      sa->integ_key_len = sa_update->integ_key_len;
-    }
-
-  if (sa->crypto_key_len + sa->integ_key_len > 0)
-    {
-      if (add_del_sa_sess (sa_index, 0) < 0)
-	return VNET_API_ERROR_SYSCALL_ERROR_1;
-    }
-
-  return 0;
-}
-
-static void
-ipsec_rand_seed (void)
-{
-  struct
-  {
-    time_t time;
-    pid_t pid;
-    void *p;
-  } seed_data;
-
-  seed_data.time = time (NULL);
-  seed_data.pid = getpid ();
-  seed_data.p = (void *) &seed_data;
-
-  RAND_seed ((const void *) &seed_data, sizeof (seed_data));
-}
-
-static clib_error_t *
-ipsec_init (vlib_main_t * vm)
-{
-  clib_error_t *error;
-  ipsec_main_t *im = &ipsec_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  vlib_node_t *node;
-
-  ipsec_rand_seed ();
-
-  memset (im, 0, sizeof (im[0]));
-
-  im->vnet_main = vnet_get_main ();
-  im->vlib_main = vm;
-
-  im->spd_index_by_spd_id = hash_create (0, sizeof (uword));
-  im->sa_index_by_sa_id = hash_create (0, sizeof (uword));
-  im->spd_index_by_sw_if_index = hash_create (0, sizeof (uword));
-
-  vec_validate_aligned (im->empty_buffers, tm->n_vlib_mains - 1,
-			CLIB_CACHE_LINE_BYTES);
-
-  node = vlib_get_node_by_name (vm, (u8 *) "error-drop");
-  ASSERT (node);
-  im->error_drop_node_index = node->index;
-
-  node = vlib_get_node_by_name (vm, (u8 *) ESP_NODE);
-
-  ASSERT (node);
-  im->esp_encrypt_node_index = node->index;
-
-  node = vlib_get_node_by_name (vm, (u8 *) "ip4-lookup");
-  ASSERT (node);
-  im->ip4_lookup_node_index = node->index;
-
-  if ((error = vlib_call_init_function (vm, ipsec_cli_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ipsec_tunnel_if_init)))
-    return error;
-
-  esp_init ();
-
-  if ((error = ikev2_init (vm)))
-    return error;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ipsec_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ipsec.h b/vnet/vnet/ipsec/ipsec.h
deleted file mode 100644
index 32c7edfc..00000000
--- a/vnet/vnet/ipsec/ipsec.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __IPSEC_H__
-#define __IPSEC_H__
-
-#define IPSEC_FLAG_IPSEC_GRE_TUNNEL (1 << 0)
-
-#define foreach_ipsec_policy_action \
-  _(0, BYPASS,  "bypass")          \
-  _(1, DISCARD, "discard")         \
-  _(2, RESOLVE, "resolve")         \
-  _(3, PROTECT, "protect")
-
-typedef enum
-{
-#define _(v,f,s) IPSEC_POLICY_ACTION_##f = v,
-  foreach_ipsec_policy_action
-#undef _
-    IPSEC_POLICY_N_ACTION,
-} ipsec_policy_action_t;
-
-#if DPDK_CRYPTO==1
-#define foreach_ipsec_crypto_alg \
-  _(0, NONE,  "none")               \
-  _(1, AES_CBC_128, "aes-cbc-128")  \
-  _(2, AES_CBC_192, "aes-cbc-192")  \
-  _(3, AES_CBC_256, "aes-cbc-256")  \
-  _(4, AES_GCM_128, "aes-gcm-128")
-#else
-#define foreach_ipsec_crypto_alg \
-  _(0, NONE,  "none")               \
-  _(1, AES_CBC_128, "aes-cbc-128")  \
-  _(2, AES_CBC_192, "aes-cbc-192")  \
-  _(3, AES_CBC_256, "aes-cbc-256")
-#endif
-
-typedef enum
-{
-#define _(v,f,s) IPSEC_CRYPTO_ALG_##f = v,
-  foreach_ipsec_crypto_alg
-#undef _
-    IPSEC_CRYPTO_N_ALG,
-} ipsec_crypto_alg_t;
-
-#if DPDK_CRYPTO==1
-#define foreach_ipsec_integ_alg \
-  _(0, NONE,  "none")                                                     \
-  _(1, MD5_96, "md5-96")           /* RFC2403 */                          \
-  _(2, SHA1_96, "sha1-96")         /* RFC2404 */                          \
-  _(3, SHA_256_96, "sha-256-96")   /* draft-ietf-ipsec-ciph-sha-256-00 */ \
-  _(4, SHA_256_128, "sha-256-128") /* RFC4868 */                          \
-  _(5, SHA_384_192, "sha-384-192") /* RFC4868 */                          \
-  _(6, SHA_512_256, "sha-512-256") /* RFC4868 */                          \
-  _(7, AES_GCM_128, "aes-gcm-128")
-#else
-#define foreach_ipsec_integ_alg \
-  _(0, NONE,  "none")                                                     \
-  _(1, MD5_96, "md5-96")           /* RFC2403 */                          \
-  _(2, SHA1_96, "sha1-96")         /* RFC2404 */                          \
-  _(3, SHA_256_96, "sha-256-96")   /* draft-ietf-ipsec-ciph-sha-256-00 */ \
-  _(4, SHA_256_128, "sha-256-128") /* RFC4868 */                          \
-  _(5, SHA_384_192, "sha-384-192") /* RFC4868 */                          \
-  _(6, SHA_512_256, "sha-512-256")	/* RFC4868 */
-#endif
-
-typedef enum
-{
-#define _(v,f,s) IPSEC_INTEG_ALG_##f = v,
-  foreach_ipsec_integ_alg
-#undef _
-    IPSEC_INTEG_N_ALG,
-} ipsec_integ_alg_t;
-
-typedef enum
-{
-  IPSEC_PROTOCOL_AH = 0,
-  IPSEC_PROTOCOL_ESP = 1
-} ipsec_protocol_t;
-
-typedef struct
-{
-  u32 id;
-  u32 spi;
-  ipsec_protocol_t protocol;
-
-  ipsec_crypto_alg_t crypto_alg;
-  u8 crypto_key_len;
-  u8 crypto_key[128];
-
-  ipsec_integ_alg_t integ_alg;
-  u8 integ_key_len;
-  u8 integ_key[128];
-
-  u8 use_esn;
-  u8 use_anti_replay;
-
-  u8 is_tunnel;
-  u8 is_tunnel_ip6;
-  ip46_address_t tunnel_src_addr;
-  ip46_address_t tunnel_dst_addr;
-
-  u32 salt;
-
-  /* runtime */
-  u32 seq;
-  u32 seq_hi;
-  u32 last_seq;
-  u32 last_seq_hi;
-  u64 replay_window;
-} ipsec_sa_t;
-
-typedef struct
-{
-  ip46_address_t start, stop;
-} ip46_address_range_t;
-
-typedef struct
-{
-  u16 start, stop;
-} port_range_t;
-
-typedef struct
-{
-  u8 is_add;
-  u8 esn;
-  u8 anti_replay;
-  ip4_address_t local_ip, remote_ip;
-  u32 local_spi;
-  u32 remote_spi;
-  ipsec_crypto_alg_t crypto_alg;
-  u8 local_crypto_key_len;
-  u8 local_crypto_key[128];
-  u8 remote_crypto_key_len;
-  u8 remote_crypto_key[128];
-  ipsec_integ_alg_t integ_alg;
-  u8 local_integ_key_len;
-  u8 local_integ_key[128];
-  u8 remote_integ_key_len;
-  u8 remote_integ_key[128];
-} ipsec_add_del_tunnel_args_t;
-
-typedef struct
-{
-  u8 is_add;
-  u32 local_sa_id;
-  u32 remote_sa_id;
-  ip4_address_t local_ip;
-  ip4_address_t remote_ip;
-} ipsec_add_del_ipsec_gre_tunnel_args_t;
-
-typedef enum
-{
-  IPSEC_IF_SET_KEY_TYPE_NONE,
-  IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO,
-  IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO,
-  IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG,
-  IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG,
-} ipsec_if_set_key_type_t;
-
-typedef struct
-{
-  u32 id;
-  i32 priority;
-  u8 is_outbound;
-
-  // Selector
-  u8 is_ipv6;
-  ip46_address_range_t laddr;
-  ip46_address_range_t raddr;
-  u8 protocol;
-  port_range_t lport;
-  port_range_t rport;
-
-  // Policy
-  u8 policy;
-  u32 sa_id;
-  u32 sa_index;
-
-  // Counter
-  vlib_counter_t counter;
-} ipsec_policy_t;
-
-typedef struct
-{
-  u32 id;
-  /* pool of policies */
-  ipsec_policy_t *policies;
-  /* vectors of policy indices */
-  u32 *ipv4_outbound_policies;
-  u32 *ipv6_outbound_policies;
-  u32 *ipv4_inbound_protect_policy_indices;
-  u32 *ipv4_inbound_policy_discard_and_bypass_indices;
-  u32 *ipv6_inbound_protect_policy_indices;
-  u32 *ipv6_inbound_policy_discard_and_bypass_indices;
-} ipsec_spd_t;
-
-typedef struct
-{
-  u32 spd_index;
-} ip4_ipsec_config_t;
-
-typedef struct
-{
-  u32 spd_index;
-} ip6_ipsec_config_t;
-
-typedef struct
-{
-  u32 input_sa_index;
-  u32 output_sa_index;
-  u32 hw_if_index;
-} ipsec_tunnel_if_t;
-
-typedef struct
-{
-  /* pool of tunnel instances */
-  ipsec_spd_t *spds;
-  ipsec_sa_t *sad;
-
-  /* pool of tunnel interfaces */
-  ipsec_tunnel_if_t *tunnel_interfaces;
-  u32 *free_tunnel_if_indices;
-
-  u32 **empty_buffers;
-
-  uword *tunnel_index_by_key;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-
-  /* next node indices */
-  u32 feature_next_node_index[32];
-
-  /* hashes */
-  uword *spd_index_by_spd_id;
-  uword *spd_index_by_sw_if_index;
-  uword *sa_index_by_sa_id;
-  uword *ipsec_if_pool_index_by_key;
-
-  /* node indexes */
-  u32 error_drop_node_index;
-  u32 ip4_lookup_node_index;
-  u32 esp_encrypt_node_index;
-
-} ipsec_main_t;
-
-ipsec_main_t ipsec_main;
-
-extern vlib_node_registration_t esp_encrypt_node;
-extern vlib_node_registration_t esp_decrypt_node;
-extern vlib_node_registration_t ipsec_if_output_node;
-extern vlib_node_registration_t ipsec_if_input_node;
-
-
-/*
- * functions
- */
-int ipsec_set_interface_spd (vlib_main_t * vm, u32 sw_if_index, u32 spd_id,
-			     int is_add);
-int ipsec_add_del_spd (vlib_main_t * vm, u32 spd_id, int is_add);
-int ipsec_add_del_policy (vlib_main_t * vm, ipsec_policy_t * policy,
-			  int is_add);
-int ipsec_add_del_sa (vlib_main_t * vm, ipsec_sa_t * new_sa, int is_add);
-int ipsec_set_sa_key (vlib_main_t * vm, ipsec_sa_t * sa_update);
-
-u32 ipsec_get_sa_index_by_sa_id (u32 sa_id);
-u8 *format_ipsec_if_output_trace (u8 * s, va_list * args);
-u8 *format_ipsec_policy_action (u8 * s, va_list * args);
-u8 *format_ipsec_crypto_alg (u8 * s, va_list * args);
-u8 *format_ipsec_integ_alg (u8 * s, va_list * args);
-u8 *format_ipsec_replay_window (u8 * s, va_list * args);
-uword unformat_ipsec_policy_action (unformat_input_t * input, va_list * args);
-uword unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args);
-uword unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args);
-
-/*u32 ipsec_add_del_tunnel_if (vnet_main_t * vnm, ipsec_add_del_tunnel_args_t * args); */
-int ipsec_add_del_tunnel_if (ipsec_add_del_tunnel_args_t * args);
-int ipsec_add_del_ipsec_gre_tunnel (vnet_main_t * vnm,
-				    ipsec_add_del_ipsec_gre_tunnel_args_t *
-				    args);
-int ipsec_set_interface_key (vnet_main_t * vnm, u32 hw_if_index,
-			     ipsec_if_set_key_type_t type, u8 alg, u8 * key);
-
-
-/*
- *  inline functions
- */
-
-always_inline void
-ipsec_alloc_empty_buffers (vlib_main_t * vm, ipsec_main_t * im)
-{
-  u32 cpu_index = os_get_cpu_number ();
-  uword l = vec_len (im->empty_buffers[cpu_index]);
-  uword n_alloc = 0;
-
-  if (PREDICT_FALSE (l < VLIB_FRAME_SIZE))
-    {
-      if (!im->empty_buffers[cpu_index])
-	{
-	  vec_alloc (im->empty_buffers[cpu_index], 2 * VLIB_FRAME_SIZE);
-	}
-
-      n_alloc = vlib_buffer_alloc (vm, im->empty_buffers[cpu_index] + l,
-				   2 * VLIB_FRAME_SIZE - l);
-
-      _vec_len (im->empty_buffers[cpu_index]) = l + n_alloc;
-    }
-}
-
-static_always_inline u32
-get_next_output_feature_node_index (vlib_buffer_t * b,
-				    vlib_node_runtime_t * nr)
-{
-  u32 next;
-  u32 sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_TX];
-  vlib_main_t *vm = vlib_get_main ();
-  vlib_node_t *node = vlib_get_node (vm, nr->node_index);
-
-  vnet_feature_next (sw_if_index, &next, b);
-  return node->next_nodes[next];
-}
-
-#endif /* __IPSEC_H__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ipsec_api.c b/vnet/vnet/ipsec/ipsec_api.c
deleted file mode 100644
index 30cc5bd2..00000000
--- a/vnet/vnet/ipsec/ipsec_api.c
+++ /dev/null
@@ -1,537 +0,0 @@
-/*
- *------------------------------------------------------------------
- * ipsec_api.c - ipsec api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#if IPSEC > 0
-#include <vnet/ipsec/ipsec.h>
-#include <vnet/ipsec/ikev2.h>
-#endif /* IPSEC */
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                                             \
-_(IPSEC_SPD_ADD_DEL, ipsec_spd_add_del)                                 \
-_(IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd)             \
-_(IPSEC_SPD_ADD_DEL_ENTRY, ipsec_spd_add_del_entry)                     \
-_(IPSEC_SAD_ADD_DEL_ENTRY, ipsec_sad_add_del_entry)                     \
-_(IPSEC_SA_SET_KEY, ipsec_sa_set_key)                                   \
-_(IPSEC_SPD_DUMP, ipsec_spd_dump)                                       \
-_(IKEV2_PROFILE_ADD_DEL, ikev2_profile_add_del)                         \
-_(IKEV2_PROFILE_SET_AUTH, ikev2_profile_set_auth)                       \
-_(IKEV2_PROFILE_SET_ID, ikev2_profile_set_id)                           \
-_(IKEV2_PROFILE_SET_TS, ikev2_profile_set_ts)                           \
-_(IKEV2_SET_LOCAL_KEY, ikev2_set_local_key)
-
-static void vl_api_ipsec_spd_add_del_t_handler
-  (vl_api_ipsec_spd_add_del_t * mp)
-{
-#if IPSEC == 0
-  clib_warning ("unimplemented");
-#else
-
-  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
-  vl_api_ipsec_spd_add_del_reply_t *rmp;
-  int rv;
-
-#if DPDK > 0
-  rv = ipsec_add_del_spd (vm, ntohl (mp->spd_id), mp->is_add);
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  REPLY_MACRO (VL_API_IPSEC_SPD_ADD_DEL_REPLY);
-#endif
-}
-
-static void vl_api_ipsec_interface_add_del_spd_t_handler
-  (vl_api_ipsec_interface_add_del_spd_t * mp)
-{
-  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
-  vl_api_ipsec_interface_add_del_spd_reply_t *rmp;
-  int rv;
-  u32 sw_if_index __attribute__ ((unused));
-  u32 spd_id __attribute__ ((unused));
-
-  sw_if_index = ntohl (mp->sw_if_index);
-  spd_id = ntohl (mp->spd_id);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-#if IPSEC > 0
-  rv = ipsec_set_interface_spd (vm, sw_if_index, spd_id, mp->is_add);
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_IPSEC_INTERFACE_ADD_DEL_SPD_REPLY);
-}
-
-static void vl_api_ipsec_spd_add_del_entry_t_handler
-  (vl_api_ipsec_spd_add_del_entry_t * mp)
-{
-  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
-  vl_api_ipsec_spd_add_del_entry_reply_t *rmp;
-  int rv;
-
-#if IPSEC > 0
-  ipsec_policy_t p;
-
-  memset (&p, 0, sizeof (p));
-
-  p.id = ntohl (mp->spd_id);
-  p.priority = ntohl (mp->priority);
-  p.is_outbound = mp->is_outbound;
-  p.is_ipv6 = mp->is_ipv6;
-
-  if (mp->is_ipv6 || mp->is_ip_any)
-    {
-      clib_memcpy (&p.raddr.start, mp->remote_address_start, 16);
-      clib_memcpy (&p.raddr.stop, mp->remote_address_stop, 16);
-      clib_memcpy (&p.laddr.start, mp->local_address_start, 16);
-      clib_memcpy (&p.laddr.stop, mp->local_address_stop, 16);
-    }
-  else
-    {
-      clib_memcpy (&p.raddr.start.ip4.data, mp->remote_address_start, 4);
-      clib_memcpy (&p.raddr.stop.ip4.data, mp->remote_address_stop, 4);
-      clib_memcpy (&p.laddr.start.ip4.data, mp->local_address_start, 4);
-      clib_memcpy (&p.laddr.stop.ip4.data, mp->local_address_stop, 4);
-    }
-  p.protocol = mp->protocol;
-  p.rport.start = ntohs (mp->remote_port_start);
-  p.rport.stop = ntohs (mp->remote_port_stop);
-  p.lport.start = ntohs (mp->local_port_start);
-  p.lport.stop = ntohs (mp->local_port_stop);
-  /* policy action resolve unsupported */
-  if (mp->policy == IPSEC_POLICY_ACTION_RESOLVE)
-    {
-      clib_warning ("unsupported action: 'resolve'");
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto out;
-    }
-  p.policy = mp->policy;
-  p.sa_id = ntohl (mp->sa_id);
-
-  rv = ipsec_add_del_policy (vm, &p, mp->is_add);
-  if (rv)
-    goto out;
-
-  if (mp->is_ip_any)
-    {
-      p.is_ipv6 = 1;
-      rv = ipsec_add_del_policy (vm, &p, mp->is_add);
-    }
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-  goto out;
-#endif
-
-out:
-  REPLY_MACRO (VL_API_IPSEC_SPD_ADD_DEL_ENTRY_REPLY);
-}
-
-static void vl_api_ipsec_sad_add_del_entry_t_handler
-  (vl_api_ipsec_sad_add_del_entry_t * mp)
-{
-  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
-  vl_api_ipsec_sad_add_del_entry_reply_t *rmp;
-  int rv;
-#if IPSEC > 0
-  ipsec_sa_t sa;
-
-  memset (&sa, 0, sizeof (sa));
-
-  sa.id = ntohl (mp->sad_id);
-  sa.spi = ntohl (mp->spi);
-  /* security protocol AH unsupported */
-  if (mp->protocol == IPSEC_PROTOCOL_AH)
-    {
-      clib_warning ("unsupported security protocol 'AH'");
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto out;
-    }
-  sa.protocol = mp->protocol;
-  /* check for unsupported crypto-alg */
-  if (mp->crypto_algorithm < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
-      mp->crypto_algorithm >= IPSEC_CRYPTO_N_ALG)
-    {
-      clib_warning ("unsupported crypto-alg: '%U'", format_ipsec_crypto_alg,
-		    mp->crypto_algorithm);
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto out;
-    }
-  sa.crypto_alg = mp->crypto_algorithm;
-  sa.crypto_key_len = mp->crypto_key_length;
-  clib_memcpy (&sa.crypto_key, mp->crypto_key, sizeof (sa.crypto_key));
-  /* check for unsupported integ-alg */
-#if DPDK_CRYPTO==1
-  if (mp->integrity_algorithm < IPSEC_INTEG_ALG_NONE ||
-#else
-  if (mp->integrity_algorithm < IPSEC_INTEG_ALG_SHA1_96 ||
-#endif
-      mp->integrity_algorithm >= IPSEC_INTEG_N_ALG)
-    {
-      clib_warning ("unsupported integ-alg: '%U'", format_ipsec_integ_alg,
-		    mp->integrity_algorithm);
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto out;
-    }
-
-#if DPDK_CRYPTO==1
-  /*Special cases, aes-gcm-128 encryption */
-  if (mp->crypto_algorithm == IPSEC_CRYPTO_ALG_AES_GCM_128)
-    {
-      if (mp->integrity_algorithm != IPSEC_INTEG_ALG_NONE
-	  && mp->integrity_algorithm != IPSEC_INTEG_ALG_AES_GCM_128)
-	{
-	  clib_warning
-	    ("unsupported: aes-gcm-128 crypto-alg needs none as integ-alg");
-	  rv = VNET_API_ERROR_UNIMPLEMENTED;
-	  goto out;
-	}
-      else			/*set integ-alg internally to aes-gcm-128 */
-	mp->integrity_algorithm = IPSEC_INTEG_ALG_AES_GCM_128;
-    }
-  else if (mp->integrity_algorithm == IPSEC_INTEG_ALG_AES_GCM_128)
-    {
-      clib_warning ("unsupported integ-alg: aes-gcm-128");
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto out;
-    }
-  else if (mp->integrity_algorithm == IPSEC_INTEG_ALG_NONE)
-    {
-      clib_warning ("unsupported integ-alg: none");
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto out;
-    }
-#endif
-
-  sa.integ_alg = mp->integrity_algorithm;
-  sa.integ_key_len = mp->integrity_key_length;
-  clib_memcpy (&sa.integ_key, mp->integrity_key, sizeof (sa.integ_key));
-  sa.use_esn = mp->use_extended_sequence_number;
-  sa.is_tunnel = mp->is_tunnel;
-  sa.is_tunnel_ip6 = mp->is_tunnel_ipv6;
-  if (sa.is_tunnel_ip6)
-    {
-      clib_memcpy (&sa.tunnel_src_addr, mp->tunnel_src_address, 16);
-      clib_memcpy (&sa.tunnel_dst_addr, mp->tunnel_dst_address, 16);
-    }
-  else
-    {
-      clib_memcpy (&sa.tunnel_src_addr.ip4.data, mp->tunnel_src_address, 4);
-      clib_memcpy (&sa.tunnel_dst_addr.ip4.data, mp->tunnel_dst_address, 4);
-    }
-
-  rv = ipsec_add_del_sa (vm, &sa, mp->is_add);
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-  goto out;
-#endif
-
-out:
-  REPLY_MACRO (VL_API_IPSEC_SAD_ADD_DEL_ENTRY_REPLY);
-}
-
-static void
-send_ipsec_spd_details (ipsec_policy_t * p, unix_shared_memory_queue_t * q,
-			u32 context)
-{
-  vl_api_ipsec_spd_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IPSEC_SPD_DETAILS);
-  mp->context = context;
-
-  mp->spd_id = htonl (p->id);
-  mp->priority = htonl (p->priority);
-  mp->is_outbound = p->is_outbound;
-  mp->is_ipv6 = p->is_ipv6;
-  if (p->is_ipv6)
-    {
-      memcpy (mp->local_start_addr, &p->laddr.start.ip6, 16);
-      memcpy (mp->local_stop_addr, &p->laddr.stop.ip6, 16);
-      memcpy (mp->remote_start_addr, &p->raddr.start.ip6, 16);
-      memcpy (mp->remote_stop_addr, &p->raddr.stop.ip6, 16);
-    }
-  else
-    {
-      memcpy (mp->local_start_addr, &p->laddr.start.ip4, 4);
-      memcpy (mp->local_stop_addr, &p->laddr.stop.ip4, 4);
-      memcpy (mp->remote_start_addr, &p->raddr.start.ip4, 4);
-      memcpy (mp->remote_stop_addr, &p->raddr.stop.ip4, 4);
-    }
-  mp->local_start_port = htons (p->lport.start);
-  mp->local_stop_port = htons (p->lport.stop);
-  mp->remote_start_port = htons (p->rport.start);
-  mp->remote_stop_port = htons (p->rport.stop);
-  mp->protocol = p->protocol;
-  mp->policy = p->policy;
-  mp->sa_id = htonl (p->sa_id);
-  mp->bytes = clib_host_to_net_u64 (p->counter.bytes);
-  mp->packets = clib_host_to_net_u64 (p->counter.packets);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_ipsec_spd_dump_t_handler (vl_api_ipsec_spd_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  ipsec_main_t *im = &ipsec_main;
-  ipsec_policy_t *policy;
-  ipsec_spd_t *spd;
-  uword *p;
-  u32 spd_index;
-#if IPSEC > 0
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  p = hash_get (im->spd_index_by_spd_id, ntohl (mp->spd_id));
-  if (!p)
-    return;
-
-  spd_index = p[0];
-  spd = pool_elt_at_index (im->spds, spd_index);
-
-  /* *INDENT-OFF* */
-  pool_foreach (policy, spd->policies,
-  ({
-    if (mp->sa_id == ~(0) || ntohl (mp->sa_id) == policy->sa_id)
-      send_ipsec_spd_details (policy, q,
-                              mp->context);}
-    ));
-  /* *INDENT-ON* */
-#else
-  clib_warning ("unimplemented");
-#endif
-}
-
-static void
-vl_api_ipsec_sa_set_key_t_handler (vl_api_ipsec_sa_set_key_t * mp)
-{
-  vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
-  vl_api_ipsec_sa_set_key_reply_t *rmp;
-  int rv;
-#if IPSEC > 0
-  ipsec_sa_t sa;
-  sa.id = ntohl (mp->sa_id);
-  sa.crypto_key_len = mp->crypto_key_length;
-  clib_memcpy (&sa.crypto_key, mp->crypto_key, sizeof (sa.crypto_key));
-  sa.integ_key_len = mp->integrity_key_length;
-  clib_memcpy (&sa.integ_key, mp->integrity_key, sizeof (sa.integ_key));
-
-  rv = ipsec_set_sa_key (vm, &sa);
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  REPLY_MACRO (VL_API_IPSEC_SA_SET_KEY_REPLY);
-}
-
-static void
-vl_api_ikev2_profile_add_del_t_handler (vl_api_ikev2_profile_add_del_t * mp)
-{
-  vl_api_ikev2_profile_add_del_reply_t *rmp;
-  int rv = 0;
-
-#if IPSEC > 0
-  vlib_main_t *vm = vlib_get_main ();
-  clib_error_t *error;
-  u8 *tmp = format (0, "%s", mp->name);
-  error = ikev2_add_del_profile (vm, tmp, mp->is_add);
-  vec_free (tmp);
-  if (error)
-    rv = VNET_API_ERROR_UNSPECIFIED;
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  REPLY_MACRO (VL_API_IKEV2_PROFILE_ADD_DEL_REPLY);
-}
-
-static void
-  vl_api_ikev2_profile_set_auth_t_handler
-  (vl_api_ikev2_profile_set_auth_t * mp)
-{
-  vl_api_ikev2_profile_set_auth_reply_t *rmp;
-  int rv = 0;
-
-#if IPSEC > 0
-  vlib_main_t *vm = vlib_get_main ();
-  clib_error_t *error;
-  u8 *tmp = format (0, "%s", mp->name);
-  u8 *data = vec_new (u8, mp->data_len);
-  clib_memcpy (data, mp->data, mp->data_len);
-  error = ikev2_set_profile_auth (vm, tmp, mp->auth_method, data, mp->is_hex);
-  vec_free (tmp);
-  vec_free (data);
-  if (error)
-    rv = VNET_API_ERROR_UNSPECIFIED;
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  REPLY_MACRO (VL_API_IKEV2_PROFILE_SET_AUTH_REPLY);
-}
-
-static void
-vl_api_ikev2_profile_set_id_t_handler (vl_api_ikev2_profile_set_id_t * mp)
-{
-  vl_api_ikev2_profile_add_del_reply_t *rmp;
-  int rv = 0;
-
-#if IPSEC > 0
-  vlib_main_t *vm = vlib_get_main ();
-  clib_error_t *error;
-  u8 *tmp = format (0, "%s", mp->name);
-  u8 *data = vec_new (u8, mp->data_len);
-  clib_memcpy (data, mp->data, mp->data_len);
-  error = ikev2_set_profile_id (vm, tmp, mp->id_type, data, mp->is_local);
-  vec_free (tmp);
-  vec_free (data);
-  if (error)
-    rv = VNET_API_ERROR_UNSPECIFIED;
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  REPLY_MACRO (VL_API_IKEV2_PROFILE_SET_ID_REPLY);
-}
-
-static void
-vl_api_ikev2_profile_set_ts_t_handler (vl_api_ikev2_profile_set_ts_t * mp)
-{
-  vl_api_ikev2_profile_set_ts_reply_t *rmp;
-  int rv = 0;
-
-#if IPSEC > 0
-  vlib_main_t *vm = vlib_get_main ();
-  clib_error_t *error;
-  u8 *tmp = format (0, "%s", mp->name);
-  error = ikev2_set_profile_ts (vm, tmp, mp->proto, mp->start_port,
-				mp->end_port, (ip4_address_t) mp->start_addr,
-				(ip4_address_t) mp->end_addr, mp->is_local);
-  vec_free (tmp);
-  if (error)
-    rv = VNET_API_ERROR_UNSPECIFIED;
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  REPLY_MACRO (VL_API_IKEV2_PROFILE_SET_TS_REPLY);
-}
-
-static void
-vl_api_ikev2_set_local_key_t_handler (vl_api_ikev2_set_local_key_t * mp)
-{
-  vl_api_ikev2_profile_set_ts_reply_t *rmp;
-  int rv = 0;
-
-#if IPSEC > 0
-  vlib_main_t *vm = vlib_get_main ();
-  clib_error_t *error;
-
-  error = ikev2_set_local_key (vm, mp->key_file);
-  if (error)
-    rv = VNET_API_ERROR_UNSPECIFIED;
-#else
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif
-
-  REPLY_MACRO (VL_API_IKEV2_SET_LOCAL_KEY_REPLY);
-}
-
-/*
- * ipsec_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_ipsec;
-#undef _
-}
-
-static clib_error_t *
-ipsec_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (ipsec_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ipsec_cli.c b/vnet/vnet/ipsec/ipsec_cli.c
deleted file mode 100644
index 7ab85d4a..00000000
--- a/vnet/vnet/ipsec/ipsec_cli.c
+++ /dev/null
@@ -1,807 +0,0 @@
-/*
- * decap.c : IPSec tunnel support
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-#include <vnet/interface.h>
-
-#include <vnet/ipsec/ipsec.h>
-
-static clib_error_t *
-set_interface_spd_command_fn (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ipsec_main_t *im = &ipsec_main;
-  u32 sw_if_index = (u32) ~ 0;
-  u32 spd_id;
-  int is_add = 1;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  if (unformat
-      (line_input, "%U %u", unformat_vnet_sw_interface, im->vnet_main,
-       &sw_if_index, &spd_id))
-    ;
-  else if (unformat (line_input, "del"))
-    is_add = 0;
-  else
-    return clib_error_return (0, "parse error: '%U'",
-			      format_unformat_error, line_input);
-
-  unformat_free (line_input);
-
-  ipsec_set_interface_spd (vm, sw_if_index, spd_id, is_add);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_spd_command, static) = {
-    .path = "set interface ipsec spd",
-    .short_help =
-    "set interface ipsec spd <int> <id>",
-    .function = set_interface_spd_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-ipsec_sa_add_del_command_fn (vlib_main_t * vm,
-			     unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ipsec_sa_t sa;
-  int is_add = ~0;
-  u8 *ck = 0, *ik = 0;
-
-  memset (&sa, 0, sizeof (sa));
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "add %u", &sa.id))
-	is_add = 1;
-      else if (unformat (line_input, "del %u", &sa.id))
-	is_add = 0;
-      else if (unformat (line_input, "spi %u", &sa.spi))
-	;
-      else if (unformat (line_input, "esp"))
-	sa.protocol = IPSEC_PROTOCOL_ESP;
-      else if (unformat (line_input, "ah"))
-	//sa.protocol = IPSEC_PROTOCOL_AH;
-	return clib_error_return (0, "unsupported security protocol 'AH'");
-      else
-	if (unformat (line_input, "crypto-key %U", unformat_hex_string, &ck))
-	sa.crypto_key_len = vec_len (ck);
-      else
-	if (unformat
-	    (line_input, "crypto-alg %U", unformat_ipsec_crypto_alg,
-	     &sa.crypto_alg))
-	{
-	  if (sa.crypto_alg < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
-	      sa.crypto_alg >= IPSEC_CRYPTO_N_ALG)
-	    return clib_error_return (0, "unsupported crypto-alg: '%U'",
-				      format_ipsec_crypto_alg, sa.crypto_alg);
-	}
-      else
-	if (unformat (line_input, "integ-key %U", unformat_hex_string, &ik))
-	sa.integ_key_len = vec_len (ik);
-      else if (unformat (line_input, "integ-alg %U", unformat_ipsec_integ_alg,
-			 &sa.integ_alg))
-	{
-#if DPDK_CRYPTO==1
-	  if (sa.integ_alg < IPSEC_INTEG_ALG_NONE ||
-#else
-	  if (sa.integ_alg < IPSEC_INTEG_ALG_SHA1_96 ||
-#endif
-	      sa.integ_alg >= IPSEC_INTEG_N_ALG)
-	    return clib_error_return (0, "unsupported integ-alg: '%U'",
-				      format_ipsec_integ_alg, sa.integ_alg);
-	}
-      else if (unformat (line_input, "tunnel-src %U",
-			 unformat_ip4_address, &sa.tunnel_src_addr.ip4))
-	sa.is_tunnel = 1;
-      else if (unformat (line_input, "tunnel-dst %U",
-			 unformat_ip4_address, &sa.tunnel_dst_addr.ip4))
-	sa.is_tunnel = 1;
-      else if (unformat (line_input, "tunnel-src %U",
-			 unformat_ip6_address, &sa.tunnel_src_addr.ip6))
-	{
-	  sa.is_tunnel = 1;
-	  sa.is_tunnel_ip6 = 1;
-	}
-      else if (unformat (line_input, "tunnel-dst %U",
-			 unformat_ip6_address, &sa.tunnel_dst_addr.ip6))
-	{
-	  sa.is_tunnel = 1;
-	  sa.is_tunnel_ip6 = 1;
-	}
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-#if DPDK_CRYPTO==1
-  /*Special cases, aes-gcm-128 encryption */
-  if (sa.crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
-    {
-      if (sa.integ_alg != IPSEC_INTEG_ALG_NONE
-	  && sa.integ_alg != IPSEC_INTEG_ALG_AES_GCM_128)
-	return clib_error_return (0,
-				  "unsupported: aes-gcm-128 crypto-alg needs none as integ-alg");
-      else			/*set integ-alg internally to aes-gcm-128 */
-	sa.integ_alg = IPSEC_INTEG_ALG_AES_GCM_128;
-    }
-  else if (sa.integ_alg == IPSEC_INTEG_ALG_AES_GCM_128)
-    return clib_error_return (0, "unsupported integ-alg: aes-gcm-128");
-  else if (sa.integ_alg == IPSEC_INTEG_ALG_NONE)
-    return clib_error_return (0, "unsupported integ-alg: none");
-#endif
-
-  unformat_free (line_input);
-
-  if (sa.crypto_key_len > sizeof (sa.crypto_key))
-    sa.crypto_key_len = sizeof (sa.crypto_key);
-
-  if (sa.integ_key_len > sizeof (sa.integ_key))
-    sa.integ_key_len = sizeof (sa.integ_key);
-
-  if (ck)
-    strncpy ((char *) sa.crypto_key, (char *) ck, sa.crypto_key_len);
-
-  if (ik)
-    strncpy ((char *) sa.integ_key, (char *) ik, sa.integ_key_len);
-
-  ipsec_add_del_sa (vm, &sa, is_add);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ipsec_sa_add_del_command, static) = {
-    .path = "ipsec sa",
-    .short_help =
-    "ipsec sa [add|del]",
-    .function = ipsec_sa_add_del_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-ipsec_spd_add_del_command_fn (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u32 spd_id = ~0;
-  int is_add = ~0;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "add"))
-	is_add = 1;
-      else if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "%u", &spd_id))
-	;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (spd_id == ~0)
-    return clib_error_return (0, "please specify SPD ID");
-
-  ipsec_add_del_spd (vm, spd_id, is_add);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ipsec_spd_add_del_command, static) = {
-    .path = "ipsec spd",
-    .short_help =
-    "ipsec spd [add|del] <id>",
-    .function = ipsec_spd_add_del_command_fn,
-};
-/* *INDENT-ON* */
-
-
-static clib_error_t *
-ipsec_policy_add_del_command_fn (vlib_main_t * vm,
-				 unformat_input_t * input,
-				 vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ipsec_policy_t p;
-  int is_add = 0;
-  int is_ip_any = 1;
-  u32 tmp, tmp2;
-
-  memset (&p, 0, sizeof (p));
-  p.lport.stop = p.rport.stop = ~0;
-  p.laddr.stop.ip4.as_u32 = p.raddr.stop.ip4.as_u32 = (u32) ~ 0;
-  p.laddr.stop.ip6.as_u64[0] = p.laddr.stop.ip6.as_u64[1] = (u64) ~ 0;
-  p.raddr.stop.ip6.as_u64[0] = p.raddr.stop.ip6.as_u64[1] = (u64) ~ 0;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "add"))
-	is_add = 1;
-      else if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "spd %u", &p.id))
-	;
-      else if (unformat (line_input, "inbound"))
-	p.is_outbound = 0;
-      else if (unformat (line_input, "outbound"))
-	p.is_outbound = 1;
-      else if (unformat (line_input, "priority %d", &p.priority))
-	;
-      else if (unformat (line_input, "protocol %u", &tmp))
-	p.protocol = (u8) tmp;
-      else
-	if (unformat
-	    (line_input, "action %U", unformat_ipsec_policy_action,
-	     &p.policy))
-	{
-	  if (p.policy == IPSEC_POLICY_ACTION_RESOLVE)
-	    return clib_error_return (0, "unsupported action: 'resolve'");
-	}
-      else if (unformat (line_input, "sa %u", &p.sa_id))
-	;
-      else if (unformat (line_input, "local-ip-range %U - %U",
-			 unformat_ip4_address, &p.laddr.start.ip4,
-			 unformat_ip4_address, &p.laddr.stop.ip4))
-	is_ip_any = 0;
-      else if (unformat (line_input, "remote-ip-range %U - %U",
-			 unformat_ip4_address, &p.raddr.start.ip4,
-			 unformat_ip4_address, &p.raddr.stop.ip4))
-	is_ip_any = 0;
-      else if (unformat (line_input, "local-ip-range %U - %U",
-			 unformat_ip6_address, &p.laddr.start.ip6,
-			 unformat_ip6_address, &p.laddr.stop.ip6))
-	{
-	  p.is_ipv6 = 1;
-	  is_ip_any = 0;
-	}
-      else if (unformat (line_input, "remote-ip-range %U - %U",
-			 unformat_ip6_address, &p.raddr.start.ip6,
-			 unformat_ip6_address, &p.raddr.stop.ip6))
-	{
-	  p.is_ipv6 = 1;
-	  is_ip_any = 0;
-	}
-      else if (unformat (line_input, "local-port-range %u - %u", &tmp, &tmp2))
-	{
-	  p.lport.start = tmp;
-	  p.lport.stop = tmp2;
-	}
-      else
-	if (unformat (line_input, "remote-port-range %u - %u", &tmp, &tmp2))
-	{
-	  p.rport.start = tmp;
-	  p.rport.stop = tmp2;
-	}
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  ipsec_add_del_policy (vm, &p, is_add);
-  if (is_ip_any)
-    {
-      p.is_ipv6 = 1;
-      ipsec_add_del_policy (vm, &p, is_add);
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ipsec_policy_add_del_command, static) = {
-    .path = "ipsec policy",
-    .short_help =
-    "ipsec policy [add|del] spd <id> priority <n> ",
-    .function = ipsec_policy_add_del_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_ipsec_sa_key_command_fn (vlib_main_t * vm,
-			     unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ipsec_sa_t sa;
-  u8 *ck = 0, *ik = 0;
-
-  memset (&sa, 0, sizeof (sa));
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "%u", &sa.id))
-	;
-      else
-	if (unformat (line_input, "crypto-key %U", unformat_hex_string, &ck))
-	sa.crypto_key_len = vec_len (ck);
-      else
-	if (unformat (line_input, "integ-key %U", unformat_hex_string, &ik))
-	sa.integ_key_len = vec_len (ik);
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (sa.crypto_key_len > sizeof (sa.crypto_key))
-    sa.crypto_key_len = sizeof (sa.crypto_key);
-
-  if (sa.integ_key_len > sizeof (sa.integ_key))
-    sa.integ_key_len = sizeof (sa.integ_key);
-
-  if (ck)
-    strncpy ((char *) sa.crypto_key, (char *) ck, sa.crypto_key_len);
-
-  if (ik)
-    strncpy ((char *) sa.integ_key, (char *) ik, sa.integ_key_len);
-
-  ipsec_set_sa_key (vm, &sa);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_ipsec_sa_key_command, static) = {
-    .path = "set ipsec sa",
-    .short_help =
-    "set ipsec sa <id> crypto-key <key> integ-key <key>",
-    .function = set_ipsec_sa_key_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-show_ipsec_command_fn (vlib_main_t * vm,
-		       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  ipsec_spd_t *spd;
-  ipsec_sa_t *sa;
-  ipsec_policy_t *p;
-  ipsec_main_t *im = &ipsec_main;
-  u32 *i;
-  ipsec_tunnel_if_t *t;
-  vnet_hw_interface_t *hi;
-
-  /* *INDENT-OFF* */
-  pool_foreach (sa, im->sad, ({
-    if (sa->id) {
-      vlib_cli_output(vm, "sa %u spi %u mode %s protocol %s", sa->id, sa->spi,
-                      sa->is_tunnel ? "tunnel" : "transport",
-                      sa->protocol ? "esp" : "ah");
-      if (sa->protocol == IPSEC_PROTOCOL_ESP) {
-        vlib_cli_output(vm, "  crypto alg %U%s%U integrity alg %U%s%U",
-                        format_ipsec_crypto_alg, sa->crypto_alg,
-                        sa->crypto_alg ? " key " : "",
-                        format_hex_bytes, sa->crypto_key, sa->crypto_key_len,
-                        format_ipsec_integ_alg, sa->integ_alg,
-                        sa->integ_alg ? " key " : "",
-                        format_hex_bytes, sa->integ_key, sa->integ_key_len);
-      }
-      if (sa->is_tunnel && sa->is_tunnel_ip6) {
-        vlib_cli_output(vm, "  tunnel src %U dst %U",
-                        format_ip6_address, &sa->tunnel_src_addr.ip6,
-                        format_ip6_address, &sa->tunnel_dst_addr.ip6);
-      } else if (sa->is_tunnel) {
-        vlib_cli_output(vm, "  tunnel src %U dst %U",
-                        format_ip4_address, &sa->tunnel_src_addr.ip4,
-                        format_ip4_address, &sa->tunnel_dst_addr.ip4);
-      }
-    }
-  }));
-  /* *INDENT-ON* */
-
-  /* *INDENT-OFF* */
-  pool_foreach (spd, im->spds, ({
-    vlib_cli_output(vm, "spd %u", spd->id);
-
-    vlib_cli_output(vm, " outbound policies");
-    vec_foreach(i, spd->ipv4_outbound_policies)
-      {
-        p = pool_elt_at_index(spd->policies, *i);
-        vlib_cli_output(vm, "  priority %d action %U protocol %s%s",
-                        p->priority,
-                        format_ipsec_policy_action, p->policy,
-                        p->protocol ?
-                          format(0, "%U", format_ip_protocol, p->protocol) :
-                          (u8 *) "any",
-                        p->policy == IPSEC_POLICY_ACTION_PROTECT ?
-                          format(0, " sa %u", p->sa_id) :
-                          (u8 *) "");
-        vlib_cli_output(vm, "   local addr range %U - %U port range %u - %u",
-                        format_ip4_address, &p->laddr.start.ip4,
-                        format_ip4_address, &p->laddr.stop.ip4,
-                        p->lport.start, p->lport.stop);
-        vlib_cli_output(vm, "   remte addr range %U - %U port range %u - %u",
-                        format_ip4_address, &p->raddr.start.ip4,
-                        format_ip4_address, &p->raddr.stop.ip4,
-                        p->rport.start, p->rport.stop);
-        vlib_cli_output(vm, "   packets %u bytes %u", p->counter.packets,
-                        p->counter.bytes);
-      };
-    vec_foreach(i, spd->ipv6_outbound_policies)
-      {
-        p = pool_elt_at_index(spd->policies, *i);
-        vlib_cli_output(vm, "  priority %d action %U protocol %s%s",
-                        p->priority,
-                        format_ipsec_policy_action, p->policy,
-                        p->protocol ?
-                          format(0, "%U", format_ip_protocol, p->protocol) :
-                          (u8 *) "any",
-                        p->policy == IPSEC_POLICY_ACTION_PROTECT ?
-                          format(0, " sa %u", p->sa_id) :
-                          (u8 *) "");
-        vlib_cli_output(vm, "   local addr range %U - %U port range %u - %u",
-                        format_ip6_address, &p->laddr.start.ip6,
-                        format_ip6_address, &p->laddr.stop.ip6,
-                        p->lport.start, p->lport.stop);
-        vlib_cli_output(vm, "   remote addr range %U - %U port range %u - %u",
-                        format_ip6_address, &p->raddr.start.ip6,
-                        format_ip6_address, &p->raddr.stop.ip6,
-                        p->rport.start, p->rport.stop);
-        vlib_cli_output(vm, "   packets %u bytes %u", p->counter.packets,
-                        p->counter.bytes);
-      };
-    vlib_cli_output(vm, " inbound policies");
-    vec_foreach(i, spd->ipv4_inbound_protect_policy_indices)
-      {
-        p = pool_elt_at_index(spd->policies, *i);
-        vlib_cli_output(vm, "  priority %d action %U protocol %s%s",
-                        p->priority,
-                        format_ipsec_policy_action, p->policy,
-                        p->protocol ?
-                          format(0, "%U", format_ip_protocol, p->protocol) :
-                          (u8 *) "any",
-                        p->policy == IPSEC_POLICY_ACTION_PROTECT ?
-                          format(0, " sa %u", p->sa_id) :
-                          (u8 *) "");
-        vlib_cli_output(vm, "   local addr range %U - %U port range %u - %u",
-                        format_ip4_address, &p->laddr.start.ip4,
-                        format_ip4_address, &p->laddr.stop.ip4,
-                        p->lport.start, p->lport.stop);
-        vlib_cli_output(vm, "   remte addr range %U - %U port range %u - %u",
-                        format_ip4_address, &p->raddr.start.ip4,
-                        format_ip4_address, &p->raddr.stop.ip4,
-                        p->rport.start, p->rport.stop);
-        vlib_cli_output(vm, "   packets %u bytes %u", p->counter.packets,
-                        p->counter.bytes);
-      };
-    vec_foreach(i, spd->ipv4_inbound_policy_discard_and_bypass_indices)
-      {
-        p = pool_elt_at_index(spd->policies, *i);
-        vlib_cli_output(vm, "  priority %d action %U protocol %s%s",
-                        p->priority,
-                        format_ipsec_policy_action, p->policy,
-                        p->protocol ?
-                          format(0, "%U", format_ip_protocol, p->protocol) :
-                          (u8 *) "any",
-                        p->policy == IPSEC_POLICY_ACTION_PROTECT ?
-                          format(0, " sa %u", p->sa_id) :
-                          (u8 *) "");
-        vlib_cli_output(vm, "   local addr range %U - %U port range %u - %u",
-                        format_ip4_address, &p->laddr.start.ip4,
-                        format_ip4_address, &p->laddr.stop.ip4,
-                        p->lport.start, p->lport.stop);
-        vlib_cli_output(vm, "   remte addr range %U - %U port range %u - %u",
-                        format_ip4_address, &p->raddr.start.ip4,
-                        format_ip4_address, &p->raddr.stop.ip4,
-                        p->rport.start, p->rport.stop);
-        vlib_cli_output(vm, "   packets %u bytes %u", p->counter.packets,
-                        p->counter.bytes);
-      };
-    vec_foreach(i, spd->ipv6_inbound_protect_policy_indices)
-      {
-        p = pool_elt_at_index(spd->policies, *i);
-        vlib_cli_output(vm, "  priority %d action %U protocol %s%s",
-                        p->priority,
-                        format_ipsec_policy_action, p->policy,
-                        p->protocol ?
-                          format(0, "%U", format_ip_protocol, p->protocol) :
-                          (u8 *) "any",
-                        p->policy == IPSEC_POLICY_ACTION_PROTECT ?
-                          format(0, " sa %u", p->sa_id) :
-                          (u8 *) "");
-        vlib_cli_output(vm, "   local addr range %U - %U port range %u - %u",
-                        format_ip6_address, &p->laddr.start.ip6,
-                        format_ip6_address, &p->laddr.stop.ip6,
-                        p->lport.start, p->lport.stop);
-        vlib_cli_output(vm, "   remote addr range %U - %U port range %u - %u",
-                        format_ip6_address, &p->raddr.start.ip6,
-                        format_ip6_address, &p->raddr.stop.ip6,
-                        p->rport.start, p->rport.stop);
-        vlib_cli_output(vm, "   packets %u bytes %u", p->counter.packets,
-                        p->counter.bytes);
-      };
-    vec_foreach(i, spd->ipv6_inbound_policy_discard_and_bypass_indices)
-      {
-        p = pool_elt_at_index(spd->policies, *i);
-        vlib_cli_output(vm, "  priority %d action %U protocol %s%s",
-                        p->priority,
-                        format_ipsec_policy_action, p->policy,
-                        p->protocol ?
-                          format(0, "%U", format_ip_protocol, p->protocol) :
-                          (u8 *) "any",
-                        p->policy == IPSEC_POLICY_ACTION_PROTECT ?
-                          format(0, " sa %u", p->sa_id) :
-                          (u8 *) "");
-        vlib_cli_output(vm, "   local addr range %U - %U port range %u - %u",
-                        format_ip6_address, &p->laddr.start.ip6,
-                        format_ip6_address, &p->laddr.stop.ip6,
-                        p->lport.start, p->lport.stop);
-        vlib_cli_output(vm, "   remote addr range %U - %U port range %u - %u",
-                        format_ip6_address, &p->raddr.start.ip6,
-                        format_ip6_address, &p->raddr.stop.ip6,
-                        p->rport.start, p->rport.stop);
-        vlib_cli_output(vm, "   packets %u bytes %u", p->counter.packets,
-                        p->counter.bytes);
-      };
-  }));
-  /* *INDENT-ON* */
-
-  vlib_cli_output (vm, "tunnel interfaces");
-  /* *INDENT-OFF* */
-  pool_foreach (t, im->tunnel_interfaces, ({
-    if (t->hw_if_index == ~0)
-      continue;
-    hi = vnet_get_hw_interface (im->vnet_main, t->hw_if_index);
-    vlib_cli_output(vm, "  %s seq", hi->name);
-    sa = pool_elt_at_index(im->sad, t->output_sa_index);
-    vlib_cli_output(vm, "   seq %u seq-hi %u esn %u anti-replay %u",
-                    sa->seq, sa->seq_hi, sa->use_esn, sa->use_anti_replay);
-    vlib_cli_output(vm, "   local-spi %u local-ip %U", sa->spi,
-                    format_ip4_address, &sa->tunnel_src_addr.ip4);
-    vlib_cli_output(vm, "   local-crypto %U %U",
-                    format_ipsec_crypto_alg, sa->crypto_alg,
-                    format_hex_bytes, sa->crypto_key, sa->crypto_key_len);
-    vlib_cli_output(vm, "   local-integrity %U %U",
-                    format_ipsec_integ_alg, sa->integ_alg,
-                    format_hex_bytes, sa->integ_key, sa->integ_key_len);
-    sa = pool_elt_at_index(im->sad, t->input_sa_index);
-    vlib_cli_output(vm, "   last-seq %u last-seq-hi %u esn %u anti-replay %u window %U",
-                    sa->last_seq, sa->last_seq_hi, sa->use_esn,
-                    sa->use_anti_replay,
-                    format_ipsec_replay_window, sa->replay_window);
-    vlib_cli_output(vm, "   remote-spi %u remote-ip %U", sa->spi,
-                    format_ip4_address, &sa->tunnel_src_addr.ip4);
-    vlib_cli_output(vm, "   remote-crypto %U %U",
-                    format_ipsec_crypto_alg, sa->crypto_alg,
-                    format_hex_bytes, sa->crypto_key, sa->crypto_key_len);
-    vlib_cli_output(vm, "   remote-integrity %U %U",
-                    format_ipsec_integ_alg, sa->integ_alg,
-                    format_hex_bytes, sa->integ_key, sa->integ_key_len);
-  }));
-  /* *INDENT-ON* */
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_ipsec_command, static) = {
-    .path = "show ipsec",
-    .short_help = "show ipsec",
-    .function = show_ipsec_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-clear_ipsec_counters_command_fn (vlib_main_t * vm,
-				 unformat_input_t * input,
-				 vlib_cli_command_t * cmd)
-{
-  ipsec_main_t *im = &ipsec_main;
-  ipsec_spd_t *spd;
-  ipsec_policy_t *p;
-
-  /* *INDENT-OFF* */
-  pool_foreach (spd, im->spds, ({
-    pool_foreach(p, spd->policies, ({
-      p->counter.packets = p->counter.bytes = 0;
-    }));
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (clear_ipsec_counters_command, static) = {
-    .path = "clear ipsec counters",
-    .short_help = "clear ipsec counters",
-    .function = clear_ipsec_counters_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-create_ipsec_tunnel_command_fn (vlib_main_t * vm,
-				unformat_input_t * input,
-				vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ipsec_add_del_tunnel_args_t a;
-  int rv;
-  u32 num_m_args = 0;
-
-  memset (&a, 0, sizeof (a));
-  a.is_add = 1;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (line_input, "local-ip %U", unformat_ip4_address, &a.local_ip))
-	num_m_args++;
-      else
-	if (unformat
-	    (line_input, "remote-ip %U", unformat_ip4_address, &a.remote_ip))
-	num_m_args++;
-      else if (unformat (line_input, "local-spi %u", &a.local_spi))
-	num_m_args++;
-      else if (unformat (line_input, "remote-spi %u", &a.remote_spi))
-	num_m_args++;
-      else if (unformat (line_input, "del"))
-	a.is_add = 0;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  if (num_m_args < 4)
-    return clib_error_return (0, "mandatory argument(s) missing");
-
-  rv = ipsec_add_del_tunnel_if (&a);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-    case VNET_API_ERROR_INVALID_VALUE:
-      if (a.is_add)
-	return clib_error_return (0,
-				  "IPSec tunnel interface already exists...");
-      else
-	return clib_error_return (0, "IPSec tunnel interface not exists...");
-    default:
-      return clib_error_return (0, "ipsec_register_interface returned %d",
-				rv);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (create_ipsec_tunnel_command, static) = {
-  .path = "create ipsec tunnel",
-  .short_help = "create ipsec tunnel local-ip <addr> local-spi <spi> remote-ip <addr> remote-spi <spi>",
-  .function = create_ipsec_tunnel_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_interface_key_command_fn (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ipsec_main_t *im = &ipsec_main;
-  ipsec_if_set_key_type_t type = IPSEC_IF_SET_KEY_TYPE_NONE;
-  u32 hw_if_index = (u32) ~ 0;
-  u32 alg;
-  u8 *key = 0;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "%U",
-		    unformat_vnet_hw_interface, im->vnet_main, &hw_if_index))
-	;
-      else
-	if (unformat
-	    (line_input, "local crypto %U", unformat_ipsec_crypto_alg, &alg))
-	type = IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO;
-      else
-	if (unformat
-	    (line_input, "remote crypto %U", unformat_ipsec_crypto_alg, &alg))
-	type = IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO;
-      else
-	if (unformat
-	    (line_input, "local integ %U", unformat_ipsec_integ_alg, &alg))
-	type = IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG;
-      else
-	if (unformat
-	    (line_input, "remote integ %U", unformat_ipsec_integ_alg, &alg))
-	type = IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG;
-      else if (unformat (line_input, "%U", unformat_hex_string, &key))
-	;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (type == IPSEC_IF_SET_KEY_TYPE_NONE)
-    return clib_error_return (0, "unknown key type");
-
-  if (alg > 0 && vec_len (key) == 0)
-    return clib_error_return (0, "key is not specified");
-
-  if (hw_if_index == (u32) ~ 0)
-    return clib_error_return (0, "interface not specified");
-
-  ipsec_set_interface_key (im->vnet_main, hw_if_index, type, alg, key);
-  vec_free (key);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_key_command, static) = {
-    .path = "set interface ipsec key",
-    .short_help =
-    "set interface ipsec key <int> <local|remote> <crypto|integ> <key type> <key>",
-    .function = set_interface_key_command_fn,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-ipsec_cli_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ipsec_cli_init);
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ipsec_format.c b/vnet/vnet/ipsec/ipsec_format.c
deleted file mode 100644
index 38aed79a..00000000
--- a/vnet/vnet/ipsec/ipsec_format.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * decap.c : IPSec tunnel support
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-#include <vnet/interface.h>
-
-#include <vnet/ipsec/ipsec.h>
-
-u8 *
-format_ipsec_policy_action (u8 * s, va_list * args)
-{
-  u32 i = va_arg (*args, u32);
-  char *t = 0;
-
-  switch (i)
-    {
-#define _(v,f,str) case IPSEC_POLICY_ACTION_##f: t = str; break;
-      foreach_ipsec_policy_action
-#undef _
-    default:
-      s = format (s, "unknown");
-    }
-  s = format (s, "%s", t);
-  return s;
-}
-
-uword
-unformat_ipsec_policy_action (unformat_input_t * input, va_list * args)
-{
-  u32 *r = va_arg (*args, u32 *);
-
-  if (0);
-#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_POLICY_ACTION_##f;
-  foreach_ipsec_policy_action
-#undef _
-    else
-    return 0;
-  return 1;
-}
-
-u8 *
-format_ipsec_crypto_alg (u8 * s, va_list * args)
-{
-  u32 i = va_arg (*args, u32);
-  u8 *t = 0;
-
-  switch (i)
-    {
-#define _(v,f,str) case IPSEC_CRYPTO_ALG_##f: t = (u8 *) str; break;
-      foreach_ipsec_crypto_alg
-#undef _
-    default:
-      s = format (s, "unknown");
-    }
-  s = format (s, "%s", t);
-  return s;
-}
-
-uword
-unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args)
-{
-  u32 *r = va_arg (*args, u32 *);
-
-  if (0);
-#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_CRYPTO_ALG_##f;
-  foreach_ipsec_crypto_alg
-#undef _
-    else
-    return 0;
-  return 1;
-}
-
-u8 *
-format_ipsec_integ_alg (u8 * s, va_list * args)
-{
-  u32 i = va_arg (*args, u32);
-  u8 *t = 0;
-
-  switch (i)
-    {
-#define _(v,f,str) case IPSEC_INTEG_ALG_##f: t = (u8 *) str; break;
-      foreach_ipsec_integ_alg
-#undef _
-    default:
-      s = format (s, "unknown");
-    }
-  s = format (s, "%s", t);
-  return s;
-}
-
-uword
-unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args)
-{
-  u32 *r = va_arg (*args, u32 *);
-
-  if (0);
-#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_INTEG_ALG_##f;
-  foreach_ipsec_integ_alg
-#undef _
-    else
-    return 0;
-  return 1;
-}
-
-u8 *
-format_ipsec_replay_window (u8 * s, va_list * args)
-{
-  u64 w = va_arg (*args, u64);
-  u8 i;
-
-  for (i = 0; i < 64; i++)
-    {
-      s = format (s, "%u", w & (1ULL << i) ? 1 : 0);
-    }
-
-  return s;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ipsec_if.c b/vnet/vnet/ipsec/ipsec_if.c
deleted file mode 100644
index a8da046f..00000000
--- a/vnet/vnet/ipsec/ipsec_if.c
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * ipsec_if.c : IPSec interface support
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-
-#include <vnet/ipsec/ipsec.h>
-#if DPDK_CRYPTO==1
-#include <vnet/devices/dpdk/ipsec/esp.h>
-#else
-#include <vnet/ipsec/esp.h>
-#endif
-
-#if DPDK_CRYPTO==0
-/* dummy function */
-static int
-add_del_sa_sess (u32 sa_index, u8 is_add)
-{
-  return 0;
-}
-#endif
-
-void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
-
-static u8 *
-format_ipsec_name (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  return format (s, "ipsec%d", dev_instance);
-}
-
-static uword
-dummy_interface_tx (vlib_main_t * vm,
-		    vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  clib_warning ("you shouldn't be here, leaking buffers...");
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (ipsec_device_class, static) =
-{
-  .name = "IPSec",
-  .format_device_name = format_ipsec_name,
-  .format_tx_trace = format_ipsec_if_output_trace,
-  .tx_function = dummy_interface_tx,
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VNET_HW_INTERFACE_CLASS (ipsec_hw_class) =
-{
-  .name = "IPSec",
-  .build_rewrite = default_build_rewrite,
-};
-/* *INDENT-ON* */
-
-static int
-ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm,
-				  ipsec_add_del_tunnel_args_t * args);
-
-static int
-ipsec_add_del_tunnel_if_rpc_callback (ipsec_add_del_tunnel_args_t * a)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ASSERT (os_get_cpu_number () == 0);
-
-  return ipsec_add_del_tunnel_if_internal (vnm, a);
-}
-
-int
-ipsec_add_del_tunnel_if (ipsec_add_del_tunnel_args_t * args)
-{
-  vl_api_rpc_call_main_thread (ipsec_add_del_tunnel_if_rpc_callback,
-			       (u8 *) args, sizeof (*args));
-  return 0;
-}
-
-int
-ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm,
-				  ipsec_add_del_tunnel_args_t * args)
-{
-  ipsec_tunnel_if_t *t;
-  ipsec_main_t *im = &ipsec_main;
-  vnet_hw_interface_t *hi;
-  u32 hw_if_index = ~0;
-  uword *p;
-  ipsec_sa_t *sa;
-
-  u64 key = (u64) args->remote_ip.as_u32 << 32 | (u64) args->remote_spi;
-  p = hash_get (im->ipsec_if_pool_index_by_key, key);
-
-  if (args->is_add)
-    {
-      /* check if same src/dst pair exists */
-      if (p)
-	return VNET_API_ERROR_INVALID_VALUE;
-
-      pool_get_aligned (im->tunnel_interfaces, t, CLIB_CACHE_LINE_BYTES);
-      memset (t, 0, sizeof (*t));
-
-      pool_get (im->sad, sa);
-      memset (sa, 0, sizeof (*sa));
-      t->input_sa_index = sa - im->sad;
-      sa->spi = args->remote_spi;
-      sa->tunnel_src_addr.ip4.as_u32 = args->remote_ip.as_u32;
-      sa->tunnel_dst_addr.ip4.as_u32 = args->local_ip.as_u32;
-      sa->is_tunnel = 1;
-      sa->use_esn = args->esn;
-      sa->use_anti_replay = args->anti_replay;
-      sa->integ_alg = args->integ_alg;
-      if (args->remote_integ_key_len <= sizeof (args->remote_integ_key))
-	{
-	  sa->integ_key_len = args->remote_integ_key_len;
-	  clib_memcpy (sa->integ_key, args->remote_integ_key,
-		       args->remote_integ_key_len);
-	}
-      sa->crypto_alg = args->crypto_alg;
-      if (args->remote_crypto_key_len <= sizeof (args->remote_crypto_key))
-	{
-	  sa->crypto_key_len = args->remote_crypto_key_len;
-	  clib_memcpy (sa->crypto_key, args->remote_crypto_key,
-		       args->remote_crypto_key_len);
-	}
-
-      add_del_sa_sess (t->input_sa_index, args->is_add);
-
-      pool_get (im->sad, sa);
-      memset (sa, 0, sizeof (*sa));
-      t->output_sa_index = sa - im->sad;
-      sa->spi = args->local_spi;
-      sa->tunnel_src_addr.ip4.as_u32 = args->local_ip.as_u32;
-      sa->tunnel_dst_addr.ip4.as_u32 = args->remote_ip.as_u32;
-      sa->is_tunnel = 1;
-      sa->seq = 1;
-      sa->use_esn = args->esn;
-      sa->use_anti_replay = args->anti_replay;
-      sa->integ_alg = args->integ_alg;
-      if (args->local_integ_key_len <= sizeof (args->local_integ_key))
-	{
-	  sa->integ_key_len = args->local_integ_key_len;
-	  clib_memcpy (sa->integ_key, args->local_integ_key,
-		       args->local_integ_key_len);
-	}
-      sa->crypto_alg = args->crypto_alg;
-      if (args->local_crypto_key_len <= sizeof (args->local_crypto_key))
-	{
-	  sa->crypto_key_len = args->local_crypto_key_len;
-	  clib_memcpy (sa->crypto_key, args->local_crypto_key,
-		       args->local_crypto_key_len);
-	}
-
-      add_del_sa_sess (t->output_sa_index, args->is_add);
-
-      hash_set (im->ipsec_if_pool_index_by_key, key,
-		t - im->tunnel_interfaces);
-
-      if (vec_len (im->free_tunnel_if_indices) > 0)
-	{
-	  hw_if_index =
-	    im->free_tunnel_if_indices[vec_len (im->free_tunnel_if_indices) -
-				       1];
-	  _vec_len (im->free_tunnel_if_indices) -= 1;
-	}
-      else
-	{
-	  hw_if_index =
-	    vnet_register_interface (vnm, ipsec_device_class.index,
-				     t - im->tunnel_interfaces,
-				     ipsec_hw_class.index,
-				     t - im->tunnel_interfaces);
-
-	  hi = vnet_get_hw_interface (vnm, hw_if_index);
-	  hi->output_node_index = ipsec_if_output_node.index;
-	}
-      t->hw_if_index = hw_if_index;
-
-      /*1st interface, register protocol */
-      if (pool_elts (im->tunnel_interfaces) == 1)
-	ip4_register_protocol (IP_PROTOCOL_IPSEC_ESP,
-			       ipsec_if_input_node.index);
-
-      return hw_if_index;
-    }
-  else
-    {
-      /* check if exists */
-      if (!p)
-	return VNET_API_ERROR_INVALID_VALUE;
-
-      t = pool_elt_at_index (im->tunnel_interfaces, p[0]);
-      hi = vnet_get_hw_interface (vnm, t->hw_if_index);
-      vnet_sw_interface_set_flags (vnm, hi->sw_if_index, 0);	/* admin down */
-      vec_add1 (im->free_tunnel_if_indices, t->hw_if_index);
-
-      /* delete input and output SA */
-      sa = pool_elt_at_index (im->sad, t->input_sa_index);
-
-      if (add_del_sa_sess (t->input_sa_index, args->is_add) < 0)
-	return VNET_API_ERROR_SYSCALL_ERROR_1;
-
-      pool_put (im->sad, sa);
-
-      sa = pool_elt_at_index (im->sad, t->output_sa_index);
-
-      if (add_del_sa_sess (t->output_sa_index, args->is_add) < 0)
-	return VNET_API_ERROR_SYSCALL_ERROR_1;
-
-      pool_put (im->sad, sa);
-
-      hash_unset (im->ipsec_if_pool_index_by_key, key);
-      pool_put (im->tunnel_interfaces, t);
-    }
-  return 0;
-}
-
-int
-ipsec_add_del_ipsec_gre_tunnel (vnet_main_t * vnm,
-				ipsec_add_del_ipsec_gre_tunnel_args_t * args)
-{
-  ipsec_tunnel_if_t *t = 0;
-  ipsec_main_t *im = &ipsec_main;
-  uword *p;
-  ipsec_sa_t *sa;
-  u64 key;
-  u32 isa, osa;
-
-  p = hash_get (im->sa_index_by_sa_id, args->local_sa_id);
-  if (!p)
-    return VNET_API_ERROR_INVALID_VALUE;
-  isa = p[0];
-
-  p = hash_get (im->sa_index_by_sa_id, args->remote_sa_id);
-  if (!p)
-    return VNET_API_ERROR_INVALID_VALUE;
-  osa = p[0];
-  sa = pool_elt_at_index (im->sad, p[0]);
-
-  if (sa->is_tunnel)
-    key = (u64) sa->tunnel_dst_addr.ip4.as_u32 << 32 | (u64) sa->spi;
-  else
-    key = (u64) args->remote_ip.as_u32 << 32 | (u64) sa->spi;
-
-  p = hash_get (im->ipsec_if_pool_index_by_key, key);
-
-  if (args->is_add)
-    {
-      /* check if same src/dst pair exists */
-      if (p)
-	return VNET_API_ERROR_INVALID_VALUE;
-
-      pool_get_aligned (im->tunnel_interfaces, t, CLIB_CACHE_LINE_BYTES);
-      memset (t, 0, sizeof (*t));
-
-      t->input_sa_index = isa;
-      t->output_sa_index = osa;
-      t->hw_if_index = ~0;
-      hash_set (im->ipsec_if_pool_index_by_key, key,
-		t - im->tunnel_interfaces);
-
-      /*1st interface, register protocol */
-      if (pool_elts (im->tunnel_interfaces) == 1)
-	ip4_register_protocol (IP_PROTOCOL_IPSEC_ESP,
-			       ipsec_if_input_node.index);
-    }
-  else
-    {
-      /* check if exists */
-      if (!p)
-	return VNET_API_ERROR_INVALID_VALUE;
-
-      t = pool_elt_at_index (im->tunnel_interfaces, p[0]);
-      hash_unset (im->ipsec_if_pool_index_by_key, key);
-      pool_put (im->tunnel_interfaces, t);
-    }
-  return 0;
-}
-
-int
-ipsec_set_interface_key (vnet_main_t * vnm, u32 hw_if_index,
-			 ipsec_if_set_key_type_t type, u8 alg, u8 * key)
-{
-  ipsec_main_t *im = &ipsec_main;
-  vnet_hw_interface_t *hi;
-  ipsec_tunnel_if_t *t;
-  ipsec_sa_t *sa;
-
-  hi = vnet_get_hw_interface (vnm, hw_if_index);
-  t = pool_elt_at_index (im->tunnel_interfaces, hi->dev_instance);
-
-  if (type == IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO)
-    {
-      sa = pool_elt_at_index (im->sad, t->output_sa_index);
-      sa->crypto_alg = alg;
-      sa->crypto_key_len = vec_len (key);
-      clib_memcpy (sa->crypto_key, key, vec_len (key));
-
-      if (add_del_sa_sess (t->input_sa_index, 0) < 0)
-	return VNET_API_ERROR_SYSCALL_ERROR_1;
-    }
-  else if (type == IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG)
-    {
-      sa = pool_elt_at_index (im->sad, t->output_sa_index);
-      sa->integ_alg = alg;
-      sa->integ_key_len = vec_len (key);
-      clib_memcpy (sa->integ_key, key, vec_len (key));
-
-      if (add_del_sa_sess (t->output_sa_index, 0) < 0)
-	return VNET_API_ERROR_SYSCALL_ERROR_1;
-    }
-  else if (type == IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO)
-    {
-      sa = pool_elt_at_index (im->sad, t->input_sa_index);
-      sa->crypto_alg = alg;
-      sa->crypto_key_len = vec_len (key);
-      clib_memcpy (sa->crypto_key, key, vec_len (key));
-
-      if (add_del_sa_sess (t->input_sa_index, 0) < 0)
-	return VNET_API_ERROR_SYSCALL_ERROR_1;
-    }
-  else if (type == IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG)
-    {
-      sa = pool_elt_at_index (im->sad, t->input_sa_index);
-      sa->integ_alg = alg;
-      sa->integ_key_len = vec_len (key);
-      clib_memcpy (sa->integ_key, key, vec_len (key));
-
-      if (add_del_sa_sess (t->output_sa_index, 0) < 0)
-	return VNET_API_ERROR_SYSCALL_ERROR_1;
-    }
-  else
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  return 0;
-}
-
-
-clib_error_t *
-ipsec_tunnel_if_init (vlib_main_t * vm)
-{
-  ipsec_main_t *im = &ipsec_main;
-
-  im->ipsec_if_pool_index_by_key = hash_create (0, sizeof (uword));
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ipsec_tunnel_if_init);
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ipsec_if_in.c b/vnet/vnet/ipsec/ipsec_if_in.c
deleted file mode 100644
index db75ab92..00000000
--- a/vnet/vnet/ipsec/ipsec_if_in.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * ipsec_if_in.c : IPSec interface input node
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-
-#include <vnet/ipsec/ipsec.h>
-#include <vnet/ipsec/esp.h>
-
-#if DPDK_CRYPTO==1
-#define ESP_NODE "dpdk-esp-decrypt"
-#else
-#define ESP_NODE "esp-decrypt"
-#endif
-
-/* Statistics (not really errors) */
-#define foreach_ipsec_if_input_error    \
-_(RX, "good packets received")
-
-static char *ipsec_if_input_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ipsec_if_input_error
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) IPSEC_IF_INPUT_ERROR_##sym,
-  foreach_ipsec_if_input_error
-#undef _
-    IPSEC_IF_INPUT_N_ERROR,
-} ipsec_if_input_error_t;
-
-typedef enum
-{
-  IPSEC_IF_INPUT_NEXT_ESP_DECRYPT,
-  IPSEC_IF_INPUT_NEXT_DROP,
-  IPSEC_IF_INPUT_N_NEXT,
-} ipsec_if_input_next_t;
-
-typedef struct
-{
-  u32 spi;
-  u32 seq;
-} ipsec_if_input_trace_t;
-
-
-u8 *
-format_ipsec_if_input_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ipsec_if_input_trace_t *t = va_arg (*args, ipsec_if_input_trace_t *);
-
-  s = format (s, "IPSec: spi %u seq %u", t->spi, t->seq);
-  return s;
-}
-
-static uword
-ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-			vlib_frame_t * from_frame)
-{
-  ipsec_main_t *im = &ipsec_main;
-  u32 *from, *to_next = 0, next_index;
-  u32 n_left_from;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, next0;
-	  vlib_buffer_t *b0;
-	  ip4_header_t *ip0;
-	  esp_header_t *esp0;
-	  uword *p;
-
-	  bi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  b0 = vlib_get_buffer (vm, bi0);
-	  ip0 = vlib_buffer_get_current (b0);
-	  esp0 = (esp_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0));
-
-	  next0 = IPSEC_IF_INPUT_NEXT_DROP;
-
-	  u64 key = (u64) ip0->src_address.as_u32 << 32 |
-	    (u64) clib_net_to_host_u32 (esp0->spi);
-
-	  p = hash_get (im->ipsec_if_pool_index_by_key, key);
-
-	  if (p)
-	    {
-	      ipsec_tunnel_if_t *t;
-	      t = pool_elt_at_index (im->tunnel_interfaces, p[0]);
-	      vnet_buffer (b0)->ipsec.sad_index = t->input_sa_index;
-	      vnet_buffer (b0)->ipsec.flags =
-		t->hw_if_index == ~0 ? IPSEC_FLAG_IPSEC_GRE_TUNNEL : 0;
-	      vlib_buffer_advance (b0, ip4_header_bytes (ip0));
-	      next0 = IPSEC_IF_INPUT_NEXT_ESP_DECRYPT;
-	    }
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ipsec_if_input_trace_t *tr =
-		vlib_add_trace (vm, node, b0, sizeof (*tr));
-	      tr->spi = clib_host_to_net_u32 (esp0->spi);
-	      tr->seq = clib_host_to_net_u32 (esp0->seq);
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, ipsec_if_input_node.index,
-			       IPSEC_IF_INPUT_ERROR_RX,
-			       from_frame->n_vectors);
-
-  return from_frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ipsec_if_input_node) = {
-  .function = ipsec_if_input_node_fn,
-  .name = "ipsec-if-input",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ipsec_if_input_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(ipsec_if_input_error_strings),
-  .error_strings = ipsec_if_input_error_strings,
-
-  .n_next_nodes = IPSEC_IF_INPUT_N_NEXT,
-
-  .next_nodes = {
-	[IPSEC_IF_INPUT_NEXT_ESP_DECRYPT] = ESP_NODE,
-	[IPSEC_IF_INPUT_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ipsec_if_input_node, ipsec_if_input_node_fn)
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ipsec_if_out.c b/vnet/vnet/ipsec/ipsec_if_out.c
deleted file mode 100644
index 8f062828..00000000
--- a/vnet/vnet/ipsec/ipsec_if_out.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * ipsec_if_out.c : IPSec interface output node
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-
-#include <vnet/ipsec/ipsec.h>
-
-#if DPDK_CRYPTO==1
-#define ESP_NODE "dpdk-esp-encrypt"
-#else
-#define ESP_NODE "esp-encrypt"
-#endif
-
-/* Statistics (not really errors) */
-#define foreach_ipsec_if_output_error    \
-_(TX, "good packets transmitted")
-
-static char *ipsec_if_output_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ipsec_if_output_error
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) IPSEC_IF_OUTPUT_ERROR_##sym,
-  foreach_ipsec_if_output_error
-#undef _
-    IPSEC_IF_OUTPUT_N_ERROR,
-} ipsec_if_output_error_t;
-
-typedef enum
-{
-  IPSEC_IF_OUTPUT_NEXT_ESP_ENCRYPT,
-  IPSEC_IF_OUTPUT_NEXT_DROP,
-  IPSEC_IF_OUTPUT_N_NEXT,
-} ipsec_if_output_next_t;
-
-typedef struct
-{
-  u32 spi;
-  u32 seq;
-} ipsec_if_output_trace_t;
-
-
-u8 *
-format_ipsec_if_output_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ipsec_if_output_trace_t *t = va_arg (*args, ipsec_if_output_trace_t *);
-
-  s = format (s, "IPSec: spi %u seq %u", t->spi, t->seq);
-  return s;
-}
-
-static uword
-ipsec_if_output_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-			 vlib_frame_t * from_frame)
-{
-  ipsec_main_t *im = &ipsec_main;
-  vnet_main_t *vnm = im->vnet_main;
-  u32 *from, *to_next = 0, next_index;
-  u32 n_left_from, sw_if_index0;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, next0;
-	  vlib_buffer_t *b0;
-	  ipsec_tunnel_if_t *t0;
-	  vnet_hw_interface_t *hi0;
-
-	  bi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  b0 = vlib_get_buffer (vm, bi0);
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	  hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
-	  t0 = pool_elt_at_index (im->tunnel_interfaces, hi0->dev_instance);
-	  vnet_buffer (b0)->ipsec.sad_index = t0->output_sa_index;
-	  next0 = IPSEC_IF_OUTPUT_NEXT_ESP_ENCRYPT;
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ipsec_if_output_trace_t *tr =
-		vlib_add_trace (vm, node, b0, sizeof (*tr));
-	      ipsec_sa_t *sa0 =
-		pool_elt_at_index (im->sad, t0->output_sa_index);
-	      tr->spi = sa0->spi;
-	      tr->seq = sa0->seq;
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, ipsec_if_output_node.index,
-			       IPSEC_IF_OUTPUT_ERROR_TX,
-			       from_frame->n_vectors);
-
-  return from_frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ipsec_if_output_node) = {
-  .function = ipsec_if_output_node_fn,
-  .name = "ipsec-if-output",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ipsec_if_output_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(ipsec_if_output_error_strings),
-  .error_strings = ipsec_if_output_error_strings,
-
-  .n_next_nodes = IPSEC_IF_OUTPUT_N_NEXT,
-
-  .next_nodes = {
-        [IPSEC_IF_OUTPUT_NEXT_ESP_ENCRYPT] = ESP_NODE,
-        [IPSEC_IF_OUTPUT_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ipsec_if_output_node, ipsec_if_output_node_fn)
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ipsec_input.c b/vnet/vnet/ipsec/ipsec_input.c
deleted file mode 100644
index 4662c1a1..00000000
--- a/vnet/vnet/ipsec/ipsec_input.c
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
- * decap.c : IPSec tunnel decapsulation
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-#include <vnet/feature/feature.h>
-
-#include <vnet/ipsec/ipsec.h>
-#include <vnet/ipsec/esp.h>
-
-#if DPDK_CRYPTO==1
-#define ESP_NODE "dpdk-esp-decrypt"
-#else
-#define ESP_NODE "esp-decrypt"
-#endif
-
-#define foreach_ipsec_input_next                \
-_(DROP, "error-drop")                           \
-_(ESP_DECRYPT, ESP_NODE)
-
-#define _(v, s) IPSEC_INPUT_NEXT_##v,
-typedef enum
-{
-  foreach_ipsec_input_next
-#undef _
-    IPSEC_INPUT_N_NEXT,
-} ipsec_input_next_t;
-
-
-#define foreach_ipsec_input_error                   \
- _(RX_PKTS, "IPSEC pkts received")                  \
- _(DECRYPTION_FAILED, "IPSEC decryption failed")
-
-
-typedef enum
-{
-#define _(sym,str) IPSEC_INPUT_ERROR_##sym,
-  foreach_ipsec_input_error
-#undef _
-    IPSEC_INPUT_N_ERROR,
-} ipsec_input_error_t;
-
-static char *ipsec_input_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ipsec_input_error
-#undef _
-};
-
-typedef struct
-{
-  u32 sa_id;
-  u32 spi;
-  u32 seq;
-} ipsec_input_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_ipsec_input_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ipsec_input_trace_t *t = va_arg (*args, ipsec_input_trace_t *);
-
-  if (t->spi == 0 && t->seq == 0)
-    {
-      s = format (s, "esp: no esp packet");
-      return s;
-    }
-
-  if (t->sa_id != 0)
-    {
-      s = format (s, "esp: sa_id %u spi %u seq %u", t->sa_id, t->spi, t->seq);
-    }
-  else
-    {
-      s = format (s, "esp: no sa spi %u seq %u", t->spi, t->seq);
-    }
-  return s;
-}
-
-always_inline ipsec_policy_t *
-ipsec_input_protect_policy_match (ipsec_spd_t * spd, u32 sa, u32 da, u32 spi)
-{
-  ipsec_main_t *im = &ipsec_main;
-  ipsec_policy_t *p;
-  ipsec_sa_t *s;
-  u32 *i;
-
-  vec_foreach (i, spd->ipv4_inbound_protect_policy_indices)
-  {
-    p = pool_elt_at_index (spd->policies, *i);
-    s = pool_elt_at_index (im->sad, p->sa_index);
-
-    if (spi != s->spi)
-      continue;
-
-    if (s->is_tunnel)
-      {
-	if (da != clib_net_to_host_u32 (s->tunnel_dst_addr.ip4.as_u32))
-	  continue;
-
-	if (sa != clib_net_to_host_u32 (s->tunnel_src_addr.ip4.as_u32))
-	  continue;
-
-	return p;
-      }
-
-    if (da < clib_net_to_host_u32 (p->laddr.start.ip4.as_u32))
-      continue;
-
-    if (da > clib_net_to_host_u32 (p->laddr.stop.ip4.as_u32))
-      continue;
-
-    if (sa < clib_net_to_host_u32 (p->raddr.start.ip4.as_u32))
-      continue;
-
-    if (sa > clib_net_to_host_u32 (p->raddr.stop.ip4.as_u32))
-      continue;
-
-    return p;
-  }
-  return 0;
-}
-
-always_inline uword
-ip6_addr_match_range (ip6_address_t * a, ip6_address_t * la,
-		      ip6_address_t * ua)
-{
-  if ((memcmp (a->as_u64, la->as_u64, 2 * sizeof (u64)) >= 0) &&
-      (memcmp (a->as_u64, ua->as_u64, 2 * sizeof (u64)) <= 0))
-    return 1;
-  return 0;
-}
-
-always_inline ipsec_policy_t *
-ipsec_input_ip6_protect_policy_match (ipsec_spd_t * spd,
-				      ip6_address_t * sa,
-				      ip6_address_t * da, u32 spi)
-{
-  ipsec_main_t *im = &ipsec_main;
-  ipsec_policy_t *p;
-  ipsec_sa_t *s;
-  u32 *i;
-
-  vec_foreach (i, spd->ipv6_inbound_protect_policy_indices)
-  {
-    p = pool_elt_at_index (spd->policies, *i);
-    s = pool_elt_at_index (im->sad, p->sa_index);
-
-    if (spi != s->spi)
-      continue;
-
-    if (s->is_tunnel)
-      {
-	if (!ip6_address_is_equal (sa, &s->tunnel_src_addr.ip6))
-	  continue;
-
-	if (!ip6_address_is_equal (da, &s->tunnel_dst_addr.ip6))
-	  continue;
-
-	return p;
-      }
-
-    if (!ip6_addr_match_range (sa, &p->raddr.start.ip6, &p->raddr.stop.ip6))
-      continue;
-
-    if (!ip6_addr_match_range (da, &p->laddr.start.ip6, &p->laddr.stop.ip6))
-      continue;
-
-    return p;
-  }
-  return 0;
-}
-
-static vlib_node_registration_t ipsec_input_ip4_node;
-
-static uword
-ipsec_input_ip4_node_fn (vlib_main_t * vm,
-			 vlib_node_runtime_t * node,
-			 vlib_frame_t * from_frame)
-{
-  u32 n_left_from, *from, next_index, *to_next;
-  ipsec_main_t *im = &ipsec_main;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, next0;
-	  vlib_buffer_t *b0;
-	  ip4_header_t *ip0;
-	  esp_header_t *esp0;
-	  ip4_ipsec_config_t *c0;
-	  ipsec_spd_t *spd0;
-	  ipsec_policy_t *p0 = 0;
-
-	  bi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  c0 =
-	    vnet_feature_next_with_data (vnet_buffer (b0)->sw_if_index
-					 [VLIB_RX], &next0, b0,
-					 sizeof (c0[0]));
-
-	  spd0 = pool_elt_at_index (im->spds, c0->spd_index);
-
-	  ip0 = vlib_buffer_get_current (b0);
-	  esp0 = (esp_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0));
-
-	  if (PREDICT_TRUE (ip0->protocol == IP_PROTOCOL_IPSEC_ESP))
-	    {
-#if 0
-	      clib_warning
-		("packet received from %U to %U spi %u size %u spd_id %u",
-		 format_ip4_address, ip0->src_address.as_u8,
-		 format_ip4_address, ip0->dst_address.as_u8,
-		 clib_net_to_host_u32 (esp0->spi),
-		 clib_net_to_host_u16 (ip0->length), spd0->id);
-#endif
-
-	      p0 = ipsec_input_protect_policy_match (spd0,
-						     clib_net_to_host_u32
-						     (ip0->src_address.
-						      as_u32),
-						     clib_net_to_host_u32
-						     (ip0->dst_address.
-						      as_u32),
-						     clib_net_to_host_u32
-						     (esp0->spi));
-
-	      if (PREDICT_TRUE (p0 != 0))
-		{
-		  p0->counter.packets++;
-		  p0->counter.bytes += clib_net_to_host_u16 (ip0->length);
-		  vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
-		  vnet_buffer (b0)->ipsec.flags = 0;
-		  next0 = IPSEC_INPUT_NEXT_ESP_DECRYPT;
-		  vlib_buffer_advance (b0, ip4_header_bytes (ip0));
-		  goto trace0;
-		}
-	    }
-
-	  /* FIXME bypass and discard */
-
-	trace0:
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ipsec_input_trace_t *tr =
-		vlib_add_trace (vm, node, b0, sizeof (*tr));
-	      if (ip0->protocol == IP_PROTOCOL_IPSEC_ESP)
-		{
-		  if (p0)
-		    tr->sa_id = p0->sa_id;
-		  tr->spi = clib_host_to_net_u32 (esp0->spi);
-		  tr->seq = clib_host_to_net_u32 (esp0->seq);
-		}
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next, bi0,
-					   next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, ipsec_input_ip4_node.index,
-			       IPSEC_INPUT_ERROR_RX_PKTS,
-			       from_frame->n_vectors);
-
-  return from_frame->n_vectors;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ipsec_input_ip4_node,static) = {
-  .function = ipsec_input_ip4_node_fn,
-  .name = "ipsec-input-ip4",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ipsec_input_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(ipsec_input_error_strings),
-  .error_strings = ipsec_input_error_strings,
-
-  .n_next_nodes = IPSEC_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [IPSEC_INPUT_NEXT_##s] = n,
-    foreach_ipsec_input_next
-#undef _
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn)
-     static vlib_node_registration_t ipsec_input_ip6_node;
-
-     static uword
-       ipsec_input_ip6_node_fn (vlib_main_t * vm,
-				vlib_node_runtime_t * node,
-				vlib_frame_t * from_frame)
-{
-  u32 n_left_from, *from, next_index, *to_next;
-  ipsec_main_t *im = &ipsec_main;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, next0;
-	  vlib_buffer_t *b0;
-	  ip6_header_t *ip0;
-	  esp_header_t *esp0;
-	  ip4_ipsec_config_t *c0;
-	  ipsec_spd_t *spd0;
-	  ipsec_policy_t *p0 = 0;
-	  u32 header_size = sizeof (ip0[0]);
-
-	  bi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  c0 =
-	    vnet_feature_next_with_data (vnet_buffer (b0)->sw_if_index
-					 [VLIB_RX], &next0, b0,
-					 sizeof (c0[0]));
-
-	  spd0 = pool_elt_at_index (im->spds, c0->spd_index);
-
-	  ip0 = vlib_buffer_get_current (b0);
-	  esp0 = (esp_header_t *) ((u8 *) ip0 + header_size);
-
-	  if (PREDICT_TRUE (ip0->protocol == IP_PROTOCOL_IPSEC_ESP))
-	    {
-#if 0
-	      clib_warning
-		("packet received from %U to %U spi %u size %u spd_id %u",
-		 format_ip6_address, &ip0->src_address, format_ip6_address,
-		 &ip0->dst_address, clib_net_to_host_u32 (esp0->spi),
-		 clib_net_to_host_u16 (ip0->payload_length) + header_size,
-		 spd0->id);
-#endif
-	      p0 = ipsec_input_ip6_protect_policy_match (spd0,
-							 &ip0->src_address,
-							 &ip0->dst_address,
-							 clib_net_to_host_u32
-							 (esp0->spi));
-
-	      if (PREDICT_TRUE (p0 != 0))
-		{
-		  p0->counter.packets++;
-		  p0->counter.bytes +=
-		    clib_net_to_host_u16 (ip0->payload_length);
-		  p0->counter.bytes += header_size;
-		  vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
-		  vnet_buffer (b0)->ipsec.flags = 0;
-		  next0 = IPSEC_INPUT_NEXT_ESP_DECRYPT;
-		  vlib_buffer_advance (b0, header_size);
-		  goto trace0;
-		}
-	    }
-
-	trace0:
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      ipsec_input_trace_t *tr =
-		vlib_add_trace (vm, node, b0, sizeof (*tr));
-	      if (ip0->protocol == IP_PROTOCOL_IPSEC_ESP)
-		{
-		  if (p0)
-		    tr->sa_id = p0->sa_id;
-		  tr->spi = clib_host_to_net_u32 (esp0->spi);
-		  tr->seq = clib_host_to_net_u32 (esp0->seq);
-		}
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, ipsec_input_ip6_node.index,
-			       IPSEC_INPUT_ERROR_RX_PKTS,
-			       from_frame->n_vectors);
-
-  return from_frame->n_vectors;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ipsec_input_ip6_node,static) = {
-  .function = ipsec_input_ip6_node_fn,
-  .name = "ipsec-input-ip6",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ipsec_input_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(ipsec_input_error_strings),
-  .error_strings = ipsec_input_error_strings,
-
-  .n_next_nodes = IPSEC_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [IPSEC_INPUT_NEXT_##s] = n,
-    foreach_ipsec_input_next
-#undef _
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip6_node, ipsec_input_ip6_node_fn)
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ipsec/ipsec_output.c b/vnet/vnet/ipsec/ipsec_output.c
deleted file mode 100644
index 97977899..00000000
--- a/vnet/vnet/ipsec/ipsec_output.c
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
- * ipsec_output.c : IPSec output node
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-
-#include <vnet/ipsec/ipsec.h>
-
-#if DPDK_CRYPTO==1
-#define ESP_NODE "dpdk-esp-encrypt"
-#else
-#define ESP_NODE "esp-encrypt"
-#endif
-
-#if IPSEC > 0
-
-#define foreach_ipsec_output_next                \
-_(DROP, "error-drop")                            \
-_(ESP_ENCRYPT, ESP_NODE)
-
-#define _(v, s) IPSEC_OUTPUT_NEXT_##v,
-typedef enum
-{
-  foreach_ipsec_output_next
-#undef _
-    IPSEC_OUTPUT_N_NEXT,
-} ipsec_output_next_t;
-
-
-#define foreach_ipsec_output_error                   \
- _(RX_PKTS, "IPSec pkts received")                   \
- _(POLICY_DISCARD, "IPSec policy discard")           \
- _(POLICY_NO_MATCH, "IPSec policy (no match)")       \
- _(POLICY_PROTECT, "IPSec policy protect")           \
- _(POLICY_BYPASS, "IPSec policy bypass")             \
- _(ENCAPS_FAILED, "IPSec encapsulation failed")
-
-
-typedef enum
-{
-#define _(sym,str) IPSEC_OUTPUT_ERROR_##sym,
-  foreach_ipsec_output_error
-#undef _
-    IPSEC_DECAP_N_ERROR,
-} ipsec_output_error_t;
-
-static char *ipsec_output_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ipsec_output_error
-#undef _
-};
-
-static vlib_node_registration_t ipsec_output_ip4_node;
-static vlib_node_registration_t ipsec_output_ip6_node;
-
-typedef struct
-{
-  u32 spd_id;
-} ipsec_output_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_ipsec_output_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ipsec_output_trace_t *t = va_arg (*args, ipsec_output_trace_t *);
-
-  if (t->spd_id != ~0)
-    {
-      s = format (s, "spd %u ", t->spd_id);
-    }
-  else
-    {
-      s = format (s, "no spd");
-    }
-  return s;
-}
-
-always_inline ipsec_policy_t *
-ipsec_output_policy_match (ipsec_spd_t * spd, u8 pr, u32 la, u32 ra, u16 lp,
-			   u16 rp)
-{
-  ipsec_policy_t *p;
-  u32 *i;
-
-  if (!spd)
-    return 0;
-
-  vec_foreach (i, spd->ipv4_outbound_policies)
-  {
-    p = pool_elt_at_index (spd->policies, *i);
-    if (PREDICT_FALSE (p->protocol && (p->protocol != pr)))
-      continue;
-
-    if (la < clib_net_to_host_u32 (p->laddr.start.ip4.as_u32))
-      continue;
-
-    if (la > clib_net_to_host_u32 (p->laddr.stop.ip4.as_u32))
-      continue;
-
-    if (ra < clib_net_to_host_u32 (p->raddr.start.ip4.as_u32))
-      continue;
-
-    if (ra > clib_net_to_host_u32 (p->raddr.stop.ip4.as_u32))
-      continue;
-
-    if (PREDICT_FALSE ((pr != IP_PROTOCOL_TCP) && (pr != IP_PROTOCOL_UDP)))
-      return p;
-
-    if (lp < p->lport.start)
-      continue;
-
-    if (lp > p->lport.stop)
-      continue;
-
-    if (rp < p->rport.start)
-      continue;
-
-    if (rp > p->rport.stop)
-      continue;
-
-    return p;
-  }
-  return 0;
-}
-
-always_inline uword
-ip6_addr_match_range (ip6_address_t * a, ip6_address_t * la,
-		      ip6_address_t * ua)
-{
-  if ((memcmp (a->as_u64, la->as_u64, 2 * sizeof (u64)) >= 0) &&
-      (memcmp (a->as_u64, ua->as_u64, 2 * sizeof (u64)) <= 0))
-    return 1;
-  return 0;
-}
-
-always_inline ipsec_policy_t *
-ipsec_output_ip6_policy_match (ipsec_spd_t * spd,
-			       ip6_address_t * la,
-			       ip6_address_t * ra, u16 lp, u16 rp, u8 pr)
-{
-  ipsec_policy_t *p;
-  u32 *i;
-
-  if (!spd)
-    return 0;
-
-  vec_foreach (i, spd->ipv6_outbound_policies)
-  {
-    p = pool_elt_at_index (spd->policies, *i);
-    if (PREDICT_FALSE (p->protocol && (p->protocol != pr)))
-      continue;
-
-    if (!ip6_addr_match_range (ra, &p->raddr.start.ip6, &p->raddr.stop.ip6))
-      continue;
-
-    if (!ip6_addr_match_range (la, &p->laddr.start.ip6, &p->laddr.stop.ip6))
-      continue;
-
-    if (PREDICT_FALSE ((pr != IP_PROTOCOL_TCP) && (pr != IP_PROTOCOL_UDP)))
-      return p;
-
-    if (lp < p->lport.start)
-      continue;
-
-    if (lp > p->lport.stop)
-      continue;
-
-    if (rp < p->rport.start)
-      continue;
-
-    if (rp > p->rport.stop)
-      continue;
-
-    return p;
-  }
-
-  return 0;
-}
-
-static inline uword
-ipsec_output_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
-		     vlib_frame_t * from_frame, int is_ipv6)
-{
-  ipsec_main_t *im = &ipsec_main;
-
-  u32 *from, *to_next = 0;
-  u32 n_left_from, sw_if_index0, last_sw_if_index = (u32) ~ 0;
-  u32 next_node_index = (u32) ~ 0, last_next_node_index = (u32) ~ 0;
-  vlib_frame_t *f = 0;
-  u32 spd_index0 = ~0;
-  ipsec_spd_t *spd0 = 0;
-  u64 nc_protect = 0, nc_bypass = 0, nc_discard = 0, nc_nomatch = 0;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      ipsec_policy_t *p0;
-      ip4_header_t *ip0;
-      ip6_header_t *ip6_0 = 0;
-      udp_header_t *udp0;
-      u32 iph_offset = 0;
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-      iph_offset = vnet_buffer (b0)->ip.save_rewrite_length;
-      ip0 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b0)
-			      + iph_offset);
-
-      /* lookup for SPD only if sw_if_index is changed */
-      if (PREDICT_FALSE (last_sw_if_index != sw_if_index0))
-	{
-	  uword *p = hash_get (im->spd_index_by_sw_if_index, sw_if_index0);
-	  ASSERT (p);
-	  spd_index0 = p[0];
-	  spd0 = pool_elt_at_index (im->spds, spd_index0);
-	  last_sw_if_index = sw_if_index0;
-	}
-
-      if (is_ipv6)
-	{
-	  ip6_0 = (ip6_header_t *) ((u8 *) vlib_buffer_get_current (b0)
-				    + iph_offset);
-
-	  udp0 = ip6_next_header (ip6_0);
-#if 0
-	  clib_warning
-	    ("packet received from %U port %u to %U port %u spd_id %u",
-	     format_ip6_address, &ip6_0->src_address,
-	     clib_net_to_host_u16 (udp0->src_port), format_ip6_address,
-	     &ip6_0->dst_address, clib_net_to_host_u16 (udp0->dst_port),
-	     spd0->id);
-#endif
-
-	  p0 = ipsec_output_ip6_policy_match (spd0,
-					      &ip6_0->src_address,
-					      &ip6_0->dst_address,
-					      clib_net_to_host_u16
-					      (udp0->src_port),
-					      clib_net_to_host_u16
-					      (udp0->dst_port),
-					      ip6_0->protocol);
-	}
-      else
-	{
-	  udp0 = (udp_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0));
-
-#if 0
-	  clib_warning ("packet received from %U to %U port %u",
-			format_ip4_address, ip0->src_address.as_u8,
-			format_ip4_address, ip0->dst_address.as_u8,
-			clib_net_to_host_u16 (udp0->dst_port));
-	  clib_warning ("sw_if_index0 %u spd_index0 %u spd_id %u",
-			sw_if_index0, spd_index0, spd0->id);
-#endif
-
-	  p0 = ipsec_output_policy_match (spd0, ip0->protocol,
-					  clib_net_to_host_u32
-					  (ip0->src_address.as_u32),
-					  clib_net_to_host_u32
-					  (ip0->dst_address.as_u32),
-					  clib_net_to_host_u16
-					  (udp0->src_port),
-					  clib_net_to_host_u16
-					  (udp0->dst_port));
-	}
-
-      if (PREDICT_TRUE (p0 != NULL))
-	{
-	  if (p0->policy == IPSEC_POLICY_ACTION_PROTECT)
-	    {
-	      nc_protect++;
-	      next_node_index = im->esp_encrypt_node_index;
-	      vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
-	      vlib_buffer_advance (b0, iph_offset);
-	      p0->counter.packets++;
-	      if (is_ipv6)
-		{
-		  p0->counter.bytes +=
-		    clib_net_to_host_u16 (ip6_0->payload_length);
-		  p0->counter.bytes += sizeof (ip6_header_t);
-		}
-	      else
-		{
-		  p0->counter.bytes += clib_net_to_host_u16 (ip0->length);
-		}
-	    }
-	  else if (p0->policy == IPSEC_POLICY_ACTION_BYPASS)
-	    {
-	      nc_bypass++;
-	      next_node_index = get_next_output_feature_node_index (b0, node);
-	      p0->counter.packets++;
-	      if (is_ipv6)
-		{
-		  p0->counter.bytes +=
-		    clib_net_to_host_u16 (ip6_0->payload_length);
-		  p0->counter.bytes += sizeof (ip6_header_t);
-		}
-	      else
-		{
-		  p0->counter.bytes += clib_net_to_host_u16 (ip0->length);
-		}
-	    }
-	  else
-	    {
-	      nc_discard++;
-	      p0->counter.packets++;
-	      if (is_ipv6)
-		{
-		  p0->counter.bytes +=
-		    clib_net_to_host_u16 (ip6_0->payload_length);
-		  p0->counter.bytes += sizeof (ip6_header_t);
-		}
-	      else
-		{
-		  p0->counter.bytes += clib_net_to_host_u16 (ip0->length);
-		}
-	      next_node_index = im->error_drop_node_index;
-	    }
-	}
-      else
-	{
-	  nc_nomatch++;
-	  next_node_index = im->error_drop_node_index;
-	}
-
-      from += 1;
-      n_left_from -= 1;
-
-      if (PREDICT_FALSE ((last_next_node_index != next_node_index) || f == 0))
-	{
-	  /* if this is not 1st frame */
-	  if (f)
-	    vlib_put_frame_to_node (vm, last_next_node_index, f);
-
-	  last_next_node_index = next_node_index;
-
-	  f = vlib_get_frame_to_node (vm, next_node_index);
-	  to_next = vlib_frame_vector_args (f);
-	}
-
-      to_next[0] = bi0;
-      to_next += 1;
-      f->n_vectors++;
-
-      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	{
-	  ipsec_output_trace_t *tr =
-	    vlib_add_trace (vm, node, b0, sizeof (*tr));
-	  if (spd0)
-	    tr->spd_id = spd0->id;
-	}
-    }
-
-  vlib_put_frame_to_node (vm, next_node_index, f);
-  vlib_node_increment_counter (vm, node->node_index,
-			       IPSEC_OUTPUT_ERROR_POLICY_PROTECT, nc_protect);
-  vlib_node_increment_counter (vm, node->node_index,
-			       IPSEC_OUTPUT_ERROR_POLICY_BYPASS, nc_bypass);
-  vlib_node_increment_counter (vm, node->node_index,
-			       IPSEC_OUTPUT_ERROR_POLICY_DISCARD, nc_discard);
-  vlib_node_increment_counter (vm, node->node_index,
-			       IPSEC_OUTPUT_ERROR_POLICY_NO_MATCH,
-			       nc_nomatch);
-  return from_frame->n_vectors;
-}
-
-static uword
-ipsec_output_ip4_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-			  vlib_frame_t * frame)
-{
-  return ipsec_output_inline (vm, node, frame, 0);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ipsec_output_ip4_node,static) = {
-  .function = ipsec_output_ip4_node_fn,
-  .name = "ipsec-output-ip4",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ipsec_output_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(ipsec_output_error_strings),
-  .error_strings = ipsec_output_error_strings,
-
-  .n_next_nodes = IPSEC_OUTPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [IPSEC_OUTPUT_NEXT_##s] = n,
-    foreach_ipsec_output_next
-#undef _
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ipsec_output_ip4_node, ipsec_output_ip4_node_fn)
-     static uword
-       ipsec_output_ip6_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-				 vlib_frame_t * frame)
-{
-  return ipsec_output_inline (vm, node, frame, 1);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ipsec_output_ip6_node,static) = {
-  .function = ipsec_output_ip6_node_fn,
-  .name = "ipsec-output-ip6",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ipsec_output_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(ipsec_output_error_strings),
-  .error_strings = ipsec_output_error_strings,
-
-  .n_next_nodes = IPSEC_OUTPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [IPSEC_OUTPUT_NEXT_##s] = n,
-    foreach_ipsec_output_next
-#undef _
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (ipsec_output_ip6_node, ipsec_output_ip6_node_fn)
-#else /* IPSEC > 1 */
-
-/* Dummy ipsec output node, in case when IPSec is disabled */
-
-static uword
-ipsec_output_node_fn (vlib_main_t * vm,
-		      vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  clib_warning ("IPSec disabled");
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ipsec_output_node) = {
-  .vector_size = sizeof (u32),
-  .function = ipsec_output_node_fn,
-  .name = "ipsec-output-ip4",
-};
-
-VLIB_REGISTER_NODE (ipsec_output_node) = {
-  .vector_size = sizeof (u32),
-  .function = ipsec_output_node_fn,
-  .name = "ipsec-output-ip6",
-};
-/* *INDENT-ON* */
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/dir.dox b/vnet/vnet/l2/dir.dox
deleted file mode 100644
index 8497a2f6..00000000
--- a/vnet/vnet/l2/dir.dox
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
-@dir
-@brief Layer 2 Forwarding Code.
-
-This directory contains the source code for basic Layer 2 forwarding.
-
-*/
-/*? %%clicmd:group_label Layer 2 CLI %% ?*/
diff --git a/vnet/vnet/l2/feat_bitmap.c b/vnet/vnet/l2/feat_bitmap.c
deleted file mode 100644
index 6c046467..00000000
--- a/vnet/vnet/l2/feat_bitmap.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * feat_bitmap.c: bitmap for managing feature invocation
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/packet.h>
-#include <vlib/cli.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/feat_bitmap.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/cache.h>
-
-
-/*
- * Drop node for feature bitmaps
- * For features that just do a drop, or are not yet implemented.
- * Initial feature dispatch nodes don't need to set b0->error
- * in case of a possible drop because that will be done here.
- *The next node is always error-drop.
- */
-
-static vlib_node_registration_t feat_bitmap_drop_node;
-
-#define foreach_feat_bitmap_drop_error		\
-_(NO_FWD,     "L2 feature forwarding disabled")	\
-_(NYI,        "L2 feature not implemented")
-
-typedef enum
-{
-#define _(sym,str) FEAT_BITMAP_DROP_ERROR_##sym,
-  foreach_feat_bitmap_drop_error
-#undef _
-    FEAT_BITMAP_DROP_N_ERROR,
-} feat_bitmap_drop_error_t;
-
-static char *feat_bitmap_drop_error_strings[] = {
-#define _(sym,string) string,
-  foreach_feat_bitmap_drop_error
-#undef _
-};
-
-typedef enum
-{
-  FEAT_BITMAP_DROP_NEXT_DROP,
-  FEAT_BITMAP_DROP_N_NEXT,
-} feat_bitmap_drop_next_t;
-
-typedef struct
-{
-  u32 feature_bitmap;
-} feat_bitmap_drop_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_feat_bitmap_drop_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  feat_bitmap_drop_trace_t *t = va_arg (*args, feat_bitmap_drop_trace_t *);
-
-  s =
-    format (s, "feat_bitmap_drop: feature bitmap 0x%08x", t->feature_bitmap);
-  return s;
-}
-
-static uword
-feat_bitmap_drop_node_fn (vlib_main_t * vm,
-			  vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  feat_bitmap_drop_next_t next_index;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;	/* number of packets to process */
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      /* get space to enqueue frame to graph node "next_index" */
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      feat_bitmap_drop_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->feature_bitmap = vnet_buffer (b0)->l2.feature_bitmap;
-	    }
-
-	  if (vnet_buffer (b0)->l2.feature_bitmap == 1)
-	    {
-	      /*
-	       * If we are executing the last feature, this is the
-	       * No forwarding catch-all
-	       */
-	      b0->error = node->errors[FEAT_BITMAP_DROP_ERROR_NO_FWD];
-	    }
-	  else
-	    {
-	      b0->error = node->errors[FEAT_BITMAP_DROP_ERROR_NYI];
-	    }
-	  next0 = FEAT_BITMAP_DROP_NEXT_DROP;
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return frame->n_vectors;
-}
-
-clib_error_t *
-feat_bitmap_drop_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (feat_bitmap_drop_init);
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (feat_bitmap_drop_node,static) = {
-  .function = feat_bitmap_drop_node_fn,
-  .name = "feature-bitmap-drop",
-  .vector_size = sizeof (u32),
-  .format_trace = format_feat_bitmap_drop_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(feat_bitmap_drop_error_strings),
-  .error_strings = feat_bitmap_drop_error_strings,
-
-  .n_next_nodes = FEAT_BITMAP_DROP_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [FEAT_BITMAP_DROP_NEXT_DROP]  = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/feat_bitmap.h b/vnet/vnet/l2/feat_bitmap.h
deleted file mode 100644
index c6e02ecc..00000000
--- a/vnet/vnet/l2/feat_bitmap.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * feat_bitmap.h: bitmap for managing feature invocation
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_vnet_l2_feat_bitmap_h
-#define included_vnet_l2_feat_bitmap_h
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-
-/*
- * The feature bitmap is a way of organizing input and output feature graph nodes.
- * The set of features to be executed are arranged in a bitmap with one bit per
- * feature and each bit positioned in the same order that the features should be
- * executed. Features can be dynamically removed from the set by masking off their
- * corresponding bits. The bitmap is stored in packet context. Each feature clears
- * its bit and then calls feat_bitmap_get_next_node_index() to go to the next
- * graph node.
- */
-
-
-/* 32 features in a u32 bitmap */
-#define FEAT_MAX 32
-
-/**
- Initialize the feature next-node indexes of a graph node.
- Should be called by the init function of each feature graph node.
-*/
-always_inline void
-feat_bitmap_init_next_nodes (vlib_main_t * vm, u32 node_index,	/* the current graph node index  */
-			     u32 num_features,	/* number of entries in feat_names */
-			     char **feat_names,	/* array of feature graph node names */
-			     u32 * next_nodes)	/* array of 32 next indexes to init */
-{
-  u32 idx;
-
-  ASSERT (num_features <= FEAT_MAX);
-
-  for (idx = 0; idx < num_features; idx++)
-    {
-      if (vlib_get_node_by_name (vm, (u8 *) feat_names[idx]))
-	{
-	  next_nodes[idx] =
-	    vlib_node_add_named_next (vm, node_index, feat_names[idx]);
-	}
-      else
-	{			// Node may be in plugin which is not installed, use drop node
-	  next_nodes[idx] =
-	    vlib_node_add_named_next (vm, node_index, "feature-bitmap-drop");
-	}
-    }
-
-  /* All unassigned bits go to the drop node */
-  for (; idx < FEAT_MAX; idx++)
-    {
-      next_nodes[idx] = vlib_node_add_named_next (vm, node_index,
-						  "feature-bitmap-drop");
-    }
-}
-
-/**
- Return the graph node index for the feature corresponding to the
- first set bit in the bitmap.
-*/
-always_inline
-  u32 feat_bitmap_get_next_node_index (u32 * next_nodes, u32 bitmap)
-{
-  u32 first_bit;
-
-  count_leading_zeros (first_bit, bitmap);
-  first_bit = uword_bits - 1 - first_bit;
-  return next_nodes[first_bit];
-}
-
-#endif /* included_vnet_l2_feat_bitmap_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2.api b/vnet/vnet/l2/l2.api
deleted file mode 100644
index 5fce7944..00000000
--- a/vnet/vnet/l2/l2.api
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Hey Emacs use -*- mode: C -*- */
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \brief Reply to l2_xconnect_dump 
-    @param context - sender context which was passed in the request
-    @param rx_sw_if_index - Receive interface index
-    @param tx_sw_if_index - Transmit interface index
- */
-define l2_xconnect_details
-{
-  u32 context;
-  u32 rx_sw_if_index;
-  u32 tx_sw_if_index;
-};
-
-/** \brief Dump L2 XConnects
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define l2_xconnect_dump
-{
-  u32 client_index;
-  u32 context;
-};
-
diff --git a/vnet/vnet/l2/l2_api.c b/vnet/vnet/l2/l2_api.c
deleted file mode 100644
index ca4f593f..00000000
--- a/vnet/vnet/l2/l2_api.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *------------------------------------------------------------------
- * l2_api.c - layer 2 forwarding api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/l2/l2_input.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                             \
-_(L2_XCONNECT_DUMP, l2_xconnect_dump)
-
-static void
-send_l2_xconnect_details (unix_shared_memory_queue_t * q, u32 context,
-			  u32 rx_sw_if_index, u32 tx_sw_if_index)
-{
-  vl_api_l2_xconnect_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_L2_XCONNECT_DETAILS);
-  mp->context = context;
-  mp->rx_sw_if_index = htonl (rx_sw_if_index);
-  mp->tx_sw_if_index = htonl (tx_sw_if_index);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_l2_xconnect_dump_t_handler (vl_api_l2_xconnect_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  l2input_main_t *l2im = &l2input_main;
-  vnet_sw_interface_t *swif;
-  l2_input_config_t *config;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  /* *INDENT-OFF* */
-  pool_foreach (swif, im->sw_interfaces,
-  ({
-    config = vec_elt_at_index (l2im->configs, swif->sw_if_index);
-    if (config->xconnect)
-      send_l2_xconnect_details (q, mp->context, swif->sw_if_index,
-                                config->output_sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-
-/*
- * vpe_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_l2;
-#undef _
-}
-
-static clib_error_t *
-l2_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (l2_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_bd.c b/vnet/vnet/l2/l2_bd.c
deleted file mode 100644
index 22f83d0b..00000000
--- a/vnet/vnet/l2/l2_bd.c
+++ /dev/null
@@ -1,1079 +0,0 @@
-/*
- * l2_bd.c : layer 2 bridge domain
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vlib/cli.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/format.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/feat_bitmap.h>
-#include <vnet/l2/l2_bd.h>
-#include <vnet/l2/l2_learn.h>
-#include <vnet/l2/l2_fib.h>
-#include <vnet/l2/l2_vtr.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/vec.h>
-
-/**
- * @file
- * @brief Ethernet Bridge Domain.
- *
- * Code in this file manages Layer 2 bridge domains.
- *
- */
-
-bd_main_t bd_main;
-
-/**
-  Init bridge domain if not done already.
-  For feature bitmap, set all bits except ARP termination
-*/
-void
-bd_validate (l2_bridge_domain_t * bd_config)
-{
-  if (!bd_is_valid (bd_config))
-    {
-      bd_config->feature_bitmap = ~L2INPUT_FEAT_ARP_TERM;
-      bd_config->bvi_sw_if_index = ~0;
-      bd_config->members = 0;
-      bd_config->flood_count = 0;
-      bd_config->tun_master_count = 0;
-      bd_config->tun_normal_count = 0;
-      bd_config->mac_by_ip4 = 0;
-      bd_config->mac_by_ip6 = hash_create_mem (0, sizeof (ip6_address_t),
-					       sizeof (uword));
-    }
-}
-
-u32
-bd_find_or_add_bd_index (bd_main_t * bdm, u32 bd_id)
-{
-  uword *p;
-  u32 rv;
-
-  if (bd_id == ~0)
-    {
-      bd_id = 0;
-      while (hash_get (bdm->bd_index_by_bd_id, bd_id))
-	bd_id++;
-    }
-  else
-    {
-      p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-      if (p)
-	return (p[0]);
-    }
-
-  rv = clib_bitmap_first_clear (bdm->bd_index_bitmap);
-
-  /* mark this index busy */
-  bdm->bd_index_bitmap = clib_bitmap_set (bdm->bd_index_bitmap, rv, 1);
-
-  hash_set (bdm->bd_index_by_bd_id, bd_id, rv);
-
-  vec_validate (l2input_main.bd_configs, rv);
-  l2input_main.bd_configs[rv].bd_id = bd_id;
-
-  return rv;
-}
-
-int
-bd_delete_bd_index (bd_main_t * bdm, u32 bd_id)
-{
-  uword *p;
-  u32 bd_index;
-
-  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-  if (p == 0)
-    return -1;
-
-  bd_index = p[0];
-
-  /* mark this index clear */
-  bdm->bd_index_bitmap = clib_bitmap_set (bdm->bd_index_bitmap, bd_index, 0);
-  hash_unset (bdm->bd_index_by_bd_id, bd_id);
-
-  l2input_main.bd_configs[bd_index].bd_id = ~0;
-  l2input_main.bd_configs[bd_index].feature_bitmap = 0;
-
-  return 0;
-}
-
-static void
-update_flood_count (l2_bridge_domain_t * bd_config)
-{
-  bd_config->flood_count = vec_len (bd_config->members) -
-    (bd_config->tun_master_count ? bd_config->tun_normal_count : 0);
-}
-
-void
-bd_add_member (l2_bridge_domain_t * bd_config, l2_flood_member_t * member)
-{
-  u32 ix;
-  vnet_sw_interface_t *sw_if = vnet_get_sw_interface
-    (vnet_get_main (), member->sw_if_index);
-
-  /*
-   * Add one element to the vector
-   * vector is ordered [ bvi, normal/tun_masters..., tun_normals... ]
-   * When flooding, the bvi interface (if present) must be the last member
-   * processed due to how BVI processing can change the packet. To enable
-   * this order, we make the bvi interface the first in the vector and
-   * flooding walks the vector in reverse.
-   */
-  switch (sw_if->flood_class)
-    {
-    case VNET_FLOOD_CLASS_TUNNEL_MASTER:
-      bd_config->tun_master_count++;
-      /* Fall through */
-    default:
-      /* Fall through */
-    case VNET_FLOOD_CLASS_NORMAL:
-      ix = (member->flags & L2_FLOOD_MEMBER_BVI) ? 0 :
-	vec_len (bd_config->members) - bd_config->tun_normal_count;
-      break;
-    case VNET_FLOOD_CLASS_TUNNEL_NORMAL:
-      ix = vec_len (bd_config->members);
-      bd_config->tun_normal_count++;
-      break;
-    }
-
-  vec_insert_elts (bd_config->members, member, 1, ix);
-  update_flood_count (bd_config);
-}
-
-#define BD_REMOVE_ERROR_OK        0
-#define BD_REMOVE_ERROR_NOT_FOUND 1
-
-u32
-bd_remove_member (l2_bridge_domain_t * bd_config, u32 sw_if_index)
-{
-  u32 ix;
-
-  /* Find and delete the member */
-  vec_foreach_index (ix, bd_config->members)
-  {
-    l2_flood_member_t *m = vec_elt_at_index (bd_config->members, ix);
-    if (m->sw_if_index == sw_if_index)
-      {
-	vnet_sw_interface_t *sw_if = vnet_get_sw_interface
-	  (vnet_get_main (), sw_if_index);
-
-	if (sw_if->flood_class != VNET_FLOOD_CLASS_NORMAL)
-	  {
-	    if (sw_if->flood_class == VNET_FLOOD_CLASS_TUNNEL_MASTER)
-	      bd_config->tun_master_count--;
-	    else if (sw_if->flood_class == VNET_FLOOD_CLASS_TUNNEL_NORMAL)
-	      bd_config->tun_normal_count--;
-	  }
-	vec_del1 (bd_config->members, ix);
-	update_flood_count (bd_config);
-
-	return BD_REMOVE_ERROR_OK;
-      }
-  }
-
-  return BD_REMOVE_ERROR_NOT_FOUND;
-}
-
-
-clib_error_t *
-l2bd_init (vlib_main_t * vm)
-{
-  bd_main_t *bdm = &bd_main;
-  u32 bd_index;
-  bdm->bd_index_by_bd_id = hash_create (0, sizeof (uword));
-  /*
-   * create a dummy bd with bd_id of 0 and bd_index of 0 with feature set
-   * to packet drop only. Thus, packets received from any L2 interface with
-   * uninitialized bd_index of 0 can be dropped safely.
-   */
-  bd_index = bd_find_or_add_bd_index (bdm, 0);
-  ASSERT (bd_index == 0);
-  l2input_main.bd_configs[0].feature_bitmap = L2INPUT_FEAT_DROP;
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2bd_init);
-
-
-/**
-    Set the learn/forward/flood flags for the bridge domain.
-    Return 0 if ok, non-zero if for an error.
-*/
-u32
-bd_set_flags (vlib_main_t * vm, u32 bd_index, u32 flags, u32 enable)
-{
-
-  l2_bridge_domain_t *bd_config;
-  u32 feature_bitmap = 0;
-
-  vec_validate (l2input_main.bd_configs, bd_index);
-  bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index);
-
-  bd_validate (bd_config);
-
-  if (flags & L2_LEARN)
-    {
-      feature_bitmap |= L2INPUT_FEAT_LEARN;
-    }
-  if (flags & L2_FWD)
-    {
-      feature_bitmap |= L2INPUT_FEAT_FWD;
-    }
-  if (flags & L2_FLOOD)
-    {
-      feature_bitmap |= L2INPUT_FEAT_FLOOD;
-    }
-  if (flags & L2_UU_FLOOD)
-    {
-      feature_bitmap |= L2INPUT_FEAT_UU_FLOOD;
-    }
-  if (flags & L2_ARP_TERM)
-    {
-      feature_bitmap |= L2INPUT_FEAT_ARP_TERM;
-    }
-
-  if (enable)
-    {
-      bd_config->feature_bitmap |= feature_bitmap;
-    }
-  else
-    {
-      bd_config->feature_bitmap &= ~feature_bitmap;
-    }
-
-  return 0;
-}
-
-/**
-    Set the mac age for the bridge domain.
-*/
-void
-bd_set_mac_age (vlib_main_t * vm, u32 bd_index, u8 age)
-{
-  l2_bridge_domain_t *bd_config;
-  int enable = 0;
-
-  vec_validate (l2input_main.bd_configs, bd_index);
-  bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index);
-  bd_config->mac_age = age;
-
-  /* check if there is at least one bd with mac aging enabled */
-  vec_foreach (bd_config, l2input_main.bd_configs)
-    if (bd_config->bd_id != ~0 && bd_config->mac_age != 0)
-    enable = 1;
-
-  vlib_process_signal_event (vm, l2fib_mac_age_scanner_process_node.index,
-			     enable ? L2_MAC_AGE_PROCESS_EVENT_START :
-			     L2_MAC_AGE_PROCESS_EVENT_STOP, 0);
-}
-
-/**
-   Set bridge-domain learn enable/disable.
-   The CLI format is:
-   set bridge-domain learn <bd_id> [disable]
-*/
-static clib_error_t *
-bd_learn (vlib_main_t * vm,
-	  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  bd_main_t *bdm = &bd_main;
-  clib_error_t *error = 0;
-  u32 bd_index, bd_id;
-  u32 enable;
-  uword *p;
-
-  if (!unformat (input, "%d", &bd_id))
-    {
-      error = clib_error_return (0, "expecting bridge-domain id but got `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-
-  if (p == 0)
-    return clib_error_return (0, "No such bridge domain %d", bd_id);
-
-  bd_index = p[0];
-
-  enable = 1;
-  if (unformat (input, "disable"))
-    {
-      enable = 0;
-    }
-
-  /* set the bridge domain flag */
-  if (bd_set_flags (vm, bd_index, L2_LEARN, enable))
-    {
-      error =
-	clib_error_return (0, "bridge-domain id %d out of range", bd_index);
-      goto done;
-    }
-
-done:
-  return error;
-}
-
-/*?
- * Layer 2 learning can be enabled and disabled on each
- * interface and on each bridge-domain. Use this command to
- * manage bridge-domains. It is enabled by default.
- *
- * @cliexpar
- * Example of how to enable learning (where 200 is the bridge-domain-id):
- * @cliexcmd{set bridge-domain learn 200}
- * Example of how to disable learning (where 200 is the bridge-domain-id):
- * @cliexcmd{set bridge-domain learn 200 disable}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (bd_learn_cli, static) = {
-  .path = "set bridge-domain learn",
-  .short_help = "set bridge-domain learn <bridge-domain-id> [disable]",
-  .function = bd_learn,
-};
-/* *INDENT-ON* */
-
-/**
-    Set bridge-domain forward enable/disable.
-    The CLI format is:
-    set bridge-domain forward <bd_index> [disable]
-*/
-static clib_error_t *
-bd_fwd (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  bd_main_t *bdm = &bd_main;
-  clib_error_t *error = 0;
-  u32 bd_index, bd_id;
-  u32 enable;
-  uword *p;
-
-  if (!unformat (input, "%d", &bd_id))
-    {
-      error = clib_error_return (0, "expecting bridge-domain id but got `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-
-  if (p == 0)
-    return clib_error_return (0, "No such bridge domain %d", bd_id);
-
-  bd_index = p[0];
-
-  enable = 1;
-  if (unformat (input, "disable"))
-    {
-      enable = 0;
-    }
-
-  /* set the bridge domain flag */
-  if (bd_set_flags (vm, bd_index, L2_FWD, enable))
-    {
-      error =
-	clib_error_return (0, "bridge-domain id %d out of range", bd_index);
-      goto done;
-    }
-
-done:
-  return error;
-}
-
-
-/*?
- * Layer 2 unicast forwarding can be enabled and disabled on each
- * interface and on each bridge-domain. Use this command to
- * manage bridge-domains. It is enabled by default.
- *
- * @cliexpar
- * Example of how to enable forwarding (where 200 is the bridge-domain-id):
- * @cliexcmd{set bridge-domain forward 200}
- * Example of how to disable forwarding (where 200 is the bridge-domain-id):
- * @cliexcmd{set bridge-domain forward 200 disable}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (bd_fwd_cli, static) = {
-  .path = "set bridge-domain forward",
-  .short_help = "set bridge-domain forward <bridge-domain-id> [disable]",
-  .function = bd_fwd,
-};
-/* *INDENT-ON* */
-
-/**
-    Set bridge-domain flood enable/disable.
-    The CLI format is:
-    set bridge-domain flood <bd_index> [disable]
-*/
-static clib_error_t *
-bd_flood (vlib_main_t * vm,
-	  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  bd_main_t *bdm = &bd_main;
-  clib_error_t *error = 0;
-  u32 bd_index, bd_id;
-  u32 enable;
-  uword *p;
-
-  if (!unformat (input, "%d", &bd_id))
-    {
-      error = clib_error_return (0, "expecting bridge-domain id but got `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-
-  if (p == 0)
-    return clib_error_return (0, "No such bridge domain %d", bd_id);
-
-  bd_index = p[0];
-
-  enable = 1;
-  if (unformat (input, "disable"))
-    {
-      enable = 0;
-    }
-
-  /* set the bridge domain flag */
-  if (bd_set_flags (vm, bd_index, L2_FLOOD, enable))
-    {
-      error =
-	clib_error_return (0, "bridge-domain id %d out of range", bd_index);
-      goto done;
-    }
-
-done:
-  return error;
-}
-
-/*?
- * Layer 2 flooding can be enabled and disabled on each
- * interface and on each bridge-domain. Use this command to
- * manage bridge-domains. It is enabled by default.
- *
- * @cliexpar
- * Example of how to enable flooding (where 200 is the bridge-domain-id):
- * @cliexcmd{set bridge-domain flood 200}
- * Example of how to disable flooding (where 200 is the bridge-domain-id):
- * @cliexcmd{set bridge-domain flood 200 disable}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (bd_flood_cli, static) = {
-  .path = "set bridge-domain flood",
-  .short_help = "set bridge-domain flood <bridge-domain-id> [disable]",
-  .function = bd_flood,
-};
-/* *INDENT-ON* */
-
-/**
-    Set bridge-domain unkown-unicast flood enable/disable.
-    The CLI format is:
-    set bridge-domain uu-flood <bd_index> [disable]
-*/
-static clib_error_t *
-bd_uu_flood (vlib_main_t * vm,
-	     unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  bd_main_t *bdm = &bd_main;
-  clib_error_t *error = 0;
-  u32 bd_index, bd_id;
-  u32 enable;
-  uword *p;
-
-  if (!unformat (input, "%d", &bd_id))
-    {
-      error = clib_error_return (0, "expecting bridge-domain id but got `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-
-  if (p == 0)
-    return clib_error_return (0, "No such bridge domain %d", bd_id);
-
-  bd_index = p[0];
-
-  enable = 1;
-  if (unformat (input, "disable"))
-    {
-      enable = 0;
-    }
-
-  /* set the bridge domain flag */
-  if (bd_set_flags (vm, bd_index, L2_UU_FLOOD, enable))
-    {
-      error =
-	clib_error_return (0, "bridge-domain id %d out of range", bd_index);
-      goto done;
-    }
-
-done:
-  return error;
-}
-
-/*?
- * Layer 2 unknown-unicast flooding can be enabled and disabled on each
- * bridge-domain. It is enabled by default.
- *
- * @cliexpar
- * Example of how to enable unknown-unicast flooding (where 200 is the
- * bridge-domain-id):
- * @cliexcmd{set bridge-domain uu-flood 200}
- * Example of how to disable unknown-unicast flooding (where 200 is the bridge-domain-id):
- * @cliexcmd{set bridge-domain uu-flood 200 disable}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (bd_uu_flood_cli, static) = {
-  .path = "set bridge-domain uu-flood",
-  .short_help = "set bridge-domain uu-flood <bridge-domain-id> [disable]",
-  .function = bd_uu_flood,
-};
-/* *INDENT-ON* */
-
-/**
-    Set bridge-domain arp term enable/disable.
-    The CLI format is:
-    set bridge-domain arp term <bridge-domain-id> [disable]
-*/
-static clib_error_t *
-bd_arp_term (vlib_main_t * vm,
-	     unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  bd_main_t *bdm = &bd_main;
-  clib_error_t *error = 0;
-  u32 bd_index, bd_id;
-  u32 enable;
-  uword *p;
-
-  if (!unformat (input, "%d", &bd_id))
-    {
-      error = clib_error_return (0, "expecting bridge-domain id but got `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-  if (p)
-    bd_index = *p;
-  else
-    return clib_error_return (0, "No such bridge domain %d", bd_id);
-
-  enable = 1;
-  if (unformat (input, "disable"))
-    enable = 0;
-
-  /* set the bridge domain flag */
-  if (bd_set_flags (vm, bd_index, L2_ARP_TERM, enable))
-    {
-      error =
-	clib_error_return (0, "bridge-domain id %d out of range", bd_index);
-      goto done;
-    }
-
-done:
-  return error;
-}
-
-static clib_error_t *
-bd_mac_age (vlib_main_t * vm,
-	    unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  bd_main_t *bdm = &bd_main;
-  clib_error_t *error = 0;
-  u32 bd_index, bd_id;
-  u32 age;
-  uword *p;
-
-  if (!unformat (input, "%d", &bd_id))
-    {
-      error = clib_error_return (0, "expecting bridge-domain id but got `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-
-  if (p == 0)
-    return clib_error_return (0, "No such bridge domain %d", bd_id);
-
-  bd_index = p[0];
-
-  if (!unformat (input, "%u", &age))
-    {
-      error =
-	clib_error_return (0, "expecting ageing time in minutes but got `%U'",
-			   format_unformat_error, input);
-      goto done;
-    }
-
-  /* set the bridge domain flag */
-  if (age > 255)
-    {
-      error =
-	clib_error_return (0, "mac aging time cannot be bigger than 255");
-      goto done;
-    }
-  bd_set_mac_age (vm, bd_index, (u8) age);
-
-done:
-  return error;
-}
-
-/*?
- * Layer 2 mac aging can be enabled and disabled on each
- * bridge-domain. Use this command to set or disable mac aging
- * on specific bridge-domains. It is disabled by default.
- *
- * @cliexpar
- * Example of how to set mac aging (where 200 is the bridge-domain-id and
- * 5 is aging time in minutes):
- * @cliexcmd{set bridge-domain mac-age 200 5}
- * Example of how to disable mac aging (where 200 is the bridge-domain-id):
- * @cliexcmd{set bridge-domain flood 200 0}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (bd_mac_age_cli, static) = {
-  .path = "set bridge-domain mac-age",
-  .short_help = "set bridge-domain mac-age <bridge-domain-id> <mins>",
-  .function = bd_mac_age,
-};
-/* *INDENT-ON* */
-
-/*?
- * Modify whether or not an existing bridge-domain should terminate and respond
- * to ARP Requests. ARP Termination is disabled by default.
- *
- * @cliexpar
- * Example of how to enable ARP termination (where 200 is the bridge-domain-id):
- * @cliexcmd{set bridge-domain arp term 200}
- * Example of how to disable ARP termination (where 200 is the bridge-domain-id):
- * @cliexcmd{set bridge-domain arp term 200 disable}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (bd_arp_term_cli, static) = {
-  .path = "set bridge-domain arp term",
-  .short_help = "set bridge-domain arp term <bridge-domain-id> [disable]",
-  .function = bd_arp_term,
-};
-/* *INDENT-ON* */
-
-
-/**
- * Add/delete IP address to MAC address mapping.
- *
- * The clib hash implementation stores uword entries in the hash table.
- * The hash table mac_by_ip4 is keyed via IP4 address and store the
- * 6-byte MAC address directly in the hash table entry uword.
- *
- * @warning This only works for 64-bit processor with 8-byte uword;
- * which means this code *WILL NOT WORK* for a 32-bit prcessor with
- * 4-byte uword.
- */
-u32
-bd_add_del_ip_mac (u32 bd_index,
-		   u8 * ip_addr, u8 * mac_addr, u8 is_ip6, u8 is_add)
-{
-  l2input_main_t *l2im = &l2input_main;
-  l2_bridge_domain_t *bd_cfg = l2input_bd_config_from_index (l2im, bd_index);
-  u64 new_mac = *(u64 *) mac_addr;
-  u64 *old_mac;
-  u16 *mac16 = (u16 *) & new_mac;
-
-  ASSERT (sizeof (uword) == sizeof (u64));	/* make sure uword is 8 bytes */
-
-  mac16[3] = 0;			/* Clear last 2 unsed bytes of the 8-byte MAC address */
-  if (is_ip6)
-    {
-      ip6_address_t *ip6_addr_key;
-      hash_pair_t *hp;
-      old_mac = (u64 *) hash_get_mem (bd_cfg->mac_by_ip6, ip_addr);
-      if (is_add)
-	{
-	  if (old_mac == 0)
-	    {			/* new entry - allocate and craete ip6 address key */
-	      ip6_addr_key = clib_mem_alloc (sizeof (ip6_address_t));
-	      clib_memcpy (ip6_addr_key, ip_addr, sizeof (ip6_address_t));
-	    }
-	  else if (*old_mac == new_mac)
-	    {			/* same mac entry already exist for ip6 address */
-	      return 0;
-	    }
-	  else
-	    {			/* updat mac for ip6 address */
-	      hp = hash_get_pair (bd_cfg->mac_by_ip6, ip_addr);
-	      ip6_addr_key = (ip6_address_t *) hp->key;
-	    }
-	  hash_set_mem (bd_cfg->mac_by_ip6, ip6_addr_key, new_mac);
-	}
-      else
-	{
-	  if (old_mac && (*old_mac == new_mac))
-	    {
-	      hp = hash_get_pair (bd_cfg->mac_by_ip6, ip_addr);
-	      ip6_addr_key = (ip6_address_t *) hp->key;
-	      hash_unset_mem (bd_cfg->mac_by_ip6, ip_addr);
-	      clib_mem_free (ip6_addr_key);
-	    }
-	  else
-	    return 1;
-	}
-    }
-  else
-    {
-      ip4_address_t ip4_addr = *(ip4_address_t *) ip_addr;
-      old_mac = (u64 *) hash_get (bd_cfg->mac_by_ip4, ip4_addr.as_u32);
-      if (is_add)
-	{
-	  if (old_mac && (*old_mac == new_mac))
-	    return 0;		/* mac entry already exist */
-	  hash_set (bd_cfg->mac_by_ip4, ip4_addr.as_u32, new_mac);
-	}
-      else
-	{
-	  if (old_mac && (*old_mac == new_mac))
-	    hash_unset (bd_cfg->mac_by_ip4, ip4_addr.as_u32);
-	  else
-	    return 1;
-	}
-    }
-  return 0;
-}
-
-/**
-    Set bridge-domain arp entry add/delete.
-    The CLI format is:
-    set bridge-domain arp entry <bridge-domain-id> <ip-addr> <mac-addr> [del]
-*/
-static clib_error_t *
-bd_arp_entry (vlib_main_t * vm,
-	      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  bd_main_t *bdm = &bd_main;
-  clib_error_t *error = 0;
-  u32 bd_index, bd_id;
-  u8 is_add = 1;
-  u8 is_ip6 = 0;
-  u8 ip_addr[16];
-  u8 mac_addr[6];
-  uword *p;
-
-  if (!unformat (input, "%d", &bd_id))
-    {
-      error = clib_error_return (0, "expecting bridge-domain id but got `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-
-  if (p)
-    bd_index = *p;
-  else
-    return clib_error_return (0, "No such bridge domain %d", bd_id);
-
-  if (unformat (input, "%U", unformat_ip4_address, ip_addr))
-    {
-      is_ip6 = 0;
-    }
-  else if (unformat (input, "%U", unformat_ip6_address, ip_addr))
-    {
-      is_ip6 = 1;
-    }
-  else
-    {
-      error = clib_error_return (0, "expecting IP address but got `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  if (!unformat (input, "%U", unformat_ethernet_address, mac_addr))
-    {
-      error = clib_error_return (0, "expecting MAC address but got `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  if (unformat (input, "del"))
-    {
-      is_add = 0;
-    }
-
-  /* set the bridge domain flagAdd IP-MAC entry into bridge domain */
-  if (bd_add_del_ip_mac (bd_index, ip_addr, mac_addr, is_ip6, is_add))
-    {
-      error = clib_error_return (0, "MAC %s for IP %U and MAC %U failed",
-				 is_add ? "add" : "del",
-				 is_ip6 ?
-				 format_ip4_address : format_ip6_address,
-				 ip_addr, format_ethernet_address, mac_addr);
-    }
-
-done:
-  return error;
-}
-
-/*?
- * Add an ARP entry to an existing bridge-domain.
- *
- * @cliexpar
- * Example of how to add an ARP entry (where 200 is the bridge-domain-id):
- * @cliexcmd{set bridge-domain arp entry 200 192.168.72.45 52:54:00:3b:83:1a}
- * Example of how to delete an ARP entry (where 200 is the bridge-domain-id):
- * @cliexcmd{set bridge-domain arp entry 200 192.168.72.45 52:54:00:3b:83:1a del}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (bd_arp_entry_cli, static) = {
-  .path = "set bridge-domain arp entry",
-  .short_help = "set bridge-domain arp entry <bridge-domain-id> <ip-addr> <mac-addr> [del]",
-  .function = bd_arp_entry,
-};
-/* *INDENT-ON* */
-
-u8 *
-format_vtr (u8 * s, va_list * args)
-{
-  u32 vtr_op = va_arg (*args, u32);
-  u32 dot1q = va_arg (*args, u32);
-  u32 tag1 = va_arg (*args, u32);
-  u32 tag2 = va_arg (*args, u32);
-  switch (vtr_op)
-    {
-    case L2_VTR_DISABLED:
-      return format (s, "none");
-    case L2_VTR_PUSH_1:
-      return format (s, "push-1 %s %d", dot1q ? "dot1q" : "dot1ad", tag1);
-    case L2_VTR_PUSH_2:
-      return format (s, "push-2 %s %d %d", dot1q ? "dot1q" : "dot1ad", tag1,
-		     tag2);
-    case L2_VTR_POP_1:
-      return format (s, "pop-1");
-    case L2_VTR_POP_2:
-      return format (s, "pop-2");
-    case L2_VTR_TRANSLATE_1_1:
-      return format (s, "trans-1-1 %s %d", dot1q ? "dot1q" : "dot1ad", tag1);
-    case L2_VTR_TRANSLATE_1_2:
-      return format (s, "trans-1-2 %s %d %d", dot1q ? "dot1q" : "dot1ad",
-		     tag1, tag2);
-    case L2_VTR_TRANSLATE_2_1:
-      return format (s, "trans-2-1 %s %d", dot1q ? "dot1q" : "dot1ad", tag1);
-    case L2_VTR_TRANSLATE_2_2:
-      return format (s, "trans-2-2 %s %d %d", dot1q ? "dot1q" : "dot1ad",
-		     tag1, tag2);
-    default:
-      return format (s, "none");
-    }
-}
-
-/**
-   Show bridge-domain state.
-   The CLI format is:
-   show bridge-domain [<bd_index>]
-*/
-static clib_error_t *
-bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  bd_main_t *bdm = &bd_main;
-  clib_error_t *error = 0;
-  u32 bd_index = ~0;
-  l2_bridge_domain_t *bd_config;
-  u32 start, end;
-  u32 printed;
-  u32 detail = 0;
-  u32 intf = 0;
-  u32 arp = 0;
-  u32 bd_id = ~0;
-  uword *p;
-
-  start = 0;
-  end = vec_len (l2input_main.bd_configs);
-
-  if (unformat (input, "%d", &bd_id))
-    {
-      if (unformat (input, "detail"))
-	detail = 1;
-      else if (unformat (input, "det"))
-	detail = 1;
-      if (unformat (input, "int"))
-	intf = 1;
-      if (unformat (input, "arp"))
-	arp = 1;
-
-      p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-      if (p)
-	bd_index = *p;
-      else
-	return clib_error_return (0, "No such bridge domain %d", bd_id);
-
-      vec_validate (l2input_main.bd_configs, bd_index);
-      bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index);
-      if (bd_is_valid (bd_config))
-	{
-	  start = bd_index;
-	  end = start + 1;
-	}
-      else
-	{
-	  vlib_cli_output (vm, "bridge-domain %d not in use", bd_id);
-	  goto done;
-	}
-    }
-
-  /* Show all bridge-domains that have been initialized */
-  printed = 0;
-  for (bd_index = start; bd_index < end; bd_index++)
-    {
-      bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index);
-      if (bd_is_valid (bd_config))
-	{
-	  if (!printed)
-	    {
-	      printed = 1;
-	      vlib_cli_output (vm,
-			       "%=5s %=7s %=10s %=10s %=10s %=10s %=10s %=14s",
-			       "ID", "Index", "Learning", "U-Forwrd",
-			       "UU-Flood", "Flooding", "ARP-Term",
-			       "BVI-Intf");
-	    }
-
-	  vlib_cli_output (vm,
-			   "%=5d %=7d %=10s %=10s %=10s %=10s %=10s %=14U",
-			   bd_config->bd_id, bd_index,
-			   bd_config->feature_bitmap & L2INPUT_FEAT_LEARN ?
-			   "on" : "off",
-			   bd_config->feature_bitmap & L2INPUT_FEAT_FWD ? "on"
-			   : "off",
-			   bd_config->feature_bitmap & L2INPUT_FEAT_UU_FLOOD ?
-			   "on" : "off",
-			   bd_config->feature_bitmap & L2INPUT_FEAT_FLOOD ?
-			   "on" : "off",
-			   bd_config->feature_bitmap & L2INPUT_FEAT_ARP_TERM ?
-			   "on" : "off", format_vnet_sw_if_index_name_with_NA,
-			   vnm, bd_config->bvi_sw_if_index);
-
-	  if (detail || intf)
-	    {
-	      /* Show all member interfaces */
-	      int i;
-	      vec_foreach_index (i, bd_config->members)
-	      {
-		l2_flood_member_t *member =
-		  vec_elt_at_index (bd_config->members, i);
-		u32 vtr_opr, dot1q, tag1, tag2;
-		if (i == 0)
-		  {
-		    vlib_cli_output (vm, "\n%=30s%=7s%=5s%=5s%=9s%=30s",
-				     "Interface", "Index", "SHG", "BVI",
-				     "TxFlood", "VLAN-Tag-Rewrite");
-		  }
-		l2vtr_get (vm, vnm, member->sw_if_index, &vtr_opr, &dot1q,
-			   &tag1, &tag2);
-		vlib_cli_output (vm, "%=30U%=7d%=5d%=5s%=9s%=30U",
-				 format_vnet_sw_if_index_name, vnm,
-				 member->sw_if_index, member->sw_if_index,
-				 member->shg,
-				 member->flags & L2_FLOOD_MEMBER_BVI ? "*" :
-				 "-", i < bd_config->flood_count ? "*" : "-",
-				 format_vtr, vtr_opr, dot1q, tag1, tag2);
-	      }
-	    }
-
-	  if ((detail || arp) &&
-	      (bd_config->feature_bitmap & L2INPUT_FEAT_ARP_TERM))
-	    {
-	      u32 ip4_addr;
-	      ip6_address_t *ip6_addr;
-	      u64 mac_addr;
-	      vlib_cli_output (vm,
-			       "\n  IP4/IP6 to MAC table for ARP Termination");
-
-              /* *INDENT-OFF* */
-              hash_foreach (ip4_addr, mac_addr, bd_config->mac_by_ip4,
-              ({
-                vlib_cli_output (vm, "%=40U => %=20U",
-                                 format_ip4_address, &ip4_addr,
-                                 format_ethernet_address, &mac_addr);
-              }));
-
-              hash_foreach_mem (ip6_addr, mac_addr, bd_config->mac_by_ip6,
-              ({
-		vlib_cli_output (vm, "%=40U => %=20U",
-				 format_ip6_address, ip6_addr,
-				 format_ethernet_address, &mac_addr);
-              }));
-              /* *INDENT-ON* */
-	    }
-	}
-    }
-
-  if (!printed)
-    {
-      vlib_cli_output (vm, "no bridge-domains in use");
-    }
-
-done:
-  return error;
-}
-
-/*?
- * Show a summary of all the bridge-domain instances or detailed view of a
- * single bridge-domain. Bridge-domains are created by adding an interface
- * to a bridge using the '<em>set interface l2 bridge</em>' command.
- *
- * @cliexpar
- * @parblock
- * Example of displaying all bridge-domains:
- * @cliexstart{show bridge-domain}
- *  ID   Index   Learning   U-Forwrd   UU-Flood   Flooding   ARP-Term     BVI-Intf
- *  0      0        off        off        off        off        off        local0
- * 200     1        on         on         on         on         off          N/A
- * @cliexend
- *
- * Example of displaying details of a single bridge-domains:
- * @cliexstart{show bridge-domain 200 detail}
- *  ID   Index   Learning   U-Forwrd   UU-Flood   Flooding   ARP-Term     BVI-Intf
- * 200     1        on         on         on         on         off          N/A
- *
- *          Interface           Index  SHG  BVI        VLAN-Tag-Rewrite
- *  GigabitEthernet0/8/0.200      3     0    -               none
- *  GigabitEthernet0/9/0.200      4     0    -               none
- * @cliexend
- * @endparblock
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (bd_show_cli, static) = {
-  .path = "show bridge-domain",
-  .short_help = "show bridge-domain [bridge-domain-id [detail|int|arp]]",
-  .function = bd_show,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_bd.h b/vnet/vnet/l2/l2_bd.h
deleted file mode 100644
index 4bb9bc9b..00000000
--- a/vnet/vnet/l2/l2_bd.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * l2_bd.h : layer 2 bridge domain
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_l2bd_h
-#define included_l2bd_h
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-
-typedef struct
-{
-  /* hash bd_id -> bd_index */
-  uword *bd_index_by_bd_id;
-
-  /* Busy bd_index bitmap */
-  uword *bd_index_bitmap;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} bd_main_t;
-
-bd_main_t bd_main;
-
-/* Bridge domain member  */
-
-#define L2_FLOOD_MEMBER_NORMAL 0
-#define L2_FLOOD_MEMBER_BVI    1
-
-typedef struct
-{
-  u32 sw_if_index;		/* the output L2 interface */
-  u8 flags;			/* 0=normal, 1=bvi */
-  u8 shg;			/* split horizon group number  */
-  u16 spare;
-} l2_flood_member_t;
-
-
-/* Per-bridge domain configuration */
-
-typedef struct
-{
-  u32 feature_bitmap;
-  /*
-   * Contains bit enables for flooding, learning, and forwarding.
-   * All other feature bits should always be set.
-   *
-   * identity of the bridge-domain's BVI interface
-   * set to ~0 if there is no BVI
-   */
-  u32 bvi_sw_if_index;
-
-  /* bridge domain id, not to be confused with bd_index */
-  u32 bd_id;
-
-  /* Vector of member ports */
-  l2_flood_member_t *members;
-
-  /* First flood_count member ports are flooded */
-  u32 flood_count;
-
-  /* Tunnel Master (Multicast vxlan) are always flooded */
-  u32 tun_master_count;
-
-  /* Tunnels (Unicast vxlan) are flooded if there are no masters */
-  u32 tun_normal_count;
-
-  /* hash ip4/ip6 -> mac for arp/nd termination */
-  uword *mac_by_ip4;
-  uword *mac_by_ip6;
-
-  /* mac aging */
-  u8 mac_age;
-
-} l2_bridge_domain_t;
-
-/* Return 1 if bridge domain has been initialized */
-always_inline u32
-bd_is_valid (l2_bridge_domain_t * bd_config)
-{
-  return (bd_config->feature_bitmap != 0);
-}
-
-/* Init bridge domain if not done already */
-void bd_validate (l2_bridge_domain_t * bd_config);
-
-
-void
-bd_add_member (l2_bridge_domain_t * bd_config, l2_flood_member_t * member);
-
-u32 bd_remove_member (l2_bridge_domain_t * bd_config, u32 sw_if_index);
-
-
-#define L2_LEARN   (1<<0)
-#define L2_FWD     (1<<1)
-#define L2_FLOOD   (1<<2)
-#define L2_UU_FLOOD (1<<3)
-#define L2_ARP_TERM (1<<4)
-
-u32 bd_set_flags (vlib_main_t * vm, u32 bd_index, u32 flags, u32 enable);
-void bd_set_mac_age (vlib_main_t * vm, u32 bd_index, u8 age);
-
-/**
- * \brief Get or create a bridge domain.
- *
- * Get or create a bridge domain with the given bridge domain ID.
- *
- * \param bdm bd_main pointer.
- * \param bd_id The bridge domain ID or ~0 if an arbitrary unused bridge domain should be used.
- * \return The bridge domain index in \c l2input_main->l2_bridge_domain_t vector.
- */
-u32 bd_find_or_add_bd_index (bd_main_t * bdm, u32 bd_id);
-
-/**
- * \brief Delete a bridge domain.
- *
- * Delete an existing bridge domain with the given bridge domain ID.
- *
- * \param bdm bd_main pointer.
- * \param bd_id The bridge domain ID.
- * \return 0 on success and -1 if the bridge domain does not exist.
- */
-int bd_delete_bd_index (bd_main_t * bdm, u32 bd_id);
-
-u32 bd_add_del_ip_mac (u32 bd_index,
-		       u8 * ip_addr, u8 * mac_addr, u8 is_ip6, u8 is_add);
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_bvi.c b/vnet/vnet/l2/l2_bvi.c
deleted file mode 100644
index f239743a..00000000
--- a/vnet/vnet/l2/l2_bvi.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * l2_bvi.c : layer 2 Bridged Virtual Interface
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/l2/l2_fwd.h>
-#include <vnet/l2/l2_flood.h>
-#include <vnet/l2/l2_bvi.h>
-
-
-/* Call the L2 nodes that need the ethertype mapping */
-void
-l2bvi_register_input_type (vlib_main_t * vm,
-			   ethernet_type_t type, u32 node_index)
-{
-  l2fwd_register_input_type (vm, type, node_index);
-  l2flood_register_input_type (vm, type, node_index);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_bvi.h b/vnet/vnet/l2/l2_bvi.h
deleted file mode 100644
index dd1130a6..00000000
--- a/vnet/vnet/l2/l2_bvi.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * l2_bvi.h : layer 2 Bridged Virtual Interface
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_l2bvi_h
-#define included_l2bvi_h
-
-#include <vlib/vlib.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vppinfra/sparse_vec.h>
-
-#include <vnet/l2/l2_input.h>
-
-#define TO_BVI_ERR_OK        0
-#define TO_BVI_ERR_BAD_MAC   1
-#define TO_BVI_ERR_ETHERTYPE 2
-
-/**
- * Send a packet from L2 processing to L3 via the BVI interface.
- * Set next0 to the proper L3 input node.
- * Return an error if the packet isn't what we expect.
- */
-
-static_always_inline u32
-l2_to_bvi (vlib_main_t * vlib_main,
-	   vnet_main_t * vnet_main,
-	   vlib_buffer_t * b0,
-	   u32 bvi_sw_if_index, next_by_ethertype_t * l3_next, u32 * next0)
-{
-  u8 l2_len;
-  u16 ethertype;
-  u8 *l3h;
-  ethernet_header_t *e0;
-  vnet_hw_interface_t *hi;
-
-  e0 = vlib_buffer_get_current (b0);
-  hi = vnet_get_sup_hw_interface (vnet_main, bvi_sw_if_index);
-
-  /* Perform L3 my-mac filter */
-  if ((!ethernet_address_cast (e0->dst_address)) &&
-      (!eth_mac_equal ((u8 *) e0, hi->hw_address)))
-    {
-      return TO_BVI_ERR_BAD_MAC;
-    }
-
-  /* Save L2 header position which may be changed due to packet replication */
-  vnet_buffer (b0)->ethernet.start_of_ethernet_header = b0->current_data;
-
-  /* Strip L2 header */
-  l2_len = vnet_buffer (b0)->l2.l2_len;
-  vlib_buffer_advance (b0, l2_len);
-
-  l3h = vlib_buffer_get_current (b0);
-  ethertype = clib_net_to_host_u16 (*(u16 *) (l3h - 2));
-
-  /* Set the input interface to be the BVI interface */
-  vnet_buffer (b0)->sw_if_index[VLIB_RX] = bvi_sw_if_index;
-  vnet_buffer (b0)->sw_if_index[VLIB_TX] = ~0;
-
-  /* Go to appropriate L3 input node */
-  if (ethertype == ETHERNET_TYPE_IP4)
-    {
-      *next0 = l3_next->input_next_ip4;
-    }
-  else if (ethertype == ETHERNET_TYPE_IP6)
-    {
-      *next0 = l3_next->input_next_ip6;
-    }
-  else
-    {
-      /* uncommon ethertype, check table */
-      u32 i0;
-
-      i0 = sparse_vec_index (l3_next->input_next_by_type, ethertype);
-      *next0 = vec_elt (l3_next->input_next_by_type, i0);
-
-      if (i0 == SPARSE_VEC_INVALID_INDEX)
-	{
-	  return TO_BVI_ERR_ETHERTYPE;
-	}
-    }
-
-  /* increment BVI RX interface stat */
-  vlib_increment_combined_counter
-    (vnet_main->interface_main.combined_sw_if_counters
-     + VNET_INTERFACE_COUNTER_RX,
-     vlib_main->cpu_index,
-     vnet_buffer (b0)->sw_if_index[VLIB_RX],
-     1, vlib_buffer_length_in_chain (vlib_main, b0));
-  return TO_BVI_ERR_OK;
-}
-
-void
-l2bvi_register_input_type (vlib_main_t * vm,
-			   ethernet_type_t type, u32 node_index);
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_classify.h b/vnet/vnet/l2/l2_classify.h
deleted file mode 100644
index 184187ff..00000000
--- a/vnet/vnet/l2/l2_classify.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __included_vnet_l2_input_classify_h__
-#define __included_vnet_l2_input_classify_h__
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/ip/ip_packet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vlib/cli.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/l2_output.h>
-#include <vnet/l2/feat_bitmap.h>
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/cache.h>
-
-#include <vnet/classify/vnet_classify.h>
-
-typedef enum
-{
-  L2_INPUT_CLASSIFY_NEXT_DROP,
-  L2_INPUT_CLASSIFY_NEXT_ETHERNET_INPUT,
-  L2_INPUT_CLASSIFY_NEXT_IP4_INPUT,
-  L2_INPUT_CLASSIFY_NEXT_IP6_INPUT,
-  L2_INPUT_CLASSIFY_NEXT_LI,
-  L2_INPUT_CLASSIFY_N_NEXT,
-} l2_input_classify_next_t;
-
-typedef enum
-{
-  L2_INPUT_CLASSIFY_TABLE_IP4,
-  L2_INPUT_CLASSIFY_TABLE_IP6,
-  L2_INPUT_CLASSIFY_TABLE_OTHER,
-  L2_INPUT_CLASSIFY_N_TABLES,
-} l2_input_classify_table_id_t;
-
-typedef enum
-{
-  L2_OUTPUT_CLASSIFY_NEXT_DROP,
-  L2_OUTPUT_CLASSIFY_N_NEXT,
-} l2_output_classify_next_t;
-
-typedef enum
-{
-  L2_OUTPUT_CLASSIFY_TABLE_IP4,
-  L2_OUTPUT_CLASSIFY_TABLE_IP6,
-  L2_OUTPUT_CLASSIFY_TABLE_OTHER,
-  L2_OUTPUT_CLASSIFY_N_TABLES,
-} l2_output_classify_table_id_t;
-
-typedef struct _l2_classify_main
-{
-  /* Next nodes for each feature */
-  u32 feat_next_node_index[32];
-
-  /* Per-address-family classifier table vectors */
-  u32 *classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_N_TABLES];
-
-  /* Next nodes for features and output interfaces */
-  l2_output_next_nodes_st next_nodes;
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-  vnet_classify_main_t *vnet_classify_main;
-} l2_input_classify_main_t;
-
-typedef struct _l2_classify_main l2_output_classify_main_t;
-
-extern l2_input_classify_main_t l2_input_classify_main;
-extern vlib_node_registration_t l2_input_classify_node;
-
-extern l2_output_classify_main_t l2_output_classify_main;
-extern vlib_node_registration_t l2_output_classify_node;
-
-void vnet_l2_input_classify_enable_disable (u32 sw_if_index,
-					    int enable_disable);
-
-int vnet_l2_input_classify_set_tables (u32 sw_if_index, u32 ip4_table_index,
-				       u32 ip6_table_index,
-				       u32 other_table_index);
-
-void vnet_l2_output_classify_enable_disable (u32 sw_if_index,
-					     int enable_disable);
-
-int vnet_l2_output_classify_set_tables (u32 sw_if_index, u32 ip4_table_index,
-					u32 ip6_table_index,
-					u32 other_table_index);
-
-#endif /* __included_vnet_l2_input_classify_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_efp_filter.c b/vnet/vnet/l2/l2_efp_filter.c
deleted file mode 100644
index 2db4dc69..00000000
--- a/vnet/vnet/l2/l2_efp_filter.c
+++ /dev/null
@@ -1,614 +0,0 @@
-/*
- * l2_efp_filter.c : layer 2 egress EFP Filter processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/l2/feat_bitmap.h>
-#include <vnet/l2/l2_output.h>
-#include <vnet/ethernet/ethernet.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/cache.h>
-
-/**
- * @file
- * @brief EFP-filter - Ethernet Flow Point Filter.
- *
- * It is possible to transmit a packet out a subinterface with VLAN tags
- * that are not compatible with that subinterface. In other words, if that
- * packet arrived on the output port, it would not be classified as coming
- * from the output subinterface. This can happen in various ways: through
- * misconfiguration, by putting subinterfaces with different VLAN encaps in
- * the same bridge-domain, etc. The EFP Filter Check detects such packets
- * and drops them. It consists of two checks, one that verifies the packet
- * prior to output VLAN tag rewrite and one that verifies the packet after
- * VLAN tag rewrite.
- *
- */
-typedef struct
-{
-
-  /* Next nodes for features and output interfaces */
-  l2_output_next_nodes_st next_nodes;
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} l2_efp_filter_main_t;
-
-
-typedef struct
-{
-  /* per-pkt trace data */
-  u8 src[6];
-  u8 dst[6];
-  u8 raw[12];			/* raw data (vlans) */
-  u32 sw_if_index;
-} l2_efp_filter_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_l2_efp_filter_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2_efp_filter_trace_t *t = va_arg (*args, l2_efp_filter_trace_t *);
-
-  s = format (s, "l2-output-vtr: sw_if_index %d dst %U src %U data "
-	      "%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
-	      t->sw_if_index,
-	      format_ethernet_address, t->dst,
-	      format_ethernet_address, t->src,
-	      t->raw[0], t->raw[1], t->raw[2], t->raw[3], t->raw[4],
-	      t->raw[5], t->raw[6], t->raw[7], t->raw[8], t->raw[9],
-	      t->raw[10], t->raw[11]);
-  return s;
-}
-
-l2_efp_filter_main_t l2_efp_filter_main;
-
-static vlib_node_registration_t l2_efp_filter_node;
-
-#define foreach_l2_efp_filter_error			\
-_(L2_EFP_FILTER, "L2 EFP filter packets")		\
-_(DROP,          "L2 EFP filter post-rewrite drops")
-
-typedef enum
-{
-#define _(sym,str) L2_EFP_FILTER_ERROR_##sym,
-  foreach_l2_efp_filter_error
-#undef _
-    L2_EFP_FILTER_N_ERROR,
-} l2_efp_filter_error_t;
-
-static char *l2_efp_filter_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2_efp_filter_error
-#undef _
-};
-
-typedef enum
-{
-  L2_EFP_FILTER_NEXT_DROP,
-  L2_EFP_FILTER_N_NEXT,
-} l2_efp_filter_next_t;
-
-
-/**
- *  Extract fields from the packet that will be used in interface
- *  classification.
- */
-static_always_inline void
-extract_keys (vnet_main_t * vnet_main,
-	      u32 sw_if_index0,
-	      vlib_buffer_t * b0,
-	      u32 * port_sw_if_index0,
-	      u16 * first_ethertype0,
-	      u16 * outer_id0, u16 * inner_id0, u32 * match_flags0)
-{
-  ethernet_header_t *e0;
-  ethernet_vlan_header_t *h0;
-  u32 tag_len;
-  u32 tag_num;
-
-  *port_sw_if_index0 =
-    vnet_get_sup_sw_interface (vnet_main, sw_if_index0)->sw_if_index;
-
-  e0 = vlib_buffer_get_current (b0);
-  h0 = (ethernet_vlan_header_t *) (e0 + 1);
-
-  *first_ethertype0 = clib_net_to_host_u16 (e0->type);
-  *outer_id0 = clib_net_to_host_u16 (h0[0].priority_cfi_and_id);
-  *inner_id0 = clib_net_to_host_u16 (h0[1].priority_cfi_and_id);
-
-  tag_len = vnet_buffer (b0)->l2.l2_len - sizeof (ethernet_header_t);
-  tag_num = tag_len / sizeof (ethernet_vlan_header_t);
-  *match_flags0 = eth_create_valid_subint_match_flags (tag_num);
-}
-
-/*
- * EFP filtering is a basic switch feature which prevents an interface from
- * transmitting a packet that doesn't match the interface's ingress match
- * criteria. The check has two parts, one performed before egress vlan tag
- * rewrite and one after.
- *
- * The pre-rewrite check insures the packet matches what an ingress packet looks
- * like after going through the interface's ingress tag rewrite operation. Only
- * pushed tags are compared. So:
- * - if the ingress vlan tag rewrite pushes no tags (or is not enabled),
- *   any packet passes the filter
- * - if the ingress vlan tag rewrite pushes one tag,
- *   the packet must have at least one tag, and the outer tag must match the pushed tag
- * - if the ingress vlan tag rewrite pushes two tags,
- *   the packet must have at least two tags, and the outer two tags must match the pushed tags
- *
- * The pre-rewrite check is performed in the l2-output node.
- *
- * The post-rewrite check insures the packet matches what an ingress packet looks
- * like before going through the interface's ingress tag rewrite operation. It verifies
- * that such a packet arriving on the wire at this port would be classified as arriving
- * an input interface equal to the packet's output interface. This can be done by running
- * the output packet's vlan tags and output port through the interface classification,
- * and checking if the resulting interface matches the output interface.
- *
- * The post-rewrite check is performed here.
- */
-
-static uword
-l2_efp_filter_node_fn (vlib_main_t * vm,
-		       vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  l2_efp_filter_next_t next_index;
-  l2_efp_filter_main_t *msm = &l2_efp_filter_main;
-  vlib_node_t *n = vlib_get_node (vm, l2_efp_filter_node.index);
-  u32 node_counter_base_index = n->error_heap_index;
-  vlib_error_main_t *em = &vm->error_main;
-  u32 cached_sw_if_index = ~0;
-  u32 cached_next_index = ~0;
-
-  /* invalidate cache to begin with */
-  cached_sw_if_index = ~0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;	/* number of packets to process */
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      /* get space to enqueue frame to graph node "next_index" */
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 6 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-	  u32 sw_if_index0, sw_if_index1;
-	  u32 feature_bitmap0, feature_bitmap1;
-	  u16 first_ethertype0, first_ethertype1;
-	  u16 outer_id0, inner_id0, outer_id1, inner_id1;
-	  u32 match_flags0, match_flags1;
-	  u32 port_sw_if_index0, subint_sw_if_index0, port_sw_if_index1,
-	    subint_sw_if_index1;
-	  vnet_hw_interface_t *hi0, *hi1;
-	  main_intf_t *main_intf0, *main_intf1;
-	  vlan_intf_t *vlan_intf0, *vlan_intf1;
-	  qinq_intf_t *qinq_intf0, *qinq_intf1;
-	  u32 is_l20, is_l21;
-	  __attribute__ ((unused)) u32 matched0, matched1;
-	  u8 error0, error1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3, *p4, *p5;
-	    __attribute__ ((unused)) u32 sw_if_index2, sw_if_index3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-	    p4 = vlib_get_buffer (vm, from[4]);
-	    p5 = vlib_get_buffer (vm, from[5]);
-
-	    /* Prefetch the buffer header and packet for the N+2 loop iteration */
-	    vlib_prefetch_buffer_header (p4, LOAD);
-	    vlib_prefetch_buffer_header (p5, LOAD);
-
-	    CLIB_PREFETCH (p4->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p5->data, CLIB_CACHE_LINE_BYTES, STORE);
-
-	    /*
-	     * Prefetch the input config for the N+1 loop iteration
-	     * This depends on the buffer header above
-	     */
-	    sw_if_index2 = vnet_buffer (p2)->sw_if_index[VLIB_TX];
-	    sw_if_index3 = vnet_buffer (p3)->sw_if_index[VLIB_TX];
-	    /*
-	     * $$$ TODO
-	     * CLIB_PREFETCH (vec_elt_at_index(l2output_main.configs, sw_if_index2), CLIB_CACHE_LINE_BYTES, LOAD);
-	     * CLIB_PREFETCH (vec_elt_at_index(l2output_main.configs, sw_if_index3), CLIB_CACHE_LINE_BYTES, LOAD);
-	     */
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  /* bi is "buffer index", b is pointer to the buffer */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  /* TX interface handles */
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_TX];
-
-	  /* process 2 packets */
-	  em->counters[node_counter_base_index +
-		       L2_EFP_FILTER_ERROR_L2_EFP_FILTER] += 2;
-
-	  /* Remove ourself from the feature bitmap */
-	  feature_bitmap0 =
-	    vnet_buffer (b0)->l2.feature_bitmap & ~L2OUTPUT_FEAT_EFP_FILTER;
-	  feature_bitmap1 =
-	    vnet_buffer (b1)->l2.feature_bitmap & ~L2OUTPUT_FEAT_EFP_FILTER;
-
-	  /* Determine next node */
-	  l2_output_dispatch (msm->vlib_main,
-			      msm->vnet_main,
-			      node,
-			      l2_efp_filter_node.index,
-			      &cached_sw_if_index,
-			      &cached_next_index,
-			      &msm->next_nodes,
-			      b0, sw_if_index0, feature_bitmap0, &next0);
-	  l2_output_dispatch (msm->vlib_main,
-			      msm->vnet_main,
-			      node,
-			      l2_efp_filter_node.index,
-			      &cached_sw_if_index,
-			      &cached_next_index,
-			      &msm->next_nodes,
-			      b1, sw_if_index1, feature_bitmap1, &next1);
-
-	  /* perform the efp filter check on two packets */
-
-	  extract_keys (msm->vnet_main,
-			sw_if_index0,
-			b0,
-			&port_sw_if_index0,
-			&first_ethertype0,
-			&outer_id0, &inner_id0, &match_flags0);
-
-	  extract_keys (msm->vnet_main,
-			sw_if_index1,
-			b1,
-			&port_sw_if_index1,
-			&first_ethertype1,
-			&outer_id1, &inner_id1, &match_flags1);
-
-	  eth_vlan_table_lookups (&ethernet_main,
-				  msm->vnet_main,
-				  port_sw_if_index0,
-				  first_ethertype0,
-				  outer_id0,
-				  inner_id0,
-				  &hi0,
-				  &main_intf0, &vlan_intf0, &qinq_intf0);
-
-	  eth_vlan_table_lookups (&ethernet_main,
-				  msm->vnet_main,
-				  port_sw_if_index1,
-				  first_ethertype1,
-				  outer_id1,
-				  inner_id1,
-				  &hi1,
-				  &main_intf1, &vlan_intf1, &qinq_intf1);
-
-	  matched0 = eth_identify_subint (hi0,
-					  b0,
-					  match_flags0,
-					  main_intf0,
-					  vlan_intf0,
-					  qinq_intf0,
-					  &subint_sw_if_index0,
-					  &error0, &is_l20);
-
-	  matched1 = eth_identify_subint (hi1,
-					  b1,
-					  match_flags1,
-					  main_intf1,
-					  vlan_intf1,
-					  qinq_intf1,
-					  &subint_sw_if_index1,
-					  &error1, &is_l21);
-
-	  if (PREDICT_FALSE (sw_if_index0 != subint_sw_if_index0))
-	    {
-	      /* Drop packet */
-	      next0 = L2_EFP_FILTER_NEXT_DROP;
-	      b0->error = node->errors[L2_EFP_FILTER_ERROR_DROP];
-	    }
-
-	  if (PREDICT_FALSE (sw_if_index1 != subint_sw_if_index1))
-	    {
-	      /* Drop packet */
-	      next1 = L2_EFP_FILTER_NEXT_DROP;
-	      b1->error = node->errors[L2_EFP_FILTER_ERROR_DROP];
-	    }
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  ethernet_header_t *h0 = vlib_buffer_get_current (b0);
-		  l2_efp_filter_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->sw_if_index = sw_if_index0;
-		  clib_memcpy (t->src, h0->src_address, 6);
-		  clib_memcpy (t->dst, h0->dst_address, 6);
-		  clib_memcpy (t->raw, &h0->type, sizeof (t->raw));
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  ethernet_header_t *h1 = vlib_buffer_get_current (b1);
-		  l2_efp_filter_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  t->sw_if_index = sw_if_index1;
-		  clib_memcpy (t->src, h1->src_address, 6);
-		  clib_memcpy (t->dst, h1->dst_address, 6);
-		  clib_memcpy (t->raw, &h1->type, sizeof (t->raw));
-		}
-	    }
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  /* if next0==next1==next_index then nothing special needs to be done */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 sw_if_index0;
-	  u32 feature_bitmap0;
-	  u16 first_ethertype0;
-	  u16 outer_id0, inner_id0;
-	  u32 match_flags0;
-	  u32 port_sw_if_index0, subint_sw_if_index0;
-	  vnet_hw_interface_t *hi0;
-	  main_intf_t *main_intf0;
-	  vlan_intf_t *vlan_intf0;
-	  qinq_intf_t *qinq_intf0;
-	  u32 is_l20;
-	  __attribute__ ((unused)) u32 matched0;
-	  u8 error0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-
-	  /* process 1 packet */
-	  em->counters[node_counter_base_index +
-		       L2_EFP_FILTER_ERROR_L2_EFP_FILTER] += 1;
-
-	  /* Remove ourself from the feature bitmap */
-	  feature_bitmap0 =
-	    vnet_buffer (b0)->l2.feature_bitmap & ~L2OUTPUT_FEAT_EFP_FILTER;
-
-	  /* Determine next node */
-	  l2_output_dispatch (msm->vlib_main,
-			      msm->vnet_main,
-			      node,
-			      l2_efp_filter_node.index,
-			      &cached_sw_if_index,
-			      &cached_next_index,
-			      &msm->next_nodes,
-			      b0, sw_if_index0, feature_bitmap0, &next0);
-
-	  /* perform the efp filter check on one packet */
-
-	  extract_keys (msm->vnet_main,
-			sw_if_index0,
-			b0,
-			&port_sw_if_index0,
-			&first_ethertype0,
-			&outer_id0, &inner_id0, &match_flags0);
-
-	  eth_vlan_table_lookups (&ethernet_main,
-				  msm->vnet_main,
-				  port_sw_if_index0,
-				  first_ethertype0,
-				  outer_id0,
-				  inner_id0,
-				  &hi0,
-				  &main_intf0, &vlan_intf0, &qinq_intf0);
-
-	  matched0 = eth_identify_subint (hi0,
-					  b0,
-					  match_flags0,
-					  main_intf0,
-					  vlan_intf0,
-					  qinq_intf0,
-					  &subint_sw_if_index0,
-					  &error0, &is_l20);
-
-	  if (PREDICT_FALSE (sw_if_index0 != subint_sw_if_index0))
-	    {
-	      /* Drop packet */
-	      next0 = L2_EFP_FILTER_NEXT_DROP;
-	      b0->error = node->errors[L2_EFP_FILTER_ERROR_DROP];
-	    }
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      ethernet_header_t *h0 = vlib_buffer_get_current (b0);
-	      l2_efp_filter_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = sw_if_index0;
-	      clib_memcpy (t->src, h0->src_address, 6);
-	      clib_memcpy (t->dst, h0->dst_address, 6);
-	      clib_memcpy (t->raw, &h0->type, sizeof (t->raw));
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2_efp_filter_node,static) = {
-  .function = l2_efp_filter_node_fn,
-  .name = "l2-efp-filter",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2_efp_filter_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2_efp_filter_error_strings),
-  .error_strings = l2_efp_filter_error_strings,
-
-  .n_next_nodes = L2_EFP_FILTER_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-       [L2_EFP_FILTER_NEXT_DROP]  = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2_efp_filter_node, l2_efp_filter_node_fn)
-     clib_error_t *l2_efp_filter_init (vlib_main_t * vm)
-{
-  l2_efp_filter_main_t *mp = &l2_efp_filter_main;
-
-  mp->vlib_main = vm;
-  mp->vnet_main = vnet_get_main ();
-
-  /* Initialize the feature next-node indexes */
-  feat_bitmap_init_next_nodes (vm,
-			       l2_efp_filter_node.index,
-			       L2OUTPUT_N_FEAT,
-			       l2output_get_feat_names (),
-			       mp->next_nodes.feat_next_node_index);
-
-  /* Initialize the output node mapping table */
-  l2output_init_output_node_vec (&mp->next_nodes.output_node_index_vec);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2_efp_filter_init);
-
-
-/** Enable/disable the EFP Filter check on the subinterface. */
-void
-l2_efp_filter_configure (vnet_main_t * vnet_main, u32 sw_if_index, u32 enable)
-{
-  /* set the interface flag */
-  l2output_intf_bitmap_enable (sw_if_index, L2OUTPUT_FEAT_EFP_FILTER, enable);
-}
-
-
-/**
- * Set subinterface egress efp filter enable/disable.
- * The CLI format is:
- *    set interface l2 efp-filter <interface> [disable]]
- */
-static clib_error_t *
-int_l2_efp_filter (vlib_main_t * vm,
-		   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index;
-  u32 enable;
-
-  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  enable = 1;
-  if (unformat (input, "disable"))
-    {
-      enable = 0;
-    }
-
-  /* enable/disable the feature */
-  l2_efp_filter_configure (vnm, sw_if_index, enable);
-
-done:
-  return error;
-}
-
-
-/*?
- * EFP filtering is a basic switch feature which prevents an interface from
- * transmitting a packet that doesn't match the interface's ingress match
- * criteria. The check has two parts, one performed before egress vlan tag
- * rewrite and one after. This command enables or disables the EFP filtering
- * for a given sub-interface.
- *
- * @cliexpar
- * Example of how to enable a Layer 2 efp-filter on a sub-interface:
- * @cliexcmd{set interface l2 efp-filter GigabitEthernet0/8/0.200}
- * Example of how to disable a Layer 2 efp-filter on a sub-interface:
- * @cliexcmd{set interface l2 efp-filter GigabitEthernet0/8/0.200 disable}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (int_l2_efp_filter_cli, static) = {
-  .path = "set interface l2 efp-filter",
-  .short_help = "set interface l2 efp-filter <interface> [disable]",
-  .function = int_l2_efp_filter,
-};
-/* *INDENT-ON* */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_efp_filter.h b/vnet/vnet/l2/l2_efp_filter.h
deleted file mode 100644
index f40851df..00000000
--- a/vnet/vnet/l2/l2_efp_filter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * l2_efp_filter.h : layer 2 egress EFP Filter processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#ifndef included_vnet_l2_efp_filter_h
-#define included_vnet_l2_efp_filter_h
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_fib.c b/vnet/vnet/l2/l2_fib.c
deleted file mode 100644
index d34836e3..00000000
--- a/vnet/vnet/l2/l2_fib.c
+++ /dev/null
@@ -1,857 +0,0 @@
-/*
- * l2_fib.c : layer 2 forwarding table (aka mac table)
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vlib/cli.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/l2_fib.h>
-#include <vnet/l2/l2_learn.h>
-#include <vnet/l2/l2_bd.h>
-
-#include <vppinfra/bihash_template.c>
-
-/**
- * @file
- * @brief Ethernet MAC Address FIB Table Management.
- *
- * The MAC Address forwarding table for bridge-domains is called the l2fib.
- * Entries are added automatically as part of mac learning, but MAC Addresses
- * entries can also be added manually.
- *
- */
-
-typedef struct
-{
-
-  /* hash table */
-  BVT (clib_bihash) mac_table;
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} l2fib_main_t;
-
-l2fib_main_t l2fib_main;
-
-
-/** Format sw_if_index. If the value is ~0, use the text "N/A" */
-u8 *
-format_vnet_sw_if_index_name_with_NA (u8 * s, va_list * args)
-{
-  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
-  u32 sw_if_index = va_arg (*args, u32);
-  if (sw_if_index == ~0)
-    return format (s, "N/A");
-  else
-    return format (s, "%U",
-		   format_vnet_sw_interface_name, vnm,
-		   vnet_get_sw_interface (vnm, sw_if_index));
-}
-
-void
-l2fib_table_dump (u32 bd_index, l2fib_entry_key_t ** l2fe_key,
-		  l2fib_entry_result_t ** l2fe_res)
-{
-  l2fib_main_t *msm = &l2fib_main;
-  BVT (clib_bihash) * h = &msm->mac_table;
-  clib_bihash_bucket_t *b;
-  BVT (clib_bihash_value) * v;
-  l2fib_entry_key_t key;
-  l2fib_entry_result_t result;
-  int i, j, k;
-
-  for (i = 0; i < h->nbuckets; i++)
-    {
-      b = &h->buckets[i];
-      if (b->offset == 0)
-	continue;
-      v = BV (clib_bihash_get_value) (h, b->offset);
-      for (j = 0; j < (1 << b->log2_pages); j++)
-	{
-	  for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
-	    {
-	      if (v->kvp[k].key == ~0ULL && v->kvp[k].value == ~0ULL)
-		continue;
-
-	      key.raw = v->kvp[k].key;
-	      result.raw = v->kvp[k].value;
-
-	      if ((bd_index == ~0) || (bd_index == key.fields.bd_index))
-		{
-		  vec_add1 (*l2fe_key, key);
-		  vec_add1 (*l2fe_res, result);
-		}
-	    }
-	  v++;
-	}
-    }
-}
-
-/** Display the contents of the l2fib. */
-static clib_error_t *
-show_l2fib (vlib_main_t * vm,
-	    unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  bd_main_t *bdm = &bd_main;
-  l2fib_main_t *msm = &l2fib_main;
-  l2_bridge_domain_t *bd_config;
-  BVT (clib_bihash) * h = &msm->mac_table;
-  clib_bihash_bucket_t *b;
-  BVT (clib_bihash_value) * v;
-  l2fib_entry_key_t key;
-  l2fib_entry_result_t result;
-  u32 first_entry = 1;
-  u64 total_entries = 0;
-  int i, j, k;
-  u8 verbose = 0;
-  u8 raw = 0;
-  u32 bd_id, bd_index = ~0;
-  u8 now = (u8) (vlib_time_now (vm) / 60);
-  u8 *s = 0;
-
-  if (unformat (input, "raw"))
-    raw = 1;
-  else if (unformat (input, "verbose"))
-    verbose = 1;
-  else if (unformat (input, "bd_index %d", &bd_index))
-    verbose = 1;
-  else if (unformat (input, "bd_id %d", &bd_id))
-    {
-      uword *p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-      if (p)
-	{
-	  verbose = 1;
-	  bd_index = p[0];
-	}
-      else
-	{
-	  vlib_cli_output (vm, "no such bridge domain id");
-	  return 0;
-	}
-    }
-
-  for (i = 0; i < h->nbuckets; i++)
-    {
-      b = &h->buckets[i];
-      if (b->offset == 0)
-	continue;
-      v = BV (clib_bihash_get_value) (h, b->offset);
-      for (j = 0; j < (1 << b->log2_pages); j++)
-	{
-	  for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
-	    {
-	      if (v->kvp[k].key == ~0ULL && v->kvp[k].value == ~0ULL)
-		continue;
-
-	      if (verbose && first_entry)
-		{
-		  first_entry = 0;
-		  vlib_cli_output (vm,
-				   "%=19s%=7s%=30s%=7s%=8s%=8s%=5s%=16s",
-				   "Mac Address", "BD Idx", "Interface",
-				   "Index", "static", "filter", "bvi",
-				   "Mac Age (min)");
-		}
-
-	      key.raw = v->kvp[k].key;
-	      result.raw = v->kvp[k].value;
-
-	      if (verbose
-		  & ((bd_index >> 31) || (bd_index == key.fields.bd_index)))
-		{
-		  bd_config = vec_elt_at_index (l2input_main.bd_configs,
-						key.fields.bd_index);
-
-		  if (bd_config->mac_age)
-		    {
-		      i16 delta = now - result.fields.timestamp;
-		      delta += delta < 0 ? 256 : 0;
-		      s = format (s, "%d", delta);
-		    }
-		  else
-		    s = format (s, "disabled");
-
-		  vlib_cli_output (vm,
-				   "%=19U%=7d%=30U%=7d%=8d%=8d%=5d%=16v",
-				   format_ethernet_address, key.fields.mac,
-				   key.fields.bd_index,
-				   format_vnet_sw_if_index_name_with_NA,
-				   msm->vnet_main, result.fields.sw_if_index,
-				   result.fields.sw_if_index == ~0
-				   ? -1 : result.fields.sw_if_index,
-				   result.fields.static_mac,
-				   result.fields.filter,
-				   result.fields.bvi, s);
-		  vec_reset_length (s);
-		}
-	      total_entries++;
-	    }
-	  v++;
-	}
-    }
-
-  if (total_entries == 0)
-    vlib_cli_output (vm, "no l2fib entries");
-  else
-    vlib_cli_output (vm, "%lld l2fib entries", total_entries);
-
-  if (raw)
-    vlib_cli_output (vm, "Raw Hash Table:\n%U\n",
-		     BV (format_bihash), h, 1 /* verbose */ );
-
-  vec_free (s);
-  return 0;
-}
-
-/*?
- * This command dispays the MAC Address entries of the L2 FIB table.
- * Output can be filtered to just get the number of MAC Addresses or display
- * each MAC Address for all bridge domains or just a single bridge domain.
- *
- * @cliexpar
- * Example of how to display the number of MAC Address entries in the L2
- * FIB table:
- * @cliexstart{show l2fib}
- * 3 l2fib entries
- * @cliexend
- * Example of how to display all the MAC Address entries in the L2
- * FIB table:
- * @cliexstart{show l2fib verbose}
- *     Mac Address     BD Idx           Interface           Index  static  filter  bvi  refresh  timestamp
- *  52:54:00:53:18:33    1      GigabitEthernet0/8/0.200      3       0       0     0      0         0
- *  52:54:00:53:18:55    1      GigabitEthernet0/8/0.200      3       1       0     0      0         0
- *  52:54:00:53:18:77    1                 N/A                -1      1       1     0      0         0
- * 3 l2fib entries
- * @cliexend
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_l2fib_cli, static) = {
-  .path = "show l2fib",
-  .short_help = "show l2fib [verbose | bd_id <nn> | bd_index <nn> | raw]",
-  .function = show_l2fib,
-};
-/* *INDENT-ON* */
-
-
-/* Remove all entries from the l2fib */
-void
-l2fib_clear_table (uint keep_static)
-{
-  l2fib_main_t *mp = &l2fib_main;
-
-  if (keep_static)
-    {
-      /* TODO: remove only non-static entries */
-    }
-  else
-    {
-      /* Remove all entries */
-      BV (clib_bihash_free) (&mp->mac_table);
-      BV (clib_bihash_init) (&mp->mac_table, "l2fib mac table",
-			     L2FIB_NUM_BUCKETS, L2FIB_MEMORY_SIZE);
-    }
-
-  l2learn_main.global_learn_count = 0;
-}
-
-/** Clear all entries in L2FIB.
- * @TODO: Later we may want a way to remove only the non-static entries
- */
-static clib_error_t *
-clear_l2fib (vlib_main_t * vm,
-	     unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  l2fib_clear_table (0);
-  return 0;
-}
-
-/*?
- * This command clears all the MAC Address entries from the L2 FIB table.
- *
- * @cliexpar
- * Example of how to clear the L2 FIB Table:
- * @cliexcmd{clear l2fib}
- * Example to show the L2 FIB Table has been cleared:
- * @cliexstart{show l2fib verbose}
- * no l2fib entries
- * @cliexend
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (clear_l2fib_cli, static) = {
-  .path = "clear l2fib",
-  .short_help = "clear l2fib",
-  .function = clear_l2fib,
-};
-/* *INDENT-ON* */
-
-
-/**
- * Add an entry to the l2fib.
- * If the entry already exists then overwrite it
- */
-void
-l2fib_add_entry (u64 mac,
-		 u32 bd_index,
-		 u32 sw_if_index, u32 static_mac, u32 filter_mac, u32 bvi_mac)
-{
-  l2fib_entry_key_t key;
-  l2fib_entry_result_t result;
-  __attribute__ ((unused)) u32 bucket_contents;
-  l2fib_main_t *mp = &l2fib_main;
-  BVT (clib_bihash_kv) kv;
-
-  /* set up key */
-  key.raw = l2fib_make_key ((u8 *) & mac, bd_index);
-
-  /* set up result */
-  result.raw = 0;		/* clear all fields */
-  result.fields.sw_if_index = sw_if_index;
-  result.fields.static_mac = static_mac;
-  result.fields.filter = filter_mac;
-  result.fields.bvi = bvi_mac;
-
-  kv.key = key.raw;
-  kv.value = result.raw;
-
-  BV (clib_bihash_add_del) (&mp->mac_table, &kv, 1 /* is_add */ );
-
-  /* increment counter if dynamically learned mac */
-  if (result.fields.static_mac)
-    {
-      l2learn_main.global_learn_count++;
-    }
-}
-
-/**
- * Add an entry to the L2FIB.
- * The CLI format is:
- *    l2fib add <mac> <bd> <intf> [static] [bvi]
- *    l2fib add <mac> <bd> filter
- * Note that filter and bvi entries are always static
- */
-static clib_error_t *
-l2fib_add (vlib_main_t * vm,
-	   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  bd_main_t *bdm = &bd_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u64 mac;
-  u32 bd_id;
-  u32 bd_index;
-  u32 sw_if_index = ~0;
-  u32 filter_mac = 0;
-  u32 static_mac = 0;
-  u32 bvi_mac = 0;
-  uword *p;
-
-  if (!unformat_user (input, unformat_ethernet_address, &mac))
-    {
-      error = clib_error_return (0, "expected mac address `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  if (!unformat (input, "%d", &bd_id))
-    {
-      error = clib_error_return (0, "expected bridge domain ID `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-  if (!p)
-    {
-      error = clib_error_return (0, "bridge domain ID %d invalid", bd_id);
-      goto done;
-    }
-  bd_index = p[0];
-
-  if (unformat (input, "filter"))
-    {
-      filter_mac = 1;
-      static_mac = 1;
-
-    }
-  else
-    {
-
-      if (!unformat_user
-	  (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-	{
-	  error = clib_error_return (0, "unknown interface `%U'",
-				     format_unformat_error, input);
-	  goto done;
-	}
-      if (unformat (input, "static"))
-	{
-	  static_mac = 1;
-	}
-      else if (unformat (input, "bvi"))
-	{
-	  bvi_mac = 1;
-	  static_mac = 1;
-	}
-    }
-
-  l2fib_add_entry (mac, bd_index, sw_if_index, static_mac, filter_mac,
-		   bvi_mac);
-
-done:
-  return error;
-}
-
-/*?
- * This command adds a MAC Address entry to the L2 FIB table
- * of an existing bridge-domain. The MAC Address can be static
- * or dynamic. This command also allows a filter to be added,
- * such that packets with given MAC Addresses (source mac or
- * destination mac match) are dropped.
- *
- * @cliexpar
- * Example of how to add a dynamic MAC Address entry to the L2 FIB table
- * of a bridge-domain (where 200 is the bridge-domain-id):
- * @cliexcmd{l2fib add 52:54:00:53:18:33 200 GigabitEthernet0/8/0.200}
- * Example of how to add a static MAC Address entry to the L2 FIB table
- * of a bridge-domain (where 200 is the bridge-domain-id):
- * @cliexcmd{l2fib add 52:54:00:53:18:55 200 GigabitEthernet0/8/0.200 static}
- * Example of how to add a filter such that a packet with the given MAC
- * Address will be dropped in a given bridge-domain (where 200 is the
- * bridge-domain-id):
- * @cliexcmd{l2fib add 52:54:00:53:18:77 200 filter}
- * Example of show command of the provisioned MAC Addresses and filters:
- * @cliexstart{show l2fib verbose}
- *     Mac Address     BD Idx           Interface           Index  static  filter  bvi  refresh  timestamp
- *  52:54:00:53:18:33    1      GigabitEthernet0/8/0.200      3       0       0     0      0         0
- *  52:54:00:53:18:55    1      GigabitEthernet0/8/0.200      3       1       0     0      0         0
- *  52:54:00:53:18:77    1                 N/A                -1      1       1     0      0         0
- * 3 l2fib entries
- * @cliexend
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (l2fib_add_cli, static) = {
-  .path = "l2fib add",
-  .short_help = "l2fib add <mac> <bridge-domain-id> filter | <intf> [static | bvi]",
-  .function = l2fib_add,
-};
-/* *INDENT-ON* */
-
-
-static clib_error_t *
-l2fib_test_command_fn (vlib_main_t * vm,
-		       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  clib_error_t *error = 0;
-  u64 mac, save_mac;
-  u32 bd_index = 0;
-  u32 sw_if_index = 8;
-  u32 filter_mac = 0;
-  u32 bvi_mac = 0;
-  u32 is_add = 0;
-  u32 is_del = 0;
-  u32 is_check = 0;
-  u32 count = 1;
-  int mac_set = 0;
-  int i;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "mac %U", unformat_ethernet_address, &mac))
-	mac_set = 1;
-      else if (unformat (input, "add"))
-	is_add = 1;
-      else if (unformat (input, "del"))
-	is_del = 1;
-      else if (unformat (input, "check"))
-	is_check = 1;
-      else if (unformat (input, "count %d", &count))
-	;
-      else
-	break;
-    }
-
-  if (mac_set == 0)
-    return clib_error_return (0, "mac not set");
-
-  if (is_add == 0 && is_del == 0 && is_check == 0)
-    return clib_error_return (0,
-			      "noop: pick at least one of (add,del,check)");
-
-  save_mac = mac;
-
-  if (is_add)
-    {
-      for (i = 0; i < count; i++)
-	{
-	  u64 tmp;
-	  l2fib_add_entry (mac, bd_index, sw_if_index, mac,
-			   filter_mac, bvi_mac);
-	  tmp = clib_net_to_host_u64 (mac);
-	  tmp >>= 16;
-	  tmp++;
-	  tmp <<= 16;
-	  mac = clib_host_to_net_u64 (tmp);
-	}
-    }
-
-  if (is_check)
-    {
-      BVT (clib_bihash_kv) kv;
-      l2fib_main_t *mp = &l2fib_main;
-
-      mac = save_mac;
-
-      for (i = 0; i < count; i++)
-	{
-	  u64 tmp;
-	  kv.key = l2fib_make_key ((u8 *) & mac, bd_index);
-	  if (BV (clib_bihash_search) (&mp->mac_table, &kv, &kv))
-	    {
-	      clib_warning ("key %U AWOL", format_ethernet_address, &mac);
-	      break;
-	    }
-	  tmp = clib_net_to_host_u64 (mac);
-	  tmp >>= 16;
-	  tmp++;
-	  tmp <<= 16;
-	  mac = clib_host_to_net_u64 (tmp);
-	}
-    }
-
-  if (is_del)
-    {
-      for (i = 0; i < count; i++)
-	{
-	  u64 tmp;
-
-	  l2fib_del_entry (mac, bd_index);
-
-	  tmp = clib_net_to_host_u64 (mac);
-	  tmp >>= 16;
-	  tmp++;
-	  tmp <<= 16;
-	  mac = clib_host_to_net_u64 (tmp);
-	}
-    }
-
-  return error;
-}
-
-/*?
- * The set of '<em>test l2fib</em>' commands allow the L2 FIB table of the default
- * bridge domain (bridge-domain-id of 0) to be modified.
- *
- * @cliexpar
- * @parblock
- * Example of how to add a set of 4 sequential MAC Address entries to L2
- * FIB table of the default bridge-domain:
- * @cliexcmd{test l2fib add mac 52:54:00:53:00:00 count 4}
- *
- * Show the set of 4 sequential MAC Address entries that were added:
- * @cliexstart{show l2fib verbose}
- *     Mac Address     BD Idx           Interface           Index  static  filter  bvi  refresh  timestamp
- * 52:54:00:53:00:00    0       GigabitEthernet0/8/0.300     8       0       0     0      0         0
- * 52:54:00:53:00:01    0       GigabitEthernet0/8/0.300     8       0       0     0      0         0
- * 52:54:00:53:00:03    0       GigabitEthernet0/8/0.300     8       0       0     0      0         0
- * 52:54:00:53:00:02    0       GigabitEthernet0/8/0.300     8       0       0     0      0         0
- * 4 l2fib entries
- * @cliexend
- *
- * Example of how to check that the set of 4 sequential MAC Address
- * entries were added to L2 FIB table of the default
- * bridge-domain. Used a count of 5 to produce an error:
- *
- * @cliexcmd{test l2fib check mac 52:54:00:53:00:00 count 5}
- * The output of the check command is in the log files. Log file
- * location may vary based on your OS and Version:
- *
- * <b><em># tail -f /var/log/messages | grep l2fib_test_command_fn</em></b>
- *
- * Sep  7 17:15:24 localhost vnet[4952]: l2fib_test_command_fn:446: key 52:54:00:53:00:04 AWOL
- *
- * Example of how to delete a set of 4 sequential MAC Address entries
- * from L2 FIB table of the default bridge-domain:
- * @cliexcmd{test l2fib del mac 52:54:00:53:00:00 count 4}
- * @endparblock
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (l2fib_test_command, static) = {
-  .path = "test l2fib",
-  .short_help = "test l2fib [add|del|check] mac <base-addr> count <nn>",
-  .function = l2fib_test_command_fn,
-};
-/* *INDENT-ON* */
-
-
-/**
- * Delete an entry from the l2fib.
- * Return 0 if the entry was deleted, or 1 if it was not found
- */
-u32
-l2fib_del_entry (u64 mac, u32 bd_index)
-{
-
-  l2fib_entry_result_t result;
-  l2fib_main_t *mp = &l2fib_main;
-  BVT (clib_bihash_kv) kv;
-
-  /* set up key */
-  kv.key = l2fib_make_key ((u8 *) & mac, bd_index);
-
-  if (BV (clib_bihash_search) (&mp->mac_table, &kv, &kv))
-    return 1;
-
-  result.raw = kv.value;
-
-  /* decrement counter if dynamically learned mac */
-  if (result.fields.static_mac)
-    {
-      if (l2learn_main.global_learn_count > 0)
-	{
-	  l2learn_main.global_learn_count--;
-	}
-    }
-
-  /* Remove entry from hash table */
-  BV (clib_bihash_add_del) (&mp->mac_table, &kv, 0 /* is_add */ );
-  return 0;
-}
-
-/**
- * Delete an entry from the L2FIB.
- * The CLI format is:
- *    l2fib del <mac> <bd-id>
- */
-static clib_error_t *
-l2fib_del (vlib_main_t * vm,
-	   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  bd_main_t *bdm = &bd_main;
-  clib_error_t *error = 0;
-  u64 mac;
-  u32 bd_id;
-  u32 bd_index;
-  uword *p;
-
-  if (!unformat_user (input, unformat_ethernet_address, &mac))
-    {
-      error = clib_error_return (0, "expected mac address `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  if (!unformat (input, "%d", &bd_id))
-    {
-      error = clib_error_return (0, "expected bridge domain ID `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-  if (!p)
-    {
-      error = clib_error_return (0, "bridge domain ID %d invalid", bd_id);
-      goto done;
-    }
-  bd_index = p[0];
-
-  /* Delete the entry */
-  if (l2fib_del_entry (mac, bd_index))
-    {
-      error = clib_error_return (0, "mac entry not found");
-      goto done;
-    }
-
-done:
-  return error;
-}
-
-/*?
- * This command deletes an existing MAC Address entry from the L2 FIB
- * table of an existing bridge-domain.
- *
- * @cliexpar
- * Example of how to delete a MAC Address entry from the L2 FIB table of a bridge-domain (where 200 is the bridge-domain-id):
- * @cliexcmd{l2fib del 52:54:00:53:18:33 200}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (l2fib_del_cli, static) = {
-  .path = "l2fib del",
-  .short_help = "l2fib del <mac> <bridge-domain-id>",
-  .function = l2fib_del,
-};
-/* *INDENT-ON* */
-
-
-BVT (clib_bihash) * get_mac_table (void)
-{
-  l2fib_main_t *mp = &l2fib_main;
-  return &mp->mac_table;
-}
-
-static uword
-l2fib_mac_age_scanner_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
-			       vlib_frame_t * f)
-{
-  uword event_type, *event_data = 0;
-  l2fib_main_t *msm = &l2fib_main;
-  l2_bridge_domain_t *bd_config;
-  BVT (clib_bihash) * h = &msm->mac_table;
-  clib_bihash_bucket_t *b;
-  BVT (clib_bihash_value) * v;
-  l2fib_entry_key_t key;
-  l2fib_entry_result_t result;
-  int i, j, k;
-  bool enabled = 0;
-  f64 start_time, last_run_duration = 0, t;
-  i16 delta;
-
-  while (1)
-    {
-      if (enabled)
-	vlib_process_wait_for_event_or_clock (vm, 60 - last_run_duration);
-      else
-	vlib_process_wait_for_event (vm);
-
-      event_type = vlib_process_get_events (vm, &event_data);
-      vec_reset_length (event_data);
-
-      switch (event_type)
-	{
-	case ~0:
-	  break;
-	case L2_MAC_AGE_PROCESS_EVENT_START:
-	  enabled = 1;
-	  break;
-	case L2_MAC_AGE_PROCESS_EVENT_STOP:
-	  enabled = 0;
-	  continue;
-	default:
-	  ASSERT (0);
-	}
-      last_run_duration = start_time = vlib_time_now (vm);
-      for (i = 0; i < h->nbuckets; i++)
-	{
-	  /* Allow no more than 10us without a pause */
-	  t = vlib_time_now (vm);
-	  if (t > start_time + 10e-6)
-	    {
-	      vlib_process_suspend (vm, 100e-6);	/* suspend for 100 us */
-	      start_time = vlib_time_now (vm);
-	    }
-
-	  if (i < (h->nbuckets - 3))
-	    {
-	      b = &h->buckets[i + 3];
-	      CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD);
-	      b = &h->buckets[i + 1];
-	      if (b->offset)
-		{
-		  v = BV (clib_bihash_get_value) (h, b->offset);
-		  CLIB_PREFETCH (v, CLIB_CACHE_LINE_BYTES, LOAD);
-		}
-	    }
-
-	  b = &h->buckets[i];
-	  if (b->offset == 0)
-	    continue;
-	  v = BV (clib_bihash_get_value) (h, b->offset);
-	  for (j = 0; j < (1 << b->log2_pages); j++)
-	    {
-	      for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
-		{
-		  if (v->kvp[k].key == ~0ULL && v->kvp[k].value == ~0ULL)
-		    continue;
-
-		  key.raw = v->kvp[k].key;
-		  result.raw = v->kvp[k].value;
-
-		  if (result.fields.static_mac)
-		    continue;
-
-		  bd_config = vec_elt_at_index (l2input_main.bd_configs,
-						key.fields.bd_index);
-
-		  if (bd_config->mac_age == 0)
-		    continue;
-
-		  delta = (u8) (start_time / 60) - result.fields.timestamp;
-		  delta += delta < 0 ? 256 : 0;
-
-		  if (delta > bd_config->mac_age)
-		    {
-		      void *p = &key.fields.mac;
-		      l2fib_del_entry (*(u64 *) p, key.fields.bd_index);
-		    }
-		}
-	      v++;
-	    }
-	}
-      last_run_duration = vlib_time_now (vm) - last_run_duration;
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2fib_mac_age_scanner_process_node) = {
-    .function = l2fib_mac_age_scanner_process,
-    .type = VLIB_NODE_TYPE_PROCESS,
-    .name = "l2fib-mac-age-scanner-process",
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-l2fib_init (vlib_main_t * vm)
-{
-  l2fib_main_t *mp = &l2fib_main;
-  l2fib_entry_key_t test_key;
-  u8 test_mac[6];
-
-  mp->vlib_main = vm;
-  mp->vnet_main = vnet_get_main ();
-
-  /* Create the hash table  */
-  BV (clib_bihash_init) (&mp->mac_table, "l2fib mac table",
-			 L2FIB_NUM_BUCKETS, L2FIB_MEMORY_SIZE);
-
-  /* verify the key constructor is good, since it is endian-sensitive */
-  memset (test_mac, 0, sizeof (test_mac));
-  test_mac[0] = 0x11;
-  test_key.raw = 0;
-  test_key.raw = l2fib_make_key ((u8 *) & test_mac, 0x1234);
-  ASSERT (test_key.fields.mac[0] == 0x11);
-  ASSERT (test_key.fields.bd_index == 0x1234);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2fib_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_fib.h b/vnet/vnet/l2/l2_fib.h
deleted file mode 100644
index 4a2da59b..00000000
--- a/vnet/vnet/l2/l2_fib.h
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * l2_fib.h : layer 2 forwarding table (aka mac table)
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_l2fib_h
-#define included_l2fib_h
-
-#include <vlib/vlib.h>
-#include <vppinfra/bihash_8_8.h>
-
-/*
- * The size of the hash table
- */
-#define L2FIB_NUM_BUCKETS (64 * 1024)
-#define L2FIB_MEMORY_SIZE (256<<20)
-
-/*
- * The L2fib key is the mac address and bridge domain ID
- */
-typedef struct
-{
-  union
-  {
-    struct
-    {
-      u16 bd_index;
-      u8 mac[6];
-    } fields;
-    struct
-    {
-      u32 w0;
-      u32 w1;
-    } words;
-    u64 raw;
-  };
-} l2fib_entry_key_t;
-
-STATIC_ASSERT_SIZEOF (l2fib_entry_key_t, 8);
-
-/*
- * The l2fib entry results
- */
-typedef struct
-{
-  union
-  {
-    struct
-    {
-      u32 sw_if_index;		/* output sw_if_index (L3 interface if bvi==1) */
-
-      u8 static_mac:1;		/* static mac, no dataplane learning */
-      u8 bvi:1;			/* mac is for a bridged virtual interface */
-      u8 filter:1;		/* drop packets to/from this mac */
-      u8 unused1:5;
-      u8 timestamp;		/* timestamp for aging */
-      u16 unused2;
-    } fields;
-    u64 raw;
-  };
-} l2fib_entry_result_t;
-
-STATIC_ASSERT_SIZEOF (l2fib_entry_result_t, 8);
-
-/**
- * Compute the hash for the given key and return
- * the corresponding bucket index
- */
-always_inline u32
-l2fib_compute_hash_bucket (l2fib_entry_key_t * key)
-{
-  u32 result;
-  u32 temp_a;
-  u32 temp_b;
-
-  result = 0xa5a5a5a5;		/* some seed */
-  temp_a = key->words.w0;
-  temp_b = key->words.w1;
-  hash_mix32 (temp_a, temp_b, result);
-
-  return result % L2FIB_NUM_BUCKETS;
-}
-
-always_inline u64
-l2fib_make_key (u8 * mac_address, u16 bd_index)
-{
-  u64 temp;
-
-  /*
-   * The mac address in memory is A:B:C:D:E:F
-   * The bd id in register is H:L
-   */
-#if CLIB_ARCH_IS_LITTLE_ENDIAN
-  /*
-   * Create the in-register key as F:E:D:C:B:A:H:L
-   * In memory the key is L:H:A:B:C:D:E:F
-   */
-  temp = *((u64 *) (mac_address)) << 16;
-  temp = (temp & ~0xffff) | (u64) (bd_index);
-#else
-  /*
-   * Create the in-register key as H:L:A:B:C:D:E:F
-   * In memory the key is H:L:A:B:C:D:E:F
-   */
-  temp = *((u64 *) (mac_address)) >> 16;
-  temp = temp | (((u64) bd_index) << 48);
-#endif
-
-  return temp;
-}
-
-
-
-/**
- * Lookup the entry for mac and bd_index in the mac table for 1 packet.
- * Cached_key and cached_result are used as a one-entry cache.
- * The function reads and updates them as needed.
- *
- * mac0 and bd_index0 are the keys. The entry is written to result0.
- * If the entry was not found, result0 is set to ~0.
- *
- * key0 and bucket0 return with the computed key and hash bucket,
- * convenient if the entry needs to be updated afterward.
- * If the cached_result was used, bucket0 is set to ~0.
- */
-
-static_always_inline void
-l2fib_lookup_1 (BVT (clib_bihash) * mac_table,
-		l2fib_entry_key_t * cached_key,
-		l2fib_entry_result_t * cached_result,
-		u8 * mac0,
-		u16 bd_index0,
-		l2fib_entry_key_t * key0,
-		u32 * bucket0, l2fib_entry_result_t * result0)
-{
-  /* set up key */
-  key0->raw = l2fib_make_key (mac0, bd_index0);
-  *bucket0 = ~0;
-
-  if (key0->raw == cached_key->raw)
-    {
-      /* Hit in the one-entry cache */
-      result0->raw = cached_result->raw;
-    }
-  else
-    {
-      /* Do a regular mac table lookup */
-      BVT (clib_bihash_kv) kv;
-
-      kv.key = key0->raw;
-      kv.value = ~0ULL;
-      BV (clib_bihash_search_inline) (mac_table, &kv);
-      result0->raw = kv.value;
-
-      /* Update one-entry cache */
-      cached_key->raw = key0->raw;
-      cached_result->raw = result0->raw;
-    }
-}
-
-
-/**
- * Lookup the entry for mac and bd_index in the mac table for 2 packets.
- * The lookups for the two packets are interleaved.
- *
- * Cached_key and cached_result are used as a one-entry cache.
- * The function reads and updates them as needed.
- *
- * mac0 and bd_index0 are the keys. The entry is written to result0.
- * If the entry was not found, result0 is set to ~0. The same
- * holds for mac1/bd_index1/result1.
- */
-static_always_inline void
-l2fib_lookup_2 (BVT (clib_bihash) * mac_table,
-		l2fib_entry_key_t * cached_key,
-		l2fib_entry_result_t * cached_result,
-		u8 * mac0,
-		u8 * mac1,
-		u16 bd_index0,
-		u16 bd_index1,
-		l2fib_entry_key_t * key0,
-		l2fib_entry_key_t * key1,
-		u32 * bucket0,
-		u32 * bucket1,
-		l2fib_entry_result_t * result0,
-		l2fib_entry_result_t * result1)
-{
-  /* set up key */
-  key0->raw = l2fib_make_key (mac0, bd_index0);
-  key1->raw = l2fib_make_key (mac1, bd_index1);
-
-  if ((key0->raw == cached_key->raw) && (key1->raw == cached_key->raw))
-    {
-      /* Both hit in the one-entry cache */
-      result0->raw = cached_result->raw;
-      result1->raw = cached_result->raw;
-      *bucket0 = ~0;
-      *bucket1 = ~0;
-
-    }
-  else
-    {
-      BVT (clib_bihash_kv) kv0, kv1;
-
-      /*
-       * Do a regular mac table lookup
-       * Interleave lookups for packet 0 and packet 1
-       */
-      kv0.key = key0->raw;
-      kv1.key = key1->raw;
-      kv0.value = ~0ULL;
-      kv1.value = ~0ULL;
-
-      BV (clib_bihash_search_inline) (mac_table, &kv0);
-      BV (clib_bihash_search_inline) (mac_table, &kv1);
-
-      result0->raw = kv0.value;
-      result1->raw = kv1.value;
-
-      /* Update one-entry cache */
-      cached_key->raw = key1->raw;
-      cached_result->raw = result1->raw;
-    }
-}
-
-static_always_inline void
-l2fib_lookup_4 (BVT (clib_bihash) * mac_table,
-		l2fib_entry_key_t * cached_key,
-		l2fib_entry_result_t * cached_result,
-		u8 * mac0,
-		u8 * mac1,
-		u8 * mac2,
-		u8 * mac3,
-		u16 bd_index0,
-		u16 bd_index1,
-		u16 bd_index2,
-		u16 bd_index3,
-		l2fib_entry_key_t * key0,
-		l2fib_entry_key_t * key1,
-		l2fib_entry_key_t * key2,
-		l2fib_entry_key_t * key3,
-		u32 * bucket0,
-		u32 * bucket1,
-		u32 * bucket2,
-		u32 * bucket3,
-		l2fib_entry_result_t * result0,
-		l2fib_entry_result_t * result1,
-		l2fib_entry_result_t * result2,
-		l2fib_entry_result_t * result3)
-{
-  /* set up key */
-  key0->raw = l2fib_make_key (mac0, bd_index0);
-  key1->raw = l2fib_make_key (mac1, bd_index1);
-  key2->raw = l2fib_make_key (mac2, bd_index2);
-  key3->raw = l2fib_make_key (mac3, bd_index3);
-
-  if ((key0->raw == cached_key->raw) && (key1->raw == cached_key->raw) &&
-      (key2->raw == cached_key->raw) && (key3->raw == cached_key->raw))
-    {
-      /* Both hit in the one-entry cache */
-      result0->raw = cached_result->raw;
-      result1->raw = cached_result->raw;
-      result2->raw = cached_result->raw;
-      result3->raw = cached_result->raw;
-      *bucket0 = ~0;
-      *bucket1 = ~0;
-      *bucket2 = ~0;
-      *bucket3 = ~0;
-
-    }
-  else
-    {
-      BVT (clib_bihash_kv) kv0, kv1, kv2, kv3;
-
-      /*
-       * Do a regular mac table lookup
-       * Interleave lookups for packet 0 and packet 1
-       */
-      kv0.key = key0->raw;
-      kv1.key = key1->raw;
-      kv2.key = key2->raw;
-      kv3.key = key3->raw;
-      kv0.value = ~0ULL;
-      kv1.value = ~0ULL;
-      kv2.value = ~0ULL;
-      kv3.value = ~0ULL;
-
-      BV (clib_bihash_search_inline) (mac_table, &kv0);
-      BV (clib_bihash_search_inline) (mac_table, &kv1);
-      BV (clib_bihash_search_inline) (mac_table, &kv2);
-      BV (clib_bihash_search_inline) (mac_table, &kv3);
-
-      result0->raw = kv0.value;
-      result1->raw = kv1.value;
-      result2->raw = kv2.value;
-      result3->raw = kv3.value;
-
-      /* Update one-entry cache */
-      cached_key->raw = key1->raw;
-      cached_result->raw = result1->raw;
-    }
-}
-
-BVT (clib_bihash) * get_mac_table (void);
-     void
-     l2fib_clear_table (uint keep_static);
-     void
-     l2fib_add_entry (u64 mac,
-		      u32 bd_index,
-		      u32 sw_if_index,
-		      u32 static_mac, u32 drop_mac, u32 bvi_mac);
-u32
-l2fib_del_entry (u64 mac, u32 bd_index);
-
-     void
-       l2fib_table_dump (u32 bd_index, l2fib_entry_key_t ** l2fe_key,
-			 l2fib_entry_result_t ** l2fe_res);
-
-     u8 *format_vnet_sw_if_index_name_with_NA (u8 * s, va_list * args);
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_flood.c b/vnet/vnet/l2/l2_flood.c
deleted file mode 100644
index ed9e5ac2..00000000
--- a/vnet/vnet/l2/l2_flood.c
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- * l2_flood.c : layer 2 flooding
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vlib/cli.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/feat_bitmap.h>
-#include <vnet/l2/l2_bvi.h>
-#include <vnet/replication.h>
-#include <vnet/l2/l2_fib.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-
-
-/**
- * @file
- * @brief Ethernet Flooding.
- *
- * Flooding uses the packet replication infrastructure to send a copy of the
- * packet to each member interface. Logically the replication infrastructure
- * expects two graph nodes: a prep node that initiates replication and sends the
- * packet to the first destination, and a recycle node that is passed the packet
- * after it has been transmitted.
- *
- * To decrease the amount of code, l2 flooding implements both functions in
- * the same graph node. This node can tell if is it being called as the "prep"
- * or "recycle" using replication_is_recycled().
- */
-
-
-typedef struct
-{
-
-  /* Next nodes for each feature */
-  u32 feat_next_node_index[32];
-
-  /* next node index for the L3 input node of each ethertype */
-  next_by_ethertype_t l3_next;
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} l2flood_main_t;
-
-typedef struct
-{
-  u8 src[6];
-  u8 dst[6];
-  u32 sw_if_index;
-  u16 bd_index;
-} l2flood_trace_t;
-
-
-/* packet trace format function */
-static u8 *
-format_l2flood_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2flood_trace_t *t = va_arg (*args, l2flood_trace_t *);
-
-  s = format (s, "l2-flood: sw_if_index %d dst %U src %U bd_index %d",
-	      t->sw_if_index,
-	      format_ethernet_address, t->dst,
-	      format_ethernet_address, t->src, t->bd_index);
-  return s;
-}
-
-l2flood_main_t l2flood_main;
-
-static vlib_node_registration_t l2flood_node;
-
-#define foreach_l2flood_error					\
-_(L2FLOOD,           "L2 flood packets")			\
-_(REPL_FAIL,         "L2 replication failures")			\
-_(NO_MEMBERS,        "L2 replication complete")			\
-_(BVI_BAD_MAC,       "BVI L3 mac mismatch")		        \
-_(BVI_ETHERTYPE,     "BVI packet with unhandled ethertype")
-
-typedef enum
-{
-#define _(sym,str) L2FLOOD_ERROR_##sym,
-  foreach_l2flood_error
-#undef _
-    L2FLOOD_N_ERROR,
-} l2flood_error_t;
-
-static char *l2flood_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2flood_error
-#undef _
-};
-
-typedef enum
-{
-  L2FLOOD_NEXT_L2_OUTPUT,
-  L2FLOOD_NEXT_DROP,
-  L2FLOOD_N_NEXT,
-} l2flood_next_t;
-
-/*
- * Perform flooding on one packet
- *
- * Due to the way BVI processing can modify the packet, the BVI interface
- * (if present) must be processed last in the replication. The member vector
- * is arranged so that the BVI interface is always the first element.
- * Flooding walks the vector in reverse.
- *
- * BVI processing causes the packet to go to L3 processing. This strips the
- * L2 header, which is fine because the replication infrastructure restores
- * it. However L3 processing can trigger larger changes to the packet. For
- * example, an ARP request could be turned into an ARP reply, an ICMP request
- * could be turned into an ICMP reply. If BVI processing is not performed
- * last, the modified packet would be replicated to the remaining members.
- */
-
-static_always_inline void
-l2flood_process (vlib_main_t * vm,
-		 vlib_node_runtime_t * node,
-		 l2flood_main_t * msm,
-		 u64 * counter_base,
-		 vlib_buffer_t * b0,
-		 u32 * sw_if_index0,
-		 l2fib_entry_key_t * key0,
-		 u32 * bucket0, l2fib_entry_result_t * result0, u32 * next0)
-{
-  u16 bd_index0;
-  l2_bridge_domain_t *bd_config;
-  l2_flood_member_t *members;
-  i32 current_member;		/* signed */
-  replication_context_t *ctx;
-  u8 in_shg = vnet_buffer (b0)->l2.shg;
-
-  if (!replication_is_recycled (b0))
-    {
-
-      /* Do flood "prep node" processing */
-
-      /* Get config for the bridge domain interface */
-      bd_index0 = vnet_buffer (b0)->l2.bd_index;
-      bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index0);
-      members = bd_config->members;
-
-      /* Find first member that passes the reflection and SHG checks */
-      current_member = bd_config->flood_count - 1;
-      while ((current_member >= 0) &&
-	     ((members[current_member].sw_if_index == *sw_if_index0) ||
-	      (in_shg && members[current_member].shg == in_shg)))
-	{
-	  current_member--;
-	}
-
-      if (current_member < 0)
-	{
-	  /* No members to flood to */
-	  *next0 = L2FLOOD_NEXT_DROP;
-	  b0->error = node->errors[L2FLOOD_ERROR_NO_MEMBERS];
-	  return;
-	}
-
-      if ((current_member > 0) &&
-	  ((current_member > 1) ||
-	   ((members[0].sw_if_index != *sw_if_index0) &&
-	    (!in_shg || members[0].shg != in_shg))))
-	{
-	  /* If more than one member then initiate replication */
-	  ctx =
-	    replication_prep (vm, b0, l2flood_node.index, 1 /* l2_packet */ );
-	  ctx->feature_replicas = (uword) members;
-	  ctx->feature_counter = current_member;
-	}
-
-    }
-  else
-    {
-      vnet_buffer_opaque_t *vnet_buff_op;
-
-      /* Do flood "recycle node" processing */
-
-      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_REPL_FAIL))
-	{
-	  (void) replication_recycle (vm, b0, 1 /* is_last */ );
-	  *next0 = L2FLOOD_NEXT_DROP;
-	  b0->error = node->errors[L2FLOOD_ERROR_REPL_FAIL];
-	  return;
-	}
-
-      ctx = replication_get_ctx (b0);
-      replication_clear_recycled (b0);
-
-      members = (l2_flood_member_t *) (intptr_t) ctx->feature_replicas;
-      current_member = (i32) ctx->feature_counter - 1;
-
-      /* Need to update input index from saved packet context */
-      vnet_buff_op = (vnet_buffer_opaque_t *) ctx->vnet_buffer;
-      *sw_if_index0 = vnet_buff_op->sw_if_index[VLIB_RX];
-
-      /* Find next member that passes the reflection and SHG check */
-      while ((current_member >= 0) &&
-	     ((members[current_member].sw_if_index == *sw_if_index0) ||
-	      (in_shg && members[current_member].shg == in_shg)))
-	{
-	  current_member--;
-	}
-
-      if (current_member < 0)
-	{
-	  /*
-	   * No more members to flood to.
-	   * Terminate replication and drop packet.
-	   */
-
-	  replication_recycle (vm, b0, 1 /* is_last */ );
-
-	  *next0 = L2FLOOD_NEXT_DROP;
-	  /* Ideally we woudn't bump a counter here, just silently complete */
-	  b0->error = node->errors[L2FLOOD_ERROR_NO_MEMBERS];
-	  return;
-	}
-
-      /* Restore packet and context and continue replication */
-      ctx->feature_counter = current_member;
-      replication_recycle (vm, b0, ((current_member == 0) ||	/*is_last */
-				    ((current_member == 1) &&
-				     ((members[0].sw_if_index ==
-				       *sw_if_index0) || (in_shg
-							  && members[0].shg ==
-							  in_shg)))));
-    }
-
-  /* Forward packet to the current member */
-  if (PREDICT_FALSE (members[current_member].flags & L2_FLOOD_MEMBER_BVI))
-    {
-      /* Do BVI processing */
-      u32 rc;
-      rc = l2_to_bvi (vm,
-		      msm->vnet_main,
-		      b0,
-		      members[current_member].sw_if_index,
-		      &msm->l3_next, next0);
-
-      if (PREDICT_FALSE (rc))
-	{
-	  if (rc == TO_BVI_ERR_BAD_MAC)
-	    {
-	      b0->error = node->errors[L2FLOOD_ERROR_BVI_BAD_MAC];
-	      *next0 = L2FLOOD_NEXT_DROP;
-	    }
-	  else if (rc == TO_BVI_ERR_ETHERTYPE)
-	    {
-	      b0->error = node->errors[L2FLOOD_ERROR_BVI_ETHERTYPE];
-	      *next0 = L2FLOOD_NEXT_DROP;
-	    }
-	}
-    }
-  else
-    {
-      /* Do normal L2 forwarding */
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] =
-	members[current_member].sw_if_index;
-      *next0 = L2FLOOD_NEXT_L2_OUTPUT;
-
-    }
-
-}
-
-
-static uword
-l2flood_node_fn (vlib_main_t * vm,
-		 vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  l2flood_next_t next_index;
-  l2flood_main_t *msm = &l2flood_main;
-  vlib_node_t *n = vlib_get_node (vm, l2flood_node.index);
-  u32 node_counter_base_index = n->error_heap_index;
-  vlib_error_main_t *em = &vm->error_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;	/* number of packets to process */
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      /* get space to enqueue frame to graph node "next_index" */
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 6 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-	  u32 sw_if_index0, sw_if_index1;
-	  l2fib_entry_key_t key0, key1;
-	  l2fib_entry_result_t result0, result1;
-	  u32 bucket0, bucket1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3, *p4, *p5;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-	    p4 = vlib_get_buffer (vm, from[4]);
-	    p5 = vlib_get_buffer (vm, from[5]);
-
-	    /* Prefetch the buffer header for the N+2 loop iteration */
-	    vlib_prefetch_buffer_header (p4, LOAD);
-	    vlib_prefetch_buffer_header (p5, LOAD);
-
-	    /* Prefetch the replication context for the N+1 loop iteration */
-	    /* This depends on the buffer header above */
-	    replication_prefetch_ctx (p2);
-	    replication_prefetch_ctx (p3);
-
-	    /* Prefetch the packet for the N+1 loop iteration */
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  /* bi is "buffer index", b is pointer to the buffer */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  /* RX interface handles */
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-
-	  /* process 2 pkts */
-	  em->counters[node_counter_base_index + L2FLOOD_ERROR_L2FLOOD] += 2;
-
-	  l2flood_process (vm, node, msm,
-			   &em->counters[node_counter_base_index], b0,
-			   &sw_if_index0, &key0, &bucket0, &result0, &next0);
-
-	  l2flood_process (vm, node, msm,
-			   &em->counters[node_counter_base_index], b1,
-			   &sw_if_index1, &key1, &bucket1, &result1, &next1);
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-		{
-		  l2flood_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  ethernet_header_t *h0 = vlib_buffer_get_current (b0);
-		  t->sw_if_index = sw_if_index0;
-		  t->bd_index = vnet_buffer (b0)->l2.bd_index;
-		  clib_memcpy (t->src, h0->src_address, 6);
-		  clib_memcpy (t->dst, h0->dst_address, 6);
-		}
-	      if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
-		{
-		  l2flood_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  ethernet_header_t *h1 = vlib_buffer_get_current (b1);
-		  t->sw_if_index = sw_if_index1;
-		  t->bd_index = vnet_buffer (b1)->l2.bd_index;
-		  clib_memcpy (t->src, h1->src_address, 6);
-		  clib_memcpy (t->dst, h1->dst_address, 6);
-		}
-	    }
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  /* if next0==next1==next_index then nothing special needs to be done */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 sw_if_index0;
-	  l2fib_entry_key_t key0;
-	  l2fib_entry_result_t result0;
-	  u32 bucket0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-
-	  /* process 1 pkt */
-	  em->counters[node_counter_base_index + L2FLOOD_ERROR_L2FLOOD] += 1;
-
-	  l2flood_process (vm, node, msm,
-			   &em->counters[node_counter_base_index], b0,
-			   &sw_if_index0, &key0, &bucket0, &result0, &next0);
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&
-			     (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      l2flood_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-	      ethernet_header_t *h0 = vlib_buffer_get_current (b0);
-	      t->sw_if_index = sw_if_index0;
-	      t->bd_index = vnet_buffer (b0)->l2.bd_index;
-	      clib_memcpy (t->src, h0->src_address, 6);
-	      clib_memcpy (t->dst, h0->dst_address, 6);
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2flood_node,static) = {
-  .function = l2flood_node_fn,
-  .name = "l2-flood",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2flood_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2flood_error_strings),
-  .error_strings = l2flood_error_strings,
-
-  .n_next_nodes = L2FLOOD_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-        [L2FLOOD_NEXT_L2_OUTPUT] = "l2-output",
-        [L2FLOOD_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2flood_node, l2flood_node_fn)
-     clib_error_t *l2flood_init (vlib_main_t * vm)
-{
-  l2flood_main_t *mp = &l2flood_main;
-
-  mp->vlib_main = vm;
-  mp->vnet_main = vnet_get_main ();
-
-  /* Initialize the feature next-node indexes */
-  feat_bitmap_init_next_nodes (vm,
-			       l2flood_node.index,
-			       L2INPUT_N_FEAT,
-			       l2input_get_feat_names (),
-			       mp->feat_next_node_index);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2flood_init);
-
-
-
-/** Add the L3 input node for this ethertype to the next nodes structure. */
-void
-l2flood_register_input_type (vlib_main_t * vm,
-			     ethernet_type_t type, u32 node_index)
-{
-  l2flood_main_t *mp = &l2flood_main;
-  u32 next_index;
-
-  next_index = vlib_node_add_next (vm, l2flood_node.index, node_index);
-
-  next_by_ethertype_register (&mp->l3_next, type, next_index);
-}
-
-
-/**
- * Set subinterface flood enable/disable.
- * The CLI format is:
- * set interface l2 flood <interface> [disable]
- */
-static clib_error_t *
-int_flood (vlib_main_t * vm,
-	   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index;
-  u32 enable;
-
-  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  enable = 1;
-  if (unformat (input, "disable"))
-    {
-      enable = 0;
-    }
-
-  /* set the interface flag */
-  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_FLOOD, enable);
-
-done:
-  return error;
-}
-
-/*?
- * Layer 2 flooding can be enabled and disabled on each
- * interface and on each bridge-domain. Use this command to
- * manage interfaces. It is enabled by default.
- *
- * @cliexpar
- * Example of how to enable flooding:
- * @cliexcmd{set interface l2 flood GigabitEthernet0/8/0}
- * Example of how to disable flooding:
- * @cliexcmd{set interface l2 flood GigabitEthernet0/8/0 disable}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (int_flood_cli, static) = {
-  .path = "set interface l2 flood",
-  .short_help = "set interface l2 flood <interface> [disable]",
-  .function = int_flood,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_flood.h b/vnet/vnet/l2/l2_flood.h
deleted file mode 100644
index acd7c905..00000000
--- a/vnet/vnet/l2/l2_flood.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * l2_flood.h : layer 2 flooding
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_l2flood_h
-#define included_l2flood_h
-
-#include <vlib/vlib.h>
-#include <vnet/ethernet/ethernet.h>
-
-void
-l2flood_register_input_type (vlib_main_t * vm,
-			     ethernet_type_t type, u32 node_index);
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_fwd.c b/vnet/vnet/l2/l2_fwd.c
deleted file mode 100644
index 710a9d9e..00000000
--- a/vnet/vnet/l2/l2_fwd.c
+++ /dev/null
@@ -1,544 +0,0 @@
-/*
- * l2_fwd.c : layer 2 forwarding using l2fib
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vlib/cli.h>
-
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/l2_bvi.h>
-#include <vnet/l2/l2_fwd.h>
-#include <vnet/l2/l2_fib.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/sparse_vec.h>
-
-
-/**
- * @file
- * @brief Ethernet Forwarding.
- *
- * Code in this file handles forwarding Layer 2 packets. This file calls
- * the FIB lookup, packet learning and the packet flooding as necessary.
- * Packet is then sent to the next graph node.
- */
-
-typedef struct
-{
-
-  /* Hash table */
-  BVT (clib_bihash) * mac_table;
-
-  /* next node index for the L3 input node of each ethertype */
-  next_by_ethertype_t l3_next;
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} l2fwd_main_t;
-
-typedef struct
-{
-  /* per-pkt trace data */
-  u8 src[6];
-  u8 dst[6];
-  u32 sw_if_index;
-  u16 bd_index;
-} l2fwd_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_l2fwd_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2fwd_trace_t *t = va_arg (*args, l2fwd_trace_t *);
-
-  s = format (s, "l2-fwd:   sw_if_index %d dst %U src %U bd_index %d",
-	      t->sw_if_index,
-	      format_ethernet_address, t->dst,
-	      format_ethernet_address, t->src, t->bd_index);
-  return s;
-}
-
-l2fwd_main_t l2fwd_main;
-
-static vlib_node_registration_t l2fwd_node;
-
-#define foreach_l2fwd_error				\
-_(L2FWD,         "L2 forward packets")			\
-_(FLOOD,         "L2 forward misses")			\
-_(HIT,           "L2 forward hits")			\
-_(BVI_BAD_MAC,   "BVI L3 MAC mismatch")  		\
-_(BVI_ETHERTYPE, "BVI packet with unhandled ethertype")	\
-_(FILTER_DROP,   "Filter Mac Drop")			\
-_(REFLECT_DROP,  "Reflection Drop")
-
-typedef enum
-{
-#define _(sym,str) L2FWD_ERROR_##sym,
-  foreach_l2fwd_error
-#undef _
-    L2FWD_N_ERROR,
-} l2fwd_error_t;
-
-static char *l2fwd_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2fwd_error
-#undef _
-};
-
-typedef enum
-{
-  L2FWD_NEXT_L2_OUTPUT,
-  L2FWD_NEXT_FLOOD,
-  L2FWD_NEXT_DROP,
-  L2FWD_N_NEXT,
-} l2fwd_next_t;
-
-/** Forward one packet based on the mac table lookup result. */
-
-static_always_inline void
-l2fwd_process (vlib_main_t * vm,
-	       vlib_node_runtime_t * node,
-	       l2fwd_main_t * msm,
-	       vlib_error_main_t * em,
-	       vlib_buffer_t * b0,
-	       u32 sw_if_index0, l2fib_entry_result_t * result0, u32 * next0)
-{
-  if (PREDICT_FALSE (result0->raw == ~0))
-    {
-      /*
-       * lookup miss, so flood
-       * TODO:replicate packet to each intf in bridge-domain
-       * For now just drop
-       */
-      if (vnet_buffer (b0)->l2.feature_bitmap & L2INPUT_FEAT_UU_FLOOD)
-	{
-	  *next0 = L2FWD_NEXT_FLOOD;
-	}
-      else
-	{
-	  /* Flooding is disabled */
-	  b0->error = node->errors[L2FWD_ERROR_FLOOD];
-	  *next0 = L2FWD_NEXT_DROP;
-	}
-
-    }
-  else
-    {
-
-      /* lookup hit, forward packet  */
-#ifdef COUNTERS
-      em->counters[node_counter_base_index + L2FWD_ERROR_HIT] += 1;
-#endif
-
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] = result0->fields.sw_if_index;
-      *next0 = L2FWD_NEXT_L2_OUTPUT;
-
-      /* perform reflection check */
-      if (PREDICT_FALSE (sw_if_index0 == result0->fields.sw_if_index))
-	{
-	  b0->error = node->errors[L2FWD_ERROR_REFLECT_DROP];
-	  *next0 = L2FWD_NEXT_DROP;
-
-	  /* perform filter check */
-	}
-      else if (PREDICT_FALSE (result0->fields.filter))
-	{
-	  b0->error = node->errors[L2FWD_ERROR_FILTER_DROP];
-	  *next0 = L2FWD_NEXT_DROP;
-
-	  /* perform BVI check */
-	}
-      else if (PREDICT_FALSE (result0->fields.bvi))
-	{
-	  u32 rc;
-	  rc = l2_to_bvi (vm,
-			  msm->vnet_main,
-			  b0,
-			  vnet_buffer (b0)->sw_if_index[VLIB_TX],
-			  &msm->l3_next, next0);
-
-	  if (PREDICT_FALSE (rc))
-	    {
-	      if (rc == TO_BVI_ERR_BAD_MAC)
-		{
-		  b0->error = node->errors[L2FWD_ERROR_BVI_BAD_MAC];
-		  *next0 = L2FWD_NEXT_DROP;
-		}
-	      else if (rc == TO_BVI_ERR_ETHERTYPE)
-		{
-		  b0->error = node->errors[L2FWD_ERROR_BVI_ETHERTYPE];
-		  *next0 = L2FWD_NEXT_DROP;
-		}
-	    }
-	}
-    }
-}
-
-
-static uword
-l2fwd_node_fn (vlib_main_t * vm,
-	       vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  l2fwd_next_t next_index;
-  l2fwd_main_t *msm = &l2fwd_main;
-  vlib_node_t *n = vlib_get_node (vm, l2fwd_node.index);
-  CLIB_UNUSED (u32 node_counter_base_index) = n->error_heap_index;
-  vlib_error_main_t *em = &vm->error_main;
-  l2fib_entry_key_t cached_key;
-  l2fib_entry_result_t cached_result;
-
-  /* Clear the one-entry cache in case mac table was updated */
-  cached_key.raw = ~0;
-  cached_result.raw = ~0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;	/* number of packets to process */
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      /* get space to enqueue frame to graph node "next_index" */
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 8 && n_left_to_next >= 4)
-	{
-	  u32 bi0, bi1, bi2, bi3;
-	  vlib_buffer_t *b0, *b1, *b2, *b3;
-	  u32 next0, next1, next2, next3;
-	  u32 sw_if_index0, sw_if_index1, sw_if_index2, sw_if_index3;
-	  ethernet_header_t *h0, *h1, *h2, *h3;
-	  l2fib_entry_key_t key0, key1, key2, key3;
-	  l2fib_entry_result_t result0, result1, result2, result3;
-	  u32 bucket0, bucket1, bucket2, bucket3;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p4, *p5, *p6, *p7;
-
-	    p4 = vlib_get_buffer (vm, from[4]);
-	    p5 = vlib_get_buffer (vm, from[5]);
-	    p6 = vlib_get_buffer (vm, from[6]);
-	    p7 = vlib_get_buffer (vm, from[7]);
-
-	    vlib_prefetch_buffer_header (p4, LOAD);
-	    vlib_prefetch_buffer_header (p5, LOAD);
-	    vlib_prefetch_buffer_header (p6, LOAD);
-	    vlib_prefetch_buffer_header (p7, LOAD);
-
-	    CLIB_PREFETCH (p4->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p5->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p6->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p7->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  /* bi is "buffer index", b is pointer to the buffer */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  to_next[2] = bi2 = from[2];
-	  to_next[3] = bi3 = from[3];
-	  from += 4;
-	  to_next += 4;
-	  n_left_from -= 4;
-	  n_left_to_next -= 4;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-	  b2 = vlib_get_buffer (vm, bi2);
-	  b3 = vlib_get_buffer (vm, bi3);
-
-	  /* RX interface handles */
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-	  sw_if_index2 = vnet_buffer (b2)->sw_if_index[VLIB_RX];
-	  sw_if_index3 = vnet_buffer (b3)->sw_if_index[VLIB_RX];
-
-	  h0 = vlib_buffer_get_current (b0);
-	  h1 = vlib_buffer_get_current (b1);
-	  h2 = vlib_buffer_get_current (b2);
-	  h3 = vlib_buffer_get_current (b3);
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2fwd_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->sw_if_index = sw_if_index0;
-		  t->bd_index = vnet_buffer (b0)->l2.bd_index;
-		  clib_memcpy (t->src, h0->src_address, 6);
-		  clib_memcpy (t->dst, h0->dst_address, 6);
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2fwd_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  t->sw_if_index = sw_if_index1;
-		  t->bd_index = vnet_buffer (b1)->l2.bd_index;
-		  clib_memcpy (t->src, h1->src_address, 6);
-		  clib_memcpy (t->dst, h1->dst_address, 6);
-		}
-	      if (b2->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2fwd_trace_t *t =
-		    vlib_add_trace (vm, node, b2, sizeof (*t));
-		  t->sw_if_index = sw_if_index2;
-		  t->bd_index = vnet_buffer (b2)->l2.bd_index;
-		  clib_memcpy (t->src, h2->src_address, 6);
-		  clib_memcpy (t->dst, h2->dst_address, 6);
-		}
-	      if (b3->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2fwd_trace_t *t =
-		    vlib_add_trace (vm, node, b3, sizeof (*t));
-		  t->sw_if_index = sw_if_index3;
-		  t->bd_index = vnet_buffer (b3)->l2.bd_index;
-		  clib_memcpy (t->src, h3->src_address, 6);
-		  clib_memcpy (t->dst, h3->dst_address, 6);
-		}
-	    }
-
-	  /* process 2 pkts */
-#ifdef COUNTERS
-	  em->counters[node_counter_base_index + L2FWD_ERROR_L2FWD] += 4;
-#endif
-	  /* *INDENT-OFF* */
-	  l2fib_lookup_4 (msm->mac_table, &cached_key, &cached_result,
-			  h0->dst_address, h1->dst_address,
-			  h2->dst_address, h3->dst_address,
-			  vnet_buffer (b0)->l2.bd_index,
-			  vnet_buffer (b1)->l2.bd_index,
-			  vnet_buffer (b2)->l2.bd_index,
-			  vnet_buffer (b3)->l2.bd_index,
-			  &key0,	/* not used */
-			  &key1,	/* not used */
-			  &key2,	/* not used */
-			  &key3,	/* not used */
-			  &bucket0,	/* not used */
-			  &bucket1,	/* not used */
-			  &bucket2,	/* not used */
-			  &bucket3,	/* not used */
-			  &result0,
-			  &result1,
-			  &result2,
-			  &result3);
-	  /* *INDENT-ON* */
-	  l2fwd_process (vm, node, msm, em, b0, sw_if_index0, &result0,
-			 &next0);
-	  l2fwd_process (vm, node, msm, em, b1, sw_if_index1, &result1,
-			 &next1);
-	  l2fwd_process (vm, node, msm, em, b2, sw_if_index2, &result2,
-			 &next2);
-	  l2fwd_process (vm, node, msm, em, b3, sw_if_index3, &result3,
-			 &next3);
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  /* if next0==next1==next_index then nothing special needs to be done */
-	  vlib_validate_buffer_enqueue_x4 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, bi2, bi3,
-					   next0, next1, next2, next3);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 sw_if_index0;
-	  ethernet_header_t *h0;
-	  l2fib_entry_key_t key0;
-	  l2fib_entry_result_t result0;
-	  u32 bucket0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-
-	  h0 = vlib_buffer_get_current (b0);
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      l2fwd_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = sw_if_index0;
-	      t->bd_index = vnet_buffer (b0)->l2.bd_index;
-	      clib_memcpy (t->src, h0->src_address, 6);
-	      clib_memcpy (t->dst, h0->dst_address, 6);
-	    }
-
-	  /* process 1 pkt */
-#ifdef COUNTERS
-	  em->counters[node_counter_base_index + L2FWD_ERROR_L2FWD] += 1;
-#endif
-	  l2fib_lookup_1 (msm->mac_table, &cached_key, &cached_result, h0->dst_address, vnet_buffer (b0)->l2.bd_index, &key0,	/* not used */
-			  &bucket0,	/* not used */
-			  &result0);
-	  l2fwd_process (vm, node, msm, em, b0, sw_if_index0, &result0,
-			 &next0);
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2fwd_node,static) = {
-  .function = l2fwd_node_fn,
-  .name = "l2-fwd",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2fwd_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2fwd_error_strings),
-  .error_strings = l2fwd_error_strings,
-
-  .n_next_nodes = L2FWD_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [L2FWD_NEXT_L2_OUTPUT] = "l2-output",
-    [L2FWD_NEXT_FLOOD] = "l2-flood",
-    [L2FWD_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2fwd_node, l2fwd_node_fn)
-     clib_error_t *l2fwd_init (vlib_main_t * vm)
-{
-  l2fwd_main_t *mp = &l2fwd_main;
-
-  mp->vlib_main = vm;
-  mp->vnet_main = vnet_get_main ();
-
-  /* init the hash table ptr */
-  mp->mac_table = get_mac_table ();
-
-  /* Initialize the next nodes for each ethertype */
-  next_by_ethertype_init (&mp->l3_next);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2fwd_init);
-
-
-/** Add the L3 input node for this ethertype to the next nodes structure. */
-void
-l2fwd_register_input_type (vlib_main_t * vm,
-			   ethernet_type_t type, u32 node_index)
-{
-  l2fwd_main_t *mp = &l2fwd_main;
-  u32 next_index;
-
-  next_index = vlib_node_add_next (vm, l2fwd_node.index, node_index);
-
-  next_by_ethertype_register (&mp->l3_next, type, next_index);
-}
-
-
-/**
- * Set subinterface forward enable/disable.
- * The CLI format is:
- *   set interface l2 forward <interface> [disable]
- */
-static clib_error_t *
-int_fwd (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index;
-  u32 enable;
-
-  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  enable = 1;
-  if (unformat (input, "disable"))
-    {
-      enable = 0;
-    }
-
-  /* set the interface flag */
-  if (l2input_intf_config (sw_if_index)->xconnect)
-    {
-      l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_XCONNECT, enable);
-    }
-  else
-    {
-      l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_FWD, enable);
-    }
-
-done:
-  return error;
-}
-
-/*?
- * Layer 2 unicast forwarding can be enabled and disabled on each
- * interface and on each bridge-domain. Use this command to
- * manage interfaces. It is enabled by default.
- *
- * @cliexpar
- * Example of how to enable fowarding:
- * @cliexcmd{set interface l2 forward GigabitEthernet0/8/0}
- * Example of how to disable fowarding:
- * @cliexcmd{set interface l2 forward GigabitEthernet0/8/0 disable}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (int_fwd_cli, static) = {
-  .path = "set interface l2 forward",
-  .short_help = "set interface l2 forward <interface> [disable]",
-  .function = int_fwd,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_fwd.h b/vnet/vnet/l2/l2_fwd.h
deleted file mode 100644
index 3968732d..00000000
--- a/vnet/vnet/l2/l2_fwd.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * l2_fwd.c : layer 2 forwarding using l2fib
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_l2fwd_h
-#define included_l2fwd_h
-
-#include <vlib/vlib.h>
-#include <vnet/ethernet/ethernet.h>
-
-
-void
-l2fwd_register_input_type (vlib_main_t * vm,
-			   ethernet_type_t type, u32 node_index);
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_input.c b/vnet/vnet/l2/l2_input.c
deleted file mode 100644
index a104ec9e..00000000
--- a/vnet/vnet/l2/l2_input.c
+++ /dev/null
@@ -1,1116 +0,0 @@
-/*
- * l2_input.c : layer 2 input packet processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/ip/ip_packet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vlib/cli.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/l2_output.h>
-#include <vnet/l2/feat_bitmap.h>
-#include <vnet/l2/l2_bvi.h>
-#include <vnet/l2/l2_fib.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/cache.h>
-
-/**
- * @file
- * @brief Interface Input Mode (Layer 2 Cross-Connect or Bridge / Layer 3).
- *
- * This file contains the CLI Commands that modify the input mode of an
- * interface. For interfaces in a Layer 2 cross-connect, all packets
- * received on one interface will be transmitted to the other. For
- * interfaces in a bridge-domain, packets will be forwarded to other
- * interfaces in the same bridge-domain based on destination mac address.
- * For interfaces in Layer 3 mode, the packets will be routed.
- */
-
-/* Feature graph node names */
-static char *l2input_feat_names[] = {
-#define _(sym,name) name,
-  foreach_l2input_feat
-#undef _
-};
-
-char **
-l2input_get_feat_names (void)
-{
-  return l2input_feat_names;
-}
-
-
-typedef struct
-{
-  /* per-pkt trace data */
-  u8 src[6];
-  u8 dst[6];
-  u32 next_index;
-  u32 sw_if_index;
-} l2input_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_l2input_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2input_trace_t *t = va_arg (*args, l2input_trace_t *);
-
-  s = format (s, "l2-input: sw_if_index %d dst %U src %U",
-	      t->sw_if_index,
-	      format_ethernet_address, t->dst,
-	      format_ethernet_address, t->src);
-  return s;
-}
-
-l2input_main_t l2input_main;
-
-#define foreach_l2input_error			\
-_(L2INPUT,     "L2 input packets")		\
-_(DROP,        "L2 input drops")
-
-typedef enum
-{
-#define _(sym,str) L2INPUT_ERROR_##sym,
-  foreach_l2input_error
-#undef _
-    L2INPUT_N_ERROR,
-} l2input_error_t;
-
-static char *l2input_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2input_error
-#undef _
-};
-
-typedef enum
-{				/*  */
-  L2INPUT_NEXT_LEARN,
-  L2INPUT_NEXT_FWD,
-  L2INPUT_NEXT_DROP,
-  L2INPUT_N_NEXT,
-} l2input_next_t;
-
-
-static_always_inline void
-classify_and_dispatch (vlib_main_t * vm,
-		       vlib_node_runtime_t * node,
-		       u32 cpu_index,
-		       l2input_main_t * msm, vlib_buffer_t * b0, u32 * next0)
-{
-  /*
-   * Load L2 input feature struct
-   * Load bridge domain struct
-   * Parse ethernet header to determine unicast/mcast/broadcast
-   * take L2 input stat
-   * classify packet as IP/UDP/TCP, control, other
-   * mask feature bitmap
-   * go to first node in bitmap
-   * Later: optimize VTM
-   *
-   * For L2XC,
-   *   set tx sw-if-handle
-   */
-
-  u16 ethertype;
-  u8 protocol;
-  l2_input_config_t *config;
-  l2_bridge_domain_t *bd_config;
-  u16 bd_index0;
-  u32 feature_bitmap;
-  u32 feat_mask;
-  ethernet_header_t *h0;
-  u8 *l3h0;
-  u32 sw_if_index0;
-
-#define get_u16(addr) ( *((u16 *)(addr)) )
-
-  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-
-  h0 = vlib_buffer_get_current (b0);
-  l3h0 = (u8 *) h0 + vnet_buffer (b0)->l2.l2_len;
-
-  ethertype = clib_net_to_host_u16 (get_u16 (l3h0 - 2));
-  feat_mask = ~0;
-
-  /* Get config for the input interface */
-  config = vec_elt_at_index (msm->configs, sw_if_index0);
-
-  /* Save split horizon group */
-  vnet_buffer (b0)->l2.shg = config->shg;
-
-  /* determine layer2 kind for stat and mask */
-  if (PREDICT_FALSE (ethernet_address_cast (h0->dst_address)))
-    {
-      protocol = ((ip6_header_t *) l3h0)->protocol;
-
-      /* Disable bridge forwarding (flooding will execute instead if not xconnect) */
-      feat_mask &= ~(L2INPUT_FEAT_FWD | L2INPUT_FEAT_UU_FLOOD);
-
-      /* Disable ARP-term for non-ARP and non-ICMP6 packet */
-      if (ethertype != ETHERNET_TYPE_ARP &&
-	  (ethertype != ETHERNET_TYPE_IP6 || protocol != IP_PROTOCOL_ICMP6))
-	feat_mask &= ~(L2INPUT_FEAT_ARP_TERM);
-    }
-  else
-    {
-      /*
-       * Check for from-BVI processing - set SHG of unicast packets from BVI
-       * to 0 so it is not dropped for VXLAN tunnels or other ports with the
-       * same SHG as that of the BVI.
-       */
-      if (PREDICT_FALSE (vnet_buffer (b0)->sw_if_index[VLIB_TX] ==
-			 L2INPUT_BVI))
-	vnet_buffer (b0)->l2.shg = 0;
-    }
-
-
-  if (config->xconnect)
-    {
-      /* Set the output interface */
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] = config->output_sw_if_index;
-    }
-  else
-    {
-      /* Do bridge-domain processing */
-      bd_index0 = config->bd_index;
-      /* save BD ID for next feature graph nodes */
-      vnet_buffer (b0)->l2.bd_index = bd_index0;
-
-      /* Get config for the bridge domain interface */
-      bd_config = vec_elt_at_index (msm->bd_configs, bd_index0);
-
-      /*
-       * Process bridge domain feature enables.
-       * To perform learning/flooding/forwarding, the corresponding bit
-       * must be enabled in both the input interface config and in the
-       * bridge domain config. In the bd_bitmap, bits for features other
-       * than learning/flooding/forwarding should always be set.
-       */
-      feat_mask = feat_mask & bd_config->feature_bitmap;
-    }
-
-  /* mask out features from bitmap using packet type and bd config */
-  feature_bitmap = config->feature_bitmap & feat_mask;
-
-  /* save for next feature graph nodes */
-  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap;
-
-  /* Determine the next node */
-  *next0 = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
-					    feature_bitmap);
-}
-
-
-static uword
-l2input_node_fn (vlib_main_t * vm,
-		 vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  l2input_next_t next_index;
-  l2input_main_t *msm = &l2input_main;
-  u32 cpu_index = os_get_cpu_number ();
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;	/* number of packets to process */
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      /* get space to enqueue frame to graph node "next_index" */
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 8 && n_left_to_next >= 4)
-	{
-	  u32 bi0, bi1, bi2, bi3;
-	  vlib_buffer_t *b0, *b1, *b2, *b3;
-	  u32 next0, next1, next2, next3;
-	  u32 sw_if_index0, sw_if_index1, sw_if_index2, sw_if_index3;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p4, *p5, *p6, *p7;
-
-	    p4 = vlib_get_buffer (vm, from[4]);
-	    p5 = vlib_get_buffer (vm, from[5]);
-	    p6 = vlib_get_buffer (vm, from[6]);
-	    p7 = vlib_get_buffer (vm, from[7]);
-
-	    /* Prefetch the buffer header and packet for the N+2 loop iteration */
-	    vlib_prefetch_buffer_header (p4, LOAD);
-	    vlib_prefetch_buffer_header (p5, LOAD);
-	    vlib_prefetch_buffer_header (p6, LOAD);
-	    vlib_prefetch_buffer_header (p7, LOAD);
-
-	    CLIB_PREFETCH (p4->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p5->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p6->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p7->data, CLIB_CACHE_LINE_BYTES, STORE);
-
-	    /*
-	     * Don't bother prefetching the bridge-domain config (which
-	     * depends on the input config above). Only a small number of
-	     * bridge domains are expected. Plus the structure is small
-	     * and several fit in a cache line.
-	     */
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  /* bi is "buffer index", b is pointer to the buffer */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  to_next[2] = bi2 = from[2];
-	  to_next[3] = bi3 = from[3];
-	  from += 4;
-	  to_next += 4;
-	  n_left_from -= 4;
-	  n_left_to_next -= 4;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-	  b2 = vlib_get_buffer (vm, bi2);
-	  b3 = vlib_get_buffer (vm, bi3);
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      /* RX interface handles */
-	      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-	      sw_if_index2 = vnet_buffer (b2)->sw_if_index[VLIB_RX];
-	      sw_if_index3 = vnet_buffer (b3)->sw_if_index[VLIB_RX];
-
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  ethernet_header_t *h0 = vlib_buffer_get_current (b0);
-		  l2input_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->sw_if_index = sw_if_index0;
-		  clib_memcpy (t->src, h0->src_address, 6);
-		  clib_memcpy (t->dst, h0->dst_address, 6);
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  ethernet_header_t *h1 = vlib_buffer_get_current (b1);
-		  l2input_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  t->sw_if_index = sw_if_index1;
-		  clib_memcpy (t->src, h1->src_address, 6);
-		  clib_memcpy (t->dst, h1->dst_address, 6);
-		}
-	      if (b2->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  ethernet_header_t *h2 = vlib_buffer_get_current (b2);
-		  l2input_trace_t *t =
-		    vlib_add_trace (vm, node, b2, sizeof (*t));
-		  t->sw_if_index = sw_if_index2;
-		  clib_memcpy (t->src, h2->src_address, 6);
-		  clib_memcpy (t->dst, h2->dst_address, 6);
-		}
-	      if (b3->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  ethernet_header_t *h3 = vlib_buffer_get_current (b3);
-		  l2input_trace_t *t =
-		    vlib_add_trace (vm, node, b3, sizeof (*t));
-		  t->sw_if_index = sw_if_index3;
-		  clib_memcpy (t->src, h3->src_address, 6);
-		  clib_memcpy (t->dst, h3->dst_address, 6);
-		}
-	    }
-
-	  vlib_node_increment_counter (vm, l2input_node.index,
-				       L2INPUT_ERROR_L2INPUT, 4);
-
-	  classify_and_dispatch (vm, node, cpu_index, msm, b0, &next0);
-	  classify_and_dispatch (vm, node, cpu_index, msm, b1, &next1);
-	  classify_and_dispatch (vm, node, cpu_index, msm, b2, &next2);
-	  classify_and_dispatch (vm, node, cpu_index, msm, b3, &next3);
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  /* if next0==next1==next_index then nothing special needs to be done */
-	  vlib_validate_buffer_enqueue_x4 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, bi2, bi3,
-					   next0, next1, next2, next3);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 sw_if_index0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      ethernet_header_t *h0 = vlib_buffer_get_current (b0);
-	      l2input_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-	      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	      t->sw_if_index = sw_if_index0;
-	      clib_memcpy (t->src, h0->src_address, 6);
-	      clib_memcpy (t->dst, h0->dst_address, 6);
-	    }
-
-	  vlib_node_increment_counter (vm, l2input_node.index,
-				       L2INPUT_ERROR_L2INPUT, 1);
-
-	  classify_and_dispatch (vm, node, cpu_index, msm, b0, &next0);
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2input_node) = {
-  .function = l2input_node_fn,
-  .name = "l2-input",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2input_trace,
-  .format_buffer = format_ethernet_header_with_length,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2input_error_strings),
-  .error_strings = l2input_error_strings,
-
-  .n_next_nodes = L2INPUT_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-       [L2INPUT_NEXT_LEARN] = "l2-learn",
-       [L2INPUT_NEXT_FWD]   = "l2-fwd",
-       [L2INPUT_NEXT_DROP]  = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2input_node, l2input_node_fn)
-     clib_error_t *l2input_init (vlib_main_t * vm)
-{
-  l2input_main_t *mp = &l2input_main;
-
-  mp->vlib_main = vm;
-  mp->vnet_main = vnet_get_main ();
-
-  /* Get packets RX'd from L2 interfaces */
-  ethernet_register_l2_input (vm, l2input_node.index);
-
-  /* Create the config vector */
-  vec_validate (mp->configs, 100);
-  /* create 100 sw interface entries and zero them */
-
-  /* Initialize the feature next-node indexes */
-  feat_bitmap_init_next_nodes (vm,
-			       l2input_node.index,
-			       L2INPUT_N_FEAT,
-			       l2input_get_feat_names (),
-			       mp->feat_next_node_index);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2input_init);
-
-
-/** Get a pointer to the config for the given interface. */
-l2_input_config_t *
-l2input_intf_config (u32 sw_if_index)
-{
-  l2input_main_t *mp = &l2input_main;
-
-  vec_validate (mp->configs, sw_if_index);
-  return vec_elt_at_index (mp->configs, sw_if_index);
-}
-
-/** Enable (or disable) the feature in the bitmap for the given interface. */
-u32
-l2input_intf_bitmap_enable (u32 sw_if_index, u32 feature_bitmap, u32 enable)
-{
-  l2input_main_t *mp = &l2input_main;
-  l2_input_config_t *config;
-
-  vec_validate (mp->configs, sw_if_index);
-  config = vec_elt_at_index (mp->configs, sw_if_index);
-
-  if (enable)
-    {
-      config->feature_bitmap |= feature_bitmap;
-    }
-  else
-    {
-      config->feature_bitmap &= ~feature_bitmap;
-    }
-
-  return config->feature_bitmap;
-}
-
-u32
-l2input_set_bridge_features (u32 bd_index, u32 feat_mask, u32 feat_value)
-{
-  l2_bridge_domain_t *bd_config;
-  vec_validate (l2input_main.bd_configs, bd_index);
-  bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index);
-  bd_validate (bd_config);
-  bd_config->feature_bitmap =
-    (bd_config->feature_bitmap & ~feat_mask) | feat_value;
-  return bd_config->feature_bitmap;
-}
-
-/**
- * Set the subinterface to run in l2 or l3 mode.
- * For L3 mode, just the sw_if_index is specified.
- * For bridged mode, the bd id and bvi flag are also specified.
- * For xconnect mode, the peer sw_if_index is also specified.
- * Return 0 if ok, or non-0 if there was an error.
- */
-
-u32
-set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, u32 mode, u32 sw_if_index, u32 bd_index,	/* for bridged interface */
-		 u32 bvi,	/* the bridged interface is the BVI */
-		 u32 shg,	/* the bridged interface's split horizon group */
-		 u32 xc_sw_if_index)	/* peer interface for xconnect */
-{
-  l2input_main_t *mp = &l2input_main;
-  l2output_main_t *l2om = &l2output_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_hw_interface_t *hi;
-  l2_output_config_t *out_config;
-  l2_input_config_t *config;
-  l2_bridge_domain_t *bd_config;
-  l2_flood_member_t member;
-  u64 mac;
-  i32 l2_if_adjust = 0;
-  u32 slot;
-
-  hi = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
-  config = l2input_intf_config (sw_if_index);
-
-  if (config->bridge)
-    {
-      /* Interface is already in bridge mode. Undo the existing config. */
-      bd_config = vec_elt_at_index (mp->bd_configs, config->bd_index);
-
-      /* remove interface from flood vector */
-      bd_remove_member (bd_config, sw_if_index);
-
-      /* undo any BVI-related config */
-      if (bd_config->bvi_sw_if_index == sw_if_index)
-	{
-	  bd_config->bvi_sw_if_index = ~0;
-	  config->bvi = 0;
-
-	  /* delete the l2fib entry for the bvi interface */
-	  mac = *((u64 *) hi->hw_address);
-	  l2fib_del_entry (mac, config->bd_index);
-
-	  /* Make loop output node send packet back to ethernet-input node */
-	  slot =
-	    vlib_node_add_named_next_with_slot (vm, hi->tx_node_index,
-						"ethernet-input",
-						VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
-	  ASSERT (slot == VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
-	}
-      l2_if_adjust--;
-    }
-  else if (config->xconnect)
-    {
-      l2_if_adjust--;
-    }
-
-  /*
-   * Directs the l2 output path to work out the interface
-   * output next-arc itself. Needed when recycling a sw_if_index.
-   */
-  vec_validate_init_empty (l2om->next_nodes.output_node_index_vec,
-			   sw_if_index, ~0);
-  l2om->next_nodes.output_node_index_vec[sw_if_index] = ~0;
-
-  /* Initialize the l2-input configuration for the interface */
-  if (mode == MODE_L3)
-    {
-      /* Set L2 config to BD index 0 so that if any packet accidentally
-       * came in on L2 path, it will be dropped in BD 0 */
-      config->xconnect = 0;
-      config->bridge = 0;
-      config->shg = 0;
-      config->bd_index = 0;
-      config->feature_bitmap = L2INPUT_FEAT_DROP;
-
-      /* Make sure any L2-output packet to this interface now in L3 mode is
-       * dropped. This may happen if L2 FIB MAC entry is stale */
-      l2om->next_nodes.output_node_index_vec[sw_if_index] =
-	L2OUTPUT_NEXT_BAD_INTF;
-    }
-  else if (mode == MODE_L2_CLASSIFY)
-    {
-      config->xconnect = 1;
-      config->bridge = 0;
-      config->output_sw_if_index = xc_sw_if_index;
-
-      /* Make sure last-chance drop is configured */
-      config->feature_bitmap |=
-	L2INPUT_FEAT_DROP | L2INPUT_FEAT_INPUT_CLASSIFY;
-
-      /* Make sure bridging features are disabled */
-      config->feature_bitmap &=
-	~(L2INPUT_FEAT_LEARN | L2INPUT_FEAT_FWD | L2INPUT_FEAT_FLOOD);
-      shg = 0;			/* not used in xconnect */
-
-      /* Insure all packets go to ethernet-input */
-      ethernet_set_rx_redirect (vnet_main, hi, 1);
-    }
-  else
-    {
-
-      if (mode == MODE_L2_BRIDGE)
-	{
-	  /*
-	   * Remove a check that the interface must be an Ethernet.
-	   * Specifically so we can bridge to L3 tunnel interfaces.
-	   * Here's the check:
-	   * if (hi->hw_class_index != ethernet_hw_interface_class.index)
-	   *
-	   */
-	  if (!hi)
-	    return MODE_ERROR_ETH;	/* non-ethernet */
-
-	  config->xconnect = 0;
-	  config->bridge = 1;
-	  config->bd_index = bd_index;
-
-	  /*
-	   * Enable forwarding, flooding, learning and ARP termination by default
-	   * (note that ARP term is disabled on BD feature bitmap by default)
-	   */
-	  config->feature_bitmap |= L2INPUT_FEAT_FWD | L2INPUT_FEAT_UU_FLOOD |
-	    L2INPUT_FEAT_FLOOD | L2INPUT_FEAT_LEARN | L2INPUT_FEAT_ARP_TERM;
-
-	  /* Make sure last-chance drop is configured */
-	  config->feature_bitmap |= L2INPUT_FEAT_DROP;
-
-	  /* Make sure xconnect is disabled */
-	  config->feature_bitmap &= ~L2INPUT_FEAT_XCONNECT;
-
-	  /* Set up bridge domain */
-	  vec_validate (mp->bd_configs, bd_index);
-	  bd_config = vec_elt_at_index (mp->bd_configs, bd_index);
-	  bd_validate (bd_config);
-
-	  /* TODO: think: add l2fib entry even for non-bvi interface? */
-
-	  /* Do BVI interface initializations */
-	  if (bvi)
-	    {
-	      /* ensure BD has no bvi interface (or replace that one with this??) */
-	      if (bd_config->bvi_sw_if_index != ~0)
-		{
-		  return MODE_ERROR_BVI_DEF;	/* bd already has a bvi interface */
-		}
-	      bd_config->bvi_sw_if_index = sw_if_index;
-	      config->bvi = 1;
-
-	      /* create the l2fib entry for the bvi interface */
-	      mac = *((u64 *) hi->hw_address);
-	      l2fib_add_entry (mac, bd_index, sw_if_index, 1, 0, 1);	/* static + bvi */
-
-	      /* Disable learning by default. no use since l2fib entry is static. */
-	      config->feature_bitmap &= ~L2INPUT_FEAT_LEARN;
-
-	      /* Make loop output node send packet to l2-input node */
-	      slot =
-		vlib_node_add_named_next_with_slot (vm, hi->tx_node_index,
-						    "l2-input",
-						    VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
-	      ASSERT (slot == VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
-	    }
-
-	  /* Add interface to bridge-domain flood vector */
-	  member.sw_if_index = sw_if_index;
-	  member.flags = bvi ? L2_FLOOD_MEMBER_BVI : L2_FLOOD_MEMBER_NORMAL;
-	  member.shg = shg;
-	  bd_add_member (bd_config, &member);
-
-	}
-      else
-	{
-	  config->xconnect = 1;
-	  config->bridge = 0;
-	  config->output_sw_if_index = xc_sw_if_index;
-
-	  /* Make sure last-chance drop is configured */
-	  config->feature_bitmap |= L2INPUT_FEAT_DROP;
-
-	  /* Make sure bridging features are disabled */
-	  config->feature_bitmap &=
-	    ~(L2INPUT_FEAT_LEARN | L2INPUT_FEAT_FWD | L2INPUT_FEAT_FLOOD);
-
-	  config->feature_bitmap |= L2INPUT_FEAT_XCONNECT;
-	  shg = 0;		/* not used in xconnect */
-	}
-
-      /* set up split-horizon group */
-      config->shg = shg;
-      out_config = l2output_intf_config (sw_if_index);
-      out_config->shg = shg;
-
-      /*
-       * Test: remove this when non-IP features can be configured.
-       * Enable a non-IP feature to test IP feature masking
-       * config->feature_bitmap |= L2INPUT_FEAT_CTRL_PKT;
-       */
-
-      l2_if_adjust++;
-    }
-
-  /* Adjust count of L2 interfaces */
-  hi->l2_if_count += l2_if_adjust;
-
-  if (hi->hw_class_index == ethernet_hw_interface_class.index)
-    {
-      if ((hi->l2_if_count == 1) && (l2_if_adjust == 1))
-	{
-	  /* Just added first L2 interface on this port */
-
-	  /* Set promiscuous mode on the l2 interface */
-	  ethernet_set_flags (vnet_main, hi->hw_if_index,
-			      ETHERNET_INTERFACE_FLAG_ACCEPT_ALL);
-
-	  /* ensure all packets go to ethernet-input */
-	  ethernet_set_rx_redirect (vnet_main, hi, 1);
-
-	}
-      else if ((hi->l2_if_count == 0) && (l2_if_adjust == -1))
-	{
-	  /* Just removed only L2 subinterface on this port */
-
-	  /* Disable promiscuous mode on the l2 interface */
-	  ethernet_set_flags (vnet_main, hi->hw_if_index, 0);
-
-	  /* Allow ip packets to go directly to ip4-input etc */
-	  ethernet_set_rx_redirect (vnet_main, hi, 0);
-	}
-    }
-
-  /* Set up the L2/L3 flag in the interface parsing tables */
-  ethernet_sw_interface_set_l2_mode (vnm, sw_if_index, (mode != MODE_L3));
-
-  return 0;
-}
-
-/**
- * Set subinterface in bridging mode with a bridge-domain ID.
- * The CLI format is:
- *   set interface l2 bridge <interface> <bd> [bvi] [split-horizon-group]
- */
-static clib_error_t *
-int_l2_bridge (vlib_main_t * vm,
-	       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 bd_index, bd_id;
-  u32 sw_if_index;
-  u32 bvi;
-  u32 rc;
-  u32 shg;
-
-  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  if (!unformat (input, "%d", &bd_id))
-    {
-      error = clib_error_return (0, "expected bridge domain ID `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  bd_index = bd_find_or_add_bd_index (&bd_main, bd_id);
-
-  /* optional bvi  */
-  bvi = unformat (input, "bvi");
-
-  /* optional split horizon group */
-  shg = 0;
-  (void) unformat (input, "%d", &shg);
-
-  /* set the interface mode */
-  if ((rc =
-       set_int_l2_mode (vm, vnm, MODE_L2_BRIDGE, sw_if_index, bd_index, bvi,
-			shg, 0)))
-    {
-      if (rc == MODE_ERROR_ETH)
-	{
-	  error = clib_error_return (0, "bridged interface must be ethernet",
-				     format_unformat_error, input);
-	}
-      else if (rc == MODE_ERROR_BVI_DEF)
-	{
-	  error =
-	    clib_error_return (0, "bridge-domain already has a bvi interface",
-			       format_unformat_error, input);
-	}
-      else
-	{
-	  error = clib_error_return (0, "invalid configuration for interface",
-				     format_unformat_error, input);
-	}
-      goto done;
-    }
-
-done:
-  return error;
-}
-
-/*?
- * Use this command put an interface into Layer 2 bridge domain. If a
- * bridge-domain with the provided bridge-domain-id does not exist, it
- * will be created. Interfaces in a bridge-domain forward packets to
- * other interfaces in the same bridge-domain based on destination mac
- * address. To remove an interface from a the Layer 2 bridge domain,
- * put the interface in a different mode, for example Layer 3 mode.
- *
- * Optionally, an interface can be added to a Layer 2 bridge-domain as
- * a Bridged Virtual Interface (bvi). Only one interface in a Layer 2
- * bridge-domain can be a bvi.
- *
- * Optionally, a split-horizon group can also be specified. This defaults
- * to 0 if not specified.
- *
- * @cliexpar
- * Example of how to configure a Layer 2 bridge-domain with three
- * interfaces (where 200 is the bridge-domain-id):
- * @cliexcmd{set interface l2 bridge GigabitEthernet0/8/0.200 200}
- * This interface is added a BVI interface:
- * @cliexcmd{set interface l2 bridge GigabitEthernet0/9/0.200 200 bvi}
- * This interface also has a split-horizon group of 1 specified:
- * @cliexcmd{set interface l2 bridge GigabitEthernet0/a/0.200 200 1}
- * Example of how to remove an interface from a Layer2 bridge-domain:
- * @cliexcmd{set interface l3 GigabitEthernet0/a/0.200}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (int_l2_bridge_cli, static) = {
-  .path = "set interface l2 bridge",
-  .short_help = "set interface l2 bridge <interface> <bridge-domain-id> [bvi] [shg]",
-  .function = int_l2_bridge,
-};
-/* *INDENT-ON* */
-
-/**
- * Set subinterface in xconnect mode with another interface.
- * The CLI format is:
- *   set interface l2 xconnect <interface> <peer interface>
- */
-static clib_error_t *
-int_l2_xc (vlib_main_t * vm,
-	   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index;
-  u32 xc_sw_if_index;
-
-  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  if (!unformat_user
-      (input, unformat_vnet_sw_interface, vnm, &xc_sw_if_index))
-    {
-      error = clib_error_return (0, "unknown peer interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  /* set the interface mode */
-  if (set_int_l2_mode
-      (vm, vnm, MODE_L2_XC, sw_if_index, 0, 0, 0, xc_sw_if_index))
-    {
-      error = clib_error_return (0, "invalid configuration for interface",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-done:
-  return error;
-}
-
-/*?
- * Use this command put an interface into Layer 2 cross-connect mode.
- * Both interfaces must be in this mode for bi-directioal traffic. All
- * packets received on one interface will be transmitted to the other.
- * To remove the Layer 2 cross-connect, put the interface in a different
- * mode, for example Layer 3 mode.
- *
- * @cliexpar
- * Example of how to configure a Layer2 cross-connect between two interfaces:
- * @cliexcmd{set interface l2 xconnect GigabitEthernet0/8/0.300 GigabitEthernet0/9/0.300}
- * @cliexcmd{set interface l2 xconnect GigabitEthernet0/9/0.300 GigabitEthernet0/8/0.300}
- * Example of how to remove a Layer2 cross-connect:
- * @cliexcmd{set interface l3 GigabitEthernet0/8/0.300}
- * @cliexcmd{set interface l3 GigabitEthernet0/9/0.300}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (int_l2_xc_cli, static) = {
-  .path = "set interface l2 xconnect",
-  .short_help = "set interface l2 xconnect <interface> <peer interface>",
-  .function = int_l2_xc,
-};
-/* *INDENT-ON* */
-
-/**
- * Set subinterface in L3 mode.
- * The CLI format is:
- *   set interface l3 <interface>
- */
-static clib_error_t *
-int_l3 (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index;
-
-  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  /* set the interface mode */
-  if (set_int_l2_mode (vm, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0))
-    {
-      error = clib_error_return (0, "invalid configuration for interface",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-done:
-  return error;
-}
-
-/*?
- * Modify the packet processing mode of the interface to Layer 3, which
- * implies packets will be routed. This is the default mode of an interface.
- * Use this command to remove an interface from a Layer 2 cross-connect or a
- * Layer 2 bridge.
- *
- * @cliexpar
- * Example of how to set the mode of an interface to Layer 3:
- * @cliexcmd{set interface l3 GigabitEthernet0/8/0.200}
-?*/
-/* *INDENT-OFF* */
-     VLIB_CLI_COMMAND (int_l3_cli, static) = {
-  .path = "set interface l3",
-  .short_help = "set interface l3 <interface>",
-  .function = int_l3,
-};
-/* *INDENT-ON* */
-
-/**
- * Show interface mode.
- * The CLI format is:
- *    show mode [<if-name1> <if-name2> ...]
- */
-static clib_error_t *
-show_int_mode (vlib_main_t * vm,
-	       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  char *mode;
-  u8 *args;
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vnet_sw_interface_t *si, *sis = 0;
-  l2input_main_t *mp = &l2input_main;
-  l2_input_config_t *config;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      u32 sw_if_index;
-
-      /* See if user wants to show specific interface */
-      if (unformat
-	  (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
-	{
-	  si = pool_elt_at_index (im->sw_interfaces, sw_if_index);
-	  vec_add1 (sis, si[0]);
-	}
-      else
-	{
-	  error = clib_error_return (0, "unknown input `%U'",
-				     format_unformat_error, input);
-	  goto done;
-	}
-
-    }
-
-  if (vec_len (sis) == 0)	/* Get all interfaces */
-    {
-      /* Gather interfaces. */
-      sis = vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces));
-      _vec_len (sis) = 0;
-      /* *INDENT-OFF* */
-      pool_foreach (si, im->sw_interfaces, ({ vec_add1 (sis, si[0]); }));
-      /* *INDENT-ON* */
-    }
-
-  vec_foreach (si, sis)
-  {
-    vec_validate (mp->configs, si->sw_if_index);
-    config = vec_elt_at_index (mp->configs, si->sw_if_index);
-    if (config->bridge)
-      {
-	u32 bd_id;
-	mode = "l2 bridge";
-	bd_id = l2input_main.bd_configs[config->bd_index].bd_id;
-
-	args = format (0, "bd_id %d%s%d", bd_id,
-		       config->bvi ? " bvi shg " : " shg ", config->shg);
-      }
-    else if (config->xconnect)
-      {
-	mode = "l2 xconnect";
-	args = format (0, "%U",
-		       format_vnet_sw_if_index_name,
-		       vnm, config->output_sw_if_index);
-      }
-    else
-      {
-	mode = "l3";
-	args = format (0, " ");
-      }
-    vlib_cli_output (vm, "%s %U %v\n",
-		     mode,
-		     format_vnet_sw_if_index_name,
-		     vnm, si->sw_if_index, args);
-    vec_free (args);
-  }
-
-done:
-  vec_free (sis);
-
-  return error;
-}
-
-/*?
- * Show the packet processing mode (Layer2 xcross-onnect, Layer 2 bridge,
- * Layer 3 routed) of all interfaces and sub-interfaces, or limit the
- * output to just the provided list of interfaces and sub-interfaces.
- * The output shows the mode, the interface, and if the interface is
- * a member of a bridge, the bridge-domain-id and the split horizen group (shg).
- *
- * @cliexpar
- * Example of displaying the mode of all interfaces:
- * @cliexstart{show mode}
- * l3 local0
- * l3 GigabitEthernet0/8/0
- * l3 GigabitEthernet0/9/0
- * l3 GigabitEthernet0/a/0
- * l2 bridge GigabitEthernet0/8/0.200 bd_id 200 shg 0
- * l2 bridge GigabitEthernet0/9/0.200 bd_id 200 shg 0
- * l2 bridge GigabitEthernet0/a/0.200 bd_id 200 shg 0
- * l2 xconnect GigabitEthernet0/8/0.300 GigabitEthernet0/9/0.300
- * l2 xconnect GigabitEthernet0/9/0.300 GigabitEthernet0/8/0.300
- * @cliexend
- * Example of displaying the mode of a seleted list of interfaces:
- * @cliexstart{show mode GigabitEthernet0/8/0 GigabitEthernet0/8/0.200}
- * l3 GigabitEthernet0/8/0
- * l2 bridge GigabitEthernet0/8/0.200 bd_id 200 shg 0
- * @cliexend
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_l2_mode, static) = {
-  .path = "show mode",
-  .short_help = "show mode [<if-name1> <if-name2> ...]",
-  .function = show_int_mode,
-};
-/* *INDENT-ON* */
-
-#define foreach_l2_init_function                \
-_(feat_bitmap_drop_init)                        \
-_(l2fib_init)                                   \
-_(l2_input_classify_init)                             \
-_(l2bd_init)                                    \
-_(l2fwd_init)                                   \
-_(l2_inacl_init)                                \
-_(l2input_init)                                 \
-_(l2_vtr_init)                                  \
-_(l2_invtr_init)                                \
-_(l2_efp_filter_init)                           \
-_(l2learn_init)                                 \
-_(l2flood_init)                                 \
-_(l2_outacl_init)                               \
-_(l2output_init)				\
-_(l2_patch_init)				\
-_(l2_xcrw_init)
-
-clib_error_t *
-l2_init (vlib_main_t * vm)
-{
-  clib_error_t *error;
-
-#define _(a) do {                                                       \
-  if ((error = vlib_call_init_function (vm, a))) return error; }        \
-while (0);
-  foreach_l2_init_function;
-#undef _
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_input.h b/vnet/vnet/l2/l2_input.h
deleted file mode 100644
index f3fada6a..00000000
--- a/vnet/vnet/l2/l2_input.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * l2_input.h : layer 2 input packet processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_vnet_l2_input_h
-#define included_vnet_l2_input_h
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/l2/l2_bd.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/ip/ip.h>
-
-/* Per-subinterface L2 feature configuration */
-
-typedef struct
-{
-
-  union
-  {
-    u16 bd_index;		/* bridge domain id */
-    u32 output_sw_if_index;	/* for xconnect */
-  };
-
-  /* Interface mode. If both are 0, this interface is in L3 mode */
-  u8 xconnect;
-  u8 bridge;
-
-  /* this is the bvi interface for the bridge-domain */
-  u8 bvi;
-
-  /* config for which input features are configured on this interface */
-  u32 feature_bitmap;
-
-  /* some of these flags are also in the feature bitmap */
-  u8 learn_enable;
-  u8 fwd_enable;
-  u8 flood_enable;
-
-  /* split horizon group */
-  u8 shg;
-
-} l2_input_config_t;
-
-
-typedef struct
-{
-
-  /* Next nodes for the feature bitmap */
-  u32 feat_next_node_index[32];
-
-  /* config vector indexed by sw_if_index */
-  l2_input_config_t *configs;
-
-  /* bridge domain config vector indexed by bd_index */
-  l2_bridge_domain_t *bd_configs;
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} l2input_main_t;
-
-extern l2input_main_t l2input_main;
-
-extern vlib_node_registration_t l2input_node;
-
-static_always_inline l2_bridge_domain_t *
-l2input_bd_config_from_index (l2input_main_t * l2im, u32 bd_index)
-{
-  l2_bridge_domain_t *bd_config;
-
-  bd_config = vec_elt_at_index (l2im->bd_configs, bd_index);
-  return bd_is_valid (bd_config) ? bd_config : NULL;
-}
-
-/* L2 input indication packet is from BVI, using -2 */
-#define L2INPUT_BVI ((u32) (~0-1))
-
-/* L2 input features */
-
-/* Mappings from feature ID to graph node name */
-#define foreach_l2input_feat                    \
- _(DROP,          "feature-bitmap-drop")        \
- _(XCONNECT,      "l2-output")                  \
- _(FLOOD,         "l2-flood")                   \
- _(ARP_TERM,      "arp-term-l2bd")              \
- _(UU_FLOOD,      "l2-flood")                   \
- _(FWD,           "l2-fwd")                     \
- _(RW,            "l2-rw")                      \
- _(LEARN,         "l2-learn")                   \
- _(VTR,           "l2-input-vtr")               \
- _(VPATH,         "vpath-input-l2")             \
- _(ACL,           "l2-input-acl")               \
- _(POLICER_CLAS,  "l2-policer-classify")	\
- _(INPUT_CLASSIFY, "l2-input-classify")
-
-/* Feature bitmap positions */
-typedef enum
-{
-#define _(sym,str) L2INPUT_FEAT_##sym##_BIT,
-  foreach_l2input_feat
-#undef _
-    L2INPUT_N_FEAT,
-} l2input_feat_t;
-
-/* Feature bit masks */
-typedef enum
-{
-#define _(sym,str) L2INPUT_FEAT_##sym = (1<<L2INPUT_FEAT_##sym##_BIT),
-  foreach_l2input_feat
-#undef _
-} l2input_feat_masks_t;
-
-/** Return an array of strings containing graph node names of each feature */
-char **l2input_get_feat_names (void);
-
-
-static_always_inline u8
-bd_feature_flood (l2_bridge_domain_t * bd_config)
-{
-  return ((bd_config->feature_bitmap & L2INPUT_FEAT_FLOOD) ==
-	  L2INPUT_FEAT_FLOOD);
-}
-
-static_always_inline u8
-bd_feature_uu_flood (l2_bridge_domain_t * bd_config)
-{
-  return ((bd_config->feature_bitmap & L2INPUT_FEAT_UU_FLOOD) ==
-	  L2INPUT_FEAT_UU_FLOOD);
-}
-
-static_always_inline u8
-bd_feature_forward (l2_bridge_domain_t * bd_config)
-{
-  return ((bd_config->feature_bitmap & L2INPUT_FEAT_FWD) == L2INPUT_FEAT_FWD);
-}
-
-static_always_inline u8
-bd_feature_learn (l2_bridge_domain_t * bd_config)
-{
-  return ((bd_config->feature_bitmap & L2INPUT_FEAT_LEARN) ==
-	  L2INPUT_FEAT_LEARN);
-}
-
-static_always_inline u8
-bd_feature_arp_term (l2_bridge_domain_t * bd_config)
-{
-  return ((bd_config->feature_bitmap & L2INPUT_FEAT_ARP_TERM) ==
-	  L2INPUT_FEAT_ARP_TERM);
-}
-
-/** Masks for eliminating features that do not apply to a packet */
-
-/** Get a pointer to the config for the given interface */
-l2_input_config_t *l2input_intf_config (u32 sw_if_index);
-
-/* Enable (or disable) the feature in the bitmap for the given interface */
-u32 l2input_intf_bitmap_enable (u32 sw_if_index,
-				u32 feature_bitmap, u32 enable);
-
-/* Sets modifies flags from a bridge domain */
-u32 l2input_set_bridge_features (u32 bd_index, u32 feat_mask, u32 feat_value);
-
-
-#define MODE_L3        0
-#define MODE_L2_BRIDGE 1
-#define MODE_L2_XC     2
-#define MODE_L2_CLASSIFY 3
-
-#define MODE_ERROR_ETH        1
-#define MODE_ERROR_BVI_DEF    2
-
-u32 set_int_l2_mode (vlib_main_t * vm,
-		     vnet_main_t * vnet_main,
-		     u32 mode,
-		     u32 sw_if_index,
-		     u32 bd_index, u32 bvi, u32 shg, u32 xc_sw_if_index);
-
-static inline void
-vnet_update_l2_len (vlib_buffer_t * b)
-{
-  ethernet_header_t *eth;
-  u16 ethertype;
-  u8 vlan_count = 0;
-
-  /* point at currrent l2 hdr */
-  eth = vlib_buffer_get_current (b);
-
-  /*
-   * l2-output pays no attention to this
-   * but the tag push/pop code on an l2 subif needs it.
-   *
-   * Determine l2 header len, check for up to 2 vlans
-   */
-  vnet_buffer (b)->l2.l2_len = sizeof (ethernet_header_t);
-  ethertype = clib_net_to_host_u16 (eth->type);
-  if (ethernet_frame_is_tagged (ethertype))
-    {
-      ethernet_vlan_header_t *vlan;
-      vnet_buffer (b)->l2.l2_len += sizeof (*vlan);
-      vlan_count = 1;
-      vlan = (void *) (eth + 1);
-      ethertype = clib_net_to_host_u16 (vlan->type);
-      if (ethertype == ETHERNET_TYPE_VLAN)
-	{
-	  vnet_buffer (b)->l2.l2_len += sizeof (*vlan);
-	  vlan_count = 2;
-	}
-    }
-  ethernet_buffer_set_vlan_count (b, vlan_count);
-}
-
-/*
- * Compute flow hash of an ethernet packet, use 5-tuple hash if L3 packet
- * is ip4 or ip6. Otherwise hash on smac/dmac/etype.
- * The vlib buffer current pointer is expected to be at ethernet header
- * and vnet l2.l2_len is exppected to be setup already.
- */
-static inline u32
-vnet_l2_compute_flow_hash (vlib_buffer_t * b)
-{
-  ethernet_header_t *eh = vlib_buffer_get_current (b);
-  u8 *l3h = (u8 *) eh + vnet_buffer (b)->l2.l2_len;
-  u16 ethertype = clib_net_to_host_u16 (*(u16 *) (l3h - 2));
-
-  if (ethertype == ETHERNET_TYPE_IP4)
-    return ip4_compute_flow_hash ((ip4_header_t *) l3h, IP_FLOW_HASH_DEFAULT);
-  else if (ethertype == ETHERNET_TYPE_IP6)
-    return ip6_compute_flow_hash ((ip6_header_t *) l3h, IP_FLOW_HASH_DEFAULT);
-  else
-    {
-      u32 a, b, c;
-      u32 *ap = (u32 *) & eh->dst_address[2];
-      u32 *bp = (u32 *) & eh->src_address[2];
-      a = *ap;
-      b = *bp;
-      c = ethertype;
-      hash_v3_mix32 (a, b, c);
-      hash_v3_finalize32 (a, b, c);
-      return c;
-    }
-}
-
-#endif
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_input_acl.c b/vnet/vnet/l2/l2_input_acl.c
deleted file mode 100644
index 104fcd15..00000000
--- a/vnet/vnet/l2/l2_input_acl.c
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * l2_input_acl.c : layer 2 input acl processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/ip/ip_packet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vlib/cli.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/feat_bitmap.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/cache.h>
-
-#include <vnet/classify/vnet_classify.h>
-#include <vnet/classify/input_acl.h>
-
-typedef struct
-{
-
-  /* Next nodes for each feature */
-  u32 feat_next_node_index[32];
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} l2_inacl_main_t;
-
-typedef struct
-{
-  u32 sw_if_index;
-  u32 next_index;
-  u32 table_index;
-  u32 offset;
-} l2_inacl_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_l2_inacl_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2_inacl_trace_t *t = va_arg (*args, l2_inacl_trace_t *);
-
-  s = format (s, "INACL: sw_if_index %d, next_index %d, table %d, offset %d",
-	      t->sw_if_index, t->next_index, t->table_index, t->offset);
-  return s;
-}
-
-l2_inacl_main_t l2_inacl_main;
-
-static vlib_node_registration_t l2_inacl_node;
-
-#define foreach_l2_inacl_error                  \
-_(NONE, "valid input ACL packets")              \
-_(MISS, "input ACL misses")                     \
-_(HIT, "input ACL hits")                        \
-_(CHAIN_HIT, "input ACL hits after chain walk") \
-_(TABLE_MISS, "input ACL table-miss drops")     \
-_(SESSION_DENY, "input ACL session deny drops")
-
-
-typedef enum
-{
-#define _(sym,str) L2_INACL_ERROR_##sym,
-  foreach_l2_inacl_error
-#undef _
-    L2_INACL_N_ERROR,
-} l2_inacl_error_t;
-
-static char *l2_inacl_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2_inacl_error
-#undef _
-};
-
-static uword
-l2_inacl_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  acl_next_index_t next_index;
-  l2_inacl_main_t *msm = &l2_inacl_main;
-  input_acl_main_t *am = &input_acl_main;
-  vnet_classify_main_t *vcm = am->vnet_classify_main;
-  input_acl_table_id_t tid = INPUT_ACL_TABLE_L2;
-  f64 now = vlib_time_now (vm);
-  u32 hits = 0;
-  u32 misses = 0;
-  u32 chain_hits = 0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;	/* number of packets to process */
-  next_index = node->cached_next_index;
-
-  /* First pass: compute hashes */
-  while (n_left_from > 2)
-    {
-      vlib_buffer_t *b0, *b1;
-      u32 bi0, bi1;
-      u8 *h0, *h1;
-      u32 sw_if_index0, sw_if_index1;
-      u32 table_index0, table_index1;
-      vnet_classify_table_t *t0, *t1;
-
-      /* prefetch next iteration */
-      {
-	vlib_buffer_t *p1, *p2;
-
-	p1 = vlib_get_buffer (vm, from[1]);
-	p2 = vlib_get_buffer (vm, from[2]);
-
-	vlib_prefetch_buffer_header (p1, STORE);
-	CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE);
-	vlib_prefetch_buffer_header (p2, STORE);
-	CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-      }
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-
-      bi1 = from[1];
-      b1 = vlib_get_buffer (vm, bi1);
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      table_index0 =
-	am->classify_table_index_by_sw_if_index[tid][sw_if_index0];
-
-      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-      table_index1 =
-	am->classify_table_index_by_sw_if_index[tid][sw_if_index1];
-
-      t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-      t1 = pool_elt_at_index (vcm->tables, table_index1);
-
-      if (t0->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
-	h0 = (void *) vlib_buffer_get_current (b0) + t0->current_data_offset;
-      else
-	h0 = b0->data;
-
-      vnet_buffer (b0)->l2_classify.hash =
-	vnet_classify_hash_packet (t0, (u8 *) h0);
-
-      vnet_classify_prefetch_bucket (t0, vnet_buffer (b0)->l2_classify.hash);
-
-      if (t1->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
-	h1 = (void *) vlib_buffer_get_current (b1) + t1->current_data_offset;
-      else
-	h1 = b1->data;
-
-      vnet_buffer (b1)->l2_classify.hash =
-	vnet_classify_hash_packet (t1, (u8 *) h1);
-
-      vnet_classify_prefetch_bucket (t1, vnet_buffer (b1)->l2_classify.hash);
-
-      vnet_buffer (b0)->l2_classify.table_index = table_index0;
-
-      vnet_buffer (b1)->l2_classify.table_index = table_index1;
-
-      from += 2;
-      n_left_from -= 2;
-    }
-
-  while (n_left_from > 0)
-    {
-      vlib_buffer_t *b0;
-      u32 bi0;
-      u8 *h0;
-      u32 sw_if_index0;
-      u32 table_index0;
-      vnet_classify_table_t *t0;
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      table_index0 =
-	am->classify_table_index_by_sw_if_index[tid][sw_if_index0];
-
-      t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-      if (t0->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
-	h0 = (void *) vlib_buffer_get_current (b0) + t0->current_data_offset;
-      else
-	h0 = b0->data;
-
-      vnet_buffer (b0)->l2_classify.hash =
-	vnet_classify_hash_packet (t0, (u8 *) h0);
-
-      vnet_buffer (b0)->l2_classify.table_index = table_index0;
-      vnet_classify_prefetch_bucket (t0, vnet_buffer (b0)->l2_classify.hash);
-
-      from++;
-      n_left_from--;
-    }
-
-  next_index = node->cached_next_index;
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /* Not enough load/store slots to dual loop... */
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0 = ACL_NEXT_INDEX_DENY;
-	  u32 table_index0;
-	  vnet_classify_table_t *t0;
-	  vnet_classify_entry_t *e0;
-	  u64 hash0;
-	  u8 *h0;
-	  u8 error0;
-
-	  /* Stride 3 seems to work best */
-	  if (PREDICT_TRUE (n_left_from > 3))
-	    {
-	      vlib_buffer_t *p1 = vlib_get_buffer (vm, from[3]);
-	      vnet_classify_table_t *tp1;
-	      u32 table_index1;
-	      u64 phash1;
-
-	      table_index1 = vnet_buffer (p1)->l2_classify.table_index;
-
-	      if (PREDICT_TRUE (table_index1 != ~0))
-		{
-		  tp1 = pool_elt_at_index (vcm->tables, table_index1);
-		  phash1 = vnet_buffer (p1)->l2_classify.hash;
-		  vnet_classify_prefetch_entry (tp1, phash1);
-		}
-	    }
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  table_index0 = vnet_buffer (b0)->l2_classify.table_index;
-	  e0 = 0;
-	  t0 = 0;
-
-	  /* Feature bitmap update */
-	  vnet_buffer (b0)->l2.feature_bitmap &= ~L2INPUT_FEAT_ACL;
-
-	  vnet_buffer (b0)->l2_classify.opaque_index = ~0;
-	  /* Determine the next node */
-	  next0 = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
-						   vnet_buffer (b0)->
-						   l2.feature_bitmap);
-
-	  if (PREDICT_TRUE (table_index0 != ~0))
-	    {
-	      hash0 = vnet_buffer (b0)->l2_classify.hash;
-	      t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-	      if (t0->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
-		h0 =
-		  (void *) vlib_buffer_get_current (b0) +
-		  t0->current_data_offset;
-	      else
-		h0 = b0->data;
-
-	      e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
-	      if (e0)
-		{
-		  vnet_buffer (b0)->l2_classify.opaque_index
-		    = e0->opaque_index;
-		  vlib_buffer_advance (b0, e0->advance);
-
-		  next0 = (e0->next_index < ACL_NEXT_INDEX_N_NEXT) ?
-		    e0->next_index : next0;
-
-		  hits++;
-
-		  error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-		    L2_INACL_ERROR_SESSION_DENY : L2_INACL_ERROR_NONE;
-		  b0->error = node->errors[error0];
-		}
-	      else
-		{
-		  while (1)
-		    {
-		      if (PREDICT_TRUE (t0->next_table_index != ~0))
-			t0 = pool_elt_at_index (vcm->tables,
-						t0->next_table_index);
-		      else
-			{
-			  next0 =
-			    (t0->miss_next_index <
-			     ACL_NEXT_INDEX_N_NEXT) ? t0->miss_next_index :
-			    next0;
-
-			  misses++;
-
-			  error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-			    L2_INACL_ERROR_TABLE_MISS : L2_INACL_ERROR_NONE;
-			  b0->error = node->errors[error0];
-			  break;
-			}
-
-		      if (t0->current_data_flag ==
-			  CLASSIFY_FLAG_USE_CURR_DATA)
-			h0 =
-			  (void *) vlib_buffer_get_current (b0) +
-			  t0->current_data_offset;
-		      else
-			h0 = b0->data;
-
-		      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
-		      e0 = vnet_classify_find_entry
-			(t0, (u8 *) h0, hash0, now);
-		      if (e0)
-			{
-			  vlib_buffer_advance (b0, e0->advance);
-			  next0 = (e0->next_index < ACL_NEXT_INDEX_N_NEXT) ?
-			    e0->next_index : next0;
-			  hits++;
-			  chain_hits++;
-
-			  error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-			    L2_INACL_ERROR_SESSION_DENY : L2_INACL_ERROR_NONE;
-			  b0->error = node->errors[error0];
-			  break;
-			}
-		    }
-		}
-	    }
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      l2_inacl_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	      t->next_index = next0;
-	      t->table_index = t0 ? t0 - vcm->tables : ~0;
-	      t->offset = (t0 && e0) ? vnet_classify_get_offset (t0, e0) : ~0;
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, node->node_index,
-			       L2_INACL_ERROR_MISS, misses);
-  vlib_node_increment_counter (vm, node->node_index,
-			       L2_INACL_ERROR_HIT, hits);
-  vlib_node_increment_counter (vm, node->node_index,
-			       L2_INACL_ERROR_CHAIN_HIT, chain_hits);
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2_inacl_node,static) = {
-  .function = l2_inacl_node_fn,
-  .name = "l2-input-acl",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2_inacl_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2_inacl_error_strings),
-  .error_strings = l2_inacl_error_strings,
-
-  .n_next_nodes = ACL_NEXT_INDEX_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-       [ACL_NEXT_INDEX_DENY]  = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2_inacl_node, l2_inacl_node_fn)
-     clib_error_t *l2_inacl_init (vlib_main_t * vm)
-{
-  l2_inacl_main_t *mp = &l2_inacl_main;
-
-  mp->vlib_main = vm;
-  mp->vnet_main = vnet_get_main ();
-
-  /* Initialize the feature next-node indexes */
-  feat_bitmap_init_next_nodes (vm,
-			       l2_inacl_node.index,
-			       L2INPUT_N_FEAT,
-			       l2input_get_feat_names (),
-			       mp->feat_next_node_index);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2_inacl_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_input_classify.c b/vnet/vnet/l2/l2_input_classify.c
deleted file mode 100644
index 497df192..00000000
--- a/vnet/vnet/l2/l2_input_classify.c
+++ /dev/null
@@ -1,655 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * l2_classify.c
- */
-
-#include <vnet/l2/l2_classify.h>
-#include <vnet/api_errno.h>
-
-/**
- * @file
- * @brief L2 input classifier.
- *
- * @sa @ref vnet/vnet/classify/vnet_classify.c
- * @sa @ref vnet/vnet/classify/vnet_classify.h
- */
-
-/**
- * @brief l2_input_classifier packet trace record.
- */
-typedef struct
-{
-  /** interface handle for the ith packet */
-  u32 sw_if_index;
-  /** graph arc index selected for this packet */
-  u32 next_index;
-  /** classifier table which provided the final result */
-  u32 table_index;
-  /** offset in classifier heap of the corresponding session */
-  u32 session_offset;
-} l2_input_classify_trace_t;
-
-/**
- * @brief vlib node runtime.
- */
-typedef struct
-{
-  /** use-case independent main object pointer */
-  vnet_classify_main_t *vcm;
-  /** l2 input classifier main object pointer */
-  l2_input_classify_main_t *l2cm;
-} l2_input_classify_runtime_t;
-
-/** Packet trace format function. */
-static u8 *
-format_l2_input_classify_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2_input_classify_trace_t *t = va_arg (*args, l2_input_classify_trace_t *);
-
-  s = format (s, "l2-classify: sw_if_index %d, table %d, offset %x, next %d",
-	      t->sw_if_index, t->table_index, t->session_offset,
-	      t->next_index);
-  return s;
-}
-
-/** l2 input classifier main data structure. */
-l2_input_classify_main_t l2_input_classify_main;
-
-vlib_node_registration_t l2_input_classify_node;
-
-#define foreach_l2_input_classify_error               \
-_(MISS, "Classify misses")                      \
-_(HIT, "Classify hits")                         \
-_(CHAIN_HIT, "Classify hits after chain walk")  \
-_(DROP, "L2 Classify Drops")
-
-typedef enum
-{
-#define _(sym,str) L2_INPUT_CLASSIFY_ERROR_##sym,
-  foreach_l2_input_classify_error
-#undef _
-    L2_INPUT_CLASSIFY_N_ERROR,
-} l2_input_classify_error_t;
-
-static char *l2_input_classify_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2_input_classify_error
-#undef _
-};
-
-/**
- * @brief l2 input classifier node.
- * @node l2-input-classify
- *
- * This is the l2 input classifier dispatch node
- *
- * @param vm    vlib_main_t corresponding to the current thread.
- * @param node  vlib_node_runtime_t data for this node.
- * @param frame vlib_frame_t whose contents should be dispatched.
- *
- * @par Graph mechanics: buffer metadata, next index usage
- *
- * @em Uses:
- * - <code>(l2_input_classify_runtime_t *)
- *         rt->classify_table_index_by_sw_if_index</code>
- *	- Head of the per-interface, per-protocol classifier table chain
- * 	  for a specific interface.
- *      - @c ~0 => send pkts to the next feature in the L2 feature chain.
- * - <code>vnet_buffer(b)->sw_if_index[VLIB_RX]</code>
- * 	- Indicates the @c sw_if_index value of the interface that the
- * 	  packet was received on.
- * - <code>vnet_buffer(b0)->l2.feature_bitmap</code>
- * 	- Used to steer packets across l2 features enabled on the interface
- * - <code>(vnet_classify_entry_t) e0->next_index</code>
- *	- Used to steer traffic when the classifier hits on a session
- * - <code>(vnet_classify_entry_t) e0->advance</code>
- *	- Signed quantity applied via <code>vlib_buffer_advance</code>
- * 	  when the classifier hits on a session
- * - <code>(vnet_classify_table_t) t0->miss_next_index</code>
- *	- Used to steer traffic when the classifier misses
- *
- * @em Sets:
- * - <code>vnet_buffer (b0)->l2_classify.table_index</code>
- * 	- Classifier table index of the first classifier table in
- *	the classifier table chain
- * - <code>vnet_buffer (b0)->l2_classify.hash</code>
- * 	- Bounded-index extensible hash corresponding to the
- *	masked fields in the current packet
- * - <code>vnet_buffer (b0)->l2.feature_bitmap</code>
- * 	- Used to steer packets across l2 features enabled on the interface
- * - <code>vnet_buffer (b0)->l2_classify.opaque_index</code>
- * 	- Copied from the classifier session object upon classifier hit
- *
- * @em Counters:
- * - <code>L2_INPUT_CLASSIFY_ERROR_MISS</code> Classifier misses
- * - <code>L2_INPUT_CLASSIFY_ERROR_HIT</code> Classifier hits
- * - <code>L2_INPUT_CLASSIFY_ERROR_CHAIN_HIT</code>
- *   Classifier hits in other than the first table
- */
-
-static uword
-l2_input_classify_node_fn (vlib_main_t * vm,
-			   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  l2_input_classify_next_t next_index;
-  l2_input_classify_main_t *cm = &l2_input_classify_main;
-  vnet_classify_main_t *vcm = cm->vnet_classify_main;
-  l2_input_classify_runtime_t *rt =
-    (l2_input_classify_runtime_t *) node->runtime_data;
-  u32 feature_bitmap;
-  u32 hits = 0;
-  u32 misses = 0;
-  u32 chain_hits = 0;
-  f64 now;
-  u32 n_next_nodes;
-
-  n_next_nodes = node->n_next_nodes;
-
-  now = vlib_time_now (vm);
-
-  n_left_from = frame->n_vectors;
-  from = vlib_frame_vector_args (frame);
-
-  /* First pass: compute hash */
-
-  while (n_left_from > 2)
-    {
-      vlib_buffer_t *b0, *b1;
-      u32 bi0, bi1;
-      ethernet_header_t *h0, *h1;
-      u32 sw_if_index0, sw_if_index1;
-      u16 type0, type1;
-      int type_index0, type_index1;
-      vnet_classify_table_t *t0, *t1;
-      u32 table_index0, table_index1;
-      u64 hash0, hash1;
-
-
-      /* prefetch next iteration */
-      {
-	vlib_buffer_t *p1, *p2;
-
-	p1 = vlib_get_buffer (vm, from[1]);
-	p2 = vlib_get_buffer (vm, from[2]);
-
-	vlib_prefetch_buffer_header (p1, STORE);
-	CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE);
-	vlib_prefetch_buffer_header (p2, STORE);
-	CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-      }
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      h0 = vlib_buffer_get_current (b0);
-
-      bi1 = from[1];
-      b1 = vlib_get_buffer (vm, bi1);
-      h1 = vlib_buffer_get_current (b1);
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      vnet_buffer (b0)->l2_classify.table_index = ~0;
-
-      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-      vnet_buffer (b1)->l2_classify.table_index = ~0;
-
-      /* Select classifier table based on ethertype */
-      type0 = clib_net_to_host_u16 (h0->type);
-      type1 = clib_net_to_host_u16 (h1->type);
-
-      type_index0 = (type0 == ETHERNET_TYPE_IP4)
-	? L2_INPUT_CLASSIFY_TABLE_IP4 : L2_INPUT_CLASSIFY_TABLE_OTHER;
-      type_index0 = (type0 == ETHERNET_TYPE_IP6)
-	? L2_INPUT_CLASSIFY_TABLE_IP6 : type_index0;
-
-      type_index1 = (type1 == ETHERNET_TYPE_IP4)
-	? L2_INPUT_CLASSIFY_TABLE_IP4 : L2_INPUT_CLASSIFY_TABLE_OTHER;
-      type_index1 = (type1 == ETHERNET_TYPE_IP6)
-	? L2_INPUT_CLASSIFY_TABLE_IP6 : type_index1;
-
-      vnet_buffer (b0)->l2_classify.table_index =
-	table_index0 =
-	rt->l2cm->classify_table_index_by_sw_if_index
-	[type_index0][sw_if_index0];
-
-      if (table_index0 != ~0)
-	{
-	  t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-	  vnet_buffer (b0)->l2_classify.hash = hash0 =
-	    vnet_classify_hash_packet (t0, (u8 *) h0);
-	  vnet_classify_prefetch_bucket (t0, hash0);
-	}
-
-      vnet_buffer (b1)->l2_classify.table_index =
-	table_index1 =
-	rt->l2cm->classify_table_index_by_sw_if_index
-	[type_index1][sw_if_index1];
-
-      if (table_index1 != ~0)
-	{
-	  t1 = pool_elt_at_index (vcm->tables, table_index1);
-
-	  vnet_buffer (b1)->l2_classify.hash = hash1 =
-	    vnet_classify_hash_packet (t1, (u8 *) h1);
-	  vnet_classify_prefetch_bucket (t1, hash1);
-	}
-
-      from += 2;
-      n_left_from -= 2;
-    }
-
-  while (n_left_from > 0)
-    {
-      vlib_buffer_t *b0;
-      u32 bi0;
-      ethernet_header_t *h0;
-      u32 sw_if_index0;
-      u16 type0;
-      u32 type_index0;
-      vnet_classify_table_t *t0;
-      u32 table_index0;
-      u64 hash0;
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      h0 = vlib_buffer_get_current (b0);
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      vnet_buffer (b0)->l2_classify.table_index = ~0;
-
-      /* Select classifier table based on ethertype */
-      type0 = clib_net_to_host_u16 (h0->type);
-
-      type_index0 = (type0 == ETHERNET_TYPE_IP4)
-	? L2_INPUT_CLASSIFY_TABLE_IP4 : L2_INPUT_CLASSIFY_TABLE_OTHER;
-      type_index0 = (type0 == ETHERNET_TYPE_IP6)
-	? L2_INPUT_CLASSIFY_TABLE_IP6 : type_index0;
-
-      vnet_buffer (b0)->l2_classify.table_index =
-	table_index0 = rt->l2cm->classify_table_index_by_sw_if_index
-	[type_index0][sw_if_index0];
-
-      if (table_index0 != ~0)
-	{
-	  t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-	  vnet_buffer (b0)->l2_classify.hash = hash0 =
-	    vnet_classify_hash_packet (t0, (u8 *) h0);
-	  vnet_classify_prefetch_bucket (t0, hash0);
-	}
-      from++;
-      n_left_from--;
-    }
-
-  next_index = node->cached_next_index;
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /* Not enough load/store slots to dual loop... */
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0 = ~0;	/* next l2 input feature, please... */
-	  ethernet_header_t *h0;
-	  u32 table_index0;
-	  u64 hash0;
-	  vnet_classify_table_t *t0;
-	  vnet_classify_entry_t *e0;
-
-	  if (PREDICT_TRUE (n_left_from > 2))
-	    {
-	      vlib_buffer_t *p2 = vlib_get_buffer (vm, from[2]);
-	      u64 phash2;
-	      u32 table_index2;
-	      vnet_classify_table_t *tp2;
-
-	      /*
-	       * Prefetch table entry two ahead. Buffer / data
-	       * were prefetched above...
-	       */
-	      table_index2 = vnet_buffer (p2)->l2_classify.table_index;
-
-	      if (PREDICT_TRUE (table_index2 != ~0))
-		{
-		  tp2 = pool_elt_at_index (vcm->tables, table_index2);
-		  phash2 = vnet_buffer (p2)->l2_classify.hash;
-		  vnet_classify_prefetch_entry (tp2, phash2);
-		}
-	    }
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  h0 = vlib_buffer_get_current (b0);
-	  table_index0 = vnet_buffer (b0)->l2_classify.table_index;
-	  e0 = 0;
-	  vnet_buffer (b0)->l2_classify.opaque_index = ~0;
-
-	  /* Remove ourself from the feature bitmap */
-	  feature_bitmap = vnet_buffer (b0)->l2.feature_bitmap
-	    & ~L2INPUT_FEAT_INPUT_CLASSIFY;
-
-	  /* save for next feature graph nodes */
-	  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap;
-
-	  if (PREDICT_TRUE (table_index0 != ~0))
-	    {
-	      hash0 = vnet_buffer (b0)->l2_classify.hash;
-	      t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-	      e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
-	      if (e0)
-		{
-		  vnet_buffer (b0)->l2_classify.opaque_index
-		    = e0->opaque_index;
-		  vlib_buffer_advance (b0, e0->advance);
-		  next0 = (e0->next_index < n_next_nodes) ?
-		    e0->next_index : next0;
-		  hits++;
-		}
-	      else
-		{
-		  while (1)
-		    {
-		      if (t0->next_table_index != ~0)
-			t0 = pool_elt_at_index (vcm->tables,
-						t0->next_table_index);
-		      else
-			{
-			  next0 = (t0->miss_next_index < n_next_nodes) ?
-			    t0->miss_next_index : next0;
-			  misses++;
-			  break;
-			}
-
-		      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
-		      e0 =
-			vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
-		      if (e0)
-			{
-			  vnet_buffer (b0)->l2_classify.opaque_index
-			    = e0->opaque_index;
-			  vlib_buffer_advance (b0, e0->advance);
-			  next0 = (e0->next_index < n_next_nodes) ?
-			    e0->next_index : next0;
-			  hits++;
-			  chain_hits++;
-			  break;
-			}
-		    }
-		}
-	    }
-
-	  if (PREDICT_FALSE (next0 == 0))
-	    b0->error = node->errors[L2_INPUT_CLASSIFY_ERROR_DROP];
-
-	  if (PREDICT_TRUE (next0 == ~0))
-	    {
-	      // Determine the next node
-	      next0 =
-		feat_bitmap_get_next_node_index (cm->feat_next_node_index,
-						 feature_bitmap);
-	    }
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      l2_input_classify_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	      t->table_index = table_index0;
-	      t->next_index = next0;
-	      t->session_offset = e0 ? vnet_classify_get_offset (t0, e0) : 0;
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, node->node_index,
-			       L2_INPUT_CLASSIFY_ERROR_MISS, misses);
-  vlib_node_increment_counter (vm, node->node_index,
-			       L2_INPUT_CLASSIFY_ERROR_HIT, hits);
-  vlib_node_increment_counter (vm, node->node_index,
-			       L2_INPUT_CLASSIFY_ERROR_CHAIN_HIT, chain_hits);
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2_input_classify_node) = {
-  .function = l2_input_classify_node_fn,
-  .name = "l2-input-classify",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2_input_classify_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2_input_classify_error_strings),
-  .error_strings = l2_input_classify_error_strings,
-
-  .runtime_data_bytes = sizeof (l2_input_classify_runtime_t),
-
-  .n_next_nodes = L2_INPUT_CLASSIFY_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [L2_INPUT_CLASSIFY_NEXT_DROP]  = "error-drop",
-    [L2_INPUT_CLASSIFY_NEXT_ETHERNET_INPUT] = "ethernet-input-not-l2",
-    [L2_INPUT_CLASSIFY_NEXT_IP4_INPUT] = "ip4-input",
-    [L2_INPUT_CLASSIFY_NEXT_IP6_INPUT] = "ip6-input",
-    [L2_INPUT_CLASSIFY_NEXT_LI] = "li-hit",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2_input_classify_node,
-			      l2_input_classify_node_fn);
-
-/** l2 input classsifier feature initialization. */
-clib_error_t *
-l2_input_classify_init (vlib_main_t * vm)
-{
-  l2_input_classify_main_t *cm = &l2_input_classify_main;
-  l2_input_classify_runtime_t *rt;
-
-  rt = vlib_node_get_runtime_data (vm, l2_input_classify_node.index);
-
-  cm->vlib_main = vm;
-  cm->vnet_main = vnet_get_main ();
-  cm->vnet_classify_main = &vnet_classify_main;
-
-  /* Initialize the feature next-node indexes */
-  feat_bitmap_init_next_nodes (vm,
-			       l2_input_classify_node.index,
-			       L2INPUT_N_FEAT,
-			       l2input_get_feat_names (),
-			       cm->feat_next_node_index);
-  rt->l2cm = cm;
-  rt->vcm = cm->vnet_classify_main;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2_input_classify_init);
-
-
-/** Enable/disable l2 input classification on a specific interface. */
-void
-vnet_l2_input_classify_enable_disable (u32 sw_if_index, int enable_disable)
-{
-  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_INPUT_CLASSIFY,
-			      (u32) enable_disable);
-}
-
-/** @brief Set l2 per-protocol, per-interface input classification tables.
- *
- *  @param sw_if_index  interface handle
- *  @param ip4_table_index  ip4 classification table index, or ~0
- *  @param ip6_table_index  ip6 classification table index, or ~0
- *  @param other_table_index  non-ip4, non-ip6 classification table index,
- *         or ~0
- *  @returns 0 on success, VNET_API_ERROR_NO_SUCH_TABLE, TABLE2, TABLE3
- *  if the indicated (non-~0) table does not exist.
- */
-
-int
-vnet_l2_input_classify_set_tables (u32 sw_if_index,
-				   u32 ip4_table_index,
-				   u32 ip6_table_index, u32 other_table_index)
-{
-  l2_input_classify_main_t *cm = &l2_input_classify_main;
-  vnet_classify_main_t *vcm = cm->vnet_classify_main;
-
-  /* Assume that we've validated sw_if_index in the API layer */
-
-  if (ip4_table_index != ~0 &&
-      pool_is_free_index (vcm->tables, ip4_table_index))
-    return VNET_API_ERROR_NO_SUCH_TABLE;
-
-  if (ip6_table_index != ~0 &&
-      pool_is_free_index (vcm->tables, ip6_table_index))
-    return VNET_API_ERROR_NO_SUCH_TABLE2;
-
-  if (other_table_index != ~0 &&
-      pool_is_free_index (vcm->tables, other_table_index))
-    return VNET_API_ERROR_NO_SUCH_TABLE3;
-
-  vec_validate
-    (cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP4],
-     sw_if_index);
-
-  vec_validate
-    (cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP6],
-     sw_if_index);
-
-  vec_validate
-    (cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_OTHER],
-     sw_if_index);
-
-  cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP4]
-    [sw_if_index] = ip4_table_index;
-
-  cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP6]
-    [sw_if_index] = ip6_table_index;
-
-  cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_OTHER]
-    [sw_if_index] = other_table_index;
-
-  return 0;
-}
-
-static clib_error_t *
-int_l2_input_classify_command_fn (vlib_main_t * vm,
-				  unformat_input_t * input,
-				  vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index = ~0;
-  u32 ip4_table_index = ~0;
-  u32 ip6_table_index = ~0;
-  u32 other_table_index = ~0;
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "intfc %U", unformat_vnet_sw_interface,
-		    vnm, &sw_if_index))
-	;
-      else if (unformat (input, "ip4-table %d", &ip4_table_index))
-	;
-      else if (unformat (input, "ip6-table %d", &ip6_table_index))
-	;
-      else if (unformat (input, "other-table %d", &other_table_index))
-	;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "interface must be specified");
-
-
-  if (ip4_table_index == ~0 && ip6_table_index == ~0
-      && other_table_index == ~0)
-    {
-      vlib_cli_output (vm, "L2 classification disabled");
-      vnet_l2_input_classify_enable_disable (sw_if_index, 0 /* enable */ );
-      return 0;
-    }
-
-  rv = vnet_l2_input_classify_set_tables (sw_if_index, ip4_table_index,
-					  ip6_table_index, other_table_index);
-  switch (rv)
-    {
-    case 0:
-      vnet_l2_input_classify_enable_disable (sw_if_index, 1 /* enable */ );
-      break;
-
-    default:
-      return clib_error_return (0, "vnet_l2_input_classify_set_tables: %d",
-				rv);
-      break;
-    }
-
-  return 0;
-}
-
-/*?
- * Configure l2 input classification.
- *
- * @cliexpar
- * @cliexstart{set interface l2 input classify intfc <interface-name> [ip4-table <index>] [ip6-table <index>] [other-table <index>]}
- * @cliexend
- * @todo This is incomplete. This needs a detailed description and a
- * practical example.
- ?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (int_l2_input_classify_cli, static) = {
-  .path = "set interface l2 input classify",
-  .short_help =
-  "set interface l2 input classify intfc <interface-name> [ip4-table <n>]\n"
-  "  [ip6-table <n>] [other-table <n>]",
-  .function = int_l2_input_classify_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_input_vtr.c b/vnet/vnet/l2/l2_input_vtr.c
deleted file mode 100644
index 60a39631..00000000
--- a/vnet/vnet/l2/l2_input_vtr.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * l2_input_vtr.c : layer 2 input vlan tag rewrite processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/feat_bitmap.h>
-#include <vnet/l2/l2_vtr.h>
-#include <vnet/l2/l2_input_vtr.h>
-#include <vnet/l2/l2_output.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/cache.h>
-
-
-typedef struct
-{
-  /* per-pkt trace data */
-  u8 src[6];
-  u8 dst[6];
-  u8 raw[12];			/* raw data (vlans) */
-  u32 sw_if_index;
-} l2_invtr_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_l2_invtr_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2_invtr_trace_t *t = va_arg (*args, l2_invtr_trace_t *);
-
-  s = format (s, "l2-input-vtr: sw_if_index %d dst %U src %U data "
-	      "%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
-	      t->sw_if_index,
-	      format_ethernet_address, t->dst,
-	      format_ethernet_address, t->src,
-	      t->raw[0], t->raw[1], t->raw[2], t->raw[3], t->raw[4],
-	      t->raw[5], t->raw[6], t->raw[7], t->raw[8], t->raw[9],
-	      t->raw[10], t->raw[11]);
-  return s;
-}
-
-l2_invtr_main_t l2_invtr_main;
-
-static vlib_node_registration_t l2_invtr_node;
-
-#define foreach_l2_invtr_error			\
-_(L2_INVTR,    "L2 inverter packets")		\
-_(DROP,        "L2 input tag rewrite drops")
-
-typedef enum
-{
-#define _(sym,str) L2_INVTR_ERROR_##sym,
-  foreach_l2_invtr_error
-#undef _
-    L2_INVTR_N_ERROR,
-} l2_invtr_error_t;
-
-static char *l2_invtr_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2_invtr_error
-#undef _
-};
-
-typedef enum
-{
-  L2_INVTR_NEXT_DROP,
-  L2_INVTR_N_NEXT,
-} l2_invtr_next_t;
-
-
-static uword
-l2_invtr_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  l2_invtr_next_t next_index;
-  l2_invtr_main_t *msm = &l2_invtr_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;	/* number of packets to process */
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      /* get space to enqueue frame to graph node "next_index" */
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 6 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-	  u32 sw_if_index0, sw_if_index1;
-	  u32 feature_bitmap0, feature_bitmap1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3, *p4, *p5;
-	    u32 sw_if_index2, sw_if_index3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-	    p4 = vlib_get_buffer (vm, from[4]);
-	    p5 = vlib_get_buffer (vm, from[5]);
-
-	    /* Prefetch the buffer header and packet for the N+2 loop iteration */
-	    vlib_prefetch_buffer_header (p4, LOAD);
-	    vlib_prefetch_buffer_header (p5, LOAD);
-
-	    CLIB_PREFETCH (p4->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p5->data, CLIB_CACHE_LINE_BYTES, STORE);
-
-	    /*
-	     * Prefetch the input config for the N+1 loop iteration
-	     * This depends on the buffer header above
-	     */
-	    sw_if_index2 = vnet_buffer (p2)->sw_if_index[VLIB_RX];
-	    sw_if_index3 = vnet_buffer (p3)->sw_if_index[VLIB_RX];
-	    CLIB_PREFETCH (vec_elt_at_index
-			   (l2output_main.configs, sw_if_index2),
-			   CLIB_CACHE_LINE_BYTES, LOAD);
-	    CLIB_PREFETCH (vec_elt_at_index
-			   (l2output_main.configs, sw_if_index3),
-			   CLIB_CACHE_LINE_BYTES, LOAD);
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  /* bi is "buffer index", b is pointer to the buffer */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  /* RX interface handles */
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-
-	  /* process 2 packets */
-
-	  /* Remove ourself from the feature bitmap */
-	  feature_bitmap0 =
-	    vnet_buffer (b0)->l2.feature_bitmap & ~L2INPUT_FEAT_VTR;
-	  feature_bitmap1 =
-	    vnet_buffer (b1)->l2.feature_bitmap & ~L2INPUT_FEAT_VTR;
-
-	  /* save for next feature graph nodes */
-	  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap0;
-	  vnet_buffer (b1)->l2.feature_bitmap = feature_bitmap1;
-
-	  /* Determine the next node */
-	  next0 = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
-						   feature_bitmap0);
-	  next1 = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
-						   feature_bitmap1);
-
-	  l2_output_config_t *config0;
-	  l2_output_config_t *config1;
-	  config0 = vec_elt_at_index (l2output_main.configs, sw_if_index0);
-	  config1 = vec_elt_at_index (l2output_main.configs, sw_if_index1);
-
-	  if (PREDICT_FALSE (config0->out_vtr_flag))
-	    {
-	      if (config0->output_vtr.push_and_pop_bytes)
-		{
-		  /* perform the tag rewrite on two packets */
-		  if (l2_vtr_process
-		      (b0,
-		       &(vec_elt_at_index
-			 (l2output_main.configs, sw_if_index0)->input_vtr)))
-		    {
-		      /* Drop packet */
-		      next0 = L2_INVTR_NEXT_DROP;
-		      b0->error = node->errors[L2_INVTR_ERROR_DROP];
-		    }
-		}
-	      else if (config0->output_pbb_vtr.push_and_pop_bytes)
-		{
-		  if (l2_pbb_process (b0, &(config0->input_pbb_vtr)))
-		    {
-		      /* Drop packet */
-		      next0 = L2_INVTR_NEXT_DROP;
-		      b0->error = node->errors[L2_INVTR_ERROR_DROP];
-		    }
-		}
-	    }
-	  if (PREDICT_FALSE (config1->out_vtr_flag))
-	    {
-	      if (config1->output_vtr.push_and_pop_bytes)
-		{
-		  if (l2_vtr_process
-		      (b1,
-		       &(vec_elt_at_index
-			 (l2output_main.configs, sw_if_index1)->input_vtr)))
-		    {
-		      /* Drop packet */
-		      next1 = L2_INVTR_NEXT_DROP;
-		      b1->error = node->errors[L2_INVTR_ERROR_DROP];
-		    }
-		}
-	      else if (config1->output_pbb_vtr.push_and_pop_bytes)
-		{
-		  if (l2_pbb_process (b1, &(config1->input_pbb_vtr)))
-		    {
-		      /* Drop packet */
-		      next1 = L2_INVTR_NEXT_DROP;
-		      b1->error = node->errors[L2_INVTR_ERROR_DROP];
-		    }
-		}
-	    }
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2_invtr_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  ethernet_header_t *h0 = vlib_buffer_get_current (b0);
-		  t->sw_if_index = sw_if_index0;
-		  clib_memcpy (t->src, h0->src_address, 6);
-		  clib_memcpy (t->dst, h0->dst_address, 6);
-		  clib_memcpy (t->raw, &h0->type, sizeof (t->raw));
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2_invtr_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  ethernet_header_t *h1 = vlib_buffer_get_current (b1);
-		  t->sw_if_index = sw_if_index0;
-		  clib_memcpy (t->src, h1->src_address, 6);
-		  clib_memcpy (t->dst, h1->dst_address, 6);
-		  clib_memcpy (t->raw, &h1->type, sizeof (t->raw));
-		}
-	    }
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  /* if next0==next1==next_index then nothing special needs to be done */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 sw_if_index0;
-	  u32 feature_bitmap0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-
-	  /* process 1 packet */
-
-	  /* Remove ourself from the feature bitmap */
-	  feature_bitmap0 =
-	    vnet_buffer (b0)->l2.feature_bitmap & ~L2INPUT_FEAT_VTR;
-
-	  /* save for next feature graph nodes */
-	  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap0;
-
-	  /* Determine the next node */
-	  next0 = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
-						   feature_bitmap0);
-
-	  l2_output_config_t *config0;
-	  config0 = vec_elt_at_index (l2output_main.configs, sw_if_index0);
-
-	  if (PREDICT_FALSE (config0->out_vtr_flag))
-	    {
-	      if (config0->output_vtr.push_and_pop_bytes)
-		{
-		  /* perform the tag rewrite on one packet */
-		  if (l2_vtr_process
-		      (b0,
-		       &(vec_elt_at_index
-			 (l2output_main.configs, sw_if_index0)->input_vtr)))
-		    {
-		      /* Drop packet */
-		      next0 = L2_INVTR_NEXT_DROP;
-		      b0->error = node->errors[L2_INVTR_ERROR_DROP];
-		    }
-		}
-	      else if (config0->output_pbb_vtr.push_and_pop_bytes)
-		{
-		  if (l2_pbb_process (b0, &(config0->input_pbb_vtr)))
-		    {
-		      /* Drop packet */
-		      next0 = L2_INVTR_NEXT_DROP;
-		      b0->error = node->errors[L2_INVTR_ERROR_DROP];
-		    }
-		}
-	    }
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      l2_invtr_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      ethernet_header_t *h0 = vlib_buffer_get_current (b0);
-	      t->sw_if_index = sw_if_index0;
-	      clib_memcpy (t->src, h0->src_address, 6);
-	      clib_memcpy (t->dst, h0->dst_address, 6);
-	      clib_memcpy (t->raw, &h0->type, sizeof (t->raw));
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2_invtr_node,static) = {
-  .function = l2_invtr_node_fn,
-  .name = "l2-input-vtr",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2_invtr_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2_invtr_error_strings),
-  .error_strings = l2_invtr_error_strings,
-
-  .n_next_nodes = L2_INVTR_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-       [L2_INVTR_NEXT_DROP]  = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2_invtr_node, l2_invtr_node_fn)
-     clib_error_t *l2_invtr_init (vlib_main_t * vm)
-{
-  l2_invtr_main_t *mp = &l2_invtr_main;
-
-  mp->vlib_main = vm;
-  mp->vnet_main = vnet_get_main ();
-
-  /* Initialize the feature next-node indexes */
-  feat_bitmap_init_next_nodes (vm,
-			       l2_invtr_node.index,
-			       L2INPUT_N_FEAT,
-			       l2input_get_feat_names (),
-			       mp->feat_next_node_index);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2_invtr_init);
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_input_vtr.h b/vnet/vnet/l2/l2_input_vtr.h
deleted file mode 100644
index f248669e..00000000
--- a/vnet/vnet/l2/l2_input_vtr.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * l2_input_vtr.h : layer 2 input vlan tag rewrite processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_vnet_l2_input_vtr_h
-#define included_vnet_l2_input_vtr_h
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/l2/feat_bitmap.h>
-#include <vnet/l2/l2_vtr.h>
-
-
-typedef struct
-{
-
-  /*
-   *  The input vtr data is located in l2_output_config_t because
-   * the same config data is used for the egress EFP Filter check.
-   */
-
-  /* Next nodes for each feature */
-  u32 feat_next_node_index[32];
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} l2_invtr_main_t;
-
-extern l2_invtr_main_t l2_invtr_main;
-
-#endif /* included_vnet_l2_input_vtr_h */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_learn.c b/vnet/vnet/l2/l2_learn.c
deleted file mode 100644
index 7f19f936..00000000
--- a/vnet/vnet/l2/l2_learn.c
+++ /dev/null
@@ -1,597 +0,0 @@
-/*
- * l2_learn.c : layer 2 learning using l2fib
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vlib/cli.h>
-
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/feat_bitmap.h>
-#include <vnet/l2/l2_fib.h>
-#include <vnet/l2/l2_learn.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-
-/**
- * @file
- * @brief Ethernet Bridge Learning.
- *
- * Populate the mac table with entries mapping the packet's source mac + bridge
- * domain ID to the input sw_if_index.
- *
- * Note that learning and forwarding are separate graph nodes. This means that
- * for a set of packets, all learning is performed first, then all nodes are
- * forwarded. The forwarding is done based on the end-state of the mac table,
- * instead of the state after each packet. Thus the forwarding results could
- * differ in certain cases (mac move tests), but this not expected to cause
- * problems in real-world networks. It is much simpler to separate learning
- * and forwarding into separate nodes.
- */
-
-
-typedef struct
-{
-  u8 src[6];
-  u8 dst[6];
-  u32 sw_if_index;
-  u16 bd_index;
-} l2learn_trace_t;
-
-
-/* packet trace format function */
-static u8 *
-format_l2learn_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2learn_trace_t *t = va_arg (*args, l2learn_trace_t *);
-
-  s = format (s, "l2-learn: sw_if_index %d dst %U src %U bd_index %d",
-	      t->sw_if_index,
-	      format_ethernet_address, t->dst,
-	      format_ethernet_address, t->src, t->bd_index);
-  return s;
-}
-
-static vlib_node_registration_t l2learn_node;
-
-#define foreach_l2learn_error				\
-_(L2LEARN,           "L2 learn packets")		\
-_(MISS,              "L2 learn misses")			\
-_(MAC_MOVE,          "L2 mac moves")			\
-_(MAC_MOVE_VIOLATE,  "L2 mac move violations")		\
-_(LIMIT,             "L2 not learned due to limit")	\
-_(HIT,               "L2 learn hits")			\
-_(FILTER_DROP,       "L2 filter mac drops")
-
-typedef enum
-{
-#define _(sym,str) L2LEARN_ERROR_##sym,
-  foreach_l2learn_error
-#undef _
-    L2LEARN_N_ERROR,
-} l2learn_error_t;
-
-static char *l2learn_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2learn_error
-#undef _
-};
-
-typedef enum
-{
-  L2LEARN_NEXT_L2FWD,
-  L2LEARN_NEXT_DROP,
-  L2LEARN_N_NEXT,
-} l2learn_next_t;
-
-
-/** Perform learning on one packet based on the mac table lookup result. */
-
-static_always_inline void
-l2learn_process (vlib_node_runtime_t * node,
-		 l2learn_main_t * msm,
-		 u64 * counter_base,
-		 vlib_buffer_t * b0,
-		 u32 sw_if_index0,
-		 l2fib_entry_key_t * key0,
-		 l2fib_entry_key_t * cached_key,
-		 u32 * bucket0,
-		 l2fib_entry_result_t * result0, u32 * next0, u8 timestamp)
-{
-  u32 feature_bitmap;
-
-  /* Set up the default next node (typically L2FWD) */
-
-  /* Remove ourself from the feature bitmap */
-  feature_bitmap = vnet_buffer (b0)->l2.feature_bitmap & ~L2INPUT_FEAT_LEARN;
-
-  /* Save for next feature graph nodes */
-  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap;
-
-  /* Determine the next node */
-  *next0 = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
-					    feature_bitmap);
-
-  /* Check mac table lookup result */
-
-  if (PREDICT_TRUE (result0->fields.sw_if_index == sw_if_index0))
-    {
-      /*
-       * The entry was in the table, and the sw_if_index matched, the normal case
-       */
-      counter_base[L2LEARN_ERROR_HIT] += 1;
-      if (PREDICT_FALSE (result0->fields.timestamp != timestamp))
-	result0->fields.timestamp = timestamp;
-
-    }
-  else if (result0->raw == ~0)
-    {
-
-      /* The entry was not in table, so add it  */
-
-      counter_base[L2LEARN_ERROR_MISS] += 1;
-
-      if (msm->global_learn_count == msm->global_learn_limit)
-	{
-	  /*
-	   * Global limit reached. Do not learn the mac but forward the packet.
-	   * In the future, limits could also be per-interface or bridge-domain.
-	   */
-	  counter_base[L2LEARN_ERROR_LIMIT] += 1;
-	  goto done;
-
-	}
-      else
-	{
-	  BVT (clib_bihash_kv) kv;
-	  /* It is ok to learn */
-
-	  result0->raw = 0;	/* clear all fields */
-	  result0->fields.sw_if_index = sw_if_index0;
-	  result0->fields.timestamp = timestamp;
-	  kv.key = key0->raw;
-	  kv.value = result0->raw;
-
-	  BV (clib_bihash_add_del) (msm->mac_table, &kv, 1 /* is_add */ );
-
-	  cached_key->raw = ~0;	/* invalidate the cache */
-	  msm->global_learn_count++;
-	}
-
-    }
-  else
-    {
-
-      /* The entry was in the table, but with the wrong sw_if_index mapping (mac move) */
-      counter_base[L2LEARN_ERROR_MAC_MOVE] += 1;
-
-      if (result0->fields.static_mac)
-	{
-	  /*
-	   * Don't overwrite a static mac
-	   * TODO: Check violation policy. For now drop the packet
-	   */
-	  b0->error = node->errors[L2LEARN_ERROR_MAC_MOVE_VIOLATE];
-	  *next0 = L2LEARN_NEXT_DROP;
-	}
-      else
-	{
-	  /*
-	   * Update the entry
-	   * TODO: may want to rate limit mac moves
-	   * TODO: check global/bridge domain/interface learn limits
-	   */
-	  BVT (clib_bihash_kv) kv;
-
-	  result0->raw = 0;	/* clear all fields */
-	  result0->fields.sw_if_index = sw_if_index0;
-	  result0->fields.timestamp = timestamp;
-
-	  kv.key = key0->raw;
-	  kv.value = result0->raw;
-
-	  cached_key->raw = ~0;	/* invalidate the cache */
-
-	  BV (clib_bihash_add_del) (msm->mac_table, &kv, 1 /* is_add */ );
-	}
-    }
-
-  if (result0->fields.filter)
-    {
-      /* drop packet because lookup matched a filter mac entry */
-
-      if (*next0 != L2LEARN_NEXT_DROP)
-	{
-	  /* if we're not already dropping the packet, do it now */
-	  b0->error = node->errors[L2LEARN_ERROR_FILTER_DROP];
-	  *next0 = L2LEARN_NEXT_DROP;
-	}
-    }
-
-done:
-  return;
-}
-
-
-static uword
-l2learn_node_fn (vlib_main_t * vm,
-		 vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  l2learn_next_t next_index;
-  l2learn_main_t *msm = &l2learn_main;
-  vlib_node_t *n = vlib_get_node (vm, l2learn_node.index);
-  u32 node_counter_base_index = n->error_heap_index;
-  vlib_error_main_t *em = &vm->error_main;
-  l2fib_entry_key_t cached_key;
-  l2fib_entry_result_t cached_result;
-  u8 timestamp = (u8) (vlib_time_now (vm) / 60);
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;	/* number of packets to process */
-  next_index = node->cached_next_index;
-
-  /* Clear the one-entry cache in case mac table was updated */
-  cached_key.raw = ~0;
-  cached_result.raw = ~0;	/* warning be gone */
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      /* get space to enqueue frame to graph node "next_index" */
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 8 && n_left_to_next >= 4)
-	{
-	  u32 bi0, bi1, bi2, bi3;
-	  vlib_buffer_t *b0, *b1, *b2, *b3;
-	  u32 next0, next1, next2, next3;
-	  u32 sw_if_index0, sw_if_index1, sw_if_index2, sw_if_index3;
-	  ethernet_header_t *h0, *h1, *h2, *h3;
-	  l2fib_entry_key_t key0, key1, key2, key3;
-	  l2fib_entry_result_t result0, result1, result2, result3;
-	  u32 bucket0, bucket1, bucket2, bucket3;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p4, *p5, *p6, *p7;;
-
-	    p4 = vlib_get_buffer (vm, from[4]);
-	    p5 = vlib_get_buffer (vm, from[5]);
-	    p6 = vlib_get_buffer (vm, from[6]);
-	    p7 = vlib_get_buffer (vm, from[7]);
-
-	    vlib_prefetch_buffer_header (p4, LOAD);
-	    vlib_prefetch_buffer_header (p5, LOAD);
-	    vlib_prefetch_buffer_header (p6, LOAD);
-	    vlib_prefetch_buffer_header (p7, LOAD);
-
-	    CLIB_PREFETCH (p4->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p5->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p6->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p7->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  /* bi is "buffer index", b is pointer to the buffer */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  to_next[2] = bi2 = from[2];
-	  to_next[3] = bi3 = from[3];
-	  from += 4;
-	  to_next += 4;
-	  n_left_from -= 4;
-	  n_left_to_next -= 4;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-	  b2 = vlib_get_buffer (vm, bi2);
-	  b3 = vlib_get_buffer (vm, bi3);
-
-	  /* RX interface handles */
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-	  sw_if_index2 = vnet_buffer (b2)->sw_if_index[VLIB_RX];
-	  sw_if_index3 = vnet_buffer (b3)->sw_if_index[VLIB_RX];
-
-	  /* Process 4 x pkts */
-
-	  h0 = vlib_buffer_get_current (b0);
-	  h1 = vlib_buffer_get_current (b1);
-	  h2 = vlib_buffer_get_current (b2);
-	  h3 = vlib_buffer_get_current (b3);
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2learn_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->sw_if_index = sw_if_index0;
-		  t->bd_index = vnet_buffer (b0)->l2.bd_index;
-		  clib_memcpy (t->src, h0->src_address, 6);
-		  clib_memcpy (t->dst, h0->dst_address, 6);
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2learn_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  t->sw_if_index = sw_if_index1;
-		  t->bd_index = vnet_buffer (b1)->l2.bd_index;
-		  clib_memcpy (t->src, h1->src_address, 6);
-		  clib_memcpy (t->dst, h1->dst_address, 6);
-		}
-	      if (b2->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2learn_trace_t *t =
-		    vlib_add_trace (vm, node, b2, sizeof (*t));
-		  t->sw_if_index = sw_if_index2;
-		  t->bd_index = vnet_buffer (b2)->l2.bd_index;
-		  clib_memcpy (t->src, h2->src_address, 6);
-		  clib_memcpy (t->dst, h2->dst_address, 6);
-		}
-	      if (b3->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2learn_trace_t *t =
-		    vlib_add_trace (vm, node, b3, sizeof (*t));
-		  t->sw_if_index = sw_if_index3;
-		  t->bd_index = vnet_buffer (b3)->l2.bd_index;
-		  clib_memcpy (t->src, h3->src_address, 6);
-		  clib_memcpy (t->dst, h3->dst_address, 6);
-		}
-	    }
-
-	  /* process 4 pkts */
-	  vlib_node_increment_counter (vm, l2learn_node.index,
-				       L2LEARN_ERROR_L2LEARN, 4);
-
-	  l2fib_lookup_4 (msm->mac_table, &cached_key, &cached_result,
-			  h0->src_address,
-			  h1->src_address,
-			  h2->src_address,
-			  h3->src_address,
-			  vnet_buffer (b0)->l2.bd_index,
-			  vnet_buffer (b1)->l2.bd_index,
-			  vnet_buffer (b2)->l2.bd_index,
-			  vnet_buffer (b3)->l2.bd_index,
-			  &key0, &key1, &key2, &key3,
-			  &bucket0, &bucket1, &bucket2, &bucket3,
-			  &result0, &result1, &result2, &result3);
-
-	  l2learn_process (node, msm, &em->counters[node_counter_base_index],
-			   b0, sw_if_index0, &key0, &cached_key,
-			   &bucket0, &result0, &next0, timestamp);
-
-	  l2learn_process (node, msm, &em->counters[node_counter_base_index],
-			   b1, sw_if_index1, &key1, &cached_key,
-			   &bucket1, &result1, &next1, timestamp);
-
-	  l2learn_process (node, msm, &em->counters[node_counter_base_index],
-			   b2, sw_if_index2, &key2, &cached_key,
-			   &bucket2, &result2, &next2, timestamp);
-
-	  l2learn_process (node, msm, &em->counters[node_counter_base_index],
-			   b3, sw_if_index3, &key3, &cached_key,
-			   &bucket3, &result3, &next3, timestamp);
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  /* if next0==next1==next_index then nothing special needs to be done */
-	  vlib_validate_buffer_enqueue_x4 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, bi2, bi3,
-					   next0, next1, next2, next3);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 sw_if_index0;
-	  ethernet_header_t *h0;
-	  l2fib_entry_key_t key0;
-	  l2fib_entry_result_t result0;
-	  u32 bucket0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-
-	  h0 = vlib_buffer_get_current (b0);
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      l2learn_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = sw_if_index0;
-	      t->bd_index = vnet_buffer (b0)->l2.bd_index;
-	      clib_memcpy (t->src, h0->src_address, 6);
-	      clib_memcpy (t->dst, h0->dst_address, 6);
-	    }
-
-	  /* process 1 pkt */
-	  vlib_node_increment_counter (vm, l2learn_node.index,
-				       L2LEARN_ERROR_L2LEARN, 1);
-
-
-	  l2fib_lookup_1 (msm->mac_table, &cached_key, &cached_result,
-			  h0->src_address, vnet_buffer (b0)->l2.bd_index,
-			  &key0, &bucket0, &result0);
-
-	  l2learn_process (node, msm, &em->counters[node_counter_base_index],
-			   b0, sw_if_index0, &key0, &cached_key,
-			   &bucket0, &result0, &next0, timestamp);
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2learn_node,static) = {
-  .function = l2learn_node_fn,
-  .name = "l2-learn",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2learn_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2learn_error_strings),
-  .error_strings = l2learn_error_strings,
-
-  .n_next_nodes = L2LEARN_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-        [L2LEARN_NEXT_DROP] = "error-drop",
-        [L2LEARN_NEXT_L2FWD] = "l2-fwd",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2learn_node, l2learn_node_fn)
-     clib_error_t *l2learn_init (vlib_main_t * vm)
-{
-  l2learn_main_t *mp = &l2learn_main;
-
-  mp->vlib_main = vm;
-  mp->vnet_main = vnet_get_main ();
-
-  /* Initialize the feature next-node indexes */
-  feat_bitmap_init_next_nodes (vm,
-			       l2learn_node.index,
-			       L2INPUT_N_FEAT,
-			       l2input_get_feat_names (),
-			       mp->feat_next_node_index);
-
-  /* init the hash table ptr */
-  mp->mac_table = get_mac_table ();
-
-  /*
-   * Set the default number of dynamically learned macs to the number
-   * of buckets.
-   */
-  mp->global_learn_limit = L2FIB_NUM_BUCKETS * 16;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2learn_init);
-
-
-/**
- * Set subinterface learn enable/disable.
- * The CLI format is:
- *    set interface l2 learn <interface> [disable]
- */
-static clib_error_t *
-int_learn (vlib_main_t * vm,
-	   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index;
-  u32 enable;
-
-  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  enable = 1;
-  if (unformat (input, "disable"))
-    {
-      enable = 0;
-    }
-
-  /* set the interface flag */
-  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_LEARN, enable);
-
-done:
-  return error;
-}
-
-/*?
- * Layer 2 learning can be enabled and disabled on each
- * interface and on each bridge-domain. Use this command to
- * manage interfaces. It is enabled by default.
- *
- * @cliexpar
- * Example of how to enable learning:
- * @cliexcmd{set interface l2 learn GigabitEthernet0/8/0}
- * Example of how to disable learning:
- * @cliexcmd{set interface l2 learn GigabitEthernet0/8/0 disable}
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (int_learn_cli, static) = {
-  .path = "set interface l2 learn",
-  .short_help = "set interface l2 learn <interface> [disable]",
-  .function = int_learn,
-};
-/* *INDENT-ON* */
-
-
-static clib_error_t *
-l2learn_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  l2learn_main_t *mp = &l2learn_main;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "limit %d", &mp->global_learn_limit))
-	;
-
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-
-  return 0;
-}
-
-VLIB_CONFIG_FUNCTION (l2learn_config, "l2learn");
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_learn.h b/vnet/vnet/l2/l2_learn.h
deleted file mode 100644
index 5bb1130b..00000000
--- a/vnet/vnet/l2/l2_learn.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * l2_learn.c : layer 2 learning using l2fib
- *
- * Copyright (c) 2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_l2learn_h
-#define included_l2learn_h
-
-#include <vlib/vlib.h>
-#include <vnet/ethernet/ethernet.h>
-
-
-typedef struct
-{
-
-  /* Hash table */
-  BVT (clib_bihash) * mac_table;
-
-  /* number of dynamically learned mac entries */
-  u32 global_learn_count;
-
-  /* maximum number of dynamically learned mac entries */
-  u32 global_learn_limit;
-
-  /* Next nodes for each feature */
-  u32 feat_next_node_index[32];
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} l2learn_main_t;
-
-
-l2learn_main_t l2learn_main;
-
-extern vlib_node_registration_t l2fib_mac_age_scanner_process_node;
-
-enum
-{
-  L2_MAC_AGE_PROCESS_EVENT_START = 1,
-  L2_MAC_AGE_PROCESS_EVENT_STOP = 2,
-} l2_mac_age_process_event_t;
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_output.c b/vnet/vnet/l2/l2_output.c
deleted file mode 100644
index 953fcb02..00000000
--- a/vnet/vnet/l2/l2_output.c
+++ /dev/null
@@ -1,708 +0,0 @@
-/*
- * l2_output.c : layer 2 output packet processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vlib/cli.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/l2/feat_bitmap.h>
-#include <vnet/l2/l2_output.h>
-
-
-/* Feature graph node names */
-static char *l2output_feat_names[] = {
-#define _(sym,name) name,
-  foreach_l2output_feat
-#undef _
-};
-
-char **
-l2output_get_feat_names (void)
-{
-  return l2output_feat_names;
-}
-
-l2output_main_t l2output_main;
-
-typedef struct
-{
-  /* per-pkt trace data */
-  u8 src[6];
-  u8 dst[6];
-  u32 sw_if_index;
-} l2output_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_l2output_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2output_trace_t *t = va_arg (*args, l2output_trace_t *);
-
-  s = format (s, "l2-output: sw_if_index %d dst %U src %U",
-	      t->sw_if_index,
-	      format_ethernet_address, t->dst,
-	      format_ethernet_address, t->src);
-  return s;
-}
-
-
-static char *l2output_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2output_error
-#undef _
-};
-
-/**
- * Check for split horizon violations.
- * Return 0 if split horizon check passes, otherwise return non-zero.
- * Packets should not be transmitted out an interface with the same
- * split-horizon group as the input interface, except if the @c shg is 0
- * in which case the check always passes.
- */
-static_always_inline u32
-split_horizon_violation (u8 shg1, u8 shg2)
-{
-  if (PREDICT_TRUE (shg1 == 0))
-    {
-      return 0;
-    }
-  else
-    {
-      return shg1 == shg2;
-    }
-}
-
-static_always_inline void
-l2output_vtr (vlib_node_runtime_t * node, l2_output_config_t * config,
-	      u32 feature_bitmap, vlib_buffer_t * b, u32 * next)
-{
-  if (PREDICT_FALSE (config->out_vtr_flag))
-    {
-      /* Perform pre-vtr EFP filter check if configured */
-      if (config->output_vtr.push_and_pop_bytes)
-	{
-	  /*
-	   * Perform output vlan tag rewrite and the pre-vtr EFP filter check.
-	   * The EFP Filter only needs to be run if there is an output VTR
-	   * configured. The flag for the post-vtr EFP Filter node is used
-	   * to trigger the pre-vtr check as well.
-	   */
-	  u32 failed1 = (feature_bitmap & L2OUTPUT_FEAT_EFP_FILTER)
-	    && (l2_efp_filter_process (b, &(config->input_vtr)));
-	  u32 failed2 = l2_vtr_process (b, &(config->output_vtr));
-
-	  if (PREDICT_FALSE (failed1 | failed2))
-	    {
-	      *next = L2OUTPUT_NEXT_DROP;
-	      if (failed2)
-		{
-		  b->error = node->errors[L2OUTPUT_ERROR_VTR_DROP];
-		}
-	      if (failed1)
-		{
-		  b->error = node->errors[L2OUTPUT_ERROR_EFP_DROP];
-		}
-	    }
-	}
-      // perform the PBB rewrite
-      else if (config->output_pbb_vtr.push_and_pop_bytes)
-	{
-	  u32 failed = l2_pbb_process (b, &(config->output_pbb_vtr));
-	  if (PREDICT_FALSE (failed))
-	    {
-	      *next = L2OUTPUT_NEXT_DROP;
-	      b->error = node->errors[L2OUTPUT_ERROR_VTR_DROP];
-	    }
-	}
-    }
-}
-
-
-static vlib_node_registration_t l2output_node;
-
-static uword
-l2output_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  l2output_next_t next_index;
-  l2output_main_t *msm = &l2output_main;
-  u32 cached_sw_if_index;
-  u32 cached_next_index;
-
-  /* Invalidate cache */
-  cached_sw_if_index = ~0;
-  cached_next_index = ~0;	/* warning be gone */
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;	/* number of packets to process */
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      /* get space to enqueue frame to graph node "next_index" */
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 8 && n_left_to_next >= 4)
-	{
-	  u32 bi0, bi1, bi2, bi3;
-	  vlib_buffer_t *b0, *b1, *b2, *b3;
-	  u32 next0, next1, next2, next3;
-	  u32 sw_if_index0, sw_if_index1, sw_if_index2, sw_if_index3;
-	  ethernet_header_t *h0, *h1, *h2, *h3;
-	  l2_output_config_t *config0, *config1, *config2, *config3;
-	  u32 feature_bitmap0, feature_bitmap1;
-	  u32 feature_bitmap2, feature_bitmap3;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p4, *p5, *p6, *p7;
-
-	    p4 = vlib_get_buffer (vm, from[4]);
-	    p5 = vlib_get_buffer (vm, from[5]);
-	    p6 = vlib_get_buffer (vm, from[6]);
-	    p7 = vlib_get_buffer (vm, from[7]);
-
-	    /* Prefetch the buffer header for the N+2 loop iteration */
-	    vlib_prefetch_buffer_header (p4, LOAD);
-	    vlib_prefetch_buffer_header (p5, LOAD);
-	    vlib_prefetch_buffer_header (p6, LOAD);
-	    vlib_prefetch_buffer_header (p7, LOAD);
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  /* bi is "buffer index", b is pointer to the buffer */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  to_next[2] = bi2 = from[2];
-	  to_next[3] = bi3 = from[3];
-	  from += 4;
-	  to_next += 4;
-	  n_left_from -= 4;
-	  n_left_to_next -= 4;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-	  b2 = vlib_get_buffer (vm, bi2);
-	  b3 = vlib_get_buffer (vm, bi3);
-
-	  /* TX interface handles */
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_TX];
-	  sw_if_index2 = vnet_buffer (b2)->sw_if_index[VLIB_TX];
-	  sw_if_index3 = vnet_buffer (b3)->sw_if_index[VLIB_TX];
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      h0 = vlib_buffer_get_current (b0);
-	      h1 = vlib_buffer_get_current (b1);
-	      h2 = vlib_buffer_get_current (b2);
-	      h3 = vlib_buffer_get_current (b3);
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2output_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->sw_if_index = sw_if_index0;
-		  clib_memcpy (t->src, h0->src_address, 6);
-		  clib_memcpy (t->dst, h0->dst_address, 6);
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2output_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  t->sw_if_index = sw_if_index1;
-		  clib_memcpy (t->src, h1->src_address, 6);
-		  clib_memcpy (t->dst, h1->dst_address, 6);
-		}
-	      if (b2->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2output_trace_t *t =
-		    vlib_add_trace (vm, node, b2, sizeof (*t));
-		  t->sw_if_index = sw_if_index2;
-		  clib_memcpy (t->src, h2->src_address, 6);
-		  clib_memcpy (t->dst, h2->dst_address, 6);
-		}
-	      if (b3->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2output_trace_t *t =
-		    vlib_add_trace (vm, node, b3, sizeof (*t));
-		  t->sw_if_index = sw_if_index3;
-		  clib_memcpy (t->src, h3->src_address, 6);
-		  clib_memcpy (t->dst, h3->dst_address, 6);
-		}
-	    }
-
-	  vlib_node_increment_counter (vm, l2output_node.index,
-				       L2OUTPUT_ERROR_L2OUTPUT, 4);
-
-	  /* Get config for the output interface */
-	  config0 = vec_elt_at_index (msm->configs, sw_if_index0);
-	  config1 = vec_elt_at_index (msm->configs, sw_if_index1);
-	  config2 = vec_elt_at_index (msm->configs, sw_if_index2);
-	  config3 = vec_elt_at_index (msm->configs, sw_if_index3);
-
-	  /*
-	   * Get features from the config
-	   * TODO: mask out any non-applicable features
-	   */
-	  feature_bitmap0 = config0->feature_bitmap;
-	  feature_bitmap1 = config1->feature_bitmap;
-	  feature_bitmap2 = config2->feature_bitmap;
-	  feature_bitmap3 = config3->feature_bitmap;
-
-	  /* Determine next node */
-	  l2_output_dispatch (msm->vlib_main,
-			      msm->vnet_main,
-			      node,
-			      l2output_node.index,
-			      &cached_sw_if_index,
-			      &cached_next_index,
-			      &msm->next_nodes,
-			      b0, sw_if_index0, feature_bitmap0, &next0);
-
-	  l2_output_dispatch (msm->vlib_main,
-			      msm->vnet_main,
-			      node,
-			      l2output_node.index,
-			      &cached_sw_if_index,
-			      &cached_next_index,
-			      &msm->next_nodes,
-			      b1, sw_if_index1, feature_bitmap1, &next1);
-
-	  l2_output_dispatch (msm->vlib_main,
-			      msm->vnet_main,
-			      node,
-			      l2output_node.index,
-			      &cached_sw_if_index,
-			      &cached_next_index,
-			      &msm->next_nodes,
-			      b2, sw_if_index2, feature_bitmap2, &next2);
-
-	  l2_output_dispatch (msm->vlib_main,
-			      msm->vnet_main,
-			      node,
-			      l2output_node.index,
-			      &cached_sw_if_index,
-			      &cached_next_index,
-			      &msm->next_nodes,
-			      b3, sw_if_index3, feature_bitmap3, &next3);
-
-	  l2output_vtr (node, config0, feature_bitmap0, b0, &next0);
-	  l2output_vtr (node, config1, feature_bitmap1, b1, &next1);
-	  l2output_vtr (node, config2, feature_bitmap2, b2, &next2);
-	  l2output_vtr (node, config3, feature_bitmap3, b3, &next3);
-
-	  /*
-	   * Perform the split horizon check
-	   * The check can only fail for non-zero shg's
-	   */
-	  if (PREDICT_FALSE (config0->shg + config1->shg +
-			     config2->shg + config3->shg))
-	    {
-	      /* one of the checks might fail, check both */
-	      if (split_horizon_violation
-		  (config0->shg, vnet_buffer (b0)->l2.shg))
-		{
-		  next0 = L2OUTPUT_NEXT_DROP;
-		  b0->error = node->errors[L2OUTPUT_ERROR_SHG_DROP];
-		}
-	      if (split_horizon_violation
-		  (config1->shg, vnet_buffer (b1)->l2.shg))
-		{
-		  next1 = L2OUTPUT_NEXT_DROP;
-		  b1->error = node->errors[L2OUTPUT_ERROR_SHG_DROP];
-		}
-	      if (split_horizon_violation
-		  (config2->shg, vnet_buffer (b2)->l2.shg))
-		{
-		  next2 = L2OUTPUT_NEXT_DROP;
-		  b2->error = node->errors[L2OUTPUT_ERROR_SHG_DROP];
-		}
-	      if (split_horizon_violation
-		  (config3->shg, vnet_buffer (b3)->l2.shg))
-		{
-		  next3 = L2OUTPUT_NEXT_DROP;
-		  b3->error = node->errors[L2OUTPUT_ERROR_SHG_DROP];
-		}
-	    }
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  /* if next0==next1==next_index then nothing special needs to be done */
-	  vlib_validate_buffer_enqueue_x4 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, bi2, bi3,
-					   next0, next1, next2, next3);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 sw_if_index0;
-	  ethernet_header_t *h0;
-	  l2_output_config_t *config0;
-	  u32 feature_bitmap0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      l2output_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = sw_if_index0;
-	      h0 = vlib_buffer_get_current (b0);
-	      clib_memcpy (t->src, h0->src_address, 6);
-	      clib_memcpy (t->dst, h0->dst_address, 6);
-	    }
-
-	  vlib_node_increment_counter (vm, l2output_node.index,
-				       L2OUTPUT_ERROR_L2OUTPUT, 1);
-
-	  /* Get config for the output interface */
-	  config0 = vec_elt_at_index (msm->configs, sw_if_index0);
-
-	  /*
-	   * Get features from the config
-	   * TODO: mask out any non-applicable features
-	   */
-	  feature_bitmap0 = config0->feature_bitmap;
-
-	  /* Determine next node */
-	  l2_output_dispatch (msm->vlib_main,
-			      msm->vnet_main,
-			      node,
-			      l2output_node.index,
-			      &cached_sw_if_index,
-			      &cached_next_index,
-			      &msm->next_nodes,
-			      b0, sw_if_index0, feature_bitmap0, &next0);
-
-	  l2output_vtr (node, config0, feature_bitmap0, b0, &next0);
-
-	  /* Perform the split horizon check */
-	  if (PREDICT_FALSE
-	      (split_horizon_violation
-	       (config0->shg, vnet_buffer (b0)->l2.shg)))
-	    {
-	      next0 = L2OUTPUT_NEXT_DROP;
-	      b0->error = node->errors[L2OUTPUT_ERROR_SHG_DROP];
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2output_node,static) = {
-  .function = l2output_node_fn,
-  .name = "l2-output",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2output_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2output_error_strings),
-  .error_strings = l2output_error_strings,
-
-  .n_next_nodes = L2OUTPUT_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-        [L2OUTPUT_NEXT_DROP] = "error-drop",
-        [L2OUTPUT_NEXT_BAD_INTF] = "l2-output-bad-intf",
-  },
-};
-/* *INDENT-ON* */
-
-
-#define foreach_l2output_bad_intf_error	\
-_(DROP,     "L2 output to interface not in L2 mode or deleted")
-
-static char *l2output_bad_intf_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2output_bad_intf_error
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) L2OUTPUT_BAD_INTF_ERROR_##sym,
-  foreach_l2output_bad_intf_error
-#undef _
-    L2OUTPUT_BAD_INTF_N_ERROR,
-} l2output_bad_intf_error_t;
-
-
-/**
- * Output node for interfaces/tunnels which was in L2 mode but were changed
- * to L3 mode or possibly deleted thereafter. On changing forwarding mode
- * of any tunnel/interface from L2 to L3, its entry in l2_output_main table
- * next_nodes.output_node_index_vec[sw_if_index] MUST be set to the value of
- * L2OUTPUT_NEXT_BAD_INTF. Thus, if there are stale entries in the L2FIB for
- * this sw_if_index, l2-output will send packets for this sw_if_index to the
- * l2-output-bad-intf node which just setup the proper drop reason before
- * sending packets to the error-drop node to drop the packet. Then, stale L2FIB
- * entries for delted tunnels won't cause possible packet or memory corrpution.
- */
-static vlib_node_registration_t l2output_bad_intf_node;
-
-static uword
-l2output_bad_intf_node_fn (vlib_main_t * vm,
-			   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  l2output_next_t next_index = 0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;	/* number of packets to process */
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      /* get space to enqueue frame to graph node "next_index" */
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-	  b0->error = node->errors[L2OUTPUT_BAD_INTF_ERROR_DROP];
-	  b1->error = node->errors[L2OUTPUT_BAD_INTF_ERROR_DROP];
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b0->error = node->errors[L2OUTPUT_BAD_INTF_ERROR_DROP];
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2output_bad_intf_node,static) = {
-  .function = l2output_bad_intf_node_fn,
-  .name = "l2-output-bad-intf",
-  .vector_size = sizeof (u32),
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors =  ARRAY_LEN(l2output_bad_intf_error_strings),
-  .error_strings = l2output_bad_intf_error_strings,
-
-  .n_next_nodes = 1,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-	[0] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2output_node, l2output_node_fn)
-     clib_error_t *l2output_init (vlib_main_t * vm)
-{
-  l2output_main_t *mp = &l2output_main;
-
-  mp->vlib_main = vm;
-  mp->vnet_main = vnet_get_main ();
-
-  /* Create the config vector */
-  vec_validate (mp->configs, 100);
-  /* Until we hook up the CLI config, just create 100 sw interface entries  and zero them */
-
-  /* Initialize the feature next-node indexes */
-  feat_bitmap_init_next_nodes (vm,
-			       l2output_node.index,
-			       L2OUTPUT_N_FEAT,
-			       l2output_get_feat_names (),
-			       mp->next_nodes.feat_next_node_index);
-
-  /* Initialize the output node mapping table */
-  l2output_init_output_node_vec (&mp->next_nodes.output_node_index_vec);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2output_init);
-
-typedef struct
-{
-  u32 node_index;
-  u32 sw_if_index;
-} output_node_mapping_rpc_args_t;
-
-static void output_node_rpc_callback (output_node_mapping_rpc_args_t * a);
-
-static void
-output_node_mapping_send_rpc (u32 node_index, u32 sw_if_index)
-{
-  output_node_mapping_rpc_args_t args;
-  void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
-
-  args.node_index = node_index;
-  args.sw_if_index = sw_if_index;
-
-  vl_api_rpc_call_main_thread (output_node_rpc_callback,
-			       (u8 *) & args, sizeof (args));
-}
-
-
-/** Create a mapping in the next node mapping table for the given sw_if_index. */
-u32
-l2output_create_output_node_mapping (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 node_index,	/* index of current node */
-				     u32 * output_node_index_vec,
-				     u32 sw_if_index)
-{
-
-  u32 next;			/* index of next graph node */
-  vnet_hw_interface_t *hw0;
-  u32 *node;
-
-  hw0 = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
-
-  uword cpu_number;
-
-  cpu_number = os_get_cpu_number ();
-
-  if (cpu_number)
-    {
-      u32 oldflags;
-
-      oldflags = __sync_fetch_and_or (&hw0->flags,
-				      VNET_HW_INTERFACE_FLAG_L2OUTPUT_MAPPED);
-
-      if ((oldflags & VNET_HW_INTERFACE_FLAG_L2OUTPUT_MAPPED))
-	return L2OUTPUT_NEXT_DROP;
-
-      output_node_mapping_send_rpc (node_index, sw_if_index);
-      return L2OUTPUT_NEXT_DROP;
-    }
-
-  /* dynamically create graph node arc  */
-  next = vlib_node_add_next (vlib_main, node_index, hw0->output_node_index);
-
-  /* Initialize vector with the mapping */
-
-  node = vec_elt_at_index (output_node_index_vec, sw_if_index);
-  *node = next;
-
-  /* reset mapping bit, includes memory barrier */
-  __sync_fetch_and_and (&hw0->flags, ~VNET_HW_INTERFACE_FLAG_L2OUTPUT_MAPPED);
-
-  return next;
-}
-
-void
-output_node_rpc_callback (output_node_mapping_rpc_args_t * a)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vnet_main_t *vnm = vnet_get_main ();
-  l2output_main_t *mp = &l2output_main;
-
-  (void) l2output_create_output_node_mapping
-    (vm, vnm, a->node_index, mp->next_nodes.output_node_index_vec,
-     a->sw_if_index);
-}
-
-/* Get a pointer to the config for the given interface */
-l2_output_config_t *
-l2output_intf_config (u32 sw_if_index)
-{
-  l2output_main_t *mp = &l2output_main;
-
-  vec_validate (mp->configs, sw_if_index);
-  return vec_elt_at_index (mp->configs, sw_if_index);
-}
-
-/** Enable (or disable) the feature in the bitmap for the given interface. */
-void
-l2output_intf_bitmap_enable (u32 sw_if_index, u32 feature_bitmap, u32 enable)
-{
-  l2output_main_t *mp = &l2output_main;
-  l2_output_config_t *config;
-
-  vec_validate (mp->configs, sw_if_index);
-  config = vec_elt_at_index (mp->configs, sw_if_index);
-
-  if (enable)
-    {
-      config->feature_bitmap |= feature_bitmap;
-    }
-  else
-    {
-      config->feature_bitmap &= ~feature_bitmap;
-    }
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_output.h b/vnet/vnet/l2/l2_output.h
deleted file mode 100644
index c683b1ad..00000000
--- a/vnet/vnet/l2/l2_output.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * l2_output.h : layer 2 output packet processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_vnet_l2_output_h
-#define included_vnet_l2_output_h
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/l2/feat_bitmap.h>
-#include <vnet/l2/l2_vtr.h>
-
-
-/* The L2 output feature configuration, a per-interface struct */
-typedef struct
-{
-
-  u32 feature_bitmap;
-
-  /*
-   * vlan tag rewrite for ingress and egress
-   * ingress vtr is located here because the same config data is used for
-   * the egress EFP filter check
-   */
-  vtr_config_t input_vtr;
-  vtr_config_t output_vtr;
-  ptr_config_t input_pbb_vtr;
-  ptr_config_t output_pbb_vtr;
-
-  /* some of these flags may get integrated into the feature bitmap */
-  u8 fwd_enable;
-  u8 flood_enable;
-
-  /* split horizon group */
-  u8 shg;
-
-  /* flag for output vtr operation */
-  u8 out_vtr_flag;
-
-} l2_output_config_t;
-
-
-/*
- * The set of next nodes for features and interface output.
- * Each output feature node should include this.
- */
-typedef struct
-{
-  /*
-   * vector of output next node index, indexed by sw_if_index.
-   * used when all output features have been executed and the
-   * next nodes are the interface output nodes.
-   */
-  u32 *output_node_index_vec;
-
-  /*
-   * array of next node index for each output feature, indexed
-   * by l2output_feat_t. Used to determine next feature node.
-   */
-  u32 feat_next_node_index[32];
-
-} l2_output_next_nodes_st;
-
-
-typedef struct
-{
-  /* Next nodes for features and output interfaces */
-  l2_output_next_nodes_st next_nodes;
-
-  /* config vector indexed by sw_if_index */
-  l2_output_config_t *configs;
-
-  /* Convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} l2output_main_t;
-
-l2output_main_t l2output_main;
-
-/* L2 output features */
-
-/* Mappings from feature ID to graph node name */
-#define foreach_l2output_feat \
- _(SPAN,              "feature-bitmap-drop")        \
- _(CFM,               "feature-bitmap-drop")        \
- _(QOS,               "feature-bitmap-drop")        \
- _(ACL,               "l2-output-acl")              \
- _(L2PT,              "feature-bitmap-drop")        \
- _(EFP_FILTER,        "l2-efp-filter")              \
- _(IPIW,              "feature-bitmap-drop")        \
- _(STP_BLOCKED,       "feature-bitmap-drop")        \
- _(LINESTATUS_DOWN,   "feature-bitmap-drop")        \
- _(OUTPUT_CLASSIFY,   "l2-output-classify")	    \
- _(XCRW,	      "l2-xcrw")
-
-/* Feature bitmap positions */
-typedef enum
-{
-#define _(sym,str) L2OUTPUT_FEAT_##sym##_BIT,
-  foreach_l2output_feat
-#undef _
-    L2OUTPUT_N_FEAT,
-} l2output_feat_t;
-
-/* Feature bit masks */
-typedef enum
-{
-#define _(sym,str) L2OUTPUT_FEAT_##sym = (1<<L2OUTPUT_FEAT_##sym##_BIT),
-  foreach_l2output_feat
-#undef _
-} l2output_feat_masks_t;
-
-#define foreach_l2output_error				\
-_(L2OUTPUT,     "L2 output packets")			\
-_(EFP_DROP,     "L2 EFP filter pre-rewrite drops")	\
-_(VTR_DROP,     "L2 output tag rewrite drops")		\
-_(SHG_DROP,     "L2 split horizon drops")		\
-_(DROP,         "L2 output drops")			\
-_(MAPPING_DROP, "L2 Output interface mapping in progress")
-
-typedef enum
-{
-  L2OUTPUT_NEXT_DROP,
-  L2OUTPUT_NEXT_BAD_INTF,
-  L2OUTPUT_N_NEXT,
-} l2output_next_t;
-
-typedef enum
-{
-#define _(sym,str) L2OUTPUT_ERROR_##sym,
-  foreach_l2output_error
-#undef _
-    L2OUTPUT_N_ERROR,
-} l2output_error_t;
-
-/* Return an array of strings containing graph node names of each feature */
-char **l2output_get_feat_names (void);
-
-
-/**
- * The next set of functions is for use by output feature graph nodes.
- * When the last bit has been cleared from the output feature bitmap,
- * the next node is the output graph node for the TX sw_if_index.
- * These functions help the feature nodes get that node index.
- */
-
-/* Create a mapping to the output graph node for the given sw_if_index */
-u32 l2output_create_output_node_mapping (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 node_index,	/* index of current node */
-					 u32 * output_node_index_vec,
-					 u32 sw_if_index);
-
-/* Initialize the next node mapping table */
-always_inline void
-l2output_init_output_node_vec (u32 ** output_node_index_vec)
-{
-
-  /*
-   * Size it at 100 sw_if_indexes initially
-   * Uninitialized mappings are set to ~0
-   */
-  vec_validate_init_empty (*output_node_index_vec, 100, ~0);
-}
-
-
-/**
- *  Get a mapping from the output node mapping table,
- * creating the entry if necessary.
- */
-always_inline u32
-l2output_get_output_node (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 node_index,	/* index of current node */
-			  u32 sw_if_index, u32 ** output_node_index_vec)	/* may be updated */
-{
-  u32 next;			/* index of next graph node */
-
-  /* Insure the vector is big enough */
-  vec_validate_init_empty (*output_node_index_vec, sw_if_index, ~0);
-
-  /* Get the mapping for the sw_if_index */
-  next = vec_elt (*output_node_index_vec, sw_if_index);
-
-  if (next == ~0)
-    {
-      /* Mapping doesn't exist so create it */
-      next = l2output_create_output_node_mapping (vlib_main,
-						  vnet_main,
-						  node_index,
-						  *output_node_index_vec,
-						  sw_if_index);
-    }
-
-  return next;
-}
-
-
-/** Determine the next L2 node based on the output feature bitmap */
-always_inline void
-l2_output_dispatch (vlib_main_t * vlib_main,
-		    vnet_main_t * vnet_main,
-		    vlib_node_runtime_t * node,
-		    u32 node_index,
-		    u32 * cached_sw_if_index,
-		    u32 * cached_next_index,
-		    l2_output_next_nodes_st * next_nodes,
-		    vlib_buffer_t * b0,
-		    u32 sw_if_index, u32 feature_bitmap, u32 * next0)
-{
-  if (feature_bitmap)
-    {
-      /* There are some features to execute */
-
-      /* Save bitmap for the next feature graph nodes */
-      vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap;
-
-      /* Determine the next node */
-      *next0 =
-	feat_bitmap_get_next_node_index (next_nodes->feat_next_node_index,
-					 feature_bitmap);
-    }
-  else
-    {
-      /*
-       * There are no features. Send packet to TX node for sw_if_index0
-       * This is a little tricky in that the output interface next node indexes
-       * are not precomputed at init time.
-       */
-
-      if (sw_if_index == *cached_sw_if_index)
-	{
-	  /* We hit in the one-entry cache. Use it. */
-	  *next0 = *cached_next_index;
-	}
-      else
-	{
-	  /* Look up the output TX node */
-	  *next0 = l2output_get_output_node (vlib_main,
-					     vnet_main,
-					     node_index,
-					     sw_if_index,
-					     &next_nodes->output_node_index_vec);
-
-	  if (*next0 == L2OUTPUT_NEXT_DROP)
-	    {
-	      vnet_hw_interface_t *hw0;
-	      hw0 = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
-
-	      if (hw0->flags & VNET_HW_INTERFACE_FLAG_L2OUTPUT_MAPPED)
-		b0->error = node->errors[L2OUTPUT_ERROR_MAPPING_DROP];
-	    }
-
-	  /* Update the one-entry cache */
-	  *cached_sw_if_index = sw_if_index;
-	  *cached_next_index = *next0;
-	}
-    }
-}
-
-/** Get a pointer to the config for the given interface */
-l2_output_config_t *l2output_intf_config (u32 sw_if_index);
-
-/** Enable (or disable) the feature in the bitmap for the given interface */
-void l2output_intf_bitmap_enable (u32 sw_if_index,
-				  u32 feature_bitmap, u32 enable);
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_output_acl.c b/vnet/vnet/l2/l2_output_acl.c
deleted file mode 100644
index 94a4d66b..00000000
--- a/vnet/vnet/l2/l2_output_acl.c
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * l2_output_acl.c : layer 2 output acl processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/ip/ip_packet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vlib/cli.h>
-#include <vnet/l2/feat_bitmap.h>
-#include <vnet/l2/l2_output.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/cache.h>
-
-
-typedef struct
-{
-  /* Next nodes for features and output interfaces */
-  l2_output_next_nodes_st next_nodes;
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} l2_outacl_main_t;
-
-
-
-typedef struct
-{
-  /* per-pkt trace data */
-  u8 src[6];
-  u8 dst[6];
-  u32 next_index;
-  u32 sw_if_index;
-} l2_outacl_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_l2_outacl_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2_outacl_trace_t *t = va_arg (*args, l2_outacl_trace_t *);
-
-  s = format (s, "l2-output-acl: sw_if_index %d dst %U src %U",
-	      t->sw_if_index,
-	      format_ethernet_address, t->dst,
-	      format_ethernet_address, t->src);
-  return s;
-}
-
-l2_outacl_main_t l2_outacl_main;
-
-static vlib_node_registration_t l2_outacl_node;
-
-#define foreach_l2_outacl_error			\
-_(L2_OUTACL,    "L2 output ACL packets")	\
-_(DROP,         "L2 output drops")
-
-typedef enum
-{
-#define _(sym,str) L2_OUTACL_ERROR_##sym,
-  foreach_l2_outacl_error
-#undef _
-    L2_OUTACL_N_ERROR,
-} l2_outacl_error_t;
-
-static char *l2_outacl_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2_outacl_error
-#undef _
-};
-
-typedef enum
-{
-  L2_OUTACL_NEXT_DROP,
-  L2_OUTACL_N_NEXT,
-} l2_outacl_next_t;
-
-
-
-static uword
-l2_outacl_node_fn (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  l2_outacl_next_t next_index;
-  l2_outacl_main_t *msm = &l2_outacl_main;
-  vlib_node_t *n = vlib_get_node (vm, l2_outacl_node.index);
-  u32 node_counter_base_index = n->error_heap_index;
-  vlib_error_main_t *em = &vm->error_main;
-  u32 cached_sw_if_index = (u32) ~ 0;
-  u32 cached_next_index = (u32) ~ 0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;	/* number of packets to process */
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      /* get space to enqueue frame to graph node "next_index" */
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (0 && n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-	  u32 sw_if_index0, sw_if_index1;
-	  ethernet_header_t *h0, *h1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  /* bi is "buffer index", b is pointer to the buffer */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  /* TX interface handles */
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_TX];
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2_outacl_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->sw_if_index = sw_if_index0;
-		  t->next_index = next0;
-		  clib_memcpy (t->src, h0->src_address, 6);
-		  clib_memcpy (t->dst, h0->dst_address, 6);
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2_outacl_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  t->sw_if_index = sw_if_index1;
-		  t->next_index = next1;
-		  clib_memcpy (t->src, h1->src_address, 6);
-		  clib_memcpy (t->dst, h1->dst_address, 6);
-		}
-	    }
-
-	  em->counters[node_counter_base_index + L2_OUTACL_ERROR_L2_OUTACL] +=
-	    2;
-
-	  /* add core loop code here */
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  /* if next0==next1==next_index then nothing special needs to be done */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 sw_if_index0;
-	  ethernet_header_t *h0;
-	  u32 feature_bitmap0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  h0 = vlib_buffer_get_current (b0);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      l2_outacl_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = sw_if_index0;
-	      clib_memcpy (t->src, h0->src_address, 6);
-	      clib_memcpy (t->dst, h0->dst_address, 6);
-	    }
-
-	  em->counters[node_counter_base_index + L2_OUTACL_ERROR_L2_OUTACL] +=
-	    1;
-
-	  /*
-	   * L2_OUTACL code
-	   * Dummy for now, just go to next feature node
-	   */
-
-
-	  /* Remove ourself from the feature bitmap */
-	  feature_bitmap0 =
-	    vnet_buffer (b0)->l2.feature_bitmap & ~L2OUTPUT_FEAT_ACL;
-
-	  /* Determine next node */
-	  l2_output_dispatch (msm->vlib_main,
-			      msm->vnet_main,
-			      node,
-			      l2_outacl_node.index,
-			      &cached_sw_if_index,
-			      &cached_next_index,
-			      &msm->next_nodes,
-			      b0, sw_if_index0, feature_bitmap0, &next0);
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2_outacl_node,static) = {
-  .function = l2_outacl_node_fn,
-  .name = "l2-output-acl",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2_outacl_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2_outacl_error_strings),
-  .error_strings = l2_outacl_error_strings,
-
-  .n_next_nodes = L2_OUTACL_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-       [L2_OUTACL_NEXT_DROP]  = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2_outacl_node, l2_outacl_node_fn)
-     clib_error_t *l2_outacl_init (vlib_main_t * vm)
-{
-  l2_outacl_main_t *mp = &l2_outacl_main;
-
-  mp->vlib_main = vm;
-  mp->vnet_main = vnet_get_main ();
-
-  /* Initialize the feature next-node indexes */
-  feat_bitmap_init_next_nodes (vm,
-			       l2_outacl_node.index,
-			       L2OUTPUT_N_FEAT,
-			       l2output_get_feat_names (),
-			       mp->next_nodes.feat_next_node_index);
-
-  /* Initialize the output node mapping table */
-  l2output_init_output_node_vec (&mp->next_nodes.output_node_index_vec);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2_outacl_init);
-
-#if 0
-/** @todo maybe someone will add output ACL's in the future.
- * Set subinterface outacl enable/disable.
- * The CLI format is:
- *    set interface acl output <interface> [disable]
- */
-static clib_error_t *
-int_l2_outacl (vlib_main_t * vm,
-	       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index;
-  u32 enable;
-
-  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  enable = 1;
-  if (unformat (input, "disable"))
-    {
-      enable = 0;
-    }
-
-  /* set the interface flag */
-  l2output_intf_bitmap_enable (sw_if_index, L2OUTPUT_FEAT_ACL, enable);
-
-done:
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (int_l2_outacl_cli, static) = {
-  .path = "set interface acl output",
-  .short_help = "set interface acl output <interface> [disable]",
-  .function = int_l2_outacl,
-};
-/* *INDENT-ON* */
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_output_classify.c b/vnet/vnet/l2/l2_output_classify.c
deleted file mode 100644
index 27d5eb39..00000000
--- a/vnet/vnet/l2/l2_output_classify.c
+++ /dev/null
@@ -1,657 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/l2/l2_classify.h>
-#include <vnet/api_errno.h>
-
-/**
- * @file
- * @brief Layer 2 Output Classifier.
- *
- * @sa @ref vnet/vnet/classify/vnet_classify.c
- * @sa @ref vnet/vnet/classify/vnet_classify.h
- */
-
-typedef struct
-{
-  /** interface handle for the ith packet */
-  u32 sw_if_index;
-  /** graph arc index selected for this packet */
-  u32 next_index;
-  /** classifier table which provided the final result */
-  u32 table_index;
-  /** offset in classifier heap of the corresponding session */
-  u32 session_offset;
-} l2_output_classify_trace_t;
-
-typedef struct
-{
-  /** use-case independent main object pointer */
-  vnet_classify_main_t *vcm;
-  /** l2 input classifier main object pointer */
-  l2_output_classify_main_t *l2cm;
-} l2_output_classify_runtime_t;
-
-/** Packet trace format function. */
-static u8 *
-format_l2_output_classify_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2_output_classify_trace_t *t =
-    va_arg (*args, l2_output_classify_trace_t *);
-
-  s = format (s, "l2-classify: sw_if_index %d, table %d, offset %x, next %d",
-	      t->sw_if_index, t->table_index, t->session_offset,
-	      t->next_index);
-  return s;
-}
-
-/** l2 output classifier main data structure. */
-l2_output_classify_main_t l2_output_classify_main;
-
-vlib_node_registration_t l2_output_classify_node;
-
-#define foreach_l2_output_classify_error               \
-_(MISS, "Classify misses")                      \
-_(HIT, "Classify hits")                         \
-_(CHAIN_HIT, "Classify hits after chain walk")  \
-_(DROP, "L2 Classify Drops")
-
-typedef enum
-{
-#define _(sym,str) L2_OUTPUT_CLASSIFY_ERROR_##sym,
-  foreach_l2_output_classify_error
-#undef _
-    L2_OUTPUT_CLASSIFY_N_ERROR,
-} l2_output_classify_error_t;
-
-static char *l2_output_classify_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2_output_classify_error
-#undef _
-};
-
-/**
- * @brief l2 output classifier node.
- * @node l2-output-classify
- *
- * This is the l2 output classifier dispatch node
- *
- * @param vm    vlib_main_t corresponding to the current thread.
- * @param node  vlib_node_runtime_t data for this node.
- * @param frame vlib_frame_t whose contents should be dispatched.
- *
- * @par Graph mechanics: buffer metadata, next index usage
- *
- * @em Uses:
- * - <code>(l2_output_classify_runtime_t *)
- *         rt->classify_table_index_by_sw_if_index</code>
- *	   Head of the per-interface, perprotocol classifier table chain
- * 	   for a specific interface. ~0 => send pkts to the next
- * 	   feature in the L2 feature chain.
- * - <code>vnet_buffer(b)->sw_if_index[VLIB_TX]</code>
- * 	- Indicates the @c sw_if_index value of the interface that the
- * 	packet was received on.
- * - <code>vnet_buffer (b0)->l2.feature_bitmap</code>
- * 	- Used to steer packets across l2 features enabled on the interface
- * - <code>(vnet_classify_entry_t) e0->next_index</code>
- *	- Used to steer traffic when the classifier hits on a session
- * - <code>(vnet_classify_entry_t) e0->advance</code>
- *	- Signed quantity applied via <code>vlib_buffer_advance</code>
- * 	when the classifier hits on a session
- * - <code>(vnet_classify_table_t) t0->miss_next_index</code>
- *	- Used to steer traffic when the classifier misses
- *
- * @em Sets:
- * - <code>vnet_buffer (b0)->l2_classify.table_index</code>
- * 	- Classifier table index of the first classifier table in
- *	the classifier table chain
- * - <code>vnet_buffer (b0)->l2_classify.hash</code>
- * 	- Bounded-index extensible hash corresponding to the
- *	masked fields in the current packet
- * - <code>vnet_buffer (b0)->l2.feature_bitmap</code>
- * 	- Used to steer packets across l2 features enabled on the interface
- * - <code>vnet_buffer (b0)->l2_classify.opaque_index</code>
- * 	- Copied from the classifier session object upon classifier hit
- *
- * @em Counters:
- * - <code>L2_OUTPUT_CLASSIFY_ERROR_MISS</code> Classifier misses
- * - <code>L2_OUTPUT_CLASSIFY_ERROR_HIT</code> Classifier hits
- * - <code>L2_OUTPUT_CLASSIFY_ERROR_CHAIN_HIT</code>
- *   Classifier hits in other than the first table
- */
-
-static uword
-l2_output_classify_node_fn (vlib_main_t * vm,
-			    vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  l2_output_classify_next_t next_index;
-  l2_output_classify_main_t *cm = &l2_output_classify_main;
-  vnet_classify_main_t *vcm = cm->vnet_classify_main;
-  l2_output_classify_runtime_t *rt =
-    (l2_output_classify_runtime_t *) node->runtime_data;
-  u32 feature_bitmap0;
-  u32 hits = 0;
-  u32 misses = 0;
-  u32 chain_hits = 0;
-  f64 now;
-  u32 n_next_nodes;
-  u32 cached_sw_if_index = (u32) ~ 0;
-  u32 cached_next_index = (u32) ~ 0;
-  u32 sw_if_index0;
-
-  n_next_nodes = node->n_next_nodes;
-
-  now = vlib_time_now (vm);
-
-  n_left_from = frame->n_vectors;
-  from = vlib_frame_vector_args (frame);
-
-  /* First pass: compute hash */
-
-  while (n_left_from > 2)
-    {
-      vlib_buffer_t *b0, *b1;
-      u32 bi0, bi1;
-      ethernet_header_t *h0, *h1;
-      u32 sw_if_index0, sw_if_index1;
-      u16 type0, type1;
-      int type_index0, type_index1;
-      vnet_classify_table_t *t0, *t1;
-      u32 table_index0, table_index1;
-      u64 hash0, hash1;
-
-
-      /* prefetch next iteration */
-      {
-	vlib_buffer_t *p1, *p2;
-
-	p1 = vlib_get_buffer (vm, from[1]);
-	p2 = vlib_get_buffer (vm, from[2]);
-
-	vlib_prefetch_buffer_header (p1, STORE);
-	CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE);
-	vlib_prefetch_buffer_header (p2, STORE);
-	CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-      }
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      h0 = vlib_buffer_get_current (b0);
-
-      bi1 = from[1];
-      b1 = vlib_get_buffer (vm, bi1);
-      h1 = vlib_buffer_get_current (b1);
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-      vnet_buffer (b0)->l2_classify.table_index = ~0;
-
-      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_TX];
-      vnet_buffer (b1)->l2_classify.table_index = ~0;
-
-      /* Select classifier table based on ethertype */
-      type0 = clib_net_to_host_u16 (h0->type);
-      type1 = clib_net_to_host_u16 (h1->type);
-
-      type_index0 = (type0 == ETHERNET_TYPE_IP4)
-	? L2_OUTPUT_CLASSIFY_TABLE_IP4 : L2_OUTPUT_CLASSIFY_TABLE_OTHER;
-      type_index0 = (type0 == ETHERNET_TYPE_IP6)
-	? L2_OUTPUT_CLASSIFY_TABLE_IP6 : type_index0;
-
-      type_index1 = (type1 == ETHERNET_TYPE_IP4)
-	? L2_OUTPUT_CLASSIFY_TABLE_IP4 : L2_OUTPUT_CLASSIFY_TABLE_OTHER;
-      type_index1 = (type1 == ETHERNET_TYPE_IP6)
-	? L2_OUTPUT_CLASSIFY_TABLE_IP6 : type_index1;
-
-      vnet_buffer (b0)->l2_classify.table_index =
-	table_index0 =
-	rt->l2cm->classify_table_index_by_sw_if_index
-	[type_index0][sw_if_index0];
-
-      if (table_index0 != ~0)
-	{
-	  t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-	  vnet_buffer (b0)->l2_classify.hash = hash0 =
-	    vnet_classify_hash_packet (t0, (u8 *) h0);
-	  vnet_classify_prefetch_bucket (t0, hash0);
-	}
-
-      vnet_buffer (b1)->l2_classify.table_index =
-	table_index1 =
-	rt->l2cm->classify_table_index_by_sw_if_index
-	[type_index1][sw_if_index1];
-
-      if (table_index1 != ~0)
-	{
-	  t1 = pool_elt_at_index (vcm->tables, table_index1);
-
-	  vnet_buffer (b1)->l2_classify.hash = hash1 =
-	    vnet_classify_hash_packet (t1, (u8 *) h1);
-	  vnet_classify_prefetch_bucket (t1, hash1);
-	}
-
-      from += 2;
-      n_left_from -= 2;
-    }
-
-  while (n_left_from > 0)
-    {
-      vlib_buffer_t *b0;
-      u32 bi0;
-      ethernet_header_t *h0;
-      u16 type0;
-      u32 type_index0;
-      vnet_classify_table_t *t0;
-      u32 table_index0;
-      u64 hash0;
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      h0 = vlib_buffer_get_current (b0);
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-      vnet_buffer (b0)->l2_classify.table_index = ~0;
-
-      /* Select classifier table based on ethertype */
-      type0 = clib_net_to_host_u16 (h0->type);
-
-      type_index0 = (type0 == ETHERNET_TYPE_IP4)
-	? L2_OUTPUT_CLASSIFY_TABLE_IP4 : L2_OUTPUT_CLASSIFY_TABLE_OTHER;
-      type_index0 = (type0 == ETHERNET_TYPE_IP6)
-	? L2_OUTPUT_CLASSIFY_TABLE_IP6 : type_index0;
-
-      vnet_buffer (b0)->l2_classify.table_index =
-	table_index0 = rt->l2cm->classify_table_index_by_sw_if_index
-	[type_index0][sw_if_index0];
-
-      if (table_index0 != ~0)
-	{
-	  t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-	  vnet_buffer (b0)->l2_classify.hash = hash0 =
-	    vnet_classify_hash_packet (t0, (u8 *) h0);
-	  vnet_classify_prefetch_bucket (t0, hash0);
-	}
-      from++;
-      n_left_from--;
-    }
-
-  next_index = node->cached_next_index;
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /* Not enough load/store slots to dual loop... */
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0 = ~0;
-	  ethernet_header_t *h0;
-	  u32 table_index0;
-	  u64 hash0;
-	  vnet_classify_table_t *t0;
-	  vnet_classify_entry_t *e0;
-
-	  if (PREDICT_TRUE (n_left_from > 2))
-	    {
-	      vlib_buffer_t *p2 = vlib_get_buffer (vm, from[2]);
-	      u64 phash2;
-	      u32 table_index2;
-	      vnet_classify_table_t *tp2;
-
-	      /*
-	       * Prefetch table entry two ahead. Buffer / data
-	       * were prefetched above...
-	       */
-	      table_index2 = vnet_buffer (p2)->l2_classify.table_index;
-
-	      if (PREDICT_TRUE (table_index2 != ~0))
-		{
-		  tp2 = pool_elt_at_index (vcm->tables, table_index2);
-		  phash2 = vnet_buffer (p2)->l2_classify.hash;
-		  vnet_classify_prefetch_entry (tp2, phash2);
-		}
-	    }
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  h0 = vlib_buffer_get_current (b0);
-	  table_index0 = vnet_buffer (b0)->l2_classify.table_index;
-	  e0 = 0;
-	  vnet_buffer (b0)->l2_classify.opaque_index = ~0;
-	  /* Remove ourself from the feature bitmap */
-	  feature_bitmap0 = vnet_buffer (b0)->l2.feature_bitmap
-	    & ~L2OUTPUT_FEAT_OUTPUT_CLASSIFY;
-
-	  /* save for next feature graph nodes */
-	  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap0;
-
-	  if (PREDICT_TRUE (table_index0 != ~0))
-	    {
-	      hash0 = vnet_buffer (b0)->l2_classify.hash;
-	      t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-	      e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
-	      if (e0)
-		{
-		  vnet_buffer (b0)->l2_classify.opaque_index
-		    = e0->opaque_index;
-		  vlib_buffer_advance (b0, e0->advance);
-		  next0 = (e0->next_index < n_next_nodes) ?
-		    e0->next_index : next0;
-		  hits++;
-		}
-	      else
-		{
-		  while (1)
-		    {
-		      if (t0->next_table_index != ~0)
-			t0 = pool_elt_at_index (vcm->tables,
-						t0->next_table_index);
-		      else
-			{
-			  next0 = (t0->miss_next_index < n_next_nodes) ?
-			    t0->miss_next_index : next0;
-			  misses++;
-			  break;
-			}
-
-		      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
-		      e0 =
-			vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
-		      if (e0)
-			{
-			  vnet_buffer (b0)->l2_classify.opaque_index
-			    = e0->opaque_index;
-			  vlib_buffer_advance (b0, e0->advance);
-			  next0 = (e0->next_index < n_next_nodes) ?
-			    e0->next_index : next0;
-			  hits++;
-			  chain_hits++;
-			  break;
-			}
-		    }
-		}
-	    }
-
-	  if (PREDICT_FALSE (next0 == 0))
-	    b0->error = node->errors[L2_OUTPUT_CLASSIFY_ERROR_DROP];
-
-	  if (PREDICT_FALSE (next0 == ~0))
-	    {
-	      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-
-	      /* Determine next node */
-	      l2_output_dispatch (cm->vlib_main,
-				  cm->vnet_main,
-				  node,
-				  l2_output_classify_node.index,
-				  &cached_sw_if_index,
-				  &cached_next_index,
-				  &cm->next_nodes,
-				  b0, sw_if_index0, feature_bitmap0, &next0);
-	    }
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      l2_output_classify_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	      t->table_index = table_index0;
-	      t->next_index = next0;
-	      t->session_offset = e0 ? vnet_classify_get_offset (t0, e0) : 0;
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, node->node_index,
-			       L2_OUTPUT_CLASSIFY_ERROR_MISS, misses);
-  vlib_node_increment_counter (vm, node->node_index,
-			       L2_OUTPUT_CLASSIFY_ERROR_HIT, hits);
-  vlib_node_increment_counter (vm, node->node_index,
-			       L2_OUTPUT_CLASSIFY_ERROR_CHAIN_HIT,
-			       chain_hits);
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2_output_classify_node) = {
-  .function = l2_output_classify_node_fn,
-  .name = "l2-output-classify",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2_output_classify_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2_output_classify_error_strings),
-  .error_strings = l2_output_classify_error_strings,
-
-  .runtime_data_bytes = sizeof (l2_output_classify_runtime_t),
-
-  .n_next_nodes = L2_OUTPUT_CLASSIFY_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [L2_OUTPUT_CLASSIFY_NEXT_DROP]  = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2_output_classify_node,
-			      l2_output_classify_node_fn);
-
-/** l2 output classsifier feature initialization. */
-clib_error_t *
-l2_output_classify_init (vlib_main_t * vm)
-{
-  l2_output_classify_main_t *cm = &l2_output_classify_main;
-  l2_output_classify_runtime_t *rt;
-
-  rt = vlib_node_get_runtime_data (vm, l2_output_classify_node.index);
-
-  cm->vlib_main = vm;
-  cm->vnet_main = vnet_get_main ();
-  cm->vnet_classify_main = &vnet_classify_main;
-
-  /* Initialize the feature next-node indexes */
-  feat_bitmap_init_next_nodes (vm,
-			       l2_output_classify_node.index,
-			       L2OUTPUT_N_FEAT,
-			       l2output_get_feat_names (),
-			       cm->feat_next_node_index);
-  rt->l2cm = cm;
-  rt->vcm = cm->vnet_classify_main;
-
-  /* Initialize the output node mapping table */
-  l2output_init_output_node_vec (&cm->next_nodes.output_node_index_vec);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2_output_classify_init);
-
-/** Enable/disable l2 input classification on a specific interface. */
-void
-vnet_l2_output_classify_enable_disable (u32 sw_if_index, int enable_disable)
-{
-
-  l2output_intf_bitmap_enable (sw_if_index, L2OUTPUT_FEAT_OUTPUT_CLASSIFY,
-			       (u32) enable_disable);
-}
-
-/** @brief Set l2 per-protocol, per-interface output classification tables.
- *
- *  @param sw_if_index        interface handle
- *  @param ip4_table_index    ip4 classification table index, or ~0
- *  @param ip6_table_index    ip6 classification table index, or ~0
- *  @param other_table_index  non-ip4, non-ip6 classification table index,
- *         or ~0
- *  @returns 0 on success, VNET_API_ERROR_NO_SUCH_TABLE, TABLE2, TABLE3
- *           if the indicated (non-~0) table does not exist.
- */
-
-int
-vnet_l2_output_classify_set_tables (u32 sw_if_index,
-				    u32 ip4_table_index,
-				    u32 ip6_table_index,
-				    u32 other_table_index)
-{
-  l2_output_classify_main_t *cm = &l2_output_classify_main;
-  vnet_classify_main_t *vcm = cm->vnet_classify_main;
-
-  /* Assume that we've validated sw_if_index in the API layer */
-
-  if (ip4_table_index != ~0 &&
-      pool_is_free_index (vcm->tables, ip4_table_index))
-    return VNET_API_ERROR_NO_SUCH_TABLE;
-
-  if (ip6_table_index != ~0 &&
-      pool_is_free_index (vcm->tables, ip6_table_index))
-    return VNET_API_ERROR_NO_SUCH_TABLE2;
-
-  if (other_table_index != ~0 &&
-      pool_is_free_index (vcm->tables, other_table_index))
-    return VNET_API_ERROR_NO_SUCH_TABLE3;
-
-  vec_validate
-    (cm->classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_IP4],
-     sw_if_index);
-
-  vec_validate
-    (cm->classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_IP6],
-     sw_if_index);
-
-  vec_validate
-    (cm->classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_OTHER],
-     sw_if_index);
-
-  cm->classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_IP4]
-    [sw_if_index] = ip4_table_index;
-
-  cm->classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_IP6]
-    [sw_if_index] = ip6_table_index;
-
-  cm->classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_OTHER]
-    [sw_if_index] = other_table_index;
-
-  return 0;
-}
-
-static clib_error_t *
-int_l2_output_classify_command_fn (vlib_main_t * vm,
-				   unformat_input_t * input,
-				   vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index = ~0;
-  u32 ip4_table_index = ~0;
-  u32 ip6_table_index = ~0;
-  u32 other_table_index = ~0;
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "intfc %U", unformat_vnet_sw_interface,
-		    vnm, &sw_if_index))
-	;
-      else if (unformat (input, "ip4-table %d", &ip4_table_index))
-	;
-      else if (unformat (input, "ip6-table %d", &ip6_table_index))
-	;
-      else if (unformat (input, "other-table %d", &other_table_index))
-	;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "interface must be specified");
-
-
-  if (ip4_table_index == ~0 && ip6_table_index == ~0
-      && other_table_index == ~0)
-    {
-      vlib_cli_output (vm, "L2 classification disabled");
-      vnet_l2_output_classify_enable_disable (sw_if_index, 0 /* enable */ );
-      return 0;
-    }
-
-  rv = vnet_l2_output_classify_set_tables (sw_if_index, ip4_table_index,
-					   ip6_table_index,
-					   other_table_index);
-  switch (rv)
-    {
-    case 0:
-      vnet_l2_output_classify_enable_disable (sw_if_index, 1 /* enable */ );
-      break;
-
-    default:
-      return clib_error_return (0, "vnet_l2_output_classify_set_tables: %d",
-				rv);
-      break;
-    }
-
-  return 0;
-}
-
-/*?
- * Configure Layer 2 output classification.
- *
- * @cliexpar
- * @cliexstart{set interface l2 output classify intfc <interface-name> [ip4-table <index>] [ip6-table <index>] [other-table <index>]}
- * @cliexend
- * @todo This is incomplete. This needs a detailed description and a
- * practical example.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (int_l2_output_classify_cli, static) = {
-  .path = "set interface l2 output classify",
-  .short_help =
-  "set interface l2 output classify intfc <<interface-name>> [ip4-table <n>]\n"
-  "  [ip6-table <n>] [other-table <n>]",
-  .function = int_l2_output_classify_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_patch.c b/vnet/vnet/l2/l2_patch.c
deleted file mode 100644
index 5e4691f4..00000000
--- a/vnet/vnet/l2/l2_patch.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/feature/feature.h>
-#include <vppinfra/error.h>
-
-typedef struct
-{
-  /* vector of dispositions, indexed by rx_sw_if_index */
-  u32 *tx_next_by_rx_sw_if_index;
-  u32 *tx_sw_if_index_by_rx_sw_if_index;
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} l2_patch_main_t;
-
-typedef struct
-{
-  u32 rx_sw_if_index;
-  u32 tx_sw_if_index;
-} l2_patch_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_l2_patch_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2_patch_trace_t *t = va_arg (*args, l2_patch_trace_t *);
-
-  s = format (s, "L2_PATCH: rx %d tx %d", t->rx_sw_if_index,
-	      t->tx_sw_if_index);
-  return s;
-}
-
-l2_patch_main_t l2_patch_main;
-
-static vlib_node_registration_t l2_patch_node;
-
-#define foreach_l2_patch_error			\
-_(PATCHED, "L2 patch packets")			\
-_(DROPPED, "L2 patch misconfigured drops")
-
-typedef enum
-{
-#define _(sym,str) L2_PATCH_ERROR_##sym,
-  foreach_l2_patch_error
-#undef _
-    L2_PATCH_N_ERROR,
-} l2_patch_error_t;
-
-static char *l2_patch_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2_patch_error
-#undef _
-};
-
-typedef enum
-{
-  L2_PATCH_NEXT_DROP,
-  L2_PATCH_N_NEXT,
-} l2_patch_next_t;
-
-static uword
-l2_patch_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  l2_patch_next_t next_index;
-  l2_patch_main_t *l2pm = &l2_patch_main;
-  vlib_node_t *n = vlib_get_node (vm, l2_patch_node.index);
-  u32 node_counter_base_index = n->error_heap_index;
-  vlib_error_main_t *em = &vm->error_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-	  u32 sw_if_index0, sw_if_index1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    /* So stupid / simple, we don't need to prefetch data */
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-
-	  ASSERT (l2pm->tx_next_by_rx_sw_if_index[sw_if_index0] != ~0);
-	  ASSERT (l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index0] != ~0);
-	  ASSERT (l2pm->tx_next_by_rx_sw_if_index[sw_if_index1] != ~0);
-	  ASSERT (l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index1] != ~0);
-
-	  next0 = l2pm->tx_next_by_rx_sw_if_index[sw_if_index0];
-	  next1 = l2pm->tx_next_by_rx_sw_if_index[sw_if_index1];
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] =
-	    l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index0];
-	  vnet_buffer (b1)->sw_if_index[VLIB_TX] =
-	    l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index1];
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2_patch_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->rx_sw_if_index = sw_if_index0;
-		  t->tx_sw_if_index =
-		    l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index0];
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2_patch_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  t->rx_sw_if_index = sw_if_index1;
-		  t->tx_sw_if_index =
-		    l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index1];
-		}
-	    }
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 sw_if_index0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-
-	  ASSERT (l2pm->tx_next_by_rx_sw_if_index[sw_if_index0] != ~0);
-	  ASSERT (l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index0] != ~0);
-
-	  next0 = l2pm->tx_next_by_rx_sw_if_index[sw_if_index0];
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] =
-	    l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index0];
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  l2_patch_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->rx_sw_if_index = sw_if_index0;
-		  t->tx_sw_if_index =
-		    l2pm->tx_sw_if_index_by_rx_sw_if_index[sw_if_index0];
-		}
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  em->counters[node_counter_base_index + L2_PATCH_ERROR_PATCHED] +=
-    frame->n_vectors;
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2_patch_node, static) = {
-  .function = l2_patch_node_fn,
-  .name = "l2-patch",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2_patch_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2_patch_error_strings),
-  .error_strings = l2_patch_error_strings,
-
-  .n_next_nodes = L2_PATCH_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-        [L2_PATCH_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2_patch_node, l2_patch_node_fn)
-     int vnet_l2_patch_add_del (u32 rx_sw_if_index, u32 tx_sw_if_index,
-				int is_add)
-{
-  l2_patch_main_t *l2pm = &l2_patch_main;
-  vnet_hw_interface_t *rxhi, *txhi;
-  u32 tx_next_index;
-
-  /*
-   * We assume that the API msg handler has used 2x VALIDATE_SW_IF_INDEX
-   * macros...
-   */
-
-  rxhi = vnet_get_sup_hw_interface (l2pm->vnet_main, rx_sw_if_index);
-
-  /* Make sure caller didn't pass a vlan subif, etc. */
-  if (rxhi->sw_if_index != rx_sw_if_index)
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-  txhi = vnet_get_sup_hw_interface (l2pm->vnet_main, tx_sw_if_index);
-  if (txhi->sw_if_index != tx_sw_if_index)
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX_2;
-
-  if (is_add)
-    {
-      tx_next_index = vlib_node_add_next (l2pm->vlib_main,
-					  l2_patch_node.index,
-					  txhi->output_node_index);
-
-      vec_validate_init_empty (l2pm->tx_next_by_rx_sw_if_index,
-			       rx_sw_if_index, ~0);
-
-      l2pm->tx_next_by_rx_sw_if_index[rx_sw_if_index] = tx_next_index;
-      vec_validate_init_empty (l2pm->tx_sw_if_index_by_rx_sw_if_index,
-			       rx_sw_if_index, ~0);
-      l2pm->tx_sw_if_index_by_rx_sw_if_index[rx_sw_if_index]
-	= txhi->sw_if_index;
-
-      ethernet_set_flags (l2pm->vnet_main, rxhi->hw_if_index,
-			  ETHERNET_INTERFACE_FLAG_ACCEPT_ALL);
-
-      vnet_feature_enable_disable ("device-input", "l2-patch",
-				   rxhi->hw_if_index, 1, 0, 0);
-    }
-  else
-    {
-      ethernet_set_flags (l2pm->vnet_main, rxhi->hw_if_index,
-			  0 /* disable promiscuous mode */ );
-
-      vnet_feature_enable_disable ("device-input", "l2-patch",
-				   rxhi->hw_if_index, 0, 0, 0);
-      if (vec_len (l2pm->tx_next_by_rx_sw_if_index) > rx_sw_if_index)
-	{
-	  l2pm->tx_next_by_rx_sw_if_index[rx_sw_if_index] = ~0;
-	  l2pm->tx_sw_if_index_by_rx_sw_if_index[rx_sw_if_index] = ~0;
-	}
-    }
-
-  return 0;
-}
-
-static clib_error_t *
-test_patch_command_fn (vlib_main_t * vm,
-		       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  l2_patch_main_t *l2pm = &l2_patch_main;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u32 rx_sw_if_index, tx_sw_if_index;
-  int rv;
-  int rx_set = 0;
-  int tx_set = 0;
-  int is_add = 1;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "rx %U", unformat_vnet_sw_interface,
-		    l2pm->vnet_main, &rx_sw_if_index))
-	rx_set = 1;
-      else if (unformat (line_input, "tx %U", unformat_vnet_sw_interface,
-			 l2pm->vnet_main, &tx_sw_if_index))
-	tx_set = 1;
-      else if (unformat (line_input, "del"))
-	is_add = 0;
-      else
-	break;
-    }
-
-  if (rx_set == 0)
-    return clib_error_return (0, "rx interface not set");
-
-  if (tx_set == 0)
-    return clib_error_return (0, "tx interface not set");
-
-  rv = vnet_l2_patch_add_del (rx_sw_if_index, tx_sw_if_index, is_add);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case VNET_API_ERROR_INVALID_SW_IF_INDEX:
-      return clib_error_return (0, "rx interface not a physical port");
-
-    case VNET_API_ERROR_INVALID_SW_IF_INDEX_2:
-      return clib_error_return (0, "tx interface not a physical port");
-
-    default:
-      return clib_error_return
-	(0, "WARNING: vnet_l2_patch_add_del returned %d", rv);
-    }
-
-  return 0;
-}
-
-/*?
- * Create or delete a Layer 2 patch.
- *
- * @cliexpar
- * @cliexstart{test l2patch rx <intfc> tx <intfc> [del]}
- * @cliexend
- * @todo This is incomplete. This needs a detailed description and a
- * practical example.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (test_patch_command, static) = {
-    .path = "test l2patch",
-    .short_help = "test l2patch rx <intfc> tx <intfc> [del]",
-    .function = test_patch_command_fn,
-};
-/* *INDENT-ON* */
-
-/** Display the contents of the l2patch table. */
-static clib_error_t *
-show_l2patch (vlib_main_t * vm,
-	      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  l2_patch_main_t *l2pm = &l2_patch_main;
-  u32 rx_sw_if_index;
-  u32 no_entries = 1;
-
-  ASSERT (vec_len (l2pm->tx_next_by_rx_sw_if_index) ==
-	  vec_len (l2pm->tx_sw_if_index_by_rx_sw_if_index));
-
-  for (rx_sw_if_index = 0;
-       rx_sw_if_index < vec_len (l2pm->tx_sw_if_index_by_rx_sw_if_index);
-       rx_sw_if_index++)
-    {
-      u32 tx_sw_if_index =
-	l2pm->tx_sw_if_index_by_rx_sw_if_index[rx_sw_if_index];
-      if (tx_sw_if_index != ~0)
-	{
-	  no_entries = 0;
-	  vlib_cli_output (vm, "%26U -> %U",
-			   format_vnet_sw_if_index_name,
-			   l2pm->vnet_main, rx_sw_if_index,
-			   format_vnet_sw_if_index_name,
-			   l2pm->vnet_main, tx_sw_if_index);
-	}
-    }
-
-  if (no_entries)
-    vlib_cli_output (vm, "no l2patch entries");
-
-  return 0;
-}
-
-/*?
- * Show Layer 2 patch entries.
- *
- * @cliexpar
- * @cliexstart{show l2patch}
- * @cliexend
- * @todo This is incomplete. This needs a detailed description and a
- * practical example.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_l2patch_cli, static) = {
-  .path = "show l2patch",
-  .short_help = "Show l2 interface cross-connect entries",
-  .function = show_l2patch,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-l2_patch_init (vlib_main_t * vm)
-{
-  l2_patch_main_t *mp = &l2_patch_main;
-
-  mp->vlib_main = vm;
-  mp->vnet_main = vnet_get_main ();
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2_patch_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_rw.c b/vnet/vnet/l2/l2_rw.c
deleted file mode 100644
index c54509d0..00000000
--- a/vnet/vnet/l2/l2_rw.c
+++ /dev/null
@@ -1,719 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/l2/feat_bitmap.h>
-#include <vnet/l2/l2_rw.h>
-
-/**
- * @file
- * @brief Layer 2 Rewrite.
- *
- * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
- */
-
-
-l2_rw_main_t l2_rw_main;
-
-vlib_node_registration_t l2_rw_node;
-
-typedef struct
-{
-  u32 sw_if_index;
-  u32 classify_table_index;
-  u32 rewrite_entry_index;
-} l2_rw_trace_t;
-
-static u8 *
-format_l2_rw_entry (u8 * s, va_list * args)
-{
-  l2_rw_entry_t *e = va_arg (*args, l2_rw_entry_t *);
-  l2_rw_main_t *rw = &l2_rw_main;
-  s = format (s, "%d -  mask:%U value:%U\n",
-	      e - rw->entries,
-	      format_hex_bytes, e->mask,
-	      e->rewrite_n_vectors * sizeof (u32x4), format_hex_bytes,
-	      e->value, e->rewrite_n_vectors * sizeof (u32x4));
-  s =
-    format (s, "      hits:%d skip_bytes:%d", e->hit_count,
-	    e->skip_n_vectors * sizeof (u32x4));
-  return s;
-}
-
-static u8 *
-format_l2_rw_config (u8 * s, va_list * args)
-{
-  l2_rw_config_t *c = va_arg (*args, l2_rw_config_t *);
-  return format (s, "table-index:%d miss-index:%d",
-		 c->table_index, c->miss_index);
-}
-
-/* packet trace format function */
-static u8 *
-format_l2_rw_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2_rw_trace_t *t = va_arg (*args, l2_rw_trace_t *);
-  return format (s, "l2-rw: sw_if_index %d, table %d, entry %d",
-		 t->sw_if_index, t->classify_table_index,
-		 t->rewrite_entry_index);
-}
-
-always_inline l2_rw_config_t *
-l2_rw_get_config (u32 sw_if_index)
-{
-  l2_rw_main_t *rw = &l2_rw_main;
-  if (PREDICT_FALSE (!clib_bitmap_get (rw->configs_bitmap, sw_if_index)))
-    {
-      vec_validate (rw->configs, sw_if_index);
-      rw->configs[sw_if_index].table_index = ~0;
-      rw->configs[sw_if_index].miss_index = ~0;
-      rw->configs_bitmap =
-	clib_bitmap_set (rw->configs_bitmap, sw_if_index, 1);
-    }
-  return &rw->configs[sw_if_index];
-}
-
-static_always_inline void
-l2_rw_rewrite (l2_rw_entry_t * rwe, u8 * h)
-{
-  if (U32X4_ALIGNED (h))
-    {
-      u32x4 *d = ((u32x4 *) h) + rwe->skip_n_vectors;
-      switch (rwe->rewrite_n_vectors)
-	{
-	case 5:
-	  d[4] = (d[4] & ~rwe->mask[4]) | rwe->value[4];
-	  /* FALLTHROUGH */
-	case 4:
-	  d[3] = (d[3] & ~rwe->mask[3]) | rwe->value[3];
-	  /* FALLTHROUGH */
-	case 3:
-	  d[2] = (d[2] & ~rwe->mask[2]) | rwe->value[2];
-	  /* FALLTHROUGH */
-	case 2:
-	  d[1] = (d[1] & ~rwe->mask[1]) | rwe->value[1];
-	  /* FALLTHROUGH */
-	case 1:
-	  d[0] = (d[0] & ~rwe->mask[0]) | rwe->value[0];
-	  break;
-	default:
-	  abort ();
-	}
-    }
-  else
-    {
-      u64 *d = ((u64 *) h) + rwe->skip_n_vectors * 2;
-      switch (rwe->rewrite_n_vectors)
-	{
-	case 5:
-	  d[8] =
-	    (d[8] & ~(((u64 *) rwe->mask)[8])) | (((u64 *) rwe->value)[8]);
-	  d[9] =
-	    (d[9] & ~(((u64 *) rwe->mask)[9])) | (((u64 *) rwe->value)[9]);
-	  /* FALLTHROUGH */
-	case 4:
-	  d[6] =
-	    (d[6] & ~(((u64 *) rwe->mask)[6])) | (((u64 *) rwe->value)[6]);
-	  d[7] =
-	    (d[7] & ~(((u64 *) rwe->mask)[7])) | (((u64 *) rwe->value)[7]);
-	  /* FALLTHROUGH */
-	case 3:
-	  d[4] =
-	    (d[4] & ~(((u64 *) rwe->mask)[4])) | (((u64 *) rwe->value)[4]);
-	  d[5] =
-	    (d[5] & ~(((u64 *) rwe->mask)[5])) | (((u64 *) rwe->value)[5]);
-	  /* FALLTHROUGH */
-	case 2:
-	  d[2] =
-	    (d[2] & ~(((u64 *) rwe->mask)[2])) | (((u64 *) rwe->value)[2]);
-	  d[3] =
-	    (d[3] & ~(((u64 *) rwe->mask)[3])) | (((u64 *) rwe->value)[3]);
-	  /* FALLTHROUGH */
-	case 1:
-	  d[0] =
-	    (d[0] & ~(((u64 *) rwe->mask)[0])) | (((u64 *) rwe->value)[0]);
-	  d[1] =
-	    (d[1] & ~(((u64 *) rwe->mask)[1])) | (((u64 *) rwe->value)[1]);
-	  break;
-	default:
-	  abort ();
-	}
-    }
-}
-
-static uword
-l2_rw_node_fn (vlib_main_t * vm,
-	       vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  l2_rw_main_t *rw = &l2_rw_main;
-  u32 n_left_from, *from, *to_next, next_index;
-  vnet_classify_main_t *vcm = &vnet_classify_main;
-  f64 now = vlib_time_now (vlib_get_main ());
-  u32 prefetch_size = 0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;	/* number of packets to process */
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      /* get space to enqueue frame to graph node "next_index" */
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, next0, sw_if_index0, feature_bitmap0, rwe_index0;
-	  u32 bi1, next1, sw_if_index1, feature_bitmap1, rwe_index1;
-	  vlib_buffer_t *b0, *b1;
-	  ethernet_header_t *h0, *h1;
-	  l2_rw_config_t *config0, *config1;
-	  u64 hash0, hash1;
-	  vnet_classify_table_t *t0, *t1;
-	  vnet_classify_entry_t *e0, *e1;
-	  l2_rw_entry_t *rwe0, *rwe1;
-
-	  {
-	    vlib_buffer_t *p2, *p3;
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-	    CLIB_PREFETCH (vlib_buffer_get_current (p2), prefetch_size, LOAD);
-	    CLIB_PREFETCH (vlib_buffer_get_current (p3), prefetch_size, LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-	  h0 = vlib_buffer_get_current (b0);
-	  h1 = vlib_buffer_get_current (b1);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-	  config0 = l2_rw_get_config (sw_if_index0);	/*TODO: check sw_if_index0 value */
-	  config1 = l2_rw_get_config (sw_if_index1);	/*TODO: check sw_if_index0 value */
-	  t0 = pool_elt_at_index (vcm->tables, config0->table_index);
-	  t1 = pool_elt_at_index (vcm->tables, config1->table_index);
-	  prefetch_size =
-	    (t1->skip_n_vectors + t1->match_n_vectors) * sizeof (u32x4);
-
-	  hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
-	  hash1 = vnet_classify_hash_packet (t1, (u8 *) h1);
-	  e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
-	  e1 = vnet_classify_find_entry (t1, (u8 *) h1, hash1, now);
-
-	  while (!e0 && (t0->next_table_index != ~0))
-	    {
-	      t0 = pool_elt_at_index (vcm->tables, t0->next_table_index);
-	      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
-	      e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
-	    }
-
-	  while (!e1 && (t1->next_table_index != ~0))
-	    {
-	      t1 = pool_elt_at_index (vcm->tables, t1->next_table_index);
-	      hash1 = vnet_classify_hash_packet (t1, (u8 *) h1);
-	      e1 = vnet_classify_find_entry (t1, (u8 *) h1, hash1, now);
-	    }
-
-	  rwe_index0 = e0 ? e0->opaque_index : config0->miss_index;
-	  rwe_index1 = e1 ? e1->opaque_index : config1->miss_index;
-
-	  if (rwe_index0 != ~0)
-	    {
-	      rwe0 = pool_elt_at_index (rw->entries, rwe_index0);
-	      l2_rw_rewrite (rwe0, (u8 *) h0);
-	    }
-	  if (rwe_index1 != ~0)
-	    {
-	      rwe1 = pool_elt_at_index (rw->entries, rwe_index1);
-	      l2_rw_rewrite (rwe1, (u8 *) h1);
-	    }
-
-	  if (PREDICT_FALSE ((b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      l2_rw_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = sw_if_index0;
-	      t->classify_table_index = config0->table_index;
-	      t->rewrite_entry_index = rwe_index0;
-	    }
-
-	  if (PREDICT_FALSE ((b1->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      l2_rw_trace_t *t = vlib_add_trace (vm, node, b1, sizeof (*t));
-	      t->sw_if_index = sw_if_index1;
-	      t->classify_table_index = config1->table_index;
-	      t->rewrite_entry_index = rwe_index1;
-	    }
-
-	  /* Update feature bitmap and get next feature index */
-	  feature_bitmap0 =
-	    vnet_buffer (b0)->l2.feature_bitmap & ~L2INPUT_FEAT_RW;
-	  feature_bitmap1 =
-	    vnet_buffer (b1)->l2.feature_bitmap & ~L2INPUT_FEAT_RW;
-	  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap0;
-	  vnet_buffer (b1)->l2.feature_bitmap = feature_bitmap1;
-	  next0 = feat_bitmap_get_next_node_index (rw->feat_next_node_index,
-						   feature_bitmap0);
-	  next1 = feat_bitmap_get_next_node_index (rw->feat_next_node_index,
-						   feature_bitmap1);
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, next0, sw_if_index0, feature_bitmap0, rwe_index0;
-	  vlib_buffer_t *b0;
-	  ethernet_header_t *h0;
-	  l2_rw_config_t *config0;
-	  u64 hash0;
-	  vnet_classify_table_t *t0;
-	  vnet_classify_entry_t *e0;
-	  l2_rw_entry_t *rwe0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  h0 = vlib_buffer_get_current (b0);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  config0 = l2_rw_get_config (sw_if_index0);	/*TODO: check sw_if_index0 value */
-	  t0 = pool_elt_at_index (vcm->tables, config0->table_index);
-
-	  hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
-	  e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
-
-	  while (!e0 && (t0->next_table_index != ~0))
-	    {
-	      t0 = pool_elt_at_index (vcm->tables, t0->next_table_index);
-	      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
-	      e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
-	    }
-
-	  rwe_index0 = e0 ? e0->opaque_index : config0->miss_index;
-
-	  if (rwe_index0 != ~0)
-	    {
-	      rwe0 = pool_elt_at_index (rw->entries, rwe_index0);
-	      l2_rw_rewrite (rwe0, (u8 *) h0);
-	    }
-
-	  if (PREDICT_FALSE ((b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      l2_rw_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = sw_if_index0;
-	      t->classify_table_index = config0->table_index;
-	      t->rewrite_entry_index = rwe_index0;
-	    }
-
-	  /* Update feature bitmap and get next feature index */
-	  feature_bitmap0 =
-	    vnet_buffer (b0)->l2.feature_bitmap & ~L2INPUT_FEAT_RW;
-	  vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap0;
-	  next0 = feat_bitmap_get_next_node_index (rw->feat_next_node_index,
-						   feature_bitmap0);
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-int
-l2_rw_mod_entry (u32 * index,
-		 u8 * mask, u8 * value, u32 len, u32 skip, u8 is_del)
-{
-  l2_rw_main_t *rw = &l2_rw_main;
-  l2_rw_entry_t *e = 0;
-  if (*index != ~0)
-    {
-      if (pool_is_free_index (rw->entries, *index))
-	{
-	  return -1;
-	}
-      e = pool_elt_at_index (rw->entries, *index);
-    }
-  else
-    {
-      pool_get (rw->entries, e);
-      *index = e - rw->entries;
-    }
-
-  if (!e)
-    return -1;
-
-  if (is_del)
-    {
-      pool_put (rw->entries, e);
-      return 0;
-    }
-
-  e->skip_n_vectors = skip / sizeof (u32x4);
-  skip -= e->skip_n_vectors * sizeof (u32x4);
-  e->rewrite_n_vectors = (skip + len - 1) / sizeof (u32x4) + 1;
-  vec_alloc_aligned (e->mask, e->rewrite_n_vectors, sizeof (u32x4));
-  memset (e->mask, 0, e->rewrite_n_vectors * sizeof (u32x4));
-  vec_alloc_aligned (e->value, e->rewrite_n_vectors, sizeof (u32x4));
-  memset (e->value, 0, e->rewrite_n_vectors * sizeof (u32x4));
-
-  clib_memcpy (((u8 *) e->value) + skip, value, len);
-  clib_memcpy (((u8 *) e->mask) + skip, mask, len);
-
-  int i;
-  for (i = 0; i < e->rewrite_n_vectors; i++)
-    {
-      e->value[i] &= e->mask[i];
-    }
-
-  return 0;
-}
-
-static clib_error_t *
-l2_rw_entry_cli_fn (vlib_main_t * vm,
-		    unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  u32 index = ~0;
-  u8 *mask = 0;
-  u8 *value = 0;
-  u32 skip = 0;
-  u8 del = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "index %d", &index))
-	;
-      else if (unformat (input, "mask %U", unformat_hex_string, &mask))
-	;
-      else if (unformat (input, "value %U", unformat_hex_string, &value))
-	;
-      else if (unformat (input, "skip %d", &skip))
-	;
-      else if (unformat (input, "del"))
-	del = 1;
-      else
-	break;
-    }
-
-  if (!mask || !value)
-    return clib_error_return (0, "Unspecified mask or value");
-
-  if (vec_len (mask) != vec_len (value))
-    return clib_error_return (0, "Mask and value lengths must be identical");
-
-  int ret;
-  if ((ret =
-       l2_rw_mod_entry (&index, mask, value, vec_len (mask), skip, del)))
-    return clib_error_return (0, "Could not add entry");
-
-  return 0;
-}
-
-/*?
- * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
- *
- * @cliexpar
- * @todo This is incomplete. This needs a detailed description and a
- * practical example.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (l2_rw_entry_cli, static) = {
-  .path = "l2 rewrite entry",
-  .short_help =
-  "l2 rewrite entry [index <index>] [mask <hex-mask>] [value <hex-value>] [skip <n_bytes>] [del]",
-  .function = l2_rw_entry_cli_fn,
-};
-/* *INDENT-ON* */
-
-int
-l2_rw_interface_set_table (u32 sw_if_index, u32 table_index, u32 miss_index)
-{
-  l2_rw_config_t *c = l2_rw_get_config (sw_if_index);
-  l2_rw_main_t *rw = &l2_rw_main;
-
-  c->table_index = table_index;
-  c->miss_index = miss_index;
-  u32 feature_bitmap = (table_index == ~0) ? 0 : L2INPUT_FEAT_RW;
-
-  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_RW, feature_bitmap);
-
-  if (c->table_index == ~0)
-    clib_bitmap_set (rw->configs_bitmap, sw_if_index, 0);
-
-  return 0;
-}
-
-static clib_error_t *
-l2_rw_interface_cli_fn (vlib_main_t * vm,
-			unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 table_index = ~0;
-  u32 sw_if_index = ~0;
-  u32 miss_index = ~0;
-
-  if (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index);
-    }
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "table %d", &table_index))
-	;
-      else if (unformat (input, "miss-index %d", &miss_index))
-	;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0,
-			      "You must specify an interface 'iface <interface>'",
-			      format_unformat_error, input);
-  int ret;
-  if ((ret =
-       l2_rw_interface_set_table (sw_if_index, table_index, miss_index)))
-    return clib_error_return (0, "l2_rw_interface_set_table returned %d",
-			      ret);
-
-  return 0;
-}
-
-/*?
- * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
- *
- * @cliexpar
- * @todo This is incomplete. This needs a detailed description and a
- * practical example.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (l2_rw_interface_cli, static) = {
-  .path = "set interface l2 rewrite",
-  .short_help =
-  "set interface l2 rewrite <interface> [table <table index>] [miss-index <entry-index>]",
-  .function = l2_rw_interface_cli_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-l2_rw_show_interfaces_cli_fn (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cmd)
-{
-  l2_rw_main_t *rw = &l2_rw_main;
-  if (clib_bitmap_count_set_bits (rw->configs_bitmap) == 0)
-    vlib_cli_output (vm, "No interface is currently using l2 rewrite\n");
-
-  uword i;
-  /* *INDENT-OFF* */
-  clib_bitmap_foreach(i, rw->configs_bitmap, {
-      vlib_cli_output (vm, "sw_if_index:%d %U\n", i, format_l2_rw_config, &rw->configs[i]);
-  });
-  /* *INDENT-ON* */
-  return 0;
-}
-
-/*?
- * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
- *
- * @cliexpar
- * @todo This is incomplete. This needs a detailed description and a
- * practical example.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (l2_rw_show_interfaces_cli, static) = {
-  .path = "show l2 rewrite interfaces",
-  .short_help =
-  "show l2 rewrite interfaces",
-  .function = l2_rw_show_interfaces_cli_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-l2_rw_show_entries_cli_fn (vlib_main_t * vm,
-			   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  l2_rw_main_t *rw = &l2_rw_main;
-  l2_rw_entry_t *e;
-  if (pool_elts (rw->entries) == 0)
-    vlib_cli_output (vm, "No entries\n");
-
-  /* *INDENT-OFF* */
-  pool_foreach(e, rw->entries, {
-    vlib_cli_output (vm, "%U\n", format_l2_rw_entry, e);
-  });
-  /* *INDENT-ON* */
-  return 0;
-}
-
-/*?
- * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
- *
- * @cliexpar
- * @todo This is incomplete. This needs a detailed description and a
- * practical example.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (l2_rw_show_entries_cli, static) = {
-  .path = "show l2 rewrite entries",
-  .short_help =
-  "show l2 rewrite entries",
-  .function = l2_rw_show_entries_cli_fn,
-};
-/* *INDENT-ON* */
-
-int
-l2_rw_enable_disable (u32 bridge_domain, u8 disable)
-{
-  u32 mask = L2INPUT_FEAT_RW;
-  l2input_set_bridge_features (bridge_domain, mask, disable ? 0 : mask);
-  return 0;
-}
-
-static clib_error_t *
-l2_rw_set_cli_fn (vlib_main_t * vm,
-		  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  u32 bridge_domain;
-  u8 disable = 0;
-
-  if (unformat_check_input (input) == UNFORMAT_END_OF_INPUT ||
-      !unformat (input, "%d", &bridge_domain))
-    {
-      return clib_error_return (0, "You must specify a bridge domain");
-    }
-
-  if (unformat_check_input (input) != UNFORMAT_END_OF_INPUT &&
-      unformat (input, "disable"))
-    {
-      disable = 1;
-    }
-
-  if (l2_rw_enable_disable (bridge_domain, disable))
-    return clib_error_return (0, "Could not enable or disable rewrite");
-
-  return 0;
-}
-
-/*?
- * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
- *
- * @cliexpar
- * @todo This is incomplete. This needs a detailed description and a
- * practical example.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (l2_rw_set_cli, static) = {
-  .path = "set bridge-domain rewrite",
-  .short_help =
-  "set bridge-domain rewrite <bridge-domain> [disable]",
-  .function = l2_rw_set_cli_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-l2_rw_init (vlib_main_t * vm)
-{
-  l2_rw_main_t *rw = &l2_rw_main;
-  rw->configs = 0;
-  rw->entries = 0;
-  clib_bitmap_alloc (rw->configs_bitmap, 1);
-  feat_bitmap_init_next_nodes (vm,
-			       l2_rw_node.index,
-			       L2INPUT_N_FEAT,
-			       l2input_get_feat_names (),
-			       rw->feat_next_node_index);
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2_rw_init);
-
-enum
-{
-  L2_RW_NEXT_DROP,
-  L2_RW_N_NEXT,
-};
-
-#define foreach_l2_rw_error               \
-_(UNKNOWN, "Unknown error")
-
-typedef enum
-{
-#define _(sym,str) L2_RW_ERROR_##sym,
-  foreach_l2_rw_error
-#undef _
-    L2_RW_N_ERROR,
-} l2_rw_error_t;
-
-static char *l2_rw_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2_rw_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2_rw_node) = {
-  .function = l2_rw_node_fn,
-  .name = "l2-rw",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2_rw_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .n_errors = ARRAY_LEN(l2_rw_error_strings),
-  .error_strings = l2_rw_error_strings,
-  .runtime_data_bytes = 0,
-  .n_next_nodes = L2_RW_N_NEXT,
-  .next_nodes = { [L2_RW_NEXT_DROP]  = "error-drop"},
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2_rw_node, l2_rw_node_fn)
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_rw.h b/vnet/vnet/l2/l2_rw.h
deleted file mode 100644
index 49aa25fb..00000000
--- a/vnet/vnet/l2/l2_rw.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * l2_rw is based on vnet classifier and provides a way
- * to modify packets matching a given table.
- *
- * Tables must be created using vnet's classify features.
- * Entries contained within these tables must have their
- * opaque index set to the rewrite entry created with l2_rw_mod_entry.
- */
-
-#ifndef L2_RW_H_
-#define L2_RW_H_
-
-#include <vnet/l2/l2_input.h>
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED(struct _l2_rw_entry {
-  u16 skip_n_vectors;
-  u16 rewrite_n_vectors;
-  u64 hit_count;
-  u32x4 *mask;
-  u32x4 *value;
-}) l2_rw_entry_t;
-/* *INDENT-ON* */
-
-/* l2_rw configuration for one interface */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED(struct _l2_rw_config {
-  u32 table_index; /* Which classify table to use */
-  u32 miss_index;  /* Rewrite entry to use if table does not match */
-}) l2_rw_config_t;
-/* *INDENT-ON* */
-
-typedef struct
-{
-  /* Next feature node indexes */
-  u32 feat_next_node_index[32];
-
-  /* A pool of entries */
-  l2_rw_entry_t *entries;
-
-  /* Config vector indexed by sw_if_index */
-  l2_rw_config_t *configs;
-  uword *configs_bitmap;
-} l2_rw_main_t;
-
-extern l2_rw_main_t l2_rw_main;
-
-/*
- * Specifies which classify table and miss_index should be used
- * with the given interface.
- * Use special values ~0 in order to un-set table_index
- * or miss_index.
- * l2_rw feature is automatically enabled for the interface
- * when table_index or miss_index is not ~0.
- * returns 0 on success and something else on error.
- */
-int l2_rw_interface_set_table (u32 sw_if_index,
-			       u32 table_index, u32 miss_index);
-
-/*
- * Creates, modifies or delete a rewrite entry.
- * If *index != ~0, modifies an existing entry (or simply
- * deletes it if is_del is set).
- * If *index == ~0, creates a new entry and the created
- * entry index is stored in *index (Does nothing if is_del
- * is set).
- * returns 0 on success and something else on error.
- */
-int l2_rw_mod_entry (u32 * index,
-		     u8 * mask, u8 * value, u32 len, u32 skip, u8 is_del);
-
-#endif /* L2_FW_H_ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_vtr.c b/vnet/vnet/l2/l2_vtr.c
deleted file mode 100644
index 95a4f157..00000000
--- a/vnet/vnet/l2/l2_vtr.c
+++ /dev/null
@@ -1,770 +0,0 @@
-/*
- * l2_vtr.c : layer 2 vlan tag rewrite configuration
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/l2_output.h>
-#include <vnet/l2/feat_bitmap.h>
-#include <vnet/l2/l2_vtr.h>
-#include <vnet/l2/l2_input_vtr.h>
-#include <vnet/l2/l2_output.h>
-
-#include <vppinfra/error.h>
-#include <vlib/cli.h>
-
-/**
- * @file
- * @brief Ethernet VLAN Tag Rewrite.
- *
- * VLAN tag rewrite provides the ability to change the VLAN tags on a packet.
- * Existing tags can be popped, new tags can be pushed, and existing tags can
- * be swapped with new tags. The rewrite feature is attached to a subinterface
- * as input and output operations. The input operation is explicitly configured.
- * The output operation is the symmetric opposite and is automatically derived
- * from the input operation.
- */
-
-/** Just a placeholder; ensures file is not eliminated by linker. */
-clib_error_t *
-l2_vtr_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2_vtr_init);
-
-u32
-l2pbb_configure (vlib_main_t * vlib_main,
-		 vnet_main_t * vnet_main, u32 sw_if_index, u32 vtr_op,
-		 u8 * b_dmac, u8 * b_smac,
-		 u16 b_vlanid, u32 i_sid, u16 vlan_outer_tag)
-{
-  u32 error = 0;
-  u32 enable = 0;
-
-  l2_output_config_t *config = 0;
-  vnet_hw_interface_t *hi;
-  hi = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
-
-  if (!hi)
-    {
-      error = VNET_API_ERROR_INVALID_INTERFACE;
-      goto done;
-    }
-
-  // Config for this interface should be already initialized
-  ptr_config_t *in_config;
-  ptr_config_t *out_config;
-  config = vec_elt_at_index (l2output_main.configs, sw_if_index);
-  in_config = &(config->input_pbb_vtr);
-  out_config = &(config->output_pbb_vtr);
-
-  in_config->pop_bytes = 0;
-  in_config->push_bytes = 0;
-  out_config->pop_bytes = 0;
-  out_config->push_bytes = 0;
-  enable = (vtr_op != L2_VTR_DISABLED);
-
-  if (!enable)
-    goto done;
-
-  if (vtr_op == L2_VTR_POP_2)
-    {
-      in_config->pop_bytes = sizeof (ethernet_pbb_header_packed_t);
-    }
-  else if (vtr_op == L2_VTR_PUSH_2)
-    {
-      clib_memcpy (in_config->macs_tags.b_dst_address, b_dmac,
-		   sizeof (in_config->macs_tags.b_dst_address));
-      clib_memcpy (in_config->macs_tags.b_src_address, b_smac,
-		   sizeof (in_config->macs_tags.b_src_address));
-      in_config->macs_tags.b_type =
-	clib_net_to_host_u16 (ETHERNET_TYPE_DOT1AD);
-      in_config->macs_tags.priority_dei_id =
-	clib_net_to_host_u16 (b_vlanid & 0xFFF);
-      in_config->macs_tags.i_type =
-	clib_net_to_host_u16 (ETHERNET_TYPE_DOT1AH);
-      in_config->macs_tags.priority_dei_uca_res_sid =
-	clib_net_to_host_u32 (i_sid & 0xFFFFF);
-      in_config->push_bytes = sizeof (ethernet_pbb_header_packed_t);
-    }
-  else if (vtr_op == L2_VTR_TRANSLATE_2_2)
-    {
-      /* TODO after PoC */
-    }
-
-  /*
-   *  Construct the output tag-rewrite config
-   *
-   *  The push/pop values are always reversed
-   */
-  out_config->raw_data = in_config->raw_data;
-  out_config->pop_bytes = in_config->push_bytes;
-  out_config->push_bytes = in_config->pop_bytes;
-
-done:
-  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_VTR, enable);
-  if (config)
-    config->out_vtr_flag = (u8) enable;
-
-  /* output vtr enable is checked explicitly in l2_output */
-  return error;
-}
-
-/**
- * Configure vtag tag rewrite on the given interface.
- * Return 1 if there is an error, 0 if ok
- */
-u32
-l2vtr_configure (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 sw_if_index, u32 vtr_op, u32 push_dot1q,	/* ethertype of first pushed tag is dot1q/dot1ad */
-		 u32 vtr_tag1,	/* first pushed tag */
-		 u32 vtr_tag2)	/* second pushed tag */
-{
-  vnet_hw_interface_t *hi;
-  vnet_sw_interface_t *si;
-  u32 hw_no_tags;
-  u32 error = 0;
-  l2_output_config_t *config;
-  vtr_config_t *in_config;
-  vtr_config_t *out_config;
-  u32 enable;
-  u32 push_inner_et;
-  u32 push_outer_et;
-  u32 cfg_tags;
-
-  hi = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
-  if (!hi || (hi->hw_class_index != ethernet_hw_interface_class.index))
-    {
-      error = VNET_API_ERROR_INVALID_INTERFACE;	/* non-ethernet interface */
-      goto done;
-    }
-
-  /* Init the config for this interface */
-  vec_validate (l2output_main.configs, sw_if_index);
-  config = vec_elt_at_index (l2output_main.configs, sw_if_index);
-  in_config = &(config->input_vtr);
-  out_config = &(config->output_vtr);
-  in_config->raw_tags = 0;
-  out_config->raw_tags = 0;
-
-  /* Get the configured tags for the interface */
-  si = vnet_get_sw_interface (vnet_main, sw_if_index);
-  hw_no_tags = (si->type == VNET_SW_INTERFACE_TYPE_HARDWARE);
-
-  /* Construct the input tag-rewrite config */
-
-  push_outer_et =
-    clib_net_to_host_u16 (push_dot1q ? ETHERNET_TYPE_VLAN :
-			  ETHERNET_TYPE_DOT1AD);
-  push_inner_et = clib_net_to_host_u16 (ETHERNET_TYPE_VLAN);
-  vtr_tag1 = clib_net_to_host_u16 (vtr_tag1);
-  vtr_tag2 = clib_net_to_host_u16 (vtr_tag2);
-
-  /* Determine number of vlan tags with explictly configured values */
-  cfg_tags = 0;
-  if (hw_no_tags || si->sub.eth.flags.no_tags)
-    {
-      cfg_tags = 0;
-    }
-  else if (si->sub.eth.flags.one_tag)
-    {
-      cfg_tags = 1;
-      if (si->sub.eth.flags.outer_vlan_id_any)
-	{
-	  cfg_tags = 0;
-	}
-    }
-  else if (si->sub.eth.flags.two_tags)
-    {
-      cfg_tags = 2;
-      if (si->sub.eth.flags.inner_vlan_id_any)
-	{
-	  cfg_tags = 1;
-	}
-      if (si->sub.eth.flags.outer_vlan_id_any)
-	{
-	  cfg_tags = 0;
-	}
-    }
-
-  switch (vtr_op)
-    {
-    case L2_VTR_DISABLED:
-      in_config->push_and_pop_bytes = 0;
-      break;
-
-    case L2_VTR_POP_1:
-      if (cfg_tags < 1)
-	{
-	  /* Need one or two tags */
-	  error = VNET_API_ERROR_INVALID_VLAN_TAG_COUNT;
-	  goto done;
-	}
-      in_config->pop_bytes = 4;
-      in_config->push_bytes = 0;
-      break;
-
-    case L2_VTR_POP_2:
-      if (cfg_tags < 2)
-	{
-	  error = VNET_API_ERROR_INVALID_VLAN_TAG_COUNT;	/* Need two tags */
-	  goto done;
-	}
-      in_config->pop_bytes = 8;
-      in_config->push_bytes = 0;
-
-      out_config->push_bytes = in_config->pop_bytes;
-      out_config->pop_bytes = in_config->push_bytes;
-      break;
-
-    case L2_VTR_PUSH_1:
-      in_config->pop_bytes = 0;
-      in_config->push_bytes = 4;
-      in_config->tags[1].priority_cfi_and_id = vtr_tag1;
-      in_config->tags[1].type = push_outer_et;
-      break;
-
-    case L2_VTR_PUSH_2:
-      in_config->pop_bytes = 0;
-      in_config->push_bytes = 8;
-      in_config->tags[0].priority_cfi_and_id = vtr_tag1;
-      in_config->tags[0].type = push_outer_et;
-      in_config->tags[1].priority_cfi_and_id = vtr_tag2;
-      in_config->tags[1].type = push_inner_et;
-      break;
-
-    case L2_VTR_TRANSLATE_1_1:
-      if (cfg_tags < 1)
-	{
-	  error = VNET_API_ERROR_INVALID_VLAN_TAG_COUNT;	/* Need one or two tags */
-	  goto done;
-	}
-      in_config->pop_bytes = 4;
-      in_config->push_bytes = 4;
-      in_config->tags[1].priority_cfi_and_id = vtr_tag1;
-      in_config->tags[1].type = push_outer_et;
-      break;
-
-    case L2_VTR_TRANSLATE_1_2:
-      if (cfg_tags < 1)
-	{
-	  error = VNET_API_ERROR_INVALID_VLAN_TAG_COUNT;	/* Need one or two tags */
-	  goto done;
-	}
-      in_config->pop_bytes = 4;
-      in_config->push_bytes = 8;
-      in_config->tags[0].priority_cfi_and_id = vtr_tag1;
-      in_config->tags[0].type = push_outer_et;
-      in_config->tags[1].priority_cfi_and_id = vtr_tag2;
-      in_config->tags[1].type = push_inner_et;
-      break;
-
-    case L2_VTR_TRANSLATE_2_1:
-      if (cfg_tags < 2)
-	{
-	  error = VNET_API_ERROR_INVALID_VLAN_TAG_COUNT;	/* Need two tags */
-	  goto done;
-	}
-      in_config->pop_bytes = 8;
-      in_config->push_bytes = 4;
-      in_config->tags[1].priority_cfi_and_id = vtr_tag1;
-      in_config->tags[1].type = push_outer_et;
-      break;
-
-    case L2_VTR_TRANSLATE_2_2:
-      if (cfg_tags < 2)
-	{
-	  error = VNET_API_ERROR_INVALID_VLAN_TAG_COUNT;	/* Need two tags */
-	  goto done;
-	}
-      in_config->pop_bytes = 8;
-      in_config->push_bytes = 8;
-      in_config->tags[0].priority_cfi_and_id = vtr_tag1;
-      in_config->tags[0].type = push_outer_et;
-      in_config->tags[1].priority_cfi_and_id = vtr_tag2;
-      in_config->tags[1].type = push_inner_et;
-      break;
-    }
-
-  /*
-   *  Construct the output tag-rewrite config
-   *
-   *  The push/pop values are always reversed
-   */
-  out_config->push_bytes = in_config->pop_bytes;
-  out_config->pop_bytes = in_config->push_bytes;
-
-  /* Any pushed tags are derived from the subinterface config */
-  push_outer_et =
-    clib_net_to_host_u16 (si->sub.eth.flags.dot1ad ? ETHERNET_TYPE_DOT1AD :
-			  ETHERNET_TYPE_VLAN);
-  push_inner_et = clib_net_to_host_u16 (ETHERNET_TYPE_VLAN);
-  vtr_tag1 = clib_net_to_host_u16 (si->sub.eth.outer_vlan_id);
-  vtr_tag2 = clib_net_to_host_u16 (si->sub.eth.inner_vlan_id);
-
-  if (out_config->push_bytes == 4)
-    {
-      out_config->tags[1].priority_cfi_and_id = vtr_tag1;
-      out_config->tags[1].type = push_outer_et;
-    }
-  else if (out_config->push_bytes == 8)
-    {
-      out_config->tags[0].priority_cfi_and_id = vtr_tag1;
-      out_config->tags[0].type = push_outer_et;
-      out_config->tags[1].priority_cfi_and_id = vtr_tag2;
-      out_config->tags[1].type = push_inner_et;
-    }
-
-  /* set the interface enable flags */
-  enable = (vtr_op != L2_VTR_DISABLED);
-  config->out_vtr_flag = (u8) enable;
-  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_VTR, enable);
-  /* output vtr enable is checked explicitly in l2_output */
-
-done:
-  return error;
-}
-
-/**
- * Get vtag tag rewrite on the given interface.
- * Return 1 if there is an error, 0 if ok
- */
-u32
-l2vtr_get (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 sw_if_index, u32 * vtr_op, u32 * push_dot1q,	/* ethertype of first pushed tag is dot1q/dot1ad */
-	   u32 * vtr_tag1,	/* first pushed tag */
-	   u32 * vtr_tag2)	/* second pushed tag */
-{
-  vnet_hw_interface_t *hi;
-  u32 error = 0;
-  vtr_config_t *in_config;
-
-  if (!vtr_op || !push_dot1q || !vtr_tag1 || !vtr_tag2)
-    {
-      clib_warning ("invalid arguments");
-      error = VNET_API_ERROR_INVALID_ARGUMENT;
-      goto done;
-    }
-
-  *vtr_op = L2_VTR_DISABLED;
-  *vtr_tag1 = 0;
-  *vtr_tag2 = 0;
-  *push_dot1q = 0;
-
-  hi = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
-  if (!hi || (hi->hw_class_index != ethernet_hw_interface_class.index))
-    {
-      /* non-ethernet interface */
-      goto done;
-    }
-
-  if (sw_if_index >= vec_len (l2output_main.configs))
-    {
-      /* no specific config (return disabled) */
-      goto done;
-    }
-
-  /* Get the config for this interface */
-  in_config =
-    &(vec_elt_at_index (l2output_main.configs, sw_if_index)->input_vtr);
-
-  /* DISABLED */
-  if (in_config->push_and_pop_bytes == 0)
-    {
-      goto done;
-    }
-
-  /* find out vtr_op */
-  switch (in_config->pop_bytes)
-    {
-    case 0:
-      switch (in_config->push_bytes)
-	{
-	case 0:
-	  /* DISABLED */
-	  goto done;
-	case 4:
-	  *vtr_op = L2_VTR_PUSH_1;
-	  *vtr_tag1 =
-	    clib_host_to_net_u16 (in_config->tags[1].priority_cfi_and_id);
-	  *push_dot1q =
-	    (ETHERNET_TYPE_VLAN ==
-	     clib_host_to_net_u16 (in_config->tags[1].type));
-	  break;
-	case 8:
-	  *vtr_op = L2_VTR_PUSH_2;
-	  *vtr_tag1 =
-	    clib_host_to_net_u16 (in_config->tags[0].priority_cfi_and_id);
-	  *vtr_tag2 =
-	    clib_host_to_net_u16 (in_config->tags[1].priority_cfi_and_id);
-	  *push_dot1q =
-	    (ETHERNET_TYPE_VLAN ==
-	     clib_host_to_net_u16 (in_config->tags[0].type));
-	  break;
-	default:
-	  clib_warning ("invalid push_bytes count: %d",
-			in_config->push_bytes);
-	  error = VNET_API_ERROR_UNEXPECTED_INTF_STATE;
-	  goto done;
-	}
-      break;
-
-    case 4:
-      switch (in_config->push_bytes)
-	{
-	case 0:
-	  *vtr_op = L2_VTR_POP_1;
-	  break;
-	case 4:
-	  *vtr_op = L2_VTR_TRANSLATE_1_1;
-	  *vtr_tag1 =
-	    clib_host_to_net_u16 (in_config->tags[1].priority_cfi_and_id);
-	  *push_dot1q =
-	    (ETHERNET_TYPE_VLAN ==
-	     clib_host_to_net_u16 (in_config->tags[1].type));
-	  break;
-	case 8:
-	  *vtr_op = L2_VTR_TRANSLATE_1_2;
-	  *vtr_tag1 =
-	    clib_host_to_net_u16 (in_config->tags[0].priority_cfi_and_id);
-	  *vtr_tag2 =
-	    clib_host_to_net_u16 (in_config->tags[1].priority_cfi_and_id);
-	  *push_dot1q =
-	    (ETHERNET_TYPE_VLAN ==
-	     clib_host_to_net_u16 (in_config->tags[0].type));
-	  break;
-	default:
-	  clib_warning ("invalid push_bytes count: %d",
-			in_config->push_bytes);
-	  error = VNET_API_ERROR_UNEXPECTED_INTF_STATE;
-	  goto done;
-	}
-      break;
-
-    case 8:
-      switch (in_config->push_bytes)
-	{
-	case 0:
-	  *vtr_op = L2_VTR_POP_2;
-	  break;
-	case 4:
-	  *vtr_op = L2_VTR_TRANSLATE_2_1;
-	  *vtr_tag1 =
-	    clib_host_to_net_u16 (in_config->tags[1].priority_cfi_and_id);
-	  *push_dot1q =
-	    (ETHERNET_TYPE_VLAN ==
-	     clib_host_to_net_u16 (in_config->tags[1].type));
-	  break;
-	case 8:
-	  *vtr_op = L2_VTR_TRANSLATE_2_2;
-	  *vtr_tag1 =
-	    clib_host_to_net_u16 (in_config->tags[0].priority_cfi_and_id);
-	  *vtr_tag2 =
-	    clib_host_to_net_u16 (in_config->tags[1].priority_cfi_and_id);
-	  *push_dot1q =
-	    (ETHERNET_TYPE_VLAN ==
-	     clib_host_to_net_u16 (in_config->tags[0].type));
-	  break;
-	default:
-	  clib_warning ("invalid push_bytes count: %d",
-			in_config->push_bytes);
-	  error = VNET_API_ERROR_UNEXPECTED_INTF_STATE;
-	  goto done;
-	}
-      break;
-
-    default:
-      clib_warning ("invalid pop_bytes count: %d", in_config->pop_bytes);
-      error = VNET_API_ERROR_UNEXPECTED_INTF_STATE;
-      goto done;
-    }
-
-done:
-  return error;
-}
-
-/**
- * Set subinterface vtr enable/disable.
- * The CLI format is:
- *    set interface l2 tag-rewrite <interface> [disable | pop 1 | pop 2 | push {dot1q|dot1ad} <tag> [<tag>]]
- *
- *  "push" can also be replaced by "translate-{1|2}-{1|2}"
- */
-static clib_error_t *
-int_l2_vtr (vlib_main_t * vm,
-	    unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index;
-  u32 vtr_op;
-  u32 push_dot1q = 0;
-  u32 tag1 = 0, tag2 = 0;
-
-  if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  vtr_op = L2_VTR_DISABLED;
-
-  if (unformat (input, "disable"))
-    {
-      vtr_op = L2_VTR_DISABLED;
-    }
-  else if (unformat (input, "pop 1"))
-    {
-      vtr_op = L2_VTR_POP_1;
-    }
-  else if (unformat (input, "pop 2"))
-    {
-      vtr_op = L2_VTR_POP_2;
-
-    }
-  else if (unformat (input, "push dot1q %d %d", &tag1, &tag2))
-    {
-      vtr_op = L2_VTR_PUSH_2;
-      push_dot1q = 1;
-    }
-  else if (unformat (input, "push dot1ad %d %d", &tag1, &tag2))
-    {
-      vtr_op = L2_VTR_PUSH_2;
-
-    }
-  else if (unformat (input, "push dot1q %d", &tag1))
-    {
-      vtr_op = L2_VTR_PUSH_1;
-      push_dot1q = 1;
-    }
-  else if (unformat (input, "push dot1ad %d", &tag1))
-    {
-      vtr_op = L2_VTR_PUSH_1;
-
-    }
-  else if (unformat (input, "translate 1-1 dot1q %d", &tag1))
-    {
-      vtr_op = L2_VTR_TRANSLATE_1_1;
-      push_dot1q = 1;
-    }
-  else if (unformat (input, "translate 1-1 dot1ad %d", &tag1))
-    {
-      vtr_op = L2_VTR_TRANSLATE_1_1;
-
-    }
-  else if (unformat (input, "translate 2-1 dot1q %d", &tag1))
-    {
-      vtr_op = L2_VTR_TRANSLATE_2_1;
-      push_dot1q = 1;
-    }
-  else if (unformat (input, "translate 2-1 dot1ad %d", &tag1))
-    {
-      vtr_op = L2_VTR_TRANSLATE_2_1;
-
-    }
-  else if (unformat (input, "translate 2-2 dot1q %d %d", &tag1, &tag2))
-    {
-      vtr_op = L2_VTR_TRANSLATE_2_2;
-      push_dot1q = 1;
-    }
-  else if (unformat (input, "translate 2-2 dot1ad %d %d", &tag1, &tag2))
-    {
-      vtr_op = L2_VTR_TRANSLATE_2_2;
-
-    }
-  else if (unformat (input, "translate 1-2 dot1q %d %d", &tag1, &tag2))
-    {
-      vtr_op = L2_VTR_TRANSLATE_1_2;
-      push_dot1q = 1;
-    }
-  else if (unformat (input, "translate 1-2 dot1ad %d %d", &tag1, &tag2))
-    {
-      vtr_op = L2_VTR_TRANSLATE_1_2;
-
-    }
-  else
-    {
-      error =
-	clib_error_return (0,
-			   "expecting [disable | pop 1 | pop 2 | push {dot1q|dot1ah} <tag> [<tag>]\n"
-			   " | translate {1|2}-{1|2} {dot1q|dot1ah} <tag> [<tag>]] but got `%U'",
-			   format_unformat_error, input);
-      goto done;
-    }
-
-  if (l2vtr_configure (vm, vnm, sw_if_index, vtr_op, push_dot1q, tag1, tag2))
-    {
-      error =
-	clib_error_return (0,
-			   "vlan tag rewrite is not compatible with interface");
-      goto done;
-    }
-
-done:
-  return error;
-}
-
-/*?
- * VLAN tag rewrite provides the ability to change the VLAN tags on a packet.
- * Existing tags can be popped, new tags can be pushed, and existing tags can
- * be swapped with new tags. The rewrite feature is attached to a subinterface
- * as input and output operations. The input operation is explicitly configured.
- * The output operation is the symmetric opposite and is automatically derived
- * from the input operation.
- *
- * <b>POP:</b> For pop operations, the subinterface encapsulation (the vlan
- * tags specified when it was created) must have at least the number of popped
- * tags. e.g. the \"pop 2\" operation would be rejected on a single-vlan interface.
- * The output tag-rewrite operation for pops is to push the specified number of
- * vlan tags onto the packet. The pushed tag values are the ones in the
- * subinterface encapsulation.
- *
- * <b>PUSH:</b> For push operations, the ethertype is also specified. The
- * output tag-rewrite operation for pushes is to pop the same number of tags
- * off the packet. If the packet doesn't have enough tags it is dropped.
- *
- *
- * @cliexpar
- * @parblock
- * By default a subinterface has no tag-rewrite. To return a subinterface to
- * this state use:
- * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 disable}
- *
- * To pop vlan tags off packets received from a subinterface, use:
- * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 pop 1}
- * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 pop 2}
- *
- * To push one or two vlan tags onto packets received from an interface, use:
- * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 push dot1q 100}
- * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 push dot1ad 100 150}
- *
- * Tags can also be translated, which is basically a combination of a pop and push.
- * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 translate 1-1 dot1ad 100}
- * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 translate 2-2 dot1ad 100 150}
- * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 translate 1-2 dot1q 100}
- * @cliexcmd{set interface l2 tag-rewrite GigabitEthernet0/8/0.200 translate 2-1 dot1q 100 150}
- *
- * To display the VLAN Tag settings, show the associate bridge-domain:
- * @cliexstart{show bridge-domain 200 detail}
- *  ID   Index   Learning   U-Forwrd   UU-Flood   Flooding   ARP-Term     BVI-Intf
- * 200     1        on         on         on         on         off          N/A
- *
- *          Interface           Index  SHG  BVI        VLAN-Tag-Rewrite
- *  GigabitEthernet0/8/0.200      5     0    -       trans-1-1 dot1ad 100
- *  GigabitEthernet0/9/0.200      4     0    -               none
- *  GigabitEthernet0/a/0.200      6     0    -               none
- * @cliexend
- * @endparblock
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (int_l2_vtr_cli, static) = {
-  .path = "set interface l2 tag-rewrite",
-  .short_help = "set interface l2 tag-rewrite <interface> [disable | pop {1|2} | push {dot1q|dot1ad} <tag> <tag>]",
-  .function = int_l2_vtr,
-};
-/* *INDENT-ON* */
-
-/**
- * Set subinterface pbb vtr enable/disable.
- * The CLI format is:
- *    set interface l2 pbb-tag-rewrite <interface> [disable | pop | push | translate_pbb_stag <outer_tag> dmac <address> smac <address> s_id <nn> [b_vlanid <nn>]]
- */
-static clib_error_t *
-int_l2_pbb_vtr (vlib_main_t * vm,
-		unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error = 0;
-  u32 sw_if_index, tmp;
-  u32 vtr_op = L2_VTR_DISABLED;
-  u32 outer_tag = 0;
-  u8 dmac[6];
-  u8 smac[6];
-  u8 dmac_set = 0, smac_set = 0;
-  u16 b_vlanid = 0;
-  u32 s_id = ~0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat_user
-	  (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-	;
-      else if (unformat (input, "disable"))
-	vtr_op = L2_VTR_DISABLED;
-      else if (vtr_op == L2_VTR_DISABLED && unformat (input, "pop"))
-	vtr_op = L2_VTR_POP_2;
-      else if (vtr_op == L2_VTR_DISABLED && unformat (input, "push"))
-	vtr_op = L2_VTR_PUSH_2;
-      else if (vtr_op == L2_VTR_DISABLED
-	       && unformat (input, "translate_pbb_stag %d", &outer_tag))
-	vtr_op = L2_VTR_TRANSLATE_2_1;
-      else if (unformat (input, "dmac %U", unformat_ethernet_address, dmac))
-	dmac_set = 1;
-      else if (unformat (input, "smac %U", unformat_ethernet_address, smac))
-	smac_set = 1;
-      else if (unformat (input, "b_vlanid %d", &tmp))
-	b_vlanid = tmp;
-      else if (unformat (input, "s_id %d", &s_id))
-	;
-      else
-	{
-	  error = clib_error_return (0,
-				     "expecting [disable | pop | push | translate_pbb_stag <outer_tag>\n"
-				     "dmac <address> smac <address> s_id <nn> [b_vlanid <nn>]]");
-	  goto done;
-	}
-    }
-
-  if ((vtr_op == L2_VTR_PUSH_2 || vtr_op == L2_VTR_TRANSLATE_2_1)
-      && (!dmac_set || !smac_set || s_id == ~0))
-    {
-      error = clib_error_return (0,
-				 "expecting dmac <address> smac <address> s_id <nn> [b_vlanid <nn>]");
-      goto done;
-    }
-
-  if (l2pbb_configure
-      (vm, vnm, sw_if_index, vtr_op, dmac, smac, b_vlanid, s_id, outer_tag))
-    {
-      error =
-	clib_error_return (0,
-			   "pbb tag rewrite is not compatible with interface");
-      goto done;
-    }
-
-done:
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (int_l2_pbb_vtr_cli, static) = {
-  .path = "set interface l2 pbb-tag-rewrite",
-  .short_help = "set interface l2 pbb-tag-rewrite <interface> [disable | pop | push | translate_pbb_stag <outer_tag> dmac <address> smac <address> s_id <nn> [b_vlanid <nn>]]",
-  .function = int_l2_pbb_vtr,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_vtr.h b/vnet/vnet/l2/l2_vtr.h
deleted file mode 100644
index 893b2272..00000000
--- a/vnet/vnet/l2/l2_vtr.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * l2_vtr.h : layer 2 vlan tag rewrite processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_vnet_l2_vtr_h
-#define included_vnet_l2_vtr_h
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/l2/l2_vtr.h>
-
-/* VTR config options for API and CLI support */
-typedef enum
-{
-  L2_VTR_DISABLED,
-  L2_VTR_PUSH_1,
-  L2_VTR_PUSH_2,
-  L2_VTR_POP_1,
-  L2_VTR_POP_2,
-  L2_VTR_TRANSLATE_1_1,
-  L2_VTR_TRANSLATE_1_2,
-  L2_VTR_TRANSLATE_2_1,
-  L2_VTR_TRANSLATE_2_2
-} l2_vtr_op_t;
-
-/**
- * Per-interface vlan tag rewrite configuration
- * There will be one instance of this struct for each sw_if_index
- * for both input vtr and output vtr
- */
-typedef struct
-{
-  union
-  {
-    /*
-     * Up to two vlan tags to push.
-     * if there is only one vlan tag to push, it is in tags[1].
-     */
-    ethernet_vlan_header_tv_t tags[2];
-    u64 raw_tags;
-  };
-
-  union
-  {
-    struct
-    {
-      u8 push_bytes;		/* number of bytes to push for up to 2 vlans (0,4,8) */
-      u8 pop_bytes;		/* number of bytes to pop for up to 2 vlans (0,4,8) */
-    };
-    u16 push_and_pop_bytes;	/* if 0 then the feature is disabled */
-  };
-} vtr_config_t;
-
-
-/**
- * Perform the configured tag rewrite on the packet.
- * Return 0 if ok, 1 if packet should be dropped (e.g. tried to pop
- * too many tags)
- */
-always_inline u32
-l2_vtr_process (vlib_buffer_t * b0, vtr_config_t * config)
-{
-  u64 temp_8;
-  u32 temp_4;
-  u8 *eth;
-
-  eth = vlib_buffer_get_current (b0);
-
-  /* copy the 12B dmac and smac to a temporary location */
-  temp_8 = *((u64 *) eth);
-  temp_4 = *((u32 *) (eth + 8));
-
-  /* adjust for popped tags */
-  eth += config->pop_bytes;
-
-  /* if not enough tags to pop then drop packet */
-  if (PREDICT_FALSE ((vnet_buffer (b0)->l2.l2_len - 12) < config->pop_bytes))
-    {
-      return 1;
-    }
-
-  /* copy the 2 new tags to the start of the packet  */
-  *((u64 *) (eth + 12 - 8)) = config->raw_tags;
-
-  /* TODO: set cos bits */
-
-  /* adjust for pushed tags: */
-  eth -= config->push_bytes;
-
-  /* copy the 12 dmac and smac back to the packet */
-  *((u64 *) eth) = temp_8;
-  *((u32 *) (eth + 8)) = temp_4;
-
-  /* Update l2_len */
-  vnet_buffer (b0)->l2.l2_len +=
-    (word) config->push_bytes - (word) config->pop_bytes;
-
-  /* Update vlan tag count */
-  ethernet_buffer_adjust_vlan_count_by_bytes (b0,
-					      (word) config->push_bytes -
-					      (word) config->pop_bytes);
-
-  /* Update packet len */
-  vlib_buffer_advance (b0,
-		       (word) config->pop_bytes - (word) config->push_bytes);
-
-  return 0;
-}
-
-
-/*
- *  Perform the egress pre-vlan tag rewrite EFP Filter check.
- * The post-vlan tag rewrite check is a separate graph node.
- *
- *  This check insures that a packet being output to an interface
- * (before output vtr is performed) has vlan tags that match those
- * on a packet received from that interface (after vtr has been performed).
- * This means verifying that any tags pushed by input vtr are present
- * on the packet.
- *
- *  Return 0 if ok, 1 if packet should be dropped.
- * This function should be passed the input vtr config for the interface.
- */
-always_inline u8
-l2_efp_filter_process (vlib_buffer_t * b0, vtr_config_t * in_config)
-{
-  u8 *eth;
-  u64 packet_tags;
-  u64 tag_mask;
-
-  eth = vlib_buffer_get_current (b0);
-
-  /*
-   * If there are 2 tags pushed, they must match config->tags[0] and
-   * config->tags[1].
-   * If there is one tag pushed, it must match config->tag[1].
-   * If there are 0 tags pushed, the check passes.
-   */
-
-  /* mask for two vlan id and ethertypes, no cos bits */
-  tag_mask = clib_net_to_host_u64 (0xFFFF0FFFFFFF0FFF);
-  /* mask for one vlan id and ethertype, no cos bits */
-  tag_mask =
-    (in_config->push_bytes ==
-     4) ? clib_net_to_host_u64 (0xFFFF0FFF) : tag_mask;
-  /* mask for always match */
-  tag_mask = (in_config->push_bytes == 0) ? 0 : tag_mask;
-
-  /*
-   * Read 8B from the packet, getting the proper set of vlan tags
-   * For 0 push bytes, the address doesn't matter since the mask
-   * clears the data to 0.
-   */
-  packet_tags = *((u64 *) (eth + 4 + in_config->push_bytes));
-
-  /* Check if the packet tags match the configured tags */
-  return (packet_tags & tag_mask) != in_config->raw_tags;
-}
-
-typedef struct
-{
-  union
-  {
-    ethernet_pbb_header_t macs_tags;
-    struct
-    {
-      u64 data1;
-      u64 data2;
-      u16 data3;
-      u32 data4;
-    } raw_data;
-  };
-  union
-  {
-    struct
-    {
-      u8 push_bytes;		/* number of bytes to push pbb tags */
-      u8 pop_bytes;		/* number of bytes to pop pbb tags */
-    };
-    u16 push_and_pop_bytes;	/* if 0 then the feature is disabled */
-  };
-} ptr_config_t;
-
-always_inline u32
-l2_pbb_process (vlib_buffer_t * b0, ptr_config_t * config)
-{
-  u8 *eth = vlib_buffer_get_current (b0);
-
-  if (config->pop_bytes > 0)
-    {
-      ethernet_pbb_header_packed_t *ph = (ethernet_pbb_header_packed_t *) eth;
-
-      // drop packet without PBB header or with wrong I-tag or B-tag
-      if (clib_net_to_host_u16 (ph->priority_dei_id) !=
-	  clib_net_to_host_u16 (config->macs_tags.priority_dei_id)
-	  || clib_net_to_host_u32 (ph->priority_dei_uca_res_sid) !=
-	  clib_net_to_host_u32 (config->macs_tags.priority_dei_uca_res_sid))
-	return 1;
-
-      eth += config->pop_bytes;
-    }
-
-  if (config->push_bytes > 0)
-    {
-      eth -= config->push_bytes;
-      // copy the B-DA (6B), B-SA (6B), B-TAG (4B), I-TAG (6B)
-      *((u64 *) eth) = config->raw_data.data1;
-      *((u64 *) (eth + 8)) = config->raw_data.data2;
-      *((u16 *) (eth + 16)) = config->raw_data.data3;
-      *((u32 *) (eth + 18)) = config->raw_data.data4;
-    }
-
-  /* Update l2_len */
-  vnet_buffer (b0)->l2.l2_len +=
-    (word) config->push_bytes - (word) config->pop_bytes;
-  /* Update packet len */
-  vlib_buffer_advance (b0,
-		       (word) config->pop_bytes - (word) config->push_bytes);
-
-  return 0;
-}
-
-u32 l2pbb_configure (vlib_main_t * vlib_main,
-		     vnet_main_t * vnet_main, u32 sw_if_index, u32 vtr_op,
-		     u8 * b_dmac, u8 * b_smac,
-		     u16 b_vlanid, u32 i_sid, u16 vlan_outer_tag);
-
-/**
- * Configure vtag tag rewrite on the given interface.
- * Return 1 if there is an error, 0 if ok
- */
-u32 l2vtr_configure (vlib_main_t * vlib_main,
-		     vnet_main_t * vnet_main,
-		     u32 sw_if_index,
-		     u32 vtr_op, u32 push_dot1q, u32 vtr_tag1, u32 vtr_tag2);
-
-/**
- * Get vtag tag rewrite on the given interface.
- * Return 1 if there is an error, 0 if ok
- */
-u32 l2vtr_get (vlib_main_t * vlib_main,
-	       vnet_main_t * vnet_main,
-	       u32 sw_if_index,
-	       u32 * vtr_op,
-	       u32 * push_dot1q, u32 * vtr_tag1, u32 * vtr_tag2);
-
-#endif /* included_vnet_l2_vtr_h */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_xcrw.c b/vnet/vnet/l2/l2_xcrw.c
deleted file mode 100644
index 70610a85..00000000
--- a/vnet/vnet/l2/l2_xcrw.c
+++ /dev/null
@@ -1,591 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/l2/l2_xcrw.h>
-
-/**
- * @file
- * General L2 / L3 cross-connect, used to set up
- * "L2 interface <--> your-favorite-tunnel-encap" tunnels.
- *
- * We set up a typical L2 cross-connect or (future) bridge
- * to hook L2 interface(s) up to the L3 stack in arbitrary ways.
- *
- * Each l2_xcrw adjacency specifies 3 things:
- *
- * 1. The next graph node (presumably in the L3 stack) to
- *    process the (L2 -> L3) packet
- *
- * 2. A new value for vnet_buffer(b)->sw_if_index[VLIB_TX]
- *    (i.e. a lookup FIB index),
- *
- * 3. A rewrite string to apply.
- *
- * Example: to cross-connect an L2 interface or (future) bridge
- * to an mpls-o-gre tunnel, set up the L2 rewrite string as shown in
- * mpls_gre_rewrite, and use "mpls-post-rewrite" to fix the
- * GRE IP header checksum and length fields.
- */
-
-typedef struct
-{
-  u32 next_index;
-  u32 tx_fib_index;
-} l2_xcrw_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_l2_xcrw_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2_xcrw_trace_t *t = va_arg (*args, l2_xcrw_trace_t *);
-
-  s = format (s, "L2_XCRW: next index %d tx_fib_index %d",
-	      t->next_index, t->tx_fib_index);
-  return s;
-}
-
-l2_xcrw_main_t l2_xcrw_main;
-
-static vlib_node_registration_t l2_xcrw_node;
-
-static char *l2_xcrw_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2_xcrw_error
-#undef _
-};
-
-static uword
-l2_xcrw_node_fn (vlib_main_t * vm,
-		 vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  l2_xcrw_next_t next_index;
-  l2_xcrw_main_t *xcm = &l2_xcrw_main;
-  vlib_node_t *n = vlib_get_node (vm, l2_xcrw_node.index);
-  u32 node_counter_base_index = n->error_heap_index;
-  vlib_error_main_t *em = &vm->error_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-	  u32 sw_if_index0, sw_if_index1;
-	  l2_xcrw_adjacency_t *adj0, *adj1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-
-	  adj0 = vec_elt_at_index (xcm->adj_by_sw_if_index, sw_if_index0);
-	  adj1 = vec_elt_at_index (xcm->adj_by_sw_if_index, sw_if_index1);
-
-	  next0 = adj0->rewrite_header.next_index;
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] =
-	    adj0->rewrite_header.sw_if_index;
-
-	  next1 = adj1->rewrite_header.next_index;
-	  vnet_buffer (b1)->sw_if_index[VLIB_TX] =
-	    adj1->rewrite_header.sw_if_index;
-
-	  em->counters[node_counter_base_index + next1]++;
-
-	  if (PREDICT_TRUE (next0 > 0))
-	    {
-	      u8 *h0 = vlib_buffer_get_current (b0);
-	      vnet_rewrite_one_header (adj0[0], h0,
-				       adj0->rewrite_header.data_bytes);
-	      vlib_buffer_advance (b0, -adj0->rewrite_header.data_bytes);
-	      em->counters[node_counter_base_index + L2_XCRW_ERROR_FWD]++;
-	    }
-
-	  if (PREDICT_TRUE (next1 > 0))
-	    {
-	      u8 *h1 = vlib_buffer_get_current (b1);
-	      vnet_rewrite_one_header (adj1[0], h1,
-				       adj1->rewrite_header.data_bytes);
-	      vlib_buffer_advance (b1, -adj1->rewrite_header.data_bytes);
-	      em->counters[node_counter_base_index + L2_XCRW_ERROR_FWD]++;
-	    }
-
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-				 && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-		{
-		  l2_xcrw_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->next_index = next0;
-		  t->tx_fib_index = adj0->rewrite_header.sw_if_index;
-		}
-	      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-				 && (b1->flags & VLIB_BUFFER_IS_TRACED)))
-		{
-		  l2_xcrw_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  t->next_index = next1;
-		  t->tx_fib_index = adj1->rewrite_header.sw_if_index;
-		}
-	    }
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 sw_if_index0;
-	  l2_xcrw_adjacency_t *adj0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-
-	  adj0 = vec_elt_at_index (xcm->adj_by_sw_if_index, sw_if_index0);
-
-	  next0 = adj0->rewrite_header.next_index;
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] =
-	    adj0->rewrite_header.sw_if_index;
-
-	  if (PREDICT_TRUE (next0 > 0))
-	    {
-	      u8 *h0 = vlib_buffer_get_current (b0);
-	      vnet_rewrite_one_header (adj0[0], h0,
-				       adj0->rewrite_header.data_bytes);
-	      vlib_buffer_advance (b0, -adj0->rewrite_header.data_bytes);
-	      em->counters[node_counter_base_index + L2_XCRW_ERROR_FWD]++;
-	    }
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      l2_xcrw_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->next_index = next0;
-	      t->tx_fib_index = adj0->rewrite_header.sw_if_index;
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2_xcrw_node, static) = {
-  .function = l2_xcrw_node_fn,
-  .name = "l2-xcrw",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2_xcrw_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2_xcrw_error_strings),
-  .error_strings = l2_xcrw_error_strings,
-
-  .n_next_nodes = L2_XCRW_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-        [L2_XCRW_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2_xcrw_node, l2_xcrw_node_fn)
-     clib_error_t *l2_xcrw_init (vlib_main_t * vm)
-{
-  l2_xcrw_main_t *mp = &l2_xcrw_main;
-
-  mp->vlib_main = vm;
-  mp->vnet_main = &vnet_main;
-  mp->tunnel_index_by_l2_sw_if_index = hash_create (0, sizeof (uword));
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2_xcrw_init);
-
-static uword
-dummy_interface_tx (vlib_main_t * vm,
-		    vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  clib_warning ("you shouldn't be here, leaking buffers...");
-  return frame->n_vectors;
-}
-
-static u8 *
-format_xcrw_name (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  return format (s, "xcrw%d", dev_instance);
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (xcrw_device_class,static) = {
-  .name = "Xcrw",
-  .format_device_name = format_xcrw_name,
-  .tx_function = dummy_interface_tx,
-};
-/* *INDENT-ON* */
-
-/* Create a sham tunnel interface and return its sw_if_index */
-static u32
-create_xcrw_interface (vlib_main_t * vm)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  static u32 instance;
-  u8 address[6];
-  u32 hw_if_index;
-  vnet_hw_interface_t *hi;
-  u32 sw_if_index;
-
-  /* mac address doesn't really matter */
-  memset (address, 0, sizeof (address));
-  address[2] = 0x12;
-
-  /* can returns error iff phy != 0 */
-  (void) ethernet_register_interface
-    (vnm, xcrw_device_class.index, instance++, address, &hw_if_index,
-     /* flag change */ 0);
-
-  hi = vnet_get_hw_interface (vnm, hw_if_index);
-  sw_if_index = hi->sw_if_index;
-  vnet_sw_interface_set_flags (vnm, sw_if_index,
-			       VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-
-  /* Output to the sham tunnel invokes the encap node */
-  hi->output_node_index = l2_xcrw_node.index;
-
-  return sw_if_index;
-}
-
-int
-vnet_configure_l2_xcrw (vlib_main_t * vm, vnet_main_t * vnm,
-			u32 l2_sw_if_index, u32 tx_fib_index,
-			u8 * rewrite, u32 next_node_index, int is_add)
-{
-  l2_xcrw_main_t *xcm = &l2_xcrw_main;
-  l2_xcrw_adjacency_t *a;
-  l2_xcrw_tunnel_t *t;
-  uword *p;
-
-  if (is_add)
-    {
-
-      pool_get (xcm->tunnels, t);
-
-      /* No interface allocated? Do it. Otherwise, set admin up */
-      if (t->tunnel_sw_if_index == 0)
-	t->tunnel_sw_if_index = create_xcrw_interface (vm);
-      else
-	vnet_sw_interface_set_flags (vnm, t->tunnel_sw_if_index,
-				     VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-
-      t->l2_sw_if_index = l2_sw_if_index;
-
-      vec_validate (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
-
-      a = vec_elt_at_index (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
-      memset (a, 0, sizeof (*a));
-
-      a->rewrite_header.sw_if_index = tx_fib_index;
-
-      /*
-       * Add or find a dynamic disposition for the successor node,
-       * e.g. so we can ship pkts to mpls_post_rewrite...
-       */
-      a->rewrite_header.next_index =
-	vlib_node_add_next (vm, l2_xcrw_node.index, next_node_index);
-
-      if (vec_len (rewrite))
-	vnet_rewrite_set_data (a[0], rewrite, vec_len (rewrite));
-
-      set_int_l2_mode (vm, vnm, MODE_L2_XC, t->l2_sw_if_index, 0, 0, 0,
-		       t->tunnel_sw_if_index);
-      hash_set (xcm->tunnel_index_by_l2_sw_if_index,
-		t->l2_sw_if_index, t - xcm->tunnels);
-      return 0;
-    }
-  else
-    {
-      p = hash_get (xcm->tunnel_index_by_l2_sw_if_index, l2_sw_if_index);
-      if (p == 0)
-	return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-      t = pool_elt_at_index (xcm->tunnels, p[0]);
-
-      a = vec_elt_at_index (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
-      /* Reset adj to drop traffic */
-      memset (a, 0, sizeof (*a));
-
-      set_int_l2_mode (vm, vnm, MODE_L3, t->l2_sw_if_index, 0, 0, 0, 0);
-
-      vnet_sw_interface_set_flags (vnm, t->tunnel_sw_if_index, 0 /* down */ );
-
-      hash_unset (xcm->tunnel_index_by_l2_sw_if_index, l2_sw_if_index);
-      pool_put (xcm->tunnels, t);
-    }
-  return 0;
-}
-
-
-static clib_error_t *
-set_l2_xcrw_command_fn (vlib_main_t * vm,
-			unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  int is_add = 1;
-  int is_ipv6 = 0;		/* for fib id -> fib index mapping */
-  u32 tx_fib_id = ~0;
-  u32 tx_fib_index = ~0;
-  u32 next_node_index = ~0;
-  u32 l2_sw_if_index;
-  u8 *rw = 0;
-  vnet_main_t *vnm = vnet_get_main ();
-  int rv;
-
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  if (!unformat (line_input, "%U",
-		 unformat_vnet_sw_interface, vnm, &l2_sw_if_index))
-    return clib_error_return (0, "unknown input '%U'",
-			      format_unformat_error, line_input);
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "next %U",
-		    unformat_vlib_node, vm, &next_node_index))
-	;
-      else if (unformat (line_input, "tx-fib-id %d", &tx_fib_id))
-	;
-      else if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "ipv6"))
-	is_ipv6 = 1;
-      else if (unformat (line_input, "rw %U", unformat_hex_string, &rw));
-      else
-	break;
-    }
-
-  if (next_node_index == ~0)
-    return clib_error_return (0, "next node not specified");
-
-  if (tx_fib_id != ~0)
-    {
-      uword *p;
-
-      if (is_ipv6)
-	p = hash_get (ip6_main.fib_index_by_table_id, tx_fib_id);
-      else
-	p = hash_get (ip4_main.fib_index_by_table_id, tx_fib_id);
-
-      if (p == 0)
-	return clib_error_return (0, "nonexistent tx_fib_id %d", tx_fib_id);
-
-      tx_fib_index = p[0];
-    }
-
-  rv = vnet_configure_l2_xcrw (vm, vnm, l2_sw_if_index, tx_fib_index,
-			       rw, next_node_index, is_add);
-
-  switch (rv)
-    {
-
-    case 0:
-      break;
-
-    case VNET_API_ERROR_INVALID_SW_IF_INDEX:
-      return clib_error_return (0, "%U not cross-connected",
-				format_vnet_sw_if_index_name,
-				vnm, l2_sw_if_index);
-    default:
-      return clib_error_return (0, "vnet_configure_l2_xcrw returned %d", rv);
-    }
-
-  vec_free (rw);
-
-  return 0;
-}
-
-/*?
- * Add or delete a Layer 2 to Layer 3 rewrite cross-connect. This is
- * used to hook Layer 2 interface(s) up to the Layer 3 stack in
- * arbitrary ways. For example, cross-connect an L2 interface or
- * (future) bridge to an mpls-o-gre tunnel. Set up the L2 rewrite
- * string as shown in mpls_gre_rewrite, and use \"mpls-post-rewrite\"
- * to fix the GRE IP header checksum and length fields.
- *
- * @cliexpar
- * @todo This is incomplete. This needs a detailed description and a
- * practical example.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_l2_xcrw_command, static) = {
-  .path = "set interface l2 xcrw",
-  .short_help =
-  "set interface l2 xcrw <interface> next <node-name>\n"
-  "    [del] [tx-fib-id <id>] [ipv6] rw <hex-bytes>",
-  .function = set_l2_xcrw_command_fn,
-};
-/* *INDENT-ON* */
-
-static u8 *
-format_l2xcrw (u8 * s, va_list * args)
-{
-  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
-  l2_xcrw_tunnel_t *t = va_arg (*args, l2_xcrw_tunnel_t *);
-  l2_xcrw_main_t *xcm = &l2_xcrw_main;
-  vlib_main_t *vm = vlib_get_main ();
-  l2_xcrw_adjacency_t *a;
-  u8 *rewrite_string;
-
-  if (t == 0)
-    {
-      s = format (s, "%-25s%s", "L2 interface", "Tunnel Details");
-      return s;
-    }
-
-  s = format (s, "%-25U %U ",
-	      format_vnet_sw_if_index_name, vnm, t->l2_sw_if_index,
-	      format_vnet_sw_if_index_name, vnm, t->tunnel_sw_if_index);
-
-  a = vec_elt_at_index (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
-
-  s = format (s, "next %U ",
-	      format_vlib_next_node_name, vm, l2_xcrw_node.index,
-	      a->rewrite_header.next_index);
-
-  if (a->rewrite_header.sw_if_index != ~0)
-    s = format (s, "tx fib index %d ", a->rewrite_header.sw_if_index);
-
-  if (a->rewrite_header.data_bytes)
-    {
-      rewrite_string = (u8 *) (a + 1);
-      rewrite_string -= a->rewrite_header.data_bytes;
-      s = format (s, "rewrite data: %U ",
-		  format_hex_bytes, rewrite_string,
-		  a->rewrite_header.data_bytes);
-    }
-
-  s = format (s, "\n");
-
-  return s;
-}
-
-
-static clib_error_t *
-show_l2xcrw_command_fn (vlib_main_t * vm,
-			unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  l2_xcrw_main_t *xcm = &l2_xcrw_main;
-  l2_xcrw_tunnel_t *t;
-
-  if (pool_elts (xcm->tunnels) == 0)
-    {
-      vlib_cli_output (vm, "No L2 / L3 rewrite cross-connects configured");
-      return 0;
-    }
-
-  vlib_cli_output (vm, "%U", format_l2xcrw, 0, 0);
-
-  /* *INDENT-OFF* */
-  pool_foreach (t, xcm->tunnels,
-  ({
-    vlib_cli_output (vm, "%U", format_l2xcrw, vnm, t);
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-/*?
- * Display a Layer 2 to Layer 3 rewrite cross-connect. This is used to
- * hook Layer 2 interface(s) up to the Layer 3 stack in arbitrary ways.
- *
- * @todo This is incomplete. This needs a detailed description and a
- * practical example.
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_l2xcrw_command, static) = {
-  .path = "show l2xcrw",
-  .short_help = "show l2xcrw",
-  .function = show_l2xcrw_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2/l2_xcrw.h b/vnet/vnet/l2/l2_xcrw.h
deleted file mode 100644
index ca80aae9..00000000
--- a/vnet/vnet/l2/l2_xcrw.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_l2_xcrw_h__
-#define __included_l2_xcrw_h__
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-#include <vnet/ip/ip.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/l2_output.h>
-#include <vnet/api_errno.h>
-#include <vnet/ethernet/ethernet.h>
-
-typedef struct
-{
-  /*
-   * Let: rewrite_header.sw_if_index = tx_fib_index or ~0.
-   *      rewrite_header.next_index = L2_XCRW_NEXT_XXX
-   */
-  vnet_declare_rewrite (VLIB_BUFFER_PRE_DATA_SIZE);
-} l2_xcrw_adjacency_t;
-
-typedef struct
-{
-  /* L2 interface */
-  u32 l2_sw_if_index;
-
-  /* Tunnel interface */
-  u32 tunnel_sw_if_index;	/* This field remains set in freed pool elts */
-
-} l2_xcrw_tunnel_t;
-
-typedef struct
-{
-  u32 cached_next_index;
-
-  /* Vector of cross-connect rewrites */
-  l2_xcrw_adjacency_t *adj_by_sw_if_index;
-
-  /* Pool of xcrw tunnels */
-  l2_xcrw_tunnel_t *tunnels;
-
-  /* Tunnel index by tunnel sw_if_index */
-  uword *tunnel_index_by_l2_sw_if_index;
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} l2_xcrw_main_t;
-
-typedef enum
-{
-  L2_XCRW_NEXT_DROP,
-  L2_XCRW_N_NEXT,
-} l2_xcrw_next_t;
-
-#define foreach_l2_xcrw_error                   \
-_(DROP, "Packets dropped")                      \
-_(FWD, "Packets forwarded")
-
-typedef enum
-{
-#define _(sym,str) L2_XCRW_ERROR_##sym,
-  foreach_l2_xcrw_error
-#undef _
-    L2_XCRW_N_ERROR,
-} l2_xcrw_error_t;
-
-#endif /* __included_l2_xcrw_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2tp/decap.c b/vnet/vnet/l2tp/decap.c
deleted file mode 100644
index e8986935..00000000
--- a/vnet/vnet/l2tp/decap.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * decap.c : L2TPv3 tunnel decapsulation
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/l2tp/l2tp.h>
-
-/* Statistics (not really errors) */
-#define foreach_l2t_decap_error                                 \
-_(USER_TO_NETWORK, "L2TP user (ip6) to L2 network pkts")        \
-_(SESSION_ID_MISMATCH, "l2tpv3 local session id mismatches")    \
-_(COOKIE_MISMATCH, "l2tpv3 local cookie mismatches")            \
-_(NO_SESSION, "l2tpv3 session not found")                       \
-_(ADMIN_DOWN, "l2tpv3 tunnel is down")
-
-static char *l2t_decap_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2t_decap_error
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) L2T_DECAP_ERROR_##sym,
-  foreach_l2t_decap_error
-#undef _
-    L2T_DECAP_N_ERROR,
-} l2t_DECAP_error_t;
-
-typedef enum
-{
-  L2T_DECAP_NEXT_DROP,
-  L2T_DECAP_NEXT_L2_INPUT,
-  L2T_DECAP_N_NEXT,
-  /* Pseudo next index */
-  L2T_DECAP_NEXT_NO_INTERCEPT = L2T_DECAP_N_NEXT,
-} l2t_decap_next_t;
-
-#define NSTAGES 3
-
-static inline void
-stage0 (vlib_main_t * vm, vlib_node_runtime_t * node, u32 buffer_index)
-{
-  vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
-  vlib_prefetch_buffer_header (b, STORE);
-  /* l2tpv3 header is a long way away, need 2 cache lines */
-  CLIB_PREFETCH (b->data, 2 * CLIB_CACHE_LINE_BYTES, STORE);
-}
-
-static inline void
-stage1 (vlib_main_t * vm, vlib_node_runtime_t * node, u32 bi)
-{
-  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
-  l2t_main_t *lm = &l2t_main;
-  ip6_header_t *ip6 = vlib_buffer_get_current (b);
-  u32 session_index;
-  uword *p = 0;
-  l2tpv3_header_t *l2t;
-
-  /* Not L2tpv3 (0x73, 0t115)? Use the normal path. */
-  if (PREDICT_FALSE (ip6->protocol != IP_PROTOCOL_L2TP))
-    {
-      vnet_buffer (b)->l2t.next_index = L2T_DECAP_NEXT_NO_INTERCEPT;
-      return;
-    }
-
-  /* Make up your minds, people... */
-  switch (lm->lookup_type)
-    {
-    case L2T_LOOKUP_SRC_ADDRESS:
-      p = hash_get_mem (lm->session_by_src_address, &ip6->src_address);
-      break;
-    case L2T_LOOKUP_DST_ADDRESS:
-      p = hash_get_mem (lm->session_by_dst_address, &ip6->dst_address);
-      break;
-    case L2T_LOOKUP_SESSION_ID:
-      l2t = (l2tpv3_header_t *) (ip6 + 1);
-      p = hash_get (lm->session_by_session_id, l2t->session_id);
-      break;
-    default:
-      ASSERT (0);
-    }
-
-  if (PREDICT_FALSE (p == 0))
-    {
-      vnet_buffer (b)->l2t.next_index = L2T_DECAP_NEXT_NO_INTERCEPT;
-      return;
-    }
-  else
-    {
-      session_index = p[0];
-    }
-
-  /* Remember mapping index, prefetch the mini counter */
-  vnet_buffer (b)->l2t.next_index = L2T_DECAP_NEXT_L2_INPUT;
-  vnet_buffer (b)->l2t.session_index = session_index;
-
-  /* $$$$$ prefetch counter */
-}
-
-static inline u32
-last_stage (vlib_main_t * vm, vlib_node_runtime_t * node, u32 bi)
-{
-  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
-  l2t_main_t *lm = &l2t_main;
-  ip6_header_t *ip6 = vlib_buffer_get_current (b);
-  vlib_node_t *n = vlib_get_node (vm, node->node_index);
-  u32 node_counter_base_index = n->error_heap_index;
-  vlib_error_main_t *em = &vm->error_main;
-  l2tpv3_header_t *l2tp;
-  u32 counter_index;
-  l2t_session_t *session = 0;
-  u32 session_index;
-  u32 next_index;
-  u8 l2tp_decap_local = (l2t_decap_local_node.index == n->index);
-
-  /* Other-than-output pkt? We're done... */
-  if (vnet_buffer (b)->l2t.next_index != L2T_DECAP_NEXT_L2_INPUT)
-    {
-      next_index = vnet_buffer (b)->l2t.next_index;
-      goto done;
-    }
-
-  em->counters[node_counter_base_index + L2T_DECAP_ERROR_USER_TO_NETWORK] +=
-    1;
-
-  session_index = vnet_buffer (b)->l2t.session_index;
-
-  counter_index =
-    session_index_to_counter_index (session_index,
-				    SESSION_COUNTER_USER_TO_NETWORK);
-
-  /* per-mapping byte stats include the ethernet header */
-  vlib_increment_combined_counter (&lm->counter_main,
-				   os_get_cpu_number (),
-				   counter_index, 1 /* packet_increment */ ,
-				   vlib_buffer_length_in_chain (vm, b) +
-				   sizeof (ethernet_header_t));
-
-  session = pool_elt_at_index (lm->sessions, session_index);
-
-  l2tp = vlib_buffer_get_current (b) + sizeof (*ip6);
-
-  if (PREDICT_FALSE (l2tp->session_id != session->local_session_id))
-    {
-      /* Key matched but session id does not. Assume packet is not for us. */
-      em->counters[node_counter_base_index +
-		   L2T_DECAP_ERROR_SESSION_ID_MISMATCH] += 1;
-      next_index = L2T_DECAP_NEXT_NO_INTERCEPT;
-      goto done;
-    }
-
-  if (PREDICT_FALSE (l2tp->cookie != session->local_cookie[0]))
-    {
-      if (l2tp->cookie != session->local_cookie[1])
-	{
-	  /* Key and session ID matched, but cookie doesn't. Drop this packet. */
-	  b->error = node->errors[L2T_DECAP_ERROR_COOKIE_MISMATCH];
-	  next_index = L2T_DECAP_NEXT_DROP;
-	  goto done;
-	}
-    }
-
-  vnet_buffer (b)->sw_if_index[VLIB_RX] = session->sw_if_index;
-
-  if (PREDICT_FALSE (!(session->admin_up)))
-    {
-      b->error = node->errors[L2T_DECAP_ERROR_ADMIN_DOWN];
-      next_index = L2T_DECAP_NEXT_DROP;
-      goto done;
-    }
-
-  /* strip the ip6 and L2TP header */
-  vlib_buffer_advance (b, sizeof (*ip6) + session->l2tp_hdr_size);
-
-  /* Required to make the l2 tag push / pop code work on l2 subifs */
-  vnet_update_l2_len (b);
-
-  if (PREDICT_FALSE (b->flags & VLIB_BUFFER_IS_TRACED))
-    {
-      l2t_trace_t *t = vlib_add_trace (vm, node, b, sizeof (*t));
-      t->is_user_to_network = 1;
-      t->our_address.as_u64[0] = ip6->dst_address.as_u64[0];
-      t->our_address.as_u64[1] = ip6->dst_address.as_u64[1];
-      t->client_address.as_u64[0] = ip6->src_address.as_u64[0];
-      t->client_address.as_u64[1] = ip6->src_address.as_u64[1];
-      t->session_index = session_index;
-    }
-
-  return L2T_DECAP_NEXT_L2_INPUT;
-
-done:
-  if (next_index == L2T_DECAP_NEXT_NO_INTERCEPT)
-    {
-      /* Small behavioral change between l2tp-decap and l2tp-decap-local */
-      if (l2tp_decap_local)
-	{
-	  b->error = node->errors[L2T_DECAP_ERROR_NO_SESSION];
-	  next_index = L2T_DECAP_NEXT_DROP;
-	}
-      else
-	{
-	  /* Go to next node on the ip6 configuration chain */
-	  if (PREDICT_TRUE (session != 0))
-	    vnet_feature_next (session->sw_if_index, &next_index, b);
-	}
-    }
-
-  if (PREDICT_FALSE (b->flags & VLIB_BUFFER_IS_TRACED))
-    {
-      l2t_trace_t *t = vlib_add_trace (vm, node, b, sizeof (*t));
-      t->is_user_to_network = 1;
-      t->our_address.as_u64[0] = ip6->dst_address.as_u64[0];
-      t->our_address.as_u64[1] = ip6->dst_address.as_u64[1];
-      t->client_address.as_u64[0] = ip6->src_address.as_u64[0];
-      t->client_address.as_u64[1] = ip6->src_address.as_u64[1];
-      t->session_index = ~0;
-    }
-  return next_index;
-}
-
-#include <vnet/pipeline.h>
-
-static uword
-l2t_decap_node_fn (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return dispatch_pipeline (vm, node, frame);
-}
-
-/*
- * l2tp-decap and l2tp-decap-local have very slightly different behavior.
- * When a packet has no associated session l2tp-decap let it go to ip6 forward,
- * while l2tp-decap-local drops it.
- */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2t_decap_node) = {
-  .function = l2t_decap_node_fn,
-  .name = "l2tp-decap",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2t_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2t_decap_error_strings),
-  .error_strings = l2t_decap_error_strings,
-
-  .n_next_nodes = L2T_DECAP_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-        [L2T_DECAP_NEXT_L2_INPUT] = "l2-input",
-        [L2T_DECAP_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2t_decap_node, l2t_decap_node_fn);
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2t_decap_local_node) = {
-  .function = l2t_decap_node_fn,
-  .name = "l2tp-decap-local",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2t_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2t_decap_error_strings),
-  .error_strings = l2t_decap_error_strings,
-
-  .n_next_nodes = L2T_DECAP_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [L2T_DECAP_NEXT_L2_INPUT] = "l2-input",
-    [L2T_DECAP_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-void
-l2tp_decap_init (void)
-{
-  ip6_register_protocol (IP_PROTOCOL_L2TP, l2t_decap_local_node.index);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2tp/encap.c b/vnet/vnet/l2tp/encap.c
deleted file mode 100644
index ed7a9580..00000000
--- a/vnet/vnet/l2tp/encap.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * encap.c : L2TPv3 tunnel encapsulation
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/l2tp/l2tp.h>
-
-/* Statistics (not really errors) */
-#define foreach_l2t_encap_error					\
-_(NETWORK_TO_USER, "L2TP L2 network to user (ip6) pkts")	\
-_(LOOKUP_FAIL_TO_L3, "L2TP L2 session lookup failed pkts")      \
-_(ADMIN_DOWN, "L2TP tunnel is down")
-
-static char *l2t_encap_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2t_encap_error
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) L2T_ENCAP_ERROR_##sym,
-  foreach_l2t_encap_error
-#undef _
-    L2T_ENCAP_N_ERROR,
-} l2t_encap_error_t;
-
-
-typedef enum
-{
-  L2T_ENCAP_NEXT_DROP,
-  L2T_ENCAP_NEXT_IP6_LOOKUP,
-  L2T_ENCAP_N_NEXT,
-} l2t_encap_next_t;
-
-typedef struct
-{
-  u32 cached_session_index;
-  u32 cached_sw_if_index;
-  vnet_main_t *vnet_main;
-} l2tp_encap_runtime_t;
-
-vlib_node_registration_t l2t_encap_node;
-
-#define NSTAGES 3
-
-static inline void
-stage0 (vlib_main_t * vm, vlib_node_runtime_t * node, u32 buffer_index)
-{
-  vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
-  vlib_prefetch_buffer_header (b, STORE);
-  CLIB_PREFETCH (b->data, 2 * CLIB_CACHE_LINE_BYTES, STORE);
-}
-
-static inline void
-stage1 (vlib_main_t * vm, vlib_node_runtime_t * node, u32 bi)
-{
-  l2tp_encap_runtime_t *rt = (void *) node->runtime_data;
-  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
-  vnet_hw_interface_t *hi;
-
-  u32 sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_TX];
-  u32 session_index = rt->cached_session_index;
-
-  if (PREDICT_FALSE (rt->cached_sw_if_index != sw_if_index))
-    {
-      hi = vnet_get_sup_hw_interface (rt->vnet_main, sw_if_index);
-      session_index = rt->cached_session_index = hi->dev_instance;
-      rt->cached_sw_if_index = sw_if_index;
-    }
-
-  /* Remember mapping index, prefetch the mini counter */
-  vnet_buffer (b)->l2t.next_index = L2T_ENCAP_NEXT_IP6_LOOKUP;
-  vnet_buffer (b)->l2t.session_index = session_index;
-
-  /* $$$$ prefetch counter... */
-}
-
-static inline u32
-last_stage (vlib_main_t * vm, vlib_node_runtime_t * node, u32 bi)
-{
-  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
-  l2t_main_t *lm = &l2t_main;
-  vlib_node_t *n = vlib_get_node (vm, l2t_encap_node.index);
-  u32 node_counter_base_index = n->error_heap_index;
-  vlib_error_main_t *em = &vm->error_main;
-  l2tpv3_header_t *l2tp;
-  u32 session_index;
-  u32 counter_index;
-  l2t_session_t *s;
-  ip6_header_t *ip6;
-  u16 payload_length;
-  u32 next_index = L2T_ENCAP_NEXT_IP6_LOOKUP;
-
-  /* Other-than-output pkt? We're done... */
-  if (vnet_buffer (b)->l2t.next_index != L2T_ENCAP_NEXT_IP6_LOOKUP)
-    return vnet_buffer (b)->l2t.next_index;
-
-  em->counters[node_counter_base_index + L2T_ENCAP_ERROR_NETWORK_TO_USER] +=
-    1;
-
-  session_index = vnet_buffer (b)->l2t.session_index;
-
-  counter_index =
-    session_index_to_counter_index (session_index,
-				    SESSION_COUNTER_NETWORK_TO_USER);
-
-  /* per-mapping byte stats include the ethernet header */
-  vlib_increment_combined_counter (&lm->counter_main,
-				   os_get_cpu_number (),
-				   counter_index, 1 /* packet_increment */ ,
-				   vlib_buffer_length_in_chain (vm, b));
-
-  s = pool_elt_at_index (lm->sessions, session_index);
-
-  vnet_buffer (b)->sw_if_index[VLIB_TX] = s->encap_fib_index;
-
-  /* Paint on an l2tpv3 hdr */
-  vlib_buffer_advance (b, -(s->l2tp_hdr_size));
-  l2tp = vlib_buffer_get_current (b);
-
-  l2tp->session_id = s->remote_session_id;
-  l2tp->cookie = s->remote_cookie;
-  if (PREDICT_FALSE (s->l2_sublayer_present))
-    {
-      l2tp->l2_specific_sublayer = 0;
-    }
-
-  /* Paint on an ip6 header */
-  vlib_buffer_advance (b, -(sizeof (*ip6)));
-  ip6 = vlib_buffer_get_current (b);
-
-  if (PREDICT_FALSE (!(s->admin_up)))
-    {
-      b->error = node->errors[L2T_ENCAP_ERROR_ADMIN_DOWN];
-      next_index = L2T_ENCAP_NEXT_DROP;
-      goto done;
-    }
-
-  ip6->ip_version_traffic_class_and_flow_label =
-    clib_host_to_net_u32 (0x6 << 28);
-
-  /* calculate ip6 payload length */
-  payload_length = vlib_buffer_length_in_chain (vm, b);
-  payload_length -= sizeof (*ip6);
-
-  ip6->payload_length = clib_host_to_net_u16 (payload_length);
-  ip6->protocol = IP_PROTOCOL_L2TP;
-  ip6->hop_limit = 0xff;
-  ip6->src_address.as_u64[0] = s->our_address.as_u64[0];
-  ip6->src_address.as_u64[1] = s->our_address.as_u64[1];
-  ip6->dst_address.as_u64[0] = s->client_address.as_u64[0];
-  ip6->dst_address.as_u64[1] = s->client_address.as_u64[1];
-
-
-done:
-  if (PREDICT_FALSE (b->flags & VLIB_BUFFER_IS_TRACED))
-    {
-      l2t_trace_t *t = vlib_add_trace (vm, node, b, sizeof (*t));
-      t->is_user_to_network = 0;
-      t->our_address.as_u64[0] = ip6->src_address.as_u64[0];
-      t->our_address.as_u64[1] = ip6->src_address.as_u64[1];
-      t->client_address.as_u64[0] = ip6->dst_address.as_u64[0];
-      t->client_address.as_u64[1] = ip6->dst_address.as_u64[1];
-      t->session_index = session_index;
-    }
-
-  return next_index;
-}
-
-#include <vnet/pipeline.h>
-
-uword
-l2t_encap_node_fn (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return dispatch_pipeline (vm, node, frame);
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2t_encap_node) = {
-  .function = l2t_encap_node_fn,
-  .name = "l2tp-encap",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2t_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .runtime_data_bytes = sizeof (l2tp_encap_runtime_t),
-
-  .n_errors = ARRAY_LEN(l2t_encap_error_strings),
-  .error_strings = l2t_encap_error_strings,
-
-  .n_next_nodes = L2T_ENCAP_N_NEXT,
-
-  /*  add dispositions here */
-  .next_nodes = {
-    [L2T_ENCAP_NEXT_IP6_LOOKUP] = "ip6-lookup",
-    [L2T_ENCAP_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2t_encap_node, l2t_encap_node_fn);
-void
-l2tp_encap_init (vlib_main_t * vm)
-{
-  l2tp_encap_runtime_t *rt;
-
-  rt = vlib_node_get_runtime_data (vm, l2t_encap_node.index);
-  rt->vnet_main = vnet_get_main ();
-  rt->cached_sw_if_index = (u32) ~ 0;
-  rt->cached_session_index = (u32) ~ 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2tp/l2tp.api b/vnet/vnet/l2tp/l2tp.api
deleted file mode 100644
index 5a5a5a48..00000000
--- a/vnet/vnet/l2tp/l2tp.api
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \brief l2tpv3 tunnel interface create request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param client_address - remote client tunnel ip address
-    @param client_address - local tunnel ip address
-    @param is_ipv6 - ipv6 if non-zero, else ipv4
-    @param local_session_id - local tunnel session id
-    @param remote_session_id - remote tunnel session id
-    @param local_cookie - local tunnel cookie
-    @param l2_sublayer_present - l2 sublayer is present in packets if non-zero
-    @param encap_vrf_id - fib identifier used for outgoing encapsulated packets
-*/
-define l2tpv3_create_tunnel
-{
-  u32 client_index;
-  u32 context;
-  u8 client_address[16];
-  u8 our_address[16];
-  u8 is_ipv6;
-  u32 local_session_id;
-  u32 remote_session_id;
-  u64 local_cookie;
-  u64 remote_cookie;
-  u8 l2_sublayer_present;
-  u32 encap_vrf_id;
-};
-
-/** \brief l2tpv3 tunnel interface create response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-    @param sw_if_index - index of the new tunnel interface
-*/
-define l2tpv3_create_tunnel_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-};
-
-define l2tpv3_set_tunnel_cookies
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u64 new_local_cookie;
-  u64 new_remote_cookie;
-};
-
-/** \brief L2TP tunnel set cookies response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define l2tpv3_set_tunnel_cookies_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-define sw_if_l2tpv3_tunnel_details
-{
-  u32 context;
-  u32 sw_if_index;
-  u8 interface_name[64];
-  u8 client_address[16];
-  u8 our_address[16];
-  u32 local_session_id;
-  u32 remote_session_id;
-  u64 local_cookie[2];
-  u64 remote_cookie;
-  u8 l2_sublayer_present;
-};
-
-define sw_if_l2tpv3_tunnel_dump
-{
-  u32 client_index;
-  u32 context;
-};
-
-define l2tpv3_interface_enable_disable
-{
-  u32 client_index;
-  u32 context;
-  u8 enable_disable;
-  u32 sw_if_index;
-};
-
-define l2tpv3_interface_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-define l2tpv3_set_lookup_key
-{
-  u32 client_index;
-  u32 context;
-  /* 0 = ip6 src_address, 1 = ip6 dst_address, 2 = session_id */
-  u8 key;
-};
-
-define l2tpv3_set_lookup_key_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2tp/l2tp.c b/vnet/vnet/l2tp/l2tp.c
deleted file mode 100644
index a4531dab..00000000
--- a/vnet/vnet/l2tp/l2tp.c
+++ /dev/null
@@ -1,739 +0,0 @@
-/*
- * l2tp.c : L2TPv3 tunnel support
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/l2tp/l2tp.h>
-
-l2t_main_t l2t_main;
-
-/* packet trace format function */
-u8 *
-format_l2t_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2t_trace_t *t = va_arg (*args, l2t_trace_t *);
-
-  if (t->is_user_to_network)
-    s = format (s, "L2T: %U (client) -> %U (our) session %d",
-		format_ip6_address, &t->client_address,
-		format_ip6_address, &t->our_address, t->session_index);
-  else
-    s = format (s, "L2T: %U (our) -> %U (client) session %d)",
-		format_ip6_address, &t->our_address,
-		format_ip6_address, &t->client_address, t->session_index);
-  return s;
-}
-
-u8 *
-format_l2t_session (u8 * s, va_list * args)
-{
-  l2t_session_t *session = va_arg (*args, l2t_session_t *);
-  l2t_main_t *lm = &l2t_main;
-  u32 counter_index;
-  vlib_counter_t v;
-
-  s = format (s, "[%d] %U (our) %U (client) %U (sw_if_index %d)\n",
-	      session - lm->sessions,
-	      format_ip6_address, &session->our_address,
-	      format_ip6_address, &session->client_address,
-	      format_vnet_sw_interface_name, lm->vnet_main,
-	      vnet_get_sw_interface (lm->vnet_main, session->sw_if_index),
-	      session->sw_if_index);
-
-  s = format (s, "   local cookies %016llx %016llx remote cookie %016llx\n",
-	      clib_net_to_host_u64 (session->local_cookie[0]),
-	      clib_net_to_host_u64 (session->local_cookie[1]),
-	      clib_net_to_host_u64 (session->remote_cookie));
-
-  s = format (s, "   local session-id %d remote session-id %d\n",
-	      clib_net_to_host_u32 (session->local_session_id),
-	      clib_net_to_host_u32 (session->remote_session_id));
-
-  s = format (s, "   l2 specific sublayer %s\n",
-	      session->l2_sublayer_present ? "preset" : "absent");
-
-  counter_index =
-    session_index_to_counter_index (session - lm->sessions,
-				    SESSION_COUNTER_USER_TO_NETWORK);
-
-  vlib_get_combined_counter (&lm->counter_main, counter_index, &v);
-  if (v.packets != 0)
-    s = format (s, "   user-to-net: %llu pkts %llu bytes\n",
-		v.packets, v.bytes);
-
-  vlib_get_combined_counter (&lm->counter_main, counter_index + 1, &v);
-
-  if (v.packets != 0)
-    s = format (s, "   net-to-user: %llu pkts %llu bytes\n",
-		v.packets, v.bytes);
-  return s;
-}
-
-static clib_error_t *
-show_l2tp_command_fn (vlib_main_t * vm,
-		      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  l2t_session_t *session;
-  l2t_main_t *lm = &l2t_main;
-  char *keystr = 0;
-  int verbose = 0;
-
-  if (unformat (input, "verbose") || unformat (input, "v"))
-    verbose = 1;
-
-  if (pool_elts (lm->sessions) == 0)
-    vlib_cli_output (vm, "No l2tp sessions...");
-  else
-    vlib_cli_output (vm, "%u l2tp sessions...", pool_elts (lm->sessions));
-
-  if (verbose)
-    {
-      switch (lm->lookup_type)
-	{
-	case L2T_LOOKUP_SRC_ADDRESS:
-	  keystr = "src address";
-	  break;
-
-	case L2T_LOOKUP_DST_ADDRESS:
-	  keystr = "dst address";
-	  break;
-
-	case L2T_LOOKUP_SESSION_ID:
-	  keystr = "session id";
-	  break;
-
-	default:
-	  keystr = "BOGUS!";
-	  break;
-	}
-
-      vlib_cli_output (vm, "L2tp session lookup on %s", keystr);
-
-      /* *INDENT-OFF* */
-      pool_foreach (session, lm->sessions,
-      ({
-        vlib_cli_output (vm, "%U", format_l2t_session, session);
-      }));
-      /* *INDENT-ON* */
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_session_detail_command, static) = {
-  .path = "show l2tpv3",
-  .short_help = "show l2tpv3 [verbose]",
-  .function = show_l2tp_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-test_counters_command_fn (vlib_main_t * vm,
-			  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  l2t_session_t *session;
-  l2t_main_t *lm = &l2t_main;
-  u32 session_index;
-  u32 counter_index;
-  u32 nincr = 0;
-  u32 cpu_index = os_get_cpu_number ();
-
-  /* *INDENT-OFF* */
-  pool_foreach (session, lm->sessions,
-  ({
-    session_index = session - lm->sessions;
-    counter_index =
-      session_index_to_counter_index (session_index,
-                                      SESSION_COUNTER_USER_TO_NETWORK);
-    vlib_increment_combined_counter (&lm->counter_main,
-                                     cpu_index,
-                                     counter_index,
-                                     1/*pkt*/, 1111 /*bytes*/);
-    vlib_increment_combined_counter (&lm->counter_main,
-                                     cpu_index,
-                                     counter_index+1,
-                                     1/*pkt*/, 2222 /*bytes*/);
-    nincr++;
-
-  }));
-  /* *INDENT-ON* */
-  vlib_cli_output (vm, "Incremented %d active counters\n", nincr);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (test_counters_command, static) = {
-    .path = "test counters",
-    .short_help = "increment all active counters",
-    .function = test_counters_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-clear_counters_command_fn (vlib_main_t * vm,
-			   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  l2t_session_t *session;
-  l2t_main_t *lm = &l2t_main;
-  u32 session_index;
-  u32 counter_index;
-  u32 nincr = 0;
-
-  /* *INDENT-OFF* */
-  pool_foreach (session, lm->sessions,
-  ({
-    session_index = session - lm->sessions;
-    counter_index =
-      session_index_to_counter_index (session_index,
-                                      SESSION_COUNTER_USER_TO_NETWORK);
-    vlib_zero_combined_counter (&lm->counter_main, counter_index);
-    vlib_zero_combined_counter (&lm->counter_main, counter_index+1);
-    nincr++;
-  }));
-  /* *INDENT-ON* */
-  vlib_cli_output (vm, "Cleared %d active counters\n", nincr);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (clear_counters_command, static) = {
-  .path = "clear counters",
-  .short_help = "clear all active counters",
-  .function = clear_counters_command_fn,
-};
-/* *INDENT-ON* */
-
-static u8 *
-format_l2tpv3_name (u8 * s, va_list * args)
-{
-  l2t_main_t *lm = &l2t_main;
-  u32 i = va_arg (*args, u32);
-  u32 show_dev_instance = ~0;
-
-  if (i < vec_len (lm->dev_inst_by_real))
-    show_dev_instance = lm->dev_inst_by_real[i];
-
-  if (show_dev_instance != ~0)
-    i = show_dev_instance;
-
-  return format (s, "l2tpv3_tunnel%d", i);
-}
-
-static int
-l2tpv3_name_renumber (vnet_hw_interface_t * hi, u32 new_dev_instance)
-{
-  l2t_main_t *lm = &l2t_main;
-
-  vec_validate_init_empty (lm->dev_inst_by_real, hi->dev_instance, ~0);
-
-  lm->dev_inst_by_real[hi->dev_instance] = new_dev_instance;
-
-  return 0;
-}
-
-static uword
-dummy_interface_tx (vlib_main_t * vm,
-		    vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  clib_warning ("you shouldn't be here, leaking buffers...");
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (l2tpv3_device_class,static) = {
-  .name = "L2TPv3",
-  .format_device_name = format_l2tpv3_name,
-  .name_renumber = l2tpv3_name_renumber,
-  .tx_function = dummy_interface_tx,
-};
-/* *INDENT-ON* */
-
-static u8 *
-format_l2tp_header_with_length (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  s = format (s, "unimplemented dev %u", dev_instance);
-  return s;
-}
-
-/* *INDENT-OFF* */
-VNET_HW_INTERFACE_CLASS (l2tpv3_hw_class) = {
-  .name = "L2TPV3",
-  .format_header = format_l2tp_header_with_length,
-  .build_rewrite = default_build_rewrite,
-  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
-};
-/* *INDENT-ON* */
-
-int
-create_l2tpv3_ipv6_tunnel (l2t_main_t * lm,
-			   ip6_address_t * client_address,
-			   ip6_address_t * our_address,
-			   u32 local_session_id,
-			   u32 remote_session_id,
-			   u64 local_cookie,
-			   u64 remote_cookie,
-			   int l2_sublayer_present,
-			   u32 encap_fib_index, u32 * sw_if_index)
-{
-  l2t_session_t *s = 0;
-  vnet_main_t *vnm = lm->vnet_main;
-  vnet_hw_interface_t *hi;
-  uword *p = (uword *) ~ 0;
-  u32 hw_if_index;
-  l2tpv3_header_t l2tp_hdr;
-  ip6_address_t *dst_address_copy, *src_address_copy;
-  u32 counter_index;
-
-  remote_session_id = clib_host_to_net_u32 (remote_session_id);
-  local_session_id = clib_host_to_net_u32 (local_session_id);
-
-  switch (lm->lookup_type)
-    {
-    case L2T_LOOKUP_SRC_ADDRESS:
-      p = hash_get_mem (lm->session_by_src_address, client_address);
-      break;
-
-    case L2T_LOOKUP_DST_ADDRESS:
-      p = hash_get_mem (lm->session_by_dst_address, our_address);
-      break;
-
-    case L2T_LOOKUP_SESSION_ID:
-      p = hash_get (lm->session_by_session_id, local_session_id);
-      break;
-
-    default:
-      ASSERT (0);
-    }
-
-  /* adding a session: session must not already exist */
-  if (p)
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  pool_get (lm->sessions, s);
-  memset (s, 0, sizeof (*s));
-  clib_memcpy (&s->our_address, our_address, sizeof (s->our_address));
-  clib_memcpy (&s->client_address, client_address,
-	       sizeof (s->client_address));
-  s->local_cookie[0] = clib_host_to_net_u64 (local_cookie);
-  s->remote_cookie = clib_host_to_net_u64 (remote_cookie);
-  s->local_session_id = local_session_id;
-  s->remote_session_id = remote_session_id;
-  s->l2_sublayer_present = l2_sublayer_present;
-  /* precompute l2tp header size */
-  s->l2tp_hdr_size = l2_sublayer_present ?
-    sizeof (l2tpv3_header_t) :
-    sizeof (l2tpv3_header_t) - sizeof (l2tp_hdr.l2_specific_sublayer);
-  s->admin_up = 0;
-  s->encap_fib_index = encap_fib_index;
-
-  /* Setup hash table entries */
-  switch (lm->lookup_type)
-    {
-    case L2T_LOOKUP_SRC_ADDRESS:
-      src_address_copy = clib_mem_alloc (sizeof (*src_address_copy));
-      clib_memcpy (src_address_copy, client_address,
-		   sizeof (*src_address_copy));
-      hash_set_mem (lm->session_by_src_address, src_address_copy,
-		    s - lm->sessions);
-      break;
-    case L2T_LOOKUP_DST_ADDRESS:
-      dst_address_copy = clib_mem_alloc (sizeof (*dst_address_copy));
-      clib_memcpy (dst_address_copy, our_address, sizeof (*dst_address_copy));
-      hash_set_mem (lm->session_by_dst_address, dst_address_copy,
-		    s - lm->sessions);
-      break;
-    case L2T_LOOKUP_SESSION_ID:
-      hash_set (lm->session_by_session_id, local_session_id,
-		s - lm->sessions);
-      break;
-
-    default:
-      ASSERT (0);
-    }
-
-  /* validate counters */
-  counter_index =
-    session_index_to_counter_index (s - lm->sessions,
-				    SESSION_COUNTER_USER_TO_NETWORK);
-  vlib_validate_combined_counter (&lm->counter_main, counter_index);
-  vlib_validate_combined_counter (&lm->counter_main, counter_index + 1);
-
-  if (vec_len (lm->free_l2tpv3_tunnel_hw_if_indices) > 0)
-    {
-      hw_if_index = lm->free_l2tpv3_tunnel_hw_if_indices
-	[vec_len (lm->free_l2tpv3_tunnel_hw_if_indices) - 1];
-      _vec_len (lm->free_l2tpv3_tunnel_hw_if_indices) -= 1;
-
-      hi = vnet_get_hw_interface (vnm, hw_if_index);
-      hi->dev_instance = s - lm->sessions;
-      hi->hw_instance = hi->dev_instance;
-    }
-  else
-    {
-      hw_if_index = vnet_register_interface
-	(vnm, l2tpv3_device_class.index, s - lm->sessions,
-	 l2tpv3_hw_class.index, s - lm->sessions);
-      hi = vnet_get_hw_interface (vnm, hw_if_index);
-      hi->output_node_index = l2t_encap_node.index;
-      /* $$$$ initialize custom dispositions, if needed */
-    }
-
-  s->hw_if_index = hw_if_index;
-  s->sw_if_index = hi->sw_if_index;
-
-  if (sw_if_index)
-    *sw_if_index = hi->sw_if_index;
-
-  return 0;
-}
-
-static clib_error_t *
-create_l2tpv3_tunnel_command_fn (vlib_main_t * vm,
-				 unformat_input_t * input,
-				 vlib_cli_command_t * cmd)
-{
-  ip6_address_t client_address, our_address;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  l2t_main_t *lm = &l2t_main;
-  u64 local_cookie = (u64) ~ 0, remote_cookie = (u64) ~ 0;
-  u32 local_session_id = 1, remote_session_id = 1;
-  int our_address_set = 0, client_address_set = 0;
-  int l2_sublayer_present = 0;
-  int rv;
-  u32 sw_if_index;
-  u32 encap_fib_id = ~0;
-  u32 encap_fib_index = ~0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "client %U",
-		    unformat_ip6_address, &client_address))
-	client_address_set = 1;
-      else if (unformat (line_input, "our %U",
-			 unformat_ip6_address, &our_address))
-	our_address_set = 1;
-      else if (unformat (line_input, "local-cookie %llx", &local_cookie))
-	;
-      else if (unformat (line_input, "remote-cookie %llx", &remote_cookie))
-	;
-      else if (unformat (line_input, "local-session-id %d",
-			 &local_session_id))
-	;
-      else if (unformat (line_input, "remote-session-id %d",
-			 &remote_session_id))
-	;
-      else if (unformat (line_input, "fib-id %d", &encap_fib_id))
-	;
-      else if (unformat (line_input, "l2-sublayer-present"))
-	l2_sublayer_present = 1;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (encap_fib_id != ~0)
-    {
-      uword *p;
-      ip6_main_t *im = &ip6_main;
-      if (!(p = hash_get (im->fib_index_by_table_id, encap_fib_id)))
-	return clib_error_return (0, "No fib with id %d", encap_fib_id);
-      encap_fib_index = p[0];
-    }
-  else
-    {
-      encap_fib_index = ~0;
-    }
-
-  if (our_address_set == 0)
-    return clib_error_return (0, "our address not specified");
-  if (client_address_set == 0)
-    return clib_error_return (0, "client address not specified");
-
-  rv = create_l2tpv3_ipv6_tunnel (lm, &client_address, &our_address,
-				  local_session_id, remote_session_id,
-				  local_cookie, remote_cookie,
-				  l2_sublayer_present,
-				  encap_fib_index, &sw_if_index);
-  switch (rv)
-    {
-    case 0:
-      vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name,
-		       vnet_get_main (), sw_if_index);
-      break;
-    case VNET_API_ERROR_INVALID_VALUE:
-      return clib_error_return (0, "session already exists...");
-
-    case VNET_API_ERROR_NO_SUCH_ENTRY:
-      return clib_error_return (0, "session does not exist...");
-
-    default:
-      return clib_error_return (0, "l2tp_session_add_del returned %d", rv);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (create_l2tpv3_tunnel_command, static) =
-{
-  .path = "create l2tpv3 tunnel",
-  .short_help =
-  "create l2tpv3 tunnel client <ip6> our <ip6> local-cookie <hex> remote-cookie <hex> local-session <dec> remote-session <dec>",
-  .function = create_l2tpv3_tunnel_command_fn,
-};
-/* *INDENT-ON* */
-
-int
-l2tpv3_set_tunnel_cookies (l2t_main_t * lm,
-			   u32 sw_if_index,
-			   u64 new_local_cookie, u64 new_remote_cookie)
-{
-  l2t_session_t *s;
-  vnet_hw_interface_t *hi;
-  vnet_main_t *vnm = vnet_get_main ();
-  hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
-
-  if (pool_is_free_index (lm->sessions, hi->dev_instance))
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  s = pool_elt_at_index (lm->sessions, hi->dev_instance);
-
-  s->local_cookie[1] = s->local_cookie[0];
-  s->local_cookie[0] = clib_host_to_net_u64 (new_local_cookie);
-  s->remote_cookie = clib_host_to_net_u64 (new_remote_cookie);
-
-  return 0;
-}
-
-
-static clib_error_t *
-set_l2tp_tunnel_cookie_command_fn (vlib_main_t * vm,
-				   unformat_input_t * input,
-				   vlib_cli_command_t * cmd)
-{
-  l2t_main_t *lm = &l2t_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index = ~0;
-  u64 local_cookie = (u64) ~ 0, remote_cookie = (u64) ~ 0;
-
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%U", unformat_vnet_sw_interface, vnm,
-		    &sw_if_index))
-	;
-      else if (unformat (input, "local %llx", &local_cookie))
-	;
-      else if (unformat (input, "remote %llx", &remote_cookie))
-	;
-      else
-	break;
-    }
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "unknown interface");
-  if (local_cookie == ~0)
-    return clib_error_return (0, "local cookie required");
-  if (remote_cookie == ~0)
-    return clib_error_return (0, "remote cookie required");
-
-  rv = l2tpv3_set_tunnel_cookies (lm, sw_if_index,
-				  local_cookie, remote_cookie);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case VNET_API_ERROR_INVALID_SW_IF_INDEX:
-      return clib_error_return (0, "invalid interface");
-
-    default:
-      return clib_error_return (0, "l2tp_session_set_cookies returned %d",
-				rv);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_l2tp_tunnel_cookie_command, static) =
-{
-  .path = "set l2tpv3 tunnel cookie",
-  .short_help =
-  "set l2tpv3 tunnel cookie <intfc> local <hex> remote <hex>",
-  .function = set_l2tp_tunnel_cookie_command_fn,
-};
-/* *INDENT-ON* */
-
-int
-l2tpv3_interface_enable_disable (vnet_main_t * vnm,
-				 u32 sw_if_index, int enable_disable)
-{
-
-  if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-  vnet_feature_enable_disable ("ip6-unicast", "l2tp-decap", sw_if_index,
-			       enable_disable, 0, 0);
-  return 0;
-}
-
-/* Enable/disable L2TPv3 intercept on IP6 fowarding path */
-static clib_error_t *
-set_ip6_l2tpv3 (vlib_main_t * vm,
-		unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  u32 sw_if_index = ~0;
-  int is_add = 1;
-  int rv;
-  vnet_main_t *vnm = vnet_get_main ();
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%U", unformat_vnet_sw_interface, vnm,
-		    &sw_if_index))
-	;
-      else if (unformat (input, "del"))
-	is_add = 0;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "interface required");
-
-  rv = l2tpv3_interface_enable_disable (vnm, sw_if_index, is_add);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case VNET_API_ERROR_INVALID_SW_IF_INDEX:
-      return clib_error_return (0, "invalid interface");
-
-    default:
-      return clib_error_return (0,
-				"l2tp_interface_enable_disable returned %d",
-				rv);
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_ip6_l2tpv3, static) =
-{
-  .path = "set interface ip6 l2tpv3",
-  .function = set_ip6_l2tpv3,
-  .short_help = "set interface ip6 l2tpv3 <intfc> [del]",
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-l2tp_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  l2t_main_t *lm = &l2t_main;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "lookup-v6-src"))
-	lm->lookup_type = L2T_LOOKUP_SRC_ADDRESS;
-      else if (unformat (input, "lookup-v6-dst"))
-	lm->lookup_type = L2T_LOOKUP_DST_ADDRESS;
-      else if (unformat (input, "lookup-session-id"))
-	lm->lookup_type = L2T_LOOKUP_SESSION_ID;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  return 0;
-}
-
-VLIB_CONFIG_FUNCTION (l2tp_config, "l2tp");
-
-
-clib_error_t *
-l2tp_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
-{
-  l2t_main_t *lm = &l2t_main;
-  vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  if (hi->hw_class_index != l2tpv3_hw_class.index)
-    return 0;
-
-  u32 session_index = hi->dev_instance;
-  l2t_session_t *s = pool_elt_at_index (lm->sessions, session_index);
-  s->admin_up = ! !(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-  return 0;
-}
-
-VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (l2tp_sw_interface_up_down);
-
-clib_error_t *
-l2tp_init (vlib_main_t * vm)
-{
-  l2t_main_t *lm = &l2t_main;
-  ip_main_t *im = &ip_main;
-  ip_protocol_info_t *pi;
-
-  lm->vnet_main = vnet_get_main ();
-  lm->vlib_main = vm;
-  lm->lookup_type = L2T_LOOKUP_DST_ADDRESS;
-
-  lm->session_by_src_address = hash_create_mem
-    (0, sizeof (ip6_address_t) /* key bytes */ ,
-     sizeof (u32) /* value bytes */ );
-  lm->session_by_dst_address = hash_create_mem
-    (0, sizeof (ip6_address_t) /* key bytes */ ,
-     sizeof (u32) /* value bytes */ );
-  lm->session_by_session_id = hash_create (0, sizeof (uword));
-
-  pi = ip_get_protocol_info (im, IP_PROTOCOL_L2TP);
-  pi->unformat_pg_edit = unformat_pg_l2tp_header;
-
-  /* insure these nodes are included in build */
-  l2tp_encap_init (vm);
-  l2tp_decap_init ();
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (l2tp_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2tp/l2tp.h b/vnet/vnet/l2tp/l2tp.h
deleted file mode 100644
index e7d2892c..00000000
--- a/vnet/vnet/l2tp/l2tp.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * l2tp.h : L2TPv3 tunnel support
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __included_l2tp_h__
-#define __included_l2tp_h__
-
-#include <vlib/vlib.h>
-#include <vnet/ip/ip.h>
-#include <vnet/l2tp/packet.h>
-
-typedef struct
-{
-  /* ip6 addresses */
-  ip6_address_t our_address;
-  ip6_address_t client_address;
-
-  /* l2tpv3 header parameters */
-  u64 local_cookie[2];
-  u64 remote_cookie;
-  u32 local_session_id;
-  u32 remote_session_id;
-
-  /* tunnel interface */
-  u32 hw_if_index;
-  u32 sw_if_index;
-
-  /* fib index used for outgoing encapsulated packets */
-  u32 encap_fib_index;
-
-  u8 l2tp_hdr_size;
-  u8 l2_sublayer_present;
-  u8 cookie_flags;		/* in host byte order */
-
-  u8 admin_up;
-} l2t_session_t;
-
-typedef enum
-{
-  L2T_LOOKUP_SRC_ADDRESS = 0,
-  L2T_LOOKUP_DST_ADDRESS,
-  L2T_LOOKUP_SESSION_ID,
-} ip6_to_l2_lookup_t;
-
-typedef struct
-{
-  /* session pool */
-  l2t_session_t *sessions;
-
-  /* ip6 -> l2 hash tables. Make up your minds, people... */
-  uword *session_by_src_address;
-  uword *session_by_dst_address;
-  uword *session_by_session_id;
-
-  ip6_to_l2_lookup_t lookup_type;
-
-  /* Counters */
-  vlib_combined_counter_main_t counter_main;
-
-  /* vector of free l2tpv3 tunnel interfaces */
-  u32 *free_l2tpv3_tunnel_hw_if_indices;
-
-  /* show device instance by real device instance */
-  u32 *dev_inst_by_real;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-
-} l2t_main_t;
-
-/* Packet trace structure */
-typedef struct
-{
-  int is_user_to_network;
-  u32 session_index;
-  ip6_address_t our_address;
-  ip6_address_t client_address;
-} l2t_trace_t;
-
-l2t_main_t l2t_main;
-extern vlib_node_registration_t l2t_encap_node;
-extern vlib_node_registration_t l2t_decap_node;
-extern vlib_node_registration_t l2t_decap_local_node;
-
-enum
-{
-  SESSION_COUNTER_USER_TO_NETWORK = 0,
-  SESSION_COUNTER_NETWORK_TO_USER,
-};
-
-static inline u32
-session_index_to_counter_index (u32 session_index, u32 counter_id)
-{
-  return ((session_index << 1) + counter_id);
-}
-
-u8 *format_l2t_trace (u8 * s, va_list * args);
-
-typedef struct
-{
-  /* Any per-interface config would go here */
-} ip6_l2tpv3_config_t;
-
-uword unformat_pg_l2tp_header (unformat_input_t * input, va_list * args);
-
-void l2tp_encap_init (vlib_main_t * vm);
-void l2tp_decap_init (void);
-int create_l2tpv3_ipv6_tunnel (l2t_main_t * lm,
-			       ip6_address_t * client_address,
-			       ip6_address_t * our_address,
-			       u32 local_session_id,
-			       u32 remote_session_id,
-			       u64 local_cookie,
-			       u64 remote_cookie,
-			       int l2_sublayer_present,
-			       u32 encap_fib_index, u32 * sw_if_index);
-
-int l2tpv3_set_tunnel_cookies (l2t_main_t * lm,
-			       u32 sw_if_index,
-			       u64 new_local_cookie, u64 new_remote_cookie);
-
-int l2tpv3_interface_enable_disable (vnet_main_t * vnm,
-				     u32 sw_if_index, int enable_disable);
-
-#endif /* __included_l2tp_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2tp/l2tp_api.c b/vnet/vnet/l2tp/l2tp_api.c
deleted file mode 100644
index 88d758c9..00000000
--- a/vnet/vnet/l2tp/l2tp_api.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- *------------------------------------------------------------------
- * l2tp_api.c - l2tpv3 api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/l2tp/l2tp.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                             \
-_(L2TPV3_CREATE_TUNNEL, l2tpv3_create_tunnel)                           \
-_(L2TPV3_SET_TUNNEL_COOKIES, l2tpv3_set_tunnel_cookies)                 \
-_(L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable)     \
-_(L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key)                         \
-_(SW_IF_L2TPV3_TUNNEL_DUMP, sw_if_l2tpv3_tunnel_dump)
-
-static void
-send_sw_if_l2tpv3_tunnel_details (vpe_api_main_t * am,
-				  unix_shared_memory_queue_t * q,
-				  l2t_session_t * s,
-				  l2t_main_t * lm, u32 context)
-{
-  vl_api_sw_if_l2tpv3_tunnel_details_t *mp;
-  u8 *if_name = NULL;
-  vnet_sw_interface_t *si = NULL;
-
-  si = vnet_get_hw_sw_interface (lm->vnet_main, s->hw_if_index);
-
-  if_name = format (if_name, "%U",
-		    format_vnet_sw_interface_name, lm->vnet_main, si);
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_IF_L2TPV3_TUNNEL_DETAILS);
-  strncpy ((char *) mp->interface_name,
-	   (char *) if_name, ARRAY_LEN (mp->interface_name) - 1);
-  mp->sw_if_index = ntohl (si->sw_if_index);
-  mp->local_session_id = s->local_session_id;
-  mp->remote_session_id = s->remote_session_id;
-  mp->local_cookie[0] = s->local_cookie[0];
-  mp->local_cookie[1] = s->local_cookie[1];
-  mp->remote_cookie = s->remote_cookie;
-  clib_memcpy (mp->client_address, &s->client_address,
-	       sizeof (s->client_address));
-  clib_memcpy (mp->our_address, &s->our_address, sizeof (s->our_address));
-  mp->l2_sublayer_present = s->l2_sublayer_present;
-  mp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-
-static void
-vl_api_sw_if_l2tpv3_tunnel_dump_t_handler (vl_api_sw_if_l2tpv3_tunnel_dump_t *
-					   mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  l2t_main_t *lm = &l2t_main;
-  unix_shared_memory_queue_t *q;
-  l2t_session_t *session;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  /* *INDENT-OFF* */
-  pool_foreach (session, lm->sessions,
-  ({
-    send_sw_if_l2tpv3_tunnel_details (am, q, session, lm, mp->context);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void vl_api_l2tpv3_create_tunnel_t_handler
-  (vl_api_l2tpv3_create_tunnel_t * mp)
-{
-  vl_api_l2tpv3_create_tunnel_reply_t *rmp;
-  l2t_main_t *lm = &l2t_main;
-  u32 sw_if_index = (u32) ~ 0;
-  int rv;
-
-  if (mp->is_ipv6 != 1)
-    {
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto out;
-    }
-
-  u32 encap_fib_index;
-
-  if (mp->encap_vrf_id != ~0)
-    {
-      uword *p;
-      ip6_main_t *im = &ip6_main;
-      if (!
-	  (p =
-	   hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id))))
-	{
-	  rv = VNET_API_ERROR_NO_SUCH_FIB;
-	  goto out;
-	}
-      encap_fib_index = p[0];
-    }
-  else
-    {
-      encap_fib_index = ~0;
-    }
-
-  rv = create_l2tpv3_ipv6_tunnel (lm,
-				  (ip6_address_t *) mp->client_address,
-				  (ip6_address_t *) mp->our_address,
-				  ntohl (mp->local_session_id),
-				  ntohl (mp->remote_session_id),
-				  clib_net_to_host_u64 (mp->local_cookie),
-				  clib_net_to_host_u64 (mp->remote_cookie),
-				  mp->l2_sublayer_present,
-				  encap_fib_index, &sw_if_index);
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_L2TPV3_CREATE_TUNNEL_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void vl_api_l2tpv3_set_tunnel_cookies_t_handler
-  (vl_api_l2tpv3_set_tunnel_cookies_t * mp)
-{
-  vl_api_l2tpv3_set_tunnel_cookies_reply_t *rmp;
-  l2t_main_t *lm = &l2t_main;
-  int rv;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = l2tpv3_set_tunnel_cookies (lm, ntohl (mp->sw_if_index),
-				  clib_net_to_host_u64 (mp->new_local_cookie),
-				  clib_net_to_host_u64
-				  (mp->new_remote_cookie));
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_L2TPV3_SET_TUNNEL_COOKIES_REPLY);
-}
-
-static void vl_api_l2tpv3_interface_enable_disable_t_handler
-  (vl_api_l2tpv3_interface_enable_disable_t * mp)
-{
-  int rv;
-  vnet_main_t *vnm = vnet_get_main ();
-  vl_api_l2tpv3_interface_enable_disable_reply_t *rmp;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = l2tpv3_interface_enable_disable
-    (vnm, ntohl (mp->sw_if_index), mp->enable_disable);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_L2TPV3_INTERFACE_ENABLE_DISABLE_REPLY);
-}
-
-static void vl_api_l2tpv3_set_lookup_key_t_handler
-  (vl_api_l2tpv3_set_lookup_key_t * mp)
-{
-  int rv = 0;
-  l2t_main_t *lm = &l2t_main;
-  vl_api_l2tpv3_set_lookup_key_reply_t *rmp;
-
-  if (mp->key > L2T_LOOKUP_SESSION_ID)
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto out;
-    }
-
-  lm->lookup_type = mp->key;
-
-out:
-  REPLY_MACRO (VL_API_L2TPV3_SET_LOOKUP_KEY_REPLY);
-}
-
-/*
- * l2tp_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_l2tp;
-#undef _
-}
-
-static clib_error_t *
-l2tp_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (l2tp_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2tp/packet.h b/vnet/vnet/l2tp/packet.h
deleted file mode 100644
index 66dfea21..00000000
--- a/vnet/vnet/l2tp/packet.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * packet.h : L2TPv3 packet header format
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __included_l2tp_packet_h__
-#define __included_l2tp_packet_h__
-
-/*
- * See RFC4719 for packet format.
- * Note: the l2_specific_sublayer is present in current Linux l2tpv3
- * tunnels. It is not present in IOS XR l2tpv3 tunnels.
- * The Linux implementation is almost certainly wrong.
- */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct
-{
-  u32 session_id;
-  u64 cookie; u32
-  l2_specific_sublayer;	/* set to 0 (if present) */
-}) l2tpv3_header_t;
-/* *INDENT-ON* */
-
-#endif /* __included_l2tp_packet_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l2tp/pg.c b/vnet/vnet/l2tp/pg.c
deleted file mode 100644
index 1e523d3b..00000000
--- a/vnet/vnet/l2tp/pg.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * pg.c: packet generator for L2TPv3 header
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/l2tp/l2tp.h>
-
-typedef struct
-{
-  pg_edit_t session_id;
-  pg_edit_t cookie;
-} pg_l2tp_header_t;
-
-typedef struct
-{
-  pg_edit_t l2_sublayer;
-} pg_l2tp_header_l2_sublayer_t;
-
-static inline void
-pg_l2tp_header_init (pg_l2tp_header_t * e)
-{
-  pg_edit_init (&e->session_id, l2tpv3_header_t, session_id);
-  pg_edit_init (&e->cookie, l2tpv3_header_t, cookie);
-}
-
-uword
-unformat_pg_l2tp_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t *s = va_arg (*args, pg_stream_t *);
-  pg_l2tp_header_t *h;
-  u32 group_index, error;
-  vlib_main_t *vm = vlib_get_main ();
-
-  h = pg_create_edit_group (s, sizeof (h[0]),
-			    sizeof (l2tpv3_header_t) - sizeof (u32),
-			    &group_index);
-  pg_l2tp_header_init (h);
-
-  error = 1;
-
-  /* session id and cookie are required */
-  if (!unformat (input, "L2TP: session_id %U cookie %U",
-		 unformat_pg_edit, unformat_pg_number, &h->session_id,
-		 unformat_pg_edit, unformat_pg_number, &h->cookie))
-    {
-      goto done;
-    }
-
-  /* "l2_sublayer <value>" is optional */
-  if (unformat (input, "l2_sublayer"))
-    {
-      pg_l2tp_header_l2_sublayer_t *h2;
-
-      h2 = pg_add_edits (s, sizeof (h2[0]), sizeof (u32), group_index);
-      pg_edit_init (&h2->l2_sublayer, l2tpv3_header_t, l2_specific_sublayer);
-      if (!unformat_user (input, unformat_pg_edit,
-			  unformat_pg_number, &h2->l2_sublayer))
-	{
-	  goto done;
-	}
-    }
-
-  /* Parse an ethernet header if it is present */
-  {
-    pg_node_t *pg_node = 0;
-    vlib_node_t *eth_lookup_node;
-
-    eth_lookup_node = vlib_get_node_by_name (vm, (u8 *) "ethernet-input");
-    ASSERT (eth_lookup_node);
-
-    pg_node = pg_get_node (eth_lookup_node->index);
-
-    if (pg_node && pg_node->unformat_edit
-	&& unformat_user (input, pg_node->unformat_edit, s))
-      ;
-  }
-
-  error = 0;
-
-done:
-  if (error)
-    pg_free_edit_group (s);
-  return error == 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/l3_types.h b/vnet/vnet/l3_types.h
deleted file mode 100644
index 28b0891e..00000000
--- a/vnet/vnet/l3_types.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * l3_types.h: layer 3 packet types
- *
- * Copyright (c) 2010 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vnet_l3_types_h
-#define included_vnet_l3_types_h
-
-/* Inherit generic L3 packet types from ethernet. */
-typedef enum
-{
-#define ethernet_type(n,f) VNET_L3_PACKET_TYPE_##f,
-#include <vnet/ethernet/types.def>
-#undef ethernet_type
-} vnet_l3_packet_type_t;
-
-#endif /* included_vnet_l3_types_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lawful-intercept/lawful_intercept.c b/vnet/vnet/lawful-intercept/lawful_intercept.c
deleted file mode 100644
index ef07a339..00000000
--- a/vnet/vnet/lawful-intercept/lawful_intercept.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/lawful-intercept/lawful_intercept.h>
-
-static clib_error_t *
-set_li_command_fn (vlib_main_t * vm,
-		 unformat_input_t * input,
-		 vlib_cli_command_t * cmd)
-{
-  li_main_t * lm = &li_main;
-  ip4_address_t collector;
-  u8 collector_set = 0;
-  ip4_address_t src;
-  u8 src_set = 0;
-  u32 tmp;
-  u16 udp_port = 0;
-  u8 is_add = 1;
-  int i;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "collector %U", unformat_ip4_address, &collector))
-      collector_set = 1;
-    if (unformat (input, "src %U", unformat_ip4_address, &src))
-      src_set = 1;
-    else if (unformat (input, "udp-port %d", &tmp))
-      udp_port = tmp;
-    else if (unformat (input, "del"))
-      is_add = 0;
-    else
-      break;
-  }
-
-  if (collector_set == 0)
-    return clib_error_return (0, "collector must be set...");
-  if (src_set == 0)
-    return clib_error_return (0, "src must be set...");
-  if (udp_port == 0)
-    return clib_error_return (0, "udp-port must be set...");
-
-  if (is_add == 1)
-    {
-      for (i = 0; i < vec_len (lm->collectors); i++)
-        {
-          if (lm->collectors[i].as_u32 == collector.as_u32)
-            {
-              if (lm->ports[i] == udp_port)
-                return clib_error_return 
-                  (0, "collector %U:%d already configured", 
-                   &collector, udp_port);
-              else
-                return clib_error_return
-                  (0, "collector %U already configured with port %d", 
-                   &collector, (int)(lm->ports[i]));
-            }
-        }
-      vec_add1 (lm->collectors, collector);
-      vec_add1 (lm->ports, udp_port);
-      vec_add1 (lm->src_addrs, src);
-      return 0;
-    }
-  else
-    {
-      for (i = 0; i < vec_len (lm->collectors); i++)
-        {
-          if ((lm->collectors[i].as_u32 == collector.as_u32)
-              && lm->ports[i] == udp_port)
-            {
-              vec_delete (lm->collectors, 1, i);
-              vec_delete (lm->ports, 1, i);
-              vec_delete (lm->src_addrs, 1, i);
-              return 0;
-            }
-        }
-      return clib_error_return (0, "collector %U:%d not configured",
-                                &collector, udp_port);
-    }
-  return 0;
-}
-
-VLIB_CLI_COMMAND (set_li_command, static) = {
-    .path = "set li",
-    .short_help = 
-    "set li src <ip4-address> collector <ip4-address> udp-port <nnnn>",
-    .function = set_li_command_fn,
-};
-
-static clib_error_t *
-li_init (vlib_main_t * vm)
-{
-  li_main_t * lm = &li_main;
-
-  lm->vlib_main = vm;
-  lm->vnet_main = vnet_get_main();
-  lm->hit_node_index = li_hit_node.index;
-  return 0;
-}
-
-VLIB_INIT_FUNCTION(li_init);
-
diff --git a/vnet/vnet/lawful-intercept/lawful_intercept.h b/vnet/vnet/lawful-intercept/lawful_intercept.h
deleted file mode 100644
index 89e699f5..00000000
--- a/vnet/vnet/lawful-intercept/lawful_intercept.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __lawful_intercept_h__
-#define __lawful_intercept_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-
-typedef struct {
-  /* LI collector info */
-  ip4_address_t * src_addrs;
-  ip4_address_t * collectors;
-  u16 * ports;
-
-  /* Hit node index */
-  u32 hit_node_index;
-
-  /* convenience */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-} li_main_t;
-
-li_main_t li_main;
-
-typedef CLIB_PACKED(struct {
-  ip4_header_t ip4;
-  udp_header_t udp;
-}) ip4_udp_header_t;
-
-extern vlib_node_registration_t li_hit_node;
-
-#endif /* __lawful_intercept_h__ */
diff --git a/vnet/vnet/lawful-intercept/node.c b/vnet/vnet/lawful-intercept/node.c
deleted file mode 100644
index ea0cd8ef..00000000
--- a/vnet/vnet/lawful-intercept/node.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vppinfra/error.h>
-
-#include <vnet/lawful-intercept/lawful_intercept.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-
-vlib_node_registration_t li_hit_node;
-
-typedef struct {
-  u32 next_index;
-} li_hit_trace_t;
-
-/* packet trace format function */
-static u8 * format_li_hit_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  li_hit_trace_t * t = va_arg (*args, li_hit_trace_t *);
-  
-  s = format (s, "LI_HIT: next index %d", t->next_index);
-
-  return s;
-}
-
-vlib_node_registration_t li_hit_node;
-
-#define foreach_li_hit_error                    \
-_(HITS, "LI packets processed")                 \
-_(NO_COLLECTOR, "No collector configured")
-
-typedef enum {
-#define _(sym,str) LI_HIT_ERROR_##sym,
-  foreach_li_hit_error
-#undef _
-  LI_HIT_N_ERROR,
-} li_hit_error_t;
-
-static char * li_hit_error_strings[] = {
-#define _(sym,string) string,
-  foreach_li_hit_error
-#undef _
-};
-
-typedef enum {
-  LI_HIT_NEXT_ETHERNET,
-  LI_HIT_N_NEXT,
-} li_hit_next_t;
-
-static uword
-li_hit_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * frame)
-{
-  u32 n_left_from, * from, * to_next;
-  li_hit_next_t next_index;
-  vlib_frame_t * int_frame = 0;
-  u32 * to_int_next = 0;
-  li_main_t * lm = &li_main;
-  
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  if (PREDICT_FALSE (vec_len (lm->collectors) == 0))
-    {
-      vlib_node_increment_counter (vm, li_hit_node.index, 
-                                   LI_HIT_ERROR_NO_COLLECTOR, 
-                                   n_left_from);
-    }
-  else
-    {
-      /* The intercept frame... */
-      int_frame = vlib_get_frame_to_node (vm, ip4_lookup_node.index);
-      to_int_next = vlib_frame_vector_args (int_frame);
-    }
-  
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-#if 0
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-          u32 next0 = LI_HIT_NEXT_INTERFACE_OUTPUT;
-          u32 next1 = LI_HIT_NEXT_INTERFACE_OUTPUT;
-          u32 sw_if_index0, sw_if_index1;
-          u8 tmp0[6], tmp1[6];
-          ethernet_header_t *en0, *en1;
-          u32 bi0, bi1;
-	  vlib_buffer_t * b0, * b1;
-          
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * p2, * p3;
-            
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-            
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-          /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-          /* $$$$$ Dual loop: process 2 x packets here $$$$$ */
-          ASSERT (b0->current_data == 0);
-          ASSERT (b1->current_data == 0);
-          
-          en0 = vlib_buffer_get_current (b0);
-          en1 = vlib_buffer_get_current (b1);
-
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
-
-          /* Send pkt back out the RX interface */
-          vnet_buffer(b0)->sw_if_index[VLIB_TX] = sw_if_index0;
-          vnet_buffer(b1)->sw_if_index[VLIB_TX] = sw_if_index1;
-
-          /* $$$$$ End of processing 2 x packets $$$$$ */
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)))
-            {
-              if (b0->flags & VLIB_BUFFER_IS_TRACED) 
-                {
-                    li_hit_trace_t *t = 
-                      vlib_add_trace (vm, node, b0, sizeof (*t));
-                    t->sw_if_index = sw_if_index0;
-                    t->next_index = next0;
-                  }
-                if (b1->flags & VLIB_BUFFER_IS_TRACED) 
-                  {
-                    li_hit_trace_t *t = 
-                      vlib_add_trace (vm, node, b1, sizeof (*t));
-                    t->sw_if_index = sw_if_index1;
-                    t->next_index = next1;
-                  }
-              }
-            
-            /* verify speculative enqueues, maybe switch current next frame */
-            vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-                                             to_next, n_left_to_next,
-                                             bi0, bi1, next0, next1);
-        }
-#endif /* $$$ dual-loop off */
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-          u32 bi0;
-	  vlib_buffer_t * b0;
-          vlib_buffer_t * c0;
-          ip4_udp_header_t * iu0;
-          ip4_header_t * ip0;
-          udp_header_t * udp0;
-          u32 next0 = LI_HIT_NEXT_ETHERNET;
-
-          /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-          if (PREDICT_TRUE(to_int_next != 0))
-            {
-              /* Make an intercept copy */
-              c0 = vlib_buffer_copy (vm, b0);
-              
-              vlib_buffer_advance(c0, -sizeof(*iu0));
-
-              iu0 = vlib_buffer_get_current(c0);
-              ip0 = &iu0->ip4;
-              
-              ip0->ip_version_and_header_length = 0x45;
-              ip0->ttl = 254;
-              ip0->protocol = IP_PROTOCOL_UDP;
-              
-              ip0->src_address.as_u32 = lm->src_addrs[0].as_u32;
-              ip0->dst_address.as_u32 = lm->collectors[0].as_u32;
-              ip0->length = vlib_buffer_length_in_chain (vm, c0);
-              ip0->checksum = ip4_header_checksum (ip0);
-              
-              udp0 = &iu0->udp;
-              udp0->src_port = udp0->dst_port = 
-                  clib_host_to_net_u16(lm->ports[0]);
-              udp0->checksum = 0;
-              udp0->length = 
-                  clib_net_to_host_u16 (vlib_buffer_length_in_chain (vm , b0));
-              
-              to_int_next [0] = vlib_get_buffer_index (vm, c0);
-              to_int_next++;
-            }
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              li_hit_trace_t *t = 
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->next_index = next0;
-            }
-            
-          /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  if (int_frame)
-    {
-      int_frame->n_vectors = frame->n_vectors;
-      vlib_put_frame_to_node (vm, ip4_lookup_node.index, int_frame);
-    }
-
-  vlib_node_increment_counter (vm, li_hit_node.index, 
-                               LI_HIT_ERROR_HITS, frame->n_vectors);
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (li_hit_node) = {
-  .function = li_hit_node_fn,
-  .name = "li-hit",
-  .vector_size = sizeof (u32),
-  .format_trace = format_li_hit_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_errors = ARRAY_LEN(li_hit_error_strings),
-  .error_strings = li_hit_error_strings,
-
-  .n_next_nodes = LI_HIT_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-        [LI_HIT_NEXT_ETHERNET] = "ethernet-input-not-l2",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (li_hit_node, li_hit_node_fn)
-
diff --git a/vnet/vnet/lisp-cp/control.c b/vnet/vnet/lisp-cp/control.c
deleted file mode 100644
index de048a41..00000000
--- a/vnet/vnet/lisp-cp/control.c
+++ /dev/null
@@ -1,4950 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlibmemory/api.h>
-#include <vnet/lisp-cp/control.h>
-#include <vnet/lisp-cp/packets.h>
-#include <vnet/lisp-cp/lisp_msg_serdes.h>
-#include <vnet/lisp-gpe/lisp_gpe.h>
-#include <vnet/lisp-gpe/lisp_gpe_fwd_entry.h>
-#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
-#include <vnet/fib/fib_entry.h>
-#include <vnet/fib/fib_table.h>
-
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-
-typedef struct
-{
-  u8 is_resend;
-  gid_address_t seid;
-  gid_address_t deid;
-  u8 smr_invoked;
-} map_request_args_t;
-
-typedef struct
-{
-  u64 nonce;
-  u8 is_rloc_probe;
-  mapping_t *mappings;
-} map_records_arg_t;
-
-static int
-lisp_add_del_adjacency (lisp_cp_main_t * lcm, gid_address_t * local_eid,
-			gid_address_t * remote_eid, u8 is_add);
-
-u8
-vnet_lisp_get_map_request_mode (void)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  return lcm->map_request_mode;
-}
-
-static u16
-auth_data_len_by_key_id (lisp_key_type_t key_id)
-{
-  switch (key_id)
-    {
-    case HMAC_SHA_1_96:
-      return SHA1_AUTH_DATA_LEN;
-    case HMAC_SHA_256_128:
-      return SHA256_AUTH_DATA_LEN;
-    default:
-      clib_warning ("unsupported key type: %d!", key_id);
-      return (u16) ~ 0;
-    }
-  return (u16) ~ 0;
-}
-
-static const EVP_MD *
-get_encrypt_fcn (lisp_key_type_t key_id)
-{
-  switch (key_id)
-    {
-    case HMAC_SHA_1_96:
-      return EVP_sha1 ();
-    case HMAC_SHA_256_128:
-      return EVP_sha256 ();
-    default:
-      clib_warning ("unsupported encryption key type: %d!", key_id);
-      break;
-    }
-  return 0;
-}
-
-static int
-queue_map_request (gid_address_t * seid, gid_address_t * deid,
-		   u8 smr_invoked, u8 is_resend);
-
-ip_interface_address_t *
-ip_interface_get_first_interface_address (ip_lookup_main_t * lm,
-					  u32 sw_if_index, u8 loop)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_sw_interface_t *swif = vnet_get_sw_interface (vnm, sw_if_index);
-  if (loop && swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
-    sw_if_index = swif->unnumbered_sw_if_index;
-  u32 ia =
-    (vec_len ((lm)->if_address_pool_index_by_sw_if_index) > (sw_if_index)) ?
-    vec_elt ((lm)->if_address_pool_index_by_sw_if_index, (sw_if_index)) :
-    (u32) ~ 0;
-  return pool_elt_at_index ((lm)->if_address_pool, ia);
-}
-
-void *
-ip_interface_get_first_address (ip_lookup_main_t * lm, u32 sw_if_index,
-				u8 version)
-{
-  ip_interface_address_t *ia;
-
-  ia = ip_interface_get_first_interface_address (lm, sw_if_index, 1);
-  if (!ia)
-    return 0;
-  return ip_interface_address_get_address (lm, ia);
-}
-
-int
-ip_interface_get_first_ip_address (lisp_cp_main_t * lcm, u32 sw_if_index,
-				   u8 version, ip_address_t * result)
-{
-  ip_lookup_main_t *lm;
-  void *addr;
-
-  lm = (version == IP4) ? &lcm->im4->lookup_main : &lcm->im6->lookup_main;
-  addr = ip_interface_get_first_address (lm, sw_if_index, version);
-  if (!addr)
-    return 0;
-
-  ip_address_set (result, addr, version);
-  return 1;
-}
-
-/**
- * convert from a LISP address to a FIB prefix
- */
-void
-ip_address_to_fib_prefix (const ip_address_t * addr, fib_prefix_t * prefix)
-{
-  if (addr->version == IP4)
-    {
-      prefix->fp_len = 32;
-      prefix->fp_proto = FIB_PROTOCOL_IP4;
-      memset (&prefix->fp_addr.pad, 0, sizeof (prefix->fp_addr.pad));
-      memcpy (&prefix->fp_addr.ip4, &addr->ip, sizeof (prefix->fp_addr.ip4));
-    }
-  else
-    {
-      prefix->fp_len = 128;
-      prefix->fp_proto = FIB_PROTOCOL_IP6;
-      memcpy (&prefix->fp_addr.ip6, &addr->ip, sizeof (prefix->fp_addr.ip6));
-    }
-}
-
-/**
- * convert from a LISP to a FIB prefix
- */
-void
-ip_prefix_to_fib_prefix (const ip_prefix_t * ip_prefix,
-			 fib_prefix_t * fib_prefix)
-{
-  ip_address_to_fib_prefix (&ip_prefix->addr, fib_prefix);
-  fib_prefix->fp_len = ip_prefix->len;
-}
-
-/**
- * Find the sw_if_index of the interface that would be used to egress towards
- * dst.
- */
-u32
-ip_fib_get_egress_iface_for_dst (lisp_cp_main_t * lcm, ip_address_t * dst)
-{
-  fib_node_index_t fei;
-  fib_prefix_t prefix;
-
-  ip_address_to_fib_prefix (dst, &prefix);
-
-  fei = fib_table_lookup (0, &prefix);
-
-  return (fib_entry_get_resolving_interface (fei));
-}
-
-/**
- * Find first IP of the interface that would be used to egress towards dst.
- * Returns 1 if the address is found 0 otherwise.
- */
-int
-ip_fib_get_first_egress_ip_for_dst (lisp_cp_main_t * lcm, ip_address_t * dst,
-				    ip_address_t * result)
-{
-  u32 si;
-  ip_lookup_main_t *lm;
-  void *addr = 0;
-  u8 ipver;
-
-  ASSERT (result != 0);
-
-  ipver = ip_addr_version (dst);
-
-  lm = (ipver == IP4) ? &lcm->im4->lookup_main : &lcm->im6->lookup_main;
-  si = ip_fib_get_egress_iface_for_dst (lcm, dst);
-
-  if ((u32) ~ 0 == si)
-    return 0;
-
-  /* find the first ip address */
-  addr = ip_interface_get_first_address (lm, si, ipver);
-  if (0 == addr)
-    return 0;
-
-  ip_address_set (result, addr, ipver);
-  return 1;
-}
-
-static int
-dp_add_del_iface (lisp_cp_main_t * lcm, u32 vni, u8 is_l2, u8 is_add)
-{
-  uword *dp_table;
-
-  if (!is_l2)
-    {
-      dp_table = hash_get (lcm->table_id_by_vni, vni);
-
-      if (!dp_table)
-	{
-	  clib_warning ("vni %d not associated to a vrf!", vni);
-	  return VNET_API_ERROR_INVALID_VALUE;
-	}
-    }
-  else
-    {
-      dp_table = hash_get (lcm->bd_id_by_vni, vni);
-      if (!dp_table)
-	{
-	  clib_warning ("vni %d not associated to a bridge domain!", vni);
-	  return VNET_API_ERROR_INVALID_VALUE;
-	}
-    }
-
-  /* enable/disable data-plane interface */
-  if (is_add)
-    {
-      if (is_l2)
-	lisp_gpe_tenant_l2_iface_add_or_lock (vni, dp_table[0]);
-      else
-	lisp_gpe_tenant_l3_iface_add_or_lock (vni, dp_table[0]);
-    }
-  else
-    {
-      if (is_l2)
-	lisp_gpe_tenant_l2_iface_unlock (vni);
-      else
-	lisp_gpe_tenant_l3_iface_unlock (vni);
-    }
-
-  return 0;
-}
-
-static void
-dp_del_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index)
-{
-  vnet_lisp_gpe_add_del_fwd_entry_args_t _a, *a = &_a;
-  fwd_entry_t *fe = 0;
-  uword *feip = 0;
-  memset (a, 0, sizeof (*a));
-
-  feip = hash_get (lcm->fwd_entry_by_mapping_index, dst_map_index);
-  if (!feip)
-    return;
-
-  fe = pool_elt_at_index (lcm->fwd_entry_pool, feip[0]);
-
-  /* delete dp fwd entry */
-  u32 sw_if_index;
-  a->is_add = 0;
-  a->locator_pairs = fe->locator_pairs;
-  a->vni = gid_address_vni (&fe->reid);
-  gid_address_copy (&a->rmt_eid, &fe->reid);
-  if (fe->is_src_dst)
-    gid_address_copy (&a->lcl_eid, &fe->leid);
-
-  vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index);
-
-  /* delete entry in fwd table */
-  hash_unset (lcm->fwd_entry_by_mapping_index, dst_map_index);
-  vec_free (fe->locator_pairs);
-  pool_put (lcm->fwd_entry_pool, fe);
-}
-
-/**
- * Finds first remote locator with best (lowest) priority that has a local
- * peer locator with an underlying route to it.
- *
- */
-static u32
-get_locator_pairs (lisp_cp_main_t * lcm, mapping_t * lcl_map,
-		   mapping_t * rmt_map, locator_pair_t ** locator_pairs)
-{
-  u32 i, limitp = 0, li, found = 0, esi;
-  locator_set_t *rmt_ls, *lcl_ls;
-  ip_address_t _lcl_addr, *lcl_addr = &_lcl_addr;
-  locator_t *lp, *rmt = 0;
-  uword *checked = 0;
-  locator_pair_t pair;
-
-  rmt_ls =
-    pool_elt_at_index (lcm->locator_set_pool, rmt_map->locator_set_index);
-  lcl_ls =
-    pool_elt_at_index (lcm->locator_set_pool, lcl_map->locator_set_index);
-
-  if (!rmt_ls || vec_len (rmt_ls->locator_indices) == 0)
-    return 0;
-
-  while (1)
-    {
-      rmt = 0;
-
-      /* find unvisited remote locator with best priority */
-      for (i = 0; i < vec_len (rmt_ls->locator_indices); i++)
-	{
-	  if (0 != hash_get (checked, i))
-	    continue;
-
-	  li = vec_elt (rmt_ls->locator_indices, i);
-	  lp = pool_elt_at_index (lcm->locator_pool, li);
-
-	  /* we don't support non-IP locators for now */
-	  if (gid_address_type (&lp->address) != GID_ADDR_IP_PREFIX)
-	    continue;
-
-	  if ((found && lp->priority == limitp)
-	      || (!found && lp->priority >= limitp))
-	    {
-	      rmt = lp;
-
-	      /* don't search for locators with lower priority and don't
-	       * check this locator again*/
-	      limitp = lp->priority;
-	      hash_set (checked, i, 1);
-	      break;
-	    }
-	}
-      /* check if a local locator with a route to remote locator exists */
-      if (rmt != 0)
-	{
-	  /* find egress sw_if_index for rmt locator */
-	  esi =
-	    ip_fib_get_egress_iface_for_dst (lcm,
-					     &gid_address_ip (&rmt->address));
-	  if ((u32) ~ 0 == esi)
-	    continue;
-
-	  for (i = 0; i < vec_len (lcl_ls->locator_indices); i++)
-	    {
-	      li = vec_elt (lcl_ls->locator_indices, i);
-	      locator_t *sl = pool_elt_at_index (lcm->locator_pool, li);
-
-	      /* found local locator with the needed sw_if_index */
-	      if (sl->sw_if_index == esi)
-		{
-		  /* and it has an address */
-		  if (0 == ip_interface_get_first_ip_address (lcm,
-							      sl->sw_if_index,
-							      gid_address_ip_version
-							      (&rmt->address),
-							      lcl_addr))
-		    continue;
-
-		  memset (&pair, 0, sizeof (pair));
-		  ip_address_copy (&pair.rmt_loc,
-				   &gid_address_ip (&rmt->address));
-		  ip_address_copy (&pair.lcl_loc, lcl_addr);
-		  pair.weight = rmt->weight;
-		  pair.priority = rmt->priority;
-		  vec_add1 (locator_pairs[0], pair);
-		  found = 1;
-		}
-	    }
-	}
-      else
-	break;
-    }
-
-  hash_free (checked);
-  return found;
-}
-
-static void
-gid_address_sd_to_flat (gid_address_t * dst, gid_address_t * src,
-			fid_address_t * fid)
-{
-  ASSERT (GID_ADDR_SRC_DST == gid_address_type (src));
-
-  dst[0] = src[0];
-
-  switch (fid_addr_type (fid))
-    {
-    case FID_ADDR_IP_PREF:
-      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
-      gid_address_ippref (dst) = fid_addr_ippref (fid);
-      break;
-    case FID_ADDR_MAC:
-      gid_address_type (dst) = GID_ADDR_MAC;
-      mac_copy (gid_address_mac (dst), fid_addr_mac (fid));
-      break;
-    default:
-      clib_warning ("Unsupported fid type %d!", fid_addr_type (fid));
-      break;
-    }
-}
-
-u8
-vnet_lisp_map_register_state_get (void)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  return lcm->map_registering;
-}
-
-u8
-vnet_lisp_rloc_probe_state_get (void)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  return lcm->rloc_probing;
-}
-
-static void
-dp_add_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index)
-{
-  vnet_lisp_gpe_add_del_fwd_entry_args_t _a, *a = &_a;
-  mapping_t *src_map, *dst_map;
-  u32 sw_if_index;
-  uword *feip = 0, *dpid;
-  fwd_entry_t *fe;
-  u8 type, is_src_dst = 0;
-
-  memset (a, 0, sizeof (*a));
-
-  /* remove entry if it already exists */
-  feip = hash_get (lcm->fwd_entry_by_mapping_index, dst_map_index);
-  if (feip)
-    dp_del_fwd_entry (lcm, src_map_index, dst_map_index);
-
-  if (lcm->lisp_pitr)
-    src_map = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
-  else
-    src_map = pool_elt_at_index (lcm->mapping_pool, src_map_index);
-  dst_map = pool_elt_at_index (lcm->mapping_pool, dst_map_index);
-
-  /* insert data plane forwarding entry */
-  a->is_add = 1;
-
-  if (MR_MODE_SRC_DST == lcm->map_request_mode)
-    {
-      if (GID_ADDR_SRC_DST == gid_address_type (&dst_map->eid))
-	{
-	  gid_address_sd_to_flat (&a->rmt_eid, &dst_map->eid,
-				  &gid_address_sd_dst (&dst_map->eid));
-	  gid_address_sd_to_flat (&a->lcl_eid, &dst_map->eid,
-				  &gid_address_sd_src (&dst_map->eid));
-	}
-      else
-	{
-	  gid_address_copy (&a->rmt_eid, &dst_map->eid);
-	  gid_address_copy (&a->lcl_eid, &src_map->eid);
-	}
-      is_src_dst = 1;
-    }
-  else
-    gid_address_copy (&a->rmt_eid, &dst_map->eid);
-
-  a->vni = gid_address_vni (&a->rmt_eid);
-
-  /* get vrf or bd_index associated to vni */
-  type = gid_address_type (&a->rmt_eid);
-  if (GID_ADDR_IP_PREFIX == type)
-    {
-      dpid = hash_get (lcm->table_id_by_vni, a->vni);
-      if (!dpid)
-	{
-	  clib_warning ("vni %d not associated to a vrf!", a->vni);
-	  return;
-	}
-      a->table_id = dpid[0];
-    }
-  else if (GID_ADDR_MAC == type)
-    {
-      dpid = hash_get (lcm->bd_id_by_vni, a->vni);
-      if (!dpid)
-	{
-	  clib_warning ("vni %d not associated to a bridge domain !", a->vni);
-	  return;
-	}
-      a->bd_id = dpid[0];
-    }
-
-  /* find best locator pair that 1) verifies LISP policy 2) are connected */
-  if (0 == get_locator_pairs (lcm, src_map, dst_map, &a->locator_pairs))
-    {
-      /* negative entry */
-      a->is_negative = 1;
-      a->action = dst_map->action;
-    }
-
-  /* TODO remove */
-  u8 ipver = ip_prefix_version (&gid_address_ippref (&a->rmt_eid));
-  a->decap_next_index = (ipver == IP4) ?
-    LISP_GPE_INPUT_NEXT_IP4_INPUT : LISP_GPE_INPUT_NEXT_IP6_INPUT;
-
-  vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index);
-
-  /* add tunnel to fwd entry table XXX check return value from DP insertion */
-  pool_get (lcm->fwd_entry_pool, fe);
-  fe->locator_pairs = a->locator_pairs;
-  gid_address_copy (&fe->reid, &a->rmt_eid);
-  gid_address_copy (&fe->leid, &src_map->eid);
-  fe->is_src_dst = is_src_dst;
-  hash_set (lcm->fwd_entry_by_mapping_index, dst_map_index,
-	    fe - lcm->fwd_entry_pool);
-}
-
-/**
- * Returns vector of adjacencies.
- *
- * The caller must free the vector returned by this function.
- *
- * @param vni virtual network identifier
- * @return vector of adjacencies
- */
-lisp_adjacency_t *
-vnet_lisp_adjacencies_get_by_vni (u32 vni)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  fwd_entry_t *fwd;
-  lisp_adjacency_t *adjs = 0, adj;
-
-  /* *INDENT-OFF* */
-  pool_foreach(fwd, lcm->fwd_entry_pool,
-  ({
-    if (gid_address_vni (&fwd->reid) != vni)
-      continue;
-
-    gid_address_copy (&adj.reid, &fwd->reid);
-    gid_address_copy (&adj.leid, &fwd->leid);
-    vec_add1 (adjs, adj);
-  }));
-  /* *INDENT-ON* */
-
-  return adjs;
-}
-
-static clib_error_t *
-lisp_show_adjacencies_command_fn (vlib_main_t * vm,
-				  unformat_input_t * input,
-				  vlib_cli_command_t * cmd)
-{
-  lisp_adjacency_t *adjs, *adj;
-  vlib_cli_output (vm, "%s %40s\n", "leid", "reid");
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u32 vni = ~0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "vni %d", &vni))
-	;
-      else
-	{
-	  vlib_cli_output (vm, "parse error: '%U'",
-			   format_unformat_error, line_input);
-	  return 0;
-	}
-    }
-
-  if (~0 == vni)
-    {
-      vlib_cli_output (vm, "error: no vni specified!");
-      return 0;
-    }
-
-  adjs = vnet_lisp_adjacencies_get_by_vni (vni);
-
-  vec_foreach (adj, adjs)
-  {
-    vlib_cli_output (vm, "%U %40U\n", format_gid_address, &adj->leid,
-		     format_gid_address, &adj->reid);
-  }
-  vec_free (adjs);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_show_adjacencies_command) = {
-    .path = "show lisp adjacencies",
-    .short_help = "show lisp adjacencies",
-    .function = lisp_show_adjacencies_command_fn,
-};
-/* *INDENT-ON* */
-
-static lisp_msmr_t *
-get_map_server (ip_address_t * a)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  lisp_msmr_t *m;
-
-  vec_foreach (m, lcm->map_servers)
-  {
-    if (!ip_address_cmp (&m->address, a))
-      {
-	return m;
-      }
-  }
-  return 0;
-}
-
-static lisp_msmr_t *
-get_map_resolver (ip_address_t * a)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  lisp_msmr_t *m;
-
-  vec_foreach (m, lcm->map_resolvers)
-  {
-    if (!ip_address_cmp (&m->address, a))
-      {
-	return m;
-      }
-  }
-  return 0;
-}
-
-int
-vnet_lisp_add_del_map_server (ip_address_t * addr, u8 is_add)
-{
-  u32 i;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  lisp_msmr_t _ms, *ms = &_ms;
-
-  if (vnet_lisp_enable_disable_status () == 0)
-    {
-      clib_warning ("LISP is disabled!");
-      return VNET_API_ERROR_LISP_DISABLED;
-    }
-
-  if (is_add)
-    {
-      if (get_map_server (addr))
-	{
-	  clib_warning ("map-server %U already exists!", format_ip_address,
-			addr);
-	  return -1;
-	}
-
-      memset (ms, 0, sizeof (*ms));
-      ip_address_copy (&ms->address, addr);
-      vec_add1 (lcm->map_servers, ms[0]);
-    }
-  else
-    {
-      for (i = 0; i < vec_len (lcm->map_servers); i++)
-	{
-	  ms = vec_elt_at_index (lcm->map_servers, i);
-	  if (!ip_address_cmp (&ms->address, addr))
-	    {
-	      vec_del1 (lcm->map_servers, i);
-	      break;
-	    }
-	}
-    }
-
-  return 0;
-}
-
-static clib_error_t *
-lisp_add_del_map_server_command_fn (vlib_main_t * vm,
-				    unformat_input_t * input,
-				    vlib_cli_command_t * cmd)
-{
-  int rv = 0;
-  u8 is_add = 1, ip_set = 0;
-  ip_address_t ip;
-  unformat_input_t _line_input, *line_input = &_line_input;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "add"))
-	is_add = 1;
-      else if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "%U", unformat_ip_address, &ip))
-	ip_set = 1;
-      else
-	{
-	  vlib_cli_output (vm, "parse error: '%U'",
-			   format_unformat_error, line_input);
-	  return 0;
-	}
-    }
-
-  if (!ip_set)
-    {
-      vlib_cli_output (vm, "map-server ip address not set!");
-      return 0;
-    }
-
-  rv = vnet_lisp_add_del_map_server (&ip, is_add);
-  if (!rv)
-    vlib_cli_output (vm, "failed to %s map-server!",
-		     is_add ? "add" : "delete");
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_add_del_map_server_command) = {
-    .path = "lisp map-server",
-    .short_help = "lisp map-server add|del <ip>",
-    .function = lisp_add_del_map_server_command_fn,
-};
-/* *INDENT-ON* */
-
-/**
- * Add/remove mapping to/from map-cache. Overwriting not allowed.
- */
-int
-vnet_lisp_map_cache_add_del (vnet_lisp_add_del_mapping_args_t * a,
-			     u32 * map_index_result)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  u32 mi, *map_indexp, map_index, i;
-  mapping_t *m, *old_map;
-  u32 **eid_indexes;
-
-  mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &a->eid);
-  old_map = mi != ~0 ? pool_elt_at_index (lcm->mapping_pool, mi) : 0;
-  if (a->is_add)
-    {
-      /* TODO check if overwriting and take appropriate actions */
-      if (mi != GID_LOOKUP_MISS && !gid_address_cmp (&old_map->eid, &a->eid))
-	{
-	  clib_warning ("eid %U found in the eid-table", format_gid_address,
-			&a->eid);
-	  return VNET_API_ERROR_VALUE_EXIST;
-	}
-
-      pool_get (lcm->mapping_pool, m);
-      gid_address_copy (&m->eid, &a->eid);
-      m->locator_set_index = a->locator_set_index;
-      m->ttl = a->ttl;
-      m->action = a->action;
-      m->local = a->local;
-      m->is_static = a->is_static;
-      m->key = vec_dup (a->key);
-      m->key_id = a->key_id;
-
-      map_index = m - lcm->mapping_pool;
-      gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->eid, map_index,
-			      1);
-
-      if (pool_is_free_index (lcm->locator_set_pool, a->locator_set_index))
-	{
-	  clib_warning ("Locator set with index %d doesn't exist",
-			a->locator_set_index);
-	  return VNET_API_ERROR_INVALID_VALUE;
-	}
-
-      /* add eid to list of eids supported by locator-set */
-      vec_validate (lcm->locator_set_to_eids, a->locator_set_index);
-      eid_indexes = vec_elt_at_index (lcm->locator_set_to_eids,
-				      a->locator_set_index);
-      vec_add1 (eid_indexes[0], map_index);
-
-      if (a->local)
-	{
-	  /* mark as local */
-	  vec_add1 (lcm->local_mappings_indexes, map_index);
-	}
-      map_index_result[0] = map_index;
-    }
-  else
-    {
-      if (mi == GID_LOOKUP_MISS)
-	{
-	  clib_warning ("eid %U not found in the eid-table",
-			format_gid_address, &a->eid);
-	  return VNET_API_ERROR_INVALID_VALUE;
-	}
-
-      /* clear locator-set to eids binding */
-      eid_indexes = vec_elt_at_index (lcm->locator_set_to_eids,
-				      a->locator_set_index);
-      for (i = 0; i < vec_len (eid_indexes[0]); i++)
-	{
-	  map_indexp = vec_elt_at_index (eid_indexes[0], i);
-	  if (map_indexp[0] == mi)
-	    break;
-	}
-      vec_del1 (eid_indexes[0], i);
-
-      /* remove local mark if needed */
-      m = pool_elt_at_index (lcm->mapping_pool, mi);
-      if (m->local)
-	{
-	  u32 k, *lm_indexp;
-	  for (k = 0; k < vec_len (lcm->local_mappings_indexes); k++)
-	    {
-	      lm_indexp = vec_elt_at_index (lcm->local_mappings_indexes, k);
-	      if (lm_indexp[0] == mi)
-		break;
-	    }
-	  vec_del1 (lcm->local_mappings_indexes, k);
-	}
-
-      /* remove mapping from dictionary */
-      gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->eid, 0, 0);
-      gid_address_free (&m->eid);
-      pool_put_index (lcm->mapping_pool, mi);
-    }
-
-  return 0;
-}
-
-/**
- *  Add/update/delete mapping to/in/from map-cache.
- */
-int
-vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a,
-				 u32 * map_index_result)
-{
-  uword *dp_table = 0;
-  u32 vni;
-  u8 type;
-
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-
-  if (vnet_lisp_enable_disable_status () == 0)
-    {
-      clib_warning ("LISP is disabled!");
-      return VNET_API_ERROR_LISP_DISABLED;
-    }
-
-  vni = gid_address_vni (&a->eid);
-  type = gid_address_type (&a->eid);
-  if (GID_ADDR_IP_PREFIX == type)
-    dp_table = hash_get (lcm->table_id_by_vni, vni);
-  else if (GID_ADDR_MAC == type)
-    dp_table = hash_get (lcm->bd_id_by_vni, vni);
-
-  if (!dp_table)
-    {
-      clib_warning ("vni %d not associated to a %s!", vni,
-		    GID_ADDR_IP_PREFIX == type ? "vrf" : "bd");
-      return VNET_API_ERROR_INVALID_VALUE;
-    }
-
-  /* store/remove mapping from map-cache */
-  return vnet_lisp_map_cache_add_del (a, map_index_result);
-}
-
-static clib_error_t *
-lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input,
-				   vlib_cli_command_t * cmd)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 is_add = 1;
-  gid_address_t eid;
-  gid_address_t *eids = 0;
-  clib_error_t *error = 0;
-  u8 *locator_set_name = 0;
-  u32 locator_set_index = 0, map_index = 0;
-  uword *p;
-  vnet_lisp_add_del_mapping_args_t _a, *a = &_a;
-  int rv = 0;
-  u32 vni = 0;
-  u8 *key = 0;
-  u32 key_id = 0;
-
-  memset (&eid, 0, sizeof (eid));
-  memset (a, 0, sizeof (*a));
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "add"))
-	is_add = 1;
-      else if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "eid %U", unformat_gid_address, &eid))
-	;
-      else if (unformat (line_input, "vni %d", &vni))
-	gid_address_vni (&eid) = vni;
-      else if (unformat (line_input, "secret-key %_%v%_", &key))
-	;
-      else if (unformat (line_input, "key-id %U", unformat_hmac_key_id,
-			 &key_id))
-	;
-      else if (unformat (line_input, "locator-set %_%v%_", &locator_set_name))
-	{
-	  p = hash_get_mem (lcm->locator_set_index_by_name, locator_set_name);
-	  if (!p)
-	    {
-	      error = clib_error_return (0, "locator-set %s doesn't exist",
-					 locator_set_name);
-	      goto done;
-	    }
-	  locator_set_index = p[0];
-	}
-      else
-	{
-	  error = unformat_parse_error (line_input);
-	  goto done;
-	}
-    }
-  /* XXX treat batch configuration */
-
-  if (GID_ADDR_SRC_DST == gid_address_type (&eid))
-    {
-      error =
-	clib_error_return (0, "src/dst is not supported for local EIDs!");
-      goto done;
-    }
-
-  if (key && (0 == key_id))
-    {
-      vlib_cli_output (vm, "invalid key_id!");
-      return 0;
-    }
-
-  gid_address_copy (&a->eid, &eid);
-  a->is_add = is_add;
-  a->locator_set_index = locator_set_index;
-  a->local = 1;
-  a->key = key;
-  a->key_id = key_id;
-
-  rv = vnet_lisp_add_del_local_mapping (a, &map_index);
-  if (0 != rv)
-    {
-      error = clib_error_return (0, "failed to %s local mapping!",
-				 is_add ? "add" : "delete");
-    }
-done:
-  vec_free (eids);
-  if (locator_set_name)
-    vec_free (locator_set_name);
-  gid_address_free (&a->eid);
-  vec_free (a->key);
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_add_del_local_eid_command) = {
-    .path = "lisp eid-table",
-    .short_help = "lisp eid-table add/del [vni <vni>] eid <eid> "
-      "locator-set <locator-set> [key <secret-key> key-id sha1|sha256 ]",
-    .function = lisp_add_del_local_eid_command_fn,
-};
-/* *INDENT-ON* */
-
-int
-vnet_lisp_eid_table_map (u32 vni, u32 dp_id, u8 is_l2, u8 is_add)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  uword *dp_idp, *vnip, **dp_table_by_vni, **vni_by_dp_table;
-
-  if (vnet_lisp_enable_disable_status () == 0)
-    {
-      clib_warning ("LISP is disabled!");
-      return -1;
-    }
-
-  dp_table_by_vni = is_l2 ? &lcm->bd_id_by_vni : &lcm->table_id_by_vni;
-  vni_by_dp_table = is_l2 ? &lcm->vni_by_bd_id : &lcm->vni_by_table_id;
-
-  if (!is_l2 && (vni == 0 || dp_id == 0))
-    {
-      clib_warning ("can't add/del default vni-vrf mapping!");
-      return -1;
-    }
-
-  dp_idp = hash_get (dp_table_by_vni[0], vni);
-  vnip = hash_get (vni_by_dp_table[0], dp_id);
-
-  if (is_add)
-    {
-      if (dp_idp || vnip)
-	{
-	  clib_warning ("vni %d or vrf %d already used in vrf/vni "
-			"mapping!", vni, dp_id);
-	  return -1;
-	}
-      hash_set (dp_table_by_vni[0], vni, dp_id);
-      hash_set (vni_by_dp_table[0], dp_id, vni);
-
-      /* create dp iface */
-      dp_add_del_iface (lcm, vni, is_l2, 1);
-    }
-  else
-    {
-      if (!dp_idp || !vnip)
-	{
-	  clib_warning ("vni %d or vrf %d not used in any vrf/vni! "
-			"mapping!", vni, dp_id);
-	  return -1;
-	}
-      hash_unset (dp_table_by_vni[0], vni);
-      hash_unset (vni_by_dp_table[0], dp_id);
-
-      /* remove dp iface */
-      dp_add_del_iface (lcm, vni, is_l2, 0);
-    }
-  return 0;
-
-}
-
-static clib_error_t *
-lisp_eid_table_map_command_fn (vlib_main_t * vm,
-			       unformat_input_t * input,
-			       vlib_cli_command_t * cmd)
-{
-  u8 is_add = 1, is_l2 = 0;
-  u32 vni = 0, dp_id = 0;
-  unformat_input_t _line_input, *line_input = &_line_input;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "vni %d", &vni))
-	;
-      else if (unformat (line_input, "vrf %d", &dp_id))
-	;
-      else if (unformat (line_input, "bd %d", &dp_id))
-	is_l2 = 1;
-      else
-	{
-	  return unformat_parse_error (line_input);
-	}
-    }
-  vnet_lisp_eid_table_map (vni, dp_id, is_l2, is_add);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_eid_table_map_command) = {
-    .path = "lisp eid-table map",
-    .short_help = "lisp eid-table map [del] vni <vni> vrf <vrf> | bd <bdi>",
-    .function = lisp_eid_table_map_command_fn,
-};
-/* *INDENT-ON* */
-
-/* return 0 if the two locator sets are identical 1 otherwise */
-static u8
-compare_locators (lisp_cp_main_t * lcm, u32 * old_ls_indexes,
-		  locator_t * new_locators)
-{
-  u32 i, old_li;
-  locator_t *old_loc, *new_loc;
-
-  if (vec_len (old_ls_indexes) != vec_len (new_locators))
-    return 1;
-
-  for (i = 0; i < vec_len (new_locators); i++)
-    {
-      old_li = vec_elt (old_ls_indexes, i);
-      old_loc = pool_elt_at_index (lcm->locator_pool, old_li);
-
-      new_loc = vec_elt_at_index (new_locators, i);
-
-      if (locator_cmp (old_loc, new_loc))
-	return 1;
-    }
-  return 0;
-}
-
-typedef struct
-{
-  u8 is_negative;
-  void *lcm;
-  gid_address_t *eids_to_be_deleted;
-} remove_mapping_args_t;
-
-/**
- * Callback invoked when a sub-prefix is found
- */
-static void
-remove_mapping_if_needed (u32 mi, void *arg)
-{
-  u8 delete = 0;
-  remove_mapping_args_t *a = arg;
-  lisp_cp_main_t *lcm = a->lcm;
-  mapping_t *m;
-  locator_set_t *ls;
-
-  m = pool_elt_at_index (lcm->mapping_pool, mi);
-  if (!m)
-    return;
-
-  ls = pool_elt_at_index (lcm->locator_set_pool, m->locator_set_index);
-
-  if (a->is_negative)
-    {
-      if (0 != vec_len (ls->locator_indices))
-	delete = 1;
-    }
-  else
-    {
-      if (0 == vec_len (ls->locator_indices))
-	delete = 1;
-    }
-
-  if (delete)
-    vec_add1 (a->eids_to_be_deleted, m->eid);
-}
-
-/**
- * This function searches map cache and looks for IP prefixes that are subset
- * of the provided one. If such prefix is found depending on 'is_negative'
- * it does follows:
- *
- * 1) if is_negative is true and found prefix points to positive mapping,
- *    then the mapping is removed
- * 2) if is_negative is false and found prefix points to negative mapping,
- *    then the mapping is removed
- */
-static void
-remove_overlapping_sub_prefixes (lisp_cp_main_t * lcm, gid_address_t * eid,
-				 u8 is_negative)
-{
-  gid_address_t *e;
-  remove_mapping_args_t a;
-  memset (&a, 0, sizeof (a));
-
-  /* do this only in src/dst mode ... */
-  if (MR_MODE_SRC_DST != lcm->map_request_mode)
-    return;
-
-  /* ... and  only for IP prefix */
-  if (GID_ADDR_SRC_DST != gid_address_type (eid)
-      || (FID_ADDR_IP_PREF != gid_address_sd_dst_type (eid)))
-    return;
-
-  a.is_negative = is_negative;
-  a.lcm = lcm;
-
-  gid_dict_foreach_subprefix (&lcm->mapping_index_by_gid, eid,
-			      remove_mapping_if_needed, &a);
-
-  vec_foreach (e, a.eids_to_be_deleted)
-  {
-    lisp_add_del_adjacency (lcm, 0, e, 0 /* is_add */ );
-    vnet_lisp_add_del_mapping (e, 0, 0, 0, 0, 0 /* is add */ , 0, 0);
-  }
-
-  vec_free (a.eids_to_be_deleted);
-}
-
-static void
-mapping_delete_timer (lisp_cp_main_t * lcm, u32 mi)
-{
-  timing_wheel_delete (&lcm->wheel, mi);
-}
-
-/**
- * Adds/removes/updates mapping. Does not program forwarding.
- *
- * @param eid end-host identifier
- * @param rlocs vector of remote locators
- * @param action action for negative map-reply
- * @param is_add add mapping if non-zero, delete otherwise
- * @param res_map_index the map-index that was created/updated/removed. It is
- *                      set to ~0 if no action is taken.
- * @param is_static used for distinguishing between statically learned
-                    remote mappings and mappings obtained from MR
- * @return return code
- */
-int
-vnet_lisp_add_del_mapping (gid_address_t * eid, locator_t * rlocs, u8 action,
-			   u8 authoritative, u32 ttl, u8 is_add, u8 is_static,
-			   u32 * res_map_index)
-{
-  vnet_lisp_add_del_mapping_args_t _m_args, *m_args = &_m_args;
-  vnet_lisp_add_del_locator_set_args_t _ls_args, *ls_args = &_ls_args;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  u32 mi, ls_index = 0, dst_map_index;
-  mapping_t *old_map;
-
-  if (vnet_lisp_enable_disable_status () == 0)
-    {
-      clib_warning ("LISP is disabled!");
-      return VNET_API_ERROR_LISP_DISABLED;
-    }
-
-  if (res_map_index)
-    res_map_index[0] = ~0;
-
-  memset (m_args, 0, sizeof (m_args[0]));
-  memset (ls_args, 0, sizeof (ls_args[0]));
-
-  ls_args->locators = rlocs;
-
-  mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, eid);
-  old_map = ((u32) ~ 0 != mi) ? pool_elt_at_index (lcm->mapping_pool, mi) : 0;
-
-  if (is_add)
-    {
-      /* overwrite: if mapping already exists, decide if locators should be
-       * updated and be done */
-      if (old_map && gid_address_cmp (&old_map->eid, eid) == 0)
-	{
-	  if (!is_static && (old_map->is_static || old_map->local))
-	    {
-	      /* do not overwrite local or static remote mappings */
-	      clib_warning ("mapping %U rejected due to collision with local "
-			    "or static remote mapping!", format_gid_address,
-			    eid);
-	      return 0;
-	    }
-
-	  locator_set_t *old_ls;
-
-	  /* update mapping attributes */
-	  old_map->action = action;
-	  old_map->authoritative = authoritative;
-	  old_map->ttl = ttl;
-
-	  old_ls = pool_elt_at_index (lcm->locator_set_pool,
-				      old_map->locator_set_index);
-	  if (compare_locators (lcm, old_ls->locator_indices,
-				ls_args->locators))
-	    {
-	      /* set locator-set index to overwrite */
-	      ls_args->is_add = 1;
-	      ls_args->index = old_map->locator_set_index;
-	      vnet_lisp_add_del_locator_set (ls_args, 0);
-	      if (res_map_index)
-		res_map_index[0] = mi;
-	    }
-	}
-      /* new mapping */
-      else
-	{
-	  remove_overlapping_sub_prefixes (lcm, eid, 0 == ls_args->locators);
-
-	  ls_args->is_add = 1;
-	  ls_args->index = ~0;
-
-	  vnet_lisp_add_del_locator_set (ls_args, &ls_index);
-
-	  /* add mapping */
-	  gid_address_copy (&m_args->eid, eid);
-	  m_args->is_add = 1;
-	  m_args->action = action;
-	  m_args->locator_set_index = ls_index;
-	  m_args->is_static = is_static;
-	  m_args->ttl = ttl;
-	  vnet_lisp_map_cache_add_del (m_args, &dst_map_index);
-
-	  if (res_map_index)
-	    res_map_index[0] = dst_map_index;
-	}
-    }
-  else
-    {
-      if (old_map == 0 || gid_address_cmp (&old_map->eid, eid) != 0)
-	{
-	  clib_warning ("cannot delete mapping for eid %U",
-			format_gid_address, eid);
-	  return -1;
-	}
-
-      m_args->is_add = 0;
-      gid_address_copy (&m_args->eid, eid);
-      m_args->locator_set_index = old_map->locator_set_index;
-
-      /* delete mapping associated from map-cache */
-      vnet_lisp_map_cache_add_del (m_args, 0);
-
-      ls_args->is_add = 0;
-      ls_args->index = old_map->locator_set_index;
-      /* delete locator set */
-      vnet_lisp_add_del_locator_set (ls_args, 0);
-
-      /* delete timer associated to the mapping if any */
-      if (old_map->timer_set)
-	mapping_delete_timer (lcm, mi);
-
-      /* return old mapping index */
-      if (res_map_index)
-	res_map_index[0] = mi;
-    }
-
-  /* success */
-  return 0;
-}
-
-int
-vnet_lisp_clear_all_remote_adjacencies (void)
-{
-  int rv = 0;
-  u32 mi, *map_indices = 0, *map_indexp;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  vnet_lisp_add_del_mapping_args_t _dm_args, *dm_args = &_dm_args;
-  vnet_lisp_add_del_locator_set_args_t _ls, *ls = &_ls;
-
-  /* *INDENT-OFF* */
-  pool_foreach_index (mi, lcm->mapping_pool,
-  ({
-    vec_add1 (map_indices, mi);
-  }));
-  /* *INDENT-ON* */
-
-  vec_foreach (map_indexp, map_indices)
-  {
-    mapping_t *map = pool_elt_at_index (lcm->mapping_pool, map_indexp[0]);
-    if (!map->local)
-      {
-	dp_del_fwd_entry (lcm, 0, map_indexp[0]);
-
-	dm_args->is_add = 0;
-	gid_address_copy (&dm_args->eid, &map->eid);
-	dm_args->locator_set_index = map->locator_set_index;
-
-	/* delete mapping associated to fwd entry */
-	vnet_lisp_map_cache_add_del (dm_args, 0);
-
-	ls->is_add = 0;
-	ls->local = 0;
-	ls->index = map->locator_set_index;
-	/* delete locator set */
-	rv = vnet_lisp_add_del_locator_set (ls, 0);
-	if (rv != 0)
-	  goto cleanup;
-      }
-  }
-
-cleanup:
-  if (map_indices)
-    vec_free (map_indices);
-  return rv;
-}
-
-/**
- * Adds adjacency or removes forwarding entry associated to remote mapping.
- * Note that adjacencies are not stored, they only result in forwarding entries
- * being created.
- */
-static int
-lisp_add_del_adjacency (lisp_cp_main_t * lcm, gid_address_t * local_eid,
-			gid_address_t * remote_eid, u8 is_add)
-{
-  u32 local_mi, remote_mi = ~0;
-
-  if (vnet_lisp_enable_disable_status () == 0)
-    {
-      clib_warning ("LISP is disabled!");
-      return VNET_API_ERROR_LISP_DISABLED;
-    }
-
-  remote_mi = gid_dictionary_sd_lookup (&lcm->mapping_index_by_gid,
-					remote_eid, local_eid);
-  if (GID_LOOKUP_MISS == remote_mi)
-    {
-      clib_warning ("Remote eid %U not found. Cannot add adjacency!",
-		    format_gid_address, remote_eid);
-
-      return -1;
-    }
-
-  if (is_add)
-    {
-      /* TODO 1) check if src/dst 2) once we have src/dst working, use it in
-       * delete*/
-
-      /* check if source eid has an associated mapping. If pitr mode is on,
-       * just use the pitr's mapping */
-      local_mi = lcm->lisp_pitr ? lcm->pitr_map_index :
-	gid_dictionary_lookup (&lcm->mapping_index_by_gid, local_eid);
-
-
-      if (GID_LOOKUP_MISS == local_mi)
-	{
-	  clib_warning ("Local eid %U not found. Cannot add adjacency!",
-			format_gid_address, local_eid);
-
-	  return -1;
-	}
-
-      /* update forwarding */
-      dp_add_fwd_entry (lcm, local_mi, remote_mi);
-    }
-  else
-    dp_del_fwd_entry (lcm, 0, remote_mi);
-
-  return 0;
-}
-
-int
-vnet_lisp_add_del_adjacency (vnet_lisp_add_del_adjacency_args_t * a)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  return lisp_add_del_adjacency (lcm, &a->leid, &a->reid, a->is_add);
-}
-
-/**
- * Handler for add/del remote mapping CLI.
- *
- * @param vm vlib context
- * @param input input from user
- * @param cmd cmd
- * @return pointer to clib error structure
- */
-static clib_error_t *
-lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm,
-					unformat_input_t * input,
-					vlib_cli_command_t * cmd)
-{
-  clib_error_t *error = 0;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 is_add = 1, del_all = 0;
-  locator_t rloc, *rlocs = 0, *curr_rloc = 0;
-  gid_address_t eid;
-  u8 eid_set = 0;
-  u32 vni, action = ~0, p, w;
-  int rv;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  memset (&eid, 0, sizeof (eid));
-  memset (&rloc, 0, sizeof (rloc));
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "del-all"))
-	del_all = 1;
-      else if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "add"))
-	;
-      else if (unformat (line_input, "eid %U", unformat_gid_address, &eid))
-	eid_set = 1;
-      else if (unformat (line_input, "vni %u", &vni))
-	{
-	  gid_address_vni (&eid) = vni;
-	}
-      else if (unformat (line_input, "p %d w %d", &p, &w))
-	{
-	  if (!curr_rloc)
-	    {
-	      clib_warning
-		("No RLOC configured for setting priority/weight!");
-	      goto done;
-	    }
-	  curr_rloc->priority = p;
-	  curr_rloc->weight = w;
-	}
-      else if (unformat (line_input, "rloc %U", unformat_ip_address,
-			 &gid_address_ip (&rloc.address)))
-	{
-	  /* since rloc is stored in ip prefix we need to set prefix length */
-	  ip_prefix_t *pref = &gid_address_ippref (&rloc.address);
-
-	  u8 version = gid_address_ip_version (&rloc.address);
-	  ip_prefix_len (pref) = ip_address_max_len (version);
-
-	  vec_add1 (rlocs, rloc);
-	  curr_rloc = &rlocs[vec_len (rlocs) - 1];
-	}
-      else if (unformat (line_input, "action %U",
-			 unformat_negative_mapping_action, &action))
-	;
-      else
-	{
-	  clib_warning ("parse error");
-	  goto done;
-	}
-    }
-
-  if (!eid_set)
-    {
-      clib_warning ("missing eid!");
-      goto done;
-    }
-
-  if (!del_all)
-    {
-      if (is_add && (~0 == action) && 0 == vec_len (rlocs))
-	{
-	  clib_warning ("no action set for negative map-reply!");
-	  goto done;
-	}
-    }
-  else
-    {
-      vnet_lisp_clear_all_remote_adjacencies ();
-      goto done;
-    }
-
-  /* TODO build src/dst with seid */
-
-  /* if it's a delete, clean forwarding */
-  if (!is_add)
-    {
-      lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-      rv = lisp_add_del_adjacency (lcm, 0, &eid, /* is_add */ 0);
-      if (rv)
-	{
-	  goto done;
-	}
-    }
-
-  /* add as static remote mapping, i.e., not authoritative and infinite
-   * ttl */
-  rv = vnet_lisp_add_del_mapping (&eid, rlocs, action, 0, ~0, is_add,
-				  1 /* is_static */ , 0);
-
-  if (rv)
-    clib_warning ("failed to %s remote mapping!", is_add ? "add" : "delete");
-
-done:
-  vec_free (rlocs);
-  unformat_free (line_input);
-  return error;
-}
-
-VLIB_CLI_COMMAND (lisp_add_del_remote_mapping_command) =
-{
-.path = "lisp remote-mapping",.short_help =
-    "lisp remote-mapping add|del [del-all] vni <vni> "
-    "eid <est-eid> [action <no-action|natively-forward|"
-    "send-map-request|drop>] rloc <dst-locator> p <prio> w <weight> "
-    "[rloc <dst-locator> ... ]",.function =
-    lisp_add_del_remote_mapping_command_fn,};
-
-/**
- * Handler for add/del adjacency CLI.
- */
-static clib_error_t *
-lisp_add_del_adjacency_command_fn (vlib_main_t * vm, unformat_input_t * input,
-				   vlib_cli_command_t * cmd)
-{
-  clib_error_t *error = 0;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
-  u8 is_add = 1;
-  ip_prefix_t *reid_ippref, *leid_ippref;
-  gid_address_t leid, reid;
-  u8 *dmac = gid_address_mac (&reid);
-  u8 *smac = gid_address_mac (&leid);
-  u8 reid_set = 0, leid_set = 0;
-  u32 vni;
-  int rv;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  memset (&reid, 0, sizeof (reid));
-  memset (&leid, 0, sizeof (leid));
-
-  leid_ippref = &gid_address_ippref (&leid);
-  reid_ippref = &gid_address_ippref (&reid);
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "add"))
-	;
-      else if (unformat (line_input, "reid %U",
-			 unformat_ip_prefix, reid_ippref))
-	{
-	  gid_address_type (&reid) = GID_ADDR_IP_PREFIX;
-	  reid_set = 1;
-	}
-      else if (unformat (line_input, "reid %U", unformat_mac_address, dmac))
-	{
-	  gid_address_type (&reid) = GID_ADDR_MAC;
-	  reid_set = 1;
-	}
-      else if (unformat (line_input, "vni %u", &vni))
-	{
-	  gid_address_vni (&leid) = vni;
-	  gid_address_vni (&reid) = vni;
-	}
-      else if (unformat (line_input, "leid %U",
-			 unformat_ip_prefix, leid_ippref))
-	{
-	  gid_address_type (&leid) = GID_ADDR_IP_PREFIX;
-	  leid_set = 1;
-	}
-      else if (unformat (line_input, "leid %U", unformat_mac_address, smac))
-	{
-	  gid_address_type (&leid) = GID_ADDR_MAC;
-	  leid_set = 1;
-	}
-      else
-	{
-	  clib_warning ("parse error");
-	  goto done;
-	}
-    }
-
-  if (!reid_set || !leid_set)
-    {
-      clib_warning ("missing remote or local eid!");
-      goto done;
-    }
-
-  if ((gid_address_type (&leid) != gid_address_type (&reid))
-      || (gid_address_type (&reid) == GID_ADDR_IP_PREFIX
-	  && ip_prefix_version (reid_ippref)
-	  != ip_prefix_version (leid_ippref)))
-    {
-      clib_warning ("remote and local EIDs are of different types!");
-      return error;
-    }
-
-  memset (a, 0, sizeof (a[0]));
-  gid_address_copy (&a->leid, &leid);
-  gid_address_copy (&a->reid, &reid);
-
-  a->is_add = is_add;
-  rv = vnet_lisp_add_del_adjacency (a);
-
-  if (rv)
-    clib_warning ("failed to %s adjacency!", is_add ? "add" : "delete");
-
-done:
-  unformat_free (line_input);
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_add_del_adjacency_command) = {
-    .path = "lisp adjacency",
-    .short_help = "lisp adjacency add|del vni <vni> reid <remote-eid> "
-      "leid <local-eid>",
-    .function = lisp_add_del_adjacency_command_fn,
-};
-/* *INDENT-ON* */
-
-int
-vnet_lisp_set_map_request_mode (u8 mode)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-
-  if (vnet_lisp_enable_disable_status () == 0)
-    {
-      clib_warning ("LISP is disabled!");
-      return VNET_API_ERROR_LISP_DISABLED;
-    }
-
-  if (mode >= _MR_MODE_MAX)
-    {
-      clib_warning ("Invalid LISP map request mode %d!", mode);
-      return VNET_API_ERROR_INVALID_ARGUMENT;
-    }
-
-  lcm->map_request_mode = mode;
-  return 0;
-}
-
-static clib_error_t *
-lisp_map_request_mode_command_fn (vlib_main_t * vm,
-				  unformat_input_t * input,
-				  vlib_cli_command_t * cmd)
-{
-  unformat_input_t _i, *i = &_i;
-  map_request_mode_t mr_mode = _MR_MODE_MAX;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, i))
-    return 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "dst-only"))
-	mr_mode = MR_MODE_DST_ONLY;
-      else if (unformat (i, "src-dst"))
-	mr_mode = MR_MODE_SRC_DST;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  goto done;
-	}
-    }
-
-  if (_MR_MODE_MAX == mr_mode)
-    {
-      clib_warning ("No LISP map request mode entered!");
-      return 0;
-    }
-
-  vnet_lisp_set_map_request_mode (mr_mode);
-done:
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_map_request_mode_command) = {
-    .path = "lisp map-request mode",
-    .short_help = "lisp map-request mode dst-only|src-dst",
-    .function = lisp_map_request_mode_command_fn,
-};
-/* *INDENT-ON* */
-
-static u8 *
-format_lisp_map_request_mode (u8 * s, va_list * args)
-{
-  u32 mode = va_arg (*args, u32);
-
-  switch (mode)
-    {
-    case 0:
-      return format (0, "dst-only");
-    case 1:
-      return format (0, "src-dst");
-    }
-  return 0;
-}
-
-static clib_error_t *
-lisp_show_map_request_mode_command_fn (vlib_main_t * vm,
-				       unformat_input_t * input,
-				       vlib_cli_command_t * cmd)
-{
-  vlib_cli_output (vm, "map-request mode: %U", format_lisp_map_request_mode,
-		   vnet_lisp_get_map_request_mode ());
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_show_map_request_mode_command) = {
-    .path = "show lisp map-request mode",
-    .short_help = "show lisp map-request mode",
-    .function = lisp_show_map_request_mode_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-lisp_show_map_resolvers_command_fn (vlib_main_t * vm,
-				    unformat_input_t * input,
-				    vlib_cli_command_t * cmd)
-{
-  lisp_msmr_t *mr;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-
-  vec_foreach (mr, lcm->map_resolvers)
-  {
-    vlib_cli_output (vm, "%U", format_ip_address, &mr->address);
-  }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_show_map_resolvers_command) = {
-    .path = "show lisp map-resolvers",
-    .short_help = "show lisp map-resolvers",
-    .function = lisp_show_map_resolvers_command_fn,
-};
-/* *INDENT-ON* */
-
-int
-vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  u32 locator_set_index = ~0;
-  mapping_t *m;
-  uword *p;
-
-  if (vnet_lisp_enable_disable_status () == 0)
-    {
-      clib_warning ("LISP is disabled!");
-      return VNET_API_ERROR_LISP_DISABLED;
-    }
-
-  p = hash_get_mem (lcm->locator_set_index_by_name, locator_set_name);
-  if (!p)
-    {
-      clib_warning ("locator-set %v doesn't exist", locator_set_name);
-      return -1;
-    }
-  locator_set_index = p[0];
-
-  if (is_add)
-    {
-      pool_get (lcm->mapping_pool, m);
-      m->locator_set_index = locator_set_index;
-      m->local = 1;
-      lcm->pitr_map_index = m - lcm->mapping_pool;
-
-      /* enable pitr mode */
-      lcm->lisp_pitr = 1;
-    }
-  else
-    {
-      /* remove pitr mapping */
-      pool_put_index (lcm->mapping_pool, lcm->pitr_map_index);
-
-      /* disable pitr mode */
-      lcm->lisp_pitr = 0;
-    }
-  return 0;
-}
-
-static clib_error_t *
-lisp_pitr_set_locator_set_command_fn (vlib_main_t * vm,
-				      unformat_input_t * input,
-				      vlib_cli_command_t * cmd)
-{
-  u8 locator_name_set = 0;
-  u8 *locator_set_name = 0;
-  u8 is_add = 1;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  clib_error_t *error = 0;
-  int rv = 0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "ls %_%v%_", &locator_set_name))
-	locator_name_set = 1;
-      else if (unformat (line_input, "disable"))
-	is_add = 0;
-      else
-	return clib_error_return (0, "parse error");
-    }
-
-  if (!locator_name_set)
-    {
-      clib_warning ("No locator set specified!");
-      goto done;
-    }
-  rv = vnet_lisp_pitr_set_locator_set (locator_set_name, is_add);
-  if (0 != rv)
-    {
-      error = clib_error_return (0, "failed to %s pitr!",
-				 is_add ? "add" : "delete");
-    }
-
-done:
-  if (locator_set_name)
-    vec_free (locator_set_name);
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_pitr_set_locator_set_command) = {
-    .path = "lisp pitr",
-    .short_help = "lisp pitr [disable] ls <locator-set-name>",
-    .function = lisp_pitr_set_locator_set_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-lisp_show_pitr_command_fn (vlib_main_t * vm,
-			   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  mapping_t *m;
-  locator_set_t *ls;
-  u8 *tmp_str = 0;
-
-  vlib_cli_output (vm, "%=20s%=16s",
-		   "pitr", lcm->lisp_pitr ? "locator-set" : "");
-
-  if (!lcm->lisp_pitr)
-    {
-      vlib_cli_output (vm, "%=20s", "disable");
-      return 0;
-    }
-
-  if (~0 == lcm->pitr_map_index)
-    {
-      tmp_str = format (0, "N/A");
-    }
-  else
-    {
-      m = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
-      if (~0 != m->locator_set_index)
-	{
-	  ls =
-	    pool_elt_at_index (lcm->locator_set_pool, m->locator_set_index);
-	  tmp_str = format (0, "%s", ls->name);
-	}
-      else
-	{
-	  tmp_str = format (0, "N/A");
-	}
-    }
-  vec_add1 (tmp_str, 0);
-
-  vlib_cli_output (vm, "%=20s%=16s", "enable", tmp_str);
-
-  vec_free (tmp_str);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_show_pitr_command) = {
-    .path = "show lisp pitr",
-    .short_help = "Show pitr",
-    .function = lisp_show_pitr_command_fn,
-};
-/* *INDENT-ON* */
-
-static u8 *
-format_eid_entry (u8 * s, va_list * args)
-{
-  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
-  lisp_cp_main_t *lcm = va_arg (*args, lisp_cp_main_t *);
-  mapping_t *mapit = va_arg (*args, mapping_t *);
-  locator_set_t *ls = va_arg (*args, locator_set_t *);
-  gid_address_t *gid = &mapit->eid;
-  u32 ttl = mapit->ttl;
-  u8 aut = mapit->authoritative;
-  u32 *loc_index;
-  u8 first_line = 1;
-  u8 *loc;
-
-  u8 *type = ls->local ? format (0, "local(%s)", ls->name)
-    : format (0, "remote");
-
-  if (vec_len (ls->locator_indices) == 0)
-    {
-      s = format (s, "%-35U%-30s%-20u%-u", format_gid_address, gid,
-		  type, ttl, aut);
-    }
-  else
-    {
-      vec_foreach (loc_index, ls->locator_indices)
-      {
-	locator_t *l = pool_elt_at_index (lcm->locator_pool, loc_index[0]);
-	if (l->local)
-	  loc = format (0, "%U", format_vnet_sw_if_index_name, vnm,
-			l->sw_if_index);
-	else
-	  loc = format (0, "%U", format_ip_address,
-			&gid_address_ip (&l->address));
-
-	if (first_line)
-	  {
-	    s = format (s, "%-35U%-20s%-30v%-20u%-u\n", format_gid_address,
-			gid, type, loc, ttl, aut);
-	    first_line = 0;
-	  }
-	else
-	  s = format (s, "%55s%v\n", "", loc);
-      }
-    }
-  return s;
-}
-
-static clib_error_t *
-lisp_show_eid_table_command_fn (vlib_main_t * vm,
-				unformat_input_t * input,
-				vlib_cli_command_t * cmd)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  mapping_t *mapit;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u32 mi;
-  gid_address_t eid;
-  u8 print_all = 1;
-  u8 filter = 0;
-
-  memset (&eid, 0, sizeof (eid));
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "eid %U", unformat_gid_address, &eid))
-	print_all = 0;
-      else if (unformat (line_input, "local"))
-	filter = 1;
-      else if (unformat (line_input, "remote"))
-	filter = 2;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  vlib_cli_output (vm, "%-35s%-20s%-30s%-20s%-s",
-		   "EID", "type", "locators", "ttl", "autoritative");
-
-  if (print_all)
-    {
-      /* *INDENT-OFF* */
-      pool_foreach (mapit, lcm->mapping_pool,
-      ({
-        locator_set_t * ls = pool_elt_at_index (lcm->locator_set_pool,
-                                                mapit->locator_set_index);
-        if (filter && !((1 == filter && ls->local) ||
-          (2 == filter && !ls->local)))
-          {
-            continue;
-          }
-        vlib_cli_output (vm, "%U", format_eid_entry, lcm->vnet_main,
-                         lcm, mapit, ls);
-      }));
-      /* *INDENT-ON* */
-    }
-  else
-    {
-      mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &eid);
-      if ((u32) ~ 0 == mi)
-	return 0;
-
-      mapit = pool_elt_at_index (lcm->mapping_pool, mi);
-      locator_set_t *ls = pool_elt_at_index (lcm->locator_set_pool,
-					     mapit->locator_set_index);
-
-      if (filter && !((1 == filter && ls->local) ||
-		      (2 == filter && !ls->local)))
-	{
-	  return 0;
-	}
-
-      vlib_cli_output (vm, "%U,", format_eid_entry, lcm->vnet_main,
-		       lcm, mapit, ls);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_cp_show_eid_table_command) = {
-    .path = "show lisp eid-table",
-    .short_help = "Shows EID table",
-    .function = lisp_show_eid_table_command_fn,
-};
-/* *INDENT-ON* */
-
-/* cleans locator to locator-set data and removes locators not part of
- * any locator-set */
-static void
-clean_locator_to_locator_set (lisp_cp_main_t * lcm, u32 lsi)
-{
-  u32 i, j, *loc_indexp, *ls_indexp, **ls_indexes, *to_be_deleted = 0;
-  locator_set_t *ls = pool_elt_at_index (lcm->locator_set_pool, lsi);
-  for (i = 0; i < vec_len (ls->locator_indices); i++)
-    {
-      loc_indexp = vec_elt_at_index (ls->locator_indices, i);
-      ls_indexes = vec_elt_at_index (lcm->locator_to_locator_sets,
-				     loc_indexp[0]);
-      for (j = 0; j < vec_len (ls_indexes[0]); j++)
-	{
-	  ls_indexp = vec_elt_at_index (ls_indexes[0], j);
-	  if (ls_indexp[0] == lsi)
-	    break;
-	}
-
-      /* delete index for removed locator-set */
-      vec_del1 (ls_indexes[0], j);
-
-      /* delete locator if it's part of no locator-set */
-      if (vec_len (ls_indexes[0]) == 0)
-	{
-	  pool_put_index (lcm->locator_pool, loc_indexp[0]);
-	  vec_add1 (to_be_deleted, i);
-	}
-    }
-
-  if (to_be_deleted)
-    {
-      for (i = 0; i < vec_len (to_be_deleted); i++)
-	{
-	  loc_indexp = vec_elt_at_index (to_be_deleted, i);
-	  vec_del1 (ls->locator_indices, loc_indexp[0]);
-	}
-      vec_free (to_be_deleted);
-    }
-}
-
-static inline uword *
-get_locator_set_index (vnet_lisp_add_del_locator_set_args_t * a, uword * p)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-
-  ASSERT (a != NULL);
-  ASSERT (p != NULL);
-
-  /* find locator-set */
-  if (a->local)
-    {
-      p = hash_get_mem (lcm->locator_set_index_by_name, a->name);
-    }
-  else
-    {
-      *p = a->index;
-    }
-
-  return p;
-}
-
-static inline int
-is_locator_in_locator_set (lisp_cp_main_t * lcm, locator_set_t * ls,
-			   locator_t * loc)
-{
-  locator_t *itloc;
-  u32 *locit;
-
-  ASSERT (ls != NULL);
-  ASSERT (loc != NULL);
-
-  vec_foreach (locit, ls->locator_indices)
-  {
-    itloc = pool_elt_at_index (lcm->locator_pool, locit[0]);
-    if ((ls->local && itloc->sw_if_index == loc->sw_if_index) ||
-	(!ls->local && !gid_address_cmp (&itloc->address, &loc->address)))
-      {
-	clib_warning ("Duplicate locator");
-	return VNET_API_ERROR_VALUE_EXIST;
-      }
-  }
-
-  return 0;
-}
-
-static inline void
-remove_locator_from_locator_set (locator_set_t * ls, u32 * locit,
-				 u32 ls_index, u32 loc_id)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  u32 **ls_indexes = NULL;
-
-  ASSERT (ls != NULL);
-  ASSERT (locit != NULL);
-
-  ls_indexes = vec_elt_at_index (lcm->locator_to_locator_sets, locit[0]);
-  pool_put_index (lcm->locator_pool, locit[0]);
-  vec_del1 (ls->locator_indices, loc_id);
-  vec_del1 (ls_indexes[0], ls_index);
-}
-
-int
-vnet_lisp_add_del_locator (vnet_lisp_add_del_locator_set_args_t * a,
-			   locator_set_t * ls, u32 * ls_result)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  locator_t *loc = NULL, *itloc = NULL;
-  uword _p = (u32) ~ 0, *p = &_p;
-  u32 loc_index = ~0, ls_index = ~0, *locit = NULL, **ls_indexes = NULL;
-  u32 loc_id = ~0;
-  int ret = 0;
-
-  ASSERT (a != NULL);
-
-  if (vnet_lisp_enable_disable_status () == 0)
-    {
-      clib_warning ("LISP is disabled!");
-      return VNET_API_ERROR_LISP_DISABLED;
-    }
-
-  p = get_locator_set_index (a, p);
-  if (!p)
-    {
-      clib_warning ("locator-set %v doesn't exist", a->name);
-      return VNET_API_ERROR_INVALID_ARGUMENT;
-    }
-
-  if (ls == 0)
-    {
-      ls = pool_elt_at_index (lcm->locator_set_pool, p[0]);
-      if (!ls)
-	{
-	  clib_warning ("locator-set %d to be overwritten doesn't exist!",
-			p[0]);
-	  return VNET_API_ERROR_INVALID_ARGUMENT;
-	}
-    }
-
-  if (a->is_add)
-    {
-      if (ls_result)
-	ls_result[0] = p[0];
-
-      /* allocate locators */
-      vec_foreach (itloc, a->locators)
-      {
-	ret = is_locator_in_locator_set (lcm, ls, itloc);
-	if (0 != ret)
-	  {
-	    return ret;
-	  }
-
-	pool_get (lcm->locator_pool, loc);
-	loc[0] = itloc[0];
-	loc_index = loc - lcm->locator_pool;
-
-	vec_add1 (ls->locator_indices, loc_index);
-
-	vec_validate (lcm->locator_to_locator_sets, loc_index);
-	ls_indexes = vec_elt_at_index (lcm->locator_to_locator_sets,
-				       loc_index);
-	vec_add1 (ls_indexes[0], p[0]);
-      }
-    }
-  else
-    {
-      ls_index = p[0];
-
-      itloc = a->locators;
-      loc_id = 0;
-      vec_foreach (locit, ls->locator_indices)
-      {
-	loc = pool_elt_at_index (lcm->locator_pool, locit[0]);
-
-	if (loc->local && loc->sw_if_index == itloc->sw_if_index)
-	  {
-	    remove_locator_from_locator_set (ls, locit, ls_index, loc_id);
-	  }
-	if (0 == loc->local &&
-	    !gid_address_cmp (&loc->address, &itloc->address))
-	  {
-	    remove_locator_from_locator_set (ls, locit, ls_index, loc_id);
-	  }
-
-	loc_id++;
-      }
-    }
-
-  return 0;
-}
-
-int
-vnet_lisp_add_del_locator_set (vnet_lisp_add_del_locator_set_args_t * a,
-			       u32 * ls_result)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  locator_set_t *ls;
-  uword _p = (u32) ~ 0, *p = &_p;
-  u32 ls_index;
-  u32 **eid_indexes;
-  int ret = 0;
-
-  if (vnet_lisp_enable_disable_status () == 0)
-    {
-      clib_warning ("LISP is disabled!");
-      return VNET_API_ERROR_LISP_DISABLED;
-    }
-
-  if (a->is_add)
-    {
-      p = get_locator_set_index (a, p);
-
-      /* overwrite */
-      if (p && p[0] != (u32) ~ 0)
-	{
-	  ls = pool_elt_at_index (lcm->locator_set_pool, p[0]);
-	  if (!ls)
-	    {
-	      clib_warning ("locator-set %d to be overwritten doesn't exist!",
-			    p[0]);
-	      return -1;
-	    }
-
-	  /* clean locator to locator-set vectors and remove locators if
-	   * they're not part of another locator-set */
-	  clean_locator_to_locator_set (lcm, p[0]);
-
-	  /* remove locator indices from locator set */
-	  vec_free (ls->locator_indices);
-
-	  ls_index = p[0];
-
-	  if (ls_result)
-	    ls_result[0] = p[0];
-	}
-      /* new locator-set */
-      else
-	{
-	  pool_get (lcm->locator_set_pool, ls);
-	  memset (ls, 0, sizeof (*ls));
-	  ls_index = ls - lcm->locator_set_pool;
-
-	  if (a->local)
-	    {
-	      ls->name = vec_dup (a->name);
-
-	      if (!lcm->locator_set_index_by_name)
-		lcm->locator_set_index_by_name = hash_create_vec (
-								   /* size */
-								   0,
-								   sizeof
-								   (ls->name
-								    [0]),
-								   sizeof
-								   (uword));
-	      hash_set_mem (lcm->locator_set_index_by_name, ls->name,
-			    ls_index);
-
-	      /* mark as local locator-set */
-	      vec_add1 (lcm->local_locator_set_indexes, ls_index);
-	    }
-	  ls->local = a->local;
-	  if (ls_result)
-	    ls_result[0] = ls_index;
-	}
-
-      ret = vnet_lisp_add_del_locator (a, ls, NULL);
-      if (0 != ret)
-	{
-	  return ret;
-	}
-    }
-  else
-    {
-      p = get_locator_set_index (a, p);
-      if (!p)
-	{
-	  clib_warning ("locator-set %v doesn't exists", a->name);
-	  return -1;
-	}
-
-      ls = pool_elt_at_index (lcm->locator_set_pool, p[0]);
-      if (!ls)
-	{
-	  clib_warning ("locator-set with index %d doesn't exists", p[0]);
-	  return -1;
-	}
-
-      if (lcm->mreq_itr_rlocs == p[0])
-	{
-	  clib_warning ("Can't delete the locator-set used to constrain "
-			"the itr-rlocs in map-requests!");
-	  return -1;
-	}
-
-      if (vec_len (lcm->locator_set_to_eids) != 0)
-	{
-	  eid_indexes = vec_elt_at_index (lcm->locator_set_to_eids, p[0]);
-	  if (vec_len (eid_indexes[0]) != 0)
-	    {
-	      clib_warning
-		("Can't delete a locator that supports a mapping!");
-	      return -1;
-	    }
-	}
-
-      /* clean locator to locator-sets data */
-      clean_locator_to_locator_set (lcm, p[0]);
-
-      if (ls->local)
-	{
-	  u32 it, lsi;
-
-	  vec_foreach_index (it, lcm->local_locator_set_indexes)
-	  {
-	    lsi = vec_elt (lcm->local_locator_set_indexes, it);
-	    if (lsi == p[0])
-	      {
-		vec_del1 (lcm->local_locator_set_indexes, it);
-		break;
-	      }
-	  }
-	  hash_unset_mem (lcm->locator_set_index_by_name, ls->name);
-	}
-      vec_free (ls->name);
-      vec_free (ls->locator_indices);
-      pool_put (lcm->locator_set_pool, ls);
-    }
-  return 0;
-}
-
-int
-vnet_lisp_rloc_probe_enable_disable (u8 is_enable)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-
-  lcm->rloc_probing = is_enable;
-  return 0;
-}
-
-int
-vnet_lisp_map_register_enable_disable (u8 is_enable)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-
-  lcm->map_registering = is_enable;
-  return 0;
-}
-
-clib_error_t *
-vnet_lisp_enable_disable (u8 is_enable)
-{
-  u32 vni, dp_table;
-  clib_error_t *error = 0;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  vnet_lisp_gpe_enable_disable_args_t _a, *a = &_a;
-
-  a->is_en = is_enable;
-  error = vnet_lisp_gpe_enable_disable (a);
-  if (error)
-    {
-      return clib_error_return (0, "failed to %s data-plane!",
-				a->is_en ? "enable" : "disable");
-    }
-
-  if (is_enable)
-    {
-      /* enable all l2 and l3 ifaces */
-
-      /* *INDENT-OFF* */
-      hash_foreach(vni, dp_table, lcm->table_id_by_vni, ({
-        dp_add_del_iface(lcm, vni, 0, 1);
-      }));
-      hash_foreach(vni, dp_table, lcm->bd_id_by_vni, ({
-        dp_add_del_iface(lcm, vni, /* is_l2 */ 1, 1);
-      }));
-      /* *INDENT-ON* */
-    }
-  else
-    {
-      /* clear interface table */
-      hash_free (lcm->fwd_entry_by_mapping_index);
-      pool_free (lcm->fwd_entry_pool);
-    }
-
-  /* update global flag */
-  lcm->is_enabled = is_enable;
-
-  return 0;
-}
-
-static clib_error_t *
-lisp_enable_disable_command_fn (vlib_main_t * vm, unformat_input_t * input,
-				vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 is_enabled = 0;
-  u8 is_set = 0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "enable"))
-	{
-	  is_set = 1;
-	  is_enabled = 1;
-	}
-      else if (unformat (line_input, "disable"))
-	is_set = 1;
-      else
-	{
-	  return clib_error_return (0, "parse error: '%U'",
-				    format_unformat_error, line_input);
-	}
-    }
-
-  if (!is_set)
-    return clib_error_return (0, "state not set");
-
-  vnet_lisp_enable_disable (is_enabled);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_cp_enable_disable_command) = {
-    .path = "lisp",
-    .short_help = "lisp [enable|disable]",
-    .function = lisp_enable_disable_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-lisp_map_register_enable_disable_command_fn (vlib_main_t * vm,
-					     unformat_input_t * input,
-					     vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 is_enabled = 0;
-  u8 is_set = 0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "enable"))
-	{
-	  is_set = 1;
-	  is_enabled = 1;
-	}
-      else if (unformat (line_input, "disable"))
-	is_set = 1;
-      else
-	{
-	  vlib_cli_output (vm, "parse error: '%U'", format_unformat_error,
-			   line_input);
-	  return 0;
-	}
-    }
-
-  if (!is_set)
-    {
-      vlib_cli_output (vm, "state not set!");
-      return 0;
-    }
-
-  vnet_lisp_map_register_enable_disable (is_enabled);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_map_register_enable_disable_command) = {
-    .path = "lisp map-register",
-    .short_help = "lisp map-register [enable|disable]",
-    .function = lisp_map_register_enable_disable_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-lisp_rloc_probe_enable_disable_command_fn (vlib_main_t * vm,
-					   unformat_input_t * input,
-					   vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 is_enabled = 0;
-  u8 is_set = 0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "enable"))
-	{
-	  is_set = 1;
-	  is_enabled = 1;
-	}
-      else if (unformat (line_input, "disable"))
-	is_set = 1;
-      else
-	{
-	  vlib_cli_output (vm, "parse error: '%U'", format_unformat_error,
-			   line_input);
-	  return 0;
-	}
-    }
-
-  if (!is_set)
-    {
-      vlib_cli_output (vm, "state not set!");
-      return 0;
-    }
-
-  vnet_lisp_rloc_probe_enable_disable (is_enabled);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_rloc_probe_enable_disable_command) = {
-    .path = "lisp rloc-probe",
-    .short_help = "lisp rloc-probe [enable|disable]",
-    .function = lisp_rloc_probe_enable_disable_command_fn,
-};
-/* *INDENT-ON* */
-
-u8
-vnet_lisp_enable_disable_status (void)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  return lcm->is_enabled;
-}
-
-static u8 *
-format_lisp_status (u8 * s, va_list * args)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  return format (s, "%s", lcm->is_enabled ? "enabled" : "disabled");
-}
-
-static clib_error_t *
-lisp_show_status_command_fn (vlib_main_t * vm, unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  u8 *msg = 0;
-  msg = format (msg, "feature: %U\ngpe: %U\n",
-		format_lisp_status, format_vnet_lisp_gpe_status);
-  vlib_cli_output (vm, "%v", msg);
-  vec_free (msg);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_show_status_command) = {
-    .path = "show lisp status",
-    .short_help = "show lisp status",
-    .function = lisp_show_status_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-lisp_show_eid_table_map_command_fn (vlib_main_t * vm,
-				    unformat_input_t * input,
-				    vlib_cli_command_t * cmd)
-{
-  hash_pair_t *p;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  uword *vni_table = 0;
-  u8 is_l2 = 0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "l2"))
-	{
-	  vni_table = lcm->bd_id_by_vni;
-	  is_l2 = 1;
-	}
-      else if (unformat (line_input, "l3"))
-	{
-	  vni_table = lcm->table_id_by_vni;
-	  is_l2 = 0;
-	}
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  if (!vni_table)
-    {
-      vlib_cli_output (vm, "Error: expected l2|l3 param!\n");
-      return 0;
-    }
-
-  vlib_cli_output (vm, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF");
-
-  /* *INDENT-OFF* */
-  hash_foreach_pair (p, vni_table,
-  ({
-    vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]);
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_show_eid_table_map_command) = {
-    .path = "show lisp eid-table map",
-    .short_help = "show lisp eid-table l2|l3",
-    .function = lisp_show_eid_table_map_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-lisp_add_del_locator_set_command_fn (vlib_main_t * vm,
-				     unformat_input_t * input,
-				     vlib_cli_command_t * cmd)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  vnet_main_t *vnm = lgm->vnet_main;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 is_add = 1;
-  clib_error_t *error = 0;
-  u8 *locator_set_name = 0;
-  locator_t locator, *locators = 0;
-  vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
-  u32 ls_index = 0;
-  int rv = 0;
-
-  memset (&locator, 0, sizeof (locator));
-  memset (a, 0, sizeof (a[0]));
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "add %_%v%_", &locator_set_name))
-	is_add = 1;
-      else if (unformat (line_input, "del %_%v%_", &locator_set_name))
-	is_add = 0;
-      else if (unformat (line_input, "iface %U p %d w %d",
-			 unformat_vnet_sw_interface, vnm,
-			 &locator.sw_if_index, &locator.priority,
-			 &locator.weight))
-	{
-	  locator.local = 1;
-	  vec_add1 (locators, locator);
-	}
-      else
-	{
-	  error = unformat_parse_error (line_input);
-	  goto done;
-	}
-    }
-
-  a->name = locator_set_name;
-  a->locators = locators;
-  a->is_add = is_add;
-  a->local = 1;
-
-  rv = vnet_lisp_add_del_locator_set (a, &ls_index);
-  if (0 != rv)
-    {
-      error = clib_error_return (0, "failed to %s locator-set!",
-				 is_add ? "add" : "delete");
-    }
-
-done:
-  vec_free (locators);
-  if (locator_set_name)
-    vec_free (locator_set_name);
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_cp_add_del_locator_set_command) = {
-    .path = "lisp locator-set",
-    .short_help = "lisp locator-set add/del <name> [iface <iface-name> "
-        "p <priority> w <weight>]",
-    .function = lisp_add_del_locator_set_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-lisp_add_del_locator_in_set_command_fn (vlib_main_t * vm,
-					unformat_input_t * input,
-					vlib_cli_command_t * cmd)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  vnet_main_t *vnm = lgm->vnet_main;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 is_add = 1;
-  clib_error_t *error = 0;
-  u8 *locator_set_name = 0;
-  u8 locator_set_name_set = 0;
-  locator_t locator, *locators = 0;
-  vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
-  u32 ls_index = 0;
-
-  memset (&locator, 0, sizeof (locator));
-  memset (a, 0, sizeof (a[0]));
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "add"))
-	is_add = 1;
-      else if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "locator-set %_%v%_", &locator_set_name))
-	locator_set_name_set = 1;
-      else if (unformat (line_input, "iface %U p %d w %d",
-			 unformat_vnet_sw_interface, vnm,
-			 &locator.sw_if_index, &locator.priority,
-			 &locator.weight))
-	{
-	  locator.local = 1;
-	  vec_add1 (locators, locator);
-	}
-      else
-	{
-	  error = unformat_parse_error (line_input);
-	  goto done;
-	}
-    }
-
-  if (!locator_set_name_set)
-    {
-      error = clib_error_return (0, "locator_set name not set!");
-      goto done;
-    }
-
-  a->name = locator_set_name;
-  a->locators = locators;
-  a->is_add = is_add;
-  a->local = 1;
-
-  vnet_lisp_add_del_locator (a, 0, &ls_index);
-
-done:
-  vec_free (locators);
-  vec_free (locator_set_name);
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_cp_add_del_locator_in_set_command) = {
-    .path = "lisp locator",
-    .short_help = "lisp locator add/del locator-set <name> iface <iface-name> "
-                  "p <priority> w <weight>",
-    .function = lisp_add_del_locator_in_set_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm,
-				      unformat_input_t * input,
-				      vlib_cli_command_t * cmd)
-{
-  locator_set_t *lsit;
-  locator_t *loc;
-  u32 *locit;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-
-  vlib_cli_output (vm, "%s%=16s%=16s%=16s", "Locator-set", "Locator",
-		   "Priority", "Weight");
-
-  /* *INDENT-OFF* */
-  pool_foreach (lsit, lcm->locator_set_pool,
-  ({
-    u8 * msg = 0;
-    int next_line = 0;
-    if (lsit->local)
-      {
-        msg = format (msg, "%v", lsit->name);
-      }
-    else
-      {
-        msg = format (msg, "<%s-%d>", "remote", lsit - lcm->locator_set_pool);
-      }
-    vec_foreach (locit, lsit->locator_indices)
-      {
-        if (next_line)
-          {
-            msg = format (msg, "%16s", " ");
-          }
-        loc = pool_elt_at_index (lcm->locator_pool, locit[0]);
-        if (loc->local)
-          msg = format (msg, "%16d%16d%16d\n", loc->sw_if_index, loc->priority,
-                        loc->weight);
-        else
-          msg = format (msg, "%16U%16d%16d\n", format_ip_address,
-                        &gid_address_ip(&loc->address), loc->priority,
-                        loc->weight);
-        next_line = 1;
-      }
-    vlib_cli_output (vm, "%v", msg);
-    vec_free (msg);
-  }));
-  /* *INDENT-ON* */
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_cp_show_locator_sets_command) = {
-    .path = "show lisp locator-set",
-    .short_help = "Shows locator-sets",
-    .function = lisp_cp_show_locator_sets_command_fn,
-};
-/* *INDENT-ON* */
-
-int
-vnet_lisp_add_del_map_resolver (vnet_lisp_add_del_map_resolver_args_t * a)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  u32 i;
-  lisp_msmr_t _mr, *mr = &_mr;
-
-  if (vnet_lisp_enable_disable_status () == 0)
-    {
-      clib_warning ("LISP is disabled!");
-      return VNET_API_ERROR_LISP_DISABLED;
-    }
-
-  if (a->is_add)
-    {
-
-      if (get_map_resolver (&a->address))
-	{
-	  clib_warning ("map-resolver %U already exists!", format_ip_address,
-			&a->address);
-	  return -1;
-	}
-
-      memset (mr, 0, sizeof (*mr));
-      ip_address_copy (&mr->address, &a->address);
-      vec_add1 (lcm->map_resolvers, *mr);
-
-      if (vec_len (lcm->map_resolvers) == 1)
-	lcm->do_map_resolver_election = 1;
-    }
-  else
-    {
-      for (i = 0; i < vec_len (lcm->map_resolvers); i++)
-	{
-	  mr = vec_elt_at_index (lcm->map_resolvers, i);
-	  if (!ip_address_cmp (&mr->address, &a->address))
-	    {
-	      if (!ip_address_cmp (&mr->address, &lcm->active_map_resolver))
-		lcm->do_map_resolver_election = 1;
-
-	      vec_del1 (lcm->map_resolvers, i);
-	      break;
-	    }
-	}
-    }
-  return 0;
-}
-
-static clib_error_t *
-lisp_add_del_map_resolver_command_fn (vlib_main_t * vm,
-				      unformat_input_t * input,
-				      vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 is_add = 1, addr_set = 0;
-  ip_address_t ip_addr;
-  clib_error_t *error = 0;
-  int rv = 0;
-  vnet_lisp_add_del_map_resolver_args_t _a, *a = &_a;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "add"))
-	is_add = 1;
-      else if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "%U", unformat_ip_address, &ip_addr))
-	addr_set = 1;
-      else
-	{
-	  error = unformat_parse_error (line_input);
-	  goto done;
-	}
-    }
-
-  if (!addr_set)
-    {
-      error = clib_error_return (0, "Map-resolver address must be set!");
-      goto done;
-    }
-
-  a->is_add = is_add;
-  a->address = ip_addr;
-  rv = vnet_lisp_add_del_map_resolver (a);
-  if (0 != rv)
-    {
-      error = clib_error_return (0, "failed to %s map-resolver!",
-				 is_add ? "add" : "delete");
-    }
-
-done:
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_add_del_map_resolver_command) = {
-    .path = "lisp map-resolver",
-    .short_help = "lisp map-resolver add/del <ip_address>",
-    .function = lisp_add_del_map_resolver_command_fn,
-};
-/* *INDENT-ON* */
-
-int
-vnet_lisp_add_del_mreq_itr_rlocs (vnet_lisp_add_del_mreq_itr_rloc_args_t * a)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  uword *p = 0;
-
-  if (vnet_lisp_enable_disable_status () == 0)
-    {
-      clib_warning ("LISP is disabled!");
-      return VNET_API_ERROR_LISP_DISABLED;
-    }
-
-  if (a->is_add)
-    {
-      p = hash_get_mem (lcm->locator_set_index_by_name, a->locator_set_name);
-      if (!p)
-	{
-	  clib_warning ("locator-set %v doesn't exist", a->locator_set_name);
-	  return VNET_API_ERROR_INVALID_ARGUMENT;
-	}
-
-      lcm->mreq_itr_rlocs = p[0];
-    }
-  else
-    {
-      lcm->mreq_itr_rlocs = ~0;
-    }
-
-  return 0;
-}
-
-static clib_error_t *
-lisp_add_del_mreq_itr_rlocs_command_fn (vlib_main_t * vm,
-					unformat_input_t * input,
-					vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 is_add = 1;
-  u8 *locator_set_name = 0;
-  clib_error_t *error = 0;
-  int rv = 0;
-  vnet_lisp_add_del_mreq_itr_rloc_args_t _a, *a = &_a;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "add %_%v%_", &locator_set_name))
-	is_add = 1;
-      else
-	{
-	  error = unformat_parse_error (line_input);
-	  goto done;
-	}
-    }
-
-  a->is_add = is_add;
-  a->locator_set_name = locator_set_name;
-  rv = vnet_lisp_add_del_mreq_itr_rlocs (a);
-  if (0 != rv)
-    {
-      error = clib_error_return (0, "failed to %s map-request itr-rlocs!",
-				 is_add ? "add" : "delete");
-    }
-
-  vec_free (locator_set_name);
-
-done:
-  return error;
-
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_add_del_map_request_command) = {
-    .path = "lisp map-request itr-rlocs",
-    .short_help = "lisp map-request itr-rlocs add/del <locator_set_name>",
-    .function = lisp_add_del_mreq_itr_rlocs_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-lisp_show_mreq_itr_rlocs_command_fn (vlib_main_t * vm,
-				     unformat_input_t * input,
-				     vlib_cli_command_t * cmd)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  locator_set_t *loc_set;
-
-  vlib_cli_output (vm, "%=20s", "itr-rlocs");
-
-  if (~0 == lcm->mreq_itr_rlocs)
-    {
-      return 0;
-    }
-
-  loc_set = pool_elt_at_index (lcm->locator_set_pool, lcm->mreq_itr_rlocs);
-
-  vlib_cli_output (vm, "%=20s", loc_set->name);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_show_map_request_command) = {
-    .path = "show lisp map-request itr-rlocs",
-    .short_help = "Shows map-request itr-rlocs",
-    .function = lisp_show_mreq_itr_rlocs_command_fn,
-};
-/* *INDENT-ON* */
-
-/* Statistics (not really errors) */
-#define foreach_lisp_cp_lookup_error           \
-_(DROP, "drop")                                \
-_(MAP_REQUESTS_SENT, "map-request sent")
-
-static char *lisp_cp_lookup_error_strings[] = {
-#define _(sym,string) string,
-  foreach_lisp_cp_lookup_error
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) LISP_CP_LOOKUP_ERROR_##sym,
-  foreach_lisp_cp_lookup_error
-#undef _
-    LISP_CP_LOOKUP_N_ERROR,
-} lisp_cp_lookup_error_t;
-
-typedef enum
-{
-  LISP_CP_LOOKUP_NEXT_DROP,
-  LISP_CP_LOOKUP_N_NEXT,
-} lisp_cp_lookup_next_t;
-
-typedef struct
-{
-  gid_address_t dst_eid;
-  ip_address_t map_resolver_ip;
-} lisp_cp_lookup_trace_t;
-
-u8 *
-format_lisp_cp_lookup_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  lisp_cp_lookup_trace_t *t = va_arg (*args, lisp_cp_lookup_trace_t *);
-
-  s = format (s, "LISP-CP-LOOKUP: map-resolver: %U destination eid %U",
-	      format_ip_address, &t->map_resolver_ip, format_gid_address,
-	      &t->dst_eid);
-  return s;
-}
-
-int
-get_mr_and_local_iface_ip (lisp_cp_main_t * lcm, ip_address_t * mr_ip,
-			   ip_address_t * sloc)
-{
-  lisp_msmr_t *mrit;
-  ip_address_t *a;
-
-  if (vec_len (lcm->map_resolvers) == 0)
-    {
-      clib_warning ("No map-resolver configured");
-      return 0;
-    }
-
-  /* find the first mr ip we have a route to and the ip of the
-   * iface that has a route to it */
-  vec_foreach (mrit, lcm->map_resolvers)
-  {
-    a = &mrit->address;
-    if (0 != ip_fib_get_first_egress_ip_for_dst (lcm, a, sloc))
-      {
-	ip_address_copy (mr_ip, a);
-
-	/* also update globals */
-	return 1;
-      }
-  }
-
-  clib_warning ("Can't find map-resolver and local interface ip!");
-  return 0;
-}
-
-static gid_address_t *
-build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set)
-{
-  void *addr;
-  u32 i;
-  locator_t *loc;
-  u32 *loc_indexp;
-  ip_interface_address_t *ia = 0;
-  gid_address_t gid_data, *gid = &gid_data;
-  gid_address_t *rlocs = 0;
-  ip_prefix_t *ippref = &gid_address_ippref (gid);
-  ip_address_t *rloc = &ip_prefix_addr (ippref);
-
-  memset (gid, 0, sizeof (gid[0]));
-  gid_address_type (gid) = GID_ADDR_IP_PREFIX;
-  for (i = 0; i < vec_len (loc_set->locator_indices); i++)
-    {
-      loc_indexp = vec_elt_at_index (loc_set->locator_indices, i);
-      loc = pool_elt_at_index (lcm->locator_pool, loc_indexp[0]);
-
-      /* Add ipv4 locators first TODO sort them */
-
-      /* *INDENT-OFF* */
-      foreach_ip_interface_address (&lcm->im4->lookup_main, ia,
-				    loc->sw_if_index, 1 /* unnumbered */,
-      ({
-	addr = ip_interface_address_get_address (&lcm->im4->lookup_main, ia);
-	ip_address_set (rloc, addr, IP4);
-        ip_prefix_len (ippref) = 32;
-        ip_prefix_normalize (ippref);
-        vec_add1 (rlocs, gid[0]);
-      }));
-
-      /* Add ipv6 locators */
-      foreach_ip_interface_address (&lcm->im6->lookup_main, ia,
-				    loc->sw_if_index, 1 /* unnumbered */,
-      ({
-        addr = ip_interface_address_get_address (&lcm->im6->lookup_main, ia);
-        ip_address_set (rloc, addr, IP6);
-        ip_prefix_len (ippref) = 128;
-        ip_prefix_normalize (ippref);
-        vec_add1 (rlocs, gid[0]);
-      }));
-      /* *INDENT-ON* */
-
-    }
-  return rlocs;
-}
-
-static vlib_buffer_t *
-build_map_request (lisp_cp_main_t * lcm, gid_address_t * deid,
-		   ip_address_t * sloc, ip_address_t * rloc,
-		   gid_address_t * itr_rlocs, u64 * nonce_res, u32 * bi_res)
-{
-  vlib_buffer_t *b;
-  u32 bi;
-  vlib_main_t *vm = lcm->vlib_main;
-
-  if (vlib_buffer_alloc (vm, &bi, 1) != 1)
-    {
-      clib_warning ("Can't allocate buffer for Map-Request!");
-      return 0;
-    }
-
-  b = vlib_get_buffer (vm, bi);
-
-  /* leave some space for the encap headers */
-  vlib_buffer_make_headroom (b, MAX_LISP_MSG_ENCAP_LEN);
-
-  /* put lisp msg */
-  lisp_msg_put_mreq (lcm, b, NULL, deid, itr_rlocs, 0 /* smr invoked */ ,
-		     1 /* rloc probe */ , nonce_res);
-
-  /* push outer ip header */
-  pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, sloc,
-		       rloc);
-
-  bi_res[0] = bi;
-
-  return b;
-}
-
-static vlib_buffer_t *
-build_encapsulated_map_request (lisp_cp_main_t * lcm,
-				gid_address_t * seid, gid_address_t * deid,
-				locator_set_t * loc_set, ip_address_t * mr_ip,
-				ip_address_t * sloc, u8 is_smr_invoked,
-				u64 * nonce_res, u32 * bi_res)
-{
-  vlib_buffer_t *b;
-  u32 bi;
-  gid_address_t *rlocs = 0;
-  vlib_main_t *vm = lcm->vlib_main;
-
-  if (vlib_buffer_alloc (vm, &bi, 1) != 1)
-    {
-      clib_warning ("Can't allocate buffer for Map-Request!");
-      return 0;
-    }
-
-  b = vlib_get_buffer (vm, bi);
-
-  /* leave some space for the encap headers */
-  vlib_buffer_make_headroom (b, MAX_LISP_MSG_ENCAP_LEN);
-
-  /* get rlocs */
-  rlocs = build_itr_rloc_list (lcm, loc_set);
-
-  if (MR_MODE_SRC_DST == lcm->map_request_mode
-      && GID_ADDR_SRC_DST != gid_address_type (deid))
-    {
-      gid_address_t sd;
-      memset (&sd, 0, sizeof (sd));
-      build_src_dst (&sd, seid, deid);
-      lisp_msg_put_mreq (lcm, b, seid, &sd, rlocs, is_smr_invoked,
-			 0 /* rloc probe */ , nonce_res);
-    }
-  else
-    {
-      /* put lisp msg */
-      lisp_msg_put_mreq (lcm, b, seid, deid, rlocs, is_smr_invoked,
-			 0 /* rloc probe */ , nonce_res);
-    }
-
-  /* push ecm: udp-ip-lisp */
-  lisp_msg_push_ecm (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, seid, deid);
-
-  /* push outer ip header */
-  pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, sloc,
-		       mr_ip);
-
-  bi_res[0] = bi;
-
-  vec_free (rlocs);
-  return b;
-}
-
-static void
-reset_pending_mr_counters (pending_map_request_t * r)
-{
-  r->time_to_expire = PENDING_MREQ_EXPIRATION_TIME;
-  r->retries_num = 0;
-}
-
-static int
-elect_map_resolver (lisp_cp_main_t * lcm)
-{
-  lisp_msmr_t *mr;
-
-  vec_foreach (mr, lcm->map_resolvers)
-  {
-    if (!mr->is_down)
-      {
-	ip_address_copy (&lcm->active_map_resolver, &mr->address);
-	lcm->do_map_resolver_election = 0;
-	return 1;
-      }
-  }
-  return 0;
-}
-
-static void
-free_map_register_records (mapping_t * maps)
-{
-  mapping_t *map;
-  vec_foreach (map, maps) vec_free (map->locators);
-
-  vec_free (maps);
-}
-
-static void
-add_locators (lisp_cp_main_t * lcm, mapping_t * m, u32 locator_set_index,
-	      ip_address_t * probed_loc)
-{
-  u32 *li;
-  locator_t *loc, new;
-  ip_interface_address_t *ia = 0;
-  void *addr;
-  ip_address_t *new_ip = &gid_address_ip (&new.address);
-
-  m->locators = 0;
-  locator_set_t *ls = pool_elt_at_index (lcm->locator_set_pool,
-					 locator_set_index);
-  vec_foreach (li, ls->locator_indices)
-  {
-    loc = pool_elt_at_index (lcm->locator_pool, li[0]);
-    new = loc[0];
-    if (loc->local)
-      {
-          /* *INDENT-OFF* */
-          foreach_ip_interface_address (&lcm->im4->lookup_main, ia,
-                                        loc->sw_if_index, 1 /* unnumbered */,
-          ({
-            addr = ip_interface_address_get_address (&lcm->im4->lookup_main,
-                                                     ia);
-            ip_address_set (new_ip, addr, IP4);
-          }));
-
-          /* Add ipv6 locators */
-          foreach_ip_interface_address (&lcm->im6->lookup_main, ia,
-                                        loc->sw_if_index, 1 /* unnumbered */,
-          ({
-            addr = ip_interface_address_get_address (&lcm->im6->lookup_main,
-                                                     ia);
-            ip_address_set (new_ip, addr, IP6);
-          }));
-          /* *INDENT-ON* */
-
-	if (probed_loc && ip_address_cmp (probed_loc, new_ip) == 0)
-	  new.probed = 1;
-      }
-    vec_add1 (m->locators, new);
-  }
-}
-
-static mapping_t *
-build_map_register_record_list (lisp_cp_main_t * lcm)
-{
-  mapping_t *recs = 0, rec, *m;
-
-  /* *INDENT-OFF* */
-  pool_foreach(m, lcm->mapping_pool,
-  {
-    /* for now build only local mappings */
-    if (!m->local)
-      continue;
-
-    rec = m[0];
-    add_locators (lcm, &rec, m->locator_set_index, NULL);
-    vec_add1 (recs, rec);
-  });
-  /* *INDENT-ON* */
-
-  return recs;
-}
-
-static int
-update_map_register_auth_data (map_register_hdr_t * map_reg_hdr,
-			       lisp_key_type_t key_id, u8 * key,
-			       u16 auth_data_len, u32 msg_len)
-{
-  MREG_KEY_ID (map_reg_hdr) = clib_host_to_net_u16 (key_id);
-  MREG_AUTH_DATA_LEN (map_reg_hdr) = clib_host_to_net_u16 (auth_data_len);
-
-  unsigned char *result = HMAC (get_encrypt_fcn (key_id), key, vec_len (key),
-				(unsigned char *) map_reg_hdr, msg_len, NULL,
-				NULL);
-  clib_memcpy (MREG_DATA (map_reg_hdr), result, auth_data_len);
-
-  return 0;
-}
-
-static vlib_buffer_t *
-build_map_register (lisp_cp_main_t * lcm, ip_address_t * sloc,
-		    ip_address_t * ms_ip, u64 * nonce_res, u8 want_map_notif,
-		    mapping_t * records, lisp_key_type_t key_id, u8 * key,
-		    u32 * bi_res)
-{
-  void *map_reg_hdr;
-  vlib_buffer_t *b;
-  u32 bi, auth_data_len = 0, msg_len = 0;
-  vlib_main_t *vm = lcm->vlib_main;
-
-  if (vlib_buffer_alloc (vm, &bi, 1) != 1)
-    {
-      clib_warning ("Can't allocate buffer for Map-Register!");
-      return 0;
-    }
-
-  b = vlib_get_buffer (vm, bi);
-
-  /* leave some space for the encap headers */
-  vlib_buffer_make_headroom (b, MAX_LISP_MSG_ENCAP_LEN);
-
-  auth_data_len = auth_data_len_by_key_id (key_id);
-  map_reg_hdr = lisp_msg_put_map_register (b, records, want_map_notif,
-					   auth_data_len, nonce_res,
-					   &msg_len);
-
-  update_map_register_auth_data (map_reg_hdr, key_id, key, auth_data_len,
-				 msg_len);
-
-  /* push outer ip header */
-  pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, sloc,
-		       ms_ip);
-
-  bi_res[0] = bi;
-  return b;
-}
-
-static int
-get_egress_map_resolver_ip (lisp_cp_main_t * lcm, ip_address_t * ip)
-{
-  lisp_msmr_t *mr;
-  while (lcm->do_map_resolver_election
-	 | (0 == ip_fib_get_first_egress_ip_for_dst (lcm,
-						     &lcm->active_map_resolver,
-						     ip)))
-    {
-      if (0 == elect_map_resolver (lcm))
-	/* all map resolvers are down */
-	{
-	  /* restart MR checking by marking all of them up */
-	  vec_foreach (mr, lcm->map_resolvers) mr->is_down = 0;
-	  return -1;
-	}
-    }
-  return 0;
-}
-
-static int
-send_rloc_probe (lisp_cp_main_t * lcm, gid_address_t * deid,
-		 u32 local_locator_set_index, ip_address_t * sloc,
-		 ip_address_t * rloc)
-{
-  locator_set_t *ls;
-  u32 bi;
-  vlib_buffer_t *b;
-  vlib_frame_t *f;
-  u64 nonce = 0;
-  u32 next_index, *to_next;
-  gid_address_t *itr_rlocs;
-
-  ls = pool_elt_at_index (lcm->locator_set_pool, local_locator_set_index);
-  itr_rlocs = build_itr_rloc_list (lcm, ls);
-
-  b = build_map_request (lcm, deid, sloc, rloc, itr_rlocs, &nonce, &bi);
-  vec_free (itr_rlocs);
-  if (!b)
-    return -1;
-
-  vnet_buffer (b)->sw_if_index[VLIB_TX] = 0;
-
-  next_index = (ip_addr_version (&lcm->active_map_resolver) == IP4) ?
-    ip4_lookup_node.index : ip6_lookup_node.index;
-
-  f = vlib_get_frame_to_node (lcm->vlib_main, next_index);
-
-  /* Enqueue the packet */
-  to_next = vlib_frame_vector_args (f);
-  to_next[0] = bi;
-  f->n_vectors = 1;
-  vlib_put_frame_to_node (lcm->vlib_main, next_index, f);
-
-  hash_set (lcm->map_register_messages_by_nonce, nonce, 0);
-  return 0;
-}
-
-static int
-send_rloc_probes (lisp_cp_main_t * lcm)
-{
-  u8 lprio = 0;
-  mapping_t *lm;
-  fwd_entry_t *e;
-  locator_pair_t *lp;
-  u32 si;
-
-  /* *INDENT-OFF* */
-  pool_foreach (e, lcm->fwd_entry_pool,
-  {
-    if (vec_len (e->locator_pairs) == 0)
-      continue;
-
-    si = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &e->leid);
-    if (~0 == si)
-      {
-        clib_warning ("internal error: cannot find local eid %U in "
-                      "map-cache!", format_gid_address, &e->leid);
-        continue;
-      }
-    lm = pool_elt_at_index (lcm->mapping_pool, si);
-
-    /* get the best (lowest) priority */
-    lprio = e->locator_pairs[0].priority;
-
-    /* send rloc-probe for pair(s) with the best remote locator priority */
-    vec_foreach (lp, e->locator_pairs)
-      {
-        if (lp->priority != lprio)
-          break;
-
-        /* get first remote locator */
-        send_rloc_probe (lcm, &e->reid, lm->locator_set_index, &lp->lcl_loc,
-                         &lp->rmt_loc);
-      }
-  });
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-static int
-send_map_register (lisp_cp_main_t * lcm, u8 want_map_notif)
-{
-  u32 bi;
-  vlib_buffer_t *b;
-  ip_address_t sloc;
-  vlib_frame_t *f;
-  u64 nonce = 0;
-  u32 next_index, *to_next;
-  ip_address_t *ms = 0;
-  mapping_t *records, *r, *g;
-
-  // TODO: support multiple map servers and do election
-  if (0 == vec_len (lcm->map_servers))
-    return -1;
-
-  ms = &lcm->map_servers[0].address;
-
-  if (0 == ip_fib_get_first_egress_ip_for_dst (lcm, ms, &sloc))
-    {
-      clib_warning ("no eligible interface address found for %U!",
-		    format_ip_address, &lcm->map_servers[0]);
-      return -1;
-    }
-
-  records = build_map_register_record_list (lcm);
-  if (!records)
-    return -1;
-
-  vec_foreach (r, records)
-  {
-    u8 *key = r->key;
-    u8 key_id = r->key_id;
-
-    if (!key)
-      continue;			/* no secret key -> map-register cannot be sent */
-
-    g = 0;
-    // TODO: group mappings that share common key
-    vec_add1 (g, r[0]);
-    b = build_map_register (lcm, &sloc, ms, &nonce, want_map_notif, g,
-			    key_id, key, &bi);
-    vec_free (g);
-    if (!b)
-      continue;
-
-    vnet_buffer (b)->sw_if_index[VLIB_TX] = 0;
-
-    next_index = (ip_addr_version (&lcm->active_map_resolver) == IP4) ?
-      ip4_lookup_node.index : ip6_lookup_node.index;
-
-    f = vlib_get_frame_to_node (lcm->vlib_main, next_index);
-
-    /* Enqueue the packet */
-    to_next = vlib_frame_vector_args (f);
-    to_next[0] = bi;
-    f->n_vectors = 1;
-    vlib_put_frame_to_node (lcm->vlib_main, next_index, f);
-
-    hash_set (lcm->map_register_messages_by_nonce, nonce, 0);
-  }
-  free_map_register_records (records);
-
-  return 0;
-}
-
-#define send_encapsulated_map_request(lcm, seid, deid, smr) \
-  _send_encapsulated_map_request(lcm, seid, deid, smr, 0)
-
-#define resend_encapsulated_map_request(lcm, seid, deid, smr) \
-  _send_encapsulated_map_request(lcm, seid, deid, smr, 1)
-
-static int
-_send_encapsulated_map_request (lisp_cp_main_t * lcm,
-				gid_address_t * seid, gid_address_t * deid,
-				u8 is_smr_invoked, u8 is_resend)
-{
-  u32 next_index, bi = 0, *to_next, map_index;
-  vlib_buffer_t *b;
-  vlib_frame_t *f;
-  u64 nonce = 0;
-  locator_set_t *loc_set;
-  mapping_t *map;
-  pending_map_request_t *pmr, *duplicate_pmr = 0;
-  ip_address_t sloc;
-  u32 ls_index;
-
-  /* if there is already a pending request remember it */
-
-  /* *INDENT-OFF* */
-  pool_foreach(pmr, lcm->pending_map_requests_pool,
-  ({
-    if (!gid_address_cmp (&pmr->src, seid)
-        && !gid_address_cmp (&pmr->dst, deid))
-      {
-        duplicate_pmr = pmr;
-        break;
-      }
-  }));
-  /* *INDENT-ON* */
-
-  if (!is_resend && duplicate_pmr)
-    {
-      /* don't send the request if there is a pending map request already */
-      return 0;
-    }
-
-  /* get locator-set for seid */
-  if (!lcm->lisp_pitr)
-    {
-      map_index = gid_dictionary_lookup (&lcm->mapping_index_by_gid, seid);
-      if (map_index == ~0)
-	{
-	  clib_warning ("No local mapping found in eid-table for %U!",
-			format_gid_address, seid);
-	  return -1;
-	}
-
-      map = pool_elt_at_index (lcm->mapping_pool, map_index);
-
-      if (!map->local)
-	{
-	  clib_warning
-	    ("Mapping found for src eid %U is not marked as local!",
-	     format_gid_address, seid);
-	  return -1;
-	}
-      ls_index = map->locator_set_index;
-    }
-  else
-    {
-      map_index = lcm->pitr_map_index;
-      map = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
-      ls_index = map->locator_set_index;
-    }
-
-  /* overwrite locator set if map-request itr-rlocs configured */
-  if (~0 != lcm->mreq_itr_rlocs)
-    {
-      ls_index = lcm->mreq_itr_rlocs;
-    }
-
-  loc_set = pool_elt_at_index (lcm->locator_set_pool, ls_index);
-
-  if (get_egress_map_resolver_ip (lcm, &sloc) < 0)
-    {
-      if (duplicate_pmr)
-	duplicate_pmr->to_be_removed = 1;
-      return -1;
-    }
-
-  /* build the encapsulated map request */
-  b = build_encapsulated_map_request (lcm, seid, deid, loc_set,
-				      &lcm->active_map_resolver,
-				      &sloc, is_smr_invoked, &nonce, &bi);
-
-  if (!b)
-    return -1;
-
-  /* set fib index to default and lookup node */
-  vnet_buffer (b)->sw_if_index[VLIB_TX] = 0;
-  next_index = (ip_addr_version (&lcm->active_map_resolver) == IP4) ?
-    ip4_lookup_node.index : ip6_lookup_node.index;
-
-  f = vlib_get_frame_to_node (lcm->vlib_main, next_index);
-
-  /* Enqueue the packet */
-  to_next = vlib_frame_vector_args (f);
-  to_next[0] = bi;
-  f->n_vectors = 1;
-  vlib_put_frame_to_node (lcm->vlib_main, next_index, f);
-
-  if (duplicate_pmr)
-    /* if there is a pending request already update it */
-    {
-      if (clib_fifo_elts (duplicate_pmr->nonces) >= PENDING_MREQ_QUEUE_LEN)
-	{
-	  /* remove the oldest nonce */
-	  u64 CLIB_UNUSED (tmp), *nonce_del;
-	  nonce_del = clib_fifo_head (duplicate_pmr->nonces);
-	  hash_unset (lcm->pending_map_requests_by_nonce, nonce_del[0]);
-	  clib_fifo_sub1 (duplicate_pmr->nonces, tmp);
-	}
-
-      clib_fifo_add1 (duplicate_pmr->nonces, nonce);
-      hash_set (lcm->pending_map_requests_by_nonce, nonce,
-		duplicate_pmr - lcm->pending_map_requests_pool);
-    }
-  else
-    {
-      /* add map-request to pending requests table */
-      pool_get (lcm->pending_map_requests_pool, pmr);
-      memset (pmr, 0, sizeof (*pmr));
-      gid_address_copy (&pmr->src, seid);
-      gid_address_copy (&pmr->dst, deid);
-      clib_fifo_add1 (pmr->nonces, nonce);
-      pmr->is_smr_invoked = is_smr_invoked;
-      reset_pending_mr_counters (pmr);
-      hash_set (lcm->pending_map_requests_by_nonce, nonce,
-		pmr - lcm->pending_map_requests_pool);
-    }
-
-  return 0;
-}
-
-static void
-get_src_and_dst_ip (void *hdr, ip_address_t * src, ip_address_t * dst)
-{
-  ip4_header_t *ip4 = hdr;
-  ip6_header_t *ip6;
-
-  if ((ip4->ip_version_and_header_length & 0xF0) == 0x40)
-    {
-      ip_address_set (src, &ip4->src_address, IP4);
-      ip_address_set (dst, &ip4->dst_address, IP4);
-    }
-  else
-    {
-      ip6 = hdr;
-      ip_address_set (src, &ip6->src_address, IP6);
-      ip_address_set (dst, &ip6->dst_address, IP6);
-    }
-}
-
-static u32
-lisp_get_vni_from_buffer_ip (lisp_cp_main_t * lcm, vlib_buffer_t * b,
-			     u8 version)
-{
-  uword *vnip;
-  u32 vni = ~0, table_id = ~0;
-
-  table_id = fib_table_get_table_id_for_sw_if_index ((version ==
-						      IP4 ? FIB_PROTOCOL_IP4 :
-						      FIB_PROTOCOL_IP6),
-						     vnet_buffer
-						     (b)->sw_if_index
-						     [VLIB_RX]);
-
-  vnip = hash_get (lcm->vni_by_table_id, table_id);
-  if (vnip)
-    vni = vnip[0];
-  else
-    clib_warning ("vrf %d is not mapped to any vni!", table_id);
-
-  return vni;
-}
-
-always_inline u32
-lisp_get_vni_from_buffer_eth (lisp_cp_main_t * lcm, vlib_buffer_t * b)
-{
-  uword *vnip;
-  u32 vni = ~0;
-  u32 sw_if_index0;
-
-  l2input_main_t *l2im = &l2input_main;
-  l2_input_config_t *config;
-  l2_bridge_domain_t *bd_config;
-
-  sw_if_index0 = vnet_buffer (b)->sw_if_index[VLIB_RX];
-  config = vec_elt_at_index (l2im->configs, sw_if_index0);
-  bd_config = vec_elt_at_index (l2im->bd_configs, config->bd_index);
-
-  vnip = hash_get (lcm->vni_by_bd_id, bd_config->bd_id);
-  if (vnip)
-    vni = vnip[0];
-  else
-    clib_warning ("bridge domain %d is not mapped to any vni!",
-		  config->bd_index);
-
-  return vni;
-}
-
-always_inline void
-get_src_and_dst_eids_from_buffer (lisp_cp_main_t * lcm, vlib_buffer_t * b,
-				  gid_address_t * src, gid_address_t * dst)
-{
-  u32 vni = 0;
-  u16 type;
-
-  memset (src, 0, sizeof (*src));
-  memset (dst, 0, sizeof (*dst));
-  type = vnet_buffer (b)->lisp.overlay_afi;
-
-  if (LISP_AFI_IP == type || LISP_AFI_IP6 == type)
-    {
-      ip4_header_t *ip;
-      u8 version, preflen;
-
-      gid_address_type (src) = GID_ADDR_IP_PREFIX;
-      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
-
-      ip = vlib_buffer_get_current (b);
-      get_src_and_dst_ip (ip, &gid_address_ip (src), &gid_address_ip (dst));
-
-      version = gid_address_ip_version (src);
-      preflen = ip_address_max_len (version);
-      gid_address_ippref_len (src) = preflen;
-      gid_address_ippref_len (dst) = preflen;
-
-      vni = lisp_get_vni_from_buffer_ip (lcm, b, version);
-      gid_address_vni (dst) = vni;
-      gid_address_vni (src) = vni;
-    }
-  else if (LISP_AFI_MAC == type)
-    {
-      ethernet_header_t *eh;
-
-      eh = vlib_buffer_get_current (b);
-
-      gid_address_type (src) = GID_ADDR_MAC;
-      gid_address_type (dst) = GID_ADDR_MAC;
-      mac_copy (&gid_address_mac (src), eh->src_address);
-      mac_copy (&gid_address_mac (dst), eh->dst_address);
-
-      /* get vni */
-      vni = lisp_get_vni_from_buffer_eth (lcm, b);
-
-      gid_address_vni (dst) = vni;
-      gid_address_vni (src) = vni;
-    }
-}
-
-static uword
-lisp_cp_lookup_inline (vlib_main_t * vm,
-		       vlib_node_runtime_t * node,
-		       vlib_frame_t * from_frame, int overlay)
-{
-  u32 *from, *to_next_drop, di, si;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  u32 pkts_mapped = 0;
-  uword n_left_from, n_left_to_next_drop;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, LISP_CP_LOOKUP_NEXT_DROP,
-			   to_next_drop, n_left_to_next_drop);
-
-      while (n_left_from > 0 && n_left_to_next_drop > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *b0;
-	  gid_address_t src, dst;
-
-	  pi0 = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next_drop[0] = pi0;
-	  to_next_drop += 1;
-	  n_left_to_next_drop -= 1;
-
-	  b0 = vlib_get_buffer (vm, pi0);
-	  b0->error = node->errors[LISP_CP_LOOKUP_ERROR_DROP];
-	  vnet_buffer (b0)->lisp.overlay_afi = overlay;
-
-	  /* src/dst eid pair */
-	  get_src_and_dst_eids_from_buffer (lcm, b0, &src, &dst);
-
-	  /* if we have remote mapping for destination already in map-chache
-	     add forwarding tunnel directly. If not send a map-request */
-	  di = gid_dictionary_sd_lookup (&lcm->mapping_index_by_gid, &dst,
-					 &src);
-	  if (~0 != di)
-	    {
-	      mapping_t *m = vec_elt_at_index (lcm->mapping_pool, di);
-	      /* send a map-request also in case of negative mapping entry
-	         with corresponding action */
-	      if (m->action == LISP_SEND_MAP_REQUEST)
-		{
-		  /* send map-request */
-		  queue_map_request (&src, &dst, 0 /* smr_invoked */ ,
-				     0 /* is_resend */ );
-		  pkts_mapped++;
-		}
-	      else
-		{
-		  si = gid_dictionary_lookup (&lcm->mapping_index_by_gid,
-					      &src);
-		  if (~0 != si)
-		    {
-		      dp_add_fwd_entry (lcm, si, di);
-		    }
-		}
-	    }
-	  else
-	    {
-	      /* send map-request */
-	      queue_map_request (&src, &dst, 0 /* smr_invoked */ ,
-				 0 /* is_resend */ );
-	      pkts_mapped++;
-	    }
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      lisp_cp_lookup_trace_t *tr = vlib_add_trace (vm, node, b0,
-							   sizeof (*tr));
-
-	      memset (tr, 0, sizeof (*tr));
-	      gid_address_copy (&tr->dst_eid, &dst);
-	      ip_address_copy (&tr->map_resolver_ip,
-			       &lcm->active_map_resolver);
-	    }
-	  gid_address_free (&dst);
-	  gid_address_free (&src);
-	}
-
-      vlib_put_next_frame (vm, node, LISP_CP_LOOKUP_NEXT_DROP,
-			   n_left_to_next_drop);
-    }
-  vlib_node_increment_counter (vm, node->node_index,
-			       LISP_CP_LOOKUP_ERROR_MAP_REQUESTS_SENT,
-			       pkts_mapped);
-  return from_frame->n_vectors;
-}
-
-static uword
-lisp_cp_lookup_ip4 (vlib_main_t * vm,
-		    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  return (lisp_cp_lookup_inline (vm, node, from_frame, LISP_AFI_IP));
-}
-
-static uword
-lisp_cp_lookup_ip6 (vlib_main_t * vm,
-		    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  return (lisp_cp_lookup_inline (vm, node, from_frame, LISP_AFI_IP6));
-}
-
-static uword
-lisp_cp_lookup_l2 (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  return (lisp_cp_lookup_inline (vm, node, from_frame, LISP_AFI_MAC));
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (lisp_cp_lookup_ip4_node) = {
-  .function = lisp_cp_lookup_ip4,
-  .name = "lisp-cp-lookup-ip4",
-  .vector_size = sizeof (u32),
-  .format_trace = format_lisp_cp_lookup_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = LISP_CP_LOOKUP_N_ERROR,
-  .error_strings = lisp_cp_lookup_error_strings,
-
-  .n_next_nodes = LISP_CP_LOOKUP_N_NEXT,
-
-  .next_nodes = {
-      [LISP_CP_LOOKUP_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (lisp_cp_lookup_ip6_node) = {
-  .function = lisp_cp_lookup_ip6,
-  .name = "lisp-cp-lookup-ip6",
-  .vector_size = sizeof (u32),
-  .format_trace = format_lisp_cp_lookup_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = LISP_CP_LOOKUP_N_ERROR,
-  .error_strings = lisp_cp_lookup_error_strings,
-
-  .n_next_nodes = LISP_CP_LOOKUP_N_NEXT,
-
-  .next_nodes = {
-      [LISP_CP_LOOKUP_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (lisp_cp_lookup_l2_node) = {
-  .function = lisp_cp_lookup_l2,
-  .name = "lisp-cp-lookup-l2",
-  .vector_size = sizeof (u32),
-  .format_trace = format_lisp_cp_lookup_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = LISP_CP_LOOKUP_N_ERROR,
-  .error_strings = lisp_cp_lookup_error_strings,
-
-  .n_next_nodes = LISP_CP_LOOKUP_N_NEXT,
-
-  .next_nodes = {
-      [LISP_CP_LOOKUP_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/* lisp_cp_input statistics */
-#define foreach_lisp_cp_input_error                     \
-_(DROP, "drop")                                         \
-_(MAP_REPLIES_RECEIVED, "map-replies received")
-
-static char *lisp_cp_input_error_strings[] = {
-#define _(sym,string) string,
-  foreach_lisp_cp_input_error
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) LISP_CP_INPUT_ERROR_##sym,
-  foreach_lisp_cp_input_error
-#undef _
-    LISP_CP_INPUT_N_ERROR,
-} lisp_cp_input_error_t;
-
-typedef enum
-{
-  LISP_CP_INPUT_NEXT_DROP,
-  LISP_CP_INPUT_N_NEXT,
-} lisp_cp_input_next_t;
-
-typedef struct
-{
-  gid_address_t dst_eid;
-  ip4_address_t map_resolver_ip;
-} lisp_cp_input_trace_t;
-
-u8 *
-format_lisp_cp_input_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  CLIB_UNUSED (lisp_cp_input_trace_t * t) =
-    va_arg (*args, lisp_cp_input_trace_t *);
-
-  s = format (s, "LISP-CP-INPUT: TODO");
-  return s;
-}
-
-static void
-remove_expired_mapping (lisp_cp_main_t * lcm, u32 mi)
-{
-  mapping_t *m;
-
-  m = pool_elt_at_index (lcm->mapping_pool, mi);
-  lisp_add_del_adjacency (lcm, 0, &m->eid, 0 /* is_add */ );
-  vnet_lisp_add_del_mapping (&m->eid, 0, 0, 0, ~0, 0 /* is_add */ ,
-			     0 /* is_static */ , 0);
-  mapping_delete_timer (lcm, mi);
-}
-
-static void
-mapping_start_expiration_timer (lisp_cp_main_t * lcm, u32 mi,
-				f64 expiration_time)
-{
-  mapping_t *m;
-  u64 now = clib_cpu_time_now ();
-  u64 cpu_cps = lcm->vlib_main->clib_time.clocks_per_second;
-  u64 exp_clock_time = now + expiration_time * cpu_cps;
-
-  m = pool_elt_at_index (lcm->mapping_pool, mi);
-
-  m->timer_set = 1;
-  timing_wheel_insert (&lcm->wheel, exp_clock_time, mi);
-}
-
-static void
-map_records_arg_free (map_records_arg_t * a)
-{
-  mapping_t *m;
-  vec_foreach (m, a->mappings)
-  {
-    vec_free (m->locators);
-    gid_address_free (&m->eid);
-  }
-
-  clib_mem_free (a);
-}
-
-void *
-process_map_reply (map_records_arg_t * a)
-{
-  mapping_t *m;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  u32 dst_map_index = 0;
-  pending_map_request_t *pmr;
-  u64 *noncep;
-  uword *pmr_index;
-
-  if (a->is_rloc_probe)
-    goto done;
-
-  /* Check pending requests table and nonce */
-  pmr_index = hash_get (lcm->pending_map_requests_by_nonce, a->nonce);
-  if (!pmr_index)
-    {
-      clib_warning ("No pending map-request entry with nonce %lu!", a->nonce);
-      goto done;
-    }
-  pmr = pool_elt_at_index (lcm->pending_map_requests_pool, pmr_index[0]);
-
-  vec_foreach (m, a->mappings)
-  {
-    /* insert/update mappings cache */
-    vnet_lisp_add_del_mapping (&m->eid, m->locators, m->action,
-			       m->authoritative, m->ttl,
-			       1, 0 /* is_static */ , &dst_map_index);
-
-    /* try to program forwarding only if mapping saved or updated */
-    if ((u32) ~ 0 != dst_map_index)
-      {
-	lisp_add_del_adjacency (lcm, &pmr->src, &m->eid, 1);
-	if ((u32) ~ 0 != m->ttl)
-	  mapping_start_expiration_timer (lcm, dst_map_index, m->ttl * 60);
-      }
-  }
-
-  /* remove pending map request entry */
-
-  /* *INDENT-OFF* */
-  clib_fifo_foreach (noncep, pmr->nonces, ({
-    hash_unset(lcm->pending_map_requests_by_nonce, noncep[0]);
-  }));
-  /* *INDENT-ON* */
-
-  clib_fifo_free (pmr->nonces);
-  pool_put (lcm->pending_map_requests_pool, pmr);
-
-done:
-  map_records_arg_free (a);
-  return 0;
-}
-
-static int
-is_auth_data_valid (map_notify_hdr_t * h, u32 msg_len,
-		    lisp_key_type_t key_id, u8 * key)
-{
-  u8 *auth_data = 0;
-  u16 auth_data_len;
-  int result;
-
-  auth_data_len = auth_data_len_by_key_id (key_id);
-  if ((u16) ~ 0 == auth_data_len)
-    {
-      clib_warning ("invalid length for key_id %d!", key_id);
-      return 0;
-    }
-
-  /* save auth data */
-  vec_validate (auth_data, auth_data_len - 1);
-  clib_memcpy (auth_data, MNOTIFY_DATA (h), auth_data_len);
-
-  /* clear auth data */
-  memset (MNOTIFY_DATA (h), 0, auth_data_len);
-
-  /* get hash of the message */
-  unsigned char *code = HMAC (get_encrypt_fcn (key_id), key, vec_len (key),
-			      (unsigned char *) h, msg_len, NULL, NULL);
-
-  result = memcmp (code, auth_data, auth_data_len);
-
-  vec_free (auth_data);
-
-  return !result;
-}
-
-static void
-process_map_notify (map_records_arg_t * a)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  uword *pmr_index;
-
-  pmr_index = hash_get (lcm->map_register_messages_by_nonce, a->nonce);
-  if (!pmr_index)
-    {
-      clib_warning ("No pending map-register entry with nonce %lu!",
-		    a->nonce);
-      return;
-    }
-
-  map_records_arg_free (a);
-  hash_unset (lcm->map_register_messages_by_nonce, a->nonce);
-}
-
-static mapping_t *
-get_mapping (lisp_cp_main_t * lcm, gid_address_t * e)
-{
-  u32 mi;
-
-  mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, e);
-  if (~0 == mi)
-    {
-      clib_warning ("eid %U not found in map-cache!", unformat_gid_address,
-		    e);
-      return 0;
-    }
-  return pool_elt_at_index (lcm->mapping_pool, mi);
-}
-
-/**
- * When map-notify is received it is necessary that all EIDs in the record
- * list share common key. The key is then used to verify authentication
- * data in map-notify message.
- */
-static int
-map_record_integrity_check (lisp_cp_main_t * lcm, mapping_t * maps,
-			    u32 key_id, u8 ** key_out)
-{
-  u32 i, len = vec_len (maps);
-  mapping_t *m;
-
-  /* get key of the first mapping */
-  m = get_mapping (lcm, &maps[0].eid);
-  if (!m || !m->key)
-    return -1;
-
-  key_out[0] = m->key;
-
-  for (i = 1; i < len; i++)
-    {
-      m = get_mapping (lcm, &maps[i].eid);
-      if (!m || !m->key)
-	return -1;
-
-      if (key_id != m->key_id || vec_cmp (m->key, key_out[0]))
-	{
-	  clib_warning ("keys does not match! %v, %v", key_out[0], m->key);
-	  return -1;
-	}
-    }
-  return 0;
-}
-
-static int
-parse_map_records (vlib_buffer_t * b, map_records_arg_t * a, u8 count)
-{
-  locator_t *locators = 0;
-  u32 i, len;
-  gid_address_t deid;
-  mapping_t m;
-  locator_t *loc;
-
-  /* parse record eid */
-  for (i = 0; i < count; i++)
-    {
-      len = lisp_msg_parse_mapping_record (b, &deid, &locators, NULL);
-      if (len == ~0)
-	{
-	  clib_warning ("Failed to parse mapping record!");
-	  vec_foreach (loc, locators) locator_free (loc);
-	  vec_free (locators);
-	  return -1;
-	}
-
-      m.locators = locators;
-      gid_address_copy (&m.eid, &deid);
-      vec_add1 (a->mappings, m);
-    }
-
-  return 0;
-}
-
-static map_records_arg_t *
-parse_map_notify (vlib_buffer_t * b)
-{
-  int rc = 0;
-  map_notify_hdr_t *mnotif_hdr;
-  lisp_key_type_t key_id;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  u8 *key = 0;
-  gid_address_t deid;
-  u16 auth_data_len = 0;
-  u8 record_count;
-  map_records_arg_t *a = clib_mem_alloc (sizeof (*a));
-
-  memset (a, 0, sizeof (*a));
-  mnotif_hdr = vlib_buffer_get_current (b);
-  vlib_buffer_pull (b, sizeof (*mnotif_hdr));
-  memset (&deid, 0, sizeof (deid));
-
-  a->nonce = MNOTIFY_NONCE (mnotif_hdr);
-  key_id = clib_net_to_host_u16 (MNOTIFY_KEY_ID (mnotif_hdr));
-  auth_data_len = auth_data_len_by_key_id (key_id);
-
-  /* advance buffer by authentication data */
-  vlib_buffer_pull (b, auth_data_len);
-
-  record_count = MNOTIFY_REC_COUNT (mnotif_hdr);
-  rc = parse_map_records (b, a, record_count);
-  if (rc != 0)
-    {
-      map_records_arg_free (a);
-      return 0;
-    }
-
-  rc = map_record_integrity_check (lcm, a->mappings, key_id, &key);
-  if (rc != 0)
-    {
-      map_records_arg_free (a);
-      return 0;
-    }
-
-  /* verify authentication data */
-  if (!is_auth_data_valid (mnotif_hdr, vlib_buffer_get_tail (b)
-			   - (u8 *) mnotif_hdr, key_id, key))
-    {
-      clib_warning ("Map-notify auth data verification failed for nonce %lu!",
-		    a->nonce);
-      map_records_arg_free (a);
-      return 0;
-    }
-  return a;
-}
-
-static vlib_buffer_t *
-build_map_reply (lisp_cp_main_t * lcm, ip_address_t * sloc,
-		 ip_address_t * dst, u64 nonce, u8 probe_bit,
-		 mapping_t * records, u16 dst_port, u32 * bi_res)
-{
-  vlib_buffer_t *b;
-  u32 bi;
-  vlib_main_t *vm = lcm->vlib_main;
-
-  if (vlib_buffer_alloc (vm, &bi, 1) != 1)
-    {
-      clib_warning ("Can't allocate buffer for Map-Register!");
-      return 0;
-    }
-
-  b = vlib_get_buffer (vm, bi);
-
-  /* leave some space for the encap headers */
-  vlib_buffer_make_headroom (b, MAX_LISP_MSG_ENCAP_LEN);
-
-  lisp_msg_put_map_reply (b, records, nonce, probe_bit);
-
-  /* push outer ip header */
-  pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, dst_port, sloc, dst);
-
-  bi_res[0] = bi;
-  return b;
-}
-
-static int
-send_map_reply (lisp_cp_main_t * lcm, u32 mi, ip_address_t * dst,
-		u8 probe_bit, u64 nonce, u16 dst_port,
-		ip_address_t * probed_loc)
-{
-  ip_address_t src;
-  u32 bi;
-  vlib_buffer_t *b;
-  vlib_frame_t *f;
-  u32 next_index, *to_next;
-  mapping_t *records = 0, *m;
-
-  m = pool_elt_at_index (lcm->mapping_pool, mi);
-  if (!m)
-    return -1;
-
-  vec_add1 (records, m[0]);
-  add_locators (lcm, &records[0], m->locator_set_index, probed_loc);
-  memset (&src, 0, sizeof (src));
-
-  if (!ip_fib_get_first_egress_ip_for_dst (lcm, dst, &src))
-    {
-      clib_warning ("can't find inteface address for %U", format_ip_address,
-		    dst);
-      return -1;
-    }
-
-  b = build_map_reply (lcm, &src, dst, nonce, probe_bit, records, dst_port,
-		       &bi);
-  if (!b)
-    return -1;
-  free_map_register_records (records);
-
-  vnet_buffer (b)->sw_if_index[VLIB_TX] = 0;
-  next_index = (ip_addr_version (&lcm->active_map_resolver) == IP4) ?
-    ip4_lookup_node.index : ip6_lookup_node.index;
-
-  f = vlib_get_frame_to_node (lcm->vlib_main, next_index);
-
-  /* Enqueue the packet */
-  to_next = vlib_frame_vector_args (f);
-  to_next[0] = bi;
-  f->n_vectors = 1;
-  vlib_put_frame_to_node (lcm->vlib_main, next_index, f);
-  return 0;
-}
-
-void
-process_map_request (vlib_main_t * vm, lisp_cp_main_t * lcm,
-		     vlib_buffer_t * b)
-{
-  u8 *ip_hdr = 0, *udp_hdr;
-  ip4_header_t *ip4;
-  ip6_header_t *ip6;
-  ip_address_t *dst_loc = 0, probed_loc, src_loc;
-  mapping_t m;
-  map_request_hdr_t *mreq_hdr;
-  gid_address_t src, dst;
-  u64 nonce;
-  u32 i, len = 0;
-  gid_address_t *itr_rlocs = 0;
-
-  mreq_hdr = vlib_buffer_get_current (b);
-
-  // TODO ugly workaround to find out whether LISP is carried by ip4 or 6
-  // and needs to be fixed
-  udp_hdr = (u8 *) vlib_buffer_get_current (b) - sizeof (udp_header_t);
-  ip4 = (ip4_header_t *) (udp_hdr - sizeof (ip4_header_t));
-  ip6 = (ip6_header_t *) (udp_hdr - sizeof (ip6_header_t));
-
-  if ((ip4->ip_version_and_header_length & 0xF0) == 0x40)
-    ip_hdr = (u8 *) ip4;
-  else
-    {
-      u32 flags = clib_net_to_host_u32
-	(ip6->ip_version_traffic_class_and_flow_label);
-      if ((flags & 0xF0000000) == 0x60000000)
-	ip_hdr = (u8 *) ip6;
-      else
-	{
-	  clib_warning ("internal error: cannot determine whether packet "
-			"is ip4 or 6!");
-	  return;
-	}
-    }
-
-  vlib_buffer_pull (b, sizeof (*mreq_hdr));
-
-  nonce = MREQ_NONCE (mreq_hdr);
-
-  if (!MREQ_SMR (mreq_hdr) && !MREQ_RLOC_PROBE (mreq_hdr))
-    {
-      clib_warning
-	("Only SMR Map-Requests and RLOC probe supported for now!");
-      return;
-    }
-
-  /* parse src eid */
-  len = lisp_msg_parse_addr (b, &src);
-  if (len == ~0)
-    return;
-
-  len = lisp_msg_parse_itr_rlocs (b, &itr_rlocs,
-				  MREQ_ITR_RLOC_COUNT (mreq_hdr) + 1);
-  if (len == ~0)
-    return;
-
-  /* parse eid records and send SMR-invoked map-requests */
-  for (i = 0; i < MREQ_REC_COUNT (mreq_hdr); i++)
-    {
-      memset (&dst, 0, sizeof (dst));
-      len = lisp_msg_parse_eid_rec (b, &dst);
-      if (len == ~0)
-	{
-	  clib_warning ("Can't parse map-request EID-record");
-	  goto done;
-	}
-
-      if (MREQ_SMR (mreq_hdr))
-	{
-	  /* send SMR-invoked map-requests */
-	  queue_map_request (&dst, &src, 1 /* invoked */ , 0 /* resend */ );
-	}
-      else if (MREQ_RLOC_PROBE (mreq_hdr))
-	{
-	  memset (&m, 0, sizeof (m));
-	  u32 mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &dst);
-
-	  // TODO: select best locator; for now use the first one
-	  dst_loc = &gid_address_ip (&itr_rlocs[0]);
-
-	  /* get src/dst IP addresses */
-	  get_src_and_dst_ip (ip_hdr, &src_loc, &probed_loc);
-
-	  // TODO get source port from buffer
-	  u16 src_port = LISP_CONTROL_PORT;
-
-	  send_map_reply (lcm, mi, dst_loc, 1 /* probe-bit */ , nonce,
-			  src_port, &probed_loc);
-	}
-    }
-
-done:
-  vec_free (itr_rlocs);
-}
-
-static map_records_arg_t *
-parse_map_reply (vlib_buffer_t * b)
-{
-  locator_t probed;
-  gid_address_t deid;
-  void *h;
-  u32 i, len = 0;
-  mapping_t m;
-  map_reply_hdr_t *mrep_hdr;
-  map_records_arg_t *a = clib_mem_alloc (sizeof (*a));
-  memset (a, 0, sizeof (*a));
-  locator_t *locators;
-
-  mrep_hdr = vlib_buffer_get_current (b);
-  a->nonce = MREP_NONCE (mrep_hdr);
-  a->is_rloc_probe = MREP_RLOC_PROBE (mrep_hdr);
-  vlib_buffer_pull (b, sizeof (*mrep_hdr));
-
-  for (i = 0; i < MREP_REC_COUNT (mrep_hdr); i++)
-    {
-      memset (&m, 0, sizeof (m));
-      locators = 0;
-      h = vlib_buffer_get_current (b);
-
-      m.ttl = clib_net_to_host_u32 (MAP_REC_TTL (h));
-      m.action = MAP_REC_ACTION (h);
-      m.authoritative = MAP_REC_AUTH (h);
-
-      len = lisp_msg_parse_mapping_record (b, &deid, &locators, &probed);
-      if (len == ~0)
-	{
-	  clib_warning ("Failed to parse mapping record!");
-	  map_records_arg_free (a);
-	  return 0;
-	}
-
-      m.locators = locators;
-      gid_address_copy (&m.eid, &deid);
-      vec_add1 (a->mappings, m);
-    }
-  return a;
-}
-
-static void
-queue_map_reply_for_processing (map_records_arg_t * a)
-{
-  vl_api_rpc_call_main_thread (process_map_reply, (u8 *) a, sizeof (a));
-}
-
-static void
-queue_map_notify_for_processing (map_records_arg_t * a)
-{
-  vl_api_rpc_call_main_thread (process_map_notify, (u8 *) a, sizeof (a[0]));
-}
-
-static uword
-lisp_cp_input (vlib_main_t * vm, vlib_node_runtime_t * node,
-	       vlib_frame_t * from_frame)
-{
-  u32 n_left_from, *from, *to_next_drop;
-  lisp_msg_type_e type;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  map_records_arg_t *a;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next_drop;
-
-      vlib_get_next_frame (vm, node, LISP_CP_INPUT_NEXT_DROP,
-			   to_next_drop, n_left_to_next_drop);
-      while (n_left_from > 0 && n_left_to_next_drop > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-
-	  bi0 = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next_drop[0] = bi0;
-	  to_next_drop += 1;
-	  n_left_to_next_drop -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  type = lisp_msg_type (vlib_buffer_get_current (b0));
-	  switch (type)
-	    {
-	    case LISP_MAP_REPLY:
-	      a = parse_map_reply (b0);
-	      if (a)
-		queue_map_reply_for_processing (a);
-	      break;
-	    case LISP_MAP_REQUEST:
-	      process_map_request (vm, lcm, b0);
-	      break;
-	    case LISP_MAP_NOTIFY:
-	      a = parse_map_notify (b0);
-	      if (a)
-		queue_map_notify_for_processing (a);
-	      break;
-	    default:
-	      clib_warning ("Unsupported LISP message type %d", type);
-	      break;
-	    }
-
-	  b0->error = node->errors[LISP_CP_INPUT_ERROR_DROP];
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, LISP_CP_INPUT_NEXT_DROP,
-			   n_left_to_next_drop);
-    }
-  return from_frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (lisp_cp_input_node) = {
-  .function = lisp_cp_input,
-  .name = "lisp-cp-input",
-  .vector_size = sizeof (u32),
-  .format_trace = format_lisp_cp_input_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = LISP_CP_INPUT_N_ERROR,
-  .error_strings = lisp_cp_input_error_strings,
-
-  .n_next_nodes = LISP_CP_INPUT_N_NEXT,
-
-  .next_nodes = {
-      [LISP_CP_INPUT_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-lisp_cp_init (vlib_main_t * vm)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  clib_error_t *error = 0;
-
-  if ((error = vlib_call_init_function (vm, lisp_gpe_init)))
-    return error;
-
-  lcm->im4 = &ip4_main;
-  lcm->im6 = &ip6_main;
-  lcm->vlib_main = vm;
-  lcm->vnet_main = vnet_get_main ();
-  lcm->mreq_itr_rlocs = ~0;
-  lcm->lisp_pitr = 0;
-  memset (&lcm->active_map_resolver, 0, sizeof (lcm->active_map_resolver));
-
-  gid_dictionary_init (&lcm->mapping_index_by_gid);
-  lcm->do_map_resolver_election = 1;
-  lcm->map_request_mode = MR_MODE_DST_ONLY;
-
-  /* default vrf mapped to vni 0 */
-  hash_set (lcm->table_id_by_vni, 0, 0);
-  hash_set (lcm->vni_by_table_id, 0, 0);
-
-  udp_register_dst_port (vm, UDP_DST_PORT_lisp_cp,
-			 lisp_cp_input_node.index, 1 /* is_ip4 */ );
-  udp_register_dst_port (vm, UDP_DST_PORT_lisp_cp6,
-			 lisp_cp_input_node.index, 0 /* is_ip4 */ );
-
-  u64 now = clib_cpu_time_now ();
-  timing_wheel_init (&lcm->wheel, now, vm->clib_time.clocks_per_second);
-  return 0;
-}
-
-static void *
-send_map_request_thread_fn (void *arg)
-{
-  map_request_args_t *a = arg;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-
-  if (a->is_resend)
-    resend_encapsulated_map_request (lcm, &a->seid, &a->deid, a->smr_invoked);
-  else
-    send_encapsulated_map_request (lcm, &a->seid, &a->deid, a->smr_invoked);
-
-  return 0;
-}
-
-static int
-queue_map_request (gid_address_t * seid, gid_address_t * deid,
-		   u8 smr_invoked, u8 is_resend)
-{
-  map_request_args_t a;
-
-  a.is_resend = is_resend;
-  gid_address_copy (&a.seid, seid);
-  gid_address_copy (&a.deid, deid);
-  a.smr_invoked = smr_invoked;
-
-  vl_api_rpc_call_main_thread (send_map_request_thread_fn,
-			       (u8 *) & a, sizeof (a));
-  return 0;
-}
-
-/**
- * Take an action with a pending map request depending on expiration time
- * and re-try counters.
- */
-static void
-update_pending_request (pending_map_request_t * r, f64 dt)
-{
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  lisp_msmr_t *mr;
-
-  if (r->time_to_expire - dt < 0)
-    /* it's time to decide what to do with this pending request */
-    {
-      if (r->retries_num >= NUMBER_OF_RETRIES)
-	/* too many retries -> assume current map resolver is not available */
-	{
-	  mr = get_map_resolver (&lcm->active_map_resolver);
-	  if (!mr)
-	    {
-	      clib_warning ("Map resolver %U not found - probably deleted "
-			    "by the user recently.", format_ip_address,
-			    &lcm->active_map_resolver);
-	    }
-	  else
-	    {
-	      clib_warning ("map resolver %U is unreachable, ignoring",
-			    format_ip_address, &lcm->active_map_resolver);
-
-	      /* mark current map resolver unavailable so it won't be
-	       * selected next time */
-	      mr->is_down = 1;
-	      mr->last_update = vlib_time_now (lcm->vlib_main);
-	    }
-
-	  reset_pending_mr_counters (r);
-	  elect_map_resolver (lcm);
-
-	  /* try to find a next eligible map resolver and re-send */
-	  queue_map_request (&r->src, &r->dst, r->is_smr_invoked,
-			     1 /* resend */ );
-	}
-      else
-	{
-	  /* try again */
-	  queue_map_request (&r->src, &r->dst, r->is_smr_invoked,
-			     1 /* resend */ );
-	  r->retries_num++;
-	  r->time_to_expire = PENDING_MREQ_EXPIRATION_TIME;
-	}
-    }
-  else
-    r->time_to_expire -= dt;
-}
-
-static void
-remove_dead_pending_map_requests (lisp_cp_main_t * lcm)
-{
-  u64 *nonce;
-  pending_map_request_t *pmr;
-  u32 *to_be_removed = 0, *pmr_index;
-
-  /* *INDENT-OFF* */
-  pool_foreach (pmr, lcm->pending_map_requests_pool,
-  ({
-    if (pmr->to_be_removed)
-      {
-        clib_fifo_foreach (nonce, pmr->nonces, ({
-          hash_unset (lcm->pending_map_requests_by_nonce, nonce[0]);
-        }));
-
-        vec_add1 (to_be_removed, pmr - lcm->pending_map_requests_pool);
-      }
-  }));
-  /* *INDENT-ON* */
-
-  vec_foreach (pmr_index, to_be_removed)
-    pool_put_index (lcm->pending_map_requests_by_nonce, pmr_index[0]);
-
-  vec_free (to_be_removed);
-}
-
-static void
-update_rloc_probing (lisp_cp_main_t * lcm, f64 dt)
-{
-  static f64 time_left = RLOC_PROBING_INTERVAL;
-
-  if (!lcm->is_enabled || !lcm->rloc_probing)
-    return;
-
-  time_left -= dt;
-  if (time_left <= 0)
-    {
-      time_left = RLOC_PROBING_INTERVAL;
-      send_rloc_probes (lcm);
-    }
-}
-
-static void
-update_map_register (lisp_cp_main_t * lcm, f64 dt)
-{
-  static f64 time_left = QUICK_MAP_REGISTER_INTERVAL;
-  static u64 mreg_sent_counter = 0;
-
-  if (!lcm->is_enabled || !lcm->map_registering)
-    return;
-
-  time_left -= dt;
-  if (time_left <= 0)
-    {
-      if (mreg_sent_counter >= QUICK_MAP_REGISTER_MSG_COUNT)
-	time_left = MAP_REGISTER_INTERVAL;
-      else
-	{
-	  mreg_sent_counter++;
-	  time_left = QUICK_MAP_REGISTER_INTERVAL;
-	}
-      send_map_register (lcm, 1 /* want map notify */ );
-    }
-}
-
-static uword
-send_map_resolver_service (vlib_main_t * vm,
-			   vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  u32 *expired = 0;
-  f64 period = 2.0;
-  pending_map_request_t *pmr;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-
-  while (1)
-    {
-      vlib_process_wait_for_event_or_clock (vm, period);
-
-      /* currently no signals are expected - just wait for clock */
-      (void) vlib_process_get_events (vm, 0);
-
-      /* *INDENT-OFF* */
-      pool_foreach (pmr, lcm->pending_map_requests_pool,
-      ({
-        if (!pmr->to_be_removed)
-          update_pending_request (pmr, period);
-      }));
-      /* *INDENT-ON* */
-
-      remove_dead_pending_map_requests (lcm);
-
-      update_map_register (lcm, period);
-      update_rloc_probing (lcm, period);
-
-      u64 now = clib_cpu_time_now ();
-
-      expired = timing_wheel_advance (&lcm->wheel, now, expired, 0);
-      if (vec_len (expired) > 0)
-	{
-	  u32 *mi = 0;
-	  vec_foreach (mi, expired)
-	  {
-	    remove_expired_mapping (lcm, mi[0]);
-	  }
-	  _vec_len (expired) = 0;
-	}
-    }
-
-  /* unreachable */
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (lisp_retry_service_node,static) = {
-    .function = send_map_resolver_service,
-    .type = VLIB_NODE_TYPE_PROCESS,
-    .name = "lisp-retry-service",
-    .process_log2_n_stack_bytes = 16,
-};
-/* *INDENT-ON* */
-
-VLIB_INIT_FUNCTION (lisp_cp_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-cp/control.h b/vnet/vnet/lisp-cp/control.h
deleted file mode 100644
index e89c6fd6..00000000
--- a/vnet/vnet/lisp-cp/control.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef VNET_CONTROL_H_
-#define VNET_CONTROL_H_
-
-#include <vnet/vnet.h>
-#include <vnet/lisp-cp/gid_dictionary.h>
-#include <vnet/lisp-cp/lisp_types.h>
-
-#define NUMBER_OF_RETRIES                   1
-#define PENDING_MREQ_EXPIRATION_TIME        3.0	/* seconds */
-#define PENDING_MREQ_QUEUE_LEN              5
-
-#define PENDING_MREG_EXPIRATION_TIME        3.0	/* seconds */
-#define RLOC_PROBING_INTERVAL               60.0
-
-/* when map-registration is enabled "quick registration" takes place first.
-   In this mode ETR sends map-register messages at an increased frequency
-   until specified message count is reached */
-#define QUICK_MAP_REGISTER_MSG_COUNT        3
-#define QUICK_MAP_REGISTER_INTERVAL         3.0
-
-/* normal map-register period */
-#define MAP_REGISTER_INTERVAL               60.0
-
-/* 15 minutes */
-#define MAP_REGISTER_DEFAULT_TTL            900
-
-typedef struct
-{
-  gid_address_t src;
-  gid_address_t dst;
-  u32 retries_num;
-  f64 time_to_expire;
-  u8 is_smr_invoked;
-  u64 *nonces;
-  u8 to_be_removed;
-} pending_map_request_t;
-
-typedef struct
-{
-  gid_address_t leid;
-  gid_address_t reid;
-  u8 is_src_dst;
-  locator_pair_t *locator_pairs;
-} fwd_entry_t;
-
-typedef struct
-{
-  gid_address_t leid;
-  gid_address_t reid;
-} lisp_adjacency_t;
-
-typedef enum
-{
-  IP4_MISS_PACKET,
-  IP6_MISS_PACKET
-} miss_packet_type_t;
-
-/* map-server/map-resolver structure */
-typedef struct
-{
-  u8 is_down;
-  f64 last_update;
-  ip_address_t address;
-  char *key;
-} lisp_msmr_t;
-
-typedef struct
-{
-  /* headers */
-  u8 data[100];
-  u32 length;
-  miss_packet_type_t type;
-} miss_packet_t;
-
-typedef enum
-{
-  MR_MODE_DST_ONLY = 0,
-  MR_MODE_SRC_DST,
-  _MR_MODE_MAX
-} map_request_mode_t;
-
-typedef struct
-{
-  /* LISP feature status */
-  u8 is_enabled;
-
-  /* eid table */
-  gid_dictionary_t mapping_index_by_gid;
-
-  /* pool of mappings */
-  mapping_t *mapping_pool;
-
-  /* hash map of secret keys by mapping index */
-  u8 *key_by_mapping_index;
-
-  /* pool of locators */
-  locator_t *locator_pool;
-
-  /* pool of locator-sets */
-  locator_set_t *locator_set_pool;
-
-  /* vector of locator-set vectors composed of and indexed by locator index */
-  u32 **locator_to_locator_sets;
-
-  /* hash map of locators by name */
-  uword *locator_set_index_by_name;
-
-  /* vector of eid index vectors supported and indexed by locator-set index */
-  u32 **locator_set_to_eids;
-
-  /* vectors of indexes for local locator-sets and mappings */
-  u32 *local_mappings_indexes;
-  u32 *local_locator_set_indexes;
-
-  /* hash map of forwarding entries by mapping index */
-  u32 *fwd_entry_by_mapping_index;
-
-  /* forwarding entries pool */
-  fwd_entry_t *fwd_entry_pool;
-
-  /* hash map keyed by nonce of pending map-requests */
-  uword *pending_map_requests_by_nonce;
-
-  /* pool of pending map requests */
-  pending_map_request_t *pending_map_requests_pool;
-
-  /* hash map of sent map register messages */
-  uword *map_register_messages_by_nonce;
-
-  /* vector of map-resolvers */
-  lisp_msmr_t *map_resolvers;
-
-  /* vector of map-servers */
-  lisp_msmr_t *map_servers;
-
-  /* map resolver address currently being used for sending requests.
-   * This has to be an actual address and not an index to map_resolvers vector
-   * since the vector may be modified during request resend/retry procedure
-   * and break things :-) */
-  ip_address_t active_map_resolver;
-
-  u8 do_map_resolver_election;
-
-  /* map-request  locator set index */
-  u32 mreq_itr_rlocs;
-
-  /* vni to vrf hash tables */
-  uword *table_id_by_vni;
-  uword *vni_by_table_id;
-
-  /* vni to bd-index hash tables */
-  uword *bd_id_by_vni;
-  uword *vni_by_bd_id;
-
-  /* track l2 and l3 interfaces that have been created for vni */
-  uword *l2_dp_intf_by_vni;
-
-  /* Proxy ETR map index */
-  u32 pitr_map_index;
-
-  /* LISP PITR mode */
-  u8 lisp_pitr;
-
-  /* map request mode */
-  u8 map_request_mode;
-
-  /* enable/disable map registering */
-  u8 map_registering;
-
-  /* enable/disable rloc-probing */
-  u8 rloc_probing;
-
-  /* timing wheel for mappping timeouts */
-  timing_wheel_t wheel;
-
-  /* commodity */
-  ip4_main_t *im4;
-  ip6_main_t *im6;
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} lisp_cp_main_t;
-
-/* lisp-gpe control plane */
-lisp_cp_main_t lisp_control_main;
-
-extern vlib_node_registration_t lisp_cp_input_node;
-extern vlib_node_registration_t lisp_cp_lookup_ip4_node;
-extern vlib_node_registration_t lisp_cp_lookup_ip6_node;
-
-clib_error_t *lisp_cp_init ();
-
-always_inline lisp_cp_main_t *
-vnet_lisp_cp_get_main ()
-{
-  return &lisp_control_main;
-}
-
-typedef struct
-{
-  u8 is_add;
-  union
-  {
-    u8 *name;
-    u32 index;
-  };
-  locator_t *locators;
-  u8 local;
-} vnet_lisp_add_del_locator_set_args_t;
-
-int
-vnet_lisp_add_del_locator_set (vnet_lisp_add_del_locator_set_args_t * a,
-			       u32 * ls_index);
-int
-vnet_lisp_add_del_locator (vnet_lisp_add_del_locator_set_args_t * a,
-			   locator_set_t * ls, u32 * ls_index);
-
-typedef struct
-{
-  u8 is_add;
-  gid_address_t eid;
-  u32 locator_set_index;
-
-  u32 ttl;
-  u8 action;
-  u8 authoritative;
-
-  u8 local;
-  u8 is_static;
-  u8 *key;
-  u8 key_id;
-} vnet_lisp_add_del_mapping_args_t;
-
-int
-vnet_lisp_map_cache_add_del (vnet_lisp_add_del_mapping_args_t * a,
-			     u32 * map_index);
-int
-vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a,
-				 u32 * map_index_result);
-
-int
-vnet_lisp_add_del_mapping (gid_address_t * deid, locator_t * dlocs, u8 action,
-			   u8 authoritative, u32 ttl, u8 is_add, u8 is_static,
-			   u32 * res_map_index);
-
-typedef struct
-{
-  gid_address_t reid;
-  gid_address_t leid;
-  u8 is_add;
-} vnet_lisp_add_del_adjacency_args_t;
-
-int vnet_lisp_add_del_adjacency (vnet_lisp_add_del_adjacency_args_t * a);
-
-typedef struct
-{
-  u8 is_add;
-  ip_address_t address;
-} vnet_lisp_add_del_map_resolver_args_t;
-
-int
-vnet_lisp_add_del_map_resolver (vnet_lisp_add_del_map_resolver_args_t * a);
-int vnet_lisp_add_del_map_server (ip_address_t * addr, u8 is_add);
-
-clib_error_t *vnet_lisp_enable_disable (u8 is_enabled);
-u8 vnet_lisp_enable_disable_status (void);
-
-int vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add);
-
-typedef struct
-{
-  u8 is_add;
-  u8 *locator_set_name;
-} vnet_lisp_add_del_mreq_itr_rloc_args_t;
-
-int
-vnet_lisp_add_del_mreq_itr_rlocs (vnet_lisp_add_del_mreq_itr_rloc_args_t * a);
-
-int vnet_lisp_clear_all_remote_adjacencies (void);
-
-int vnet_lisp_eid_table_map (u32 vni, u32 vrf, u8 is_l2, u8 is_add);
-int vnet_lisp_add_del_map_table_key (gid_address_t * eid, char *key,
-				     u8 is_add);
-int vnet_lisp_set_map_request_mode (u8 mode);
-u8 vnet_lisp_get_map_request_mode (void);
-lisp_adjacency_t *vnet_lisp_adjacencies_get_by_vni (u32 vni);
-int vnet_lisp_rloc_probe_enable_disable (u8 is_enable);
-int vnet_lisp_map_register_enable_disable (u8 is_enable);
-u8 vnet_lisp_map_register_state_get (void);
-u8 vnet_lisp_rloc_probe_state_get (void);
-
-#endif /* VNET_CONTROL_H_ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-cp/gid_dictionary.c b/vnet/vnet/lisp-cp/gid_dictionary.c
deleted file mode 100644
index d238124e..00000000
--- a/vnet/vnet/lisp-cp/gid_dictionary.c
+++ /dev/null
@@ -1,865 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/lisp-cp/gid_dictionary.h>
-
-typedef struct
-{
-  void *arg;
-  ip_prefix_t src;
-  foreach_subprefix_match_cb_t cb;
-  union
-  {
-    gid_ip4_table_t *ip4_table;
-    gid_ip6_table_t *ip6_table;
-  };
-} sfib_entry_arg_t;
-
-static u32 ip4_lookup (gid_ip4_table_t * db, u32 vni, ip_prefix_t * key);
-
-static u32 ip6_lookup (gid_ip6_table_t * db, u32 vni, ip_prefix_t * key);
-
-static void
-foreach_sfib4_subprefix (BVT (clib_bihash_kv) * kvp, void *arg)
-{
-  sfib_entry_arg_t *a = arg;
-  u32 ip = (u32) kvp->key[0];
-  ip4_address_t *mask;
-  u8 plen = ip_prefix_len (&a->src);
-
-  ASSERT (plen <= 32);
-  mask = &a->ip4_table->ip4_fib_masks[plen];
-
-  u32 src_ip = ip_prefix_v4 (&a->src).as_u32;
-  src_ip &= mask->as_u32;
-  ip &= mask->as_u32;
-
-  if (src_ip == ip)
-    {
-      /* found sub-prefix of src prefix */
-      (a->cb) (kvp->value, a->arg);
-    }
-}
-
-static void
-gid_dict_foreach_ip4_subprefix (gid_dictionary_t * db, u32 vni,
-				ip_prefix_t * src, ip_prefix_t * dst,
-				foreach_subprefix_match_cb_t cb, void *arg)
-{
-  u32 sfi;
-  gid_ip4_table_t *sfib4;
-  sfib_entry_arg_t a;
-
-  sfi = ip4_lookup (&db->dst_ip4_table, vni, dst);
-  if (GID_LOOKUP_MISS == sfi)
-    return;
-
-  sfib4 = pool_elt_at_index (db->src_ip4_table_pool, sfi);
-
-  a.arg = arg;
-  a.cb = cb;
-  a.src = src[0];
-  a.ip4_table = sfib4;
-
-  BV (clib_bihash_foreach_key_value_pair) (&sfib4->ip4_lookup_table,
-					   foreach_sfib4_subprefix, &a);
-}
-
-static void
-foreach_sfib6_subprefix (BVT (clib_bihash_kv) * kvp, void *arg)
-{
-  sfib_entry_arg_t *a = arg;
-  ip6_address_t ip;
-  ip6_address_t *mask;
-  u8 plen = ip_prefix_len (&a->src);
-
-  mask = &a->ip6_table->ip6_fib_masks[plen];
-  ip.as_u64[0] = kvp->key[0];
-  ip.as_u64[1] = kvp->key[1];
-
-  if (ip6_address_is_equal_masked (&ip_prefix_v6 (&a->src), &ip, mask))
-    {
-      /* found sub-prefix of src prefix */
-      (a->cb) (kvp->value, a->arg);
-    }
-}
-
-static void
-gid_dict_foreach_ip6_subprefix (gid_dictionary_t * db, u32 vni,
-				ip_prefix_t * src, ip_prefix_t * dst,
-				foreach_subprefix_match_cb_t cb, void *arg)
-{
-  u32 sfi;
-  gid_ip6_table_t *sfib6;
-  sfib_entry_arg_t a;
-
-  sfi = ip6_lookup (&db->dst_ip6_table, vni, dst);
-  if (GID_LOOKUP_MISS == sfi)
-    return;
-
-  sfib6 = pool_elt_at_index (db->src_ip6_table_pool, sfi);
-
-  a.arg = arg;
-  a.cb = cb;
-  a.src = src[0];
-  a.ip6_table = sfib6;
-
-  BV (clib_bihash_foreach_key_value_pair) (&sfib6->ip6_lookup_table,
-					   foreach_sfib6_subprefix, &a);
-}
-
-void
-gid_dict_foreach_subprefix (gid_dictionary_t * db, gid_address_t * eid,
-			    foreach_subprefix_match_cb_t cb, void *arg)
-{
-  ip_prefix_t *ippref = &gid_address_sd_dst_ippref (eid);
-
-  if (IP4 == ip_prefix_version (ippref))
-    gid_dict_foreach_ip4_subprefix (db, gid_address_vni (eid),
-				    &gid_address_sd_src_ippref (eid),
-				    &gid_address_sd_dst_ippref (eid), cb,
-				    arg);
-  else
-    gid_dict_foreach_ip6_subprefix (db, gid_address_vni (eid),
-				    &gid_address_sd_src_ippref (eid),
-				    &gid_address_sd_dst_ippref (eid), cb,
-				    arg);
-}
-
-static void
-make_mac_sd_key (BVT (clib_bihash_kv) * kv, u32 vni, u8 src_mac[6],
-		 u8 dst_mac[6])
-{
-  kv->key[0] = (u64) vni;
-  kv->key[1] = mac_to_u64 (dst_mac);
-  kv->key[2] = src_mac ? mac_to_u64 (src_mac) : (u64) 0;
-}
-
-static u32
-mac_sd_lookup (gid_mac_table_t * db, u32 vni, u8 * dst, u8 * src)
-{
-  int rv;
-  BVT (clib_bihash_kv) kv, value;
-
-  make_mac_sd_key (&kv, vni, src, dst);
-  rv = BV (clib_bihash_search_inline_2) (&db->mac_lookup_table, &kv, &value);
-
-  /* no match, try with src 0, catch all for dst */
-  if (rv != 0)
-    {
-      kv.key[2] = 0;
-      rv = BV (clib_bihash_search_inline_2) (&db->mac_lookup_table, &kv,
-					     &value);
-      if (rv == 0)
-	return value.value;
-    }
-  else
-    return value.value;
-
-  return GID_LOOKUP_MISS;
-}
-
-static u32
-ip4_lookup_exact_match (gid_ip4_table_t * db, u32 vni, ip_prefix_t * key)
-{
-  int rv;
-  BVT (clib_bihash_kv) kv, value;
-
-  ip4_address_t *mask;
-
-  mask = &db->ip4_fib_masks[ip_prefix_len (key)];
-
-  kv.key[0] = ((u64) vni << 32) | (ip_prefix_v4 (key).as_u32 & mask->as_u32);
-  kv.key[1] = 0;
-  kv.key[2] = 0;
-
-  rv = BV (clib_bihash_search_inline_2) (&db->ip4_lookup_table, &kv, &value);
-  if (rv == 0)
-    return value.value;
-
-  return GID_LOOKUP_MISS;
-}
-
-static u32
-ip4_lookup (gid_ip4_table_t * db, u32 vni, ip_prefix_t * key)
-{
-  int i, len;
-  int rv;
-  BVT (clib_bihash_kv) kv, value;
-
-  len = vec_len (db->ip4_prefix_lengths_in_search_order);
-
-  for (i = 0; i < len; i++)
-    {
-      int dst_address_length = db->ip4_prefix_lengths_in_search_order[i];
-      ip4_address_t *mask;
-
-      ASSERT (dst_address_length >= 0 && dst_address_length <= 32);
-
-      mask = &db->ip4_fib_masks[dst_address_length];
-
-      kv.key[0] =
-	((u64) vni << 32) | (ip_prefix_v4 (key).as_u32 & mask->as_u32);
-      kv.key[1] = 0;
-      kv.key[2] = 0;
-
-      rv =
-	BV (clib_bihash_search_inline_2) (&db->ip4_lookup_table, &kv, &value);
-      if (rv == 0)
-	return value.value;
-    }
-
-  return GID_LOOKUP_MISS;
-}
-
-static u32
-ip6_lookup_exact_match (gid_ip6_table_t * db, u32 vni, ip_prefix_t * key)
-{
-  int rv;
-  BVT (clib_bihash_kv) kv, value;
-
-  ip6_address_t *mask;
-  mask = &db->ip6_fib_masks[ip_prefix_len (key)];
-
-  kv.key[0] = ip_prefix_v6 (key).as_u64[0] & mask->as_u64[0];
-  kv.key[1] = ip_prefix_v6 (key).as_u64[1] & mask->as_u64[1];
-  kv.key[2] = (u64) vni;
-
-  rv = BV (clib_bihash_search_inline_2) (&db->ip6_lookup_table, &kv, &value);
-  if (rv == 0)
-    return value.value;
-
-  return GID_LOOKUP_MISS;
-}
-
-static u32
-ip6_lookup (gid_ip6_table_t * db, u32 vni, ip_prefix_t * key)
-{
-  int i, len;
-  int rv;
-  BVT (clib_bihash_kv) kv, value;
-
-  len = vec_len (db->ip6_prefix_lengths_in_search_order);
-
-  for (i = 0; i < len; i++)
-    {
-      int dst_address_length = db->ip6_prefix_lengths_in_search_order[i];
-      ip6_address_t *mask;
-
-      ASSERT (dst_address_length >= 0 && dst_address_length <= 128);
-
-      mask = &db->ip6_fib_masks[dst_address_length];
-
-      kv.key[0] = ip_prefix_v6 (key).as_u64[0] & mask->as_u64[0];
-      kv.key[1] = ip_prefix_v6 (key).as_u64[1] & mask->as_u64[1];
-      kv.key[2] = (u64) vni;
-
-      rv =
-	BV (clib_bihash_search_inline_2) (&db->ip6_lookup_table, &kv, &value);
-      if (rv == 0)
-	return value.value;
-    }
-
-  return GID_LOOKUP_MISS;
-}
-
-static u32
-ip_sd_lookup (gid_dictionary_t * db, u32 vni, ip_prefix_t * dst,
-	      ip_prefix_t * src)
-{
-  u32 sfi;
-  gid_ip4_table_t *sfib4;
-  gid_ip6_table_t *sfib6;
-
-  switch (ip_prefix_version (dst))
-    {
-    case IP4:
-      sfi = ip4_lookup (&db->dst_ip4_table, vni, dst);
-      if (GID_LOOKUP_MISS != sfi)
-	sfib4 = pool_elt_at_index (db->src_ip4_table_pool, sfi);
-      else
-	return GID_LOOKUP_MISS;
-
-      if (!src)
-	{
-	  ip_prefix_t sp;
-	  memset (&sp, 0, sizeof (sp));
-	  return ip4_lookup_exact_match (sfib4, 0, &sp);
-	}
-      else
-	return ip4_lookup (sfib4, 0, src);
-
-      break;
-    case IP6:
-      sfi = ip6_lookup (&db->dst_ip6_table, vni, dst);
-      if (GID_LOOKUP_MISS != sfi)
-	sfib6 = pool_elt_at_index (db->src_ip6_table_pool, sfi);
-      else
-	return GID_LOOKUP_MISS;
-
-      if (!src)
-	{
-	  ip_prefix_t sp;
-	  memset (&sp, 0, sizeof (sp));
-	  ip_prefix_version (&sp) = IP6;
-	  return ip6_lookup_exact_match (sfib6, 0, &sp);
-	}
-      else
-	return ip6_lookup (sfib6, 0, src);
-
-      break;
-    default:
-      clib_warning ("address type %d not supported!",
-		    ip_prefix_version (dst));
-      break;
-    }
-  return GID_LOOKUP_MISS;
-}
-
-u32
-gid_dictionary_lookup (gid_dictionary_t * db, gid_address_t * key)
-{
-  switch (gid_address_type (key))
-    {
-    case GID_ADDR_IP_PREFIX:
-      return ip_sd_lookup (db, gid_address_vni (key),
-			   &gid_address_ippref (key), 0);
-    case GID_ADDR_MAC:
-      return mac_sd_lookup (&db->sd_mac_table, gid_address_vni (key),
-			    gid_address_mac (key), 0);
-    case GID_ADDR_SRC_DST:
-      switch (gid_address_sd_dst_type (key))
-	{
-	case FID_ADDR_IP_PREF:
-	  return ip_sd_lookup (db, gid_address_vni (key),
-			       &gid_address_sd_dst_ippref (key),
-			       &gid_address_sd_src_ippref (key));
-	  break;
-	case FID_ADDR_MAC:
-	  return mac_sd_lookup (&db->sd_mac_table, gid_address_vni (key),
-				gid_address_sd_dst_mac (key),
-				gid_address_sd_src_mac (key));
-	  break;
-	default:
-	  clib_warning ("Source/Dest address type %d not supported!",
-			gid_address_sd_dst_type (key));
-	  break;
-	}
-      break;
-    default:
-      clib_warning ("address type %d not supported!", gid_address_type (key));
-      break;
-    }
-  return GID_LOOKUP_MISS;
-}
-
-u32
-gid_dictionary_sd_lookup (gid_dictionary_t * db, gid_address_t * dst,
-			  gid_address_t * src)
-{
-  switch (gid_address_type (dst))
-    {
-    case GID_ADDR_IP_PREFIX:
-      return ip_sd_lookup (db, gid_address_vni (dst),
-			   &gid_address_ippref (dst),
-			   &gid_address_ippref (src));
-    case GID_ADDR_MAC:
-      return mac_sd_lookup (&db->sd_mac_table, gid_address_vni (dst),
-			    gid_address_mac (dst), gid_address_mac (src));
-    case GID_ADDR_SRC_DST:
-      switch (gid_address_sd_dst_type (dst))
-	{
-	case FID_ADDR_IP_PREF:
-	  return ip_sd_lookup (db, gid_address_vni (dst),
-			       &gid_address_sd_dst_ippref (dst),
-			       &gid_address_sd_src_ippref (dst));
-	  break;
-	case FID_ADDR_MAC:
-	  return mac_sd_lookup (&db->sd_mac_table, gid_address_vni (dst),
-				gid_address_sd_dst_mac (dst),
-				gid_address_sd_src_mac (dst));
-	  break;
-	default:
-	  clib_warning ("Source/Dest address type %d not supported!",
-			gid_address_sd_dst_type (dst));
-	  break;
-	}
-      break;
-    default:
-      clib_warning ("address type %d not supported!", gid_address_type (dst));
-      break;
-    }
-  return GID_LOOKUP_MISS;
-}
-
-static void
-ip4_compute_prefix_lengths_in_search_order (gid_ip4_table_t * db)
-{
-  int i;
-  vec_reset_length (db->ip4_prefix_lengths_in_search_order);
-  /* Note: bitmap reversed so this is in fact a longest prefix match */
-
-  /* *INDENT-OFF* */
-  clib_bitmap_foreach (i, db->ip4_non_empty_dst_address_length_bitmap,
-  ({
-    int dst_address_length = 32 - i;
-    vec_add1 (db->ip4_prefix_lengths_in_search_order, dst_address_length);
-  }));
-  /* *INDENT-ON* */
-
-}
-
-static u32
-add_del_ip4_key (gid_ip4_table_t * db, u32 vni, ip_prefix_t * pref, u32 val,
-		 u8 is_add)
-{
-  BVT (clib_bihash_kv) kv, value;
-  u32 old_val = ~0;
-  ip4_address_t key;
-  u8 plen = ip_prefix_len (pref);
-
-  clib_memcpy (&key, &ip_prefix_v4 (pref), sizeof (key));
-  key.as_u32 &= db->ip4_fib_masks[plen].as_u32;
-  if (is_add)
-    {
-      db->ip4_non_empty_dst_address_length_bitmap =
-	clib_bitmap_set (db->ip4_non_empty_dst_address_length_bitmap,
-			 32 - plen, 1);
-      ip4_compute_prefix_lengths_in_search_order (db);
-
-      db->ip4_prefix_len_refcount[plen]++;
-    }
-  else
-    {
-      ASSERT (db->ip4_prefix_len_refcount[plen] != 0);
-
-      db->ip4_prefix_len_refcount[plen]--;
-
-      if (db->ip4_prefix_len_refcount[plen] == 0)
-	{
-	  db->ip4_non_empty_dst_address_length_bitmap =
-	    clib_bitmap_set (db->ip4_non_empty_dst_address_length_bitmap,
-			     32 - plen, 0);
-	  ip4_compute_prefix_lengths_in_search_order (db);
-	}
-    }
-
-  kv.key[0] = ((u64) vni << 32) | key.as_u32;
-  kv.key[1] = 0;
-  kv.key[2] = 0;
-
-  if (BV (clib_bihash_search) (&db->ip4_lookup_table, &kv, &value) == 0)
-    old_val = value.value;
-
-  if (!is_add)
-    BV (clib_bihash_add_del) (&db->ip4_lookup_table, &kv, 0 /* is_add */ );
-  else
-    {
-      kv.value = val;
-      BV (clib_bihash_add_del) (&db->ip4_lookup_table, &kv, 1 /* is_add */ );
-    }
-  return old_val;
-}
-
-static void
-ip4_lookup_init (gid_ip4_table_t * db)
-{
-  uword i;
-
-  memset (db->ip4_prefix_len_refcount, 0,
-	  sizeof (db->ip4_prefix_len_refcount));
-
-  for (i = 0; i < ARRAY_LEN (db->ip4_fib_masks); i++)
-    {
-      u32 m;
-
-      if (i < 32)
-	m = pow2_mask (i) << (32 - i);
-      else
-	m = ~0;
-      db->ip4_fib_masks[i].as_u32 = clib_host_to_net_u32 (m);
-    }
-  if (db->ip4_lookup_table_nbuckets == 0)
-    db->ip4_lookup_table_nbuckets = IP4_LOOKUP_DEFAULT_HASH_NUM_BUCKETS;
-
-  db->ip4_lookup_table_nbuckets =
-    1 << max_log2 (db->ip4_lookup_table_nbuckets);
-
-  if (db->ip4_lookup_table_size == 0)
-    db->ip4_lookup_table_size = IP4_LOOKUP_DEFAULT_HASH_MEMORY_SIZE;
-
-  BV (clib_bihash_init) (&db->ip4_lookup_table, "ip4 lookup table",
-			 db->ip4_lookup_table_nbuckets,
-			 db->ip4_lookup_table_size);
-}
-
-static u32
-add_del_sd_ip4_key (gid_dictionary_t * db, u32 vni, ip_prefix_t * dst_pref,
-		    ip_prefix_t * src_pref, u32 val, u8 is_add)
-{
-  u32 sfi, old_val = ~0;
-  gid_ip4_table_t *sfib;
-
-  sfi = ip4_lookup_exact_match (&db->dst_ip4_table, vni, dst_pref);
-
-  if (is_add)
-    {
-      if (GID_LOOKUP_MISS == sfi)
-	{
-	  pool_get (db->src_ip4_table_pool, sfib);
-	  ip4_lookup_init (sfib);
-	  add_del_ip4_key (&db->dst_ip4_table, vni, dst_pref,
-			   sfib - db->src_ip4_table_pool, is_add);
-	  if (src_pref)
-	    add_del_ip4_key (sfib, 0 /* vni */ , src_pref, val, is_add);
-	  else
-	    {
-	      ip_prefix_t sp;
-	      memset (&sp, 0, sizeof (sp));
-	      add_del_ip4_key (sfib, 0 /* vni */ , &sp, val, is_add);
-	    }
-	}
-      else
-	{
-	  ASSERT (!pool_is_free_index (db->src_ip4_table_pool, sfi));
-	  sfib = pool_elt_at_index (db->src_ip4_table_pool, sfi);
-	  if (src_pref)
-	    {
-	      old_val = ip4_lookup_exact_match (sfib, 0, src_pref);
-	      add_del_ip4_key (sfib, 0 /* vni */ , src_pref, val, is_add);
-	    }
-	  else
-	    {
-	      ip_prefix_t sp;
-	      memset (&sp, 0, sizeof (sp));
-	      old_val =
-		add_del_ip4_key (sfib, 0 /* vni */ , &sp, val, is_add);
-	    }
-	}
-    }
-  else
-    {
-      if (GID_LOOKUP_MISS != sfi)
-	{
-	  add_del_ip4_key (&db->dst_ip4_table, vni, dst_pref, 0, is_add);
-	  sfib = pool_elt_at_index (db->src_ip4_table_pool, sfi);
-	  if (src_pref)
-	    old_val = add_del_ip4_key (sfib, 0, src_pref, 0, is_add);
-	  else
-	    {
-	      ip_prefix_t sp;
-	      memset (&sp, 0, sizeof (sp));
-	      old_val = add_del_ip4_key (sfib, 0, &sp, 0, is_add);
-	    }
-	}
-      else
-	clib_warning ("cannot delete dst mapping %U!", format_ip_prefix,
-		      dst_pref);
-    }
-  return old_val;
-}
-
-static void
-ip6_compute_prefix_lengths_in_search_order (gid_ip6_table_t * db)
-{
-  int i;
-  vec_reset_length (db->ip6_prefix_lengths_in_search_order);
-  /* Note: bitmap reversed so this is in fact a longest prefix match */
-
-  /* *INDENT-OFF* */
-  clib_bitmap_foreach (i, db->ip6_non_empty_dst_address_length_bitmap,
-  ({
-    int dst_address_length = 128 - i;
-    vec_add1 (db->ip6_prefix_lengths_in_search_order, dst_address_length);
-  }));
-  /* *INDENT-ON* */
-}
-
-static u32
-add_del_ip6_key (gid_ip6_table_t * db, u32 vni, ip_prefix_t * pref, u32 val,
-		 u8 is_add)
-{
-  BVT (clib_bihash_kv) kv, value;
-  u32 old_val = ~0;
-  ip6_address_t key;
-  u8 plen = ip_prefix_len (pref);
-
-  clib_memcpy (&key, &ip_prefix_v6 (pref), sizeof (key));
-  ip6_address_mask (&key, &db->ip6_fib_masks[plen]);
-  if (is_add)
-    {
-      db->ip6_non_empty_dst_address_length_bitmap =
-	clib_bitmap_set (db->ip6_non_empty_dst_address_length_bitmap,
-			 128 - plen, 1);
-      ip6_compute_prefix_lengths_in_search_order (db);
-      db->ip6_prefix_len_refcount[plen]++;
-    }
-  else
-    {
-      ASSERT (db->ip6_prefix_len_refcount[plen] != 0);
-
-      db->ip6_prefix_len_refcount[plen]--;
-
-      if (db->ip6_prefix_len_refcount[plen] == 0)
-	{
-	  db->ip6_non_empty_dst_address_length_bitmap =
-	    clib_bitmap_set (db->ip6_non_empty_dst_address_length_bitmap,
-			     128 - plen, 0);
-	  ip6_compute_prefix_lengths_in_search_order (db);
-	}
-    }
-
-  kv.key[0] = key.as_u64[0];
-  kv.key[1] = key.as_u64[1];
-  kv.key[2] = (u64) vni;
-//  kv.key[2] = ((u64)((fib - im->fibs))<<32) | ip_prefix_len(key);
-
-  if (BV (clib_bihash_search) (&db->ip6_lookup_table, &kv, &value) == 0)
-    old_val = value.value;
-
-  if (!is_add)
-    BV (clib_bihash_add_del) (&db->ip6_lookup_table, &kv, 0 /* is_add */ );
-  else
-    {
-      kv.value = val;
-      BV (clib_bihash_add_del) (&db->ip6_lookup_table, &kv, 1 /* is_add */ );
-    }
-  return old_val;
-}
-
-static u32
-add_del_mac (gid_mac_table_t * db, u32 vni, u8 * dst_mac, u8 * src_mac,
-	     u32 val, u8 is_add)
-{
-  BVT (clib_bihash_kv) kv, value;
-  u32 old_val = ~0;
-
-  make_mac_sd_key (&kv, vni, src_mac, dst_mac);
-
-  if (BV (clib_bihash_search) (&db->mac_lookup_table, &kv, &value) == 0)
-    old_val = value.value;
-
-  if (!is_add)
-    BV (clib_bihash_add_del) (&db->mac_lookup_table, &kv, 0 /* is_add */ );
-  else
-    {
-      kv.value = val;
-      BV (clib_bihash_add_del) (&db->mac_lookup_table, &kv, 1 /* is_add */ );
-    }
-  return old_val;
-}
-
-static void
-ip6_lookup_init (gid_ip6_table_t * db)
-{
-  uword i;
-
-  memset (db->ip6_prefix_len_refcount, 0,
-	  sizeof (db->ip6_prefix_len_refcount));
-
-  for (i = 0; i < ARRAY_LEN (db->ip6_fib_masks); i++)
-    {
-      u32 j, i0, i1;
-
-      i0 = i / 32;
-      i1 = i % 32;
-
-      for (j = 0; j < i0; j++)
-	db->ip6_fib_masks[i].as_u32[j] = ~0;
-
-      if (i1)
-	db->ip6_fib_masks[i].as_u32[i0] =
-	  clib_host_to_net_u32 (pow2_mask (i1) << (32 - i1));
-    }
-
-  if (db->ip6_lookup_table_nbuckets == 0)
-    db->ip6_lookup_table_nbuckets = IP6_LOOKUP_DEFAULT_HASH_NUM_BUCKETS;
-
-  db->ip6_lookup_table_nbuckets =
-    1 << max_log2 (db->ip6_lookup_table_nbuckets);
-
-  if (db->ip6_lookup_table_size == 0)
-    db->ip6_lookup_table_size = IP6_LOOKUP_DEFAULT_HASH_MEMORY_SIZE;
-
-  BV (clib_bihash_init) (&db->ip6_lookup_table, "ip6 lookup table",
-			 db->ip6_lookup_table_nbuckets,
-			 db->ip6_lookup_table_size);
-}
-
-static u32
-add_del_sd_ip6_key (gid_dictionary_t * db, u32 vni, ip_prefix_t * dst_pref,
-		    ip_prefix_t * src_pref, u32 val, u8 is_add)
-{
-  u32 sfi, old_val = ~0;
-  gid_ip6_table_t *sfib;
-
-  sfi = ip6_lookup_exact_match (&db->dst_ip6_table, vni, dst_pref);
-
-  if (is_add)
-    {
-      if (GID_LOOKUP_MISS == sfi)
-	{
-	  pool_get (db->src_ip6_table_pool, sfib);
-	  ip6_lookup_init (sfib);
-	  add_del_ip6_key (&db->dst_ip6_table, vni, dst_pref,
-			   sfib - db->src_ip6_table_pool, is_add);
-	  if (src_pref)
-	    add_del_ip6_key (sfib, 0 /* vni */ , src_pref, val, is_add);
-	  else
-	    {
-	      ip_prefix_t sp;
-	      memset (&sp, 0, sizeof (sp));
-	      ip_prefix_version (&sp) = IP6;
-	      add_del_ip6_key (sfib, 0 /* vni */ , &sp, val, is_add);
-	    }
-	}
-      else
-	{
-	  ASSERT (!pool_is_free_index (db->src_ip6_table_pool, sfi));
-	  sfib = pool_elt_at_index (db->src_ip6_table_pool, sfi);
-	  if (src_pref)
-	    {
-	      old_val = ip6_lookup_exact_match (sfib, 0, src_pref);
-	      add_del_ip6_key (sfib, 0 /* vni */ , src_pref, val, is_add);
-	    }
-	  else
-	    {
-	      ip_prefix_t sp;
-	      memset (&sp, 0, sizeof (sp));
-	      ip_prefix_version (&sp) = IP6;
-	      old_val =
-		add_del_ip6_key (sfib, 0 /* vni */ , &sp, val, is_add);
-	    }
-	}
-    }
-  else
-    {
-      if (GID_LOOKUP_MISS != sfi)
-	{
-	  add_del_ip6_key (&db->dst_ip6_table, vni, dst_pref, 0, is_add);
-	  sfib = pool_elt_at_index (db->src_ip6_table_pool, sfi);
-	  if (src_pref)
-	    old_val = add_del_ip6_key (sfib, 0, src_pref, 0, is_add);
-	  else
-	    {
-	      ip_prefix_t sp;
-	      memset (&sp, 0, sizeof (sp));
-	      ip_prefix_version (&sp) = IP6;
-	      old_val = add_del_ip6_key (sfib, 0, &sp, 0, is_add);
-	    }
-	}
-      else
-	clib_warning ("cannot delete dst mapping %U!", format_ip_prefix,
-		      dst_pref);
-    }
-  return old_val;
-}
-
-static u32
-add_del_ip (gid_dictionary_t * db, u32 vni, ip_prefix_t * dst_key,
-	    ip_prefix_t * src_key, u32 value, u8 is_add)
-{
-  switch (ip_prefix_version (dst_key))
-    {
-    case IP4:
-      return add_del_sd_ip4_key (db, vni, dst_key, src_key, value, is_add);
-      break;
-    case IP6:
-      return add_del_sd_ip6_key (db, vni, dst_key, src_key, value, is_add);
-      break;
-    default:
-      clib_warning ("address type %d not supported!",
-		    ip_prefix_version (dst_key));
-      break;
-    }
-  return ~0;
-}
-
-static u32
-add_del_sd (gid_dictionary_t * db, u32 vni, source_dest_t * key, u32 value,
-	    u8 is_add)
-{
-  switch (sd_dst_type (key))
-    {
-    case FID_ADDR_IP_PREF:
-      add_del_ip (db, vni, &sd_dst_ippref (key), &sd_src_ippref (key),
-		  value, is_add);
-
-    case FID_ADDR_MAC:
-      return add_del_mac (&db->sd_mac_table, vni, sd_dst_mac (key),
-			  sd_src_mac (key), value, is_add);
-
-    default:
-      clib_warning ("SD address type %d not supprted!", sd_dst_type (key));
-      break;
-    }
-
-  return ~0;
-}
-
-u32
-gid_dictionary_add_del (gid_dictionary_t * db, gid_address_t * key, u32 value,
-			u8 is_add)
-{
-  switch (gid_address_type (key))
-    {
-    case GID_ADDR_IP_PREFIX:
-      return add_del_ip (db, gid_address_vni (key), &gid_address_ippref (key),
-			 0, value, is_add);
-    case GID_ADDR_MAC:
-      return add_del_mac (&db->sd_mac_table, gid_address_vni (key),
-			  gid_address_mac (key), 0, value, is_add);
-    case GID_ADDR_SRC_DST:
-      return add_del_sd (db, gid_address_vni (key), &gid_address_sd (key),
-			 value, is_add);
-    default:
-      clib_warning ("address type %d not supported!", gid_address_type (key));
-      break;
-    }
-  return ~0;
-}
-
-static void
-mac_lookup_init (gid_mac_table_t * db)
-{
-  if (db->mac_lookup_table_nbuckets == 0)
-    db->mac_lookup_table_nbuckets = MAC_LOOKUP_DEFAULT_HASH_NUM_BUCKETS;
-
-  db->mac_lookup_table_nbuckets =
-    1 << max_log2 (db->mac_lookup_table_nbuckets);
-
-  if (db->mac_lookup_table_size == 0)
-    db->mac_lookup_table_size = MAC_LOOKUP_DEFAULT_HASH_MEMORY_SIZE;
-
-  BV (clib_bihash_init) (&db->mac_lookup_table, "mac lookup table",
-			 db->mac_lookup_table_nbuckets,
-			 db->mac_lookup_table_size);
-}
-
-void
-gid_dictionary_init (gid_dictionary_t * db)
-{
-  ip4_lookup_init (&db->dst_ip4_table);
-  ip6_lookup_init (&db->dst_ip6_table);
-  mac_lookup_init (&db->sd_mac_table);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-cp/gid_dictionary.h b/vnet/vnet/lisp-cp/gid_dictionary.h
deleted file mode 100644
index c5aaf8cb..00000000
--- a/vnet/vnet/lisp-cp/gid_dictionary.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef VNET_LISP_GPE_GID_DICTIONARY_H_
-#define VNET_LISP_GPE_GID_DICTIONARY_H_
-
-#include <vnet/vnet.h>
-#include <vnet/lisp-cp/lisp_types.h>
-#include <vppinfra/bihash_24_8.h>
-#include <vppinfra/bihash_template.h>
-
-#define GID_LOOKUP_MISS ((u32)~0)
-
-/* Default size of the ip4 hash table */
-#define IP4_LOOKUP_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
-#define IP4_LOOKUP_DEFAULT_HASH_MEMORY_SIZE (32<<20)
-
-/* Default size of the ip6 hash table */
-#define IP6_LOOKUP_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
-#define IP6_LOOKUP_DEFAULT_HASH_MEMORY_SIZE (32<<20)
-
-/* Default size of the MAC hash table */
-#define MAC_LOOKUP_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
-#define MAC_LOOKUP_DEFAULT_HASH_MEMORY_SIZE (32<<20)
-
-typedef void (*foreach_subprefix_match_cb_t) (u32, void *);
-
-typedef struct
-{
-  BVT (clib_bihash) ip4_lookup_table;
-
-  /* bitmap/vector of mask widths to search */
-  uword *ip4_non_empty_dst_address_length_bitmap;
-  u8 *ip4_prefix_lengths_in_search_order;
-  ip4_address_t ip4_fib_masks[33];
-  u32 ip4_prefix_len_refcount[33];
-
-  /* ip4 lookup table config parameters */
-  u32 ip4_lookup_table_nbuckets;
-  uword ip4_lookup_table_size;
-} gid_ip4_table_t;
-
-typedef struct
-{
-  BVT (clib_bihash) ip6_lookup_table;
-
-  /* bitmap/vector of mask widths to search */
-  uword *ip6_non_empty_dst_address_length_bitmap;
-  u8 *ip6_prefix_lengths_in_search_order;
-  ip6_address_t ip6_fib_masks[129];
-  u64 ip6_prefix_len_refcount[129];
-
-  /* ip6 lookup table config parameters */
-  u32 ip6_lookup_table_nbuckets;
-  uword ip6_lookup_table_size;
-} gid_ip6_table_t;
-
-typedef struct gid_mac_table
-{
-  BVT (clib_bihash) mac_lookup_table;
-
-  /* mac lookup table config parameters */
-  u32 mac_lookup_table_nbuckets;
-  uword mac_lookup_table_size;
-} gid_mac_table_t;
-
-typedef struct
-{
-  /** destination IP LPM ip4 lookup table */
-  gid_ip4_table_t dst_ip4_table;
-
-  /** pool of source IP LPM ip4 lookup tables */
-  gid_ip4_table_t *src_ip4_table_pool;
-
-  /** destination IP LPM ip6 lookup table */
-  gid_ip6_table_t dst_ip6_table;
-
-  /** pool of source IP LPM ip6 lookup tables */
-  gid_ip6_table_t *src_ip6_table_pool;
-
-  /** flat source/dest mac lookup table */
-  gid_mac_table_t sd_mac_table;
-
-} gid_dictionary_t;
-
-u32
-gid_dictionary_add_del (gid_dictionary_t * db, gid_address_t * key, u32 value,
-			u8 is_add);
-
-u32 gid_dictionary_lookup (gid_dictionary_t * db, gid_address_t * key);
-u32 gid_dictionary_sd_lookup (gid_dictionary_t * db, gid_address_t * dst,
-			      gid_address_t * src);
-
-void gid_dictionary_init (gid_dictionary_t * db);
-
-void
-gid_dict_foreach_subprefix (gid_dictionary_t * db, gid_address_t * eid,
-			    foreach_subprefix_match_cb_t cb, void *arg);
-
-#endif /* VNET_LISP_GPE_GID_DICTIONARY_H_ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-cp/lisp.api b/vnet/vnet/lisp-cp/lisp.api
deleted file mode 100644
index 20c17aa3..00000000
--- a/vnet/vnet/lisp-cp/lisp.api
+++ /dev/null
@@ -1,835 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \brief add or delete locator_set
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add address if non-zero, else delete
-    @param locator_set_name - locator name
-    @param locator_num - number of locators
-    @param locators - LISP locator records
-        Structure of one locator record is as follows:
-
-        define locator_t {
-          u32 sw_if_index;
-          u8 priority;
-          u8 weight;
-        }
-*/
-define lisp_add_del_locator_set
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 locator_set_name[64];
-  u32 locator_num;
-  u8 locators[0];
-};
-
-/** \brief Reply for locator_set add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-    @param ls_index - locator set index
-*/
-define lisp_add_del_locator_set_reply
-{
-  u32 context;
-  i32 retval;
-  u32 ls_index;
-};
-
-/** \brief add or delete locator for locator_set
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add address if non-zero, else delete
-    @param locator_set_name - name of locator_set to add/del locator
-    @param sw_if_index - index of the interface
-    @param priority - priority of the lisp locator
-    @param weight - weight of the lisp locator
-*/
-define lisp_add_del_locator
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 locator_set_name[64];
-  u32 sw_if_index;
-  u8 priority;
-  u8 weight;
-};
-
-/** \brief Reply for locator add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_locator_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief add or delete lisp eid-table
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add address if non-zero, else delete
-    @param eid_type:
-      0 : ipv4
-      1 : ipv6
-      2 : mac
-    @param eid - EID can be ip4, ip6 or mac
-    @param prefix_len - prefix len
-    @param locator_set_name - name of locator_set to add/del eid-table
-    @param vni - virtual network instance
-    @param key_id
-      HMAC_NO_KEY           0
-      HMAC_SHA_1_96         1
-      HMAC_SHA_256_128      2
-    @param key - secret key
-*/
-define lisp_add_del_local_eid
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 eid_type;
-  u8 eid[16];
-  u8 prefix_len;
-  u8 locator_set_name[64];
-  u32 vni;
-  u16 key_id;
-  u8 key[64];
-};
-
-/** \brief Reply for local_eid add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_local_eid_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Add/delete map server
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add address if non-zero; delete otherwise
-    @param is_ipv6 - if non-zero the address is ipv6, else ipv4
-    @param ip_address - map server IP address
-*/
-define lisp_add_del_map_server
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 is_ipv6;
-  u8 ip_address[16];
-};
-
-/** \brief Reply for lisp_add_del_map_server
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_map_server_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief add or delete map-resolver
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add address if non-zero, else delete
-    @param is_ipv6 - if non-zero the address is ipv6, else ipv4
-    @param ip_address - array of address bytes
-*/
-define lisp_add_del_map_resolver
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 is_ipv6;
-  u8 ip_address[16];
-};
-
-/** \brief Reply for map_resolver add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_map_resolver_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief enable or disable LISP feature
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_en - enable protocol if non-zero, else disable
-*/
-define lisp_enable_disable
-{
-  u32 client_index;
-  u32 context;
-  u8 is_en;
-};
-
-/** \brief Reply for gpe enable/disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief configure or disable LISP PITR node
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param ls_name - locator set name
-    @param is_add - add locator set if non-zero, else disable pitr
-*/
-define lisp_pitr_set_locator_set
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 ls_name[64];
-};
-
-/** \brief Reply for lisp_pitr_set_locator_set
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_pitr_set_locator_set_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Get state of LISP RLOC probing
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define show_lisp_rloc_probe_state
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Reply for show_lisp_rloc_probe_state
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-    @param is_enabled - state of RLOC probing
-*/
-define show_lisp_rloc_probe_state_reply
-{
-  u32 context;
-  i32 retval;
-  u8 is_enabled;
-};
-
-/** \brief enable/disable LISP RLOC probing
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_enable - enable if non-zero; disable otherwise
-*/
-define lisp_rloc_probe_enable_disable
-{
-  u32 client_index;
-  u32 context;
-  u8 is_enabled;
-};
-
-/** \brief Reply for lisp_rloc_probe_enable_disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_rloc_probe_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief enable/disable LISP map-register
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_enable - enable if non-zero; disable otherwise
-*/
-define lisp_map_register_enable_disable
-{
-  u32 client_index;
-  u32 context;
-  u8 is_enabled;
-};
-
-/** \brief Reply for lisp_map_register_enable_disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_map_register_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Get state of LISP map-register
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define show_lisp_map_register_state
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Reply for show_lisp_map_register_state
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define show_lisp_map_register_state_reply
-{
-  u32 context;
-  i32 retval;
-  u8 is_enabled;
-};
-
-/** \brief set LISP map-request mode. Based on configuration VPP will send
-      src/dest or just normal destination map requests.
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param mode - new map-request mode. Supported values are:
-      0 - destination only
-      1 - source/destaination
-*/
-define lisp_map_request_mode
-{
-  u32 client_index;
-  u32 context;
-  u8 mode;
-};
-
-/** \brief Reply for lisp_map_request_mode
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_map_request_mode_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Request for LISP map-request mode
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define show_lisp_map_request_mode
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Reply for show_lisp_map_request_mode
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-    @param mode - map-request mode
-*/
-define show_lisp_map_request_mode_reply
-{
-  u32 context;
-  i32 retval;
-  u8 mode;
-};
-
-/** \brief add or delete remote static mapping
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add address if non-zero, else delete
-    @param is_src_dst - flag indicating src/dst based routing policy
-    @param del_all - if set, delete all remote mappings
-    @param vni - virtual network instance
-    @param action - negative map-reply action
-    @param eid_type -
-      0 : ipv4
-      1 : ipv6
-      2 : mac
-    @param deid - dst EID
-    @param seid - src EID, valid only if is_src_dst is enabled
-    @param rloc_num - number of remote locators
-    @param rlocs - remote locator records
-        Structure of remote locator:
-
-        define rloc_t {
-          u8 is_ip4;
-          u8 priority;
-          u8 weight;
-          u8 addr[16];
-        }
-*/
-define lisp_add_del_remote_mapping
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 is_src_dst;
-  u8 del_all;
-  u32 vni;
-  u8 action;
-  u8 eid_type;
-  u8 eid[16];
-  u8 eid_len;
-  u8 seid[16];
-  u8 seid_len;
-  u32 rloc_num;
-  u8 rlocs[0];
-};
-
-/** \brief Reply for lisp_add_del_remote_mapping
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_remote_mapping_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief add or delete LISP adjacency adjacency
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add address if non-zero, else delete
-    @param vni - virtual network instance
-    @param eid_type -
-      0 : ipv4
-      1 : ipv6
-      2 : mac
-    @param reid - remote EID
-    @param leid - local EID
-*/
-define lisp_add_del_adjacency
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u32 vni;
-  u8 eid_type;
-  u8 reid[16];
-  u8 leid[16];
-  u8 reid_len;
-  u8 leid_len;
-};
-
-/** \brief Reply for lisp_add_del_adjacency
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_adjacency_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief add or delete map request itr rlocs
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add address if non-zero, else delete
-    @param locator_set_name - locator set name
-*/
-define lisp_add_del_map_request_itr_rlocs
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 locator_set_name[64];
-};
-
-/** \brief Reply for lisp_add_del_map_request_itr_rlocs
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define lisp_add_del_map_request_itr_rlocs_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief map/unmap vni/bd_index to vrf
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add or delete mapping
-    @param dp_table - virtual network id/bridge domain index
-    @param vrf - vrf
-*/
-define lisp_eid_table_add_del_map
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u32 vni;
-  u32 dp_table;
-  u8 is_l2;
-};
-
-/** \brief Reply for lisp_eid_table_add_del_map
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_eid_table_add_del_map_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Request for map lisp locator status
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param locator_set_index - index of locator_set
-    @param ls_name - locator set name
-    @param is_index_set - flag indicating whether ls_name or ls_index is set
- */
-define lisp_locator_dump
-{
-  u32 client_index;
-  u32 context;
-  u32 ls_index;
-  u8 ls_name[64];
-  u8 is_index_set;
-};
-
-/** \brief LISP locator_set status
-    @param local - if is set, then locator is local
-    @param locator_set_name - name of the locator_set
-    @param sw_if_index - sw_if_index of the locator
-    @param priority - locator priority
-    @param weight - locator weight
-  */
-define lisp_locator_details
-{
-  u32 context;
-  u8 local;
-  u32 sw_if_index;
-  u8 is_ipv6;
-  u8 ip_address[16];
-  u8 priority;
-  u8 weight;
-};
-
-/** \brief LISP locator_set status
-    @param context - sender context, to match reply w/ request
-    @param ls_index - locator set index
-    @param ls_name - name of the locator set
- */
-define lisp_locator_set_details
-{
-  u32 context;
-  u32 ls_index;
-  u8 ls_name[64];
-};
-
-/** \brief Request for locator_set summary status
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param filter - filter type
-      Supported values:
-        0: all locator sets
-        1: local locator sets
-        2: remote locator sets
- */
-define lisp_locator_set_dump
-{
-  u32 client_index;
-  u32 context;
-  u8 filter;
-};
-
-/** \brief Dump lisp eid-table
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param locator_set_index - index of locator_set, if ~0 then the mapping
-                                is negative
-    @param action - negative map request action
-    @param is_local - local if non-zero, else remote
-    @param eid_type:
-      0 : ipv4
-      1 : ipv6
-      2 : mac
-    @param is_src_dst - EID is type of source/destination
-    @param eid - EID can be ip4, ip6 or mac
-    @param eid_prefix_len - prefix length
-    @param seid - source EID can be ip4, ip6 or mac
-    @param seid_prefix_len - source prefix length
-    @param vni - virtual network instance
-    @param ttl - time to live
-    @param authoritative - authoritative
-    @param key_id
-      HMAC_NO_KEY           0
-      HMAC_SHA_1_96         1
-      HMAC_SHA_256_128      2
-    @param key - secret key
-*/
-
-define lisp_eid_table_details
-{
-  u32 context;
-  u32 locator_set_index;
-  u8 action;
-  u8 is_local;
-  u8 eid_type;
-  u8 is_src_dst;
-  u32 vni;
-  u8 eid[16];
-  u8 eid_prefix_len;
-  u8 seid[16];
-  u8 seid_prefix_len;
-  u32 ttl;
-  u8 authoritative;
-  u16 key_id;
-  u8 key[64];
-};
-
-/** \brief Request for eid table summary status
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param eid_set - if non-zero request info about specific mapping
-    @param vni - virtual network instance; valid only if eid_set != 0
-    @param prefix_length - prefix length if EID is IP address;
-      valid only if eid_set != 0
-    @param eid_type - EID type; valid only if eid_set != 0
-      Supported values:
-        0: EID is IPv4
-        1: EID is IPv6
-        2: EID is ethernet address
-    @param eid - endpoint identifier
-    @param filter - filter type;
-      Support values:
-        0: all eid
-        1: local eid
-        2: remote eid
- */
-define lisp_eid_table_dump
-{
-  u32 client_index;
-  u32 context;
-  u8 eid_set;
-  u8 prefix_length;
-  u32 vni;
-  u8 eid_type;
-  u8 eid[16];
-  u8 filter;
-};
-
-/** \brief LISP adjacency
-    @param eid_type -
-      0 : ipv4
-      1 : ipv6
-      2 : mac
-    @param reid - remote EID
-    @param leid - local EID
-    @param reid_prefix_len - remote EID IP prefix length
-    @param leid_prefix_len - local EID IP prefix length
-  */
-typeonly manual_print manual_endian define lisp_adjacency
-{
-  u8 eid_type;
-  u8 reid[16];
-  u8 leid[16];
-  u8 reid_prefix_len;
-  u8 leid_prefix_len;
-};
-
-/** \brief LISP adjacency reply
-    @param count - number of adjacencies
-    @param adjacencies - array of adjacencies
-  */
-manual_endian manual_print define lisp_adjacencies_get_reply
-{
-  u32 context;
-  i32 retval;
-  u32 count;
-  vl_api_lisp_adjacency_t adjacencies[count];
-};
-
-/** \brief Request for LISP adjacencies
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param vni - filter adjacencies by VNI
- */
-define lisp_adjacencies_get
-{
-  u32 client_index;
-  u32 context;
-  u32 vni;
-};
-
-/** \brief Shows relationship between vni and vrf/bd
-    @param dp_table - VRF index or bridge domain index
-    @param vni - vitual network instance
-  */
-define lisp_eid_table_map_details
-{
-  u32 context;
-  u32 vni;
-  u32 dp_table;
-};
-
-/** \brief Request for lisp_eid_table_map_details
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_l2 - if set dump vni/bd mappings else vni/vrf
- */
-define lisp_eid_table_map_dump
-{
-  u32 client_index;
-  u32 context;
-  u8 is_l2;
-};
-
-/** \brief Dumps all VNIs used in mappings
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-  */
-define lisp_eid_table_vni_dump
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief reply to lisp_eid_table_vni_dump
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param vni - virtual network instance
- */
-define lisp_eid_table_vni_details
-{
-  u32 client_index;
-  u32 context;
-  u32 vni;
-};
-
-/** \brief LISP map resolver status
-    @param is_ipv6 - if non-zero the address is ipv6, else ipv4
-    @param ip_address - array of address bytes
- */
-define lisp_map_resolver_details
-{
-  u32 context;
-  u8 is_ipv6;
-  u8 ip_address[16];
-};
-
-/** \brief Request for map resolver summary status
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
- */
-define lisp_map_resolver_dump
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief LISP map server details
-    @param is_ipv6 - if non-zero the address is ipv6, else ipv4
-    @param ip_address - array of address bytes
- */
-define lisp_map_server_details
-{
-  u32 context;
-  u8 is_ipv6;
-  u8 ip_address[16];
-};
-
-/** \brief Request for map server summary status
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
- */
-define lisp_map_server_dump
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Request for lisp-gpe protocol status
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define show_lisp_status
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Status of lisp, enable or disable
-    @param context - sender context, to match reply w/ request
-    @param feature_status - lisp enable if non-zero, else disable
-    @param gpe_status - lisp enable if non-zero, else disable
-*/
-define show_lisp_status_reply
-{
-  u32 context;
-  i32 retval;
-  u8 feature_status;
-  u8 gpe_status;
-};
-
-/** \brief Get LISP map request itr rlocs status
-    @param context - sender context, to match reply w/ request
-    @param locator_set_name - name of the locator_set
- */
-define lisp_get_map_request_itr_rlocs
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Request for map request itr rlocs summary status
- */
-define lisp_get_map_request_itr_rlocs_reply
-{
-  u32 context;
-  i32 retval;
-  u8 locator_set_name[64];
-};
-
-/** \brief Request for lisp pitr status
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define show_lisp_pitr
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Status of lisp pitr, enable or disable
-    @param context - sender context, to match reply w/ request
-    @param status - lisp pitr enable if non-zero, else disable
-    @param locator_set_name -  name of the locator_set
-*/
-define show_lisp_pitr_reply
-{
-  u32 context;
-  i32 retval;
-  u8 status;
-  u8 locator_set_name[64];
-};
-
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
- 
\ No newline at end of file
diff --git a/vnet/vnet/lisp-cp/lisp_api.c b/vnet/vnet/lisp-cp/lisp_api.c
deleted file mode 100644
index d3fc4627..00000000
--- a/vnet/vnet/lisp-cp/lisp_api.c
+++ /dev/null
@@ -1,1257 +0,0 @@
-/*
- *------------------------------------------------------------------
- * lisp_api.c - lisp api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/lisp-cp/control.h>
-#include <vnet/lisp-gpe/lisp_gpe.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                             \
-_(LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set)                   \
-_(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator)                           \
-_(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid)                       \
-_(LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver)                 \
-_(LISP_ADD_DEL_MAP_SERVER, lisp_add_del_map_server)                     \
-_(LISP_ENABLE_DISABLE, lisp_enable_disable)                             \
-_(LISP_RLOC_PROBE_ENABLE_DISABLE, lisp_rloc_probe_enable_disable)       \
-_(LISP_MAP_REGISTER_ENABLE_DISABLE, lisp_map_register_enable_disable)   \
-_(LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping)             \
-_(LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency)                       \
-_(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set)                 \
-_(LISP_MAP_REQUEST_MODE, lisp_map_request_mode)                         \
-_(LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map)               \
-_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump)                         \
-_(LISP_LOCATOR_DUMP, lisp_locator_dump)                                 \
-_(LISP_EID_TABLE_DUMP, lisp_eid_table_dump)                             \
-_(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump)                       \
-_(LISP_MAP_SERVER_DUMP, lisp_map_server_dump)                           \
-_(LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump)                     \
-_(LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_dump)                     \
-_(LISP_ADJACENCIES_GET, lisp_adjacencies_get)                           \
-_(SHOW_LISP_RLOC_PROBE_STATE, show_lisp_rloc_probe_state)               \
-_(SHOW_LISP_MAP_REGISTER_STATE, show_lisp_map_register_state)           \
-_(SHOW_LISP_STATUS, show_lisp_status)                                   \
-_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS,                                   \
-  lisp_add_del_map_request_itr_rlocs)                                   \
-_(LISP_GET_MAP_REQUEST_ITR_RLOCS, lisp_get_map_request_itr_rlocs)       \
-_(SHOW_LISP_PITR, show_lisp_pitr)                                       \
-_(SHOW_LISP_MAP_REQUEST_MODE, show_lisp_map_request_mode)               \
-
-/** Used for transferring locators via VPP API */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u8 is_ip4; /**< is locator an IPv4 address */
-  u8 priority; /**< locator priority */
-  u8 weight; /**< locator weight */
-  u8 addr[16]; /**< IPv4/IPv6 address */
-}) rloc_t;
-/* *INDENT-ON* */
-
-/** Used for transferring locators via VPP API */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u32 sw_if_index; /**< locator sw_if_index */
-  u8 priority; /**< locator priority */
-  u8 weight; /**< locator weight */
-}) ls_locator_t;
-/* *INDENT-ON* */
-
-static locator_t *
-unformat_lisp_locs (void *rmt_locs, u32 rloc_num)
-{
-  u32 i;
-  locator_t *locs = 0, loc;
-  rloc_t *r;
-
-  for (i = 0; i < rloc_num; i++)
-    {
-      /* remote locators */
-      r = &((rloc_t *) rmt_locs)[i];
-      memset (&loc, 0, sizeof (loc));
-      gid_address_ip_set (&loc.address, &r->addr, r->is_ip4 ? IP4 : IP6);
-
-      loc.priority = r->priority;
-      loc.weight = r->weight;
-
-      vec_add1 (locs, loc);
-    }
-  return locs;
-}
-
-static void
-vl_api_lisp_add_del_locator_set_t_handler (vl_api_lisp_add_del_locator_set_t *
-					   mp)
-{
-  vl_api_lisp_add_del_locator_set_reply_t *rmp;
-  int rv = 0;
-  vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
-  locator_t locator;
-  ls_locator_t *ls_loc;
-  u32 ls_index = ~0, locator_num;
-  u8 *locator_name = NULL;
-  int i;
-
-  memset (a, 0, sizeof (a[0]));
-
-  locator_name = format (0, "%s", mp->locator_set_name);
-
-  a->name = locator_name;
-  a->is_add = mp->is_add;
-  a->local = 1;
-  locator_num = clib_net_to_host_u32 (mp->locator_num);
-
-  memset (&locator, 0, sizeof (locator));
-  for (i = 0; i < locator_num; i++)
-    {
-      ls_loc = &((ls_locator_t *) mp->locators)[i];
-      VALIDATE_SW_IF_INDEX (ls_loc);
-
-      locator.sw_if_index = htonl (ls_loc->sw_if_index);
-      locator.priority = ls_loc->priority;
-      locator.weight = ls_loc->weight;
-      locator.local = 1;
-      vec_add1 (a->locators, locator);
-    }
-
-  rv = vnet_lisp_add_del_locator_set (a, &ls_index);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  vec_free (locator_name);
-  vec_free (a->locators);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2 (VL_API_LISP_ADD_DEL_LOCATOR_SET_REPLY,
-  ({
-    rmp->ls_index = clib_host_to_net_u32 (ls_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_lisp_add_del_locator_t_handler (vl_api_lisp_add_del_locator_t * mp)
-{
-  vl_api_lisp_add_del_locator_reply_t *rmp;
-  int rv = 0;
-  locator_t locator, *locators = NULL;
-  vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
-  u32 ls_index = ~0;
-  u8 *locator_name = NULL;
-
-  memset (&locator, 0, sizeof (locator));
-  memset (a, 0, sizeof (a[0]));
-
-  locator.sw_if_index = ntohl (mp->sw_if_index);
-  locator.priority = mp->priority;
-  locator.weight = mp->weight;
-  locator.local = 1;
-  vec_add1 (locators, locator);
-
-  locator_name = format (0, "%s", mp->locator_set_name);
-
-  a->name = locator_name;
-  a->locators = locators;
-  a->is_add = mp->is_add;
-  a->local = 1;
-
-  rv = vnet_lisp_add_del_locator (a, NULL, &ls_index);
-
-  vec_free (locators);
-  vec_free (locator_name);
-
-  REPLY_MACRO (VL_API_LISP_ADD_DEL_LOCATOR_REPLY);
-}
-
-static int
-unformat_lisp_eid_api (gid_address_t * dst, u32 vni, u8 type, void *src,
-		       u8 len)
-{
-  switch (type)
-    {
-    case 0:			/* ipv4 */
-      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
-      gid_address_ip_set (dst, src, IP4);
-      gid_address_ippref_len (dst) = len;
-      ip_prefix_normalize (&gid_address_ippref (dst));
-      break;
-    case 1:			/* ipv6 */
-      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
-      gid_address_ip_set (dst, src, IP6);
-      gid_address_ippref_len (dst) = len;
-      ip_prefix_normalize (&gid_address_ippref (dst));
-      break;
-    case 2:			/* l2 mac */
-      gid_address_type (dst) = GID_ADDR_MAC;
-      clib_memcpy (&gid_address_mac (dst), src, 6);
-      break;
-    default:
-      /* unknown type */
-      return VNET_API_ERROR_INVALID_VALUE;
-    }
-
-  gid_address_vni (dst) = vni;
-
-  return 0;
-}
-
-static void
-vl_api_lisp_add_del_local_eid_t_handler (vl_api_lisp_add_del_local_eid_t * mp)
-{
-  vl_api_lisp_add_del_local_eid_reply_t *rmp;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  int rv = 0;
-  gid_address_t _eid, *eid = &_eid;
-  uword *p = NULL;
-  u32 locator_set_index = ~0, map_index = ~0;
-  vnet_lisp_add_del_mapping_args_t _a, *a = &_a;
-  u8 *name = NULL, *key = NULL;
-  memset (a, 0, sizeof (a[0]));
-  memset (eid, 0, sizeof (eid[0]));
-
-  rv = unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
-			      mp->eid_type, mp->eid, mp->prefix_len);
-  if (rv)
-    goto out;
-
-  name = format (0, "%s", mp->locator_set_name);
-  p = hash_get_mem (lcm->locator_set_index_by_name, name);
-  if (!p)
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto out;
-    }
-  locator_set_index = p[0];
-
-  if (*mp->key)
-    key = format (0, "%s", mp->key);
-
-  /* XXX treat batch configuration */
-  a->is_add = mp->is_add;
-  gid_address_copy (&a->eid, eid);
-  a->locator_set_index = locator_set_index;
-  a->local = 1;
-  a->key = key;
-  a->key_id = clib_net_to_host_u16 (mp->key_id);
-
-  rv = vnet_lisp_add_del_local_mapping (a, &map_index);
-
-out:
-  vec_free (name);
-  vec_free (key);
-  gid_address_free (&a->eid);
-
-  REPLY_MACRO (VL_API_LISP_ADD_DEL_LOCAL_EID_REPLY);
-}
-
-static void
-  vl_api_lisp_eid_table_add_del_map_t_handler
-  (vl_api_lisp_eid_table_add_del_map_t * mp)
-{
-  vl_api_lisp_eid_table_add_del_map_reply_t *rmp;
-  int rv = 0;
-  rv = vnet_lisp_eid_table_map (clib_net_to_host_u32 (mp->vni),
-				clib_net_to_host_u32 (mp->dp_table),
-				mp->is_l2, mp->is_add);
-REPLY_MACRO (VL_API_LISP_EID_TABLE_ADD_DEL_MAP_REPLY)}
-
-static void
-vl_api_lisp_add_del_map_server_t_handler (vl_api_lisp_add_del_map_server_t
-					  * mp)
-{
-  vl_api_lisp_add_del_map_server_reply_t *rmp;
-  int rv = 0;
-  ip_address_t addr;
-
-  memset (&addr, 0, sizeof (addr));
-
-  ip_address_set (&addr, mp->ip_address, mp->is_ipv6 ? IP6 : IP4);
-  rv = vnet_lisp_add_del_map_server (&addr, mp->is_add);
-
-  REPLY_MACRO (VL_API_LISP_ADD_DEL_MAP_SERVER_REPLY);
-}
-
-static void
-vl_api_lisp_add_del_map_resolver_t_handler (vl_api_lisp_add_del_map_resolver_t
-					    * mp)
-{
-  vl_api_lisp_add_del_map_resolver_reply_t *rmp;
-  int rv = 0;
-  vnet_lisp_add_del_map_resolver_args_t _a, *a = &_a;
-
-  memset (a, 0, sizeof (a[0]));
-
-  a->is_add = mp->is_add;
-  ip_address_set (&a->address, mp->ip_address, mp->is_ipv6 ? IP6 : IP4);
-
-  rv = vnet_lisp_add_del_map_resolver (a);
-
-  REPLY_MACRO (VL_API_LISP_ADD_DEL_MAP_RESOLVER_REPLY);
-}
-
-static void
-  vl_api_lisp_map_register_enable_disable_t_handler
-  (vl_api_lisp_map_register_enable_disable_t * mp)
-{
-  vl_api_lisp_map_register_enable_disable_reply_t *rmp;
-  int rv = 0;
-
-  vnet_lisp_map_register_enable_disable (mp->is_enabled);
-  REPLY_MACRO (VL_API_LISP_ENABLE_DISABLE_REPLY);
-}
-
-static void
-  vl_api_lisp_rloc_probe_enable_disable_t_handler
-  (vl_api_lisp_rloc_probe_enable_disable_t * mp)
-{
-  vl_api_lisp_rloc_probe_enable_disable_reply_t *rmp;
-  int rv = 0;
-
-  vnet_lisp_rloc_probe_enable_disable (mp->is_enabled);
-  REPLY_MACRO (VL_API_LISP_ENABLE_DISABLE_REPLY);
-}
-
-static void
-vl_api_lisp_enable_disable_t_handler (vl_api_lisp_enable_disable_t * mp)
-{
-  vl_api_lisp_enable_disable_reply_t *rmp;
-  int rv = 0;
-
-  vnet_lisp_enable_disable (mp->is_en);
-  REPLY_MACRO (VL_API_LISP_ENABLE_DISABLE_REPLY);
-}
-
-static void
-  vl_api_show_lisp_map_request_mode_t_handler
-  (vl_api_show_lisp_map_request_mode_t * mp)
-{
-  int rv = 0;
-  vl_api_show_lisp_map_request_mode_reply_t *rmp;
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_SHOW_LISP_MAP_REQUEST_MODE_REPLY,
-  ({
-    rmp->mode = vnet_lisp_get_map_request_mode ();
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_lisp_map_request_mode_t_handler (vl_api_lisp_map_request_mode_t * mp)
-{
-  vl_api_lisp_map_request_mode_reply_t *rmp;
-  int rv = 0;
-
-  rv = vnet_lisp_set_map_request_mode (mp->mode);
-
-  REPLY_MACRO (VL_API_LISP_MAP_REQUEST_MODE_REPLY);
-}
-
-static void
-vl_api_lisp_pitr_set_locator_set_t_handler (vl_api_lisp_pitr_set_locator_set_t
-					    * mp)
-{
-  vl_api_lisp_pitr_set_locator_set_reply_t *rmp;
-  int rv = 0;
-  u8 *ls_name = 0;
-
-  ls_name = format (0, "%s", mp->ls_name);
-  rv = vnet_lisp_pitr_set_locator_set (ls_name, mp->is_add);
-  vec_free (ls_name);
-
-  REPLY_MACRO (VL_API_LISP_PITR_SET_LOCATOR_SET_REPLY);
-}
-
-static void
-  vl_api_lisp_add_del_map_request_itr_rlocs_t_handler
-  (vl_api_lisp_add_del_map_request_itr_rlocs_t * mp)
-{
-  vl_api_lisp_add_del_map_request_itr_rlocs_reply_t *rmp;
-  int rv = 0;
-  u8 *locator_set_name = NULL;
-  vnet_lisp_add_del_mreq_itr_rloc_args_t _a, *a = &_a;
-
-  locator_set_name = format (0, "%s", mp->locator_set_name);
-
-  a->is_add = mp->is_add;
-  a->locator_set_name = locator_set_name;
-
-  rv = vnet_lisp_add_del_mreq_itr_rlocs (a);
-
-  vec_free (locator_set_name);
-
-  REPLY_MACRO (VL_API_LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS_REPLY);
-}
-
-static void
-  vl_api_lisp_add_del_remote_mapping_t_handler
-  (vl_api_lisp_add_del_remote_mapping_t * mp)
-{
-  locator_t *rlocs = 0;
-  vl_api_lisp_add_del_remote_mapping_reply_t *rmp;
-  int rv = 0;
-  gid_address_t _eid, *eid = &_eid;
-  u32 rloc_num = clib_net_to_host_u32 (mp->rloc_num);
-
-  memset (eid, 0, sizeof (eid[0]));
-
-  rv = unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
-			      mp->eid_type, mp->eid, mp->eid_len);
-  if (rv)
-    goto send_reply;
-
-  rlocs = unformat_lisp_locs (mp->rlocs, rloc_num);
-
-  if (!mp->is_add)
-    {
-      vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
-      gid_address_copy (&a->reid, eid);
-      a->is_add = 0;
-      rv = vnet_lisp_add_del_adjacency (a);
-      if (rv)
-	{
-	  goto out;
-	}
-    }
-
-  /* NOTE: for now this works as a static remote mapping, i.e.,
-   * not authoritative and ttl infinite. */
-  rv = vnet_lisp_add_del_mapping (eid, rlocs, mp->action, 0, ~0,
-				  mp->is_add, 1 /* is_static */ , 0);
-
-  if (mp->del_all)
-    vnet_lisp_clear_all_remote_adjacencies ();
-
-out:
-  vec_free (rlocs);
-send_reply:
-  REPLY_MACRO (VL_API_LISP_ADD_DEL_REMOTE_MAPPING_REPLY);
-}
-
-static void
-vl_api_lisp_add_del_adjacency_t_handler (vl_api_lisp_add_del_adjacency_t * mp)
-{
-  vl_api_lisp_add_del_adjacency_reply_t *rmp;
-  vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
-
-  int rv = 0;
-  memset (a, 0, sizeof (a[0]));
-
-  rv = unformat_lisp_eid_api (&a->leid, clib_net_to_host_u32 (mp->vni),
-			      mp->eid_type, mp->leid, mp->leid_len);
-  rv |= unformat_lisp_eid_api (&a->reid, clib_net_to_host_u32 (mp->vni),
-			       mp->eid_type, mp->reid, mp->reid_len);
-
-  if (rv)
-    goto send_reply;
-
-  a->is_add = mp->is_add;
-  rv = vnet_lisp_add_del_adjacency (a);
-
-send_reply:
-  REPLY_MACRO (VL_API_LISP_ADD_DEL_ADJACENCY_REPLY);
-}
-
-static void
-send_lisp_locator_details (lisp_cp_main_t * lcm,
-			   locator_t * loc,
-			   unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_lisp_locator_details_t *rmp;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_LOCATOR_DETAILS);
-  rmp->context = context;
-
-  rmp->local = loc->local;
-  if (loc->local)
-    {
-      rmp->sw_if_index = ntohl (loc->sw_if_index);
-    }
-  else
-    {
-      rmp->is_ipv6 = gid_address_ip_version (&loc->address);
-      ip_address_copy_addr (rmp->ip_address, &gid_address_ip (&loc->address));
-    }
-  rmp->priority = loc->priority;
-  rmp->weight = loc->weight;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_lisp_locator_dump_t_handler (vl_api_lisp_locator_dump_t * mp)
-{
-  u8 *ls_name = 0;
-  unix_shared_memory_queue_t *q = 0;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  locator_set_t *lsit = 0;
-  locator_t *loc = 0;
-  u32 ls_index = ~0, *locit = 0;
-  uword *p = 0;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  if (mp->is_index_set)
-    ls_index = htonl (mp->ls_index);
-  else
-    {
-      /* make sure we get a proper C-string */
-      mp->ls_name[sizeof (mp->ls_name) - 1] = 0;
-      ls_name = format (0, "%s", mp->ls_name);
-      p = hash_get_mem (lcm->locator_set_index_by_name, ls_name);
-      if (!p)
-	goto out;
-      ls_index = p[0];
-    }
-
-  if (pool_is_free_index (lcm->locator_set_pool, ls_index))
-    return;
-
-  lsit = pool_elt_at_index (lcm->locator_set_pool, ls_index);
-
-  vec_foreach (locit, lsit->locator_indices)
-  {
-    loc = pool_elt_at_index (lcm->locator_pool, locit[0]);
-    send_lisp_locator_details (lcm, loc, q, mp->context);
-  };
-out:
-  vec_free (ls_name);
-}
-
-static void
-send_lisp_locator_set_details (lisp_cp_main_t * lcm,
-			       locator_set_t * lsit,
-			       unix_shared_memory_queue_t * q,
-			       u32 context, u32 ls_index)
-{
-  vl_api_lisp_locator_set_details_t *rmp;
-  u8 *str = 0;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_LOCATOR_SET_DETAILS);
-  rmp->context = context;
-
-  rmp->ls_index = htonl (ls_index);
-  if (lsit->local)
-    {
-      ASSERT (lsit->name != NULL);
-      strncpy ((char *) rmp->ls_name, (char *) lsit->name,
-	       vec_len (lsit->name));
-    }
-  else
-    {
-      str = format (0, "<remote-%d>", ls_index);
-      strncpy ((char *) rmp->ls_name, (char *) str, vec_len (str));
-      vec_free (str);
-    }
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_lisp_locator_set_dump_t_handler (vl_api_lisp_locator_set_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q = NULL;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  locator_set_t *lsit = NULL;
-  u8 filter;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  filter = mp->filter;
-  /* *INDENT-OFF* */
-  pool_foreach (lsit, lcm->locator_set_pool,
-  ({
-    if (filter && !((1 == filter && lsit->local) ||
-                    (2 == filter && !lsit->local)))
-      {
-        continue;
-      }
-    send_lisp_locator_set_details (lcm, lsit, q, mp->context,
-                                   lsit - lcm->locator_set_pool);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-lisp_fid_put_api (u8 * dst, fid_address_t * src, u8 * prefix_length)
-{
-  ASSERT (prefix_length);
-  ip_prefix_t *ippref = &fid_addr_ippref (src);
-
-  switch (fid_addr_type (src))
-    {
-    case FID_ADDR_IP_PREF:
-      if (ip_prefix_version (ippref) == IP4)
-	clib_memcpy (dst, &ip_prefix_v4 (ippref), 4);
-      else
-	clib_memcpy (dst, &ip_prefix_v6 (ippref), 16);
-      prefix_length[0] = ip_prefix_len (ippref);
-      break;
-
-    case FID_ADDR_MAC:
-      prefix_length[0] = 0;
-      clib_memcpy (dst, fid_addr_mac (src), 6);
-      break;
-
-    default:
-      clib_warning ("Unknown FID type %d!", fid_addr_type (src));
-      break;
-    }
-}
-
-static u8
-fid_type_to_api_type (fid_address_t * fid)
-{
-  ip_prefix_t *ippref;
-
-  switch (fid_addr_type (fid))
-    {
-    case FID_ADDR_IP_PREF:
-      ippref = &fid_addr_ippref (fid);
-      if (ip_prefix_version (ippref) == IP4)
-	return 0;
-      else if (ip_prefix_version (ippref) == IP6)
-	return 1;
-      else
-	return ~0;
-
-    case FID_ADDR_MAC:
-      return 2;
-    }
-
-  return ~0;
-}
-
-static void
-send_lisp_eid_table_details (mapping_t * mapit,
-			     unix_shared_memory_queue_t * q,
-			     u32 context, u8 filter)
-{
-  fid_address_t *fid;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  locator_set_t *ls = 0;
-  vl_api_lisp_eid_table_details_t *rmp = NULL;
-  gid_address_t *gid = NULL;
-  u8 *mac = 0;
-  ip_prefix_t *ip_prefix = NULL;
-
-  switch (filter)
-    {
-    case 0:			/* all mappings */
-      break;
-
-    case 1:			/* local only */
-      if (!mapit->local)
-	return;
-      break;
-    case 2:			/* remote only */
-      if (mapit->local)
-	return;
-      break;
-    default:
-      clib_warning ("Filter error, unknown filter: %d", filter);
-      return;
-    }
-
-  gid = &mapit->eid;
-  ip_prefix = &gid_address_ippref (gid);
-  mac = gid_address_mac (gid);
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_DETAILS);
-
-  ls = pool_elt_at_index (lcm->locator_set_pool, mapit->locator_set_index);
-  if (vec_len (ls->locator_indices) == 0)
-    rmp->locator_set_index = ~0;
-  else
-    rmp->locator_set_index = clib_host_to_net_u32 (mapit->locator_set_index);
-
-  rmp->is_local = mapit->local;
-  rmp->ttl = clib_host_to_net_u32 (mapit->ttl);
-  rmp->action = mapit->action;
-  rmp->authoritative = mapit->authoritative;
-
-  switch (gid_address_type (gid))
-    {
-    case GID_ADDR_SRC_DST:
-      rmp->is_src_dst = 1;
-      fid = &gid_address_sd_src (gid);
-      rmp->eid_type = fid_type_to_api_type (fid);
-      lisp_fid_put_api (rmp->seid, &gid_address_sd_src (gid),
-			&rmp->seid_prefix_len);
-      lisp_fid_put_api (rmp->eid, &gid_address_sd_dst (gid),
-			&rmp->eid_prefix_len);
-      break;
-    case GID_ADDR_IP_PREFIX:
-      rmp->eid_prefix_len = ip_prefix_len (ip_prefix);
-      if (ip_prefix_version (ip_prefix) == IP4)
-	{
-	  rmp->eid_type = 0;	/* ipv4 type */
-	  clib_memcpy (rmp->eid, &ip_prefix_v4 (ip_prefix),
-		       sizeof (ip_prefix_v4 (ip_prefix)));
-	}
-      else
-	{
-	  rmp->eid_type = 1;	/* ipv6 type */
-	  clib_memcpy (rmp->eid, &ip_prefix_v6 (ip_prefix),
-		       sizeof (ip_prefix_v6 (ip_prefix)));
-	}
-      break;
-    case GID_ADDR_MAC:
-      rmp->eid_type = 2;	/* l2 mac type */
-      clib_memcpy (rmp->eid, mac, 6);
-      break;
-    default:
-      ASSERT (0);
-    }
-  rmp->context = context;
-  rmp->vni = clib_host_to_net_u32 (gid_address_vni (gid));
-  rmp->key_id = clib_host_to_net_u16 (mapit->key_id);
-  memcpy (rmp->key, mapit->key, vec_len (mapit->key));
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_lisp_eid_table_dump_t_handler (vl_api_lisp_eid_table_dump_t * mp)
-{
-  u32 mi;
-  unix_shared_memory_queue_t *q = NULL;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  mapping_t *mapit = NULL;
-  gid_address_t _eid, *eid = &_eid;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  if (mp->eid_set)
-    {
-      memset (eid, 0, sizeof (*eid));
-
-      unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
-			     mp->eid_type, mp->eid, mp->prefix_length);
-
-      mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, eid);
-      if ((u32) ~ 0 == mi)
-	return;
-
-      mapit = pool_elt_at_index (lcm->mapping_pool, mi);
-      send_lisp_eid_table_details (mapit, q, mp->context,
-				   0 /* ignore filter */ );
-    }
-  else
-    {
-      /* *INDENT-OFF* */
-      pool_foreach (mapit, lcm->mapping_pool,
-      ({
-        send_lisp_eid_table_details(mapit, q, mp->context,
-                                    mp->filter);
-      }));
-      /* *INDENT-ON* */
-    }
-}
-
-static void
-send_lisp_map_server_details (ip_address_t * ip,
-			      unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_lisp_map_server_details_t *rmp = NULL;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_MAP_SERVER_DETAILS);
-
-  switch (ip_addr_version (ip))
-    {
-    case IP4:
-      rmp->is_ipv6 = 0;
-      clib_memcpy (rmp->ip_address, &ip_addr_v4 (ip),
-		   sizeof (ip_addr_v4 (ip)));
-      break;
-
-    case IP6:
-      rmp->is_ipv6 = 1;
-      clib_memcpy (rmp->ip_address, &ip_addr_v6 (ip),
-		   sizeof (ip_addr_v6 (ip)));
-      break;
-
-    default:
-      ASSERT (0);
-    }
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_lisp_map_server_dump_t_handler (vl_api_lisp_map_server_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q = NULL;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  lisp_msmr_t *mr;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  vec_foreach (mr, lcm->map_servers)
-  {
-    send_lisp_map_server_details (&mr->address, q, mp->context);
-  }
-}
-
-static void
-send_lisp_map_resolver_details (ip_address_t * ip,
-				unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_lisp_map_resolver_details_t *rmp = NULL;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_MAP_RESOLVER_DETAILS);
-
-  switch (ip_addr_version (ip))
-    {
-    case IP4:
-      rmp->is_ipv6 = 0;
-      clib_memcpy (rmp->ip_address, &ip_addr_v4 (ip),
-		   sizeof (ip_addr_v4 (ip)));
-      break;
-
-    case IP6:
-      rmp->is_ipv6 = 1;
-      clib_memcpy (rmp->ip_address, &ip_addr_v6 (ip),
-		   sizeof (ip_addr_v6 (ip)));
-      break;
-
-    default:
-      ASSERT (0);
-    }
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_lisp_map_resolver_dump_t_handler (vl_api_lisp_map_resolver_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q = NULL;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  lisp_msmr_t *mr;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  vec_foreach (mr, lcm->map_resolvers)
-  {
-    send_lisp_map_resolver_details (&mr->address, q, mp->context);
-  }
-}
-
-static void
-send_eid_table_map_pair (hash_pair_t * p,
-			 unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_lisp_eid_table_map_details_t *rmp = NULL;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_MAP_DETAILS);
-
-  rmp->vni = clib_host_to_net_u32 (p->key);
-  rmp->dp_table = clib_host_to_net_u32 (p->value[0]);
-  rmp->context = context;
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_lisp_eid_table_map_dump_t_handler (vl_api_lisp_eid_table_map_dump_t *
-					  mp)
-{
-  unix_shared_memory_queue_t *q = NULL;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  hash_pair_t *p;
-  uword *vni_table = 0;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  if (mp->is_l2)
-    {
-      vni_table = lcm->bd_id_by_vni;
-    }
-  else
-    {
-      vni_table = lcm->table_id_by_vni;
-    }
-
-  /* *INDENT-OFF* */
-  hash_foreach_pair (p, vni_table,
-  ({
-    send_eid_table_map_pair (p, q, mp->context);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-send_eid_table_vni (u32 vni, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_lisp_eid_table_vni_details_t *rmp = 0;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_VNI_DETAILS);
-  rmp->context = context;
-  rmp->vni = clib_host_to_net_u32 (vni);
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-lisp_adjacency_copy (vl_api_lisp_adjacency_t * dst, lisp_adjacency_t * adjs)
-{
-  lisp_adjacency_t *adj;
-  vl_api_lisp_adjacency_t a;
-  u32 i, n = vec_len (adjs);
-
-  for (i = 0; i < n; i++)
-    {
-      adj = vec_elt_at_index (adjs, i);
-      memset (&a, 0, sizeof (a));
-
-      switch (gid_address_type (&adj->reid))
-	{
-	case GID_ADDR_IP_PREFIX:
-	  a.reid_prefix_len = gid_address_ippref_len (&adj->reid);
-	  a.leid_prefix_len = gid_address_ippref_len (&adj->leid);
-	  if (gid_address_ip_version (&adj->reid) == IP4)
-	    {
-	      a.eid_type = 0;	/* ipv4 type */
-	      clib_memcpy (a.reid, &gid_address_ip (&adj->reid), 4);
-	      clib_memcpy (a.leid, &gid_address_ip (&adj->leid), 4);
-	    }
-	  else
-	    {
-	      a.eid_type = 1;	/* ipv6 type */
-	      clib_memcpy (a.reid, &gid_address_ip (&adj->reid), 16);
-	      clib_memcpy (a.leid, &gid_address_ip (&adj->leid), 16);
-	    }
-	  break;
-	case GID_ADDR_MAC:
-	  a.eid_type = 2;	/* l2 mac type */
-	  mac_copy (a.reid, gid_address_mac (&adj->reid));
-	  mac_copy (a.leid, gid_address_mac (&adj->leid));
-	  break;
-	default:
-	  ASSERT (0);
-	}
-      dst[i] = a;
-    }
-}
-
-static void
-  vl_api_show_lisp_rloc_probe_state_t_handler
-  (vl_api_show_lisp_rloc_probe_state_t * mp)
-{
-  vl_api_show_lisp_rloc_probe_state_reply_t *rmp = 0;
-  int rv = 0;
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2 (VL_API_SHOW_LISP_RLOC_PROBE_STATE_REPLY,
-  {
-    rmp->is_enabled = vnet_lisp_rloc_probe_state_get ();
-  });
-  /* *INDENT-ON* */
-}
-
-static void
-  vl_api_show_lisp_map_register_state_t_handler
-  (vl_api_show_lisp_map_register_state_t * mp)
-{
-  vl_api_show_lisp_map_register_state_reply_t *rmp = 0;
-  int rv = 0;
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2 (VL_API_SHOW_LISP_MAP_REGISTER_STATE_REPLY,
-  {
-    rmp->is_enabled = vnet_lisp_map_register_state_get ();
-  });
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_lisp_adjacencies_get_t_handler (vl_api_lisp_adjacencies_get_t * mp)
-{
-  vl_api_lisp_adjacencies_get_reply_t *rmp = 0;
-  lisp_adjacency_t *adjs = 0;
-  int rv = 0;
-  vl_api_lisp_adjacency_t a;
-  u32 size = ~0;
-  u32 vni = clib_net_to_host_u32 (mp->vni);
-
-  adjs = vnet_lisp_adjacencies_get_by_vni (vni);
-  size = vec_len (adjs) * sizeof (a);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO4 (VL_API_LISP_ADJACENCIES_GET_REPLY, size,
-  {
-    rmp->count = clib_host_to_net_u32 (vec_len (adjs));
-    lisp_adjacency_copy (rmp->adjacencies, adjs);
-  });
-  /* *INDENT-ON* */
-
-  vec_free (adjs);
-}
-
-static void
-vl_api_lisp_eid_table_vni_dump_t_handler (vl_api_lisp_eid_table_vni_dump_t *
-					  mp)
-{
-  hash_pair_t *p;
-  u32 *vnis = 0;
-  unix_shared_memory_queue_t *q = 0;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  /* *INDENT-OFF* */
-  hash_foreach_pair (p, lcm->table_id_by_vni,
-  ({
-    hash_set (vnis, p->key, 0);
-  }));
-
-  hash_foreach_pair (p, lcm->bd_id_by_vni,
-  ({
-    hash_set (vnis, p->key, 0);
-  }));
-
-  hash_foreach_pair (p, vnis,
-  ({
-    send_eid_table_vni (p->key, q, mp->context);
-  }));
-  /* *INDENT-ON* */
-
-  hash_free (vnis);
-}
-
-static void
-vl_api_show_lisp_status_t_handler (vl_api_show_lisp_status_t * mp)
-{
-  unix_shared_memory_queue_t *q = NULL;
-  vl_api_show_lisp_status_reply_t *rmp = NULL;
-  int rv = 0;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_SHOW_LISP_STATUS_REPLY,
-  ({
-    rmp->gpe_status = vnet_lisp_gpe_enable_disable_status ();
-    rmp->feature_status = vnet_lisp_enable_disable_status ();
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-  vl_api_lisp_get_map_request_itr_rlocs_t_handler
-  (vl_api_lisp_get_map_request_itr_rlocs_t * mp)
-{
-  unix_shared_memory_queue_t *q = NULL;
-  vl_api_lisp_get_map_request_itr_rlocs_reply_t *rmp = NULL;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  locator_set_t *loc_set = 0;
-  u8 *tmp_str = 0;
-  int rv = 0;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  if (~0 == lcm->mreq_itr_rlocs)
-    {
-      tmp_str = format (0, " ");
-    }
-  else
-    {
-      loc_set =
-	pool_elt_at_index (lcm->locator_set_pool, lcm->mreq_itr_rlocs);
-      tmp_str = format (0, "%s", loc_set->name);
-    }
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_LISP_GET_MAP_REQUEST_ITR_RLOCS_REPLY,
-  ({
-    strncpy((char *) rmp->locator_set_name, (char *) tmp_str,
-            ARRAY_LEN(rmp->locator_set_name) - 1);
-  }));
-  /* *INDENT-ON* */
-
-  vec_free (tmp_str);
-}
-
-static void
-vl_api_show_lisp_pitr_t_handler (vl_api_show_lisp_pitr_t * mp)
-{
-  unix_shared_memory_queue_t *q = NULL;
-  vl_api_show_lisp_pitr_reply_t *rmp = NULL;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
-  mapping_t *m;
-  locator_set_t *ls = 0;
-  u8 *tmp_str = 0;
-  int rv = 0;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  if (!lcm->lisp_pitr)
-    {
-      tmp_str = format (0, "N/A");
-    }
-  else
-    {
-      m = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
-      if (~0 != m->locator_set_index)
-	{
-	  ls =
-	    pool_elt_at_index (lcm->locator_set_pool, m->locator_set_index);
-	  tmp_str = format (0, "%s", ls->name);
-	}
-      else
-	{
-	  tmp_str = format (0, "N/A");
-	}
-    }
-  vec_add1 (tmp_str, 0);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_SHOW_LISP_PITR_REPLY,
-  ({
-    rmp->status = lcm->lisp_pitr;
-    strncpy((char *) rmp->locator_set_name, (char *) tmp_str,
-            ARRAY_LEN(rmp->locator_set_name) - 1);
-  }));
-  /* *INDENT-ON* */
-}
-
-/*
- * lisp_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_lisp;
-#undef _
-}
-
-static clib_error_t *
-lisp_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (lisp_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-cp/lisp_cp_dpo.c b/vnet/vnet/lisp-cp/lisp_cp_dpo.c
deleted file mode 100644
index 185b07a2..00000000
--- a/vnet/vnet/lisp-cp/lisp_cp_dpo.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/dpo/dpo.h>
-#include <vnet/lisp-gpe/lisp_gpe.h>
-#include <vnet/lisp-cp/control.h>
-
-/**
- * The static array of LISP punt DPOs
- */
-static dpo_id_t lisp_cp_dpos[DPO_PROTO_NUM];
-
-const dpo_id_t *
-lisp_cp_dpo_get (dpo_proto_t proto)
-{
-  /*
-   * there are only two instances of this DPO type.
-   * we can use the protocol as the index
-   */
-  return (&lisp_cp_dpos[proto]);
-}
-
-static u8 *
-format_lisp_cp_dpo (u8 * s, va_list * args)
-{
-  index_t index = va_arg (*args, index_t);
-  CLIB_UNUSED (u32 indent) = va_arg (*args, u32);
-
-  return (format (s, "lisp-cp-punt-%U", format_dpo_proto, index));
-}
-
-static void
-lisp_cp_dpo_lock (dpo_id_t * dpo)
-{
-}
-
-static void
-lisp_cp_dpo_unlock (dpo_id_t * dpo)
-{
-}
-
-const static dpo_vft_t lisp_cp_vft = {
-  .dv_lock = lisp_cp_dpo_lock,
-  .dv_unlock = lisp_cp_dpo_unlock,
-  .dv_format = format_lisp_cp_dpo,
-};
-
-/**
- * @brief The per-protocol VLIB graph nodes that are assigned to a LISP-CP
- *        object.
- *
- * this means that these graph nodes are ones from which a LISP-CP is the
- * parent object in the DPO-graph.
- */
-const static char *const lisp_cp_ip4_nodes[] = {
-  "lisp-cp-lookup-ip4",
-  NULL,
-};
-
-const static char *const lisp_cp_ip6_nodes[] = {
-  "lisp-cp-lookup-ip6",
-  NULL,
-};
-
-const static char *const lisp_cp_ethernet_nodes[] = {
-  "lisp-cp-lookup-l2",
-  NULL,
-};
-
-
-const static char *const *const lisp_cp_nodes[DPO_PROTO_NUM] = {
-  [DPO_PROTO_IP4] = lisp_cp_ip4_nodes,
-  [DPO_PROTO_IP6] = lisp_cp_ip6_nodes,
-  [DPO_PROTO_ETHERNET] = lisp_cp_ethernet_nodes,
-  [DPO_PROTO_MPLS] = NULL,
-};
-
-clib_error_t *
-lisp_cp_dpo_module_init (vlib_main_t * vm)
-{
-  dpo_proto_t dproto;
-
-  /*
-   * there are no exit arcs from the LIS-CP VLIB node, so we
-   * pass NULL as said node array.
-   */
-  dpo_register (DPO_LISP_CP, &lisp_cp_vft, lisp_cp_nodes);
-
-  FOR_EACH_DPO_PROTO (dproto)
-  {
-    dpo_set (&lisp_cp_dpos[dproto], DPO_LISP_CP, dproto, dproto);
-  }
-
-  return (NULL);
-}
-
-VLIB_INIT_FUNCTION (lisp_cp_dpo_module_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-cp/lisp_cp_dpo.h b/vnet/vnet/lisp-cp/lisp_cp_dpo.h
deleted file mode 100644
index f0f3fae8..00000000
--- a/vnet/vnet/lisp-cp/lisp_cp_dpo.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __LISP_CP_DPO_H__
-#define __LISP_CP_DPO_H__
-
-#include <vnet/vnet.h>
-#include <vnet/dpo/dpo.h>
-
-/**
- * A representation of punt to the LISP control plane.
- */
-typedef struct lisp_cp_dpo_t
-{
-  /**
-   * The transport payload type.
-   */
-  dpo_proto_t lcd_proto;
-} lisp_cp_dpo_t;
-
-extern const dpo_id_t *lisp_cp_dpo_get (dpo_proto_t proto);
-
-extern void lisp_cp_dpo_module_init (void);
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-cp/lisp_cp_messages.h b/vnet/vnet/lisp-cp/lisp_cp_messages.h
deleted file mode 100644
index 278f60e1..00000000
--- a/vnet/vnet/lisp-cp/lisp_cp_messages.h
+++ /dev/null
@@ -1,613 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef VNET_LISP_GPE_LISP_CP_MESSAGES_H_
-#define VNET_LISP_GPE_LISP_CP_MESSAGES_H_
-
-#include <vnet/vnet.h>
-
-#define MAX_IP_PKT_LEN 4096
-#define MAX_IP_HDR_LEN 40	/* without options or IPv6 hdr extensions */
-#define UDP_HDR_LEN 8
-#define LISP_DATA_HDR_LEN 8
-#define LISP_ECM_HDR_LEN 4
-#define MAX_LISP_MSG_ENCAP_LEN  2*(MAX_IP_HDR_LEN + UDP_HDR_LEN)+ LISP_ECM_HDR_LEN
-#define MAX_LISP_PKT_ENCAP_LEN  MAX_IP_HDR_LEN + UDP_HDR_LEN + LISP_DATA_HDR_LEN
-
-#define LISP_CONTROL_PORT 4342
-
-/*
- * EID RECORD FIELD
- */
-
-/*
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    / |   Reserved    | EID mask-len  |        EID-prefix-AFI         |
- *  Rec +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    \ |                       EID-prefix  ...                         |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-
-typedef struct _eid_prefix_record_hdr
-{
-  u8 reserved;
-  u8 eid_prefix_length;
-} __attribute__ ((__packed__)) eid_record_hdr_t;
-
-void eid_rec_hdr_init (eid_record_hdr_t * ptr);
-
-#define EID_REC_CAST(h_) ((eid_record_hdr_t *)(h_))
-#define EID_REC_MLEN(h_) EID_REC_CAST((h_))->eid_prefix_length
-#define EID_REC_ADDR(h) (u8 *)(h) + sizeof(eid_record_hdr_t)
-
-/* LISP Types */
-typedef enum
-{
-  NOT_LISP_MSG,
-  LISP_MAP_REQUEST = 1,
-  LISP_MAP_REPLY,
-  LISP_MAP_REGISTER,
-  LISP_MAP_NOTIFY,
-  LISP_INFO_NAT = 7,
-  LISP_ENCAP_CONTROL_TYPE = 8,
-  LISP_MSG_TYPES
-} lisp_msg_type_e;
-
-/*
- * ENCAPSULATED CONTROL MESSAGE
- */
-
-/*
- *     0                   1                   2                   3
- *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   / |                       IPv4 or IPv6 Header                     |
- * OH  |                      (uses RLOC addresses)                    |
- *   \ |                                                               |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   / |       Source Port = xxxx      |       Dest Port = 4342        |
- * UDP +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   \ |           UDP Length          |        UDP Checksum           |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * LH  |Type=8 |S|                  Reserved                           |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   / |                       IPv4 or IPv6 Header                     |
- * IH  |                  (uses RLOC or EID addresses)                 |
- *   \ |                                                               |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   / |       Source Port = xxxx      |       Dest Port = yyyy        |
- * UDP +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   \ |           UDP Length          |        UDP Checksum           |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * LCM |                      LISP Control Message                     |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-
-/*
- * Encapsulated control message header. This is followed by the IP
- * header of the encapsulated LISP control message.
- *
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |Type=8 |S|                 Reserved                            |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-typedef struct
-{
-#if CLIB_ARCH_IS_LITTLE_ENDIAN
-  u8 reserved:3;
-  u8 s_bit:1;
-  u8 type:4;
-#else
-  u8 type:4;
-  u8 s_bit:1;
-  u8 reserved:3;
-#endif
-  u8 reserved2[3];
-} ecm_hdr_t;
-
-char *ecm_hdr_to_char (ecm_hdr_t * h);
-
-#define ECM_TYPE(h_) ((ecm_hdr_t *)(h_))->type
-
-/*
- * MAP-REQUEST MESSAGE
- */
-
-/*
- * Map-Request Message Format
- *
- *       0                   1                   2                   3
- *       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |Type=1 |A|M|P|S|p|s|    Reserved     |   IRC   | Record Count  |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |                         Nonce . . .                           |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |                         . . . Nonce                           |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |         Source-EID-AFI        |   Source EID Address  ...     |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |         ITR-RLOC-AFI 1        |    ITR-RLOC Address 1  ...    |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |                              ...                              |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |         ITR-RLOC-AFI n        |    ITR-RLOC Address n  ...    |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    / |   Reserved    | EID mask-len  |        EID-prefix-AFI         |
- *  Rec +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    \ |                       EID-prefix  ...                         |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |                   Map-Reply Record  ...                       |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |                     Mapping Protocol Data                     |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-
-/*
- * Fixed size portion of the map request. Variable size source EID
- * address, originating ITR RLOC AFIs and addresses and then map
- * request records follow.
- */
-typedef struct
-{
-#if CLIB_ARCH_IS_LITTLE_ENDIAN
-  u8 solicit_map_request:1;
-  u8 rloc_probe:1;
-  u8 map_data_present:1;
-  u8 authoritative:1;
-  u8 type:4;
-#else
-  u8 type:4;
-  u8 authoritative:1;
-  u8 map_data_present:1;
-  u8 rloc_probe:1;
-  u8 solicit_map_request:1;
-#endif
-#if CLIB_ARCH_IS_LITTLE_ENDIAN
-  u8 reserved1:6;
-  u8 smr_invoked:1;
-  u8 pitr:1;
-#else
-  u8 pitr:1;
-  u8 smr_invoked:1;
-  u8 reserved1:6;
-#endif
-#if CLIB_ARCH_IS_LITTLE_ENDIAN
-  u8 additional_itr_rloc_count:5;
-  u8 reserved2:3;
-#else
-  u8 reserved2:3;
-  u8 additional_itr_rloc_count:5;
-#endif
-  u8 record_count;
-  u64 nonce;
-} __attribute__ ((__packed__)) map_request_hdr_t;
-
-void map_request_hdr_init (void *ptr);
-char *map_request_hdr_to_char (map_request_hdr_t * h);
-
-#define MREQ_TYPE(h_) (h_)->type
-#define MREQ_HDR_CAST(h_) ((map_request_hdr_t *)(h_))
-#define MREQ_REC_COUNT(h_) (MREQ_HDR_CAST(h_))->record_count
-#define MREQ_RLOC_PROBE(h_) (MREQ_HDR_CAST(h_))->rloc_probe
-#define MREQ_ITR_RLOC_COUNT(h_) (MREQ_HDR_CAST(h_))->additional_itr_rloc_count
-#define MREQ_NONCE(h_) (MREQ_HDR_CAST(h_))->nonce
-#define MREQ_SMR(h_) (MREQ_HDR_CAST(h_))->solicit_map_request
-#define MREQ_SMR_INVOKED(h_) (MREQ_HDR_CAST(h_))->smr_invoked
-
-/*
- * MAP-REPLY MESSAGE
- */
-
- /*
-  * Map-Reply Message Format
-  *
-  *       0                   1                   2                   3
-  *       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-  *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  *      |Type=2 |P|E|S|         Reserved                | Record Count  |
-  *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  *      |                         Nonce . . .                           |
-  *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  *      |                         . . . Nonce                           |
-  *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  *  |   |                          Record  TTL                          |
-  *  |   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  *  R   | Locator Count | EID mask-len  | ACT |A|      Reserved         |
-  *  e   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  *  c   | Rsvd  |  Map-Version Number   |            EID-AFI            |
-  *  o   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  *  r   |                          EID-prefix                           |
-  *  d   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  *  |  /|    Priority   |    Weight     |  M Priority   |   M Weight    |
-  *  | L +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  *  | o |        Unused Flags     |L|p|R|           Loc-AFI             |
-  *  | c +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  *  |  \|                            Locator                            |
-  *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  *      |                     Mapping Protocol Data                     |
-  *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  */
-
- /*
-  * Fixed size portion of the map reply.
-  */
-typedef struct
-{
-#if CLIB_ARCH_IS_LITTLE_ENDIAN
-  u8 reserved1:1;
-  u8 security:1;
-  u8 echo_nonce:1;
-  u8 rloc_probe:1;
-  u8 type:4;
-#else
-  u8 type:4;
-  u8 rloc_probe:1;
-  u8 echo_nonce:1;
-  u8 security:1;
-  u8 reserved1:1;
-#endif
-  u8 reserved2;
-  u8 reserved3;
-  u8 record_count;
-  u64 nonce;
-} __attribute__ ((__packed__)) map_reply_hdr_t;
-
-void map_reply_hdr_init (void *ptr);
-char *map_reply_hdr_to_char (map_reply_hdr_t * h);
-
-#define MREP_TYPE(h_) MREP_HDR_CAST(h_)->type
-#define MREP_HDR_CAST(h_) ((map_reply_hdr_t *)(h_))
-#define MREP_REC_COUNT(h_) MREP_HDR_CAST(h_)->record_count
-#define MREP_RLOC_PROBE(h_) MREP_HDR_CAST(h_)->rloc_probe
-#define MREP_NONCE(h_) MREP_HDR_CAST(h_)->nonce
-
-
-always_inline lisp_msg_type_e
-lisp_msg_type (void *b)
-{
-  ecm_hdr_t *hdr = b;
-  if (!hdr)
-    {
-      return (NOT_LISP_MSG);
-    }
-  return (hdr->type);
-}
-
-always_inline void
-increment_record_count (void *b)
-{
-  switch (lisp_msg_type (b))
-    {
-    case LISP_MAP_REQUEST:
-      MREQ_REC_COUNT (b) += 1;
-      break;
-    case LISP_MAP_REPLY:
-      MREP_REC_COUNT (b) += 1;
-      break;
-    default:
-      return;
-    }
-}
-
-
-/*
- * LOCATOR FIELD
- *
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    /|    Priority   |    Weight     |  M Priority   |   M Weight    |
- *   L +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   o |        Unused Flags     |L|p|R|           Loc-AFI             |
- *   c +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    \|                            Locator                            |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- * Fixed portion of the mapping record locator. Variable length
- * locator address follows.
- */
-typedef struct _locator_hdr
-{
-  u8 priority;
-  u8 weight;
-  u8 mpriority;
-  u8 mweight;
-  u8 unused1;
-#ifdef CLIB_ARCH_IS_LITTLE_ENDIAN
-  u8 reachable:1;
-  u8 probed:1;
-  u8 local:1;
-  u8 unused2:5;
-#else
-  u8 unused2:5;
-  u8 local:1;
-  u8 probed:1;
-  u8 reachable:1;
-#endif
-} __attribute__ ((__packed__)) locator_hdr_t;
-
-#define LOC_CAST(h_) ((locator_hdr_t *)(h_))
-#define LOC_PROBED(h_) LOC_CAST(h_)->probed
-#define LOC_PRIORITY(h_) LOC_CAST(h_)->priority
-#define LOC_WEIGHT(h_) LOC_CAST(h_)->weight
-#define LOC_MPRIORITY(h_) LOC_CAST(h_)->mpriority
-#define LOC_MWEIGHT(h_) LOC_CAST(h_)->mweight
-#define LOC_REACHABLE(h_) LOC_CAST(h_)->reachable
-#define LOC_LOCAL(h_) LOC_CAST(h_)->local
-#define LOC_ADDR(h_) ((u8 *)(h_)  + sizeof(locator_hdr_t))
-
-/*
- * MAPPING RECORD
- *
- * Mapping record used in all LISP control messages.
- *
- *  +--->  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |      |                          Record  TTL                          |
- *  |      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  R      | Locator Count | EID mask-len  | ACT |A|       Reserved        |
- *  e      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  c      | Rsvd  |  Map-Version Number   |            EID-AFI            |
- *  o      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  r      |                          EID-prefix                           |
- *  d      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |     /|    Priority   |    Weight     |  M Priority   |   M Weight    |
- *  |    / +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |  Loc |         Unused Flags    |L|p|R|           Loc-AFI             |
- *  |    \ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |     \|                             Locator                           |
- *  +--->  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-/*
- * Fixed portion of the mapping record. EID prefix address and
- * locators follow.
- */
-
-typedef struct _mapping_record_hdr_t
-{
-  u32 ttl;
-  u8 locator_count;
-  u8 eid_prefix_length;
-#ifdef CLIB_ARCH_IS_LITTLE_ENDIAN
-  u8 reserved1:4;
-  u8 authoritative:1;
-  u8 action:3;
-#else
-  u8 action:3;
-  u8 authoritative:1;
-  u8 reserved1:4;
-#endif
-  u8 reserved2;
-#ifdef CLIB_ARCH_IS_LITTLE_ENDIAN
-  u8 version_hi:4;
-  u8 reserved3:4;
-#else
-  u8 reserved3:4;
-  u8 version_hi:4;
-#endif
-  u8 version_low;
-} __attribute__ ((__packed__)) mapping_record_hdr_t;
-
-void mapping_record_init_hdr (mapping_record_hdr_t * h);
-
-#define MAP_REC_EID_PLEN(h) ((mapping_record_hdr_t *)(h))->eid_prefix_length
-#define MAP_REC_LOC_COUNT(h) ((mapping_record_hdr_t *)(h))->locator_count
-#define MAP_REC_ACTION(h) ((mapping_record_hdr_t *)(h))->action
-#define MAP_REC_AUTH(h) ((mapping_record_hdr_t *)(h))->authoritative
-#define MAP_REC_TTL(h) ((mapping_record_hdr_t *)(h))->ttl
-#define MAP_REC_EID(h) (u8 *)(h)+sizeof(mapping_record_hdr_t)
-#define MAP_REC_VERSION(h) (h)->version_hi << 8 | (h)->version_low
-
-typedef enum
-{
-  LISP_NO_ACTION,
-  LISP_FORWARD_NATIVE,
-  LISP_SEND_MAP_REQUEST,
-  LISP_DROP
-} lisp_action_e;
-
-typedef enum lisp_authoritative
-{
-  A_NO_AUTHORITATIVE = 0,
-  A_AUTHORITATIVE
-} lisp_authoritative_e;
-
-/*
- * LISP Canonical Address Format Encodings
- *
- *   0                   1                   2                   3
- *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |           AFI = 16387         |     Rsvd1     |     Flags     |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |    Type       |     Rsvd2     |            Length             |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-typedef struct _lcaf_hdr_t
-{
-  u8 reserved1;
-  u8 flags;
-  u8 type;
-  u8 reserved2;
-  u16 len;
-} __attribute__ ((__packed__)) lcaf_hdr_t;
-
-#define LCAF_TYPE(h) ((lcaf_hdr_t *)(h))->type
-#define LCAF_LENGTH(h) ((lcaf_hdr_t *)(h))->len
-#define LCAF_RES2(h) ((lcaf_hdr_t *)(h))->reserved2
-#define LCAF_FLAGS(h) ((lcaf_hdr_t *)(h))->flags
-#define LCAF_PAYLOAD(h) (u8 *)(h)+sizeof(lcaf_hdr_t)
-
-/*
- * Source/Dest Key Canonical Address Format:
- *
- *   0                   1                   2                   3
- *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   |            Reserved           |   Source-ML   |    Dest-ML    |
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-typedef struct _lcaf_src_dst_hdr_t
-{
-  u16 reserved;
-  u8 src_mask_len;
-  u8 dst_mask_len;
-} __attribute__ ((__packed__)) lcaf_src_dst_hdr_t;
-
-#define LCAF_SD_SRC_ML(_h) (_h)->src_mask_len
-#define LCAF_SD_DST_ML(_h) (_h)->dst_mask_len
-
-/*
- * The Map-Register message format is:
- *
- *       0                   1                   2                   3
- *       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |Type=3 |P|            Reserved               |M| Record Count  |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |                         Nonce . . .                           |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |                         . . . Nonce                           |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |            Key ID             |  Authentication Data Length   |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      ~                     Authentication Data                       ~
- *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |   |                          Record TTL                           |
- *  |   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  R   | Locator Count | EID mask-len  | ACT |A|      Reserved         |
- *  e   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  c   | Rsvd  |  Map-Version Number   |        EID-Prefix-AFI         |
- *  o   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  r   |                          EID-Prefix                           |
- *  d   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |  /|    Priority   |    Weight     |  M Priority   |   M Weight    |
- *  | L +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  | o |        Unused Flags     |L|p|R|           Loc-AFI             |
- *  | c +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |  \|                             Locator                           |
- *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-typedef struct
-{
-#if CLIB_ARCH_IS_LITTLE_ENDIAN
-  u8 res1:3;
-  u8 proxy_map_reply:1;
-  u8 type:4;
-#else
-  u8 type:4;
-  u8 proxy_map_reply:1;
-  u8 res1:3;
-#endif
-
-  u8 res2;
-
-#if CLIB_ARCH_IS_LITTLE_ENDIAN
-  u8 want_map_notify:1;
-  u8 res3:7;
-#else
-  u8 res3:7;
-  u8 want_map_notify:1;
-#endif
-
-  u8 record_count;
-  u64 nonce;
-  u16 key_id;
-  u16 auth_data_len;
-  u8 data[0];
-} __attribute__ ((__packed__)) map_register_hdr_t;
-
-#define MREG_TYPE(h_) (h_)->type
-#define MREG_HDR_CAST(h_) ((map_register_hdr_t *)(h_))
-#define MREG_PROXY_MR(h_) (MREG_HDR_CAST(h_))->proxy_map_reply
-#define MREG_WANT_MAP_NOTIFY(h_) (MREG_HDR_CAST(h_))->want_map_notify
-#define MREG_REC_COUNT(h_) (MREG_HDR_CAST(h_))->record_count
-#define MREG_NONCE(h_) (MREG_HDR_CAST(h_))->nonce
-#define MREG_KEY_ID(h_) (MREG_HDR_CAST(h_))->key_id
-#define MREG_AUTH_DATA_LEN(h_) (MREG_HDR_CAST(h_))->auth_data_len
-#define MREG_DATA(h_) (MREG_HDR_CAST(h_))->data
-
-/*
- * The Map-Notify message format is:
- *
- *       0                   1                   2                   3
- *       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |Type=4 |              Reserved                 | Record Count  |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |                         Nonce . . .                           |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |                         . . . Nonce                           |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      |            Key ID             |  Authentication Data Length   |
- *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *      ~                     Authentication Data                       ~
- *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |   |                          Record TTL                           |
- *  |   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  R   | Locator Count | EID mask-len  | ACT |A|      Reserved         |
- *  e   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  c   | Rsvd  |  Map-Version Number   |         EID-Prefix-AFI        |
- *  o   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  r   |                          EID-Prefix                           |
- *  d   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |  /|    Priority   |    Weight     |  M Priority   |   M Weight    |
- *  | L +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  | o |        Unused Flags     |L|p|R|           Loc-AFI             |
- *  | c +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |  \|                             Locator                           |
- *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-*/
-
-typedef struct
-{
-#if CLIB_ARCH_IS_LITTLE_ENDIAN
-  u8 res1:4;
-  u8 type:4;
-#else
-  u8 type:4;
-  u8 res1:4;
-#endif
-
-  u16 res2;
-
-  u8 record_count;
-  u64 nonce;
-  u16 key_id;
-  u16 auth_data_len;
-  u8 data[0];
-} __attribute__ ((__packed__)) map_notify_hdr_t;
-
-#define MNOTIFY_TYPE(h_) (h_)->type
-#define MNOTIFY_HDR_CAST(h_) ((map_register_hdr_t *)(h_))
-#define MNOTIFY_REC_COUNT(h_) (MREG_HDR_CAST(h_))->record_count
-#define MNOTIFY_NONCE(h_) (MREG_HDR_CAST(h_))->nonce
-#define MNOTIFY_KEY_ID(h_) (MREG_HDR_CAST(h_))->key_id
-#define MNOTIFY_AUTH_DATA_LEN(h_) (MREG_HDR_CAST(h_))->auth_data_len
-#define MNOTIFY_DATA(h_) (MREG_HDR_CAST(h_))->data
-
-#endif /* VNET_LISP_GPE_LISP_CP_MESSAGES_H_ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-cp/lisp_msg_serdes.c b/vnet/vnet/lisp-cp/lisp_msg_serdes.c
deleted file mode 100644
index eee1885c..00000000
--- a/vnet/vnet/lisp-cp/lisp_msg_serdes.c
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/lisp-cp/lisp_msg_serdes.h>
-#include <vnet/lisp-cp/packets.h>
-#include <vppinfra/time.h>
-
-void *lisp_msg_put_gid (vlib_buffer_t * b, gid_address_t * gid);
-
-static void
-lisp_msg_put_locators (vlib_buffer_t * b, locator_t * locators)
-{
-  locator_t *loc;
-
-  vec_foreach (loc, locators)
-  {
-    u8 *p = vlib_buffer_put_uninit (b, sizeof (locator_hdr_t));
-    memset (p, 0, sizeof (locator_hdr_t));
-    LOC_PRIORITY (p) = loc->priority;
-    LOC_MPRIORITY (p) = loc->mpriority;
-    LOC_WEIGHT (p) = loc->weight;
-    LOC_MWEIGHT (p) = loc->mweight;
-    LOC_LOCAL (p) = loc->local;
-    LOC_PROBED (p) = loc->probed ? 1 : 0;
-    lisp_msg_put_gid (b, &loc->address);
-  }
-}
-
-static void
-lisp_msg_put_mapping_record (vlib_buffer_t * b, mapping_t * record)
-{
-  mapping_record_hdr_t *p =
-    vlib_buffer_put_uninit (b, sizeof (mapping_record_hdr_t));
-  gid_address_t *eid = &record->eid;
-
-  memset (p, 0, sizeof (*p));
-  MAP_REC_EID_PLEN (p) = gid_address_len (eid);
-  MAP_REC_TTL (p) = clib_host_to_net_u32 (MAP_REGISTER_DEFAULT_TTL);
-  MAP_REC_AUTH (p) = record->authoritative ? 1 : 0;
-  MAP_REC_LOC_COUNT (p) = vec_len (record->locators);
-
-  lisp_msg_put_gid (b, eid);
-  lisp_msg_put_locators (b, record->locators);
-}
-
-static void
-lisp_msg_put_mreg_records (vlib_buffer_t * b, mapping_t * records)
-{
-  u32 i;
-  for (i = 0; i < vec_len (records); i++)
-    lisp_msg_put_mapping_record (b, &records[i]);
-}
-
-void *
-lisp_msg_put_gid (vlib_buffer_t * b, gid_address_t * gid)
-{
-  u8 *p = 0;
-  if (!gid)
-    {
-      /* insert only src-eid-afi field set to 0 */
-      p = vlib_buffer_put_uninit (b, sizeof (u16));
-      *(u16 *) p = 0;
-    }
-  else
-    {
-      p = vlib_buffer_put_uninit (b, gid_address_size_to_put (gid));
-      gid_address_put (p, gid);
-    }
-  return p;
-}
-
-static void *
-lisp_msg_put_itr_rlocs (lisp_cp_main_t * lcm, vlib_buffer_t * b,
-			gid_address_t * rlocs, u8 * locs_put)
-{
-  u8 *bp, count = 0;
-  u32 i;
-
-  bp = vlib_buffer_get_current (b);
-  for (i = 0; i < vec_len (rlocs); i++)
-    {
-      lisp_msg_put_gid (b, &rlocs[i]);
-      count++;
-    }
-
-  *locs_put = count - 1;
-  return bp;
-}
-
-void *
-lisp_msg_put_eid_rec (vlib_buffer_t * b, gid_address_t * eid)
-{
-  eid_record_hdr_t *h = vlib_buffer_put_uninit (b, sizeof (*h));
-
-  memset (h, 0, sizeof (*h));
-  EID_REC_MLEN (h) = gid_address_len (eid);
-  lisp_msg_put_gid (b, eid);
-  return h;
-}
-
-u64
-nonce_build (u32 seed)
-{
-  u64 nonce;
-  u32 nonce_lower;
-  u32 nonce_upper;
-  struct timespec ts;
-
-  /* Put nanosecond clock in lower 32-bits and put an XOR of the nanosecond
-   * clock with the seond clock in the upper 32-bits. */
-  syscall (SYS_clock_gettime, CLOCK_REALTIME, &ts);
-  nonce_lower = ts.tv_nsec;
-  nonce_upper = ts.tv_sec ^ clib_host_to_net_u32 (nonce_lower);
-
-  /* OR in a caller provided seed to the low-order 32-bits. */
-  nonce_lower |= seed;
-
-  /* Return 64-bit nonce. */
-  nonce = nonce_upper;
-  nonce = (nonce << 32) | nonce_lower;
-  return nonce;
-}
-
-void *
-lisp_msg_put_map_reply (vlib_buffer_t * b, mapping_t * records, u64 nonce,
-			u8 probe_bit)
-{
-  map_reply_hdr_t *h = vlib_buffer_put_uninit (b, sizeof (h[0]));
-
-  memset (h, 0, sizeof (h[0]));
-  MREP_TYPE (h) = LISP_MAP_REPLY;
-  MREP_NONCE (h) = nonce;
-  MREP_REC_COUNT (h) = 1;
-  MREP_RLOC_PROBE (h) = probe_bit;
-
-  lisp_msg_put_mreg_records (b, records);
-  return h;
-}
-
-void *
-lisp_msg_put_map_register (vlib_buffer_t * b, mapping_t * records,
-			   u8 want_map_notify, u16 auth_data_len, u64 * nonce,
-			   u32 * msg_len)
-{
-  u8 *auth_data = 0;
-
-  /* Basic header init */
-  map_register_hdr_t *h = vlib_buffer_put_uninit (b, sizeof (h[0]));
-
-  memset (h, 0, sizeof (h[0]));
-  MREG_TYPE (h) = LISP_MAP_REGISTER;
-  MREG_NONCE (h) = nonce_build (0);
-  MREG_WANT_MAP_NOTIFY (h) = want_map_notify ? 1 : 0;
-  MREG_REC_COUNT (h) = vec_len (records);
-
-  auth_data = vlib_buffer_put_uninit (b, auth_data_len);
-  memset (auth_data, 0, auth_data_len);
-
-  /* Put map register records */
-  lisp_msg_put_mreg_records (b, records);
-
-  nonce[0] = MREG_NONCE (h);
-  msg_len[0] = vlib_buffer_get_tail (b) - (u8 *) h;
-  return h;
-}
-
-void *
-lisp_msg_put_mreq (lisp_cp_main_t * lcm, vlib_buffer_t * b,
-		   gid_address_t * seid, gid_address_t * deid,
-		   gid_address_t * rlocs, u8 is_smr_invoked,
-		   u8 rloc_probe_set, u64 * nonce)
-{
-  u8 loc_count = 0;
-
-  /* Basic header init */
-  map_request_hdr_t *h = vlib_buffer_put_uninit (b, sizeof (h[0]));
-
-  memset (h, 0, sizeof (h[0]));
-  MREQ_TYPE (h) = LISP_MAP_REQUEST;
-  MREQ_NONCE (h) = nonce_build (0);
-  MREQ_SMR_INVOKED (h) = is_smr_invoked ? 1 : 0;
-  MREQ_RLOC_PROBE (h) = rloc_probe_set ? 1 : 0;
-
-  /* We're adding one eid record */
-  increment_record_count (h);
-
-  /* Fill source eid */
-  lisp_msg_put_gid (b, seid);
-
-  /* Put itr rlocs */
-  lisp_msg_put_itr_rlocs (lcm, b, rlocs, &loc_count);
-  MREQ_ITR_RLOC_COUNT (h) = loc_count;
-
-  /* Put eid record */
-  lisp_msg_put_eid_rec (b, deid);
-
-  nonce[0] = MREQ_NONCE (h);
-  return h;
-}
-
-void *
-lisp_msg_push_ecm (vlib_main_t * vm, vlib_buffer_t * b, int lp, int rp,
-		   gid_address_t * la, gid_address_t * ra)
-{
-  ecm_hdr_t *h;
-  ip_address_t _src_ip, *src_ip = &_src_ip, _dst_ip, *dst_ip = &_dst_ip;
-  if (gid_address_type (la) != GID_ADDR_IP_PREFIX)
-    {
-      /* empty ip4 */
-      memset (src_ip, 0, sizeof (src_ip[0]));
-      memset (dst_ip, 0, sizeof (dst_ip[0]));
-    }
-  else
-    {
-      src_ip = &gid_address_ip (la);
-      dst_ip = &gid_address_ip (ra);
-    }
-
-  /* Push inner ip and udp */
-  pkt_push_udp_and_ip (vm, b, lp, rp, src_ip, dst_ip);
-
-  /* Push lisp ecm hdr */
-  h = pkt_push_ecm_hdr (b);
-
-  return h;
-}
-
-static u32
-msg_type_to_hdr_len (lisp_msg_type_e type)
-{
-  switch (type)
-    {
-    case LISP_MAP_REQUEST:
-      return (sizeof (map_request_hdr_t));
-    case LISP_MAP_REPLY:
-      return (sizeof (map_reply_hdr_t));
-    default:
-      return (0);
-    }
-}
-
-void *
-lisp_msg_pull_hdr (vlib_buffer_t * b, lisp_msg_type_e type)
-{
-  return vlib_buffer_pull (b, msg_type_to_hdr_len (type));
-}
-
-u32
-lisp_msg_parse_addr (vlib_buffer_t * b, gid_address_t * eid)
-{
-  u32 len;
-  memset (eid, 0, sizeof (*eid));
-  len = gid_address_parse (vlib_buffer_get_current (b), eid);
-  if (len != ~0)
-    vlib_buffer_pull (b, len);
-  return len;
-}
-
-u32
-lisp_msg_parse_eid_rec (vlib_buffer_t * b, gid_address_t * eid)
-{
-  eid_record_hdr_t *h = vlib_buffer_get_current (b);
-  u32 len;
-  memset (eid, 0, sizeof (*eid));
-  len = gid_address_parse (EID_REC_ADDR (h), eid);
-  if (len == ~0)
-    return len;
-
-  gid_address_ippref_len (eid) = EID_REC_MLEN (h);
-  vlib_buffer_pull (b, len + sizeof (eid_record_hdr_t));
-
-  return len + sizeof (eid_record_hdr_t);
-}
-
-u32
-lisp_msg_parse_itr_rlocs (vlib_buffer_t * b, gid_address_t ** rlocs,
-			  u8 rloc_count)
-{
-  gid_address_t tloc;
-  u32 i, len = 0, tlen = 0;
-
-  //MREQ_ITR_RLOC_COUNT(mreq_hdr) + 1
-  for (i = 0; i < rloc_count; i++)
-    {
-      len = lisp_msg_parse_addr (b, &tloc);
-      if (len == ~0)
-	return len;
-      vec_add1 (*rlocs, tloc);
-      tlen += len;
-    }
-  return tlen;
-}
-
-u32
-lisp_msg_parse_loc (vlib_buffer_t * b, locator_t * loc)
-{
-  int len;
-
-  len = locator_parse (vlib_buffer_get_current (b), loc);
-  if (len == ~0)
-    return ~0;
-
-  vlib_buffer_pull (b, len);
-
-  return len;
-}
-
-u32
-lisp_msg_parse_mapping_record (vlib_buffer_t * b, gid_address_t * eid,
-			       locator_t ** locs, locator_t * probed_)
-{
-  void *h = 0, *loc_hdr = 0;
-  locator_t loc, *probed = 0;
-  int i = 0, len = 0, llen = 0;
-
-  h = vlib_buffer_get_current (b);
-  vlib_buffer_pull (b, sizeof (mapping_record_hdr_t));
-
-  memset (eid, 0, sizeof (*eid));
-  len = gid_address_parse (vlib_buffer_get_current (b), eid);
-  if (len == ~0)
-    return len;
-
-  vlib_buffer_pull (b, len);
-  if (GID_ADDR_IP_PREFIX == gid_address_type (eid))
-    gid_address_ippref_len (eid) = MAP_REC_EID_PLEN (h);
-
-  for (i = 0; i < MAP_REC_LOC_COUNT (h); i++)
-    {
-      loc_hdr = vlib_buffer_get_current (b);
-
-      llen = lisp_msg_parse_loc (b, &loc);
-      if (llen == ~0)
-	return llen;
-      vec_add1 (*locs, loc);
-      len += llen;
-
-      if (LOC_PROBED (loc_hdr))
-	{
-	  if (probed != 0)
-	    clib_warning
-	      ("Multiple locators probed! Probing only the first!");
-	  else
-	    probed = &loc;
-	}
-    }
-  /* XXX */
-  if (probed_ != 0 && probed)
-    *probed_ = *probed;
-
-  return len + sizeof (map_reply_hdr_t);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-cp/lisp_msg_serdes.h b/vnet/vnet/lisp-cp/lisp_msg_serdes.h
deleted file mode 100644
index d794eff6..00000000
--- a/vnet/vnet/lisp-cp/lisp_msg_serdes.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef VNET_LISP_GPE_LISP_MSG_BUILDER_H_
-#define VNET_LISP_GPE_LISP_MSG_BUILDER_H_
-
-#include <vnet/vnet.h>
-#include <vnet/lisp-cp/lisp_cp_messages.h>
-#include <vnet/lisp-cp/control.h>
-
-void *lisp_msg_put_mreq (lisp_cp_main_t * lcm, vlib_buffer_t * b,
-			 gid_address_t * seid, gid_address_t * deid,
-			 gid_address_t * rlocs, u8 is_smr_invoked,
-			 u8 rloc_probe_set, u64 * nonce);
-
-void *lisp_msg_put_map_register (vlib_buffer_t * b, mapping_t * records,
-				 u8 want_map_notify, u16 auth_data_len,
-				 u64 * nonce, u32 * msg_len);
-
-void *lisp_msg_push_ecm (vlib_main_t * vm, vlib_buffer_t * b, int lp, int rp,
-			 gid_address_t * la, gid_address_t * ra);
-
-void *lisp_msg_put_map_reply (vlib_buffer_t * b, mapping_t * record,
-			      u64 nonce, u8 probe_bit);
-
-u32
-lisp_msg_parse_mapping_record (vlib_buffer_t * b, gid_address_t * eid,
-			       locator_t ** locs, locator_t * probed_);
-
-u32 lisp_msg_parse_addr (vlib_buffer_t * b, gid_address_t * eid);
-
-u32 lisp_msg_parse_eid_rec (vlib_buffer_t * b, gid_address_t * eid);
-
-u32
-lisp_msg_parse_itr_rlocs (vlib_buffer_t * b, gid_address_t ** rlocs,
-			  u8 rloc_count);
-
-#endif /* VNET_LISP_GPE_LISP_MSG_BUILDER_H_ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-cp/lisp_types.c b/vnet/vnet/lisp-cp/lisp_types.c
deleted file mode 100644
index 5ab4a5eb..00000000
--- a/vnet/vnet/lisp-cp/lisp_types.c
+++ /dev/null
@@ -1,1574 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/lisp-cp/lisp_types.h>
-
-static u16 gid_address_put_no_vni (u8 * b, gid_address_t * gid);
-static u16 gid_address_size_to_put_no_vni (gid_address_t * gid);
-static u16 fid_addr_size_to_write (fid_address_t * a);
-
-u32 mac_parse (u8 * offset, u8 * a);
-
-typedef u16 (*size_to_write_fct) (void *);
-typedef void *(*cast_fct) (gid_address_t *);
-typedef u16 (*serdes_fct) (u8 *, void *);
-typedef u8 (*addr_len_fct) (void *);
-typedef void (*copy_fct) (void *, void *);
-typedef void (*free_fct) (void *);
-typedef int (*cmp_fct) (void *, void *);
-
-size_to_write_fct size_to_write_fcts[GID_ADDR_TYPES] =
-  { ip_prefix_size_to_write, lcaf_size_to_write, mac_size_to_write,
-  sd_size_to_write
-};
-serdes_fct write_fcts[GID_ADDR_TYPES] =
-  { ip_prefix_write, lcaf_write, mac_write, sd_write };
-cast_fct cast_fcts[GID_ADDR_TYPES] =
-  { ip_prefix_cast, lcaf_cast, mac_cast, sd_cast };
-addr_len_fct addr_len_fcts[GID_ADDR_TYPES] =
-  { ip_prefix_length, lcaf_length, mac_length, sd_length };
-copy_fct copy_fcts[GID_ADDR_TYPES] =
-  { ip_prefix_copy, lcaf_copy, mac_copy, sd_copy };
-
-#define foreach_lcaf_type \
-  _(1, no_addr)      \
-  _(0, NULL)         \
-  _(1, vni)          \
-  _(0, NULL)         \
-  _(0, NULL)         \
-  _(0, NULL)         \
-  _(0, NULL)         \
-  _(0, NULL)         \
-  _(0, NULL)         \
-  _(0, NULL)         \
-  _(0, NULL)         \
-  _(0, NULL)         \
-  _(1, sd)
-
-#define _(cond, name)                             \
-  u16 name ## _write (u8 * p, void * a);          \
-  u16 name ## _parse (u8 * p, void * a);          \
-  u16 name ## _size_to_write (void * a);          \
-  void name ## _free (void * a);                  \
-  void name ## _copy (void * dst, void * src);    \
-  u8 name ## _length (void * a);                  \
-  int name ## _cmp (void *, void *);
-foreach_lcaf_type
-#undef _
-#define CONCAT(a,b) a##_##b
-#define IF(c, t, e) CONCAT(IF, c)(t, e)
-#define IF_0(t, e) e
-#define IF_1(t, e) t
-#define EXPAND_FCN(cond, fcn)                           \
-  IF(cond, fcn, NULL)
-  cmp_fct lcaf_cmp_fcts[LCAF_TYPES] =
-{
-#define _(cond, name)                                   \
-    EXPAND_FCN(cond, name##_cmp),
-  foreach_lcaf_type
-#undef _
-};
-
-addr_len_fct lcaf_body_length_fcts[LCAF_TYPES] = {
-#define _(cond, name)                                   \
-    EXPAND_FCN(cond, name##_length),
-  foreach_lcaf_type
-#undef _
-};
-
-copy_fct lcaf_copy_fcts[LCAF_TYPES] = {
-#define _(cond, name)                                   \
-    EXPAND_FCN(cond, name##_copy),
-  foreach_lcaf_type
-#undef _
-};
-
-free_fct lcaf_free_fcts[LCAF_TYPES] = {
-#define _(cond, name)                                   \
-    EXPAND_FCN(cond, name##_free),
-  foreach_lcaf_type
-#undef _
-};
-
-size_to_write_fct lcaf_size_to_write_fcts[LCAF_TYPES] = {
-#define _(cond, name)                                   \
-    EXPAND_FCN(cond, name##_size_to_write),
-  foreach_lcaf_type
-#undef _
-};
-
-serdes_fct lcaf_write_fcts[LCAF_TYPES] = {
-#define _(cond, name)                                   \
-    EXPAND_FCN(cond, name##_write),
-  foreach_lcaf_type
-#undef _
-};
-
-serdes_fct lcaf_parse_fcts[LCAF_TYPES] = {
-#define _(cond, name)                                   \
-    EXPAND_FCN(cond, name##_parse),
-  foreach_lcaf_type
-#undef _
-};
-
-u8 *
-format_ip_address (u8 * s, va_list * args)
-{
-  ip_address_t *a = va_arg (*args, ip_address_t *);
-  u8 ver = ip_addr_version (a);
-  if (ver == IP4)
-    {
-      return format (s, "%U", format_ip4_address, &ip_addr_v4 (a));
-    }
-  else if (ver == IP6)
-    {
-      return format (s, "%U", format_ip6_address, &ip_addr_v6 (a));
-    }
-  else
-    {
-      clib_warning ("Can't format IP version %d!", ver);
-      return 0;
-    }
-}
-
-uword
-unformat_ip_address (unformat_input_t * input, va_list * args)
-{
-  ip_address_t *a = va_arg (*args, ip_address_t *);
-
-  memset (a, 0, sizeof (*a));
-  if (unformat (input, "%U", unformat_ip4_address, &ip_addr_v4 (a)))
-    ip_addr_version (a) = IP4;
-  else if (unformat_user (input, unformat_ip6_address, &ip_addr_v6 (a)))
-    ip_addr_version (a) = IP6;
-  else
-    return 0;
-  return 1;
-}
-
-u8 *
-format_ip_prefix (u8 * s, va_list * args)
-{
-  ip_prefix_t *a = va_arg (*args, ip_prefix_t *);
-  return format (s, "%U/%d", format_ip_address, &ip_prefix_addr (a),
-		 ip_prefix_len (a));
-}
-
-uword
-unformat_ip_prefix (unformat_input_t * input, va_list * args)
-{
-  ip_prefix_t *a = va_arg (*args, ip_prefix_t *);
-  if (unformat (input, "%U/%d", unformat_ip_address, &ip_prefix_addr (a),
-		&ip_prefix_len (a)))
-    {
-      if ((ip_prefix_version (a) == IP4 && 32 < ip_prefix_len (a)) ||
-	  (ip_prefix_version (a) == IP6 && 128 < ip_prefix_length (a)))
-	{
-	  clib_warning ("Prefix length to big: %d!", ip_prefix_len (a));
-	  return 0;
-	}
-      ip_prefix_normalize (a);
-    }
-  else
-    return 0;
-  return 1;
-}
-
-uword
-unformat_mac_address (unformat_input_t * input, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  return unformat (input, "%x:%x:%x:%x:%x:%x", &a[0], &a[1], &a[2], &a[3],
-		   &a[4], &a[5]);
-}
-
-u8 *
-format_mac_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
-		 a[0], a[1], a[2], a[3], a[4], a[5]);
-}
-
-u8 *
-format_fid_address (u8 * s, va_list * args)
-{
-  fid_address_t *a = va_arg (*args, fid_address_t *);
-
-  switch (fid_addr_type (a))
-    {
-    case FID_ADDR_IP_PREF:
-      return format (s, "%U", format_ip_prefix, &fid_addr_ippref (a));
-
-    case FID_ADDR_MAC:
-      return format (s, "%U", format_mac_address, &fid_addr_mac (a));
-
-    default:
-      clib_warning ("Can't format fid address type %d!", fid_addr_type (a));
-      return 0;
-    }
-  return 0;
-}
-
-u8 *
-format_gid_address (u8 * s, va_list * args)
-{
-  gid_address_t *a = va_arg (*args, gid_address_t *);
-  u8 type = gid_address_type (a);
-  switch (type)
-    {
-    case GID_ADDR_IP_PREFIX:
-      return format (s, "[%d] %U", gid_address_vni (a), format_ip_prefix,
-		     &gid_address_ippref (a));
-    case GID_ADDR_SRC_DST:
-      return format (s, "[%d] %U|%U", gid_address_vni (a),
-		     format_fid_address, &gid_address_sd_src (a),
-		     format_fid_address, &gid_address_sd_dst (a));
-    case GID_ADDR_MAC:
-      return format (s, "[%d] %U", gid_address_vni (a), format_mac_address,
-		     &gid_address_mac (a));
-    default:
-      clib_warning ("Can't format gid type %d", type);
-      return 0;
-    }
-  return 0;
-}
-
-uword
-unformat_fid_address (unformat_input_t * i, va_list * args)
-{
-  fid_address_t *a = va_arg (*args, fid_address_t *);
-  ip_prefix_t ippref;
-  u8 mac[6] = { 0 };
-
-  if (unformat (i, "%U", unformat_ip_prefix, &ippref))
-    {
-      fid_addr_type (a) = FID_ADDR_IP_PREF;
-      ip_prefix_copy (&fid_addr_ippref (a), &ippref);
-    }
-  else if (unformat (i, "%U", unformat_mac_address, mac))
-    {
-      fid_addr_type (a) = FID_ADDR_MAC;
-      mac_copy (fid_addr_mac (a), mac);
-    }
-  else
-    return 0;
-
-  return 1;
-}
-
-uword
-unformat_hmac_key_id (unformat_input_t * input, va_list * args)
-{
-  u32 *key_id = va_arg (*args, u32 *);
-  u8 *s = 0;
-
-  if (unformat (input, "%s", &s))
-    {
-      if (!strcmp ((char *) s, "sha1"))
-	key_id[0] = HMAC_SHA_1_96;
-      else if (!strcmp ((char *) s, "sha256"))
-	key_id[0] = HMAC_SHA_256_128;
-      else
-	{
-	  clib_warning ("invalid key_id: '%s'", s);
-	  key_id[0] = HMAC_NO_KEY;
-	}
-    }
-  else
-    return 0;
-
-  vec_free (s);
-  return 1;
-}
-
-uword
-unformat_gid_address (unformat_input_t * input, va_list * args)
-{
-  gid_address_t *a = va_arg (*args, gid_address_t *);
-  u8 mac[6] = { 0 };
-  ip_prefix_t ippref;
-  fid_address_t sim1, sim2;
-
-  memset (&ippref, 0, sizeof (ippref));
-  memset (&sim1, 0, sizeof (sim1));
-  memset (&sim2, 0, sizeof (sim2));
-
-  if (unformat (input, "%U|%U", unformat_fid_address, &sim1,
-		unformat_fid_address, &sim2))
-    {
-      gid_address_sd_src (a) = sim1;
-      gid_address_sd_dst (a) = sim2;
-      gid_address_type (a) = GID_ADDR_SRC_DST;
-    }
-  else if (unformat (input, "%U", unformat_ip_prefix, &ippref))
-    {
-      ip_prefix_copy (&gid_address_ippref (a), &ippref);
-      gid_address_type (a) = GID_ADDR_IP_PREFIX;
-    }
-  else if (unformat (input, "%U", unformat_mac_address, mac))
-    {
-      mac_copy (gid_address_mac (a), mac);
-      gid_address_type (a) = GID_ADDR_MAC;
-    }
-  else
-    return 0;
-
-  return 1;
-}
-
-uword
-unformat_negative_mapping_action (unformat_input_t * input, va_list * args)
-{
-  u32 *action = va_arg (*args, u32 *);
-  u8 *s = 0;
-
-  if (unformat (input, "%s", &s))
-    {
-      if (!strcmp ((char *) s, "no-action"))
-	action[0] = LISP_NO_ACTION;
-      else if (!strcmp ((char *) s, "natively-forward"))
-	action[0] = LISP_FORWARD_NATIVE;
-      else if (!strcmp ((char *) s, "send-map-request"))
-	action[0] = LISP_SEND_MAP_REQUEST;
-      else if (!strcmp ((char *) s, "drop"))
-	action[0] = LISP_DROP;
-      else
-	{
-	  clib_warning ("invalid action: '%s'", s);
-	  action[0] = LISP_DROP;
-	}
-    }
-  else
-    return 0;
-
-  vec_free (s);
-  return 1;
-}
-
-u8 *
-format_hmac_key_id (u8 * s, va_list * args)
-{
-  lisp_key_type_t key_id = va_arg (*args, lisp_key_type_t);
-
-  switch (key_id)
-    {
-    case HMAC_SHA_1_96:
-      return format (0, "sha1");
-    case HMAC_SHA_256_128:
-      return format (0, "sha256");
-    default:
-      return 0;
-    }
-
-  return 0;
-}
-
-u8 *
-format_negative_mapping_action (u8 * s, va_list * args)
-{
-  lisp_action_e action = va_arg (*args, lisp_action_e);
-
-  switch (action)
-    {
-    case LISP_NO_ACTION:
-      s = format (s, "no-action");
-      break;
-    case LISP_FORWARD_NATIVE:
-      s = format (s, "natively-forward");
-      break;
-    case LISP_SEND_MAP_REQUEST:
-      s = format (s, "send-map-request");
-      break;
-    case LISP_DROP:
-    default:
-      s = format (s, "drop");
-      break;
-    }
-  return (s);
-}
-
-u16
-ip_address_size (const ip_address_t * a)
-{
-  switch (ip_addr_version (a))
-    {
-    case IP4:
-      return sizeof (ip4_address_t);
-      break;
-    case IP6:
-      return sizeof (ip6_address_t);
-      break;
-    }
-  return 0;
-}
-
-u16
-ip_version_to_size (u8 ver)
-{
-  switch (ver)
-    {
-    case IP4:
-      return sizeof (ip4_address_t);
-      break;
-    case IP6:
-      return sizeof (ip6_address_t);
-      break;
-    }
-  return 0;
-}
-
-u8
-ip_version_to_max_plen (u8 ver)
-{
-  switch (ver)
-    {
-    case IP4:
-      return 32;
-      break;
-    case IP6:
-      return 128;
-      break;
-    }
-  return 0;
-}
-
-always_inline lisp_afi_e
-ip_version_to_iana_afi (u16 version)
-{
-  switch (version)
-    {
-    case IP4:
-      return LISP_AFI_IP;
-    case IP6:
-      return LISP_AFI_IP6;
-    default:
-      return 0;
-    }
-  return 0;
-}
-
-always_inline u8
-ip_iana_afi_to_version (lisp_afi_e afi)
-{
-  switch (afi)
-    {
-    case LISP_AFI_IP:
-      return IP4;
-    case LISP_AFI_IP6:
-      return IP6;
-    default:
-      return 0;
-    }
-  return 0;
-}
-
-u16
-ip_address_size_to_write (ip_address_t * a)
-{
-  return ip_address_size (a) + sizeof (u16);
-}
-
-u16
-ip_address_iana_afi (ip_address_t * a)
-{
-  return ip_version_to_iana_afi (ip_addr_version (a));
-}
-
-u8
-ip_address_max_len (u8 version)
-{
-  return version == IP4 ? 32 : 128;
-}
-
-u16
-ip4_address_size_to_put ()
-{
-  // return sizeof(u16) + sizeof (ip4_address_t);
-  return 6;
-}
-
-u16
-ip6_address_size_to_put ()
-{
-  //return sizeof(u16) + sizeof (ip6_address_t);
-  return 18;
-}
-
-u32
-ip4_address_put (u8 * b, ip4_address_t * a)
-{
-  *(u16 *) b = clib_host_to_net_u16 (ip_version_to_iana_afi (IP4));
-  u8 *p = b + sizeof (u16);
-  clib_memcpy (p, a, sizeof (*a));
-  return ip4_address_size_to_put ();
-}
-
-u32
-ip6_address_put (u8 * b, ip6_address_t * a)
-{
-  *(u16 *) b = clib_host_to_net_u16 (ip_version_to_iana_afi (IP6));
-  u8 *p = b + sizeof (u16);
-  clib_memcpy (p, a, sizeof (*a));
-  return ip6_address_size_to_put ();
-}
-
-u32
-ip_address_put (u8 * b, ip_address_t * a)
-{
-  u32 len = ip_address_size (a);
-  *(u16 *) b = clib_host_to_net_u16 (ip_address_iana_afi (a));
-  u8 *p = b + sizeof (u16);
-  clib_memcpy (p, &ip_addr_addr (a), len);
-  return (len + sizeof (u16));
-}
-
-u32
-ip_address_parse (void *offset, u16 iana_afi, ip_address_t * dst)
-{
-  ip_addr_version (dst) = ip_iana_afi_to_version (iana_afi);
-  u8 size = ip_version_to_size (ip_addr_version (dst));
-  clib_memcpy (&ip_addr_addr (dst), offset + sizeof (u16), size);
-  return (sizeof (u16) + size);
-}
-
-u32
-lcaf_hdr_parse (void *offset, lcaf_t * lcaf)
-{
-  lcaf_hdr_t *lh = offset;
-  lcaf->type = lh->type;
-
-  /* this is a bit of hack: since the LCAF Instance ID is the
-     only message that uses reserved2 field, we can set it here.
-     If any LCAF format starts using reserved2 field as well this needs
-     to be moved elsewhere */
-  lcaf_vni_len (lcaf) = lh->reserved2;
-
-  return sizeof (lh[0]);
-}
-
-static u8
-iana_afi_to_fid_addr_type (u16 type)
-{
-  switch (type)
-    {
-    case LISP_AFI_IP:
-    case LISP_AFI_IP6:
-      return FID_ADDR_IP_PREF;
-
-    case LISP_AFI_MAC:
-      return FID_ADDR_MAC;
-    }
-  return ~0;
-}
-
-static u16
-fid_addr_parse (u8 * p, fid_address_t * a)
-{
-  u16 afi = clib_net_to_host_u16 (*(u16 *) p);
-  fid_addr_type (a) = iana_afi_to_fid_addr_type (afi);
-  ip_address_t *ip_addr = &ip_prefix_addr (&fid_addr_ippref (a));
-
-  switch (fid_addr_type (a))
-    {
-    case FID_ADDR_MAC:
-      return mac_parse (p, fid_addr_mac (a));
-
-    case FID_ADDR_IP_PREF:
-      return ip_address_parse (p, afi, ip_addr);
-    }
-  return ~0;
-}
-
-u16
-sd_parse (u8 * p, void *a)
-{
-  lcaf_src_dst_hdr_t *sd_hdr;
-  gid_address_t *g = a;
-  u16 size = 0;
-  fid_address_t *src = &gid_address_sd_src (g);
-  fid_address_t *dst = &gid_address_sd_dst (g);
-
-  gid_address_type (g) = GID_ADDR_SRC_DST;
-
-  sd_hdr = (lcaf_src_dst_hdr_t *) (p + size);
-  size += sizeof (sd_hdr[0]);
-
-  size += fid_addr_parse (p + size, src);
-  size += fid_addr_parse (p + size, dst);
-
-  if (fid_addr_type (src) == FID_ADDR_IP_PREF)
-    {
-      ip_prefix_t *ippref = &fid_addr_ippref (src);
-      ip_prefix_len (ippref) = LCAF_SD_SRC_ML (sd_hdr);
-    }
-  if (fid_addr_type (dst) == FID_ADDR_IP_PREF)
-    {
-      ip_prefix_t *ippref = &fid_addr_ippref (dst);
-      ip_prefix_len (ippref) = LCAF_SD_DST_ML (sd_hdr);
-    }
-  return size;
-}
-
-u16
-try_parse_src_dst_lcaf (u8 * p, gid_address_t * a)
-{
-  lcaf_t lcaf;
-  u16 size = sizeof (u16);	/* skip AFI */
-
-  size += lcaf_hdr_parse (p + size, &lcaf);
-
-  if (LCAF_SOURCE_DEST != lcaf_type (&lcaf))
-    return ~0;
-
-  size += sd_parse (p + size, a);
-  return size;
-}
-
-u16
-vni_parse (u8 * p, void *a)
-{
-  lcaf_t *lcaf = a;
-  gid_address_t *g = a;
-  u16 size = 0;
-
-  gid_address_vni (g) = clib_net_to_host_u32 (*(u32 *) p);
-  size += sizeof (u32);
-  gid_address_vni_mask (g) = lcaf_vni_len (lcaf);
-
-  /* nested LCAFs are not supported except of src/dst with vni - to handle
-   * such case look at the next AFI and process src/dest LCAF separately */
-  u16 afi = clib_net_to_host_u16 (*((u16 *) (p + size)));
-  if (LISP_AFI_LCAF == afi)
-    {
-      u16 len = try_parse_src_dst_lcaf (p + size, g);
-      if ((u16) ~ 0 == len)
-	return ~0;
-      size += len;
-    }
-  else
-    size += gid_address_parse (p + size, g);
-
-  return size;
-}
-
-u16
-no_addr_parse (u8 * p, void *a)
-{
-  /* do nothing */
-  return 0;
-}
-
-u32
-lcaf_parse (void *offset, gid_address_t * addr)
-{
-  /* skip AFI type */
-  offset += sizeof (u16);
-  lcaf_t *lcaf = &gid_address_lcaf (addr);
-
-  u32 size = lcaf_hdr_parse (offset, lcaf);
-  u8 type = lcaf_type (lcaf);
-
-  if (!lcaf_parse_fcts[type])
-    {
-      clib_warning ("Unsupported LCAF type: %u", type);
-      return ~0;
-    }
-  size += (*lcaf_parse_fcts[type]) (offset + size, lcaf);
-  return sizeof (u16) + size;
-}
-
-void
-vni_free (void *a)
-{
-  vni_t *v = a;
-  gid_address_free (vni_gid (v));
-  clib_mem_free (vni_gid (v));
-}
-
-void
-no_addr_free (void *a)
-{
-  /* nothing to do */
-}
-
-void
-sd_free (void *a)
-{
-  /* nothing */
-}
-
-void
-gid_address_free (gid_address_t * a)
-{
-  if (gid_address_type (a) != GID_ADDR_LCAF)
-    return;
-
-  lcaf_t *lcaf = &gid_address_lcaf (a);
-  u8 lcaf_type = lcaf_type (lcaf);
-  (*lcaf_free_fcts[lcaf_type]) (lcaf);
-}
-
-void
-gid_address_from_ip (gid_address_t * g, ip_address_t * ip)
-{
-  memset (g, 0, sizeof (g[0]));
-  ip_address_set (&gid_address_ip (g), ip, ip_addr_version (ip));
-  gid_address_ippref_len (g) = 32;
-}
-
-int
-ip_address_cmp (const ip_address_t * ip1, const ip_address_t * ip2)
-{
-  int res = 0;
-  if (ip_addr_version (ip1) != ip_addr_version (ip2))
-    return -1;
-  res =
-    memcmp (&ip_addr_addr (ip1), &ip_addr_addr (ip2), ip_address_size (ip1));
-
-  if (res < 0)
-    res = 2;
-  else if (res > 0)
-    res = 1;
-
-  return res;
-}
-
-void
-ip_address_copy (ip_address_t * dst, const ip_address_t * src)
-{
-  if (IP4 == ip_addr_version (src))
-    {
-      /* don't copy any garbe from the union */
-      memset (dst, 0, sizeof (*dst));
-      dst->ip.v4 = src->ip.v4;
-      dst->version = IP4;
-    }
-  else
-    {
-      clib_memcpy (dst, src, sizeof (ip_address_t));
-    }
-}
-
-void
-ip_address_copy_addr (void *dst, const ip_address_t * src)
-{
-  clib_memcpy (dst, src, ip_address_size (src));
-}
-
-void
-ip_address_set (ip_address_t * dst, const void *src, u8 version)
-{
-  clib_memcpy (dst, src, ip_version_to_size (version));
-  ip_addr_version (dst) = version;
-}
-
-void
-ip_address_to_46 (const ip_address_t * addr,
-		  ip46_address_t * a, fib_protocol_t * proto)
-{
-  *proto = (IP4 == ip_addr_version (addr) ?
-	    FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6);
-  switch (*proto)
-    {
-    case FIB_PROTOCOL_IP4:
-      ip46_address_set_ip4 (a, &addr->ip.v4);
-      break;
-    case FIB_PROTOCOL_IP6:
-      a->ip6 = addr->ip.v6;
-      break;
-    default:
-      ASSERT (0);
-      break;
-    }
-}
-
-static void
-ip_prefix_normalize_ip4 (ip4_address_t * ip4, u8 preflen)
-{
-  u32 mask = ~0;
-
-  ASSERT (ip4);
-
-  if (32 <= preflen)
-    {
-      return;
-    }
-
-  mask = pow2_mask (preflen) << (32 - preflen);
-  mask = clib_host_to_net_u32 (mask);
-  ip4->data_u32 &= mask;
-}
-
-static void
-ip_prefix_normalize_ip6 (ip6_address_t * ip6, u8 preflen)
-{
-  u8 mask_6[16];
-  u32 *m;
-  u8 j, i0, i1;
-
-  ASSERT (ip6);
-
-  memset (mask_6, 0, sizeof (mask_6));
-
-  if (128 <= preflen)
-    {
-      return;
-    }
-
-  i1 = preflen % 32;
-  i0 = preflen / 32;
-  m = (u32 *) & mask_6[0];
-
-  for (j = 0; j < i0; j++)
-    {
-      m[j] = ~0;
-    }
-
-  if (i1)
-    {
-      m[i0] = clib_host_to_net_u32 (pow2_mask (i1) << (32 - i1));
-    }
-
-  for (j = 0; j < sizeof (mask_6); j++)
-    {
-      ip6->as_u8[j] &= mask_6[j];
-    }
-}
-
-void
-ip_prefix_normalize (ip_prefix_t * a)
-{
-  u8 preflen = ip_prefix_len (a);
-
-  switch (ip_prefix_version (a))
-    {
-    case IP4:
-      ip_prefix_normalize_ip4 (&ip_prefix_v4 (a), preflen);
-      break;
-
-    case IP6:
-      ip_prefix_normalize_ip6 (&ip_prefix_v6 (a), preflen);
-      break;
-
-    default:
-      ASSERT (0);
-    }
-}
-
-void *
-ip_prefix_cast (gid_address_t * a)
-{
-  return &gid_address_ippref (a);
-}
-
-u16
-ip_prefix_size_to_write (void *pref)
-{
-  ip_prefix_t *a = (ip_prefix_t *) pref;
-  return ip_address_size_to_write (&ip_prefix_addr (a));
-}
-
-u16
-ip_prefix_write (u8 * p, void *gid)
-{
-  gid_address_t *g = gid;
-  ip_prefix_t *a = &gid_address_ippref (g);
-
-  switch (ip_prefix_version (a))
-    {
-    case IP4:
-      return ip4_address_put (p, &ip_prefix_v4 (a));
-      break;
-    case IP6:
-      return ip6_address_put (p, &ip_prefix_v6 (a));
-      break;
-    }
-  return 0;
-}
-
-u8
-ip_prefix_length (void *a)
-{
-  return ip_prefix_len ((ip_prefix_t *) a);
-}
-
-void
-ip_prefix_copy (void *dst, void *src)
-{
-  clib_memcpy (dst, src, sizeof (ip_prefix_t));
-}
-
-void
-mac_copy (void *dst, void *src)
-{
-  clib_memcpy (dst, src, 6);
-}
-
-void
-sd_copy (void *dst, void *src)
-{
-  clib_memcpy (dst, src, sizeof (source_dest_t));
-}
-
-int
-ip_prefix_cmp (ip_prefix_t * p1, ip_prefix_t * p2)
-{
-  int cmp = 0;
-
-  ip_prefix_normalize (p1);
-  ip_prefix_normalize (p2);
-
-  cmp = ip_address_cmp (&ip_prefix_addr (p1), &ip_prefix_addr (p2));
-  if (cmp == 0)
-    {
-      if (ip_prefix_len (p1) < ip_prefix_len (p2))
-	{
-	  cmp = 1;
-	}
-      else
-	{
-	  if (ip_prefix_len (p1) > ip_prefix_len (p2))
-	    cmp = 2;
-	}
-    }
-  return cmp;
-}
-
-void
-no_addr_copy (void *dst, void *src)
-{
-  /* nothing to do */
-}
-
-void
-vni_copy (void *dst, void *src)
-{
-  vni_t *vd = dst;
-  vni_t *vs = src;
-
-  clib_memcpy (vd, vs, sizeof (vd[0]));
-  vni_gid (vd) = clib_mem_alloc (sizeof (gid_address_t));
-  gid_address_copy (vni_gid (vd), vni_gid (vs));
-}
-
-void
-lcaf_copy (void *dst, void *src)
-{
-  lcaf_t *lcaf_dst = dst;
-  lcaf_t *lcaf_src = src;
-
-  lcaf_type (lcaf_dst) = lcaf_type (lcaf_src);
-  (*lcaf_copy_fcts[lcaf_type (lcaf_src)]) (dst, src);
-}
-
-u8
-lcaf_length (void *a)
-{
-  return 0;
-}
-
-u8
-mac_length (void *a)
-{
-  return 0;
-}
-
-u8
-sd_length (void *a)
-{
-  return 0;
-}
-
-void *
-lcaf_cast (gid_address_t * a)
-{
-  return &gid_address_lcaf (a);
-}
-
-void *
-mac_cast (gid_address_t * a)
-{
-  return &gid_address_mac (a);
-}
-
-void *
-sd_cast (gid_address_t * a)
-{
-  return &gid_address_sd (a);
-}
-
-u8
-no_addr_length (void *a)
-{
-  return 0;
-}
-
-u8
-vni_length (void *a)
-{
-  vni_t *v = a;
-  return (sizeof (u32)		/* VNI size */
-	  + gid_address_size_to_put (vni_gid (v)) /* vni body size */ );
-}
-
-u16
-lcaf_write (u8 * p, void *a)
-{
-  u16 size = 0, len;
-  lcaf_t *lcaf = a;
-  u8 type = lcaf_type (lcaf);
-  lcaf_hdr_t _h, *h = &_h;
-
-  *(u16 *) p = clib_host_to_net_u16 (LISP_AFI_LCAF);
-  size += sizeof (u16);
-  memset (h, 0, sizeof (h[0]));
-  LCAF_TYPE (h) = type;
-  u16 lcaf_len = (*lcaf_body_length_fcts[type]) (lcaf);
-  LCAF_LENGTH (h) = clib_host_to_net_u16 (lcaf_len);
-
-  clib_memcpy (p + size, h, sizeof (h[0]));
-  size += sizeof (h[0]);
-  len = (*lcaf_write_fcts[type]) (p + size, lcaf);
-
-  if ((u16) ~ 0 == len)
-    return ~0;
-
-  return size + len;
-}
-
-u16
-mac_write (u8 * p, void *a)
-{
-  *(u16 *) p = clib_host_to_net_u16 (LISP_AFI_MAC);
-  clib_memcpy (p + sizeof (u16), a, 6);
-  return mac_size_to_write (a);
-}
-
-static u16
-fid_addr_write (u8 * p, fid_address_t * a)
-{
-  switch (fid_addr_type (a))
-    {
-    case FID_ADDR_IP_PREF:
-      return ip_prefix_write (p, &fid_addr_ippref (a));
-
-    case FID_ADDR_MAC:
-      return mac_write (p, &fid_addr_mac (a));
-
-    default:
-      return ~0;
-    }
-  return ~0;
-}
-
-static u8
-fid_address_length (fid_address_t * a)
-{
-  switch (fid_addr_type (a))
-    {
-    case FID_ADDR_IP_PREF:
-      return ip_prefix_length (&fid_addr_ippref (a));
-    case FID_ADDR_MAC:
-      return 0;
-    }
-  return 0;
-}
-
-u16
-sd_write (u8 * p, void *a)
-{
-  source_dest_t *sd = a;
-  u16 size = 0;
-  lcaf_hdr_t _h, *h = &_h;
-  lcaf_src_dst_hdr_t sd_hdr;
-
-  *(u16 *) p = clib_host_to_net_u16 (LISP_AFI_LCAF);
-  size += sizeof (u16);
-  memset (h, 0, sizeof (h[0]));
-  LCAF_TYPE (h) = LCAF_SOURCE_DEST;
-  u16 lcaf_len = sizeof (lcaf_src_dst_hdr_t)
-    + fid_addr_size_to_write (&sd_src (sd))
-    + fid_addr_size_to_write (&sd_dst (sd));
-  LCAF_LENGTH (h) = clib_host_to_net_u16 (lcaf_len);
-
-  clib_memcpy (p + size, h, sizeof (h[0]));
-  size += sizeof (h[0]);
-
-  memset (&sd_hdr, 0, sizeof (sd_hdr));
-  LCAF_SD_SRC_ML (&sd_hdr) = fid_address_length (&sd_src (sd));
-  LCAF_SD_DST_ML (&sd_hdr) = fid_address_length (&sd_dst (sd));
-  clib_memcpy (p + size, &sd_hdr, sizeof (sd_hdr));
-  size += sizeof (sd_hdr);
-
-  u16 len = fid_addr_write (p + size, &sd_src (sd));
-  if ((u16) ~ 0 == len)
-    return ~0;
-  size += len;
-
-  len = fid_addr_write (p + size, &sd_dst (sd));
-  if ((u16) ~ 0 == len)
-    return ~0;
-  size += len;
-
-  return size;
-}
-
-u16
-vni_write (u8 * p, void *a)
-{
-  lcaf_hdr_t _h, *h = &_h;
-  gid_address_t *g = a;
-  u16 size = 0, len;
-
-  /* put lcaf header */
-  *(u16 *) p = clib_host_to_net_u16 (LISP_AFI_LCAF);
-  size += sizeof (u16);
-  memset (h, 0, sizeof (h[0]));
-  LCAF_TYPE (h) = LCAF_INSTANCE_ID;
-  u16 lcaf_len = sizeof (u32)	/* Instance ID size */
-    + gid_address_size_to_put_no_vni (g);
-  LCAF_LENGTH (h) = clib_host_to_net_u16 (lcaf_len);
-  LCAF_RES2 (h) = gid_address_vni_mask (g);
-
-  /* put vni header */
-  clib_memcpy (p + size, h, sizeof (h[0]));
-  size += sizeof (h[0]);
-
-  u32 *afip = (u32 *) (p + size);
-  afip[0] = clib_host_to_net_u32 (gid_address_vni (g));
-  size += sizeof (u32);
-
-  if (GID_ADDR_SRC_DST == gid_address_type (g))
-    /* write src/dst LCAF */
-    {
-      len = sd_write (p + size, g);
-      if ((u16) ~ 0 == len)
-	return ~0;
-    }
-  else
-    /* write the actual address */
-    len = gid_address_put_no_vni (p + size, g);
-
-  if ((u16) ~ 0 == len)
-    return ~0;
-
-  return size + len;
-}
-
-u16
-no_addr_write (u8 * p, void *a)
-{
-  /* do nothing; return AFI field size */
-  return sizeof (u16);
-}
-
-u16
-no_addr_size_to_write (void *a)
-{
-  return sizeof (u16);		/* AFI field length */
-}
-
-static u16
-fid_addr_size_to_write (fid_address_t * a)
-{
-  switch (fid_addr_type (a))
-    {
-    case FID_ADDR_IP_PREF:
-      return ip_prefix_size_to_write (a);
-
-    case FID_ADDR_MAC:
-      return mac_size_to_write (a);
-
-    default:
-      break;
-    }
-  return 0;
-}
-
-u16
-vni_size_to_write (void *a)
-{
-  gid_address_t *g = a;
-
-  u16 lcaf_size = sizeof (u32) + sizeof (u16)	/* LCAF AFI field size */
-    + sizeof (lcaf_hdr_t);
-
-  if (gid_address_type (g) == GID_ADDR_SRC_DST)
-    /* special case where nested LCAF is supported */
-    return lcaf_size + sd_size_to_write (g);
-  else
-    return lcaf_size + gid_address_size_to_put_no_vni (g);
-}
-
-u16
-lcaf_size_to_write (void *a)
-{
-  lcaf_t *lcaf = (lcaf_t *) a;
-  u32 size = 0, len;
-  u8 type = lcaf_type (lcaf);
-
-  size += sizeof (u16);		/* AFI size */
-
-  len = (*lcaf_size_to_write_fcts[type]) (lcaf);
-  if (~0 == len)
-    return ~0;
-
-  return size + len;
-}
-
-u16
-sd_size_to_write (void *a)
-{
-  source_dest_t *sd = a;
-  return sizeof (u16)
-    + sizeof (lcaf_hdr_t)
-    + sizeof (lcaf_src_dst_hdr_t)
-    + fid_addr_size_to_write (&sd_src (sd))
-    + fid_addr_size_to_write (&sd_dst (sd));
-}
-
-u16
-mac_size_to_write (void *a)
-{
-  return sizeof (u16) + 6;
-}
-
-u8
-gid_address_len (gid_address_t * a)
-{
-  gid_address_type_t type = gid_address_type (a);
-  return (*addr_len_fcts[type]) ((*cast_fcts[type]) (a));
-}
-
-static u16
-gid_address_put_no_vni (u8 * b, gid_address_t * gid)
-{
-  gid_address_type_t type = gid_address_type (gid);
-  return (*write_fcts[type]) (b, (*cast_fcts[type]) (gid));
-}
-
-u16
-gid_address_put (u8 * b, gid_address_t * gid)
-{
-  if (0 != gid_address_vni (gid))
-    return vni_write (b, gid);
-
-  return gid_address_put_no_vni (b, gid);
-}
-
-static u16
-gid_address_size_to_put_no_vni (gid_address_t * gid)
-{
-  gid_address_type_t type = gid_address_type (gid);
-  return (*size_to_write_fcts[type]) ((*cast_fcts[type]) (gid));
-}
-
-u16
-gid_address_size_to_put (gid_address_t * gid)
-{
-  if (0 != gid_address_vni (gid))
-    return vni_size_to_write (gid);
-
-  return gid_address_size_to_put_no_vni (gid);
-}
-
-void *
-gid_address_cast (gid_address_t * gid, gid_address_type_t type)
-{
-  return (*cast_fcts[type]) (gid);
-}
-
-void
-gid_address_copy (gid_address_t * dst, gid_address_t * src)
-{
-  gid_address_type_t type = gid_address_type (src);
-  (*copy_fcts[type]) ((*cast_fcts[type]) (dst), (*cast_fcts[type]) (src));
-  gid_address_type (dst) = type;
-  gid_address_vni (dst) = gid_address_vni (src);
-  gid_address_vni_mask (dst) = gid_address_vni_mask (src);
-}
-
-u32
-mac_parse (u8 * offset, u8 * a)
-{
-  /* skip AFI field */
-  offset += sizeof (u16);
-
-  clib_memcpy (a, offset, 6);
-  return sizeof (u16) + 6;
-}
-
-u32
-gid_address_parse (u8 * offset, gid_address_t * a)
-{
-  lisp_afi_e afi;
-  int len = 0;
-
-  if (!a)
-    return 0;
-
-  /* NOTE: since gid_address_parse may be called by vni_parse, we can't 0
-   * the gid address here */
-  afi = clib_net_to_host_u16 (*((u16 *) offset));
-
-  switch (afi)
-    {
-    case LISP_AFI_NO_ADDR:
-      len = sizeof (u16);
-      gid_address_type (a) = GID_ADDR_NO_ADDRESS;
-      break;
-    case LISP_AFI_IP:
-      len = ip_address_parse (offset, afi, &gid_address_ip (a));
-      gid_address_type (a) = GID_ADDR_IP_PREFIX;
-      /* this should be modified outside if needed */
-      gid_address_ippref_len (a) = 32;
-      break;
-    case LISP_AFI_IP6:
-      len = ip_address_parse (offset, afi, &gid_address_ip (a));
-      gid_address_type (a) = GID_ADDR_IP_PREFIX;
-      /* this should be modified outside if needed */
-      gid_address_ippref_len (a) = 128;
-      break;
-    case LISP_AFI_LCAF:
-      gid_address_type (a) = GID_ADDR_LCAF;
-      len = lcaf_parse (offset, a);
-      break;
-    case LISP_AFI_MAC:
-      len = mac_parse (offset, gid_address_mac (a));
-      gid_address_type (a) = GID_ADDR_MAC;
-      break;
-    default:
-      clib_warning ("LISP AFI %d not supported!", afi);
-      return ~0;
-    }
-  return len;
-}
-
-void
-gid_address_ip_set (gid_address_t * dst, void *src, u8 version)
-{
-  gid_address_ippref_len (dst) = ip_address_max_len (version);
-  ip_address_set (&gid_address_ip (dst), src, version);
-}
-
-int
-no_addr_cmp (void *a1, void *a2)
-{
-  return 0;
-}
-
-int
-vni_cmp (void *a1, void *a2)
-{
-  vni_t *v1 = a1;
-  vni_t *v2 = a2;
-
-  if (vni_mask_len (v1) != vni_mask_len (v2))
-    return -1;
-  if (vni_vni (v1) != vni_vni (v2))
-    return -1;
-  return gid_address_cmp (vni_gid (v1), vni_gid (v2));
-}
-
-static int
-mac_cmp (void *a1, void *a2)
-{
-  return memcmp (a1, a2, 6);
-}
-
-static int
-fid_addr_cmp (fid_address_t * a1, fid_address_t * a2)
-{
-  if (fid_addr_type (a1) != fid_addr_type (a2))
-    return -1;
-
-  switch (fid_addr_type (a1))
-    {
-    case FID_ADDR_IP_PREF:
-      return ip_prefix_cmp (&fid_addr_ippref (a1), &fid_addr_ippref (a2));
-
-    case FID_ADDR_MAC:
-      return mac_cmp (fid_addr_mac (a1), fid_addr_mac (a2));
-
-    default:
-      return -1;
-    }
-  return -1;
-}
-
-int
-sd_cmp (void *a1, void *a2)
-{
-  source_dest_t *sd1 = a1;
-  source_dest_t *sd2 = a2;
-
-  if (fid_addr_cmp (&sd_dst (sd1), &sd_dst (sd2)))
-    return -1;
-  if (fid_addr_cmp (&sd_src (sd1), &sd_src (sd2)))
-    return -1;
-  return 0;
-}
-
-/* Compare two gid_address_t.
- * Returns:
- *        -1: If they are from different afi
- *             0: Both address are the same
- *             1: Addr1 is bigger than addr2
- *             2: Addr2 is bigger than addr1
- */
-int
-gid_address_cmp (gid_address_t * a1, gid_address_t * a2)
-{
-  lcaf_t *lcaf1, *lcaf2;
-  int cmp = -1;
-  if (!a1 || !a2)
-    return -1;
-  if (gid_address_type (a1) != gid_address_type (a2))
-    return -1;
-  if (gid_address_vni (a1) != gid_address_vni (a2))
-    return -1;
-  if (gid_address_vni_mask (a1) != gid_address_vni_mask (a2))
-    return -1;
-
-  switch (gid_address_type (a1))
-    {
-    case GID_ADDR_NO_ADDRESS:
-      if (a1 == a2)
-	cmp = 0;
-      else
-	cmp = 2;
-      break;
-    case GID_ADDR_IP_PREFIX:
-      cmp =
-	ip_prefix_cmp (&gid_address_ippref (a1), &gid_address_ippref (a2));
-      break;
-    case GID_ADDR_LCAF:
-      lcaf1 = &gid_address_lcaf (a1);
-      lcaf2 = &gid_address_lcaf (a2);
-      if (lcaf_type (lcaf1) == lcaf_type (lcaf2))
-	cmp = (*lcaf_cmp_fcts[lcaf_type (lcaf1)]) (lcaf1, lcaf2);
-      break;
-    case GID_ADDR_MAC:
-      cmp = mac_cmp (gid_address_mac (a1), gid_address_mac (a2));
-      break;
-
-    case GID_ADDR_SRC_DST:
-      cmp = sd_cmp (&gid_address_sd (a1), &gid_address_sd (a2));
-      break;
-    default:
-      break;
-    }
-
-  return cmp;
-}
-
-u32
-locator_parse (void *b, locator_t * loc)
-{
-  locator_hdr_t *h;
-  u8 status = 1;		/* locator up */
-  int len;
-
-  h = b;
-  if (!LOC_REACHABLE (h) && LOC_LOCAL (h))
-    status = 0;
-
-  len = gid_address_parse (LOC_ADDR (h), &loc->address);
-  if (len == ~0)
-    return len;
-
-  loc->state = status;
-  loc->local = 0;
-  loc->priority = LOC_PRIORITY (h);
-  loc->weight = LOC_WEIGHT (h);
-  loc->mpriority = LOC_MPRIORITY (h);
-  loc->mweight = LOC_MWEIGHT (h);
-
-  return sizeof (locator_hdr_t) + len;
-}
-
-void
-locator_copy (locator_t * dst, locator_t * src)
-{
-  /* TODO if gid become more complex, this will need to be changed! */
-  clib_memcpy (dst, src, sizeof (*dst));
-  if (!src->local)
-    gid_address_copy (&dst->address, &src->address);
-}
-
-u32
-locator_cmp (locator_t * l1, locator_t * l2)
-{
-  u32 ret = 0;
-  if ((ret = gid_address_cmp (&l1->address, &l2->address)) != 0)
-    return 1;
-
-  if (l1->priority != l2->priority)
-    return 1;
-  if (l1->weight != l2->weight)
-    return 1;
-  if (l1->mpriority != l2->mpriority)
-    return 1;
-  if (l1->mweight != l2->mweight)
-    return 1;
-  return 0;
-}
-
-void
-locator_free (locator_t * l)
-{
-  if (!l->local)
-    gid_address_free (&l->address);
-}
-
-void
-build_src_dst (gid_address_t * sd, gid_address_t * src, gid_address_t * dst)
-{
-  memset (sd, 0, sizeof (*sd));
-  gid_address_type (sd) = GID_ADDR_SRC_DST;
-  gid_address_vni (sd) = gid_address_vni (dst);
-  gid_address_vni_mask (sd) = gid_address_vni_mask (dst);
-
-  switch (gid_address_type (dst))
-    {
-    case GID_ADDR_IP_PREFIX:
-      gid_address_sd_src_type (sd) = FID_ADDR_IP_PREF;
-      gid_address_sd_dst_type (sd) = FID_ADDR_IP_PREF;
-      ip_prefix_copy (&gid_address_sd_src_ippref (sd),
-		      &gid_address_ippref (src));
-      ip_prefix_copy (&gid_address_sd_dst_ippref (sd),
-		      &gid_address_ippref (dst));
-      break;
-    case GID_ADDR_MAC:
-      gid_address_sd_src_type (sd) = FID_ADDR_MAC;
-      gid_address_sd_dst_type (sd) = FID_ADDR_MAC;
-      mac_copy (gid_address_sd_src_mac (sd), gid_address_mac (src));
-      mac_copy (gid_address_sd_dst_mac (sd), gid_address_mac (dst));
-      break;
-    default:
-      clib_warning ("Unsupported gid type %d while conversion!",
-		    gid_address_type (dst));
-      break;
-    }
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-cp/lisp_types.h b/vnet/vnet/lisp-cp/lisp_types.h
deleted file mode 100644
index ac58b894..00000000
--- a/vnet/vnet/lisp-cp/lisp_types.h
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef VNET_LISP_GPE_LISP_TYPES_H_
-#define VNET_LISP_GPE_LISP_TYPES_H_
-
-#include <vnet/ip/ip.h>
-#include <vnet/lisp-cp/lisp_cp_messages.h>
-
-#define SHA1_AUTH_DATA_LEN                  20
-#define SHA256_AUTH_DATA_LEN                32
-
-typedef enum
-{
-  HMAC_NO_KEY = 0,
-  HMAC_SHA_1_96,
-  HMAC_SHA_256_128
-} lisp_key_type_t;
-
-uword unformat_hmac_key_id (unformat_input_t * input, va_list * args);
-u8 *format_hmac_key_id (u8 * s, va_list * args);
-
-typedef enum
-{
-  IP4,
-  IP6
-} ip_address_type_t;
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED(struct ip_address
-{
-  union
-  {
-    ip4_address_t v4;
-    ip6_address_t v6;
-  } ip;
-  u8 version;
-}) ip_address_t;
-/* *INDENT-ON* */
-
-#define ip_addr_addr(_a) (_a)->ip
-#define ip_addr_v4(_a) (_a)->ip.v4
-#define ip_addr_v6(_a) (_a)->ip.v6
-#define ip_addr_version(_a) (_a)->version
-
-int ip_address_cmp (const ip_address_t * ip1, const ip_address_t * ip2);
-void ip_address_copy (ip_address_t * dst, const ip_address_t * src);
-void ip_address_copy_addr (void *dst, const ip_address_t * src);
-void ip_address_set (ip_address_t * dst, const void *src, u8 version);
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED(struct ip_prefix
-{
-  ip_address_t addr;
-  u8 len;
-}) ip_prefix_t;
-/* *INDENT-ON* */
-
-#define ip_prefix_addr(_a) (_a)->addr
-#define ip_prefix_version(_a) ip_addr_version(&ip_prefix_addr(_a))
-#define ip_prefix_len(_a) (_a)->len
-#define ip_prefix_v4(_a) ip_addr_v4(&ip_prefix_addr(_a))
-#define ip_prefix_v6(_a) ip_addr_v6(&ip_prefix_addr(_a))
-
-void ip_prefix_normalize (ip_prefix_t * a);
-
-extern void ip_address_to_fib_prefix (const ip_address_t * addr,
-				      fib_prefix_t * prefix);
-extern void ip_prefix_to_fib_prefix (const ip_prefix_t * ipp,
-				     fib_prefix_t * fibp);
-
-typedef enum
-{
-  /* NOTE: ip addresses are left out on purpose. Use max masked ip-prefixes
-   * instead */
-  GID_ADDR_IP_PREFIX,
-  GID_ADDR_LCAF,
-  GID_ADDR_MAC,
-  GID_ADDR_SRC_DST,
-  GID_ADDR_NO_ADDRESS,
-  GID_ADDR_TYPES
-} gid_address_type_t;
-
-typedef enum
-{
-  /* make sure that values corresponds with RFC */
-  LCAF_NULL_BODY = 0,
-  LCAF_AFI_LIST_TYPE,
-  LCAF_INSTANCE_ID,
-  LCAF_SOURCE_DEST = 12,
-  LCAF_TYPES
-} lcaf_type_t;
-
-typedef enum fid_addr_type_t_
-{
-  FID_ADDR_IP_PREF,
-  FID_ADDR_MAC
-} __attribute__ ((packed)) fid_addr_type_t;
-
-/* flat address type */
-typedef struct
-{
-  union
-  {
-    ip_prefix_t ippref;
-    u8 mac[6];
-  };
-  fid_addr_type_t type;
-} fid_address_t;
-
-typedef fid_address_t dp_address_t;
-
-#define fid_addr_ippref(_a) (_a)->ippref
-#define fid_addr_mac(_a) (_a)->mac
-#define fid_addr_type(_a) (_a)->type
-u8 *format_fid_address (u8 * s, va_list * args);
-
-typedef struct
-{
-  fid_address_t src;
-  fid_address_t dst;
-} source_dest_t;
-
-#define sd_dst(_a) (_a)->dst
-#define sd_src(_a) (_a)->src
-#define sd_src_ippref(_a) fid_addr_ippref(&sd_src(_a))
-#define sd_dst_ippref(_a) fid_addr_ippref(&sd_dst(_a))
-#define sd_src_mac(_a) fid_addr_mac(&sd_src(_a))
-#define sd_dst_mac(_a) fid_addr_mac(&sd_dst(_a))
-#define sd_src_type(_a) fid_addr_type(&sd_src(_a))
-#define sd_dst_type(_a) fid_addr_type(&sd_dst(_a))
-
-typedef struct
-{
-  u8 vni_mask_len;
-  u32 vni;
-  struct _gid_address_t *gid_addr;
-} vni_t;
-
-#define vni_vni(_a) (_a)->vni
-#define vni_mask_len(_a) (_a)->vni_mask_len
-#define vni_gid(_a) (_a)->gid_addr
-
-typedef struct
-{
-  /* the union needs to be at the beginning! */
-  union
-  {
-    source_dest_t sd;
-    vni_t uni;
-  };
-  u8 type;
-} lcaf_t;
-
-#define lcaf_type(_a) (_a)->type
-#define lcaf_vni(_a) vni_vni(& (_a)->uni)
-#define lcaf_vni_len(_a) vni_mask_len(& (_a)->uni)
-
-/* might want to expand this in the future :) */
-typedef struct _gid_address_t
-{
-  union
-  {
-    ip_prefix_t ippref;
-    lcaf_t lcaf;
-    u8 mac[6];
-    source_dest_t sd;
-  };
-  u8 type;
-  u32 vni;
-  u8 vni_mask;
-} gid_address_t;
-
-u8 *format_ip_address (u8 * s, va_list * args);
-uword unformat_ip_address (unformat_input_t * input, va_list * args);
-u8 *format_ip_prefix (u8 * s, va_list * args);
-uword unformat_ip_prefix (unformat_input_t * input, va_list * args);
-u8 *format_mac_address (u8 * s, va_list * args);
-uword unformat_mac_address (unformat_input_t * input, va_list * args);
-
-u16 ip4_address_size_to_put ();
-u16 ip6_address_size_to_put ();
-u32 ip4_address_put (u8 * b, ip4_address_t * a);
-u32 ip6_address_put (u8 * b, ip6_address_t * a);
-
-u16 ip_address_size_to_write (ip_address_t * a);
-u16 ip_address_iana_afi (ip_address_t * a);
-u8 ip_address_max_len (u8 ver);
-u32 ip_address_put (u8 * b, ip_address_t * a);
-void ip_address_to_46 (const ip_address_t * addr,
-		       ip46_address_t * a, fib_protocol_t * proto);
-
-/* LISP AFI codes  */
-typedef enum
-{
-  LISP_AFI_NO_ADDR,
-  LISP_AFI_IP,
-  LISP_AFI_IP6,
-  LISP_AFI_LCAF = 16387,
-  LISP_AFI_MAC = 16389
-} lisp_afi_e;
-
-u8 *format_gid_address (u8 * s, va_list * args);
-uword unformat_gid_address (unformat_input_t * input, va_list * args);
-int gid_address_cmp (gid_address_t * a1, gid_address_t * a2);
-void gid_address_free (gid_address_t * a);
-
-u16 gid_address_size_to_put (gid_address_t * a);
-u16 gid_address_put (u8 * b, gid_address_t * gid);
-u8 gid_address_len (gid_address_t * a);
-void *gid_address_cast (gid_address_t * gid, gid_address_type_t type);
-void gid_address_copy (gid_address_t * dst, gid_address_t * src);
-u32 gid_address_parse (u8 * offset, gid_address_t * a);
-void gid_address_ip_set (gid_address_t * dst, void *src, u8 version);
-
-#define gid_address_type(_a) (_a)->type
-#define gid_address_ippref(_a) (_a)->ippref
-#define gid_address_ippref_len(_a) (_a)->ippref.len
-#define gid_address_ip(_a) ip_prefix_addr(&gid_address_ippref(_a))
-#define gid_address_ip_version(_a) ip_addr_version(&gid_address_ip(_a))
-#define gid_address_lcaf(_a) (_a)->lcaf
-#define gid_address_mac(_a) (_a)->mac
-#define gid_address_vni(_a) (_a)->vni
-#define gid_address_vni_mask(_a) (_a)->vni_mask
-#define gid_address_sd_dst_ippref(_a) sd_dst_ippref(&(_a)->sd)
-#define gid_address_sd_src_ippref(_a) sd_src_ippref(&(_a)->sd)
-#define gid_address_sd_dst_mac(_a) sd_dst_mac(&(_a)->sd)
-#define gid_address_sd_src_mac(_a) sd_src_mac(&(_a)->sd)
-#define gid_address_sd(_a) (_a)->sd
-#define gid_address_sd_src(_a) sd_src(&gid_address_sd(_a))
-#define gid_address_sd_dst(_a) sd_dst(&gid_address_sd(_a))
-#define gid_address_sd_src_type(_a) sd_src_type(&gid_address_sd(_a))
-#define gid_address_sd_dst_type(_a) sd_dst_type(&gid_address_sd(_a))
-
-/* 'sub'address functions */
-#define foreach_gid_address_type_fcns  \
-  _(ip_prefix)                    \
-  _(lcaf)                         \
-  _(mac)                          \
-  _(sd)
-
-/* *INDENT-OFF* */
-#define _(_n)                                 \
-u16    _n ## _size_to_write (void * pref);    \
-u16    _n ## _write (u8 * p, void * pref);    \
-u8     _n ## _length (void *a);               \
-void * _n ## _cast (gid_address_t * a);       \
-void   _n ## _copy (void * dst , void * src);
-
-foreach_gid_address_type_fcns
-#undef _
-/* *INDENT-ON* */
-
-always_inline u64
-mac_to_u64 (u8 * m)
-{
-  return (*((u64 *) m) & 0xffffffffffff);
-}
-
-typedef struct
-{
-  /* mark locator as local as opposed to remote */
-  u8 local;
-  u8 state;
-  union
-  {
-    u32 sw_if_index;
-    gid_address_t address;
-  };
-  u8 priority;
-  u8 weight;
-  u8 mpriority;
-  u8 mweight;
-  u8 probed;
-} locator_t;
-
-u32 locator_parse (void *ptr, locator_t * loc);
-void locator_copy (locator_t * dst, locator_t * src);
-u32 locator_cmp (locator_t * l1, locator_t * l2);
-void locator_free (locator_t * l);
-
-typedef struct
-{
-  /* locator-set name */
-  u8 *name;
-
-  /* vector of locator indices */
-  u32 *locator_indices;
-  u8 local;
-} locator_set_t;
-
-typedef struct
-{
-  gid_address_t eid;
-
-  /* index of local locator set */
-  union
-  {
-    u32 locator_set_index;
-    locator_t *locators;	/* used for map register message */
-  };
-
-  u32 ttl;
-  u8 action;
-  u8 authoritative;
-
-  u8 local;
-  /* valid only for remote mappings */
-  u8 is_static;
-  u8 *key;
-  lisp_key_type_t key_id;
-  u8 timer_set;
-} mapping_t;
-
-uword
-unformat_negative_mapping_action (unformat_input_t * input, va_list * args);
-u8 *format_negative_mapping_action (u8 *, va_list * args);
-
-typedef struct locator_pair
-{
-  /* local and remote locators (underlay attachment points) */
-  ip_address_t lcl_loc;
-  ip_address_t rmt_loc;
-
-  u8 priority;
-  u8 weight;
-} locator_pair_t;
-
-void
-build_src_dst (gid_address_t * sd, gid_address_t * src, gid_address_t * dst);
-
-void gid_address_from_ip (gid_address_t * g, ip_address_t * ip);
-
-#endif /* VNET_LISP_GPE_LISP_TYPES_H_ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-cp/packets.c b/vnet/vnet/lisp-cp/packets.c
deleted file mode 100644
index 3a4f421b..00000000
--- a/vnet/vnet/lisp-cp/packets.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/lisp-cp/packets.h>
-#include <vnet/lisp-cp/lisp_cp_messages.h>
-#include <vnet/ip/udp_packet.h>
-
-/* Returns IP ID for the packet */
-/* static u16 ip_id = 0;
-static inline u16
-get_IP_ID()
-{
-    ip_id++;
-    return (ip_id);
-} */
-
-u16
-udp_ip4_checksum (const void *b, u32 len, u8 * src, u8 * dst)
-{
-  const u16 *buf = b;
-  u16 *ip_src = (u16 *) src;
-  u16 *ip_dst = (u16 *) dst;
-  u32 length = len;
-  u32 sum = 0;
-
-  while (len > 1)
-    {
-      sum += *buf++;
-      if (sum & 0x80000000)
-	sum = (sum & 0xFFFF) + (sum >> 16);
-      len -= 2;
-    }
-
-  /* Add the padding if the packet length is odd */
-  if (len & 1)
-    sum += *((u8 *) buf);
-
-  /* Add the pseudo-header */
-  sum += *(ip_src++);
-  sum += *ip_src;
-
-  sum += *(ip_dst++);
-  sum += *ip_dst;
-
-  sum += clib_host_to_net_u16 (IP_PROTOCOL_UDP);
-  sum += clib_host_to_net_u16 (length);
-
-  /* Add the carries */
-  while (sum >> 16)
-    sum = (sum & 0xFFFF) + (sum >> 16);
-
-  /* Return the one's complement of sum */
-  return ((u16) (~sum));
-}
-
-u16
-udp_ip6_checksum (ip6_header_t * ip6, udp_header_t * up, u32 len)
-{
-  size_t i;
-  register const u16 *sp;
-  u32 sum;
-  union
-  {
-    struct
-    {
-      ip6_address_t ph_src;
-      ip6_address_t ph_dst;
-      u32 ph_len;
-      u8 ph_zero[3];
-      u8 ph_nxt;
-    } ph;
-    u16 pa[20];
-  } phu;
-
-  /* pseudo-header */
-  memset (&phu, 0, sizeof (phu));
-  phu.ph.ph_src = ip6->src_address;
-  phu.ph.ph_dst = ip6->dst_address;
-  phu.ph.ph_len = clib_host_to_net_u32 (len);
-  phu.ph.ph_nxt = IP_PROTOCOL_UDP;
-
-  sum = 0;
-  for (i = 0; i < sizeof (phu.pa) / sizeof (phu.pa[0]); i++)
-    sum += phu.pa[i];
-
-  sp = (const u16 *) up;
-
-  for (i = 0; i < (len & ~1); i += 2)
-    sum += *sp++;
-
-  if (len & 1)
-    sum += clib_host_to_net_u16 ((*(const u8 *) sp) << 8);
-
-  while (sum > 0xffff)
-    sum = (sum & 0xffff) + (sum >> 16);
-  sum = ~sum & 0xffff;
-
-  return (sum);
-}
-
-u16
-udp_checksum (udp_header_t * uh, u32 udp_len, void *ih, u8 version)
-{
-  switch (version)
-    {
-    case IP4:
-      return (udp_ip4_checksum (uh, udp_len,
-				((ip4_header_t *) ih)->src_address.as_u8,
-				((ip4_header_t *) ih)->dst_address.as_u8));
-    case IP6:
-      return (udp_ip6_checksum (ih, uh, udp_len));
-    default:
-      return ~0;
-    }
-}
-
-void *
-pkt_push_udp (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp)
-{
-  udp_header_t *uh;
-  u16 udp_len = sizeof (udp_header_t) + vlib_buffer_length_in_chain (vm, b);
-
-  uh = vlib_buffer_push_uninit (b, sizeof (*uh));
-
-  uh->src_port = clib_host_to_net_u16 (sp);
-  uh->dst_port = clib_host_to_net_u16 (dp);
-  uh->length = clib_host_to_net_u16 (udp_len);
-  uh->checksum = 0;
-  return uh;
-}
-
-void *
-pkt_push_ipv4 (vlib_main_t * vm, vlib_buffer_t * b, ip4_address_t * src,
-	       ip4_address_t * dst, int proto)
-{
-  ip4_header_t *ih;
-
-  /* make some room */
-  ih = vlib_buffer_push_uninit (b, sizeof (ip4_header_t));
-
-  ih->ip_version_and_header_length = 0x45;
-  ih->tos = 0;
-  ih->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b));
-
-  /* iph->fragment_id = clib_host_to_net_u16(get_IP_ID ()); */
-
-  /* TODO: decide if we allow fragments in case of control */
-  ih->flags_and_fragment_offset = clib_host_to_net_u16 (IP_DF);
-  ih->ttl = 255;
-  ih->protocol = proto;
-  ih->src_address.as_u32 = src->as_u32;
-  ih->dst_address.as_u32 = dst->as_u32;
-
-  ih->checksum = ip4_header_checksum (ih);
-  return ih;
-}
-
-void *
-pkt_push_ipv6 (vlib_main_t * vm, vlib_buffer_t * b, ip6_address_t * src,
-	       ip6_address_t * dst, int proto)
-{
-  ip6_header_t *ip6h;
-  u16 payload_length;
-
-  /* make some room */
-  ip6h = vlib_buffer_push_uninit (b, sizeof (ip6_header_t));
-
-  ip6h->ip_version_traffic_class_and_flow_label =
-    clib_host_to_net_u32 (0x6 << 28);
-
-  /* calculate ip6 payload length */
-  payload_length = vlib_buffer_length_in_chain (vm, b);
-  payload_length -= sizeof (*ip6h);
-
-  ip6h->payload_length = clib_host_to_net_u16 (payload_length);
-
-  ip6h->hop_limit = 0xff;
-  ip6h->protocol = proto;
-  clib_memcpy (ip6h->src_address.as_u8, src->as_u8,
-	       sizeof (ip6h->src_address));
-  clib_memcpy (ip6h->dst_address.as_u8, dst->as_u8,
-	       sizeof (ip6h->src_address));
-
-  return ip6h;
-}
-
-void *
-pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
-	     ip_address_t * dst, u32 proto)
-{
-  if (ip_addr_version (src) != ip_addr_version (dst))
-    {
-      clib_warning ("src %U and dst %U IP have different AFI! Discarding!",
-		    format_ip_address, src, format_ip_address, dst);
-      return 0;
-    }
-
-  switch (ip_addr_version (src))
-    {
-    case IP4:
-      return pkt_push_ipv4 (vm, b, &ip_addr_v4 (src), &ip_addr_v4 (dst),
-			    proto);
-      break;
-    case IP6:
-      return pkt_push_ipv6 (vm, b, &ip_addr_v6 (src), &ip_addr_v6 (dst),
-			    proto);
-      break;
-    }
-
-  return 0;
-}
-
-void *
-pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp,
-		     ip_address_t * sip, ip_address_t * dip)
-{
-  u16 udpsum;
-  udp_header_t *uh;
-  void *ih;
-
-  uh = pkt_push_udp (vm, b, sp, dp);
-
-  ih = pkt_push_ip (vm, b, sip, dip, IP_PROTOCOL_UDP);
-
-  udpsum = udp_checksum (uh, clib_net_to_host_u16 (uh->length), ih,
-			 ip_addr_version (sip));
-  if (udpsum == (u16) ~ 0)
-    {
-      clib_warning ("Failed UDP checksum! Discarding");
-      return 0;
-    }
-  uh->checksum = udpsum;
-  return ih;
-}
-
-void *
-pkt_push_ecm_hdr (vlib_buffer_t * b)
-{
-  ecm_hdr_t *h;
-  h = vlib_buffer_push_uninit (b, sizeof (h[0]));
-
-  memset (h, 0, sizeof (h[0]));
-  h->type = LISP_ENCAP_CONTROL_TYPE;
-  memset (h->reserved2, 0, sizeof (h->reserved2));
-
-  return h;
-}
-
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-cp/packets.h b/vnet/vnet/lisp-cp/packets.h
deleted file mode 100644
index 212a1d78..00000000
--- a/vnet/vnet/lisp-cp/packets.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/lisp-cp/lisp_types.h>
-
-#define IP_DF 0x4000		/* don't fragment */
-
-void *pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
-		   ip_address_t * dst, u32 proto);
-
-void *pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp,
-			   u16 dp, ip_address_t * sip, ip_address_t * dip);
-
-void *pkt_push_ecm_hdr (vlib_buffer_t * b);
-
-always_inline u8 *
-vlib_buffer_get_tail (vlib_buffer_t * b)
-{
-  return b->data + b->current_data + b->current_length;
-}
-
-always_inline void *
-vlib_buffer_put_uninit (vlib_buffer_t * b, u8 size)
-{
-  /* XXX should make sure there's enough space! */
-  void *p = vlib_buffer_get_tail (b);
-  b->current_length += size;
-  return p;
-}
-
-always_inline void *
-vlib_buffer_push_uninit (vlib_buffer_t * b, u8 size)
-{
-  /* XXX should make sure there's enough space! */
-  ASSERT (b->current_data >= size);
-  b->current_data -= size;
-  b->current_length += size;
-
-  return vlib_buffer_get_current (b);
-}
-
-always_inline void *
-vlib_buffer_make_headroom (vlib_buffer_t * b, u8 size)
-{
-  /* XXX should make sure there's enough space! */
-  b->current_data += size;
-  return vlib_buffer_get_current (b);
-}
-
-always_inline void *
-vlib_buffer_pull (vlib_buffer_t * b, u8 size)
-{
-  if (b->current_length < size)
-    return 0;
-
-  void *data = vlib_buffer_get_current (b);
-  vlib_buffer_advance (b, size);
-  return data;
-}
-
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/decap.c b/vnet/vnet/lisp-gpe/decap.c
deleted file mode 100644
index 637d4a74..00000000
--- a/vnet/vnet/lisp-gpe/decap.c
+++ /dev/null
@@ -1,501 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief L2 LISP-GPE decap code.
- *
- */
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/lisp-gpe/lisp_gpe.h>
-
-typedef struct
-{
-  u32 next_index;
-  u32 tunnel_index;
-  u32 error;
-  lisp_gpe_header_t h;
-} lisp_gpe_rx_trace_t;
-
-static u8 *
-format_lisp_gpe_rx_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  lisp_gpe_rx_trace_t *t = va_arg (*args, lisp_gpe_rx_trace_t *);
-
-  if (t->tunnel_index != ~0)
-    {
-      s = format (s, "LISP-GPE: tunnel %d next %d error %d", t->tunnel_index,
-		  t->next_index, t->error);
-    }
-  else
-    {
-      s = format (s, "LISP-GPE: no tunnel next %d error %d\n", t->next_index,
-		  t->error);
-    }
-  s = format (s, "\n  %U", format_lisp_gpe_header_with_length, &t->h,
-	      (u32) sizeof (t->h) /* max size */ );
-  return s;
-}
-
-static u32 next_proto_to_next_index[LISP_GPE_NEXT_PROTOS] = {
-  LISP_GPE_INPUT_NEXT_DROP,
-  LISP_GPE_INPUT_NEXT_IP4_INPUT,
-  LISP_GPE_INPUT_NEXT_IP6_INPUT,
-  LISP_GPE_INPUT_NEXT_L2_INPUT,
-  LISP_GPE_INPUT_NEXT_DROP
-};
-
-always_inline u32
-next_protocol_to_next_index (lisp_gpe_header_t * lgh, u8 * next_header)
-{
-  /* lisp-gpe router */
-  if (PREDICT_TRUE ((lgh->flags & LISP_GPE_FLAGS_P)
-		    && lgh->next_protocol < LISP_GPE_NEXT_PROTOS))
-    return next_proto_to_next_index[lgh->next_protocol];
-  /* legacy lisp router */
-  else if ((lgh->flags & LISP_GPE_FLAGS_P) == 0)
-    {
-      ip4_header_t *iph = (ip4_header_t *) next_header;
-      if ((iph->ip_version_and_header_length & 0xF0) == 0x40)
-	return LISP_GPE_INPUT_NEXT_IP4_INPUT;
-      else if ((iph->ip_version_and_header_length & 0xF0) == 0x60)
-	return LISP_GPE_INPUT_NEXT_IP6_INPUT;
-      else
-	return LISP_GPE_INPUT_NEXT_DROP;
-    }
-  else
-    return LISP_GPE_INPUT_NEXT_DROP;
-}
-
-always_inline tunnel_lookup_t *
-next_index_to_iface (lisp_gpe_main_t * lgm, u32 next_index)
-{
-  if (LISP_GPE_INPUT_NEXT_IP4_INPUT == next_index
-      || LISP_GPE_INPUT_NEXT_IP6_INPUT == next_index)
-    return &lgm->l3_ifaces;
-  else if (LISP_GPE_INPUT_NEXT_L2_INPUT == next_index)
-    return &lgm->l2_ifaces;
-  clib_warning ("next_index not associated to an interface!");
-  return 0;
-}
-
-static_always_inline void
-incr_decap_stats (vnet_main_t * vnm, u32 cpu_index, u32 length,
-		  u32 sw_if_index, u32 * last_sw_if_index, u32 * n_packets,
-		  u32 * n_bytes)
-{
-  vnet_interface_main_t *im;
-
-  if (PREDICT_TRUE (sw_if_index == *last_sw_if_index))
-    {
-      *n_packets += 1;
-      *n_bytes += length;
-    }
-  else
-    {
-      if (PREDICT_TRUE (*last_sw_if_index != ~0))
-	{
-	  im = &vnm->interface_main;
-
-	  vlib_increment_combined_counter (im->combined_sw_if_counters +
-					   VNET_INTERFACE_COUNTER_RX,
-					   cpu_index, *last_sw_if_index,
-					   *n_packets, *n_bytes);
-	}
-      *last_sw_if_index = sw_if_index;
-      *n_packets = 1;
-      *n_bytes = length;
-    }
-}
-
-/**
- * @brief LISP-GPE decap dispatcher.
- * @node lisp_gpe_input_inline
- *
- * LISP-GPE decap dispatcher.
- *
- * Decaps IP-UDP-LISP-GPE header and based on the next protocol and in the
- * GPE header and the vni decides the next node to forward the packet to.
- *
- * @param[in]   vm      vlib_main_t corresponding to current thread.
- * @param[in]   node    vlib_node_runtime_t data for this node.
- * @param[in]   frame   vlib_frame_t whose contents should be dispatched.
- *
- * @return number of vectors in frame.
- */
-static uword
-lisp_gpe_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
-		       vlib_frame_t * from_frame, u8 is_v4)
-{
-  u32 n_left_from, next_index, *from, *to_next, cpu_index;
-  u32 n_bytes = 0, n_packets = 0, last_sw_if_index = ~0, drops = 0;
-  lisp_gpe_main_t *lgm = vnet_lisp_gpe_get_main ();
-
-  cpu_index = os_get_cpu_number ();
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  ip4_udp_lisp_gpe_header_t *iul4_0, *iul4_1;
-	  ip6_udp_lisp_gpe_header_t *iul6_0, *iul6_1;
-	  lisp_gpe_header_t *lh0, *lh1;
-	  u32 next0, next1, error0, error1;
-	  uword *si0, *si1;
-	  tunnel_lookup_t *tl0, *tl1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
-	    CLIB_PREFETCH (p3->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  /* udp leaves current_data pointing at the lisp header */
-	  if (is_v4)
-	    {
-	      vlib_buffer_advance (b0,
-				   -(word) (sizeof (udp_header_t) +
-					    sizeof (ip4_header_t)));
-	      vlib_buffer_advance (b1,
-				   -(word) (sizeof (udp_header_t) +
-					    sizeof (ip4_header_t)));
-
-	      iul4_0 = vlib_buffer_get_current (b0);
-	      iul4_1 = vlib_buffer_get_current (b1);
-
-	      /* pop (ip, udp, lisp-gpe) */
-	      vlib_buffer_advance (b0, sizeof (*iul4_0));
-	      vlib_buffer_advance (b1, sizeof (*iul4_1));
-
-	      lh0 = &iul4_0->lisp;
-	      lh1 = &iul4_1->lisp;
-	    }
-	  else
-	    {
-	      vlib_buffer_advance (b0,
-				   -(word) (sizeof (udp_header_t) +
-					    sizeof (ip6_header_t)));
-	      vlib_buffer_advance (b1,
-				   -(word) (sizeof (udp_header_t) +
-					    sizeof (ip6_header_t)));
-
-	      iul6_0 = vlib_buffer_get_current (b0);
-	      iul6_1 = vlib_buffer_get_current (b1);
-
-	      /* pop (ip, udp, lisp-gpe) */
-	      vlib_buffer_advance (b0, sizeof (*iul6_0));
-	      vlib_buffer_advance (b1, sizeof (*iul6_1));
-
-	      lh0 = &iul6_0->lisp;
-	      lh1 = &iul6_1->lisp;
-	    }
-
-	  /* determine next_index from lisp-gpe header */
-	  next0 = next_protocol_to_next_index (lh0,
-					       vlib_buffer_get_current (b0));
-	  next1 = next_protocol_to_next_index (lh1,
-					       vlib_buffer_get_current (b1));
-
-	  /* determine if tunnel is l2 or l3 */
-	  tl0 = next_index_to_iface (lgm, next0);
-	  tl1 = next_index_to_iface (lgm, next1);
-
-	  /* map iid/vni to lisp-gpe sw_if_index which is used by ipx_input to
-	   * decide the rx vrf and the input features to be applied */
-	  si0 = hash_get (tl0->sw_if_index_by_vni,
-			  clib_net_to_host_u32 (lh0->iid));
-	  si1 = hash_get (tl1->sw_if_index_by_vni,
-			  clib_net_to_host_u32 (lh1->iid));
-
-
-	  /* Required to make the l2 tag push / pop code work on l2 subifs */
-	  vnet_update_l2_len (b0);
-	  vnet_update_l2_len (b1);
-
-	  if (si0)
-	    {
-	      incr_decap_stats (lgm->vnet_main, cpu_index,
-				vlib_buffer_length_in_chain (vm, b0), si0[0],
-				&last_sw_if_index, &n_packets, &n_bytes);
-	      vnet_buffer (b0)->sw_if_index[VLIB_RX] = si0[0];
-	      error0 = 0;
-	    }
-	  else
-	    {
-	      next0 = LISP_GPE_INPUT_NEXT_DROP;
-	      error0 = LISP_GPE_ERROR_NO_TUNNEL;
-	      drops++;
-	    }
-
-	  if (si1)
-	    {
-	      incr_decap_stats (lgm->vnet_main, cpu_index,
-				vlib_buffer_length_in_chain (vm, b1), si1[0],
-				&last_sw_if_index, &n_packets, &n_bytes);
-	      vnet_buffer (b1)->sw_if_index[VLIB_RX] = si1[0];
-	      error1 = 0;
-	    }
-	  else
-	    {
-	      next1 = LISP_GPE_INPUT_NEXT_DROP;
-	      error1 = LISP_GPE_ERROR_NO_TUNNEL;
-	      drops++;
-	    }
-
-	  b0->error = error0 ? node->errors[error0] : 0;
-	  b1->error = error1 ? node->errors[error1] : 0;
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      lisp_gpe_rx_trace_t *tr = vlib_add_trace (vm, node, b0,
-							sizeof (*tr));
-	      tr->next_index = next0;
-	      tr->error = error0;
-	      tr->h = lh0[0];
-	    }
-
-	  if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      lisp_gpe_rx_trace_t *tr = vlib_add_trace (vm, node, b1,
-							sizeof (*tr));
-	      tr->next_index = next1;
-	      tr->error = error1;
-	      tr->h = lh1[0];
-	    }
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, bi1, next0,
-					   next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  ip4_udp_lisp_gpe_header_t *iul4_0;
-	  ip6_udp_lisp_gpe_header_t *iul6_0;
-	  lisp_gpe_header_t *lh0;
-	  u32 error0;
-	  uword *si0;
-	  tunnel_lookup_t *tl0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  /* udp leaves current_data pointing at the lisp header
-	   * TODO: there's no difference in processing between v4 and v6
-	   * encapsulated packets so the code should be simplified if ip header
-	   * info is not going to be used for dp smrs/dpsec */
-	  if (is_v4)
-	    {
-	      vlib_buffer_advance (b0,
-				   -(word) (sizeof (udp_header_t) +
-					    sizeof (ip4_header_t)));
-
-	      iul4_0 = vlib_buffer_get_current (b0);
-
-	      /* pop (ip, udp, lisp-gpe) */
-	      vlib_buffer_advance (b0, sizeof (*iul4_0));
-
-	      lh0 = &iul4_0->lisp;
-	    }
-	  else
-	    {
-	      vlib_buffer_advance (b0,
-				   -(word) (sizeof (udp_header_t) +
-					    sizeof (ip6_header_t)));
-
-	      iul6_0 = vlib_buffer_get_current (b0);
-
-	      /* pop (ip, udp, lisp-gpe) */
-	      vlib_buffer_advance (b0, sizeof (*iul6_0));
-
-	      lh0 = &iul6_0->lisp;
-	    }
-
-	  /* TODO if security is to be implemented, something similar to RPF,
-	   * probably we'd like to check that the peer is allowed to send us
-	   * packets. For this, we should use the tunnel table OR check that
-	   * we have a mapping for the source eid and that the outer source of
-	   * the packet is one of its locators */
-
-	  /* determine next_index from lisp-gpe header */
-	  next0 = next_protocol_to_next_index (lh0,
-					       vlib_buffer_get_current (b0));
-
-	  /* determine if tunnel is l2 or l3 */
-	  tl0 = next_index_to_iface (lgm, next0);
-
-	  /* map iid/vni to lisp-gpe sw_if_index which is used by ipx_input to
-	   * decide the rx vrf and the input features to be applied.
-	   * NOTE: vni uses only the first 24 bits */
-	  si0 = hash_get (tl0->sw_if_index_by_vni,
-			  clib_net_to_host_u32 (lh0->iid << 8));
-
-	  /* Required to make the l2 tag push / pop code work on l2 subifs */
-	  vnet_update_l2_len (b0);
-
-	  if (si0)
-	    {
-	      incr_decap_stats (lgm->vnet_main, cpu_index,
-				vlib_buffer_length_in_chain (vm, b0), si0[0],
-				&last_sw_if_index, &n_packets, &n_bytes);
-	      vnet_buffer (b0)->sw_if_index[VLIB_RX] = si0[0];
-	      error0 = 0;
-	    }
-	  else
-	    {
-	      next0 = LISP_GPE_INPUT_NEXT_DROP;
-	      error0 = LISP_GPE_ERROR_NO_TUNNEL;
-	      drops++;
-	    }
-
-	  /* TODO error handling if security is implemented */
-	  b0->error = error0 ? node->errors[error0] : 0;
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      lisp_gpe_rx_trace_t *tr = vlib_add_trace (vm, node, b0,
-							sizeof (*tr));
-	      tr->next_index = next0;
-	      tr->error = error0;
-	      tr->h = lh0[0];
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  /* flush iface stats */
-  incr_decap_stats (lgm->vnet_main, cpu_index, 0, ~0, &last_sw_if_index,
-		    &n_packets, &n_bytes);
-  vlib_node_increment_counter (vm, lisp_gpe_ip4_input_node.index,
-			       LISP_GPE_ERROR_NO_TUNNEL, drops);
-  return from_frame->n_vectors;
-}
-
-static uword
-lisp_gpe_ip4_input (vlib_main_t * vm, vlib_node_runtime_t * node,
-		    vlib_frame_t * from_frame)
-{
-  return lisp_gpe_input_inline (vm, node, from_frame, 1);
-}
-
-static uword
-lisp_gpe_ip6_input (vlib_main_t * vm, vlib_node_runtime_t * node,
-		    vlib_frame_t * from_frame)
-{
-  return lisp_gpe_input_inline (vm, node, from_frame, 0);
-}
-
-static char *lisp_gpe_ip4_input_error_strings[] = {
-#define lisp_gpe_error(n,s) s,
-#include <vnet/lisp-gpe/lisp_gpe_error.def>
-#undef lisp_gpe_error
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (lisp_gpe_ip4_input_node) = {
-  .function = lisp_gpe_ip4_input,
-  .name = "lisp-gpe-ip4-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-  .n_next_nodes = LISP_GPE_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [LISP_GPE_INPUT_NEXT_##s] = n,
-    foreach_lisp_gpe_ip_input_next
-#undef _
-  },
-
-  .n_errors = ARRAY_LEN (lisp_gpe_ip4_input_error_strings),
-  .error_strings = lisp_gpe_ip4_input_error_strings,
-
-  .format_buffer = format_lisp_gpe_header_with_length,
-  .format_trace = format_lisp_gpe_rx_trace,
-  // $$$$ .unformat_buffer = unformat_lisp_gpe_header,
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (lisp_gpe_ip6_input_node) = {
-  .function = lisp_gpe_ip6_input,
-  .name = "lisp-gpe-ip6-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-  .n_next_nodes = LISP_GPE_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [LISP_GPE_INPUT_NEXT_##s] = n,
-    foreach_lisp_gpe_ip_input_next
-#undef _
-  },
-
-  .n_errors = ARRAY_LEN (lisp_gpe_ip4_input_error_strings),
-  .error_strings = lisp_gpe_ip4_input_error_strings,
-
-  .format_buffer = format_lisp_gpe_header_with_length,
-  .format_trace = format_lisp_gpe_rx_trace,
-  // $$$$ .unformat_buffer = unformat_lisp_gpe_header,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/dir.dox b/vnet/vnet/lisp-gpe/dir.dox
deleted file mode 100644
index afa6da9a..00000000
--- a/vnet/vnet/lisp-gpe/dir.dox
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- @dir
- @brief LISP-GPE code.
-
- An implementation of LISP-GPE as per:
- rfc-6830
- draft-lewis-lisp-gpe-02
-
- See file: rfc.txt
-
-*/
\ No newline at end of file
diff --git a/vnet/vnet/lisp-gpe/interface.c b/vnet/vnet/lisp-gpe/interface.c
deleted file mode 100644
index 3288b241..00000000
--- a/vnet/vnet/lisp-gpe/interface.c
+++ /dev/null
@@ -1,709 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @file
- * @brief Common utility functions for LISP-GPE interfaces.
- *
- */
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ip/udp.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/lisp-gpe/lisp_gpe.h>
-#include <vnet/lisp-gpe/lisp_gpe_fwd_entry.h>
-#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
-#include <vnet/lisp-gpe/lisp_gpe_adjacency.h>
-#include <vnet/adj/adj.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/lisp-cp/lisp_cp_dpo.h>
-
-/**
- * @brief The VLIB node arc/edge from the interface's TX node, to the L2
- * load-balanceing node. Which is where all packets go
- */
-static uword l2_arc_to_lb;
-
-#define foreach_lisp_gpe_tx_next        \
-  _(DROP, "error-drop")                 \
-  _(IP4_LOOKUP, "ip4-lookup")           \
-  _(IP6_LOOKUP, "ip6-lookup")
-
-typedef enum
-{
-#define _(sym,str) LISP_GPE_TX_NEXT_##sym,
-  foreach_lisp_gpe_tx_next
-#undef _
-    LISP_GPE_TX_N_NEXT,
-} lisp_gpe_tx_next_t;
-
-typedef struct
-{
-  u32 tunnel_index;
-} lisp_gpe_tx_trace_t;
-
-u8 *
-format_lisp_gpe_tx_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  lisp_gpe_tx_trace_t *t = va_arg (*args, lisp_gpe_tx_trace_t *);
-
-  s = format (s, "LISP-GPE-TX: tunnel %d", t->tunnel_index);
-  return s;
-}
-
-#define is_v4_packet(_h) ((*(u8*) _h) & 0xF0) == 0x40
-
-/**
- * @brief LISP-GPE interface TX (encap) function.
- * @node lisp_gpe_interface_tx
- *
- * The LISP-GPE interface TX (encap) function.
- *
- * Looks up the associated tunnel based on the adjacency hit in the SD FIB
- * and if the tunnel is multihomed it uses the flow hash to determine
- * sub-tunnel, and rewrite string, to be used to encapsulate the packet.
- *
- * @param[in]   vm      vlib_main_t corresponding to the current thread.
- * @param[in]   node    vlib_node_runtime_t data for this node.
- * @param[in]   frame   vlib_frame_t whose contents should be dispatched.
- *
- * @return number of vectors in frame.
- */
-static uword
-lisp_gpe_interface_tx (vlib_main_t * vm, vlib_node_runtime_t * node,
-		       vlib_frame_t * from_frame)
-{
-  u32 n_left_from, next_index, *from, *to_next;
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, adj_index0, next0;
-	  const ip_adjacency_t *adj0;
-	  const dpo_id_t *dpo0;
-	  vlib_buffer_t *b0;
-	  u8 is_v4_0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  /* Fixup the checksum and len fields in the LISP tunnel encap
-	   * that was applied at the midchain node */
-	  is_v4_0 = is_v4_packet (vlib_buffer_get_current (b0));
-	  ip_udp_fixup_one (lgm->vlib_main, b0, is_v4_0);
-
-	  /* Follow the DPO on which the midchain is stacked */
-	  adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
-	  adj0 = adj_get (adj_index0);
-	  dpo0 = &adj0->sub_type.midchain.next_dpo;
-	  next0 = dpo0->dpoi_next_node;
-	  vnet_buffer (b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      lisp_gpe_tx_trace_t *tr = vlib_add_trace (vm, node, b0,
-							sizeof (*tr));
-	      tr->tunnel_index = adj_index0;
-	    }
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-static u8 *
-format_lisp_gpe_name (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  return format (s, "lisp_gpe%d", dev_instance);
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (lisp_gpe_device_class) = {
-  .name = "LISP_GPE",
-  .format_device_name = format_lisp_gpe_name,
-  .format_tx_trace = format_lisp_gpe_tx_trace,
-  .tx_function = lisp_gpe_interface_tx,
-};
-/* *INDENT-ON* */
-
-u8 *
-format_lisp_gpe_header_with_length (u8 * s, va_list * args)
-{
-  lisp_gpe_header_t *h = va_arg (*args, lisp_gpe_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-  u32 header_bytes;
-
-  header_bytes = sizeof (h[0]);
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    return format (s, "lisp-gpe header truncated");
-
-  s = format (s, "flags: ");
-#define _(n,v) if (h->flags & v) s = format (s, "%s ", #n);
-  foreach_lisp_gpe_flag_bit;
-#undef _
-
-  s = format (s, "\n  ver_res %d res %d next_protocol %d iid %d(%x)",
-	      h->ver_res, h->res, h->next_protocol,
-	      clib_net_to_host_u32 (h->iid), clib_net_to_host_u32 (h->iid));
-  return s;
-}
-
-/* *INDENT-OFF* */
-VNET_HW_INTERFACE_CLASS (lisp_gpe_hw_class) = {
-  .name = "LISP_GPE",
-  .format_header = format_lisp_gpe_header_with_length,
-  .build_rewrite = lisp_gpe_build_rewrite,
-  .update_adjacency = lisp_gpe_update_adjacency,
-};
-/* *INDENT-ON* */
-
-
-typedef struct
-{
-  u32 lb_index;
-} l2_lisp_gpe_tx_trace_t;
-
-static u8 *
-format_l2_lisp_gpe_tx_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2_lisp_gpe_tx_trace_t *t = va_arg (*args, l2_lisp_gpe_tx_trace_t *);
-
-  s = format (s, "L2-LISP-GPE-TX: load-balance %d", t->lb_index);
-  return s;
-}
-
-/**
- * @brief LISP-GPE interface TX (encap) function for L2 overlays.
- * @node l2_lisp_gpe_interface_tx
- *
- * The L2 LISP-GPE interface TX (encap) function.
- *
- * Uses bridge domain index, source and destination ethernet addresses to
- * lookup tunnel. If the tunnel is multihomed a flow has is used to determine
- * the sub-tunnel and therefore the rewrite string to be used to encapsulate
- * the packets.
- *
- * @param[in]   vm        vlib_main_t corresponding to the current thread.
- * @param[in]   node      vlib_node_runtime_t data for this node.
- * @param[in]   frame     vlib_frame_t whose contents should be dispatched.
- *
- * @return number of vectors in frame.
- */
-static uword
-l2_lisp_gpe_interface_tx (vlib_main_t * vm, vlib_node_runtime_t * node,
-			  vlib_frame_t * from_frame)
-{
-  u32 n_left_from, next_index, *from, *to_next;
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *b0;
-	  u32 bi0, lbi0;
-	  ethernet_header_t *e0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  e0 = vlib_buffer_get_current (b0);
-
-	  vnet_buffer (b0)->lisp.overlay_afi = LISP_AFI_MAC;
-
-	  /* lookup dst + src mac */
-	  lbi0 = lisp_l2_fib_lookup (lgm, vnet_buffer (b0)->l2.bd_index,
-				     e0->src_address, e0->dst_address);
-	  vnet_buffer (b0)->ip.adj_index[VLIB_TX] = lbi0;
-
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      l2_lisp_gpe_tx_trace_t *tr = vlib_add_trace (vm, node, b0,
-							   sizeof (*tr));
-	      tr->lb_index = lbi0;
-	    }
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, l2_arc_to_lb);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-static u8 *
-format_l2_lisp_gpe_name (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  return format (s, "l2_lisp_gpe%d", dev_instance);
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (l2_lisp_gpe_device_class,static) = {
-  .name = "L2_LISP_GPE",
-  .format_device_name = format_l2_lisp_gpe_name,
-  .format_tx_trace = format_l2_lisp_gpe_tx_trace,
-  .tx_function = l2_lisp_gpe_interface_tx,
-};
-/* *INDENT-ON* */
-
-static vnet_hw_interface_t *
-lisp_gpe_create_iface (lisp_gpe_main_t * lgm, u32 vni, u32 dp_table,
-		       vnet_device_class_t * dev_class,
-		       tunnel_lookup_t * tuns)
-{
-  u32 flen;
-  u32 hw_if_index = ~0;
-  u8 *new_name;
-  vnet_hw_interface_t *hi;
-  vnet_main_t *vnm = lgm->vnet_main;
-
-  /* create hw lisp_gpeX iface if needed, otherwise reuse existing */
-  flen = vec_len (lgm->free_tunnel_hw_if_indices);
-  if (flen > 0)
-    {
-      hw_if_index = lgm->free_tunnel_hw_if_indices[flen - 1];
-      _vec_len (lgm->free_tunnel_hw_if_indices) -= 1;
-
-      hi = vnet_get_hw_interface (vnm, hw_if_index);
-
-      /* rename interface */
-      new_name = format (0, "%U", dev_class->format_device_name, vni);
-
-      vec_add1 (new_name, 0);
-      vnet_rename_interface (vnm, hw_if_index, (char *) new_name);
-      vec_free (new_name);
-
-      /* clear old stats of freed interface before reuse */
-      vnet_interface_main_t *im = &vnm->interface_main;
-      vnet_interface_counter_lock (im);
-      vlib_zero_combined_counter (&im->combined_sw_if_counters
-				  [VNET_INTERFACE_COUNTER_TX],
-				  hi->sw_if_index);
-      vlib_zero_combined_counter (&im->combined_sw_if_counters
-				  [VNET_INTERFACE_COUNTER_RX],
-				  hi->sw_if_index);
-      vlib_zero_simple_counter (&im->sw_if_counters
-				[VNET_INTERFACE_COUNTER_DROP],
-				hi->sw_if_index);
-      vnet_interface_counter_unlock (im);
-    }
-  else
-    {
-      hw_if_index = vnet_register_interface (vnm, dev_class->index, vni,
-					     lisp_gpe_hw_class.index, 0);
-      hi = vnet_get_hw_interface (vnm, hw_if_index);
-    }
-
-  hash_set (tuns->hw_if_index_by_dp_table, dp_table, hw_if_index);
-
-  /* set tunnel termination: post decap, packets are tagged as having been
-   * originated by lisp-gpe interface */
-  hash_set (tuns->sw_if_index_by_vni, vni, hi->sw_if_index);
-  hash_set (tuns->vni_by_sw_if_index, hi->sw_if_index, vni);
-
-  return hi;
-}
-
-static void
-lisp_gpe_remove_iface (lisp_gpe_main_t * lgm, u32 hi_index, u32 dp_table,
-		       tunnel_lookup_t * tuns)
-{
-  vnet_main_t *vnm = lgm->vnet_main;
-  vnet_hw_interface_t *hi;
-  uword *vnip;
-
-  hi = vnet_get_hw_interface (vnm, hi_index);
-
-  /* disable interface */
-  vnet_sw_interface_set_flags (vnm, hi->sw_if_index, 0 /* down */ );
-  vnet_hw_interface_set_flags (vnm, hi->hw_if_index, 0 /* down */ );
-  hash_unset (tuns->hw_if_index_by_dp_table, dp_table);
-  vec_add1 (lgm->free_tunnel_hw_if_indices, hi->hw_if_index);
-
-  /* clean tunnel termination and vni to sw_if_index binding */
-  vnip = hash_get (tuns->vni_by_sw_if_index, hi->sw_if_index);
-  if (0 == vnip)
-    {
-      clib_warning ("No vni associated to interface %d", hi->sw_if_index);
-      return;
-    }
-  hash_unset (tuns->sw_if_index_by_vni, vnip[0]);
-  hash_unset (tuns->vni_by_sw_if_index, hi->sw_if_index);
-}
-
-static void
-lisp_gpe_iface_set_table (u32 sw_if_index, u32 table_id)
-{
-  fib_node_index_t fib_index;
-
-  fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, table_id);
-  vec_validate (ip4_main.fib_index_by_sw_if_index, sw_if_index);
-  ip4_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
-  ip4_sw_interface_enable_disable (sw_if_index, 1);
-
-  fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, table_id);
-  vec_validate (ip6_main.fib_index_by_sw_if_index, sw_if_index);
-  ip6_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
-  ip6_sw_interface_enable_disable (sw_if_index, 1);
-}
-
-static void
-lisp_gpe_tenant_del_default_routes (u32 table_id)
-{
-  fib_protocol_t proto;
-
-  FOR_EACH_FIB_IP_PROTOCOL (proto)
-  {
-    fib_prefix_t prefix = {
-      .fp_proto = proto,
-    };
-    u32 fib_index;
-
-    fib_index = fib_table_find (prefix.fp_proto, table_id);
-    fib_table_entry_special_remove (fib_index, &prefix, FIB_SOURCE_LISP);
-    fib_table_unlock (fib_index, prefix.fp_proto);
-  }
-}
-
-static void
-lisp_gpe_tenant_add_default_routes (u32 table_id)
-{
-  fib_protocol_t proto;
-
-  FOR_EACH_FIB_IP_PROTOCOL (proto)
-  {
-    fib_prefix_t prefix = {
-      .fp_proto = proto,
-    };
-    u32 fib_index;
-
-    /*
-     * Add a deafult route that results in a control plane punt DPO
-     */
-    fib_index = fib_table_find_or_create_and_lock (prefix.fp_proto, table_id);
-    fib_table_entry_special_dpo_add (fib_index, &prefix, FIB_SOURCE_LISP,
-				     FIB_ENTRY_FLAG_EXCLUSIVE,
-				     lisp_cp_dpo_get (fib_proto_to_dpo
-						      (proto)));
-  }
-}
-
-
-/**
- * @brief Add/del LISP-GPE L3 interface.
- *
- * Creates LISP-GPE interface, sets ingress arcs from lisp_gpeX_lookup,
- * installs default routes that attract all traffic with no more specific
- * routes to lgpe-ipx-lookup, set egress arcs to ipx-lookup, sets
- * the interface in the right vrf and enables it.
- *
- * @param[in]   lgm     Reference to @ref lisp_gpe_main_t.
- * @param[in]   a       Parameters to create interface.
- *
- * @return number of vectors in frame.
- */
-u32
-lisp_gpe_add_l3_iface (lisp_gpe_main_t * lgm, u32 vni, u32 table_id)
-{
-  vnet_main_t *vnm = lgm->vnet_main;
-  tunnel_lookup_t *l3_ifaces = &lgm->l3_ifaces;
-  vnet_hw_interface_t *hi;
-  uword *hip, *si;
-
-  hip = hash_get (l3_ifaces->hw_if_index_by_dp_table, table_id);
-
-  if (hip)
-    {
-      clib_warning ("vrf %d already mapped to a vni", table_id);
-      return ~0;
-    }
-
-  si = hash_get (l3_ifaces->sw_if_index_by_vni, vni);
-
-  if (si)
-    {
-      clib_warning ("Interface for vni %d already exists", vni);
-    }
-
-  /* create lisp iface and populate tunnel tables */
-  hi = lisp_gpe_create_iface (lgm, vni, table_id,
-			      &lisp_gpe_device_class, l3_ifaces);
-
-  /* insert default routes that point to lisp-cp lookup */
-  lisp_gpe_iface_set_table (hi->sw_if_index, table_id);
-  lisp_gpe_tenant_add_default_routes (table_id);
-
-  /* enable interface */
-  vnet_sw_interface_set_flags (vnm, hi->sw_if_index,
-			       VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-  vnet_hw_interface_set_flags (vnm, hi->hw_if_index,
-			       VNET_HW_INTERFACE_FLAG_LINK_UP);
-
-  return (hi->sw_if_index);
-}
-
-void
-lisp_gpe_del_l3_iface (lisp_gpe_main_t * lgm, u32 vni, u32 table_id)
-{
-  vnet_main_t *vnm = lgm->vnet_main;
-  tunnel_lookup_t *l3_ifaces = &lgm->l3_ifaces;
-  vnet_hw_interface_t *hi;
-  uword *hip;
-
-  hip = hash_get (l3_ifaces->hw_if_index_by_dp_table, table_id);
-
-  if (hip == 0)
-    {
-      clib_warning ("The interface for vrf %d doesn't exist", table_id);
-      return;
-    }
-
-  hi = vnet_get_hw_interface (vnm, hip[0]);
-
-  lisp_gpe_remove_iface (lgm, hip[0], table_id, &lgm->l3_ifaces);
-
-  /* unset default routes */
-  ip4_sw_interface_enable_disable (hi->sw_if_index, 0);
-  ip6_sw_interface_enable_disable (hi->sw_if_index, 0);
-  lisp_gpe_tenant_del_default_routes (table_id);
-}
-
-/**
- * @brief Add/del LISP-GPE L2 interface.
- *
- * Creates LISP-GPE interface, sets it in L2 mode in the appropriate
- * bridge domain, sets egress arcs and enables it.
- *
- * @param[in]   lgm     Reference to @ref lisp_gpe_main_t.
- * @param[in]   a       Parameters to create interface.
- *
- * @return number of vectors in frame.
- */
-u32
-lisp_gpe_add_l2_iface (lisp_gpe_main_t * lgm, u32 vni, u32 bd_id)
-{
-  vnet_main_t *vnm = lgm->vnet_main;
-  tunnel_lookup_t *l2_ifaces = &lgm->l2_ifaces;
-  vnet_hw_interface_t *hi;
-  uword *hip, *si;
-  u16 bd_index;
-
-  bd_index = bd_find_or_add_bd_index (&bd_main, bd_id);
-  hip = hash_get (l2_ifaces->hw_if_index_by_dp_table, bd_index);
-
-  if (hip)
-    {
-      clib_warning ("bridge domain %d already mapped to a vni", bd_id);
-      return ~0;
-    }
-
-  si = hash_get (l2_ifaces->sw_if_index_by_vni, vni);
-  if (si)
-    {
-      clib_warning ("Interface for vni %d already exists", vni);
-      return ~0;
-    }
-
-  /* create lisp iface and populate tunnel tables */
-  hi = lisp_gpe_create_iface (lgm, vni, bd_index,
-			      &l2_lisp_gpe_device_class, &lgm->l2_ifaces);
-
-  /* enable interface */
-  vnet_sw_interface_set_flags (vnm, hi->sw_if_index,
-			       VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-  vnet_hw_interface_set_flags (vnm, hi->hw_if_index,
-			       VNET_HW_INTERFACE_FLAG_LINK_UP);
-
-  l2_arc_to_lb = vlib_node_add_named_next (vlib_get_main (),
-					   hi->tx_node_index,
-					   "l2-load-balance");
-
-  /* we're ready. add iface to l2 bridge domain */
-  set_int_l2_mode (lgm->vlib_main, vnm, MODE_L2_BRIDGE, hi->sw_if_index,
-		   bd_index, 0, 0, 0);
-
-  return (hi->sw_if_index);
-}
-
-/**
- * @brief Add/del LISP-GPE L2 interface.
- *
- * Creates LISP-GPE interface, sets it in L2 mode in the appropriate
- * bridge domain, sets egress arcs and enables it.
- *
- * @param[in]   lgm     Reference to @ref lisp_gpe_main_t.
- * @param[in]   a       Parameters to create interface.
- *
- * @return number of vectors in frame.
- */
-void
-lisp_gpe_del_l2_iface (lisp_gpe_main_t * lgm, u32 vni, u32 bd_id)
-{
-  tunnel_lookup_t *l2_ifaces = &lgm->l2_ifaces;
-  u16 bd_index;
-  uword *hip;
-
-  bd_index = bd_find_or_add_bd_index (&bd_main, bd_id);
-  hip = hash_get (l2_ifaces->hw_if_index_by_dp_table, bd_index);
-
-  if (hip == 0)
-    {
-      clib_warning ("The interface for bridge domain %d doesn't exist",
-		    bd_id);
-      return;
-    }
-  lisp_gpe_remove_iface (lgm, hip[0], bd_index, &lgm->l2_ifaces);
-}
-
-static clib_error_t *
-lisp_gpe_add_del_iface_command_fn (vlib_main_t * vm, unformat_input_t * input,
-				   vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 is_add = 1;
-  u32 table_id, vni, bd_id;
-  u8 vni_is_set = 0, vrf_is_set = 0, bd_index_is_set = 0;
-
-  if (vnet_lisp_gpe_enable_disable_status () == 0)
-    {
-      return clib_error_return (0, "LISP is disabled");
-    }
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "add"))
-	is_add = 1;
-      else if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "vrf %d", &table_id))
-	{
-	  vrf_is_set = 1;
-	}
-      else if (unformat (line_input, "vni %d", &vni))
-	{
-	  vni_is_set = 1;
-	}
-      else if (unformat (line_input, "bd %d", &bd_id))
-	{
-	  bd_index_is_set = 1;
-	}
-      else
-	{
-	  return clib_error_return (0, "parse error: '%U'",
-				    format_unformat_error, line_input);
-	}
-    }
-
-  if (vrf_is_set && bd_index_is_set)
-    return clib_error_return (0,
-			      "Cannot set both vrf and brdige domain index!");
-
-  if (!vni_is_set)
-    return clib_error_return (0, "vni must be set!");
-
-  if (!vrf_is_set && !bd_index_is_set)
-    return clib_error_return (0, "vrf or bridge domain index must be set!");
-
-  if (bd_index_is_set)
-    {
-      if (is_add)
-	{
-	  if (~0 == lisp_gpe_tenant_l2_iface_add_or_lock (vni, bd_id))
-	    return clib_error_return (0, "L2 interface not created");
-	}
-      else
-	lisp_gpe_tenant_l2_iface_unlock (vni);
-    }
-  else
-    {
-      if (is_add)
-	{
-	  if (~0 == lisp_gpe_tenant_l3_iface_add_or_lock (vni, table_id))
-	    return clib_error_return (0, "L3 interface not created");
-	}
-      else
-	lisp_gpe_tenant_l3_iface_unlock (vni);
-    }
-
-  return (NULL);
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (add_del_lisp_gpe_iface_command, static) = {
-  .path = "lisp gpe iface",
-  .short_help = "lisp gpe iface add/del vni <vni> vrf <vrf>",
-  .function = lisp_gpe_add_del_iface_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe.api b/vnet/vnet/lisp-gpe/lisp_gpe.api
deleted file mode 100644
index 3956b97d..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe.api
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \brief add or delete lisp gpe tunnel
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add address if non-zero, else delete
-    @param eid_type -
-      0 : ipv4
-      1 : ipv6
-      2 : mac
-    @param rmt_eid - remote eid
-    @param lcl_eid - local eid
-    @param rmt_len - remote prefix len
-    @param lcl_len - local prefix len
-    @param vni - virtual network identifier
-    @param dp_table - vrf/bridge domain id
-    @param loc_num - number of locators
-    @param lcl_locs - array of local locators
-    @param rmt_locs - array of remote locators
-    @param action - negative action when 0 locators configured
-*/
-define lisp_gpe_add_del_fwd_entry
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 eid_type;
-  u8 rmt_eid[16];
-  u8 lcl_eid[16];
-  u8 rmt_len;
-  u8 lcl_len;
-  u32 vni;
-  u32 dp_table;
-  u32 loc_num;
-  u8 lcl_locs[loc_num];
-  u8 rmt_locs[loc_num];
-  u8 action;
-};
-
-/** \brief Reply for gpe_fwd_entry add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_gpe_add_del_fwd_entry_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief enable or disable lisp-gpe protocol
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_en - enable protocol if non-zero, else disable
-*/
-define lisp_gpe_enable_disable
-{
-  u32 client_index;
-  u32 context;
-  u8 is_en;
-};
-
-/** \brief Reply for gpe enable/disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_gpe_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief add or delete gpe_iface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add address if non-zero, else delete
-*/
-define lisp_gpe_add_del_iface
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 is_l2;
-  u32 dp_table;
-  u32 vni;
-};
-
-/** \brief Reply for gpe_iface add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_gpe_add_del_iface_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-define lisp_gpe_tunnel_details
-{
-  u32 context;
-  u32 tunnels;
-  u8 is_ipv6;
-  u8 source_ip[16];
-  u8 destination_ip[16];
-  u32 encap_fib_id;
-  u32 decap_fib_id;
-  u32 dcap_next;
-  u8 lisp_ver;
-  u8 next_protocol;
-  u8 flags;
-  u8 ver_res;
-  u8 res;
-  u32 iid;
-};
-
-/** \brief Request for gpe tunnel summary status
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
- */
-define lisp_gpe_tunnel_dump
-{
-  u32 client_index;
-  u32 context;
-};
-
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
- 
\ No newline at end of file
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe.c b/vnet/vnet/lisp-gpe/lisp_gpe.c
deleted file mode 100644
index fbda8687..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief Common utility functions for IPv4, IPv6 and L2 LISP-GPE tunnels.
- *
- */
-
-#include <vnet/lisp-gpe/lisp_gpe.h>
-#include <vnet/lisp-gpe/lisp_gpe_fwd_entry.h>
-#include <vnet/lisp-gpe/lisp_gpe_adjacency.h>
-#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
-
-/** LISP-GPE global state */
-lisp_gpe_main_t lisp_gpe_main;
-
-
-/** CLI command to add/del forwarding entry. */
-static clib_error_t *
-lisp_gpe_add_del_fwd_entry_command_fn (vlib_main_t * vm,
-				       unformat_input_t * input,
-				       vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 is_add = 1;
-  ip_address_t lloc, rloc;
-  clib_error_t *error = 0;
-  gid_address_t _reid, *reid = &_reid, _leid, *leid = &_leid;
-  u8 reid_set = 0, leid_set = 0, is_negative = 0, vrf_set = 0, vni_set = 0;
-  u32 vni, vrf, action = ~0, p, w;
-  locator_pair_t pair, *pairs = 0;
-  int rv;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "add"))
-	is_add = 1;
-      else if (unformat (line_input, "leid %U", unformat_gid_address, leid))
-	{
-	  leid_set = 1;
-	}
-      else if (unformat (line_input, "reid %U", unformat_gid_address, reid))
-	{
-	  reid_set = 1;
-	}
-      else if (unformat (line_input, "vni %u", &vni))
-	{
-	  gid_address_vni (leid) = vni;
-	  gid_address_vni (reid) = vni;
-	  vni_set = 1;
-	}
-      else if (unformat (line_input, "vrf %u", &vrf))
-	{
-	  vrf_set = 1;
-	}
-      else if (unformat (line_input, "bd %u", &vrf))
-	{
-	  vrf_set = 1;
-	}
-      else if (unformat (line_input, "negative action %U",
-			 unformat_negative_mapping_action, &action))
-	{
-	  is_negative = 1;
-	}
-      else if (unformat (line_input, "loc-pair %U %U p %d w %d",
-			 unformat_ip_address, &lloc,
-			 unformat_ip_address, &rloc, &p, &w))
-	{
-	  pair.lcl_loc = lloc;
-	  pair.rmt_loc = rloc;
-	  pair.priority = p;
-	  pair.weight = w;
-	  vec_add1 (pairs, pair);
-	}
-      else
-	{
-	  error = unformat_parse_error (line_input);
-	  goto done;
-	}
-    }
-  unformat_free (line_input);
-
-  if (!vni_set || !vrf_set)
-    {
-      error = clib_error_return (0, "vni and vrf must be set!");
-      goto done;
-    }
-
-  if (!reid_set)
-    {
-      error = clib_error_return (0, "remote eid must be set!");
-      goto done;
-    }
-
-  if (is_negative)
-    {
-      if (~0 == action)
-	{
-	  error = clib_error_return (0, "no action set for negative tunnel!");
-	  goto done;
-	}
-    }
-  else
-    {
-      if (vec_len (pairs) == 0)
-	{
-	  error = clib_error_return (0, "expected ip4/ip6 locators.");
-	  goto done;
-	}
-    }
-
-  if (!leid_set)
-    {
-      /* if leid not set, make sure it's the same AFI like reid */
-      gid_address_type (leid) = gid_address_type (reid);
-      if (GID_ADDR_IP_PREFIX == gid_address_type (reid))
-	gid_address_ip_version (leid) = gid_address_ip_version (reid);
-    }
-
-  /* add fwd entry */
-  vnet_lisp_gpe_add_del_fwd_entry_args_t _a, *a = &_a;
-  memset (a, 0, sizeof (a[0]));
-
-  a->is_add = is_add;
-  a->is_negative = is_negative;
-  a->vni = vni;
-  a->table_id = vrf;
-  gid_address_copy (&a->lcl_eid, leid);
-  gid_address_copy (&a->rmt_eid, reid);
-  a->locator_pairs = pairs;
-
-  rv = vnet_lisp_gpe_add_del_fwd_entry (a, 0);
-  if (0 != rv)
-    {
-      error = clib_error_return (0, "failed to %s gpe tunnel!",
-				 is_add ? "add" : "delete");
-    }
-
-done:
-  vec_free (pairs);
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_gpe_add_del_fwd_entry_command, static) = {
-  .path = "lisp gpe entry",
-  .short_help = "lisp gpe entry add/del vni <vni> vrf <vrf> [leid <leid>]"
-      "reid <reid> [loc-pair <lloc> <rloc> p <priority> w <weight>] "
-      "[negative action <action>]",
-  .function = lisp_gpe_add_del_fwd_entry_command_fn,
-};
-/* *INDENT-ON* */
-
-/** Check if LISP-GPE is enabled. */
-u8
-vnet_lisp_gpe_enable_disable_status (void)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-
-  return lgm->is_en;
-}
-
-/** Enable/disable LISP-GPE. */
-clib_error_t *
-vnet_lisp_gpe_enable_disable (vnet_lisp_gpe_enable_disable_args_t * a)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-
-  if (a->is_en)
-    {
-      lgm->is_en = 1;
-    }
-  else
-    {
-      /* remove all entries */
-      vnet_lisp_gpe_fwd_entry_flush ();
-
-      /* disable all l3 ifaces */
-      lisp_gpe_tenant_flush ();
-
-      lgm->is_en = 0;
-    }
-
-  return 0;
-}
-
-/** CLI command to enable/disable LISP-GPE. */
-static clib_error_t *
-lisp_gpe_enable_disable_command_fn (vlib_main_t * vm,
-				    unformat_input_t * input,
-				    vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 is_en = 1;
-  vnet_lisp_gpe_enable_disable_args_t _a, *a = &_a;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "enable"))
-	is_en = 1;
-      else if (unformat (line_input, "disable"))
-	is_en = 0;
-      else
-	{
-	  return clib_error_return (0, "parse error: '%U'",
-				    format_unformat_error, line_input);
-	}
-    }
-  a->is_en = is_en;
-  return vnet_lisp_gpe_enable_disable (a);
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (enable_disable_lisp_gpe_command, static) = {
-  .path = "lisp gpe",
-  .short_help = "lisp gpe [enable|disable]",
-  .function = lisp_gpe_enable_disable_command_fn,
-};
-/* *INDENT-ON* */
-
-/** CLI command to show LISP-GPE interfaces. */
-static clib_error_t *
-lisp_show_iface_command_fn (vlib_main_t * vm,
-			    unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  hash_pair_t *p;
-
-  vlib_cli_output (vm, "%=10s%=12s", "vrf", "hw_if_index");
-
-  /* *INDENT-OFF* */
-  hash_foreach_pair (p, lgm->l3_ifaces.hw_if_index_by_dp_table, ({
-    vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]);
-  }));
-  /* *INDENT-ON* */
-
-  if (0 != lgm->l2_ifaces.hw_if_index_by_dp_table)
-    {
-      vlib_cli_output (vm, "%=10s%=12s", "bd_id", "hw_if_index");
-      /* *INDENT-OFF* */
-      hash_foreach_pair (p, lgm->l2_ifaces.hw_if_index_by_dp_table, ({
-        vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]);
-      }));
-      /* *INDENT-ON* */
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_show_iface_command) = {
-    .path = "show lisp gpe interface",
-    .short_help = "show lisp gpe interface",
-    .function = lisp_show_iface_command_fn,
-};
-/* *INDENT-ON* */
-
-/** Format LISP-GPE status. */
-u8 *
-format_vnet_lisp_gpe_status (u8 * s, va_list * args)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  return format (s, "%s", lgm->is_en ? "enabled" : "disabled");
-}
-
-
-/** LISP-GPE init function. */
-clib_error_t *
-lisp_gpe_init (vlib_main_t * vm)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  clib_error_t *error = 0;
-
-  if ((error = vlib_call_init_function (vm, ip_main_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip4_lookup_init)))
-    return error;
-
-  lgm->vnet_main = vnet_get_main ();
-  lgm->vlib_main = vm;
-  lgm->im4 = &ip4_main;
-  lgm->im6 = &ip6_main;
-  lgm->lm4 = &ip4_main.lookup_main;
-  lgm->lm6 = &ip6_main.lookup_main;
-
-  lgm->lisp_gpe_fwd_entries =
-    hash_create_mem (0, sizeof (lisp_gpe_fwd_entry_key_t), sizeof (uword));
-
-  udp_register_dst_port (vm, UDP_DST_PORT_lisp_gpe,
-			 lisp_gpe_ip4_input_node.index, 1 /* is_ip4 */ );
-  udp_register_dst_port (vm, UDP_DST_PORT_lisp_gpe6,
-			 lisp_gpe_ip6_input_node.index, 0 /* is_ip4 */ );
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (lisp_gpe_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe.h b/vnet/vnet/lisp-gpe/lisp_gpe.h
deleted file mode 100644
index bb0f788b..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief LISP-GPE definitions.
- */
-
-#ifndef included_vnet_lisp_gpe_h
-#define included_vnet_lisp_gpe_h
-
-#include <vppinfra/error.h>
-#include <vppinfra/mhash.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/udp.h>
-#include <vnet/lisp-cp/lisp_types.h>
-#include <vnet/lisp-gpe/lisp_gpe_packet.h>
-#include <vnet/adj/adj_types.h>
-
-/** IP4-UDP-LISP encap header */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  ip4_header_t ip4;             /* 20 bytes */
-  udp_header_t udp;             /* 8 bytes */
-  lisp_gpe_header_t lisp;       /* 8 bytes */
-}) ip4_udp_lisp_gpe_header_t;
-/* *INDENT-ON* */
-
-/** IP6-UDP-LISP encap header */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  ip6_header_t ip6;             /* 40 bytes */
-  udp_header_t udp;             /* 8 bytes */
-  lisp_gpe_header_t lisp;       /* 8 bytes */
-}) ip6_udp_lisp_gpe_header_t;
-/* *INDENT-ON* */
-
-#define foreach_lisp_gpe_ip_input_next          \
-_(DROP, "error-drop")                           \
-_(IP4_INPUT, "ip4-input")                       \
-_(IP6_INPUT, "ip6-input")                       \
-_(L2_INPUT, "l2-input")
-
-/** Enum of possible next nodes post LISP-GPE decap */
-typedef enum
-{
-#define _(s,n) LISP_GPE_INPUT_NEXT_##s,
-  foreach_lisp_gpe_ip_input_next
-#undef _
-    LISP_GPE_INPUT_N_NEXT,
-} lisp_gpe_input_next_t;
-
-typedef enum
-{
-#define lisp_gpe_error(n,s) LISP_GPE_ERROR_##n,
-#include <vnet/lisp-gpe/lisp_gpe_error.def>
-#undef lisp_gpe_error
-  LISP_GPE_N_ERROR,
-} lisp_gpe_error_t;
-
-typedef struct tunnel_lookup
-{
-  /** Lookup lisp-gpe interfaces by dp table (eg. vrf/bridge index) */
-  uword *hw_if_index_by_dp_table;
-
-  /** lookup decap tunnel termination sw_if_index by vni and vice versa */
-  uword *sw_if_index_by_vni;
-
-  // FIXME - Need this?
-  uword *vni_by_sw_if_index;
-} tunnel_lookup_t;
-
-/** LISP-GPE global state*/
-typedef struct lisp_gpe_main
-{
-  /**
-   * @brief DB of all forwarding entries. The Key is:{l-EID,r-EID,vni}
-   * where the EID encodes L2 or L3
-   */
-  uword *lisp_gpe_fwd_entries;
-
-  /**
-   * @brief A Pool of all LISP forwarding entries
-   */
-  struct lisp_gpe_fwd_entry_t_ *lisp_fwd_entry_pool;
-
-  /** Free vlib hw_if_indices */
-  u32 *free_tunnel_hw_if_indices;
-
-  u8 is_en;
-
-  /* L3 data structures
-   * ================== */
-  tunnel_lookup_t l3_ifaces;
-
-  /* L2 data structures
-   * ================== */
-
-  /** L2 LISP FIB */
-    BVT (clib_bihash) l2_fib;
-
-  tunnel_lookup_t l2_ifaces;
-
-  /** Load-balance for a miss in the table */
-  dpo_id_t l2_lb_cp_lkup;
-
-  /** convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-  ip4_main_t *im4;
-  ip6_main_t *im6;
-  ip_lookup_main_t *lm4;
-  ip_lookup_main_t *lm6;
-} lisp_gpe_main_t;
-
-/** LISP-GPE global state*/
-lisp_gpe_main_t lisp_gpe_main;
-
-always_inline lisp_gpe_main_t *
-vnet_lisp_gpe_get_main ()
-{
-  return &lisp_gpe_main;
-}
-
-
-extern vlib_node_registration_t lisp_gpe_ip4_input_node;
-extern vlib_node_registration_t lisp_gpe_ip6_input_node;
-extern vnet_hw_interface_class_t lisp_gpe_hw_class;
-
-u8 *format_lisp_gpe_header_with_length (u8 * s, va_list * args);
-
-/** Read LISP-GPE status */
-u8 vnet_lisp_gpe_enable_disable_status (void);
-
-u32
-lisp_gpe_l3_iface_find_or_create (lisp_gpe_main_t * lgm,
-				  u32 overlay_table_id, u32 vni);
-
-/** Add/del LISP-GPE interface. */
-extern void lisp_gpe_del_l2_iface (lisp_gpe_main_t * lgm, u32 vni, u32 bd_id);
-extern u32 lisp_gpe_add_l2_iface (lisp_gpe_main_t * lgm, u32 vni, u32 bd_id);
-extern void lisp_gpe_del_l3_iface (lisp_gpe_main_t * lgm, u32 vni, u32 bd_id);
-extern u32 lisp_gpe_add_l3_iface (lisp_gpe_main_t * lgm, u32 vni, u32 bd_id);
-
-
-typedef struct
-{
-  u8 is_en;
-} vnet_lisp_gpe_enable_disable_args_t;
-
-clib_error_t
-  * vnet_lisp_gpe_enable_disable (vnet_lisp_gpe_enable_disable_args_t * a);
-
-typedef enum
-{
-  NO_ACTION,
-  FORWARD_NATIVE,
-  SEND_MAP_REQUEST,
-  DROP
-} negative_fwd_actions_e;
-
-/** */
-typedef struct
-{
-  u8 is_add;
-
-  /** type of mapping */
-  u8 is_negative;
-
-  /** action for negative mappings */
-  negative_fwd_actions_e action;
-
-  /** local eid */
-  gid_address_t lcl_eid;
-
-  /** remote eid */
-  gid_address_t rmt_eid;
-
-  /** vector of locator pairs */
-  locator_pair_t *locator_pairs;
-
-  /** FIB index to lookup remote locator at encap */
-  u32 encap_fib_index;
-
-  /** FIB index to lookup inner IP at decap */
-  u32 decap_fib_index;
-
-  /* TODO remove */
-  u32 decap_next_index;
-
-  /** VNI/tenant id in HOST byte order */
-  u32 vni;
-
-  /** vrf or bd where fwd entry should be inserted */
-  union
-  {
-    /** table (vrf) id */
-    u32 table_id;
-
-    /** bridge domain id */
-    u16 bd_id;
-
-    /** generic access */
-    u32 dp_table;
-  };
-} vnet_lisp_gpe_add_del_fwd_entry_args_t;
-
-#define foreach_lgpe_ip4_lookup_next    \
-  _(DROP, "error-drop")                 \
-  _(LISP_CP_LOOKUP, "lisp-cp-lookup")
-
-typedef enum lgpe_ip4_lookup_next
-{
-#define _(sym,str) LGPE_IP4_LOOKUP_NEXT_##sym,
-  foreach_lgpe_ip4_lookup_next
-#undef _
-    LGPE_IP4_LOOKUP_N_NEXT,
-} lgpe_ip4_lookup_next_t;
-
-#define foreach_lgpe_ip6_lookup_next    \
-  _(DROP, "error-drop")                 \
-  _(LISP_CP_LOOKUP, "lisp-cp-lookup")
-
-typedef enum lgpe_ip6_lookup_next
-{
-#define _(sym,str) LGPE_IP6_LOOKUP_NEXT_##sym,
-  foreach_lgpe_ip6_lookup_next
-#undef _
-    LGPE_IP6_LOOKUP_N_NEXT,
-} lgpe_ip6_lookup_next_t;
-
-u8 *format_vnet_lisp_gpe_status (u8 * s, va_list * args);
-
-#endif /* included_vnet_lisp_gpe_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_adjacency.c b/vnet/vnet/lisp-gpe/lisp_gpe_adjacency.c
deleted file mode 100644
index 8c96a25c..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe_adjacency.c
+++ /dev/null
@@ -1,542 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief Common utility functions for IPv4, IPv6 and L2 LISP-GPE adjacencys.
- *
- */
-
-#include <vnet/dpo/load_balance.h>
-#include <vnet/lisp-cp/lisp_types.h>
-#include <vnet/lisp-gpe/lisp_gpe_sub_interface.h>
-#include <vnet/lisp-gpe/lisp_gpe_adjacency.h>
-#include <vnet/lisp-gpe/lisp_gpe_tunnel.h>
-#include <vnet/fib/fib_entry.h>
-#include <vnet/adj/adj_midchain.h>
-
-/**
- * Memory pool of all adjacencies
- */
-static lisp_gpe_adjacency_t *lisp_adj_pool;
-
-/**
- * Hash table of all adjacencies. key:{nh, itf}
- * We never have an all zeros address since the interfaces are multi-access,
- * therefore there is no ambiguity between a v4 and v6 next-hop, so we don't
- * need to add the protocol to the key.
- */
-static
-BVT (clib_bihash)
-  lisp_adj_db;
-
-#define LISP_ADJ_SET_KEY(_key, _itf, _nh)       \
-{						\
-  _key.key[0] = (_nh)->ip.v6.as_u64[0];		\
-  _key.key[1] = (_nh)->ip.v6.as_u64[1];		\
-  _key.key[2] = (_itf);				\
-}
-
-     static index_t lisp_adj_find (const ip_address_t * addr, u32 sw_if_index)
-{
-  BVT (clib_bihash_kv) kv;
-
-  LISP_ADJ_SET_KEY (kv, sw_if_index, addr);
-
-  if (BV (clib_bihash_search) (&lisp_adj_db, &kv, &kv) < 0)
-    {
-      return (INDEX_INVALID);
-    }
-  else
-    {
-      return (kv.value);
-    }
-}
-
-static void
-lisp_adj_insert (const ip_address_t * addr, u32 sw_if_index, index_t ai)
-{
-  BVT (clib_bihash_kv) kv;
-
-  LISP_ADJ_SET_KEY (kv, sw_if_index, addr);
-  kv.value = ai;
-
-  BV (clib_bihash_add_del) (&lisp_adj_db, &kv, 1);
-}
-
-static void
-lisp_adj_remove (const ip_address_t * addr, u32 sw_if_index)
-{
-  BVT (clib_bihash_kv) kv;
-
-  LISP_ADJ_SET_KEY (kv, sw_if_index, addr);
-
-  BV (clib_bihash_add_del) (&lisp_adj_db, &kv, 0);
-}
-
-static lisp_gpe_adjacency_t *
-lisp_gpe_adjacency_get_i (index_t lai)
-{
-  return (pool_elt_at_index (lisp_adj_pool, lai));
-}
-
-fib_forward_chain_type_t
-lisp_gpe_adj_get_fib_chain_type (const lisp_gpe_adjacency_t * ladj)
-{
-  switch (ip_addr_version (&ladj->remote_rloc))
-    {
-    case IP4:
-      return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
-    case IP6:
-      return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
-    default:
-      ASSERT (0);
-      break;
-    }
-  return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
-}
-
-static void
-ip46_address_to_ip_address (const ip46_address_t * a, ip_address_t * b)
-{
-  if (ip46_address_is_ip4 (a))
-    {
-      memset (b, 0, sizeof (*b));
-      ip_address_set (b, &a->ip4, IP4);
-    }
-  else
-    {
-      ip_address_set (b, &a->ip6, IP6);
-    }
-}
-
-/**
- * @brief Stack the tunnel's midchain on the IP forwarding chain of the via
- */
-static void
-lisp_gpe_adj_stack_one (lisp_gpe_adjacency_t * ladj, adj_index_t ai)
-{
-  const lisp_gpe_tunnel_t *lgt;
-  dpo_id_t tmp = DPO_INVALID;
-
-  lgt = lisp_gpe_tunnel_get (ladj->tunnel_index);
-  fib_entry_contribute_forwarding (lgt->fib_entry_index,
-				   lisp_gpe_adj_get_fib_chain_type (ladj),
-				   &tmp);
-
-  if (DPO_LOAD_BALANCE == tmp.dpoi_type)
-    {
-      /*
-       * post LISP rewrite we will load-balance. However, the LISP encap
-       * is always the same for this adjacency/tunnel and hence the IP/UDP src,dst
-       * hash is always the same result too. So we do that hash now and
-       * stack on the choice.
-       * If the choice is an incomplete adj then we will need a poke when
-       * it becomes complete. This happens since the adj update walk propagates
-       * as far a recursive paths.
-       */
-      const dpo_id_t *choice;
-      load_balance_t *lb;
-      int hash;
-
-      lb = load_balance_get (tmp.dpoi_index);
-
-      if (IP4 == ip_addr_version (&ladj->remote_rloc))
-	{
-	  hash = ip4_compute_flow_hash ((ip4_header_t *) adj_get_rewrite (ai),
-					lb->lb_hash_config);
-	}
-      else
-	{
-	  hash = ip6_compute_flow_hash ((ip6_header_t *) adj_get_rewrite (ai),
-					lb->lb_hash_config);
-	}
-
-      choice =
-	load_balance_get_bucket_i (lb, hash & lb->lb_n_buckets_minus_1);
-      dpo_copy (&tmp, choice);
-    }
-
-  adj_nbr_midchain_stack (ai, &tmp);
-  dpo_reset (&tmp);
-}
-
-/**
- * @brief Call back when restacking all adjacencies on a GRE interface
- */
-static adj_walk_rc_t
-lisp_gpe_adj_walk_cb (adj_index_t ai, void *ctx)
-{
-  lisp_gpe_adjacency_t *ladj = ctx;
-
-  lisp_gpe_adj_stack_one (ladj, ai);
-
-  return (ADJ_WALK_RC_CONTINUE);
-}
-
-static void
-lisp_gpe_adj_stack (lisp_gpe_adjacency_t * ladj)
-{
-  fib_protocol_t nh_proto;
-  ip46_address_t nh;
-
-  ip_address_to_46 (&ladj->remote_rloc, &nh, &nh_proto);
-
-  /*
-   * walk all the adjacencies on th lisp interface and restack them
-   */
-  adj_nbr_walk_nh (ladj->sw_if_index,
-		   nh_proto, &nh, lisp_gpe_adj_walk_cb, ladj);
-}
-
-static lisp_gpe_next_protocol_e
-lisp_gpe_adj_proto_from_vnet_link_type (vnet_link_t linkt)
-{
-  switch (linkt)
-    {
-    case VNET_LINK_IP4:
-      return (LISP_GPE_NEXT_PROTO_IP4);
-    case VNET_LINK_IP6:
-      return (LISP_GPE_NEXT_PROTO_IP6);
-    case VNET_LINK_ETHERNET:
-      return (LISP_GPE_NEXT_PROTO_ETHERNET);
-    default:
-      ASSERT (0);
-    }
-  return (LISP_GPE_NEXT_PROTO_IP4);
-}
-
-#define is_v4_packet(_h) ((*(u8*) _h) & 0xF0) == 0x40
-
-static void
-lisp_gpe_fixup (vlib_main_t * vm, ip_adjacency_t * adj, vlib_buffer_t * b)
-{
-  /* Fixup the checksum and len fields in the LISP tunnel encap
-   * that was applied at the midchain node */
-  ip_udp_fixup_one (vm, b, is_v4_packet (vlib_buffer_get_current (b)));
-}
-
-/**
- * @brief The LISP-GPE interface registered function to update, i.e.
- * provide an rewrite string for, an adjacency.
- */
-void
-lisp_gpe_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai)
-{
-  const lisp_gpe_tunnel_t *lgt;
-  lisp_gpe_adjacency_t *ladj;
-  ip_adjacency_t *adj;
-  ip_address_t rloc;
-  vnet_link_t linkt;
-  index_t lai;
-
-  adj = adj_get (ai);
-  ip46_address_to_ip_address (&adj->sub_type.nbr.next_hop, &rloc);
-
-  /*
-   * find an existing or create a new adj
-   */
-  lai = lisp_adj_find (&rloc, sw_if_index);
-
-  ASSERT (INDEX_INVALID != lai);
-
-  ladj = pool_elt_at_index (lisp_adj_pool, lai);
-  lgt = lisp_gpe_tunnel_get (ladj->tunnel_index);
-  linkt = adj_get_link_type (ai);
-
-  adj_nbr_midchain_update_rewrite
-    (ai, lisp_gpe_fixup,
-     (VNET_LINK_ETHERNET == linkt ?
-      ADJ_MIDCHAIN_FLAG_NO_COUNT :
-      ADJ_MIDCHAIN_FLAG_NONE),
-     lisp_gpe_tunnel_build_rewrite
-     (lgt, ladj, lisp_gpe_adj_proto_from_vnet_link_type (linkt)));
-
-  lisp_gpe_adj_stack_one (ladj, ai);
-}
-
-u8 *
-lisp_gpe_build_rewrite (vnet_main_t * vnm,
-			u32 sw_if_index,
-			vnet_link_t link_type, const void *dst_address)
-{
-  ASSERT (0);
-  return (NULL);
-}
-
-index_t
-lisp_gpe_adjacency_find_or_create_and_lock (const locator_pair_t * pair,
-					    u32 overlay_table_id, u32 vni)
-{
-  const lisp_gpe_sub_interface_t *l3s;
-  const lisp_gpe_tunnel_t *lgt;
-  lisp_gpe_adjacency_t *ladj;
-  index_t lai, l3si;
-
-  /*
-   * first find the L3 sub-interface that corresponds to the loacl-rloc and vni
-   */
-  l3si = lisp_gpe_sub_interface_find_or_create_and_lock (&pair->lcl_loc,
-							 overlay_table_id,
-							 vni);
-  l3s = lisp_gpe_sub_interface_get (l3si);
-
-  /*
-   * find an existing or create a new adj
-   */
-  lai = lisp_adj_find (&pair->rmt_loc, l3s->sw_if_index);
-
-  if (INDEX_INVALID == lai)
-    {
-
-      pool_get (lisp_adj_pool, ladj);
-      memset (ladj, 0, sizeof (*ladj));
-      lai = (ladj - lisp_adj_pool);
-
-      ip_address_copy (&ladj->remote_rloc, &pair->rmt_loc);
-      ladj->vni = vni;
-      /* transfer the lock to the adj */
-      ladj->lisp_l3_sub_index = l3si;
-      ladj->sw_if_index = l3s->sw_if_index;
-
-      /* if vni is non-default */
-      if (ladj->vni)
-	ladj->flags = LISP_GPE_FLAGS_I;
-
-      /* work in lisp-gpe not legacy mode */
-      ladj->flags |= LISP_GPE_FLAGS_P;
-
-      /*
-       * find the tunnel that will provide the underlying transport
-       * and hence the rewrite.
-       * The RLOC FIB index is default table - always.
-       */
-      ladj->tunnel_index = lisp_gpe_tunnel_find_or_create_and_lock (pair, 0);
-
-      lgt = lisp_gpe_tunnel_get (ladj->tunnel_index);
-
-      /*
-       * become of child of the RLOC FIB entry so we are updated when
-       * its reachability changes, allowing us to re-stack the midcahins
-       */
-      ladj->fib_entry_child_index = fib_entry_child_add (lgt->fib_entry_index,
-							 FIB_NODE_TYPE_LISP_ADJ,
-							 lai);
-
-      lisp_adj_insert (&ladj->remote_rloc, ladj->sw_if_index, lai);
-    }
-  else
-    {
-      /* unlock the interface from the find. */
-      lisp_gpe_sub_interface_unlock (l3si);
-      ladj = lisp_gpe_adjacency_get_i (lai);
-    }
-
-  ladj->locks++;
-
-  return (lai);
-}
-
-/**
- * @brief Get a pointer to a tunnel from a pointer to a FIB node
- */
-static lisp_gpe_adjacency_t *
-lisp_gpe_adjacency_from_fib_node (const fib_node_t * node)
-{
-  return ((lisp_gpe_adjacency_t *)
-	  ((char *) node -
-	   STRUCT_OFFSET_OF (lisp_gpe_adjacency_t, fib_node)));
-}
-
-static void
-lisp_gpe_adjacency_last_lock_gone (lisp_gpe_adjacency_t * ladj)
-{
-  const lisp_gpe_tunnel_t *lgt;
-
-  /*
-   * no children so we are not counting locks. no-op.
-   * at least not counting
-   */
-  lisp_adj_remove (&ladj->remote_rloc, ladj->sw_if_index);
-
-  /*
-   * unlock the resources this adj holds
-   */
-  lgt = lisp_gpe_tunnel_get (ladj->tunnel_index);
-
-  fib_entry_child_remove (lgt->fib_entry_index, ladj->fib_entry_child_index);
-
-  lisp_gpe_tunnel_unlock (ladj->tunnel_index);
-  lisp_gpe_sub_interface_unlock (ladj->lisp_l3_sub_index);
-
-  pool_put (lisp_adj_pool, ladj);
-}
-
-void
-lisp_gpe_adjacency_unlock (index_t lai)
-{
-  lisp_gpe_adjacency_t *ladj;
-
-  ladj = lisp_gpe_adjacency_get_i (lai);
-
-  ladj->locks--;
-
-  if (0 == ladj->locks)
-    {
-      lisp_gpe_adjacency_last_lock_gone (ladj);
-    }
-}
-
-const lisp_gpe_adjacency_t *
-lisp_gpe_adjacency_get (index_t lai)
-{
-  return (lisp_gpe_adjacency_get_i (lai));
-}
-
-
-/**
- * @brief LISP GPE tunnel back walk
- *
- * The FIB entry through which this tunnel resolves has been updated.
- * re-stack the midchain on the new forwarding.
- */
-static fib_node_back_walk_rc_t
-lisp_gpe_adjacency_back_walk (fib_node_t * node,
-			      fib_node_back_walk_ctx_t * ctx)
-{
-  lisp_gpe_adj_stack (lisp_gpe_adjacency_from_fib_node (node));
-
-  return (FIB_NODE_BACK_WALK_CONTINUE);
-}
-
-static fib_node_t *
-lisp_gpe_adjacency_get_fib_node (fib_node_index_t index)
-{
-  lisp_gpe_adjacency_t *ladj;
-
-  ladj = pool_elt_at_index (lisp_adj_pool, index);
-  return (&ladj->fib_node);
-}
-
-static void
-lisp_gpe_adjacency_last_fib_lock_gone (fib_node_t * node)
-{
-  lisp_gpe_adjacency_last_lock_gone (lisp_gpe_adjacency_from_fib_node (node));
-}
-
-const static fib_node_vft_t lisp_gpe_tuennel_vft = {
-  .fnv_get = lisp_gpe_adjacency_get_fib_node,
-  .fnv_back_walk = lisp_gpe_adjacency_back_walk,
-  .fnv_last_lock = lisp_gpe_adjacency_last_fib_lock_gone,
-};
-
-u8 *
-format_lisp_gpe_adjacency (u8 * s, va_list * args)
-{
-  lisp_gpe_adjacency_t *ladj = va_arg (*args, lisp_gpe_adjacency_t *);
-  lisp_gpe_adjacency_format_flags_t flags =
-    va_arg (*args, lisp_gpe_adjacency_format_flags_t);
-
-  if (flags & LISP_GPE_ADJ_FORMAT_FLAG_DETAIL)
-    {
-      s =
-	format (s, "index %d locks:%d\n", ladj - lisp_adj_pool, ladj->locks);
-    }
-
-  s = format (s, " vni: %d,", ladj->vni);
-  s = format (s, " remote-RLOC: %U,", format_ip_address, &ladj->remote_rloc);
-
-  if (flags & LISP_GPE_ADJ_FORMAT_FLAG_DETAIL)
-    {
-      s = format (s, " %U\n",
-		  format_lisp_gpe_sub_interface,
-		  lisp_gpe_sub_interface_get (ladj->lisp_l3_sub_index));
-      s = format (s, " %U\n",
-		  format_lisp_gpe_tunnel,
-		  lisp_gpe_tunnel_get (ladj->tunnel_index));
-    }
-  else
-    {
-      s = format (s, " LISP L3 sub-interface index: %d,",
-		  ladj->lisp_l3_sub_index);
-      s = format (s, " LISP tunnel index: %d", ladj->tunnel_index);
-    }
-
-
-  return (s);
-}
-
-static clib_error_t *
-lisp_gpe_adjacency_show (vlib_main_t * vm,
-			 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  lisp_gpe_adjacency_t *ladj;
-  index_t index;
-
-  if (pool_elts (lisp_adj_pool) == 0)
-    vlib_cli_output (vm, "No lisp-gpe Adjacencies");
-
-  if (unformat (input, "%d", &index))
-    {
-      ladj = lisp_gpe_adjacency_get_i (index);
-      vlib_cli_output (vm, "%U", format_lisp_gpe_adjacency, ladj,
-		       LISP_GPE_ADJ_FORMAT_FLAG_DETAIL);
-    }
-  else
-    {
-      /* *INDENT-OFF* */
-      pool_foreach (ladj, lisp_adj_pool,
-      ({
-	vlib_cli_output (vm, "[%d] %U\n",
-			 ladj - lisp_adj_pool,
-			 format_lisp_gpe_adjacency, ladj,
-			 LISP_GPE_ADJ_FORMAT_FLAG_NONE);
-      }));
-      /* *INDENT-ON* */
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_lisp_gpe_tunnel_command, static) =
-{
-  .path = "show lisp gpe adjacency",
-  .function = lisp_gpe_adjacency_show,
-};
-/* *INDENT-ON* */
-
-#define LISP_ADJ_NBR_DEFAULT_HASH_NUM_BUCKETS (256)
-#define LISP_ADJ_NBR_DEFAULT_HASH_MEMORY_SIZE (1<<20)
-
-static clib_error_t *
-lisp_gpe_adj_module_init (vlib_main_t * vm)
-{
-  BV (clib_bihash_init) (&lisp_adj_db,
-			 "Adjacency Neighbour table",
-			 LISP_ADJ_NBR_DEFAULT_HASH_NUM_BUCKETS,
-			 LISP_ADJ_NBR_DEFAULT_HASH_MEMORY_SIZE);
-
-  fib_node_register_type (FIB_NODE_TYPE_LISP_ADJ, &lisp_gpe_tuennel_vft);
-  return (NULL);
-}
-
-VLIB_INIT_FUNCTION (lisp_gpe_adj_module_init)
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_adjacency.h b/vnet/vnet/lisp-gpe/lisp_gpe_adjacency.h
deleted file mode 100644
index adc3acae..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe_adjacency.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief Common utility functions for IPv4, IPv6 and L2 LISP-GPE adjacencys.
- *
- */
-
-#ifndef LISP_GPE_ADJACENCY_H__
-#define LISP_GPE_ADJACENCY_H__
-
-#include <vnet/fib/fib_node.h>
-#include <vnet/lisp-gpe/lisp_gpe.h>
-
-/**
- * @brief A LISP GPE Adjacency.
- *
- * A adjacency represents peer on an L3 sub-interface to which to send traffic.
- * adjacencies are thus present in the EID space.
- * The peer is identified by the key:{remote-rloc, sub-interface}, which is
- * equivalent to the usal adjacency key {next-hop, interface}. So curiously
- * the rloc address from the underlay is used as a next hop address in the overlay
- * This is OK because:
- *  1 - the RLOC is unique in the underlay AND there is only one underlay VRF per
- *      overlay
- *  2 - the RLOC may overlap with an address in the overlay, but we do not create
- *      an adj-fib (i.e. a route in the overlay FIB for the rloc)
- *
- *
- */
-typedef struct lisp_gpe_adjacency_t_
-{
-  /**
-   * The LISP adj is a part of the FIB control plane graph.
-   */
-  fib_node_t fib_node;
-
-  /**
-   * remote RLOC. The adjacency's next-hop
-   */
-  ip_address_t remote_rloc;
-
-  /**
-   * The VNI. Used in combination with the local-rloc to get the sub-interface
-   */
-  u32 vni;
-
-  /**
-   * The number of locks/reference counts on the adjacency.
-   */
-  u32 locks;
-
-  /**
-   * The index of the LISP L3 subinterface
-   */
-  u32 lisp_l3_sub_index;
-
-  /**
-   * The SW IF index of the sub-interface this adjacency uses.
-   * Cached for convenience from the LISP L3 sub-interface
-   */
-  u32 sw_if_index;
-
-  /**
-   * The index of the LISP GPE tunnel that provides the transport
-   * in the underlay.
-   */
-  u32 tunnel_index;
-
-  /**
-   * This adjacency is a child of the FIB entry to reach the RLOC.
-   * This is so when the reachability of that RLOC changes, we can restack
-   * the FIB adjacnecies.
-   */
-  u32 fib_entry_child_index;
-
-  /**
-   * LISP header fields in HOST byte order
-   */
-  u8 flags;
-  u8 ver_res;
-  u8 res;
-  u8 next_protocol;
-
-} lisp_gpe_adjacency_t;
-
-extern index_t lisp_gpe_adjacency_find_or_create_and_lock (const
-							   locator_pair_t *
-							   pair,
-							   u32 rloc_fib_index,
-							   u32 vni);
-
-extern void lisp_gpe_adjacency_unlock (index_t l3si);
-
-extern const lisp_gpe_adjacency_t *lisp_gpe_adjacency_get (index_t l3si);
-
-extern void lisp_gpe_update_adjacency (vnet_main_t * vnm,
-				       u32 sw_if_index, adj_index_t ai);
-extern u8 *lisp_gpe_build_rewrite (vnet_main_t * vnm,
-				   u32 sw_if_index,
-				   vnet_link_t link_type,
-				   const void *dst_address);
-
-
-/**
- * @brief Flags for displaying the adjacency
- */
-typedef enum lisp_gpe_adjacency_format_flags_t_
-{
-  LISP_GPE_ADJ_FORMAT_FLAG_NONE,
-  LISP_GPE_ADJ_FORMAT_FLAG_DETAIL,
-} lisp_gpe_adjacency_format_flags_t;
-
-extern u8 *format_lisp_gpe_adjacency (u8 * s, va_list * args);
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_api.c b/vnet/vnet/lisp-gpe/lisp_gpe_api.c
deleted file mode 100644
index 176ded50..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe_api.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- *------------------------------------------------------------------
- * lisp_gpe_api.c - lisp_gpe api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/lisp-gpe/lisp_gpe.h>
-#include <vnet/lisp-gpe/lisp_gpe_fwd_entry.h>
-#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                             \
-_(LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry)               \
-_(LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable)                     \
-_(LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface)                       \
-_(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump)
-
-/** Used for transferring locators via VPP API */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u8 is_ip4; /**< is locator an IPv4 address */
-  u8 priority; /**< locator priority */
-  u8 weight; /**< locator weight */
-  u8 addr[16]; /**< IPv4/IPv6 address */
-}) rloc_t;
-/* *INDENT-ON* */
-
-static locator_pair_t *
-unformat_lisp_loc_pairs (void *lcl_locs, void *rmt_locs, u32 rloc_num)
-{
-  u32 i;
-  locator_pair_t *pairs = 0, pair;
-  rloc_t *r;
-
-  for (i = 0; i < rloc_num; i++)
-    {
-      /* local locator */
-      r = &((rloc_t *) lcl_locs)[i];
-      memset (&pair.lcl_loc, 0, sizeof (pair.lcl_loc));
-      ip_address_set (&pair.lcl_loc, &r->addr, r->is_ip4 ? IP4 : IP6);
-
-      /* remote locators */
-      r = &((rloc_t *) rmt_locs)[i];
-      memset (&pair.rmt_loc, 0, sizeof (pair.rmt_loc));
-      ip_address_set (&pair.rmt_loc, &r->addr, r->is_ip4 ? IP4 : IP6);
-
-      pair.priority = r->priority;
-      pair.weight = r->weight;
-
-      vec_add1 (pairs, pair);
-    }
-  return pairs;
-}
-
-static int
-unformat_lisp_eid_api (gid_address_t * dst, u32 vni, u8 type, void *src,
-		       u8 len)
-{
-  switch (type)
-    {
-    case 0:			/* ipv4 */
-      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
-      gid_address_ip_set (dst, src, IP4);
-      gid_address_ippref_len (dst) = len;
-      ip_prefix_normalize (&gid_address_ippref (dst));
-      break;
-    case 1:			/* ipv6 */
-      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
-      gid_address_ip_set (dst, src, IP6);
-      gid_address_ippref_len (dst) = len;
-      ip_prefix_normalize (&gid_address_ippref (dst));
-      break;
-    case 2:			/* l2 mac */
-      gid_address_type (dst) = GID_ADDR_MAC;
-      clib_memcpy (&gid_address_mac (dst), src, 6);
-      break;
-    default:
-      /* unknown type */
-      return VNET_API_ERROR_INVALID_VALUE;
-    }
-
-  gid_address_vni (dst) = vni;
-
-  return 0;
-}
-
-static void
-  vl_api_lisp_gpe_add_del_fwd_entry_t_handler
-  (vl_api_lisp_gpe_add_del_fwd_entry_t * mp)
-{
-  vl_api_lisp_gpe_add_del_fwd_entry_reply_t *rmp;
-  vnet_lisp_gpe_add_del_fwd_entry_args_t _a, *a = &_a;
-  locator_pair_t *pairs = 0;
-  int rv = 0;
-
-  memset (a, 0, sizeof (a[0]));
-
-  rv = unformat_lisp_eid_api (&a->rmt_eid, mp->vni, mp->eid_type,
-			      mp->rmt_eid, mp->rmt_len);
-  rv |= unformat_lisp_eid_api (&a->lcl_eid, mp->vni, mp->eid_type,
-			       mp->lcl_eid, mp->lcl_len);
-
-  pairs = unformat_lisp_loc_pairs (mp->lcl_locs, mp->rmt_locs, mp->loc_num);
-
-  if (rv || 0 == pairs)
-    goto send_reply;
-
-  a->is_add = mp->is_add;
-  a->locator_pairs = pairs;
-  a->dp_table = mp->dp_table;
-  a->vni = mp->vni;
-  a->action = mp->action;
-
-  rv = vnet_lisp_gpe_add_del_fwd_entry (a, 0);
-  vec_free (pairs);
-send_reply:
-  REPLY_MACRO (VL_API_LISP_GPE_ADD_DEL_FWD_ENTRY_REPLY);
-}
-
-static void
-vl_api_lisp_gpe_enable_disable_t_handler (vl_api_lisp_gpe_enable_disable_t *
-					  mp)
-{
-  vl_api_lisp_gpe_enable_disable_reply_t *rmp;
-  int rv = 0;
-  vnet_lisp_gpe_enable_disable_args_t _a, *a = &_a;
-
-  a->is_en = mp->is_en;
-  vnet_lisp_gpe_enable_disable (a);
-
-  REPLY_MACRO (VL_API_LISP_GPE_ENABLE_DISABLE_REPLY);
-}
-
-static void
-vl_api_lisp_gpe_add_del_iface_t_handler (vl_api_lisp_gpe_add_del_iface_t * mp)
-{
-  vl_api_lisp_gpe_add_del_iface_reply_t *rmp;
-  int rv = 0;
-
-  if (mp->is_l2)
-    {
-      if (mp->is_add)
-	{
-	  if (~0 ==
-	      lisp_gpe_tenant_l2_iface_add_or_lock (mp->vni, mp->dp_table))
-	    rv = 1;
-	}
-      else
-	lisp_gpe_tenant_l2_iface_unlock (mp->vni);
-    }
-  else
-    {
-      if (mp->is_add)
-	{
-	  if (~0 ==
-	      lisp_gpe_tenant_l3_iface_add_or_lock (mp->vni, mp->dp_table))
-	    rv = 1;
-	}
-      else
-	lisp_gpe_tenant_l3_iface_unlock (mp->vni);
-    }
-
-  REPLY_MACRO (VL_API_LISP_GPE_ADD_DEL_IFACE_REPLY);
-}
-
-static void
-send_lisp_gpe_fwd_entry_details (lisp_gpe_fwd_entry_t * lfe,
-				 unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_lisp_gpe_tunnel_details_t *rmp;
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_LISP_GPE_TUNNEL_DETAILS);
-
-  rmp->tunnels = lfe - lgm->lisp_fwd_entry_pool;
-
-  rmp->is_ipv6 = ip_prefix_version (&(lfe->key->rmt.ippref)) == IP6 ? 1 : 0;
-  ip_address_copy_addr (rmp->source_ip,
-			&ip_prefix_addr (&(lfe->key->rmt.ippref)));
-  ip_address_copy_addr (rmp->destination_ip,
-			&ip_prefix_addr (&(lfe->key->rmt.ippref)));
-
-  rmp->encap_fib_id = htonl (0);
-  rmp->decap_fib_id = htonl (lfe->eid_fib_index);
-  rmp->iid = htonl (lfe->key->vni);
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_lisp_gpe_tunnel_dump_t_handler (vl_api_lisp_gpe_tunnel_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q = NULL;
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  lisp_gpe_fwd_entry_t *lfe = NULL;
-
-  if (pool_elts (lgm->lisp_fwd_entry_pool) == 0)
-    {
-      return;
-    }
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  /* *INDENT-OFF* */
-  pool_foreach(lfe, lgm->lisp_fwd_entry_pool,
-  ({
-    send_lisp_gpe_fwd_entry_details(lfe, q, mp->context);
-  }));
-  /* *INDENT-ON* */
-}
-
-/*
- * lisp_gpe_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_lisp_gpe;
-#undef _
-}
-
-static clib_error_t *
-lisp_gpe_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (lisp_gpe_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_error.def b/vnet/vnet/lisp-gpe/lisp_gpe_error.def
deleted file mode 100644
index 415fada7..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe_error.def
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- 
-lisp_gpe_error (ENCAPSULATED, "good packets encapsulated")
-lisp_gpe_error (DECAPSULATED, "good packets decapsulated")
-lisp_gpe_error (NO_TUNNEL, "tunnel does not exist")
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.c b/vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
deleted file mode 100644
index 26a93a87..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
+++ /dev/null
@@ -1,1053 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/lisp-gpe/lisp_gpe_fwd_entry.h>
-#include <vnet/lisp-gpe/lisp_gpe_adjacency.h>
-#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
-#include <vnet/lisp-cp/lisp_cp_dpo.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/fib_entry.h>
-#include <vnet/fib/fib_path_list.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/dpo/drop_dpo.h>
-#include <vnet/dpo/lookup_dpo.h>
-#include <vnet/dpo/load_balance.h>
-#include <vnet/adj/adj_midchain.h>
-
-/**
- * @brief Add route to IP4 or IP6 Destination FIB.
- *
- * Add a route to the destination FIB that results in the lookup
- * in the SRC FIB. The SRC FIB is created is it does not yet exist.
- *
- * @param[in]   dst_table_id    Destination FIB Table-ID
- * @param[in]   dst_prefix      Destination IP prefix.
- *
- * @return  src_fib_index   The index/ID of the SRC FIB created.
- */
-static u32
-ip_dst_fib_add_route (u32 dst_fib_index, const ip_prefix_t * dst_prefix)
-{
-  fib_node_index_t src_fib_index;
-  fib_prefix_t dst_fib_prefix;
-  fib_node_index_t dst_fei;
-
-  ASSERT (NULL != dst_prefix);
-
-  ip_prefix_to_fib_prefix (dst_prefix, &dst_fib_prefix);
-
-  /*
-   * lookup the destination prefix in the VRF table and retrieve the
-   * LISP associated data
-   */
-  dst_fei = fib_table_lookup_exact_match (dst_fib_index, &dst_fib_prefix);
-
-  /*
-   * If the FIB entry is not present, or not LISP sourced, add it
-   */
-  if (dst_fei == FIB_NODE_INDEX_INVALID ||
-      NULL == fib_entry_get_source_data (dst_fei, FIB_SOURCE_LISP))
-    {
-      dpo_id_t src_lkup_dpo = DPO_INVALID;
-
-      /* create a new src FIB.  */
-      src_fib_index =
-	fib_table_create_and_lock (dst_fib_prefix.fp_proto,
-				   "LISP-src for [%d,%U]",
-				   dst_fib_index,
-				   format_fib_prefix, &dst_fib_prefix);
-      /*
-       * add src fib default route
-       */
-      fib_prefix_t prefix = {
-	.fp_proto = dst_fib_prefix.fp_proto,
-      };
-      fib_table_entry_special_dpo_add (src_fib_index, &prefix,
-				       FIB_SOURCE_LISP,
-				       FIB_ENTRY_FLAG_EXCLUSIVE,
-				       lisp_cp_dpo_get (fib_proto_to_dpo
-							(dst_fib_prefix.fp_proto)));
-      /*
-       * create a data-path object to perform the source address lookup
-       * in the SRC FIB
-       */
-      lookup_dpo_add_or_lock_w_fib_index (src_fib_index,
-					  (ip_prefix_version (dst_prefix) ==
-					   IP6 ? DPO_PROTO_IP6 :
-					   DPO_PROTO_IP4),
-					  LOOKUP_INPUT_SRC_ADDR,
-					  LOOKUP_TABLE_FROM_CONFIG,
-					  &src_lkup_dpo);
-
-      /*
-       * add the entry to the destination FIB that uses the lookup DPO
-       */
-      dst_fei = fib_table_entry_special_dpo_add (dst_fib_index,
-						 &dst_fib_prefix,
-						 FIB_SOURCE_LISP,
-						 FIB_ENTRY_FLAG_EXCLUSIVE,
-						 &src_lkup_dpo);
-
-      /*
-       * the DPO is locked by the FIB entry, and we have no further
-       * need for it.
-       */
-      dpo_unlock (&src_lkup_dpo);
-
-      /*
-       * save the SRC FIB index on the entry so we can retrieve it for
-       * subsequent routes.
-       */
-      fib_entry_set_source_data (dst_fei, FIB_SOURCE_LISP, &src_fib_index);
-    }
-  else
-    {
-      /*
-       * destination FIB entry already present
-       */
-      src_fib_index = *(u32 *) fib_entry_get_source_data (dst_fei,
-							  FIB_SOURCE_LISP);
-    }
-
-  return (src_fib_index);
-}
-
-/**
- * @brief Del route to IP4 or IP6 SD FIB.
- *
- * Remove routes from both destination and source FIBs.
- *
- * @param[in]   src_fib_index   The index/ID of the SRC FIB
- * @param[in]   src_prefix      Source IP prefix.
- * @param[in]   dst_fib_index   The index/ID of the DST FIB
- * @param[in]   dst_prefix      Destination IP prefix.
- */
-static void
-ip_src_dst_fib_del_route (u32 src_fib_index,
-			  const ip_prefix_t * src_prefix,
-			  u32 dst_fib_index, const ip_prefix_t * dst_prefix)
-{
-  fib_prefix_t dst_fib_prefix, src_fib_prefix;
-  u8 have_default = 0;
-  u32 n_entries;
-
-  ASSERT (NULL != dst_prefix);
-  ASSERT (NULL != src_prefix);
-
-  ip_prefix_to_fib_prefix (dst_prefix, &dst_fib_prefix);
-  ip_prefix_to_fib_prefix (src_prefix, &src_fib_prefix);
-
-  fib_table_entry_delete (src_fib_index, &src_fib_prefix, FIB_SOURCE_LISP);
-
-  /* check if only default left or empty */
-  fib_prefix_t default_pref = {
-    .fp_proto = dst_fib_prefix.fp_proto
-  };
-
-  if (fib_table_lookup_exact_match (src_fib_index,
-				    &default_pref) != FIB_NODE_INDEX_INVALID)
-    have_default = 1;
-
-  n_entries = fib_table_get_num_entries (src_fib_index,
-					 src_fib_prefix.fp_proto,
-					 FIB_SOURCE_LISP);
-  if (n_entries == 0 || (have_default && n_entries == 1))
-    {
-      /*
-       * remove src FIB default route
-       */
-      if (have_default)
-	fib_table_entry_special_remove (src_fib_index, &default_pref,
-					FIB_SOURCE_LISP);
-
-      /*
-       * there's nothing left now, unlock the source FIB and the
-       * destination route
-       */
-      fib_table_entry_special_remove (dst_fib_index,
-				      &dst_fib_prefix, FIB_SOURCE_LISP);
-      fib_table_unlock (src_fib_index, src_fib_prefix.fp_proto);
-    }
-}
-
-/**
- * @brief Add route to IP4 or IP6 SRC FIB.
- *
- * Adds a route to in the LISP SRC FIB with the result of the route
- * being the DPO passed.
- *
- * @param[in]   src_fib_index   The index/ID of the SRC FIB
- * @param[in]   src_prefix      Source IP prefix.
- * @param[in]   src_dpo         The DPO the route will link to.
- */
-static void
-ip_src_fib_add_route_w_dpo (u32 src_fib_index,
-			    const ip_prefix_t * src_prefix,
-			    const dpo_id_t * src_dpo)
-{
-  fib_prefix_t src_fib_prefix;
-
-  ip_prefix_to_fib_prefix (src_prefix, &src_fib_prefix);
-
-  /*
-   * add the entry into the source fib.
-   */
-  fib_node_index_t src_fei;
-
-  src_fei = fib_table_lookup_exact_match (src_fib_index, &src_fib_prefix);
-
-  if (FIB_NODE_INDEX_INVALID == src_fei ||
-      !fib_entry_is_sourced (src_fei, FIB_SOURCE_LISP))
-    {
-      fib_table_entry_special_dpo_add (src_fib_index,
-				       &src_fib_prefix,
-				       FIB_SOURCE_LISP,
-				       FIB_ENTRY_FLAG_EXCLUSIVE, src_dpo);
-    }
-}
-
-static fib_route_path_t *
-lisp_gpe_mk_fib_paths (const lisp_fwd_path_t * paths)
-{
-  const lisp_gpe_adjacency_t *ladj;
-  fib_route_path_t *rpaths = NULL;
-  u8 best_priority;
-  u32 ii;
-
-  vec_validate (rpaths, vec_len (paths) - 1);
-
-  best_priority = paths[0].priority;
-
-  vec_foreach_index (ii, paths)
-  {
-    if (paths[0].priority != best_priority)
-      break;
-
-    ladj = lisp_gpe_adjacency_get (paths[ii].lisp_adj);
-
-    ip_address_to_46 (&ladj->remote_rloc,
-		      &rpaths[ii].frp_addr, &rpaths[ii].frp_proto);
-
-    rpaths[ii].frp_sw_if_index = ladj->sw_if_index;
-    rpaths[ii].frp_weight = (paths[ii].weight ? paths[ii].weight : 1);
-  }
-
-  ASSERT (0 != vec_len (rpaths));
-
-  return (rpaths);
-}
-
-/**
- * @brief Add route to IP4 or IP6 SRC FIB.
- *
- * Adds a route to in the LISP SRC FIB for the tunnel.
- *
- * @param[in]   src_fib_index   The index/ID of the SRC FIB
- * @param[in]   src_prefix      Source IP prefix.
- * @param[in]   paths           The paths from which to construct the
- *                              load balance
- */
-static void
-ip_src_fib_add_route (u32 src_fib_index,
-		      const ip_prefix_t * src_prefix,
-		      const lisp_fwd_path_t * paths)
-{
-  fib_prefix_t src_fib_prefix;
-  fib_route_path_t *rpaths;
-
-  ip_prefix_to_fib_prefix (src_prefix, &src_fib_prefix);
-
-  rpaths = lisp_gpe_mk_fib_paths (paths);
-
-  fib_table_entry_update (src_fib_index,
-			  &src_fib_prefix,
-			  FIB_SOURCE_LISP, FIB_ENTRY_FLAG_NONE, rpaths);
-  vec_free (rpaths);
-}
-
-
-static void
-create_fib_entries (lisp_gpe_fwd_entry_t * lfe)
-{
-  dpo_proto_t dproto;
-
-  dproto = (ip_prefix_version (&lfe->key->rmt.ippref) == IP4 ?
-	    DPO_PROTO_IP4 : DPO_PROTO_IP6);
-
-  lfe->src_fib_index = ip_dst_fib_add_route (lfe->eid_fib_index,
-					     &lfe->key->rmt.ippref);
-
-  if (LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE == lfe->type)
-    {
-      dpo_id_t dpo = DPO_INVALID;
-
-      switch (lfe->action)
-	{
-	case LISP_NO_ACTION:
-	  /* TODO update timers? */
-	case LISP_FORWARD_NATIVE:
-	  /* TODO check if route/next-hop for eid exists in fib and add
-	   * more specific for the eid with the next-hop found */
-	case LISP_SEND_MAP_REQUEST:
-	  /* insert tunnel that always sends map-request */
-	  dpo_copy (&dpo, lisp_cp_dpo_get (dproto));
-	  break;
-	case LISP_DROP:
-	  /* for drop fwd entries, just add route, no need to add encap tunnel */
-	  dpo_copy (&dpo, drop_dpo_get (dproto));
-	  break;
-	}
-      ip_src_fib_add_route_w_dpo (lfe->src_fib_index,
-				  &lfe->key->lcl.ippref, &dpo);
-      dpo_reset (&dpo);
-    }
-  else
-    {
-      ip_src_fib_add_route (lfe->src_fib_index,
-			    &lfe->key->lcl.ippref, lfe->paths);
-    }
-}
-
-static void
-delete_fib_entries (lisp_gpe_fwd_entry_t * lfe)
-{
-  ip_src_dst_fib_del_route (lfe->src_fib_index,
-			    &lfe->key->lcl.ippref,
-			    lfe->eid_fib_index, &lfe->key->rmt.ippref);
-}
-
-static void
-gid_to_dp_address (gid_address_t * g, dp_address_t * d)
-{
-  switch (gid_address_type (g))
-    {
-    case GID_ADDR_IP_PREFIX:
-    case GID_ADDR_SRC_DST:
-      ip_prefix_copy (&d->ippref, &gid_address_ippref (g));
-      d->type = FID_ADDR_IP_PREF;
-      break;
-    case GID_ADDR_MAC:
-    default:
-      mac_copy (&d->mac, &gid_address_mac (g));
-      d->type = FID_ADDR_MAC;
-      break;
-    }
-}
-
-static lisp_gpe_fwd_entry_t *
-find_fwd_entry (lisp_gpe_main_t * lgm,
-		vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
-		lisp_gpe_fwd_entry_key_t * key)
-{
-  uword *p;
-
-  memset (key, 0, sizeof (*key));
-
-  if (GID_ADDR_IP_PREFIX == gid_address_type (&a->rmt_eid))
-    {
-      /*
-       * the ip version of the source is not set to ip6 when the
-       * source is all zeros. force it.
-       */
-      ip_prefix_version (&gid_address_ippref (&a->lcl_eid)) =
-	ip_prefix_version (&gid_address_ippref (&a->rmt_eid));
-    }
-
-  gid_to_dp_address (&a->rmt_eid, &key->rmt);
-  gid_to_dp_address (&a->lcl_eid, &key->lcl);
-  key->vni = a->vni;
-
-  p = hash_get_mem (lgm->lisp_gpe_fwd_entries, key);
-
-  if (NULL != p)
-    {
-      return (pool_elt_at_index (lgm->lisp_fwd_entry_pool, p[0]));
-    }
-  return (NULL);
-}
-
-static int
-lisp_gpe_fwd_entry_path_sort (void *a1, void *a2)
-{
-  lisp_fwd_path_t *p1 = a1, *p2 = a2;
-
-  return (p1->priority - p2->priority);
-}
-
-static void
-lisp_gpe_fwd_entry_mk_paths (lisp_gpe_fwd_entry_t * lfe,
-			     vnet_lisp_gpe_add_del_fwd_entry_args_t * a)
-{
-  lisp_fwd_path_t *path;
-  u32 index;
-
-  vec_validate (lfe->paths, vec_len (a->locator_pairs) - 1);
-
-  vec_foreach_index (index, a->locator_pairs)
-  {
-    path = &lfe->paths[index];
-
-    path->priority = a->locator_pairs[index].priority;
-    path->weight = a->locator_pairs[index].weight;
-
-    path->lisp_adj =
-      lisp_gpe_adjacency_find_or_create_and_lock (&a->locator_pairs
-						  [index],
-						  a->dp_table, lfe->key->vni);
-  }
-  vec_sort_with_function (lfe->paths, lisp_gpe_fwd_entry_path_sort);
-}
-
-/**
- * @brief Add/Delete LISP IP forwarding entry.
- *
- * creation of forwarding entries for IP LISP overlay:
- *
- * @param[in]   lgm     Reference to @ref lisp_gpe_main_t.
- * @param[in]   a       Parameters for building the forwarding entry.
- *
- * @return 0 on success.
- */
-static int
-add_ip_fwd_entry (lisp_gpe_main_t * lgm,
-		  vnet_lisp_gpe_add_del_fwd_entry_args_t * a)
-{
-  lisp_gpe_fwd_entry_key_t key;
-  lisp_gpe_fwd_entry_t *lfe;
-  fib_protocol_t fproto;
-
-  lfe = find_fwd_entry (lgm, a, &key);
-
-  if (NULL != lfe)
-    /* don't support updates */
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  pool_get (lgm->lisp_fwd_entry_pool, lfe);
-  memset (lfe, 0, sizeof (*lfe));
-  lfe->key = clib_mem_alloc (sizeof (key));
-  memcpy (lfe->key, &key, sizeof (key));
-
-  hash_set_mem (lgm->lisp_gpe_fwd_entries, lfe->key,
-		lfe - lgm->lisp_fwd_entry_pool);
-
-  fproto = (IP4 == ip_prefix_version (&fid_addr_ippref (&lfe->key->rmt)) ?
-	    FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6);
-
-  lfe->type = (a->is_negative ?
-	       LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE :
-	       LISP_GPE_FWD_ENTRY_TYPE_NORMAL);
-  lfe->tenant = lisp_gpe_tenant_find_or_create (lfe->key->vni);
-  lfe->eid_table_id = a->table_id;
-  lfe->eid_fib_index = fib_table_find_or_create_and_lock (fproto,
-							  lfe->eid_table_id);
-
-  if (LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE != lfe->type)
-    {
-      lisp_gpe_fwd_entry_mk_paths (lfe, a);
-    }
-
-  create_fib_entries (lfe);
-
-  return (0);
-}
-
-static void
-del_ip_fwd_entry_i (lisp_gpe_main_t * lgm, lisp_gpe_fwd_entry_t * lfe)
-{
-  lisp_fwd_path_t *path;
-  fib_protocol_t fproto;
-
-  vec_foreach (path, lfe->paths)
-  {
-    lisp_gpe_adjacency_unlock (path->lisp_adj);
-  }
-
-  delete_fib_entries (lfe);
-
-  fproto = (IP4 == ip_prefix_version (&fid_addr_ippref (&lfe->key->rmt)) ?
-	    FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6);
-  fib_table_unlock (lfe->eid_fib_index, fproto);
-
-  hash_unset_mem (lgm->lisp_gpe_fwd_entries, lfe->key);
-  clib_mem_free (lfe->key);
-  pool_put (lgm->lisp_fwd_entry_pool, lfe);
-}
-
-/**
- * @brief Add/Delete LISP IP forwarding entry.
- *
- * removal of forwarding entries for IP LISP overlay:
- *
- * @param[in]   lgm     Reference to @ref lisp_gpe_main_t.
- * @param[in]   a       Parameters for building the forwarding entry.
- *
- * @return 0 on success.
- */
-static int
-del_ip_fwd_entry (lisp_gpe_main_t * lgm,
-		  vnet_lisp_gpe_add_del_fwd_entry_args_t * a)
-{
-  lisp_gpe_fwd_entry_key_t key;
-  lisp_gpe_fwd_entry_t *lfe;
-
-  lfe = find_fwd_entry (lgm, a, &key);
-
-  if (NULL == lfe)
-    /* no such entry */
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  del_ip_fwd_entry_i (lgm, lfe);
-
-  return (0);
-}
-
-static void
-make_mac_fib_key (BVT (clib_bihash_kv) * kv, u16 bd_index, u8 src_mac[6],
-		  u8 dst_mac[6])
-{
-  kv->key[0] = (((u64) bd_index) << 48) | mac_to_u64 (dst_mac);
-  kv->key[1] = mac_to_u64 (src_mac);
-  kv->key[2] = 0;
-}
-
-/**
- * @brief Lookup L2 SD FIB entry
- *
- * Does a vni + dest + source lookup in the L2 LISP FIB. If the lookup fails
- * it tries a second time with source set to 0 (i.e., a simple dest lookup).
- *
- * @param[in]   lgm             Reference to @ref lisp_gpe_main_t.
- * @param[in]   bd_index        Bridge domain index.
- * @param[in]   src_mac         Source mac address.
- * @param[in]   dst_mac         Destination mac address.
- *
- * @return index of mapping matching the lookup key.
- */
-index_t
-lisp_l2_fib_lookup (lisp_gpe_main_t * lgm, u16 bd_index, u8 src_mac[6],
-		    u8 dst_mac[6])
-{
-  int rv;
-  BVT (clib_bihash_kv) kv, value;
-
-  make_mac_fib_key (&kv, bd_index, src_mac, dst_mac);
-  rv = BV (clib_bihash_search_inline_2) (&lgm->l2_fib, &kv, &value);
-
-  /* no match, try with src 0, catch all for dst */
-  if (rv != 0)
-    {
-      kv.key[1] = 0;
-      rv = BV (clib_bihash_search_inline_2) (&lgm->l2_fib, &kv, &value);
-      if (rv == 0)
-	return value.value;
-    }
-  else
-    return value.value;
-
-  return lisp_gpe_main.l2_lb_cp_lkup.dpoi_index;
-}
-
-/**
- * @brief Add/del L2 SD FIB entry
- *
- * Inserts value in L2 FIB keyed by vni + dest + source. If entry is
- * overwritten the associated value is returned.
- *
- * @param[in]   lgm             Reference to @ref lisp_gpe_main_t.
- * @param[in]   bd_index        Bridge domain index.
- * @param[in]   src_mac         Source mac address.
- * @param[in]   dst_mac         Destination mac address.
- * @param[in]   val             Value to add.
- * @param[in]   is_add          Add/del flag.
- *
- * @return ~0 or value of overwritten entry.
- */
-static u32
-lisp_l2_fib_add_del_entry (u16 bd_index, u8 src_mac[6],
-			   u8 dst_mac[6], const dpo_id_t * dpo, u8 is_add)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  BVT (clib_bihash_kv) kv, value;
-  u32 old_val = ~0;
-
-  make_mac_fib_key (&kv, bd_index, src_mac, dst_mac);
-
-  if (BV (clib_bihash_search) (&lgm->l2_fib, &kv, &value) == 0)
-    old_val = value.value;
-
-  if (!is_add)
-    BV (clib_bihash_add_del) (&lgm->l2_fib, &kv, 0 /* is_add */ );
-  else
-    {
-      kv.value = dpo->dpoi_index;
-      BV (clib_bihash_add_del) (&lgm->l2_fib, &kv, 1 /* is_add */ );
-    }
-  return old_val;
-}
-
-#define L2_FIB_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
-#define L2_FIB_DEFAULT_HASH_MEMORY_SIZE (32<<20)
-
-static void
-l2_fib_init (lisp_gpe_main_t * lgm)
-{
-  index_t lbi;
-
-  BV (clib_bihash_init) (&lgm->l2_fib, "l2 fib",
-			 1 << max_log2 (L2_FIB_DEFAULT_HASH_NUM_BUCKETS),
-			 L2_FIB_DEFAULT_HASH_MEMORY_SIZE);
-
-  /*
-   * the result from a 'miss' in a L2 Table
-   */
-  lbi = load_balance_create (1, DPO_PROTO_ETHERNET, 0);
-  load_balance_set_bucket (lbi, 0, lisp_cp_dpo_get (DPO_PROTO_ETHERNET));
-
-  dpo_set (&lgm->l2_lb_cp_lkup, DPO_LOAD_BALANCE, DPO_PROTO_ETHERNET, lbi);
-}
-
-static void
-del_l2_fwd_entry_i (lisp_gpe_main_t * lgm, lisp_gpe_fwd_entry_t * lfe)
-{
-  lisp_fwd_path_t *path;
-
-  if (LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE != lfe->type)
-    {
-      vec_foreach (path, lfe->paths)
-      {
-	lisp_gpe_adjacency_unlock (path->lisp_adj);
-      }
-      fib_path_list_child_remove (lfe->l2.path_list_index,
-				  lfe->l2.child_index);
-    }
-
-  lisp_l2_fib_add_del_entry (lfe->l2.eid_bd_index,
-			     fid_addr_mac (&lfe->key->lcl),
-			     fid_addr_mac (&lfe->key->rmt), NULL, 0);
-
-  hash_unset_mem (lgm->lisp_gpe_fwd_entries, lfe->key);
-  clib_mem_free (lfe->key);
-  pool_put (lgm->lisp_fwd_entry_pool, lfe);
-}
-
-/**
- * @brief Delete LISP L2 forwarding entry.
- *
- * Coordinates the removal of forwarding entries for L2 LISP overlay:
- *
- * @param[in]   lgm     Reference to @ref lisp_gpe_main_t.
- * @param[in]   a       Parameters for building the forwarding entry.
- *
- * @return 0 on success.
- */
-static int
-del_l2_fwd_entry (lisp_gpe_main_t * lgm,
-		  vnet_lisp_gpe_add_del_fwd_entry_args_t * a)
-{
-  lisp_gpe_fwd_entry_key_t key;
-  lisp_gpe_fwd_entry_t *lfe;
-
-  lfe = find_fwd_entry (lgm, a, &key);
-
-  if (NULL == lfe)
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  del_l2_fwd_entry_i (lgm, lfe);
-
-  return (0);
-}
-
-/**
- * @brief Construct and insert the forwarding information used by a L2 entry
- */
-static void
-lisp_gpe_l2_update_fwding (lisp_gpe_fwd_entry_t * lfe)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  dpo_id_t dpo = DPO_INVALID;
-
-  if (LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE != lfe->type)
-    {
-      fib_path_list_contribute_forwarding (lfe->l2.path_list_index,
-					   FIB_FORW_CHAIN_TYPE_ETHERNET,
-					   &lfe->l2.dpo);
-      dpo_copy (&dpo, &lfe->l2.dpo);
-    }
-  else
-    {
-      dpo_copy (&dpo, &lgm->l2_lb_cp_lkup);
-    }
-
-  /* add entry to l2 lisp fib */
-  lisp_l2_fib_add_del_entry (lfe->l2.eid_bd_index,
-			     fid_addr_mac (&lfe->key->lcl),
-			     fid_addr_mac (&lfe->key->rmt), &dpo, 1);
-
-  dpo_reset (&dpo);
-}
-
-/**
- * @brief Add LISP L2 forwarding entry.
- *
- * Coordinates the creation of forwarding entries for L2 LISP overlay:
- * creates lisp-gpe tunnel and injects new entry in Source/Dest L2 FIB.
- *
- * @param[in]   lgm     Reference to @ref lisp_gpe_main_t.
- * @param[in]   a       Parameters for building the forwarding entry.
- *
- * @return 0 on success.
- */
-static int
-add_l2_fwd_entry (lisp_gpe_main_t * lgm,
-		  vnet_lisp_gpe_add_del_fwd_entry_args_t * a)
-{
-  lisp_gpe_fwd_entry_key_t key;
-  bd_main_t *bdm = &bd_main;
-  lisp_gpe_fwd_entry_t *lfe;
-  uword *bd_indexp;
-
-  bd_indexp = hash_get (bdm->bd_index_by_bd_id, a->bd_id);
-  if (!bd_indexp)
-    {
-      clib_warning ("bridge domain %d doesn't exist", a->bd_id);
-      return -1;
-    }
-
-  lfe = find_fwd_entry (lgm, a, &key);
-
-  if (NULL != lfe)
-    /* don't support updates */
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  pool_get (lgm->lisp_fwd_entry_pool, lfe);
-  memset (lfe, 0, sizeof (*lfe));
-  lfe->key = clib_mem_alloc (sizeof (key));
-  memcpy (lfe->key, &key, sizeof (key));
-
-  hash_set_mem (lgm->lisp_gpe_fwd_entries, lfe->key,
-		lfe - lgm->lisp_fwd_entry_pool);
-
-  lfe->type = (a->is_negative ?
-	       LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE :
-	       LISP_GPE_FWD_ENTRY_TYPE_NORMAL);
-  lfe->l2.eid_bd_id = a->bd_id;
-  lfe->l2.eid_bd_index = bd_indexp[0];
-  lfe->tenant = lisp_gpe_tenant_find_or_create (lfe->key->vni);
-
-  if (LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE != lfe->type)
-    {
-      fib_route_path_t *rpaths;
-
-      /*
-       * Make the sorted array of LISP paths with their resp. adjacency
-       */
-      lisp_gpe_fwd_entry_mk_paths (lfe, a);
-
-      /*
-       * From the LISP paths, construct a FIB path list that will
-       * contribute a load-balance.
-       */
-      rpaths = lisp_gpe_mk_fib_paths (lfe->paths);
-
-      lfe->l2.path_list_index =
-	fib_path_list_create (FIB_PATH_LIST_FLAG_NONE, rpaths);
-
-      /*
-       * become a child of the path-list so we receive updates when
-       * its forwarding state changes. this includes an implicit lock.
-       */
-      lfe->l2.child_index =
-	fib_path_list_child_add (lfe->l2.path_list_index,
-				 FIB_NODE_TYPE_LISP_GPE_FWD_ENTRY,
-				 lfe - lgm->lisp_fwd_entry_pool);
-    }
-  else
-    {
-      lfe->action = a->action;
-    }
-
-  lisp_gpe_l2_update_fwding (lfe);
-
-  return 0;
-}
-
-/**
- * @brief conver from the embedded fib_node_t struct to the LSIP entry
- */
-static lisp_gpe_fwd_entry_t *
-lisp_gpe_fwd_entry_from_fib_node (fib_node_t * node)
-{
-  return ((lisp_gpe_fwd_entry_t *) (((char *) node) -
-				    STRUCT_OFFSET_OF (lisp_gpe_fwd_entry_t,
-						      node)));
-}
-
-/**
- * @brief Function invoked during a backwalk of the FIB graph
- */
-static fib_node_back_walk_rc_t
-lisp_gpe_fib_node_back_walk (fib_node_t * node,
-			     fib_node_back_walk_ctx_t * ctx)
-{
-  lisp_gpe_l2_update_fwding (lisp_gpe_fwd_entry_from_fib_node (node));
-
-  return (FIB_NODE_BACK_WALK_CONTINUE);
-}
-
-/**
- * @brief Get a fib_node_t struct from the index of a LISP fwd entry
- */
-static fib_node_t *
-lisp_gpe_fwd_entry_get_fib_node (fib_node_index_t index)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  lisp_gpe_fwd_entry_t *lfe;
-
-  lfe = pool_elt_at_index (lgm->lisp_fwd_entry_pool, index);
-
-  return (&(lfe->node));
-}
-
-/**
- * @brief An indication from the graph that the last lock has gone
- */
-static void
-lisp_gpe_fwd_entry_fib_node_last_lock_gone (fib_node_t * node)
-{
-  /* We don't manage the locks of the LISP objects via the graph, since
-   * this object has no children. so this is a no-op. */
-}
-
-/**
- * @brief Virtual function table to register with FIB for the LISP type
- */
-const static fib_node_vft_t lisp_fwd_vft = {
-  .fnv_get = lisp_gpe_fwd_entry_get_fib_node,
-  .fnv_last_lock = lisp_gpe_fwd_entry_fib_node_last_lock_gone,
-  .fnv_back_walk = lisp_gpe_fib_node_back_walk,
-};
-
-/**
- * @brief Forwarding entry create/remove dispatcher.
- *
- * Calls l2 or l3 forwarding entry add/del function based on input data.
- *
- * @param[in]   a       Forwarding entry parameters.
- * @param[out]  hw_if_indexp    NOT USED
- *
- * @return 0 on success.
- */
-int
-vnet_lisp_gpe_add_del_fwd_entry (vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
-				 u32 * hw_if_indexp)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  u8 type;
-
-  if (vnet_lisp_gpe_enable_disable_status () == 0)
-    {
-      clib_warning ("LISP is disabled!");
-      return VNET_API_ERROR_LISP_DISABLED;
-    }
-
-  type = gid_address_type (&a->rmt_eid);
-  switch (type)
-    {
-    case GID_ADDR_IP_PREFIX:
-      if (a->is_add)
-	return add_ip_fwd_entry (lgm, a);
-      else
-	return del_ip_fwd_entry (lgm, a);
-      break;
-    case GID_ADDR_MAC:
-      if (a->is_add)
-	return add_l2_fwd_entry (lgm, a);
-      else
-	return del_l2_fwd_entry (lgm, a);
-    default:
-      clib_warning ("Forwarding entries for type %d not supported!", type);
-      return -1;
-    }
-}
-
-/**
- * @brief Flush all the forwrding entries
- */
-void
-vnet_lisp_gpe_fwd_entry_flush (void)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  lisp_gpe_fwd_entry_t *lfe;
-
-  /* *INDENT-OFF* */
-  pool_foreach (lfe, lgm->lisp_fwd_entry_pool,
-  ({
-    switch (fid_addr_type(&lfe->key->rmt))
-      {
-      case FID_ADDR_MAC:
-	del_l2_fwd_entry_i (lgm, lfe);
-	break;
-      case FID_ADDR_IP_PREF:
-	del_ip_fwd_entry_i (lgm, lfe);
-	break;
-      }
-  }));
-  /* *INDENT-ON* */
-}
-
-static u8 *
-format_lisp_fwd_path (u8 * s, va_list ap)
-{
-  lisp_fwd_path_t *lfp = va_arg (ap, lisp_fwd_path_t *);
-
-  s = format (s, "priority:%d weight:%d ", lfp->priority, lfp->weight);
-  s = format (s, "adj:[%U]\n",
-	      format_lisp_gpe_adjacency,
-	      lisp_gpe_adjacency_get (lfp->lisp_adj),
-	      LISP_GPE_ADJ_FORMAT_FLAG_NONE);
-
-  return (s);
-}
-
-typedef enum lisp_gpe_fwd_entry_format_flag_t_
-{
-  LISP_GPE_FWD_ENTRY_FORMAT_NONE = (0 << 0),
-  LISP_GPE_FWD_ENTRY_FORMAT_DETAIL = (1 << 1),
-} lisp_gpe_fwd_entry_format_flag_t;
-
-
-static u8 *
-format_lisp_gpe_fwd_entry (u8 * s, va_list ap)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  lisp_gpe_fwd_entry_t *lfe = va_arg (ap, lisp_gpe_fwd_entry_t *);
-  lisp_gpe_fwd_entry_format_flag_t flags =
-    va_arg (ap, lisp_gpe_fwd_entry_format_flag_t);
-
-  s = format (s, "VNI:%d VRF:%d EID: %U -> %U  [index:%d]",
-	      lfe->key->vni, lfe->eid_table_id,
-	      format_fid_address, &lfe->key->lcl,
-	      format_fid_address, &lfe->key->rmt,
-	      lfe - lgm->lisp_fwd_entry_pool);
-
-  if (LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE == lfe->type)
-    {
-      s = format (s, "\n Negative - action:%U",
-		  format_negative_mapping_action, lfe->action);
-    }
-  else
-    {
-      lisp_fwd_path_t *path;
-
-      s = format (s, "\n via:");
-      vec_foreach (path, lfe->paths)
-      {
-	s = format (s, "\n  %U", format_lisp_fwd_path, path);
-      }
-    }
-
-  if (flags & LISP_GPE_FWD_ENTRY_FORMAT_DETAIL)
-    {
-      switch (fid_addr_type (&lfe->key->rmt))
-	{
-	case FID_ADDR_MAC:
-	  s = format (s, " fib-path-list:%d\n", lfe->l2.path_list_index);
-	  s = format (s, " dpo:%U\n", format_dpo_id, &lfe->l2.dpo, 0);
-	  break;
-	case FID_ADDR_IP_PREF:
-	  break;
-	}
-    }
-
-  return (s);
-}
-
-static clib_error_t *
-lisp_gpe_fwd_entry_show (vlib_main_t * vm,
-			 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  lisp_gpe_fwd_entry_t *lfe;
-  index_t index;
-  u32 vni = ~0;
-
-  if (unformat (input, "vni %d", &vni))
-    ;
-  else if (unformat (input, "%d", &index))
-    {
-      if (!pool_is_free_index (lgm->lisp_fwd_entry_pool, index))
-	{
-	  lfe = pool_elt_at_index (lgm->lisp_fwd_entry_pool, index);
-
-	  vlib_cli_output (vm, "[%d@] %U",
-			   index,
-			   format_lisp_gpe_fwd_entry, lfe,
-			   LISP_GPE_FWD_ENTRY_FORMAT_DETAIL);
-	}
-      else
-	{
-	  vlib_cli_output (vm, "entry %d invalid", index);
-	}
-
-      return (NULL);
-    }
-
-  /* *INDENT-OFF* */
-  pool_foreach (lfe, lgm->lisp_fwd_entry_pool,
-  ({
-    if ((vni == ~0) ||
-	(lfe->key->vni == vni))
-      vlib_cli_output (vm, "%U", format_lisp_gpe_fwd_entry, lfe,
-		       LISP_GPE_FWD_ENTRY_FORMAT_NONE);
-  }));
-  /* *INDENT-ON* */
-
-  return (NULL);
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_gpe_fwd_entry_show_command, static) = {
-  .path = "show lisp gpe entry",
-  .short_help = "show lisp gpe entry vni <vni> vrf <vrf> [leid <leid>] reid <reid>",
-  .function = lisp_gpe_fwd_entry_show,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-lisp_gpe_fwd_entry_init (vlib_main_t * vm)
-{
-  lisp_gpe_main_t *lgm = &lisp_gpe_main;
-  clib_error_t *error = NULL;
-
-  if ((error = vlib_call_init_function (vm, lisp_cp_dpo_module_init)))
-    return (error);
-
-  l2_fib_init (lgm);
-
-  fib_node_register_type (FIB_NODE_TYPE_LISP_GPE_FWD_ENTRY, &lisp_fwd_vft);
-
-  return (error);
-}
-
-VLIB_INIT_FUNCTION (lisp_gpe_fwd_entry_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.h b/vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.h
deleted file mode 100644
index f7923671..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief LISP-GPE definitions.
- */
-
-#ifndef __LISP_GPE_FWD_ENTRY_H__
-#define __LISP_GPE_FWD_ENTRY_H__
-
-#include <vnet/lisp-gpe/lisp_gpe.h>
-
-/**
- * @brief A path on which to forward lisp traffic
- */
-typedef struct lisp_fwd_path_t_
-{
-  /**
-   * The adjacency constructed for the locator pair
-   */
-  index_t lisp_adj;
-
-  /**
-   * Priority. Only the paths with the best priority will be installed in FIB
-   */
-  u8 priority;
-
-  /**
-   * [UE]CMP weigt for the path
-   */
-  u8 weight;
-
-} lisp_fwd_path_t;
-
-/**
- * @brief A Forwarding entry can be 'normal' or 'negative'
- * Negative implies we deliberately want to add a FIB entry for an EID
- * that results in 'special' behaviour determined by an 'action'.
- * @normal means send it down some tunnels.
- */
-typedef enum lisp_gpe_fwd_entry_type_t_
-{
-  LISP_GPE_FWD_ENTRY_TYPE_NORMAL,
-  LISP_GPE_FWD_ENTRY_TYPE_NEGATIVE,
-} lisp_gpe_fwd_entry_type_t;
-
-
-/**
- * LISP-GPE fwd entry key
- */
-typedef struct lisp_gpe_fwd_entry_key_t_
-{
-  dp_address_t rmt;
-  dp_address_t lcl;
-  u32 vni;
-} lisp_gpe_fwd_entry_key_t;
-
-/**
- * @brief A LISP Forwarding Entry
- *
- * A forwarding entry is from a locai EID to a remote EID over a set of rloc pairs
- */
-typedef struct lisp_gpe_fwd_entry_t_
-{
-  /**
-   * This object joins the FIB control plane graph to receive updates to
-   * for changes to the graph.
-   */
-  fib_node_t node;
-
-  /**
-   * The Entry's key: {lEID,r-EID,vni}
-   */
-  lisp_gpe_fwd_entry_key_t *key;
-
-  /**
-   * The forwarding entry type
-   */
-  lisp_gpe_fwd_entry_type_t type;
-
-  /**
-   * The tenant the entry belongs to
-   */
-  u32 tenant;
-
-  /**
-   * The VRF (in the case of L3) or Bridge-Domain (for L2) index
-   */
-  union
-  {
-    /**
-     * Fields relevant to an L2 entry
-     */
-    struct
-    {
-      /**
-       * The VRF ID
-       */
-      u32 eid_table_id;
-
-      /**
-       * The FIB index for the overlay, i.e. the FIB in which the EIDs
-       * are present
-       */
-      u32 eid_fib_index;
-      /**
-       * The SRC-FIB index for created for anding source-route entries
-       */
-      u32 src_fib_index;
-    };
-    /**
-     * Fields relevant to an L2 entry
-     */
-    struct
-    {
-      /**
-       * The Bridge-Domain (for L2) index
-       */
-      u32 eid_bd_id;
-
-      /**
-       * The Bridge-domain index for the overlay EIDs
-       */
-      u32 eid_bd_index;
-
-      /**
-       * The path-list created for the forwarding
-       */
-      fib_node_index_t path_list_index;
-
-      /**
-       * Child index of this entry on the path-list
-       */
-      u32 child_index;
-
-      /**
-       * The DPO used to forward
-       */
-      dpo_id_t dpo;
-    } l2;
-  };
-
-  union
-  {
-    /**
-     * @brief When the type is 'normal'
-     *        The RLOC pair that form the route's paths. i.e. where to send
-     *        packets for this route.
-     */
-    lisp_fwd_path_t *paths;
-
-    /**
-     * @brief When the type is negative. The action to take.
-     */
-    negative_fwd_actions_e action;
-  };
-} lisp_gpe_fwd_entry_t;
-
-extern int
-vnet_lisp_gpe_add_del_fwd_entry (vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
-				 u32 * hw_if_indexp);
-
-extern void vnet_lisp_gpe_fwd_entry_flush (void);
-
-extern u32 lisp_l2_fib_lookup (lisp_gpe_main_t * lgm,
-			       u16 bd_index, u8 src_mac[8], u8 dst_mac[8]);
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_packet.h b/vnet/vnet/lisp-gpe/lisp_gpe_packet.h
deleted file mode 100644
index 62ac9bd7..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe_packet.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- *  @file
- *  @brief LISP-GPE packet header structure
- *
- */
-
-#ifndef included_lisp_gpe_packet_h
-#define included_lisp_gpe_packet_h
-
-/*
- *   From draft-lewis-lisp-gpe-02.txt
- *
- *  0                   1                   2                   3
- *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * |N|L|E|V|I|P|R|O|Ver|      Reserved             | Next Protocol |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * |                 Instance ID/Locator-Status-Bits               |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- *   N: The N-bit is the nonce-present bit.  When this bit is set to 1,
- *     the low-order 24 bits of the first 32 bits of the LISP header
- *     contain a Nonce.  See Section 6.3.1 for details.  Both N- and
- *     V-bits MUST NOT be set in the same packet.  If they are, a
- *     decapsulating ETR MUST treat the 'Nonce/Map-Version' field as
- *     having a Nonce value present.
- *
- *  L: The L-bit is the 'Locator-Status-Bits' field enabled bit.  When
- *     this bit is set to 1, the Locator-Status-Bits in the second
- *     32 bits of the LISP header are in use.
- *
- *  E: The E-bit is the echo-nonce-request bit.  This bit MUST be ignored
- *     and has no meaning when the N-bit is set to 0.  When the N-bit is
- *     set to 1 and this bit is set to 1, an ITR is requesting that the
- *     nonce value in the 'Nonce' field be echoed back in LISP-
- *     encapsulated packets when the ITR is also an ETR.  See
- *     Section 6.3.1 for details.
- *
- *  V: The V-bit is the Map-Version present bit.  When this bit is set to
- *     1, the N-bit MUST be 0.  Refer to Section 6.6.3 for more details.
- *
- *  I: The I-bit is the Instance ID bit.  See Section 5.5 for more
- *     details.  When this bit is set to 1, the 'Locator-Status-Bits'
- *     field is reduced to 8 bits and the high-order 24 bits are used as
- *     an Instance ID.  If the L-bit is set to 0, then the low-order
- *     8 bits are transmitted as zero and ignored on receipt.
- *
- * P Bit:  Flag bit 5 is defined as the Next Protocol bit.  The P bit
- *    MUST be set to 1 to indicate the presence of the 8 bit next
- *    protocol field.
- *
- *    P = 0 indicates that the payload MUST conform to LISP as defined
- *    in [RFC6830].
- *
- *    Flag bit 5 was chosen as the P bit because this flag bit is
- *    currently unallocated in LISP [RFC6830].
- *
- *  O: Flag bit 7 is defined as the O bit.  When the O bit is set to 1, the
- *  packet is an OAM packet and OAM processing MUST occur.  The OAM
- *  protocol details are out of scope for this document.  As with the
- *  P-bit, bit 7 is currently a reserved flag in [RFC6830].
- *
- * Next Protocol Field:  The lower 8 bits of the first word are used to
- *    carry a next protocol.  This next protocol field contains the
- *    protocol of the encapsulated payload packet.
- *
- *    LISP [RFC6830] uses the lower 16 bits of the first word for either
- *    a nonce, an echo-nonce ([RFC6830]) or to support map-versioning
- *    ([RFC6834]).  These are all optional capabilities that are
- *    indicated by setting the N, E, and the V bit respectively.
- *
- *    To maintain the desired data plane compatibility, when the P bit
- *    is set, the N, E, and V bits MUST be set to zero.
- *
- * A new protocol registry will be requested from IANA for the Next
- * Protocol field.  This draft defines the following Next Protocol
- * values:
- *
- *    0x1 : IPv4
- *    0x2 : IPv6
- *    0x3 : Ethernet
- *    0x4: Network Service Header
- */
-
-/** LISP-GPE header */
-typedef struct
-{
-  u8 flags;
-  u8 ver_res;
-  u8 res;
-  u8 next_protocol;
-  u32 iid;
-} lisp_gpe_header_t;
-
-#define foreach_lisp_gpe_flag_bit               \
-_(N, 0x80)                                      \
-_(L, 0x40)                                      \
-_(E, 0x20)                                      \
-_(V, 0x10)                                      \
-_(I, 0x08)                                      \
-_(P, 0x04)                                      \
-_(O, 0x01)
-
-typedef enum
-{
-#define _(n,v) LISP_GPE_FLAGS_##n = v,
-  foreach_lisp_gpe_flag_bit
-#undef _
-} vnet_lisp_gpe_flag_bit_t;
-
-#define LISP_GPE_VERSION 0x0
-
-#define LISP_GPE_NEXT_PROTOCOL_IP4 0x1
-#define LISP_GPE_NEXT_PROTOCOL_IP6 0x2
-#define LISP_GPE_NEXT_PROTOCOL_ETHERNET 0x3
-#define LISP_GPE_NEXT_PROTOCOL_NSH 0x4
-
-typedef enum
-{
-  LISP_GPE_NEXT_PROTO_IP4 = 1,
-  LISP_GPE_NEXT_PROTO_IP6,
-  LISP_GPE_NEXT_PROTO_ETHERNET,
-  LISP_GPE_NEXT_PROTO_NSH,
-  LISP_GPE_NEXT_PROTOS
-} lisp_gpe_next_protocol_e;
-
-#endif /* included_lisp_gpe_packet_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.c b/vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.c
deleted file mode 100644
index 5b69bd15..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.c
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief LISP sub-interfaces.
- *
- */
-#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
-#include <vnet/lisp-gpe/lisp_gpe_sub_interface.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/interface.h>
-
-/**
- * @brief Pool of all l3-sub-interfaces
- */
-static lisp_gpe_sub_interface_t *lisp_gpe_sub_interface_pool;
-
-/**
- * A DB of all LISP L3 sub-interfaces. The key is:{VNI,l-RLOC}
- */
-static uword *lisp_gpe_sub_interfaces;
-
-/**
- * A DB of all VNET L3 sub-interfaces. The key is:{VNI,l-RLOC}
- * Used in the data-plane for interface lookup on decap.
- */
-uword *lisp_gpe_sub_interfaces_sw_if_index;
-
-/**
- * The next available sub-interface ID. FIXME
- */
-static u32 lisp_gpe_sub_interface_id;
-
-
-static index_t
-lisp_gpe_sub_interface_db_find (const ip_address_t * lrloc, u32 vni)
-{
-  uword *p;
-
-  lisp_gpe_sub_interface_key_t key = {
-    .local_rloc = *lrloc,
-    .vni = clib_host_to_net_u32 (vni),
-  };
-
-  p = hash_get_mem (lisp_gpe_sub_interfaces, &key);
-
-  if (NULL == p)
-    return (INDEX_INVALID);
-  else
-    return (p[0]);
-}
-
-static void
-lisp_gpe_sub_interface_db_insert (const lisp_gpe_sub_interface_t * l3s)
-{
-  hash_set_mem (lisp_gpe_sub_interfaces,
-		&l3s->key, l3s - lisp_gpe_sub_interface_pool);
-  hash_set_mem (lisp_gpe_sub_interfaces_sw_if_index,
-		&l3s->key, l3s->sw_if_index);
-}
-
-static void
-lisp_gpe_sub_interface_db_remove (const lisp_gpe_sub_interface_t * l3s)
-{
-  hash_unset_mem (lisp_gpe_sub_interfaces, &l3s->key);
-  hash_unset_mem (lisp_gpe_sub_interfaces_sw_if_index, &l3s->key);
-}
-
-lisp_gpe_sub_interface_t *
-lisp_gpe_sub_interface_get_i (index_t l3si)
-{
-  return (pool_elt_at_index (lisp_gpe_sub_interface_pool, l3si));
-}
-
-static void
-lisp_gpe_sub_interface_set_table (u32 sw_if_index, u32 table_id)
-{
-  fib_node_index_t fib_index;
-
-  fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, table_id);
-  ASSERT (FIB_NODE_INDEX_INVALID != fib_index);
-
-  vec_validate (ip4_main.fib_index_by_sw_if_index, sw_if_index);
-  ip4_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
-
-  fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, table_id);
-  ASSERT (FIB_NODE_INDEX_INVALID != fib_index);
-
-  vec_validate (ip6_main.fib_index_by_sw_if_index, sw_if_index);
-  ip6_main.fib_index_by_sw_if_index[sw_if_index] = fib_index;
-}
-
-static void
-lisp_gpe_sub_interface_unset_table (u32 sw_if_index, u32 table_id)
-{
-  ip4_main.fib_index_by_sw_if_index[sw_if_index] = 0;
-  ip4_sw_interface_enable_disable (sw_if_index, 0);
-
-  ip6_main.fib_index_by_sw_if_index[sw_if_index] = 0;
-  ip6_sw_interface_enable_disable (sw_if_index, 0);
-}
-
-index_t
-lisp_gpe_sub_interface_find_or_create_and_lock (const ip_address_t * lrloc,
-						u32 overlay_table_id, u32 vni)
-{
-  lisp_gpe_sub_interface_t *l3s;
-  index_t l3si;
-
-  l3si = lisp_gpe_sub_interface_db_find (lrloc, clib_host_to_net_u32 (vni));
-
-  if (INDEX_INVALID == l3si)
-    {
-      u32 main_sw_if_index, sub_sw_if_index;
-
-      /*
-       * find the main interface from the VNI
-       */
-      main_sw_if_index =
-	lisp_gpe_tenant_l3_iface_add_or_lock (vni, overlay_table_id);
-
-      vnet_sw_interface_t sub_itf_template = {
-	.type = VNET_SW_INTERFACE_TYPE_SUB,
-	.flood_class = VNET_FLOOD_CLASS_NORMAL,
-	.sup_sw_if_index = main_sw_if_index,
-	.sub.id = lisp_gpe_sub_interface_id++,
-      };
-
-      if (NULL != vnet_create_sw_interface (vnet_get_main (),
-					    &sub_itf_template,
-					    &sub_sw_if_index))
-	return (INDEX_INVALID);
-
-      pool_get (lisp_gpe_sub_interface_pool, l3s);
-      memset (l3s, 0, sizeof (*l3s));
-      l3s->key = clib_mem_alloc (sizeof (*l3s->key));
-      memset (l3s->key, 0, sizeof (*l3s->key));
-
-      l3s->key->local_rloc = *lrloc;
-      l3s->key->vni = clib_host_to_net_u32 (vni);
-      l3s->main_sw_if_index = main_sw_if_index;
-      l3s->sw_if_index = sub_sw_if_index;
-      l3s->eid_table_id = overlay_table_id;
-
-      l3si = (l3s - lisp_gpe_sub_interface_pool);
-
-      // FIXME. enable When we get an adj
-      ip6_sw_interface_enable_disable (l3s->sw_if_index, 1);
-      ip4_sw_interface_enable_disable (l3s->sw_if_index, 1);
-
-      vnet_sw_interface_set_flags (vnet_get_main (),
-				   l3s->sw_if_index,
-				   VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-
-      lisp_gpe_sub_interface_db_insert (l3s);
-    }
-  else
-    {
-      l3s = lisp_gpe_sub_interface_get_i (l3si);
-      l3s->eid_table_id = overlay_table_id;
-    }
-
-  lisp_gpe_sub_interface_set_table (l3s->sw_if_index, l3s->eid_table_id);
-  l3s->locks++;
-
-  return (l3si);
-}
-
-void
-lisp_gpe_sub_interface_unlock (index_t l3si)
-{
-  lisp_gpe_sub_interface_t *l3s;
-
-  l3s = lisp_gpe_sub_interface_get_i (l3si);
-
-  l3s->locks--;
-
-  if (0 == l3s->locks)
-    {
-      lisp_gpe_sub_interface_unset_table (l3s->sw_if_index,
-					  l3s->eid_table_id);
-
-      lisp_gpe_tenant_l3_iface_unlock (clib_net_to_host_u32 (l3s->key->vni));
-      vnet_sw_interface_set_flags (vnet_get_main (), l3s->sw_if_index, 0);
-      vnet_delete_sub_interface (l3s->sw_if_index);
-
-      lisp_gpe_sub_interface_db_remove (l3s);
-
-      clib_mem_free (l3s->key);
-      pool_put (lisp_gpe_sub_interface_pool, l3s);
-    }
-}
-
-const lisp_gpe_sub_interface_t *
-lisp_gpe_sub_interface_get (index_t l3si)
-{
-  return (lisp_gpe_sub_interface_get_i (l3si));
-}
-
-u8 *
-format_lisp_gpe_sub_interface (u8 * s, va_list ap)
-{
-  lisp_gpe_sub_interface_t *l3s = va_arg (ap, lisp_gpe_sub_interface_t *);
-  vnet_main_t *vnm = vnet_get_main ();
-
-  s = format (s, "%=16U",
-	      format_vnet_sw_interface_name,
-	      vnm, vnet_get_sw_interface (vnm, l3s->sw_if_index));
-  s = format (s, "%=10d", clib_net_to_host_u32 (l3s->key->vni));
-  s = format (s, "%=12d", l3s->sw_if_index);
-  s = format (s, "%U", format_ip_address, &l3s->key->local_rloc);
-
-  return (s);
-}
-
-/** CLI command to show LISP-GPE interfaces. */
-static clib_error_t *
-lisp_gpe_sub_interface_show (vlib_main_t * vm,
-			     unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  lisp_gpe_sub_interface_t *l3s;
-
-  vlib_cli_output (vm, "%=16s%=10s%=12s%s", "Name", "VNI", "SW IF Index",
-		   "local RLOC");
-
-  /* *INDENT-OFF* */
-  pool_foreach (l3s, lisp_gpe_sub_interface_pool,
-  ({
-    vlib_cli_output (vm, "%U", format_lisp_gpe_sub_interface, l3s);
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_gpe_sub_interface_command) = {
-  .path = "show lisp gpe sub-interface",
-  .short_help = "show lisp gpe sub-interface",
-  .function = lisp_gpe_sub_interface_show,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-lisp_gpe_sub_interface_module_init (vlib_main_t * vm)
-{
-  lisp_gpe_sub_interfaces =
-    hash_create_mem (0,
-		     sizeof (lisp_gpe_sub_interface_key_t), sizeof (uword));
-  lisp_gpe_sub_interfaces_sw_if_index =
-    hash_create_mem (0,
-		     sizeof (lisp_gpe_sub_interface_key_t), sizeof (uword));
-
-  return (NULL);
-}
-
-VLIB_INIT_FUNCTION (lisp_gpe_sub_interface_module_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.h b/vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.h
deleted file mode 100644
index ad942f41..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief LISP sub-interfaces.
- *
- */
-
-#ifndef __LISP_GPE_SUB_INTERFACE_H__
-#define __LISP_GPE_SUB_INTERFACE_H__
-
-#include <vnet/lisp-gpe/lisp_gpe.h>
-
-/**
- * A Key for lookup in the L£ sub-interface DB
- */
-typedef struct lisp_gpe_sub_interface_key_t_
-{
-    /**
-     * The local-RLOC. This is the interface's 'source' address.
-     */
-  ip_address_t local_rloc;
-
-    /**
-     * The VNI. In network byte order!
-     */
-  u32 vni;
-} lisp_gpe_sub_interface_key_t;
-
-/**
- * @brief A LISP L3 sub-interface
- *
- * A LISP sub-interface is a multi-access interface, whose local address is a
- * single local-RLOC. Adjacencies that form on this sub-interface, represent
- * remote RLOCs.
- * This is analogous to an ethernet interface.
- * As with all interface types it can only be present in one VRF, hence a
- * LISP sub-interface is per-local-rloc and per-VNI.
- */
-typedef struct lisp_gpe_sub_interface_t_
-{
-  /**
-   * The interface's key inthe DB; rloc & vni;
-   * The key is allocated from the heap so it can be used in the hash-table.
-   * if it's part of the object, then it is subjet to realloc, which no-worky.
-   */
-  lisp_gpe_sub_interface_key_t *key;
-
-  /**
-   * The Table-ID in the overlay that this interface is bound to.
-   */
-  u32 eid_table_id;
-
-  /**
-   * A reference counting lock on the number of users of this interface.
-   * When this count drops to 0 the interface is deleted.
-   */
-  u32 locks;
-
-  /**
-   * The SW if index assigned to this sub-interface
-   */
-  u32 sw_if_index;
-
-  /**
-   * The SW IF index assigned to the main interface of which this is a sub.
-   */
-  u32 main_sw_if_index;
-} lisp_gpe_sub_interface_t;
-
-extern index_t lisp_gpe_sub_interface_find_or_create_and_lock (const
-							       ip_address_t *
-							       lrloc,
-							       u32
-							       eid_table_id,
-							       u32 vni);
-
-extern u8 *format_lisp_gpe_sub_interface (u8 * s, va_list ap);
-
-extern void lisp_gpe_sub_interface_unlock (index_t itf);
-
-extern const lisp_gpe_sub_interface_t *lisp_gpe_sub_interface_get (index_t
-								   itf);
-
-/**
- * A DB of all L3 sub-interfaces. The key is:{VNI,l-RLOC}
- */
-extern uword *lisp_gpe_sub_interfaces_sw_if_index;
-
-/**
- * @brief
- *  Get a VNET L3 interface matching the local-RLOC and VNI
- *  Called from the data-plane
- */
-always_inline u32
-lisp_gpe_sub_interface_find_ip6 (const ip6_address_t * addr, u32 vni)
-{
-  lisp_gpe_sub_interface_key_t key;
-  const uword *p;
-
-  key.local_rloc.ip.v6.as_u64[0] = addr->as_u64[0];
-  key.local_rloc.ip.v6.as_u64[1] = addr->as_u64[1];
-  key.local_rloc.version = IP6;
-  key.vni = vni;
-
-  p = hash_get_mem (&lisp_gpe_sub_interfaces_sw_if_index, &key);
-
-  if (NULL != p)
-    return p[0];
-
-  return (INDEX_INVALID);
-}
-
-/**
- * @brief
- *  Get a VNET L3 interface matching the local-RLOC and VNI
- *  Called from the data-plane
- */
-always_inline index_t
-lisp_gpe_sub_interface_find_ip4 (const ip4_address_t * addr, u32 vni)
-{
-  lisp_gpe_sub_interface_key_t key;
-  const uword *p;
-
-  key.local_rloc.ip.v4.as_u32 = addr->as_u32;
-  key.local_rloc.version = IP4;
-  key.vni = vni;
-
-  p = hash_get_mem (&lisp_gpe_sub_interfaces_sw_if_index, &key);
-
-  if (NULL != p)
-    return p[0];
-
-  return (INDEX_INVALID);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
-
-#endif
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_tenant.c b/vnet/vnet/lisp-gpe/lisp_gpe_tenant.c
deleted file mode 100644
index 6abb7731..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe_tenant.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
-
-/**
- * The pool of all tenants
- */
-static lisp_gpe_tenant_t *lisp_gpe_tenant_pool;
-
-/**
- * The hash table of all tenants: key:{VNI}.
- */
-uword *lisp_gpe_tenant_db;
-
-static lisp_gpe_tenant_t *
-lisp_gpe_tenant_find (u32 vni)
-{
-  uword *p;
-
-  p = hash_get (lisp_gpe_tenant_db, vni);
-
-  if (NULL == p)
-    return (NULL);
-
-  return (pool_elt_at_index (lisp_gpe_tenant_pool, p[0]));
-}
-
-static lisp_gpe_tenant_t *
-lisp_gpe_tenant_find_or_create_i (u32 vni)
-{
-  lisp_gpe_tenant_t *lt;
-
-  lt = lisp_gpe_tenant_find (vni);
-
-  if (NULL == lt)
-    {
-      pool_get (lisp_gpe_tenant_pool, lt);
-      memset (lt, 0, sizeof (*lt));
-
-      lt->lt_vni = vni;
-      lt->lt_table_id = ~0;
-      lt->lt_bd_id = ~0;
-
-      hash_set (lisp_gpe_tenant_db, vni, lt - lisp_gpe_tenant_pool);
-    }
-
-  return (lt);
-}
-
-/**
- * @brief Find or create a tenant for the given VNI
- */
-u32
-lisp_gpe_tenant_find_or_create (u32 vni)
-{
-  lisp_gpe_tenant_t *lt;
-
-  lt = lisp_gpe_tenant_find (vni);
-
-  if (NULL == lt)
-    {
-      lt = lisp_gpe_tenant_find_or_create_i (vni);
-    }
-
-  return (lt - lisp_gpe_tenant_pool);
-}
-
-/**
- * @brief If there are no more locks/users of te tenant, then delete it
- */
-static void
-lisp_gpe_tenant_delete_if_empty (lisp_gpe_tenant_t * lt)
-{
-  int i;
-
-  for (i = 0; i < LISP_GPE_TENANT_LOCK_NUM; i++)
-    {
-      if (lt->lt_locks[i])
-	return;
-    }
-
-  hash_unset (lisp_gpe_tenant_db, lt->lt_vni);
-  pool_put (lisp_gpe_tenant_pool, lt);
-}
-
-/**
- * @brief Add/create and lock a new or find and lock the existing L3
- * interface for the tenant
- *
- * @paran vni The tenant's VNI
- * @param table_id the Tenant's L3 table ID.
- *
- * @return the SW IF index of the L3 interface
- */
-u32
-lisp_gpe_tenant_l3_iface_add_or_lock (u32 vni, u32 table_id)
-{
-  lisp_gpe_tenant_t *lt;
-
-  lt = lisp_gpe_tenant_find_or_create_i (vni);
-
-  if (~0 == lt->lt_table_id)
-    lt->lt_table_id = table_id;
-
-  ASSERT (lt->lt_table_id == table_id);
-
-  if (0 == lt->lt_locks[LISP_GPE_TENANT_LOCK_L3_IFACE])
-    {
-      /* create the l3 interface since there are currently no users of it */
-      lt->lt_l3_sw_if_index =
-	lisp_gpe_add_l3_iface (&lisp_gpe_main, vni, table_id);
-    }
-
-  lt->lt_locks[LISP_GPE_TENANT_LOCK_L3_IFACE]++;
-
-  return (lt->lt_l3_sw_if_index);
-}
-
-/**
- * @brief Release the lock held on the tenant's L3 interface
- */
-void
-lisp_gpe_tenant_l3_iface_unlock (u32 vni)
-{
-  lisp_gpe_tenant_t *lt;
-
-  lt = lisp_gpe_tenant_find (vni);
-
-  if (NULL == lt)
-    {
-      clib_warning ("No tenant for VNI %d", vni);
-      return;
-    }
-
-  if (0 == lt->lt_locks[LISP_GPE_TENANT_LOCK_L3_IFACE])
-    {
-      clib_warning ("No L3 interface for tenant VNI %d", vni);
-      return;
-    }
-
-  lt->lt_locks[LISP_GPE_TENANT_LOCK_L3_IFACE]--;
-
-  if (0 == lt->lt_locks[LISP_GPE_TENANT_LOCK_L3_IFACE])
-    {
-      /* the last user has gone, so delete the l3 interface */
-      lisp_gpe_del_l3_iface (&lisp_gpe_main, vni, lt->lt_table_id);
-    }
-
-  /*
-   * If there are no more locks on any tenant managed resource, then
-   * this tenant is toast.
-   */
-  lisp_gpe_tenant_delete_if_empty (lt);
-}
-
-/**
- * @brief Add/create and lock a new or find and lock the existing L2
- * interface for the tenant
- *
- * @paran vni The tenant's VNI
- * @param table_id the Tenant's L2 Bridge Domain ID.
- *
- * @return the SW IF index of the L2 interface
- */
-u32
-lisp_gpe_tenant_l2_iface_add_or_lock (u32 vni, u32 bd_id)
-{
-  lisp_gpe_tenant_t *lt;
-
-  lt = lisp_gpe_tenant_find_or_create_i (vni);
-
-  if (NULL == lt)
-    {
-      clib_warning ("No tenant for VNI %d", vni);
-      return ~0;
-    }
-
-  if (~0 == lt->lt_bd_id)
-    lt->lt_bd_id = bd_id;
-
-  ASSERT (lt->lt_bd_id == bd_id);
-
-  if (0 == lt->lt_locks[LISP_GPE_TENANT_LOCK_L2_IFACE])
-    {
-      /* create the l2 interface since there are currently no users of it */
-      lt->lt_l2_sw_if_index =
-	lisp_gpe_add_l2_iface (&lisp_gpe_main, vni, bd_id);
-    }
-
-  lt->lt_locks[LISP_GPE_TENANT_LOCK_L2_IFACE]++;
-
-  return (lt->lt_l2_sw_if_index);
-}
-
-/**
- * @brief Release the lock held on the tenant's L3 interface
- */
-void
-lisp_gpe_tenant_l2_iface_unlock (u32 vni)
-{
-  lisp_gpe_tenant_t *lt;
-
-  lt = lisp_gpe_tenant_find (vni);
-
-  if (NULL == lt)
-    {
-      clib_warning ("No tenant for VNI %d", vni);
-      return;
-    }
-
-  if (0 == lt->lt_locks[LISP_GPE_TENANT_LOCK_L2_IFACE])
-    {
-      clib_warning ("No L2 interface for tenant VNI %d", vni);
-      return;
-    }
-
-  lt->lt_locks[LISP_GPE_TENANT_LOCK_L2_IFACE]--;
-
-  if (0 == lt->lt_locks[LISP_GPE_TENANT_LOCK_L2_IFACE])
-    {
-      /* the last user has gone, so delete the l2 interface */
-      lisp_gpe_del_l2_iface (&lisp_gpe_main, vni, lt->lt_bd_id);
-    }
-
-  /*
-   * If there are no more locks on any tenant managed resource, then
-   * this tenant is toast.
-   */
-  lisp_gpe_tenant_delete_if_empty (lt);
-}
-
-/**
- * @brief get a const pointer to the tenant object
- */
-const lisp_gpe_tenant_t *
-lisp_gpe_tenant_get (u32 index)
-{
-  return (pool_elt_at_index (lisp_gpe_tenant_pool, index));
-}
-
-/**
- * @brief Flush/delete ALL the tenants
- */
-void
-lisp_gpe_tenant_flush (void)
-{
-  lisp_gpe_tenant_t *lt;
-
-  /* *INDENT-OFF* */
-  pool_foreach(lt, lisp_gpe_tenant_pool,
-  ({
-    lisp_gpe_tenant_l2_iface_unlock(lt->lt_vni);
-    lisp_gpe_tenant_l3_iface_unlock(lt->lt_vni);
-  }));
-  /* *INDENT-ON* */
-}
-
-/**
- * @brif Show/display one tenant
- */
-static u8 *
-format_lisp_gpe_tenant (u8 * s, va_list ap)
-{
-  const lisp_gpe_tenant_t *lt = va_arg (ap, lisp_gpe_tenant_t *);
-
-  s = format (s, "VNI:%d ", lt->lt_vni);
-
-  if (lt->lt_table_id != ~0)
-    {
-      s = format (s, "VRF:%d ", lt->lt_table_id);
-      s = format (s, "L3-SW-IF:%d ", lt->lt_l3_sw_if_index);
-    }
-
-  if (lt->lt_bd_id != ~0)
-    {
-      s = format (s, "BD-ID:%d ", lt->lt_bd_id);
-      s = format (s, "L2-SW-IF:%d ", lt->lt_l2_sw_if_index);
-    }
-
-  return (s);
-}
-
-/**
- * @brief CLI command to show LISP-GPE tenant.
- */
-static clib_error_t *
-lisp_gpe_tenant_show (vlib_main_t * vm,
-		      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  lisp_gpe_tenant_t *lt;
-
-  /* *INDENT-OFF* */
-  pool_foreach (lt, lisp_gpe_tenant_pool,
-  ({
-    vlib_cli_output (vm, "%U", format_lisp_gpe_tenant, lt);
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (lisp_gpe_tenant_command) = {
-  .path = "show lisp gpe tenant",
-  .short_help = "show lisp gpe tenant",
-  .function = lisp_gpe_tenant_show,
-};
-/* *INDENT-ON* */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_tenant.h b/vnet/vnet/lisp-gpe/lisp_gpe_tenant.h
deleted file mode 100644
index 5db7dde8..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe_tenant.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __LISP_GPE_TENANT_H__
-#define __LISP_GPE_TENANT_H__
-
-#include <vnet/lisp-gpe/lisp_gpe.h>
-
-/**
- * Refernece counting lock types on the tenant.
- * When all of these counters drop to zero, we no longer need the tenant.
- */
-typedef enum lisp_gpe_tenant_lock_t_
-{
-  LISP_GPE_TENANT_LOCK_L2_IFACE,
-  LISP_GPE_TENANT_LOCK_L3_IFACE,
-  LISP_GPE_TENANT_LOCK_NUM,
-} lisp_gpe_tenant_lock_t;
-
-/**
- * @brief Representation of the data associated with a LISP overlay tenant
- *
- * This object exists to manage the shared resources of the L2 and L3 interface
- * of a given tenant.
- */
-typedef struct lisp_gpe_tenant_t_
-{
-  /**
-   * The VNI is the identifier of the tenant
-   */
-  u32 lt_vni;
-
-  /**
-   * The tenant can have both L2 and L3 services enabled.
-   */
-  u32 lt_table_id;
-  u32 lt_bd_id;
-
-  /**
-   * The number of locks on the tenant's L3 interface.
-   */
-  u32 lt_locks[LISP_GPE_TENANT_LOCK_NUM];
-
-  /**
-   * The L3 SW interface index
-   */
-  u32 lt_l3_sw_if_index;
-
-  /**
-   * The L2 SW interface index
-   */
-  u32 lt_l2_sw_if_index;
-
-} lisp_gpe_tenant_t;
-
-extern u32 lisp_gpe_tenant_find_or_create (u32 vni);
-
-extern u32 lisp_gpe_tenant_l3_iface_add_or_lock (u32 vni, u32 vrf);
-extern void lisp_gpe_tenant_l3_iface_unlock (u32 vni);
-
-extern u32 lisp_gpe_tenant_l2_iface_add_or_lock (u32 vni, u32 vrf);
-extern void lisp_gpe_tenant_l2_iface_unlock (u32 vni);
-
-extern const lisp_gpe_tenant_t *lisp_gpe_tenant_get (u32 index);
-
-extern void lisp_gpe_tenant_flush (void);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
-
-#endif
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_tunnel.c b/vnet/vnet/lisp-gpe/lisp_gpe_tunnel.c
deleted file mode 100644
index e4e59707..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe_tunnel.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief Common utility functions for IPv4, IPv6 and L2 LISP-GPE tunnels.
- *
- */
-#include <vnet/lisp-gpe/lisp_gpe.h>
-#include <vnet/lisp-gpe/lisp_gpe_tunnel.h>
-#include <vnet/lisp-gpe/lisp_gpe_adjacency.h>
-
-#include <vnet/fib/fib_table.h>
-
-/**
- * @brief Pool of all LISP tunnels
- */
-static lisp_gpe_tunnel_t *lisp_gpe_tunnel_pool;
-
-/**
- * @brief a DB of all tunnels
- */
-static uword *lisp_gpe_tunnel_db;
-
-/**
- * @brief Compute IP-UDP-GPE sub-tunnel encap/rewrite header.
- *
- * @param[in]   t       Parent of the sub-tunnel.
- * @param[in]   st      Sub-tunnel.
- * @param[in]   lp      Local and remote locators used in the encap header.
- *
- * @return 0 on success.
- */
-u8 *
-lisp_gpe_tunnel_build_rewrite (const lisp_gpe_tunnel_t * lgt,
-			       const lisp_gpe_adjacency_t * ladj,
-			       lisp_gpe_next_protocol_e payload_proto)
-{
-  lisp_gpe_header_t *lisp0;
-  u8 *rw = 0;
-  int len;
-
-  if (IP4 == ip_addr_version (&lgt->key->lcl))
-    {
-      ip4_udp_lisp_gpe_header_t *h0;
-      ip4_header_t *ip0;
-
-      len = sizeof (*h0);
-
-      vec_validate_aligned (rw, len - 1, CLIB_CACHE_LINE_BYTES);
-
-      h0 = (ip4_udp_lisp_gpe_header_t *) rw;
-
-      /* Fixed portion of the (outer) ip4 header */
-      ip0 = &h0->ip4;
-      ip0->ip_version_and_header_length = 0x45;
-      ip0->ttl = 254;
-      ip0->protocol = IP_PROTOCOL_UDP;
-
-      /* we fix up the ip4 header length and checksum after-the-fact */
-      ip_address_copy_addr (&ip0->src_address, &lgt->key->lcl);
-      ip_address_copy_addr (&ip0->dst_address, &lgt->key->rmt);
-      ip0->checksum = ip4_header_checksum (ip0);
-
-      /* UDP header, randomize src port on something, maybe? */
-      h0->udp.src_port = clib_host_to_net_u16 (4341);
-      h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_lisp_gpe);
-
-      /* LISP-gpe header */
-      lisp0 = &h0->lisp;
-    }
-  else
-    {
-      ip6_udp_lisp_gpe_header_t *h0;
-      ip6_header_t *ip0;
-
-      len = sizeof (*h0);
-
-      vec_validate_aligned (rw, len - 1, CLIB_CACHE_LINE_BYTES);
-
-      h0 = (ip6_udp_lisp_gpe_header_t *) rw;
-
-      /* Fixed portion of the (outer) ip6 header */
-      ip0 = &h0->ip6;
-      ip0->ip_version_traffic_class_and_flow_label =
-	clib_host_to_net_u32 (0x6 << 28);
-      ip0->hop_limit = 254;
-      ip0->protocol = IP_PROTOCOL_UDP;
-
-      /* we fix up the ip6 header length after-the-fact */
-      ip_address_copy_addr (&ip0->src_address, &lgt->key->lcl);
-      ip_address_copy_addr (&ip0->dst_address, &lgt->key->rmt);
-
-      /* UDP header, randomize src port on something, maybe? */
-      h0->udp.src_port = clib_host_to_net_u16 (4341);
-      h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_lisp_gpe);
-
-      /* LISP-gpe header */
-      lisp0 = &h0->lisp;
-    }
-
-  lisp0->flags = ladj->flags;
-  lisp0->ver_res = 0;
-  lisp0->res = 0;
-  lisp0->next_protocol = payload_proto;
-  lisp0->iid = clib_host_to_net_u32 (ladj->vni) >> 8;	/* first 24 bits only */
-
-  return (rw);
-}
-
-static lisp_gpe_tunnel_t *
-lisp_gpe_tunnel_db_find (const lisp_gpe_tunnel_key_t * key)
-{
-  uword *p;
-
-  p = hash_get_mem (lisp_gpe_tunnel_db, (void *) key);
-
-  if (NULL != p)
-    {
-      return (pool_elt_at_index (lisp_gpe_tunnel_pool, p[0]));
-    }
-  return (NULL);
-}
-
-lisp_gpe_tunnel_t *
-lisp_gpe_tunnel_get_i (index_t lgti)
-{
-  return (pool_elt_at_index (lisp_gpe_tunnel_pool, lgti));
-}
-
-index_t
-lisp_gpe_tunnel_find_or_create_and_lock (const locator_pair_t * pair,
-					 u32 rloc_fib_index)
-{
-  lisp_gpe_tunnel_key_t key = {
-    .lcl = pair->lcl_loc,
-    .rmt = pair->rmt_loc,
-    .fib_index = rloc_fib_index,
-  };
-  lisp_gpe_tunnel_t *lgt;
-  fib_prefix_t pfx;
-
-  lgt = lisp_gpe_tunnel_db_find (&key);
-
-  if (NULL == lgt)
-    {
-      pool_get (lisp_gpe_tunnel_pool, lgt);
-      memset (lgt, 0, sizeof (*lgt));
-
-      lgt->key = clib_mem_alloc (sizeof (*lgt->key));
-      memset (lgt->key, 0, sizeof (*lgt->key));
-
-      lgt->key->rmt = pair->rmt_loc;
-      lgt->key->lcl = pair->lcl_loc;
-      lgt->key->fib_index = rloc_fib_index;
-
-      /*
-       * source the FIB entry for the RLOC so we can track its forwarding
-       * chain
-       */
-      ip_address_to_fib_prefix (&lgt->key->rmt, &pfx);
-
-      lgt->fib_entry_index = fib_table_entry_special_add (rloc_fib_index,
-							  &pfx,
-							  FIB_SOURCE_RR,
-							  FIB_ENTRY_FLAG_NONE,
-							  ADJ_INDEX_INVALID);
-
-      hash_set_mem (lisp_gpe_tunnel_db, &lgt->key,
-		    (lgt - lisp_gpe_tunnel_pool));
-    }
-
-  lgt->locks++;
-
-  return (lgt - lisp_gpe_tunnel_pool);
-}
-
-void
-lisp_gpe_tunnel_unlock (index_t lgti)
-{
-  lisp_gpe_tunnel_t *lgt;
-
-  lgt = lisp_gpe_tunnel_get_i (lgti);
-  lgt->locks--;
-
-  if (0 == lgt->locks)
-    {
-      hash_unset_mem (lisp_gpe_tunnel_db, &lgt->key);
-      clib_mem_free (lgt->key);
-      pool_put (lisp_gpe_tunnel_pool, lgt);
-    }
-}
-
-const lisp_gpe_tunnel_t *
-lisp_gpe_tunnel_get (index_t lgti)
-{
-  return (lisp_gpe_tunnel_get_i (lgti));
-}
-
-/** Format LISP-GPE tunnel. */
-u8 *
-format_lisp_gpe_tunnel (u8 * s, va_list * args)
-{
-  lisp_gpe_tunnel_t *lgt = va_arg (*args, lisp_gpe_tunnel_t *);
-
-  s = format (s, "tunnel %d\n", lgt - lisp_gpe_tunnel_pool);
-  s = format (s, " fib-index: %d, locks:%d \n",
-	      lgt->key->fib_index, lgt->locks);
-  s = format (s, " lisp ver 0\n");
-
-  s = format (s, " locator-pair:\n");
-  s = format (s, "  local: %U remote: %U\n",
-	      format_ip_address, &lgt->key->lcl,
-	      format_ip_address, &lgt->key->rmt);
-  s = format (s, " RLOC FIB entry: %d\n", lgt->fib_entry_index);
-
-  return s;
-}
-
-/**
- * CLI command to show LISP-GPE tunnels.
- */
-static clib_error_t *
-show_lisp_gpe_tunnel_command_fn (vlib_main_t * vm,
-				 unformat_input_t * input,
-				 vlib_cli_command_t * cmd)
-{
-  lisp_gpe_tunnel_t *lgt;
-  index_t index;
-
-  if (pool_elts (lisp_gpe_tunnel_pool) == 0)
-    vlib_cli_output (vm, "No lisp-gpe tunnels configured...");
-
-  if (unformat (input, "%d", &index))
-    {
-      lgt = lisp_gpe_tunnel_get_i (index);
-      vlib_cli_output (vm, "%U", format_lisp_gpe_tunnel, lgt);
-    }
-  else
-    {
-      /* *INDENT-OFF* */
-      pool_foreach (lgt, lisp_gpe_tunnel_pool,
-      ({
-	vlib_cli_output (vm, "%U", format_lisp_gpe_tunnel, lgt);
-      }));
-      /* *INDENT-ON* */
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_lisp_gpe_tunnel_command, static) =
-{
-  .path = "show lisp gpe tunnel",
-  .function = show_lisp_gpe_tunnel_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-lisp_gpe_tunnel_module_init (vlib_main_t * vm)
-{
-  lisp_gpe_tunnel_db = hash_create_mem (0,
-					sizeof (lisp_gpe_tunnel_key_t),
-					sizeof (uword));
-
-  return (NULL);
-}
-
-VLIB_INIT_FUNCTION (lisp_gpe_tunnel_module_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_tunnel.h b/vnet/vnet/lisp-gpe/lisp_gpe_tunnel.h
deleted file mode 100644
index 333d2882..00000000
--- a/vnet/vnet/lisp-gpe/lisp_gpe_tunnel.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief Common utility functions for IPv4, IPv6 and L2 LISP-GPE tunnels.
- *
- */
-
-#ifndef LISP_GPE_TUNNEL_H__
-#define LISP_GPE_TUNNEL_H__
-
-#include <vnet/lisp-gpe/lisp_gpe.h>
-#include <vnet/lisp-gpe/lisp_gpe_packet.h>
-
-/**
- * Forward declaration
- */
-struct lisp_gpe_adjacency_t_;
-
-/**
- * A Key for a tunnel
- */
-typedef struct lisp_gpe_tunnel_key_t_
-{
-  ip_address_t rmt;
-  ip_address_t lcl;
-  u32 fib_index;
-} lisp_gpe_tunnel_key_t;
-
-/**
- * @brief A LISP GPE Tunnel.
- *
- * A tunnel represents an associatation between a local and remote RLOC.
- * As such it represents a unique LISP rewrite.
- */
-typedef struct lisp_gpe_tunnel_t_
-{
-  /**
-   * RLOC pair and rloc fib_index. This is the tunnel's key.
-   */
-  lisp_gpe_tunnel_key_t *key;
-
-  /**
-   * number of reference counting locks
-   */
-  u32 locks;
-
-  /**
-   * the FIB entry through which the remote rloc is reachable
-   s */
-  fib_node_index_t fib_entry_index;
-} lisp_gpe_tunnel_t;
-
-extern index_t lisp_gpe_tunnel_find_or_create_and_lock (const locator_pair_t *
-							pair,
-							u32 rloc_fib_index);
-
-extern void lisp_gpe_tunnel_unlock (index_t lgti);
-
-extern const lisp_gpe_tunnel_t *lisp_gpe_tunnel_get (index_t lgti);
-
-extern u8 *lisp_gpe_tunnel_build_rewrite (const lisp_gpe_tunnel_t * lgt,
-					  const struct lisp_gpe_adjacency_t_
-					  *ladj,
-					  lisp_gpe_next_protocol_e
-					  payload_proto);
-extern u8 *format_lisp_gpe_tunnel (u8 * s, va_list * args);
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lisp-gpe/rfc.txt b/vnet/vnet/lisp-gpe/rfc.txt
deleted file mode 100644
index 5e3da150..00000000
--- a/vnet/vnet/lisp-gpe/rfc.txt
+++ /dev/null
@@ -1,826 +0,0 @@
-Network Working Group                                           D. Lewis
-Internet-Draft                                       Cisco Systems, Inc.
-Intended status: Informational                                P. Agarwal
-Expires: January 5, 2015                                        Broadcom
-                                                              L. Kreeger
-                                                                F. Maino
-                                                                P. Quinn
-                                                                M. Smith
-                                                                N. Yadav
-                                                     Cisco Systems, Inc.
-                                                            July 4, 2014
-
-
-                    LISP Generic Protocol Extension
-                      draft-lewis-lisp-gpe-02.txt
-
-Abstract
-
-   This draft describes extending the Locator/ID Separation Protocol
-   (LISP) [RFC6830], via changes to the LISP header, with three new
-   capabilities: support for multi-protocol encapsulation, operations,
-   administration and management (OAM) signaling, and explicit
-   versioning.
-
-Status of this Memo
-
-   This Internet-Draft is submitted in full conformance with the
-   provisions of BCP 78 and BCP 79.
-
-   Internet-Drafts are working documents of the Internet Engineering
-   Task Force (IETF).  Note that other groups may also distribute
-   working documents as Internet-Drafts.  The list of current Internet-
-   Drafts is at http://datatracker.ietf.org/drafts/current/.
-
-   Internet-Drafts are draft documents valid for a maximum of six months
-   and may be updated, replaced, or obsoleted by other documents at any
-   time.  It is inappropriate to use Internet-Drafts as reference
-   material or to cite them other than as "work in progress."
-
-   This Internet-Draft will expire on January 5, 2015.
-
-Copyright Notice
-
-   Copyright (c) 2014 IETF Trust and the persons identified as the
-   document authors.  All rights reserved.
-
-   This document is subject to BCP 78 and the IETF Trust's Legal
-   Provisions Relating to IETF Documents
-
-
-
-Lewis, et al.            Expires January 5, 2015                [Page 1]
-
-Internet-Draft       LISP Generic Protocol Extension           July 2014
-
-
-   (http://trustee.ietf.org/license-info) in effect on the date of
-   publication of this document.  Please review these documents
-   carefully, as they describe your rights and restrictions with respect
-   to this document.  Code Components extracted from this document must
-   include Simplified BSD License text as described in Section 4.e of
-   the Trust Legal Provisions and are provided without warranty as
-   described in the Simplified BSD License.
-
-
-Table of Contents
-
-   1.  Introduction . . . . . . . . . . . . . . . . . . . . . . . . .  3
-   2.  LISP Header Without Protocol Extensions  . . . . . . . . . . .  4
-   3.  Generic Protocol Extension for LISP (LISP-gpe) . . . . . . . .  5
-     3.1.  Multi Protocol Support . . . . . . . . . . . . . . . . . .  5
-     3.2.  OAM Support  . . . . . . . . . . . . . . . . . . . . . . .  6
-     3.3.  Version Bits . . . . . . . . . . . . . . . . . . . . . . .  6
-   4.  Backward Compatibility . . . . . . . . . . . . . . . . . . . .  8
-     4.1.  LISP-gpe Routers to (legacy) LISP Routers  . . . . . . . .  8
-     4.2.  (legacy) LISP Routers to LISP-gpe Routers  . . . . . . . .  8
-     4.3.  Type of Service  . . . . . . . . . . . . . . . . . . . . .  8
-     4.4.  VLAN Identifier (VID)  . . . . . . . . . . . . . . . . . .  8
-   5.  LISP-gpe Examples  . . . . . . . . . . . . . . . . . . . . . .  9
-   6.  Security Considerations  . . . . . . . . . . . . . . . . . . . 11
-   7.  Acknowledgments  . . . . . . . . . . . . . . . . . . . . . . . 12
-   8.  IANA Considerations  . . . . . . . . . . . . . . . . . . . . . 13
-   9.  References . . . . . . . . . . . . . . . . . . . . . . . . . . 14
-     9.1.  Normative References . . . . . . . . . . . . . . . . . . . 14
-     9.2.  Informative References . . . . . . . . . . . . . . . . . . 14
-   Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . . 15
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Lewis, et al.            Expires January 5, 2015                [Page 2]
-
-Internet-Draft       LISP Generic Protocol Extension           July 2014
-
-
-1.  Introduction
-
-   LISP [RFC6830] defines an encapsulation format that carries IPv4 or
-   IPv6 (henceforth referred to as IP) packets in a LISP header and
-   outer UDP/IP transport.
-
-   The LISP header does not specify the protocol being encapsulated and
-   therefore is currently limited to encapsulating only IP packet
-   payloads.  Other protocols, most notably VXLAN [VXLAN] (which defines
-   a similar header format to LISP), are used to encapsulate L2
-   protocols such as Ethernet.  LISP [RFC6830] can be extended to
-   indicate the inner protocol, enabling the encapsulation of Ethernet,
-   IP or any other desired protocol all the while ensuring compatibility
-   with existing LISP [RFC6830] deployments.
-
-   As LISP is deployed, there's also the need to provide increased
-   visibility and diagnostic capabilities within the overlay.
-
-   This document describes extending LISP ([RFC6830]) via the following
-   changes:
-
-   Next Protocol Bit (P bit):  A reserved flag bit is allocated, and set
-      in the LISP-gpe header to indicate that a next protocol field is
-      present.
-
-   OAM Flag Bit (O bit):  A reserved flag bit is allocated, and set in
-      the LISP-gpe header, to indicate that the packet is an OAM packet.
-
-   Version:  Two reserved bits are allocated, and set in the LISP-gpe
-      header, to indicate LISP-gpe protocol version.
-
-   Next protocol:  An 8 bit next protocol field is present in the LISP-
-      gpe header.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Lewis, et al.            Expires January 5, 2015                [Page 3]
-
-Internet-Draft       LISP Generic Protocol Extension           July 2014
-
-
-2.  LISP Header Without Protocol Extensions
-
-   As described in the introduction, the LISP header has no protocol
-   identifier that indicates the type of payload being carried by LISP.
-   Because of this, LISP is limited to an IP payload.  Furthermore, the
-   LISP header has no mechanism to signal OAM packets.
-
-   The LISP header contains flags (some defined, some reserved), a
-   Nonce/Map-version field and an instance ID/Locator-status-bit field.
-   The flags provide flexibility to define how the reserved bits can be
-   used to change the definition of the LISP header.
-
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |N|L|E|V|I|flags|            Nonce/Map-Version                  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                 Instance ID/Locator-Status-Bits               |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-                           Figure 1: LISP Header
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Lewis, et al.            Expires January 5, 2015                [Page 4]
-
-Internet-Draft       LISP Generic Protocol Extension           July 2014
-
-
-3.  Generic Protocol Extension for LISP (LISP-gpe)
-
-3.1.  Multi Protocol Support
-
-   This draft defines the following changes to the LISP header in order
-   to support multi-protocol encapsulation.
-
-   P Bit:  Flag bit 5 is defined as the Next Protocol bit.  The P bit
-      MUST be set to 1 to indicate the presence of the 8 bit next
-      protocol field.
-
-      P = 0 indicates that the payload MUST conform to LISP as defined
-      in [RFC6830].
-
-      Flag bit 5 was chosen as the P bit because this flag bit is
-      currently unallocated in LISP [RFC6830].
-
-   Next Protocol Field:  The lower 8 bits of the first word are used to
-      carry a next protocol.  This next protocol field contains the
-      protocol of the encapsulated payload packet.
-
-      LISP [RFC6830] uses the lower 16 bits of the first word for either
-      a nonce, an echo-nonce ([RFC6830]) or to support map-versioning
-      ([RFC6834]).  These are all optional capabilities that are
-      indicated by setting the N, E, and the V bit respectively.
-
-      To maintain the desired data plane compatibility, when the P bit
-      is set, the N, E, and V bits MUST be set to zero.
-
-   A new protocol registry will be requested from IANA for the Next
-   Protocol field.  This draft defines the following Next Protocol
-   values:
-
-      0x1 : IPv4
-
-      0x2 : IPv6
-
-      0x3 : Ethernet
-
-      0x4: Network Service Header
-
-
-
-
-
-
-
-
-
-
-
-Lewis, et al.            Expires January 5, 2015                [Page 5]
-
-Internet-Draft       LISP Generic Protocol Extension           July 2014
-
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |N|L|E|V|I|P|R|R|      Reserved                 | Next Protocol |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                 Instance ID/Locator-Status-Bits               |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-
-                  Figure 2: LISP-gpe Next Protocol (P=1)
-
-3.2.  OAM Support
-
-   Flag bit 7 is defined as the O bit.  When the O bit is set to 1, the
-   packet is an OAM packet and OAM processing MUST occur.  The OAM
-   protocol details are out of scope for this document.  As with the
-   P-bit, bit 7 is currently a reserved flag in [RFC6830].
-
-
-
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |N|L|E|V|I|P|R|O|      Reserved                 | Next Protocol |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                 Instance ID/Locator-Status-Bits               |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-
-                     Figure 3: LISP-gpe OAM bit (P=1)
-
-3.3.  Version Bits
-
-   LISP-gpe bits8 and 9 are defined as version bits.  The version field
-   is used to ensure backward compatibility going forward with future
-   LISP-gpe updates.
-
-   The initial version for LISP-gpe is 0.
-
-
-
-
-
-
-
-
-
-
-Lewis, et al.            Expires January 5, 2015                [Page 6]
-
-Internet-Draft       LISP Generic Protocol Extension           July 2014
-
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |N|L|E|V|I|P|R|O|Ver|      Reserved             | Next Protocol |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                 Instance ID/Locator-Status-Bits               |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-
-                   Figure 4: LISP-gpe Version bits (P=1)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Lewis, et al.            Expires January 5, 2015                [Page 7]
-
-Internet-Draft       LISP Generic Protocol Extension           July 2014
-
-
-4.  Backward Compatibility
-
-   Undefined (in RFC6830) flag bits 5 and 7, LISP-gpe P and O bits, were
-   selected to ensure compatibility with existing LISP [RFC6830]
-   deployments.
-
-   Similarly, using P = 0 to indicate that the format of the header and
-   payload conforms to [RFC6830] ensures compatibility with existing
-   LISP hardware forwarding platforms.
-
-4.1.  LISP-gpe Routers to (legacy) LISP Routers
-
-   A LISP-gpe router MUST not encapsulate non-IP packet nor OAM packets
-   to a LISP router.  A method for determining the capabilities of a
-   LISP router (gpe or "legacy") is out of the scope of this draft.
-
-   When encapsulating IP packets to a LISP router the P bit SHOULD be
-   set to 1 and the UDP port MUST be set to 4341.  OAM bit MUST be set
-   to 0.  The Next Protocol field SHOULD be 0x1 (IPv4) or 0x2 (IPv6).
-   The (legacy) LISP router will ignore the P bit and the protocol type
-   field.  The (legacy) LISP router will treat the packet as a LISP
-   packet and inspect the first nibble of the payload to determine the
-   IP version.
-
-   When the P bit is set, the N, E, and V bits MUST be set to zero.  The
-   receiving (legacy) LISP router will ignore N, E and V bits, when the
-   P bit is set.
-
-4.2.  (legacy) LISP Routers to LISP-gpe Routers
-
-   When a LISP-gpe router receives a packet from a (legacy) LISP router,
-   the P bit MUST not be set and the UDP port MUST be 4341.  The payload
-   MUST be IP, and the LISP-gpe router will inspect the first nibble of
-   the payload to determine IP version.
-
-4.3.  Type of Service
-
-   When a LISP-gpe router performs Ethernet encapsulation, the inner
-   802.1Q [IEEE8021Q] priority code point (PCP) field MAY be mapped from
-   the encapsulated frame to the Type of Service field in the outer IPv4
-   header, or in the case of IPv6 the 'Traffic Class' field.
-
-4.4.  VLAN Identifier (VID)
-
-   When a LISP-gpe router performs Ethernet encapsulation, the inner
-   header 802.1Q [IEEE8021Q] VLAN Identifier (VID) MAY be mapped to, or
-   used to determine the LISP Instance ID field.
-
-
-
-
-Lewis, et al.            Expires January 5, 2015                [Page 8]
-
-Internet-Draft       LISP Generic Protocol Extension           July 2014
-
-
-5.  LISP-gpe Examples
-
-   This section provides two examples of IP protocols, and one example
-   of Ethernet encapsulated LISP-gpe using the generic extension
-   described in this document.
-
-
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |N|L|E|V|I|1|0|0|0|   Reserved                  |   NP = IPv4   |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                 Instance ID/Locator-Status-Bits               |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |               Original IPv4 Packet                            |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-
-                        Figure 5: IPv4 and LISP-gpe
-
-
-
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |N|L|E|V|I|1|0|0|0|   Reserved                  |   NP = IPv6   |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                 Instance ID/Locator-Status-Bits               |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |               Original IPv6 Packet                            |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-
-                        Figure 6: IPv6 and LISP-gpe
-
-
-
-
-
-
-
-
-
-
-
-
-
-Lewis, et al.            Expires January 5, 2015                [Page 9]
-
-Internet-Draft       LISP Generic Protocol Extension           July 2014
-
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |N|L|E|V|I|1|0|0|0|   Reserved                  | NP = Ethernet |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                 Instance ID/Locator-Status-Bits               |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |               Original Ethernet Frame                         |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-
-                      Figure 7: Ethernet and LISP-gpe
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Lewis, et al.            Expires January 5, 2015               [Page 10]
-
-Internet-Draft       LISP Generic Protocol Extension           July 2014
-
-
-6.  Security Considerations
-
-   LISP-gpe security considerations are similar to the LISP security
-   considerations documented at length in LISP [RFC6830].  With LISP-
-   gpe, issues such as dataplane spoofing, flooding, and traffic
-   redirection are dependent on the particular protocol payload
-   encapsulated.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Lewis, et al.            Expires January 5, 2015               [Page 11]
-
-Internet-Draft       LISP Generic Protocol Extension           July 2014
-
-
-7.  Acknowledgments
-
-   A special thank you goes to Dino Farinacci for his guidance and
-   detailed review.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Lewis, et al.            Expires January 5, 2015               [Page 12]
-
-Internet-Draft       LISP Generic Protocol Extension           July 2014
-
-
-8.  IANA Considerations
-
-   IANA is requested to set up a registry of "Next Protocol".  These are
-   8-bit values.  Next Protocol values 0, 1, 2, 3 and 4 are defined in
-   this draft.  New values are assigned via Standards Action [RFC5226].
-
-              +---------------+-------------+---------------+
-              | Next Protocol | Description | Reference     |
-              +---------------+-------------+---------------+
-              | 0             | Reserved    | This document |
-              |               |             |               |
-              | 1             | IPv4        | This document |
-              |               |             |               |
-              | 2             | IPv6        | This document |
-              |               |             |               |
-              | 3             | Ethernet    | This document |
-              |               |             |               |
-              | 4             | NSH         | This document |
-              |               |             |               |
-              | 5..253        | Unassigned  |               |
-              +---------------+-------------+---------------+
-
-                                  Table 1
-
-   There are ten bits at the beginning of the LISP-gpe header.  New
-   bits are assigned via Standards Action [RFC5226].
-
-   Bits 0-3 - Assigned by LISP [RFC6830] 
-   Bit 4 - Instance ID (I bit)
-   Bit 5 - Next Protocol (P bit)
-   Bit 6 - Reserved
-   Bit 7 - OAM (O bit)
-   Bits 8-9 - Version
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Lewis, et al.            Expires January 5, 2015               [Page 13]
-
-Internet-Draft       LISP Generic Protocol Extension           July 2014
-
-
-9.  References
-
-9.1.  Normative References
-
-   [RFC0768]  Postel, J., "User Datagram Protocol", STD 6, RFC 768,
-              August 1980.
-
-   [RFC0791]  Postel, J., "Internet Protocol", STD 5, RFC 791,
-              September 1981.
-
-   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
-              Requirement Levels", BCP 14, RFC 2119, March 1997.
-
-   [RFC5226]  Narten, T. and H. Alvestrand, "Guidelines for Writing an
-              IANA Considerations Section in RFCs", BCP 26, RFC 5226,
-              May 2008.
-
-9.2.  Informative References
-
-   [ETYPES]   The IEEE Registration Authority, "IEEE 802 Numbers", 2012,
-              <http://www.iana.org/assignments/ieee-802-numbers/
-              ieee-802-numbers.xml>.
-
-   [IEEE8021Q]
-              The IEEE Computer Society, "Media Access Control (MAC)
-              Bridges and Virtual Bridge Local Area Networks", August
-              2012, <http://standards.ieee.org/getieee802/download/
-              802.1Q-2011.pdf>.
-
-   [RFC1700]  Reynolds, J. and J. Postel, "Assigned Numbers", RFC 1700,
-              October 1994.
-
-   [RFC6830]  Farinacci, D., Fuller, V., Meyer, D., and D. Lewis, "The
-              Locator/ID Separation Protocol (LISP)", RFC 6830,
-              January 2013.
-
-   [RFC6834]  Iannone, L., Saucez, D., and O. Bonaventure, "Locator/ID
-              Separation Protocol (LISP) Map-Versioning", RFC 6834,
-              January 2013.
-
-   [VXLAN]    Dutt, D., Mahalingam, M., Duda, K., Agarwal, P., Kreeger,
-              L., Sridhar, T., Bursell, M., and C. Wright, "VXLAN: A
-              Framework for Overlaying Virtualized Layer 2 Networks over
-              Layer 3 Networks", 2013.
-
-
-
-
-
-
-
-Lewis, et al.            Expires January 5, 2015               [Page 14]
-
-Internet-Draft       LISP Generic Protocol Extension           July 2014
-
-
-Authors' Addresses
-
-   Darrel Lewis
-   Cisco Systems, Inc.
-
-   Email: darlewis@cisco.com
-
-
-   Puneet Agarwal
-   Broadcom
-
-   Email: pagarwal@broadcom.com
-
-
-   Larry Kreeger
-   Cisco Systems, Inc.
-
-   Email: kreeger@cisco.com
-
-
-   Fabio Maino
-   Cisco Systems, Inc.
-
-   Email: fmaino@cisco.com
-
-
-   Paul Quinn
-   Cisco Systems, Inc.
-
-   Email: paulq@cisco.com
-
-
-   Michael Smith
-   Cisco Systems, Inc.
-
-   Email: michsmit@cisco.com
-
-
-   Navindra Yadav
-   Cisco Systems, Inc.
-
-   Email: nyadav@cisco.com
diff --git a/vnet/vnet/llc/llc.c b/vnet/vnet/llc/llc.c
deleted file mode 100644
index 975207b6..00000000
--- a/vnet/vnet/llc/llc.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * llc.c: llc support
- *
- * Copyright (c) 2010 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/llc/llc.h>
-
-/* Global main structure. */
-llc_main_t llc_main;
-
-u8 *
-format_llc_protocol (u8 * s, va_list * args)
-{
-  llc_protocol_t p = va_arg (*args, u32);
-  llc_main_t *pm = &llc_main;
-  llc_protocol_info_t *pi = llc_get_protocol_info (pm, p);
-
-  if (pi)
-    s = format (s, "%s", pi->name);
-  else
-    s = format (s, "0x%02x", p);
-
-  return s;
-}
-
-u8 *
-format_llc_header_with_length (u8 * s, va_list * args)
-{
-  llc_main_t *pm = &llc_main;
-  llc_header_t *h = va_arg (*args, llc_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-  llc_protocol_t p = h->dst_sap;
-  uword indent, header_bytes;
-
-  header_bytes = llc_header_length (h);
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    return format (s, "llc header truncated");
-
-  indent = format_get_indent (s);
-
-  s = format (s, "LLC %U -> %U",
-	      format_llc_protocol, h->src_sap,
-	      format_llc_protocol, h->dst_sap);
-
-  if (h->control != 0x03)
-    s = format (s, ", control 0x%x", llc_header_get_control (h));
-
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    {
-      llc_protocol_info_t *pi = llc_get_protocol_info (pm, p);
-      vlib_node_t *node = vlib_get_node (pm->vlib_main, pi->node_index);
-      if (node->format_buffer)
-	s = format (s, "\n%U%U",
-		    format_white_space, indent,
-		    node->format_buffer, (void *) (h + 1),
-		    max_header_bytes - header_bytes);
-    }
-
-  return s;
-}
-
-u8 *
-format_llc_header (u8 * s, va_list * args)
-{
-  llc_header_t *h = va_arg (*args, llc_header_t *);
-  return format (s, "%U", format_llc_header_with_length, h, 0);
-}
-
-/* Returns llc protocol as an int in host byte order. */
-uword
-unformat_llc_protocol (unformat_input_t * input, va_list * args)
-{
-  u8 *result = va_arg (*args, u8 *);
-  llc_main_t *pm = &llc_main;
-  int p, i;
-
-  /* Numeric type. */
-  if (unformat (input, "0x%x", &p) || unformat (input, "%d", &p))
-    {
-      if (p >= (1 << 8))
-	return 0;
-      *result = p;
-      return 1;
-    }
-
-  /* Named type. */
-  if (unformat_user (input, unformat_vlib_number_by_name,
-		     pm->protocol_info_by_name, &i))
-    {
-      llc_protocol_info_t *pi = vec_elt_at_index (pm->protocol_infos, i);
-      *result = pi->protocol;
-      return 1;
-    }
-
-  return 0;
-}
-
-uword
-unformat_llc_header (unformat_input_t * input, va_list * args)
-{
-  u8 **result = va_arg (*args, u8 **);
-  llc_header_t _h, *h = &_h;
-  u8 p;
-
-  if (!unformat (input, "%U", unformat_llc_protocol, &p))
-    return 0;
-
-  h->src_sap = h->dst_sap = p;
-  h->control = 0x3;
-
-  /* Add header to result. */
-  {
-    void *p;
-    u32 n_bytes = sizeof (h[0]);
-
-    vec_add2 (*result, p, n_bytes);
-    clib_memcpy (p, h, n_bytes);
-  }
-
-  return 1;
-}
-
-static u8 *
-llc_build_rewrite (vnet_main_t * vnm,
-		   u32 sw_if_index,
-		   vnet_link_t link_type, const void *dst_address)
-{
-  llc_header_t *h;
-  u8 *rewrite = NULL;
-  llc_protocol_t protocol;
-
-  switch (link_type)
-    {
-#define _(a,b) case VNET_LINK_##a: protocol = LLC_PROTOCOL_##b; break
-      _(IP4, ip4);
-#undef _
-    default:
-      return (NULL);
-    }
-
-  vec_validate (rewrite, sizeof (*h) - 1);
-  h = (llc_header_t *) rewrite;
-  h->src_sap = h->dst_sap = protocol;
-  h->control = 0x3;
-
-  return (rewrite);
-}
-
-/* *INDENT-OFF* */
-VNET_HW_INTERFACE_CLASS (llc_hw_interface_class) = {
-  .name = "LLC",
-  .format_header = format_llc_header_with_length,
-  .unformat_header = unformat_llc_header,
-  .build_rewrite = llc_build_rewrite,
-};
-/* *INDENT-ON* */
-
-static void
-add_protocol (llc_main_t * pm, llc_protocol_t protocol, char *protocol_name)
-{
-  llc_protocol_info_t *pi;
-  u32 i;
-
-  vec_add2 (pm->protocol_infos, pi, 1);
-  i = pi - pm->protocol_infos;
-
-  pi->name = protocol_name;
-  pi->protocol = protocol;
-  pi->next_index = pi->node_index = ~0;
-
-  hash_set (pm->protocol_info_by_protocol, protocol, i);
-  hash_set_mem (pm->protocol_info_by_name, pi->name, i);
-}
-
-static clib_error_t *
-llc_init (vlib_main_t * vm)
-{
-  clib_error_t *error;
-  llc_main_t *pm = &llc_main;
-
-  memset (pm, 0, sizeof (pm[0]));
-  pm->vlib_main = vm;
-
-  pm->protocol_info_by_name = hash_create_string (0, sizeof (uword));
-  pm->protocol_info_by_protocol = hash_create (0, sizeof (uword));
-
-#define _(f,n) add_protocol (pm, LLC_PROTOCOL_##f, #f);
-  foreach_llc_protocol;
-#undef _
-
-  if ((error = vlib_call_init_function (vm, snap_init)))
-    return error;
-
-  return vlib_call_init_function (vm, llc_input_init);
-}
-
-VLIB_INIT_FUNCTION (llc_init);
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/llc/llc.h b/vnet/vnet/llc/llc.h
deleted file mode 100644
index 0b85f5d8..00000000
--- a/vnet/vnet/llc/llc.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * llc.h: LLC definitions
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_llc_h
-#define included_llc_h
-
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-
-/* Protocol (SSAP/DSAP) types. */
-#define foreach_llc_protocol			\
-  _ (null, 0x0)					\
-  _ (sublayer, 0x2)				\
-  _ (sna_path_control, 0x4)			\
-  _ (ip4, 0x6)					\
-  _ (sna1, 0x8)					\
-  _ (sna2, 0xc)					\
-  _ (sna3, 0x40)				\
-  _ (proway_lan, 0x0e)				\
-  _ (netware1, 0x10)				\
-  _ (netware2, 0xe0)				\
-  _ (osi_layer1, 0x14)				\
-  _ (osi_layer2, 0x20)				\
-  _ (osi_layer3, 0x34)				\
-  _ (osi_layer4, 0x54)				\
-  _ (osi_layer5, 0xfe)				\
-  _ (bpdu, 0x42)				\
-  _ (arp, 0x98)					\
-  _ (snap, 0xaa)				\
-  _ (vines1, 0xba)				\
-  _ (vines2, 0xbc)				\
-  _ (netbios, 0xf0)				\
-  _ (global_dsap, 0xff)
-
-typedef enum
-{
-#define _(f,n) LLC_PROTOCOL_##f = n,
-  foreach_llc_protocol
-#undef _
-} llc_protocol_t;
-
-typedef struct
-{
-#define LLC_DST_SAP_IS_GROUP (1 << 0)
-#define LLC_SRC_SAP_IS_RESPONSE (1 << 0)
-  u8 dst_sap, src_sap;
-
-  /* Control byte.
-     [0] 1 => supervisory 0 => information
-     [1] unnumbered frame. */
-  u8 control;
-
-  /* Only present if (control & 3) != 3. */
-  u8 extended_control[0];
-} llc_header_t;
-
-always_inline u16
-llc_header_get_control (llc_header_t * h)
-{
-  u16 r = h->control;
-  return r | ((((r & 3) != 3) ? h->extended_control[0] : 0) << 8);
-}
-
-always_inline u8
-llc_header_length (llc_header_t * h)
-{
-  return ((h->control & 3) != 3 ? 4 : 3);
-}
-
-typedef struct
-{
-  /* Name (a c string). */
-  char *name;
-
-  /* LLC protocol (SAP type). */
-  llc_protocol_t protocol;
-
-  /* Node which handles this type. */
-  u32 node_index;
-
-  /* Next index for this type. */
-  u32 next_index;
-} llc_protocol_info_t;
-
-#define foreach_llc_error			\
-  _ (NONE, "no error")				\
-  _ (UNKNOWN_PROTOCOL, "unknown llc ssap/dsap")	\
-  _ (UNKNOWN_CONTROL, "control != 0x3")
-
-typedef enum
-{
-#define _(f,s) LLC_ERROR_##f,
-  foreach_llc_error
-#undef _
-    LLC_N_ERROR,
-} llc_error_t;
-
-typedef struct
-{
-  vlib_main_t *vlib_main;
-
-  llc_protocol_info_t *protocol_infos;
-
-  /* Hash tables mapping name/protocol to protocol info index. */
-  uword *protocol_info_by_name, *protocol_info_by_protocol;
-
-  /* llc-input next index indexed by protocol. */
-  u8 input_next_by_protocol[256];
-} llc_main_t;
-
-always_inline llc_protocol_info_t *
-llc_get_protocol_info (llc_main_t * m, llc_protocol_t protocol)
-{
-  uword *p = hash_get (m->protocol_info_by_protocol, protocol);
-  return p ? vec_elt_at_index (m->protocol_infos, p[0]) : 0;
-}
-
-extern llc_main_t llc_main;
-
-/* Register given node index to take input for given llc type. */
-void
-llc_register_input_protocol (vlib_main_t * vm,
-			     llc_protocol_t protocol, u32 node_index);
-
-void llc_set_adjacency (vnet_rewrite_header_t * rw,
-			uword max_data_bytes, llc_protocol_t protocol);
-
-format_function_t format_llc_protocol;
-format_function_t format_llc_header;
-format_function_t format_llc_header_with_length;
-
-/* Parse llc protocol as 0xXXXX or protocol name. */
-unformat_function_t unformat_llc_protocol;
-
-/* Parse llc header. */
-unformat_function_t unformat_llc_header;
-unformat_function_t unformat_pg_llc_header;
-
-always_inline void
-llc_setup_node (vlib_main_t * vm, u32 node_index)
-{
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  pg_node_t *pn = pg_get_node (node_index);
-
-  n->format_buffer = format_llc_header_with_length;
-  n->unformat_buffer = unformat_llc_header;
-  pn->unformat_edit = unformat_pg_llc_header;
-}
-
-#endif /* included_llc_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/llc/node.c b/vnet/vnet/llc/node.c
deleted file mode 100644
index 60b5c134..00000000
--- a/vnet/vnet/llc/node.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * llc_node.c: llc packet processing
- *
- * Copyright (c) 2010 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/llc/llc.h>
-
-#define foreach_llc_input_next			\
-  _ (PUNT, "error-punt")			\
-  _ (DROP, "error-drop")
-
-typedef enum
-{
-#define _(s,n) LLC_INPUT_NEXT_##s,
-  foreach_llc_input_next
-#undef _
-    LLC_INPUT_N_NEXT,
-} llc_input_next_t;
-
-typedef struct
-{
-  u8 packet_data[32];
-} llc_input_trace_t;
-
-static u8 *
-format_llc_input_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  llc_input_trace_t *t = va_arg (*va, llc_input_trace_t *);
-
-  s = format (s, "%U", format_llc_header, t->packet_data);
-
-  return s;
-}
-
-static uword
-llc_input (vlib_main_t * vm,
-	   vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  llc_main_t *lm = &llc_main;
-  u32 n_left_from, next_index, *from, *to_next;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node,
-				   from,
-				   n_left_from,
-				   sizeof (from[0]),
-				   sizeof (llc_input_trace_t));
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  llc_header_t *h0, *h1;
-	  u8 next0, next1, len0, len1, enqueue_code;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *b2, *b3;
-
-	    b2 = vlib_get_buffer (vm, from[2]);
-	    b3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (b2, LOAD);
-	    vlib_prefetch_buffer_header (b3, LOAD);
-
-	    CLIB_PREFETCH (b2->data, sizeof (h0[0]), LOAD);
-	    CLIB_PREFETCH (b3->data, sizeof (h1[0]), LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  h0 = (void *) (b0->data + b0->current_data);
-	  h1 = (void *) (b1->data + b1->current_data);
-
-	  len0 = llc_header_length (h0);
-	  len1 = llc_header_length (h1);
-
-	  b0->current_data += len0;
-	  b1->current_data += len1;
-
-	  b0->current_length -= len0;
-	  b1->current_length -= len1;
-
-	  next0 = lm->input_next_by_protocol[h0->dst_sap];
-	  next1 = lm->input_next_by_protocol[h1->dst_sap];
-
-	  b0->error =
-	    node->errors[next0 ==
-			 LLC_INPUT_NEXT_DROP ? LLC_ERROR_UNKNOWN_PROTOCOL :
-			 LLC_ERROR_NONE];
-	  b1->error =
-	    node->errors[next1 ==
-			 LLC_INPUT_NEXT_DROP ? LLC_ERROR_UNKNOWN_PROTOCOL :
-			 LLC_ERROR_NONE];
-
-	  enqueue_code = (next0 != next_index) + 2 * (next1 != next_index);
-
-	  if (PREDICT_FALSE (enqueue_code != 0))
-	    {
-	      switch (enqueue_code)
-		{
-		case 1:
-		  /* A B A */
-		  to_next[-2] = bi1;
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node, next0, bi0);
-		  break;
-
-		case 2:
-		  /* A A B */
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node, next1, bi1);
-		  break;
-
-		case 3:
-		  /* A B B or A B C */
-		  to_next -= 2;
-		  n_left_to_next += 2;
-		  vlib_set_next_frame_buffer (vm, node, next0, bi0);
-		  vlib_set_next_frame_buffer (vm, node, next1, bi1);
-		  if (next0 == next1)
-		    {
-		      vlib_put_next_frame (vm, node, next_index,
-					   n_left_to_next);
-		      next_index = next1;
-		      vlib_get_next_frame (vm, node, next_index, to_next,
-					   n_left_to_next);
-		    }
-		}
-	    }
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  llc_header_t *h0;
-	  u8 next0, len0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  h0 = (void *) (b0->data + b0->current_data);
-
-	  len0 = llc_header_length (h0);
-
-	  b0->current_data += len0;
-
-	  b0->current_length -= len0;
-
-	  next0 = lm->input_next_by_protocol[h0->dst_sap];
-
-	  b0->error =
-	    node->errors[next0 ==
-			 LLC_INPUT_NEXT_DROP ? LLC_ERROR_UNKNOWN_PROTOCOL :
-			 LLC_ERROR_NONE];
-
-	  /* Sent packet to wrong next? */
-	  if (PREDICT_FALSE (next0 != next_index))
-	    {
-	      /* Return old frame; remove incorrectly enqueued packet. */
-	      vlib_put_next_frame (vm, node, next_index, n_left_to_next + 1);
-
-	      /* Send to correct next. */
-	      next_index = next0;
-	      vlib_get_next_frame (vm, node, next_index,
-				   to_next, n_left_to_next);
-
-	      to_next[0] = bi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-static char *llc_error_strings[] = {
-#define _(f,s) s,
-  foreach_llc_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (llc_input_node) = {
-  .function = llc_input,
-  .name = "llc-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .n_errors = LLC_N_ERROR,
-  .error_strings = llc_error_strings,
-
-  .n_next_nodes = LLC_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [LLC_INPUT_NEXT_##s] = n,
-    foreach_llc_input_next
-#undef _
-  },
-
-  .format_buffer = format_llc_header_with_length,
-  .format_trace = format_llc_input_trace,
-  .unformat_buffer = unformat_llc_header,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-llc_input_init (vlib_main_t * vm)
-{
-  llc_main_t *lm = &llc_main;
-
-  {
-    clib_error_t *error = vlib_call_init_function (vm, llc_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  llc_setup_node (vm, llc_input_node.index);
-
-  {
-    int i;
-    for (i = 0; i < ARRAY_LEN (lm->input_next_by_protocol); i++)
-      lm->input_next_by_protocol[i] = LLC_INPUT_NEXT_DROP;
-  }
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (llc_input_init);
-
-void
-llc_register_input_protocol (vlib_main_t * vm,
-			     llc_protocol_t protocol, u32 node_index)
-{
-  llc_main_t *lm = &llc_main;
-  llc_protocol_info_t *pi;
-
-  {
-    clib_error_t *error = vlib_call_init_function (vm, llc_input_init);
-    if (error)
-      clib_error_report (error);
-    /* Otherwise, osi_input_init will wipe out e.g. the snap init */
-    error = vlib_call_init_function (vm, osi_input_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  pi = llc_get_protocol_info (lm, protocol);
-  pi->node_index = node_index;
-  pi->next_index = vlib_node_add_next (vm, llc_input_node.index, node_index);
-
-  lm->input_next_by_protocol[protocol] = pi->next_index;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/llc/pg.c b/vnet/vnet/llc/pg.c
deleted file mode 100644
index ad18a4b0..00000000
--- a/vnet/vnet/llc/pg.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * llc_pg.c: packet generator llc interface
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/llc/llc.h>
-
-typedef struct
-{
-  pg_edit_t dst_sap;
-  pg_edit_t src_sap;
-  pg_edit_t control;
-} pg_llc_header_t;
-
-static inline void
-pg_llc_header_init (pg_llc_header_t * e)
-{
-  pg_edit_init (&e->dst_sap, llc_header_t, dst_sap);
-  pg_edit_init (&e->src_sap, llc_header_t, src_sap);
-  pg_edit_init (&e->control, llc_header_t, control);
-}
-
-uword
-unformat_pg_llc_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t *s = va_arg (*args, pg_stream_t *);
-  pg_llc_header_t *h;
-  u32 group_index, error;
-
-  h = pg_create_edit_group (s, sizeof (h[0]), sizeof (llc_header_t),
-			    &group_index);
-  pg_llc_header_init (h);
-
-  pg_edit_set_fixed (&h->control, 0x03);
-
-  error = 1;
-  if (!unformat (input, "%U -> %U",
-		 unformat_pg_edit,
-		 unformat_llc_protocol, &h->src_sap, &h->dst_sap))
-    goto done;
-
-  {
-    llc_main_t *pm = &llc_main;
-    llc_protocol_info_t *pi = 0;
-    pg_node_t *pg_node = 0;
-
-    if (h->dst_sap.type == PG_EDIT_FIXED)
-      {
-	u8 t = *h->dst_sap.values[PG_EDIT_LO];
-	pi = llc_get_protocol_info (pm, t);
-	if (pi && pi->node_index != ~0)
-	  pg_node = pg_get_node (pi->node_index);
-      }
-
-    if (pg_node && pg_node->unformat_edit
-	&& unformat_user (input, pg_node->unformat_edit, s))
-      ;
-
-    else if (!unformat_user (input, unformat_pg_payload, s))
-      goto done;
-  }
-
-  error = 0;
-done:
-  if (error)
-    pg_free_edit_group (s);
-  return error == 0;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lldp/dir.dox b/vnet/vnet/lldp/dir.dox
deleted file mode 100644
index 6aa45f70..00000000
--- a/vnet/vnet/lldp/dir.dox
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- @dir vnet/vnet/lldp
- @brief Link Layer Discovery Protocol (LLDP) implementation
-*/
diff --git a/vnet/vnet/lldp/lldp_cli.c b/vnet/vnet/lldp/lldp_cli.c
deleted file mode 100644
index 45f688c5..00000000
--- a/vnet/vnet/lldp/lldp_cli.c
+++ /dev/null
@@ -1,646 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @file
- * @brief LLDP CLI handling
- *
- */
-#include <vnet/lisp-cp/lisp_types.h>
-#include <vnet/lldp/lldp_node.h>
-
-#ifndef ETHER_ADDR_LEN
-#include <net/ethernet.h>
-#endif
-
-typedef enum lldp_cfg_err
-{
-  lldp_ok,
-  lldp_not_supported,
-  lldp_invalid_arg,
-} lldp_cfg_err_t;
-
-static clib_error_t *
-lldp_cfg_err_to_clib_err (lldp_cfg_err_t e)
-{
-
-  switch (e)
-    {
-    case lldp_ok:
-      return 0;
-    case lldp_not_supported:
-      return clib_error_return (0, "not supported");
-    case lldp_invalid_arg:
-      return clib_error_return (0, "invalid argument");
-    }
-  return 0;
-}
-
-static lldp_cfg_err_t
-lldp_cfg_intf_set (u32 hw_if_index, int enable)
-{
-  lldp_main_t *lm = &lldp_main;
-  vnet_main_t *vnm = lm->vnet_main;
-  ethernet_main_t *em = &ethernet_main;
-  const vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
-  const ethernet_interface_t *eif = ethernet_get_interface (em, hw_if_index);
-
-  if (!eif)
-    {
-      return lldp_not_supported;
-    }
-
-  if (enable)
-    {
-      lldp_intf_t *n = lldp_get_intf (lm, hw_if_index);
-      if (n)
-	{
-	  /* already enabled */
-	  return 0;
-	}
-      n = lldp_create_intf (lm, hw_if_index);
-      const vnet_sw_interface_t *sw =
-	vnet_get_sw_interface (lm->vnet_main, hi->sw_if_index);
-      if (sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
-	{
-	  lldp_schedule_intf (lm, n);
-	}
-    }
-  else
-    {
-      lldp_intf_t *n = lldp_get_intf (lm, hi->sw_if_index);
-      lldp_delete_intf (lm, n);
-    }
-
-  return 0;
-}
-
-static clib_error_t *
-lldp_intf_cmd (vlib_main_t * vm, unformat_input_t * input,
-	       vlib_cli_command_t * cmd)
-{
-  lldp_main_t *lm = &lldp_main;
-  vnet_main_t *vnm = lm->vnet_main;
-  u32 hw_if_index;
-  int enable = 0;
-
-  if (unformat (input, "%U %U", unformat_vnet_hw_interface, vnm, &hw_if_index,
-		unformat_vlib_enable_disable, &enable))
-    {
-      return
-	lldp_cfg_err_to_clib_err (lldp_cfg_intf_set (hw_if_index, enable));
-    }
-  else
-    {
-      return clib_error_return (0, "unknown input `%U'",
-				format_unformat_error, input);
-    }
-  return 0;
-}
-
-static lldp_cfg_err_t
-lldp_cfg_set (u8 ** host, int hold_time, int tx_interval)
-{
-  lldp_main_t *lm = &lldp_main;
-  int reschedule = 0;
-  if (host && *host)
-    {
-      vec_free (lm->sys_name);
-      lm->sys_name = *host;
-      *host = NULL;
-    }
-  if (hold_time)
-    {
-      if (hold_time < LLDP_MIN_TX_HOLD || hold_time > LLDP_MAX_TX_HOLD)
-	{
-	  return lldp_invalid_arg;
-	}
-      if (lm->msg_tx_hold != hold_time)
-	{
-	  lm->msg_tx_hold = hold_time;
-	  reschedule = 1;
-	}
-    }
-  if (tx_interval)
-    {
-      if (tx_interval < LLDP_MIN_TX_INTERVAL ||
-	  tx_interval > LLDP_MAX_TX_INTERVAL)
-	{
-	  return lldp_invalid_arg;
-	}
-      if (lm->msg_tx_interval != tx_interval)
-	{
-	  reschedule = 1;
-	  lm->msg_tx_interval = tx_interval;
-	}
-    }
-  if (reschedule)
-    {
-      vlib_process_signal_event (lm->vlib_main, lm->lldp_process_node_index,
-				 LLDP_EVENT_RESCHEDULE, 0);
-    }
-  return lldp_ok;
-}
-
-static clib_error_t *
-lldp_cfg_cmd (vlib_main_t * vm, unformat_input_t * input,
-	      vlib_cli_command_t * cmd)
-{
-  int hold_time = 0;
-  int tx_interval = 0;
-  u8 *host = NULL;
-  clib_error_t *ret = NULL;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "system-name %s", &host))
-	{
-	}
-      else if (unformat (input, "tx-hold %d", &hold_time))
-	{
-	  if (hold_time < LLDP_MIN_TX_HOLD || hold_time > LLDP_MAX_TX_HOLD)
-	    {
-	      ret =
-		clib_error_return (0,
-				   "invalid tx-hold `%d' (out of range <%d,%d>)",
-				   hold_time, LLDP_MIN_TX_HOLD,
-				   LLDP_MAX_TX_HOLD);
-	      goto out;
-	    }
-	}
-      else if (unformat (input, "tx-interval %d", &tx_interval))
-	{
-	  if (tx_interval < LLDP_MIN_TX_INTERVAL ||
-	      tx_interval > LLDP_MAX_TX_INTERVAL)
-	    {
-	      ret =
-		clib_error_return (0,
-				   "invalid tx-interval `%d' (out of range <%d,%d>)",
-				   tx_interval, LLDP_MIN_TX_INTERVAL,
-				   LLDP_MAX_TX_INTERVAL);
-	      goto out;
-	    }
-	}
-      else
-	{
-	  ret = clib_error_return (0, "unknown input `%U'",
-				   format_unformat_error, input);
-	  goto out;
-	}
-    }
-  ret =
-    lldp_cfg_err_to_clib_err (lldp_cfg_set (&host, hold_time, tx_interval));
-out:
-  vec_free (host);
-  return ret;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND(set_interface_lldp_cmd, static) = {
-  .path = "set interface lldp",
-  .short_help = "set interface lldp <interface> (enable | disable) ",
-  .function = lldp_intf_cmd,
-};
-
-VLIB_CLI_COMMAND(set_lldp_cmd, static) = {
-  .path = "set lldp",
-  .short_help = "set lldp [system-name <string>] [tx-hold <value>] "
-                "[tx-interval <value>]",
-  .function = lldp_cfg_cmd,
-};
-/* *INDENT-ON* */
-
-static const char *
-lldp_chassis_id_subtype_str (lldp_chassis_id_subtype_t t)
-{
-  switch (t)
-    {
-#define F(num, val, str) \
-  case num:              \
-    return str;
-      foreach_chassis_id_subtype (F)
-#undef F
-    }
-  return "unknown chassis subtype";
-}
-
-static const char *
-lldp_port_id_subtype_str (lldp_port_id_subtype_t t)
-{
-  switch (t)
-    {
-#define F(num, val, str) \
-  case num:              \
-    return str;
-      foreach_port_id_subtype (F)
-#undef F
-    }
-  return "unknown port subtype";
-}
-
-/*
- * format port id subtype&value
- *
- * @param va - 1st argument - unsigned - port id subtype
- * @param va - 2nd argument - u8* - port id
- * @param va - 3rd argument - unsigned - port id length
- * @param va - 4th argument - int - 1 for detailed output, 0 for simple
- */
-u8 *
-format_lldp_port_id (u8 * s, va_list * va)
-{
-  const lldp_port_id_subtype_t subtype = va_arg (*va, unsigned);
-  const u8 *id = va_arg (*va, u8 *);
-  const unsigned len = va_arg (*va, unsigned);
-  const int detail = va_arg (*va, int);
-  if (!id)
-    {
-      return s;
-    }
-  switch (subtype)
-    {
-    case LLDP_PORT_ID_SUBTYPE_NAME (intf_alias):
-      /* fallthrough */
-    case LLDP_PORT_ID_SUBTYPE_NAME (port_comp):
-      /* fallthrough */
-    case LLDP_PORT_ID_SUBTYPE_NAME (local):
-      /* fallthrough */
-    case LLDP_PORT_ID_SUBTYPE_NAME (intf_name):
-      if (detail)
-	{
-	  s = format (s, "%U(%s)", format_ascii_bytes, id, len,
-		      lldp_port_id_subtype_str (subtype));
-	}
-      else
-	{
-	  s = format (s, "%U", format_ascii_bytes, id, len);
-	}
-      break;
-    case LLDP_PORT_ID_SUBTYPE_NAME (mac_addr):
-      if (ETHER_ADDR_LEN == len)
-	{
-	  if (detail)
-	    {
-	      s = format (s, "%U(%s)", format_mac_address, id,
-			  lldp_port_id_subtype_str (subtype));
-	    }
-	  else
-	    {
-	      s = format (s, "%U", format_mac_address, id);
-	    }
-	  break;
-	}
-      /* fallthrough */
-    case LLDP_PORT_ID_SUBTYPE_NAME (net_addr):
-      /* TODO */
-      /* fallthrough */
-    default:
-      if (detail)
-	{
-	  s = format (s, "%U(%s)", format_hex_bytes, id, len,
-		      lldp_port_id_subtype_str (subtype));
-	}
-      else
-	{
-	  s = format (s, "%U", format_hex_bytes, id, len);
-	}
-      break;
-    }
-  return s;
-}
-
-/*
- * format chassis id subtype&value
- *
- * @param s format string
- * @param va - 1st argument - unsigned - chassis id subtype
- * @param va - 2nd argument - u8* - chassis id
- * @param va - 3rd argument - unsigned - chassis id length
- * @param va - 4th argument - int - 1 for detailed output, 0 for simple
- */
-u8 *
-format_lldp_chassis_id (u8 * s, va_list * va)
-{
-  const lldp_chassis_id_subtype_t subtype =
-    va_arg (*va, lldp_chassis_id_subtype_t);
-  const u8 *id = va_arg (*va, u8 *);
-  const unsigned len = va_arg (*va, unsigned);
-  const int detail = va_arg (*va, int);
-  if (!id)
-    {
-      return s;
-    }
-  switch (subtype)
-    {
-    case LLDP_CHASS_ID_SUBTYPE_NAME (chassis_comp):
-      /* fallthrough */
-    case LLDP_CHASS_ID_SUBTYPE_NAME (intf_alias):
-      /* fallthrough */
-    case LLDP_CHASS_ID_SUBTYPE_NAME (port_comp):
-      /* fallthrough */
-    case LLDP_PORT_ID_SUBTYPE_NAME (local):
-      /* fallthrough */
-    case LLDP_CHASS_ID_SUBTYPE_NAME (intf_name):
-      if (detail)
-	{
-	  s = format (s, "%U(%s)", format_ascii_bytes, id, len,
-		      lldp_chassis_id_subtype_str (subtype));
-	}
-      else
-	{
-	  s = format (s, "%U", format_ascii_bytes, id, len);
-	}
-      break;
-    case LLDP_CHASS_ID_SUBTYPE_NAME (mac_addr):
-      if (ETHER_ADDR_LEN == len)
-	{
-	  if (detail)
-	    {
-	      s = format (s, "%U(%s)", format_mac_address, id,
-			  lldp_chassis_id_subtype_str (subtype));
-	    }
-	  else
-	    {
-	      s = format (s, "%U", format_mac_address, id);
-	    }
-	  break;
-	}
-      /* fallthrough */
-    case LLDP_CHASS_ID_SUBTYPE_NAME (net_addr):
-      /* TODO */
-    default:
-      if (detail)
-	{
-	  s = format (s, "%U(%s)", format_hex_bytes, id, len,
-		      lldp_chassis_id_subtype_str (subtype));
-	}
-      else
-	{
-	  s = format (s, "%U", format_hex_bytes, id, len);
-	}
-      break;
-    }
-  return s;
-}
-
-/*
- * convert a tlv code to human-readable string
- */
-static const char *
-lldp_tlv_code_str (lldp_tlv_code_t t)
-{
-  switch (t)
-    {
-#define F(n, t, s) \
-  case n:          \
-    return s;
-      foreach_lldp_tlv_type (F)
-#undef F
-    }
-  return "unknown lldp tlv";
-}
-
-/*
- * format a single LLDP TLV
- *
- * @param s format string
- * @param va variable list - pointer to lldp_tlv_t is expected
- */
-u8 *
-format_lldp_tlv (u8 * s, va_list * va)
-{
-  const lldp_tlv_t *tlv = va_arg (*va, lldp_tlv_t *);
-  if (!tlv)
-    {
-      return s;
-    }
-  u16 l = lldp_tlv_get_length (tlv);
-  switch (lldp_tlv_get_code (tlv))
-    {
-    case LLDP_TLV_NAME (chassis_id):
-      s = format (s, "%U", format_lldp_chassis_id,
-		  ((lldp_chassis_id_tlv_t *) tlv)->subtype,
-		  ((lldp_chassis_id_tlv_t *) tlv)->id,
-		  l - STRUCT_SIZE_OF (lldp_chassis_id_tlv_t, subtype), 1);
-      break;
-    case LLDP_TLV_NAME (port_id):
-      s = format (s, "%U", format_lldp_port_id,
-		  ((lldp_port_id_tlv_t *) tlv)->subtype,
-		  ((lldp_port_id_tlv_t *) tlv)->id,
-		  l - STRUCT_SIZE_OF (lldp_port_id_tlv_t, subtype), 1);
-      break;
-    case LLDP_TLV_NAME (ttl):
-      s = format (s, "%d", ntohs (((lldp_ttl_tlv_t *) tlv)->ttl));
-      break;
-    case LLDP_TLV_NAME (sys_name):
-      /* fallthrough */
-    case LLDP_TLV_NAME (sys_desc):
-      s = format (s, "%U", format_ascii_bytes, tlv->v, l);
-      break;
-    default:
-      s = format (s, "%U", format_hex_bytes, tlv->v, l);
-    }
-
-  return s;
-}
-
-static u8 *
-format_time_ago (u8 * s, va_list * va)
-{
-  f64 ago = va_arg (*va, double);
-  f64 now = va_arg (*va, double);
-  if (ago < 0.01)
-    {
-      return format (s, "never");
-    }
-  return format (s, "%.1fs ago", now - ago);
-}
-
-static u8 *
-format_lldp_intfs_detail (u8 * s, vlib_main_t * vm, const lldp_main_t * lm)
-{
-  vnet_main_t *vnm = &vnet_main;
-  const lldp_intf_t *n;
-  const vnet_hw_interface_t *hw;
-  const vnet_sw_interface_t *sw;
-  s = format (s, "LLDP configuration:\n");
-  if (lm->sys_name)
-    {
-      s = format (s, "Configured system name: %U\n", format_ascii_bytes,
-		  lm->sys_name, vec_len (lm->sys_name));
-    }
-  s = format (s, "Configured tx-hold: %d\n", (int) lm->msg_tx_hold);
-  s = format (s, "Configured tx-interval: %d\n", (int) lm->msg_tx_interval);
-  s = format (s, "\nLLDP-enabled interface table:\n");
-  f64 now = vlib_time_now (vm);
-
-  /* *INDENT-OFF* */
-  pool_foreach(
-      n, lm->intfs, ({
-        hw = vnet_get_hw_interface(vnm, n->hw_if_index);
-        sw = vnet_get_sw_interface(lm->vnet_main, hw->sw_if_index);
-        /* Interface shutdown */
-        if (!(sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
-          {
-            s = format(s, "\nInterface name: %s\nInterface/peer state: "
-                          "interface down\nLast packet sent: %U\n",
-                       hw->name, format_time_ago, n->last_sent, now);
-          }
-        else if (now < n->last_heard + n->ttl)
-          {
-            s = format(s,
-                       "\nInterface name: %s\nInterface/peer state: "
-                       "active\nPeer chassis ID: %U\nRemote port ID: %U\nLast "
-                       "packet sent: %U\nLast packet received: %U\n",
-                       hw->name, format_lldp_chassis_id, n->chassis_id_subtype,
-                       n->chassis_id, vec_len(n->chassis_id), 1,
-                       format_lldp_port_id, n->port_id_subtype, n->port_id,
-                       vec_len(n->port_id), 1, format_time_ago, n->last_sent,
-                       now, format_time_ago, n->last_heard, now);
-          }
-        else
-          {
-            s = format(s, "\nInterface name: %s\nInterface/peer state: "
-                          "inactive(timeout)\nLast known peer chassis ID: "
-                          "%U\nLast known peer port ID: %U\nLast packet sent: "
-                          "%U\nLast packet received: %U\n",
-                       hw->name, format_lldp_chassis_id, n->chassis_id_subtype,
-                       n->chassis_id, vec_len(n->chassis_id), 1,
-                       format_lldp_port_id, n->port_id_subtype, n->port_id,
-                       vec_len(n->port_id), 1, format_time_ago, n->last_sent,
-                       now, format_time_ago, n->last_heard, now);
-          }
-      }));
-  /* *INDENT-ON* */
-  return s;
-}
-
-static u8 *
-format_lldp_intfs (u8 * s, va_list * va)
-{
-  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
-  const lldp_main_t *lm = va_arg (*va, lldp_main_t *);
-  const int detail = va_arg (*va, int);
-  vnet_main_t *vnm = &vnet_main;
-  const lldp_intf_t *n;
-
-  if (detail)
-    {
-      return format_lldp_intfs_detail (s, vm, lm);
-    }
-
-  f64 now = vlib_time_now (vm);
-  s = format (s, "%-25s %-25s %-25s %=15s %=15s %=10s\n", "Local interface",
-	      "Peer chassis ID", "Remote port ID", "Last heard", "Last sent",
-	      "Status");
-
-  /* *INDENT-OFF* */
-  pool_foreach(
-      n, lm->intfs, ({
-        const vnet_hw_interface_t *hw =
-            vnet_get_hw_interface(vnm, n->hw_if_index);
-        const vnet_sw_interface_t *sw =
-            vnet_get_sw_interface(lm->vnet_main, hw->sw_if_index);
-        /* Interface shutdown */
-        if (!(sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
-          continue;
-        if (now < n->last_heard + n->ttl)
-          {
-            s = format(s, "%-25s %-25U %-25U %=15U %=15U %=10s\n", hw->name,
-                       format_lldp_chassis_id, n->chassis_id_subtype,
-                       n->chassis_id, vec_len(n->chassis_id), 0,
-                       format_lldp_port_id, n->port_id_subtype, n->port_id,
-                       vec_len(n->port_id), 0, format_time_ago, n->last_heard,
-                       now, format_time_ago, n->last_sent, now, "active");
-          }
-        else
-          {
-            s = format(s, "%-25s %-25s %-25s %=15U %=15U %=10s\n", hw->name,
-                       "", "", format_time_ago, n->last_heard, now,
-                       format_time_ago, n->last_sent, now, "inactive");
-          }
-      }));
-  /* *INDENT-ON* */
-  return s;
-}
-
-static clib_error_t *
-show_lldp (vlib_main_t * vm, unformat_input_t * input,
-	   CLIB_UNUSED (vlib_cli_command_t * lmd))
-{
-  lldp_main_t *lm = &lldp_main;
-
-  if (unformat (input, "detail"))
-    {
-      vlib_cli_output (vm, "%U\n", format_lldp_intfs, vm, lm, 1);
-    }
-  else
-    {
-      vlib_cli_output (vm, "%U\n", format_lldp_intfs, vm, lm, 0);
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND(show_lldp_command, static) = {
-  .path = "show lldp",
-  .short_help = "show lldp [detail]",
-  .function = show_lldp,
-};
-/* *INDENT-ON* */
-
-/*
- * packet trace format function, very similar to
- * lldp_packet_scan except that we call the per TLV format
- * functions instead of the per TLV processing functions
- */
-u8 *
-lldp_input_format_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  const lldp_input_trace_t *t = va_arg (*args, lldp_input_trace_t *);
-  const u8 *cur;
-  const lldp_tlv_t *tlv;
-  cur = t->data;
-  while (((cur + lldp_tlv_get_length ((lldp_tlv_t *) cur)) <
-	  t->data + t->len))
-    {
-      tlv = (lldp_tlv_t *) cur;
-      if (cur == t->data)
-	{
-	  s = format (s, "TLV #%d(%s): %U\n", lldp_tlv_get_code (tlv),
-		      lldp_tlv_code_str (lldp_tlv_get_code (tlv)),
-		      format_lldp_tlv, tlv);
-	}
-      else
-	{
-	  s = format (s, "  TLV #%d(%s): %U\n", lldp_tlv_get_code (tlv),
-		      lldp_tlv_code_str (lldp_tlv_get_code (tlv)),
-		      format_lldp_tlv, tlv);
-	}
-      cur += STRUCT_SIZE_OF (lldp_tlv_t, head) + lldp_tlv_get_length (tlv);
-    }
-
-  return s;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lldp/lldp_doc.md b/vnet/vnet/lldp/lldp_doc.md
deleted file mode 100644
index bac480a5..00000000
--- a/vnet/vnet/lldp/lldp_doc.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# VPP Link Layer Discovery Protocol (LLDP) implementation    {#lldp_doc}
-
-This is a memo intended to contain documentation of the VPP LLDP implementation
-Everything that is not directly obvious should come here.
-
-
-## LLDP
-LLDP is a link layer protocol to advertise the capabilities and current status of the system.
-
-There are 2 nodes handling LLDP
-
-1.) input-node which processes incoming packets and updates the local database
-2.) process-node which is responsible for sending out LLDP packets from VPP side
-
-
-### Configuration
-
-LLDP has a global configuration and a per-interface enable setting.
-
-Global configuration is modified using the "set lldp" command
-
-set lldp [system-name <string>] [tx-hold <value>] [tx-interval <value>]
-
-system-name: the name of the VPP system sent to peers in the system-name TLV
-tx-hold: multiplier for tx-interval when setting time-to-live (TTL) value in the LLDP packets (TTL = tx-hold * tx-interval + 1, if TTL > 65535, then TTL = 65535)
-tx-interval: time interval between sending out LLDP packets
-
-Per interface setting is done using the "set interface lldp" command
-
-set interface lldp <interface> (enable | disable)
-
-interface: the name of the interface for which to enable/disable LLDP
-
-
-### Configuration example
-
-Configure system-name as "VPP" and transmit interval to 10 seconds:
-
-set lldp system-name VPP tx-interval 10
-
-Enable LLDP on interface TenGigabitEthernet5/0/1
-
-set interface lldp TenGigabitEthernet5/0/1 enable
-
-
-### Operational data
-
-The list of LLDP-enabled interfaces which are up can be shown using "show lldp" command
-
-Example:
-DBGvpp# show lldp
-Local interface           Peer chassis ID           Remote port ID               Last heard      Last sent      Status
-GigabitEthernet2/0/1                                                               never         27.0s ago     inactive
-TenGigabitEthernet5/0/1   8c:60:4f:dd:ca:52         Eth1/3/3                     20.1s ago       18.3s ago      active
-
-All LLDP configuration data with all LLDP-enabled interfaces can be shown using "show lldp detail" command
-
-Example:
-DBGvpp# show lldp detail
-LLDP configuration:
-Configured system name: vpp
-Configured tx-hold: 4
-Configured tx-interval: 30
-
-LLDP-enabled interface table:
-
-Interface name: GigabitEthernet2/0/1
-Interface/peer state: inactive(timeout)
-Last known peer chassis ID:
-Last known peer port ID:
-Last packet sent: 12.4s ago
-Last packet received: never
-
-Interface name: GigabitEthernet2/0/2
-Interface/peer state: interface down
-Last packet sent: never
-
-Interface name: TenGigabitEthernet5/0/1
-Interface/peer state: active
-Peer chassis ID: 8c:60:4f:dd:ca:52(MAC address)
-Remote port ID: Eth1/3/3(Locally assigned)
-Last packet sent: 3.6s ago
-Last packet received: 5.5s ago
-
diff --git a/vnet/vnet/lldp/lldp_input.c b/vnet/vnet/lldp/lldp_input.c
deleted file mode 100644
index 762743d0..00000000
--- a/vnet/vnet/lldp/lldp_input.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief LLDP packet parsing implementation
- */
-#include <vnet/lldp/lldp_node.h>
-#include <vnet/lldp/lldp_protocol.h>
-#include <vlibmemory/api.h>
-
-typedef struct
-{
-  u32 hw_if_index;
-  u8 chassis_id_len;
-  u8 chassis_id_subtype;
-  u8 portid_len;
-  u8 portid_subtype;
-  u16 ttl;
-  u8 data[0];			/* this contains both chassis id (chassis_id_len bytes) and port
-				   id (portid_len bytes) */
-} lldp_intf_update_t;
-
-static void
-lldp_rpc_update_peer_cb (const lldp_intf_update_t * a)
-{
-  ASSERT (os_get_cpu_number () == 0);
-
-  lldp_intf_t *n = lldp_get_intf (&lldp_main, a->hw_if_index);
-  if (!n)
-    {
-      /* LLDP turned off for this interface, ignore the update */
-      return;
-    }
-  const u8 *chassis_id = a->data;
-  const u8 *portid = a->data + a->chassis_id_len;
-
-  if (n->chassis_id)
-    {
-      _vec_len (n->chassis_id) = 0;
-    }
-  vec_add (n->chassis_id, chassis_id, a->chassis_id_len);
-  n->chassis_id_subtype = a->chassis_id_subtype;
-  if (n->port_id)
-    {
-      _vec_len (n->port_id) = 0;
-    }
-  vec_add (n->port_id, portid, a->portid_len);
-  n->port_id_subtype = a->portid_subtype;
-  n->ttl = a->ttl;
-  n->last_heard = vlib_time_now (lldp_main.vlib_main);
-}
-
-static void
-lldp_rpc_update_peer (u32 hw_if_index, const u8 * chid, u8 chid_len,
-		      u8 chid_subtype, const u8 * portid,
-		      u8 portid_len, u8 portid_subtype, u16 ttl)
-{
-  const size_t data_size =
-    sizeof (lldp_intf_update_t) + chid_len + portid_len;
-  u8 data[data_size];
-  lldp_intf_update_t *u = (lldp_intf_update_t *) data;
-  u->hw_if_index = hw_if_index;
-  u->chassis_id_len = chid_len;
-  u->chassis_id_subtype = chid_subtype;
-  u->ttl = ttl;
-  u->portid_len = portid_len;
-  u->portid_subtype = portid_subtype;
-  clib_memcpy (u->data, chid, chid_len);
-  clib_memcpy (u->data + chid_len, portid, portid_len);
-  vl_api_rpc_call_main_thread (lldp_rpc_update_peer_cb, data, data_size);
-}
-
-lldp_tlv_code_t
-lldp_tlv_get_code (const lldp_tlv_t * tlv)
-{
-  return tlv->head.byte1 >> 1;
-}
-
-void
-lldp_tlv_set_code (lldp_tlv_t * tlv, lldp_tlv_code_t code)
-{
-  tlv->head.byte1 = (tlv->head.byte1 & 1) + (code << 1);
-}
-
-u16
-lldp_tlv_get_length (const lldp_tlv_t * tlv)
-{
-  return (((u16) (tlv->head.byte1 & 1)) << 8) + tlv->head.byte2;
-}
-
-void
-lldp_tlv_set_length (lldp_tlv_t * tlv, u16 length)
-{
-  tlv->head.byte2 = length & ((1 << 8) - 1);
-  if (length > (1 << 8) - 1)
-    {
-      tlv->head.byte1 |= 1;
-    }
-  else
-    {
-      tlv->head.byte1 &= (1 << 8) - 2;
-    }
-}
-
-lldp_main_t lldp_main;
-
-static int
-lldp_packet_scan (u32 hw_if_index, const lldp_tlv_t * pkt)
-{
-  const lldp_tlv_t *tlv = pkt;
-
-#define TLV_VIOLATES_PKT_BOUNDARY(pkt, tlv)                               \
-  (((((u8 *)tlv) + sizeof (lldp_tlv_t)) > ((u8 *)pkt + vec_len (pkt))) || \
-   ((((u8 *)tlv) + lldp_tlv_get_length (tlv)) > ((u8 *)pkt + vec_len (pkt))))
-
-  /* first tlv is always chassis id, followed by port id and ttl tlvs */
-  if (TLV_VIOLATES_PKT_BOUNDARY (pkt, tlv) ||
-      LLDP_TLV_NAME (chassis_id) != lldp_tlv_get_code (tlv))
-    {
-      return LLDP_ERROR_BAD_TLV;
-    }
-
-  u16 l = lldp_tlv_get_length (tlv);
-  if (l < STRUCT_SIZE_OF (lldp_chassis_id_tlv_t, subtype) +
-      LLDP_MIN_CHASS_ID_LEN ||
-      l > STRUCT_SIZE_OF (lldp_chassis_id_tlv_t, subtype) +
-      LLDP_MAX_CHASS_ID_LEN)
-    {
-      return LLDP_ERROR_BAD_TLV;
-    }
-
-  u8 chid_subtype = ((lldp_chassis_id_tlv_t *) tlv)->subtype;
-  u8 *chid = ((lldp_chassis_id_tlv_t *) tlv)->id;
-  u8 chid_len = l - STRUCT_SIZE_OF (lldp_chassis_id_tlv_t, subtype);
-
-  tlv = (lldp_tlv_t *) ((u8 *) tlv + STRUCT_SIZE_OF (lldp_tlv_t, head) + l);
-
-  if (TLV_VIOLATES_PKT_BOUNDARY (pkt, tlv) ||
-      LLDP_TLV_NAME (port_id) != lldp_tlv_get_code (tlv))
-    {
-      return LLDP_ERROR_BAD_TLV;
-    }
-  l = lldp_tlv_get_length (tlv);
-  if (l < STRUCT_SIZE_OF (lldp_port_id_tlv_t, subtype) +
-      LLDP_MIN_PORT_ID_LEN ||
-      l > STRUCT_SIZE_OF (lldp_chassis_id_tlv_t, subtype) +
-      LLDP_MAX_PORT_ID_LEN)
-    {
-      return LLDP_ERROR_BAD_TLV;
-    }
-
-  u8 portid_subtype = ((lldp_port_id_tlv_t *) tlv)->subtype;
-  u8 *portid = ((lldp_port_id_tlv_t *) tlv)->id;
-  u8 portid_len = l - STRUCT_SIZE_OF (lldp_port_id_tlv_t, subtype);
-
-  tlv = (lldp_tlv_t *) ((u8 *) tlv + STRUCT_SIZE_OF (lldp_tlv_t, head) + l);
-
-  if (TLV_VIOLATES_PKT_BOUNDARY (pkt, tlv) ||
-      LLDP_TLV_NAME (ttl) != lldp_tlv_get_code (tlv))
-    {
-      return LLDP_ERROR_BAD_TLV;
-    }
-  l = lldp_tlv_get_length (tlv);
-  if (l != STRUCT_SIZE_OF (lldp_ttl_tlv_t, ttl))
-    {
-      return LLDP_ERROR_BAD_TLV;
-    }
-  u16 ttl = ntohs (((lldp_ttl_tlv_t *) tlv)->ttl);
-  tlv = (lldp_tlv_t *) ((u8 *) tlv + STRUCT_SIZE_OF (lldp_tlv_t, head) + l);
-  while (!TLV_VIOLATES_PKT_BOUNDARY (pkt, tlv) &&
-	 LLDP_TLV_NAME (pdu_end) != lldp_tlv_get_code (tlv))
-    {
-      switch (lldp_tlv_get_code (tlv))
-	{
-#define F(num, type, str)     \
-  case LLDP_TLV_NAME (type):  \
-    /* ignore optional TLV */ \
-    break;
-	  foreach_lldp_optional_tlv_type (F);
-#undef F
-	default:
-	  return LLDP_ERROR_BAD_TLV;
-	}
-      tlv = (lldp_tlv_t *) ((u8 *) tlv + STRUCT_SIZE_OF (lldp_tlv_t, head) +
-			    lldp_tlv_get_length (tlv));
-    }
-  /* last tlv is pdu_end */
-  if (TLV_VIOLATES_PKT_BOUNDARY (pkt, tlv) ||
-      LLDP_TLV_NAME (pdu_end) != lldp_tlv_get_code (tlv) ||
-      0 != lldp_tlv_get_length (tlv))
-    {
-      return LLDP_ERROR_BAD_TLV;
-    }
-  lldp_rpc_update_peer (hw_if_index, chid, chid_len, chid_subtype, portid,
-			portid_len, portid_subtype, ttl);
-  return LLDP_ERROR_NONE;
-}
-
-lldp_intf_t *
-lldp_get_intf (lldp_main_t * lm, u32 hw_if_index)
-{
-  uword *p = hash_get (lm->intf_by_hw_if_index, hw_if_index);
-
-  if (p)
-    {
-      return pool_elt_at_index (lm->intfs, p[0]);
-    }
-  return NULL;
-}
-
-lldp_intf_t *
-lldp_create_intf (lldp_main_t * lm, u32 hw_if_index)
-{
-
-  uword *p;
-  lldp_intf_t *n;
-  p = hash_get (lm->intf_by_hw_if_index, hw_if_index);
-
-  if (p == 0)
-    {
-      pool_get (lm->intfs, n);
-      memset (n, 0, sizeof (*n));
-      n->hw_if_index = hw_if_index;
-      hash_set (lm->intf_by_hw_if_index, n->hw_if_index, n - lm->intfs);
-    }
-  else
-    {
-      n = pool_elt_at_index (lm->intfs, p[0]);
-    }
-  return n;
-}
-
-/*
- * lldp input routine
- */
-lldp_error_t
-lldp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0)
-{
-  lldp_main_t *lm = &lldp_main;
-  lldp_error_t e;
-
-  /* find our interface */
-  vnet_sw_interface_t *sw_interface = vnet_get_sw_interface (lm->vnet_main,
-							     vnet_buffer
-							     (b0)->sw_if_index
-							     [VLIB_RX]);
-  lldp_intf_t *n = lldp_get_intf (lm, sw_interface->hw_if_index);
-
-  if (!n)
-    {
-      /* lldp disabled on this interface, we're done */
-      return LLDP_ERROR_DISABLED;
-    }
-
-  /* Actually scan the packet */
-  e = lldp_packet_scan (sw_interface->hw_if_index,
-			vlib_buffer_get_current (b0));
-
-  return e;
-}
-
-/*
- * setup function
- */
-static clib_error_t *
-lldp_init (vlib_main_t * vm)
-{
-  clib_error_t *error;
-  lldp_main_t *lm = &lldp_main;
-
-  if ((error = vlib_call_init_function (vm, lldp_template_init)))
-    return error;
-
-  lm->vlib_main = vm;
-  lm->vnet_main = vnet_get_main ();
-  lm->msg_tx_hold = 4;		/* default value per IEEE 802.1AB-2009 */
-  lm->msg_tx_interval = 30;	/* default value per IEEE 802.1AB-2009 */
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (lldp_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lldp/lldp_node.c b/vnet/vnet/lldp/lldp_node.c
deleted file mode 100644
index acaa5e10..00000000
--- a/vnet/vnet/lldp/lldp_node.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief LLDP nodes implementation
- */
-#include <vnet/lldp/lldp_node.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/packet.h>
-
-/* set this to 1 to turn on debug prints via clib_warning() */
-#define LLDP_DEBUG (0)
-
-static vlib_node_registration_t lldp_process_node;
-
-#define F(sym, string) static char LLDP_ERR_##sym##_STR[] = string;
-foreach_lldp_error (F);
-#undef F
-
-/*
- * packet counter strings
- * Dump these counters via the "show error" CLI command
- */
-static char *lldp_error_strings[] = {
-#define F(sym, string) LLDP_ERR_##sym##_STR,
-  foreach_lldp_error (F)
-#undef F
-};
-
-/*
- * We actually send all lldp pkts to the "error" node after scanning
- * them, so the graph node has only one next-index. The "error-drop"
- * node automatically bumps our per-node packet counters for us.
- */
-typedef enum
-{
-  LLDP_INPUT_NEXT_NORMAL,
-  LLDP_INPUT_N_NEXT,
-} lldp_next_t;
-
-/*
- * Process a frame of lldp packets
- * Expect 1 packet / frame
- */
-static uword
-lldp_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-	      vlib_frame_t * frame)
-{
-  u32 n_left_from, *from;
-  lldp_input_trace_t *t0;
-
-  from = vlib_frame_vector_args (frame);	/* array of buffer indices */
-  n_left_from = frame->n_vectors;	/* number of buffer indices */
-
-  while (n_left_from > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      u32 next0, error0;
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-
-      next0 = LLDP_INPUT_NEXT_NORMAL;
-
-      /* scan this lldp pkt. error0 is the counter index to bump */
-      error0 = lldp_input (vm, b0, bi0);
-      b0->error = node->errors[error0];
-
-      /* If this pkt is traced, snapshot the data */
-      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-	{
-	  int len;
-	  t0 = vlib_add_trace (vm, node, b0, sizeof (*t0));
-	  len = (b0->current_length < sizeof (t0->data)) ? b0->current_length
-	    : sizeof (t0->data);
-	  t0->len = len;
-	  clib_memcpy (t0->data, vlib_buffer_get_current (b0), len);
-	}
-      /* push this pkt to the next graph node, always error-drop */
-      vlib_set_next_frame_buffer (vm, node, next0, bi0);
-
-      from += 1;
-      n_left_from -= 1;
-    }
-
-  return frame->n_vectors;
-}
-
-/*
- * lldp input graph node declaration
- */
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(lldp_input_node, static) = {
-  .function = lldp_node_fn,
-  .name = "lldp-input",
-  .vector_size = sizeof(u32),
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = LLDP_N_ERROR,
-  .error_strings = lldp_error_strings,
-
-  .format_trace = lldp_input_format_trace,
-
-  .n_next_nodes = LLDP_INPUT_N_NEXT,
-  .next_nodes =
-      {
-              [LLDP_INPUT_NEXT_NORMAL] = "error-drop",
-      },
-};
-/* *INDENT-ON* */
-
-/*
- * lldp process node function
- */
-static uword
-lldp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  lldp_main_t *lm = &lldp_main;
-  f64 timeout = 0;
-  uword event_type, *event_data = 0;
-
-  /* So we can send events to the lldp process */
-  lm->lldp_process_node_index = lldp_process_node.index;
-
-  /* with ethernet input */
-  ethernet_register_input_type (vm, ETHERNET_TYPE_802_1_LLDP /* LLDP */ ,
-				lldp_input_node.index);
-
-  while (1)
-    {
-      if (vec_len (lm->intfs_timeouts))
-	{
-#if LLDP_DEBUG
-	  clib_warning ("DEBUG: wait for event with timeout %f", timeout);
-#endif
-	  (void) vlib_process_wait_for_event_or_clock (vm, timeout);
-	}
-      else
-	{
-#if LLDP_DEBUG
-	  clib_warning ("DEBUG: wait for event without timeout");
-#endif
-	  (void) vlib_process_wait_for_event (vm);
-	}
-      event_type = vlib_process_get_events (vm, &event_data);
-      switch (event_type)
-	{
-	case ~0:		/* no events => timeout */
-	  /* nothing to do here */
-	  break;
-	case LLDP_EVENT_RESCHEDULE:
-	  /* nothing to do here - reschedule is done automatically after
-	   * each event or timeout */
-	  break;
-	default:
-	  clib_warning ("BUG: event type 0x%wx", event_type);
-	  break;
-	}
-      if (!vec_len (lm->intfs_timeouts))
-	{
-	  continue;
-	}
-      /* send packet(s) and schedule another timeut */
-      const f64 now = vlib_time_now (lm->vlib_main);
-      while (1)
-	{
-	  lldp_intf_t *n = pool_elt_at_index (lm->intfs,
-					      lm->intfs_timeouts
-					      [lm->intfs_timeouts_idx]);
-	  if (n->last_sent < 0.01 || now > n->last_sent + lm->msg_tx_interval)
-	    {
-#if LLDP_DEBUG
-	      clib_warning ("send packet to lldp %p, if idx %d", n,
-			    n->hw_if_index);
-#endif
-	      lldp_send_ethernet (lm, n, 0);
-	      ++lm->intfs_timeouts_idx;
-	      if (lm->intfs_timeouts_idx >= vec_len (lm->intfs_timeouts))
-		{
-		  lm->intfs_timeouts_idx = 0;
-		}
-	      continue;
-	    }
-	  else
-	    {
-	      timeout = n->last_sent + lm->msg_tx_interval - now;
-	      break;
-	    }
-	}
-#if LLDP_DEBUG
-      clib_warning ("DEBUG: timeout set to %f", timeout);
-      u8 *s = NULL;
-      u32 i;
-      vec_foreach_index (i, lm->intfs_timeouts)
-      {
-	if (i == lm->intfs_timeouts_idx)
-	  {
-	    s = format (s, " [%d]", lm->intfs_timeouts[i]);
-	  }
-	else
-	  {
-	    s = format (s, " %d", lm->intfs_timeouts[i]);
-	  }
-      }
-      clib_warning ("DEBUG: timeout schedule: %s", s);
-      vec_free (s);
-#endif
-      if (event_data)
-	{
-	  _vec_len (event_data) = 0;
-	}
-    }
-
-  return 0;
-}
-
-/*
- * lldp process node declaration
- */
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(lldp_process_node, static) = {
-  .function = lldp_process,
-  .type = VLIB_NODE_TYPE_PROCESS,
-  .name = "lldp-process",
-};
-/* *INDENT-ON* */
-
-void
-lldp_schedule_intf (lldp_main_t * lm, lldp_intf_t * n)
-{
-  const int idx = n - lm->intfs;
-  u32 v;
-  vec_foreach_index (v, lm->intfs_timeouts)
-  {
-    if (lm->intfs_timeouts[v] == idx)
-      {
-	/* already scheduled */
-	return;
-      }
-  }
-  n->last_sent = 0;		/* ensure that a packet is sent out immediately */
-  /* put the interface at the current position in the timeouts - it
-   * will timeout immediately */
-  vec_insert (lm->intfs_timeouts, 1, lm->intfs_timeouts_idx);
-  lm->intfs_timeouts[lm->intfs_timeouts_idx] = n - lm->intfs;
-  vlib_process_signal_event (lm->vlib_main, lm->lldp_process_node_index,
-			     LLDP_EVENT_RESCHEDULE, 0);
-#if LLDP_DEBUG
-  clib_warning ("DEBUG: schedule interface %p, if idx %d", n, n->hw_if_index);
-#endif
-}
-
-void
-lldp_unschedule_intf (lldp_main_t * lm, lldp_intf_t * n)
-{
-  if (!n)
-    {
-      return;
-    }
-#if LLDP_DEBUG
-  clib_warning ("DEBUG: unschedule interface %p, if idx %d", n,
-		n->hw_if_index);
-#endif
-  const int idx = n - lm->intfs;
-  u32 v;
-  /* remove intf index from timeouts vector */
-  vec_foreach_index (v, lm->intfs_timeouts)
-  {
-    if (lm->intfs_timeouts[v] == idx)
-      {
-	vec_delete (lm->intfs_timeouts, 1, v);
-	break;
-      }
-  }
-  /* wrap current timeout index to first element if needed */
-  if (lm->intfs_timeouts_idx >= vec_len (lm->intfs_timeouts))
-    {
-      lm->intfs_timeouts_idx = 0;
-    }
-  vlib_process_signal_event (lm->vlib_main, lm->lldp_process_node_index,
-			     LLDP_EVENT_RESCHEDULE, 0);
-}
-
-static clib_error_t *
-lldp_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
-{
-  lldp_main_t *lm = &lldp_main;
-  vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  lldp_intf_t *n = lldp_get_intf (lm, hi->hw_if_index);
-  if (n)
-    {
-      if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
-	{
-	  /* FIXME - the packet sent here isn't send properly - need to find a
-	   * way to send the packet before interface goes down */
-	  lldp_send_ethernet (lm, n, 1);
-	  lldp_unschedule_intf (lm, n);
-	}
-    }
-  return 0;
-}
-
-VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (lldp_sw_interface_up_down);
-
-static clib_error_t *
-lldp_hw_interface_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
-{
-  lldp_main_t *lm = &lldp_main;
-  lldp_intf_t *n = lldp_get_intf (lm, hw_if_index);
-  if (n)
-    {
-      if (flags & VNET_HW_INTERFACE_FLAG_LINK_UP)
-	{
-	  lldp_schedule_intf (lm, n);
-	}
-    }
-  return 0;
-}
-
-VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (lldp_hw_interface_up_down);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lldp/lldp_node.h b/vnet/vnet/lldp/lldp_node.h
deleted file mode 100644
index 477ca7dc..00000000
--- a/vnet/vnet/lldp/lldp_node.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief LLDP global declarations
- */
-#ifndef __included_lldp_node_h__
-#define __included_lldp_node_h__
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vnet/snap/snap.h>
-#include <vppinfra/format.h>
-#include <vppinfra/hash.h>
-
-#include <vnet/lldp/lldp_protocol.h>
-
-typedef struct lldp_intf
-{
-  /* hw interface index */
-  u32 hw_if_index;
-
-  /* Timers */
-  f64 last_heard;
-  f64 last_sent;
-
-  /* Info received from peer */
-  u8 *chassis_id;
-  u8 *port_id;
-  u16 ttl;
-  lldp_port_id_subtype_t port_id_subtype;
-  lldp_chassis_id_subtype_t chassis_id_subtype;
-
-} lldp_intf_t;
-
-typedef struct
-{
-  /* pool of lldp-enabled interface context data */
-  lldp_intf_t *intfs;
-
-  /* rapidly find an interface by vlib hw interface index */
-  uword *intf_by_hw_if_index;
-
-  /* Background process node index */
-  u32 lldp_process_node_index;
-
-  /* interface idxs (into intfs pool) in the order of timing out */
-  u32 *intfs_timeouts;
-
-  /* index of the interface which will time out next */
-  u32 intfs_timeouts_idx;
-
-  /* packet template for sending out packets */
-  vlib_packet_template_t packet_template;
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-
-  /* system name advertised over LLDP (default is none) */
-  u8 *sys_name;
-
-  /* IEEE Std 802.1AB-2009:
-   * 9.2.5.6 msgTxHold
-   * This variable is used, as a multiplier of msgTxInterval, to determine the
-   * value of txTTL that is carried in LLDP frames transmitted by the LLDP
-   * agent. The recommended default value of msgTxHold is 4; this value can
-   * be changed by management to any value in the range 1 through 100.
-   */
-  u8 msg_tx_hold;
-
-  /* IEEE Std 802.1AB-2009:
-   * 9.2.5.7 msgTxInterval
-   * This variable defines the time interval in timer ticks between
-   * transmissions during normal transmission periods (i.e., txFast is zero).
-   * The recommended default value for msgTxInterval is 30 s; this value can
-   * be changed by management to any value in the range 1 through 3600.
-   */
-  u16 msg_tx_interval;
-} lldp_main_t;
-
-#define LLDP_MIN_TX_HOLD (1)
-#define LLDP_MAX_TX_HOLD (100)
-#define LLDP_MIN_TX_INTERVAL (1)
-#define LLDP_MAX_TX_INTERVAL (3600)
-
-extern lldp_main_t lldp_main;
-
-/* Packet counters */
-#define foreach_lldp_error(F)                     \
-    F(NONE, "good lldp packets (processed)")      \
-    F(CACHE_HIT, "good lldp packets (cache hit)") \
-    F(BAD_TLV, "lldp packets with bad TLVs")      \
-    F(DISABLED, "lldp packets received on disabled interfaces")
-
-typedef enum
-{
-#define F(sym, str) LLDP_ERROR_##sym,
-  foreach_lldp_error (F)
-#undef F
-    LLDP_N_ERROR,
-} lldp_error_t;
-
-/* lldp packet trace capture */
-typedef struct
-{
-  u32 len;
-  u8 data[400];
-} lldp_input_trace_t;
-
-enum
-{
-  LLDP_EVENT_RESCHEDULE = 1,
-} lldp_process_event_t;
-
-lldp_intf_t *lldp_get_intf (lldp_main_t * lm, u32 hw_if_index);
-lldp_intf_t *lldp_create_intf (lldp_main_t * lm, u32 hw_if_index);
-void lldp_delete_intf (lldp_main_t * lm, lldp_intf_t * n);
-lldp_error_t lldp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0);
-u8 *lldp_input_format_trace (u8 * s, va_list * args);
-void lldp_send_ethernet (lldp_main_t * lm, lldp_intf_t * n, int shutdown);
-void lldp_schedule_intf (lldp_main_t * lm, lldp_intf_t * n);
-void lldp_unschedule_intf (lldp_main_t * lm, lldp_intf_t * n);
-
-#endif /* __included_lldp_node_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lldp/lldp_output.c b/vnet/vnet/lldp/lldp_output.c
deleted file mode 100644
index 6cb26270..00000000
--- a/vnet/vnet/lldp/lldp_output.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief LLDP packet generation implementation
- */
-#include <vnet/lldp/lldp_node.h>
-
-static void
-lldp_add_chassis_id (const vnet_hw_interface_t * hw, u8 ** t0p)
-{
-  lldp_chassis_id_tlv_t *t = (lldp_chassis_id_tlv_t *) * t0p;
-
-  lldp_tlv_set_code ((lldp_tlv_t *) t, LLDP_TLV_NAME (chassis_id));
-  t->subtype = LLDP_CHASS_ID_SUBTYPE_NAME (mac_addr);
-
-  const size_t addr_len = 6;
-  clib_memcpy (&t->id, hw->hw_address, addr_len);
-  const size_t len =
-    STRUCT_SIZE_OF (lldp_chassis_id_tlv_t, subtype) + addr_len;
-  lldp_tlv_set_length ((lldp_tlv_t *) t, len);
-  *t0p += STRUCT_SIZE_OF (lldp_tlv_t, head) + len;
-}
-
-static void
-lldp_add_port_id (const vnet_hw_interface_t * hw, u8 ** t0p)
-{
-  lldp_port_id_tlv_t *t = (lldp_port_id_tlv_t *) * t0p;
-
-  lldp_tlv_set_code ((lldp_tlv_t *) t, LLDP_TLV_NAME (port_id));
-  t->subtype = LLDP_PORT_ID_SUBTYPE_NAME (intf_name);
-
-  const size_t name_len = vec_len (hw->name);
-  clib_memcpy (&t->id, hw->name, name_len);
-  const size_t len = STRUCT_SIZE_OF (lldp_port_id_tlv_t, subtype) + name_len;
-  lldp_tlv_set_length ((lldp_tlv_t *) t, len);
-  *t0p += STRUCT_SIZE_OF (lldp_tlv_t, head) + len;
-}
-
-static void
-lldp_add_ttl (const lldp_main_t * lm, u8 ** t0p, int shutdown)
-{
-  lldp_ttl_tlv_t *t = (lldp_ttl_tlv_t *) * t0p;
-  lldp_tlv_set_code ((lldp_tlv_t *) t, LLDP_TLV_NAME (ttl));
-  if (shutdown)
-    {
-      t->ttl = 0;
-    }
-  else
-    {
-      if ((size_t) lm->msg_tx_interval * lm->msg_tx_hold + 1 > (1 << 16) - 1)
-	{
-	  t->ttl = htons ((1 << 16) - 1);
-	}
-      else
-	{
-	  t->ttl = htons (lm->msg_tx_hold * lm->msg_tx_interval + 1);
-	}
-    }
-  const size_t len = STRUCT_SIZE_OF (lldp_ttl_tlv_t, ttl);
-  lldp_tlv_set_length ((lldp_tlv_t *) t, len);
-  *t0p += STRUCT_SIZE_OF (lldp_tlv_t, head) + len;
-}
-
-static void
-lldp_add_sys_name (const lldp_main_t * lm, u8 ** t0p)
-{
-  const size_t len = vec_len (lm->sys_name);
-  if (len)
-    {
-      lldp_tlv_t *t = (lldp_tlv_t *) * t0p;
-      lldp_tlv_set_code (t, LLDP_TLV_NAME (sys_name));
-      lldp_tlv_set_length (t, len);
-      clib_memcpy (t->v, lm->sys_name, len);
-      *t0p += STRUCT_SIZE_OF (lldp_tlv_t, head) + len;
-    }
-}
-
-static void
-lldp_add_pdu_end (u8 ** t0p)
-{
-  lldp_tlv_t *t = (lldp_tlv_t *) * t0p;
-  lldp_tlv_set_code (t, LLDP_TLV_NAME (pdu_end));
-  lldp_tlv_set_length (t, 0);
-  *t0p += STRUCT_SIZE_OF (lldp_tlv_t, head);
-}
-
-static void
-lldp_add_tlvs (lldp_main_t * lm, vnet_hw_interface_t * hw, u8 ** t0p,
-	       int shutdown)
-{
-  lldp_add_chassis_id (hw, t0p);
-  lldp_add_port_id (hw, t0p);
-  lldp_add_ttl (lm, t0p, shutdown);
-  lldp_add_sys_name (lm, t0p);
-  lldp_add_pdu_end (t0p);
-}
-
-/*
- * send a lldp pkt on an ethernet interface
- */
-void
-lldp_send_ethernet (lldp_main_t * lm, lldp_intf_t * n, int shutdown)
-{
-  u32 *to_next;
-  ethernet_header_t *h0;
-  vnet_hw_interface_t *hw;
-  u32 bi0;
-  vlib_buffer_t *b0;
-  u8 *t0;
-  vlib_frame_t *f;
-  vlib_main_t *vm = lm->vlib_main;
-  vnet_main_t *vnm = lm->vnet_main;
-
-  /*
-   * see lldp_template_init() to understand what's already painted
-   * into the buffer by the packet template mechanism
-   */
-  h0 = vlib_packet_template_get_packet (vm, &lm->packet_template, &bi0);
-
-  /* Add the interface's ethernet source address */
-  hw = vnet_get_hw_interface (vnm, n->hw_if_index);
-
-  clib_memcpy (h0->src_address, hw->hw_address, vec_len (hw->hw_address));
-
-  u8 *data = ((u8 *) h0) + sizeof (*h0);
-  t0 = data;
-
-  /* add TLVs */
-  lldp_add_tlvs (lm, hw, &t0, shutdown);
-
-  /* Set the outbound packet length */
-  b0 = vlib_get_buffer (vm, bi0);
-  b0->current_length = sizeof (*h0) + t0 - data;
-
-  /* And the outbound interface */
-  vnet_buffer (b0)->sw_if_index[VLIB_TX] = hw->sw_if_index;
-
-  /* And output the packet on the correct interface */
-  f = vlib_get_frame_to_node (vm, hw->output_node_index);
-  to_next = vlib_frame_vector_args (f);
-  to_next[0] = bi0;
-  f->n_vectors = 1;
-
-  vlib_put_frame_to_node (vm, hw->output_node_index, f);
-  n->last_sent = vlib_time_now (vm);
-}
-
-void
-lldp_delete_intf (lldp_main_t * lm, lldp_intf_t * n)
-{
-  if (n)
-    {
-      lldp_unschedule_intf (lm, n);
-      hash_unset (lm->intf_by_hw_if_index, n->hw_if_index);
-      vec_free (n->chassis_id);
-      vec_free (n->port_id);
-      pool_put (lm->intfs, n);
-    }
-}
-
-static clib_error_t *
-lldp_template_init (vlib_main_t * vm)
-{
-  lldp_main_t *lm = &lldp_main;
-
-  /* Create the ethernet lldp packet template */
-  {
-    ethernet_header_t h;
-
-    memset (&h, 0, sizeof (h));
-
-    /*
-     * Send to 01:80:C2:00:00:0E - propagation constrained to a single
-     * physical link - stopped by all type of bridge
-     */
-    h.dst_address[0] = 0x01;
-    h.dst_address[1] = 0x80;
-    h.dst_address[2] = 0xC2;
-    /* h.dst_address[3] = 0x00; (memset) */
-    /* h.dst_address[4] = 0x00; (memset) */
-    h.dst_address[5] = 0x0E;
-
-    /* leave src address blank (fill in at send time) */
-
-    h.type = htons (ETHERNET_TYPE_802_1_LLDP);
-
-    vlib_packet_template_init (vm, &lm->packet_template,
-			       /* data */ &h, sizeof (h),
-			       /* alloc chunk size */ 8, "lldp-ethernet");
-  }
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (lldp_template_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/lldp/lldp_protocol.h b/vnet/vnet/lldp/lldp_protocol.h
deleted file mode 100644
index e641b26e..00000000
--- a/vnet/vnet/lldp/lldp_protocol.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2011-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_lldp_protocol_h__
-#define __included_lldp_protocol_h__
-/**
- * @file
- * @brief LLDP protocol declarations
- */
-#include <vnet/srp/packet.h>
-
-/*
- * optional TLV codes.
- */
-#define foreach_lldp_optional_tlv_type(F) \
-  F (4, port_desc, "Port Description")    \
-  F (5, sys_name, "System name")          \
-  F (6, sys_desc, "System Description")   \
-  F (7, sys_caps, "System Capabilities")  \
-  F (8, mgmt_addr, "Management Address")  \
-  F (127, org_spec, "Organizationally Specific TLV")
-
-/*
- * all TLV codes.
- */
-#define foreach_lldp_tlv_type(F)  \
-  F (0, pdu_end, "End of LLDPDU") \
-  F (1, chassis_id, "Chassis ID") \
-  F (2, port_id, "Port ID")       \
-  F (3, ttl, "Time To Live")      \
-  foreach_lldp_optional_tlv_type (F)
-
-#define LLDP_TLV_NAME(t) LLDP_TLV_##t
-
-typedef enum
-{
-#define F(n, t, s) LLDP_TLV_NAME (t) = n,
-  foreach_lldp_tlv_type (F)
-#undef F
-} lldp_tlv_code_t;
-
-struct lldp_tlv_head
-{
-  u8 byte1;			/* contains TLV code in the upper 7 bits + MSB of length */
-  u8 byte2;			/* contains the lower bits of length */
-};
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  struct lldp_tlv_head head;
-  u8 v[0];
-}) lldp_tlv_t;
-/* *INDENT-ON* */
-
-lldp_tlv_code_t lldp_tlv_get_code (const lldp_tlv_t * tlv);
-void lldp_tlv_set_code (lldp_tlv_t * tlv, lldp_tlv_code_t code);
-u16 lldp_tlv_get_length (const lldp_tlv_t * tlv);
-void lldp_tlv_set_length (lldp_tlv_t * tlv, u16 length);
-
-#define foreach_chassis_id_subtype(F)      \
-  F (0, reserved, "Reserved")              \
-  F (1, chassis_comp, "Chassis component") \
-  F (2, intf_alias, "Interface alias")     \
-  F (3, port_comp, "Port component")       \
-  F (4, mac_addr, "MAC address")           \
-  F (5, net_addr, "Network address")       \
-  F (6, intf_name, "Interface name")       \
-  F (7, local, "Locally assigned")
-
-#define LLDP_CHASS_ID_SUBTYPE_NAME(t) LLDP_CHASS_ID_SUBTYPE_##t
-#define LLDP_MIN_CHASS_ID_LEN (1)
-#define LLDP_MAX_CHASS_ID_LEN (255)
-
-typedef enum
-{
-#define F(n, t, s) LLDP_CHASS_ID_SUBTYPE_NAME (t) = n,
-  foreach_chassis_id_subtype (F)
-#undef F
-} lldp_chassis_id_subtype_t;
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  struct lldp_tlv_head head;
-  u8 subtype;
-  u8 id[0];
-}) lldp_chassis_id_tlv_t;
-/* *INDENT-ON* */
-
-#define foreach_port_id_subtype(F)            \
-  F (0, reserved, "Reserved")                 \
-  F (1, intf_alias, "Interface alias")        \
-  F (2, port_comp, "Port component")          \
-  F (3, mac_addr, "MAC address")              \
-  F (4, net_addr, "Network address")          \
-  F (5, intf_name, "Interface name")          \
-  F (6, agent_circuit_id, "Agent circuit ID") \
-  F (7, local, "Locally assigned")
-
-#define LLDP_PORT_ID_SUBTYPE_NAME(t) LLDP_PORT_ID_SUBTYPE_##t
-#define LLDP_MIN_PORT_ID_LEN (1)
-#define LLDP_MAX_PORT_ID_LEN (255)
-
-typedef enum
-{
-#define F(n, t, s) LLDP_PORT_ID_SUBTYPE_NAME (t) = n,
-  foreach_port_id_subtype (F)
-#undef F
-} lldp_port_id_subtype_t;
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  struct lldp_tlv_head head;
-  u8 subtype;
-  u8 id[0];
-}) lldp_port_id_tlv_t;
-
-typedef CLIB_PACKED (struct {
-  struct lldp_tlv_head head;
-  u16 ttl;
-}) lldp_ttl_tlv_t;
-/* *INDENT-ON* */
-
-#endif /* __included_lldp_protocol_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/map/examples/gen-rules.py b/vnet/vnet/map/examples/gen-rules.py
deleted file mode 100755
index 7964aa9a..00000000
--- a/vnet/vnet/map/examples/gen-rules.py
+++ /dev/null
@@ -1,186 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import ipaddress
-import argparse
-import sys
-
-# map add domain ip4-pfx <pfx> ip6-pfx ::/0 ip6-src <ip6-src> ea-bits-len 0 psid-offset 6 psid-len 6
-# map add rule index <0> psid <psid> ip6-dst <ip6-dst>
-
-def_ip4_pfx = '192.0.2.0/24'
-def_ip6_pfx = '2001:db8::/32'
-def_ip6_src = '2001:db8::1'
-def_psid_offset = 6
-def_psid_len = 6
-def_ea_bits_len = 0
-
-parser = argparse.ArgumentParser(description='MAP VPP configuration generator')
-parser.add_argument('-t', action="store", dest="mapmode")
-parser.add_argument('-f', action="store", dest="format", default="vpp")
-parser.add_argument('--ip4-prefix', action="store", dest="ip4_pfx", default=def_ip4_pfx)
-parser.add_argument('--ip6-prefix', action="store", dest="ip6_pfx", default=def_ip6_pfx)
-parser.add_argument('--ip6-src', action="store", dest="ip6_src", default=def_ip6_src)
-parser.add_argument('--psid-len', action="store", dest="psid_len", default=def_psid_len)
-parser.add_argument('--psid-offset', action="store", dest="psid_offset", default=def_psid_offset)
-parser.add_argument('--ea-bits-len', action="store", dest="ea_bits_len", default=def_ea_bits_len)
-args = parser.parse_args()
-
-#
-# Print domain
-#
-def domain_print(i, ip4_pfx, ip6_pfx, ip6_src, eabits_len, psid_offset, psid_len):
-    if format == 'vpp':
-        print("map add domain ip4-pfx " + ip4_pfx + " ip6-pfx", ip6_pfx, "ip6-src " + ip6_src +
-              " ea-bits-len", eabits_len, "psid-offset", psid_offset, "psid-len", psid_len)
-    if format == 'confd':
-        print("vpp softwire softwire-instances softwire-instance", i, "br-ipv6 " + ip6_src +
-              " ipv6-prefix " + ip6_pfx + " ipv4-prefix " + ip4_pfx +
-              " ea-bits-len", eabits_len, "psid-offset", psid_offset, "psid-len", psid_len)
-    if format == 'xml':
-        print("<softwire-instance>")
-        print("<id>", i, "</id>");
-        print("  <br-ipv6>" + ip6_src + "</br-ipv6>")
-        print("  <ipv6-prefix>" + ip6_pfx + "</ipv6-prefix>")
-        print("  <ipv4-prefix>" + ip4_pfx + "</ipv4-prefix>")
-        print("  <ea-len>", eabits_len, "</ea-len>")
-        print("  <psid-len>", psid_len, "</psid-len>")
-        print("  <psid-offset>", psid_offset, "</psid-offset>")
-
-def domain_print_end():
-    if format == 'xml':
-        print("</softwire-instance>")
-
-def rule_print(i, psid, dst):
-    if format == 'vpp':
-        print("map add rule index", i, "psid", psid, "ip6-dst", dst)
-    if format == 'confd':
-        print("binding", psid, "ipv6-addr", dst)
-    if format == 'xml':
-        print("  <binding>")
-        print("    <psid>", psid, "</psid>")
-        print("    <ipv6-addr>", dst, "</ipv6-addr>")
-        print("  </binding>")
-
-#
-# Algorithmic mapping Shared IPv4 address
-#
-def algo(ip4_pfx_str, ip6_pfx_str, ip6_src_str, ea_bits_len, psid_offset, psid_len, ip6_src_ecmp = False):
-    domain_print(0, ip4_pfx_str, ip6_pfx_str, ip6_src_str, ea_bits_len, psid_offset, psid_len)
-    domain_print_end()
-
-#
-# 1:1 Full IPv4 address
-#
-def lw46(ip4_pfx_str, ip6_pfx_str, ip6_src_str, ea_bits_len, psid_offset, psid_len, ip6_src_ecmp = False):
-    ip4_pfx = ipaddress.ip_network(ip4_pfx_str)
-    ip6_src = ipaddress.ip_address(ip6_src_str)
-    ip6_dst = ipaddress.ip_network(ip6_pfx_str)
-    psid_len = 0
-    mod = ip4_pfx.num_addresses / 1024
-
-    for i in range(ip4_pfx.num_addresses):
-        domain_print(i, str(ip4_pfx[i]) + "/32", str(ip6_dst[i]) + "/128", str(ip6_src), 0, 0, 0)
-        domain_print_end()
-        if ip6_src_ecmp and not i % mod:
-            ip6_src = ip6_src + 1
-
-#
-# 1:1 Shared IPv4 address, shared BR (16) VPP CLI
-#
-def lw46_shared(ip4_pfx_str, ip6_pfx_str, ip6_src_str, ea_bits_len, psid_offset, psid_len, ip6_src_ecmp = False):
-    ip4_pfx = ipaddress.ip_network(ip4_pfx_str)
-    ip6_src = ipaddress.ip_address(ip6_src_str)
-    ip6_dst = ipaddress.ip_network(ip6_pfx_str)
-    mod = ip4_pfx.num_addresses / 1024
-
-    for i in range(ip4_pfx.num_addresses):
-        domain_print(i, str(ip4_pfx[i]) + "/32", "::/0", str(ip6_src), 0, 0, psid_len)
-        for psid in range(0x1 << int(psid_len)):
-            rule_print(i, psid, str(ip6_dst[(i * (0x1<<int(psid_len))) + psid]))
-        domain_print_end()
-        if ip6_src_ecmp and not i % mod:
-            ip6_src = ip6_src + 1
-
-
-#
-# 1:1 Shared IPv4 address, shared BR
-#
-def lw46_shared_b(ip4_pfx_str, ip6_pfx_str, ip6_src_str, ea_bits_len, psid_offset, psid_len, ip6_src_ecmp = False):
-    ip4_pfx = ipaddress.ip_network(ip4_pfx_str)
-    ip6_src = ipaddress.ip_address(ip6_src_str)
-    ip6_dst = list(ipaddress.ip_network(ip6_pfx_str).subnets(new_prefix=56))
-    mod = ip4_pfx.num_addresses / 1024
-
-    for i in range(ip4_pfx.num_addresses):
-        domain_print(i, str(ip4_pfx[i]) + "/32", "::/0", str(ip6_src), 0, 0, psid_len)
-        for psid in range(0x1 << psid_len):
-            enduserprefix = list(ip6_dst.pop(0).subnets(new_prefix=64))[255-1]
-            rule_print(i, psid, enduserprefix[(i * (0x1<<psid_len)) + psid])
-        domain_print_end()
-        if ip6_src_ecmp and not i % mod:
-            ip6_src = ip6_src + 1
-
-
-def xml_header_print():
-    print('''
-<?xml version="1.0" encoding="UTF-8"?>
-    <hello xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <capabilities>
-    <capability>urn:ietf:params:netconf:base:1.0</capability>
-    </capabilities>
-    </hello>
-]]>]]>
-
-<?xml version="1.0" encoding="UTF-8"?>
-    <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"  message-id="1">
-    <edit-config>
-    <target>
-    <candidate/>
-    </target>
-    <config>
-
-    <vpp xmlns="http://www.cisco.com/yang/cisco-vpp">
- <softwire>
- <softwire-instances>
-
-    ''')
-
-def xml_footer_print():
-    print('''
-</softwire-instances>
-</softwire>
-</vpp>
-    </config>
-    </edit-config>
-    </rpc>
-
-]]>]]>
-
-<?xml version="1.0" encoding="UTF-8"?>
-    <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="2">
-    <close-session/>
-    </rpc>
-
-]]>]]>
-    ''')
-
-
-format = args.format
-if format == 'xml':
-    xml_header_print()
-globals()[args.mapmode](args.ip4_pfx, args.ip6_pfx, args.ip6_src, args.ea_bits_len, args.psid_offset, args.psid_len)
-if format == 'xml':
-    xml_footer_print()
diff --git a/vnet/vnet/map/examples/health_check.c b/vnet/vnet/map/examples/health_check.c
deleted file mode 100644
index 5f0d85fe..00000000
--- a/vnet/vnet/map/examples/health_check.c
+++ /dev/null
@@ -1,109 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <arpa/inet.h>
-#include <net/if.h>
-#include <stdbool.h>
-#include <errno.h>
-
-static void
-usage (void) {
-  fprintf(stderr,
-	  "Usage: health_check"
-	  " -d debug"
-	  " -I interface"
-	  "\n");
-  exit(2);
-}
-
-int
-main (int argc, char **argv)
-{
-  int sd, ch;
-  uint8_t *opt, *pkt;
-  struct ifreq ifr;
-  char *interface = NULL;
-  bool debug = false;
-
-  while ((ch = getopt(argc, argv, "h?" "I:" "d")) != EOF) {
-    switch(ch) {
-    case 'I':
-      interface = optarg;
-      break;
-    case 'd':
-      debug = true;
-      break;
-    default:
-      usage();
-      break;
-    }
-  }
-
-  argc -= optind;
-  argv += optind;
-
-  if (!interface)
-    usage();
-
-  /* Request a socket descriptor sd. */
-  if ((sd = socket (AF_INET6, SOCK_RAW, IPPROTO_IPIP)) < 0) {
-    perror ("Failed to get socket descriptor ");
-    exit (EXIT_FAILURE);
-  }
-
-  memset(&ifr, 0, sizeof(ifr));
-  snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", interface);
-
-  /* Bind socket to interface of this node. */
-  if (setsockopt (sd, SOL_SOCKET, SO_BINDTODEVICE, (void *) &ifr, sizeof (ifr)) < 0) {
-    perror ("SO_BINDTODEVICE failed");
-    exit (EXIT_FAILURE);
-  }
-  if (debug) printf("Binding to interface %s\n", interface);
-
-  while (1) {
-    struct sockaddr_in6 src_addr;
-    socklen_t addrlen = sizeof(src_addr);
-    char source[INET6_ADDRSTRLEN+1];
-    int len;
-    uint8_t inpack[IP_MAXPACKET];
-
-    if ((len = recvfrom(sd, inpack, sizeof(inpack), 0, (struct sockaddr *)&src_addr, &addrlen)) < 0) {
-      perror("recvfrom failed ");
-    }
-    if (inet_ntop(AF_INET6, &src_addr.sin6_addr, source, INET6_ADDRSTRLEN) == NULL) {
-      perror("inet_ntop() failed.");
-      exit(EXIT_FAILURE);
-    }
-
-    /* Reply */
-    struct iphdr *ip = (struct iphdr *)inpack;
-    uint32_t saddr;
-    struct icmphdr *icmp;
-
-    saddr = ip->saddr;
-    ip->saddr = ip->daddr;
-    ip->daddr = saddr;
-
-    switch (ip->protocol) {
-    case 1:
-      if (debug) printf ("ICMP Echo request from %s\n", source);
-      icmp = (struct icmphdr *)&ip[1];
-      icmp->type = ICMP_ECHOREPLY;
-      break;
-    default:
-      fprintf(stderr, "Unsupported protocol %d", ip->protocol);
-    }
-    if (len = sendto(sd, inpack, len, 0, (struct sockaddr *)&src_addr, addrlen) < 0) {
-      perror("sendto failed ");
-    }
-  }
-
-  close (sd);
-
-  return (EXIT_SUCCESS);
-}
diff --git a/vnet/vnet/map/examples/test_map.py b/vnet/vnet/map/examples/test_map.py
deleted file mode 100755
index 21388d49..00000000
--- a/vnet/vnet/map/examples/test_map.py
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/env python
-
-import time,argparse,sys,cmd, unittest
-from ipaddress import *
-
-parser = argparse.ArgumentParser(description='VPP MAP test')
-parser.add_argument('-i', nargs='*', action="store", dest="inputdir")
-args = parser.parse_args()
-
-for dir in args.inputdir:
-    sys.path.append(dir)
-from vpp_papi import *
-
-#
-# 1:1 Shared IPv4 address, shared BR (16) VPP CLI
-#
-def lw46_shared(ip4_pfx_str, ip6_pfx_str, ip6_src_str, ea_bits_len, psid_offset, psid_len, ip6_src_ecmp = False):
-    ip4_pfx = ip_network(ip4_pfx_str)
-    ip6_src = ip_address(ip6_src_str)
-    ip6_dst = ip_network(ip6_pfx_str)
-    ip6_nul = IPv6Address(u'0::0')
-    mod = ip4_pfx.num_addresses / 1024
-
-    for i in range(ip4_pfx.num_addresses):
-        a = time.clock()
-        t = map_add_domain(0, ip6_nul.packed, ip4_pfx[i].packed, ip6_src.packed, 0, 32, 128, ea_bits_len, psid_offset, psid_len, 0, 0)
-        #print "Return from map_add_domain", t
-        if t == None:
-            print "map_add_domain failed"
-            continue
-        if t.retval != 0:
-            print "map_add_domain failed", t
-            continue
-        for psid in range(0x1 << int(psid_len)):
-            r = map_add_del_rule(0, t.index, 1, (ip6_dst[(i * (0x1<<int(psid_len))) + psid]).packed, psid)
-            #print "Return from map_add_del_rule", r
-
-        if ip6_src_ecmp and not i % mod:
-            ip6_src = ip6_src + 1
-
-        print "Running time:", time.clock() - a
-
-class TestMAP(unittest.TestCase):
-    '''
-    def test_delete_all(self):
-        t = map_domain_dump(0)
-        self.assertNotEqual(t, None)
-        print "Number of domains configured: ", len(t)
-        for d in t:
-            ts = map_del_domain(0, d.domainindex)
-            self.assertNotEqual(ts, None)
-        t = map_domain_dump(0)
-        self.assertNotEqual(t, None)
-        print "Number of domains configured: ", len(t)
-        self.assertEqual(len(t), 0)
-
-    '''
-
-    def test_a_million_rules(self):
-        ip4_pfx = u'192.0.2.0/24'
-        ip6_pfx = u'2001:db8::/32'
-        ip6_src = u'2001:db8::1'
-        psid_offset = 6
-        psid_len = 6
-        ea_bits_len = 0
-        lw46_shared(ip4_pfx, ip6_pfx, ip6_src, ea_bits_len, psid_offset, psid_len)
-
-#
-# RX thread, that should sit on blocking vpe_api_read()
-
-# 
-
-
-#
-#
-#
-import threading
-class RXThread (threading.Thread):
-    def __init__(self):
-        threading.Thread.__init__(self)
-
-    def run(self):
-        print "Starting "
-        i = 0
-        while True:
-            msg = vpe_api_read()
-            if msg:
-                #print msg
-                id = unpack('>H', msg[0:2])
-                size = unpack('>H', msg[2:4])
-                print "Received", id, "of size", size
-                i += 1
-                #del msg
-                continue
-
-            #time.sleep(0.001)
-        return
-
-# Create RX thread
-rxthread = RXThread()
-rxthread.setDaemon(True)
-        
-print "Connect", connect_to_vpe("client124")
-import timeit
-rxthread.start()
-print "After thread started"
-
-#pneum_kill_thread()
-print "After thread killed"
-
-#t = show_version(0)
-#print "Result from show version", t
-
-print timeit.timeit('t = show_version(0)', number=1000, setup="from __main__ import show_version")
-time.sleep(10)
-#print timeit.timeit('control_ping(0)', number=10, setup="from __main__ import control_ping")
-
-
-disconnect_from_vpe()
-sys.exit()
-
-
-print t.program, t.version,t.builddate,t.builddirectory
-
-'''
-
-t = map_domain_dump(0)
-if not t:
-    print('show map domain failed')
-
-for d in t:
-    print("IP6 prefix:",str(IPv6Address(d.ip6prefix)))
-    print( "IP4 prefix:",str(IPv4Address(d.ip4prefix)))
-'''
-
-suite = unittest.TestLoader().loadTestsFromTestCase(TestMAP)
-unittest.TextTestRunner(verbosity=2).run(suite)
-
-disconnect_from_vpe()
-
-
diff --git a/vnet/vnet/map/gen-rules.py b/vnet/vnet/map/gen-rules.py
deleted file mode 100755
index 533a8e23..00000000
--- a/vnet/vnet/map/gen-rules.py
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-import ipaddress
-import argparse
-import sys
-
-# map add domain ip4-pfx <pfx> ip6-pfx ::/0 ip6-src <ip6-src> ea-bits-len 0 psid-offset 6 psid-len 6
-# map add rule index <0> psid <psid> ip6-dst <ip6-dst>
-
-parser = argparse.ArgumentParser(description='MAP VPP configuration generator')
-parser.add_argument('-t', action="store", dest="mapmode")
-args = parser.parse_args()
-
-#
-# 1:1 Shared IPv4 address, shared BR
-#
-def shared11br():
-    ip4_pfx = ipaddress.ip_network('20.0.0.0/16')
-    ip6_dst = ipaddress.ip_network('bbbb::/32')
-    psid_len = 6
-    for i in range(ip4_pfx.num_addresses):
-        print("map add domain ip4-pfx " + str(ip4_pfx[i]) +  "/32 ip6-pfx ::/0 ip6-shared-src cccc:bbbb::1",
-              "ea-bits-len 0 psid-offset 6 psid-len", psid_len)
-        for psid in range(0x1 << psid_len):
-            print("map add rule index", i, "psid", psid, "ip6-dst", ip6_dst[(i * (0x1<<psid_len)) + psid])
-
-
-#
-# 1:1 Shared IPv4 address
-#
-def shared11():
-    ip4_pfx = ipaddress.ip_network('20.0.0.0/16')
-    ip6_src = ipaddress.ip_network('cccc:bbbb::/64')
-    ip6_dst = ipaddress.ip_network('bbbb::/32')
-    psid_len = 6
-    for i in range(ip4_pfx.num_addresses):
-        print("map add domain ip4-pfx " + str(ip4_pfx[i]) +  "/32 ip6-pfx ::/0 ip6-src", ip6_src[i],
-              "ea-bits-len 0 psid-offset 6 psid-len", psid_len)
-        for psid in range(0x1 << psid_len):
-            print("map add rule index", i, "psid", psid, "ip6-dst", ip6_dst[(i * (0x1<<psid_len)) + psid])
-
-#
-# 1:1 Shared IPv4 address small
-#
-def smallshared11():
-    ip4_pfx = ipaddress.ip_network('20.0.0.0/24')
-    ip6_src = ipaddress.ip_network('cccc:bbbb::/64')
-    ip6_dst = ipaddress.ip_network('bbbb::/32')
-    psid_len = 6
-    for i in range(ip4_pfx.num_addresses):
-        print("map add domain ip4-pfx " + str(ip4_pfx[i]) +  "/32 ip6-pfx ::/0 ip6-src", ip6_src[i],
-              "ea-bits-len 0 psid-offset 6 psid-len", psid_len)
-        for psid in range(0x1 << psid_len):
-            print("map add rule index", i, "psid", psid, "ip6-dst", ip6_dst[(i * (0x1<<psid_len)) + psid])
-
-#
-# 1:1 Full IPv4 address
-#
-def full11():
-    ip4_pfx = ipaddress.ip_network('20.0.0.0/16')
-    ip6_src = ipaddress.ip_network('cccc:bbbb::/64')
-    ip6_dst = ipaddress.ip_network('bbbb::/32')
-    psid_len = 0
-    for i in range(ip4_pfx.num_addresses):
-        print("map add domain ip4-pfx " + str(ip4_pfx[i]) +  "/32 ip6-pfx " + str(ip6_dst[i]) + "/128 ip6-src", ip6_src[i],
-              "ea-bits-len 0 psid-offset 0 psid-len 0")
-def full11br():
-    ip4_pfx = ipaddress.ip_network('20.0.0.0/16')
-    ip6_dst = ipaddress.ip_network('bbbb::/32')
-    psid_len = 0
-    for i in range(ip4_pfx.num_addresses):
-        print("map add domain ip4-pfx " + str(ip4_pfx[i]) +  "/32 ip6-pfx " + str(ip6_dst[i]) + "/128 ip6-shared-src cccc:bbbb::1",
-              "ea-bits-len 0 psid-offset 0 psid-len 0")
-
-#
-# Algorithmic mapping Shared IPv4 address
-#
-def algo():
-    print("map add domain ip4-pfx 20.0.0.0/24 ip6-pfx bbbb::/32 ip6-src cccc:bbbb::1 ea-bits-len 16 psid-offset 6 psid-len 8")
-    print("map add domain ip4-pfx 20.0.1.0/24 ip6-pfx bbbb:1::/32 ip6-src cccc:bbbb::2 ea-bits-len 8 psid-offset 0 psid-len 0")
-
-#
-# IP4 forwarding
-#
-def ip4():
-    ip4_pfx = ipaddress.ip_network('20.0.0.0/16')
-    for i in range(ip4_pfx.num_addresses):
-        print("ip route add " + str(ip4_pfx[i]) +  "/32 via 172.16.0.2")
-
-
-globals()[args.mapmode]()
-
-
diff --git a/vnet/vnet/map/ip4_map.c b/vnet/vnet/map/ip4_map.c
deleted file mode 100644
index 9fd10f62..00000000
--- a/vnet/vnet/map/ip4_map.c
+++ /dev/null
@@ -1,813 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * Defines used for testing various optimisation schemes
- */
-#define MAP_ENCAP_DUAL 0
-
-#include "map.h"
-#include "../ip/ip_frag.h"
-
-vlib_node_registration_t ip4_map_reass_node;
-
-enum ip4_map_next_e
-{
-  IP4_MAP_NEXT_IP6_LOOKUP,
-#ifdef MAP_SKIP_IP6_LOOKUP
-  IP4_MAP_NEXT_IP6_REWRITE,
-#endif
-  IP4_MAP_NEXT_IP4_FRAGMENT,
-  IP4_MAP_NEXT_IP6_FRAGMENT,
-  IP4_MAP_NEXT_REASS,
-  IP4_MAP_NEXT_ICMP_ERROR,
-  IP4_MAP_NEXT_DROP,
-  IP4_MAP_N_NEXT,
-};
-
-enum ip4_map_reass_next_t
-{
-  IP4_MAP_REASS_NEXT_IP6_LOOKUP,
-  IP4_MAP_REASS_NEXT_IP4_FRAGMENT,
-  IP4_MAP_REASS_NEXT_DROP,
-  IP4_MAP_REASS_N_NEXT,
-};
-
-typedef struct
-{
-  u32 map_domain_index;
-  u16 port;
-  u8 cached;
-} map_ip4_map_reass_trace_t;
-
-u8 *
-format_ip4_map_reass_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  map_ip4_map_reass_trace_t *t = va_arg (*args, map_ip4_map_reass_trace_t *);
-  return format (s, "MAP domain index: %d L4 port: %u Status: %s",
-		 t->map_domain_index, t->port,
-		 t->cached ? "cached" : "forwarded");
-}
-
-/*
- * ip4_map_get_port
- */
-u16
-ip4_map_get_port (ip4_header_t * ip, map_dir_e dir)
-{
-  /* Find port information */
-  if (PREDICT_TRUE ((ip->protocol == IP_PROTOCOL_TCP) ||
-		    (ip->protocol == IP_PROTOCOL_UDP)))
-    {
-      udp_header_t *udp = (void *) (ip + 1);
-      return (dir == MAP_SENDER ? udp->src_port : udp->dst_port);
-    }
-  else if (ip->protocol == IP_PROTOCOL_ICMP)
-    {
-      /*
-       * 1) ICMP Echo request or Echo reply
-       * 2) ICMP Error with inner packet being UDP or TCP
-       * 3) ICMP Error with inner packet being ICMP Echo request or Echo reply
-       */
-      icmp46_header_t *icmp = (void *) (ip + 1);
-      if (icmp->type == ICMP4_echo_request || icmp->type == ICMP4_echo_reply)
-	{
-	  return *((u16 *) (icmp + 1));
-	}
-      else if (clib_net_to_host_u16 (ip->length) >= 56)
-	{			// IP + ICMP + IP + L4 header
-	  ip4_header_t *icmp_ip = (ip4_header_t *) (icmp + 2);
-	  if (PREDICT_TRUE ((icmp_ip->protocol == IP_PROTOCOL_TCP) ||
-			    (icmp_ip->protocol == IP_PROTOCOL_UDP)))
-	    {
-	      udp_header_t *udp = (void *) (icmp_ip + 1);
-	      return (dir == MAP_SENDER ? udp->dst_port : udp->src_port);
-	    }
-	  else if (icmp_ip->protocol == IP_PROTOCOL_ICMP)
-	    {
-	      icmp46_header_t *inner_icmp = (void *) (icmp_ip + 1);
-	      if (inner_icmp->type == ICMP4_echo_request
-		  || inner_icmp->type == ICMP4_echo_reply)
-		return (*((u16 *) (inner_icmp + 1)));
-	    }
-	}
-    }
-  return (0);
-}
-
-static_always_inline u16
-ip4_map_port_and_security_check (map_domain_t * d, ip4_header_t * ip,
-				 u32 * next, u8 * error)
-{
-  u16 port = 0;
-
-  if (d->psid_length > 0)
-    {
-      if (ip4_get_fragment_offset (ip) == 0)
-	{
-	  if (PREDICT_FALSE
-	      ((ip->ip_version_and_header_length != 0x45)
-	       || clib_host_to_net_u16 (ip->length) < 28))
-	    {
-	      return 0;
-	    }
-	  port = ip4_map_get_port (ip, MAP_RECEIVER);
-	  if (port)
-	    {
-	      /* Verify that port is not among the well-known ports */
-	      if ((d->psid_offset > 0)
-		  && (clib_net_to_host_u16 (port) <
-		      (0x1 << (16 - d->psid_offset))))
-		{
-		  *error = MAP_ERROR_ENCAP_SEC_CHECK;
-		}
-	      else
-		{
-		  if (ip4_get_fragment_more (ip))
-		    *next = IP4_MAP_NEXT_REASS;
-		  return (port);
-		}
-	    }
-	  else
-	    {
-	      *error = MAP_ERROR_BAD_PROTOCOL;
-	    }
-	}
-      else
-	{
-	  *next = IP4_MAP_NEXT_REASS;
-	}
-    }
-  return (0);
-}
-
-/*
- * ip4_map_vtcfl
- */
-static_always_inline u32
-ip4_map_vtcfl (ip4_header_t * ip4, vlib_buffer_t * p)
-{
-  map_main_t *mm = &map_main;
-  u8 tc = mm->tc_copy ? ip4->tos : mm->tc;
-  u32 vtcfl = 0x6 << 28;
-  vtcfl |= tc << 20;
-  vtcfl |= vnet_buffer (p)->ip.flow_hash & 0x000fffff;
-
-  return (clib_host_to_net_u32 (vtcfl));
-}
-
-static_always_inline bool
-ip4_map_ip6_lookup_bypass (vlib_buffer_t * p0, ip4_header_t * ip)
-{
-#ifdef MAP_SKIP_IP6_LOOKUP
-  map_main_t *mm = &map_main;
-  u32 adj_index0 = mm->adj6_index;
-  if (adj_index0 > 0)
-    {
-      ip_lookup_main_t *lm6 = &ip6_main.lookup_main;
-      ip_adjacency_t *adj = ip_get_adjacency (lm6, mm->adj6_index);
-      if (adj->n_adj > 1)
-	{
-	  u32 hash_c0 = ip4_compute_flow_hash (ip, IP_FLOW_HASH_DEFAULT);
-	  adj_index0 += (hash_c0 & (adj->n_adj - 1));
-	}
-      vnet_buffer (p0)->ip.adj_index[VLIB_TX] = adj_index0;
-      return (true);
-    }
-#endif
-  return (false);
-}
-
-/*
- * ip4_map_ttl
- */
-static inline void
-ip4_map_decrement_ttl (ip4_header_t * ip, u8 * error)
-{
-  i32 ttl = ip->ttl;
-
-  /* Input node should have reject packets with ttl 0. */
-  ASSERT (ip->ttl > 0);
-
-  u32 checksum = ip->checksum + clib_host_to_net_u16 (0x0100);
-  checksum += checksum >= 0xffff;
-  ip->checksum = checksum;
-  ttl -= 1;
-  ip->ttl = ttl;
-  *error = ttl <= 0 ? IP4_ERROR_TIME_EXPIRED : *error;
-
-  /* Verify checksum. */
-  ASSERT (ip->checksum == ip4_header_checksum (ip));
-}
-
-static u32
-ip4_map_fragment (vlib_buffer_t * b, u16 mtu, bool df, u8 * error)
-{
-  map_main_t *mm = &map_main;
-
-  if (mm->frag_inner)
-    {
-      ip_frag_set_vnet_buffer (b, sizeof (ip6_header_t), mtu,
-			       IP4_FRAG_NEXT_IP6_LOOKUP,
-			       IP_FRAG_FLAG_IP6_HEADER);
-      return (IP4_MAP_NEXT_IP4_FRAGMENT);
-    }
-  else
-    {
-      if (df && !mm->frag_ignore_df)
-	{
-	  icmp4_error_set_vnet_buffer (b, ICMP4_destination_unreachable,
-				       ICMP4_destination_unreachable_fragmentation_needed_and_dont_fragment_set,
-				       mtu);
-	  vlib_buffer_advance (b, sizeof (ip6_header_t));
-	  *error = MAP_ERROR_DF_SET;
-	  return (IP4_MAP_NEXT_ICMP_ERROR);
-	}
-      ip_frag_set_vnet_buffer (b, 0, mtu, IP6_FRAG_NEXT_IP6_LOOKUP,
-			       IP_FRAG_FLAG_IP6_HEADER);
-      return (IP4_MAP_NEXT_IP6_FRAGMENT);
-    }
-}
-
-/*
- * ip4_map
- */
-static uword
-ip4_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip4_map_node.index);
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  map_main_t *mm = &map_main;
-  vlib_combined_counter_main_t *cm = mm->domain_counters;
-  u32 cpu_index = os_get_cpu_number ();
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /* Dual loop */
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 pi0, pi1;
-	  vlib_buffer_t *p0, *p1;
-	  map_domain_t *d0, *d1;
-	  u8 error0 = MAP_ERROR_NONE, error1 = MAP_ERROR_NONE;
-	  ip4_header_t *ip40, *ip41;
-	  u16 port0 = 0, port1 = 0;
-	  ip6_header_t *ip6h0, *ip6h1;
-	  u32 map_domain_index0 = ~0, map_domain_index1 = ~0;
-	  u32 next0 = IP4_MAP_NEXT_IP6_LOOKUP, next1 =
-	    IP4_MAP_NEXT_IP6_LOOKUP;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, STORE);
-	    vlib_prefetch_buffer_header (p3, STORE);
-	    /* IPv4 + 8 = 28. possibly plus -40 */
-	    CLIB_PREFETCH (p2->data - 40, 68, STORE);
-	    CLIB_PREFETCH (p3->data - 40, 68, STORE);
-	  }
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-	  ip40 = vlib_buffer_get_current (p0);
-	  ip41 = vlib_buffer_get_current (p1);
-	  d0 =
-	    ip4_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-				&map_domain_index0);
-	  d1 =
-	    ip4_map_get_domain (vnet_buffer (p1)->ip.adj_index[VLIB_TX],
-				&map_domain_index1);
-	  ASSERT (d0);
-	  ASSERT (d1);
-
-	  /*
-	   * Shared IPv4 address
-	   */
-	  port0 = ip4_map_port_and_security_check (d0, ip40, &next0, &error0);
-	  port1 = ip4_map_port_and_security_check (d1, ip41, &next1, &error1);
-
-	  /* Decrement IPv4 TTL */
-	  ip4_map_decrement_ttl (ip40, &error0);
-	  ip4_map_decrement_ttl (ip41, &error1);
-	  bool df0 =
-	    ip40->flags_and_fragment_offset &
-	    clib_host_to_net_u16 (IP4_HEADER_FLAG_DONT_FRAGMENT);
-	  bool df1 =
-	    ip41->flags_and_fragment_offset &
-	    clib_host_to_net_u16 (IP4_HEADER_FLAG_DONT_FRAGMENT);
-
-	  /* MAP calc */
-	  u32 da40 = clib_net_to_host_u32 (ip40->dst_address.as_u32);
-	  u32 da41 = clib_net_to_host_u32 (ip41->dst_address.as_u32);
-	  u16 dp40 = clib_net_to_host_u16 (port0);
-	  u16 dp41 = clib_net_to_host_u16 (port1);
-	  u64 dal60 = map_get_pfx (d0, da40, dp40);
-	  u64 dal61 = map_get_pfx (d1, da41, dp41);
-	  u64 dar60 = map_get_sfx (d0, da40, dp40);
-	  u64 dar61 = map_get_sfx (d1, da41, dp41);
-	  if (dal60 == 0 && dar60 == 0 && error0 == MAP_ERROR_NONE
-	      && next0 != IP4_MAP_NEXT_REASS)
-	    error0 = MAP_ERROR_NO_BINDING;
-	  if (dal61 == 0 && dar61 == 0 && error1 == MAP_ERROR_NONE
-	      && next1 != IP4_MAP_NEXT_REASS)
-	    error1 = MAP_ERROR_NO_BINDING;
-
-	  /* construct ipv6 header */
-	  vlib_buffer_advance (p0, -sizeof (ip6_header_t));
-	  vlib_buffer_advance (p1, -sizeof (ip6_header_t));
-	  ip6h0 = vlib_buffer_get_current (p0);
-	  ip6h1 = vlib_buffer_get_current (p1);
-	  vnet_buffer (p0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-	  vnet_buffer (p1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-
-	  ip6h0->ip_version_traffic_class_and_flow_label =
-	    ip4_map_vtcfl (ip40, p0);
-	  ip6h1->ip_version_traffic_class_and_flow_label =
-	    ip4_map_vtcfl (ip41, p1);
-	  ip6h0->payload_length = ip40->length;
-	  ip6h1->payload_length = ip41->length;
-	  ip6h0->protocol = IP_PROTOCOL_IP_IN_IP;
-	  ip6h1->protocol = IP_PROTOCOL_IP_IN_IP;
-	  ip6h0->hop_limit = 0x40;
-	  ip6h1->hop_limit = 0x40;
-	  ip6h0->src_address = d0->ip6_src;
-	  ip6h1->src_address = d1->ip6_src;
-	  ip6h0->dst_address.as_u64[0] = clib_host_to_net_u64 (dal60);
-	  ip6h0->dst_address.as_u64[1] = clib_host_to_net_u64 (dar60);
-	  ip6h1->dst_address.as_u64[0] = clib_host_to_net_u64 (dal61);
-	  ip6h1->dst_address.as_u64[1] = clib_host_to_net_u64 (dar61);
-
-	  /*
-	   * Determine next node. Can be one of:
-	   * ip6-lookup, ip6-rewrite, ip4-fragment, ip4-virtreass, error-drop
-	   */
-	  if (PREDICT_TRUE (error0 == MAP_ERROR_NONE))
-	    {
-	      if (PREDICT_FALSE
-		  (d0->mtu
-		   && (clib_net_to_host_u16 (ip6h0->payload_length) +
-		       sizeof (*ip6h0) > d0->mtu)))
-		{
-		  next0 = ip4_map_fragment (p0, d0->mtu, df0, &error0);
-		}
-	      else
-		{
-		  next0 =
-		    ip4_map_ip6_lookup_bypass (p0,
-					       ip40) ?
-		    IP4_MAP_NEXT_IP6_REWRITE : next0;
-		  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
-						   cpu_index,
-						   map_domain_index0, 1,
-						   clib_net_to_host_u16
-						   (ip6h0->payload_length) +
-						   40);
-		}
-	    }
-	  else
-	    {
-	      next0 = IP4_MAP_NEXT_DROP;
-	    }
-
-	  /*
-	   * Determine next node. Can be one of:
-	   * ip6-lookup, ip6-rewrite, ip4-fragment, ip4-virtreass, error-drop
-	   */
-	  if (PREDICT_TRUE (error1 == MAP_ERROR_NONE))
-	    {
-	      if (PREDICT_FALSE
-		  (d1->mtu
-		   && (clib_net_to_host_u16 (ip6h1->payload_length) +
-		       sizeof (*ip6h1) > d1->mtu)))
-		{
-		  next1 = ip4_map_fragment (p1, d1->mtu, df1, &error1);
-		}
-	      else
-		{
-		  next1 =
-		    ip4_map_ip6_lookup_bypass (p1,
-					       ip41) ?
-		    IP4_MAP_NEXT_IP6_REWRITE : next1;
-		  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
-						   cpu_index,
-						   map_domain_index1, 1,
-						   clib_net_to_host_u16
-						   (ip6h1->payload_length) +
-						   40);
-		}
-	    }
-	  else
-	    {
-	      next1 = IP4_MAP_NEXT_DROP;
-	    }
-
-	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      map_trace_t *tr = vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->map_domain_index = map_domain_index0;
-	      tr->port = port0;
-	    }
-	  if (PREDICT_FALSE (p1->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      map_trace_t *tr = vlib_add_trace (vm, node, p1, sizeof (*tr));
-	      tr->map_domain_index = map_domain_index1;
-	      tr->port = port1;
-	    }
-
-	  p0->error = error_node->errors[error0];
-	  p1->error = error_node->errors[error1];
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
-					   n_left_to_next, pi0, pi1, next0,
-					   next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  map_domain_t *d0;
-	  u8 error0 = MAP_ERROR_NONE;
-	  ip4_header_t *ip40;
-	  u16 port0 = 0;
-	  ip6_header_t *ip6h0;
-	  u32 next0 = IP4_MAP_NEXT_IP6_LOOKUP;
-	  u32 map_domain_index0 = ~0;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip40 = vlib_buffer_get_current (p0);
-	  d0 =
-	    ip4_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-				&map_domain_index0);
-	  ASSERT (d0);
-
-	  /*
-	   * Shared IPv4 address
-	   */
-	  port0 = ip4_map_port_and_security_check (d0, ip40, &next0, &error0);
-
-	  /* Decrement IPv4 TTL */
-	  ip4_map_decrement_ttl (ip40, &error0);
-	  bool df0 =
-	    ip40->flags_and_fragment_offset &
-	    clib_host_to_net_u16 (IP4_HEADER_FLAG_DONT_FRAGMENT);
-
-	  /* MAP calc */
-	  u32 da40 = clib_net_to_host_u32 (ip40->dst_address.as_u32);
-	  u16 dp40 = clib_net_to_host_u16 (port0);
-	  u64 dal60 = map_get_pfx (d0, da40, dp40);
-	  u64 dar60 = map_get_sfx (d0, da40, dp40);
-	  if (dal60 == 0 && dar60 == 0 && error0 == MAP_ERROR_NONE
-	      && next0 != IP4_MAP_NEXT_REASS)
-	    error0 = MAP_ERROR_NO_BINDING;
-
-	  /* construct ipv6 header */
-	  vlib_buffer_advance (p0, -(sizeof (ip6_header_t)));
-	  ip6h0 = vlib_buffer_get_current (p0);
-	  vnet_buffer (p0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-
-	  ip6h0->ip_version_traffic_class_and_flow_label =
-	    ip4_map_vtcfl (ip40, p0);
-	  ip6h0->payload_length = ip40->length;
-	  ip6h0->protocol = IP_PROTOCOL_IP_IN_IP;
-	  ip6h0->hop_limit = 0x40;
-	  ip6h0->src_address = d0->ip6_src;
-	  ip6h0->dst_address.as_u64[0] = clib_host_to_net_u64 (dal60);
-	  ip6h0->dst_address.as_u64[1] = clib_host_to_net_u64 (dar60);
-
-	  /*
-	   * Determine next node. Can be one of:
-	   * ip6-lookup, ip6-rewrite, ip4-fragment, ip4-virtreass, error-drop
-	   */
-	  if (PREDICT_TRUE (error0 == MAP_ERROR_NONE))
-	    {
-	      if (PREDICT_FALSE
-		  (d0->mtu
-		   && (clib_net_to_host_u16 (ip6h0->payload_length) +
-		       sizeof (*ip6h0) > d0->mtu)))
-		{
-		  next0 = ip4_map_fragment (p0, d0->mtu, df0, &error0);
-		}
-	      else
-		{
-		  next0 =
-		    ip4_map_ip6_lookup_bypass (p0,
-					       ip40) ?
-		    IP4_MAP_NEXT_IP6_REWRITE : next0;
-		  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
-						   cpu_index,
-						   map_domain_index0, 1,
-						   clib_net_to_host_u16
-						   (ip6h0->payload_length) +
-						   40);
-		}
-	    }
-	  else
-	    {
-	      next0 = IP4_MAP_NEXT_DROP;
-	    }
-
-	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      map_trace_t *tr = vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->map_domain_index = map_domain_index0;
-	      tr->port = port0;
-	    }
-
-	  p0->error = error_node->errors[error0];
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, pi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/*
- * ip4_map_reass
- */
-static uword
-ip4_map_reass (vlib_main_t * vm,
-	       vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip4_map_reass_node.index);
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  map_main_t *mm = &map_main;
-  vlib_combined_counter_main_t *cm = mm->domain_counters;
-  u32 cpu_index = os_get_cpu_number ();
-  u32 *fragments_to_drop = NULL;
-  u32 *fragments_to_loopback = NULL;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  map_domain_t *d0;
-	  u8 error0 = MAP_ERROR_NONE;
-	  ip4_header_t *ip40;
-	  i32 port0 = 0;
-	  ip6_header_t *ip60;
-	  u32 next0 = IP4_MAP_REASS_NEXT_IP6_LOOKUP;
-	  u32 map_domain_index0;
-	  u8 cached = 0;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip60 = vlib_buffer_get_current (p0);
-	  ip40 = (ip4_header_t *) (ip60 + 1);
-	  d0 =
-	    ip4_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-				&map_domain_index0);
-
-	  map_ip4_reass_lock ();
-	  map_ip4_reass_t *r = map_ip4_reass_get (ip40->src_address.as_u32,
-						  ip40->dst_address.as_u32,
-						  ip40->fragment_id,
-						  ip40->protocol,
-						  &fragments_to_drop);
-	  if (PREDICT_FALSE (!r))
-	    {
-	      // Could not create a caching entry
-	      error0 = MAP_ERROR_FRAGMENT_MEMORY;
-	    }
-	  else if (PREDICT_TRUE (ip4_get_fragment_offset (ip40)))
-	    {
-	      if (r->port >= 0)
-		{
-		  // We know the port already
-		  port0 = r->port;
-		}
-	      else if (map_ip4_reass_add_fragment (r, pi0))
-		{
-		  // Not enough space for caching
-		  error0 = MAP_ERROR_FRAGMENT_MEMORY;
-		  map_ip4_reass_free (r, &fragments_to_drop);
-		}
-	      else
-		{
-		  cached = 1;
-		}
-	    }
-	  else
-	    if ((port0 =
-		 ip4_get_port (ip40, MAP_RECEIVER, p0->current_length)) < 0)
-	    {
-	      // Could not find port. We'll free the reassembly.
-	      error0 = MAP_ERROR_BAD_PROTOCOL;
-	      port0 = 0;
-	      map_ip4_reass_free (r, &fragments_to_drop);
-	    }
-	  else
-	    {
-	      r->port = port0;
-	      map_ip4_reass_get_fragments (r, &fragments_to_loopback);
-	    }
-
-#ifdef MAP_IP4_REASS_COUNT_BYTES
-	  if (!cached && r)
-	    {
-	      r->forwarded += clib_host_to_net_u16 (ip40->length) - 20;
-	      if (!ip4_get_fragment_more (ip40))
-		r->expected_total =
-		  ip4_get_fragment_offset (ip40) * 8 +
-		  clib_host_to_net_u16 (ip40->length) - 20;
-	      if (r->forwarded >= r->expected_total)
-		map_ip4_reass_free (r, &fragments_to_drop);
-	    }
-#endif
-
-	  map_ip4_reass_unlock ();
-
-	  // NOTE: Most operations have already been performed by ip4_map
-	  // All we need is the right destination address
-	  ip60->dst_address.as_u64[0] =
-	    map_get_pfx_net (d0, ip40->dst_address.as_u32, port0);
-	  ip60->dst_address.as_u64[1] =
-	    map_get_sfx_net (d0, ip40->dst_address.as_u32, port0);
-
-	  if (PREDICT_FALSE
-	      (d0->mtu
-	       && (clib_net_to_host_u16 (ip60->payload_length) +
-		   sizeof (*ip60) > d0->mtu)))
-	    {
-	      vnet_buffer (p0)->ip_frag.header_offset = sizeof (*ip60);
-	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP6_LOOKUP;
-	      vnet_buffer (p0)->ip_frag.mtu = d0->mtu;
-	      vnet_buffer (p0)->ip_frag.flags = IP_FRAG_FLAG_IP6_HEADER;
-	      next0 = IP4_MAP_REASS_NEXT_IP4_FRAGMENT;
-	    }
-
-	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      map_ip4_map_reass_trace_t *tr =
-		vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->map_domain_index = map_domain_index0;
-	      tr->port = port0;
-	      tr->cached = cached;
-	    }
-
-	  if (cached)
-	    {
-	      //Dequeue the packet
-	      n_left_to_next++;
-	      to_next--;
-	    }
-	  else
-	    {
-	      if (error0 == MAP_ERROR_NONE)
-		vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
-						 cpu_index, map_domain_index0,
-						 1,
-						 clib_net_to_host_u16
-						 (ip60->payload_length) + 40);
-	      next0 =
-		(error0 == MAP_ERROR_NONE) ? next0 : IP4_MAP_REASS_NEXT_DROP;
-	      p0->error = error_node->errors[error0];
-	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					       n_left_to_next, pi0, next0);
-	    }
-
-	  //Loopback when we reach the end of the inpu vector
-	  if (n_left_from == 0 && vec_len (fragments_to_loopback))
-	    {
-	      from = vlib_frame_vector_args (frame);
-	      u32 len = vec_len (fragments_to_loopback);
-	      if (len <= VLIB_FRAME_SIZE)
-		{
-		  clib_memcpy (from, fragments_to_loopback,
-			       sizeof (u32) * len);
-		  n_left_from = len;
-		  vec_reset_length (fragments_to_loopback);
-		}
-	      else
-		{
-		  clib_memcpy (from,
-			       fragments_to_loopback + (len -
-							VLIB_FRAME_SIZE),
-			       sizeof (u32) * VLIB_FRAME_SIZE);
-		  n_left_from = VLIB_FRAME_SIZE;
-		  _vec_len (fragments_to_loopback) = len - VLIB_FRAME_SIZE;
-		}
-	    }
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  map_send_all_to_node (vm, fragments_to_drop, node,
-			&error_node->errors[MAP_ERROR_FRAGMENT_DROPPED],
-			IP4_MAP_REASS_NEXT_DROP);
-
-  vec_free (fragments_to_drop);
-  vec_free (fragments_to_loopback);
-  return frame->n_vectors;
-}
-
-static char *map_error_strings[] = {
-#define _(sym,string) string,
-  foreach_map_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(ip4_map_node) = {
-  .function = ip4_map,
-  .name = "ip4-map",
-  .vector_size = sizeof(u32),
-  .format_trace = format_map_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = MAP_N_ERROR,
-  .error_strings = map_error_strings,
-
-  .n_next_nodes = IP4_MAP_N_NEXT,
-  .next_nodes = {
-    [IP4_MAP_NEXT_IP6_LOOKUP] = "ip6-lookup",
-#ifdef MAP_SKIP_IP6_LOOKUP
-    [IP4_MAP_NEXT_IP6_REWRITE] = "ip6-rewrite",
-#endif
-    [IP4_MAP_NEXT_IP4_FRAGMENT] = "ip4-frag",
-    [IP4_MAP_NEXT_IP6_FRAGMENT] = "ip6-frag",
-    [IP4_MAP_NEXT_REASS] = "ip4-map-reass",
-    [IP4_MAP_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-    [IP4_MAP_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(ip4_map_reass_node) = {
-  .function = ip4_map_reass,
-  .name = "ip4-map-reass",
-  .vector_size = sizeof(u32),
-  .format_trace = format_ip4_map_reass_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = MAP_N_ERROR,
-  .error_strings = map_error_strings,
-
-  .n_next_nodes = IP4_MAP_REASS_N_NEXT,
-  .next_nodes = {
-    [IP4_MAP_REASS_NEXT_IP6_LOOKUP] = "ip6-lookup",
-    [IP4_MAP_REASS_NEXT_IP4_FRAGMENT] = "ip4-frag",
-    [IP4_MAP_REASS_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/map/ip4_map_t.c b/vnet/vnet/map/ip4_map_t.c
deleted file mode 100644
index 15974d8a..00000000
--- a/vnet/vnet/map/ip4_map_t.c
+++ /dev/null
@@ -1,1363 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "map.h"
-
-#include "../ip/ip_frag.h"
-
-#define IP4_MAP_T_DUAL_LOOP 1
-
-typedef enum
-{
-  IP4_MAPT_NEXT_MAPT_TCP_UDP,
-  IP4_MAPT_NEXT_MAPT_ICMP,
-  IP4_MAPT_NEXT_MAPT_FRAGMENTED,
-  IP4_MAPT_NEXT_DROP,
-  IP4_MAPT_N_NEXT
-} ip4_mapt_next_t;
-
-typedef enum
-{
-  IP4_MAPT_ICMP_NEXT_IP6_LOOKUP,
-  IP4_MAPT_ICMP_NEXT_IP6_FRAG,
-  IP4_MAPT_ICMP_NEXT_DROP,
-  IP4_MAPT_ICMP_N_NEXT
-} ip4_mapt_icmp_next_t;
-
-typedef enum
-{
-  IP4_MAPT_TCP_UDP_NEXT_IP6_LOOKUP,
-  IP4_MAPT_TCP_UDP_NEXT_IP6_FRAG,
-  IP4_MAPT_TCP_UDP_NEXT_DROP,
-  IP4_MAPT_TCP_UDP_N_NEXT
-} ip4_mapt_tcp_udp_next_t;
-
-typedef enum
-{
-  IP4_MAPT_FRAGMENTED_NEXT_IP6_LOOKUP,
-  IP4_MAPT_FRAGMENTED_NEXT_IP6_FRAG,
-  IP4_MAPT_FRAGMENTED_NEXT_DROP,
-  IP4_MAPT_FRAGMENTED_N_NEXT
-} ip4_mapt_fragmented_next_t;
-
-//This is used to pass information within the buffer data.
-//Buffer structure being too small to contain big structures like this.
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  ip6_address_t daddr;
-  ip6_address_t saddr;
-  //IPv6 header + Fragmentation header will be here
-  //sizeof(ip6) + sizeof(ip_frag) - sizeof(ip4)
-  u8 unused[28];
-}) ip4_mapt_pseudo_header_t;
-/* *INDENT-ON* */
-
-#define frag_id_4to6(id) (id)
-
-//TODO: Find the right place in memory for this.
-/* *INDENT-OFF* */
-static u8 icmp_to_icmp6_updater_pointer_table[] =
-  { 0, 1, 4, 4, ~0,
-    ~0, ~0, ~0, 7, 6,
-    ~0, ~0, 8, 8, 8,
-    8, 24, 24, 24, 24
-  };
-/* *INDENT-ON* */
-
-
-static_always_inline int
-ip4_map_fragment_cache (ip4_header_t * ip4, u16 port)
-{
-  u32 *ignore = NULL;
-  map_ip4_reass_lock ();
-  map_ip4_reass_t *r =
-    map_ip4_reass_get (ip4->src_address.as_u32, ip4->dst_address.as_u32,
-		       ip4->fragment_id,
-		       (ip4->protocol ==
-			IP_PROTOCOL_ICMP) ? IP_PROTOCOL_ICMP6 : ip4->protocol,
-		       &ignore);
-  if (r)
-    r->port = port;
-
-  map_ip4_reass_unlock ();
-  return !r;
-}
-
-static_always_inline i32
-ip4_map_fragment_get_port (ip4_header_t * ip4)
-{
-  u32 *ignore = NULL;
-  map_ip4_reass_lock ();
-  map_ip4_reass_t *r =
-    map_ip4_reass_get (ip4->src_address.as_u32, ip4->dst_address.as_u32,
-		       ip4->fragment_id,
-		       (ip4->protocol ==
-			IP_PROTOCOL_ICMP) ? IP_PROTOCOL_ICMP6 : ip4->protocol,
-		       &ignore);
-  i32 ret = r ? r->port : -1;
-  map_ip4_reass_unlock ();
-  return ret;
-}
-
-
-/* Statelessly translates an ICMP packet into ICMPv6.
- *
- * Warning: The checksum will need to be recomputed.
- *
- */
-static_always_inline int
-ip4_icmp_to_icmp6_in_place (icmp46_header_t * icmp, u32 icmp_len,
-			    i32 * receiver_port, ip4_header_t ** inner_ip4)
-{
-  *inner_ip4 = NULL;
-  switch (icmp->type)
-    {
-    case ICMP4_echo_reply:
-      *receiver_port = ((u16 *) icmp)[2];
-      icmp->type = ICMP6_echo_reply;
-      break;
-    case ICMP4_echo_request:
-      *receiver_port = ((u16 *) icmp)[2];
-      icmp->type = ICMP6_echo_request;
-      break;
-    case ICMP4_destination_unreachable:
-      *inner_ip4 = (ip4_header_t *) (((u8 *) icmp) + 8);
-      *receiver_port = ip4_get_port (*inner_ip4, MAP_SENDER, icmp_len - 8);
-
-      switch (icmp->code)
-	{
-	case ICMP4_destination_unreachable_destination_unreachable_net:	//0
-	case ICMP4_destination_unreachable_destination_unreachable_host:	//1
-	  icmp->type = ICMP6_destination_unreachable;
-	  icmp->code = ICMP6_destination_unreachable_no_route_to_destination;
-	  break;
-	case ICMP4_destination_unreachable_protocol_unreachable:	//2
-	  icmp->type = ICMP6_parameter_problem;
-	  icmp->code = ICMP6_parameter_problem_unrecognized_next_header;
-	  break;
-	case ICMP4_destination_unreachable_port_unreachable:	//3
-	  icmp->type = ICMP6_destination_unreachable;
-	  icmp->code = ICMP6_destination_unreachable_port_unreachable;
-	  break;
-	case ICMP4_destination_unreachable_fragmentation_needed_and_dont_fragment_set:	//4
-	  icmp->type =
-	    ICMP6_packet_too_big;
-	  icmp->code = 0;
-	  {
-	    u32 advertised_mtu = clib_net_to_host_u32 (*((u32 *) (icmp + 1)));
-	    if (advertised_mtu)
-	      advertised_mtu += 20;
-	    else
-	      advertised_mtu = 1000;	//FIXME ! (RFC 1191 - plateau value)
-
-	    //FIXME: = minimum(advertised MTU+20, MTU_of_IPv6_nexthop, (MTU_of_IPv4_nexthop)+20)
-	    *((u32 *) (icmp + 1)) = clib_host_to_net_u32 (advertised_mtu);
-	  }
-	  break;
-
-	case ICMP4_destination_unreachable_source_route_failed:	//5
-	case ICMP4_destination_unreachable_destination_network_unknown:	//6
-	case ICMP4_destination_unreachable_destination_host_unknown:	//7
-	case ICMP4_destination_unreachable_source_host_isolated:	//8
-	case ICMP4_destination_unreachable_network_unreachable_for_type_of_service:	//11
-	case ICMP4_destination_unreachable_host_unreachable_for_type_of_service:	//12
-	  icmp->type =
-	    ICMP6_destination_unreachable;
-	  icmp->code = ICMP6_destination_unreachable_no_route_to_destination;
-	  break;
-	case ICMP4_destination_unreachable_network_administratively_prohibited:	//9
-	case ICMP4_destination_unreachable_host_administratively_prohibited:	//10
-	case ICMP4_destination_unreachable_communication_administratively_prohibited:	//13
-	case ICMP4_destination_unreachable_precedence_cutoff_in_effect:	//15
-	  icmp->type = ICMP6_destination_unreachable;
-	  icmp->code =
-	    ICMP6_destination_unreachable_destination_administratively_prohibited;
-	  break;
-	case ICMP4_destination_unreachable_host_precedence_violation:	//14
-	default:
-	  return -1;
-	}
-      break;
-
-    case ICMP4_time_exceeded:	//11
-      *inner_ip4 = (ip4_header_t *) (((u8 *) icmp) + 8);
-      *receiver_port = ip4_get_port (*inner_ip4, MAP_SENDER, icmp_len - 8);
-      icmp->type = ICMP6_time_exceeded;
-      //icmp->code = icmp->code //unchanged
-      break;
-
-    case ICMP4_parameter_problem:
-      *inner_ip4 = (ip4_header_t *) (((u8 *) icmp) + 8);
-      *receiver_port = ip4_get_port (*inner_ip4, MAP_SENDER, icmp_len - 8);
-
-      switch (icmp->code)
-	{
-	case ICMP4_parameter_problem_pointer_indicates_error:
-	case ICMP4_parameter_problem_bad_length:
-	  icmp->type = ICMP6_parameter_problem;
-	  icmp->code = ICMP6_parameter_problem_erroneous_header_field;
-	  {
-	    u8 ptr =
-	      icmp_to_icmp6_updater_pointer_table[*((u8 *) (icmp + 1))];
-	    if (ptr == 0xff)
-	      return -1;
-
-	    *((u32 *) (icmp + 1)) = clib_host_to_net_u32 (ptr);
-	  }
-	  break;
-	default:
-	  //All other codes cause dropping the packet
-	  return -1;
-	}
-      break;
-
-    default:
-      //All other types cause dropping the packet
-      return -1;
-      break;
-    }
-  return 0;
-}
-
-static_always_inline void
-_ip4_map_t_icmp (map_domain_t * d, vlib_buffer_t * p, u8 * error)
-{
-  ip4_header_t *ip4, *inner_ip4;
-  ip6_header_t *ip6, *inner_ip6;
-  u32 ip_len;
-  icmp46_header_t *icmp;
-  i32 recv_port;
-  ip_csum_t csum;
-  u16 *inner_L4_checksum = 0;
-  ip6_frag_hdr_t *inner_frag;
-  u32 inner_frag_id;
-  u32 inner_frag_offset;
-  u8 inner_frag_more;
-
-  ip4 = vlib_buffer_get_current (p);
-  ip_len = clib_net_to_host_u16 (ip4->length);
-  ASSERT (ip_len <= p->current_length);
-
-  icmp = (icmp46_header_t *) (ip4 + 1);
-  if (ip4_icmp_to_icmp6_in_place (icmp, ip_len - sizeof (*ip4),
-				  &recv_port, &inner_ip4))
-    {
-      *error = MAP_ERROR_ICMP;
-      return;
-    }
-
-  if (recv_port < 0)
-    {
-      // In case of 1:1 mapping, we don't care about the port
-      if (d->ea_bits_len == 0 && d->rules)
-	{
-	  recv_port = 0;
-	}
-      else
-	{
-	  *error = MAP_ERROR_ICMP;
-	  return;
-	}
-    }
-
-  if (inner_ip4)
-    {
-      //We have 2 headers to translate.
-      //We need to make some room in the middle of the packet
-
-      if (PREDICT_FALSE (ip4_is_fragment (inner_ip4)))
-	{
-	  //Here it starts getting really tricky
-	  //We will add a fragmentation header in the inner packet
-
-	  if (!ip4_is_first_fragment (inner_ip4))
-	    {
-	      //For now we do not handle unless it is the first fragment
-	      //Ideally we should handle the case as we are in slow path already
-	      *error = MAP_ERROR_FRAGMENTED;
-	      return;
-	    }
-
-	  vlib_buffer_advance (p,
-			       -2 * (sizeof (*ip6) - sizeof (*ip4)) -
-			       sizeof (*inner_frag));
-	  ip6 = vlib_buffer_get_current (p);
-	  clib_memcpy (u8_ptr_add (ip6, sizeof (*ip6) - sizeof (*ip4)), ip4,
-		       20 + 8);
-	  ip4 =
-	    (ip4_header_t *) u8_ptr_add (ip6, sizeof (*ip6) - sizeof (*ip4));
-	  icmp = (icmp46_header_t *) (ip4 + 1);
-
-	  inner_ip6 =
-	    (ip6_header_t *) u8_ptr_add (inner_ip4,
-					 sizeof (*ip4) - sizeof (*ip6) -
-					 sizeof (*inner_frag));
-	  inner_frag =
-	    (ip6_frag_hdr_t *) u8_ptr_add (inner_ip6, sizeof (*inner_ip6));
-	  ip6->payload_length =
-	    u16_net_add (ip4->length,
-			 sizeof (*ip6) - 2 * sizeof (*ip4) +
-			 sizeof (*inner_frag));
-	  inner_frag_id = frag_id_4to6 (inner_ip4->fragment_id);
-	  inner_frag_offset = ip4_get_fragment_offset (inner_ip4);
-	  inner_frag_more =
-	    ! !(inner_ip4->flags_and_fragment_offset &
-		clib_net_to_host_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS));
-	}
-      else
-	{
-	  vlib_buffer_advance (p, -2 * (sizeof (*ip6) - sizeof (*ip4)));
-	  ip6 = vlib_buffer_get_current (p);
-	  clib_memcpy (u8_ptr_add (ip6, sizeof (*ip6) - sizeof (*ip4)), ip4,
-		       20 + 8);
-	  ip4 =
-	    (ip4_header_t *) u8_ptr_add (ip6, sizeof (*ip6) - sizeof (*ip4));
-	  icmp = (icmp46_header_t *) u8_ptr_add (ip4, sizeof (*ip4));
-	  inner_ip6 =
-	    (ip6_header_t *) u8_ptr_add (inner_ip4,
-					 sizeof (*ip4) - sizeof (*ip6));
-	  ip6->payload_length =
-	    u16_net_add (ip4->length, sizeof (*ip6) - 2 * sizeof (*ip4));
-	  inner_frag = NULL;
-	}
-
-      if (PREDICT_TRUE (inner_ip4->protocol == IP_PROTOCOL_TCP))
-	{
-	  inner_L4_checksum = &((tcp_header_t *) (inner_ip4 + 1))->checksum;
-	  *inner_L4_checksum =
-	    ip_csum_fold (ip_csum_sub_even
-			  (*inner_L4_checksum,
-			   *((u64 *) (&inner_ip4->src_address))));
-	}
-      else if (PREDICT_TRUE (inner_ip4->protocol == IP_PROTOCOL_UDP))
-	{
-	  inner_L4_checksum = &((udp_header_t *) (inner_ip4 + 1))->checksum;
-	  if (!*inner_L4_checksum)
-	    {
-	      //The inner packet was first translated, and therefore came from IPv6.
-	      //As the packet was an IPv6 packet, the UDP checksum can't be NULL
-	      *error = MAP_ERROR_ICMP;
-	      return;
-	    }
-	  *inner_L4_checksum =
-	    ip_csum_fold (ip_csum_sub_even
-			  (*inner_L4_checksum,
-			   *((u64 *) (&inner_ip4->src_address))));
-	}
-      else if (inner_ip4->protocol == IP_PROTOCOL_ICMP)
-	{
-	  //We have an ICMP inside an ICMP
-	  //It needs to be translated, but not for error ICMP messages
-	  icmp46_header_t *inner_icmp = (icmp46_header_t *) (inner_ip4 + 1);
-	  csum = inner_icmp->checksum;
-	  //Only types ICMP4_echo_request and ICMP4_echo_reply are handled by ip4_icmp_to_icmp6_in_place
-	  csum = ip_csum_sub_even (csum, *((u16 *) inner_icmp));
-	  inner_icmp->type = (inner_icmp->type == ICMP4_echo_request) ?
-	    ICMP6_echo_request : ICMP6_echo_reply;
-	  csum = ip_csum_add_even (csum, *((u16 *) inner_icmp));
-	  csum =
-	    ip_csum_add_even (csum, clib_host_to_net_u16 (IP_PROTOCOL_ICMP6));
-	  csum =
-	    ip_csum_add_even (csum, inner_ip4->length - sizeof (*inner_ip4));
-	  inner_icmp->checksum = ip_csum_fold (csum);
-	  inner_L4_checksum = &inner_icmp->checksum;
-	  inner_ip4->protocol = IP_PROTOCOL_ICMP6;
-	}
-      else
-	{
-	  /* To shut up Coverity */
-	  os_panic ();
-	}
-
-      //FIXME: Security check with the port found in the inner packet
-
-      csum = *inner_L4_checksum;	//Initial checksum of the inner L4 header
-      //FIXME: Shouldn't we remove ip addresses from there ?
-
-      inner_ip6->ip_version_traffic_class_and_flow_label =
-	clib_host_to_net_u32 ((6 << 28) + (inner_ip4->tos << 20));
-      inner_ip6->payload_length =
-	u16_net_add (inner_ip4->length, -sizeof (*inner_ip4));
-      inner_ip6->hop_limit = inner_ip4->ttl;
-      inner_ip6->protocol = inner_ip4->protocol;
-
-      //Note that the source address is within the domain
-      //while the destination address is the one outside the domain
-      ip4_map_t_embedded_address (d, &inner_ip6->dst_address,
-				  &inner_ip4->dst_address);
-      inner_ip6->src_address.as_u64[0] =
-	map_get_pfx_net (d, inner_ip4->src_address.as_u32, recv_port);
-      inner_ip6->src_address.as_u64[1] =
-	map_get_sfx_net (d, inner_ip4->src_address.as_u32, recv_port);
-
-      if (PREDICT_FALSE (inner_frag != NULL))
-	{
-	  inner_frag->next_hdr = inner_ip6->protocol;
-	  inner_frag->identification = inner_frag_id;
-	  inner_frag->rsv = 0;
-	  inner_frag->fragment_offset_and_more =
-	    ip6_frag_hdr_offset_and_more (inner_frag_offset, inner_frag_more);
-	  inner_ip6->protocol = IP_PROTOCOL_IPV6_FRAGMENTATION;
-	  inner_ip6->payload_length =
-	    clib_host_to_net_u16 (clib_net_to_host_u16
-				  (inner_ip6->payload_length) +
-				  sizeof (*inner_frag));
-	}
-
-      csum = ip_csum_add_even (csum, inner_ip6->src_address.as_u64[0]);
-      csum = ip_csum_add_even (csum, inner_ip6->src_address.as_u64[1]);
-      csum = ip_csum_add_even (csum, inner_ip6->dst_address.as_u64[0]);
-      csum = ip_csum_add_even (csum, inner_ip6->dst_address.as_u64[1]);
-      *inner_L4_checksum = ip_csum_fold (csum);
-
-    }
-  else
-    {
-      vlib_buffer_advance (p, sizeof (*ip4) - sizeof (*ip6));
-      ip6 = vlib_buffer_get_current (p);
-      ip6->payload_length =
-	clib_host_to_net_u16 (clib_net_to_host_u16 (ip4->length) -
-			      sizeof (*ip4));
-    }
-
-  //Translate outer IPv6
-  ip6->ip_version_traffic_class_and_flow_label =
-    clib_host_to_net_u32 ((6 << 28) + (ip4->tos << 20));
-
-  ip6->hop_limit = ip4->ttl;
-  ip6->protocol = IP_PROTOCOL_ICMP6;
-
-  ip4_map_t_embedded_address (d, &ip6->src_address, &ip4->src_address);
-  ip6->dst_address.as_u64[0] =
-    map_get_pfx_net (d, ip4->dst_address.as_u32, recv_port);
-  ip6->dst_address.as_u64[1] =
-    map_get_sfx_net (d, ip4->dst_address.as_u32, recv_port);
-
-  //Truncate when the packet exceeds the minimal IPv6 MTU
-  if (p->current_length > 1280)
-    {
-      ip6->payload_length = clib_host_to_net_u16 (1280 - sizeof (*ip6));
-      p->current_length = 1280;	//Looks too simple to be correct...
-    }
-
-  //TODO: We could do an easy diff-checksum for echo requests/replies
-  //Recompute ICMP checksum
-  icmp->checksum = 0;
-  csum = ip_csum_with_carry (0, ip6->payload_length);
-  csum = ip_csum_with_carry (csum, clib_host_to_net_u16 (ip6->protocol));
-  csum = ip_csum_with_carry (csum, ip6->src_address.as_u64[0]);
-  csum = ip_csum_with_carry (csum, ip6->src_address.as_u64[1]);
-  csum = ip_csum_with_carry (csum, ip6->dst_address.as_u64[0]);
-  csum = ip_csum_with_carry (csum, ip6->dst_address.as_u64[1]);
-  csum =
-    ip_incremental_checksum (csum, icmp,
-			     clib_net_to_host_u16 (ip6->payload_length));
-  icmp->checksum = ~ip_csum_fold (csum);
-}
-
-static uword
-ip4_map_t_icmp (vlib_main_t * vm,
-		vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip4_map_t_icmp_node.index);
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  vlib_combined_counter_main_t *cm = map_main.domain_counters;
-  u32 cpu_index = os_get_cpu_number ();
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  ip4_mapt_icmp_next_t next0;
-	  u8 error0;
-	  map_domain_t *d0;
-	  u16 len0;
-
-	  next0 = IP4_MAPT_ICMP_NEXT_IP6_LOOKUP;
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  error0 = MAP_ERROR_NONE;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  vlib_buffer_advance (p0, sizeof (ip4_mapt_pseudo_header_t));	//The pseudo-header is not used
-	  len0 =
-	    clib_net_to_host_u16 (((ip4_header_t *)
-				   vlib_buffer_get_current (p0))->length);
-	  d0 =
-	    pool_elt_at_index (map_main.domains,
-			       vnet_buffer (p0)->map_t.map_domain_index);
-	  _ip4_map_t_icmp (d0, p0, &error0);
-
-	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
-	    {
-	      vnet_buffer (p0)->ip_frag.header_offset = 0;
-	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
-	      vnet_buffer (p0)->ip_frag.next_index = IP6_FRAG_NEXT_IP6_LOOKUP;
-	      next0 = IP4_MAPT_ICMP_NEXT_IP6_FRAG;
-	    }
-	  if (PREDICT_TRUE (error0 == MAP_ERROR_NONE))
-	    {
-	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
-					       cpu_index,
-					       vnet_buffer (p0)->map_t.
-					       map_domain_index, 1, len0);
-	    }
-	  else
-	    {
-	      next0 = IP4_MAPT_ICMP_NEXT_DROP;
-	    }
-	  p0->error = error_node->errors[error0];
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next, pi0,
-					   next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return frame->n_vectors;
-}
-
-static uword
-ip4_map_t_fragmented (vlib_main_t * vm,
-		      vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  ip4_header_t *ip40;
-	  ip6_header_t *ip60;
-	  ip6_frag_hdr_t *frag0;
-	  ip4_mapt_pseudo_header_t *pheader0;
-	  ip4_mapt_fragmented_next_t next0;
-
-	  next0 = IP4_MAPT_FRAGMENTED_NEXT_IP6_LOOKUP;
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  //Accessing pseudo header
-	  pheader0 = vlib_buffer_get_current (p0);
-	  vlib_buffer_advance (p0, sizeof (*pheader0));
-
-	  //Accessing ip4 header
-	  ip40 = vlib_buffer_get_current (p0);
-	  frag0 =
-	    (ip6_frag_hdr_t *) u8_ptr_add (ip40,
-					   sizeof (*ip40) - sizeof (*frag0));
-	  ip60 =
-	    (ip6_header_t *) u8_ptr_add (ip40,
-					 sizeof (*ip40) - sizeof (*frag0) -
-					 sizeof (*ip60));
-	  vlib_buffer_advance (p0,
-			       sizeof (*ip40) - sizeof (*ip60) -
-			       sizeof (*frag0));
-
-	  //We know that the protocol was one of ICMP, TCP or UDP
-	  //because the first fragment was found and cached
-	  frag0->next_hdr =
-	    (ip40->protocol ==
-	     IP_PROTOCOL_ICMP) ? IP_PROTOCOL_ICMP6 : ip40->protocol;
-	  frag0->identification = frag_id_4to6 (ip40->fragment_id);
-	  frag0->rsv = 0;
-	  frag0->fragment_offset_and_more =
-	    ip6_frag_hdr_offset_and_more (ip4_get_fragment_offset (ip40),
-					  clib_net_to_host_u16
-					  (ip40->flags_and_fragment_offset) &
-					  IP4_HEADER_FLAG_MORE_FRAGMENTS);
-
-	  ip60->ip_version_traffic_class_and_flow_label =
-	    clib_host_to_net_u32 ((6 << 28) + (ip40->tos << 20));
-	  ip60->payload_length =
-	    clib_host_to_net_u16 (clib_net_to_host_u16 (ip40->length) -
-				  sizeof (*ip40) + sizeof (*frag0));
-	  ip60->hop_limit = ip40->ttl;
-	  ip60->protocol = IP_PROTOCOL_IPV6_FRAGMENTATION;
-	  ip60->dst_address.as_u64[0] = pheader0->daddr.as_u64[0];
-	  ip60->dst_address.as_u64[1] = pheader0->daddr.as_u64[1];
-	  ip60->src_address.as_u64[0] = pheader0->saddr.as_u64[0];
-	  ip60->src_address.as_u64[1] = pheader0->saddr.as_u64[1];
-
-	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
-	    {
-	      vnet_buffer (p0)->ip_frag.header_offset = 0;
-	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
-	      vnet_buffer (p0)->ip_frag.next_index = IP6_FRAG_NEXT_IP6_LOOKUP;
-	      next0 = IP4_MAPT_FRAGMENTED_NEXT_IP6_FRAG;
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next, pi0,
-					   next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return frame->n_vectors;
-}
-
-static uword
-ip4_map_t_tcp_udp (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-#ifdef IP4_MAP_T_DUAL_LOOP
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 pi0, pi1;
-	  vlib_buffer_t *p0, *p1;
-	  ip4_header_t *ip40, *ip41;
-	  ip6_header_t *ip60, *ip61;
-	  ip_csum_t csum0, csum1;
-	  u16 *checksum0, *checksum1;
-	  ip6_frag_hdr_t *frag0, *frag1;
-	  u32 frag_id0, frag_id1;
-	  ip4_mapt_pseudo_header_t *pheader0, *pheader1;
-	  ip4_mapt_tcp_udp_next_t next0, next1;
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  next0 = IP4_MAPT_TCP_UDP_NEXT_IP6_LOOKUP;
-	  next1 = IP4_MAPT_TCP_UDP_NEXT_IP6_LOOKUP;
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-
-	  //Accessing pseudo header
-	  pheader0 = vlib_buffer_get_current (p0);
-	  pheader1 = vlib_buffer_get_current (p1);
-	  vlib_buffer_advance (p0, sizeof (*pheader0));
-	  vlib_buffer_advance (p1, sizeof (*pheader1));
-
-	  //Accessing ip4 header
-	  ip40 = vlib_buffer_get_current (p0);
-	  ip41 = vlib_buffer_get_current (p1);
-	  checksum0 =
-	    (u16 *) u8_ptr_add (ip40,
-				vnet_buffer (p0)->map_t.checksum_offset);
-	  checksum1 =
-	    (u16 *) u8_ptr_add (ip41,
-				vnet_buffer (p1)->map_t.checksum_offset);
-
-	  //UDP checksum is optional over IPv4 but mandatory for IPv6
-	  //We do not check udp->length sanity but use our safe computed value instead
-	  if (PREDICT_FALSE
-	      (!*checksum0 && ip40->protocol == IP_PROTOCOL_UDP))
-	    {
-	      u16 udp_len =
-		clib_host_to_net_u16 (ip40->length) - sizeof (*ip40);
-	      udp_header_t *udp =
-		(udp_header_t *) u8_ptr_add (ip40, sizeof (*ip40));
-	      ip_csum_t csum;
-	      csum = ip_incremental_checksum (0, udp, udp_len);
-	      csum =
-		ip_csum_with_carry (csum, clib_host_to_net_u16 (udp_len));
-	      csum =
-		ip_csum_with_carry (csum,
-				    clib_host_to_net_u16 (IP_PROTOCOL_UDP));
-	      csum =
-		ip_csum_with_carry (csum, *((u64 *) (&ip40->src_address)));
-	      *checksum0 = ~ip_csum_fold (csum);
-	    }
-	  if (PREDICT_FALSE
-	      (!*checksum1 && ip41->protocol == IP_PROTOCOL_UDP))
-	    {
-	      u16 udp_len =
-		clib_host_to_net_u16 (ip41->length) - sizeof (*ip40);
-	      udp_header_t *udp =
-		(udp_header_t *) u8_ptr_add (ip41, sizeof (*ip40));
-	      ip_csum_t csum;
-	      csum = ip_incremental_checksum (0, udp, udp_len);
-	      csum =
-		ip_csum_with_carry (csum, clib_host_to_net_u16 (udp_len));
-	      csum =
-		ip_csum_with_carry (csum,
-				    clib_host_to_net_u16 (IP_PROTOCOL_UDP));
-	      csum =
-		ip_csum_with_carry (csum, *((u64 *) (&ip41->src_address)));
-	      *checksum1 = ~ip_csum_fold (csum);
-	    }
-
-	  csum0 = ip_csum_sub_even (*checksum0, ip40->src_address.as_u32);
-	  csum1 = ip_csum_sub_even (*checksum1, ip41->src_address.as_u32);
-	  csum0 = ip_csum_sub_even (csum0, ip40->dst_address.as_u32);
-	  csum1 = ip_csum_sub_even (csum1, ip41->dst_address.as_u32);
-
-	  // Deal with fragmented packets
-	  if (PREDICT_FALSE (ip40->flags_and_fragment_offset &
-			     clib_host_to_net_u16
-			     (IP4_HEADER_FLAG_MORE_FRAGMENTS)))
-	    {
-	      ip60 =
-		(ip6_header_t *) u8_ptr_add (ip40,
-					     sizeof (*ip40) - sizeof (*ip60) -
-					     sizeof (*frag0));
-	      frag0 =
-		(ip6_frag_hdr_t *) u8_ptr_add (ip40,
-					       sizeof (*ip40) -
-					       sizeof (*frag0));
-	      frag_id0 = frag_id_4to6 (ip40->fragment_id);
-	      vlib_buffer_advance (p0,
-				   sizeof (*ip40) - sizeof (*ip60) -
-				   sizeof (*frag0));
-	    }
-	  else
-	    {
-	      ip60 =
-		(ip6_header_t *) (((u8 *) ip40) + sizeof (*ip40) -
-				  sizeof (*ip60));
-	      vlib_buffer_advance (p0, sizeof (*ip40) - sizeof (*ip60));
-	      frag0 = NULL;
-	    }
-
-	  if (PREDICT_FALSE (ip41->flags_and_fragment_offset &
-			     clib_host_to_net_u16
-			     (IP4_HEADER_FLAG_MORE_FRAGMENTS)))
-	    {
-	      ip61 =
-		(ip6_header_t *) u8_ptr_add (ip41,
-					     sizeof (*ip40) - sizeof (*ip60) -
-					     sizeof (*frag0));
-	      frag1 =
-		(ip6_frag_hdr_t *) u8_ptr_add (ip41,
-					       sizeof (*ip40) -
-					       sizeof (*frag0));
-	      frag_id1 = frag_id_4to6 (ip41->fragment_id);
-	      vlib_buffer_advance (p1,
-				   sizeof (*ip40) - sizeof (*ip60) -
-				   sizeof (*frag0));
-	    }
-	  else
-	    {
-	      ip61 =
-		(ip6_header_t *) (((u8 *) ip41) + sizeof (*ip40) -
-				  sizeof (*ip60));
-	      vlib_buffer_advance (p1, sizeof (*ip40) - sizeof (*ip60));
-	      frag1 = NULL;
-	    }
-
-	  ip60->ip_version_traffic_class_and_flow_label =
-	    clib_host_to_net_u32 ((6 << 28) + (ip40->tos << 20));
-	  ip61->ip_version_traffic_class_and_flow_label =
-	    clib_host_to_net_u32 ((6 << 28) + (ip41->tos << 20));
-	  ip60->payload_length = u16_net_add (ip40->length, -sizeof (*ip40));
-	  ip61->payload_length = u16_net_add (ip41->length, -sizeof (*ip40));
-	  ip60->hop_limit = ip40->ttl;
-	  ip61->hop_limit = ip41->ttl;
-	  ip60->protocol = ip40->protocol;
-	  ip61->protocol = ip41->protocol;
-
-	  if (PREDICT_FALSE (frag0 != NULL))
-	    {
-	      frag0->next_hdr = ip60->protocol;
-	      frag0->identification = frag_id0;
-	      frag0->rsv = 0;
-	      frag0->fragment_offset_and_more =
-		ip6_frag_hdr_offset_and_more (0, 1);
-	      ip60->protocol = IP_PROTOCOL_IPV6_FRAGMENTATION;
-	      ip60->payload_length =
-		u16_net_add (ip60->payload_length, sizeof (*frag0));
-	    }
-
-	  if (PREDICT_FALSE (frag1 != NULL))
-	    {
-	      frag1->next_hdr = ip61->protocol;
-	      frag1->identification = frag_id1;
-	      frag1->rsv = 0;
-	      frag1->fragment_offset_and_more =
-		ip6_frag_hdr_offset_and_more (0, 1);
-	      ip61->protocol = IP_PROTOCOL_IPV6_FRAGMENTATION;
-	      ip61->payload_length =
-		u16_net_add (ip61->payload_length, sizeof (*frag0));
-	    }
-
-	  //Finally copying the address
-	  ip60->dst_address.as_u64[0] = pheader0->daddr.as_u64[0];
-	  ip61->dst_address.as_u64[0] = pheader1->daddr.as_u64[0];
-	  ip60->dst_address.as_u64[1] = pheader0->daddr.as_u64[1];
-	  ip61->dst_address.as_u64[1] = pheader1->daddr.as_u64[1];
-	  ip60->src_address.as_u64[0] = pheader0->saddr.as_u64[0];
-	  ip61->src_address.as_u64[0] = pheader1->saddr.as_u64[0];
-	  ip60->src_address.as_u64[1] = pheader0->saddr.as_u64[1];
-	  ip61->src_address.as_u64[1] = pheader1->saddr.as_u64[1];
-
-	  csum0 = ip_csum_add_even (csum0, ip60->src_address.as_u64[0]);
-	  csum1 = ip_csum_add_even (csum1, ip61->src_address.as_u64[0]);
-	  csum0 = ip_csum_add_even (csum0, ip60->src_address.as_u64[1]);
-	  csum1 = ip_csum_add_even (csum1, ip61->src_address.as_u64[1]);
-	  csum0 = ip_csum_add_even (csum0, ip60->dst_address.as_u64[0]);
-	  csum1 = ip_csum_add_even (csum1, ip61->dst_address.as_u64[0]);
-	  csum0 = ip_csum_add_even (csum0, ip60->dst_address.as_u64[1]);
-	  csum1 = ip_csum_add_even (csum1, ip61->dst_address.as_u64[1]);
-	  *checksum0 = ip_csum_fold (csum0);
-	  *checksum1 = ip_csum_fold (csum1);
-
-	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
-	    {
-	      vnet_buffer (p0)->ip_frag.header_offset = 0;
-	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
-	      vnet_buffer (p0)->ip_frag.next_index = IP6_FRAG_NEXT_IP6_LOOKUP;
-	      next0 = IP4_MAPT_TCP_UDP_NEXT_IP6_FRAG;
-	    }
-
-	  if (vnet_buffer (p1)->map_t.mtu < p1->current_length)
-	    {
-	      vnet_buffer (p1)->ip_frag.header_offset = 0;
-	      vnet_buffer (p1)->ip_frag.mtu = vnet_buffer (p1)->map_t.mtu;
-	      vnet_buffer (p1)->ip_frag.next_index = IP6_FRAG_NEXT_IP6_LOOKUP;
-	      next1 = IP4_MAPT_TCP_UDP_NEXT_IP6_FRAG;
-	    }
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next, pi0, pi1,
-					   next0, next1);
-	}
-#endif
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  ip4_header_t *ip40;
-	  ip6_header_t *ip60;
-	  ip_csum_t csum0;
-	  u16 *checksum0;
-	  ip6_frag_hdr_t *frag0;
-	  u32 frag_id0;
-	  ip4_mapt_pseudo_header_t *pheader0;
-	  ip4_mapt_tcp_udp_next_t next0;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  next0 = IP4_MAPT_TCP_UDP_NEXT_IP6_LOOKUP;
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  //Accessing pseudo header
-	  pheader0 = vlib_buffer_get_current (p0);
-	  vlib_buffer_advance (p0, sizeof (*pheader0));
-
-	  //Accessing ip4 header
-	  ip40 = vlib_buffer_get_current (p0);
-	  checksum0 =
-	    (u16 *) u8_ptr_add (ip40,
-				vnet_buffer (p0)->map_t.checksum_offset);
-
-	  //UDP checksum is optional over IPv4 but mandatory for IPv6
-	  //We do not check udp->length sanity but use our safe computed value instead
-	  if (PREDICT_FALSE
-	      (!*checksum0 && ip40->protocol == IP_PROTOCOL_UDP))
-	    {
-	      u16 udp_len =
-		clib_host_to_net_u16 (ip40->length) - sizeof (*ip40);
-	      udp_header_t *udp =
-		(udp_header_t *) u8_ptr_add (ip40, sizeof (*ip40));
-	      ip_csum_t csum;
-	      csum = ip_incremental_checksum (0, udp, udp_len);
-	      csum =
-		ip_csum_with_carry (csum, clib_host_to_net_u16 (udp_len));
-	      csum =
-		ip_csum_with_carry (csum,
-				    clib_host_to_net_u16 (IP_PROTOCOL_UDP));
-	      csum =
-		ip_csum_with_carry (csum, *((u64 *) (&ip40->src_address)));
-	      *checksum0 = ~ip_csum_fold (csum);
-	    }
-
-	  csum0 = ip_csum_sub_even (*checksum0, ip40->src_address.as_u32);
-	  csum0 = ip_csum_sub_even (csum0, ip40->dst_address.as_u32);
-
-	  // Deal with fragmented packets
-	  if (PREDICT_FALSE (ip40->flags_and_fragment_offset &
-			     clib_host_to_net_u16
-			     (IP4_HEADER_FLAG_MORE_FRAGMENTS)))
-	    {
-	      ip60 =
-		(ip6_header_t *) u8_ptr_add (ip40,
-					     sizeof (*ip40) - sizeof (*ip60) -
-					     sizeof (*frag0));
-	      frag0 =
-		(ip6_frag_hdr_t *) u8_ptr_add (ip40,
-					       sizeof (*ip40) -
-					       sizeof (*frag0));
-	      frag_id0 = frag_id_4to6 (ip40->fragment_id);
-	      vlib_buffer_advance (p0,
-				   sizeof (*ip40) - sizeof (*ip60) -
-				   sizeof (*frag0));
-	    }
-	  else
-	    {
-	      ip60 =
-		(ip6_header_t *) (((u8 *) ip40) + sizeof (*ip40) -
-				  sizeof (*ip60));
-	      vlib_buffer_advance (p0, sizeof (*ip40) - sizeof (*ip60));
-	      frag0 = NULL;
-	    }
-
-	  ip60->ip_version_traffic_class_and_flow_label =
-	    clib_host_to_net_u32 ((6 << 28) + (ip40->tos << 20));
-	  ip60->payload_length = u16_net_add (ip40->length, -sizeof (*ip40));
-	  ip60->hop_limit = ip40->ttl;
-	  ip60->protocol = ip40->protocol;
-
-	  if (PREDICT_FALSE (frag0 != NULL))
-	    {
-	      frag0->next_hdr = ip60->protocol;
-	      frag0->identification = frag_id0;
-	      frag0->rsv = 0;
-	      frag0->fragment_offset_and_more =
-		ip6_frag_hdr_offset_and_more (0, 1);
-	      ip60->protocol = IP_PROTOCOL_IPV6_FRAGMENTATION;
-	      ip60->payload_length =
-		u16_net_add (ip60->payload_length, sizeof (*frag0));
-	    }
-
-	  //Finally copying the address
-	  ip60->dst_address.as_u64[0] = pheader0->daddr.as_u64[0];
-	  ip60->dst_address.as_u64[1] = pheader0->daddr.as_u64[1];
-	  ip60->src_address.as_u64[0] = pheader0->saddr.as_u64[0];
-	  ip60->src_address.as_u64[1] = pheader0->saddr.as_u64[1];
-
-	  csum0 = ip_csum_add_even (csum0, ip60->src_address.as_u64[0]);
-	  csum0 = ip_csum_add_even (csum0, ip60->src_address.as_u64[1]);
-	  csum0 = ip_csum_add_even (csum0, ip60->dst_address.as_u64[0]);
-	  csum0 = ip_csum_add_even (csum0, ip60->dst_address.as_u64[1]);
-	  *checksum0 = ip_csum_fold (csum0);
-
-	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
-	    {
-	      //Send to fragmentation node if necessary
-	      vnet_buffer (p0)->ip_frag.header_offset = 0;
-	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
-	      vnet_buffer (p0)->ip_frag.next_index = IP6_FRAG_NEXT_IP6_LOOKUP;
-	      next0 = IP4_MAPT_TCP_UDP_NEXT_IP6_FRAG;
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next, pi0,
-					   next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-static_always_inline void
-ip4_map_t_classify (vlib_buffer_t * p0, map_domain_t * d0,
-		    ip4_header_t * ip40, u16 ip4_len0, i32 * dst_port0,
-		    u8 * error0, ip4_mapt_next_t * next0)
-{
-  if (PREDICT_FALSE (ip4_get_fragment_offset (ip40)))
-    {
-      *next0 = IP4_MAPT_NEXT_MAPT_FRAGMENTED;
-      if (d0->ea_bits_len == 0 && d0->rules)
-	{
-	  *dst_port0 = 0;
-	}
-      else
-	{
-	  *dst_port0 = ip4_map_fragment_get_port (ip40);
-	  *error0 = (*dst_port0 == -1) ? MAP_ERROR_FRAGMENT_MEMORY : *error0;
-	}
-    }
-  else if (PREDICT_TRUE (ip40->protocol == IP_PROTOCOL_TCP))
-    {
-      vnet_buffer (p0)->map_t.checksum_offset = 36;
-      *next0 = IP4_MAPT_NEXT_MAPT_TCP_UDP;
-      *error0 = ip4_len0 < 40 ? MAP_ERROR_MALFORMED : *error0;
-      *dst_port0 = (i32) * ((u16 *) u8_ptr_add (ip40, sizeof (*ip40) + 2));
-    }
-  else if (PREDICT_TRUE (ip40->protocol == IP_PROTOCOL_UDP))
-    {
-      vnet_buffer (p0)->map_t.checksum_offset = 26;
-      *next0 = IP4_MAPT_NEXT_MAPT_TCP_UDP;
-      *error0 = ip4_len0 < 28 ? MAP_ERROR_MALFORMED : *error0;
-      *dst_port0 = (i32) * ((u16 *) u8_ptr_add (ip40, sizeof (*ip40) + 2));
-    }
-  else if (ip40->protocol == IP_PROTOCOL_ICMP)
-    {
-      *next0 = IP4_MAPT_NEXT_MAPT_ICMP;
-      if (d0->ea_bits_len == 0 && d0->rules)
-	*dst_port0 = 0;
-      else if (((icmp46_header_t *) u8_ptr_add (ip40, sizeof (*ip40)))->code
-	       == ICMP4_echo_reply
-	       || ((icmp46_header_t *)
-		   u8_ptr_add (ip40,
-			       sizeof (*ip40)))->code == ICMP4_echo_request)
-	*dst_port0 = (i32) * ((u16 *) u8_ptr_add (ip40, sizeof (*ip40) + 6));
-    }
-  else
-    {
-      *error0 = MAP_ERROR_BAD_PROTOCOL;
-    }
-}
-
-static uword
-ip4_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip4_map_t_node.index);
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  vlib_combined_counter_main_t *cm = map_main.domain_counters;
-  u32 cpu_index = os_get_cpu_number ();
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-#ifdef IP4_MAP_T_DUAL_LOOP
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 pi0, pi1;
-	  vlib_buffer_t *p0, *p1;
-	  ip4_header_t *ip40, *ip41;
-	  map_domain_t *d0, *d1;
-	  ip4_mapt_next_t next0 = 0, next1 = 0;
-	  u16 ip4_len0, ip4_len1;
-	  u8 error0, error1;
-	  i32 dst_port0, dst_port1;
-	  ip4_mapt_pseudo_header_t *pheader0, *pheader1;
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  error0 = MAP_ERROR_NONE;
-	  error1 = MAP_ERROR_NONE;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-	  ip40 = vlib_buffer_get_current (p0);
-	  ip41 = vlib_buffer_get_current (p1);
-	  ip4_len0 = clib_host_to_net_u16 (ip40->length);
-	  ip4_len1 = clib_host_to_net_u16 (ip41->length);
-
-	  if (PREDICT_FALSE (p0->current_length < ip4_len0 ||
-			     ip40->ip_version_and_header_length != 0x45))
-	    {
-	      error0 = MAP_ERROR_UNKNOWN;
-	      next0 = IP4_MAPT_NEXT_DROP;
-	    }
-
-	  if (PREDICT_FALSE (p1->current_length < ip4_len1 ||
-			     ip41->ip_version_and_header_length != 0x45))
-	    {
-	      error1 = MAP_ERROR_UNKNOWN;
-	      next1 = IP4_MAPT_NEXT_DROP;
-	    }
-
-	  d0 = ip4_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-				   &vnet_buffer (p0)->map_t.map_domain_index);
-	  d1 = ip4_map_get_domain (vnet_buffer (p1)->ip.adj_index[VLIB_TX],
-				   &vnet_buffer (p1)->map_t.map_domain_index);
-
-	  vnet_buffer (p0)->map_t.mtu = d0->mtu ? d0->mtu : ~0;
-	  vnet_buffer (p1)->map_t.mtu = d1->mtu ? d1->mtu : ~0;
-
-	  dst_port0 = -1;
-	  dst_port1 = -1;
-
-	  ip4_map_t_classify (p0, d0, ip40, ip4_len0, &dst_port0, &error0,
-			      &next0);
-	  ip4_map_t_classify (p1, d1, ip41, ip4_len1, &dst_port1, &error1,
-			      &next1);
-
-	  //Add MAP-T pseudo header in front of the packet
-	  vlib_buffer_advance (p0, -sizeof (*pheader0));
-	  vlib_buffer_advance (p1, -sizeof (*pheader1));
-	  pheader0 = vlib_buffer_get_current (p0);
-	  pheader1 = vlib_buffer_get_current (p1);
-
-	  //Save addresses within the packet
-	  ip4_map_t_embedded_address (d0, &pheader0->saddr,
-				      &ip40->src_address);
-	  ip4_map_t_embedded_address (d1, &pheader1->saddr,
-				      &ip41->src_address);
-	  pheader0->daddr.as_u64[0] =
-	    map_get_pfx_net (d0, ip40->dst_address.as_u32, (u16) dst_port0);
-	  pheader0->daddr.as_u64[1] =
-	    map_get_sfx_net (d0, ip40->dst_address.as_u32, (u16) dst_port0);
-	  pheader1->daddr.as_u64[0] =
-	    map_get_pfx_net (d1, ip41->dst_address.as_u32, (u16) dst_port1);
-	  pheader1->daddr.as_u64[1] =
-	    map_get_sfx_net (d1, ip41->dst_address.as_u32, (u16) dst_port1);
-
-	  if (PREDICT_FALSE
-	      (ip4_is_first_fragment (ip40) && (dst_port0 != -1)
-	       && (d0->ea_bits_len != 0 || !d0->rules)
-	       && ip4_map_fragment_cache (ip40, dst_port0)))
-	    {
-	      error0 = MAP_ERROR_FRAGMENT_MEMORY;
-	    }
-
-	  if (PREDICT_FALSE
-	      (ip4_is_first_fragment (ip41) && (dst_port1 != -1)
-	       && (d1->ea_bits_len != 0 || !d1->rules)
-	       && ip4_map_fragment_cache (ip41, dst_port1)))
-	    {
-	      error1 = MAP_ERROR_FRAGMENT_MEMORY;
-	    }
-
-	  if (PREDICT_TRUE
-	      (error0 == MAP_ERROR_NONE && next0 != IP4_MAPT_NEXT_MAPT_ICMP))
-	    {
-	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
-					       cpu_index,
-					       vnet_buffer (p0)->map_t.
-					       map_domain_index, 1,
-					       clib_net_to_host_u16 (ip40->
-								     length));
-	    }
-
-	  if (PREDICT_TRUE
-	      (error1 == MAP_ERROR_NONE && next1 != IP4_MAPT_NEXT_MAPT_ICMP))
-	    {
-	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
-					       cpu_index,
-					       vnet_buffer (p1)->map_t.
-					       map_domain_index, 1,
-					       clib_net_to_host_u16 (ip41->
-								     length));
-	    }
-
-	  next0 = (error0 != MAP_ERROR_NONE) ? IP4_MAPT_NEXT_DROP : next0;
-	  next1 = (error1 != MAP_ERROR_NONE) ? IP4_MAPT_NEXT_DROP : next1;
-	  p0->error = error_node->errors[error0];
-	  p1->error = error_node->errors[error1];
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
-					   n_left_to_next, pi0, pi1, next0,
-					   next1);
-	}
-#endif
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  ip4_header_t *ip40;
-	  map_domain_t *d0;
-	  ip4_mapt_next_t next0;
-	  u16 ip4_len0;
-	  u8 error0;
-	  i32 dst_port0;
-	  ip4_mapt_pseudo_header_t *pheader0;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  error0 = MAP_ERROR_NONE;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip40 = vlib_buffer_get_current (p0);
-	  ip4_len0 = clib_host_to_net_u16 (ip40->length);
-	  if (PREDICT_FALSE (p0->current_length < ip4_len0 ||
-			     ip40->ip_version_and_header_length != 0x45))
-	    {
-	      error0 = MAP_ERROR_UNKNOWN;
-	      next0 = IP4_MAPT_NEXT_DROP;
-	    }
-
-	  d0 = ip4_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-				   &vnet_buffer (p0)->map_t.map_domain_index);
-
-	  vnet_buffer (p0)->map_t.mtu = d0->mtu ? d0->mtu : ~0;
-
-	  dst_port0 = -1;
-	  ip4_map_t_classify (p0, d0, ip40, ip4_len0, &dst_port0, &error0,
-			      &next0);
-
-	  //Add MAP-T pseudo header in front of the packet
-	  vlib_buffer_advance (p0, -sizeof (*pheader0));
-	  pheader0 = vlib_buffer_get_current (p0);
-
-	  //Save addresses within the packet
-	  ip4_map_t_embedded_address (d0, &pheader0->saddr,
-				      &ip40->src_address);
-	  pheader0->daddr.as_u64[0] =
-	    map_get_pfx_net (d0, ip40->dst_address.as_u32, (u16) dst_port0);
-	  pheader0->daddr.as_u64[1] =
-	    map_get_sfx_net (d0, ip40->dst_address.as_u32, (u16) dst_port0);
-
-	  //It is important to cache at this stage because the result might be necessary
-	  //for packets within the same vector.
-	  //Actually, this approach even provides some limited out-of-order fragments support
-	  if (PREDICT_FALSE
-	      (ip4_is_first_fragment (ip40) && (dst_port0 != -1)
-	       && (d0->ea_bits_len != 0 || !d0->rules)
-	       && ip4_map_fragment_cache (ip40, dst_port0)))
-	    {
-	      error0 = MAP_ERROR_UNKNOWN;
-	    }
-
-	  if (PREDICT_TRUE
-	      (error0 == MAP_ERROR_NONE && next0 != IP4_MAPT_NEXT_MAPT_ICMP))
-	    {
-	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_TX,
-					       cpu_index,
-					       vnet_buffer (p0)->map_t.
-					       map_domain_index, 1,
-					       clib_net_to_host_u16 (ip40->
-								     length));
-	    }
-
-	  next0 = (error0 != MAP_ERROR_NONE) ? IP4_MAPT_NEXT_DROP : next0;
-	  p0->error = error_node->errors[error0];
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next, pi0,
-					   next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return frame->n_vectors;
-}
-
-static char *map_t_error_strings[] = {
-#define _(sym,string) string,
-  foreach_map_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(ip4_map_t_fragmented_node) = {
-  .function = ip4_map_t_fragmented,
-  .name = "ip4-map-t-fragmented",
-  .vector_size = sizeof(u32),
-  .format_trace = format_map_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = MAP_N_ERROR,
-  .error_strings = map_t_error_strings,
-
-  .n_next_nodes = IP4_MAPT_FRAGMENTED_N_NEXT,
-  .next_nodes = {
-      [IP4_MAPT_FRAGMENTED_NEXT_IP6_LOOKUP] = "ip6-lookup",
-      [IP4_MAPT_FRAGMENTED_NEXT_IP6_FRAG] = IP6_FRAG_NODE_NAME,
-      [IP4_MAPT_FRAGMENTED_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(ip4_map_t_icmp_node) = {
-  .function = ip4_map_t_icmp,
-  .name = "ip4-map-t-icmp",
-  .vector_size = sizeof(u32),
-  .format_trace = format_map_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = MAP_N_ERROR,
-  .error_strings = map_t_error_strings,
-
-  .n_next_nodes = IP4_MAPT_ICMP_N_NEXT,
-  .next_nodes = {
-      [IP4_MAPT_ICMP_NEXT_IP6_LOOKUP] = "ip6-lookup",
-      [IP4_MAPT_ICMP_NEXT_IP6_FRAG] = IP6_FRAG_NODE_NAME,
-      [IP4_MAPT_ICMP_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(ip4_map_t_tcp_udp_node) = {
-  .function = ip4_map_t_tcp_udp,
-  .name = "ip4-map-t-tcp-udp",
-  .vector_size = sizeof(u32),
-  .format_trace = format_map_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = MAP_N_ERROR,
-  .error_strings = map_t_error_strings,
-
-  .n_next_nodes = IP4_MAPT_TCP_UDP_N_NEXT,
-  .next_nodes = {
-      [IP4_MAPT_TCP_UDP_NEXT_IP6_LOOKUP] = "ip6-lookup",
-      [IP4_MAPT_TCP_UDP_NEXT_IP6_FRAG] = IP6_FRAG_NODE_NAME,
-      [IP4_MAPT_TCP_UDP_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(ip4_map_t_node) = {
-  .function = ip4_map_t,
-  .name = "ip4-map-t",
-  .vector_size = sizeof(u32),
-  .format_trace = format_map_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = MAP_N_ERROR,
-  .error_strings = map_t_error_strings,
-
-  .n_next_nodes = IP4_MAPT_N_NEXT,
-  .next_nodes = {
-      [IP4_MAPT_NEXT_MAPT_TCP_UDP] = "ip4-map-t-tcp-udp",
-      [IP4_MAPT_NEXT_MAPT_ICMP] = "ip4-map-t-icmp",
-      [IP4_MAPT_NEXT_MAPT_FRAGMENTED] = "ip4-map-t-fragmented",
-      [IP4_MAPT_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/map/ip6_map.c b/vnet/vnet/map/ip6_map.c
deleted file mode 100644
index d2945059..00000000
--- a/vnet/vnet/map/ip6_map.c
+++ /dev/null
@@ -1,1269 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "map.h"
-
-#include "../ip/ip_frag.h"
-
-enum ip6_map_next_e
-{
-  IP6_MAP_NEXT_IP4_LOOKUP,
-#ifdef MAP_SKIP_IP6_LOOKUP
-  IP6_MAP_NEXT_IP4_REWRITE,
-#endif
-  IP6_MAP_NEXT_IP6_REASS,
-  IP6_MAP_NEXT_IP4_REASS,
-  IP6_MAP_NEXT_IP4_FRAGMENT,
-  IP6_MAP_NEXT_IP6_ICMP_RELAY,
-  IP6_MAP_NEXT_IP6_LOCAL,
-  IP6_MAP_NEXT_DROP,
-  IP6_MAP_NEXT_ICMP,
-  IP6_MAP_N_NEXT,
-};
-
-enum ip6_map_ip6_reass_next_e
-{
-  IP6_MAP_IP6_REASS_NEXT_IP6_MAP,
-  IP6_MAP_IP6_REASS_NEXT_DROP,
-  IP6_MAP_IP6_REASS_N_NEXT,
-};
-
-enum ip6_map_ip4_reass_next_e
-{
-  IP6_MAP_IP4_REASS_NEXT_IP4_LOOKUP,
-  IP6_MAP_IP4_REASS_NEXT_IP4_FRAGMENT,
-  IP6_MAP_IP4_REASS_NEXT_DROP,
-  IP6_MAP_IP4_REASS_N_NEXT,
-};
-
-enum ip6_icmp_relay_next_e
-{
-  IP6_ICMP_RELAY_NEXT_IP4_LOOKUP,
-  IP6_ICMP_RELAY_NEXT_DROP,
-  IP6_ICMP_RELAY_N_NEXT,
-};
-
-vlib_node_registration_t ip6_map_ip4_reass_node;
-vlib_node_registration_t ip6_map_ip6_reass_node;
-static vlib_node_registration_t ip6_map_icmp_relay_node;
-
-typedef struct
-{
-  u32 map_domain_index;
-  u16 port;
-  u8 cached;
-} map_ip6_map_ip4_reass_trace_t;
-
-u8 *
-format_ip6_map_ip4_reass_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  map_ip6_map_ip4_reass_trace_t *t =
-    va_arg (*args, map_ip6_map_ip4_reass_trace_t *);
-  return format (s, "MAP domain index: %d L4 port: %u Status: %s",
-		 t->map_domain_index, t->port,
-		 t->cached ? "cached" : "forwarded");
-}
-
-typedef struct
-{
-  u16 offset;
-  u16 frag_len;
-  u8 out;
-} map_ip6_map_ip6_reass_trace_t;
-
-u8 *
-format_ip6_map_ip6_reass_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  map_ip6_map_ip6_reass_trace_t *t =
-    va_arg (*args, map_ip6_map_ip6_reass_trace_t *);
-  return format (s, "Offset: %d Fragment length: %d Status: %s", t->offset,
-		 t->frag_len, t->out ? "out" : "in");
-}
-
-/*
- * ip6_map_sec_check
- */
-static_always_inline bool
-ip6_map_sec_check (map_domain_t * d, u16 port, ip4_header_t * ip4,
-		   ip6_header_t * ip6)
-{
-  u16 sp4 = clib_net_to_host_u16 (port);
-  u32 sa4 = clib_net_to_host_u32 (ip4->src_address.as_u32);
-  u64 sal6 = map_get_pfx (d, sa4, sp4);
-  u64 sar6 = map_get_sfx (d, sa4, sp4);
-
-  if (PREDICT_FALSE
-      (sal6 != clib_net_to_host_u64 (ip6->src_address.as_u64[0])
-       || sar6 != clib_net_to_host_u64 (ip6->src_address.as_u64[1])))
-    return (false);
-  return (true);
-}
-
-static_always_inline void
-ip6_map_security_check (map_domain_t * d, ip4_header_t * ip4,
-			ip6_header_t * ip6, u32 * next, u8 * error)
-{
-  map_main_t *mm = &map_main;
-  if (d->ea_bits_len || d->rules)
-    {
-      if (d->psid_length > 0)
-	{
-	  if (!ip4_is_fragment (ip4))
-	    {
-	      u16 port = ip4_map_get_port (ip4, MAP_SENDER);
-	      if (port)
-		{
-		  if (mm->sec_check)
-		    *error =
-		      ip6_map_sec_check (d, port, ip4,
-					 ip6) ? MAP_ERROR_NONE :
-		      MAP_ERROR_DECAP_SEC_CHECK;
-		}
-	      else
-		{
-		  *error = MAP_ERROR_BAD_PROTOCOL;
-		}
-	    }
-	  else
-	    {
-	      *next = mm->sec_check_frag ? IP6_MAP_NEXT_IP4_REASS : *next;
-	    }
-	}
-    }
-}
-
-static_always_inline bool
-ip6_map_ip4_lookup_bypass (vlib_buffer_t * p0, ip4_header_t * ip)
-{
-#ifdef MAP_SKIP_IP6_LOOKUP
-  map_main_t *mm = &map_main;
-  u32 adj_index0 = mm->adj4_index;
-  if (adj_index0 > 0)
-    {
-      ip_lookup_main_t *lm4 = &ip4_main.lookup_main;
-      ip_adjacency_t *adj = ip_get_adjacency (lm4, mm->adj4_index);
-      if (adj->n_adj > 1)
-	{
-	  u32 hash_c0 = ip4_compute_flow_hash (ip, IP_FLOW_HASH_DEFAULT);
-	  adj_index0 += (hash_c0 & (adj->n_adj - 1));
-	}
-      vnet_buffer (p0)->ip.adj_index[VLIB_TX] = adj_index0;
-      return (true);
-    }
-#endif
-  return (false);
-}
-
-/*
- * ip6_map
- */
-static uword
-ip6_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip6_map_node.index);
-  map_main_t *mm = &map_main;
-  vlib_combined_counter_main_t *cm = mm->domain_counters;
-  u32 cpu_index = os_get_cpu_number ();
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /* Dual loop */
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 pi0, pi1;
-	  vlib_buffer_t *p0, *p1;
-	  u8 error0 = MAP_ERROR_NONE;
-	  u8 error1 = MAP_ERROR_NONE;
-	  map_domain_t *d0 = 0, *d1 = 0;
-	  ip4_header_t *ip40, *ip41;
-	  ip6_header_t *ip60, *ip61;
-	  u16 port0 = 0, port1 = 0;
-	  u32 map_domain_index0 = ~0, map_domain_index1 = ~0;
-	  u32 next0 = IP6_MAP_NEXT_IP4_LOOKUP;
-	  u32 next1 = IP6_MAP_NEXT_IP4_LOOKUP;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    /* IPv6 + IPv4 header + 8 bytes of ULP */
-	    CLIB_PREFETCH (p2->data, 68, LOAD);
-	    CLIB_PREFETCH (p3->data, 68, LOAD);
-	  }
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-	  ip60 = vlib_buffer_get_current (p0);
-	  ip61 = vlib_buffer_get_current (p1);
-	  vlib_buffer_advance (p0, sizeof (ip6_header_t));
-	  vlib_buffer_advance (p1, sizeof (ip6_header_t));
-	  ip40 = vlib_buffer_get_current (p0);
-	  ip41 = vlib_buffer_get_current (p1);
-
-	  /*
-	   * Encapsulated IPv4 packet
-	   *   - IPv4 fragmented -> Pass to virtual reassembly unless security check disabled
-	   *   - Lookup/Rewrite or Fragment node in case of packet > MTU
-	   * Fragmented IPv6 packet
-	   * ICMP IPv6 packet
-	   *   - Error -> Pass to ICMPv6/ICMPv4 relay
-	   *   - Info -> Pass to IPv6 local
-	   * Anything else -> drop
-	   */
-	  if (PREDICT_TRUE
-	      (ip60->protocol == IP_PROTOCOL_IP_IN_IP
-	       && clib_net_to_host_u16 (ip60->payload_length) > 20))
-	    {
-	      d0 =
-		ip6_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-				    (ip4_address_t *) & ip40->src_address.
-				    as_u32, &map_domain_index0, &error0);
-	    }
-	  else if (ip60->protocol == IP_PROTOCOL_ICMP6 &&
-		   clib_net_to_host_u16 (ip60->payload_length) >
-		   sizeof (icmp46_header_t))
-	    {
-	      icmp46_header_t *icmp = (void *) (ip60 + 1);
-	      next0 = (icmp->type == ICMP6_echo_request
-		       || icmp->type ==
-		       ICMP6_echo_reply) ? IP6_MAP_NEXT_IP6_LOCAL :
-		IP6_MAP_NEXT_IP6_ICMP_RELAY;
-	    }
-	  else if (ip60->protocol == IP_PROTOCOL_IPV6_FRAGMENTATION)
-	    {
-	      next0 = IP6_MAP_NEXT_IP6_REASS;
-	    }
-	  else
-	    {
-	      error0 = MAP_ERROR_BAD_PROTOCOL;
-	    }
-	  if (PREDICT_TRUE
-	      (ip61->protocol == IP_PROTOCOL_IP_IN_IP
-	       && clib_net_to_host_u16 (ip61->payload_length) > 20))
-	    {
-	      d1 =
-		ip6_map_get_domain (vnet_buffer (p1)->ip.adj_index[VLIB_TX],
-				    (ip4_address_t *) & ip41->src_address.
-				    as_u32, &map_domain_index1, &error1);
-	    }
-	  else if (ip61->protocol == IP_PROTOCOL_ICMP6 &&
-		   clib_net_to_host_u16 (ip61->payload_length) >
-		   sizeof (icmp46_header_t))
-	    {
-	      icmp46_header_t *icmp = (void *) (ip61 + 1);
-	      next1 = (icmp->type == ICMP6_echo_request
-		       || icmp->type ==
-		       ICMP6_echo_reply) ? IP6_MAP_NEXT_IP6_LOCAL :
-		IP6_MAP_NEXT_IP6_ICMP_RELAY;
-	    }
-	  else if (ip61->protocol == IP_PROTOCOL_IPV6_FRAGMENTATION)
-	    {
-	      next1 = IP6_MAP_NEXT_IP6_REASS;
-	    }
-	  else
-	    {
-	      error1 = MAP_ERROR_BAD_PROTOCOL;
-	    }
-
-	  if (d0)
-	    {
-	      /* MAP inbound security check */
-	      ip6_map_security_check (d0, ip40, ip60, &next0, &error0);
-
-	      if (PREDICT_TRUE (error0 == MAP_ERROR_NONE &&
-				next0 == IP6_MAP_NEXT_IP4_LOOKUP))
-		{
-		  if (PREDICT_FALSE
-		      (d0->mtu
-		       && (clib_host_to_net_u16 (ip40->length) > d0->mtu)))
-		    {
-		      vnet_buffer (p0)->ip_frag.header_offset = 0;
-		      vnet_buffer (p0)->ip_frag.flags = 0;
-		      vnet_buffer (p0)->ip_frag.next_index =
-			IP4_FRAG_NEXT_IP4_LOOKUP;
-		      vnet_buffer (p0)->ip_frag.mtu = d0->mtu;
-		      next0 = IP6_MAP_NEXT_IP4_FRAGMENT;
-		    }
-		  else
-		    {
-		      next0 =
-			ip6_map_ip4_lookup_bypass (p0,
-						   ip40) ?
-			IP6_MAP_NEXT_IP4_REWRITE : next0;
-		    }
-		  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-						   cpu_index,
-						   map_domain_index0, 1,
-						   clib_net_to_host_u16
-						   (ip40->length));
-		}
-	    }
-	  if (d1)
-	    {
-	      /* MAP inbound security check */
-	      ip6_map_security_check (d1, ip41, ip61, &next1, &error1);
-
-	      if (PREDICT_TRUE (error1 == MAP_ERROR_NONE &&
-				next1 == IP6_MAP_NEXT_IP4_LOOKUP))
-		{
-		  if (PREDICT_FALSE
-		      (d1->mtu
-		       && (clib_host_to_net_u16 (ip41->length) > d1->mtu)))
-		    {
-		      vnet_buffer (p1)->ip_frag.header_offset = 0;
-		      vnet_buffer (p1)->ip_frag.flags = 0;
-		      vnet_buffer (p1)->ip_frag.next_index =
-			IP4_FRAG_NEXT_IP4_LOOKUP;
-		      vnet_buffer (p1)->ip_frag.mtu = d1->mtu;
-		      next1 = IP6_MAP_NEXT_IP4_FRAGMENT;
-		    }
-		  else
-		    {
-		      next1 =
-			ip6_map_ip4_lookup_bypass (p1,
-						   ip41) ?
-			IP6_MAP_NEXT_IP4_REWRITE : next1;
-		    }
-		  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-						   cpu_index,
-						   map_domain_index1, 1,
-						   clib_net_to_host_u16
-						   (ip41->length));
-		}
-	    }
-
-	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      map_trace_t *tr = vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->map_domain_index = map_domain_index0;
-	      tr->port = port0;
-	    }
-
-	  if (PREDICT_FALSE (p1->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      map_trace_t *tr = vlib_add_trace (vm, node, p1, sizeof (*tr));
-	      tr->map_domain_index = map_domain_index1;
-	      tr->port = port1;
-	    }
-
-	  if (error0 == MAP_ERROR_DECAP_SEC_CHECK && mm->icmp6_enabled)
-	    {
-	      /* Set ICMP parameters */
-	      vlib_buffer_advance (p0, -sizeof (ip6_header_t));
-	      icmp6_error_set_vnet_buffer (p0, ICMP6_destination_unreachable,
-					   ICMP6_destination_unreachable_source_address_failed_policy,
-					   0);
-	      next0 = IP6_MAP_NEXT_ICMP;
-	    }
-	  else
-	    {
-	      next0 = (error0 == MAP_ERROR_NONE) ? next0 : IP6_MAP_NEXT_DROP;
-	    }
-
-	  if (error1 == MAP_ERROR_DECAP_SEC_CHECK && mm->icmp6_enabled)
-	    {
-	      /* Set ICMP parameters */
-	      vlib_buffer_advance (p1, -sizeof (ip6_header_t));
-	      icmp6_error_set_vnet_buffer (p1, ICMP6_destination_unreachable,
-					   ICMP6_destination_unreachable_source_address_failed_policy,
-					   0);
-	      next1 = IP6_MAP_NEXT_ICMP;
-	    }
-	  else
-	    {
-	      next1 = (error1 == MAP_ERROR_NONE) ? next1 : IP6_MAP_NEXT_DROP;
-	    }
-
-	  /* Reset packet */
-	  if (next0 == IP6_MAP_NEXT_IP6_LOCAL)
-	    vlib_buffer_advance (p0, -sizeof (ip6_header_t));
-	  if (next1 == IP6_MAP_NEXT_IP6_LOCAL)
-	    vlib_buffer_advance (p1, -sizeof (ip6_header_t));
-
-	  p0->error = error_node->errors[error0];
-	  p1->error = error_node->errors[error1];
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
-					   n_left_to_next, pi0, pi1, next0,
-					   next1);
-	}
-
-      /* Single loop */
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  u8 error0 = MAP_ERROR_NONE;
-	  map_domain_t *d0 = 0;
-	  ip4_header_t *ip40;
-	  ip6_header_t *ip60;
-	  i32 port0 = 0;
-	  u32 map_domain_index0 = ~0;
-	  u32 next0 = IP6_MAP_NEXT_IP4_LOOKUP;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip60 = vlib_buffer_get_current (p0);
-	  vlib_buffer_advance (p0, sizeof (ip6_header_t));
-	  ip40 = vlib_buffer_get_current (p0);
-
-	  /*
-	   * Encapsulated IPv4 packet
-	   *   - IPv4 fragmented -> Pass to virtual reassembly unless security check disabled
-	   *   - Lookup/Rewrite or Fragment node in case of packet > MTU
-	   * Fragmented IPv6 packet
-	   * ICMP IPv6 packet
-	   *   - Error -> Pass to ICMPv6/ICMPv4 relay
-	   *   - Info -> Pass to IPv6 local
-	   * Anything else -> drop
-	   */
-	  if (PREDICT_TRUE
-	      (ip60->protocol == IP_PROTOCOL_IP_IN_IP
-	       && clib_net_to_host_u16 (ip60->payload_length) > 20))
-	    {
-	      d0 =
-		ip6_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-				    (ip4_address_t *) & ip40->src_address.
-				    as_u32, &map_domain_index0, &error0);
-	    }
-	  else if (ip60->protocol == IP_PROTOCOL_ICMP6 &&
-		   clib_net_to_host_u16 (ip60->payload_length) >
-		   sizeof (icmp46_header_t))
-	    {
-	      icmp46_header_t *icmp = (void *) (ip60 + 1);
-	      next0 = (icmp->type == ICMP6_echo_request
-		       || icmp->type ==
-		       ICMP6_echo_reply) ? IP6_MAP_NEXT_IP6_LOCAL :
-		IP6_MAP_NEXT_IP6_ICMP_RELAY;
-	    }
-	  else if (ip60->protocol == IP_PROTOCOL_IPV6_FRAGMENTATION &&
-		   (((ip6_frag_hdr_t *) (ip60 + 1))->next_hdr ==
-		    IP_PROTOCOL_IP_IN_IP))
-	    {
-	      next0 = IP6_MAP_NEXT_IP6_REASS;
-	    }
-	  else
-	    {
-	      error0 = MAP_ERROR_BAD_PROTOCOL;
-	    }
-
-	  if (d0)
-	    {
-	      /* MAP inbound security check */
-	      ip6_map_security_check (d0, ip40, ip60, &next0, &error0);
-
-	      if (PREDICT_TRUE (error0 == MAP_ERROR_NONE &&
-				next0 == IP6_MAP_NEXT_IP4_LOOKUP))
-		{
-		  if (PREDICT_FALSE
-		      (d0->mtu
-		       && (clib_host_to_net_u16 (ip40->length) > d0->mtu)))
-		    {
-		      vnet_buffer (p0)->ip_frag.header_offset = 0;
-		      vnet_buffer (p0)->ip_frag.flags = 0;
-		      vnet_buffer (p0)->ip_frag.next_index =
-			IP4_FRAG_NEXT_IP4_LOOKUP;
-		      vnet_buffer (p0)->ip_frag.mtu = d0->mtu;
-		      next0 = IP6_MAP_NEXT_IP4_FRAGMENT;
-		    }
-		  else
-		    {
-		      next0 =
-			ip6_map_ip4_lookup_bypass (p0,
-						   ip40) ?
-			IP6_MAP_NEXT_IP4_REWRITE : next0;
-		    }
-		  vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-						   cpu_index,
-						   map_domain_index0, 1,
-						   clib_net_to_host_u16
-						   (ip40->length));
-		}
-	    }
-
-	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      map_trace_t *tr = vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->map_domain_index = map_domain_index0;
-	      tr->port = (u16) port0;
-	    }
-
-	  if (mm->icmp6_enabled &&
-	      (error0 == MAP_ERROR_DECAP_SEC_CHECK
-	       || error0 == MAP_ERROR_NO_DOMAIN))
-	    {
-	      /* Set ICMP parameters */
-	      vlib_buffer_advance (p0, -sizeof (ip6_header_t));
-	      icmp6_error_set_vnet_buffer (p0, ICMP6_destination_unreachable,
-					   ICMP6_destination_unreachable_source_address_failed_policy,
-					   0);
-	      next0 = IP6_MAP_NEXT_ICMP;
-	    }
-	  else
-	    {
-	      next0 = (error0 == MAP_ERROR_NONE) ? next0 : IP6_MAP_NEXT_DROP;
-	    }
-
-	  /* Reset packet */
-	  if (next0 == IP6_MAP_NEXT_IP6_LOCAL)
-	    vlib_buffer_advance (p0, -sizeof (ip6_header_t));
-
-	  p0->error = error_node->errors[error0];
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, pi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-
-static_always_inline void
-ip6_map_ip6_reass_prepare (vlib_main_t * vm, vlib_node_runtime_t * node,
-			   map_ip6_reass_t * r, u32 ** fragments_ready,
-			   u32 ** fragments_to_drop)
-{
-  ip4_header_t *ip40;
-  ip6_header_t *ip60;
-  ip6_frag_hdr_t *frag0;
-  vlib_buffer_t *p0;
-
-  if (!r->ip4_header.ip_version_and_header_length)
-    return;
-
-  //The IP header is here, we need to check for packets
-  //that can be forwarded
-  int i;
-  for (i = 0; i < MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
-    {
-      if (r->fragments[i].pi == ~0 ||
-	  ((!r->fragments[i].next_data_len)
-	   && (r->fragments[i].next_data_offset != (0xffff))))
-	continue;
-
-      p0 = vlib_get_buffer (vm, r->fragments[i].pi);
-      ip60 = vlib_buffer_get_current (p0);
-      frag0 = (ip6_frag_hdr_t *) (ip60 + 1);
-      ip40 = (ip4_header_t *) (frag0 + 1);
-
-      if (ip6_frag_hdr_offset (frag0))
-	{
-	  //Not first fragment, add the IPv4 header
-	  clib_memcpy (ip40, &r->ip4_header, 20);
-	}
-
-#ifdef MAP_IP6_REASS_COUNT_BYTES
-      r->forwarded +=
-	clib_net_to_host_u16 (ip60->payload_length) - sizeof (*frag0);
-#endif
-
-      if (ip6_frag_hdr_more (frag0))
-	{
-	  //Not last fragment, we copy end of next
-	  clib_memcpy (u8_ptr_add (ip60, p0->current_length),
-		       r->fragments[i].next_data, 20);
-	  p0->current_length += 20;
-	  ip60->payload_length = u16_net_add (ip60->payload_length, 20);
-	}
-
-      if (!ip4_is_fragment (ip40))
-	{
-	  ip40->fragment_id = frag_id_6to4 (frag0->identification);
-	  ip40->flags_and_fragment_offset =
-	    clib_host_to_net_u16 (ip6_frag_hdr_offset (frag0));
-	}
-      else
-	{
-	  ip40->flags_and_fragment_offset =
-	    clib_host_to_net_u16 (ip4_get_fragment_offset (ip40) +
-				  ip6_frag_hdr_offset (frag0));
-	}
-
-      if (ip6_frag_hdr_more (frag0))
-	ip40->flags_and_fragment_offset |=
-	  clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS);
-
-      ip40->length =
-	clib_host_to_net_u16 (p0->current_length - sizeof (*ip60) -
-			      sizeof (*frag0));
-      ip40->checksum = ip4_header_checksum (ip40);
-
-      if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	{
-	  map_ip6_map_ip6_reass_trace_t *tr =
-	    vlib_add_trace (vm, node, p0, sizeof (*tr));
-	  tr->offset = ip4_get_fragment_offset (ip40);
-	  tr->frag_len = clib_net_to_host_u16 (ip40->length) - sizeof (*ip40);
-	  tr->out = 1;
-	}
-
-      vec_add1 (*fragments_ready, r->fragments[i].pi);
-      r->fragments[i].pi = ~0;
-      r->fragments[i].next_data_len = 0;
-      r->fragments[i].next_data_offset = 0;
-      map_main.ip6_reass_buffered_counter--;
-
-      //TODO: Best solution would be that ip6_map handles extension headers
-      // and ignores atomic fragment. But in the meantime, let's just copy the header.
-
-      u8 protocol = frag0->next_hdr;
-      memmove (u8_ptr_add (ip40, -sizeof (*ip60)), ip60, sizeof (*ip60));
-      ((ip6_header_t *) u8_ptr_add (ip40, -sizeof (*ip60)))->protocol =
-	protocol;
-      vlib_buffer_advance (p0, sizeof (*frag0));
-    }
-}
-
-void
-map_ip6_drop_pi (u32 pi)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vlib_node_runtime_t *n =
-    vlib_node_get_runtime (vm, ip6_map_ip6_reass_node.index);
-  vlib_set_next_frame_buffer (vm, n, IP6_MAP_IP6_REASS_NEXT_DROP, pi);
-}
-
-void
-map_ip4_drop_pi (u32 pi)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vlib_node_runtime_t *n =
-    vlib_node_get_runtime (vm, ip6_map_ip4_reass_node.index);
-  vlib_set_next_frame_buffer (vm, n, IP6_MAP_IP4_REASS_NEXT_DROP, pi);
-}
-
-/*
- * ip6_reass
- * TODO: We should count the number of successfully
- * transmitted fragment bytes and compare that to the last fragment
- * offset such that we can free the reassembly structure when all fragments
- * have been forwarded.
- */
-static uword
-ip6_map_ip6_reass (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip6_map_ip6_reass_node.index);
-  u32 *fragments_to_drop = NULL;
-  u32 *fragments_ready = NULL;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /* Single loop */
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  u8 error0 = MAP_ERROR_NONE;
-	  ip6_header_t *ip60;
-	  ip6_frag_hdr_t *frag0;
-	  u16 offset;
-	  u16 next_offset;
-	  u16 frag_len;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip60 = vlib_buffer_get_current (p0);
-	  frag0 = (ip6_frag_hdr_t *) (ip60 + 1);
-	  offset =
-	    clib_host_to_net_u16 (frag0->fragment_offset_and_more) & (~7);
-	  frag_len =
-	    clib_net_to_host_u16 (ip60->payload_length) - sizeof (*frag0);
-	  next_offset =
-	    ip6_frag_hdr_more (frag0) ? (offset + frag_len) : (0xffff);
-
-	  //FIXME: Support other extension headers, maybe
-
-	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      map_ip6_map_ip6_reass_trace_t *tr =
-		vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->offset = offset;
-	      tr->frag_len = frag_len;
-	      tr->out = 0;
-	    }
-
-	  map_ip6_reass_lock ();
-	  map_ip6_reass_t *r =
-	    map_ip6_reass_get (&ip60->src_address, &ip60->dst_address,
-			       frag0->identification, frag0->next_hdr,
-			       &fragments_to_drop);
-	  //FIXME: Use better error codes
-	  if (PREDICT_FALSE (!r))
-	    {
-	      // Could not create a caching entry
-	      error0 = MAP_ERROR_FRAGMENT_MEMORY;
-	    }
-	  else if (PREDICT_FALSE ((frag_len <= 20 &&
-				   (ip6_frag_hdr_more (frag0) || (!offset)))))
-	    {
-	      //Very small fragment are restricted to the last one and
-	      //can't be the first one
-	      error0 = MAP_ERROR_FRAGMENT_MALFORMED;
-	    }
-	  else
-	    if (map_ip6_reass_add_fragment
-		(r, pi0, offset, next_offset, (u8 *) (frag0 + 1), frag_len))
-	    {
-	      map_ip6_reass_free (r, &fragments_to_drop);
-	      error0 = MAP_ERROR_FRAGMENT_MEMORY;
-	    }
-	  else
-	    {
-#ifdef MAP_IP6_REASS_COUNT_BYTES
-	      if (!ip6_frag_hdr_more (frag0))
-		r->expected_total = offset + frag_len;
-#endif
-	      ip6_map_ip6_reass_prepare (vm, node, r, &fragments_ready,
-					 &fragments_to_drop);
-#ifdef MAP_IP6_REASS_COUNT_BYTES
-	      if (r->forwarded >= r->expected_total)
-		map_ip6_reass_free (r, &fragments_to_drop);
-#endif
-	    }
-	  map_ip6_reass_unlock ();
-
-	  if (error0 == MAP_ERROR_NONE)
-	    {
-	      if (frag_len > 20)
-		{
-		  //Dequeue the packet
-		  n_left_to_next++;
-		  to_next--;
-		}
-	      else
-		{
-		  //All data from that packet was copied no need to keep it, but this is not an error
-		  p0->error = error_node->errors[MAP_ERROR_NONE];
-		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-						   to_next, n_left_to_next,
-						   pi0,
-						   IP6_MAP_IP6_REASS_NEXT_DROP);
-		}
-	    }
-	  else
-	    {
-	      p0->error = error_node->errors[error0];
-	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					       n_left_to_next, pi0,
-					       IP6_MAP_IP6_REASS_NEXT_DROP);
-	    }
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  map_send_all_to_node (vm, fragments_ready, node,
-			&error_node->errors[MAP_ERROR_NONE],
-			IP6_MAP_IP6_REASS_NEXT_IP6_MAP);
-  map_send_all_to_node (vm, fragments_to_drop, node,
-			&error_node->errors[MAP_ERROR_FRAGMENT_DROPPED],
-			IP6_MAP_IP6_REASS_NEXT_DROP);
-
-  vec_free (fragments_to_drop);
-  vec_free (fragments_ready);
-  return frame->n_vectors;
-}
-
-/*
- * ip6_ip4_virt_reass
- */
-static uword
-ip6_map_ip4_reass (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip6_map_ip4_reass_node.index);
-  map_main_t *mm = &map_main;
-  vlib_combined_counter_main_t *cm = mm->domain_counters;
-  u32 cpu_index = os_get_cpu_number ();
-  u32 *fragments_to_drop = NULL;
-  u32 *fragments_to_loopback = NULL;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /* Single loop */
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  u8 error0 = MAP_ERROR_NONE;
-	  map_domain_t *d0;
-	  ip4_header_t *ip40;
-	  ip6_header_t *ip60;
-	  i32 port0 = 0;
-	  u32 map_domain_index0 = ~0;
-	  u32 next0 = IP6_MAP_IP4_REASS_NEXT_IP4_LOOKUP;
-	  u8 cached = 0;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip40 = vlib_buffer_get_current (p0);
-	  ip60 = ((ip6_header_t *) ip40) - 1;
-
-	  d0 =
-	    ip6_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-				(ip4_address_t *) & ip40->src_address.as_u32,
-				&map_domain_index0, &error0);
-
-	  map_ip4_reass_lock ();
-	  //This node only deals with fragmented ip4
-	  map_ip4_reass_t *r = map_ip4_reass_get (ip40->src_address.as_u32,
-						  ip40->dst_address.as_u32,
-						  ip40->fragment_id,
-						  ip40->protocol,
-						  &fragments_to_drop);
-	  if (PREDICT_FALSE (!r))
-	    {
-	      // Could not create a caching entry
-	      error0 = MAP_ERROR_FRAGMENT_MEMORY;
-	    }
-	  else if (PREDICT_TRUE (ip4_get_fragment_offset (ip40)))
-	    {
-	      // This is a fragment
-	      if (r->port >= 0)
-		{
-		  // We know the port already
-		  port0 = r->port;
-		}
-	      else if (map_ip4_reass_add_fragment (r, pi0))
-		{
-		  // Not enough space for caching
-		  error0 = MAP_ERROR_FRAGMENT_MEMORY;
-		  map_ip4_reass_free (r, &fragments_to_drop);
-		}
-	      else
-		{
-		  cached = 1;
-		}
-	    }
-	  else
-	    if ((port0 =
-		 ip4_get_port (ip40, MAP_SENDER, p0->current_length)) < 0)
-	    {
-	      // Could not find port from first fragment. Stop reassembling.
-	      error0 = MAP_ERROR_BAD_PROTOCOL;
-	      port0 = 0;
-	      map_ip4_reass_free (r, &fragments_to_drop);
-	    }
-	  else
-	    {
-	      // Found port. Remember it and loopback saved fragments
-	      r->port = port0;
-	      map_ip4_reass_get_fragments (r, &fragments_to_loopback);
-	    }
-
-#ifdef MAP_IP4_REASS_COUNT_BYTES
-	  if (!cached && r)
-	    {
-	      r->forwarded += clib_host_to_net_u16 (ip40->length) - 20;
-	      if (!ip4_get_fragment_more (ip40))
-		r->expected_total =
-		  ip4_get_fragment_offset (ip40) * 8 +
-		  clib_host_to_net_u16 (ip40->length) - 20;
-	      if (r->forwarded >= r->expected_total)
-		map_ip4_reass_free (r, &fragments_to_drop);
-	    }
-#endif
-
-	  map_ip4_reass_unlock ();
-
-	  if (PREDICT_TRUE (error0 == MAP_ERROR_NONE))
-	    error0 =
-	      ip6_map_sec_check (d0, port0, ip40,
-				 ip60) ? MAP_ERROR_NONE :
-	      MAP_ERROR_DECAP_SEC_CHECK;
-
-	  if (PREDICT_FALSE
-	      (d0->mtu && (clib_host_to_net_u16 (ip40->length) > d0->mtu)
-	       && error0 == MAP_ERROR_NONE && !cached))
-	    {
-	      vnet_buffer (p0)->ip_frag.header_offset = 0;
-	      vnet_buffer (p0)->ip_frag.flags = 0;
-	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
-	      vnet_buffer (p0)->ip_frag.mtu = d0->mtu;
-	      next0 = IP6_MAP_IP4_REASS_NEXT_IP4_FRAGMENT;
-	    }
-
-	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      map_ip6_map_ip4_reass_trace_t *tr =
-		vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->map_domain_index = map_domain_index0;
-	      tr->port = port0;
-	      tr->cached = cached;
-	    }
-
-	  if (cached)
-	    {
-	      //Dequeue the packet
-	      n_left_to_next++;
-	      to_next--;
-	    }
-	  else
-	    {
-	      if (error0 == MAP_ERROR_NONE)
-		vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-						 cpu_index, map_domain_index0,
-						 1,
-						 clib_net_to_host_u16
-						 (ip40->length));
-	      next0 =
-		(error0 ==
-		 MAP_ERROR_NONE) ? next0 : IP6_MAP_IP4_REASS_NEXT_DROP;
-	      p0->error = error_node->errors[error0];
-	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					       n_left_to_next, pi0, next0);
-	    }
-
-	  //Loopback when we reach the end of the inpu vector
-	  if (n_left_from == 0 && vec_len (fragments_to_loopback))
-	    {
-	      from = vlib_frame_vector_args (frame);
-	      u32 len = vec_len (fragments_to_loopback);
-	      if (len <= VLIB_FRAME_SIZE)
-		{
-		  clib_memcpy (from, fragments_to_loopback,
-			       sizeof (u32) * len);
-		  n_left_from = len;
-		  vec_reset_length (fragments_to_loopback);
-		}
-	      else
-		{
-		  clib_memcpy (from,
-			       fragments_to_loopback + (len -
-							VLIB_FRAME_SIZE),
-			       sizeof (u32) * VLIB_FRAME_SIZE);
-		  n_left_from = VLIB_FRAME_SIZE;
-		  _vec_len (fragments_to_loopback) = len - VLIB_FRAME_SIZE;
-		}
-	    }
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  map_send_all_to_node (vm, fragments_to_drop, node,
-			&error_node->errors[MAP_ERROR_FRAGMENT_DROPPED],
-			IP6_MAP_IP4_REASS_NEXT_DROP);
-
-  vec_free (fragments_to_drop);
-  vec_free (fragments_to_loopback);
-  return frame->n_vectors;
-}
-
-/*
- * ip6_icmp_relay
- */
-static uword
-ip6_map_icmp_relay (vlib_main_t * vm,
-		    vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip6_map_icmp_relay_node.index);
-  map_main_t *mm = &map_main;
-  u32 cpu_index = os_get_cpu_number ();
-  u16 *fragment_ids, *fid;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  /* Get random fragment IDs for replies. */
-  fid = fragment_ids =
-    clib_random_buffer_get_data (&vm->random_buffer,
-				 n_left_from * sizeof (fragment_ids[0]));
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /* Single loop */
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  u8 error0 = MAP_ERROR_NONE;
-	  ip6_header_t *ip60;
-	  u32 next0 = IP6_ICMP_RELAY_NEXT_IP4_LOOKUP;
-	  u32 mtu;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip60 = vlib_buffer_get_current (p0);
-	  u16 tlen = clib_net_to_host_u16 (ip60->payload_length);
-
-	  /*
-	   * In:
-	   *  IPv6 header           (40)
-	   *  ICMPv6 header          (8)
-	   *  IPv6 header           (40)
-	   *  Original IPv4 header / packet
-	   * Out:
-	   *  New IPv4 header
-	   *  New ICMP header
-	   *  Original IPv4 header / packet
-	   */
-
-	  /* Need at least ICMP(8) + IPv6(40) + IPv4(20) + L4 header(8) */
-	  if (tlen < 76)
-	    {
-	      error0 = MAP_ERROR_ICMP_RELAY;
-	      goto error;
-	    }
-
-	  icmp46_header_t *icmp60 = (icmp46_header_t *) (ip60 + 1);
-	  ip6_header_t *inner_ip60 = (ip6_header_t *) (icmp60 + 2);
-
-	  if (inner_ip60->protocol != IP_PROTOCOL_IP_IN_IP)
-	    {
-	      error0 = MAP_ERROR_ICMP_RELAY;
-	      goto error;
-	    }
-
-	  ip4_header_t *inner_ip40 = (ip4_header_t *) (inner_ip60 + 1);
-	  vlib_buffer_advance (p0, 60);	/* sizeof ( IPv6 + ICMP + IPv6 - IPv4 - ICMP ) */
-	  ip4_header_t *new_ip40 = vlib_buffer_get_current (p0);
-	  icmp46_header_t *new_icmp40 = (icmp46_header_t *) (new_ip40 + 1);
-
-	  /*
-	   * Relay according to RFC2473, section 8.3
-	   */
-	  switch (icmp60->type)
-	    {
-	    case ICMP6_destination_unreachable:
-	    case ICMP6_time_exceeded:
-	    case ICMP6_parameter_problem:
-	      /* Type 3 - destination unreachable, Code 1 - host unreachable */
-	      new_icmp40->type = ICMP4_destination_unreachable;
-	      new_icmp40->code =
-		ICMP4_destination_unreachable_destination_unreachable_host;
-	      break;
-
-	    case ICMP6_packet_too_big:
-	      /* Type 3 - destination unreachable, Code 4 - packet too big */
-	      /* Potential TODO: Adjust domain tunnel MTU based on the value received here */
-	      mtu = clib_net_to_host_u32 (*((u32 *) (icmp60 + 1)));
-
-	      /* Check DF flag */
-	      if (!
-		  (inner_ip40->flags_and_fragment_offset &
-		   clib_host_to_net_u16 (IP4_HEADER_FLAG_DONT_FRAGMENT)))
-		{
-		  error0 = MAP_ERROR_ICMP_RELAY;
-		  goto error;
-		}
-
-	      new_icmp40->type = ICMP4_destination_unreachable;
-	      new_icmp40->code =
-		ICMP4_destination_unreachable_fragmentation_needed_and_dont_fragment_set;
-	      *((u32 *) (new_icmp40 + 1)) =
-		clib_host_to_net_u32 (mtu < 1280 ? 1280 : mtu);
-	      break;
-
-	    default:
-	      error0 = MAP_ERROR_ICMP_RELAY;
-	      break;
-	    }
-
-	  /*
-	   * Ensure the total ICMP packet is no longer than 576 bytes (RFC1812)
-	   */
-	  new_ip40->ip_version_and_header_length = 0x45;
-	  new_ip40->tos = 0;
-	  u16 nlen = (tlen - 20) > 576 ? 576 : tlen - 20;
-	  new_ip40->length = clib_host_to_net_u16 (nlen);
-	  new_ip40->fragment_id = fid[0];
-	  fid++;
-	  new_ip40->ttl = 64;
-	  new_ip40->protocol = IP_PROTOCOL_ICMP;
-	  new_ip40->src_address = mm->icmp4_src_address;
-	  new_ip40->dst_address = inner_ip40->src_address;
-	  new_ip40->checksum = ip4_header_checksum (new_ip40);
-
-	  new_icmp40->checksum = 0;
-	  ip_csum_t sum = ip_incremental_checksum (0, new_icmp40, nlen - 20);
-	  new_icmp40->checksum = ~ip_csum_fold (sum);
-
-	  vlib_increment_simple_counter (&mm->icmp_relayed, cpu_index, 0, 1);
-
-	error:
-	  if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      map_trace_t *tr = vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->map_domain_index = 0;
-	      tr->port = 0;
-	    }
-
-	  next0 =
-	    (error0 == MAP_ERROR_NONE) ? next0 : IP6_ICMP_RELAY_NEXT_DROP;
-	  p0->error = error_node->errors[error0];
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, pi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-
-}
-
-static char *map_error_strings[] = {
-#define _(sym,string) string,
-  foreach_map_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(ip6_map_node) = {
-  .function = ip6_map,
-  .name = "ip6-map",
-  .vector_size = sizeof(u32),
-  .format_trace = format_map_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = MAP_N_ERROR,
-  .error_strings = map_error_strings,
-
-  .n_next_nodes = IP6_MAP_N_NEXT,
-  .next_nodes = {
-    [IP6_MAP_NEXT_IP4_LOOKUP] = "ip4-lookup",
-#ifdef MAP_SKIP_IP6_LOOKUP
-    [IP6_MAP_NEXT_IP4_REWRITE] = "ip4-rewrite",
-#endif
-    [IP6_MAP_NEXT_IP6_REASS] = "ip6-map-ip6-reass",
-    [IP6_MAP_NEXT_IP4_REASS] = "ip6-map-ip4-reass",
-    [IP6_MAP_NEXT_IP4_FRAGMENT] = "ip4-frag",
-    [IP6_MAP_NEXT_IP6_ICMP_RELAY] = "ip6-map-icmp-relay",
-    [IP6_MAP_NEXT_IP6_LOCAL] = "ip6-local",
-    [IP6_MAP_NEXT_DROP] = "error-drop",
-    [IP6_MAP_NEXT_ICMP] = "ip6-icmp-error",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(ip6_map_ip6_reass_node) = {
-  .function = ip6_map_ip6_reass,
-  .name = "ip6-map-ip6-reass",
-  .vector_size = sizeof(u32),
-  .format_trace = format_ip6_map_ip6_reass_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .n_errors = MAP_N_ERROR,
-  .error_strings = map_error_strings,
-  .n_next_nodes = IP6_MAP_IP6_REASS_N_NEXT,
-  .next_nodes = {
-    [IP6_MAP_IP6_REASS_NEXT_IP6_MAP] = "ip6-map",
-    [IP6_MAP_IP6_REASS_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(ip6_map_ip4_reass_node) = {
-  .function = ip6_map_ip4_reass,
-  .name = "ip6-map-ip4-reass",
-  .vector_size = sizeof(u32),
-  .format_trace = format_ip6_map_ip4_reass_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .n_errors = MAP_N_ERROR,
-  .error_strings = map_error_strings,
-  .n_next_nodes = IP6_MAP_IP4_REASS_N_NEXT,
-  .next_nodes = {
-    [IP6_MAP_IP4_REASS_NEXT_IP4_LOOKUP] = "ip4-lookup",
-    [IP6_MAP_IP4_REASS_NEXT_IP4_FRAGMENT] = "ip4-frag",
-    [IP6_MAP_IP4_REASS_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(ip6_map_icmp_relay_node, static) = {
-  .function = ip6_map_icmp_relay,
-  .name = "ip6-map-icmp-relay",
-  .vector_size = sizeof(u32),
-  .format_trace = format_map_trace, //FIXME
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .n_errors = MAP_N_ERROR,
-  .error_strings = map_error_strings,
-  .n_next_nodes = IP6_ICMP_RELAY_N_NEXT,
-  .next_nodes = {
-    [IP6_ICMP_RELAY_NEXT_IP4_LOOKUP] = "ip4-lookup",
-    [IP6_ICMP_RELAY_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/map/ip6_map_t.c b/vnet/vnet/map/ip6_map_t.c
deleted file mode 100644
index eb3996c2..00000000
--- a/vnet/vnet/map/ip6_map_t.c
+++ /dev/null
@@ -1,1517 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "map.h"
-
-#include "../ip/ip_frag.h"
-
-#define IP6_MAP_T_DUAL_LOOP
-
-typedef enum
-{
-  IP6_MAPT_NEXT_MAPT_TCP_UDP,
-  IP6_MAPT_NEXT_MAPT_ICMP,
-  IP6_MAPT_NEXT_MAPT_FRAGMENTED,
-  IP6_MAPT_NEXT_DROP,
-  IP6_MAPT_N_NEXT
-} ip6_mapt_next_t;
-
-typedef enum
-{
-  IP6_MAPT_ICMP_NEXT_IP4_LOOKUP,
-  IP6_MAPT_ICMP_NEXT_IP4_FRAG,
-  IP6_MAPT_ICMP_NEXT_DROP,
-  IP6_MAPT_ICMP_N_NEXT
-} ip6_mapt_icmp_next_t;
-
-typedef enum
-{
-  IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP,
-  IP6_MAPT_TCP_UDP_NEXT_IP4_FRAG,
-  IP6_MAPT_TCP_UDP_NEXT_DROP,
-  IP6_MAPT_TCP_UDP_N_NEXT
-} ip6_mapt_tcp_udp_next_t;
-
-typedef enum
-{
-  IP6_MAPT_FRAGMENTED_NEXT_IP4_LOOKUP,
-  IP6_MAPT_FRAGMENTED_NEXT_IP4_FRAG,
-  IP6_MAPT_FRAGMENTED_NEXT_DROP,
-  IP6_MAPT_FRAGMENTED_N_NEXT
-} ip6_mapt_fragmented_next_t;
-
-static_always_inline int
-ip6_map_fragment_cache (ip6_header_t * ip6, ip6_frag_hdr_t * frag,
-			map_domain_t * d, u16 port)
-{
-  u32 *ignore = NULL;
-  map_ip4_reass_lock ();
-  map_ip4_reass_t *r = map_ip4_reass_get (map_get_ip4 (&ip6->src_address),
-					  ip6_map_t_embedded_address (d,
-								      &ip6->
-								      dst_address),
-					  frag_id_6to4 (frag->identification),
-					  (ip6->protocol ==
-					   IP_PROTOCOL_ICMP6) ?
-					  IP_PROTOCOL_ICMP : ip6->protocol,
-					  &ignore);
-  if (r)
-    r->port = port;
-
-  map_ip4_reass_unlock ();
-  return !r;
-}
-
-/* Returns the associated port or -1 */
-static_always_inline i32
-ip6_map_fragment_get (ip6_header_t * ip6, ip6_frag_hdr_t * frag,
-		      map_domain_t * d)
-{
-  u32 *ignore = NULL;
-  map_ip4_reass_lock ();
-  map_ip4_reass_t *r = map_ip4_reass_get (map_get_ip4 (&ip6->src_address),
-					  ip6_map_t_embedded_address (d,
-								      &ip6->
-								      dst_address),
-					  frag_id_6to4 (frag->identification),
-					  (ip6->protocol ==
-					   IP_PROTOCOL_ICMP6) ?
-					  IP_PROTOCOL_ICMP : ip6->protocol,
-					  &ignore);
-  i32 ret = r ? r->port : -1;
-  map_ip4_reass_unlock ();
-  return ret;
-}
-
-static_always_inline u8
-ip6_translate_tos (const ip6_header_t * ip6)
-{
-#ifdef IP6_MAP_T_OVERRIDE_TOS
-  return IP6_MAP_T_OVERRIDE_TOS;
-#else
-  return (clib_net_to_host_u32 (ip6->ip_version_traffic_class_and_flow_label)
-	  & 0x0ff00000) >> 20;
-#endif
-}
-
-//TODO: Find right place in memory for that
-/* *INDENT-OFF* */
-static u8 icmp6_to_icmp_updater_pointer_table[] =
-  { 0, 1, ~0, ~0,
-    2, 2, 9, 8,
-    12, 12, 12, 12,
-    12, 12, 12, 12,
-    12, 12, 12, 12,
-    12, 12, 12, 12,
-    24, 24, 24, 24,
-    24, 24, 24, 24,
-    24, 24, 24, 24,
-    24, 24, 24, 24
-  };
-/* *INDENT-ON* */
-
-static_always_inline int
-ip6_icmp_to_icmp6_in_place (icmp46_header_t * icmp, u32 icmp_len,
-			    i32 * sender_port, ip6_header_t ** inner_ip6)
-{
-  *inner_ip6 = NULL;
-  switch (icmp->type)
-    {
-    case ICMP6_echo_request:
-      *sender_port = ((u16 *) icmp)[2];
-      icmp->type = ICMP4_echo_request;
-      break;
-    case ICMP6_echo_reply:
-      *sender_port = ((u16 *) icmp)[2];
-      icmp->type = ICMP4_echo_reply;
-      break;
-    case ICMP6_destination_unreachable:
-      *inner_ip6 = (ip6_header_t *) u8_ptr_add (icmp, 8);
-      *sender_port = ip6_get_port (*inner_ip6, MAP_RECEIVER, icmp_len);
-
-      switch (icmp->code)
-	{
-	case ICMP6_destination_unreachable_no_route_to_destination:	//0
-	case ICMP6_destination_unreachable_beyond_scope_of_source_address:	//2
-	case ICMP6_destination_unreachable_address_unreachable:	//3
-	  icmp->type = ICMP4_destination_unreachable;
-	  icmp->code =
-	    ICMP4_destination_unreachable_destination_unreachable_host;
-	  break;
-	case ICMP6_destination_unreachable_destination_administratively_prohibited:	//1
-	  icmp->type =
-	    ICMP4_destination_unreachable;
-	  icmp->code =
-	    ICMP4_destination_unreachable_communication_administratively_prohibited;
-	  break;
-	case ICMP6_destination_unreachable_port_unreachable:
-	  icmp->type = ICMP4_destination_unreachable;
-	  icmp->code = ICMP4_destination_unreachable_port_unreachable;
-	  break;
-	default:
-	  return -1;
-	}
-      break;
-    case ICMP6_packet_too_big:
-      *inner_ip6 = (ip6_header_t *) u8_ptr_add (icmp, 8);
-      *sender_port = ip6_get_port (*inner_ip6, MAP_RECEIVER, icmp_len);
-
-      icmp->type = ICMP4_destination_unreachable;
-      icmp->code = 4;
-      {
-	u32 advertised_mtu = clib_net_to_host_u32 (*((u32 *) (icmp + 1)));
-	advertised_mtu -= 20;
-	//FIXME: = minimum(advertised MTU-20, MTU_of_IPv4_nexthop, (MTU_of_IPv6_nexthop)-20)
-	((u16 *) (icmp))[3] = clib_host_to_net_u16 (advertised_mtu);
-      }
-      break;
-
-    case ICMP6_time_exceeded:
-      *inner_ip6 = (ip6_header_t *) u8_ptr_add (icmp, 8);
-      *sender_port = ip6_get_port (*inner_ip6, MAP_RECEIVER, icmp_len);
-
-      icmp->type = ICMP4_time_exceeded;
-      break;
-
-    case ICMP6_parameter_problem:
-      *inner_ip6 = (ip6_header_t *) u8_ptr_add (icmp, 8);
-      *sender_port = ip6_get_port (*inner_ip6, MAP_RECEIVER, icmp_len);
-
-      switch (icmp->code)
-	{
-	case ICMP6_parameter_problem_erroneous_header_field:
-	  icmp->type = ICMP4_parameter_problem;
-	  icmp->code = ICMP4_parameter_problem_pointer_indicates_error;
-	  u32 pointer = clib_net_to_host_u32 (*((u32 *) (icmp + 1)));
-	  if (pointer >= 40)
-	    return -1;
-
-	  ((u8 *) (icmp + 1))[0] =
-	    icmp6_to_icmp_updater_pointer_table[pointer];
-	  break;
-	case ICMP6_parameter_problem_unrecognized_next_header:
-	  icmp->type = ICMP4_destination_unreachable;
-	  icmp->code = ICMP4_destination_unreachable_port_unreachable;
-	  break;
-	case ICMP6_parameter_problem_unrecognized_option:
-	default:
-	  return -1;
-	}
-      break;
-    default:
-      return -1;
-      break;
-    }
-  return 0;
-}
-
-static_always_inline void
-_ip6_map_t_icmp (map_domain_t * d, vlib_buffer_t * p, u8 * error)
-{
-  ip6_header_t *ip6, *inner_ip6;
-  ip4_header_t *ip4, *inner_ip4;
-  u32 ip6_pay_len;
-  icmp46_header_t *icmp;
-  i32 sender_port;
-  ip_csum_t csum;
-  u32 ip4_sadr, inner_ip4_dadr;
-
-  ip6 = vlib_buffer_get_current (p);
-  ip6_pay_len = clib_net_to_host_u16 (ip6->payload_length);
-  icmp = (icmp46_header_t *) (ip6 + 1);
-  ASSERT (ip6_pay_len + sizeof (*ip6) <= p->current_length);
-
-  if (ip6->protocol != IP_PROTOCOL_ICMP6)
-    {
-      //No extensions headers allowed here
-      //TODO: SR header
-      *error = MAP_ERROR_MALFORMED;
-      return;
-    }
-
-  //There are no fragmented ICMP messages, so no extension header for now
-
-  if (ip6_icmp_to_icmp6_in_place
-      (icmp, ip6_pay_len, &sender_port, &inner_ip6))
-    {
-      //TODO: In case of 1:1 mapping it is not necessary to have the sender port
-      *error = MAP_ERROR_ICMP;
-      return;
-    }
-
-  if (sender_port < 0)
-    {
-      // In case of 1:1 mapping, we don't care about the port
-      if (d->ea_bits_len == 0 && d->rules)
-	{
-	  sender_port = 0;
-	}
-      else
-	{
-	  *error = MAP_ERROR_ICMP;
-	  return;
-	}
-    }
-
-  //Security check
-  //Note that this prevents an intermediate IPv6 router from answering the request
-  ip4_sadr = map_get_ip4 (&ip6->src_address);
-  if (ip6->src_address.as_u64[0] != map_get_pfx_net (d, ip4_sadr, sender_port)
-      || ip6->src_address.as_u64[1] != map_get_sfx_net (d, ip4_sadr,
-							sender_port))
-    {
-      *error = MAP_ERROR_SEC_CHECK;
-      return;
-    }
-
-  if (inner_ip6)
-    {
-      u16 *inner_L4_checksum, inner_l4_offset, inner_frag_offset,
-	inner_frag_id;
-      u8 *inner_l4, inner_protocol;
-
-      //We have two headers to translate
-      //   FROM
-      //   [   IPv6   ]<- ext ->[IC][   IPv6   ]<- ext ->[L4 header ...
-      // Handled cases:
-      //                     [   IPv6   ][IC][   IPv6   ][L4 header ...
-      //                 [   IPv6   ][IC][   IPv6   ][Fr][L4 header ...
-      //    TO
-      //                               [ IPv4][IC][ IPv4][L4 header ...
-
-      //TODO: This was already done deep in ip6_icmp_to_icmp6_in_place
-      //We shouldn't have to do it again
-      if (ip6_parse (inner_ip6, ip6_pay_len - 8,
-		     &inner_protocol, &inner_l4_offset, &inner_frag_offset))
-	{
-	  *error = MAP_ERROR_MALFORMED;
-	  return;
-	}
-
-      inner_l4 = u8_ptr_add (inner_ip6, inner_l4_offset);
-      inner_ip4 =
-	(ip4_header_t *) u8_ptr_add (inner_l4, -sizeof (*inner_ip4));
-      if (inner_frag_offset)
-	{
-	  ip6_frag_hdr_t *inner_frag =
-	    (ip6_frag_hdr_t *) u8_ptr_add (inner_ip6, inner_frag_offset);
-	  inner_frag_id = frag_id_6to4 (inner_frag->identification);
-	}
-      else
-	{
-	  inner_frag_id = 0;
-	}
-
-      //Do the translation of the inner packet
-      if (inner_protocol == IP_PROTOCOL_TCP)
-	{
-	  inner_L4_checksum = (u16 *) u8_ptr_add (inner_l4, 16);
-	}
-      else if (inner_protocol == IP_PROTOCOL_UDP)
-	{
-	  inner_L4_checksum = (u16 *) u8_ptr_add (inner_l4, 6);
-	}
-      else if (inner_protocol == IP_PROTOCOL_ICMP6)
-	{
-	  icmp46_header_t *inner_icmp = (icmp46_header_t *) inner_l4;
-	  csum = inner_icmp->checksum;
-	  csum = ip_csum_sub_even (csum, *((u16 *) inner_icmp));
-	  //It cannot be of a different type as ip6_icmp_to_icmp6_in_place succeeded
-	  inner_icmp->type = (inner_icmp->type == ICMP6_echo_request) ?
-	    ICMP4_echo_request : ICMP4_echo_reply;
-	  csum = ip_csum_add_even (csum, *((u16 *) inner_icmp));
-	  inner_icmp->checksum = ip_csum_fold (csum);
-	  inner_protocol = IP_PROTOCOL_ICMP;	//Will be copied to ip6 later
-	  inner_L4_checksum = &inner_icmp->checksum;
-	}
-      else
-	{
-	  *error = MAP_ERROR_BAD_PROTOCOL;
-	  return;
-	}
-
-      csum = *inner_L4_checksum;
-      csum = ip_csum_sub_even (csum, inner_ip6->src_address.as_u64[0]);
-      csum = ip_csum_sub_even (csum, inner_ip6->src_address.as_u64[1]);
-      csum = ip_csum_sub_even (csum, inner_ip6->dst_address.as_u64[0]);
-      csum = ip_csum_sub_even (csum, inner_ip6->dst_address.as_u64[1]);
-
-      //Sanity check of the outer destination address
-      if (ip6->dst_address.as_u64[0] != inner_ip6->src_address.as_u64[0] &&
-	  ip6->dst_address.as_u64[1] != inner_ip6->src_address.as_u64[1])
-	{
-	  *error = MAP_ERROR_SEC_CHECK;
-	  return;
-	}
-
-      //Security check of inner packet
-      inner_ip4_dadr = map_get_ip4 (&inner_ip6->dst_address);
-      if (inner_ip6->dst_address.as_u64[0] !=
-	  map_get_pfx_net (d, inner_ip4_dadr, sender_port)
-	  || inner_ip6->dst_address.as_u64[1] != map_get_sfx_net (d,
-								  inner_ip4_dadr,
-								  sender_port))
-	{
-	  *error = MAP_ERROR_SEC_CHECK;
-	  return;
-	}
-
-      inner_ip4->dst_address.as_u32 = inner_ip4_dadr;
-      inner_ip4->src_address.as_u32 =
-	ip6_map_t_embedded_address (d, &inner_ip6->src_address);
-      inner_ip4->ip_version_and_header_length =
-	IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
-      inner_ip4->tos = ip6_translate_tos (inner_ip6);
-      inner_ip4->length =
-	u16_net_add (inner_ip6->payload_length,
-		     sizeof (*ip4) + sizeof (*ip6) - inner_l4_offset);
-      inner_ip4->fragment_id = inner_frag_id;
-      inner_ip4->flags_and_fragment_offset =
-	clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS);
-      inner_ip4->ttl = inner_ip6->hop_limit;
-      inner_ip4->protocol = inner_protocol;
-      inner_ip4->checksum = ip4_header_checksum (inner_ip4);
-
-      if (inner_ip4->protocol == IP_PROTOCOL_ICMP)
-	{
-	  //Remove remainings of the pseudo-header in the csum
-	  csum =
-	    ip_csum_sub_even (csum, clib_host_to_net_u16 (IP_PROTOCOL_ICMP6));
-	  csum =
-	    ip_csum_sub_even (csum, inner_ip4->length - sizeof (*inner_ip4));
-	}
-      else
-	{
-	  //Update to new pseudo-header
-	  csum = ip_csum_add_even (csum, inner_ip4->src_address.as_u32);
-	  csum = ip_csum_add_even (csum, inner_ip4->dst_address.as_u32);
-	}
-      *inner_L4_checksum = ip_csum_fold (csum);
-
-      //Move up icmp header
-      ip4 = (ip4_header_t *) u8_ptr_add (inner_l4, -2 * sizeof (*ip4) - 8);
-      clib_memcpy (u8_ptr_add (inner_l4, -sizeof (*ip4) - 8), icmp, 8);
-      icmp = (icmp46_header_t *) u8_ptr_add (inner_l4, -sizeof (*ip4) - 8);
-    }
-  else
-    {
-      //Only one header to translate
-      ip4 = (ip4_header_t *) u8_ptr_add (ip6, sizeof (*ip6) - sizeof (*ip4));
-    }
-  vlib_buffer_advance (p, (u32) (((u8 *) ip4) - ((u8 *) ip6)));
-
-  ip4->dst_address.as_u32 = ip6_map_t_embedded_address (d, &ip6->dst_address);
-  ip4->src_address.as_u32 = ip4_sadr;
-  ip4->ip_version_and_header_length =
-    IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
-  ip4->tos = ip6_translate_tos (ip6);
-  ip4->fragment_id = 0;
-  ip4->flags_and_fragment_offset = 0;
-  ip4->ttl = ip6->hop_limit;
-  ip4->protocol = IP_PROTOCOL_ICMP;
-  //TODO fix the length depending on offset length
-  ip4->length = u16_net_add (ip6->payload_length,
-			     (inner_ip6 ==
-			      NULL) ? sizeof (*ip4) : (2 * sizeof (*ip4) -
-						       sizeof (*ip6)));
-  ip4->checksum = ip4_header_checksum (ip4);
-
-  //TODO: We could do an easy diff-checksum for echo requests/replies
-  //Recompute ICMP checksum
-  icmp->checksum = 0;
-  csum =
-    ip_incremental_checksum (0, icmp,
-			     clib_net_to_host_u16 (ip4->length) -
-			     sizeof (*ip4));
-  icmp->checksum = ~ip_csum_fold (csum);
-}
-
-static uword
-ip6_map_t_icmp (vlib_main_t * vm,
-		vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip6_map_t_icmp_node.index);
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  vlib_combined_counter_main_t *cm = map_main.domain_counters;
-  u32 cpu_index = os_get_cpu_number ();
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  u8 error0;
-	  ip6_mapt_icmp_next_t next0;
-	  map_domain_t *d0;
-	  u16 len0;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  error0 = MAP_ERROR_NONE;
-	  next0 = IP6_MAPT_ICMP_NEXT_IP4_LOOKUP;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  len0 =
-	    clib_net_to_host_u16 (((ip6_header_t *)
-				   vlib_buffer_get_current
-				   (p0))->payload_length);
-	  d0 =
-	    pool_elt_at_index (map_main.domains,
-			       vnet_buffer (p0)->map_t.map_domain_index);
-	  _ip6_map_t_icmp (d0, p0, &error0);
-
-	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
-	    {
-	      //Send to fragmentation node if necessary
-	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
-	      vnet_buffer (p0)->ip_frag.header_offset = 0;
-	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
-	      next0 = IP6_MAPT_ICMP_NEXT_IP4_FRAG;
-	    }
-
-	  if (PREDICT_TRUE (error0 == MAP_ERROR_NONE))
-	    {
-	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-					       cpu_index,
-					       vnet_buffer (p0)->
-					       map_t.map_domain_index, 1,
-					       len0);
-	    }
-	  else
-	    {
-	      next0 = IP6_MAPT_ICMP_NEXT_DROP;
-	    }
-
-	  p0->error = error_node->errors[error0];
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next, pi0,
-					   next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return frame->n_vectors;
-}
-
-static uword
-ip6_map_t_fragmented (vlib_main_t * vm,
-		      vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-#ifdef IP6_MAP_T_DUAL_LOOP
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 pi0, pi1;
-	  vlib_buffer_t *p0, *p1;
-	  ip6_header_t *ip60, *ip61;
-	  ip6_frag_hdr_t *frag0, *frag1;
-	  ip4_header_t *ip40, *ip41;
-	  u16 frag_id0, frag_offset0, frag_id1, frag_offset1;
-	  u8 frag_more0, frag_more1;
-	  u32 next0, next1;
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  next0 = IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP;
-	  next1 = IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP;
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-	  ip60 = vlib_buffer_get_current (p0);
-	  ip61 = vlib_buffer_get_current (p1);
-	  frag0 =
-	    (ip6_frag_hdr_t *) u8_ptr_add (ip60,
-					   vnet_buffer (p0)->map_t.
-					   v6.frag_offset);
-	  frag1 =
-	    (ip6_frag_hdr_t *) u8_ptr_add (ip61,
-					   vnet_buffer (p1)->map_t.
-					   v6.frag_offset);
-	  ip40 =
-	    (ip4_header_t *) u8_ptr_add (ip60,
-					 vnet_buffer (p0)->map_t.
-					 v6.l4_offset - sizeof (*ip40));
-	  ip41 =
-	    (ip4_header_t *) u8_ptr_add (ip61,
-					 vnet_buffer (p1)->map_t.
-					 v6.l4_offset - sizeof (*ip40));
-	  vlib_buffer_advance (p0,
-			       vnet_buffer (p0)->map_t.v6.l4_offset -
-			       sizeof (*ip40));
-	  vlib_buffer_advance (p1,
-			       vnet_buffer (p1)->map_t.v6.l4_offset -
-			       sizeof (*ip40));
-
-	  frag_id0 = frag_id_6to4 (frag0->identification);
-	  frag_id1 = frag_id_6to4 (frag1->identification);
-	  frag_more0 = ip6_frag_hdr_more (frag0);
-	  frag_more1 = ip6_frag_hdr_more (frag1);
-	  frag_offset0 = ip6_frag_hdr_offset (frag0);
-	  frag_offset1 = ip6_frag_hdr_offset (frag1);
-
-	  ip40->dst_address.as_u32 = vnet_buffer (p0)->map_t.v6.daddr;
-	  ip41->dst_address.as_u32 = vnet_buffer (p1)->map_t.v6.daddr;
-	  ip40->src_address.as_u32 = vnet_buffer (p0)->map_t.v6.saddr;
-	  ip41->src_address.as_u32 = vnet_buffer (p1)->map_t.v6.saddr;
-	  ip40->ip_version_and_header_length =
-	    IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
-	  ip41->ip_version_and_header_length =
-	    IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
-	  ip40->tos = ip6_translate_tos (ip60);
-	  ip41->tos = ip6_translate_tos (ip61);
-	  ip40->length = u16_net_add (ip60->payload_length,
-				      sizeof (*ip40) -
-				      vnet_buffer (p0)->map_t.v6.l4_offset +
-				      sizeof (*ip60));
-	  ip41->length =
-	    u16_net_add (ip61->payload_length,
-			 sizeof (*ip40) -
-			 vnet_buffer (p1)->map_t.v6.l4_offset +
-			 sizeof (*ip60));
-	  ip40->fragment_id = frag_id0;
-	  ip41->fragment_id = frag_id1;
-	  ip40->flags_and_fragment_offset =
-	    clib_host_to_net_u16 (frag_offset0 |
-				  (frag_more0 ? IP4_HEADER_FLAG_MORE_FRAGMENTS
-				   : 0));
-	  ip41->flags_and_fragment_offset =
-	    clib_host_to_net_u16 (frag_offset1 |
-				  (frag_more1 ? IP4_HEADER_FLAG_MORE_FRAGMENTS
-				   : 0));
-	  ip40->ttl = ip60->hop_limit;
-	  ip41->ttl = ip61->hop_limit;
-	  ip40->protocol =
-	    (vnet_buffer (p0)->map_t.v6.l4_protocol ==
-	     IP_PROTOCOL_ICMP6) ? IP_PROTOCOL_ICMP : vnet_buffer (p0)->
-	    map_t.v6.l4_protocol;
-	  ip41->protocol =
-	    (vnet_buffer (p1)->map_t.v6.l4_protocol ==
-	     IP_PROTOCOL_ICMP6) ? IP_PROTOCOL_ICMP : vnet_buffer (p1)->
-	    map_t.v6.l4_protocol;
-	  ip40->checksum = ip4_header_checksum (ip40);
-	  ip41->checksum = ip4_header_checksum (ip41);
-
-	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
-	    {
-	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
-	      vnet_buffer (p0)->ip_frag.header_offset = 0;
-	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
-	      next0 = IP6_MAPT_FRAGMENTED_NEXT_IP4_FRAG;
-	    }
-
-	  if (vnet_buffer (p1)->map_t.mtu < p1->current_length)
-	    {
-	      vnet_buffer (p1)->ip_frag.mtu = vnet_buffer (p1)->map_t.mtu;
-	      vnet_buffer (p1)->ip_frag.header_offset = 0;
-	      vnet_buffer (p1)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
-	      next1 = IP6_MAPT_FRAGMENTED_NEXT_IP4_FRAG;
-	    }
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next, pi0, pi1,
-					   next0, next1);
-	}
-#endif
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  ip6_header_t *ip60;
-	  ip6_frag_hdr_t *frag0;
-	  ip4_header_t *ip40;
-	  u16 frag_id0;
-	  u8 frag_more0;
-	  u16 frag_offset0;
-	  u32 next0;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  next0 = IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP;
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip60 = vlib_buffer_get_current (p0);
-	  frag0 =
-	    (ip6_frag_hdr_t *) u8_ptr_add (ip60,
-					   vnet_buffer (p0)->map_t.
-					   v6.frag_offset);
-	  ip40 =
-	    (ip4_header_t *) u8_ptr_add (ip60,
-					 vnet_buffer (p0)->map_t.
-					 v6.l4_offset - sizeof (*ip40));
-	  vlib_buffer_advance (p0,
-			       vnet_buffer (p0)->map_t.v6.l4_offset -
-			       sizeof (*ip40));
-
-	  frag_id0 = frag_id_6to4 (frag0->identification);
-	  frag_more0 = ip6_frag_hdr_more (frag0);
-	  frag_offset0 = ip6_frag_hdr_offset (frag0);
-
-	  ip40->dst_address.as_u32 = vnet_buffer (p0)->map_t.v6.daddr;
-	  ip40->src_address.as_u32 = vnet_buffer (p0)->map_t.v6.saddr;
-	  ip40->ip_version_and_header_length =
-	    IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
-	  ip40->tos = ip6_translate_tos (ip60);
-	  ip40->length = u16_net_add (ip60->payload_length,
-				      sizeof (*ip40) -
-				      vnet_buffer (p0)->map_t.v6.l4_offset +
-				      sizeof (*ip60));
-	  ip40->fragment_id = frag_id0;
-	  ip40->flags_and_fragment_offset =
-	    clib_host_to_net_u16 (frag_offset0 |
-				  (frag_more0 ? IP4_HEADER_FLAG_MORE_FRAGMENTS
-				   : 0));
-	  ip40->ttl = ip60->hop_limit;
-	  ip40->protocol =
-	    (vnet_buffer (p0)->map_t.v6.l4_protocol ==
-	     IP_PROTOCOL_ICMP6) ? IP_PROTOCOL_ICMP : vnet_buffer (p0)->
-	    map_t.v6.l4_protocol;
-	  ip40->checksum = ip4_header_checksum (ip40);
-
-	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
-	    {
-	      //Send to fragmentation node if necessary
-	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
-	      vnet_buffer (p0)->ip_frag.header_offset = 0;
-	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
-	      next0 = IP6_MAPT_FRAGMENTED_NEXT_IP4_FRAG;
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next, pi0,
-					   next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return frame->n_vectors;
-}
-
-static uword
-ip6_map_t_tcp_udp (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-#ifdef IP6_MAP_T_DUAL_LOOP
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 pi0, pi1;
-	  vlib_buffer_t *p0, *p1;
-	  ip6_header_t *ip60, *ip61;
-	  ip_csum_t csum0, csum1;
-	  ip4_header_t *ip40, *ip41;
-	  u16 fragment_id0, flags0, *checksum0,
-	    fragment_id1, flags1, *checksum1;
-	  ip6_mapt_tcp_udp_next_t next0, next1;
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  next0 = IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP;
-	  next1 = IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-	  ip60 = vlib_buffer_get_current (p0);
-	  ip61 = vlib_buffer_get_current (p1);
-	  ip40 =
-	    (ip4_header_t *) u8_ptr_add (ip60,
-					 vnet_buffer (p0)->map_t.
-					 v6.l4_offset - sizeof (*ip40));
-	  ip41 =
-	    (ip4_header_t *) u8_ptr_add (ip61,
-					 vnet_buffer (p1)->map_t.
-					 v6.l4_offset - sizeof (*ip40));
-	  vlib_buffer_advance (p0,
-			       vnet_buffer (p0)->map_t.v6.l4_offset -
-			       sizeof (*ip40));
-	  vlib_buffer_advance (p1,
-			       vnet_buffer (p1)->map_t.v6.l4_offset -
-			       sizeof (*ip40));
-	  checksum0 =
-	    (u16 *) u8_ptr_add (ip60,
-				vnet_buffer (p0)->map_t.checksum_offset);
-	  checksum1 =
-	    (u16 *) u8_ptr_add (ip61,
-				vnet_buffer (p1)->map_t.checksum_offset);
-
-	  csum0 = ip_csum_sub_even (*checksum0, ip60->src_address.as_u64[0]);
-	  csum1 = ip_csum_sub_even (*checksum1, ip61->src_address.as_u64[0]);
-	  csum0 = ip_csum_sub_even (csum0, ip60->src_address.as_u64[1]);
-	  csum1 = ip_csum_sub_even (csum1, ip61->src_address.as_u64[1]);
-	  csum0 = ip_csum_sub_even (csum0, ip60->dst_address.as_u64[0]);
-	  csum1 = ip_csum_sub_even (csum0, ip61->dst_address.as_u64[0]);
-	  csum0 = ip_csum_sub_even (csum0, ip60->dst_address.as_u64[1]);
-	  csum1 = ip_csum_sub_even (csum1, ip61->dst_address.as_u64[1]);
-	  csum0 = ip_csum_add_even (csum0, vnet_buffer (p0)->map_t.v6.daddr);
-	  csum1 = ip_csum_add_even (csum1, vnet_buffer (p1)->map_t.v6.daddr);
-	  csum0 = ip_csum_add_even (csum0, vnet_buffer (p0)->map_t.v6.saddr);
-	  csum1 = ip_csum_add_even (csum1, vnet_buffer (p1)->map_t.v6.saddr);
-	  *checksum0 = ip_csum_fold (csum0);
-	  *checksum1 = ip_csum_fold (csum1);
-
-	  if (PREDICT_FALSE (vnet_buffer (p0)->map_t.v6.frag_offset))
-	    {
-	      ip6_frag_hdr_t *hdr = (ip6_frag_hdr_t *) u8_ptr_add (ip60,
-								   vnet_buffer
-								   (p0)->
-								   map_t.
-								   v6.frag_offset);
-	      fragment_id0 = frag_id_6to4 (hdr->identification);
-	      flags0 = clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS);
-	    }
-	  else
-	    {
-	      fragment_id0 = 0;
-	      flags0 = 0;
-	    }
-
-	  if (PREDICT_FALSE (vnet_buffer (p1)->map_t.v6.frag_offset))
-	    {
-	      ip6_frag_hdr_t *hdr = (ip6_frag_hdr_t *) u8_ptr_add (ip61,
-								   vnet_buffer
-								   (p1)->
-								   map_t.
-								   v6.frag_offset);
-	      fragment_id1 = frag_id_6to4 (hdr->identification);
-	      flags1 = clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS);
-	    }
-	  else
-	    {
-	      fragment_id1 = 0;
-	      flags1 = 0;
-	    }
-
-	  ip40->dst_address.as_u32 = vnet_buffer (p0)->map_t.v6.daddr;
-	  ip41->dst_address.as_u32 = vnet_buffer (p1)->map_t.v6.daddr;
-	  ip40->src_address.as_u32 = vnet_buffer (p0)->map_t.v6.saddr;
-	  ip41->src_address.as_u32 = vnet_buffer (p1)->map_t.v6.saddr;
-	  ip40->ip_version_and_header_length =
-	    IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
-	  ip41->ip_version_and_header_length =
-	    IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
-	  ip40->tos = ip6_translate_tos (ip60);
-	  ip41->tos = ip6_translate_tos (ip61);
-	  ip40->length = u16_net_add (ip60->payload_length,
-				      sizeof (*ip40) + sizeof (*ip60) -
-				      vnet_buffer (p0)->map_t.v6.l4_offset);
-	  ip41->length =
-	    u16_net_add (ip61->payload_length,
-			 sizeof (*ip40) + sizeof (*ip60) -
-			 vnet_buffer (p1)->map_t.v6.l4_offset);
-	  ip40->fragment_id = fragment_id0;
-	  ip41->fragment_id = fragment_id1;
-	  ip40->flags_and_fragment_offset = flags0;
-	  ip41->flags_and_fragment_offset = flags1;
-	  ip40->ttl = ip60->hop_limit;
-	  ip41->ttl = ip61->hop_limit;
-	  ip40->protocol = vnet_buffer (p0)->map_t.v6.l4_protocol;
-	  ip41->protocol = vnet_buffer (p1)->map_t.v6.l4_protocol;
-	  ip40->checksum = ip4_header_checksum (ip40);
-	  ip41->checksum = ip4_header_checksum (ip41);
-
-	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
-	    {
-	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
-	      vnet_buffer (p0)->ip_frag.header_offset = 0;
-	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
-	      next0 = IP6_MAPT_TCP_UDP_NEXT_IP4_FRAG;
-	    }
-
-	  if (vnet_buffer (p1)->map_t.mtu < p1->current_length)
-	    {
-	      vnet_buffer (p1)->ip_frag.mtu = vnet_buffer (p1)->map_t.mtu;
-	      vnet_buffer (p1)->ip_frag.header_offset = 0;
-	      vnet_buffer (p1)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
-	      next1 = IP6_MAPT_TCP_UDP_NEXT_IP4_FRAG;
-	    }
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
-					   n_left_to_next, pi0, pi1, next0,
-					   next1);
-	}
-#endif
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  ip6_header_t *ip60;
-	  u16 *checksum0;
-	  ip_csum_t csum0;
-	  ip4_header_t *ip40;
-	  u16 fragment_id0;
-	  u16 flags0;
-	  ip6_mapt_tcp_udp_next_t next0;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  next0 = IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip60 = vlib_buffer_get_current (p0);
-	  ip40 =
-	    (ip4_header_t *) u8_ptr_add (ip60,
-					 vnet_buffer (p0)->map_t.
-					 v6.l4_offset - sizeof (*ip40));
-	  vlib_buffer_advance (p0,
-			       vnet_buffer (p0)->map_t.v6.l4_offset -
-			       sizeof (*ip40));
-	  checksum0 =
-	    (u16 *) u8_ptr_add (ip60,
-				vnet_buffer (p0)->map_t.checksum_offset);
-
-	  //TODO: This can probably be optimized
-	  csum0 = ip_csum_sub_even (*checksum0, ip60->src_address.as_u64[0]);
-	  csum0 = ip_csum_sub_even (csum0, ip60->src_address.as_u64[1]);
-	  csum0 = ip_csum_sub_even (csum0, ip60->dst_address.as_u64[0]);
-	  csum0 = ip_csum_sub_even (csum0, ip60->dst_address.as_u64[1]);
-	  csum0 = ip_csum_add_even (csum0, vnet_buffer (p0)->map_t.v6.daddr);
-	  csum0 = ip_csum_add_even (csum0, vnet_buffer (p0)->map_t.v6.saddr);
-	  *checksum0 = ip_csum_fold (csum0);
-
-	  if (PREDICT_FALSE (vnet_buffer (p0)->map_t.v6.frag_offset))
-	    {
-	      //Only the first fragment
-	      ip6_frag_hdr_t *hdr = (ip6_frag_hdr_t *) u8_ptr_add (ip60,
-								   vnet_buffer
-								   (p0)->
-								   map_t.
-								   v6.frag_offset);
-	      fragment_id0 = frag_id_6to4 (hdr->identification);
-	      flags0 = clib_host_to_net_u16 (IP4_HEADER_FLAG_MORE_FRAGMENTS);
-	    }
-	  else
-	    {
-	      fragment_id0 = 0;
-	      flags0 = 0;
-	    }
-
-	  ip40->dst_address.as_u32 = vnet_buffer (p0)->map_t.v6.daddr;
-	  ip40->src_address.as_u32 = vnet_buffer (p0)->map_t.v6.saddr;
-	  ip40->ip_version_and_header_length =
-	    IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS;
-	  ip40->tos = ip6_translate_tos (ip60);
-	  ip40->length = u16_net_add (ip60->payload_length,
-				      sizeof (*ip40) + sizeof (*ip60) -
-				      vnet_buffer (p0)->map_t.v6.l4_offset);
-	  ip40->fragment_id = fragment_id0;
-	  ip40->flags_and_fragment_offset = flags0;
-	  ip40->ttl = ip60->hop_limit;
-	  ip40->protocol = vnet_buffer (p0)->map_t.v6.l4_protocol;
-	  ip40->checksum = ip4_header_checksum (ip40);
-
-	  if (vnet_buffer (p0)->map_t.mtu < p0->current_length)
-	    {
-	      //Send to fragmentation node if necessary
-	      vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu;
-	      vnet_buffer (p0)->ip_frag.header_offset = 0;
-	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
-	      next0 = IP6_MAPT_TCP_UDP_NEXT_IP4_FRAG;
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next, pi0,
-					   next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return frame->n_vectors;
-}
-
-static_always_inline void
-ip6_map_t_classify (vlib_buffer_t * p0, ip6_header_t * ip60,
-		    map_domain_t * d0, i32 * src_port0,
-		    u8 * error0, ip6_mapt_next_t * next0,
-		    u32 l4_len0, ip6_frag_hdr_t * frag0)
-{
-  if (PREDICT_FALSE (vnet_buffer (p0)->map_t.v6.frag_offset &&
-		     ip6_frag_hdr_offset (frag0)))
-    {
-      *next0 = IP6_MAPT_NEXT_MAPT_FRAGMENTED;
-      if (d0->ea_bits_len == 0 && d0->rules)
-	{
-	  *src_port0 = 0;
-	}
-      else
-	{
-	  *src_port0 = ip6_map_fragment_get (ip60, frag0, d0);
-	  *error0 = (*src_port0 != -1) ? *error0 : MAP_ERROR_FRAGMENT_DROPPED;
-	}
-    }
-  else
-    if (PREDICT_TRUE
-	(vnet_buffer (p0)->map_t.v6.l4_protocol == IP_PROTOCOL_TCP))
-    {
-      *error0 =
-	l4_len0 < sizeof (tcp_header_t) ? MAP_ERROR_MALFORMED : *error0;
-      vnet_buffer (p0)->map_t.checksum_offset =
-	vnet_buffer (p0)->map_t.v6.l4_offset + 16;
-      *next0 = IP6_MAPT_NEXT_MAPT_TCP_UDP;
-      *src_port0 =
-	(i32) *
-	((u16 *) u8_ptr_add (ip60, vnet_buffer (p0)->map_t.v6.l4_offset));
-    }
-  else
-    if (PREDICT_TRUE
-	(vnet_buffer (p0)->map_t.v6.l4_protocol == IP_PROTOCOL_UDP))
-    {
-      *error0 =
-	l4_len0 < sizeof (udp_header_t) ? MAP_ERROR_MALFORMED : *error0;
-      vnet_buffer (p0)->map_t.checksum_offset =
-	vnet_buffer (p0)->map_t.v6.l4_offset + 6;
-      *next0 = IP6_MAPT_NEXT_MAPT_TCP_UDP;
-      *src_port0 =
-	(i32) *
-	((u16 *) u8_ptr_add (ip60, vnet_buffer (p0)->map_t.v6.l4_offset));
-    }
-  else if (vnet_buffer (p0)->map_t.v6.l4_protocol == IP_PROTOCOL_ICMP6)
-    {
-      *error0 =
-	l4_len0 < sizeof (icmp46_header_t) ? MAP_ERROR_MALFORMED : *error0;
-      *next0 = IP6_MAPT_NEXT_MAPT_ICMP;
-      if (d0->ea_bits_len == 0 && d0->rules)
-	{
-	  *src_port0 = 0;
-	}
-      else
-	if (((icmp46_header_t *)
-	     u8_ptr_add (ip60,
-			 vnet_buffer (p0)->map_t.v6.l4_offset))->code ==
-	    ICMP6_echo_reply
-	    || ((icmp46_header_t *)
-		u8_ptr_add (ip60,
-			    vnet_buffer (p0)->map_t.v6.l4_offset))->code ==
-	    ICMP6_echo_request)
-	{
-	  *src_port0 =
-	    (i32) *
-	    ((u16 *)
-	     u8_ptr_add (ip60, vnet_buffer (p0)->map_t.v6.l4_offset + 6));
-	}
-    }
-  else
-    {
-      //TODO: In case of 1:1 mapping, it might be possible to do something with those packets.
-      *error0 = MAP_ERROR_BAD_PROTOCOL;
-    }
-}
-
-static uword
-ip6_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node =
-    vlib_node_get_runtime (vm, ip6_map_t_node.index);
-  vlib_combined_counter_main_t *cm = map_main.domain_counters;
-  u32 cpu_index = os_get_cpu_number ();
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-#ifdef IP6_MAP_T_DUAL_LOOP
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 pi0, pi1;
-	  vlib_buffer_t *p0, *p1;
-	  ip6_header_t *ip60, *ip61;
-	  u8 error0, error1;
-	  ip6_mapt_next_t next0, next1;
-	  u32 l4_len0, l4_len1;
-	  i32 src_port0, src_port1;
-	  map_domain_t *d0, *d1;
-	  ip6_frag_hdr_t *frag0, *frag1;
-	  u32 saddr0, saddr1;
-	  next0 = next1 = 0;	//Because compiler whines
-
-	  pi0 = to_next[0] = from[0];
-	  pi1 = to_next[1] = from[1];
-	  from += 2;
-	  n_left_from -= 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-
-	  error0 = MAP_ERROR_NONE;
-	  error1 = MAP_ERROR_NONE;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  p1 = vlib_get_buffer (vm, pi1);
-	  ip60 = vlib_buffer_get_current (p0);
-	  ip61 = vlib_buffer_get_current (p1);
-
-	  saddr0 = map_get_ip4 (&ip60->src_address);
-	  saddr1 = map_get_ip4 (&ip61->src_address);
-	  d0 = ip6_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-				   (ip4_address_t *) & saddr0,
-				   &vnet_buffer (p0)->map_t.map_domain_index,
-				   &error0);
-	  d1 =
-	    ip6_map_get_domain (vnet_buffer (p1)->ip.adj_index[VLIB_TX],
-				(ip4_address_t *) & saddr1,
-				&vnet_buffer (p1)->map_t.map_domain_index,
-				&error1);
-
-	  vnet_buffer (p0)->map_t.v6.saddr = saddr0;
-	  vnet_buffer (p1)->map_t.v6.saddr = saddr1;
-	  vnet_buffer (p0)->map_t.v6.daddr =
-	    ip6_map_t_embedded_address (d0, &ip60->dst_address);
-	  vnet_buffer (p1)->map_t.v6.daddr =
-	    ip6_map_t_embedded_address (d1, &ip61->dst_address);
-	  vnet_buffer (p0)->map_t.mtu = d0->mtu ? d0->mtu : ~0;
-	  vnet_buffer (p1)->map_t.mtu = d1->mtu ? d1->mtu : ~0;
-
-	  if (PREDICT_FALSE (ip6_parse (ip60, p0->current_length,
-					&(vnet_buffer (p0)->map_t.
-					  v6.l4_protocol),
-					&(vnet_buffer (p0)->map_t.
-					  v6.l4_offset),
-					&(vnet_buffer (p0)->map_t.
-					  v6.frag_offset))))
-	    {
-	      error0 = MAP_ERROR_MALFORMED;
-	      next0 = IP6_MAPT_NEXT_DROP;
-	    }
-
-	  if (PREDICT_FALSE (ip6_parse (ip61, p1->current_length,
-					&(vnet_buffer (p1)->map_t.
-					  v6.l4_protocol),
-					&(vnet_buffer (p1)->map_t.
-					  v6.l4_offset),
-					&(vnet_buffer (p1)->map_t.
-					  v6.frag_offset))))
-	    {
-	      error1 = MAP_ERROR_MALFORMED;
-	      next1 = IP6_MAPT_NEXT_DROP;
-	    }
-
-	  src_port0 = src_port1 = -1;
-	  l4_len0 = (u32) clib_net_to_host_u16 (ip60->payload_length) +
-	    sizeof (*ip60) - vnet_buffer (p0)->map_t.v6.l4_offset;
-	  l4_len1 = (u32) clib_net_to_host_u16 (ip61->payload_length) +
-	    sizeof (*ip60) - vnet_buffer (p1)->map_t.v6.l4_offset;
-	  frag0 =
-	    (ip6_frag_hdr_t *) u8_ptr_add (ip60,
-					   vnet_buffer (p0)->map_t.
-					   v6.frag_offset);
-	  frag1 =
-	    (ip6_frag_hdr_t *) u8_ptr_add (ip61,
-					   vnet_buffer (p1)->map_t.
-					   v6.frag_offset);
-
-	  ip6_map_t_classify (p0, ip60, d0, &src_port0, &error0, &next0,
-			      l4_len0, frag0);
-	  ip6_map_t_classify (p1, ip61, d1, &src_port1, &error1, &next1,
-			      l4_len1, frag1);
-
-	  if (PREDICT_FALSE
-	      ((src_port0 != -1)
-	       && (ip60->src_address.as_u64[0] !=
-		   map_get_pfx_net (d0, vnet_buffer (p0)->map_t.v6.saddr,
-				    src_port0)
-		   || ip60->src_address.as_u64[1] != map_get_sfx_net (d0,
-								      vnet_buffer
-								      (p0)->map_t.v6.saddr,
-								      src_port0))))
-	    {
-	      error0 = MAP_ERROR_SEC_CHECK;
-	    }
-
-	  if (PREDICT_FALSE
-	      ((src_port1 != -1)
-	       && (ip61->src_address.as_u64[0] !=
-		   map_get_pfx_net (d1, vnet_buffer (p1)->map_t.v6.saddr,
-				    src_port1)
-		   || ip61->src_address.as_u64[1] != map_get_sfx_net (d1,
-								      vnet_buffer
-								      (p1)->map_t.v6.saddr,
-								      src_port1))))
-	    {
-	      error1 = MAP_ERROR_SEC_CHECK;
-	    }
-
-	  if (PREDICT_FALSE (vnet_buffer (p0)->map_t.v6.frag_offset &&
-			     !ip6_frag_hdr_offset ((ip6_frag_hdr_t *)
-						   u8_ptr_add (ip60,
-							       vnet_buffer
-							       (p0)->map_t.
-							       v6.frag_offset)))
-	      && (src_port0 != -1) && (d0->ea_bits_len != 0 || !d0->rules)
-	      && (error0 == MAP_ERROR_NONE))
-	    {
-	      ip6_map_fragment_cache (ip60,
-				      (ip6_frag_hdr_t *) u8_ptr_add (ip60,
-								     vnet_buffer
-								     (p0)->map_t.
-								     v6.frag_offset),
-				      d0, src_port0);
-	    }
-
-	  if (PREDICT_FALSE (vnet_buffer (p1)->map_t.v6.frag_offset &&
-			     !ip6_frag_hdr_offset ((ip6_frag_hdr_t *)
-						   u8_ptr_add (ip61,
-							       vnet_buffer
-							       (p1)->map_t.
-							       v6.frag_offset)))
-	      && (src_port1 != -1) && (d1->ea_bits_len != 0 || !d1->rules)
-	      && (error1 == MAP_ERROR_NONE))
-	    {
-	      ip6_map_fragment_cache (ip61,
-				      (ip6_frag_hdr_t *) u8_ptr_add (ip61,
-								     vnet_buffer
-								     (p1)->map_t.
-								     v6.frag_offset),
-				      d1, src_port1);
-	    }
-
-	  if (PREDICT_TRUE
-	      (error0 == MAP_ERROR_NONE && next0 != IP6_MAPT_NEXT_MAPT_ICMP))
-	    {
-	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-					       cpu_index,
-					       vnet_buffer (p0)->
-					       map_t.map_domain_index, 1,
-					       clib_net_to_host_u16
-					       (ip60->payload_length));
-	    }
-
-	  if (PREDICT_TRUE
-	      (error1 == MAP_ERROR_NONE && next1 != IP6_MAPT_NEXT_MAPT_ICMP))
-	    {
-	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-					       cpu_index,
-					       vnet_buffer (p1)->
-					       map_t.map_domain_index, 1,
-					       clib_net_to_host_u16
-					       (ip61->payload_length));
-	    }
-
-	  next0 = (error0 != MAP_ERROR_NONE) ? IP6_MAPT_NEXT_DROP : next0;
-	  next1 = (error1 != MAP_ERROR_NONE) ? IP6_MAPT_NEXT_DROP : next1;
-	  p0->error = error_node->errors[error0];
-	  p1->error = error_node->errors[error1];
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
-					   n_left_to_next, pi0, pi1, next0,
-					   next1);
-	}
-#endif
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 pi0;
-	  vlib_buffer_t *p0;
-	  ip6_header_t *ip60;
-	  u8 error0;
-	  u32 l4_len0;
-	  i32 src_port0;
-	  map_domain_t *d0;
-	  ip6_frag_hdr_t *frag0;
-	  ip6_mapt_next_t next0 = 0;
-	  u32 saddr;
-
-	  pi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  error0 = MAP_ERROR_NONE;
-
-	  p0 = vlib_get_buffer (vm, pi0);
-	  ip60 = vlib_buffer_get_current (p0);
-	  //Save saddr in a different variable to not overwrite ip.adj_index
-	  saddr = map_get_ip4 (&ip60->src_address);
-	  d0 = ip6_map_get_domain (vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-				   (ip4_address_t *) & saddr,
-				   &vnet_buffer (p0)->map_t.map_domain_index,
-				   &error0);
-
-	  //FIXME: What if d0 is null
-	  vnet_buffer (p0)->map_t.v6.saddr = saddr;
-	  vnet_buffer (p0)->map_t.v6.daddr =
-	    ip6_map_t_embedded_address (d0, &ip60->dst_address);
-	  vnet_buffer (p0)->map_t.mtu = d0->mtu ? d0->mtu : ~0;
-
-	  if (PREDICT_FALSE (ip6_parse (ip60, p0->current_length,
-					&(vnet_buffer (p0)->map_t.
-					  v6.l4_protocol),
-					&(vnet_buffer (p0)->map_t.
-					  v6.l4_offset),
-					&(vnet_buffer (p0)->map_t.
-					  v6.frag_offset))))
-	    {
-	      error0 = MAP_ERROR_MALFORMED;
-	      next0 = IP6_MAPT_NEXT_DROP;
-	    }
-
-	  src_port0 = -1;
-	  l4_len0 = (u32) clib_net_to_host_u16 (ip60->payload_length) +
-	    sizeof (*ip60) - vnet_buffer (p0)->map_t.v6.l4_offset;
-	  frag0 =
-	    (ip6_frag_hdr_t *) u8_ptr_add (ip60,
-					   vnet_buffer (p0)->map_t.
-					   v6.frag_offset);
-
-
-	  if (PREDICT_FALSE (vnet_buffer (p0)->map_t.v6.frag_offset &&
-			     ip6_frag_hdr_offset (frag0)))
-	    {
-	      src_port0 = ip6_map_fragment_get (ip60, frag0, d0);
-	      error0 = (src_port0 != -1) ? error0 : MAP_ERROR_FRAGMENT_MEMORY;
-	      next0 = IP6_MAPT_NEXT_MAPT_FRAGMENTED;
-	    }
-	  else
-	    if (PREDICT_TRUE
-		(vnet_buffer (p0)->map_t.v6.l4_protocol == IP_PROTOCOL_TCP))
-	    {
-	      error0 =
-		l4_len0 <
-		sizeof (tcp_header_t) ? MAP_ERROR_MALFORMED : error0;
-	      vnet_buffer (p0)->map_t.checksum_offset =
-		vnet_buffer (p0)->map_t.v6.l4_offset + 16;
-	      next0 = IP6_MAPT_NEXT_MAPT_TCP_UDP;
-	      src_port0 =
-		(i32) *
-		((u16 *)
-		 u8_ptr_add (ip60, vnet_buffer (p0)->map_t.v6.l4_offset));
-	    }
-	  else
-	    if (PREDICT_TRUE
-		(vnet_buffer (p0)->map_t.v6.l4_protocol == IP_PROTOCOL_UDP))
-	    {
-	      error0 =
-		l4_len0 <
-		sizeof (udp_header_t) ? MAP_ERROR_MALFORMED : error0;
-	      vnet_buffer (p0)->map_t.checksum_offset =
-		vnet_buffer (p0)->map_t.v6.l4_offset + 6;
-	      next0 = IP6_MAPT_NEXT_MAPT_TCP_UDP;
-	      src_port0 =
-		(i32) *
-		((u16 *)
-		 u8_ptr_add (ip60, vnet_buffer (p0)->map_t.v6.l4_offset));
-	    }
-	  else if (vnet_buffer (p0)->map_t.v6.l4_protocol ==
-		   IP_PROTOCOL_ICMP6)
-	    {
-	      error0 =
-		l4_len0 <
-		sizeof (icmp46_header_t) ? MAP_ERROR_MALFORMED : error0;
-	      next0 = IP6_MAPT_NEXT_MAPT_ICMP;
-	      if (((icmp46_header_t *)
-		   u8_ptr_add (ip60,
-			       vnet_buffer (p0)->map_t.v6.l4_offset))->code ==
-		  ICMP6_echo_reply
-		  || ((icmp46_header_t *)
-		      u8_ptr_add (ip60,
-				  vnet_buffer (p0)->map_t.v6.
-				  l4_offset))->code == ICMP6_echo_request)
-		src_port0 =
-		  (i32) *
-		  ((u16 *)
-		   u8_ptr_add (ip60,
-			       vnet_buffer (p0)->map_t.v6.l4_offset + 6));
-	    }
-	  else
-	    {
-	      //TODO: In case of 1:1 mapping, it might be possible to do something with those packets.
-	      error0 = MAP_ERROR_BAD_PROTOCOL;
-	    }
-
-	  //Security check
-	  if (PREDICT_FALSE
-	      ((src_port0 != -1)
-	       && (ip60->src_address.as_u64[0] !=
-		   map_get_pfx_net (d0, vnet_buffer (p0)->map_t.v6.saddr,
-				    src_port0)
-		   || ip60->src_address.as_u64[1] != map_get_sfx_net (d0,
-								      vnet_buffer
-								      (p0)->map_t.v6.saddr,
-								      src_port0))))
-	    {
-	      //Security check when src_port0 is not zero (non-first fragment, UDP or TCP)
-	      error0 = MAP_ERROR_SEC_CHECK;
-	    }
-
-	  //Fragmented first packet needs to be cached for following packets
-	  if (PREDICT_FALSE (vnet_buffer (p0)->map_t.v6.frag_offset &&
-			     !ip6_frag_hdr_offset ((ip6_frag_hdr_t *)
-						   u8_ptr_add (ip60,
-							       vnet_buffer
-							       (p0)->map_t.
-							       v6.frag_offset)))
-	      && (src_port0 != -1) && (d0->ea_bits_len != 0 || !d0->rules)
-	      && (error0 == MAP_ERROR_NONE))
-	    {
-	      ip6_map_fragment_cache (ip60,
-				      (ip6_frag_hdr_t *) u8_ptr_add (ip60,
-								     vnet_buffer
-								     (p0)->map_t.
-								     v6.frag_offset),
-				      d0, src_port0);
-	    }
-
-	  if (PREDICT_TRUE
-	      (error0 == MAP_ERROR_NONE && next0 != IP6_MAPT_NEXT_MAPT_ICMP))
-	    {
-	      vlib_increment_combined_counter (cm + MAP_DOMAIN_COUNTER_RX,
-					       cpu_index,
-					       vnet_buffer (p0)->
-					       map_t.map_domain_index, 1,
-					       clib_net_to_host_u16
-					       (ip60->payload_length));
-	    }
-
-	  next0 = (error0 != MAP_ERROR_NONE) ? IP6_MAPT_NEXT_DROP : next0;
-	  p0->error = error_node->errors[error0];
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next, pi0,
-					   next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return frame->n_vectors;
-}
-
-static char *map_t_error_strings[] = {
-#define _(sym,string) string,
-  foreach_map_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(ip6_map_t_fragmented_node) = {
-  .function = ip6_map_t_fragmented,
-  .name = "ip6-map-t-fragmented",
-  .vector_size = sizeof (u32),
-  .format_trace = format_map_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = MAP_N_ERROR,
-  .error_strings = map_t_error_strings,
-
-  .n_next_nodes = IP6_MAPT_FRAGMENTED_N_NEXT,
-  .next_nodes = {
-      [IP6_MAPT_FRAGMENTED_NEXT_IP4_LOOKUP] = "ip4-lookup",
-      [IP6_MAPT_FRAGMENTED_NEXT_IP4_FRAG] = IP4_FRAG_NODE_NAME,
-      [IP6_MAPT_FRAGMENTED_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(ip6_map_t_icmp_node) = {
-  .function = ip6_map_t_icmp,
-  .name = "ip6-map-t-icmp",
-  .vector_size = sizeof (u32),
-  .format_trace = format_map_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = MAP_N_ERROR,
-  .error_strings = map_t_error_strings,
-
-  .n_next_nodes = IP6_MAPT_ICMP_N_NEXT,
-  .next_nodes = {
-      [IP6_MAPT_ICMP_NEXT_IP4_LOOKUP] = "ip4-lookup",
-      [IP6_MAPT_ICMP_NEXT_IP4_FRAG] = IP4_FRAG_NODE_NAME,
-      [IP6_MAPT_ICMP_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(ip6_map_t_tcp_udp_node) = {
-  .function = ip6_map_t_tcp_udp,
-  .name = "ip6-map-t-tcp-udp",
-  .vector_size = sizeof (u32),
-  .format_trace = format_map_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = MAP_N_ERROR,
-  .error_strings = map_t_error_strings,
-
-  .n_next_nodes = IP6_MAPT_TCP_UDP_N_NEXT,
-  .next_nodes = {
-      [IP6_MAPT_TCP_UDP_NEXT_IP4_LOOKUP] = "ip4-lookup",
-      [IP6_MAPT_TCP_UDP_NEXT_IP4_FRAG] = IP4_FRAG_NODE_NAME,
-      [IP6_MAPT_TCP_UDP_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE(ip6_map_t_node) = {
-  .function = ip6_map_t,
-  .name = "ip6-map-t",
-  .vector_size = sizeof(u32),
-  .format_trace = format_map_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = MAP_N_ERROR,
-  .error_strings = map_t_error_strings,
-
-  .n_next_nodes = IP6_MAPT_N_NEXT,
-  .next_nodes = {
-      [IP6_MAPT_NEXT_MAPT_TCP_UDP] = "ip6-map-t-tcp-udp",
-      [IP6_MAPT_NEXT_MAPT_ICMP] = "ip6-map-t-icmp",
-      [IP6_MAPT_NEXT_MAPT_FRAGMENTED] = "ip6-map-t-fragmented",
-      [IP6_MAPT_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/map/map.api b/vnet/vnet/map/map.api
deleted file mode 100644
index 4e4be85e..00000000
--- a/vnet/vnet/map/map.api
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/** \brief Add MAP domains
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param ip6_prefix - Rule IPv6 prefix
-    @param ip4_prefix - Rule IPv4 prefix
-    @param ip6_src - MAP domain IPv6 BR address / Tunnel source
-    @param ip6_prefix_len - Rule IPv6 prefix length
-    @param ip4_prefix_len - Rule IPv4 prefix length
-    @param ea_bits_len - Embedded Address bits length
-    @param psid_offset - Port Set Identifider (PSID) offset
-    @param psid_length - PSID length
-    @param is_translation - MAP-E / MAP-T
-    @param mtu - MTU
-*/
-define map_add_domain
-{
-  u32 client_index;
-  u32 context;
-  u8 ip6_prefix[16];
-  u8 ip4_prefix[4];
-  u8 ip6_src[16];
-  u8 ip6_prefix_len;
-  u8 ip4_prefix_len;
-  u8 ip6_src_prefix_len;
-  u8 ea_bits_len;
-  u8 psid_offset;
-  u8 psid_length;
-  u8 is_translation;
-  u16 mtu;
-};
-
-/** \brief Reply for MAP domain add
-    @param context - returned sender context, to match reply w/ request
-    @param index - MAP domain index
-    @param retval - return code
-*/
-define map_add_domain_reply
-{
-  u32 context;
-  u32 index;
-  i32 retval;
-};
-
-/** \brief Delete MAP domain
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param index - MAP Domain index
-*/
-define map_del_domain
-{
-  u32 client_index;
-  u32 context;
-  u32 index;
-};
-
-/** \brief Reply for MAP domain del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define map_del_domain_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Add or Delete MAP rule from a domain (Only used for shared IPv4 per subscriber)
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param index - MAP Domain index
-    @param is_add - If 1 add rule, if 0 delete rule
-    @param ip6_dst - MAP CE IPv6 address
-    @param psid - Rule PSID
-*/
-define map_add_del_rule
-{
-  u32 client_index;
-  u32 context;
-  u32 index;
-  u32 is_add;
-  u8 ip6_dst[16];
-  u16 psid;
-};
-
-/** \brief Reply for MAP rule add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define map_add_del_rule_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Get list of map domains
-    @param client_index - opaque cookie to identify the sender
-*/
-define map_domain_dump
-{
-  u32 client_index;
-  u32 context;
-};
-
-define map_domain_details
-{
-  u32 context;
-  u32 domain_index;
-  u8 ip6_prefix[16];
-  u8 ip4_prefix[4];
-  u8 ip6_src[16];
-  u8 ip6_prefix_len;
-  u8 ip4_prefix_len;
-  u8 ip6_src_len;
-  u8 ea_bits_len;
-  u8 psid_offset;
-  u8 psid_length;
-  u8 flags;
-  u16 mtu;
-  u8 is_translation;
-};
-
-define map_rule_dump
-{
-  u32 client_index;
-  u32 context;
-  u32 domain_index;
-};
-
-define map_rule_details
-{
-  u32 context;
-  u8 ip6_dst[16];
-  u16 psid;
-};
-
-/** \brief Request for a single block of summary stats
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define map_summary_stats
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Reply for map_summary_stats request
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for request
-    @param total_bindings -
-    @param total_pkts -
-    @param total_ip4_fragments -
-    @param total_security_check -
-*/
-define map_summary_stats_reply
-{
-  u32 context;
-  i32 retval;
-  u64 total_bindings;
-  u64 total_pkts[2];
-  u64 total_bytes[2];
-  u64 total_ip4_fragments;
-  u64 total_security_check[2];
-};
diff --git a/vnet/vnet/map/map.c b/vnet/vnet/map/map.c
deleted file mode 100644
index aeec6a94..00000000
--- a/vnet/vnet/map/map.c
+++ /dev/null
@@ -1,2166 +0,0 @@
-/*
- * map.c : MAP support
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/fib/fib_table.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/adj/adj.h>
-#include <vnet/map/map_dpo.h>
-
-#include "map.h"
-
-#ifdef __SSE4_2__
-static inline u32
-crc_u32 (u32 data, u32 value)
-{
-  __asm__ volatile ("crc32l %[data], %[value];":[value] "+r" (value):[data]
-		    "rm" (data));
-  return value;
-}
-#else
-#include <vppinfra/xxhash.h>
-
-static inline u32
-crc_u32 (u32 data, u32 value)
-{
-  u64 tmp = ((u64) data << 32) | (u64) value;
-  return (u32) clib_xxhash (tmp);
-}
-#endif
-
-/*
- * This code supports the following MAP modes:
- *
- * Algorithmic Shared IPv4 address (ea_bits_len > 0):
- *   ea_bits_len + ip4_prefix > 32
- *   psid_length > 0, ip6_prefix < 64, ip4_prefix <= 32
- * Algorithmic Full IPv4 address (ea_bits_len > 0):
- *   ea_bits_len + ip4_prefix = 32
- *   psid_length = 0, ip6_prefix < 64, ip4_prefix <= 32
- * Algorithmic IPv4 prefix (ea_bits_len > 0):
- *   ea_bits_len + ip4_prefix < 32
- *   psid_length = 0, ip6_prefix < 64, ip4_prefix <= 32
- *
- * Independent Shared IPv4 address (ea_bits_len = 0):
- *   ip4_prefix = 32
- *   psid_length > 0
- *   Rule IPv6 address = 128, Rule PSID Set
- * Independent Full IPv4 address (ea_bits_len = 0):
- *   ip4_prefix = 32
- *   psid_length = 0, ip6_prefix = 128
- * Independent IPv4 prefix (ea_bits_len = 0):
- *   ip4_prefix < 32
- *   psid_length = 0, ip6_prefix = 128
- *
- */
-
-/*
- * This code supports MAP-T:
- *
- * With DMR prefix length equal to 96.
- *
- */
-
-
-i32
-ip4_get_port (ip4_header_t * ip, map_dir_e dir, u16 buffer_len)
-{
-  //TODO: use buffer length
-  if (ip->ip_version_and_header_length != 0x45 ||
-      ip4_get_fragment_offset (ip))
-    return -1;
-
-  if (PREDICT_TRUE ((ip->protocol == IP_PROTOCOL_TCP) ||
-		    (ip->protocol == IP_PROTOCOL_UDP)))
-    {
-      udp_header_t *udp = (void *) (ip + 1);
-      return (dir == MAP_SENDER) ? udp->src_port : udp->dst_port;
-    }
-  else if (ip->protocol == IP_PROTOCOL_ICMP)
-    {
-      icmp46_header_t *icmp = (void *) (ip + 1);
-      if (icmp->type == ICMP4_echo_request || icmp->type == ICMP4_echo_reply)
-	{
-	  return *((u16 *) (icmp + 1));
-	}
-      else if (clib_net_to_host_u16 (ip->length) >= 64)
-	{
-	  ip = (ip4_header_t *) (icmp + 2);
-	  if (PREDICT_TRUE ((ip->protocol == IP_PROTOCOL_TCP) ||
-			    (ip->protocol == IP_PROTOCOL_UDP)))
-	    {
-	      udp_header_t *udp = (void *) (ip + 1);
-	      return (dir == MAP_SENDER) ? udp->dst_port : udp->src_port;
-	    }
-	  else if (ip->protocol == IP_PROTOCOL_ICMP)
-	    {
-	      icmp46_header_t *icmp = (void *) (ip + 1);
-	      if (icmp->type == ICMP4_echo_request ||
-		  icmp->type == ICMP4_echo_reply)
-		{
-		  return *((u16 *) (icmp + 1));
-		}
-	    }
-	}
-    }
-  return -1;
-}
-
-i32
-ip6_get_port (ip6_header_t * ip6, map_dir_e dir, u16 buffer_len)
-{
-  u8 l4_protocol;
-  u16 l4_offset;
-  u16 frag_offset;
-  u8 *l4;
-
-  if (ip6_parse (ip6, buffer_len, &l4_protocol, &l4_offset, &frag_offset))
-    return -1;
-
-  //TODO: Use buffer length
-
-  if (frag_offset &&
-      ip6_frag_hdr_offset (((ip6_frag_hdr_t *)
-			    u8_ptr_add (ip6, frag_offset))))
-    return -1;			//Can't deal with non-first fragment for now
-
-  l4 = u8_ptr_add (ip6, l4_offset);
-  if (l4_protocol == IP_PROTOCOL_TCP || l4_protocol == IP_PROTOCOL_UDP)
-    {
-      return (dir ==
-	      MAP_SENDER) ? ((udp_header_t *) (l4))->src_port : ((udp_header_t
-								  *)
-								 (l4))->dst_port;
-    }
-  else if (l4_protocol == IP_PROTOCOL_ICMP6)
-    {
-      icmp46_header_t *icmp = (icmp46_header_t *) (l4);
-      if (icmp->type == ICMP6_echo_request)
-	{
-	  return (dir == MAP_SENDER) ? ((u16 *) (icmp))[2] : -1;
-	}
-      else if (icmp->type == ICMP6_echo_reply)
-	{
-	  return (dir == MAP_SENDER) ? -1 : ((u16 *) (icmp))[2];
-	}
-    }
-  return -1;
-}
-
-
-int
-map_create_domain (ip4_address_t * ip4_prefix,
-		   u8 ip4_prefix_len,
-		   ip6_address_t * ip6_prefix,
-		   u8 ip6_prefix_len,
-		   ip6_address_t * ip6_src,
-		   u8 ip6_src_len,
-		   u8 ea_bits_len,
-		   u8 psid_offset,
-		   u8 psid_length, u32 * map_domain_index, u16 mtu, u8 flags)
-{
-  u8 suffix_len, suffix_shift;
-  map_main_t *mm = &map_main;
-  dpo_id_t dpo_v4 = DPO_INVALID;
-  dpo_id_t dpo_v6 = DPO_INVALID;
-  fib_node_index_t fei;
-  map_domain_t *d;
-
-  /* Sanity check on the src prefix length */
-  if (flags & MAP_DOMAIN_TRANSLATION)
-    {
-      if (ip6_src_len != 96)
-	{
-	  clib_warning ("MAP-T only supports ip6_src_len = 96 for now.");
-	  return -1;
-	}
-    }
-  else
-    {
-      if (ip6_src_len != 128)
-	{
-	  clib_warning
-	    ("MAP-E requires a BR address, not a prefix (ip6_src_len should "
-	     "be 128).");
-	  return -1;
-	}
-    }
-
-  /* How many, and which bits to grab from the IPv4 DA */
-  if (ip4_prefix_len + ea_bits_len < 32)
-    {
-      flags |= MAP_DOMAIN_PREFIX;
-      suffix_shift = 32 - ip4_prefix_len - ea_bits_len;
-      suffix_len = ea_bits_len;
-    }
-  else
-    {
-      suffix_shift = 0;
-      suffix_len = 32 - ip4_prefix_len;
-    }
-
-  /* EA bits must be within the first 64 bits */
-  if (ea_bits_len > 0 && ((ip6_prefix_len + ea_bits_len) > 64 ||
-			  ip6_prefix_len + suffix_len + psid_length > 64))
-    {
-      clib_warning
-	("Embedded Address bits must be within the first 64 bits of "
-	 "the IPv6 prefix");
-      return -1;
-    }
-
-  /* Get domain index */
-  pool_get_aligned (mm->domains, d, CLIB_CACHE_LINE_BYTES);
-  memset (d, 0, sizeof (*d));
-  *map_domain_index = d - mm->domains;
-
-  /* Init domain struct */
-  d->ip4_prefix.as_u32 = ip4_prefix->as_u32;
-  d->ip4_prefix_len = ip4_prefix_len;
-  d->ip6_prefix = *ip6_prefix;
-  d->ip6_prefix_len = ip6_prefix_len;
-  d->ip6_src = *ip6_src;
-  d->ip6_src_len = ip6_src_len;
-  d->ea_bits_len = ea_bits_len;
-  d->psid_offset = psid_offset;
-  d->psid_length = psid_length;
-  d->mtu = mtu;
-  d->flags = flags;
-  d->suffix_shift = suffix_shift;
-  d->suffix_mask = (1 << suffix_len) - 1;
-
-  d->psid_shift = 16 - psid_length - psid_offset;
-  d->psid_mask = (1 << d->psid_length) - 1;
-  d->ea_shift = 64 - ip6_prefix_len - suffix_len - d->psid_length;
-
-  /* MAP data-plane object */
-  if (d->flags & MAP_DOMAIN_TRANSLATION)
-    map_t_dpo_create (DPO_PROTO_IP4, *map_domain_index, &dpo_v4);
-  else
-    map_dpo_create (DPO_PROTO_IP4, *map_domain_index, &dpo_v4);
-
-  /* Create ip4 route */
-  fib_prefix_t pfx = {
-    .fp_proto = FIB_PROTOCOL_IP4,
-    .fp_len = d->ip4_prefix_len,
-    .fp_addr = {
-		.ip4 = d->ip4_prefix,
-		}
-    ,
-  };
-  fib_table_entry_special_dpo_add (0, &pfx,
-				   FIB_SOURCE_MAP,
-				   FIB_ENTRY_FLAG_EXCLUSIVE, &dpo_v4);
-  dpo_reset (&dpo_v4);
-
-  /*
-   * Multiple MAP domains may share same source IPv6 TEP.
-   * In this case the route will exist and be MAP sourced.
-   * Find the adj (if any) already contributed and modify it
-   */
-  fib_prefix_t pfx6 = {
-    .fp_proto = FIB_PROTOCOL_IP6,
-    .fp_len = d->ip6_src_len,
-    .fp_addr = {
-		.ip6 = d->ip6_src,
-		}
-    ,
-  };
-  fei = fib_table_lookup_exact_match (0, &pfx6);
-
-  if (FIB_NODE_INDEX_INVALID != fei)
-    {
-      dpo_id_t dpo = DPO_INVALID;
-
-      if (fib_entry_get_dpo_for_source (fei, FIB_SOURCE_MAP, &dpo))
-	{
-	  /*
-	   * modify the existing MAP to indicate it's shared
-	   * skip to route add.
-	   */
-	  const dpo_id_t *md_dpo;
-	  map_dpo_t *md;
-
-	  ASSERT (DPO_LOAD_BALANCE == dpo.dpoi_type);
-
-	  md_dpo = load_balance_get_bucket (dpo.dpoi_index, 0);
-	  md = map_dpo_get (md_dpo->dpoi_index);
-
-	  md->md_domain = ~0;
-	  dpo_copy (&dpo_v6, md_dpo);
-	  dpo_reset (&dpo);
-
-	  goto route_add;
-	}
-    }
-
-  if (d->flags & MAP_DOMAIN_TRANSLATION)
-    map_t_dpo_create (DPO_PROTO_IP6, *map_domain_index, &dpo_v6);
-  else
-    map_dpo_create (DPO_PROTO_IP6, *map_domain_index, &dpo_v6);
-
-route_add:
-  /*
-   * Create ip6 route. This is a reference counted add. If the prefix
-   * already exists and is MAP sourced, it is now MAP source n+1 times
-   * and will need to be removed n+1 times.
-   */
-  fib_table_entry_special_dpo_add (0, &pfx6,
-				   FIB_SOURCE_MAP,
-				   FIB_ENTRY_FLAG_EXCLUSIVE, &dpo_v6);
-  dpo_reset (&dpo_v6);
-
-  /* Validate packet/byte counters */
-  map_domain_counter_lock (mm);
-  int i;
-  for (i = 0; i < vec_len (mm->simple_domain_counters); i++)
-    {
-      vlib_validate_simple_counter (&mm->simple_domain_counters[i],
-				    *map_domain_index);
-      vlib_zero_simple_counter (&mm->simple_domain_counters[i],
-				*map_domain_index);
-    }
-  for (i = 0; i < vec_len (mm->domain_counters); i++)
-    {
-      vlib_validate_combined_counter (&mm->domain_counters[i],
-				      *map_domain_index);
-      vlib_zero_combined_counter (&mm->domain_counters[i], *map_domain_index);
-    }
-  map_domain_counter_unlock (mm);
-
-  return 0;
-}
-
-/*
- * map_delete_domain
- */
-int
-map_delete_domain (u32 map_domain_index)
-{
-  map_main_t *mm = &map_main;
-  map_domain_t *d;
-
-  if (pool_is_free_index (mm->domains, map_domain_index))
-    {
-      clib_warning ("MAP domain delete: domain does not exist: %d",
-		    map_domain_index);
-      return -1;
-    }
-
-  d = pool_elt_at_index (mm->domains, map_domain_index);
-
-  fib_prefix_t pfx = {
-    .fp_proto = FIB_PROTOCOL_IP4,
-    .fp_len = d->ip4_prefix_len,
-    .fp_addr = {
-		.ip4 = d->ip4_prefix,
-		}
-    ,
-  };
-  fib_table_entry_special_remove (0, &pfx, FIB_SOURCE_MAP);
-
-  fib_prefix_t pfx6 = {
-    .fp_proto = FIB_PROTOCOL_IP6,
-    .fp_len = d->ip6_src_len,
-    .fp_addr = {
-		.ip6 = d->ip6_src,
-		}
-    ,
-  };
-  fib_table_entry_special_remove (0, &pfx6, FIB_SOURCE_MAP);
-
-  /* Deleting rules */
-  if (d->rules)
-    clib_mem_free (d->rules);
-
-  pool_put (mm->domains, d);
-
-  return 0;
-}
-
-int
-map_add_del_psid (u32 map_domain_index, u16 psid, ip6_address_t * tep,
-		  u8 is_add)
-{
-  map_domain_t *d;
-  map_main_t *mm = &map_main;
-
-  if (pool_is_free_index (mm->domains, map_domain_index))
-    {
-      clib_warning ("MAP rule: domain does not exist: %d", map_domain_index);
-      return -1;
-    }
-  d = pool_elt_at_index (mm->domains, map_domain_index);
-
-  /* Rules are only used in 1:1 independent case */
-  if (d->ea_bits_len > 0)
-    return (-1);
-
-  if (!d->rules)
-    {
-      u32 l = (0x1 << d->psid_length) * sizeof (ip6_address_t);
-      d->rules = clib_mem_alloc_aligned (l, CLIB_CACHE_LINE_BYTES);
-      if (!d->rules)
-	return -1;
-      memset (d->rules, 0, l);
-    }
-
-  if (psid >= (0x1 << d->psid_length))
-    {
-      clib_warning ("MAP rule: PSID outside bounds: %d [%d]", psid,
-		    0x1 << d->psid_length);
-      return -1;
-    }
-
-  if (is_add)
-    {
-      d->rules[psid] = *tep;
-    }
-  else
-    {
-      memset (&d->rules[psid], 0, sizeof (ip6_address_t));
-    }
-  return 0;
-}
-
-#ifdef MAP_SKIP_IP6_LOOKUP
-static void
-map_pre_resolve (ip4_address_t * ip4, ip6_address_t * ip6)
-{
-  map_main_t *mm = &map_main;
-  ip6_main_t *im6 = &ip6_main;
-
-  if (ip6->as_u64[0] != 0 || ip6->as_u64[1] != 0)
-    {
-      // FIXME NOT an ADJ
-      mm->adj6_index = ip6_fib_table_fwding_lookup (im6, 0, ip6);
-      clib_warning ("FIB lookup results in: %u", mm->adj6_index);
-    }
-  if (ip4->as_u32 != 0)
-    {
-      // FIXME NOT an ADJ
-      mm->adj4_index = ip4_fib_table_lookup_lb (0, ip4);
-      clib_warning ("FIB lookup results in: %u", mm->adj4_index);
-    }
-}
-#endif
-
-static clib_error_t *
-map_security_check_command_fn (vlib_main_t * vm,
-			       unformat_input_t * input,
-			       vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  map_main_t *mm = &map_main;
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "off"))
-	mm->sec_check = false;
-      else if (unformat (line_input, "on"))
-	mm->sec_check = true;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-  return 0;
-}
-
-static clib_error_t *
-map_security_check_frag_command_fn (vlib_main_t * vm,
-				    unformat_input_t * input,
-				    vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  map_main_t *mm = &map_main;
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "off"))
-	mm->sec_check_frag = false;
-      else if (unformat (line_input, "on"))
-	mm->sec_check_frag = true;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-  return 0;
-}
-
-static clib_error_t *
-map_add_domain_command_fn (vlib_main_t * vm,
-			   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ip4_address_t ip4_prefix;
-  ip6_address_t ip6_prefix;
-  ip6_address_t ip6_src;
-  u32 ip6_prefix_len = 0, ip4_prefix_len = 0, map_domain_index, ip6_src_len;
-  u32 num_m_args = 0;
-  /* Optional arguments */
-  u32 ea_bits_len = 0, psid_offset = 0, psid_length = 0;
-  u32 mtu = 0;
-  u8 flags = 0;
-  ip6_src_len = 128;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (line_input, "ip4-pfx %U/%d", unformat_ip4_address, &ip4_prefix,
-	   &ip4_prefix_len))
-	num_m_args++;
-      else
-	if (unformat
-	    (line_input, "ip6-pfx %U/%d", unformat_ip6_address, &ip6_prefix,
-	     &ip6_prefix_len))
-	num_m_args++;
-      else
-	if (unformat
-	    (line_input, "ip6-src %U/%d", unformat_ip6_address, &ip6_src,
-	     &ip6_src_len))
-	num_m_args++;
-      else
-	if (unformat
-	    (line_input, "ip6-src %U", unformat_ip6_address, &ip6_src))
-	num_m_args++;
-      else if (unformat (line_input, "ea-bits-len %d", &ea_bits_len))
-	num_m_args++;
-      else if (unformat (line_input, "psid-offset %d", &psid_offset))
-	num_m_args++;
-      else if (unformat (line_input, "psid-len %d", &psid_length))
-	num_m_args++;
-      else if (unformat (line_input, "mtu %d", &mtu))
-	num_m_args++;
-      else if (unformat (line_input, "map-t"))
-	flags |= MAP_DOMAIN_TRANSLATION;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  if (num_m_args < 3)
-    return clib_error_return (0, "mandatory argument(s) missing");
-
-  map_create_domain (&ip4_prefix, ip4_prefix_len,
-		     &ip6_prefix, ip6_prefix_len, &ip6_src, ip6_src_len,
-		     ea_bits_len, psid_offset, psid_length, &map_domain_index,
-		     mtu, flags);
-
-  return 0;
-}
-
-static clib_error_t *
-map_del_domain_command_fn (vlib_main_t * vm,
-			   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u32 num_m_args = 0;
-  u32 map_domain_index;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "index %d", &map_domain_index))
-	num_m_args++;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  if (num_m_args != 1)
-    return clib_error_return (0, "mandatory argument(s) missing");
-
-  map_delete_domain (map_domain_index);
-
-  return 0;
-}
-
-static clib_error_t *
-map_add_rule_command_fn (vlib_main_t * vm,
-			 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ip6_address_t tep;
-  u32 num_m_args = 0;
-  u32 psid = 0, map_domain_index;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "index %d", &map_domain_index))
-	num_m_args++;
-      else if (unformat (line_input, "psid %d", &psid))
-	num_m_args++;
-      else
-	if (unformat (line_input, "ip6-dst %U", unformat_ip6_address, &tep))
-	num_m_args++;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  if (num_m_args != 3)
-    return clib_error_return (0, "mandatory argument(s) missing");
-
-  if (map_add_del_psid (map_domain_index, psid, &tep, 1) != 0)
-    {
-      return clib_error_return (0, "Failing to add Mapping Rule");
-    }
-  return 0;
-}
-
-#if MAP_SKIP_IP6_LOOKUP
-static clib_error_t *
-map_pre_resolve_command_fn (vlib_main_t * vm,
-			    unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ip4_address_t ip4nh;
-  ip6_address_t ip6nh;
-  map_main_t *mm = &map_main;
-
-  memset (&ip4nh, 0, sizeof (ip4nh));
-  memset (&ip6nh, 0, sizeof (ip6nh));
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "ip4-nh %U", unformat_ip4_address, &ip4nh))
-	mm->preresolve_ip4 = ip4nh;
-      else
-	if (unformat (line_input, "ip6-nh %U", unformat_ip6_address, &ip6nh))
-	mm->preresolve_ip6 = ip6nh;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  map_pre_resolve (&ip4nh, &ip6nh);
-
-  return 0;
-}
-#endif
-
-static clib_error_t *
-map_icmp_relay_source_address_command_fn (vlib_main_t * vm,
-					  unformat_input_t * input,
-					  vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ip4_address_t icmp_src_address;
-  map_main_t *mm = &map_main;
-
-  mm->icmp4_src_address.as_u32 = 0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (line_input, "%U", unformat_ip4_address, &icmp_src_address))
-	mm->icmp4_src_address = icmp_src_address;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  return 0;
-}
-
-static clib_error_t *
-map_icmp_unreachables_command_fn (vlib_main_t * vm,
-				  unformat_input_t * input,
-				  vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  map_main_t *mm = &map_main;
-  int num_m_args = 0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      num_m_args++;
-      if (unformat (line_input, "on"))
-	mm->icmp6_enabled = true;
-      else if (unformat (line_input, "off"))
-	mm->icmp6_enabled = false;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-
-  if (num_m_args != 1)
-    return clib_error_return (0, "mandatory argument(s) missing");
-
-  return 0;
-}
-
-static clib_error_t *
-map_fragment_command_fn (vlib_main_t * vm,
-			 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  map_main_t *mm = &map_main;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "inner"))
-	mm->frag_inner = true;
-      else if (unformat (line_input, "outer"))
-	mm->frag_inner = false;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  return 0;
-}
-
-static clib_error_t *
-map_fragment_df_command_fn (vlib_main_t * vm,
-			    unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  map_main_t *mm = &map_main;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "on"))
-	mm->frag_ignore_df = true;
-      else if (unformat (line_input, "off"))
-	mm->frag_ignore_df = false;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  return 0;
-}
-
-static clib_error_t *
-map_traffic_class_command_fn (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  map_main_t *mm = &map_main;
-  u32 tc = 0;
-
-  mm->tc_copy = false;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "copy"))
-	mm->tc_copy = true;
-      else if (unformat (line_input, "%x", &tc))
-	mm->tc = tc & 0xff;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  return 0;
-}
-
-static u8 *
-format_map_domain (u8 * s, va_list * args)
-{
-  map_domain_t *d = va_arg (*args, map_domain_t *);
-  bool counters = va_arg (*args, int);
-  map_main_t *mm = &map_main;
-  ip6_address_t ip6_prefix;
-
-  if (d->rules)
-    memset (&ip6_prefix, 0, sizeof (ip6_prefix));
-  else
-    ip6_prefix = d->ip6_prefix;
-
-  s = format (s,
-	      "[%d] ip4-pfx %U/%d ip6-pfx %U/%d ip6-src %U/%d ea_bits_len %d psid-offset %d psid-len %d mtu %d %s",
-	      d - mm->domains,
-	      format_ip4_address, &d->ip4_prefix, d->ip4_prefix_len,
-	      format_ip6_address, &ip6_prefix, d->ip6_prefix_len,
-	      format_ip6_address, &d->ip6_src, d->ip6_src_len,
-	      d->ea_bits_len, d->psid_offset, d->psid_length, d->mtu,
-	      (d->flags & MAP_DOMAIN_TRANSLATION) ? "map-t" : "");
-
-  if (counters)
-    {
-      map_domain_counter_lock (mm);
-      vlib_counter_t v;
-      vlib_get_combined_counter (&mm->domain_counters[MAP_DOMAIN_COUNTER_TX],
-				 d - mm->domains, &v);
-      s = format (s, "  TX: %lld/%lld", v.packets, v.bytes);
-      vlib_get_combined_counter (&mm->domain_counters[MAP_DOMAIN_COUNTER_RX],
-				 d - mm->domains, &v);
-      s = format (s, "  RX: %lld/%lld", v.packets, v.bytes);
-      map_domain_counter_unlock (mm);
-    }
-  s = format (s, "\n");
-
-  if (d->rules)
-    {
-      int i;
-      ip6_address_t dst;
-      for (i = 0; i < (0x1 << d->psid_length); i++)
-	{
-	  dst = d->rules[i];
-	  if (dst.as_u64[0] == 0 && dst.as_u64[1] == 0)
-	    continue;
-	  s = format (s,
-		      " rule psid: %d ip6-dst %U\n", i, format_ip6_address,
-		      &dst);
-	}
-    }
-  return s;
-}
-
-static u8 *
-format_map_ip4_reass (u8 * s, va_list * args)
-{
-  map_main_t *mm = &map_main;
-  map_ip4_reass_t *r = va_arg (*args, map_ip4_reass_t *);
-  map_ip4_reass_key_t *k = &r->key;
-  f64 now = vlib_time_now (mm->vlib_main);
-  f64 lifetime = (((f64) mm->ip4_reass_conf_lifetime_ms) / 1000);
-  f64 dt = (r->ts + lifetime > now) ? (r->ts + lifetime - now) : -1;
-  s = format (s,
-	      "ip4-reass src=%U  dst=%U  protocol=%d  identifier=%d  port=%d  lifetime=%.3lf\n",
-	      format_ip4_address, &k->src.as_u8, format_ip4_address,
-	      &k->dst.as_u8, k->protocol,
-	      clib_net_to_host_u16 (k->fragment_id),
-	      (r->port >= 0) ? clib_net_to_host_u16 (r->port) : -1, dt);
-  return s;
-}
-
-static u8 *
-format_map_ip6_reass (u8 * s, va_list * args)
-{
-  map_main_t *mm = &map_main;
-  map_ip6_reass_t *r = va_arg (*args, map_ip6_reass_t *);
-  map_ip6_reass_key_t *k = &r->key;
-  f64 now = vlib_time_now (mm->vlib_main);
-  f64 lifetime = (((f64) mm->ip6_reass_conf_lifetime_ms) / 1000);
-  f64 dt = (r->ts + lifetime > now) ? (r->ts + lifetime - now) : -1;
-  s = format (s,
-	      "ip6-reass src=%U  dst=%U  protocol=%d  identifier=%d  lifetime=%.3lf\n",
-	      format_ip6_address, &k->src.as_u8, format_ip6_address,
-	      &k->dst.as_u8, k->protocol,
-	      clib_net_to_host_u32 (k->fragment_id), dt);
-  return s;
-}
-
-static clib_error_t *
-show_map_domain_command_fn (vlib_main_t * vm, unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  map_main_t *mm = &map_main;
-  map_domain_t *d;
-  bool counters = false;
-  u32 map_domain_index = ~0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "counters"))
-	counters = true;
-      else if (unformat (line_input, "index %d", &map_domain_index))
-	;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  if (pool_elts (mm->domains) == 0)
-    vlib_cli_output (vm, "No MAP domains are configured...");
-
-  if (map_domain_index == ~0)
-    {
-    /* *INDENT-OFF* */
-    pool_foreach(d, mm->domains, ({vlib_cli_output(vm, "%U", format_map_domain, d, counters);}));
-    /* *INDENT-ON* */
-    }
-  else
-    {
-      if (pool_is_free_index (mm->domains, map_domain_index))
-	{
-	  return clib_error_return (0, "MAP domain does not exists %d",
-				    map_domain_index);
-	}
-
-      d = pool_elt_at_index (mm->domains, map_domain_index);
-      vlib_cli_output (vm, "%U", format_map_domain, d, counters);
-    }
-
-  return 0;
-}
-
-static clib_error_t *
-show_map_fragments_command_fn (vlib_main_t * vm, unformat_input_t * input,
-			       vlib_cli_command_t * cmd)
-{
-  map_main_t *mm = &map_main;
-  map_ip4_reass_t *f4;
-  map_ip6_reass_t *f6;
-
-  /* *INDENT-OFF* */
-  pool_foreach(f4, mm->ip4_reass_pool, ({vlib_cli_output (vm, "%U", format_map_ip4_reass, f4);}));
-  /* *INDENT-ON* */
-  /* *INDENT-OFF* */
-  pool_foreach(f6, mm->ip6_reass_pool, ({vlib_cli_output (vm, "%U", format_map_ip6_reass, f6);}));
-  /* *INDENT-ON* */
-  return (0);
-}
-
-u64
-map_error_counter_get (u32 node_index, map_error_t map_error)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vlib_node_runtime_t *error_node = vlib_node_get_runtime (vm, node_index);
-  vlib_error_main_t *em = &vm->error_main;
-  vlib_error_t e = error_node->errors[map_error];
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  u32 ci;
-
-  ci = vlib_error_get_code (e);
-  ASSERT (ci < n->n_errors);
-  ci += n->error_heap_index;
-
-  return (em->counters[ci]);
-}
-
-static clib_error_t *
-show_map_stats_command_fn (vlib_main_t * vm, unformat_input_t * input,
-			   vlib_cli_command_t * cmd)
-{
-  map_main_t *mm = &map_main;
-  map_domain_t *d;
-  int domains = 0, rules = 0, domaincount = 0, rulecount = 0;
-  if (pool_elts (mm->domains) == 0)
-    vlib_cli_output (vm, "No MAP domains are configured...");
-
-  /* *INDENT-OFF* */
-  pool_foreach(d, mm->domains, ({
-    if (d->rules) {
-      rulecount+= 0x1 << d->psid_length;
-      rules += sizeof(ip6_address_t) * 0x1 << d->psid_length;
-    }
-    domains += sizeof(*d);
-    domaincount++;
-  }));
-  /* *INDENT-ON* */
-
-  vlib_cli_output (vm, "MAP domains structure: %d\n", sizeof (map_domain_t));
-  vlib_cli_output (vm, "MAP domains: %d (%d bytes)\n", domaincount, domains);
-  vlib_cli_output (vm, "MAP rules: %d (%d bytes)\n", rulecount, rules);
-  vlib_cli_output (vm, "Total: %d bytes)\n", rules + domains);
-
-#if MAP_SKIP_IP6_LOOKUP
-  vlib_cli_output (vm,
-		   "MAP pre-resolve: IP6 next-hop: %U (%u), IP4 next-hop: %U (%u)\n",
-		   format_ip6_address, &mm->preresolve_ip6, mm->adj6_index,
-		   format_ip4_address, &mm->preresolve_ip4, mm->adj4_index);
-#endif
-
-  if (mm->tc_copy)
-    vlib_cli_output (vm, "MAP traffic-class: copy");
-  else
-    vlib_cli_output (vm, "MAP traffic-class: %x", mm->tc);
-
-  vlib_cli_output (vm,
-		   "MAP IPv6 inbound security check: %s, fragmented packet security check: %s",
-		   mm->sec_check ? "enabled" : "disabled",
-		   mm->sec_check_frag ? "enabled" : "disabled");
-
-  vlib_cli_output (vm, "ICMP-relay IPv4 source address: %U\n",
-		   format_ip4_address, &mm->icmp4_src_address);
-  vlib_cli_output (vm, "ICMP6 unreachables sent for unmatched packets: %s\n",
-		   mm->icmp6_enabled ? "enabled" : "disabled");
-  vlib_cli_output (vm, "Inner fragmentation: %s\n",
-		   mm->frag_inner ? "enabled" : "disabled");
-  vlib_cli_output (vm, "Fragment packets regardless of DF flag: %s\n",
-		   mm->frag_ignore_df ? "enabled" : "disabled");
-
-  /*
-   * Counters
-   */
-  vlib_combined_counter_main_t *cm = mm->domain_counters;
-  u64 total_pkts[MAP_N_DOMAIN_COUNTER];
-  u64 total_bytes[MAP_N_DOMAIN_COUNTER];
-  int which, i;
-  vlib_counter_t v;
-
-  memset (total_pkts, 0, sizeof (total_pkts));
-  memset (total_bytes, 0, sizeof (total_bytes));
-
-  map_domain_counter_lock (mm);
-  vec_foreach (cm, mm->domain_counters)
-  {
-    which = cm - mm->domain_counters;
-
-    for (i = 0; i < vec_len (cm->maxi); i++)
-      {
-	vlib_get_combined_counter (cm, i, &v);
-	total_pkts[which] += v.packets;
-	total_bytes[which] += v.bytes;
-      }
-  }
-  map_domain_counter_unlock (mm);
-
-  vlib_cli_output (vm, "Encapsulated packets: %lld bytes: %lld\n",
-		   total_pkts[MAP_DOMAIN_COUNTER_TX],
-		   total_bytes[MAP_DOMAIN_COUNTER_TX]);
-  vlib_cli_output (vm, "Decapsulated packets: %lld bytes: %lld\n",
-		   total_pkts[MAP_DOMAIN_COUNTER_RX],
-		   total_bytes[MAP_DOMAIN_COUNTER_RX]);
-
-  vlib_cli_output (vm, "ICMP relayed packets: %d\n",
-		   vlib_get_simple_counter (&mm->icmp_relayed, 0));
-
-  return 0;
-}
-
-static clib_error_t *
-map_params_reass_command_fn (vlib_main_t * vm, unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u32 lifetime = ~0;
-  f64 ht_ratio = (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1);
-  u32 pool_size = ~0;
-  u64 buffers = ~(0ull);
-  u8 ip4 = 0, ip6 = 0;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "lifetime %u", &lifetime))
-	;
-      else if (unformat (line_input, "ht-ratio %lf", &ht_ratio))
-	;
-      else if (unformat (line_input, "pool-size %u", &pool_size))
-	;
-      else if (unformat (line_input, "buffers %llu", &buffers))
-	;
-      else if (unformat (line_input, "ip4"))
-	ip4 = 1;
-      else if (unformat (line_input, "ip6"))
-	ip6 = 1;
-      else
-	{
-	  unformat_free (line_input);
-	  return clib_error_return (0, "invalid input");
-	}
-    }
-  unformat_free (line_input);
-
-  if (!ip4 && !ip6)
-    return clib_error_return (0, "must specify ip4 and/or ip6");
-
-  if (ip4)
-    {
-      if (pool_size != ~0 && pool_size > MAP_IP4_REASS_CONF_POOL_SIZE_MAX)
-	return clib_error_return (0, "invalid ip4-reass pool-size ( > %d)",
-				  MAP_IP4_REASS_CONF_POOL_SIZE_MAX);
-      if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1)
-	  && ht_ratio > MAP_IP4_REASS_CONF_HT_RATIO_MAX)
-	return clib_error_return (0, "invalid ip4-reass ht-ratio ( > %d)",
-				  MAP_IP4_REASS_CONF_HT_RATIO_MAX);
-      if (lifetime != ~0 && lifetime > MAP_IP4_REASS_CONF_LIFETIME_MAX)
-	return clib_error_return (0, "invalid ip4-reass lifetime ( > %d)",
-				  MAP_IP4_REASS_CONF_LIFETIME_MAX);
-      if (buffers != ~(0ull) && buffers > MAP_IP4_REASS_CONF_BUFFERS_MAX)
-	return clib_error_return (0, "invalid ip4-reass buffers ( > %ld)",
-				  MAP_IP4_REASS_CONF_BUFFERS_MAX);
-    }
-
-  if (ip6)
-    {
-      if (pool_size != ~0 && pool_size > MAP_IP6_REASS_CONF_POOL_SIZE_MAX)
-	return clib_error_return (0, "invalid ip6-reass pool-size ( > %d)",
-				  MAP_IP6_REASS_CONF_POOL_SIZE_MAX);
-      if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1)
-	  && ht_ratio > MAP_IP6_REASS_CONF_HT_RATIO_MAX)
-	return clib_error_return (0, "invalid ip6-reass ht-log2len ( > %d)",
-				  MAP_IP6_REASS_CONF_HT_RATIO_MAX);
-      if (lifetime != ~0 && lifetime > MAP_IP6_REASS_CONF_LIFETIME_MAX)
-	return clib_error_return (0, "invalid ip6-reass lifetime ( > %d)",
-				  MAP_IP6_REASS_CONF_LIFETIME_MAX);
-      if (buffers != ~(0ull) && buffers > MAP_IP6_REASS_CONF_BUFFERS_MAX)
-	return clib_error_return (0, "invalid ip6-reass buffers ( > %ld)",
-				  MAP_IP6_REASS_CONF_BUFFERS_MAX);
-    }
-
-  if (ip4)
-    {
-      u32 reass = 0, packets = 0;
-      if (pool_size != ~0)
-	{
-	  if (map_ip4_reass_conf_pool_size (pool_size, &reass, &packets))
-	    {
-	      vlib_cli_output (vm, "Could not set ip4-reass pool-size");
-	    }
-	  else
-	    {
-	      vlib_cli_output (vm,
-			       "Setting ip4-reass pool-size (destroyed-reassembly=%u , dropped-fragments=%u)",
-			       reass, packets);
-	    }
-	}
-      if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1))
-	{
-	  if (map_ip4_reass_conf_ht_ratio (ht_ratio, &reass, &packets))
-	    {
-	      vlib_cli_output (vm, "Could not set ip4-reass ht-log2len");
-	    }
-	  else
-	    {
-	      vlib_cli_output (vm,
-			       "Setting ip4-reass ht-log2len (destroyed-reassembly=%u , dropped-fragments=%u)",
-			       reass, packets);
-	    }
-	}
-      if (lifetime != ~0)
-	{
-	  if (map_ip4_reass_conf_lifetime (lifetime))
-	    vlib_cli_output (vm, "Could not set ip4-reass lifetime");
-	  else
-	    vlib_cli_output (vm, "Setting ip4-reass lifetime");
-	}
-      if (buffers != ~(0ull))
-	{
-	  if (map_ip4_reass_conf_buffers (buffers))
-	    vlib_cli_output (vm, "Could not set ip4-reass buffers");
-	  else
-	    vlib_cli_output (vm, "Setting ip4-reass buffers");
-	}
-
-      if (map_main.ip4_reass_conf_buffers >
-	  map_main.ip4_reass_conf_pool_size *
-	  MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY)
-	{
-	  vlib_cli_output (vm,
-			   "Note: 'ip4-reass buffers' > pool-size * max-fragments-per-reassembly.");
-	}
-    }
-
-  if (ip6)
-    {
-      u32 reass = 0, packets = 0;
-      if (pool_size != ~0)
-	{
-	  if (map_ip6_reass_conf_pool_size (pool_size, &reass, &packets))
-	    {
-	      vlib_cli_output (vm, "Could not set ip6-reass pool-size");
-	    }
-	  else
-	    {
-	      vlib_cli_output (vm,
-			       "Setting ip6-reass pool-size (destroyed-reassembly=%u , dropped-fragments=%u)",
-			       reass, packets);
-	    }
-	}
-      if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1))
-	{
-	  if (map_ip6_reass_conf_ht_ratio (ht_ratio, &reass, &packets))
-	    {
-	      vlib_cli_output (vm, "Could not set ip6-reass ht-log2len");
-	    }
-	  else
-	    {
-	      vlib_cli_output (vm,
-			       "Setting ip6-reass ht-log2len (destroyed-reassembly=%u , dropped-fragments=%u)",
-			       reass, packets);
-	    }
-	}
-      if (lifetime != ~0)
-	{
-	  if (map_ip6_reass_conf_lifetime (lifetime))
-	    vlib_cli_output (vm, "Could not set ip6-reass lifetime");
-	  else
-	    vlib_cli_output (vm, "Setting ip6-reass lifetime");
-	}
-      if (buffers != ~(0ull))
-	{
-	  if (map_ip6_reass_conf_buffers (buffers))
-	    vlib_cli_output (vm, "Could not set ip6-reass buffers");
-	  else
-	    vlib_cli_output (vm, "Setting ip6-reass buffers");
-	}
-
-      if (map_main.ip6_reass_conf_buffers >
-	  map_main.ip6_reass_conf_pool_size *
-	  MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY)
-	{
-	  vlib_cli_output (vm,
-			   "Note: 'ip6-reass buffers' > pool-size * max-fragments-per-reassembly.");
-	}
-    }
-
-  return 0;
-}
-
-
-/*
- * packet trace format function
- */
-u8 *
-format_map_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  map_trace_t *t = va_arg (*args, map_trace_t *);
-  u32 map_domain_index = t->map_domain_index;
-  u16 port = t->port;
-
-  s =
-    format (s, "MAP domain index: %d L4 port: %u", map_domain_index,
-	    clib_net_to_host_u16 (port));
-
-  return s;
-}
-
-static_always_inline map_ip4_reass_t *
-map_ip4_reass_lookup (map_ip4_reass_key_t * k, u32 bucket, f64 now)
-{
-  map_main_t *mm = &map_main;
-  u32 ri = mm->ip4_reass_hash_table[bucket];
-  while (ri != MAP_REASS_INDEX_NONE)
-    {
-      map_ip4_reass_t *r = pool_elt_at_index (mm->ip4_reass_pool, ri);
-      if (r->key.as_u64[0] == k->as_u64[0] &&
-	  r->key.as_u64[1] == k->as_u64[1] &&
-	  now < r->ts + (((f64) mm->ip4_reass_conf_lifetime_ms) / 1000))
-	{
-	  return r;
-	}
-      ri = r->bucket_next;
-    }
-  return NULL;
-}
-
-#define map_ip4_reass_pool_index(r) (r - map_main.ip4_reass_pool)
-
-void
-map_ip4_reass_free (map_ip4_reass_t * r, u32 ** pi_to_drop)
-{
-  map_main_t *mm = &map_main;
-  map_ip4_reass_get_fragments (r, pi_to_drop);
-
-  // Unlink in hash bucket
-  map_ip4_reass_t *r2 = NULL;
-  u32 r2i = mm->ip4_reass_hash_table[r->bucket];
-  while (r2i != map_ip4_reass_pool_index (r))
-    {
-      ASSERT (r2i != MAP_REASS_INDEX_NONE);
-      r2 = pool_elt_at_index (mm->ip4_reass_pool, r2i);
-      r2i = r2->bucket_next;
-    }
-  if (r2)
-    {
-      r2->bucket_next = r->bucket_next;
-    }
-  else
-    {
-      mm->ip4_reass_hash_table[r->bucket] = r->bucket_next;
-    }
-
-  // Unlink in list
-  if (r->fifo_next == map_ip4_reass_pool_index (r))
-    {
-      mm->ip4_reass_fifo_last = MAP_REASS_INDEX_NONE;
-    }
-  else
-    {
-      if (mm->ip4_reass_fifo_last == map_ip4_reass_pool_index (r))
-	mm->ip4_reass_fifo_last = r->fifo_prev;
-      pool_elt_at_index (mm->ip4_reass_pool, r->fifo_prev)->fifo_next =
-	r->fifo_next;
-      pool_elt_at_index (mm->ip4_reass_pool, r->fifo_next)->fifo_prev =
-	r->fifo_prev;
-    }
-
-  pool_put (mm->ip4_reass_pool, r);
-  mm->ip4_reass_allocated--;
-}
-
-map_ip4_reass_t *
-map_ip4_reass_get (u32 src, u32 dst, u16 fragment_id,
-		   u8 protocol, u32 ** pi_to_drop)
-{
-  map_ip4_reass_t *r;
-  map_main_t *mm = &map_main;
-  map_ip4_reass_key_t k = {.src.data_u32 = src,
-    .dst.data_u32 = dst,
-    .fragment_id = fragment_id,
-    .protocol = protocol
-  };
-
-  u32 h = 0;
-  h = crc_u32 (k.as_u32[0], h);
-  h = crc_u32 (k.as_u32[1], h);
-  h = crc_u32 (k.as_u32[2], h);
-  h = crc_u32 (k.as_u32[3], h);
-  h = h >> (32 - mm->ip4_reass_ht_log2len);
-
-  f64 now = vlib_time_now (mm->vlib_main);
-
-  //Cache garbage collection
-  while (mm->ip4_reass_fifo_last != MAP_REASS_INDEX_NONE)
-    {
-      map_ip4_reass_t *last =
-	pool_elt_at_index (mm->ip4_reass_pool, mm->ip4_reass_fifo_last);
-      if (last->ts + (((f64) mm->ip4_reass_conf_lifetime_ms) / 1000) < now)
-	map_ip4_reass_free (last, pi_to_drop);
-      else
-	break;
-    }
-
-  if ((r = map_ip4_reass_lookup (&k, h, now)))
-    return r;
-
-  if (mm->ip4_reass_allocated >= mm->ip4_reass_conf_pool_size)
-    return NULL;
-
-  pool_get (mm->ip4_reass_pool, r);
-  mm->ip4_reass_allocated++;
-  int i;
-  for (i = 0; i < MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
-    r->fragments[i] = ~0;
-
-  u32 ri = map_ip4_reass_pool_index (r);
-
-  //Link in new bucket
-  r->bucket = h;
-  r->bucket_next = mm->ip4_reass_hash_table[h];
-  mm->ip4_reass_hash_table[h] = ri;
-
-  //Link in fifo
-  if (mm->ip4_reass_fifo_last != MAP_REASS_INDEX_NONE)
-    {
-      r->fifo_next =
-	pool_elt_at_index (mm->ip4_reass_pool,
-			   mm->ip4_reass_fifo_last)->fifo_next;
-      r->fifo_prev = mm->ip4_reass_fifo_last;
-      pool_elt_at_index (mm->ip4_reass_pool, r->fifo_prev)->fifo_next = ri;
-      pool_elt_at_index (mm->ip4_reass_pool, r->fifo_next)->fifo_prev = ri;
-    }
-  else
-    {
-      r->fifo_next = r->fifo_prev = ri;
-      mm->ip4_reass_fifo_last = ri;
-    }
-
-  //Set other fields
-  r->ts = now;
-  r->key = k;
-  r->port = -1;
-#ifdef MAP_IP4_REASS_COUNT_BYTES
-  r->expected_total = 0xffff;
-  r->forwarded = 0;
-#endif
-
-  return r;
-}
-
-int
-map_ip4_reass_add_fragment (map_ip4_reass_t * r, u32 pi)
-{
-  if (map_main.ip4_reass_buffered_counter >= map_main.ip4_reass_conf_buffers)
-    return -1;
-
-  int i;
-  for (i = 0; i < MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
-    if (r->fragments[i] == ~0)
-      {
-	r->fragments[i] = pi;
-	map_main.ip4_reass_buffered_counter++;
-	return 0;
-      }
-  return -1;
-}
-
-static_always_inline map_ip6_reass_t *
-map_ip6_reass_lookup (map_ip6_reass_key_t * k, u32 bucket, f64 now)
-{
-  map_main_t *mm = &map_main;
-  u32 ri = mm->ip6_reass_hash_table[bucket];
-  while (ri != MAP_REASS_INDEX_NONE)
-    {
-      map_ip6_reass_t *r = pool_elt_at_index (mm->ip6_reass_pool, ri);
-      if (now < r->ts + (((f64) mm->ip6_reass_conf_lifetime_ms) / 1000) &&
-	  r->key.as_u64[0] == k->as_u64[0] &&
-	  r->key.as_u64[1] == k->as_u64[1] &&
-	  r->key.as_u64[2] == k->as_u64[2] &&
-	  r->key.as_u64[3] == k->as_u64[3] &&
-	  r->key.as_u64[4] == k->as_u64[4])
-	return r;
-      ri = r->bucket_next;
-    }
-  return NULL;
-}
-
-#define map_ip6_reass_pool_index(r) (r - map_main.ip6_reass_pool)
-
-void
-map_ip6_reass_free (map_ip6_reass_t * r, u32 ** pi_to_drop)
-{
-  map_main_t *mm = &map_main;
-  int i;
-  for (i = 0; i < MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
-    if (r->fragments[i].pi != ~0)
-      {
-	vec_add1 (*pi_to_drop, r->fragments[i].pi);
-	r->fragments[i].pi = ~0;
-	map_main.ip6_reass_buffered_counter--;
-      }
-
-  // Unlink in hash bucket
-  map_ip6_reass_t *r2 = NULL;
-  u32 r2i = mm->ip6_reass_hash_table[r->bucket];
-  while (r2i != map_ip6_reass_pool_index (r))
-    {
-      ASSERT (r2i != MAP_REASS_INDEX_NONE);
-      r2 = pool_elt_at_index (mm->ip6_reass_pool, r2i);
-      r2i = r2->bucket_next;
-    }
-  if (r2)
-    {
-      r2->bucket_next = r->bucket_next;
-    }
-  else
-    {
-      mm->ip6_reass_hash_table[r->bucket] = r->bucket_next;
-    }
-
-  // Unlink in list
-  if (r->fifo_next == map_ip6_reass_pool_index (r))
-    {
-      //Single element in the list, list is now empty
-      mm->ip6_reass_fifo_last = MAP_REASS_INDEX_NONE;
-    }
-  else
-    {
-      if (mm->ip6_reass_fifo_last == map_ip6_reass_pool_index (r))	//First element
-	mm->ip6_reass_fifo_last = r->fifo_prev;
-      pool_elt_at_index (mm->ip6_reass_pool, r->fifo_prev)->fifo_next =
-	r->fifo_next;
-      pool_elt_at_index (mm->ip6_reass_pool, r->fifo_next)->fifo_prev =
-	r->fifo_prev;
-    }
-
-  // Free from pool if necessary
-  pool_put (mm->ip6_reass_pool, r);
-  mm->ip6_reass_allocated--;
-}
-
-map_ip6_reass_t *
-map_ip6_reass_get (ip6_address_t * src, ip6_address_t * dst, u32 fragment_id,
-		   u8 protocol, u32 ** pi_to_drop)
-{
-  map_ip6_reass_t *r;
-  map_main_t *mm = &map_main;
-  map_ip6_reass_key_t k = {
-    .src = *src,
-    .dst = *dst,
-    .fragment_id = fragment_id,
-    .protocol = protocol
-  };
-
-  u32 h = 0;
-  int i;
-  for (i = 0; i < 10; i++)
-    h = crc_u32 (k.as_u32[i], h);
-  h = h >> (32 - mm->ip6_reass_ht_log2len);
-
-  f64 now = vlib_time_now (mm->vlib_main);
-
-  //Cache garbage collection
-  while (mm->ip6_reass_fifo_last != MAP_REASS_INDEX_NONE)
-    {
-      map_ip6_reass_t *last =
-	pool_elt_at_index (mm->ip6_reass_pool, mm->ip6_reass_fifo_last);
-      if (last->ts + (((f64) mm->ip6_reass_conf_lifetime_ms) / 1000) < now)
-	map_ip6_reass_free (last, pi_to_drop);
-      else
-	break;
-    }
-
-  if ((r = map_ip6_reass_lookup (&k, h, now)))
-    return r;
-
-  if (mm->ip6_reass_allocated >= mm->ip6_reass_conf_pool_size)
-    return NULL;
-
-  pool_get (mm->ip6_reass_pool, r);
-  mm->ip6_reass_allocated++;
-  for (i = 0; i < MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
-    {
-      r->fragments[i].pi = ~0;
-      r->fragments[i].next_data_len = 0;
-      r->fragments[i].next_data_offset = 0;
-    }
-
-  u32 ri = map_ip6_reass_pool_index (r);
-
-  //Link in new bucket
-  r->bucket = h;
-  r->bucket_next = mm->ip6_reass_hash_table[h];
-  mm->ip6_reass_hash_table[h] = ri;
-
-  //Link in fifo
-  if (mm->ip6_reass_fifo_last != MAP_REASS_INDEX_NONE)
-    {
-      r->fifo_next =
-	pool_elt_at_index (mm->ip6_reass_pool,
-			   mm->ip6_reass_fifo_last)->fifo_next;
-      r->fifo_prev = mm->ip6_reass_fifo_last;
-      pool_elt_at_index (mm->ip6_reass_pool, r->fifo_prev)->fifo_next = ri;
-      pool_elt_at_index (mm->ip6_reass_pool, r->fifo_next)->fifo_prev = ri;
-    }
-  else
-    {
-      r->fifo_next = r->fifo_prev = ri;
-      mm->ip6_reass_fifo_last = ri;
-    }
-
-  //Set other fields
-  r->ts = now;
-  r->key = k;
-  r->ip4_header.ip_version_and_header_length = 0;
-#ifdef MAP_IP6_REASS_COUNT_BYTES
-  r->expected_total = 0xffff;
-  r->forwarded = 0;
-#endif
-  return r;
-}
-
-int
-map_ip6_reass_add_fragment (map_ip6_reass_t * r, u32 pi,
-			    u16 data_offset, u16 next_data_offset,
-			    u8 * data_start, u16 data_len)
-{
-  map_ip6_fragment_t *f = NULL, *prev_f = NULL;
-  u16 copied_len = (data_len > 20) ? 20 : data_len;
-
-  if (map_main.ip6_reass_buffered_counter >= map_main.ip6_reass_conf_buffers)
-    return -1;
-
-  //Lookup for fragments for the current buffer
-  //and the one before that
-  int i;
-  for (i = 0; i < MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
-    {
-      if (data_offset && r->fragments[i].next_data_offset == data_offset)
-	{
-	  prev_f = &r->fragments[i];	// This is buffer for previous packet
-	}
-      else if (r->fragments[i].next_data_offset == next_data_offset)
-	{
-	  f = &r->fragments[i];	// This is a buffer for the current packet
-	}
-      else if (r->fragments[i].next_data_offset == 0)
-	{			//Available
-	  if (f == NULL)
-	    f = &r->fragments[i];
-	  else if (prev_f == NULL)
-	    prev_f = &r->fragments[i];
-	}
-    }
-
-  if (!f || f->pi != ~0)
-    return -1;
-
-  if (data_offset)
-    {
-      if (!prev_f)
-	return -1;
-
-      clib_memcpy (prev_f->next_data, data_start, copied_len);
-      prev_f->next_data_len = copied_len;
-      prev_f->next_data_offset = data_offset;
-    }
-  else
-    {
-      if (((ip4_header_t *) data_start)->ip_version_and_header_length != 0x45)
-	return -1;
-
-      if (r->ip4_header.ip_version_and_header_length == 0)
-	clib_memcpy (&r->ip4_header, data_start, sizeof (ip4_header_t));
-    }
-
-  if (data_len > 20)
-    {
-      f->next_data_offset = next_data_offset;
-      f->pi = pi;
-      map_main.ip6_reass_buffered_counter++;
-    }
-  return 0;
-}
-
-void
-map_ip4_reass_reinit (u32 * trashed_reass, u32 * dropped_packets)
-{
-  map_main_t *mm = &map_main;
-  int i;
-
-  if (dropped_packets)
-    *dropped_packets = mm->ip4_reass_buffered_counter;
-  if (trashed_reass)
-    *trashed_reass = mm->ip4_reass_allocated;
-  if (mm->ip4_reass_fifo_last != MAP_REASS_INDEX_NONE)
-    {
-      u16 ri = mm->ip4_reass_fifo_last;
-      do
-	{
-	  map_ip4_reass_t *r = pool_elt_at_index (mm->ip4_reass_pool, ri);
-	  for (i = 0; i < MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
-	    if (r->fragments[i] != ~0)
-	      map_ip4_drop_pi (r->fragments[i]);
-
-	  ri = r->fifo_next;
-	  pool_put (mm->ip4_reass_pool, r);
-	}
-      while (ri != mm->ip4_reass_fifo_last);
-    }
-
-  vec_free (mm->ip4_reass_hash_table);
-  vec_resize (mm->ip4_reass_hash_table, 1 << mm->ip4_reass_ht_log2len);
-  for (i = 0; i < (1 << mm->ip4_reass_ht_log2len); i++)
-    mm->ip4_reass_hash_table[i] = MAP_REASS_INDEX_NONE;
-  pool_free (mm->ip4_reass_pool);
-  pool_alloc (mm->ip4_reass_pool, mm->ip4_reass_conf_pool_size);
-
-  mm->ip4_reass_allocated = 0;
-  mm->ip4_reass_fifo_last = MAP_REASS_INDEX_NONE;
-  mm->ip4_reass_buffered_counter = 0;
-}
-
-u8
-map_get_ht_log2len (f32 ht_ratio, u16 pool_size)
-{
-  u32 desired_size = (u32) (pool_size * ht_ratio);
-  u8 i;
-  for (i = 1; i < 31; i++)
-    if ((1 << i) >= desired_size)
-      return i;
-  return 4;
-}
-
-int
-map_ip4_reass_conf_ht_ratio (f32 ht_ratio, u32 * trashed_reass,
-			     u32 * dropped_packets)
-{
-  map_main_t *mm = &map_main;
-  if (ht_ratio > MAP_IP4_REASS_CONF_HT_RATIO_MAX)
-    return -1;
-
-  map_ip4_reass_lock ();
-  mm->ip4_reass_conf_ht_ratio = ht_ratio;
-  mm->ip4_reass_ht_log2len =
-    map_get_ht_log2len (ht_ratio, mm->ip4_reass_conf_pool_size);
-  map_ip4_reass_reinit (trashed_reass, dropped_packets);
-  map_ip4_reass_unlock ();
-  return 0;
-}
-
-int
-map_ip4_reass_conf_pool_size (u16 pool_size, u32 * trashed_reass,
-			      u32 * dropped_packets)
-{
-  map_main_t *mm = &map_main;
-  if (pool_size > MAP_IP4_REASS_CONF_POOL_SIZE_MAX)
-    return -1;
-
-  map_ip4_reass_lock ();
-  mm->ip4_reass_conf_pool_size = pool_size;
-  map_ip4_reass_reinit (trashed_reass, dropped_packets);
-  map_ip4_reass_unlock ();
-  return 0;
-}
-
-int
-map_ip4_reass_conf_lifetime (u16 lifetime_ms)
-{
-  map_main.ip4_reass_conf_lifetime_ms = lifetime_ms;
-  return 0;
-}
-
-int
-map_ip4_reass_conf_buffers (u32 buffers)
-{
-  map_main.ip4_reass_conf_buffers = buffers;
-  return 0;
-}
-
-void
-map_ip6_reass_reinit (u32 * trashed_reass, u32 * dropped_packets)
-{
-  map_main_t *mm = &map_main;
-  if (dropped_packets)
-    *dropped_packets = mm->ip6_reass_buffered_counter;
-  if (trashed_reass)
-    *trashed_reass = mm->ip6_reass_allocated;
-  int i;
-  if (mm->ip6_reass_fifo_last != MAP_REASS_INDEX_NONE)
-    {
-      u16 ri = mm->ip6_reass_fifo_last;
-      do
-	{
-	  map_ip6_reass_t *r = pool_elt_at_index (mm->ip6_reass_pool, ri);
-	  for (i = 0; i < MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
-	    if (r->fragments[i].pi != ~0)
-	      map_ip6_drop_pi (r->fragments[i].pi);
-
-	  ri = r->fifo_next;
-	  pool_put (mm->ip6_reass_pool, r);
-	}
-      while (ri != mm->ip6_reass_fifo_last);
-      mm->ip6_reass_fifo_last = MAP_REASS_INDEX_NONE;
-    }
-
-  vec_free (mm->ip6_reass_hash_table);
-  vec_resize (mm->ip6_reass_hash_table, 1 << mm->ip6_reass_ht_log2len);
-  for (i = 0; i < (1 << mm->ip6_reass_ht_log2len); i++)
-    mm->ip6_reass_hash_table[i] = MAP_REASS_INDEX_NONE;
-  pool_free (mm->ip6_reass_pool);
-  pool_alloc (mm->ip6_reass_pool, mm->ip4_reass_conf_pool_size);
-
-  mm->ip6_reass_allocated = 0;
-  mm->ip6_reass_buffered_counter = 0;
-}
-
-int
-map_ip6_reass_conf_ht_ratio (f32 ht_ratio, u32 * trashed_reass,
-			     u32 * dropped_packets)
-{
-  map_main_t *mm = &map_main;
-  if (ht_ratio > MAP_IP6_REASS_CONF_HT_RATIO_MAX)
-    return -1;
-
-  map_ip6_reass_lock ();
-  mm->ip6_reass_conf_ht_ratio = ht_ratio;
-  mm->ip6_reass_ht_log2len =
-    map_get_ht_log2len (ht_ratio, mm->ip6_reass_conf_pool_size);
-  map_ip6_reass_reinit (trashed_reass, dropped_packets);
-  map_ip6_reass_unlock ();
-  return 0;
-}
-
-int
-map_ip6_reass_conf_pool_size (u16 pool_size, u32 * trashed_reass,
-			      u32 * dropped_packets)
-{
-  map_main_t *mm = &map_main;
-  if (pool_size > MAP_IP6_REASS_CONF_POOL_SIZE_MAX)
-    return -1;
-
-  map_ip6_reass_lock ();
-  mm->ip6_reass_conf_pool_size = pool_size;
-  map_ip6_reass_reinit (trashed_reass, dropped_packets);
-  map_ip6_reass_unlock ();
-  return 0;
-}
-
-int
-map_ip6_reass_conf_lifetime (u16 lifetime_ms)
-{
-  map_main.ip6_reass_conf_lifetime_ms = lifetime_ms;
-  return 0;
-}
-
-int
-map_ip6_reass_conf_buffers (u32 buffers)
-{
-  map_main.ip6_reass_conf_buffers = buffers;
-  return 0;
-}
-
-/* *INDENT-OFF* */
-
-/*?
- * Configure MAP reassembly behaviour
- *
- * @cliexpar
- * @cliexstart{map params reassembly}
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(map_ip4_reass_lifetime_command, static) = {
-  .path = "map params reassembly",
-  .short_help = "map params reassembly [ip4 | ip6] [lifetime <lifetime-ms>] "
-                "[pool-size <pool-size>] [buffers <buffers>] "
-                "[ht-ratio <ht-ratio>]",
-  .function = map_params_reass_command_fn,
-};
-
-/*?
- * Set or copy the IP TOS/Traffic Class field
- *
- * @cliexpar
- * @cliexstart{map params traffic-class}
- *
- * This command is used to set the traffic-class field in translated
- * or encapsulated packets. If copy is specifed (the default) then the
- * traffic-class/TOS field is copied from the original packet to the
- * translated / encapsulating header.
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(map_traffic_class_command, static) = {
-  .path = "map params traffic-class",
-  .short_help = "map params traffic-class {0x0-0xff | copy}",
-  .function = map_traffic_class_command_fn,
-};
-
-/*?
- * Bypass IP4/IP6 lookup
- *
- * @cliexpar
- * @cliexstart{map params pre-resolve}
- *
- * Bypass a second FIB lookup of the translated or encapsulated
- * packet, and forward the packet directly to the specified
- * next-hop. This optimization trades forwarding flexibility for
- * performance.
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(map_pre_resolve_command, static) = {
-  .path = "map params pre-resolve",
-  .short_help = " map params pre-resolve {ip4-nh <address>} "
-                "| {ip6-nh <address>}",
-  .function = map_pre_resolve_command_fn,
-};
-
-/*?
- * Enable or disable the MAP-E inbound security check
- *
- * @cliexpar
- * @cliexstart{map params security-check}
- *
- * By default, a decapsulated packet's IPv4 source address will be
- * verified against the outer header's IPv6 source address. Disabling
- * this feature will allow IPv4 source address spoofing.
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(map_security_check_command, static) = {
-  .path = "map params security-check",
-  .short_help = "map params security-check on|off",
-  .function = map_security_check_command_fn,
-};
-
-/*?
- * Specifiy the IPv4 source address used for relayed ICMP error messages
- *
- * @cliexpar
- * @cliexstart{map params icmp source-address}
- *
- * This command specifies which IPv4 source address (must be local to
- * the system), that is used for relayed received IPv6 ICMP error
- * messages.
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(map_icmp_relay_source_address_command, static) = {
-  .path = "map params icmp source-address",
-  .short_help = "map params icmp source-address <ip4-address>",
-  .function = map_icmp_relay_source_address_command_fn,
-};
-
-/*?
- * Send IPv6 ICMP unreachables
- *
- * @cliexpar
- * @cliexstart{map params icmp6 unreachables}
- *
- * Send IPv6 ICMP unreachable messages back if security check fails or
- * no MAP domain exists.
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(map_icmp_unreachables_command, static) = {
-  .path = "map params icmp6 unreachables",
-  .short_help = "map params icmp6 unreachables {on|off}",
-  .function = map_icmp_unreachables_command_fn,
-};
-
-/*?
- * Configure MAP fragmentation behaviour
- *
- * @cliexpar
- * @cliexstart{map params fragment}
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(map_fragment_command, static) = {
-  .path = "map params fragment",
-  .short_help = "map params fragment inner|outer",
-  .function = map_fragment_command_fn,
-};
-
-/*?
- * Ignore the IPv4 Don't fragment bit
- *
- * @cliexpar
- * @cliexstart{map params fragment ignore-df}
- *
- * Allows fragmentation of the IPv4 packet even if the DF bit is
- * set. The choice between inner or outer fragmentation of tunnel
- * packets is complicated. The benefit of inner fragmentation is that
- * the ultimate endpoint must reassemble, instead of the tunnel
- * endpoint.
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(map_fragment_df_command, static) = {
-  .path = "map params fragment ignore-df",
-  .short_help = "map params fragment ignore-df on|off",
-  .function = map_fragment_df_command_fn,
-};
-
-/*?
- * Specifiy if the inbound security check should be done on fragments
- *
- * @cliexpar
- * @cliexstart{map params security-check fragments}
- *
- * Typically the inbound on-decapsulation security check is only done
- * on the first packet. The packet that contains the L4
- * information. While a security check on every fragment is possible,
- * it has a cost. State must be created on the first fragment.
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(map_security_check_frag_command, static) = {
-  .path = "map params security-check fragments",
-  .short_help = "map params security-check fragments on|off",
-  .function = map_security_check_frag_command_fn,
-};
-
-/*?
- * Add MAP domain
- *
- * @cliexpar
- * @cliexstart{map add domain}
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(map_add_domain_command, static) = {
-  .path = "map add domain",
-  .short_help = "map add domain ip4-pfx <ip4-pfx> ip6-pfx <ip6-pfx> "
-      "ip6-src <ip6-pfx> ea-bits-len <n> psid-offset <n> psid-len <n> "
-      "[map-t] [mtu <mtu>]",
-  .function = map_add_domain_command_fn,
-};
-
-/*?
- * Add MAP rule to a domain
- *
- * @cliexpar
- * @cliexstart{map add rule}
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(map_add_rule_command, static) = {
-  .path = "map add rule",
-  .short_help = "map add rule index <domain> psid <psid> ip6-dst <ip6-addr>",
-  .function = map_add_rule_command_fn,
-};
-
-/*?
- * Delete MAP domain
- *
- * @cliexpar
- * @cliexstart{map del domain}
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(map_del_command, static) = {
-  .path = "map del domain",
-  .short_help = "map del domain index <domain>",
-  .function = map_del_domain_command_fn,
-};
-
-/*?
- * Show MAP domains
- *
- * @cliexpar
- * @cliexstart{show map domain}
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(show_map_domain_command, static) = {
-  .path = "show map domain",
-  .short_help = "show map domain index <n> [counters]",
-  .function = show_map_domain_command_fn,
-};
-
-/*?
- * Show MAP statistics
- *
- * @cliexpar
- * @cliexstart{show map stats}
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(show_map_stats_command, static) = {
-  .path = "show map stats",
-  .short_help = "show map stats",
-  .function = show_map_stats_command_fn,
-};
-
-/*?
- * Show MAP fragmentation information
- *
- * @cliexpar
- * @cliexstart{show map fragments}
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND(show_map_fragments_command, static) = {
-  .path = "show map fragments",
-  .short_help = "show map fragments",
-  .function = show_map_fragments_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * map_init
- */
-clib_error_t *
-map_init (vlib_main_t * vm)
-{
-  map_main_t *mm = &map_main;
-  mm->vnet_main = vnet_get_main ();
-  mm->vlib_main = vm;
-
-#ifdef MAP_SKIP_IP6_LOOKUP
-  memset (&mm->preresolve_ip4, 0, sizeof (mm->preresolve_ip4));
-  memset (&mm->preresolve_ip6, 0, sizeof (mm->preresolve_ip6));
-  mm->adj4_index = 0;
-  mm->adj6_index = 0;
-#endif
-
-  /* traffic class */
-  mm->tc = 0;
-  mm->tc_copy = true;
-
-  /* Inbound security check */
-  mm->sec_check = true;
-  mm->sec_check_frag = false;
-
-  /* ICMP6 Type 1, Code 5 for security check failure */
-  mm->icmp6_enabled = false;
-
-  /* Inner or outer fragmentation */
-  mm->frag_inner = false;
-  mm->frag_ignore_df = false;
-
-  vec_validate (mm->domain_counters, MAP_N_DOMAIN_COUNTER - 1);
-  mm->domain_counters[MAP_DOMAIN_COUNTER_RX].name = "rx";
-  mm->domain_counters[MAP_DOMAIN_COUNTER_TX].name = "tx";
-
-  vlib_validate_simple_counter (&mm->icmp_relayed, 0);
-  vlib_zero_simple_counter (&mm->icmp_relayed, 0);
-
-  /* IP4 virtual reassembly */
-  mm->ip4_reass_hash_table = 0;
-  mm->ip4_reass_pool = 0;
-  mm->ip4_reass_lock =
-    clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
-  mm->ip4_reass_conf_ht_ratio = MAP_IP4_REASS_HT_RATIO_DEFAULT;
-  mm->ip4_reass_conf_lifetime_ms = MAP_IP4_REASS_LIFETIME_DEFAULT;
-  mm->ip4_reass_conf_pool_size = MAP_IP4_REASS_POOL_SIZE_DEFAULT;
-  mm->ip4_reass_conf_buffers = MAP_IP4_REASS_BUFFERS_DEFAULT;
-  mm->ip4_reass_ht_log2len =
-    map_get_ht_log2len (mm->ip4_reass_conf_ht_ratio,
-			mm->ip4_reass_conf_pool_size);
-  mm->ip4_reass_fifo_last = MAP_REASS_INDEX_NONE;
-  map_ip4_reass_reinit (NULL, NULL);
-
-  /* IP6 virtual reassembly */
-  mm->ip6_reass_hash_table = 0;
-  mm->ip6_reass_pool = 0;
-  mm->ip6_reass_lock =
-    clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
-  mm->ip6_reass_conf_ht_ratio = MAP_IP6_REASS_HT_RATIO_DEFAULT;
-  mm->ip6_reass_conf_lifetime_ms = MAP_IP6_REASS_LIFETIME_DEFAULT;
-  mm->ip6_reass_conf_pool_size = MAP_IP6_REASS_POOL_SIZE_DEFAULT;
-  mm->ip6_reass_conf_buffers = MAP_IP6_REASS_BUFFERS_DEFAULT;
-  mm->ip6_reass_ht_log2len =
-    map_get_ht_log2len (mm->ip6_reass_conf_ht_ratio,
-			mm->ip6_reass_conf_pool_size);
-  mm->ip6_reass_fifo_last = MAP_REASS_INDEX_NONE;
-  map_ip6_reass_reinit (NULL, NULL);
-
-  map_dpo_module_init ();
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (map_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/map/map.h b/vnet/vnet/map/map.h
deleted file mode 100644
index f446b739..00000000
--- a/vnet/vnet/map/map.h
+++ /dev/null
@@ -1,591 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <stdbool.h>
-#include <vppinfra/error.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vlib/vlib.h>
-#include <vnet/fib/fib_types.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/adj/adj.h>
-#include <vnet/map/map_dpo.h>
-#include <vnet/dpo/load_balance.h>
-
-#define MAP_SKIP_IP6_LOOKUP 1
-
-typedef enum
-{
-  MAP_SENDER,
-  MAP_RECEIVER
-} map_dir_e;
-
-int map_create_domain (ip4_address_t * ip4_prefix, u8 ip4_prefix_len,
-		       ip6_address_t * ip6_prefix, u8 ip6_prefix_len,
-		       ip6_address_t * ip6_src, u8 ip6_src_len,
-		       u8 ea_bits_len, u8 psid_offset, u8 psid_length,
-		       u32 * map_domain_index, u16 mtu, u8 flags);
-int map_delete_domain (u32 map_domain_index);
-int map_add_del_psid (u32 map_domain_index, u16 psid, ip6_address_t * tep,
-		      u8 is_add);
-u8 *format_map_trace (u8 * s, va_list * args);
-i32 ip4_get_port (ip4_header_t * ip, map_dir_e dir, u16 buffer_len);
-i32 ip6_get_port (ip6_header_t * ip6, map_dir_e dir, u16 buffer_len);
-u16 ip4_map_get_port (ip4_header_t * ip, map_dir_e dir);
-
-typedef enum __attribute__ ((__packed__))
-{
-  MAP_DOMAIN_PREFIX = 1 << 0, MAP_DOMAIN_TRANSLATION = 1 << 1,	// The domain uses MAP-T
-} map_domain_flags_e;
-
-/**
- * IP4 reassembly logic:
- * One virtually reassembled flow requires a map_ip4_reass_t structure in order
- * to keep the first-fragment port number and, optionally, cache out of sequence
- * packets.
- * There are up to MAP_IP4_REASS_MAX_REASSEMBLY such structures.
- * When in use, those structures are stored in a hash table of MAP_IP4_REASS_BUCKETS buckets.
- * When a new structure needs to be used, it is allocated from available ones.
- * If there is no structure available, the oldest in use is selected and used if and
- * only if it was first allocated more than MAP_IP4_REASS_LIFETIME seconds ago.
- * In case no structure can be allocated, the fragment is dropped.
- */
-
-#define MAP_IP4_REASS_LIFETIME_DEFAULT (100)	/* ms */
-#define MAP_IP4_REASS_HT_RATIO_DEFAULT (1.0)
-#define MAP_IP4_REASS_POOL_SIZE_DEFAULT 1024	// Number of reassembly structures
-#define MAP_IP4_REASS_BUFFERS_DEFAULT 2048
-
-#define MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY 5	// Number of fragment per reassembly
-
-#define MAP_IP6_REASS_LIFETIME_DEFAULT (100)	/* ms */
-#define MAP_IP6_REASS_HT_RATIO_DEFAULT (1.0)
-#define MAP_IP6_REASS_POOL_SIZE_DEFAULT 1024	// Number of reassembly structures
-#define MAP_IP6_REASS_BUFFERS_DEFAULT 2048
-
-#define MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY 5
-
-#define MAP_IP6_REASS_COUNT_BYTES
-#define MAP_IP4_REASS_COUNT_BYTES
-
-//#define IP6_MAP_T_OVERRIDE_TOS 0
-
-/*
- * This structure _MUST_ be no larger than a single cache line (64 bytes).
- * If more space is needed make a union of ip6_prefix and *rules, those are mutually exclusive.
- */
-typedef struct
-{
-  ip6_address_t ip6_src;
-  ip6_address_t ip6_prefix;
-  ip6_address_t *rules;
-  u32 suffix_mask;
-  ip4_address_t ip4_prefix;
-  u16 psid_mask;
-  u16 mtu;
-  map_domain_flags_e flags;
-  u8 ip6_prefix_len;
-  u8 ip6_src_len;
-  u8 ea_bits_len;
-  u8 psid_offset;
-  u8 psid_length;
-
-  /* helpers */
-  u8 psid_shift;
-  u8 suffix_shift;
-  u8 ea_shift;
-
-  /* not used by forwarding */
-  u8 ip4_prefix_len;
-} map_domain_t;
-
-STATIC_ASSERT ((sizeof (map_domain_t) <= CLIB_CACHE_LINE_BYTES),
-	       "MAP domain fits in one cacheline");
-
-#define MAP_REASS_INDEX_NONE ((u16)0xffff)
-
-/*
- * Hash key, padded out to 16 bytes for fast compare
- */
-/* *INDENT-OFF* */
-typedef union {
-  CLIB_PACKED (struct {
-    ip4_address_t src;
-    ip4_address_t dst;
-    u16 fragment_id;
-    u8 protocol;
-  });
-  u64 as_u64[2];
-  u32 as_u32[4];
-} map_ip4_reass_key_t;
-/* *INDENT-ON* */
-
-typedef struct
-{
-  map_ip4_reass_key_t key;
-  f64 ts;
-#ifdef MAP_IP4_REASS_COUNT_BYTES
-  u16 expected_total;
-  u16 forwarded;
-#endif
-  i32 port;
-  u16 bucket;
-  u16 bucket_next;
-  u16 fifo_prev;
-  u16 fifo_next;
-  u32 fragments[MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY];
-} map_ip4_reass_t;
-
-/*
- * MAP domain counters
- */
-typedef enum
-{
-  /* Simple counters */
-  MAP_DOMAIN_IPV4_FRAGMENT = 0,
-  /* Combined counters */
-  MAP_DOMAIN_COUNTER_RX = 0,
-  MAP_DOMAIN_COUNTER_TX,
-  MAP_N_DOMAIN_COUNTER
-} map_domain_counter_t;
-
-/*
- * main_main_t
- */
-/* *INDENT-OFF* */
-typedef union {
-  CLIB_PACKED (struct {
-    ip6_address_t src;
-    ip6_address_t dst;
-    u32 fragment_id;
-    u8 protocol;
-  });
-  u64 as_u64[5];
-  u32 as_u32[10];
-} map_ip6_reass_key_t;
-/* *INDENT-OFF* */
-
-typedef struct {
-  u32 pi; //Cached packet or ~0
-  u16 next_data_offset; //The data offset of the additional 20 bytes or ~0
-  u8 next_data_len; //Number of bytes ready to be copied (20 if not last fragment)
-  u8 next_data[20]; //The 20 additional bytes
-} map_ip6_fragment_t;
-
-typedef struct {
-  map_ip6_reass_key_t key;
-  f64 ts;
-#ifdef MAP_IP6_REASS_COUNT_BYTES
-  u16 expected_total;
-  u16 forwarded;
-#endif
-  u16 bucket; //What hash bucket this element is linked in
-  u16 bucket_next;
-  u16 fifo_prev;
-  u16 fifo_next;
-  ip4_header_t ip4_header;
-  map_ip6_fragment_t fragments[MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY];
-} map_ip6_reass_t;
-
-typedef struct {
-  /* pool of MAP domains */
-  map_domain_t *domains;
-
-  /* MAP Domain packet/byte counters indexed by map domain index */
-  vlib_simple_counter_main_t *simple_domain_counters;
-  vlib_combined_counter_main_t *domain_counters;
-  volatile u32 *counter_lock;
-
-#ifdef MAP_SKIP_IP6_LOOKUP
-  /* pre-presolve */
-  u32 adj6_index, adj4_index;
-  ip4_address_t preresolve_ip4;
-  ip6_address_t preresolve_ip6;
-#endif
-
-  /* Traffic class: zero, copy (~0) or fixed value */
-  u8 tc;
-  bool tc_copy;
-
-  bool sec_check;		/* Inbound security check */
-  bool sec_check_frag;		/* Inbound security check for (subsequent) fragments */
-  bool icmp6_enabled;		/* Send destination unreachable for security check failure */
-
-  /* ICMPv6 -> ICMPv4 relay parameters */
-  ip4_address_t icmp4_src_address;
-  vlib_simple_counter_main_t icmp_relayed;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-
-  /*
-   * IPv4 encap and decap reassembly
-   */
-  /* Configuration */
-  f32 ip4_reass_conf_ht_ratio; //Size of ht is 2^ceil(log2(ratio*pool_size))
-  u16 ip4_reass_conf_pool_size; //Max number of allocated reass structures
-  u16 ip4_reass_conf_lifetime_ms; //Time a reassembly struct is considered valid in ms
-  u32 ip4_reass_conf_buffers; //Maximum number of buffers used by ip4 reassembly
-
-  /* Runtime */
-  map_ip4_reass_t *ip4_reass_pool;
-  u8 ip4_reass_ht_log2len; //Hash table size is 2^log2len
-  u16 ip4_reass_allocated;
-  u16 *ip4_reass_hash_table;
-  u16 ip4_reass_fifo_last;
-  volatile u32 *ip4_reass_lock;
-
-  /* Counters */
-  u32 ip4_reass_buffered_counter;
-
-  bool frag_inner;		/* Inner or outer fragmentation */
-  bool frag_ignore_df;		/* Fragment (outer) packet even if DF is set */
-
-  /*
-   * IPv6 decap reassembly
-   */
-  /* Configuration */
-  f32 ip6_reass_conf_ht_ratio; //Size of ht is 2^ceil(log2(ratio*pool_size))
-  u16 ip6_reass_conf_pool_size; //Max number of allocated reass structures
-  u16 ip6_reass_conf_lifetime_ms; //Time a reassembly struct is considered valid in ms
-  u32 ip6_reass_conf_buffers; //Maximum number of buffers used by ip6 reassembly
-
-  /* Runtime */
-  map_ip6_reass_t *ip6_reass_pool;
-  u8 ip6_reass_ht_log2len; //Hash table size is 2^log2len
-  u16 ip6_reass_allocated;
-  u16 *ip6_reass_hash_table;
-  u16 ip6_reass_fifo_last;
-  volatile u32 *ip6_reass_lock;
-
-  /* Counters */
-  u32 ip6_reass_buffered_counter;
-
-} map_main_t;
-
-/*
- * MAP Error counters/messages
- */
-#define foreach_map_error				\
-  /* Must be first. */					\
- _(NONE, "valid MAP packets")				\
- _(BAD_PROTOCOL, "bad protocol")			\
- _(SEC_CHECK, "security check failed")			\
- _(ENCAP_SEC_CHECK, "encap security check failed")	\
- _(DECAP_SEC_CHECK, "decap security check failed")	\
- _(ICMP, "unable to translate ICMP")			\
- _(ICMP_RELAY, "unable to relay ICMP")			\
- _(UNKNOWN, "unknown")					\
- _(NO_BINDING, "no binding")				\
- _(NO_DOMAIN, "no domain")				\
- _(FRAGMENTED, "packet is a fragment")                  \
- _(FRAGMENT_MEMORY, "could not cache fragment")	        \
- _(FRAGMENT_MALFORMED, "fragment has unexpected format")\
- _(FRAGMENT_DROPPED, "dropped cached fragment")         \
- _(MALFORMED, "malformed packet")			\
- _(DF_SET, "can't fragment, DF set")
-
-typedef enum {
-#define _(sym,str) MAP_ERROR_##sym,
-   foreach_map_error
-#undef _
-   MAP_N_ERROR,
- } map_error_t;
-
-u64 map_error_counter_get(u32 node_index, map_error_t map_error);
-
-typedef struct {
-  u32 map_domain_index;
-  u16 port;
-} map_trace_t;
-
-map_main_t map_main;
-
-extern vlib_node_registration_t ip4_map_node;
-extern vlib_node_registration_t ip6_map_node;
-
-extern vlib_node_registration_t ip4_map_t_node;
-extern vlib_node_registration_t ip4_map_t_fragmented_node;
-extern vlib_node_registration_t ip4_map_t_tcp_udp_node;
-extern vlib_node_registration_t ip4_map_t_icmp_node;
-
-extern vlib_node_registration_t ip6_map_t_node;
-extern vlib_node_registration_t ip6_map_t_fragmented_node;
-extern vlib_node_registration_t ip6_map_t_tcp_udp_node;
-extern vlib_node_registration_t ip6_map_t_icmp_node;
-
-/*
- * map_get_pfx
- */
-static_always_inline u64
-map_get_pfx (map_domain_t *d, u32 addr, u16 port)
-{
-  u16 psid = (port >> d->psid_shift) & d->psid_mask;
-
-  if (d->ea_bits_len == 0 && d->rules)
-    return clib_net_to_host_u64(d->rules[psid].as_u64[0]);
-
-  u32 suffix = (addr >> d->suffix_shift) & d->suffix_mask;
-  u64 ea = d->ea_bits_len == 0 ? 0 : (((u64) suffix << d->psid_length)) | psid;
-
-  return clib_net_to_host_u64(d->ip6_prefix.as_u64[0]) | ea << d->ea_shift;
-}
-
-static_always_inline u64
-map_get_pfx_net (map_domain_t *d, u32 addr, u16 port)
-{
-  return clib_host_to_net_u64(map_get_pfx(d, clib_net_to_host_u32(addr),
-                                          clib_net_to_host_u16(port)));
-}
-
-/*
- * map_get_sfx
- */
-static_always_inline u64
-map_get_sfx (map_domain_t *d, u32 addr, u16 port)
-{
-  u16 psid = (port >> d->psid_shift) & d->psid_mask;
-
-  /* Shared 1:1 mode. */
-  if (d->ea_bits_len == 0 && d->rules)
-    return clib_net_to_host_u64(d->rules[psid].as_u64[1]);
-  if (d->ip6_prefix_len == 128)
-    return clib_net_to_host_u64(d->ip6_prefix.as_u64[1]);
-
-  /* IPv4 prefix */
-  if (d->flags & MAP_DOMAIN_PREFIX)
-    return (u64) (addr & (0xFFFFFFFF << d->suffix_shift)) << 16;
-
-  /* Shared or full IPv4 address */
-  return ((u64) addr << 16) | psid;
-}
-
-static_always_inline u64
-map_get_sfx_net (map_domain_t *d, u32 addr, u16 port)
-{
-  return clib_host_to_net_u64(map_get_sfx(d, clib_net_to_host_u32(addr),
-                                          clib_net_to_host_u16(port)));
-}
-
-static_always_inline u32
-map_get_ip4 (ip6_address_t *addr)
-{
-  return clib_host_to_net_u32(clib_net_to_host_u64(addr->as_u64[1]) >> 16);
-}
-
-/*
- * Get the MAP domain from an IPv4 lookup adjacency.
- */
-static_always_inline map_domain_t *
-ip4_map_get_domain (u32 mdi,
-		    u32 *map_domain_index)
-{
-  map_main_t *mm = &map_main;
-  map_dpo_t *md;
-
-  md = map_dpo_get(mdi);
-
-  ASSERT(md);
-  *map_domain_index = md->md_domain;
-  return pool_elt_at_index(mm->domains, *map_domain_index);
-}
-
-/*
- * Get the MAP domain from an IPv6 lookup adjacency.
- * If the IPv6 address or prefix is not shared, no lookup is required.
- * The IPv4 address is used otherwise.
- */
-static_always_inline map_domain_t *
-ip6_map_get_domain (u32 mdi, ip4_address_t *addr,
-                    u32 *map_domain_index, u8 *error)
-{
-  map_main_t *mm = &map_main;
-  map_dpo_t *md;
-
-  /*
-   * Disable direct MAP domain lookup on decap, until the security check is updated to verify IPv4 SA.
-   * (That's done implicitly when MAP domain is looked up in the IPv4 FIB)
-   */
-#ifdef MAP_NONSHARED_DOMAIN_ENABLED
-  md = map_dpo_get(mdi);
-
-  ASSERT(md);
-  *map_domain_index = md->md_domain;
-  if (*map_domain_index != ~0)
-    return pool_elt_at_index(mm->domains, *map_domain_index);
-#endif
-
-  u32 lbi = ip4_fib_forwarding_lookup(0, addr);
-  const dpo_id_t *dpo = load_balance_get_bucket(lbi, 0);
-  if (PREDICT_TRUE(dpo->dpoi_type == map_dpo_type ||
-		   dpo->dpoi_type == map_t_dpo_type))
-    {
-      md = map_dpo_get(dpo->dpoi_index);
-     *map_domain_index = md->md_domain;
-      return pool_elt_at_index(mm->domains, *map_domain_index);
-    }
-  *error = MAP_ERROR_NO_DOMAIN;
-  return NULL;
-}
-
-map_ip4_reass_t *
-map_ip4_reass_get(u32 src, u32 dst, u16 fragment_id,
-                  u8 protocol, u32 **pi_to_drop);
-void
-map_ip4_reass_free(map_ip4_reass_t *r, u32 **pi_to_drop);
-
-#define map_ip4_reass_lock() while (__sync_lock_test_and_set(map_main.ip4_reass_lock, 1)) {}
-#define map_ip4_reass_unlock() do {CLIB_MEMORY_BARRIER(); *map_main.ip4_reass_lock = 0;} while(0)
-
-static_always_inline void
-map_ip4_reass_get_fragments(map_ip4_reass_t *r, u32 **pi)
-{
-  int i;
-  for (i=0; i<MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
-    if(r->fragments[i] != ~0) {
-      vec_add1(*pi, r->fragments[i]);
-      r->fragments[i] = ~0;
-      map_main.ip4_reass_buffered_counter--;
-    }
-}
-
-int map_ip4_reass_add_fragment(map_ip4_reass_t *r, u32 pi);
-
-map_ip6_reass_t *
-map_ip6_reass_get(ip6_address_t *src, ip6_address_t *dst, u32 fragment_id,
-                  u8 protocol, u32 **pi_to_drop);
-void
-map_ip6_reass_free(map_ip6_reass_t *r, u32 **pi_to_drop);
-
-#define map_ip6_reass_lock() while (__sync_lock_test_and_set(map_main.ip6_reass_lock, 1)) {}
-#define map_ip6_reass_unlock() do {CLIB_MEMORY_BARRIER(); *map_main.ip6_reass_lock = 0;} while(0)
-
-int
-map_ip6_reass_add_fragment(map_ip6_reass_t *r, u32 pi,
-                           u16 data_offset, u16 next_data_offset,
-                           u8 *data_start, u16 data_len);
-
-void map_ip4_drop_pi(u32 pi);
-
-int map_ip4_reass_conf_ht_ratio(f32 ht_ratio, u32 *trashed_reass, u32 *dropped_packets);
-#define MAP_IP4_REASS_CONF_HT_RATIO_MAX 100
-int map_ip4_reass_conf_pool_size(u16 pool_size, u32 *trashed_reass, u32 *dropped_packets);
-#define MAP_IP4_REASS_CONF_POOL_SIZE_MAX (0xfeff)
-int map_ip4_reass_conf_lifetime(u16 lifetime_ms);
-#define MAP_IP4_REASS_CONF_LIFETIME_MAX 0xffff
-int map_ip4_reass_conf_buffers(u32 buffers);
-#define MAP_IP4_REASS_CONF_BUFFERS_MAX (0xffffffff)
-
-void map_ip6_drop_pi(u32 pi);
-
-
-int map_ip6_reass_conf_ht_ratio(f32 ht_ratio, u32 *trashed_reass, u32 *dropped_packets);
-#define MAP_IP6_REASS_CONF_HT_RATIO_MAX 100
-int map_ip6_reass_conf_pool_size(u16 pool_size, u32 *trashed_reass, u32 *dropped_packets);
-#define MAP_IP6_REASS_CONF_POOL_SIZE_MAX (0xfeff)
-int map_ip6_reass_conf_lifetime(u16 lifetime_ms);
-#define MAP_IP6_REASS_CONF_LIFETIME_MAX 0xffff
-int map_ip6_reass_conf_buffers(u32 buffers);
-#define MAP_IP6_REASS_CONF_BUFFERS_MAX (0xffffffff)
-
-static_always_inline
-int ip6_parse(const ip6_header_t *ip6, u32 buff_len,
-              u8 *l4_protocol, u16 *l4_offset, u16 *frag_hdr_offset)
-{
-  if (ip6->protocol == IP_PROTOCOL_IPV6_FRAGMENTATION) {
-    *l4_protocol = ((ip6_frag_hdr_t *)(ip6 + 1))->next_hdr;
-    *frag_hdr_offset = sizeof(*ip6);
-    *l4_offset = sizeof(*ip6) + sizeof(ip6_frag_hdr_t);
-  } else {
-    *l4_protocol = ip6->protocol;
-    *frag_hdr_offset = 0;
-    *l4_offset = sizeof(*ip6);
-  }
-
-  return (buff_len < (*l4_offset + 4)) ||
-      (clib_net_to_host_u16(ip6->payload_length) < (*l4_offset + 4 - sizeof(*ip6)));
-}
-
-
-#define u8_ptr_add(ptr, index) (((u8 *)ptr) + index)
-#define u16_net_add(u, val) clib_host_to_net_u16(clib_net_to_host_u16(u) + (val))
-
-#define frag_id_6to4(id) ((id) ^ ((id) >> 16))
-
-static_always_inline void
-ip4_map_t_embedded_address (map_domain_t *d,
-                                ip6_address_t *ip6, const ip4_address_t *ip4)
-{
-  ASSERT(d->ip6_src_len == 96); //No support for other lengths for now
-  ip6->as_u64[0] = d->ip6_src.as_u64[0];
-  ip6->as_u32[2] = d->ip6_src.as_u32[2];
-  ip6->as_u32[3] = ip4->as_u32;
-}
-
-static_always_inline u32
-ip6_map_t_embedded_address (map_domain_t *d, ip6_address_t *addr)
-{
-  ASSERT(d->ip6_src_len == 96); //No support for other lengths for now
-  return addr->as_u32[3];
-}
-
-static inline void
-map_domain_counter_lock (map_main_t *mm)
-{
-  if (mm->counter_lock)
-    while (__sync_lock_test_and_set(mm->counter_lock, 1))
-      /* zzzz */ ;
-}
-static inline void
-map_domain_counter_unlock (map_main_t *mm)
-{
-  if (mm->counter_lock)
-    *mm->counter_lock = 0;
-}
-
-
-static_always_inline void
-map_send_all_to_node(vlib_main_t *vm, u32 *pi_vector,
-                     vlib_node_runtime_t *node, vlib_error_t *error,
-                     u32 next)
-{
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  //Deal with fragments that are ready
-  from = pi_vector;
-  n_left_from = vec_len(pi_vector);
-  next_index = node->cached_next_index;
-  while (n_left_from > 0) {
-    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
-    while (n_left_from > 0 && n_left_to_next > 0) {
-      u32 pi0 = to_next[0] = from[0];
-      from += 1;
-      n_left_from -= 1;
-      to_next += 1;
-      n_left_to_next -= 1;
-      vlib_buffer_t *p0 = vlib_get_buffer(vm, pi0);
-      p0->error = *error;
-      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next, n_left_to_next, pi0, next);
-    }
-    vlib_put_next_frame(vm, node, next_index, n_left_to_next);
-  }
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/map/map_api.c b/vnet/vnet/map/map_api.c
deleted file mode 100644
index 7febeb3d..00000000
--- a/vnet/vnet/map/map_api.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- *------------------------------------------------------------------
- * map_api.c - vnet map api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include "map.h"
-#include <vnet/api_errno.h>
-#include <vnet/ip/ip.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg			\
-_(MAP_ADD_DOMAIN, map_add_domain)		\
-_(MAP_DEL_DOMAIN, map_del_domain)		\
-_(MAP_ADD_DEL_RULE, map_add_del_rule)		\
-_(MAP_DOMAIN_DUMP, map_domain_dump)		\
-_(MAP_RULE_DUMP, map_rule_dump)			\
-_(MAP_SUMMARY_STATS, map_summary_stats)
-
-static void
-vl_api_map_add_domain_t_handler (vl_api_map_add_domain_t * mp)
-{
-  vl_api_map_add_domain_reply_t *rmp;
-  int rv = 0;
-  u32 index;
-  u8 flags = mp->is_translation ? MAP_DOMAIN_TRANSLATION : 0;
-  rv =
-    map_create_domain ((ip4_address_t *) & mp->ip4_prefix, mp->ip4_prefix_len,
-		       (ip6_address_t *) & mp->ip6_prefix, mp->ip6_prefix_len,
-		       (ip6_address_t *) & mp->ip6_src,
-		       mp->ip6_src_prefix_len, mp->ea_bits_len,
-		       mp->psid_offset, mp->psid_length, &index,
-		       ntohs (mp->mtu), flags);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_MAP_ADD_DOMAIN_REPLY,
-  ({
-    rmp->index = ntohl(index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_map_del_domain_t_handler (vl_api_map_del_domain_t * mp)
-{
-  vl_api_map_del_domain_reply_t *rmp;
-  int rv = 0;
-
-  rv = map_delete_domain (ntohl (mp->index));
-
-  REPLY_MACRO (VL_API_MAP_DEL_DOMAIN_REPLY);
-}
-
-static void
-vl_api_map_add_del_rule_t_handler (vl_api_map_add_del_rule_t * mp)
-{
-  vl_api_map_del_domain_reply_t *rmp;
-  int rv = 0;
-
-  rv =
-    map_add_del_psid (ntohl (mp->index), ntohs (mp->psid),
-		      (ip6_address_t *) mp->ip6_dst, mp->is_add);
-
-  REPLY_MACRO (VL_API_MAP_ADD_DEL_RULE_REPLY);
-}
-
-static void
-vl_api_map_domain_dump_t_handler (vl_api_map_domain_dump_t * mp)
-{
-  vl_api_map_domain_details_t *rmp;
-  map_main_t *mm = &map_main;
-  map_domain_t *d;
-  unix_shared_memory_queue_t *q;
-
-  if (pool_elts (mm->domains) == 0)
-    return;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  /* *INDENT-OFF* */
-  pool_foreach(d, mm->domains,
-  ({
-    /* Make sure every field is initiated (or don't skip the memset()) */
-    rmp = vl_msg_api_alloc (sizeof (*rmp));
-    rmp->_vl_msg_id = ntohs(VL_API_MAP_DOMAIN_DETAILS);
-    rmp->domain_index = htonl(d - mm->domains);
-    rmp->ea_bits_len = d->ea_bits_len;
-    rmp->psid_offset = d->psid_offset;
-    rmp->psid_length = d->psid_length;
-    clib_memcpy(rmp->ip4_prefix, &d->ip4_prefix, sizeof(rmp->ip4_prefix));
-    rmp->ip4_prefix_len = d->ip4_prefix_len;
-    clib_memcpy(rmp->ip6_prefix, &d->ip6_prefix, sizeof(rmp->ip6_prefix));
-    rmp->ip6_prefix_len = d->ip6_prefix_len;
-    clib_memcpy(rmp->ip6_src, &d->ip6_src, sizeof(rmp->ip6_src));
-    rmp->ip6_src_len = d->ip6_src_len;
-    rmp->mtu = htons(d->mtu);
-    rmp->is_translation = (d->flags & MAP_DOMAIN_TRANSLATION);
-    rmp->context = mp->context;
-
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_map_rule_dump_t_handler (vl_api_map_rule_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  u16 i;
-  ip6_address_t dst;
-  vl_api_map_rule_details_t *rmp;
-  map_main_t *mm = &map_main;
-  u32 domain_index = ntohl (mp->domain_index);
-  map_domain_t *d;
-
-  if (pool_elts (mm->domains) == 0)
-    return;
-
-  d = pool_elt_at_index (mm->domains, domain_index);
-  if (!d || !d->rules)
-    {
-      return;
-    }
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  for (i = 0; i < (0x1 << d->psid_length); i++)
-    {
-      dst = d->rules[i];
-      if (dst.as_u64[0] == 0 && dst.as_u64[1] == 0)
-	{
-	  continue;
-	}
-      rmp = vl_msg_api_alloc (sizeof (*rmp));
-      memset (rmp, 0, sizeof (*rmp));
-      rmp->_vl_msg_id = ntohs (VL_API_MAP_RULE_DETAILS);
-      rmp->psid = htons (i);
-      clib_memcpy (rmp->ip6_dst, &dst, sizeof (rmp->ip6_dst));
-      rmp->context = mp->context;
-      vl_msg_api_send_shmem (q, (u8 *) & rmp);
-    }
-}
-
-static void
-vl_api_map_summary_stats_t_handler (vl_api_map_summary_stats_t * mp)
-{
-  vl_api_map_summary_stats_reply_t *rmp;
-  vlib_combined_counter_main_t *cm;
-  vlib_counter_t v;
-  int i, which;
-  u64 total_pkts[VLIB_N_RX_TX];
-  u64 total_bytes[VLIB_N_RX_TX];
-  map_main_t *mm = &map_main;
-  unix_shared_memory_queue_t *q =
-    vl_api_client_index_to_input_queue (mp->client_index);
-
-  if (!q)
-    return;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_MAP_SUMMARY_STATS_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = 0;
-
-  memset (total_pkts, 0, sizeof (total_pkts));
-  memset (total_bytes, 0, sizeof (total_bytes));
-
-  map_domain_counter_lock (mm);
-  vec_foreach (cm, mm->domain_counters)
-  {
-    which = cm - mm->domain_counters;
-
-    for (i = 0; i < vec_len (cm->maxi); i++)
-      {
-	vlib_get_combined_counter (cm, i, &v);
-	total_pkts[which] += v.packets;
-	total_bytes[which] += v.bytes;
-      }
-  }
-
-  map_domain_counter_unlock (mm);
-
-  /* Note: in network byte order! */
-  rmp->total_pkts[MAP_DOMAIN_COUNTER_RX] =
-    clib_host_to_net_u64 (total_pkts[MAP_DOMAIN_COUNTER_RX]);
-  rmp->total_bytes[MAP_DOMAIN_COUNTER_RX] =
-    clib_host_to_net_u64 (total_bytes[MAP_DOMAIN_COUNTER_RX]);
-  rmp->total_pkts[MAP_DOMAIN_COUNTER_TX] =
-    clib_host_to_net_u64 (total_pkts[MAP_DOMAIN_COUNTER_TX]);
-  rmp->total_bytes[MAP_DOMAIN_COUNTER_TX] =
-    clib_host_to_net_u64 (total_bytes[MAP_DOMAIN_COUNTER_TX]);
-  rmp->total_bindings = clib_host_to_net_u64 (pool_elts (mm->domains));
-  rmp->total_ip4_fragments = 0;	// Not yet implemented. Should be a simple counter.
-  rmp->total_security_check[MAP_DOMAIN_COUNTER_TX] =
-    clib_host_to_net_u64 (map_error_counter_get
-			  (ip4_map_node.index, MAP_ERROR_ENCAP_SEC_CHECK));
-  rmp->total_security_check[MAP_DOMAIN_COUNTER_RX] =
-    clib_host_to_net_u64 (map_error_counter_get
-			  (ip4_map_node.index, MAP_ERROR_DECAP_SEC_CHECK));
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-/*
- * vpe_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_map;
-#undef _
-}
-
-static clib_error_t *
-map_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (map_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/map/map_doc.md b/vnet/vnet/map/map_doc.md
deleted file mode 100644
index 17f3c511..00000000
--- a/vnet/vnet/map/map_doc.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# VPP MAP and Lw4o6 implementation    {#map_doc}
-
-This is a memo intended to contain documentation of the VPP MAP and Lw4o6 implementations.
-Everything that is not directly obvious should come here.
-
-
-
-## MAP-E Virtual Reassembly
-
-The MAP-E implementation supports handling of IPv4 fragments as well as IPv4-in-IPv6 inner and outer fragments. This is called virtual reassembly because the fragments are not actually reassembled. Instead, some meta-data are kept about the first fragment and reused for subsequent fragments.
-
-Fragment caching and handling is not always necessary. It is performed when:
-* An IPv4 fragment is received and the destination IPv4 address is shared.
-* An IPv6 packet is received with an inner IPv4 fragment, the IPv4 source address is shared, and 'security-check fragments' is on.
-* An IPv6 fragment is received.
-
-There are 3 dedicated nodes:
-* ip4-map-reass 
-* ip6-map-ip4-reass
-* ip6-map-ip6-reass
-
-ip4-map sends all fragments to ip4-map-reass.
-ip6-map sends all inner-fragments to ip6-map-ip4-reass.
-ip6-map sends all outer-fragments to ip6-map-ip6-reass.
-
-IPv4 (resp. IPv6) virtual reassembly makes use of a hash table in order to store IPv4 (resp. IPv6) reassembly structures. The hash-key is based on the IPv4-src:IPv4-dst:Frag-ID:Protocol tuple (resp. IPv6-src:IPv6-dst:Frag-ID tuple, as the protocol is IPv4-in-IPv6). Therefore, each packet reassembly makes use of exactly one reassembly structure. When such a structure is allocated, it is timestamped with the current time. Finally, those structures are capable of storing a limited number of buffer indexes.
-
-An IPv4 (resp. IPv6) reassembly structure can cache up to MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY (resp. MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY) buffers. Buffers are cached until the first fragment is received.
-
-#### Virtual Reassembly configuration
-
-IPv4 and IPv6 virtual reassembly support the following configuration:
-    map params reassembly [ip4 | ip6] [lifetime <lifetime-ms>] [pool-size <pool-size>] [buffers <buffers>] [ht-ratio <ht-ratio>]
-
-lifetime: 
-	The time in milliseconds a reassembly structure is considered valid. The longer, the more reliable is reassembly, but the more likely it is to exhaust the pool of reassembly structures. IPv4 standard suggests a lifetime of 15 seconds. IPv6 specifies a lifetime of 60 people. Those values are not realistic for high-throughput cases.
-
-buffers:
-	The upper limit of buffers that are allowed to be cached. It can be used to protect against fragmentation attacks which would aim to exhaust the global buffers pool.
-	
-pool-size:
-	The number of reassembly structures that can be allocated. As each structure can store a small fixed number of fragments, it also sets an upper-bound of 'pool-size * MAP_IPX_REASS_MAX_FRAGMENTS_PER_REASSEMBLY' buffers that can be cached in total.
-	
-ht-ratio:
-	The amount of buckets in the hash-table is pool-size * ht-ratio.
-
-
-Any time pool-size and ht-ratio is modified, the hash-table is destroyed and created again, which means all current state is lost.
-
-
-##### Additional considerations
-
-Reassembly at high rate is expensive in terms of buffers. There is a trade-off between the lifetime and number of allocated buffers. Reducing the lifetime helps, but at the cost of loosing state for fragments that are wide appart.
-
-Let:
-R be the packet rate at which fragments are received.
-F be the number of fragments per packet.
-
-Assuming the first fragment is always received last. We should have:
-buffers > lifetime * R / F * (F - 1)
-pool-size > lifetime * R/F
-
-This is a worst case. Receiving the first fragment earlier helps reducing the number of required buffers. Also, an optimization is implemented (MAP_IP6_REASS_COUNT_BYTES and MAP_IP4_REASS_COUNT_BYTES) which counts the number of transmitted bytes and remembers the total number of bytes which should be transmitted based on the last fragment, and therefore helps reducing 'pool-size'.
-
-But the formula shows that it is challenging to forward a significant amount of fragmented packets at high rates. For instance, with a lifetime of 1 second, 5Mpps packet rate would require buffering up to 2.5 millions fragments.
-
-If you want to do that, be prepared to configure a lot of fragments.
-
-
diff --git a/vnet/vnet/map/map_dpo.c b/vnet/vnet/map/map_dpo.c
deleted file mode 100644
index df2b5fa4..00000000
--- a/vnet/vnet/map/map_dpo.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/ip/ip.h>
-#include <vnet/map/map_dpo.h>
-
-/**
- * pool of all MPLS Label DPOs
- */
-map_dpo_t *map_dpo_pool;
-
-/**
- * The register MAP DPO type
- */
-dpo_type_t map_dpo_type;
-dpo_type_t map_t_dpo_type;
-
-static map_dpo_t *
-map_dpo_alloc (void)
-{
-    map_dpo_t *md;
-
-    pool_get_aligned(map_dpo_pool, md, CLIB_CACHE_LINE_BYTES);
-    memset(md, 0, sizeof(*md));
-
-    return (md);
-}
-
-static index_t
-map_dpo_get_index (map_dpo_t *md)
-{
-    return (md - map_dpo_pool);
-}
-
-void
-map_dpo_create (dpo_proto_t dproto,
-		u32 domain_index,
-		dpo_id_t *dpo)
-{
-    map_dpo_t *md;
-
-    md = map_dpo_alloc();
-    md->md_domain = domain_index;
-    md->md_proto = dproto;
-
-    dpo_set(dpo,
-	    map_dpo_type,
-	    dproto,
-	    map_dpo_get_index(md));
-}
-
-void
-map_t_dpo_create (dpo_proto_t dproto,
-		  u32 domain_index,
-		  dpo_id_t *dpo)
-{
-    map_dpo_t *md;
-
-    md = map_dpo_alloc();
-    md->md_domain = domain_index;
-    md->md_proto = dproto;
-
-    dpo_set(dpo,
-	    map_t_dpo_type,
-	    dproto,
-	    map_dpo_get_index(md));
-}
-
-
-u8*
-format_map_dpo (u8 *s, va_list *args)
-{
-    index_t index = va_arg (*args, index_t);
-    CLIB_UNUSED(u32 indent) = va_arg (*args, u32);
-    map_dpo_t *md;
-
-    md = map_dpo_get(index);
-
-    return (format(s, "map:[%d]:%U domain:%d",
-		   index,
-                   format_dpo_proto, md->md_proto,
-		   md->md_domain));
-}
-
-u8*
-format_map_t_dpo (u8 *s, va_list *args)
-{
-    index_t index = va_arg (*args, index_t);
-    CLIB_UNUSED(u32 indent) = va_arg (*args, u32);
-    map_dpo_t *md;
-
-    md = map_dpo_get(index);
-
-    return (format(s, "map-t:[%d]:%U domain:%d",
-		   index,
-                   format_dpo_proto, md->md_proto,
-		   md->md_domain));
-}
-
-
-static void
-map_dpo_lock (dpo_id_t *dpo)
-{
-    map_dpo_t *md;
-
-    md = map_dpo_get(dpo->dpoi_index);
-
-    md->md_locks++;
-}
-
-static void
-map_dpo_unlock (dpo_id_t *dpo)
-{
-    map_dpo_t *md;
-
-    md = map_dpo_get(dpo->dpoi_index);
-
-    md->md_locks--;
-
-    if (0 == md->md_locks)
-    {
-	pool_put(map_dpo_pool, md);
-    }
-}
-
-const static dpo_vft_t md_vft = {
-    .dv_lock = map_dpo_lock,
-    .dv_unlock = map_dpo_unlock,
-    .dv_format = format_map_dpo,
-};
-
-const static char* const map_ip4_nodes[] =
-{
-    "ip4-map",
-    NULL,
-};
-const static char* const map_ip6_nodes[] =
-{
-    "ip6-map",
-    NULL,
-};
-
-const static char* const * const map_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = map_ip4_nodes,
-    [DPO_PROTO_IP6]  = map_ip6_nodes,
-    [DPO_PROTO_MPLS] = NULL,
-};
-
-const static dpo_vft_t md_t_vft = {
-    .dv_lock = map_dpo_lock,
-    .dv_unlock = map_dpo_unlock,
-    .dv_format = format_map_t_dpo,
-};
-
-const static char* const map_t_ip4_nodes[] =
-{
-    "ip4-map-t",
-    NULL,
-};
-const static char* const map_t_ip6_nodes[] =
-{
-    "ip6-map-t",
-    NULL,
-};
-
-const static char* const * const map_t_nodes[DPO_PROTO_NUM] =
-{
-    [DPO_PROTO_IP4]  = map_t_ip4_nodes,
-    [DPO_PROTO_IP6]  = map_t_ip6_nodes,
-    [DPO_PROTO_MPLS] = NULL,
-};
-
-void
-map_dpo_module_init (void)
-{
-    map_dpo_type = dpo_register_new_type(&md_vft, map_nodes);
-    map_t_dpo_type = dpo_register_new_type(&md_t_vft, map_t_nodes);
-}
diff --git a/vnet/vnet/map/map_dpo.h b/vnet/vnet/map/map_dpo.h
deleted file mode 100644
index be510dba..00000000
--- a/vnet/vnet/map/map_dpo.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __MAP_DPO_H__
-#define __MAP_DPO_H__
-
-#include <vnet/vnet.h>
-#include <vnet/dpo/dpo.h>
-
-/**
- * A representation of a MAP DPO
- */
-typedef struct map_dpo_t
-{
-    /**
-     * The dat-plane protocol
-     */
-    dpo_proto_t md_proto;
-
-    /**
-     * the MAP domain index
-     */
-    u32 md_domain;
-
-    /**
-     * Number of locks/users of the label
-     */
-    u16 md_locks;
-} map_dpo_t;
-
-extern void map_dpo_create (dpo_proto_t dproto,
-			    u32 domain_index,
-			    dpo_id_t *dpo);
-extern void map_t_dpo_create (dpo_proto_t dproto,
-			      u32 domain_index,
-			      dpo_id_t *dpo);
-
-extern u8* format_map_dpo(u8 *s, va_list *args);
-
-/*
- * Encapsulation violation for fast data-path access
- */
-extern map_dpo_t *map_dpo_pool;
-extern dpo_type_t map_dpo_type;
-extern dpo_type_t map_t_dpo_type;
-
-static inline map_dpo_t *
-map_dpo_get (index_t index)
-{
-    return (pool_elt_at_index(map_dpo_pool, index));
-}
-
-extern void map_dpo_module_init(void);
-
-#endif
diff --git a/vnet/vnet/map/test.c b/vnet/vnet/map/test.c
deleted file mode 100644
index f3c893a7..00000000
--- a/vnet/vnet/map/test.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * test.c : MAP unit tests
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <assert.h>
-#include "map.h"
-
-static map_domain_t *
-get_domain(ip4_address_t * ip4_prefix, u8 ip4_prefix_len,
-	   ip6_address_t * ip6_prefix, u8 ip6_prefix_len,
-	   ip6_address_t * ip6_src, u8 ip6_src_len,
-	   u8 ea_bits_len, u8 psid_offset,
-	   u8 psid_length, u16 mtu, u8 flags)
-{
-  map_domain_t * d = malloc(sizeof(*d));
-  u8 suffix_len;
-
-  /* EA bits must be within the first 64 bits */
-  if (ea_bits_len > 0 && (ip6_prefix_len + ea_bits_len) > 64)
-    return NULL;
-
-  /* Init domain struct */
-  d->ip4_prefix.as_u32 = ip4_prefix->as_u32;
-  d->ip4_prefix_len = ip4_prefix_len;
-  d->ip6_prefix = *ip6_prefix;
-  d->ip6_prefix_len = ip6_prefix_len;
-  d->ip6_src = *ip6_src;
-  d->ip6_src_len = ip6_src_len;
-  d->ea_bits_len = ea_bits_len;
-  d->psid_offset = psid_offset;
-  d->psid_length = psid_length;
-  d->mtu = mtu;
-  d->flags = flags;
-
-  /* How many, and which bits to grab from the IPv4 DA */
-  if (ip4_prefix_len + ea_bits_len < 32)
-    {
-      d->flags |= MAP_DOMAIN_PREFIX;
-      d->suffix_shift = 32 - ip4_prefix_len - ea_bits_len;
-      suffix_len = ea_bits_len;
-    }
-  else
-    {
-      d->suffix_shift = 0;
-      suffix_len = 32 - ip4_prefix_len;
-    }
-  d->suffix_mask = (1 << suffix_len) - 1;
-
-  d->psid_shift = 16 - psid_length - psid_offset;
-  d->psid_mask = (1 << d->psid_length) - 1;
-
-  if (ip6_prefix_len + suffix_len + d->psid_length > 64)
-    return NULL;
-
-  d->ea_shift = 64 - ip6_prefix_len - suffix_len - d->psid_length;
-
-  return d;
-}
-
-
-/*
- * VPP-340:
- * map_add_domain ip4-pfx 20.0.0.0/8 ip6-pfx 2001:db8::/40 ip6-src 2001:db8:ffff::/96 ea-bits-len 24 psid-offset 0 psid-len 0 map-t
- * IPv4 src = 100.0.0.1
- * IPv4 dst = 20.169.201.219
- * UDP dest port = 1232
- * IPv6 src = 2001:db8:ffff::6400:1
- * IPv6 dst = a9c9:dfb8::14a9:c9db:0
- * a9c9:dfb8::14a9:c9db:0 != 2001:db8:a9:c9db:0:14a9:c9db:0
- */
-static void
-test_map_t_destaddr (void)
-{
-  ip4_address_t ip4_prefix;
-  ip6_address_t ip6_prefix;
-  ip6_address_t ip6_src;
-
-  ip4_prefix.as_u32 = clib_host_to_net_u32(0x14000000);
-  ip6_prefix.as_u64[0] = clib_host_to_net_u64(0x20010db800000000);
-  ip6_prefix.as_u64[1] = 0;
-  ip6_src.as_u64[0] = clib_host_to_net_u64(0x20010db8ffff0000);
-  map_domain_t * d = get_domain (&ip4_prefix, 8, &ip6_prefix, 40, &ip6_src, 96, 24, 0, 0, 0, MAP_DOMAIN_TRANSLATION);
-
-  ip6_address_t dst6;
-
-  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
-  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
-  assert(dst6.as_u64[0] == 0x20010db800a9c9db);
-  assert(dst6.as_u64[1] == 0x000014a9c9db0000);
-}
-
-/*
- * VPP-228
- * ip4-pfx 20.0.0.0/8
- * ip6-pfx 2001:db8::/<n>
- * ip6-src 2001:db8:ffff::1
- * ea-bits-len 16 psid-offset 6 psid-len 8
- * 20.169.201.219 port 1232
- */
-static void
-test_map_eabits (void)
-{
-  ip4_address_t ip4_prefix;
-  ip6_address_t ip6_prefix;
-  ip6_address_t ip6_src;
-  ip6_address_t dst6;
-
-  ip4_prefix.as_u32 = clib_host_to_net_u32(0x14000000);
-  ip6_prefix.as_u64[0] = clib_host_to_net_u64(0x20010db800000000);
-  ip6_prefix.as_u64[1] = 0;
-  ip6_src.as_u64[0] = clib_host_to_net_u64(0x20010db8ffff0000);
-  ip6_src.as_u64[1] = clib_host_to_net_u64(0x0000000000000001);
-  map_domain_t * d = get_domain (&ip4_prefix, 16, &ip6_prefix, 48, &ip6_src,
-				 128, 16, 6, 8, 0, 0);
-  assert(!d);
-
-  //20.0.0.0/8	2001:db8::/32	4	2001:db8:a000::14a0:0:0
-  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
-		  128, 4, 0, 0, 0, 0);
-  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
-  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
-  assert(dst6.as_u64[0] == 0x20010db8a0000000);
-  assert(dst6.as_u64[1] == 0x000014a000000000);
-
-  //20.0.0.0/8	2001:db8::/32	8	2001:db8:a900::14a9:0:0
-  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
-		  128, 8, 0, 0, 0, 0);
-  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
-  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
-  assert(dst6.as_u64[0] == 0x20010db8a9000000);
-  assert(dst6.as_u64[1] == 0x000014a900000000);
-
-  //20.0.0.0/8	2001:db8::/32	10	2001:db8:a9c0::14a9:c000:0
-  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
-		  128, 10, 0, 0, 0, 0);
-  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
-  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
-  assert(dst6.as_u64[0] == 0x20010db8a9c00000);
-  assert(dst6.as_u64[1] == 0x000014a9c0000000);
-
-  //20.0.0.0/8	2001:db8::/32	16	2001:db8:a9c9::14a9:c900:0
-  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
-		  128, 16, 0, 0, 0, 0);
-  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
-  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
-  assert(dst6.as_u64[0] == 0x20010db8a9c90000);
-  assert(dst6.as_u64[1] == 0x000014a9c9000000);
-
-  //20.0.0.0/8	2001:db8::/32	20	2001:db8:a9c9:d000:0:14a9:c9d0:0
-  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
-		  128, 20, 0, 0, 0, 0);
-  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
-  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
-  assert(dst6.as_u64[0] == 0x20010db8a9c9d000);
-  assert(dst6.as_u64[1] == 0x000014a9c9d00000);
-
-  //20.0.0.0/8	2001:db8::/32	23	2001:db8:a9c9:da00:0:14a9:c9da:0
-  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
-		  128, 23, 0, 0, 0, 0);
-  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
-  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
-  assert(dst6.as_u64[0] == 0x20010db8a9c9da00);
-  assert(dst6.as_u64[1] == 0x000014a9c9da0000);
-
-  //20.169.201.0/24	2001:db8::/32	7	2001:db8:da00::14a9:c9da:0
-  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
-		  128, 7, 0, 0, 0, 0);
-  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
-  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
-  assert(dst6.as_u64[0] == 0x20010db8a8000000);
-  assert(dst6.as_u64[1] == 0x000014a800000000);
-}
-
-#define foreach_test_case			\
-  _(map_t_destaddr)				\
-  _(map_eabits)
-
-static void
-run_tests (void)
-{
-#define _(_test_name)				\
-  test_ ## _test_name ();
-
-  foreach_test_case
-#undef _
-}
-
-int main()
-{
-  run_tests ();
-  return 0;
-}
diff --git a/vnet/vnet/mcast/mcast.c b/vnet/vnet/mcast/mcast.c
deleted file mode 100644
index 55be89ae..00000000
--- a/vnet/vnet/mcast/mcast.c
+++ /dev/null
@@ -1,565 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/mcast/mcast.h>
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/icmp46_packet.h>
-#include <vnet/ip/ip4.h>
-
-typedef struct {
-  u32 sw_if_index;
-  u32 next_index;
-  u32 group_index;
-} mcast_prep_trace_t;
-
-/* packet trace format function */
-static u8 * format_mcast_prep_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  mcast_prep_trace_t * t = va_arg (*args, mcast_prep_trace_t *);
-  
-  s = format (s, "MCAST_PREP: group %d, next index %d, tx_sw_if_index %d",
-              t->group_index, t->next_index, t->sw_if_index);
-  return s;
-}
-
-mcast_main_t mcast_main;
-vlib_node_registration_t mcast_prep_node;
-vlib_node_registration_t mcast_recycle_node;
-
-#define foreach_mcast_prep_error \
-_(MCASTS, "Multicast Packets")
-
-typedef enum {
-#define _(sym,str) MCAST_PREP_ERROR_##sym,
-  foreach_mcast_prep_error
-#undef _
-  MCAST_PREP_N_ERROR,
-} mcast_prep_error_t;
-
-static char * mcast_prep_error_strings[] = {
-#define _(sym,string) string,
-  foreach_mcast_prep_error
-#undef _
-};
-
-typedef enum {
-  MCAST_PREP_NEXT_DROP,
-  MCAST_PREP_N_NEXT,
-} mcast_prep_next_t;
-
-static uword
-mcast_prep_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * frame)
-{
-  u32 n_left_from, * from, * to_next;
-  mcast_prep_next_t next_index;
-  mcast_main_t * mcm = &mcast_main;
-  vlib_node_t *n = vlib_get_node (vm, mcast_prep_node.index);
-  u32 node_counter_base_index = n->error_heap_index;
-  vlib_error_main_t * em = &vm->error_main;
-  ip4_main_t * im = &ip4_main;
-  ip_lookup_main_t * lm = &im->lookup_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (0 && n_left_from >= 4 && n_left_to_next >= 2)
-	{
-          u32 bi0, bi1;
-	  vlib_buffer_t * b0, * b1;
-          u32 next0, next1;
-          u32 sw_if_index0, sw_if_index1;
-          
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * p2, * p3;
-            
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-            
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-          /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-          next0 = 0;
-          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
-          next1 = 0;
-
-          /* $$$$ your message in this space. Process 2 x pkts */
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)))
-            {
-              if (b0->flags & VLIB_BUFFER_IS_TRACED) 
-                {
-                    mcast_prep_trace_t *t = 
-                      vlib_add_trace (vm, node, b0, sizeof (*t));
-                    t->sw_if_index = sw_if_index0;
-                    t->next_index = next0;
-                  }
-                if (b1->flags & VLIB_BUFFER_IS_TRACED) 
-                  {
-                    mcast_prep_trace_t *t = 
-                      vlib_add_trace (vm, node, b1, sizeof (*t));
-                    t->sw_if_index = sw_if_index1;
-                    t->next_index = next1;
-                  }
-              }
-            
-            /* verify speculative enqueues, maybe switch current next frame */
-            vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-                                             to_next, n_left_to_next,
-                                             bi0, bi1, next0, next1);
-        }
-      
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-          u32 bi0;
-	  vlib_buffer_t * b0;
-          u32 next0, adj_index0;
-          mcast_group_t * g0;
-          ip_adjacency_t * adj0;
-          
-          /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-          adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
-          adj0 = ip_get_adjacency (lm, adj_index0);
-          vnet_buffer(b0)->mcast.mcast_group_index = adj0->mcast_group_index;
-          g0 = pool_elt_at_index (mcm->groups, adj0->mcast_group_index);
-
-          /* 
-           * Handle the degenerate single-copy case 
-           * If we don't change the freelist, the packet will never
-           * make it to the recycle node...
-           */
-          if (PREDICT_TRUE(vec_len (g0->members) > 1))
-            {
-              /* Save the original free list index */
-              vnet_buffer(b0)->mcast.original_free_list_index =
-                b0->free_list_index;
-              
-              /* Swap in the multicast recycle list */
-              b0->free_list_index = mcm->mcast_recycle_list_index;
-              
-              /* 
-               * Make sure that intermediate "frees" don't screw up 
-               */
-              b0->recycle_count = vec_len (g0->members);
-              b0->flags |= VLIB_BUFFER_RECYCLE;
-
-              /* Set up for the recycle node */
-              vnet_buffer(b0)->mcast.mcast_current_index = 1;
-            }
-
-          /* Transmit the pkt on the first interface */
-          next0 = g0->members[0].prep_and_recycle_node_next_index;
-          vnet_buffer(b0)->sw_if_index[VLIB_TX] = 
-            g0->members[0].tx_sw_if_index;
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) {
-            mcast_prep_trace_t *t = 
-               vlib_add_trace (vm, node, b0, sizeof (*t));
-            t->next_index = next0;
-            t->sw_if_index = vnet_buffer(b0)->sw_if_index[VLIB_TX];
-            t->group_index = vnet_buffer(b0)->mcast.mcast_group_index;
-            }
-            
-          /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  em->counters[node_counter_base_index + MCAST_PREP_ERROR_MCASTS] += 
-      frame->n_vectors;
-
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (mcast_prep_node) = {
-  .function = mcast_prep_node_fn,
-  .name = "mcast_prep",
-  .vector_size = sizeof (u32),
-  .format_trace = format_mcast_prep_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_errors = ARRAY_LEN(mcast_prep_error_strings),
-  .error_strings = mcast_prep_error_strings,
-
-  .n_next_nodes = MCAST_PREP_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-        [MCAST_PREP_NEXT_DROP] = "error-drop",
-  },
-};
-
-typedef struct {
-  u32 sw_if_index;
-  u32 next_index;
-  u32 current_member;
-  u32 group_index;
-} mcast_recycle_trace_t;
-
-static u8 * format_mcast_recycle_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  mcast_recycle_trace_t * t = va_arg (*args, mcast_recycle_trace_t *);
-  
-  s = format (s, 
-"MCAST_R: group %d, current member %d next (node) index %d, tx_sw_if_index %d",
-              t->group_index, t->current_member, t->next_index, t->sw_if_index);
-  return s;
-}
-
-#define foreach_mcast_recycle_error \
-_(RECYCLES, "Multicast Recycles")
-
-typedef enum {
-#define _(sym,str) MCAST_RECYCLE_ERROR_##sym,
-  foreach_mcast_recycle_error
-#undef _
-  MCAST_RECYCLE_N_ERROR,
-} mcast_recycle_error_t;
-
-static char * mcast_recycle_error_strings[] = {
-#define _(sym,string) string,
-  foreach_mcast_recycle_error
-#undef _
-};
-
-typedef enum {
-  MCAST_RECYCLE_NEXT_DROP,
-  MCAST_RECYCLE_N_NEXT,
-} mcast_recycle_next_t;
-
-static uword
-mcast_recycle_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * frame)
-{
-  u32 n_left_from, * from, * to_next;
-  mcast_recycle_next_t next_index;
-  mcast_main_t * mcm = &mcast_main;
-  vlib_node_t *n = vlib_get_node (vm, mcast_recycle_node.index);
-  u32 node_counter_base_index = n->error_heap_index;
-  vlib_error_main_t * em = &vm->error_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (0 && n_left_from >= 4 && n_left_to_next >= 2)
-	{
-          u32 bi0, bi1;
-	  vlib_buffer_t * b0, * b1;
-          u32 next0, next1;
-          u32 sw_if_index0, sw_if_index1;
-          
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * p2, * p3;
-            
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-            
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-          /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-          next0 = 0;
-          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
-          next1 = 0;
-
-          /* $$$$ your message in this space. Process 2 x pkts */
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)))
-            {
-              if (b0->flags & VLIB_BUFFER_IS_TRACED) 
-                {
-                    mcast_recycle_trace_t *t = 
-                      vlib_add_trace (vm, node, b0, sizeof (*t));
-                    t->sw_if_index = sw_if_index0;
-                    t->next_index = next0;
-                  }
-                if (b1->flags & VLIB_BUFFER_IS_TRACED) 
-                  {
-                    mcast_recycle_trace_t *t = 
-                      vlib_add_trace (vm, node, b1, sizeof (*t));
-                    t->sw_if_index = sw_if_index1;
-                    t->next_index = next1;
-                  }
-              }
-            
-            /* verify speculative enqueues, maybe switch current next frame */
-            vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-                                             to_next, n_left_to_next,
-                                             bi0, bi1, next0, next1);
-        }
-      
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-          u32 bi0;
-	  vlib_buffer_t * b0;
-          u32 next0;
-          u32 current_member0;
-          mcast_group_t * g0;
-          
-          /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-          g0 = pool_elt_at_index (mcm->groups, 
-                                  vnet_buffer(b0)->mcast.mcast_group_index);
-
-          /* No more replicas? */
-          if (b0->recycle_count == 1)
-            {
-              /* Restore the original free list index */
-              b0->free_list_index = 
-                vnet_buffer(b0)->mcast.original_free_list_index;
-              b0->flags &= ~(VLIB_BUFFER_RECYCLE);
-            }
-          current_member0 = vnet_buffer(b0)->mcast.mcast_current_index;
-          
-          next0 = 
-            g0->members[current_member0].prep_and_recycle_node_next_index;
-          vnet_buffer(b0)->sw_if_index[VLIB_TX] = 
-            g0->members[current_member0].tx_sw_if_index;
-          
-          vnet_buffer(b0)->mcast.mcast_current_index = 
-            current_member0 + 1;
-          
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) {
-            mcast_recycle_trace_t *t = 
-               vlib_add_trace (vm, node, b0, sizeof (*t));
-            t->next_index = next0;
-            t->sw_if_index = vnet_buffer(b0)->sw_if_index[VLIB_TX];
-            t->group_index = vnet_buffer(b0)->mcast.mcast_group_index;
-            t->current_member = current_member0;
-            }
-            
-          /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  em->counters[node_counter_base_index + MCAST_RECYCLE_ERROR_RECYCLES] += 
-      frame->n_vectors;
-
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (mcast_recycle_node) = {
-  .function = mcast_recycle_node_fn,
-  .name = "mcast-recycle",
-  .vector_size = sizeof (u32),
-  .format_trace = format_mcast_recycle_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_errors = ARRAY_LEN(mcast_recycle_error_strings),
-  .error_strings = mcast_recycle_error_strings,
-
-  .n_next_nodes = MCAST_RECYCLE_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-        [MCAST_RECYCLE_NEXT_DROP] = "error-drop",
-  },
-};
-
-/*
- * fish pkts back from the recycle queue/freelist
- * un-flatten the context chains
- */
-static void mcast_recycle_callback (vlib_main_t *vm, 
-                                    vlib_buffer_free_list_t * fl)
-{
-  vlib_frame_t * f = 0;
-  u32 n_left_from;
-  u32 n_left_to_next = 0;
-  u32 n_this_frame = 0;
-  u32 * from;
-  u32 * to_next;
-  u32 bi0, pi0;
-  vlib_buffer_t *b0;
-  vlib_buffer_t *bnext0;
-  int i;
-
-  /* aligned, unaligned buffers */
-  for (i = 0; i < 2; i++) 
-    {
-      if (i == 0)
-        {
-          from = fl->aligned_buffers;
-          n_left_from = vec_len (from);
-        }
-      else
-        {
-          from = fl->unaligned_buffers;
-          n_left_from = vec_len (from);
-        }
-    
-      while (n_left_from > 0)
-        {
-          if (PREDICT_FALSE(n_left_to_next == 0)) 
-            {
-              if (f)
-                {
-                  f->n_vectors = n_this_frame;
-                  vlib_put_frame_to_node (vm, mcast_recycle_node.index, f);
-                }
-              
-              f = vlib_get_frame_to_node (vm, mcast_recycle_node.index);
-              to_next = vlib_frame_vector_args (f);
-              n_left_to_next = VLIB_FRAME_SIZE;
-              n_this_frame = 0;
-            }
-          
-          bi0 = from[0];
-          if (PREDICT_TRUE(n_left_from > 1))
-            {
-              pi0 = from[1];
-              vlib_prefetch_buffer_with_index(vm,pi0,LOAD);
-            }
-        
-          bnext0 = b0 = vlib_get_buffer (vm, bi0);
-          
-          while (bnext0->flags & VLIB_BUFFER_NEXT_PRESENT)
-            {
-              from += 1;
-              n_left_from -= 1;
-              bnext0 = vlib_get_buffer (vm, bnext0->next_buffer);
-            }
-          to_next[0] = bi0;
-
-          if (CLIB_DEBUG > 0)
-            vlib_buffer_set_known_state (vm, bi0, VLIB_BUFFER_KNOWN_ALLOCATED);
-
-          from++;
-          to_next++;
-          n_this_frame++;
-          n_left_to_next--;
-          n_left_from--;
-        }
-    }
-  
-  vec_reset_length (fl->aligned_buffers);
-  vec_reset_length (fl->unaligned_buffers);
-
-  if (f)
-    {
-      ASSERT(n_this_frame);
-      f->n_vectors = n_this_frame;
-      vlib_put_frame_to_node (vm, mcast_recycle_node.index, f);
-    }
-}
-
-clib_error_t *mcast_init (vlib_main_t *vm)
-{
-  mcast_main_t * mcm = &mcast_main;
-  vlib_buffer_main_t * bm = vm->buffer_main;
-  vlib_buffer_free_list_t * fl;
-    
-  mcm->vlib_main = vm;
-  mcm->vnet_main = vnet_get_main();
-  mcm->mcast_recycle_list_index = 
-    vlib_buffer_create_free_list (vm, 1024 /* fictional */, "mcast-recycle");
-
-  fl = pool_elt_at_index (bm->buffer_free_list_pool, 
-                          mcm->mcast_recycle_list_index);
-
-  fl->buffers_added_to_freelist_function = mcast_recycle_callback;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (mcast_init);
-
-
diff --git a/vnet/vnet/mcast/mcast.h b/vnet/vnet/mcast/mcast.h
deleted file mode 100644
index 96e51442..00000000
--- a/vnet/vnet/mcast/mcast.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_vnet_mcast_h__
-#define __included_vnet_mcast_h__
-
-#include <vnet/vnet.h>
-#include <vlib/buffer.h>
-#include <vlib/buffer_funcs.h>
-
-typedef struct {
-  /* Arrange for both prep and recycle nodes to have identical
-     next indices for a given output interface */
-  u32 prep_and_recycle_node_next_index;
-
-  /* Show command, etc. */
-  u32 tx_sw_if_index;
-} mcast_group_member_t;
-
-typedef struct {
-  /* vector of group members */
-  mcast_group_member_t * members;
-} mcast_group_t;
-
-typedef struct {
-  /* pool of multicast (interface) groups */
-  mcast_group_t * groups;
-
-  /* multicast "free" list, aka recycle list */
-  u32 mcast_recycle_list_index;
-
-  /* convenience */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-} mcast_main_t;
-
-mcast_main_t mcast_main;
-
-#endif /* __included_vnet_mcast_h__ */
diff --git a/vnet/vnet/mcast/mcast_test.c b/vnet/vnet/mcast/mcast_test.c
deleted file mode 100644
index be80c9fc..00000000
--- a/vnet/vnet/mcast/mcast_test.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/mcast/mcast.h>
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-#include <vnet/ip/lookup.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/icmp46_packet.h>
-#include <vnet/ip/ip4.h>
-#include <vnet/mcast/mcast.h>
-
-typedef struct {
-  /* convenience */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-  mcast_main_t * mcast_main;
-} mcast_test_main_t;
-
-mcast_test_main_t mcast_test_main;
-vlib_node_registration_t mcast_prep_node;
-vlib_node_registration_t mcast_recycle_node;
-
-static clib_error_t *
-mcast_test_command_fn (vlib_main_t * vm,
-		 unformat_input_t * input,
-		 vlib_cli_command_t * cmd)
-{
-  /* u8 *rewrite_data; */
-  /* mcast_test_main_t * mtm = &mcast_test_main; */
-  /* mcast_main_t * mcm = mtm->mcast_main; */
-  /* ip_adjacency_t adj; */
-  /* u32 adj_index; */
-  /* mcast_group_t * g; */
-  /* mcast_group_member_t * member; */
-  /* unformat_input_t _line_input, * line_input = &_line_input; */
-  /* ip4_address_t dst_addr, zero; */
-  /* ip4_main_t * im = &ip4_main; */
-  /* ip_lookup_main_t * lm = &im->lookup_main; */
-
-  /* /\* Get a line of input. *\/ */
-  /* if (! unformat_user (input, unformat_line_input, line_input)) */
-  /*   return 0; */
-
-  /* pool_get (mcm->groups, g); */
-  /* memset (g, 0, sizeof (*g)); */
-
-  /* while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) */
-  /*   { */
-  /*     vnet_hw_interface_t *hw; */
-  /*     u32 next, sw_if_index; */
-
-  /*     if (unformat (line_input, "%U", unformat_vnet_sw_interface,  */
-  /*                   mtm->vnet_main, &sw_if_index))  */
-  /*       { */
-  /*         vec_add2 (g->members, member, 1); */
-  /*         member->tx_sw_if_index = sw_if_index; */
-          
-  /*         hw = vnet_get_sup_hw_interface (mtm->vnet_main,  */
-  /*                                         sw_if_index); */
-          
-  /*         next = vlib_node_add_next (mtm->vlib_main,  */
-  /*                                    mcast_prep_node.index, */
-  /*                                    hw->output_node_index); */
-          
-  /*         /\* Required to be the same next index... *\/ */
-  /*         vlib_node_add_next_with_slot (mtm->vlib_main, */
-  /*                                       mcast_recycle_node.index, */
-  /*                                       hw->output_node_index, next); */
-  /*         member->prep_and_recycle_node_next_index = next; */
-  /*       } */
-  /*     else */
-  /*       { */
-  /*         return unformat_parse_error (line_input); */
-  /*       } */
-  /*   } */
-
-  /* if (vec_len (g->members) == 0) */
-  /*   { */
-  /*     pool_put (mcm->groups, g); */
-  /*     vlib_cli_output (vm, "no group members specified"); */
-  /*     return 0; */
-  /*   } */
-
-
-  /* adj.lookup_next_index = IP_LOOKUP_NEXT_REWRITE; */
-  /* adj.mcast_group_index = g - mcm->groups; */
-  /* rewrite_data = format (0, "abcdefg"); */
-
-  /* vnet_rewrite_for_tunnel */
-  /*   (mtm->vnet_main, */
-  /*    (u32)~0, /\* tx_sw_if_index, we dont know yet *\/ */
-  /*    ip4_rewrite_node.index, */
-  /*    mcast_prep_node.index, */
-  /*    &adj.rewrite_header, */
-  /*    rewrite_data, vec_len(rewrite_data)); */
-
-  /* ip_add_adjacency (lm, &adj, 1 /\* one adj *\/, */
-  /*                   &adj_index); */
-  
-  /* dst_addr.as_u32 = clib_host_to_net_u32 (0x0a000002); */
-  /* zero.as_u32 = 0; */
-
-  /* ip4_add_del_route_next_hop (im, */
-  /*                             IP4_ROUTE_FLAG_ADD, */
-  /*                             &dst_addr, */
-  /*                             24 /\* mask width *\/, */
-  /*                             &zero /\* no next hop *\/, */
-                          
-  /*                             0, // next hop sw if index */
-  /*                             1, // weight */
-  /*                             adj_index, */
-  /*                             0 /\* explicit fib 0 *\/); */
-
-  return 0;
-}
-
-static VLIB_CLI_COMMAND (mcast_test_command) = {
-  .path = "test mc",
-  .short_help = "test mc",
-  .function = mcast_test_command_fn,
-};
-
-clib_error_t *mcast_test_init (vlib_main_t *vm)
-{
-  mcast_test_main_t * mtm = &mcast_test_main;
-    
-  mtm->vlib_main = vm;
-  mtm->vnet_main = vnet_get_main();
-  mtm->mcast_main = &mcast_main;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (mcast_test_init);
diff --git a/vnet/vnet/misc.c b/vnet/vnet/misc.c
deleted file mode 100644
index 4c8c4cad..00000000
--- a/vnet/vnet/misc.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * misc.c: vnet misc
- *
- * Copyright (c) 2012 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-
-vnet_main_t vnet_main;
-
-vnet_main_t *
-vnet_get_main (void)
-{
-  return &vnet_main;
-}
-
-static uword
-vnet_local_interface_tx (vlib_main_t * vm,
-			 vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  ASSERT (0);
-  return f->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (vnet_local_interface_device_class) = {
-  .name = "local",
-  .tx_function = vnet_local_interface_tx,
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VNET_HW_INTERFACE_CLASS (vnet_local_interface_hw_class,static) = {
-  .name = "local",
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-vnet_main_init (vlib_main_t * vm)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error;
-  u32 hw_if_index;
-  vnet_hw_interface_t *hw;
-
-  if ((error = vlib_call_init_function (vm, vnet_interface_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, fib_module_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip_main_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip4_lookup_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip6_lookup_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, mpls_init)))
-    return error;
-
-  vnm->vlib_main = vm;
-
-  hw_if_index = vnet_register_interface
-    (vnm, vnet_local_interface_device_class.index, /* instance */ 0,
-     vnet_local_interface_hw_class.index, /* instance */ 0);
-  hw = vnet_get_hw_interface (vnm, hw_if_index);
-
-  vnm->local_interface_hw_if_index = hw_if_index;
-  vnm->local_interface_sw_if_index = hw->sw_if_index;
-
-  /* the local interface is used as an input interface when decapping from
-   * an IPSEC tunnel. so it needs to be IP enabled */
-  ip4_sw_interface_enable_disable (hw->sw_if_index, 1);
-  ip6_sw_interface_enable_disable (hw->sw_if_index, 1);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (vnet_main_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/mpls/error.def b/vnet/vnet/mpls/error.def
deleted file mode 100644
index de8b9665..00000000
--- a/vnet/vnet/mpls/error.def
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * mpls_error.def: mpls errors
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-mpls_error (NONE, "no error")
-mpls_error (UNKNOWN_PROTOCOL, "unknown protocol")
-mpls_error (UNSUPPORTED_VERSION, "unsupported version")
-mpls_error (PKTS_DECAP, "MPLS-GRE input packets decapsulated")
-mpls_error (PKTS_ENCAP, "MPLS-GRE output packets encapsulated")
-mpls_error (NO_LABEL, "MPLS-GRE no label for fib/dst")
-mpls_error (TTL_EXPIRED, "MPLS-GRE ttl expired")
-mpls_error (S_NOT_SET, "MPLS-GRE s-bit not set")
-mpls_error (BAD_LABEL, "invalid FIB id in label")
-mpls_error (NOT_IP4, "non-ip4 packets dropped")
-mpls_error (DISALLOWED_FIB, "disallowed FIB id")
-mpls_error (NOT_ENABLED, "MPLS not enabled")
-mpls_error (DROP, "MPLS DROP DPO")
-mpls_error (PUNT, "MPLS PUNT DPO")
diff --git a/vnet/vnet/mpls/interface.c b/vnet/vnet/mpls/interface.c
deleted file mode 100644
index 692a2d1e..00000000
--- a/vnet/vnet/mpls/interface.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * interface.c: mpls interfaces
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/mpls/mpls.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/adj/adj_midchain.h>
-#include <vnet/dpo/classify_dpo.h>
-
-
-u8
-mpls_sw_interface_is_enabled (u32 sw_if_index)
-{
-    mpls_main_t * mm = &mpls_main;
-
-    if (vec_len(mm->mpls_enabled_by_sw_if_index) < sw_if_index)
-        return (0);
-
-    return (mm->mpls_enabled_by_sw_if_index[sw_if_index]);
-}
-
-void
-mpls_sw_interface_enable_disable (mpls_main_t * mm,
-                                  u32 sw_if_index,
-                                  u8 is_enable)
-{
-  fib_node_index_t lfib_index;
-
-  vec_validate_init_empty (mm->mpls_enabled_by_sw_if_index, sw_if_index, 0);
-
-  /*
-   * enable/disable only on the 1<->0 transition
-   */
-  if (is_enable)
-    {
-      if (1 != ++mm->mpls_enabled_by_sw_if_index[sw_if_index])
-        return;
-
-      lfib_index = fib_table_find_or_create_and_lock(FIB_PROTOCOL_MPLS,
-						     MPLS_FIB_DEFAULT_TABLE_ID);
-      vec_validate(mm->fib_index_by_sw_if_index, 0);
-      mm->fib_index_by_sw_if_index[sw_if_index] = lfib_index;
-    }
-  else
-    {
-      ASSERT(mm->mpls_enabled_by_sw_if_index[sw_if_index] > 0);
-      if (0 != --mm->mpls_enabled_by_sw_if_index[sw_if_index])
-        return;
-
-      fib_table_unlock(mm->fib_index_by_sw_if_index[sw_if_index],
-		       FIB_PROTOCOL_MPLS);
-    }
-
-  vnet_feature_enable_disable ("mpls-input", "mpls-lookup", sw_if_index,
-			       is_enable, 0, 0);
-
-}
-
-static clib_error_t *
-mpls_interface_enable_disable (vlib_main_t * vm,
-                               unformat_input_t * input,
-                               vlib_cli_command_t * cmd)
-{
-  vnet_main_t * vnm = vnet_get_main();
-  clib_error_t * error = 0;
-  u32 sw_if_index, enable;
-
-  sw_if_index = ~0;
-
-  if (! unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  if (unformat (input, "enable"))
-      enable = 1;
-  else if (unformat (input, "disable"))
-      enable = 0;
-  else
-    {
-      error = clib_error_return (0, "expected 'enable' or 'disable'",
-				 format_unformat_error, input);
-      goto done;
-    }
-
-  mpls_sw_interface_enable_disable(&mpls_main, sw_if_index, enable);
-
- done:
-  return error;
-}
-
-/*?
- * This command enables an interface to accpet MPLS packets
- *
- * @cliexpar
- * @cliexstart{set interface mpls}
- *  set interface mpls GigEthernet0/8/0 enable
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND (set_interface_ip_table_command, static) = {
-  .path = "set interface mpls",
-  .function = mpls_interface_enable_disable,
-  .short_help = "Enable/Disable an interface for MPLS forwarding",
-};
diff --git a/vnet/vnet/mpls/mpls.c b/vnet/vnet/mpls/mpls.c
deleted file mode 100644
index 0e610e17..00000000
--- a/vnet/vnet/mpls/mpls.c
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * mpls.c: mpls
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/mpls/mpls.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/mpls_fib.h>
-
-const static char* mpls_eos_bit_names[] = MPLS_EOS_BITS;
-
-mpls_main_t mpls_main;
-
-u8 * format_mpls_unicast_label (u8 * s, va_list * args)
-{
-  mpls_label_t label = va_arg (*args, mpls_label_t);
-
-  switch (label) {
-  case MPLS_IETF_IPV4_EXPLICIT_NULL_LABEL:
-      s = format (s, "%s", MPLS_IETF_IPV4_EXPLICIT_NULL_STRING);
-      break;
-  case MPLS_IETF_ROUTER_ALERT_LABEL:
-      s = format (s, "%s", MPLS_IETF_ROUTER_ALERT_STRING);
-      break;
-  case MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL:
-      s = format (s, "%s", MPLS_IETF_IPV6_EXPLICIT_NULL_STRING);
-      break;
-  case MPLS_IETF_IMPLICIT_NULL_LABEL:
-      s = format (s, "%s", MPLS_IETF_IMPLICIT_NULL_STRING);
-      break;
-  case MPLS_IETF_ELI_LABEL:
-      s = format (s, "%s", MPLS_IETF_ELI_STRING);
-      break;
-  case MPLS_IETF_GAL_LABEL:
-      s = format (s, "%s", MPLS_IETF_GAL_STRING);
-      break;
-  default:
-      s = format (s, "%d", label);
-      break;
-  }
-  return s;
-}
-
-uword unformat_mpls_unicast_label (unformat_input_t * input, va_list * args)
-{
-  mpls_label_t *label = va_arg (*args, mpls_label_t*);
-  
-  if (unformat (input, MPLS_IETF_IPV4_EXPLICIT_NULL_STRING))
-      *label = MPLS_IETF_IPV4_EXPLICIT_NULL_LABEL;
-  else if (unformat (input, MPLS_IETF_IPV6_EXPLICIT_NULL_STRING))
-      *label = MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL;
-  else if (unformat (input, MPLS_IETF_ROUTER_ALERT_STRING))
-      *label = MPLS_IETF_ROUTER_ALERT_LABEL;
-  else if (unformat (input, MPLS_IETF_IMPLICIT_NULL_STRING))
-      *label = MPLS_IETF_IMPLICIT_NULL_LABEL;
-  else if (unformat (input, "%d", label))
-      ;
-
-  return (1);
-}
-
-u8 * format_mpls_eos_bit (u8 * s, va_list * args)
-{
-  mpls_eos_bit_t eb = va_arg (*args, mpls_eos_bit_t);
-
-  ASSERT(eb <= MPLS_EOS);
-
-  s = format(s, "%s", mpls_eos_bit_names[eb]);
-
-  return (s);
-}
-
-u8 * format_mpls_header (u8 * s, va_list * args)
-{
-  mpls_unicast_header_t hdr = va_arg (*args, mpls_unicast_header_t);
-
-  return (format(s, "[%U:%d:%d:%U]",
-		 format_mpls_unicast_label, 
-		 vnet_mpls_uc_get_label(hdr.label_exp_s_ttl),
-		 vnet_mpls_uc_get_ttl(hdr.label_exp_s_ttl),
-		 vnet_mpls_uc_get_exp(hdr.label_exp_s_ttl),
-		 format_mpls_eos_bit,
-		 vnet_mpls_uc_get_s(hdr.label_exp_s_ttl)));
-}
-
-uword
-unformat_mpls_header (unformat_input_t * input, va_list * args)
-{
-  u8 ** result = va_arg (*args, u8 **);
-  mpls_unicast_header_t _h, * h = &_h;
-  u32 label, label_exp_s_ttl;
-
-  if (! unformat (input, "MPLS %d", &label))
-    return 0;
-
-  label_exp_s_ttl = (label<<12) | (1<<8) /* s-bit */ | 0xFF;
-  h->label_exp_s_ttl = clib_host_to_net_u32 (label_exp_s_ttl);
-
-  /* Add gre, mpls headers to result. */
-  {
-    void * p;
-    u32 h_n_bytes = sizeof (h[0]);
-
-    vec_add2 (*result, p, h_n_bytes);
-    clib_memcpy (p, h, h_n_bytes);
-  }
-
-  return 1;
-}
-
-uword
-unformat_mpls_label_net_byte_order (unformat_input_t * input,
-                                        va_list * args)
-{
-  u32 * result = va_arg (*args, u32 *);
-  u32 label;
-
-  if (!unformat (input, "MPLS: label %d", &label))
-    return 0;
-
-  label = (label<<12) | (1<<8) /* s-bit set */ | 0xFF /* ttl */;
-
-  *result = clib_host_to_net_u32 (label);
-  return 1;
-}
-
-u8 * format_mpls_unicast_header_host_byte_order (u8 * s, va_list * args)
-{
-  mpls_unicast_header_t *h = va_arg(*args, mpls_unicast_header_t *);
-  u32 label = h->label_exp_s_ttl;
-  
-  s = format (s, "label %d exp %d, s %d, ttl %d",
-              vnet_mpls_uc_get_label (label),
-              vnet_mpls_uc_get_exp (label),
-              vnet_mpls_uc_get_s (label),
-              vnet_mpls_uc_get_ttl (label));
-  return s;
-}
-
-u8 * format_mpls_unicast_header_net_byte_order (u8 * s, va_list * args)
-{
-  mpls_unicast_header_t *h = va_arg(*args, mpls_unicast_header_t *);
-  mpls_unicast_header_t h_host;
-
-  h_host.label_exp_s_ttl = clib_net_to_host_u32 (h->label_exp_s_ttl);
-
-  return format (s, "%U", format_mpls_unicast_header_host_byte_order,
-                 &h_host);
-}
-
-int
-mpls_dest_cmp(void * a1, void * a2)
-{
-  show_mpls_fib_t * r1 = a1;
-  show_mpls_fib_t * r2 = a2;
-
-  return clib_net_to_host_u32(r1->dest) - clib_net_to_host_u32(r2->dest);
-}
-
-int
-mpls_fib_index_cmp(void * a1, void * a2)
-{
-  show_mpls_fib_t * r1 = a1;
-  show_mpls_fib_t * r2 = a2;
-
-  return r1->fib_index - r2->fib_index;
-}
-
-int
-mpls_label_cmp(void * a1, void * a2)
-{
-  show_mpls_fib_t * r1 = a1;
-  show_mpls_fib_t * r2 = a2;
-
-  return r1->label - r2->label;
-}
-
-static clib_error_t *
-vnet_mpls_local_label (vlib_main_t * vm,
-                       unformat_input_t * input,
-                       vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, * line_input = &_line_input;
-  fib_route_path_t *rpaths = NULL, rpath;
-  u32 table_id, is_del, is_ip;
-  mpls_label_t local_label;
-  mpls_label_t out_label;
-  clib_error_t * error;
-  mpls_eos_bit_t eos;
-  vnet_main_t * vnm;
-  fib_prefix_t pfx;
-
-  vnm = vnet_get_main();
-  error = NULL;
-  is_ip = 0;
-  table_id = 0;
-  eos = MPLS_EOS;
-  is_del = 0;
-  local_label = MPLS_LABEL_INVALID;
-  memset(&pfx, 0, sizeof(pfx));
-
-   /* Get a line of input. */
-  if (! unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      memset(&rpath, 0, sizeof(rpath));
-
-      if (unformat (line_input, "table %d", &table_id))
-	;
-      else if (unformat (line_input, "del"))
-	is_del = 1;
-      else if (unformat (line_input, "add"))
-	is_del = 0;
-      else if (unformat (line_input, "eos"))
-	pfx.fp_eos = MPLS_EOS;
-      else if (unformat (line_input, "non-eos"))
-	pfx.fp_eos = MPLS_NON_EOS;
-      else if (unformat (line_input, "%U/%d",
-			 unformat_ip4_address,
-			 &pfx.fp_addr.ip4,
-			 &pfx.fp_len))
-      {
-	  pfx.fp_proto = FIB_PROTOCOL_IP4;
-          is_ip = 1;
-      }
-      else if (unformat (line_input, "%U/%d",
-			 unformat_ip6_address,
-			 &pfx.fp_addr.ip6,
-			 &pfx.fp_len))
-      {
-	  pfx.fp_proto = FIB_PROTOCOL_IP6;
-          is_ip = 1;
-      }
-      else if (unformat (line_input, "via %U %U weight %u",
-			 unformat_ip4_address,
-			 &rpath.frp_addr.ip4,
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index,
-			 &rpath.frp_weight))
-      {
-	  rpath.frp_proto = FIB_PROTOCOL_IP4;
-	  vec_add1(rpaths, rpath);
-      }
-
-      else if (unformat (line_input, "via %U %U weight %u",
-			 unformat_ip6_address,
-			 &rpath.frp_addr.ip6,
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index,
-			 &rpath.frp_weight))
-      {
-	  rpath.frp_proto = FIB_PROTOCOL_IP6;
-	  vec_add1(rpaths, rpath);
-      }
-
-      else if (unformat (line_input, "via %U %U",
-			 unformat_ip4_address,
- 			 &rpath.frp_addr.ip4,
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index))
-      {
-	  rpath.frp_weight = 1;
-	  rpath.frp_proto = FIB_PROTOCOL_IP4;
-	  vec_add1(rpaths, rpath);
-      }
-			 
-      else if (unformat (line_input, "via %U %U",
-			 unformat_ip6_address,
- 			 &rpath.frp_addr.ip6,
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index))
-      {
-	  rpath.frp_weight = 1;
-	  rpath.frp_proto = FIB_PROTOCOL_IP6;
-	  vec_add1(rpaths, rpath);
-      }
-      else if (unformat (line_input, "via %U next-hop-table %d",
-			 unformat_ip4_address,
-  			 &rpath.frp_addr.ip4,
-			 &rpath.frp_fib_index))
-      {
-	  rpath.frp_weight = 1;
-	  rpath.frp_sw_if_index = ~0;
-	  rpath.frp_proto = FIB_PROTOCOL_IP4;
-	  vec_add1(rpaths, rpath);
-      }
-      else if (unformat (line_input, "via %U next-hop-table %d",
-			 unformat_ip6_address,
-  			 &rpath.frp_addr.ip6,
-			 &rpath.frp_fib_index))
-      {
-	  rpath.frp_weight = 1;
-	  rpath.frp_sw_if_index = ~0;
-	  rpath.frp_proto = FIB_PROTOCOL_IP6;
-	  vec_add1(rpaths, rpath);
-      }
-      else if (unformat (line_input, "via %U",
-			 unformat_ip4_address,
-  			 &rpath.frp_addr.ip4))
-      {
-	  /*
-	   * the recursive next-hops are by default in the same table
-	   * as the prefix
-	   */
-	  rpath.frp_fib_index = table_id;
-	  rpath.frp_weight = 1;
-	  rpath.frp_sw_if_index = ~0;
-	  rpath.frp_proto = FIB_PROTOCOL_IP4;
-	  vec_add1(rpaths, rpath);
-      }
-      else if (unformat (line_input, "via %U",
-			 unformat_ip6_address,
-  			 &rpath.frp_addr.ip6))
-      {
-	  rpath.frp_fib_index = table_id;
-	  rpath.frp_weight = 1;
-	  rpath.frp_sw_if_index = ~0;
-	  rpath.frp_proto = FIB_PROTOCOL_IP6;
-	  vec_add1(rpaths, rpath);
-      }
-      else if (unformat (line_input, "%d", &local_label))
-	;
-      else if (unformat (line_input,
-			 "ip4-lookup-in-table %d",
-			 &rpath.frp_fib_index))
-      {
-          rpath.frp_proto = FIB_PROTOCOL_IP4;
-          rpath.frp_sw_if_index = FIB_NODE_INDEX_INVALID;
-	  pfx.fp_payload_proto = DPO_PROTO_IP4;
-	  vec_add1(rpaths, rpath);
-      }
-      else if (unformat (line_input,
-			 "ip6-lookup-in-table %d",
-			 &rpath.frp_fib_index))
-      {
-          rpath.frp_proto = FIB_PROTOCOL_IP6;
-          rpath.frp_sw_if_index = FIB_NODE_INDEX_INVALID;
-	  vec_add1(rpaths, rpath);
-	  pfx.fp_payload_proto = DPO_PROTO_IP6;
-      }
-      else if (unformat (line_input,
-			 "mpls-lookup-in-table %d",
-			 &rpath.frp_fib_index))
-      {
-          rpath.frp_proto = FIB_PROTOCOL_MPLS;
-          rpath.frp_sw_if_index = FIB_NODE_INDEX_INVALID;
-	  pfx.fp_payload_proto = DPO_PROTO_MPLS;
-	  vec_add1(rpaths, rpath);
-      }
-      else if (unformat (line_input, "out-label %U",
-                         unformat_mpls_unicast_label,
-			 &out_label))
-      {
-	  if (vec_len(rpaths) == 0)
-	  {
-	      error = clib_error_return(0 , "Paths then labels");
-	      goto done;
-	  }
-	  vec_add1(rpaths[vec_len(rpaths)-1].frp_label_stack, out_label);
-      }
-      else
-      {
-          error = clib_error_return (0, "unkown input: %U",
-                                     format_unformat_error, line_input);
-          goto done;
-      }
-
-    }
-
-  if (MPLS_LABEL_INVALID == local_label)
-  {
-      error = clib_error_return (0, "local-label required: %U",
-				 format_unformat_error, input);
-      goto done;
-  }
-
-
-  if (is_ip)
-  {
-      u32 fib_index = fib_table_find(pfx.fp_proto, table_id);
-
-      if (FIB_NODE_INDEX_INVALID == fib_index)
-      {
-          error = clib_error_return (0, "%U table-id %d does not exist",
-                                     format_fib_protocol, pfx.fp_proto, table_id);
-          goto done;
-      }
-
-      if (is_del)
-      {
-          fib_table_entry_local_label_remove(fib_index, &pfx, local_label);
-      }
-      else
-      {
-          fib_table_entry_local_label_add(fib_index, &pfx, local_label);
-      }
-  }
-  else
-  {
-      fib_node_index_t lfe, fib_index;
-      u32 fi;
-
-      if (NULL == rpaths)
-      {
-	  error = clib_error_return(0 , "no paths");
-	  goto done;
-      }
-
-      pfx.fp_proto = FIB_PROTOCOL_MPLS;
-      pfx.fp_len = 21;
-      pfx.fp_label = local_label;
-      pfx.fp_payload_proto = fib_proto_to_dpo(rpaths[0].frp_proto);
-
-      /*
-       * the CLI parsing stored table Ids, swap to FIB indicies
-       */
-      if (FIB_NODE_INDEX_INVALID == rpath.frp_sw_if_index)
-      {
-	  fi = fib_table_id_find_fib_index(dpo_proto_to_fib(pfx.fp_payload_proto),
-					   rpaths[0].frp_fib_index);
-
-	  if (~0 == fi)
-	  {
-	      error = clib_error_return(0 , "%U Via table %d does not exist",
-					format_dpo_proto, pfx.fp_payload_proto,
-					rpaths[0].frp_fib_index);
-	      goto done;
-	  }
-	  rpaths[0].frp_fib_index = fi;
-      }
-
-      fib_index = mpls_fib_index_from_table_id(table_id);
-
-      if (FIB_NODE_INDEX_INVALID == fib_index)
-      {
-          error = clib_error_return (0, "MPLS table-id %d does not exist",
-                                     table_id);
-          goto done;
-      }
-
-      lfe = fib_table_entry_path_add2(fib_index,
-				      &pfx,
-				      FIB_SOURCE_CLI,
-				      FIB_ENTRY_FLAG_NONE,
-				      rpaths);
-
-      if (FIB_NODE_INDEX_INVALID == lfe)
-      {
-          error = clib_error_return (0, "Failed to create %U-%U in MPLS table-id %d",
-                                     format_mpls_unicast_label, local_label,
-                                     format_mpls_eos_bit, eos,
-                                     table_id);
-          goto done;
-      }
-  }
-
-done:
-  return error;
-}
-
-VLIB_CLI_COMMAND (mpls_local_label_command, static) = {
-  .path = "mpls local-label",
-  .function = vnet_mpls_local_label,
-  .short_help = "Create/Delete MPL local labels",
-};
-
-int
-mpls_fib_reset_labels (u32 fib_id)
-{
-  // FIXME
-  return 0;
-}
-
-static clib_error_t *
-mpls_init (vlib_main_t * vm)
-{
-  mpls_main_t * mm = &mpls_main;
-  clib_error_t * error;
-
-  mm->vlib_main = vm;
-  mm->vnet_main = vnet_get_main();
-
-  if ((error = vlib_call_init_function (vm, ip_main_init)))
-    return error;
-
-  return vlib_call_init_function (vm, mpls_input_init);
-}
-
-VLIB_INIT_FUNCTION (mpls_init);
-
-mpls_main_t * mpls_get_main (vlib_main_t * vm)
-{
-  vlib_call_init_function (vm, mpls_init);
-  return &mpls_main;
-}
-
diff --git a/vnet/vnet/mpls/mpls.h b/vnet/vnet/mpls/mpls.h
deleted file mode 100644
index b6fdbce7..00000000
--- a/vnet/vnet/mpls/mpls.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vnet_mpls_h
-#define included_vnet_mpls_h
-
-#include <vnet/vnet.h>
-#include <vnet/mpls/packet.h>
-#include <vnet/mpls/mpls_types.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/fib/fib_node.h>
-#include <vnet/adj/adj.h>
-
-typedef enum {
-#define mpls_error(n,s) MPLS_ERROR_##n,
-#include <vnet/mpls/error.def>
-#undef mpls_error
-  MPLS_N_ERROR,
-} mpls_error_t;
-
-#define MPLS_FIB_DEFAULT_TABLE_ID 0
-
-/**
- * Type exposure is to allow the DP fast/inlined access
- */
-#define MPLS_FIB_KEY_SIZE 21
-#define MPLS_FIB_DB_SIZE (1 << (MPLS_FIB_KEY_SIZE-1))
-
-typedef struct mpls_fib_t_
-{
-  /**
-   * A hash table of entries. 21 bit key
-   * Hash table for reduced memory footprint
-   */
-  uword * mf_entries;
-
-  /**
-   * The load-balance indeices keyed by 21 bit label+eos bit.
-   * A flat array for maximum lookup performace.
-   */
-  index_t mf_lbs[MPLS_FIB_DB_SIZE];
-} mpls_fib_t;
-
-/**
- * @brief Definition of a callback for receiving MPLS interface state change
- * notifications
- */
-typedef void (*mpls_interface_state_change_callback_t)(u32 sw_if_index,
-                                                       u32 is_enable);
-
-typedef struct {
-  /* MPLS FIB index for each software interface */
-  u32 *fib_index_by_sw_if_index;
-
-  /**  A pool of all the MPLS FIBs */
-  struct fib_table_t_ *fibs;
-
-  /** A hash table to lookup the mpls_fib by table ID */
-  uword *fib_index_by_table_id;
-
-  /* Feature arc indices */
-  u8 input_feature_arc_index;
-  u8 output_feature_arc_index;
-
-  /* IP4 enabled count by software interface */
-  u8 * mpls_enabled_by_sw_if_index;
-
-  /* convenience */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-} mpls_main_t;
-
-extern mpls_main_t mpls_main;
-
-extern clib_error_t * mpls_feature_init(vlib_main_t * vm);
-
-format_function_t format_mpls_protocol;
-format_function_t format_mpls_encap_index;
-
-format_function_t format_mpls_eos_bit;
-format_function_t format_mpls_unicast_header_net_byte_order;
-format_function_t format_mpls_unicast_label;
-format_function_t format_mpls_header;
-
-extern vlib_node_registration_t mpls_input_node;
-extern vlib_node_registration_t mpls_policy_encap_node;
-extern vlib_node_registration_t mpls_output_node;
-extern vlib_node_registration_t mpls_midchain_node;
-
-/* Parse mpls protocol as 0xXXXX or protocol name.
-   In either host or network byte order. */
-unformat_function_t unformat_mpls_protocol_host_byte_order;
-unformat_function_t unformat_mpls_protocol_net_byte_order;
-unformat_function_t unformat_mpls_label_net_byte_order;
-unformat_function_t unformat_mpls_unicast_label;
-
-/* Parse mpls header. */
-unformat_function_t unformat_mpls_header;
-unformat_function_t unformat_pg_mpls_header;
-
-void mpls_sw_interface_enable_disable (mpls_main_t * mm,
-				       u32 sw_if_index,
-				       u8 is_enable);
-
-u8 mpls_sw_interface_is_enabled (u32 sw_if_index);
-
-int mpls_fib_reset_labels (u32 fib_id);
-
-#define foreach_mpls_input_next			\
-_(DROP, "error-drop")                           \
-_(LOOKUP, "mpls-lookup")
-
-typedef enum {
-#define _(s,n) MPLS_INPUT_NEXT_##s,
-  foreach_mpls_input_next
-#undef _
-  MPLS_INPUT_N_NEXT,
-} mpls_input_next_t;
-
-#define foreach_mpls_lookup_next        	\
-_(DROP, "error-drop")                           \
-_(IP4_INPUT, "ip4-input")                       \
-_(L2_OUTPUT, "l2-output")
-
-// FIXME remove.
-typedef enum {
-#define _(s,n) MPLS_LOOKUP_NEXT_##s,
-  foreach_mpls_lookup_next
-#undef _
-  MPLS_LOOKUP_N_NEXT,
-} mpls_lookup_next_t;
-
-#define foreach_mpls_output_next        	\
-_(DROP, "error-drop")
-
-typedef enum {
-#define _(s,n) MPLS_OUTPUT_NEXT_##s,
-  foreach_mpls_output_next
-#undef _
-  MPLS_OUTPUT_N_NEXT,
-} mpls_output_next_t;
-
-typedef struct {
-  u32 fib_index;
-  u32 entry_index;
-  u32 dest;
-  u32 s_bit;
-  u32 label;
-} show_mpls_fib_t;
-
-int
-mpls_dest_cmp(void * a1, void * a2);
-
-int
-mpls_fib_index_cmp(void * a1, void * a2);
-
-int
-mpls_label_cmp(void * a1, void * a2);
-
-#endif /* included_vnet_mpls_h */
diff --git a/vnet/vnet/mpls/mpls_features.c b/vnet/vnet/mpls/mpls_features.c
deleted file mode 100644
index a7593c55..00000000
--- a/vnet/vnet/mpls/mpls_features.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * mpls_features.c: MPLS input and output features
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/mpls/mpls.h>
-
-always_inline uword
-mpls_terminate (vlib_main_t * vm,
-                vlib_node_runtime_t * node,
-                vlib_frame_t * frame,
-                int error_code)
-{
-  u32 * buffers = vlib_frame_vector_args (frame);
-  uword n_packets = frame->n_vectors;
-
-  vlib_error_drop_buffers (vm, node,
-                           buffers,
-                           /* stride */ 1,
-                           n_packets,
-                           /* next */ 0,
-                           mpls_input_node.index,
-                           error_code);
-
-  return n_packets;
-}
-
-static uword
-mpls_punt (vlib_main_t * vm,
-           vlib_node_runtime_t * node,
-           vlib_frame_t * frame)
-{
-    return (mpls_terminate(vm, node, frame, MPLS_ERROR_PUNT));
-}
-
-VLIB_REGISTER_NODE (mpls_punt_node) = {
-  .function = mpls_punt,
-  .name = "mpls-punt",
-  .vector_size = sizeof (u32),
-
-  .n_next_nodes = 1,
-  .next_nodes = {
-    [0] = "error-punt",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_punt_node, mpls_punt)
-
-static uword
-mpls_drop (vlib_main_t * vm,
-           vlib_node_runtime_t * node,
-           vlib_frame_t * frame)
-{
-    return (mpls_terminate(vm, node, frame, MPLS_ERROR_DROP));
-}
-
-VLIB_REGISTER_NODE (mpls_drop_node) = {
-  .function = mpls_drop,
-  .name = "mpls-drop",
-  .vector_size = sizeof (u32),
-
-  .n_next_nodes = 1,
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_drop_node, mpls_drop)
-
-static uword
-mpls_not_enabled (vlib_main_t * vm,
-                  vlib_node_runtime_t * node,
-                  vlib_frame_t * frame)
-{
-    return (mpls_terminate(vm, node, frame, MPLS_ERROR_NOT_ENABLED));
-}
-
-VLIB_REGISTER_NODE (mpls_not_enabled_node) = {
-  .function = mpls_not_enabled,
-  .name = "mpls-not-enabled",
-  .vector_size = sizeof (u32),
-
-  .n_next_nodes = 1,
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_not_enabled_node, mpls_not_enabled)
-
-VNET_FEATURE_ARC_INIT (mpls_input, static) =
-{
-  .arc_name  = "mpls-input",
-  .start_nodes = VNET_FEATURES ("mpls-input"),
-  .arc_index_ptr = &mpls_main.input_feature_arc_index,
-};
-
-VNET_FEATURE_INIT (mpls_lookup, static) = {
-  .arc_name = "mpls-input",
-  .node_name = "mpls-lookup",
-  .runs_before = VNET_FEATURES ("mpls-not-enabled"),
-};
-
-VNET_FEATURE_INIT (mpls_not_enabled, static) = {
-  .arc_name = "mpls-input",
-  .node_name = "mpls-not-enabled",
-  .runs_before = VNET_FEATURES (0), /* not before any other features */
-};
-
-VNET_FEATURE_ARC_INIT (mpls_output, static) =
-{
-  .arc_name  = "mpls-output",
-  .start_nodes = VNET_FEATURES ("mpls-output", "mpls-midchain"),
-  .arc_index_ptr = &mpls_main.output_feature_arc_index,
-};
-
-/* Built-in ip4 tx feature path definition */
-VNET_FEATURE_INIT (mpls_interface_output, static) = {
-  .arc_name = "mpls-output",
-  .node_name = "interface-output",
-  .runs_before = 0, /* not before any other features */
-};
-
-static clib_error_t *
-mpls_sw_interface_add_del (vnet_main_t * vnm,
-                           u32 sw_if_index,
-                           u32 is_add)
-{
-  mpls_main_t * mm = &mpls_main;
-
-  vec_validate_init_empty (mm->mpls_enabled_by_sw_if_index, sw_if_index, 0);
-  vec_validate_init_empty (mm->fib_index_by_sw_if_index, sw_if_index, 0);
-
-  vnet_feature_enable_disable ("mpls-input", "mpls-not-enabled", sw_if_index,
-			       is_add, 0, 0);
-  vnet_feature_enable_disable ("mpls-output", "interface-output", sw_if_index,
-			       is_add, 0, 0);
-
-  return /* no error */ 0;
-}
-
-VNET_SW_INTERFACE_ADD_DEL_FUNCTION (mpls_sw_interface_add_del);
-
-
diff --git a/vnet/vnet/mpls/mpls_lookup.c b/vnet/vnet/mpls/mpls_lookup.c
deleted file mode 100644
index 2d34cbde..00000000
--- a/vnet/vnet/mpls/mpls_lookup.c
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- * mpls_lookup.c: MPLS lookup
- *
- * Copyright (c) 2012-2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/mpls/mpls.h>
-#include <vnet/fib/mpls_fib.h>
-#include <vnet/dpo/load_balance.h>
-
-vlib_node_registration_t mpls_lookup_node;
-
-typedef struct {
-  u32 next_index;
-  u32 lb_index;
-  u32 lfib_index;
-  u32 label_net_byte_order;
-  u32 hash;
-} mpls_lookup_trace_t;
-
-static u8 *
-format_mpls_lookup_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  mpls_lookup_trace_t * t = va_arg (*args, mpls_lookup_trace_t *);
-
-  s = format (s, "MPLS: next [%d], lookup fib index %d, LB index %d hash %d"
-              "label %d eos %d", 
-              t->next_index, t->lfib_index, t->lb_index, t->hash,
-              vnet_mpls_uc_get_label(
-                  clib_net_to_host_u32(t->label_net_byte_order)),
-              vnet_mpls_uc_get_s(t->label_net_byte_order));
-  return s;
-}
-
-/*
- * Compute flow hash. 
- * We'll use it to select which adjacency to use for this flow.  And other things.
- */
-always_inline u32
-mpls_compute_flow_hash (const mpls_unicast_header_t * hdr,
-                        flow_hash_config_t flow_hash_config)
-{
-    // FIXME
-    return (vnet_mpls_uc_get_label(hdr->label_exp_s_ttl));
-}
-
-static inline uword
-mpls_lookup (vlib_main_t * vm,
-             vlib_node_runtime_t * node,
-             vlib_frame_t * from_frame)
-{
-  vlib_combined_counter_main_t * cm = &load_balance_main.lbm_to_counters;
-  u32 n_left_from, next_index, * from, * to_next;
-  mpls_main_t * mm = &mpls_main;
-  u32 cpu_index = os_get_cpu_number();
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-                           to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-        {
-          u32 lbi0, next0, lfib_index0, bi0, hash_c0;
-          const mpls_unicast_header_t * h0;
-          const load_balance_t *lb0;
-          const dpo_id_t *dpo0;
-          vlib_buffer_t * b0;
-          u32 lbi1, next1, lfib_index1, bi1, hash_c1;
-          const mpls_unicast_header_t * h1;
-          const load_balance_t *lb1;
-          const dpo_id_t *dpo1;
-          vlib_buffer_t * b1;
-
-           /* Prefetch next iteration. */
-          {
-            vlib_buffer_t * p2, * p3;
-
-            p2 = vlib_get_buffer (vm, from[2]);
-            p3 = vlib_get_buffer (vm, from[3]);
-
-            vlib_prefetch_buffer_header (p2, STORE);
-            vlib_prefetch_buffer_header (p3, STORE);
-
-            CLIB_PREFETCH (p2->data, sizeof (h0[0]), STORE);
-            CLIB_PREFETCH (p3->data, sizeof (h0[0]), STORE);
-          }
-
-          bi0 = to_next[0] = from[0];
-          bi1 = to_next[1] = from[1];
-
-          from += 2;
-          n_left_from -= 2;
-          to_next += 2;
-          n_left_to_next -= 2;
-
-          b0 = vlib_get_buffer (vm, bi0);
-          b1 = vlib_get_buffer (vm, bi1);
-          h0 = vlib_buffer_get_current (b0);
-          h1 = vlib_buffer_get_current (b1);
-
-          lfib_index0 = vec_elt(mm->fib_index_by_sw_if_index,
-                                vnet_buffer(b0)->sw_if_index[VLIB_RX]);
-          lfib_index1 = vec_elt(mm->fib_index_by_sw_if_index,
-                                vnet_buffer(b1)->sw_if_index[VLIB_RX]);
-
-          lbi0 = mpls_fib_table_forwarding_lookup (lfib_index0, h0);
-          lbi1 = mpls_fib_table_forwarding_lookup (lfib_index1, h1);
-          lb0 = load_balance_get(lbi0);
-          lb1 = load_balance_get(lbi1);
-
-          hash_c0 = vnet_buffer(b0)->ip.flow_hash = 0;
-          hash_c1 = vnet_buffer(b1)->ip.flow_hash = 0;
-
-          if (PREDICT_FALSE(lb0->lb_n_buckets > 1))
-          {
-              hash_c0 = vnet_buffer (b0)->ip.flow_hash =
-                  mpls_compute_flow_hash(h0, lb0->lb_hash_config);
-          }
-          if (PREDICT_FALSE(lb1->lb_n_buckets > 1))
-          {
-              hash_c1 = vnet_buffer (b1)->ip.flow_hash =
-                  mpls_compute_flow_hash(h1, lb1->lb_hash_config);
-          }
-
-          ASSERT (lb0->lb_n_buckets > 0);
-          ASSERT (is_pow2 (lb0->lb_n_buckets));
-          ASSERT (lb1->lb_n_buckets > 0);
-          ASSERT (is_pow2 (lb1->lb_n_buckets));
-
-          dpo0 = load_balance_get_bucket_i(lb0,
-                                           (hash_c0 &
-                                            (lb0->lb_n_buckets_minus_1)));
-          dpo1 = load_balance_get_bucket_i(lb1,
-                                           (hash_c1 &
-                                            (lb1->lb_n_buckets_minus_1)));
-
-          next0 = dpo0->dpoi_next_node;
-          next1 = dpo1->dpoi_next_node;
-
-          vnet_buffer (b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-          vnet_buffer (b1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
-
-          vlib_increment_combined_counter
-              (cm, cpu_index, lbi0, 1,
-               vlib_buffer_length_in_chain (vm, b0));
-          vlib_increment_combined_counter
-              (cm, cpu_index, lbi1, 1,
-               vlib_buffer_length_in_chain (vm, b1));
-
-          /*
-           * before we pop the label copy th values we need to maintain.
-           * The label header is in network byte order.
-           *  last byte is the TTL.
-           *  bits 2 to 4 inclusive are the EXP bits
-           */
-          vnet_buffer (b0)->mpls.ttl = ((char*)h0)[3];
-          vnet_buffer (b0)->mpls.exp = (((char*)h0)[2] & 0xe) >> 1;
-          vnet_buffer (b0)->mpls.first = 1;
-          vnet_buffer (b1)->mpls.ttl = ((char*)h1)[3];
-          vnet_buffer (b1)->mpls.exp = (((char*)h1)[2] & 0xe) >> 1;
-          vnet_buffer (b1)->mpls.first = 1;
-
-          /*
-           * pop the label that was just used in the lookup
-           */
-          vlib_buffer_advance(b0, sizeof(*h0));
-          vlib_buffer_advance(b1, sizeof(*h1));
-
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-          {
-              mpls_lookup_trace_t *tr = vlib_add_trace (vm, node,
-                                                        b0, sizeof (*tr));
-              tr->next_index = next0;
-              tr->lb_index = lbi0;
-              tr->lfib_index = lfib_index0;
-              tr->hash = hash_c0;
-              tr->label_net_byte_order = h0->label_exp_s_ttl;
-          }
-
-          if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
-          {
-              mpls_lookup_trace_t *tr = vlib_add_trace (vm, node,
-                                                        b1, sizeof (*tr));
-              tr->next_index = next1;
-              tr->lb_index = lbi1;
-              tr->lfib_index = lfib_index1;
-              tr->hash = hash_c1;
-              tr->label_net_byte_order = h1->label_exp_s_ttl;
-          }
-
-          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-                                           to_next, n_left_to_next,
-                                           bi0, bi1, next0, next1);
-        }
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-      {
-          u32 lbi0, next0, lfib_index0, bi0, hash_c0;
-          const mpls_unicast_header_t * h0;
-          const load_balance_t *lb0;
-          const dpo_id_t *dpo0;
-          vlib_buffer_t * b0;
-
-          bi0 = from[0];
-          to_next[0] = bi0;
-          from += 1;
-          to_next += 1;
-          n_left_from -= 1;
-          n_left_to_next -= 1;
-
-          b0 = vlib_get_buffer (vm, bi0);
-          h0 = vlib_buffer_get_current (b0);
-
-          lfib_index0 = vec_elt(mm->fib_index_by_sw_if_index,
-                                vnet_buffer(b0)->sw_if_index[VLIB_RX]);
-
-          lbi0 = mpls_fib_table_forwarding_lookup(lfib_index0, h0);
-	  lb0 = load_balance_get(lbi0);
-
-          hash_c0 = vnet_buffer(b0)->ip.flow_hash = 0;
-          if (PREDICT_FALSE(lb0->lb_n_buckets > 1))
-          {
-              hash_c0 = vnet_buffer (b0)->ip.flow_hash =
-                  mpls_compute_flow_hash(h0, lb0->lb_hash_config);
-          }
-
-          ASSERT (lb0->lb_n_buckets > 0);
-          ASSERT (is_pow2 (lb0->lb_n_buckets));
-
-          dpo0 = load_balance_get_bucket_i(lb0,
-                                           (hash_c0 &
-                                            (lb0->lb_n_buckets_minus_1)));
-
-          next0 = dpo0->dpoi_next_node;
-          vnet_buffer (b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-
-          vlib_increment_combined_counter
-              (cm, cpu_index, lbi0, 1,
-               vlib_buffer_length_in_chain (vm, b0));
-
-          /*
-           * before we pop the label copy th values we need to maintain.
-           * The label header is in network byte order.
-           *  last byte is the TTL.
-           *  bits 2 to 4 inclusive are the EXP bits
-           */
-          vnet_buffer (b0)->mpls.ttl = ((char*)h0)[3];
-          vnet_buffer (b0)->mpls.exp = (((char*)h0)[2] & 0xe) >> 1;
-          vnet_buffer (b0)->mpls.first = 1;
-
-          /*
-           * pop the label that was just used in the lookup
-           */
-          vlib_buffer_advance(b0, sizeof(*h0));
-
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-          {
-              mpls_lookup_trace_t *tr = vlib_add_trace (vm, node,
-                                                        b0, sizeof (*tr));
-              tr->next_index = next0;
-              tr->lb_index = lbi0;
-              tr->lfib_index = lfib_index0;
-              tr->hash = hash_c0;
-              tr->label_net_byte_order = h0->label_exp_s_ttl;
-          }
-
-          vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-                                           to_next, n_left_to_next,
-                                           bi0, next0);
-        }
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, mpls_lookup_node.index,
-                               MPLS_ERROR_PKTS_DECAP, from_frame->n_vectors);
-  return from_frame->n_vectors;
-}
-
-static char * mpls_error_strings[] = {
-#define mpls_error(n,s) s,
-#include "error.def"
-#undef mpls_error
-};
-
-VLIB_REGISTER_NODE (mpls_lookup_node) = {
-  .function = mpls_lookup,
-  .name = "mpls-lookup",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-  .n_errors = MPLS_N_ERROR,
-  .error_strings = mpls_error_strings,
-
-  .sibling_of = "ip4-lookup",
-
-  .format_buffer = format_mpls_header,
-  .format_trace = format_mpls_lookup_trace,
-  .unformat_buffer = unformat_mpls_header,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_lookup_node, mpls_lookup)
-
-typedef struct {
-  u32 next_index;
-  u32 lb_index;
-  u32 hash;
-} mpls_load_balance_trace_t;
-
-static u8 *
-format_mpls_load_balance_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  mpls_load_balance_trace_t * t = va_arg (*args, mpls_load_balance_trace_t *);
-
-  s = format (s, "MPLS: next [%d], LB index %d hash %d",
-              t->next_index, t->lb_index, t->hash);
-  return s;
-}
-
-always_inline uword
-mpls_load_balance (vlib_main_t * vm,
-                  vlib_node_runtime_t * node,
-                  vlib_frame_t * frame)
-{
-  vlib_combined_counter_main_t * cm = &load_balance_main.lbm_via_counters;
-  u32 n_left_from, n_left_to_next, * from, * to_next;
-  u32 cpu_index = os_get_cpu_number();
-  u32 next;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next,
-                           to_next, n_left_to_next);
-
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-        {
-          mpls_lookup_next_t next0, next1;
-          const load_balance_t *lb0, *lb1;
-          vlib_buffer_t * p0, *p1;
-          u32 pi0, lbi0, hc0, pi1, lbi1, hc1;
-          const mpls_unicast_header_t *mpls0, *mpls1;
-          const dpo_id_t *dpo0, *dpo1;
-
-          /* Prefetch next iteration. */
-          {
-            vlib_buffer_t * p2, * p3;
-
-            p2 = vlib_get_buffer (vm, from[2]);
-            p3 = vlib_get_buffer (vm, from[3]);
-
-            vlib_prefetch_buffer_header (p2, STORE);
-            vlib_prefetch_buffer_header (p3, STORE);
-
-            CLIB_PREFETCH (p2->data, sizeof (mpls0[0]), STORE);
-            CLIB_PREFETCH (p3->data, sizeof (mpls0[0]), STORE);
-          }
-
-          pi0 = to_next[0] = from[0];
-          pi1 = to_next[1] = from[1];
-
-          from += 2;
-          n_left_from -= 2;
-          to_next += 2;
-          n_left_to_next -= 2;
-
-          p0 = vlib_get_buffer (vm, pi0);
-          p1 = vlib_get_buffer (vm, pi1);
-
-          mpls0 = vlib_buffer_get_current (p0);
-          mpls1 = vlib_buffer_get_current (p1);
-          lbi0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-          lbi1 = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
-
-          lb0 = load_balance_get(lbi0);
-          lb1 = load_balance_get(lbi1);
-
-          /*
-           * this node is for via FIBs we can re-use the hash value from the
-           * to node if present.
-           * We don't want to use the same hash value at each level in the recursion
-           * graph as that would lead to polarisation
-           */
-          hc0 = vnet_buffer (p0)->ip.flow_hash = 0;
-          hc1 = vnet_buffer (p1)->ip.flow_hash = 0;
-
-          if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
-          {
-              if (PREDICT_TRUE (vnet_buffer(p0)->ip.flow_hash))
-              {
-                  hc0 = vnet_buffer(p0)->ip.flow_hash = vnet_buffer(p0)->ip.flow_hash >> 1;
-              }
-              else
-              {
-                  hc0 = vnet_buffer(p0)->ip.flow_hash = mpls_compute_flow_hash(mpls0, hc0);
-              }
-          }
-          if (PREDICT_FALSE (lb1->lb_n_buckets > 1))
-          {
-              if (PREDICT_TRUE (vnet_buffer(p1)->ip.flow_hash))
-              {
-                  hc1 = vnet_buffer(p1)->ip.flow_hash = vnet_buffer(p1)->ip.flow_hash >> 1;
-              }
-              else
-              {
-                  hc1 = vnet_buffer(p1)->ip.flow_hash = mpls_compute_flow_hash(mpls1, hc1);
-              }
-          }
-
-          dpo0 = load_balance_get_bucket_i(lb0, hc0 & (lb0->lb_n_buckets_minus_1));
-          dpo1 = load_balance_get_bucket_i(lb1, hc1 & (lb1->lb_n_buckets_minus_1));
-
-          next0 = dpo0->dpoi_next_node;
-          next1 = dpo1->dpoi_next_node;
-
-          vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-          vnet_buffer (p1)->ip.adj_index[VLIB_TX] = dpo1->dpoi_index;
-
-          vlib_increment_combined_counter
-              (cm, cpu_index, lbi0, 1,
-               vlib_buffer_length_in_chain (vm, p0));
-          vlib_increment_combined_counter
-              (cm, cpu_index, lbi1, 1,
-               vlib_buffer_length_in_chain (vm, p1));
-
-          if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED))
-          {
-              mpls_load_balance_trace_t *tr = vlib_add_trace (vm, node,
-                                                              p0, sizeof (*tr));
-              tr->next_index = next0;
-              tr->lb_index = lbi0;
-              tr->hash = hc0;
-          }
-
-          vlib_validate_buffer_enqueue_x2 (vm, node, next,
-                                           to_next, n_left_to_next,
-                                           pi0, pi1, next0, next1);
-       }
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-        {
-          mpls_lookup_next_t next0;
-          const load_balance_t *lb0;
-          vlib_buffer_t * p0;
-          u32 pi0, lbi0, hc0;
-          const mpls_unicast_header_t *mpls0;
-          const dpo_id_t *dpo0;
-
-          pi0 = from[0];
-          to_next[0] = pi0;
-          from += 1;
-          to_next += 1;
-          n_left_to_next -= 1;
-          n_left_from -= 1;
-
-          p0 = vlib_get_buffer (vm, pi0);
-
-          mpls0 = vlib_buffer_get_current (p0);
-          lbi0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-
-          lb0 = load_balance_get(lbi0);
-
-          hc0 = vnet_buffer (p0)->ip.flow_hash = 0;
-          if (PREDICT_FALSE (lb0->lb_n_buckets > 1))
-          {
-              if (PREDICT_TRUE (vnet_buffer(p0)->ip.flow_hash))
-              {
-                  hc0 = vnet_buffer(p0)->ip.flow_hash = vnet_buffer(p0)->ip.flow_hash >> 1;
-              }
-              else
-              {
-                  hc0 = vnet_buffer(p0)->ip.flow_hash = mpls_compute_flow_hash(mpls0, hc0);
-              }
-          }
-
-          dpo0 = load_balance_get_bucket_i(lb0, hc0 & (lb0->lb_n_buckets_minus_1));
-
-          next0 = dpo0->dpoi_next_node;
-          vnet_buffer (p0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index;
-
-          vlib_increment_combined_counter
-              (cm, cpu_index, lbi0, 1,
-               vlib_buffer_length_in_chain (vm, p0));
-
-          vlib_validate_buffer_enqueue_x1 (vm, node, next,
-                                           to_next, n_left_to_next,
-                                           pi0, next0);
-        }
-
-      vlib_put_next_frame (vm, node, next, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (mpls_load_balance_node) = {
-  .function = mpls_load_balance,
-  .name = "mpls-load-balance",
-  .vector_size = sizeof (u32),
-  .sibling_of = "mpls-lookup",
-
-  .format_trace = format_mpls_load_balance_trace,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_load_balance_node, mpls_load_balance)
diff --git a/vnet/vnet/mpls/mpls_output.c b/vnet/vnet/mpls/mpls_output.c
deleted file mode 100644
index 8292a0cb..00000000
--- a/vnet/vnet/mpls/mpls_output.c
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * mpls_output.c: MPLS Adj rewrite
- *
- * Copyright (c) 2012-2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ip/ip.h>
-#include <vnet/mpls/mpls.h>
-
-typedef struct {
-  /* Adjacency taken. */
-  u32 adj_index;
-  u32 flow_hash;
-
-  /* Packet data, possibly *after* rewrite. */
-  u8 packet_data[64 - 1*sizeof(u32)];
-} mpls_output_trace_t;
-
-static u8 *
-format_mpls_output_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  mpls_output_trace_t * t = va_arg (*args, mpls_output_trace_t *);
-  vnet_main_t * vnm = vnet_get_main();
-  uword indent = format_get_indent (s);
-
-  s = format (s, "adj-idx %d : %U flow hash: 0x%08x",
-              t->adj_index,
-              format_ip_adjacency, t->adj_index, FORMAT_IP_ADJACENCY_NONE,
-	      t->flow_hash);
-  s = format (s, "\n%U%U",
-              format_white_space, indent,
-              format_ip_adjacency_packet_data,
-              vnm, t->adj_index,
-              t->packet_data, sizeof (t->packet_data));
-  return s;
-}
-
-static inline uword
-mpls_output_inline (vlib_main_t * vm,
-                    vlib_node_runtime_t * node,
-                    vlib_frame_t * from_frame,
-		    int is_midchain)
-{
-  u32 n_left_from, next_index, * from, * to_next, cpu_index;
-  vlib_node_runtime_t * error_node;
-  u32 n_left_to_next;
-
-  cpu_index = os_get_cpu_number();
-  error_node = vlib_node_get_runtime (vm, mpls_output_node.index);
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index,
-                           to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-        {
-          ip_adjacency_t * adj0;
-          mpls_unicast_header_t *hdr0;
-          vlib_buffer_t * p0;
-          u32 pi0, rw_len0, adj_index0, next0, error0;
-
-          ip_adjacency_t * adj1;
-          mpls_unicast_header_t *hdr1;
-          vlib_buffer_t * p1;
-          u32 pi1, rw_len1, adj_index1, next1, error1;
-
-          /* Prefetch next iteration. */
-          {
-            vlib_buffer_t * p2, * p3;
-
-            p2 = vlib_get_buffer (vm, from[2]);
-            p3 = vlib_get_buffer (vm, from[3]);
-
-            vlib_prefetch_buffer_header (p2, STORE);
-            vlib_prefetch_buffer_header (p3, STORE);
-
-            CLIB_PREFETCH (p2->data, sizeof (hdr0[0]), STORE);
-            CLIB_PREFETCH (p3->data, sizeof (hdr1[0]), STORE);
-          }
-
-          pi0 = to_next[0] = from[0];
-          pi1 = to_next[1] = from[1];
-
-          from += 2;
-          n_left_from -= 2;
-          to_next += 2;
-          n_left_to_next -= 2;
-
-          p0 = vlib_get_buffer (vm, pi0);
-          p1 = vlib_get_buffer (vm, pi1);
-
-          adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-          adj_index1 = vnet_buffer (p1)->ip.adj_index[VLIB_TX];
-
-          /* We should never rewrite a pkt using the MISS adjacency */
-          ASSERT(adj_index0);
-          ASSERT(adj_index1);
-
-          adj0 = adj_get(adj_index0);
-          adj1 = adj_get(adj_index1);
-          hdr0 = vlib_buffer_get_current (p0);
-          hdr1 = vlib_buffer_get_current (p1);
-
-          /* Guess we are only writing on simple Ethernet header. */
-          vnet_rewrite_two_headers (adj0[0], adj1[0], hdr0, hdr1,
-                                   sizeof (ethernet_header_t));
-
-          /* Update packet buffer attributes/set output interface. */
-          rw_len0 = adj0[0].rewrite_header.data_bytes;
-          rw_len1 = adj1[0].rewrite_header.data_bytes;
-
-          if (PREDICT_FALSE (rw_len0 > sizeof(ethernet_header_t)))
-              vlib_increment_combined_counter
-                  (&adjacency_counters,
-                   cpu_index, adj_index0,
-                   /* packet increment */ 0,
-                   /* byte increment */ rw_len0-sizeof(ethernet_header_t));
-          if (PREDICT_FALSE (rw_len1 > sizeof(ethernet_header_t)))
-              vlib_increment_combined_counter
-                  (&adjacency_counters,
-                   cpu_index, adj_index1,
-                   /* packet increment */ 0,
-                   /* byte increment */ rw_len1-sizeof(ethernet_header_t));
-
-          /* Check MTU of outgoing interface. */
-          if (PREDICT_TRUE(vlib_buffer_length_in_chain (vm, p0) <=
-                           adj0[0].rewrite_header.max_l3_packet_bytes))
-            {
-              p0->current_data -= rw_len0;
-              p0->current_length += rw_len0;
-
-              vnet_buffer (p0)->sw_if_index[VLIB_TX] =
-                  adj0[0].rewrite_header.sw_if_index;
-              next0 = adj0[0].rewrite_header.next_index;
-              error0 = IP4_ERROR_NONE;
-
-              if (is_midchain)
-                {
-                  adj0->sub_type.midchain.fixup_func(vm, adj0, p0);
-                }
-            }
-          else
-            {
-              error0 = IP4_ERROR_MTU_EXCEEDED;
-              next0 = MPLS_OUTPUT_NEXT_DROP;
-            }
-          if (PREDICT_TRUE(vlib_buffer_length_in_chain (vm, p1) <=
-                           adj1[0].rewrite_header.max_l3_packet_bytes))
-            {
-              p1->current_data -= rw_len1;
-              p1->current_length += rw_len1;
-
-              vnet_buffer (p1)->sw_if_index[VLIB_TX] =
-                  adj1[0].rewrite_header.sw_if_index;
-              next1 = adj1[0].rewrite_header.next_index;
-              error1 = IP4_ERROR_NONE;
-
-              if (is_midchain)
-                {
-                  adj1->sub_type.midchain.fixup_func(vm, adj1, p1);
-                }
-            }
-          else
-            {
-              error1 = IP4_ERROR_MTU_EXCEEDED;
-              next1 = MPLS_OUTPUT_NEXT_DROP;
-            }
-
-          p0->error = error_node->errors[error0];
-          p1->error = error_node->errors[error1];
-
-          if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED))
-            {
-              mpls_output_trace_t *tr = vlib_add_trace (vm, node,
-                                                        p0, sizeof (*tr));
-              tr->adj_index = vnet_buffer(p0)->ip.adj_index[VLIB_TX];
-              tr->flow_hash = vnet_buffer(p0)->ip.flow_hash;
-            }
-          if (PREDICT_FALSE(p1->flags & VLIB_BUFFER_IS_TRACED))
-            {
-              mpls_output_trace_t *tr = vlib_add_trace (vm, node,
-                                                        p1, sizeof (*tr));
-              tr->adj_index = vnet_buffer(p1)->ip.adj_index[VLIB_TX];
-              tr->flow_hash = vnet_buffer(p1)->ip.flow_hash;
-            }
-
-          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-                                           to_next, n_left_to_next,
-                                           pi0, pi1, next0, next1);
-        }
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-        {
-	  ip_adjacency_t * adj0;
-          mpls_unicast_header_t *hdr0;
-	  vlib_buffer_t * p0;
-	  u32 pi0, rw_len0, adj_index0, next0, error0;
-
-	  pi0 = to_next[0] = from[0];
-
-	  p0 = vlib_get_buffer (vm, pi0);
-
-	  adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-
-          /* We should never rewrite a pkt using the MISS adjacency */
-          ASSERT(adj_index0);
-
-	  adj0 = adj_get(adj_index0);
-      	  hdr0 = vlib_buffer_get_current (p0);
-
-	  /* Guess we are only writing on simple Ethernet header. */
-          vnet_rewrite_one_header (adj0[0], hdr0, 
-                                   sizeof (ethernet_header_t));
-          
-          /* Update packet buffer attributes/set output interface. */
-          rw_len0 = adj0[0].rewrite_header.data_bytes;
-          
-          if (PREDICT_FALSE (rw_len0 > sizeof(ethernet_header_t)))
-              vlib_increment_combined_counter 
-                  (&adjacency_counters,
-                   cpu_index, adj_index0, 
-                   /* packet increment */ 0,
-                   /* byte increment */ rw_len0-sizeof(ethernet_header_t));
-          
-          /* Check MTU of outgoing interface. */
-          if (PREDICT_TRUE(vlib_buffer_length_in_chain (vm, p0) <=
-                           adj0[0].rewrite_header.max_l3_packet_bytes))
-            {
-              p0->current_data -= rw_len0;
-              p0->current_length += rw_len0;
-
-              vnet_buffer (p0)->sw_if_index[VLIB_TX] =
-                  adj0[0].rewrite_header.sw_if_index;
-              next0 = adj0[0].rewrite_header.next_index;
-              error0 = IP4_ERROR_NONE;
-
-	      if (is_midchain)
-	        {
-		  adj0->sub_type.midchain.fixup_func(vm, adj0, p0);
-		}
-            }
-          else
-            {
-              error0 = IP4_ERROR_MTU_EXCEEDED;
-              next0 = MPLS_OUTPUT_NEXT_DROP;
-            }
-	  p0->error = error_node->errors[error0];
-
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-      
-          if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED)) 
-            {
-              mpls_output_trace_t *tr = vlib_add_trace (vm, node, 
-                                                        p0, sizeof (*tr));
-              tr->adj_index = vnet_buffer(p0)->ip.adj_index[VLIB_TX];
-              tr->flow_hash = vnet_buffer(p0)->ip.flow_hash;
-            }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, next0);
-        }
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, mpls_output_node.index,
-                               MPLS_ERROR_PKTS_ENCAP,
-                               from_frame->n_vectors);
-
-  return from_frame->n_vectors;
-}
-
-static char * mpls_error_strings[] = {
-#define mpls_error(n,s) s,
-#include "error.def"
-#undef mpls_error
-};
-
-static inline uword
-mpls_output (vlib_main_t * vm,
-             vlib_node_runtime_t * node,
-             vlib_frame_t * from_frame)
-{
-    return (mpls_output_inline(vm, node, from_frame, /* is_midchain */ 0));
-}
-
-VLIB_REGISTER_NODE (mpls_output_node) = {
-  .function = mpls_output,
-  .name = "mpls-output",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-  .n_errors = MPLS_N_ERROR,
-  .error_strings = mpls_error_strings,
-
-  .n_next_nodes = MPLS_OUTPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [MPLS_OUTPUT_NEXT_##s] = n,
-    foreach_mpls_output_next
-#undef _
-  },
-
-  .format_trace = format_mpls_output_trace,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_output_node, mpls_output)
-
-static inline uword
-mpls_midchain (vlib_main_t * vm,
-               vlib_node_runtime_t * node,
-               vlib_frame_t * from_frame)
-{
-    return (mpls_output_inline(vm, node, from_frame, /* is_midchain */ 1));
-}
-
-VLIB_REGISTER_NODE (mpls_midchain_node) = {
-  .function = mpls_midchain,
-  .name = "mpls-midchain",
-  .vector_size = sizeof (u32),
-
-  .format_trace = format_mpls_output_trace,
-
-  .sibling_of = "mpls-output",
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_midchain_node, mpls_midchain)
-
-/**
- * @brief Next index values from the MPLS incomplete adj node
- */
-#define foreach_mpls_adj_incomplete_next       	\
-_(DROP, "error-drop")                   \
-_(IP4,  "ip4-arp")                      \
-_(IP6,  "ip6-discover-neighbor")
-
-typedef enum {
-#define _(s,n) MPLS_ADJ_INCOMPLETE_NEXT_##s,
-  foreach_mpls_adj_incomplete_next
-#undef _
-  MPLS_ADJ_INCOMPLETE_N_NEXT,
-} mpls_adj_incomplete_next_t;
-
-/**
- * @brief A struct to hold tracing information for the MPLS label imposition
- * node.
- */
-typedef struct mpls_adj_incomplete_trace_t_
-{
-    u32 next;
-} mpls_adj_incomplete_trace_t;
-
-
-/**
- * @brief Graph node for incomplete MPLS adjacency.
- * This node will push traffic to either the v4-arp or v6-nd node
- * based on the next-hop proto of the adj.
- * We pay a cost for this 'routing' node, but an incomplete adj is the
- * exception case.
- */
-static inline uword
-mpls_adj_incomplete (vlib_main_t * vm,
-                     vlib_node_runtime_t * node,
-                     vlib_frame_t * from_frame)
-{
-    u32 n_left_from, next_index, * from, * to_next;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-                           to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-        {
-          u32 pi0, next0, adj_index0;
-	  ip_adjacency_t * adj0;
-	  vlib_buffer_t * p0;
-
- 	  pi0 = to_next[0] = from[0];
-	  p0 = vlib_get_buffer (vm, pi0);
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-          adj_index0 = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-          ASSERT(adj_index0);
-
-	  adj0 = adj_get(adj_index0);
-
-          if (PREDICT_TRUE(FIB_PROTOCOL_IP4 == adj0->ia_nh_proto))
-          {
-              next0 = MPLS_ADJ_INCOMPLETE_NEXT_IP4;
-          }
-          else
-          {
-              next0 = MPLS_ADJ_INCOMPLETE_NEXT_IP6;
-          }              
-
-	  if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED)) 
-	  {
-	      mpls_adj_incomplete_trace_t *tr =
-		  vlib_add_trace (vm, node, p0, sizeof (*tr));
-	      tr->next = next0;
-	  }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   pi0, next0);
-        }
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-static u8 *
-format_mpls_adj_incomplete_trace (u8 * s, va_list * args)
-{
-    CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-    CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-    mpls_adj_incomplete_trace_t * t;
-    uword indent;
-
-    t = va_arg (*args, mpls_adj_incomplete_trace_t *);
-    indent = format_get_indent (s);
-
-    s = format (s, "%Unext:%d",
-                format_white_space, indent,
-                t->next);
-    return (s);
-}
-
-VLIB_REGISTER_NODE (mpls_adj_incomplete_node) = {
-  .function = mpls_adj_incomplete,
-  .name = "mpls-adj-incomplete",
-  .format_trace = format_mpls_adj_incomplete_trace,
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-  .n_errors = MPLS_N_ERROR,
-  .error_strings = mpls_error_strings,
-
-  .n_next_nodes = MPLS_ADJ_INCOMPLETE_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [MPLS_ADJ_INCOMPLETE_NEXT_##s] = n,
-    foreach_mpls_adj_incomplete_next
-#undef _
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_adj_incomplete_node,
-                              mpls_adj_incomplete)
diff --git a/vnet/vnet/mpls/mpls_tunnel.c b/vnet/vnet/mpls/mpls_tunnel.c
deleted file mode 100644
index 8d1e30a3..00000000
--- a/vnet/vnet/mpls/mpls_tunnel.c
+++ /dev/null
@@ -1,787 +0,0 @@
-/*
- * mpls_tunnel.c: MPLS tunnel interfaces (i.e. for RSVP-TE)
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/mpls/mpls_tunnel.h>
-#include <vnet/ip/ip.h>
-#include <vnet/fib/fib_path_list.h>
-#include <vnet/adj/adj_midchain.h>
-
-/**
- * @brief pool of tunnel instances
- */
-static mpls_tunnel_t *mpls_tunnel_pool;
-
-/**
- * @brief Pool of free tunnel SW indices - i.e. recycled indices
- */
-static u32 * mpls_tunnel_free_hw_if_indices;
-
-/**
- * @brief DB of SW index to tunnel index
- */
-static u32 *mpls_tunnel_db;
-
-/**
- * @brief Get a tunnel object from a SW interface index
- */
-static mpls_tunnel_t*
-mpls_tunnel_get_from_sw_if_index (u32 sw_if_index)
-{
-    if ((vec_len(mpls_tunnel_db) < sw_if_index) ||
-	(~0 == mpls_tunnel_db[sw_if_index]))
-	return (NULL);
-
-    return (pool_elt_at_index(mpls_tunnel_pool,
-			      mpls_tunnel_db[sw_if_index]));
-}
-
-/**
- * @brief Return true if the label stack is imp-null only
- */
-static fib_forward_chain_type_t
-mpls_tunnel_get_fwd_chain_type (const mpls_tunnel_t *mt)
-{
-    if ((1 == vec_len(mt->mt_label_stack)) &&
-	(mt->mt_label_stack[0] == MPLS_IETF_IMPLICIT_NULL_LABEL))
-    {
-	/*
-	 * the only label in the label stack is implicit null
-	 * we need to build an IP chain.
-	 */
-	if (FIB_PROTOCOL_IP4 == fib_path_list_get_proto(mt->mt_path_list))
-	{
-	    return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
-	}
-	else
-	{
-	    return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
-	}
-    }
-    else
-    {
-	return (FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS);
-    }
-}
-
-/**
- * @brief Build a rewrite string for the MPLS tunnel.
- *
- * We have choices here;
- *  1 - have an Adjacency with a zero length string and stack it on
- *       MPLS label objects
- *  2 - put the label header rewrites in the adjacency string.
- *
- * We choose 2 since it results in fewer graph nodes in the egress path
- */
-static u8*
-mpls_tunnel_build_rewrite (vnet_main_t * vnm,
-			   u32 sw_if_index,
-			   vnet_link_t link_type,
-			   const void *dst_address)
-{
-    mpls_unicast_header_t *muh;
-    mpls_tunnel_t *mt;
-    u8 *rewrite;
-    u32 mti, ii;
-
-    rewrite = NULL;
-    mti = mpls_tunnel_db[sw_if_index];
-    mt = pool_elt_at_index(mpls_tunnel_pool, mti);
-
-    /*
-     * The vector must be allocated as u8 so the length is correct
-     */
-    ASSERT(0 < vec_len(mt->mt_label_stack));
-    vec_validate(rewrite, (sizeof(*muh) * vec_len(mt->mt_label_stack)) - 1);
-    ASSERT(rewrite);
-    muh = (mpls_unicast_header_t *)rewrite;
-
-    /*
-     * The last (inner most) label in the stack may be EOS, all the rest Non-EOS
-     */
-    for (ii = 0; ii < vec_len(mt->mt_label_stack)-1; ii++)
-    {
-	vnet_mpls_uc_set_label(&muh[ii].label_exp_s_ttl, mt->mt_label_stack[ii]);
-	vnet_mpls_uc_set_ttl(&muh[ii].label_exp_s_ttl, 255);
-	vnet_mpls_uc_set_exp(&muh[ii].label_exp_s_ttl, 0);
-	vnet_mpls_uc_set_s(&muh[ii].label_exp_s_ttl, MPLS_NON_EOS);
-	muh[ii].label_exp_s_ttl = clib_host_to_net_u32(muh[ii].label_exp_s_ttl);
-    }
-
-    vnet_mpls_uc_set_label(&muh[ii].label_exp_s_ttl, mt->mt_label_stack[ii]);
-    vnet_mpls_uc_set_ttl(&muh[ii].label_exp_s_ttl, 255);
-    vnet_mpls_uc_set_exp(&muh[ii].label_exp_s_ttl, 0);
-
-    if ((VNET_LINK_MPLS == link_type) &&
-	(mt->mt_label_stack[ii] != MPLS_IETF_IMPLICIT_NULL_LABEL))
-    {
-	vnet_mpls_uc_set_s(&muh[ii].label_exp_s_ttl, MPLS_NON_EOS);
-    }
-    else
-    {
-	vnet_mpls_uc_set_s(&muh[ii].label_exp_s_ttl, MPLS_EOS);
-    }
-
-    muh[ii].label_exp_s_ttl = clib_host_to_net_u32(muh[ii].label_exp_s_ttl);
-
-    return (rewrite);
-}
-
-/**
- * mpls_tunnel_stack
- *
- * 'stack' (resolve the recursion for) the tunnel's midchain adjacency
- */
-static void
-mpls_tunnel_stack (adj_index_t ai)
-{
-    ip_adjacency_t *adj;
-    mpls_tunnel_t *mt;
-    u32 sw_if_index;
-
-    adj = adj_get(ai);
-    sw_if_index = adj->rewrite_header.sw_if_index;
-
-    mt = mpls_tunnel_get_from_sw_if_index(sw_if_index);
-
-    if (NULL == mt)
-	return;
-
-    /*
-     * find the adjacency that is contributed by the FIB path-list
-     * that this tunnel resovles via, and use it as the next adj
-     * in the midchain
-     */
-    if (vnet_hw_interface_get_flags(vnet_get_main(),
-				    mt->mt_hw_if_index) &
-	VNET_HW_INTERFACE_FLAG_LINK_UP)
-    {
-	dpo_id_t dpo = DPO_INVALID;
-
-	fib_path_list_contribute_forwarding(mt->mt_path_list,
-					    mpls_tunnel_get_fwd_chain_type(mt),
-					    &dpo);
-
-	if (DPO_LOAD_BALANCE == dpo.dpoi_type)
-	{
-	    /*
-	     * we don't support multiple paths, so no need to load-balance.
-	     * pull the first and only choice and stack directly on that.
-	     */
-	    load_balance_t *lb;
-
-	    lb = load_balance_get (dpo.dpoi_index);
-
-	    ASSERT(1 == lb->lb_n_buckets);
-
-	    dpo_copy(&dpo, load_balance_get_bucket_i (lb, 0));
-	}
-
-	adj_nbr_midchain_stack(ai, &dpo);
-	dpo_reset(&dpo);
-    }
-    else
-    {
-	adj_nbr_midchain_unstack(ai);
-    }
-}
-
-/**
- * @brief Call back when restacking all adjacencies on a MPLS interface
- */
-static adj_walk_rc_t
-mpls_adj_walk_cb (adj_index_t ai,
-		 void *ctx)
-{
-    mpls_tunnel_stack(ai);
-
-    return (ADJ_WALK_RC_CONTINUE);
-}
-
-static void
-mpls_tunnel_restack (mpls_tunnel_t *mt)
-{
-    fib_protocol_t proto;
-
-    /*
-     * walk all the adjacencies on the MPLS interface and restack them
-     */
-    FOR_EACH_FIB_PROTOCOL(proto)
-    {
-	adj_nbr_walk(mt->mt_sw_if_index,
-		     proto,
-		     mpls_adj_walk_cb,
-		     NULL);
-    }
-}
-
-static clib_error_t *
-mpls_tunnel_admin_up_down (vnet_main_t * vnm,
-			   u32 hw_if_index,
-			   u32 flags)
-{
-    vnet_hw_interface_t * hi;
-    mpls_tunnel_t *mt;
-
-    hi = vnet_get_hw_interface (vnm, hw_if_index);
-
-    mt = mpls_tunnel_get_from_sw_if_index(hi->sw_if_index);
-
-    if (NULL == mt)
-	return (NULL);
-
-    if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
-	vnet_hw_interface_set_flags (vnm, hw_if_index,
-				     VNET_HW_INTERFACE_FLAG_LINK_UP);
-    else
-	vnet_hw_interface_set_flags (vnm, hw_if_index, 0 /* down */);
-
-    mpls_tunnel_restack(mt);
-
-    return (NULL);
-}
-
-/**
- * @brief Fixup the adj rewrite post encap. This is a no-op since the
- * rewrite is a stack of labels.
- */
-static void
-mpls_tunnel_fixup (vlib_main_t *vm,
-		   ip_adjacency_t *adj,
-		   vlib_buffer_t *b0)
-{
-}
-
-static void
-mpls_tunnel_update_adj (vnet_main_t * vnm,
-			u32 sw_if_index,
-			adj_index_t ai)
-{
-    adj_nbr_midchain_update_rewrite(
-	ai, mpls_tunnel_fixup, 
-	ADJ_MIDCHAIN_FLAG_NONE,
-	mpls_tunnel_build_rewrite(vnm, sw_if_index,
-				  adj_get_link_type(ai),
-				  NULL));
-
-    mpls_tunnel_stack(ai);
-}
-
-static u8 *
-format_mpls_tunnel_name (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  return format (s, "mpls-tunnel%d", dev_instance);
-}
-
-static u8 *
-format_mpls_tunnel_device (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  CLIB_UNUSED (int verbose) = va_arg (*args, int);
-
-  return (format (s, "MPLS-tunnel: id %d\n", dev_instance));
-}
-
-/**
- * @brief Packet trace structure
- */
-typedef struct mpls_tunnel_trace_t_
-{
-    /**
-   * Tunnel-id / index in tunnel vector
-   */
-  u32 tunnel_id;
-} mpls_tunnel_trace_t;
-
-static u8 *
-format_mpls_tunnel_tx_trace (u8 * s,
-			     va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  mpls_tunnel_trace_t * t = va_arg (*args, mpls_tunnel_trace_t *);
-
-  s = format (s, "MPLS: tunnel %d", t->tunnel_id);
-  return s;
-}
-
-/**
- * @brief TX function. Only called L2. L3 traffic uses the adj-midchains
- */
-static uword
-mpls_tunnel_tx (vlib_main_t * vm,
-		vlib_node_runtime_t * node,
-		vlib_frame_t * frame)
-{
-  u32 next_index;
-  u32 * from, * to_next, n_left_from, n_left_to_next;
-  vnet_interface_output_runtime_t * rd = (void *) node->runtime_data;
-  const mpls_tunnel_t *mt;
-
-  mt = pool_elt_at_index(mpls_tunnel_pool, rd->dev_instance);
-
-  /* Vector of buffer / pkt indices we're supposed to process */
-  from = vlib_frame_vector_args (frame);
-
-  /* Number of buffers / pkts */
-  n_left_from = frame->n_vectors;
-
-  /* Speculatively send the first buffer to the last disposition we used */
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      /* set up to enqueue to our disposition with index = next_index */
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /*
-       * FIXME DUAL LOOP
-       */
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t * b0;
-	  u32 bi0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer(vm, bi0);
-
-	  vnet_buffer(b0)->ip.adj_index[VLIB_TX] = mt->mt_l2_adj;
-
-	  if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      mpls_tunnel_trace_t *tr = vlib_add_trace (vm, node,
-						   b0, sizeof (*tr));
-	      tr->tunnel_id = rd->dev_instance;
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, mt->mt_l2_tx_arc);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-VNET_DEVICE_CLASS (mpls_tunnel_class) = {
-    .name = "MPLS tunnel device",
-    .format_device_name = format_mpls_tunnel_name,
-    .format_device = format_mpls_tunnel_device,
-    .format_tx_trace = format_mpls_tunnel_tx_trace,
-    .tx_function = mpls_tunnel_tx,
-    .admin_up_down_function = mpls_tunnel_admin_up_down,
-};
-
-VNET_HW_INTERFACE_CLASS (mpls_tunnel_hw_interface_class) = {
-  .name = "MPLS-Tunnel",
-//  .format_header = format_mpls_eth_header_with_length,
-//  .unformat_header = unformat_mpls_eth_header,
-  .update_adjacency = mpls_tunnel_update_adj,
-  .build_rewrite = mpls_tunnel_build_rewrite,
-  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
-};
-
-const mpls_tunnel_t *
-mpls_tunnel_get (u32 mti)
-{
-    return (pool_elt_at_index(mpls_tunnel_pool, mti));
-}
-
-/**
- * @brief Walk all the MPLS tunnels
- */
-void
-mpls_tunnel_walk (mpls_tunnel_walk_cb_t cb,
-		  void *ctx)
-{
-    u32 mti;
-
-    pool_foreach_index(mti, mpls_tunnel_pool,
-    ({
-	cb(mti, ctx);
-    }));
-}
-
-void
-vnet_mpls_tunnel_del (u32 sw_if_index)
-{
-    mpls_tunnel_t *mt;
-
-    mt = mpls_tunnel_get_from_sw_if_index(sw_if_index);
-
-    if (NULL == mt)
-	return;
-    
-    fib_path_list_child_remove(mt->mt_path_list,
-			       mt->mt_sibling_index);
-    if (ADJ_INDEX_INVALID != mt->mt_l2_adj)
-	adj_unlock(mt->mt_l2_adj);
-
-    vec_free(mt->mt_label_stack);
-
-    vec_add1 (mpls_tunnel_free_hw_if_indices, mt->mt_hw_if_index);
-    pool_put(mpls_tunnel_pool, mt);
-    mpls_tunnel_db[sw_if_index] = ~0;
-}
-
-void
-vnet_mpls_tunnel_add (fib_route_path_t *rpaths,
-		      mpls_label_t *label_stack,
-		      u8 l2_only,
-		      u32 *sw_if_index)
-{
-    vnet_hw_interface_t * hi;
-    mpls_tunnel_t *mt;
-    vnet_main_t * vnm;
-    u32 mti;
-
-    vnm = vnet_get_main();
-    pool_get(mpls_tunnel_pool, mt);
-    memset (mt, 0, sizeof (*mt));
-    mti = mt - mpls_tunnel_pool;
-    fib_node_init(&mt->mt_node, FIB_NODE_TYPE_MPLS_TUNNEL);
-    mt->mt_l2_adj = ADJ_INDEX_INVALID;
-
-    /*
-     * Create a new, or re=use and old, tunnel HW interface
-     */
-    if (vec_len (mpls_tunnel_free_hw_if_indices) > 0)
-    {
-	mt->mt_hw_if_index = 
-	    mpls_tunnel_free_hw_if_indices[vec_len(mpls_tunnel_free_hw_if_indices)-1];
-	_vec_len (mpls_tunnel_free_hw_if_indices) -= 1;
-	hi = vnet_get_hw_interface (vnm, mt->mt_hw_if_index);
-	hi->hw_instance = mti;
-	hi->dev_instance = mti;
-    }
-    else 
-    {
-	mt->mt_hw_if_index = vnet_register_interface(
-	                         vnm,
-				 mpls_tunnel_class.index,
-				 mti,
-				 mpls_tunnel_hw_interface_class.index,
-				 mti);
-	hi = vnet_get_hw_interface(vnm, mt->mt_hw_if_index);
-    }
-
-    /*
-     * Add the new tunnel to the tunnel DB - key:SW if index
-     */
-    mt->mt_sw_if_index = hi->sw_if_index;
-    vec_validate_init_empty(mpls_tunnel_db, mt->mt_sw_if_index, ~0);
-    mpls_tunnel_db[mt->mt_sw_if_index] = mti;
-
-    /*
-     * construct a path-list from the path provided
-     */
-    mt->mt_path_list = fib_path_list_create(FIB_PATH_LIST_FLAG_SHARED, rpaths);
-    mt->mt_sibling_index = fib_path_list_child_add(mt->mt_path_list,
-						   FIB_NODE_TYPE_MPLS_TUNNEL,
-						   mti);
-
-    mt->mt_label_stack = vec_dup(label_stack);
-
-    if (l2_only)
-    {
-	mt->mt_l2_adj =
-	    adj_nbr_add_or_lock(fib_path_list_get_proto(mt->mt_path_list),
-				VNET_LINK_ETHERNET,
-				&zero_addr,
-				mt->mt_sw_if_index);
-
-	mt->mt_l2_tx_arc = vlib_node_add_named_next(vlib_get_main(),
-						    hi->tx_node_index,
-						    "adj-l2-midchain");
-    }
-
-    *sw_if_index = mt->mt_sw_if_index;
-}
-
-static clib_error_t *
-vnet_create_mpls_tunnel_command_fn (vlib_main_t * vm,
-				    unformat_input_t * input,
-				    vlib_cli_command_t * cmd)
-{
-    unformat_input_t _line_input, * line_input = &_line_input;
-    vnet_main_t * vnm = vnet_get_main();
-    u8 is_del = 0;
-    u8 l2_only = 0;
-    fib_route_path_t rpath, *rpaths = NULL;
-    mpls_label_t out_label = MPLS_LABEL_INVALID, *labels = NULL;
-    u32 sw_if_index;
-
-    memset(&rpath, 0, sizeof(rpath));
-
-    /* Get a line of input. */
-    if (! unformat_user (input, unformat_line_input, line_input))
-	return 0;
-
-    while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-	if (unformat (line_input, "del %U",
-		      unformat_vnet_sw_interface, vnm,
-		      &sw_if_index))
-	    is_del = 1;
-	else if (unformat (line_input, "add"))
-	    is_del = 0;
-	else if (unformat (line_input, "out-label %U",
-			   unformat_mpls_unicast_label, &out_label))
-	{
-	    vec_add1(labels, out_label);
-	}
-	else if (unformat (line_input, "via %U %U",
-			   unformat_ip4_address,
-			   &rpath.frp_addr.ip4,
-			   unformat_vnet_sw_interface, vnm,
-			   &rpath.frp_sw_if_index))
-	{
-	    rpath.frp_weight = 1;
-	    rpath.frp_proto = FIB_PROTOCOL_IP4;
-	}
-			 
-	else if (unformat (line_input, "via %U %U",
-			   unformat_ip6_address,
-			   &rpath.frp_addr.ip6,
-			   unformat_vnet_sw_interface, vnm,
-			   &rpath.frp_sw_if_index))
-	{
-	    rpath.frp_weight = 1;
-	    rpath.frp_proto = FIB_PROTOCOL_IP6;
-	}
-	else if (unformat (line_input, "via %U",
-			   unformat_ip6_address,
-			   &rpath.frp_addr.ip6))
-	{
-	    rpath.frp_fib_index = 0;
-	    rpath.frp_weight = 1;
-	    rpath.frp_sw_if_index = ~0;
-	    rpath.frp_proto = FIB_PROTOCOL_IP6;
-	}
-	else if (unformat (line_input, "via %U",
-			   unformat_ip4_address,
-			   &rpath.frp_addr.ip4))
-	{
-	    rpath.frp_fib_index = 0;
-	    rpath.frp_weight = 1;
-	    rpath.frp_sw_if_index = ~0;
-	    rpath.frp_proto = FIB_PROTOCOL_IP4;
-	}
-	else if (unformat (line_input, "l2-only"))
-	    l2_only = 1;
-	else
-	    return clib_error_return (0, "unknown input '%U'",
-				      format_unformat_error, line_input);
-    }
-
-    if (is_del)
-    {
-	vnet_mpls_tunnel_del(sw_if_index);
-    }
-    else
-    {
-	if (0 == vec_len(labels))
-	    return clib_error_return (0, "No Output Labels '%U'",
-				      format_unformat_error, line_input);
-
-	vec_add1(rpaths, rpath);
-	vnet_mpls_tunnel_add(rpaths, labels, l2_only, &sw_if_index);
-    }
-
-    vec_free(labels);
-    vec_free(rpaths);
-
-    return (NULL);
-}
-
-/*?
- * This command create a uni-directional MPLS tunnel
- *
- * @cliexpar
- * @cliexstart{create mpls tunnel}
- *  create mpls tunnel via 10.0.0.1 GigEthernet0/8/0 out-label 33 out-label 34
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND (create_mpls_tunnel_command, static) = {
-  .path = "mpls tunnel",
-  .short_help = 
-  "mpls tunnel via [addr] [interface] [out-labels]",
-  .function = vnet_create_mpls_tunnel_command_fn,
-};
-
-static u8 *
-format_mpls_tunnel (u8 * s, va_list * args)
-{
-    mpls_tunnel_t *mt = va_arg (*args, mpls_tunnel_t *);
-    int ii;
-
-    s = format(s, "mpls_tunnel%d: sw_if_index:%d hw_if_index:%d",
-	       mt - mpls_tunnel_pool,
-	       mt->mt_sw_if_index,
-	       mt->mt_hw_if_index);
-    s = format(s, "\n label-stack:\n  ");
-    for (ii = 0; ii < vec_len(mt->mt_label_stack); ii++)
-    {
-	s = format(s, "%d, ", mt->mt_label_stack[ii]);
-    }
-    s = format(s, "\n via:\n");
-    s = fib_path_list_format(mt->mt_path_list, s);
-    s = format(s, "\n");
-
-    return (s);
-}
-
-static clib_error_t *
-show_mpls_tunnel_command_fn (vlib_main_t * vm,
-			     unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-    mpls_tunnel_t * mt;
-    u32 mti = ~0;
-
-    if (pool_elts (mpls_tunnel_pool) == 0)
-	vlib_cli_output (vm, "No MPLS tunnels configured...");
-
-    while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-	if (unformat (input, "%d", &mti))
-	    ;
-	else
-	    break;
-    }
-
-    if (~0 == mti)
-    {
-	pool_foreach (mt, mpls_tunnel_pool,
-	({
-	    vlib_cli_output (vm, "[@%d] %U",
-			     mt - mpls_tunnel_pool,
-			     format_mpls_tunnel, mt);
-	}));
-    }
-    else
-    {
-	if (pool_is_free_index(mpls_tunnel_pool, mti))
-	    return clib_error_return (0, "Not atunnel index %d", mti);
-
-	mt = pool_elt_at_index(mpls_tunnel_pool, mti);
-
-	vlib_cli_output (vm, "[@%d] %U",
-			 mt - mpls_tunnel_pool,
-			 format_mpls_tunnel, mt);
-    }
-
-    return 0;
-}
-
-/*?
- * This command to show MPLS tunnels
- *
- * @cliexpar
- * @cliexstart{sh mpls tunnel 2}
- * [@2] mpls_tunnel2: sw_if_index:5 hw_if_index:5
- *  label-stack:
- *    3, 
- *  via:
- *   index:26 locks:1 proto:ipv4 uPRF-list:26 len:1 itfs:[2, ]
- *     index:26 pl-index:26 ipv4 weight=1 attached-nexthop:  oper-flags:resolved,
- *      10.0.0.2 loop0
- *         [@0]: ipv4 via 10.0.0.2 loop0: IP4: de:ad:00:00:00:00 -> 00:00:11:aa:bb:cc
- * @cliexend
- ?*/
-VLIB_CLI_COMMAND (show_mpls_tunnel_command, static) = {
-    .path = "show mpls tunnel",
-    .function = show_mpls_tunnel_command_fn,
-};
-
-static mpls_tunnel_t *
-mpls_tunnel_from_fib_node (fib_node_t *node)
-{
-#if (CLIB_DEBUG > 0)
-    ASSERT(FIB_NODE_TYPE_MPLS_TUNNEL == node->fn_type);
-#endif
-    return ((mpls_tunnel_t*) (((char*)node) -
-                             STRUCT_OFFSET_OF(mpls_tunnel_t, mt_node)));
-}
-
-/**
- * Function definition to backwalk a FIB node
- */
-static fib_node_back_walk_rc_t
-mpls_tunnel_back_walk (fib_node_t *node,
-		      fib_node_back_walk_ctx_t *ctx)
-{
-    mpls_tunnel_restack(mpls_tunnel_from_fib_node(node));
-
-    return (FIB_NODE_BACK_WALK_CONTINUE);
-}
-
-/**
- * Function definition to get a FIB node from its index
- */
-static fib_node_t*
-mpls_tunnel_fib_node_get (fib_node_index_t index)
-{
-    mpls_tunnel_t * mt;
-
-    mt = pool_elt_at_index(mpls_tunnel_pool, index);
-
-    return (&mt->mt_node);
-}
-
-/**
- * Function definition to inform the FIB node that its last lock has gone.
- */
-static void
-mpls_tunnel_last_lock_gone (fib_node_t *node)
-{
-    /*
-     * The MPLS MPLS tunnel is a root of the graph. As such
-     * it never has children and thus is never locked.
-     */
-    ASSERT(0);
-}
-
-/*
- * Virtual function table registered by MPLS MPLS tunnels
- * for participation in the FIB object graph.
- */
-const static fib_node_vft_t mpls_vft = {
-    .fnv_get = mpls_tunnel_fib_node_get,
-    .fnv_last_lock = mpls_tunnel_last_lock_gone,
-    .fnv_back_walk = mpls_tunnel_back_walk,
-};
-
-static clib_error_t *
-mpls_tunnel_init (vlib_main_t *vm)
-{
-  fib_node_register_type(FIB_NODE_TYPE_MPLS_TUNNEL, &mpls_vft);
-
-  return 0;
-}
-VLIB_INIT_FUNCTION(mpls_tunnel_init);
diff --git a/vnet/vnet/mpls/mpls_tunnel.h b/vnet/vnet/mpls/mpls_tunnel.h
deleted file mode 100644
index ee56c0fc..00000000
--- a/vnet/vnet/mpls/mpls_tunnel.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __MPLS_TUNNEL_H__
-#define __MPLS_TUNNEL_H__
-
-#include <vnet/mpls/mpls.h>
-
-/**
- * @brief A uni-directional MPLS tunnel
- */
-typedef struct mpls_tunnel_t_
-{
-    /**
-     * @brief The tunnel hooks into the FIB control plane graph.
-     */
-    fib_node_t mt_node;
-
-    /**
-     * @brief If the tunnel is an L2 tunnel, this is the link type ETHERNET
-     * adjacency
-     */
-    adj_index_t mt_l2_adj;
-
-    /**
-     * @brief on a L2 tunnel this is the VLIB arc from the L2-tx to the l2-midchain
-     */
-    u32 mt_l2_tx_arc;
-
-    /**
-     * @brief The path-list over which the tunnel's destination is reachable
-     */
-    fib_node_index_t mt_path_list;
-
-    /**
-     * @brief sibling index on the path-list so notifications are received.
-     */
-    u32 mt_sibling_index;
-
-    /**
-     * @brief The Label stack to apply to egress packets
-     */
-    mpls_label_t *mt_label_stack;
-
-    /**
-     * @brief Flag to indicate the tunnel is only for L2 traffic, that is
-     * this tunnel belongs in a bridge domain.
-     */
-    u8 mt_l2_only;
-
-    /**
-     * @brief The HW interface index of the tunnel interfaces
-     */
-    u32 mt_hw_if_index;
-
-    /**
-     * @brief The SW interface index of the tunnel interfaces
-     */
-    u32 mt_sw_if_index;
-
-} mpls_tunnel_t;
-
-/**
- * @brief Create a new MPLS tunnel
- */
-extern void vnet_mpls_tunnel_add (fib_route_path_t *rpath,
-				  mpls_label_t *label_stack,
-				  u8 l2_only,
-				  u32 *sw_if_index);
-
-extern void vnet_mpls_tunnel_del (u32 sw_if_index);
-
-extern const mpls_tunnel_t *mpls_tunnel_get(u32 index);
-
-/**
- * @brief Callback function invoked while walking MPLS tunnels
- */
-typedef void (*mpls_tunnel_walk_cb_t)(u32 index, void *ctx);
-
-/**
- * @brief Walk all the MPLS tunnels
- */
-extern void mpls_tunnel_walk(mpls_tunnel_walk_cb_t cb,
-			     void *ctx);
-
-#endif
diff --git a/vnet/vnet/mpls/mpls_types.h b/vnet/vnet/mpls/mpls_types.h
deleted file mode 100644
index d7c629df..00000000
--- a/vnet/vnet/mpls/mpls_types.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef __MPLS_TYPES_H__
-#define __MPLS_TYPES_H__
-
-#define MPLS_IETF_MIN_LABEL                  0x00000
-#define MPLS_IETF_MAX_LABEL                  0xfffff
-
-#define MPLS_IETF_MIN_RESERVED_LABEL         0x00000
-#define MPLS_IETF_MAX_RESERVED_LABEL         0x0000f
-
-#define MPLS_IETF_MIN_UNRES_LABEL            0x00010
-#define MPLS_IETF_MAX_UNRES_LABEL            0xfffff
-
-#define MPLS_IETF_IPV4_EXPLICIT_NULL_LABEL   0x00000
-#define MPLS_IETF_ROUTER_ALERT_LABEL         0x00001
-#define MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL   0x00002
-#define MPLS_IETF_IMPLICIT_NULL_LABEL        0x00003
-#define MPLS_IETF_ELI_LABEL                  0x00007
-#define MPLS_IETF_GAL_LABEL                  0x0000D
-
-#define MPLS_IETF_IPV4_EXPLICIT_NULL_STRING          "ip4-explicit-null"
-#define MPLS_IETF_IPV4_EXPLICIT_NULL_BRIEF_STRING    "e-nul"
-#define MPLS_IETF_IMPLICIT_NULL_STRING               "implicit-null"
-#define MPLS_IETF_IMPLICIT_NULL_BRIEF_STRING         "i-nul"
-#define MPLS_IETF_ROUTER_ALERT_STRING                "router-alert"
-#define MPLS_IETF_ROUTER_ALERT_BRIEF_STRING          "r-alt"
-#define MPLS_IETF_IPV6_EXPLICIT_NULL_STRING          "ipv6-explicit-null"
-#define MPLS_IETF_IPV6_EXPLICIT_NULL_BRIEF_STRING    "v6enl"
-#define MPLS_IETF_ELI_STRING                         "entropy-label-indicator"
-#define MPLS_IETF_ELI_BRIEF_STRING                   "eli"
-#define MPLS_IETF_GAL_STRING                         "gal"
-#define MPLS_IETF_GAL_BRIEF_STRING                   "gal"
-
-#define MPLS_LABEL_INVALID (MPLS_IETF_MAX_LABEL+1)
-
-#define MPLS_LABEL_IS_REAL(_lbl) \
-    (((_lbl) > MPLS_IETF_MIN_UNRES_LABEL) &&	\
-     ((_lbl) <= MPLS_IETF_MAX_UNRES_LABEL))
-
-#endif
diff --git a/vnet/vnet/mpls/node.c b/vnet/vnet/mpls/node.c
deleted file mode 100644
index 18100912..00000000
--- a/vnet/vnet/mpls/node.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * node.c: MPLS input
- *
- * Copyright (c) 2012-2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/mpls/mpls.h>
-#include <vnet/feature/feature.h>
-
-typedef struct {
-  u32 next_index;
-  u32 label_host_byte_order;
-} mpls_input_trace_t;
-
-static u8 *
-format_mpls_input_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  mpls_input_trace_t * t = va_arg (*args, mpls_input_trace_t *);
-  char * next_name;
-
-  next_name = "BUG!";
-
-#define _(a,b) if (t->next_index == MPLS_INPUT_NEXT_##a) next_name = b;
-  foreach_mpls_input_next;
-#undef _
-  
-  s = format (s, "MPLS: next %s[%d]  label %d ttl %d", 
-              next_name, t->next_index,
-	      vnet_mpls_uc_get_label(t->label_host_byte_order),
-	      vnet_mpls_uc_get_ttl(t->label_host_byte_order));
-
-  return s;
-}
-
-vlib_node_registration_t mpls_input_node;
-
-typedef struct {
-  u32 last_label;
-  u32 last_inner_fib_index;
-  u32 last_outer_fib_index;
-  mpls_main_t * mpls_main;
-} mpls_input_runtime_t;
-
-static inline uword
-mpls_input_inline (vlib_main_t * vm,
-                   vlib_node_runtime_t * node,
-                   vlib_frame_t * from_frame)
-{
-  u32 n_left_from, next_index, * from, * to_next;
-  mpls_input_runtime_t * rt;
-  mpls_main_t * mm;
-  u32 cpu_index = os_get_cpu_number();
-  vlib_simple_counter_main_t * cm;
-  vnet_main_t * vnm = vnet_get_main();
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-  rt = vlib_node_get_runtime_data (vm, mpls_input_node.index);
-  mm = rt->mpls_main;
-  /* 
-   * Force an initial lookup every time, in case the control-plane
-   * changed the label->FIB mapping.
-   */
-  rt->last_label = ~0;
-
-  next_index = node->cached_next_index;
-
-  cm = vec_elt_at_index (vnm->interface_main.sw_if_counters,
-                         VNET_INTERFACE_COUNTER_MPLS);
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-        {
-          u32 label0, bi0, next0, sw_if_index0;
-          u32 label1, bi1, next1, sw_if_index1;
-          mpls_unicast_header_t *h0, *h1;
-          vlib_buffer_t *b0, *b1;
-
-          /* Prefetch next iteration. */
-          {
-            vlib_buffer_t * p2, * p3;
-
-            p2 = vlib_get_buffer (vm, from[2]);
-            p3 = vlib_get_buffer (vm, from[3]);
-
-            vlib_prefetch_buffer_header (p2, STORE);
-            vlib_prefetch_buffer_header (p3, STORE);
-
-            CLIB_PREFETCH (p2->data, sizeof (h0[0]), STORE);
-            CLIB_PREFETCH (p3->data, sizeof (h1[0]), STORE);
-          }
-
-
-          bi0 = to_next[0] = from[0];
-          bi1 = to_next[1] = from[1];
-
-          from += 2;
-          to_next += 2;
-          n_left_from -= 2;
-          n_left_to_next -= 2;
-
-          b0 = vlib_get_buffer (vm, bi0);
-          b1 = vlib_get_buffer (vm, bi1);
-
-          h0 = vlib_buffer_get_current (b0);
-          h1 = vlib_buffer_get_current (b1);
-
-          sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-          sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-
-          label0 = clib_net_to_host_u32 (h0->label_exp_s_ttl);
-          label1 = clib_net_to_host_u32 (h1->label_exp_s_ttl);
-
-          /* TTL expired? */
-          if (PREDICT_FALSE(vnet_mpls_uc_get_ttl (label0) == 0))
-           {
-              next0 = MPLS_INPUT_NEXT_DROP;
-              b0->error = node->errors[MPLS_ERROR_TTL_EXPIRED];
-            }
-          else
-            {
-              next0 = MPLS_INPUT_NEXT_LOOKUP;
-              vnet_feature_arc_start(mm->input_feature_arc_index, sw_if_index0, &next0, b0);
-              vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
-            }
-
-          if (PREDICT_FALSE(vnet_mpls_uc_get_ttl (label1) == 0))
-           {
-              next1 = MPLS_INPUT_NEXT_DROP;
-              b1->error = node->errors[MPLS_ERROR_TTL_EXPIRED];
-            }
-          else
-            {
-              next1 = MPLS_INPUT_NEXT_LOOKUP;
-              vnet_feature_arc_start(mm->input_feature_arc_index, sw_if_index1, &next1, b1);
-              vlib_increment_simple_counter (cm, cpu_index, sw_if_index1, 1);
-            }
-
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-            {
-              mpls_input_trace_t *tr = vlib_add_trace (vm, node,
-                                                       b0, sizeof (*tr));
-              tr->next_index = next0;
-              tr->label_host_byte_order = label0;
-            }
-          if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
-            {
-              mpls_input_trace_t *tr = vlib_add_trace (vm, node,
-                                                       b1, sizeof (*tr));
-              tr->next_index = next1;
-              tr->label_host_byte_order = label1;
-            }
-
-          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-                                           to_next, n_left_to_next,
-                                           bi0, bi1, next0, next1);
-        }
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t * b0;
-	  mpls_unicast_header_t * h0;
-          u32 label0;
-	  u32 next0 = 0;
-          u32 sw_if_index0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-          h0 = vlib_buffer_get_current (b0);
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-
-	  label0 = clib_net_to_host_u32 (h0->label_exp_s_ttl);
-	  /* TTL expired? */
-	  if (PREDICT_FALSE(vnet_mpls_uc_get_ttl (label0) == 0))
-           {
-              next0 = MPLS_INPUT_NEXT_DROP;
-              b0->error = node->errors[MPLS_ERROR_TTL_EXPIRED];
-            }
-	  else
-            {
-	      vnet_feature_arc_start(mm->input_feature_arc_index, sw_if_index0, &next0, b0);
-              vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
-            }
-
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
-            {
-              mpls_input_trace_t *tr = vlib_add_trace (vm, node, 
-						       b0, sizeof (*tr));
-              tr->next_index = next0;
-              tr->label_host_byte_order = label0;
-            }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, mpls_input_node.index,
-                               MPLS_ERROR_PKTS_DECAP, from_frame->n_vectors);
-  return from_frame->n_vectors;
-}
-
-static uword
-mpls_input (vlib_main_t * vm,
-            vlib_node_runtime_t * node,
-            vlib_frame_t * from_frame)
-{
-  return mpls_input_inline (vm, node, from_frame);
-}
-
-static char * mpls_error_strings[] = {
-#define mpls_error(n,s) s,
-#include "error.def"
-#undef mpls_error
-};
-
-VLIB_REGISTER_NODE (mpls_input_node) = {
-  .function = mpls_input,
-  .name = "mpls-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .runtime_data_bytes = sizeof(mpls_input_runtime_t),
-
-  .n_errors = MPLS_N_ERROR,
-  .error_strings = mpls_error_strings,
-
-  .n_next_nodes = MPLS_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [MPLS_INPUT_NEXT_##s] = n,
-    foreach_mpls_input_next
-#undef _
-  },
-
-  .format_buffer = format_mpls_unicast_header_net_byte_order,
-  .format_trace = format_mpls_input_trace,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_input_node, mpls_input)
-
-static void
-mpls_setup_nodes (vlib_main_t * vm)
-{
-  mpls_input_runtime_t * rt;
-  pg_node_t * pn;
-
-  pn = pg_get_node (mpls_input_node.index);
-  pn->unformat_edit = unformat_pg_mpls_header;
-
-  rt = vlib_node_get_runtime_data (vm, mpls_input_node.index);
-  rt->last_label = (u32) ~0;
-  rt->last_inner_fib_index = 0;
-  rt->last_outer_fib_index = 0;
-  rt->mpls_main = &mpls_main;
-
-  ethernet_register_input_type (vm, ETHERNET_TYPE_MPLS_UNICAST,
-                                mpls_input_node.index);
-}
-
-static clib_error_t * mpls_input_init (vlib_main_t * vm)
-{
-  clib_error_t * error; 
-
-  error = vlib_call_init_function (vm, mpls_init);
-  if (error)
-    clib_error_report (error);
-
-  mpls_setup_nodes (vm);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (mpls_input_init);
diff --git a/vnet/vnet/mpls/packet.h b/vnet/vnet/mpls/packet.h
deleted file mode 100644
index bc67445b..00000000
--- a/vnet/vnet/mpls/packet.h
+++ /dev/null
@@ -1,125 +0,0 @@
-#ifndef included_vnet_mpls_packet_h
-#define included_vnet_mpls_packet_h
-
-/*
- * MPLS packet format
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * A label value only, i.e. 20bits.
- */
-typedef u32 mpls_label_t;
-
-typedef struct {
-    /* Label: top 20 bits [in network byte order] */
-    /* Experimental: 3 bits ... */
-    /* S (bottom of label stack): 1 bit */
-    /* TTL: 8 bits */
-    mpls_label_t label_exp_s_ttl;
-} mpls_unicast_header_t;
-
-typedef enum mpls_eos_bit_t_
-{
-    MPLS_NON_EOS = 0,
-    MPLS_EOS     = 1,
-} mpls_eos_bit_t;
-
-#define MPLS_EOS_BITS {				\
-    [MPLS_NON_EOS] = "neos",		      	\
-    [MPLS_EOS] = "eos",				\
-}
-
-#define FOR_EACH_MPLS_EOS_BIT(_eos) \
-    for (_eos = MPLS_NON_EOS; _eos <= MPLS_EOS; _eos++)
-
-#define MPLS_ENTRY_LABEL_OFFSET        0
-#define MPLS_ENTRY_LABEL_SHIFT 12
-#define MPLS_ENTRY_LABEL_MASK  0x000fffff
-#define MPLS_ENTRY_LABEL_BITS  \
-    (MPLS_ENTRY_LABEL_MASK << MPLS_ENTRY_LABEL_SHIFT)
-
-#define MPLS_ENTRY_EXP_OFFSET   2       /* byte offset to EXP bits */
-#define MPLS_ENTRY_EXP_SHIFT   9
-#define MPLS_ENTRY_EXP_MASK    0x07
-#define MPLS_ENTRY_EXP(mpls)   \
-    (((mpls)>>MPLS_ENTRY_EXP_SHIFT) & MPLS_ENTRY_EXP_MASK)
-#define MPLS_ENTRY_EXP_BITS    \
-    (MPLS_ENTRY_EXP_MASK << MPLS_ENTRY_EXP_SHIFT)
-
-#define MPLS_ENTRY_EOS_OFFSET   2       /* byte offset to EOS bit */
-#define MPLS_ENTRY_EOS_SHIFT   8
-#define MPLS_ENTRY_EOS_MASK    0x01    /* EOS bit in its byte */
-#define        MPLS_ENTRY_EOS(mpls)    \
-    (((mpls) >> MPLS_ENTRY_EOS_SHIFT) & MPLS_ENTRY_EOS_MASK)
-#define MPLS_ENTRY_EOS_BIT     (MPLS_ENTRY_EOS_MASK << MPLS_ENTRY_EOS_SHIFT)
-
-#define MPLS_ENTRY_TTL_OFFSET  3  /* byte offset to ttl field */
-#define MPLS_ENTRY_TTL_SHIFT   0
-#define MPLS_ENTRY_TTL_MASK    0xff
-#define MPLS_ENTRY_TTL(mpls)   \
-    (((mpls) >> MPLS_ENTRY_TTL_SHIFT) & MPLS_ENTRY_TTL_MASK)
-#define MPLS_ENTRY_TTL_BITS    \
-    (MPLS_ENTRY_TTL_MASK << MPLS_ENTRY_TTL_SHIFT)
-
-static inline u32 vnet_mpls_uc_get_label (mpls_label_t label_exp_s_ttl)
-{
-    return (label_exp_s_ttl>>MPLS_ENTRY_LABEL_SHIFT);
-}
-
-static inline u32 vnet_mpls_uc_get_exp (mpls_label_t label_exp_s_ttl)
-{
-    return (MPLS_ENTRY_EXP(label_exp_s_ttl));
-}
-
-static inline u32 vnet_mpls_uc_get_s (mpls_label_t label_exp_s_ttl)
-{
-    return (MPLS_ENTRY_EOS(label_exp_s_ttl));
-}
-
-static inline u32 vnet_mpls_uc_get_ttl (mpls_label_t label_exp_s_ttl)
-{
-    return (MPLS_ENTRY_TTL(label_exp_s_ttl));
-}
-
-static inline void vnet_mpls_uc_set_label (mpls_label_t *label_exp_s_ttl,
-                                           u32 value)
-{
-    *label_exp_s_ttl = (((*label_exp_s_ttl) & ~(MPLS_ENTRY_LABEL_BITS)) |
-                        ((value  & MPLS_ENTRY_LABEL_MASK) << MPLS_ENTRY_LABEL_SHIFT));
-}
-
-static inline void vnet_mpls_uc_set_exp (mpls_label_t *label_exp_s_ttl,
-                                         u32 exp)
-{
-    *label_exp_s_ttl = (((*label_exp_s_ttl) & ~(MPLS_ENTRY_EXP_BITS)) |
-                        ((exp & MPLS_ENTRY_EXP_MASK) << MPLS_ENTRY_EXP_SHIFT));
-}
- 
-static inline void vnet_mpls_uc_set_s (mpls_label_t *label_exp_s_ttl,
-                                       u32 eos)
-{
-    *label_exp_s_ttl = (((*label_exp_s_ttl) & ~(MPLS_ENTRY_EOS_BIT)) |
-                        ((eos & MPLS_ENTRY_EOS_MASK) << MPLS_ENTRY_EOS_SHIFT));
-}
- 
-static inline void vnet_mpls_uc_set_ttl (mpls_label_t *label_exp_s_ttl,
-                                         u32 ttl)
-{
-    *label_exp_s_ttl = (((*label_exp_s_ttl) & ~(MPLS_ENTRY_TTL_BITS)) |
-                        ((ttl & MPLS_ENTRY_TTL_MASK)));
-}
-
-#endif /* included_vnet_mpls_packet_h */
diff --git a/vnet/vnet/mpls/pg.c b/vnet/vnet/mpls/pg.c
deleted file mode 100644
index 6ff86e32..00000000
--- a/vnet/vnet/mpls/pg.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * pg.c: packet generator mpls interface
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/gre/gre.h>
-#include <vnet/mpls/mpls.h>
-
-typedef struct {
-  pg_edit_t label;
-} pg_mpls_header_t;
-
-static inline void
-pg_mpls_header_init (pg_mpls_header_t * e)
-{
-  pg_edit_init (&e->label, mpls_unicast_header_t, label_exp_s_ttl);
-}
-
-uword
-unformat_pg_mpls_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t * s = va_arg (*args, pg_stream_t *);
-  pg_mpls_header_t * h;
-  vlib_main_t * vm = vlib_get_main();
-  u32 group_index, error;
-  
-  h = pg_create_edit_group (s, sizeof (h[0]), sizeof (mpls_unicast_header_t),
-			    &group_index);
-  pg_mpls_header_init (h);
-
-  error = 1;
-  if (! unformat (input, "%U",
-		  unformat_pg_edit,
-                  unformat_mpls_label_net_byte_order, &h->label))
-    goto done;
-
-  {
-    pg_node_t * pg_node = 0;
-    vlib_node_t * ip_lookup_node;
-
-    ip_lookup_node = vlib_get_node_by_name (vm, (u8 *)"ip4-input");
-    ASSERT (ip_lookup_node);
-
-    pg_node = pg_get_node (ip_lookup_node->index);
-
-    if (pg_node && pg_node->unformat_edit
-	&& unformat_user (input, pg_node->unformat_edit, s))
-      ;
-  }
-
-  error = 0;
- done:
-  if (error)
-    pg_free_edit_group (s);
-  return error == 0;
-}
-
diff --git a/vnet/vnet/osi/node.c b/vnet/vnet/osi/node.c
deleted file mode 100644
index 12075aa8..00000000
--- a/vnet/vnet/osi/node.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * osi_node.c: osi packet processing
- *
- * Copyright (c) 2010 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/osi/osi.h>
-#include <vnet/ppp/ppp.h>
-#include <vnet/hdlc/hdlc.h>
-#include <vnet/llc/llc.h>
-
-#define foreach_osi_input_next			\
-  _ (PUNT, "error-punt")			\
-  _ (DROP, "error-drop")
-
-typedef enum
-{
-#define _(s,n) OSI_INPUT_NEXT_##s,
-  foreach_osi_input_next
-#undef _
-    OSI_INPUT_N_NEXT,
-} osi_input_next_t;
-
-typedef struct
-{
-  u8 packet_data[32];
-} osi_input_trace_t;
-
-static u8 *
-format_osi_input_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  osi_input_trace_t *t = va_arg (*va, osi_input_trace_t *);
-
-  s = format (s, "%U", format_osi_header, t->packet_data);
-
-  return s;
-}
-
-static uword
-osi_input (vlib_main_t * vm,
-	   vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  osi_main_t *lm = &osi_main;
-  u32 n_left_from, next_index, *from, *to_next;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node,
-				   from,
-				   n_left_from,
-				   sizeof (from[0]),
-				   sizeof (osi_input_trace_t));
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  osi_header_t *h0, *h1;
-	  u8 next0, next1, enqueue_code;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *b2, *b3;
-
-	    b2 = vlib_get_buffer (vm, from[2]);
-	    b3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (b2, LOAD);
-	    vlib_prefetch_buffer_header (b3, LOAD);
-
-	    CLIB_PREFETCH (b2->data, sizeof (h0[0]), LOAD);
-	    CLIB_PREFETCH (b3->data, sizeof (h1[0]), LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  h0 = (void *) (b0->data + b0->current_data);
-	  h1 = (void *) (b1->data + b1->current_data);
-
-	  next0 = lm->input_next_by_protocol[h0->protocol];
-	  next1 = lm->input_next_by_protocol[h1->protocol];
-
-	  b0->error =
-	    node->errors[next0 ==
-			 OSI_INPUT_NEXT_DROP ? OSI_ERROR_UNKNOWN_PROTOCOL :
-			 OSI_ERROR_NONE];
-	  b1->error =
-	    node->errors[next1 ==
-			 OSI_INPUT_NEXT_DROP ? OSI_ERROR_UNKNOWN_PROTOCOL :
-			 OSI_ERROR_NONE];
-
-	  enqueue_code = (next0 != next_index) + 2 * (next1 != next_index);
-
-	  if (PREDICT_FALSE (enqueue_code != 0))
-	    {
-	      switch (enqueue_code)
-		{
-		case 1:
-		  /* A B A */
-		  to_next[-2] = bi1;
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node, next0, bi0);
-		  break;
-
-		case 2:
-		  /* A A B */
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node, next1, bi1);
-		  break;
-
-		case 3:
-		  /* A B B or A B C */
-		  to_next -= 2;
-		  n_left_to_next += 2;
-		  vlib_set_next_frame_buffer (vm, node, next0, bi0);
-		  vlib_set_next_frame_buffer (vm, node, next1, bi1);
-		  if (next0 == next1)
-		    {
-		      vlib_put_next_frame (vm, node, next_index,
-					   n_left_to_next);
-		      next_index = next1;
-		      vlib_get_next_frame (vm, node, next_index, to_next,
-					   n_left_to_next);
-		    }
-		}
-	    }
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  osi_header_t *h0;
-	  u8 next0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  h0 = (void *) (b0->data + b0->current_data);
-
-	  next0 = lm->input_next_by_protocol[h0->protocol];
-
-	  b0->error =
-	    node->errors[next0 ==
-			 OSI_INPUT_NEXT_DROP ? OSI_ERROR_UNKNOWN_PROTOCOL :
-			 OSI_ERROR_NONE];
-
-	  /* Sent packet to wrong next? */
-	  if (PREDICT_FALSE (next0 != next_index))
-	    {
-	      /* Return old frame; remove incorrectly enqueued packet. */
-	      vlib_put_next_frame (vm, node, next_index, n_left_to_next + 1);
-
-	      /* Send to correct next. */
-	      next_index = next0;
-	      vlib_get_next_frame (vm, node, next_index, to_next,
-				   n_left_to_next);
-
-	      to_next[0] = bi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-static char *osi_error_strings[] = {
-#define _(f,s) s,
-  foreach_osi_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (osi_input_node) = {
-  .function = osi_input,
-  .name = "osi-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .n_errors = OSI_N_ERROR,
-  .error_strings = osi_error_strings,
-
-  .n_next_nodes = OSI_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [OSI_INPUT_NEXT_##s] = n,
-    foreach_osi_input_next
-#undef _
-  },
-
-  .format_buffer = format_osi_header_with_length,
-  .format_trace = format_osi_input_trace,
-  .unformat_buffer = unformat_osi_header,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-osi_input_init (vlib_main_t * vm)
-{
-  clib_error_t *error = 0;
-  osi_main_t *lm = &osi_main;
-
-  if ((error = vlib_call_init_function (vm, osi_init)))
-    return error;
-
-  osi_setup_node (vm, osi_input_node.index);
-
-  {
-    int i;
-    for (i = 0; i < ARRAY_LEN (lm->input_next_by_protocol); i++)
-      lm->input_next_by_protocol[i] = OSI_INPUT_NEXT_DROP;
-  }
-
-  ppp_register_input_protocol (vm, PPP_PROTOCOL_osi, osi_input_node.index);
-  hdlc_register_input_protocol (vm, HDLC_PROTOCOL_osi, osi_input_node.index);
-  llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer1,
-			       osi_input_node.index);
-  llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer2,
-			       osi_input_node.index);
-  llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer3,
-			       osi_input_node.index);
-  llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer4,
-			       osi_input_node.index);
-  llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer5,
-			       osi_input_node.index);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (osi_input_init);
-
-void
-osi_register_input_protocol (osi_protocol_t protocol, u32 node_index)
-{
-  osi_main_t *lm = &osi_main;
-  vlib_main_t *vm = lm->vlib_main;
-  osi_protocol_info_t *pi;
-
-  {
-    clib_error_t *error = vlib_call_init_function (vm, osi_input_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  pi = osi_get_protocol_info (lm, protocol);
-  pi->node_index = node_index;
-  pi->next_index = vlib_node_add_next (vm, osi_input_node.index, node_index);
-
-  lm->input_next_by_protocol[protocol] = pi->next_index;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/osi/osi.c b/vnet/vnet/osi/osi.c
deleted file mode 100644
index 34c867f1..00000000
--- a/vnet/vnet/osi/osi.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * osi.c: osi support
- *
- * Copyright (c) 2010 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/osi/osi.h>
-
-/* Global main structure. */
-osi_main_t osi_main;
-
-u8 *
-format_osi_protocol (u8 * s, va_list * args)
-{
-  osi_protocol_t p = va_arg (*args, u32);
-  osi_main_t *pm = &osi_main;
-  osi_protocol_info_t *pi = osi_get_protocol_info (pm, p);
-
-  if (pi)
-    s = format (s, "%s", pi->name);
-  else
-    s = format (s, "0x%02x", p);
-
-  return s;
-}
-
-u8 *
-format_osi_header_with_length (u8 * s, va_list * args)
-{
-  osi_main_t *pm = &osi_main;
-  osi_header_t *h = va_arg (*args, osi_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-  osi_protocol_t p = h->protocol;
-  uword indent, header_bytes;
-
-  header_bytes = sizeof (h[0]);
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    return format (s, "osi header truncated");
-
-  indent = format_get_indent (s);
-
-  s = format (s, "OSI %U", format_osi_protocol, p);
-
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    {
-      osi_protocol_info_t *pi = osi_get_protocol_info (pm, p);
-      vlib_node_t *node = vlib_get_node (pm->vlib_main, pi->node_index);
-      if (node->format_buffer)
-	s = format (s, "\n%U%U",
-		    format_white_space, indent,
-		    node->format_buffer, (void *) (h + 1),
-		    max_header_bytes - header_bytes);
-    }
-
-  return s;
-}
-
-u8 *
-format_osi_header (u8 * s, va_list * args)
-{
-  osi_header_t *h = va_arg (*args, osi_header_t *);
-  return format (s, "%U", format_osi_header_with_length, h, 0);
-}
-
-/* Returns osi protocol as an int in host byte order. */
-uword
-unformat_osi_protocol (unformat_input_t * input, va_list * args)
-{
-  u8 *result = va_arg (*args, u8 *);
-  osi_main_t *pm = &osi_main;
-  int p, i;
-
-  /* Numeric type. */
-  if (unformat (input, "0x%x", &p) || unformat (input, "%d", &p))
-    {
-      if (p >= (1 << 8))
-	return 0;
-      *result = p;
-      return 1;
-    }
-
-  /* Named type. */
-  if (unformat_user (input, unformat_vlib_number_by_name,
-		     pm->protocol_info_by_name, &i))
-    {
-      osi_protocol_info_t *pi = vec_elt_at_index (pm->protocol_infos, i);
-      *result = pi->protocol;
-      return 1;
-    }
-
-  return 0;
-}
-
-uword
-unformat_osi_header (unformat_input_t * input, va_list * args)
-{
-  u8 **result = va_arg (*args, u8 **);
-  osi_header_t _h, *h = &_h;
-  u8 p;
-
-  if (!unformat (input, "%U", unformat_osi_protocol, &p))
-    return 0;
-
-  h->protocol = p;
-
-  /* Add header to result. */
-  {
-    void *p;
-    u32 n_bytes = sizeof (h[0]);
-
-    vec_add2 (*result, p, n_bytes);
-    clib_memcpy (p, h, n_bytes);
-  }
-
-  return 1;
-}
-
-static void
-add_protocol (osi_main_t * pm, osi_protocol_t protocol, char *protocol_name)
-{
-  osi_protocol_info_t *pi;
-  u32 i;
-
-  vec_add2 (pm->protocol_infos, pi, 1);
-  i = pi - pm->protocol_infos;
-
-  pi->name = protocol_name;
-  pi->protocol = protocol;
-  pi->next_index = pi->node_index = ~0;
-
-  hash_set (pm->protocol_info_by_protocol, protocol, i);
-  hash_set_mem (pm->protocol_info_by_name, pi->name, i);
-}
-
-static clib_error_t *
-osi_init (vlib_main_t * vm)
-{
-  clib_error_t *error = 0;
-  osi_main_t *pm = &osi_main;
-
-  /* init order dependency: llc_init -> osi_init */
-  if ((error = vlib_call_init_function (vm, llc_init)))
-    return error;
-
-  memset (pm, 0, sizeof (pm[0]));
-  pm->vlib_main = vm;
-
-  pm->protocol_info_by_name = hash_create_string (0, sizeof (uword));
-  pm->protocol_info_by_protocol = hash_create (0, sizeof (uword));
-
-#define _(f,n) add_protocol (pm, OSI_PROTOCOL_##f, #f);
-  foreach_osi_protocol;
-#undef _
-
-  return vlib_call_init_function (vm, osi_input_init);
-}
-
-VLIB_INIT_FUNCTION (osi_init);
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/osi/osi.h b/vnet/vnet/osi/osi.h
deleted file mode 100644
index ee21f0c3..00000000
--- a/vnet/vnet/osi/osi.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * osi.h: OSI definitions
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_osi_h
-#define included_osi_h
-
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-
-#define foreach_osi_protocol			\
-  _ (null, 0x0)					\
-  _ (x_29, 0x01)				\
-  _ (x_633, 0x03)				\
-  _ (q_931, 0x08)				\
-  _ (q_933, 0x08)				\
-  _ (q_2931, 0x09)				\
-  _ (q_2119, 0x0c)				\
-  _ (snap, 0x80)				\
-  _ (clnp, 0x81)				\
-  _ (esis, 0x82)				\
-  _ (isis, 0x83)				\
-  _ (idrp, 0x85)				\
-  _ (x25_esis, 0x8a)				\
-  _ (iso10030, 0x8c)				\
-  _ (iso11577, 0x8d)				\
-  _ (ip6, 0x8e)					\
-  _ (compressed, 0xb0)				\
-  _ (sndcf, 0xc1)				\
-  _ (ip4, 0xcc)					\
-  _ (ppp, 0xcf)
-
-typedef enum
-{
-#define _(f,n) OSI_PROTOCOL_##f = n,
-  foreach_osi_protocol
-#undef _
-} osi_protocol_t;
-
-typedef struct
-{
-  u8 protocol;
-
-  u8 payload[0];
-} osi_header_t;
-
-typedef struct
-{
-  /* Name (a c string). */
-  char *name;
-
-  /* OSI protocol (SAP type). */
-  osi_protocol_t protocol;
-
-  /* Node which handles this type. */
-  u32 node_index;
-
-  /* Next index for this type. */
-  u32 next_index;
-} osi_protocol_info_t;
-
-#define foreach_osi_error			\
-  _ (NONE, "no error")				\
-  _ (UNKNOWN_PROTOCOL, "unknown osi protocol")
-
-typedef enum
-{
-#define _(f,s) OSI_ERROR_##f,
-  foreach_osi_error
-#undef _
-    OSI_N_ERROR,
-} osi_error_t;
-
-typedef struct
-{
-  vlib_main_t *vlib_main;
-
-  osi_protocol_info_t *protocol_infos;
-
-  /* Hash tables mapping name/protocol to protocol info index. */
-  uword *protocol_info_by_name, *protocol_info_by_protocol;
-
-  /* osi-input next index indexed by protocol. */
-  u8 input_next_by_protocol[256];
-} osi_main_t;
-
-always_inline osi_protocol_info_t *
-osi_get_protocol_info (osi_main_t * m, osi_protocol_t protocol)
-{
-  uword *p = hash_get (m->protocol_info_by_protocol, protocol);
-  return p ? vec_elt_at_index (m->protocol_infos, p[0]) : 0;
-}
-
-extern osi_main_t osi_main;
-
-/* Register given node index to take input for given osi type. */
-void osi_register_input_protocol (osi_protocol_t protocol, u32 node_index);
-
-void osi_set_adjacency (vnet_rewrite_header_t * rw,
-			uword max_data_bytes, osi_protocol_t protocol);
-
-format_function_t format_osi_protocol;
-format_function_t format_osi_header;
-format_function_t format_osi_header_with_length;
-
-/* Parse osi protocol as 0xXXXX or protocol name. */
-unformat_function_t unformat_osi_protocol;
-
-/* Parse osi header. */
-unformat_function_t unformat_osi_header;
-unformat_function_t unformat_pg_osi_header;
-
-always_inline void
-osi_setup_node (vlib_main_t * vm, u32 node_index)
-{
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  pg_node_t *pn = pg_get_node (node_index);
-
-  n->format_buffer = format_osi_header_with_length;
-  n->unformat_buffer = unformat_osi_header;
-  pn->unformat_edit = unformat_pg_osi_header;
-}
-
-void osi_register_input_protocol (osi_protocol_t protocol, u32 node_index);
-
-format_function_t format_osi_header;
-
-#endif /* included_osi_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/osi/pg.c b/vnet/vnet/osi/pg.c
deleted file mode 100644
index c87a869b..00000000
--- a/vnet/vnet/osi/pg.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * osi_pg.c: packet generator osi interface
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/osi/osi.h>
-
-typedef struct
-{
-  pg_edit_t protocol;
-} pg_osi_header_t;
-
-static inline void
-pg_osi_header_init (pg_osi_header_t * e)
-{
-  pg_edit_init (&e->protocol, osi_header_t, protocol);
-}
-
-uword
-unformat_pg_osi_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t *s = va_arg (*args, pg_stream_t *);
-  pg_osi_header_t *h;
-  u32 group_index, error;
-
-  h = pg_create_edit_group (s, sizeof (h[0]), sizeof (osi_header_t),
-			    &group_index);
-  pg_osi_header_init (h);
-
-  error = 1;
-  if (!unformat (input, "%U",
-		 unformat_pg_edit, unformat_osi_protocol, &h->protocol))
-    goto done;
-
-  {
-    osi_main_t *pm = &osi_main;
-    osi_protocol_info_t *pi = 0;
-    pg_node_t *pg_node = 0;
-
-    if (h->protocol.type == PG_EDIT_FIXED)
-      {
-	u8 t = *h->protocol.values[PG_EDIT_LO];
-	pi = osi_get_protocol_info (pm, t);
-	if (pi && pi->node_index != ~0)
-	  pg_node = pg_get_node (pi->node_index);
-      }
-
-    if (pg_node && pg_node->unformat_edit
-	&& unformat_user (input, pg_node->unformat_edit, s))
-      ;
-
-    else if (!unformat_user (input, unformat_pg_payload, s))
-      goto done;
-  }
-
-  error = 0;
-done:
-  if (error)
-    pg_free_edit_group (s);
-  return error == 0;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/pg/cli.c b/vnet/vnet/pg/cli.c
deleted file mode 100644
index f5896b43..00000000
--- a/vnet/vnet/pg/cli.c
+++ /dev/null
@@ -1,636 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pg_cli.c: packet generator cli
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <sys/stat.h>
-
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-
-#ifdef CLIB_UNIX
-#include <vnet/unix/pcap.h>
-#endif
-
-/* Root of all packet generator cli commands. */
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vlib_cli_pg_command, static) = {
-  .path = "packet-generator",
-  .short_help = "Packet generator commands",
-};
-/* *INDENT-ON* */
-
-void
-pg_enable_disable (u32 stream_index, int is_enable)
-{
-  pg_main_t *pg = &pg_main;
-  pg_stream_t *s;
-
-  if (stream_index == ~0)
-    {
-      /* No stream specified: enable/disable all streams. */
-      /* *INDENT-OFF* */
-        pool_foreach (s, pg->streams, ({
-            pg_stream_enable_disable (pg, s, is_enable);
-        }));
-	/* *INDENT-ON* */
-    }
-  else
-    {
-      /* enable/disable specified stream. */
-      s = pool_elt_at_index (pg->streams, stream_index);
-      pg_stream_enable_disable (pg, s, is_enable);
-    }
-}
-
-clib_error_t *
-pg_capture (pg_capture_args_t * a)
-{
-  pg_main_t *pg = &pg_main;
-  pg_interface_t *pi;
-
-  if (a->is_enabled == 1)
-    {
-      struct stat sb;
-      if (stat ((char *) a->pcap_file_name, &sb) != -1)
-	return clib_error_return (0, "Cannot create pcap file");
-    }
-
-  pi = pool_elt_at_index (pg->interfaces, a->dev_instance);
-  vec_free (pi->pcap_file_name);
-  memset (&pi->pcap_main, 0, sizeof (pi->pcap_main));
-
-  if (a->is_enabled == 0)
-    return 0;
-
-  pi->pcap_file_name = a->pcap_file_name;
-  pi->pcap_main.file_name = (char *) pi->pcap_file_name;
-  pi->pcap_main.n_packets_to_capture = a->count;
-  pi->pcap_main.packet_type = PCAP_PACKET_TYPE_ethernet;
-
-  return 0;
-}
-
-static clib_error_t *
-enable_disable_stream (vlib_main_t * vm,
-		       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  pg_main_t *pg = &pg_main;
-  int is_enable = cmd->function_arg != 0;
-  u32 stream_index = ~0;
-
-  if (unformat (input, "%U", unformat_eof))
-    ;
-  else if (unformat (input, "%U", unformat_hash_vec_string,
-		     pg->stream_index_by_name, &stream_index))
-    ;
-  else
-    return clib_error_create ("unknown input `%U'",
-			      format_unformat_error, input);
-
-  pg_enable_disable (stream_index, is_enable);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (enable_streams_cli, static) = {
-  .path = "packet-generator enable-stream",
-  .short_help = "Enable packet generator streams",
-  .function = enable_disable_stream,
-  .function_arg = 1,		/* is_enable */
-};
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (disable_streams_cli, static) = {
-  .path = "packet-generator disable-stream",
-  .short_help = "Disable packet generator streams",
-  .function = enable_disable_stream,
-  .function_arg = 0,		/* is_enable */
-};
-/* *INDENT-ON* */
-
-static u8 *
-format_pg_stream (u8 * s, va_list * va)
-{
-  pg_stream_t *t = va_arg (*va, pg_stream_t *);
-  u8 *v;
-
-  if (!t)
-    return format (s, "%=16s%=12s%=16s%s",
-		   "Name", "Enabled", "Count", "Parameters");
-
-  s = format (s, "%-16v%=12s%16Ld",
-	      t->name,
-	      pg_stream_is_enabled (t) ? "Yes" : "No",
-	      t->n_packets_generated);
-
-  v = 0;
-
-  v = format (v, "limit %Ld, ", t->n_packets_limit);
-
-  v = format (v, "rate %.2e pps, ", t->rate_packets_per_second);
-
-  v = format (v, "size %d%c%d, ",
-	      t->min_packet_bytes,
-	      t->packet_size_edit_type == PG_EDIT_RANDOM ? '+' : '-',
-	      t->max_packet_bytes);
-
-  v = format (v, "buffer-size %d, ", t->buffer_bytes);
-
-  v = format (v, "worker %d, ", t->worker_index);
-
-  if (v)
-    {
-      s = format (s, "  %v", v);
-      vec_free (v);
-    }
-
-  return s;
-}
-
-static clib_error_t *
-show_streams (vlib_main_t * vm,
-	      unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  pg_main_t *pg = &pg_main;
-  pg_stream_t *s;
-
-  if (pool_elts (pg->streams) == 0)
-    {
-      vlib_cli_output (vm, "no streams currently defined");
-      goto done;
-    }
-
-  vlib_cli_output (vm, "%U", format_pg_stream, 0);
-  /* *INDENT-OFF* */
-  pool_foreach (s, pg->streams, ({
-      vlib_cli_output (vm, "%U", format_pg_stream, s);
-    }));
-  /* *INDENT-ON* */
-
-done:
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_streams_cli, static) = {
-  .path = "show packet-generator",
-  .short_help = "Show packet generator streams",
-  .function = show_streams,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-pg_pcap_read (pg_stream_t * s, char *file_name)
-{
-#ifndef CLIB_UNIX
-  return clib_error_return (0, "no pcap support");
-#else
-  pcap_main_t pm;
-  clib_error_t *error;
-  memset (&pm, 0, sizeof (pm));
-  pm.file_name = file_name;
-  error = pcap_read (&pm);
-  s->replay_packet_templates = pm.packets_read;
-  s->min_packet_bytes = pm.min_packet_bytes;
-  s->max_packet_bytes = pm.max_packet_bytes;
-  s->buffer_bytes = pm.max_packet_bytes;
-  /* For PCAP buffers we never re-use buffers. */
-  s->flags |= PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE;
-
-  if (s->n_packets_limit == 0)
-    s->n_packets_limit = vec_len (pm.packets_read);
-
-  return error;
-#endif /* CLIB_UNIX */
-}
-
-static uword
-unformat_pg_stream_parameter (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t *s = va_arg (*args, pg_stream_t *);
-  f64 x;
-
-  if (unformat (input, "limit %f", &x))
-    s->n_packets_limit = x;
-
-  else if (unformat (input, "rate %f", &x))
-    s->rate_packets_per_second = x;
-
-  else if (unformat (input, "size %d-%d", &s->min_packet_bytes,
-		     &s->max_packet_bytes))
-    s->packet_size_edit_type = PG_EDIT_INCREMENT;
-
-  else if (unformat (input, "size %d+%d", &s->min_packet_bytes,
-		     &s->max_packet_bytes))
-    s->packet_size_edit_type = PG_EDIT_RANDOM;
-
-  else if (unformat (input, "buffer-size %d", &s->buffer_bytes))
-    ;
-
-  else
-    return 0;
-
-  return 1;
-}
-
-static clib_error_t *
-validate_stream (pg_stream_t * s)
-{
-  if (s->max_packet_bytes < s->min_packet_bytes)
-    return clib_error_create ("max-size < min-size");
-
-  if (s->buffer_bytes >= 4096 || s->buffer_bytes == 0)
-    return
-      clib_error_create ("buffer-size must be positive and < 4096, given %d",
-			 s->buffer_bytes);
-
-  if (s->rate_packets_per_second < 0)
-    return clib_error_create ("negative rate");
-
-  return 0;
-}
-
-static clib_error_t *
-new_stream (vlib_main_t * vm,
-	    unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  clib_error_t *error = 0;
-  u8 *tmp = 0;
-  u32 hw_if_index;
-  unformat_input_t sub_input = { 0 };
-  int sub_input_given = 0;
-  vnet_main_t *vnm = vnet_get_main ();
-  pg_main_t *pg = &pg_main;
-  pg_stream_t s = { 0 };
-  char *pcap_file_name;
-
-  s.sw_if_index[VLIB_RX] = s.sw_if_index[VLIB_TX] = ~0;
-  s.node_index = ~0;
-  s.max_packet_bytes = s.min_packet_bytes = 64;
-  s.buffer_bytes = VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES;
-  s.if_id = 0;
-  pcap_file_name = 0;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "name %v", &tmp))
-	{
-	  if (s.name)
-	    vec_free (s.name);
-	  s.name = tmp;
-	}
-
-      else if (unformat (input, "node %U",
-			 unformat_vnet_hw_interface, vnm, &hw_if_index))
-	{
-	  vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
-
-	  s.node_index = hi->output_node_index;
-	  s.sw_if_index[VLIB_TX] = hi->sw_if_index;
-	}
-
-      else if (unformat (input, "source pg%u", &s.if_id))
-	;
-
-      else if (unformat (input, "node %U",
-			 unformat_vlib_node, vm, &s.node_index))
-	;
-
-      else if (unformat (input, "worker %u", &s.worker_index))
-	;
-
-      else if (unformat (input, "interface %U",
-			 unformat_vnet_sw_interface, vnm,
-			 &s.sw_if_index[VLIB_RX]))
-	;
-
-      else if (unformat (input, "pcap %s", &pcap_file_name))
-	;
-
-      else if (!sub_input_given
-	       && unformat (input, "data %U", unformat_input, &sub_input))
-	sub_input_given++;
-
-      else if (unformat_user (input, unformat_pg_stream_parameter, &s))
-	;
-
-      else if (unformat (input, "no-recycle"))
-	s.flags |= PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE;
-
-      else
-	{
-	  error = clib_error_create ("unknown input `%U'",
-				     format_unformat_error, input);
-	  goto done;
-	}
-    }
-
-  error = validate_stream (&s);
-  if (error)
-    return error;
-
-  if (!sub_input_given && !pcap_file_name)
-    {
-      error = clib_error_create ("no packet data given");
-      goto done;
-    }
-
-  if (s.node_index == ~0)
-    {
-      if (pcap_file_name != 0)
-	{
-	  vlib_node_t *n =
-	    vlib_get_node_by_name (vm, (u8 *) "ethernet-input");
-	  s.node_index = n->index;
-	}
-      else
-	{
-	  error = clib_error_create ("output interface or node not given");
-	  goto done;
-	}
-    }
-
-  {
-    pg_node_t *n;
-
-    if (s.node_index < vec_len (pg->nodes))
-      n = pg->nodes + s.node_index;
-    else
-      n = 0;
-
-    if (s.worker_index >= vlib_num_workers ())
-      s.worker_index = 0;
-
-    if (pcap_file_name != 0)
-      {
-	error = pg_pcap_read (&s, pcap_file_name);
-	if (error)
-	  goto done;
-	vec_free (pcap_file_name);
-      }
-
-    else if (n && n->unformat_edit
-	     && unformat_user (&sub_input, n->unformat_edit, &s))
-      ;
-
-    else if (!unformat_user (&sub_input, unformat_pg_payload, &s))
-      {
-	error = clib_error_create
-	  ("failed to parse packet data from `%U'",
-	   format_unformat_error, &sub_input);
-	goto done;
-      }
-  }
-
-  pg_stream_add (pg, &s);
-  return 0;
-
-done:
-  pg_stream_free (&s);
-  unformat_free (&sub_input);
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (new_stream_cli, static) = {
-  .path = "packet-generator new",
-  .function = new_stream,
-  .short_help = "Create packet generator stream",
-  .long_help =
-  "Create packet generator stream\n"
-  "\n"
-  "Arguments:\n"
-  "\n"
-  "name STRING          sets stream name\n"
-  "interface STRING     interface for stream output \n"
-  "node NODE-NAME       node for stream output\n"
-  "data STRING          specifies packet data\n"
-  "pcap FILENAME        read packet data from pcap file\n",
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-del_stream (vlib_main_t * vm,
-	    unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  pg_main_t *pg = &pg_main;
-  u32 i;
-
-  if (!unformat (input, "%U",
-		 &unformat_hash_vec_string, pg->stream_index_by_name, &i))
-    return clib_error_create ("expected stream name `%U'",
-			      format_unformat_error, input);
-
-  pg_stream_del (pg, i);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (del_stream_cli, static) = {
-  .path = "packet-generator delete",
-  .function = del_stream,
-  .short_help = "Delete stream with given name",
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-change_stream_parameters (vlib_main_t * vm,
-			  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  pg_main_t *pg = &pg_main;
-  pg_stream_t *s, s_new;
-  u32 stream_index = ~0;
-  clib_error_t *error;
-
-  if (unformat (input, "%U", unformat_hash_vec_string,
-		pg->stream_index_by_name, &stream_index))
-    ;
-  else
-    return clib_error_create ("expecting stream name; got `%U'",
-			      format_unformat_error, input);
-
-  s = pool_elt_at_index (pg->streams, stream_index);
-  s_new = s[0];
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat_user (input, unformat_pg_stream_parameter, &s_new))
-	;
-
-      else
-	return clib_error_create ("unknown input `%U'",
-				  format_unformat_error, input);
-    }
-
-  error = validate_stream (&s_new);
-  if (!error)
-    s[0] = s_new;
-
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (change_stream_parameters_cli, static) = {
-  .path = "packet-generator configure",
-  .short_help = "Change packet generator stream parameters",
-  .function = change_stream_parameters,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-pg_capture_cmd_fn (vlib_main_t * vm,
-		   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  clib_error_t *error = 0;
-  vnet_main_t *vnm = vnet_get_main ();
-  unformat_input_t _line_input, *line_input = &_line_input;
-  vnet_hw_interface_t *hi = 0;
-  u8 *pcap_file_name = 0;
-  u32 hw_if_index;
-  u32 is_disable = 0;
-  u32 count = ~0;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "%U",
-		    unformat_vnet_hw_interface, vnm, &hw_if_index))
-	{
-	  hi = vnet_get_hw_interface (vnm, hw_if_index);
-	}
-
-      else if (unformat (line_input, "pcap %s", &pcap_file_name))
-	;
-      else if (unformat (line_input, "count %u", &count))
-	;
-      else if (unformat (line_input, "disable"))
-	is_disable = 1;
-
-      else
-	{
-	  error = clib_error_create ("unknown input `%U'",
-				     format_unformat_error, input);
-	  return error;
-	}
-    }
-
-  if (!hi)
-    return clib_error_return (0, "Please specify interface name");
-
-  if (hi->dev_class_index != pg_dev_class.index)
-    return clib_error_return (0, "Please specify packet-generator interface");
-
-  if (!pcap_file_name && is_disable == 0)
-    return clib_error_return (0, "Please specify pcap file name");
-
-  unformat_free (line_input);
-
-  pg_capture_args_t _a, *a = &_a;
-
-  a->hw_if_index = hw_if_index;
-  a->dev_instance = hi->dev_instance;
-  a->is_enabled = !is_disable;
-  a->pcap_file_name = pcap_file_name;
-  a->count = count;
-
-  error = pg_capture (a);
-  return error;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (pg_capture_cmd, static) = {
-  .path = "packet-generator capture",
-  .short_help = "packet-generator capture <interface name> pcap <filename> [count <n>]",
-  .function = pg_capture_cmd_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-create_pg_if_cmd_fn (vlib_main_t * vm,
-		     unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  pg_main_t *pg = &pg_main;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u32 if_id;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "interface pg%u", &if_id))
-	;
-
-      else
-	return clib_error_create ("unknown input `%U'",
-				  format_unformat_error, input);
-    }
-
-  unformat_free (line_input);
-
-  pg_interface_add_or_get (pg, if_id);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (create_pg_if_cmd, static) = {
-  .path = "create packet-generator",
-  .short_help = "create packet-generator interface <interface name>",
-  .function = create_pg_if_cmd_fn,
-};
-/* *INDENT-ON* */
-
-/* Dummy init function so that we can be linked in. */
-static clib_error_t *
-pg_cli_init (vlib_main_t * vm)
-{
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (pg_cli_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/pg/edit.c b/vnet/vnet/pg/edit.c
deleted file mode 100644
index cb4d070f..00000000
--- a/vnet/vnet/pg/edit.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pg_edit.c: packet generator edits
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-
-static void
-pg_edit_set_value_helper (pg_edit_t * e, u64 value, u8 * result)
-{
-  int i, j, n_bits_left;
-  u8 *v, tmp[8];
-
-  v = tmp;
-
-  n_bits_left = e->n_bits;
-  i = 0;
-  j = e->lsb_bit_offset % BITS (v[0]);
-
-  if (n_bits_left > 0 && j != 0)
-    {
-      v[i] = (value & 0xff) << j;
-      value >>= BITS (v[0]) - j;
-      n_bits_left -= BITS (v[0]) - j;
-      i += 1;
-    }
-
-  while (n_bits_left > 0)
-    {
-      v[i] = value & 0xff;
-      value >>= 8;
-      n_bits_left -= 8;
-      i += 1;
-    }
-
-  /* Convert to network byte order. */
-  for (j = 0; j < i; j++)
-    result[j] = v[i - 1 - j];
-}
-
-void
-pg_edit_set_value (pg_edit_t * e, int hi_or_lo, u64 value)
-{
-  pg_edit_alloc_value (e, hi_or_lo);
-  pg_edit_set_value_helper (e, value, e->values[hi_or_lo]);
-}
-
-/* Parse an int either %d or 0x%x into network byte order. */
-uword
-unformat_pg_number (unformat_input_t * input, va_list * args)
-{
-  u8 *result = va_arg (*args, u8 *);
-  pg_edit_t *e = va_arg (*args, pg_edit_t *);
-  u64 value;
-
-  ASSERT (BITS (value) >= e->n_bits);
-
-  if (!unformat (input, "0x%X", sizeof (value), &value)
-      && !unformat (input, "%D", sizeof (value), &value))
-    return 0;
-
-  /* Number given does not fit into bit field. */
-  if (e->n_bits < 64 && value >= (u64) 1 << (u64) e->n_bits)
-    return 0;
-
-  pg_edit_set_value_helper (e, value, result);
-  return 1;
-}
-
-uword
-unformat_pg_edit (unformat_input_t * input, va_list * args)
-{
-  unformat_function_t *f = va_arg (*args, unformat_function_t *);
-  pg_edit_t *e = va_arg (*args, pg_edit_t *);
-
-  pg_edit_alloc_value (e, PG_EDIT_LO);
-  if (!unformat_user (input, f, e->values[PG_EDIT_LO], e))
-    return 0;
-
-  pg_edit_alloc_value (e, PG_EDIT_HI);
-  if (unformat (input, "-%U", f, e->values[PG_EDIT_HI], e))
-    e->type = PG_EDIT_INCREMENT;
-  else if (unformat (input, "+%U", f, e->values[PG_EDIT_HI], e))
-    e->type = PG_EDIT_RANDOM;
-  else
-    e->type = PG_EDIT_FIXED;
-
-  return 1;
-}
-
-uword
-unformat_pg_payload (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t *s = va_arg (*args, pg_stream_t *);
-  vlib_main_t *vm = vlib_get_main ();
-  pg_edit_t *e;
-  u32 i, node_index, len, max_len;
-  u8 *v;
-
-  v = 0;
-
-  if (unformat (input, "incrementing %d", &len))
-    {
-      vec_resize (v, len);
-      for (i = 0; i < len; i++)
-	v[i] = i;
-    }
-  else if (unformat (input, "hex 0x%U", unformat_hex_string, &v))
-    ;
-
-  else if (unformat (input, "%U", unformat_vlib_node, vm, &node_index))
-    {
-      pg_node_t *pn = pg_get_node (node_index);
-      if (!pn->unformat_edit)
-	return 0;
-      return unformat (input, "%U", pn->unformat_edit, s);
-    }
-
-  else
-    return 0;
-
-  /* Length not including this payload. */
-  max_len = pg_edit_group_n_bytes (s, 0);
-  if (max_len + vec_len (v) >= s->max_packet_bytes)
-    {
-      if (s->max_packet_bytes >= max_len)
-	_vec_len (v) = s->max_packet_bytes - max_len;
-      else
-	_vec_len (v) = 0;
-    }
-
-  e = pg_create_edit_group (s, sizeof (e[0]), vec_len (v), 0);
-
-  e->type = PG_EDIT_FIXED;
-  e->n_bits = vec_len (v) * BITS (v[0]);
-
-  /* Least significant bit is at end of bitstream, since everything is always bigendian. */
-  e->lsb_bit_offset = e->n_bits - BITS (v[0]);
-
-  e->values[PG_EDIT_LO] = v;
-
-  return 1;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/pg/edit.h b/vnet/vnet/pg/edit.h
deleted file mode 100644
index 3bfdad57..00000000
--- a/vnet/vnet/pg/edit.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pg_edit.h: packet generator edits
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_packet_generator_pg_edit_h
-#define included_packet_generator_pg_edit_h
-
-#include <vppinfra/format.h>
-#include <vppinfra/vec.h>
-
-typedef enum
-{
-  /* Invalid type used to poison edits. */
-  PG_EDIT_INVALID_TYPE,
-
-  /* Value is fixed: does not change for all packets in sequence. */
-  PG_EDIT_FIXED,
-
-  /* Value v increments between low and high values v_low <= v <= v_high. */
-  PG_EDIT_INCREMENT,
-
-  /* Random value between low and high values v_low <= v <= v_high. */
-  PG_EDIT_RANDOM,
-
-  /* Unspecified value; will be specified by some edit function. */
-  PG_EDIT_UNSPECIFIED,
-} pg_edit_type_t;
-
-typedef struct
-{
-  pg_edit_type_t type;
-
-  /* Bit offset within packet where value is to be written.
-     Bits are written in network byte order: high bits first.
-     This is the bit offset of the least significant bit: i.e. the
-     highest numbered byte * 8 plus bit offset within that byte.
-     Negative offsets encode special edits. */
-  i32 lsb_bit_offset;
-
-  /* Special offset indicating this edit is for packet length. */
-#define PG_EDIT_PACKET_LENGTH (-1)
-
-  /* Number of bits in edit. */
-  u32 n_bits;
-
-  /* Low and high values for this edit.  Network byte order. */
-  u8 *values[2];
-#define PG_EDIT_LO 0
-#define PG_EDIT_HI 1
-
-  /* Last value used for increment edit type. */
-  u64 last_increment_value;
-} pg_edit_t;
-
-always_inline void
-pg_edit_free (pg_edit_t * e)
-{
-  int i;
-  for (i = 0; i < ARRAY_LEN (e->values); i++)
-    vec_free (e->values[i]);
-}
-
-#define pg_edit_init_bitfield(e,type,field,field_offset,field_n_bits)	\
-do {									\
-  u32 _bo;								\
-									\
-  ASSERT ((field_offset) < STRUCT_BITS_OF (type, field));		\
-									\
-  /* Start byte offset. */						\
-  _bo = STRUCT_OFFSET_OF (type, field);					\
-									\
-  /* Adjust for big endian byte order. */				\
-  _bo += ((STRUCT_BITS_OF (type, field)					\
-	   - (field_offset) - 1) / BITS (u8));				\
-									\
-  (e)->lsb_bit_offset = _bo * BITS (u8) + ((field_offset) % BITS (u8));	\
-  (e)->n_bits = (field_n_bits);						\
-} while (0)
-
-/* Initialize edit for byte aligned fields. */
-#define pg_edit_init(e,type,field) \
-   pg_edit_init_bitfield(e,type,field,0,STRUCT_BITS_OF(type,field))
-
-static inline uword
-pg_edit_n_alloc_bytes (pg_edit_t * e)
-{
-  int i0, i1, n_bytes, n_bits_left;
-
-  i0 = e->lsb_bit_offset;
-  i1 = i0 % BITS (u8);
-
-  n_bytes = 0;
-  n_bits_left = e->n_bits;
-
-  if (n_bits_left > 0 && i1 != 0)
-    {
-      n_bytes++;
-      n_bits_left -= i1;
-      if (n_bits_left < 0)
-	n_bits_left = 0;
-    }
-
-  n_bytes += (n_bits_left / BITS (u8));
-  n_bytes += (n_bits_left % BITS (u8)) != 0;
-
-  return n_bytes;
-}
-
-static inline void
-pg_edit_alloc_value (pg_edit_t * e, int i)
-{
-  vec_validate (e->values[i], e->lsb_bit_offset / BITS (u8));
-}
-
-extern void pg_edit_set_value (pg_edit_t * e, int hi_or_lo, u64 value);
-
-static inline void
-pg_edit_set_fixed (pg_edit_t * e, u64 value)
-{
-  e->type = PG_EDIT_FIXED;
-  pg_edit_set_value (e, PG_EDIT_LO, value);
-}
-
-static inline void
-pg_edit_copy_type_and_values (pg_edit_t * dst, pg_edit_t * src)
-{
-  int i;
-  dst->type = src->type;
-  src->type = PG_EDIT_INVALID_TYPE;
-  for (i = 0; i < ARRAY_LEN (dst->values); i++)
-    {
-      dst->values[i] = src->values[i];
-      src->values[i] = 0;
-    }
-}
-
-static inline u64
-pg_edit_get_value (pg_edit_t * e, int hi_or_lo)
-{
-  u64 r = 0;
-  int i, n;
-  u8 *v = e->values[hi_or_lo];
-
-  n = round_pow2 (e->n_bits, BITS (u8)) / BITS (u8);
-
-  ASSERT (n <= vec_len (v));
-  ASSERT (n <= sizeof (r));
-
-  for (i = 0; i < n; i++)
-    r = (r << BITS (v[i])) + v[i];
-
-  return r;
-}
-
-static inline uword
-pg_edit_is_fixed_with_value (pg_edit_t * e, u64 value)
-{
-  return (e->type == PG_EDIT_FIXED
-	  && value == pg_edit_get_value (e, PG_EDIT_LO));
-}
-
-uword unformat_pg_edit (unformat_input_t * input, va_list * args);
-uword unformat_pg_payload (unformat_input_t * input, va_list * args);
-uword unformat_pg_number (unformat_input_t * input, va_list * args);
-uword unformat_pg_interface (unformat_input_t * input, va_list * args);
-
-#endif /* included_packet_generator_pg_edit_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/pg/example.script b/vnet/vnet/pg/example.script
deleted file mode 100644
index 0e29b9ec..00000000
--- a/vnet/vnet/pg/example.script
+++ /dev/null
@@ -1,6 +0,0 @@
-packet-generator new {
-  name x
-  limit 1
-  node ethernet-input
-  data { IP: 1.2.3 -> 4.5.6 incrementing 100 }
-}
diff --git a/vnet/vnet/pg/init.c b/vnet/vnet/pg/init.c
deleted file mode 100644
index 631be25e..00000000
--- a/vnet/vnet/pg/init.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pg_init.c: VLIB packet generator
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-
-/* Global main structure. */
-pg_main_t pg_main;
-
-static clib_error_t *
-pg_init (vlib_main_t * vm)
-{
-  clib_error_t *error;
-  pg_main_t *pg = &pg_main;
-
-  pg->if_index_by_if_id = hash_create (0, sizeof (uword));
-
-  if ((error = vlib_call_init_function (vm, vnet_main_init)))
-    goto done;
-
-  if ((error = vlib_call_init_function (vm, pg_cli_init)))
-    goto done;
-
-done:
-  return error;
-}
-
-VLIB_INIT_FUNCTION (pg_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/pg/input.c b/vnet/vnet/pg/input.c
deleted file mode 100644
index e15faeb8..00000000
--- a/vnet/vnet/pg/input.c
+++ /dev/null
@@ -1,1667 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pg_input.c: buffer generator input
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/vnet.h>
-#include <vnet/feature/feature.h>
-#include <vnet/devices/devices.h>
-
-static int
-validate_buffer_data2 (vlib_buffer_t * b, pg_stream_t * s,
-		       u32 data_offset, u32 n_bytes)
-{
-  u8 *bd, *pd, *pm;
-  u32 i;
-
-  bd = b->data;
-  pd = s->fixed_packet_data + data_offset;
-  pm = s->fixed_packet_data_mask + data_offset;
-
-  if (pd + n_bytes >= vec_end (s->fixed_packet_data))
-    n_bytes = (pd < vec_end (s->fixed_packet_data)
-	       ? vec_end (s->fixed_packet_data) - pd : 0);
-
-  for (i = 0; i < n_bytes; i++)
-    if ((bd[i] & pm[i]) != pd[i])
-      break;
-
-  if (i >= n_bytes)
-    return 1;
-
-  clib_warning ("buffer %U", format_vlib_buffer, b);
-  clib_warning ("differ at index %d", i);
-  clib_warning ("is     %U", format_hex_bytes, bd, n_bytes);
-  clib_warning ("mask   %U", format_hex_bytes, pm, n_bytes);
-  clib_warning ("expect %U", format_hex_bytes, pd, n_bytes);
-  return 0;
-}
-
-static int
-validate_buffer_data (vlib_buffer_t * b, pg_stream_t * s)
-{
-  return validate_buffer_data2 (b, s, 0, s->buffer_bytes);
-}
-
-always_inline void
-set_1 (void *a0,
-       u64 v0, u64 v_min, u64 v_max, u32 n_bits, u32 is_net_byte_order)
-{
-  ASSERT (v0 >= v_min && v0 <= v_max);
-  if (n_bits == BITS (u8))
-    {
-      ((u8 *) a0)[0] = v0;
-    }
-  else if (n_bits == BITS (u16))
-    {
-      if (is_net_byte_order)
-	v0 = clib_host_to_net_u16 (v0);
-      clib_mem_unaligned (a0, u16) = v0;
-    }
-  else if (n_bits == BITS (u32))
-    {
-      if (is_net_byte_order)
-	v0 = clib_host_to_net_u32 (v0);
-      clib_mem_unaligned (a0, u32) = v0;
-    }
-  else if (n_bits == BITS (u64))
-    {
-      if (is_net_byte_order)
-	v0 = clib_host_to_net_u64 (v0);
-      clib_mem_unaligned (a0, u64) = v0;
-    }
-}
-
-always_inline void
-set_2 (void *a0, void *a1,
-       u64 v0, u64 v1,
-       u64 v_min, u64 v_max,
-       u32 n_bits, u32 is_net_byte_order, u32 is_increment)
-{
-  ASSERT (v0 >= v_min && v0 <= v_max);
-  ASSERT (v1 >= v_min && v1 <= (v_max + is_increment));
-  if (n_bits == BITS (u8))
-    {
-      ((u8 *) a0)[0] = v0;
-      ((u8 *) a1)[0] = v1;
-    }
-  else if (n_bits == BITS (u16))
-    {
-      if (is_net_byte_order)
-	{
-	  v0 = clib_host_to_net_u16 (v0);
-	  v1 = clib_host_to_net_u16 (v1);
-	}
-      clib_mem_unaligned (a0, u16) = v0;
-      clib_mem_unaligned (a1, u16) = v1;
-    }
-  else if (n_bits == BITS (u32))
-    {
-      if (is_net_byte_order)
-	{
-	  v0 = clib_host_to_net_u32 (v0);
-	  v1 = clib_host_to_net_u32 (v1);
-	}
-      clib_mem_unaligned (a0, u32) = v0;
-      clib_mem_unaligned (a1, u32) = v1;
-    }
-  else if (n_bits == BITS (u64))
-    {
-      if (is_net_byte_order)
-	{
-	  v0 = clib_host_to_net_u64 (v0);
-	  v1 = clib_host_to_net_u64 (v1);
-	}
-      clib_mem_unaligned (a0, u64) = v0;
-      clib_mem_unaligned (a1, u64) = v1;
-    }
-}
-
-static_always_inline void
-do_set_fixed (pg_main_t * pg,
-	      pg_stream_t * s,
-	      u32 * buffers,
-	      u32 n_buffers,
-	      u32 n_bits,
-	      u32 byte_offset, u32 is_net_byte_order, u64 v_min, u64 v_max)
-{
-  vlib_main_t *vm = vlib_get_main ();
-
-  while (n_buffers >= 4)
-    {
-      vlib_buffer_t *b0, *b1, *b2, *b3;
-      void *a0, *a1;
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-      b1 = vlib_get_buffer (vm, buffers[1]);
-      b2 = vlib_get_buffer (vm, buffers[2]);
-      b3 = vlib_get_buffer (vm, buffers[3]);
-      buffers += 2;
-      n_buffers -= 2;
-
-      a0 = (void *) b0 + byte_offset;
-      a1 = (void *) b1 + byte_offset;
-      CLIB_PREFETCH ((void *) b2 + byte_offset, sizeof (v_min), WRITE);
-      CLIB_PREFETCH ((void *) b3 + byte_offset, sizeof (v_min), WRITE);
-
-      set_2 (a0, a1, v_min, v_min, v_min, v_max, n_bits, is_net_byte_order,
-	     /* is_increment */ 0);
-
-      ASSERT (validate_buffer_data (b0, s));
-      ASSERT (validate_buffer_data (b1, s));
-    }
-
-  while (n_buffers > 0)
-    {
-      vlib_buffer_t *b0;
-      void *a0;
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-      buffers += 1;
-      n_buffers -= 1;
-
-      a0 = (void *) b0 + byte_offset;
-
-      set_1 (a0, v_min, v_min, v_max, n_bits, is_net_byte_order);
-
-      ASSERT (validate_buffer_data (b0, s));
-    }
-}
-
-static_always_inline u64
-do_set_increment (pg_main_t * pg,
-		  pg_stream_t * s,
-		  u32 * buffers,
-		  u32 n_buffers,
-		  u32 n_bits,
-		  u32 byte_offset,
-		  u32 is_net_byte_order,
-		  u32 want_sum, u64 * sum_result, u64 v_min, u64 v_max, u64 v)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  u64 sum = 0;
-
-  ASSERT (v >= v_min && v <= v_max);
-
-  while (n_buffers >= 4)
-    {
-      vlib_buffer_t *b0, *b1, *b2, *b3;
-      void *a0, *a1;
-      u64 v_old;
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-      b1 = vlib_get_buffer (vm, buffers[1]);
-      b2 = vlib_get_buffer (vm, buffers[2]);
-      b3 = vlib_get_buffer (vm, buffers[3]);
-      buffers += 2;
-      n_buffers -= 2;
-
-      a0 = (void *) b0 + byte_offset;
-      a1 = (void *) b1 + byte_offset;
-      CLIB_PREFETCH ((void *) b2 + byte_offset, sizeof (v_min), WRITE);
-      CLIB_PREFETCH ((void *) b3 + byte_offset, sizeof (v_min), WRITE);
-
-      v_old = v;
-      v = v_old + 2;
-      v = v > v_max ? v_min : v;
-      set_2 (a0, a1,
-	     v_old + 0, v_old + 1, v_min, v_max, n_bits, is_net_byte_order,
-	     /* is_increment */ 1);
-
-      if (want_sum)
-	sum += 2 * v_old + 1;
-
-      if (PREDICT_FALSE (v_old + 1 > v_max))
-	{
-	  if (want_sum)
-	    sum -= 2 * v_old + 1;
-
-	  v = v_old;
-	  set_1 (a0, v + 0, v_min, v_max, n_bits, is_net_byte_order);
-	  if (want_sum)
-	    sum += v;
-	  v += 1;
-
-	  v = v > v_max ? v_min : v;
-	  set_1 (a1, v + 0, v_min, v_max, n_bits, is_net_byte_order);
-	  if (want_sum)
-	    sum += v;
-	  v += 1;
-	}
-
-      ASSERT (validate_buffer_data (b0, s));
-      ASSERT (validate_buffer_data (b1, s));
-    }
-
-  while (n_buffers > 0)
-    {
-      vlib_buffer_t *b0;
-      void *a0;
-      u64 v_old;
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-      buffers += 1;
-      n_buffers -= 1;
-
-      a0 = (void *) b0 + byte_offset;
-
-      v_old = v;
-      if (want_sum)
-	sum += v_old;
-      v += 1;
-      v = v > v_max ? v_min : v;
-
-      ASSERT (v_old >= v_min && v_old <= v_max);
-      set_1 (a0, v_old, v_min, v_max, n_bits, is_net_byte_order);
-
-      ASSERT (validate_buffer_data (b0, s));
-    }
-
-  if (want_sum)
-    *sum_result = sum;
-
-  return v;
-}
-
-static_always_inline void
-do_set_random (pg_main_t * pg,
-	       pg_stream_t * s,
-	       u32 * buffers,
-	       u32 n_buffers,
-	       u32 n_bits,
-	       u32 byte_offset,
-	       u32 is_net_byte_order,
-	       u32 want_sum, u64 * sum_result, u64 v_min, u64 v_max)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  u64 v_diff = v_max - v_min + 1;
-  u64 r_mask = max_pow2 (v_diff) - 1;
-  u64 v0, v1;
-  u64 sum = 0;
-  void *random_data;
-
-  random_data = clib_random_buffer_get_data
-    (&vm->random_buffer, n_buffers * n_bits / BITS (u8));
-
-  v0 = v1 = v_min;
-
-  while (n_buffers >= 4)
-    {
-      vlib_buffer_t *b0, *b1, *b2, *b3;
-      void *a0, *a1;
-      u64 r0 = 0, r1 = 0;	/* warnings be gone */
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-      b1 = vlib_get_buffer (vm, buffers[1]);
-      b2 = vlib_get_buffer (vm, buffers[2]);
-      b3 = vlib_get_buffer (vm, buffers[3]);
-      buffers += 2;
-      n_buffers -= 2;
-
-      a0 = (void *) b0 + byte_offset;
-      a1 = (void *) b1 + byte_offset;
-      CLIB_PREFETCH ((void *) b2 + byte_offset, sizeof (v_min), WRITE);
-      CLIB_PREFETCH ((void *) b3 + byte_offset, sizeof (v_min), WRITE);
-
-      switch (n_bits)
-	{
-#define _(n)					\
-	  case BITS (u##n):			\
-	    {					\
-	      u##n * r = random_data;		\
-	      r0 = r[0];			\
-	      r1 = r[1];			\
-	      random_data = r + 2;		\
-	    }					\
-	  break;
-
-	  _(8);
-	  _(16);
-	  _(32);
-	  _(64);
-
-#undef _
-	}
-
-      /* Add power of 2 sized random number which may be out of range. */
-      v0 += r0 & r_mask;
-      v1 += r1 & r_mask;
-
-      /* Twice should be enough to reduce to v_min .. v_max range. */
-      v0 = v0 > v_max ? v0 - v_diff : v0;
-      v1 = v1 > v_max ? v1 - v_diff : v1;
-      v0 = v0 > v_max ? v0 - v_diff : v0;
-      v1 = v1 > v_max ? v1 - v_diff : v1;
-
-      if (want_sum)
-	sum += v0 + v1;
-
-      set_2 (a0, a1, v0, v1, v_min, v_max, n_bits, is_net_byte_order,
-	     /* is_increment */ 0);
-
-      ASSERT (validate_buffer_data (b0, s));
-      ASSERT (validate_buffer_data (b1, s));
-    }
-
-  while (n_buffers > 0)
-    {
-      vlib_buffer_t *b0;
-      void *a0;
-      u64 r0 = 0;		/* warnings be gone */
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-      buffers += 1;
-      n_buffers -= 1;
-
-      a0 = (void *) b0 + byte_offset;
-
-      switch (n_bits)
-	{
-#define _(n)					\
-	  case BITS (u##n):			\
-	    {					\
-	      u##n * r = random_data;		\
-	      r0 = r[0];			\
-	      random_data = r + 1;		\
-	    }					\
-	  break;
-
-	  _(8);
-	  _(16);
-	  _(32);
-	  _(64);
-
-#undef _
-	}
-
-      /* Add power of 2 sized random number which may be out of range. */
-      v0 += r0 & r_mask;
-
-      /* Twice should be enough to reduce to v_min .. v_max range. */
-      v0 = v0 > v_max ? v0 - v_diff : v0;
-      v0 = v0 > v_max ? v0 - v_diff : v0;
-
-      if (want_sum)
-	sum += v0;
-
-      set_1 (a0, v0, v_min, v_max, n_bits, is_net_byte_order);
-
-      ASSERT (validate_buffer_data (b0, s));
-    }
-
-  if (want_sum)
-    *sum_result = sum;
-}
-
-#define _(i,t)							\
-  clib_mem_unaligned (a##i, t) =				\
-    clib_host_to_net_##t ((clib_net_to_host_mem_##t (a##i) &~ mask)	\
-			  | (v##i << shift))
-
-always_inline void
-setbits_1 (void *a0,
-	   u64 v0,
-	   u64 v_min, u64 v_max,
-	   u32 max_bits, u32 n_bits, u64 mask, u32 shift)
-{
-  ASSERT (v0 >= v_min && v0 <= v_max);
-  if (max_bits == BITS (u8))
-    ((u8 *) a0)[0] = (((u8 *) a0)[0] & ~mask) | (v0 << shift);
-
-  else if (max_bits == BITS (u16))
-    {
-      _(0, u16);
-    }
-  else if (max_bits == BITS (u32))
-    {
-      _(0, u32);
-    }
-  else if (max_bits == BITS (u64))
-    {
-      _(0, u64);
-    }
-}
-
-always_inline void
-setbits_2 (void *a0, void *a1,
-	   u64 v0, u64 v1,
-	   u64 v_min, u64 v_max,
-	   u32 max_bits, u32 n_bits, u64 mask, u32 shift, u32 is_increment)
-{
-  ASSERT (v0 >= v_min && v0 <= v_max);
-  ASSERT (v1 >= v_min && v1 <= v_max + is_increment);
-  if (max_bits == BITS (u8))
-    {
-      ((u8 *) a0)[0] = (((u8 *) a0)[0] & ~mask) | (v0 << shift);
-      ((u8 *) a1)[0] = (((u8 *) a1)[0] & ~mask) | (v1 << shift);
-    }
-
-  else if (max_bits == BITS (u16))
-    {
-      _(0, u16);
-      _(1, u16);
-    }
-  else if (max_bits == BITS (u32))
-    {
-      _(0, u32);
-      _(1, u32);
-    }
-  else if (max_bits == BITS (u64))
-    {
-      _(0, u64);
-      _(1, u64);
-    }
-}
-
-#undef _
-
-static_always_inline void
-do_setbits_fixed (pg_main_t * pg,
-		  pg_stream_t * s,
-		  u32 * buffers,
-		  u32 n_buffers,
-		  u32 max_bits,
-		  u32 n_bits,
-		  u32 byte_offset, u64 v_min, u64 v_max, u64 mask, u32 shift)
-{
-  vlib_main_t *vm = vlib_get_main ();
-
-  while (n_buffers >= 4)
-    {
-      vlib_buffer_t *b0, *b1, *b2, *b3;
-      void *a0, *a1;
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-      b1 = vlib_get_buffer (vm, buffers[1]);
-      b2 = vlib_get_buffer (vm, buffers[2]);
-      b3 = vlib_get_buffer (vm, buffers[3]);
-      buffers += 2;
-      n_buffers -= 2;
-
-      a0 = (void *) b0 + byte_offset;
-      a1 = (void *) b1 + byte_offset;
-      CLIB_PREFETCH ((void *) b2 + byte_offset, sizeof (v_min), WRITE);
-      CLIB_PREFETCH ((void *) b3 + byte_offset, sizeof (v_min), WRITE);
-
-      setbits_2 (a0, a1,
-		 v_min, v_min, v_min, v_max, max_bits, n_bits, mask, shift,
-		 /* is_increment */ 0);
-
-      ASSERT (validate_buffer_data (b0, s));
-      ASSERT (validate_buffer_data (b1, s));
-    }
-
-  while (n_buffers > 0)
-    {
-      vlib_buffer_t *b0;
-      void *a0;
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-      buffers += 1;
-      n_buffers -= 1;
-
-      a0 = (void *) b0 + byte_offset;
-
-      setbits_1 (a0, v_min, v_min, v_max, max_bits, n_bits, mask, shift);
-      ASSERT (validate_buffer_data (b0, s));
-    }
-}
-
-static_always_inline u64
-do_setbits_increment (pg_main_t * pg,
-		      pg_stream_t * s,
-		      u32 * buffers,
-		      u32 n_buffers,
-		      u32 max_bits,
-		      u32 n_bits,
-		      u32 byte_offset,
-		      u64 v_min, u64 v_max, u64 v, u64 mask, u32 shift)
-{
-  vlib_main_t *vm = vlib_get_main ();
-
-  ASSERT (v >= v_min && v <= v_max);
-
-  while (n_buffers >= 4)
-    {
-      vlib_buffer_t *b0, *b1, *b2, *b3;
-      void *a0, *a1;
-      u64 v_old;
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-      b1 = vlib_get_buffer (vm, buffers[1]);
-      b2 = vlib_get_buffer (vm, buffers[2]);
-      b3 = vlib_get_buffer (vm, buffers[3]);
-      buffers += 2;
-      n_buffers -= 2;
-
-      a0 = (void *) b0 + byte_offset;
-      a1 = (void *) b1 + byte_offset;
-      CLIB_PREFETCH ((void *) b2 + byte_offset, sizeof (v_min), WRITE);
-      CLIB_PREFETCH ((void *) b3 + byte_offset, sizeof (v_min), WRITE);
-
-      v_old = v;
-      v = v_old + 2;
-      v = v > v_max ? v_min : v;
-      setbits_2 (a0, a1,
-		 v_old + 0, v_old + 1,
-		 v_min, v_max, max_bits, n_bits, mask, shift,
-		 /* is_increment */ 1);
-
-      if (PREDICT_FALSE (v_old + 1 > v_max))
-	{
-	  v = v_old;
-	  setbits_1 (a0, v + 0, v_min, v_max, max_bits, n_bits, mask, shift);
-	  v += 1;
-
-	  v = v > v_max ? v_min : v;
-	  setbits_1 (a1, v + 0, v_min, v_max, max_bits, n_bits, mask, shift);
-	  v += 1;
-	}
-      ASSERT (validate_buffer_data (b0, s));
-      ASSERT (validate_buffer_data (b1, s));
-    }
-
-  while (n_buffers > 0)
-    {
-      vlib_buffer_t *b0;
-      void *a0;
-      u64 v_old;
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-      buffers += 1;
-      n_buffers -= 1;
-
-      a0 = (void *) b0 + byte_offset;
-
-      v_old = v;
-      v = v_old + 1;
-      v = v > v_max ? v_min : v;
-
-      ASSERT (v_old >= v_min && v_old <= v_max);
-      setbits_1 (a0, v_old, v_min, v_max, max_bits, n_bits, mask, shift);
-
-      ASSERT (validate_buffer_data (b0, s));
-    }
-
-  return v;
-}
-
-static_always_inline void
-do_setbits_random (pg_main_t * pg,
-		   pg_stream_t * s,
-		   u32 * buffers,
-		   u32 n_buffers,
-		   u32 max_bits,
-		   u32 n_bits,
-		   u32 byte_offset, u64 v_min, u64 v_max, u64 mask, u32 shift)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  u64 v_diff = v_max - v_min + 1;
-  u64 r_mask = max_pow2 (v_diff) - 1;
-  u64 v0, v1;
-  void *random_data;
-
-  random_data = clib_random_buffer_get_data
-    (&vm->random_buffer, n_buffers * max_bits / BITS (u8));
-  v0 = v1 = v_min;
-
-  while (n_buffers >= 4)
-    {
-      vlib_buffer_t *b0, *b1, *b2, *b3;
-      void *a0, *a1;
-      u64 r0 = 0, r1 = 0;	/* warnings be gone */
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-      b1 = vlib_get_buffer (vm, buffers[1]);
-      b2 = vlib_get_buffer (vm, buffers[2]);
-      b3 = vlib_get_buffer (vm, buffers[3]);
-      buffers += 2;
-      n_buffers -= 2;
-
-      a0 = (void *) b0 + byte_offset;
-      a1 = (void *) b1 + byte_offset;
-      CLIB_PREFETCH ((void *) b2 + byte_offset, sizeof (v_min), WRITE);
-      CLIB_PREFETCH ((void *) b3 + byte_offset, sizeof (v_min), WRITE);
-
-      switch (max_bits)
-	{
-#define _(n)					\
-	  case BITS (u##n):			\
-	    {					\
-	      u##n * r = random_data;		\
-	      r0 = r[0];			\
-	      r1 = r[1];			\
-	      random_data = r + 2;		\
-	    }					\
-	  break;
-
-	  _(8);
-	  _(16);
-	  _(32);
-	  _(64);
-
-#undef _
-	}
-
-      /* Add power of 2 sized random number which may be out of range. */
-      v0 += r0 & r_mask;
-      v1 += r1 & r_mask;
-
-      /* Twice should be enough to reduce to v_min .. v_max range. */
-      v0 = v0 > v_max ? v0 - v_diff : v0;
-      v1 = v1 > v_max ? v1 - v_diff : v1;
-      v0 = v0 > v_max ? v0 - v_diff : v0;
-      v1 = v1 > v_max ? v1 - v_diff : v1;
-
-      setbits_2 (a0, a1, v0, v1, v_min, v_max, max_bits, n_bits, mask, shift,
-		 /* is_increment */ 0);
-
-      ASSERT (validate_buffer_data (b0, s));
-      ASSERT (validate_buffer_data (b1, s));
-    }
-
-  while (n_buffers > 0)
-    {
-      vlib_buffer_t *b0;
-      void *a0;
-      u64 r0 = 0;		/* warnings be gone */
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-      buffers += 1;
-      n_buffers -= 1;
-
-      a0 = (void *) b0 + byte_offset;
-
-      switch (max_bits)
-	{
-#define _(n)					\
-	  case BITS (u##n):			\
-	    {					\
-	      u##n * r = random_data;		\
-	      r0 = r[0];			\
-	      random_data = r + 1;		\
-	    }					\
-	  break;
-
-	  _(8);
-	  _(16);
-	  _(32);
-	  _(64);
-
-#undef _
-	}
-
-      /* Add power of 2 sized random number which may be out of range. */
-      v0 += r0 & r_mask;
-
-      /* Twice should be enough to reduce to v_min .. v_max range. */
-      v0 = v0 > v_max ? v0 - v_diff : v0;
-      v0 = v0 > v_max ? v0 - v_diff : v0;
-
-      setbits_1 (a0, v0, v_min, v_max, max_bits, n_bits, mask, shift);
-
-      ASSERT (validate_buffer_data (b0, s));
-    }
-}
-
-static u64
-do_it (pg_main_t * pg,
-       pg_stream_t * s,
-       u32 * buffers,
-       u32 n_buffers,
-       u32 lo_bit, u32 hi_bit,
-       u64 v_min, u64 v_max, u64 v, pg_edit_type_t edit_type)
-{
-  u32 max_bits, l0, l1, h1, start_bit;
-
-  if (v_min == v_max)
-    edit_type = PG_EDIT_FIXED;
-
-  l0 = lo_bit / BITS (u8);
-  l1 = lo_bit % BITS (u8);
-  h1 = hi_bit % BITS (u8);
-
-  start_bit = l0 * BITS (u8);
-
-  max_bits = hi_bit - start_bit;
-  ASSERT (max_bits <= 64);
-
-#define _(n)						\
-  case (n):						\
-    if (edit_type == PG_EDIT_INCREMENT)			\
-      v = do_set_increment (pg, s, buffers, n_buffers,	\
-			    BITS (u##n),		\
-			    l0,				\
-			    /* is_net_byte_order */ 1,	\
-			    /* want sum */ 0, 0,	\
-			    v_min, v_max,		\
-			    v);				\
-    else if (edit_type == PG_EDIT_RANDOM)		\
-      do_set_random (pg, s, buffers, n_buffers,		\
-		     BITS (u##n),			\
-		     l0,				\
-		     /* is_net_byte_order */ 1,		\
-		     /* want sum */ 0, 0,		\
-		     v_min, v_max);			\
-    else /* edit_type == PG_EDIT_FIXED */		\
-      do_set_fixed (pg, s, buffers, n_buffers,		\
-		    BITS (u##n),			\
-		    l0,					\
-		    /* is_net_byte_order */ 1,		\
-		    v_min, v_max);			\
-  goto done;
-
-  if (l1 == 0 && h1 == 0)
-    {
-      switch (max_bits)
-	{
-	  _(8);
-	  _(16);
-	  _(32);
-	  _(64);
-	}
-    }
-
-#undef _
-
-  {
-    u64 mask;
-    u32 shift = l1;
-    u32 n_bits = max_bits;
-
-    max_bits = clib_max (max_pow2 (n_bits), 8);
-
-    mask = ((u64) 1 << (u64) n_bits) - 1;
-    mask &= ~(((u64) 1 << (u64) shift) - 1);
-
-    mask <<= max_bits - n_bits;
-    shift += max_bits - n_bits;
-
-    switch (max_bits)
-      {
-#define _(n)								\
-	case (n):							\
-	  if (edit_type == PG_EDIT_INCREMENT)				\
-	    v = do_setbits_increment (pg, s, buffers, n_buffers,	\
-				      BITS (u##n), n_bits,		\
-				      l0, v_min, v_max, v,		\
-				      mask, shift);			\
-	  else if (edit_type == PG_EDIT_RANDOM)				\
-	    do_setbits_random (pg, s, buffers, n_buffers,		\
-			       BITS (u##n), n_bits,			\
-			       l0, v_min, v_max,			\
-			       mask, shift);				\
-	  else /* edit_type == PG_EDIT_FIXED */				\
-	    do_setbits_fixed (pg, s, buffers, n_buffers,		\
-			      BITS (u##n), n_bits,			\
-			      l0, v_min, v_max,				\
-			      mask, shift);				\
-	goto done;
-
-	_(8);
-	_(16);
-	_(32);
-	_(64);
-
-#undef _
-      }
-  }
-
-done:
-  return v;
-}
-
-static void
-pg_generate_set_lengths (pg_main_t * pg,
-			 pg_stream_t * s, u32 * buffers, u32 n_buffers)
-{
-  u64 v_min, v_max, length_sum;
-  pg_edit_type_t edit_type;
-
-  v_min = s->min_packet_bytes;
-  v_max = s->max_packet_bytes;
-  edit_type = s->packet_size_edit_type;
-
-  if (edit_type == PG_EDIT_INCREMENT)
-    s->last_increment_packet_size
-      = do_set_increment (pg, s, buffers, n_buffers,
-			  8 * STRUCT_SIZE_OF (vlib_buffer_t, current_length),
-			  STRUCT_OFFSET_OF (vlib_buffer_t, current_length),
-			  /* is_net_byte_order */ 0,
-			  /* want sum */ 1, &length_sum,
-			  v_min, v_max, s->last_increment_packet_size);
-
-  else if (edit_type == PG_EDIT_RANDOM)
-    do_set_random (pg, s, buffers, n_buffers,
-		   8 * STRUCT_SIZE_OF (vlib_buffer_t, current_length),
-		   STRUCT_OFFSET_OF (vlib_buffer_t, current_length),
-		   /* is_net_byte_order */ 0,
-		   /* want sum */ 1, &length_sum,
-		   v_min, v_max);
-
-  else				/* edit_type == PG_EDIT_FIXED */
-    {
-      do_set_fixed (pg, s, buffers, n_buffers,
-		    8 * STRUCT_SIZE_OF (vlib_buffer_t, current_length),
-		    STRUCT_OFFSET_OF (vlib_buffer_t, current_length),
-		    /* is_net_byte_order */ 0,
-		    v_min, v_max);
-      length_sum = v_min * n_buffers;
-    }
-
-  {
-    vnet_main_t *vnm = vnet_get_main ();
-    vnet_interface_main_t *im = &vnm->interface_main;
-    vnet_sw_interface_t *si =
-      vnet_get_sw_interface (vnm, s->sw_if_index[VLIB_RX]);
-
-    vlib_increment_combined_counter (im->combined_sw_if_counters
-				     + VNET_INTERFACE_COUNTER_RX,
-				     os_get_cpu_number (),
-				     si->sw_if_index, n_buffers, length_sum);
-  }
-
-}
-
-static void
-pg_generate_fix_multi_buffer_lengths (pg_main_t * pg,
-				      pg_stream_t * s,
-				      u32 * buffers, u32 n_buffers)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  pg_buffer_index_t *pbi;
-  uword n_bytes_left;
-  static u32 *unused_buffers = 0;
-
-  while (n_buffers > 0)
-    {
-      vlib_buffer_t *b;
-      u32 bi;
-
-      bi = buffers[0];
-      b = vlib_get_buffer (vm, bi);
-
-      /* Current length here is length of whole packet. */
-      n_bytes_left = b->current_length;
-
-      pbi = s->buffer_indices;
-      while (1)
-	{
-	  uword n = clib_min (n_bytes_left, s->buffer_bytes);
-
-	  b->current_length = n;
-	  n_bytes_left -= n;
-	  if (n_bytes_left > 0)
-	    b->flags |= VLIB_BUFFER_NEXT_PRESENT;
-	  else
-	    b->flags &= ~VLIB_BUFFER_NEXT_PRESENT;
-
-	  /* Return unused buffers to fifos. */
-	  if (n == 0)
-	    vec_add1 (unused_buffers, bi);
-
-	  pbi++;
-	  if (pbi >= vec_end (s->buffer_indices))
-	    break;
-
-	  bi = b->next_buffer;
-	  b = vlib_get_buffer (vm, bi);
-	}
-      ASSERT (n_bytes_left == 0);
-
-      buffers += 1;
-      n_buffers -= 1;
-    }
-
-  if (vec_len (unused_buffers) > 0)
-    {
-      vlib_buffer_free_no_next (vm, unused_buffers, vec_len (unused_buffers));
-      _vec_len (unused_buffers) = 0;
-    }
-}
-
-static void
-pg_generate_edit (pg_main_t * pg,
-		  pg_stream_t * s, u32 * buffers, u32 n_buffers)
-{
-  pg_edit_t *e;
-
-  vec_foreach (e, s->non_fixed_edits)
-  {
-    switch (e->type)
-      {
-      case PG_EDIT_RANDOM:
-      case PG_EDIT_INCREMENT:
-	{
-	  u32 lo_bit, hi_bit;
-	  u64 v_min, v_max;
-
-	  v_min = pg_edit_get_value (e, PG_EDIT_LO);
-	  v_max = pg_edit_get_value (e, PG_EDIT_HI);
-
-	  hi_bit = (BITS (u8) * STRUCT_OFFSET_OF (vlib_buffer_t, data)
-		    + BITS (u8) + e->lsb_bit_offset);
-	  lo_bit = hi_bit - e->n_bits;
-
-	  e->last_increment_value
-	    = do_it (pg, s, buffers, n_buffers, lo_bit, hi_bit, v_min, v_max,
-		     e->last_increment_value, e->type);
-	}
-	break;
-
-      case PG_EDIT_UNSPECIFIED:
-	break;
-
-      default:
-	/* Should not be any fixed edits left. */
-	ASSERT (0);
-	break;
-      }
-  }
-
-  /* Call any edit functions to e.g. completely IP lengths, checksums, ... */
-  {
-    int i;
-    for (i = vec_len (s->edit_groups) - 1; i >= 0; i--)
-      {
-	pg_edit_group_t *g = s->edit_groups + i;
-	if (g->edit_function)
-	  g->edit_function (pg, s, g, buffers, n_buffers);
-      }
-  }
-}
-
-static void
-pg_set_next_buffer_pointers (pg_main_t * pg,
-			     pg_stream_t * s,
-			     u32 * buffers, u32 * next_buffers, u32 n_buffers)
-{
-  vlib_main_t *vm = vlib_get_main ();
-
-  while (n_buffers >= 4)
-    {
-      u32 ni0, ni1;
-      vlib_buffer_t *b0, *b1;
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-      b1 = vlib_get_buffer (vm, buffers[1]);
-      ni0 = next_buffers[0];
-      ni1 = next_buffers[1];
-
-      vlib_prefetch_buffer_with_index (vm, buffers[2], WRITE);
-      vlib_prefetch_buffer_with_index (vm, buffers[3], WRITE);
-
-      b0->flags |= VLIB_BUFFER_NEXT_PRESENT;
-      b1->flags |= VLIB_BUFFER_NEXT_PRESENT;
-      b0->next_buffer = ni0;
-      b1->next_buffer = ni1;
-
-      buffers += 2;
-      next_buffers += 2;
-      n_buffers -= 2;
-    }
-
-  while (n_buffers > 0)
-    {
-      u32 ni0;
-      vlib_buffer_t *b0;
-
-      b0 = vlib_get_buffer (vm, buffers[0]);
-      ni0 = next_buffers[0];
-      buffers += 1;
-      next_buffers += 1;
-      n_buffers -= 1;
-
-      b0->flags |= VLIB_BUFFER_NEXT_PRESENT;
-      b0->next_buffer = ni0;
-    }
-}
-
-static_always_inline void
-init_replay_buffers_inline (vlib_main_t * vm,
-			    pg_stream_t * s,
-			    u32 * buffers,
-			    u32 n_buffers, u32 data_offset, u32 n_data)
-{
-  u32 n_left, *b, i, l;
-
-  n_left = n_buffers;
-  b = buffers;
-  i = s->current_replay_packet_index;
-  l = vec_len (s->replay_packet_templates);
-
-  while (n_left >= 1)
-    {
-      u32 bi0, n0;
-      vlib_buffer_t *b0;
-      u8 *d0;
-
-      bi0 = b[0];
-      b += 1;
-      n_left -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      vnet_buffer (b0)->sw_if_index[VLIB_RX] = s->sw_if_index[VLIB_RX];
-      /* was s->sw_if_index[VLIB_TX]; */
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-
-      d0 = vec_elt (s->replay_packet_templates, i);
-
-      n0 = n_data;
-      if (data_offset + n_data >= vec_len (d0))
-	n0 = vec_len (d0) > data_offset ? vec_len (d0) - data_offset : 0;
-
-      b0->current_length = n0;
-
-      clib_memcpy (b0->data, d0 + data_offset, n0);
-      i = i + 1 == l ? 0 : i + 1;
-    }
-}
-
-static_always_inline void
-init_buffers_inline (vlib_main_t * vm,
-		     pg_stream_t * s,
-		     u32 * buffers,
-		     u32 n_buffers, u32 data_offset, u32 n_data, u32 set_data)
-{
-  u32 n_left, *b;
-  u8 *data, *mask;
-
-  if (vec_len (s->replay_packet_templates) > 0)
-    return init_replay_buffers_inline (vm, s, buffers, n_buffers, data_offset,
-				       n_data);
-
-  data = s->fixed_packet_data + data_offset;
-  mask = s->fixed_packet_data_mask + data_offset;
-  if (data + n_data >= vec_end (s->fixed_packet_data))
-    n_data = (data < vec_end (s->fixed_packet_data)
-	      ? vec_end (s->fixed_packet_data) - data : 0);
-  if (n_data > 0)
-    {
-      ASSERT (data + n_data <= vec_end (s->fixed_packet_data));
-      ASSERT (mask + n_data <= vec_end (s->fixed_packet_data_mask));
-    }
-
-  n_left = n_buffers;
-  b = buffers;
-
-  while (n_left >= 4)
-    {
-      u32 bi0, bi1;
-      vlib_buffer_t *b0, *b1;
-
-      /* Prefetch next iteration. */
-      vlib_prefetch_buffer_with_index (vm, b[2], STORE);
-      vlib_prefetch_buffer_with_index (vm, b[3], STORE);
-
-      bi0 = b[0];
-      bi1 = b[1];
-      b += 2;
-      n_left -= 2;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      vnet_buffer (b0)->sw_if_index[VLIB_RX] =
-	vnet_buffer (b1)->sw_if_index[VLIB_RX] = s->sw_if_index[VLIB_RX];
-
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] =
-	vnet_buffer (b1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-
-      if (set_data)
-	{
-	  clib_memcpy (b0->data, data, n_data);
-	  clib_memcpy (b1->data, data, n_data);
-	}
-      else
-	{
-	  ASSERT (validate_buffer_data2 (b0, s, data_offset, n_data));
-	  ASSERT (validate_buffer_data2 (b1, s, data_offset, n_data));
-	}
-    }
-
-  while (n_left >= 1)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-
-      bi0 = b[0];
-      b += 1;
-      n_left -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      vnet_buffer (b0)->sw_if_index[VLIB_RX] = s->sw_if_index[VLIB_RX];
-      /* s->sw_if_index[VLIB_TX]; */
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-
-      if (set_data)
-	clib_memcpy (b0->data, data, n_data);
-      else
-	ASSERT (validate_buffer_data2 (b0, s, data_offset, n_data));
-    }
-}
-
-static void
-pg_buffer_init (vlib_main_t * vm,
-		vlib_buffer_free_list_t * fl, u32 * buffers, u32 n_buffers)
-{
-  pg_main_t *pg = &pg_main;
-  pg_stream_t *s;
-  uword bi, si;
-
-  si = fl->buffer_init_function_opaque & pow2_mask (24);
-  bi = fl->buffer_init_function_opaque >> 24;
-
-  s = pool_elt_at_index (pg->streams, si);
-
-  init_buffers_inline (vm, s, buffers, n_buffers,
-		       /* data_offset */ bi * s->buffer_bytes,
-		       /* n_data */ s->buffer_bytes,
-		       /* set_data */ 1);
-}
-
-static u32
-pg_stream_fill_helper (pg_main_t * pg,
-		       pg_stream_t * s,
-		       pg_buffer_index_t * bi,
-		       u32 * buffers, u32 * next_buffers, u32 n_alloc)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vlib_buffer_free_list_t *f;
-  uword is_start_of_packet = bi == s->buffer_indices;
-  u32 n_allocated;
-
-  f = vlib_buffer_get_free_list (vm, bi->free_list_index);
-
-  /*
-   * Historically, the pg maintained its own free lists and
-   * device drivers tx paths would return pkts. With the DPDK,
-   * that doesn't happen.
-   */
-  if (DPDK == 0 && !(s->flags & PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE))
-    f->buffer_init_function = pg_buffer_init;
-  f->buffer_init_function_opaque =
-    (s - pg->streams) | ((bi - s->buffer_indices) << 24);
-
-  if (is_start_of_packet)
-    vnet_buffer (&f->buffer_init_template)->sw_if_index[VLIB_RX]
-      = vnet_main.local_interface_sw_if_index;
-
-  n_allocated = vlib_buffer_alloc_from_free_list (vm,
-						  buffers,
-						  n_alloc,
-						  bi->free_list_index);
-  if (n_allocated == 0)
-    return 0;
-
-  /*
-   * We can't assume we got all the buffers we asked for...
-   * This never worked until recently.
-   */
-  n_alloc = n_allocated;
-
-  /* Reinitialize buffers */
-  if (DPDK == 0 || CLIB_DEBUG > 0
-      || (s->flags & PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE))
-    init_buffers_inline
-      (vm, s,
-       buffers,
-       n_alloc, (bi - s->buffer_indices) * s->buffer_bytes /* data offset */ ,
-       s->buffer_bytes,
-       /* set_data */
-       DPDK == 1 || (s->flags & PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE) != 0);
-
-  if (next_buffers)
-    pg_set_next_buffer_pointers (pg, s, buffers, next_buffers, n_alloc);
-
-  if (is_start_of_packet)
-    {
-      if (vec_len (s->replay_packet_templates) > 0)
-	{
-	  vnet_main_t *vnm = vnet_get_main ();
-	  vnet_interface_main_t *im = &vnm->interface_main;
-	  vnet_sw_interface_t *si =
-	    vnet_get_sw_interface (vnm, s->sw_if_index[VLIB_RX]);
-	  u32 l = 0;
-	  u32 i;
-	  for (i = 0; i < n_alloc; i++)
-	    l += vlib_buffer_index_length_in_chain (vm, buffers[i]);
-	  vlib_increment_combined_counter (im->combined_sw_if_counters
-					   + VNET_INTERFACE_COUNTER_RX,
-					   os_get_cpu_number (),
-					   si->sw_if_index, n_alloc, l);
-	  s->current_replay_packet_index += n_alloc;
-	  s->current_replay_packet_index %=
-	    vec_len (s->replay_packet_templates);
-	}
-      else
-	{
-	  pg_generate_set_lengths (pg, s, buffers, n_alloc);
-	  if (vec_len (s->buffer_indices) > 1)
-	    pg_generate_fix_multi_buffer_lengths (pg, s, buffers, n_alloc);
-
-	  pg_generate_edit (pg, s, buffers, n_alloc);
-	}
-    }
-
-  return n_alloc;
-}
-
-static u32
-pg_stream_fill (pg_main_t * pg, pg_stream_t * s, u32 n_buffers)
-{
-  pg_buffer_index_t *bi;
-  word i, n_in_fifo, n_alloc, n_free, n_added;
-  u32 *tail, *start, *end, *last_tail, *last_start;
-
-  bi = s->buffer_indices;
-
-  n_in_fifo = clib_fifo_elts (bi->buffer_fifo);
-  if (n_in_fifo >= n_buffers)
-    return n_in_fifo;
-
-  n_alloc = n_buffers - n_in_fifo;
-
-  /* Round up, but never generate more than limit. */
-  n_alloc = clib_max (VLIB_FRAME_SIZE, n_alloc);
-
-  if (s->n_packets_limit > 0
-      && s->n_packets_generated + n_in_fifo + n_alloc >= s->n_packets_limit)
-    {
-      n_alloc = s->n_packets_limit - s->n_packets_generated - n_in_fifo;
-      if (n_alloc < 0)
-	n_alloc = 0;
-    }
-
-  /* All buffer fifos should have the same size. */
-  if (CLIB_DEBUG > 0)
-    {
-      uword l = ~0, e;
-      vec_foreach (bi, s->buffer_indices)
-      {
-	e = clib_fifo_elts (bi->buffer_fifo);
-	if (bi == s->buffer_indices)
-	  l = e;
-	ASSERT (l == e);
-      }
-    }
-
-  last_tail = last_start = 0;
-  n_added = n_alloc;
-
-  for (i = vec_len (s->buffer_indices) - 1; i >= 0; i--)
-    {
-      bi = vec_elt_at_index (s->buffer_indices, i);
-
-      n_free = clib_fifo_free_elts (bi->buffer_fifo);
-      if (n_free < n_alloc)
-	clib_fifo_resize (bi->buffer_fifo, n_alloc - n_free);
-
-      tail = clib_fifo_advance_tail (bi->buffer_fifo, n_alloc);
-      start = bi->buffer_fifo;
-      end = clib_fifo_end (bi->buffer_fifo);
-
-      if (tail + n_alloc <= end)
-	{
-	  n_added =
-	    pg_stream_fill_helper (pg, s, bi, tail, last_tail, n_alloc);
-	}
-      else
-	{
-	  u32 n = clib_min (end - tail, n_alloc);
-	  n_added = pg_stream_fill_helper (pg, s, bi, tail, last_tail, n);
-
-	  if (n_added == n && n_alloc > n_added)
-	    {
-	      n_added += pg_stream_fill_helper
-		(pg, s, bi, start, last_start, n_alloc - n_added);
-	    }
-	}
-
-      if (PREDICT_FALSE (n_added < n_alloc))
-	tail = clib_fifo_advance_tail (bi->buffer_fifo, n_added - n_alloc);
-
-      last_tail = tail;
-      last_start = start;
-
-      /* Verify that pkts in the fifo are properly allocated */
-    }
-
-  return n_in_fifo + n_added;
-}
-
-typedef struct
-{
-  u32 stream_index;
-
-  u32 packet_length;
-
-  /* Use pre data for packet data. */
-  vlib_buffer_t buffer;
-} pg_input_trace_t;
-
-static u8 *
-format_pg_input_trace (u8 * s, va_list * va)
-{
-  vlib_main_t *vm = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  pg_input_trace_t *t = va_arg (*va, pg_input_trace_t *);
-  pg_main_t *pg = &pg_main;
-  pg_stream_t *stream;
-  vlib_node_t *n;
-  uword indent = format_get_indent (s);
-
-  stream = 0;
-  if (!pool_is_free_index (pg->streams, t->stream_index))
-    stream = pool_elt_at_index (pg->streams, t->stream_index);
-
-  if (stream)
-    s = format (s, "stream %v", pg->streams[t->stream_index].name);
-  else
-    s = format (s, "stream %d", t->stream_index);
-
-  s = format (s, ", %d bytes", t->packet_length);
-
-  s = format (s, "\n%U%U",
-	      format_white_space, indent, format_vlib_buffer, &t->buffer);
-
-  s = format (s, "\n%U", format_white_space, indent);
-
-  n = 0;
-  if (stream)
-    n = vlib_get_node (vm, stream->node_index);
-
-  if (n && n->format_buffer)
-    s = format (s, "%U", n->format_buffer,
-		t->buffer.pre_data, sizeof (t->buffer.pre_data));
-  else
-    s = format (s, "%U",
-		format_hex_bytes, t->buffer.pre_data,
-		ARRAY_LEN (t->buffer.pre_data));
-  return s;
-}
-
-static void
-pg_input_trace (pg_main_t * pg,
-		vlib_node_runtime_t * node,
-		pg_stream_t * s, u32 * buffers, u32 n_buffers)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  u32 *b, n_left, stream_index, next_index;
-
-  n_left = n_buffers;
-  b = buffers;
-  stream_index = s - pg->streams;
-  next_index = s->next_index;
-
-  while (n_left >= 2)
-    {
-      u32 bi0, bi1;
-      vlib_buffer_t *b0, *b1;
-      pg_input_trace_t *t0, *t1;
-
-      bi0 = b[0];
-      bi1 = b[1];
-      b += 2;
-      n_left -= 2;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      vlib_trace_buffer (vm, node, next_index, b0, /* follow_chain */ 1);
-      vlib_trace_buffer (vm, node, next_index, b1, /* follow_chain */ 1);
-
-      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-      t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
-
-      t0->stream_index = stream_index;
-      t1->stream_index = stream_index;
-
-      t0->packet_length = vlib_buffer_length_in_chain (vm, b0);
-      t1->packet_length = vlib_buffer_length_in_chain (vm, b1);
-
-      clib_memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
-      clib_memcpy (&t1->buffer, b1, sizeof (b1[0]) - sizeof (b1->pre_data));
-
-      clib_memcpy (t0->buffer.pre_data, b0->data,
-		   sizeof (t0->buffer.pre_data));
-      clib_memcpy (t1->buffer.pre_data, b1->data,
-		   sizeof (t1->buffer.pre_data));
-    }
-
-  while (n_left >= 1)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      pg_input_trace_t *t0;
-
-      bi0 = b[0];
-      b += 1;
-      n_left -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      vlib_trace_buffer (vm, node, next_index, b0, /* follow_chain */ 1);
-      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-
-      t0->stream_index = stream_index;
-      t0->packet_length = vlib_buffer_length_in_chain (vm, b0);
-      clib_memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
-      clib_memcpy (t0->buffer.pre_data, b0->data,
-		   sizeof (t0->buffer.pre_data));
-    }
-}
-
-static uword
-pg_generate_packets (vlib_node_runtime_t * node,
-		     pg_main_t * pg,
-		     pg_stream_t * s, uword n_packets_to_generate)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  u32 *to_next, n_this_frame, n_left, n_trace, n_packets_in_fifo;
-  uword n_packets_generated;
-  pg_buffer_index_t *bi, *bi0;
-  u32 next_index = s->next_index;
-  vnet_feature_main_t *fm = &feature_main;
-  vnet_feature_config_main_t *cm;
-  u8 feature_arc_index = fm->device_input_feature_arc_index;
-  cm = &fm->feature_config_mains[feature_arc_index];
-  u32 current_config_index = ~(u32) 0;
-  int i;
-
-  bi0 = s->buffer_indices;
-
-  n_packets_in_fifo = pg_stream_fill (pg, s, n_packets_to_generate);
-  n_packets_to_generate = clib_min (n_packets_in_fifo, n_packets_to_generate);
-  n_packets_generated = 0;
-
-  if (PREDICT_FALSE
-      (vnet_have_features (feature_arc_index, s->sw_if_index[VLIB_RX])))
-    {
-      current_config_index =
-	vec_elt (cm->config_index_by_sw_if_index, s->sw_if_index[VLIB_RX]);
-      vnet_get_config_data (&cm->config_main, &current_config_index,
-			    &next_index, 0);
-    }
-
-  while (n_packets_to_generate > 0)
-    {
-      u32 *head, *start, *end;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left);
-
-      n_this_frame = n_packets_to_generate;
-      if (n_this_frame > n_left)
-	n_this_frame = n_left;
-
-      start = bi0->buffer_fifo;
-      end = clib_fifo_end (bi0->buffer_fifo);
-      head = clib_fifo_head (bi0->buffer_fifo);
-
-      if (head + n_this_frame <= end)
-	vlib_copy_buffers (to_next, head, n_this_frame);
-      else
-	{
-	  u32 n = end - head;
-	  vlib_copy_buffers (to_next + 0, head, n);
-	  vlib_copy_buffers (to_next + n, start, n_this_frame - n);
-	}
-
-      vec_foreach (bi, s->buffer_indices)
-	clib_fifo_advance_head (bi->buffer_fifo, n_this_frame);
-
-      if (current_config_index != ~(u32) 0)
-	for (i = 0; i < n_this_frame; i++)
-	  {
-	    vlib_buffer_t *b;
-	    b = vlib_get_buffer (vm, to_next[i]);
-	    vnet_buffer (b)->device_input_feat.saved_next_index =
-	      s->next_index;
-	    vnet_buffer (b)->device_input_feat.buffer_advance = 0;
-	    b->current_config_index = current_config_index;
-	    b->feature_arc_index = feature_arc_index;
-	  }
-
-      n_trace = vlib_get_trace_count (vm, node);
-      if (n_trace > 0)
-	{
-	  u32 n = clib_min (n_trace, n_this_frame);
-	  pg_input_trace (pg, node, s, to_next, n);
-	  vlib_set_trace_count (vm, node, n_trace - n);
-	}
-      n_packets_to_generate -= n_this_frame;
-      n_packets_generated += n_this_frame;
-      n_left -= n_this_frame;
-      vlib_put_next_frame (vm, node, next_index, n_left);
-    }
-
-  return n_packets_generated;
-}
-
-static uword
-pg_input_stream (vlib_node_runtime_t * node, pg_main_t * pg, pg_stream_t * s)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  uword n_packets;
-  f64 time_now, dt;
-
-  if (s->n_packets_limit > 0 && s->n_packets_generated >= s->n_packets_limit)
-    {
-      pg_stream_enable_disable (pg, s, /* want_enabled */ 0);
-      return 0;
-    }
-
-  /* Apply rate limit. */
-  time_now = vlib_time_now (vm);
-  if (s->time_last_generate == 0)
-    s->time_last_generate = time_now;
-
-  dt = time_now - s->time_last_generate;
-  s->time_last_generate = time_now;
-
-  n_packets = VLIB_FRAME_SIZE;
-  if (s->rate_packets_per_second > 0)
-    {
-      s->packet_accumulator += dt * s->rate_packets_per_second;
-      n_packets = s->packet_accumulator;
-
-      /* Never allow accumulator to grow if we get behind. */
-      s->packet_accumulator -= n_packets;
-    }
-
-  /* Apply fixed limit. */
-  if (s->n_packets_limit > 0
-      && s->n_packets_generated + n_packets > s->n_packets_limit)
-    n_packets = s->n_packets_limit - s->n_packets_generated;
-
-  /* Generate up to one frame's worth of packets. */
-  if (n_packets > VLIB_FRAME_SIZE)
-    n_packets = VLIB_FRAME_SIZE;
-
-  if (n_packets > 0)
-    n_packets = pg_generate_packets (node, pg, s, n_packets);
-
-  s->n_packets_generated += n_packets;
-
-  return n_packets;
-}
-
-uword
-pg_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  uword i;
-  pg_main_t *pg = &pg_main;
-  uword n_packets = 0;
-  u32 worker_index = 0;
-
-  if (vlib_num_workers ())
-    worker_index = vlib_get_current_worker_index ();
-
-  /* *INDENT-OFF* */
-  clib_bitmap_foreach (i, pg->enabled_streams[worker_index], ({
-    pg_stream_t *s = vec_elt_at_index (pg->streams, i);
-    n_packets += pg_input_stream (node, pg, s);
-  }));
-  /* *INDENT-ON* */
-
-  return n_packets;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (pg_input_node) = {
-  .function = pg_input,
-  .name = "pg-input",
-  .sibling_of = "device-input",
-  .type = VLIB_NODE_TYPE_INPUT,
-
-  .format_trace = format_pg_input_trace,
-
-  /* Input node will be left disabled until a stream is active. */
-  .state = VLIB_NODE_STATE_DISABLED,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/pg/output.c b/vnet/vnet/pg/output.c
deleted file mode 100644
index 3d1f2660..00000000
--- a/vnet/vnet/pg/output.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pg_output.c: packet generator output
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-
-uword
-pg_output (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  pg_main_t *pg = &pg_main;
-  u32 *buffers = vlib_frame_args (frame);
-  uword n_buffers = frame->n_vectors;
-  uword n_left = n_buffers;
-  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
-  pg_interface_t *pif = pool_elt_at_index (pg->interfaces, rd->dev_instance);
-
-  if (PREDICT_FALSE (pif->lockp != 0))
-    while (__sync_lock_test_and_set (pif->lockp, 1))
-      ;
-
-  if (pif->pcap_file_name != 0)
-    {
-      while (n_left > 0)
-	{
-	  n_left--;
-	  u32 bi0 = buffers[0];
-	  buffers++;
-
-	  pcap_add_buffer (&pif->pcap_main, vm, bi0,
-			   ETHERNET_MAX_PACKET_BYTES);
-	}
-      pcap_write (&pif->pcap_main);
-    }
-
-  vlib_buffer_free (vm, vlib_frame_args (frame), n_buffers);
-  if (PREDICT_FALSE (pif->lockp != 0))
-    *pif->lockp = 0;
-  return n_buffers;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/pg/pg.h b/vnet/vnet/pg/pg.h
deleted file mode 100644
index a4027834..00000000
--- a/vnet/vnet/pg/pg.h
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pg.h: VLIB packet generator
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vlib_pg_h
-#define included_vlib_pg_h
-
-#include <vlib/vlib.h>		/* for VLIB_N_RX_TX */
-#include <vnet/pg/edit.h>
-#include <vppinfra/fifo.h>	/* for buffer_fifo */
-#include <vnet/unix/pcap.h>
-#include <vnet/interface.h>
-
-extern vnet_device_class_t pg_dev_class;
-
-struct pg_main_t;
-struct pg_stream_t;
-
-typedef struct pg_edit_group_t
-{
-  /* Edits in this group. */
-  pg_edit_t *edits;
-
-  /* Vector of non-fixed edits for this group. */
-  pg_edit_t *non_fixed_edits;
-
-  /* Fixed edits for this group. */
-  u8 *fixed_packet_data;
-  u8 *fixed_packet_data_mask;
-
-  /* Byte offset where packet data begins. */
-  u32 start_byte_offset;
-
-  /* Number of packet bytes for this edit group. */
-  u32 n_packet_bytes;
-
-  /* Function to perform miscellaneous edits (e.g. set IP checksum, ...). */
-  void (*edit_function) (struct pg_main_t * pg,
-			 struct pg_stream_t * s,
-			 struct pg_edit_group_t * g,
-			 u32 * buffers, u32 n_buffers);
-
-  /* Opaque data for edit function's use. */
-  uword edit_function_opaque;
-} pg_edit_group_t;
-
-/* Packets are made of multiple buffers chained together.
-   This struct keeps track of data per-chain index. */
-typedef struct
-{
-  /* Vector of buffer edits for this stream and buffer index. */
-  pg_edit_t *edits;
-
-  /* Buffers pre-initialized with fixed buffer data for this stream. */
-  u32 *buffer_fifo;
-
-  /* Buffer free list for this buffer index in stream. */
-  u32 free_list_index;
-} pg_buffer_index_t;
-
-typedef struct pg_stream_t
-{
-  /* Stream name. */
-  u8 *name;
-
-  u32 flags;
-
-  /* Stream is currently enabled. */
-#define PG_STREAM_FLAGS_IS_ENABLED (1 << 0)
-#define PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE (1 << 1)
-
-  /* Edit groups are created by each protocol level (e.g. ethernet,
-     ip4, tcp, ...). */
-  pg_edit_group_t *edit_groups;
-
-  pg_edit_type_t packet_size_edit_type;
-
-  /* Min/max packet size. */
-  u32 min_packet_bytes, max_packet_bytes;
-
-  /* Vector of non-fixed edits for this stream.
-     All fixed edits are performed and placed into fixed_packet_data. */
-  pg_edit_t *non_fixed_edits;
-
-  /* Packet data with all fixed edits performed.
-     All packets in stream are initialized according with this data.
-     Mask specifies which bits of packet data are covered by fixed edits. */
-  u8 *fixed_packet_data, *fixed_packet_data_mask;
-
-  /* Size to use for buffers.  0 means use buffers big enough
-     for max_packet_bytes. */
-  u32 buffer_bytes;
-
-  /* Last packet length if packet size edit type is increment. */
-  u32 last_increment_packet_size;
-
-  /* Index into main interface pool for this stream. */
-  u32 pg_if_index;
-
-  /* Interface used to mark packets for this stream.  May be different
-     than hw/sw index from pg main interface pool.  They will be
-     different if this stream is being used generate buffers as if
-     they were received on a non-pg interface.  For example, suppose you
-     are trying to test vlan code and you want to generate buffers that
-     appear to come from an ethernet interface. */
-  u32 sw_if_index[VLIB_N_RX_TX];
-
-  /* Node where stream's buffers get put. */
-  u32 node_index;
-
-  /* Worker thread index */
-  u32 worker_index;
-
-  /* Output next index to reach output node from stream input node. */
-  u32 next_index;
-
-  u32 if_id;
-
-  /* Number of packets currently generated. */
-  u64 n_packets_generated;
-
-  /* Stream is disabled when packet limit is reached.
-     Zero means no packet limit. */
-  u64 n_packets_limit;
-
-  /* Rate for this stream in packets/second.
-     Zero means unlimited rate. */
-  f64 rate_packets_per_second;
-
-  f64 time_last_generate;
-
-  f64 packet_accumulator;
-
-  pg_buffer_index_t *buffer_indices;
-
-  u8 **replay_packet_templates;
-  u32 current_replay_packet_index;
-} pg_stream_t;
-
-always_inline void
-pg_buffer_index_free (pg_buffer_index_t * bi)
-{
-  vec_free (bi->edits);
-  clib_fifo_free (bi->buffer_fifo);
-}
-
-always_inline void
-pg_edit_group_free (pg_edit_group_t * g)
-{
-  pg_edit_t *e;
-  vec_foreach (e, g->edits) pg_edit_free (e);
-  vec_free (g->edits);
-  vec_free (g->fixed_packet_data);
-  vec_free (g->fixed_packet_data_mask);
-}
-
-always_inline void
-pg_stream_free (pg_stream_t * s)
-{
-  pg_edit_group_t *g;
-  pg_edit_t *e;
-  vec_foreach (e, s->non_fixed_edits) pg_edit_free (e);
-  vec_free (s->non_fixed_edits);
-  vec_foreach (g, s->edit_groups) pg_edit_group_free (g);
-  vec_free (s->edit_groups);
-  vec_free (s->fixed_packet_data);
-  vec_free (s->fixed_packet_data_mask);
-  vec_free (s->name);
-
-  {
-    pg_buffer_index_t *bi;
-    vec_foreach (bi, s->buffer_indices) pg_buffer_index_free (bi);
-    vec_free (s->buffer_indices);
-  }
-}
-
-always_inline int
-pg_stream_is_enabled (pg_stream_t * s)
-{
-  return (s->flags & PG_STREAM_FLAGS_IS_ENABLED) != 0;
-}
-
-always_inline pg_edit_group_t *
-pg_stream_get_group (pg_stream_t * s, u32 group_index)
-{
-  return vec_elt_at_index (s->edit_groups, group_index);
-}
-
-always_inline void *
-pg_create_edit_group (pg_stream_t * s,
-		      int n_edit_bytes, int n_packet_bytes, u32 * group_index)
-{
-  pg_edit_group_t *g;
-  int n_edits;
-
-  vec_add2 (s->edit_groups, g, 1);
-  if (group_index)
-    *group_index = g - s->edit_groups;
-
-  ASSERT (n_edit_bytes % sizeof (pg_edit_t) == 0);
-  n_edits = n_edit_bytes / sizeof (pg_edit_t);
-  vec_resize (g->edits, n_edits);
-
-  g->n_packet_bytes = n_packet_bytes;
-
-  return g->edits;
-}
-
-always_inline void *
-pg_add_edits (pg_stream_t * s, int n_edit_bytes, int n_packet_bytes,
-	      u32 group_index)
-{
-  pg_edit_group_t *g = pg_stream_get_group (s, group_index);
-  pg_edit_t *e;
-  int n_edits;
-  ASSERT (n_edit_bytes % sizeof (pg_edit_t) == 0);
-  n_edits = n_edit_bytes / sizeof (pg_edit_t);
-  vec_add2 (g->edits, e, n_edits);
-  g->n_packet_bytes += n_packet_bytes;
-  return e;
-}
-
-always_inline void *
-pg_get_edit_group (pg_stream_t * s, u32 group_index)
-{
-  pg_edit_group_t *g = pg_stream_get_group (s, group_index);
-  return g->edits;
-}
-
-/* Number of bytes for all groups >= given group. */
-always_inline uword
-pg_edit_group_n_bytes (pg_stream_t * s, u32 group_index)
-{
-  pg_edit_group_t *g;
-  uword n_bytes = 0;
-
-  for (g = s->edit_groups + group_index; g < vec_end (s->edit_groups); g++)
-    n_bytes += g->n_packet_bytes;
-  return n_bytes;
-}
-
-always_inline void
-pg_free_edit_group (pg_stream_t * s)
-{
-  uword i = vec_len (s->edit_groups) - 1;
-  pg_edit_group_t *g = pg_stream_get_group (s, i);
-
-  pg_edit_group_free (g);
-  memset (g, 0, sizeof (g[0]));
-  _vec_len (s->edit_groups) = i;
-}
-
-typedef struct
-{
-  /* TX lock */
-  volatile u32 *lockp;
-
-  /* VLIB interface indices. */
-  u32 hw_if_index, sw_if_index;
-
-  /* Identifies stream for this interface. */
-  u32 id;
-
-  pcap_main_t pcap_main;
-  u8 *pcap_file_name;
-} pg_interface_t;
-
-/* Per VLIB node data. */
-typedef struct
-{
-  /* Parser function indexed by node index. */
-  unformat_function_t *unformat_edit;
-} pg_node_t;
-
-typedef struct pg_main_t
-{
-  /* Pool of streams. */
-  pg_stream_t *streams;
-
-  /* Bitmap indicating which streams are currently enabled. */
-  uword **enabled_streams;
-
-  /* Hash mapping name -> stream index. */
-  uword *stream_index_by_name;
-
-  /* Pool of interfaces. */
-  pg_interface_t *interfaces;
-  uword *if_index_by_if_id;
-
-  /* Per VLIB node information. */
-  pg_node_t *nodes;
-} pg_main_t;
-
-/* Global main structure. */
-extern pg_main_t pg_main;
-
-/* Global node. */
-extern vlib_node_registration_t pg_input_node;
-
-/* Buffer generator input, output node functions. */
-vlib_node_function_t pg_input, pg_output;
-
-/* Stream add/delete. */
-void pg_stream_del (pg_main_t * pg, uword index);
-void pg_stream_add (pg_main_t * pg, pg_stream_t * s_init);
-
-/* Enable/disable stream. */
-void pg_stream_enable_disable (pg_main_t * pg, pg_stream_t * s,
-			       int is_enable);
-
-/* Find/create free packet-generator interface index. */
-u32 pg_interface_add_or_get (pg_main_t * pg, uword stream_index);
-
-always_inline pg_node_t *
-pg_get_node (uword node_index)
-{
-  pg_main_t *pg = &pg_main;
-  vec_validate (pg->nodes, node_index);
-  return pg->nodes + node_index;
-}
-
-void pg_edit_group_get_fixed_packet_data (pg_stream_t * s,
-					  u32 group_index,
-					  void *fixed_packet_data,
-					  void *fixed_packet_data_mask);
-
-void pg_enable_disable (u32 stream_index, int is_enable);
-
-typedef struct
-{
-  u32 hw_if_index;
-  u32 dev_instance;
-  u8 is_enabled;
-  u8 *pcap_file_name;
-  u32 count;
-} pg_capture_args_t;
-
-clib_error_t *pg_capture (pg_capture_args_t * a);
-
-#endif /* included_vlib_pg_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/pg/stream.c b/vnet/vnet/pg/stream.c
deleted file mode 100644
index 1ed7189f..00000000
--- a/vnet/vnet/pg/stream.c
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pg_stream.c: packet generator streams
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/mpls/mpls.h>
-#include <vnet/devices/devices.h>
-
-/* Mark stream active or inactive. */
-void
-pg_stream_enable_disable (pg_main_t * pg, pg_stream_t * s, int want_enabled)
-{
-  vlib_main_t *vm;
-  vnet_main_t *vnm = vnet_get_main ();
-  pg_interface_t *pi = pool_elt_at_index (pg->interfaces, s->pg_if_index);
-
-  want_enabled = want_enabled != 0;
-
-  if (pg_stream_is_enabled (s) == want_enabled)
-    /* No change necessary. */
-    return;
-
-  if (want_enabled)
-    s->n_packets_generated = 0;
-
-  /* Toggle enabled flag. */
-  s->flags ^= PG_STREAM_FLAGS_IS_ENABLED;
-
-  ASSERT (!pool_is_free (pg->streams, s));
-
-  vec_validate (pg->enabled_streams, s->worker_index);
-  pg->enabled_streams[s->worker_index] =
-    clib_bitmap_set (pg->enabled_streams[s->worker_index], s - pg->streams,
-		     want_enabled);
-
-  if (want_enabled)
-    {
-      vnet_hw_interface_set_flags (vnm, pi->hw_if_index,
-				   VNET_HW_INTERFACE_FLAG_LINK_UP);
-
-      vnet_sw_interface_set_flags (vnm, pi->sw_if_index,
-				   VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-    }
-
-  if (vlib_num_workers ())
-    vm = vlib_get_worker_vlib_main (s->worker_index);
-  else
-    vm = vlib_get_main ();
-
-  vlib_node_set_state (vm, pg_input_node.index,
-		       (clib_bitmap_is_zero
-			(pg->enabled_streams[s->worker_index]) ?
-			VLIB_NODE_STATE_DISABLED : VLIB_NODE_STATE_POLLING));
-
-  s->packet_accumulator = 0;
-  s->time_last_generate = 0;
-}
-
-static u8 *
-format_pg_interface_name (u8 * s, va_list * args)
-{
-  pg_main_t *pg = &pg_main;
-  u32 if_index = va_arg (*args, u32);
-  pg_interface_t *pi;
-
-  pi = pool_elt_at_index (pg->interfaces, if_index);
-  s = format (s, "pg%d", pi->id);
-
-  return s;
-}
-
-static clib_error_t *
-pg_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
-{
-  u32 hw_flags = 0;
-
-  if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
-    hw_flags = VNET_HW_INTERFACE_FLAG_LINK_UP;
-
-  vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (pg_dev_class) = {
-  .name = "pg",
-  .tx_function = pg_output,
-  .format_device_name = format_pg_interface_name,
-  .admin_up_down_function = pg_interface_admin_up_down,
-};
-/* *INDENT-ON* */
-
-static u8 *
-pg_build_rewrite (vnet_main_t * vnm,
-		  u32 sw_if_index,
-		  vnet_link_t link_type, const void *dst_address)
-{
-  u8 *rewrite = NULL;
-  u16 *h;
-
-  vec_validate (rewrite, sizeof (*h) - 1);
-  h = (u16 *) rewrite;
-  h[0] = clib_host_to_net_u16 (vnet_link_to_l3_proto (link_type));
-
-  return (rewrite);
-}
-
-/* *INDENT-OFF* */
-VNET_HW_INTERFACE_CLASS (pg_interface_class,static) = {
-  .name = "Packet generator",
-  .build_rewrite = pg_build_rewrite,
-};
-/* *INDENT-ON* */
-
-static u32
-pg_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, u32 flags)
-{
-  /* nothing for now */
-  return 0;
-}
-
-u32
-pg_interface_add_or_get (pg_main_t * pg, uword if_id)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-  pg_interface_t *pi;
-  vnet_hw_interface_t *hi;
-  uword *p;
-  u32 i;
-
-  p = hash_get (pg->if_index_by_if_id, if_id);
-
-  if (p)
-    {
-      return p[0];
-    }
-  else
-    {
-      u8 hw_addr[6];
-      f64 now = vlib_time_now (vm);
-      u32 rnd;
-
-      pool_get (pg->interfaces, pi);
-      i = pi - pg->interfaces;
-
-      rnd = (u32) (now * 1e6);
-      rnd = random_u32 (&rnd);
-      clib_memcpy (hw_addr + 2, &rnd, sizeof (rnd));
-      hw_addr[0] = 2;
-      hw_addr[1] = 0xfe;
-
-      pi->id = if_id;
-      ethernet_register_interface (vnm, pg_dev_class.index, i, hw_addr,
-				   &pi->hw_if_index, pg_eth_flag_change);
-      hi = vnet_get_hw_interface (vnm, pi->hw_if_index);
-      pi->sw_if_index = hi->sw_if_index;
-
-      hash_set (pg->if_index_by_if_id, if_id, i);
-
-      if (vlib_num_workers ())
-	{
-	  pi->lockp = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
-					      CLIB_CACHE_LINE_BYTES);
-	  *pi->lockp = 0;
-	}
-
-      ip4_sw_interface_enable_disable (pi->hw_if_index, 1);
-      ip6_sw_interface_enable_disable (pi->hw_if_index, 1);
-      mpls_sw_interface_enable_disable (&mpls_main, pi->hw_if_index, 1);
-    }
-
-  return i;
-}
-
-static void
-do_edit (pg_stream_t * stream,
-	 pg_edit_group_t * g, pg_edit_t * e, uword want_commit)
-{
-  u32 i, i0, i1, mask, n_bits_left;
-  u8 *v, *s, *m;
-
-  i0 = e->lsb_bit_offset / BITS (u8);
-
-  /* Make space for edit in value and mask. */
-  vec_validate (g->fixed_packet_data, i0);
-  vec_validate (g->fixed_packet_data_mask, i0);
-
-  if (e->type != PG_EDIT_FIXED)
-    {
-      switch (e->type)
-	{
-	case PG_EDIT_RANDOM:
-	case PG_EDIT_INCREMENT:
-	  e->last_increment_value = pg_edit_get_value (e, PG_EDIT_LO);
-	  break;
-
-	default:
-	  break;
-	}
-
-      if (want_commit)
-	{
-	  ASSERT (e->type != PG_EDIT_INVALID_TYPE);
-	  vec_add1 (g->non_fixed_edits, e[0]);
-	}
-      return;
-    }
-
-  s = g->fixed_packet_data;
-  m = g->fixed_packet_data_mask;
-
-  n_bits_left = e->n_bits;
-  i0 = e->lsb_bit_offset / BITS (u8);
-  i1 = e->lsb_bit_offset % BITS (u8);
-
-  v = e->values[PG_EDIT_LO];
-  i = pg_edit_n_alloc_bytes (e) - 1;
-
-  /* Odd low order bits?. */
-  if (i1 != 0 && n_bits_left > 0)
-    {
-      u32 n = clib_min (n_bits_left, BITS (u8) - i1);
-
-      mask = pow2_mask (n) << i1;
-
-      ASSERT (i0 < vec_len (s));
-      ASSERT (i < vec_len (v));
-      ASSERT ((v[i] & ~mask) == 0);
-
-      s[i0] |= v[i] & mask;
-      m[i0] |= mask;
-
-      i0--;
-      i--;
-      n_bits_left -= n;
-    }
-
-  /* Even bytes. */
-  while (n_bits_left >= 8)
-    {
-      ASSERT (i0 < vec_len (s));
-      ASSERT (i < vec_len (v));
-
-      s[i0] = v[i];
-      m[i0] = ~0;
-
-      i0--;
-      i--;
-      n_bits_left -= 8;
-    }
-
-  /* Odd high order bits. */
-  if (n_bits_left > 0)
-    {
-      mask = pow2_mask (n_bits_left);
-
-      ASSERT (i0 < vec_len (s));
-      ASSERT (i < vec_len (v));
-      ASSERT ((v[i] & ~mask) == 0);
-
-      s[i0] |= v[i] & mask;
-      m[i0] |= mask;
-    }
-
-  if (want_commit)
-    pg_edit_free (e);
-}
-
-void
-pg_edit_group_get_fixed_packet_data (pg_stream_t * s,
-				     u32 group_index,
-				     void *packet_data,
-				     void *packet_data_mask)
-{
-  pg_edit_group_t *g = pg_stream_get_group (s, group_index);
-  pg_edit_t *e;
-
-  vec_foreach (e, g->edits) do_edit (s, g, e, /* want_commit */ 0);
-
-  clib_memcpy (packet_data, g->fixed_packet_data,
-	       vec_len (g->fixed_packet_data));
-  clib_memcpy (packet_data_mask, g->fixed_packet_data_mask,
-	       vec_len (g->fixed_packet_data_mask));
-}
-
-static void
-perform_fixed_edits (pg_stream_t * s)
-{
-  pg_edit_group_t *g;
-  pg_edit_t *e;
-  word i;
-
-  for (i = vec_len (s->edit_groups) - 1; i >= 0; i--)
-    {
-      g = vec_elt_at_index (s->edit_groups, i);
-      vec_foreach (e, g->edits) do_edit (s, g, e, /* want_commit */ 1);
-
-      /* All edits have either been performed or added to
-         g->non_fixed_edits.  So, we can delete the vector. */
-      vec_free (g->edits);
-    }
-
-  vec_free (s->fixed_packet_data_mask);
-  vec_free (s->fixed_packet_data);
-  vec_foreach (g, s->edit_groups)
-  {
-    int i;
-    g->start_byte_offset = vec_len (s->fixed_packet_data);
-
-    /* Relocate and copy non-fixed edits from group to stream. */
-    vec_foreach (e, g->non_fixed_edits)
-      e->lsb_bit_offset += g->start_byte_offset * BITS (u8);
-
-    for (i = 0; i < vec_len (g->non_fixed_edits); i++)
-      ASSERT (g->non_fixed_edits[i].type != PG_EDIT_INVALID_TYPE);
-
-    vec_add (s->non_fixed_edits,
-	     g->non_fixed_edits, vec_len (g->non_fixed_edits));
-    vec_free (g->non_fixed_edits);
-
-    vec_add (s->fixed_packet_data,
-	     g->fixed_packet_data, vec_len (g->fixed_packet_data));
-    vec_add (s->fixed_packet_data_mask,
-	     g->fixed_packet_data_mask, vec_len (g->fixed_packet_data_mask));
-  }
-}
-
-void
-pg_stream_add (pg_main_t * pg, pg_stream_t * s_init)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  pg_stream_t *s;
-  uword *p;
-
-  if (!pg->stream_index_by_name)
-    pg->stream_index_by_name
-      = hash_create_vec (0, sizeof (s->name[0]), sizeof (uword));
-
-  /* Delete any old stream with the same name. */
-  if (s_init->name
-      && (p = hash_get_mem (pg->stream_index_by_name, s_init->name)))
-    {
-      pg_stream_del (pg, p[0]);
-    }
-
-  pool_get (pg->streams, s);
-  s[0] = s_init[0];
-
-  /* Give it a name. */
-  if (!s->name)
-    s->name = format (0, "stream%d", s - pg->streams);
-  else
-    s->name = vec_dup (s->name);
-
-  hash_set_mem (pg->stream_index_by_name, s->name, s - pg->streams);
-
-  /* Get fixed part of buffer data. */
-  if (s->edit_groups)
-    perform_fixed_edits (s);
-
-  /* Determine packet size. */
-  switch (s->packet_size_edit_type)
-    {
-    case PG_EDIT_INCREMENT:
-    case PG_EDIT_RANDOM:
-      if (s->min_packet_bytes == s->max_packet_bytes)
-	s->packet_size_edit_type = PG_EDIT_FIXED;
-      break;
-
-    default:
-      /* Get packet size from fixed edits. */
-      s->packet_size_edit_type = PG_EDIT_FIXED;
-      if (!s->replay_packet_templates)
-	s->min_packet_bytes = s->max_packet_bytes =
-	  vec_len (s->fixed_packet_data);
-      break;
-    }
-
-  s->last_increment_packet_size = s->min_packet_bytes;
-
-  {
-    pg_buffer_index_t *bi;
-    int n;
-
-#if DPDK > 0
-    s->buffer_bytes = VLIB_BUFFER_DATA_SIZE;
-#endif
-
-    if (!s->buffer_bytes)
-      s->buffer_bytes = s->max_packet_bytes;
-
-    s->buffer_bytes = vlib_buffer_round_size (s->buffer_bytes);
-
-    n = s->max_packet_bytes / s->buffer_bytes;
-    n += (s->max_packet_bytes % s->buffer_bytes) != 0;
-
-    vec_resize (s->buffer_indices, n);
-
-    vec_foreach (bi, s->buffer_indices)
-    {
-      bi->free_list_index =
-	vlib_buffer_create_free_list (vm, s->buffer_bytes,
-				      "pg stream %d buffer #%d",
-				      s - pg->streams,
-				      1 + (bi - s->buffer_indices));
-    }
-  }
-
-  /* Find an interface to use. */
-  s->pg_if_index = pg_interface_add_or_get (pg, s->if_id);
-
-  {
-    pg_interface_t *pi = pool_elt_at_index (pg->interfaces, s->pg_if_index);
-    vlib_rx_or_tx_t rx_or_tx;
-
-    vlib_foreach_rx_tx (rx_or_tx)
-    {
-      if (s->sw_if_index[rx_or_tx] == ~0)
-	s->sw_if_index[rx_or_tx] = pi->sw_if_index;
-    }
-  }
-
-  /* Connect the graph. */
-  s->next_index = vlib_node_add_next (vm, device_input_node.index,
-				      s->node_index);
-}
-
-void
-pg_stream_del (pg_main_t * pg, uword index)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  pg_stream_t *s;
-  pg_buffer_index_t *bi;
-
-  s = pool_elt_at_index (pg->streams, index);
-
-  pg_stream_enable_disable (pg, s, /* want_enabled */ 0);
-  hash_unset_mem (pg->stream_index_by_name, s->name);
-
-  vec_foreach (bi, s->buffer_indices)
-  {
-    vlib_buffer_delete_free_list (vm, bi->free_list_index);
-    clib_fifo_free (bi->buffer_fifo);
-  }
-
-  pg_stream_free (s);
-  pool_put (pg->streams, s);
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/pipeline.h b/vnet/vnet/pipeline.h
deleted file mode 100644
index a4aa5cf5..00000000
--- a/vnet/vnet/pipeline.h
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * vnet/pipeline.h: software pipeline
- *
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Usage example.
- *
- * #define NSTAGES 3 or whatever
- *
- * <Define pipeline stages>
- *
- * #include <vnet/pipeline.h>
- *
- * static uword my_node_fn (vlib_main_t * vm,
- *                               vlib_node_runtime_t * node,
- *                               vlib_frame_t * frame)
- * {
- *     return dispatch_pipeline (vm, node, frame);
- * }
- *
- */
-
-#ifndef NSTAGES
-#error files which #include <vnet/pipeline.h> must define NSTAGES
-#endif
-
-#ifndef STAGE_INLINE
-#define STAGE_INLINE inline
-#endif
-
-/*
- * A prefetch stride of 2 is quasi-equivalent to doubling the number
- * of stages with every other pipeline stage empty.
- */
-
-/*
- * This is a typical first pipeline stage, which prefetches
- * buffer metadata and the first line of pkt data.
- * To use it:
- *  #define stage0 generic_stage0
- */
-static STAGE_INLINE void
-generic_stage0 (vlib_main_t * vm,
-		vlib_node_runtime_t * node, u32 buffer_index)
-{
-  /* generic default stage 0 here */
-  vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
-  vlib_prefetch_buffer_header (b, STORE);
-  CLIB_PREFETCH (b->data, CLIB_CACHE_LINE_BYTES, STORE);
-}
-
-#if NSTAGES == 2
-
-static STAGE_INLINE uword
-dispatch_pipeline (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 *from = vlib_frame_vector_args (frame);
-  u32 n_left_from, n_left_to_next, *to_next, next_index, next0;
-  int pi, pi_limit;
-
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      pi_limit = clib_min (n_left_from, n_left_to_next);
-
-      for (pi = 0; pi < NSTAGES - 1; pi++)
-	{
-	  if (pi == pi_limit)
-	    break;
-	  stage0 (vm, node, from[pi]);
-	}
-
-      for (; pi < pi_limit; pi++)
-	{
-	  stage0 (vm, node, from[pi]);
-	  to_next[0] = from[pi - 1];
-	  to_next++;
-	  n_left_to_next--;
-	  next0 = last_stage (vm, node, from[pi - 1]);
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   from[pi - 1], next0);
-	  n_left_from--;
-	  if ((int) n_left_to_next < 0 && n_left_from > 0)
-	    vlib_get_next_frame (vm, node, next_index, to_next,
-				 n_left_to_next);
-	}
-
-      for (; pi < (pi_limit + (NSTAGES - 1)); pi++)
-	{
-	  if (((pi - 1) >= 0) && ((pi - 1) < pi_limit))
-	    {
-	      to_next[0] = from[pi - 1];
-	      to_next++;
-	      n_left_to_next--;
-	      next0 = last_stage (vm, node, from[pi - 1]);
-	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					       to_next, n_left_to_next,
-					       from[pi - 1], next0);
-	      n_left_from--;
-	      if ((int) n_left_to_next < 0 && n_left_from > 0)
-		vlib_get_next_frame (vm, node, next_index, to_next,
-				     n_left_to_next);
-	    }
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-      from += pi_limit;
-    }
-  return frame->n_vectors;
-}
-#endif
-
-#if NSTAGES == 3
-static STAGE_INLINE uword
-dispatch_pipeline (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 *from = vlib_frame_vector_args (frame);
-  u32 n_left_from, n_left_to_next, *to_next, next_index, next0;
-  int pi, pi_limit;
-
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      pi_limit = clib_min (n_left_from, n_left_to_next);
-
-      for (pi = 0; pi < NSTAGES - 1; pi++)
-	{
-	  if (pi == pi_limit)
-	    break;
-	  stage0 (vm, node, from[pi]);
-	  if (pi - 1 >= 0)
-	    stage1 (vm, node, from[pi - 1]);
-	}
-
-      for (; pi < pi_limit; pi++)
-	{
-	  stage0 (vm, node, from[pi]);
-	  stage1 (vm, node, from[pi - 1]);
-	  to_next[0] = from[pi - 2];
-	  to_next++;
-	  n_left_to_next--;
-	  next0 = last_stage (vm, node, from[pi - 2]);
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   from[pi - 2], next0);
-	  n_left_from--;
-	  if ((int) n_left_to_next < 0 && n_left_from > 0)
-	    vlib_get_next_frame (vm, node, next_index, to_next,
-				 n_left_to_next);
-	}
-
-
-      for (; pi < (pi_limit + (NSTAGES - 1)); pi++)
-	{
-	  if (((pi - 1) >= 0) && ((pi - 1) < pi_limit))
-	    stage1 (vm, node, from[pi - 1]);
-	  if (((pi - 2) >= 0) && ((pi - 2) < pi_limit))
-	    {
-	      to_next[0] = from[pi - 2];
-	      to_next++;
-	      n_left_to_next--;
-	      next0 = last_stage (vm, node, from[pi - 2]);
-	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					       to_next, n_left_to_next,
-					       from[pi - 2], next0);
-	      n_left_from--;
-	      if ((int) n_left_to_next < 0 && n_left_from > 0)
-		vlib_get_next_frame (vm, node, next_index, to_next,
-				     n_left_to_next);
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-      from += pi_limit;
-    }
-  return frame->n_vectors;
-}
-#endif
-
-#if NSTAGES == 4
-static STAGE_INLINE uword
-dispatch_pipeline (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 *from = vlib_frame_vector_args (frame);
-  u32 n_left_from, n_left_to_next, *to_next, next_index, next0;
-  int pi, pi_limit;
-
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      pi_limit = clib_min (n_left_from, n_left_to_next);
-
-      for (pi = 0; pi < NSTAGES - 1; pi++)
-	{
-	  if (pi == pi_limit)
-	    break;
-	  stage0 (vm, node, from[pi]);
-	  if (pi - 1 >= 0)
-	    stage1 (vm, node, from[pi - 1]);
-	  if (pi - 2 >= 0)
-	    stage2 (vm, node, from[pi - 2]);
-	}
-
-      for (; pi < pi_limit; pi++)
-	{
-	  stage0 (vm, node, from[pi]);
-	  stage1 (vm, node, from[pi - 1]);
-	  stage2 (vm, node, from[pi - 2]);
-	  to_next[0] = from[pi - 3];
-	  to_next++;
-	  n_left_to_next--;
-	  next0 = last_stage (vm, node, from[pi - 3]);
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   from[pi - 3], next0);
-	  n_left_from--;
-	  if ((int) n_left_to_next < 0 && n_left_from > 0)
-	    vlib_get_next_frame (vm, node, next_index, to_next,
-				 n_left_to_next);
-	}
-
-
-      for (; pi < (pi_limit + (NSTAGES - 1)); pi++)
-	{
-	  if (((pi - 1) >= 0) && ((pi - 1) < pi_limit))
-	    stage1 (vm, node, from[pi - 1]);
-	  if (((pi - 2) >= 0) && ((pi - 2) < pi_limit))
-	    stage2 (vm, node, from[pi - 2]);
-	  if (((pi - 3) >= 0) && ((pi - 3) < pi_limit))
-	    {
-	      to_next[0] = from[pi - 3];
-	      to_next++;
-	      n_left_to_next--;
-	      next0 = last_stage (vm, node, from[pi - 3]);
-	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					       to_next, n_left_to_next,
-					       from[pi - 3], next0);
-	      n_left_from--;
-	      if ((int) n_left_to_next < 0 && n_left_from > 0)
-		vlib_get_next_frame (vm, node, next_index, to_next,
-				     n_left_to_next);
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-      from += pi_limit;
-    }
-  return frame->n_vectors;
-}
-#endif
-
-
-#if NSTAGES == 5
-static STAGE_INLINE uword
-dispatch_pipeline (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 *from = vlib_frame_vector_args (frame);
-  u32 n_left_from, n_left_to_next, *to_next, next_index, next0;
-  int pi, pi_limit;
-
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      pi_limit = clib_min (n_left_from, n_left_to_next);
-
-      for (pi = 0; pi < NSTAGES - 1; pi++)
-	{
-	  if (pi == pi_limit)
-	    break;
-	  stage0 (vm, node, from[pi]);
-	  if (pi - 1 >= 0)
-	    stage1 (vm, node, from[pi - 1]);
-	  if (pi - 2 >= 0)
-	    stage2 (vm, node, from[pi - 2]);
-	  if (pi - 3 >= 0)
-	    stage3 (vm, node, from[pi - 3]);
-	}
-
-      for (; pi < pi_limit; pi++)
-	{
-	  stage0 (vm, node, from[pi]);
-	  stage1 (vm, node, from[pi - 1]);
-	  stage2 (vm, node, from[pi - 2]);
-	  stage3 (vm, node, from[pi - 3]);
-	  to_next[0] = from[pi - 4];
-	  to_next++;
-	  n_left_to_next--;
-	  next0 = last_stage (vm, node, from[pi - 4]);
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   from[pi - 4], next0);
-	  n_left_from--;
-	  if ((int) n_left_to_next < 0 && n_left_from > 0)
-	    vlib_get_next_frame (vm, node, next_index, to_next,
-				 n_left_to_next);
-	}
-
-
-      for (; pi < (pi_limit + (NSTAGES - 1)); pi++)
-	{
-	  if (((pi - 1) >= 0) && ((pi - 1) < pi_limit))
-	    stage1 (vm, node, from[pi - 1]);
-	  if (((pi - 2) >= 0) && ((pi - 2) < pi_limit))
-	    stage2 (vm, node, from[pi - 2]);
-	  if (((pi - 3) >= 0) && ((pi - 3) < pi_limit))
-	    stage3 (vm, node, from[pi - 3]);
-	  if (((pi - 4) >= 0) && ((pi - 4) < pi_limit))
-	    {
-	      to_next[0] = from[pi - 4];
-	      to_next++;
-	      n_left_to_next--;
-	      next0 = last_stage (vm, node, from[pi - 4]);
-	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					       to_next, n_left_to_next,
-					       from[pi - 4], next0);
-	      n_left_from--;
-	      if ((int) n_left_to_next < 0 && n_left_from > 0)
-		vlib_get_next_frame (vm, node, next_index, to_next,
-				     n_left_to_next);
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-      from += pi_limit;
-    }
-  return frame->n_vectors;
-}
-#endif
-
-#if NSTAGES == 6
-static STAGE_INLINE uword
-dispatch_pipeline (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 *from = vlib_frame_vector_args (frame);
-  u32 n_left_from, n_left_to_next, *to_next, next_index, next0;
-  int pi, pi_limit;
-
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      pi_limit = clib_min (n_left_from, n_left_to_next);
-
-      for (pi = 0; pi < NSTAGES - 1; pi++)
-	{
-	  if (pi == pi_limit)
-	    break;
-	  stage0 (vm, node, from[pi]);
-	  if (pi - 1 >= 0)
-	    stage1 (vm, node, from[pi - 1]);
-	  if (pi - 2 >= 0)
-	    stage2 (vm, node, from[pi - 2]);
-	  if (pi - 3 >= 0)
-	    stage3 (vm, node, from[pi - 3]);
-	  if (pi - 4 >= 0)
-	    stage4 (vm, node, from[pi - 4]);
-	}
-
-      for (; pi < pi_limit; pi++)
-	{
-	  stage0 (vm, node, from[pi]);
-	  stage1 (vm, node, from[pi - 1]);
-	  stage2 (vm, node, from[pi - 2]);
-	  stage3 (vm, node, from[pi - 3]);
-	  stage4 (vm, node, from[pi - 4]);
-	  to_next[0] = from[pi - 5];
-	  to_next++;
-	  n_left_to_next--;
-	  next0 = last_stage (vm, node, from[pi - 5]);
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   from[pi - 5], next0);
-	  n_left_from--;
-	  if ((int) n_left_to_next < 0 && n_left_from > 0)
-	    vlib_get_next_frame (vm, node, next_index, to_next,
-				 n_left_to_next);
-	}
-
-
-      for (; pi < (pi_limit + (NSTAGES - 1)); pi++)
-	{
-	  if (((pi - 1) >= 0) && ((pi - 1) < pi_limit))
-	    stage1 (vm, node, from[pi - 1]);
-	  if (((pi - 2) >= 0) && ((pi - 2) < pi_limit))
-	    stage2 (vm, node, from[pi - 2]);
-	  if (((pi - 3) >= 0) && ((pi - 3) < pi_limit))
-	    stage3 (vm, node, from[pi - 3]);
-	  if (((pi - 4) >= 0) && ((pi - 4) < pi_limit))
-	    stage4 (vm, node, from[pi - 4]);
-	  if (((pi - 5) >= 0) && ((pi - 5) < pi_limit))
-	    {
-	      to_next[0] = from[pi - 5];
-	      to_next++;
-	      n_left_to_next--;
-	      next0 = last_stage (vm, node, from[pi - 5]);
-	      vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					       to_next, n_left_to_next,
-					       from[pi - 5], next0);
-	      n_left_from--;
-	      if ((int) n_left_to_next < 0 && n_left_from > 0)
-		vlib_get_next_frame (vm, node, next_index, to_next,
-				     n_left_to_next);
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-      from += pi_limit;
-    }
-  return frame->n_vectors;
-}
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/plugin/p1.c b/vnet/vnet/plugin/p1.c
deleted file mode 100644
index 3102ecce..00000000
--- a/vnet/vnet/plugin/p1.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* 
- * This file and in fact the entire directory shouldn't even exist.
- *
- * Unfortunately, various things malfunction when we try to go there. 
- * Plugin DLL's end up with their own copies of critical
- * data structures. No one of these problems would be tough to fix, 
- * but there are quite a number of them.
- */
-
-/* 
- * Make certain that plugin .dll's which reference the following functions
- * can find them...
- */
-
-#if DPDK > 0
-#define foreach_dpdk_plugin_reference		\
-_(rte_calloc)                                   \
-_(rte_free)                                     \
-_(rte_malloc)                                   \
-_(rte_zmalloc)                                  \
-_(rte_malloc_virt2phy)                          \
-_(rte_eal_get_configuration)
-#else
-#define foreach_dpdk_plugin_reference
-#endif
-
-#define _(a) void a (void);
-foreach_dpdk_plugin_reference
-#undef _
-
-void *vnet_library_plugin_references[] =
-  {
-#define _(a) &a,
-    foreach_dpdk_plugin_reference
-#undef _
-  };
-
-void vnet_library_plugin_reference(void) { }
diff --git a/vnet/vnet/plugin/plugin.h b/vnet/vnet/plugin/plugin.h
deleted file mode 100644
index a14a5932..00000000
--- a/vnet/vnet/plugin/plugin.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vnet_plugin_h
-#define included_vnet_plugin_h
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vppinfra/error.h>
-
-/* Pointers to Genuine Vnet data structures handed to plugin .dll's */
-typedef struct {
-  vnet_main_t * vnet_main;
-  ethernet_main_t * ethernet_main;
-} vnet_plugin_handoff_t;
-
-void * vnet_get_handoff_structure (void);
-
-#endif /* included_vnet_plugin_h */
diff --git a/vnet/vnet/policer/node_funcs.c b/vnet/vnet/policer/node_funcs.c
deleted file mode 100644
index 1f4997ff..00000000
--- a/vnet/vnet/policer/node_funcs.c
+++ /dev/null
@@ -1,938 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdint.h>
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/policer/policer.h>
-#include <vnet/ip/ip.h>
-#include <vnet/classify/policer_classify.h>
-#include <vnet/classify/vnet_classify.h>
-
-#define IP4_NON_DSCP_BITS 0x03
-#define IP4_DSCP_SHIFT    2
-#define IP6_NON_DSCP_BITS 0xf03fffff
-#define IP6_DSCP_SHIFT    22
-
-/* Dispatch functions meant to be instantiated elsewhere */
-
-typedef struct
-{
-  u32 next_index;
-  u32 sw_if_index;
-  u32 policer_index;
-} vnet_policer_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_policer_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  vnet_policer_trace_t *t = va_arg (*args, vnet_policer_trace_t *);
-
-  s = format (s, "VNET_POLICER: sw_if_index %d policer_index %d next %d",
-	      t->sw_if_index, t->policer_index, t->next_index);
-  return s;
-}
-
-#define foreach_vnet_policer_error              \
-_(TRANSMIT, "Packets Transmitted")              \
-_(DROP, "Packets Dropped")
-
-typedef enum
-{
-#define _(sym,str) VNET_POLICER_ERROR_##sym,
-  foreach_vnet_policer_error
-#undef _
-    VNET_POLICER_N_ERROR,
-} vnet_policer_error_t;
-
-static char *vnet_policer_error_strings[] = {
-#define _(sym,string) string,
-  foreach_vnet_policer_error
-#undef _
-};
-
-static_always_inline void
-vnet_policer_mark (vlib_buffer_t * b, u8 dscp)
-{
-  ethernet_header_t *eh;
-  ip4_header_t *ip4h;
-  ip6_header_t *ip6h;
-  u16 type;
-
-  eh = (ethernet_header_t *) b->data;
-  type = clib_net_to_host_u16 (eh->type);
-
-  if (PREDICT_TRUE (type == ETHERNET_TYPE_IP4))
-    {
-      ip4h = (ip4_header_t *) & (b->data[sizeof (ethernet_header_t)]);;
-      ip4h->tos &= IP4_NON_DSCP_BITS;
-      ip4h->tos |= dscp << IP4_DSCP_SHIFT;
-      ip4h->checksum = ip4_header_checksum (ip4h);
-    }
-  else
-    {
-      if (PREDICT_TRUE (type == ETHERNET_TYPE_IP6))
-	{
-	  ip6h = (ip6_header_t *) & (b->data[sizeof (ethernet_header_t)]);
-	  ip6h->ip_version_traffic_class_and_flow_label &=
-	    clib_host_to_net_u32 (IP6_NON_DSCP_BITS);
-	  ip6h->ip_version_traffic_class_and_flow_label |=
-	    clib_host_to_net_u32 (dscp << IP6_DSCP_SHIFT);
-	}
-    }
-}
-
-static_always_inline
-  u8 vnet_policer_police (vlib_main_t * vm,
-			  vlib_buffer_t * b,
-			  u32 policer_index,
-			  u64 time_in_policer_periods,
-			  policer_result_e packet_color)
-{
-  u8 act;
-  u32 len;
-  u32 col;
-  policer_read_response_type_st *pol;
-  vnet_policer_main_t *pm = &vnet_policer_main;
-
-  len = vlib_buffer_length_in_chain (vm, b);
-  pol = &pm->policers[policer_index];
-  col = vnet_police_packet (pol, len, packet_color, time_in_policer_periods);
-  act = pol->action[col];
-  if (PREDICT_TRUE (act == SSE2_QOS_ACTION_MARK_AND_TRANSMIT))
-    vnet_policer_mark (b, pol->mark_dscp[col]);
-
-  return act;
-}
-
-static inline uword
-vnet_policer_inline (vlib_main_t * vm,
-		     vlib_node_runtime_t * node,
-		     vlib_frame_t * frame, vnet_policer_index_t which)
-{
-  u32 n_left_from, *from, *to_next;
-  vnet_policer_next_t next_index;
-  vnet_policer_main_t *pm = &vnet_policer_main;
-  u64 time_in_policer_periods;
-  u32 transmitted = 0;
-
-  time_in_policer_periods =
-    clib_cpu_time_now () >> POLICER_TICKS_PER_PERIOD_SHIFT;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-	  u32 sw_if_index0, sw_if_index1;
-	  u32 pi0 = 0, pi1 = 0;
-	  u8 act0, act1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *b2, *b3;
-
-	    b2 = vlib_get_buffer (vm, from[2]);
-	    b3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (b2, LOAD);
-	    vlib_prefetch_buffer_header (b3, LOAD);
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  next0 = VNET_POLICER_NEXT_TRANSMIT;
-
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-	  next1 = VNET_POLICER_NEXT_TRANSMIT;
-
-
-	  if (which == VNET_POLICER_INDEX_BY_SW_IF_INDEX)
-	    {
-	      pi0 = pm->policer_index_by_sw_if_index[sw_if_index0];
-	      pi1 = pm->policer_index_by_sw_if_index[sw_if_index1];
-	    }
-
-	  if (which == VNET_POLICER_INDEX_BY_OPAQUE)
-	    {
-	      pi0 = vnet_buffer (b0)->policer.index;
-	      pi1 = vnet_buffer (b1)->policer.index;
-	    }
-
-	  if (which == VNET_POLICER_INDEX_BY_EITHER)
-	    {
-	      pi0 = vnet_buffer (b0)->policer.index;
-	      pi0 = (pi0 != ~0) ? pi0 :
-		pm->policer_index_by_sw_if_index[sw_if_index0];
-	      pi1 = vnet_buffer (b1)->policer.index;
-	      pi1 = (pi1 != ~0) ? pi1 :
-		pm->policer_index_by_sw_if_index[sw_if_index1];
-	    }
-
-	  act0 = vnet_policer_police (vm, b0, pi0, time_in_policer_periods,
-				      POLICE_CONFORM /* no chaining */ );
-
-	  act1 = vnet_policer_police (vm, b1, pi1, time_in_policer_periods,
-				      POLICE_CONFORM /* no chaining */ );
-
-	  if (PREDICT_FALSE (act0 == SSE2_QOS_ACTION_DROP))	/* drop action */
-	    {
-	      next0 = VNET_POLICER_NEXT_DROP;
-	      b0->error = node->errors[VNET_POLICER_ERROR_DROP];
-	    }
-	  else			/* transmit or mark-and-transmit action */
-	    {
-	      transmitted++;
-	    }
-
-	  if (PREDICT_FALSE (act1 == SSE2_QOS_ACTION_DROP))	/* drop action */
-	    {
-	      next1 = VNET_POLICER_NEXT_DROP;
-	      b1->error = node->errors[VNET_POLICER_ERROR_DROP];
-	    }
-	  else			/* transmit or mark-and-transmit action */
-	    {
-	      transmitted++;
-	    }
-
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  vnet_policer_trace_t *t =
-		    vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->sw_if_index = sw_if_index0;
-		  t->next_index = next0;
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  vnet_policer_trace_t *t =
-		    vlib_add_trace (vm, node, b1, sizeof (*t));
-		  t->sw_if_index = sw_if_index1;
-		  t->next_index = next1;
-		}
-	    }
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 sw_if_index0;
-	  u32 pi0 = 0;
-	  u8 act0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  next0 = VNET_POLICER_NEXT_TRANSMIT;
-
-	  if (which == VNET_POLICER_INDEX_BY_SW_IF_INDEX)
-	    pi0 = pm->policer_index_by_sw_if_index[sw_if_index0];
-
-	  if (which == VNET_POLICER_INDEX_BY_OPAQUE)
-	    pi0 = vnet_buffer (b0)->policer.index;
-
-	  if (which == VNET_POLICER_INDEX_BY_EITHER)
-	    {
-	      pi0 = vnet_buffer (b0)->policer.index;
-	      pi0 = (pi0 != ~0) ? pi0 :
-		pm->policer_index_by_sw_if_index[sw_if_index0];
-	    }
-
-	  act0 = vnet_policer_police (vm, b0, pi0, time_in_policer_periods,
-				      POLICE_CONFORM /* no chaining */ );
-
-	  if (PREDICT_FALSE (act0 == SSE2_QOS_ACTION_DROP))	/* drop action */
-	    {
-	      next0 = VNET_POLICER_NEXT_DROP;
-	      b0->error = node->errors[VNET_POLICER_ERROR_DROP];
-	    }
-	  else			/* transmit or mark-and-transmit action */
-	    {
-	      transmitted++;
-	    }
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      vnet_policer_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = sw_if_index0;
-	      t->next_index = next0;
-	      t->policer_index = pi0;
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, node->node_index,
-			       VNET_POLICER_ERROR_TRANSMIT, transmitted);
-  return frame->n_vectors;
-}
-
-uword
-vnet_policer_by_sw_if_index (vlib_main_t * vm,
-			     vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return vnet_policer_inline (vm, node, frame,
-			      VNET_POLICER_INDEX_BY_SW_IF_INDEX);
-}
-
-uword
-vnet_policer_by_opaque (vlib_main_t * vm,
-			vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return vnet_policer_inline (vm, node, frame, VNET_POLICER_INDEX_BY_OPAQUE);
-}
-
-uword
-vnet_policer_by_either (vlib_main_t * vm,
-			vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return vnet_policer_inline (vm, node, frame, VNET_POLICER_INDEX_BY_EITHER);
-}
-
-void
-vnet_policer_node_funcs_reference (void)
-{
-}
-
-
-#define TEST_CODE 1
-
-#ifdef TEST_CODE
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (policer_by_sw_if_index_node, static) = {
-  .function = vnet_policer_by_sw_if_index,
-  .name = "policer-by-sw-if-index",
-  .vector_size = sizeof (u32),
-  .format_trace = format_policer_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(vnet_policer_error_strings),
-  .error_strings = vnet_policer_error_strings,
-
-  .n_next_nodes = VNET_POLICER_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [VNET_POLICER_NEXT_TRANSMIT] = "ethernet-input",
-    [VNET_POLICER_NEXT_DROP] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (policer_by_sw_if_index_node,
-			      vnet_policer_by_sw_if_index);
-/* *INDENT-ON* */
-
-
-int
-test_policer_add_del (u32 rx_sw_if_index, u8 * config_name, int is_add)
-{
-  vnet_policer_main_t *pm = &vnet_policer_main;
-  policer_read_response_type_st *template;
-  policer_read_response_type_st *policer;
-  vnet_hw_interface_t *rxhi;
-  uword *p;
-
-  rxhi = vnet_get_sup_hw_interface (pm->vnet_main, rx_sw_if_index);
-
-  /* Make sure caller didn't pass a vlan subif, etc. */
-  if (rxhi->sw_if_index != rx_sw_if_index)
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-  if (is_add)
-    {
-
-      p = hash_get_mem (pm->policer_config_by_name, config_name);
-
-      if (p == 0)
-	return -2;
-
-      template = pool_elt_at_index (pm->policer_templates, p[0]);
-
-      vnet_hw_interface_rx_redirect_to_node
-	(pm->vnet_main, rxhi->hw_if_index, policer_by_sw_if_index_node.index);
-
-      pool_get_aligned (pm->policers, policer, CLIB_CACHE_LINE_BYTES);
-
-      policer[0] = template[0];
-
-      vec_validate (pm->policer_index_by_sw_if_index, rx_sw_if_index);
-      pm->policer_index_by_sw_if_index[rx_sw_if_index]
-	= policer - pm->policers;
-    }
-  else
-    {
-      u32 pi;
-      vnet_hw_interface_rx_redirect_to_node (pm->vnet_main,
-					     rxhi->hw_if_index,
-					     ~0 /* disable */ );
-
-      pi = pm->policer_index_by_sw_if_index[rx_sw_if_index];
-      pm->policer_index_by_sw_if_index[rx_sw_if_index] = ~0;
-      pool_put_index (pm->policers, pi);
-    }
-
-  return 0;
-}
-
-static clib_error_t *
-test_policer_command_fn (vlib_main_t * vm,
-			 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_policer_main_t *pm = &vnet_policer_main;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u32 rx_sw_if_index;
-  int rv;
-  u8 *config_name = 0;
-  int rx_set = 0;
-  int is_add = 1;
-  int is_show = 0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "intfc %U", unformat_vnet_sw_interface,
-		    pm->vnet_main, &rx_sw_if_index))
-	rx_set = 1;
-      else if (unformat (line_input, "show"))
-	is_show = 1;
-      else if (unformat (line_input, "policer %s", &config_name))
-	;
-      else if (unformat (line_input, "del"))
-	is_add = 0;
-      else
-	break;
-    }
-
-  if (rx_set == 0)
-    return clib_error_return (0, "interface not set");
-
-  if (is_show)
-    {
-      u32 pi = pm->policer_index_by_sw_if_index[rx_sw_if_index];
-      policer_read_response_type_st *policer;
-      policer = pool_elt_at_index (pm->policers, pi);
-
-      vlib_cli_output (vm, "%U", format_policer_instance, policer);
-      return 0;
-    }
-
-  if (is_add && config_name == 0)
-    {
-      return clib_error_return (0, "policer config name required");
-    }
-
-  rv = test_policer_add_del (rx_sw_if_index, config_name, is_add);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    default:
-      return clib_error_return
-	(0, "WARNING: vnet_vnet_policer_add_del returned %d", rv);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (test_patch_command, static) = {
-    .path = "test policer",
-    .short_help =
-    "intfc <intfc> policer <policer-config-name> [del]",
-    .function = test_policer_command_fn,
-};
-/* *INDENT-ON* */
-
-#endif /* TEST_CODE */
-
-
-typedef struct
-{
-  u32 sw_if_index;
-  u32 next_index;
-  u32 table_index;
-  u32 offset;
-  u32 policer_index;
-} policer_classify_trace_t;
-
-static u8 *
-format_policer_classify_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  policer_classify_trace_t *t = va_arg (*args, policer_classify_trace_t *);
-
-  s = format (s, "POLICER_CLASSIFY: sw_if_index %d next %d table %d offset %d"
-	      " policer_index %d",
-	      t->sw_if_index, t->next_index, t->table_index, t->offset,
-	      t->policer_index);
-  return s;
-}
-
-#define foreach_policer_classify_error                 \
-_(MISS, "Policer classify misses")                     \
-_(HIT, "Policer classify hits")                        \
-_(CHAIN_HIT, "Polcier classify hits after chain walk") \
-_(DROP, "Policer classify action drop")
-
-typedef enum
-{
-#define _(sym,str) POLICER_CLASSIFY_ERROR_##sym,
-  foreach_policer_classify_error
-#undef _
-    POLICER_CLASSIFY_N_ERROR,
-} policer_classify_error_t;
-
-static char *policer_classify_error_strings[] = {
-#define _(sym,string) string,
-  foreach_policer_classify_error
-#undef _
-};
-
-static inline uword
-policer_classify_inline (vlib_main_t * vm,
-			 vlib_node_runtime_t * node,
-			 vlib_frame_t * frame,
-			 policer_classify_table_id_t tid)
-{
-  u32 n_left_from, *from, *to_next;
-  policer_classify_next_index_t next_index;
-  policer_classify_main_t *pcm = &policer_classify_main;
-  vnet_classify_main_t *vcm = pcm->vnet_classify_main;
-  f64 now = vlib_time_now (vm);
-  u32 hits = 0;
-  u32 misses = 0;
-  u32 chain_hits = 0;
-  u32 drop = 0;
-  u32 n_next_nodes;
-  u64 time_in_policer_periods;
-
-  time_in_policer_periods =
-    clib_cpu_time_now () >> POLICER_TICKS_PER_PERIOD_SHIFT;
-
-  n_next_nodes = node->n_next_nodes;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  /* First pass: compute hashes */
-  while (n_left_from > 2)
-    {
-      vlib_buffer_t *b0, *b1;
-      u32 bi0, bi1;
-      u8 *h0, *h1;
-      u32 sw_if_index0, sw_if_index1;
-      u32 table_index0, table_index1;
-      vnet_classify_table_t *t0, *t1;
-
-      /* Prefetch next iteration */
-      {
-	vlib_buffer_t *p1, *p2;
-
-	p1 = vlib_get_buffer (vm, from[1]);
-	p2 = vlib_get_buffer (vm, from[2]);
-
-	vlib_prefetch_buffer_header (p1, STORE);
-	CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE);
-	vlib_prefetch_buffer_header (p2, STORE);
-	CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-      }
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      h0 = b0->data;
-
-      bi1 = from[1];
-      b1 = vlib_get_buffer (vm, bi1);
-      h1 = b1->data;
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      table_index0 =
-	pcm->classify_table_index_by_sw_if_index[tid][sw_if_index0];
-
-      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-      table_index1 =
-	pcm->classify_table_index_by_sw_if_index[tid][sw_if_index1];
-
-      t0 = pool_elt_at_index (vcm->tables, table_index0);
-
-      t1 = pool_elt_at_index (vcm->tables, table_index1);
-
-      vnet_buffer (b0)->l2_classify.hash =
-	vnet_classify_hash_packet (t0, (u8 *) h0);
-
-      vnet_classify_prefetch_bucket (t0, vnet_buffer (b0)->l2_classify.hash);
-
-      vnet_buffer (b1)->l2_classify.hash =
-	vnet_classify_hash_packet (t1, (u8 *) h1);
-
-      vnet_classify_prefetch_bucket (t1, vnet_buffer (b1)->l2_classify.hash);
-
-      vnet_buffer (b0)->l2_classify.table_index = table_index0;
-
-      vnet_buffer (b1)->l2_classify.table_index = table_index1;
-
-      from += 2;
-      n_left_from -= 2;
-    }
-
-  while (n_left_from > 0)
-    {
-      vlib_buffer_t *b0;
-      u32 bi0;
-      u8 *h0;
-      u32 sw_if_index0;
-      u32 table_index0;
-      vnet_classify_table_t *t0;
-
-      bi0 = from[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      h0 = b0->data;
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      table_index0 =
-	pcm->classify_table_index_by_sw_if_index[tid][sw_if_index0];
-
-      t0 = pool_elt_at_index (vcm->tables, table_index0);
-      vnet_buffer (b0)->l2_classify.hash =
-	vnet_classify_hash_packet (t0, (u8 *) h0);
-
-      vnet_buffer (b0)->l2_classify.table_index = table_index0;
-      vnet_classify_prefetch_bucket (t0, vnet_buffer (b0)->l2_classify.hash);
-
-      from++;
-      n_left_from--;
-    }
-
-  next_index = node->cached_next_index;
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /* Not enough load/store slots to dual loop... */
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0 = POLICER_CLASSIFY_NEXT_INDEX_DROP;
-	  u32 table_index0;
-	  vnet_classify_table_t *t0;
-	  vnet_classify_entry_t *e0;
-	  u64 hash0;
-	  u8 *h0;
-	  u8 act0;
-
-	  /* Stride 3 seems to work best */
-	  if (PREDICT_TRUE (n_left_from > 3))
-	    {
-	      vlib_buffer_t *p1 = vlib_get_buffer (vm, from[3]);
-	      vnet_classify_table_t *tp1;
-	      u32 table_index1;
-	      u64 phash1;
-
-	      table_index1 = vnet_buffer (p1)->l2_classify.table_index;
-
-	      if (PREDICT_TRUE (table_index1 != ~0))
-		{
-		  tp1 = pool_elt_at_index (vcm->tables, table_index1);
-		  phash1 = vnet_buffer (p1)->l2_classify.hash;
-		  vnet_classify_prefetch_entry (tp1, phash1);
-		}
-	    }
-
-	  /* Speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  h0 = b0->data;
-	  table_index0 = vnet_buffer (b0)->l2_classify.table_index;
-	  e0 = 0;
-	  t0 = 0;
-
-	  if (tid == POLICER_CLASSIFY_TABLE_L2)
-	    {
-	      /* Feature bitmap update */
-	      vnet_buffer (b0)->l2.feature_bitmap &=
-		~L2INPUT_FEAT_POLICER_CLAS;
-	      /* Determine the next node */
-	      next0 =
-		feat_bitmap_get_next_node_index (pcm->feat_next_node_index,
-						 vnet_buffer (b0)->
-						 l2.feature_bitmap);
-	    }
-	  else
-	    vnet_get_config_data (pcm->vnet_config_main[tid],
-				  &b0->current_config_index, &next0,
-				  /* # bytes of config data */ 0);
-
-	  vnet_buffer (b0)->l2_classify.opaque_index = ~0;
-
-	  if (PREDICT_TRUE (table_index0 != ~0))
-	    {
-	      hash0 = vnet_buffer (b0)->l2_classify.hash;
-	      t0 = pool_elt_at_index (vcm->tables, table_index0);
-	      e0 = vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
-
-	      if (e0)
-		{
-		  act0 = vnet_policer_police (vm,
-					      b0,
-					      e0->next_index,
-					      time_in_policer_periods,
-					      e0->opaque_index);
-		  if (PREDICT_FALSE (act0 == SSE2_QOS_ACTION_DROP))
-		    {
-		      next0 = POLICER_CLASSIFY_NEXT_INDEX_DROP;
-		      b0->error = node->errors[POLICER_CLASSIFY_ERROR_DROP];
-		      drop++;
-		    }
-		  hits++;
-		}
-	      else
-		{
-		  while (1)
-		    {
-		      if (PREDICT_TRUE (t0->next_table_index != ~0))
-			{
-			  t0 = pool_elt_at_index (vcm->tables,
-						  t0->next_table_index);
-			}
-		      else
-			{
-			  next0 = (t0->miss_next_index < n_next_nodes) ?
-			    t0->miss_next_index : next0;
-			  misses++;
-			  break;
-			}
-
-		      hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
-		      e0 =
-			vnet_classify_find_entry (t0, (u8 *) h0, hash0, now);
-		      if (e0)
-			{
-			  act0 = vnet_policer_police (vm,
-						      b0,
-						      e0->next_index,
-						      time_in_policer_periods,
-						      e0->opaque_index);
-			  if (PREDICT_FALSE (act0 == SSE2_QOS_ACTION_DROP))
-			    {
-			      next0 = POLICER_CLASSIFY_NEXT_INDEX_DROP;
-			      b0->error =
-				node->errors[POLICER_CLASSIFY_ERROR_DROP];
-			      drop++;
-			    }
-			  hits++;
-			  chain_hits++;
-			  break;
-			}
-		    }
-		}
-	    }
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      policer_classify_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	      t->next_index = next0;
-	      t->table_index = t0 ? t0 - vcm->tables : ~0;
-	      t->offset = (e0 && t0) ? vnet_classify_get_offset (t0, e0) : ~0;
-	      t->policer_index = e0 ? e0->next_index : ~0;
-	    }
-
-	  /* Verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, node->node_index,
-			       POLICER_CLASSIFY_ERROR_MISS, misses);
-  vlib_node_increment_counter (vm, node->node_index,
-			       POLICER_CLASSIFY_ERROR_HIT, hits);
-  vlib_node_increment_counter (vm, node->node_index,
-			       POLICER_CLASSIFY_ERROR_CHAIN_HIT, chain_hits);
-  vlib_node_increment_counter (vm, node->node_index,
-			       POLICER_CLASSIFY_ERROR_DROP, drop);
-
-  return frame->n_vectors;
-}
-
-static uword
-ip4_policer_classify (vlib_main_t * vm,
-		      vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return policer_classify_inline (vm, node, frame,
-				  POLICER_CLASSIFY_TABLE_IP4);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_policer_classify_node) = {
-  .function = ip4_policer_classify,
-  .name = "ip4-policer-classify",
-  .vector_size = sizeof (u32),
-  .format_trace = format_policer_classify_trace,
-  .n_errors = ARRAY_LEN(policer_classify_error_strings),
-  .error_strings = policer_classify_error_strings,
-  .n_next_nodes = POLICER_CLASSIFY_NEXT_INDEX_N_NEXT,
-  .next_nodes = {
-    [POLICER_CLASSIFY_NEXT_INDEX_DROP] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_policer_classify_node, ip4_policer_classify);
-/* *INDENT-ON* */
-
-static uword
-ip6_policer_classify (vlib_main_t * vm,
-		      vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return policer_classify_inline (vm, node, frame,
-				  POLICER_CLASSIFY_TABLE_IP6);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_policer_classify_node) = {
-  .function = ip6_policer_classify,
-  .name = "ip6-policer-classify",
-  .vector_size = sizeof (u32),
-  .format_trace = format_policer_classify_trace,
-  .n_errors = ARRAY_LEN(policer_classify_error_strings),
-  .error_strings = policer_classify_error_strings,
-  .n_next_nodes = POLICER_CLASSIFY_NEXT_INDEX_N_NEXT,
-  .next_nodes = {
-    [POLICER_CLASSIFY_NEXT_INDEX_DROP] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_policer_classify_node, ip6_policer_classify);
-/* *INDENT-ON* */
-
-static uword
-l2_policer_classify (vlib_main_t * vm,
-		     vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return policer_classify_inline (vm, node, frame, POLICER_CLASSIFY_TABLE_L2);
-}
-
-VLIB_REGISTER_NODE (l2_policer_classify_node) =
-{
-  .function = l2_policer_classify,.name = "l2-policer-classify",.vector_size =
-    sizeof (u32),.format_trace = format_policer_classify_trace,.n_errors =
-    ARRAY_LEN (policer_classify_error_strings),.error_strings =
-    policer_classify_error_strings,.n_next_nodes =
-    POLICER_CLASSIFY_NEXT_INDEX_N_NEXT,.next_nodes =
-  {
-  [POLICER_CLASSIFY_NEXT_INDEX_DROP] = "error-drop",}
-,};
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2_policer_classify_node, l2_policer_classify);
-
-
-static clib_error_t *
-policer_classify_init (vlib_main_t * vm)
-{
-  policer_classify_main_t *pcm = &policer_classify_main;
-
-  pcm->vlib_main = vm;
-  pcm->vnet_main = vnet_get_main ();
-  pcm->vnet_classify_main = &vnet_classify_main;
-
-  /* Initialize L2 feature next-node indexes */
-  feat_bitmap_init_next_nodes (vm,
-			       l2_policer_classify_node.index,
-			       L2INPUT_N_FEAT,
-			       l2input_get_feat_names (),
-			       pcm->feat_next_node_index);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (policer_classify_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/policer/police.h b/vnet/vnet/policer/police.h
deleted file mode 100644
index 34bcf9ca..00000000
--- a/vnet/vnet/policer/police.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __POLICE_H__
-#define __POLICE_H__
-
-typedef enum
-{
-  POLICE_CONFORM = 0,
-  POLICE_EXCEED = 1,
-  POLICE_VIOLATE = 2,
-} policer_result_e;
-
-// This is the hardware representation of the policer.
-// To be multithread-safe, the policer is accessed through a spin-lock
-// on the lock field. (For a policer update operation, 24B needs to be
-// modified and this would be a challenge to do with atomic instructions.)
-// The structure is padded so that no other data is put into the same
-// 64B cache-line. This reduces cache-thrashing between threads.
-//
-// A note on scale:
-// The HW TSC tick is roughly one CPU clock cycle.
-// This is shifted to create a larger period, with a goal to be around 50usec.
-// The period time will vary based on CPU clock speed.
-// CPU speeds of 1Ghz to 8Ghz are targetted.
-// The shift amount is a constant 17 bits, resulting in a period between
-// 16usec (8Ghz CPU) and 131usec (1Ghz CPU).
-// The token_per_period computation takes into account the clock speed.
-//
-// The 32-bit bucket/limit supports about 850ms of burst on a 40GE port,
-// or 340ms on a 100GE port. If a larger burst is configued, then the
-// programmed value is simply capped at 2^32-1. If we needed to support
-// more than that, the bucket and limit fields could be expanded.
-//
-// tokens_per_period should be > 1000 to support 0.1% granularity.
-// To support lower rates (which would not meet this requirement), the packet
-// length, bucket, and limit values can be scaled. The scale is a power of 2
-// so the multiplication can be implemented as a shift. The control plane
-// computes the shift amount be the largest possible that still supports the
-// burst size. This makes the rate accuracy as high as possible.
-//
-// The 64-bit last_update_time supports a 4Ghz CPU without rollover for 100 years
-//
-// The lock field should be used for a spin-lock on the struct.
-
-#define POLICER_TICKS_PER_PERIOD_SHIFT 17
-#define POLICER_TICKS_PER_PERIOD       (1 << POLICER_TICKS_PER_PERIOD_SHIFT)
-
-typedef struct
-{
-
-  u32 lock;			// for exclusive access to the struct
-
-  u32 single_rate;		// 1 = single rate policer, 0 = two rate policer
-  u32 color_aware;		// for hierarchical policing
-  u32 scale;			// power-of-2 shift amount for lower rates
-  u8 action[3];
-  u8 mark_dscp[3];
-  u8 pad[2];
-
-  // Fields are marked as 2R if they are only used for a 2-rate policer,
-  // and MOD if they are modified as part of the update operation.
-  // 1 token = 1 byte.
-
-  u32 cir_tokens_per_period;	// # of tokens for each period
-  u32 pir_tokens_per_period;	// 2R
-
-  u32 current_limit;
-  u32 current_bucket;		// MOD
-  u32 extended_limit;
-  u32 extended_bucket;		// MOD
-
-  u64 last_update_time;		// MOD
-  u64 pad64;
-
-} policer_read_response_type_st;
-
-static inline policer_result_e
-vnet_police_packet (policer_read_response_type_st * policer,
-		    u32 packet_length,
-		    policer_result_e packet_color, u64 time)
-{
-  u64 n_periods;
-  u64 current_tokens, extended_tokens;
-  policer_result_e result;
-
-  // Scale packet length to support a wide range of speeds
-  packet_length = packet_length << policer->scale;
-
-  // Compute the number of policer periods that have passed since the last
-  // operation.
-  n_periods = time - policer->last_update_time;
-  policer->last_update_time = time;
-
-  // Since there is no background last-update-time adjustment, n_periods
-  // could grow large if the policer is idle for a long time. This could
-  // cause a 64-bit overflow when computing tokens_per_period * num_periods.
-  // It will overflow if log2(n_periods) + log2(tokens_per_period) > 64.
-  //
-  // To mitigate this, the policer configuration algorithm insures that
-  // tokens_per_period is less than 2^22, i.e. this is a 22 bit value not
-  // a 32-bit value. Thus overflow will only occur if n_periods > 64-22 or
-  // 42. 2^42 min-sized periods is 16us * 2^42, or 2 years. So this can
-  // rarely occur. If overflow does happen, the only effect will be that
-  // fewer tokens than the max burst will be added to the bucket for this
-  // packet. This constraint on tokens_per_period lets the ucode omit
-  // code to dynamically check for or prevent the overflow.
-
-  if (policer->single_rate)
-    {
-
-      // Compute number of tokens for this time period
-      current_tokens =
-	policer->current_bucket + n_periods * policer->cir_tokens_per_period;
-      if (current_tokens > policer->current_limit)
-	{
-	  current_tokens = policer->current_limit;
-	}
-
-      extended_tokens =
-	policer->extended_bucket + n_periods * policer->cir_tokens_per_period;
-      if (extended_tokens > policer->extended_limit)
-	{
-	  extended_tokens = policer->extended_limit;
-	}
-
-      // Determine color
-
-      if ((!policer->color_aware || (packet_color == POLICE_CONFORM))
-	  && (current_tokens >= packet_length))
-	{
-	  policer->current_bucket = current_tokens - packet_length;
-	  policer->extended_bucket = extended_tokens - packet_length;
-	  result = POLICE_CONFORM;
-	}
-      else if ((!policer->color_aware || (packet_color != POLICE_VIOLATE))
-	       && (extended_tokens >= packet_length))
-	{
-	  policer->current_bucket = current_tokens;
-	  policer->extended_bucket = extended_tokens - packet_length;
-	  result = POLICE_EXCEED;
-	}
-      else
-	{
-	  policer->current_bucket = current_tokens;
-	  policer->extended_bucket = extended_tokens;
-	  result = POLICE_VIOLATE;
-	}
-
-    }
-  else
-    {
-      // Two-rate policer
-
-      // Compute number of tokens for this time period
-      current_tokens =
-	policer->current_bucket + n_periods * policer->cir_tokens_per_period;
-      extended_tokens =
-	policer->extended_bucket + n_periods * policer->pir_tokens_per_period;
-      if (current_tokens > policer->current_limit)
-	{
-	  current_tokens = policer->current_limit;
-	}
-      if (extended_tokens > policer->extended_limit)
-	{
-	  extended_tokens = policer->extended_limit;
-	}
-
-      // Determine color
-
-      if ((policer->color_aware && (packet_color == POLICE_VIOLATE))
-	  || (extended_tokens < packet_length))
-	{
-	  policer->current_bucket = current_tokens;
-	  policer->extended_bucket = extended_tokens;
-	  result = POLICE_VIOLATE;
-	}
-      else if ((policer->color_aware && (packet_color == POLICE_EXCEED))
-	       || (current_tokens < packet_length))
-	{
-	  policer->current_bucket = current_tokens;
-	  policer->extended_bucket = extended_tokens - packet_length;
-	  result = POLICE_EXCEED;
-	}
-      else
-	{
-	  policer->current_bucket = current_tokens - packet_length;
-	  policer->extended_bucket = extended_tokens - packet_length;
-	  result = POLICE_CONFORM;
-	}
-    }
-  return result;
-}
-
-#endif // __POLICE_H__
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/policer/policer.c b/vnet/vnet/policer/policer.c
deleted file mode 100644
index 290a6af5..00000000
--- a/vnet/vnet/policer/policer.c
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <stdint.h>
-#include <vnet/policer/policer.h>
-#include <vnet/classify/vnet_classify.h>
-
-clib_error_t *
-policer_add_del (vlib_main_t * vm,
-		 u8 * name,
-		 sse2_qos_pol_cfg_params_st * cfg,
-		 u32 * policer_index, u8 is_add)
-{
-  vnet_policer_main_t *pm = &vnet_policer_main;
-  policer_read_response_type_st test_policer;
-  policer_read_response_type_st *policer;
-  uword *p;
-  u32 pi;
-  int rv;
-
-  p = hash_get_mem (pm->policer_config_by_name, name);
-
-  if (is_add == 0)
-    {
-      if (p == 0)
-	{
-	  vec_free (name);
-	  return clib_error_return (0, "No such policer configuration");
-	}
-      hash_unset_mem (pm->policer_config_by_name, name);
-      hash_unset_mem (pm->policer_index_by_name, name);
-      vec_free (name);
-      return 0;
-    }
-
-  if (p != 0)
-    {
-      vec_free (name);
-      return clib_error_return (0, "Policer already exists");
-    }
-
-  /* Vet the configuration before adding it to the table */
-  rv = sse2_pol_logical_2_physical (cfg, &test_policer);
-
-  if (rv == 0)
-    {
-      policer_read_response_type_st *pp;
-      sse2_qos_pol_cfg_params_st *cp;
-
-      pool_get (pm->configs, cp);
-      pool_get (pm->policer_templates, pp);
-
-      ASSERT (cp - pm->configs == pp - pm->policer_templates);
-
-      clib_memcpy (cp, cfg, sizeof (*cp));
-      clib_memcpy (pp, &test_policer, sizeof (*pp));
-
-      hash_set_mem (pm->policer_config_by_name, name, cp - pm->configs);
-      pool_get_aligned (pm->policers, policer, CLIB_CACHE_LINE_BYTES);
-      policer[0] = pp[0];
-      pi = policer - pm->policers;
-      hash_set_mem (pm->policer_index_by_name, name, pi);
-      *policer_index = pi;
-    }
-  else
-    {
-      vec_free (name);
-      return clib_error_return (0, "Config failed sanity check");
-    }
-
-  return 0;
-}
-
-u8 *
-format_policer_instance (u8 * s, va_list * va)
-{
-  policer_read_response_type_st *i
-    = va_arg (*va, policer_read_response_type_st *);
-
-  s = format (s, "policer at %llx: %s rate, %s color-aware\n",
-	      i, i->single_rate ? "single" : "dual",
-	      i->color_aware ? "is" : "not");
-  s = format (s, "cir %u tok/period, pir %u tok/period, scale %u\n",
-	      i->cir_tokens_per_period, i->pir_tokens_per_period, i->scale);
-  s = format (s, "cur lim %u, cur bkt %u, ext lim %u, ext bkt %u\n",
-	      i->current_limit,
-	      i->current_bucket, i->extended_limit, i->extended_bucket);
-  s = format (s, "last update %llu\n", i->last_update_time);
-  return s;
-}
-
-static u8 *
-format_policer_round_type (u8 * s, va_list * va)
-{
-  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
-
-  if (c->rnd_type == SSE2_QOS_ROUND_TO_CLOSEST)
-    s = format (s, "closest");
-  else if (c->rnd_type == SSE2_QOS_ROUND_TO_UP)
-    s = format (s, "up");
-  else if (c->rnd_type == SSE2_QOS_ROUND_TO_DOWN)
-    s = format (s, "down");
-  else
-    s = format (s, "ILLEGAL");
-  return s;
-}
-
-
-static u8 *
-format_policer_rate_type (u8 * s, va_list * va)
-{
-  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
-
-  if (c->rate_type == SSE2_QOS_RATE_KBPS)
-    s = format (s, "kbps");
-  else if (c->rate_type == SSE2_QOS_RATE_PPS)
-    s = format (s, "pps");
-  else
-    s = format (s, "ILLEGAL");
-  return s;
-}
-
-static u8 *
-format_policer_type (u8 * s, va_list * va)
-{
-  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
-
-  if (c->rfc == SSE2_QOS_POLICER_TYPE_1R2C)
-    s = format (s, "1r2c");
-
-  else if (c->rfc == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
-    s = format (s, "1r3c");
-
-  else if (c->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698)
-    s = format (s, "2r3c-2698");
-
-  else if (c->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115)
-    s = format (s, "2r3c-4115");
-
-  else if (c->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1)
-    s = format (s, "2r3c-mef5cf1");
-  else
-    s = format (s, "ILLEGAL");
-  return s;
-}
-
-static u8 *
-format_dscp (u8 * s, va_list * va)
-{
-  u32 i = va_arg (*va, u32);
-  char *t = 0;
-
-  switch (i)
-    {
-#define _(v,f,str) case VNET_DSCP_##f: t = str; break;
-      foreach_vnet_dscp
-#undef _
-    default:
-      return format (s, "ILLEGAL");
-    }
-  s = format (s, "%s", t);
-  return s;
-}
-
-static u8 *
-format_policer_action_type (u8 * s, va_list * va)
-{
-  sse2_qos_pol_action_params_st *a
-    = va_arg (*va, sse2_qos_pol_action_params_st *);
-
-  if (a->action_type == SSE2_QOS_ACTION_DROP)
-    s = format (s, "drop");
-  else if (a->action_type == SSE2_QOS_ACTION_TRANSMIT)
-    s = format (s, "transmit");
-  else if (a->action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
-    s = format (s, "mark-and-transmit %U", format_dscp, a->dscp);
-  else
-    s = format (s, "ILLEGAL");
-  return s;
-}
-
-u8 *
-format_policer_config (u8 * s, va_list * va)
-{
-  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
-
-  s = format (s, "type %U cir %u eir %u cb %u eb %u\n",
-	      format_policer_type, c,
-	      c->rb.kbps.cir_kbps,
-	      c->rb.kbps.eir_kbps, c->rb.kbps.cb_bytes, c->rb.kbps.eb_bytes);
-  s = format (s, "rate type %U, round type %U\n",
-	      format_policer_rate_type, c, format_policer_round_type, c);
-  s = format (s, "conform action %U, exceed action %U, violate action %U\n",
-	      format_policer_action_type, &c->conform_action,
-	      format_policer_action_type, &c->exceed_action,
-	      format_policer_action_type, &c->violate_action);
-  return s;
-}
-
-static uword
-unformat_policer_type (unformat_input_t * input, va_list * va)
-{
-  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
-
-  if (!unformat (input, "type"))
-    return 0;
-
-  if (unformat (input, "1r2c"))
-    c->rfc = SSE2_QOS_POLICER_TYPE_1R2C;
-  else if (unformat (input, "1r3c"))
-    c->rfc = SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697;
-  else if (unformat (input, "2r3c-2698"))
-    c->rfc = SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698;
-  else if (unformat (input, "2r3c-4115"))
-    c->rfc = SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115;
-  else if (unformat (input, "2r3c-mef5cf1"))
-    c->rfc = SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1;
-  else
-    return 0;
-  return 1;
-}
-
-static uword
-unformat_policer_round_type (unformat_input_t * input, va_list * va)
-{
-  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
-
-  if (!unformat (input, "round"))
-    return 0;
-
-  if (unformat (input, "closest"))
-    c->rnd_type = SSE2_QOS_ROUND_TO_CLOSEST;
-  else if (unformat (input, "up"))
-    c->rnd_type = SSE2_QOS_ROUND_TO_UP;
-  else if (unformat (input, "down"))
-    c->rnd_type = SSE2_QOS_ROUND_TO_DOWN;
-  else
-    return 0;
-  return 1;
-}
-
-static uword
-unformat_policer_rate_type (unformat_input_t * input, va_list * va)
-{
-  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
-
-  if (!unformat (input, "rate"))
-    return 0;
-
-  if (unformat (input, "kbps"))
-    c->rate_type = SSE2_QOS_RATE_KBPS;
-  else if (unformat (input, "pps"))
-    c->rate_type = SSE2_QOS_RATE_PPS;
-  else
-    return 0;
-  return 1;
-}
-
-static uword
-unformat_policer_cir (unformat_input_t * input, va_list * va)
-{
-  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
-
-  if (unformat (input, "cir %u", &c->rb.kbps.cir_kbps))
-    return 1;
-  return 0;
-}
-
-static uword
-unformat_policer_eir (unformat_input_t * input, va_list * va)
-{
-  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
-
-  if (unformat (input, "eir %u", &c->rb.kbps.eir_kbps))
-    return 1;
-  return 0;
-}
-
-static uword
-unformat_policer_cb (unformat_input_t * input, va_list * va)
-{
-  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
-
-  if (unformat (input, "cb %u", &c->rb.kbps.cb_bytes))
-    return 1;
-  return 0;
-}
-
-static uword
-unformat_policer_eb (unformat_input_t * input, va_list * va)
-{
-  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
-
-  if (unformat (input, "eb %u", &c->rb.kbps.eb_bytes))
-    return 1;
-  return 0;
-}
-
-static uword
-unformat_dscp (unformat_input_t * input, va_list * va)
-{
-  u8 *r = va_arg (*va, u8 *);
-
-  if (0);
-#define _(v,f,str) else if (unformat (input, str)) *r = VNET_DSCP_##f;
-  foreach_vnet_dscp
-#undef _
-    else
-    return 0;
-  return 1;
-}
-
-static uword
-unformat_policer_action_type (unformat_input_t * input, va_list * va)
-{
-  sse2_qos_pol_action_params_st *a
-    = va_arg (*va, sse2_qos_pol_action_params_st *);
-
-  if (unformat (input, "drop"))
-    a->action_type = SSE2_QOS_ACTION_DROP;
-  else if (unformat (input, "transmit"))
-    a->action_type = SSE2_QOS_ACTION_TRANSMIT;
-  else if (unformat (input, "mark-and-transmit %U", unformat_dscp, &a->dscp))
-    a->action_type = SSE2_QOS_ACTION_MARK_AND_TRANSMIT;
-  else
-    return 0;
-  return 1;
-}
-
-static uword
-unformat_policer_action (unformat_input_t * input, va_list * va)
-{
-  sse2_qos_pol_cfg_params_st *c = va_arg (*va, sse2_qos_pol_cfg_params_st *);
-
-  if (unformat (input, "conform-action %U", unformat_policer_action_type,
-		&c->conform_action))
-    return 1;
-  else if (unformat (input, "exceed-action %U", unformat_policer_action_type,
-		     &c->exceed_action))
-    return 1;
-  else if (unformat (input, "violate-action %U", unformat_policer_action_type,
-		     &c->violate_action))
-    return 1;
-  return 0;
-}
-
-static uword
-unformat_policer_classify_next_index (unformat_input_t * input, va_list * va)
-{
-  u32 *r = va_arg (*va, u32 *);
-  vnet_policer_main_t *pm = &vnet_policer_main;
-  uword *p;
-  u8 *match_name = 0;
-
-  if (unformat (input, "%s", &match_name))
-    ;
-  else
-    return 0;
-
-  p = hash_get_mem (pm->policer_index_by_name, match_name);
-
-  if (p == 0)
-    return 0;
-
-  *r = p[0];
-
-  return 1;
-}
-
-static uword
-unformat_policer_classify_precolor (unformat_input_t * input, va_list * va)
-{
-  u32 *r = va_arg (*va, u32 *);
-
-  if (unformat (input, "conform-color"))
-    *r = POLICE_CONFORM;
-  else if (unformat (input, "exceed-color"))
-    *r = POLICE_EXCEED;
-  else
-    return 0;
-
-  return 1;
-}
-
-#define foreach_config_param                    \
-_(eb)                                           \
-_(cb)                                           \
-_(eir)                                          \
-_(cir)                                          \
-_(rate_type)                                    \
-_(round_type)                                   \
-_(type)                                         \
-_(action)
-
-static clib_error_t *
-configure_policer_command_fn (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cmd)
-{
-  sse2_qos_pol_cfg_params_st c;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 is_add = 1;
-  u8 *name = 0;
-  u32 pi;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  memset (&c, 0, sizeof (c));
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "name %s", &name))
-	;
-      else if (unformat (line_input, "color-aware"))
-	c.color_aware = 1;
-
-#define _(a) else if (unformat (line_input, "%U", unformat_policer_##a, &c)) ;
-      foreach_config_param
-#undef _
-	else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  return policer_add_del (vm, name, &c, &pi, is_add);
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (configure_policer_command, static) = {
-    .path = "configure policer",
-    .short_help = "configure policer name <name> <params> ",
-    .function = configure_policer_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-show_policer_command_fn (vlib_main_t * vm,
-			 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vnet_policer_main_t *pm = &vnet_policer_main;
-  hash_pair_t *p;
-  u32 pool_index;
-  u8 *match_name = 0;
-  u8 *name;
-  sse2_qos_pol_cfg_params_st *config;
-  policer_read_response_type_st *templ;
-
-  (void) unformat (input, "name %s", &match_name);
-
-  /* *INDENT-OFF* */
-  hash_foreach_pair (p, pm->policer_config_by_name,
-  ({
-    name = (u8 *) p->key;
-    if (match_name == 0 || !strcmp((char *) name, (char *) match_name))
-      {
-        pool_index = p->value[0];
-        config = pool_elt_at_index (pm->configs, pool_index);
-        templ = pool_elt_at_index (pm->policer_templates, pool_index);
-        vlib_cli_output (vm, "Name \"%s\" %U ",
-                         name, format_policer_config, config);
-        vlib_cli_output (vm, "Template %U",
-                         format_policer_instance, templ);
-        vlib_cli_output (vm, "-----------");
-      }
-  }));
-  /* *INDENT-ON* */
-  return 0;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_policer_command, static) = {
-    .path = "show policer",
-    .short_help = "show policer [name]",
-    .function = show_policer_command_fn,
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-policer_init (vlib_main_t * vm)
-{
-  vnet_policer_main_t *pm = &vnet_policer_main;
-  void vnet_policer_node_funcs_reference (void);
-
-  vnet_policer_node_funcs_reference ();
-
-  pm->vlib_main = vm;
-  pm->vnet_main = vnet_get_main ();
-
-  pm->policer_config_by_name = hash_create_string (0, sizeof (uword));
-  pm->policer_index_by_name = hash_create_string (0, sizeof (uword));
-
-  vnet_classify_register_unformat_policer_next_index_fn
-    (unformat_policer_classify_next_index);
-  vnet_classify_register_unformat_opaque_index_fn
-    (unformat_policer_classify_precolor);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (policer_init);
-
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/policer/policer.h b/vnet/vnet/policer/policer.h
deleted file mode 100644
index 8e2d7c79..00000000
--- a/vnet/vnet/policer/policer.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_policer_h__
-#define __included_policer_h__
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-
-#include <vnet/policer/xlate.h>
-#include <vnet/policer/police.h>
-
-typedef struct
-{
-  /* policer pool, aligned */
-  policer_read_response_type_st *policers;
-
-  /* config + template h/w policer instance parallel pools */
-  sse2_qos_pol_cfg_params_st *configs;
-  policer_read_response_type_st *policer_templates;
-
-  /* Config by name hash */
-  uword *policer_config_by_name;
-
-  /* Policer by name hash */
-  uword *policer_index_by_name;
-
-  /* Policer by sw_if_index vector */
-  u32 *policer_index_by_sw_if_index;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} vnet_policer_main_t;
-
-vnet_policer_main_t vnet_policer_main;
-
-typedef enum
-{
-  VNET_POLICER_INDEX_BY_SW_IF_INDEX,
-  VNET_POLICER_INDEX_BY_OPAQUE,
-  VNET_POLICER_INDEX_BY_EITHER,
-} vnet_policer_index_t;
-
-typedef enum
-{
-  VNET_POLICER_NEXT_TRANSMIT,
-  VNET_POLICER_NEXT_DROP,
-  VNET_POLICER_N_NEXT,
-} vnet_policer_next_t;
-
-#define foreach_vnet_dscp \
-  _(0 , CS0,  "CS0")  \
-  _(8 , CS1,  "CS1")  \
-  _(10, AF11, "AF11") \
-  _(12, AF12, "AF12") \
-  _(14, AF13, "AF13") \
-  _(16, CS2,  "CS2")  \
-  _(18, AF21, "AF21") \
-  _(20, AF22, "AF22") \
-  _(22, AF23, "AF23") \
-  _(24, CS3,  "CS3")  \
-  _(26, AF31, "AF31") \
-  _(28, AF32, "AF32") \
-  _(30, AF33, "AF33") \
-  _(32, CS4,  "CS4")  \
-  _(34, AF41, "AF41") \
-  _(36, AF42, "AF42") \
-  _(38, AF43, "AF43") \
-  _(40, CS5,  "CS5")  \
-  _(46, EF,   "EF")   \
-  _(48, CS6,  "CS6")  \
-  _(50, CS7,  "CS7")
-
-typedef enum
-{
-#define _(v,f,str) VNET_DSCP_##f = v,
-  foreach_vnet_dscp
-#undef _
-} vnet_dscp_t;
-
-u8 *format_policer_instance (u8 * s, va_list * va);
-clib_error_t *policer_add_del (vlib_main_t * vm,
-			       u8 * name,
-			       sse2_qos_pol_cfg_params_st * cfg,
-			       u32 * policer_index, u8 is_add);
-
-#endif /* __included_policer_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/policer/xlate.c b/vnet/vnet/policer/xlate.c
deleted file mode 100644
index 74a6eb23..00000000
--- a/vnet/vnet/policer/xlate.c
+++ /dev/null
@@ -1,1505 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <string.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <assert.h>
-#include <math.h>
-#include <stdint.h>
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-
-#include <vnet/policer/xlate.h>
-#include <vnet/policer/police.h>
-
-#define INTERNAL_SS 1
-
-/* debugs */
-#define SSE2_QOS_DEBUG_ERROR(msg, args...) \
-    fformat(stderr, msg "\n", ##args);
-
-#define SSE2_QOS_DEBUG_INFO(msg, args...) \
-    fformat(stderr, msg "\n", ##args);
-
-
-#define SSE2_QOS_TR_ERR(TpParms...)
-// {
-// }
-
-#define SSE2_QOS_TR_INFO(TpParms...)
-
-#ifndef MIN
-#define MIN(x,y)            (((x)<(y))?(x):(y))
-#endif
-
-#ifndef MAX
-#define MAX(x,y)            (((x)>(y))?(x):(y))
-#endif
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_M40AH_OFFSET                   0
-#define IPE_POLICER_FULL_WRITE_REQUEST_M40AH_MASK                     8
-#define IPE_POLICER_FULL_WRITE_REQUEST_M40AH_SHIFT                   24
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_TYPE_OFFSET                    2
-#define IPE_POLICER_FULL_WRITE_REQUEST_TYPE_MASK                      2
-#define IPE_POLICER_FULL_WRITE_REQUEST_TYPE_SHIFT                    10
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_CMD_OFFSET                     3
-#define IPE_POLICER_FULL_WRITE_REQUEST_CMD_MASK                       2
-#define IPE_POLICER_FULL_WRITE_REQUEST_CMD_SHIFT                      0
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_M40AL_OFFSET                   4
-#define IPE_POLICER_FULL_WRITE_REQUEST_M40AL_MASK                    32
-#define IPE_POLICER_FULL_WRITE_REQUEST_M40AL_SHIFT                    0
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_RFC_OFFSET                     8
-#define IPE_POLICER_FULL_WRITE_REQUEST_RFC_MASK                       2
-#define IPE_POLICER_FULL_WRITE_REQUEST_RFC_SHIFT                     30
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_AN_OFFSET                      8
-#define IPE_POLICER_FULL_WRITE_REQUEST_AN_MASK                        1
-#define IPE_POLICER_FULL_WRITE_REQUEST_AN_SHIFT                      29
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_REXP_OFFSET                    8
-#define IPE_POLICER_FULL_WRITE_REQUEST_REXP_MASK                      4
-#define IPE_POLICER_FULL_WRITE_REQUEST_REXP_SHIFT                    22
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_ARM_OFFSET                     9
-#define IPE_POLICER_FULL_WRITE_REQUEST_ARM_MASK                      11
-#define IPE_POLICER_FULL_WRITE_REQUEST_ARM_SHIFT                     11
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_PRM_OFFSET                    10
-#define IPE_POLICER_FULL_WRITE_REQUEST_PRM_MASK                      11
-#define IPE_POLICER_FULL_WRITE_REQUEST_PRM_SHIFT                      0
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_CBLE_OFFSET                   12
-#define IPE_POLICER_FULL_WRITE_REQUEST_CBLE_MASK                      5
-#define IPE_POLICER_FULL_WRITE_REQUEST_CBLE_SHIFT                    27
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_CBLM_OFFSET                   12
-#define IPE_POLICER_FULL_WRITE_REQUEST_CBLM_MASK                      7
-#define IPE_POLICER_FULL_WRITE_REQUEST_CBLM_SHIFT                    20
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_EBLE_OFFSET                   13
-#define IPE_POLICER_FULL_WRITE_REQUEST_EBLE_MASK                      5
-#define IPE_POLICER_FULL_WRITE_REQUEST_EBLE_SHIFT                    15
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_EBLM_OFFSET                   14
-#define IPE_POLICER_FULL_WRITE_REQUEST_EBLM_MASK                      7
-#define IPE_POLICER_FULL_WRITE_REQUEST_EBLM_SHIFT                     8
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_CB_OFFSET                     16
-#define IPE_POLICER_FULL_WRITE_REQUEST_CB_MASK                       31
-#define IPE_POLICER_FULL_WRITE_REQUEST_CB_SHIFT                       0
-
-#define IPE_POLICER_FULL_WRITE_REQUEST_EB_OFFSET                     20
-#define IPE_POLICER_FULL_WRITE_REQUEST_EB_MASK                       31
-#define IPE_POLICER_FULL_WRITE_REQUEST_EB_SHIFT                       0
-
-#define IPE_RFC_RFC2697           0x00000000
-#define IPE_RFC_RFC2698           0x00000001
-#define IPE_RFC_RFC4115           0x00000002
-#define IPE_RFC_MEF5CF1           0x00000003
-
-/* End of constants copied from sse_ipe_desc_fmt.h */
-
-/* Misc Policer specific definitions */
-#define SSE2_QOS_POLICER_FIXED_PKT_SIZE    256
-
-// TODO check what can be provided by hw macro based on ASIC
-#define SSE2_QOS_POL_TICKS_PER_SEC     1000LL	/* 1 tick = 1 ms */
-
-/*
- * Default burst, in ms (byte format)
- */
-#define SSE2_QOS_POL_DEF_BURST_BYTE    100
-
-/*
- * Minimum burst needs to be such that the largest packet size is accomodated
- */
-// Do we need to get it from some lib?
-#define SSE2_QOS_POL_MIN_BURST_BYTE    9*1024
-
-
-/*
- * Flag to indicate if AN is employed or not
- * 1 - TRUE, 0 - FALSE
- */
-#define SSE2_QOS_POL_ALLOW_NEGATIVE    1
-
-// Various Macros to take care of policer calculations
-
-#define SSE2_QOS_POL_COMM_BKT_MAX \
-                            (1<<IPE_POLICER_FULL_WRITE_REQUEST_CB_MASK)
-#define SSE2_QOS_POL_EXTD_BKT_MAX \
-                            (1<<IPE_POLICER_FULL_WRITE_REQUEST_EB_MASK)
-
-#define SSE2_QOS_POL_RATE_EXP_SIZE \
-                            (IPE_POLICER_FULL_WRITE_REQUEST_REXP_MASK)
-#define SSE2_QOS_POL_RATE_EXP_MAX  ((1<<SSE2_QOS_POL_RATE_EXP_SIZE) - 1)
-#define SSE2_QOS_POL_AVG_RATE_MANT_SIZE \
-                            (IPE_POLICER_FULL_WRITE_REQUEST_ARM_MASK)
-#define SSE2_QOS_POL_AVG_RATE_MANT_MAX    \
-                            ((1<< SSE2_QOS_POL_AVG_RATE_MANT_SIZE) - 1)
-#define SSE2_QOS_POL_AVG_RATE_MAX \
-                            (SSE2_QOS_POL_AVG_RATE_MANT_MAX << \
-                             SSE2_QOS_POL_RATE_EXP_MAX)
-
-#define SSE2_QOS_POL_PEAK_RATE_MANT_SIZE   \
-                            (IPE_POLICER_FULL_WRITE_REQUEST_PRM_MASK)
-#define SSE2_QOS_POL_PEAK_RATE_MANT_MAX    \
-                            ((1<<SSE2_QOS_POL_PEAK_RATE_MANT_SIZE) - 1)
-#define SSE2_QOS_POL_PEAK_RATE_MAX \
-                            (SSE2_QOS_POL_PEAK_RATE_MANT_MAX << \
-                             SSE2_QOS_POL_RATE_EXP_MAX)
-
-#define SSE2_QOS_POL_COMM_BKT_LIMIT_MANT_SIZE   \
-                        (IPE_POLICER_FULL_WRITE_REQUEST_CBLM_MASK)
-#define SSE2_QOS_POL_COMM_BKT_LIMIT_MANT_MAX   \
-                        ((1<<SSE2_QOS_POL_COMM_BKT_LIMIT_MANT_SIZE) - 1)
-#define SSE2_QOS_POL_COMM_BKT_LIMIT_EXP_SIZE   \
-                        (IPE_POLICER_FULL_WRITE_REQUEST_CBLE_MASK)
-#define SSE2_QOS_POL_COMM_BKT_LIMIT_EXP_MAX   \
-                        ((1<<SSE2_QOS_POL_COMM_BKT_LIMIT_EXP_SIZE) - 1)
-#define SSE2_QOS_POL_COMM_BKT_LIMIT_MAX \
-                        ((u64)SSE2_QOS_POL_COMM_BKT_LIMIT_MANT_MAX << \
-                         (u64)SSE2_QOS_POL_COMM_BKT_LIMIT_EXP_MAX)
-
-#define SSE2_QOS_POL_EXTD_BKT_LIMIT_MANT_SIZE   \
-                        (IPE_POLICER_FULL_WRITE_REQUEST_EBLM_MASK)
-#define SSE2_QOS_POL_EXTD_BKT_LIMIT_MANT_MAX   \
-                        ((1<<SSE2_QOS_POL_EXTD_BKT_LIMIT_MANT_SIZE) - 1)
-#define SSE2_QOS_POL_EXTD_BKT_LIMIT_EXP_SIZE   \
-                        (IPE_POLICER_FULL_WRITE_REQUEST_EBLE_MASK)
-#define SSE2_QOS_POL_EXTD_BKT_LIMIT_EXP_MAX   \
-                        ((1<<SSE2_QOS_POL_EXTD_BKT_LIMIT_EXP_SIZE) - 1)
-#define SSE2_QOS_POL_EXT_BKT_LIMIT_MAX \
-                        ((u64)SSE2_QOS_POL_EXTD_BKT_LIMIT_MANT_MAX << \
-                         (u64)SSE2_QOS_POL_EXTD_BKT_LIMIT_EXP_MAX)
-
-/*
- * Rates determine the units of the bucket
- *    256.114688 Gbps < Rate                      8 byte units
- *    128.057344 Gbps < Rate <= 256.114688 Gbps   4 byte units
- *     64.028672 Gbps < Rate <= 128.057344 Gbps   2 byte units
- *                      Rate <=  64.028672 Gbps   1 byte units
- *
- * The code uses bytes per tick as oppose to Gigabits per second.
- */
-#define RATE256 (256114688000LL / 8LL / SSE2_QOS_POL_TICKS_PER_SEC)
-#define RATE128 (128057344000LL / 8LL / SSE2_QOS_POL_TICKS_PER_SEC)
-#define RATE64  ( 64028672000LL / 8LL / SSE2_QOS_POL_TICKS_PER_SEC)
-
-#define RATE_OVER256_UNIT  8LL
-#define RATE_128TO256_UNIT 4LL
-#define RATE_64TO128_UNIT  2LL
-
-static int
-sse2_qos_pol_round (u64 numerator,
-		    u64 denominator,
-		    u64 * rounded_value, sse2_qos_round_type_en round_type)
-{
-  int rc = 0;
-
-  if (denominator == 0)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Illegal denominator");
-      SSE2_QOS_TR_ERR (SSE2_QOSRM_TP_ERR_59);
-      return (EINVAL);
-    }
-
-  switch (round_type)
-    {
-    case SSE2_QOS_ROUND_TO_CLOSEST:
-      *rounded_value = ((numerator + (denominator >> 1)) / denominator);
-      break;
-
-    case SSE2_QOS_ROUND_TO_UP:
-      *rounded_value = (numerator / denominator);
-      if ((*rounded_value * denominator) < numerator)
-	{
-	  *rounded_value += 1;
-	}
-      break;
-
-    case SSE2_QOS_ROUND_TO_DOWN:
-      *rounded_value = (numerator / denominator);
-      break;
-
-    case SSE2_QOS_ROUND_INVALID:
-    default:
-      SSE2_QOS_DEBUG_ERROR ("Illegal round type");
-      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_60, round_type);
-      rc = EINVAL;
-      break;
-    }
-  return (rc);
-}
-
-
-static int
-sse2_pol_validate_cfg_params (sse2_qos_pol_cfg_params_st * cfg)
-{
-  u64 numer, denom, rnd_value;
-  u32 cir_hw, eir_hw;
-  int rc = 0;
-
-  if ((cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698) &&
-      (cfg->rb.kbps.eir_kbps < cfg->rb.kbps.cir_kbps))
-    {
-      SSE2_QOS_DEBUG_ERROR ("CIR (%u kbps) is greater than PIR (%u kbps)",
-			    cfg->rb.kbps.cir_kbps, cfg->rb.kbps.eir_kbps);
-      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_39, cfg->rb.kbps.cir_kbps,
-		       cfg->rb.kbps.eir_kbps);
-      return (EINVAL);
-    }
-
-  /*
-   * convert rates to bytes-per-tick
-   */
-  numer = (u64) (cfg->rb.kbps.cir_kbps);
-  denom = (u64) (8 * SSE2_QOS_POL_TICKS_PER_SEC) / 1000;
-  rc = sse2_qos_pol_round (numer, denom, &rnd_value,
-			   (sse2_qos_round_type_en) cfg->rnd_type);
-  if (rc != 0)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Unable to convert CIR to bytes/tick format");
-      // Error traced
-      return (rc);
-    }
-  cir_hw = (u32) rnd_value;
-
-  numer = (u64) (cfg->rb.kbps.eir_kbps);
-  rc = sse2_qos_pol_round (numer, denom, &rnd_value,
-			   (sse2_qos_round_type_en) cfg->rnd_type);
-  if (rc != 0)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Unable to convert EIR to bytes/tick format");
-      // Error traced
-      return (rc);
-    }
-  eir_hw = (u32) rnd_value;
-
-  if (cir_hw > SSE2_QOS_POL_AVG_RATE_MAX)
-    {
-      SSE2_QOS_DEBUG_ERROR ("hw cir (%u bytes/tick) is greater than the "
-			    "max supported value (%u)", cir_hw,
-			    SSE2_QOS_POL_AVG_RATE_MAX);
-      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_84, cir_hw, SSE2_QOS_POL_AVG_RATE_MAX);
-      return (EINVAL);
-    }
-
-  if (eir_hw > SSE2_QOS_POL_PEAK_RATE_MAX)
-    {
-      SSE2_QOS_DEBUG_ERROR ("hw eir (%u bytes/tick) is greater than the "
-			    "max supported value (%u). Capping it to the max. "
-			    "supported value", eir_hw,
-			    SSE2_QOS_POL_PEAK_RATE_MAX);
-      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_85, eir_hw,
-		       SSE2_QOS_POL_PEAK_RATE_MAX);
-      return (EINVAL);
-    }
-  /*
-   * CIR = 0, with bc != 0 is not allowed
-   */
-  if ((cfg->rb.kbps.cir_kbps == 0) && cfg->rb.kbps.cb_bytes)
-    {
-      SSE2_QOS_DEBUG_ERROR ("CIR = 0 with bc != 0");
-      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_55);
-      return (EINVAL);
-    }
-
-  if ((cfg->rb.kbps.eir_kbps == 0) &&
-      (cfg->rfc > SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697))
-    {
-      SSE2_QOS_DEBUG_ERROR ("EIR = 0 for a 2R3C policer (rfc: %u)", cfg->rfc);
-      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_23, cfg->rb.kbps.eir_kbps, cfg->rfc);
-      return (EINVAL);
-    }
-
-  if (cfg->rb.kbps.eir_kbps &&
-      (cfg->rfc < SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698))
-    {
-      SSE2_QOS_DEBUG_ERROR ("EIR: %u kbps for a 1-rate policer (rfc: %u)",
-			    cfg->rb.kbps.eir_kbps, cfg->rfc);
-      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_23, cfg->rb.kbps.eir_kbps, cfg->rfc);
-      return (EINVAL);
-    }
-
-  if ((cfg->rfc == SSE2_QOS_POLICER_TYPE_1R2C) && cfg->rb.kbps.eb_bytes)
-    {
-      SSE2_QOS_DEBUG_ERROR ("For a 1R1B policer, EB burst cannot be > 0");
-      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_56);
-      return (EINVAL);
-    }
-
-  return (0);
-}
-
-static void
-sse2_qos_convert_value_to_exp_mant_fmt (u64 value,
-					u16 max_exp_value,
-					u16 max_mant_value,
-					sse2_qos_round_type_en type,
-					u8 * exp, u32 * mant)
-{
-  u64 rnd_value;
-  u64 temp_mant;
-  u8 temp_exp;
-
-  /*
-   * Select the lowest possible exp, and the largest possible mant
-   */
-  temp_exp = 0;
-  temp_mant = value;
-  while (temp_exp <= max_exp_value)
-    {
-      if (temp_mant <= max_mant_value)
-	{
-	  break;
-	}
-
-      temp_exp++;
-      rnd_value = 0;
-      (void) sse2_qos_pol_round ((u64) value, (u64) (1 << temp_exp),
-				 &rnd_value, type);
-      temp_mant = rnd_value;
-    }
-
-  if (temp_exp > max_exp_value)
-    {
-      /*
-       * CAP mant to its max value, and decrement exp
-       */
-      temp_exp--;
-      temp_mant = max_mant_value;
-    }
-
-  *exp = temp_exp;
-  *mant = (u32) temp_mant;
-
-  SSE2_QOS_DEBUG_INFO ("value: 0x%llx, mant: %u, exp: %u", value, *mant,
-		       *exp);
-  return;
-}
-
-static int
-sse2_pol_convert_cfg_rates_to_hw (sse2_qos_pol_cfg_params_st * cfg,
-				  sse2_qos_pol_hw_params_st * hw)
-{
-  int rc = 0;
-  u32 cir_hw, eir_hw, hi_mant, hi_rate, cir_rnded, eir_rnded, eir_kbps;
-  u64 numer, denom, rnd_value;
-  u8 exp;
-
-  /*
-   * convert rates to bytes-per-tick (tick is 1ms)
-   * For rate conversion, the denominator is gonna be the same
-   */
-  denom = (u64) ((SSE2_QOS_POL_TICKS_PER_SEC * 8) / 1000);
-  numer = (u64) (cfg->rb.kbps.cir_kbps);
-  rc = sse2_qos_pol_round (numer, denom, &rnd_value,
-			   (sse2_qos_round_type_en) cfg->rnd_type);
-  if (rc != 0)
-    {
-      SSE2_QOS_DEBUG_ERROR
-	("Rounding error, rate: %d kbps, rounding_type: %d",
-	 cfg->rb.kbps.cir_kbps, cfg->rnd_type);
-      // Error is traced
-      return (rc);
-    }
-  cir_hw = (u32) rnd_value;
-
-  if (cfg->rb.kbps.cir_kbps && (cir_hw == 0))
-    {
-      /*
-       * After rounding, cir_hw = 0. Bump it up
-       */
-      cir_hw = 1;
-    }
-
-  if (cfg->rfc == SSE2_QOS_POLICER_TYPE_1R2C)
-    {
-      eir_kbps = 0;
-    }
-  else if (cfg->rfc == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
-    {
-      eir_kbps = cfg->rb.kbps.cir_kbps;
-    }
-  else if (cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115)
-    {
-      eir_kbps = cfg->rb.kbps.eir_kbps - cfg->rb.kbps.cir_kbps;
-    }
-  else
-    {
-      eir_kbps = cfg->rb.kbps.eir_kbps;
-    }
-
-  numer = (u64) eir_kbps;
-  rc = sse2_qos_pol_round (numer, denom, &rnd_value,
-			   (sse2_qos_round_type_en) cfg->rnd_type);
-  if (rc != 0)
-    {
-      SSE2_QOS_DEBUG_ERROR
-	("Rounding error, rate: %d kbps, rounding_type: %d", eir_kbps,
-	 cfg->rnd_type);
-      // Error is traced
-      return (rc);
-    }
-  eir_hw = (u32) rnd_value;
-
-  if (eir_kbps && (eir_hw == 0))
-    {
-      /*
-       * After rounding, eir_hw = 0. Bump it up
-       */
-      eir_hw = 1;
-    }
-
-  SSE2_QOS_DEBUG_INFO ("cir_hw: %u bytes/tick, eir_hw: %u bytes/tick", cir_hw,
-		       eir_hw);
-
-  if (cir_hw > eir_hw)
-    {
-      hi_rate = cir_hw;
-    }
-  else
-    {
-      hi_rate = eir_hw;
-    }
-
-  if ((cir_hw == 0) && (eir_hw == 0))
-    {
-      /*
-       * Both the rates are 0. Use exp = 15, and set the RFC to 4115. Also
-       * set AN = 0
-       */
-      exp = (u8) SSE2_QOS_POL_RATE_EXP_MAX;
-      hi_mant = 0;
-      hw->rfc = IPE_RFC_RFC4115;
-      hw->allow_negative = 0;
-    }
-  else
-    {
-      sse2_qos_convert_value_to_exp_mant_fmt (hi_rate,
-					      (u16) SSE2_QOS_POL_RATE_EXP_MAX,
-					      (u16)
-					      SSE2_QOS_POL_AVG_RATE_MANT_MAX,
-					      (sse2_qos_round_type_en)
-					      cfg->rnd_type, &exp, &hi_mant);
-    }
-
-  denom = (1ULL << exp);
-  if (hi_rate == eir_hw)
-    {
-      hw->peak_rate_man = (u16) hi_mant;
-      rc = sse2_qos_pol_round ((u64) cir_hw, denom, &rnd_value,
-			       (sse2_qos_round_type_en) cfg->rnd_type);
-      hw->avg_rate_man = (u16) rnd_value;
-    }
-  else
-    {
-      hw->avg_rate_man = (u16) hi_mant;
-      rc = sse2_qos_pol_round ((u64) eir_hw, denom, &rnd_value,
-			       (sse2_qos_round_type_en) cfg->rnd_type);
-      hw->peak_rate_man = (u16) rnd_value;
-    }
-  if (rc != 0)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Rounding error");
-      // Error is traced
-      return (rc);
-    }
-  hw->rate_exp = exp;
-
-  if ((hw->avg_rate_man == 0) && (cfg->rb.kbps.cir_kbps))
-    {
-      /*
-       * cir was reduced to 0 during rounding. Bump it up
-       */
-      hw->avg_rate_man = 1;
-      SSE2_QOS_DEBUG_INFO ("CIR = 0 during rounding. Bump it up to %u "
-			   "bytes/tick", (hw->avg_rate_man << hw->rate_exp));
-    }
-
-  if ((hw->peak_rate_man == 0) && eir_kbps)
-    {
-      /*
-       * eir was reduced to 0 during rounding. Bump it up
-       */
-      hw->peak_rate_man = 1;
-      SSE2_QOS_DEBUG_INFO ("EIR = 0 during rounding. Bump it up to %u "
-			   "bytes/tick", (hw->peak_rate_man << hw->rate_exp));
-    }
-
-  cir_rnded = (hw->avg_rate_man << hw->rate_exp);
-  eir_rnded = (hw->peak_rate_man << hw->rate_exp);
-
-  SSE2_QOS_DEBUG_INFO ("Configured(rounded) values, cir: %u "
-		       "kbps (mant: %u, exp: %u, rate: %u bytes/tick)",
-		       cfg->rb.kbps.cir_kbps, hw->avg_rate_man,
-		       hw->rate_exp, cir_rnded);
-
-  SSE2_QOS_DEBUG_INFO ("Configured(rounded) values, eir: %u "
-		       "kbps (mant: %u, exp: %u, rate: %u bytes/tick)",
-		       cfg->rb.kbps.eir_kbps, hw->peak_rate_man,
-		       hw->rate_exp, eir_rnded);
-
-  return (rc);
-}
-
-/*****
- * NAME
- *   sse2_pol_get_bkt_max
- *
- * PARAMETERS
- *  rate_hw    - either the averate rate or peak rate
- *  bkt_max    - bit width in the current bucket or extended bucket
- *
- * RETURNS
- *  u64   - maximum token bytes for the current or extended bucket
- *
- * DESCRIPTION
- *  The current bucket or extended bucket fields are in units of either
- *  1,2,4,8 bytes based on the average or peak rate respective to current
- *  or extended bucket.
- *
- *  To get the actual maximum number of bytes that can be stored in the
- *  field, the value must be multiplied by the units of either 1,2,4,8
- *  bytes based on the rate.
- *****/
-u64
-sse2_pol_get_bkt_max (u64 rate_hw, u64 bkt_max)
-{
-  if (rate_hw <= RATE64)
-    {
-      return (bkt_max - 1);
-    }
-  else if (rate_hw <= RATE128)
-    {
-      return ((bkt_max * RATE_64TO128_UNIT) - RATE_64TO128_UNIT);
-    }
-  else if (rate_hw <= RATE256)
-    {
-      return ((bkt_max * RATE_128TO256_UNIT) - RATE_128TO256_UNIT);
-    }
-  /* rate must be over 256 */
-  return ((bkt_max * RATE_OVER256_UNIT) - RATE_OVER256_UNIT);
-}
-
-/*****
- * NAME
- *   sse2_pol_get_bkt_value
- *
- * PARAMETERS
- *  rate_hw    - either the averate rate or peak rate
- *  byte_value - bytes for this token bucket
- *
- * RETURNS
- *  u64   - unit value for the current or extended bucket field
- *
- * DESCRIPTION
- *  The current bucket or extended bucket fields are in units of either
- *  1,2,4,8 bytes based on the average or peak rate respective to current
- *  or extended bucket.
- *
- *  To get the units that can be stored in the field, the byte value must
- *  be divided by the units of either 1,2,4,8 bytes based on the rate.
- *****/
-u64
-sse2_pol_get_bkt_value (u64 rate_hw, u64 byte_value)
-{
-  if (rate_hw <= RATE64)
-    {
-      return (byte_value);
-    }
-  else if (rate_hw <= RATE128)
-    {
-      return (byte_value / RATE_64TO128_UNIT);
-    }
-  else if (rate_hw <= RATE256)
-    {
-      return (byte_value / RATE_128TO256_UNIT);
-    }
-  /* rate must be over 256 */
-  return (byte_value / RATE_OVER256_UNIT);
-}
-
-static void
-sse2_pol_rnd_burst_byte_fmt (u64 cfg_burst,
-			     u16 max_exp_value,
-			     u16 max_mant_value,
-			     u32 max_bkt_value,
-			     u32 rate_hw,
-			     u8 * exp, u32 * mant, u32 * bkt_value)
-{
-  u64 bkt_max = max_bkt_value;
-  u64 bkt_limit_max;
-  u64 rnd_burst;
-  u64 temp_bkt_value;
-
-  bkt_limit_max = ((u64) max_mant_value << (u64) max_exp_value);
-  bkt_max = sse2_pol_get_bkt_max (rate_hw, bkt_max);
-  bkt_max = MIN (bkt_max, bkt_limit_max);
-  if (!cfg_burst)
-    {
-      /*
-       * If configured burst = 0, compute the burst to be 100ms at a given
-       * rate. Note that for rate_hw = 0, exp = mant = 0.
-       */
-      cfg_burst = (u64) rate_hw *(u64) SSE2_QOS_POL_DEF_BURST_BYTE;
-    }
-
-  if (cfg_burst > bkt_max)
-    {
-      SSE2_QOS_DEBUG_ERROR ("burst 0x%llx bytes is greater than the max. "
-			    "supported value 0x%llx bytes. Capping it to the "
-			    "max", cfg_burst, bkt_max);
-      SSE2_QOS_TR_INFO (SSE2_QOS_TP_INFO_38,
-			(uint) cfg_burst, (uint) bkt_max);
-      cfg_burst = bkt_max;
-    }
-
-  if (cfg_burst < SSE2_QOS_POL_MIN_BURST_BYTE)
-    {
-      /*
-       * Bump up the burst value ONLY if the cfg_burst is non-zero AND
-       * less than the min. supported value
-       */
-      SSE2_QOS_DEBUG_INFO ("burst 0x%llx bytes is less than the min "
-			   "supported value %u bytes. Rounding it up to "
-			   "the min", cfg_burst, SSE2_QOS_POL_MIN_BURST_BYTE);
-      SSE2_QOS_TR_INFO (SSE2_QOS_TP_INFO_39, (uint) cfg_burst,
-			SSE2_QOS_POL_MIN_BURST_BYTE);
-      cfg_burst = SSE2_QOS_POL_MIN_BURST_BYTE;
-    }
-
-  sse2_qos_convert_value_to_exp_mant_fmt (cfg_burst,
-					  max_exp_value,
-					  max_mant_value,
-					  SSE2_QOS_ROUND_TO_DOWN, exp, mant);
-
-  /* Bucket value is based on rate. */
-  rnd_burst = ((u64) (*mant) << (u64) (*exp));
-  temp_bkt_value = sse2_pol_get_bkt_value (rate_hw, rnd_burst);
-  *bkt_value = (u32) temp_bkt_value;
-}
-
-static int
-sse2_pol_convert_cfg_burst_to_hw (sse2_qos_pol_cfg_params_st * cfg,
-				  sse2_qos_pol_hw_params_st * hw)
-{
-  u8 temp_exp;
-  u32 temp_mant, rate_hw;
-  u64 eb_bytes;
-  u32 bkt_value;
-
-  /*
-   * compute Committed Burst
-   */
-  SSE2_QOS_DEBUG_INFO ("Compute commit burst ...");
-  rate_hw = (hw->avg_rate_man) << (hw->rate_exp);
-  sse2_pol_rnd_burst_byte_fmt (cfg->rb.kbps.cb_bytes,
-			       (u16) SSE2_QOS_POL_COMM_BKT_LIMIT_EXP_MAX,
-			       (u16) SSE2_QOS_POL_COMM_BKT_LIMIT_MANT_MAX,
-			       (u32) SSE2_QOS_POL_COMM_BKT_MAX,
-			       rate_hw, &temp_exp, &temp_mant, &bkt_value);
-  SSE2_QOS_DEBUG_INFO ("Committed burst, burst_limit: 0x%llx mant : %u, "
-		       "exp: %u, rnded: 0x%llx cb:%u bytes",
-		       cfg->rb.kbps.cb_bytes, temp_mant, temp_exp,
-		       ((u64) temp_mant << (u64) temp_exp), bkt_value);
-
-  hw->comm_bkt_limit_exp = temp_exp;
-  hw->comm_bkt_limit_man = (u8) temp_mant;
-  hw->comm_bkt = bkt_value;
-
-  /*
-   * compute Exceed Burst
-   */
-  SSE2_QOS_DEBUG_INFO ("Compute exceed burst ...");
-
-  if (cfg->rfc == SSE2_QOS_POLICER_TYPE_1R2C)
-    {
-      /*
-       * For 1R2C, hw uses 2R3C (RFC-4115). As such, the Exceed Bucket
-       * params are set to 0. Recommendation is to use EB_exp = max_exp (=15)
-       * and EB_mant = 0
-       */
-      hw->extd_bkt_limit_exp = (u8) SSE2_QOS_POL_EXTD_BKT_LIMIT_EXP_MAX;
-      hw->extd_bkt_limit_man = 0;
-      SSE2_QOS_DEBUG_INFO ("Excess burst, burst: 0x%llx mant: %u, "
-			   "exp: %u, rnded: 0x%llx bytes",
-			   cfg->rb.kbps.eb_bytes, hw->extd_bkt_limit_man,
-			   hw->extd_bkt_limit_exp,
-			   ((u64) hw->extd_bkt_limit_man <<
-			    (u64) hw->extd_bkt_limit_exp));
-      SSE2_QOS_TR_INFO (SSE2_QOS_TP_INFO_20, (uint) cfg->rb.kbps.eb_bytes,
-			hw->extd_bkt_limit_man, hw->extd_bkt_limit_exp);
-      return (0);
-    }
-
-  if (cfg->rfc == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
-    {
-      eb_bytes = cfg->rb.kbps.cb_bytes + cfg->rb.kbps.eb_bytes;
-    }
-  else if (cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115)
-    {
-      eb_bytes = cfg->rb.kbps.eb_bytes - cfg->rb.kbps.cb_bytes;
-    }
-  else
-    {
-      eb_bytes = cfg->rb.kbps.eb_bytes;
-    }
-
-  rate_hw = (hw->peak_rate_man) << (hw->rate_exp);
-  sse2_pol_rnd_burst_byte_fmt (eb_bytes,
-			       (u16) SSE2_QOS_POL_EXTD_BKT_LIMIT_EXP_MAX,
-			       (u16) SSE2_QOS_POL_EXTD_BKT_LIMIT_MANT_MAX,
-			       (u32) SSE2_QOS_POL_EXTD_BKT_MAX,
-			       rate_hw, &temp_exp, &temp_mant, &bkt_value);
-
-  SSE2_QOS_DEBUG_INFO ("Excess burst, burst_limit: 0x%llx mant: %u, "
-		       "exp: %u, rnded: 0x%llx eb:%u bytes",
-		       cfg->rb.kbps.eb_bytes, temp_mant, temp_exp,
-		       ((u64) temp_mant << (u64) temp_exp), bkt_value);
-
-  hw->extd_bkt_limit_exp = (u8) temp_exp;
-  hw->extd_bkt_limit_man = (u8) temp_mant;
-  hw->extd_bkt = bkt_value;
-
-  return (0);
-}
-
-
-/*
- * Input: configured parameter values in 'cfg'.
- * Output: h/w programmable parameter values in 'hw'.
- * Return: success or failure code.
- */
-static int
-sse2_pol_convert_cfg_to_hw_params (sse2_qos_pol_cfg_params_st * cfg,
-				   sse2_qos_pol_hw_params_st * hw)
-{
-  int rc = 0;
-
-  /*
-   * clear the hw_params
-   */
-  memset (hw, 0, sizeof (sse2_qos_pol_hw_params_st));
-
-  hw->allow_negative = SSE2_QOS_POL_ALLOW_NEGATIVE;
-
-  if ((cfg->rfc == SSE2_QOS_POLICER_TYPE_1R2C) ||
-      (cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115))
-    {
-      hw->rfc = IPE_RFC_RFC4115;
-    }
-  else if (cfg->rfc == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
-    {
-      hw->rfc = IPE_RFC_RFC2697;
-    }
-  else if (cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698)
-    {
-      hw->rfc = IPE_RFC_RFC2698;
-    }
-  else if (cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1)
-    {
-      hw->rfc = IPE_RFC_MEF5CF1;
-    }
-  else
-    {
-      SSE2_QOS_DEBUG_ERROR ("Invalid RFC type %d\n", cfg->rfc);
-      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_61, cfg->rfc);
-      return (EINVAL);
-    }
-
-  rc = sse2_pol_convert_cfg_rates_to_hw (cfg, hw);
-  if (rc != 0)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Unable to convert config rates to hw. Error: %d",
-			    rc);
-      // Error is traced
-      return (rc);
-    }
-
-  rc = sse2_pol_convert_cfg_burst_to_hw (cfg, hw);
-  if (rc != 0)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Unable to convert config burst to hw. Error: %d",
-			    rc);
-      // Error is traced
-      return (rc);
-    }
-
-  return 0;
-}
-
-
-u32
-sse2_qos_convert_pps_to_kbps (u32 rate_pps)
-{
-  // sse2_qos_ship_inc_counter(SSE2_QOS_SHIP_COUNTER_TYPE_API_CNT,
-  //                            SSE2_QOS_SHIP_CNT_POL_CONV_PPS_TO_KBPS);
-
-  u64 numer, rnd_value = 0;
-
-  numer = (u64) ((u64) rate_pps *
-		 (u64) SSE2_QOS_POLICER_FIXED_PKT_SIZE * 8LL);
-  (void) sse2_qos_pol_round (numer, 1000LL, &rnd_value,
-			     SSE2_QOS_ROUND_TO_CLOSEST);
-
-  return ((u32) rnd_value);
-}
-
-u32
-sse2_qos_convert_burst_ms_to_bytes (u32 burst_ms, u32 rate_kbps)
-{
-  u64 numer, rnd_value = 0;
-
-  //sse2_qos_ship_inc_counter(SSE2_QOS_SHIP_COUNTER_TYPE_API_CNT,
-  //                          SSE2_QOS_SHIP_CNT_POL_CONV_BURST_MS_TO_BYTES);
-
-  numer = (u64) ((u64) burst_ms * (u64) rate_kbps);
-
-  (void) sse2_qos_pol_round (numer, 8LL, &rnd_value,
-			     SSE2_QOS_ROUND_TO_CLOSEST);
-
-  return ((u32) rnd_value);
-}
-
-
-/*
- * Input: configured parameters in 'cfg'.
- * Output: h/w parameters are returned in 'hw',
- * Return: Status, success or failure code.
- */
-int
-sse2_pol_compute_hw_params (sse2_qos_pol_cfg_params_st * cfg,
-			    sse2_qos_pol_hw_params_st * hw)
-{
-  int rc = 0;
-
-  if (!cfg || !hw)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Illegal parameters");
-      return (-1);
-    }
-
-  /*
-   * Validate the police config params being presented to RM
-   */
-  rc = sse2_pol_validate_cfg_params (cfg);
-  if (rc != 0)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Config parameter validation failed. Error: %d",
-			    rc);
-      // Error is traced
-      return (-1);
-    }
-
-  /*
-   * first round configured values to h/w supported values. This func
-   * also determines whether 'tick' or 'byte' format
-   */
-  rc = sse2_pol_convert_cfg_to_hw_params (cfg, hw);
-  if (rc != 0)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Unable to convert config params to hw params. "
-			    "Error: %d", rc);
-      SSE2_QOS_TR_ERR (SSE2_QOS_TP_ERR_53, rc);
-      return (-1);
-    }
-
-  return 0;
-}
-
-
-#if defined (INTERNAL_SS) || defined (X86)
-
-// For initializing the x86 policer format
-
-/*
- * Return the number of hardware TSC timer ticks per second for the dataplane.
- * This is approximately, but not exactly, the clock speed.
- */
-static u64
-get_tsc_hz (void)
-{
-  f64 cpu_freq;
-
-  cpu_freq = os_cpu_clock_frequency ();
-  return (u64) cpu_freq;
-}
-
-/*
- * Convert rates into bytes_per_period and scale.
- * Return 0 if ok or 1 if error.
- */
-static int
-compute_policer_params (u64 hz,	// CPU speed in clocks per second
-			u64 cir_rate,	// in bytes per second
-			u64 pir_rate,	// in bytes per second
-			u32 * current_limit,	// in bytes, output may scale the input
-			u32 * extended_limit,	// in bytes, output may scale the input
-			u32 * cir_bytes_per_period,
-			u32 * pir_bytes_per_period, u32 * scale)
-{
-  double period;
-  double internal_cir_bytes_per_period;
-  double internal_pir_bytes_per_period;
-  u32 max;
-  u32 scale_shift;
-  u32 scale_amount;
-  u32 __attribute__ ((unused)) orig_current_limit = *current_limit;
-
-  // Compute period. For 1Ghz-to-8Ghz CPUs, the period will be in
-  // the range of 16 to 116 usec.
-  period = ((double) hz) / ((double) POLICER_TICKS_PER_PERIOD);
-
-  // Determine bytes per period for each rate
-  internal_cir_bytes_per_period = (double) cir_rate / period;
-  internal_pir_bytes_per_period = (double) pir_rate / period;
-
-  // Scale if possible. Scaling helps rate accuracy, but is contrained
-  // by the scaled rates and limits fitting in 32-bits.
-  // In addition, we need to insure the scaled rate is no larger than
-  // 2^22 tokens per period. This allows the dataplane to ignore overflow
-  // in the tokens-per-period multiplication since it could only
-  // happen if the policer were idle for more than a year.
-  // This is not really a constraint because 100Gbps at 1Ghz is only
-  // 1.6M tokens per period.
-#define MAX_RATE_SHIFT 10
-  max = MAX (*current_limit, *extended_limit);
-  max = MAX (max, (u32) internal_cir_bytes_per_period << MAX_RATE_SHIFT);
-  max = MAX (max, (u32) internal_pir_bytes_per_period << MAX_RATE_SHIFT);
-  scale_shift = __builtin_clz (max);
-
-  scale_amount = 1 << scale_shift;
-  *scale = scale_shift;
-
-  // Scale the limits
-  *current_limit = *current_limit << scale_shift;
-  *extended_limit = *extended_limit << scale_shift;
-
-  // Scale the rates
-  internal_cir_bytes_per_period =
-    internal_cir_bytes_per_period * ((double) scale_amount);
-  internal_pir_bytes_per_period =
-    internal_pir_bytes_per_period * ((double) scale_amount);
-
-  // Make sure the new rates are reasonable
-  // Only needed for very low rates with large bursts
-  if (internal_cir_bytes_per_period < 1.0)
-    {
-      internal_cir_bytes_per_period = 1.0;
-    }
-  if (internal_pir_bytes_per_period < 1.0)
-    {
-      internal_pir_bytes_per_period = 1.0;
-    }
-
-  *cir_bytes_per_period = (u32) internal_cir_bytes_per_period;
-  *pir_bytes_per_period = (u32) internal_pir_bytes_per_period;
-
-// #define PRINT_X86_POLICE_PARAMS
-#ifdef PRINT_X86_POLICE_PARAMS
-  {
-    u64 effective_BPS;
-
-    // This value actually slightly conservative because it doesn't take into account
-    // the partial period at the end of a second. This really matters only for very low
-    // rates.
-    effective_BPS =
-      (((u64) (*cir_bytes_per_period * (u64) period)) >> *scale);
-
-    printf ("hz=%llu, cir_rate=%llu, limit=%u => "
-	    "periods-per-sec=%d usec-per-period=%d => "
-	    "scale=%d cir_BPP=%u, scaled_limit=%u => "
-	    "effective BPS=%llu, accuracy=%f\n",
-	    // input values
-	    (unsigned long long) hz,
-	    (unsigned long long) cir_rate, orig_current_limit,
-	    // computed values
-	    (u32) (period),	// periods per second
-	    (u32) (1000.0 * 1000.0 / period),	// in usec
-	    *scale, *cir_bytes_per_period, *current_limit,
-	    // accuracy
-	    (unsigned long long) effective_BPS,
-	    (double) cir_rate / (double) effective_BPS);
-  }
-#endif
-
-  return 0;			// ok
-}
-
-
-/*
- * Input: configured parameters in 'cfg'.
- * Output: h/w parameters are returned in 'hw',
- * Return: Status, success or failure code.
- */
-int
-x86_pol_compute_hw_params (sse2_qos_pol_cfg_params_st * cfg,
-			   policer_read_response_type_st * hw)
-{
-  const int BYTES_PER_KBIT = (1000 / 8);
-  u64 hz;
-  u32 cap;
-
-  if (!cfg || !hw)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Illegal parameters");
-      return (-1);
-    }
-
-  hz = get_tsc_hz ();
-  hw->last_update_time = 0;
-
-  // Cap the bursts to 32-bits. This allows up to almost one second of
-  // burst on a 40GE interface, which should be fine for x86.
-  cap =
-    (cfg->rb.kbps.cb_bytes > 0xFFFFFFFF) ? 0xFFFFFFFF : cfg->rb.kbps.cb_bytes;
-  hw->current_limit = cap;
-  cap =
-    (cfg->rb.kbps.eb_bytes > 0xFFFFFFFF) ? 0xFFFFFFFF : cfg->rb.kbps.eb_bytes;
-  hw->extended_limit = cap;
-
-  if ((cfg->rb.kbps.cir_kbps == 0) && (cfg->rb.kbps.cb_bytes == 0)
-      && (cfg->rb.kbps.eb_bytes == 0))
-    {
-      // This is a uninitialized, always-violate policer
-      hw->single_rate = 1;
-      hw->cir_tokens_per_period = 0;
-      return 0;
-    }
-
-  if ((cfg->rfc == SSE2_QOS_POLICER_TYPE_1R2C) ||
-      (cfg->rfc == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697))
-    {
-      // Single-rate policer
-
-      hw->single_rate = 1;
-
-      if ((cfg->rfc == SSE2_QOS_POLICER_TYPE_1R2C) && cfg->rb.kbps.eb_bytes)
-	{
-	  SSE2_QOS_DEBUG_ERROR
-	    ("Policer parameter validation failed -- 1R2C.");
-	  return (-1);
-	}
-
-      if ((cfg->rb.kbps.cir_kbps == 0) ||
-	  (cfg->rb.kbps.eir_kbps != 0) ||
-	  ((cfg->rb.kbps.cb_bytes == 0) && (cfg->rb.kbps.eb_bytes == 0)))
-	{
-	  SSE2_QOS_DEBUG_ERROR ("Policer parameter validation failed -- 1R.");
-	  return (-1);
-	}
-
-      if (compute_policer_params (hz,
-				  (u64) cfg->rb.kbps.cir_kbps *
-				  BYTES_PER_KBIT, 0, &hw->current_limit,
-				  &hw->extended_limit,
-				  &hw->cir_tokens_per_period,
-				  &hw->pir_tokens_per_period, &hw->scale))
-	{
-	  SSE2_QOS_DEBUG_ERROR ("Policer parameter computation failed.");
-	  return (-1);
-	}
-
-    }
-  else if ((cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698) ||
-	   (cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115))
-    {
-      // Two-rate policer
-
-      if ((cfg->rb.kbps.cir_kbps == 0) || (cfg->rb.kbps.eir_kbps == 0)
-	  || (cfg->rb.kbps.eir_kbps < cfg->rb.kbps.cir_kbps)
-	  || (cfg->rb.kbps.cb_bytes == 0) || (cfg->rb.kbps.eb_bytes == 0))
-	{
-	  SSE2_QOS_DEBUG_ERROR ("Config parameter validation failed.");
-	  return (-1);
-	}
-
-      if (compute_policer_params (hz,
-				  (u64) cfg->rb.kbps.cir_kbps *
-				  BYTES_PER_KBIT,
-				  (u64) cfg->rb.kbps.eir_kbps *
-				  BYTES_PER_KBIT, &hw->current_limit,
-				  &hw->extended_limit,
-				  &hw->cir_tokens_per_period,
-				  &hw->pir_tokens_per_period, &hw->scale))
-	{
-	  SSE2_QOS_DEBUG_ERROR ("Policer parameter computation failed.");
-	  return (-1);
-	}
-
-    }
-  else
-    {
-      SSE2_QOS_DEBUG_ERROR
-	("Config parameter validation failed. RFC not supported");
-      return (-1);
-    }
-
-  hw->current_bucket = hw->current_limit;
-  hw->extended_bucket = hw->extended_limit;
-
-  return 0;
-}
-#endif
-
-
-/*
- * Input: configured parameters in 'cfg'.
- * Output: physical structure is returned in 'phys',
- * Return: Status, success or failure code.
- */
-int
-sse2_pol_logical_2_physical (sse2_qos_pol_cfg_params_st * cfg,
-			     policer_read_response_type_st * phys)
-{
-  int rc;
-  sse2_qos_pol_hw_params_st pol_hw;
-  sse2_qos_pol_cfg_params_st kbps_cfg;
-
-  memset (phys, 0, sizeof (policer_read_response_type_st));
-  memset (&kbps_cfg, 0, sizeof (sse2_qos_pol_cfg_params_st));
-
-  if (!cfg)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Illegal parameters");
-      return (-1);
-    }
-
-  switch (cfg->rate_type)
-    {
-    case SSE2_QOS_RATE_KBPS:
-      /* copy all the data into kbps_cfg */
-      kbps_cfg.rb.kbps.cir_kbps = cfg->rb.kbps.cir_kbps;
-      kbps_cfg.rb.kbps.eir_kbps = cfg->rb.kbps.eir_kbps;
-      kbps_cfg.rb.kbps.cb_bytes = cfg->rb.kbps.cb_bytes;
-      kbps_cfg.rb.kbps.eb_bytes = cfg->rb.kbps.eb_bytes;
-      break;
-    case SSE2_QOS_RATE_PPS:
-      kbps_cfg.rb.kbps.cir_kbps =
-	sse2_qos_convert_pps_to_kbps (cfg->rb.pps.cir_pps);
-      kbps_cfg.rb.kbps.eir_kbps =
-	sse2_qos_convert_pps_to_kbps (cfg->rb.pps.eir_pps);
-      kbps_cfg.rb.kbps.cb_bytes = sse2_qos_convert_burst_ms_to_bytes ((u32)
-								      cfg->
-								      rb.pps.cb_ms,
-								      kbps_cfg.rb.
-								      kbps.cir_kbps);
-      kbps_cfg.rb.kbps.eb_bytes =
-	sse2_qos_convert_burst_ms_to_bytes ((u32) cfg->rb.pps.eb_ms,
-					    kbps_cfg.rb.kbps.eir_kbps);
-      break;
-    default:
-      SSE2_QOS_DEBUG_ERROR ("Illegal rate type");
-      return (-1);
-    }
-
-  /* rate type is now converted to kbps */
-  kbps_cfg.rate_type = SSE2_QOS_RATE_KBPS;
-  kbps_cfg.rnd_type = cfg->rnd_type;
-  kbps_cfg.rfc = cfg->rfc;
-
-  phys->action[POLICE_CONFORM] = cfg->conform_action.action_type;
-  phys->mark_dscp[POLICE_CONFORM] = cfg->conform_action.dscp;
-  phys->action[POLICE_EXCEED] = cfg->exceed_action.action_type;
-  phys->mark_dscp[POLICE_EXCEED] = cfg->exceed_action.dscp;
-  phys->action[POLICE_VIOLATE] = cfg->violate_action.action_type;
-  phys->mark_dscp[POLICE_VIOLATE] = cfg->violate_action.dscp;
-
-  phys->color_aware = cfg->color_aware;
-
-#if !defined (INTERNAL_SS) && !defined (X86)
-  // convert logical into hw params which involves qos calculations
-  rc = sse2_pol_compute_hw_params (&kbps_cfg, &pol_hw);
-  if (rc == -1)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Unable to compute hw param. Error: %d", rc);
-      return (rc);
-    }
-
-  // convert hw params into the physical
-  phys->rfc = pol_hw.rfc;
-  phys->an = pol_hw.allow_negative;
-  phys->rexp = pol_hw.rate_exp;
-  phys->arm = pol_hw.avg_rate_man;
-  phys->prm = pol_hw.peak_rate_man;
-  phys->cble = pol_hw.comm_bkt_limit_exp;
-  phys->cblm = pol_hw.comm_bkt_limit_man;
-  phys->eble = pol_hw.extd_bkt_limit_exp;
-  phys->eblm = pol_hw.extd_bkt_limit_man;
-  phys->cb = pol_hw.comm_bkt;
-  phys->eb = pol_hw.extd_bkt;
-
-  /* for debugging purposes, the bucket token values can be overwritten */
-  if (cfg->overwrite_bucket)
-    {
-      phys->cb = cfg->current_bucket;
-      phys->eb = cfg->extended_bucket;
-    }
-#else
-  // convert logical into hw params which involves qos calculations
-  rc = x86_pol_compute_hw_params (&kbps_cfg, phys);
-  if (rc == -1)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Unable to compute hw param. Error: %d", rc);
-      return (rc);
-    }
-
-  /* for debugging purposes, the bucket token values can be overwritten */
-  if (cfg->overwrite_bucket)
-    {
-      phys->current_bucket = cfg->current_bucket;
-      phys->extended_bucket = cfg->extended_bucket;
-    }
-
-  // Touch to avoid compiler warning for X86
-  pol_hw.allow_negative = pol_hw.allow_negative;
-
-#endif // if !defined (INTERNAL_SS) && !defined (X86)
-
-  return 0;
-}
-
-
-static void
-sse2_qos_convert_pol_bucket_to_hw_fmt (policer_read_response_type_st * bkt,
-				       sse2_qos_pol_hw_params_st * hw_fmt)
-{
-  memset (hw_fmt, 0, sizeof (sse2_qos_pol_hw_params_st));
-#if !defined (INTERNAL_SS) && !defined (X86)
-  hw_fmt->rfc = (u8) bkt->rfc;
-  hw_fmt->allow_negative = (u8) bkt->an;
-  hw_fmt->rate_exp = (u8) bkt->rexp;
-  hw_fmt->avg_rate_man = (u16) bkt->arm;
-  hw_fmt->peak_rate_man = (u16) bkt->prm;
-  hw_fmt->comm_bkt_limit_man = (u8) bkt->cblm;
-  hw_fmt->comm_bkt_limit_exp = (u8) bkt->cble;
-  hw_fmt->extd_bkt_limit_man = (u8) bkt->eblm;
-  hw_fmt->extd_bkt_limit_exp = (u8) bkt->eble;
-  hw_fmt->extd_bkt = bkt->eb;
-  hw_fmt->comm_bkt = bkt->cb;
-#endif // if !defined (INTERNAL_SS) && !defined (X86)
-}
-
-/*
- * Input: h/w programmable parameter values in 'hw'
- * Output: configured parameter values in 'cfg'
- * Return: Status, success or failure code.
- */
-static int
-sse2_pol_convert_hw_to_cfg_params (sse2_qos_pol_hw_params_st * hw,
-				   sse2_qos_pol_cfg_params_st * cfg)
-{
-  u64 temp_rate;
-
-  if ((hw == NULL) || (cfg == NULL))
-    {
-      return EINVAL;
-    }
-
-  if ((hw->rfc == IPE_RFC_RFC4115) &&
-      !(hw->peak_rate_man << hw->rate_exp) && !(hw->extd_bkt_limit_man))
-    {
-      /*
-       * For a 1R2C, we set EIR = 0, EB = 0
-       */
-      cfg->rfc = SSE2_QOS_POLICER_TYPE_1R2C;
-    }
-  else if (hw->rfc == IPE_RFC_RFC2697)
-    {
-      cfg->rfc = SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697;
-    }
-  else if (hw->rfc == IPE_RFC_RFC2698)
-    {
-      cfg->rfc = SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698;
-    }
-  else if (hw->rfc == IPE_RFC_RFC4115)
-    {
-      cfg->rfc = SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115;
-    }
-  else if (hw->rfc == IPE_RFC_MEF5CF1)
-    {
-      cfg->rfc = SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1;
-    }
-  else
-    {
-      return EINVAL;
-    }
-
-  temp_rate = (((u64) hw->avg_rate_man << hw->rate_exp) * 8LL *
-	       SSE2_QOS_POL_TICKS_PER_SEC) / 1000;
-  cfg->rb.kbps.cir_kbps = (u32) temp_rate;
-
-  temp_rate = (((u64) hw->peak_rate_man << hw->rate_exp) * 8LL *
-	       SSE2_QOS_POL_TICKS_PER_SEC) / 1000;
-  cfg->rb.kbps.eir_kbps = (u32) temp_rate;
-
-  cfg->rb.kbps.cb_bytes = ((u64) hw->comm_bkt_limit_man <<
-			   (u64) hw->comm_bkt_limit_exp);
-  cfg->rb.kbps.eb_bytes = ((u64) hw->extd_bkt_limit_man <<
-			   (u64) hw->extd_bkt_limit_exp);
-
-  if (cfg->rfc == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
-    {
-      /*
-       * For 1R3C in the hardware, EB = sum(CB, EB). Also, EIR = CIR. Restore
-       * values such that the configured params don't reflect this adjustment
-       */
-      cfg->rb.kbps.eb_bytes = (cfg->rb.kbps.eb_bytes - cfg->rb.kbps.cb_bytes);
-      cfg->rb.kbps.eir_kbps = 0;
-    }
-  else if (cfg->rfc == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115)
-    {
-      /*
-       * For 4115 in the hardware is excess rate and burst, but EA provides
-       * peak-rate, so adjust it to be eir
-       */
-      cfg->rb.kbps.eir_kbps += cfg->rb.kbps.cir_kbps;
-      cfg->rb.kbps.eb_bytes += cfg->rb.kbps.cb_bytes;
-    }
-  /* h/w conversion to cfg is in kbps */
-  cfg->rate_type = SSE2_QOS_RATE_KBPS;
-  cfg->overwrite_bucket = 0;
-  cfg->current_bucket = hw->comm_bkt;
-  cfg->extended_bucket = hw->extd_bkt;
-
-  SSE2_QOS_DEBUG_INFO ("configured params, cir: %u kbps, eir: %u kbps, cb "
-		       "burst: 0x%llx bytes, eb burst: 0x%llx bytes",
-		       cfg->rb.kbps.cir_kbps, cfg->rb.kbps.eir_kbps,
-		       cfg->rb.kbps.cb_bytes, cfg->rb.kbps.eb_bytes);
-  SSE2_QOS_TR_INFO (SSE2_QOS_TP_INFO_22, cfg->rb.kbps.cir_kbps,
-		    cfg->rb.kbps.eir_kbps,
-		    (uint) cfg->rb.kbps.cb_bytes,
-		    (uint) cfg->rb.kbps.eb_bytes);
-
-  return 0;
-}
-
-u32
-sse2_qos_convert_kbps_to_pps (u32 rate_kbps)
-{
-  u64 numer, denom, rnd_value = 0;
-
-  // sse_qosrm_ship_inc_counter(SSE2_QOS_SHIP_COUNTER_TYPE_API_CNT,
-  //                            SSE2_QOS_SHIP_CNT_POL_CONV_KBPS_TO_PPS);
-
-  numer = (u64) ((u64) rate_kbps * 1000LL);
-  denom = (u64) ((u64) SSE2_QOS_POLICER_FIXED_PKT_SIZE * 8LL);
-
-  (void) sse2_qos_pol_round (numer, denom, &rnd_value,
-			     SSE2_QOS_ROUND_TO_CLOSEST);
-
-  return ((u32) rnd_value);
-}
-
-u32
-sse2_qos_convert_burst_bytes_to_ms (u64 burst_bytes, u32 rate_kbps)
-{
-  u64 numer, denom, rnd_value = 0;
-
-  //sse_qosrm_ship_inc_counter(SSE2_QOS_SHIP_COUNTER_TYPE_API_CNT,
-  //                         SSE2_QOS_SHIP_CNT_POL_CONV_BYTES_TO_BURST_MS);
-
-  numer = burst_bytes * 8LL;
-  denom = (u64) rate_kbps;
-
-  (void) sse2_qos_pol_round (numer, denom, &rnd_value,
-			     SSE2_QOS_ROUND_TO_CLOSEST);
-
-  return ((u32) rnd_value);
-}
-
-/*
- * Input: physical structure in 'phys', rate_type in cfg
- * Output: configured parameters in 'cfg'.
- * Return: Status, success or failure code.
- */
-int
-sse2_pol_physical_2_logical (policer_read_response_type_st * phys,
-			     sse2_qos_pol_cfg_params_st * cfg)
-{
-  int rc;
-  sse2_qos_pol_hw_params_st pol_hw;
-  sse2_qos_pol_cfg_params_st kbps_cfg;
-
-  memset (&pol_hw, 0, sizeof (sse2_qos_pol_hw_params_st));
-  memset (&kbps_cfg, 0, sizeof (sse2_qos_pol_cfg_params_st));
-
-  if (!phys)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Illegal parameters");
-      return (-1);
-    }
-
-  sse2_qos_convert_pol_bucket_to_hw_fmt (phys, &pol_hw);
-
-  rc = sse2_pol_convert_hw_to_cfg_params (&pol_hw, &kbps_cfg);
-  if (rc != 0)
-    {
-      SSE2_QOS_DEBUG_ERROR ("Unable to convert hw params to config params. "
-			    "Error: %d", rc);
-      return (-1);
-    }
-
-  /* check what rate type is required */
-  switch (cfg->rate_type)
-    {
-    case SSE2_QOS_RATE_KBPS:
-      /* copy all the data into kbps_cfg */
-      cfg->rb.kbps.cir_kbps = kbps_cfg.rb.kbps.cir_kbps;
-      cfg->rb.kbps.eir_kbps = kbps_cfg.rb.kbps.eir_kbps;
-      cfg->rb.kbps.cb_bytes = kbps_cfg.rb.kbps.cb_bytes;
-      cfg->rb.kbps.eb_bytes = kbps_cfg.rb.kbps.eb_bytes;
-      break;
-    case SSE2_QOS_RATE_PPS:
-      cfg->rb.pps.cir_pps =
-	sse2_qos_convert_kbps_to_pps (kbps_cfg.rb.kbps.cir_kbps);
-      cfg->rb.pps.eir_pps =
-	sse2_qos_convert_kbps_to_pps (kbps_cfg.rb.kbps.eir_kbps);
-      cfg->rb.pps.cb_ms =
-	sse2_qos_convert_burst_bytes_to_ms (kbps_cfg.rb.kbps.cb_bytes,
-					    kbps_cfg.rb.kbps.cir_kbps);
-      cfg->rb.pps.eb_ms =
-	sse2_qos_convert_burst_bytes_to_ms (kbps_cfg.rb.kbps.eb_bytes,
-					    kbps_cfg.rb.kbps.eir_kbps);
-      break;
-    default:
-      SSE2_QOS_DEBUG_ERROR ("Illegal rate type");
-      return (-1);
-    }
-
-  /* cfg->rate_type remains what it was */
-  cfg->rnd_type = kbps_cfg.rnd_type;
-  cfg->rfc = kbps_cfg.rfc;
-  cfg->overwrite_bucket = kbps_cfg.overwrite_bucket;
-  cfg->current_bucket = kbps_cfg.current_bucket;
-  cfg->extended_bucket = kbps_cfg.extended_bucket;
-
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/policer/xlate.h b/vnet/vnet/policer/xlate.h
deleted file mode 100644
index 16742f80..00000000
--- a/vnet/vnet/policer/xlate.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*---------------------------------------------------------------------------
- * from gdp_logical_qos.h
- *---------------------------------------------------------------------------
- */
-
-#ifndef __included_xlate_h__
-#define __included_xlate_h__
-
-#include <vnet/policer/police.h>
-
-/*
- * edt: * enum sse2_qos_policer_type_en
- *  Defines type of policer to be allocated
- */
-typedef enum sse2_qos_policer_type_en_
-{
-  SSE2_QOS_POLICER_TYPE_1R2C = 0,
-  SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697 = 1,
-  SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698 = 2,
-  SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115 = 3,
-  SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1 = 4,
-  SSE2_QOS_POLICER_TYPE_MAX
-} sse2_qos_policer_type_en;
-
-/*
- * edt: * enum
- *  Enum used to define type of rounding used when calculating policer values
- */
-typedef enum
-{
-  SSE2_QOS_ROUND_TO_CLOSEST = 0,
-  SSE2_QOS_ROUND_TO_UP,
-  SSE2_QOS_ROUND_TO_DOWN,
-  SSE2_QOS_ROUND_INVALID
-} sse2_qos_round_type_en;
-
-/*
- * edt: * enum
- *  Enum used to define type of rate for configuration, either pps or kbps.
- *  If kbps, then burst is in bytes, if pps, then burst is in ms.
- *
- *  Default of zero is kbps, which is inline with how it is programmed
- *  in actual hardware.  However, the warning is that this is reverse logic
- *  of units_in_bits field in sse2_static_policer_parameters_st, which is
- *  inline with sse_punt_drop.h.
- */
-typedef enum
-{
-  SSE2_QOS_RATE_KBPS = 0,
-  SSE2_QOS_RATE_PPS,
-  SSE2_QOS_RATE_INVALID
-} sse2_qos_rate_type_en;
-
-/*
- * edt: * enum
- * Defines type of policer actions.
- */
-typedef enum
-{
-  SSE2_QOS_ACTION_DROP = 0,
-  SSE2_QOS_ACTION_TRANSMIT,
-  SSE2_QOS_ACTION_MARK_AND_TRANSMIT
-} sse2_qos_action_type_en;
-
-/*
- * edt * struct sse2_qos_pol_action_params_st
- * This structure is used to hold user configured police action parameters.
- *
- * element: action_type
- *      Action type (see sse2_qos_action_type_en).
- * elemtnt: dscp
- *      DSCP value to set when action is SSE2_QOS_ACTION_MARK_AND_TRANSMIT.
- */
-typedef struct sse2_qos_pol_action_params_st_
-{
-  u8 action_type;
-  u8 dscp;
-} sse2_qos_pol_action_params_st;
-
-/*
- * edt: * struct sse2_qos_pol_cfg_params_st
- *
- * Description:
- * This structure is used to hold user configured policing parameters.
- *
- * element: cir_kbps
- *      CIR in kbps.
- * element: eir_kbps
- *      EIR or PIR in kbps.
- * element: cb_bytes
- *      Committed Burst in bytes.
- * element: eb_bytes
- *      Excess or Peak Burst in bytes.
- * element: cir_pps
- *      CIR in pps.
- * element: eir_pps
- *      EIR or PIR in pps.
- * element: cb_ms
- *      Committed Burst in milliseconds.
- * element: eb_ms
- *      Excess or Peak Burst in milliseconds.
- * element: rate_type
- *      Indicates the union if in kbps/bytes or pps/ms.
- * element: rfc
- *      Policer algorithm - 1R2C, 1R3C (2697), 2R3C (2698) or 2R3C (4115). See
- *      sse_qos_policer_type_en
- * element: rnd_type
- *      Rounding type (see sse_qos_round_type_en). Needed when policer values
- *      need to be rounded. Caller can decide on type of rounding used
- */
-typedef struct sse2_qos_pol_cfg_params_st_
-{
-  union
-  {
-    struct
-    {
-      u32 cir_kbps;
-      u32 eir_kbps;
-      u64 cb_bytes;
-      u64 eb_bytes;
-    } kbps;
-    struct
-    {
-      u32 cir_pps;
-      u32 eir_pps;
-      u64 cb_ms;
-      u64 eb_ms;
-    } pps;
-  } rb;				/* rate burst config */
-  u8 rate_type;			/* sse2_qos_rate_type_en */
-  u8 rnd_type;			/* sse2_qos_round_type_en */
-  u8 rfc;			/* sse2_qos_policer_type_en */
-  u8 color_aware;
-  u8 overwrite_bucket;		/* for debugging purposes */
-  u32 current_bucket;		/* for debugging purposes */
-  u32 extended_bucket;		/* for debugging purposes */
-  sse2_qos_pol_action_params_st conform_action;
-  sse2_qos_pol_action_params_st exceed_action;
-  sse2_qos_pol_action_params_st violate_action;
-} sse2_qos_pol_cfg_params_st;
-
-
-typedef struct sse2_qos_pol_hw_params_st_
-{
-  u8 rfc;
-  u8 allow_negative;
-  u8 rate_exp;
-  u16 avg_rate_man;
-  u16 peak_rate_man;
-  u8 comm_bkt_limit_exp;
-  u8 comm_bkt_limit_man;
-  u8 extd_bkt_limit_exp;
-  u8 extd_bkt_limit_man;
-  u32 comm_bkt;
-  u32 extd_bkt;
-} sse2_qos_pol_hw_params_st;
-
-
-int
-sse2_pol_logical_2_physical (sse2_qos_pol_cfg_params_st * cfg,
-			     policer_read_response_type_st * phys);
-
-
-#endif /* __included_xlate_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ppp/error.def b/vnet/vnet/ppp/error.def
deleted file mode 100644
index ba645408..00000000
--- a/vnet/vnet/ppp/error.def
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ppp_error.def: ppp errors
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-ppp_error (NONE, "no error")
-ppp_error (UNKNOWN_PROTOCOL, "unknown ppp protocol")
-ppp_error (UNKNOWN_ADDRESS_CONTROL, "address, control != 0xff03")
diff --git a/vnet/vnet/ppp/node.c b/vnet/vnet/ppp/node.c
deleted file mode 100644
index 4f1f6a71..00000000
--- a/vnet/vnet/ppp/node.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ppp_node.c: ppp packet processing
- *
- * Copyright (c) 2010 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ppp/ppp.h>
-#include <vppinfra/sparse_vec.h>
-
-#define foreach_ppp_input_next			\
-  _ (PUNT, "error-punt")			\
-  _ (DROP, "error-drop")
-
-typedef enum
-{
-#define _(s,n) PPP_INPUT_NEXT_##s,
-  foreach_ppp_input_next
-#undef _
-    PPP_INPUT_N_NEXT,
-} ppp_input_next_t;
-
-typedef struct
-{
-  u8 packet_data[32];
-} ppp_input_trace_t;
-
-static u8 *
-format_ppp_input_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  ppp_input_trace_t *t = va_arg (*va, ppp_input_trace_t *);
-
-  s = format (s, "%U", format_ppp_header, t->packet_data);
-
-  return s;
-}
-
-typedef struct
-{
-  /* Sparse vector mapping ppp protocol in network byte order
-     to next index. */
-  u16 *next_by_protocol;
-
-  u32 *sparse_index_by_next_index;
-} ppp_input_runtime_t;
-
-static uword
-ppp_input (vlib_main_t * vm,
-	   vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  ppp_input_runtime_t *rt = (void *) node->runtime_data;
-  u32 n_left_from, next_index, i_next, *from, *to_next;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node,
-				   from,
-				   n_left_from,
-				   sizeof (from[0]),
-				   sizeof (ppp_input_trace_t));
-
-  next_index = node->cached_next_index;
-  i_next = vec_elt (rt->sparse_index_by_next_index, next_index);
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  ppp_header_t *h0, *h1;
-	  u32 i0, i1, protocol0, protocol1, enqueue_code;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, sizeof (h0[0]), LOAD);
-	    CLIB_PREFETCH (p3->data, sizeof (h1[0]), LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  h0 = (void *) (b0->data + b0->current_data);
-	  h1 = (void *) (b1->data + b1->current_data);
-
-	  b0->current_data += sizeof (h0[0]);
-	  b1->current_data += sizeof (h1[0]);
-
-	  b0->current_length -= sizeof (h0[0]);
-	  b1->current_length -= sizeof (h1[0]);
-
-	  /* Index sparse array with network byte order. */
-	  protocol0 = h0->protocol;
-	  protocol1 = h1->protocol;
-	  sparse_vec_index2 (rt->next_by_protocol, protocol0, protocol1, &i0,
-			     &i1);
-
-	  b0->error =
-	    node->errors[i0 ==
-			 SPARSE_VEC_INVALID_INDEX ? PPP_ERROR_UNKNOWN_PROTOCOL
-			 : PPP_ERROR_NONE];
-	  b1->error =
-	    node->errors[i1 ==
-			 SPARSE_VEC_INVALID_INDEX ? PPP_ERROR_UNKNOWN_PROTOCOL
-			 : PPP_ERROR_NONE];
-
-	  enqueue_code = (i0 != i_next) + 2 * (i1 != i_next);
-
-	  if (PREDICT_FALSE (enqueue_code != 0))
-	    {
-	      switch (enqueue_code)
-		{
-		case 1:
-		  /* A B A */
-		  to_next[-2] = bi1;
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node,
-					      vec_elt (rt->next_by_protocol,
-						       i0), bi0);
-		  break;
-
-		case 2:
-		  /* A A B */
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node,
-					      vec_elt (rt->next_by_protocol,
-						       i1), bi1);
-		  break;
-
-		case 3:
-		  /* A B B or A B C */
-		  to_next -= 2;
-		  n_left_to_next += 2;
-		  vlib_set_next_frame_buffer (vm, node,
-					      vec_elt (rt->next_by_protocol,
-						       i0), bi0);
-		  vlib_set_next_frame_buffer (vm, node,
-					      vec_elt (rt->next_by_protocol,
-						       i1), bi1);
-		  if (i0 == i1)
-		    {
-		      vlib_put_next_frame (vm, node, next_index,
-					   n_left_to_next);
-		      i_next = i1;
-		      next_index = vec_elt (rt->next_by_protocol, i_next);
-		      vlib_get_next_frame (vm, node, next_index, to_next,
-					   n_left_to_next);
-		    }
-		}
-	    }
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  ppp_header_t *h0;
-	  u32 i0, protocol0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  h0 = (void *) (b0->data + b0->current_data);
-
-	  b0->current_data += sizeof (h0[0]);
-	  b0->current_length -= sizeof (h0[0]);
-
-	  protocol0 = h0->protocol;
-	  i0 = sparse_vec_index (rt->next_by_protocol, protocol0);
-
-	  b0->error =
-	    node->errors[i0 ==
-			 SPARSE_VEC_INVALID_INDEX ? PPP_ERROR_UNKNOWN_PROTOCOL
-			 : PPP_ERROR_NONE];
-
-	  /* Sent packet to wrong next? */
-	  if (PREDICT_FALSE (i0 != i_next))
-	    {
-	      /* Return old frame; remove incorrectly enqueued packet. */
-	      vlib_put_next_frame (vm, node, next_index, n_left_to_next + 1);
-
-	      /* Send to correct next. */
-	      i_next = i0;
-	      next_index = vec_elt (rt->next_by_protocol, i_next);
-	      vlib_get_next_frame (vm, node, next_index,
-				   to_next, n_left_to_next);
-	      to_next[0] = bi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-static char *ppp_error_strings[] = {
-#define ppp_error(n,s) s,
-#include "error.def"
-#undef ppp_error
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ppp_input_node) = {
-  .function = ppp_input,
-  .name = "ppp-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .runtime_data_bytes = sizeof (ppp_input_runtime_t),
-
-  .n_errors = PPP_N_ERROR,
-  .error_strings = ppp_error_strings,
-
-  .n_next_nodes = PPP_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [PPP_INPUT_NEXT_##s] = n,
-    foreach_ppp_input_next
-#undef _
-  },
-
-  .format_buffer = format_ppp_header_with_length,
-  .format_trace = format_ppp_input_trace,
-  .unformat_buffer = unformat_ppp_header,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-ppp_input_init (vlib_main_t * vm)
-{
-  ppp_input_runtime_t *rt;
-
-  {
-    clib_error_t *error = vlib_call_init_function (vm, ppp_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  ppp_setup_node (vm, ppp_input_node.index);
-
-  rt = vlib_node_get_runtime_data (vm, ppp_input_node.index);
-
-  rt->next_by_protocol = sparse_vec_new
-    ( /* elt bytes */ sizeof (rt->next_by_protocol[0]),
-     /* bits in index */ BITS (((ppp_header_t *) 0)->protocol));
-
-  vec_validate (rt->sparse_index_by_next_index, PPP_INPUT_NEXT_DROP);
-  vec_validate (rt->sparse_index_by_next_index, PPP_INPUT_NEXT_PUNT);
-  rt->sparse_index_by_next_index[PPP_INPUT_NEXT_DROP]
-    = SPARSE_VEC_INVALID_INDEX;
-  rt->sparse_index_by_next_index[PPP_INPUT_NEXT_PUNT]
-    = SPARSE_VEC_INVALID_INDEX;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (ppp_input_init);
-
-void
-ppp_register_input_protocol (vlib_main_t * vm,
-			     ppp_protocol_t protocol, u32 node_index)
-{
-  ppp_main_t *em = &ppp_main;
-  ppp_protocol_info_t *pi;
-  ppp_input_runtime_t *rt;
-  u16 *n;
-  u32 i;
-
-  {
-    clib_error_t *error = vlib_call_init_function (vm, ppp_input_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  pi = ppp_get_protocol_info (em, protocol);
-  pi->node_index = node_index;
-  pi->next_index = vlib_node_add_next (vm, ppp_input_node.index, node_index);
-
-  /* Setup ppp protocol -> next index sparse vector mapping. */
-  rt = vlib_node_get_runtime_data (vm, ppp_input_node.index);
-  n =
-    sparse_vec_validate (rt->next_by_protocol,
-			 clib_host_to_net_u16 (protocol));
-  n[0] = pi->next_index;
-
-  /* Rebuild next index -> sparse index inverse mapping when sparse vector
-     is updated. */
-  vec_validate (rt->sparse_index_by_next_index, pi->next_index);
-  for (i = 1; i < vec_len (rt->next_by_protocol); i++)
-    rt->sparse_index_by_next_index[rt->next_by_protocol[i]] = i;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ppp/packet.h b/vnet/vnet/ppp/packet.h
deleted file mode 100644
index cab9743d..00000000
--- a/vnet/vnet/ppp/packet.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vnet_ppp_packet_h
-#define included_vnet_ppp_packet_h
-
-/*
- * PPP packet format
- *
- * Copyright (c) 2009 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
-See http://www.iana.org/assignments/ppp-numbers.
-
-The Point-to-Point Protocol (PPP) Data Link Layer [146,147,175]
-contains a 16 bit Protocol field to identify the the encapsulated
-protocol.  The Protocol field is consistent with the ISO 3309 (HDLC)
-extension mechanism for Address fields.  All Protocols MUST be
-assigned such that the least significant bit of the most significant
-octet equals "0", and the least significant bit of the least
-significant octet equals "1".
-*/
-
-#define foreach_ppp_protocol			\
-_ (0x0001, padding)				\
-_ (0x0003, rohc_small_cid)			\
-_ (0x0005, rohc_large_cid)			\
-_ (0x0021, ip4)					\
-_ (0x0023, osi)					\
-_ (0x0025, xerox_ns_idp)			\
-_ (0x0027, decnet)				\
-_ (0x0029, appletalk)				\
-_ (0x002b, ipx)					\
-_ (0x002d, vj_compressed_tcp)			\
-_ (0x002f, vj_uncompressed_tcp)			\
-_ (0x0031, bpdu)				\
-_ (0x0033, streams)				\
-_ (0x0035, vines)				\
-_ (0x0039, appletalk_eddp)			\
-_ (0x003b, appletalk_smart_buffered)		\
-_ (0x003d, multilink)				\
-_ (0x003f, netbios_framing)			\
-_ (0x0041, cisco)				\
-_ (0x0043, timeplex)				\
-_ (0x0045, fujitsu_lblb)			\
-_ (0x0047, dca_remote_lan)			\
-_ (0x0049, sdtp)				\
-_ (0x004b, sna_over_802_2)			\
-_ (0x004d, sna)					\
-_ (0x004f, ip6_header_compression)		\
-_ (0x0051, knx)					\
-_ (0x0053, encryption)				\
-_ (0x0055, link_encryption)			\
-_ (0x0057, ip6)					\
-_ (0x0059, ppp_mux)				\
-_ (0x005b, vendor_specific_a)			\
-_ (0x0061, rtp_iphc_full_header)		\
-_ (0x0063, rtp_iphc_compressed_tcp)		\
-_ (0x0065, rtp_iphc_compressed_non_tcp)		\
-_ (0x0067, rtp_iphc_compressed_udp_8)		\
-_ (0x0069, rtp_iphc_compressed_rtp_8)		\
-_ (0x006f, stampede)				\
-_ (0x0073, mp_plus)				\
-_ (0x007d, control)				\
-_ (0x00c1, ntcits_ipi)				\
-_ (0x00cf, ppp_nlpid)				\
-_ (0x00fb, multilink_compression)		\
-_ (0x00fd, compressed_datagram)			\
-_ (0x0201, 802_1d_hello)			\
-_ (0x0203, ibm_source_routing)			\
-_ (0x0205, dec_lanbridge)			\
-_ (0x0207, cdp)					\
-_ (0x0209, netcs)				\
-_ (0x020b, stp)					\
-_ (0x020d, edp)					\
-_ (0x0211, oscp_a)				\
-_ (0x0213, oscp_b)				\
-_ (0x0231, luxcom)				\
-_ (0x0233, sigma)				\
-_ (0x0235, apple_client_server)			\
-_ (0x0281, mpls_unicast)			\
-_ (0x0283, mpls_multicast)			\
-_ (0x0285, ieee_p1284_4)			\
-_ (0x0287, tetra)				\
-_ (0x0289, multichannel_flow_treatment)		\
-_ (0x2063, rtp_iphc_compressed_tcp_no_delta)	\
-_ (0x2065, rtp_iphc_context_state)		\
-_ (0x2067, rtp_iphc_compressed_udp_16)		\
-_ (0x2069, rtp_iphc_compressed_rtp_16)		\
-_ (0x4001, cray)				\
-_ (0x4003, cdpd)				\
-_ (0x4005, expand)				\
-_ (0x4007, odsicp)				\
-_ (0x4009, docsis_dll)				\
-_ (0x400B, cetacean)				\
-_ (0x4021, lzs)					\
-_ (0x4023, reftek)				\
-_ (0x4025, fibre_channel)			\
-_ (0x4027, emit)				\
-_ (0x405b, vendor_specific_b)			\
-_ (0xc021, lcp)					\
-_ (0xc023, pap)					\
-_ (0xc025, link_quality_report)			\
-_ (0xc027, shiva_password)			\
-_ (0xc029, cbcp)				\
-_ (0xc02b, bacp)				\
-_ (0xc02d, bap)					\
-_ (0xc05b, vendor_specific_password)		\
-_ (0xc081, container_control)			\
-_ (0xc223, chap)				\
-_ (0xc225, rsa)					\
-_ (0xc227, extensible_authentication)		\
-_ (0xc229, mitsubishi_security_info)		\
-_ (0xc26f, stampede_authorization)		\
-_ (0xc281, proprietary_authentication_a)	\
-_ (0xc283, proprietary_authentication_b)	\
-_ (0xc481, proprietary_node_id_authentication)
-
-typedef enum
-{
-#define _(n,f) PPP_PROTOCOL_##f = n,
-  foreach_ppp_protocol
-#undef _
-} ppp_protocol_t;
-
-/* PPP Link Control Protocol (LCP) and Internet Protocol Control Protocol (IPCP) Codes
-
-The Point-to-Point Protocol (PPP) Link Control Protocol (LCP),
-the Compression Control Protocol (CCP), Internet Protocol Control
-Protocol (IPCP), and other control protocols, contain an 8 bit
-Code field which identifies the type of packet. */
-
-#define foreach_ppp_lcp_code			\
-_ (0, vendor_specific)				\
-_ (1, configure_request)			\
-_ (2, configure_ack)				\
-_ (3, configure_nak)				\
-_ (4, configure_reject)				\
-_ (5, terminate_request)			\
-_ (6, terminate_ack)				\
-_ (7, code_reject)				\
-_ (8, protocol_reject)				\
-_ (9, echo_request)				\
-_ (10, echo_reply)				\
-_ (11, discard_request)				\
-_ (12, identification)				\
-_ (13, time_remaining)				\
-_ (14, reset_request)				\
-_ (15, reset_reply)
-
-typedef struct
-{
-  /* Set to 0xff 0x03 */
-  u8 address, control;
-
-  /* Layer 3 protocol for this packet. */
-  u16 protocol;
-} ppp_header_t;
-
-#endif /* included_vnet_ppp_packet_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ppp/pg.c b/vnet/vnet/ppp/pg.c
deleted file mode 100644
index 0b46ccb9..00000000
--- a/vnet/vnet/ppp/pg.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ppp_pg.c: packet generator ppp interface
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ppp/ppp.h>
-
-typedef struct
-{
-  pg_edit_t address;
-  pg_edit_t control;
-  pg_edit_t protocol;
-} pg_ppp_header_t;
-
-static inline void
-pg_ppp_header_init (pg_ppp_header_t * e)
-{
-  pg_edit_init (&e->address, ppp_header_t, address);
-  pg_edit_init (&e->control, ppp_header_t, control);
-  pg_edit_init (&e->protocol, ppp_header_t, protocol);
-}
-
-uword
-unformat_pg_ppp_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t *s = va_arg (*args, pg_stream_t *);
-  pg_ppp_header_t *h;
-  u32 group_index, error;
-
-  h = pg_create_edit_group (s, sizeof (h[0]), sizeof (ppp_header_t),
-			    &group_index);
-  pg_ppp_header_init (h);
-
-  pg_edit_set_fixed (&h->address, 0xff);
-  pg_edit_set_fixed (&h->control, 0x03);
-
-  error = 1;
-  if (!unformat (input, "%U",
-		 unformat_pg_edit,
-		 unformat_ppp_protocol_net_byte_order, &h->protocol))
-    goto done;
-
-  {
-    ppp_main_t *pm = &ppp_main;
-    ppp_protocol_info_t *pi = 0;
-    pg_node_t *pg_node = 0;
-
-    if (h->protocol.type == PG_EDIT_FIXED)
-      {
-	u16 t = *(u16 *) h->protocol.values[PG_EDIT_LO];
-	pi = ppp_get_protocol_info (pm, clib_net_to_host_u16 (t));
-	if (pi && pi->node_index != ~0)
-	  pg_node = pg_get_node (pi->node_index);
-      }
-
-    if (pg_node && pg_node->unformat_edit
-	&& unformat_user (input, pg_node->unformat_edit, s))
-      ;
-
-    else if (!unformat_user (input, unformat_pg_payload, s))
-      goto done;
-  }
-
-  error = 0;
-done:
-  if (error)
-    pg_free_edit_group (s);
-  return error == 0;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ppp/ppp.c b/vnet/vnet/ppp/ppp.c
deleted file mode 100644
index a0eefbad..00000000
--- a/vnet/vnet/ppp/ppp.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ppp.c: ppp support
- *
- * Copyright (c) 2010 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/ppp/ppp.h>
-
-/* Global main structure. */
-ppp_main_t ppp_main;
-
-u8 *
-format_ppp_protocol (u8 * s, va_list * args)
-{
-  ppp_protocol_t p = va_arg (*args, u32);
-  ppp_main_t *pm = &ppp_main;
-  ppp_protocol_info_t *pi = ppp_get_protocol_info (pm, p);
-
-  if (pi)
-    s = format (s, "%s", pi->name);
-  else
-    s = format (s, "0x%04x", p);
-
-  return s;
-}
-
-u8 *
-format_ppp_header_with_length (u8 * s, va_list * args)
-{
-  ppp_main_t *pm = &ppp_main;
-  ppp_header_t *h = va_arg (*args, ppp_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-  ppp_protocol_t p = clib_net_to_host_u16 (h->protocol);
-  uword indent, header_bytes;
-
-  header_bytes = sizeof (h[0]);
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    return format (s, "ppp header truncated");
-
-  indent = format_get_indent (s);
-
-  s = format (s, "PPP %U", format_ppp_protocol, p);
-
-  if (h->address != 0xff)
-    s = format (s, ", address 0x%02x", h->address);
-  if (h->control != 0x03)
-    s = format (s, ", control 0x%02x", h->control);
-
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    {
-      ppp_protocol_info_t *pi = ppp_get_protocol_info (pm, p);
-      vlib_node_t *node = vlib_get_node (pm->vlib_main, pi->node_index);
-      if (node->format_buffer)
-	s = format (s, "\n%U%U",
-		    format_white_space, indent,
-		    node->format_buffer, (void *) (h + 1),
-		    max_header_bytes - header_bytes);
-    }
-
-  return s;
-}
-
-u8 *
-format_ppp_header (u8 * s, va_list * args)
-{
-  ppp_header_t *h = va_arg (*args, ppp_header_t *);
-  return format (s, "%U", format_ppp_header_with_length, h, 0);
-}
-
-/* Returns ppp protocol as an int in host byte order. */
-uword
-unformat_ppp_protocol_host_byte_order (unformat_input_t * input,
-				       va_list * args)
-{
-  u16 *result = va_arg (*args, u16 *);
-  ppp_main_t *pm = &ppp_main;
-  int p, i;
-
-  /* Numeric type. */
-  if (unformat (input, "0x%x", &p) || unformat (input, "%d", &p))
-    {
-      if (p >= (1 << 16))
-	return 0;
-      *result = p;
-      return 1;
-    }
-
-  /* Named type. */
-  if (unformat_user (input, unformat_vlib_number_by_name,
-		     pm->protocol_info_by_name, &i))
-    {
-      ppp_protocol_info_t *pi = vec_elt_at_index (pm->protocol_infos, i);
-      *result = pi->protocol;
-      return 1;
-    }
-
-  return 0;
-}
-
-uword
-unformat_ppp_protocol_net_byte_order (unformat_input_t * input,
-				      va_list * args)
-{
-  u16 *result = va_arg (*args, u16 *);
-  if (!unformat_user (input, unformat_ppp_protocol_host_byte_order, result))
-    return 0;
-  *result = clib_host_to_net_u16 ((u16) * result);
-  return 1;
-}
-
-uword
-unformat_ppp_header (unformat_input_t * input, va_list * args)
-{
-  u8 **result = va_arg (*args, u8 **);
-  ppp_header_t _h, *h = &_h;
-  u16 p;
-
-  if (!unformat (input, "%U", unformat_ppp_protocol_host_byte_order, &p))
-    return 0;
-
-  h->address = 0xff;
-  h->control = 0x03;
-  h->protocol = clib_host_to_net_u16 (p);
-
-  /* Add header to result. */
-  {
-    void *p;
-    u32 n_bytes = sizeof (h[0]);
-
-    vec_add2 (*result, p, n_bytes);
-    clib_memcpy (p, h, n_bytes);
-  }
-
-  return 1;
-}
-
-static u8 *
-ppp_build_rewrite (vnet_main_t * vnm,
-		   u32 sw_if_index,
-		   vnet_link_t link_type, const void *dst_hw_address)
-{
-  ppp_header_t *h;
-  u8 *rewrite = NULL;
-  ppp_protocol_t protocol;
-
-  switch (link_type)
-    {
-#define _(a,b) case VNET_LINK_##a: protocol = PPP_PROTOCOL_##b; break
-      _(IP4, ip4);
-      _(IP6, ip6);
-      _(MPLS, mpls_unicast);
-#undef _
-    default:
-      return (NULL);
-    }
-
-  vec_validate (rewrite, sizeof (*h) - 1);
-  h = (ppp_header_t *) rewrite;
-  h->address = 0xff;
-  h->control = 0x03;
-  h->protocol = clib_host_to_net_u16 (protocol);
-
-  return (rewrite);
-}
-
-/* *INDENT-OFF* */
-VNET_HW_INTERFACE_CLASS (ppp_hw_interface_class) = {
-  .name = "PPP",
-  .format_header = format_ppp_header_with_length,
-  .unformat_header = unformat_ppp_header,
-  .build_rewrite = ppp_build_rewrite,
-  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
-};
-/* *INDENT-ON* */
-
-static void
-add_protocol (ppp_main_t * pm, ppp_protocol_t protocol, char *protocol_name)
-{
-  ppp_protocol_info_t *pi;
-  u32 i;
-
-  vec_add2 (pm->protocol_infos, pi, 1);
-  i = pi - pm->protocol_infos;
-
-  pi->name = protocol_name;
-  pi->protocol = protocol;
-  pi->next_index = pi->node_index = ~0;
-
-  hash_set (pm->protocol_info_by_protocol, protocol, i);
-  hash_set_mem (pm->protocol_info_by_name, pi->name, i);
-}
-
-static clib_error_t *
-ppp_init (vlib_main_t * vm)
-{
-  ppp_main_t *pm = &ppp_main;
-
-  memset (pm, 0, sizeof (pm[0]));
-  pm->vlib_main = vm;
-
-  pm->protocol_info_by_name = hash_create_string (0, sizeof (uword));
-  pm->protocol_info_by_protocol = hash_create (0, sizeof (uword));
-
-#define _(n,s) add_protocol (pm, PPP_PROTOCOL_##s, #s);
-  foreach_ppp_protocol;
-#undef _
-
-  return vlib_call_init_function (vm, ppp_input_init);
-}
-
-VLIB_INIT_FUNCTION (ppp_init);
-
-ppp_main_t *
-ppp_get_main (vlib_main_t * vm)
-{
-  vlib_call_init_function (vm, ppp_init);
-  return &ppp_main;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/ppp/ppp.h b/vnet/vnet/ppp/ppp.h
deleted file mode 100644
index fdc205b6..00000000
--- a/vnet/vnet/ppp/ppp.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ppp.h: types/functions for ppp.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_ppp_h
-#define included_ppp_h
-
-#include <vnet/vnet.h>
-#include <vnet/ppp/packet.h>
-#include <vnet/pg/pg.h>
-
-extern vnet_hw_interface_class_t ppp_hw_interface_class;
-
-typedef enum
-{
-#define ppp_error(n,s) PPP_ERROR_##n,
-#include <vnet/ppp/error.def>
-#undef ppp_error
-  PPP_N_ERROR,
-} ppp_error_t;
-
-typedef struct
-{
-  /* Name (a c string). */
-  char *name;
-
-  /* PPP protocol type in host byte order. */
-  ppp_protocol_t protocol;
-
-  /* Node which handles this type. */
-  u32 node_index;
-
-  /* Next index for this type. */
-  u32 next_index;
-} ppp_protocol_info_t;
-
-typedef struct
-{
-  vlib_main_t *vlib_main;
-
-  ppp_protocol_info_t *protocol_infos;
-
-  /* Hash tables mapping name/protocol to protocol info index. */
-  uword *protocol_info_by_name, *protocol_info_by_protocol;
-} ppp_main_t;
-
-always_inline ppp_protocol_info_t *
-ppp_get_protocol_info (ppp_main_t * em, ppp_protocol_t protocol)
-{
-  uword *p = hash_get (em->protocol_info_by_protocol, protocol);
-  return p ? vec_elt_at_index (em->protocol_infos, p[0]) : 0;
-}
-
-extern ppp_main_t ppp_main;
-
-/* Register given node index to take input for given ppp type. */
-void
-ppp_register_input_type (vlib_main_t * vm,
-			 ppp_protocol_t protocol, u32 node_index);
-
-void ppp_set_adjacency (vnet_rewrite_header_t * rw,
-			uword max_data_bytes, ppp_protocol_t protocol);
-
-format_function_t format_ppp_protocol;
-format_function_t format_ppp_header;
-format_function_t format_ppp_header_with_length;
-
-/* Parse ppp protocol as 0xXXXX or protocol name.
-   In either host or network byte order. */
-unformat_function_t unformat_ppp_protocol_host_byte_order;
-unformat_function_t unformat_ppp_protocol_net_byte_order;
-
-/* Parse ppp header. */
-unformat_function_t unformat_ppp_header;
-unformat_function_t unformat_pg_ppp_header;
-
-always_inline void
-ppp_setup_node (vlib_main_t * vm, u32 node_index)
-{
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  pg_node_t *pn = pg_get_node (node_index);
-
-  n->format_buffer = format_ppp_header_with_length;
-  n->unformat_buffer = unformat_ppp_header;
-  pn->unformat_edit = unformat_pg_ppp_header;
-}
-
-void
-ppp_register_input_protocol (vlib_main_t * vm,
-			     ppp_protocol_t protocol, u32 node_index);
-
-#endif /* included_ppp_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/replication.c b/vnet/vnet/replication.c
deleted file mode 100644
index 561c86cd..00000000
--- a/vnet/vnet/replication.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * replication.c : packet replication
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vppinfra/error.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/replication.h>
-
-
-replication_main_t replication_main;
-
-
-replication_context_t *
-replication_prep (vlib_main_t * vm,
-		  vlib_buffer_t * b0, u32 recycle_node_index, u32 l2_packet)
-{
-  replication_main_t *rm = &replication_main;
-  replication_context_t *ctx;
-  uword cpu_number = vm->cpu_index;
-  ip4_header_t *ip;
-  u32 ctx_id;
-
-  /* Allocate a context, reserve context 0 */
-  if (PREDICT_FALSE (rm->contexts[cpu_number] == 0))
-    pool_get_aligned (rm->contexts[cpu_number], ctx, CLIB_CACHE_LINE_BYTES);
-
-  pool_get_aligned (rm->contexts[cpu_number], ctx, CLIB_CACHE_LINE_BYTES);
-  ctx_id = ctx - rm->contexts[cpu_number];
-
-  /* Save state from vlib buffer */
-  ctx->saved_free_list_index = b0->free_list_index;
-  ctx->current_data = b0->current_data;
-
-  /* Set up vlib buffer hooks */
-  b0->recycle_count = ctx_id;
-  b0->free_list_index = rm->recycle_list_index;
-  b0->flags |= VLIB_BUFFER_RECYCLE;
-
-  /* Save feature state */
-  ctx->recycle_node_index = recycle_node_index;
-
-  /* Save vnet state */
-  clib_memcpy (ctx->vnet_buffer, vnet_buffer (b0),
-	       sizeof (vnet_buffer_opaque_t));
-
-  /* Save packet contents */
-  ctx->l2_packet = l2_packet;
-  ip = (ip4_header_t *) vlib_buffer_get_current (b0);
-  if (l2_packet)
-    {
-      /* Save ethernet header */
-      ctx->l2_header[0] = ((u64 *) ip)[0];
-      ctx->l2_header[1] = ((u64 *) ip)[1];
-      ctx->l2_header[2] = ((u64 *) ip)[2];
-      /* set ip to the true ip header */
-      ip = (ip4_header_t *) (((u8 *) ip) + vnet_buffer (b0)->l2.l2_len);
-    }
-
-  /*
-   * Copy L3 fields.
-   * We need to save TOS for ip4 and ip6 packets.
-   * Fortunately the TOS field is
-   * in the first two bytes of both the ip4 and ip6 headers.
-   */
-  ctx->ip_tos = *((u16 *) (ip));
-
-  /*
-   * Save the ip4 checksum as well. We just blindly save the corresponding two
-   * bytes even for ip6 packets.
-   */
-  ctx->ip4_checksum = ip->checksum;
-
-  return ctx;
-}
-
-
-replication_context_t *
-replication_recycle (vlib_main_t * vm, vlib_buffer_t * b0, u32 is_last)
-{
-  replication_main_t *rm = &replication_main;
-  replication_context_t *ctx;
-  uword cpu_number = vm->cpu_index;
-  ip4_header_t *ip;
-
-  /* Get access to the replication context */
-  ctx = pool_elt_at_index (rm->contexts[cpu_number], b0->recycle_count);
-
-  /* Restore vnet buffer state */
-  clib_memcpy (vnet_buffer (b0), ctx->vnet_buffer,
-	       sizeof (vnet_buffer_opaque_t));
-
-  /* Restore the packet start (current_data) and length */
-  vlib_buffer_advance (b0, ctx->current_data - b0->current_data);
-
-  /* Restore packet contents */
-  ip = (ip4_header_t *) vlib_buffer_get_current (b0);
-  if (ctx->l2_packet)
-    {
-      /* Restore ethernet header */
-      ((u64 *) ip)[0] = ctx->l2_header[0];
-      ((u64 *) ip)[1] = ctx->l2_header[1];
-      ((u64 *) ip)[2] = ctx->l2_header[2];
-      /* set ip to the true ip header */
-      ip = (ip4_header_t *) (((u8 *) ip) + vnet_buffer (b0)->l2.l2_len);
-    }
-
-  // Restore L3 fields
-  *((u16 *) (ip)) = ctx->ip_tos;
-  ip->checksum = ctx->ip4_checksum;
-
-  if (is_last)
-    {
-      /*
-       * This is the last replication in the list.
-       * Restore original buffer free functionality.
-       */
-      b0->free_list_index = ctx->saved_free_list_index;
-      b0->flags &= ~VLIB_BUFFER_RECYCLE;
-
-      /* Free context back to its pool */
-      pool_put (rm->contexts[cpu_number], ctx);
-    }
-
-  return ctx;
-}
-
-
-
-/*
- * fish pkts back from the recycle queue/freelist
- * un-flatten the context chains
- */
-static void
-replication_recycle_callback (vlib_main_t * vm, vlib_buffer_free_list_t * fl)
-{
-  vlib_frame_t *f = 0;
-  u32 n_left_from;
-  u32 n_left_to_next = 0;
-  u32 n_this_frame = 0;
-  u32 *from;
-  u32 *to_next = 0;
-  u32 bi0, pi0;
-  vlib_buffer_t *b0;
-  int i;
-  replication_main_t *rm = &replication_main;
-  replication_context_t *ctx;
-  u32 feature_node_index = 0;
-  uword cpu_number = vm->cpu_index;
-
-  /*
-   * All buffers in the list are destined to the same recycle node.
-   * Pull the recycle node index from the first buffer.
-   * Note: this could be sped up if the node index were stuffed into
-   * the freelist itself.
-   */
-  if (vec_len (fl->aligned_buffers) > 0)
-    {
-      bi0 = fl->aligned_buffers[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      ctx = pool_elt_at_index (rm->contexts[cpu_number], b0->recycle_count);
-      feature_node_index = ctx->recycle_node_index;
-    }
-  else if (vec_len (fl->unaligned_buffers) > 0)
-    {
-      bi0 = fl->unaligned_buffers[0];
-      b0 = vlib_get_buffer (vm, bi0);
-      ctx = pool_elt_at_index (rm->contexts[cpu_number], b0->recycle_count);
-      feature_node_index = ctx->recycle_node_index;
-    }
-
-  /* aligned, unaligned buffers */
-  for (i = 0; i < 2; i++)
-    {
-      if (i == 0)
-	{
-	  from = fl->aligned_buffers;
-	  n_left_from = vec_len (from);
-	}
-      else
-	{
-	  from = fl->unaligned_buffers;
-	  n_left_from = vec_len (from);
-	}
-
-      while (n_left_from > 0)
-	{
-	  if (PREDICT_FALSE (n_left_to_next == 0))
-	    {
-	      if (f)
-		{
-		  f->n_vectors = n_this_frame;
-		  vlib_put_frame_to_node (vm, feature_node_index, f);
-		}
-
-	      f = vlib_get_frame_to_node (vm, feature_node_index);
-	      to_next = vlib_frame_vector_args (f);
-	      n_left_to_next = VLIB_FRAME_SIZE;
-	      n_this_frame = 0;
-	    }
-
-	  bi0 = from[0];
-	  if (PREDICT_TRUE (n_left_from > 1))
-	    {
-	      pi0 = from[1];
-	      vlib_prefetch_buffer_with_index (vm, pi0, LOAD);
-	    }
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  /* Mark that this buffer was just recycled */
-	  b0->flags |= VLIB_BUFFER_IS_RECYCLED;
-
-#if (CLIB_DEBUG > 0)
-#if DPDK == 0
-	  vlib_buffer_set_known_state (vm, bi0, VLIB_BUFFER_KNOWN_ALLOCATED);
-#endif
-#endif
-
-	  /* If buffer is traced, mark frame as traced */
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    f->flags |= VLIB_FRAME_TRACE;
-
-	  to_next[0] = bi0;
-
-	  from++;
-	  to_next++;
-	  n_this_frame++;
-	  n_left_to_next--;
-	  n_left_from--;
-	}
-    }
-
-  vec_reset_length (fl->aligned_buffers);
-  vec_reset_length (fl->unaligned_buffers);
-
-  if (f)
-    {
-      ASSERT (n_this_frame);
-      f->n_vectors = n_this_frame;
-      vlib_put_frame_to_node (vm, feature_node_index, f);
-    }
-}
-
-clib_error_t *
-replication_init (vlib_main_t * vm)
-{
-  replication_main_t *rm = &replication_main;
-  vlib_buffer_main_t *bm = vm->buffer_main;
-  vlib_buffer_free_list_t *fl;
-  __attribute__ ((unused)) replication_context_t *ctx;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-
-  rm->vlib_main = vm;
-  rm->vnet_main = vnet_get_main ();
-  rm->recycle_list_index =
-    vlib_buffer_create_free_list (vm, 1024 /* fictional */ ,
-				  "replication-recycle");
-
-  fl = pool_elt_at_index (bm->buffer_free_list_pool, rm->recycle_list_index);
-
-  fl->buffers_added_to_freelist_function = replication_recycle_callback;
-
-  /* Verify the replication context is the expected size */
-  ASSERT (sizeof (replication_context_t) == 128);	/* 2 cache lines */
-
-  vec_validate (rm->contexts, tm->n_vlib_mains - 1);
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (replication_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/replication.h b/vnet/vnet/replication.h
deleted file mode 100644
index 5dc554c9..00000000
--- a/vnet/vnet/replication.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * replication.h : packet replication
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_replication_h
-#define included_replication_h
-
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/replication.h>
-
-
-typedef struct
-{
-  /* The entire vnet buffer header restored for each replica */
-  u8 vnet_buffer[32];		/* 16B aligned to allow vector unit copy */
-  u8 reserved[32];		/* space for future expansion of vnet buffer header */
-
-  /* feature state used during this replication */
-  u64 feature_replicas;		/* feature's id for its set of replicas */
-  u32 feature_counter;		/* feature's current index into set of replicas */
-  u32 recycle_node_index;	/* feature's recycle node index */
-
-  /*
-   * data saved from the start of replication and restored
-   * at the end of replication
-   */
-  u32 saved_free_list_index;	/* from vlib buffer */
-
-  /* data saved from the original packet and restored for each replica */
-  u64 l2_header[3];		/*  24B (must be at least 22B for l2 packets) */
-  u16 ip_tos;			/* v4 and v6 */
-  u16 ip4_checksum;		/* needed for v4 only */
-
-  /* data saved from the vlib buffer header and restored for each replica */
-  i16 current_data;		/* offset of first byte of packet in packet data */
-  u8 pad[6];			/* to 64B */
-  u8 l2_packet;			/* flag for l2 vs l3 packet data */
-
-} replication_context_t;	/* 128B */
-
-
-typedef struct
-{
-
-  u32 recycle_list_index;
-
-  /* per-thread pools of replication contexts */
-  replication_context_t **contexts;
-
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-
-} replication_main_t;
-
-
-extern replication_main_t replication_main;
-
-
-/* Return 1 if this buffer just came from the replication recycle handler. */
-always_inline u32
-replication_is_recycled (vlib_buffer_t * b0)
-{
-  return b0->flags & VLIB_BUFFER_IS_RECYCLED;
-}
-
-/*
- * Clear the recycle flag. If buffer came from the replication recycle
- * handler, this flag must be cleared before the packet is transmitted again.
- */
-always_inline void
-replication_clear_recycled (vlib_buffer_t * b0)
-{
-  b0->flags &= ~VLIB_BUFFER_IS_RECYCLED;
-}
-
-/*
- * Return the active replication context if this buffer has
- * been recycled, otherwise return 0. (Note that this essentially
- * restricts access to the replication context to the replication
- * feature's prep and recycle nodes.)
- */
-always_inline replication_context_t *
-replication_get_ctx (vlib_buffer_t * b0)
-{
-  replication_main_t *rm = &replication_main;
-
-  return replication_is_recycled (b0) ?
-    pool_elt_at_index (rm->contexts[os_get_cpu_number ()],
-		       b0->recycle_count) : 0;
-}
-
-/* Prefetch the replication context for this buffer, if it exists */
-always_inline void
-replication_prefetch_ctx (vlib_buffer_t * b0)
-{
-  replication_context_t *ctx = replication_get_ctx (b0);
-
-  if (ctx)
-    {
-      CLIB_PREFETCH (ctx, (2 * CLIB_CACHE_LINE_BYTES), STORE);
-    }
-}
-
-replication_context_t *replication_prep (vlib_main_t * vm,
-					 vlib_buffer_t * b0,
-					 u32 recycle_node_index,
-					 u32 l2_packet);
-
-replication_context_t *replication_recycle (vlib_main_t * vm,
-					    vlib_buffer_t * b0, u32 is_last);
-
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/rewrite.c b/vnet/vnet/rewrite.c
deleted file mode 100644
index 53d548bc..00000000
--- a/vnet/vnet/rewrite.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * rewrite.c: packet rewrite
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/ip/lookup.h>
-
-void
-vnet_rewrite_copy_slow_path (vnet_rewrite_data_t * p0,
-			     vnet_rewrite_data_t * rw0,
-			     word n_left, uword most_likely_size)
-{
-  uword n_done =
-    round_pow2 (most_likely_size, sizeof (rw0[0])) / sizeof (rw0[0]);
-
-  p0 -= n_done;
-  rw0 -= n_done;
-
-  /* As we enter the cleanup loop, p0 and rw0 point to the last chunk written
-     by the fast path. Hence, the constant 1, which the
-     vnet_rewrite_copy_one macro renders as p0[-1] = rw0[-1]. */
-
-  while (n_left > 0)
-    {
-      vnet_rewrite_copy_one (p0, rw0, 1);
-      p0--;
-      rw0--;
-      n_left--;
-    }
-}
-
-u8 *
-format_vnet_rewrite (u8 * s, va_list * args)
-{
-  vlib_main_t *vm = va_arg (*args, vlib_main_t *);
-  vnet_rewrite_header_t *rw = va_arg (*args, vnet_rewrite_header_t *);
-  u32 max_data_bytes = va_arg (*args, u32);
-  CLIB_UNUSED (uword indent) = va_arg (*args, u32);
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_node_t *next;
-
-  next = vlib_get_next_node (vm, rw->node_index, rw->next_index);
-
-  if (rw->sw_if_index != ~0)
-    {
-      vnet_sw_interface_t *si;
-      si = vnet_get_sw_interface (vnm, rw->sw_if_index);
-      s = format (s, "%U: ", format_vnet_sw_interface_name, vnm, si);
-    }
-  else
-    s = format (s, "%v: ", next->name);
-
-  /* Format rewrite string. */
-  if (rw->data_bytes > 0)
-
-    s = format (s, "%U",
-		next->format_buffer ? next->format_buffer : format_hex_bytes,
-		rw->data + max_data_bytes - rw->data_bytes, rw->data_bytes);
-
-  return s;
-}
-
-u8 *
-format_vnet_rewrite_header (u8 * s, va_list * args)
-{
-  vlib_main_t *vm = va_arg (*args, vlib_main_t *);
-  vnet_rewrite_header_t *rw = va_arg (*args, vnet_rewrite_header_t *);
-  u8 *packet_data = va_arg (*args, u8 *);
-  u32 packet_data_bytes = va_arg (*args, u32);
-  vlib_node_t *next;
-
-  next = vlib_get_next_node (vm, rw->node_index, rw->next_index);
-
-  /* Format rewrite string. */
-  s = format (s, "%U",
-	      next->format_buffer ? next->format_buffer : format_hex_bytes,
-	      packet_data, packet_data_bytes);
-
-  return s;
-}
-
-uword
-unformat_vnet_rewrite (unformat_input_t * input, va_list * args)
-{
-  vlib_main_t *vm = va_arg (*args, vlib_main_t *);
-  vnet_rewrite_header_t *rw = va_arg (*args, vnet_rewrite_header_t *);
-  u32 max_data_bytes = va_arg (*args, u32);
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_node_t *next;
-  u32 next_index, sw_if_index, max_packet_bytes, error;
-  u8 *rw_data;
-
-  rw_data = 0;
-  sw_if_index = ~0;
-  max_packet_bytes = ~0;
-  error = 1;
-
-  /* Parse sw interface. */
-  if (unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
-    {
-      vnet_hw_interface_t *hi;
-
-      hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
-
-      next_index = hi->output_node_index;
-      max_packet_bytes = hi->max_l3_packet_bytes[VLIB_RX];
-    }
-
-  else if (unformat (input, "%U", unformat_vlib_node, vm, &next_index))
-    ;
-
-  else
-    goto done;
-
-  next = vlib_get_node (vm, next_index);
-
-  if (next->unformat_buffer
-      && unformat_user (input, next->unformat_buffer, &rw_data))
-    ;
-
-  else if (unformat_user (input, unformat_hex_string, &rw_data)
-	   || unformat (input, "0x%U", unformat_hex_string, &rw_data))
-    ;
-
-  else
-    goto done;
-
-  /* Re-write does not fit. */
-  if (vec_len (rw_data) >= max_data_bytes)
-    goto done;
-
-  {
-    u32 tmp;
-
-    if (unformat (input, "mtu %d", &tmp)
-	&& tmp < (1 << BITS (rw->max_l3_packet_bytes)))
-      max_packet_bytes = tmp;
-  }
-
-  error = 0;
-  rw->sw_if_index = sw_if_index;
-  rw->max_l3_packet_bytes = max_packet_bytes;
-  rw->next_index = vlib_node_add_next (vm, rw->node_index, next_index);
-  vnet_rewrite_set_data_internal (rw, max_data_bytes, rw_data,
-				  vec_len (rw_data));
-
-done:
-  vec_free (rw_data);
-  return error == 0;
-}
-
-u32
-vnet_tx_node_index_for_sw_interface (vnet_main_t * vnm, u32 sw_if_index)
-{
-  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  return (hw->output_node_index);
-}
-
-void
-vnet_rewrite_init (vnet_main_t * vnm,
-		   u32 sw_if_index,
-		   u32 this_node, u32 next_node, vnet_rewrite_header_t * rw)
-{
-  rw->sw_if_index = sw_if_index;
-  rw->node_index = this_node;
-  rw->next_index = vlib_node_add_next (vnm->vlib_main, this_node, next_node);
-  rw->max_l3_packet_bytes =
-    vnet_sw_interface_get_mtu (vnm, sw_if_index, VLIB_TX);
-}
-
-void
-vnet_rewrite_for_sw_interface (vnet_main_t * vnm,
-			       vnet_link_t link_type,
-			       u32 sw_if_index,
-			       u32 node_index,
-			       void *dst_address,
-			       vnet_rewrite_header_t * rw,
-			       u32 max_rewrite_bytes)
-{
-
-  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  vnet_hw_interface_class_t *hc =
-    vnet_get_hw_interface_class (vnm, hw->hw_class_index);
-  u8 *rewrite = NULL;
-
-  vnet_rewrite_init (vnm, sw_if_index, node_index,
-		     vnet_tx_node_index_for_sw_interface (vnm, sw_if_index),
-		     rw);
-
-  ASSERT (hc->build_rewrite);
-  rewrite = hc->build_rewrite (vnm, sw_if_index, link_type, dst_address);
-
-  ASSERT (vec_len (rewrite) < max_rewrite_bytes);
-  vnet_rewrite_set_data_internal (rw, max_rewrite_bytes, rewrite,
-				  vec_len (rewrite));
-  vec_free (rewrite);
-}
-
-void
-vnet_rewrite_for_tunnel (vnet_main_t * vnm,
-			 u32 tx_sw_if_index,
-			 u32 rewrite_node_index,
-			 u32 post_rewrite_node_index,
-			 vnet_rewrite_header_t * rw,
-			 u8 * rewrite_data, u32 rewrite_length)
-{
-  ip_adjacency_t *adj = 0;
-  /*
-   * Installed into vnet_buffer(b)->sw_if_index[VLIB_TX] e.g.
-   * by ip4_rewrite_inline. If the post-rewrite node injects into
-   * ipX-forward, this will be interpreted as a FIB number.
-   */
-  rw->sw_if_index = tx_sw_if_index;
-  rw->node_index = rewrite_node_index;
-  rw->next_index = vlib_node_add_next (vnm->vlib_main, rewrite_node_index,
-				       post_rewrite_node_index);
-  rw->max_l3_packet_bytes = (u16) ~ 0;	/* we can't know at this point */
-
-  ASSERT (rewrite_length < sizeof (adj->rewrite_data));
-  /* Leave room for ethernet + VLAN tag */
-  vnet_rewrite_set_data_internal (rw, sizeof (adj->rewrite_data),
-				  rewrite_data, rewrite_length);
-}
-
-void
-serialize_vnet_rewrite (serialize_main_t * m, va_list * va)
-{
-  vnet_rewrite_header_t *rw = va_arg (*va, vnet_rewrite_header_t *);
-  u32 max_data_bytes = va_arg (*va, u32);
-  u8 *p;
-
-  serialize_integer (m, rw->sw_if_index, sizeof (rw->sw_if_index));
-  serialize_integer (m, rw->data_bytes, sizeof (rw->data_bytes));
-  serialize_integer (m, rw->max_l3_packet_bytes,
-		     sizeof (rw->max_l3_packet_bytes));
-  p = serialize_get (m, rw->data_bytes);
-  clib_memcpy (p, vnet_rewrite_get_data_internal (rw, max_data_bytes),
-	       rw->data_bytes);
-}
-
-void
-unserialize_vnet_rewrite (serialize_main_t * m, va_list * va)
-{
-  vnet_rewrite_header_t *rw = va_arg (*va, vnet_rewrite_header_t *);
-  u32 max_data_bytes = va_arg (*va, u32);
-  u8 *p;
-
-  /* It is up to user to fill these in. */
-  rw->node_index = ~0;
-  rw->next_index = ~0;
-
-  unserialize_integer (m, &rw->sw_if_index, sizeof (rw->sw_if_index));
-  unserialize_integer (m, &rw->data_bytes, sizeof (rw->data_bytes));
-  unserialize_integer (m, &rw->max_l3_packet_bytes,
-		       sizeof (rw->max_l3_packet_bytes));
-  p = unserialize_get (m, rw->data_bytes);
-  clib_memcpy (vnet_rewrite_get_data_internal (rw, max_data_bytes), p,
-	       rw->data_bytes);
-}
-
-u8 *
-vnet_build_rewrite_for_sw_interface (vnet_main_t * vnm,
-				     u32 sw_if_index,
-				     vnet_link_t link_type,
-				     const void *dst_address)
-{
-  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  vnet_hw_interface_class_t *hc =
-    vnet_get_hw_interface_class (vnm, hw->hw_class_index);
-
-  ASSERT (hc->build_rewrite);
-  return (hc->build_rewrite (vnm, sw_if_index, link_type, dst_address));
-}
-
-
-void
-vnet_update_adjacency_for_sw_interface (vnet_main_t * vnm,
-					u32 sw_if_index, u32 ai)
-{
-  vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  vnet_hw_interface_class_t *hc =
-    vnet_get_hw_interface_class (vnm, hw->hw_class_index);
-
-  ASSERT (hc->update_adjacency);
-  hc->update_adjacency (vnm, sw_if_index, ai);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/rewrite.h b/vnet/vnet/rewrite.h
deleted file mode 100644
index 00c1efbd..00000000
--- a/vnet/vnet/rewrite.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * rewrite.h: packet rewrite
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vnet_rewrite_h
-#define included_vnet_rewrite_h
-
-#include <vlib/vlib.h>
-#include <vnet/l3_types.h>
-
-/* Consider using vector types for speed? */
-typedef uword vnet_rewrite_data_t;
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  /* Interface to mark re-written packets with. */
-  u32 sw_if_index;
-
-  /* Packet processing node where rewrite happens. */
-  u32 node_index;
-
-  /* Next node to feed after packet rewrite is done. */
-  u16 next_index;
-
-  /* Number of bytes in rewrite data. */
-  u16 data_bytes;
-
-  /* Max packet size layer 3 (MTU) for output interface.
-     Used for MTU check after packet rewrite. */
-  u16 max_l3_packet_bytes;
-
-  /* Rewrite string starting at end and going backwards. */
-  u8 data[0];
-}) vnet_rewrite_header_t;
-/* *INDENT-ON* */
-
-/*
-  Helper macro for declaring rewrite string w/ given max-size.
-
-  Typical usage:
-    typedef struct {
-      //
-      int a, b;
-
-      // Total adjacency is 64 bytes.
-      vnet_rewrite_declare(64 - 2*sizeof(int)) rw;
-    } my_adjacency_t;
-*/
-#define vnet_declare_rewrite(total_bytes)				\
-struct {								\
-  vnet_rewrite_header_t rewrite_header;  			        \
-									\
-  u8 rewrite_data[(total_bytes) - sizeof (vnet_rewrite_header_t)];	\
-}
-
-always_inline void
-vnet_rewrite_clear_data_internal (vnet_rewrite_header_t * rw, int max_size)
-{
-  /* Sanity check values carefully for this memset operation */
-  ASSERT ((max_size > 0) && (max_size < VLIB_BUFFER_PRE_DATA_SIZE));
-
-  rw->data_bytes = 0;
-  memset (rw->data, 0xfe, max_size);
-}
-
-always_inline void
-vnet_rewrite_set_data_internal (vnet_rewrite_header_t * rw,
-				int max_size, void *data, int data_bytes)
-{
-  /* Sanity check values carefully for this memset operation */
-  ASSERT ((max_size > 0) && (max_size < VLIB_BUFFER_PRE_DATA_SIZE));
-  ASSERT ((data_bytes >= 0) && (data_bytes < max_size));
-
-  rw->data_bytes = data_bytes;
-  clib_memcpy (rw->data + max_size - data_bytes, data, data_bytes);
-  memset (rw->data, 0xfe, max_size - data_bytes);
-}
-
-#define vnet_rewrite_set_data(rw,data,data_bytes)		\
-  vnet_rewrite_set_data_internal (&((rw).rewrite_header),	\
-				  sizeof ((rw).rewrite_data),	\
-				  (data),			\
-				  (data_bytes))
-
-always_inline void *
-vnet_rewrite_get_data_internal (vnet_rewrite_header_t * rw, int max_size)
-{
-  ASSERT (rw->data_bytes <= max_size);
-  return rw->data + max_size - rw->data_bytes;
-}
-
-#define vnet_rewrite_get_data(rw) \
-  vnet_rewrite_get_data_internal (&((rw).rewrite_header), sizeof ((rw).rewrite_data))
-
-always_inline void
-vnet_rewrite_copy_one (vnet_rewrite_data_t * p0, vnet_rewrite_data_t * rw0,
-		       int i)
-{
-  p0[-i] = rw0[-i];
-}
-
-void vnet_rewrite_copy_slow_path (vnet_rewrite_data_t * p0,
-				  vnet_rewrite_data_t * rw0,
-				  word n_left, uword most_likely_size);
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u64 a;
-  u32 b;
-  u16 c;
-}) eh_copy_t;
-/* *INDENT-ON* */
-
-always_inline void
-_vnet_rewrite_one_header (vnet_rewrite_header_t * h0,
-			  void *packet0, int max_size, int most_likely_size)
-{
-  vnet_rewrite_data_t *p0 = packet0;
-  vnet_rewrite_data_t *rw0 = (vnet_rewrite_data_t *) (h0->data + max_size);
-  word n_left0;
-
-  /* 0xfefe => poisoned adjacency => crash */
-  ASSERT (h0->data_bytes != 0xfefe);
-
-  if (PREDICT_TRUE (h0->data_bytes == sizeof (eh_copy_t)))
-    {
-      eh_copy_t *s, *d;
-      s = (eh_copy_t *) (h0->data + max_size - sizeof (eh_copy_t));
-      d = (eh_copy_t *) (((u8 *) packet0) - sizeof (eh_copy_t));
-      clib_memcpy (d, s, sizeof (eh_copy_t));
-      return;
-    }
-
-
-#define _(i)								\
-  do {									\
-    if (most_likely_size > ((i)-1)*sizeof (vnet_rewrite_data_t))	\
-      vnet_rewrite_copy_one (p0, rw0, (i));				\
-  } while (0)
-
-  _(4);
-  _(3);
-  _(2);
-  _(1);
-
-#undef _
-
-  n_left0 = (int)
-    (((int) h0->data_bytes - most_likely_size) + (sizeof (rw0[0]) - 1))
-    / (int) sizeof (rw0[0]);
-  if (PREDICT_FALSE (n_left0 > 0))
-    vnet_rewrite_copy_slow_path (p0, rw0, n_left0, most_likely_size);
-}
-
-always_inline void
-_vnet_rewrite_two_headers (vnet_rewrite_header_t * h0,
-			   vnet_rewrite_header_t * h1,
-			   void *packet0,
-			   void *packet1, int max_size, int most_likely_size)
-{
-  vnet_rewrite_data_t *p0 = packet0;
-  vnet_rewrite_data_t *p1 = packet1;
-  vnet_rewrite_data_t *rw0 = (vnet_rewrite_data_t *) (h0->data + max_size);
-  vnet_rewrite_data_t *rw1 = (vnet_rewrite_data_t *) (h1->data + max_size);
-  word n_left0, n_left1;
-  int slow_path;
-
-  /* 0xfefe => poisoned adjacency => crash */
-  ASSERT (h0->data_bytes != 0xfefe);
-  ASSERT (h1->data_bytes != 0xfefe);
-
-  /* Arithmetic calculation: bytes0 == bytes1 == 14 */
-  slow_path = h0->data_bytes ^ h1->data_bytes;
-  slow_path += h0->data_bytes ^ sizeof (eh_copy_t);
-
-  if (PREDICT_TRUE (slow_path == 0))
-    {
-      eh_copy_t *s0, *d0, *s1, *d1;
-      s0 = (eh_copy_t *) (h0->data + max_size - sizeof (eh_copy_t));
-      d0 = (eh_copy_t *) (((u8 *) packet0) - sizeof (eh_copy_t));
-      clib_memcpy (d0, s0, sizeof (eh_copy_t));
-      s1 = (eh_copy_t *) (h1->data + max_size - sizeof (eh_copy_t));
-      d1 = (eh_copy_t *) (((u8 *) packet1) - sizeof (eh_copy_t));
-      clib_memcpy (d1, s1, sizeof (eh_copy_t));
-      return;
-    }
-
-#define _(i)								\
-  do {									\
-    if (most_likely_size > ((i)-1)*sizeof (vnet_rewrite_data_t))	\
-      {									\
-	vnet_rewrite_copy_one (p0, rw0, (i));				\
-	vnet_rewrite_copy_one (p1, rw1, (i));				\
-      }									\
-  } while (0)
-
-  _(4);
-  _(3);
-  _(2);
-  _(1);
-
-#undef _
-
-  n_left0 = (int)
-    (((int) h0->data_bytes - most_likely_size) + (sizeof (rw0[0]) - 1))
-    / (int) sizeof (rw0[0]);
-  n_left1 = (int)
-    (((int) h1->data_bytes - most_likely_size) + (sizeof (rw1[0]) - 1))
-    / (int) sizeof (rw1[0]);
-
-  if (PREDICT_FALSE (n_left0 > 0 || n_left1 > 0))
-    {
-      vnet_rewrite_copy_slow_path (p0, rw0, n_left0, most_likely_size);
-      vnet_rewrite_copy_slow_path (p1, rw1, n_left1, most_likely_size);
-    }
-}
-
-#define vnet_rewrite_one_header(rw0,p0,most_likely_size)	\
-  _vnet_rewrite_one_header (&((rw0).rewrite_header), (p0),	\
-			    sizeof ((rw0).rewrite_data),	\
-			    (most_likely_size))
-
-#define vnet_rewrite_two_headers(rw0,rw1,p0,p1,most_likely_size)	\
-  _vnet_rewrite_two_headers (&((rw0).rewrite_header), &((rw1).rewrite_header), \
-			     (p0), (p1),				\
-			     sizeof ((rw0).rewrite_data),		\
-			     (most_likely_size))
-
-#define VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST ((void *) 0)
-/** Deprecated */
-void vnet_rewrite_for_sw_interface (struct vnet_main_t *vnm,
-				    vnet_link_t packet_type,
-				    u32 sw_if_index,
-				    u32 node_index,
-				    void *dst_address,
-				    vnet_rewrite_header_t * rw,
-				    u32 max_rewrite_bytes);
-
-u32 vnet_tx_node_index_for_sw_interface (struct vnet_main_t *vnm,
-					 u32 sw_if_index);
-
-void vnet_rewrite_init (struct vnet_main_t *vnm,
-			u32 sw_if_index,
-			u32 this_node,
-			u32 next_node, vnet_rewrite_header_t * rw);
-
-u8 *vnet_build_rewrite_for_sw_interface (struct vnet_main_t *vnm,
-					 u32 sw_if_index,
-					 vnet_link_t packet_type,
-					 const void *dst_address);
-void vnet_update_adjacency_for_sw_interface (struct vnet_main_t *vnm,
-					     u32 sw_if_index, u32 ai);
-
-/* Parser for unformat header & rewrite string. */
-unformat_function_t unformat_vnet_rewrite;
-
-format_function_t format_vnet_rewrite;
-format_function_t format_vnet_rewrite_header;
-
-serialize_function_t serialize_vnet_rewrite, unserialize_vnet_rewrite;
-
-#endif /* included_vnet_rewrite_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/snap/node.c b/vnet/vnet/snap/node.c
deleted file mode 100644
index 884ff324..00000000
--- a/vnet/vnet/snap/node.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * snap_node.c: snap packet processing
- *
- * Copyright (c) 2010 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/llc/llc.h>
-#include <vnet/snap/snap.h>
-
-typedef enum
-{
-  SNAP_INPUT_NEXT_DROP,
-  SNAP_INPUT_NEXT_PUNT,
-  SNAP_INPUT_NEXT_ETHERNET_TYPE,
-  SNAP_INPUT_N_NEXT,
-} snap_input_next_t;
-
-typedef struct
-{
-  u8 packet_data[32];
-} snap_input_trace_t;
-
-static u8 *
-format_snap_input_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  snap_input_trace_t *t = va_arg (*va, snap_input_trace_t *);
-
-  s = format (s, "%U", format_snap_header, t->packet_data);
-
-  return s;
-}
-
-static uword
-snap_input (vlib_main_t * vm,
-	    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  snap_main_t *sm = &snap_main;
-  u32 n_left_from, next_index, *from, *to_next;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node,
-				   from,
-				   n_left_from,
-				   sizeof (from[0]),
-				   sizeof (snap_input_trace_t));
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  snap_header_t *h0, *h1;
-	  snap_protocol_info_t *pi0, *pi1;
-	  u8 next0, next1, is_ethernet0, is_ethernet1, len0, len1,
-	    enqueue_code;
-	  u32 oui0, oui1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *b2, *b3;
-
-	    b2 = vlib_get_buffer (vm, from[2]);
-	    b3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (b2, LOAD);
-	    vlib_prefetch_buffer_header (b3, LOAD);
-
-	    CLIB_PREFETCH (b2->data, sizeof (h0[0]), LOAD);
-	    CLIB_PREFETCH (b3->data, sizeof (h1[0]), LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  h0 = (void *) (b0->data + b0->current_data);
-	  h1 = (void *) (b1->data + b1->current_data);
-
-	  oui0 = snap_header_get_oui (h0);
-	  oui1 = snap_header_get_oui (h1);
-
-	  is_ethernet0 = oui0 == IEEE_OUI_ethernet;
-	  is_ethernet1 = oui1 == IEEE_OUI_ethernet;
-
-	  len0 = sizeof (h0[0]) - (is_ethernet0 ? sizeof (h0->protocol) : 0);
-	  len1 = sizeof (h1[0]) - (is_ethernet1 ? sizeof (h1->protocol) : 0);
-
-	  b0->current_data += len0;
-	  b1->current_data += len1;
-
-	  b0->current_length -= len0;
-	  b1->current_length -= len1;
-
-	  pi0 = snap_get_protocol_info (sm, h0);
-	  pi1 = snap_get_protocol_info (sm, h1);
-
-	  next0 = pi0 ? pi0->next_index : SNAP_INPUT_NEXT_DROP;
-	  next1 = pi1 ? pi1->next_index : SNAP_INPUT_NEXT_DROP;
-
-	  next0 = is_ethernet0 ? SNAP_INPUT_NEXT_ETHERNET_TYPE : next0;
-	  next1 = is_ethernet1 ? SNAP_INPUT_NEXT_ETHERNET_TYPE : next1;
-
-	  /* In case of error. */
-	  b0->error = node->errors[SNAP_ERROR_UNKNOWN_PROTOCOL];
-	  b1->error = node->errors[SNAP_ERROR_UNKNOWN_PROTOCOL];
-
-	  enqueue_code = (next0 != next_index) + 2 * (next1 != next_index);
-
-	  if (PREDICT_FALSE (enqueue_code != 0))
-	    {
-	      switch (enqueue_code)
-		{
-		case 1:
-		  /* A B A */
-		  to_next[-2] = bi1;
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node, next0, bi0);
-		  break;
-
-		case 2:
-		  /* A A B */
-		  to_next -= 1;
-		  n_left_to_next += 1;
-		  vlib_set_next_frame_buffer (vm, node, next1, bi1);
-		  break;
-
-		case 3:
-		  /* A B B or A B C */
-		  to_next -= 2;
-		  n_left_to_next += 2;
-		  vlib_set_next_frame_buffer (vm, node, next0, bi0);
-		  vlib_set_next_frame_buffer (vm, node, next1, bi1);
-		  if (next0 == next1)
-		    {
-		      vlib_put_next_frame (vm, node, next_index,
-					   n_left_to_next);
-		      next_index = next1;
-		      vlib_get_next_frame (vm, node, next_index, to_next,
-					   n_left_to_next);
-		    }
-		}
-	    }
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  snap_header_t *h0;
-	  snap_protocol_info_t *pi0;
-	  u8 next0, is_ethernet0, len0;
-	  u32 oui0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  h0 = (void *) (b0->data + b0->current_data);
-
-	  oui0 = snap_header_get_oui (h0);
-
-	  is_ethernet0 = oui0 == IEEE_OUI_ethernet;
-
-	  len0 = sizeof (h0[0]) - (is_ethernet0 ? sizeof (h0->protocol) : 0);
-
-	  b0->current_data += len0;
-
-	  b0->current_length -= len0;
-
-	  pi0 = snap_get_protocol_info (sm, h0);
-
-	  next0 = pi0 ? pi0->next_index : SNAP_INPUT_NEXT_DROP;
-
-	  next0 = is_ethernet0 ? SNAP_INPUT_NEXT_ETHERNET_TYPE : next0;
-
-	  /* In case of error. */
-	  b0->error = node->errors[SNAP_ERROR_UNKNOWN_PROTOCOL];
-
-	  /* Sent packet to wrong next? */
-	  if (PREDICT_FALSE (next0 != next_index))
-	    {
-	      /* Return old frame; remove incorrectly enqueued packet. */
-	      vlib_put_next_frame (vm, node, next_index, n_left_to_next + 1);
-
-	      /* Send to correct next. */
-	      next_index = next0;
-	      vlib_get_next_frame (vm, node, next_index,
-				   to_next, n_left_to_next);
-
-	      to_next[0] = bi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-	    }
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-static char *snap_error_strings[] = {
-#define _(f,s) s,
-  foreach_snap_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (snap_input_node) = {
-  .function = snap_input,
-  .name = "snap-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .n_errors = SNAP_N_ERROR,
-  .error_strings = snap_error_strings,
-
-  .n_next_nodes = SNAP_INPUT_N_NEXT,
-  .next_nodes = {
-    [SNAP_INPUT_NEXT_DROP] = "error-drop",
-    [SNAP_INPUT_NEXT_PUNT] = "error-punt",
-    [SNAP_INPUT_NEXT_ETHERNET_TYPE] = "ethernet-input-type",
-  },
-
-  .format_buffer = format_snap_header_with_length,
-  .format_trace = format_snap_input_trace,
-  .unformat_buffer = unformat_snap_header,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-snap_input_init (vlib_main_t * vm)
-{
-  {
-    clib_error_t *error = vlib_call_init_function (vm, snap_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  snap_setup_node (vm, snap_input_node.index);
-
-  llc_register_input_protocol (vm, LLC_PROTOCOL_snap, snap_input_node.index);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (snap_input_init);
-
-void
-snap_register_input_protocol (vlib_main_t * vm,
-			      char *name,
-			      u32 ieee_oui, u16 protocol, u32 node_index)
-{
-  snap_main_t *sm = &snap_main;
-  snap_protocol_info_t *pi;
-  snap_header_t h;
-  snap_oui_and_protocol_t key;
-
-  {
-    clib_error_t *error = vlib_call_init_function (vm, snap_input_init);
-    if (error)
-      clib_error_report (error);
-  }
-
-  h.protocol = clib_host_to_net_u16 (protocol);
-  h.oui[0] = (ieee_oui >> 16) & 0xff;
-  h.oui[1] = (ieee_oui >> 8) & 0xff;
-  h.oui[2] = (ieee_oui >> 0) & 0xff;
-  pi = snap_get_protocol_info (sm, &h);
-  if (pi)
-    return;
-
-  vec_add2 (sm->protocols, pi, 1);
-
-  pi->name = format (0, "%s", name);
-  pi->node_index = node_index;
-  pi->next_index = vlib_node_add_next (vm, snap_input_node.index, node_index);
-
-  key.oui = ieee_oui;
-  key.protocol = clib_host_to_net_u16 (protocol);
-
-  mhash_set (&sm->protocol_hash, &key, pi - sm->protocols, /* old_value */ 0);
-  hash_set_mem (sm->protocol_info_by_name, name, pi - sm->protocols);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/snap/pg.c b/vnet/vnet/snap/pg.c
deleted file mode 100644
index aad125f3..00000000
--- a/vnet/vnet/snap/pg.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * snap_pg.c: packet generator snap interface
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/snap/snap.h>
-
-typedef struct
-{
-  pg_edit_t oui;
-  pg_edit_t protocol;
-} pg_snap_header_t;
-
-static inline void
-pg_snap_header_init (pg_snap_header_t * e)
-{
-  pg_edit_init (&e->oui, snap_header_t, oui);
-  pg_edit_init (&e->protocol, snap_header_t, protocol);
-}
-
-uword
-unformat_pg_snap_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t *s = va_arg (*args, pg_stream_t *);
-  pg_snap_header_t *h;
-  u32 group_index, error;
-
-  h = pg_create_edit_group (s, sizeof (h[0]), sizeof (snap_header_t),
-			    &group_index);
-  pg_snap_header_init (h);
-
-  error = 1;
-  if (!unformat (input, "%U -> %U",
-		 unformat_pg_edit,
-		 unformat_snap_protocol, &h->oui, &h->protocol))
-    goto done;
-
-  {
-    snap_main_t *pm = &snap_main;
-    snap_protocol_info_t *pi = 0;
-    pg_node_t *pg_node = 0;
-
-    if (h->oui.type == PG_EDIT_FIXED && h->protocol.type == PG_EDIT_FIXED)
-      {
-	u8 *o = h->oui.values[PG_EDIT_LO];
-	u8 *p = h->protocol.values[PG_EDIT_LO];
-	snap_header_t h;
-
-	h.oui[0] = o[0];
-	h.oui[1] = o[1];
-	h.oui[2] = o[2];
-	h.protocol = *(u16 *) p;
-	pi = snap_get_protocol_info (pm, &h);
-	if (pi && pi->node_index != ~0)
-	  pg_node = pg_get_node (pi->node_index);
-      }
-
-    if (pg_node && pg_node->unformat_edit
-	&& unformat_user (input, pg_node->unformat_edit, s))
-      ;
-
-    else if (!unformat_user (input, unformat_pg_payload, s))
-      goto done;
-  }
-
-  error = 0;
-done:
-  if (error)
-    pg_free_edit_group (s);
-  return error == 0;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/snap/snap.c b/vnet/vnet/snap/snap.c
deleted file mode 100644
index 64482bfc..00000000
--- a/vnet/vnet/snap/snap.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * snap.c: snap support
- *
- * Copyright (c) 2010 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/snap/snap.h>
-#include <vnet/ethernet/ethernet.h>
-
-/* Global main structure. */
-snap_main_t snap_main;
-
-static u8 *
-format_cisco_snap_protocol (u8 * s, va_list * args)
-{
-  snap_header_t *h = va_arg (*args, snap_header_t *);
-  u16 protocol = clib_net_to_host_u16 (h->protocol);
-  char *t = 0;
-  switch (protocol)
-    {
-#define _(n,f) case n: t = #f; break;
-      foreach_snap_cisco_protocol;
-#undef _
-    default:
-      break;
-    }
-  if (t)
-    return format (s, "%s", t);
-  else
-    return format (s, "unknown 0x%x", protocol);
-}
-
-u8 *
-format_snap_protocol (u8 * s, va_list * args)
-{
-  snap_header_t *h = va_arg (*args, snap_header_t *);
-  u32 oui = snap_header_get_oui (h);
-  u16 protocol = clib_net_to_host_u16 (h->protocol);
-
-  switch (oui)
-    {
-    case IEEE_OUI_ethernet:
-      return format (s, "ethernet %U", format_ethernet_type, h->protocol);
-
-    case IEEE_OUI_cisco:
-      return format (s, "cisco %U", format_cisco_snap_protocol, h);
-
-    default:
-      return format (s, "oui 0x%06x 0x%04x", oui, protocol);
-    }
-}
-
-u8 *
-format_snap_header_with_length (u8 * s, va_list * args)
-{
-  snap_main_t *sm = &snap_main;
-  snap_header_t *h = va_arg (*args, snap_header_t *);
-  snap_protocol_info_t *pi = snap_get_protocol_info (sm, h);
-  u32 max_header_bytes = va_arg (*args, u32);
-  uword indent, header_bytes;
-
-  header_bytes = sizeof (h[0]);
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    return format (s, "snap header truncated");
-
-  indent = format_get_indent (s);
-
-  s = format (s, "SNAP %U", format_snap_protocol, h);
-
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes && pi != 0)
-    {
-      vlib_node_t *node = vlib_get_node (sm->vlib_main, pi->node_index);
-      if (node->format_buffer)
-	s = format (s, "\n%U%U",
-		    format_white_space, indent,
-		    node->format_buffer, (void *) (h + 1),
-		    max_header_bytes - header_bytes);
-    }
-
-  return s;
-}
-
-u8 *
-format_snap_header (u8 * s, va_list * args)
-{
-  snap_header_t *h = va_arg (*args, snap_header_t *);
-  return format (s, "%U", format_snap_header_with_length, h, 0);
-}
-
-/* Returns snap protocol as an int in host byte order. */
-uword
-unformat_snap_protocol (unformat_input_t * input, va_list * args)
-{
-  snap_header_t *result = va_arg (*args, snap_header_t *);
-  snap_main_t *sm = &snap_main;
-  snap_oui_and_protocol_t p;
-  u32 i;
-
-  /* Numeric type. */
-  if (unformat (input, "0x%x 0x%x", &p.oui, &p.protocol))
-    {
-      if (p.oui >= (1 << 24))
-	return 0;
-      if (p.protocol >= (1 << 16))
-	return 0;
-    }
-
-  /* Named type. */
-  else if (unformat_user (input, unformat_vlib_number_by_name,
-			  sm->protocol_info_by_name, &i))
-    {
-      snap_protocol_info_t *pi = vec_elt_at_index (sm->protocols, i);
-      p = pi->oui_and_protocol;
-    }
-
-  else
-    return 0;
-
-  snap_header_set_protocol (result, &p);
-  return 1;
-}
-
-uword
-unformat_snap_header (unformat_input_t * input, va_list * args)
-{
-  u8 **result = va_arg (*args, u8 **);
-  snap_header_t _h, *h = &_h;
-
-  if (!unformat (input, "%U", unformat_snap_protocol, h))
-    return 0;
-
-  /* Add header to result. */
-  {
-    void *p;
-    u32 n_bytes = sizeof (h[0]);
-
-    vec_add2 (*result, p, n_bytes);
-    clib_memcpy (p, h, n_bytes);
-  }
-
-  return 1;
-}
-
-static clib_error_t *
-snap_init (vlib_main_t * vm)
-{
-  snap_main_t *sm = &snap_main;
-
-  memset (sm, 0, sizeof (sm[0]));
-  sm->vlib_main = vm;
-
-  mhash_init (&sm->protocol_hash, sizeof (uword),
-	      sizeof (snap_oui_and_protocol_t));
-
-  sm->protocol_info_by_name
-    = hash_create_string ( /* elts */ 0, sizeof (uword));
-
-  return vlib_call_init_function (vm, snap_input_init);
-}
-
-VLIB_INIT_FUNCTION (snap_init);
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/snap/snap.h b/vnet/vnet/snap/snap.h
deleted file mode 100644
index dbba15bf..00000000
--- a/vnet/vnet/snap/snap.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * snap.h: SNAP definitions
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_snap_h
-#define included_snap_h
-
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-
-#define foreach_ieee_oui			\
-  _ (0x000000, ethernet)			\
-  _ (0x00000c, cisco)
-
-typedef enum
-{
-#define _(n,f) IEEE_OUI_##f = n,
-  foreach_ieee_oui
-#undef _
-} ieee_oui_t;
-
-#define foreach_snap_cisco_protocol		\
-  _ (0x0102, drip)				\
-  _ (0x0104, port_aggregation_protocol)		\
-  _ (0x0105, mls_hello)				\
-  _ (0x010b, per_vlan_spanning_tree)		\
-  _ (0x010c, vlan_bridge)			\
-  _ (0x0111, unidirectional_link_detection)	\
-  _ (0x2000, cdp)				\
-  _ (0x2001, cgmp)				\
-  _ (0x2003, vtp)				\
-  _ (0x2004, dtp)				\
-  _ (0x200a, stp_uplink_fast)
-
-typedef enum
-{
-#define _(n,f) SNAP_cisco_##f = n,
-  foreach_snap_cisco_protocol
-#undef _
-} snap_cisco_protocol_t;
-
-typedef union
-{
-  /* *INDENT-OFF* */
-  CLIB_PACKED (struct {
-    /* OUI: organization unique identifier. */
-    u8 oui[3];
-
-    /* Per-OUI protocol. */
-    u16 protocol;
-  });
-  /* *INDENT-ON* */
-
-  u8 as_u8[5];
-} snap_header_t;
-
-typedef struct
-{
-  u32 oui;
-  u32 protocol;
-} snap_oui_and_protocol_t;
-
-typedef struct
-{
-  /* Name vector string. */
-  u8 *name;
-
-  snap_oui_and_protocol_t oui_and_protocol;
-
-  /* Node which handles this type. */
-  u32 node_index;
-
-  /* snap-input next index for this type. */
-  u32 next_index;
-} snap_protocol_info_t;
-
-always_inline void
-snap_header_set_protocol (snap_header_t * h, snap_oui_and_protocol_t * p)
-{
-  u16 protocol = p->protocol;
-  u32 oui = p->oui;
-  h->protocol = clib_host_to_net_u16 (protocol);
-  h->oui[0] = (oui >> 16) & 0xff;
-  h->oui[1] = (oui >> 8) & 0xff;
-  h->oui[2] = (oui >> 0) & 0xff;
-}
-
-#define foreach_snap_error			\
-  _ (NONE, "no error")				\
-  _ (UNKNOWN_PROTOCOL, "unknown oui/snap protocol")
-
-typedef enum
-{
-#define _(f,s) SNAP_ERROR_##f,
-  foreach_snap_error
-#undef _
-    SNAP_N_ERROR,
-} snap_error_t;
-
-typedef struct
-{
-  vlib_main_t *vlib_main;
-
-  /* Vector of known SNAP oui/protocol pairs. */
-  snap_protocol_info_t *protocols;
-
-  /* Hash table mapping oui/protocol to protocol index. */
-  mhash_t protocol_hash;
-
-  /* Hash table mapping protocol by name. */
-  uword *protocol_info_by_name;
-} snap_main_t;
-
-always_inline u32
-snap_header_get_oui (snap_header_t * h)
-{
-  return (h->oui[0] << 16) | (h->oui[1] << 8) | h->oui[2];
-}
-
-always_inline snap_protocol_info_t *
-snap_get_protocol_info (snap_main_t * sm, snap_header_t * h)
-{
-  snap_oui_and_protocol_t key;
-  uword *p;
-
-  key.oui = snap_header_get_oui (h);
-  key.protocol = h->protocol;
-
-  p = mhash_get (&sm->protocol_hash, &key);
-  return p ? vec_elt_at_index (sm->protocols, p[0]) : 0;
-}
-
-snap_main_t snap_main;
-
-/* Register given node index to take input for given snap type. */
-void
-snap_register_input_protocol (vlib_main_t * vm,
-			      char *name,
-			      u32 ieee_oui, u16 protocol, u32 node_index);
-
-void snap_set_adjacency (vnet_rewrite_header_t * rw,
-			 uword max_data_bytes, u32 ieee_oui, u16 protocol);
-
-format_function_t format_snap_protocol;
-format_function_t format_snap_header;
-format_function_t format_snap_header_with_length;
-
-/* Parse snap protocol as 0xXXXX or protocol name. */
-unformat_function_t unformat_snap_protocol;
-
-/* Parse snap header. */
-unformat_function_t unformat_snap_header;
-unformat_function_t unformat_pg_snap_header;
-
-always_inline void
-snap_setup_node (vlib_main_t * vm, u32 node_index)
-{
-  vlib_node_t *n = vlib_get_node (vm, node_index);
-  pg_node_t *pn = pg_get_node (node_index);
-
-  n->format_buffer = format_snap_header_with_length;
-  n->unformat_buffer = unformat_snap_header;
-  pn->unformat_edit = unformat_pg_snap_header;
-}
-
-#endif /* included_snap_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/span/node.c b/vnet/vnet/span/node.c
deleted file mode 100644
index 50d642c2..00000000
--- a/vnet/vnet/span/node.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vppinfra/error.h>
-
-#include <vnet/span/span.h>
-
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-
-vlib_node_registration_t span_node;
-
-/* packet trace format function */
-u8 *
-format_span_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  span_trace_t *t = va_arg (*args, span_trace_t *);
-
-  vnet_main_t *vnm = &vnet_main;
-  s = format (s, "SPAN: mirrored %U -> %U",
-	      format_vnet_sw_if_index_name, vnm, t->src_sw_if_index,
-	      format_vnet_sw_if_index_name, vnm, t->mirror_sw_if_index);
-
-  return s;
-}
-
-#define foreach_span_error                      \
-_(HITS, "SPAN incomming packets processed")
-
-typedef enum
-{
-#define _(sym,str) SPAN_ERROR_##sym,
-  foreach_span_error
-#undef _
-    SPAN_N_ERROR,
-} span_error_t;
-
-static char *span_error_strings[] = {
-#define _(sym,string) string,
-  foreach_span_error
-#undef _
-};
-
-static_always_inline void
-span_mirror (vlib_main_t * vm, span_interface_t * si0, vlib_buffer_t * b0,
-	     vlib_frame_t ** mirror_frames, int is_rx)
-{
-  vlib_buffer_t *c0;
-  vnet_main_t *vnm = &vnet_main;
-  u32 *to_mirror_next = 0;
-  u32 i;
-
-  if (is_rx != 0 && si0->num_rx_mirror_ports == 0)
-    return;
-
-  if (is_rx == 0 && si0->num_tx_mirror_ports == 0)
-    return;
-
-  /* Don't do it again */
-  if (PREDICT_FALSE (b0->flags & VNET_BUFFER_SPAN_CLONE))
-    return;
-
-  /* *INDENT-OFF* */
-  clib_bitmap_foreach (i, is_rx ? si0->rx_mirror_ports : si0->tx_mirror_ports, (
-    {
-      if (mirror_frames[i] == 0)
-	mirror_frames[i] = vnet_get_frame_to_sw_interface (vnm, i);
-      to_mirror_next = vlib_frame_vector_args (mirror_frames[i]);
-      to_mirror_next += mirror_frames[i]->n_vectors;
-      c0 = vlib_buffer_copy (vm, b0);
-      vnet_buffer (c0)->sw_if_index[VLIB_TX] = i;
-      c0->flags |= VNET_BUFFER_SPAN_CLONE;
-      to_mirror_next[0] = vlib_get_buffer_index (vm, c0);
-      mirror_frames[i]->n_vectors++;
-    }));
-  /* *INDENT-ON* */
-}
-
-static_always_inline uword
-span_node_inline_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-		     vlib_frame_t * frame, int is_rx)
-{
-  span_main_t *sm = &span_main;
-  vnet_main_t *vnm = &vnet_main;
-  u32 n_left_from, *from, *to_next;
-  u32 n_span_packets = 0;
-  u32 next_index;
-  u32 sw_if_index;
-  static __thread vlib_frame_t **mirror_frames = 0;
-  vlib_rx_or_tx_t rxtx = is_rx ? VLIB_RX : VLIB_TX;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  vec_validate_aligned (mirror_frames, sm->max_sw_if_index,
-			CLIB_CACHE_LINE_BYTES);
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0;
-	  u32 bi1;
-	  vlib_buffer_t *b0;
-	  vlib_buffer_t *b1;
-	  span_interface_t *si0, *si1;
-	  u32 sw_if_index0;
-	  u32 next0 = 0;
-	  u32 sw_if_index1;
-	  u32 next1 = 0;
-
-	  /* speculatively enqueue b0, b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  from += 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[rxtx];
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[rxtx];
-	  si0 = vec_elt_at_index (sm->interfaces, sw_if_index0);
-	  si1 = vec_elt_at_index (sm->interfaces, sw_if_index1);
-
-	  span_mirror (vm, si0, b0, mirror_frames, is_rx);
-	  span_mirror (vm, si1, b1, mirror_frames, is_rx);
-
-	  vnet_feature_next (sw_if_index0, &next0, b0);
-	  vnet_feature_next (sw_if_index1, &next1, b1);
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      span_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->src_sw_if_index = sw_if_index0;
-	      //t->mirror_sw_if_index = si0->mirror_sw_if_index;
-	    }
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      span_trace_t *t = vlib_add_trace (vm, node, b1, sizeof (*t));
-	      t->src_sw_if_index = sw_if_index1;
-	      //t->mirror_sw_if_index = si1->mirror_sw_if_index;
-	    }
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  span_interface_t *si0;
-	  u32 sw_if_index0;
-	  u32 next0 = 0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  from += 1;
-	  n_left_from -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[rxtx];
-	  si0 = vec_elt_at_index (sm->interfaces, sw_if_index0);
-	  span_mirror (vm, si0, b0, mirror_frames, is_rx);
-
-	  vnet_feature_next (sw_if_index0, &next0, b0);
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      span_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->src_sw_if_index = sw_if_index0;
-	    }
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-
-  for (sw_if_index = 0; sw_if_index < vec_len (mirror_frames); sw_if_index++)
-    {
-      if (mirror_frames[sw_if_index] == 0)
-	continue;
-
-      vnet_put_frame_to_sw_interface (vnm, sw_if_index,
-				      mirror_frames[sw_if_index]);
-      mirror_frames[sw_if_index] = 0;
-    }
-  vlib_node_increment_counter (vm, span_node.index, SPAN_ERROR_HITS,
-			       n_span_packets);
-
-  return frame->n_vectors;
-}
-
-static uword
-span_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-		    vlib_frame_t * frame)
-{
-  return span_node_inline_fn (vm, node, frame, 1);
-}
-
-static uword
-span_output_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-		     vlib_frame_t * frame)
-{
-  return span_node_inline_fn (vm, node, frame, 0);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (span_input_node) = {
-  .function = span_input_node_fn,
-  .name = "span-input",
-  .vector_size = sizeof (u32),
-  .format_trace = format_span_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(span_error_strings),
-  .error_strings = span_error_strings,
-
-  .n_next_nodes = 0,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (span_input_node, span_input_node_fn)
-
-VLIB_REGISTER_NODE (span_output_node) = {
-  .function = span_output_node_fn,
-  .name = "span-output",
-  .vector_size = sizeof (u32),
-  .format_trace = format_span_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(span_error_strings),
-  .error_strings = span_error_strings,
-
-  .n_next_nodes = 0,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (span_output_node, span_output_node_fn)
-
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/span/span.api b/vnet/vnet/span/span.api
deleted file mode 100644
index 4babdd83..00000000
--- a/vnet/vnet/span/span.api
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Hey Emacs use -*- mode: C -*- */
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
- /** \brief Enable/Disable span to mirror traffic from one interface to another
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context which was passed in the request
-    @param sw_if_index_from - interface to be mirorred
-    @param sw_if_index_to - interface where the traffic is mirrored
-    @param state - 0 = disabled, 1 = rx enabled, 2 = tx enabled, 3 tx & rx enabled
-*/
-define sw_interface_span_enable_disable {
-    u32 client_index;
-    u32 context;
-    u32 sw_if_index_from;
-    u32 sw_if_index_to;
-    u8  state;
-};
-
-/** \brief Reply to SPAN enable/disable request
-    @param context - sender context which was passed in the request
-*/
-define sw_interface_span_enable_disable_reply {
-    u32 context;
-    i32 retval;
-};
-
-/** \brief SPAN dump request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define sw_interface_span_dump {
-    u32 client_index;
-    u32 context;
-};
-
-/** \brief Reply to SPAN dump request
-    @param context - sender context which was passed in the request
-    @param sw_if_index_from - mirorred interface
-    @param sw_if_index_to - interface where the traffic is mirrored
-    @param state - 0 = disabled, 1 = rx enabled, 2 = tx enabled, 3 tx & rx enabled
-*/
-define sw_interface_span_details {
-    u32 context;
-    u32 sw_if_index_from;
-    u32 sw_if_index_to;
-    u8 state;
-};
diff --git a/vnet/vnet/span/span.c b/vnet/vnet/span/span.c
deleted file mode 100644
index 7b5816c7..00000000
--- a/vnet/vnet/span/span.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vppinfra/error.h>
-#include <vnet/feature/feature.h>
-
-#include <vnet/span/span.h>
-
-int
-span_add_delete_entry (vlib_main_t * vm,
-		       u32 src_sw_if_index, u32 dst_sw_if_index, u8 state)
-{
-  span_main_t *sm = &span_main;
-  span_interface_t *si;
-  u32 new_num_rx_mirror_ports, new_num_tx_mirror_ports;
-
-  if (state > 3)
-    return VNET_API_ERROR_UNIMPLEMENTED;
-
-  if ((src_sw_if_index == ~0) || (dst_sw_if_index == ~0 && state > 0)
-      || (src_sw_if_index == dst_sw_if_index))
-    return VNET_API_ERROR_INVALID_INTERFACE;
-
-  vnet_sw_interface_t *sw_if;
-
-  sw_if = vnet_get_sw_interface (vnet_get_main (), src_sw_if_index);
-  if (sw_if->type == VNET_SW_INTERFACE_TYPE_SUB)
-    return VNET_API_ERROR_UNIMPLEMENTED;
-
-  vec_validate_aligned (sm->interfaces, src_sw_if_index,
-			CLIB_CACHE_LINE_BYTES);
-  si = vec_elt_at_index (sm->interfaces, src_sw_if_index);
-
-  si->rx_mirror_ports = clib_bitmap_set (si->rx_mirror_ports, dst_sw_if_index,
-					 (state & 1) != 0);
-  si->tx_mirror_ports = clib_bitmap_set (si->tx_mirror_ports, dst_sw_if_index,
-					 (state & 2) != 0);
-
-  new_num_rx_mirror_ports = clib_bitmap_count_set_bits (si->rx_mirror_ports);
-  new_num_tx_mirror_ports = clib_bitmap_count_set_bits (si->tx_mirror_ports);
-
-  if (new_num_rx_mirror_ports == 1 && si->num_rx_mirror_ports == 0)
-    vnet_feature_enable_disable ("device-input", "span-input",
-				 src_sw_if_index, 1, 0, 0);
-
-  if (new_num_rx_mirror_ports == 0 && si->num_rx_mirror_ports == 1)
-    vnet_feature_enable_disable ("device-input", "span-input",
-				 src_sw_if_index, 0, 0, 0);
-
-  if (new_num_rx_mirror_ports == 1 && si->num_rx_mirror_ports == 0)
-    vnet_feature_enable_disable ("device-input", "span-output",
-				 src_sw_if_index, 1, 0, 0);
-
-  if (new_num_rx_mirror_ports == 0 && si->num_rx_mirror_ports == 1)
-    vnet_feature_enable_disable ("device-input", "span-output",
-				 src_sw_if_index, 0, 0, 0);
-
-  si->num_rx_mirror_ports = new_num_rx_mirror_ports;
-  si->num_tx_mirror_ports = new_num_tx_mirror_ports;
-
-  if (dst_sw_if_index > sm->max_sw_if_index)
-    sm->max_sw_if_index = dst_sw_if_index;
-
-  return 0;
-}
-
-static clib_error_t *
-set_interface_span_command_fn (vlib_main_t * vm,
-			       unformat_input_t * input,
-			       vlib_cli_command_t * cmd)
-{
-  span_main_t *sm = &span_main;
-  u32 src_sw_if_index = ~0;
-  u32 dst_sw_if_index = ~0;
-  u8 state = 3;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%U", unformat_vnet_sw_interface,
-		    sm->vnet_main, &src_sw_if_index))
-	;
-      else if (unformat (input, "destination %U", unformat_vnet_sw_interface,
-			 sm->vnet_main, &dst_sw_if_index))
-	;
-      else if (unformat (input, "disable"))
-	state = 0;
-      else if (unformat (input, "rx"))
-	state = 1;
-      else if (unformat (input, "tx"))
-	state = 2;
-      else if (unformat (input, "both"))
-	state = 3;
-      else
-	break;
-    }
-
-  int rv =
-    span_add_delete_entry (vm, src_sw_if_index, dst_sw_if_index, state);
-  if (rv == VNET_API_ERROR_INVALID_INTERFACE)
-    return clib_error_return (0, "Invalid interface");
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_span_command, static) = {
-  .path = "set interface span",
-  .short_help = "set interface span <if-name> [disable | destination <if-name> [both|rx|tx]]",
-  .function = set_interface_span_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-show_interfaces_span_command_fn (vlib_main_t * vm,
-				 unformat_input_t * input,
-				 vlib_cli_command_t * cmd)
-{
-  span_main_t *sm = &span_main;
-  span_interface_t *si;
-  vnet_main_t *vnm = &vnet_main;
-  u8 header = 1;
-  char *states[] = { "none", "rx", "tx", "both" };
-  u8 *s = 0;
-
-  /* *INDENT-OFF* */
-  vec_foreach (si, sm->interfaces)
-    if (si->num_rx_mirror_ports || si->num_tx_mirror_ports)
-      {
-	clib_bitmap_t *b;
-	u32 i;
-	b = clib_bitmap_dup_or (si->rx_mirror_ports, si->tx_mirror_ports);
-	if (header)
-	  {
-	    vlib_cli_output (vm, "%-40s %s", "Source interface",
-			     "Mirror interface (direction)");
-	    header = 0;
-	  }
-	s = format (s, "%U", format_vnet_sw_if_index_name, vnm,
-		    si - sm->interfaces);
-	clib_bitmap_foreach (i, b, (
-	  {
-	    int state;
-	    state = (clib_bitmap_get (si->rx_mirror_ports, i) +
-		     clib_bitmap_get (si->tx_mirror_ports, i) * 2);
-
-	    vlib_cli_output (vm, "%-40v %U (%s)", s,
-			     format_vnet_sw_if_index_name, vnm, i,
-			     states[state]);
-	    vec_reset_length (s);
-	  }));
-	clib_bitmap_free (b);
-      }
-  /* *INDENT-ON* */
-  vec_free (s);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_interfaces_span_command, static) = {
-  .path = "show interfaces span",
-  .short_help = "Shows SPAN mirror table",
-  .function = show_interfaces_span_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-span_init (vlib_main_t * vm)
-{
-  span_main_t *sm = &span_main;
-
-  sm->vlib_main = vm;
-  sm->vnet_main = vnet_get_main ();
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (span_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/span/span.h b/vnet/vnet/span/span.h
deleted file mode 100644
index a98b010b..00000000
--- a/vnet/vnet/span/span.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __span_h__
-#define __span_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-
-typedef struct
-{
-  clib_bitmap_t *rx_mirror_ports;
-  clib_bitmap_t *tx_mirror_ports;
-  u32 num_rx_mirror_ports;
-  u32 num_tx_mirror_ports;
-} span_interface_t;
-
-typedef struct
-{
-  /* per-interface vector of span instances */
-  span_interface_t *interfaces;
-
-  /* biggest sw_if_index used so far */
-  u32 max_sw_if_index;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} span_main_t;
-
-span_main_t span_main;
-
-typedef struct
-{
-  u32 src_sw_if_index;		/* mirrored interface index */
-  u32 mirror_sw_if_index;	/* output interface index */
-} span_trace_t;
-
-#endif /* __span_h__ */
-
-int
-span_add_delete_entry (vlib_main_t * vm, u32 src_sw_if_index,
-		       u32 dst_sw_if_index, u8 is_add);
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/span/span.md b/vnet/vnet/span/span.md
deleted file mode 100644
index ee3f814f..00000000
--- a/vnet/vnet/span/span.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# VPP SPAN implementation
-
-This is a memo intended to contain documentation of the VPP SPAN implementation.
-Everything that is not directly obvious should come here.
-
-
-## Switched Port Analyzer (SPAN)
-Port mirroring is used on a network switch to send a copy of network packets seen on one switch port to a network monitoring connection on another switch port.
-Can be used by network engineers or administrators to measure performnce, analyze and debug data or diagnose errors on a network.
-
-### RX traffic node
-There is one static node to mirror incomming packets.
-* span-input: Creates a copy of incomming buffer due to incomming buffers can be reused internally.
-
-Chaining: dpdk-input -> span-input ->
-* original buffer is sent to ethernet-input for processing
-* buffer copy is sent to interface-output
-
-### Configuration
-SPAN supports the following CLI configuration commands:
-
-#### Enable/Disable SPAN (CLI)
-	set interface span <if-name> [disable | destination <if-name>]
-
-<if-name>: mirrored interface name
-destination <if-name>: monitoring interface name
-disable: delete mirroring
-
-#### Enable/Disabl SPAN (API)
-SPAN supports the following API configuration command:
-	sw_interface_span_enable_disable src GigabitEthernet0/8/0 dst GigabitEthernet0/9/0
-	sw_interface_span_enable_disable src_sw_if_index 1 dst_sw_if_index 2
-
-src/src_sw_if_index: mirrored interface name
-dst/dst_sw_if_index: monitoring interface name
-
-#### Remove SPAN entry (API)
-SPAN supports the following API configuration command:
-	sw_interface_span_enable_disable src_sw_if_index 1 dst_sw_if_index 2 disable
-
-src_sw_if_index: mirrored interface name
-dst_sw_if_index: monitoring interface name
-
-### Configuration example
-
-Mirror all packets on interface GigabitEthernet0/10/0 to interface GigabitEthernet0/11/0.
-
-Configure IPv4 addresses on mirrored interface:
-set interface ip address GigabitEthernet0/10/0 192.168.1.13/24
-set interface state GigabitEthernet0/10/0 up
-
-Configure IPv4 addresses on monitoring interface:
-set interface ip address GigabitEthernet0/11/0 192.168.2.13/24
-set interface state GigabitEthernet0/11/0 up
-
-Configure SPAN
-set span src GigabitEthernet0/10/0 dst GigabitEthernet0/11/0
-
-### Operational data
-
-Active SPAN mirroring CLI show command:
-    show interfaces span
-
-Active SPAN mirroring API dump command:
-    sw_interface_span_dump
diff --git a/vnet/vnet/span/span_api.c b/vnet/vnet/span/span_api.c
deleted file mode 100644
index b4565663..00000000
--- a/vnet/vnet/span/span_api.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *------------------------------------------------------------------
- * span_api.c - span mirroring api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/span/span.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                             \
-_(SW_INTERFACE_SPAN_ENABLE_DISABLE, sw_interface_span_enable_disable)   \
-_(SW_INTERFACE_SPAN_DUMP, sw_interface_span_dump)                       \
-
-static void
-  vl_api_sw_interface_span_enable_disable_t_handler
-  (vl_api_sw_interface_span_enable_disable_t * mp)
-{
-  vl_api_sw_interface_span_enable_disable_reply_t *rmp;
-  int rv;
-
-  vlib_main_t *vm = vlib_get_main ();
-
-  rv = span_add_delete_entry (vm, ntohl (mp->sw_if_index_from),
-			      ntohl (mp->sw_if_index_to), mp->state);
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SPAN_ENABLE_DISABLE_REPLY);
-}
-
-static void
-vl_api_sw_interface_span_dump_t_handler (vl_api_sw_interface_span_dump_t * mp)
-{
-
-  unix_shared_memory_queue_t *q;
-  span_interface_t *si;
-  vl_api_sw_interface_span_details_t *rmp;
-  span_main_t *sm = &span_main;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  /* *INDENT-OFF* */
-  vec_foreach (si, sm->interfaces)
-    if (si->num_rx_mirror_ports || si->num_tx_mirror_ports)
-    {
-      clib_bitmap_t *b;
-      u32 i;
-      b = clib_bitmap_dup_or (si->rx_mirror_ports, si->tx_mirror_ports);
-      clib_bitmap_foreach (i, b, (
-        {
-          rmp = vl_msg_api_alloc (sizeof (*rmp));
-          memset (rmp, 0, sizeof (*rmp));
-          rmp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SPAN_DETAILS);
-          rmp->context = mp->context;
-
-          rmp->sw_if_index_from = htonl (si - sm->interfaces);
-          rmp->sw_if_index_to = htonl (i);
-          rmp->state = (u8) (clib_bitmap_get (si->rx_mirror_ports, i) +
-                             clib_bitmap_get (si->tx_mirror_ports, i) * 2);
-
-          vl_msg_api_send_shmem (q, (u8 *) & rmp);
-        }));
-      clib_bitmap_free (b);
-    }
-  /* *INDENT-ON* */
-}
-
-/*
- * vpe_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_span;
-#undef _
-}
-
-static clib_error_t *
-span_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (span_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/sr/dir.dox b/vnet/vnet/sr/dir.dox
deleted file mode 100644
index a98b202c..00000000
--- a/vnet/vnet/sr/dir.dox
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- @dir
- @brief Segment Routing code
-
- An implementation of Segment Routing as per:
- draft-previdi-6man-segment-routing-header-05
-
- See file: rfc_draft_05.txt 
- 
-*/
\ No newline at end of file
diff --git a/vnet/vnet/sr/examples/sr_multicastmap.script b/vnet/vnet/sr/examples/sr_multicastmap.script
deleted file mode 100644
index 20bf7dc0..00000000
--- a/vnet/vnet/sr/examples/sr_multicastmap.script
+++ /dev/null
@@ -1,4 +0,0 @@
-sr_tunnel_add_del name sr2 src ::a:1:1:0:6 dst ff15::2/128 next ::a:1:1:0:f next ::a:1:1:0:1a next ff15::1 tag ::a:1:1:0:7  clean 
-sr_tunnel_add_del name sr3 src ::b:1:1:0:6 dst ff16::2/128 next ::a:1:1:0:13 next ::a:1:1:0:1a next ff15::1 tag ::a:1:1:0:7  clean
-sr_policy_add_del name pol1 tunnel sr2 tunnel sr3
-sr_multicast_map_add_del address ff15::1 sr-policy pol1
diff --git a/vnet/vnet/sr/rfc_draft_05.txt b/vnet/vnet/sr/rfc_draft_05.txt
deleted file mode 100644
index bc41c181..00000000
--- a/vnet/vnet/sr/rfc_draft_05.txt
+++ /dev/null
@@ -1,1265 +0,0 @@
-Network Working Group                                    S. Previdi, Ed.
-Internet-Draft                                               C. Filsfils
-Intended status: Standards Track                     Cisco Systems, Inc.
-Expires: June 12, 2015                                          B. Field
-                                                                 Comcast
-                                                                I. Leung
-                                                   Rogers Communications
-                                                        December 9, 2014
-
-
-                   IPv6 Segment Routing Header (SRH)
-              draft-previdi-6man-segment-routing-header-05
-
-Abstract
-
-   Segment Routing (SR) allows a node to steer a packet through a
-   controlled set of instructions, called segments, by prepending a SR
-   header to the packet.  A segment can represent any instruction,
-   topological or service-based.  SR allows to enforce a flow through
-   any path (topological, or application/service based) while
-   maintaining per-flow state only at the ingress node to the SR domain.
-
-   Segment Routing can be applied to the IPv6 data plane with the
-   addition of a new type of Routing Extension Header.  This draft
-   describes the Segment Routing Extension Header Type and how it is
-   used by SR capable nodes.
-
-Requirements Language
-
-   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
-   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
-   document are to be interpreted as described in RFC 2119 [RFC2119].
-
-Status of This Memo
-
-   This Internet-Draft is submitted in full conformance with the
-   provisions of BCP 78 and BCP 79.
-
-   Internet-Drafts are working documents of the Internet Engineering
-   Task Force (IETF).  Note that other groups may also distribute
-   working documents as Internet-Drafts.  The list of current Internet-
-   Drafts is at http://datatracker.ietf.org/drafts/current/.
-
-   Internet-Drafts are draft documents valid for a maximum of six months
-   and may be updated, replaced, or obsoleted by other documents at any
-   time.  It is inappropriate to use Internet-Drafts as reference
-   material or to cite them other than as "work in progress."
-
-
-
-
-Previdi, et al.           Expires June 12, 2015                 [Page 1]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-   This Internet-Draft will expire on June 12, 2015.
-
-Copyright Notice
-
-   Copyright (c) 2014 IETF Trust and the persons identified as the
-   document authors.  All rights reserved.
-
-   This document is subject to BCP 78 and the IETF Trust's Legal
-   Provisions Relating to IETF Documents
-   (http://trustee.ietf.org/license-info) in effect on the date of
-   publication of this document.  Please review these documents
-   carefully, as they describe your rights and restrictions with respect
-   to this document.  Code Components extracted from this document must
-   include Simplified BSD License text as described in Section 4.e of
-   the Trust Legal Provisions and are provided without warranty as
-   described in the Simplified BSD License.
-
-Table of Contents
-
-   1.  Structure of this document  . . . . . . . . . . . . . . . . .   3
-   2.  Segment Routing Documents . . . . . . . . . . . . . . . . . .   3
-   3.  Introduction  . . . . . . . . . . . . . . . . . . . . . . . .   3
-     3.1.  Data Planes supporting Segment Routing  . . . . . . . . .   4
-     3.2.  Illustration  . . . . . . . . . . . . . . . . . . . . . .   4
-   4.  Abstract Routing Model  . . . . . . . . . . . . . . . . . . .   7
-     4.1.  Segment Routing Global Block (SRGB) . . . . . . . . . . .   8
-     4.2.  Traffic Engineering with SR . . . . . . . . . . . . . . .   9
-     4.3.  Segment Routing Database  . . . . . . . . . . . . . . . .  10
-   5.  IPv6 Instantiation of Segment Routing . . . . . . . . . . . .  10
-     5.1.  Segment Identifiers (SIDs) and SRGB . . . . . . . . . . .  10
-       5.1.1.  Node-SID  . . . . . . . . . . . . . . . . . . . . . .  11
-       5.1.2.  Adjacency-SID . . . . . . . . . . . . . . . . . . . .  11
-     5.2.  Segment Routing Extension Header (SRH)  . . . . . . . . .  11
-       5.2.1.  SRH and RFC2460 behavior  . . . . . . . . . . . . . .  15
-   6.  SRH Procedures  . . . . . . . . . . . . . . . . . . . . . . .  15
-     6.1.  Segment Routing Operations  . . . . . . . . . . . . . . .  15
-     6.2.  Segment Routing Node Functions  . . . . . . . . . . . . .  16
-       6.2.1.  Ingress SR Node . . . . . . . . . . . . . . . . . . .  16
-       6.2.2.  Transit Non-SR Capable Node . . . . . . . . . . . . .  18
-       6.2.3.  SR Intra Segment Transit Node . . . . . . . . . . . .  18
-       6.2.4.  SR Segment Endpoint Node  . . . . . . . . . . . . . .  18
-     6.3.  FRR Flag Settings . . . . . . . . . . . . . . . . . . . .  18
-   7.  SR and Tunneling  . . . . . . . . . . . . . . . . . . . . . .  18
-   8.  Example Use Case  . . . . . . . . . . . . . . . . . . . . . .  19
-   9.  IANA Considerations . . . . . . . . . . . . . . . . . . . . .  21
-   10. Manageability Considerations  . . . . . . . . . . . . . . . .  21
-   11. Security Considerations . . . . . . . . . . . . . . . . . . .  21
-   12. Contributors  . . . . . . . . . . . . . . . . . . . . . . . .  21
-
-
-
-Previdi, et al.           Expires June 12, 2015                 [Page 2]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-   13. Acknowledgements  . . . . . . . . . . . . . . . . . . . . . .  21
-   14. References  . . . . . . . . . . . . . . . . . . . . . . . . .  21
-     14.1.  Normative References . . . . . . . . . . . . . . . . . .  21
-     14.2.  Informative References . . . . . . . . . . . . . . . . .  21
-   Authors' Addresses  . . . . . . . . . . . . . . . . . . . . . . .  22
-
-1.  Structure of this document
-
-   Section 3 gives an introduction on SR for IPv6 networks.
-
-   Section 4 describes the Segment Routing abstract model.
-
-   Section 5 defines the Segment Routing Header (SRH) allowing
-   instantiation of SR over IPv6 dataplane.
-
-   Section 6 details the procedures of the Segment Routing Header.
-
-2.  Segment Routing Documents
-
-   Segment Routing terminology is defined in
-   [I-D.filsfils-spring-segment-routing].
-
-   Segment Routing use cases are described in
-   [I-D.filsfils-spring-segment-routing-use-cases].
-
-   Segment Routing IPv6 use cases are described in
-   [I-D.ietf-spring-ipv6-use-cases].
-
-   Segment Routing protocol extensions are defined in
-   [I-D.ietf-isis-segment-routing-extensions], and
-   [I-D.psenak-ospf-segment-routing-ospfv3-extension].
-
-   The security mechanisms of the Segment Routing Header (SRH) are
-   described in [I-D.vyncke-6man-segment-routing-security].
-
-3.  Introduction
-
-   Segment Routing (SR), defined in
-   [I-D.filsfils-spring-segment-routing], allows a node to steer a
-   packet through a controlled set of instructions, called segments, by
-   prepending a SR header to the packet.  A segment can represent any
-   instruction, topological or service-based.  SR allows to enforce a
-   flow through any path (topological or service/application based)
-   while maintaining per-flow state only at the ingress node to the SR
-   domain.  Segments can be derived from different components: IGP, BGP,
-   Services, Contexts, Locators, etc.  The list of segment forming the
-   path is called the Segment List and is encoded in the packet header.
-
-
-
-
-Previdi, et al.           Expires June 12, 2015                 [Page 3]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-   SR allows the use of strict and loose source based routing paradigms
-   without requiring any additional signaling protocols in the
-   infrastructure hence delivering an excellent scalability property.
-
-   The source based routing model described in
-   [I-D.filsfils-spring-segment-routing] is inherited from the ones
-   proposed by [RFC1940] and [RFC2460].  The source based routing model
-   offers the support for explicit routing capability.
-
-3.1.  Data Planes supporting Segment Routing
-
-   Segment Routing (SR), can be instantiated over MPLS
-   ([I-D.filsfils-spring-segment-routing-mpls]) and IPv6.  This document
-   defines its instantiation over the IPv6 data-plane based on the use-
-   cases defined in [I-D.ietf-spring-ipv6-use-cases].
-
-   Segment Routing for IPv6 (SR-IPv6) is required in networks where MPLS
-   data-plane is not used or, when combined with SR-MPLS, in networks
-   where MPLS is used in the core and IPv6 is used at the edge (home
-   networks, datacenters).
-
-   This document defines a new type of Routing Header (originally
-   defined in [RFC2460]) called the Segment Routing Header (SRH) in
-   order to convey the Segment List in the packet header as defined in
-   [I-D.filsfils-spring-segment-routing].  Mechanisms through which
-   segment are known and advertised are outside the scope of this
-   document.
-
-3.2.  Illustration
-
-   In the context of Figure 1 where all the links have the same IGP
-   cost, let us assume that a packet P enters the SR domain at an
-   ingress edge router I and that the operator requests the following
-   requirements for packet P:
-
-      The local service S offered by node B must be applied to packet P.
-
-      The links AB and CE cannot be used to transport the packet P.
-
-      Any node N along the journey of the packet should be able to
-      determine where the packet P entered the SR domain and where it
-      will exit.  The intermediate node should be able to determine the
-      paths from the ingress edge router to itself, and from itself to
-      the egress edge router.
-
-      Per-flow State for packet P should only be created at the ingress
-      edge router.
-
-
-
-
-Previdi, et al.           Expires June 12, 2015                 [Page 4]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-      The operator can forbid, for security reasons, anyone outside the
-      operator domain to exploit its intra-domain SR capabilities.
-
-   I---A---B---C---E
-        \  |  / \ /
-         \ | /   F
-          \|/
-           D
-
-                Figure 1: An illustration of SR properties
-
-   All these properties may be realized by instructing the ingress SR
-   edge router I to push the following abstract SR header on the packet
-   P.
-
-   +---------------------------------------------------------------+
-   |                                   |                           |
-   |      Abstract SR Header           |                           |
-   |                                   |                           |
-   | {SD, SB, SS, SF, SE}, Ptr, SI, SE |        Transported        |
-   |  ^                     |          |           Packet          |
-   |  |                     |          |             P             |
-   |  +---------------------+          |                           |
-   |                                   |                           |
-   +---------------------------------------------------------------+
-
-                       Figure 2: Packet P at node I
-
-   The abstract SR header contains a source route encoded as a list of
-   segments {SD, SB, SS, SF, SE}, a pointer (Ptr) and the identification
-   of the ingress and egress SR edge routers (segments SI and SE).
-
-   A segment identifies a topological instruction or a service
-   instruction.  A segment can either be global or local.  The
-   instruction associated with a global segment is recognized and
-   executed by any SR-capable node in the domain.  The instruction
-   associated with a local segment is only supported by the specific
-   node that originates it.
-
-   Let us assume some IGP (i.e.: ISIS and OSPF) extensions to define a
-   "Node Segment" as a global instruction within the IGP domain to
-   forward a packet along the shortest path to the specified node.  Let
-   us further assume that within the SR domain illustrated in Figure 1,
-   segments SI, SD, SB, SE and SF respectively identify IGP node
-   segments to I, D, B, E and F.
-
-   Let us assume that node B identifies its local service S with local
-   segment SS.
-
-
-
-Previdi, et al.           Expires June 12, 2015                 [Page 5]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-   With all of this in mind, let us describe the journey of the packet
-   P.
-
-   The packet P reaches the ingress SR edge router.  I pushes the SR
-   header illustrated in Figure 2 and sets the pointer to the first
-   segment of the list (SD).
-
-   SD is an instruction recognized by all the nodes in the SR domain
-   which causes the packet to be forwarded along the shortest path to D.
-
-   Once at D, the pointer is incremented and the next segment is
-   executed (SB).
-
-   SB is an instruction recognized by all the nodes in the SR domain
-   which causes the packet to be forwarded along the shortest path to B.
-
-   Once at B, the pointer is incremented and the next segment is
-   executed (SS).
-
-   SS is an instruction only recognized by node B which causes the
-   packet to receive service S.
-
-   Once the service applied, the next segment is executed (SF) which
-   causes the packet to be forwarded along the shortest path to F.
-
-   Once at F, the pointer is incremented and the next segment is
-   executed (SE).
-
-   SE is an instruction recognized by all the nodes in the SR domain
-   which causes the packet to be forwarded along the shortest path to E.
-
-   E then removes the SR header and the packet continues its journey
-   outside the SR domain.
-
-   All of the requirements are met.
-
-   First, the packet P has not used links AB and CE: the shortest-path
-   from I to D is I-A-D, the shortest-path from D to B is D-B, the
-   shortest-path from B to F is B-C-F and the shortest-path from F to E
-   is F-E, hence the packet path through the SR domain is I-A-D-B-C-F-E
-   and the links AB and CE have been avoided.
-
-   Second, the service S supported by B has been applied on packet P.
-
-   Third, any node along the packet path is able to identify the service
-   and topological journey of the packet within the SR domain.  For
-   example, node C receives the packet illustrated in Figure 3 and hence
-   is able to infer where the packet entered the SR domain (SI), how it
-
-
-
-Previdi, et al.           Expires June 12, 2015                 [Page 6]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-   got up to itself {SD, SB, SS, SE}, where it will exit the SR domain
-   (SE) and how it will do so {SF, SE}.
-
-   +---------------------------------------------------------------+
-   |                                   |                           |
-   |           SR Header               |                           |
-   |                                   |                           |
-   | {SD, SB, SS, SF, SE}, Ptr, SI, SE |        Transported        |
-   |               ^        |          |           Packet          |
-   |               |        |          |             P             |
-   |               +--------+          |                           |
-   |                                   |                           |
-   +---------------------------------------------------------------+
-
-                       Figure 3: Packet P at node C
-
-   Fourth, only node I maintains per-flow state for packet P.  The
-   entire program of topological and service instructions to be executed
-   by the SR domain on packet P is encoded by the ingress edge router I
-   in the SR header in the form of a list of segments where each segment
-   identifies a specific instruction.  No further per-flow state is
-   required along the packet path.  The per-flow state is in the SR
-   header and travels with the packet.  Intermediate nodes only hold
-   states related to the IGP global node segments and the local IGP
-   adjacency segments.  These segments are not per-flow specific and
-   hence scale very well.  Typically, an intermediate node would
-   maintain in the order of 100's to 1000's global node segments and in
-   the order of 10's to 100 of local adjacency segments.  Typically the
-   SR IGP forwarding table is expected to be much less than 10000
-   entries.
-
-   Fifth, the SR header is inserted at the entrance to the domain and
-   removed at the exit of the operator domain.  For security reasons,
-   the operator can forbid anyone outside its domain to use its intra-
-   domain SR capability.
-
-4.  Abstract Routing Model
-
-   At the entrance of the SR domain, the ingress SR edge router pushes
-   the SR header on top of the packet.  At the exit of the SR domain,
-   the egress SR edge router removes the SR header.
-
-   The abstract SR header contains an ordered list of segments, a
-   pointer identifying the next segment to process and the
-   identifications of the ingress and egress SR edge routers on the path
-   of this packet.  The pointer identifies the segment that MUST be used
-   by the receiving router to process the packet.  This segment is
-   called the active segment.
-
-
-
-Previdi, et al.           Expires June 12, 2015                 [Page 7]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-   A property of SR is that the entire source route of the packet,
-   including the identity of the ingress and egress edge routers is
-   always available with the packet.  This allows for interesting
-   accounting and service applications.
-
-   We define three SR-header operations:
-
-      "PUSH": an SR header is pushed on an IP packet, or additional
-      segments are added at the head of the segment list.  The pointer
-      is moved to the first entry of the added segments.
-
-      "NEXT": the active segment is completed, the pointer is moved to
-      the next segment in the list.
-
-      "CONTINUE": the active segment is not completed, the pointer is
-      left unchanged.
-
-   In the future, other SR-header management operations may be defined.
-
-   As the packet travels through the SR domain, the pointer is
-   incremented through the ordered list of segments and the source route
-   encoded by the SR ingress edge node is executed.
-
-   A node processes an incoming packet according to the instruction
-   associated with the active segment.
-
-   Any instruction might be associated with a segment: for example, an
-   intra-domain topological strict or loose forwarding instruction, a
-   service instruction, etc.
-
-   At minimum, a segment instruction must define two elements: the
-   identity of the next-hop to forward the packet to (this could be the
-   same node or a context within the node) and which SR-header
-   management operation to execute.
-
-   Each segment is known in the network through a Segment Identifier
-   (SID).  The terms "segment" and "SID" are interchangeable.
-
-4.1.  Segment Routing Global Block (SRGB)
-
-   In the SR abstract model, a segment is identified by a Segment
-   Routing Identifier (SID).  The SR abstract model doesn't mandate a
-   specific format for the SID (IPv6 address or other formats).
-
-   In Segment Routing IPv6 the SID is an IPv6 address.  Therefore, the
-   SRGB is materialized by the global IPv6 address space which
-   represents the set of IPv6 routable addresses in the SR domain.  The
-   following rules apply:
-
-
-
-Previdi, et al.           Expires June 12, 2015                 [Page 8]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-   o  Each node of the SR domain MUST be configured with the Segment
-      Routing Global Block (SRGB).
-
-   o  All global segments must be allocated from the SRGB.  Any SR
-      capable node MUST be able to process any global segment advertised
-      by any other node within the SR domain.
-
-   o  Any segment outside the SRGB has a local significance and is
-      called a "local segment".  An SR-capable node MUST be able to
-      process the local segments it originates.  An SR-capable node MUST
-      NOT support the instruction associated with a local segment
-      originated by a remote node.
-
-4.2.  Traffic Engineering with SR
-
-   An SR Traffic Engineering policy is composed of two elements: a flow
-   classification and a segment-list to prepend on the packets of the
-   flow.
-
-   In SR, this per-flow state only exists at the ingress edge node where
-   the policy is defined and the SR header is pushed.
-
-   It is outside the scope of the document to define the process that
-   leads to the instantiation at a node N of an SR Traffic Engineering
-   policy.
-
-   [I-D.filsfils-spring-segment-routing-use-cases] illustrates various
-   alternatives:
-
-      N is deriving this policy automatically (e.g.  FRR).
-
-      N is provisioned explicitly by the operator.
-
-      N is provisioned by a controller or server (e.g.: SDN Controller).
-
-      N is provisioned by the operator with a high-level policy which is
-      mapped into a path thanks to a local CSPF-based computation (e.g.
-      affinity/SRLG exclusion).
-
-      N could also be provisioned by other means.
-
-   [I-D.filsfils-spring-segment-routing-use-cases] explains why the
-   majority of use-cases require very short segment-lists, hence
-   minimizing the performance impact, if any, of inserting and
-   transporting the segment list.
-
-
-
-
-
-
-Previdi, et al.           Expires June 12, 2015                 [Page 9]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-   A SDN controller, which desires to instantiate at node N an SR
-   Traffic Engineering policy, collects the SR capability of node N such
-   as to ensure that the policy meets its capability.
-
-4.3.  Segment Routing Database
-
-   The Segment routing Database (SRDB) is a set of entries where each
-   entry is identified by a SID.  The instruction associated with each
-   entry at least defines the identity of the next-hop to which the
-   packet should be forwarded and what operation should be performed on
-   the SR header (PUSH, CONTINUE, NEXT).
-
-   +---------+-----------+---------------------------------+
-   | Segment |  Next-Hop |  SR Header operation            |
-   +---------+-----------+---------------------------------+
-   |   Sk    |     M     | CONTINUE                        |
-   |   Sj    |     N     | NEXT                            |
-   |   Sl    | NAT Srvc  | NEXT                            |
-   |   Sm    |  FW srvc  | NEXT                            |
-   |   Sn    |     Q     | NEXT                            |
-   |  etc.   |   etc.    | etc.                            |
-   +---------+-----------+---------------------------------+
-
-                           Figure 4: SR Database
-
-   Each SR-capable node maintains its local SRDB.  SRDB entries can
-   either derive from local policy or from protocol segment
-   advertisement.
-
-5.  IPv6 Instantiation of Segment Routing
-
-5.1.  Segment Identifiers (SIDs) and SRGB
-
-   Segment Routing, as described in
-   [I-D.filsfils-spring-segment-routing], defines Node-SID and
-   Adjacency-SID.  When SR is used over IPv6 data-plane the following
-   applies.
-
-   The SRGB is the global IPv6 address space which represents the set of
-   IPv6 routable addresses in the SR domain.
-
-   Node SIDs are IPv6 addresses part of the SRGB (i.e.: routable
-   addresses).  Adjacency-SIDs are IPv6 addresses which may not be part
-   of the global IPv6 address space.
-
-
-
-
-
-
-
-Previdi, et al.           Expires June 12, 2015                [Page 10]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-5.1.1.  Node-SID
-
-   The Node-SID identifies a node.  With SR-IPv6 the Node-SID is an IPv6
-   prefix that the operator configured on the node and that is used as
-   the node identifier.  Typically, in case of a router, this is the
-   IPv6 address of the node loopback interface.  Therefore, SR-IPv6 does
-   not require any additional SID advertisement for the Node Segment.
-   The Node-SID is in fact the IPv6 address of the node.
-
-5.1.2.  Adjacency-SID
-
-   In the SR architecture defined in
-   [I-D.filsfils-spring-segment-routing] the Adjacency-SID (or Adj-SID)
-   identifies a given interface and may be local or global (depending on
-   how it is advertised).  A node may advertise one (or more) Adj-SIDs
-   allocated to a given interface so to force the forwarding of the
-   packet (when received with that particular Adj-SID) into the
-   interface regardless the routing entry for the packet destination.
-   The semantic of the Adj-SID is:
-
-      Send out the packet to the interface this prefix is allocated to.
-
-   When SR is applied to IPv6, any SID is in a global IPv6 address and
-   therefore, an Adj-SID has a global significance (i.e.: the IPv6
-   address representing the SID is a global address).  In other words, a
-   node that advertises the Adj-SID in the form of a global IPv6 address
-   representing the link/adjacency the packet has to be forwarded to,
-   will apply to the Adj-SID a global significance.
-
-   Advertisement of Adj-SID may be done using multiple mechanisms among
-   which the ones described in ISIS and OSPF protocol extensions:
-   [I-D.ietf-isis-segment-routing-extensions] and
-   [I-D.psenak-ospf-segment-routing-ospfv3-extension].  The distinction
-   between local and global significance of the Adj-SID is given in the
-   encoding of the Adj-SID advertisement.
-
-5.2.  Segment Routing Extension Header (SRH)
-
-   A new type of the Routing Header (originally defined in [RFC2460]) is
-   defined: the Segment Routing Header (SRH) which has a new Routing
-   Type, (suggested value 4) to be assigned by IANA.
-
-   As an example, if an explicit path is to be constructed across a core
-   network running ISIS or OSPF, the segment list will contain SIDs
-   representing the nodes across the path (loose or strict) which,
-   usually, are the IPv6 loopback interface address of each node.  If
-   the path is across service or application entities, the segment list
-
-
-
-
-Previdi, et al.           Expires June 12, 2015                [Page 11]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-   contains the IPv6 addresses of these services or application
-   instances.
-
-   The Segment Routing Header (SRH) is defined as follows:
-
-
-     0                   1                   2                   3
-     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    | Next Header   |  Hdr Ext Len  | Routing Type  | Segments Left |
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    | First Segment |             Flags             |  HMAC Key ID  |
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    |                                                               |
-    |            Segment List[0] (128 bits ipv6 address)            |
-    |                                                               |
-    |                                                               |
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    |                                                               |
-    |                                                               |
-                                  ...
-    |                                                               |
-    |                                                               |
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    |                                                               |
-    |            Segment List[n] (128 bits ipv6 address)            |
-    |                                                               |
-    |                                                               |
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    |                                                               |
-    |            Policy List[0] (optional)                          |
-    |                                                               |
-    |                                                               |
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    |                                                               |
-    |            Policy List[1] (optional)                          |
-    |                                                               |
-    |                                                               |
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    |                                                               |
-    |            Policy List[2] (optional)                          |
-    |                                                               |
-    |                                                               |
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    |                                                               |
-    |                                                               |
-    |                                                               |
-    |                       HMAC (256 bits)                         |
-
-
-
-Previdi, et al.           Expires June 12, 2015                [Page 12]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-    |                        (optional)                             |
-    |                                                               |
-    |                                                               |
-    |                                                               |
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-   where:
-
-   o  Next Header: 8-bit selector.  Identifies the type of header
-      immediately following the SRH.
-
-   o  Hdr Ext Len: 8-bit unsigned integer, is the length of the SRH
-      header in 8-octet units, not including the first 8 octets.
-
-   o  Routing Type: TBD, to be assigned by IANA (suggested value: 4).
-
-   o  Segments Left.  Defined in [RFC2460], it contains the index, in
-      the Segment List, of the next segment to inspect.  Segments Left
-      is decremented at each segment and it is used as an index in the
-      segment list.
-
-   o  First Segment: offset in the SRH, not including the first 8 octets
-      and expressed in 16-octet units, pointing to the last element of
-      the segment list, which is in fact the first segment of the
-      segment routing path.
-
-   o  Flags: 16 bits of flags.  Following flags are defined:
-
-                              1
-          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |C|P|R|R|    Policy Flags       |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-         C-flag: Clean-up flag.  Set when the SRH has to be removed from
-         the packet when packet reaches the last segment.
-
-         P-flag: Protected flag.  Set when the packet has been rerouted
-         through FRR mechanism by a SR endpoint node.  See Section 6.3
-         for more details.
-
-         R-flags.  Reserved and for future use.
-
-         Policy Flags.  Define the type of the IPv6 addresses encoded
-         into the Policy List (see below).  The following have been
-         defined:
-
-
-
-
-
-Previdi, et al.           Expires June 12, 2015                [Page 13]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-            Bits 4-6: determine the type of the first element after the
-            segment list.
-
-            Bits 7-9: determine the type of the second element.
-
-            Bits 10-12: determine the type of the third element.
-
-            Bits 13-15: determine the type of the fourth element.
-
-         The following values are used for the type:
-
-            0x0: Not present.  If value is set to 0x0, it means the
-            element represented by these bits is not present.
-
-            0x1: SR Ingress.
-
-            0x2: SR Egress.
-
-            0x3: Original Source Address.
-
-   o  HMAC Key ID and HMAC field, and their use are defined in
-      [I-D.vyncke-6man-segment-routing-security].
-
-   o  Segment List[n]: 128 bit IPv6 addresses representing the nth
-      segment in the Segment List.  The Segment List is encoded starting
-      from the last segment of the path.  I.e., the first element of the
-      segment list (Segment List [0]) contains the last segment of the
-      path while the last segment of the Segment List (Segment List[n])
-      contains the first segment of the path.  The index contained in
-      "Segments Left" identifies the current active segment.
-
-   o  Policy List.  Optional addresses representing specific nodes in
-      the SR path such as:
-
-         SR Ingress: a 128 bit generic identifier representing the
-         ingress in the SR domain (i.e.: it needs not to be a valid IPv6
-         address).
-
-         SR Egress: a 128 bit generic identifier representing the egress
-         in the SR domain (i.e.: it needs not to be a valid IPv6
-         address).
-
-         Original Source Address: IPv6 address originally present in the
-         SA field of the packet.
-
-      The segments in the Policy List are encoded after the segment list
-      and they are optional.  If none are in the SRH, all bits of the
-      Policy List Flags MUST be set to 0x0.
-
-
-
-Previdi, et al.           Expires June 12, 2015                [Page 14]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-5.2.1.  SRH and RFC2460 behavior
-
-   The SRH being a new type of the Routing Header, it also has the same
-   properties:
-
-      SHOULD only appear once in the packet.
-
-      Only the router whose address is in the DA field of the packet
-      header MUST inspect the SRH.
-
-   Therefore, Segment Routing in IPv6 networks implies that the segment
-   identifier (i.e.: the IPv6 address of the segment) is moved into the
-   DA of the packet.
-
-   The DA of the packet changes at each segment termination/completion
-   and therefore the original DA of the packet MUST be encoded as the
-   last segment of the path.
-
-   As illustrated in Section 3.2, nodes that are within the path of a
-   segment will forward packets based on the DA of the packet without
-   inspecting the SRH.  This ensures full interoperability between SR-
-   capable and non-SR-capable nodes.
-
-6.  SRH Procedures
-
-   In this section we describe the different procedures on the SRH.
-
-6.1.  Segment Routing Operations
-
-   When Segment Routing is instantiated over the IPv6 data plane the
-   following applies:
-
-   o  The segment list is encoded in the SRH.
-
-   o  The active segment is in the destination address of the packet.
-
-   o  The Segment Routing CONTINUE operation (as described in
-      [I-D.filsfils-spring-segment-routing]) is implemented as a
-      regular/plain IPv6 operation consisting of DA based forwarding.
-
-   o  The NEXT operation is implemented through the update of the DA
-      with the value represented by the Next Segment field in the SRH.
-
-   o  The PUSH operation is implemented through the insertion of the SRH
-      or the insertion of additional segments in the SRH segment list.
-
-
-
-
-
-
-Previdi, et al.           Expires June 12, 2015                [Page 15]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-6.2.  Segment Routing Node Functions
-
-   SR packets are forwarded to segments endpoints (i.e.: nodes whose
-   address is in the DA field of the packet).  The segment endpoint,
-   when receiving a SR packet destined to itself, does:
-
-   o  Inspect the SRH.
-
-   o  Determine the next active segment.
-
-   o  Update the Segments Left field (or, if requested, remove the SRH
-      from the packet).
-
-   o  Update the DA.
-
-   o  Send the packet to the next segment.
-
-   The procedures applied to the SRH are related to the node function.
-   Following nodes functions are defined:
-
-      Ingress SR Node.
-
-      Transit Non-SR Node.
-
-      Transit SR Intra Segment Node.
-
-      SR Endpoint Node.
-
-6.2.1.  Ingress SR Node
-
-   Ingress Node can be a router at the edge of the SR domain or a SR-
-   capable host.  The ingress SR node may obtain the segment list by
-   either:
-
-      Local path computation.
-
-      Local configuration.
-
-      Interaction with an SDN controller delivering the path as a
-      complete SRH.
-
-      Any other mechanism (mechanisms through which the path is acquired
-      are outside the scope of this document).
-
-   When creating the SRH (either at ingress node or in the SDN
-   controller) the following is done:
-
-      Next Header and Hdr Ext Len fields are set according to [RFC2460].
-
-
-
-Previdi, et al.           Expires June 12, 2015                [Page 16]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-      Routing Type field is set as TBD (SRH).
-
-      The Segment List is built with the FIRST segment of the path
-      encoded in the LAST element of the Segment List.  Subsequent
-      segments are encoded on top of the first segment.  Finally, the
-      LAST segment of the path is encoded in the FIRST element of the
-      Segment List.  In other words, the Segment List is encoded in the
-      reverse order of the path.
-
-      The original DA of the packet is encoded as the last segment of
-      the path (encoded in the first element of the Segment List).
-
-      the DA of the packet is set with the value of the first segment
-      (found in the last element of the segment list).
-
-      the Segments Left field is set to n-1 where n is the number of
-      elements in the Segment List.
-
-      The packet is sent out towards the first segment (i.e.:
-      represented in the packet DA).
-
-6.2.1.1.  Security at Ingress
-
-   The procedures related to the Segment Routing security are detailed
-   in [I-D.vyncke-6man-segment-routing-security].
-
-   In the case where the SR domain boundaries are not under control of
-   the network operator (e.g.: when the SR domain edge is in a home
-   network), it is important to authenticate and validate the content of
-   any SRH being received by the network operator.  In such case, the
-   security procedure described in
-   [I-D.vyncke-6man-segment-routing-security] is to be used.
-
-   The ingress node (e.g.: the host in the home network) requests the
-   SRH from a control system (e.g.: an SDN controller) which delivers
-   the SRH with its HMAC signature on it.
-
-   Then, the home network host can send out SR packets (with an SRH on
-   it) that will be validated at the ingress of the network operator
-   infrastructure.
-
-   The ingress node of the network operator infrastructure, is
-   configured in order to validate the incoming SRH HMACs in order to
-   allow only packets having correct SRH according to their SA/DA
-   addresses.
-
-
-
-
-
-
-Previdi, et al.           Expires June 12, 2015                [Page 17]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-6.2.2.  Transit Non-SR Capable Node
-
-   SR is interoperable with plain IPv6 forwarding.  Any non SR-capable
-   node will forward SR packets solely based on the DA.  There's no SRH
-   inspection.  This ensures full interoperability between SR and non-SR
-   nodes.
-
-6.2.3.  SR Intra Segment Transit Node
-
-   Only the node whose address is in DA inspects and processes the SRH
-   (according to [RFC2460]).  An intra segment transit node is not in
-   the DA and its forwarding is based on DA and its SR-IPv6 FIB.
-
-6.2.4.  SR Segment Endpoint Node
-
-   The SR segment endpoint node is the node whose address is in the DA.
-   The segment endpoint node inspects the SRH and does:
-
-   1.   IF DA = myself (segment endpoint)
-   2.      IF Segments Left > 0 THEN
-              decrement Segments Left
-              update DA with Segment List[Segments Left]
-   3.      ELSE IF Segments List[Segments Left] <> DA THEN
-              update DA with Segments List[Segments Left]
-              IF Clean-up bit is set THEN remove the SRH
-   4.      ELSE give the packet to next PID (application)
-                End of processing.
-   5.   Forward the packet out
-
-6.3.  FRR Flag Settings
-
-   A node supporting SR and doing Fast Reroute (as described in
-   [I-D.filsfils-spring-segment-routing-use-cases], when rerouting
-   packets through FRR mechanisms, SHOULD inspect the rerouted packet
-   header and look for the SRH.  If the SRH is present, the rerouting
-   node SHOULD set the Protected bit on all rerouted packets.
-
-7.  SR and Tunneling
-
-   Encapsulation can be realized in two different ways with SR-IPv6:
-
-      Outer encapsulation.
-
-      SRH with SA/DA original addresses.
-
-   Outer encapsulation tunneling is the traditional method where an
-   additional IPv6 header is prepended to the packet.  The original IPv6
-   header being encapsulated, everything is preserved and the packet is
-
-
-
-Previdi, et al.           Expires June 12, 2015                [Page 18]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-   switched/routed according to the outer header (that could contain a
-   SRH).
-
-   SRH allows encoding both original SA and DA, hence an operator may
-   decide to change the SA/DA at ingress and restore them at egress.
-   This can be achieved without outer encapsulation, by changing SA/DA
-   and encoding the original SA in the Policy List and in the original
-   DA in the Segment List.
-
-8.  Example Use Case
-
-   A more detailed description of use cases are available in
-   [I-D.ietf-spring-ipv6-use-cases].  In this section, a simple SR-IPv6
-   example is illustrated.
-
-   In the topology described in Figure 6 it is assumed an end-to-end SR
-   deployment.  Therefore SR is supported by all nodes from A to J.
-
-    Home Network |          Backbone         |    Datacenter
-                 |                           |
-                 |   +---+   +---+   +---+   |   +---+   |
-             +---|---| C |---| D |---| E |---|---| I |---|
-             |   |   +---+   +---+   +---+   |   +---+   |
-             |   |     |       |       |     |     |     |  +---+
-   +---+   +---+ |     |       |       |     |     |     |--| X |
-   | A |---| B | |   +---+   +---+   +---+   |   +---+   |  +---+
-   +---+   +---+ |   | F |---| G |---| H |---|---| J |---|
-                 |   +---+   +---+   +---+   |   +---+   |
-                 |                           |
-                 |        +-----------+
-                          |    SDN    |
-                          | Orch/Ctlr |
-                          +-----------+
-
-                       Figure 6: Sample SR topology
-
-   The following workflow applies to packets sent by host A and destined
-   to server X.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Previdi, et al.           Expires June 12, 2015                [Page 19]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-   . Host A sends a request for a path to server X to the SDN
-     controller or orchestration system.
-
-   . The SDN controller/orchestrator builds a SRH with:
-      . Segment List: C, F, J, X
-      . HMAC
-     that satisfies the requirements expressed in the request
-     by host A and based on policies applicable to host A.
-
-   . Host A receives the SRH and insert it into the packet.
-     The packet has now:
-      . SA: A
-      . DA: C
-      . SRH with
-         . SL: X, J, F, C
-         . Segments Left: 3 (i.e.: Segment List size - 1)
-         . PL: C (ingress), J (egress)
-        Note that X is the last segment and C is the
-        first segment (i.e.: the SL is encoded in the reverse
-        path order).
-      . HMAC
-
-   . When packet arrives in C (first segment), C does:
-      . Validate the HMAC of the SRH.
-      . Decrement Segments Left by one: 2
-      . Update the DA with the next segment found in
-        Segment List[2]. DA is set to F.
-      . Forward the packet to F.
-
-   . When packet arrives in F (second segment), F does:
-      . Decrement Segments Left by one: 1
-      . Update the DA with the next segment found in
-        Segment List[1]. DA is set to J.
-      . Forward the packet to J.
-
-   . Packet travels across G and H nodes which do plain
-     IPv6 forwarding based on DA. No inspection of SRH needs
-     to be done in these nodes. However, any SR capable node
-     is allowed to set the Protected bit in case of FRR
-     protection.
-
-   . When packet arrives in J (third segment), J does:
-      . Decrement Segments Left by one: 0
-      . Update the DA with the next segment found in
-        Segment List[0]. DA is set to X.
-      . If the cleanup bit is set, then node J will strip out
-        the SRH from the packet.
-      . Forward the packet to X.
-
-
-
-Previdi, et al.           Expires June 12, 2015                [Page 20]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-   The packet arrives in the server that may or may not support SR.  The
-   return traffic, from server to host, may be sent using the same
-   procedures.
-
-9.  IANA Considerations
-
-   TBD
-
-10.  Manageability Considerations
-
-   TBD
-
-11.  Security Considerations
-
-   Security mechanisms applied to Segment Routing over IPv6 networks are
-   detailed in [I-D.vyncke-6man-segment-routing-security].
-
-12.  Contributors
-
-   The authors would like to thank Dave Barach, John Leddy, John
-   Brzozowski, Pierre Francois, Nagendra Kumar, Mark Townsley, Christian
-   Martin, Roberta Maglione, Eric Vyncke, James Connolly, David Lebrun
-   and Fred Baker for their contribution to this document.
-
-13.  Acknowledgements
-
-   TBD
-
-14.  References
-
-14.1.  Normative References
-
-   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
-              Requirement Levels", BCP 14, RFC 2119, March 1997.
-
-   [RFC2460]  Deering, S. and R. Hinden, "Internet Protocol, Version 6
-              (IPv6) Specification", RFC 2460, December 1998.
-
-14.2.  Informative References
-
-   [I-D.filsfils-spring-segment-routing]
-              Filsfils, C., Previdi, S., Bashandy, A., Decraene, B.,
-              Litkowski, S., Horneffer, M., Milojevic, I., Shakir, R.,
-              Ytti, S., Henderickx, W., Tantsura, J., and E. Crabbe,
-              "Segment Routing Architecture", draft-filsfils-spring-
-              segment-routing-04 (work in progress), July 2014.
-
-
-
-
-
-Previdi, et al.           Expires June 12, 2015                [Page 21]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-   [I-D.filsfils-spring-segment-routing-mpls]
-              Filsfils, C., Previdi, S., Bashandy, A., Decraene, B.,
-              Litkowski, S., Horneffer, M., Milojevic, I., Shakir, R.,
-              Ytti, S., Henderickx, W., Tantsura, J., and E. Crabbe,
-              "Segment Routing with MPLS data plane", draft-filsfils-
-              spring-segment-routing-mpls-03 (work in progress), August
-              2014.
-
-   [I-D.filsfils-spring-segment-routing-use-cases]
-              Filsfils, C., Francois, P., Previdi, S., Decraene, B.,
-              Litkowski, S., Horneffer, M., Milojevic, I., Shakir, R.,
-              Ytti, S., Henderickx, W., Tantsura, J., Kini, S., and E.
-              Crabbe, "Segment Routing Use Cases", draft-filsfils-
-              spring-segment-routing-use-cases-01 (work in progress),
-              October 2014.
-
-   [I-D.ietf-isis-segment-routing-extensions]
-              Previdi, S., Filsfils, C., Bashandy, A., Gredler, H.,
-              Litkowski, S., Decraene, B., and J. Tantsura, "IS-IS
-              Extensions for Segment Routing", draft-ietf-isis-segment-
-              routing-extensions-03 (work in progress), October 2014.
-
-   [I-D.ietf-spring-ipv6-use-cases]
-              Brzozowski, J., Leddy, J., Leung, I., Previdi, S.,
-              Townsley, W., Martin, C., Filsfils, C., and R. Maglione,
-              "IPv6 SPRING Use Cases", draft-ietf-spring-ipv6-use-
-              cases-03 (work in progress), November 2014.
-
-   [I-D.psenak-ospf-segment-routing-ospfv3-extension]
-              Psenak, P., Previdi, S., Filsfils, C., Gredler, H.,
-              Shakir, R., Henderickx, W., and J. Tantsura, "OSPFv3
-              Extensions for Segment Routing", draft-psenak-ospf-
-              segment-routing-ospfv3-extension-02 (work in progress),
-              July 2014.
-
-   [I-D.vyncke-6man-segment-routing-security]
-              Vyncke, E. and S. Previdi, "IPv6 Segment Routing Header
-              (SRH) Security Considerations", July 2014.
-
-   [RFC1940]  Estrin, D., Li, T., Rekhter, Y., Varadhan, K., and D.
-              Zappala, "Source Demand Routing: Packet Format and
-              Forwarding Specification (Version 1)", RFC 1940, May 1996.
-
-Authors' Addresses
-
-
-
-
-
-
-
-Previdi, et al.           Expires June 12, 2015                [Page 22]
-
-Internet-Draft      IPv6 Segment Routing Header (SRH)      December 2014
-
-
-   Stefano Previdi (editor)
-   Cisco Systems, Inc.
-   Via Del Serafico, 200
-   Rome  00142
-   Italy
-
-   Email: sprevidi@cisco.com
-
-
-   Clarence Filsfils
-   Cisco Systems, Inc.
-   Brussels
-   BE
-
-   Email: cfilsfil@cisco.com
-
-
-   Brian Field
-   Comcast
-   4100 East Dry Creek Road
-   Centennial, CO  80122
-   US
-
-   Email: Brian_Field@cable.comcast.com
-
-
-   Ida Leung
-   Rogers Communications
-   8200 Dixie Road
-   Brampton, ON  L6T 0C1
-   CA
-
-   Email: Ida.Leung@rci.rogers.com
diff --git a/vnet/vnet/sr/sr.c b/vnet/vnet/sr/sr.c
deleted file mode 100644
index 5d0275d9..00000000
--- a/vnet/vnet/sr/sr.c
+++ /dev/null
@@ -1,3333 +0,0 @@
-/*
- * sr.c: ipv6 segment routing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @file
- * @brief Segment Routing main functions
- *
- */
-#include <vnet/vnet.h>
-#include <vnet/sr/sr.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/dpo/dpo.h>
-
-#include <openssl/hmac.h>
-
-ip6_sr_main_t sr_main;
-static vlib_node_registration_t sr_local_node;
-
-/**
- * @brief Dynamically added SR DPO type
- */
-static dpo_type_t sr_dpo_type;
-
-/**
- * @brief Use passed HMAC key in ip6_sr_header_t in OpenSSL HMAC routines
- *
- * @param sm ip6_sr_main_t *
- * @param ip ip6_header_t *
- * @param sr ip6_sr_header_t *
- */
-void
-sr_fix_hmac (ip6_sr_main_t * sm, ip6_header_t * ip, ip6_sr_header_t * sr)
-{
-  u32 key_index;
-  static u8 *keybuf;
-  u8 *copy_target;
-  int first_segment;
-  ip6_address_t *addrp;
-  int i;
-  ip6_sr_hmac_key_t *hmac_key;
-  u32 sig_len;
-
-  key_index = sr->hmac_key;
-
-  /* No signature? Pass... */
-  if (key_index == 0)
-    return;
-
-  /* We don't know about this key? Fail... */
-  if (key_index >= vec_len (sm->hmac_keys))
-    return;
-
-  hmac_key = sm->hmac_keys + key_index;
-
-  vec_reset_length (keybuf);
-
-  /* pkt ip6 src address */
-  vec_add2 (keybuf, copy_target, sizeof (ip6_address_t));
-  clib_memcpy (copy_target, ip->src_address.as_u8, sizeof (ip6_address_t));
-
-  /* first segment */
-  vec_add2 (keybuf, copy_target, 1);
-  copy_target[0] = sr->first_segment;
-
-  /* octet w/ bit 0 = "clean" flag */
-  vec_add2 (keybuf, copy_target, 1);
-  copy_target[0]
-    = (sr->flags & clib_host_to_net_u16 (IP6_SR_HEADER_FLAG_CLEANUP))
-    ? 0x80 : 0;
-
-  /* hmac key id */
-  vec_add2 (keybuf, copy_target, 1);
-  copy_target[0] = sr->hmac_key;
-
-  first_segment = sr->first_segment;
-
-  addrp = sr->segments;
-
-  /* segments */
-  for (i = 0; i <= first_segment; i++)
-    {
-      vec_add2 (keybuf, copy_target, sizeof (ip6_address_t));
-      clib_memcpy (copy_target, addrp->as_u8, sizeof (ip6_address_t));
-      addrp++;
-    }
-
-  addrp++;
-
-  HMAC_CTX_init (sm->hmac_ctx);
-  if (!HMAC_Init (sm->hmac_ctx, hmac_key->shared_secret,
-		  vec_len (hmac_key->shared_secret), sm->md))
-    clib_warning ("barf1");
-  if (!HMAC_Update (sm->hmac_ctx, keybuf, vec_len (keybuf)))
-    clib_warning ("barf2");
-  if (!HMAC_Final (sm->hmac_ctx, (unsigned char *) addrp, &sig_len))
-    clib_warning ("barf3");
-  HMAC_CTX_cleanup (sm->hmac_ctx);
-}
-
-/**
- * @brief Format function for decoding various SR flags
- *
- * @param s u8 * - formatted string
- * @param args va_list * - u16 flags
- *
- * @return formatted output string u8 *
- */
-u8 *
-format_ip6_sr_header_flags (u8 * s, va_list * args)
-{
-  u16 flags = (u16) va_arg (*args, int);
-  u8 pl_flag;
-  int bswap_needed = va_arg (*args, int);
-  int i;
-
-  if (bswap_needed)
-    flags = clib_host_to_net_u16 (flags);
-
-  if (flags & IP6_SR_HEADER_FLAG_CLEANUP)
-    s = format (s, "cleanup ");
-
-  if (flags & IP6_SR_HEADER_FLAG_PROTECTED)
-    s = format (s, "reroute ");
-
-  s = format (s, "pl: ");
-  for (i = 1; i <= 4; i++)
-    {
-      pl_flag = ip6_sr_policy_list_flags (flags, i);
-      s = format (s, "[%d] ", i);
-
-      switch (pl_flag)
-	{
-	case IP6_SR_HEADER_FLAG_PL_ELT_NOT_PRESENT:
-	  s = format (s, "NotPr ");
-	  break;
-	case IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE:
-	  s = format (s, "InPE ");
-	  break;
-	case IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE:
-	  s = format (s, "EgPE ");
-	  break;
-
-	case IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR:
-	  s = format (s, "OrgSrc ");
-	  break;
-	}
-    }
-  return s;
-}
-
-/**
- * @brief Format function for decoding ip6_sr_header_t
- *
- * @param s u8 * - formatted string
- * @param args va_list * - ip6_sr_header_t
- *
- * @return formatted output string u8 *
- */
-u8 *
-format_ip6_sr_header (u8 * s, va_list * args)
-{
-  ip6_sr_header_t *h = va_arg (*args, ip6_sr_header_t *);
-  ip6_address_t placeholder_addr =
-    { {254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254,
-       254, 254}
-  };
-  int print_hmac = va_arg (*args, int);
-  int i, pl_index, max_segs;
-  int flags_host_byte_order = clib_net_to_host_u16 (h->flags);
-
-  s = format (s, "next proto %d, len %d, type %d",
-	      h->protocol, (h->length << 3) + 8, h->type);
-  s = format (s, "\n      segs left %d, first_segment %d, hmac key %d",
-	      h->segments_left, h->first_segment, h->hmac_key);
-  s = format (s, "\n      flags %U", format_ip6_sr_header_flags,
-	      flags_host_byte_order, 0 /* bswap needed */ );
-
-  /*
-   * Header length is in 8-byte units (minus one), so
-   * divide by 2 to ascertain the number of ip6 addresses in the
-   * segment list
-   */
-  max_segs = (h->length >> 1);
-
-  if (!print_hmac && h->hmac_key)
-    max_segs -= 2;
-
-  s = format (s, "\n  Segments (in processing order):");
-
-  for (i = h->first_segment; i >= 1; i--)
-    s = format (s, "\n  %U", format_ip6_address, h->segments + i);
-  if (ip6_address_is_equal (&placeholder_addr, h->segments))
-    s = format (s, "\n  (empty placeholder)");
-  else
-    s = format (s, "\n  %U", format_ip6_address, h->segments);
-
-  s = format (s, "\n  Policy List:");
-
-  pl_index = 1;			/* to match the RFC text */
-  for (i = (h->first_segment + 1); i < max_segs; i++, pl_index++)
-    {
-      char *tag;
-      char *tags[] = { " ", "InPE: ", "EgPE: ", "OrgSrc: " };
-
-      tag = tags[0];
-      if (pl_index >= 1 && pl_index <= 4)
-	{
-	  int this_pl_flag = ip6_sr_policy_list_flags
-	    (flags_host_byte_order, pl_index);
-	  tag = tags[this_pl_flag];
-	}
-
-      s = format (s, "\n  %s%U", tag, format_ip6_address, h->segments + i);
-    }
-
-  return s;
-}
-
-/**
- * @brief Format function for decoding ip6_sr_header_t with length
- *
- * @param s u8 * - formatted string
- * @param args va_list * - ip6_header_t + ip6_sr_header_t
- *
- * @return formatted output string u8 *
- */
-u8 *
-format_ip6_sr_header_with_length (u8 * s, va_list * args)
-{
-  ip6_header_t *h = va_arg (*args, ip6_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-  uword header_bytes;
-
-  header_bytes = sizeof (h[0]) + sizeof (ip6_sr_header_t);
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    return format (s, "ip6_sr header truncated");
-
-  s = format (s, "IP6: %U\n", format_ip6_header, h, max_header_bytes);
-  s =
-    format (s, "SR: %U\n", format_ip6_sr_header, (ip6_sr_header_t *) (h + 1),
-	    0 /* print_hmac */ , max_header_bytes);
-  return s;
-}
-
-/**
- * @brief Defined valid next nodes
- * @note Cannot call replicate yet without DPDK
-*/
-#if DPDK > 0
-#define foreach_sr_rewrite_next                 \
-_(ERROR, "error-drop")                          \
-_(IP6_LOOKUP, "ip6-lookup")                     \
-_(SR_LOCAL, "sr-local")                         \
-_(SR_REPLICATE,"sr-replicate")
-#else
-#define foreach_sr_rewrite_next                 \
-_(ERROR, "error-drop")                          \
-_(IP6_LOOKUP, "ip6-lookup")                     \
-_(SR_LOCAL, "sr-local")
-#endif /* DPDK */
-
-/**
- * @brief Struct for defined valid next nodes
-*/
-typedef enum
-{
-#define _(s,n) SR_REWRITE_NEXT_##s,
-  foreach_sr_rewrite_next
-#undef _
-    SR_REWRITE_N_NEXT,
-} sr_rewrite_next_t;
-
-/**
- * @brief Struct for data for SR rewrite packet trace
- */
-typedef struct
-{
-  ip6_address_t src, dst;
-  u16 length;
-  u32 next_index;
-  u32 tunnel_index;
-  u8 sr[256];
-} sr_rewrite_trace_t;
-
-/**
- * @brief Error strings for SR rewrite
- */
-static char *sr_rewrite_error_strings[] = {
-#define sr_error(n,s) s,
-#include "sr_error.def"
-#undef sr_error
-};
-
-/**
- * @brief Struct for SR rewrite error strings
- */
-typedef enum
-{
-#define sr_error(n,s) SR_REWRITE_ERROR_##n,
-#include "sr_error.def"
-#undef sr_error
-  SR_REWRITE_N_ERROR,
-} sr_rewrite_error_t;
-
-
-/**
- * @brief Format function for SR rewrite trace.
- */
-u8 *
-format_sr_rewrite_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  sr_rewrite_trace_t *t = va_arg (*args, sr_rewrite_trace_t *);
-  ip6_sr_main_t *sm = &sr_main;
-  ip6_sr_tunnel_t *tun = pool_elt_at_index (sm->tunnels, t->tunnel_index);
-  ip6_fib_t *rx_fib, *tx_fib;
-
-  rx_fib = ip6_fib_get (tun->rx_fib_index);
-  tx_fib = ip6_fib_get (tun->tx_fib_index);
-
-  s = format
-    (s, "SR-REWRITE: next %s ip6 src %U dst %U len %u\n"
-     "           rx-fib-id %d tx-fib-id %d\n%U",
-     (t->next_index == SR_REWRITE_NEXT_SR_LOCAL)
-     ? "sr-local" : "ip6-lookup",
-     format_ip6_address, &t->src,
-     format_ip6_address, &t->dst, t->length,
-     rx_fib->table_id, tx_fib->table_id,
-     format_ip6_sr_header, t->sr, 0 /* print_hmac */ );
-  return s;
-}
-
-/**
- * @brief Main processing dual-loop for Segment Routing Rewrite
- * @node sr-rewrite
- *
- * @param vm vlib_main_t *
- * @param node vlib_node_runtime_t *
- * @param from_frame vlib_frame_t *
- *
- * @return from_frame->n_vectors uword
- */
-static uword
-sr_rewrite (vlib_main_t * vm,
-	    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  u32 n_left_from, next_index, *from, *to_next;
-  ip6_sr_main_t *sm = &sr_main;
-  u32 (*sr_local_cb) (vlib_main_t *, vlib_node_runtime_t *,
-		      vlib_buffer_t *, ip6_header_t *, ip6_sr_header_t *);
-  sr_local_cb = sm->sr_local_cb;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /* Note 2x loop disabled */
-      while (0 && n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  ip6_header_t *ip0, *ip1;
-	  ip6_sr_header_t *sr0, *sr1;
-	  ip6_sr_tunnel_t *t0, *t1;
-	  u32 next0 = SR_REWRITE_NEXT_IP6_LOOKUP;
-	  u32 next1 = SR_REWRITE_NEXT_IP6_LOOKUP;
-	  u16 new_l0 = 0;
-	  u16 new_l1 = 0;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  /*
-	   * $$$ parse through header(s) to pick the point
-	   * where we punch in the SR extention header
-	   */
-	  t0 =
-	    pool_elt_at_index (sm->tunnels,
-			       vnet_buffer (b0)->ip.adj_index[VLIB_TX]);
-	  t1 =
-	    pool_elt_at_index (sm->tunnels,
-			       vnet_buffer (b1)->ip.adj_index[VLIB_TX]);
-
-	  ASSERT (VLIB_BUFFER_PRE_DATA_SIZE
-		  >= ((word) vec_len (t0->rewrite)) + b0->current_data);
-	  ASSERT (VLIB_BUFFER_PRE_DATA_SIZE
-		  >= ((word) vec_len (t1->rewrite)) + b1->current_data);
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = t0->tx_fib_index;
-	  vnet_buffer (b1)->sw_if_index[VLIB_TX] = t1->tx_fib_index;
-
-	  ip0 = vlib_buffer_get_current (b0);
-	  ip1 = vlib_buffer_get_current (b1);
-#if DPDK > 0			/* Cannot call replication node yet without DPDK */
-	  /* add a replication node */
-	  if (PREDICT_FALSE (t0->policy_index != ~0))
-	    {
-	      vnet_buffer (b0)->ip.save_protocol = t0->policy_index;
-	      next0 = SR_REWRITE_NEXT_SR_REPLICATE;
-	      sr0 = (ip6_sr_header_t *) (t0->rewrite);
-	      goto processnext;
-	    }
-#endif /* DPDK */
-
-	  /*
-	   * SR-unaware service chaining case: pkt coming back from
-	   * service has the original dst address, and will already
-	   * have an SR header. If so, send it to sr-local
-	   */
-	  if (PREDICT_FALSE (ip0->protocol == IPPROTO_IPV6_ROUTE))
-	    {
-	      vlib_buffer_advance (b0, sizeof (ip0));
-	      sr0 = (ip6_sr_header_t *) (ip0 + 1);
-	      new_l0 = clib_net_to_host_u16 (ip0->payload_length);
-	      next0 = SR_REWRITE_NEXT_SR_LOCAL;
-	    }
-	  else
-	    {
-	      u32 len_bytes = sizeof (ip6_header_t);
-	      u8 next_hdr = ip0->protocol;
-
-	      /* HBH must immediately follow ipv6 header */
-	      if (PREDICT_FALSE
-		  (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-		{
-		  ip6_hop_by_hop_ext_t *ext_hdr =
-		    (ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
-		  len_bytes +=
-		    ip6_ext_header_len ((ip6_ext_header_t *) ext_hdr);
-		  /* Ignoring the sr_local for now, if RH follows HBH here */
-		  next_hdr = ext_hdr->next_hdr;
-		  ext_hdr->next_hdr = IPPROTO_IPV6_ROUTE;
-		}
-	      else
-		{
-		  ip0->protocol = IPPROTO_IPV6_ROUTE;	/* routing extension header */
-		}
-	      /*
-	       * Copy data before the punch-in point left by the
-	       * required amount. Assume (for the moment) that only
-	       * the main packet header needs to be copied.
-	       */
-	      clib_memcpy (((u8 *) ip0) - vec_len (t0->rewrite),
-			   ip0, len_bytes);
-	      vlib_buffer_advance (b0, -(word) vec_len (t0->rewrite));
-	      ip0 = vlib_buffer_get_current (b0);
-	      sr0 = (ip6_sr_header_t *) ((u8 *) ip0 + len_bytes);
-	      /* $$$ tune */
-	      clib_memcpy (sr0, t0->rewrite, vec_len (t0->rewrite));
-
-	      /* Fix the next header chain */
-	      sr0->protocol = next_hdr;
-
-	      new_l0 = clib_net_to_host_u16 (ip0->payload_length) +
-		vec_len (t0->rewrite);
-	      ip0->payload_length = clib_host_to_net_u16 (new_l0);
-
-	      /* Copy dst address into the DA slot in the segment list */
-	      clib_memcpy (sr0->segments, ip0->dst_address.as_u64,
-			   sizeof (ip6_address_t));
-	      /* Rewrite the ip6 dst address with the first hop */
-	      clib_memcpy (ip0->dst_address.as_u64, t0->first_hop.as_u64,
-			   sizeof (ip6_address_t));
-
-	      sr_fix_hmac (sm, ip0, sr0);
-
-	      next0 = sr_local_cb ? sr_local_cb (vm, node, b0, ip0, sr0) :
-		next0;
-
-	      /*
-	       * Ignore "do not rewrite" shtik in this path
-	       */
-	      if (PREDICT_FALSE (next0 & 0x80000000))
-		{
-		  next0 ^= 0xFFFFFFFF;
-		  if (PREDICT_FALSE (next0 == SR_REWRITE_NEXT_ERROR))
-		    b0->error = node->errors[SR_REWRITE_ERROR_APP_CALLBACK];
-		}
-	    }
-#if DPDK > 0			/* Cannot call replication node yet without DPDK */
-	processnext:
-	  /* add a replication node */
-	  if (PREDICT_FALSE (t1->policy_index != ~0))
-	    {
-	      vnet_buffer (b1)->ip.save_protocol = t1->policy_index;
-	      next1 = SR_REWRITE_NEXT_SR_REPLICATE;
-	      sr1 = (ip6_sr_header_t *) (t1->rewrite);
-	      goto trace00;
-	    }
-#endif /* DPDK */
-	  if (PREDICT_FALSE (ip1->protocol == IPPROTO_IPV6_ROUTE))
-	    {
-	      vlib_buffer_advance (b1, sizeof (ip1));
-	      sr1 = (ip6_sr_header_t *) (ip1 + 1);
-	      new_l1 = clib_net_to_host_u16 (ip1->payload_length);
-	      next1 = SR_REWRITE_NEXT_SR_LOCAL;
-	    }
-	  else
-	    {
-	      u32 len_bytes = sizeof (ip6_header_t);
-	      u8 next_hdr = ip1->protocol;
-
-	      /* HBH must immediately follow ipv6 header */
-	      if (PREDICT_FALSE
-		  (ip1->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-		{
-		  ip6_hop_by_hop_ext_t *ext_hdr =
-		    (ip6_hop_by_hop_ext_t *) ip6_next_header (ip1);
-		  len_bytes +=
-		    ip6_ext_header_len ((ip6_ext_header_t *) ext_hdr);
-		  /* Ignoring the sr_local for now, if RH follows HBH here */
-		  next_hdr = ext_hdr->next_hdr;
-		  ext_hdr->next_hdr = IPPROTO_IPV6_ROUTE;
-		}
-	      else
-		{
-		  ip1->protocol = IPPROTO_IPV6_ROUTE;
-		}
-	      /*
-	       * Copy data before the punch-in point left by the
-	       * required amount. Assume (for the moment) that only
-	       * the main packet header needs to be copied.
-	       */
-	      clib_memcpy (((u8 *) ip1) - vec_len (t1->rewrite),
-			   ip1, len_bytes);
-	      vlib_buffer_advance (b1, -(word) vec_len (t1->rewrite));
-	      ip1 = vlib_buffer_get_current (b1);
-	      sr1 = (ip6_sr_header_t *) ((u8 *) ip1 + len_bytes);
-	      clib_memcpy (sr1, t1->rewrite, vec_len (t1->rewrite));
-
-	      sr1->protocol = next_hdr;
-	      new_l1 = clib_net_to_host_u16 (ip1->payload_length) +
-		vec_len (t1->rewrite);
-	      ip1->payload_length = clib_host_to_net_u16 (new_l1);
-
-	      /* Copy dst address into the DA slot in the segment list */
-	      clib_memcpy (sr1->segments, ip1->dst_address.as_u64,
-			   sizeof (ip6_address_t));
-	      /* Rewrite the ip6 dst address with the first hop */
-	      clib_memcpy (ip1->dst_address.as_u64, t1->first_hop.as_u64,
-			   sizeof (ip6_address_t));
-
-	      sr_fix_hmac (sm, ip1, sr1);
-
-	      next1 = sr_local_cb ? sr_local_cb (vm, node, b1, ip1, sr1) :
-		next1;
-
-	      /*
-	       * Ignore "do not rewrite" shtik in this path
-	       */
-	      if (PREDICT_FALSE (next1 & 0x80000000))
-		{
-		  next1 ^= 0xFFFFFFFF;
-		  if (PREDICT_FALSE (next1 == SR_REWRITE_NEXT_ERROR))
-		    b1->error = node->errors[SR_REWRITE_ERROR_APP_CALLBACK];
-		}
-	    }
-#if DPDK > 0			/* Cannot run replicate without DPDK and only replicate uses this label */
-	trace00:
-#endif /* DPDK */
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      sr_rewrite_trace_t *tr = vlib_add_trace (vm, node,
-						       b0, sizeof (*tr));
-	      tr->tunnel_index = t0 - sm->tunnels;
-	      clib_memcpy (tr->src.as_u8, ip0->src_address.as_u8,
-			   sizeof (tr->src.as_u8));
-	      clib_memcpy (tr->dst.as_u8, ip0->dst_address.as_u8,
-			   sizeof (tr->dst.as_u8));
-	      tr->length = new_l0;
-	      tr->next_index = next0;
-	      if (sr0)
-		clib_memcpy (tr->sr, sr0, sizeof (tr->sr));
-	    }
-	  if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      sr_rewrite_trace_t *tr = vlib_add_trace (vm, node,
-						       b1, sizeof (*tr));
-	      tr->tunnel_index = t1 - sm->tunnels;
-	      clib_memcpy (tr->src.as_u8, ip1->src_address.as_u8,
-			   sizeof (tr->src.as_u8));
-	      clib_memcpy (tr->dst.as_u8, ip1->dst_address.as_u8,
-			   sizeof (tr->dst.as_u8));
-	      tr->length = new_l1;
-	      tr->next_index = next1;
-	      if (sr1)
-		clib_memcpy (tr->sr, sr1, sizeof (tr->sr));
-	    }
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  ip6_header_t *ip0 = 0;
-	  ip6_sr_header_t *sr0 = 0;
-	  ip6_sr_tunnel_t *t0;
-	  u32 next0 = SR_REWRITE_NEXT_IP6_LOOKUP;
-	  u16 new_l0 = 0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-
-	  /*
-	   * $$$ parse through header(s) to pick the point
-	   * where we punch in the SR extention header
-	   */
-	  t0 =
-	    pool_elt_at_index (sm->tunnels,
-			       vnet_buffer (b0)->ip.adj_index[VLIB_TX]);
-#if DPDK > 0			/* Cannot call replication node yet without DPDK */
-	  /* add a replication node */
-	  if (PREDICT_FALSE (t0->policy_index != ~0))
-	    {
-	      vnet_buffer (b0)->ip.save_protocol = t0->policy_index;
-	      next0 = SR_REWRITE_NEXT_SR_REPLICATE;
-	      sr0 = (ip6_sr_header_t *) (t0->rewrite);
-	      goto trace0;
-	    }
-#endif /* DPDK */
-
-	  ASSERT (VLIB_BUFFER_PRE_DATA_SIZE
-		  >= ((word) vec_len (t0->rewrite)) + b0->current_data);
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = t0->tx_fib_index;
-
-	  ip0 = vlib_buffer_get_current (b0);
-
-	  /*
-	   * SR-unaware service chaining case: pkt coming back from
-	   * service has the original dst address, and will already
-	   * have an SR header. If so, send it to sr-local
-	   */
-	  if (PREDICT_FALSE (ip0->protocol == IPPROTO_IPV6_ROUTE))
-	    {
-	      vlib_buffer_advance (b0, sizeof (ip0));
-	      sr0 = (ip6_sr_header_t *) (ip0 + 1);
-	      new_l0 = clib_net_to_host_u16 (ip0->payload_length);
-	      next0 = SR_REWRITE_NEXT_SR_LOCAL;
-	    }
-	  else
-	    {
-	      u32 len_bytes = sizeof (ip6_header_t);
-	      u8 next_hdr = ip0->protocol;
-
-	      /* HBH must immediately follow ipv6 header */
-	      if (PREDICT_FALSE
-		  (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-		{
-		  ip6_hop_by_hop_ext_t *ext_hdr =
-		    (ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
-		  len_bytes +=
-		    ip6_ext_header_len ((ip6_ext_header_t *) ext_hdr);
-		  next_hdr = ext_hdr->next_hdr;
-		  ext_hdr->next_hdr = IPPROTO_IPV6_ROUTE;
-		  /* Ignoring the sr_local for now, if RH follows HBH here */
-		}
-	      else
-		{
-		  ip0->protocol = IPPROTO_IPV6_ROUTE;	/* routing extension header */
-		}
-	      /*
-	       * Copy data before the punch-in point left by the
-	       * required amount. Assume (for the moment) that only
-	       * the main packet header needs to be copied.
-	       */
-	      clib_memcpy (((u8 *) ip0) - vec_len (t0->rewrite),
-			   ip0, len_bytes);
-	      vlib_buffer_advance (b0, -(word) vec_len (t0->rewrite));
-	      ip0 = vlib_buffer_get_current (b0);
-	      sr0 = (ip6_sr_header_t *) ((u8 *) ip0 + len_bytes);
-	      /* $$$ tune */
-	      clib_memcpy (sr0, t0->rewrite, vec_len (t0->rewrite));
-
-	      /* Fix the next header chain */
-	      sr0->protocol = next_hdr;
-	      new_l0 = clib_net_to_host_u16 (ip0->payload_length) +
-		vec_len (t0->rewrite);
-	      ip0->payload_length = clib_host_to_net_u16 (new_l0);
-
-	      /* Copy dst address into the DA slot in the segment list */
-	      clib_memcpy (sr0->segments, ip0->dst_address.as_u64,
-			   sizeof (ip6_address_t));
-	      /* Rewrite the ip6 dst address with the first hop */
-	      clib_memcpy (ip0->dst_address.as_u64, t0->first_hop.as_u64,
-			   sizeof (ip6_address_t));
-
-	      sr_fix_hmac (sm, ip0, sr0);
-
-	      next0 = sr_local_cb ? sr_local_cb (vm, node, b0, ip0, sr0) :
-		next0;
-
-	      /*
-	       * Ignore "do not rewrite" shtik in this path
-	       */
-	      if (PREDICT_FALSE (next0 & 0x80000000))
-		{
-		  next0 ^= 0xFFFFFFFF;
-		  if (PREDICT_FALSE (next0 == SR_REWRITE_NEXT_ERROR))
-		    b0->error = node->errors[SR_REWRITE_ERROR_APP_CALLBACK];
-		}
-	    }
-#if DPDK > 0			/* Cannot run replicate without DPDK and only replicate uses this label */
-	trace0:
-#endif /* DPDK */
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      sr_rewrite_trace_t *tr = vlib_add_trace (vm, node,
-						       b0, sizeof (*tr));
-	      tr->tunnel_index = t0 - sm->tunnels;
-	      if (ip0)
-		{
-		  memcpy (tr->src.as_u8, ip0->src_address.as_u8,
-			  sizeof (tr->src.as_u8));
-		  memcpy (tr->dst.as_u8, ip0->dst_address.as_u8,
-			  sizeof (tr->dst.as_u8));
-		}
-	      tr->length = new_l0;
-	      tr->next_index = next0;
-	      if (sr0)
-		clib_memcpy (tr->sr, sr0, sizeof (tr->sr));
-	    }
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return from_frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (sr_rewrite_node) = {
-  .function = sr_rewrite,
-  .name = "sr-rewrite",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-  .format_trace = format_sr_rewrite_trace,
-  .format_buffer = format_ip6_sr_header_with_length,
-
-  .n_errors = SR_REWRITE_N_ERROR,
-  .error_strings = sr_rewrite_error_strings,
-
-  .runtime_data_bytes = 0,
-
-  .n_next_nodes = SR_REWRITE_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [SR_REWRITE_NEXT_##s] = n,
-    foreach_sr_rewrite_next
-#undef _
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (sr_rewrite_node, sr_rewrite)
-/* *INDENT-ON* */
-
-static int
-ip6_delete_route_no_next_hop (ip6_address_t * dst_address_arg,
-			      u32 dst_address_length, u32 rx_table_id)
-{
-  fib_prefix_t pfx = {
-    .fp_len = dst_address_length,
-    .fp_proto = FIB_PROTOCOL_IP6,
-    .fp_addr = {
-		.ip6 = *dst_address_arg,
-		}
-  };
-
-  fib_table_entry_delete (fib_table_id_find_fib_index (FIB_PROTOCOL_IP6,
-						       rx_table_id),
-			  &pfx, FIB_SOURCE_SR);
-
-  return 0;
-}
-
-/**
- * @brief Find or add if not found - HMAC shared secret
- *
- * @param sm ip6_sr_main_t *
- * @param secret u8 *
- * @param indexp u32 *
- *
- * @return ip6_sr_hmac_key_t *
- */
-static ip6_sr_hmac_key_t *
-find_or_add_shared_secret (ip6_sr_main_t * sm, u8 * secret, u32 * indexp)
-{
-  uword *p;
-  ip6_sr_hmac_key_t *key = 0;
-  int i;
-
-  p = hash_get_mem (sm->hmac_key_by_shared_secret, secret);
-
-  if (p)
-    {
-      key = vec_elt_at_index (sm->hmac_keys, p[0]);
-      if (indexp)
-	*indexp = p[0];
-      return (key);
-    }
-
-  /* Specific key ID? */
-  if (indexp && *indexp)
-    {
-      vec_validate (sm->hmac_keys, *indexp);
-      key = sm->hmac_keys + *indexp;
-    }
-  else
-    {
-      for (i = 0; i < vec_len (sm->hmac_keys); i++)
-	{
-	  if (sm->hmac_keys[i].shared_secret == 0)
-	    {
-	      key = sm->hmac_keys + i;
-	      goto found;
-	    }
-	}
-      vec_validate (sm->hmac_keys, i);
-      key = sm->hmac_keys + i;
-    found:
-      ;
-    }
-
-  key->shared_secret = vec_dup (secret);
-
-  hash_set_mem (sm->hmac_key_by_shared_secret, key->shared_secret,
-		key - sm->hmac_keys);
-
-  if (indexp)
-    *indexp = key - sm->hmac_keys;
-  return (key);
-}
-
-/**
- * @brief Add or Delete a Segment Routing tunnel.
- *
- * @param a ip6_sr_add_del_tunnel_args_t *
- *
- * @return retval int
- */
-int
-ip6_sr_add_del_tunnel (ip6_sr_add_del_tunnel_args_t * a)
-{
-  ip6_main_t *im = &ip6_main;
-  ip6_sr_tunnel_key_t key;
-  ip6_sr_tunnel_t *t;
-  uword *p, *n;
-  ip6_sr_header_t *h = 0;
-  u32 header_length;
-  ip6_address_t *addrp, *this_address;
-  ip6_sr_main_t *sm = &sr_main;
-  u8 *key_copy;
-  u32 rx_fib_index, tx_fib_index;
-  u32 hmac_key_index_u32;
-  u8 hmac_key_index = 0;
-  ip6_sr_policy_t *pt;
-  int i;
-  dpo_id_t dpo = DPO_INVALID;
-
-  /* Make sure that the rx FIB exists */
-  p = hash_get (im->fib_index_by_table_id, a->rx_table_id);
-
-  if (p == 0)
-    return -3;
-
-  /* remember the FIB index */
-  rx_fib_index = p[0];
-
-  /* Make sure that the supplied FIB exists */
-  p = hash_get (im->fib_index_by_table_id, a->tx_table_id);
-
-  if (p == 0)
-    return -4;
-
-  /* remember the FIB index */
-  tx_fib_index = p[0];
-
-  clib_memcpy (key.src.as_u8, a->src_address->as_u8, sizeof (key.src));
-  clib_memcpy (key.dst.as_u8, a->dst_address->as_u8, sizeof (key.dst));
-
-  /* When adding a tunnel:
-   * - If a "name" is given, it must not exist.
-   * - The "key" is always checked, and must not exist.
-   * When deleting a tunnel:
-   * - If the "name" is given, and it exists, then use it.
-   * - If the "name" is not given, use the "key".
-   * - If the "name" and the "key" are given, then both must point to the same
-   *   thing.
-   */
-
-  /* Lookup the key */
-  p = hash_get_mem (sm->tunnel_index_by_key, &key);
-
-  /* If the name is given, look it up */
-  if (a->name)
-    n = hash_get_mem (sm->tunnel_index_by_name, a->name);
-  else
-    n = 0;
-
-  /* validate key/name parameters */
-  if (!a->is_del)		/* adding a tunnel */
-    {
-      if (a->name && n)		/* name given & exists already */
-	return -1;
-      if (p)			/* key exists already */
-	return -1;
-    }
-  else				/* deleting a tunnel */
-    {
-      if (!p)			/* key doesn't exist */
-	return -2;
-      if (a->name && !n)	/* name given & it doesn't exist */
-	return -2;
-
-      if (n)			/* name given & found */
-	{
-	  if (n[0] != p[0])	/* name and key do not point to the same thing */
-	    return -2;
-	}
-    }
-
-
-  if (a->is_del)		/* delete the tunnel */
-    {
-      hash_pair_t *hp;
-
-      /* Delete existing tunnel */
-      t = pool_elt_at_index (sm->tunnels, p[0]);
-
-      ip6_delete_route_no_next_hop (&t->key.dst, t->dst_mask_width,
-				    a->rx_table_id);
-      vec_free (t->rewrite);
-      /* Remove tunnel from any policy if associated */
-      if (t->policy_index != ~0)
-	{
-	  pt = pool_elt_at_index (sm->policies, t->policy_index);
-	  for (i = 0; i < vec_len (pt->tunnel_indices); i++)
-	    {
-	      if (pt->tunnel_indices[i] == t - sm->tunnels)
-		{
-		  vec_delete (pt->tunnel_indices, 1, i);
-		  goto found;
-		}
-	    }
-	  clib_warning ("Tunnel index %d not found in policy_index %d",
-			t - sm->tunnels, pt - sm->policies);
-	found:
-	  /* If this is last tunnel in the  policy, clean up the policy too */
-	  if (vec_len (pt->tunnel_indices) == 0)
-	    {
-	      hash_unset_mem (sm->policy_index_by_policy_name, pt->name);
-	      vec_free (pt->name);
-	      pool_put (sm->policies, pt);
-	    }
-	}
-
-      /* Clean up the tunnel by name */
-      if (t->name)
-	{
-	  hash_unset_mem (sm->tunnel_index_by_name, t->name);
-	  vec_free (t->name);
-	}
-      pool_put (sm->tunnels, t);
-      hp = hash_get_pair (sm->tunnel_index_by_key, &key);
-      key_copy = (void *) (hp->key);
-      hash_unset_mem (sm->tunnel_index_by_key, &key);
-      vec_free (key_copy);
-      return 0;
-    }
-
-  /* create a new tunnel */
-  pool_get (sm->tunnels, t);
-  memset (t, 0, sizeof (*t));
-  t->policy_index = ~0;
-
-  clib_memcpy (&t->key, &key, sizeof (t->key));
-  t->dst_mask_width = a->dst_mask_width;
-  t->rx_fib_index = rx_fib_index;
-  t->tx_fib_index = tx_fib_index;
-
-  if (!vec_len (a->segments))
-    /* there must be at least one segment... */
-    return -4;
-
-  /* The first specified hop goes right into the dst address */
-  clib_memcpy (&t->first_hop, &a->segments[0], sizeof (ip6_address_t));
-
-  /*
-   * Create the sr header rewrite string
-   * The list of segments needs an extra slot for the ultimate destination
-   * which is taken from the packet we add the SRH to.
-   */
-  header_length = sizeof (*h) +
-    sizeof (ip6_address_t) * (vec_len (a->segments) + 1 + vec_len (a->tags));
-
-  if (a->shared_secret)
-    {
-      /* Allocate a new key slot if we don't find the secret key */
-      hmac_key_index_u32 = 0;
-      (void) find_or_add_shared_secret (sm, a->shared_secret,
-					&hmac_key_index_u32);
-
-      /* Hey Vinz Clortho: Gozzer is pissed.. you're out of keys! */
-      if (hmac_key_index_u32 >= 256)
-	return -5;
-      hmac_key_index = hmac_key_index_u32;
-      header_length += SHA256_DIGEST_LENGTH;
-    }
-
-  vec_validate (t->rewrite, header_length - 1);
-
-  h = (ip6_sr_header_t *) t->rewrite;
-
-  h->protocol = 0xFF;		/* we don't know yet */
-
-  h->length = (header_length / 8) - 1;
-  h->type = ROUTING_HEADER_TYPE_SR;
-
-  /* first_segment and segments_left need to have the index of the last
-   * element in the list; a->segments has one element less than ends up
-   * in the header (it does not have the DA in it), so vec_len(a->segments)
-   * is the value we want.
-   */
-  h->first_segment = h->segments_left = vec_len (a->segments);
-
-  if (a->shared_secret)
-    h->hmac_key = hmac_key_index & 0xFF;
-
-  h->flags = a->flags_net_byte_order;
-
-  /* Paint on the segment list, in reverse.
-   * This is offset by one to leave room at the start for the ultimate
-   * destination.
-   */
-  addrp = h->segments + vec_len (a->segments);
-
-  vec_foreach (this_address, a->segments)
-  {
-    clib_memcpy (addrp->as_u8, this_address->as_u8, sizeof (ip6_address_t));
-    addrp--;
-  }
-
-  /*
-   * Since the ultimate destination address is not yet known, set that slot
-   * to a value we will instantly recognize as bogus.
-   */
-  memset (h->segments, 0xfe, sizeof (ip6_address_t));
-
-  /* Paint on the tag list, not reversed */
-  addrp = h->segments + vec_len (a->segments);
-
-  vec_foreach (this_address, a->tags)
-  {
-    clib_memcpy (addrp->as_u8, this_address->as_u8, sizeof (ip6_address_t));
-    addrp++;
-  }
-
-  key_copy = vec_new (ip6_sr_tunnel_key_t, 1);
-  clib_memcpy (key_copy, &key, sizeof (ip6_sr_tunnel_key_t));
-  hash_set_mem (sm->tunnel_index_by_key, key_copy, t - sm->tunnels);
-
-  /*
-   * Stick the tunnel index into the rewrite header.
-   *
-   * Unfortunately, inserting an SR header according to the various
-   * RFC's requires parsing through the ip6 header, perhaps consing a
-   * buffer onto the head of the vlib_buffer_t, etc. We don't use the
-   * normal reverse bcopy rewrite code.
-   *
-   * We don't handle ugly RFC-related cases yet, but I'm sure PL will complain
-   * at some point...
-   */
-  dpo_set (&dpo, sr_dpo_type, DPO_PROTO_IP6, t - sm->tunnels);
-
-  fib_prefix_t pfx = {
-    .fp_proto = FIB_PROTOCOL_IP6,
-    .fp_len = a->dst_mask_width,
-    .fp_addr = {
-		.ip6 = *a->dst_address,
-		}
-  };
-  fib_table_entry_special_dpo_add (rx_fib_index,
-				   &pfx,
-				   FIB_SOURCE_SR,
-				   FIB_ENTRY_FLAG_EXCLUSIVE, &dpo);
-  dpo_reset (&dpo);
-
-  if (a->policy_name)
-    {
-      p = hash_get_mem (sm->policy_index_by_policy_name, a->policy_name);
-      if (p)
-	{
-	  pt = pool_elt_at_index (sm->policies, p[0]);
-	}
-      else			/* no policy, lets create one */
-	{
-	  pool_get (sm->policies, pt);
-	  memset (pt, 0, sizeof (*pt));
-	  pt->name = format (0, "%s%c", a->policy_name, 0);
-	  hash_set_mem (sm->policy_index_by_policy_name, pt->name,
-			pt - sm->policies);
-	  p = hash_get_mem (sm->policy_index_by_policy_name, a->policy_name);
-	}
-      vec_add1 (pt->tunnel_indices, t - sm->tunnels);
-      if (p == 0)
-	clib_warning ("p is NULL!");
-      t->policy_index = p ? p[0] : ~0;	/* equiv. to (pt - sm->policies) */
-    }
-
-  if (a->name)
-    {
-      t->name = format (0, "%s%c", a->name, 0);
-      hash_set_mem (sm->tunnel_index_by_name, t->name, t - sm->tunnels);
-    }
-
-  return 0;
-}
-
-/**
- * @brief no-op lock function.
- * The lifetime of the SR entry is managed by the control plane
- */
-static void
-sr_dpo_lock (dpo_id_t * dpo)
-{
-}
-
-/**
- * @brief no-op unlock function.
- * The lifetime of the SR entry is managed by the control plane
- */
-static void
-sr_dpo_unlock (dpo_id_t * dpo)
-{
-}
-
-u8 *
-format_sr_dpo (u8 * s, va_list * args)
-{
-  index_t index = va_arg (*args, index_t);
-  CLIB_UNUSED (u32 indent) = va_arg (*args, u32);
-
-  return (format (s, "SR: tunnel:[%d]", index));
-}
-
-const static dpo_vft_t sr_vft = {
-  .dv_lock = sr_dpo_lock,
-  .dv_unlock = sr_dpo_unlock,
-  .dv_format = format_sr_dpo,
-};
-
-const static char *const sr_ip6_nodes[] = {
-  "sr-rewrite",
-  NULL,
-};
-
-const static char *const *const sr_nodes[DPO_PROTO_NUM] = {
-  [DPO_PROTO_IP6] = sr_ip6_nodes,
-};
-
-/**
- * @brief CLI parser for Add or Delete a Segment Routing tunnel.
- *
- * @param vm vlib_main_t *
- * @param input unformat_input_t *
- * @param cmd vlib_cli_command_t *
- *
- * @return error clib_error_t *
- */
-static clib_error_t *
-sr_add_del_tunnel_command_fn (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cmd)
-{
-  int is_del = 0;
-  ip6_address_t src_address;
-  int src_address_set = 0;
-  ip6_address_t dst_address;
-  u32 dst_mask_width;
-  int dst_address_set = 0;
-  u16 flags = 0;
-  u8 *shared_secret = 0;
-  u8 *name = 0;
-  u8 *policy_name = 0;
-  u32 rx_table_id = 0;
-  u32 tx_table_id = 0;
-  ip6_address_t *segments = 0;
-  ip6_address_t *this_seg;
-  ip6_address_t *tags = 0;
-  ip6_address_t *this_tag;
-  ip6_sr_add_del_tunnel_args_t _a, *a = &_a;
-  ip6_address_t next_address, tag;
-  int pl_index;
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	is_del = 1;
-      else if (unformat (input, "rx-fib-id %d", &rx_table_id))
-	;
-      else if (unformat (input, "tx-fib-id %d", &tx_table_id))
-	;
-      else if (unformat (input, "src %U", unformat_ip6_address, &src_address))
-	src_address_set = 1;
-      else if (unformat (input, "name %s", &name))
-	;
-      else if (unformat (input, "policy %s", &policy_name))
-	;
-      else if (unformat (input, "dst %U/%d",
-			 unformat_ip6_address, &dst_address, &dst_mask_width))
-	dst_address_set = 1;
-      else if (unformat (input, "next %U", unformat_ip6_address,
-			 &next_address))
-	{
-	  vec_add2 (segments, this_seg, 1);
-	  clib_memcpy (this_seg->as_u8, next_address.as_u8,
-		       sizeof (*this_seg));
-	}
-      else if (unformat (input, "tag %U", unformat_ip6_address, &tag))
-	{
-	  vec_add2 (tags, this_tag, 1);
-	  clib_memcpy (this_tag->as_u8, tag.as_u8, sizeof (*this_tag));
-	}
-      else if (unformat (input, "clean"))
-	flags |= IP6_SR_HEADER_FLAG_CLEANUP;
-      else if (unformat (input, "protected"))
-	flags |= IP6_SR_HEADER_FLAG_PROTECTED;
-      else if (unformat (input, "key %s", &shared_secret))
-	/* Do not include the trailing NULL byte. Guaranteed interop issue */
-	_vec_len (shared_secret) -= 1;
-      else if (unformat (input, "InPE %d", &pl_index))
-	{
-	  if (pl_index <= 0 || pl_index > 4)
-	    {
-	    pl_index_range_error:
-	      return clib_error_return
-		(0, "Policy List Element Index %d out of range (1-4)",
-		 pl_index);
-
-	    }
-	  flags |= IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE
-	    << ip6_sr_policy_list_shift_from_index (pl_index);
-	}
-      else if (unformat (input, "EgPE %d", &pl_index))
-	{
-	  if (pl_index <= 0 || pl_index > 4)
-	    goto pl_index_range_error;
-	  flags |= IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE
-	    << ip6_sr_policy_list_shift_from_index (pl_index);
-	}
-      else if (unformat (input, "OrgSrc %d", &pl_index))
-	{
-	  if (pl_index <= 0 || pl_index > 4)
-	    goto pl_index_range_error;
-	  flags |= IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR
-	    << ip6_sr_policy_list_shift_from_index (pl_index);
-	}
-      else
-	break;
-    }
-
-  if (!src_address_set)
-    return clib_error_return (0, "src address required");
-
-  if (!dst_address_set)
-    return clib_error_return (0, "dst address required");
-
-  if (!segments)
-    return clib_error_return (0, "at least one sr segment required");
-
-  memset (a, 0, sizeof (*a));
-  a->src_address = &src_address;
-  a->dst_address = &dst_address;
-  a->dst_mask_width = dst_mask_width;
-  a->segments = segments;
-  a->tags = tags;
-  a->flags_net_byte_order = clib_host_to_net_u16 (flags);
-  a->is_del = is_del;
-  a->rx_table_id = rx_table_id;
-  a->tx_table_id = tx_table_id;
-  a->shared_secret = shared_secret;
-
-  if (vec_len (name))
-    a->name = name;
-  else
-    a->name = 0;
-
-  if (vec_len (policy_name))
-    a->policy_name = policy_name;
-  else
-    a->policy_name = 0;
-
-  rv = ip6_sr_add_del_tunnel (a);
-
-  vec_free (segments);
-  vec_free (tags);
-  vec_free (shared_secret);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case -1:
-      return clib_error_return (0, "SR tunnel src %U dst %U already exists",
-				format_ip6_address, &src_address,
-				format_ip6_address, &dst_address);
-
-    case -2:
-      return clib_error_return (0, "SR tunnel src %U dst %U does not exist",
-				format_ip6_address, &src_address,
-				format_ip6_address, &dst_address);
-
-    case -3:
-      return clib_error_return (0, "FIB table %d does not exist",
-				rx_table_id);
-
-    case -4:
-      return clib_error_return (0, "At least one segment is required");
-
-    default:
-      return clib_error_return (0, "BUG: ip6_sr_add_del_tunnel returns %d",
-				rv);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (sr_tunnel_command, static) = {
-    .path = "sr tunnel",
-    .short_help =
-      "sr tunnel [del] [name <name>] src <addr> dst <addr> [next <addr>] "
-      "[clean] [reroute] [key <secret>] [policy <policy_name>]"
-      "[rx-fib-id <fib_id>] [tx-fib-id <fib_id>]",
-    .function = sr_add_del_tunnel_command_fn,
-};
-/* *INDENT-ON* */
-
-/**
- * @brief Display Segment Routing tunnel
- *
- * @param vm vlib_main_t *
- * @param t ip6_sr_tunnel_t *
- *
- */
-void
-ip6_sr_tunnel_display (vlib_main_t * vm, ip6_sr_tunnel_t * t)
-{
-  ip6_sr_main_t *sm = &sr_main;
-  ip6_fib_t *rx_fib, *tx_fib;
-  ip6_sr_policy_t *pt;
-
-  rx_fib = ip6_fib_get (t->rx_fib_index);
-  tx_fib = ip6_fib_get (t->tx_fib_index);
-
-  if (t->name)
-    vlib_cli_output (vm, "sr tunnel name: %s", (char *) t->name);
-
-  vlib_cli_output (vm, "src %U dst %U first hop %U",
-		   format_ip6_address, &t->key.src,
-		   format_ip6_address, &t->key.dst,
-		   format_ip6_address, &t->first_hop);
-  vlib_cli_output (vm, "    rx-fib-id %d tx-fib-id %d",
-		   rx_fib->table_id, tx_fib->table_id);
-  vlib_cli_output (vm, "  sr: %U", format_ip6_sr_header, t->rewrite,
-		   0 /* print_hmac */ );
-
-  if (t->policy_index != ~0)
-    {
-      pt = pool_elt_at_index (sm->policies, t->policy_index);
-      vlib_cli_output (vm, "sr policy: %s", (char *) pt->name);
-    }
-  vlib_cli_output (vm, "-------");
-
-  return;
-}
-
-/**
- * @brief CLI Parser for Display Segment Routing tunnel
- *
- * @param vm vlib_main_t *
- * @param input unformat_input_t *
- * @param cmd vlib_cli_command_t *
- *
- * @return error clib_error_t *
- */
-static clib_error_t *
-show_sr_tunnel_fn (vlib_main_t * vm,
-		   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  static ip6_sr_tunnel_t **tunnels;
-  ip6_sr_tunnel_t *t;
-  ip6_sr_main_t *sm = &sr_main;
-  int i;
-  uword *p = 0;
-  u8 *name = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "name %s", &name))
-	{
-	  p = hash_get_mem (sm->tunnel_index_by_name, name);
-	  if (!p)
-	    vlib_cli_output (vm, "No SR tunnel with name: %s. Showing all.",
-			     name);
-	}
-      else
-	break;
-    }
-
-  vec_reset_length (tunnels);
-
-  if (!p)			/* Either name parm not passed or no tunnel with that name found, show all */
-    {
-      /* *INDENT-OFF* */
-  pool_foreach (t, sm->tunnels,
-  ({
-    vec_add1 (tunnels, t);
-  }));
-  /* *INDENT-ON* */
-    }
-  else				/* Just show the one tunnel by name */
-    vec_add1 (tunnels, &sm->tunnels[p[0]]);
-
-  if (vec_len (tunnels) == 0)
-    vlib_cli_output (vm, "No SR tunnels configured");
-
-  for (i = 0; i < vec_len (tunnels); i++)
-    {
-      t = tunnels[i];
-      ip6_sr_tunnel_display (vm, t);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_sr_tunnel_command, static) = {
-    .path = "show sr tunnel",
-    .short_help = "show sr tunnel [name <sr-tunnel-name>]",
-    .function = show_sr_tunnel_fn,
-};
-/* *INDENT-ON* */
-
-/**
- * @brief Add or Delete a Segment Routing policy
- *
- * @param a ip6_sr_add_del_policy_args_t *
- *
- * @return retval int
- */
-int
-ip6_sr_add_del_policy (ip6_sr_add_del_policy_args_t * a)
-{
-  ip6_sr_main_t *sm = &sr_main;
-  uword *p;
-  ip6_sr_tunnel_t *t = 0;
-  ip6_sr_policy_t *policy;
-  u32 *tunnel_indices = 0;
-  int i;
-
-
-
-  if (a->is_del)
-    {
-      p = hash_get_mem (sm->policy_index_by_policy_name, a->name);
-      if (!p)
-	return -6;		/* policy name not found */
-
-      policy = pool_elt_at_index (sm->policies, p[0]);
-
-      vec_foreach_index (i, policy->tunnel_indices)
-      {
-	t = pool_elt_at_index (sm->tunnels, policy->tunnel_indices[i]);
-	t->policy_index = ~0;
-      }
-      hash_unset_mem (sm->policy_index_by_policy_name, a->name);
-      pool_put (sm->policies, policy);
-      return 0;
-    }
-
-
-  if (!vec_len (a->tunnel_names))
-    return -3;			/*tunnel name is required case */
-
-  vec_reset_length (tunnel_indices);
-  /* Check tunnel names, add tunnel_index to policy */
-  for (i = 0; i < vec_len (a->tunnel_names); i++)
-    {
-      p = hash_get_mem (sm->tunnel_index_by_name, a->tunnel_names[i]);
-      if (!p)
-	return -4;		/* tunnel name not found case */
-
-      t = pool_elt_at_index (sm->tunnels, p[0]);
-      /*
-         No need to check t==0. -3 condition above ensures name
-       */
-      if (t->policy_index != ~0)
-	return -5;		/* tunnel name already associated with a policy */
-
-      /* Add to tunnel indicies */
-      vec_add1 (tunnel_indices, p[0]);
-    }
-
-  /* Add policy to ip6_sr_main_t */
-  pool_get (sm->policies, policy);
-  policy->name = a->name;
-  policy->tunnel_indices = tunnel_indices;
-  hash_set_mem (sm->policy_index_by_policy_name, policy->name,
-		policy - sm->policies);
-
-  /* Yes, this could be construed as overkill but the last thing you should do is set
-     the policy_index on the tunnel after everything is set in ip6_sr_main_t.
-     If this is deemed overly cautious, could set this in the vec_len(tunnel_names) loop.
-   */
-  for (i = 0; i < vec_len (policy->tunnel_indices); i++)
-    {
-      t = pool_elt_at_index (sm->tunnels, policy->tunnel_indices[i]);
-      t->policy_index = policy - sm->policies;
-    }
-
-  return 0;
-}
-
-/**
- * @brief CLI Parser for Add or Delete a Segment Routing policy
- *
- * @param vm vlib_main_t *
- * @param input unformat_input_t *
- * @param cmd vlib_cli_command_t *
- *
- * @return error clib_error_t *
- */
-static clib_error_t *
-sr_add_del_policy_command_fn (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cmd)
-{
-  int is_del = 0;
-  u8 **tunnel_names = 0;
-  u8 *tunnel_name = 0;
-  u8 *name = 0;
-  ip6_sr_add_del_policy_args_t _a, *a = &_a;
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	is_del = 1;
-      else if (unformat (input, "name %s", &name))
-	;
-      else if (unformat (input, "tunnel %s", &tunnel_name))
-	{
-	  if (tunnel_name)
-	    {
-	      vec_add1 (tunnel_names, tunnel_name);
-	      tunnel_name = 0;
-	    }
-	}
-      else
-	break;
-    }
-
-  if (!name)
-    return clib_error_return (0, "name of SR policy required");
-
-
-  memset (a, 0, sizeof (*a));
-
-  a->is_del = is_del;
-  a->name = name;
-  a->tunnel_names = tunnel_names;
-
-  rv = ip6_sr_add_del_policy (a);
-
-  vec_free (tunnel_names);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    case -3:
-      return clib_error_return (0,
-				"tunnel name to associate to SR policy is required");
-
-    case -4:
-      return clib_error_return (0, "tunnel name not found");
-
-    case -5:
-      return clib_error_return (0, "tunnel already associated with policy");
-
-    case -6:
-      return clib_error_return (0, "policy name %s not found", name);
-
-    case -7:
-      return clib_error_return (0, "TODO: deleting policy name %s", name);
-
-    default:
-      return clib_error_return (0, "BUG: ip6_sr_add_del_policy returns %d",
-				rv);
-
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (sr_policy_command, static) = {
-    .path = "sr policy",
-    .short_help =
-    "sr policy [del] name <policy-name> tunnel <sr-tunnel-name> [tunnel <sr-tunnel-name>]*",
-    .function = sr_add_del_policy_command_fn,
-};
-/* *INDENT-ON* */
-
-/**
- * @brief CLI Parser for Displaying Segment Routing policy
- *
- * @param vm vlib_main_t *
- * @param input unformat_input_t *
- * @param cmd vlib_cli_command_t *
- *
- * @return error clib_error_t *
- */
-static clib_error_t *
-show_sr_policy_fn (vlib_main_t * vm,
-		   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  static ip6_sr_policy_t **policies;
-  ip6_sr_policy_t *policy;
-  ip6_sr_tunnel_t *t;
-  ip6_sr_main_t *sm = &sr_main;
-  int i, j;
-  uword *p = 0;
-  u8 *name = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "name %s", &name))
-	{
-	  p = hash_get_mem (sm->policy_index_by_policy_name, name);
-	  if (!p)
-	    vlib_cli_output (vm,
-			     "policy with name %s not found. Showing all.",
-			     name);
-	}
-      else
-	break;
-    }
-
-  vec_reset_length (policies);
-
-  if (!p)			/* Either name parm not passed or no policy with that name found, show all */
-    {
-      /* *INDENT-OFF* */
-  pool_foreach (policy, sm->policies,
-  ({
-    vec_add1 (policies, policy);
-  }));
-  /* *INDENT-ON* */
-    }
-  else				/* Just show the one policy by name and a summary of tunnel names */
-    {
-      policy = pool_elt_at_index (sm->policies, p[0]);
-      vec_add1 (policies, policy);
-    }
-
-  if (vec_len (policies) == 0)
-    vlib_cli_output (vm, "No SR policies configured");
-
-  for (i = 0; i < vec_len (policies); i++)
-    {
-      policy = policies[i];
-
-      if (policy->name)
-	vlib_cli_output (vm, "SR policy name: %s", (char *) policy->name);
-      for (j = 0; j < vec_len (policy->tunnel_indices); j++)
-	{
-	  t = pool_elt_at_index (sm->tunnels, policy->tunnel_indices[j]);
-	  ip6_sr_tunnel_display (vm, t);
-	}
-    }
-
-  return 0;
-
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_sr_policy_command, static) = {
-    .path = "show sr policy",
-    .short_help = "show sr policy [name <sr-policy-name>]",
-    .function = show_sr_policy_fn,
-};
-/* *INDENT-ON* */
-
-/**
- * @brief Add or Delete a mapping of IP6 multicast address
- * to Segment Routing policy.
- *
- * @param a ip6_sr_add_del_multicastmap_args_t *
- *
- * @return retval int
- */
-int
-ip6_sr_add_del_multicastmap (ip6_sr_add_del_multicastmap_args_t * a)
-{
-  uword *p;
-  ip6_sr_tunnel_t *t;
-  ip6_sr_main_t *sm = &sr_main;
-  ip6_sr_policy_t *pt;
-
-  if (a->is_del)
-    {
-      /* clean up the adjacency */
-      p =
-	hash_get_mem (sm->policy_index_by_multicast_address,
-		      a->multicast_address);
-    }
-  else
-    {
-      /* Get our policy by policy_name */
-      p = hash_get_mem (sm->policy_index_by_policy_name, a->policy_name);
-
-    }
-  if (!p)
-    return -1;
-
-  pt = pool_elt_at_index (sm->policies, p[0]);
-
-  /*
-     Get the first tunnel associated with policy populate the fib adjacency.
-     From there, since this tunnel will have it's policy_index != ~0 it will
-     be the trigger in the dual_loop to pull up the policy and make a copy-rewrite
-     for each tunnel in the policy
-   */
-
-  t = pool_elt_at_index (sm->tunnels, pt->tunnel_indices[0]);
-
-  /*
-   * Stick the tunnel index into the rewrite header.
-   *
-   * Unfortunately, inserting an SR header according to the various
-   * RFC's requires parsing through the ip6 header, perhaps consing a
-   * buffer onto the head of the vlib_buffer_t, etc. We don't use the
-   * normal reverse bcopy rewrite code.
-   *
-   * We don't handle ugly RFC-related cases yet, but I'm sure PL will complain
-   * at some point...
-   */
-  dpo_id_t dpo = DPO_INVALID;
-
-  dpo_set (&dpo, sr_dpo_type, DPO_PROTO_IP6, t - sm->tunnels);
-
-  /* Construct a FIB entry for multicast using the rx/tx fib from the first tunnel */
-  fib_prefix_t pfx = {
-    .fp_proto = FIB_PROTOCOL_IP6,
-    .fp_len = 128,
-    .fp_addr = {
-		.ip6 = *a->multicast_address,
-		}
-  };
-  fib_table_entry_special_dpo_add (t->rx_fib_index,
-				   &pfx,
-				   FIB_SOURCE_SR,
-				   FIB_ENTRY_FLAG_EXCLUSIVE, &dpo);
-  dpo_reset (&dpo);
-
-  u8 *mcast_copy = 0;
-  mcast_copy = vec_new (ip6_address_t, 1);
-  memcpy (mcast_copy, a->multicast_address, sizeof (ip6_address_t));
-
-  if (a->is_del)
-    {
-      hash_unset_mem (sm->policy_index_by_multicast_address, mcast_copy);
-      vec_free (mcast_copy);
-      return 0;
-    }
-  /* else */
-
-  hash_set_mem (sm->policy_index_by_multicast_address, mcast_copy,
-		pt - sm->policies);
-
-
-  return 0;
-}
-
-/**
- * @brief CLI Parser for Adding or Delete a mapping of IP6 multicast address
- * to Segment Routing policy.
- *
- * @param vm vlib_main_t *
- * @param input unformat_input_t *
- * @param cmd vlib_cli_command_t *
- *
- * @return error clib_error_t *
- */
-static clib_error_t *
-sr_add_del_multicast_map_command_fn (vlib_main_t * vm,
-				     unformat_input_t * input,
-				     vlib_cli_command_t * cmd)
-{
-  int is_del = 0;
-  ip6_address_t multicast_address;
-  u8 *policy_name = 0;
-  int multicast_address_set = 0;
-  ip6_sr_add_del_multicastmap_args_t _a, *a = &_a;
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	is_del = 1;
-      else
-	if (unformat
-	    (input, "address %U", unformat_ip6_address, &multicast_address))
-	multicast_address_set = 1;
-      else if (unformat (input, "sr-policy %s", &policy_name))
-	;
-      else
-	break;
-    }
-
-  if (!is_del && !policy_name)
-    return clib_error_return (0, "name of sr policy required");
-
-  if (!multicast_address_set)
-    return clib_error_return (0, "multicast address required");
-
-  memset (a, 0, sizeof (*a));
-
-  a->is_del = is_del;
-  a->multicast_address = &multicast_address;
-  a->policy_name = policy_name;
-
-#if DPDK > 0			/*Cannot call replicate or configure multicast map yet without DPDK */
-  rv = ip6_sr_add_del_multicastmap (a);
-#else
-  return clib_error_return (0,
-			    "cannot use multicast replicate spray case without DPDK installed");
-#endif /* DPDK */
-
-  switch (rv)
-    {
-    case 0:
-      break;
-    case -1:
-      return clib_error_return (0, "no policy with name: %s", policy_name);
-
-    case -2:
-      return clib_error_return (0, "multicast map someting ");
-
-    case -3:
-      return clib_error_return (0,
-				"tunnel name to associate to SR policy is required");
-
-    case -7:
-      return clib_error_return (0, "TODO: deleting policy name %s",
-				policy_name);
-
-    default:
-      return clib_error_return (0, "BUG: ip6_sr_add_del_policy returns %d",
-				rv);
-
-    }
-  return 0;
-
-}
-
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (sr_multicast_map_command, static) = {
-    .path = "sr multicast-map",
-    .short_help =
-    "sr multicast-map address <multicast-ip6-address> sr-policy <sr-policy-name> [del]",
-    .function = sr_add_del_multicast_map_command_fn,
-};
-/* *INDENT-ON* */
-
-/**
- * @brief CLI Parser for Displaying a mapping of IP6 multicast address
- * to Segment Routing policy.
- *
- * @param vm vlib_main_t *
- * @param input unformat_input_t *
- * @param cmd vlib_cli_command_t *
- *
- * @return error clib_error_t *
- */
-static clib_error_t *
-show_sr_multicast_map_fn (vlib_main_t * vm,
-			  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  ip6_sr_main_t *sm = &sr_main;
-  u8 *key = 0;
-  u32 value;
-  ip6_address_t multicast_address;
-  ip6_sr_policy_t *pt;
-
-  /* pull all entries from the hash table into vector for display */
-
-  /* *INDENT-OFF* */
-  hash_foreach_mem (key, value, sm->policy_index_by_multicast_address,
-  ({
-    if (!key)
-	vlib_cli_output (vm, "no multicast maps configured");
-    else
-      {
-	multicast_address = *((ip6_address_t *)key);
-	pt = pool_elt_at_index (sm->policies, value);
-	if (pt)
-	  {
-	    vlib_cli_output (vm, "address: %U policy: %s",
-			     format_ip6_address, &multicast_address,
-			     pt->name);
-	  }
-	else
-	  vlib_cli_output (vm, "BUG: policy not found for address: %U with policy index %d",
-			     format_ip6_address, &multicast_address,
-			     value);
-
-      }
-
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_sr_multicast_map_command, static) = {
-    .path = "show sr multicast-map",
-    .short_help = "show sr multicast-map",
-    .function = show_sr_multicast_map_fn,
-};
-/* *INDENT-ON* */
-
-
-#define foreach_sr_fix_dst_addr_next            \
-_(DROP, "error-drop")
-
-/**
- * @brief Struct for valid next-nodes for SR fix destination address node
- */
-typedef enum
-{
-#define _(s,n) SR_FIX_DST_ADDR_NEXT_##s,
-  foreach_sr_fix_dst_addr_next
-#undef _
-    SR_FIX_DST_ADDR_N_NEXT,
-} sr_fix_dst_addr_next_t;
-
-/**
- * @brief Error strings for SR Fix Destination rewrite
- */
-static char *sr_fix_dst_error_strings[] = {
-#define sr_fix_dst_error(n,s) s,
-#include "sr_fix_dst_error.def"
-#undef sr_fix_dst_error
-};
-
-/**
- * @brief Struct for errors for SR Fix Destination rewrite
- */
-typedef enum
-{
-#define sr_fix_dst_error(n,s) SR_FIX_DST_ERROR_##n,
-#include "sr_fix_dst_error.def"
-#undef sr_fix_dst_error
-  SR_FIX_DST_N_ERROR,
-} sr_fix_dst_error_t;
-
-/**
- * @brief Information for fix address trace
- */
-typedef struct
-{
-  ip6_address_t src, dst;
-  u32 next_index;
-  u32 adj_index;
-  u8 sr[256];
-} sr_fix_addr_trace_t;
-
-/**
- * @brief Formatter for fix address trace
- */
-u8 *
-format_sr_fix_addr_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  sr_fix_addr_trace_t *t = va_arg (*args, sr_fix_addr_trace_t *);
-  vnet_hw_interface_t *hi = 0;
-  ip_adjacency_t *adj;
-  ip6_main_t *im = &ip6_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-  vnet_main_t *vnm = vnet_get_main ();
-
-  if (t->adj_index != ~0)
-    {
-      adj = ip_get_adjacency (lm, t->adj_index);
-      hi = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index);
-    }
-
-  s = format (s, "SR-FIX_ADDR: next %s ip6 src %U dst %U\n",
-	      (t->next_index == SR_FIX_DST_ADDR_NEXT_DROP)
-	      ? "drop" : "output",
-	      format_ip6_address, &t->src, format_ip6_address, &t->dst);
-  if (t->next_index != SR_FIX_DST_ADDR_NEXT_DROP)
-    {
-      s =
-	format (s, "%U\n", format_ip6_sr_header, t->sr, 1 /* print_hmac */ );
-      s =
-	format (s, "   output via %s",
-		hi ? (char *) (hi->name) : "Invalid adj");
-    }
-  return s;
-}
-
-/**
- * @brief Fix SR destination address - dual-loop
- *
- * @node sr-fix-dst-addr
- * @param vm vlib_main_t *
- * @param node vlib_node_runtime_t *
- * @param from_frame vlib_frame_t *
- *
- * @return from_frame->n_vectors uword
- */
-static uword
-sr_fix_dst_addr (vlib_main_t * vm,
-		 vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  u32 n_left_from, next_index, *from, *to_next;
-  ip6_main_t *im = &ip6_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-#if 0
-      while (0 && n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  __attribute__ ((unused)) vlib_buffer_t *b0, *b1;
-	  u32 next0 = SR_FIX_DST_ADDR_NEXT_DROP;
-	  u32 next1 = SR_FIX_DST_ADDR_NEXT_DROP;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-#endif
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  ip6_header_t *ip0;
-	  ip_adjacency_t *adj0;
-	  ip6_sr_header_t *sr0;
-	  u32 next0 = SR_FIX_DST_ADDR_NEXT_DROP;
-	  ip6_address_t *new_dst0;
-	  ethernet_header_t *eh0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  adj0 =
-	    ip_get_adjacency (lm, vnet_buffer (b0)->ip.adj_index[VLIB_TX]);
-	  next0 = adj0->mcast_group_index;
-
-	  /* We should be pointing at an Ethernet header... */
-	  eh0 = vlib_buffer_get_current (b0);
-	  ip0 = (ip6_header_t *) (eh0 + 1);
-	  sr0 = (ip6_sr_header_t *) (ip0 + 1);
-
-	  /* We'd better find an SR header... */
-	  if (PREDICT_FALSE (ip0->protocol != IPPROTO_IPV6_ROUTE))
-	    {
-	      b0->error = node->errors[SR_FIX_DST_ERROR_NO_SR_HEADER];
-	      goto do_trace0;
-	    }
-	  else
-	    {
-	      /*
-	       * We get here from sr_rewrite or sr_local, with
-	       * sr->segments_left pointing at the (copy of the original) dst
-	       * address. Use it, then increment sr0->segments_left.
-	       */
-
-	      /* Out of segments? Turf the packet */
-	      if (PREDICT_FALSE (sr0->segments_left == 0))
-		{
-		  b0->error = node->errors[SR_FIX_DST_ERROR_NO_MORE_SEGMENTS];
-		  goto do_trace0;
-		}
-
-	      /*
-	       * Rewrite the packet with the original dst address
-	       * We assume that the last segment (in processing order) contains
-	       * the original dst address. The list is reversed, so sr0->segments
-	       * contains the original dst address.
-	       */
-	      new_dst0 = sr0->segments;
-	      ip0->dst_address.as_u64[0] = new_dst0->as_u64[0];
-	      ip0->dst_address.as_u64[1] = new_dst0->as_u64[1];
-	    }
-
-	do_trace0:
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      sr_fix_addr_trace_t *t = vlib_add_trace (vm, node,
-						       b0, sizeof (*t));
-	      t->next_index = next0;
-	      t->adj_index = ~0;
-
-	      if (next0 != SR_FIX_DST_ADDR_NEXT_DROP)
-		{
-		  t->adj_index = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
-		  clib_memcpy (t->src.as_u8, ip0->src_address.as_u8,
-			       sizeof (t->src.as_u8));
-		  clib_memcpy (t->dst.as_u8, ip0->dst_address.as_u8,
-			       sizeof (t->dst.as_u8));
-		  clib_memcpy (t->sr, sr0, sizeof (t->sr));
-		}
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  return from_frame->n_vectors;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (sr_fix_dst_addr_node) = {
-  .function = sr_fix_dst_addr,
-  .name = "sr-fix-dst-addr",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-  .format_trace = format_sr_fix_addr_trace,
-  .format_buffer = format_ip6_sr_header_with_length,
-
-  .runtime_data_bytes = 0,
-
-  .n_errors = SR_FIX_DST_N_ERROR,
-  .error_strings = sr_fix_dst_error_strings,
-
-  .n_next_nodes = SR_FIX_DST_ADDR_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [SR_FIX_DST_ADDR_NEXT_##s] = n,
-    foreach_sr_fix_dst_addr_next
-#undef _
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (sr_fix_dst_addr_node, sr_fix_dst_addr)
-/* *INDENT-ON* */
-
-static clib_error_t *
-sr_init (vlib_main_t * vm)
-{
-  ip6_sr_main_t *sm = &sr_main;
-  clib_error_t *error = 0;
-  vlib_node_t *ip6_lookup_node, *ip6_rewrite_node;
-
-  if ((error = vlib_call_init_function (vm, ip_main_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip6_lookup_init)))
-    return error;
-
-  sm->vlib_main = vm;
-  sm->vnet_main = vnet_get_main ();
-
-  vec_validate (sm->hmac_keys, 0);
-  sm->hmac_keys[0].shared_secret = (u8 *) 0xdeadbeef;
-
-  sm->tunnel_index_by_key =
-    hash_create_mem (0, sizeof (ip6_sr_tunnel_key_t), sizeof (uword));
-
-  sm->tunnel_index_by_name = hash_create_string (0, sizeof (uword));
-
-  sm->policy_index_by_policy_name = hash_create_string (0, sizeof (uword));
-
-  sm->policy_index_by_multicast_address =
-    hash_create_mem (0, sizeof (ip6_address_t), sizeof (uword));
-
-  sm->hmac_key_by_shared_secret = hash_create_string (0, sizeof (uword));
-
-  ip6_register_protocol (IPPROTO_IPV6_ROUTE, sr_local_node.index);
-
-  ip6_lookup_node = vlib_get_node_by_name (vm, (u8 *) "ip6-lookup");
-  ASSERT (ip6_lookup_node);
-
-  ip6_rewrite_node = vlib_get_node_by_name (vm, (u8 *) "ip6-rewrite");
-  ASSERT (ip6_rewrite_node);
-
-#if DPDK > 0			/* Cannot run replicate without DPDK */
-  /* Add a disposition to sr_replicate for the sr multicast replicate node */
-  sm->ip6_lookup_sr_replicate_index =
-    vlib_node_add_next (vm, ip6_lookup_node->index, sr_replicate_node.index);
-#endif /* DPDK */
-
-  /* Add a disposition to ip6_rewrite for the sr dst address hack node */
-  sm->ip6_rewrite_sr_next_index =
-    vlib_node_add_next (vm, ip6_rewrite_node->index,
-			sr_fix_dst_addr_node.index);
-
-  OpenSSL_add_all_digests ();
-
-  sm->md = (void *) EVP_get_digestbyname ("sha1");
-  sm->hmac_ctx = clib_mem_alloc (sizeof (HMAC_CTX));
-
-  sr_dpo_type = dpo_register_new_type (&sr_vft, sr_nodes);
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (sr_init);
-
-/**
- * @brief Definition of next-nodes for SR local
- */
-#define foreach_sr_local_next                   \
-  _ (ERROR, "error-drop")                       \
-  _ (IP6_LOOKUP, "ip6-lookup")
-
-/**
- * @brief Struct for definition of next-nodes for SR local
- */
-typedef enum
-{
-#define _(s,n) SR_LOCAL_NEXT_##s,
-  foreach_sr_local_next
-#undef _
-    SR_LOCAL_N_NEXT,
-} sr_local_next_t;
-
-/**
- * @brief Struct for packet trace of SR local
- */
-typedef struct
-{
-  u8 next_index;
-  u8 sr_valid;
-  ip6_address_t src, dst;
-  u16 length;
-  u8 sr[256];
-} sr_local_trace_t;
-
-/**
- * @brief Definition of SR local error-strings
- */
-static char *sr_local_error_strings[] = {
-#define sr_error(n,s) s,
-#include "sr_error.def"
-#undef sr_error
-};
-
-/**
- * @brief Struct for definition of SR local error-strings
- */
-typedef enum
-{
-#define sr_error(n,s) SR_LOCAL_ERROR_##n,
-#include "sr_error.def"
-#undef sr_error
-  SR_LOCAL_N_ERROR,
-} sr_local_error_t;
-
-/**
- * @brief Format SR local trace
- *
- * @param s u8 *
- * @param args va_list *
- *
- * @return s u8 *
- */
-u8 *
-format_sr_local_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  sr_local_trace_t *t = va_arg (*args, sr_local_trace_t *);
-
-  s = format (s, "SR-LOCAL: src %U dst %U len %u next_index %d",
-	      format_ip6_address, &t->src,
-	      format_ip6_address, &t->dst, t->length, t->next_index);
-  if (t->sr_valid)
-    s =
-      format (s, "\n  %U", format_ip6_sr_header, t->sr, 1 /* print_hmac */ );
-  else
-    s = format (s, "\n  popped SR header");
-
-  return s;
-}
-
-
-/* $$$$ fixme: smp, don't copy data, cache input, output (maybe) */
-/**
- * @brief Validate the SR HMAC
- *
- * @param sm ip6_sr_main_t *
- * @param ip ip6_header_t *
- * @param sr ip6_sr_header_t *
- *
- * @return retval int
- */
-static int
-sr_validate_hmac (ip6_sr_main_t * sm, ip6_header_t * ip, ip6_sr_header_t * sr)
-{
-  u32 key_index;
-  static u8 *keybuf;
-  u8 *copy_target;
-  int first_segment;
-  ip6_address_t *addrp;
-  int i;
-  ip6_sr_hmac_key_t *hmac_key;
-  static u8 *signature;
-  u32 sig_len;
-
-  key_index = sr->hmac_key;
-
-  /* No signature? Pass... */
-  if (key_index == 0)
-    return 0;
-
-  /* We don't know about this key? Fail... */
-  if (key_index >= vec_len (sm->hmac_keys))
-    return 1;
-
-  vec_validate (signature, SHA256_DIGEST_LENGTH - 1);
-
-  hmac_key = sm->hmac_keys + key_index;
-
-  vec_reset_length (keybuf);
-
-  /* pkt ip6 src address */
-  vec_add2 (keybuf, copy_target, sizeof (ip6_address_t));
-  clib_memcpy (copy_target, ip->src_address.as_u8, sizeof (ip6_address_t));
-
-  /* last segment */
-  vec_add2 (keybuf, copy_target, 1);
-  copy_target[0] = sr->first_segment;
-
-  /* octet w/ bit 0 = "clean" flag */
-  vec_add2 (keybuf, copy_target, 1);
-  copy_target[0]
-    = (sr->flags & clib_host_to_net_u16 (IP6_SR_HEADER_FLAG_CLEANUP))
-    ? 0x80 : 0;
-
-  /* hmac key id */
-  vec_add2 (keybuf, copy_target, 1);
-  copy_target[0] = sr->hmac_key;
-
-  first_segment = sr->first_segment;
-
-  addrp = sr->segments;
-
-  /* segments */
-  for (i = 0; i <= first_segment; i++)
-    {
-      vec_add2 (keybuf, copy_target, sizeof (ip6_address_t));
-      clib_memcpy (copy_target, addrp->as_u8, sizeof (ip6_address_t));
-      addrp++;
-    }
-
-  if (sm->is_debug)
-    clib_warning ("verify key index %d keybuf: %U", key_index,
-		  format_hex_bytes, keybuf, vec_len (keybuf));
-
-  /* shared secret */
-
-  /* SHA1 is shorter than SHA-256 */
-  memset (signature, 0, vec_len (signature));
-
-  HMAC_CTX_init (sm->hmac_ctx);
-  if (!HMAC_Init (sm->hmac_ctx, hmac_key->shared_secret,
-		  vec_len (hmac_key->shared_secret), sm->md))
-    clib_warning ("barf1");
-  if (!HMAC_Update (sm->hmac_ctx, keybuf, vec_len (keybuf)))
-    clib_warning ("barf2");
-  if (!HMAC_Final (sm->hmac_ctx, signature, &sig_len))
-    clib_warning ("barf3");
-  HMAC_CTX_cleanup (sm->hmac_ctx);
-
-  if (sm->is_debug)
-    clib_warning ("computed signature len %d, value %U", sig_len,
-		  format_hex_bytes, signature, vec_len (signature));
-
-  /* Point at the SHA signature in the packet */
-  addrp++;
-  if (sm->is_debug)
-    clib_warning ("read signature %U", format_hex_bytes, addrp,
-		  SHA256_DIGEST_LENGTH);
-
-  return memcmp (signature, addrp, SHA256_DIGEST_LENGTH);
-}
-
-/**
- * @brief SR local node
- * @node sr-local
- *
- * @param vm vlib_main_t *
- * @param node vlib_node_runtime_t *
- * @param from_frame vlib_frame_t *
- *
- * @return from_frame->n_vectors uword
- */
-static uword
-sr_local (vlib_main_t * vm,
-	  vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  u32 n_left_from, next_index, *from, *to_next;
-  ip6_sr_main_t *sm = &sr_main;
-  u32 (*sr_local_cb) (vlib_main_t *, vlib_node_runtime_t *,
-		      vlib_buffer_t *, ip6_header_t *, ip6_sr_header_t *);
-  sr_local_cb = sm->sr_local_cb;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  ip6_header_t *ip0, *ip1;
-	  ip6_sr_header_t *sr0, *sr1;
-	  ip6_address_t *new_dst0, *new_dst1;
-	  u32 next0 = SR_LOCAL_NEXT_IP6_LOOKUP;
-	  u32 next1 = SR_LOCAL_NEXT_IP6_LOOKUP;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
-	    CLIB_PREFETCH (p3->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  ip0 = vlib_buffer_get_current (b0);
-	  sr0 = (ip6_sr_header_t *) (ip0 + 1);
-	  if (PREDICT_FALSE
-	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-	    {
-	      ip6_hop_by_hop_ext_t *ext_hdr =
-		(ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
-	      sr0 =
-		(ip6_sr_header_t *) ip6_ext_next_header ((ip6_ext_header_t *)
-							 ext_hdr);
-	    }
-
-	  if (PREDICT_FALSE (sr0->type != ROUTING_HEADER_TYPE_SR))
-	    {
-	      next0 = SR_LOCAL_NEXT_ERROR;
-	      b0->error =
-		node->errors[SR_LOCAL_ERROR_BAD_ROUTING_HEADER_TYPE];
-	      goto do_trace0;
-	    }
-
-	  /* Out of segments? Turf the packet */
-	  if (PREDICT_FALSE (sr0->segments_left == 0))
-	    {
-	      next0 = SR_LOCAL_NEXT_ERROR;
-	      b0->error = node->errors[SR_LOCAL_ERROR_NO_MORE_SEGMENTS];
-	      goto do_trace0;
-	    }
-
-	  if (PREDICT_FALSE (sm->validate_hmac))
-	    {
-	      if (sr_validate_hmac (sm, ip0, sr0))
-		{
-		  next0 = SR_LOCAL_NEXT_ERROR;
-		  b0->error = node->errors[SR_LOCAL_ERROR_HMAC_INVALID];
-		  goto do_trace0;
-		}
-	    }
-
-	  next0 = sr_local_cb ? sr_local_cb (vm, node, b0, ip0, sr0) : next0;
-
-	  /*
-	   * To suppress rewrite, return ~SR_LOCAL_NEXT_xxx
-	   */
-	  if (PREDICT_FALSE (next0 & 0x80000000))
-	    {
-	      next0 ^= 0xFFFFFFFF;
-	      if (PREDICT_FALSE (next0 == SR_LOCAL_NEXT_ERROR))
-		b0->error = node->errors[SR_LOCAL_ERROR_APP_CALLBACK];
-	    }
-	  else
-	    {
-	      u32 segment_index0;
-
-	      segment_index0 = sr0->segments_left - 1;
-
-	      /* Rewrite the packet */
-	      new_dst0 = (ip6_address_t *) (sr0->segments + segment_index0);
-	      ip0->dst_address.as_u64[0] = new_dst0->as_u64[0];
-	      ip0->dst_address.as_u64[1] = new_dst0->as_u64[1];
-
-	      if (PREDICT_TRUE (sr0->segments_left > 0))
-		sr0->segments_left -= 1;
-	    }
-
-	  /* End of the path. Clean up the SR header, or not */
-	  if (PREDICT_FALSE
-	      (sr0->segments_left == 0 &&
-	       (sr0->flags &
-		clib_host_to_net_u16 (IP6_SR_HEADER_FLAG_CLEANUP))))
-	    {
-	      u64 *copy_dst0, *copy_src0;
-	      u16 new_l0;
-	      u32 copy_len_u64s0 = 0;
-	      int i;
-
-	      /*
-	       * Copy the ip6 header right by the (real) length of the
-	       * sr header.
-	       */
-	      if (PREDICT_FALSE
-		  (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-		{
-		  ip6_hop_by_hop_ext_t *ext_hdr =
-		    (ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
-		  copy_len_u64s0 =
-		    (((ip6_ext_header_t *) ext_hdr)->n_data_u64s) + 1;
-		  ext_hdr->next_hdr = sr0->protocol;
-		}
-	      else
-		{
-		  ip0->protocol = sr0->protocol;
-		}
-	      vlib_buffer_advance (b0, (sr0->length + 1) * 8);
-
-	      new_l0 = clib_net_to_host_u16 (ip0->payload_length) -
-		(sr0->length + 1) * 8;
-	      ip0->payload_length = clib_host_to_net_u16 (new_l0);
-
-	      copy_src0 = (u64 *) ip0;
-	      copy_dst0 = copy_src0 + (sr0->length + 1);
-
-	      copy_dst0[4 + copy_len_u64s0] = copy_src0[4 + copy_len_u64s0];
-	      copy_dst0[3 + copy_len_u64s0] = copy_src0[3 + copy_len_u64s0];
-	      copy_dst0[2 + copy_len_u64s0] = copy_src0[2 + copy_len_u64s0];
-	      copy_dst0[1 + copy_len_u64s0] = copy_src0[1 + copy_len_u64s0];
-	      copy_dst0[0 + copy_len_u64s0] = copy_src0[0 + copy_len_u64s0];
-
-	      for (i = copy_len_u64s0 - 1; i >= 0; i--)
-		{
-		  copy_dst0[i] = copy_src0[i];
-		}
-
-	      sr0 = 0;
-	    }
-
-	do_trace0:
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      sr_local_trace_t *tr = vlib_add_trace (vm, node,
-						     b0, sizeof (*tr));
-	      clib_memcpy (tr->src.as_u8, ip0->src_address.as_u8,
-			   sizeof (tr->src.as_u8));
-	      clib_memcpy (tr->dst.as_u8, ip0->dst_address.as_u8,
-			   sizeof (tr->dst.as_u8));
-	      tr->length = vlib_buffer_length_in_chain (vm, b0);
-	      tr->next_index = next0;
-	      tr->sr_valid = sr0 != 0;
-	      if (tr->sr_valid)
-		clib_memcpy (tr->sr, sr0, sizeof (tr->sr));
-	    }
-
-	  b1 = vlib_get_buffer (vm, bi1);
-	  ip1 = vlib_buffer_get_current (b1);
-	  sr1 = (ip6_sr_header_t *) (ip1 + 1);
-	  if (PREDICT_FALSE
-	      (ip1->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-	    {
-
-	      ip6_hop_by_hop_ext_t *ext_hdr =
-		(ip6_hop_by_hop_ext_t *) ip6_next_header (ip1);
-	      sr1 =
-		(ip6_sr_header_t *) ip6_ext_next_header ((ip6_ext_header_t *)
-							 ext_hdr);
-	    }
-
-	  if (PREDICT_FALSE (sr1->type != ROUTING_HEADER_TYPE_SR))
-	    {
-	      next1 = SR_LOCAL_NEXT_ERROR;
-	      b1->error =
-		node->errors[SR_LOCAL_ERROR_BAD_ROUTING_HEADER_TYPE];
-	      goto do_trace1;
-	    }
-
-	  /* Out of segments? Turf the packet */
-	  if (PREDICT_FALSE (sr1->segments_left == 0))
-	    {
-	      next1 = SR_LOCAL_NEXT_ERROR;
-	      b1->error = node->errors[SR_LOCAL_ERROR_NO_MORE_SEGMENTS];
-	      goto do_trace1;
-	    }
-
-	  if (PREDICT_FALSE (sm->validate_hmac))
-	    {
-	      if (sr_validate_hmac (sm, ip1, sr1))
-		{
-		  next1 = SR_LOCAL_NEXT_ERROR;
-		  b1->error = node->errors[SR_LOCAL_ERROR_HMAC_INVALID];
-		  goto do_trace1;
-		}
-	    }
-
-	  next1 = sr_local_cb ? sr_local_cb (vm, node, b1, ip1, sr1) : next1;
-
-	  /*
-	   * To suppress rewrite, return ~SR_LOCAL_NEXT_xxx
-	   */
-	  if (PREDICT_FALSE (next1 & 0x80000000))
-	    {
-	      next1 ^= 0xFFFFFFFF;
-	      if (PREDICT_FALSE (next1 == SR_LOCAL_NEXT_ERROR))
-		b1->error = node->errors[SR_LOCAL_ERROR_APP_CALLBACK];
-	    }
-	  else
-	    {
-	      u32 segment_index1;
-
-	      segment_index1 = sr1->segments_left - 1;
-
-	      /* Rewrite the packet */
-	      new_dst1 = (ip6_address_t *) (sr1->segments + segment_index1);
-	      ip1->dst_address.as_u64[0] = new_dst1->as_u64[0];
-	      ip1->dst_address.as_u64[1] = new_dst1->as_u64[1];
-
-	      if (PREDICT_TRUE (sr1->segments_left > 0))
-		sr1->segments_left -= 1;
-	    }
-
-	  /* End of the path. Clean up the SR header, or not */
-	  if (PREDICT_FALSE
-	      (sr1->segments_left == 0 &&
-	       (sr1->flags &
-		clib_host_to_net_u16 (IP6_SR_HEADER_FLAG_CLEANUP))))
-	    {
-	      u64 *copy_dst1, *copy_src1;
-	      u16 new_l1;
-	      u32 copy_len_u64s1 = 0;
-	      int i;
-
-	      /*
-	       * Copy the ip6 header right by the (real) length of the
-	       * sr header.
-	       */
-	      if (PREDICT_FALSE
-		  (ip1->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-		{
-		  ip6_hop_by_hop_ext_t *ext_hdr =
-		    (ip6_hop_by_hop_ext_t *) ip6_next_header (ip1);
-		  copy_len_u64s1 =
-		    (((ip6_ext_header_t *) ext_hdr)->n_data_u64s) + 1;
-		  ext_hdr->next_hdr = sr1->protocol;
-		}
-	      else
-		{
-		  ip1->protocol = sr1->protocol;
-		}
-	      vlib_buffer_advance (b1, (sr1->length + 1) * 8);
-
-	      new_l1 = clib_net_to_host_u16 (ip1->payload_length) -
-		(sr1->length + 1) * 8;
-	      ip1->payload_length = clib_host_to_net_u16 (new_l1);
-
-	      copy_src1 = (u64 *) ip1;
-	      copy_dst1 = copy_src1 + (sr1->length + 1);
-
-	      copy_dst1[4 + copy_len_u64s1] = copy_src1[4 + copy_len_u64s1];
-	      copy_dst1[3 + copy_len_u64s1] = copy_src1[3 + copy_len_u64s1];
-	      copy_dst1[2 + copy_len_u64s1] = copy_src1[2 + copy_len_u64s1];
-	      copy_dst1[1 + copy_len_u64s1] = copy_src1[1 + copy_len_u64s1];
-	      copy_dst1[0 + copy_len_u64s1] = copy_src1[0 + copy_len_u64s1];
-
-	      for (i = copy_len_u64s1 - 1; i >= 0; i--)
-		{
-		  copy_dst1[i] = copy_src1[i];
-		}
-
-	      sr1 = 0;
-	    }
-
-	do_trace1:
-	  if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      sr_local_trace_t *tr = vlib_add_trace (vm, node,
-						     b1, sizeof (*tr));
-	      clib_memcpy (tr->src.as_u8, ip1->src_address.as_u8,
-			   sizeof (tr->src.as_u8));
-	      clib_memcpy (tr->dst.as_u8, ip1->dst_address.as_u8,
-			   sizeof (tr->dst.as_u8));
-	      tr->length = vlib_buffer_length_in_chain (vm, b1);
-	      tr->next_index = next1;
-	      tr->sr_valid = sr1 != 0;
-	      if (tr->sr_valid)
-		clib_memcpy (tr->sr, sr1, sizeof (tr->sr));
-	    }
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  ip6_header_t *ip0 = 0;
-	  ip6_sr_header_t *sr0;
-	  ip6_address_t *new_dst0;
-	  u32 next0 = SR_LOCAL_NEXT_IP6_LOOKUP;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  ip0 = vlib_buffer_get_current (b0);
-	  sr0 = (ip6_sr_header_t *) (ip0 + 1);
-
-	  if (PREDICT_FALSE
-	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-	    {
-	      ip6_hop_by_hop_ext_t *ext_hdr =
-		(ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
-	      sr0 =
-		(ip6_sr_header_t *) ip6_ext_next_header ((ip6_ext_header_t *)
-							 ext_hdr);
-	    }
-	  if (PREDICT_FALSE (sr0->type != ROUTING_HEADER_TYPE_SR))
-	    {
-	      next0 = SR_LOCAL_NEXT_ERROR;
-	      b0->error =
-		node->errors[SR_LOCAL_ERROR_BAD_ROUTING_HEADER_TYPE];
-	      goto do_trace;
-	    }
-
-	  /* Out of segments? Turf the packet */
-	  if (PREDICT_FALSE (sr0->segments_left == 0))
-	    {
-	      next0 = SR_LOCAL_NEXT_ERROR;
-	      b0->error = node->errors[SR_LOCAL_ERROR_NO_MORE_SEGMENTS];
-	      goto do_trace;
-	    }
-
-	  if (PREDICT_FALSE (sm->validate_hmac))
-	    {
-	      if (sr_validate_hmac (sm, ip0, sr0))
-		{
-		  next0 = SR_LOCAL_NEXT_ERROR;
-		  b0->error = node->errors[SR_LOCAL_ERROR_HMAC_INVALID];
-		  goto do_trace;
-		}
-	    }
-
-	  next0 = sr_local_cb ? sr_local_cb (vm, node, b0, ip0, sr0) : next0;
-
-	  /*
-	   * To suppress rewrite, return ~SR_LOCAL_NEXT_xxx
-	   */
-	  if (PREDICT_FALSE (next0 & 0x80000000))
-	    {
-	      next0 ^= 0xFFFFFFFF;
-	      if (PREDICT_FALSE (next0 == SR_LOCAL_NEXT_ERROR))
-		b0->error = node->errors[SR_LOCAL_ERROR_APP_CALLBACK];
-	    }
-	  else
-	    {
-	      u32 segment_index0;
-
-	      segment_index0 = sr0->segments_left - 1;
-
-	      /* Rewrite the packet */
-	      new_dst0 = (ip6_address_t *) (sr0->segments + segment_index0);
-	      ip0->dst_address.as_u64[0] = new_dst0->as_u64[0];
-	      ip0->dst_address.as_u64[1] = new_dst0->as_u64[1];
-
-	      if (PREDICT_TRUE (sr0->segments_left > 0))
-		sr0->segments_left -= 1;
-	    }
-
-	  /* End of the path. Clean up the SR header, or not */
-	  if (PREDICT_FALSE
-	      (sr0->segments_left == 0 &&
-	       (sr0->flags &
-		clib_host_to_net_u16 (IP6_SR_HEADER_FLAG_CLEANUP))))
-	    {
-	      u64 *copy_dst0, *copy_src0;
-	      u16 new_l0;
-	      u32 copy_len_u64s0 = 0;
-	      int i;
-
-	      /*
-	       * Copy the ip6 header right by the (real) length of the
-	       * sr header.
-	       */
-	      if (PREDICT_FALSE
-		  (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-		{
-		  ip6_hop_by_hop_ext_t *ext_hdr =
-		    (ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
-		  copy_len_u64s0 =
-		    (((ip6_ext_header_t *) ext_hdr)->n_data_u64s) + 1;
-		  ext_hdr->next_hdr = sr0->protocol;
-		}
-	      else
-		{
-		  ip0->protocol = sr0->protocol;
-		}
-
-	      vlib_buffer_advance (b0, (sr0->length + 1) * 8);
-
-	      new_l0 = clib_net_to_host_u16 (ip0->payload_length) -
-		(sr0->length + 1) * 8;
-	      ip0->payload_length = clib_host_to_net_u16 (new_l0);
-
-	      copy_src0 = (u64 *) ip0;
-	      copy_dst0 = copy_src0 + (sr0->length + 1);
-	      copy_dst0[4 + copy_len_u64s0] = copy_src0[4 + copy_len_u64s0];
-	      copy_dst0[3 + copy_len_u64s0] = copy_src0[3 + copy_len_u64s0];
-	      copy_dst0[2 + copy_len_u64s0] = copy_src0[2 + copy_len_u64s0];
-	      copy_dst0[1 + copy_len_u64s0] = copy_src0[1 + copy_len_u64s0];
-	      copy_dst0[0 + copy_len_u64s0] = copy_src0[0 + copy_len_u64s0];
-
-	      for (i = copy_len_u64s0 - 1; i >= 0; i--)
-		{
-		  copy_dst0[i] = copy_src0[i];
-		}
-
-	      sr0 = 0;
-	    }
-
-	do_trace:
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      sr_local_trace_t *tr = vlib_add_trace (vm, node,
-						     b0, sizeof (*tr));
-	      clib_memcpy (tr->src.as_u8, ip0->src_address.as_u8,
-			   sizeof (tr->src.as_u8));
-	      clib_memcpy (tr->dst.as_u8, ip0->dst_address.as_u8,
-			   sizeof (tr->dst.as_u8));
-	      tr->length = vlib_buffer_length_in_chain (vm, b0);
-	      tr->next_index = next0;
-	      tr->sr_valid = sr0 != 0;
-	      if (tr->sr_valid)
-		clib_memcpy (tr->sr, sr0, sizeof (tr->sr));
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, sr_local_node.index,
-			       SR_LOCAL_ERROR_PKTS_PROCESSED,
-			       from_frame->n_vectors);
-  return from_frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (sr_local_node, static) = {
-  .function = sr_local,
-  .name = "sr-local",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-  .format_trace = format_sr_local_trace,
-
-  .runtime_data_bytes = 0,
-
-  .n_errors = SR_LOCAL_N_ERROR,
-  .error_strings = sr_local_error_strings,
-
-  .n_next_nodes = SR_LOCAL_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [SR_LOCAL_NEXT_##s] = n,
-    foreach_sr_local_next
-#undef _
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (sr_local_node, sr_local)
-/* *INDENT-ON* */
-
-ip6_sr_main_t *
-sr_get_main (vlib_main_t * vm)
-{
-  vlib_call_init_function (vm, sr_init);
-  ASSERT (sr_local_node.index);
-  return &sr_main;
-}
-
-/**
- * @brief CLI parser for SR fix destination rewrite node
- *
- * @param vm vlib_main_t *
- * @param input unformat_input_t *
- * @param cmd vlib_cli_command_t *
- *
- * @return error clib_error_t *
- */
-static clib_error_t *
-set_ip6_sr_rewrite_fn (vlib_main_t * vm,
-		       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  fib_prefix_t pfx = {
-    .fp_proto = FIB_PROTOCOL_IP6,
-    .fp_len = 128,
-  };
-  u32 fib_index = 0;
-  u32 fib_id = 0;
-  u32 adj_index;
-  ip_adjacency_t *adj;
-  vnet_hw_interface_t *hi;
-  u32 sw_if_index;
-  ip6_sr_main_t *sm = &sr_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  fib_node_index_t fei;
-
-  if (!unformat (input, "%U", unformat_ip6_address, &pfx.fp_addr.ip6))
-    return clib_error_return (0, "ip6 address missing in '%U'",
-			      format_unformat_error, input);
-
-  if (unformat (input, "rx-table-id %d", &fib_id))
-    {
-      fib_index = fib_table_id_find_fib_index (FIB_PROTOCOL_IP6, fib_id);
-      if (fib_index == ~0)
-	return clib_error_return (0, "fib-id %d not found", fib_id);
-    }
-
-  fei = fib_table_lookup_exact_match (fib_index, &pfx);
-
-  if (FIB_NODE_INDEX_INVALID == fei)
-    return clib_error_return (0, "no match for %U",
-			      format_ip6_address, &pfx.fp_addr.ip6);
-
-  adj_index = fib_entry_get_adj_for_source (fei, FIB_SOURCE_SR);
-
-  if (ADJ_INDEX_INVALID == adj_index)
-    return clib_error_return (0, "%U not SR sourced",
-			      format_ip6_address, &pfx.fp_addr.ip6);
-
-  adj = adj_get (adj_index);
-
-  if (adj->lookup_next_index != IP_LOOKUP_NEXT_REWRITE)
-    return clib_error_return (0, "%U unresolved (not a rewrite adj)",
-			      format_ip6_address, &pfx.fp_addr.ip6);
-
-  adj->rewrite_header.next_index = sm->ip6_rewrite_sr_next_index;
-
-  sw_if_index = adj->rewrite_header.sw_if_index;
-  hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  adj->rewrite_header.node_index = sr_fix_dst_addr_node.index;
-
-  /* $$$$$ hack... steal the mcast group index */
-  adj->mcast_group_index =
-    vlib_node_add_next (vm, sr_fix_dst_addr_node.index,
-			hi->output_node_index);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_ip6_sr_rewrite, static) = {
-    .path = "set ip6 sr rewrite",
-    .short_help = "set ip6 sr rewrite <ip6-address> [fib-id <id>]",
-    .function = set_ip6_sr_rewrite_fn,
-};
-/* *INDENT-ON* */
-
-/**
- * @brief Register a callback routine to set next0 in sr_local
- *
- * @param cb void *
- */
-void
-vnet_register_sr_app_callback (void *cb)
-{
-  ip6_sr_main_t *sm = &sr_main;
-
-  sm->sr_local_cb = cb;
-}
-
-/**
- * @brief Test routine for validation of HMAC
- */
-static clib_error_t *
-test_sr_hmac_validate_fn (vlib_main_t * vm,
-			  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  ip6_sr_main_t *sm = &sr_main;
-
-  if (unformat (input, "validate on"))
-    sm->validate_hmac = 1;
-  else if (unformat (input, "chunk-offset off"))
-    sm->validate_hmac = 0;
-  else
-    return clib_error_return (0, "expected validate on|off in '%U'",
-			      format_unformat_error, input);
-
-  vlib_cli_output (vm, "hmac signature validation %s",
-		   sm->validate_hmac ? "on" : "off");
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (test_sr_hmac_validate, static) = {
-    .path = "test sr hmac",
-    .short_help = "test sr hmac validate [on|off]",
-    .function = test_sr_hmac_validate_fn,
-};
-/* *INDENT-ON* */
-
-/**
- * @brief Add or Delete HMAC key
- *
- * @param sm ip6_sr_main_t *
- * @param key_id u32
- * @param shared_secret u8 *
- * @param is_del u8
- *
- * @return retval i32
- */
-// $$$ fixme shouldn't return i32
-i32
-sr_hmac_add_del_key (ip6_sr_main_t * sm, u32 key_id, u8 * shared_secret,
-		     u8 is_del)
-{
-  u32 index;
-  ip6_sr_hmac_key_t *key;
-
-  if (is_del == 0)
-    {
-      /* Specific key in use? Fail. */
-      if (key_id && vec_len (sm->hmac_keys) > key_id
-	  && sm->hmac_keys[key_id].shared_secret)
-	return -2;
-
-      index = key_id;
-      key = find_or_add_shared_secret (sm, shared_secret, &index);
-      ASSERT (index == key_id);
-      return 0;
-    }
-
-  /* delete */
-
-  if (key_id)			/* delete by key ID */
-    {
-      if (vec_len (sm->hmac_keys) <= key_id)
-	return -3;
-
-      key = sm->hmac_keys + key_id;
-
-      hash_unset_mem (sm->hmac_key_by_shared_secret, key->shared_secret);
-      vec_free (key->shared_secret);
-      return 0;
-    }
-
-  index = 0;
-  key = find_or_add_shared_secret (sm, shared_secret, &index);
-  hash_unset_mem (sm->hmac_key_by_shared_secret, key->shared_secret);
-  vec_free (key->shared_secret);
-  return 0;
-}
-
-
-static clib_error_t *
-sr_hmac_add_del_key_fn (vlib_main_t * vm,
-			unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  ip6_sr_main_t *sm = &sr_main;
-  u8 is_del = 0;
-  u32 key_id = 0;
-  u8 key_id_set = 0;
-  u8 *shared_secret = 0;
-  i32 rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	is_del = 1;
-      else if (unformat (input, "id %d", &key_id))
-	key_id_set = 1;
-      else if (unformat (input, "key %s", &shared_secret))
-	{
-	  /* Do not include the trailing NULL byte. Guaranteed interop issue */
-	  _vec_len (shared_secret) -= 1;
-	}
-      else
-	break;
-    }
-
-  if (is_del == 0 && shared_secret == 0)
-    return clib_error_return (0, "shared secret must be set to add a key");
-
-  if (shared_secret == 0 && key_id_set == 0)
-    return clib_error_return (0, "shared secret and key id both unset");
-
-  rv = sr_hmac_add_del_key (sm, key_id, shared_secret, is_del);
-
-  vec_free (shared_secret);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    default:
-      return clib_error_return (0, "sr_hmac_add_del_key returned %d", rv);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (sr_hmac, static) = {
-    .path = "sr hmac",
-    .short_help = "sr hmac [del] id <nn> key <str>",
-    .function = sr_hmac_add_del_key_fn,
-};
-/* *INDENT-ON* */
-
-/**
- * @brief CLI parser for show HMAC key shared secrets
- *
- * @param vm vlib_main_t *
- * @param input unformat_input_t *
- * @param cmd vlib_cli_command_t *
- *
- * @return error clib_error_t *
- */
-static clib_error_t *
-show_sr_hmac_fn (vlib_main_t * vm,
-		 unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  ip6_sr_main_t *sm = &sr_main;
-  int i;
-
-  for (i = 1; i < vec_len (sm->hmac_keys); i++)
-    {
-      if (sm->hmac_keys[i].shared_secret)
-	vlib_cli_output (vm, "[%d]: %v", i, sm->hmac_keys[i].shared_secret);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_sr_hmac, static) = {
-    .path = "show sr hmac",
-    .short_help = "show sr hmac",
-    .function = show_sr_hmac_fn,
-};
-/* *INDENT-ON* */
-
-/**
- * @brief Test for SR debug flag
- *
- * @param vm vlib_main_t *
- * @param input unformat_input_t *
- * @param cmd vlib_cli_command_t *
- *
- * @return error clib_error_t *
- */
-static clib_error_t *
-test_sr_debug_fn (vlib_main_t * vm,
-		  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  ip6_sr_main_t *sm = &sr_main;
-
-  if (unformat (input, "on"))
-    sm->is_debug = 1;
-  else if (unformat (input, "off"))
-    sm->is_debug = 0;
-  else
-    return clib_error_return (0, "expected on|off in '%U'",
-			      format_unformat_error, input);
-
-  vlib_cli_output (vm, "debug trace now %s", sm->is_debug ? "on" : "off");
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (test_sr_debug, static) = {
-    .path = "test sr debug",
-    .short_help = "test sr debug on|off",
-    .function = test_sr_debug_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/sr/sr.h b/vnet/vnet/sr/sr.h
deleted file mode 100644
index 610b3699..00000000
--- a/vnet/vnet/sr/sr.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief Segment Routing header
- *
- * @note sr_replicate only works using DPDK today
- */
-#ifndef included_vnet_sr_h
-#define included_vnet_sr_h
-
-#include <vnet/vnet.h>
-#include <vnet/sr/sr_packet.h>
-#include <vnet/ip/ip6_packet.h>
-
-#include <openssl/opensslconf.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/crypto.h>
-#include <openssl/sha.h>
-#include <openssl/opensslv.h>
-#include <openssl/hmac.h>
-
-/**
- *    @brief Segment Route tunnel key
- */
-typedef struct
-{
-  ip6_address_t src;
-  ip6_address_t dst;
-} ip6_sr_tunnel_key_t;
-
-/**
- * @brief Segment Route tunnel
- */
-typedef struct
-{
-  /** src, dst address */
-  ip6_sr_tunnel_key_t key;
-
-  /** Pptional tunnel name */
-  u8 *name;
-
-  /** Mask width for FIB entry */
-  u32 dst_mask_width;
-
-  /** First hop, to save 1 elt in the segment list */
-  ip6_address_t first_hop;
-
-  /** RX Fib index */
-  u32 rx_fib_index;
-  /** TX Fib index */
-  u32 tx_fib_index;
-
-  /** The actual ip6 SR header */
-  u8 *rewrite;
-
-  /** Indicates that this tunnel is part of a policy comprising
-     of multiple tunnels. If == ~0 tunnel is not part of a policy */
-  u32 policy_index;
-} ip6_sr_tunnel_t;
-
-/**
- * @brief Shared secret for keyed-hash message authentication code (HMAC).
- */
-typedef struct
-{
-  u8 *shared_secret;
-} ip6_sr_hmac_key_t;
-
-/**
- * @brief Args required for add/del tunnel.
- *
- * Else we end up passing a LOT of parameters around.
- */
-typedef struct
-{
-  /** Key (header imposition case) */
-  ip6_address_t *src_address;
-  ip6_address_t *dst_address;
-  u32 dst_mask_width;
-  u32 rx_table_id;
-  u32 tx_table_id;
-
-  /** optional name argument - for referencing SR tunnel/policy by name */
-  u8 *name;
-
-  /** optional policy name */
-  u8 *policy_name;
-
-  /** segment list, when inserting an ip6 SR header */
-  ip6_address_t *segments;
-
-  /**
-   * "Tag" list, aka segments inserted at the end of the list,
-   * past last_seg
-   */
-  ip6_address_t *tags;
-
-  /** Shared secret => generate SHA-256 HMAC security fields */
-  u8 *shared_secret;
-
-  /** Flags, e.g. cleanup, policy-list flags */
-  u16 flags_net_byte_order;
-
-  /** Delete the tunnnel? */
-  u8 is_del;
-} ip6_sr_add_del_tunnel_args_t;
-
-/**
- * @brief Args for creating a policy.
- *
- * Typically used for multicast replication.
- * ie a multicast address can be associated with a policy,
- * then replicated across a number of unicast SR tunnels.
- */
-typedef struct
-{
-  /** policy name */
-  u8 *name;
-
-  /** tunnel names */
-  u8 **tunnel_names;
-
-  /** Delete the policy? */
-  u8 is_del;
-} ip6_sr_add_del_policy_args_t;
-
-/**
- * @brief Segment Routing policy.
- *
- * Typically used for multicast replication.
- * ie a multicast address can be associated with a policy,
- * then replicated across a number of unicast SR tunnels.
- */
-typedef struct
-{
-  /** name of policy */
-  u8 *name;
-
-  /** vector to SR tunnel index */
-  u32 *tunnel_indices;
-
-} ip6_sr_policy_t;
-
-/**
- * @brief Args for mapping of multicast address to policy name.
- *
- * Typically used for multicast replication.
- * ie a multicast address can be associated with a policy,
- * then replicated across a number of unicast SR tunnels.
- */
-typedef struct
-{
-  /** multicast IP6 address */
-  ip6_address_t *multicast_address;
-
-  /** name of policy to map to */
-  u8 *policy_name;
-
-  /** Delete the mapping */
-  u8 is_del;
-
-} ip6_sr_add_del_multicastmap_args_t;
-
-/**
- * @brief Segment Routing state.
- */
-typedef struct
-{
-  /** pool of tunnel instances, sr entry only */
-  ip6_sr_tunnel_t *tunnels;
-
-  /** find an sr "tunnel" by its outer-IP src/dst */
-  uword *tunnel_index_by_key;
-
-  /** find an sr "tunnel" by its name */
-  uword *tunnel_index_by_name;
-
-  /** policy pool */
-  ip6_sr_policy_t *policies;
-
-  /** find a policy by name */
-  uword *policy_index_by_policy_name;
-
-  /** multicast address to policy mapping */
-  uword *policy_index_by_multicast_address;
-
-  /** hmac key id by shared secret */
-  uword *hmac_key_by_shared_secret;
-
-  /** ip6-rewrite next index for reinstalling the original dst address */
-  u32 ip6_rewrite_sr_next_index;
-
-  /** ip6-replicate next index for multicast tunnel */
-  u32 ip6_lookup_sr_replicate_index;
-
-  /** application API callback */
-  void *sr_local_cb;
-
-  /** validate hmac keys */
-  u8 validate_hmac;
-
-  /** pool of hmac keys */
-  ip6_sr_hmac_key_t *hmac_keys;
-
-  /** Openssl var */
-  EVP_MD *md;
-  /** Openssl var */
-  HMAC_CTX *hmac_ctx;
-
-  /** enable debug spew */
-  u8 is_debug;
-
-  /** convenience */
-  vlib_main_t *vlib_main;
-  /** convenience */
-  vnet_main_t *vnet_main;
-} ip6_sr_main_t;
-
-ip6_sr_main_t sr_main;
-
-format_function_t format_ip6_sr_header;
-format_function_t format_ip6_sr_header_with_length;
-
-vlib_node_registration_t ip6_sr_input_node;
-
-#if DPDK > 0
-extern vlib_node_registration_t sr_replicate_node;
-#endif /* DPDK */
-
-int ip6_sr_add_del_tunnel (ip6_sr_add_del_tunnel_args_t * a);
-int ip6_sr_add_del_policy (ip6_sr_add_del_policy_args_t * a);
-int ip6_sr_add_del_multicastmap (ip6_sr_add_del_multicastmap_args_t * a);
-
-void vnet_register_sr_app_callback (void *cb);
-
-void sr_fix_hmac (ip6_sr_main_t * sm, ip6_header_t * ip,
-		  ip6_sr_header_t * sr);
-
-#endif /* included_vnet_sr_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/sr/sr_error.def b/vnet/vnet/sr/sr_error.def
deleted file mode 100644
index 62d021fd..00000000
--- a/vnet/vnet/sr/sr_error.def
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-sr_error (NONE, "no error")
-sr_error (BAD_ROUTING_HEADER_TYPE, "bad routing header type (not 4)")
-sr_error (NO_MORE_SEGMENTS, "out of SR segment drops")
-sr_error (PKTS_PROCESSED, "SR packets processed")
-sr_error (APP_CALLBACK, "SR application callback errors")
-sr_error (HMAC_INVALID, "SR packets with invalid HMAC signatures")
diff --git a/vnet/vnet/sr/sr_fix_dst_error.def b/vnet/vnet/sr/sr_fix_dst_error.def
deleted file mode 100644
index 48fe7af6..00000000
--- a/vnet/vnet/sr/sr_fix_dst_error.def
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-sr_fix_dst_error (NONE, "no error")
-sr_fix_dst_error (NO_SR_HEADER, "no SR header present")
-sr_fix_dst_error (NO_MORE_SEGMENTS, "no more SR segments")
diff --git a/vnet/vnet/sr/sr_packet.h b/vnet/vnet/sr/sr_packet.h
deleted file mode 100644
index 179b94c2..00000000
--- a/vnet/vnet/sr/sr_packet.h
+++ /dev/null
@@ -1,251 +0,0 @@
-#ifndef included_vnet_sr_packet_h
-#define included_vnet_sr_packet_h
-
-#include <vnet/ip/ip.h>
-
-/*
- * ipv6 segment-routing header format
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- *  @file
- *  @brief The Segment Routing Header (SRH).
- *
- *  The Segment Routing Header (SRH) is defined in the diagram below.
- *
- *
- *     0                   1                   2                   3
- *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    | Next Header   |  Hdr Ext Len  | Routing Type  | Segments Left |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    | First Segment |             Flags             |  HMAC Key ID  |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |                                                               |
- *    |            Segment List[0] (128 bits ipv6 address)            |
- *    |                                                               |
- *    |                                                               |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |                                                               |
- *    |                                                               |
- *                                  ...
- *    |                                                               |
- *    |                                                               |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |                                                               |
- *    |            Segment List[n] (128 bits ipv6 address)            |
- *    |                                                               |
- *    |                                                               |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |                                                               |
- *    |            Policy List[0] (optional)                          |
- *    |                                                               |
- *    |                                                               |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |                                                               |
- *    |            Policy List[1] (optional)                          |
- *    |                                                               |
- *    |                                                               |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |                                                               |
- *    |            Policy List[2] (optional)                          |
- *    |                                                               |
- *    |                                                               |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |                                                               |
- *    |                                                               |
- *    |                                                               |
- *    |                       HMAC (256 bits)                         |
- *    |                        (optional)                             |
- *    |                                                               |
- *    |                                                               |
- *    |                                                               |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- *   where:
- *
- *   o  Next Header: 8-bit selector.  Identifies the type of header
- *      immediately following the SRH.
- *
- *   o  Hdr Ext Len: 8-bit unsigned integer, is the length of the SRH
- *      header in 8-octet units, not including the first 8 octets.
- *
- *   o  Routing Type: TBD, to be assigned by IANA (suggested value: 4).
- *
- *   o  Segments Left.  Defined in [RFC2460], it contains the index, in
- *      the Segment List, of the next segment to inspect.  Segments Left
- *      is decremented at each segment and it is used as an index in the
- *      segment list.
- *
- *   o  First Segment: offset in the SRH, not including the first 8 octets
- *      and expressed in 16-octet units, pointing to the last element of
- *      the segment list, which is in fact the first segment of the
- *      segment routing path.
- *
- *   o  Flags: 16 bits of flags.  Following flags are defined:
- *
- *                              1
- *          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
- *         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *         |C|P|R|R|    Policy Flags       |
- *         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- *         C-flag: Clean-up flag.  Set when the SRH has to be removed from
- *         the packet when packet reaches the last segment.
- *
- *         P-flag: Protected flag.  Set when the packet has been rerouted
- *         through FRR mechanism by a SR endpoint node.  See Section 6.3
- *         for more details.
- *
- *         R-flags.  Reserved and for future use.
- *
- *         Policy Flags.  Define the type of the IPv6 addresses encoded
- *         into the Policy List (see below).  The following have been
- *         defined:
- *
- *            Bits 4-6: determine the type of the first element after the
- *            segment list.
- *
- *            Bits 7-9: determine the type of the second element.
- *
- *            Bits 10-12: determine the type of the third element.
- *
- *            Bits 13-15: determine the type of the fourth element.
- *
- *         The following values are used for the type:
- *
- *            0x0: Not present.  If value is set to 0x0, it means the
- *            element represented by these bits is not present.
- *
- *            0x1: SR Ingress.
- *
- *            0x2: SR Egress.
- *
- *            0x3: Original Source Address.
- *
- *   o  HMAC Key ID and HMAC field, and their use are defined in
- *      [I-D.vyncke-6man-segment-routing-security].
- *
- *   o  Segment List[n]: 128 bit IPv6 addresses representing the nth
- *      segment in the Segment List.  The Segment List is encoded starting
- *      from the last segment of the path.  I.e., the first element of the
- *      segment list (Segment List [0]) contains the last segment of the
- *      path while the last segment of the Segment List (Segment List[n])
- *      contains the first segment of the path.  The index contained in
- *      "Segments Left" identifies the current active segment.
- *
- *   o  Policy List.  Optional addresses representing specific nodes in
- *      the SR path such as:
- *
- *         SR Ingress: a 128 bit generic identifier representing the
- *         ingress in the SR domain (i.e.: it needs not to be a valid IPv6
- *         address).
- *
- *         SR Egress: a 128 bit generic identifier representing the egress
- *         in the SR domain (i.e.: it needs not to be a valid IPv6
- *         address).
- *
- *         Original Source Address: IPv6 address originally present in the
- *         SA field of the packet.
- *
- *      The segments in the Policy List are encoded after the segment list
- *      and they are optional.  If none are in the SRH, all bits of the
- *      Policy List Flags MUST be set to 0x0.
- */
-
-#ifndef IPPROTO_IPV6_ROUTE
-#define IPPROTO_IPV6_ROUTE        43
-#endif
-
-#define ROUTING_HEADER_TYPE_SR    4
-/**
-    @brief SR header struct.
-*/
-typedef struct
-{
-  /** Protocol for next header. */
-  u8 protocol;
-
-  /**
-   * Length of routing header in 8 octet units,
-   * not including the first 8 octets
-   */
-  u8 length;
-
-  /** Type of routing header; type 4 = segement routing */
-  u8 type;
-
-  /** Next segment in the segment list */
-  u8 segments_left;
-
-  /**
-   * Policy list pointer: offset in the SRH of the policy
-   * list - in 16-octet units - not including the first 8 octets.
-   */
-  u8 first_segment;
-
-  /** Flag bits */
-#define IP6_SR_HEADER_FLAG_CLEANUP    (0x8000)
-  /** Flag bits */
-#define IP6_SR_HEADER_FLAG_PROTECTED  (0x4000)
-  /** Flag bits */
-#define IP6_SR_HEADER_FLAG_RESERVED   (0x3000)
-  /** Flag bits */
-#define IP6_SR_HEADER_FLAG_PL_ELT_NOT_PRESENT (0x0)
-    /** Flag bits */
-#define IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE (0x1)
-    /** Flag bits */
-#define IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE (0x2)
-    /** Flag bits */
-#define IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR (0x3)
-  /** values 0x4 - 0x7 are reserved */
-  u16 flags;
-  u8 hmac_key;
-
-  /** The segment + policy list elts */
-  ip6_address_t segments[0];
-} __attribute__ ((packed)) ip6_sr_header_t;
-
-static inline int
-ip6_sr_policy_list_shift_from_index (int pl_index)
-{
-  return (-3 * pl_index) + 12;
-}
-
-/** pl_index is one-origined */
-static inline int
-ip6_sr_policy_list_flags (u16 flags_host_byte_order, int pl_index)
-{
-  int shift;
-
-  if (pl_index <= 0 || pl_index > 4)
-    return 0;
-
-  shift = (-3 * pl_index) + 12;
-  flags_host_byte_order >>= shift;
-
-  return (flags_host_byte_order & 7);
-}
-
-#endif /* included_vnet_sr_packet_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/sr/sr_replicate.c b/vnet/vnet/sr/sr_replicate.c
deleted file mode 100644
index 5f9de504..00000000
--- a/vnet/vnet/sr/sr_replicate.c
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
- * sr_replicate.c: ipv6 segment routing replicator for multicast
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- *  @file
- *  @brief Functions for replicating packets across SR tunnels.
- *
- *  Leverages rte_pktmbuf_clone() so there is no memcpy for
- *  invariant parts of the packet.
- *
- *  @note Currently requires DPDK
-*/
-
-#if DPDK > 0			/* Cannot run replicate without DPDK */
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/sr/sr.h>
-#include <vnet/devices/dpdk/dpdk.h>
-#include <vnet/ip/ip.h>
-#include <vnet/fib/ip6_fib.h>
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-
-/**
- *   @brief sr_replicate state.
- *
-*/
-typedef struct
-{
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} sr_replicate_main_t;
-
-sr_replicate_main_t sr_replicate_main;
-
-/**
- *    @brief Information to display in packet trace.
- *
-*/
-typedef struct
-{
-  ip6_address_t src, dst;
-  u16 length;
-  u32 next_index;
-  u32 tunnel_index;
-  u8 sr[256];
-} sr_replicate_trace_t;
-
-/**
- *  @brief packet trace format function.
- *
- *  @param *s u8 used for string output
- *  @param *args va_list  structured input to va_arg to output @ref sr_replicate_trace_t
- *  @return *s u8 - formatted trace output
-*/
-static u8 *
-format_sr_replicate_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  sr_replicate_trace_t *t = va_arg (*args, sr_replicate_trace_t *);
-  ip6_sr_main_t *sm = &sr_main;
-  ip6_sr_tunnel_t *tun = pool_elt_at_index (sm->tunnels, t->tunnel_index);
-  ip6_fib_t *rx_fib, *tx_fib;
-
-  rx_fib = ip6_fib_get (tun->rx_fib_index);
-  tx_fib = ip6_fib_get (tun->tx_fib_index);
-
-  s = format
-    (s, "SR-REPLICATE: next %s ip6 src %U dst %U len %u\n"
-     "           rx-fib-id %d tx-fib-id %d\n%U",
-     "ip6-lookup",
-     format_ip6_address, &t->src,
-     format_ip6_address, &t->dst, t->length,
-     rx_fib->table_id, tx_fib->table_id,
-     format_ip6_sr_header, t->sr, 0 /* print_hmac */ );
-  return s;
-
-}
-
-#define foreach_sr_replicate_error \
-_(REPLICATED, "sr packets replicated") \
-_(NO_BUFFERS, "error allocating buffers for replicas") \
-_(NO_REPLICAS, "no replicas were needed") \
-_(NO_BUFFER_DROPS, "sr no buffer drops")
-
-/**
- * @brief Struct for SR replicate errors
- */
-typedef enum
-{
-#define _(sym,str) SR_REPLICATE_ERROR_##sym,
-  foreach_sr_replicate_error
-#undef _
-    SR_REPLICATE_N_ERROR,
-} sr_replicate_error_t;
-
-/**
- * @brief Error strings for SR replicate
- */
-static char *sr_replicate_error_strings[] = {
-#define _(sym,string) string,
-  foreach_sr_replicate_error
-#undef _
-};
-
-/**
- * @brief Defines next-nodes for packet processing.
- *
-*/
-typedef enum
-{
-  SR_REPLICATE_NEXT_IP6_LOOKUP,
-  SR_REPLICATE_N_NEXT,
-} sr_replicate_next_t;
-
-/**
- *   @brief Single loop packet replicator.
- *
- *   @node sr-replicate
- *   @param vm vlib_main_t
- *   @return frame->n_vectors uword
-*/
-static uword
-sr_replicate_node_fn (vlib_main_t * vm,
-		      vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  sr_replicate_next_t next_index;
-  int pkts_replicated = 0;
-  ip6_sr_main_t *sm = &sr_main;
-  int no_buffer_drops = 0;
-  vlib_buffer_free_list_t *fl;
-  unsigned socket_id = rte_socket_id ();
-  vlib_buffer_main_t *bm = vm->buffer_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  fl = vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, hdr_bi0;
-	  vlib_buffer_t *b0, *orig_b0;
-	  struct rte_mbuf *orig_mb0 = 0, *hdr_mb0 = 0, *clone0 = 0;
-	  struct rte_mbuf **hdr_vec = 0, **rte_mbuf_vec = 0;
-	  ip6_sr_policy_t *pol0 = 0;
-	  ip6_sr_tunnel_t *t0 = 0;
-	  ip6_sr_header_t *hdr_sr0 = 0;
-	  ip6_header_t *ip0 = 0, *hdr_ip0 = 0;
-	  int num_replicas = 0;
-	  int i;
-	  u32 len_bytes = sizeof (ip6_header_t);
-	  u8 next_hdr, ip_next_hdr = IPPROTO_IPV6_ROUTE;
-
-	  bi0 = from[0];
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  orig_b0 = b0;
-
-	  pol0 = pool_elt_at_index (sm->policies,
-				    vnet_buffer (b0)->ip.save_protocol);
-
-	  ip0 = vlib_buffer_get_current (b0);
-	  /* Skip forward to the punch-in point */
-	  vlib_buffer_advance (b0, sizeof (*ip0));
-	  next_hdr = ip0->protocol;
-
-	  /* HBH must immediately follow ipv6 header */
-	  if (PREDICT_FALSE
-	      (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
-	    {
-	      ip6_hop_by_hop_ext_t *ext_hdr =
-		(ip6_hop_by_hop_ext_t *) ip6_next_header (ip0);
-	      u32 ext_hdr_len = 0;
-	      ext_hdr_len = ip6_ext_header_len ((ip6_ext_header_t *) ext_hdr);
-	      len_bytes += ext_hdr_len;
-	      next_hdr = ext_hdr->next_hdr;
-	      ext_hdr->next_hdr = IPPROTO_IPV6_ROUTE;
-	      ip_next_hdr = IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS;
-	      /* Skip forward to the punch-in point */
-	      vlib_buffer_advance (b0, ext_hdr_len);
-
-	    }
-
-	  orig_mb0 = rte_mbuf_from_vlib_buffer (b0);
-
-	  i16 delta0 = vlib_buffer_length_in_chain (vm, orig_b0)
-	    - (i16) orig_mb0->pkt_len;
-
-	  u16 new_data_len0 = (u16) ((i16) orig_mb0->data_len + delta0);
-	  u16 new_pkt_len0 = (u16) ((i16) orig_mb0->pkt_len + delta0);
-
-	  orig_mb0->data_len = new_data_len0;
-	  orig_mb0->pkt_len = new_pkt_len0;
-	  orig_mb0->data_off += (u16) (b0->current_data);
-
-	  /*
-	     Before entering loop determine if we can allocate:
-	     - all the new HEADER RTE_MBUFs and assign them to a vector
-	     - all the clones
-
-	     if successful, then iterate over vectors of resources
-
-	   */
-	  num_replicas = vec_len (pol0->tunnel_indices);
-
-	  if (PREDICT_FALSE (num_replicas == 0))
-	    {
-	      b0->error = node->errors[SR_REPLICATE_ERROR_NO_REPLICAS];
-	      goto do_trace0;
-	    }
-
-	  vec_reset_length (hdr_vec);
-	  vec_reset_length (rte_mbuf_vec);
-
-	  for (i = 0; i < num_replicas; i++)
-	    {
-	      uint8_t nb_seg;
-	      struct rte_mbuf *clone0i;
-	      vlib_buffer_t *clone0_c, *clone_b0;
-
-	      t0 = vec_elt_at_index (sm->tunnels, pol0->tunnel_indices[i]);
-	      hdr_mb0 = rte_pktmbuf_alloc (bm->pktmbuf_pools[socket_id]);
-
-	      if (i < (num_replicas - 1))
-		{
-		  /* Not the last tunnel to process */
-		  clone0 = rte_pktmbuf_clone
-		    (orig_mb0, bm->pktmbuf_pools[socket_id]);
-		  if (clone0 == 0)
-		    goto clone_fail;
-		  nb_seg = 0;
-		  clone0i = clone0;
-		  clone0_c = NULL;
-		  while ((clone0->nb_segs >= 1) && (nb_seg < clone0->nb_segs))
-		    {
-
-		      clone_b0 = vlib_buffer_from_rte_mbuf (clone0i);
-		      vlib_buffer_init_for_free_list (clone_b0, fl);
-
-		      ASSERT ((clone_b0->flags & VLIB_BUFFER_NEXT_PRESENT) ==
-			      0);
-		      ASSERT (clone_b0->current_data == 0);
-
-		      clone_b0->current_data =
-			(clone0i->buf_addr + clone0i->data_off) -
-			(void *) clone_b0->data;
-
-		      clone_b0->current_length = clone0i->data_len;
-		      if (PREDICT_FALSE (clone0_c != NULL))
-			{
-			  clone0_c->flags |= VLIB_BUFFER_NEXT_PRESENT;
-			  clone0_c->next_buffer =
-			    vlib_get_buffer_index (vm, clone_b0);
-			}
-		      clone0_c = clone_b0;
-		      clone0i = clone0i->next;
-		      nb_seg++;
-		    }
-		}
-	      else
-		/* First tunnel to process, use original MB */
-		clone0 = orig_mb0;
-
-
-	      if (PREDICT_FALSE (!clone0 || !hdr_mb0))
-		{
-		clone_fail:
-		  b0->error = node->errors[SR_REPLICATE_ERROR_NO_BUFFERS];
-
-		  vec_foreach_index (i, rte_mbuf_vec)
-		  {
-		    rte_pktmbuf_free (rte_mbuf_vec[i]);
-		  }
-		  vec_free (rte_mbuf_vec);
-
-		  vec_foreach_index (i, hdr_vec)
-		  {
-		    rte_pktmbuf_free (hdr_vec[i]);
-		  }
-		  vec_free (hdr_vec);
-
-		  goto do_trace0;
-		}
-
-	      vec_add1 (hdr_vec, hdr_mb0);
-	      vec_add1 (rte_mbuf_vec, clone0);
-
-	    }
-
-	  for (i = 0; i < num_replicas; i++)
-	    {
-	      vlib_buffer_t *hdr_b0;
-	      u16 new_l0 = 0;
-
-	      t0 = vec_elt_at_index (sm->tunnels, pol0->tunnel_indices[i]);
-	      /* Our replicas */
-	      hdr_mb0 = hdr_vec[i];
-	      clone0 = rte_mbuf_vec[i];
-
-	      hdr_mb0->data_len = len_bytes + vec_len (t0->rewrite);
-	      hdr_mb0->pkt_len = hdr_mb0->data_len +
-		vlib_buffer_length_in_chain (vm, orig_b0);
-
-	      hdr_b0 = vlib_buffer_from_rte_mbuf (hdr_mb0);
-
-	      vlib_buffer_init_for_free_list (hdr_b0, fl);
-
-	      memcpy (hdr_b0->data, ip0, len_bytes);
-	      memcpy (hdr_b0->data + len_bytes, t0->rewrite,
-		      vec_len (t0->rewrite));
-
-	      hdr_b0->current_data = 0;
-	      hdr_b0->current_length = len_bytes + vec_len (t0->rewrite);
-	      hdr_b0->flags = orig_b0->flags | VLIB_BUFFER_NEXT_PRESENT;
-	      hdr_b0->trace_index = orig_b0->trace_index;
-	      vnet_buffer (hdr_b0)->l2_classify.opaque_index = 0;
-
-	      hdr_b0->total_length_not_including_first_buffer =
-		hdr_mb0->pkt_len - hdr_b0->current_length;
-	      vnet_buffer (hdr_b0)->sw_if_index[VLIB_TX] = t0->tx_fib_index;
-
-	      hdr_ip0 = (ip6_header_t *) hdr_b0->data;
-	      new_l0 = clib_net_to_host_u16 (ip0->payload_length) +
-		vec_len (t0->rewrite);
-	      hdr_ip0->payload_length = clib_host_to_net_u16 (new_l0);
-	      hdr_sr0 = (ip6_sr_header_t *) ((u8 *) hdr_ip0 + len_bytes);
-	      /* $$$ tune */
-	      clib_memcpy (hdr_sr0, t0->rewrite, vec_len (t0->rewrite));
-	      hdr_sr0->protocol = next_hdr;
-	      hdr_ip0->protocol = ip_next_hdr;
-
-	      /* Copy dst address into the DA slot in the segment list */
-	      clib_memcpy (hdr_sr0->segments, ip0->dst_address.as_u64,
-			   sizeof (ip6_address_t));
-
-	      /* Rewrite the ip6 dst address */
-	      hdr_ip0->dst_address.as_u64[0] = t0->first_hop.as_u64[0];
-	      hdr_ip0->dst_address.as_u64[1] = t0->first_hop.as_u64[1];
-
-	      sr_fix_hmac (sm, hdr_ip0, hdr_sr0);
-
-	      /* prepend new header to invariant piece */
-	      hdr_mb0->next = clone0;
-	      hdr_b0->next_buffer =
-		vlib_get_buffer_index (vm,
-				       vlib_buffer_from_rte_mbuf (clone0));
-
-	      /* update header's fields */
-	      hdr_mb0->pkt_len =
-		(uint16_t) (hdr_mb0->data_len + clone0->pkt_len);
-	      hdr_mb0->nb_segs = (uint8_t) (clone0->nb_segs + 1);
-
-	      /* copy metadata from source packet */
-	      hdr_mb0->port = clone0->port;
-	      hdr_mb0->vlan_tci = clone0->vlan_tci;
-	      hdr_mb0->vlan_tci_outer = clone0->vlan_tci_outer;
-	      hdr_mb0->tx_offload = clone0->tx_offload;
-	      hdr_mb0->hash = clone0->hash;
-
-	      hdr_mb0->ol_flags = clone0->ol_flags & ~(IND_ATTACHED_MBUF);
-
-	      __rte_mbuf_sanity_check (hdr_mb0, 1);
-
-	      hdr_bi0 = vlib_get_buffer_index (vm, hdr_b0);
-
-	      to_next[0] = hdr_bi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-
-	      if (n_left_to_next == 0)
-		{
-		  vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-		  vlib_get_next_frame (vm, node, next_index,
-				       to_next, n_left_to_next);
-
-		}
-	      pkts_replicated++;
-	    }
-
-	  from += 1;
-	  n_left_from -= 1;
-
-	do_trace0:
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      sr_replicate_trace_t *tr = vlib_add_trace (vm, node,
-							 b0, sizeof (*tr));
-	      tr->tunnel_index = t0 - sm->tunnels;
-	      tr->length = 0;
-	      if (hdr_ip0)
-		{
-		  memcpy (tr->src.as_u8, hdr_ip0->src_address.as_u8,
-			  sizeof (tr->src.as_u8));
-		  memcpy (tr->dst.as_u8, hdr_ip0->dst_address.as_u8,
-			  sizeof (tr->dst.as_u8));
-		  if (hdr_ip0->payload_length)
-		    tr->length = clib_net_to_host_u16
-		      (hdr_ip0->payload_length);
-		}
-	      tr->next_index = next_index;
-	      if (hdr_sr0)
-		memcpy (tr->sr, hdr_sr0, sizeof (tr->sr));
-	    }
-
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, sr_replicate_node.index,
-			       SR_REPLICATE_ERROR_REPLICATED,
-			       pkts_replicated);
-
-  vlib_node_increment_counter (vm, sr_replicate_node.index,
-			       SR_REPLICATE_ERROR_NO_BUFFER_DROPS,
-			       no_buffer_drops);
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (sr_replicate_node) = {
-  .function = sr_replicate_node_fn,
-  .name = "sr-replicate",
-  .vector_size = sizeof (u32),
-  .format_trace = format_sr_replicate_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(sr_replicate_error_strings),
-  .error_strings = sr_replicate_error_strings,
-
-  .n_next_nodes = SR_REPLICATE_N_NEXT,
-
-  .next_nodes = {
-        [SR_REPLICATE_NEXT_IP6_LOOKUP] = "ip6-lookup",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (sr_replicate_node, sr_replicate_node_fn)
-/* *INDENT-ON* */
-
-clib_error_t *
-sr_replicate_init (vlib_main_t * vm)
-{
-  sr_replicate_main_t *msm = &sr_replicate_main;
-
-  msm->vlib_main = vm;
-  msm->vnet_main = vnet_get_main ();
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (sr_replicate_init);
-
-#endif /* DPDK */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/srp/format.c b/vnet/vnet/srp/format.c
deleted file mode 100644
index a0250cc9..00000000
--- a/vnet/vnet/srp/format.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * srp_format.c: srp formatting/parsing.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/srp/srp.h>
-#include <vnet/ethernet/ethernet.h>
-
-static u8 * format_srp_mode (u8 * s, va_list * args)
-{
-  u32 mode = va_arg (*args, u32);
-  char * t = 0;
-  switch (mode)
-    {
-#define _(f) case SRP_MODE_##f: t = #f; break;
-  foreach_srp_mode
-#undef _
-    default: t = 0; break;
-    }
-  if (t)
-    s = format (s, "%s", t);
-  else
-    s = format (s, "unknown 0x%x", mode);
-
-  return s;
-}
-
-u8 * format_srp_header_with_length (u8 * s, va_list * args)
-{
-  srp_and_ethernet_header_t * h = va_arg (*args, srp_and_ethernet_header_t *);
-  u32 max_header_bytes = va_arg (*args, u32);
-  ethernet_main_t * em = &ethernet_main;
-  uword indent, header_bytes;
-
-  header_bytes = sizeof (h[0]);
-  if (max_header_bytes != 0 && header_bytes > max_header_bytes)
-    return format (s, "srp header truncated");
-
-  indent = format_get_indent (s);
-
-  s = format (s, "mode %U, ring %s, priority %d, ttl %d",
-	      format_srp_mode, h->srp.mode,
-	      h->srp.is_inner_ring ? "inner" : "outer",
-	      h->srp.priority, h->srp.ttl);
-
-  s = format (s, "\n%U%U: %U -> %U",
-	      format_white_space, indent,
-	      format_ethernet_type, clib_net_to_host_u16 (h->ethernet.type),
-	      format_ethernet_address, h->ethernet.src_address,
-	      format_ethernet_address, h->ethernet.dst_address);
-
-  if (max_header_bytes != 0 && header_bytes < max_header_bytes)
-    {
-      ethernet_type_info_t * ti;
-      vlib_node_t * node;
-
-      ti = ethernet_get_type_info (em, h->ethernet.type);
-      node = ti ? vlib_get_node (em->vlib_main, ti->node_index) : 0;
-      if (node && node->format_buffer)
-	s = format (s, "\n%U%U",
-		    format_white_space, indent,
-		    node->format_buffer, (void *) h + header_bytes,
-		    max_header_bytes - header_bytes);
-    }
-
-  return s;
-}
-
-u8 * format_srp_header (u8 * s, va_list * args)
-{
-  srp_header_t * m = va_arg (*args, srp_header_t *);
-  return format (s, "%U", format_srp_header_with_length, m, 0);
-}
-
-uword
-unformat_srp_header (unformat_input_t * input, va_list * args)
-{
-  u8 ** result = va_arg (*args, u8 **);
-  srp_and_ethernet_header_t * h;
-
-  {
-    void * p;
-    vec_add2 (*result, p, sizeof (h[0]));
-    h = p;
-  }
-
-  if (! unformat (input, "%U: %U -> %U",
-		  unformat_ethernet_type_net_byte_order, &h->ethernet.type,
-		  unformat_ethernet_address, &h->ethernet.src_address,
-		  unformat_ethernet_address, &h->ethernet.dst_address))
-    return 0;
-
-  h->srp.mode = SRP_MODE_data;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      u32 x;
-
-      if (unformat (input, "control"))
-	h->srp.mode = SRP_MODE_control_pass_to_host;
-      
-      else if (unformat (input, "pri %d", &x))
-	h->srp.priority = x;
-
-      else if (unformat (input, "ttl %d", &x))
-	h->srp.ttl = x;
-
-      else
-	return 0;
-    }
-
-  return 1;
-}
diff --git a/vnet/vnet/srp/interface.c b/vnet/vnet/srp/interface.c
deleted file mode 100644
index d427cc3c..00000000
--- a/vnet/vnet/srp/interface.c
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * srp_interface.c: srp interfaces
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/srp/srp.h>
-
-static u8*
-srp_build_rewrite (vnet_main_t * vnm,
-		   u32 sw_if_index,
-		   vnet_link_t link_type,
-		   const void * dst_address)
-{
-  vnet_hw_interface_t * hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  srp_main_t * sm = &srp_main;
-  srp_and_ethernet_header_t * h;
-  u8* rewrite = NULL;
-  u16 type;
-  uword n_bytes = sizeof (h[0]);
-
-  switch (link_type) {
-#define _(a,b) case VNET_LINK_##a: type = ETHERNET_TYPE_##b; break
-    _ (IP4, IP4);
-    _ (IP6, IP6);
-    _ (MPLS, MPLS_UNICAST);
-    _ (ARP, ARP);
-#undef _
-  default:
-      return (NULL);
-  }
-
-  vec_validate(rewrite, n_bytes-1);
-  h = (srp_and_ethernet_header_t *)rewrite;
-
-  clib_memcpy (h->ethernet.src_address, hw->hw_address, sizeof (h->ethernet.src_address));
-  if (dst_address)
-    clib_memcpy (h->ethernet.dst_address, dst_address, sizeof (h->ethernet.dst_address));
-  else
-    memset (h->ethernet.dst_address, ~0, sizeof (h->ethernet.dst_address)); /* broadcast */
-
-  h->ethernet.type = clib_host_to_net_u16 (type);
-
-  h->srp.as_u16 = 0;
-  h->srp.mode = SRP_MODE_data;
-  h->srp.ttl = sm->default_data_ttl;
-  srp_header_compute_parity (&h->srp);
-
-  return (rewrite);
-}
-
-static void srp_register_interface_helper (u32 * hw_if_indices_by_side, u32 redistribute);
-
-void serialize_srp_main (serialize_main_t * m, va_list * va)
-{
-  srp_main_t * sm = &srp_main;
-  srp_interface_t * si;
-
-  serialize_integer (m, pool_elts (sm->interface_pool), sizeof (u32));
-  pool_foreach (si, sm->interface_pool, ({
-    serialize_integer (m, si->rings[SRP_RING_OUTER].hw_if_index, sizeof (u32));
-    serialize_integer (m, si->rings[SRP_RING_INNER].hw_if_index, sizeof (u32));
-  }));
-}
-
-void unserialize_srp_main (serialize_main_t * m, va_list * va)
-{
-  u32 i, n_ifs, hw_if_indices[SRP_N_RING];
-
-  unserialize_integer (m, &n_ifs, sizeof (u32));
-  for (i = 0; i < n_ifs; i++)
-    {
-      unserialize_integer (m, &hw_if_indices[SRP_RING_OUTER], sizeof (u32));
-      unserialize_integer (m, &hw_if_indices[SRP_RING_INNER], sizeof (u32));
-      srp_register_interface_helper (hw_if_indices, /* redistribute */ 0);
-    }
-}
-
-static void serialize_srp_register_interface_msg (serialize_main_t * m, va_list * va)
-{
-  u32 * hw_if_indices = va_arg (*va, u32 *);
-  serialize_integer (m, hw_if_indices[SRP_SIDE_A], sizeof (hw_if_indices[SRP_SIDE_A]));
-  serialize_integer (m, hw_if_indices[SRP_SIDE_B], sizeof (hw_if_indices[SRP_SIDE_B]));
-}
-
-static void unserialize_srp_register_interface_msg (serialize_main_t * m, va_list * va)
-{
-  CLIB_UNUSED (mc_main_t * mcm) = va_arg (*va, mc_main_t *);
-  u32 hw_if_indices[SRP_N_SIDE];
-  srp_main_t * sm = &srp_main;
-  uword * p;
-
-  unserialize_integer (m, &hw_if_indices[SRP_SIDE_A], sizeof (hw_if_indices[SRP_SIDE_A]));
-  unserialize_integer (m, &hw_if_indices[SRP_SIDE_B], sizeof (hw_if_indices[SRP_SIDE_B]));
-
-  p = hash_get (sm->srp_register_interface_waiting_process_pool_index_by_hw_if_index,
-		hw_if_indices[0]);
-  if (p)
-    {
-      vlib_one_time_waiting_process_t * wp = pool_elt_at_index (sm->srp_register_interface_waiting_process_pool, p[0]);
-      vlib_signal_one_time_waiting_process (mcm->vlib_main, wp);
-      pool_put (sm->srp_register_interface_waiting_process_pool, wp);
-      hash_unset (sm->srp_register_interface_waiting_process_pool_index_by_hw_if_index,
-		  hw_if_indices[0]);
-    }
-  else
-    srp_register_interface_helper (hw_if_indices, /* redistribute */ 0);
-}
-
-MC_SERIALIZE_MSG (srp_register_interface_msg, static) = {
-  .name = "vnet_srp_register_interface",
-  .serialize = serialize_srp_register_interface_msg,
-  .unserialize = unserialize_srp_register_interface_msg,
-};
-
-static void srp_register_interface_helper (u32 * hw_if_indices_by_side, u32 redistribute)
-{
-  vnet_main_t * vnm = vnet_get_main();
-  srp_main_t * sm = &srp_main;
-  vlib_main_t * vm = sm->vlib_main;
-  srp_interface_t * si;
-  vnet_hw_interface_t * hws[SRP_N_RING];
-  uword s, * p;
-
-  if (vm->mc_main && redistribute)
-    {
-      vlib_one_time_waiting_process_t * wp;
-      mc_serialize (vm->mc_main, &srp_register_interface_msg, hw_if_indices_by_side);
-      pool_get (sm->srp_register_interface_waiting_process_pool, wp);
-      hash_set (sm->srp_register_interface_waiting_process_pool_index_by_hw_if_index,
-		hw_if_indices_by_side[0],
-		wp - sm->srp_register_interface_waiting_process_pool);
-      vlib_current_process_wait_for_one_time_event (vm, wp);
-    }
-
-  /* Check if interface has already been registered. */
-  p = hash_get (sm->interface_index_by_hw_if_index, hw_if_indices_by_side[0]);
-  if (p)
-    {
-      si = pool_elt_at_index (sm->interface_pool, p[0]);
-    }
-  else
-    {
-      pool_get (sm->interface_pool, si);
-      memset (si, 0, sizeof (si[0]));
-    }
-  for (s = 0; s < SRP_N_SIDE; s++)
-    {
-      hws[s] = vnet_get_hw_interface (vnm, hw_if_indices_by_side[s]);
-      si->rings[s].ring = s;
-      si->rings[s].hw_if_index = hw_if_indices_by_side[s];
-      si->rings[s].sw_if_index = hws[s]->sw_if_index;
-      hash_set (sm->interface_index_by_hw_if_index, hw_if_indices_by_side[s], si - sm->interface_pool);
-    }
-
-  /* Inherit MAC address from outer ring. */
-  clib_memcpy (si->my_address, hws[SRP_RING_OUTER]->hw_address,
-	  vec_len (hws[SRP_RING_OUTER]->hw_address));
-
-  /* Default time to wait to restore signal. */
-  si->config.wait_to_restore_idle_delay = 60;
-  si->config.ips_tx_interval = 1;
-}
-
-void srp_register_interface (u32 * hw_if_indices_by_side)
-{
-  srp_register_interface_helper (hw_if_indices_by_side, /* redistribute */ 1);
-}
-
-void srp_interface_set_hw_wrap_function (u32 hw_if_index, srp_hw_wrap_function_t * f)
-{
-  srp_interface_t * si = srp_get_interface_from_vnet_hw_interface (hw_if_index);
-  si->hw_wrap_function = f;
-}
-
-void srp_interface_set_hw_enable_function (u32 hw_if_index, srp_hw_enable_function_t * f)
-{
-  srp_interface_t * si = srp_get_interface_from_vnet_hw_interface (hw_if_index);
-  si->hw_enable_function = f;
-}
-
-void srp_interface_enable_ips (u32 hw_if_index)
-{
-  srp_main_t * sm = &srp_main;
-  srp_interface_t * si = srp_get_interface_from_vnet_hw_interface (hw_if_index);
-
-  si->ips_process_enable = 1;
-
-  vlib_node_set_state (sm->vlib_main, srp_ips_process_node.index, VLIB_NODE_STATE_POLLING);
-}
-
-static uword
-srp_is_valid_class_for_interface (vnet_main_t * vnm, u32 hw_if_index, u32 hw_class_index)
-{
-  srp_interface_t * si = srp_get_interface_from_vnet_hw_interface (hw_if_index);
-
-  if (! si)
-    return 0;
-
-  /* Both sides must be admin down. */
-  if (vnet_sw_interface_is_admin_up (vnm, si->rings[SRP_RING_OUTER].sw_if_index))
-    return 0;
-  if (vnet_sw_interface_is_admin_up (vnm, si->rings[SRP_RING_INNER].sw_if_index))
-    return 0;
-					 
-  return 1;
-}
-
-static void
-srp_interface_hw_class_change (vnet_main_t * vnm, u32 hw_if_index,
-			       u32 old_hw_class_index, u32 new_hw_class_index)
-{
-  srp_main_t * sm = &srp_main;
-  srp_interface_t * si = srp_get_interface_from_vnet_hw_interface (hw_if_index);
-  vnet_hw_interface_t * hi;
-  vnet_device_class_t * dc;
-  u32 r, to_srp;
-
-  if (!si) {
-      clib_warning ("srp interface no set si = 0");
-      return;
-  }
-
-  to_srp = new_hw_class_index == srp_hw_interface_class.index;
-
-  /* Changing class on either outer or inner rings implies changing the class
-     of the other. */
-  for (r = 0; r < SRP_N_RING; r++)
-    {
-      srp_interface_ring_t * ir = &si->rings[r];
-
-      hi = vnet_get_hw_interface (vnm, ir->hw_if_index);
-      dc = vnet_get_device_class (vnm, hi->dev_class_index);
-
-      /* hw_if_index itself will be handled by caller. */
-      if (ir->hw_if_index != hw_if_index)
-	{
-	  vnet_hw_interface_init_for_class (vnm, ir->hw_if_index,
-					    new_hw_class_index,
-					    to_srp ? si - sm->interface_pool : ~0);
-
-	  if (dc->hw_class_change)
-	    dc->hw_class_change (vnm, ir->hw_if_index, new_hw_class_index);
-	}
-      else
-	hi->hw_instance = to_srp ? si - sm->interface_pool : ~0;
-    }
-
-  if (si->hw_enable_function)
-    si->hw_enable_function (si, /* enable */ to_srp);
-}
-
-VNET_HW_INTERFACE_CLASS (srp_hw_interface_class) = {
-  .name = "SRP",
-  .format_address = format_ethernet_address,
-  .format_header = format_srp_header_with_length,
-  .format_device = format_srp_device,
-  .unformat_hw_address = unformat_ethernet_address,
-  .unformat_header = unformat_srp_header,
-  .build_rewrite = srp_build_rewrite,
-  .update_adjacency = ethernet_update_adjacency,
-  .is_valid_class_for_interface = srp_is_valid_class_for_interface,
-  .hw_class_change = srp_interface_hw_class_change,
-};
-
-static void serialize_srp_interface_config_msg (serialize_main_t * m, va_list * va)
-{
-  srp_interface_t * si = va_arg (*va, srp_interface_t *);
-  srp_main_t * sm = &srp_main;
-
-  ASSERT (! pool_is_free (sm->interface_pool, si));
-  serialize_integer (m, si - sm->interface_pool, sizeof (u32));
-  serialize (m, serialize_f64, si->config.wait_to_restore_idle_delay);
-  serialize (m, serialize_f64, si->config.ips_tx_interval);
-}
-
-static void unserialize_srp_interface_config_msg (serialize_main_t * m, va_list * va)
-{
-  CLIB_UNUSED (mc_main_t * mcm) = va_arg (*va, mc_main_t *);
-  srp_main_t * sm = &srp_main;
-  srp_interface_t * si;
-  u32 si_index;
-
-  unserialize_integer (m, &si_index, sizeof (u32));
-  si = pool_elt_at_index (sm->interface_pool, si_index);
-  unserialize (m, unserialize_f64, &si->config.wait_to_restore_idle_delay);
-  unserialize (m, unserialize_f64, &si->config.ips_tx_interval);
-}
-
-MC_SERIALIZE_MSG (srp_interface_config_msg, static) = {
-  .name = "vnet_srp_interface_config",
-  .serialize = serialize_srp_interface_config_msg,
-  .unserialize = unserialize_srp_interface_config_msg,
-};
-
-void srp_interface_get_interface_config (u32 hw_if_index, srp_interface_config_t * c)
-{
-  srp_interface_t * si = srp_get_interface_from_vnet_hw_interface (hw_if_index);
-  ASSERT (si != 0);
-  c[0] = si->config;
-}
-
-void srp_interface_set_interface_config (u32 hw_if_index, srp_interface_config_t * c)
-{
-  srp_main_t * sm = &srp_main;
-  vlib_main_t * vm = sm->vlib_main;
-  srp_interface_t * si = srp_get_interface_from_vnet_hw_interface (hw_if_index);
-  ASSERT (si != 0);
-  if (memcmp (&si->config, &c[0], sizeof (c[0])))
-    {
-      si->config = c[0];
-      if (vm->mc_main)
-	mc_serialize (vm->mc_main, &srp_interface_config_msg, si);
-    }
-}
-
-#if DEBUG > 0
-
-#define VNET_SIMULATED_SRP_TX_NEXT_SRP_INPUT VNET_INTERFACE_TX_N_NEXT
-
-/* Echo packets back to srp input. */
-static uword
-simulated_srp_interface_tx (vlib_main_t * vm,
-			    vlib_node_runtime_t * node,
-			    vlib_frame_t * frame)
-{
-  u32 n_left_from, n_left_to_next, n_copy, * from, * to_next;
-  u32 next_index = VNET_SIMULATED_SRP_TX_NEXT_SRP_INPUT;
-  u32 i;
-  vlib_buffer_t * b;
-
-  n_left_from = frame->n_vectors;
-  from = vlib_frame_args (frame);
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      n_copy = clib_min (n_left_from, n_left_to_next);
-
-      clib_memcpy (to_next, from, n_copy * sizeof (from[0]));
-      n_left_to_next -= n_copy;
-      n_left_from -= n_copy;
-      for (i = 0; i < n_copy; i++)
-	{
-	  b = vlib_get_buffer (vm, from[i]);
-	  /* TX interface will be fake eth; copy to RX for benefit of srp-input. */
-	  b->sw_if_index[VLIB_RX] = b->sw_if_index[VLIB_TX];
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return n_left_from;
-}
-
-static u8 * format_simulated_srp_name (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  return format (s, "fake-srp%d", dev_instance);
-}
-
-VNET_DEVICE_CLASS (srp_simulated_device_class,static) = {
-  .name = "Simulated srp",
-  .format_device_name = format_simulated_srp_name,
-  .tx_function = simulated_srp_interface_tx,
-};
-
-static clib_error_t *
-create_simulated_srp_interfaces (vlib_main_t * vm,
-				 unformat_input_t * input,
-				 vlib_cli_command_t * cmd)
-{
-  vnet_main_t * vnm = vnet_get_main();
-  u8 address[6];
-  u32 hw_if_index;
-  vnet_hw_interface_t * hi;
-  static u32 instance;
-
-  if (! unformat_user (input, unformat_ethernet_address, &address))
-    {
-      memset (address, 0, sizeof (address));
-      address[0] = 0xde;
-      address[1] = 0xad;
-      address[5] = instance;
-    }
-
-  hw_if_index = vnet_register_interface (vnm,
-					 srp_simulated_device_class.index,
-					 instance++,
-					 srp_hw_interface_class.index, 0);
-
-  hi = vnet_get_hw_interface (vnm, hw_if_index);
-
-  srp_setup_node (vm, hi->output_node_index);
-
-  hi->min_packet_bytes = 40 + 16;
-
-  /* Standard default ethernet MTU. */
-  hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] = 1500;
-
-  vec_free (hi->hw_address);
-  vec_add (hi->hw_address, address, sizeof (address));
-
-  {
-    uword slot;
-
-    slot = vlib_node_add_named_next_with_slot
-      (vm, hi->tx_node_index,
-       "srp-input",
-       VNET_SIMULATED_SRP_TX_NEXT_SRP_INPUT);
-    ASSERT (slot == VNET_SIMULATED_SRP_TX_NEXT_SRP_INPUT);
-  }
-
-  return /* no error */ 0;
-}
-
-static VLIB_CLI_COMMAND (create_simulated_srp_interface_command) = {
-  .path = "srp create-interfaces",
-  .short_help = "Create simulated srp interface",
-  .function = create_simulated_srp_interfaces,
-};
-#endif
diff --git a/vnet/vnet/srp/node.c b/vnet/vnet/srp/node.c
deleted file mode 100644
index 897be254..00000000
--- a/vnet/vnet/srp/node.c
+++ /dev/null
@@ -1,932 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * node.c: srp packet processing
- *
- * Copyright (c) 2011 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/ip/ip_packet.h>	/* for ip_csum_fold */
-#include <vnet/srp/srp.h>
-
-typedef struct {
-  u8 packet_data[32];
-} srp_input_trace_t;
-
-static u8 * format_srp_input_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  srp_input_trace_t * t = va_arg (*va, srp_input_trace_t *);
-
-  s = format (s, "%U", format_srp_header, t->packet_data);
-
-  return s;
-}
-
-typedef enum {
-  SRP_INPUT_NEXT_ERROR,
-  SRP_INPUT_NEXT_ETHERNET_INPUT,
-  SRP_INPUT_NEXT_CONTROL,
-  SRP_INPUT_N_NEXT,
-} srp_input_next_t;
-
-typedef struct {
-  u8 next_index;
-  u8 buffer_advance;
-  u16 error;
-} srp_input_disposition_t;
-
-static srp_input_disposition_t srp_input_disposition_by_mode[8] = {
-  [SRP_MODE_reserved0] = {
-    .next_index = SRP_INPUT_NEXT_ERROR,
-    .error = SRP_ERROR_UNKNOWN_MODE,
-  },
-  [SRP_MODE_reserved1] = {
-    .next_index = SRP_INPUT_NEXT_ERROR,
-    .error = SRP_ERROR_UNKNOWN_MODE,
-  },
-  [SRP_MODE_reserved2] = {
-    .next_index = SRP_INPUT_NEXT_ERROR,
-    .error = SRP_ERROR_UNKNOWN_MODE,
-  },
-  [SRP_MODE_reserved3] = {
-    .next_index = SRP_INPUT_NEXT_ERROR,
-    .error = SRP_ERROR_UNKNOWN_MODE,
-  },
-  [SRP_MODE_keep_alive] = {
-    .next_index = SRP_INPUT_NEXT_ERROR,
-    .error = SRP_ERROR_KEEP_ALIVE_DROPPED,
-  },
-  [SRP_MODE_data] = {
-    .next_index = SRP_INPUT_NEXT_ETHERNET_INPUT,
-    .buffer_advance = sizeof (srp_header_t),
-  },
-  [SRP_MODE_control_pass_to_host] = {
-    .next_index = SRP_INPUT_NEXT_CONTROL,
-  },
-  [SRP_MODE_control_locally_buffered_for_host] = {
-    .next_index = SRP_INPUT_NEXT_CONTROL,
-  },
-};
-
-static uword
-srp_input (vlib_main_t * vm,
-	   vlib_node_runtime_t * node,
-	   vlib_frame_t * from_frame)
-{
-  vnet_main_t * vnm = vnet_get_main();
-  srp_main_t * sm = &srp_main;
-  u32 n_left_from, next_index, * from, * to_next;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node,
-				   from,
-				   n_left_from,
-				   sizeof (from[0]),
-				   sizeof (srp_input_trace_t));
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1, sw_if_index0, sw_if_index1;
-	  vlib_buffer_t * b0, * b1;
-	  u8 next0, next1, error0, error1;
-	  srp_header_t * s0, * s1;
-	  srp_input_disposition_t * d0, * d1;
-	  vnet_hw_interface_t * hi0, * hi1;
-	  srp_interface_t * si0, * si1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * b2, * b3;
-
-	    b2 = vlib_get_buffer (vm, from[2]);
-	    b3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (b2, LOAD);
-	    vlib_prefetch_buffer_header (b3, LOAD);
-
-	    CLIB_PREFETCH (b2->data, sizeof (srp_header_t), LOAD);
-	    CLIB_PREFETCH (b3->data, sizeof (srp_header_t), LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  s0 = (void *) (b0->data + b0->current_data);
-	  s1 = (void *) (b1->data + b1->current_data);
-
-	  /* Data packets are always assigned to side A (outer ring) interface. */
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-
-	  hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
-	  hi1 = vnet_get_sup_hw_interface (vnm, sw_if_index1);
-
-	  si0 = pool_elt_at_index (sm->interface_pool, hi0->hw_instance);
-	  si1 = pool_elt_at_index (sm->interface_pool, hi1->hw_instance);
-
-	  sw_if_index0 = (s0->mode == SRP_MODE_data
-			  ? si0->rings[SRP_RING_OUTER].sw_if_index
-			  : sw_if_index0);
-	  sw_if_index1 = (s1->mode == SRP_MODE_data
-			  ? si1->rings[SRP_RING_OUTER].sw_if_index
-			  : sw_if_index1);
-	    
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = sw_if_index0;
-	  vnet_buffer (b1)->sw_if_index[VLIB_RX] = sw_if_index1;
-
-	  d0 = srp_input_disposition_by_mode + s0->mode;
-	  d1 = srp_input_disposition_by_mode + s1->mode;
-
-	  next0 = d0->next_index;
-	  next1 = d1->next_index;
-
-	  error0 = d0->error;
-	  error1 = d1->error;
-
-	  vlib_buffer_advance (b0, d0->buffer_advance);
-	  vlib_buffer_advance (b1, d1->buffer_advance);
-
-	  b0->error = node->errors[error0];
-	  b1->error = node->errors[error1];
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-    
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, sw_if_index0;
-	  vlib_buffer_t * b0;
-	  u8 next0, error0;
-	  srp_header_t * s0;
-	  srp_input_disposition_t * d0;
-	  srp_interface_t * si0;
-	  vnet_hw_interface_t * hi0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  n_left_from -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  s0 = (void *) (b0->data + b0->current_data);
-
-	  /* Data packets are always assigned to side A (outer ring) interface. */
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-
-	  hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
-
-	  si0 = pool_elt_at_index (sm->interface_pool, hi0->hw_instance);
-
-	  sw_if_index0 = (s0->mode == SRP_MODE_data
-			  ? si0->rings[SRP_RING_OUTER].sw_if_index
-			  : sw_if_index0);
-	    
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = sw_if_index0;
-
-	  d0 = srp_input_disposition_by_mode + s0->mode;
-
-	  next0 = d0->next_index;
-
-	  error0 = d0->error;
-
-	  vlib_buffer_advance (b0, d0->buffer_advance);
-
-	  b0->error = node->errors[error0];
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-static char * srp_error_strings[] = {
-#define _(f,s) s,
-  foreach_srp_error
-#undef _
-};
-
-static vlib_node_registration_t srp_input_node = {
-  .function = srp_input,
-  .name = "srp-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .n_errors = SRP_N_ERROR,
-  .error_strings = srp_error_strings,
-
-  .n_next_nodes = SRP_INPUT_N_NEXT,
-  .next_nodes = {
-    [SRP_INPUT_NEXT_ERROR] = "error-drop",
-    [SRP_INPUT_NEXT_ETHERNET_INPUT] = "ethernet-input",
-    [SRP_INPUT_NEXT_CONTROL] = "srp-control",
-  },
-
-  .format_buffer = format_srp_header_with_length,
-  .format_trace = format_srp_input_trace,
-  .unformat_buffer = unformat_srp_header,
-};
-
-static uword
-srp_topology_packet (vlib_main_t * vm, u32 sw_if_index, u8 ** contents)
-{
-  vnet_main_t * vnm = vnet_get_main();
-  vnet_hw_interface_t * hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  srp_topology_header_t * t;
-  srp_topology_mac_binding_t * mb;
-  u32 nb, nmb;
-
-  t = (void *) *contents;
-
-  nb = clib_net_to_host_u16 (t->n_bytes_of_data_that_follows);
-  nmb = (nb - sizeof (t->originator_address)) / sizeof (mb[0]);
-  if (vec_len (*contents) < sizeof (t[0]) + nmb * sizeof (mb[0]))
-    return SRP_ERROR_TOPOLOGY_BAD_LENGTH;
-
-  /* Fill in our source MAC address. */
-  clib_memcpy (t->ethernet.src_address, hi->hw_address, vec_len (hi->hw_address));
-
-  /* Make space for our MAC binding. */
-  vec_resize (*contents, sizeof (srp_topology_mac_binding_t));
-  t = (void *) *contents;
-  t->n_bytes_of_data_that_follows = clib_host_to_net_u16 (nb + sizeof (mb[0]));
-
-  mb = t->bindings + nmb;
-
-  mb->flags =
-    ((t->srp.is_inner_ring ? SRP_TOPOLOGY_MAC_BINDING_FLAG_IS_INNER_RING : 0)
-     | (/* is wrapped FIXME */ 0));
-  clib_memcpy (mb->address, hi->hw_address, vec_len (hi->hw_address));
-
-  t->control.checksum
-    = ~ip_csum_fold (ip_incremental_checksum (0, &t->control,
-					      vec_len (*contents) - STRUCT_OFFSET_OF (srp_generic_control_header_t, control)));
-
-  {
-    vlib_frame_t * f = vlib_get_frame_to_node (vm, hi->output_node_index);
-    vlib_buffer_t * b;
-    u32 * to_next = vlib_frame_vector_args (f);
-    u32 bi;
-
-    bi = vlib_buffer_add_data (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX,
-			       /* buffer to append to */ 0,
-			       *contents, vec_len (*contents));
-    b = vlib_get_buffer (vm, bi);
-    vnet_buffer (b)->sw_if_index[VLIB_RX] = vnet_buffer (b)->sw_if_index[VLIB_TX] = sw_if_index;
-    to_next[0] = bi;
-    f->n_vectors = 1;
-    vlib_put_frame_to_node (vm, hi->output_node_index, f);
-  }
-
-  return SRP_ERROR_CONTROL_PACKETS_PROCESSED;
-}
-
-typedef uword (srp_control_handler_function_t) (vlib_main_t * vm,
-						u32 sw_if_index,
-						u8 ** contents);
-
-static uword
-srp_control_input (vlib_main_t * vm,
-		   vlib_node_runtime_t * node,
-		   vlib_frame_t * from_frame)
-{
-  u32 n_left_from, next_index, * from, * to_next;
-  vlib_node_runtime_t * error_node;
-  static u8 * contents;
-
-  error_node = vlib_node_get_runtime (vm, srp_input_node.index);
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node,
-				   from,
-				   n_left_from,
-				   sizeof (from[0]),
-				   sizeof (srp_input_trace_t));
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, l2_len0, l3_len0;
-	  vlib_buffer_t * b0;
-	  u8 next0, error0;
-	  srp_generic_control_header_t * s0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-	  n_left_from -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  s0 = (void *) (b0->data + b0->current_data);
-	  l2_len0 = vlib_buffer_length_in_chain (vm, b0);
-	  l3_len0 = l2_len0 - STRUCT_OFFSET_OF (srp_generic_control_header_t, control);
-
-	  error0 = SRP_ERROR_CONTROL_PACKETS_PROCESSED;
-
-	  error0 = s0->control.version != 0 ? SRP_ERROR_CONTROL_VERSION_NON_ZERO : error0;
-
-	  {
-	    u16 save0 = s0->control.checksum;
-	    u16 computed0;
-	    s0->control.checksum = 0;
-	    computed0 = ~ip_csum_fold (ip_incremental_checksum (0, &s0->control, l3_len0));
-	    error0 = save0 != computed0 ? SRP_ERROR_CONTROL_BAD_CHECKSUM : error0;
-	  }
-
-	  if (error0 == SRP_ERROR_CONTROL_PACKETS_PROCESSED)
-	    {
-	      static srp_control_handler_function_t * t[SRP_N_CONTROL_PACKET_TYPE] = {
-		[SRP_CONTROL_PACKET_TYPE_topology] = srp_topology_packet,
-	      };
-	      srp_control_handler_function_t * f;
-
-	      f = 0;
-	      if (s0->control.type < ARRAY_LEN (t))
-		f = t[s0->control.type];
-
-	      if (f)
-		{
-		  vec_validate (contents, l2_len0 - 1);
-		  vlib_buffer_contents (vm, bi0, contents);
-		  error0 = f (vm, vnet_buffer (b0)->sw_if_index[VLIB_RX], &contents);
-		}
-	      else
-		error0 = SRP_ERROR_UNKNOWN_CONTROL;
-	    }
-
-	  b0->error = error_node->errors[error0];
-	  next0 = 0;
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-static vlib_node_registration_t srp_control_input_node = {
-  .function = srp_control_input,
-  .name = "srp-control",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .n_next_nodes = 1,
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-
-  .format_buffer = format_srp_header_with_length,
-  .format_trace = format_srp_input_trace,
-  .unformat_buffer = unformat_srp_header,
-};
-
-static u8 * format_srp_ips_request_type (u8 * s, va_list * args)
-{
-  u32 x = va_arg (*args, u32);
-  char * t = 0;
-  switch (x)
-    {
-#define _(f,n) case SRP_IPS_REQUEST_##f: t = #f; break;
-      foreach_srp_ips_request_type
-#undef _
-    default:
-      return format (s, "unknown 0x%x", x);
-    }
-  return format (s, "%U", format_c_identifier, t);
-}
-
-static u8 * format_srp_ips_status (u8 * s, va_list * args)
-{
-  u32 x = va_arg (*args, u32);
-  char * t = 0;
-  switch (x)
-    {
-#define _(f,n) case SRP_IPS_STATUS_##f: t = #f; break;
-      foreach_srp_ips_status
-#undef _
-    default:
-      return format (s, "unknown 0x%x", x);
-    }
-  return format (s, "%U", format_c_identifier, t);
-}
-
-static u8 * format_srp_ips_state (u8 * s, va_list * args)
-{
-  u32 x = va_arg (*args, u32);
-  char * t = 0;
-  switch (x)
-    {
-#define _(f) case SRP_IPS_STATE_##f: t = #f; break;
-      foreach_srp_ips_state
-#undef _
-    default:
-      return format (s, "unknown 0x%x", x);
-    }
-  return format (s, "%U", format_c_identifier, t);
-}
-
-static u8 * format_srp_ring (u8 * s, va_list * args)
-{
-  u32 ring = va_arg (*args, u32);
-  return format (s, "%s", ring == SRP_RING_INNER ? "inner" : "outer");
-}
-
-static u8 * format_srp_ips_header (u8 * s, va_list * args)
-{
-  srp_ips_header_t * h = va_arg (*args, srp_ips_header_t *);
-
-  s = format (s, "%U, %U, %U, %s-path",
-	      format_srp_ips_request_type, h->request_type,
-	      format_ethernet_address, h->originator_address,
-	      format_srp_ips_status, h->status,
-	      h->is_long_path ? "long" : "short");
-
-  return s;
-}
-
-static u8 * format_srp_interface (u8 * s, va_list * args)
-{
-  srp_interface_t * si = va_arg (*args, srp_interface_t *);
-  srp_interface_ring_t * ir;
-
-  s = format (s, "address %U, IPS state %U",
-	      format_ethernet_address, si->my_address,
-	      format_srp_ips_state, si->current_ips_state);
-  for (ir = si->rings; ir < si->rings + SRP_N_RING; ir++)
-    if (ir->rx_neighbor_address_valid)
-      s = format (s, ", %U neighbor %U",
-		  format_srp_ring, ir->ring,
-		  format_ethernet_address, ir->rx_neighbor_address);
-
-  return s;
-}
-
-u8 * format_srp_device (u8 * s, va_list * args)
-{
-  u32 hw_if_index = va_arg (*args, u32);
-  CLIB_UNUSED (int verbose) = va_arg (*args, int);
-  vnet_main_t * vnm = vnet_get_main();
-  srp_main_t * sm = &srp_main;
-  vnet_hw_interface_t * hi = vnet_get_hw_interface (vnm, hw_if_index);
-  srp_interface_t * si = pool_elt_at_index (sm->interface_pool, hi->hw_instance);
-  return format (s, "%U", format_srp_interface, si);
-}
-
-always_inline srp_interface_t *
-srp_get_interface (u32 sw_if_index, srp_ring_type_t * ring)
-{
-  vnet_main_t * vnm = vnet_get_main();
-  srp_main_t * sm = &srp_main;
-  vnet_hw_interface_t * hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
-  srp_interface_t * si;
-
-  ASSERT (hi->hw_class_index == srp_hw_interface_class.index);
-  si = pool_elt_at_index (sm->interface_pool, hi->hw_instance);
-
-  ASSERT (si->rings[SRP_RING_INNER].hw_if_index == hi->hw_if_index
-	  || si->rings[SRP_RING_OUTER].hw_if_index == hi->hw_if_index);
-  if (ring)
-    *ring =
-      (hi->hw_if_index == si->rings[SRP_RING_INNER].hw_if_index
-       ? SRP_RING_INNER
-       : SRP_RING_OUTER);
-
-  return si;
-}
-
-static void init_ips_packet (srp_interface_t * si,
-			     srp_ring_type_t tx_ring,
-			     srp_ips_header_t * i)
-{
-  memset (i, 0, sizeof (i[0]));
-
-  i->srp.ttl = 1;
-  i->srp.is_inner_ring = tx_ring;
-  i->srp.priority = 7;
-  i->srp.mode = SRP_MODE_control_locally_buffered_for_host;
-  srp_header_compute_parity (&i->srp);
-
-  clib_memcpy (&i->ethernet.src_address, &si->my_address, sizeof (si->my_address));
-  i->ethernet.type = clib_host_to_net_u16 (ETHERNET_TYPE_SRP_CONTROL);
-
-  /* Checksum will be filled in later. */
-  i->control.version = 0;
-  i->control.type = SRP_CONTROL_PACKET_TYPE_ips;
-  i->control.ttl = 255;
-
-  clib_memcpy (&i->originator_address, &si->my_address, sizeof (si->my_address));
-}
-
-static void tx_ips_packet (srp_interface_t * si,
-			   srp_ring_type_t tx_ring,
-			   srp_ips_header_t * i)
-{
-  srp_main_t * sm = &srp_main;
-  vnet_main_t * vnm = vnet_get_main();
-  vlib_main_t * vm = sm->vlib_main;
-  vnet_hw_interface_t * hi = vnet_get_hw_interface (vnm, si->rings[tx_ring].hw_if_index);
-  vlib_frame_t * f;
-  vlib_buffer_t * b;
-  u32 * to_next, bi;
-
-  if (! vnet_sw_interface_is_admin_up (vnm, hi->sw_if_index))
-    return;
-  if (hi->hw_class_index != srp_hw_interface_class.index)
-    return;
-
-  i->control.checksum
-    = ~ip_csum_fold (ip_incremental_checksum (0, &i->control,
-					      sizeof (i[0]) - STRUCT_OFFSET_OF (srp_ips_header_t, control)));
-
-  bi = vlib_buffer_add_data (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX,
-			     /* buffer to append to */ 0,
-			     i, sizeof (i[0]));
-
-  /* FIXME trace. */
-  if (0)
-    clib_warning ("%U %U",
-		  format_vnet_sw_if_index_name, vnm, hi->sw_if_index,
-		  format_srp_ips_header, i);
-
-  b = vlib_get_buffer (vm, bi);
-  vnet_buffer (b)->sw_if_index[VLIB_RX] = vnet_buffer (b)->sw_if_index[VLIB_TX] = hi->sw_if_index;
-
-  f = vlib_get_frame_to_node (vm, hi->output_node_index);
-  to_next = vlib_frame_vector_args (f);
-  to_next[0] = bi;
-  f->n_vectors = 1;
-  vlib_put_frame_to_node (vm, hi->output_node_index, f);
-}
-
-static void serialize_srp_interface_state_msg (serialize_main_t * m, va_list * va)
-{
-  srp_interface_t * si = va_arg (*va, srp_interface_t *);
-  srp_main_t * sm = &srp_main;
-  int r;
-
-  ASSERT (! pool_is_free (sm->interface_pool, si));
-  serialize_integer (m, si - sm->interface_pool, sizeof (u32));
-  serialize_likely_small_unsigned_integer (m, si->current_ips_state);
-  for (r = 0; r < SRP_N_RING; r++)
-    {
-      srp_interface_ring_t * ir = &si->rings[r];
-      void * p;
-      serialize_likely_small_unsigned_integer (m, ir->rx_neighbor_address_valid);
-      if (ir->rx_neighbor_address_valid)
-	{
-	  p = serialize_get (m, sizeof (ir->rx_neighbor_address));
-	  clib_memcpy (p, ir->rx_neighbor_address, sizeof (ir->rx_neighbor_address));
-	}
-      serialize_likely_small_unsigned_integer (m, ir->waiting_to_restore);
-      if (ir->waiting_to_restore)
-	serialize (m, serialize_f64, ir->wait_to_restore_start_time);
-    }
-}
-
-static void unserialize_srp_interface_state_msg (serialize_main_t * m, va_list * va)
-{
-  CLIB_UNUSED (mc_main_t * mcm) = va_arg (*va, mc_main_t *);
-  srp_main_t * sm = &srp_main;
-  srp_interface_t * si;
-  u32 si_index, r;
-
-  unserialize_integer (m, &si_index, sizeof (u32));
-  si = pool_elt_at_index (sm->interface_pool, si_index);
-  si->current_ips_state = unserialize_likely_small_unsigned_integer (m);
-  for (r = 0; r < SRP_N_RING; r++)
-    {
-      srp_interface_ring_t * ir = &si->rings[r];
-      void * p;
-      ir->rx_neighbor_address_valid = unserialize_likely_small_unsigned_integer (m);
-      if (ir->rx_neighbor_address_valid)
-	{
-	  p = unserialize_get (m, sizeof (ir->rx_neighbor_address));
-	  clib_memcpy (ir->rx_neighbor_address, p, sizeof (ir->rx_neighbor_address));
-	}
-      ir->waiting_to_restore = unserialize_likely_small_unsigned_integer (m);
-      if (ir->waiting_to_restore)
-	unserialize (m, unserialize_f64, &ir->wait_to_restore_start_time);
-    }
-}
-
-MC_SERIALIZE_MSG (srp_interface_state_msg, static) = {
-  .name = "vnet_srp_interface_state",
-  .serialize = serialize_srp_interface_state_msg,
-  .unserialize = unserialize_srp_interface_state_msg,
-};
-
-static int requests_switch (srp_ips_request_type_t r)
-{
-  static u8 t[16] = {
-    [SRP_IPS_REQUEST_forced_switch] = 1,
-    [SRP_IPS_REQUEST_manual_switch] = 1,
-    [SRP_IPS_REQUEST_signal_fail] = 1,
-    [SRP_IPS_REQUEST_signal_degrade] = 1,
-  };
-  return (int) r < ARRAY_LEN (t) ? t[r] : 0;
-}
-
-/* Called when an IPS control packet is received on given interface. */
-void srp_ips_rx_packet (u32 sw_if_index, srp_ips_header_t * h)
-{
-  vnet_main_t * vnm = vnet_get_main();
-  vlib_main_t * vm = srp_main.vlib_main;
-  srp_ring_type_t rx_ring;
-  srp_interface_t * si = srp_get_interface (sw_if_index, &rx_ring);
-  srp_interface_ring_t * ir = &si->rings[rx_ring];
-  int si_needs_broadcast = 0;
-
-  /* FIXME trace. */
-  if (0)
-    clib_warning ("%U %U %U",
-		  format_time_interval, "h:m:s:u", vlib_time_now (vm),
-		  format_vnet_sw_if_index_name, vnm, sw_if_index,
-		  format_srp_ips_header, h);
-
-  /* Ignore self-generated IPS packets. */
-  if (! memcmp (h->originator_address, si->my_address, sizeof (h->originator_address)))
-    goto done;
-
-  /* Learn neighbor address from short path messages. */
-  if (! h->is_long_path)
-    {
-      if (ir->rx_neighbor_address_valid
-	  && memcmp (ir->rx_neighbor_address, h->originator_address, sizeof (ir->rx_neighbor_address)))
-	{
-	  ASSERT (0);
-	}
-      ir->rx_neighbor_address_valid = 1;
-      clib_memcpy (ir->rx_neighbor_address, h->originator_address, sizeof (ir->rx_neighbor_address));
-    }
-
-  switch (si->current_ips_state)
-    {
-    case SRP_IPS_STATE_idle:
-      /* Received {REQ,NEIGHBOR,W,S} in idle state: wrap. */
-      if (requests_switch (h->request_type)
-	  && ! h->is_long_path
-	  && h->status == SRP_IPS_STATUS_wrapped)
-	{
-	  srp_ips_header_t to_tx[2];
-
-	  si_needs_broadcast = 1;
-	  si->current_ips_state = SRP_IPS_STATE_wrapped;
-	  si->hw_wrap_function (si->rings[SRP_SIDE_A].hw_if_index, /* enable_wrap */ 1);
-	  si->hw_wrap_function (si->rings[SRP_SIDE_B].hw_if_index, /* enable_wrap */ 1);
-
-	  init_ips_packet (si, rx_ring ^ 0, &to_tx[0]);
-	  to_tx[0].request_type = SRP_IPS_REQUEST_idle;
-	  to_tx[0].status = SRP_IPS_STATUS_wrapped;
-	  to_tx[0].is_long_path = 0;
-	  tx_ips_packet (si, rx_ring ^ 0, &to_tx[0]);
-
-	  init_ips_packet (si, rx_ring ^ 1, &to_tx[1]);
-	  to_tx[1].request_type = h->request_type;
-	  to_tx[1].status = SRP_IPS_STATUS_wrapped;
-	  to_tx[1].is_long_path = 1;
-	  tx_ips_packet (si, rx_ring ^ 1, &to_tx[1]);
-	}
-      break;
-
-    case SRP_IPS_STATE_wrapped:
-      if (! h->is_long_path
-	  && h->request_type == SRP_IPS_REQUEST_idle
-	  && h->status == SRP_IPS_STATUS_idle)
-	{
-	  si_needs_broadcast = 1;
-	  si->current_ips_state = SRP_IPS_STATE_idle;
-	  si->hw_wrap_function (si->rings[SRP_SIDE_A].hw_if_index, /* enable_wrap */ 0);
-	  si->hw_wrap_function (si->rings[SRP_SIDE_B].hw_if_index, /* enable_wrap */ 0);
-	}
-      break;
-
-    case SRP_IPS_STATE_pass_thru:
-      /* FIXME */
-      break;
-
-    default:
-      abort ();
-      break;
-    }
-
- done:
-  if (vm->mc_main && si_needs_broadcast)
-    mc_serialize (vm->mc_main, &srp_interface_state_msg, si);
-}
-
-/* Preform local IPS request on given interface. */
-void srp_ips_local_request (u32 sw_if_index, srp_ips_request_type_t request)
-{
-  vnet_main_t * vnm = vnet_get_main();
-  srp_main_t * sm = &srp_main;
-  vlib_main_t * vm = sm->vlib_main;
-  srp_ring_type_t rx_ring;
-  srp_interface_t * si = srp_get_interface (sw_if_index, &rx_ring);
-  srp_interface_ring_t * ir = &si->rings[rx_ring];
-  int si_needs_broadcast = 0;
-
-  if (request == SRP_IPS_REQUEST_wait_to_restore)
-    {
-      if (si->current_ips_state != SRP_IPS_STATE_wrapped)
-	return;
-      if (! ir->waiting_to_restore)
-	{
-	  ir->wait_to_restore_start_time = vlib_time_now (sm->vlib_main);
-	  ir->waiting_to_restore = 1;
-	  si_needs_broadcast = 1;
-	}
-    }
-  else
-    {
-      /* FIXME handle local signal fail. */
-      si_needs_broadcast = ir->waiting_to_restore;
-      ir->wait_to_restore_start_time = 0;
-      ir->waiting_to_restore = 0;
-    }
-
-  /* FIXME trace. */
-  if (0)
-    clib_warning ("%U %U",
-		  format_vnet_sw_if_index_name, vnm, sw_if_index,
-		  format_srp_ips_request_type, request);
-
-  if (vm->mc_main && si_needs_broadcast)
-    mc_serialize (vm->mc_main, &srp_interface_state_msg, si);
-}
-
-static void maybe_send_ips_message (srp_interface_t * si)
-{
-  srp_main_t * sm = &srp_main;
-  srp_ips_header_t to_tx[2];
-  srp_ring_type_t rx_ring = SRP_RING_OUTER;
-  srp_interface_ring_t * r0 = &si->rings[rx_ring ^ 0];
-  srp_interface_ring_t * r1 = &si->rings[rx_ring ^ 1];
-  f64 now = vlib_time_now (sm->vlib_main);
-
-  if (! si->ips_process_enable)
-    return;
-
-  if (si->current_ips_state == SRP_IPS_STATE_wrapped
-      && r0->waiting_to_restore
-      && r1->waiting_to_restore
-      && now >= r0->wait_to_restore_start_time + si->config.wait_to_restore_idle_delay
-      && now >= r1->wait_to_restore_start_time + si->config.wait_to_restore_idle_delay)
-    {
-      si->current_ips_state = SRP_IPS_STATE_idle;
-      r0->waiting_to_restore = r1->waiting_to_restore = 0;
-      r0->wait_to_restore_start_time = r1->wait_to_restore_start_time = 0;
-    }
-
-  if (si->current_ips_state != SRP_IPS_STATE_idle)
-    return;
-
-  init_ips_packet (si, rx_ring ^ 0, &to_tx[0]);
-  init_ips_packet (si, rx_ring ^ 1, &to_tx[1]);
-
-  if (si->current_ips_state == SRP_IPS_STATE_idle)
-    {
-      to_tx[0].request_type = to_tx[1].request_type = SRP_IPS_REQUEST_idle;
-      to_tx[0].status = to_tx[1].status = SRP_IPS_STATUS_idle;
-      to_tx[0].is_long_path = to_tx[1].is_long_path = 0;
-    }
-
-  else if (si->current_ips_state == SRP_IPS_STATE_wrapped)
-    {
-      to_tx[0].request_type =
-	(si->rings[rx_ring ^ 0].waiting_to_restore
-	 ? SRP_IPS_REQUEST_wait_to_restore
-	 : SRP_IPS_REQUEST_signal_fail);
-      to_tx[1].request_type =
-	(si->rings[rx_ring ^ 1].waiting_to_restore
-	 ? SRP_IPS_REQUEST_wait_to_restore
-	 : SRP_IPS_REQUEST_signal_fail);
-      to_tx[0].status = to_tx[1].status = SRP_IPS_STATUS_wrapped;
-      to_tx[0].is_long_path = 0;
-      to_tx[1].is_long_path = 1;
-    }
-
-  tx_ips_packet (si, rx_ring ^ 0, &to_tx[0]);
-  tx_ips_packet (si, rx_ring ^ 1, &to_tx[1]);
-}
-
-static uword
-srp_ips_process (vlib_main_t * vm,
-		 vlib_node_runtime_t * rt,
-		 vlib_frame_t * f)
-{
-  srp_main_t * sm = &srp_main;
-  srp_interface_t * si;
-
-  while (1)
-    {
-      pool_foreach (si, sm->interface_pool, ({
-	maybe_send_ips_message (si);
-      }));
-      vlib_process_suspend (vm, 1.0);
-    }
-
-  return 0;
-}
-
-vlib_node_registration_t srp_ips_process_node = {
-    .function = srp_ips_process,
-    .type = VLIB_NODE_TYPE_PROCESS,
-    .name = "srp-ips-process",
-    .state = VLIB_NODE_STATE_DISABLED,
-};
-
-static clib_error_t * srp_init (vlib_main_t * vm)
-{
-  srp_main_t * sm = &srp_main;
-
-  sm->default_data_ttl = 255;
-  sm->vlib_main = vm;
-  vlib_register_node (vm, &srp_ips_process_node);
-  vlib_register_node (vm, &srp_input_node);
-  vlib_register_node (vm, &srp_control_input_node);
-  srp_setup_node (vm, srp_input_node.index);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (srp_init);
diff --git a/vnet/vnet/srp/packet.h b/vnet/vnet/srp/packet.h
deleted file mode 100644
index 96dab648..00000000
--- a/vnet/vnet/srp/packet.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * srp/packet.h: srp packet format.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_srp_packet_h
-#define included_srp_packet_h
-
-#include <vppinfra/byte_order.h>
-#include <vppinfra/bitops.h>
-#include <vnet/ethernet/packet.h>
-
-/* SRP version 2. */
-
-#define foreach_srp_mode			\
-  _ (reserved0)					\
-  _ (reserved1)					\
-  _ (reserved2)					\
-  _ (reserved3)					\
-  _ (control_pass_to_host)			\
-  _ (control_locally_buffered_for_host)		\
-  _ (keep_alive)				\
-  _ (data)
-
-typedef enum {
-#define _(f) SRP_MODE_##f,
-  foreach_srp_mode
-#undef _
-  SRP_N_MODE,
-} srp_mode_t;
-
-typedef union {
-  /* For computing parity bit. */
-  u16 as_u16;
-
-  struct {
-    u8 ttl;
-
-#if CLIB_ARCH_IS_BIG_ENDIAN
-    u8 is_inner_ring : 1;
-    u8 mode : 3;
-    u8 priority : 3;
-    u8 parity : 1;
-#endif
-#if CLIB_ARCH_IS_LITTLE_ENDIAN
-    u8 parity : 1;
-    u8 priority : 3;
-    u8 mode : 3;
-    u8 is_inner_ring : 1;
-#endif
-  };
-} srp_header_t;
-
-always_inline void
-srp_header_compute_parity (srp_header_t * h)
-{
-  h->parity = 0;
-  h->parity = count_set_bits (h->as_u16) ^ 1; /* odd parity */
-}
-
-typedef struct {
-  srp_header_t srp;
-  ethernet_header_t ethernet;
-} srp_and_ethernet_header_t;
-
-#define foreach_srp_control_packet_type		\
-  _ (reserved)					\
-  _ (topology)					\
-  _ (ips)
-
-typedef enum {
-#define _(f) SRP_CONTROL_PACKET_TYPE_##f,
-  foreach_srp_control_packet_type
-#undef _
-  SRP_N_CONTROL_PACKET_TYPE,
-} srp_control_packet_type_t;
-
-typedef CLIB_PACKED (struct {
-  /* Set to 0. */
-  u8 version;
-
-  srp_control_packet_type_t type : 8;
-
-  /* IP4-like checksum of packet starting with start of control header. */
-  u16 checksum;
-
-  u16 ttl;
-}) srp_control_header_t;
-
-typedef struct {
-  srp_header_t srp;
-  ethernet_header_t ethernet;
-  srp_control_header_t control;
-} srp_generic_control_header_t;
-
-typedef struct {
-  u8 flags;
-#define SRP_TOPOLOGY_MAC_BINDING_FLAG_IS_INNER_RING (1 << 6)
-#define SRP_TOPOLOGY_MAC_BINDING_FLAG_IS_WRAPPED (1 << 5)
-
-  /* MAC address. */
-  u8 address[6];
-} srp_topology_mac_binding_t;
-
-typedef CLIB_PACKED (struct {
-  srp_header_t srp;
-  ethernet_header_t ethernet;
-  srp_control_header_t control;
-
-  /* Length in bytes of data that follows. */
-  u16 n_bytes_of_data_that_follows;
-
-  /* MAC address of originator of this topology request. */
-  u8 originator_address[6];
-
-  /* Bindings follow. */
-  srp_topology_mac_binding_t bindings[0];
-}) srp_topology_header_t;
-
-#define foreach_srp_ips_request_type		\
-  _ (idle, 0x0)					\
-  _ (wait_to_restore, 0x5)			\
-  _ (manual_switch, 0x6)			\
-  _ (signal_degrade, 0x8)			\
-  _ (signal_fail, 0xb)				\
-  _ (forced_switch, 0xd)
-
-typedef enum {
-#define _(f,n) SRP_IPS_REQUEST_##f = n,
-  foreach_srp_ips_request_type
-#undef _
-} srp_ips_request_type_t;
-
-#define foreach_srp_ips_status			\
-  _ (idle, 0x0)					\
-  _ (wrapped, 0x2)
-
-typedef enum {
-#define _(f,n) SRP_IPS_STATUS_##f = n,
-  foreach_srp_ips_status
-#undef _
-} srp_ips_status_t;
-
-typedef struct {
-  srp_header_t srp;
-  ethernet_header_t ethernet;
-  srp_control_header_t control;
-  u8 originator_address[6];
-
-  union {
-    u8 ips_octet;
-
-    struct {
-#if CLIB_ARCH_IS_BIG_ENDIAN
-      u8 request_type : 4;
-      u8 is_long_path : 1;
-      u8 status : 3;
-#endif
-#if CLIB_ARCH_IS_LITTLE_ENDIAN
-      u8 status : 3;
-      u8 is_long_path : 1;
-      u8 request_type : 4;
-#endif
-    };
-  };
-
-  u8 reserved;
-} srp_ips_header_t;
-
-#endif /* included_srp_packet_h */
diff --git a/vnet/vnet/srp/pg.c b/vnet/vnet/srp/pg.c
deleted file mode 100644
index 54f1a3bb..00000000
--- a/vnet/vnet/srp/pg.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * srp/pg.c: packet generator srp interface
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/srp/srp.h>
-#include <vnet/ethernet/ethernet.h>
-
-typedef struct {
-  pg_edit_t ttl;
-  pg_edit_t is_inner_ring;
-  pg_edit_t mode;
-  pg_edit_t priority;
-  pg_edit_t parity;
-  pg_edit_t type;
-  pg_edit_t src_address;
-  pg_edit_t dst_address;
-} pg_srp_header_t;
-
-static inline void
-pg_srp_header_init (pg_srp_header_t * e)
-{
-  pg_edit_init (&e->ttl, srp_and_ethernet_header_t, srp.ttl);
-  pg_edit_init_bitfield (&e->is_inner_ring, srp_and_ethernet_header_t,
-			 srp.as_u16,
-			 7, 1);
-  pg_edit_init_bitfield (&e->mode, srp_and_ethernet_header_t,
-			 srp.as_u16,
-			 4, 3);
-  pg_edit_init_bitfield (&e->priority, srp_and_ethernet_header_t,
-			 srp.as_u16,
-			 1, 3);
-  pg_edit_init_bitfield (&e->parity, srp_and_ethernet_header_t,
-			 srp.as_u16,
-			 0, 1);
-  pg_edit_init (&e->type, srp_and_ethernet_header_t, ethernet.type);
-  pg_edit_init (&e->src_address, srp_and_ethernet_header_t, ethernet.src_address);
-  pg_edit_init (&e->dst_address, srp_and_ethernet_header_t, ethernet.dst_address);
-}
-
-uword
-unformat_pg_srp_header (unformat_input_t * input, va_list * args)
-{
-  pg_stream_t * s = va_arg (*args, pg_stream_t *);
-  pg_srp_header_t * e;
-  u32 error, group_index;
-  
-  e = pg_create_edit_group (s, sizeof (e[0]), sizeof (srp_header_t),
-			    &group_index);
-  pg_srp_header_init (e);
-
-  error = 1;
-  if (! unformat (input, "%U: %U -> %U",
-		  unformat_pg_edit,
-		    unformat_ethernet_type_net_byte_order, &e->type,
-		  unformat_pg_edit,
-		    unformat_ethernet_address, &e->src_address,
-		  unformat_pg_edit,
-		    unformat_ethernet_address, &e->dst_address))
-    goto done;
-
-  {
-    srp_header_t h;
-
-    h.as_u16 = 0;
-    h.mode = SRP_MODE_data;
-    h.ttl = 255;
-    h.parity = count_set_bits (h.as_u16) ^ 1;
-  
-    pg_edit_set_fixed (&e->mode, h.mode);
-    pg_edit_set_fixed (&e->ttl, h.ttl);
-    pg_edit_set_fixed (&e->is_inner_ring, h.is_inner_ring);
-    pg_edit_set_fixed (&e->priority, h.priority);
-    pg_edit_set_fixed (&e->parity, h.parity);
-  }
-
-  error = 0;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "mode %U",
-		    unformat_pg_edit,
-		    unformat_pg_number, &e->mode))
-	;
-      else if (unformat (input, "ttl %U",
-			 unformat_pg_edit,
-			 unformat_pg_number, &e->ttl))
-	;
-      else if (unformat (input, "priority %U",
-			 unformat_pg_edit,
-			 unformat_pg_number, &e->priority))
-	;
-      else
-	break;
-    }
-      
-  {
-    ethernet_main_t * em = &ethernet_main;
-    ethernet_type_info_t * ti = 0;
-    pg_node_t * pg_node = 0;
-
-    if (e->type.type == PG_EDIT_FIXED)
-      {
-	u16 t = *(u16 *) e->type.values[PG_EDIT_LO];
-	ti = ethernet_get_type_info (em, clib_net_to_host_u16 (t));
-	if (ti && ti->node_index != ~0)
-	  pg_node = pg_get_node (ti->node_index);
-      }
-
-    if (pg_node && pg_node->unformat_edit
-	&& unformat_user (input, pg_node->unformat_edit, s))
-      ;
-    else if (! unformat_user (input, unformat_pg_payload, s))
-      goto done;
-  }
-
- done:
-  if (error)
-    pg_free_edit_group (s);
-  return error == 0;
-}
-
diff --git a/vnet/vnet/srp/srp.h b/vnet/vnet/srp/srp.h
deleted file mode 100644
index 5288ebe4..00000000
--- a/vnet/vnet/srp/srp.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * srp.h: types/functions for srp.
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_srp_h
-#define included_srp_h
-
-#include <vnet/vnet.h>
-#include <vnet/srp/packet.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/pg/pg.h>
-
-extern vnet_hw_interface_class_t srp_hw_interface_class;
-
-/* See RFC 2892. */
-#define foreach_srp_ips_state			\
-  _ (idle)					\
-  _ (pass_thru)					\
-  _ (wrapped)
-
-typedef enum {
-#define _(f) SRP_IPS_STATE_##f,
-  foreach_srp_ips_state
-#undef _
-  SRP_N_IPS_STATE,
-} srp_ips_state_t;
-
-typedef enum {
-  SRP_RING_OUTER,
-  SRP_RING_INNER,
-  SRP_N_RING = 2,
-  SRP_SIDE_A = SRP_RING_OUTER,	/* outer rx, inner tx */
-  SRP_SIDE_B = SRP_RING_INNER,	/* inner rx, outer tx */
-  SRP_N_SIDE = 2,
-} srp_ring_type_t;
-
-typedef struct {
-  srp_ring_type_t ring;
-
-  /* Hardware interface for this ring/side. */
-  u32 hw_if_index;
-
-  /* Software interface corresponding to hardware interface. */
-  u32 sw_if_index;
-
-  /* Mac address of neighbor on RX fiber. */
-  u8 rx_neighbor_address[6];
-
-  u8 rx_neighbor_address_valid;
-
-  /* True if we are waiting to restore signal. */
-  u8 waiting_to_restore;
-
-  /* Time stamp when signal became valid. */
-  f64 wait_to_restore_start_time;
-} srp_interface_ring_t;
-
-struct srp_interface_t;
-typedef void (srp_hw_wrap_function_t) (u32 hw_if_index, u32 wrap_enable);
-typedef void (srp_hw_enable_function_t) (struct srp_interface_t * si, u32 wrap_enable);
-
-typedef struct {
-  /* Delay between wait to restore event and entering idle state in seconds. */
-  f64 wait_to_restore_idle_delay;
-
-  /* Number of seconds between sending ips messages to neighbors. */
-  f64 ips_tx_interval;
-} srp_interface_config_t;
-
-typedef struct srp_interface_t {
-  /* Current IPS state. */
-  srp_ips_state_t current_ips_state;
-
-  /* Address for this interface. */
-  u8 my_address[6];
-
-  /* Enable IPS process handling for this interface. */
-  u8 ips_process_enable;
-
-  srp_interface_ring_t rings[SRP_N_RING];
-
-  /* Configurable parameters. */
-  srp_interface_config_t config;
-
-  srp_hw_wrap_function_t * hw_wrap_function;
-
-  srp_hw_enable_function_t * hw_enable_function;
-} srp_interface_t;
-
-typedef struct {
-  vlib_main_t * vlib_main;
-
-  /* Pool of SRP interfaces. */
-  srp_interface_t * interface_pool;
-
-  uword * interface_index_by_hw_if_index;
-
-  /* TTL to use for outgoing data packets. */
-  u32 default_data_ttl;
-
-  vlib_one_time_waiting_process_t * srp_register_interface_waiting_process_pool;
-
-  uword * srp_register_interface_waiting_process_pool_index_by_hw_if_index;
-} srp_main_t;
-
-/* Registers sides A/B hardware interface as being SRP capable. */
-void srp_register_interface (u32 * hw_if_indices);
-
-/* Enable sending IPS messages for interface implied by given vlib hardware interface. */
-void srp_interface_enable_ips (u32 hw_if_index);
-
-/* Set function to wrap hardware side of SRP interface. */
-void srp_interface_set_hw_wrap_function (u32 hw_if_index, srp_hw_wrap_function_t * f);
-
-void srp_interface_set_hw_enable_function (u32 hw_if_index, srp_hw_enable_function_t * f);
-
-extern vlib_node_registration_t srp_ips_process_node;
-
-/* Called when an IPS control packet is received on given interface. */
-void srp_ips_rx_packet (u32 sw_if_index, srp_ips_header_t * ips_packet);
-
-/* Preform local IPS request on given interface. */
-void srp_ips_local_request (u32 sw_if_index, srp_ips_request_type_t request);
-
-always_inline void
-srp_ips_link_change (u32 sw_if_index, u32 link_is_up)
-{
-  srp_ips_local_request (sw_if_index,
-			 link_is_up
-			 ? SRP_IPS_REQUEST_wait_to_restore
-			 : SRP_IPS_REQUEST_signal_fail);
-}
-
-void srp_interface_get_interface_config (u32 hw_if_index, srp_interface_config_t * c);
-void srp_interface_set_interface_config (u32 hw_if_index, srp_interface_config_t * c);
-
-srp_main_t srp_main;
-
-always_inline srp_interface_t *
-srp_get_interface_from_vnet_hw_interface (u32 hw_if_index)
-{
-  srp_main_t * sm = &srp_main;
-  uword * p = hash_get (sm->interface_index_by_hw_if_index, hw_if_index);
-  return p ? pool_elt_at_index (sm->interface_pool, p[0]) : 0;
-}
-
-u8 * format_srp_header (u8 * s, va_list * args);
-u8 * format_srp_header_with_length (u8 * s, va_list * args);
-u8 * format_srp_device (u8 * s, va_list * args);
-
-/* Parse srp header. */
-uword
-unformat_srp_header (unformat_input_t * input, va_list * args);
-
-uword unformat_pg_srp_header (unformat_input_t * input, va_list * args);
-
-always_inline void
-srp_setup_node (vlib_main_t * vm, u32 node_index)
-{
-  vlib_node_t * n = vlib_get_node (vm, node_index);
-  pg_node_t * pn = pg_get_node (node_index);
-  n->format_buffer = format_srp_header_with_length;
-  n->unformat_buffer = unformat_srp_header;
-  pn->unformat_edit = unformat_pg_srp_header;
-}
-
-#define foreach_srp_error						\
-  _ (NONE, "no error")							\
-  _ (UNKNOWN_MODE, "unknown mode in SRP header")			\
-  _ (KEEP_ALIVE_DROPPED, "v1 keep alive mode in SRP header")		\
-  _ (CONTROL_PACKETS_PROCESSED, "control packets processed")		\
-  _ (IPS_PACKETS_PROCESSED, "IPS packets processed")			\
-  _ (UNKNOWN_CONTROL, "unknown control packet")				\
-  _ (CONTROL_VERSION_NON_ZERO, "control packet with non-zero version")	\
-  _ (CONTROL_BAD_CHECKSUM, "control packet with bad checksum")		\
-  _ (TOPOLOGY_BAD_LENGTH, "topology packet with bad length")
-
-typedef enum {
-#define _(n,s) SRP_ERROR_##n,
-  foreach_srp_error
-#undef _
-  SRP_N_ERROR,
-} srp_error_t;
-
-serialize_function_t serialize_srp_main, unserialize_srp_main;
-
-#endif /* included_srp_h */
diff --git a/vnet/vnet/unix/gdb_funcs.c b/vnet/vnet/unix/gdb_funcs.c
deleted file mode 100644
index cfb4b247..00000000
--- a/vnet/vnet/unix/gdb_funcs.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief Host utility functions
- */
-#include <vppinfra/format.h>
-#include <vlib/vlib.h>
-
-#include <vlib/threads.h>
-
-
-
-/**
- * @brief GDB callable function: vl - Return vector length of vector
- *
- * @param *p - void - address of vector
- *
- * @return length - u32
- *
- */
-u32 vl(void *p)
-{
-  return vec_len (p);
-}
-
-/**
- * @brief GDB callable function: pe - call pool_elts - number of elements in a pool
- *
- * @param *v - void - address of pool
- *
- * @return number - uword
- *
- */
-uword pe (void *v)
-{
-  return (pool_elts(v));
-}
-
-/**
- * @brief GDB callable function: pifi - call pool_is_free_index - is passed index free?
- *
- * @param *p - void - address of pool
- * @param *index - u32
- *
- * @return 0|1 - int
- *
- */
-int pifi (void *p, u32 index)
-{
-  return pool_is_free_index (p, index);
-}
-
-/**
- * @brief GDB callable function: debug_hex_bytes - return formatted hex string
- *
- * @param *s - u8
- * @param n - u32 - number of bytes to format
- *
- */
-void debug_hex_bytes (u8 *s, u32 n)
-{
-  fformat (stderr, "%U\n", format_hex_bytes, s, n);
-}
-
-/**
- * @brief GDB callable function: vlib_dump_frame_ownership
- *
- */
-void vlib_dump_frame_ownership (void)
-{
-  vlib_main_t * vm = vlib_get_main();
-  vlib_node_main_t * nm = &vm->node_main;
-  vlib_node_runtime_t * this_node_runtime;
-  vlib_next_frame_t * nf;
-  u32 first_nf_index;
-  u32 index;
-
-  vec_foreach(this_node_runtime, nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL])
-    {
-      first_nf_index = this_node_runtime->next_frame_index;
-
-      for (index = first_nf_index; index < first_nf_index + 
-             this_node_runtime->n_next_nodes; index++) 
-        {
-          vlib_node_runtime_t * owned_runtime;
-          nf = vec_elt_at_index (vm->node_main.next_frames, index);
-          if (nf->flags & VLIB_FRAME_OWNER) 
-            {
-              owned_runtime = vec_elt_at_index (nm->nodes_by_type[0],
-                                                nf->node_runtime_index);
-              fformat(stderr, 
-                      "%s next index %d owns enqueue rights to %s\n",
-                      nm->nodes[this_node_runtime->node_index]->name, 
-                      index - first_nf_index, 
-                      nm->nodes[owned_runtime->node_index]->name);
-              fformat (stderr, "  nf index %d nf->frame_index %d\n",
-                       nf - vm->node_main.next_frames, 
-                       nf->frame_index);
-            }
-        }
-    }
-}
-
-/**
- * @brief GDB callable function: vlib_runtime_index_to_node_name
- *
- * Takes node index and will return the node name.
- *
- * @param index - u32
- */
-void vlib_runtime_index_to_node_name (u32 index)
-{
-  vlib_main_t * vm = vlib_get_main();
-  vlib_node_main_t * nm = &vm->node_main;
-
-  if (index > vec_len (nm->nodes))
-    {
-      fformat(stderr, "%d out of range, max %d\n", vec_len(nm->nodes));
-      return;
-    }
-
-  fformat(stderr, "node runtime index %d name %s\n", index, nm->nodes[index]->name);
-}
-
-
-/**
- * @brief GDB callable function: show_gdb_command_fn - show gdb
- *
- * Shows list of functions for VPP available in GDB
- *
- * @return error - clib_error_t
- */
-static clib_error_t *
-show_gdb_command_fn (vlib_main_t * vm,
-                     unformat_input_t * input,
-                     vlib_cli_command_t * cmd)
-{
-  vlib_cli_output (vm, "vl(p) returns vec_len(p)");
-  vlib_cli_output (vm, "pe(p) returns pool_elts(p)");
-  vlib_cli_output (vm, "pifi(p, i) returns pool_is_free_index(p, i)");
-  vlib_cli_output (vm, "debug_hex_bytes (ptr, n_bytes) dumps n_bytes in hex");
-  vlib_cli_output (vm, "vlib_dump_frame_ownership() does what it says");
-  vlib_cli_output (vm, "vlib_runtime_index_to_node_name (index) prints NN");
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (show_gdb_funcs_command, static) = {
-  .path = "show gdb",
-  .short_help = "Describe functions which can be called from gdb",
-  .function = show_gdb_command_fn,
-};
-
-/* Cafeteria plan, maybe you don't want these functions */
-clib_error_t * 
-gdb_func_init (vlib_main_t * vm) { return 0; } 
-
-VLIB_INIT_FUNCTION (gdb_func_init);
diff --git a/vnet/vnet/unix/pcap.c b/vnet/vnet/unix/pcap.c
deleted file mode 100644
index bba225f7..00000000
--- a/vnet/vnet/unix/pcap.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pcap.c: libpcap packet capture format
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <vnet/unix/pcap.h>
-#include <sys/fcntl.h>
-
-/**
- * @file
- * @brief PCAP function.
- *
- * Usage:
- *
- * <code><pre>
- * \#include <vnet/unix/pcap.h>
- *
- * static pcap_main_t pcap = {
- *  .file_name = "/tmp/ip4",
- *  .n_packets_to_capture = 2,
- *  .packet_type = PCAP_PACKET_TYPE_ip,
- * };
- * </pre></code>
- *
- * To add a buffer:
- *
- *  <code><pre>pcap_add_buffer (&pcap, vm, pi0, 128);</pre></code>
- *
- * File will be written after @c n_packets_to_capture or call to pcap_write (&amp;pcap).
- *
-*/
-
-/**
- * @brief Close PCAP file
- *
- * @return rc - clib_error_t
- *
- */
-clib_error_t *
-pcap_close (pcap_main_t * pm)
-{
-  close (pm->file_descriptor);
-  pm->flags &= ~PCAP_MAIN_INIT_DONE;
-  pm->file_descriptor = -1;
-  return 0;
-}
-
-/**
- * @brief Write PCAP file
- *
- * @return rc - clib_error_t
- *
- */
-clib_error_t *
-pcap_write (pcap_main_t * pm)
-{
-  clib_error_t * error = 0;
-
-  if (! (pm->flags & PCAP_MAIN_INIT_DONE))
-    {
-      pcap_file_header_t fh;
-      int n;
-
-      if (! pm->file_name)
-	pm->file_name = "/tmp/vnet.pcap";
-
-      pm->file_descriptor = open (pm->file_name, O_CREAT | O_TRUNC | O_WRONLY, 0664);
-      if (pm->file_descriptor < 0)
-	{
-	  error = clib_error_return_unix (0, "failed to open `%s'", pm->file_name);
-	  goto done;
-	}
-
-      pm->flags |= PCAP_MAIN_INIT_DONE;
-      pm->n_packets_captured = 0;
-      pm->n_pcap_data_written = 0;
-
-      /* Write file header. */
-      memset (&fh, 0, sizeof (fh));
-      fh.magic = 0xa1b2c3d4;
-      fh.major_version = 2;
-      fh.minor_version = 4;
-      fh.time_zone = 0;
-      fh.max_packet_size_in_bytes = 1 << 16;
-      fh.packet_type = pm->packet_type;
-      n = write (pm->file_descriptor, &fh, sizeof (fh));
-      if (n != sizeof (fh))
-	{
-	  if (n < 0)
-	    error = clib_error_return_unix (0, "write file header `%s'", pm->file_name);
-	  else
-	    error = clib_error_return (0, "short write of file header `%s'", pm->file_name);
-	  goto done;
-	}
-    }
-
-  while (vec_len (pm->pcap_data) > pm->n_pcap_data_written)
-    {
-      int n = vec_len (pm->pcap_data) - pm->n_pcap_data_written;
-
-      n = write (pm->file_descriptor,
-		 vec_elt_at_index (pm->pcap_data, pm->n_pcap_data_written), n);
-
-      if (n < 0 && unix_error_is_fatal (errno))
-	{
-	  error = clib_error_return_unix (0, "write `%s'", pm->file_name);
-	  goto done;
-	}
-        pm->n_pcap_data_written += n;
-      }
-
-  if (pm->n_pcap_data_written >= vec_len (pm->pcap_data))
-    {
-      vec_reset_length (pm->pcap_data);
-      pm->n_pcap_data_written = 0;
-    }
-
-  if (pm->n_packets_captured >= pm->n_packets_to_capture)
-    pcap_close(pm);
-
- done:
-  if (error)
-    {
-      if (pm->file_descriptor >= 0)
-	close (pm->file_descriptor);
-    }
-  return error;
-}
-
-/**
- * @brief Read PCAP file
- *
- * @return rc - clib_error_t
- *
- */
-clib_error_t * pcap_read (pcap_main_t * pm)
-{
-  clib_error_t * error = 0;
-  int fd, need_swap, n;
-  pcap_file_header_t fh;
-  pcap_packet_header_t ph;
-
-  fd = open (pm->file_name, O_RDONLY);
-  if (fd < 0)
-    {
-      error = clib_error_return_unix (0, "open `%s'", pm->file_name);
-      goto done;
-    }
-
-  if (read (fd, &fh, sizeof (fh)) != sizeof (fh))
-    {
-      error = clib_error_return_unix (0, "read file header `%s'", pm->file_name);
-      goto done;
-    }
-
-  need_swap = 0;
-  if (fh.magic == 0xd4c3b2a1)
-    {
-      need_swap = 1;
-#define _(t,f) fh.f = clib_byte_swap_##t (fh.f);
-      foreach_pcap_file_header;
-#undef _
-    }    
-
-  if (fh.magic != 0xa1b2c3d4)
-    {
-      error = clib_error_return (0, "bad magic `%s'", pm->file_name);
-      goto done;
-    }
-
-  pm->min_packet_bytes = 0;
-  pm->max_packet_bytes = 0;
-  while ((n = read (fd, &ph, sizeof (ph))) != 0)
-    {
-      u8 * data;
-
-      if (need_swap)
-	{
-#define _(t,f) ph.f = clib_byte_swap_##t (ph.f);
-	  foreach_pcap_packet_header;
-#undef _
-	}
-
-      data = vec_new (u8, ph.n_bytes_in_packet);
-      if (read (fd, data, ph.n_packet_bytes_stored_in_file) != ph.n_packet_bytes_stored_in_file)
-	{
-	  error = clib_error_return (0, "short read `%s'", pm->file_name);
-	  goto done;
-	}
-
-      if (vec_len (pm->packets_read) == 0)
-	pm->min_packet_bytes = pm->max_packet_bytes = ph.n_bytes_in_packet;
-      else
-	{
-	  pm->min_packet_bytes = clib_min (pm->min_packet_bytes, ph.n_bytes_in_packet);
-	  pm->max_packet_bytes = clib_max (pm->max_packet_bytes, ph.n_bytes_in_packet);
-	}
-
-      vec_add1 (pm->packets_read, data);
-    }
-
- done:
-  if (fd >= 0)
-    close (fd);
-  return error;
-
-}
diff --git a/vnet/vnet/unix/pcap.h b/vnet/vnet/unix/pcap.h
deleted file mode 100644
index 6aaf32be..00000000
--- a/vnet/vnet/unix/pcap.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pcap.h: libpcap packet capture format
- *
- * Copyright (c) 2008 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-/**
- * @file
- * @brief PCAP utility definitions
- */
-#ifndef included_vnet_pcap_h
-#define included_vnet_pcap_h
-
-#include <vlib/vlib.h>
-
-/**
- * @brief Packet types supported by PCAP
- *
- * null 0
- * ethernet 1
- * ppp 9
- * ip 12
- * hdlc 104
- */
-#define foreach_vnet_pcap_packet_type           \
-  _ (null, 0)					\
-  _ (ethernet, 1)				\
-  _ (ppp, 9)					\
-  _ (ip, 12)					\
-  _ (hdlc, 104)
-
-typedef enum {
-#define _(f,n) PCAP_PACKET_TYPE_##f = (n),
-  foreach_vnet_pcap_packet_type
-#undef _
-} pcap_packet_type_t;
-
-#define foreach_pcap_file_header			\
-  /** 0xa1b2c3d4 host byte order.			\
-     0xd4c3b2a1 => need to byte swap everything. */	\
-  _ (u32, magic)					\
-							\
-  /** Currently major 2 minor 4. */			\
-  _ (u16, major_version)				\
-  _ (u16, minor_version)				\
-							\
-  /** 0 for GMT. */					\
-  _ (u32, time_zone)					\
-							\
-  /** Accuracy of timestamps.  Typically set to 0. */	\
-  _ (u32, sigfigs)					\
-							\
-  /** Size of largest packet in file. */                \
-  _ (u32, max_packet_size_in_bytes)			\
-							\
-  /** One of vnet_pcap_packet_type_t. */                \
-  _ (u32, packet_type)
-
-/** File header struct */
-typedef struct {
-#define _(t, f) t f;
-  foreach_pcap_file_header
-#undef _
-} pcap_file_header_t;
-
-#define foreach_pcap_packet_header					\
-  /** Time stamp in seconds  */                                         \
-  _ (u32, time_in_sec)							\
-  /** Time stamp in microseconds. */                                    \
-  _ (u32, time_in_usec)							\
-									\
-  /** Number of bytes stored in file. */                                \
-  _ (u32, n_packet_bytes_stored_in_file)				\
-  /** Number of bytes in actual packet. */                              \
-  _ (u32, n_bytes_in_packet)
-
-/** Packet header. */
-typedef struct {
-#define _(t, f) t f;
-  foreach_pcap_packet_header
-#undef _
-
-  /** Packet data follows. */
-  u8 data[0];
-} pcap_packet_header_t;
-
-/**
- * @brief PCAP main state data structure
- */
-typedef struct {
-  /** File name of pcap output. */
-  char * file_name;
-
-  /** Number of packets to capture. */
-  u32 n_packets_to_capture;
-
-  /** Packet type */
-  pcap_packet_type_t packet_type;
-
-  /** Number of packets currently captured. */
-  u32 n_packets_captured;
-
-  /** flags */
-  u32 flags;
-#define PCAP_MAIN_INIT_DONE (1 << 0)
-
-  /** File descriptor for reading/writing. */
-  int file_descriptor;
-
-  /** Bytes written */
-  u32 n_pcap_data_written;
-
-  /** Vector of pcap data. */
-  u8 * pcap_data;
-
-  /** Packets read from file. */
-  u8 ** packets_read;
-
-  /** Min/Max Packet bytes */
-  u32 min_packet_bytes, max_packet_bytes;
-} pcap_main_t;
-
-/** Write out data to output file. */
-clib_error_t * pcap_write (pcap_main_t * pm);
-
-/** Read data from file. */
-clib_error_t * pcap_read (pcap_main_t * pm);
-
-/**
- * @brief Add packet
- *
- * @param *pm - pcap_main_t
- * @param time_now - f64
- * @param n_bytes_in_trace - u32
- * @param n_bytes_in_packet - u32
- *
- * @return Packet Data
- *
- */
-static inline void *
-pcap_add_packet (pcap_main_t * pm,
-		 f64 time_now,
-		 u32 n_bytes_in_trace,
-		 u32 n_bytes_in_packet)
-{
-  pcap_packet_header_t * h;
-  u8 * d;
-
-  vec_add2 (pm->pcap_data, d, sizeof (h[0]) + n_bytes_in_trace);
-  h = (void *) (d);
-  h->time_in_sec = time_now;
-  h->time_in_usec = 1e6*(time_now - h->time_in_sec);
-  h->n_packet_bytes_stored_in_file = n_bytes_in_trace;
-  h->n_bytes_in_packet = n_bytes_in_packet;
-  pm->n_packets_captured++;
-  return h->data;
-}
-
-/**
- * @brief Add buffer (vlib_buffer_t) to the trace
- *
- * @param *pm - pcap_main_t
- * @param *vm - vlib_main_t
- * @param buffer_index - u32
- * @param n_bytes_in_trace - u32
- *
- */
-static inline void
-pcap_add_buffer (pcap_main_t * pm,
-		 vlib_main_t * vm, u32 buffer_index,
-		 u32 n_bytes_in_trace)
-{
-  vlib_buffer_t * b = vlib_get_buffer (vm, buffer_index);
-  u32 n = vlib_buffer_length_in_chain (vm, b);
-  i32 n_left = clib_min (n_bytes_in_trace, n);
-  f64 time_now = vlib_time_now (vm);
-  void * d;
-
-  d = pcap_add_packet (pm, time_now, n_left, n);
-  while (1)
-    {
-      u32 copy_length = clib_min ((u32) n_left, b->current_length);
-      clib_memcpy (d, b->data + b->current_data, copy_length);
-      n_left -= b->current_length;
-      if (n_left <= 0)
-	break;
-      d += b->current_length;
-      ASSERT (b->flags & VLIB_BUFFER_NEXT_PRESENT);
-      b = vlib_get_buffer (vm, b->next_buffer);
-    }
-
-  /** Flush output vector. */
-  if (vec_len (pm->pcap_data) >= 64*1024
-      || pm->n_packets_captured >= pm->n_packets_to_capture)
-    pcap_write (pm);
-}
-
-#endif /* included_vnet_pcap_h */
diff --git a/vnet/vnet/unix/pcap2pg.c b/vnet/vnet/unix/pcap2pg.c
deleted file mode 100644
index 217a61f4..00000000
--- a/vnet/vnet/unix/pcap2pg.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * pcap2pg.c: convert pcap input to pg input
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief Functions to convert PCAP file format to VPP PG (Packet Generator)
- *
- */
-#include <vnet/unix/pcap.h>
-#include <vnet/ethernet/packet.h>
-#include <stdio.h>
-
-pcap_main_t pcap_main;
-
-/**
- * @brief char * to seed a PG file
- */
-static char * pg_fmt =
-  "packet-generator new {\n"
-  "    name s%d\n"
-  "    limit 1\n"
-  "    size %d-%d\n"
-  "    node ethernet-input\n";
-
-
-/**
- * @brief Packet Generator Stream boilerplate
- *
- * @param *ofp - FILE
- * @param i - int
- * @param *pkt - u8
- */
-void stream_boilerplate (FILE *ofp, int i, u8 * pkt)
-{
-  fformat(ofp, pg_fmt, i, vec_len(pkt), vec_len(pkt));
-}
-
-/**
- * @brief Conversion of PCAP file to PG file format
- *
- * @param *pm - pcap_main_t
- * @param *ofp - FILE
- *
- * @return rc - int
- *
- */
-int pcap2pg (pcap_main_t * pm, FILE *ofp)
-{
-  int i, j;
-  u8 *pkt;
-
-  for (i = 0; i < vec_len (pm->packets_read); i++)
-    {
-      int offset;
-      ethernet_header_t * h;
-      u64 ethertype;
-
-      pkt = pm->packets_read[i];
-      h = (ethernet_header_t *)pkt;
-
-      stream_boilerplate (ofp, i, pkt);
-
-      fformat (ofp, "    data {\n");
-
-      ethertype = clib_net_to_host_u16 (h->type);
-
-      /**
-       * In vnet terms, packet generator interfaces are not ethernets.
-       * They don't have vlan tables.
-       * This transforms captured 802.1q VLAN packets into
-       * regular Ethernet packets.
-       */
-      if (ethertype == 0x8100 /* 802.1q vlan */)
-        {
-          u16 * vlan_ethertype = (u16 *)(h+1);
-          ethertype = clib_net_to_host_u16(vlan_ethertype[0]);
-          offset = 18;
-        }
-      else
-        offset = 14;
-
-      fformat (ofp,
-               "          0x%04x: %02x%02x.%02x%02x.%02x%02x"
-               " -> %02x%02x.%02x%02x.%02x%02x\n",
-               ethertype,
-               h->src_address[0],
-               h->src_address[1],
-               h->src_address[2],
-               h->src_address[3],
-               h->src_address[4],
-               h->src_address[5],
-               h->dst_address[0],
-               h->dst_address[1],
-               h->dst_address[2],
-               h->dst_address[3],
-               h->dst_address[4],
-               h->dst_address[5]);
-
-      fformat (ofp, "      hex 0x");
-
-      for (j = offset; j < vec_len (pkt); j++)
-          fformat (ofp, "%02x", pkt[j]);
-
-      fformat (ofp, " }\n");
-      fformat (ofp, "}\n\n");
-    }
-  return 0;
-}
-
-/**
- * @brief pcap2pg.
- * usage: pcap2pg -i <input-file> [-o <output-file>]
- */
-int main (int argc, char **argv)
-{
-  unformat_input_t input;
-  pcap_main_t * pm = &pcap_main;
-  u8 * input_file = 0, * output_file = 0;
-  FILE * ofp;
-  clib_error_t * error;
-
-  unformat_init_command_line (&input, argv);
-
-  while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat(&input, "-i %s", &input_file)
-          || unformat (&input, "input %s", &input_file))
-        ;
-      else if (unformat (&input, "-o %s", &output_file)
-               || unformat (&input, "output %s", &output_file))
-        ;
-      else 
-        {
-        usage:
-          fformat(stderr, 
-                  "usage: pcap2pg -i <input-file> [-o <output-file>]\n");
-          exit (1);
-        }
-    }
-
-  if (input_file == 0)
-    goto usage;
-  
-  pm->file_name = (char *)input_file;
-  error = pcap_read (pm);
-
-  if (error)
-    {
-      clib_error_report (error);
-      exit (1);
-    }
-
-  if (output_file)
-    {
-      ofp = fopen ((char *)output_file, "rw");
-      if (ofp == NULL)
-        clib_unix_warning ("Couldn't create '%s'", output_file);
-      exit (1);
-    }
-  else
-    {
-      ofp = stdout;
-    }
-  
-  pcap2pg (pm, ofp);
-
-  fclose (ofp);
-  exit (0);
-}
diff --git a/vnet/vnet/unix/tap.api b/vnet/vnet/unix/tap.api
deleted file mode 100644
index 9b16eadb..00000000
--- a/vnet/vnet/unix/tap.api
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \file
-
-    This file defines vpe control-plane API messages for
-    the Linux kernel TAP device driver
-*/
-
-/** \brief Initialize a new tap interface with the given paramters 
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param use_random_mac - let the system generate a unique mac address
-    @param tap_name - name to associate with the new interface
-    @param mac_address - mac addr to assign to the interface if use_radom not set
-*/
-define tap_connect
-{
-  u32 client_index;
-  u32 context;
-  u8 use_random_mac;
-  u8 tap_name[64];
-  u8 mac_address[6];
-  u8 renumber;
-  u32 custom_dev_instance;
-  u8 tag[64];
-};
-
-/** \brief Reply for tap connect request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-    @param sw_if_index - software index allocated for the new tap interface
-*/
-define tap_connect_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-};
-
-/** \brief Modify a tap interface with the given paramters 
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface index of existing tap interface
-    @param use_random_mac - let the system generate a unique mac address
-    @param tap_name - name to associate with the new interface
-    @param mac_address - mac addr to assign to the interface if use_radom not set
-*/
-define tap_modify
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 use_random_mac;
-  u8 tap_name[64];
-  u8 mac_address[6];
-  u8 renumber;
-  u32 custom_dev_instance;
-};
-
-/** \brief Reply for tap modify request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-    @param sw_if_index - software index if the modified tap interface
-*/
-define tap_modify_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-};
-
-/** \brief Delete tap interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface index of existing tap interface
-*/
-define tap_delete
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-};
-
-/** \brief Reply for tap delete request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define tap_delete_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Dump tap interfaces request */
-define sw_interface_tap_dump
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Reply for tap dump request
-    @param sw_if_index - software index of tap interface
-    @param dev_name - Linux tap device name
-*/
-define sw_interface_tap_details
-{
-  u32 context;
-  u32 sw_if_index;
-  u8 dev_name[64];
-};
diff --git a/vnet/vnet/unix/tap_api.c b/vnet/vnet/unix/tap_api.c
deleted file mode 100644
index 99b79ba2..00000000
--- a/vnet/vnet/unix/tap_api.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- *------------------------------------------------------------------
- * tap_api.c - vnet tap device driver API support
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/unix/tuntap.h>
-#include <vnet/unix/tapcli.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_tap_api_msg                     \
-_(TAP_CONNECT, tap_connect)                     \
-_(TAP_MODIFY, tap_modify)                       \
-_(TAP_DELETE, tap_delete)                       \
-_(SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump)
-
-#define vl_msg_name_crc_list
-#include <vnet/unix/tap.api.h>
-#undef vl_msg_name_crc_list
-
-/*
- * WARNING: replicated pending api refactor completion
- */
-static void
-send_sw_interface_flags_deleted (vpe_api_main_t * am,
-				 unix_shared_memory_queue_t * q,
-				 u32 sw_if_index)
-{
-  vl_api_sw_interface_set_flags_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_FLAGS);
-  mp->sw_if_index = ntohl (sw_if_index);
-
-  mp->admin_up_down = 0;
-  mp->link_up_down = 0;
-  mp->deleted = 1;
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_tap_connect_t_handler (vl_api_tap_connect_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  int rv;
-  vl_api_tap_connect_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  unix_shared_memory_queue_t *q;
-  u32 sw_if_index = (u32) ~ 0;
-  u8 *tag;
-
-  rv = vnet_tap_connect_renumber (vm, mp->tap_name,
-				  mp->use_random_mac ? 0 : mp->mac_address,
-				  &sw_if_index, mp->renumber,
-				  ntohl (mp->custom_dev_instance));
-
-  /* Add tag if supplied */
-  if (rv == 0 && mp->tag[0])
-    {
-      mp->tag[ARRAY_LEN (mp->tag) - 1] = 0;
-      tag = format (0, "%s%c", mp->tag, 0);
-      vnet_set_sw_interface_tag (vnm, tag, sw_if_index);
-    }
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_TAP_CONNECT_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = ntohl (rv);
-  rmp->sw_if_index = ntohl (sw_if_index);
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_tap_modify_t_handler (vl_api_tap_modify_t * mp)
-{
-  int rv;
-  vl_api_tap_modify_reply_t *rmp;
-  unix_shared_memory_queue_t *q;
-  u32 sw_if_index = (u32) ~ 0;
-  vlib_main_t *vm = vlib_get_main ();
-
-  rv = vnet_tap_modify (vm, ntohl (mp->sw_if_index), mp->tap_name,
-			mp->use_random_mac ? 0 : mp->mac_address,
-			&sw_if_index, mp->renumber,
-			ntohl (mp->custom_dev_instance));
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_TAP_MODIFY_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = ntohl (rv);
-  rmp->sw_if_index = ntohl (sw_if_index);
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_tap_delete_t_handler (vl_api_tap_delete_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  int rv;
-  vpe_api_main_t *vam = &vpe_api_main;
-  vl_api_tap_delete_reply_t *rmp;
-  unix_shared_memory_queue_t *q;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  rv = vnet_tap_delete (vm, sw_if_index);
-  if (!rv)
-    {
-      vnet_main_t *vnm = vnet_get_main ();
-      vnet_clear_sw_interface_tag (vnm, sw_if_index);
-    }
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_TAP_DELETE_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = ntohl (rv);
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-
-  if (!rv)
-    send_sw_interface_flags_deleted (vam, q, sw_if_index);
-}
-
-static void
-send_sw_interface_tap_details (vpe_api_main_t * am,
-			       unix_shared_memory_queue_t * q,
-			       tapcli_interface_details_t * tap_if,
-			       u32 context)
-{
-  vl_api_sw_interface_tap_details_t *mp;
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_TAP_DETAILS);
-  mp->sw_if_index = ntohl (tap_if->sw_if_index);
-  strncpy ((char *) mp->dev_name,
-	   (char *) tap_if->dev_name, ARRAY_LEN (mp->dev_name) - 1);
-  mp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_sw_interface_tap_dump_t_handler (vl_api_sw_interface_tap_dump_t * mp)
-{
-  int rv = 0;
-  vpe_api_main_t *am = &vpe_api_main;
-  unix_shared_memory_queue_t *q;
-  tapcli_interface_details_t *tapifs = NULL;
-  tapcli_interface_details_t *tap_if = NULL;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  rv = vnet_tap_dump_ifs (&tapifs);
-  if (rv)
-    return;
-
-  vec_foreach (tap_if, tapifs)
-  {
-    send_sw_interface_tap_details (am, q, tap_if, mp->context);
-  }
-
-  vec_free (tapifs);
-}
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_tap;
-#undef _
-}
-
-static clib_error_t *
-tap_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_tap_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (tap_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/unix/tapcli.c b/vnet/vnet/unix/tapcli.c
deleted file mode 100644
index 9862a2bd..00000000
--- a/vnet/vnet/unix/tapcli.c
+++ /dev/null
@@ -1,1328 +0,0 @@
-/*
- *------------------------------------------------------------------
- * tapcli.c - dynamic tap interface hookup
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-/**
- * @file
- * @brief  dynamic tap interface hookup
- */
-
-#include <fcntl.h>		/* for open */
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/uio.h>		/* for iovec */
-#include <netinet/in.h>
-
-#include <linux/if_arp.h>
-#include <linux/if_tun.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-
-#include <vnet/ip/ip.h>
-
-#include <vnet/ethernet/ethernet.h>
-
-#include <vnet/feature/feature.h>
-#include <vnet/devices/devices.h>
-#include <vnet/unix/tapcli.h>
-
-static vnet_device_class_t tapcli_dev_class;
-static vnet_hw_interface_class_t tapcli_interface_class;
-static vlib_node_registration_t tapcli_rx_node;
-
-static void tapcli_nopunt_frame (vlib_main_t * vm,
-                                 vlib_node_runtime_t * node,
-                                 vlib_frame_t * frame);
-/**
- * @brief Struct for the tapcli interface
- */
-typedef struct {
-  u32 unix_fd;
-  u32 unix_file_index;
-  u32 provision_fd;
-  /** For counters */
-  u32 sw_if_index;
-  u32 hw_if_index;
-  u32 is_promisc;
-  struct ifreq ifr;
-  u32 per_interface_next_index;
-  /** for delete */
-  u8 active;
-} tapcli_interface_t;
-
-/**
- * @brief Struct for RX trace
- */
-typedef struct {
-  u16 sw_if_index;
-} tapcli_rx_trace_t;
-
-/**
- * @brief Function to format TAP CLI trace
- *
- * @param *s - u8 - formatting string
- * @param *va - va_list
- *
- * @return *s - u8 - formatted string
- *
- */
-u8 * format_tapcli_rx_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  vnet_main_t * vnm = vnet_get_main();
-  tapcli_rx_trace_t * t = va_arg (*va, tapcli_rx_trace_t *);
-  s = format (s, "%U", format_vnet_sw_if_index_name,
-                vnm, t->sw_if_index);
-  return s;
-}
-
-/**
- * @brief TAPCLI main state struct
- */
-typedef struct {
-  /** Vector of iovecs for readv/writev calls. */
-  struct iovec * iovecs;
-
-  /** Vector of VLIB rx buffers to use.  We allocate them in blocks
-     of VLIB_FRAME_SIZE (256). */
-  u32 * rx_buffers;
-
-  /** tap device destination MAC address. Required, or Linux drops pkts */
-  u8 ether_dst_mac[6];
-
-  /** Interface MTU in bytes and # of default sized buffers. */
-  u32 mtu_bytes, mtu_buffers;
-
-  /** Vector of tap interfaces */
-  tapcli_interface_t * tapcli_interfaces;
-
-  /** Vector of deleted tap interfaces */
-  u32 * tapcli_inactive_interfaces;
-
-  /** Bitmap of tap interfaces with pending reads */
-  uword * pending_read_bitmap;
-
-  /** Hash table to find tapcli interface given hw_if_index */
-  uword * tapcli_interface_index_by_sw_if_index;
-
-  /** Hash table to find tapcli interface given unix fd */
-  uword * tapcli_interface_index_by_unix_fd;
-
-  /** renumbering table */
-  u32 * show_dev_instance_by_real_dev_instance;
-
-  /** 1 => disable CLI */
-  int is_disabled;
-
-  /** convenience - vlib_main_t */
-  vlib_main_t * vlib_main;
-  /** convenience - vnet_main_t */
-  vnet_main_t * vnet_main;
-  /** convenience - unix_main_t */
-  unix_main_t * unix_main;
-} tapcli_main_t;
-
-static tapcli_main_t tapcli_main;
-
-/**
- * @brief tapcli TX node function
- * @node tap-cli-tx
- *
- * Output node, writes the buffers comprising the incoming frame
- * to the tun/tap device, aka hands them to the Linux kernel stack.
- *
- * @param *vm - vlib_main_t
- * @param *node - vlib_node_runtime_t
- * @param *frame - vlib_frame_t
- *
- * @return n_packets - uword
- *
- */
-static uword
-tapcli_tx (vlib_main_t * vm,
-	   vlib_node_runtime_t * node,
-	   vlib_frame_t * frame)
-{
-  u32 * buffers = vlib_frame_args (frame);
-  uword n_packets = frame->n_vectors;
-  tapcli_main_t * tm = &tapcli_main;
-  tapcli_interface_t * ti;
-  int i;
-
-  for (i = 0; i < n_packets; i++)
-    {
-      struct iovec * iov;
-      vlib_buffer_t * b;
-      uword l;
-      vnet_hw_interface_t * hw;
-      uword * p;
-      u32 tx_sw_if_index;
-
-      b = vlib_get_buffer (vm, buffers[i]);
-
-      tx_sw_if_index = vnet_buffer(b)->sw_if_index[VLIB_TX];
-      if (tx_sw_if_index == (u32)~0)
-        tx_sw_if_index = vnet_buffer(b)->sw_if_index[VLIB_RX];
-        
-      ASSERT(tx_sw_if_index != (u32)~0);
-
-      /* Use the sup intfc to finesse vlan subifs */
-      hw = vnet_get_sup_hw_interface (tm->vnet_main, tx_sw_if_index);
-      tx_sw_if_index = hw->sw_if_index;
-
-      p = hash_get (tm->tapcli_interface_index_by_sw_if_index, 
-                    tx_sw_if_index);
-      if (p == 0)
-        {
-          clib_warning ("sw_if_index %d unknown", tx_sw_if_index);
-          /* $$$ leak, but this should never happen... */
-          continue;
-        }
-      else
-        ti = vec_elt_at_index (tm->tapcli_interfaces, p[0]);
-
-      /* Re-set iovecs if present. */
-      if (tm->iovecs)
-	_vec_len (tm->iovecs) = 0;
-
-      /* VLIB buffer chain -> Unix iovec(s). */
-      vec_add2 (tm->iovecs, iov, 1);
-      iov->iov_base = b->data + b->current_data;
-      iov->iov_len = l = b->current_length;
-
-      if (PREDICT_FALSE (b->flags & VLIB_BUFFER_NEXT_PRESENT))
-	{
-	  do {
-	    b = vlib_get_buffer (vm, b->next_buffer);
-
-	    vec_add2 (tm->iovecs, iov, 1);
-
-	    iov->iov_base = b->data + b->current_data;
-	    iov->iov_len = b->current_length;
-	    l += b->current_length;
-	  } while (b->flags & VLIB_BUFFER_NEXT_PRESENT);
-	}
-
-      if (writev (ti->unix_fd, tm->iovecs, vec_len (tm->iovecs)) < l)
-	clib_unix_warning ("writev");
-    }
-
-  vlib_buffer_free(vm, vlib_frame_vector_args(frame), frame->n_vectors);
-
-  return n_packets;
-}
-
-VLIB_REGISTER_NODE (tapcli_tx_node,static) = {
-  .function = tapcli_tx,
-  .name = "tapcli-tx",
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .vector_size = 4,
-};
-
-/**
- * @brief Dispatch tapcli RX node function for node tap_cli_rx
- *
- *
- * @param *vm - vlib_main_t
- * @param *node - vlib_node_runtime_t
- * @param *ti - tapcli_interface_t
- *
- * @return n_packets - uword
- *
- */
-static uword tapcli_rx_iface(vlib_main_t * vm,
-                            vlib_node_runtime_t * node,
-                            tapcli_interface_t * ti)
-{
-  tapcli_main_t * tm = &tapcli_main;
-  const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
-  u32 n_trace = vlib_get_trace_count (vm, node);
-  u8 set_trace = 0;
-
-  vnet_main_t *vnm;
-  vnet_sw_interface_t * si;
-  u8 admin_down;
-  u32 next = node->cached_next_index;
-  u32 n_left_to_next, next_index;
-  u32 *to_next;
-
-  vnm = vnet_get_main();
-  si = vnet_get_sw_interface (vnm, ti->sw_if_index);
-  admin_down = !(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-
-  vlib_get_next_frame(vm, node, next, to_next, n_left_to_next);
-
-  while (n_left_to_next) { // Fill at most one vector
-    vlib_buffer_t *b_first, *b, *prev;
-    u32 bi_first, bi;
-    word n_bytes_in_packet;
-    int j, n_bytes_left;
-
-    if (PREDICT_FALSE(vec_len(tm->rx_buffers) < tm->mtu_buffers)) {
-      uword len = vec_len(tm->rx_buffers);
-      _vec_len(tm->rx_buffers) +=
-          vlib_buffer_alloc_from_free_list(vm, &tm->rx_buffers[len],
-                            VLIB_FRAME_SIZE - len, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-      if (PREDICT_FALSE(vec_len(tm->rx_buffers) < tm->mtu_buffers)) {
-          vlib_node_increment_counter(vm, tapcli_rx_node.index,
-                                      TAPCLI_ERROR_BUFFER_ALLOC,
-                                      tm->mtu_buffers - vec_len(tm->rx_buffers));
-        break;
-      }
-    }
-
-    uword i_rx = vec_len (tm->rx_buffers) - 1;
-
-    /* Allocate RX buffers from end of rx_buffers.
-           Turn them into iovecs to pass to readv. */
-    vec_validate (tm->iovecs, tm->mtu_buffers - 1);
-    for (j = 0; j < tm->mtu_buffers; j++) {
-      b = vlib_get_buffer (vm, tm->rx_buffers[i_rx - j]);
-      tm->iovecs[j].iov_base = b->data;
-      tm->iovecs[j].iov_len = buffer_size;
-    }
-
-    n_bytes_left = readv (ti->unix_fd, tm->iovecs, tm->mtu_buffers);
-    n_bytes_in_packet = n_bytes_left;
-    if (n_bytes_left <= 0) {
-      if (errno != EAGAIN) {
-        vlib_node_increment_counter(vm, tapcli_rx_node.index,
-                                    TAPCLI_ERROR_READ, 1);
-      }
-      break;
-    }
-
-    bi_first = tm->rx_buffers[i_rx];
-    b = b_first = vlib_get_buffer (vm, tm->rx_buffers[i_rx]);
-    prev = NULL;
-
-    while (1) {
-      b->current_length = n_bytes_left < buffer_size ? n_bytes_left : buffer_size;
-      n_bytes_left -= buffer_size;
-
-      if (prev) {
-        prev->next_buffer = bi;
-        prev->flags |= VLIB_BUFFER_NEXT_PRESENT;
-      }
-      prev = b;
-
-      /* last segment */
-      if (n_bytes_left <= 0)
-        break;
-
-      i_rx--;
-      bi = tm->rx_buffers[i_rx];
-      b = vlib_get_buffer (vm, bi);
-    }
-
-    _vec_len (tm->rx_buffers) = i_rx;
-
-    b_first->total_length_not_including_first_buffer =
-        (n_bytes_in_packet > buffer_size) ? n_bytes_in_packet - buffer_size : 0;
-    b_first->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
-
-    VLIB_BUFFER_TRACE_TRAJECTORY_INIT(b_first);
-
-    vnet_buffer (b_first)->sw_if_index[VLIB_RX] = ti->sw_if_index;
-    vnet_buffer (b_first)->sw_if_index[VLIB_TX] = (u32)~0;
-
-    b_first->error = node->errors[TAPCLI_ERROR_NONE];
-    next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-    next_index = (ti->per_interface_next_index != ~0) ?
-        ti->per_interface_next_index : next_index;
-    next_index = admin_down ? VNET_DEVICE_INPUT_NEXT_DROP : next_index;
-
-    to_next[0] = bi_first;
-    to_next++;
-    n_left_to_next--;
-
-    vnet_feature_start_device_input_x1 (ti->sw_if_index, &next_index, 
-                                        b_first, 0);
-
-    vlib_validate_buffer_enqueue_x1 (vm, node, next,
-                                     to_next, n_left_to_next,
-                                     bi_first, next_index);
-
-    /* Interface counters for tapcli interface. */
-    if (PREDICT_TRUE(!admin_down)) {
-      vlib_increment_combined_counter (
-          vnet_main.interface_main.combined_sw_if_counters
-          + VNET_INTERFACE_COUNTER_RX,
-          os_get_cpu_number(), ti->sw_if_index,
-          1, n_bytes_in_packet);
-
-      if (PREDICT_FALSE(n_trace > 0)) {
-        vlib_trace_buffer (vm, node, next_index,
-                           b_first, /* follow_chain */ 1);
-        n_trace--;
-        set_trace = 1;
-        tapcli_rx_trace_t *t0 = vlib_add_trace (vm, node, b_first, sizeof (*t0));
-        t0->sw_if_index = si->sw_if_index;
-      }
-    }
-  }
-  vlib_put_next_frame (vm, node, next, n_left_to_next);
-  if (set_trace)
-    vlib_set_trace_count (vm, node, n_trace);
-  return VLIB_FRAME_SIZE - n_left_to_next;
-}
-
-/**
- * @brief tapcli RX node function
- * @node tap-cli-rx
- *
- * Input node from the Kernel tun/tap device
- *
- * @param *vm - vlib_main_t
- * @param *node - vlib_node_runtime_t
- * @param *frame - vlib_frame_t
- *
- * @return n_packets - uword
- *
- */
-static uword
-tapcli_rx (vlib_main_t * vm,
-	   vlib_node_runtime_t * node,
-	   vlib_frame_t * frame)
-{
-  tapcli_main_t * tm = &tapcli_main;
-  static u32 * ready_interface_indices;
-  tapcli_interface_t * ti;
-  int i;
-  u32 total_count = 0;
-
-  vec_reset_length (ready_interface_indices);
-  clib_bitmap_foreach (i, tm->pending_read_bitmap,
-  ({
-    vec_add1 (ready_interface_indices, i);
-  }));
-
-  if (vec_len (ready_interface_indices) == 0)
-    return 0;
-
-  for (i = 0; i < vec_len(ready_interface_indices); i++)
-  {
-    tm->pending_read_bitmap =
-        clib_bitmap_set (tm->pending_read_bitmap,
-                         ready_interface_indices[i], 0);
-
-    ti = vec_elt_at_index (tm->tapcli_interfaces, ready_interface_indices[i]);
-    total_count += tapcli_rx_iface(vm, node, ti);
-  }
-  return total_count; //This might return more than 256.
-}
-
-/** TAPCLI error strings */
-static char * tapcli_rx_error_strings[] = {
-#define _(sym,string) string,
-  foreach_tapcli_error
-#undef _
-};
-
-VLIB_REGISTER_NODE (tapcli_rx_node, static) = {
-  .function = tapcli_rx,
-  .name = "tapcli-rx",
-  .sibling_of = "device-input",
-  .type = VLIB_NODE_TYPE_INPUT,
-  .state = VLIB_NODE_STATE_INTERRUPT,
-  .vector_size = 4,
-  .n_errors = TAPCLI_N_ERROR,
-  .error_strings = tapcli_rx_error_strings,
-  .format_trace = format_tapcli_rx_trace,
-};
-
-
-/**
- * @brief Gets called when file descriptor is ready from epoll.
- *
- * @param *uf - unix_file_t
- *
- * @return error - clib_error_t
- *
- */
-static clib_error_t * tapcli_read_ready (unix_file_t * uf)
-{
-  vlib_main_t * vm = vlib_get_main();
-  tapcli_main_t * tm = &tapcli_main;
-  uword * p;
-
-  /** Schedule the rx node */
-  vlib_node_set_interrupt_pending (vm, tapcli_rx_node.index);
-
-  p = hash_get (tm->tapcli_interface_index_by_unix_fd, uf->file_descriptor);
-
-  /** Mark the specific tap interface ready-to-read */
-  if (p)
-    tm->pending_read_bitmap = clib_bitmap_set (tm->pending_read_bitmap,
-                                               p[0], 1);
-  else
-    clib_warning ("fd %d not in hash table", uf->file_descriptor);
-
-  return 0;
-}
-
-/**
- * @brief CLI function for TAPCLI configuration
- *
- * @param *vm - vlib_main_t
- * @param *input - unformat_input_t
- *
- * @return error - clib_error_t
- *
- */
-static clib_error_t *
-tapcli_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  tapcli_main_t *tm = &tapcli_main;
-  const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "mtu %d", &tm->mtu_bytes))
-	;
-      else if (unformat (input, "disable"))
-        tm->is_disabled = 1;
-      else
-          return clib_error_return (0, "unknown input `%U'",
-                                    format_unformat_error, input);
-    }
-
-  if (tm->is_disabled)
-    return 0;
-
-  if (geteuid())
-    {
-      clib_warning ("tapcli disabled: must be superuser");
-      tm->is_disabled = 1;
-      return 0;
-    }
-
-  tm->mtu_buffers = (tm->mtu_bytes + (buffer_size - 1)) / buffer_size;
-
-  return 0;
-}
-
-/**
- * @brief Renumber TAPCLI interface
- *
- * @param *hi - vnet_hw_interface_t
- * @param new_dev_instance - u32
- *
- * @return rc - int
- *
- */
-static int tap_name_renumber (vnet_hw_interface_t * hi,
-                              u32 new_dev_instance)
-{
-  tapcli_main_t *tm = &tapcli_main;
-
-  vec_validate_init_empty (tm->show_dev_instance_by_real_dev_instance,
-                           hi->dev_instance, ~0);
-
-  tm->show_dev_instance_by_real_dev_instance [hi->dev_instance] =
-    new_dev_instance;
-
-  return 0;
-}
-
-VLIB_CONFIG_FUNCTION (tapcli_config, "tapcli");
-
-/**
- * @brief Free "no punt" frame
- *
- * @param *vm - vlib_main_t
- * @param *node - vlib_node_runtime_t
- * @param *frame - vlib_frame_t
- *
- */
-static void
-tapcli_nopunt_frame (vlib_main_t * vm,
-                   vlib_node_runtime_t * node,
-                   vlib_frame_t * frame)
-{
-  u32 * buffers = vlib_frame_args (frame);
-  uword n_packets = frame->n_vectors;
-  vlib_buffer_free (vm, buffers, n_packets);
-  vlib_frame_free (vm, node, frame);
-}
-
-VNET_HW_INTERFACE_CLASS (tapcli_interface_class,static) = {
-  .name = "tapcli",
-  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
-};
-
-/**
- * @brief Formatter for TAPCLI interface name
- *
- * @param *s - formatter string
- * @param *args - va_list
- *
- * @return *s - formatted string
- *
- */
-static u8 * format_tapcli_interface_name (u8 * s, va_list * args)
-{
-  u32 i = va_arg (*args, u32);
-  u32 show_dev_instance = ~0;
-  tapcli_main_t * tm = &tapcli_main;
-
-  if (i < vec_len (tm->show_dev_instance_by_real_dev_instance))
-    show_dev_instance = tm->show_dev_instance_by_real_dev_instance[i];
-
-  if (show_dev_instance != ~0)
-    i = show_dev_instance;
-
-  s = format (s, "tap-%d", i);
-  return s;
-}
-
-/**
- * @brief Modify interface flags for TAPCLI interface
- *
- * @param *vnm - vnet_main_t
- * @param *hw - vnet_hw_interface_t
- * @param flags - u32
- *
- * @return rc - u32
- *
- */
-static u32 tapcli_flag_change (vnet_main_t * vnm,
-                               vnet_hw_interface_t * hw,
-                               u32 flags)
-{
-  tapcli_main_t *tm = &tapcli_main;
-  tapcli_interface_t *ti;
-
-   ti = vec_elt_at_index (tm->tapcli_interfaces, hw->dev_instance);
-
-  if (flags & ETHERNET_INTERFACE_FLAG_MTU)
-    {
-      const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
-      tm->mtu_bytes = hw->max_packet_bytes;
-      tm->mtu_buffers = (tm->mtu_bytes + (buffer_size - 1)) / buffer_size;
-    }
-   else
-    {
-      struct ifreq ifr;
-      u32 want_promisc;
-
-      memcpy (&ifr, &ti->ifr, sizeof (ifr));
-
-      /* get flags, modify to bring up interface... */
-      if (ioctl (ti->provision_fd, SIOCGIFFLAGS, &ifr) < 0)
-        {
-          clib_unix_warning ("Couldn't get interface flags for %s", hw->name);
-          return 0;
-        }
-
-      want_promisc = (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL) != 0;
-
-      if (want_promisc == ti->is_promisc)
-        return 0;
-
-      if (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL)
-        ifr.ifr_flags |= IFF_PROMISC;
-      else
-        ifr.ifr_flags &= ~(IFF_PROMISC);
-
-      /* get flags, modify to bring up interface... */
-      if (ioctl (ti->provision_fd, SIOCSIFFLAGS, &ifr) < 0)
-        {
-          clib_unix_warning ("Couldn't set interface flags for %s", hw->name);
-          return 0;
-        }
-
-      ti->is_promisc = want_promisc;
-    }
-
-  return 0;
-}
-
-/**
- * @brief Setting the TAP interface's next processing node
- *
- * @param *vnm - vnet_main_t
- * @param hw_if_index - u32
- * @param node_index - u32
- *
- */
-static void tapcli_set_interface_next_node (vnet_main_t *vnm,
-                                            u32 hw_if_index,
-                                            u32 node_index)
-{
-  tapcli_main_t *tm = &tapcli_main;
-  tapcli_interface_t *ti;
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-
-  ti = vec_elt_at_index (tm->tapcli_interfaces, hw->dev_instance);
-
-  /** Shut off redirection */
-  if (node_index == ~0)
-    {
-      ti->per_interface_next_index = node_index;
-      return;
-    }
-
-  ti->per_interface_next_index =
-    vlib_node_add_next (tm->vlib_main, tapcli_rx_node.index, node_index);
-}
-
-/**
- * @brief Set link_state == admin_state otherwise things like ip6 neighbor discovery breaks
- *
- * @param *vnm - vnet_main_t
- * @param hw_if_index - u32
- * @param flags - u32
- *
- * @return error - clib_error_t
- */
-static clib_error_t *
-tapcli_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
-{
-  uword is_admin_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
-  u32 hw_flags;
-  u32 speed_duplex = VNET_HW_INTERFACE_FLAG_FULL_DUPLEX
-    | VNET_HW_INTERFACE_FLAG_SPEED_1G;
-
-  if (is_admin_up)
-    hw_flags = VNET_HW_INTERFACE_FLAG_LINK_UP | speed_duplex;
-  else
-    hw_flags = speed_duplex;
-
-  vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
-  return 0;
-}
-
-VNET_DEVICE_CLASS (tapcli_dev_class,static) = {
-  .name = "tapcli",
-  .tx_function = tapcli_tx,
-  .format_device_name = format_tapcli_interface_name,
-  .rx_redirect_to_node = tapcli_set_interface_next_node,
-  .name_renumber = tap_name_renumber,
-  .admin_up_down_function = tapcli_interface_admin_up_down,
-};
-
-/**
- * @brief Dump TAP interfaces
- *
- * @param **out_tapids - tapcli_interface_details_t
- *
- * @return rc - int
- *
- */
-int vnet_tap_dump_ifs (tapcli_interface_details_t **out_tapids)
-{
-  tapcli_main_t * tm = &tapcli_main;
-  tapcli_interface_t * ti;
-
-  tapcli_interface_details_t * r_tapids = NULL;
-  tapcli_interface_details_t * tapid = NULL;
-
-  vec_foreach (ti, tm->tapcli_interfaces) {
-    if (!ti->active)
-        continue;
-    vec_add2(r_tapids, tapid, 1);
-    tapid->sw_if_index = ti->sw_if_index;
-    strncpy((char *)tapid->dev_name, ti->ifr.ifr_name, sizeof (ti->ifr.ifr_name)-1);
-  }
-
-  *out_tapids = r_tapids;
-
-  return 0;
-}
-
-/**
- * @brief Get tap interface from inactive interfaces or create new
- *
- * @return interface - tapcli_interface_t
- *
- */
-static tapcli_interface_t *tapcli_get_new_tapif()
-{
-  tapcli_main_t * tm = &tapcli_main;
-  tapcli_interface_t *ti = NULL;
-
-  int inactive_cnt = vec_len(tm->tapcli_inactive_interfaces);
-  // if there are any inactive ifaces
-  if (inactive_cnt > 0) {
-    // take last
-    u32 ti_idx = tm->tapcli_inactive_interfaces[inactive_cnt - 1];
-    if (vec_len(tm->tapcli_interfaces) > ti_idx) {
-      ti = vec_elt_at_index (tm->tapcli_interfaces, ti_idx);
-      clib_warning("reusing tap interface");
-    }
-    // "remove" from inactive list
-    _vec_len(tm->tapcli_inactive_interfaces) -= 1;
-  }
-
-  // ti was not retrieved from inactive ifaces - create new
-  if (!ti)
-    vec_add2 (tm->tapcli_interfaces, ti, 1);
-
-  return ti;
-}
-
-/**
- * @brief Connect a TAP interface
- *
- * @param vm - vlib_main_t
- * @param intfc_name - u8
- * @param hwaddr_arg - u8
- * @param sw_if_indexp - u32
- *
- * @return rc - int
- *
- */
-int vnet_tap_connect (vlib_main_t * vm, u8 * intfc_name, u8 *hwaddr_arg,
-                      u32 * sw_if_indexp)
-{
-  tapcli_main_t * tm = &tapcli_main;
-  tapcli_interface_t * ti = NULL;
-  struct ifreq ifr;
-  int flags;
-  int dev_net_tun_fd;
-  int dev_tap_fd = -1;
-  clib_error_t * error;
-  u8 hwaddr [6];
-  int rv = 0;
-
-  if (tm->is_disabled)
-    {
-      return VNET_API_ERROR_FEATURE_DISABLED;
-    }
-
-  flags = IFF_TAP | IFF_NO_PI;
-
-  if ((dev_net_tun_fd = open ("/dev/net/tun", O_RDWR)) < 0)
-    return VNET_API_ERROR_SYSCALL_ERROR_1;
-
-  memset (&ifr, 0, sizeof (ifr));
-  strncpy(ifr.ifr_name, (char *) intfc_name, sizeof (ifr.ifr_name)-1);
-  ifr.ifr_flags = flags;
-  if (ioctl (dev_net_tun_fd, TUNSETIFF, (void *)&ifr) < 0)
-    {
-      rv = VNET_API_ERROR_SYSCALL_ERROR_2;
-      goto error;
-    }
-    
-  /* Open a provisioning socket */
-  if ((dev_tap_fd = socket(PF_PACKET, SOCK_RAW,
-                           htons(ETH_P_ALL))) < 0 )
-    {
-      rv = VNET_API_ERROR_SYSCALL_ERROR_3;
-      goto error;
-    }
-
-  /* Find the interface index. */
-  {
-    struct ifreq ifr;
-    struct sockaddr_ll sll;
-
-    memset (&ifr, 0, sizeof(ifr));
-    strncpy (ifr.ifr_name, (char *) intfc_name, sizeof (ifr.ifr_name)-1);
-    if (ioctl (dev_tap_fd, SIOCGIFINDEX, &ifr) < 0 )
-      {
-        rv = VNET_API_ERROR_SYSCALL_ERROR_4;
-        goto error;
-      }
-
-    /* Bind the provisioning socket to the interface. */
-    memset(&sll, 0, sizeof(sll));
-    sll.sll_family   = AF_PACKET;
-    sll.sll_ifindex  = ifr.ifr_ifindex;
-    sll.sll_protocol = htons(ETH_P_ALL);
-
-    if (bind(dev_tap_fd, (struct sockaddr*) &sll, sizeof(sll)) < 0)
-      {
-        rv = VNET_API_ERROR_SYSCALL_ERROR_5;
-        goto error;
-      }
-  }
-
-  /* non-blocking I/O on /dev/tapX */
-  {
-    int one = 1;
-    if (ioctl (dev_net_tun_fd, FIONBIO, &one) < 0)
-      {
-        rv = VNET_API_ERROR_SYSCALL_ERROR_6;
-	goto error;
-      }
-  }
-  ifr.ifr_mtu = tm->mtu_bytes;
-  if (ioctl (dev_tap_fd, SIOCSIFMTU, &ifr) < 0)
-    {
-      rv = VNET_API_ERROR_SYSCALL_ERROR_7;
-      goto error;
-    }
-
-  /* get flags, modify to bring up interface... */
-  if (ioctl (dev_tap_fd, SIOCGIFFLAGS, &ifr) < 0)
-    {
-      rv = VNET_API_ERROR_SYSCALL_ERROR_8;
-      goto error;
-    }
-
-  ifr.ifr_flags |= (IFF_UP | IFF_RUNNING);
-
-  if (ioctl (dev_tap_fd, SIOCSIFFLAGS, &ifr) < 0)
-    {
-      rv = VNET_API_ERROR_SYSCALL_ERROR_9;
-      goto error;
-    }
-
-  ti = tapcli_get_new_tapif();
-  ti->per_interface_next_index = ~0;
-
-  if (hwaddr_arg != 0)
-    clib_memcpy(hwaddr, hwaddr_arg, 6);
-  else
-    {
-      f64 now = vlib_time_now(vm);
-      u32 rnd;
-      rnd = (u32) (now * 1e6);
-      rnd = random_u32 (&rnd);
-
-      memcpy (hwaddr+2, &rnd, sizeof(rnd));
-      hwaddr[0] = 2;
-      hwaddr[1] = 0xfe;
-    }
-
-  error = ethernet_register_interface
-        (tm->vnet_main,
-         tapcli_dev_class.index,
-         ti - tm->tapcli_interfaces /* device instance */,
-         hwaddr /* ethernet address */,
-         &ti->hw_if_index, 
-         tapcli_flag_change);
-
-  if (error)
-    {
-      clib_error_report (error);
-      rv = VNET_API_ERROR_INVALID_REGISTRATION;
-      goto error;
-    }
-
-  {
-    unix_file_t template = {0};
-    template.read_function = tapcli_read_ready;
-    template.file_descriptor = dev_net_tun_fd;
-    ti->unix_file_index = unix_file_add (&unix_main, &template);
-    ti->unix_fd = dev_net_tun_fd;
-    ti->provision_fd = dev_tap_fd;
-    clib_memcpy (&ti->ifr, &ifr, sizeof (ifr));
-  }
-  
-  {
-    vnet_hw_interface_t * hw;
-    hw = vnet_get_hw_interface (tm->vnet_main, ti->hw_if_index);
-    hw->min_supported_packet_bytes = TAP_MTU_MIN;
-    hw->max_supported_packet_bytes = TAP_MTU_MAX;
-    hw->max_l3_packet_bytes[VLIB_RX] = hw->max_l3_packet_bytes[VLIB_TX] = hw->max_supported_packet_bytes - sizeof(ethernet_header_t);
-    ti->sw_if_index = hw->sw_if_index;
-    if (sw_if_indexp)
-      *sw_if_indexp = hw->sw_if_index;
-  }
-
-  ti->active = 1;
-  
-  hash_set (tm->tapcli_interface_index_by_sw_if_index, ti->sw_if_index,
-            ti - tm->tapcli_interfaces);
-  
-  hash_set (tm->tapcli_interface_index_by_unix_fd, ti->unix_fd,
-            ti - tm->tapcli_interfaces);
-  
-  return rv;
-
- error:
-  close (dev_net_tun_fd);
-  if (dev_tap_fd >= 0)
-      close (dev_tap_fd);
-
-  return rv;
-}
-
-/**
- * @brief Renumber a TAP interface
- *
- * @param *vm - vlib_main_t
- * @param *intfc_name - u8
- * @param *hwaddr_arg - u8
- * @param *sw_if_indexp - u32
- * @param renumber - u8
- * @param custom_dev_instance - u32
- *
- * @return rc - int
- *
- */
-int vnet_tap_connect_renumber (vlib_main_t * vm, u8 * intfc_name,
-                               u8 *hwaddr_arg, u32 * sw_if_indexp,
-                               u8 renumber, u32 custom_dev_instance)
-{
-    int rv = vnet_tap_connect(vm, intfc_name, hwaddr_arg, sw_if_indexp);
-
-    if (!rv && renumber)
-        vnet_interface_name_renumber (*sw_if_indexp, custom_dev_instance);
-
-    return rv;
-}
-
-/**
- * @brief Disconnect TAP CLI interface
- *
- * @param *ti - tapcli_interface_t
- *
- * @return rc - int
- *
- */
-static int tapcli_tap_disconnect (tapcli_interface_t *ti)
-{
-  int rv = 0;
-  vnet_main_t * vnm = vnet_get_main();
-  tapcli_main_t * tm = &tapcli_main;
-  u32 sw_if_index = ti->sw_if_index;
-
-  // bring interface down
-  vnet_sw_interface_set_flags (vnm, sw_if_index, 0);
-
-  if (ti->unix_file_index != ~0) {
-    unix_file_del (&unix_main, unix_main.file_pool + ti->unix_file_index);
-    ti->unix_file_index = ~0;
-  }
-  else
-    close(ti->unix_fd);
-
-  hash_unset (tm->tapcli_interface_index_by_unix_fd, ti->unix_fd);
-  hash_unset (tm->tapcli_interface_index_by_sw_if_index, ti->sw_if_index);
-  close(ti->provision_fd);
-  ti->unix_fd = -1;
-  ti->provision_fd = -1;
-
-  return rv;
-}
-
-/**
- * @brief Delete TAP interface
- *
- * @param *vm - vlib_main_t
- * @param sw_if_index - u32
- *
- * @return rc - int
- *
- */
-int vnet_tap_delete(vlib_main_t *vm, u32 sw_if_index)
-{
-  int rv = 0;
-  tapcli_main_t * tm = &tapcli_main;
-  tapcli_interface_t *ti;
-  uword *p = NULL;
-
-  p = hash_get (tm->tapcli_interface_index_by_sw_if_index,
-                sw_if_index);
-  if (p == 0) {
-    clib_warning ("sw_if_index %d unknown", sw_if_index);
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-  }
-  ti = vec_elt_at_index (tm->tapcli_interfaces, p[0]);
-
-  // inactive
-  ti->active = 0;
-  tapcli_tap_disconnect(ti);
-  // add to inactive list
-  vec_add1(tm->tapcli_inactive_interfaces, ti - tm->tapcli_interfaces);
-
-  // reset renumbered iface
-  if (p[0] < vec_len (tm->show_dev_instance_by_real_dev_instance))
-    tm->show_dev_instance_by_real_dev_instance[p[0]] = ~0;
-
-  ethernet_delete_interface (tm->vnet_main, ti->hw_if_index);
-  return rv;
-}
-
-/**
- * @brief CLI function to delete TAP interface
- *
- * @param *vm - vlib_main_t
- * @param *input - unformat_input_t
- * @param *cmd - vlib_cli_command_t
- *
- * @return error - clib_error_t
- *
- */
-static clib_error_t *
-tap_delete_command_fn (vlib_main_t * vm,
-		 unformat_input_t * input,
-		 vlib_cli_command_t * cmd)
-{
-  tapcli_main_t * tm = &tapcli_main;
-  u32 sw_if_index = ~0;
-
-  if (tm->is_disabled)
-    {
-      return clib_error_return (0, "device disabled...");
-    }
-
-  if (unformat (input, "%U", unformat_vnet_sw_interface, tm->vnet_main,
-                &sw_if_index))
-      ;
-  else
-    return clib_error_return (0, "unknown input `%U'",
-                              format_unformat_error, input);
-
-
-  int rc = vnet_tap_delete (vm, sw_if_index);
-
-  if (!rc) {
-    vlib_cli_output (vm, "Deleted.");
-  } else {
-    vlib_cli_output (vm, "Error during deletion of tap interface. (rc: %d)", rc);
-  }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (tap_delete_command, static) = {
-    .path = "tap delete",
-    .short_help = "tap delete <vpp-tap-intfc-name>",
-    .function = tap_delete_command_fn,
-};
-
-/**
- * @brief Modifies tap interface - can result in new interface being created
- *
- * @param *vm - vlib_main_t
- * @param orig_sw_if_index - u32
- * @param *intfc_name - u8
- * @param *hwaddr_arg - u8
- * @param *sw_if_indexp - u32
- * @param renumber - u8
- * @param custom_dev_instance - u32
- *
- * @return rc - int
- *
- */
-int vnet_tap_modify (vlib_main_t * vm, u32 orig_sw_if_index,
-                     u8 * intfc_name, u8 *hwaddr_arg, 
-                     u32 * sw_if_indexp,
-                     u8 renumber, u32 custom_dev_instance)
-{
-    int rv = vnet_tap_delete (vm, orig_sw_if_index);
-
-    if (rv)
-        return rv;
-
-    rv = vnet_tap_connect_renumber(vm, intfc_name, hwaddr_arg, sw_if_indexp,
-            renumber, custom_dev_instance);
-
-    return rv;
-}
-
-/**
- * @brief CLI function to modify TAP interface
- *
- * @param *vm - vlib_main_t
- * @param *input - unformat_input_t
- * @param *cmd - vlib_cli_command_t
- *
- * @return error - clib_error_t
- *
- */
-static clib_error_t *
-tap_modify_command_fn (vlib_main_t * vm,
-		 unformat_input_t * input,
-		 vlib_cli_command_t * cmd)
-{
-  u8 * intfc_name;
-  tapcli_main_t * tm = &tapcli_main;
-  u32 sw_if_index = ~0;
-  u32 new_sw_if_index = ~0;
-  int user_hwaddr = 0;
-  u8 hwaddr[6];
-
-  if (tm->is_disabled)
-    {
-      return clib_error_return (0, "device disabled...");
-    }
-
-  if (unformat (input, "%U", unformat_vnet_sw_interface, tm->vnet_main,
-                &sw_if_index))
-      ;
-  else
-    return clib_error_return (0, "unknown input `%U'",
-                              format_unformat_error, input);
-
-  if (unformat (input, "%s", &intfc_name))
-    ;
-  else
-    return clib_error_return (0, "unknown input `%U'",
-                              format_unformat_error, input);
-
-  if (unformat(input, "hwaddr %U", unformat_ethernet_address,
-               &hwaddr))
-    user_hwaddr = 1;
-
-
-  int rc = vnet_tap_modify (vm, sw_if_index, intfc_name,
-                            (user_hwaddr == 1 ? hwaddr : 0),
-                            &new_sw_if_index, 0, 0);
-
-  if (!rc) {
-    vlib_cli_output (vm, "Modified %U for Linux tap '%s'",
-                   format_vnet_sw_if_index_name, tm->vnet_main, 
-                   new_sw_if_index, intfc_name);
-  } else {
-    vlib_cli_output (vm, "Error during modification of tap interface. (rc: %d)", rc);
-  }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (tap_modify_command, static) = {
-    .path = "tap modify",
-    .short_help = "tap modify <vpp-tap-intfc-name> <linux-intfc-name> [hwaddr <addr>]",
-    .function = tap_modify_command_fn,
-};
-
-/**
- * @brief CLI function to connect TAP interface
- *
- * @param *vm - vlib_main_t
- * @param *input - unformat_input_t
- * @param *cmd - vlib_cli_command_t
- *
- * @return error - clib_error_t
- *
- */
-static clib_error_t *
-tap_connect_command_fn (vlib_main_t * vm,
-		 unformat_input_t * input,
-		 vlib_cli_command_t * cmd)
-{
-  u8 * intfc_name;
-  tapcli_main_t * tm = &tapcli_main;
-  u8 hwaddr[6];
-  u8 *hwaddr_arg = 0;
-  u32 sw_if_index;
-
-  if (tm->is_disabled)
-    {
-      return clib_error_return (0, "device disabled...");
-    }
-
-  if (unformat (input, "%s", &intfc_name))
-    ;
-  else
-    return clib_error_return (0, "unknown input `%U'",
-                              format_unformat_error, input);
-  
-  if (unformat(input, "hwaddr %U", unformat_ethernet_address,
-               &hwaddr))
-    hwaddr_arg = hwaddr;
-
-  /* It is here for backward compatibility */
-  if (unformat(input, "hwaddr random"))
-    ;
-
-  int rv = vnet_tap_connect(vm, intfc_name, hwaddr_arg, &sw_if_index);
-  if (rv) {
-    switch (rv) {
-    case VNET_API_ERROR_SYSCALL_ERROR_1:
-      vlib_cli_output (vm, "Couldn't open /dev/net/tun");
-      break;
-
-    case VNET_API_ERROR_SYSCALL_ERROR_2:
-      vlib_cli_output (vm, "Error setting flags on '%s'", intfc_name);
-      break;
-  
-    case VNET_API_ERROR_SYSCALL_ERROR_3:
-      vlib_cli_output (vm, "Couldn't open provisioning socket");
-      break;
-
-    case VNET_API_ERROR_SYSCALL_ERROR_4:
-      vlib_cli_output (vm, "Couldn't get if_index");
-      break;
-    
-    case VNET_API_ERROR_SYSCALL_ERROR_5:
-      vlib_cli_output (vm, "Couldn't bind provisioning socket");
-      break;
-
-    case VNET_API_ERROR_SYSCALL_ERROR_6:
-      vlib_cli_output (0, "Couldn't set device non-blocking flag");
-      break;
-
-    case VNET_API_ERROR_SYSCALL_ERROR_7:
-      vlib_cli_output (0, "Couldn't set device MTU");
-      break;
-
-    case VNET_API_ERROR_SYSCALL_ERROR_8:
-      vlib_cli_output (0, "Couldn't get interface flags");
-      break;
-
-    case VNET_API_ERROR_SYSCALL_ERROR_9:
-      vlib_cli_output (0, "Couldn't set intfc admin state up");
-      break;
-
-    case VNET_API_ERROR_INVALID_REGISTRATION:
-      vlib_cli_output (0, "Invalid registration");
-      break;
-    default:
-      vlib_cli_output (0, "Unknown error: %d", rv);
-      break;
-    }
-    return 0;
-  }
-
-  vlib_cli_output(vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main(), sw_if_index);
-  return 0;
-  }
-
-VLIB_CLI_COMMAND (tap_connect_command, static) = {
-    .path = "tap connect",
-    .short_help = "tap connect <intfc-name> [hwaddr <addr>]",
-    .function = tap_connect_command_fn,
-};
-
-/**
- * @brief TAPCLI main init
- *
- * @param *vm - vlib_main_t
- *
- * @return error - clib_error_t
- *
- */
-clib_error_t *
-tapcli_init (vlib_main_t * vm)
-{
-  tapcli_main_t * tm = &tapcli_main;
-
-  tm->vlib_main = vm;
-  tm->vnet_main = vnet_get_main();
-  tm->unix_main = &unix_main;
-  tm->mtu_bytes = TAP_MTU_DEFAULT;
-  tm->tapcli_interface_index_by_sw_if_index = hash_create (0, sizeof(uword));
-  tm->tapcli_interface_index_by_unix_fd = hash_create (0, sizeof (uword));
-  tm->rx_buffers = 0;
-  vec_alloc(tm->rx_buffers, VLIB_FRAME_SIZE);
-  vec_reset_length(tm->rx_buffers);
-  vm->os_punt_frame = tapcli_nopunt_frame;
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (tapcli_init);
diff --git a/vnet/vnet/unix/tapcli.h b/vnet/vnet/unix/tapcli.h
deleted file mode 100644
index fcd82dbf..00000000
--- a/vnet/vnet/unix/tapcli.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * tapcli.h : tap support
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file
- * @brief TAPCLI definitions
- */
-
-#ifndef __included_tapcli_h__
-#define __included_tapcli_h__
-
-/** TAP CLI errors */
-#define foreach_tapcli_error				\
-  /* Must be first. */                                  \
- _(NONE, "no error")                                    \
- _(READ, "read error")                                  \
- _(BUFFER_ALLOC, "buffer allocation error")             \
- _(UNKNOWN, "unknown error")
-
-typedef enum {
-#define _(sym,str) TAPCLI_ERROR_##sym,
-  foreach_tapcli_error
-#undef _
-   TAPCLI_N_ERROR,
- } tapcli_error_t;
-
-/** TAP CLI interface details struct */
-typedef struct {
-  u32 sw_if_index;
-  u8 dev_name[64];
-} tapcli_interface_details_t;
-
-int vnet_tap_dump_ifs (tapcli_interface_details_t **out_tapids);
-
-#define TAP_MTU_MIN 68
-#define TAP_MTU_MAX 65535
-#define TAP_MTU_DEFAULT 1500
-
-#endif /* __included_tapcli_h__ */
diff --git a/vnet/vnet/unix/tuntap.c b/vnet/vnet/unix/tuntap.c
deleted file mode 100644
index 4a5dd676..00000000
--- a/vnet/vnet/unix/tuntap.c
+++ /dev/null
@@ -1,1000 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * tuntap.c - kernel stack (reverse) punt/inject path
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-/**
- * @file
- * @brief  TunTap Kernel stack (reverse) punt/inject path.
- *
- * This driver runs in one of two distinct modes:
- * - "punt/inject" mode, where we send pkts not otherwise processed
- * by the forwarding to the Linux kernel stack, and
- *
- * - "normal interface" mode, where we treat the Linux kernel stack
- * as a peer.
- *
- * By default, we select punt/inject mode.
- */
-
-#include <fcntl.h>		/* for open */
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/uio.h>		/* for iovec */
-#include <netinet/in.h>
-
-#include <linux/if_arp.h>
-#include <linux/if_tun.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-
-#include <vnet/ip/ip.h>
-
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/devices/devices.h>
-#include <vnet/feature/feature.h>
-
-static vnet_device_class_t tuntap_dev_class;
-static vnet_hw_interface_class_t tuntap_interface_class;
-
-static void tuntap_punt_frame (vlib_main_t * vm,
-                               vlib_node_runtime_t * node,
-                               vlib_frame_t * frame);
-static void tuntap_nopunt_frame (vlib_main_t * vm,
-                                 vlib_node_runtime_t * node,
-                                 vlib_frame_t * frame);
-
-typedef struct {
-  u32 sw_if_index;
-  u8 is_v6;
-  u8 addr[16];
-} subif_address_t;
-
-/**
- * @brief TUNTAP node main state
- */
-typedef struct {
-  /** Vector of iovecs for readv/writev calls. */
-  struct iovec * iovecs;
-
-  /** Vector of VLIB rx buffers to use.  We allocate them in blocks
-     of VLIB_FRAME_SIZE (256). */
-  u32 * rx_buffers;
-
-  /** File descriptors for /dev/net/tun and provisioning socket. */
-  int dev_net_tun_fd, dev_tap_fd;
-
-  /** Create a "tap" [ethernet] encaps device */
-  int is_ether;
-
-  /** 1 if a "normal" routed intfc, 0 if a punt/inject interface */
-
-  int have_normal_interface;
-
-  /** tap device destination MAC address. Required, or Linux drops pkts */
-  u8 ether_dst_mac[6];
-
-  /** Interface MTU in bytes and # of default sized buffers. */
-  u32 mtu_bytes, mtu_buffers;
-
-  /** Linux interface name for tun device. */
-  char * tun_name;
-
-  /** Pool of subinterface addresses */
-  subif_address_t *subifs;
-
-  /** Hash for subif addresses */
-  mhash_t subif_mhash;
-
-  /** Unix file index */
-  u32 unix_file_index;
-
-  /** For the "normal" interface, if configured */
-  u32 hw_if_index, sw_if_index;
-
-} tuntap_main_t;
-
-static tuntap_main_t tuntap_main = {
-  .tun_name = "vnet",
-
-  /** Suitable defaults for an Ethernet-like tun/tap device */
-  .mtu_bytes = 4096 + 256,
-};
-
-/**
- * @brief tuntap_tx
- * @node tuntap-tx
- *
- * Output node, writes the buffers comprising the incoming frame
- * to the tun/tap device, aka hands them to the Linux kernel stack.
- *
- * @param *vm - vlib_main_t
- * @param *node - vlib_node_runtime_t
- * @param *frame - vlib_frame_t
- *
- * @return rc - uword
- *
- */
-static uword
-tuntap_tx (vlib_main_t * vm,
-	   vlib_node_runtime_t * node,
-	   vlib_frame_t * frame)
-{
-  u32 * buffers = vlib_frame_args (frame);
-  uword n_packets = frame->n_vectors;
-  tuntap_main_t * tm = &tuntap_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  u32 n_bytes = 0;
-  int i;
-
-  for (i = 0; i < n_packets; i++)
-    {
-      struct iovec * iov;
-      vlib_buffer_t * b;
-      uword l;
-
-      b = vlib_get_buffer (vm, buffers[i]);
-
-      if (tm->is_ether && (!tm->have_normal_interface))
-        {
-          vlib_buffer_reset(b);
-          clib_memcpy (vlib_buffer_get_current (b), tm->ether_dst_mac, 6);
-        }
-
-      /* Re-set iovecs if present. */
-      if (tm->iovecs)
-	_vec_len (tm->iovecs) = 0;
-
-      /** VLIB buffer chain -> Unix iovec(s). */
-      vec_add2 (tm->iovecs, iov, 1);
-      iov->iov_base = b->data + b->current_data;
-      iov->iov_len = l = b->current_length;
-
-      if (PREDICT_FALSE (b->flags & VLIB_BUFFER_NEXT_PRESENT))
-	{
-	  do {
-	    b = vlib_get_buffer (vm, b->next_buffer);
-
-	    vec_add2 (tm->iovecs, iov, 1);
-
-	    iov->iov_base = b->data + b->current_data;
-	    iov->iov_len = b->current_length;
-	    l += b->current_length;
-	  } while (b->flags & VLIB_BUFFER_NEXT_PRESENT);
-	}
-
-      if (writev (tm->dev_net_tun_fd, tm->iovecs, vec_len (tm->iovecs)) < l)
-	clib_unix_warning ("writev");
-
-      n_bytes += l;
-    }
-
-  /* Update tuntap interface output stats. */
-  vlib_increment_combined_counter (im->combined_sw_if_counters
-				   + VNET_INTERFACE_COUNTER_TX,
-				   vm->cpu_index,
-				   tm->sw_if_index, n_packets, n_bytes);
-
-
-  /** The normal interface path flattens the buffer chain */
-  if (tm->have_normal_interface)
-    vlib_buffer_free_no_next (vm, buffers, n_packets);
-  else
-    vlib_buffer_free (vm, buffers, n_packets);
-
-  return n_packets;
-}
-
-VLIB_REGISTER_NODE (tuntap_tx_node,static) = {
-  .function = tuntap_tx,
-  .name = "tuntap-tx",
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .vector_size = 4,
-};
-
-/**
- * @brief TUNTAP receive node
- * @node tuntap-rx
- *
- * @param *vm - vlib_main_t
- * @param *node - vlib_node_runtime_t
- * @param *frame - vlib_frame_t
- *
- * @return rc - uword
- *
- */
-static uword
-tuntap_rx (vlib_main_t * vm,
-	   vlib_node_runtime_t * node,
-	   vlib_frame_t * frame)
-{
-  tuntap_main_t * tm = &tuntap_main;
-  vlib_buffer_t * b;
-  u32 bi;
-  const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
-
-  /** Make sure we have some RX buffers. */
-  {
-    uword n_left = vec_len (tm->rx_buffers);
-    uword n_alloc;
-
-    if (n_left < VLIB_FRAME_SIZE / 2)
-      {
-	if (! tm->rx_buffers)
-	  vec_alloc (tm->rx_buffers, VLIB_FRAME_SIZE);
-
-	n_alloc = vlib_buffer_alloc (vm, tm->rx_buffers + n_left, VLIB_FRAME_SIZE - n_left);
-	_vec_len (tm->rx_buffers) = n_left + n_alloc;
-      }
-  }
-
-  /** Allocate RX buffers from end of rx_buffers.
-     Turn them into iovecs to pass to readv. */
-  {
-    uword i_rx = vec_len (tm->rx_buffers) - 1;
-    vlib_buffer_t * b;
-    word i, n_bytes_left, n_bytes_in_packet;
-
-    /** We should have enough buffers left for an MTU sized packet. */
-    ASSERT (vec_len (tm->rx_buffers) >= tm->mtu_buffers);
-
-    vec_validate (tm->iovecs, tm->mtu_buffers - 1);
-    for (i = 0; i < tm->mtu_buffers; i++)
-      {
-	b = vlib_get_buffer (vm, tm->rx_buffers[i_rx - i]);
-	tm->iovecs[i].iov_base = b->data;
-	tm->iovecs[i].iov_len = buffer_size;
-      }
-
-    n_bytes_left = readv (tm->dev_net_tun_fd, tm->iovecs, tm->mtu_buffers);
-    n_bytes_in_packet = n_bytes_left;
-    if (n_bytes_left <= 0)
-      {
-        if (errno != EAGAIN)
-          clib_unix_warning ("readv %d", n_bytes_left);
-	return 0;
-      }
-
-    bi = tm->rx_buffers[i_rx];
-
-    while (1)
-      {
-	b = vlib_get_buffer (vm, tm->rx_buffers[i_rx]);
-	b->flags = 0;
-	b->current_data = 0;
-	b->current_length = n_bytes_left < buffer_size ? n_bytes_left : buffer_size;
-
-	n_bytes_left -= buffer_size;
-
-	if (n_bytes_left <= 0)
-          {
-            break;
-          }
-
-	i_rx--;
-	b->flags |= VLIB_BUFFER_NEXT_PRESENT;
-	b->next_buffer = tm->rx_buffers[i_rx];
-      }
-
-    /** Interface counters for tuntap interface. */
-    vlib_increment_combined_counter
-        (vnet_main.interface_main.combined_sw_if_counters
-         + VNET_INTERFACE_COUNTER_RX,
-         os_get_cpu_number(),
-         tm->sw_if_index,
-         1, n_bytes_in_packet);
-
-    _vec_len (tm->rx_buffers) = i_rx;
-  }
-
-  b = vlib_get_buffer (vm, bi);
-
-  {
-    u32 next_index;
-    uword n_trace = vlib_get_trace_count (vm, node);
-
-    vnet_buffer (b)->sw_if_index[VLIB_RX] = tm->sw_if_index;
-    vnet_buffer (b)->sw_if_index[VLIB_TX] = (u32)~0;
-
-    /*
-     * Turn this on if you run into
-     * "bad monkey" contexts, and you want to know exactly
-     * which nodes they've visited...
-     */
-    if (VLIB_BUFFER_TRACE_TRAJECTORY)
-        b->pre_data[0] = 0;
-
-    b->error = node->errors[0];
-
-    if (tm->is_ether)
-      {
-	next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-      }
-    else
-      switch (b->data[0] & 0xf0)
-        {
-        case 0x40:
-          next_index = VNET_DEVICE_INPUT_NEXT_IP4_INPUT;
-          break;
-        case 0x60:
-          next_index = VNET_DEVICE_INPUT_NEXT_IP6_INPUT;
-          break;
-        default:
-          next_index = VNET_DEVICE_INPUT_NEXT_DROP;
-          break;
-        }
-
-    /* The linux kernel couldn't care less if our interface is up */
-    if (tm->have_normal_interface)
-      {
-        vnet_main_t *vnm = vnet_get_main();
-        vnet_sw_interface_t * si;
-        si = vnet_get_sw_interface (vnm, tm->sw_if_index);
-        if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
-          next_index = VNET_DEVICE_INPUT_NEXT_DROP;
-      }
-
-    vnet_feature_start_device_input_x1 (tm->sw_if_index, &next_index, b, 0);
-
-    vlib_set_next_frame_buffer (vm, node, next_index, bi);
-
-    if (n_trace > 0)
-      {
-        vlib_trace_buffer (vm, node, next_index,
-                           b, /* follow_chain */ 1);
-        vlib_set_trace_count (vm, node, n_trace - 1);
-      }
-  }
-
-  return 1;
-}
-
-/**
- * @brief TUNTAP_RX error strings
- */
-static char * tuntap_rx_error_strings[] = {
-  "unknown packet type",
-};
-
-VLIB_REGISTER_NODE (tuntap_rx_node,static) = {
-  .function = tuntap_rx,
-  .name = "tuntap-rx",
-  .sibling_of = "device-input",
-  .type = VLIB_NODE_TYPE_INPUT,
-  .state = VLIB_NODE_STATE_INTERRUPT,
-  .vector_size = 4,
-  .n_errors = 1,
-  .error_strings = tuntap_rx_error_strings,
-};
-
-/**
- * @brief Gets called when file descriptor is ready from epoll.
- *
- * @param *uf - unix_file_t
- *
- * @return error - clib_error_t
- */
-static clib_error_t * tuntap_read_ready (unix_file_t * uf)
-{
-  vlib_main_t * vm = vlib_get_main();
-  vlib_node_set_interrupt_pending (vm, tuntap_rx_node.index);
-  return 0;
-}
-
-/**
- * @brief Clean up the tun/tap device
- *
- * @param *vm - vlib_main_t
- *
- * @return error - clib_error_t
- *
- */
-static clib_error_t *
-tuntap_exit (vlib_main_t * vm)
-{
-  tuntap_main_t *tm = &tuntap_main;
-  struct ifreq ifr;
-  int sfd;
-
-  /* Not present. */
-  if (! tm->dev_net_tun_fd || tm->dev_net_tun_fd < 0)
-    return 0;
-
-  sfd = socket (AF_INET, SOCK_STREAM, 0);
-  if (sfd < 0)
-    clib_unix_warning("provisioning socket");
-
-  memset(&ifr, 0, sizeof (ifr));
-  strncpy (ifr.ifr_name, tm->tun_name, sizeof (ifr.ifr_name)-1);
-
-  /* get flags, modify to bring down interface... */
-  if (ioctl (sfd, SIOCGIFFLAGS, &ifr) < 0)
-    clib_unix_warning ("SIOCGIFFLAGS");
-
-  ifr.ifr_flags &= ~(IFF_UP | IFF_RUNNING);
-
-  if (ioctl (sfd, SIOCSIFFLAGS, &ifr) < 0)
-    clib_unix_warning ("SIOCSIFFLAGS");
-
-  /* Turn off persistence */
-  if (ioctl (tm->dev_net_tun_fd, TUNSETPERSIST, 0) < 0)
-    clib_unix_warning ("TUNSETPERSIST");
-  close(tm->dev_tap_fd);
-  if (tm->dev_net_tun_fd >= 0)
-    close(tm->dev_net_tun_fd);
-  if (sfd >= 0)
-    close (sfd);
-
-  return 0;
-}
-
-VLIB_MAIN_LOOP_EXIT_FUNCTION (tuntap_exit);
-
-/**
- * @brief CLI function for tun/tap config
- *
- * @param *vm - vlib_main_t
- * @param *input - unformat_input_t
- *
- * @return error - clib_error_t
- *
- */
-static clib_error_t *
-tuntap_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  tuntap_main_t *tm = &tuntap_main;
-  clib_error_t * error = 0;
-  struct ifreq ifr;
-  u8 * name;
-  int flags = IFF_TUN | IFF_NO_PI;
-  int is_enabled = 0, is_ether = 0, have_normal_interface = 0;
-  const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "mtu %d", &tm->mtu_bytes))
-	;
-      else if (unformat (input, "enable"))
-        is_enabled = 1;
-      else if (unformat (input, "disable"))
-        is_enabled = 0;
-      else if (unformat (input, "ethernet") ||
-               unformat (input, "ether"))
-        is_ether = 1;
-      else if (unformat (input, "have-normal-interface") ||
-               unformat (input, "have-normal"))
-        have_normal_interface = 1;
-      else if (unformat (input, "name %s", &name))
-	tm->tun_name = (char *) name;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-
-  tm->dev_net_tun_fd = -1;
-  tm->dev_tap_fd = -1;
-
-  if (is_enabled == 0)
-    return 0;
-
-  if (geteuid()) 
-    {
-      clib_warning ("tuntap disabled: must be superuser");
-      return 0;
-    }    
-
-  tm->is_ether = is_ether;
-  tm->have_normal_interface = have_normal_interface;
-
-  if (is_ether)
-    flags = IFF_TAP | IFF_NO_PI;
-
-  if ((tm->dev_net_tun_fd = open ("/dev/net/tun", O_RDWR)) < 0)
-    {
-      error = clib_error_return_unix (0, "open /dev/net/tun");
-      goto done;
-    }
-
-  memset (&ifr, 0, sizeof (ifr));
-  strncpy(ifr.ifr_name, tm->tun_name, sizeof(ifr.ifr_name)-1);
-  ifr.ifr_flags = flags;
-  if (ioctl (tm->dev_net_tun_fd, TUNSETIFF, (void *)&ifr) < 0)
-    {
-      error = clib_error_return_unix (0, "ioctl TUNSETIFF");
-      goto done;
-    }
-    
-  /* Make it persistent, at least until we split. */
-  if (ioctl (tm->dev_net_tun_fd, TUNSETPERSIST, 1) < 0)
-    {
-      error = clib_error_return_unix (0, "TUNSETPERSIST");
-      goto done;
-    }
-
-  /* Open a provisioning socket */
-  if ((tm->dev_tap_fd = socket(PF_PACKET, SOCK_RAW,
-			       htons(ETH_P_ALL))) < 0 )
-    {
-      error = clib_error_return_unix (0, "socket");
-      goto done;
-    }
-
-  /* Find the interface index. */
-  {
-    struct ifreq ifr;
-    struct sockaddr_ll sll;
-
-    memset (&ifr, 0, sizeof(ifr));
-    strncpy (ifr.ifr_name, tm->tun_name, sizeof(ifr.ifr_name)-1);
-    if (ioctl (tm->dev_tap_fd, SIOCGIFINDEX, &ifr) < 0 )
-      {
-	error = clib_error_return_unix (0, "ioctl SIOCGIFINDEX");
-	goto done;
-      }
-
-    /* Bind the provisioning socket to the interface. */
-    memset(&sll, 0, sizeof(sll));
-    sll.sll_family   = AF_PACKET;
-    sll.sll_ifindex  = ifr.ifr_ifindex;
-    sll.sll_protocol = htons(ETH_P_ALL);
-
-    if (bind(tm->dev_tap_fd, (struct sockaddr*) &sll, sizeof(sll)) < 0)
-      {
-	error = clib_error_return_unix (0, "bind");
-	goto done;
-      }
-  }
-
-  /* non-blocking I/O on /dev/tapX */
-  {
-    int one = 1;
-    if (ioctl (tm->dev_net_tun_fd, FIONBIO, &one) < 0)
-      {
-	error = clib_error_return_unix (0, "ioctl FIONBIO");
-	goto done;
-      }
-  }
-
-  tm->mtu_buffers = (tm->mtu_bytes + (buffer_size - 1)) / buffer_size;
-
-  ifr.ifr_mtu = tm->mtu_bytes;
-  if (ioctl (tm->dev_tap_fd, SIOCSIFMTU, &ifr) < 0)
-    {
-      error = clib_error_return_unix (0, "ioctl SIOCSIFMTU");
-      goto done;
-    }
-
-  /* get flags, modify to bring up interface... */
-  if (ioctl (tm->dev_tap_fd, SIOCGIFFLAGS, &ifr) < 0)
-    {
-      error = clib_error_return_unix (0, "ioctl SIOCGIFFLAGS");
-      goto done;
-    }
-
-  ifr.ifr_flags |= (IFF_UP | IFF_RUNNING);
-
-  if (ioctl (tm->dev_tap_fd, SIOCSIFFLAGS, &ifr) < 0)
-    {
-      error = clib_error_return_unix (0, "ioctl SIOCSIFFLAGS");
-      goto done;
-    }
-
-  if (is_ether)
-    {
-      if (ioctl (tm->dev_tap_fd, SIOCGIFHWADDR, &ifr) < 0)
-        {
-          error = clib_error_return_unix (0, "ioctl SIOCGIFHWADDR");
-          goto done;
-        }
-      else
-        clib_memcpy (tm->ether_dst_mac, ifr.ifr_hwaddr.sa_data, 6);
-    }
-
-  if (have_normal_interface)
-    {
-      vnet_main_t *vnm = vnet_get_main();
-      error = ethernet_register_interface
-        (vnm,
-         tuntap_dev_class.index,
-         0 /* device instance */,
-         tm->ether_dst_mac /* ethernet address */,
-         &tm->hw_if_index, 
-         0 /* flag change */);
-      if (error)
-        clib_error_report (error);
-      tm->sw_if_index = tm->hw_if_index;
-      vm->os_punt_frame = tuntap_nopunt_frame;
-    }
-  else
-    {
-      vnet_main_t *vnm = vnet_get_main();
-      vnet_hw_interface_t * hi;
-      
-      vm->os_punt_frame = tuntap_punt_frame;
-      
-      tm->hw_if_index = vnet_register_interface
-        (vnm,
-         tuntap_dev_class.index, 0 /* device instance */,
-         tuntap_interface_class.index, 0);
-      hi = vnet_get_hw_interface (vnm, tm->hw_if_index);
-      tm->sw_if_index = hi->sw_if_index;
-      
-      /* Interface is always up. */
-      vnet_hw_interface_set_flags (vnm, tm->hw_if_index, 
-                                   VNET_HW_INTERFACE_FLAG_LINK_UP);
-      vnet_sw_interface_set_flags (vnm, tm->sw_if_index, 
-                                   VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-    }
-
-  {
-    unix_file_t template = {0};
-    template.read_function = tuntap_read_ready;
-    template.file_descriptor = tm->dev_net_tun_fd;
-    tm->unix_file_index = unix_file_add (&unix_main, &template);
-  }
-
- done:
-  if (error)
-    {
-      if (tm->dev_net_tun_fd >= 0)
-	close (tm->dev_net_tun_fd);
-      if (tm->dev_tap_fd >= 0)
-	close (tm->dev_tap_fd);
-    }
-
-  return error;
-}
-
-VLIB_CONFIG_FUNCTION (tuntap_config, "tuntap");
-
-/**
- * @brief Add or Del IP4 address to tun/tap interface
- *
- * @param *im - ip4_main_t
- * @param opaque - uword
- * @param sw_if_index - u32
- * @param *address - ip4_address_t
- * @param is_delete - u32
- *
- */
-void
-tuntap_ip4_add_del_interface_address (ip4_main_t * im,
-				      uword opaque,
-				      u32 sw_if_index,
-				      ip4_address_t * address,
-				      u32 address_length,
-				      u32 if_address_index,
-				      u32 is_delete)
-{
-  tuntap_main_t * tm = &tuntap_main;
-  struct ifreq ifr;
-  subif_address_t subif_addr, * ap;
-  uword * p;
-
-  /** Tuntap disabled, or using a "normal" interface. */
-  if (tm->have_normal_interface ||  tm->dev_tap_fd < 0)
-    return;
-
-  /** See if we already know about this subif */
-  memset (&subif_addr, 0, sizeof (subif_addr));
-  subif_addr.sw_if_index = sw_if_index;
-  clib_memcpy (&subif_addr.addr, address, sizeof (*address));
-
-  p = mhash_get (&tm->subif_mhash, &subif_addr);
-
-  if (p)
-    ap = pool_elt_at_index (tm->subifs, p[0]);
-  else
-    {
-      pool_get (tm->subifs, ap);
-      *ap = subif_addr;
-      mhash_set (&tm->subif_mhash, ap, ap - tm->subifs, 0);
-    }
-
-  /* Use subif pool index to select alias device. */
-  memset (&ifr, 0, sizeof (ifr));
-  snprintf (ifr.ifr_name, sizeof(ifr.ifr_name), 
-            "%s:%d", tm->tun_name, (int)(ap - tm->subifs));
-
-  /* the tuntap punt/inject is enabled for IPv4 RX so long as
-   * any vpp interface has an IPv4 address.
-   * this is also ref counted.
-   */
-  ip4_sw_interface_enable_disable (tm->sw_if_index, !is_delete);
-
-  if (! is_delete)
-    {
-      struct sockaddr_in * sin;
-
-      sin = (struct sockaddr_in *)&ifr.ifr_addr;
-
-      /* Set ipv4 address, netmask. */
-      sin->sin_family = AF_INET;
-      clib_memcpy (&sin->sin_addr.s_addr, address, 4);
-      if (ioctl (tm->dev_tap_fd, SIOCSIFADDR, &ifr) < 0)
-	clib_unix_warning ("ioctl SIOCSIFADDR");
-    
-      sin->sin_addr.s_addr = im->fib_masks[address_length];
-      if (ioctl (tm->dev_tap_fd, SIOCSIFNETMASK, &ifr) < 0)
-	clib_unix_warning ("ioctl SIOCSIFNETMASK");
-    }
-  else
-    {
-      mhash_unset (&tm->subif_mhash, &subif_addr, 0 /* old value ptr */);
-      pool_put (tm->subifs, ap);
-    }
-
-  /* get flags, modify to bring up interface... */
-  if (ioctl (tm->dev_tap_fd, SIOCGIFFLAGS, &ifr) < 0)
-    clib_unix_warning ("ioctl SIOCGIFFLAGS");
-
-  if (is_delete)
-    ifr.ifr_flags &= ~(IFF_UP | IFF_RUNNING);
-  else
-    ifr.ifr_flags |= (IFF_UP | IFF_RUNNING);
-
-  if (ioctl (tm->dev_tap_fd, SIOCSIFFLAGS, &ifr) < 0)
-    clib_unix_warning ("ioctl SIOCSIFFLAGS");
-}
-
-/**
- * @brief workaround for a known include file bug.
- * including @c <linux/ipv6.h> causes multiple definitions if
- * @c <netinet/in.h is also included.
- */
-struct in6_ifreq {
-	struct in6_addr	ifr6_addr;
-        u32		ifr6_prefixlen;
-        int		ifr6_ifindex;
-};
-
-/**
- * @brief Add or Del tun/tap interface address.
- *
- * Both the v6 interface address API and the way ifconfig
- * displays subinterfaces differ from their v4 couterparts.
- * The code given here seems to work but YMMV.
- *
- * @param *im - ip6_main_t
- * @param opaque - uword
- * @param sw_if_index - u32
- * @param *address - ip6_address_t
- * @param address_length - u32
- * @param if_address_index - u32
- * @param is_delete - u32
- */
-void
-tuntap_ip6_add_del_interface_address (ip6_main_t * im,
-				      uword opaque,
-				      u32 sw_if_index,
-				      ip6_address_t * address,
-				      u32 address_length,
-				      u32 if_address_index,
-				      u32 is_delete)
-{
-  tuntap_main_t * tm = &tuntap_main;
-  struct ifreq ifr;
-  struct in6_ifreq ifr6;
-  subif_address_t subif_addr, * ap;
-  uword * p;
-
-  /* Tuntap disabled, or using a "normal" interface. */
-  if (tm->have_normal_interface ||  tm->dev_tap_fd < 0)
-    return;
-
-  /* See if we already know about this subif */
-  memset (&subif_addr, 0, sizeof (subif_addr));
-  subif_addr.sw_if_index = sw_if_index;
-  subif_addr.is_v6 = 1;
-  clib_memcpy (&subif_addr.addr, address, sizeof (*address));
-
-  p = mhash_get (&tm->subif_mhash, &subif_addr);
-
-  if (p)
-    ap = pool_elt_at_index (tm->subifs, p[0]);
-  else
-    {
-      pool_get (tm->subifs, ap);
-      *ap = subif_addr;
-      mhash_set (&tm->subif_mhash, ap, ap - tm->subifs, 0);
-    }
-
-  /* Use subif pool index to select alias device. */
-  memset (&ifr, 0, sizeof (ifr));
-  memset (&ifr6, 0, sizeof (ifr6));
-  snprintf (ifr.ifr_name, sizeof(ifr.ifr_name), 
-            "%s:%d", tm->tun_name, (int)(ap - tm->subifs));
-
-  /* the tuntap punt/inject is enabled for IPv6 RX so long as
-   * any vpp interface has an IPv6 address.
-   * this is also ref counted.
-   */
-  ip6_sw_interface_enable_disable (tm->sw_if_index, !is_delete);
-
-  if (! is_delete)
-    {
-      int sockfd = socket (AF_INET6, SOCK_STREAM, 0);
-      if (sockfd < 0)
-        clib_unix_warning ("get ifindex socket");
-
-      if (ioctl (sockfd, SIOGIFINDEX, &ifr) < 0)
-        clib_unix_warning ("get ifindex");
-
-      ifr6.ifr6_ifindex = ifr.ifr_ifindex;
-      ifr6.ifr6_prefixlen = address_length;
-      clib_memcpy (&ifr6.ifr6_addr, address, 16);
-
-      if (ioctl (sockfd, SIOCSIFADDR, &ifr6) < 0)
-        clib_unix_warning ("set address");
-
-      if (sockfd >= 0)
-        close (sockfd);
-    }
-  else
-    {
-      int sockfd = socket (AF_INET6, SOCK_STREAM, 0);
-      if (sockfd < 0)
-        clib_unix_warning ("get ifindex socket");
-
-      if (ioctl (sockfd, SIOGIFINDEX, &ifr) < 0)
-        clib_unix_warning ("get ifindex");
-
-      ifr6.ifr6_ifindex = ifr.ifr_ifindex;
-      ifr6.ifr6_prefixlen = address_length;
-      clib_memcpy (&ifr6.ifr6_addr, address, 16);
-
-      if (ioctl (sockfd, SIOCDIFADDR, &ifr6) < 0)
-        clib_unix_warning ("del address");
-
-      if (sockfd >= 0)
-        close (sockfd);
-
-      mhash_unset (&tm->subif_mhash, &subif_addr, 0 /* old value ptr */);
-      pool_put (tm->subifs, ap);
-    }
-}
-
-/**
- * @brief TX the tun/tap frame
- *
- * @param *vm - vlib_main_t
- * @param *node - vlib_node_runtime_t
- * @param *frame - vlib_frame_t
- *
- */
-static void
-tuntap_punt_frame (vlib_main_t * vm,
-                   vlib_node_runtime_t * node,
-                   vlib_frame_t * frame)
-{
-  tuntap_tx (vm, node, frame);
-  vlib_frame_free (vm, node, frame);
-}
-
-/**
- * @brief Free the tun/tap frame
- *
- * @param *vm - vlib_main_t
- * @param *node - vlib_node_runtime_t
- * @param *frame - vlib_frame_t
- *
- */
-static void
-tuntap_nopunt_frame (vlib_main_t * vm,
-                   vlib_node_runtime_t * node,
-                   vlib_frame_t * frame)
-{
-  u32 * buffers = vlib_frame_args (frame);
-  uword n_packets = frame->n_vectors;
-  vlib_buffer_free (vm, buffers, n_packets);
-  vlib_frame_free (vm, node, frame);
-}
-
-VNET_HW_INTERFACE_CLASS (tuntap_interface_class,static) = {
-  .name = "tuntap",
-  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
-};
-
-/**
- * @brief Format tun/tap interface name
- *
- * @param *s - u8 - formatter string
- * @param *args - va_list
- *
- * @return *s - u8 - formatted string
- *
- */
-static u8 * format_tuntap_interface_name (u8 * s, va_list * args)
-{
-  u32 i = va_arg (*args, u32);
-
-  s = format (s, "tuntap-%d", i);
-  return s;
-}
-
-/**
- * @brief TX packet out tun/tap
- *
- * @param *vm - vlib_main_t
- * @param *node - vlib_node_runtime_t
- * @param *frame - vlib_frame_t
- *
- * @return n_buffers - uword - Packets transmitted
- *
- */
-static uword
-tuntap_intfc_tx (vlib_main_t * vm,
-		 vlib_node_runtime_t * node,
-		 vlib_frame_t * frame)
-{
-  tuntap_main_t * tm = &tuntap_main;
-  u32 * buffers = vlib_frame_args (frame);
-  uword n_buffers = frame->n_vectors;
-
-  /* Normal interface transmit happens only on the normal interface... */
-  if (tm->have_normal_interface)
-    return tuntap_tx (vm, node, frame);
-
-  vlib_buffer_free (vm, buffers, n_buffers);
-  return n_buffers;
-}
-
-VNET_DEVICE_CLASS (tuntap_dev_class,static) = {
-  .name = "tuntap",
-  .tx_function = tuntap_intfc_tx,
-  .format_device_name = format_tuntap_interface_name,
-};
-
-/**
- * @brief tun/tap node init
- *
- * @param *vm - vlib_main_t
- *
- * @return error - clib_error_t
- *
- */
-static clib_error_t *
-tuntap_init (vlib_main_t * vm)
-{
-  clib_error_t * error;
-  ip4_main_t * im4 = &ip4_main;
-  ip6_main_t * im6 = &ip6_main;
-  ip4_add_del_interface_address_callback_t cb4;
-  ip6_add_del_interface_address_callback_t cb6;
-  tuntap_main_t * tm = &tuntap_main;
-
-  error = vlib_call_init_function (vm, ip4_init);
-  if (error)
-    return error;
-
-  mhash_init (&tm->subif_mhash, sizeof (u32), sizeof(subif_address_t));
-
-  cb4.function = tuntap_ip4_add_del_interface_address;
-  cb4.function_opaque = 0;
-  vec_add1 (im4->add_del_interface_address_callbacks, cb4);
-
-  cb6.function = tuntap_ip6_add_del_interface_address;
-  cb6.function_opaque = 0;
-  vec_add1 (im6->add_del_interface_address_callbacks, cb6);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (tuntap_init);
diff --git a/vnet/vnet/unix/tuntap.h b/vnet/vnet/unix/tuntap.h
deleted file mode 100644
index d7f96cae..00000000
--- a/vnet/vnet/unix/tuntap.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *------------------------------------------------------------------
- * tuntap.h - kernel stack (reverse) punt/inject path
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-/**
- * @file
- * @brief Call from VLIB_INIT_FUNCTION to set the Linux kernel inject node name.
- */
-void register_tuntap_inject_node_name (char *name);
-
-int vnet_tap_connect (vlib_main_t * vm, u8 * intfc_name,
-                      u8 *hwaddr_arg, u32 * sw_if_indexp);
-int vnet_tap_connect_renumber (vlib_main_t * vm, u8 * intfc_name,
-                      u8 *hwaddr_arg, u32 * sw_if_indexp,
-                      u8 renumber, u32 custom_dev_instance);
-
-int vnet_tap_delete(vlib_main_t *vm, u32 sw_if_index);
-
-int vnet_tap_modify (vlib_main_t * vm, u32 orig_sw_if_index,
-                     u8 * intfc_name, u8 *hwaddr_arg,
-                     u32 * sw_if_indexp,
-                     u8 renumber, u32 custom_dev_instance);
diff --git a/vnet/vnet/vnet.h b/vnet/vnet/vnet.h
deleted file mode 100644
index 5a8ae858..00000000
--- a/vnet/vnet/vnet.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * vnet.h: general networking definitions
- *
- * Copyright (c) 2011 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_vnet_vnet_h
-#define included_vnet_vnet_h
-
-#include <vppinfra/types.h>
-
-#include <vnet/unix/pcap.h>
-#include <vnet/buffer.h>
-#include <vnet/config.h>
-#include <vnet/interface.h>
-#include <vnet/rewrite.h>
-#include <vnet/api_errno.h>
-
-typedef struct vnet_main_t
-{
-  u32 local_interface_hw_if_index;
-  u32 local_interface_sw_if_index;
-
-  vnet_interface_main_t interface_main;
-
-  /* set up by constructors */
-  vnet_device_class_t *device_class_registrations;
-  vnet_hw_interface_class_t *hw_interface_class_registrations;
-    _vnet_interface_function_list_elt_t
-    * hw_interface_add_del_functions[VNET_ITF_FUNC_N_PRIO];
-    _vnet_interface_function_list_elt_t
-    * hw_interface_link_up_down_functions[VNET_ITF_FUNC_N_PRIO];
-    _vnet_interface_function_list_elt_t
-    * sw_interface_add_del_functions[VNET_ITF_FUNC_N_PRIO];
-    _vnet_interface_function_list_elt_t
-    * sw_interface_admin_up_down_functions[VNET_ITF_FUNC_N_PRIO];
-
-  uword *interface_tag_by_sw_if_index;
-
-  /*
-   * Last "api" error, preserved so we can issue reasonable diagnostics
-   * at or near the top of the food chain
-   */
-  vnet_api_error_t api_errno;
-
-  vlib_main_t *vlib_main;
-} vnet_main_t;
-
-vnet_main_t vnet_main;
-vnet_main_t **vnet_mains;
-
-#include <vnet/interface_funcs.h>
-#include <vnet/global_funcs.h>
-
-#endif /* included_vnet_vnet_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/vnet_all_api_h.h b/vnet/vnet/vnet_all_api_h.h
deleted file mode 100644
index 1b4d6c45..00000000
--- a/vnet/vnet/vnet_all_api_h.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *------------------------------------------------------------------
- * vl_memory_api_h.h - memory API headers, in a specific order.
- *
- * Copyright (c) 2009-2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-/*
- * Add to the bottom of the #include list, or elves will steal your
- * keyboard in the middle of the night!
- *
- * Include current layer (2) last, or an artistic disagreement
- * about message numbering will occur
- */
-
-#ifndef included_from_layer_3
-#include <vlibmemory/vl_memory_api_h.h>
-#endif /* included_from_layer_3 */
-
-#include <vnet/devices/af_packet/af_packet.api.h>
-#include <vnet/devices/netmap/netmap.api.h>
-#include <vnet/devices/virtio/vhost_user.api.h>
-#include <vnet/gre/gre.api.h>
-#include <vnet/interface.api.h>
-#include <vnet/map/map.api.h>
-#include <vnet/l2/l2.api.h>
-#include <vnet/l2tp/l2tp.api.h>
-#include <vnet/span/span.api.h>
-#include <vnet/ip/ip.api.h>
-#include <vnet/unix/tap.api.h>
-#include <vnet/vxlan/vxlan.api.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.api.h>
-#include <vnet/bfd/bfd.api.h>
-#include <vnet/ipsec/ipsec.api.h>
-#include <vnet/ipsec-gre/ipsec_gre.api.h>
-#include <vnet/lisp-cp/lisp.api.h>
-#include <vnet/lisp-gpe/lisp_gpe.api.h>
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/vnet_msg_enum.h b/vnet/vnet/vnet_msg_enum.h
deleted file mode 100644
index 9899471e..00000000
--- a/vnet/vnet/vnet_msg_enum.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vnet_msg_enum_h
-#define included_vnet_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum
-{
-  VL_ILLEGAL_MESSAGE_ID = 0,
-#include <vnet/vnet_all_api_h.h>
-  VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* included_vnet_msg_enum_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/vxlan-gpe/decap.c b/vnet/vnet/vxlan-gpe/decap.c
deleted file mode 100644
index 22ab4b62..00000000
--- a/vnet/vnet/vxlan-gpe/decap.c
+++ /dev/null
@@ -1,733 +0,0 @@
-/*
- * decap.c - decapsulate VXLAN GPE
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- *  @file
- *  @brief Functions for decapsulating VXLAN GPE tunnels
- *
-*/
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-
-vlib_node_registration_t vxlan_gpe_input_node;
-
-/**
- * @brief Struct for VXLAN GPE decap packet tracing
- *
- */
-typedef struct {
-  u32 next_index;
-  u32 tunnel_index;
-  u32 error;
-} vxlan_gpe_rx_trace_t;
-
-/**
- * @brief Tracing function for VXLAN GPE packet decapsulation
- *
- * @param *s
- * @param *args
- *
- * @return *s
- *
- */
-static u8 * format_vxlan_gpe_rx_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  vxlan_gpe_rx_trace_t * t = va_arg (*args, vxlan_gpe_rx_trace_t *);
-
-  if (t->tunnel_index != ~0)
-  {
-    s = format (s, "VXLAN-GPE: tunnel %d next %d error %d", t->tunnel_index,
-        t->next_index, t->error);
-  }
-  else
-  {
-    s = format (s, "VXLAN-GPE: no tunnel next %d error %d\n", t->next_index,
-        t->error);
-  }
-  return s;
-}
-
-/**
- * @brief Tracing function for VXLAN GPE packet decapsulation including length
- *
- * @param *s
- * @param *args
- *
- * @return *s
- *
- */
-static u8 * format_vxlan_gpe_with_length (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-
-
-  return s;
-}
-
-/**
- * @brief Common processing for IPv4 and IPv6 VXLAN GPE decap dispatch functions
- *
- * It is worth noting that other than trivial UDP forwarding (transit), VXLAN GPE
- * tunnels are "terminate local". This means that there is no "TX" interface for this
- * decap case, so that field in the buffer_metadata can be "used for something else".
- * The something else in this case is, for the IPv4/IPv6 inner-packet type case, the
- * FIB index used to look up the inner-packet's adjacency.
- *
- *      vnet_buffer(b0)->sw_if_index[VLIB_TX] = t0->decap_fib_index;
- *
- * @param *vm
- * @param *node
- * @param *from_frame
- * @param is_ip4
- *
- * @return from_frame->n_vectors
- *
- */
-always_inline uword
-vxlan_gpe_input (vlib_main_t * vm,
-                     vlib_node_runtime_t * node,
-                     vlib_frame_t * from_frame,
-					 u8 is_ip4)
-{
-  u32 n_left_from, next_index, *from, *to_next;
-  vxlan_gpe_main_t * ngm = &vxlan_gpe_main;
-  vnet_main_t * vnm = ngm->vnet_main;
-  vnet_interface_main_t * im = &vnm->interface_main;
-  u32 last_tunnel_index = ~0;
-  vxlan4_gpe_tunnel_key_t last_key4;
-  vxlan6_gpe_tunnel_key_t last_key6;
-  u32 pkts_decapsulated = 0;
-  u32 cpu_index = os_get_cpu_number ();
-  u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
-
-  if (is_ip4)
-      memset (&last_key4, 0xff, sizeof(last_key4));
-  else
-      memset (&last_key6, 0xff, sizeof(last_key6));
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-  stats_sw_if_index = node->runtime_data[0];
-  stats_n_packets = stats_n_bytes = 0;
-
-  while (n_left_from > 0)
-  {
-    u32 n_left_to_next;
-
-    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
-
-    while (n_left_from >= 4 && n_left_to_next >= 2)
-    {
-      u32 bi0, bi1;
-      vlib_buffer_t * b0, *b1;
-      u32 next0, next1;
-      ip4_vxlan_gpe_header_t * iuvn4_0, *iuvn4_1;
-      ip6_vxlan_gpe_header_t * iuvn6_0, *iuvn6_1;
-      uword * p0, *p1;
-      u32 tunnel_index0, tunnel_index1;
-      vxlan_gpe_tunnel_t * t0, *t1;
-      vxlan4_gpe_tunnel_key_t key4_0, key4_1;
-      vxlan6_gpe_tunnel_key_t key6_0, key6_1;
-      u32 error0, error1;
-      u32 sw_if_index0, sw_if_index1, len0, len1;
-
-      /* Prefetch next iteration. */
-      {
-        vlib_buffer_t * p2, *p3;
-
-        p2 = vlib_get_buffer (vm, from[2]);
-        p3 = vlib_get_buffer (vm, from[3]);
-
-        vlib_prefetch_buffer_header(p2, LOAD);
-        vlib_prefetch_buffer_header(p3, LOAD);
-
-        CLIB_PREFETCH(p2->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
-        CLIB_PREFETCH(p3->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
-      }
-
-      bi0 = from[0];
-      bi1 = from[1];
-      to_next[0] = bi0;
-      to_next[1] = bi1;
-      from += 2;
-      to_next += 2;
-      n_left_to_next -= 2;
-      n_left_from -= 2;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      if (is_ip4)
-      {
-        /* udp leaves current_data pointing at the vxlan-gpe header */
-        vlib_buffer_advance (b0, -(word) (sizeof(udp_header_t) + sizeof(ip4_header_t)));
-        vlib_buffer_advance (b1, -(word) (sizeof(udp_header_t) + sizeof(ip4_header_t)));
-
-        iuvn4_0 = vlib_buffer_get_current (b0);
-        iuvn4_1 = vlib_buffer_get_current (b1);
-
-        /* pop (ip, udp, vxlan) */
-        vlib_buffer_advance (b0, sizeof(*iuvn4_0));
-        vlib_buffer_advance (b1, sizeof(*iuvn4_1));
-      }
-      else
-      {
-        /* udp leaves current_data pointing at the vxlan-gpe header */
-        vlib_buffer_advance (b0, -(word) (sizeof(udp_header_t) + sizeof(ip6_header_t)));
-        vlib_buffer_advance (b1, -(word) (sizeof(udp_header_t) + sizeof(ip6_header_t)));
-
-        iuvn6_0 = vlib_buffer_get_current (b0);
-        iuvn6_1 = vlib_buffer_get_current (b1);
-
-        /* pop (ip, udp, vxlan) */
-        vlib_buffer_advance (b0, sizeof(*iuvn6_0));
-        vlib_buffer_advance (b1, sizeof(*iuvn6_1));
-      }
-
-      tunnel_index0 = ~0;
-      tunnel_index1 = ~0;
-      error0 = 0;
-      error1 = 0;
-
-      if (is_ip4)
-      {
-        next0 =
-            (iuvn4_0->vxlan.protocol < VXLAN_GPE_PROTOCOL_MAX)?
-            ngm->decap_next_node_list[iuvn4_0->vxlan.protocol]: \
-            VXLAN_GPE_INPUT_NEXT_DROP;
-        next1 =
-            (iuvn4_1->vxlan.protocol < VXLAN_GPE_PROTOCOL_MAX)?
-            ngm->decap_next_node_list[iuvn4_1->vxlan.protocol]: \
-            VXLAN_GPE_INPUT_NEXT_DROP;
-
-        key4_0.local = iuvn4_0->ip4.dst_address.as_u32;
-        key4_1.local = iuvn4_1->ip4.dst_address.as_u32;
-
-        key4_0.remote = iuvn4_0->ip4.src_address.as_u32;
-        key4_1.remote = iuvn4_1->ip4.src_address.as_u32;
-
-        key4_0.vni = iuvn4_0->vxlan.vni_res;
-        key4_1.vni = iuvn4_1->vxlan.vni_res;
-
-        key4_0.pad = 0;
-        key4_1.pad = 0;
-      }
-      else /* is_ip6 */
-      {
-        next0 = (iuvn6_0->vxlan.protocol < node->n_next_nodes) ?
-                iuvn6_0->vxlan.protocol : VXLAN_GPE_INPUT_NEXT_DROP;
-        next1 = (iuvn6_1->vxlan.protocol < node->n_next_nodes) ?
-                iuvn6_1->vxlan.protocol : VXLAN_GPE_INPUT_NEXT_DROP;
-
-        key6_0.local.as_u64[0] = iuvn6_0->ip6.dst_address.as_u64[0];
-        key6_0.local.as_u64[1] = iuvn6_0->ip6.dst_address.as_u64[1];
-        key6_1.local.as_u64[0] = iuvn6_1->ip6.dst_address.as_u64[0];
-        key6_1.local.as_u64[1] = iuvn6_1->ip6.dst_address.as_u64[1];
-
-        key6_0.remote.as_u64[0] = iuvn6_0->ip6.src_address.as_u64[0];
-        key6_0.remote.as_u64[1] = iuvn6_0->ip6.src_address.as_u64[1];
-        key6_1.remote.as_u64[0] = iuvn6_1->ip6.src_address.as_u64[0];
-        key6_1.remote.as_u64[1] = iuvn6_1->ip6.src_address.as_u64[1];
-
-        key6_0.vni = iuvn6_0->vxlan.vni_res;
-        key6_1.vni = iuvn6_1->vxlan.vni_res;
-      }
-
-      /* Processing packet 0*/
-      if (is_ip4)
-      {
-        /* Processing for key4_0 */
-        if (PREDICT_FALSE((key4_0.as_u64[0] != last_key4.as_u64[0])
-                || (key4_0.as_u64[1] != last_key4.as_u64[1])))
-        {
-          p0 = hash_get_mem(ngm->vxlan4_gpe_tunnel_by_key, &key4_0);
-
-          if (p0 == 0)
-          {
-            error0 = VXLAN_GPE_ERROR_NO_SUCH_TUNNEL;
-            goto trace0;
-          }
-
-          last_key4.as_u64[0] = key4_0.as_u64[0];
-          last_key4.as_u64[1] = key4_0.as_u64[1];
-          tunnel_index0 = last_tunnel_index = p0[0];
-        }
-        else
-          tunnel_index0 = last_tunnel_index;
-      }
-      else /* is_ip6 */
-      {
-        next0 =
-            (iuvn6_0->vxlan.protocol < VXLAN_GPE_PROTOCOL_MAX)?
-            ngm->decap_next_node_list[iuvn6_0->vxlan.protocol]: \
-            VXLAN_GPE_INPUT_NEXT_DROP;
-        next1 =
-            (iuvn6_1->vxlan.protocol < VXLAN_GPE_PROTOCOL_MAX)?
-            ngm->decap_next_node_list[iuvn6_1->vxlan.protocol]: \
-            VXLAN_GPE_INPUT_NEXT_DROP;
-
-        key6_0.local.as_u64[0] = iuvn6_0->ip6.dst_address.as_u64[0];
-        key6_0.local.as_u64[1] = iuvn6_0->ip6.dst_address.as_u64[1];
-        key6_1.local.as_u64[0] = iuvn6_1->ip6.dst_address.as_u64[0];
-        key6_1.local.as_u64[1] = iuvn6_1->ip6.dst_address.as_u64[1];
-
-        key6_0.remote.as_u64[0] = iuvn6_0->ip6.src_address.as_u64[0];
-        key6_0.remote.as_u64[1] = iuvn6_0->ip6.src_address.as_u64[1];
-        key6_1.remote.as_u64[0] = iuvn6_1->ip6.src_address.as_u64[0];
-        key6_1.remote.as_u64[1] = iuvn6_1->ip6.src_address.as_u64[1];
-
-        key6_0.vni = iuvn6_0->vxlan.vni_res;
-        key6_1.vni = iuvn6_1->vxlan.vni_res;
-
-        /* Processing for key6_0 */
-        if (PREDICT_FALSE(memcmp (&key6_0, &last_key6, sizeof(last_key6)) != 0))
-        {
-          p0 = hash_get_mem(ngm->vxlan6_gpe_tunnel_by_key, &key6_0);
-
-          if (p0 == 0)
-          {
-            error0 = VXLAN_GPE_ERROR_NO_SUCH_TUNNEL;
-            goto trace0;
-          }
-
-          memcpy (&last_key6, &key6_0, sizeof(key6_0));
-          tunnel_index0 = last_tunnel_index = p0[0];
-        }
-        else
-          tunnel_index0 = last_tunnel_index;
-      }
-
-      t0 = pool_elt_at_index(ngm->tunnels, tunnel_index0);
-
-
-      sw_if_index0 = t0->sw_if_index;
-      len0 = vlib_buffer_length_in_chain (vm, b0);
-
-      /* Required to make the l2 tag push / pop code work on l2 subifs */
-      vnet_update_l2_len (b0);
-
-      /**
-       * ip[46] lookup in the configured FIB
-       */
-      vnet_buffer(b0)->sw_if_index[VLIB_TX] = t0->decap_fib_index;
-
-      pkts_decapsulated++;
-      stats_n_packets += 1;
-      stats_n_bytes += len0;
-
-      if (PREDICT_FALSE(sw_if_index0 != stats_sw_if_index))
-      {
-        stats_n_packets -= 1;
-        stats_n_bytes -= len0;
-        if (stats_n_packets)
-          vlib_increment_combined_counter (
-              im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-              cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
-        stats_n_packets = 1;
-        stats_n_bytes = len0;
-        stats_sw_if_index = sw_if_index0;
-      }
-
-      trace0: b0->error = error0 ? node->errors[error0] : 0;
-
-      if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-      {
-        vxlan_gpe_rx_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof(*tr));
-        tr->next_index = next0;
-        tr->error = error0;
-        tr->tunnel_index = tunnel_index0;
-      }
-
-      /* Process packet 1 */
-      if (is_ip4)
-      {
-        /* Processing for key4_1 */
-        if (PREDICT_FALSE(
-            (key4_1.as_u64[0] != last_key4.as_u64[0])
-                || (key4_1.as_u64[1] != last_key4.as_u64[1])))
-        {
-          p1 = hash_get_mem(ngm->vxlan4_gpe_tunnel_by_key, &key4_1);
-
-          if (p1 == 0)
-          {
-            error1 = VXLAN_GPE_ERROR_NO_SUCH_TUNNEL;
-            goto trace1;
-          }
-
-          last_key4.as_u64[0] = key4_1.as_u64[0];
-          last_key4.as_u64[1] = key4_1.as_u64[1];
-          tunnel_index1 = last_tunnel_index = p1[0];
-        }
-        else
-          tunnel_index1 = last_tunnel_index;
-      }
-      else /* is_ip6 */
-      {
-        /* Processing for key6_1 */
-        if (PREDICT_FALSE(memcmp (&key6_1, &last_key6, sizeof(last_key6)) != 0))
-        {
-          p1 = hash_get_mem(ngm->vxlan6_gpe_tunnel_by_key, &key6_1);
-
-          if (p1 == 0)
-          {
-            error1 = VXLAN_GPE_ERROR_NO_SUCH_TUNNEL;
-            goto trace1;
-          }
-
-          memcpy (&last_key6, &key6_1, sizeof(key6_1));
-          tunnel_index1 = last_tunnel_index = p1[0];
-        }
-        else
-          tunnel_index1 = last_tunnel_index;
-      }
-
-      t1 = pool_elt_at_index(ngm->tunnels, tunnel_index1);
-
-      sw_if_index1 = t1->sw_if_index;
-      len1 = vlib_buffer_length_in_chain (vm, b1);
-
-      /* Required to make the l2 tag push / pop code work on l2 subifs */
-      vnet_update_l2_len (b1);
-
-      /*
-       * ip[46] lookup in the configured FIB
-       */
-      vnet_buffer(b1)->sw_if_index[VLIB_TX] = t1->decap_fib_index;
-
-      pkts_decapsulated++;
-      stats_n_packets += 1;
-      stats_n_bytes += len1;
-
-      /* Batch stats increment on the same vxlan tunnel so counter
-       is not incremented per packet */
-      if (PREDICT_FALSE(sw_if_index1 != stats_sw_if_index))
-      {
-        stats_n_packets -= 1;
-        stats_n_bytes -= len1;
-        if (stats_n_packets)
-          vlib_increment_combined_counter (
-              im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-              cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
-        stats_n_packets = 1;
-        stats_n_bytes = len1;
-        stats_sw_if_index = sw_if_index1;
-      }
-      vnet_buffer(b1)->sw_if_index[VLIB_TX] = t1->decap_fib_index;
-
-      trace1: b1->error = error1 ? node->errors[error1] : 0;
-
-      if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
-      {
-        vxlan_gpe_rx_trace_t *tr = vlib_add_trace (vm, node, b1, sizeof(*tr));
-        tr->next_index = next1;
-        tr->error = error1;
-        tr->tunnel_index = tunnel_index1;
-      }
-
-      vlib_validate_buffer_enqueue_x2(vm, node, next_index, to_next,
-                                      n_left_to_next, bi0, bi1, next0, next1);
-    }
-
-    while (n_left_from > 0 && n_left_to_next > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t * b0;
-      u32 next0;
-      ip4_vxlan_gpe_header_t * iuvn4_0;
-      ip6_vxlan_gpe_header_t * iuvn6_0;
-      uword * p0;
-      u32 tunnel_index0;
-      vxlan_gpe_tunnel_t * t0;
-      vxlan4_gpe_tunnel_key_t key4_0;
-      vxlan6_gpe_tunnel_key_t key6_0;
-      u32 error0;
-      u32 sw_if_index0, len0;
-
-      bi0 = from[0];
-      to_next[0] = bi0;
-      from += 1;
-      to_next += 1;
-      n_left_from -= 1;
-      n_left_to_next -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      if (is_ip4)
-      {
-        /* udp leaves current_data pointing at the vxlan-gpe header */
-        vlib_buffer_advance (
-            b0, -(word) (sizeof(udp_header_t) + sizeof(ip4_header_t)));
-
-        iuvn4_0 = vlib_buffer_get_current (b0);
-
-        /* pop (ip, udp, vxlan) */
-        vlib_buffer_advance (b0, sizeof(*iuvn4_0));
-      }
-      else
-      {
-        /* udp leaves current_data pointing at the vxlan-gpe header */
-        vlib_buffer_advance (
-            b0, -(word) (sizeof(udp_header_t) + sizeof(ip6_header_t)));
-
-        iuvn6_0 = vlib_buffer_get_current (b0);
-
-        /* pop (ip, udp, vxlan) */
-        vlib_buffer_advance (b0, sizeof(*iuvn6_0));
-      }
-
-      tunnel_index0 = ~0;
-      error0 = 0;
-
-      if (is_ip4)
-      {
-        next0 =
-            (iuvn4_0->vxlan.protocol < VXLAN_GPE_PROTOCOL_MAX)?
-            ngm->decap_next_node_list[iuvn4_0->vxlan.protocol]: \
-            VXLAN_GPE_INPUT_NEXT_DROP;
-
-        key4_0.local = iuvn4_0->ip4.dst_address.as_u32;
-        key4_0.remote = iuvn4_0->ip4.src_address.as_u32;
-        key4_0.vni = iuvn4_0->vxlan.vni_res;
-        key4_0.pad = 0;
-
-        /* Processing for key4_0 */
-        if (PREDICT_FALSE(
-            (key4_0.as_u64[0] != last_key4.as_u64[0])
-                || (key4_0.as_u64[1] != last_key4.as_u64[1])))
-        {
-          p0 = hash_get_mem(ngm->vxlan4_gpe_tunnel_by_key, &key4_0);
-
-          if (p0 == 0)
-          {
-            error0 = VXLAN_GPE_ERROR_NO_SUCH_TUNNEL;
-            goto trace00;
-          }
-
-          last_key4.as_u64[0] = key4_0.as_u64[0];
-          last_key4.as_u64[1] = key4_0.as_u64[1];
-          tunnel_index0 = last_tunnel_index = p0[0];
-        }
-        else
-          tunnel_index0 = last_tunnel_index;
-      }
-      else /* is_ip6 */
-      {
-        next0 =
-            (iuvn6_0->vxlan.protocol < VXLAN_GPE_PROTOCOL_MAX)?
-            ngm->decap_next_node_list[iuvn6_0->vxlan.protocol]: \
-            VXLAN_GPE_INPUT_NEXT_DROP;
-
-        key6_0.local.as_u64[0] = iuvn6_0->ip6.dst_address.as_u64[0];
-        key6_0.local.as_u64[1] = iuvn6_0->ip6.dst_address.as_u64[1];
-        key6_0.remote.as_u64[0] = iuvn6_0->ip6.src_address.as_u64[0];
-        key6_0.remote.as_u64[1] = iuvn6_0->ip6.src_address.as_u64[1];
-        key6_0.vni = iuvn6_0->vxlan.vni_res;
-
-        /* Processing for key6_0 */
-        if (PREDICT_FALSE(memcmp (&key6_0, &last_key6, sizeof(last_key6)) != 0))
-        {
-          p0 = hash_get_mem(ngm->vxlan6_gpe_tunnel_by_key, &key6_0);
-
-          if (p0 == 0)
-          {
-            error0 = VXLAN_GPE_ERROR_NO_SUCH_TUNNEL;
-            goto trace00;
-          }
-
-          memcpy (&last_key6, &key6_0, sizeof(key6_0));
-          tunnel_index0 = last_tunnel_index = p0[0];
-        }
-        else
-          tunnel_index0 = last_tunnel_index;
-      }
-
-      t0 = pool_elt_at_index(ngm->tunnels, tunnel_index0);
-
-
-      sw_if_index0 = t0->sw_if_index;
-      len0 = vlib_buffer_length_in_chain (vm, b0);
-
-      /* Required to make the l2 tag push / pop code work on l2 subifs */
-      vnet_update_l2_len (b0);
-
-      /*
-       * ip[46] lookup in the configured FIB
-       */
-      vnet_buffer(b0)->sw_if_index[VLIB_TX] = t0->decap_fib_index;
-
-      pkts_decapsulated++;
-      stats_n_packets += 1;
-      stats_n_bytes += len0;
-
-      /* Batch stats increment on the same vxlan-gpe tunnel so counter
-       is not incremented per packet */
-      if (PREDICT_FALSE(sw_if_index0 != stats_sw_if_index))
-      {
-        stats_n_packets -= 1;
-        stats_n_bytes -= len0;
-        if (stats_n_packets)
-          vlib_increment_combined_counter (
-              im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-              cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
-        stats_n_packets = 1;
-        stats_n_bytes = len0;
-        stats_sw_if_index = sw_if_index0;
-      }
-
-      trace00: b0->error = error0 ? node->errors[error0] : 0;
-
-      if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-      {
-        vxlan_gpe_rx_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof(*tr));
-        tr->next_index = next0;
-        tr->error = error0;
-        tr->tunnel_index = tunnel_index0;
-      }
-      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
-                                      n_left_to_next, bi0, next0);
-    }
-
-    vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-  }
-  vlib_node_increment_counter (vm, vxlan_gpe_input_node.index,
-                               VXLAN_GPE_ERROR_DECAPSULATED, pkts_decapsulated);
-  /* Increment any remaining batch stats */
-  if (stats_n_packets)
-  {
-    vlib_increment_combined_counter (
-        im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX, cpu_index,
-        stats_sw_if_index, stats_n_packets, stats_n_bytes);
-    node->runtime_data[0] = stats_sw_if_index;
-  }
-  return from_frame->n_vectors;
-}
-
-/**
- * @brief Graph processing dispatch function for IPv4 VXLAN GPE
- *
- * @node vxlan4-gpe-input
- * @param *vm
- * @param *node
- * @param *from_frame
- *
- * @return from_frame->n_vectors
- *
- */
-static uword
-vxlan4_gpe_input (vlib_main_t * vm, vlib_node_runtime_t * node,
-                  vlib_frame_t * from_frame)
-{
-  return vxlan_gpe_input (vm, node, from_frame, /* is_ip4 */1);
-}
-
-
-void
-vxlan_gpe_register_decap_protocol (u8 protocol_id, uword next_node_index)
-{
-  vxlan_gpe_main_t *hm = &vxlan_gpe_main;
-  hm->decap_next_node_list[protocol_id] = next_node_index;
-  return;
-}
-
-void
-vxlan_gpe_unregister_decap_protocol (u8 protocol_id, uword next_node_index)
-{
-  vxlan_gpe_main_t *hm = &vxlan_gpe_main;
-  hm->decap_next_node_list[protocol_id] = VXLAN_GPE_INPUT_NEXT_DROP;
-  return;
-}
-
-
-/**
- * @brief Graph processing dispatch function for IPv6 VXLAN GPE
- *
- * @node vxlan6-gpe-input
- * @param *vm
- * @param *node
- * @param *from_frame
- *
- * @return from_frame->n_vectors - uword
- *
- */
-static uword
-vxlan6_gpe_input (vlib_main_t * vm, vlib_node_runtime_t * node,
-                  vlib_frame_t * from_frame)
-{
-  return vxlan_gpe_input (vm, node, from_frame, /* is_ip4 */0);
-}
-
-/**
- * @brief VXLAN GPE error strings
- */
-static char * vxlan_gpe_error_strings[] = {
-#define vxlan_gpe_error(n,s) s,
-#include <vnet/vxlan-gpe/vxlan_gpe_error.def>
-#undef vxlan_gpe_error
-#undef _
-};
-
-VLIB_REGISTER_NODE (vxlan4_gpe_input_node) = {
-  .function = vxlan4_gpe_input,
-  .name = "vxlan4-gpe-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .n_errors = ARRAY_LEN(vxlan_gpe_error_strings),
-  .error_strings = vxlan_gpe_error_strings,
-
-  .n_next_nodes = VXLAN_GPE_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [VXLAN_GPE_INPUT_NEXT_##s] = n,
-    foreach_vxlan_gpe_input_next
-#undef _
-  },
-
-  .format_buffer = format_vxlan_gpe_with_length,
-  .format_trace = format_vxlan_gpe_rx_trace,
-  // $$$$ .unformat_buffer = unformat_vxlan_gpe_header,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (vxlan4_gpe_input_node, vxlan4_gpe_input);
-
-VLIB_REGISTER_NODE (vxlan6_gpe_input_node) = {
-  .function = vxlan6_gpe_input,
-  .name = "vxlan6-gpe-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .n_errors = ARRAY_LEN(vxlan_gpe_error_strings),
-  .error_strings = vxlan_gpe_error_strings,
-
-  .n_next_nodes = VXLAN_GPE_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [VXLAN_GPE_INPUT_NEXT_##s] = n,
-    foreach_vxlan_gpe_input_next
-#undef _
-  },
-
-  .format_buffer = format_vxlan_gpe_with_length,
-  .format_trace = format_vxlan_gpe_rx_trace,
-  // $$$$ .unformat_buffer = unformat_vxlan_gpe_header,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (vxlan6_gpe_input_node, vxlan6_gpe_input);
diff --git a/vnet/vnet/vxlan-gpe/dir.dox b/vnet/vnet/vxlan-gpe/dir.dox
deleted file mode 100644
index c154733b..00000000
--- a/vnet/vnet/vxlan-gpe/dir.dox
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- @dir
- @brief VXLAN GPE 
-
- Based on IETF: draft-quinn-vxlan-gpe-03.txt
-
-Abstract
-
-   This draft describes extending Virtual eXtensible Local Area Network
-   (VXLAN), via changes to the VXLAN header, with three new
-   capabilities: support for multi-protocol encapsulation, operations,
-   administration and management (OAM) signaling and explicit
-   versioning.
-
- See file: vxlan-gpe-rfc.txt 
- 
-*/
\ No newline at end of file
diff --git a/vnet/vnet/vxlan-gpe/encap.c b/vnet/vnet/vxlan-gpe/encap.c
deleted file mode 100644
index 3a486e56..00000000
--- a/vnet/vnet/vxlan-gpe/encap.c
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- *  @file
- *  @brief Functions for encapsulating VXLAN GPE tunnels
- *
-*/
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-
-/** Statistics (not really errors) */
-#define foreach_vxlan_gpe_encap_error    \
-_(ENCAPSULATED, "good packets encapsulated")
-
-/**
- * @brief VXLAN GPE encap error strings
- */
-static char * vxlan_gpe_encap_error_strings[] = {
-#define _(sym,string) string,
-  foreach_vxlan_gpe_encap_error
-#undef _
-};
-
-/**
- * @brief Struct for VXLAN GPE errors/counters
- */
-typedef enum {
-#define _(sym,str) VXLAN_GPE_ENCAP_ERROR_##sym,
-    foreach_vxlan_gpe_encap_error
-#undef _
-    VXLAN_GPE_ENCAP_N_ERROR,
-} vxlan_gpe_encap_error_t;
-
-/**
- * @brief Struct for tracing VXLAN GPE encapsulated packets
- */
-typedef struct {
-  u32 tunnel_index;
-} vxlan_gpe_encap_trace_t;
-
-/**
- * @brief Trace of packets encapsulated in VXLAN GPE
- *
- * @param *s
- * @param *args
- *
- * @return *s
- *
- */
-u8 * format_vxlan_gpe_encap_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  vxlan_gpe_encap_trace_t * t
-      = va_arg (*args, vxlan_gpe_encap_trace_t *);
-
-  s = format (s, "VXLAN-GPE-ENCAP: tunnel %d", t->tunnel_index);
-  return s;
-}
-
-/**
- * @brief Instantiates UDP + VXLAN-GPE header then set next node to IP4|6 lookup
- *
- * @param *ngm
- * @param *b0
- * @param *t0 contains rewrite header
- * @param *next0 relative index of next dispatch function (next node)
- * @param is_v4 Is this IPv4? (or IPv6)
- *
- */
-always_inline void
-vxlan_gpe_encap_one_inline (vxlan_gpe_main_t * ngm, vlib_buffer_t * b0,
-                            vxlan_gpe_tunnel_t * t0, u32 * next0,
-                            u8 is_v4)
-{
-  ASSERT(sizeof(ip4_vxlan_gpe_header_t) == 36);
-  ASSERT(sizeof(ip6_vxlan_gpe_header_t) == 56);
-
-  ip_udp_encap_one (ngm->vlib_main, b0, t0->rewrite, t0->rewrite_size, is_v4);
-  next0[0] = t0->encap_next_node;
-}
-
-/**
- * @brief Instantiates UDP + VXLAN-GPE header then set next node to IP4|6 lookup for two packets
- *
- * @param *ngm
- * @param *b0 Packet0
- * @param *b1 Packet1
- * @param *t0 contains rewrite header for Packet0
- * @param *t1 contains rewrite header for Packet1
- * @param *next0 relative index of next dispatch function (next node) for Packet0
- * @param *next1 relative index of next dispatch function (next node) for Packet1
- * @param is_v4 Is this IPv4? (or IPv6)
- *
- */
-always_inline void
-vxlan_gpe_encap_two_inline (vxlan_gpe_main_t * ngm, vlib_buffer_t * b0,
-                            vlib_buffer_t * b1, vxlan_gpe_tunnel_t * t0,
-                            vxlan_gpe_tunnel_t * t1, u32 * next0,
-                            u32 * next1, u8 is_v4)
-{
-  ASSERT(sizeof(ip4_vxlan_gpe_header_t) == 36);
-  ASSERT(sizeof(ip6_vxlan_gpe_header_t) == 56);
-
-  ip_udp_encap_one (ngm->vlib_main, b0, t0->rewrite, t0->rewrite_size, is_v4);
-  ip_udp_encap_one (ngm->vlib_main, b1, t1->rewrite, t1->rewrite_size, is_v4);
-  next0[0] = next1[0] = t0->encap_next_node;
-}
-
-/**
- * @brief Common processing for IPv4 and IPv6 VXLAN GPE encap dispatch functions
- *
- * It is worth noting that other than trivial UDP forwarding (transit), VXLAN GPE
- * tunnels are "establish local". This means that we don't have a TX interface as yet
- * as we need to look up where the outer-header dest is. By setting the TX index in the
- * buffer metadata to the encap FIB, we can do a lookup to get the adjacency and real TX.
- *
- *      vnet_buffer(b0)->sw_if_index[VLIB_TX] = t0->encap_fib_index;
- *
- * @node vxlan-gpe-input
- * @param *vm
- * @param *node
- * @param *from_frame
- *
- * @return from_frame->n_vectors
- *
- */
-static uword
-vxlan_gpe_encap (vlib_main_t * vm,
-               vlib_node_runtime_t * node,
-               vlib_frame_t * from_frame)
-{
-  u32 n_left_from, next_index, *from, *to_next;
-  vxlan_gpe_main_t * ngm = &vxlan_gpe_main;
-  vnet_main_t * vnm = ngm->vnet_main;
-  vnet_interface_main_t * im = &vnm->interface_main;
-  u32 pkts_encapsulated = 0;
-  u32 cpu_index = os_get_cpu_number ();
-  u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-  stats_sw_if_index = node->runtime_data[0];
-  stats_n_packets = stats_n_bytes = 0;
-
-  while (n_left_from > 0)
-  {
-    u32 n_left_to_next;
-
-    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
-
-    while (n_left_from >= 4 && n_left_to_next >= 2)
-    {
-      u32 bi0, bi1;
-      vlib_buffer_t * b0, *b1;
-      u32 next0, next1;
-      u32 sw_if_index0, sw_if_index1, len0, len1;
-      vnet_hw_interface_t * hi0, *hi1;
-      vxlan_gpe_tunnel_t * t0, *t1;
-      u8 is_ip4_0, is_ip4_1;
-
-      next0 = next1 = VXLAN_GPE_ENCAP_NEXT_IP4_LOOKUP;
-
-      /* Prefetch next iteration. */
-      {
-        vlib_buffer_t * p2, *p3;
-
-        p2 = vlib_get_buffer (vm, from[2]);
-        p3 = vlib_get_buffer (vm, from[3]);
-
-        vlib_prefetch_buffer_header(p2, LOAD);
-        vlib_prefetch_buffer_header(p3, LOAD);
-
-        CLIB_PREFETCH(p2->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
-        CLIB_PREFETCH(p3->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
-      }
-
-      bi0 = from[0];
-      bi1 = from[1];
-      to_next[0] = bi0;
-      to_next[1] = bi1;
-      from += 2;
-      to_next += 2;
-      n_left_to_next -= 2;
-      n_left_from -= 2;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      /* 1-wide cache? */
-      sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_TX];
-      sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_TX];
-      hi0 = vnet_get_sup_hw_interface (vnm, vnet_buffer(b0)->sw_if_index[VLIB_TX]);
-      hi1 = vnet_get_sup_hw_interface (vnm, vnet_buffer(b1)->sw_if_index[VLIB_TX]);
-
-      t0 = pool_elt_at_index(ngm->tunnels, hi0->dev_instance);
-      t1 = pool_elt_at_index(ngm->tunnels, hi1->dev_instance);
-
-      is_ip4_0 = (t0->flags & VXLAN_GPE_TUNNEL_IS_IPV4);
-      is_ip4_1 = (t1->flags & VXLAN_GPE_TUNNEL_IS_IPV4);
-
-      if (PREDICT_TRUE(is_ip4_0 == is_ip4_1))
-      {
-        vxlan_gpe_encap_two_inline (ngm, b0, b1, t0, t1, &next0, &next1,is_ip4_0);
-      }
-      else
-      {
-        vxlan_gpe_encap_one_inline (ngm, b0, t0, &next0, is_ip4_0);
-        vxlan_gpe_encap_one_inline (ngm, b1, t1, &next1, is_ip4_1);
-      }
-
-      /* Reset to look up tunnel partner in the configured FIB */
-      vnet_buffer(b0)->sw_if_index[VLIB_TX] = t0->encap_fib_index;
-      vnet_buffer(b1)->sw_if_index[VLIB_TX] = t1->encap_fib_index;
-      vnet_buffer(b0)->sw_if_index[VLIB_RX] = sw_if_index0;
-      vnet_buffer(b1)->sw_if_index[VLIB_RX] = sw_if_index1;
-      pkts_encapsulated += 2;
-
-      len0 = vlib_buffer_length_in_chain (vm, b0);
-      len1 = vlib_buffer_length_in_chain (vm, b0);
-      stats_n_packets += 2;
-      stats_n_bytes += len0 + len1;
-
-      /* Batch stats increment on the same vxlan tunnel so counter is not
-       incremented per packet. Note stats are still incremented for deleted
-       and admin-down tunnel where packets are dropped. It is not worthwhile
-       to check for this rare case and affect normal path performance. */
-      if (PREDICT_FALSE((sw_if_index0 != stats_sw_if_index)
-              || (sw_if_index1 != stats_sw_if_index)))
-      {
-        stats_n_packets -= 2;
-        stats_n_bytes -= len0 + len1;
-        if (sw_if_index0 == sw_if_index1)
-        {
-          if (stats_n_packets)
-            vlib_increment_combined_counter (
-                im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
-                cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
-          stats_sw_if_index = sw_if_index0;
-          stats_n_packets = 2;
-          stats_n_bytes = len0 + len1;
-        }
-        else
-        {
-          vlib_increment_combined_counter (
-              im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
-              cpu_index, sw_if_index0, 1, len0);
-          vlib_increment_combined_counter (
-              im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
-              cpu_index, sw_if_index1, 1, len1);
-        }
-      }
-
-      if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-      {
-        vxlan_gpe_encap_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof(*tr));
-        tr->tunnel_index = t0 - ngm->tunnels;
-      }
-
-      if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
-      {
-        vxlan_gpe_encap_trace_t *tr = vlib_add_trace (vm, node, b1,
-                                                      sizeof(*tr));
-        tr->tunnel_index = t1 - ngm->tunnels;
-      }
-
-      vlib_validate_buffer_enqueue_x2(vm, node, next_index, to_next,
-                                      n_left_to_next, bi0, bi1, next0, next1);
-    }
-
-    while (n_left_from > 0 && n_left_to_next > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t * b0;
-      u32 next0 = VXLAN_GPE_ENCAP_NEXT_IP4_LOOKUP;
-      u32 sw_if_index0, len0;
-      vnet_hw_interface_t * hi0;
-      vxlan_gpe_tunnel_t * t0;
-      u8 is_ip4_0;
-
-      bi0 = from[0];
-      to_next[0] = bi0;
-      from += 1;
-      to_next += 1;
-      n_left_from -= 1;
-      n_left_to_next -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      /* 1-wide cache? */
-      sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_TX];
-      hi0 = vnet_get_sup_hw_interface (vnm, vnet_buffer(b0)->sw_if_index[VLIB_TX]);
-
-      t0 = pool_elt_at_index(ngm->tunnels, hi0->dev_instance);
-
-      is_ip4_0 = (t0->flags & VXLAN_GPE_TUNNEL_IS_IPV4);
-
-      vxlan_gpe_encap_one_inline (ngm, b0, t0, &next0, is_ip4_0);
-
-      /* Reset to look up tunnel partner in the configured FIB */
-      vnet_buffer(b0)->sw_if_index[VLIB_TX] = t0->encap_fib_index;
-      vnet_buffer(b0)->sw_if_index[VLIB_RX] = sw_if_index0;
-      pkts_encapsulated++;
-
-      len0 = vlib_buffer_length_in_chain (vm, b0);
-      stats_n_packets += 1;
-      stats_n_bytes += len0;
-
-      /* Batch stats increment on the same vxlan tunnel so counter is not
-       *  incremented per packet. Note stats are still incremented for deleted
-       *  and admin-down tunnel where packets are dropped. It is not worthwhile
-       *  to check for this rare case and affect normal path performance. */
-      if (PREDICT_FALSE(sw_if_index0 != stats_sw_if_index))
-      {
-        stats_n_packets -= 1;
-        stats_n_bytes -= len0;
-        if (stats_n_packets)
-          vlib_increment_combined_counter (
-              im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
-              cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
-        stats_n_packets = 1;
-        stats_n_bytes = len0;
-        stats_sw_if_index = sw_if_index0;
-      }
-      if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-      {
-        vxlan_gpe_encap_trace_t *tr = vlib_add_trace (vm, node, b0,
-                                                      sizeof(*tr));
-        tr->tunnel_index = t0 - ngm->tunnels;
-      }
-      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
-                                      n_left_to_next, bi0, next0);
-    }
-
-    vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-  }
-  vlib_node_increment_counter (vm, node->node_index,
-                               VXLAN_GPE_ENCAP_ERROR_ENCAPSULATED,
-                               pkts_encapsulated);
-  /* Increment any remaining batch stats */
-  if (stats_n_packets)
-  {
-    vlib_increment_combined_counter (
-        im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX, cpu_index,
-        stats_sw_if_index, stats_n_packets, stats_n_bytes);
-    node->runtime_data[0] = stats_sw_if_index;
-  }
-
-  return from_frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (vxlan_gpe_encap_node) = {
-  .function = vxlan_gpe_encap,
-  .name = "vxlan-gpe-encap",
-  .vector_size = sizeof (u32),
-  .format_trace = format_vxlan_gpe_encap_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(vxlan_gpe_encap_error_strings),
-  .error_strings = vxlan_gpe_encap_error_strings,
-
-  .n_next_nodes = VXLAN_GPE_ENCAP_N_NEXT,
-
-  .next_nodes = {
-    [VXLAN_GPE_ENCAP_NEXT_IP4_LOOKUP] = "ip4-lookup",
-    [VXLAN_GPE_ENCAP_NEXT_IP6_LOOKUP] = "ip6-lookup",
-    [VXLAN_GPE_ENCAP_NEXT_DROP] = "error-drop",
-  },
-};
-
diff --git a/vnet/vnet/vxlan-gpe/vxlan-gpe-rfc.txt b/vnet/vnet/vxlan-gpe/vxlan-gpe-rfc.txt
deleted file mode 100644
index 35cee50f..00000000
--- a/vnet/vnet/vxlan-gpe/vxlan-gpe-rfc.txt
+++ /dev/null
@@ -1,868 +0,0 @@
-Network Working Group                                           P. Quinn
-Internet-Draft                                       Cisco Systems, Inc.
-Intended status: Experimental                                 P. Agarwal
-Expires: January 4, 2015                                        Broadcom
-                                                             R. Fernando
-                                                              L. Kreeger
-                                                                D. Lewis
-                                                                F. Maino
-                                                                M. Smith
-                                                                N. Yadav
-                                                     Cisco Systems, Inc.
-                                                                 L. Yong
-                                                              Huawei USA
-                                                                   X. Xu
-                                                     Huawei Technologies
-                                                                U. Elzur
-                                                                   Intel
-                                                                 P. Garg
-                                                               Microsoft
-                                                            July 3, 2014
-
-
-                  Generic Protocol Extension for VXLAN
-                      draft-quinn-vxlan-gpe-03.txt
-
-Abstract
-
-   This draft describes extending Virtual eXtensible Local Area Network
-   (VXLAN), via changes to the VXLAN header, with three new
-   capabilities: support for multi-protocol encapsulation, operations,
-   administration and management (OAM) signaling and explicit
-   versioning.
-
-Status of this Memo
-
-   This Internet-Draft is submitted in full conformance with the
-   provisions of BCP 78 and BCP 79.
-
-   Internet-Drafts are working documents of the Internet Engineering
-   Task Force (IETF).  Note that other groups may also distribute
-   working documents as Internet-Drafts.  The list of current Internet-
-   Drafts is at http://datatracker.ietf.org/drafts/current/.
-
-   Internet-Drafts are draft documents valid for a maximum of six months
-   and may be updated, replaced, or obsoleted by other documents at any
-   time.  It is inappropriate to use Internet-Drafts as reference
-   material or to cite them other than as "work in progress."
-
-
-
-
-Quinn, et al.            Expires January 4, 2015                [Page 1]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-   This Internet-Draft will expire on January 4, 2015.
-
-Copyright Notice
-
-   Copyright (c) 2014 IETF Trust and the persons identified as the
-   document authors.  All rights reserved.
-
-   This document is subject to BCP 78 and the IETF Trust's Legal
-   Provisions Relating to IETF Documents
-   (http://trustee.ietf.org/license-info) in effect on the date of
-   publication of this document.  Please review these documents
-   carefully, as they describe your rights and restrictions with respect
-   to this document.  Code Components extracted from this document must
-   include Simplified BSD License text as described in Section 4.e of
-   the Trust Legal Provisions and are provided without warranty as
-   described in the Simplified BSD License.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Quinn, et al.            Expires January 4, 2015                [Page 2]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-Table of Contents
-
-   1.  Introduction . . . . . . . . . . . . . . . . . . . . . . . . .  4
-   2.  VXLAN Without Protocol Extension . . . . . . . . . . . . . . .  5
-   3.  Generic Protocol Extension VXLAN (VXLAN-gpe) . . . . . . . . .  6
-     3.1.  Multi Protocol Support . . . . . . . . . . . . . . . . . .  6
-     3.2.  OAM Support  . . . . . . . . . . . . . . . . . . . . . . .  7
-     3.3.  Version Bits . . . . . . . . . . . . . . . . . . . . . . .  7
-   4.  Backward Compatibility . . . . . . . . . . . . . . . . . . . .  8
-     4.1.  VXLAN VTEP to VXLAN-gpe VTEP . . . . . . . . . . . . . . .  8
-     4.2.  VXLAN-gpe VTEP to VXLAN VTEP . . . . . . . . . . . . . . .  8
-     4.3.  VXLAN-gpe UDP Ports  . . . . . . . . . . . . . . . . . . .  8
-     4.4.  VXLAN-gpe and Encapsulated IP Header Fields  . . . . . . .  8
-   5.  VXLAN-gpe Examples . . . . . . . . . . . . . . . . . . . . . .  9
-   6.  Security Considerations  . . . . . . . . . . . . . . . . . . . 11
-   7.  Acknowledgments  . . . . . . . . . . . . . . . . . . . . . . . 12
-   8.  IANA Considerations  . . . . . . . . . . . . . . . . . . . . . 13
-     8.1.  UDP Port . . . . . . . . . . . . . . . . . . . . . . . . . 13
-     8.2.  VXLAN-gpe Next Protocol  . . . . . . . . . . . . . . . . . 13
-     8.3.  VXLAN-gpe Reserved Bits  . . . . . . . . . . . . . . . . . 13
-   9.  References . . . . . . . . . . . . . . . . . . . . . . . . . . 14
-     9.1.  Normative References . . . . . . . . . . . . . . . . . . . 14
-     9.2.  Informative References . . . . . . . . . . . . . . . . . . 14
-   Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . . 15
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Quinn, et al.            Expires January 4, 2015                [Page 3]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-1.  Introduction
-
-   Virtual eXtensible Local Area Network [VXLAN] defines an
-   encapsulation format that encapsulates Ethernet frames in an outer
-   UDP/IP transport.  As data centers evolve, the need to carry other
-   protocols encapsulated in an IP packet is required, as well as the
-   need to provide increased visibility and diagnostic capabilities
-   within the overlay.  The VXLAN header does not specify the protocol
-   being encapsulated and therefore is currently limited to
-   encapsulating only Ethernet frame payload, nor does it provide the
-   ability to define OAM protocols.  Rather than defining yet another
-   encapsulation, VXLAN is extended to provide protocol typing and OAM
-   capabilities.
-
-   This document describes extending VXLAN via the following changes:
-
-   Next Protocol Bit (P bit):  A reserved flag bit is allocated, and set
-      in the VXLAN-gpe header to indicate that a next protocol field is
-      present.
-
-   OAM Flag Bit (O bit):  A reserved flag bit is allocated, and set in
-      the VXLAN-gpe header, to indicate that the packet is an OAM
-      packet.
-
-   Version:  Two reserved bits are allocated, and set in the VXLAN-gpe
-      header, to indicate VXLAN-gpe protocol version.
-
-   Next Protocol:  A 8 bit next protocol field is present in the VXLAN-
-      gpe header.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Quinn, et al.            Expires January 4, 2015                [Page 4]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-2.  VXLAN Without Protocol Extension
-
-   As described in the introduction, the VXLAN header has no protocol
-   identifier that indicates the type of payload being carried by VXLAN.
-   Because of this, VXLAN is limited to an Ethernet payload.
-   Furthermore, the VXLAN header has no mechanism to signal OAM packets.
-
-   The VXLAN header defines bits 0-7 as flags (some defined, some
-   reserved), the VXLAN network identifier (VNI) field and several
-   reserved bits.  The flags provide flexibility to define how the
-   reserved bits can be used to change the definition of the VXLAN
-   header.
-
-
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |R|R|R|R|I|R|R|R|            Reserved                           |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                VXLAN Network Identifier (VNI) |   Reserved    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-                          Figure 1: VXLAN Header
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Quinn, et al.            Expires January 4, 2015                [Page 5]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-3.  Generic Protocol Extension VXLAN (VXLAN-gpe)
-
-3.1.  Multi Protocol Support
-
-   This draft defines the following two changes to the VXLAN header in
-   order to support multi-protocol encapsulation:
-
-   P Bit:  Flag bit 5 is defined as the Next Protocol bit.  The P bit
-      MUST be set to 1 to indicate the presence of the 8 bit next
-      protocol field.
-
-      P = 0 indicates that the payload MUST conform to VXLAN as defined
-      in [VXLAN].
-
-      Flag bit 5 was chosen as the P bit because this flag bit is
-      currently reserved in VXLAN.
-
-   Next Protocol Field:  The lower 8 bits of the first word are used to
-      carry a next protocol.  This next protocol field contains the
-      protocol of the encapsulated payload packet.  A new protocol
-      registry will be requested from IANA.
-
-      This draft defines the following Next Protocol values:
-
-      0x1 : IPv4
-      0x2 : IPv6
-      0x3 : Ethernet
-      0x4 : Network Service Header [NSH]
-
-
-
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |R|R|R|R|I|P|R|R|   Reserved                    |Next Protocol  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                VXLAN Network Identifier (VNI) |   Reserved    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-
-                     Figure 2: VXLAN-gpe Next Protocol
-
-
-
-
-
-
-
-
-Quinn, et al.            Expires January 4, 2015                [Page 6]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-3.2.  OAM Support
-
-   Flag bit 7 is defined as the O bit.  When the O bit is set to 1, the
-   packet is an OAM packet and OAM processing MUST occur.  The OAM
-   protocol details are out of scope for this document.  As with the
-   P-bit, bit 7 is currently a reserved flag in VXLAN.
-
-
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |R|R|R|R|I|P|R|O|   Reserved                    |Next Protocol  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                VXLAN Network Identifier (VNI) |   Reserved    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-
-                        Figure 3: VXLAN-gpe OAM Bit
-
-3.3.  Version Bits
-
-   VXLAN-gpe bits 8 and 9 are defined as version bits.  These bits are
-   reserved in VXLAN.  The version field is used to ensure backward
-   compatibility going forward with future VXLAN-gpe updates.
-
-   The initial version for VXLAN-gpe is 0.
-
-
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |R|R|R|R|I|P|R|O|Ver|   Reserved                |Next Protocol  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                VXLAN Network Identifier (VNI) |   Reserved    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-
-
-
-                     Figure 4: VXLAN-gpe Version Bits
-
-
-
-
-
-
-
-Quinn, et al.            Expires January 4, 2015                [Page 7]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-4.  Backward Compatibility
-
-4.1.  VXLAN VTEP to VXLAN-gpe VTEP
-
-   As per VXLAN, reserved bits 5 and 7, VXLAN-gpe P and O-bits
-   respectively must be set to zero.  The remaining reserved bits must
-   be zero, including the VXLAN-gpe version field, bits 8 and 9.  The
-   encapsulated payload MUST be Ethernet.
-
-4.2.  VXLAN-gpe VTEP to VXLAN VTEP
-
-   A VXLAN-gpe VTEP MUST NOT encapsulate non-Ethernet frames to a VXLAN
-   VTEP.  When encapsulating Ethernet frames to a VXLAN VTEP, the VXLAN-
-   gpe VTEP will set the P bit to 0, the Next Protocol to 0 and use UDP
-   destination port 4789.  A VXLAN-gpe VTEP MUST also set O = 0 and Ver
-   = 0 when encapsulating Ethernet frames to VXLAN VTEP.  The receiving
-   VXLAN VTEP will threat this packet as a VXLAN packet.
-
-   A method for determining the capabilities of a VXLAN VTEP (gpe or
-   non-gpe) is out of the scope of this draft.
-
-4.3.  VXLAN-gpe UDP Ports
-
-   VXLAN-gpe uses a new UDP destination port (to be assigned by IANA)
-   when sending traffic to VXLAN-gpe VTEPs.
-
-4.4.  VXLAN-gpe and Encapsulated IP Header Fields
-
-   When encapsulating and decapsulating IPv4 and IPv6 packets, certain
-   fields, such as IPv4 Time to Live (TTL) from the inner IP header need
-   to be considered.  VXLAN-gpe IP encapsulation and decapsulation
-   utilizes the techniques described in [RFC6830], section 5.3.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Quinn, et al.            Expires January 4, 2015                [Page 8]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-5.  VXLAN-gpe Examples
-
-   This section provides three examples of protocols encapsulated using
-   the Generic Protocol Extension for VXLAN described in this document.
-
-
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |R|R|R|R|I|1|R|0|0|0|   Reserved                |    NP = IPv4  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                VXLAN Network Identifier (VNI) |   Reserved    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |               Original IPv4 Packet                            |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-
-                       Figure 5: IPv4 and VXLAN-gpe
-
-
-
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |R|R|R|R|I|1|R|0|0|0|   Reserved                |  NP = IPv6    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                VXLAN Network Identifier (VNI) |   Reserved    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |               Original IPv6 Packet                            |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-
-                       Figure 6: IPv6 and VXLAN-gpe
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Quinn, et al.            Expires January 4, 2015                [Page 9]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |R|R|R|R|I|1|R|0|0|0|   Reserved                |NP = Ethernet  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                VXLAN Network Identifier (VNI) |   Reserved    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |               Original Ethernet Frame                         |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-
-                     Figure 7: Ethernet and VXLAN-gpe
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Quinn, et al.            Expires January 4, 2015               [Page 10]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-6.  Security Considerations
-
-   VXLAN's security is focused on issues around L2 encapsulation into
-   L3.  With VXLAN-gpe, issues such as spoofing, flooding, and traffic
-   redirection are dependent on the particular protocol payload
-   encapsulated.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Quinn, et al.            Expires January 4, 2015               [Page 11]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-7.  Acknowledgments
-
-   A special thank you goes to Dino Farinacci for his guidance and
-   detailed review.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Quinn, et al.            Expires January 4, 2015               [Page 12]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-8.  IANA Considerations
-
-8.1.  UDP Port
-
-   A new UDP port will be requested from IANA.
-
-8.2.  VXLAN-gpe Next Protocol
-
-   IANA is requested to set up a registry of "Next Protocol".  These are
-   8-bit values.  Next Protocol values 0, 1, 2, 3 and 4 are defined in
-   this draft.  New values are assigned via Standards Action [RFC5226].
-
-              +---------------+-------------+---------------+
-              | Next Protocol | Description | Reference     |
-              +---------------+-------------+---------------+
-              | 0             | Reserved    | This document |
-              |               |             |               |
-              | 1             | IPv4        | This document |
-              |               |             |               |
-              | 2             | IPv6        | This document |
-              |               |             |               |
-              | 3             | Ethernet    | This document |
-              |               |             |               |
-              | 4             | NSH         | This document |
-              |               |             |               |
-              | 5..253        | Unassigned  |               |
-              +---------------+-------------+---------------+
-
-                                  Table 1
-
-8.3.  VXLAN-gpe Reserved Bits
-
-   There are ten bits at the beginning of the VXLAN-gpe header.  New
-   bits are assigned via Standards Action [RFC5226].
-
-   Bits 0-3 - Reserved
-   Bit 4 - Instance ID (I bit)
-   Bit 5 - Next Protocol (P bit)
-   Bit 6 - Reserved
-   Bit 7 - OAM (O bit)
-   Bits 8-9 - Version
-
-
-
-
-
-
-
-
-
-
-Quinn, et al.            Expires January 4, 2015               [Page 13]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-9.  References
-
-9.1.  Normative References
-
-   [RFC0768]  Postel, J., "User Datagram Protocol", STD 6, RFC 768,
-              August 1980.
-
-   [RFC0791]  Postel, J., "Internet Protocol", STD 5, RFC 791,
-              September 1981.
-
-   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
-              Requirement Levels", BCP 14, RFC 2119, March 1997.
-
-   [RFC5226]  Narten, T. and H. Alvestrand, "Guidelines for Writing an
-              IANA Considerations Section in RFCs", BCP 26, RFC 5226,
-              May 2008.
-
-9.2.  Informative References
-
-   [NSH]      Quinn, P. and et al. , "Network Service Header", 2014.
-
-   [RFC1700]  Reynolds, J. and J. Postel, "Assigned Numbers", RFC 1700,
-              October 1994.
-
-   [RFC6830]  Farinacci, D., Fuller, V., Meyer, D., and D. Lewis, "The
-              Locator/ID Separation Protocol (LISP)", RFC 6830,
-              January 2013.
-
-   [VXLAN]    Dutt, D., Mahalingam, M., Duda, K., Agarwal, P., Kreeger,
-              L., Sridhar, T., Bursell, M., and C. Wright, "VXLAN: A
-              Framework for Overlaying Virtualized Layer 2 Networks over
-              Layer 3 Networks", 2013.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Quinn, et al.            Expires January 4, 2015               [Page 14]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-Authors' Addresses
-
-   Paul Quinn
-   Cisco Systems, Inc.
-
-   Email: paulq@cisco.com
-
-
-   Puneet Agarwal
-   Broadcom
-
-   Email: pagarwal@broadcom.com
-
-
-   Rex Fernando
-   Cisco Systems, Inc.
-
-   Email: rex@cisco.com
-
-
-   Larry Kreeger
-   Cisco Systems, Inc.
-
-   Email: kreeger@cisco.com
-
-
-   Darrel Lewis
-   Cisco Systems, Inc.
-
-   Email: darlewis@cisco.com
-
-
-   Fabio Maino
-   Cisco Systems, Inc.
-
-   Email: kreeger@cisco.com
-
-
-   Michael Smith
-   Cisco Systems, Inc.
-
-   Email: michsmit@cisco.com
-
-
-
-
-
-
-
-
-
-Quinn, et al.            Expires January 4, 2015               [Page 15]
-
-Internet-Draft    Generic Protocol Extension for VXLAN         July 2014
-
-
-   Navindra Yadav
-   Cisco Systems, Inc.
-
-   Email: nyadav@cisco.com
-
-
-   Lucy Yong
-   Huawei USA
-
-   Email: lucy.yong@huawei.com
-
-
-   Xiaohu Xu
-   Huawei Technologies
-
-   Email: xuxiaohu@huawei.com
-
-
-   Uri Elzur
-   Intel
-
-   Email: uri.elzur@intel.com
-
-
-   Pankaj Garg
-   Microsoft
-
-   Email: Garg.Pankaj@microsoft.com
diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe.api b/vnet/vnet/vxlan-gpe/vxlan_gpe.api
deleted file mode 100644
index 6c6973f8..00000000
--- a/vnet/vnet/vxlan-gpe/vxlan_gpe.api
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-define vxlan_gpe_add_del_tunnel
-{
-  u32 client_index;
-  u32 context;
-  u8 is_ipv6;
-  u8 local[16];
-  u8 remote[16];
-  u32 encap_vrf_id;
-  u32 decap_vrf_id;
-  u8 protocol;
-  u32 vni;
-  u8 is_add;
-};
-
-define vxlan_gpe_add_del_tunnel_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-};
-
-define vxlan_gpe_tunnel_dump
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-};
-
-define vxlan_gpe_tunnel_details
-{
-  u32 context;
-  u32 sw_if_index;
-  u8 local[16];
-  u8 remote[16];
-  u32 vni;
-  u8 protocol;
-  u32 encap_vrf_id;
-  u32 decap_vrf_id;
-  u8 is_ipv6;
-};
-
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
\ No newline at end of file
diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe.c b/vnet/vnet/vxlan-gpe/vxlan_gpe.c
deleted file mode 100644
index b97510c4..00000000
--- a/vnet/vnet/vxlan-gpe/vxlan_gpe.c
+++ /dev/null
@@ -1,659 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- *  @file
- *  @brief Common utility functions for IPv4 and IPv6 VXLAN GPE tunnels
- *
-*/
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <vnet/fib/fib.h>
-#include <vnet/ip/format.h>
-
-vxlan_gpe_main_t vxlan_gpe_main;
-
-/**
- * @brief Tracing function for VXLAN GPE tunnel packets
- *
- * @param *s formatting string
- * @param *args
- *
- * @return *s formatted string
- *
- */
-u8 * format_vxlan_gpe_tunnel (u8 * s, va_list * args)
-{
-  vxlan_gpe_tunnel_t * t = va_arg (*args, vxlan_gpe_tunnel_t *);
-  vxlan_gpe_main_t * gm = &vxlan_gpe_main;
-
-  s = format (s, "[%d] local: %U remote: %U ",
-              t - gm->tunnels,
-              format_ip46_address, &t->local, IP46_TYPE_ANY,
-              format_ip46_address, &t->remote, IP46_TYPE_ANY);
-
-  s = format (s, "  vxlan VNI %d ", t->vni);
-
-  switch (t->protocol)
-    {
-    case VXLAN_GPE_PROTOCOL_IP4:
-      s = format (s, "next-protocol ip4");
-      break;
-    case VXLAN_GPE_PROTOCOL_IP6:
-      s = format (s, "next-protocol ip6");
-      break;
-    case VXLAN_GPE_PROTOCOL_ETHERNET:
-      s = format (s, "next-protocol ethernet");
-      break;
-    case VXLAN_GPE_PROTOCOL_NSH:
-      s = format (s, "next-protocol nsh");
-      break;
-    default:
-      s = format (s, "next-protocol unknown %d", t->protocol);
-    }
-
-  s = format (s, " fibs: (encap %d, decap %d)",
-              t->encap_fib_index,
-              t->decap_fib_index);
-
-  return s;
-}
-
-/**
- * @brief Naming for VXLAN GPE tunnel
- *
- * @param *s formatting string
- * @param *args
- *
- * @return *s formatted string
- *
- */
-static u8 * format_vxlan_gpe_name (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  return format (s, "vxlan_gpe_tunnel%d", dev_instance);
-}
-
-static uword dummy_interface_tx (vlib_main_t * vm,
-                                 vlib_node_runtime_t * node,
-                                 vlib_frame_t * frame)
-{
-  clib_warning ("you shouldn't be here, leaking buffers...");
-  return frame->n_vectors;
-}
-
-/**
- * @brief CLI function for VXLAN GPE admin up/down
- *
- * @param *vnm
- * @param hw_if_index
- * @param flag
- *
- * @return *rc
- *
- */
-static clib_error_t *
-vxlan_gpe_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
-{
-  if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
-    vnet_hw_interface_set_flags (vnm, hw_if_index, VNET_HW_INTERFACE_FLAG_LINK_UP);
-  else
-    vnet_hw_interface_set_flags (vnm, hw_if_index, 0);
-
-  return 0;
-}
-
-VNET_DEVICE_CLASS (vxlan_gpe_device_class,static) = {
-  .name = "VXLAN_GPE",
-  .format_device_name = format_vxlan_gpe_name,
-  .format_tx_trace = format_vxlan_gpe_encap_trace,
-  .tx_function = dummy_interface_tx,
-  .admin_up_down_function = vxlan_gpe_interface_admin_up_down,
-};
-
-
-/**
- * @brief Formatting function for tracing VXLAN GPE with length
- *
- * @param *s
- * @param *args
- *
- * @return *s
- *
- */
-static u8 * format_vxlan_gpe_header_with_length (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  s = format (s, "unimplemented dev %u", dev_instance);
-  return s;
-}
-
-VNET_HW_INTERFACE_CLASS (vxlan_gpe_hw_class) = {
-  .name = "VXLAN_GPE",
-  .format_header = format_vxlan_gpe_header_with_length,
-  .build_rewrite = default_build_rewrite,
-  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
-};
-
-
-#define foreach_gpe_copy_field                  \
-_(vni)                                          \
-_(protocol)                                \
-_(encap_fib_index)                              \
-_(decap_fib_index)
-
-#define foreach_copy_ipv4 {                     \
-  _(local.ip4.as_u32)                           \
-  _(remote.ip4.as_u32)                          \
-}
-
-#define foreach_copy_ipv6 {                     \
-  _(local.ip6.as_u64[0])                        \
-  _(local.ip6.as_u64[1])                        \
-  _(remote.ip6.as_u64[0])                       \
-  _(remote.ip6.as_u64[1])                       \
-}
-
-
-/**
- * @brief Calculate IPv4 VXLAN GPE rewrite header
- *
- * @param *t
- *
- * @return rc
- *
- */
-int vxlan4_gpe_rewrite (vxlan_gpe_tunnel_t * t, u32 extension_size, 
-                        u8 protocol_override, uword encap_next_node)
-{
-  u8 *rw = 0;
-  ip4_header_t * ip0;
-  ip4_vxlan_gpe_header_t * h0;
-  int len;
-
-  len = sizeof (*h0) + extension_size;
-
-  vec_free(t->rewrite);
-  vec_validate_aligned (rw, len-1, CLIB_CACHE_LINE_BYTES);
-
-  h0 = (ip4_vxlan_gpe_header_t *) rw;
-
-  /* Fixed portion of the (outer) ip4 header */
-  ip0 = &h0->ip4;
-  ip0->ip_version_and_header_length = 0x45;
-  ip0->ttl = 254;
-  ip0->protocol = IP_PROTOCOL_UDP;
-
-  /* we fix up the ip4 header length and checksum after-the-fact */
-  ip0->src_address.as_u32 = t->local.ip4.as_u32;
-  ip0->dst_address.as_u32 = t->remote.ip4.as_u32;
-  ip0->checksum = ip4_header_checksum (ip0);
-
-  /* UDP header, randomize src port on something, maybe? */
-  h0->udp.src_port = clib_host_to_net_u16 (4790);
-  h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_vxlan_gpe);
-
-  /* VXLAN header. Are we having fun yet? */
-  h0->vxlan.flags = VXLAN_GPE_FLAGS_I | VXLAN_GPE_FLAGS_P;
-  h0->vxlan.ver_res = VXLAN_GPE_VERSION;
-  if (protocol_override)
-  {
-      h0->vxlan.protocol = protocol_override;
-  }
-  else
-  {
-      h0->vxlan.protocol = t->protocol;
-  }
-  t->rewrite_size = sizeof(ip4_vxlan_gpe_header_t) +  extension_size;
-  h0->vxlan.vni_res = clib_host_to_net_u32 (t->vni<<8);
-
-  t->rewrite = rw;
-  t->encap_next_node = encap_next_node;
-  return (0);
-}
-
-/**
- * @brief Calculate IPv6 VXLAN GPE rewrite header
- *
- * @param *t
- *
- * @return rc
- *
- */
-int vxlan6_gpe_rewrite (vxlan_gpe_tunnel_t * t, u32 extension_size, 
-                        u8 protocol_override, uword encap_next_node)
-{
-  u8 *rw = 0;
-  ip6_header_t * ip0;
-  ip6_vxlan_gpe_header_t * h0;
-  int len;
-
-  len = sizeof (*h0) + extension_size;
-
-  vec_free(t->rewrite);
-  vec_validate_aligned (rw, len-1, CLIB_CACHE_LINE_BYTES);
-
-  h0 = (ip6_vxlan_gpe_header_t *) rw;
-
-  /* Fixed portion of the (outer) ip4 header */
-  ip0 = &h0->ip6;
-  ip0->ip_version_traffic_class_and_flow_label = clib_host_to_net_u32(6 << 28);
-  ip0->hop_limit = 255;
-  ip0->protocol = IP_PROTOCOL_UDP;
-
-  ip0->src_address.as_u64[0] = t->local.ip6.as_u64[0];
-  ip0->src_address.as_u64[1] = t->local.ip6.as_u64[1];
-  ip0->dst_address.as_u64[0] = t->remote.ip6.as_u64[0];
-  ip0->dst_address.as_u64[1] = t->remote.ip6.as_u64[1];
-
-  /* UDP header, randomize src port on something, maybe? */
-  h0->udp.src_port = clib_host_to_net_u16 (4790);
-  h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_vxlan_gpe);
-
-  /* VXLAN header. Are we having fun yet? */
-  h0->vxlan.flags = VXLAN_GPE_FLAGS_I | VXLAN_GPE_FLAGS_P;
-  h0->vxlan.ver_res = VXLAN_GPE_VERSION;
-  if (protocol_override)
-  {
-      h0->vxlan.protocol = t->protocol;
-  }
-  else
-  {
-      h0->vxlan.protocol = protocol_override;
-  }
-  t->rewrite_size = sizeof(ip4_vxlan_gpe_header_t) +  extension_size;
-  h0->vxlan.vni_res = clib_host_to_net_u32 (t->vni<<8);
-
-  t->rewrite = rw;
-  t->encap_next_node = encap_next_node;
-  return (0);
-}
-
-/**
- * @brief Add or Del a VXLAN GPE tunnel
- *
- * @param *a
- * @param *sw_if_index
- *
- * @return rc
- *
- */
-int vnet_vxlan_gpe_add_del_tunnel
-(vnet_vxlan_gpe_add_del_tunnel_args_t *a, u32 * sw_if_indexp)
-{
-  vxlan_gpe_main_t * gm = &vxlan_gpe_main;
-  vxlan_gpe_tunnel_t *t = 0;
-  vnet_main_t * vnm = gm->vnet_main;
-  vnet_hw_interface_t * hi;
-  uword * p;
-  u32 hw_if_index = ~0;
-  u32 sw_if_index = ~0;
-  int rv;
-  vxlan4_gpe_tunnel_key_t key4, *key4_copy;
-  vxlan6_gpe_tunnel_key_t key6, *key6_copy;
-  hash_pair_t *hp;
-
-  if (!a->is_ip6)
-  {
-    key4.local = a->local.ip4.as_u32;
-    key4.remote = a->remote.ip4.as_u32;
-    key4.vni = clib_host_to_net_u32 (a->vni << 8);
-    key4.pad = 0;
-
-    p = hash_get_mem(gm->vxlan4_gpe_tunnel_by_key, &key4);
-  }
-  else
-  {
-    key6.local.as_u64[0] = a->local.ip6.as_u64[0];
-    key6.local.as_u64[1] = a->local.ip6.as_u64[1];
-    key6.remote.as_u64[0] = a->remote.ip6.as_u64[0];
-    key6.remote.as_u64[1] = a->remote.ip6.as_u64[1];
-    key6.vni = clib_host_to_net_u32 (a->vni << 8);
-
-    p = hash_get_mem(gm->vxlan6_gpe_tunnel_by_key, &key6);
-  }
-
-  if (a->is_add)
-    {
-      /* adding a tunnel: tunnel must not already exist */
-      if (p)
-        return VNET_API_ERROR_INVALID_VALUE;
-
-      pool_get_aligned (gm->tunnels, t, CLIB_CACHE_LINE_BYTES);
-      memset (t, 0, sizeof (*t));
-
-      /* copy from arg structure */
-#define _(x) t->x = a->x;
-      foreach_gpe_copy_field;
-      if (!a->is_ip6) foreach_copy_ipv4
-      else            foreach_copy_ipv6
-#undef _
-
-      if (!a->is_ip6) t->flags |= VXLAN_GPE_TUNNEL_IS_IPV4;
-
-      if (!a->is_ip6) {
-        rv = vxlan4_gpe_rewrite (t, 0, 0, VXLAN_GPE_ENCAP_NEXT_IP4_LOOKUP);
-      } else {
-        rv = vxlan6_gpe_rewrite (t, 0, 0, VXLAN_GPE_ENCAP_NEXT_IP6_LOOKUP);
-      }
-
-      if (rv)
-      {
-          pool_put (gm->tunnels, t);
-          return rv;
-      }
-
-      if (!a->is_ip6)
-      {
-        key4_copy = clib_mem_alloc (sizeof (*key4_copy));
-        clib_memcpy (key4_copy, &key4, sizeof (*key4_copy));
-        hash_set_mem (gm->vxlan4_gpe_tunnel_by_key, key4_copy,
-                      t - gm->tunnels);
-      }
-      else
-      {
-          key6_copy = clib_mem_alloc (sizeof (*key6_copy));
-          clib_memcpy (key6_copy, &key6, sizeof (*key6_copy));
-          hash_set_mem (gm->vxlan6_gpe_tunnel_by_key, key6_copy,
-                        t - gm->tunnels);
-      }
-
-      if (vec_len (gm->free_vxlan_gpe_tunnel_hw_if_indices) > 0)
-        {
-          hw_if_index = gm->free_vxlan_gpe_tunnel_hw_if_indices
-            [vec_len (gm->free_vxlan_gpe_tunnel_hw_if_indices)-1];
-          _vec_len (gm->free_vxlan_gpe_tunnel_hw_if_indices) -= 1;
-
-          hi = vnet_get_hw_interface (vnm, hw_if_index);
-          hi->dev_instance = t - gm->tunnels;
-          hi->hw_instance = hi->dev_instance;
-        }
-      else
-        {
-          hw_if_index = vnet_register_interface
-            (vnm, vxlan_gpe_device_class.index, t - gm->tunnels,
-             vxlan_gpe_hw_class.index, t - gm->tunnels);
-          hi = vnet_get_hw_interface (vnm, hw_if_index);
-          hi->output_node_index = vxlan_gpe_encap_node.index;
-        }
-
-      t->hw_if_index = hw_if_index;
-      t->sw_if_index = sw_if_index = hi->sw_if_index;
-      vec_validate_init_empty (gm->tunnel_index_by_sw_if_index, sw_if_index, ~0);
-      gm->tunnel_index_by_sw_if_index[sw_if_index] = t - gm->tunnels;
-
-      vnet_sw_interface_set_flags (vnm, hi->sw_if_index,
-                                   VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-    }
-  else
-    {
-      /* deleting a tunnel: tunnel must exist */
-      if (!p)
-        return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-      t = pool_elt_at_index (gm->tunnels, p[0]);
-
-      vnet_sw_interface_set_flags (vnm, t->sw_if_index, 0 /* down */);
-      vec_add1 (gm->free_vxlan_gpe_tunnel_hw_if_indices, t->hw_if_index);
-
-      gm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
-
-      if (!a->is_ip6)
-      {
-        hp = hash_get_pair (gm->vxlan4_gpe_tunnel_by_key, &key4);
-        key4_copy = (void *)(hp->key);
-        hash_unset_mem (gm->vxlan4_gpe_tunnel_by_key, &key4);
-        clib_mem_free (key4_copy);
-      }
-      else
-      {
-        hp = hash_get_pair (gm->vxlan6_gpe_tunnel_by_key, &key6);
-        key6_copy = (void *)(hp->key);
-        hash_unset_mem (gm->vxlan4_gpe_tunnel_by_key, &key6);
-        clib_mem_free (key6_copy);
-      }
-
-      vec_free (t->rewrite);
-      pool_put (gm->tunnels, t);
-    }
-
-  if (sw_if_indexp)
-      *sw_if_indexp = sw_if_index;
-
-  return 0;
-}
-
-static clib_error_t *
-vxlan_gpe_add_del_tunnel_command_fn (vlib_main_t * vm,
-                                   unformat_input_t * input,
-                                   vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, * line_input = &_line_input;
-  u8 is_add = 1;
-  ip46_address_t local, remote;
-  u8 local_set = 0;
-  u8 remote_set = 0;
-  u8 ipv4_set = 0;
-  u8 ipv6_set = 0;
-  u32 encap_fib_index = 0;
-  u32 decap_fib_index = 0;
-  u8 protocol = VXLAN_GPE_PROTOCOL_IP4;
-  u32 vni;
-  u8 vni_set = 0;
-  int rv;
-  u32 tmp;
-  vnet_vxlan_gpe_add_del_tunnel_args_t _a, * a = &_a;
-  u32 sw_if_index;
-
-  /* Get a line of input. */
-  if (! unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (line_input, "del"))
-      is_add = 0;
-    else if (unformat (line_input, "local %U",
-                       unformat_ip4_address, &local.ip4))
-    {
-      local_set = 1;
-      ipv4_set = 1;
-    }
-    else if (unformat (line_input, "remote %U",
-                       unformat_ip4_address, &remote.ip4))
-    {
-      remote_set = 1;
-      ipv4_set = 1;
-    }
-    else if (unformat (line_input, "local %U",
-                       unformat_ip6_address, &local.ip6))
-    {
-      local_set = 1;
-      ipv6_set = 1;
-    }
-    else if (unformat (line_input, "remote %U",
-                       unformat_ip6_address, &remote.ip6))
-    {
-      remote_set = 1;
-      ipv6_set = 1;
-    }
-    else if (unformat (line_input, "encap-vrf-id %d", &tmp))
-      {
-        if (ipv6_set)
-          encap_fib_index = ip6_fib_index_from_table_id (tmp);
-        else
-          encap_fib_index =  ip4_fib_index_from_table_id (tmp);
-
-        if (encap_fib_index == ~0)
-          return clib_error_return (0, "nonexistent encap fib id %d", tmp);
-      }
-    else if (unformat (line_input, "decap-vrf-id %d", &tmp))
-      {
-        if (ipv6_set)
-          decap_fib_index = ip6_fib_index_from_table_id (tmp);
-        else
-          decap_fib_index = ip4_fib_index_from_table_id (tmp);
-
-        if (decap_fib_index == ~0)
-          return clib_error_return (0, "nonexistent decap fib id %d", tmp);
-      }
-    else if (unformat (line_input, "vni %d", &vni))
-      vni_set = 1;
-    else if (unformat(line_input, "next-ip4"))
-      protocol = VXLAN_GPE_PROTOCOL_IP4;
-    else if (unformat(line_input, "next-ip6"))
-      protocol = VXLAN_GPE_PROTOCOL_IP6;
-    else if (unformat(line_input, "next-ethernet"))
-      protocol = VXLAN_GPE_PROTOCOL_ETHERNET;
-    else if (unformat(line_input, "next-nsh"))
-      protocol = VXLAN_GPE_PROTOCOL_NSH;
-    else
-      return clib_error_return (0, "parse error: '%U'",
-                                format_unformat_error, line_input);
-  }
-
-  unformat_free (line_input);
-
-  if (local_set == 0)
-    return clib_error_return (0, "tunnel local address not specified");
-
-  if (remote_set == 0)
-    return clib_error_return (0, "tunnel remote address not specified");
-
-  if (ipv4_set && ipv6_set)
-    return clib_error_return (0, "both IPv4 and IPv6 addresses specified");
-
-  if ((ipv4_set && memcmp(&local.ip4, &remote.ip4, sizeof(local.ip4)) == 0) ||
-      (ipv6_set && memcmp(&local.ip6, &remote.ip6, sizeof(local.ip6)) == 0))
-    return clib_error_return (0, "src and dst addresses are identical");
-
-  if (vni_set == 0)
-    return clib_error_return (0, "vni not specified");
-
-  memset (a, 0, sizeof (*a));
-
-  a->is_add = is_add;
-  a->is_ip6 = ipv6_set;
-
-#define _(x) a->x = x;
-  foreach_gpe_copy_field;
-  if (ipv4_set) foreach_copy_ipv4
-  else          foreach_copy_ipv6
-#undef _
-
-  rv = vnet_vxlan_gpe_add_del_tunnel (a, &sw_if_index);
-
-  switch(rv)
-    {
-    case 0:
-      vlib_cli_output(vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main(), sw_if_index);
-      break;
-    case VNET_API_ERROR_INVALID_DECAP_NEXT:
-      return clib_error_return (0, "invalid decap-next...");
-
-    case VNET_API_ERROR_TUNNEL_EXIST:
-      return clib_error_return (0, "tunnel already exists...");
-
-    case VNET_API_ERROR_NO_SUCH_ENTRY:
-      return clib_error_return (0, "tunnel does not exist...");
-
-    default:
-      return clib_error_return
-        (0, "vnet_vxlan_gpe_add_del_tunnel returned %d", rv);
-    }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (create_vxlan_gpe_tunnel_command, static) = {
-  .path = "create vxlan-gpe tunnel",
-  .short_help =
-  "create vxlan-gpe tunnel local <local-addr> remote <remote-addr>"
-  " vni <nn> [next-ip4][next-ip6][next-ethernet][next-nsh]"
-  " [encap-vrf-id <nn>] [decap-vrf-id <nn>]"
-  " [del]\n",
-  .function = vxlan_gpe_add_del_tunnel_command_fn,
-};
-
-/**
- * @brief CLI function for showing VXLAN GPE tunnels
- *
- * @param *vm
- * @param *input
- * @param *cmd
- *
- * @return error
- *
- */
-static clib_error_t *
-show_vxlan_gpe_tunnel_command_fn (vlib_main_t * vm,
-                                unformat_input_t * input,
-                                vlib_cli_command_t * cmd)
-{
-  vxlan_gpe_main_t * gm = &vxlan_gpe_main;
-  vxlan_gpe_tunnel_t * t;
-
-  if (pool_elts (gm->tunnels) == 0)
-    vlib_cli_output (vm, "No vxlan-gpe tunnels configured.");
-
-  pool_foreach (t, gm->tunnels,
-  ({
-    vlib_cli_output (vm, "%U", format_vxlan_gpe_tunnel, t);
-  }));
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (show_vxlan_gpe_tunnel_command, static) = {
-    .path = "show vxlan-gpe",
-    .function = show_vxlan_gpe_tunnel_command_fn,
-};
-
-/**
- * @brief Feature init function for VXLAN GPE
- *
- * @param *vm
- *
- * @return error
- *
- */
-clib_error_t *vxlan_gpe_init (vlib_main_t *vm)
-{
-  vxlan_gpe_main_t *gm = &vxlan_gpe_main;
-
-  gm->vnet_main = vnet_get_main();
-  gm->vlib_main = vm;
-
-  gm->vxlan4_gpe_tunnel_by_key
-    = hash_create_mem (0, sizeof(vxlan4_gpe_tunnel_key_t), sizeof (uword));
-
-  gm->vxlan6_gpe_tunnel_by_key
-    = hash_create_mem (0, sizeof(vxlan6_gpe_tunnel_key_t), sizeof (uword));
-
-
-  udp_register_dst_port (vm, UDP_DST_PORT_vxlan_gpe,
-                         vxlan4_gpe_input_node.index, 1 /* is_ip4 */);
-  udp_register_dst_port (vm, UDP_DST_PORT_vxlan6_gpe,
-                         vxlan6_gpe_input_node.index, 0 /* is_ip4 */);
-
-  /* Register the list of standard decap protocols supported */
-  vxlan_gpe_register_decap_protocol (VXLAN_GPE_PROTOCOL_IP4,
-                                     VXLAN_GPE_INPUT_NEXT_IP4_INPUT);
-  vxlan_gpe_register_decap_protocol (VXLAN_GPE_PROTOCOL_IP6,
-                                     VXLAN_GPE_INPUT_NEXT_IP6_INPUT);
-  vxlan_gpe_register_decap_protocol (VXLAN_GPE_PROTOCOL_ETHERNET,
-                                     VXLAN_GPE_INPUT_NEXT_ETHERNET_INPUT);
-  return 0;
-}
-
-VLIB_INIT_FUNCTION(vxlan_gpe_init);
-
diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe.h b/vnet/vnet/vxlan-gpe/vxlan_gpe.h
deleted file mode 100644
index 1b4bc44e..00000000
--- a/vnet/vnet/vxlan-gpe/vxlan_gpe.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- *  @file
- *  @brief VXLAN GPE definitions
- *
-*/
-#ifndef included_vnet_vxlan_gpe_h
-#define included_vnet_vxlan_gpe_h
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vnet/ip/udp.h>
-
-/**
- * @brief VXLAN GPE header struct
- *
- */
-typedef CLIB_PACKED (struct {
-  /** 20 bytes */
-  ip4_header_t ip4;
-  /** 8 bytes */
-  udp_header_t udp;
-  /** 8 bytes */
-  vxlan_gpe_header_t vxlan;
-}) ip4_vxlan_gpe_header_t;
-
-typedef CLIB_PACKED (struct {
-  /** 40 bytes */
-  ip6_header_t ip6;
-  /** 8 bytes */
-  udp_header_t udp;
-  /** 8 bytes */
-  vxlan_gpe_header_t vxlan;
-}) ip6_vxlan_gpe_header_t;
-
-/**
- * @brief Key struct for IPv4 VXLAN GPE tunnel.
- * Key fields: local remote, vni
- * all fields in NET byte order
- * VNI shifted 8 bits
- */
-typedef CLIB_PACKED(struct {
-  union {
-    struct {
-      u32 local;
-      u32 remote;
-
-      u32 vni;
-      u32 pad;
-    };
-    u64 as_u64[2];
-  };
-}) vxlan4_gpe_tunnel_key_t;
-
-/**
- * @brief Key struct for IPv6 VXLAN GPE tunnel.
- * Key fields: local remote, vni
- * all fields in NET byte order
- * VNI shifted 8 bits
- */
-typedef CLIB_PACKED(struct {
-  ip6_address_t local;
-  ip6_address_t remote;
-  u32 vni;
-}) vxlan6_gpe_tunnel_key_t;
-
-/**
- * @brief Struct for VXLAN GPE tunnel
- */
-typedef struct {
-  /** Rewrite string. $$$$ embed vnet_rewrite header */
-  u8 * rewrite;
-
-  /** encapsulated protocol */
-  u8 protocol;
-
-  /** tunnel local address */
-  ip46_address_t local;
-  /** tunnel remote address */
-  ip46_address_t remote;
-
-  /** FIB indices - tunnel partner lookup here */
-  u32 encap_fib_index;
-  /** FIB indices - inner IP packet lookup here */
-  u32 decap_fib_index;
-
-  /** VXLAN GPE VNI in HOST byte order, shifted left 8 bits */
-  u32 vni;
-
-  /** vnet intfc hw_if_index */
-  u32 hw_if_index;
-  /** vnet intfc sw_if_index */
-  u32 sw_if_index;
-
-  /** flags */
-  u32 flags;
-
-  /** rewrite size for dynamic plugins like iOAM */
-  u8  rewrite_size;
-
-  /** Next node after VxLAN-GPE encap */
-  uword encap_next_node;
-} vxlan_gpe_tunnel_t;
-
-/** Flags for vxlan_gpe_tunnel_t */
-#define VXLAN_GPE_TUNNEL_IS_IPV4	1
-
-/** next nodes for VXLAN GPE input */
-#define foreach_vxlan_gpe_input_next        \
-_(DROP, "error-drop")                           \
-_(IP4_INPUT, "ip4-input")                       \
-_(IP6_INPUT, "ip6-input")                       \
-_(ETHERNET_INPUT, "ethernet-input")
-
-/** struct for next nodes for VXLAN GPE input */
-typedef enum {
-#define _(s,n) VXLAN_GPE_INPUT_NEXT_##s,
-  foreach_vxlan_gpe_input_next
-#undef _
-  VXLAN_GPE_INPUT_N_NEXT,
-} vxlan_gpe_input_next_t;
-
-/** struct for VXLAN GPE errors */
-typedef enum {
-#define vxlan_gpe_error(n,s) VXLAN_GPE_ERROR_##n,
-#include <vnet/vxlan-gpe/vxlan_gpe_error.def>
-#undef vxlan_gpe_error
-  VXLAN_GPE_N_ERROR,
-} vxlan_gpe_input_error_t;
-
-/** Struct for VXLAN GPE node state */
-typedef struct {
-  /** vector of encap tunnel instances */
-  vxlan_gpe_tunnel_t *tunnels;
-
-  /** lookup IPv4 VXLAN GPE tunnel by key */
-  uword * vxlan4_gpe_tunnel_by_key;
-  /** lookup IPv6 VXLAN GPE tunnel by key */
-  uword * vxlan6_gpe_tunnel_by_key;
-
-  /** Free vlib hw_if_indices */
-  u32 * free_vxlan_gpe_tunnel_hw_if_indices;
-
-  /** Mapping from sw_if_index to tunnel index */
-  u32 * tunnel_index_by_sw_if_index;
-
-  /** State convenience vlib_main_t */
-  vlib_main_t * vlib_main;
-  /** State convenience vnet_main_t */
-  vnet_main_t * vnet_main;
-
-  /** List of next nodes for the decap indexed on protocol */
-  uword decap_next_node_list[VXLAN_GPE_PROTOCOL_MAX];
-} vxlan_gpe_main_t;
-
-vxlan_gpe_main_t vxlan_gpe_main;
-
-extern vlib_node_registration_t vxlan_gpe_encap_node;
-extern vlib_node_registration_t vxlan4_gpe_input_node;
-extern vlib_node_registration_t vxlan6_gpe_input_node;
-
-u8 * format_vxlan_gpe_encap_trace (u8 * s, va_list * args);
-
-/** Struct for VXLAN GPE add/del args */
-typedef struct {
-  u8 is_add;
-  u8 is_ip6;
-  ip46_address_t local, remote;
-  u8 protocol;
-  u32 encap_fib_index;
-  u32 decap_fib_index;
-  u32 vni;
-} vnet_vxlan_gpe_add_del_tunnel_args_t;
-
-
-int vnet_vxlan_gpe_add_del_tunnel
-(vnet_vxlan_gpe_add_del_tunnel_args_t *a, u32 * sw_if_indexp);
-
-
-int vxlan4_gpe_rewrite (vxlan_gpe_tunnel_t * t, u32 extension_size,
-                        u8 protocol_override, uword encap_next_node);
-int vxlan6_gpe_rewrite (vxlan_gpe_tunnel_t * t, u32 extension_size,
-                       u8 protocol_override, uword encap_next_node);
-
-/**
- * @brief Struct for defining VXLAN GPE next nodes
- */
-typedef enum {
-  VXLAN_GPE_ENCAP_NEXT_IP4_LOOKUP,
-  VXLAN_GPE_ENCAP_NEXT_IP6_LOOKUP,
-  VXLAN_GPE_ENCAP_NEXT_DROP,
-  VXLAN_GPE_ENCAP_N_NEXT
-} vxlan_gpe_encap_next_t;
-
-
-void vxlan_gpe_unregister_decap_protocol (u8 protocol_id, uword next_node_index);
-
-void vxlan_gpe_register_decap_protocol (u8 protocol_id, uword next_node_index);
-
-
-#endif /* included_vnet_vxlan_gpe_h */
diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe_api.c b/vnet/vnet/vxlan-gpe/vxlan_gpe_api.c
deleted file mode 100644
index 012a41da..00000000
--- a/vnet/vnet/vxlan-gpe/vxlan_gpe_api.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- *------------------------------------------------------------------
- * vxlan_gpe_api.c - vxlan_gpe api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <vnet/fib/fib_table.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                             \
-_(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel)                   \
-_(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump)                         \
-
-static void
-  vl_api_vxlan_gpe_add_del_tunnel_t_handler
-  (vl_api_vxlan_gpe_add_del_tunnel_t * mp)
-{
-  vl_api_vxlan_gpe_add_del_tunnel_reply_t *rmp;
-  int rv = 0;
-  vnet_vxlan_gpe_add_del_tunnel_args_t _a, *a = &_a;
-  u32 encap_fib_index, decap_fib_index;
-  u8 protocol;
-  uword *p;
-  ip4_main_t *im = &ip4_main;
-  u32 sw_if_index = ~0;
-
-
-  p = hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id));
-  if (!p)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_FIB;
-      goto out;
-    }
-  encap_fib_index = p[0];
-
-  protocol = mp->protocol;
-
-  /* Interpret decap_vrf_id as an opaque if sending to other-than-ip4-input */
-  if (protocol == VXLAN_GPE_INPUT_NEXT_IP4_INPUT)
-    {
-      p = hash_get (im->fib_index_by_table_id, ntohl (mp->decap_vrf_id));
-      if (!p)
-	{
-	  rv = VNET_API_ERROR_NO_SUCH_INNER_FIB;
-	  goto out;
-	}
-      decap_fib_index = p[0];
-    }
-  else
-    {
-      decap_fib_index = ntohl (mp->decap_vrf_id);
-    }
-
-  /* Check src & dst are different */
-  if ((mp->is_ipv6 && memcmp (mp->local, mp->remote, 16) == 0) ||
-      (!mp->is_ipv6 && memcmp (mp->local, mp->remote, 4) == 0))
-    {
-      rv = VNET_API_ERROR_SAME_SRC_DST;
-      goto out;
-    }
-  memset (a, 0, sizeof (*a));
-
-  a->is_add = mp->is_add;
-  a->is_ip6 = mp->is_ipv6;
-  /* ip addresses sent in network byte order */
-  if (a->is_ip6)
-    {
-      clib_memcpy (&(a->local.ip6), mp->local, 16);
-      clib_memcpy (&(a->remote.ip6), mp->remote, 16);
-    }
-  else
-    {
-      clib_memcpy (&(a->local.ip4), mp->local, 4);
-      clib_memcpy (&(a->remote.ip4), mp->remote, 4);
-    }
-  a->encap_fib_index = encap_fib_index;
-  a->decap_fib_index = decap_fib_index;
-  a->protocol = protocol;
-  a->vni = ntohl (mp->vni);
-  rv = vnet_vxlan_gpe_add_del_tunnel (a, &sw_if_index);
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_VXLAN_GPE_ADD_DEL_TUNNEL_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void send_vxlan_gpe_tunnel_details
-  (vxlan_gpe_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_vxlan_gpe_tunnel_details_t *rmp;
-  ip4_main_t *im4 = &ip4_main;
-  ip6_main_t *im6 = &ip6_main;
-  u8 is_ipv6 = !(t->flags & VXLAN_GPE_TUNNEL_IS_IPV4);
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_VXLAN_GPE_TUNNEL_DETAILS);
-  if (is_ipv6)
-    {
-      memcpy (rmp->local, &(t->local.ip6), 16);
-      memcpy (rmp->remote, &(t->remote.ip6), 16);
-      rmp->encap_vrf_id = htonl (im6->fibs[t->encap_fib_index].ft_table_id);
-      rmp->decap_vrf_id = htonl (im6->fibs[t->decap_fib_index].ft_table_id);
-    }
-  else
-    {
-      memcpy (rmp->local, &(t->local.ip4), 4);
-      memcpy (rmp->remote, &(t->remote.ip4), 4);
-      rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id);
-      rmp->decap_vrf_id = htonl (im4->fibs[t->decap_fib_index].ft_table_id);
-    }
-  rmp->vni = htonl (t->vni);
-  rmp->protocol = t->protocol;
-  rmp->sw_if_index = htonl (t->sw_if_index);
-  rmp->is_ipv6 = is_ipv6;
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void vl_api_vxlan_gpe_tunnel_dump_t_handler
-  (vl_api_vxlan_gpe_tunnel_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  vxlan_gpe_main_t *vgm = &vxlan_gpe_main;
-  vxlan_gpe_tunnel_t *t;
-  u32 sw_if_index;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  if (~0 == sw_if_index)
-    {
-      /* *INDENT-OFF* */
-      pool_foreach (t, vgm->tunnels,
-      ({
-        send_vxlan_gpe_tunnel_details(t, q, mp->context);
-      }));
-      /* *INDENT-ON* */
-    }
-  else
-    {
-      if ((sw_if_index >= vec_len (vgm->tunnel_index_by_sw_if_index)) ||
-	  (~0 == vgm->tunnel_index_by_sw_if_index[sw_if_index]))
-	{
-	  return;
-	}
-      t = &vgm->tunnels[vgm->tunnel_index_by_sw_if_index[sw_if_index]];
-      send_vxlan_gpe_tunnel_details (t, q, mp->context);
-    }
-}
-
-
-/*
- * vpe_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_span;
-#undef _
-}
-
-static clib_error_t *
-vxlan_gpe_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (vxlan_gpe_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe_error.def b/vnet/vnet/vxlan-gpe/vxlan_gpe_error.def
deleted file mode 100644
index 9cf1b1cb..00000000
--- a/vnet/vnet/vxlan-gpe/vxlan_gpe_error.def
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-vxlan_gpe_error (DECAPSULATED, "good packets decapsulated")
-vxlan_gpe_error (NO_SUCH_TUNNEL, "no such tunnel packets")
diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe_packet.h b/vnet/vnet/vxlan-gpe/vxlan_gpe_packet.h
deleted file mode 100644
index ec3c2e58..00000000
--- a/vnet/vnet/vxlan-gpe/vxlan_gpe_packet.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- *  @file
- *  @brief VXLAN GPE packet header structure
- *
-*/
-#ifndef included_vxlan_gpe_packet_h
-#define included_vxlan_gpe_packet_h
-
-/**
- *   From draft-quinn-vxlan-gpe-03.txt
- *
- *    0                   1                   2                   3
- *    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   |R|R|R|R|I|P|R|O|Ver|   Reserved                |Next Protocol  |
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   |                VXLAN Network Identifier (VNI) |   Reserved    |
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- *   I Bit: Flag bit 4 indicates that the VNI is valid. 
- *
- *   P Bit:  Flag bit 5 is defined as the Next Protocol bit.  The P bit
- *      MUST be set to 1 to indicate the presence of the 8 bit next
- *      protocol field.
- *
- *   O Bit: Flag bit 7 is defined as the O bit. When the O bit is set to 1, 
- *
- *      the packet is an OAM packet and OAM processing MUST occur.  The OAM
- *      protocol details are out of scope for this document.  As with the
- *      P-bit, bit 7 is currently a reserved flag in VXLAN.
- *
- *   VXLAN-gpe bits 8 and 9 are defined as version bits.  These bits are
- *   reserved in VXLAN.  The version field is used to ensure backward
- *   compatibility going forward with future VXLAN-gpe updates.
- *
- *   The initial version for VXLAN-gpe is 0.
- *
- *   This draft defines the following Next Protocol values:
- *
- *      0x1 : IPv4
- *      0x2 : IPv6
- *      0x3 : Ethernet
- *      0x4 : Network Service Header [NSH]
- */
-
-/**
- * @brief VXLAN GPE support inner protocol definition.
- * 1 - IP4
- * 2 - IP6
- * 3 - ETHERNET
- * 4 - NSH
- */
-#define foreach_vxlan_gpe_protocol \
-_ (0x01, IP4)                         \
-_ (0x02, IP6)                         \
-_ (0x03, ETHERNET)		     \
-_ (0x04, NSH)		     \
-_ (0x05, IOAM)
-
-
-/**
- * @brief Struct for VXLAN GPE support inner protocol definition.
- * 1 - IP4
- * 2 - IP6
- * 3 - ETHERNET
- * 4 - NSH
- * 5 - IOAM
- */
-typedef enum {
-#define _(n,f) VXLAN_GPE_PROTOCOL_##f = n,
-  foreach_vxlan_gpe_protocol
-#undef _
-  VXLAN_GPE_PROTOCOL_MAX,
-} vxlan_gpe_protocol_t;
-
-/**
- * @brief VXLAN GPE Header definition
- */
-typedef struct {
-  u8 flags;
-  /** Version and Reserved */
-  u8 ver_res;
-  /** Reserved */
-  u8 res;
-  /** see vxlan_gpe_protocol_t */
-  u8 protocol;
-  /** VNI and Reserved */
-  u32 vni_res;
-} vxlan_gpe_header_t;
-
-#define VXLAN_GPE_FLAGS_I 0x08
-#define VXLAN_GPE_FLAGS_P 0x04
-#define VXLAN_GPE_FLAGS_O 0x01
-#define VXLAN_GPE_VERSION 0x0
-
-#endif /* included_vxlan_gpe_packet_h */
diff --git a/vnet/vnet/vxlan/decap.c b/vnet/vnet/vxlan/decap.c
deleted file mode 100644
index 73e50ffe..00000000
--- a/vnet/vnet/vxlan/decap.c
+++ /dev/null
@@ -1,1130 +0,0 @@
-/*
- * decap.c: vxlan tunnel decap packet processing
- *
- * Copyright (c) 2013 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
-#include <vnet/vxlan/vxlan.h>
-
-vlib_node_registration_t vxlan4_input_node;
-vlib_node_registration_t vxlan6_input_node;
-
-typedef struct {
-  u32 next_index;
-  u32 tunnel_index;
-  u32 error;
-  u32 vni;
-} vxlan_rx_trace_t;
-
-static u8 * format_vxlan_rx_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  vxlan_rx_trace_t * t = va_arg (*args, vxlan_rx_trace_t *);
-
-  if (t->tunnel_index != ~0)
-    {
-      s = format (s, "VXLAN decap from vxlan_tunnel%d vni %d next %d error %d",
-                  t->tunnel_index, t->vni, t->next_index, t->error);
-    }
-  else
-    {
-      s = format (s, "VXLAN decap error - tunnel for vni %d does not exist", 
-		  t->vni);
-    }
-  return s;
-}
-
-always_inline uword
-vxlan_input (vlib_main_t * vm,
-             vlib_node_runtime_t * node,
-             vlib_frame_t * from_frame,
-             u32 is_ip4)
-{
-  u32 n_left_from, next_index, * from, * to_next;
-  vxlan_main_t * vxm = &vxlan_main;
-  vnet_main_t * vnm = vxm->vnet_main;
-  vnet_interface_main_t * im = &vnm->interface_main;
-  u32 last_tunnel_index = ~0;
-  vxlan4_tunnel_key_t last_key4;
-  vxlan6_tunnel_key_t last_key6;
-  u32 pkts_decapsulated = 0;
-  u32 cpu_index = os_get_cpu_number();
-  u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
-
-  if (is_ip4)
-    last_key4.as_u64 = ~0;
-  else
-    memset (&last_key6, 0xff, sizeof (last_key6));
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-  stats_sw_if_index = node->runtime_data[0];
-  stats_n_packets = stats_n_bytes = 0;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-          u32 bi0, bi1;
-	  vlib_buffer_t * b0, * b1;
-	  u32 next0, next1;
-          ip4_header_t * ip4_0, * ip4_1;
-          ip6_header_t * ip6_0, * ip6_1;
-          vxlan_header_t * vxlan0, * vxlan1;
-	  uword * p0, * p1;
-          u32 tunnel_index0, tunnel_index1;
-          vxlan_tunnel_t * t0, * t1, * mt0 = NULL, * mt1 = NULL;
-          vxlan4_tunnel_key_t key4_0, key4_1;
-          vxlan6_tunnel_key_t key6_0, key6_1;
-          u32 error0, error1;
-	  u32 sw_if_index0, sw_if_index1, len0, len1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * p2, * p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
-	    CLIB_PREFETCH (p3->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-          /* udp leaves current_data pointing at the vxlan header */
-          vxlan0 = vlib_buffer_get_current (b0);
-          vxlan1 = vlib_buffer_get_current (b1);
-          if (is_ip4) {
-	    vlib_buffer_advance
-	      (b0, -(word)(sizeof(udp_header_t)+sizeof(ip4_header_t)));
-	    vlib_buffer_advance
-	      (b1, -(word)(sizeof(udp_header_t)+sizeof(ip4_header_t)));
-            ip4_0 = vlib_buffer_get_current (b0);
-            ip4_1 = vlib_buffer_get_current (b1);
-	  } else {
-            vlib_buffer_advance
-              (b0, -(word)(sizeof(udp_header_t)+sizeof(ip6_header_t)));
-            vlib_buffer_advance
-              (b1, -(word)(sizeof(udp_header_t)+sizeof(ip6_header_t)));
-            ip6_0 = vlib_buffer_get_current (b0);
-            ip6_1 = vlib_buffer_get_current (b1);
-	  }
-
-          /* pop (ip, udp, vxlan) */
-          if (is_ip4) {
-            vlib_buffer_advance
-              (b0, sizeof(*ip4_0)+sizeof(udp_header_t)+sizeof(*vxlan0));
-	    vlib_buffer_advance
-              (b1, sizeof(*ip4_1)+sizeof(udp_header_t)+sizeof(*vxlan1));
-          } else {
-	    vlib_buffer_advance
-              (b0, sizeof(*ip6_0)+sizeof(udp_header_t)+sizeof(*vxlan0));
-            vlib_buffer_advance
-              (b1, sizeof(*ip6_1)+sizeof(udp_header_t)+sizeof(*vxlan1));
-          }
-
-          tunnel_index0 = ~0;
-          error0 = 0;
-
-          tunnel_index1 = ~0;
-          error1 = 0;
-
-	  if (PREDICT_FALSE (vxlan0->flags != VXLAN_FLAGS_I))
-	    {
-	      error0 = VXLAN_ERROR_BAD_FLAGS;
-	      next0 = VXLAN_INPUT_NEXT_DROP;
-	      goto trace0;
-	    }
-
-          if (is_ip4) {
-            key4_0.src = ip4_0->src_address.as_u32;
-            key4_0.vni = vxlan0->vni_reserved;
-
- 	    /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
-           if (PREDICT_FALSE (key4_0.as_u64 != last_key4.as_u64))
-              {
-                p0 = hash_get (vxm->vxlan4_tunnel_by_key, key4_0.as_u64);
-                if (PREDICT_FALSE (p0 == NULL))
-                  {
-                    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-                    next0 = VXLAN_INPUT_NEXT_DROP;
-                    goto trace0;
-                  }
-                last_key4.as_u64 = key4_0.as_u64;
-                tunnel_index0 = last_tunnel_index = p0[0];
-              }
-            else
-              tunnel_index0 = last_tunnel_index;
-	    t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
-
- 	    /* Validate VXLAN tunnel SIP against packet DIP */
-	    if (PREDICT_TRUE (ip4_0->dst_address.as_u32 == t0->src.ip4.as_u32))
-	      goto next0; /* valid packet */
-	    if (PREDICT_FALSE (ip4_address_is_multicast (&ip4_0->dst_address)))
-	      {
-		key4_0.src = ip4_0->dst_address.as_u32;
-		key4_0.vni = vxlan0->vni_reserved;
-		/* Make sure mcast VXLAN tunnel exist by packet DIP and VNI */
-		p0 = hash_get (vxm->vxlan4_tunnel_by_key, key4_0.as_u64);
-		if (PREDICT_TRUE (p0 != NULL))
-		  {
-		    mt0 = pool_elt_at_index (vxm->tunnels, p0[0]);
-		    goto next0; /* valid packet */
-		  }
-	      }
-	    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-	    next0 = VXLAN_INPUT_NEXT_DROP;
-	    goto trace0;
-
-         } else /* !is_ip4 */ {
-            key6_0.src.as_u64[0] = ip6_0->src_address.as_u64[0];
-            key6_0.src.as_u64[1] = ip6_0->src_address.as_u64[1];
-            key6_0.vni = vxlan0->vni_reserved;
-
- 	    /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
-           if (PREDICT_FALSE (memcmp(&key6_0, &last_key6, sizeof(last_key6)) != 0))
-              {
-                p0 = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6_0);
-                if (PREDICT_FALSE (p0 == NULL))
-                  {
-                    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-                    next0 = VXLAN_INPUT_NEXT_DROP;
-                    goto trace0;
-                  }
-                clib_memcpy (&last_key6, &key6_0, sizeof(key6_0));
-                tunnel_index0 = last_tunnel_index = p0[0];
-              }
-            else
-              tunnel_index0 = last_tunnel_index;
-	    t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
-
-	    /* Validate VXLAN tunnel SIP against packet DIP */
-	    if (PREDICT_TRUE (ip6_address_is_equal (&ip6_0->dst_address,
-						    &t0->src.ip6)))
-		goto next0; /* valid packet */
-	    if (PREDICT_FALSE (ip6_address_is_multicast (&ip6_0->dst_address)))
-	      {
-		key6_0.src.as_u64[0] = ip6_0->dst_address.as_u64[0];
-		key6_0.src.as_u64[1] = ip6_0->dst_address.as_u64[1];
-		key6_0.vni = vxlan0->vni_reserved;
-		p0 = hash_get (vxm->vxlan6_tunnel_by_key, &key6_0);
-		if (PREDICT_TRUE (p0 != NULL)) 
-		  {
-		    mt0 = pool_elt_at_index (vxm->tunnels, p0[0]);
-		    goto next0; /* valid packet */
-		  }
-	      }
-	    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-	    next0 = VXLAN_INPUT_NEXT_DROP;
-	    goto trace0;
-          }
-
-	next0:
-          next0 = t0->decap_next_index;
-          sw_if_index0 = t0->sw_if_index;
-          len0 = vlib_buffer_length_in_chain (vm, b0);
-
-          /* Required to make the l2 tag push / pop code work on l2 subifs */
-          if (PREDICT_TRUE(next0 == VXLAN_INPUT_NEXT_L2_INPUT))
-            vnet_update_l2_len (b0);
-
-          /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
-          vnet_buffer(b0)->sw_if_index[VLIB_RX] = sw_if_index0;
-	  sw_if_index0 = (mt0) ? mt0->sw_if_index : sw_if_index0;
-
-          pkts_decapsulated ++;
-          stats_n_packets += 1;
-          stats_n_bytes += len0;
-
-	  /* Batch stats increment on the same vxlan tunnel so counter
-	     is not incremented per packet */
-	  if (PREDICT_FALSE (sw_if_index0 != stats_sw_if_index)) 
-	    {
-	      stats_n_packets -= 1;
-	      stats_n_bytes -= len0;
-	      if (stats_n_packets)
-		vlib_increment_combined_counter 
-		  (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-		   cpu_index, stats_sw_if_index, 
-		   stats_n_packets, stats_n_bytes);
-	      stats_n_packets = 1;
-	      stats_n_bytes = len0;
-	      stats_sw_if_index = sw_if_index0;
-	    }
-
-        trace0:
-          b0->error = error0 ? node->errors[error0] : 0;
-
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
-            {
-              vxlan_rx_trace_t *tr 
-                = vlib_add_trace (vm, node, b0, sizeof (*tr));
-              tr->next_index = next0;
-              tr->error = error0;
-              tr->tunnel_index = tunnel_index0;
-              tr->vni = vnet_get_vni (vxlan0);
-            }
-
-	  if (PREDICT_FALSE (vxlan1->flags != VXLAN_FLAGS_I))
-	    {
-	      error1 = VXLAN_ERROR_BAD_FLAGS;
-	      next1 = VXLAN_INPUT_NEXT_DROP;
-	      goto trace1;
-	    }
-
-          if (is_ip4) {
-            key4_1.src = ip4_1->src_address.as_u32;
-            key4_1.vni = vxlan1->vni_reserved;
-
-	    /* Make sure unicast VXLAN tunnel exist by packet SIP and VNI */
-	    if (PREDICT_FALSE (key4_1.as_u64 != last_key4.as_u64))
-              {
-                p1 = hash_get (vxm->vxlan4_tunnel_by_key, key4_1.as_u64);
-                if (PREDICT_FALSE (p1 == NULL))
-                  {
-                    error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-                    next1 = VXLAN_INPUT_NEXT_DROP;
-                    goto trace1;
-                  }
-                last_key4.as_u64 = key4_1.as_u64;
-                tunnel_index1 = last_tunnel_index = p1[0];
-              }
-            else
-              tunnel_index1 = last_tunnel_index;
- 	    t1 = pool_elt_at_index (vxm->tunnels, tunnel_index1);
-
-	    /* Validate VXLAN tunnel SIP against packet DIP */
-	    if (PREDICT_TRUE (ip4_1->dst_address.as_u32 == t1->src.ip4.as_u32))
-	      goto next1; /* valid packet */
-	    if (PREDICT_FALSE (ip4_address_is_multicast (&ip4_1->dst_address)))
-	      {
-		key4_1.src = ip4_1->dst_address.as_u32;
-		key4_1.vni = vxlan1->vni_reserved;
-		/* Make sure mcast VXLAN tunnel exist by packet DIP and VNI */
-		p1 = hash_get (vxm->vxlan4_tunnel_by_key, key4_1.as_u64);
-		if (PREDICT_TRUE (p1 != NULL))
-		  {
-		    mt1 = pool_elt_at_index (vxm->tunnels, p1[0]);
-		    goto next1; /* valid packet */
-		  }
-	      }
-	    error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-	    next1 = VXLAN_INPUT_NEXT_DROP;
-	    goto trace1;
-
-         } else /* !is_ip4 */ {
-            key6_1.src.as_u64[0] = ip6_1->src_address.as_u64[0];
-            key6_1.src.as_u64[1] = ip6_1->src_address.as_u64[1];
-            key6_1.vni = vxlan1->vni_reserved;
-
-	    /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
-            if (PREDICT_FALSE (memcmp(&key6_1, &last_key6, sizeof(last_key6)) != 0))
-              {
-                p1 = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6_1);
-
-                if (PREDICT_FALSE (p1 == NULL))
-                  {
-                    error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-                    next1 = VXLAN_INPUT_NEXT_DROP;
-                    goto trace1;
-                  }
-
-                clib_memcpy (&last_key6, &key6_1, sizeof(key6_1));
-                tunnel_index1 = last_tunnel_index = p1[0];
-              }
-            else
-              tunnel_index1 = last_tunnel_index;
- 	    t1 = pool_elt_at_index (vxm->tunnels, tunnel_index1);
-
-	    /* Validate VXLAN tunnel SIP against packet DIP */
-	    if (PREDICT_TRUE (ip6_address_is_equal (&ip6_1->dst_address,
-						    &t1->src.ip6)))
-		goto next1; /* valid packet */
-	    if (PREDICT_FALSE (ip6_address_is_multicast (&ip6_1->dst_address)))
-	      {
-		key6_1.src.as_u64[0] = ip6_1->dst_address.as_u64[0];
-		key6_1.src.as_u64[1] = ip6_1->dst_address.as_u64[1];
-		key6_1.vni = vxlan1->vni_reserved;
-		p1 = hash_get (vxm->vxlan6_tunnel_by_key, &key6_1);
-		if (PREDICT_TRUE (p1 != NULL)) 
-		  {
-		    mt1 = pool_elt_at_index (vxm->tunnels, p1[0]);
-		    goto next1; /* valid packet */
-		  }
-	      }
-	    error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-	    next1 = VXLAN_INPUT_NEXT_DROP;
-	    goto trace1;
-	  }
-
-	next1:
-          next1 = t1->decap_next_index;
-          sw_if_index1 = t1->sw_if_index;
-          len1 = vlib_buffer_length_in_chain (vm, b1);
-
-          /* Required to make the l2 tag push / pop code work on l2 subifs */
-          if (PREDICT_TRUE(next1 == VXLAN_INPUT_NEXT_L2_INPUT))
-            vnet_update_l2_len (b1);
-
-          /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
-          vnet_buffer(b1)->sw_if_index[VLIB_RX] = sw_if_index1;
-	  sw_if_index1 = (mt1) ? mt1->sw_if_index : sw_if_index1;
-
-          pkts_decapsulated ++;
-          stats_n_packets += 1;
-          stats_n_bytes += len1;
-
-	  /* Batch stats increment on the same vxlan tunnel so counter
-	     is not incremented per packet */
-	  if (PREDICT_FALSE (sw_if_index1 != stats_sw_if_index)) 
-	    {
-	      stats_n_packets -= 1;
-	      stats_n_bytes -= len1;
-	      if (stats_n_packets)
-		vlib_increment_combined_counter 
-		  (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-		   cpu_index, stats_sw_if_index, 
-		   stats_n_packets, stats_n_bytes);
-	      stats_n_packets = 1;
-	      stats_n_bytes = len1;
-	      stats_sw_if_index = sw_if_index1;
-	    }
-
-        trace1:
-          b1->error = error1 ? node->errors[error1] : 0;
-
-          if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED)) 
-            {
-              vxlan_rx_trace_t *tr 
-                = vlib_add_trace (vm, node, b1, sizeof (*tr));
-              tr->next_index = next1;
-              tr->error = error1;
-              tr->tunnel_index = tunnel_index1;
-              tr->vni = vnet_get_vni (vxlan1);
-            }
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t * b0;
-	  u32 next0;
-          ip4_header_t * ip4_0;
-          ip6_header_t * ip6_0;
-          vxlan_header_t * vxlan0;
-	  uword * p0;
-          u32 tunnel_index0;
-          vxlan_tunnel_t * t0, * mt0 = NULL;
-          vxlan4_tunnel_key_t key4_0;
-          vxlan6_tunnel_key_t key6_0;
-          u32 error0;
-	  u32 sw_if_index0, len0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-          /* udp leaves current_data pointing at the vxlan header */
-          vxlan0 = vlib_buffer_get_current (b0);
-          if (is_ip4) {
-	    vlib_buffer_advance
-	      (b0, -(word)(sizeof(udp_header_t)+sizeof(ip4_header_t)));
-            ip4_0 = vlib_buffer_get_current (b0);
-          } else {
-            vlib_buffer_advance
-              (b0, -(word)(sizeof(udp_header_t)+sizeof(ip6_header_t)));
-            ip6_0 = vlib_buffer_get_current (b0);
-          }
-
-          /* pop (ip, udp, vxlan) */
-          if (is_ip4) {
-            vlib_buffer_advance
-              (b0, sizeof(*ip4_0)+sizeof(udp_header_t)+sizeof(*vxlan0));
-          } else {
-	    vlib_buffer_advance
-              (b0, sizeof(*ip6_0)+sizeof(udp_header_t)+sizeof(*vxlan0));
-          }
-
-          tunnel_index0 = ~0;
-          error0 = 0;
-
-	  if (PREDICT_FALSE (vxlan0->flags != VXLAN_FLAGS_I))
-	    {
-	      error0 = VXLAN_ERROR_BAD_FLAGS;
-	      next0 = VXLAN_INPUT_NEXT_DROP;
-	      goto trace00;
-	    }
-
-          if (is_ip4) {
-            key4_0.src = ip4_0->src_address.as_u32;
-            key4_0.vni = vxlan0->vni_reserved;
-
-	    /* Make sure unicast VXLAN tunnel exist by packet SIP and VNI */
-            if (PREDICT_FALSE (key4_0.as_u64 != last_key4.as_u64))
-              {
-                p0 = hash_get (vxm->vxlan4_tunnel_by_key, key4_0.as_u64);
-                if (PREDICT_FALSE (p0 == NULL))
-                  {
-                    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-                    next0 = VXLAN_INPUT_NEXT_DROP;
-                    goto trace00;
-                  }
-                last_key4.as_u64 = key4_0.as_u64;
-                tunnel_index0 = last_tunnel_index = p0[0];
-              }
-            else
-              tunnel_index0 = last_tunnel_index;
-	    t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
-
-	    /* Validate VXLAN tunnel SIP against packet DIP */
-	    if (PREDICT_TRUE (ip4_0->dst_address.as_u32 == t0->src.ip4.as_u32))
-	      goto next00; /* valid packet */
-	    if (PREDICT_FALSE (ip4_address_is_multicast (&ip4_0->dst_address)))
-	      {
-		key4_0.src = ip4_0->dst_address.as_u32;
-		key4_0.vni = vxlan0->vni_reserved;
-		/* Make sure mcast VXLAN tunnel exist by packet DIP and VNI */
-		p0 = hash_get (vxm->vxlan4_tunnel_by_key, key4_0.as_u64);
-		if (PREDICT_TRUE (p0 != NULL))
-		  {
-		    mt0 = pool_elt_at_index (vxm->tunnels, p0[0]);
-		    goto next00; /* valid packet */
-		  }
-	      }
-	    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-	    next0 = VXLAN_INPUT_NEXT_DROP;
-	    goto trace00;
-
-          } else /* !is_ip4 */ {
-            key6_0.src.as_u64[0] = ip6_0->src_address.as_u64[0];
-            key6_0.src.as_u64[1] = ip6_0->src_address.as_u64[1];
-            key6_0.vni = vxlan0->vni_reserved;
-
-	    /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
-            if (PREDICT_FALSE (memcmp(&key6_0, &last_key6, sizeof(last_key6)) != 0))
-              {
-                p0 = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6_0);
-                if (PREDICT_FALSE (p0 == NULL))
-                  {
-                    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-                    next0 = VXLAN_INPUT_NEXT_DROP;
-                    goto trace00;
-                  }
-                clib_memcpy (&last_key6, &key6_0, sizeof(key6_0));
-                tunnel_index0 = last_tunnel_index = p0[0];
-              }
-            else
-              tunnel_index0 = last_tunnel_index;
-	    t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
-
-	    /* Validate VXLAN tunnel SIP against packet DIP */
-	    if (PREDICT_TRUE (ip6_address_is_equal (&ip6_0->dst_address,
-						    &t0->src.ip6)))
-		goto next00; /* valid packet */
-	    if (PREDICT_FALSE (ip6_address_is_multicast (&ip6_0->dst_address)))
-	      {
-		key6_0.src.as_u64[0] = ip6_0->dst_address.as_u64[0];
-		key6_0.src.as_u64[1] = ip6_0->dst_address.as_u64[1];
-		key6_0.vni = vxlan0->vni_reserved;
-		p0 = hash_get (vxm->vxlan6_tunnel_by_key, &key6_0);
-		if (PREDICT_TRUE (p0 != NULL)) 
-		  {
-		    mt0 = pool_elt_at_index (vxm->tunnels, p0[0]);
-		    goto next00; /* valid packet */
-		  }
-	      }
-	    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-	    next0 = VXLAN_INPUT_NEXT_DROP;
-	    goto trace00;
-          }
-
-	next00:
-          next0 = t0->decap_next_index;
-          sw_if_index0 = t0->sw_if_index;
-          len0 = vlib_buffer_length_in_chain (vm, b0);
-
-          /* Required to make the l2 tag push / pop code work on l2 subifs */
-          if (PREDICT_TRUE(next0 == VXLAN_INPUT_NEXT_L2_INPUT))
-            vnet_update_l2_len (b0);
-
-          /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
-          vnet_buffer(b0)->sw_if_index[VLIB_RX] = sw_if_index0;
-	  sw_if_index0 = (mt0) ? mt0->sw_if_index : sw_if_index0;
-
-          pkts_decapsulated ++;
-          stats_n_packets += 1;
-          stats_n_bytes += len0;
-
-	  /* Batch stats increment on the same vxlan tunnel so counter
-	     is not incremented per packet */
-	  if (PREDICT_FALSE (sw_if_index0 != stats_sw_if_index)) 
-	    {
-	      stats_n_packets -= 1;
-	      stats_n_bytes -= len0;
-	      if (stats_n_packets)
-		vlib_increment_combined_counter 
-		  (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-		   cpu_index, stats_sw_if_index, 
-		   stats_n_packets, stats_n_bytes);
-	      stats_n_packets = 1;
-	      stats_n_bytes = len0;
-	      stats_sw_if_index = sw_if_index0;
-	    }
-
-        trace00:
-          b0->error = error0 ? node->errors[error0] : 0;
-
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
-            {
-              vxlan_rx_trace_t *tr 
-                = vlib_add_trace (vm, node, b0, sizeof (*tr));
-              tr->next_index = next0;
-              tr->error = error0;
-              tr->tunnel_index = tunnel_index0;
-              tr->vni = vnet_get_vni (vxlan0);
-            }
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  /* Do we still need this now that tunnel tx stats is kept? */
-  vlib_node_increment_counter (vm, is_ip4? 
-			       vxlan4_input_node.index:vxlan6_input_node.index,
-                               VXLAN_ERROR_DECAPSULATED, 
-                               pkts_decapsulated);
-
-  /* Increment any remaining batch stats */
-  if (stats_n_packets)
-    {
-      vlib_increment_combined_counter 
-	(im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-	 cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
-      node->runtime_data[0] = stats_sw_if_index;
-    }
-
-  return from_frame->n_vectors;
-}
-
-static uword
-vxlan4_input (vlib_main_t * vm,
-             vlib_node_runtime_t * node,
-             vlib_frame_t * from_frame)
-{
-	return vxlan_input(vm, node, from_frame, /* is_ip4 */ 1);
-}
-
-static uword
-vxlan6_input (vlib_main_t * vm,
-             vlib_node_runtime_t * node,
-             vlib_frame_t * from_frame)
-{
-	return vxlan_input(vm, node, from_frame, /* is_ip4 */ 0);
-}
-
-static char * vxlan_error_strings[] = {
-#define vxlan_error(n,s) s,
-#include <vnet/vxlan/vxlan_error.def>
-#undef vxlan_error
-#undef _
-};
-
-VLIB_REGISTER_NODE (vxlan4_input_node) = {
-  .function = vxlan4_input,
-  .name = "vxlan4-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .n_errors = VXLAN_N_ERROR,
-  .error_strings = vxlan_error_strings,
-
-  .n_next_nodes = VXLAN_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [VXLAN_INPUT_NEXT_##s] = n,
-    foreach_vxlan_input_next
-#undef _
-  },
-
-//temp  .format_buffer = format_vxlan_header,
-  .format_trace = format_vxlan_rx_trace,
-  // $$$$ .unformat_buffer = unformat_vxlan_header,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (vxlan4_input_node, vxlan4_input)
-
-VLIB_REGISTER_NODE (vxlan6_input_node) = {
-  .function = vxlan6_input,
-  .name = "vxlan6-input",
-  /* Takes a vector of packets. */
-  .vector_size = sizeof (u32),
-
-  .n_errors = VXLAN_N_ERROR,
-  .error_strings = vxlan_error_strings,
-
-  .n_next_nodes = VXLAN_INPUT_N_NEXT,
-  .next_nodes = {
-#define _(s,n) [VXLAN_INPUT_NEXT_##s] = n,
-    foreach_vxlan_input_next
-#undef _
-  },
-
-//temp  .format_buffer = format_vxlan_header,
-  .format_trace = format_vxlan_rx_trace,
-  // $$$$ .unformat_buffer = unformat_vxlan_header,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (vxlan6_input_node, vxlan6_input)
-
-
-typedef enum {
-  IP_VXLAN_BYPASS_NEXT_DROP,
-  IP_VXLAN_BYPASS_NEXT_VXLAN,
-  IP_VXLAN_BYPASS_N_NEXT,
-} ip_vxan_bypass_next_t;
-
-always_inline uword
-ip_vxlan_bypass_inline (vlib_main_t * vm,
-			 vlib_node_runtime_t * node,
-			 vlib_frame_t * frame,
-			 u32 is_ip4)
-{
-  vxlan_main_t * vxm = &vxlan_main;
-  u32 * from, * to_next, n_left_from, n_left_to_next, next_index;
-  vlib_node_runtime_t * error_node = vlib_node_get_runtime (vm, ip4_input_node.index);
-  ip4_address_t addr4; /* last IPv4 address matching a local VTEP address */
-  ip6_address_t addr6; /* last IPv6 address matching a local VTEP address */
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
-
-  if (is_ip4) addr4.data_u32 = ~0;
-  else ip6_address_set_zero (&addr6);
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-      	{
-      	  vlib_buffer_t * b0, * b1;
-      	  ip4_header_t * ip0, * ip1;
-      	  udp_header_t * udp0, * udp1;
-      	  u32 bi0, ip_len0, udp_len0, flags0, next0;
-      	  u32 bi1, ip_len1, udp_len1, flags1, next1;
-      	  i32 len_diff0, len_diff1;
-      	  u8 error0, good_udp0, proto0;
-      	  u8 error1, good_udp1, proto1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * p2, * p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
-	    CLIB_PREFETCH (p3->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
-	  }
-
-      	  bi0 = to_next[0] = from[0];
-      	  bi1 = to_next[1] = from[1];
-      	  from += 2;
-      	  n_left_from -= 2;
-      	  to_next += 2;
-      	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-	  ip0 = vlib_buffer_get_current (b0);
-	  ip1 = vlib_buffer_get_current (b1);
-
-	  /* Setup packet for next IP feature */
-	  vnet_feature_next(vnet_buffer(b0)->sw_if_index[VLIB_RX], &next0, b0);
-	  vnet_feature_next(vnet_buffer(b1)->sw_if_index[VLIB_RX], &next1, b1);
-
-	  /* Treat IP frag packets as "experimental" protocol for now
-	     until support of IP frag reassembly is implemented */
-	  proto0 = ip4_is_fragment(ip0) ? 0xfe : ip0->protocol;
-	  proto1 = ip4_is_fragment(ip1) ? 0xfe : ip1->protocol;
-
-	  /* Process packet 0 */
-	  if (proto0 != IP_PROTOCOL_UDP)
-	    goto exit0; /* not UDP packet */
-
-	  udp0 = ip4_next_header (ip0);
-	  if (udp0->dst_port != clib_host_to_net_u16 (UDP_DST_PORT_vxlan))
-	    goto exit0; /* not VXLAN packet */
-
-	  if (is_ip4) 
-	    {
-	      if (addr4.as_u32 != ip0->dst_address.as_u32)
-	        {
-		  if (!hash_get (vxm->vtep4, ip0->dst_address.as_u32))
-		    goto exit0; /* no local VTEP for VXLAN packet */
-		  addr4 = ip0->dst_address;
-	        }
-	    }
-	  else goto exit0; /* IP6 VXLAN bypass not yet supported */
-
-	  /* vxlan-input node expect current at VXLAN header */
-	  vlib_buffer_advance (b0, sizeof(ip4_header_t)+sizeof(udp_header_t));
-
-	  flags0 = b0->flags;
-	  good_udp0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-
-	  /* Don't verify UDP checksum for packets with explicit zero checksum. */
-	  good_udp0 |= udp0->checksum == 0;
-
-	  /* Verify UDP length */
-	  ip_len0 = clib_net_to_host_u16 (ip0->length);
-	  udp_len0 = clib_net_to_host_u16 (udp0->length);
-
-	  len_diff0 = ip_len0 - udp_len0;
-
-	  /* Verify UDP checksum */
-	  if (PREDICT_FALSE (!good_udp0))
-	    {
-	      if (!(flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
-		  flags0 = ip4_tcp_udp_validate_checksum (vm, b0);
-	      good_udp0 =
-		  (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-	    }
-
-	  error0 = good_udp0 ? 0 : IP4_ERROR_UDP_CHECKSUM;
-	  error0 = (len_diff0 >= 0) ? error0 : IP4_ERROR_UDP_LENGTH;
-
-	  next0 = error0 ? 
-	    IP_VXLAN_BYPASS_NEXT_DROP : IP_VXLAN_BYPASS_NEXT_VXLAN;
-	  b0->error = error0 ? error_node->errors[error0] : 0;
-
-	exit0:
-	  /* Process packet 1 */
-	  if (proto1 != IP_PROTOCOL_UDP)
-	    goto exit1; /* not UDP packet */
-
-	  udp1 = ip4_next_header (ip1);
-	  if (udp1->dst_port != clib_host_to_net_u16 (UDP_DST_PORT_vxlan))
-	    goto exit1; /* not VXLAN packet */
-
-	  if (is_ip4) 
-	    {
-	      if (addr4.as_u32 != ip1->dst_address.as_u32)
-	        {
-		  if (!hash_get (vxm->vtep4, ip1->dst_address.as_u32))
-		    goto exit1; /* no local VTEP for VXLAN packet */
-		  addr4 = ip1->dst_address;
-	        }
-	    }
-	  else goto exit1; /* IP6 VXLAN bypass not yet supported */
-
-	  /* vxlan-input node expect current at VXLAN header */
-	  vlib_buffer_advance (b1, sizeof(ip4_header_t)+sizeof(udp_header_t));
-
-	  flags1 = b1->flags;
-	  good_udp1 = (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-
-	  /* Don't verify UDP checksum for packets with explicit zero checksum. */
-	  good_udp1 |= udp1->checksum == 0;
-
-	  /* Verify UDP length */
-	  ip_len1 = clib_net_to_host_u16 (ip1->length);
-	  udp_len1 = clib_net_to_host_u16 (udp1->length);
-
-	  len_diff1 = ip_len1 - udp_len1;
-
-	  /* Verify UDP checksum */
-	  if (PREDICT_FALSE (!good_udp1))
-	    {
-	      if (!(flags1 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
-		  flags1 = ip4_tcp_udp_validate_checksum (vm, b1);
-	      good_udp1 =
-		  (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-	    }
-
-	  error1 = good_udp1 ? 0 : IP4_ERROR_UDP_CHECKSUM;
-	  error1 = (len_diff1 >= 0) ? error1 : IP4_ERROR_UDP_LENGTH;
-
-	  next1 = error1 ? 
-	    IP_VXLAN_BYPASS_NEXT_DROP : IP_VXLAN_BYPASS_NEXT_VXLAN;
-	  b1->error = error1 ? error_node->errors[error1] : 0;
- 
-	exit1:
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t * b0;
-	  ip4_header_t * ip0;
-	  udp_header_t * udp0;
-      	  u32 bi0, ip_len0, udp_len0, flags0, next0;
-	  i32 len_diff0;
-	  u8 error0, good_udp0, proto0;
-
-	  bi0 = to_next[0] = from[0];
-	  from += 1;
-	  n_left_from -= 1;
-	  to_next += 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  ip0 = vlib_buffer_get_current (b0);
-
-	  /* Setup packet for next IP feature */
-	  vnet_feature_next(vnet_buffer(b0)->sw_if_index[VLIB_RX], &next0, b0);
-
-	  /* Treat IP frag packets as "experimental" protocol for now
-	     until support of IP frag reassembly is implemented */
-	  proto0 = ip4_is_fragment(ip0) ? 0xfe : ip0->protocol;
-
-	  if (proto0 != IP_PROTOCOL_UDP)
-	    goto exit; /* not UDP packet */
-
-	  udp0 = ip4_next_header (ip0);
-	  if (udp0->dst_port != clib_host_to_net_u16 (UDP_DST_PORT_vxlan))
-	    goto exit; /* not VXLAN packet */
-
-	  if (is_ip4) 
-	    {
-	      if (addr4.as_u32 != ip0->dst_address.as_u32)
-	        {
-		  if (!hash_get (vxm->vtep4, ip0->dst_address.as_u32))
-		    goto exit; /* no local VTEP for VXLAN packet */
-		  addr4 = ip0->dst_address;
-	        }
-	    }
-	  else goto exit; /* IP6 VXLAN bypass not yet supported */
-
-	  /* vxlan-input node expect current at VXLAN header */
-	  vlib_buffer_advance (b0, sizeof(ip4_header_t)+sizeof(udp_header_t));
-
-	  flags0 = b0->flags;
-	  good_udp0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-
-	  /* Don't verify UDP checksum for packets with explicit zero checksum. */
-	  good_udp0 |= udp0->checksum == 0;
-
-	  /* Verify UDP length */
-	  ip_len0 = clib_net_to_host_u16 (ip0->length);
-	  udp_len0 = clib_net_to_host_u16 (udp0->length);
-
-	  len_diff0 = ip_len0 - udp_len0;
-
-	  /* Verify UDP checksum */
-	  if (PREDICT_FALSE (!good_udp0))
-	    {
-	      if (!(flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
-		  flags0 = ip4_tcp_udp_validate_checksum (vm, b0);
-	      good_udp0 =
-		  (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-	    }
-
-	  error0 = good_udp0 ? 0 : IP4_ERROR_UDP_CHECKSUM;
-	  error0 = (len_diff0 >= 0) ? error0 : IP4_ERROR_UDP_LENGTH;
-
-	  next0 = error0 ? 
-	    IP_VXLAN_BYPASS_NEXT_DROP : IP_VXLAN_BYPASS_NEXT_VXLAN;
-	  b0->error = error0 ? error_node->errors[error0] : 0;
-
-	exit:
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-static uword
-ip4_vxlan_bypass (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * frame)
-{
-  return ip_vxlan_bypass_inline (vm, node, frame, /* is_ip4 */ 1);
-}
-
-VLIB_REGISTER_NODE (ip4_vxlan_bypass_node) = {
-  .function = ip4_vxlan_bypass,
-  .name = "ip4-vxlan-bypass",
-  .vector_size = sizeof (u32),
-
-  .n_next_nodes = IP_VXLAN_BYPASS_N_NEXT,
-  .next_nodes = {
-    [IP_VXLAN_BYPASS_NEXT_DROP] = "error-drop",
-    [IP_VXLAN_BYPASS_NEXT_VXLAN] = "vxlan4-input",
-  },
-
-  .format_buffer = format_ip4_header,
-  .format_trace = format_ip4_forward_next_trace,
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_vxlan_bypass_node,ip4_vxlan_bypass)
-
-
-static clib_error_t *
-set_ip_vxlan_bypass (vlib_main_t * vm,
-		     unformat_input_t * input,
-		     vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, * line_input = &_line_input;
-  vnet_main_t * vnm = vnet_get_main();
-  clib_error_t * error = 0;
-  u32 sw_if_index, is_del;
-
-  sw_if_index = ~0;
-  is_del = 0;
-
-  if (! unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat_user (line_input, unformat_vnet_sw_interface, vnm, &sw_if_index))
-	  ;
-      else if (unformat (line_input, "del"))
-        is_del = 1;
-      else
-        {
-	  error = unformat_parse_error (line_input);
-	  goto done;
-	}
-    }
-
-  if (~0 == sw_if_index)
-    {
-      error = clib_error_return (0, "unknown interface `%U'",
-				 format_unformat_error, line_input);
-      goto done;
-    }
-
-  vnet_feature_enable_disable ("ip4-unicast", "ip4-vxlan-bypass", sw_if_index,
-			       is_del == 0, 0, 0);
- done:
-  return error;
-}
-
-/*?
- * This command adds the 'ip4-vxlan-bypass' graph node for a given interface. 
- * By adding the IPv4 vxlan-bypass graph node to an interface, the node checks
- *  for and validate input vxlan packet and bypass ip4-lookup, ip4-local, 
- * ip4-udp-lookup nodes to speedup vxlan packet forwarding. This node will 
- * cause extra overhead to for non-vxlan packets which is kept at a minimum.
- *
- * @cliexpar
- * @parblock
- * Example of graph node before ip4-vxlan-bypass is enabled:
- * @cliexstart{show vlib graph ip4-vxlan-bypass}
- *            Name                      Next                    Previous
- * ip4-vxlan-bypass                error-drop [0]
- *                                vxlan4-input [1]
- *                                 ip4-lookup [2]      
- * @cliexend
- *
- * Example of how to enable ip4-vxlan-bypass on an interface:
- * @cliexcmd{set interface ip vxlan-bypass GigabitEthernet2/0/0}
- *
- * Example of graph node after ip4-vxlan-bypass is enabled:
- * @cliexstart{show vlib graph ip4-vxlan-bypass}
- *            Name                      Next                    Previous         
- * ip4-vxlan-bypass                error-drop [0]               ip4-input        
- *                                vxlan4-input [1]        ip4-input-no-checksum  
- *                                 ip4-lookup [2]      
- * @cliexend
- *
- * Example of how to display the feature enabed on an interface:
- * @cliexstart{show ip interface features GigabitEthernet2/0/0}
- * IP feature paths configured on GigabitEthernet2/0/0...
- *
- * ipv4 unicast:
- *   ip4-vxlan-bypass
- *   ip4-lookup
- *
- * ipv4 multicast:
- *   ip4-lookup-multicast
- *
- * ipv4 multicast:
- *   interface-output
- *
- * ipv6 unicast:
- *   ip6-lookup
- *
- * ipv6 multicast:
- *   ip6-lookup
- *
- * ipv6 multicast:
- *   interface-output
- * @cliexend
- *
- * Example of how to disable unicast source checking on an interface:
- * @cliexcmd{set interface ip vxlan-bypass GigabitEthernet2/0/0 del}
- * @endparblock
-?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_ip_vxlan_bypass_command, static) = {
-  .path = "set interface ip vxlan-bypass",
-  .function = set_ip_vxlan_bypass,
-  .short_help = "set interface ip vxlan-bypass <interface> [del]",
-};
-
-/* Dummy init function to get us linked in. */
-clib_error_t * ip4_vxlan_bypass_init (vlib_main_t * vm)
-{ return 0; }
-
-VLIB_INIT_FUNCTION (ip4_vxlan_bypass_init);
diff --git a/vnet/vnet/vxlan/dir.dox b/vnet/vnet/vxlan/dir.dox
deleted file mode 100644
index 31a9e2b6..00000000
--- a/vnet/vnet/vxlan/dir.dox
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
-@dir
-@brief VXLAN Code.
-
-This directory contains source code to support VXLAN.
-
-*/
-/*? %%clicmd:group_label VXLAN CLI %% ?*/
diff --git a/vnet/vnet/vxlan/encap.c b/vnet/vnet/vxlan/encap.c
deleted file mode 100644
index 5b63064a..00000000
--- a/vnet/vnet/vxlan/encap.c
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/vxlan/vxlan.h>
-
-/* Statistics (not all errors) */
-#define foreach_vxlan_encap_error    \
-_(ENCAPSULATED, "good packets encapsulated")
-
-static char * vxlan_encap_error_strings[] = {
-#define _(sym,string) string,
-  foreach_vxlan_encap_error
-#undef _
-};
-
-typedef enum {
-#define _(sym,str) VXLAN_ENCAP_ERROR_##sym,
-    foreach_vxlan_encap_error
-#undef _
-    VXLAN_ENCAP_N_ERROR,
-} vxlan_encap_error_t;
-
-typedef enum {
-    VXLAN_ENCAP_NEXT_DROP,
-    VXLAN_ENCAP_N_NEXT,
-} vxlan_encap_next_t;
-
-typedef struct {
-  u32 tunnel_index;
-  u32 vni;
-} vxlan_encap_trace_t;
-
-u8 * format_vxlan_encap_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  vxlan_encap_trace_t * t 
-      = va_arg (*args, vxlan_encap_trace_t *);
-
-  s = format (s, "VXLAN encap to vxlan_tunnel%d vni %d", 
-	      t->tunnel_index, t->vni);
-  return s;
-}
-
-
-#define foreach_fixed_header4_offset            \
-    _(0) _(1) _(2) _(3)
-
-#define foreach_fixed_header6_offset            \
-    _(0) _(1) _(2) _(3) _(4) _(5) _(6)
-
-always_inline uword
-vxlan_encap_inline (vlib_main_t * vm,
-		    vlib_node_runtime_t * node,
-		    vlib_frame_t * from_frame,
-		    u32 is_ip4)
-{
-  u32 n_left_from, next_index, * from, * to_next;
-  vxlan_main_t * vxm = &vxlan_main;
-  vnet_main_t * vnm = vxm->vnet_main;
-  vnet_interface_main_t * im = &vnm->interface_main;
-  u32 pkts_encapsulated = 0;
-  u16 old_l0 = 0, old_l1 = 0;
-  u32 cpu_index = os_get_cpu_number();
-  u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
-  u32 sw_if_index0 = 0, sw_if_index1 = 0;
-  u32 next0 = 0, next1 = 0;
-  vnet_hw_interface_t * hi0, * hi1;
-  vxlan_tunnel_t * t0 = NULL, * t1 = NULL;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-  stats_sw_if_index = node->runtime_data[0];
-  stats_n_packets = stats_n_bytes = 0;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-          u32 bi0, bi1;
-	  vlib_buffer_t * b0, * b1;
-          u32 flow_hash0, flow_hash1;
-	  u32 len0, len1;
-          ip4_header_t * ip4_0, * ip4_1;
-          ip6_header_t * ip6_0, * ip6_1;
-          udp_header_t * udp0, * udp1;
-          u64 * copy_src0, * copy_dst0;
-          u64 * copy_src1, * copy_dst1;
-          u32 * copy_src_last0, * copy_dst_last0;
-          u32 * copy_src_last1, * copy_dst_last1;
-          u16 new_l0, new_l1;
-          ip_csum_t sum0, sum1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * p2, * p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
-	    CLIB_PREFETCH (p3->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-          flow_hash0 = vnet_l2_compute_flow_hash (b0);
-          flow_hash1 = vnet_l2_compute_flow_hash (b1);
-
-	  /* Get next node index and adj index from tunnel next_dpo */
-	  if (sw_if_index0 != vnet_buffer(b0)->sw_if_index[VLIB_TX])
-	    {
-	      sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_TX];
-	      hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
-	      t0 = &vxm->tunnels[hi0->dev_instance];
-	      /* Note: change to always set next0 if it may be set to drop */
-	      next0 = t0->next_dpo.dpoi_next_node;
-	    }
-          vnet_buffer(b0)->ip.adj_index[VLIB_TX] = t0->next_dpo.dpoi_index;
-
-	  /* Get next node index and adj index from tunnel next_dpo */
-	  if (sw_if_index1 != vnet_buffer(b1)->sw_if_index[VLIB_TX])
-	    {
-	      sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_TX];
-	      hi1 = vnet_get_sup_hw_interface (vnm, sw_if_index1); 
-	      t1 = &vxm->tunnels[hi1->dev_instance];
-	      /* Note: change to always set next1 if it may be set to drop */
-	      next1 = t1->next_dpo.dpoi_next_node;
-	    }
-          vnet_buffer(b1)->ip.adj_index[VLIB_TX] = t1->next_dpo.dpoi_index;
-
-          /* Apply the rewrite string. $$$$ vnet_rewrite? */
-          vlib_buffer_advance (b0, -(word)_vec_len(t0->rewrite));
-          vlib_buffer_advance (b1, -(word)_vec_len(t1->rewrite));
-
-	  if (is_ip4)
-	    {
-	      /* IP4 VXLAN header should be 36 octects */
-              ASSERT(sizeof(ip4_vxlan_header_t) == 36);
-              ASSERT(vec_len(t0->rewrite) == sizeof(ip4_vxlan_header_t));
-	      ASSERT(vec_len(t1->rewrite) == sizeof(ip4_vxlan_header_t));
-
-	      ip4_0 = vlib_buffer_get_current(b0);
-	      ip4_1 = vlib_buffer_get_current(b1);
-
-	      /* Copy the fixed header */
-	      copy_dst0 = (u64 *) ip4_0;
-	      copy_src0 = (u64 *) t0->rewrite;
-	      copy_dst1 = (u64 *) ip4_1;
-	      copy_src1 = (u64 *) t1->rewrite;
-	      /* Copy first 32 octets 8-bytes at a time */
-#define _(offs) copy_dst0[offs] = copy_src0[offs];
-	      foreach_fixed_header4_offset;
-#undef _
-#define _(offs) copy_dst1[offs] = copy_src1[offs];
-	      foreach_fixed_header4_offset;
-#undef _
-	      /* Last 4 octets. Hopefully gcc will be our friend */
-              copy_dst_last0 = (u32 *)(&copy_dst0[4]);
-              copy_src_last0 = (u32 *)(&copy_src0[4]);
-              copy_dst_last0[0] = copy_src_last0[0];
-              copy_dst_last1 = (u32 *)(&copy_dst1[4]);
-              copy_src_last1 = (u32 *)(&copy_src1[4]);
-              copy_dst_last1[0] = copy_src_last1[0];
-
-	      /* Fix the IP4 checksum and length */
-	      sum0 = ip4_0->checksum;
-	      new_l0 = /* old_l0 always 0, see the rewrite setup */ 
-                clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
-              sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
-				     length /* changed member */);
-	      ip4_0->checksum = ip_csum_fold (sum0);
-	      ip4_0->length = new_l0;
-	      sum1 = ip4_1->checksum;
-	      new_l1 = /* old_l1 always 0, see the rewrite setup */
-                clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1));
-              sum1 = ip_csum_update (sum1, old_l1, new_l1, ip4_header_t,
-				     length /* changed member */);
-	      ip4_1->checksum = ip_csum_fold (sum1);
-	      ip4_1->length = new_l1;
-
-	      /* Fix UDP length and set source port */
-	      udp0 = (udp_header_t *)(ip4_0+1);
-	      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain(vm, b0)
-					     - sizeof (*ip4_0));
-	      udp0->length = new_l0;
-	      udp0->src_port = flow_hash0;
-	      udp1 = (udp_header_t *)(ip4_1+1);
-	      new_l1 = clib_host_to_net_u16 (vlib_buffer_length_in_chain(vm, b1)
-					     - sizeof (*ip4_1));
-	      udp1->length = new_l1;
-	      udp1->src_port = flow_hash1;
-	    }
-	  else /* ipv6 */
-	    {
-              int bogus = 0;
-
-	      /* IP6 VXLAN header should be 56 octects */
-              ASSERT(sizeof(ip6_vxlan_header_t) == 56);
-              ASSERT(vec_len(t0->rewrite) == sizeof(ip6_vxlan_header_t));
-	      ASSERT(vec_len(t1->rewrite) == sizeof(ip6_vxlan_header_t));
-	      ip6_0 = vlib_buffer_get_current(b0);
-	      ip6_1 = vlib_buffer_get_current(b1);
-
-	      /* Copy the fixed header */
-	      copy_dst0 = (u64 *) ip6_0;
-	      copy_src0 = (u64 *) t0->rewrite;
-	      copy_dst1 = (u64 *) ip6_1;
-	      copy_src1 = (u64 *) t1->rewrite;
-	      /* Copy first 56 (ip6) octets 8-bytes at a time */
-#define _(offs) copy_dst0[offs] = copy_src0[offs];
-	      foreach_fixed_header6_offset;
-#undef _
-#define _(offs) copy_dst1[offs] = copy_src1[offs];
-	      foreach_fixed_header6_offset;
-#undef _
-	      /* Fix IP6 payload length */
-	      new_l0 =
-                clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
-				      - sizeof(*ip6_0));
-	      ip6_0->payload_length = new_l0;
-	      new_l1 =
-                clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1)
-				      - sizeof(*ip6_1));
-	      ip6_1->payload_length = new_l1;
-
-	      /* Fix UDP length  and set source port */
-	      udp0 = (udp_header_t *)(ip6_0+1);
-	      udp0->length = new_l0;
-	      udp0->src_port = flow_hash0;
-	      udp1 = (udp_header_t *)(ip6_1+1);
-	      udp1->length = new_l1;
-	      udp1->src_port = flow_hash1;
-
-	      /* IPv6 UDP checksum is mandatory */
-	      udp0->checksum = ip6_tcp_udp_icmp_compute_checksum(vm, b0,
-								 ip6_0, &bogus);
-	      ASSERT(bogus == 0);
-	      if (udp0->checksum == 0)
-		udp0->checksum = 0xffff;
-	      udp1->checksum = ip6_tcp_udp_icmp_compute_checksum(vm, b1,
-                                                        ip6_1, &bogus);
-	      ASSERT(bogus == 0);
-	      if (udp1->checksum == 0)
-		udp1->checksum = 0xffff;
-	    }
-
-          pkts_encapsulated += 2;
- 	  len0 = vlib_buffer_length_in_chain (vm, b0);
- 	  len1 = vlib_buffer_length_in_chain (vm, b1);
-	  stats_n_packets += 2;
-	  stats_n_bytes += len0 + len1;
-
-	  /* Batch stats increment on the same vxlan tunnel so counter is not
-	     incremented per packet. Note stats are still incremented for deleted
-	     and admin-down tunnel where packets are dropped. It is not worthwhile
-	     to check for this rare case and affect normal path performance. */
-	  if (PREDICT_FALSE ((sw_if_index0 != stats_sw_if_index) ||
-			     (sw_if_index1 != stats_sw_if_index))) 
-	    {
-	      stats_n_packets -= 2;
-	      stats_n_bytes -= len0 + len1;
-	      if (sw_if_index0 == sw_if_index1) 
-	        {
-		  if (stats_n_packets) 
-		    vlib_increment_combined_counter 
-		      (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
-		       cpu_index, stats_sw_if_index, 
-		       stats_n_packets, stats_n_bytes);
-		  stats_sw_if_index = sw_if_index0;
-		  stats_n_packets = 2;
-		  stats_n_bytes = len0 + len1;
-	        }
-	      else 
-	        {
-		  vlib_increment_combined_counter 
-		      (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
-		       cpu_index, sw_if_index0, 1, len0);
-		  vlib_increment_combined_counter 
-		      (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
-		       cpu_index, sw_if_index1, 1, len1);
-		}
-	    }
-
-	  if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
-            {
-              vxlan_encap_trace_t *tr = 
-                vlib_add_trace (vm, node, b0, sizeof (*tr));
-              tr->tunnel_index = t0 - vxm->tunnels;
-              tr->vni = t0->vni;
-           }
-
-          if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED)) 
-            {
-              vxlan_encap_trace_t *tr = 
-                vlib_add_trace (vm, node, b1, sizeof (*tr));
-              tr->tunnel_index = t1 - vxm->tunnels;
-              tr->vni = t1->vni;
-            }
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t * b0;
-          u32 flow_hash0;
-	  u32 len0;
-          ip4_header_t * ip4_0;
-          ip6_header_t * ip6_0;
-          udp_header_t * udp0;
-          u64 * copy_src0, * copy_dst0;
-          u32 * copy_src_last0, * copy_dst_last0;
-          u16 new_l0;
-          ip_csum_t sum0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-          flow_hash0 = vnet_l2_compute_flow_hash(b0);
-
-	  /* Get next node index and adj index from tunnel next_dpo */
-	  if (sw_if_index0 != vnet_buffer(b0)->sw_if_index[VLIB_TX])
-	    {
-	      sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_TX];
-	      hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
-	      t0 = &vxm->tunnels[hi0->dev_instance];
-	      /* Note: change to always set next0 if it may be set to drop */
-	      next0 = t0->next_dpo.dpoi_next_node;
-	    }
-	  vnet_buffer(b0)->ip.adj_index[VLIB_TX] = t0->next_dpo.dpoi_index;
-
-          /* Apply the rewrite string. $$$$ vnet_rewrite? */
-          vlib_buffer_advance (b0, -(word)_vec_len(t0->rewrite));
-
-	  if (is_ip4)
-	    {
-	      /* IP4 VXLAN header should be 36 octects */
-              ASSERT(sizeof(ip4_vxlan_header_t) == 36);
-              ASSERT(vec_len(t0->rewrite) == sizeof(ip4_vxlan_header_t));
-	      ip4_0 = vlib_buffer_get_current(b0);
-
-	      /* Copy the fixed header */
-	      copy_dst0 = (u64 *) ip4_0;
-	      copy_src0 = (u64 *) t0->rewrite;
-	      /* Copy first 32 octets 8-bytes at a time */
-#define _(offs) copy_dst0[offs] = copy_src0[offs];
-	      foreach_fixed_header4_offset;
-#undef _
-	      /* Last 4 octets. Hopefully gcc will be our friend */
-              copy_dst_last0 = (u32 *)(&copy_dst0[4]);
-              copy_src_last0 = (u32 *)(&copy_src0[4]);
-              copy_dst_last0[0] = copy_src_last0[0];
-
-	      /* Fix the IP4 checksum and length */
-	      sum0 = ip4_0->checksum;
-	      new_l0 = /* old_l0 always 0, see the rewrite setup */ 
-                clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
-              sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
-				     length /* changed member */);
-	      ip4_0->checksum = ip_csum_fold (sum0);
-	      ip4_0->length = new_l0;
-
-	      /* Fix UDP length and set source port */
-	      udp0 = (udp_header_t *)(ip4_0+1);
-	      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain(vm, b0)
-					     - sizeof (*ip4_0));
-	      udp0->length = new_l0;
-	      udp0->src_port = flow_hash0;
-	    }
-
-	  else /* ip6 path */
-	    {
-              int bogus = 0;
-
-	      /* IP6 VXLAN header should be 56 octects */
-              ASSERT(sizeof(ip6_vxlan_header_t) == 56);
-              ASSERT(vec_len(t0->rewrite) == sizeof(ip6_vxlan_header_t));
-	      ip6_0 = vlib_buffer_get_current(b0);
-	      /* Copy the fixed header */
-	      copy_dst0 = (u64 *) ip6_0;
-	      copy_src0 = (u64 *) t0->rewrite;
-	      /* Copy first 56 (ip6) octets 8-bytes at a time */
-#define _(offs) copy_dst0[offs] = copy_src0[offs];
-	      foreach_fixed_header6_offset;
-#undef _
-	      /* Fix IP6 payload length */
-	      new_l0 =
-                clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
-				      - sizeof(*ip6_0));
-	      ip6_0->payload_length = new_l0;
-
-	      /* Fix UDP length  and set source port */
-	      udp0 = (udp_header_t *)(ip6_0+1);
-	      udp0->length = new_l0;
-	      udp0->src_port = flow_hash0;
-
-	      /* IPv6 UDP checksum is mandatory */
-	      udp0->checksum = ip6_tcp_udp_icmp_compute_checksum(vm, b0,
-								 ip6_0, &bogus);
-	      ASSERT(bogus == 0);
-	      if (udp0->checksum == 0)
-		udp0->checksum = 0xffff;
-	    }
-
-          pkts_encapsulated ++;
-	  len0 = vlib_buffer_length_in_chain (vm, b0);
-	  stats_n_packets += 1;
-	  stats_n_bytes += len0;
-
-	  /* Batch stats increment on the same vxlan tunnel so counter is not
-	     incremented per packet. Note stats are still incremented for deleted
-	     and admin-down tunnel where packets are dropped. It is not worthwhile
-	     to check for this rare case and affect normal path performance. */
-	  if (PREDICT_FALSE (sw_if_index0 != stats_sw_if_index)) 
-	    {
-	      stats_n_packets -= 1;
-	      stats_n_bytes -= len0;
-	      if (stats_n_packets)
-		vlib_increment_combined_counter 
-		  (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
-		   cpu_index, stats_sw_if_index, 
-		   stats_n_packets, stats_n_bytes);
-	      stats_n_packets = 1;
-	      stats_n_bytes = len0;
-	      stats_sw_if_index = sw_if_index0;
-	    }
-
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
-            {
-              vxlan_encap_trace_t *tr = 
-                vlib_add_trace (vm, node, b0, sizeof (*tr));
-              tr->tunnel_index = t0 - vxm->tunnels;
-              tr->vni = t0->vni;
-            }
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  /* Do we still need this now that tunnel tx stats is kept? */
-  vlib_node_increment_counter (vm, node->node_index, 
-                               VXLAN_ENCAP_ERROR_ENCAPSULATED, 
-                               pkts_encapsulated);
-
-  /* Increment any remaining batch stats */
-  if (stats_n_packets)
-    {
-      vlib_increment_combined_counter 
-	(im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
-	 cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
-      node->runtime_data[0] = stats_sw_if_index;
-    }
-
-  return from_frame->n_vectors;
-}
-
-static uword
-vxlan4_encap (vlib_main_t * vm,
-	      vlib_node_runtime_t * node,
-	      vlib_frame_t * from_frame)
-{
-  return vxlan_encap_inline (vm, node, from_frame, /* is_ip4 */ 1);
-}
-
-static uword
-vxlan6_encap (vlib_main_t * vm,
-	      vlib_node_runtime_t * node,
-	      vlib_frame_t * from_frame)
-{
-  return vxlan_encap_inline (vm, node, from_frame, /* is_ip4 */ 0);
-}
-
-VLIB_REGISTER_NODE (vxlan4_encap_node) = {
-  .function = vxlan4_encap,
-  .name = "vxlan4-encap",
-  .vector_size = sizeof (u32),
-  .format_trace = format_vxlan_encap_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .n_errors = ARRAY_LEN(vxlan_encap_error_strings),
-  .error_strings = vxlan_encap_error_strings,
-  .n_next_nodes = VXLAN_ENCAP_N_NEXT,
-  .next_nodes = {
-        [VXLAN_ENCAP_NEXT_DROP] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (vxlan4_encap_node, vxlan4_encap)
-
-VLIB_REGISTER_NODE (vxlan6_encap_node) = {
-  .function = vxlan6_encap,
-  .name = "vxlan6-encap",
-  .vector_size = sizeof (u32),
-  .format_trace = format_vxlan_encap_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .n_errors = ARRAY_LEN(vxlan_encap_error_strings),
-  .error_strings = vxlan_encap_error_strings,
-  .n_next_nodes = VXLAN_ENCAP_N_NEXT,
-  .next_nodes = {
-        [VXLAN_ENCAP_NEXT_DROP] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (vxlan6_encap_node, vxlan6_encap)
-
diff --git a/vnet/vnet/vxlan/vxlan.api b/vnet/vnet/vxlan/vxlan.api
deleted file mode 100644
index 048220fb..00000000
--- a/vnet/vnet/vxlan/vxlan.api
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
- define vxlan_add_del_tunnel
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 is_ipv6;
-  u8 src_address[16];
-  u8 dst_address[16];
-  u32 mcast_sw_if_index;
-  u32 encap_vrf_id;
-  u32 decap_next_index;
-  u32 vni;
-};
-
-define vxlan_add_del_tunnel_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-};
-
-define vxlan_tunnel_dump
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-};
-
-define vxlan_tunnel_details
-{
-  u32 context;
-  u32 sw_if_index;
-  u8 src_address[16];
-  u8 dst_address[16];
-  u32 mcast_sw_if_index;
-  u32 encap_vrf_id;
-  u32 decap_next_index;
-  u32 vni;
-  u8 is_ipv6;
-};
-
-/** \brief Interface set vxlan-bypass request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface used to reach neighbor
-    @param is_ipv6 - if non-zero, enable ipv6-vxlan-bypass, else ipv4-vxlan-bypass
-    @param enable - if non-zero enable, else disable
-*/
-define sw_interface_set_vxlan_bypass
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 is_ipv6;
-  u8 enable;
-};
-
-/** \brief Interface set vxlan-bypass response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define sw_interface_set_vxlan_bypass_reply
-{
-  u32 context;
-  i32 retval;
-};
\ No newline at end of file
diff --git a/vnet/vnet/vxlan/vxlan.c b/vnet/vnet/vxlan/vxlan.c
deleted file mode 100644
index abf0182f..00000000
--- a/vnet/vnet/vxlan/vxlan.c
+++ /dev/null
@@ -1,899 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/vxlan/vxlan.h>
-#include <vnet/ip/format.h>
-#include <vnet/fib/fib_entry.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/dpo/receive_dpo.h>
-#include <vlib/vlib.h>
-
-/**
- * @file
- * @brief VXLAN.
- *
- * VXLAN provides the features needed to allow L2 bridge domains (BDs)
- * to span multiple servers. This is done by building an L2 overlay on
- * top of an L3 network underlay using VXLAN tunnels.
- *
- * This makes it possible for servers to be co-located in the same data
- * center or be separated geographically as long as they are reachable
- * through the underlay L3 network.
- *
- * You can refer to this kind of L2 overlay bridge domain as a VXLAN
- * (Virtual eXtensible VLAN) segment.
- */
-
-
-vxlan_main_t vxlan_main;
-
-static u8 * format_decap_next (u8 * s, va_list * args)
-{
-  u32 next_index = va_arg (*args, u32);
-
-  switch (next_index)
-    {
-    case VXLAN_INPUT_NEXT_DROP:
-      return format (s, "drop");
-    case VXLAN_INPUT_NEXT_L2_INPUT:
-      return format (s, "l2");
-    default:
-      return format (s, "index %d", next_index);
-    }
-  return s;
-}
-
-u8 * format_vxlan_tunnel (u8 * s, va_list * args)
-{
-  vxlan_tunnel_t * t = va_arg (*args, vxlan_tunnel_t *);
-  vxlan_main_t * ngm = &vxlan_main;
-
-  s = format (s, "[%d] src %U dst %U vni %d sw_if_index %d ",
-              t - ngm->tunnels,
-              format_ip46_address, &t->src, IP46_TYPE_ANY,
-              format_ip46_address, &t->dst, IP46_TYPE_ANY,
-              t->vni, t->sw_if_index);
-
-  if (ip46_address_is_multicast (&t->dst))
-    s = format (s, "mcast_sw_if_index %d ", t->mcast_sw_if_index);
-
-  s = format (s, "encap_fib_index %d fib_entry_index %d decap_next %U\n", 
-	      t->encap_fib_index, t->fib_entry_index,
-	      format_decap_next, t->decap_next_index);
-  return s;
-}
-
-static u8 * format_vxlan_name (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  return format (s, "vxlan_tunnel%d", dev_instance);
-}
-
-static uword dummy_interface_tx (vlib_main_t * vm,
-                                 vlib_node_runtime_t * node,
-                                 vlib_frame_t * frame)
-{
-  clib_warning ("you shouldn't be here, leaking buffers...");
-  return frame->n_vectors;
-}
-
-static clib_error_t *
-vxlan_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
-{
-  if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
-    vnet_hw_interface_set_flags (vnm, hw_if_index, VNET_HW_INTERFACE_FLAG_LINK_UP);
-  else
-    vnet_hw_interface_set_flags (vnm, hw_if_index, 0);
-
-  return /* no error */ 0;
-}
-
-VNET_DEVICE_CLASS (vxlan_device_class,static) = {
-  .name = "VXLAN",
-  .format_device_name = format_vxlan_name,
-  .format_tx_trace = format_vxlan_encap_trace,
-  .tx_function = dummy_interface_tx,
-  .admin_up_down_function = vxlan_interface_admin_up_down,
-};
-
-static u8 * format_vxlan_header_with_length (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  s = format (s, "unimplemented dev %u", dev_instance);
-  return s;
-}
-
-VNET_HW_INTERFACE_CLASS (vxlan_hw_class) = {
-  .name = "VXLAN",
-  .format_header = format_vxlan_header_with_length,
-  .build_rewrite = default_build_rewrite,
-};
-
-static void
-vxlan_tunnel_restack_dpo(vxlan_tunnel_t * t)
-{
-    dpo_id_t dpo = DPO_INVALID;
-    u32 encap_index = ip46_address_is_ip4(&t->dst) ?
-        vxlan4_encap_node.index : vxlan6_encap_node.index;
-    fib_forward_chain_type_t forw_type = ip46_address_is_ip4(&t->dst) ?
-        FIB_FORW_CHAIN_TYPE_UNICAST_IP4 : FIB_FORW_CHAIN_TYPE_UNICAST_IP6;
-
-    fib_entry_contribute_forwarding (t->fib_entry_index, forw_type, &dpo);
-    dpo_stack_from_node (encap_index, &t->next_dpo, &dpo);
-    dpo_reset(&dpo);
-}
-
-static vxlan_tunnel_t *
-vxlan_tunnel_from_fib_node (fib_node_t *node)
-{
-#if (CLIB_DEBUG > 0)
-    ASSERT(FIB_NODE_TYPE_VXLAN_TUNNEL == node->fn_type);
-#endif
-    return ((vxlan_tunnel_t*) (((char*)node) -
-			       STRUCT_OFFSET_OF(vxlan_tunnel_t, node)));
-}
-
-/**
- * Function definition to backwalk a FIB node -
- * Here we will restack the new dpo of VXLAN DIP to encap node.
- */
-static fib_node_back_walk_rc_t
-vxlan_tunnel_back_walk (fib_node_t *node,
-			fib_node_back_walk_ctx_t *ctx)
-{
-    vxlan_tunnel_restack_dpo(vxlan_tunnel_from_fib_node(node));
-    return (FIB_NODE_BACK_WALK_CONTINUE);
-}
-
-/**
- * Function definition to get a FIB node from its index
- */
-static fib_node_t*
-vxlan_tunnel_fib_node_get (fib_node_index_t index)
-{
-    vxlan_tunnel_t * t;
-    vxlan_main_t * vxm = &vxlan_main;
-
-    t = pool_elt_at_index(vxm->tunnels, index);
-
-    return (&t->node);
-}
-
-/**
- * Function definition to inform the FIB node that its last lock has gone.
- */
-static void
-vxlan_tunnel_last_lock_gone (fib_node_t *node)
-{
-    /*
-     * The VXLAN tunnel is a root of the graph. As such
-     * it never has children and thus is never locked.
-     */
-    ASSERT(0);
-}
-
-/*
- * Virtual function table registered by VXLAN tunnels
- * for participation in the FIB object graph.
- */
-const static fib_node_vft_t vxlan_vft = {
-    .fnv_get = vxlan_tunnel_fib_node_get,
-    .fnv_last_lock = vxlan_tunnel_last_lock_gone,
-    .fnv_back_walk = vxlan_tunnel_back_walk,
-};
-
-
-#define foreach_copy_field                      \
-_(vni)                                          \
-_(mcast_sw_if_index)                            \
-_(encap_fib_index)                              \
-_(decap_next_index)                             \
-_(src)                                          \
-_(dst)
-
-static int vxlan4_rewrite (vxlan_tunnel_t * t)
-{
-  u8 *rw = 0;
-  ip4_header_t * ip0;
-  ip4_vxlan_header_t * h0;
-  int len = sizeof (*h0);
-
-  vec_validate_aligned (rw, len-1, CLIB_CACHE_LINE_BYTES);
-
-  h0 = (ip4_vxlan_header_t *) rw;
-
-  /* Fixed portion of the (outer) ip4 header */
-  ip0 = &h0->ip4;
-  ip0->ip_version_and_header_length = 0x45;
-  ip0->ttl = 254;
-  ip0->protocol = IP_PROTOCOL_UDP;
-
-  /* we fix up the ip4 header length and checksum after-the-fact */
-  ip0->src_address.as_u32 = t->src.ip4.as_u32;
-  ip0->dst_address.as_u32 = t->dst.ip4.as_u32;
-  ip0->checksum = ip4_header_checksum (ip0);
-
-  /* UDP header, randomize src port on something, maybe? */
-  h0->udp.src_port = clib_host_to_net_u16 (4789);
-  h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_vxlan);
-
-  /* VXLAN header */
-  vnet_set_vni_and_flags(&h0->vxlan, t->vni);
-
-  t->rewrite = rw;
-  return (0);
-}
-
-static int vxlan6_rewrite (vxlan_tunnel_t * t)
-{
-  u8 *rw = 0;
-  ip6_header_t * ip0;
-  ip6_vxlan_header_t * h0;
-  int len = sizeof (*h0);
-
-  vec_validate_aligned (rw, len-1, CLIB_CACHE_LINE_BYTES);
-
-  h0 = (ip6_vxlan_header_t *) rw;
-
-  /* Fixed portion of the (outer) ip6 header */
-  ip0 = &h0->ip6;
-  ip0->ip_version_traffic_class_and_flow_label = clib_host_to_net_u32(6 << 28);
-  ip0->hop_limit = 255;
-  ip0->protocol = IP_PROTOCOL_UDP;
-
-  ip0->src_address.as_u64[0] = t->src.ip6.as_u64[0];
-  ip0->src_address.as_u64[1] = t->src.ip6.as_u64[1];
-  ip0->dst_address.as_u64[0] = t->dst.ip6.as_u64[0];
-  ip0->dst_address.as_u64[1] = t->dst.ip6.as_u64[1];
-
-  /* UDP header, randomize src port on something, maybe? */
-  h0->udp.src_port = clib_host_to_net_u16 (4789);
-  h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_vxlan);
-
-  /* VXLAN header */
-  vnet_set_vni_and_flags(&h0->vxlan, t->vni);
-
-  t->rewrite = rw;
-  return (0);
-}
-
-static int vxlan_check_decap_next(vxlan_main_t * vxm, u32 is_ip6, u32 decap_next_index)
-{
-  vlib_main_t * vm = vxm->vlib_main;
-  vlib_node_runtime_t *r;
-
-  if(!is_ip6)
-    {
-      r = vlib_node_get_runtime (vm, vxlan4_input_node.index);
-      if(decap_next_index >= r->n_next_nodes)
-	return 1;
-    }
-  else
-    {
-      r = vlib_node_get_runtime (vm, vxlan6_input_node.index);
-      if(decap_next_index >= r->n_next_nodes)
-	return 1;
-    }
-
-  return 0;
-}
-
-static uword
-vtep_addr_ref(ip46_address_t *ip)
-{
-	if (!ip46_address_is_ip4(ip))
-		return 1; /* always create */
-	uword *pvtep = hash_get (vxlan_main.vtep4, ip->ip4.as_u32);
-	if (pvtep) 
-		return ++pvtep[0];
-	hash_set (vxlan_main.vtep4, ip->ip4.as_u32, 1);
-	return 1;
-}
-
-static uword
-vtep_addr_unref(ip46_address_t *ip)
-{
-	if (!ip46_address_is_ip4(ip))
-		return 0; /* alwways destroy */
-	uword *pvtep = hash_get (vxlan_main.vtep4, ip->ip4.as_u32);
-        ASSERT(pvtep);
-	if (!(--pvtep[0]))
-		hash_unset (vxlan_main.vtep4, ip->ip4.as_u32);
-	return pvtep[0];
-}
-
-static
-mcast_remote_t *
-mcast_ep_get(ip46_address_t * ip)
-{
-        ASSERT(ip46_address_is_multicast(ip));
-	uword * ep_idx = hash_get_mem (vxlan_main.mcast_ep_by_ip, ip);
-        ASSERT(ep_idx);
-	return pool_elt_at_index(vxlan_main.mcast_eps, *ep_idx);
-}
-
-static void
-mcast_ep_add(mcast_remote_t * new_ep)
-{
-	mcast_remote_t * ep;
-
-	pool_get_aligned (vxlan_main.mcast_eps, ep, CLIB_CACHE_LINE_BYTES);
-	*ep = *new_ep;
-	hash_set_mem (vxlan_main.mcast_ep_by_ip, &ep->ip, ep - vxlan_main.mcast_eps);
-}
-
-static void
-mcast_ep_remove(mcast_remote_t * ep)
-{
-	hash_unset_mem (vxlan_main.mcast_ep_by_ip, &ep->ip);
-	pool_put (vxlan_main.mcast_eps, ep);
-}
-
-static void
-ip46_multicast_ethernet_address(u8 * ethernet_address, ip46_address_t * ip) {
-          if (ip46_address_is_ip4(ip))
-              ip4_multicast_ethernet_address(ethernet_address, &ip->ip4);
-          else
-              ip6_multicast_ethernet_address(ethernet_address, ip->ip6.as_u32[0]);
-}
-
-int vnet_vxlan_add_del_tunnel 
-(vnet_vxlan_add_del_tunnel_args_t *a, u32 * sw_if_indexp)
-{
-  vxlan_main_t * vxm = &vxlan_main;
-  vxlan_tunnel_t *t = 0;
-  vnet_main_t * vnm = vxm->vnet_main;
-  uword * p;
-  u32 hw_if_index = ~0;
-  u32 sw_if_index = ~0;
-  int rv;
-  vxlan4_tunnel_key_t key4;
-  vxlan6_tunnel_key_t key6;
-  u32 is_ip6 = a->is_ip6;
-
-  if (!is_ip6)
-    {
-      key4.src = a->dst.ip4.as_u32; /* decap src in key is encap dst in config */
-      key4.vni = clib_host_to_net_u32 (a->vni << 8);
-      p = hash_get (vxm->vxlan4_tunnel_by_key, key4.as_u64);
-    } 
-  else 
-    {
-      key6.src.as_u64[0] = a->dst.ip6.as_u64[0];
-      key6.src.as_u64[1] = a->dst.ip6.as_u64[1];
-      key6.vni = clib_host_to_net_u32 (a->vni << 8);
-      p = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6);
-    }
-  
-  if (a->is_add)
-    {
-      l2input_main_t * l2im = &l2input_main;
-
-      /* adding a tunnel: tunnel must not already exist */
-      if (p)
-        return VNET_API_ERROR_TUNNEL_EXIST;
-
-      /*if not set explicitly, default to l2 */
-      if(a->decap_next_index == ~0)
-	a->decap_next_index = VXLAN_INPUT_NEXT_L2_INPUT;
-      if (vxlan_check_decap_next(vxm, is_ip6, a->decap_next_index))
-	  return VNET_API_ERROR_INVALID_DECAP_NEXT;
-
-      pool_get_aligned (vxm->tunnels, t, CLIB_CACHE_LINE_BYTES);
-      memset (t, 0, sizeof (*t));
-      
-      /* copy from arg structure */
-#define _(x) t->x = a->x;
-      foreach_copy_field;
-#undef _
-      
-      /* copy the key */
-      if (is_ip6)
-        {
-          t->key6 = clib_mem_alloc (sizeof(vxlan6_tunnel_key_t));
-          clib_memcpy (t->key6, &key6, sizeof(key6));
-        }
-      else
-        {
-          t->key4 = 0; /* not yet used */
-        }
-
-      if (!is_ip6) 
-        rv = vxlan4_rewrite (t);
-      else
-	rv = vxlan6_rewrite (t);
-
-      if (rv)
-        {
-          pool_put (vxm->tunnels, t);
-          return rv;
-        }
-
-      if (!is_ip6)
-	hash_set (vxm->vxlan4_tunnel_by_key, key4.as_u64, t - vxm->tunnels);
-      else
-        hash_set_mem (vxm->vxlan6_tunnel_by_key, t->key6, t - vxm->tunnels);
-
-      vnet_hw_interface_t * hi;
-      if (vec_len (vxm->free_vxlan_tunnel_hw_if_indices) > 0)
-        {
-	  vnet_interface_main_t * im = &vnm->interface_main;
-          hw_if_index = vxm->free_vxlan_tunnel_hw_if_indices
-            [vec_len (vxm->free_vxlan_tunnel_hw_if_indices)-1];
-          _vec_len (vxm->free_vxlan_tunnel_hw_if_indices) -= 1;
-          
-          hi = vnet_get_hw_interface (vnm, hw_if_index);
-          hi->dev_instance = t - vxm->tunnels;
-          hi->hw_instance = hi->dev_instance;
-
-	  /* clear old stats of freed tunnel before reuse */
-	  sw_if_index = hi->sw_if_index;
-	  vnet_interface_counter_lock(im);
-	  vlib_zero_combined_counter 
-	    (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_TX], sw_if_index);
-	  vlib_zero_combined_counter 
-	    (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_RX], sw_if_index);
-	  vlib_zero_simple_counter 
-	    (&im->sw_if_counters[VNET_INTERFACE_COUNTER_DROP], sw_if_index);
-	  vnet_interface_counter_unlock(im);
-        }
-      else 
-        {
-          hw_if_index = vnet_register_interface
-            (vnm, vxlan_device_class.index, t - vxm->tunnels,
-             vxlan_hw_class.index, t - vxm->tunnels);
-          hi = vnet_get_hw_interface (vnm, hw_if_index);
-        }
-      
-      t->hw_if_index = hw_if_index;
-      t->sw_if_index = sw_if_index = hi->sw_if_index;
-      
-      vec_validate_init_empty (vxm->tunnel_index_by_sw_if_index, sw_if_index, ~0);
-      vxm->tunnel_index_by_sw_if_index[sw_if_index] = t - vxm->tunnels;
-
-      /* setup l2 input config with l2 feature and bd 0 to drop packet */
-      vec_validate (l2im->configs, sw_if_index);
-      l2im->configs[sw_if_index].feature_bitmap = L2INPUT_FEAT_DROP;
-      l2im->configs[sw_if_index].bd_index = 0;
-      
-      vnet_sw_interface_set_flags (vnm, sw_if_index, 
-                                   VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-      fib_node_init(&t->node, FIB_NODE_TYPE_VXLAN_TUNNEL);
-      fib_prefix_t tun_dst_pfx;
-      u32 encap_index = !is_ip6 ?
-          vxlan4_encap_node.index : vxlan6_encap_node.index;
-      vnet_flood_class_t flood_class = VNET_FLOOD_CLASS_TUNNEL_NORMAL;
-
-      fib_prefix_from_ip46_addr(&t->dst, &tun_dst_pfx);
-      if (!ip46_address_is_multicast(&t->dst))
-        {
-          /* Unicast tunnel -
-           * source the FIB entry for the tunnel's destination
-           * and become a child thereof. The tunnel will then get poked
-           * when the forwarding for the entry updates, and the tunnel can
-           * re-stack accordingly
-           */
-	  vtep_addr_ref(&t->src);
-          t->fib_entry_index = fib_table_entry_special_add
-            (t->encap_fib_index, &tun_dst_pfx, FIB_SOURCE_RR,
-	     FIB_ENTRY_FLAG_NONE, ADJ_INDEX_INVALID);
-          t->sibling_index = fib_entry_child_add
-            (t->fib_entry_index, FIB_NODE_TYPE_VXLAN_TUNNEL, t - vxm->tunnels);
-          vxlan_tunnel_restack_dpo(t);
-	} 
-      else
-        {
- 	  /* Multicast tunnel -
-	   * as the same mcast group can be used for mutiple mcast tunnels
-	   * with different VNIs, create the output fib adjecency only if
-	   * it does not already exist
-	   */
-          fib_protocol_t fp = (is_ip6) ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4;
-          dpo_id_t dpo = DPO_INVALID;
-	  dpo_proto_t dproto = fib_proto_to_dpo(fp);
-
-	  if (vtep_addr_ref(&t->dst) == 1)
-	    {
-               u8 mcast_mac[6];
-
-               ip46_multicast_ethernet_address(mcast_mac, &t->dst);
-               receive_dpo_add_or_lock(dproto, ~0, NULL, &dpo);
-	       mcast_remote_t new_ep = {
-	         .ip = t->dst,
-		 .mcast_adj_index = adj_rewrite_add_and_lock
-                   (fp, fib_proto_to_link(fp), a->mcast_sw_if_index, mcast_mac),
-                 /* Add VRF local mcast adj. */
-                 .fib_entry_index = fib_table_entry_special_dpo_add
-                   (t->encap_fib_index, &tun_dst_pfx,
-                    FIB_SOURCE_SPECIAL, FIB_ENTRY_FLAG_NONE, &dpo)
-		   };
-	       mcast_ep_add(&new_ep);
-	       dpo_reset(&dpo);
-	    }
-          /* Stack shared mcast dst mac addr rewrite on encap */
-          dpo_set (&dpo, DPO_ADJACENCY, dproto,
-	    mcast_ep_get(&t->dst)->mcast_adj_index);
-          dpo_stack_from_node (encap_index, &t->next_dpo, &dpo);
-          dpo_reset (&dpo);
-	  flood_class = VNET_FLOOD_CLASS_TUNNEL_MASTER;
-	}
-
-      /* Set vxlan tunnel output node */
-      hi->output_node_index = encap_index;
-
-      vnet_get_sw_interface (vnet_get_main(), sw_if_index)->flood_class = flood_class;
-    }
-  else
-    {
-      /* deleting a tunnel: tunnel must exist */
-      if (!p)
-        return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-      t = pool_elt_at_index (vxm->tunnels, p[0]);
-
-      vnet_sw_interface_set_flags (vnm, t->sw_if_index, 0 /* down */);
-      /* make sure tunnel is removed from l2 bd or xconnect */
-      set_int_l2_mode(vxm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0, 0, 0, 0);
-      vec_add1 (vxm->free_vxlan_tunnel_hw_if_indices, t->hw_if_index);
-
-      vxm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
-
-      if (!is_ip6)
-        hash_unset (vxm->vxlan4_tunnel_by_key, key4.as_u64);
-      else
-        {
-	  hash_unset_mem (vxm->vxlan6_tunnel_by_key, t->key6);
-	  clib_mem_free (t->key6);
-	}
-
-      if (!ip46_address_is_multicast(&t->dst))
-        {
-	  vtep_addr_unref(&a->src);
-	  fib_entry_child_remove(t->fib_entry_index, t->sibling_index);
-	  fib_table_entry_delete_index(t->fib_entry_index, FIB_SOURCE_RR);
-        }
-      else if (vtep_addr_unref(&t->dst) == 0)
-        {
-	  mcast_remote_t* ep = mcast_ep_get(&t->dst);
-	  adj_unlock(ep->mcast_adj_index);
-	  fib_table_entry_delete_index(ep->fib_entry_index, FIB_SOURCE_SPECIAL);
-	  mcast_ep_remove(ep);
-        }
-
-      fib_node_deinit(&t->node);
-      vec_free (t->rewrite);
-      pool_put (vxm->tunnels, t);
-    }
-
-  if (sw_if_indexp)
-      *sw_if_indexp = sw_if_index;
-
-  return 0;
-}
-
-static u32 fib4_index_from_fib_id (u32 fib_id)
-{
-  ip4_main_t * im = &ip4_main;
-  uword * p;
-
-  p = hash_get (im->fib_index_by_table_id, fib_id);
-  if (!p)
-    return ~0;
-
-  return p[0];
-}
-
-static u32 fib6_index_from_fib_id (u32 fib_id)
-{
-  ip6_main_t * im = &ip6_main;
-  uword * p;
-
-  p = hash_get (im->fib_index_by_table_id, fib_id);
-  if (!p)
-    return ~0;
-
-  return p[0];
-}
-
-static uword get_decap_next_for_node(u32 node_index, u32 ipv4_set)
-{
-  vxlan_main_t * vxm = &vxlan_main;
-  vlib_main_t * vm = vxm->vlib_main;
-  uword next_index = ~0;
-
-  if (ipv4_set)
-    {
-      next_index = vlib_node_add_next (vm, vxlan4_input_node.index, node_index);
-    }
-  else
-    {
-      next_index = vlib_node_add_next (vm, vxlan6_input_node.index, node_index);
-    }
-
-  return next_index;
-}
-
-static uword unformat_decap_next (unformat_input_t * input, va_list * args)
-{
-  u32 * result = va_arg (*args, u32 *);
-  u32 ipv4_set = va_arg (*args, int);
-  vxlan_main_t * vxm = &vxlan_main;
-  vlib_main_t * vm = vxm->vlib_main;
-  u32 node_index;
-  u32 tmp;
-
-  if (unformat (input, "l2"))
-    *result = VXLAN_INPUT_NEXT_L2_INPUT;
-  else if (unformat (input, "node %U", unformat_vlib_node, vm, &node_index))
-    *result = get_decap_next_for_node(node_index, ipv4_set);
-  else if (unformat (input, "%d", &tmp))
-    *result = tmp;
-  else
-    return 0;
-  return 1;
-}
-
-static clib_error_t *
-vxlan_add_del_tunnel_command_fn (vlib_main_t * vm,
-                                   unformat_input_t * input,
-                                   vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, * line_input = &_line_input;
-  ip46_address_t src , dst;
-  u8 is_add = 1;
-  u8 src_set = 0;
-  u8 dst_set = 0;
-  u8 grp_set = 0;
-  u8 ipv4_set = 0;
-  u8 ipv6_set = 0;
-  u32 encap_fib_index = 0;
-  u32 mcast_sw_if_index = ~0;
-  u32 decap_next_index = VXLAN_INPUT_NEXT_L2_INPUT;
-  u32 vni = 0;
-  u32 tmp;
-  int rv;
-  vnet_vxlan_add_del_tunnel_args_t _a, * a = &_a;
-  u32 tunnel_sw_if_index;
-
-  /* Cant "universally zero init" (={0}) due to GCC bug 53119 */
-  memset(&src, 0, sizeof src);
-  memset(&dst, 0, sizeof dst);
-
-  /* Get a line of input. */
-  if (! unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (line_input, "del"))
-      {
-        is_add = 0;
-      }
-    else if (unformat (line_input, "src %U",
-                       unformat_ip4_address, &src.ip4))
-      {
-        src_set = 1;
-        ipv4_set = 1;
-      }
-    else if (unformat (line_input, "dst %U",
-                       unformat_ip4_address, &dst.ip4))
-      {
-        dst_set = 1;
-        ipv4_set = 1;
-      }
-    else if (unformat (line_input, "src %U", 
-                       unformat_ip6_address, &src.ip6))
-      {
-        src_set = 1;
-        ipv6_set = 1;
-      }
-    else if (unformat (line_input, "dst %U",
-                       unformat_ip6_address, &dst.ip6))
-      {
-        dst_set = 1;
-        ipv6_set = 1;
-      }
-    else if (unformat (line_input, "group %U %U",
-                       unformat_ip4_address, &dst.ip4,
-		       unformat_vnet_sw_interface,
-		       vnet_get_main(), &mcast_sw_if_index))
-      {
-        grp_set = dst_set = 1;
-        ipv4_set = 1;
-      }
-    else if (unformat (line_input, "group %U %U",
-                       unformat_ip6_address, &dst.ip6,
-		       unformat_vnet_sw_interface,
-		       vnet_get_main(), &mcast_sw_if_index))
-      {
-        grp_set = dst_set = 1;
-        ipv6_set = 1;
-      }
-    else if (unformat (line_input, "encap-vrf-id %d", &tmp))
-      {
-        if (ipv6_set)
-          encap_fib_index = fib6_index_from_fib_id (tmp);
-        else
-          encap_fib_index = fib4_index_from_fib_id (tmp);
-        if (encap_fib_index == ~0)
-          return clib_error_return (0, "nonexistent encap-vrf-id %d", tmp);
-      }
-    else if (unformat (line_input, "decap-next %U", unformat_decap_next, 
-                       &decap_next_index, ipv4_set))
-      ;
-    else if (unformat (line_input, "vni %d", &vni))
-      {
-        if (vni >> 24)  
-          return clib_error_return (0, "vni %d out of range", vni);
-      }
-    else 
-      return clib_error_return (0, "parse error: '%U'", 
-                                format_unformat_error, line_input);
-  }
-
-  unformat_free (line_input);
-
-  if (src_set == 0)
-    return clib_error_return (0, "tunnel src address not specified");
-
-  if (dst_set == 0)
-    return clib_error_return (0, "tunnel dst address not specified");
-
-  if (grp_set && !ip46_address_is_multicast(&dst))
-    return clib_error_return (0, "tunnel group address not multicast");
-
-  if (grp_set == 0 && ip46_address_is_multicast(&dst))
-    return clib_error_return (0, "dst address must be unicast");
-
-  if (grp_set && mcast_sw_if_index == ~0)
-    return clib_error_return (0, "tunnel nonexistent multicast device");
-
-  if (ipv4_set && ipv6_set)
-    return clib_error_return (0, "both IPv4 and IPv6 addresses specified");
-
-  if (ip46_address_cmp(&src, &dst) == 0)
-    return clib_error_return (0, "src and dst addresses are identical");
-
-  if (decap_next_index == ~0)
-    return clib_error_return (0, "next node not found");
-
-  if (vni == 0)
-    return clib_error_return (0, "vni not specified");
-
-  memset (a, 0, sizeof (*a));
-
-  a->is_add = is_add;
-  a->is_ip6 = ipv6_set;
-
-#define _(x) a->x = x;
-  foreach_copy_field;
-#undef _
-  
-  rv = vnet_vxlan_add_del_tunnel (a, &tunnel_sw_if_index);
-
-  switch(rv)
-    {
-    case 0:
-      if (is_add)
-        vlib_cli_output(vm, "%U\n", format_vnet_sw_if_index_name, 
-			vnet_get_main(), tunnel_sw_if_index);
-      break;
-
-    case VNET_API_ERROR_TUNNEL_EXIST:
-      return clib_error_return (0, "tunnel already exists...");
-
-    case VNET_API_ERROR_NO_SUCH_ENTRY:
-      return clib_error_return (0, "tunnel does not exist...");
-
-    default:
-      return clib_error_return 
-        (0, "vnet_vxlan_add_del_tunnel returned %d", rv);
-    }
-
-  return 0;
-}
-
-/*?
- * Add or delete a VXLAN Tunnel.
- *
- * VXLAN provides the features needed to allow L2 bridge domains (BDs)
- * to span multiple servers. This is done by building an L2 overlay on
- * top of an L3 network underlay using VXLAN tunnels.
- *
- * This makes it possible for servers to be co-located in the same data
- * center or be separated geographically as long as they are reachable
- * through the underlay L3 network.
- *
- * You can refer to this kind of L2 overlay bridge domain as a VXLAN
- * (Virtual eXtensible VLAN) segment.
- *
- * @cliexpar
- * Example of how to create a VXLAN Tunnel:
- * @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 vni 13 encap-vrf-id 7}
- * Example of how to delete a VXLAN Tunnel:
- * @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 vni 13 del}
- ?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (create_vxlan_tunnel_command, static) = {
-  .path = "create vxlan tunnel",
-  .short_help = 
-  "create vxlan tunnel src <local-vtep-addr>"
-  " {dst <remote-vtep-addr>|group <mcast-vtep-addr> <intf-name>} vni <nn>"
-  " [encap-vrf-id <nn>] [decap-next [l2|node <name>]] [del]",
-  .function = vxlan_add_del_tunnel_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-show_vxlan_tunnel_command_fn (vlib_main_t * vm,
-                                unformat_input_t * input,
-                                vlib_cli_command_t * cmd)
-{
-  vxlan_main_t * vxm = &vxlan_main;
-  vxlan_tunnel_t * t;
-  
-  if (pool_elts (vxm->tunnels) == 0)
-    vlib_cli_output (vm, "No vxlan tunnels configured...");
-
-  pool_foreach (t, vxm->tunnels,
-  ({
-    vlib_cli_output (vm, "%U", format_vxlan_tunnel, t);
-  }));
-  
-  return 0;
-}
-
-/*?
- * Display all the VXLAN Tunnel entries.
- *
- * @cliexpar
- * Example of how to display the VXLAN Tunnel entries:
- * @cliexstart{show vxlan tunnel}
- * [0] src 10.0.3.1 dst 10.0.3.3 vni 13 encap_fib_index 0 sw_if_index 5 decap_next l2
- * @cliexend
- ?*/
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_vxlan_tunnel_command, static) = {
-    .path = "show vxlan tunnel",
-    .short_help = "show vxlan tunnel",
-    .function = show_vxlan_tunnel_command_fn,
-};
-/* *INDENT-ON* */
-
-
-clib_error_t *vxlan_init (vlib_main_t *vm)
-{
-  vxlan_main_t * vxm = &vxlan_main;
-  
-  vxm->vnet_main = vnet_get_main();
-  vxm->vlib_main = vm;
-
-  /* initialize the ip6 hash */
-  vxm->vxlan6_tunnel_by_key = hash_create_mem(0,
-        sizeof(vxlan6_tunnel_key_t),
-        sizeof(uword));
-  vxm->mcast_ep_by_ip = hash_create_mem(0,
-        sizeof(ip46_address_t),
-	sizeof(uword));
-
-  udp_register_dst_port (vm, UDP_DST_PORT_vxlan, 
-                         vxlan4_input_node.index, /* is_ip4 */ 1);
-  udp_register_dst_port (vm, UDP_DST_PORT_vxlan6,
-                         vxlan6_input_node.index, /* is_ip4 */ 0);
-
-  fib_node_register_type(FIB_NODE_TYPE_VXLAN_TUNNEL, &vxlan_vft);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION(vxlan_init);
diff --git a/vnet/vnet/vxlan/vxlan.h b/vnet/vnet/vxlan/vxlan.h
deleted file mode 100644
index 7605d94a..00000000
--- a/vnet/vnet/vxlan/vxlan.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vnet_vxlan_h
-#define included_vnet_vxlan_h
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/l2_output.h>
-#include <vnet/l2/l2_bd.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/vxlan/vxlan_packet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vnet/ip/udp.h>
-#include <vnet/dpo/dpo.h>
-#include <vnet/adj/adj_types.h>
-
-typedef CLIB_PACKED (struct {
-  ip4_header_t ip4;            /* 20 bytes */
-  udp_header_t udp;            /* 8 bytes */
-  vxlan_header_t vxlan;        /* 8 bytes */
-}) ip4_vxlan_header_t;
-
-typedef CLIB_PACKED (struct {
-  ip6_header_t ip6;            /* 40 bytes */
-  udp_header_t udp;            /* 8 bytes */
-  vxlan_header_t vxlan;        /* 8 bytes */
-}) ip6_vxlan_header_t;
-
-typedef CLIB_PACKED(struct {
-  /* 
-   * Key fields: ip src and vxlan vni on incoming VXLAN packet
-   * all fields in NET byte order
-   */
-  union {
-    struct {
-      u32 src;
-      u32 vni;                 /* shifted left 8 bits */
-    };
-    u64 as_u64;
-  };
-}) vxlan4_tunnel_key_t;
-
-typedef CLIB_PACKED(struct {
-  /*
-   * Key fields: ip src and vxlan vni on incoming VXLAN packet
-   * all fields in NET byte order
-   */
-  ip6_address_t src;
-  u32 vni;                 /* shifted left 8 bits */
-}) vxlan6_tunnel_key_t;
-
-typedef struct {
-  /* Rewrite string. $$$$ embed vnet_rewrite header */
-  u8 * rewrite;
-
-  /* FIB DPO for IP forwarding of VXLAN encap packet */
-  dpo_id_t next_dpo;  
-
-  /* storage for the hash key */
-  union {
-    vxlan4_tunnel_key_t *key4; /* unused for now */
-    vxlan6_tunnel_key_t *key6;
-  };
-
-  /* vxlan VNI in HOST byte order */
-  u32 vni;
-
-  /* tunnel src and dst addresses */
-  ip46_address_t src;
-  ip46_address_t dst;
-
-  /* mcast packet output intfc index (used only if dst is mcast) */
-  u32 mcast_sw_if_index;
-
-  /* decap next index */
-  u32 decap_next_index;
-
-  /* The FIB index for src/dst addresses */
-  u32 encap_fib_index;
-
-  /* vnet intfc index */
-  u32 sw_if_index;
-  u32 hw_if_index;
-
-  /**
-   * Linkage into the FIB object graph
-   */
-  fib_node_t node;
-
-  /*
-   * The FIB entry for (depending on VXLAN tunnel is unicast or mcast)
-   * sending unicast VXLAN encap packets or receiving mcast VXLAN packets
-   */
-  fib_node_index_t fib_entry_index;
-  adj_index_t mcast_adj_index;
-
-  /**
-   * The tunnel is a child of the FIB entry for its desintion. This is
-   * so it receives updates when the forwarding information for that entry
-   * changes.
-   * The tunnels sibling index on the FIB entry's dependency list.
-   */
-  u32 sibling_index;
-} vxlan_tunnel_t;
-
-#define foreach_vxlan_input_next        \
-_(DROP, "error-drop")                   \
-_(L2_INPUT, "l2-input")
-
-typedef enum {
-#define _(s,n) VXLAN_INPUT_NEXT_##s,
-  foreach_vxlan_input_next
-#undef _
-  VXLAN_INPUT_N_NEXT,
-} vxlan_input_next_t;
-
-typedef enum {
-#define vxlan_error(n,s) VXLAN_ERROR_##n,
-#include <vnet/vxlan/vxlan_error.def>
-#undef vxlan_error
-  VXLAN_N_ERROR,
-} vxlan_input_error_t;
-
-typedef struct {
-  ip46_address_t ip;
-  fib_node_index_t fib_entry_index;
-  adj_index_t mcast_adj_index;
-} mcast_remote_t;
-
-typedef struct {
-  /* vector of encap tunnel instances */
-  vxlan_tunnel_t * tunnels;
-
-  /* lookup tunnel by key */
-  uword * vxlan4_tunnel_by_key; /* keyed on ipv4.dst + vni */
-  uword * vxlan6_tunnel_by_key; /* keyed on ipv6.dst + vni */
-
-  /* local VTEP IPs ref count used by vxlan-bypass node to check if
-     received VXLAN packet DIP matches any local VTEP address */
-  uword * vtep4;  /* local ip4 VTEPs keyed on their ip4 addr */
-  uword * vtep6;  /* local ip6 VTEPs keyed on their ip6 addr */
-
-  /* set of active remote mcast VTEP */
-  mcast_remote_t * mcast_eps;
-  uword * mcast_ep_by_ip; /* mcast VTEPs keyed on their ip46 addr */
-
-  /* Free vlib hw_if_indices */
-  u32 * free_vxlan_tunnel_hw_if_indices;
-
-  /* Mapping from sw_if_index to tunnel index */
-  u32 * tunnel_index_by_sw_if_index;
-
-  /* convenience */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-} vxlan_main_t;
-
-vxlan_main_t vxlan_main;
-
-extern vlib_node_registration_t vxlan4_input_node;
-extern vlib_node_registration_t vxlan6_input_node;
-extern vlib_node_registration_t vxlan4_encap_node;
-extern vlib_node_registration_t vxlan6_encap_node;
-
-u8 * format_vxlan_encap_trace (u8 * s, va_list * args);
-
-typedef struct {
-  u8 is_add;
-
-  /* we normally use is_ip4, but since this adds to the
-   * structure, this seems less of abreaking change */
-  u8 is_ip6;
-  ip46_address_t src, dst;
-  u32 mcast_sw_if_index;
-  u32 encap_fib_index;
-  u32 decap_next_index;
-  u32 vni;
-} vnet_vxlan_add_del_tunnel_args_t;
-
-int vnet_vxlan_add_del_tunnel 
-(vnet_vxlan_add_del_tunnel_args_t *a, u32 * sw_if_indexp);
-
-#endif /* included_vnet_vxlan_h */
diff --git a/vnet/vnet/vxlan/vxlan_api.c b/vnet/vnet/vxlan/vxlan_api.c
deleted file mode 100644
index 6c9cbd79..00000000
--- a/vnet/vnet/vxlan/vxlan_api.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- *------------------------------------------------------------------
- * vxlan_api.c - vxlan api
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vlibmemory/api.h>
-
-#include <vnet/interface.h>
-#include <vnet/api_errno.h>
-#include <vnet/feature/feature.h>
-#include <vnet/vxlan/vxlan.h>
-#include <vnet/fib/fib_table.h>
-
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-#include <vlibapi/api_helper_macros.h>
-
-#define foreach_vpe_api_msg                             \
-_(SW_INTERFACE_SET_VXLAN_BYPASS, sw_interface_set_vxlan_bypass)         \
-_(VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel)                           \
-_(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump)
-
-static void
-  vl_api_sw_interface_set_vxlan_bypass_t_handler
-  (vl_api_sw_interface_set_vxlan_bypass_t * mp)
-{
-  vl_api_sw_interface_set_vxlan_bypass_reply_t *rmp;
-  int rv = 0;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  if (mp->is_ipv6)
-    {
-      /* not yet implemented */
-    }
-  else
-    vnet_feature_enable_disable ("ip4-unicast", "ip4-vxlan-bypass",
-				 sw_if_index, mp->enable, 0, 0);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_VXLAN_BYPASS_REPLY);
-}
-
-static void vl_api_vxlan_add_del_tunnel_t_handler
-  (vl_api_vxlan_add_del_tunnel_t * mp)
-{
-  vl_api_vxlan_add_del_tunnel_reply_t *rmp;
-  int rv = 0;
-  vnet_vxlan_add_del_tunnel_args_t _a, *a = &_a;
-  u32 encap_fib_index;
-  uword *p;
-  ip4_main_t *im = &ip4_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index = ~0;
-
-  p = hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id));
-  if (!p)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_FIB;
-      goto out;
-    }
-  encap_fib_index = p[0];
-  memset (a, 0, sizeof (*a));
-
-  a->is_add = mp->is_add;
-  a->is_ip6 = mp->is_ipv6;
-
-  /* ip addresses sent in network byte order */
-  ip46_from_addr_buf (mp->is_ipv6, mp->dst_address, &a->dst);
-  ip46_from_addr_buf (mp->is_ipv6, mp->src_address, &a->src);
-
-  /* Check src & dst are different */
-  if (ip46_address_cmp (&a->dst, &a->src) == 0)
-    {
-      rv = VNET_API_ERROR_SAME_SRC_DST;
-      goto out;
-    }
-  a->mcast_sw_if_index = ntohl (mp->mcast_sw_if_index);
-  if (ip46_address_is_multicast (&a->dst) &&
-      pool_is_free_index (vnm->interface_main.sw_interfaces,
-			  a->mcast_sw_if_index))
-    {
-      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-      goto out;
-    }
-  a->encap_fib_index = encap_fib_index;
-  a->decap_next_index = ntohl (mp->decap_next_index);
-  a->vni = ntohl (mp->vni);
-  rv = vnet_vxlan_add_del_tunnel (a, &sw_if_index);
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_VXLAN_ADD_DEL_TUNNEL_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void send_vxlan_tunnel_details
-  (vxlan_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_vxlan_tunnel_details_t *rmp;
-  ip4_main_t *im4 = &ip4_main;
-  ip6_main_t *im6 = &ip6_main;
-  u8 is_ipv6 = !ip46_address_is_ip4 (&t->dst);
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_VXLAN_TUNNEL_DETAILS);
-  if (is_ipv6)
-    {
-      memcpy (rmp->src_address, t->src.ip6.as_u8, 16);
-      memcpy (rmp->dst_address, t->dst.ip6.as_u8, 16);
-      rmp->encap_vrf_id = htonl (im6->fibs[t->encap_fib_index].ft_table_id);
-    }
-  else
-    {
-      memcpy (rmp->src_address, t->src.ip4.as_u8, 4);
-      memcpy (rmp->dst_address, t->dst.ip4.as_u8, 4);
-      rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id);
-    }
-  rmp->mcast_sw_if_index = htonl (t->mcast_sw_if_index);
-  rmp->vni = htonl (t->vni);
-  rmp->decap_next_index = htonl (t->decap_next_index);
-  rmp->sw_if_index = htonl (t->sw_if_index);
-  rmp->is_ipv6 = is_ipv6;
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void vl_api_vxlan_tunnel_dump_t_handler
-  (vl_api_vxlan_tunnel_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  vxlan_main_t *vxm = &vxlan_main;
-  vxlan_tunnel_t *t;
-  u32 sw_if_index;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  if (~0 == sw_if_index)
-    {
-      /* *INDENT-OFF* */
-      pool_foreach (t, vxm->tunnels,
-      ({
-        send_vxlan_tunnel_details(t, q, mp->context);
-      }));
-      /* *INDENT-ON* */
-    }
-  else
-    {
-      if ((sw_if_index >= vec_len (vxm->tunnel_index_by_sw_if_index)) ||
-	  (~0 == vxm->tunnel_index_by_sw_if_index[sw_if_index]))
-	{
-	  return;
-	}
-      t = &vxm->tunnels[vxm->tunnel_index_by_sw_if_index[sw_if_index]];
-      send_vxlan_tunnel_details (t, q, mp->context);
-    }
-}
-
-/*
- * vpe_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_vxlan;
-#undef _
-}
-
-static clib_error_t *
-vxlan_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  am->api_trace_cfg[VL_API_VXLAN_ADD_DEL_TUNNEL].size += 16 * sizeof (u32);
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (vxlan_api_hookup);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vnet/vnet/vxlan/vxlan_error.def b/vnet/vnet/vxlan/vxlan_error.def
deleted file mode 100644
index 17f90595..00000000
--- a/vnet/vnet/vxlan/vxlan_error.def
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-vxlan_error (DECAPSULATED, "good packets decapsulated")
-vxlan_error (NO_SUCH_TUNNEL, "no such tunnel packets")
-vxlan_error (BAD_FLAGS, "packets with bad flags field in vxlan header")
diff --git a/vnet/vnet/vxlan/vxlan_packet.h b/vnet/vnet/vxlan/vxlan_packet.h
deleted file mode 100644
index 5f93a36f..00000000
--- a/vnet/vnet/vxlan/vxlan_packet.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_vxlan_packet_h__
-#define __included_vxlan_packet_h__ 1
-
-/* 
- * From RFC-7384
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * |R|R|R|R|I|R|R|R|            Reserved                           |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * |                VXLAN Network Identifier (VNI) |   Reserved    |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * 
- * VXLAN Header:  This is an 8-byte field that has:
- * 
- * - Flags (8 bits): where the I flag MUST be set to 1 for a valid
- * VXLAN Network ID (VNI).  The other 7 bits (designated "R") are
- * reserved fields and MUST be set to zero on transmission and
- * ignored on receipt.
- * 
- * - VXLAN Segment ID/VXLAN Network Identifier (VNI): this is a
- * 24-bit value used to designate the individual VXLAN overlay
- * network on which the communicating VMs are situated.  VMs in
- * different VXLAN overlay networks cannot communicate with each
- * other.
- * 
- * - Reserved fields (24 bits and 8 bits): MUST be set to zero on
- * transmission and ignored on receipt.
- * 
- */
-
-typedef struct {
-  u8 flags;
-  u8 res1;
-  u8 res2;
-  u8 res3;
-  u32 vni_reserved;
-} vxlan_header_t;
-
-#define VXLAN_FLAGS_I 0x08
-
-static inline u32 vnet_get_vni (vxlan_header_t * h)
-{
-  u32 vni_reserved_host_byte_order;
-
-  vni_reserved_host_byte_order = clib_net_to_host_u32 (h->vni_reserved);
-  return vni_reserved_host_byte_order >> 8;
-}
-
-static inline void vnet_set_vni_and_flags (vxlan_header_t * h, u32 vni)
-{
-  h->vni_reserved = clib_host_to_net_u32 (vni<<8);
-  * (u32 *) h = 0;
-  h->flags = VXLAN_FLAGS_I;
-}
-
-#endif /* __included_vxlan_packet_h__ */
diff --git a/vpp-api-test/Makefile.am b/vpp-api-test/Makefile.am
deleted file mode 100644
index 27466fad..00000000
--- a/vpp-api-test/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall @Q_PLATFORM_DEFINE@ @Q_PLATFORM_PLUGPATH@ @DPDK@ @DPDK_CRYPTO@
-
-libvatplugin_la_SOURCES = \
-  vat/plugin_api.c
-
-lib_LTLIBRARIES = libvatplugin.la	
-
-bin_PROGRAMS = vpp_api_test vpp_json_test vpp_restart
-
-vpp_api_test_SOURCES = vat/api_format.c vat/main.c vat/plugin.c vat/vat.h vat/json_format.h vat/json_format.c
-vpp_json_test_SOURCES = vat/json_format.h vat/json_format.c vat/json_test.c
-
-vpp_api_test_LDADD = -lvlibmemoryclient -lvlibapi -lsvm \
-	-lvppinfra -lpthread -lm \
-	-lrt -ldl libvatplugin.la
-vpp_json_test_LDADD = -lvppinfra -lm
-nobase_include_HEADERS = vat/vat.h vat/json_format.h
-
-vpp_restart_SOURCES = vat/restart.c
-vpp_restart_LDADD = -lsvmdb -lsvm -lvppinfra -lpthread -lrt
-
-dist_bin_SCRIPTS = scripts/vppctl
diff --git a/vpp-api-test/configure.ac b/vpp-api-test/configure.ac
deleted file mode 100644
index cf0af125..00000000
--- a/vpp-api-test/configure.ac
+++ /dev/null
@@ -1,40 +0,0 @@
-AC_INIT(vpp-api-test, 1.0)
-LT_INIT
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-AC_ARG_WITH(q-plugin-prefix,
-            AC_HELP_STRING([--with-q-plugin-prefix],[vlib plugin prefix]),
-       	    [case $with_q_plugin_prefix in
-	       *) ;;
-             esac])
-
-AC_ARG_WITH(q-platform,
-            AC_HELP_STRING([--with-q-platform],[Build version for given platform (qnative)]),
-	    [case $with_q_platform in
-	       qnative) ;;
-               vpp) with_q_platform=vpp;;
-	       *) with_q_platform=qnative;;
-	     esac])
-
-AC_ARG_WITH(dpdk,
-            AC_HELP_STRING([--with-dpdk],[Use DPDK]),
-            [with_dpdk=1],
-            [with_dpdk=0])
-
-AC_ARG_WITH(dpdk_crypto,
-            AC_HELP_STRING([--with-dpdk-crypto],[Use DPDK cryptodev]),
-            [with_dpdk_crypto=1],
-            [with_dpdk_crypto=0])
-
-AC_SUBST(Q_PLATFORM_DEFINE,[-DQ_PLATFORM_${with_q_platform}])
-AC_SUBST(Q_PLATFORM_PLUGPATH,[-DQ_PLUGIN_PREFIX=${with_q_plugin_prefix}])
-AC_SUBST(DPDK,[-DDPDK=${with_dpdk}])
-AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1")
-AC_SUBST(DPDK_CRYPTO,[-DDPDK_CRYPTO=${with_dpdk_crypto}])
-AM_CONDITIONAL(WITH_DPDK_CRYPTO, test "$with_dpdk_crypto" = "1")
-
-
-AC_OUTPUT([Makefile])
diff --git a/vpp-api-test/scripts/vppctl b/vpp-api-test/scripts/vppctl
deleted file mode 100755
index 4fdf03c7..00000000
--- a/vpp-api-test/scripts/vppctl
+++ /dev/null
@@ -1,121 +0,0 @@
-#! /usr/bin/python
-'''
-Copyright 2016 Intel Corporation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-'''
-
-from cmd import Cmd
-import os
-import subprocess
-import re
-import sys
-try:
-        import readline
-except ImportError:
-        readline = None
-
-persishist = os.path.expanduser('~/.vpphistory')
-persishist_size = 1000
-if not persishist:
-        os.mknod(persishist, stat.S_IFREG)
-
-class Vppctl(Cmd):
-
-        def historyWrite(self):
-                if readline:
-                        readline.set_history_length(persishist_size)
-                        readline.write_history_file(persishist)
-
-        def runVat(self, line):
-                input_prefix = "exec "
-                input_command = input_prefix + line
-                line_remove = '^load_one_plugin:'
-                s = '\n'
-                command = ['vpp_api_test']
-
-                if os.geteuid() != 0:
-                    command = ['sudo', 'vpp_api_test']
-
-                vpp_process = subprocess.Popen(command,
-                        stderr=subprocess.PIPE,
-                        stdin=subprocess.PIPE,
-                        stdout=subprocess.PIPE)
-                stdout_value = vpp_process.communicate(input_command)[0]
-
-                buffer_stdout = stdout_value.splitlines()
-
-                buffer_stdout[:]  = [b for b in buffer_stdout
-                        if line_remove not in b]
-
-                for i, num in enumerate(buffer_stdout):
-                        buffer_stdout[i] = num.replace('vat# ','')
-
-                stdout_value = s.join(buffer_stdout)
-                print stdout_value
-
-        def do_help(self, line):
-                self.runVat("help")
-
-        def default(self, line):
-                self.runVat(line)
-
-        def do_exit(self, line):
-                self.historyWrite()
-                raise SystemExit
-
-        def emptyline(self):
-                pass
-
-        def do_EOF(self,line):
-                self.historyWrite()
-                sys.stdout.write('\n')
-                raise SystemExit
-
-        def preloop(self):
-                if readline and os.path.exists(persishist):
-                        readline.read_history_file(persishist)
-
-        def postcmd(self, stop, line):
-                self.historyWrite()
-
-if __name__ == '__main__':
-        command_args = sys.argv
-
-
-        if not len(command_args) > 1:
-                prompt = Vppctl()
-                red_set = '\033[31m'
-                norm_set = '\033[0m'
-                if sys.stdout.isatty():
-                        prompt.prompt = 'vpp# '
-                        try:
-                                prompt.cmdloop(red_set + "    _______    _       " + norm_set + " _   _____  ___ \n" +
-                                        red_set + " __/ __/ _ \  (_)__   " + norm_set + " | | / / _ \/ _ \\\n" +
-                                        red_set + " _/ _// // / / / _ \\" + norm_set + "   | |/ / ___/ ___/\n" +
-                                        red_set + " /_/ /____(_)_/\___/   " + norm_set + "|___/_/  /_/   \n")
-                        except KeyboardInterrupt:
-                                sys.stdout.write('\n')
-                else:
-                        try:
-                                prompt.cmdloop()
-                        except KeyboardInterrupt:
-                                sys.stdout.write('\n')
-        else:
-                del command_args[0]
-                stdout_value = " ".join(command_args)
-                VatAddress = Vppctl()
-                VatAddress.runVat(stdout_value)
-
-
-
diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c
deleted file mode 100644
index a864ab23..00000000
--- a/vpp-api-test/vat/api_format.c
+++ /dev/null
@@ -1,17827 +0,0 @@
-/*
- *------------------------------------------------------------------
- * api_format.c
- *
- * Copyright (c) 2014-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include "vat.h"
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-#include <vnet/ip/ip.h>
-#include <vnet/sr/sr_packet.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2tp/l2tp.h>
-#include <vnet/vxlan/vxlan.h>
-#include <vnet/gre/gre.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <vnet/lisp-gpe/lisp_gpe.h>
-
-#include <vpp-api/vpe_msg_enum.h>
-#include <vnet/l2/l2_classify.h>
-#include <vnet/l2/l2_vtr.h>
-#include <vnet/classify/input_acl.h>
-#include <vnet/classify/policer_classify.h>
-#include <vnet/classify/flow_classify.h>
-#include <vnet/mpls/mpls.h>
-#include <vnet/ipsec/ipsec.h>
-#include <vnet/ipsec/ikev2.h>
-#include <inttypes.h>
-#include <vnet/map/map.h>
-#include <vnet/cop/cop.h>
-#include <vnet/ip/ip6_hop_by_hop.h>
-#include <vnet/ip/ip_source_and_port_range_check.h>
-#include <vnet/policer/xlate.h>
-#include <vnet/span/span.h>
-#include <vnet/policer/policer.h>
-#include <vnet/policer/police.h>
-
-#include <inttypes.h>
-#include <sys/stat.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_printfun
-
-static uword
-api_unformat_sw_if_index (unformat_input_t * input, va_list * args)
-{
-  vat_main_t *vam = va_arg (*args, vat_main_t *);
-  u32 *result = va_arg (*args, u32 *);
-  u8 *if_name;
-  uword *p;
-
-  if (!unformat (input, "%s", &if_name))
-    return 0;
-
-  p = hash_get_mem (vam->sw_if_index_by_interface_name, if_name);
-  if (p == 0)
-    return 0;
-  *result = p[0];
-  return 1;
-}
-
-void vat_suspend (vlib_main_t * vm, f64 interval);
-
-#if VPP_API_TEST_BUILTIN == 0
-/* Parse an IP4 address %d.%d.%d.%d. */
-uword
-unformat_ip4_address (unformat_input_t * input, va_list * args)
-{
-  u8 *result = va_arg (*args, u8 *);
-  unsigned a[4];
-
-  if (!unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]))
-    return 0;
-
-  if (a[0] >= 256 || a[1] >= 256 || a[2] >= 256 || a[3] >= 256)
-    return 0;
-
-  result[0] = a[0];
-  result[1] = a[1];
-  result[2] = a[2];
-  result[3] = a[3];
-
-  return 1;
-}
-
-uword
-unformat_ethernet_address (unformat_input_t * input, va_list * args)
-{
-  u8 *result = va_arg (*args, u8 *);
-  u32 i, a[6];
-
-  if (!unformat (input, "%_%x:%x:%x:%x:%x:%x%_",
-		 &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
-    return 0;
-
-  /* Check range. */
-  for (i = 0; i < 6; i++)
-    if (a[i] >= (1 << 8))
-      return 0;
-
-  for (i = 0; i < 6; i++)
-    result[i] = a[i];
-
-  return 1;
-}
-
-/* Returns ethernet type as an int in host byte order. */
-uword
-unformat_ethernet_type_host_byte_order (unformat_input_t * input,
-					va_list * args)
-{
-  u16 *result = va_arg (*args, u16 *);
-  int type;
-
-  /* Numeric type. */
-  if (unformat (input, "0x%x", &type) || unformat (input, "%d", &type))
-    {
-      if (type >= (1 << 16))
-	return 0;
-      *result = type;
-      return 1;
-    }
-  return 0;
-}
-
-/* Parse an IP6 address. */
-uword
-unformat_ip6_address (unformat_input_t * input, va_list * args)
-{
-  ip6_address_t *result = va_arg (*args, ip6_address_t *);
-  u16 hex_quads[8];
-  uword hex_quad, n_hex_quads, hex_digit, n_hex_digits;
-  uword c, n_colon, double_colon_index;
-
-  n_hex_quads = hex_quad = n_hex_digits = n_colon = 0;
-  double_colon_index = ARRAY_LEN (hex_quads);
-  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
-    {
-      hex_digit = 16;
-      if (c >= '0' && c <= '9')
-	hex_digit = c - '0';
-      else if (c >= 'a' && c <= 'f')
-	hex_digit = c + 10 - 'a';
-      else if (c >= 'A' && c <= 'F')
-	hex_digit = c + 10 - 'A';
-      else if (c == ':' && n_colon < 2)
-	n_colon++;
-      else
-	{
-	  unformat_put_input (input);
-	  break;
-	}
-
-      /* Too many hex quads. */
-      if (n_hex_quads >= ARRAY_LEN (hex_quads))
-	return 0;
-
-      if (hex_digit < 16)
-	{
-	  hex_quad = (hex_quad << 4) | hex_digit;
-
-	  /* Hex quad must fit in 16 bits. */
-	  if (n_hex_digits >= 4)
-	    return 0;
-
-	  n_colon = 0;
-	  n_hex_digits++;
-	}
-
-      /* Save position of :: */
-      if (n_colon == 2)
-	{
-	  /* More than one :: ? */
-	  if (double_colon_index < ARRAY_LEN (hex_quads))
-	    return 0;
-	  double_colon_index = n_hex_quads;
-	}
-
-      if (n_colon > 0 && n_hex_digits > 0)
-	{
-	  hex_quads[n_hex_quads++] = hex_quad;
-	  hex_quad = 0;
-	  n_hex_digits = 0;
-	}
-    }
-
-  if (n_hex_digits > 0)
-    hex_quads[n_hex_quads++] = hex_quad;
-
-  {
-    word i;
-
-    /* Expand :: to appropriate number of zero hex quads. */
-    if (double_colon_index < ARRAY_LEN (hex_quads))
-      {
-	word n_zero = ARRAY_LEN (hex_quads) - n_hex_quads;
-
-	for (i = n_hex_quads - 1; i >= (signed) double_colon_index; i--)
-	  hex_quads[n_zero + i] = hex_quads[i];
-
-	for (i = 0; i < n_zero; i++)
-	  hex_quads[double_colon_index + i] = 0;
-
-	n_hex_quads = ARRAY_LEN (hex_quads);
-      }
-
-    /* Too few hex quads given. */
-    if (n_hex_quads < ARRAY_LEN (hex_quads))
-      return 0;
-
-    for (i = 0; i < ARRAY_LEN (hex_quads); i++)
-      result->as_u16[i] = clib_host_to_net_u16 (hex_quads[i]);
-
-    return 1;
-  }
-}
-
-uword
-unformat_ipsec_policy_action (unformat_input_t * input, va_list * args)
-{
-  u32 *r = va_arg (*args, u32 *);
-
-  if (0);
-#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_POLICY_ACTION_##f;
-  foreach_ipsec_policy_action
-#undef _
-    else
-    return 0;
-  return 1;
-}
-
-uword
-unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args)
-{
-  u32 *r = va_arg (*args, u32 *);
-
-  if (0);
-#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_CRYPTO_ALG_##f;
-  foreach_ipsec_crypto_alg
-#undef _
-    else
-    return 0;
-  return 1;
-}
-
-u8 *
-format_ipsec_crypto_alg (u8 * s, va_list * args)
-{
-  u32 i = va_arg (*args, u32);
-  u8 *t = 0;
-
-  switch (i)
-    {
-#define _(v,f,str) case IPSEC_CRYPTO_ALG_##f: t = (u8 *) str; break;
-      foreach_ipsec_crypto_alg
-#undef _
-    default:
-      return format (s, "unknown");
-    }
-  return format (s, "%s", t);
-}
-
-uword
-unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args)
-{
-  u32 *r = va_arg (*args, u32 *);
-
-  if (0);
-#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_INTEG_ALG_##f;
-  foreach_ipsec_integ_alg
-#undef _
-    else
-    return 0;
-  return 1;
-}
-
-u8 *
-format_ipsec_integ_alg (u8 * s, va_list * args)
-{
-  u32 i = va_arg (*args, u32);
-  u8 *t = 0;
-
-  switch (i)
-    {
-#define _(v,f,str) case IPSEC_INTEG_ALG_##f: t = (u8 *) str; break;
-      foreach_ipsec_integ_alg
-#undef _
-    default:
-      return format (s, "unknown");
-    }
-  return format (s, "%s", t);
-}
-
-uword
-unformat_ikev2_auth_method (unformat_input_t * input, va_list * args)
-{
-  u32 *r = va_arg (*args, u32 *);
-
-  if (0);
-#define _(v,f,s) else if (unformat (input, s)) *r = IKEV2_AUTH_METHOD_##f;
-  foreach_ikev2_auth_method
-#undef _
-    else
-    return 0;
-  return 1;
-}
-
-uword
-unformat_ikev2_id_type (unformat_input_t * input, va_list * args)
-{
-  u32 *r = va_arg (*args, u32 *);
-
-  if (0);
-#define _(v,f,s) else if (unformat (input, s)) *r = IKEV2_ID_TYPE_##f;
-  foreach_ikev2_id_type
-#undef _
-    else
-    return 0;
-  return 1;
-}
-#endif /* VPP_API_TEST_BUILTIN */
-
-static uword
-unformat_policer_rate_type (unformat_input_t * input, va_list * args)
-{
-  u8 *r = va_arg (*args, u8 *);
-
-  if (unformat (input, "kbps"))
-    *r = SSE2_QOS_RATE_KBPS;
-  else if (unformat (input, "pps"))
-    *r = SSE2_QOS_RATE_PPS;
-  else
-    return 0;
-  return 1;
-}
-
-static uword
-unformat_policer_round_type (unformat_input_t * input, va_list * args)
-{
-  u8 *r = va_arg (*args, u8 *);
-
-  if (unformat (input, "closest"))
-    *r = SSE2_QOS_ROUND_TO_CLOSEST;
-  else if (unformat (input, "up"))
-    *r = SSE2_QOS_ROUND_TO_UP;
-  else if (unformat (input, "down"))
-    *r = SSE2_QOS_ROUND_TO_DOWN;
-  else
-    return 0;
-  return 1;
-}
-
-static uword
-unformat_policer_type (unformat_input_t * input, va_list * args)
-{
-  u8 *r = va_arg (*args, u8 *);
-
-  if (unformat (input, "1r2c"))
-    *r = SSE2_QOS_POLICER_TYPE_1R2C;
-  else if (unformat (input, "1r3c"))
-    *r = SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697;
-  else if (unformat (input, "2r3c-2698"))
-    *r = SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698;
-  else if (unformat (input, "2r3c-4115"))
-    *r = SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115;
-  else if (unformat (input, "2r3c-mef5cf1"))
-    *r = SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1;
-  else
-    return 0;
-  return 1;
-}
-
-static uword
-unformat_dscp (unformat_input_t * input, va_list * va)
-{
-  u8 *r = va_arg (*va, u8 *);
-
-  if (0);
-#define _(v,f,str) else if (unformat (input, str)) *r = VNET_DSCP_##f;
-  foreach_vnet_dscp
-#undef _
-    else
-    return 0;
-  return 1;
-}
-
-static uword
-unformat_policer_action_type (unformat_input_t * input, va_list * va)
-{
-  sse2_qos_pol_action_params_st *a
-    = va_arg (*va, sse2_qos_pol_action_params_st *);
-
-  if (unformat (input, "drop"))
-    a->action_type = SSE2_QOS_ACTION_DROP;
-  else if (unformat (input, "transmit"))
-    a->action_type = SSE2_QOS_ACTION_TRANSMIT;
-  else if (unformat (input, "mark-and-transmit %U", unformat_dscp, &a->dscp))
-    a->action_type = SSE2_QOS_ACTION_MARK_AND_TRANSMIT;
-  else
-    return 0;
-  return 1;
-}
-
-static uword
-unformat_policer_classify_table_type (unformat_input_t * input, va_list * va)
-{
-  u32 *r = va_arg (*va, u32 *);
-  u32 tid;
-
-  if (unformat (input, "ip4"))
-    tid = POLICER_CLASSIFY_TABLE_IP4;
-  else if (unformat (input, "ip6"))
-    tid = POLICER_CLASSIFY_TABLE_IP6;
-  else if (unformat (input, "l2"))
-    tid = POLICER_CLASSIFY_TABLE_L2;
-  else
-    return 0;
-
-  *r = tid;
-  return 1;
-}
-
-static uword
-unformat_flow_classify_table_type (unformat_input_t * input, va_list * va)
-{
-  u32 *r = va_arg (*va, u32 *);
-  u32 tid;
-
-  if (unformat (input, "ip4"))
-    tid = FLOW_CLASSIFY_TABLE_IP4;
-  else if (unformat (input, "ip6"))
-    tid = FLOW_CLASSIFY_TABLE_IP6;
-  else
-    return 0;
-
-  *r = tid;
-  return 1;
-}
-
-#if (VPP_API_TEST_BUILTIN==0)
-u8 *
-format_ip4_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
-}
-
-u8 *
-format_ip6_address (u8 * s, va_list * args)
-{
-  ip6_address_t *a = va_arg (*args, ip6_address_t *);
-  u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
-
-  i_max_n_zero = ARRAY_LEN (a->as_u16);
-  max_n_zeros = 0;
-  i_first_zero = i_max_n_zero;
-  n_zeros = 0;
-  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
-    {
-      u32 is_zero = a->as_u16[i] == 0;
-      if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
-	{
-	  i_first_zero = i;
-	  n_zeros = 0;
-	}
-      n_zeros += is_zero;
-      if ((!is_zero && n_zeros > max_n_zeros)
-	  || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
-	{
-	  i_max_n_zero = i_first_zero;
-	  max_n_zeros = n_zeros;
-	  i_first_zero = ARRAY_LEN (a->as_u16);
-	  n_zeros = 0;
-	}
-    }
-
-  last_double_colon = 0;
-  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
-    {
-      if (i == i_max_n_zero && max_n_zeros > 1)
-	{
-	  s = format (s, "::");
-	  i += max_n_zeros - 1;
-	  last_double_colon = 1;
-	}
-      else
-	{
-	  s = format (s, "%s%x",
-		      (last_double_colon || i == 0) ? "" : ":",
-		      clib_net_to_host_u16 (a->as_u16[i]));
-	  last_double_colon = 0;
-	}
-    }
-
-  return s;
-}
-
-/* Format an IP46 address. */
-u8 *
-format_ip46_address (u8 * s, va_list * args)
-{
-  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
-  ip46_type_t type = va_arg (*args, ip46_type_t);
-  int is_ip4 = 1;
-
-  switch (type)
-    {
-    case IP46_TYPE_ANY:
-      is_ip4 = ip46_address_is_ip4 (ip46);
-      break;
-    case IP46_TYPE_IP4:
-      is_ip4 = 1;
-      break;
-    case IP46_TYPE_IP6:
-      is_ip4 = 0;
-      break;
-    }
-
-  return is_ip4 ?
-    format (s, "%U", format_ip4_address, &ip46->ip4) :
-    format (s, "%U", format_ip6_address, &ip46->ip6);
-}
-
-u8 *
-format_ethernet_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-
-  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
-		 a[0], a[1], a[2], a[3], a[4], a[5]);
-}
-#endif
-
-static void
-increment_v4_address (ip4_address_t * a)
-{
-  u32 v;
-
-  v = ntohl (a->as_u32) + 1;
-  a->as_u32 = ntohl (v);
-}
-
-static void
-increment_v6_address (ip6_address_t * a)
-{
-  u64 v0, v1;
-
-  v0 = clib_net_to_host_u64 (a->as_u64[0]);
-  v1 = clib_net_to_host_u64 (a->as_u64[1]);
-
-  v1 += 1;
-  if (v1 == 0)
-    v0 += 1;
-  a->as_u64[0] = clib_net_to_host_u64 (v0);
-  a->as_u64[1] = clib_net_to_host_u64 (v1);
-}
-
-static void
-increment_mac_address (u64 * mac)
-{
-  u64 tmp = *mac;
-
-  tmp = clib_net_to_host_u64 (tmp);
-  tmp += 1 << 16;		/* skip unused (least significant) octets */
-  tmp = clib_host_to_net_u64 (tmp);
-  *mac = tmp;
-}
-
-static void vl_api_create_loopback_reply_t_handler
-  (vl_api_create_loopback_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  vam->retval = retval;
-  vam->regenerate_interface_table = 1;
-  vam->sw_if_index = ntohl (mp->sw_if_index);
-  vam->result_ready = 1;
-}
-
-static void vl_api_create_loopback_reply_t_handler_json
-  (vl_api_create_loopback_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_af_packet_create_reply_t_handler
-  (vl_api_af_packet_create_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  vam->retval = retval;
-  vam->regenerate_interface_table = 1;
-  vam->sw_if_index = ntohl (mp->sw_if_index);
-  vam->result_ready = 1;
-}
-
-static void vl_api_af_packet_create_reply_t_handler_json
-  (vl_api_af_packet_create_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_create_vlan_subif_reply_t_handler
-  (vl_api_create_vlan_subif_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  vam->retval = retval;
-  vam->regenerate_interface_table = 1;
-  vam->sw_if_index = ntohl (mp->sw_if_index);
-  vam->result_ready = 1;
-}
-
-static void vl_api_create_vlan_subif_reply_t_handler_json
-  (vl_api_create_vlan_subif_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_create_subif_reply_t_handler
-  (vl_api_create_subif_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  vam->retval = retval;
-  vam->regenerate_interface_table = 1;
-  vam->sw_if_index = ntohl (mp->sw_if_index);
-  vam->result_ready = 1;
-}
-
-static void vl_api_create_subif_reply_t_handler_json
-  (vl_api_create_subif_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_interface_name_renumber_reply_t_handler
-  (vl_api_interface_name_renumber_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  vam->retval = retval;
-  vam->regenerate_interface_table = 1;
-  vam->result_ready = 1;
-}
-
-static void vl_api_interface_name_renumber_reply_t_handler_json
-  (vl_api_interface_name_renumber_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-/*
- * Special-case: build the interface table, maintain
- * the next loopback sw_if_index vbl.
- */
-static void vl_api_sw_interface_details_t_handler
-  (vl_api_sw_interface_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  u8 *s = format (0, "%s%c", mp->interface_name, 0);
-
-  hash_set_mem (vam->sw_if_index_by_interface_name, s,
-		ntohl (mp->sw_if_index));
-
-  /* In sub interface case, fill the sub interface table entry */
-  if (mp->sw_if_index != mp->sup_sw_if_index)
-    {
-      sw_interface_subif_t *sub = NULL;
-
-      vec_add2 (vam->sw_if_subif_table, sub, 1);
-
-      vec_validate (sub->interface_name, strlen ((char *) s) + 1);
-      strncpy ((char *) sub->interface_name, (char *) s,
-	       vec_len (sub->interface_name));
-      sub->sw_if_index = ntohl (mp->sw_if_index);
-      sub->sub_id = ntohl (mp->sub_id);
-
-      sub->sub_dot1ad = mp->sub_dot1ad;
-      sub->sub_number_of_tags = mp->sub_number_of_tags;
-      sub->sub_outer_vlan_id = ntohs (mp->sub_outer_vlan_id);
-      sub->sub_inner_vlan_id = ntohs (mp->sub_inner_vlan_id);
-      sub->sub_exact_match = mp->sub_exact_match;
-      sub->sub_default = mp->sub_default;
-      sub->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any;
-      sub->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any;
-
-      /* vlan tag rewrite */
-      sub->vtr_op = ntohl (mp->vtr_op);
-      sub->vtr_push_dot1q = ntohl (mp->vtr_push_dot1q);
-      sub->vtr_tag1 = ntohl (mp->vtr_tag1);
-      sub->vtr_tag2 = ntohl (mp->vtr_tag2);
-    }
-}
-
-static void vl_api_sw_interface_details_t_handler_json
-  (vl_api_sw_interface_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
-  vat_json_object_add_uint (node, "sup_sw_if_index",
-			    ntohl (mp->sup_sw_if_index));
-  vat_json_object_add_uint (node, "l2_address_length",
-			    ntohl (mp->l2_address_length));
-  vat_json_object_add_bytes (node, "l2_address", mp->l2_address,
-			     sizeof (mp->l2_address));
-  vat_json_object_add_string_copy (node, "interface_name",
-				   mp->interface_name);
-  vat_json_object_add_uint (node, "admin_up_down", mp->admin_up_down);
-  vat_json_object_add_uint (node, "link_up_down", mp->link_up_down);
-  vat_json_object_add_uint (node, "link_duplex", mp->link_duplex);
-  vat_json_object_add_uint (node, "link_speed", mp->link_speed);
-  vat_json_object_add_uint (node, "mtu", ntohs (mp->link_mtu));
-  vat_json_object_add_uint (node, "sub_id", ntohl (mp->sub_id));
-  vat_json_object_add_uint (node, "sub_dot1ad", mp->sub_dot1ad);
-  vat_json_object_add_uint (node, "sub_number_of_tags",
-			    mp->sub_number_of_tags);
-  vat_json_object_add_uint (node, "sub_outer_vlan_id",
-			    ntohs (mp->sub_outer_vlan_id));
-  vat_json_object_add_uint (node, "sub_inner_vlan_id",
-			    ntohs (mp->sub_inner_vlan_id));
-  vat_json_object_add_uint (node, "sub_exact_match", mp->sub_exact_match);
-  vat_json_object_add_uint (node, "sub_default", mp->sub_default);
-  vat_json_object_add_uint (node, "sub_outer_vlan_id_any",
-			    mp->sub_outer_vlan_id_any);
-  vat_json_object_add_uint (node, "sub_inner_vlan_id_any",
-			    mp->sub_inner_vlan_id_any);
-  vat_json_object_add_uint (node, "vtr_op", ntohl (mp->vtr_op));
-  vat_json_object_add_uint (node, "vtr_push_dot1q",
-			    ntohl (mp->vtr_push_dot1q));
-  vat_json_object_add_uint (node, "vtr_tag1", ntohl (mp->vtr_tag1));
-  vat_json_object_add_uint (node, "vtr_tag2", ntohl (mp->vtr_tag2));
-}
-
-static void vl_api_sw_interface_set_flags_t_handler
-  (vl_api_sw_interface_set_flags_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  if (vam->interface_event_display)
-    errmsg ("interface flags: sw_if_index %d %s %s",
-	    ntohl (mp->sw_if_index),
-	    mp->admin_up_down ? "admin-up" : "admin-down",
-	    mp->link_up_down ? "link-up" : "link-down");
-}
-
-static void vl_api_sw_interface_set_flags_t_handler_json
-  (vl_api_sw_interface_set_flags_t * mp)
-{
-  /* JSON output not supported */
-}
-
-static void
-vl_api_cli_reply_t_handler (vl_api_cli_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  vam->retval = retval;
-  vam->shmem_result = (u8 *) mp->reply_in_shmem;
-  vam->result_ready = 1;
-}
-
-static void
-vl_api_cli_reply_t_handler_json (vl_api_cli_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-  api_main_t *am = &api_main;
-  void *oldheap;
-  u8 *reply;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "reply_in_shmem",
-			    ntohl (mp->reply_in_shmem));
-  /* Toss the shared-memory original... */
-  pthread_mutex_lock (&am->vlib_rp->mutex);
-  oldheap = svm_push_data_heap (am->vlib_rp);
-
-  reply = (u8 *) (mp->reply_in_shmem);
-  vec_free (reply);
-
-  svm_pop_heap (oldheap);
-  pthread_mutex_unlock (&am->vlib_rp->mutex);
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void
-vl_api_cli_inband_reply_t_handler (vl_api_cli_inband_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  vam->retval = retval;
-  vam->cmd_reply = mp->reply;
-  vam->result_ready = 1;
-}
-
-static void
-vl_api_cli_inband_reply_t_handler_json (vl_api_cli_inband_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_string_copy (&node, "reply", mp->reply);
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_classify_add_del_table_reply_t_handler
-  (vl_api_classify_add_del_table_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      if (retval == 0 &&
-	  ((mp->new_table_index != 0xFFFFFFFF) ||
-	   (mp->skip_n_vectors != 0xFFFFFFFF) ||
-	   (mp->match_n_vectors != 0xFFFFFFFF)))
-	/*
-	 * Note: this is just barely thread-safe, depends on
-	 * the main thread spinning waiting for an answer...
-	 */
-	errmsg ("new index %d, skip_n_vectors %d, match_n_vectors %d",
-		ntohl (mp->new_table_index),
-		ntohl (mp->skip_n_vectors), ntohl (mp->match_n_vectors));
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_classify_add_del_table_reply_t_handler_json
-  (vl_api_classify_add_del_table_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "new_table_index",
-			    ntohl (mp->new_table_index));
-  vat_json_object_add_uint (&node, "skip_n_vectors",
-			    ntohl (mp->skip_n_vectors));
-  vat_json_object_add_uint (&node, "match_n_vectors",
-			    ntohl (mp->match_n_vectors));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_get_node_index_reply_t_handler
-  (vl_api_get_node_index_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      if (retval == 0)
-	errmsg ("node index %d", ntohl (mp->node_index));
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_get_node_index_reply_t_handler_json
-  (vl_api_get_node_index_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "node_index", ntohl (mp->node_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_get_next_index_reply_t_handler
-  (vl_api_get_next_index_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      if (retval == 0)
-	errmsg ("next node index %d", ntohl (mp->next_index));
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_get_next_index_reply_t_handler_json
-  (vl_api_get_next_index_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "next_index", ntohl (mp->next_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_add_node_next_reply_t_handler
-  (vl_api_add_node_next_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      if (retval == 0)
-	errmsg ("next index %d", ntohl (mp->next_index));
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_add_node_next_reply_t_handler_json
-  (vl_api_add_node_next_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "next_index", ntohl (mp->next_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_show_version_reply_t_handler
-  (vl_api_show_version_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  if (retval >= 0)
-    {
-      errmsg ("        program: %s", mp->program);
-      errmsg ("        version: %s", mp->version);
-      errmsg ("     build date: %s", mp->build_date);
-      errmsg ("build directory: %s", mp->build_directory);
-    }
-  vam->retval = retval;
-  vam->result_ready = 1;
-}
-
-static void vl_api_show_version_reply_t_handler_json
-  (vl_api_show_version_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_string_copy (&node, "program", mp->program);
-  vat_json_object_add_string_copy (&node, "version", mp->version);
-  vat_json_object_add_string_copy (&node, "build_date", mp->build_date);
-  vat_json_object_add_string_copy (&node, "build_directory",
-				   mp->build_directory);
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void
-vl_api_ip4_arp_event_t_handler (vl_api_ip4_arp_event_t * mp)
-{
-  errmsg ("arp %s event: address %U new mac %U sw_if_index %d",
-	  mp->mac_ip ? "mac/ip binding" : "address resolution",
-	  format_ip4_address, &mp->address,
-	  format_ethernet_address, mp->new_mac, mp->sw_if_index);
-}
-
-static void
-vl_api_ip4_arp_event_t_handler_json (vl_api_ip4_arp_event_t * mp)
-{
-  /* JSON output not supported */
-}
-
-static void
-vl_api_ip6_nd_event_t_handler (vl_api_ip6_nd_event_t * mp)
-{
-  errmsg ("ip6 nd %s event: address %U new mac %U sw_if_index %d",
-	  mp->mac_ip ? "mac/ip binding" : "address resolution",
-	  format_ip6_address, mp->address,
-	  format_ethernet_address, mp->new_mac, mp->sw_if_index);
-}
-
-static void
-vl_api_ip6_nd_event_t_handler_json (vl_api_ip6_nd_event_t * mp)
-{
-  /* JSON output not supported */
-}
-
-/*
- * Special-case: build the bridge domain table, maintain
- * the next bd id vbl.
- */
-static void vl_api_bridge_domain_details_t_handler
-  (vl_api_bridge_domain_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  u32 n_sw_ifs = ntohl (mp->n_sw_ifs);
-
-  print (vam->ofp, "\n%-3s %-3s %-3s %-3s %-3s %-3s",
-	 " ID", "LRN", "FWD", "FLD", "BVI", "#IF");
-
-  print (vam->ofp, "%3d %3d %3d %3d %3d %3d",
-	 ntohl (mp->bd_id), mp->learn, mp->forward,
-	 mp->flood, ntohl (mp->bvi_sw_if_index), n_sw_ifs);
-
-  if (n_sw_ifs)
-    print (vam->ofp, "\n\n%s %s  %s", "sw_if_index", "SHG", "Interface Name");
-}
-
-static void vl_api_bridge_domain_details_t_handler_json
-  (vl_api_bridge_domain_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node, *array = NULL;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id));
-  vat_json_object_add_uint (node, "flood", mp->flood);
-  vat_json_object_add_uint (node, "forward", mp->forward);
-  vat_json_object_add_uint (node, "learn", mp->learn);
-  vat_json_object_add_uint (node, "bvi_sw_if_index",
-			    ntohl (mp->bvi_sw_if_index));
-  vat_json_object_add_uint (node, "n_sw_ifs", ntohl (mp->n_sw_ifs));
-  array = vat_json_object_add (node, "sw_if");
-  vat_json_init_array (array);
-}
-
-/*
- * Special-case: build the bridge domain sw if table.
- */
-static void vl_api_bridge_domain_sw_if_details_t_handler
-  (vl_api_bridge_domain_sw_if_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  hash_pair_t *p;
-  u8 *sw_if_name = 0;
-  u32 sw_if_index;
-
-  sw_if_index = ntohl (mp->sw_if_index);
-  /* *INDENT-OFF* */
-  hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
-  ({
-    if ((u32) p->value[0] == sw_if_index)
-      {
-        sw_if_name = (u8 *)(p->key);
-        break;
-      }
-  }));
-  /* *INDENT-ON* */
-
-  print (vam->ofp, "%7d     %3d  %s", sw_if_index,
-	 mp->shg, sw_if_name ? (char *) sw_if_name :
-	 "sw_if_index not found!");
-}
-
-static void vl_api_bridge_domain_sw_if_details_t_handler_json
-  (vl_api_bridge_domain_sw_if_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-  uword last_index = 0;
-
-  ASSERT (VAT_JSON_ARRAY == vam->json_tree.type);
-  ASSERT (vec_len (vam->json_tree.array) >= 1);
-  last_index = vec_len (vam->json_tree.array) - 1;
-  node = &vam->json_tree.array[last_index];
-  node = vat_json_object_get_element (node, "sw_if");
-  ASSERT (NULL != node);
-  node = vat_json_array_add (node);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id));
-  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
-  vat_json_object_add_uint (node, "shg", mp->shg);
-}
-
-static void vl_api_control_ping_reply_t_handler
-  (vl_api_control_ping_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_control_ping_reply_t_handler_json
-  (vl_api_control_ping_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  if (VAT_JSON_NONE != vam->json_tree.type)
-    {
-      vat_json_print (vam->ofp, &vam->json_tree);
-      vat_json_free (&vam->json_tree);
-      vam->json_tree.type = VAT_JSON_NONE;
-    }
-  else
-    {
-      /* just print [] */
-      vat_json_init_array (&vam->json_tree);
-      vat_json_print (vam->ofp, &vam->json_tree);
-      vam->json_tree.type = VAT_JSON_NONE;
-    }
-
-  vam->retval = retval;
-  vam->result_ready = 1;
-}
-
-static void
-vl_api_l2_flags_reply_t_handler (vl_api_l2_flags_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_l2_flags_reply_t_handler_json
-  (vl_api_l2_flags_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "resulting_feature_bitmap",
-			    ntohl (mp->resulting_feature_bitmap));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_bridge_flags_reply_t_handler
-  (vl_api_bridge_flags_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_bridge_flags_reply_t_handler_json
-  (vl_api_bridge_flags_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "resulting_feature_bitmap",
-			    ntohl (mp->resulting_feature_bitmap));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_tap_connect_reply_t_handler
-  (vl_api_tap_connect_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->sw_if_index = ntohl (mp->sw_if_index);
-      vam->result_ready = 1;
-    }
-
-}
-
-static void vl_api_tap_connect_reply_t_handler_json
-  (vl_api_tap_connect_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-
-}
-
-static void
-vl_api_tap_modify_reply_t_handler (vl_api_tap_modify_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->sw_if_index = ntohl (mp->sw_if_index);
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_tap_modify_reply_t_handler_json
-  (vl_api_tap_modify_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void
-vl_api_tap_delete_reply_t_handler (vl_api_tap_delete_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_tap_delete_reply_t_handler_json
-  (vl_api_tap_delete_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_mpls_tunnel_add_del_reply_t_handler
-  (vl_api_mpls_tunnel_add_del_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_mpls_tunnel_add_del_reply_t_handler_json
-  (vl_api_mpls_tunnel_add_del_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "tunnel_sw_if_index",
-			    ntohl (mp->sw_if_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_l2tpv3_create_tunnel_reply_t_handler
-  (vl_api_l2tpv3_create_tunnel_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->sw_if_index = ntohl (mp->sw_if_index);
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_l2tpv3_create_tunnel_reply_t_handler_json
-  (vl_api_l2tpv3_create_tunnel_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-
-static void vl_api_lisp_add_del_locator_set_reply_t_handler
-  (vl_api_lisp_add_del_locator_set_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_lisp_add_del_locator_set_reply_t_handler_json
-  (vl_api_lisp_add_del_locator_set_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "locator_set_index", ntohl (mp->ls_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_vxlan_add_del_tunnel_reply_t_handler
-  (vl_api_vxlan_add_del_tunnel_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->sw_if_index = ntohl (mp->sw_if_index);
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json
-  (vl_api_vxlan_add_del_tunnel_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_gre_add_del_tunnel_reply_t_handler
-  (vl_api_gre_add_del_tunnel_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->sw_if_index = ntohl (mp->sw_if_index);
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_gre_add_del_tunnel_reply_t_handler_json
-  (vl_api_gre_add_del_tunnel_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_create_vhost_user_if_reply_t_handler
-  (vl_api_create_vhost_user_if_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->sw_if_index = ntohl (mp->sw_if_index);
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_create_vhost_user_if_reply_t_handler_json
-  (vl_api_create_vhost_user_if_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_ip_address_details_t_handler
-  (vl_api_ip_address_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  static ip_address_details_t empty_ip_address_details = { {0} };
-  ip_address_details_t *address = NULL;
-  ip_details_t *current_ip_details = NULL;
-  ip_details_t *details = NULL;
-
-  details = vam->ip_details_by_sw_if_index[vam->is_ipv6];
-
-  if (!details || vam->current_sw_if_index >= vec_len (details)
-      || !details[vam->current_sw_if_index].present)
-    {
-      errmsg ("ip address details arrived but not stored");
-      errmsg ("ip_dump should be called first");
-      return;
-    }
-
-  current_ip_details = vec_elt_at_index (details, vam->current_sw_if_index);
-
-#define addresses (current_ip_details->addr)
-
-  vec_validate_init_empty (addresses, vec_len (addresses),
-			   empty_ip_address_details);
-
-  address = vec_elt_at_index (addresses, vec_len (addresses) - 1);
-
-  clib_memcpy (&address->ip, &mp->ip, sizeof (address->ip));
-  address->prefix_length = mp->prefix_length;
-#undef addresses
-}
-
-static void vl_api_ip_address_details_t_handler_json
-  (vl_api_ip_address_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-  struct in6_addr ip6;
-  struct in_addr ip4;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  if (vam->is_ipv6)
-    {
-      clib_memcpy (&ip6, mp->ip, sizeof (ip6));
-      vat_json_object_add_ip6 (node, "ip", ip6);
-    }
-  else
-    {
-      clib_memcpy (&ip4, mp->ip, sizeof (ip4));
-      vat_json_object_add_ip4 (node, "ip", ip4);
-    }
-  vat_json_object_add_uint (node, "prefix_length", mp->prefix_length);
-}
-
-static void
-vl_api_ip_details_t_handler (vl_api_ip_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  static ip_details_t empty_ip_details = { 0 };
-  ip_details_t *ip = NULL;
-  u32 sw_if_index = ~0;
-
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  vec_validate_init_empty (vam->ip_details_by_sw_if_index[vam->is_ipv6],
-			   sw_if_index, empty_ip_details);
-
-  ip = vec_elt_at_index (vam->ip_details_by_sw_if_index[vam->is_ipv6],
-			 sw_if_index);
-
-  ip->present = 1;
-}
-
-static void
-vl_api_ip_details_t_handler_json (vl_api_ip_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  vat_json_array_add_uint (&vam->json_tree,
-			   clib_net_to_host_u32 (mp->sw_if_index));
-}
-
-static void vl_api_map_domain_details_t_handler_json
-  (vl_api_map_domain_details_t * mp)
-{
-  vat_json_node_t *node = NULL;
-  vat_main_t *vam = &vat_main;
-  struct in6_addr ip6;
-  struct in_addr ip4;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-
-  node = vat_json_array_add (&vam->json_tree);
-  vat_json_init_object (node);
-
-  vat_json_object_add_uint (node, "domain_index",
-			    clib_net_to_host_u32 (mp->domain_index));
-  clib_memcpy (&ip6, mp->ip6_prefix, sizeof (ip6));
-  vat_json_object_add_ip6 (node, "ip6_prefix", ip6);
-  clib_memcpy (&ip4, mp->ip4_prefix, sizeof (ip4));
-  vat_json_object_add_ip4 (node, "ip4_prefix", ip4);
-  clib_memcpy (&ip6, mp->ip6_src, sizeof (ip6));
-  vat_json_object_add_ip6 (node, "ip6_src", ip6);
-  vat_json_object_add_int (node, "ip6_prefix_len", mp->ip6_prefix_len);
-  vat_json_object_add_int (node, "ip4_prefix_len", mp->ip4_prefix_len);
-  vat_json_object_add_int (node, "ip6_src_len", mp->ip6_src_len);
-  vat_json_object_add_int (node, "ea_bits_len", mp->ea_bits_len);
-  vat_json_object_add_int (node, "psid_offset", mp->psid_offset);
-  vat_json_object_add_int (node, "psid_length", mp->psid_length);
-  vat_json_object_add_uint (node, "flags", mp->flags);
-  vat_json_object_add_uint (node, "mtu", clib_net_to_host_u16 (mp->mtu));
-  vat_json_object_add_int (node, "is_translation", mp->is_translation);
-}
-
-static void vl_api_map_domain_details_t_handler
-  (vl_api_map_domain_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  if (mp->is_translation)
-    {
-      print (vam->ofp,
-	     "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U/%d (ip6-src) index: %u",
-	     format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len,
-	     format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len,
-	     format_ip6_address, mp->ip6_src, mp->ip6_src_len,
-	     clib_net_to_host_u32 (mp->domain_index));
-    }
-  else
-    {
-      print (vam->ofp,
-	     "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U (ip6-src) index: %u",
-	     format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len,
-	     format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len,
-	     format_ip6_address, mp->ip6_src,
-	     clib_net_to_host_u32 (mp->domain_index));
-    }
-  print (vam->ofp, "  ea-len %d psid-offset %d psid-len %d mtu %d %s",
-	 mp->ea_bits_len, mp->psid_offset, mp->psid_length, mp->mtu,
-	 mp->is_translation ? "map-t" : "");
-}
-
-static void vl_api_map_rule_details_t_handler_json
-  (vl_api_map_rule_details_t * mp)
-{
-  struct in6_addr ip6;
-  vat_json_node_t *node = NULL;
-  vat_main_t *vam = &vat_main;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-
-  node = vat_json_array_add (&vam->json_tree);
-  vat_json_init_object (node);
-
-  vat_json_object_add_uint (node, "psid", clib_net_to_host_u16 (mp->psid));
-  clib_memcpy (&ip6, mp->ip6_dst, sizeof (ip6));
-  vat_json_object_add_ip6 (node, "ip6_dst", ip6);
-}
-
-static void
-vl_api_map_rule_details_t_handler (vl_api_map_rule_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  print (vam->ofp, " %d (psid) %U (ip6-dst)",
-	 clib_net_to_host_u16 (mp->psid), format_ip6_address, mp->ip6_dst);
-}
-
-static void
-vl_api_dhcp_compl_event_t_handler (vl_api_dhcp_compl_event_t * mp)
-{
-  errmsg ("DHCP compl event: pid %d %s hostname %s host_addr %U "
-	  "router_addr %U host_mac %U",
-	  mp->pid, mp->is_ipv6 ? "ipv6" : "ipv4", mp->hostname,
-	  format_ip4_address, &mp->host_address,
-	  format_ip4_address, &mp->router_address,
-	  format_ethernet_address, mp->host_mac);
-}
-
-static void vl_api_dhcp_compl_event_t_handler_json
-  (vl_api_dhcp_compl_event_t * mp)
-{
-  /* JSON output not supported */
-}
-
-static void
-set_simple_interface_counter (u8 vnet_counter_type, u32 sw_if_index,
-			      u32 counter)
-{
-  vat_main_t *vam = &vat_main;
-  static u64 default_counter = 0;
-
-  vec_validate_init_empty (vam->simple_interface_counters, vnet_counter_type,
-			   NULL);
-  vec_validate_init_empty (vam->simple_interface_counters[vnet_counter_type],
-			   sw_if_index, default_counter);
-  vam->simple_interface_counters[vnet_counter_type][sw_if_index] = counter;
-}
-
-static void
-set_combined_interface_counter (u8 vnet_counter_type, u32 sw_if_index,
-				interface_counter_t counter)
-{
-  vat_main_t *vam = &vat_main;
-  static interface_counter_t default_counter = { 0, };
-
-  vec_validate_init_empty (vam->combined_interface_counters,
-			   vnet_counter_type, NULL);
-  vec_validate_init_empty (vam->combined_interface_counters
-			   [vnet_counter_type], sw_if_index, default_counter);
-  vam->combined_interface_counters[vnet_counter_type][sw_if_index] = counter;
-}
-
-static void vl_api_vnet_interface_counters_t_handler
-  (vl_api_vnet_interface_counters_t * mp)
-{
-  /* not supported */
-}
-
-static void vl_api_vnet_interface_counters_t_handler_json
-  (vl_api_vnet_interface_counters_t * mp)
-{
-  interface_counter_t counter;
-  vlib_counter_t *v;
-  u64 *v_packets;
-  u64 packets;
-  u32 count;
-  u32 first_sw_if_index;
-  int i;
-
-  count = ntohl (mp->count);
-  first_sw_if_index = ntohl (mp->first_sw_if_index);
-
-  if (!mp->is_combined)
-    {
-      v_packets = (u64 *) & mp->data;
-      for (i = 0; i < count; i++)
-	{
-	  packets =
-	    clib_net_to_host_u64 (clib_mem_unaligned (v_packets, u64));
-	  set_simple_interface_counter (mp->vnet_counter_type,
-					first_sw_if_index + i, packets);
-	  v_packets++;
-	}
-    }
-  else
-    {
-      v = (vlib_counter_t *) & mp->data;
-      for (i = 0; i < count; i++)
-	{
-	  counter.packets =
-	    clib_net_to_host_u64 (clib_mem_unaligned (&v->packets, u64));
-	  counter.bytes =
-	    clib_net_to_host_u64 (clib_mem_unaligned (&v->bytes, u64));
-	  set_combined_interface_counter (mp->vnet_counter_type,
-					  first_sw_if_index + i, counter);
-	  v++;
-	}
-    }
-}
-
-static u32
-ip4_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id)
-{
-  vat_main_t *vam = &vat_main;
-  u32 i;
-
-  for (i = 0; i < vec_len (vam->ip4_fib_counters_vrf_id_by_index); i++)
-    {
-      if (vam->ip4_fib_counters_vrf_id_by_index[i] == vrf_id)
-	{
-	  return i;
-	}
-    }
-  return ~0;
-}
-
-static u32
-ip6_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id)
-{
-  vat_main_t *vam = &vat_main;
-  u32 i;
-
-  for (i = 0; i < vec_len (vam->ip6_fib_counters_vrf_id_by_index); i++)
-    {
-      if (vam->ip6_fib_counters_vrf_id_by_index[i] == vrf_id)
-	{
-	  return i;
-	}
-    }
-  return ~0;
-}
-
-static void vl_api_vnet_ip4_fib_counters_t_handler
-  (vl_api_vnet_ip4_fib_counters_t * mp)
-{
-  /* not supported */
-}
-
-static void vl_api_vnet_ip4_fib_counters_t_handler_json
-  (vl_api_vnet_ip4_fib_counters_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vl_api_ip4_fib_counter_t *v;
-  ip4_fib_counter_t *counter;
-  struct in_addr ip4;
-  u32 vrf_id;
-  u32 vrf_index;
-  u32 count;
-  int i;
-
-  vrf_id = ntohl (mp->vrf_id);
-  vrf_index = ip4_fib_counters_get_vrf_index_by_vrf_id (vrf_id);
-  if (~0 == vrf_index)
-    {
-      vrf_index = vec_len (vam->ip4_fib_counters_vrf_id_by_index);
-      vec_validate (vam->ip4_fib_counters_vrf_id_by_index, vrf_index);
-      vam->ip4_fib_counters_vrf_id_by_index[vrf_index] = vrf_id;
-      vec_validate (vam->ip4_fib_counters, vrf_index);
-      vam->ip4_fib_counters[vrf_index] = NULL;
-    }
-
-  vec_free (vam->ip4_fib_counters[vrf_index]);
-  v = (vl_api_ip4_fib_counter_t *) & mp->c;
-  count = ntohl (mp->count);
-  for (i = 0; i < count; i++)
-    {
-      vec_validate (vam->ip4_fib_counters[vrf_index], i);
-      counter = &vam->ip4_fib_counters[vrf_index][i];
-      clib_memcpy (&ip4, &v->address, sizeof (ip4));
-      counter->address = ip4;
-      counter->address_length = v->address_length;
-      counter->packets = clib_net_to_host_u64 (v->packets);
-      counter->bytes = clib_net_to_host_u64 (v->bytes);
-      v++;
-    }
-}
-
-static void vl_api_vnet_ip6_fib_counters_t_handler
-  (vl_api_vnet_ip6_fib_counters_t * mp)
-{
-  /* not supported */
-}
-
-static void vl_api_vnet_ip6_fib_counters_t_handler_json
-  (vl_api_vnet_ip6_fib_counters_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vl_api_ip6_fib_counter_t *v;
-  ip6_fib_counter_t *counter;
-  struct in6_addr ip6;
-  u32 vrf_id;
-  u32 vrf_index;
-  u32 count;
-  int i;
-
-  vrf_id = ntohl (mp->vrf_id);
-  vrf_index = ip6_fib_counters_get_vrf_index_by_vrf_id (vrf_id);
-  if (~0 == vrf_index)
-    {
-      vrf_index = vec_len (vam->ip6_fib_counters_vrf_id_by_index);
-      vec_validate (vam->ip6_fib_counters_vrf_id_by_index, vrf_index);
-      vam->ip6_fib_counters_vrf_id_by_index[vrf_index] = vrf_id;
-      vec_validate (vam->ip6_fib_counters, vrf_index);
-      vam->ip6_fib_counters[vrf_index] = NULL;
-    }
-
-  vec_free (vam->ip6_fib_counters[vrf_index]);
-  v = (vl_api_ip6_fib_counter_t *) & mp->c;
-  count = ntohl (mp->count);
-  for (i = 0; i < count; i++)
-    {
-      vec_validate (vam->ip6_fib_counters[vrf_index], i);
-      counter = &vam->ip6_fib_counters[vrf_index][i];
-      clib_memcpy (&ip6, &v->address, sizeof (ip6));
-      counter->address = ip6;
-      counter->address_length = v->address_length;
-      counter->packets = clib_net_to_host_u64 (v->packets);
-      counter->bytes = clib_net_to_host_u64 (v->bytes);
-      v++;
-    }
-}
-
-static void vl_api_get_first_msg_id_reply_t_handler
-  (vl_api_get_first_msg_id_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->result_ready = 1;
-    }
-  if (retval >= 0)
-    {
-      errmsg ("first message id %d", ntohs (mp->first_msg_id));
-    }
-}
-
-static void vl_api_get_first_msg_id_reply_t_handler_json
-  (vl_api_get_first_msg_id_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "first_msg_id",
-			    (uint) ntohs (mp->first_msg_id));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_get_node_graph_reply_t_handler
-  (vl_api_get_node_graph_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  api_main_t *am = &api_main;
-  i32 retval = ntohl (mp->retval);
-  u8 *pvt_copy, *reply;
-  void *oldheap;
-  vlib_node_t *node;
-  int i;
-
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->result_ready = 1;
-    }
-
-  /* "Should never happen..." */
-  if (retval != 0)
-    return;
-
-  reply = (u8 *) (mp->reply_in_shmem);
-  pvt_copy = vec_dup (reply);
-
-  /* Toss the shared-memory original... */
-  pthread_mutex_lock (&am->vlib_rp->mutex);
-  oldheap = svm_push_data_heap (am->vlib_rp);
-
-  vec_free (reply);
-
-  svm_pop_heap (oldheap);
-  pthread_mutex_unlock (&am->vlib_rp->mutex);
-
-  if (vam->graph_nodes)
-    {
-      hash_free (vam->graph_node_index_by_name);
-
-      for (i = 0; i < vec_len (vam->graph_nodes); i++)
-	{
-	  node = vam->graph_nodes[i];
-	  vec_free (node->name);
-	  vec_free (node->next_nodes);
-	  vec_free (node);
-	}
-      vec_free (vam->graph_nodes);
-    }
-
-  vam->graph_node_index_by_name = hash_create_string (0, sizeof (uword));
-  vam->graph_nodes = vlib_node_unserialize (pvt_copy);
-  vec_free (pvt_copy);
-
-  for (i = 0; i < vec_len (vam->graph_nodes); i++)
-    {
-      node = vam->graph_nodes[i];
-      hash_set_mem (vam->graph_node_index_by_name, node->name, i);
-    }
-}
-
-static void vl_api_get_node_graph_reply_t_handler_json
-  (vl_api_get_node_graph_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  api_main_t *am = &api_main;
-  void *oldheap;
-  vat_json_node_t node;
-  u8 *reply;
-
-  /* $$$$ make this real? */
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "reply_in_shmem", mp->reply_in_shmem);
-
-  reply = (u8 *) (mp->reply_in_shmem);
-
-  /* Toss the shared-memory original... */
-  pthread_mutex_lock (&am->vlib_rp->mutex);
-  oldheap = svm_push_data_heap (am->vlib_rp);
-
-  vec_free (reply);
-
-  svm_pop_heap (oldheap);
-  pthread_mutex_unlock (&am->vlib_rp->mutex);
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void
-vl_api_lisp_locator_details_t_handler (vl_api_lisp_locator_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  u8 *s = 0;
-
-  if (mp->local)
-    {
-      s = format (s, "%=16d%=16d%=16d",
-		  ntohl (mp->sw_if_index), mp->priority, mp->weight);
-    }
-  else
-    {
-      s = format (s, "%=16U%=16d%=16d",
-		  mp->is_ipv6 ? format_ip6_address :
-		  format_ip4_address,
-		  mp->ip_address, mp->priority, mp->weight);
-    }
-
-  print (vam->ofp, "%v", s);
-  vec_free (s);
-}
-
-static void
-vl_api_lisp_locator_details_t_handler_json (vl_api_lisp_locator_details_t *
-					    mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-  struct in6_addr ip6;
-  struct in_addr ip4;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-  vat_json_init_object (node);
-
-  vat_json_object_add_uint (node, "local", mp->local ? 1 : 0);
-  vat_json_object_add_uint (node, "priority", mp->priority);
-  vat_json_object_add_uint (node, "weight", mp->weight);
-
-  if (mp->local)
-    vat_json_object_add_uint (node, "sw_if_index",
-			      clib_net_to_host_u32 (mp->sw_if_index));
-  else
-    {
-      if (mp->is_ipv6)
-	{
-	  clib_memcpy (&ip6, mp->ip_address, sizeof (ip6));
-	  vat_json_object_add_ip6 (node, "address", ip6);
-	}
-      else
-	{
-	  clib_memcpy (&ip4, mp->ip_address, sizeof (ip4));
-	  vat_json_object_add_ip4 (node, "address", ip4);
-	}
-    }
-}
-
-static void
-vl_api_lisp_locator_set_details_t_handler (vl_api_lisp_locator_set_details_t *
-					   mp)
-{
-  vat_main_t *vam = &vat_main;
-  u8 *ls_name = 0;
-
-  ls_name = format (0, "%s", mp->ls_name);
-
-  print (vam->ofp, "%=10d%=15v", clib_net_to_host_u32 (mp->ls_index),
-	 ls_name);
-  vec_free (ls_name);
-}
-
-static void
-  vl_api_lisp_locator_set_details_t_handler_json
-  (vl_api_lisp_locator_set_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = 0;
-  u8 *ls_name = 0;
-
-  ls_name = format (0, "%s", mp->ls_name);
-  vec_add1 (ls_name, 0);
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_string_copy (node, "ls_name", ls_name);
-  vat_json_object_add_uint (node, "ls_index",
-			    clib_net_to_host_u32 (mp->ls_index));
-  vec_free (ls_name);
-}
-
-static u8 *
-format_lisp_flat_eid (u8 * s, va_list * args)
-{
-  u32 type = va_arg (*args, u32);
-  u8 *eid = va_arg (*args, u8 *);
-  u32 eid_len = va_arg (*args, u32);
-
-  switch (type)
-    {
-    case 0:
-      return format (s, "%U/%d", format_ip4_address, eid, eid_len);
-    case 1:
-      return format (s, "%U/%d", format_ip6_address, eid, eid_len);
-    case 2:
-      return format (s, "%U", format_ethernet_address, eid);
-    }
-  return 0;
-}
-
-static u8 *
-format_lisp_eid_vat (u8 * s, va_list * args)
-{
-  u32 type = va_arg (*args, u32);
-  u8 *eid = va_arg (*args, u8 *);
-  u32 eid_len = va_arg (*args, u32);
-  u8 *seid = va_arg (*args, u8 *);
-  u32 seid_len = va_arg (*args, u32);
-  u32 is_src_dst = va_arg (*args, u32);
-
-  if (is_src_dst)
-    s = format (s, "%U|", format_lisp_flat_eid, type, seid, seid_len);
-
-  s = format (s, "%U", format_lisp_flat_eid, type, eid, eid_len);
-
-  return s;
-}
-
-static void
-vl_api_lisp_eid_table_details_t_handler (vl_api_lisp_eid_table_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  u8 *s = 0, *eid = 0;
-
-  if (~0 == mp->locator_set_index)
-    s = format (0, "action: %d", mp->action);
-  else
-    s = format (0, "%d", clib_net_to_host_u32 (mp->locator_set_index));
-
-  eid = format (0, "%U", format_lisp_eid_vat,
-		mp->eid_type,
-		mp->eid,
-		mp->eid_prefix_len,
-		mp->seid, mp->seid_prefix_len, mp->is_src_dst);
-  vec_add1 (eid, 0);
-
-  print (vam->ofp, "[%d] %-35s%-20s%-30s%-20d%-20d%-10d%-20s",
-	 clib_net_to_host_u32 (mp->vni),
-	 eid,
-	 mp->is_local ? "local" : "remote",
-	 s, clib_net_to_host_u32 (mp->ttl), mp->authoritative,
-	 clib_net_to_host_u16 (mp->key_id), mp->key);
-
-  vec_free (s);
-  vec_free (eid);
-}
-
-static void
-vl_api_lisp_eid_table_details_t_handler_json (vl_api_lisp_eid_table_details_t
-					      * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = 0;
-  u8 *eid = 0;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  if (~0 == mp->locator_set_index)
-    vat_json_object_add_uint (node, "action", mp->action);
-  else
-    vat_json_object_add_uint (node, "locator_set_index",
-			      clib_net_to_host_u32 (mp->locator_set_index));
-
-  vat_json_object_add_uint (node, "is_local", mp->is_local ? 1 : 0);
-  eid = format (0, "%U", format_lisp_eid_vat,
-		mp->eid_type,
-		mp->eid,
-		mp->eid_prefix_len,
-		mp->seid, mp->seid_prefix_len, mp->is_src_dst);
-  vec_add1 (eid, 0);
-  vat_json_object_add_string_copy (node, "eid", eid);
-  vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni));
-  vat_json_object_add_uint (node, "ttl", clib_net_to_host_u32 (mp->ttl));
-  vat_json_object_add_uint (node, "authoritative", (mp->authoritative));
-
-  if (mp->key_id)
-    {
-      vat_json_object_add_uint (node, "key_id",
-				clib_net_to_host_u16 (mp->key_id));
-      vat_json_object_add_string_copy (node, "key", mp->key);
-    }
-  vec_free (eid);
-}
-
-static void
-  vl_api_lisp_eid_table_map_details_t_handler
-  (vl_api_lisp_eid_table_map_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  u8 *line = format (0, "%=10d%=10d",
-		     clib_net_to_host_u32 (mp->vni),
-		     clib_net_to_host_u32 (mp->dp_table));
-  print (vam->ofp, "%v", line);
-  vec_free (line);
-}
-
-static void
-  vl_api_lisp_eid_table_map_details_t_handler_json
-  (vl_api_lisp_eid_table_map_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "dp_table",
-			    clib_net_to_host_u32 (mp->dp_table));
-  vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni));
-}
-
-static void
-  vl_api_lisp_eid_table_vni_details_t_handler
-  (vl_api_lisp_eid_table_vni_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  u8 *line = format (0, "%d", clib_net_to_host_u32 (mp->vni));
-  print (vam->ofp, "%v", line);
-  vec_free (line);
-}
-
-static void
-  vl_api_lisp_eid_table_vni_details_t_handler_json
-  (vl_api_lisp_eid_table_vni_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni));
-}
-
-static u8 *
-format_decap_next (u8 * s, va_list * args)
-{
-  u32 next_index = va_arg (*args, u32);
-
-  switch (next_index)
-    {
-    case LISP_GPE_INPUT_NEXT_DROP:
-      return format (s, "drop");
-    case LISP_GPE_INPUT_NEXT_IP4_INPUT:
-      return format (s, "ip4");
-    case LISP_GPE_INPUT_NEXT_IP6_INPUT:
-      return format (s, "ip6");
-    default:
-      return format (s, "unknown %d", next_index);
-    }
-  return s;
-}
-
-static void
-vl_api_lisp_gpe_tunnel_details_t_handler (vl_api_lisp_gpe_tunnel_details_t *
-					  mp)
-{
-  vat_main_t *vam = &vat_main;
-  u8 *iid_str;
-  u8 *flag_str = NULL;
-
-  iid_str = format (0, "%d (0x%x)", ntohl (mp->iid), ntohl (mp->iid));
-
-#define _(n,v) if (mp->flags & v) flag_str = format (flag_str, "%s-bit ", #n);
-  foreach_lisp_gpe_flag_bit;
-#undef _
-
-  print (vam->ofp, "%=20d%=30U%=16U%=16d%=16d%=16U"
-	 "%=16d%=16d%=16sd=16d%=16s%=16s",
-	 mp->tunnels,
-	 mp->is_ipv6 ? format_ip6_address : format_ip4_address,
-	 mp->source_ip,
-	 mp->is_ipv6 ? format_ip6_address : format_ip4_address,
-	 mp->destination_ip,
-	 ntohl (mp->encap_fib_id),
-	 ntohl (mp->decap_fib_id),
-	 format_decap_next, ntohl (mp->dcap_next),
-	 mp->ver_res >> 6,
-	 flag_str, mp->next_protocol, mp->ver_res, mp->res, iid_str);
-
-  vec_free (iid_str);
-}
-
-static void
-  vl_api_lisp_gpe_tunnel_details_t_handler_json
-  (vl_api_lisp_gpe_tunnel_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-  struct in6_addr ip6;
-  struct in_addr ip4;
-  u8 *next_decap_str;
-
-  next_decap_str = format (0, "%U", format_decap_next, htonl (mp->dcap_next));
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "tunel", mp->tunnels);
-  if (mp->is_ipv6)
-    {
-      clib_memcpy (&ip6, mp->source_ip, sizeof (ip6));
-      vat_json_object_add_ip6 (node, "source address", ip6);
-      clib_memcpy (&ip6, mp->destination_ip, sizeof (ip6));
-      vat_json_object_add_ip6 (node, "destination address", ip6);
-    }
-  else
-    {
-      clib_memcpy (&ip4, mp->source_ip, sizeof (ip4));
-      vat_json_object_add_ip4 (node, "source address", ip4);
-      clib_memcpy (&ip4, mp->destination_ip, sizeof (ip4));
-      vat_json_object_add_ip4 (node, "destination address", ip4);
-    }
-  vat_json_object_add_uint (node, "fib encap", ntohl (mp->encap_fib_id));
-  vat_json_object_add_uint (node, "fib decap", ntohl (mp->decap_fib_id));
-  vat_json_object_add_string_copy (node, "decap next", next_decap_str);
-  vat_json_object_add_uint (node, "lisp version", mp->ver_res >> 6);
-  vat_json_object_add_uint (node, "flags", mp->flags);
-  vat_json_object_add_uint (node, "next protocol", mp->next_protocol);
-  vat_json_object_add_uint (node, "ver_res", mp->ver_res);
-  vat_json_object_add_uint (node, "res", mp->res);
-  vat_json_object_add_uint (node, "iid", ntohl (mp->iid));
-
-  vec_free (next_decap_str);
-}
-
-static void
-  vl_api_show_lisp_map_register_state_reply_t_handler
-  (vl_api_show_lisp_map_register_state_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  int retval = clib_net_to_host_u32 (mp->retval);
-
-  print (vam->ofp, "%s", mp->is_enabled ? "enabled" : "disabled");
-
-  vam->retval = retval;
-  vam->result_ready = 1;
-}
-
-static void
-  vl_api_show_lisp_map_register_state_reply_t_handler_json
-  (vl_api_show_lisp_map_register_state_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t _node, *node = &_node;
-  int retval = clib_net_to_host_u32 (mp->retval);
-
-  u8 *s = format (0, "%s", mp->is_enabled ? "enabled" : "disabled");
-
-  vat_json_init_object (node);
-  vat_json_object_add_string_copy (node, "state", s);
-
-  vat_json_print (vam->ofp, node);
-  vat_json_free (node);
-
-  vam->retval = retval;
-  vam->result_ready = 1;
-  vec_free (s);
-}
-
-static void
-  vl_api_show_lisp_rloc_probe_state_reply_t_handler
-  (vl_api_show_lisp_rloc_probe_state_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  int retval = clib_net_to_host_u32 (mp->retval);
-
-  if (retval)
-    goto end;
-
-  print (vam->ofp, "%s", mp->is_enabled ? "enabled" : "disabled");
-end:
-  vam->retval = retval;
-  vam->result_ready = 1;
-}
-
-static void
-  vl_api_show_lisp_rloc_probe_state_reply_t_handler_json
-  (vl_api_show_lisp_rloc_probe_state_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t _node, *node = &_node;
-  int retval = clib_net_to_host_u32 (mp->retval);
-
-  u8 *s = format (0, "%s", mp->is_enabled ? "enabled" : "disabled");
-  vat_json_init_object (node);
-  vat_json_object_add_string_copy (node, "state", s);
-
-  vat_json_print (vam->ofp, node);
-  vat_json_free (node);
-
-  vam->retval = retval;
-  vam->result_ready = 1;
-  vec_free (s);
-}
-
-static void
-  vl_api_lisp_adjacencies_get_reply_t_handler
-  (vl_api_lisp_adjacencies_get_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  u32 i, n;
-  int retval = clib_net_to_host_u32 (mp->retval);
-  vl_api_lisp_adjacency_t *a;
-
-  if (retval)
-    goto end;
-
-  n = clib_net_to_host_u32 (mp->count);
-
-  for (i = 0; i < n; i++)
-    {
-      a = &mp->adjacencies[i];
-      print (vam->ofp, "%U %40U",
-	     format_lisp_flat_eid, a->eid_type, a->leid, a->leid_prefix_len,
-	     format_lisp_flat_eid, a->eid_type, a->reid, a->reid_prefix_len);
-    }
-
-end:
-  vam->retval = retval;
-  vam->result_ready = 1;
-}
-
-static void
-  vl_api_lisp_adjacencies_get_reply_t_handler_json
-  (vl_api_lisp_adjacencies_get_reply_t * mp)
-{
-  u8 *s = 0;
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *e = 0, root;
-  u32 i, n;
-  int retval = clib_net_to_host_u32 (mp->retval);
-  vl_api_lisp_adjacency_t *a;
-
-  if (retval)
-    goto end;
-
-  n = clib_net_to_host_u32 (mp->count);
-  vat_json_init_array (&root);
-
-  for (i = 0; i < n; i++)
-    {
-      e = vat_json_array_add (&root);
-      a = &mp->adjacencies[i];
-
-      vat_json_init_object (e);
-      s = format (0, "%U", format_lisp_flat_eid, a->eid_type, a->leid,
-		  a->leid_prefix_len);
-      vec_add1 (s, 0);
-      vat_json_object_add_string_copy (e, "leid", s);
-      vec_free (s);
-
-      s = format (0, "%U", format_lisp_flat_eid, a->eid_type, a->reid,
-		  a->reid_prefix_len);
-      vec_add1 (s, 0);
-      vat_json_object_add_string_copy (e, "reid", s);
-      vec_free (s);
-    }
-
-  vat_json_print (vam->ofp, &root);
-  vat_json_free (&root);
-
-end:
-  vam->retval = retval;
-  vam->result_ready = 1;
-}
-
-static void
-vl_api_lisp_map_server_details_t_handler (vl_api_lisp_map_server_details_t
-					  * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "%=20U",
-	 mp->is_ipv6 ? format_ip6_address : format_ip4_address,
-	 mp->ip_address);
-}
-
-static void
-  vl_api_lisp_map_server_details_t_handler_json
-  (vl_api_lisp_map_server_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-  struct in6_addr ip6;
-  struct in_addr ip4;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  if (mp->is_ipv6)
-    {
-      clib_memcpy (&ip6, mp->ip_address, sizeof (ip6));
-      vat_json_object_add_ip6 (node, "map-server", ip6);
-    }
-  else
-    {
-      clib_memcpy (&ip4, mp->ip_address, sizeof (ip4));
-      vat_json_object_add_ip4 (node, "map-server", ip4);
-    }
-}
-
-static void
-vl_api_lisp_map_resolver_details_t_handler (vl_api_lisp_map_resolver_details_t
-					    * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "%=20U",
-	 mp->is_ipv6 ? format_ip6_address : format_ip4_address,
-	 mp->ip_address);
-}
-
-static void
-  vl_api_lisp_map_resolver_details_t_handler_json
-  (vl_api_lisp_map_resolver_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-  struct in6_addr ip6;
-  struct in_addr ip4;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  if (mp->is_ipv6)
-    {
-      clib_memcpy (&ip6, mp->ip_address, sizeof (ip6));
-      vat_json_object_add_ip6 (node, "map resolver", ip6);
-    }
-  else
-    {
-      clib_memcpy (&ip4, mp->ip_address, sizeof (ip4));
-      vat_json_object_add_ip4 (node, "map resolver", ip4);
-    }
-}
-
-static void
-  vl_api_show_lisp_status_reply_t_handler
-  (vl_api_show_lisp_status_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  if (0 <= retval)
-    {
-      print (vam->ofp, "feature: %s\ngpe: %s",
-	     mp->feature_status ? "enabled" : "disabled",
-	     mp->gpe_status ? "enabled" : "disabled");
-    }
-
-  vam->retval = retval;
-  vam->result_ready = 1;
-}
-
-static void
-  vl_api_show_lisp_status_reply_t_handler_json
-  (vl_api_show_lisp_status_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-  u8 *gpe_status = NULL;
-  u8 *feature_status = NULL;
-
-  gpe_status = format (0, "%s", mp->gpe_status ? "enabled" : "disabled");
-  feature_status = format (0, "%s",
-			   mp->feature_status ? "enabled" : "disabled");
-  vec_add1 (gpe_status, 0);
-  vec_add1 (feature_status, 0);
-
-  vat_json_init_object (&node);
-  vat_json_object_add_string_copy (&node, "gpe_status", gpe_status);
-  vat_json_object_add_string_copy (&node, "feature_status", feature_status);
-
-  vec_free (gpe_status);
-  vec_free (feature_status);
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void
-  vl_api_lisp_get_map_request_itr_rlocs_reply_t_handler
-  (vl_api_lisp_get_map_request_itr_rlocs_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  if (retval >= 0)
-    {
-      print (vam->ofp, "%=20s", mp->locator_set_name);
-    }
-
-  vam->retval = retval;
-  vam->result_ready = 1;
-}
-
-static void
-  vl_api_lisp_get_map_request_itr_rlocs_reply_t_handler_json
-  (vl_api_lisp_get_map_request_itr_rlocs_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_string_copy (node, "itr-rlocs", mp->locator_set_name);
-
-  vat_json_print (vam->ofp, node);
-  vat_json_free (node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static u8 *
-format_lisp_map_request_mode (u8 * s, va_list * args)
-{
-  u32 mode = va_arg (*args, u32);
-
-  switch (mode)
-    {
-    case 0:
-      return format (0, "dst-only");
-    case 1:
-      return format (0, "src-dst");
-    }
-  return 0;
-}
-
-static void
-  vl_api_show_lisp_map_request_mode_reply_t_handler
-  (vl_api_show_lisp_map_request_mode_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  if (0 <= retval)
-    {
-      u32 mode = mp->mode;
-      print (vam->ofp, "map_request_mode: %U",
-	     format_lisp_map_request_mode, mode);
-    }
-
-  vam->retval = retval;
-  vam->result_ready = 1;
-}
-
-static void
-  vl_api_show_lisp_map_request_mode_reply_t_handler_json
-  (vl_api_show_lisp_map_request_mode_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-  u8 *s = 0;
-  u32 mode;
-
-  mode = mp->mode;
-  s = format (0, "%U", format_lisp_map_request_mode, mode);
-  vec_add1 (s, 0);
-
-  vat_json_init_object (&node);
-  vat_json_object_add_string_copy (&node, "map_request_mode", s);
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vec_free (s);
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void
-vl_api_show_lisp_pitr_reply_t_handler (vl_api_show_lisp_pitr_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  if (0 <= retval)
-    {
-      print (vam->ofp, "%-20s%-16s",
-	     mp->status ? "enabled" : "disabled",
-	     mp->status ? (char *) mp->locator_set_name : "");
-    }
-
-  vam->retval = retval;
-  vam->result_ready = 1;
-}
-
-static void
-vl_api_show_lisp_pitr_reply_t_handler_json (vl_api_show_lisp_pitr_reply_t *
-					    mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-  u8 *status = 0;
-
-  status = format (0, "%s", mp->status ? "enabled" : "disabled");
-  vec_add1 (status, 0);
-
-  vat_json_init_object (&node);
-  vat_json_object_add_string_copy (&node, "status", status);
-  if (mp->status)
-    {
-      vat_json_object_add_string_copy (&node, "locator_set",
-				       mp->locator_set_name);
-    }
-
-  vec_free (status);
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static u8 *
-format_policer_type (u8 * s, va_list * va)
-{
-  u32 i = va_arg (*va, u32);
-
-  if (i == SSE2_QOS_POLICER_TYPE_1R2C)
-    s = format (s, "1r2c");
-  else if (i == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
-    s = format (s, "1r3c");
-  else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698)
-    s = format (s, "2r3c-2698");
-  else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115)
-    s = format (s, "2r3c-4115");
-  else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1)
-    s = format (s, "2r3c-mef5cf1");
-  else
-    s = format (s, "ILLEGAL");
-  return s;
-}
-
-static u8 *
-format_policer_rate_type (u8 * s, va_list * va)
-{
-  u32 i = va_arg (*va, u32);
-
-  if (i == SSE2_QOS_RATE_KBPS)
-    s = format (s, "kbps");
-  else if (i == SSE2_QOS_RATE_PPS)
-    s = format (s, "pps");
-  else
-    s = format (s, "ILLEGAL");
-  return s;
-}
-
-static u8 *
-format_policer_round_type (u8 * s, va_list * va)
-{
-  u32 i = va_arg (*va, u32);
-
-  if (i == SSE2_QOS_ROUND_TO_CLOSEST)
-    s = format (s, "closest");
-  else if (i == SSE2_QOS_ROUND_TO_UP)
-    s = format (s, "up");
-  else if (i == SSE2_QOS_ROUND_TO_DOWN)
-    s = format (s, "down");
-  else
-    s = format (s, "ILLEGAL");
-  return s;
-}
-
-static u8 *
-format_policer_action_type (u8 * s, va_list * va)
-{
-  u32 i = va_arg (*va, u32);
-
-  if (i == SSE2_QOS_ACTION_DROP)
-    s = format (s, "drop");
-  else if (i == SSE2_QOS_ACTION_TRANSMIT)
-    s = format (s, "transmit");
-  else if (i == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
-    s = format (s, "mark-and-transmit");
-  else
-    s = format (s, "ILLEGAL");
-  return s;
-}
-
-static u8 *
-format_dscp (u8 * s, va_list * va)
-{
-  u32 i = va_arg (*va, u32);
-  char *t = 0;
-
-  switch (i)
-    {
-#define _(v,f,str) case VNET_DSCP_##f: t = str; break;
-      foreach_vnet_dscp
-#undef _
-    default:
-      return format (s, "ILLEGAL");
-    }
-  s = format (s, "%s", t);
-  return s;
-}
-
-static void
-vl_api_policer_details_t_handler (vl_api_policer_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  u8 *conform_dscp_str, *exceed_dscp_str, *violate_dscp_str;
-
-  if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
-    conform_dscp_str = format (0, "%U", format_dscp, mp->conform_dscp);
-  else
-    conform_dscp_str = format (0, "");
-
-  if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
-    exceed_dscp_str = format (0, "%U", format_dscp, mp->exceed_dscp);
-  else
-    exceed_dscp_str = format (0, "");
-
-  if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
-    violate_dscp_str = format (0, "%U", format_dscp, mp->violate_dscp);
-  else
-    violate_dscp_str = format (0, "");
-
-  print (vam->ofp, "Name \"%s\", type %U, cir %u, eir %u, cb %u, eb %u, "
-	 "rate type %U, round type %U, %s rate, %s color-aware, "
-	 "cir %u tok/period, pir %u tok/period, scale %u, cur lim %u, "
-	 "cur bkt %u, ext lim %u, ext bkt %u, last update %llu"
-	 "conform action %U%s, exceed action %U%s, violate action %U%s",
-	 mp->name,
-	 format_policer_type, mp->type,
-	 ntohl (mp->cir),
-	 ntohl (mp->eir),
-	 clib_net_to_host_u64 (mp->cb),
-	 clib_net_to_host_u64 (mp->eb),
-	 format_policer_rate_type, mp->rate_type,
-	 format_policer_round_type, mp->round_type,
-	 mp->single_rate ? "single" : "dual",
-	 mp->color_aware ? "is" : "not",
-	 ntohl (mp->cir_tokens_per_period),
-	 ntohl (mp->pir_tokens_per_period),
-	 ntohl (mp->scale),
-	 ntohl (mp->current_limit),
-	 ntohl (mp->current_bucket),
-	 ntohl (mp->extended_limit),
-	 ntohl (mp->extended_bucket),
-	 clib_net_to_host_u64 (mp->last_update_time),
-	 format_policer_action_type, mp->conform_action_type,
-	 conform_dscp_str,
-	 format_policer_action_type, mp->exceed_action_type,
-	 exceed_dscp_str,
-	 format_policer_action_type, mp->violate_action_type,
-	 violate_dscp_str);
-
-  vec_free (conform_dscp_str);
-  vec_free (exceed_dscp_str);
-  vec_free (violate_dscp_str);
-}
-
-static void vl_api_policer_details_t_handler_json
-  (vl_api_policer_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node;
-  u8 *rate_type_str, *round_type_str, *type_str;
-  u8 *conform_action_str, *exceed_action_str, *violate_action_str;
-
-  rate_type_str = format (0, "%U", format_policer_rate_type, mp->rate_type);
-  round_type_str =
-    format (0, "%U", format_policer_round_type, mp->round_type);
-  type_str = format (0, "%U", format_policer_type, mp->type);
-  conform_action_str = format (0, "%U", format_policer_action_type,
-			       mp->conform_action_type);
-  exceed_action_str = format (0, "%U", format_policer_action_type,
-			      mp->exceed_action_type);
-  violate_action_str = format (0, "%U", format_policer_action_type,
-			       mp->violate_action_type);
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_string_copy (node, "name", mp->name);
-  vat_json_object_add_uint (node, "cir", ntohl (mp->cir));
-  vat_json_object_add_uint (node, "eir", ntohl (mp->eir));
-  vat_json_object_add_uint (node, "cb", ntohl (mp->cb));
-  vat_json_object_add_uint (node, "eb", ntohl (mp->eb));
-  vat_json_object_add_string_copy (node, "rate_type", rate_type_str);
-  vat_json_object_add_string_copy (node, "round_type", round_type_str);
-  vat_json_object_add_string_copy (node, "type", type_str);
-  vat_json_object_add_uint (node, "single_rate", mp->single_rate);
-  vat_json_object_add_uint (node, "color_aware", mp->color_aware);
-  vat_json_object_add_uint (node, "scale", ntohl (mp->scale));
-  vat_json_object_add_uint (node, "cir_tokens_per_period",
-			    ntohl (mp->cir_tokens_per_period));
-  vat_json_object_add_uint (node, "eir_tokens_per_period",
-			    ntohl (mp->pir_tokens_per_period));
-  vat_json_object_add_uint (node, "current_limit", ntohl (mp->current_limit));
-  vat_json_object_add_uint (node, "current_bucket",
-			    ntohl (mp->current_bucket));
-  vat_json_object_add_uint (node, "extended_limit",
-			    ntohl (mp->extended_limit));
-  vat_json_object_add_uint (node, "extended_bucket",
-			    ntohl (mp->extended_bucket));
-  vat_json_object_add_uint (node, "last_update_time",
-			    ntohl (mp->last_update_time));
-  vat_json_object_add_string_copy (node, "conform_action",
-				   conform_action_str);
-  if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
-    {
-      u8 *dscp_str = format (0, "%U", format_dscp, mp->conform_dscp);
-      vat_json_object_add_string_copy (node, "conform_dscp", dscp_str);
-      vec_free (dscp_str);
-    }
-  vat_json_object_add_string_copy (node, "exceed_action", exceed_action_str);
-  if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
-    {
-      u8 *dscp_str = format (0, "%U", format_dscp, mp->exceed_dscp);
-      vat_json_object_add_string_copy (node, "exceed_dscp", dscp_str);
-      vec_free (dscp_str);
-    }
-  vat_json_object_add_string_copy (node, "violate_action",
-				   violate_action_str);
-  if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
-    {
-      u8 *dscp_str = format (0, "%U", format_dscp, mp->violate_dscp);
-      vat_json_object_add_string_copy (node, "violate_dscp", dscp_str);
-      vec_free (dscp_str);
-    }
-
-  vec_free (rate_type_str);
-  vec_free (round_type_str);
-  vec_free (type_str);
-  vec_free (conform_action_str);
-  vec_free (exceed_action_str);
-  vec_free (violate_action_str);
-}
-
-static void
-vl_api_classify_table_ids_reply_t_handler (vl_api_classify_table_ids_reply_t *
-					   mp)
-{
-  vat_main_t *vam = &vat_main;
-  int i, count = ntohl (mp->count);
-
-  if (count > 0)
-    print (vam->ofp, "classify table ids (%d) : ", count);
-  for (i = 0; i < count; i++)
-    {
-      print (vam->ofp, "%d", ntohl (mp->ids[i]));
-      print (vam->ofp, (i < count - 1) ? "," : "");
-    }
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void
-  vl_api_classify_table_ids_reply_t_handler_json
-  (vl_api_classify_table_ids_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  int i, count = ntohl (mp->count);
-
-  if (count > 0)
-    {
-      vat_json_node_t node;
-
-      vat_json_init_object (&node);
-      for (i = 0; i < count; i++)
-	{
-	  vat_json_object_add_uint (&node, "table_id", ntohl (mp->ids[i]));
-	}
-      vat_json_print (vam->ofp, &node);
-      vat_json_free (&node);
-    }
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void
-  vl_api_classify_table_by_interface_reply_t_handler
-  (vl_api_classify_table_by_interface_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  u32 table_id;
-
-  table_id = ntohl (mp->l2_table_id);
-  if (table_id != ~0)
-    print (vam->ofp, "l2 table id : %d", table_id);
-  else
-    print (vam->ofp, "l2 table id : No input ACL tables configured");
-  table_id = ntohl (mp->ip4_table_id);
-  if (table_id != ~0)
-    print (vam->ofp, "ip4 table id : %d", table_id);
-  else
-    print (vam->ofp, "ip4 table id : No input ACL tables configured");
-  table_id = ntohl (mp->ip6_table_id);
-  if (table_id != ~0)
-    print (vam->ofp, "ip6 table id : %d", table_id);
-  else
-    print (vam->ofp, "ip6 table id : No input ACL tables configured");
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void
-  vl_api_classify_table_by_interface_reply_t_handler_json
-  (vl_api_classify_table_by_interface_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-
-  vat_json_object_add_int (&node, "l2_table_id", ntohl (mp->l2_table_id));
-  vat_json_object_add_int (&node, "ip4_table_id", ntohl (mp->ip4_table_id));
-  vat_json_object_add_int (&node, "ip6_table_id", ntohl (mp->ip6_table_id));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_policer_add_del_reply_t_handler
-  (vl_api_policer_add_del_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->result_ready = 1;
-      if (retval == 0 && mp->policer_index != 0xFFFFFFFF)
-	/*
-	 * Note: this is just barely thread-safe, depends on
-	 * the main thread spinning waiting for an answer...
-	 */
-	errmsg ("policer index %d", ntohl (mp->policer_index));
-    }
-}
-
-static void vl_api_policer_add_del_reply_t_handler_json
-  (vl_api_policer_add_del_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "policer_index",
-			    ntohl (mp->policer_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-/* Format hex dump. */
-u8 *
-format_hex_bytes (u8 * s, va_list * va)
-{
-  u8 *bytes = va_arg (*va, u8 *);
-  int n_bytes = va_arg (*va, int);
-  uword i;
-
-  /* Print short or long form depending on byte count. */
-  uword short_form = n_bytes <= 32;
-  uword indent = format_get_indent (s);
-
-  if (n_bytes == 0)
-    return s;
-
-  for (i = 0; i < n_bytes; i++)
-    {
-      if (!short_form && (i % 32) == 0)
-	s = format (s, "%08x: ", i);
-      s = format (s, "%02x", bytes[i]);
-      if (!short_form && ((i + 1) % 32) == 0 && (i + 1) < n_bytes)
-	s = format (s, "\n%U", format_white_space, indent);
-    }
-
-  return s;
-}
-
-static void
-vl_api_classify_table_info_reply_t_handler (vl_api_classify_table_info_reply_t
-					    * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (retval == 0)
-    {
-      print (vam->ofp, "classify table info :");
-      print (vam->ofp, "sessions: %d nexttbl: %d nextnode: %d",
-	     ntohl (mp->active_sessions), ntohl (mp->next_table_index),
-	     ntohl (mp->miss_next_index));
-      print (vam->ofp, "nbuckets: %d skip: %d match: %d",
-	     ntohl (mp->nbuckets), ntohl (mp->skip_n_vectors),
-	     ntohl (mp->match_n_vectors));
-      print (vam->ofp, "mask: %U", format_hex_bytes, mp->mask,
-	     ntohl (mp->mask_length));
-    }
-  vam->retval = retval;
-  vam->result_ready = 1;
-}
-
-static void
-  vl_api_classify_table_info_reply_t_handler_json
-  (vl_api_classify_table_info_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  i32 retval = ntohl (mp->retval);
-  if (retval == 0)
-    {
-      vat_json_init_object (&node);
-
-      vat_json_object_add_int (&node, "sessions",
-			       ntohl (mp->active_sessions));
-      vat_json_object_add_int (&node, "nexttbl",
-			       ntohl (mp->next_table_index));
-      vat_json_object_add_int (&node, "nextnode",
-			       ntohl (mp->miss_next_index));
-      vat_json_object_add_int (&node, "nbuckets", ntohl (mp->nbuckets));
-      vat_json_object_add_int (&node, "skip", ntohl (mp->skip_n_vectors));
-      vat_json_object_add_int (&node, "match", ntohl (mp->match_n_vectors));
-      u8 *s = format (0, "%U%c", format_hex_bytes, mp->mask,
-		      ntohl (mp->mask_length), 0);
-      vat_json_object_add_string_copy (&node, "mask", s);
-
-      vat_json_print (vam->ofp, &node);
-      vat_json_free (&node);
-    }
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void
-vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t *
-					   mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "next_index: %d advance: %d opaque: %d ",
-	 ntohl (mp->hit_next_index), ntohl (mp->advance),
-	 ntohl (mp->opaque_index));
-  print (vam->ofp, "mask: %U", format_hex_bytes, mp->match,
-	 ntohl (mp->match_length));
-}
-
-static void
-  vl_api_classify_session_details_t_handler_json
-  (vl_api_classify_session_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_int (node, "next_index", ntohl (mp->hit_next_index));
-  vat_json_object_add_int (node, "advance", ntohl (mp->advance));
-  vat_json_object_add_int (node, "opaque", ntohl (mp->opaque_index));
-  u8 *s =
-    format (0, "%U%c", format_hex_bytes, mp->match, ntohl (mp->match_length),
-	    0);
-  vat_json_object_add_string_copy (node, "match", s);
-}
-
-static void vl_api_pg_create_interface_reply_t_handler
-  (vl_api_pg_create_interface_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_pg_create_interface_reply_t_handler_json
-  (vl_api_pg_create_interface_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  i32 retval = ntohl (mp->retval);
-  if (retval == 0)
-    {
-      vat_json_init_object (&node);
-
-      vat_json_object_add_int (&node, "sw_if_index", ntohl (mp->sw_if_index));
-
-      vat_json_print (vam->ofp, &node);
-      vat_json_free (&node);
-    }
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_policer_classify_details_t_handler
-  (vl_api_policer_classify_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index),
-	 ntohl (mp->table_index));
-}
-
-static void vl_api_policer_classify_details_t_handler_json
-  (vl_api_policer_classify_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
-  vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index));
-}
-
-static void vl_api_ipsec_gre_add_del_tunnel_reply_t_handler
-  (vl_api_ipsec_gre_add_del_tunnel_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->sw_if_index = ntohl (mp->sw_if_index);
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_ipsec_gre_add_del_tunnel_reply_t_handler_json
-  (vl_api_ipsec_gre_add_del_tunnel_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static void vl_api_flow_classify_details_t_handler
-  (vl_api_flow_classify_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index),
-	 ntohl (mp->table_index));
-}
-
-static void vl_api_flow_classify_details_t_handler_json
-  (vl_api_flow_classify_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
-  vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index));
-}
-
-
-
-#define vl_api_vnet_ip4_fib_counters_t_endian vl_noop_handler
-#define vl_api_vnet_ip4_fib_counters_t_print vl_noop_handler
-#define vl_api_vnet_ip6_fib_counters_t_endian vl_noop_handler
-#define vl_api_vnet_ip6_fib_counters_t_print vl_noop_handler
-#define vl_api_lisp_adjacencies_get_reply_t_endian vl_noop_handler
-#define vl_api_lisp_adjacencies_get_reply_t_print vl_noop_handler
-
-/*
- * Generate boilerplate reply handlers, which
- * dig the return value out of the xxx_reply_t API message,
- * stick it into vam->retval, and set vam->result_ready
- *
- * Could also do this by pointing N message decode slots at
- * a single function, but that could break in subtle ways.
- */
-
-#define foreach_standard_reply_retval_handler           \
-_(sw_interface_set_flags_reply)                         \
-_(sw_interface_add_del_address_reply)                   \
-_(sw_interface_set_table_reply)                         \
-_(sw_interface_set_mpls_enable_reply)                   \
-_(sw_interface_set_vpath_reply)                         \
-_(sw_interface_set_vxlan_bypass_reply)                  \
-_(sw_interface_set_l2_bridge_reply)                     \
-_(sw_interface_set_dpdk_hqos_pipe_reply)                \
-_(sw_interface_set_dpdk_hqos_subport_reply)             \
-_(sw_interface_set_dpdk_hqos_tctbl_reply)               \
-_(bridge_domain_add_del_reply)                          \
-_(sw_interface_set_l2_xconnect_reply)                   \
-_(l2fib_add_del_reply)                                  \
-_(ip_add_del_route_reply)                               \
-_(mpls_route_add_del_reply)                             \
-_(mpls_ip_bind_unbind_reply)                            \
-_(proxy_arp_add_del_reply)                              \
-_(proxy_arp_intfc_enable_disable_reply)                 \
-_(sw_interface_set_unnumbered_reply)                    \
-_(ip_neighbor_add_del_reply)                            \
-_(reset_vrf_reply)                                      \
-_(oam_add_del_reply)                                    \
-_(reset_fib_reply)                                      \
-_(dhcp_proxy_config_reply)                              \
-_(dhcp_proxy_config_2_reply)                            \
-_(dhcp_proxy_set_vss_reply)                             \
-_(dhcp_client_config_reply)                             \
-_(set_ip_flow_hash_reply)                               \
-_(sw_interface_ip6_enable_disable_reply)                \
-_(sw_interface_ip6_set_link_local_address_reply)        \
-_(sw_interface_ip6nd_ra_prefix_reply)                   \
-_(sw_interface_ip6nd_ra_config_reply)                   \
-_(set_arp_neighbor_limit_reply)                         \
-_(l2_patch_add_del_reply)                               \
-_(sr_tunnel_add_del_reply)                              \
-_(sr_policy_add_del_reply)                              \
-_(sr_multicast_map_add_del_reply)                       \
-_(classify_add_del_session_reply)                       \
-_(classify_set_interface_ip_table_reply)                \
-_(classify_set_interface_l2_tables_reply)               \
-_(l2tpv3_set_tunnel_cookies_reply)                      \
-_(l2tpv3_interface_enable_disable_reply)                \
-_(l2tpv3_set_lookup_key_reply)                          \
-_(l2_fib_clear_table_reply)                             \
-_(l2_interface_efp_filter_reply)                        \
-_(l2_interface_vlan_tag_rewrite_reply)                  \
-_(modify_vhost_user_if_reply)                           \
-_(delete_vhost_user_if_reply)                           \
-_(want_ip4_arp_events_reply)                            \
-_(want_ip6_nd_events_reply)                             \
-_(input_acl_set_interface_reply)                        \
-_(ipsec_spd_add_del_reply)                              \
-_(ipsec_interface_add_del_spd_reply)                    \
-_(ipsec_spd_add_del_entry_reply)                        \
-_(ipsec_sad_add_del_entry_reply)                        \
-_(ipsec_sa_set_key_reply)                               \
-_(ikev2_profile_add_del_reply)                          \
-_(ikev2_profile_set_auth_reply)                         \
-_(ikev2_profile_set_id_reply)                           \
-_(ikev2_profile_set_ts_reply)                           \
-_(ikev2_set_local_key_reply)                            \
-_(delete_loopback_reply)                                \
-_(bd_ip_mac_add_del_reply)                              \
-_(map_del_domain_reply)                                 \
-_(map_add_del_rule_reply)                               \
-_(want_interface_events_reply)                          \
-_(want_stats_reply)					\
-_(cop_interface_enable_disable_reply)			\
-_(cop_whitelist_enable_disable_reply)                   \
-_(sw_interface_clear_stats_reply)                       \
-_(ioam_enable_reply)                              \
-_(ioam_disable_reply)                              \
-_(lisp_add_del_locator_reply)                           \
-_(lisp_add_del_local_eid_reply)                         \
-_(lisp_add_del_remote_mapping_reply)                    \
-_(lisp_add_del_adjacency_reply)                         \
-_(lisp_gpe_add_del_fwd_entry_reply)                     \
-_(lisp_add_del_map_resolver_reply)                      \
-_(lisp_add_del_map_server_reply)                        \
-_(lisp_gpe_enable_disable_reply)                        \
-_(lisp_gpe_add_del_iface_reply)                         \
-_(lisp_enable_disable_reply)                            \
-_(lisp_rloc_probe_enable_disable_reply)                 \
-_(lisp_map_register_enable_disable_reply)               \
-_(lisp_pitr_set_locator_set_reply)                      \
-_(lisp_map_request_mode_reply)                          \
-_(lisp_add_del_map_request_itr_rlocs_reply)             \
-_(lisp_eid_table_add_del_map_reply)                     \
-_(vxlan_gpe_add_del_tunnel_reply)                       \
-_(af_packet_delete_reply)                               \
-_(policer_classify_set_interface_reply)                 \
-_(netmap_create_reply)                                  \
-_(netmap_delete_reply)                                  \
-_(set_ipfix_exporter_reply)                             \
-_(set_ipfix_classify_stream_reply)                      \
-_(ipfix_classify_table_add_del_reply)                   \
-_(flow_classify_set_interface_reply)                    \
-_(sw_interface_span_enable_disable_reply)               \
-_(pg_capture_reply)                                     \
-_(pg_enable_disable_reply)                              \
-_(ip_source_and_port_range_check_add_del_reply)         \
-_(ip_source_and_port_range_check_interface_add_del_reply)\
-_(delete_subif_reply)                                   \
-_(l2_interface_pbb_tag_rewrite_reply)                   \
-_(punt_reply)                                           \
-_(feature_enable_disable_reply)				\
-_(sw_interface_tag_add_del_reply)			\
-_(sw_interface_set_mtu_reply)
-
-#define _(n)                                    \
-    static void vl_api_##n##_t_handler          \
-    (vl_api_##n##_t * mp)                       \
-    {                                           \
-        vat_main_t * vam = &vat_main;           \
-        i32 retval = ntohl(mp->retval);         \
-        if (vam->async_mode) {                  \
-            vam->async_errors += (retval < 0);  \
-        } else {                                \
-            vam->retval = retval;               \
-            vam->result_ready = 1;              \
-        }                                       \
-    }
-foreach_standard_reply_retval_handler;
-#undef _
-
-#define _(n)                                    \
-    static void vl_api_##n##_t_handler_json     \
-    (vl_api_##n##_t * mp)                       \
-    {                                           \
-        vat_main_t * vam = &vat_main;           \
-        vat_json_node_t node;                   \
-        vat_json_init_object(&node);            \
-        vat_json_object_add_int(&node, "retval", ntohl(mp->retval));    \
-        vat_json_print(vam->ofp, &node);        \
-        vam->retval = ntohl(mp->retval);        \
-        vam->result_ready = 1;                  \
-    }
-foreach_standard_reply_retval_handler;
-#undef _
-
-/*
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-
-#define foreach_vpe_api_reply_msg                                       \
-_(CREATE_LOOPBACK_REPLY, create_loopback_reply)                         \
-_(SW_INTERFACE_DETAILS, sw_interface_details)                           \
-_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags)                       \
-_(SW_INTERFACE_SET_FLAGS_REPLY, sw_interface_set_flags_reply)           \
-_(CONTROL_PING_REPLY, control_ping_reply)                               \
-_(CLI_REPLY, cli_reply)                                                 \
-_(CLI_INBAND_REPLY, cli_inband_reply)                                   \
-_(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY,                                   \
-  sw_interface_add_del_address_reply)                                   \
-_(SW_INTERFACE_SET_TABLE_REPLY, sw_interface_set_table_reply) 		\
-_(SW_INTERFACE_SET_MPLS_ENABLE_REPLY, sw_interface_set_mpls_enable_reply) \
-_(SW_INTERFACE_SET_VPATH_REPLY, sw_interface_set_vpath_reply) 		\
-_(SW_INTERFACE_SET_VXLAN_BYPASS_REPLY, sw_interface_set_vxlan_bypass_reply) \
-_(SW_INTERFACE_SET_L2_XCONNECT_REPLY,                                   \
-  sw_interface_set_l2_xconnect_reply)                                   \
-_(SW_INTERFACE_SET_L2_BRIDGE_REPLY,                                     \
-  sw_interface_set_l2_bridge_reply)                                     \
-_(SW_INTERFACE_SET_DPDK_HQOS_PIPE_REPLY,                                \
-  sw_interface_set_dpdk_hqos_pipe_reply)                                \
-_(SW_INTERFACE_SET_DPDK_HQOS_SUBPORT_REPLY,                             \
-  sw_interface_set_dpdk_hqos_subport_reply)                             \
-_(SW_INTERFACE_SET_DPDK_HQOS_TCTBL_REPLY,                               \
-  sw_interface_set_dpdk_hqos_tctbl_reply)                               \
-_(BRIDGE_DOMAIN_ADD_DEL_REPLY, bridge_domain_add_del_reply)             \
-_(BRIDGE_DOMAIN_DETAILS, bridge_domain_details)                         \
-_(BRIDGE_DOMAIN_SW_IF_DETAILS, bridge_domain_sw_if_details)             \
-_(L2FIB_ADD_DEL_REPLY, l2fib_add_del_reply)                             \
-_(L2_FLAGS_REPLY, l2_flags_reply)                                       \
-_(BRIDGE_FLAGS_REPLY, bridge_flags_reply)                               \
-_(TAP_CONNECT_REPLY, tap_connect_reply)					\
-_(TAP_MODIFY_REPLY, tap_modify_reply)					\
-_(TAP_DELETE_REPLY, tap_delete_reply)					\
-_(SW_INTERFACE_TAP_DETAILS, sw_interface_tap_details)                   \
-_(IP_ADD_DEL_ROUTE_REPLY, ip_add_del_route_reply)			\
-_(MPLS_ROUTE_ADD_DEL_REPLY, mpls_route_add_del_reply)			\
-_(MPLS_IP_BIND_UNBIND_REPLY, mpls_ip_bind_unbind_reply)			\
-_(PROXY_ARP_ADD_DEL_REPLY, proxy_arp_add_del_reply)                     \
-_(PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY,                                 \
-  proxy_arp_intfc_enable_disable_reply)                                 \
-_(MPLS_TUNNEL_ADD_DEL_REPLY, mpls_tunnel_add_del_reply)                 \
-_(SW_INTERFACE_SET_UNNUMBERED_REPLY,                                    \
-  sw_interface_set_unnumbered_reply)                                    \
-_(IP_NEIGHBOR_ADD_DEL_REPLY, ip_neighbor_add_del_reply)                 \
-_(RESET_VRF_REPLY, reset_vrf_reply)                                     \
-_(CREATE_VLAN_SUBIF_REPLY, create_vlan_subif_reply)                     \
-_(CREATE_SUBIF_REPLY, create_subif_reply)                     		\
-_(OAM_ADD_DEL_REPLY, oam_add_del_reply)                                 \
-_(RESET_FIB_REPLY, reset_fib_reply)                                     \
-_(DHCP_PROXY_CONFIG_REPLY, dhcp_proxy_config_reply)                     \
-_(DHCP_PROXY_CONFIG_2_REPLY, dhcp_proxy_config_2_reply)                 \
-_(DHCP_PROXY_SET_VSS_REPLY, dhcp_proxy_set_vss_reply)                   \
-_(DHCP_CLIENT_CONFIG_REPLY, dhcp_client_config_reply)                   \
-_(SET_IP_FLOW_HASH_REPLY, set_ip_flow_hash_reply)                       \
-_(SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY,                                \
-  sw_interface_ip6_enable_disable_reply)                                \
-_(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_REPLY,                        \
-  sw_interface_ip6_set_link_local_address_reply)                        \
-_(SW_INTERFACE_IP6ND_RA_PREFIX_REPLY,                                   \
-  sw_interface_ip6nd_ra_prefix_reply)                                   \
-_(SW_INTERFACE_IP6ND_RA_CONFIG_REPLY,                                   \
-  sw_interface_ip6nd_ra_config_reply)                                   \
-_(SET_ARP_NEIGHBOR_LIMIT_REPLY, set_arp_neighbor_limit_reply)           \
-_(L2_PATCH_ADD_DEL_REPLY, l2_patch_add_del_reply)                       \
-_(SR_TUNNEL_ADD_DEL_REPLY, sr_tunnel_add_del_reply)                     \
-_(SR_POLICY_ADD_DEL_REPLY, sr_policy_add_del_reply)                     \
-_(SR_MULTICAST_MAP_ADD_DEL_REPLY, sr_multicast_map_add_del_reply)                     \
-_(CLASSIFY_ADD_DEL_TABLE_REPLY, classify_add_del_table_reply)           \
-_(CLASSIFY_ADD_DEL_SESSION_REPLY, classify_add_del_session_reply)       \
-_(CLASSIFY_SET_INTERFACE_IP_TABLE_REPLY,                                \
-classify_set_interface_ip_table_reply)                                  \
-_(CLASSIFY_SET_INTERFACE_L2_TABLES_REPLY,                               \
-  classify_set_interface_l2_tables_reply)                               \
-_(GET_NODE_INDEX_REPLY, get_node_index_reply)                           \
-_(ADD_NODE_NEXT_REPLY, add_node_next_reply)                             \
-_(L2TPV3_CREATE_TUNNEL_REPLY, l2tpv3_create_tunnel_reply)               \
-_(L2TPV3_SET_TUNNEL_COOKIES_REPLY, l2tpv3_set_tunnel_cookies_reply)     \
-_(L2TPV3_INTERFACE_ENABLE_DISABLE_REPLY,                                \
-  l2tpv3_interface_enable_disable_reply)                                \
-_(L2TPV3_SET_LOOKUP_KEY_REPLY, l2tpv3_set_lookup_key_reply)             \
-_(SW_IF_L2TPV3_TUNNEL_DETAILS, sw_if_l2tpv3_tunnel_details)             \
-_(VXLAN_ADD_DEL_TUNNEL_REPLY, vxlan_add_del_tunnel_reply)               \
-_(VXLAN_TUNNEL_DETAILS, vxlan_tunnel_details)                           \
-_(GRE_ADD_DEL_TUNNEL_REPLY, gre_add_del_tunnel_reply)                   \
-_(GRE_TUNNEL_DETAILS, gre_tunnel_details)                               \
-_(L2_FIB_CLEAR_TABLE_REPLY, l2_fib_clear_table_reply)                   \
-_(L2_INTERFACE_EFP_FILTER_REPLY, l2_interface_efp_filter_reply)         \
-_(L2_INTERFACE_VLAN_TAG_REWRITE_REPLY, l2_interface_vlan_tag_rewrite_reply) \
-_(SW_INTERFACE_VHOST_USER_DETAILS, sw_interface_vhost_user_details)     \
-_(CREATE_VHOST_USER_IF_REPLY, create_vhost_user_if_reply)               \
-_(MODIFY_VHOST_USER_IF_REPLY, modify_vhost_user_if_reply)               \
-_(DELETE_VHOST_USER_IF_REPLY, delete_vhost_user_if_reply)               \
-_(SHOW_VERSION_REPLY, show_version_reply)                               \
-_(L2_FIB_TABLE_ENTRY, l2_fib_table_entry)				\
-_(VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, vxlan_gpe_add_del_tunnel_reply)	    \
-_(VXLAN_GPE_TUNNEL_DETAILS, vxlan_gpe_tunnel_details)                   \
-_(INTERFACE_NAME_RENUMBER_REPLY, interface_name_renumber_reply)		\
-_(WANT_IP4_ARP_EVENTS_REPLY, want_ip4_arp_events_reply)			\
-_(IP4_ARP_EVENT, ip4_arp_event)                                         \
-_(WANT_IP6_ND_EVENTS_REPLY, want_ip6_nd_events_reply)			\
-_(IP6_ND_EVENT, ip6_nd_event)						\
-_(INPUT_ACL_SET_INTERFACE_REPLY, input_acl_set_interface_reply)         \
-_(IP_ADDRESS_DETAILS, ip_address_details)                               \
-_(IP_DETAILS, ip_details)                                               \
-_(IPSEC_SPD_ADD_DEL_REPLY, ipsec_spd_add_del_reply)                     \
-_(IPSEC_INTERFACE_ADD_DEL_SPD_REPLY, ipsec_interface_add_del_spd_reply) \
-_(IPSEC_SPD_ADD_DEL_ENTRY_REPLY, ipsec_spd_add_del_entry_reply)         \
-_(IPSEC_SAD_ADD_DEL_ENTRY_REPLY, ipsec_sad_add_del_entry_reply)         \
-_(IPSEC_SA_SET_KEY_REPLY, ipsec_sa_set_key_reply)                       \
-_(IKEV2_PROFILE_ADD_DEL_REPLY, ikev2_profile_add_del_reply)             \
-_(IKEV2_PROFILE_SET_AUTH_REPLY, ikev2_profile_set_auth_reply)           \
-_(IKEV2_PROFILE_SET_ID_REPLY, ikev2_profile_set_id_reply)               \
-_(IKEV2_PROFILE_SET_TS_REPLY, ikev2_profile_set_ts_reply)               \
-_(IKEV2_SET_LOCAL_KEY_REPLY, ikev2_set_local_key_reply)                 \
-_(DELETE_LOOPBACK_REPLY, delete_loopback_reply)                         \
-_(BD_IP_MAC_ADD_DEL_REPLY, bd_ip_mac_add_del_reply)                     \
-_(DHCP_COMPL_EVENT, dhcp_compl_event)                                   \
-_(VNET_INTERFACE_COUNTERS, vnet_interface_counters)                     \
-_(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters)                         \
-_(VNET_IP6_FIB_COUNTERS, vnet_ip6_fib_counters)                         \
-_(MAP_ADD_DOMAIN_REPLY, map_add_domain_reply)                           \
-_(MAP_DEL_DOMAIN_REPLY, map_del_domain_reply)                           \
-_(MAP_ADD_DEL_RULE_REPLY, map_add_del_rule_reply)	                \
-_(MAP_DOMAIN_DETAILS, map_domain_details)                               \
-_(MAP_RULE_DETAILS, map_rule_details)                                   \
-_(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply)             \
-_(WANT_STATS_REPLY, want_stats_reply)					\
-_(GET_FIRST_MSG_ID_REPLY, get_first_msg_id_reply)    			\
-_(COP_INTERFACE_ENABLE_DISABLE_REPLY, cop_interface_enable_disable_reply) \
-_(COP_WHITELIST_ENABLE_DISABLE_REPLY, cop_whitelist_enable_disable_reply) \
-_(GET_NODE_GRAPH_REPLY, get_node_graph_reply)                           \
-_(SW_INTERFACE_CLEAR_STATS_REPLY, sw_interface_clear_stats_reply)      \
-_(IOAM_ENABLE_REPLY, ioam_enable_reply)                   \
-_(IOAM_DISABLE_REPLY, ioam_disable_reply)                     \
-_(LISP_ADD_DEL_LOCATOR_SET_REPLY, lisp_add_del_locator_set_reply)       \
-_(LISP_ADD_DEL_LOCATOR_REPLY, lisp_add_del_locator_reply)               \
-_(LISP_ADD_DEL_LOCAL_EID_REPLY, lisp_add_del_local_eid_reply)           \
-_(LISP_ADD_DEL_REMOTE_MAPPING_REPLY, lisp_add_del_remote_mapping_reply) \
-_(LISP_ADD_DEL_ADJACENCY_REPLY, lisp_add_del_adjacency_reply)           \
-_(LISP_GPE_ADD_DEL_FWD_ENTRY_REPLY, lisp_gpe_add_del_fwd_entry_reply)   \
-_(LISP_ADD_DEL_MAP_RESOLVER_REPLY, lisp_add_del_map_resolver_reply)     \
-_(LISP_ADD_DEL_MAP_SERVER_REPLY, lisp_add_del_map_server_reply)         \
-_(LISP_GPE_ENABLE_DISABLE_REPLY, lisp_gpe_enable_disable_reply)         \
-_(LISP_ENABLE_DISABLE_REPLY, lisp_enable_disable_reply)                 \
-_(LISP_MAP_REGISTER_ENABLE_DISABLE_REPLY,                               \
-  lisp_map_register_enable_disable_reply)                               \
-_(LISP_RLOC_PROBE_ENABLE_DISABLE_REPLY,                                 \
-  lisp_rloc_probe_enable_disable_reply)                                 \
-_(LISP_PITR_SET_LOCATOR_SET_REPLY, lisp_pitr_set_locator_set_reply)     \
-_(LISP_MAP_REQUEST_MODE_REPLY, lisp_map_request_mode_reply)             \
-_(LISP_EID_TABLE_ADD_DEL_MAP_REPLY, lisp_eid_table_add_del_map_reply)   \
-_(LISP_GPE_ADD_DEL_IFACE_REPLY, lisp_gpe_add_del_iface_reply)           \
-_(LISP_LOCATOR_SET_DETAILS, lisp_locator_set_details)                   \
-_(LISP_LOCATOR_DETAILS, lisp_locator_details)                           \
-_(LISP_EID_TABLE_DETAILS, lisp_eid_table_details)                       \
-_(LISP_EID_TABLE_MAP_DETAILS, lisp_eid_table_map_details)               \
-_(LISP_EID_TABLE_VNI_DETAILS, lisp_eid_table_vni_details)               \
-_(LISP_GPE_TUNNEL_DETAILS, lisp_gpe_tunnel_details)                     \
-_(LISP_MAP_RESOLVER_DETAILS, lisp_map_resolver_details)                 \
-_(LISP_MAP_SERVER_DETAILS, lisp_map_server_details)                     \
-_(LISP_ADJACENCIES_GET_REPLY, lisp_adjacencies_get_reply)               \
-_(SHOW_LISP_STATUS_REPLY, show_lisp_status_reply)                       \
-_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS_REPLY,                             \
-  lisp_add_del_map_request_itr_rlocs_reply)                             \
-_(LISP_GET_MAP_REQUEST_ITR_RLOCS_REPLY,                                 \
-  lisp_get_map_request_itr_rlocs_reply)                                 \
-_(SHOW_LISP_PITR_REPLY, show_lisp_pitr_reply)                           \
-_(SHOW_LISP_MAP_REQUEST_MODE_REPLY, show_lisp_map_request_mode_reply)   \
-_(SHOW_LISP_RLOC_PROBE_STATE_REPLY, show_lisp_rloc_probe_state_reply)   \
-_(SHOW_LISP_MAP_REGISTER_STATE_REPLY,                                   \
-  show_lisp_map_register_state_reply)                                   \
-_(AF_PACKET_CREATE_REPLY, af_packet_create_reply)                       \
-_(AF_PACKET_DELETE_REPLY, af_packet_delete_reply)                       \
-_(POLICER_ADD_DEL_REPLY, policer_add_del_reply)                         \
-_(POLICER_DETAILS, policer_details)                                     \
-_(POLICER_CLASSIFY_SET_INTERFACE_REPLY, policer_classify_set_interface_reply) \
-_(POLICER_CLASSIFY_DETAILS, policer_classify_details)                   \
-_(NETMAP_CREATE_REPLY, netmap_create_reply)                             \
-_(NETMAP_DELETE_REPLY, netmap_delete_reply)                             \
-_(MPLS_TUNNEL_DETAILS, mpls_tunnel_details)                             \
-_(MPLS_FIB_DETAILS, mpls_fib_details)                                   \
-_(CLASSIFY_TABLE_IDS_REPLY, classify_table_ids_reply)                   \
-_(CLASSIFY_TABLE_BY_INTERFACE_REPLY, classify_table_by_interface_reply) \
-_(CLASSIFY_TABLE_INFO_REPLY, classify_table_info_reply)                 \
-_(CLASSIFY_SESSION_DETAILS, classify_session_details)                   \
-_(SET_IPFIX_EXPORTER_REPLY, set_ipfix_exporter_reply)                   \
-_(IPFIX_EXPORTER_DETAILS, ipfix_exporter_details)                       \
-_(SET_IPFIX_CLASSIFY_STREAM_REPLY, set_ipfix_classify_stream_reply)     \
-_(IPFIX_CLASSIFY_STREAM_DETAILS, ipfix_classify_stream_details)         \
-_(IPFIX_CLASSIFY_TABLE_ADD_DEL_REPLY, ipfix_classify_table_add_del_reply) \
-_(IPFIX_CLASSIFY_TABLE_DETAILS, ipfix_classify_table_details)           \
-_(FLOW_CLASSIFY_SET_INTERFACE_REPLY, flow_classify_set_interface_reply) \
-_(FLOW_CLASSIFY_DETAILS, flow_classify_details)                         \
-_(SW_INTERFACE_SPAN_ENABLE_DISABLE_REPLY, sw_interface_span_enable_disable_reply) \
-_(SW_INTERFACE_SPAN_DETAILS, sw_interface_span_details)                 \
-_(GET_NEXT_INDEX_REPLY, get_next_index_reply)                           \
-_(PG_CREATE_INTERFACE_REPLY, pg_create_interface_reply)                 \
-_(PG_CAPTURE_REPLY, pg_capture_reply)                                   \
-_(PG_ENABLE_DISABLE_REPLY, pg_enable_disable_reply)                     \
-_(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL_REPLY,                         \
- ip_source_and_port_range_check_add_del_reply)                          \
-_(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL_REPLY,               \
- ip_source_and_port_range_check_interface_add_del_reply)                \
-_(IPSEC_GRE_ADD_DEL_TUNNEL_REPLY, ipsec_gre_add_del_tunnel_reply)       \
-_(IPSEC_GRE_TUNNEL_DETAILS, ipsec_gre_tunnel_details)                   \
-_(DELETE_SUBIF_REPLY, delete_subif_reply)                               \
-_(L2_INTERFACE_PBB_TAG_REWRITE_REPLY, l2_interface_pbb_tag_rewrite_reply) \
-_(PUNT_REPLY, punt_reply)                                               \
-_(IP_FIB_DETAILS, ip_fib_details)                                       \
-_(IP6_FIB_DETAILS, ip6_fib_details)                                     \
-_(FEATURE_ENABLE_DISABLE_REPLY, feature_enable_disable_reply)           \
-_(SW_INTERFACE_TAG_ADD_DEL_REPLY, sw_interface_tag_add_del_reply)     	\
-_(L2_XCONNECT_DETAILS, l2_xconnect_details)                             \
-_(SW_INTERFACE_SET_MTU_REPLY, sw_interface_set_mtu_reply)               \
-_(IP_NEIGHBOR_DETAILS, ip_neighbor_details)                             \
-_(SW_INTERFACE_GET_TABLE_REPLY, sw_interface_get_table_reply)
-
-/* M: construct, but don't yet send a message */
-
-#define M(T,t)                                          \
-do {                                                    \
-    vam->result_ready = 0;                              \
-    mp = vl_msg_api_alloc_as_if_client(sizeof(*mp));    \
-    memset (mp, 0, sizeof (*mp));                       \
-    mp->_vl_msg_id = ntohs (VL_API_##T);                \
-    mp->client_index = vam->my_client_index;            \
-} while(0);
-
-#define M2(T,t,n)                                               \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc_as_if_client(sizeof(*mp)+(n));        \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T);                        \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W                                       \
-do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
-                                                \
-    while (vat_time_now (vam) < timeout) {      \
-        if (vam->result_ready == 1) {           \
-            return (vam->retval);               \
-        }                                       \
-        vat_suspend (vam->vlib_main, 1e-3);     \
-    }                                           \
-    return -99;                                 \
-} while(0);
-
-/* W2: wait for results, with timeout */
-#define W2(body)                                \
-do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
-                                                \
-    while (vat_time_now (vam) < timeout) {      \
-        if (vam->result_ready == 1) {           \
-	  (body);                               \
-	  return (vam->retval);                 \
-        }                                       \
-        vat_suspend (vam->vlib_main, 1e-3);     \
-    }                                           \
-    return -99;                                 \
-} while(0);
-
-typedef struct
-{
-  u8 *name;
-  u32 value;
-} name_sort_t;
-
-
-#define STR_VTR_OP_CASE(op)     \
-    case L2_VTR_ ## op:         \
-        return "" # op;
-
-static const char *
-str_vtr_op (u32 vtr_op)
-{
-  switch (vtr_op)
-    {
-      STR_VTR_OP_CASE (DISABLED);
-      STR_VTR_OP_CASE (PUSH_1);
-      STR_VTR_OP_CASE (PUSH_2);
-      STR_VTR_OP_CASE (POP_1);
-      STR_VTR_OP_CASE (POP_2);
-      STR_VTR_OP_CASE (TRANSLATE_1_1);
-      STR_VTR_OP_CASE (TRANSLATE_1_2);
-      STR_VTR_OP_CASE (TRANSLATE_2_1);
-      STR_VTR_OP_CASE (TRANSLATE_2_2);
-    }
-
-  return "UNKNOWN";
-}
-
-static int
-dump_sub_interface_table (vat_main_t * vam)
-{
-  const sw_interface_subif_t *sub = NULL;
-
-  if (vam->json_output)
-    {
-      clib_warning
-	("JSON output supported only for VPE API calls and dump_stats_table");
-      return -99;
-    }
-
-  print (vam->ofp,
-	 "%-30s%-12s%-11s%-7s%-5s%-9s%-9s%-6s%-8s%-10s%-10s",
-	 "Interface", "sw_if_index",
-	 "sub id", "dot1ad", "tags", "outer id",
-	 "inner id", "exact", "default", "outer any", "inner any");
-
-  vec_foreach (sub, vam->sw_if_subif_table)
-  {
-    print (vam->ofp,
-	   "%-30s%-12d%-11d%-7s%-5d%-9d%-9d%-6d%-8d%-10d%-10d",
-	   sub->interface_name,
-	   sub->sw_if_index,
-	   sub->sub_id, sub->sub_dot1ad ? "dot1ad" : "dot1q",
-	   sub->sub_number_of_tags, sub->sub_outer_vlan_id,
-	   sub->sub_inner_vlan_id, sub->sub_exact_match, sub->sub_default,
-	   sub->sub_outer_vlan_id_any, sub->sub_inner_vlan_id_any);
-    if (sub->vtr_op != L2_VTR_DISABLED)
-      {
-	print (vam->ofp,
-	       "  vlan-tag-rewrite - op: %-14s [ dot1q: %d "
-	       "tag1: %d tag2: %d ]",
-	       str_vtr_op (sub->vtr_op), sub->vtr_push_dot1q,
-	       sub->vtr_tag1, sub->vtr_tag2);
-      }
-  }
-
-  return 0;
-}
-
-static int
-name_sort_cmp (void *a1, void *a2)
-{
-  name_sort_t *n1 = a1;
-  name_sort_t *n2 = a2;
-
-  return strcmp ((char *) n1->name, (char *) n2->name);
-}
-
-static int
-dump_interface_table (vat_main_t * vam)
-{
-  hash_pair_t *p;
-  name_sort_t *nses = 0, *ns;
-
-  if (vam->json_output)
-    {
-      clib_warning
-	("JSON output supported only for VPE API calls and dump_stats_table");
-      return -99;
-    }
-
-  /* *INDENT-OFF* */
-  hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
-  ({
-    vec_add2 (nses, ns, 1);
-    ns->name = (u8 *)(p->key);
-    ns->value = (u32) p->value[0];
-  }));
-  /* *INDENT-ON* */
-
-  vec_sort_with_function (nses, name_sort_cmp);
-
-  print (vam->ofp, "%-25s%-15s", "Interface", "sw_if_index");
-  vec_foreach (ns, nses)
-  {
-    print (vam->ofp, "%-25s%-15d", ns->name, ns->value);
-  }
-  vec_free (nses);
-  return 0;
-}
-
-static int
-dump_ip_table (vat_main_t * vam, int is_ipv6)
-{
-  const ip_details_t *det = NULL;
-  const ip_address_details_t *address = NULL;
-  u32 i = ~0;
-
-  print (vam->ofp, "%-12s", "sw_if_index");
-
-  vec_foreach (det, vam->ip_details_by_sw_if_index[is_ipv6])
-  {
-    i++;
-    if (!det->present)
-      {
-	continue;
-      }
-    print (vam->ofp, "%-12d", i);
-    print (vam->ofp, "            %-30s%-13s", "Address", "Prefix length");
-    if (!det->addr)
-      {
-	continue;
-      }
-    vec_foreach (address, det->addr)
-    {
-      print (vam->ofp,
-	     "            %-30U%-13d",
-	     is_ipv6 ? format_ip6_address : format_ip4_address,
-	     address->ip, address->prefix_length);
-    }
-  }
-
-  return 0;
-}
-
-static int
-dump_ipv4_table (vat_main_t * vam)
-{
-  if (vam->json_output)
-    {
-      clib_warning
-	("JSON output supported only for VPE API calls and dump_stats_table");
-      return -99;
-    }
-
-  return dump_ip_table (vam, 0);
-}
-
-static int
-dump_ipv6_table (vat_main_t * vam)
-{
-  if (vam->json_output)
-    {
-      clib_warning
-	("JSON output supported only for VPE API calls and dump_stats_table");
-      return -99;
-    }
-
-  return dump_ip_table (vam, 1);
-}
-
-static char *
-counter_type_to_str (u8 counter_type, u8 is_combined)
-{
-  if (!is_combined)
-    {
-      switch (counter_type)
-	{
-	case VNET_INTERFACE_COUNTER_DROP:
-	  return "drop";
-	case VNET_INTERFACE_COUNTER_PUNT:
-	  return "punt";
-	case VNET_INTERFACE_COUNTER_IP4:
-	  return "ip4";
-	case VNET_INTERFACE_COUNTER_IP6:
-	  return "ip6";
-	case VNET_INTERFACE_COUNTER_RX_NO_BUF:
-	  return "rx-no-buf";
-	case VNET_INTERFACE_COUNTER_RX_MISS:
-	  return "rx-miss";
-	case VNET_INTERFACE_COUNTER_RX_ERROR:
-	  return "rx-error";
-	case VNET_INTERFACE_COUNTER_TX_ERROR:
-	  return "tx-error";
-	default:
-	  return "INVALID-COUNTER-TYPE";
-	}
-    }
-  else
-    {
-      switch (counter_type)
-	{
-	case VNET_INTERFACE_COUNTER_RX:
-	  return "rx";
-	case VNET_INTERFACE_COUNTER_TX:
-	  return "tx";
-	default:
-	  return "INVALID-COUNTER-TYPE";
-	}
-    }
-}
-
-static int
-dump_stats_table (vat_main_t * vam)
-{
-  vat_json_node_t node;
-  vat_json_node_t *msg_array;
-  vat_json_node_t *msg;
-  vat_json_node_t *counter_array;
-  vat_json_node_t *counter;
-  interface_counter_t c;
-  u64 packets;
-  ip4_fib_counter_t *c4;
-  ip6_fib_counter_t *c6;
-  int i, j;
-
-  if (!vam->json_output)
-    {
-      clib_warning ("dump_stats_table supported only in JSON format");
-      return -99;
-    }
-
-  vat_json_init_object (&node);
-
-  /* interface counters */
-  msg_array = vat_json_object_add (&node, "interface_counters");
-  vat_json_init_array (msg_array);
-  for (i = 0; i < vec_len (vam->simple_interface_counters); i++)
-    {
-      msg = vat_json_array_add (msg_array);
-      vat_json_init_object (msg);
-      vat_json_object_add_string_copy (msg, "vnet_counter_type",
-				       (u8 *) counter_type_to_str (i, 0));
-      vat_json_object_add_int (msg, "is_combined", 0);
-      counter_array = vat_json_object_add (msg, "data");
-      vat_json_init_array (counter_array);
-      for (j = 0; j < vec_len (vam->simple_interface_counters[i]); j++)
-	{
-	  packets = vam->simple_interface_counters[i][j];
-	  vat_json_array_add_uint (counter_array, packets);
-	}
-    }
-  for (i = 0; i < vec_len (vam->combined_interface_counters); i++)
-    {
-      msg = vat_json_array_add (msg_array);
-      vat_json_init_object (msg);
-      vat_json_object_add_string_copy (msg, "vnet_counter_type",
-				       (u8 *) counter_type_to_str (i, 1));
-      vat_json_object_add_int (msg, "is_combined", 1);
-      counter_array = vat_json_object_add (msg, "data");
-      vat_json_init_array (counter_array);
-      for (j = 0; j < vec_len (vam->combined_interface_counters[i]); j++)
-	{
-	  c = vam->combined_interface_counters[i][j];
-	  counter = vat_json_array_add (counter_array);
-	  vat_json_init_object (counter);
-	  vat_json_object_add_uint (counter, "packets", c.packets);
-	  vat_json_object_add_uint (counter, "bytes", c.bytes);
-	}
-    }
-
-  /* ip4 fib counters */
-  msg_array = vat_json_object_add (&node, "ip4_fib_counters");
-  vat_json_init_array (msg_array);
-  for (i = 0; i < vec_len (vam->ip4_fib_counters); i++)
-    {
-      msg = vat_json_array_add (msg_array);
-      vat_json_init_object (msg);
-      vat_json_object_add_uint (msg, "vrf_id",
-				vam->ip4_fib_counters_vrf_id_by_index[i]);
-      counter_array = vat_json_object_add (msg, "c");
-      vat_json_init_array (counter_array);
-      for (j = 0; j < vec_len (vam->ip4_fib_counters[i]); j++)
-	{
-	  counter = vat_json_array_add (counter_array);
-	  vat_json_init_object (counter);
-	  c4 = &vam->ip4_fib_counters[i][j];
-	  vat_json_object_add_ip4 (counter, "address", c4->address);
-	  vat_json_object_add_uint (counter, "address_length",
-				    c4->address_length);
-	  vat_json_object_add_uint (counter, "packets", c4->packets);
-	  vat_json_object_add_uint (counter, "bytes", c4->bytes);
-	}
-    }
-
-  /* ip6 fib counters */
-  msg_array = vat_json_object_add (&node, "ip6_fib_counters");
-  vat_json_init_array (msg_array);
-  for (i = 0; i < vec_len (vam->ip6_fib_counters); i++)
-    {
-      msg = vat_json_array_add (msg_array);
-      vat_json_init_object (msg);
-      vat_json_object_add_uint (msg, "vrf_id",
-				vam->ip6_fib_counters_vrf_id_by_index[i]);
-      counter_array = vat_json_object_add (msg, "c");
-      vat_json_init_array (counter_array);
-      for (j = 0; j < vec_len (vam->ip6_fib_counters[i]); j++)
-	{
-	  counter = vat_json_array_add (counter_array);
-	  vat_json_init_object (counter);
-	  c6 = &vam->ip6_fib_counters[i][j];
-	  vat_json_object_add_ip6 (counter, "address", c6->address);
-	  vat_json_object_add_uint (counter, "address_length",
-				    c6->address_length);
-	  vat_json_object_add_uint (counter, "packets", c6->packets);
-	  vat_json_object_add_uint (counter, "bytes", c6->bytes);
-	}
-    }
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  return 0;
-}
-
-int
-exec (vat_main_t * vam)
-{
-  api_main_t *am = &api_main;
-  vl_api_cli_request_t *mp;
-  f64 timeout;
-  void *oldheap;
-  u8 *cmd = 0;
-  unformat_input_t *i = vam->input;
-
-  if (vec_len (i->buffer) == 0)
-    return -1;
-
-  if (vam->exec_mode == 0 && unformat (i, "mode"))
-    {
-      vam->exec_mode = 1;
-      return 0;
-    }
-  if (vam->exec_mode == 1 && (unformat (i, "exit") || unformat (i, "quit")))
-    {
-      vam->exec_mode = 0;
-      return 0;
-    }
-
-
-  M (CLI_REQUEST, cli_request);
-
-  /*
-   * Copy cmd into shared memory.
-   * In order for the CLI command to work, it
-   * must be a vector ending in \n, not a C-string ending
-   * in \n\0.
-   */
-  pthread_mutex_lock (&am->vlib_rp->mutex);
-  oldheap = svm_push_data_heap (am->vlib_rp);
-
-  vec_validate (cmd, vec_len (vam->input->buffer) - 1);
-  clib_memcpy (cmd, vam->input->buffer, vec_len (vam->input->buffer));
-
-  svm_pop_heap (oldheap);
-  pthread_mutex_unlock (&am->vlib_rp->mutex);
-
-  mp->cmd_in_shmem = (u64) cmd;
-  S;
-  timeout = vat_time_now (vam) + 10.0;
-
-  while (vat_time_now (vam) < timeout)
-    {
-      if (vam->result_ready == 1)
-	{
-	  u8 *free_me;
-	  if (vam->shmem_result != NULL)
-	    print (vam->ofp, "%s", vam->shmem_result);
-	  pthread_mutex_lock (&am->vlib_rp->mutex);
-	  oldheap = svm_push_data_heap (am->vlib_rp);
-
-	  free_me = (u8 *) vam->shmem_result;
-	  vec_free (free_me);
-
-	  svm_pop_heap (oldheap);
-	  pthread_mutex_unlock (&am->vlib_rp->mutex);
-	  return 0;
-	}
-    }
-  return -99;
-}
-
-/*
- * Future replacement of exec() that passes CLI buffers directly in
- * the API messages instead of an additional shared memory area.
- */
-static int
-exec_inband (vat_main_t * vam)
-{
-  vl_api_cli_inband_t *mp;
-  f64 timeout;
-  unformat_input_t *i = vam->input;
-
-  if (vec_len (i->buffer) == 0)
-    return -1;
-
-  if (vam->exec_mode == 0 && unformat (i, "mode"))
-    {
-      vam->exec_mode = 1;
-      return 0;
-    }
-  if (vam->exec_mode == 1 && (unformat (i, "exit") || unformat (i, "quit")))
-    {
-      vam->exec_mode = 0;
-      return 0;
-    }
-
-  /*
-   * In order for the CLI command to work, it
-   * must be a vector ending in \n, not a C-string ending
-   * in \n\0.
-   */
-  u32 len = vec_len (vam->input->buffer);
-  M2 (CLI_INBAND, cli_inband, len);
-  clib_memcpy (mp->cmd, vam->input->buffer, len);
-  mp->length = htonl (len);
-
-  S;
-  W2 (print (vam->ofp, "%s", vam->cmd_reply));
-}
-
-static int
-api_create_loopback (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_create_loopback_t *mp;
-  f64 timeout;
-  u8 mac_address[6];
-  u8 mac_set = 0;
-
-  memset (mac_address, 0, sizeof (mac_address));
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
-	mac_set = 1;
-      else
-	break;
-    }
-
-  /* Construct the API message */
-  M (CREATE_LOOPBACK, create_loopback);
-  if (mac_set)
-    clib_memcpy (mp->mac_address, mac_address, sizeof (mac_address));
-
-  S;
-  W;
-}
-
-static int
-api_delete_loopback (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_delete_loopback_t *mp;
-  f64 timeout;
-  u32 sw_if_index = ~0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "sw_if_index %d", &sw_if_index))
-	;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    {
-      errmsg ("missing sw_if_index");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (DELETE_LOOPBACK, delete_loopback);
-  mp->sw_if_index = ntohl (sw_if_index);
-
-  S;
-  W;
-}
-
-static int
-api_want_stats (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_want_stats_t *mp;
-  f64 timeout;
-  int enable = -1;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "enable"))
-	enable = 1;
-      else if (unformat (i, "disable"))
-	enable = 0;
-      else
-	break;
-    }
-
-  if (enable == -1)
-    {
-      errmsg ("missing enable|disable");
-      return -99;
-    }
-
-  M (WANT_STATS, want_stats);
-  mp->enable_disable = enable;
-
-  S;
-  W;
-}
-
-static int
-api_want_interface_events (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_want_interface_events_t *mp;
-  f64 timeout;
-  int enable = -1;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "enable"))
-	enable = 1;
-      else if (unformat (i, "disable"))
-	enable = 0;
-      else
-	break;
-    }
-
-  if (enable == -1)
-    {
-      errmsg ("missing enable|disable");
-      return -99;
-    }
-
-  M (WANT_INTERFACE_EVENTS, want_interface_events);
-  mp->enable_disable = enable;
-
-  vam->interface_event_display = enable;
-
-  S;
-  W;
-}
-
-
-/* Note: non-static, called once to set up the initial intfc table */
-int
-api_sw_interface_dump (vat_main_t * vam)
-{
-  vl_api_sw_interface_dump_t *mp;
-  f64 timeout;
-  hash_pair_t *p;
-  name_sort_t *nses = 0, *ns;
-  sw_interface_subif_t *sub = NULL;
-
-  /* Toss the old name table */
-  /* *INDENT-OFF* */
-  hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
-  ({
-    vec_add2 (nses, ns, 1);
-    ns->name = (u8 *)(p->key);
-    ns->value = (u32) p->value[0];
-  }));
-  /* *INDENT-ON* */
-
-  hash_free (vam->sw_if_index_by_interface_name);
-
-  vec_foreach (ns, nses) vec_free (ns->name);
-
-  vec_free (nses);
-
-  vec_foreach (sub, vam->sw_if_subif_table)
-  {
-    vec_free (sub->interface_name);
-  }
-  vec_free (vam->sw_if_subif_table);
-
-  /* recreate the interface name hash table */
-  vam->sw_if_index_by_interface_name = hash_create_string (0, sizeof (uword));
-
-  /* Get list of ethernets */
-  M (SW_INTERFACE_DUMP, sw_interface_dump);
-  mp->name_filter_valid = 1;
-  strncpy ((char *) mp->name_filter, "Ether", sizeof (mp->name_filter) - 1);
-  S;
-
-  /* and local / loopback interfaces */
-  M (SW_INTERFACE_DUMP, sw_interface_dump);
-  mp->name_filter_valid = 1;
-  strncpy ((char *) mp->name_filter, "lo", sizeof (mp->name_filter) - 1);
-  S;
-
-  /* and packet-generator interfaces */
-  M (SW_INTERFACE_DUMP, sw_interface_dump);
-  mp->name_filter_valid = 1;
-  strncpy ((char *) mp->name_filter, "pg", sizeof (mp->name_filter) - 1);
-  S;
-
-  /* and vxlan-gpe tunnel interfaces */
-  M (SW_INTERFACE_DUMP, sw_interface_dump);
-  mp->name_filter_valid = 1;
-  strncpy ((char *) mp->name_filter, "vxlan_gpe",
-	   sizeof (mp->name_filter) - 1);
-  S;
-
-  /* and vxlan tunnel interfaces */
-  M (SW_INTERFACE_DUMP, sw_interface_dump);
-  mp->name_filter_valid = 1;
-  strncpy ((char *) mp->name_filter, "vxlan", sizeof (mp->name_filter) - 1);
-  S;
-
-  /* and host (af_packet) interfaces */
-  M (SW_INTERFACE_DUMP, sw_interface_dump);
-  mp->name_filter_valid = 1;
-  strncpy ((char *) mp->name_filter, "host", sizeof (mp->name_filter) - 1);
-  S;
-
-  /* and l2tpv3 tunnel interfaces */
-  M (SW_INTERFACE_DUMP, sw_interface_dump);
-  mp->name_filter_valid = 1;
-  strncpy ((char *) mp->name_filter, "l2tpv3_tunnel",
-	   sizeof (mp->name_filter) - 1);
-  S;
-
-  /* and GRE tunnel interfaces */
-  M (SW_INTERFACE_DUMP, sw_interface_dump);
-  mp->name_filter_valid = 1;
-  strncpy ((char *) mp->name_filter, "gre", sizeof (mp->name_filter) - 1);
-  S;
-
-  /* and LISP-GPE interfaces */
-  M (SW_INTERFACE_DUMP, sw_interface_dump);
-  mp->name_filter_valid = 1;
-  strncpy ((char *) mp->name_filter, "lisp_gpe",
-	   sizeof (mp->name_filter) - 1);
-  S;
-
-  /* and IPSEC tunnel interfaces */
-  M (SW_INTERFACE_DUMP, sw_interface_dump);
-  mp->name_filter_valid = 1;
-  strncpy ((char *) mp->name_filter, "ipsec", sizeof (mp->name_filter) - 1);
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-static int
-api_sw_interface_set_flags (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_set_flags_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u8 admin_up = 0, link_up = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "admin-up"))
-	admin_up = 1;
-      else if (unformat (i, "admin-down"))
-	admin_up = 0;
-      else if (unformat (i, "link-up"))
-	link_up = 1;
-      else if (unformat (i, "link-down"))
-	link_up = 0;
-      else
-	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (SW_INTERFACE_SET_FLAGS, sw_interface_set_flags);
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->admin_up_down = admin_up;
-  mp->link_up_down = link_up;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply, return the good/bad news... */
-  W;
-}
-
-static int
-api_sw_interface_clear_stats (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_clear_stats_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else
-	break;
-    }
-
-  /* Construct the API message */
-  M (SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats);
-
-  if (sw_if_index_set == 1)
-    mp->sw_if_index = ntohl (sw_if_index);
-  else
-    mp->sw_if_index = ~0;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply, return the good/bad news... */
-  W;
-}
-
-static int
-api_sw_interface_set_dpdk_hqos_pipe (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_set_dpdk_hqos_pipe_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u32 subport;
-  u8 subport_set = 0;
-  u32 pipe;
-  u8 pipe_set = 0;
-  u32 profile;
-  u8 profile_set = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "rx %U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %u", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "subport %u", &subport))
-	subport_set = 1;
-      else
-	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "pipe %u", &pipe))
-	pipe_set = 1;
-      else if (unformat (i, "profile %u", &profile))
-	profile_set = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  if (subport_set == 0)
-    {
-      errmsg ("missing subport ");
-      return -99;
-    }
-
-  if (pipe_set == 0)
-    {
-      errmsg ("missing pipe");
-      return -99;
-    }
-
-  if (profile_set == 0)
-    {
-      errmsg ("missing profile");
-      return -99;
-    }
-
-  M (SW_INTERFACE_SET_DPDK_HQOS_PIPE, sw_interface_set_dpdk_hqos_pipe);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->subport = ntohl (subport);
-  mp->pipe = ntohl (pipe);
-  mp->profile = ntohl (profile);
-
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_sw_interface_set_dpdk_hqos_subport (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_set_dpdk_hqos_subport_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u32 subport;
-  u8 subport_set = 0;
-  u32 tb_rate = 1250000000;	/* 10GbE */
-  u32 tb_size = 1000000;
-  u32 tc_rate[] = { 1250000000, 1250000000, 1250000000, 1250000000 };
-  u32 tc_period = 10;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "rx %U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %u", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "subport %u", &subport))
-	subport_set = 1;
-      else
-	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "rate %u", &tb_rate))
-	{
-	  u32 tc_id;
-
-	  for (tc_id = 0; tc_id < (sizeof (tc_rate) / sizeof (tc_rate[0]));
-	       tc_id++)
-	    tc_rate[tc_id] = tb_rate;
-	}
-      else if (unformat (i, "bktsize %u", &tb_size))
-	;
-      else if (unformat (i, "tc0 %u", &tc_rate[0]))
-	;
-      else if (unformat (i, "tc1 %u", &tc_rate[1]))
-	;
-      else if (unformat (i, "tc2 %u", &tc_rate[2]))
-	;
-      else if (unformat (i, "tc3 %u", &tc_rate[3]))
-	;
-      else if (unformat (i, "period %u", &tc_period))
-	;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  if (subport_set == 0)
-    {
-      errmsg ("missing subport ");
-      return -99;
-    }
-
-  M (SW_INTERFACE_SET_DPDK_HQOS_SUBPORT, sw_interface_set_dpdk_hqos_subport);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->subport = ntohl (subport);
-  mp->tb_rate = ntohl (tb_rate);
-  mp->tb_size = ntohl (tb_size);
-  mp->tc_rate[0] = ntohl (tc_rate[0]);
-  mp->tc_rate[1] = ntohl (tc_rate[1]);
-  mp->tc_rate[2] = ntohl (tc_rate[2]);
-  mp->tc_rate[3] = ntohl (tc_rate[3]);
-  mp->tc_period = ntohl (tc_period);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_sw_interface_set_dpdk_hqos_tctbl (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_set_dpdk_hqos_tctbl_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u8 entry_set = 0;
-  u8 tc_set = 0;
-  u8 queue_set = 0;
-  u32 entry, tc, queue;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "rx %U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %u", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "entry %d", &entry))
-	entry_set = 1;
-      else if (unformat (i, "tc %d", &tc))
-	tc_set = 1;
-      else if (unformat (i, "queue %d", &queue))
-	queue_set = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  if (entry_set == 0)
-    {
-      errmsg ("missing entry ");
-      return -99;
-    }
-
-  if (tc_set == 0)
-    {
-      errmsg ("missing traffic class ");
-      return -99;
-    }
-
-  if (queue_set == 0)
-    {
-      errmsg ("missing queue ");
-      return -99;
-    }
-
-  M (SW_INTERFACE_SET_DPDK_HQOS_TCTBL, sw_interface_set_dpdk_hqos_tctbl);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->entry = ntohl (entry);
-  mp->tc = ntohl (tc);
-  mp->queue = ntohl (queue);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_sw_interface_add_del_address (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_add_del_address_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u8 is_add = 1, del_all = 0;
-  u32 address_length = 0;
-  u8 v4_address_set = 0;
-  u8 v6_address_set = 0;
-  ip4_address_t v4address;
-  ip6_address_t v6address;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "del-all"))
-	del_all = 1;
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else
-	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "%U/%d",
-			 unformat_ip4_address, &v4address, &address_length))
-	v4_address_set = 1;
-      else if (unformat (i, "%U/%d",
-			 unformat_ip6_address, &v6address, &address_length))
-	v6_address_set = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-  if (v4_address_set && v6_address_set)
-    {
-      errmsg ("both v4 and v6 addresses set");
-      return -99;
-    }
-  if (!v4_address_set && !v6_address_set && !del_all)
-    {
-      errmsg ("no addresses set");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (SW_INTERFACE_ADD_DEL_ADDRESS, sw_interface_add_del_address);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->is_add = is_add;
-  mp->del_all = del_all;
-  if (v6_address_set)
-    {
-      mp->is_ipv6 = 1;
-      clib_memcpy (mp->address, &v6address, sizeof (v6address));
-    }
-  else
-    {
-      clib_memcpy (mp->address, &v4address, sizeof (v4address));
-    }
-  mp->address_length = address_length;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply, return good/bad news  */
-  W;
-}
-
-static int
-api_sw_interface_set_mpls_enable (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_set_mpls_enable_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u8 enable = 1;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "disable"))
-	enable = 0;
-      else if (unformat (i, "dis"))
-	enable = 0;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (SW_INTERFACE_SET_MPLS_ENABLE, sw_interface_set_mpls_enable);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->enable = enable;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-}
-
-static int
-api_sw_interface_set_table (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_set_table_t *mp;
-  f64 timeout;
-  u32 sw_if_index, vrf_id = 0;
-  u8 sw_if_index_set = 0;
-  u8 is_ipv6 = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "vrf %d", &vrf_id))
-	;
-      else if (unformat (i, "ipv6"))
-	is_ipv6 = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (SW_INTERFACE_SET_TABLE, sw_interface_set_table);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->is_ipv6 = is_ipv6;
-  mp->vrf_id = ntohl (vrf_id);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-}
-
-static void vl_api_sw_interface_get_table_reply_t_handler
-  (vl_api_sw_interface_get_table_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "%d", ntohl (mp->vrf_id));
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-
-}
-
-static void vl_api_sw_interface_get_table_reply_t_handler_json
-  (vl_api_sw_interface_get_table_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_int (&node, "vrf_id", ntohl (mp->vrf_id));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static int
-api_sw_interface_get_table (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_get_table_t *mp;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u8 is_ipv6 = 0;
-  f64 timeout;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "ipv6"))
-	is_ipv6 = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  M (SW_INTERFACE_GET_TABLE, sw_interface_get_table);
-  mp->sw_if_index = htonl (sw_if_index);
-  mp->is_ipv6 = is_ipv6;
-
-  S;
-  W;
-}
-
-static int
-api_sw_interface_set_vpath (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_set_vpath_t *mp;
-  f64 timeout;
-  u32 sw_if_index = 0;
-  u8 sw_if_index_set = 0;
-  u8 is_enable = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "enable"))
-	is_enable = 1;
-      else if (unformat (i, "disable"))
-	is_enable = 0;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (SW_INTERFACE_SET_VPATH, sw_interface_set_vpath);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->enable = is_enable;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-}
-
-static int
-api_sw_interface_set_vxlan_bypass (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_set_vxlan_bypass_t *mp;
-  f64 timeout;
-  u32 sw_if_index = 0;
-  u8 sw_if_index_set = 0;
-  u8 is_enable = 0;
-  u8 is_ipv6 = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "enable"))
-	is_enable = 1;
-      else if (unformat (i, "disable"))
-	is_enable = 0;
-      else if (unformat (i, "ip4"))
-	is_ipv6 = 0;
-      else if (unformat (i, "ip6"))
-	is_ipv6 = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (SW_INTERFACE_SET_VXLAN_BYPASS, sw_interface_set_vxlan_bypass);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->enable = is_enable;
-  mp->is_ipv6 = is_ipv6;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-}
-
-static int
-api_sw_interface_set_l2_xconnect (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_set_l2_xconnect_t *mp;
-  f64 timeout;
-  u32 rx_sw_if_index;
-  u8 rx_sw_if_index_set = 0;
-  u32 tx_sw_if_index;
-  u8 tx_sw_if_index_set = 0;
-  u8 enable = 1;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
-	rx_sw_if_index_set = 1;
-      else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
-	tx_sw_if_index_set = 1;
-      else if (unformat (i, "rx"))
-	{
-	  if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-	    {
-	      if (unformat (i, "%U", api_unformat_sw_if_index, vam,
-			    &rx_sw_if_index))
-		rx_sw_if_index_set = 1;
-	    }
-	  else
-	    break;
-	}
-      else if (unformat (i, "tx"))
-	{
-	  if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-	    {
-	      if (unformat (i, "%U", api_unformat_sw_if_index, vam,
-			    &tx_sw_if_index))
-		tx_sw_if_index_set = 1;
-	    }
-	  else
-	    break;
-	}
-      else if (unformat (i, "enable"))
-	enable = 1;
-      else if (unformat (i, "disable"))
-	enable = 0;
-      else
-	break;
-    }
-
-  if (rx_sw_if_index_set == 0)
-    {
-      errmsg ("missing rx interface name or rx_sw_if_index");
-      return -99;
-    }
-
-  if (enable && (tx_sw_if_index_set == 0))
-    {
-      errmsg ("missing tx interface name or tx_sw_if_index");
-      return -99;
-    }
-
-  M (SW_INTERFACE_SET_L2_XCONNECT, sw_interface_set_l2_xconnect);
-
-  mp->rx_sw_if_index = ntohl (rx_sw_if_index);
-  mp->tx_sw_if_index = ntohl (tx_sw_if_index);
-  mp->enable = enable;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_sw_interface_set_l2_bridge (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_set_l2_bridge_t *mp;
-  f64 timeout;
-  u32 rx_sw_if_index;
-  u8 rx_sw_if_index_set = 0;
-  u32 bd_id;
-  u8 bd_id_set = 0;
-  u8 bvi = 0;
-  u32 shg = 0;
-  u8 enable = 1;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "sw_if_index %d", &rx_sw_if_index))
-	rx_sw_if_index_set = 1;
-      else if (unformat (i, "bd_id %d", &bd_id))
-	bd_id_set = 1;
-      else
-	if (unformat
-	    (i, "%U", api_unformat_sw_if_index, vam, &rx_sw_if_index))
-	rx_sw_if_index_set = 1;
-      else if (unformat (i, "shg %d", &shg))
-	;
-      else if (unformat (i, "bvi"))
-	bvi = 1;
-      else if (unformat (i, "enable"))
-	enable = 1;
-      else if (unformat (i, "disable"))
-	enable = 0;
-      else
-	break;
-    }
-
-  if (rx_sw_if_index_set == 0)
-    {
-      errmsg ("missing rx interface name or sw_if_index");
-      return -99;
-    }
-
-  if (enable && (bd_id_set == 0))
-    {
-      errmsg ("missing bridge domain");
-      return -99;
-    }
-
-  M (SW_INTERFACE_SET_L2_BRIDGE, sw_interface_set_l2_bridge);
-
-  mp->rx_sw_if_index = ntohl (rx_sw_if_index);
-  mp->bd_id = ntohl (bd_id);
-  mp->shg = (u8) shg;
-  mp->bvi = bvi;
-  mp->enable = enable;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_bridge_domain_dump (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_bridge_domain_dump_t *mp;
-  f64 timeout;
-  u32 bd_id = ~0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "bd_id %d", &bd_id))
-	;
-      else
-	break;
-    }
-
-  M (BRIDGE_DOMAIN_DUMP, bridge_domain_dump);
-  mp->bd_id = ntohl (bd_id);
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_bridge_domain_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_bridge_domain_add_del_t *mp;
-  f64 timeout;
-  u32 bd_id = ~0;
-  u8 is_add = 1;
-  u32 flood = 1, forward = 1, learn = 1, uu_flood = 1, arp_term = 0;
-  u32 mac_age = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "bd_id %d", &bd_id))
-	;
-      else if (unformat (i, "flood %d", &flood))
-	;
-      else if (unformat (i, "uu-flood %d", &uu_flood))
-	;
-      else if (unformat (i, "forward %d", &forward))
-	;
-      else if (unformat (i, "learn %d", &learn))
-	;
-      else if (unformat (i, "arp-term %d", &arp_term))
-	;
-      else if (unformat (i, "mac-age %d", &mac_age))
-	;
-      else if (unformat (i, "del"))
-	{
-	  is_add = 0;
-	  flood = uu_flood = forward = learn = 0;
-	}
-      else
-	break;
-    }
-
-  if (bd_id == ~0)
-    {
-      errmsg ("missing bridge domain");
-      return -99;
-    }
-
-  if (mac_age > 255)
-    {
-      errmsg ("mac age must be less than 256 ");
-      return -99;
-    }
-
-  M (BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del);
-
-  mp->bd_id = ntohl (bd_id);
-  mp->flood = flood;
-  mp->uu_flood = uu_flood;
-  mp->forward = forward;
-  mp->learn = learn;
-  mp->arp_term = arp_term;
-  mp->is_add = is_add;
-  mp->mac_age = (u8) mac_age;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_l2fib_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_l2fib_add_del_t *mp;
-  f64 timeout;
-  u64 mac = 0;
-  u8 mac_set = 0;
-  u32 bd_id;
-  u8 bd_id_set = 0;
-  u32 sw_if_index = ~0;
-  u8 sw_if_index_set = 0;
-  u8 is_add = 1;
-  u8 static_mac = 0;
-  u8 filter_mac = 0;
-  u8 bvi_mac = 0;
-  int count = 1;
-  f64 before = 0;
-  int j;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "mac %U", unformat_ethernet_address, &mac))
-	mac_set = 1;
-      else if (unformat (i, "bd_id %d", &bd_id))
-	bd_id_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if"))
-	{
-	  if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-	    {
-	      if (unformat
-		  (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-		sw_if_index_set = 1;
-	    }
-	  else
-	    break;
-	}
-      else if (unformat (i, "static"))
-	static_mac = 1;
-      else if (unformat (i, "filter"))
-	{
-	  filter_mac = 1;
-	  static_mac = 1;
-	}
-      else if (unformat (i, "bvi"))
-	{
-	  bvi_mac = 1;
-	  static_mac = 1;
-	}
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "count %d", &count))
-	;
-      else
-	break;
-    }
-
-  if (mac_set == 0)
-    {
-      errmsg ("missing mac address");
-      return -99;
-    }
-
-  if (bd_id_set == 0)
-    {
-      errmsg ("missing bridge domain");
-      return -99;
-    }
-
-  if (is_add && sw_if_index_set == 0 && filter_mac == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  if (count > 1)
-    {
-      /* Turn on async mode */
-      vam->async_mode = 1;
-      vam->async_errors = 0;
-      before = vat_time_now (vam);
-    }
-
-  for (j = 0; j < count; j++)
-    {
-      M (L2FIB_ADD_DEL, l2fib_add_del);
-
-      mp->mac = mac;
-      mp->bd_id = ntohl (bd_id);
-      mp->is_add = is_add;
-
-      if (is_add)
-	{
-	  mp->sw_if_index = ntohl (sw_if_index);
-	  mp->static_mac = static_mac;
-	  mp->filter_mac = filter_mac;
-	  mp->bvi_mac = bvi_mac;
-	}
-      increment_mac_address (&mac);
-      /* send it... */
-      S;
-    }
-
-  if (count > 1)
-    {
-      vl_api_control_ping_t *mp;
-      f64 after;
-
-      /* Shut off async mode */
-      vam->async_mode = 0;
-
-      M (CONTROL_PING, control_ping);
-      S;
-
-      timeout = vat_time_now (vam) + 1.0;
-      while (vat_time_now (vam) < timeout)
-	if (vam->result_ready == 1)
-	  goto out;
-      vam->retval = -99;
-
-    out:
-      if (vam->retval == -99)
-	errmsg ("timeout");
-
-      if (vam->async_errors > 0)
-	{
-	  errmsg ("%d asynchronous errors", vam->async_errors);
-	  vam->retval = -98;
-	}
-      vam->async_errors = 0;
-      after = vat_time_now (vam);
-
-      print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec",
-	     count, after - before, count / (after - before));
-    }
-  else
-    {
-      /* Wait for a reply... */
-      W;
-    }
-  /* Return the good/bad news */
-  return (vam->retval);
-}
-
-static int
-api_l2_flags (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_l2_flags_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u32 feature_bitmap = 0;
-  u8 sw_if_index_set = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if"))
-	{
-	  if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-	    {
-	      if (unformat
-		  (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-		sw_if_index_set = 1;
-	    }
-	  else
-	    break;
-	}
-      else if (unformat (i, "learn"))
-	feature_bitmap |= L2INPUT_FEAT_LEARN;
-      else if (unformat (i, "forward"))
-	feature_bitmap |= L2INPUT_FEAT_FWD;
-      else if (unformat (i, "flood"))
-	feature_bitmap |= L2INPUT_FEAT_FLOOD;
-      else if (unformat (i, "uu-flood"))
-	feature_bitmap |= L2INPUT_FEAT_UU_FLOOD;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  M (L2_FLAGS, l2_flags);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->feature_bitmap = ntohl (feature_bitmap);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_bridge_flags (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_bridge_flags_t *mp;
-  f64 timeout;
-  u32 bd_id;
-  u8 bd_id_set = 0;
-  u8 is_set = 1;
-  u32 flags = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "bd_id %d", &bd_id))
-	bd_id_set = 1;
-      else if (unformat (i, "learn"))
-	flags |= L2_LEARN;
-      else if (unformat (i, "forward"))
-	flags |= L2_FWD;
-      else if (unformat (i, "flood"))
-	flags |= L2_FLOOD;
-      else if (unformat (i, "uu-flood"))
-	flags |= L2_UU_FLOOD;
-      else if (unformat (i, "arp-term"))
-	flags |= L2_ARP_TERM;
-      else if (unformat (i, "off"))
-	is_set = 0;
-      else if (unformat (i, "disable"))
-	is_set = 0;
-      else
-	break;
-    }
-
-  if (bd_id_set == 0)
-    {
-      errmsg ("missing bridge domain");
-      return -99;
-    }
-
-  M (BRIDGE_FLAGS, bridge_flags);
-
-  mp->bd_id = ntohl (bd_id);
-  mp->feature_bitmap = ntohl (flags);
-  mp->is_set = is_set;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_bd_ip_mac_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_bd_ip_mac_add_del_t *mp;
-  f64 timeout;
-  u32 bd_id;
-  u8 is_ipv6 = 0;
-  u8 is_add = 1;
-  u8 bd_id_set = 0;
-  u8 ip_set = 0;
-  u8 mac_set = 0;
-  ip4_address_t v4addr;
-  ip6_address_t v6addr;
-  u8 macaddr[6];
-
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "bd_id %d", &bd_id))
-	{
-	  bd_id_set++;
-	}
-      else if (unformat (i, "%U", unformat_ip4_address, &v4addr))
-	{
-	  ip_set++;
-	}
-      else if (unformat (i, "%U", unformat_ip6_address, &v6addr))
-	{
-	  ip_set++;
-	  is_ipv6++;
-	}
-      else if (unformat (i, "%U", unformat_ethernet_address, macaddr))
-	{
-	  mac_set++;
-	}
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else
-	break;
-    }
-
-  if (bd_id_set == 0)
-    {
-      errmsg ("missing bridge domain");
-      return -99;
-    }
-  else if (ip_set == 0)
-    {
-      errmsg ("missing IP address");
-      return -99;
-    }
-  else if (mac_set == 0)
-    {
-      errmsg ("missing MAC address");
-      return -99;
-    }
-
-  M (BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del);
-
-  mp->bd_id = ntohl (bd_id);
-  mp->is_ipv6 = is_ipv6;
-  mp->is_add = is_add;
-  if (is_ipv6)
-    clib_memcpy (mp->ip_address, &v6addr, sizeof (v6addr));
-  else
-    clib_memcpy (mp->ip_address, &v4addr, sizeof (v4addr));
-  clib_memcpy (mp->mac_address, macaddr, 6);
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_tap_connect (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_tap_connect_t *mp;
-  f64 timeout;
-  u8 mac_address[6];
-  u8 random_mac = 1;
-  u8 name_set = 0;
-  u8 *tap_name;
-  u8 *tag = 0;
-
-  memset (mac_address, 0, sizeof (mac_address));
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
-	{
-	  random_mac = 0;
-	}
-      else if (unformat (i, "random-mac"))
-	random_mac = 1;
-      else if (unformat (i, "tapname %s", &tap_name))
-	name_set = 1;
-      else if (unformat (i, "tag %s", &tag))
-	;
-      else
-	break;
-    }
-
-  if (name_set == 0)
-    {
-      errmsg ("missing tap name");
-      return -99;
-    }
-  if (vec_len (tap_name) > 63)
-    {
-      errmsg ("tap name too long");
-      return -99;
-    }
-  vec_add1 (tap_name, 0);
-
-  if (vec_len (tag) > 63)
-    {
-      errmsg ("tag too long");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (TAP_CONNECT, tap_connect);
-
-  mp->use_random_mac = random_mac;
-  clib_memcpy (mp->mac_address, mac_address, 6);
-  clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name));
-  if (tag)
-    clib_memcpy (mp->tag, tag, vec_len (tag));
-
-  vec_free (tap_name);
-  vec_free (tag);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-}
-
-static int
-api_tap_modify (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_tap_modify_t *mp;
-  f64 timeout;
-  u8 mac_address[6];
-  u8 random_mac = 1;
-  u8 name_set = 0;
-  u8 *tap_name;
-  u32 sw_if_index = ~0;
-  u8 sw_if_index_set = 0;
-
-  memset (mac_address, 0, sizeof (mac_address));
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
-	{
-	  random_mac = 0;
-	}
-      else if (unformat (i, "random-mac"))
-	random_mac = 1;
-      else if (unformat (i, "tapname %s", &tap_name))
-	name_set = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing vpp interface name");
-      return -99;
-    }
-  if (name_set == 0)
-    {
-      errmsg ("missing tap name");
-      return -99;
-    }
-  if (vec_len (tap_name) > 63)
-    {
-      errmsg ("tap name too long");
-    }
-  vec_add1 (tap_name, 0);
-
-  /* Construct the API message */
-  M (TAP_MODIFY, tap_modify);
-
-  mp->use_random_mac = random_mac;
-  mp->sw_if_index = ntohl (sw_if_index);
-  clib_memcpy (mp->mac_address, mac_address, 6);
-  clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name));
-  vec_free (tap_name);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-}
-
-static int
-api_tap_delete (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_tap_delete_t *mp;
-  f64 timeout;
-  u32 sw_if_index = ~0;
-  u8 sw_if_index_set = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing vpp interface name");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (TAP_DELETE, tap_delete);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-}
-
-static int
-api_ip_add_del_route (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ip_add_del_route_t *mp;
-  f64 timeout;
-  u32 sw_if_index = ~0, vrf_id = 0;
-  u8 is_ipv6 = 0;
-  u8 is_local = 0, is_drop = 0;
-  u8 is_unreach = 0, is_prohibit = 0;
-  u8 create_vrf_if_needed = 0;
-  u8 is_add = 1;
-  u32 next_hop_weight = 1;
-  u8 not_last = 0;
-  u8 is_multipath = 0;
-  u8 address_set = 0;
-  u8 address_length_set = 0;
-  u32 next_hop_table_id = 0;
-  u32 resolve_attempts = 0;
-  u32 dst_address_length = 0;
-  u8 next_hop_set = 0;
-  ip4_address_t v4_dst_address, v4_next_hop_address;
-  ip6_address_t v6_dst_address, v6_next_hop_address;
-  int count = 1;
-  int j;
-  f64 before = 0;
-  u32 random_add_del = 0;
-  u32 *random_vector = 0;
-  uword *random_hash;
-  u32 random_seed = 0xdeaddabe;
-  u32 classify_table_index = ~0;
-  u8 is_classify = 0;
-  u8 resolve_host = 0, resolve_attached = 0;
-  mpls_label_t *next_hop_out_label_stack = NULL;
-  mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
-  mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	;
-      else if (unformat (i, "%U", unformat_ip4_address, &v4_dst_address))
-	{
-	  address_set = 1;
-	  is_ipv6 = 0;
-	}
-      else if (unformat (i, "%U", unformat_ip6_address, &v6_dst_address))
-	{
-	  address_set = 1;
-	  is_ipv6 = 1;
-	}
-      else if (unformat (i, "/%d", &dst_address_length))
-	{
-	  address_length_set = 1;
-	}
-
-      else if (is_ipv6 == 0 && unformat (i, "via %U", unformat_ip4_address,
-					 &v4_next_hop_address))
-	{
-	  next_hop_set = 1;
-	}
-      else if (is_ipv6 == 1 && unformat (i, "via %U", unformat_ip6_address,
-					 &v6_next_hop_address))
-	{
-	  next_hop_set = 1;
-	}
-      else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
-	;
-      else if (unformat (i, "weight %d", &next_hop_weight))
-	;
-      else if (unformat (i, "drop"))
-	{
-	  is_drop = 1;
-	}
-      else if (unformat (i, "null-send-unreach"))
-	{
-	  is_unreach = 1;
-	}
-      else if (unformat (i, "null-send-prohibit"))
-	{
-	  is_prohibit = 1;
-	}
-      else if (unformat (i, "local"))
-	{
-	  is_local = 1;
-	}
-      else if (unformat (i, "classify %d", &classify_table_index))
-	{
-	  is_classify = 1;
-	}
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "add"))
-	is_add = 1;
-      else if (unformat (i, "not-last"))
-	not_last = 1;
-      else if (unformat (i, "resolve-via-host"))
-	resolve_host = 1;
-      else if (unformat (i, "resolve-via-attached"))
-	resolve_attached = 1;
-      else if (unformat (i, "multipath"))
-	is_multipath = 1;
-      else if (unformat (i, "vrf %d", &vrf_id))
-	;
-      else if (unformat (i, "create-vrf"))
-	create_vrf_if_needed = 1;
-      else if (unformat (i, "count %d", &count))
-	;
-      else if (unformat (i, "lookup-in-vrf %d", &next_hop_table_id))
-	;
-      else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
-	;
-      else if (unformat (i, "out-label %d", &next_hop_out_label))
-	vec_add1 (next_hop_out_label_stack, ntohl (next_hop_out_label));
-      else if (unformat (i, "via-label %d", &next_hop_via_label))
-	;
-      else if (unformat (i, "random"))
-	random_add_del = 1;
-      else if (unformat (i, "seed %d", &random_seed))
-	;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (!next_hop_set && !is_drop && !is_local &&
-      !is_classify && !is_unreach && !is_prohibit &&
-      MPLS_LABEL_INVALID == next_hop_via_label)
-    {
-      errmsg
-	("next hop / local / drop / unreach / prohibit / classify not set");
-      return -99;
-    }
-
-  if (next_hop_set && MPLS_LABEL_INVALID != next_hop_via_label)
-    {
-      errmsg ("next hop and next-hop via label set");
-      return -99;
-    }
-  if (address_set == 0)
-    {
-      errmsg ("missing addresses");
-      return -99;
-    }
-
-  if (address_length_set == 0)
-    {
-      errmsg ("missing address length");
-      return -99;
-    }
-
-  /* Generate a pile of unique, random routes */
-  if (random_add_del)
-    {
-      u32 this_random_address;
-      random_hash = hash_create (count, sizeof (uword));
-
-      hash_set (random_hash, v4_next_hop_address.as_u32, 1);
-      for (j = 0; j <= count; j++)
-	{
-	  do
-	    {
-	      this_random_address = random_u32 (&random_seed);
-	      this_random_address =
-		clib_host_to_net_u32 (this_random_address);
-	    }
-	  while (hash_get (random_hash, this_random_address));
-	  vec_add1 (random_vector, this_random_address);
-	  hash_set (random_hash, this_random_address, 1);
-	}
-      hash_free (random_hash);
-      v4_dst_address.as_u32 = random_vector[0];
-    }
-
-  if (count > 1)
-    {
-      /* Turn on async mode */
-      vam->async_mode = 1;
-      vam->async_errors = 0;
-      before = vat_time_now (vam);
-    }
-
-  for (j = 0; j < count; j++)
-    {
-      /* Construct the API message */
-      M2 (IP_ADD_DEL_ROUTE, ip_add_del_route,
-	  sizeof (mpls_label_t) * vec_len (next_hop_out_label_stack));
-
-      mp->next_hop_sw_if_index = ntohl (sw_if_index);
-      mp->table_id = ntohl (vrf_id);
-      mp->create_vrf_if_needed = create_vrf_if_needed;
-
-      mp->is_add = is_add;
-      mp->is_drop = is_drop;
-      mp->is_unreach = is_unreach;
-      mp->is_prohibit = is_prohibit;
-      mp->is_ipv6 = is_ipv6;
-      mp->is_local = is_local;
-      mp->is_classify = is_classify;
-      mp->is_multipath = is_multipath;
-      mp->is_resolve_host = resolve_host;
-      mp->is_resolve_attached = resolve_attached;
-      mp->not_last = not_last;
-      mp->next_hop_weight = next_hop_weight;
-      mp->dst_address_length = dst_address_length;
-      mp->next_hop_table_id = ntohl (next_hop_table_id);
-      mp->classify_table_index = ntohl (classify_table_index);
-      mp->next_hop_via_label = ntohl (next_hop_via_label);
-      mp->next_hop_n_out_labels = vec_len (next_hop_out_label_stack);
-      if (0 != mp->next_hop_n_out_labels)
-	{
-	  memcpy (mp->next_hop_out_label_stack,
-		  next_hop_out_label_stack,
-		  vec_len (next_hop_out_label_stack) * sizeof (mpls_label_t));
-	  vec_free (next_hop_out_label_stack);
-	}
-
-      if (is_ipv6)
-	{
-	  clib_memcpy (mp->dst_address, &v6_dst_address,
-		       sizeof (v6_dst_address));
-	  if (next_hop_set)
-	    clib_memcpy (mp->next_hop_address, &v6_next_hop_address,
-			 sizeof (v6_next_hop_address));
-	  increment_v6_address (&v6_dst_address);
-	}
-      else
-	{
-	  clib_memcpy (mp->dst_address, &v4_dst_address,
-		       sizeof (v4_dst_address));
-	  if (next_hop_set)
-	    clib_memcpy (mp->next_hop_address, &v4_next_hop_address,
-			 sizeof (v4_next_hop_address));
-	  if (random_add_del)
-	    v4_dst_address.as_u32 = random_vector[j + 1];
-	  else
-	    increment_v4_address (&v4_dst_address);
-	}
-      /* send it... */
-      S;
-      /* If we receive SIGTERM, stop now... */
-      if (vam->do_exit)
-	break;
-    }
-
-  /* When testing multiple add/del ops, use a control-ping to sync */
-  if (count > 1)
-    {
-      vl_api_control_ping_t *mp;
-      f64 after;
-
-      /* Shut off async mode */
-      vam->async_mode = 0;
-
-      M (CONTROL_PING, control_ping);
-      S;
-
-      timeout = vat_time_now (vam) + 1.0;
-      while (vat_time_now (vam) < timeout)
-	if (vam->result_ready == 1)
-	  goto out;
-      vam->retval = -99;
-
-    out:
-      if (vam->retval == -99)
-	errmsg ("timeout");
-
-      if (vam->async_errors > 0)
-	{
-	  errmsg ("%d asynchronous errors", vam->async_errors);
-	  vam->retval = -98;
-	}
-      vam->async_errors = 0;
-      after = vat_time_now (vam);
-
-      /* slim chance, but we might have eaten SIGTERM on the first iteration */
-      if (j > 0)
-	count = j;
-
-      print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec",
-	     count, after - before, count / (after - before));
-    }
-  else
-    {
-      /* Wait for a reply... */
-      W;
-    }
-
-  /* Return the good/bad news */
-  return (vam->retval);
-}
-
-static int
-api_mpls_route_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_mpls_route_add_del_t *mp;
-  f64 timeout;
-  u32 sw_if_index = ~0, table_id = 0;
-  u8 create_table_if_needed = 0;
-  u8 is_add = 1;
-  u32 next_hop_weight = 1;
-  u8 is_multipath = 0;
-  u32 next_hop_table_id = 0;
-  u8 next_hop_set = 0;
-  ip4_address_t v4_next_hop_address = {
-    .as_u32 = 0,
-  };
-  ip6_address_t v6_next_hop_address = { {0} };
-  int count = 1;
-  int j;
-  f64 before = 0;
-  u32 classify_table_index = ~0;
-  u8 is_classify = 0;
-  u8 resolve_host = 0, resolve_attached = 0;
-  mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
-  mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
-  mpls_label_t *next_hop_out_label_stack = NULL;
-  mpls_label_t local_label = MPLS_LABEL_INVALID;
-  u8 is_eos = 0;
-  u8 next_hop_proto_is_ip4 = 1;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	;
-      else if (unformat (i, "%d", &local_label))
-	;
-      else if (unformat (i, "eos"))
-	is_eos = 1;
-      else if (unformat (i, "non-eos"))
-	is_eos = 0;
-      else if (unformat (i, "via %U", unformat_ip4_address,
-			 &v4_next_hop_address))
-	{
-	  next_hop_set = 1;
-	  next_hop_proto_is_ip4 = 1;
-	}
-      else if (unformat (i, "via %U", unformat_ip6_address,
-			 &v6_next_hop_address))
-	{
-	  next_hop_set = 1;
-	  next_hop_proto_is_ip4 = 0;
-	}
-      else if (unformat (i, "weight %d", &next_hop_weight))
-	;
-      else if (unformat (i, "create-table"))
-	create_table_if_needed = 1;
-      else if (unformat (i, "classify %d", &classify_table_index))
-	{
-	  is_classify = 1;
-	}
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "add"))
-	is_add = 1;
-      else if (unformat (i, "resolve-via-host"))
-	resolve_host = 1;
-      else if (unformat (i, "resolve-via-attached"))
-	resolve_attached = 1;
-      else if (unformat (i, "multipath"))
-	is_multipath = 1;
-      else if (unformat (i, "count %d", &count))
-	;
-      else if (unformat (i, "lookup-in-ip4-table %d", &next_hop_table_id))
-	{
-	  next_hop_set = 1;
-	  next_hop_proto_is_ip4 = 1;
-	}
-      else if (unformat (i, "lookup-in-ip6-table %d", &next_hop_table_id))
-	{
-	  next_hop_set = 1;
-	  next_hop_proto_is_ip4 = 0;
-	}
-      else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
-	;
-      else if (unformat (i, "via-label %d", &next_hop_via_label))
-	;
-      else if (unformat (i, "out-label %d", &next_hop_out_label))
-	vec_add1 (next_hop_out_label_stack, ntohl (next_hop_out_label));
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (!next_hop_set && !is_classify)
-    {
-      errmsg ("next hop / classify not set");
-      return -99;
-    }
-
-  if (MPLS_LABEL_INVALID == local_label)
-    {
-      errmsg ("missing label");
-      return -99;
-    }
-
-  if (count > 1)
-    {
-      /* Turn on async mode */
-      vam->async_mode = 1;
-      vam->async_errors = 0;
-      before = vat_time_now (vam);
-    }
-
-  for (j = 0; j < count; j++)
-    {
-      /* Construct the API message */
-      M2 (MPLS_ROUTE_ADD_DEL, mpls_route_add_del,
-	  sizeof (mpls_label_t) * vec_len (next_hop_out_label_stack));
-
-      mp->mr_next_hop_sw_if_index = ntohl (sw_if_index);
-      mp->mr_table_id = ntohl (table_id);
-      mp->mr_create_table_if_needed = create_table_if_needed;
-
-      mp->mr_is_add = is_add;
-      mp->mr_next_hop_proto_is_ip4 = next_hop_proto_is_ip4;
-      mp->mr_is_classify = is_classify;
-      mp->mr_is_multipath = is_multipath;
-      mp->mr_is_resolve_host = resolve_host;
-      mp->mr_is_resolve_attached = resolve_attached;
-      mp->mr_next_hop_weight = next_hop_weight;
-      mp->mr_next_hop_table_id = ntohl (next_hop_table_id);
-      mp->mr_classify_table_index = ntohl (classify_table_index);
-      mp->mr_next_hop_via_label = ntohl (next_hop_via_label);
-      mp->mr_label = ntohl (local_label);
-      mp->mr_eos = is_eos;
-
-      mp->mr_next_hop_n_out_labels = vec_len (next_hop_out_label_stack);
-      if (0 != mp->mr_next_hop_n_out_labels)
-	{
-	  memcpy (mp->mr_next_hop_out_label_stack,
-		  next_hop_out_label_stack,
-		  vec_len (next_hop_out_label_stack) * sizeof (mpls_label_t));
-	  vec_free (next_hop_out_label_stack);
-	}
-
-      if (next_hop_set)
-	{
-	  if (next_hop_proto_is_ip4)
-	    {
-	      clib_memcpy (mp->mr_next_hop,
-			   &v4_next_hop_address,
-			   sizeof (v4_next_hop_address));
-	    }
-	  else
-	    {
-	      clib_memcpy (mp->mr_next_hop,
-			   &v6_next_hop_address,
-			   sizeof (v6_next_hop_address));
-	    }
-	}
-      local_label++;
-
-      /* send it... */
-      S;
-      /* If we receive SIGTERM, stop now... */
-      if (vam->do_exit)
-	break;
-    }
-
-  /* When testing multiple add/del ops, use a control-ping to sync */
-  if (count > 1)
-    {
-      vl_api_control_ping_t *mp;
-      f64 after;
-
-      /* Shut off async mode */
-      vam->async_mode = 0;
-
-      M (CONTROL_PING, control_ping);
-      S;
-
-      timeout = vat_time_now (vam) + 1.0;
-      while (vat_time_now (vam) < timeout)
-	if (vam->result_ready == 1)
-	  goto out;
-      vam->retval = -99;
-
-    out:
-      if (vam->retval == -99)
-	errmsg ("timeout");
-
-      if (vam->async_errors > 0)
-	{
-	  errmsg ("%d asynchronous errors", vam->async_errors);
-	  vam->retval = -98;
-	}
-      vam->async_errors = 0;
-      after = vat_time_now (vam);
-
-      /* slim chance, but we might have eaten SIGTERM on the first iteration */
-      if (j > 0)
-	count = j;
-
-      print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec",
-	     count, after - before, count / (after - before));
-    }
-  else
-    {
-      /* Wait for a reply... */
-      W;
-    }
-
-  /* Return the good/bad news */
-  return (vam->retval);
-}
-
-static int
-api_mpls_ip_bind_unbind (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_mpls_ip_bind_unbind_t *mp;
-  f64 timeout;
-  u32 ip_table_id = 0;
-  u8 create_table_if_needed = 0;
-  u8 is_bind = 1;
-  u8 is_ip4 = 1;
-  ip4_address_t v4_address;
-  ip6_address_t v6_address;
-  u32 address_length;
-  u8 address_set = 0;
-  mpls_label_t local_label = MPLS_LABEL_INVALID;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U/%d", unformat_ip4_address,
-		    &v4_address, &address_length))
-	{
-	  is_ip4 = 1;
-	  address_set = 1;
-	}
-      else if (unformat (i, "%U/%d", unformat_ip6_address,
-			 &v6_address, &address_length))
-	{
-	  is_ip4 = 0;
-	  address_set = 1;
-	}
-      else if (unformat (i, "%d", &local_label))
-	;
-      else if (unformat (i, "create-table"))
-	create_table_if_needed = 1;
-      else if (unformat (i, "table-id %d", &ip_table_id))
-	;
-      else if (unformat (i, "unbind"))
-	is_bind = 0;
-      else if (unformat (i, "bind"))
-	is_bind = 1;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (!address_set)
-    {
-      errmsg ("IP addres not set");
-      return -99;
-    }
-
-  if (MPLS_LABEL_INVALID == local_label)
-    {
-      errmsg ("missing label");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (MPLS_IP_BIND_UNBIND, mpls_ip_bind_unbind);
-
-  mp->mb_create_table_if_needed = create_table_if_needed;
-  mp->mb_is_bind = is_bind;
-  mp->mb_is_ip4 = is_ip4;
-  mp->mb_ip_table_id = ntohl (ip_table_id);
-  mp->mb_mpls_table_id = 0;
-  mp->mb_label = ntohl (local_label);
-  mp->mb_address_length = address_length;
-
-  if (is_ip4)
-    clib_memcpy (mp->mb_address, &v4_address, sizeof (v4_address));
-  else
-    clib_memcpy (mp->mb_address, &v6_address, sizeof (v6_address));
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-}
-
-static int
-api_proxy_arp_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_proxy_arp_add_del_t *mp;
-  f64 timeout;
-  u32 vrf_id = 0;
-  u8 is_add = 1;
-  ip4_address_t lo, hi;
-  u8 range_set = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "vrf %d", &vrf_id))
-	;
-      else if (unformat (i, "%U - %U", unformat_ip4_address, &lo,
-			 unformat_ip4_address, &hi))
-	range_set = 1;
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (range_set == 0)
-    {
-      errmsg ("address range not set");
-      return -99;
-    }
-
-  M (PROXY_ARP_ADD_DEL, proxy_arp_add_del);
-
-  mp->vrf_id = ntohl (vrf_id);
-  mp->is_add = is_add;
-  clib_memcpy (mp->low_address, &lo, sizeof (mp->low_address));
-  clib_memcpy (mp->hi_address, &hi, sizeof (mp->hi_address));
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_proxy_arp_intfc_enable_disable (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_proxy_arp_intfc_enable_disable_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 enable = 1;
-  u8 sw_if_index_set = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "enable"))
-	enable = 1;
-      else if (unformat (i, "disable"))
-	enable = 0;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  M (PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->enable_disable = enable;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_mpls_tunnel_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_mpls_tunnel_add_del_t *mp;
-  f64 timeout;
-
-  u8 is_add = 1;
-  u8 l2_only = 0;
-  u32 sw_if_index = ~0;
-  u32 next_hop_sw_if_index = ~0;
-  u32 next_hop_proto_is_ip4 = 1;
-
-  u32 next_hop_table_id = 0;
-  ip4_address_t v4_next_hop_address = {
-    .as_u32 = 0,
-  };
-  ip6_address_t v6_next_hop_address = { {0} };
-  mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID, *labels = NULL;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "add"))
-	is_add = 1;
-      else if (unformat (i, "del sw_if_index %d", &sw_if_index))
-	is_add = 0;
-      else if (unformat (i, "sw_if_index %d", &next_hop_sw_if_index))
-	;
-      else if (unformat (i, "via %U",
-			 unformat_ip4_address, &v4_next_hop_address))
-	{
-	  next_hop_proto_is_ip4 = 1;
-	}
-      else if (unformat (i, "via %U",
-			 unformat_ip6_address, &v6_next_hop_address))
-	{
-	  next_hop_proto_is_ip4 = 0;
-	}
-      else if (unformat (i, "l2-only"))
-	l2_only = 1;
-      else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
-	;
-      else if (unformat (i, "out-label %d", &next_hop_out_label))
-	vec_add1 (labels, ntohl (next_hop_out_label));
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  M2 (MPLS_TUNNEL_ADD_DEL, mpls_tunnel_add_del,
-      sizeof (mpls_label_t) * vec_len (labels));
-
-  mp->mt_next_hop_sw_if_index = ntohl (next_hop_sw_if_index);
-  mp->mt_sw_if_index = ntohl (sw_if_index);
-  mp->mt_is_add = is_add;
-  mp->mt_l2_only = l2_only;
-  mp->mt_next_hop_table_id = ntohl (next_hop_table_id);
-  mp->mt_next_hop_proto_is_ip4 = next_hop_proto_is_ip4;
-
-  mp->mt_next_hop_n_out_labels = vec_len (labels);
-
-  if (0 != mp->mt_next_hop_n_out_labels)
-    {
-      clib_memcpy (mp->mt_next_hop_out_label_stack, labels,
-		   sizeof (mpls_label_t) * mp->mt_next_hop_n_out_labels);
-      vec_free (labels);
-    }
-
-  if (next_hop_proto_is_ip4)
-    {
-      clib_memcpy (mp->mt_next_hop,
-		   &v4_next_hop_address, sizeof (v4_next_hop_address));
-    }
-  else
-    {
-      clib_memcpy (mp->mt_next_hop,
-		   &v6_next_hop_address, sizeof (v6_next_hop_address));
-    }
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_sw_interface_set_unnumbered (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_set_unnumbered_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u32 unnum_sw_index = ~0;
-  u8 is_add = 1;
-  u8 sw_if_index_set = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "unnum_if_index %d", &unnum_sw_index))
-	;
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  M (SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->unnumbered_sw_if_index = ntohl (unnum_sw_index);
-  mp->is_add = is_add;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_ip_neighbor_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ip_neighbor_add_del_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u32 vrf_id = 0;
-  u8 is_add = 1;
-  u8 is_static = 0;
-  u8 mac_address[6];
-  u8 mac_set = 0;
-  u8 v4_address_set = 0;
-  u8 v6_address_set = 0;
-  ip4_address_t v4address;
-  ip6_address_t v6address;
-
-  memset (mac_address, 0, sizeof (mac_address));
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
-	{
-	  mac_set = 1;
-	}
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else
-	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "is_static"))
-	is_static = 1;
-      else if (unformat (i, "vrf %d", &vrf_id))
-	;
-      else if (unformat (i, "dst %U", unformat_ip4_address, &v4address))
-	v4_address_set = 1;
-      else if (unformat (i, "dst %U", unformat_ip6_address, &v6address))
-	v6_address_set = 1;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-  if (v4_address_set && v6_address_set)
-    {
-      errmsg ("both v4 and v6 addresses set");
-      return -99;
-    }
-  if (!v4_address_set && !v6_address_set)
-    {
-      errmsg ("no address set");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->is_add = is_add;
-  mp->vrf_id = ntohl (vrf_id);
-  mp->is_static = is_static;
-  if (mac_set)
-    clib_memcpy (mp->mac_address, mac_address, 6);
-  if (v6_address_set)
-    {
-      mp->is_ipv6 = 1;
-      clib_memcpy (mp->dst_address, &v6address, sizeof (v6address));
-    }
-  else
-    {
-      /* mp->is_ipv6 = 0; via memset in M macro above */
-      clib_memcpy (mp->dst_address, &v4address, sizeof (v4address));
-    }
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply, return good/bad news  */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_reset_vrf (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_reset_vrf_t *mp;
-  f64 timeout;
-  u32 vrf_id = 0;
-  u8 is_ipv6 = 0;
-  u8 vrf_id_set = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "vrf %d", &vrf_id))
-	vrf_id_set = 1;
-      else if (unformat (i, "ipv6"))
-	is_ipv6 = 1;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (vrf_id_set == 0)
-    {
-      errmsg ("missing vrf id");
-      return -99;
-    }
-
-  M (RESET_VRF, reset_vrf);
-
-  mp->vrf_id = ntohl (vrf_id);
-  mp->is_ipv6 = is_ipv6;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_create_vlan_subif (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_create_vlan_subif_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u32 vlan_id;
-  u8 vlan_id_set = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else
-	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "vlan %d", &vlan_id))
-	vlan_id_set = 1;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  if (vlan_id_set == 0)
-    {
-      errmsg ("missing vlan_id");
-      return -99;
-    }
-  M (CREATE_VLAN_SUBIF, create_vlan_subif);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->vlan_id = ntohl (vlan_id);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-#define foreach_create_subif_bit                \
-_(no_tags)                                      \
-_(one_tag)                                      \
-_(two_tags)                                     \
-_(dot1ad)                                       \
-_(exact_match)                                  \
-_(default_sub)                                  \
-_(outer_vlan_id_any)                            \
-_(inner_vlan_id_any)
-
-static int
-api_create_subif (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_create_subif_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u32 sub_id;
-  u8 sub_id_set = 0;
-  u32 no_tags = 0;
-  u32 one_tag = 0;
-  u32 two_tags = 0;
-  u32 dot1ad = 0;
-  u32 exact_match = 0;
-  u32 default_sub = 0;
-  u32 outer_vlan_id_any = 0;
-  u32 inner_vlan_id_any = 0;
-  u32 tmp;
-  u16 outer_vlan_id = 0;
-  u16 inner_vlan_id = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else
-	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sub_id %d", &sub_id))
-	sub_id_set = 1;
-      else if (unformat (i, "outer_vlan_id %d", &tmp))
-	outer_vlan_id = tmp;
-      else if (unformat (i, "inner_vlan_id %d", &tmp))
-	inner_vlan_id = tmp;
-
-#define _(a) else if (unformat (i, #a)) a = 1 ;
-      foreach_create_subif_bit
-#undef _
-	else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  if (sub_id_set == 0)
-    {
-      errmsg ("missing sub_id");
-      return -99;
-    }
-  M (CREATE_SUBIF, create_subif);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->sub_id = ntohl (sub_id);
-
-#define _(a) mp->a = a;
-  foreach_create_subif_bit;
-#undef _
-
-  mp->outer_vlan_id = ntohs (outer_vlan_id);
-  mp->inner_vlan_id = ntohs (inner_vlan_id);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_oam_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_oam_add_del_t *mp;
-  f64 timeout;
-  u32 vrf_id = 0;
-  u8 is_add = 1;
-  ip4_address_t src, dst;
-  u8 src_set = 0;
-  u8 dst_set = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "vrf %d", &vrf_id))
-	;
-      else if (unformat (i, "src %U", unformat_ip4_address, &src))
-	src_set = 1;
-      else if (unformat (i, "dst %U", unformat_ip4_address, &dst))
-	dst_set = 1;
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (src_set == 0)
-    {
-      errmsg ("missing src addr");
-      return -99;
-    }
-
-  if (dst_set == 0)
-    {
-      errmsg ("missing dst addr");
-      return -99;
-    }
-
-  M (OAM_ADD_DEL, oam_add_del);
-
-  mp->vrf_id = ntohl (vrf_id);
-  mp->is_add = is_add;
-  clib_memcpy (mp->src_address, &src, sizeof (mp->src_address));
-  clib_memcpy (mp->dst_address, &dst, sizeof (mp->dst_address));
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_reset_fib (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_reset_fib_t *mp;
-  f64 timeout;
-  u32 vrf_id = 0;
-  u8 is_ipv6 = 0;
-  u8 vrf_id_set = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "vrf %d", &vrf_id))
-	vrf_id_set = 1;
-      else if (unformat (i, "ipv6"))
-	is_ipv6 = 1;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (vrf_id_set == 0)
-    {
-      errmsg ("missing vrf id");
-      return -99;
-    }
-
-  M (RESET_FIB, reset_fib);
-
-  mp->vrf_id = ntohl (vrf_id);
-  mp->is_ipv6 = is_ipv6;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_dhcp_proxy_config (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_dhcp_proxy_config_t *mp;
-  f64 timeout;
-  u32 vrf_id = 0;
-  u8 is_add = 1;
-  u8 insert_cid = 1;
-  u8 v4_address_set = 0;
-  u8 v6_address_set = 0;
-  ip4_address_t v4address;
-  ip6_address_t v6address;
-  u8 v4_src_address_set = 0;
-  u8 v6_src_address_set = 0;
-  ip4_address_t v4srcaddress;
-  ip6_address_t v6srcaddress;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "vrf %d", &vrf_id))
-	;
-      else if (unformat (i, "insert-cid %d", &insert_cid))
-	;
-      else if (unformat (i, "svr %U", unformat_ip4_address, &v4address))
-	v4_address_set = 1;
-      else if (unformat (i, "svr %U", unformat_ip6_address, &v6address))
-	v6_address_set = 1;
-      else if (unformat (i, "src %U", unformat_ip4_address, &v4srcaddress))
-	v4_src_address_set = 1;
-      else if (unformat (i, "src %U", unformat_ip6_address, &v6srcaddress))
-	v6_src_address_set = 1;
-      else
-	break;
-    }
-
-  if (v4_address_set && v6_address_set)
-    {
-      errmsg ("both v4 and v6 server addresses set");
-      return -99;
-    }
-  if (!v4_address_set && !v6_address_set)
-    {
-      errmsg ("no server addresses set");
-      return -99;
-    }
-
-  if (v4_src_address_set && v6_src_address_set)
-    {
-      errmsg ("both v4 and v6  src addresses set");
-      return -99;
-    }
-  if (!v4_src_address_set && !v6_src_address_set)
-    {
-      errmsg ("no src addresses set");
-      return -99;
-    }
-
-  if (!(v4_src_address_set && v4_address_set) &&
-      !(v6_src_address_set && v6_address_set))
-    {
-      errmsg ("no matching server and src addresses set");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (DHCP_PROXY_CONFIG, dhcp_proxy_config);
-
-  mp->insert_circuit_id = insert_cid;
-  mp->is_add = is_add;
-  mp->vrf_id = ntohl (vrf_id);
-  if (v6_address_set)
-    {
-      mp->is_ipv6 = 1;
-      clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
-      clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
-    }
-  else
-    {
-      clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
-      clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
-    }
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply, return good/bad news  */
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_dhcp_proxy_config_2 (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_dhcp_proxy_config_2_t *mp;
-  f64 timeout;
-  u32 rx_vrf_id = 0;
-  u32 server_vrf_id = 0;
-  u8 is_add = 1;
-  u8 insert_cid = 1;
-  u8 v4_address_set = 0;
-  u8 v6_address_set = 0;
-  ip4_address_t v4address;
-  ip6_address_t v6address;
-  u8 v4_src_address_set = 0;
-  u8 v6_src_address_set = 0;
-  ip4_address_t v4srcaddress;
-  ip6_address_t v6srcaddress;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "rx_vrf_id %d", &rx_vrf_id))
-	;
-      else if (unformat (i, "server_vrf_id %d", &server_vrf_id))
-	;
-      else if (unformat (i, "insert-cid %d", &insert_cid))
-	;
-      else if (unformat (i, "svr %U", unformat_ip4_address, &v4address))
-	v4_address_set = 1;
-      else if (unformat (i, "svr %U", unformat_ip6_address, &v6address))
-	v6_address_set = 1;
-      else if (unformat (i, "src %U", unformat_ip4_address, &v4srcaddress))
-	v4_src_address_set = 1;
-      else if (unformat (i, "src %U", unformat_ip6_address, &v6srcaddress))
-	v6_src_address_set = 1;
-      else
-	break;
-    }
-
-  if (v4_address_set && v6_address_set)
-    {
-      errmsg ("both v4 and v6 server addresses set");
-      return -99;
-    }
-  if (!v4_address_set && !v6_address_set)
-    {
-      errmsg ("no server addresses set");
-      return -99;
-    }
-
-  if (v4_src_address_set && v6_src_address_set)
-    {
-      errmsg ("both v4 and v6  src addresses set");
-      return -99;
-    }
-  if (!v4_src_address_set && !v6_src_address_set)
-    {
-      errmsg ("no src addresses set");
-      return -99;
-    }
-
-  if (!(v4_src_address_set && v4_address_set) &&
-      !(v6_src_address_set && v6_address_set))
-    {
-      errmsg ("no matching server and src addresses set");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (DHCP_PROXY_CONFIG_2, dhcp_proxy_config_2);
-
-  mp->insert_circuit_id = insert_cid;
-  mp->is_add = is_add;
-  mp->rx_vrf_id = ntohl (rx_vrf_id);
-  mp->server_vrf_id = ntohl (server_vrf_id);
-  if (v6_address_set)
-    {
-      mp->is_ipv6 = 1;
-      clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
-      clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
-    }
-  else
-    {
-      clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
-      clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
-    }
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply, return good/bad news  */
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_dhcp_proxy_set_vss (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_dhcp_proxy_set_vss_t *mp;
-  f64 timeout;
-  u8 is_ipv6 = 0;
-  u8 is_add = 1;
-  u32 tbl_id;
-  u8 tbl_id_set = 0;
-  u32 oui;
-  u8 oui_set = 0;
-  u32 fib_id;
-  u8 fib_id_set = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "tbl_id %d", &tbl_id))
-	tbl_id_set = 1;
-      if (unformat (i, "fib_id %d", &fib_id))
-	fib_id_set = 1;
-      if (unformat (i, "oui %d", &oui))
-	oui_set = 1;
-      else if (unformat (i, "ipv6"))
-	is_ipv6 = 1;
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (tbl_id_set == 0)
-    {
-      errmsg ("missing tbl id");
-      return -99;
-    }
-
-  if (fib_id_set == 0)
-    {
-      errmsg ("missing fib id");
-      return -99;
-    }
-  if (oui_set == 0)
-    {
-      errmsg ("missing oui");
-      return -99;
-    }
-
-  M (DHCP_PROXY_SET_VSS, dhcp_proxy_set_vss);
-  mp->tbl_id = ntohl (tbl_id);
-  mp->fib_id = ntohl (fib_id);
-  mp->oui = ntohl (oui);
-  mp->is_ipv6 = is_ipv6;
-  mp->is_add = is_add;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_dhcp_client_config (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_dhcp_client_config_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u8 is_add = 1;
-  u8 *hostname = 0;
-  u8 disable_event = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "del"))
-	is_add = 0;
-      else
-	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "hostname %s", &hostname))
-	;
-      else if (unformat (i, "disable_event"))
-	disable_event = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  if (vec_len (hostname) > 63)
-    {
-      errmsg ("hostname too long");
-    }
-  vec_add1 (hostname, 0);
-
-  /* Construct the API message */
-  M (DHCP_CLIENT_CONFIG, dhcp_client_config);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  clib_memcpy (mp->hostname, hostname, vec_len (hostname));
-  vec_free (hostname);
-  mp->is_add = is_add;
-  mp->want_dhcp_event = disable_event ? 0 : 1;
-  mp->pid = getpid ();
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply, return good/bad news  */
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_set_ip_flow_hash (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_set_ip_flow_hash_t *mp;
-  f64 timeout;
-  u32 vrf_id = 0;
-  u8 is_ipv6 = 0;
-  u8 vrf_id_set = 0;
-  u8 src = 0;
-  u8 dst = 0;
-  u8 sport = 0;
-  u8 dport = 0;
-  u8 proto = 0;
-  u8 reverse = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "vrf %d", &vrf_id))
-	vrf_id_set = 1;
-      else if (unformat (i, "ipv6"))
-	is_ipv6 = 1;
-      else if (unformat (i, "src"))
-	src = 1;
-      else if (unformat (i, "dst"))
-	dst = 1;
-      else if (unformat (i, "sport"))
-	sport = 1;
-      else if (unformat (i, "dport"))
-	dport = 1;
-      else if (unformat (i, "proto"))
-	proto = 1;
-      else if (unformat (i, "reverse"))
-	reverse = 1;
-
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (vrf_id_set == 0)
-    {
-      errmsg ("missing vrf id");
-      return -99;
-    }
-
-  M (SET_IP_FLOW_HASH, set_ip_flow_hash);
-  mp->src = src;
-  mp->dst = dst;
-  mp->sport = sport;
-  mp->dport = dport;
-  mp->proto = proto;
-  mp->reverse = reverse;
-  mp->vrf_id = ntohl (vrf_id);
-  mp->is_ipv6 = is_ipv6;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_sw_interface_ip6_enable_disable (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_ip6_enable_disable_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u8 enable = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "enable"))
-	enable = 1;
-      else if (unformat (i, "disable"))
-	enable = 0;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  M (SW_INTERFACE_IP6_ENABLE_DISABLE, sw_interface_ip6_enable_disable);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->enable = enable;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_sw_interface_ip6_set_link_local_address (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_ip6_set_link_local_address_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u32 address_length = 0;
-  u8 v6_address_set = 0;
-  ip6_address_t v6address;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "%U/%d",
-			 unformat_ip6_address, &v6address, &address_length))
-	v6_address_set = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-  if (!v6_address_set)
-    {
-      errmsg ("no address set");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS,
-     sw_interface_ip6_set_link_local_address);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  clib_memcpy (mp->address, &v6address, sizeof (v6address));
-  mp->address_length = address_length;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply, return good/bad news  */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-
-static int
-api_sw_interface_ip6nd_ra_prefix (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_ip6nd_ra_prefix_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u32 address_length = 0;
-  u8 v6_address_set = 0;
-  ip6_address_t v6address;
-  u8 use_default = 0;
-  u8 no_advertise = 0;
-  u8 off_link = 0;
-  u8 no_autoconfig = 0;
-  u8 no_onlink = 0;
-  u8 is_no = 0;
-  u32 val_lifetime = 0;
-  u32 pref_lifetime = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "%U/%d",
-			 unformat_ip6_address, &v6address, &address_length))
-	v6_address_set = 1;
-      else if (unformat (i, "val_life %d", &val_lifetime))
-	;
-      else if (unformat (i, "pref_life %d", &pref_lifetime))
-	;
-      else if (unformat (i, "def"))
-	use_default = 1;
-      else if (unformat (i, "noadv"))
-	no_advertise = 1;
-      else if (unformat (i, "offl"))
-	off_link = 1;
-      else if (unformat (i, "noauto"))
-	no_autoconfig = 1;
-      else if (unformat (i, "nolink"))
-	no_onlink = 1;
-      else if (unformat (i, "isno"))
-	is_no = 1;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-  if (!v6_address_set)
-    {
-      errmsg ("no address set");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  clib_memcpy (mp->address, &v6address, sizeof (v6address));
-  mp->address_length = address_length;
-  mp->use_default = use_default;
-  mp->no_advertise = no_advertise;
-  mp->off_link = off_link;
-  mp->no_autoconfig = no_autoconfig;
-  mp->no_onlink = no_onlink;
-  mp->is_no = is_no;
-  mp->val_lifetime = ntohl (val_lifetime);
-  mp->pref_lifetime = ntohl (pref_lifetime);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply, return good/bad news  */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_sw_interface_ip6nd_ra_config (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_ip6nd_ra_config_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u8 suppress = 0;
-  u8 managed = 0;
-  u8 other = 0;
-  u8 ll_option = 0;
-  u8 send_unicast = 0;
-  u8 cease = 0;
-  u8 is_no = 0;
-  u8 default_router = 0;
-  u32 max_interval = 0;
-  u32 min_interval = 0;
-  u32 lifetime = 0;
-  u32 initial_count = 0;
-  u32 initial_interval = 0;
-
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "maxint %d", &max_interval))
-	;
-      else if (unformat (i, "minint %d", &min_interval))
-	;
-      else if (unformat (i, "life %d", &lifetime))
-	;
-      else if (unformat (i, "count %d", &initial_count))
-	;
-      else if (unformat (i, "interval %d", &initial_interval))
-	;
-      else if (unformat (i, "suppress") || unformat (i, "surpress"))
-	suppress = 1;
-      else if (unformat (i, "managed"))
-	managed = 1;
-      else if (unformat (i, "other"))
-	other = 1;
-      else if (unformat (i, "ll"))
-	ll_option = 1;
-      else if (unformat (i, "send"))
-	send_unicast = 1;
-      else if (unformat (i, "cease"))
-	cease = 1;
-      else if (unformat (i, "isno"))
-	is_no = 1;
-      else if (unformat (i, "def"))
-	default_router = 1;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->max_interval = ntohl (max_interval);
-  mp->min_interval = ntohl (min_interval);
-  mp->lifetime = ntohl (lifetime);
-  mp->initial_count = ntohl (initial_count);
-  mp->initial_interval = ntohl (initial_interval);
-  mp->suppress = suppress;
-  mp->managed = managed;
-  mp->other = other;
-  mp->ll_option = ll_option;
-  mp->send_unicast = send_unicast;
-  mp->cease = cease;
-  mp->is_no = is_no;
-  mp->default_router = default_router;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply, return good/bad news  */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_set_arp_neighbor_limit (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_set_arp_neighbor_limit_t *mp;
-  f64 timeout;
-  u32 arp_nbr_limit;
-  u8 limit_set = 0;
-  u8 is_ipv6 = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "arp_nbr_limit %d", &arp_nbr_limit))
-	limit_set = 1;
-      else if (unformat (i, "ipv6"))
-	is_ipv6 = 1;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (limit_set == 0)
-    {
-      errmsg ("missing limit value");
-      return -99;
-    }
-
-  M (SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit);
-
-  mp->arp_neighbor_limit = ntohl (arp_nbr_limit);
-  mp->is_ipv6 = is_ipv6;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_l2_patch_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_l2_patch_add_del_t *mp;
-  f64 timeout;
-  u32 rx_sw_if_index;
-  u8 rx_sw_if_index_set = 0;
-  u32 tx_sw_if_index;
-  u8 tx_sw_if_index_set = 0;
-  u8 is_add = 1;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
-	rx_sw_if_index_set = 1;
-      else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
-	tx_sw_if_index_set = 1;
-      else if (unformat (i, "rx"))
-	{
-	  if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-	    {
-	      if (unformat (i, "%U", api_unformat_sw_if_index, vam,
-			    &rx_sw_if_index))
-		rx_sw_if_index_set = 1;
-	    }
-	  else
-	    break;
-	}
-      else if (unformat (i, "tx"))
-	{
-	  if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-	    {
-	      if (unformat (i, "%U", api_unformat_sw_if_index, vam,
-			    &tx_sw_if_index))
-		tx_sw_if_index_set = 1;
-	    }
-	  else
-	    break;
-	}
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else
-	break;
-    }
-
-  if (rx_sw_if_index_set == 0)
-    {
-      errmsg ("missing rx interface name or rx_sw_if_index");
-      return -99;
-    }
-
-  if (tx_sw_if_index_set == 0)
-    {
-      errmsg ("missing tx interface name or tx_sw_if_index");
-      return -99;
-    }
-
-  M (L2_PATCH_ADD_DEL, l2_patch_add_del);
-
-  mp->rx_sw_if_index = ntohl (rx_sw_if_index);
-  mp->tx_sw_if_index = ntohl (tx_sw_if_index);
-  mp->is_add = is_add;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_ioam_enable (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_ioam_enable_t *mp;
-  f64 timeout;
-  u32 id = 0;
-  int has_trace_option = 0;
-  int has_pot_option = 0;
-  int has_seqno_option = 0;
-  int has_analyse_option = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "trace"))
-	has_trace_option = 1;
-      else if (unformat (input, "pot"))
-	has_pot_option = 1;
-      else if (unformat (input, "seqno"))
-	has_seqno_option = 1;
-      else if (unformat (input, "analyse"))
-	has_analyse_option = 1;
-      else
-	break;
-    }
-  M (IOAM_ENABLE, ioam_enable);
-  mp->id = htons (id);
-  mp->seqno = has_seqno_option;
-  mp->analyse = has_analyse_option;
-  mp->pot_enable = has_pot_option;
-  mp->trace_enable = has_trace_option;
-
-  S;
-  W;
-
-  return (0);
-
-}
-
-
-static int
-api_ioam_disable (vat_main_t * vam)
-{
-  vl_api_ioam_disable_t *mp;
-  f64 timeout;
-
-  M (IOAM_DISABLE, ioam_disable);
-  S;
-  W;
-  return 0;
-}
-
-static int
-api_sr_tunnel_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sr_tunnel_add_del_t *mp;
-  f64 timeout;
-  int is_del = 0;
-  int pl_index;
-  ip6_address_t src_address;
-  int src_address_set = 0;
-  ip6_address_t dst_address;
-  u32 dst_mask_width;
-  int dst_address_set = 0;
-  u16 flags = 0;
-  u32 rx_table_id = 0;
-  u32 tx_table_id = 0;
-  ip6_address_t *segments = 0;
-  ip6_address_t *this_seg;
-  ip6_address_t *tags = 0;
-  ip6_address_t *this_tag;
-  ip6_address_t next_address, tag;
-  u8 *name = 0;
-  u8 *policy_name = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "del"))
-	is_del = 1;
-      else if (unformat (i, "name %s", &name))
-	;
-      else if (unformat (i, "policy %s", &policy_name))
-	;
-      else if (unformat (i, "rx_fib_id %d", &rx_table_id))
-	;
-      else if (unformat (i, "tx_fib_id %d", &tx_table_id))
-	;
-      else if (unformat (i, "src %U", unformat_ip6_address, &src_address))
-	src_address_set = 1;
-      else if (unformat (i, "dst %U/%d",
-			 unformat_ip6_address, &dst_address, &dst_mask_width))
-	dst_address_set = 1;
-      else if (unformat (i, "next %U", unformat_ip6_address, &next_address))
-	{
-	  vec_add2 (segments, this_seg, 1);
-	  clib_memcpy (this_seg->as_u8, next_address.as_u8,
-		       sizeof (*this_seg));
-	}
-      else if (unformat (i, "tag %U", unformat_ip6_address, &tag))
-	{
-	  vec_add2 (tags, this_tag, 1);
-	  clib_memcpy (this_tag->as_u8, tag.as_u8, sizeof (*this_tag));
-	}
-      else if (unformat (i, "clean"))
-	flags |= IP6_SR_HEADER_FLAG_CLEANUP;
-      else if (unformat (i, "protected"))
-	flags |= IP6_SR_HEADER_FLAG_PROTECTED;
-      else if (unformat (i, "InPE %d", &pl_index))
-	{
-	  if (pl_index <= 0 || pl_index > 4)
-	    {
-	    pl_index_range_error:
-	      errmsg ("pl index %d out of range", pl_index);
-	      return -99;
-	    }
-	  flags |=
-	    IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE << (3 * (pl_index - 1));
-	}
-      else if (unformat (i, "EgPE %d", &pl_index))
-	{
-	  if (pl_index <= 0 || pl_index > 4)
-	    goto pl_index_range_error;
-	  flags |=
-	    IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE << (3 * (pl_index - 1));
-	}
-      else if (unformat (i, "OrgSrc %d", &pl_index))
-	{
-	  if (pl_index <= 0 || pl_index > 4)
-	    goto pl_index_range_error;
-	  flags |=
-	    IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR << (3 * (pl_index - 1));
-	}
-      else
-	break;
-    }
-
-  if (!src_address_set)
-    {
-      errmsg ("src address required");
-      return -99;
-    }
-
-  if (!dst_address_set)
-    {
-      errmsg ("dst address required");
-      return -99;
-    }
-
-  if (!segments)
-    {
-      errmsg ("at least one sr segment required");
-      return -99;
-    }
-
-  M2 (SR_TUNNEL_ADD_DEL, sr_tunnel_add_del,
-      vec_len (segments) * sizeof (ip6_address_t)
-      + vec_len (tags) * sizeof (ip6_address_t));
-
-  clib_memcpy (mp->src_address, &src_address, sizeof (mp->src_address));
-  clib_memcpy (mp->dst_address, &dst_address, sizeof (mp->dst_address));
-  mp->dst_mask_width = dst_mask_width;
-  mp->flags_net_byte_order = clib_host_to_net_u16 (flags);
-  mp->n_segments = vec_len (segments);
-  mp->n_tags = vec_len (tags);
-  mp->is_add = is_del == 0;
-  clib_memcpy (mp->segs_and_tags, segments,
-	       vec_len (segments) * sizeof (ip6_address_t));
-  clib_memcpy (mp->segs_and_tags +
-	       vec_len (segments) * sizeof (ip6_address_t), tags,
-	       vec_len (tags) * sizeof (ip6_address_t));
-
-  mp->outer_vrf_id = ntohl (rx_table_id);
-  mp->inner_vrf_id = ntohl (tx_table_id);
-  memcpy (mp->name, name, vec_len (name));
-  memcpy (mp->policy_name, policy_name, vec_len (policy_name));
-
-  vec_free (segments);
-  vec_free (tags);
-
-  S;
-  W;
-  /* NOTREACHED */
-}
-
-static int
-api_sr_policy_add_del (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_sr_policy_add_del_t *mp;
-  f64 timeout;
-  int is_del = 0;
-  u8 *name = 0;
-  u8 *tunnel_name = 0;
-  u8 **tunnel_names = 0;
-
-  int name_set = 0;
-  int tunnel_set = 0;
-  int j = 0;
-  int tunnel_names_length = 1;	// Init to 1 to offset the #tunnel_names counter byte
-  int tun_name_len = 0;		// Different naming convention used as confusing these would be "bad" (TM)
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	is_del = 1;
-      else if (unformat (input, "name %s", &name))
-	name_set = 1;
-      else if (unformat (input, "tunnel %s", &tunnel_name))
-	{
-	  if (tunnel_name)
-	    {
-	      vec_add1 (tunnel_names, tunnel_name);
-	      /* For serializer:
-	         - length = #bytes to store in serial vector
-	         - +1 = byte to store that length
-	       */
-	      tunnel_names_length += (vec_len (tunnel_name) + 1);
-	      tunnel_set = 1;
-	      tunnel_name = 0;
-	    }
-	}
-      else
-	break;
-    }
-
-  if (!name_set)
-    {
-      errmsg ("policy name required");
-      return -99;
-    }
-
-  if ((!tunnel_set) && (!is_del))
-    {
-      errmsg ("tunnel name required");
-      return -99;
-    }
-
-  M2 (SR_POLICY_ADD_DEL, sr_policy_add_del, tunnel_names_length);
-
-
-
-  mp->is_add = !is_del;
-
-  memcpy (mp->name, name, vec_len (name));
-  // Since mp->tunnel_names is of type u8[0] and not a u8 *, u8 ** needs to be serialized
-  u8 *serial_orig = 0;
-  vec_validate (serial_orig, tunnel_names_length);
-  *serial_orig = vec_len (tunnel_names);	// Store the number of tunnels as length in first byte of serialized vector
-  serial_orig += 1;		// Move along one byte to store the length of first tunnel_name
-
-  for (j = 0; j < vec_len (tunnel_names); j++)
-    {
-      tun_name_len = vec_len (tunnel_names[j]);
-      *serial_orig = tun_name_len;	// Store length of tunnel name in first byte of Length/Value pair
-      serial_orig += 1;		// Move along one byte to store the actual tunnel name
-      memcpy (serial_orig, tunnel_names[j], tun_name_len);
-      serial_orig += tun_name_len;	// Advance past the copy
-    }
-  memcpy (mp->tunnel_names, serial_orig - tunnel_names_length, tunnel_names_length);	// Regress serial_orig to head then copy fwd
-
-  vec_free (tunnel_names);
-  vec_free (tunnel_name);
-
-  S;
-  W;
-  /* NOTREACHED */
-}
-
-static int
-api_sr_multicast_map_add_del (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_sr_multicast_map_add_del_t *mp;
-  f64 timeout;
-  int is_del = 0;
-  ip6_address_t multicast_address;
-  u8 *policy_name = 0;
-  int multicast_address_set = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	is_del = 1;
-      else
-	if (unformat
-	    (input, "address %U", unformat_ip6_address, &multicast_address))
-	multicast_address_set = 1;
-      else if (unformat (input, "sr-policy %s", &policy_name))
-	;
-      else
-	break;
-    }
-
-  if (!is_del && !policy_name)
-    {
-      errmsg ("sr-policy name required");
-      return -99;
-    }
-
-
-  if (!multicast_address_set)
-    {
-      errmsg ("address required");
-      return -99;
-    }
-
-  M (SR_MULTICAST_MAP_ADD_DEL, sr_multicast_map_add_del);
-
-  mp->is_add = !is_del;
-  memcpy (mp->policy_name, policy_name, vec_len (policy_name));
-  clib_memcpy (mp->multicast_address, &multicast_address,
-	       sizeof (mp->multicast_address));
-
-
-  vec_free (policy_name);
-
-  S;
-  W;
-  /* NOTREACHED */
-}
-
-
-#define foreach_tcp_proto_field                 \
-_(src_port)                                     \
-_(dst_port)
-
-#define foreach_udp_proto_field                 \
-_(src_port)                                     \
-_(dst_port)
-
-#define foreach_ip4_proto_field                 \
-_(src_address)                                  \
-_(dst_address)                                  \
-_(tos)                                          \
-_(length)                                       \
-_(fragment_id)                                  \
-_(ttl)                                          \
-_(protocol)                                     \
-_(checksum)
-
-uword
-unformat_tcp_mask (unformat_input_t * input, va_list * args)
-{
-  u8 **maskp = va_arg (*args, u8 **);
-  u8 *mask = 0;
-  u8 found_something = 0;
-  tcp_header_t *tcp;
-
-#define _(a) u8 a=0;
-  foreach_tcp_proto_field;
-#undef _
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (0);
-#define _(a) else if (unformat (input, #a)) a=1;
-      foreach_tcp_proto_field
-#undef _
-	else
-	break;
-    }
-
-#define _(a) found_something += a;
-  foreach_tcp_proto_field;
-#undef _
-
-  if (found_something == 0)
-    return 0;
-
-  vec_validate (mask, sizeof (*tcp) - 1);
-
-  tcp = (tcp_header_t *) mask;
-
-#define _(a) if (a) memset (&tcp->a, 0xff, sizeof (tcp->a));
-  foreach_tcp_proto_field;
-#undef _
-
-  *maskp = mask;
-  return 1;
-}
-
-uword
-unformat_udp_mask (unformat_input_t * input, va_list * args)
-{
-  u8 **maskp = va_arg (*args, u8 **);
-  u8 *mask = 0;
-  u8 found_something = 0;
-  udp_header_t *udp;
-
-#define _(a) u8 a=0;
-  foreach_udp_proto_field;
-#undef _
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (0);
-#define _(a) else if (unformat (input, #a)) a=1;
-      foreach_udp_proto_field
-#undef _
-	else
-	break;
-    }
-
-#define _(a) found_something += a;
-  foreach_udp_proto_field;
-#undef _
-
-  if (found_something == 0)
-    return 0;
-
-  vec_validate (mask, sizeof (*udp) - 1);
-
-  udp = (udp_header_t *) mask;
-
-#define _(a) if (a) memset (&udp->a, 0xff, sizeof (udp->a));
-  foreach_udp_proto_field;
-#undef _
-
-  *maskp = mask;
-  return 1;
-}
-
-typedef struct
-{
-  u16 src_port, dst_port;
-} tcpudp_header_t;
-
-uword
-unformat_l4_mask (unformat_input_t * input, va_list * args)
-{
-  u8 **maskp = va_arg (*args, u8 **);
-  u16 src_port = 0, dst_port = 0;
-  tcpudp_header_t *tcpudp;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "tcp %U", unformat_tcp_mask, maskp))
-	return 1;
-      else if (unformat (input, "udp %U", unformat_udp_mask, maskp))
-	return 1;
-      else if (unformat (input, "src_port"))
-	src_port = 0xFFFF;
-      else if (unformat (input, "dst_port"))
-	dst_port = 0xFFFF;
-      else
-	return 0;
-    }
-
-  if (!src_port && !dst_port)
-    return 0;
-
-  u8 *mask = 0;
-  vec_validate (mask, sizeof (tcpudp_header_t) - 1);
-
-  tcpudp = (tcpudp_header_t *) mask;
-  tcpudp->src_port = src_port;
-  tcpudp->dst_port = dst_port;
-
-  *maskp = mask;
-
-  return 1;
-}
-
-uword
-unformat_ip4_mask (unformat_input_t * input, va_list * args)
-{
-  u8 **maskp = va_arg (*args, u8 **);
-  u8 *mask = 0;
-  u8 found_something = 0;
-  ip4_header_t *ip;
-
-#define _(a) u8 a=0;
-  foreach_ip4_proto_field;
-#undef _
-  u8 version = 0;
-  u8 hdr_length = 0;
-
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "version"))
-	version = 1;
-      else if (unformat (input, "hdr_length"))
-	hdr_length = 1;
-      else if (unformat (input, "src"))
-	src_address = 1;
-      else if (unformat (input, "dst"))
-	dst_address = 1;
-      else if (unformat (input, "proto"))
-	protocol = 1;
-
-#define _(a) else if (unformat (input, #a)) a=1;
-      foreach_ip4_proto_field
-#undef _
-	else
-	break;
-    }
-
-#define _(a) found_something += a;
-  foreach_ip4_proto_field;
-#undef _
-
-  if (found_something == 0)
-    return 0;
-
-  vec_validate (mask, sizeof (*ip) - 1);
-
-  ip = (ip4_header_t *) mask;
-
-#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
-  foreach_ip4_proto_field;
-#undef _
-
-  ip->ip_version_and_header_length = 0;
-
-  if (version)
-    ip->ip_version_and_header_length |= 0xF0;
-
-  if (hdr_length)
-    ip->ip_version_and_header_length |= 0x0F;
-
-  *maskp = mask;
-  return 1;
-}
-
-#define foreach_ip6_proto_field                 \
-_(src_address)                                  \
-_(dst_address)                                  \
-_(payload_length)				\
-_(hop_limit)                                    \
-_(protocol)
-
-uword
-unformat_ip6_mask (unformat_input_t * input, va_list * args)
-{
-  u8 **maskp = va_arg (*args, u8 **);
-  u8 *mask = 0;
-  u8 found_something = 0;
-  ip6_header_t *ip;
-  u32 ip_version_traffic_class_and_flow_label;
-
-#define _(a) u8 a=0;
-  foreach_ip6_proto_field;
-#undef _
-  u8 version = 0;
-  u8 traffic_class = 0;
-  u8 flow_label = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "version"))
-	version = 1;
-      else if (unformat (input, "traffic-class"))
-	traffic_class = 1;
-      else if (unformat (input, "flow-label"))
-	flow_label = 1;
-      else if (unformat (input, "src"))
-	src_address = 1;
-      else if (unformat (input, "dst"))
-	dst_address = 1;
-      else if (unformat (input, "proto"))
-	protocol = 1;
-
-#define _(a) else if (unformat (input, #a)) a=1;
-      foreach_ip6_proto_field
-#undef _
-	else
-	break;
-    }
-
-#define _(a) found_something += a;
-  foreach_ip6_proto_field;
-#undef _
-
-  if (found_something == 0)
-    return 0;
-
-  vec_validate (mask, sizeof (*ip) - 1);
-
-  ip = (ip6_header_t *) mask;
-
-#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
-  foreach_ip6_proto_field;
-#undef _
-
-  ip_version_traffic_class_and_flow_label = 0;
-
-  if (version)
-    ip_version_traffic_class_and_flow_label |= 0xF0000000;
-
-  if (traffic_class)
-    ip_version_traffic_class_and_flow_label |= 0x0FF00000;
-
-  if (flow_label)
-    ip_version_traffic_class_and_flow_label |= 0x000FFFFF;
-
-  ip->ip_version_traffic_class_and_flow_label =
-    clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label);
-
-  *maskp = mask;
-  return 1;
-}
-
-uword
-unformat_l3_mask (unformat_input_t * input, va_list * args)
-{
-  u8 **maskp = va_arg (*args, u8 **);
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp))
-	return 1;
-      else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp))
-	return 1;
-      else
-	break;
-    }
-  return 0;
-}
-
-uword
-unformat_l2_mask (unformat_input_t * input, va_list * args)
-{
-  u8 **maskp = va_arg (*args, u8 **);
-  u8 *mask = 0;
-  u8 src = 0;
-  u8 dst = 0;
-  u8 proto = 0;
-  u8 tag1 = 0;
-  u8 tag2 = 0;
-  u8 ignore_tag1 = 0;
-  u8 ignore_tag2 = 0;
-  u8 cos1 = 0;
-  u8 cos2 = 0;
-  u8 dot1q = 0;
-  u8 dot1ad = 0;
-  int len = 14;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "src"))
-	src = 1;
-      else if (unformat (input, "dst"))
-	dst = 1;
-      else if (unformat (input, "proto"))
-	proto = 1;
-      else if (unformat (input, "tag1"))
-	tag1 = 1;
-      else if (unformat (input, "tag2"))
-	tag2 = 1;
-      else if (unformat (input, "ignore-tag1"))
-	ignore_tag1 = 1;
-      else if (unformat (input, "ignore-tag2"))
-	ignore_tag2 = 1;
-      else if (unformat (input, "cos1"))
-	cos1 = 1;
-      else if (unformat (input, "cos2"))
-	cos2 = 1;
-      else if (unformat (input, "dot1q"))
-	dot1q = 1;
-      else if (unformat (input, "dot1ad"))
-	dot1ad = 1;
-      else
-	break;
-    }
-  if ((src + dst + proto + tag1 + tag2 + dot1q + dot1ad +
-       ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
-    return 0;
-
-  if (tag1 || ignore_tag1 || cos1 || dot1q)
-    len = 18;
-  if (tag2 || ignore_tag2 || cos2 || dot1ad)
-    len = 22;
-
-  vec_validate (mask, len - 1);
-
-  if (dst)
-    memset (mask, 0xff, 6);
-
-  if (src)
-    memset (mask + 6, 0xff, 6);
-
-  if (tag2 || dot1ad)
-    {
-      /* inner vlan tag */
-      if (tag2)
-	{
-	  mask[19] = 0xff;
-	  mask[18] = 0x0f;
-	}
-      if (cos2)
-	mask[18] |= 0xe0;
-      if (proto)
-	mask[21] = mask[20] = 0xff;
-      if (tag1)
-	{
-	  mask[15] = 0xff;
-	  mask[14] = 0x0f;
-	}
-      if (cos1)
-	mask[14] |= 0xe0;
-      *maskp = mask;
-      return 1;
-    }
-  if (tag1 | dot1q)
-    {
-      if (tag1)
-	{
-	  mask[15] = 0xff;
-	  mask[14] = 0x0f;
-	}
-      if (cos1)
-	mask[14] |= 0xe0;
-      if (proto)
-	mask[16] = mask[17] = 0xff;
-
-      *maskp = mask;
-      return 1;
-    }
-  if (cos2)
-    mask[18] |= 0xe0;
-  if (cos1)
-    mask[14] |= 0xe0;
-  if (proto)
-    mask[12] = mask[13] = 0xff;
-
-  *maskp = mask;
-  return 1;
-}
-
-uword
-unformat_classify_mask (unformat_input_t * input, va_list * args)
-{
-  u8 **maskp = va_arg (*args, u8 **);
-  u32 *skipp = va_arg (*args, u32 *);
-  u32 *matchp = va_arg (*args, u32 *);
-  u32 match;
-  u8 *mask = 0;
-  u8 *l2 = 0;
-  u8 *l3 = 0;
-  u8 *l4 = 0;
-  int i;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "hex %U", unformat_hex_string, &mask))
-	;
-      else if (unformat (input, "l2 %U", unformat_l2_mask, &l2))
-	;
-      else if (unformat (input, "l3 %U", unformat_l3_mask, &l3))
-	;
-      else if (unformat (input, "l4 %U", unformat_l4_mask, &l4))
-	;
-      else
-	break;
-    }
-
-  if (l4 && !l3)
-    {
-      vec_free (mask);
-      vec_free (l2);
-      vec_free (l4);
-      return 0;
-    }
-
-  if (mask || l2 || l3 || l4)
-    {
-      if (l2 || l3 || l4)
-	{
-	  /* "With a free Ethernet header in every package" */
-	  if (l2 == 0)
-	    vec_validate (l2, 13);
-	  mask = l2;
-	  if (vec_len (l3))
-	    {
-	      vec_append (mask, l3);
-	      vec_free (l3);
-	    }
-	  if (vec_len (l4))
-	    {
-	      vec_append (mask, l4);
-	      vec_free (l4);
-	    }
-	}
-
-      /* Scan forward looking for the first significant mask octet */
-      for (i = 0; i < vec_len (mask); i++)
-	if (mask[i])
-	  break;
-
-      /* compute (skip, match) params */
-      *skipp = i / sizeof (u32x4);
-      vec_delete (mask, *skipp * sizeof (u32x4), 0);
-
-      /* Pad mask to an even multiple of the vector size */
-      while (vec_len (mask) % sizeof (u32x4))
-	vec_add1 (mask, 0);
-
-      match = vec_len (mask) / sizeof (u32x4);
-
-      for (i = match * sizeof (u32x4); i > 0; i -= sizeof (u32x4))
-	{
-	  u64 *tmp = (u64 *) (mask + (i - sizeof (u32x4)));
-	  if (*tmp || *(tmp + 1))
-	    break;
-	  match--;
-	}
-      if (match == 0)
-	clib_warning ("BUG: match 0");
-
-      _vec_len (mask) = match * sizeof (u32x4);
-
-      *matchp = match;
-      *maskp = mask;
-
-      return 1;
-    }
-
-  return 0;
-}
-
-#define foreach_l2_next                         \
-_(drop, DROP)                                   \
-_(ethernet, ETHERNET_INPUT)                     \
-_(ip4, IP4_INPUT)                               \
-_(ip6, IP6_INPUT)
-
-uword
-unformat_l2_next_index (unformat_input_t * input, va_list * args)
-{
-  u32 *miss_next_indexp = va_arg (*args, u32 *);
-  u32 next_index = 0;
-  u32 tmp;
-
-#define _(n,N) \
-  if (unformat (input, #n)) { next_index = L2_INPUT_CLASSIFY_NEXT_##N; goto out;}
-  foreach_l2_next;
-#undef _
-
-  if (unformat (input, "%d", &tmp))
-    {
-      next_index = tmp;
-      goto out;
-    }
-
-  return 0;
-
-out:
-  *miss_next_indexp = next_index;
-  return 1;
-}
-
-#define foreach_ip_next                         \
-_(drop, DROP)                                   \
-_(local, LOCAL)                                 \
-_(rewrite, REWRITE)
-
-uword
-unformat_ip_next_index (unformat_input_t * input, va_list * args)
-{
-  u32 *miss_next_indexp = va_arg (*args, u32 *);
-  u32 next_index = 0;
-  u32 tmp;
-
-#define _(n,N) \
-  if (unformat (input, #n)) { next_index = IP_LOOKUP_NEXT_##N; goto out;}
-  foreach_ip_next;
-#undef _
-
-  if (unformat (input, "%d", &tmp))
-    {
-      next_index = tmp;
-      goto out;
-    }
-
-  return 0;
-
-out:
-  *miss_next_indexp = next_index;
-  return 1;
-}
-
-#define foreach_acl_next                        \
-_(deny, DENY)
-
-uword
-unformat_acl_next_index (unformat_input_t * input, va_list * args)
-{
-  u32 *miss_next_indexp = va_arg (*args, u32 *);
-  u32 next_index = 0;
-  u32 tmp;
-
-#define _(n,N) \
-  if (unformat (input, #n)) { next_index = ACL_NEXT_INDEX_##N; goto out;}
-  foreach_acl_next;
-#undef _
-
-  if (unformat (input, "permit"))
-    {
-      next_index = ~0;
-      goto out;
-    }
-  else if (unformat (input, "%d", &tmp))
-    {
-      next_index = tmp;
-      goto out;
-    }
-
-  return 0;
-
-out:
-  *miss_next_indexp = next_index;
-  return 1;
-}
-
-uword
-unformat_policer_precolor (unformat_input_t * input, va_list * args)
-{
-  u32 *r = va_arg (*args, u32 *);
-
-  if (unformat (input, "conform-color"))
-    *r = POLICE_CONFORM;
-  else if (unformat (input, "exceed-color"))
-    *r = POLICE_EXCEED;
-  else
-    return 0;
-
-  return 1;
-}
-
-static int
-api_classify_add_del_table (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_classify_add_del_table_t *mp;
-
-  u32 nbuckets = 2;
-  u32 skip = ~0;
-  u32 match = ~0;
-  int is_add = 1;
-  int del_chain = 0;
-  u32 table_index = ~0;
-  u32 next_table_index = ~0;
-  u32 miss_next_index = ~0;
-  u32 memory_size = 32 << 20;
-  u8 *mask = 0;
-  f64 timeout;
-  u32 current_data_flag = 0;
-  int current_data_offset = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "del-chain"))
-	{
-	  is_add = 0;
-	  del_chain = 1;
-	}
-      else if (unformat (i, "buckets %d", &nbuckets))
-	;
-      else if (unformat (i, "memory_size %d", &memory_size))
-	;
-      else if (unformat (i, "skip %d", &skip))
-	;
-      else if (unformat (i, "match %d", &match))
-	;
-      else if (unformat (i, "table %d", &table_index))
-	;
-      else if (unformat (i, "mask %U", unformat_classify_mask,
-			 &mask, &skip, &match))
-	;
-      else if (unformat (i, "next-table %d", &next_table_index))
-	;
-      else if (unformat (i, "miss-next %U", unformat_ip_next_index,
-			 &miss_next_index))
-	;
-      else if (unformat (i, "l2-miss-next %U", unformat_l2_next_index,
-			 &miss_next_index))
-	;
-      else if (unformat (i, "acl-miss-next %U", unformat_acl_next_index,
-			 &miss_next_index))
-	;
-      else if (unformat (i, "current-data-flag %d", &current_data_flag))
-	;
-      else if (unformat (i, "current-data-offset %d", &current_data_offset))
-	;
-      else
-	break;
-    }
-
-  if (is_add && mask == 0)
-    {
-      errmsg ("Mask required");
-      return -99;
-    }
-
-  if (is_add && skip == ~0)
-    {
-      errmsg ("skip count required");
-      return -99;
-    }
-
-  if (is_add && match == ~0)
-    {
-      errmsg ("match count required");
-      return -99;
-    }
-
-  if (!is_add && table_index == ~0)
-    {
-      errmsg ("table index required for delete");
-      return -99;
-    }
-
-  M2 (CLASSIFY_ADD_DEL_TABLE, classify_add_del_table, vec_len (mask));
-
-  mp->is_add = is_add;
-  mp->del_chain = del_chain;
-  mp->table_index = ntohl (table_index);
-  mp->nbuckets = ntohl (nbuckets);
-  mp->memory_size = ntohl (memory_size);
-  mp->skip_n_vectors = ntohl (skip);
-  mp->match_n_vectors = ntohl (match);
-  mp->next_table_index = ntohl (next_table_index);
-  mp->miss_next_index = ntohl (miss_next_index);
-  mp->current_data_flag = ntohl (current_data_flag);
-  mp->current_data_offset = ntohl (current_data_offset);
-  clib_memcpy (mp->mask, mask, vec_len (mask));
-
-  vec_free (mask);
-
-  S;
-  W;
-  /* NOTREACHED */
-}
-
-uword
-unformat_l4_match (unformat_input_t * input, va_list * args)
-{
-  u8 **matchp = va_arg (*args, u8 **);
-
-  u8 *proto_header = 0;
-  int src_port = 0;
-  int dst_port = 0;
-
-  tcpudp_header_t h;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "src_port %d", &src_port))
-	;
-      else if (unformat (input, "dst_port %d", &dst_port))
-	;
-      else
-	return 0;
-    }
-
-  h.src_port = clib_host_to_net_u16 (src_port);
-  h.dst_port = clib_host_to_net_u16 (dst_port);
-  vec_validate (proto_header, sizeof (h) - 1);
-  memcpy (proto_header, &h, sizeof (h));
-
-  *matchp = proto_header;
-
-  return 1;
-}
-
-uword
-unformat_ip4_match (unformat_input_t * input, va_list * args)
-{
-  u8 **matchp = va_arg (*args, u8 **);
-  u8 *match = 0;
-  ip4_header_t *ip;
-  int version = 0;
-  u32 version_val;
-  int hdr_length = 0;
-  u32 hdr_length_val;
-  int src = 0, dst = 0;
-  ip4_address_t src_val, dst_val;
-  int proto = 0;
-  u32 proto_val;
-  int tos = 0;
-  u32 tos_val;
-  int length = 0;
-  u32 length_val;
-  int fragment_id = 0;
-  u32 fragment_id_val;
-  int ttl = 0;
-  int ttl_val;
-  int checksum = 0;
-  u32 checksum_val;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "version %d", &version_val))
-	version = 1;
-      else if (unformat (input, "hdr_length %d", &hdr_length_val))
-	hdr_length = 1;
-      else if (unformat (input, "src %U", unformat_ip4_address, &src_val))
-	src = 1;
-      else if (unformat (input, "dst %U", unformat_ip4_address, &dst_val))
-	dst = 1;
-      else if (unformat (input, "proto %d", &proto_val))
-	proto = 1;
-      else if (unformat (input, "tos %d", &tos_val))
-	tos = 1;
-      else if (unformat (input, "length %d", &length_val))
-	length = 1;
-      else if (unformat (input, "fragment_id %d", &fragment_id_val))
-	fragment_id = 1;
-      else if (unformat (input, "ttl %d", &ttl_val))
-	ttl = 1;
-      else if (unformat (input, "checksum %d", &checksum_val))
-	checksum = 1;
-      else
-	break;
-    }
-
-  if (version + hdr_length + src + dst + proto + tos + length + fragment_id
-      + ttl + checksum == 0)
-    return 0;
-
-  /*
-   * Aligned because we use the real comparison functions
-   */
-  vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4));
-
-  ip = (ip4_header_t *) match;
-
-  /* These are realistically matched in practice */
-  if (src)
-    ip->src_address.as_u32 = src_val.as_u32;
-
-  if (dst)
-    ip->dst_address.as_u32 = dst_val.as_u32;
-
-  if (proto)
-    ip->protocol = proto_val;
-
-
-  /* These are not, but they're included for completeness */
-  if (version)
-    ip->ip_version_and_header_length |= (version_val & 0xF) << 4;
-
-  if (hdr_length)
-    ip->ip_version_and_header_length |= (hdr_length_val & 0xF);
-
-  if (tos)
-    ip->tos = tos_val;
-
-  if (length)
-    ip->length = clib_host_to_net_u16 (length_val);
-
-  if (ttl)
-    ip->ttl = ttl_val;
-
-  if (checksum)
-    ip->checksum = clib_host_to_net_u16 (checksum_val);
-
-  *matchp = match;
-  return 1;
-}
-
-uword
-unformat_ip6_match (unformat_input_t * input, va_list * args)
-{
-  u8 **matchp = va_arg (*args, u8 **);
-  u8 *match = 0;
-  ip6_header_t *ip;
-  int version = 0;
-  u32 version_val;
-  u8 traffic_class = 0;
-  u32 traffic_class_val = 0;
-  u8 flow_label = 0;
-  u8 flow_label_val;
-  int src = 0, dst = 0;
-  ip6_address_t src_val, dst_val;
-  int proto = 0;
-  u32 proto_val;
-  int payload_length = 0;
-  u32 payload_length_val;
-  int hop_limit = 0;
-  int hop_limit_val;
-  u32 ip_version_traffic_class_and_flow_label;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "version %d", &version_val))
-	version = 1;
-      else if (unformat (input, "traffic_class %d", &traffic_class_val))
-	traffic_class = 1;
-      else if (unformat (input, "flow_label %d", &flow_label_val))
-	flow_label = 1;
-      else if (unformat (input, "src %U", unformat_ip6_address, &src_val))
-	src = 1;
-      else if (unformat (input, "dst %U", unformat_ip6_address, &dst_val))
-	dst = 1;
-      else if (unformat (input, "proto %d", &proto_val))
-	proto = 1;
-      else if (unformat (input, "payload_length %d", &payload_length_val))
-	payload_length = 1;
-      else if (unformat (input, "hop_limit %d", &hop_limit_val))
-	hop_limit = 1;
-      else
-	break;
-    }
-
-  if (version + traffic_class + flow_label + src + dst + proto +
-      payload_length + hop_limit == 0)
-    return 0;
-
-  /*
-   * Aligned because we use the real comparison functions
-   */
-  vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4));
-
-  ip = (ip6_header_t *) match;
-
-  if (src)
-    clib_memcpy (&ip->src_address, &src_val, sizeof (ip->src_address));
-
-  if (dst)
-    clib_memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address));
-
-  if (proto)
-    ip->protocol = proto_val;
-
-  ip_version_traffic_class_and_flow_label = 0;
-
-  if (version)
-    ip_version_traffic_class_and_flow_label |= (version_val & 0xF) << 28;
-
-  if (traffic_class)
-    ip_version_traffic_class_and_flow_label |=
-      (traffic_class_val & 0xFF) << 20;
-
-  if (flow_label)
-    ip_version_traffic_class_and_flow_label |= (flow_label_val & 0xFFFFF);
-
-  ip->ip_version_traffic_class_and_flow_label =
-    clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label);
-
-  if (payload_length)
-    ip->payload_length = clib_host_to_net_u16 (payload_length_val);
-
-  if (hop_limit)
-    ip->hop_limit = hop_limit_val;
-
-  *matchp = match;
-  return 1;
-}
-
-uword
-unformat_l3_match (unformat_input_t * input, va_list * args)
-{
-  u8 **matchp = va_arg (*args, u8 **);
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "ip4 %U", unformat_ip4_match, matchp))
-	return 1;
-      else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp))
-	return 1;
-      else
-	break;
-    }
-  return 0;
-}
-
-uword
-unformat_vlan_tag (unformat_input_t * input, va_list * args)
-{
-  u8 *tagp = va_arg (*args, u8 *);
-  u32 tag;
-
-  if (unformat (input, "%d", &tag))
-    {
-      tagp[0] = (tag >> 8) & 0x0F;
-      tagp[1] = tag & 0xFF;
-      return 1;
-    }
-
-  return 0;
-}
-
-uword
-unformat_l2_match (unformat_input_t * input, va_list * args)
-{
-  u8 **matchp = va_arg (*args, u8 **);
-  u8 *match = 0;
-  u8 src = 0;
-  u8 src_val[6];
-  u8 dst = 0;
-  u8 dst_val[6];
-  u8 proto = 0;
-  u16 proto_val;
-  u8 tag1 = 0;
-  u8 tag1_val[2];
-  u8 tag2 = 0;
-  u8 tag2_val[2];
-  int len = 14;
-  u8 ignore_tag1 = 0;
-  u8 ignore_tag2 = 0;
-  u8 cos1 = 0;
-  u8 cos2 = 0;
-  u32 cos1_val = 0;
-  u32 cos2_val = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "src %U", unformat_ethernet_address, &src_val))
-	src = 1;
-      else
-	if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val))
-	dst = 1;
-      else if (unformat (input, "proto %U",
-			 unformat_ethernet_type_host_byte_order, &proto_val))
-	proto = 1;
-      else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val))
-	tag1 = 1;
-      else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val))
-	tag2 = 1;
-      else if (unformat (input, "ignore-tag1"))
-	ignore_tag1 = 1;
-      else if (unformat (input, "ignore-tag2"))
-	ignore_tag2 = 1;
-      else if (unformat (input, "cos1 %d", &cos1_val))
-	cos1 = 1;
-      else if (unformat (input, "cos2 %d", &cos2_val))
-	cos2 = 1;
-      else
-	break;
-    }
-  if ((src + dst + proto + tag1 + tag2 +
-       ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
-    return 0;
-
-  if (tag1 || ignore_tag1 || cos1)
-    len = 18;
-  if (tag2 || ignore_tag2 || cos2)
-    len = 22;
-
-  vec_validate_aligned (match, len - 1, sizeof (u32x4));
-
-  if (dst)
-    clib_memcpy (match, dst_val, 6);
-
-  if (src)
-    clib_memcpy (match + 6, src_val, 6);
-
-  if (tag2)
-    {
-      /* inner vlan tag */
-      match[19] = tag2_val[1];
-      match[18] = tag2_val[0];
-      if (cos2)
-	match[18] |= (cos2_val & 0x7) << 5;
-      if (proto)
-	{
-	  match[21] = proto_val & 0xff;
-	  match[20] = proto_val >> 8;
-	}
-      if (tag1)
-	{
-	  match[15] = tag1_val[1];
-	  match[14] = tag1_val[0];
-	}
-      if (cos1)
-	match[14] |= (cos1_val & 0x7) << 5;
-      *matchp = match;
-      return 1;
-    }
-  if (tag1)
-    {
-      match[15] = tag1_val[1];
-      match[14] = tag1_val[0];
-      if (proto)
-	{
-	  match[17] = proto_val & 0xff;
-	  match[16] = proto_val >> 8;
-	}
-      if (cos1)
-	match[14] |= (cos1_val & 0x7) << 5;
-
-      *matchp = match;
-      return 1;
-    }
-  if (cos2)
-    match[18] |= (cos2_val & 0x7) << 5;
-  if (cos1)
-    match[14] |= (cos1_val & 0x7) << 5;
-  if (proto)
-    {
-      match[13] = proto_val & 0xff;
-      match[12] = proto_val >> 8;
-    }
-
-  *matchp = match;
-  return 1;
-}
-
-
-uword
-unformat_classify_match (unformat_input_t * input, va_list * args)
-{
-  u8 **matchp = va_arg (*args, u8 **);
-  u32 skip_n_vectors = va_arg (*args, u32);
-  u32 match_n_vectors = va_arg (*args, u32);
-
-  u8 *match = 0;
-  u8 *l2 = 0;
-  u8 *l3 = 0;
-  u8 *l4 = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "hex %U", unformat_hex_string, &match))
-	;
-      else if (unformat (input, "l2 %U", unformat_l2_match, &l2))
-	;
-      else if (unformat (input, "l3 %U", unformat_l3_match, &l3))
-	;
-      else if (unformat (input, "l4 %U", unformat_l4_match, &l4))
-	;
-      else
-	break;
-    }
-
-  if (l4 && !l3)
-    {
-      vec_free (match);
-      vec_free (l2);
-      vec_free (l4);
-      return 0;
-    }
-
-  if (match || l2 || l3 || l4)
-    {
-      if (l2 || l3 || l4)
-	{
-	  /* "Win a free Ethernet header in every packet" */
-	  if (l2 == 0)
-	    vec_validate_aligned (l2, 13, sizeof (u32x4));
-	  match = l2;
-	  if (vec_len (l3))
-	    {
-	      vec_append_aligned (match, l3, sizeof (u32x4));
-	      vec_free (l3);
-	    }
-	  if (vec_len (l4))
-	    {
-	      vec_append_aligned (match, l4, sizeof (u32x4));
-	      vec_free (l4);
-	    }
-	}
-
-      /* Make sure the vector is big enough even if key is all 0's */
-      vec_validate_aligned
-	(match, ((match_n_vectors + skip_n_vectors) * sizeof (u32x4)) - 1,
-	 sizeof (u32x4));
-
-      /* Set size, include skipped vectors */
-      _vec_len (match) = (match_n_vectors + skip_n_vectors) * sizeof (u32x4);
-
-      *matchp = match;
-
-      return 1;
-    }
-
-  return 0;
-}
-
-static int
-api_classify_add_del_session (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_classify_add_del_session_t *mp;
-  int is_add = 1;
-  u32 table_index = ~0;
-  u32 hit_next_index = ~0;
-  u32 opaque_index = ~0;
-  u8 *match = 0;
-  i32 advance = 0;
-  f64 timeout;
-  u32 skip_n_vectors = 0;
-  u32 match_n_vectors = 0;
-  u32 action = 0;
-  u32 metadata = 0;
-
-  /*
-   * Warning: you have to supply skip_n and match_n
-   * because the API client cant simply look at the classify
-   * table object.
-   */
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "hit-next %U", unformat_ip_next_index,
-			 &hit_next_index))
-	;
-      else if (unformat (i, "l2-hit-next %U", unformat_l2_next_index,
-			 &hit_next_index))
-	;
-      else if (unformat (i, "acl-hit-next %U", unformat_acl_next_index,
-			 &hit_next_index))
-	;
-      else if (unformat (i, "policer-hit-next %d", &hit_next_index))
-	;
-      else if (unformat (i, "%U", unformat_policer_precolor, &opaque_index))
-	;
-      else if (unformat (i, "opaque-index %d", &opaque_index))
-	;
-      else if (unformat (i, "skip_n %d", &skip_n_vectors))
-	;
-      else if (unformat (i, "match_n %d", &match_n_vectors))
-	;
-      else if (unformat (i, "match %U", unformat_classify_match,
-			 &match, skip_n_vectors, match_n_vectors))
-	;
-      else if (unformat (i, "advance %d", &advance))
-	;
-      else if (unformat (i, "table-index %d", &table_index))
-	;
-      else if (unformat (i, "action set-ip4-fib-id %d", &metadata))
-	action = 1;
-      else if (unformat (i, "action set-ip6-fib-id %d", &metadata))
-	action = 2;
-      else if (unformat (i, "action %d", &action))
-	;
-      else if (unformat (i, "metadata %d", &metadata))
-	;
-      else
-	break;
-    }
-
-  if (table_index == ~0)
-    {
-      errmsg ("Table index required");
-      return -99;
-    }
-
-  if (is_add && match == 0)
-    {
-      errmsg ("Match value required");
-      return -99;
-    }
-
-  M2 (CLASSIFY_ADD_DEL_SESSION, classify_add_del_session, vec_len (match));
-
-  mp->is_add = is_add;
-  mp->table_index = ntohl (table_index);
-  mp->hit_next_index = ntohl (hit_next_index);
-  mp->opaque_index = ntohl (opaque_index);
-  mp->advance = ntohl (advance);
-  mp->action = action;
-  mp->metadata = ntohl (metadata);
-  clib_memcpy (mp->match, match, vec_len (match));
-  vec_free (match);
-
-  S;
-  W;
-  /* NOTREACHED */
-}
-
-static int
-api_classify_set_interface_ip_table (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_classify_set_interface_ip_table_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  int sw_if_index_set;
-  u32 table_index = ~0;
-  u8 is_ipv6 = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "table %d", &table_index))
-	;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-
-  M (CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->table_index = ntohl (table_index);
-  mp->is_ipv6 = is_ipv6;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_classify_set_interface_l2_tables (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_classify_set_interface_l2_tables_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  int sw_if_index_set;
-  u32 ip4_table_index = ~0;
-  u32 ip6_table_index = ~0;
-  u32 other_table_index = ~0;
-  u32 is_input = 1;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "ip4-table %d", &ip4_table_index))
-	;
-      else if (unformat (i, "ip6-table %d", &ip6_table_index))
-	;
-      else if (unformat (i, "other-table %d", &other_table_index))
-	;
-      else if (unformat (i, "is-input %d", &is_input))
-	;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-
-  M (CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->ip4_table_index = ntohl (ip4_table_index);
-  mp->ip6_table_index = ntohl (ip6_table_index);
-  mp->other_table_index = ntohl (other_table_index);
-  mp->is_input = (u8) is_input;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_set_ipfix_exporter (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_set_ipfix_exporter_t *mp;
-  ip4_address_t collector_address;
-  u8 collector_address_set = 0;
-  u32 collector_port = ~0;
-  ip4_address_t src_address;
-  u8 src_address_set = 0;
-  u32 vrf_id = ~0;
-  u32 path_mtu = ~0;
-  u32 template_interval = ~0;
-  u8 udp_checksum = 0;
-  f64 timeout;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "collector_address %U", unformat_ip4_address,
-		    &collector_address))
-	collector_address_set = 1;
-      else if (unformat (i, "collector_port %d", &collector_port))
-	;
-      else if (unformat (i, "src_address %U", unformat_ip4_address,
-			 &src_address))
-	src_address_set = 1;
-      else if (unformat (i, "vrf_id %d", &vrf_id))
-	;
-      else if (unformat (i, "path_mtu %d", &path_mtu))
-	;
-      else if (unformat (i, "template_interval %d", &template_interval))
-	;
-      else if (unformat (i, "udp_checksum"))
-	udp_checksum = 1;
-      else
-	break;
-    }
-
-  if (collector_address_set == 0)
-    {
-      errmsg ("collector_address required");
-      return -99;
-    }
-
-  if (src_address_set == 0)
-    {
-      errmsg ("src_address required");
-      return -99;
-    }
-
-  M (SET_IPFIX_EXPORTER, set_ipfix_exporter);
-
-  memcpy (mp->collector_address, collector_address.data,
-	  sizeof (collector_address.data));
-  mp->collector_port = htons ((u16) collector_port);
-  memcpy (mp->src_address, src_address.data, sizeof (src_address.data));
-  mp->vrf_id = htonl (vrf_id);
-  mp->path_mtu = htonl (path_mtu);
-  mp->template_interval = htonl (template_interval);
-  mp->udp_checksum = udp_checksum;
-
-  S;
-  W;
-  /* NOTREACHED */
-}
-
-static int
-api_set_ipfix_classify_stream (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_set_ipfix_classify_stream_t *mp;
-  u32 domain_id = 0;
-  u32 src_port = UDP_DST_PORT_ipfix;
-  f64 timeout;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "domain %d", &domain_id))
-	;
-      else if (unformat (i, "src_port %d", &src_port))
-	;
-      else
-	{
-	  errmsg ("unknown input `%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  M (SET_IPFIX_CLASSIFY_STREAM, set_ipfix_classify_stream);
-
-  mp->domain_id = htonl (domain_id);
-  mp->src_port = htons ((u16) src_port);
-
-  S;
-  W;
-  /* NOTREACHED */
-}
-
-static int
-api_ipfix_classify_table_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ipfix_classify_table_add_del_t *mp;
-  int is_add = -1;
-  u32 classify_table_index = ~0;
-  u8 ip_version = 0;
-  u8 transport_protocol = 255;
-  f64 timeout;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "add"))
-	is_add = 1;
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "table %d", &classify_table_index))
-	;
-      else if (unformat (i, "ip4"))
-	ip_version = 4;
-      else if (unformat (i, "ip6"))
-	ip_version = 6;
-      else if (unformat (i, "tcp"))
-	transport_protocol = 6;
-      else if (unformat (i, "udp"))
-	transport_protocol = 17;
-      else
-	{
-	  errmsg ("unknown input `%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (is_add == -1)
-    {
-      errmsg ("expecting: add|del");
-      return -99;
-    }
-  if (classify_table_index == ~0)
-    {
-      errmsg ("classifier table not specified");
-      return -99;
-    }
-  if (ip_version == 0)
-    {
-      errmsg ("IP version not specified");
-      return -99;
-    }
-
-  M (IPFIX_CLASSIFY_TABLE_ADD_DEL, ipfix_classify_table_add_del);
-
-  mp->is_add = is_add;
-  mp->table_id = htonl (classify_table_index);
-  mp->ip_version = ip_version;
-  mp->transport_protocol = transport_protocol;
-
-  S;
-  W;
-  /* NOTREACHED */
-}
-
-static int
-api_get_node_index (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_get_node_index_t *mp;
-  f64 timeout;
-  u8 *name = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "node %s", &name))
-	;
-      else
-	break;
-    }
-  if (name == 0)
-    {
-      errmsg ("node name required");
-      return -99;
-    }
-  if (vec_len (name) >= ARRAY_LEN (mp->node_name))
-    {
-      errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name));
-      return -99;
-    }
-
-  M (GET_NODE_INDEX, get_node_index);
-  clib_memcpy (mp->node_name, name, vec_len (name));
-  vec_free (name);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_get_next_index (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_get_next_index_t *mp;
-  f64 timeout;
-  u8 *node_name = 0, *next_node_name = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "node-name %s", &node_name))
-	;
-      else if (unformat (i, "next-node-name %s", &next_node_name))
-	break;
-    }
-
-  if (node_name == 0)
-    {
-      errmsg ("node name required");
-      return -99;
-    }
-  if (vec_len (node_name) >= ARRAY_LEN (mp->node_name))
-    {
-      errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name));
-      return -99;
-    }
-
-  if (next_node_name == 0)
-    {
-      errmsg ("next node name required");
-      return -99;
-    }
-  if (vec_len (next_node_name) >= ARRAY_LEN (mp->next_name))
-    {
-      errmsg ("next node name too long, max %d", ARRAY_LEN (mp->next_name));
-      return -99;
-    }
-
-  M (GET_NEXT_INDEX, get_next_index);
-  clib_memcpy (mp->node_name, node_name, vec_len (node_name));
-  clib_memcpy (mp->next_name, next_node_name, vec_len (next_node_name));
-  vec_free (node_name);
-  vec_free (next_node_name);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_add_node_next (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_add_node_next_t *mp;
-  f64 timeout;
-  u8 *name = 0;
-  u8 *next = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "node %s", &name))
-	;
-      else if (unformat (i, "next %s", &next))
-	;
-      else
-	break;
-    }
-  if (name == 0)
-    {
-      errmsg ("node name required");
-      return -99;
-    }
-  if (vec_len (name) >= ARRAY_LEN (mp->node_name))
-    {
-      errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name));
-      return -99;
-    }
-  if (next == 0)
-    {
-      errmsg ("next node required");
-      return -99;
-    }
-  if (vec_len (next) >= ARRAY_LEN (mp->next_name))
-    {
-      errmsg ("next name too long, max %d", ARRAY_LEN (mp->next_name));
-      return -99;
-    }
-
-  M (ADD_NODE_NEXT, add_node_next);
-  clib_memcpy (mp->node_name, name, vec_len (name));
-  clib_memcpy (mp->next_name, next, vec_len (next));
-  vec_free (name);
-  vec_free (next);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_l2tpv3_create_tunnel (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  ip6_address_t client_address, our_address;
-  int client_address_set = 0;
-  int our_address_set = 0;
-  u32 local_session_id = 0;
-  u32 remote_session_id = 0;
-  u64 local_cookie = 0;
-  u64 remote_cookie = 0;
-  u8 l2_sublayer_present = 0;
-  vl_api_l2tpv3_create_tunnel_t *mp;
-  f64 timeout;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "client_address %U", unformat_ip6_address,
-		    &client_address))
-	client_address_set = 1;
-      else if (unformat (i, "our_address %U", unformat_ip6_address,
-			 &our_address))
-	our_address_set = 1;
-      else if (unformat (i, "local_session_id %d", &local_session_id))
-	;
-      else if (unformat (i, "remote_session_id %d", &remote_session_id))
-	;
-      else if (unformat (i, "local_cookie %lld", &local_cookie))
-	;
-      else if (unformat (i, "remote_cookie %lld", &remote_cookie))
-	;
-      else if (unformat (i, "l2-sublayer-present"))
-	l2_sublayer_present = 1;
-      else
-	break;
-    }
-
-  if (client_address_set == 0)
-    {
-      errmsg ("client_address required");
-      return -99;
-    }
-
-  if (our_address_set == 0)
-    {
-      errmsg ("our_address required");
-      return -99;
-    }
-
-  M (L2TPV3_CREATE_TUNNEL, l2tpv3_create_tunnel);
-
-  clib_memcpy (mp->client_address, client_address.as_u8,
-	       sizeof (mp->client_address));
-
-  clib_memcpy (mp->our_address, our_address.as_u8, sizeof (mp->our_address));
-
-  mp->local_session_id = ntohl (local_session_id);
-  mp->remote_session_id = ntohl (remote_session_id);
-  mp->local_cookie = clib_host_to_net_u64 (local_cookie);
-  mp->remote_cookie = clib_host_to_net_u64 (remote_cookie);
-  mp->l2_sublayer_present = l2_sublayer_present;
-  mp->is_ipv6 = 1;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_l2tpv3_set_tunnel_cookies (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u64 new_local_cookie = 0;
-  u64 new_remote_cookie = 0;
-  vl_api_l2tpv3_set_tunnel_cookies_t *mp;
-  f64 timeout;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "new_local_cookie %lld", &new_local_cookie))
-	;
-      else if (unformat (i, "new_remote_cookie %lld", &new_remote_cookie))
-	;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  M (L2TPV3_SET_TUNNEL_COOKIES, l2tpv3_set_tunnel_cookies);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->new_local_cookie = clib_host_to_net_u64 (new_local_cookie);
-  mp->new_remote_cookie = clib_host_to_net_u64 (new_remote_cookie);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_l2tpv3_interface_enable_disable (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_l2tpv3_interface_enable_disable_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u8 enable_disable = 1;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "enable"))
-	enable_disable = 1;
-      else if (unformat (i, "disable"))
-	enable_disable = 0;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  M (L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->enable_disable = enable_disable;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_l2tpv3_set_lookup_key (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_l2tpv3_set_lookup_key_t *mp;
-  f64 timeout;
-  u8 key = ~0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "lookup_v6_src"))
-	key = L2T_LOOKUP_SRC_ADDRESS;
-      else if (unformat (i, "lookup_v6_dst"))
-	key = L2T_LOOKUP_DST_ADDRESS;
-      else if (unformat (i, "lookup_session_id"))
-	key = L2T_LOOKUP_SESSION_ID;
-      else
-	break;
-    }
-
-  if (key == (u8) ~ 0)
-    {
-      errmsg ("l2tp session lookup key unset");
-      return -99;
-    }
-
-  M (L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key);
-
-  mp->key = key;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler
-  (vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "* %U (our) %U (client) (sw_if_index %d)",
-	 format_ip6_address, mp->our_address,
-	 format_ip6_address, mp->client_address,
-	 clib_net_to_host_u32 (mp->sw_if_index));
-
-  print (vam->ofp,
-	 "   local cookies %016llx %016llx remote cookie %016llx",
-	 clib_net_to_host_u64 (mp->local_cookie[0]),
-	 clib_net_to_host_u64 (mp->local_cookie[1]),
-	 clib_net_to_host_u64 (mp->remote_cookie));
-
-  print (vam->ofp, "   local session-id %d remote session-id %d",
-	 clib_net_to_host_u32 (mp->local_session_id),
-	 clib_net_to_host_u32 (mp->remote_session_id));
-
-  print (vam->ofp, "   l2 specific sublayer %s\n",
-	 mp->l2_sublayer_present ? "preset" : "absent");
-
-}
-
-static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler_json
-  (vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-  struct in6_addr addr;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-
-  clib_memcpy (&addr, mp->our_address, sizeof (addr));
-  vat_json_object_add_ip6 (node, "our_address", addr);
-  clib_memcpy (&addr, mp->client_address, sizeof (addr));
-  vat_json_object_add_ip6 (node, "client_address", addr);
-
-  vat_json_node_t *lc = vat_json_object_add (node, "local_cookie");
-  vat_json_init_array (lc);
-  vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[0]));
-  vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[1]));
-  vat_json_object_add_uint (node, "remote_cookie",
-			    clib_net_to_host_u64 (mp->remote_cookie));
-
-  printf ("local id: %u", clib_net_to_host_u32 (mp->local_session_id));
-  vat_json_object_add_uint (node, "local_session_id",
-			    clib_net_to_host_u32 (mp->local_session_id));
-  vat_json_object_add_uint (node, "remote_session_id",
-			    clib_net_to_host_u32 (mp->remote_session_id));
-  vat_json_object_add_string_copy (node, "l2_sublayer",
-				   mp->l2_sublayer_present ? (u8 *) "present"
-				   : (u8 *) "absent");
-}
-
-static int
-api_sw_if_l2tpv3_tunnel_dump (vat_main_t * vam)
-{
-  vl_api_sw_if_l2tpv3_tunnel_dump_t *mp;
-  f64 timeout;
-
-  /* Get list of l2tpv3-tunnel interfaces */
-  M (SW_IF_L2TPV3_TUNNEL_DUMP, sw_if_l2tpv3_tunnel_dump);
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-
-static void vl_api_sw_interface_tap_details_t_handler
-  (vl_api_sw_interface_tap_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "%-16s %d",
-	 mp->dev_name, clib_net_to_host_u32 (mp->sw_if_index));
-}
-
-static void vl_api_sw_interface_tap_details_t_handler_json
-  (vl_api_sw_interface_tap_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
-  vat_json_object_add_string_copy (node, "dev_name", mp->dev_name);
-}
-
-static int
-api_sw_interface_tap_dump (vat_main_t * vam)
-{
-  vl_api_sw_interface_tap_dump_t *mp;
-  f64 timeout;
-
-  print (vam->ofp, "\n%-16s %s", "dev_name", "sw_if_index");
-  /* Get list of tap interfaces */
-  M (SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump);
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-static uword unformat_vxlan_decap_next
-  (unformat_input_t * input, va_list * args)
-{
-  u32 *result = va_arg (*args, u32 *);
-  u32 tmp;
-
-  if (unformat (input, "l2"))
-    *result = VXLAN_INPUT_NEXT_L2_INPUT;
-  else if (unformat (input, "%d", &tmp))
-    *result = tmp;
-  else
-    return 0;
-  return 1;
-}
-
-static int
-api_vxlan_add_del_tunnel (vat_main_t * vam)
-{
-  unformat_input_t *line_input = vam->input;
-  vl_api_vxlan_add_del_tunnel_t *mp;
-  f64 timeout;
-  ip46_address_t src, dst;
-  u8 is_add = 1;
-  u8 ipv4_set = 0, ipv6_set = 0;
-  u8 src_set = 0;
-  u8 dst_set = 0;
-  u8 grp_set = 0;
-  u32 mcast_sw_if_index = ~0;
-  u32 encap_vrf_id = 0;
-  u32 decap_next_index = ~0;
-  u32 vni = 0;
-
-  /* Can't "universally zero init" (={0}) due to GCC bug 53119 */
-  memset (&src, 0, sizeof src);
-  memset (&dst, 0, sizeof dst);
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "del"))
-	is_add = 0;
-      else
-	if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4))
-	{
-	  ipv4_set = 1;
-	  src_set = 1;
-	}
-      else
-	if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4))
-	{
-	  ipv4_set = 1;
-	  dst_set = 1;
-	}
-      else
-	if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6))
-	{
-	  ipv6_set = 1;
-	  src_set = 1;
-	}
-      else
-	if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6))
-	{
-	  ipv6_set = 1;
-	  dst_set = 1;
-	}
-      else if (unformat (line_input, "group %U %U",
-			 unformat_ip4_address, &dst.ip4,
-			 api_unformat_sw_if_index, vam, &mcast_sw_if_index))
-	{
-	  grp_set = dst_set = 1;
-	  ipv4_set = 1;
-	}
-      else if (unformat (line_input, "group %U",
-			 unformat_ip4_address, &dst.ip4))
-	{
-	  grp_set = dst_set = 1;
-	  ipv4_set = 1;
-	}
-      else if (unformat (line_input, "group %U %U",
-			 unformat_ip6_address, &dst.ip6,
-			 api_unformat_sw_if_index, vam, &mcast_sw_if_index))
-	{
-	  grp_set = dst_set = 1;
-	  ipv6_set = 1;
-	}
-      else if (unformat (line_input, "group %U",
-			 unformat_ip6_address, &dst.ip6))
-	{
-	  grp_set = dst_set = 1;
-	  ipv6_set = 1;
-	}
-      else
-	if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index))
-	;
-      else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
-	;
-      else if (unformat (line_input, "decap-next %U",
-			 unformat_vxlan_decap_next, &decap_next_index))
-	;
-      else if (unformat (line_input, "vni %d", &vni))
-	;
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, line_input);
-	  return -99;
-	}
-    }
-
-  if (src_set == 0)
-    {
-      errmsg ("tunnel src address not specified");
-      return -99;
-    }
-  if (dst_set == 0)
-    {
-      errmsg ("tunnel dst address not specified");
-      return -99;
-    }
-
-  if (grp_set && !ip46_address_is_multicast (&dst))
-    {
-      errmsg ("tunnel group address not multicast");
-      return -99;
-    }
-  if (grp_set && mcast_sw_if_index == ~0)
-    {
-      errmsg ("tunnel nonexistent multicast device");
-      return -99;
-    }
-  if (grp_set == 0 && ip46_address_is_multicast (&dst))
-    {
-      errmsg ("tunnel dst address must be unicast");
-      return -99;
-    }
-
-
-  if (ipv4_set && ipv6_set)
-    {
-      errmsg ("both IPv4 and IPv6 addresses specified");
-      return -99;
-    }
-
-  if ((vni == 0) || (vni >> 24))
-    {
-      errmsg ("vni not specified or out of range");
-      return -99;
-    }
-
-  M (VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel);
-
-  if (ipv6_set)
-    {
-      clib_memcpy (mp->src_address, &src.ip6, sizeof (src.ip6));
-      clib_memcpy (mp->dst_address, &dst.ip6, sizeof (dst.ip6));
-    }
-  else
-    {
-      clib_memcpy (mp->src_address, &src.ip4, sizeof (src.ip4));
-      clib_memcpy (mp->dst_address, &dst.ip4, sizeof (dst.ip4));
-    }
-  mp->encap_vrf_id = ntohl (encap_vrf_id);
-  mp->decap_next_index = ntohl (decap_next_index);
-  mp->mcast_sw_if_index = ntohl (mcast_sw_if_index);
-  mp->vni = ntohl (vni);
-  mp->is_add = is_add;
-  mp->is_ipv6 = ipv6_set;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static void vl_api_vxlan_tunnel_details_t_handler
-  (vl_api_vxlan_tunnel_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  ip46_address_t src, dst;
-
-  ip46_from_addr_buf (mp->is_ipv6, mp->src_address, &src);
-  ip46_from_addr_buf (mp->is_ipv6, mp->dst_address, &dst);
-
-  print (vam->ofp, "%11d%24U%24U%14d%18d%13d%19d",
-	 ntohl (mp->sw_if_index),
-	 format_ip46_address, &src, IP46_TYPE_ANY,
-	 format_ip46_address, &dst, IP46_TYPE_ANY,
-	 ntohl (mp->encap_vrf_id),
-	 ntohl (mp->decap_next_index), ntohl (mp->vni),
-	 ntohl (mp->mcast_sw_if_index));
-}
-
-static void vl_api_vxlan_tunnel_details_t_handler_json
-  (vl_api_vxlan_tunnel_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
-  if (mp->is_ipv6)
-    {
-      struct in6_addr ip6;
-
-      clib_memcpy (&ip6, mp->src_address, sizeof (ip6));
-      vat_json_object_add_ip6 (node, "src_address", ip6);
-      clib_memcpy (&ip6, mp->dst_address, sizeof (ip6));
-      vat_json_object_add_ip6 (node, "dst_address", ip6);
-    }
-  else
-    {
-      struct in_addr ip4;
-
-      clib_memcpy (&ip4, mp->src_address, sizeof (ip4));
-      vat_json_object_add_ip4 (node, "src_address", ip4);
-      clib_memcpy (&ip4, mp->dst_address, sizeof (ip4));
-      vat_json_object_add_ip4 (node, "dst_address", ip4);
-    }
-  vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id));
-  vat_json_object_add_uint (node, "decap_next_index",
-			    ntohl (mp->decap_next_index));
-  vat_json_object_add_uint (node, "vni", ntohl (mp->vni));
-  vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0);
-  vat_json_object_add_uint (node, "mcast_sw_if_index",
-			    ntohl (mp->mcast_sw_if_index));
-}
-
-static int
-api_vxlan_tunnel_dump (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_vxlan_tunnel_dump_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      sw_if_index = ~0;
-    }
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%11s%24s%24s%14s%18s%13s%19s",
-	     "sw_if_index", "src_address", "dst_address",
-	     "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index");
-    }
-
-  /* Get list of vxlan-tunnel interfaces */
-  M (VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump);
-
-  mp->sw_if_index = htonl (sw_if_index);
-
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-static int
-api_gre_add_del_tunnel (vat_main_t * vam)
-{
-  unformat_input_t *line_input = vam->input;
-  vl_api_gre_add_del_tunnel_t *mp;
-  f64 timeout;
-  ip4_address_t src4, dst4;
-  u8 is_add = 1;
-  u8 teb = 0;
-  u8 src_set = 0;
-  u8 dst_set = 0;
-  u32 outer_fib_id = 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "src %U", unformat_ip4_address, &src4))
-	src_set = 1;
-      else if (unformat (line_input, "dst %U", unformat_ip4_address, &dst4))
-	dst_set = 1;
-      else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id))
-	;
-      else if (unformat (line_input, "teb"))
-	teb = 1;
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, line_input);
-	  return -99;
-	}
-    }
-
-  if (src_set == 0)
-    {
-      errmsg ("tunnel src address not specified");
-      return -99;
-    }
-  if (dst_set == 0)
-    {
-      errmsg ("tunnel dst address not specified");
-      return -99;
-    }
-
-
-  M (GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel);
-
-  clib_memcpy (&mp->src_address, &src4, sizeof (src4));
-  clib_memcpy (&mp->dst_address, &dst4, sizeof (dst4));
-  mp->outer_fib_id = ntohl (outer_fib_id);
-  mp->is_add = is_add;
-  mp->teb = teb;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static void vl_api_gre_tunnel_details_t_handler
-  (vl_api_gre_tunnel_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "%11d%15U%15U%6d%14d",
-	 ntohl (mp->sw_if_index),
-	 format_ip4_address, &mp->src_address,
-	 format_ip4_address, &mp->dst_address,
-	 mp->teb, ntohl (mp->outer_fib_id));
-}
-
-static void vl_api_gre_tunnel_details_t_handler_json
-  (vl_api_gre_tunnel_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-  struct in_addr ip4;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
-  clib_memcpy (&ip4, &mp->src_address, sizeof (ip4));
-  vat_json_object_add_ip4 (node, "src_address", ip4);
-  clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4));
-  vat_json_object_add_ip4 (node, "dst_address", ip4);
-  vat_json_object_add_uint (node, "teb", mp->teb);
-  vat_json_object_add_uint (node, "outer_fib_id", ntohl (mp->outer_fib_id));
-}
-
-static int
-api_gre_tunnel_dump (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_gre_tunnel_dump_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      sw_if_index = ~0;
-    }
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%11s%15s%15s%6s%14s",
-	     "sw_if_index", "src_address", "dst_address", "teb",
-	     "outer_fib_id");
-    }
-
-  /* Get list of gre-tunnel interfaces */
-  M (GRE_TUNNEL_DUMP, gre_tunnel_dump);
-
-  mp->sw_if_index = htonl (sw_if_index);
-
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-static int
-api_l2_fib_clear_table (vat_main_t * vam)
-{
-//  unformat_input_t * i = vam->input;
-  vl_api_l2_fib_clear_table_t *mp;
-  f64 timeout;
-
-  M (L2_FIB_CLEAR_TABLE, l2_fib_clear_table);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_l2_interface_efp_filter (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_l2_interface_efp_filter_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 enable = 1;
-  u8 sw_if_index_set = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "enable"))
-	enable = 1;
-      else if (unformat (i, "disable"))
-	enable = 0;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing sw_if_index");
-      return -99;
-    }
-
-  M (L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->enable_disable = enable;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-#define foreach_vtr_op                          \
-_("disable",  L2_VTR_DISABLED)                  \
-_("push-1",  L2_VTR_PUSH_1)                     \
-_("push-2",  L2_VTR_PUSH_2)                     \
-_("pop-1",  L2_VTR_POP_1)                       \
-_("pop-2",  L2_VTR_POP_2)                       \
-_("translate-1-1",  L2_VTR_TRANSLATE_1_1)       \
-_("translate-1-2",  L2_VTR_TRANSLATE_1_2)       \
-_("translate-2-1",  L2_VTR_TRANSLATE_2_1)       \
-_("translate-2-2",  L2_VTR_TRANSLATE_2_2)
-
-static int
-api_l2_interface_vlan_tag_rewrite (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_l2_interface_vlan_tag_rewrite_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u8 vtr_op_set = 0;
-  u32 vtr_op = 0;
-  u32 push_dot1q = 1;
-  u32 tag1 = ~0;
-  u32 tag2 = ~0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "vtr_op %d", &vtr_op))
-	vtr_op_set = 1;
-#define _(n,v) else if (unformat(i, n)) {vtr_op = v; vtr_op_set = 1;}
-      foreach_vtr_op
-#undef _
-	else if (unformat (i, "push_dot1q %d", &push_dot1q))
-	;
-      else if (unformat (i, "tag1 %d", &tag1))
-	;
-      else if (unformat (i, "tag2 %d", &tag2))
-	;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if ((sw_if_index_set == 0) || (vtr_op_set == 0))
-    {
-      errmsg ("missing vtr operation or sw_if_index");
-      return -99;
-    }
-
-  M (L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)
-    mp->sw_if_index = ntohl (sw_if_index);
-  mp->vtr_op = ntohl (vtr_op);
-  mp->push_dot1q = ntohl (push_dot1q);
-  mp->tag1 = ntohl (tag1);
-  mp->tag2 = ntohl (tag2);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_create_vhost_user_if (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_create_vhost_user_if_t *mp;
-  f64 timeout;
-  u8 *file_name;
-  u8 is_server = 0;
-  u8 file_name_set = 0;
-  u32 custom_dev_instance = ~0;
-  u8 hwaddr[6];
-  u8 use_custom_mac = 0;
-  u8 *tag = 0;
-
-  /* Shut up coverity */
-  memset (hwaddr, 0, sizeof (hwaddr));
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "socket %s", &file_name))
-	{
-	  file_name_set = 1;
-	}
-      else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance))
-	;
-      else if (unformat (i, "mac %U", unformat_ethernet_address, hwaddr))
-	use_custom_mac = 1;
-      else if (unformat (i, "server"))
-	is_server = 1;
-      else if (unformat (i, "tag %s", &tag))
-	;
-      else
-	break;
-    }
-
-  if (file_name_set == 0)
-    {
-      errmsg ("missing socket file name");
-      return -99;
-    }
-
-  if (vec_len (file_name) > 255)
-    {
-      errmsg ("socket file name too long");
-      return -99;
-    }
-  vec_add1 (file_name, 0);
-
-  M (CREATE_VHOST_USER_IF, create_vhost_user_if);
-
-  mp->is_server = is_server;
-  clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
-  vec_free (file_name);
-  if (custom_dev_instance != ~0)
-    {
-      mp->renumber = 1;
-      mp->custom_dev_instance = ntohl (custom_dev_instance);
-    }
-  mp->use_custom_mac = use_custom_mac;
-  clib_memcpy (mp->mac_address, hwaddr, 6);
-  if (tag)
-    strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1);
-  vec_free (tag);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_modify_vhost_user_if (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_modify_vhost_user_if_t *mp;
-  f64 timeout;
-  u8 *file_name;
-  u8 is_server = 0;
-  u8 file_name_set = 0;
-  u32 custom_dev_instance = ~0;
-  u8 sw_if_index_set = 0;
-  u32 sw_if_index = (u32) ~ 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "socket %s", &file_name))
-	{
-	  file_name_set = 1;
-	}
-      else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance))
-	;
-      else if (unformat (i, "server"))
-	is_server = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing sw_if_index or interface name");
-      return -99;
-    }
-
-  if (file_name_set == 0)
-    {
-      errmsg ("missing socket file name");
-      return -99;
-    }
-
-  if (vec_len (file_name) > 255)
-    {
-      errmsg ("socket file name too long");
-      return -99;
-    }
-  vec_add1 (file_name, 0);
-
-  M (MODIFY_VHOST_USER_IF, modify_vhost_user_if);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->is_server = is_server;
-  clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
-  vec_free (file_name);
-  if (custom_dev_instance != ~0)
-    {
-      mp->renumber = 1;
-      mp->custom_dev_instance = ntohl (custom_dev_instance);
-    }
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_delete_vhost_user_if (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_delete_vhost_user_if_t *mp;
-  f64 timeout;
-  u32 sw_if_index = ~0;
-  u8 sw_if_index_set = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing sw_if_index or interface name");
-      return -99;
-    }
-
-
-  M (DELETE_VHOST_USER_IF, delete_vhost_user_if);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static void vl_api_sw_interface_vhost_user_details_t_handler
-  (vl_api_sw_interface_vhost_user_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "%-25s %3" PRIu32 " %6" PRIu32 " %8x %6d %7d %s",
-	 (char *) mp->interface_name,
-	 ntohl (mp->sw_if_index), ntohl (mp->virtio_net_hdr_sz),
-	 clib_net_to_host_u64 (mp->features), mp->is_server,
-	 ntohl (mp->num_regions), (char *) mp->sock_filename);
-  print (vam->ofp, "    Status: '%s'", strerror (ntohl (mp->sock_errno)));
-}
-
-static void vl_api_sw_interface_vhost_user_details_t_handler_json
-  (vl_api_sw_interface_vhost_user_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
-  vat_json_object_add_string_copy (node, "interface_name",
-				   mp->interface_name);
-  vat_json_object_add_uint (node, "virtio_net_hdr_sz",
-			    ntohl (mp->virtio_net_hdr_sz));
-  vat_json_object_add_uint (node, "features",
-			    clib_net_to_host_u64 (mp->features));
-  vat_json_object_add_uint (node, "is_server", mp->is_server);
-  vat_json_object_add_string_copy (node, "sock_filename", mp->sock_filename);
-  vat_json_object_add_uint (node, "num_regions", ntohl (mp->num_regions));
-  vat_json_object_add_uint (node, "sock_errno", ntohl (mp->sock_errno));
-}
-
-static int
-api_sw_interface_vhost_user_dump (vat_main_t * vam)
-{
-  vl_api_sw_interface_vhost_user_dump_t *mp;
-  f64 timeout;
-  print (vam->ofp,
-	 "Interface name           idx hdr_sz features server regions filename");
-
-  /* Get list of vhost-user interfaces */
-  M (SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump);
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-static int
-api_show_version (vat_main_t * vam)
-{
-  vl_api_show_version_t *mp;
-  f64 timeout;
-
-  M (SHOW_VERSION, show_version);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-
-static int
-api_vxlan_gpe_add_del_tunnel (vat_main_t * vam)
-{
-  unformat_input_t *line_input = vam->input;
-  vl_api_vxlan_gpe_add_del_tunnel_t *mp;
-  f64 timeout;
-  ip4_address_t local4, remote4;
-  ip6_address_t local6, remote6;
-  u8 is_add = 1;
-  u8 ipv4_set = 0, ipv6_set = 0;
-  u8 local_set = 0;
-  u8 remote_set = 0;
-  u32 encap_vrf_id = 0;
-  u32 decap_vrf_id = 0;
-  u8 protocol = ~0;
-  u32 vni;
-  u8 vni_set = 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "del"))
-	is_add = 0;
-      else if (unformat (line_input, "local %U",
-			 unformat_ip4_address, &local4))
-	{
-	  local_set = 1;
-	  ipv4_set = 1;
-	}
-      else if (unformat (line_input, "remote %U",
-			 unformat_ip4_address, &remote4))
-	{
-	  remote_set = 1;
-	  ipv4_set = 1;
-	}
-      else if (unformat (line_input, "local %U",
-			 unformat_ip6_address, &local6))
-	{
-	  local_set = 1;
-	  ipv6_set = 1;
-	}
-      else if (unformat (line_input, "remote %U",
-			 unformat_ip6_address, &remote6))
-	{
-	  remote_set = 1;
-	  ipv6_set = 1;
-	}
-      else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
-	;
-      else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id))
-	;
-      else if (unformat (line_input, "vni %d", &vni))
-	vni_set = 1;
-      else if (unformat (line_input, "next-ip4"))
-	protocol = 1;
-      else if (unformat (line_input, "next-ip6"))
-	protocol = 2;
-      else if (unformat (line_input, "next-ethernet"))
-	protocol = 3;
-      else if (unformat (line_input, "next-nsh"))
-	protocol = 4;
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, line_input);
-	  return -99;
-	}
-    }
-
-  if (local_set == 0)
-    {
-      errmsg ("tunnel local address not specified");
-      return -99;
-    }
-  if (remote_set == 0)
-    {
-      errmsg ("tunnel remote address not specified");
-      return -99;
-    }
-  if (ipv4_set && ipv6_set)
-    {
-      errmsg ("both IPv4 and IPv6 addresses specified");
-      return -99;
-    }
-
-  if (vni_set == 0)
-    {
-      errmsg ("vni not specified");
-      return -99;
-    }
-
-  M (VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel);
-
-
-  if (ipv6_set)
-    {
-      clib_memcpy (&mp->local, &local6, sizeof (local6));
-      clib_memcpy (&mp->remote, &remote6, sizeof (remote6));
-    }
-  else
-    {
-      clib_memcpy (&mp->local, &local4, sizeof (local4));
-      clib_memcpy (&mp->remote, &remote4, sizeof (remote4));
-    }
-
-  mp->encap_vrf_id = ntohl (encap_vrf_id);
-  mp->decap_vrf_id = ntohl (decap_vrf_id);
-  mp->protocol = protocol;
-  mp->vni = ntohl (vni);
-  mp->is_add = is_add;
-  mp->is_ipv6 = ipv6_set;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static void vl_api_vxlan_gpe_tunnel_details_t_handler
-  (vl_api_vxlan_gpe_tunnel_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "%11d%24U%24U%13d%12d%14d%14d",
-	 ntohl (mp->sw_if_index),
-	 format_ip46_address, &(mp->local[0]),
-	 format_ip46_address, &(mp->remote[0]),
-	 ntohl (mp->vni),
-	 ntohl (mp->protocol),
-	 ntohl (mp->encap_vrf_id), ntohl (mp->decap_vrf_id));
-}
-
-static void vl_api_vxlan_gpe_tunnel_details_t_handler_json
-  (vl_api_vxlan_gpe_tunnel_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-  struct in_addr ip4;
-  struct in6_addr ip6;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
-  if (mp->is_ipv6)
-    {
-      clib_memcpy (&ip6, &(mp->local[0]), sizeof (ip6));
-      vat_json_object_add_ip6 (node, "local", ip6);
-      clib_memcpy (&ip6, &(mp->remote[0]), sizeof (ip6));
-      vat_json_object_add_ip6 (node, "remote", ip6);
-    }
-  else
-    {
-      clib_memcpy (&ip4, &(mp->local[0]), sizeof (ip4));
-      vat_json_object_add_ip4 (node, "local", ip4);
-      clib_memcpy (&ip4, &(mp->remote[0]), sizeof (ip4));
-      vat_json_object_add_ip4 (node, "remote", ip4);
-    }
-  vat_json_object_add_uint (node, "vni", ntohl (mp->vni));
-  vat_json_object_add_uint (node, "protocol", ntohl (mp->protocol));
-  vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id));
-  vat_json_object_add_uint (node, "decap_vrf_id", ntohl (mp->decap_vrf_id));
-  vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0);
-}
-
-static int
-api_vxlan_gpe_tunnel_dump (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_vxlan_gpe_tunnel_dump_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      sw_if_index = ~0;
-    }
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%11s%24s%24s%13s%15s%14s%14s",
-	     "sw_if_index", "local", "remote", "vni",
-	     "protocol", "encap_vrf_id", "decap_vrf_id");
-    }
-
-  /* Get list of vxlan-tunnel interfaces */
-  M (VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump);
-
-  mp->sw_if_index = htonl (sw_if_index);
-
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-u8 *
-format_l2_fib_mac_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-
-  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
-		 a[2], a[3], a[4], a[5], a[6], a[7]);
-}
-
-static void vl_api_l2_fib_table_entry_t_handler
-  (vl_api_l2_fib_table_entry_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "%3" PRIu32 "    %U    %3" PRIu32
-	 "       %d       %d     %d",
-	 ntohl (mp->bd_id), format_l2_fib_mac_address, &mp->mac,
-	 ntohl (mp->sw_if_index), mp->static_mac, mp->filter_mac,
-	 mp->bvi_mac);
-}
-
-static void vl_api_l2_fib_table_entry_t_handler_json
-  (vl_api_l2_fib_table_entry_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id));
-  vat_json_object_add_uint (node, "mac", clib_net_to_host_u64 (mp->mac));
-  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
-  vat_json_object_add_uint (node, "static_mac", mp->static_mac);
-  vat_json_object_add_uint (node, "filter_mac", mp->filter_mac);
-  vat_json_object_add_uint (node, "bvi_mac", mp->bvi_mac);
-}
-
-static int
-api_l2_fib_table_dump (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_l2_fib_table_dump_t *mp;
-  f64 timeout;
-  u32 bd_id;
-  u8 bd_id_set = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "bd_id %d", &bd_id))
-	bd_id_set = 1;
-      else
-	break;
-    }
-
-  if (bd_id_set == 0)
-    {
-      errmsg ("missing bridge domain");
-      return -99;
-    }
-
-  print (vam->ofp, "BD-ID     Mac Address      sw-ndx  Static  Filter  BVI");
-
-  /* Get list of l2 fib entries */
-  M (L2_FIB_TABLE_DUMP, l2_fib_table_dump);
-
-  mp->bd_id = ntohl (bd_id);
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-
-static int
-api_interface_name_renumber (vat_main_t * vam)
-{
-  unformat_input_t *line_input = vam->input;
-  vl_api_interface_name_renumber_t *mp;
-  u32 sw_if_index = ~0;
-  f64 timeout;
-  u32 new_show_dev_instance = ~0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "%U", api_unformat_sw_if_index, vam,
-		    &sw_if_index))
-	;
-      else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
-	;
-      else if (unformat (line_input, "new_show_dev_instance %d",
-			 &new_show_dev_instance))
-	;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  if (new_show_dev_instance == ~0)
-    {
-      errmsg ("missing new_show_dev_instance");
-      return -99;
-    }
-
-  M (INTERFACE_NAME_RENUMBER, interface_name_renumber);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->new_show_dev_instance = ntohl (new_show_dev_instance);
-
-  S;
-  W;
-}
-
-static int
-api_want_ip4_arp_events (vat_main_t * vam)
-{
-  unformat_input_t *line_input = vam->input;
-  vl_api_want_ip4_arp_events_t *mp;
-  f64 timeout;
-  ip4_address_t address;
-  int address_set = 0;
-  u32 enable_disable = 1;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "address %U", unformat_ip4_address, &address))
-	address_set = 1;
-      else if (unformat (line_input, "del"))
-	enable_disable = 0;
-      else
-	break;
-    }
-
-  if (address_set == 0)
-    {
-      errmsg ("missing addresses");
-      return -99;
-    }
-
-  M (WANT_IP4_ARP_EVENTS, want_ip4_arp_events);
-  mp->enable_disable = enable_disable;
-  mp->pid = getpid ();
-  mp->address = address.as_u32;
-
-  S;
-  W;
-}
-
-static int
-api_want_ip6_nd_events (vat_main_t * vam)
-{
-  unformat_input_t *line_input = vam->input;
-  vl_api_want_ip6_nd_events_t *mp;
-  f64 timeout;
-  ip6_address_t address;
-  int address_set = 0;
-  u32 enable_disable = 1;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "address %U", unformat_ip6_address, &address))
-	address_set = 1;
-      else if (unformat (line_input, "del"))
-	enable_disable = 0;
-      else
-	break;
-    }
-
-  if (address_set == 0)
-    {
-      errmsg ("missing addresses");
-      return -99;
-    }
-
-  M (WANT_IP6_ND_EVENTS, want_ip6_nd_events);
-  mp->enable_disable = enable_disable;
-  mp->pid = getpid ();
-  clib_memcpy (mp->address, &address, sizeof (ip6_address_t));
-
-  S;
-  W;
-}
-
-static int
-api_input_acl_set_interface (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_input_acl_set_interface_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  int sw_if_index_set;
-  u32 ip4_table_index = ~0;
-  u32 ip6_table_index = ~0;
-  u32 l2_table_index = ~0;
-  u8 is_add = 1;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "ip4-table %d", &ip4_table_index))
-	;
-      else if (unformat (i, "ip6-table %d", &ip6_table_index))
-	;
-      else if (unformat (i, "l2-table %d", &l2_table_index))
-	;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  M (INPUT_ACL_SET_INTERFACE, input_acl_set_interface);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->ip4_table_index = ntohl (ip4_table_index);
-  mp->ip6_table_index = ntohl (ip6_table_index);
-  mp->l2_table_index = ntohl (l2_table_index);
-  mp->is_add = is_add;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_ip_address_dump (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ip_address_dump_t *mp;
-  u32 sw_if_index = ~0;
-  u8 sw_if_index_set = 0;
-  u8 ipv4_set = 0;
-  u8 ipv6_set = 0;
-  f64 timeout;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else
-	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "ipv4"))
-	ipv4_set = 1;
-      else if (unformat (i, "ipv6"))
-	ipv6_set = 1;
-      else
-	break;
-    }
-
-  if (ipv4_set && ipv6_set)
-    {
-      errmsg ("ipv4 and ipv6 flags cannot be both set");
-      return -99;
-    }
-
-  if ((!ipv4_set) && (!ipv6_set))
-    {
-      errmsg ("no ipv4 nor ipv6 flag set");
-      return -99;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  vam->current_sw_if_index = sw_if_index;
-  vam->is_ipv6 = ipv6_set;
-
-  M (IP_ADDRESS_DUMP, ip_address_dump);
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->is_ipv6 = ipv6_set;
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-static int
-api_ip_dump (vat_main_t * vam)
-{
-  vl_api_ip_dump_t *mp;
-  unformat_input_t *in = vam->input;
-  int ipv4_set = 0;
-  int ipv6_set = 0;
-  int is_ipv6;
-  f64 timeout;
-  int i;
-
-  while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (in, "ipv4"))
-	ipv4_set = 1;
-      else if (unformat (in, "ipv6"))
-	ipv6_set = 1;
-      else
-	break;
-    }
-
-  if (ipv4_set && ipv6_set)
-    {
-      errmsg ("ipv4 and ipv6 flags cannot be both set");
-      return -99;
-    }
-
-  if ((!ipv4_set) && (!ipv6_set))
-    {
-      errmsg ("no ipv4 nor ipv6 flag set");
-      return -99;
-    }
-
-  is_ipv6 = ipv6_set;
-  vam->is_ipv6 = is_ipv6;
-
-  /* free old data */
-  for (i = 0; i < vec_len (vam->ip_details_by_sw_if_index[is_ipv6]); i++)
-    {
-      vec_free (vam->ip_details_by_sw_if_index[is_ipv6][i].addr);
-    }
-  vec_free (vam->ip_details_by_sw_if_index[is_ipv6]);
-
-  M (IP_DUMP, ip_dump);
-  mp->is_ipv6 = ipv6_set;
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-static int
-api_ipsec_spd_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ipsec_spd_add_del_t *mp;
-  f64 timeout;
-  u32 spd_id = ~0;
-  u8 is_add = 1;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "spd_id %d", &spd_id))
-	;
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-  if (spd_id == ~0)
-    {
-      errmsg ("spd_id must be set");
-      return -99;
-    }
-
-  M (IPSEC_SPD_ADD_DEL, ipsec_spd_add_del);
-
-  mp->spd_id = ntohl (spd_id);
-  mp->is_add = is_add;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_ipsec_interface_add_del_spd (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ipsec_interface_add_del_spd_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u32 spd_id = (u32) ~ 0;
-  u8 is_add = 1;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "spd_id %d", &spd_id))
-	;
-      else
-	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-
-    }
-
-  if (spd_id == (u32) ~ 0)
-    {
-      errmsg ("spd_id must be set");
-      return -99;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  M (IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd);
-
-  mp->spd_id = ntohl (spd_id);
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->is_add = is_add;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_ipsec_spd_add_del_entry (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ipsec_spd_add_del_entry_t *mp;
-  f64 timeout;
-  u8 is_add = 1, is_outbound = 0, is_ipv6 = 0, is_ip_any = 1;
-  u32 spd_id = 0, sa_id = 0, protocol = 0, policy = 0;
-  i32 priority = 0;
-  u32 rport_start = 0, rport_stop = (u32) ~ 0;
-  u32 lport_start = 0, lport_stop = (u32) ~ 0;
-  ip4_address_t laddr4_start, laddr4_stop, raddr4_start, raddr4_stop;
-  ip6_address_t laddr6_start, laddr6_stop, raddr6_start, raddr6_stop;
-
-  laddr4_start.as_u32 = raddr4_start.as_u32 = 0;
-  laddr4_stop.as_u32 = raddr4_stop.as_u32 = (u32) ~ 0;
-  laddr6_start.as_u64[0] = raddr6_start.as_u64[0] = 0;
-  laddr6_start.as_u64[1] = raddr6_start.as_u64[1] = 0;
-  laddr6_stop.as_u64[0] = raddr6_stop.as_u64[0] = (u64) ~ 0;
-  laddr6_stop.as_u64[1] = raddr6_stop.as_u64[1] = (u64) ~ 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "del"))
-	is_add = 0;
-      if (unformat (i, "outbound"))
-	is_outbound = 1;
-      if (unformat (i, "inbound"))
-	is_outbound = 0;
-      else if (unformat (i, "spd_id %d", &spd_id))
-	;
-      else if (unformat (i, "sa_id %d", &sa_id))
-	;
-      else if (unformat (i, "priority %d", &priority))
-	;
-      else if (unformat (i, "protocol %d", &protocol))
-	;
-      else if (unformat (i, "lport_start %d", &lport_start))
-	;
-      else if (unformat (i, "lport_stop %d", &lport_stop))
-	;
-      else if (unformat (i, "rport_start %d", &rport_start))
-	;
-      else if (unformat (i, "rport_stop %d", &rport_stop))
-	;
-      else
-	if (unformat
-	    (i, "laddr_start %U", unformat_ip4_address, &laddr4_start))
-	{
-	  is_ipv6 = 0;
-	  is_ip_any = 0;
-	}
-      else
-	if (unformat (i, "laddr_stop %U", unformat_ip4_address, &laddr4_stop))
-	{
-	  is_ipv6 = 0;
-	  is_ip_any = 0;
-	}
-      else
-	if (unformat
-	    (i, "raddr_start %U", unformat_ip4_address, &raddr4_start))
-	{
-	  is_ipv6 = 0;
-	  is_ip_any = 0;
-	}
-      else
-	if (unformat (i, "raddr_stop %U", unformat_ip4_address, &raddr4_stop))
-	{
-	  is_ipv6 = 0;
-	  is_ip_any = 0;
-	}
-      else
-	if (unformat
-	    (i, "laddr_start %U", unformat_ip6_address, &laddr6_start))
-	{
-	  is_ipv6 = 1;
-	  is_ip_any = 0;
-	}
-      else
-	if (unformat (i, "laddr_stop %U", unformat_ip6_address, &laddr6_stop))
-	{
-	  is_ipv6 = 1;
-	  is_ip_any = 0;
-	}
-      else
-	if (unformat
-	    (i, "raddr_start %U", unformat_ip6_address, &raddr6_start))
-	{
-	  is_ipv6 = 1;
-	  is_ip_any = 0;
-	}
-      else
-	if (unformat (i, "raddr_stop %U", unformat_ip6_address, &raddr6_stop))
-	{
-	  is_ipv6 = 1;
-	  is_ip_any = 0;
-	}
-      else
-	if (unformat (i, "action %U", unformat_ipsec_policy_action, &policy))
-	{
-	  if (policy == IPSEC_POLICY_ACTION_RESOLVE)
-	    {
-	      clib_warning ("unsupported action: 'resolve'");
-	      return -99;
-	    }
-	}
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-
-    }
-
-  M (IPSEC_SPD_ADD_DEL_ENTRY, ipsec_spd_add_del_entry);
-
-  mp->spd_id = ntohl (spd_id);
-  mp->priority = ntohl (priority);
-  mp->is_outbound = is_outbound;
-
-  mp->is_ipv6 = is_ipv6;
-  if (is_ipv6 || is_ip_any)
-    {
-      clib_memcpy (mp->remote_address_start, &raddr6_start,
-		   sizeof (ip6_address_t));
-      clib_memcpy (mp->remote_address_stop, &raddr6_stop,
-		   sizeof (ip6_address_t));
-      clib_memcpy (mp->local_address_start, &laddr6_start,
-		   sizeof (ip6_address_t));
-      clib_memcpy (mp->local_address_stop, &laddr6_stop,
-		   sizeof (ip6_address_t));
-    }
-  else
-    {
-      clib_memcpy (mp->remote_address_start, &raddr4_start,
-		   sizeof (ip4_address_t));
-      clib_memcpy (mp->remote_address_stop, &raddr4_stop,
-		   sizeof (ip4_address_t));
-      clib_memcpy (mp->local_address_start, &laddr4_start,
-		   sizeof (ip4_address_t));
-      clib_memcpy (mp->local_address_stop, &laddr4_stop,
-		   sizeof (ip4_address_t));
-    }
-  mp->protocol = (u8) protocol;
-  mp->local_port_start = ntohs ((u16) lport_start);
-  mp->local_port_stop = ntohs ((u16) lport_stop);
-  mp->remote_port_start = ntohs ((u16) rport_start);
-  mp->remote_port_stop = ntohs ((u16) rport_stop);
-  mp->policy = (u8) policy;
-  mp->sa_id = ntohl (sa_id);
-  mp->is_add = is_add;
-  mp->is_ip_any = is_ip_any;
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_ipsec_sad_add_del_entry (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ipsec_sad_add_del_entry_t *mp;
-  f64 timeout;
-  u32 sad_id = 0, spi = 0;
-  u8 *ck = 0, *ik = 0;
-  u8 is_add = 1;
-
-  u8 protocol = IPSEC_PROTOCOL_AH;
-  u8 is_tunnel = 0, is_tunnel_ipv6 = 0;
-  u32 crypto_alg = 0, integ_alg = 0;
-  ip4_address_t tun_src4;
-  ip4_address_t tun_dst4;
-  ip6_address_t tun_src6;
-  ip6_address_t tun_dst6;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "sad_id %d", &sad_id))
-	;
-      else if (unformat (i, "spi %d", &spi))
-	;
-      else if (unformat (i, "esp"))
-	protocol = IPSEC_PROTOCOL_ESP;
-      else if (unformat (i, "tunnel_src %U", unformat_ip4_address, &tun_src4))
-	{
-	  is_tunnel = 1;
-	  is_tunnel_ipv6 = 0;
-	}
-      else if (unformat (i, "tunnel_dst %U", unformat_ip4_address, &tun_dst4))
-	{
-	  is_tunnel = 1;
-	  is_tunnel_ipv6 = 0;
-	}
-      else if (unformat (i, "tunnel_src %U", unformat_ip6_address, &tun_src6))
-	{
-	  is_tunnel = 1;
-	  is_tunnel_ipv6 = 1;
-	}
-      else if (unformat (i, "tunnel_dst %U", unformat_ip6_address, &tun_dst6))
-	{
-	  is_tunnel = 1;
-	  is_tunnel_ipv6 = 1;
-	}
-      else
-	if (unformat
-	    (i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg))
-	{
-	  if (crypto_alg < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
-	      crypto_alg >= IPSEC_CRYPTO_N_ALG)
-	    {
-	      clib_warning ("unsupported crypto-alg: '%U'",
-			    format_ipsec_crypto_alg, crypto_alg);
-	      return -99;
-	    }
-	}
-      else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
-	;
-      else
-	if (unformat
-	    (i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg))
-	{
-#if DPDK_CRYPTO==1
-	  if (integ_alg < IPSEC_INTEG_ALG_NONE ||
-#else
-	  if (integ_alg < IPSEC_INTEG_ALG_SHA1_96 ||
-#endif
-	      integ_alg >= IPSEC_INTEG_N_ALG)
-	    {
-	      clib_warning ("unsupported integ-alg: '%U'",
-			    format_ipsec_integ_alg, integ_alg);
-	      return -99;
-	    }
-	}
-      else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
-	;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-
-    }
-
-#if DPDK_CRYPTO==1
-  /*Special cases, aes-gcm-128 encryption */
-  if (crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
-    {
-      if (integ_alg != IPSEC_INTEG_ALG_NONE
-	  && integ_alg != IPSEC_INTEG_ALG_AES_GCM_128)
-	{
-	  clib_warning
-	    ("unsupported: aes-gcm-128 crypto-alg needs none as integ-alg");
-	  return -99;
-	}
-      else			/*set integ-alg internally to aes-gcm-128 */
-	integ_alg = IPSEC_INTEG_ALG_AES_GCM_128;
-    }
-  else if (integ_alg == IPSEC_INTEG_ALG_AES_GCM_128)
-    {
-      clib_warning ("unsupported integ-alg: aes-gcm-128");
-      return -99;
-    }
-  else if (integ_alg == IPSEC_INTEG_ALG_NONE)
-    {
-      clib_warning ("unsupported integ-alg: none");
-      return -99;
-    }
-#endif
-
-
-  M (IPSEC_SAD_ADD_DEL_ENTRY, ipsec_sad_add_del_entry);
-
-  mp->sad_id = ntohl (sad_id);
-  mp->is_add = is_add;
-  mp->protocol = protocol;
-  mp->spi = ntohl (spi);
-  mp->is_tunnel = is_tunnel;
-  mp->is_tunnel_ipv6 = is_tunnel_ipv6;
-  mp->crypto_algorithm = crypto_alg;
-  mp->integrity_algorithm = integ_alg;
-  mp->crypto_key_length = vec_len (ck);
-  mp->integrity_key_length = vec_len (ik);
-
-  if (mp->crypto_key_length > sizeof (mp->crypto_key))
-    mp->crypto_key_length = sizeof (mp->crypto_key);
-
-  if (mp->integrity_key_length > sizeof (mp->integrity_key))
-    mp->integrity_key_length = sizeof (mp->integrity_key);
-
-  if (ck)
-    clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
-  if (ik)
-    clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
-
-  if (is_tunnel)
-    {
-      if (is_tunnel_ipv6)
-	{
-	  clib_memcpy (mp->tunnel_src_address, &tun_src6,
-		       sizeof (ip6_address_t));
-	  clib_memcpy (mp->tunnel_dst_address, &tun_dst6,
-		       sizeof (ip6_address_t));
-	}
-      else
-	{
-	  clib_memcpy (mp->tunnel_src_address, &tun_src4,
-		       sizeof (ip4_address_t));
-	  clib_memcpy (mp->tunnel_dst_address, &tun_dst4,
-		       sizeof (ip4_address_t));
-	}
-    }
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_ipsec_sa_set_key (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ipsec_sa_set_key_t *mp;
-  f64 timeout;
-  u32 sa_id;
-  u8 *ck = 0, *ik = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "sa_id %d", &sa_id))
-	;
-      else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
-	;
-      else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
-	;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  M (IPSEC_SA_SET_KEY, ipsec_set_sa_key);
-
-  mp->sa_id = ntohl (sa_id);
-  mp->crypto_key_length = vec_len (ck);
-  mp->integrity_key_length = vec_len (ik);
-
-  if (mp->crypto_key_length > sizeof (mp->crypto_key))
-    mp->crypto_key_length = sizeof (mp->crypto_key);
-
-  if (mp->integrity_key_length > sizeof (mp->integrity_key))
-    mp->integrity_key_length = sizeof (mp->integrity_key);
-
-  if (ck)
-    clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
-  if (ik)
-    clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_ikev2_profile_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ikev2_profile_add_del_t *mp;
-  f64 timeout;
-  u8 is_add = 1;
-  u8 *name = 0;
-
-  const char *valid_chars = "a-zA-Z0-9_";
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "name %U", unformat_token, valid_chars, &name))
-	vec_add1 (name, 0);
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (!vec_len (name))
-    {
-      errmsg ("profile name must be specified");
-      return -99;
-    }
-
-  if (vec_len (name) > 64)
-    {
-      errmsg ("profile name too long");
-      return -99;
-    }
-
-  M (IKEV2_PROFILE_ADD_DEL, ikev2_profile_add_del);
-
-  clib_memcpy (mp->name, name, vec_len (name));
-  mp->is_add = is_add;
-  vec_free (name);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_ikev2_profile_set_auth (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ikev2_profile_set_auth_t *mp;
-  f64 timeout;
-  u8 *name = 0;
-  u8 *data = 0;
-  u32 auth_method = 0;
-  u8 is_hex = 0;
-
-  const char *valid_chars = "a-zA-Z0-9_";
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "name %U", unformat_token, valid_chars, &name))
-	vec_add1 (name, 0);
-      else if (unformat (i, "auth_method %U",
-			 unformat_ikev2_auth_method, &auth_method))
-	;
-      else if (unformat (i, "auth_data 0x%U", unformat_hex_string, &data))
-	is_hex = 1;
-      else if (unformat (i, "auth_data %v", &data))
-	;
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (!vec_len (name))
-    {
-      errmsg ("profile name must be specified");
-      return -99;
-    }
-
-  if (vec_len (name) > 64)
-    {
-      errmsg ("profile name too long");
-      return -99;
-    }
-
-  if (!vec_len (data))
-    {
-      errmsg ("auth_data must be specified");
-      return -99;
-    }
-
-  if (!auth_method)
-    {
-      errmsg ("auth_method must be specified");
-      return -99;
-    }
-
-  M (IKEV2_PROFILE_SET_AUTH, ikev2_profile_set_auth);
-
-  mp->is_hex = is_hex;
-  mp->auth_method = (u8) auth_method;
-  mp->data_len = vec_len (data);
-  clib_memcpy (mp->name, name, vec_len (name));
-  clib_memcpy (mp->data, data, vec_len (data));
-  vec_free (name);
-  vec_free (data);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_ikev2_profile_set_id (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ikev2_profile_set_id_t *mp;
-  f64 timeout;
-  u8 *name = 0;
-  u8 *data = 0;
-  u8 is_local = 0;
-  u32 id_type = 0;
-  ip4_address_t ip4;
-
-  const char *valid_chars = "a-zA-Z0-9_";
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "name %U", unformat_token, valid_chars, &name))
-	vec_add1 (name, 0);
-      else if (unformat (i, "id_type %U", unformat_ikev2_id_type, &id_type))
-	;
-      else if (unformat (i, "id_data %U", unformat_ip4_address, &ip4))
-	{
-	  data = vec_new (u8, 4);
-	  clib_memcpy (data, ip4.as_u8, 4);
-	}
-      else if (unformat (i, "id_data 0x%U", unformat_hex_string, &data))
-	;
-      else if (unformat (i, "id_data %v", &data))
-	;
-      else if (unformat (i, "local"))
-	is_local = 1;
-      else if (unformat (i, "remote"))
-	is_local = 0;
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (!vec_len (name))
-    {
-      errmsg ("profile name must be specified");
-      return -99;
-    }
-
-  if (vec_len (name) > 64)
-    {
-      errmsg ("profile name too long");
-      return -99;
-    }
-
-  if (!vec_len (data))
-    {
-      errmsg ("id_data must be specified");
-      return -99;
-    }
-
-  if (!id_type)
-    {
-      errmsg ("id_type must be specified");
-      return -99;
-    }
-
-  M (IKEV2_PROFILE_SET_ID, ikev2_profile_set_id);
-
-  mp->is_local = is_local;
-  mp->id_type = (u8) id_type;
-  mp->data_len = vec_len (data);
-  clib_memcpy (mp->name, name, vec_len (name));
-  clib_memcpy (mp->data, data, vec_len (data));
-  vec_free (name);
-  vec_free (data);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_ikev2_profile_set_ts (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ikev2_profile_set_ts_t *mp;
-  f64 timeout;
-  u8 *name = 0;
-  u8 is_local = 0;
-  u32 proto = 0, start_port = 0, end_port = (u32) ~ 0;
-  ip4_address_t start_addr, end_addr;
-
-  const char *valid_chars = "a-zA-Z0-9_";
-
-  start_addr.as_u32 = 0;
-  end_addr.as_u32 = (u32) ~ 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "name %U", unformat_token, valid_chars, &name))
-	vec_add1 (name, 0);
-      else if (unformat (i, "protocol %d", &proto))
-	;
-      else if (unformat (i, "start_port %d", &start_port))
-	;
-      else if (unformat (i, "end_port %d", &end_port))
-	;
-      else
-	if (unformat (i, "start_addr %U", unformat_ip4_address, &start_addr))
-	;
-      else if (unformat (i, "end_addr %U", unformat_ip4_address, &end_addr))
-	;
-      else if (unformat (i, "local"))
-	is_local = 1;
-      else if (unformat (i, "remote"))
-	is_local = 0;
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (!vec_len (name))
-    {
-      errmsg ("profile name must be specified");
-      return -99;
-    }
-
-  if (vec_len (name) > 64)
-    {
-      errmsg ("profile name too long");
-      return -99;
-    }
-
-  M (IKEV2_PROFILE_SET_TS, ikev2_profile_set_ts);
-
-  mp->is_local = is_local;
-  mp->proto = (u8) proto;
-  mp->start_port = (u16) start_port;
-  mp->end_port = (u16) end_port;
-  mp->start_addr = start_addr.as_u32;
-  mp->end_addr = end_addr.as_u32;
-  clib_memcpy (mp->name, name, vec_len (name));
-  vec_free (name);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_ikev2_set_local_key (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ikev2_set_local_key_t *mp;
-  f64 timeout;
-  u8 *file = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "file %v", &file))
-	vec_add1 (file, 0);
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (!vec_len (file))
-    {
-      errmsg ("RSA key file must be specified");
-      return -99;
-    }
-
-  if (vec_len (file) > 256)
-    {
-      errmsg ("file name too long");
-      return -99;
-    }
-
-  M (IKEV2_SET_LOCAL_KEY, ikev2_set_local_key);
-
-  clib_memcpy (mp->key_file, file, vec_len (file));
-  vec_free (file);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-/*
- * MAP
- */
-static int
-api_map_add_domain (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_map_add_domain_t *mp;
-  f64 timeout;
-
-  ip4_address_t ip4_prefix;
-  ip6_address_t ip6_prefix;
-  ip6_address_t ip6_src;
-  u32 num_m_args = 0;
-  u32 ip6_prefix_len = 0, ip4_prefix_len = 0, ea_bits_len = 0, psid_offset =
-    0, psid_length = 0;
-  u8 is_translation = 0;
-  u32 mtu = 0;
-  u32 ip6_src_len = 128;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "ip4-pfx %U/%d", unformat_ip4_address,
-		    &ip4_prefix, &ip4_prefix_len))
-	num_m_args++;
-      else if (unformat (i, "ip6-pfx %U/%d", unformat_ip6_address,
-			 &ip6_prefix, &ip6_prefix_len))
-	num_m_args++;
-      else
-	if (unformat
-	    (i, "ip6-src %U/%d", unformat_ip6_address, &ip6_src,
-	     &ip6_src_len))
-	num_m_args++;
-      else if (unformat (i, "ip6-src %U", unformat_ip6_address, &ip6_src))
-	num_m_args++;
-      else if (unformat (i, "ea-bits-len %d", &ea_bits_len))
-	num_m_args++;
-      else if (unformat (i, "psid-offset %d", &psid_offset))
-	num_m_args++;
-      else if (unformat (i, "psid-len %d", &psid_length))
-	num_m_args++;
-      else if (unformat (i, "mtu %d", &mtu))
-	num_m_args++;
-      else if (unformat (i, "map-t"))
-	is_translation = 1;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (num_m_args < 3)
-    {
-      errmsg ("mandatory argument(s) missing");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (MAP_ADD_DOMAIN, map_add_domain);
-
-  clib_memcpy (mp->ip4_prefix, &ip4_prefix, sizeof (ip4_prefix));
-  mp->ip4_prefix_len = ip4_prefix_len;
-
-  clib_memcpy (mp->ip6_prefix, &ip6_prefix, sizeof (ip6_prefix));
-  mp->ip6_prefix_len = ip6_prefix_len;
-
-  clib_memcpy (mp->ip6_src, &ip6_src, sizeof (ip6_src));
-  mp->ip6_src_prefix_len = ip6_src_len;
-
-  mp->ea_bits_len = ea_bits_len;
-  mp->psid_offset = psid_offset;
-  mp->psid_length = psid_length;
-  mp->is_translation = is_translation;
-  mp->mtu = htons (mtu);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply, return good/bad news  */
-  W;
-}
-
-static int
-api_map_del_domain (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_map_del_domain_t *mp;
-  f64 timeout;
-
-  u32 num_m_args = 0;
-  u32 index;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "index %d", &index))
-	num_m_args++;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (num_m_args != 1)
-    {
-      errmsg ("mandatory argument(s) missing");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (MAP_DEL_DOMAIN, map_del_domain);
-
-  mp->index = ntohl (index);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply, return good/bad news  */
-  W;
-}
-
-static int
-api_map_add_del_rule (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_map_add_del_rule_t *mp;
-  f64 timeout;
-  u8 is_add = 1;
-  ip6_address_t ip6_dst;
-  u32 num_m_args = 0, index, psid = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "index %d", &index))
-	num_m_args++;
-      else if (unformat (i, "psid %d", &psid))
-	num_m_args++;
-      else if (unformat (i, "dst %U", unformat_ip6_address, &ip6_dst))
-	num_m_args++;
-      else if (unformat (i, "del"))
-	{
-	  is_add = 0;
-	}
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  /* Construct the API message */
-  M (MAP_ADD_DEL_RULE, map_add_del_rule);
-
-  mp->index = ntohl (index);
-  mp->is_add = is_add;
-  clib_memcpy (mp->ip6_dst, &ip6_dst, sizeof (ip6_dst));
-  mp->psid = ntohs (psid);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply, return good/bad news  */
-  W;
-}
-
-static int
-api_map_domain_dump (vat_main_t * vam)
-{
-  vl_api_map_domain_dump_t *mp;
-  f64 timeout;
-
-  /* Construct the API message */
-  M (MAP_DOMAIN_DUMP, map_domain_dump);
-
-  /* send it... */
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-static int
-api_map_rule_dump (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_map_rule_dump_t *mp;
-  f64 timeout;
-  u32 domain_index = ~0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "index %u", &domain_index))
-	;
-      else
-	break;
-    }
-
-  if (domain_index == ~0)
-    {
-      clib_warning ("parse error: domain index expected");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (MAP_RULE_DUMP, map_rule_dump);
-
-  mp->domain_index = htonl (domain_index);
-
-  /* send it... */
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-static void vl_api_map_add_domain_reply_t_handler
-  (vl_api_map_add_domain_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_map_add_domain_reply_t_handler_json
-  (vl_api_map_add_domain_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "index", ntohl (mp->index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
-static int
-api_get_first_msg_id (vat_main_t * vam)
-{
-  vl_api_get_first_msg_id_t *mp;
-  f64 timeout;
-  unformat_input_t *i = vam->input;
-  u8 *name;
-  u8 name_set = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "client %s", &name))
-	name_set = 1;
-      else
-	break;
-    }
-
-  if (name_set == 0)
-    {
-      errmsg ("missing client name");
-      return -99;
-    }
-  vec_add1 (name, 0);
-
-  if (vec_len (name) > 63)
-    {
-      errmsg ("client name too long");
-      return -99;
-    }
-
-  M (GET_FIRST_MSG_ID, get_first_msg_id);
-  clib_memcpy (mp->name, name, vec_len (name));
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_cop_interface_enable_disable (vat_main_t * vam)
-{
-  unformat_input_t *line_input = vam->input;
-  vl_api_cop_interface_enable_disable_t *mp;
-  f64 timeout;
-  u32 sw_if_index = ~0;
-  u8 enable_disable = 1;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "disable"))
-	enable_disable = 0;
-      if (unformat (line_input, "enable"))
-	enable_disable = 1;
-      else if (unformat (line_input, "%U", api_unformat_sw_if_index,
-			 vam, &sw_if_index))
-	;
-      else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
-	;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable);
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->enable_disable = enable_disable;
-
-  /* send it... */
-  S;
-  /* Wait for the reply */
-  W;
-}
-
-static int
-api_cop_whitelist_enable_disable (vat_main_t * vam)
-{
-  unformat_input_t *line_input = vam->input;
-  vl_api_cop_whitelist_enable_disable_t *mp;
-  f64 timeout;
-  u32 sw_if_index = ~0;
-  u8 ip4 = 0, ip6 = 0, default_cop = 0;
-  u32 fib_id = 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "ip4"))
-	ip4 = 1;
-      else if (unformat (line_input, "ip6"))
-	ip6 = 1;
-      else if (unformat (line_input, "default"))
-	default_cop = 1;
-      else if (unformat (line_input, "%U", api_unformat_sw_if_index,
-			 vam, &sw_if_index))
-	;
-      else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
-	;
-      else if (unformat (line_input, "fib-id %d", &fib_id))
-	;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable);
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->fib_id = ntohl (fib_id);
-  mp->ip4 = ip4;
-  mp->ip6 = ip6;
-  mp->default_cop = default_cop;
-
-  /* send it... */
-  S;
-  /* Wait for the reply */
-  W;
-}
-
-static int
-api_get_node_graph (vat_main_t * vam)
-{
-  vl_api_get_node_graph_t *mp;
-  f64 timeout;
-
-  M (GET_NODE_GRAPH, get_node_graph);
-
-  /* send it... */
-  S;
-  /* Wait for the reply */
-  W;
-}
-
-/* *INDENT-OFF* */
-/** Used for parsing LISP eids */
-typedef CLIB_PACKED(struct{
-  u8 addr[16];   /**< eid address */
-  u32 len;       /**< prefix length if IP */
-  u8 type;      /**< type of eid */
-}) lisp_eid_vat_t;
-/* *INDENT-ON* */
-
-static uword
-unformat_lisp_eid_vat (unformat_input_t * input, va_list * args)
-{
-  lisp_eid_vat_t *a = va_arg (*args, lisp_eid_vat_t *);
-
-  memset (a, 0, sizeof (a[0]));
-
-  if (unformat (input, "%U/%d", unformat_ip4_address, a->addr, &a->len))
-    {
-      a->type = 0;		/* ipv4 type */
-    }
-  else if (unformat (input, "%U/%d", unformat_ip6_address, a->addr, &a->len))
-    {
-      a->type = 1;		/* ipv6 type */
-    }
-  else if (unformat (input, "%U", unformat_ethernet_address, a->addr))
-    {
-      a->type = 2;		/* mac type */
-    }
-  else
-    {
-      return 0;
-    }
-
-  if ((a->type == 0 && a->len > 32) || (a->type == 1 && a->len > 128))
-    {
-      return 0;
-    }
-
-  return 1;
-}
-
-static int
-lisp_eid_size_vat (u8 type)
-{
-  switch (type)
-    {
-    case 0:
-      return 4;
-    case 1:
-      return 16;
-    case 2:
-      return 6;
-    }
-  return 0;
-}
-
-static void
-lisp_eid_put_vat (u8 * dst, u8 eid[16], u8 type)
-{
-  clib_memcpy (dst, eid, lisp_eid_size_vat (type));
-}
-
-/* *INDENT-OFF* */
-/** Used for transferring locators via VPP API */
-typedef CLIB_PACKED(struct
-{
-  u32 sw_if_index; /**< locator sw_if_index */
-  u8 priority; /**< locator priority */
-  u8 weight;   /**< locator weight */
-}) ls_locator_t;
-/* *INDENT-ON* */
-
-static int
-api_lisp_add_del_locator_set (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_add_del_locator_set_t *mp;
-  f64 timeout = ~0;
-  u8 is_add = 1;
-  u8 *locator_set_name = NULL;
-  u8 locator_set_name_set = 0;
-  ls_locator_t locator, *locators = 0;
-  u32 sw_if_index, priority, weight;
-  u32 data_len = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	{
-	  is_add = 0;
-	}
-      else if (unformat (input, "locator-set %s", &locator_set_name))
-	{
-	  locator_set_name_set = 1;
-	}
-      else if (unformat (input, "sw_if_index %u p %u w %u",
-			 &sw_if_index, &priority, &weight))
-	{
-	  locator.sw_if_index = htonl (sw_if_index);
-	  locator.priority = priority;
-	  locator.weight = weight;
-	  vec_add1 (locators, locator);
-	}
-      else
-	if (unformat
-	    (input, "iface %U p %u w %u", api_unformat_sw_if_index, vam,
-	     &sw_if_index, &priority, &weight))
-	{
-	  locator.sw_if_index = htonl (sw_if_index);
-	  locator.priority = priority;
-	  locator.weight = weight;
-	  vec_add1 (locators, locator);
-	}
-      else
-	break;
-    }
-
-  if (locator_set_name_set == 0)
-    {
-      errmsg ("missing locator-set name");
-      vec_free (locators);
-      return -99;
-    }
-
-  if (vec_len (locator_set_name) > 64)
-    {
-      errmsg ("locator-set name too long");
-      vec_free (locator_set_name);
-      vec_free (locators);
-      return -99;
-    }
-  vec_add1 (locator_set_name, 0);
-
-  data_len = sizeof (ls_locator_t) * vec_len (locators);
-
-  /* Construct the API message */
-  M2 (LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set, data_len);
-
-  mp->is_add = is_add;
-  clib_memcpy (mp->locator_set_name, locator_set_name,
-	       vec_len (locator_set_name));
-  vec_free (locator_set_name);
-
-  mp->locator_num = clib_host_to_net_u32 (vec_len (locators));
-  if (locators)
-    clib_memcpy (mp->locators, locators, data_len);
-  vec_free (locators);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_add_del_locator (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_add_del_locator_t *mp;
-  f64 timeout = ~0;
-  u32 tmp_if_index = ~0;
-  u32 sw_if_index = ~0;
-  u8 sw_if_index_set = 0;
-  u8 sw_if_index_if_name_set = 0;
-  u32 priority = ~0;
-  u8 priority_set = 0;
-  u32 weight = ~0;
-  u8 weight_set = 0;
-  u8 is_add = 1;
-  u8 *locator_set_name = NULL;
-  u8 locator_set_name_set = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	{
-	  is_add = 0;
-	}
-      else if (unformat (input, "locator-set %s", &locator_set_name))
-	{
-	  locator_set_name_set = 1;
-	}
-      else if (unformat (input, "iface %U", api_unformat_sw_if_index, vam,
-			 &tmp_if_index))
-	{
-	  sw_if_index_if_name_set = 1;
-	  sw_if_index = tmp_if_index;
-	}
-      else if (unformat (input, "sw_if_index %d", &tmp_if_index))
-	{
-	  sw_if_index_set = 1;
-	  sw_if_index = tmp_if_index;
-	}
-      else if (unformat (input, "p %d", &priority))
-	{
-	  priority_set = 1;
-	}
-      else if (unformat (input, "w %d", &weight))
-	{
-	  weight_set = 1;
-	}
-      else
-	break;
-    }
-
-  if (locator_set_name_set == 0)
-    {
-      errmsg ("missing locator-set name");
-      return -99;
-    }
-
-  if (sw_if_index_set == 0 && sw_if_index_if_name_set == 0)
-    {
-      errmsg ("missing sw_if_index");
-      vec_free (locator_set_name);
-      return -99;
-    }
-
-  if (sw_if_index_set != 0 && sw_if_index_if_name_set != 0)
-    {
-      errmsg ("cannot use both params interface name and sw_if_index");
-      vec_free (locator_set_name);
-      return -99;
-    }
-
-  if (priority_set == 0)
-    {
-      errmsg ("missing locator-set priority");
-      vec_free (locator_set_name);
-      return -99;
-    }
-
-  if (weight_set == 0)
-    {
-      errmsg ("missing locator-set weight");
-      vec_free (locator_set_name);
-      return -99;
-    }
-
-  if (vec_len (locator_set_name) > 64)
-    {
-      errmsg ("locator-set name too long");
-      vec_free (locator_set_name);
-      return -99;
-    }
-  vec_add1 (locator_set_name, 0);
-
-  /* Construct the API message */
-  M (LISP_ADD_DEL_LOCATOR, lisp_add_del_locator);
-
-  mp->is_add = is_add;
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->priority = priority;
-  mp->weight = weight;
-  clib_memcpy (mp->locator_set_name, locator_set_name,
-	       vec_len (locator_set_name));
-  vec_free (locator_set_name);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-uword
-unformat_hmac_key_id (unformat_input_t * input, va_list * args)
-{
-  u32 *key_id = va_arg (*args, u32 *);
-  u8 *s = 0;
-
-  if (unformat (input, "%s", &s))
-    {
-      if (!strcmp ((char *) s, "sha1"))
-	key_id[0] = HMAC_SHA_1_96;
-      else if (!strcmp ((char *) s, "sha256"))
-	key_id[0] = HMAC_SHA_256_128;
-      else
-	{
-	  clib_warning ("invalid key_id: '%s'", s);
-	  key_id[0] = HMAC_NO_KEY;
-	}
-    }
-  else
-    return 0;
-
-  vec_free (s);
-  return 1;
-}
-
-static int
-api_lisp_add_del_local_eid (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_add_del_local_eid_t *mp;
-  f64 timeout = ~0;
-  u8 is_add = 1;
-  u8 eid_set = 0;
-  lisp_eid_vat_t _eid, *eid = &_eid;
-  u8 *locator_set_name = 0;
-  u8 locator_set_name_set = 0;
-  u32 vni = 0;
-  u16 key_id = 0;
-  u8 *key = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	{
-	  is_add = 0;
-	}
-      else if (unformat (input, "vni %d", &vni))
-	{
-	  ;
-	}
-      else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid))
-	{
-	  eid_set = 1;
-	}
-      else if (unformat (input, "locator-set %s", &locator_set_name))
-	{
-	  locator_set_name_set = 1;
-	}
-      else if (unformat (input, "key-id %U", unformat_hmac_key_id, &key_id))
-	;
-      else if (unformat (input, "secret-key %_%v%_", &key))
-	;
-      else
-	break;
-    }
-
-  if (locator_set_name_set == 0)
-    {
-      errmsg ("missing locator-set name");
-      return -99;
-    }
-
-  if (0 == eid_set)
-    {
-      errmsg ("EID address not set!");
-      vec_free (locator_set_name);
-      return -99;
-    }
-
-  if (key && (0 == key_id))
-    {
-      errmsg ("invalid key_id!");
-      return -99;
-    }
-
-  if (vec_len (key) > 64)
-    {
-      errmsg ("key too long");
-      vec_free (key);
-      return -99;
-    }
-
-  if (vec_len (locator_set_name) > 64)
-    {
-      errmsg ("locator-set name too long");
-      vec_free (locator_set_name);
-      return -99;
-    }
-  vec_add1 (locator_set_name, 0);
-
-  /* Construct the API message */
-  M (LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid);
-
-  mp->is_add = is_add;
-  lisp_eid_put_vat (mp->eid, eid->addr, eid->type);
-  mp->eid_type = eid->type;
-  mp->prefix_len = eid->len;
-  mp->vni = clib_host_to_net_u32 (vni);
-  mp->key_id = clib_host_to_net_u16 (key_id);
-  clib_memcpy (mp->locator_set_name, locator_set_name,
-	       vec_len (locator_set_name));
-  clib_memcpy (mp->key, key, vec_len (key));
-
-  vec_free (locator_set_name);
-  vec_free (key);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-/* *INDENT-OFF* */
-/** Used for transferring locators via VPP API */
-typedef CLIB_PACKED(struct
-{
-  u8 is_ip4; /**< is locator an IPv4 address? */
-  u8 priority; /**< locator priority */
-  u8 weight;   /**< locator weight */
-  u8 addr[16]; /**< IPv4/IPv6 address */
-}) rloc_t;
-/* *INDENT-ON* */
-
-static int
-api_lisp_gpe_add_del_fwd_entry (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_gpe_add_del_fwd_entry_t *mp;
-  f64 timeout = ~0;
-  u8 is_add = 1;
-  lisp_eid_vat_t _rmt_eid, *rmt_eid = &_rmt_eid;
-  lisp_eid_vat_t _lcl_eid, *lcl_eid = &_lcl_eid;
-  u8 rmt_eid_set = 0, lcl_eid_set = 0;
-  u32 action = ~0, p, w;
-  ip4_address_t rmt_rloc4, lcl_rloc4;
-  ip6_address_t rmt_rloc6, lcl_rloc6;
-  rloc_t *rmt_locs = 0, *lcl_locs = 0, rloc, *curr_rloc = 0;
-
-  memset (&rloc, 0, sizeof (rloc));
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	{
-	  is_add = 0;
-	}
-      else if (unformat (input, "rmt_eid %U", unformat_lisp_eid_vat, rmt_eid))
-	{
-	  rmt_eid_set = 1;
-	}
-      else if (unformat (input, "lcl_eid %U", unformat_lisp_eid_vat, lcl_eid))
-	{
-	  lcl_eid_set = 1;
-	}
-      else if (unformat (input, "p %d w %d", &p, &w))
-	{
-	  if (!curr_rloc)
-	    {
-	      errmsg ("No RLOC configured for setting priority/weight!");
-	      return -99;
-	    }
-	  curr_rloc->priority = p;
-	  curr_rloc->weight = w;
-	}
-      else if (unformat (input, "loc-pair %U %U", unformat_ip4_address,
-			 &lcl_rloc4, unformat_ip4_address, &rmt_rloc4))
-	{
-	  rloc.is_ip4 = 1;
-
-	  clib_memcpy (&rloc.addr, &lcl_rloc4, sizeof (lcl_rloc4));
-	  rloc.priority = rloc.weight = 0;
-	  vec_add1 (lcl_locs, rloc);
-
-	  clib_memcpy (&rloc.addr, &rmt_rloc4, sizeof (rmt_rloc4));
-	  vec_add1 (rmt_locs, rloc);
-	  /* priority and weight saved in rmt loc */
-	  curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1];
-	}
-      else if (unformat (input, "loc-pair %U %U", unformat_ip6_address,
-			 &lcl_rloc6, unformat_ip6_address, &rmt_rloc6))
-	{
-	  rloc.is_ip4 = 0;
-	  clib_memcpy (&rloc.addr, &lcl_rloc6, sizeof (lcl_rloc6));
-	  rloc.priority = rloc.weight = 0;
-	  vec_add1 (lcl_locs, rloc);
-
-	  clib_memcpy (&rloc.addr, &rmt_rloc6, sizeof (rmt_rloc6));
-	  vec_add1 (rmt_locs, rloc);
-	  /* priority and weight saved in rmt loc */
-	  curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1];
-	}
-      else if (unformat (input, "action %d", &action))
-	{
-	  ;
-	}
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, input);
-	  return -99;
-	}
-    }
-
-  if (!rmt_eid_set)
-    {
-      errmsg ("remote eid addresses not set");
-      return -99;
-    }
-
-  if (lcl_eid_set && rmt_eid->type != lcl_eid->type)
-    {
-      errmsg ("eid types don't match");
-      return -99;
-    }
-
-  if (0 == rmt_locs && (u32) ~ 0 == action)
-    {
-      errmsg ("action not set for negative mapping");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry);
-
-  mp->is_add = is_add;
-  lisp_eid_put_vat (mp->rmt_eid, rmt_eid->addr, rmt_eid->type);
-  lisp_eid_put_vat (mp->lcl_eid, lcl_eid->addr, lcl_eid->type);
-  mp->eid_type = rmt_eid->type;
-  mp->rmt_len = rmt_eid->len;
-  mp->lcl_len = lcl_eid->len;
-  mp->action = action;
-
-  if (0 != rmt_locs && 0 != lcl_locs)
-    {
-      mp->loc_num = vec_len (rmt_locs);
-      clib_memcpy (mp->lcl_locs, lcl_locs,
-		   (sizeof (rloc_t) * vec_len (lcl_locs)));
-      clib_memcpy (mp->rmt_locs, rmt_locs,
-		   (sizeof (rloc_t) * vec_len (rmt_locs)));
-    }
-  vec_free (lcl_locs);
-  vec_free (rmt_locs);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_add_del_map_server (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_add_del_map_server_t *mp;
-  f64 timeout = ~0;
-  u8 is_add = 1;
-  u8 ipv4_set = 0;
-  u8 ipv6_set = 0;
-  ip4_address_t ipv4;
-  ip6_address_t ipv6;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	{
-	  is_add = 0;
-	}
-      else if (unformat (input, "%U", unformat_ip4_address, &ipv4))
-	{
-	  ipv4_set = 1;
-	}
-      else if (unformat (input, "%U", unformat_ip6_address, &ipv6))
-	{
-	  ipv6_set = 1;
-	}
-      else
-	break;
-    }
-
-  if (ipv4_set && ipv6_set)
-    {
-      errmsg ("both eid v4 and v6 addresses set");
-      return -99;
-    }
-
-  if (!ipv4_set && !ipv6_set)
-    {
-      errmsg ("eid addresses not set");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (LISP_ADD_DEL_MAP_SERVER, lisp_add_del_map_server);
-
-  mp->is_add = is_add;
-  if (ipv6_set)
-    {
-      mp->is_ipv6 = 1;
-      clib_memcpy (mp->ip_address, &ipv6, sizeof (ipv6));
-    }
-  else
-    {
-      mp->is_ipv6 = 0;
-      clib_memcpy (mp->ip_address, &ipv4, sizeof (ipv4));
-    }
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_add_del_map_resolver (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_add_del_map_resolver_t *mp;
-  f64 timeout = ~0;
-  u8 is_add = 1;
-  u8 ipv4_set = 0;
-  u8 ipv6_set = 0;
-  ip4_address_t ipv4;
-  ip6_address_t ipv6;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	{
-	  is_add = 0;
-	}
-      else if (unformat (input, "%U", unformat_ip4_address, &ipv4))
-	{
-	  ipv4_set = 1;
-	}
-      else if (unformat (input, "%U", unformat_ip6_address, &ipv6))
-	{
-	  ipv6_set = 1;
-	}
-      else
-	break;
-    }
-
-  if (ipv4_set && ipv6_set)
-    {
-      errmsg ("both eid v4 and v6 addresses set");
-      return -99;
-    }
-
-  if (!ipv4_set && !ipv6_set)
-    {
-      errmsg ("eid addresses not set");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver);
-
-  mp->is_add = is_add;
-  if (ipv6_set)
-    {
-      mp->is_ipv6 = 1;
-      clib_memcpy (mp->ip_address, &ipv6, sizeof (ipv6));
-    }
-  else
-    {
-      mp->is_ipv6 = 0;
-      clib_memcpy (mp->ip_address, &ipv4, sizeof (ipv4));
-    }
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_gpe_enable_disable (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_gpe_enable_disable_t *mp;
-  f64 timeout = ~0;
-  u8 is_set = 0;
-  u8 is_en = 1;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "enable"))
-	{
-	  is_set = 1;
-	  is_en = 1;
-	}
-      else if (unformat (input, "disable"))
-	{
-	  is_set = 1;
-	  is_en = 0;
-	}
-      else
-	break;
-    }
-
-  if (is_set == 0)
-    {
-      errmsg ("Value not set");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable);
-
-  mp->is_en = is_en;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_rloc_probe_enable_disable (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_rloc_probe_enable_disable_t *mp;
-  f64 timeout = ~0;
-  u8 is_set = 0;
-  u8 is_en = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "enable"))
-	{
-	  is_set = 1;
-	  is_en = 1;
-	}
-      else if (unformat (input, "disable"))
-	is_set = 1;
-      else
-	break;
-    }
-
-  if (!is_set)
-    {
-      errmsg ("Value not set");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (LISP_RLOC_PROBE_ENABLE_DISABLE, lisp_rloc_probe_enable_disable);
-
-  mp->is_enabled = is_en;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_map_register_enable_disable (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_map_register_enable_disable_t *mp;
-  f64 timeout = ~0;
-  u8 is_set = 0;
-  u8 is_en = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "enable"))
-	{
-	  is_set = 1;
-	  is_en = 1;
-	}
-      else if (unformat (input, "disable"))
-	is_set = 1;
-      else
-	break;
-    }
-
-  if (!is_set)
-    {
-      errmsg ("Value not set");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (LISP_MAP_REGISTER_ENABLE_DISABLE, lisp_map_register_enable_disable);
-
-  mp->is_enabled = is_en;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_enable_disable (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_enable_disable_t *mp;
-  f64 timeout = ~0;
-  u8 is_set = 0;
-  u8 is_en = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "enable"))
-	{
-	  is_set = 1;
-	  is_en = 1;
-	}
-      else if (unformat (input, "disable"))
-	{
-	  is_set = 1;
-	}
-      else
-	break;
-    }
-
-  if (!is_set)
-    {
-      errmsg ("Value not set");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (LISP_ENABLE_DISABLE, lisp_enable_disable);
-
-  mp->is_en = is_en;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_show_lisp_map_register_state (vat_main_t * vam)
-{
-  f64 timeout = ~0;
-  vl_api_show_lisp_map_register_state_t *mp;
-
-  M (SHOW_LISP_MAP_REGISTER_STATE, show_lisp_map_register_state);
-
-  /* send */
-  S;
-
-  /* wait for reply */
-  W;
-
-  return 0;
-}
-
-static int
-api_show_lisp_rloc_probe_state (vat_main_t * vam)
-{
-  f64 timeout = ~0;
-  vl_api_show_lisp_rloc_probe_state_t *mp;
-
-  M (SHOW_LISP_RLOC_PROBE_STATE, show_lisp_rloc_probe_state);
-
-  /* send */
-  S;
-
-  /* wait for reply */
-  W;
-
-  return 0;
-}
-
-static int
-api_show_lisp_map_request_mode (vat_main_t * vam)
-{
-  f64 timeout = ~0;
-  vl_api_show_lisp_map_request_mode_t *mp;
-
-  M (SHOW_LISP_MAP_REQUEST_MODE, show_lisp_map_request_mode);
-
-  /* send */
-  S;
-
-  /* wait for reply */
-  W;
-
-  return 0;
-}
-
-static int
-api_lisp_map_request_mode (vat_main_t * vam)
-{
-  f64 timeout = ~0;
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_map_request_mode_t *mp;
-  u8 mode = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "dst-only"))
-	mode = 0;
-      else if (unformat (input, "src-dst"))
-	mode = 1;
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, input);
-	  return -99;
-	}
-    }
-
-  M (LISP_MAP_REQUEST_MODE, lisp_map_request_mode);
-
-  mp->mode = mode;
-
-  /* send */
-  S;
-
-  /* wait for reply */
-  W;
-
-  /* notreached */
-  return 0;
-}
-
-/**
- * Enable/disable LISP proxy ITR.
- *
- * @param vam vpp API test context
- * @return return code
- */
-static int
-api_lisp_pitr_set_locator_set (vat_main_t * vam)
-{
-  f64 timeout = ~0;
-  u8 ls_name_set = 0;
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_pitr_set_locator_set_t *mp;
-  u8 is_add = 1;
-  u8 *ls_name = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	is_add = 0;
-      else if (unformat (input, "locator-set %s", &ls_name))
-	ls_name_set = 1;
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, input);
-	  return -99;
-	}
-    }
-
-  if (!ls_name_set)
-    {
-      errmsg ("locator-set name not set!");
-      return -99;
-    }
-
-  M (LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set);
-
-  mp->is_add = is_add;
-  clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name));
-  vec_free (ls_name);
-
-  /* send */
-  S;
-
-  /* wait for reply */
-  W;
-
-  /* notreached */
-  return 0;
-}
-
-static int
-api_show_lisp_pitr (vat_main_t * vam)
-{
-  vl_api_show_lisp_pitr_t *mp;
-  f64 timeout = ~0;
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%=20s", "lisp status:");
-    }
-
-  M (SHOW_LISP_PITR, show_lisp_pitr);
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-/**
- * Add/delete mapping between vni and vrf
- */
-static int
-api_lisp_eid_table_add_del_map (vat_main_t * vam)
-{
-  f64 timeout = ~0;
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_eid_table_add_del_map_t *mp;
-  u8 is_add = 1, vni_set = 0, vrf_set = 0, bd_index_set = 0;
-  u32 vni, vrf, bd_index;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	is_add = 0;
-      else if (unformat (input, "vrf %d", &vrf))
-	vrf_set = 1;
-      else if (unformat (input, "bd_index %d", &bd_index))
-	bd_index_set = 1;
-      else if (unformat (input, "vni %d", &vni))
-	vni_set = 1;
-      else
-	break;
-    }
-
-  if (!vni_set || (!vrf_set && !bd_index_set))
-    {
-      errmsg ("missing arguments!");
-      return -99;
-    }
-
-  if (vrf_set && bd_index_set)
-    {
-      errmsg ("error: both vrf and bd entered!");
-      return -99;
-    }
-
-  M (LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map);
-
-  mp->is_add = is_add;
-  mp->vni = htonl (vni);
-  mp->dp_table = vrf_set ? htonl (vrf) : htonl (bd_index);
-  mp->is_l2 = bd_index_set;
-
-  /* send */
-  S;
-
-  /* wait for reply */
-  W;
-
-  /* notreached */
-  return 0;
-}
-
-uword
-unformat_negative_mapping_action (unformat_input_t * input, va_list * args)
-{
-  u32 *action = va_arg (*args, u32 *);
-  u8 *s = 0;
-
-  if (unformat (input, "%s", &s))
-    {
-      if (!strcmp ((char *) s, "no-action"))
-	action[0] = 0;
-      else if (!strcmp ((char *) s, "natively-forward"))
-	action[0] = 1;
-      else if (!strcmp ((char *) s, "send-map-request"))
-	action[0] = 2;
-      else if (!strcmp ((char *) s, "drop"))
-	action[0] = 3;
-      else
-	{
-	  clib_warning ("invalid action: '%s'", s);
-	  action[0] = 3;
-	}
-    }
-  else
-    return 0;
-
-  vec_free (s);
-  return 1;
-}
-
-/**
- * Add/del remote mapping to/from LISP control plane
- *
- * @param vam vpp API test context
- * @return return code
- */
-static int
-api_lisp_add_del_remote_mapping (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_add_del_remote_mapping_t *mp;
-  f64 timeout = ~0;
-  u32 vni = 0;
-  lisp_eid_vat_t _eid, *eid = &_eid;
-  lisp_eid_vat_t _seid, *seid = &_seid;
-  u8 is_add = 1, del_all = 0, eid_set = 0, seid_set = 0;
-  u32 action = ~0, p, w, data_len;
-  ip4_address_t rloc4;
-  ip6_address_t rloc6;
-  rloc_t *rlocs = 0, rloc, *curr_rloc = 0;
-
-  memset (&rloc, 0, sizeof (rloc));
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del-all"))
-	{
-	  del_all = 1;
-	}
-      else if (unformat (input, "del"))
-	{
-	  is_add = 0;
-	}
-      else if (unformat (input, "add"))
-	{
-	  is_add = 1;
-	}
-      else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid))
-	{
-	  eid_set = 1;
-	}
-      else if (unformat (input, "seid %U", unformat_lisp_eid_vat, seid))
-	{
-	  seid_set = 1;
-	}
-      else if (unformat (input, "vni %d", &vni))
-	{
-	  ;
-	}
-      else if (unformat (input, "p %d w %d", &p, &w))
-	{
-	  if (!curr_rloc)
-	    {
-	      errmsg ("No RLOC configured for setting priority/weight!");
-	      return -99;
-	    }
-	  curr_rloc->priority = p;
-	  curr_rloc->weight = w;
-	}
-      else if (unformat (input, "rloc %U", unformat_ip4_address, &rloc4))
-	{
-	  rloc.is_ip4 = 1;
-	  clib_memcpy (&rloc.addr, &rloc4, sizeof (rloc4));
-	  vec_add1 (rlocs, rloc);
-	  curr_rloc = &rlocs[vec_len (rlocs) - 1];
-	}
-      else if (unformat (input, "rloc %U", unformat_ip6_address, &rloc6))
-	{
-	  rloc.is_ip4 = 0;
-	  clib_memcpy (&rloc.addr, &rloc6, sizeof (rloc6));
-	  vec_add1 (rlocs, rloc);
-	  curr_rloc = &rlocs[vec_len (rlocs) - 1];
-	}
-      else if (unformat (input, "action %U",
-			 unformat_negative_mapping_action, &action))
-	{
-	  ;
-	}
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, input);
-	  return -99;
-	}
-    }
-
-  if (0 == eid_set)
-    {
-      errmsg ("missing params!");
-      return -99;
-    }
-
-  if (is_add && (~0 == action) && 0 == vec_len (rlocs))
-    {
-      errmsg ("no action set for negative map-reply!");
-      return -99;
-    }
-
-  data_len = vec_len (rlocs) * sizeof (rloc_t);
-
-  M2 (LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping, data_len);
-  mp->is_add = is_add;
-  mp->vni = htonl (vni);
-  mp->action = (u8) action;
-  mp->is_src_dst = seid_set;
-  mp->eid_len = eid->len;
-  mp->seid_len = seid->len;
-  mp->del_all = del_all;
-  mp->eid_type = eid->type;
-  lisp_eid_put_vat (mp->eid, eid->addr, eid->type);
-  lisp_eid_put_vat (mp->seid, seid->addr, seid->type);
-
-  mp->rloc_num = clib_host_to_net_u32 (vec_len (rlocs));
-  clib_memcpy (mp->rlocs, rlocs, data_len);
-  vec_free (rlocs);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-/**
- * Add/del LISP adjacency. Saves mapping in LISP control plane and updates
- * forwarding entries in data-plane accordingly.
- *
- * @param vam vpp API test context
- * @return return code
- */
-static int
-api_lisp_add_del_adjacency (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_add_del_adjacency_t *mp;
-  f64 timeout = ~0;
-  u32 vni = 0;
-  ip4_address_t leid4, reid4;
-  ip6_address_t leid6, reid6;
-  u8 reid_mac[6] = { 0 };
-  u8 leid_mac[6] = { 0 };
-  u8 reid_type, leid_type;
-  u32 leid_len = 0, reid_len = 0, len;
-  u8 is_add = 1;
-
-  leid_type = reid_type = (u8) ~ 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	{
-	  is_add = 0;
-	}
-      else if (unformat (input, "add"))
-	{
-	  is_add = 1;
-	}
-      else if (unformat (input, "reid %U/%d", unformat_ip4_address,
-			 &reid4, &len))
-	{
-	  reid_type = 0;	/* ipv4 */
-	  reid_len = len;
-	}
-      else if (unformat (input, "reid %U/%d", unformat_ip6_address,
-			 &reid6, &len))
-	{
-	  reid_type = 1;	/* ipv6 */
-	  reid_len = len;
-	}
-      else if (unformat (input, "reid %U", unformat_ethernet_address,
-			 reid_mac))
-	{
-	  reid_type = 2;	/* mac */
-	}
-      else if (unformat (input, "leid %U/%d", unformat_ip4_address,
-			 &leid4, &len))
-	{
-	  leid_type = 0;	/* ipv4 */
-	  leid_len = len;
-	}
-      else if (unformat (input, "leid %U/%d", unformat_ip6_address,
-			 &leid6, &len))
-	{
-	  leid_type = 1;	/* ipv6 */
-	  leid_len = len;
-	}
-      else if (unformat (input, "leid %U", unformat_ethernet_address,
-			 leid_mac))
-	{
-	  leid_type = 2;	/* mac */
-	}
-      else if (unformat (input, "vni %d", &vni))
-	{
-	  ;
-	}
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, input);
-	  return -99;
-	}
-    }
-
-  if ((u8) ~ 0 == reid_type)
-    {
-      errmsg ("missing params!");
-      return -99;
-    }
-
-  if (leid_type != reid_type)
-    {
-      errmsg ("remote and local EIDs are of different types!");
-      return -99;
-    }
-
-  M (LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency);
-  mp->is_add = is_add;
-  mp->vni = htonl (vni);
-  mp->leid_len = leid_len;
-  mp->reid_len = reid_len;
-  mp->eid_type = reid_type;
-
-  switch (mp->eid_type)
-    {
-    case 0:
-      clib_memcpy (mp->leid, &leid4, sizeof (leid4));
-      clib_memcpy (mp->reid, &reid4, sizeof (reid4));
-      break;
-    case 1:
-      clib_memcpy (mp->leid, &leid6, sizeof (leid6));
-      clib_memcpy (mp->reid, &reid6, sizeof (reid6));
-      break;
-    case 2:
-      clib_memcpy (mp->leid, leid_mac, 6);
-      clib_memcpy (mp->reid, reid_mac, 6);
-      break;
-    default:
-      errmsg ("unknown EID type %d!", mp->eid_type);
-      return 0;
-    }
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_gpe_add_del_iface (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_gpe_add_del_iface_t *mp;
-  f64 timeout = ~0;
-  u8 action_set = 0, is_add = 1, is_l2 = 0, dp_table_set = 0, vni_set = 0;
-  u32 dp_table = 0, vni = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "up"))
-	{
-	  action_set = 1;
-	  is_add = 1;
-	}
-      else if (unformat (input, "down"))
-	{
-	  action_set = 1;
-	  is_add = 0;
-	}
-      else if (unformat (input, "table_id %d", &dp_table))
-	{
-	  dp_table_set = 1;
-	}
-      else if (unformat (input, "bd_id %d", &dp_table))
-	{
-	  dp_table_set = 1;
-	  is_l2 = 1;
-	}
-      else if (unformat (input, "vni %d", &vni))
-	{
-	  vni_set = 1;
-	}
-      else
-	break;
-    }
-
-  if (action_set == 0)
-    {
-      errmsg ("Action not set");
-      return -99;
-    }
-  if (dp_table_set == 0 || vni_set == 0)
-    {
-      errmsg ("vni and dp_table must be set");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface);
-
-  mp->is_add = is_add;
-  mp->dp_table = dp_table;
-  mp->is_l2 = is_l2;
-  mp->vni = vni;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-/**
- * Add/del map request itr rlocs from LISP control plane and updates
- *
- * @param vam vpp API test context
- * @return return code
- */
-static int
-api_lisp_add_del_map_request_itr_rlocs (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_add_del_map_request_itr_rlocs_t *mp;
-  f64 timeout = ~0;
-  u8 *locator_set_name = 0;
-  u8 locator_set_name_set = 0;
-  u8 is_add = 1;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "del"))
-	{
-	  is_add = 0;
-	}
-      else if (unformat (input, "%_%v%_", &locator_set_name))
-	{
-	  locator_set_name_set = 1;
-	}
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, input);
-	  return -99;
-	}
-    }
-
-  if (is_add && !locator_set_name_set)
-    {
-      errmsg ("itr-rloc is not set!");
-      return -99;
-    }
-
-  if (is_add && vec_len (locator_set_name) > 64)
-    {
-      errmsg ("itr-rloc locator-set name too long");
-      vec_free (locator_set_name);
-      return -99;
-    }
-
-  M (LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS, lisp_add_del_map_request_itr_rlocs);
-  mp->is_add = is_add;
-  if (is_add)
-    {
-      clib_memcpy (mp->locator_set_name, locator_set_name,
-		   vec_len (locator_set_name));
-    }
-  else
-    {
-      memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name));
-    }
-  vec_free (locator_set_name);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_locator_dump (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_locator_dump_t *mp;
-  f64 timeout = ~0;
-  u8 is_index_set = 0, is_name_set = 0;
-  u8 *ls_name = 0;
-  u32 ls_index = ~0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "ls_name %_%v%_", &ls_name))
-	{
-	  is_name_set = 1;
-	}
-      else if (unformat (input, "ls_index %d", &ls_index))
-	{
-	  is_index_set = 1;
-	}
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, input);
-	  return -99;
-	}
-    }
-
-  if (!is_index_set && !is_name_set)
-    {
-      errmsg ("error: expected one of index or name!");
-      return -99;
-    }
-
-  if (is_index_set && is_name_set)
-    {
-      errmsg ("error: only one param expected!");
-      return -99;
-    }
-
-  if (vec_len (ls_name) > 62)
-    {
-      errmsg ("error: locator set name too long!");
-      return -99;
-    }
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%=16s%=16s%=16s", "locator", "priority", "weight");
-    }
-
-  M (LISP_LOCATOR_DUMP, lisp_locator_dump);
-  mp->is_index_set = is_index_set;
-
-  if (is_index_set)
-    mp->ls_index = clib_host_to_net_u32 (ls_index);
-  else
-    {
-      vec_add1 (ls_name, 0);
-      strncpy ((char *) mp->ls_name, (char *) ls_name,
-	       sizeof (mp->ls_name) - 1);
-    }
-
-  /* send it... */
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_locator_set_dump (vat_main_t * vam)
-{
-  vl_api_lisp_locator_set_dump_t *mp;
-  unformat_input_t *input = vam->input;
-  f64 timeout = ~0;
-  u8 filter = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "local"))
-	{
-	  filter = 1;
-	}
-      else if (unformat (input, "remote"))
-	{
-	  filter = 2;
-	}
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, input);
-	  return -99;
-	}
-    }
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%=10s%=15s", "ls_index", "ls_name");
-    }
-
-  M (LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
-
-  mp->filter = filter;
-
-  /* send it... */
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_eid_table_map_dump (vat_main_t * vam)
-{
-  u8 is_l2 = 0;
-  u8 mode_set = 0;
-  unformat_input_t *input = vam->input;
-  vl_api_lisp_eid_table_map_dump_t *mp;
-  f64 timeout = ~0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "l2"))
-	{
-	  is_l2 = 1;
-	  mode_set = 1;
-	}
-      else if (unformat (input, "l3"))
-	{
-	  is_l2 = 0;
-	  mode_set = 1;
-	}
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, input);
-	  return -99;
-	}
-    }
-
-  if (!mode_set)
-    {
-      errmsg ("expected one of 'l2' or 'l3' parameter!");
-      return -99;
-    }
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF");
-    }
-
-  M (LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump);
-  mp->is_l2 = is_l2;
-
-  /* send it... */
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_eid_table_vni_dump (vat_main_t * vam)
-{
-  vl_api_lisp_eid_table_vni_dump_t *mp;
-  f64 timeout = ~0;
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "VNI");
-    }
-
-  M (LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_dump);
-
-  /* send it... */
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_eid_table_dump (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_lisp_eid_table_dump_t *mp;
-  f64 timeout = ~0;
-  struct in_addr ip4;
-  struct in6_addr ip6;
-  u8 mac[6];
-  u8 eid_type = ~0, eid_set = 0;
-  u32 prefix_length = ~0, t, vni = 0;
-  u8 filter = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "eid %U/%d", unformat_ip4_address, &ip4, &t))
-	{
-	  eid_set = 1;
-	  eid_type = 0;
-	  prefix_length = t;
-	}
-      else if (unformat (i, "eid %U/%d", unformat_ip6_address, &ip6, &t))
-	{
-	  eid_set = 1;
-	  eid_type = 1;
-	  prefix_length = t;
-	}
-      else if (unformat (i, "eid %U", unformat_ethernet_address, mac))
-	{
-	  eid_set = 1;
-	  eid_type = 2;
-	}
-      else if (unformat (i, "vni %d", &t))
-	{
-	  vni = t;
-	}
-      else if (unformat (i, "local"))
-	{
-	  filter = 1;
-	}
-      else if (unformat (i, "remote"))
-	{
-	  filter = 2;
-	}
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%-35s%-20s%-30s%-20s%-20s%-10s%-20s", "EID",
-	     "type", "ls_index", "ttl", "authoritative", "key_id", "key");
-    }
-
-  M (LISP_EID_TABLE_DUMP, lisp_eid_table_dump);
-
-  mp->filter = filter;
-  if (eid_set)
-    {
-      mp->eid_set = 1;
-      mp->vni = htonl (vni);
-      mp->eid_type = eid_type;
-      switch (eid_type)
-	{
-	case 0:
-	  mp->prefix_length = prefix_length;
-	  clib_memcpy (mp->eid, &ip4, sizeof (ip4));
-	  break;
-	case 1:
-	  mp->prefix_length = prefix_length;
-	  clib_memcpy (mp->eid, &ip6, sizeof (ip6));
-	  break;
-	case 2:
-	  clib_memcpy (mp->eid, mac, sizeof (mac));
-	  break;
-	default:
-	  errmsg ("unknown EID type %d!", eid_type);
-	  return -99;
-	}
-    }
-
-  /* send it... */
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_gpe_tunnel_dump (vat_main_t * vam)
-{
-  vl_api_lisp_gpe_tunnel_dump_t *mp;
-  f64 timeout = ~0;
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%=20s%=30s%=16s%=16s%=16s%=16s"
-	     "%=16s%=16s%=16s%=16s%=16s",
-	     "Tunel", "Source", "Destination", "Fib encap", "Fib decap",
-	     "Decap next", "Lisp version", "Flags", "Next protocol",
-	     "ver_res", "res", "iid");
-    }
-
-  M (LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump);
-  /* send it... */
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_adjacencies_get (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_lisp_adjacencies_get_t *mp;
-  f64 timeout = ~0;
-  u8 vni_set = 0;
-  u32 vni = ~0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "vni %d", &vni))
-	{
-	  vni_set = 1;
-	}
-      else
-	{
-	  errmsg ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (!vni_set)
-    {
-      errmsg ("vni not set!");
-      return -99;
-    }
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%s %40s", "leid", "reid");
-    }
-
-  M (LISP_ADJACENCIES_GET, lisp_adjacencies_get);
-  mp->vni = clib_host_to_net_u32 (vni);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_map_server_dump (vat_main_t * vam)
-{
-  vl_api_lisp_map_server_dump_t *mp;
-  f64 timeout = ~0;
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%=20s", "Map server");
-    }
-
-  M (LISP_MAP_SERVER_DUMP, lisp_map_server_dump);
-  /* send it... */
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_map_resolver_dump (vat_main_t * vam)
-{
-  vl_api_lisp_map_resolver_dump_t *mp;
-  f64 timeout = ~0;
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%=20s", "Map resolver");
-    }
-
-  M (LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump);
-  /* send it... */
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_show_lisp_status (vat_main_t * vam)
-{
-  vl_api_show_lisp_status_t *mp;
-  f64 timeout = ~0;
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%-20s%-16s", "lisp status", "locator-set");
-    }
-
-  M (SHOW_LISP_STATUS, show_lisp_status);
-  /* send it... */
-  S;
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_lisp_get_map_request_itr_rlocs (vat_main_t * vam)
-{
-  vl_api_lisp_get_map_request_itr_rlocs_t *mp;
-  f64 timeout = ~0;
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%=20s", "itr-rlocs:");
-    }
-
-  M (LISP_GET_MAP_REQUEST_ITR_RLOCS, lisp_get_map_request_itr_rlocs);
-  /* send it... */
-  S;
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_af_packet_create (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_af_packet_create_t *mp;
-  f64 timeout;
-  u8 *host_if_name = 0;
-  u8 hw_addr[6];
-  u8 random_hw_addr = 1;
-
-  memset (hw_addr, 0, sizeof (hw_addr));
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "name %s", &host_if_name))
-	vec_add1 (host_if_name, 0);
-      else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
-	random_hw_addr = 0;
-      else
-	break;
-    }
-
-  if (!vec_len (host_if_name))
-    {
-      errmsg ("host-interface name must be specified");
-      return -99;
-    }
-
-  if (vec_len (host_if_name) > 64)
-    {
-      errmsg ("host-interface name too long");
-      return -99;
-    }
-
-  M (AF_PACKET_CREATE, af_packet_create);
-
-  clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
-  clib_memcpy (mp->hw_addr, hw_addr, 6);
-  mp->use_random_hw_addr = random_hw_addr;
-  vec_free (host_if_name);
-
-  S;
-  W2 (fprintf (vam->ofp, " new sw_if_index = %d ", vam->sw_if_index));
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_af_packet_delete (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_af_packet_delete_t *mp;
-  f64 timeout;
-  u8 *host_if_name = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "name %s", &host_if_name))
-	vec_add1 (host_if_name, 0);
-      else
-	break;
-    }
-
-  if (!vec_len (host_if_name))
-    {
-      errmsg ("host-interface name must be specified");
-      return -99;
-    }
-
-  if (vec_len (host_if_name) > 64)
-    {
-      errmsg ("host-interface name too long");
-      return -99;
-    }
-
-  M (AF_PACKET_DELETE, af_packet_delete);
-
-  clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
-  vec_free (host_if_name);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_policer_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_policer_add_del_t *mp;
-  f64 timeout;
-  u8 is_add = 1;
-  u8 *name = 0;
-  u32 cir = 0;
-  u32 eir = 0;
-  u64 cb = 0;
-  u64 eb = 0;
-  u8 rate_type = 0;
-  u8 round_type = 0;
-  u8 type = 0;
-  u8 color_aware = 0;
-  sse2_qos_pol_action_params_st conform_action, exceed_action, violate_action;
-
-  conform_action.action_type = SSE2_QOS_ACTION_TRANSMIT;
-  conform_action.dscp = 0;
-  exceed_action.action_type = SSE2_QOS_ACTION_MARK_AND_TRANSMIT;
-  exceed_action.dscp = 0;
-  violate_action.action_type = SSE2_QOS_ACTION_DROP;
-  violate_action.dscp = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "name %s", &name))
-	vec_add1 (name, 0);
-      else if (unformat (i, "cir %u", &cir))
-	;
-      else if (unformat (i, "eir %u", &eir))
-	;
-      else if (unformat (i, "cb %u", &cb))
-	;
-      else if (unformat (i, "eb %u", &eb))
-	;
-      else if (unformat (i, "rate_type %U", unformat_policer_rate_type,
-			 &rate_type))
-	;
-      else if (unformat (i, "round_type %U", unformat_policer_round_type,
-			 &round_type))
-	;
-      else if (unformat (i, "type %U", unformat_policer_type, &type))
-	;
-      else if (unformat (i, "conform_action %U", unformat_policer_action_type,
-			 &conform_action))
-	;
-      else if (unformat (i, "exceed_action %U", unformat_policer_action_type,
-			 &exceed_action))
-	;
-      else if (unformat (i, "violate_action %U", unformat_policer_action_type,
-			 &violate_action))
-	;
-      else if (unformat (i, "color-aware"))
-	color_aware = 1;
-      else
-	break;
-    }
-
-  if (!vec_len (name))
-    {
-      errmsg ("policer name must be specified");
-      return -99;
-    }
-
-  if (vec_len (name) > 64)
-    {
-      errmsg ("policer name too long");
-      return -99;
-    }
-
-  M (POLICER_ADD_DEL, policer_add_del);
-
-  clib_memcpy (mp->name, name, vec_len (name));
-  vec_free (name);
-  mp->is_add = is_add;
-  mp->cir = cir;
-  mp->eir = eir;
-  mp->cb = cb;
-  mp->eb = eb;
-  mp->rate_type = rate_type;
-  mp->round_type = round_type;
-  mp->type = type;
-  mp->conform_action_type = conform_action.action_type;
-  mp->conform_dscp = conform_action.dscp;
-  mp->exceed_action_type = exceed_action.action_type;
-  mp->exceed_dscp = exceed_action.dscp;
-  mp->violate_action_type = violate_action.action_type;
-  mp->violate_dscp = violate_action.dscp;
-  mp->color_aware = color_aware;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_policer_dump (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_policer_dump_t *mp;
-  f64 timeout = ~0;
-  u8 *match_name = 0;
-  u8 match_name_valid = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "name %s", &match_name))
-	{
-	  vec_add1 (match_name, 0);
-	  match_name_valid = 1;
-	}
-      else
-	break;
-    }
-
-  M (POLICER_DUMP, policer_dump);
-  mp->match_name_valid = match_name_valid;
-  clib_memcpy (mp->match_name, match_name, vec_len (match_name));
-  vec_free (match_name);
-  /* send it... */
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_policer_classify_set_interface (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_policer_classify_set_interface_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  int sw_if_index_set;
-  u32 ip4_table_index = ~0;
-  u32 ip6_table_index = ~0;
-  u32 l2_table_index = ~0;
-  u8 is_add = 1;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "ip4-table %d", &ip4_table_index))
-	;
-      else if (unformat (i, "ip6-table %d", &ip6_table_index))
-	;
-      else if (unformat (i, "l2-table %d", &l2_table_index))
-	;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  M (POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->ip4_table_index = ntohl (ip4_table_index);
-  mp->ip6_table_index = ntohl (ip6_table_index);
-  mp->l2_table_index = ntohl (l2_table_index);
-  mp->is_add = is_add;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_policer_classify_dump (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_policer_classify_dump_t *mp;
-  f64 timeout = ~0;
-  u8 type = POLICER_CLASSIFY_N_TABLES;
-
-  if (unformat (i, "type %U", unformat_policer_classify_table_type, &type))
-    ;
-  else
-    {
-      errmsg ("classify table type must be specified");
-      return -99;
-    }
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%10s%20s", "Intfc idx", "Classify table");
-    }
-
-  M (POLICER_CLASSIFY_DUMP, policer_classify_dump);
-  mp->type = type;
-  /* send it... */
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_netmap_create (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_netmap_create_t *mp;
-  f64 timeout;
-  u8 *if_name = 0;
-  u8 hw_addr[6];
-  u8 random_hw_addr = 1;
-  u8 is_pipe = 0;
-  u8 is_master = 0;
-
-  memset (hw_addr, 0, sizeof (hw_addr));
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "name %s", &if_name))
-	vec_add1 (if_name, 0);
-      else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
-	random_hw_addr = 0;
-      else if (unformat (i, "pipe"))
-	is_pipe = 1;
-      else if (unformat (i, "master"))
-	is_master = 1;
-      else if (unformat (i, "slave"))
-	is_master = 0;
-      else
-	break;
-    }
-
-  if (!vec_len (if_name))
-    {
-      errmsg ("interface name must be specified");
-      return -99;
-    }
-
-  if (vec_len (if_name) > 64)
-    {
-      errmsg ("interface name too long");
-      return -99;
-    }
-
-  M (NETMAP_CREATE, netmap_create);
-
-  clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
-  clib_memcpy (mp->hw_addr, hw_addr, 6);
-  mp->use_random_hw_addr = random_hw_addr;
-  mp->is_pipe = is_pipe;
-  mp->is_master = is_master;
-  vec_free (if_name);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_netmap_delete (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_netmap_delete_t *mp;
-  f64 timeout;
-  u8 *if_name = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "name %s", &if_name))
-	vec_add1 (if_name, 0);
-      else
-	break;
-    }
-
-  if (!vec_len (if_name))
-    {
-      errmsg ("interface name must be specified");
-      return -99;
-    }
-
-  if (vec_len (if_name) > 64)
-    {
-      errmsg ("interface name too long");
-      return -99;
-    }
-
-  M (NETMAP_DELETE, netmap_delete);
-
-  clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
-  vec_free (if_name);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static void vl_api_mpls_tunnel_details_t_handler
-  (vl_api_mpls_tunnel_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 len = mp->mt_next_hop_n_labels;
-  i32 i;
-
-  print (vam->ofp, "[%d]: via %U %d labels ",
-	 mp->tunnel_index,
-	 format_ip4_address, mp->mt_next_hop,
-	 ntohl (mp->mt_next_hop_sw_if_index));
-  for (i = 0; i < len; i++)
-    {
-      print (vam->ofp, "%u ", ntohl (mp->mt_next_hop_out_labels[i]));
-    }
-  print (vam->ofp, "");
-}
-
-static void vl_api_mpls_tunnel_details_t_handler_json
-  (vl_api_mpls_tunnel_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-  struct in_addr ip4;
-  i32 i;
-  i32 len = mp->mt_next_hop_n_labels;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "tunnel_index", ntohl (mp->tunnel_index));
-  clib_memcpy (&ip4, &(mp->mt_next_hop), sizeof (ip4));
-  vat_json_object_add_ip4 (node, "next_hop", ip4);
-  vat_json_object_add_uint (node, "next_hop_sw_if_index",
-			    ntohl (mp->mt_next_hop_sw_if_index));
-  vat_json_object_add_uint (node, "l2_only", ntohl (mp->mt_l2_only));
-  vat_json_object_add_uint (node, "label_count", len);
-  for (i = 0; i < len; i++)
-    {
-      vat_json_object_add_uint (node, "label",
-				ntohl (mp->mt_next_hop_out_labels[i]));
-    }
-}
-
-static int
-api_mpls_tunnel_dump (vat_main_t * vam)
-{
-  vl_api_mpls_tunnel_dump_t *mp;
-  f64 timeout;
-  i32 index = -1;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (vam->input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (!unformat (vam->input, "tunnel_index %d", &index))
-	{
-	  index = -1;
-	  break;
-	}
-    }
-
-  print (vam->ofp, "  tunnel_index %d", index);
-
-  M (MPLS_TUNNEL_DUMP, mpls_tunnel_dump);
-  mp->tunnel_index = htonl (index);
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-#define vl_api_mpls_fib_details_t_endian vl_noop_handler
-#define vl_api_mpls_fib_details_t_print vl_noop_handler
-
-static void
-vl_api_mpls_fib_details_t_handler (vl_api_mpls_fib_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  int count = ntohl (mp->count);
-  vl_api_fib_path2_t *fp;
-  int i;
-
-  print (vam->ofp,
-	 "table-id %d, label %u, ess_bit %u",
-	 ntohl (mp->table_id), ntohl (mp->label), mp->eos_bit);
-  fp = mp->path;
-  for (i = 0; i < count; i++)
-    {
-      if (fp->afi == IP46_TYPE_IP6)
-	print (vam->ofp,
-	       "  weight %d, sw_if_index %d, is_local %d, is_drop %d, "
-	       "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
-	       ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
-	       fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
-	       format_ip6_address, fp->next_hop);
-      else if (fp->afi == IP46_TYPE_IP4)
-	print (vam->ofp,
-	       "  weight %d, sw_if_index %d, is_local %d, is_drop %d, "
-	       "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
-	       ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
-	       fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
-	       format_ip4_address, fp->next_hop);
-      fp++;
-    }
-}
-
-static void vl_api_mpls_fib_details_t_handler_json
-  (vl_api_mpls_fib_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  int count = ntohl (mp->count);
-  vat_json_node_t *node = NULL;
-  struct in_addr ip4;
-  struct in6_addr ip6;
-  vl_api_fib_path2_t *fp;
-  int i;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "table", ntohl (mp->table_id));
-  vat_json_object_add_uint (node, "s_bit", mp->eos_bit);
-  vat_json_object_add_uint (node, "label", ntohl (mp->label));
-  vat_json_object_add_uint (node, "path_count", count);
-  fp = mp->path;
-  for (i = 0; i < count; i++)
-    {
-      vat_json_object_add_uint (node, "weight", ntohl (fp->weight));
-      vat_json_object_add_uint (node, "sw_if_index", ntohl (fp->sw_if_index));
-      vat_json_object_add_uint (node, "is_local", fp->is_local);
-      vat_json_object_add_uint (node, "is_drop", fp->is_drop);
-      vat_json_object_add_uint (node, "is_unreach", fp->is_unreach);
-      vat_json_object_add_uint (node, "is_prohibit", fp->is_prohibit);
-      vat_json_object_add_uint (node, "next_hop_afi", fp->afi);
-      if (fp->afi == IP46_TYPE_IP4)
-	{
-	  clib_memcpy (&ip4, &fp->next_hop, sizeof (ip4));
-	  vat_json_object_add_ip4 (node, "next_hop", ip4);
-	}
-      else if (fp->afi == IP46_TYPE_IP6)
-	{
-	  clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6));
-	  vat_json_object_add_ip6 (node, "next_hop", ip6);
-	}
-    }
-}
-
-static int
-api_mpls_fib_dump (vat_main_t * vam)
-{
-  vl_api_mpls_fib_dump_t *mp;
-  f64 timeout;
-
-  M (MPLS_FIB_DUMP, mpls_fib_dump);
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-#define vl_api_ip_fib_details_t_endian vl_noop_handler
-#define vl_api_ip_fib_details_t_print vl_noop_handler
-
-static void
-vl_api_ip_fib_details_t_handler (vl_api_ip_fib_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  int count = ntohl (mp->count);
-  vl_api_fib_path_t *fp;
-  int i;
-
-  print (vam->ofp,
-	 "table-id %d, prefix %U/%d",
-	 ntohl (mp->table_id), format_ip4_address, mp->address,
-	 mp->address_length);
-  fp = mp->path;
-  for (i = 0; i < count; i++)
-    {
-      if (fp->afi == IP46_TYPE_IP6)
-	print (vam->ofp,
-	       "  weight %d, sw_if_index %d, is_local %d, is_drop %d, "
-	       "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
-	       ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
-	       fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
-	       format_ip6_address, fp->next_hop);
-      else if (fp->afi == IP46_TYPE_IP4)
-	print (vam->ofp,
-	       "  weight %d, sw_if_index %d, is_local %d, is_drop %d, "
-	       "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
-	       ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
-	       fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
-	       format_ip4_address, fp->next_hop);
-      fp++;
-    }
-}
-
-static void vl_api_ip_fib_details_t_handler_json
-  (vl_api_ip_fib_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  int count = ntohl (mp->count);
-  vat_json_node_t *node = NULL;
-  struct in_addr ip4;
-  struct in6_addr ip6;
-  vl_api_fib_path_t *fp;
-  int i;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "table", ntohl (mp->table_id));
-  clib_memcpy (&ip4, &mp->address, sizeof (ip4));
-  vat_json_object_add_ip4 (node, "prefix", ip4);
-  vat_json_object_add_uint (node, "mask_length", mp->address_length);
-  vat_json_object_add_uint (node, "path_count", count);
-  fp = mp->path;
-  for (i = 0; i < count; i++)
-    {
-      vat_json_object_add_uint (node, "weight", ntohl (fp->weight));
-      vat_json_object_add_uint (node, "sw_if_index", ntohl (fp->sw_if_index));
-      vat_json_object_add_uint (node, "is_local", fp->is_local);
-      vat_json_object_add_uint (node, "is_drop", fp->is_drop);
-      vat_json_object_add_uint (node, "is_unreach", fp->is_unreach);
-      vat_json_object_add_uint (node, "is_prohibit", fp->is_prohibit);
-      vat_json_object_add_uint (node, "next_hop_afi", fp->afi);
-      if (fp->afi == IP46_TYPE_IP4)
-	{
-	  clib_memcpy (&ip4, &fp->next_hop, sizeof (ip4));
-	  vat_json_object_add_ip4 (node, "next_hop", ip4);
-	}
-      else if (fp->afi == IP46_TYPE_IP6)
-	{
-	  clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6));
-	  vat_json_object_add_ip6 (node, "next_hop", ip6);
-	}
-    }
-}
-
-static int
-api_ip_fib_dump (vat_main_t * vam)
-{
-  vl_api_ip_fib_dump_t *mp;
-  f64 timeout;
-
-  M (IP_FIB_DUMP, ip_fib_dump);
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-static void vl_api_ip_neighbor_details_t_handler
-  (vl_api_ip_neighbor_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "%c %U %U",
-	 (mp->is_static) ? 'S' : 'D',
-	 format_ethernet_address, &mp->mac_address,
-	 (mp->is_ipv6) ? format_ip6_address : format_ip4_address,
-	 &mp->ip_address);
-}
-
-static void vl_api_ip_neighbor_details_t_handler_json
-  (vl_api_ip_neighbor_details_t * mp)
-{
-
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node;
-  struct in_addr ip4;
-  struct in6_addr ip6;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_string_copy (node, "flag",
-				   (mp->is_static) ? (u8 *) "static" : (u8 *)
-				   "dynamic");
-
-  vat_json_object_add_string_copy (node, "link_layer",
-				   format (0, "%U", format_ethernet_address,
-					   &mp->mac_address));
-
-  if (mp->is_ipv6)
-    {
-      clib_memcpy (&ip6, &mp->ip_address, sizeof (ip6));
-      vat_json_object_add_ip6 (node, "ip_address", ip6);
-    }
-  else
-    {
-      clib_memcpy (&ip4, &mp->ip_address, sizeof (ip4));
-      vat_json_object_add_ip4 (node, "ip_address", ip4);
-    }
-}
-
-static int
-api_ip_neighbor_dump (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ip_neighbor_dump_t *mp;
-  f64 timeout;
-  u8 is_ipv6 = 0;
-  u32 sw_if_index = ~0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	;
-      else if (unformat (i, "ip6"))
-	is_ipv6 = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  M (IP_NEIGHBOR_DUMP, ip_neighbor_dump);
-  mp->is_ipv6 = (u8) is_ipv6;
-  mp->sw_if_index = ntohl (sw_if_index);
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-#define vl_api_ip6_fib_details_t_endian vl_noop_handler
-#define vl_api_ip6_fib_details_t_print vl_noop_handler
-
-static void
-vl_api_ip6_fib_details_t_handler (vl_api_ip6_fib_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  int count = ntohl (mp->count);
-  vl_api_fib_path_t *fp;
-  int i;
-
-  print (vam->ofp,
-	 "table-id %d, prefix %U/%d",
-	 ntohl (mp->table_id), format_ip6_address, mp->address,
-	 mp->address_length);
-  fp = mp->path;
-  for (i = 0; i < count; i++)
-    {
-      if (fp->afi == IP46_TYPE_IP6)
-	print (vam->ofp,
-	       "  weight %d, sw_if_index %d, is_local %d, is_drop %d, "
-	       "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
-	       ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
-	       fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
-	       format_ip6_address, fp->next_hop);
-      else if (fp->afi == IP46_TYPE_IP4)
-	print (vam->ofp,
-	       "  weight %d, sw_if_index %d, is_local %d, is_drop %d, "
-	       "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
-	       ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
-	       fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
-	       format_ip4_address, fp->next_hop);
-      fp++;
-    }
-}
-
-static void vl_api_ip6_fib_details_t_handler_json
-  (vl_api_ip6_fib_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  int count = ntohl (mp->count);
-  vat_json_node_t *node = NULL;
-  struct in_addr ip4;
-  struct in6_addr ip6;
-  vl_api_fib_path_t *fp;
-  int i;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "table", ntohl (mp->table_id));
-  clib_memcpy (&ip6, &mp->address, sizeof (ip6));
-  vat_json_object_add_ip6 (node, "prefix", ip6);
-  vat_json_object_add_uint (node, "mask_length", mp->address_length);
-  vat_json_object_add_uint (node, "path_count", count);
-  fp = mp->path;
-  for (i = 0; i < count; i++)
-    {
-      vat_json_object_add_uint (node, "weight", ntohl (fp->weight));
-      vat_json_object_add_uint (node, "sw_if_index", ntohl (fp->sw_if_index));
-      vat_json_object_add_uint (node, "is_local", fp->is_local);
-      vat_json_object_add_uint (node, "is_drop", fp->is_drop);
-      vat_json_object_add_uint (node, "is_unreach", fp->is_unreach);
-      vat_json_object_add_uint (node, "is_prohibit", fp->is_prohibit);
-      vat_json_object_add_uint (node, "next_hop_afi", fp->afi);
-      if (fp->afi == IP46_TYPE_IP4)
-	{
-	  clib_memcpy (&ip4, &fp->next_hop, sizeof (ip4));
-	  vat_json_object_add_ip4 (node, "next_hop", ip4);
-	}
-      else if (fp->afi == IP46_TYPE_IP6)
-	{
-	  clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6));
-	  vat_json_object_add_ip6 (node, "next_hop", ip6);
-	}
-    }
-}
-
-static int
-api_ip6_fib_dump (vat_main_t * vam)
-{
-  vl_api_ip6_fib_dump_t *mp;
-  f64 timeout;
-
-  M (IP6_FIB_DUMP, ip6_fib_dump);
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-int
-api_classify_table_ids (vat_main_t * vam)
-{
-  vl_api_classify_table_ids_t *mp;
-  f64 timeout;
-
-  /* Construct the API message */
-  M (CLASSIFY_TABLE_IDS, classify_table_ids);
-  mp->context = 0;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-int
-api_classify_table_by_interface (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_classify_table_by_interface_t *mp;
-  f64 timeout;
-
-  u32 sw_if_index = ~0;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	;
-      else if (unformat (input, "sw_if_index %d", &sw_if_index))
-	;
-      else
-	break;
-    }
-  if (sw_if_index == ~0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface);
-  mp->context = 0;
-  mp->sw_if_index = ntohl (sw_if_index);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-int
-api_classify_table_info (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_classify_table_info_t *mp;
-  f64 timeout;
-
-  u32 table_id = ~0;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "table_id %d", &table_id))
-	;
-      else
-	break;
-    }
-  if (table_id == ~0)
-    {
-      errmsg ("missing table id");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (CLASSIFY_TABLE_INFO, classify_table_info);
-  mp->context = 0;
-  mp->table_id = ntohl (table_id);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-int
-api_classify_session_dump (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_classify_session_dump_t *mp;
-  f64 timeout;
-
-  u32 table_id = ~0;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "table_id %d", &table_id))
-	;
-      else
-	break;
-    }
-  if (table_id == ~0)
-    {
-      errmsg ("missing table id");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (CLASSIFY_SESSION_DUMP, classify_session_dump);
-  mp->context = 0;
-  mp->table_id = ntohl (table_id);
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static void
-vl_api_ipfix_exporter_details_t_handler (vl_api_ipfix_exporter_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "collector_address %U, collector_port %d, "
-	 "src_address %U, vrf_id %d, path_mtu %u, "
-	 "template_interval %u, udp_checksum %d",
-	 format_ip4_address, mp->collector_address,
-	 ntohs (mp->collector_port),
-	 format_ip4_address, mp->src_address,
-	 ntohl (mp->vrf_id), ntohl (mp->path_mtu),
-	 ntohl (mp->template_interval), mp->udp_checksum);
-
-  vam->retval = 0;
-  vam->result_ready = 1;
-}
-
-static void
-  vl_api_ipfix_exporter_details_t_handler_json
-  (vl_api_ipfix_exporter_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-  struct in_addr collector_address;
-  struct in_addr src_address;
-
-  vat_json_init_object (&node);
-  clib_memcpy (&collector_address, &mp->collector_address,
-	       sizeof (collector_address));
-  vat_json_object_add_ip4 (&node, "collector_address", collector_address);
-  vat_json_object_add_uint (&node, "collector_port",
-			    ntohs (mp->collector_port));
-  clib_memcpy (&src_address, &mp->src_address, sizeof (src_address));
-  vat_json_object_add_ip4 (&node, "src_address", src_address);
-  vat_json_object_add_int (&node, "vrf_id", ntohl (mp->vrf_id));
-  vat_json_object_add_uint (&node, "path_mtu", ntohl (mp->path_mtu));
-  vat_json_object_add_uint (&node, "template_interval",
-			    ntohl (mp->template_interval));
-  vat_json_object_add_int (&node, "udp_checksum", mp->udp_checksum);
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-  vam->retval = 0;
-  vam->result_ready = 1;
-}
-
-int
-api_ipfix_exporter_dump (vat_main_t * vam)
-{
-  vl_api_ipfix_exporter_dump_t *mp;
-  f64 timeout;
-
-  /* Construct the API message */
-  M (IPFIX_EXPORTER_DUMP, ipfix_exporter_dump);
-  mp->context = 0;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_ipfix_classify_stream_dump (vat_main_t * vam)
-{
-  vl_api_ipfix_classify_stream_dump_t *mp;
-  f64 timeout;
-
-  /* Construct the API message */
-  M (IPFIX_CLASSIFY_STREAM_DUMP, ipfix_classify_stream_dump);
-  mp->context = 0;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static void
-  vl_api_ipfix_classify_stream_details_t_handler
-  (vl_api_ipfix_classify_stream_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  print (vam->ofp, "domain_id %d, src_port %d",
-	 ntohl (mp->domain_id), ntohs (mp->src_port));
-  vam->retval = 0;
-  vam->result_ready = 1;
-}
-
-static void
-  vl_api_ipfix_classify_stream_details_t_handler_json
-  (vl_api_ipfix_classify_stream_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_uint (&node, "domain_id", ntohl (mp->domain_id));
-  vat_json_object_add_uint (&node, "src_port", ntohs (mp->src_port));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-  vam->retval = 0;
-  vam->result_ready = 1;
-}
-
-static int
-api_ipfix_classify_table_dump (vat_main_t * vam)
-{
-  vl_api_ipfix_classify_table_dump_t *mp;
-  f64 timeout;
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%15s%15s%20s", "table_id", "ip_version",
-	     "transport_protocol");
-    }
-
-  /* Construct the API message */
-  M (IPFIX_CLASSIFY_TABLE_DUMP, ipfix_classify_table_dump);
-
-  /* send it... */
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-static void
-  vl_api_ipfix_classify_table_details_t_handler
-  (vl_api_ipfix_classify_table_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  print (vam->ofp, "%15d%15d%20d", ntohl (mp->table_id), mp->ip_version,
-	 mp->transport_protocol);
-}
-
-static void
-  vl_api_ipfix_classify_table_details_t_handler_json
-  (vl_api_ipfix_classify_table_details_t * mp)
-{
-  vat_json_node_t *node = NULL;
-  vat_main_t *vam = &vat_main;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-
-  node = vat_json_array_add (&vam->json_tree);
-  vat_json_init_object (node);
-
-  vat_json_object_add_uint (node, "table_id", ntohl (mp->table_id));
-  vat_json_object_add_uint (node, "ip_version", mp->ip_version);
-  vat_json_object_add_uint (node, "transport_protocol",
-			    mp->transport_protocol);
-}
-
-static int
-api_sw_interface_span_enable_disable (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_span_enable_disable_t *mp;
-  f64 timeout;
-  u32 src_sw_if_index = ~0;
-  u32 dst_sw_if_index = ~0;
-  u8 state = 3;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (i, "src %U", api_unformat_sw_if_index, vam, &src_sw_if_index))
-	;
-      else if (unformat (i, "src_sw_if_index %d", &src_sw_if_index))
-	;
-      else
-	if (unformat
-	    (i, "dst %U", api_unformat_sw_if_index, vam, &dst_sw_if_index))
-	;
-      else if (unformat (i, "dst_sw_if_index %d", &dst_sw_if_index))
-	;
-      else if (unformat (i, "disable"))
-	state = 0;
-      else if (unformat (i, "rx"))
-	state = 1;
-      else if (unformat (i, "tx"))
-	state = 2;
-      else if (unformat (i, "both"))
-	state = 3;
-      else
-	break;
-    }
-
-  M (SW_INTERFACE_SPAN_ENABLE_DISABLE, sw_interface_span_enable_disable);
-
-  mp->sw_if_index_from = htonl (src_sw_if_index);
-  mp->sw_if_index_to = htonl (dst_sw_if_index);
-  mp->state = state;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static void
-vl_api_sw_interface_span_details_t_handler (vl_api_sw_interface_span_details_t
-					    * mp)
-{
-  vat_main_t *vam = &vat_main;
-  u8 *sw_if_from_name = 0;
-  u8 *sw_if_to_name = 0;
-  u32 sw_if_index_from = ntohl (mp->sw_if_index_from);
-  u32 sw_if_index_to = ntohl (mp->sw_if_index_to);
-  char *states[] = { "none", "rx", "tx", "both" };
-  hash_pair_t *p;
-
-  /* *INDENT-OFF* */
-  hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
-  ({
-    if ((u32) p->value[0] == sw_if_index_from)
-      {
-        sw_if_from_name = (u8 *)(p->key);
-        if (sw_if_to_name)
-          break;
-      }
-    if ((u32) p->value[0] == sw_if_index_to)
-      {
-        sw_if_to_name = (u8 *)(p->key);
-        if (sw_if_from_name)
-          break;
-      }
-  }));
-  /* *INDENT-ON* */
-  print (vam->ofp, "%20s => %20s (%s)",
-	 sw_if_from_name, sw_if_to_name, states[mp->state]);
-}
-
-static void
-  vl_api_sw_interface_span_details_t_handler_json
-  (vl_api_sw_interface_span_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-  u8 *sw_if_from_name = 0;
-  u8 *sw_if_to_name = 0;
-  u32 sw_if_index_from = ntohl (mp->sw_if_index_from);
-  u32 sw_if_index_to = ntohl (mp->sw_if_index_to);
-  hash_pair_t *p;
-
-  /* *INDENT-OFF* */
-  hash_foreach_pair (p, vam->sw_if_index_by_interface_name,
-  ({
-    if ((u32) p->value[0] == sw_if_index_from)
-      {
-        sw_if_from_name = (u8 *)(p->key);
-        if (sw_if_to_name)
-          break;
-      }
-    if ((u32) p->value[0] == sw_if_index_to)
-      {
-        sw_if_to_name = (u8 *)(p->key);
-        if (sw_if_from_name)
-          break;
-      }
-  }));
-  /* *INDENT-ON* */
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "src-if-index", sw_if_index_from);
-  vat_json_object_add_string_copy (node, "src-if-name", sw_if_from_name);
-  vat_json_object_add_uint (node, "dst-if-index", sw_if_index_to);
-  vat_json_object_add_string_copy (node, "dst-if-name", sw_if_to_name);
-  vat_json_object_add_uint (node, "state", mp->state);
-}
-
-static int
-api_sw_interface_span_dump (vat_main_t * vam)
-{
-  vl_api_sw_interface_span_dump_t *mp;
-  f64 timeout;
-
-  M (SW_INTERFACE_SPAN_DUMP, sw_interface_span_dump);
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-int
-api_pg_create_interface (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_pg_create_interface_t *mp;
-  f64 timeout;
-
-  u32 if_id = ~0;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "if_id %d", &if_id))
-	;
-      else
-	break;
-    }
-  if (if_id == ~0)
-    {
-      errmsg ("missing pg interface index");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (PG_CREATE_INTERFACE, pg_create_interface);
-  mp->context = 0;
-  mp->interface_id = ntohl (if_id);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-int
-api_pg_capture (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_pg_capture_t *mp;
-  f64 timeout;
-
-  u32 if_id = ~0;
-  u8 enable = 1;
-  u32 count = 1;
-  u8 pcap_file_set = 0;
-  u8 *pcap_file = 0;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "if_id %d", &if_id))
-	;
-      else if (unformat (input, "pcap %s", &pcap_file))
-	pcap_file_set = 1;
-      else if (unformat (input, "count %d", &count))
-	;
-      else if (unformat (input, "disable"))
-	enable = 0;
-      else
-	break;
-    }
-  if (if_id == ~0)
-    {
-      errmsg ("missing pg interface index");
-      return -99;
-    }
-  if (pcap_file_set > 0)
-    {
-      if (vec_len (pcap_file) > 255)
-	{
-	  errmsg ("pcap file name is too long");
-	  return -99;
-	}
-    }
-
-  u32 name_len = vec_len (pcap_file);
-  /* Construct the API message */
-  M (PG_CAPTURE, pg_capture);
-  mp->context = 0;
-  mp->interface_id = ntohl (if_id);
-  mp->is_enabled = enable;
-  mp->count = ntohl (count);
-  mp->pcap_name_length = ntohl (name_len);
-  if (pcap_file_set != 0)
-    {
-      clib_memcpy (mp->pcap_file_name, pcap_file, name_len);
-    }
-  vec_free (pcap_file);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-int
-api_pg_enable_disable (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_pg_enable_disable_t *mp;
-  f64 timeout;
-
-  u8 enable = 1;
-  u8 stream_name_set = 0;
-  u8 *stream_name = 0;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "stream %s", &stream_name))
-	stream_name_set = 1;
-      else if (unformat (input, "disable"))
-	enable = 0;
-      else
-	break;
-    }
-
-  if (stream_name_set > 0)
-    {
-      if (vec_len (stream_name) > 255)
-	{
-	  errmsg ("stream name too long");
-	  return -99;
-	}
-    }
-
-  u32 name_len = vec_len (stream_name);
-  /* Construct the API message */
-  M (PG_ENABLE_DISABLE, pg_enable_disable);
-  mp->context = 0;
-  mp->is_enabled = enable;
-  if (stream_name_set != 0)
-    {
-      mp->stream_name_length = ntohl (name_len);
-      clib_memcpy (mp->stream_name, stream_name, name_len);
-    }
-  vec_free (stream_name);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-int
-api_ip_source_and_port_range_check_add_del (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_ip_source_and_port_range_check_add_del_t *mp;
-  f64 timeout;
-
-  u16 *low_ports = 0;
-  u16 *high_ports = 0;
-  u16 this_low;
-  u16 this_hi;
-  ip4_address_t ip4_addr;
-  ip6_address_t ip6_addr;
-  u32 length;
-  u32 tmp, tmp2;
-  u8 prefix_set = 0;
-  u32 vrf_id = ~0;
-  u8 is_add = 1;
-  u8 is_ipv6 = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%U/%d", unformat_ip4_address, &ip4_addr, &length))
-	{
-	  prefix_set = 1;
-	}
-      else
-	if (unformat
-	    (input, "%U/%d", unformat_ip6_address, &ip6_addr, &length))
-	{
-	  prefix_set = 1;
-	  is_ipv6 = 1;
-	}
-      else if (unformat (input, "vrf %d", &vrf_id))
-	;
-      else if (unformat (input, "del"))
-	is_add = 0;
-      else if (unformat (input, "port %d", &tmp))
-	{
-	  if (tmp == 0 || tmp > 65535)
-	    {
-	      errmsg ("port %d out of range", tmp);
-	      return -99;
-	    }
-	  this_low = tmp;
-	  this_hi = this_low + 1;
-	  vec_add1 (low_ports, this_low);
-	  vec_add1 (high_ports, this_hi);
-	}
-      else if (unformat (input, "range %d - %d", &tmp, &tmp2))
-	{
-	  if ((tmp > tmp2) || (tmp == 0) || (tmp2 > 65535))
-	    {
-	      errmsg ("incorrect range parameters");
-	      return -99;
-	    }
-	  this_low = tmp;
-	  /* Note: in debug CLI +1 is added to high before
-	     passing to real fn that does "the work"
-	     (ip_source_and_port_range_check_add_del).
-	     This fn is a wrapper around the binary API fn a
-	     control plane will call, which expects this increment
-	     to have occurred. Hence letting the binary API control
-	     plane fn do the increment for consistency between VAT
-	     and other control planes.
-	   */
-	  this_hi = tmp2;
-	  vec_add1 (low_ports, this_low);
-	  vec_add1 (high_ports, this_hi);
-	}
-      else
-	break;
-    }
-
-  if (prefix_set == 0)
-    {
-      errmsg ("<address>/<mask> not specified");
-      return -99;
-    }
-
-  if (vrf_id == ~0)
-    {
-      errmsg ("VRF ID required, not specified");
-      return -99;
-    }
-
-  if (vrf_id == 0)
-    {
-      errmsg
-	("VRF ID should not be default. Should be distinct VRF for this purpose.");
-      return -99;
-    }
-
-  if (vec_len (low_ports) == 0)
-    {
-      errmsg ("At least one port or port range required");
-      return -99;
-    }
-
-  M (IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL,
-     ip_source_and_port_range_check_add_del);
-
-  mp->is_add = is_add;
-
-  if (is_ipv6)
-    {
-      mp->is_ipv6 = 1;
-      clib_memcpy (mp->address, &ip6_addr, sizeof (ip6_addr));
-    }
-  else
-    {
-      mp->is_ipv6 = 0;
-      clib_memcpy (mp->address, &ip4_addr, sizeof (ip4_addr));
-    }
-
-  mp->mask_length = length;
-  mp->number_of_ranges = vec_len (low_ports);
-
-  clib_memcpy (mp->low_ports, low_ports, vec_len (low_ports));
-  vec_free (low_ports);
-
-  clib_memcpy (mp->high_ports, high_ports, vec_len (high_ports));
-  vec_free (high_ports);
-
-  mp->vrf_id = ntohl (vrf_id);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-int
-api_ip_source_and_port_range_check_interface_add_del (vat_main_t * vam)
-{
-  unformat_input_t *input = vam->input;
-  vl_api_ip_source_and_port_range_check_interface_add_del_t *mp;
-  f64 timeout;
-  u32 sw_if_index = ~0;
-  int vrf_set = 0;
-  u32 tcp_out_vrf_id = ~0, udp_out_vrf_id = ~0;
-  u32 tcp_in_vrf_id = ~0, udp_in_vrf_id = ~0;
-  u8 is_add = 1;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	;
-      else if (unformat (input, "sw_if_index %d", &sw_if_index))
-	;
-      else if (unformat (input, "tcp-out-vrf %d", &tcp_out_vrf_id))
-	vrf_set = 1;
-      else if (unformat (input, "udp-out-vrf %d", &udp_out_vrf_id))
-	vrf_set = 1;
-      else if (unformat (input, "tcp-in-vrf %d", &tcp_in_vrf_id))
-	vrf_set = 1;
-      else if (unformat (input, "udp-in-vrf %d", &udp_in_vrf_id))
-	vrf_set = 1;
-      else if (unformat (input, "del"))
-	is_add = 0;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    {
-      errmsg ("Interface required but not specified");
-      return -99;
-    }
-
-  if (vrf_set == 0)
-    {
-      errmsg ("VRF ID required but not specified");
-      return -99;
-    }
-
-  if (tcp_out_vrf_id == 0
-      || udp_out_vrf_id == 0 || tcp_in_vrf_id == 0 || udp_in_vrf_id == 0)
-    {
-      errmsg
-	("VRF ID should not be default. Should be distinct VRF for this purpose.");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL,
-     ip_source_and_port_range_check_interface_add_del);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->is_add = is_add;
-  mp->tcp_out_vrf_id = ntohl (tcp_out_vrf_id);
-  mp->udp_out_vrf_id = ntohl (udp_out_vrf_id);
-  mp->tcp_in_vrf_id = ntohl (tcp_in_vrf_id);
-  mp->udp_in_vrf_id = ntohl (udp_in_vrf_id);
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-}
-
-static int
-api_ipsec_gre_add_del_tunnel (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ipsec_gre_add_del_tunnel_t *mp;
-  f64 timeout;
-  u32 local_sa_id = 0;
-  u32 remote_sa_id = 0;
-  ip4_address_t src_address;
-  ip4_address_t dst_address;
-  u8 is_add = 1;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "local_sa %d", &local_sa_id))
-	;
-      else if (unformat (i, "remote_sa %d", &remote_sa_id))
-	;
-      else if (unformat (i, "src %U", unformat_ip4_address, &src_address))
-	;
-      else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address))
-	;
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  M (IPSEC_GRE_ADD_DEL_TUNNEL, ipsec_gre_add_del_tunnel);
-
-  mp->local_sa_id = ntohl (local_sa_id);
-  mp->remote_sa_id = ntohl (remote_sa_id);
-  clib_memcpy (mp->src_address, &src_address, sizeof (src_address));
-  clib_memcpy (mp->dst_address, &dst_address, sizeof (dst_address));
-  mp->is_add = is_add;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_punt (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_punt_t *mp;
-  f64 timeout;
-  u32 ipv = ~0;
-  u32 protocol = ~0;
-  u32 port = ~0;
-  int is_add = 1;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "ip %d", &ipv))
-	;
-      else if (unformat (i, "protocol %d", &protocol))
-	;
-      else if (unformat (i, "port %d", &port))
-	;
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  M (PUNT, punt);
-
-  mp->is_add = (u8) is_add;
-  mp->ipv = (u8) ipv;
-  mp->l4_protocol = (u8) protocol;
-  mp->l4_port = htons ((u16) port);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static void vl_api_ipsec_gre_tunnel_details_t_handler
-  (vl_api_ipsec_gre_tunnel_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "%11d%15U%15U%14d%14d",
-	 ntohl (mp->sw_if_index),
-	 format_ip4_address, &mp->src_address,
-	 format_ip4_address, &mp->dst_address,
-	 ntohl (mp->local_sa_id), ntohl (mp->remote_sa_id));
-}
-
-static void vl_api_ipsec_gre_tunnel_details_t_handler_json
-  (vl_api_ipsec_gre_tunnel_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-  struct in_addr ip4;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
-  clib_memcpy (&ip4, &mp->src_address, sizeof (ip4));
-  vat_json_object_add_ip4 (node, "src_address", ip4);
-  clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4));
-  vat_json_object_add_ip4 (node, "dst_address", ip4);
-  vat_json_object_add_uint (node, "local_sa_id", ntohl (mp->local_sa_id));
-  vat_json_object_add_uint (node, "remote_sa_id", ntohl (mp->remote_sa_id));
-}
-
-static int
-api_ipsec_gre_tunnel_dump (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_ipsec_gre_tunnel_dump_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else
-	break;
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      sw_if_index = ~0;
-    }
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%11s%15s%15s%14s%14s",
-	     "sw_if_index", "src_address", "dst_address",
-	     "local_sa_id", "remote_sa_id");
-    }
-
-  /* Get list of gre-tunnel interfaces */
-  M (IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump);
-
-  mp->sw_if_index = htonl (sw_if_index);
-
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-static int
-api_delete_subif (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_delete_subif_t *mp;
-  f64 timeout;
-  u32 sw_if_index = ~0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	;
-      if (unformat (i, "sw_if_index %d", &sw_if_index))
-	;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    {
-      errmsg ("missing sw_if_index");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (DELETE_SUBIF, delete_subif);
-  mp->sw_if_index = ntohl (sw_if_index);
-
-  S;
-  W;
-}
-
-#define foreach_pbb_vtr_op      \
-_("disable",  L2_VTR_DISABLED)  \
-_("pop",  L2_VTR_POP_2)         \
-_("push",  L2_VTR_PUSH_2)
-
-static int
-api_l2_interface_pbb_tag_rewrite (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_l2_interface_pbb_tag_rewrite_t *mp;
-  f64 timeout;
-  u32 sw_if_index = ~0, vtr_op = ~0;
-  u16 outer_tag = ~0;
-  u8 dmac[6], smac[6];
-  u8 dmac_set = 0, smac_set = 0;
-  u16 vlanid = 0;
-  u32 sid = ~0;
-  u32 tmp;
-
-  /* Shut up coverity */
-  memset (dmac, 0, sizeof (dmac));
-  memset (smac, 0, sizeof (smac));
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	;
-      else if (unformat (i, "vtr_op %d", &vtr_op))
-	;
-#define _(n,v) else if (unformat(i, n)) {vtr_op = v;}
-      foreach_pbb_vtr_op
-#undef _
-	else if (unformat (i, "translate_pbb_stag"))
-	{
-	  if (unformat (i, "%d", &tmp))
-	    {
-	      vtr_op = L2_VTR_TRANSLATE_2_1;
-	      outer_tag = tmp;
-	    }
-	  else
-	    {
-	      errmsg
-		("translate_pbb_stag operation requires outer tag definition");
-	      return -99;
-	    }
-	}
-      else if (unformat (i, "dmac %U", unformat_ethernet_address, dmac))
-	dmac_set++;
-      else if (unformat (i, "smac %U", unformat_ethernet_address, smac))
-	smac_set++;
-      else if (unformat (i, "sid %d", &sid))
-	;
-      else if (unformat (i, "vlanid %d", &tmp))
-	vlanid = tmp;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if ((sw_if_index == ~0) || (vtr_op == ~0))
-    {
-      errmsg ("missing sw_if_index or vtr operation");
-      return -99;
-    }
-  if (((vtr_op == L2_VTR_PUSH_2) || (vtr_op == L2_VTR_TRANSLATE_2_2))
-      && ((dmac_set == 0) || (smac_set == 0) || (sid == ~0)))
-    {
-      errmsg
-	("push and translate_qinq operations require dmac, smac, sid and optionally vlanid");
-      return -99;
-    }
-
-  M (L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite);
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->vtr_op = ntohl (vtr_op);
-  mp->outer_tag = ntohs (outer_tag);
-  clib_memcpy (mp->b_dmac, dmac, sizeof (dmac));
-  clib_memcpy (mp->b_smac, smac, sizeof (smac));
-  mp->b_vlanid = ntohs (vlanid);
-  mp->i_sid = ntohl (sid);
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_flow_classify_set_interface (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_flow_classify_set_interface_t *mp;
-  f64 timeout;
-  u32 sw_if_index;
-  int sw_if_index_set;
-  u32 ip4_table_index = ~0;
-  u32 ip6_table_index = ~0;
-  u8 is_add = 1;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	sw_if_index_set = 1;
-      else if (unformat (i, "del"))
-	is_add = 0;
-      else if (unformat (i, "ip4-table %d", &ip4_table_index))
-	;
-      else if (unformat (i, "ip6-table %d", &ip6_table_index))
-	;
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error, i);
-	  return -99;
-	}
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  M (FLOW_CLASSIFY_SET_INTERFACE, flow_classify_set_interface);
-
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->ip4_table_index = ntohl (ip4_table_index);
-  mp->ip6_table_index = ntohl (ip6_table_index);
-  mp->is_add = is_add;
-
-  S;
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_flow_classify_dump (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_flow_classify_dump_t *mp;
-  f64 timeout = ~0;
-  u8 type = FLOW_CLASSIFY_N_TABLES;
-
-  if (unformat (i, "type %U", unformat_flow_classify_table_type, &type))
-    ;
-  else
-    {
-      errmsg ("classify table type must be specified");
-      return -99;
-    }
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%10s%20s", "Intfc idx", "Classify table");
-    }
-
-  M (FLOW_CLASSIFY_DUMP, flow_classify_dump);
-  mp->type = type;
-  /* send it... */
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  /* Wait for a reply... */
-  W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int
-api_feature_enable_disable (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_feature_enable_disable_t *mp;
-  f64 timeout;
-  u8 *arc_name = 0;
-  u8 *feature_name = 0;
-  u32 sw_if_index = ~0;
-  u8 enable = 1;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "arc_name %s", &arc_name))
-	;
-      else if (unformat (i, "feature_name %s", &feature_name))
-	;
-      else
-	if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	;
-      else if (unformat (i, "disable"))
-	enable = 0;
-      else
-	break;
-    }
-
-  if (arc_name == 0)
-    {
-      errmsg ("missing arc name");
-      return -99;
-    }
-  if (vec_len (arc_name) > 63)
-    {
-      errmsg ("arc name too long");
-    }
-
-  if (feature_name == 0)
-    {
-      errmsg ("missing feature name");
-      return -99;
-    }
-  if (vec_len (feature_name) > 63)
-    {
-      errmsg ("feature name too long");
-    }
-
-  if (sw_if_index == ~0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (FEATURE_ENABLE_DISABLE, feature_enable_disable);
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->enable = enable;
-  clib_memcpy (mp->arc_name, arc_name, vec_len (arc_name));
-  clib_memcpy (mp->feature_name, feature_name, vec_len (feature_name));
-  vec_free (arc_name);
-  vec_free (feature_name);
-
-  S;
-  W;
-}
-
-static int
-api_sw_interface_tag_add_del (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_tag_add_del_t *mp;
-  f64 timeout;
-  u32 sw_if_index = ~0;
-  u8 *tag = 0;
-  u8 enable = 1;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "tag %s", &tag))
-	;
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	;
-      else if (unformat (i, "del"))
-	enable = 0;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  if (enable && (tag == 0))
-    {
-      errmsg ("no tag specified");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del);
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->is_add = enable;
-  if (enable)
-    strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1);
-  vec_free (tag);
-
-  S;
-  W;
-}
-
-static void vl_api_l2_xconnect_details_t_handler
-  (vl_api_l2_xconnect_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "%15d%15d",
-	 ntohl (mp->rx_sw_if_index), ntohl (mp->tx_sw_if_index));
-}
-
-static void vl_api_l2_xconnect_details_t_handler_json
-  (vl_api_l2_xconnect_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "rx_sw_if_index",
-			    ntohl (mp->rx_sw_if_index));
-  vat_json_object_add_uint (node, "tx_sw_if_index",
-			    ntohl (mp->tx_sw_if_index));
-}
-
-static int
-api_l2_xconnect_dump (vat_main_t * vam)
-{
-  vl_api_l2_xconnect_dump_t *mp;
-  f64 timeout;
-
-  if (!vam->json_output)
-    {
-      print (vam->ofp, "%15s%15s", "rx_sw_if_index", "tx_sw_if_index");
-    }
-
-  M (L2_XCONNECT_DUMP, l2_xconnect_dump);
-
-  S;
-
-  /* Use a control ping for synchronization */
-  {
-    vl_api_control_ping_t *mp;
-    M (CONTROL_PING, control_ping);
-    S;
-  }
-  W;
-}
-
-static int
-api_sw_interface_set_mtu (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_sw_interface_set_mtu_t *mp;
-  f64 timeout;
-  u32 sw_if_index = ~0;
-  u32 mtu = 0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "mtu %d", &mtu))
-	;
-      if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
-	;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	;
-      else
-	break;
-    }
-
-  if (sw_if_index == ~0)
-    {
-      errmsg ("missing interface name or sw_if_index");
-      return -99;
-    }
-
-  if (mtu == 0)
-    {
-      errmsg ("no mtu specified");
-      return -99;
-    }
-
-  /* Construct the API message */
-  M (SW_INTERFACE_SET_MTU, sw_interface_set_mtu);
-  mp->sw_if_index = ntohl (sw_if_index);
-  mp->mtu = ntohs ((u16) mtu);
-
-  S;
-  W;
-}
-
-
-static int
-q_or_quit (vat_main_t * vam)
-{
-  longjmp (vam->jump_buf, 1);
-  return 0;			/* not so much */
-}
-
-static int
-q (vat_main_t * vam)
-{
-  return q_or_quit (vam);
-}
-
-static int
-quit (vat_main_t * vam)
-{
-  return q_or_quit (vam);
-}
-
-static int
-comment (vat_main_t * vam)
-{
-  return 0;
-}
-
-static int
-cmd_cmp (void *a1, void *a2)
-{
-  u8 **c1 = a1;
-  u8 **c2 = a2;
-
-  return strcmp ((char *) (c1[0]), (char *) (c2[0]));
-}
-
-static int
-help (vat_main_t * vam)
-{
-  u8 **cmds = 0;
-  u8 *name = 0;
-  hash_pair_t *p;
-  unformat_input_t *i = vam->input;
-  int j;
-
-  if (unformat (i, "%s", &name))
-    {
-      uword *hs;
-
-      vec_add1 (name, 0);
-
-      hs = hash_get_mem (vam->help_by_name, name);
-      if (hs)
-	print (vam->ofp, "usage: %s %s", name, hs[0]);
-      else
-	print (vam->ofp, "No such msg / command '%s'", name);
-      vec_free (name);
-      return 0;
-    }
-
-  print (vam->ofp, "Help is available for the following:");
-
-    /* *INDENT-OFF* */
-    hash_foreach_pair (p, vam->function_by_name,
-    ({
-      vec_add1 (cmds, (u8 *)(p->key));
-    }));
-    /* *INDENT-ON* */
-
-  vec_sort_with_function (cmds, cmd_cmp);
-
-  for (j = 0; j < vec_len (cmds); j++)
-    print (vam->ofp, "%s", cmds[j]);
-
-  vec_free (cmds);
-  return 0;
-}
-
-static int
-set (vat_main_t * vam)
-{
-  u8 *name = 0, *value = 0;
-  unformat_input_t *i = vam->input;
-
-  if (unformat (i, "%s", &name))
-    {
-      /* The input buffer is a vector, not a string. */
-      value = vec_dup (i->buffer);
-      vec_delete (value, i->index, 0);
-      /* Almost certainly has a trailing newline */
-      if (value[vec_len (value) - 1] == '\n')
-	value[vec_len (value) - 1] = 0;
-      /* Make sure it's a proper string, one way or the other */
-      vec_add1 (value, 0);
-      (void) clib_macro_set_value (&vam->macro_main,
-				   (char *) name, (char *) value);
-    }
-  else
-    errmsg ("usage: set <name> <value>");
-
-  vec_free (name);
-  vec_free (value);
-  return 0;
-}
-
-static int
-unset (vat_main_t * vam)
-{
-  u8 *name = 0;
-
-  if (unformat (vam->input, "%s", &name))
-    if (clib_macro_unset (&vam->macro_main, (char *) name) == 1)
-      errmsg ("unset: %s wasn't set", name);
-  vec_free (name);
-  return 0;
-}
-
-typedef struct
-{
-  u8 *name;
-  u8 *value;
-} macro_sort_t;
-
-
-static int
-macro_sort_cmp (void *a1, void *a2)
-{
-  macro_sort_t *s1 = a1;
-  macro_sort_t *s2 = a2;
-
-  return strcmp ((char *) (s1->name), (char *) (s2->name));
-}
-
-static int
-dump_macro_table (vat_main_t * vam)
-{
-  macro_sort_t *sort_me = 0, *sm;
-  int i;
-  hash_pair_t *p;
-
-    /* *INDENT-OFF* */
-    hash_foreach_pair (p, vam->macro_main.the_value_table_hash,
-    ({
-      vec_add2 (sort_me, sm, 1);
-      sm->name = (u8 *)(p->key);
-      sm->value = (u8 *) (p->value[0]);
-    }));
-    /* *INDENT-ON* */
-
-  vec_sort_with_function (sort_me, macro_sort_cmp);
-
-  if (vec_len (sort_me))
-    print (vam->ofp, "%-15s%s", "Name", "Value");
-  else
-    print (vam->ofp, "The macro table is empty...");
-
-  for (i = 0; i < vec_len (sort_me); i++)
-    print (vam->ofp, "%-15s%s", sort_me[i].name, sort_me[i].value);
-  return 0;
-}
-
-static int
-dump_node_table (vat_main_t * vam)
-{
-  int i, j;
-  vlib_node_t *node, *next_node;
-
-  if (vec_len (vam->graph_nodes) == 0)
-    {
-      print (vam->ofp, "Node table empty, issue get_node_graph...");
-      return 0;
-    }
-
-  for (i = 0; i < vec_len (vam->graph_nodes); i++)
-    {
-      node = vam->graph_nodes[i];
-      print (vam->ofp, "[%d] %s", i, node->name);
-      for (j = 0; j < vec_len (node->next_nodes); j++)
-	{
-	  if (node->next_nodes[j] != ~0)
-	    {
-	      next_node = vam->graph_nodes[node->next_nodes[j]];
-	      print (vam->ofp, "  [%d] %s", j, next_node->name);
-	    }
-	}
-    }
-  return 0;
-}
-
-static int
-value_sort_cmp (void *a1, void *a2)
-{
-  name_sort_t *n1 = a1;
-  name_sort_t *n2 = a2;
-
-  if (n1->value < n2->value)
-    return -1;
-  if (n1->value > n2->value)
-    return 1;
-  return 0;
-}
-
-
-static int
-dump_msg_api_table (vat_main_t * vam)
-{
-  api_main_t *am = &api_main;
-  name_sort_t *nses = 0, *ns;
-  hash_pair_t *hp;
-  int i;
-
-  /* *INDENT-OFF* */
-  hash_foreach_pair (hp, am->msg_index_by_name_and_crc,
-  ({
-    vec_add2 (nses, ns, 1);
-    ns->name = (u8 *)(hp->key);
-    ns->value = (u32) hp->value[0];
-  }));
-  /* *INDENT-ON* */
-
-  vec_sort_with_function (nses, value_sort_cmp);
-
-  for (i = 0; i < vec_len (nses); i++)
-    print (vam->ofp, " [%d]: %s", nses[i].value, nses[i].name);
-  vec_free (nses);
-  return 0;
-}
-
-static int
-get_msg_id (vat_main_t * vam)
-{
-  u8 *name_and_crc;
-  u32 message_index;
-
-  if (unformat (vam->input, "%s", &name_and_crc))
-    {
-      message_index = vl_api_get_msg_index (name_and_crc);
-      if (message_index == ~0)
-	{
-	  print (vam->ofp, " '%s' not found", name_and_crc);
-	  return 0;
-	}
-      print (vam->ofp, " '%s' has message index %d",
-	     name_and_crc, message_index);
-      return 0;
-    }
-  errmsg ("name_and_crc required...");
-  return 0;
-}
-
-static int
-search_node_table (vat_main_t * vam)
-{
-  unformat_input_t *line_input = vam->input;
-  u8 *node_to_find;
-  int j;
-  vlib_node_t *node, *next_node;
-  uword *p;
-
-  if (vam->graph_node_index_by_name == 0)
-    {
-      print (vam->ofp, "Node table empty, issue get_node_graph...");
-      return 0;
-    }
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "%s", &node_to_find))
-	{
-	  vec_add1 (node_to_find, 0);
-	  p = hash_get_mem (vam->graph_node_index_by_name, node_to_find);
-	  if (p == 0)
-	    {
-	      print (vam->ofp, "%s not found...", node_to_find);
-	      goto out;
-	    }
-	  node = vam->graph_nodes[p[0]];
-	  print (vam->ofp, "[%d] %s", p[0], node->name);
-	  for (j = 0; j < vec_len (node->next_nodes); j++)
-	    {
-	      if (node->next_nodes[j] != ~0)
-		{
-		  next_node = vam->graph_nodes[node->next_nodes[j]];
-		  print (vam->ofp, "  [%d] %s", j, next_node->name);
-		}
-	    }
-	}
-
-      else
-	{
-	  clib_warning ("parse error '%U'", format_unformat_error,
-			line_input);
-	  return -99;
-	}
-
-    out:
-      vec_free (node_to_find);
-
-    }
-
-  return 0;
-}
-
-
-static int
-script (vat_main_t * vam)
-{
-#if (VPP_API_TEST_BUILTIN==0)
-  u8 *s = 0;
-  char *save_current_file;
-  unformat_input_t save_input;
-  jmp_buf save_jump_buf;
-  u32 save_line_number;
-
-  FILE *new_fp, *save_ifp;
-
-  if (unformat (vam->input, "%s", &s))
-    {
-      new_fp = fopen ((char *) s, "r");
-      if (new_fp == 0)
-	{
-	  errmsg ("Couldn't open script file %s", s);
-	  vec_free (s);
-	  return -99;
-	}
-    }
-  else
-    {
-      errmsg ("Missing script name");
-      return -99;
-    }
-
-  clib_memcpy (&save_input, &vam->input, sizeof (save_input));
-  clib_memcpy (&save_jump_buf, &vam->jump_buf, sizeof (save_jump_buf));
-  save_ifp = vam->ifp;
-  save_line_number = vam->input_line_number;
-  save_current_file = (char *) vam->current_file;
-
-  vam->input_line_number = 0;
-  vam->ifp = new_fp;
-  vam->current_file = s;
-  do_one_file (vam);
-
-  clib_memcpy (&vam->input, &save_input, sizeof (vam->input));
-  clib_memcpy (&vam->jump_buf, &save_jump_buf, sizeof (save_jump_buf));
-  vam->ifp = save_ifp;
-  vam->input_line_number = save_line_number;
-  vam->current_file = (u8 *) save_current_file;
-  vec_free (s);
-
-  return 0;
-#else
-  clib_warning ("use the exec command...");
-  return -99;
-#endif
-}
-
-static int
-echo (vat_main_t * vam)
-{
-  print (vam->ofp, "%v", vam->input->buffer);
-  return 0;
-}
-
-/* List of API message constructors, CLI names map to api_xxx */
-#define foreach_vpe_api_msg                                             \
-_(create_loopback,"[mac <mac-addr>]")                                   \
-_(sw_interface_dump,"")                                                 \
-_(sw_interface_set_flags,                                               \
-  "<intfc> | sw_if_index <id> admin-up | admin-down link-up | link down") \
-_(sw_interface_add_del_address,                                         \
-  "<intfc> | sw_if_index <id> <ip4-address> | <ip6-address> [del] [del-all] ") \
-_(sw_interface_set_table,                                               \
-  "<intfc> | sw_if_index <id> vrf <table-id> [ipv6]")                   \
-_(sw_interface_set_mpls_enable,                                         \
-  "<intfc> | sw_if_index [disable | dis]")                              \
-_(sw_interface_set_vpath,                                               \
-  "<intfc> | sw_if_index <id> enable | disable")                        \
-_(sw_interface_set_vxlan_bypass,                                        \
-  "<intfc> | sw_if_index <id> [ip4 | ip6] enable | disable")            \
-_(sw_interface_set_l2_xconnect,                                         \
-  "rx <intfc> | rx_sw_if_index <id> tx <intfc> | tx_sw_if_index <id>\n" \
-  "enable | disable")                                                   \
-_(sw_interface_set_l2_bridge,                                           \
-  "<intfc> | sw_if_index <id> bd_id <bridge-domain-id>\n"               \
-  "[shg <split-horizon-group>] [bvi]\n"                                 \
-  "enable | disable")                                                   \
-_(sw_interface_set_dpdk_hqos_pipe,                                      \
-  "rx <intfc> | sw_if_index <id> subport <subport-id> pipe <pipe-id>\n" \
-  "profile <profile-id>\n")                                             \
-_(sw_interface_set_dpdk_hqos_subport,                                   \
-  "rx <intfc> | sw_if_index <id> subport <subport-id> [rate <n>]\n"     \
-  "[bktsize <n>] [tc0 <n>] [tc1 <n>] [tc2 <n>] [tc3 <n>] [period <n>]\n") \
-_(sw_interface_set_dpdk_hqos_tctbl,                                     \
-  "rx <intfc> | sw_if_index <id> entry <n> tc <n> queue <n>\n")         \
-_(bridge_domain_add_del,                                                \
-  "bd_id <bridge-domain-id> [flood 1|0] [uu-flood 1|0] [forward 1|0] [learn 1|0] [arp-term 1|0] [del]\n") \
-_(bridge_domain_dump, "[bd_id <bridge-domain-id>]\n")                   \
-_(l2fib_add_del,                                                        \
-  "mac <mac-addr> bd_id <bridge-domain-id> [del] | sw_if <intfc> | sw_if_index <id> [static] [filter] [bvi] [count <nn>]\n") \
-_(l2_flags,                                                             \
-  "sw_if <intfc> | sw_if_index <id> [learn] [forward] [uu-flood] [flood]\n") \
-_(bridge_flags,                                                         \
-  "bd_id <bridge-domain-id> [learn] [forward] [uu-flood] [flood] [arp-term] [disable]\n") \
-_(tap_connect,                                                          \
-  "tapname <name> mac <mac-addr> | random-mac [tag <string>]")          \
-_(tap_modify,                                                           \
-  "<vpp-if-name> | sw_if_index <id> tapname <name> mac <mac-addr> | random-mac") \
-_(tap_delete,                                                           \
-  "<vpp-if-name> | sw_if_index <id>")                                   \
-_(sw_interface_tap_dump, "")                                            \
-_(ip_add_del_route,                                                     \
-  "<addr>/<mask> via <addr> [table-id <n>]\n"                           \
-  "[<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n"               \
-  "[weight <n>] [drop] [local] [classify <n>] [del]\n"                  \
-  "[multipath] [count <n>]")                                            \
-_(mpls_route_add_del,                                                   \
-  "<label> <eos> via <addr> [table-id <n>]\n"                           \
-  "[<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n"               \
-  "[weight <n>] [drop] [local] [classify <n>] [del]\n"                  \
-  "[multipath] [count <n>]")                                            \
-_(mpls_ip_bind_unbind,                                                  \
-  "<label> <addr/len>")                                                 \
-_(mpls_tunnel_add_del,                                                  \
-  " via <addr> [table-id <n>]\n"                                        \
-  "sw_if_index <id>] [l2]  [del]")                                      \
-_(proxy_arp_add_del,                                                    \
-  "<lo-ip4-addr> - <hi-ip4-addr> [vrf <n>] [del]")                      \
-_(proxy_arp_intfc_enable_disable,                                       \
-  "<intfc> | sw_if_index <id> enable | disable")                        \
-_(sw_interface_set_unnumbered,                                          \
-  "<intfc> | sw_if_index <id> unnum_if_index <id> [del]")               \
-_(ip_neighbor_add_del,                                                  \
-  "(<intfc> | sw_if_index <id>) dst <ip46-address> "                    \
-  "[mac <mac-addr>] [vrf <vrf-id>] [is_static] [del]")                  \
-_(reset_vrf, "vrf <id> [ipv6]")                                         \
-_(create_vlan_subif, "<intfc> | sw_if_index <id> vlan <n>")             \
-_(create_subif, "<intfc> | sw_if_index <id> sub_id <n>\n"               \
-  "[outer_vlan_id <n>][inner_vlan_id <n>]\n"                            \
-  "[no_tags][one_tag][two_tags][dot1ad][exact_match][default_sub]\n"    \
-  "[outer_vlan_id_any][inner_vlan_id_any]")                             \
-_(oam_add_del, "src <ip4-address> dst <ip4-address> [vrf <n>] [del]")   \
-_(reset_fib, "vrf <n> [ipv6]")                                          \
-_(dhcp_proxy_config,                                                    \
-  "svr <v46-address> src <v46-address>\n"                               \
-   "insert-cid <n> [del]")                                              \
-_(dhcp_proxy_config_2,                                                  \
-  "svr <v46-address> src <v46-address>\n"                               \
-   "rx_vrf_id <nn> server_vrf_id <nn> insert-cid <n> [del]")            \
-_(dhcp_proxy_set_vss,                                                   \
-  "tbl_id <n> fib_id <n> oui <n> [ipv6] [del]")                         \
-_(dhcp_client_config,                                                   \
-  "<intfc> | sw_if_index <id> [hostname <name>] [disable_event] [del]") \
-_(set_ip_flow_hash,                                                     \
-  "vrf <n> [src] [dst] [sport] [dport] [proto] [reverse] [ipv6]")       \
-_(sw_interface_ip6_enable_disable,                                      \
-  "<intfc> | sw_if_index <id> enable | disable")                        \
-_(sw_interface_ip6_set_link_local_address,                              \
-  "<intfc> | sw_if_index <id> <ip6-address>/<mask-width>")              \
-_(sw_interface_ip6nd_ra_prefix,                                         \
-  "<intfc> | sw_if_index <id> <ip6-address>/<mask-width>\n"             \
-  "val_life <n> pref_life <n> [def] [noadv] [offl] [noauto]\n"          \
-  "[nolink] [isno]")                                                    \
-_(sw_interface_ip6nd_ra_config,                                         \
-  "<intfc> | sw_if_index <id> [maxint <n>] [minint <n>]\n"              \
-  "[life <n>] [count <n>] [interval <n>] [suppress]\n"                  \
-  "[managed] [other] [ll] [send] [cease] [isno] [def]")                 \
-_(set_arp_neighbor_limit, "arp_nbr_limit <n> [ipv6]")                   \
-_(l2_patch_add_del,                                                     \
-  "rx <intfc> | rx_sw_if_index <id> tx <intfc> | tx_sw_if_index <id>\n" \
-  "enable | disable")                                                   \
-_(sr_tunnel_add_del,                                                    \
-  "[name <name>] src <ip6-addr> dst <ip6-addr>/<mw> \n"                 \
-  "(next <ip6-addr>)+ [tag <ip6-addr>]* [clean] [reroute] \n"           \
-  "[policy <policy_name>]")						\
-_(sr_policy_add_del,                                                    \
-  "name <name> tunnel <tunnel-name> [tunnel <tunnel-name>]* [del]")	\
-_(sr_multicast_map_add_del,                                             \
-  "address [ip6 multicast address] sr-policy [policy name] [del]")	\
-_(classify_add_del_table,                                               \
-  "buckets <nn> [skip <n>] [match <n>] [memory_size <nn-bytes>]\n"	\
-  " [del] [del-chain] mask <mask-value>\n"                              \
-  " [l2-miss-next | miss-next | acl-miss-next] <name|nn>\n" 		\
-  " [current-data-flag <n>] [current-data-offset <nn>] [table <nn>]")   \
-_(classify_add_del_session,                                             \
-  "[hit-next|l2-hit-next|acl-hit-next|policer-hit-next] <name|nn>\n"    \
-  "  table-index <nn> skip_n <nn> match_n <nn> match [hex] [l2]\n"      \
-  "  [l3 [ip4|ip6]] [action set-ip4-fib-id <nn>]\n"                     \
-  "  [action set-ip6-fib-id <nn> | action <n> metadata <nn>] [del]")    \
-_(classify_set_interface_ip_table,                                      \
-  "<intfc> | sw_if_index <nn> table <nn>")				\
-_(classify_set_interface_l2_tables,                                     \
-  "<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>]\n"      \
-  "  [other-table <nn>]")                                               \
-_(get_node_index, "node <node-name")                                    \
-_(add_node_next, "node <node-name> next <next-node-name>")              \
-_(l2tpv3_create_tunnel,                                                 \
-  "client_address <ip6-addr> our_address <ip6-addr>\n"                  \
-  "[local_session_id <nn>][remote_session_id <nn>][local_cookie <nn>]\n" \
-  "[remote_cookie <nn>]\n[l2-sublayer-preset]\n")                       \
-_(l2tpv3_set_tunnel_cookies,                                            \
-  "<intfc> | sw_if_index <nn> [new_local_cookie <nn>]\n"                \
-  "[new_remote_cookie <nn>]\n")                                         \
-_(l2tpv3_interface_enable_disable,                                      \
-  "<intfc> | sw_if_index <nn> enable | disable")                        \
-_(l2tpv3_set_lookup_key,                                                \
-  "lookup_v6_src | lookup_v6_dst | lookup_session_id")                  \
-_(sw_if_l2tpv3_tunnel_dump, "")                                         \
-_(vxlan_add_del_tunnel,                                                 \
-  "src <ip-addr> { dst <ip-addr> | group <mcast-ip-addr>\n"             \
-  "{ <intfc> | mcast_sw_if_index <nn> } }\n"                            \
-  "vni <vni> [encap-vrf-id <nn>] [decap-next <l2|nn>] [del]")           \
-_(vxlan_tunnel_dump, "[<intfc> | sw_if_index <nn>]")                    \
-_(gre_add_del_tunnel,                                                   \
-  "src <ip4-addr> dst <ip4-addr> [outer-fib-id <nn>] [teb] [del]\n")    \
-_(gre_tunnel_dump, "[<intfc> | sw_if_index <nn>]")                      \
-_(l2_fib_clear_table, "")                                               \
-_(l2_interface_efp_filter, "sw_if_index <nn> enable | disable")         \
-_(l2_interface_vlan_tag_rewrite,                                        \
-  "<intfc> | sw_if_index <nn> \n"                                       \
-  "[disable][push-[1|2]][pop-[1|2]][translate-1-[1|2]] \n"              \
-  "[translate-2-[1|2]] [push_dot1q 0] tag1 <nn> tag2 <nn>")             \
-_(create_vhost_user_if,                                                 \
-        "socket <filename> [server] [renumber <dev_instance>] "         \
-        "[mac <mac_address>]")                                          \
-_(modify_vhost_user_if,                                                 \
-        "<intfc> | sw_if_index <nn> socket <filename>\n"                \
-        "[server] [renumber <dev_instance>]")                           \
-_(delete_vhost_user_if, "<intfc> | sw_if_index <nn>")                   \
-_(sw_interface_vhost_user_dump, "")                                     \
-_(show_version, "")                                                     \
-_(vxlan_gpe_add_del_tunnel,                                             \
-  "local <addr> remote <addr> vni <nn>\n"                               \
-    "[encap-vrf-id <nn>] [decap-vrf-id <nn>] [next-ip4][next-ip6]"      \
-  "[next-ethernet] [next-nsh]\n")                                       \
-_(vxlan_gpe_tunnel_dump, "[<intfc> | sw_if_index <nn>]")                \
-_(l2_fib_table_dump, "bd_id <bridge-domain-id>")			\
-_(interface_name_renumber,                                              \
-  "<intfc> | sw_if_index <nn> new_show_dev_instance <nn>")		\
-_(input_acl_set_interface,                                              \
-  "<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>]\n"      \
-  "  [l2-table <nn>] [del]")                                            \
-_(want_ip4_arp_events, "address <ip4-address> [del]")                   \
-_(want_ip6_nd_events, "address <ip6-address> [del]")                    \
-_(ip_address_dump, "(ipv4 | ipv6) (<intfc> | sw_if_index <id>)")        \
-_(ip_dump, "ipv4 | ipv6")                                               \
-_(ipsec_spd_add_del, "spd_id <n> [del]")                                \
-_(ipsec_interface_add_del_spd, "(<intfc> | sw_if_index <id>)\n"         \
-  "  spid_id <n> ")                                                     \
-_(ipsec_sad_add_del_entry, "sad_id <n> spi <n> crypto_alg <alg>\n"      \
-  "  crypto_key <hex> tunnel_src <ip4|ip6> tunnel_dst <ip4|ip6>\n"      \
-  "  integ_alg <alg> integ_key <hex>")                                  \
-_(ipsec_spd_add_del_entry, "spd_id <n> priority <n> action <action>\n"  \
-  "  (inbound|outbound) [sa_id <n>] laddr_start <ip4|ip6>\n"            \
-  "  laddr_stop <ip4|ip6> raddr_start <ip4|ip6> raddr_stop <ip4|ip6>\n" \
-  "  [lport_start <n> lport_stop <n>] [rport_start <n> rport_stop <n>]" ) \
-_(ipsec_sa_set_key, "sa_id <n> crypto_key <hex> integ_key <hex>")       \
-_(ikev2_profile_add_del, "name <profile_name> [del]")                   \
-_(ikev2_profile_set_auth, "name <profile_name> auth_method <method>\n"  \
-  "(auth_data 0x<data> | auth_data <data>)")                            \
-_(ikev2_profile_set_id, "name <profile_name> id_type <type>\n"          \
-  "(id_data 0x<data> | id_data <data>) (local|remote)")                 \
-_(ikev2_profile_set_ts, "name <profile_name> protocol <proto>\n"        \
-  "start_port <port> end_port <port> start_addr <ip4> end_addr <ip4>\n" \
-  "(local|remote)")                                                     \
-_(ikev2_set_local_key, "file <absolute_file_path>")                     \
-_(delete_loopback,"sw_if_index <nn>")                                   \
-_(bd_ip_mac_add_del, "bd_id <bridge-domain-id> <ip4/6-addr> <mac-addr> [del]") \
-_(map_add_domain,                                                       \
-  "ip4-pfx <ip4pfx> ip6-pfx <ip6pfx> "					\
-  "ip6-src <ip6addr> "							\
-  "ea-bits-len <n> psid-offset <n> psid-len <n>")			\
-_(map_del_domain, "index <n>")                                          \
-_(map_add_del_rule,                                                     \
-  "index <n> psid <n> dst <ip6addr> [del]")                             \
-_(map_domain_dump, "")                                                  \
-_(map_rule_dump, "index <map-domain>")                                  \
-_(want_interface_events,  "enable|disable")                             \
-_(want_stats,"enable|disable")                                          \
-_(get_first_msg_id, "client <name>")					\
-_(cop_interface_enable_disable, "<intfc> | sw_if_index <nn> [disable]") \
-_(cop_whitelist_enable_disable, "<intfc> | sw_if_index <nn>\n"		\
-  "fib-id <nn> [ip4][ip6][default]")					\
-_(get_node_graph, " ")                                                  \
-_(sw_interface_clear_stats,"<intfc> | sw_if_index <nn>")                \
-_(ioam_enable, "[trace] [pow] [ppc <encap|decap>]")                     \
-_(ioam_disable, "")                                                     \
-_(lisp_add_del_locator_set, "locator-set <locator_name> [iface <intf> |" \
-                            " sw_if_index <sw_if_index> p <priority> "  \
-                            "w <weight>] [del]")                        \
-_(lisp_add_del_locator, "locator-set <locator_name> "                   \
-                        "iface <intf> | sw_if_index <sw_if_index> "     \
-                        "p <priority> w <weight> [del]")                \
-_(lisp_add_del_local_eid,"vni <vni> eid "                               \
-                         "<ipv4|ipv6>/<prefix> | <L2 address> "         \
-                         "locator-set <locator_name> [del]"             \
-                         "[key-id sha1|sha256 secret-key <secret-key>]") \
-_(lisp_gpe_add_del_fwd_entry, "rmt_eid <eid> [lcl_eid <eid>] vni <vni>" \
-  "dp_table <table> loc-pair <lcl_loc> <rmt_loc> ... [del]")            \
-_(lisp_add_del_map_resolver, "<ip4|6-addr> [del]")                      \
-_(lisp_add_del_map_server, "<ip4|6-addr> [del]")                        \
-_(lisp_gpe_enable_disable, "enable|disable")                            \
-_(lisp_enable_disable, "enable|disable")                                \
-_(lisp_map_register_enable_disable, "enable|disable")                   \
-_(lisp_rloc_probe_enable_disable, "enable|disable")                     \
-_(lisp_gpe_add_del_iface, "up|down")                                    \
-_(lisp_add_del_remote_mapping, "add|del vni <vni> eid <dest-eid> "      \
-                               "[seid <seid>] "                         \
-                               "rloc <locator> p <prio> "               \
-                               "w <weight> [rloc <loc> ... ] "          \
-                               "action <action> [del-all]")             \
-_(lisp_add_del_adjacency, "add|del vni <vni> reid <remote-eid> leid "   \
-                          "<local-eid>")                                \
-_(lisp_pitr_set_locator_set, "locator-set <loc-set-name> | del")        \
-_(lisp_map_request_mode, "src-dst|dst-only")                            \
-_(lisp_add_del_map_request_itr_rlocs, "<loc-set-name> [del]")           \
-_(lisp_eid_table_add_del_map, "[del] vni <vni> vrf <vrf>")              \
-_(lisp_locator_set_dump, "[local | remote]")                            \
-_(lisp_locator_dump, "ls_index <index> | ls_name <name>")               \
-_(lisp_eid_table_dump, "[eid <ipv4|ipv6>/<prefix> | <mac>] [vni] "      \
-                       "[local] | [remote]")                            \
-_(lisp_eid_table_vni_dump, "")                                          \
-_(lisp_eid_table_map_dump, "l2|l3")                                     \
-_(lisp_gpe_tunnel_dump, "")                                             \
-_(lisp_map_resolver_dump, "")                                           \
-_(lisp_map_server_dump, "")                                             \
-_(lisp_adjacencies_get, "vni <vni>")                                    \
-_(show_lisp_rloc_probe_state, "")                                       \
-_(show_lisp_map_register_state, "")                                     \
-_(show_lisp_status, "")                                                 \
-_(lisp_get_map_request_itr_rlocs, "")                                   \
-_(show_lisp_pitr, "")                                                   \
-_(show_lisp_map_request_mode, "")                                       \
-_(af_packet_create, "name <host interface name> [hw_addr <mac>]")       \
-_(af_packet_delete, "name <host interface name>")                       \
-_(policer_add_del, "name <policer name> <params> [del]")                \
-_(policer_dump, "[name <policer name>]")                                \
-_(policer_classify_set_interface,                                       \
-  "<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>]\n"      \
-  "  [l2-table <nn>] [del]")                                            \
-_(policer_classify_dump, "type [ip4|ip6|l2]")                           \
-_(netmap_create, "name <interface name> [hw-addr <mac>] [pipe] "        \
-    "[master|slave]")                                                   \
-_(netmap_delete, "name <interface name>")                               \
-_(mpls_tunnel_dump, "tunnel_index <tunnel-id>")                         \
-_(mpls_fib_dump, "")                                                    \
-_(classify_table_ids, "")                                               \
-_(classify_table_by_interface, "sw_if_index <sw_if_index>")             \
-_(classify_table_info, "table_id <nn>")                                 \
-_(classify_session_dump, "table_id <nn>")                               \
-_(set_ipfix_exporter, "collector_address <ip4> [collector_port <nn>] "  \
-    "src_address <ip4> [vrf_id <nn>] [path_mtu <nn>] "                  \
-    "[template_interval <nn>] [udp_checksum]")                          \
-_(ipfix_exporter_dump, "")                                              \
-_(set_ipfix_classify_stream, "[domain <domain-id>] [src_port <src-port>]") \
-_(ipfix_classify_stream_dump, "")                                       \
-_(ipfix_classify_table_add_del, "table <table-index> ip4|ip6 [tcp|udp]") \
-_(ipfix_classify_table_dump, "")                                        \
-_(sw_interface_span_enable_disable, "[src <intfc> | src_sw_if_index <id>] [disable | [[dst <intfc> | dst_sw_if_index <id>] [both|rx|tx]]]") \
-_(sw_interface_span_dump, "")                                           \
-_(get_next_index, "node-name <node-name> next-node-name <node-name>")   \
-_(pg_create_interface, "if_id <nn>")                                    \
-_(pg_capture, "if_id <nnn> pcap <file_name> count <nnn> [disable]")     \
-_(pg_enable_disable, "[stream <id>] disable")                           \
-_(ip_source_and_port_range_check_add_del,                               \
-  "<ip-addr>/<mask> range <nn>-<nn> vrf <id>")                          \
-_(ip_source_and_port_range_check_interface_add_del,                     \
-  "<intf> | sw_if_index <nn> [tcp-out-vrf <id>] [tcp-in-vrf <id>]"      \
-  "[udp-in-vrf <id>] [udp-out-vrf <id>]")                               \
-_(ipsec_gre_add_del_tunnel,                                             \
-  "src <addr> dst <addr> local_sa <sa-id> remote_sa <sa-id> [del]")     \
-_(ipsec_gre_tunnel_dump, "[sw_if_index <nn>]")                          \
-_(delete_subif,"<intfc> | sw_if_index <nn>")                            \
-_(l2_interface_pbb_tag_rewrite,                                         \
-  "<intfc> | sw_if_index <nn> \n"                                       \
-  "[disable | push | pop | translate_pbb_stag <outer_tag>] \n"          \
-  "dmac <mac> smac <mac> sid <nn> [vlanid <nn>]")                       \
-_(punt, "protocol <l4-protocol> [ip <ver>] [port <l4-port>] [del]")     \
-_(flow_classify_set_interface,                                          \
-  "<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>] [del]") \
-_(flow_classify_dump, "type [ip4|ip6]")                                 \
-_(ip_fib_dump, "")                                                      \
-_(ip6_fib_dump, "")                                                     \
-_(feature_enable_disable, "arc_name <arc_name> "                        \
-  "feature_name <feature_name> <intfc> | sw_if_index <nn> [disable]")	\
-_(sw_interface_tag_add_del, "<intfc> | sw_if_index <nn> tag <text>"	\
-"[disable]")                                                        	\
-_(l2_xconnect_dump, "")                                             	\
-_(sw_interface_set_mtu, "<intfc> | sw_if_index <nn> mtu <nn>")        \
-_(ip_neighbor_dump, "[ip6] <intfc> | sw_if_index <nn>")                 \
-_(sw_interface_get_table, "<intfc> | sw_if_index <id> [ipv6]")
-
-/* List of command functions, CLI names map directly to functions */
-#define foreach_cli_function                                    \
-_(comment, "usage: comment <ignore-rest-of-line>")		\
-_(dump_interface_table, "usage: dump_interface_table")          \
-_(dump_sub_interface_table, "usage: dump_sub_interface_table")  \
-_(dump_ipv4_table, "usage: dump_ipv4_table")                    \
-_(dump_ipv6_table, "usage: dump_ipv6_table")                    \
-_(dump_stats_table, "usage: dump_stats_table")                  \
-_(dump_macro_table, "usage: dump_macro_table ")                 \
-_(dump_node_table, "usage: dump_node_table")			\
-_(dump_msg_api_table, "usage: dump_msg_api_table")		\
-_(get_msg_id, "usage: get_msg_id name_and_crc")			\
-_(echo, "usage: echo <message>")				\
-_(exec, "usage: exec <vpe-debug-CLI-command>")                  \
-_(exec_inband, "usage: exec_inband <vpe-debug-CLI-command>")    \
-_(help, "usage: help")                                          \
-_(q, "usage: quit")                                             \
-_(quit, "usage: quit")                                          \
-_(search_node_table, "usage: search_node_table <name>...")	\
-_(set, "usage: set <variable-name> <value>")                    \
-_(script, "usage: script <file-name>")                          \
-_(unset, "usage: unset <variable-name>")
-
-#define _(N,n)                                  \
-    static void vl_api_##n##_t_handler_uni      \
-    (vl_api_##n##_t * mp)                       \
-    {                                           \
-        vat_main_t * vam = &vat_main;           \
-        if (vam->json_output) {                 \
-            vl_api_##n##_t_handler_json(mp);    \
-        } else {                                \
-            vl_api_##n##_t_handler(mp);         \
-        }                                       \
-    }
-foreach_vpe_api_reply_msg;
-#undef _
-
-void
-vat_api_hookup (vat_main_t * vam)
-{
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler_uni,          \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_reply_msg;
-#undef _
-
-#if (VPP_API_TEST_BUILTIN==0)
-  vl_msg_api_set_first_available_msg_id (VL_MSG_FIRST_AVAILABLE);
-#endif
-
-  vam->sw_if_index_by_interface_name = hash_create_string (0, sizeof (uword));
-
-  vam->function_by_name = hash_create_string (0, sizeof (uword));
-
-  vam->help_by_name = hash_create_string (0, sizeof (uword));
-
-  /* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
-  foreach_vpe_api_msg;
-#undef _
-
-  /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
-  foreach_vpe_api_msg;
-#undef _
-
-  /* CLI functions */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, n);
-  foreach_cli_function;
-#undef _
-
-  /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
-  foreach_cli_function;
-#undef _
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp-api-test/vat/json_format.c b/vpp-api-test/vat/json_format.c
deleted file mode 100644
index 6f316d97..00000000
--- a/vpp-api-test/vat/json_format.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- *------------------------------------------------------------------
- * json_format.c
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
-
-*/
-#include <inttypes.h>
-#include <vat/json_format.h>
-#include <vnet/ip/ip.h>
-#include <vppinfra/vec.h>
-
-#define VAT_TAB_WIDTH               2
-
-typedef struct vat_print_ctx_s
-{
-  FILE *ofp;
-  u32 indent;
-} vat_print_ctx_t;
-
-/* Format an IP4 address. */
-static u8 *
-vat_json_format_ip4_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
-}
-
-/* Format an IP6 address. */
-static u8 *
-vat_json_format_ip6_address (u8 * s, va_list * args)
-{
-  ip6_address_t *a = va_arg (*args, ip6_address_t *);
-  u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
-
-  i_max_n_zero = ARRAY_LEN (a->as_u16);
-  max_n_zeros = 0;
-  i_first_zero = i_max_n_zero;
-  n_zeros = 0;
-  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
-    {
-      u32 is_zero = a->as_u16[i] == 0;
-      if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
-	{
-	  i_first_zero = i;
-	  n_zeros = 0;
-	}
-      n_zeros += is_zero;
-      if ((!is_zero && n_zeros > max_n_zeros)
-	  || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
-	{
-	  i_max_n_zero = i_first_zero;
-	  max_n_zeros = n_zeros;
-	  i_first_zero = ARRAY_LEN (a->as_u16);
-	  n_zeros = 0;
-	}
-    }
-
-  last_double_colon = 0;
-  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
-    {
-      if (i == i_max_n_zero && max_n_zeros > 1)
-	{
-	  s = format (s, "::");
-	  i += max_n_zeros - 1;
-	  last_double_colon = 1;
-	}
-      else
-	{
-	  s = format (s, "%s%x",
-		      (last_double_colon || i == 0) ? "" : ":",
-		      clib_net_to_host_u16 (a->as_u16[i]));
-	  last_double_colon = 0;
-	}
-    }
-
-  return s;
-}
-
-static void
-vat_json_indent_print (vat_print_ctx_t * ctx)
-{
-  int i;
-  for (i = 0; i < ctx->indent * VAT_TAB_WIDTH; i++)
-    {
-      fformat (ctx->ofp, " ");
-    }
-}
-
-static void
-vat_json_indent_line (vat_print_ctx_t * ctx, char *fmt, ...)
-{
-  va_list va;
-
-  vat_json_indent_print (ctx);
-  va_start (va, fmt);
-  va_fformat (ctx->ofp, fmt, &va);
-  va_end (va);
-}
-
-static u8
-is_num_only (vat_json_node_t * p)
-{
-  vat_json_node_t *elem;
-  vec_foreach (elem, p)
-  {
-    if (VAT_JSON_INT != elem->type && VAT_JSON_UINT != elem->type)
-      {
-	return 0;
-      }
-  }
-  return 1;
-}
-
-static void
-vat_json_print_internal (vat_print_ctx_t * ctx, vat_json_node_t * node)
-{
-#define P(fmt,...) fformat(ctx->ofp, fmt, ##__VA_ARGS__)
-#define PL(fmt,...) fformat(ctx->ofp, fmt"\n", ##__VA_ARGS__)
-#define PPL(fmt,...) vat_json_indent_line(ctx, fmt"\n", ##__VA_ARGS__)
-#define PP(fmt,...) vat_json_indent_line(ctx, fmt, ##__VA_ARGS__)
-#define INCR (ctx->indent++)
-#define DECR (ctx->indent--)
-
-  vat_json_pair_t *pair;
-  u32 i, count;
-  vat_json_node_t *elem;
-  u8 num_only = 0;
-
-  if (!node)
-    {
-      return;
-    }
-
-  switch (node->type)
-    {
-    case VAT_JSON_OBJECT:
-      count = vec_len (node->pairs);
-      if (count >= 1)
-	{
-	  PL ("{");
-	  INCR;
-	  for (i = 0; i < count; i++)
-	    {
-	      pair = &node->pairs[i];
-	      PP ("\"%s\": ", pair->name);
-	      vat_json_print_internal (ctx, &pair->value);
-	      if (i < count - 1)
-		{
-		  P (",");
-		}
-	      PL ();
-	    }
-	  DECR;
-	  PP ("}");
-	}
-      else
-	{
-	  P ("{}");
-	}
-      break;
-    case VAT_JSON_ARRAY:
-      num_only = is_num_only (node->array);
-      count = vec_len (node->array);
-      if (count >= 1)
-	{
-	  if (num_only)
-	    P ("[");
-	  else
-	    PL ("[ ");
-	  INCR;
-	  for (i = 0; i < count; i++)
-	    {
-	      elem = &node->array[i];
-	      if (!num_only)
-		{
-		  vat_json_indent_print (ctx);
-		}
-	      vat_json_print_internal (ctx, elem);
-	      if (i < count - 1)
-		{
-		  if (num_only)
-		    {
-		      P (", ");
-		    }
-		  else
-		    {
-		      P (",");
-		    }
-		}
-	      if (!num_only)
-		PL ();
-	    }
-	  DECR;
-	  if (!num_only)
-	    PP ("]");
-	  else
-	    P ("]");
-	}
-      else
-	{
-	  P ("[]");
-	}
-      break;
-    case VAT_JSON_INT:
-      P ("%d", node->sint);
-      break;
-    case VAT_JSON_UINT:
-      P ("%" PRIu64, node->uint);
-      break;
-    case VAT_JSON_REAL:
-      P ("%f", node->real);
-      break;
-    case VAT_JSON_STRING:
-      P ("\"%s\"", node->string);
-      break;
-    case VAT_JSON_IPV4:
-      P ("\"%U\"", vat_json_format_ip4_address, &node->ip4);
-      break;
-    case VAT_JSON_IPV6:
-      P ("\"%U\"", vat_json_format_ip6_address, &node->ip6);
-      break;
-    default:
-      break;
-    }
-#undef PPL
-#undef PP
-#undef PL
-#undef P
-}
-
-void
-vat_json_print (FILE * ofp, vat_json_node_t * node)
-{
-  vat_print_ctx_t ctx;
-  memset (&ctx, 0, sizeof ctx);
-  ctx.indent = 0;
-  ctx.ofp = ofp;
-  fformat (ofp, "\n");
-  vat_json_print_internal (&ctx, node);
-  fformat (ofp, "\n");
-}
-
-void
-vat_json_free (vat_json_node_t * node)
-{
-  int i = 0;
-
-  if (NULL == node)
-    {
-      return;
-    }
-  switch (node->type)
-    {
-    case VAT_JSON_OBJECT:
-      for (i = 0; i < vec_len (node->pairs); i++)
-	{
-	  vat_json_free (&node->pairs[i].value);
-	}
-      if (NULL != node->pairs)
-	{
-	  vec_free (node->pairs);
-	}
-      break;
-    case VAT_JSON_ARRAY:
-      for (i = 0; i < vec_len (node->array); i++)
-	{
-	  vat_json_free (&node->array[i]);
-	}
-      if (NULL != node->array)
-	{
-	  vec_free (node->array);
-	}
-      break;
-    case VAT_JSON_STRING:
-      if (NULL != node->string)
-	{
-	  vec_free (node->string);
-	}
-      break;
-    default:
-      break;
-    }
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp-api-test/vat/json_format.h b/vpp-api-test/vat/json_format.h
deleted file mode 100644
index 154fb3df..00000000
--- a/vpp-api-test/vat/json_format.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- *------------------------------------------------------------------
- * json_format.h
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#ifndef __JSON_FORMAT_H__
-#define __JSON_FORMAT_H__
-
-#include <vppinfra/clib.h>
-#include <vppinfra/format.h>
-#include <netinet/ip.h>
-
-/* JSON value type */
-typedef enum
-{
-  VAT_JSON_NONE,
-  VAT_JSON_OBJECT,
-  VAT_JSON_ARRAY,
-  VAT_JSON_STRING,
-  VAT_JSON_REAL,
-  VAT_JSON_UINT,
-  VAT_JSON_INT,
-  VAT_JSON_IPV4,
-  VAT_JSON_IPV6,
-  VAT_JSON_MAX
-} vat_json_val_type_t;
-
-typedef struct vat_json_node_s vat_json_node_t;
-typedef struct vat_json_pair_s vat_json_pair_t;
-
-/* JSON object structure */
-struct vat_json_node_s
-{
-  vat_json_val_type_t type;
-  union
-  {
-    vat_json_pair_t *pairs;
-    vat_json_node_t *array;
-    u8 *string;
-    struct in_addr ip4;
-    struct in6_addr ip6;
-    u64 uint;
-    i64 sint;
-    f64 real;
-  };
-};
-
-struct vat_json_pair_s
-{
-  const char *name;
-  vat_json_node_t value;
-};
-
-void vat_json_print (FILE * ofp, vat_json_node_t * node);
-void vat_json_free (vat_json_node_t * node);
-
-static_always_inline void
-vat_json_init_object (vat_json_node_t * json)
-{
-  json->type = VAT_JSON_OBJECT;
-  json->pairs = NULL;
-}
-
-static_always_inline void
-vat_json_init_array (vat_json_node_t * json)
-{
-  json->type = VAT_JSON_ARRAY;
-  json->array = NULL;
-}
-
-static_always_inline void
-vat_json_set_string (vat_json_node_t * json, u8 * str)
-{
-  json->type = VAT_JSON_STRING;
-  json->string = str;
-}
-
-static_always_inline void
-vat_json_set_string_copy (vat_json_node_t * json, const u8 * str)
-{
-  u8 *ns = NULL;
-  vec_validate (ns, strlen ((const char *) str));
-  strcpy ((char *) ns, (const char *) str);
-  vec_add1 (ns, '\0');
-  vat_json_set_string (json, ns);
-}
-
-static_always_inline void
-vat_json_set_int (vat_json_node_t * json, i64 num)
-{
-  json->type = VAT_JSON_INT;
-  json->sint = num;
-}
-
-static_always_inline void
-vat_json_set_uint (vat_json_node_t * json, u64 num)
-{
-  json->type = VAT_JSON_UINT;
-  json->uint = num;
-}
-
-static_always_inline void
-vat_json_set_real (vat_json_node_t * json, f64 real)
-{
-  json->type = VAT_JSON_REAL;
-  json->real = real;
-}
-
-static_always_inline void
-vat_json_set_ip4 (vat_json_node_t * json, struct in_addr ip4)
-{
-  json->type = VAT_JSON_IPV4;
-  json->ip4 = ip4;
-}
-
-static_always_inline void
-vat_json_set_ip6 (vat_json_node_t * json, struct in6_addr ip6)
-{
-  json->type = VAT_JSON_IPV6;
-  json->ip6 = ip6;
-}
-
-static_always_inline vat_json_node_t *
-vat_json_object_add (vat_json_node_t * json, const char *name)
-{
-  ASSERT (VAT_JSON_OBJECT == json->type);
-  uword pos = vec_len (json->pairs);
-  vec_validate (json->pairs, pos);
-  json->pairs[pos].name = name;
-  return &json->pairs[pos].value;
-}
-
-static_always_inline vat_json_node_t *
-vat_json_array_add (vat_json_node_t * json)
-{
-  ASSERT (VAT_JSON_ARRAY == json->type);
-  uword pos = vec_len (json->array);
-  vec_validate (json->array, pos);
-  return &json->array[pos];
-}
-
-static_always_inline vat_json_node_t *
-vat_json_object_add_list (vat_json_node_t * json, const char *name)
-{
-  vat_json_node_t *array_node = vat_json_object_add (json, name);
-  vat_json_init_array (array_node);
-  return array_node;
-}
-
-static_always_inline void
-vat_json_object_add_string_copy (vat_json_node_t * json,
-				 const char *name, u8 * str)
-{
-  vat_json_set_string_copy (vat_json_object_add (json, name), str);
-}
-
-static_always_inline void
-vat_json_object_add_uint (vat_json_node_t * json,
-			  const char *name, u64 number)
-{
-  vat_json_set_uint (vat_json_object_add (json, name), number);
-}
-
-static_always_inline void
-vat_json_object_add_int (vat_json_node_t * json, const char *name, i64 number)
-{
-  vat_json_set_int (vat_json_object_add (json, name), number);
-}
-
-static_always_inline void
-vat_json_object_add_real (vat_json_node_t * json, const char *name, f64 real)
-{
-  vat_json_set_real (vat_json_object_add (json, name), real);
-}
-
-static_always_inline void
-vat_json_object_add_ip4 (vat_json_node_t * json,
-			 const char *name, struct in_addr ip4)
-{
-  vat_json_set_ip4 (vat_json_object_add (json, name), ip4);
-}
-
-static_always_inline void
-vat_json_object_add_ip6 (vat_json_node_t * json,
-			 const char *name, struct in6_addr ip6)
-{
-  vat_json_set_ip6 (vat_json_object_add (json, name), ip6);
-}
-
-static_always_inline void
-vat_json_array_add_int (vat_json_node_t * json, i64 number)
-{
-  vat_json_set_int (vat_json_array_add (json), number);
-}
-
-static_always_inline void
-vat_json_array_add_uint (vat_json_node_t * json, u64 number)
-{
-  vat_json_set_uint (vat_json_array_add (json), number);
-}
-
-static_always_inline void
-vat_json_object_add_bytes (vat_json_node_t * json,
-			   const char *name, u8 * array, uword size)
-{
-  ASSERT (VAT_JSON_OBJECT == json->type);
-  vat_json_node_t *json_array = vat_json_object_add (json, name);
-  vat_json_init_array (json_array);
-  int i;
-  for (i = 0; i < size; i++)
-    {
-      vat_json_array_add_uint (json_array, array[i]);
-    }
-}
-
-static_always_inline vat_json_node_t *
-vat_json_object_get_element (vat_json_node_t * json, const char *name)
-{
-  int i = 0;
-
-  ASSERT (VAT_JSON_OBJECT == json->type);
-  for (i = 0; i < vec_len (json->pairs); i++)
-    {
-      if (0 == strcmp (json->pairs[i].name, name))
-	{
-	  return &json->pairs[i].value;
-	}
-    }
-  return NULL;
-}
-
-#endif /* __JSON_FORMAT_H__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp-api-test/vat/json_test.c b/vpp-api-test/vat/json_test.c
deleted file mode 100644
index 46261694..00000000
--- a/vpp-api-test/vat/json_test.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *------------------------------------------------------------------
- * json_test.c
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vat/vat.h>
-#include <vat/json_format.h>
-
-static void
-print_json_test (void)
-{
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_string_copy (&node, "str", (u8 *) "string-value");
-  vat_json_object_add_uint (&node, "ab", 127);
-  vat_json_object_add_real (&node, "pi", 3.14159f);
-  vat_json_print (stdout, &node);
-  vat_json_free (&node);
-
-  vat_json_init_object (&node);
-  vat_json_node_t *a1 = vat_json_object_add (&node, "a1");
-  vat_json_init_object (a1);
-  vat_json_object_add_uint (a1, "b1", 512);
-  vat_json_object_add_string_copy (a1, "b2", (u8 *) "string");
-
-  vat_json_object_add_int (&node, "a2", 2);
-
-  vat_json_node_t *a3 = vat_json_object_add_list (&node, "a3");
-  vat_json_init_array (a3);
-  vat_json_array_add_uint (a3, 1);
-  vat_json_array_add_int (a3, -2);
-  vat_json_array_add_uint (a3, 3);
-
-  vat_json_init_object (vat_json_object_add (&node, "a4"));
-
-  struct in_addr ipv4 = { 0 };
-  struct in6_addr ipv6 = { {{0}} };
-
-  vat_json_object_add_ip4 (&node, "ipv4", ipv4);
-  vat_json_object_add_ip6 (&node, "ipv6", ipv6);
-
-  vat_json_print (stdout, &node);
-  vat_json_free (&node);
-}
-
-int
-main (void)
-{
-  print_json_test ();
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp-api-test/vat/main.c b/vpp-api-test/vat/main.c
deleted file mode 100644
index 34492e2b..00000000
--- a/vpp-api-test/vat/main.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "vat.h"
-#include "plugin.h"
-#include <signal.h>
-
-vat_main_t vat_main;
-
-void
-vat_suspend (vlib_main_t * vm, f64 interval)
-{
-  /* do nothing in the standalone version, just return */
-}
-
-void
-fformat_append_cr (FILE * ofp, const char *fmt, ...)
-{
-  va_list va;
-
-  va_start (va, fmt);
-  (void) va_fformat (ofp, (char *) fmt, &va);
-  va_end (va);
-  fformat (ofp, "\n");
-}
-
-int
-connect_to_vpe (char *name)
-{
-  vat_main_t *vam = &vat_main;
-  api_main_t *am = &api_main;
-
-  if (vl_client_connect_to_vlib ("/vpe-api", name, 32) < 0)
-    return -1;
-
-  vam->vl_input_queue = am->shmem_hdr->vl_input_queue;
-  vam->my_client_index = am->my_client_index;
-
-  return 0;
-}
-
-vlib_main_t vlib_global_main;
-vlib_main_t **vlib_mains;
-void
-vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...)
-{
-  clib_warning ("BUG");
-}
-
-
-static u8 *
-format_api_error (u8 * s, va_list * args)
-{
-  vat_main_t *vam = va_arg (*args, vat_main_t *);
-  i32 error = va_arg (*args, u32);
-  uword *p;
-
-  p = hash_get (vam->error_string_by_error_number, -error);
-
-  if (p)
-    s = format (s, "%s", p[0]);
-  else
-    s = format (s, "%d", error);
-  return s;
-}
-
-void
-do_one_file (vat_main_t * vam)
-{
-  int rv;
-  int (*fp) (vat_main_t * vam);
-  int arg_len;
-  unformat_input_t _input;
-  u8 *cmdp, *argsp;
-  uword *p;
-  u8 *this_cmd = 0;
-
-  vam->input = &_input;
-
-  /* Used by the "quit" command handler */
-  if (setjmp (vam->jump_buf) != 0)
-    return;
-
-  vam->jump_buf_set = 1;
-
-  while (1)
-    {
-      if (vam->ifp == stdin)
-	{
-	  if (vam->exec_mode == 0)
-	    rv = write (1, "vat# ", 5);
-	  else
-	    rv = write (1, "exec# ", 6);
-	}
-
-      _vec_len (vam->inbuf) = 4096;
-
-      if (vam->do_exit ||
-	  fgets ((char *) vam->inbuf, vec_len (vam->inbuf), vam->ifp) == 0)
-	break;
-
-      vam->input_line_number++;
-
-      vec_free (this_cmd);
-
-      this_cmd =
-	(u8 *) clib_macro_eval (&vam->macro_main, (char *) vam->inbuf,
-				1 /* complain */ );
-
-      if (vam->exec_mode == 0)
-	{
-	  /* Split input into cmd + args */
-	  cmdp = this_cmd;
-
-	  while (cmdp < (this_cmd + vec_len (this_cmd)))
-	    {
-	      if (*cmdp == ' ' || *cmdp == '\t' || *cmdp == '\n')
-		{
-		  cmdp++;
-		}
-	      else
-		break;
-	    }
-	  argsp = cmdp;
-	  while (argsp < (this_cmd + vec_len (this_cmd)))
-	    {
-	      if (*argsp != ' ' && *argsp != '\t' && *argsp != '\n')
-		{
-		  argsp++;
-		}
-	      else
-		break;
-	    }
-	  *argsp++ = 0;
-	  while (argsp < (this_cmd + vec_len (this_cmd)))
-	    {
-	      if (*argsp == ' ' || *argsp == '\t' || *argsp == '\n')
-		{
-		  argsp++;
-		}
-	      else
-		break;
-	    }
-
-
-	  /* Blank input line? */
-	  if (*cmdp == 0)
-	    continue;
-
-	  p = hash_get_mem (vam->function_by_name, cmdp);
-	  if (p == 0)
-	    {
-	      errmsg ("'%s': function not found\n", cmdp);
-	      continue;
-	    }
-
-	  arg_len = strlen ((char *) argsp);
-
-	  unformat_init_string (vam->input, (char *) argsp, arg_len);
-	  fp = (void *) p[0];
-	}
-      else
-	{
-	  unformat_init_string (vam->input, (char *) this_cmd,
-				strlen ((char *) this_cmd));
-	  cmdp = this_cmd;
-	  fp = exec;
-	}
-
-      rv = (*fp) (vam);
-      if (rv < 0)
-	errmsg ("%s error: %U\n", cmdp, format_api_error, vam, rv);
-      unformat_free (vam->input);
-
-      if (vam->regenerate_interface_table)
-	{
-	  vam->regenerate_interface_table = 0;
-	  api_sw_interface_dump (vam);
-	}
-    }
-}
-
-static void
-init_error_string_table (vat_main_t * vam)
-{
-
-  vam->error_string_by_error_number = hash_create (0, sizeof (uword));
-
-#define _(n,v,s) hash_set (vam->error_string_by_error_number, -v, s);
-  foreach_vnet_api_error;
-#undef _
-
-  hash_set (vam->error_string_by_error_number, 99, "Misc");
-}
-
-static i8 *
-eval_current_file (macro_main_t * mm, i32 complain)
-{
-  vat_main_t *vam = &vat_main;
-  return ((i8 *) format (0, "%s%c", vam->current_file, 0));
-}
-
-static i8 *
-eval_current_line (macro_main_t * mm, i32 complain)
-{
-  vat_main_t *vam = &vat_main;
-  return ((i8 *) format (0, "%d%c", vam->input_line_number, 0));
-}
-
-static void
-signal_handler (int signum, siginfo_t * si, ucontext_t * uc)
-{
-  vat_main_t *vam = &vat_main;
-
-  switch (signum)
-    {
-      /* these (caught) signals cause the application to exit */
-    case SIGINT:
-    case SIGTERM:
-      if (vam->jump_buf_set)
-	{
-	  vam->do_exit = 1;
-	  return;
-	}
-
-      /* FALLTHROUGH on purpose */
-
-    default:
-      break;
-    }
-
-  _exit (1);
-}
-
-static void
-setup_signal_handlers (void)
-{
-  uword i;
-  struct sigaction sa;
-
-  for (i = 1; i < 32; i++)
-    {
-      memset (&sa, 0, sizeof (sa));
-      sa.sa_sigaction = (void *) signal_handler;
-      sa.sa_flags = SA_SIGINFO;
-
-      switch (i)
-	{
-	  /* these signals take the default action */
-	case SIGABRT:
-	case SIGKILL:
-	case SIGSTOP:
-	case SIGUSR1:
-	case SIGUSR2:
-	  continue;
-
-	  /* ignore SIGPIPE, SIGCHLD */
-	case SIGPIPE:
-	case SIGCHLD:
-	  sa.sa_sigaction = (void *) SIG_IGN;
-	  break;
-
-	  /* catch and handle all other signals */
-	default:
-	  break;
-	}
-
-      if (sigaction (i, &sa, 0) < 0)
-	clib_unix_warning ("sigaction %U", format_signal, i);
-    }
-}
-
-int
-main (int argc, char **argv)
-{
-  vat_main_t *vam = &vat_main;
-  unformat_input_t _argv, *a = &_argv;
-  u8 **input_files = 0;
-  u8 *output_file = 0;
-  u8 *chroot_prefix;
-  u8 *this_input_file;
-  u8 interactive = 1;
-  u8 json_output = 0;
-  u8 *heap;
-  mheap_t *h;
-  int i;
-
-  clib_mem_init (0, 128 << 20);
-
-  heap = clib_mem_get_per_cpu_heap ();
-  h = mheap_header (heap);
-
-  /* make the main heap thread-safe */
-  h->flags |= MHEAP_FLAG_THREAD_SAFE;
-
-  clib_macro_init (&vam->macro_main);
-  clib_macro_add_builtin (&vam->macro_main, "current_file",
-			  eval_current_file);
-  clib_macro_add_builtin (&vam->macro_main, "current_line",
-			  eval_current_line);
-
-  init_error_string_table (vam);
-
-  unformat_init_command_line (a, argv);
-
-  while (unformat_check_input (a) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (a, "in %s", &this_input_file))
-	vec_add1 (input_files, this_input_file);
-      else if (unformat (a, "out %s", &output_file))
-	;
-      else if (unformat (a, "script"))
-	interactive = 0;
-      else if (unformat (a, "json"))
-	json_output = 1;
-      else if (unformat (a, "plugin_path %s", (u8 *) & vat_plugin_path))
-	vec_add1 (vat_plugin_path, 0);
-      else if (unformat (a, "plugin_name_filter %s",
-			 (u8 *) & vat_plugin_name_filter))
-	vec_add1 (vat_plugin_name_filter, 0);
-      else if (unformat (a, "chroot prefix %s", &chroot_prefix))
-	{
-	  vl_set_memory_root_path ((char *) chroot_prefix);
-	}
-      else
-	{
-	  fformat (stderr,
-		   "%s: usage [in <f1> ... in <fn>] [out <fn>] [script] [json]\n");
-	  exit (1);
-	}
-    }
-
-  if (output_file)
-    vam->ofp = fopen ((char *) output_file, "w");
-  else
-    vam->ofp = stdout;
-
-  if (vam->ofp == NULL)
-    {
-      fformat (stderr, "Couldn't open output file %s\n",
-	       output_file ? (char *) output_file : "stdout");
-      exit (1);
-    }
-
-  clib_time_init (&vam->clib_time);
-
-  vat_api_hookup (vam);
-  vat_plugin_api_reference ();
-
-  setup_signal_handlers ();
-
-  if (connect_to_vpe ("vpp_api_test") < 0)
-    {
-      svm_region_exit ();
-      fformat (stderr, "Couldn't connect to vpe, exiting...\n");
-      exit (1);
-    }
-
-  vam->json_output = json_output;
-
-  if (!json_output)
-    {
-      api_sw_interface_dump (vam);
-    }
-
-  vec_validate (vam->inbuf, 4096);
-
-  vam->current_file = (u8 *) "plugin-init";
-  vat_plugin_init (vam);
-
-  for (i = 0; i < vec_len (input_files); i++)
-    {
-      vam->ifp = fopen ((char *) input_files[i], "r");
-      if (vam->ifp == NULL)
-	{
-	  fformat (stderr, "Couldn't open input file %s\n", input_files[i]);
-	  continue;
-	}
-      vam->current_file = input_files[i];
-      vam->input_line_number = 0;
-      do_one_file (vam);
-      fclose (vam->ifp);
-    }
-
-  if (output_file)
-    fclose (vam->ofp);
-
-  if (interactive)
-    {
-      vam->ifp = stdin;
-      vam->ofp = stdout;
-      vam->current_file = (u8 *) "interactive";
-      do_one_file (vam);
-      fclose (vam->ifp);
-    }
-
-  vl_client_disconnect_from_vlib ();
-  exit (0);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp-api-test/vat/plugin.c b/vpp-api-test/vat/plugin.c
deleted file mode 100644
index c1cc928c..00000000
--- a/vpp-api-test/vat/plugin.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * plugin.c: plugin handling
- */
-
-#include <vat/vat.h>
-#include <vat/plugin.h>
-#include <dlfcn.h>
-#include <dirent.h>
-
-plugin_main_t vat_plugin_main;
-
-static int
-load_one_plugin (plugin_main_t * pm, plugin_info_t * pi)
-{
-  void *handle, *register_handle;
-  clib_error_t *(*fp) (vat_main_t *);
-  clib_error_t *error;
-
-  handle = dlopen ((char *) pi->name, RTLD_LAZY);
-
-  /*
-   * Note: this can happen if the plugin has an undefined symbol reference,
-   * so print a warning. Otherwise, the poor slob won't know what happened.
-   * Ask me how I know that...
-   */
-  if (handle == 0)
-    {
-      clib_warning ("%s", dlerror ());
-      return -1;
-    }
-
-  pi->handle = handle;
-
-  register_handle = dlsym (pi->handle, "vat_plugin_register");
-  if (register_handle == 0)
-    return 0;
-
-  fp = register_handle;
-
-  error = (*fp) (pm->vat_main);
-
-  if (error)
-    {
-      clib_error_report (error);
-      dlclose (handle);
-      return 1;
-    }
-
-  clib_warning ("Loaded plugin: %s", pi->name);
-
-  return 0;
-}
-
-static u8 **
-split_plugin_path (plugin_main_t * pm)
-{
-  int i;
-  u8 **rv = 0;
-  u8 *path = pm->plugin_path;
-  u8 *this = 0;
-
-  for (i = 0; i < vec_len (pm->plugin_path); i++)
-    {
-      if (path[i] != ':')
-	{
-	  vec_add1 (this, path[i]);
-	  continue;
-	}
-      vec_add1 (this, 0);
-      vec_add1 (rv, this);
-      this = 0;
-    }
-  if (this)
-    {
-      vec_add1 (this, 0);
-      vec_add1 (rv, this);
-    }
-  return rv;
-}
-
-int
-vat_load_new_plugins (plugin_main_t * pm)
-{
-  DIR *dp;
-  struct dirent *entry;
-  struct stat statb;
-  uword *p;
-  plugin_info_t *pi;
-  u8 **plugin_path;
-  int i;
-
-  plugin_path = split_plugin_path (pm);
-
-  for (i = 0; i < vec_len (plugin_path); i++)
-    {
-      dp = opendir ((char *) plugin_path[i]);
-
-      if (dp == 0)
-	continue;
-
-      while ((entry = readdir (dp)))
-	{
-	  u8 *plugin_name;
-
-	  if (pm->plugin_name_filter)
-	    {
-	      int j;
-	      for (j = 0; j < vec_len (pm->plugin_name_filter); j++)
-		if (entry->d_name[j] != pm->plugin_name_filter[j])
-		  goto next;
-	    }
-
-	  plugin_name = format (0, "%s/%s%c", plugin_path[i],
-				entry->d_name, 0);
-
-	  /* unreadable */
-	  if (stat ((char *) plugin_name, &statb) < 0)
-	    {
-	    ignore:
-	      vec_free (plugin_name);
-	      continue;
-	    }
-
-	  /* a dir or other things which aren't plugins */
-	  if (!S_ISREG (statb.st_mode))
-	    goto ignore;
-
-	  p = hash_get_mem (pm->plugin_by_name_hash, plugin_name);
-	  if (p == 0)
-	    {
-	      vec_add2 (pm->plugin_info, pi, 1);
-	      pi->name = plugin_name;
-	      pi->file_info = statb;
-
-	      if (load_one_plugin (pm, pi))
-		{
-		  vec_free (plugin_name);
-		  _vec_len (pm->plugin_info) = vec_len (pm->plugin_info) - 1;
-		  continue;
-		}
-	      memset (pi, 0, sizeof (*pi));
-	      hash_set_mem (pm->plugin_by_name_hash, plugin_name,
-			    pi - pm->plugin_info);
-	    }
-	next:
-	  ;
-	}
-      closedir (dp);
-      vec_free (plugin_path[i]);
-    }
-  vec_free (plugin_path);
-  return 0;
-}
-
-#define QUOTE_(x) #x
-#define QUOTE(x) QUOTE_(x)
-
-/*
- * Load plugins from /usr/lib/vpp_api_test_plugins by default
- */
-char *vat_plugin_path = "/usr/lib/vpp_api_test_plugins";
-
-char *vat_plugin_name_filter = 0;
-
-int
-vat_plugin_init (vat_main_t * vam)
-{
-  plugin_main_t *pm = &vat_plugin_main;
-
-
-  pm->plugin_path = format (0, "%s%c", vat_plugin_path, 0);
-  if (vat_plugin_name_filter)
-    pm->plugin_name_filter = format (0, "%s%c", vat_plugin_name_filter, 0);
-
-  pm->plugin_by_name_hash = hash_create_string (0, sizeof (uword));
-  pm->vat_main = vam;
-
-  return vat_load_new_plugins (pm);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp-api-test/vat/plugin.h b/vpp-api-test/vat/plugin.h
deleted file mode 100644
index 559ec52f..00000000
--- a/vpp-api-test/vat/plugin.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * plugin.h: plugin handling
- */
-
-#ifndef __included_plugin_h__
-#define __included_plugin_h__
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-typedef struct
-{
-  u8 *name;
-  struct stat file_info;
-  void *handle;
-} plugin_info_t;
-
-typedef struct
-{
-  /* loaded plugin info */
-  plugin_info_t *plugin_info;
-  uword *plugin_by_name_hash;
-
-  /* path and name filter */
-  u8 *plugin_path;
-  u8 *plugin_name_filter;
-
-  /* convenience */
-  vat_main_t *vat_main;
-
-} plugin_main_t;
-
-plugin_main_t vat_plugin_main;
-
-int vat_plugin_init (vat_main_t * vam);
-int vat_load_new_plugins (plugin_main_t * pm);
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp-api-test/vat/plugin_api.c b/vpp-api-test/vat/plugin_api.c
deleted file mode 100644
index 4e1eb897..00000000
--- a/vpp-api-test/vat/plugin_api.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vat/vat.h>
-#include <vnet/ip/ip.h>
-
-uword
-unformat_sw_if_index (unformat_input_t * input, va_list * args)
-{
-  vat_main_t *vam = va_arg (*args, vat_main_t *);
-  u32 *result = va_arg (*args, u32 *);
-  u8 *if_name;
-  uword *p;
-
-  if (!unformat (input, "%s", &if_name))
-    return 0;
-
-  p = hash_get_mem (vam->sw_if_index_by_interface_name, if_name);
-  if (p == 0)
-    return 0;
-  *result = p[0];
-  return 1;
-}
-
-/* Parse an IP4 address %d.%d.%d.%d. */
-uword
-unformat_ip4_address (unformat_input_t * input, va_list * args)
-{
-  u8 *result = va_arg (*args, u8 *);
-  unsigned a[4];
-
-  if (!unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]))
-    return 0;
-
-  if (a[0] >= 256 || a[1] >= 256 || a[2] >= 256 || a[3] >= 256)
-    return 0;
-
-  result[0] = a[0];
-  result[1] = a[1];
-  result[2] = a[2];
-  result[3] = a[3];
-
-  return 1;
-}
-
-uword
-unformat_ethernet_address (unformat_input_t * input, va_list * args)
-{
-  u8 *result = va_arg (*args, u8 *);
-  u32 i, a[6];
-
-  if (!unformat (input, "%_%x:%x:%x:%x:%x:%x%_",
-		 &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
-    return 0;
-
-  /* Check range. */
-  for (i = 0; i < 6; i++)
-    if (a[i] >= (1 << 8))
-      return 0;
-
-  for (i = 0; i < 6; i++)
-    result[i] = a[i];
-
-  return 1;
-}
-
-/* Returns ethernet type as an int in host byte order. */
-uword
-unformat_ethernet_type_host_byte_order (unformat_input_t * input,
-					va_list * args)
-{
-  u16 *result = va_arg (*args, u16 *);
-  int type;
-
-  /* Numeric type. */
-  if (unformat (input, "0x%x", &type) || unformat (input, "%d", &type))
-    {
-      if (type >= (1 << 16))
-	return 0;
-      *result = type;
-      return 1;
-    }
-  return 0;
-}
-
-/* Parse an IP6 address. */
-uword
-unformat_ip6_address (unformat_input_t * input, va_list * args)
-{
-  ip6_address_t *result = va_arg (*args, ip6_address_t *);
-  u16 hex_quads[8];
-  uword hex_quad, n_hex_quads, hex_digit, n_hex_digits;
-  uword c, n_colon, double_colon_index;
-
-  n_hex_quads = hex_quad = n_hex_digits = n_colon = 0;
-  double_colon_index = ARRAY_LEN (hex_quads);
-  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
-    {
-      hex_digit = 16;
-      if (c >= '0' && c <= '9')
-	hex_digit = c - '0';
-      else if (c >= 'a' && c <= 'f')
-	hex_digit = c + 10 - 'a';
-      else if (c >= 'A' && c <= 'F')
-	hex_digit = c + 10 - 'A';
-      else if (c == ':' && n_colon < 2)
-	n_colon++;
-      else
-	{
-	  unformat_put_input (input);
-	  break;
-	}
-
-      /* Too many hex quads. */
-      if (n_hex_quads >= ARRAY_LEN (hex_quads))
-	return 0;
-
-      if (hex_digit < 16)
-	{
-	  hex_quad = (hex_quad << 4) | hex_digit;
-
-	  /* Hex quad must fit in 16 bits. */
-	  if (n_hex_digits >= 4)
-	    return 0;
-
-	  n_colon = 0;
-	  n_hex_digits++;
-	}
-
-      /* Save position of :: */
-      if (n_colon == 2)
-	{
-	  /* More than one :: ? */
-	  if (double_colon_index < ARRAY_LEN (hex_quads))
-	    return 0;
-	  double_colon_index = n_hex_quads;
-	}
-
-      if (n_colon > 0 && n_hex_digits > 0)
-	{
-	  hex_quads[n_hex_quads++] = hex_quad;
-	  hex_quad = 0;
-	  n_hex_digits = 0;
-	}
-    }
-
-  if (n_hex_digits > 0)
-    hex_quads[n_hex_quads++] = hex_quad;
-
-  {
-    word i;
-
-    /* Expand :: to appropriate number of zero hex quads. */
-    if (double_colon_index < ARRAY_LEN (hex_quads))
-      {
-	word n_zero = ARRAY_LEN (hex_quads) - n_hex_quads;
-
-	for (i = n_hex_quads - 1; i >= (signed) double_colon_index; i--)
-	  hex_quads[n_zero + i] = hex_quads[i];
-
-	for (i = 0; i < n_zero; i++)
-	  hex_quads[double_colon_index + i] = 0;
-
-	n_hex_quads = ARRAY_LEN (hex_quads);
-      }
-
-    /* Too few hex quads given. */
-    if (n_hex_quads < ARRAY_LEN (hex_quads))
-      return 0;
-
-    for (i = 0; i < ARRAY_LEN (hex_quads); i++)
-      result->as_u16[i] = clib_host_to_net_u16 (hex_quads[i]);
-
-    return 1;
-  }
-}
-
-u8 *
-format_ip4_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
-}
-
-u8 *
-format_ethernet_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-
-  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
-		 a[0], a[1], a[2], a[3], a[4], a[5]);
-}
-
-void
-vat_plugin_api_reference (void)
-{
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp-api-test/vat/restart.c b/vpp-api-test/vat/restart.c
deleted file mode 100644
index adc63f84..00000000
--- a/vpp-api-test/vat/restart.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <time.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <svmdb.h>
-#include <vppinfra/format.h>
-#include <vppinfra/error.h>
-#include <vppinfra/time.h>
-#include <vppinfra/macros.h>
-
-int
-restart_main_fn (unformat_input_t * i)
-{
-  int verbose = 0;
-  int old_pid;
-  int wait;
-  u8 *chroot_path = 0;
-  svmdb_client_t *svmdb_client;
-  volatile pid_t *pidp;
-  struct stat statb;
-  ino_t old_inode;
-  int sleeps;
-  svmdb_map_args_t _ma, *ma = &_ma;
-
-  struct timespec _req, *req = &_req;
-  struct timespec _rem, *rem = &_rem;
-
-  if (geteuid ())
-    clib_error ("vpp_restart: must be root...");
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "verbose") || unformat (i, "v"))
-	verbose = 1;
-      else if (unformat (i, "chroot %s", &chroot_path))
-	;
-      else
-	{
-	  clib_error ("unknown input `%U'", format_unformat_error, i);
-	  return 1;
-	}
-    }
-
-  /*
-   * Step 1: look up the current VPP pid in the shared-memory database
-   */
-  memset (ma, 0, sizeof (*ma));
-  ma->root_path = (char *) chroot_path;
-
-  svmdb_client = svmdb_map (ma);
-
-  pidp = svmdb_local_get_variable_reference (svmdb_client,
-					     SVMDB_NAMESPACE_VEC, "vpp_pid");
-  if (pidp == 0)
-    {
-      clib_error ("'vpp_pid' svm variable not found, vpp has never run?");
-      return 2;
-    }
-
-  /* Spin for up to 10 seconds for vpp to start */
-  for (wait = 0; wait < 1000; wait++)
-    {
-      req->tv_sec = 0;
-      req->tv_nsec = 10000 * 1000;	/* 10 ms */
-      while (nanosleep (req, rem) < 0)
-	*req = *rem;
-
-      if (*pidp)
-	goto found2;
-    }
-
-  clib_error ("VPP not runnning...");
-  return 3;
-
-found2:
-
-  old_pid = *pidp;
-
-  /*
-   * Step 2: sanity check the pid we discovered
-   */
-  if (verbose)
-    fformat (stdout, "Sanity check current vpp pid %d\n", old_pid);
-
-  if (kill (old_pid, 0) < 0)
-    {
-      svmdb_unmap (svmdb_client);
-      clib_error ("vpp current pid %d not running...", old_pid);
-      return 2;
-    }
-
-  if (verbose)
-    fformat (stdout, "Sanity check vpp pid %d OK\n", old_pid);
-
-  /*
-   * Step 3: figure out the current vpp <--> client shared-VM file
-   * inode number
-   */
-  if (stat ("/dev/shm/vpe-api", &statb) < 0)
-    {
-      clib_unix_error ("stat fail");
-      return 4;
-    }
-
-  old_inode = statb.st_ino;
-
-  if (verbose)
-    fformat (stdout, "Old inode %u\n", old_inode);
-
-  /* Note: restart wipes out the shared VM database */
-  svmdb_unmap (svmdb_client);
-
-  /*
-   * Step 4: send SIGTERM to vpp.
-   * systemd et al. will restart vpp after wiping out the shared-VM
-   * database and (crucially) the shared API messaging segment
-   */
-
-  if (kill (old_pid, SIGTERM) < 0)
-    {
-      clib_unix_error ("SIGTERM fail");
-      return 3;
-    }
-
-  sleeps = 0;
-
-  /*
-   * Step 5: wait up to 15 seconds for a new incarnation of
-   * the shared-VM API segment to appear.
-   */
-  for (wait = 0; wait < 150; wait++)
-    {
-      if ((stat ("/dev/shm/vpe-api", &statb) < 0)
-	  || statb.st_ino == old_inode)
-	{
-	  req->tv_sec = 0;
-	  req->tv_nsec = 100000 * 1000;	/* 100 ms */
-	  while (nanosleep (req, rem) < 0)
-	    *req = *rem;
-	  sleeps++;
-	}
-      else
-	goto new_inode;
-    }
-
-  clib_error ("Timeout waiting for new inode to appear...");
-  return 5;
-
-new_inode:
-  if (verbose && sleeps > 0)
-    fformat (stdout, "Inode sleeps %d\n", sleeps);
-
-  if (verbose)
-    fformat (stdout, "New inode %u\n", statb.st_ino);
-
-  /*
-   * Step 6: remap the SVM database
-   */
-  svmdb_client = svmdb_map (ma);
-
-  pidp = svmdb_local_get_variable_reference (svmdb_client,
-					     SVMDB_NAMESPACE_VEC, "vpp_pid");
-  if (pidp == 0)
-    {
-      clib_error ("post_restart: 'vpp_pid' svm variable not found,"
-		  "vpp did not restart?");
-      return 2;
-    }
-
-  sleeps = 0;
-
-  /*
-   * Step 7: wait for vpp to publish its new PID
-   */
-
-  /* Spin for up to 15 seconds */
-  for (wait = 0; wait < 150; wait++)
-    {
-      if (*pidp && (*pidp != old_pid))
-	goto restarted;
-      req->tv_sec = 0;
-      req->tv_nsec = 100000 * 1000;	/* 100 ms */
-      while (nanosleep (req, rem) < 0)
-	*req = *rem;
-      sleeps++;
-    }
-
-  clib_error ("Timeout waiting for vpp to publish pid after restart...");
-  return 4;
-
-restarted:
-
-  /* Done... */
-
-  if (verbose && sleeps)
-    fformat (stdout, "pid sleeps %d\n", sleeps);
-
-  if (verbose)
-    fformat (stdout, "New PID %d... Restarted...\n", *pidp);
-
-  svmdb_unmap (svmdb_client);
-  return 0;
-}
-
-int
-main (int argc, char **argv)
-{
-  unformat_input_t i;
-  int ret;
-
-  clib_mem_init (0, 64ULL << 20);
-
-  unformat_init_command_line (&i, argv);
-  ret = restart_main_fn (&i);
-  unformat_free (&i);
-  return ret;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp-api-test/vat/vat.h b/vpp-api-test/vat/vat.h
deleted file mode 100644
index 01f75513..00000000
--- a/vpp-api-test/vat/vat.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_vat_h__
-#define __included_vat_h__
-
-#include <stdio.h>
-#include <setjmp.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/format.h>
-#include <vppinfra/error.h>
-#include <vppinfra/time.h>
-#include <vppinfra/macros.h>
-#include <vnet/vnet.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-
-#include "json_format.h"
-
-#include <vlib/vlib.h>
-
-typedef struct
-{
-  u8 *interface_name;
-  u32 sw_if_index;
-  /*
-   * Subinterface ID. A number 0-N to uniquely identify this
-   * subinterface under the super interface
-   */
-  u32 sub_id;
-
-  /* 0 = dot1q, 1=dot1ad */
-  u8 sub_dot1ad;
-
-  /* Number of tags 0-2 */
-  u8 sub_number_of_tags;
-  u16 sub_outer_vlan_id;
-  u16 sub_inner_vlan_id;
-  u8 sub_exact_match;
-  u8 sub_default;
-  u8 sub_outer_vlan_id_any;
-  u8 sub_inner_vlan_id_any;
-
-  /* vlan tag rewrite */
-  u32 vtr_op;
-  u32 vtr_push_dot1q;
-  u32 vtr_tag1;
-  u32 vtr_tag2;
-} sw_interface_subif_t;
-
-typedef struct
-{
-  u8 ip[16];
-  u8 prefix_length;
-} ip_address_details_t;
-
-typedef struct
-{
-  u8 present;
-  ip_address_details_t *addr;
-} ip_details_t;
-
-typedef struct
-{
-  u64 packets;
-  u64 bytes;
-} interface_counter_t;
-
-typedef struct
-{
-  struct in_addr address;
-  u8 address_length;
-  u64 packets;
-  u64 bytes;
-} ip4_fib_counter_t;
-
-typedef struct
-{
-  struct in6_addr address;
-  u8 address_length;
-  u64 packets;
-  u64 bytes;
-} ip6_fib_counter_t;
-
-typedef struct
-{
-  /* vpe input queue */
-  unix_shared_memory_queue_t *vl_input_queue;
-
-  /* interface name table */
-  uword *sw_if_index_by_interface_name;
-
-  /* subinterface table */
-  sw_interface_subif_t *sw_if_subif_table;
-
-  /* Graph node table */
-  uword *graph_node_index_by_name;
-  vlib_node_t **graph_nodes;
-
-  /* ip tables */
-  ip_details_t *ip_details_by_sw_if_index[2];
-
-  /* sw_if_index of currently processed interface */
-  u32 current_sw_if_index;
-
-  /* remember that we are dumping ipv6 */
-  u8 is_ipv6;
-
-  /* function table */
-  uword *function_by_name;
-
-  /* help strings */
-  uword *help_by_name;
-
-  /* macro table */
-  macro_main_t macro_main;
-
-  /* Errors by number */
-  uword *error_string_by_error_number;
-
-
-  /* Main thread can spin (w/ timeout) here if needed */
-  u32 async_mode;
-  u32 async_errors;
-  volatile u32 result_ready;
-  volatile i32 retval;
-  volatile u32 sw_if_index;
-  volatile u8 *shmem_result;
-  volatile u8 *cmd_reply;
-
-  /* our client index */
-  u32 my_client_index;
-
-  /* Time is of the essence... */
-  clib_time_t clib_time;
-
-  /* Unwind (so we can quit) */
-  jmp_buf jump_buf;
-  int jump_buf_set;
-  volatile int do_exit;
-
-  /* temporary parse buffer */
-  unformat_input_t *input;
-
-  /* input buffer */
-  u8 *inbuf;
-
-  /* stdio input / output FILEs */
-  FILE *ifp, *ofp;
-  u8 *current_file;
-  u32 input_line_number;
-
-  /* exec mode toggle */
-  int exec_mode;
-
-  /* Regenerate the interface table */
-  volatile int regenerate_interface_table;
-
-  /* flag for JSON output format */
-  u8 json_output;
-
-  /* flag for interface event display */
-  u8 interface_event_display;
-
-  /* JSON tree used in composing dump api call results */
-  vat_json_node_t json_tree;
-
-  /* counters */
-  u64 **simple_interface_counters;
-  interface_counter_t **combined_interface_counters;
-  ip4_fib_counter_t **ip4_fib_counters;
-  u32 *ip4_fib_counters_vrf_id_by_index;
-  ip6_fib_counter_t **ip6_fib_counters;
-  u32 *ip6_fib_counters_vrf_id_by_index;
-
-  /* Convenience */
-  vlib_main_t *vlib_main;
-} vat_main_t;
-
-vat_main_t vat_main;
-
-static inline f64
-vat_time_now (vat_main_t * vam)
-{
-#if VPP_API_TEST_BUILTIN
-  return vlib_time_now (vam->vlib_main);
-#else
-  return clib_time_now (&vam->clib_time);
-#endif
-}
-
-#if VPP_API_TEST_BUILTIN
-#define errmsg(fmt,args...)                             \
-do {                                                    \
-  vat_main_t *__vam = &vat_main;                        \
-  vlib_cli_output (__vam->vlib_main, fmt, ##args);      \
- } while(0);
-#else
-#define errmsg(fmt,args...)                                     \
-do {                                                            \
-  vat_main_t *__vam = &vat_main;                                \
-    if(__vam->ifp != stdin)                                     \
-        fformat(__vam->ofp,"%s(%d): \n", __vam->current_file,   \
-                __vam->input_line_number);                      \
-    fformat(__vam->ofp, fmt "\n", ##args);                      \
-    fflush(__vam->ofp);                                         \
-} while(0);
-#endif
-
-void vat_api_hookup (vat_main_t * vam);
-int api_sw_interface_dump (vat_main_t * vam);
-void do_one_file (vat_main_t * vam);
-int exec (vat_main_t * vam);
-
-/* Plugin API library functions */
-char *vat_plugin_path;
-char *vat_plugin_name_filter;
-void vat_plugin_api_reference (void);
-uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
-uword unformat_ip4_address (unformat_input_t * input, va_list * args);
-uword unformat_ethernet_address (unformat_input_t * input, va_list * args);
-uword unformat_ethernet_type_host_byte_order (unformat_input_t * input,
-					      va_list * args);
-uword unformat_ip6_address (unformat_input_t * input, va_list * args);
-u8 *format_ip4_address (u8 * s, va_list * args);
-u8 *format_ethernet_address (u8 * s, va_list * args);
-
-#if VPP_API_TEST_BUILTIN
-#define print api_cli_output
-void api_cli_output (void *, const char *fmt, ...);
-#else
-#define print fformat_append_cr
-void fformat_append_cr (FILE *, const char *fmt, ...);
-#endif
-
-#endif /* __included_vat_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp-api/Makefile.am b/vpp-api/Makefile.am
index 1812b637..b50522ef 100644
--- a/vpp-api/Makefile.am
+++ b/vpp-api/Makefile.am
@@ -1,2 +1,4 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = python java
+SUBDIRS = java
+
+# vi:syntax=automake
diff --git a/vpp-api/configure.ac b/vpp-api/configure.ac
index 3d7bf251..278041c7 100644
--- a/vpp-api/configure.ac
+++ b/vpp-api/configure.ac
@@ -7,7 +7,6 @@ AM_SILENT_RULES([yes])
 
 AC_PROG_CC
 
-AC_OUTPUT([python/Makefile])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
diff --git a/vpp-api/java/Makefile.am b/vpp-api/java/Makefile.am
index 92b8c264..b0551965 100644
--- a/vpp-api/java/Makefile.am
+++ b/vpp-api/java/Makefile.am
@@ -84,8 +84,7 @@ packagedir_jvpp_core = io/fd/vpp/jvpp/core
 BUILT_SOURCES += jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h
 
 JSON_FILES = \
-	$(prefix)/../vpp/vpp-api/vpe.api.json \
-	$(wildcard $(prefix)/../vnet/vnet/*.api.json)
+	$(wildcard $(prefix)/../vpp/share/vpp/api/core/*.api.json)
 
 jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h:		\
     jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h	\
diff --git a/vpp-api/java/jvpp-core/jvpp_core.c b/vpp-api/java/jvpp-core/jvpp_core.c
index 107fa788..ef4cb8e3 100644
--- a/vpp-api/java/jvpp-core/jvpp_core.c
+++ b/vpp-api/java/jvpp-core/jvpp_core.c
@@ -15,18 +15,18 @@
 
 #include <vnet/vnet.h>
 
-#include <vpp-api/vpe_msg_enum.h>
+#include <vpp/api/vpe_msg_enum.h>
 #define vl_typedefs             /* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_typedefs
 
 #define vl_endianfun
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_endianfun
 
 #define vl_print(handle, ...)
 #define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_printfun
 
 #include <vnet/api_errno.h>
diff --git a/vpp-api/java/jvpp-registry/jvpp_registry.c b/vpp-api/java/jvpp-registry/jvpp_registry.c
index 7e199b81..cbd5e0ab 100644
--- a/vpp-api/java/jvpp-registry/jvpp_registry.c
+++ b/vpp-api/java/jvpp-registry/jvpp_registry.c
@@ -16,7 +16,7 @@
 #include <vnet/vnet.h>
 
 #define vl_api_version(n,v) static u32 vpe_api_version = (v);
-#include <vpp-api/vpe.api.h>
+#include <vpp/api/vpe.api.h>
 #undef vl_api_version
 
 
@@ -25,19 +25,19 @@
 #include "io_fd_vpp_jvpp_VppJNIConnection.h"
 #include "io_fd_vpp_jvpp_JVppRegistryImpl.h"
 
-#include <vpp-api/vpe_msg_enum.h>
+#include <vpp/api/vpe_msg_enum.h>
 #define vl_typedefs             /* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_typedefs
 
 #define vl_endianfun
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_endianfun
 
 /* instantiate all the print functions we know about */
 #define vl_print(handle, ...)
 #define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
+#include <vpp/api/vpe_all_api_h.h>
 #undef vl_printfun
 
 vlib_main_t vlib_global_main;
diff --git a/vpp-api/java/jvpp/gen/jvpp_gen.py b/vpp-api/java/jvpp/gen/jvpp_gen.py
index b1cd84c4..5f8df2a9 100755
--- a/vpp-api/java/jvpp/gen/jvpp_gen.py
+++ b/vpp-api/java/jvpp/gen/jvpp_gen.py
@@ -30,6 +30,8 @@ from jvppgen import jvpp_impl_gen
 from jvppgen import jvpp_c_gen
 from jvppgen import util
 
+blacklist = [ "memclnt.api", "flowperpkt.api" ]
+
 # Invocation:
 # ~/Projects/vpp/vpp-api/jvpp/gen$ mkdir -p java/io/fd/vpp/jvpp && cd java/io/fd/vpp/jvpp
 # ~/Projects/vpp/vpp-api/jvpp/gen/java/io/fd/vpp/jvpp$ ../../../../jvpp_gen.py -idefs_api_vpp_papi.py
@@ -55,6 +57,9 @@ print "plugin_name %s" % plugin_name
 cfg = {}
 
 for inputfile in args.inputfiles:
+    if any(substring in inputfile for substring in blacklist):
+        print "WARNING: Imput file %s blacklisted" % inputfile
+        continue
     _cfg = json.load(open(inputfile, 'r'))
     if 'types' in cfg:
         cfg['types'].extend(_cfg['types'])
diff --git a/vpp-api/python/Makefile.am b/vpp-api/python/Makefile.am
deleted file mode 100644
index 2a578464..00000000
--- a/vpp-api/python/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-ACLOCAL_AMFLAGS = -I m4
-AM_CFLAGS = -Wall
-
-BUILT_SOURCES =
-bin_PROGRAMS =
-CLEANFILES =
-lib_LTLIBRARIES =
-noinst_PROGRAMS = test_pneum
-nobase_include_HEADERS = pneum/pneum.h
-
-#
-# Python / C extension
-#
-lib_LTLIBRARIES += libpneum.la
-libpneum_la_SOURCES = pneum/pneum.c
-libpneum_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra -lpthread \
-                     -lm -lrt
-libpneum_la_LDFLAGS = -module
-libpneum_la_CPPFLAGS =
-
-# TODO: Support both Python 2 and 3.
-install-exec-local:
-	cd $(srcdir);							\
-	mkdir -p $(prefix)/lib/python2.7/site-packages; 		\
-	PYTHONUSERBASE=$(prefix)					\
-	python setup.py build_ext -L $(prefix)/lib64 \
-	-I $(prefix)/../vppinfra/include/ install --user
-
-#
-# Test client
-#
-noinst_PROGRAMS += test_pneum
-test_pneum_SOURCES = pneum/pneum.c pneum/test_pneum.c
-test_pneum_LDADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra -lpthread \
-                   -lm -lrt
-
-
diff --git a/vpp-api/python/README.rst b/vpp-api/python/README.rst
deleted file mode 100644
index e69de29b..00000000
diff --git a/vpp-api/python/pneum/pneum.c b/vpp-api/python/pneum/pneum.c
deleted file mode 100644
index 6918cc9b..00000000
--- a/vpp-api/python/pneum/pneum.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <stdbool.h>
-
-#include <vnet/vnet.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-
-#include <vpp-api/vpe_msg_enum.h>
-
-#include "pneum.h"
-
-#define vl_typedefs             /* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun             /* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-vlib_main_t vlib_global_main;
-vlib_main_t **vlib_mains;
-
-typedef struct {
-  u8 rx_thread_jmpbuf_valid;
-  u8 connected_to_vlib;
-  jmp_buf rx_thread_jmpbuf;
-  pthread_t rx_thread_handle;
-} pneum_main_t;
-
-pneum_main_t pneum_main;
-
-pneum_callback_t pneum_callback;
-
-/*
- * Satisfy external references when -lvlib is not available.
- */
-void vlib_cli_output (struct vlib_main_t * vm, char * fmt, ...)
-{
-  clib_warning ("vlib_cli_output called...");
-}
-
-void
-pneum_free (void * msg)
-{
-  vl_msg_api_free (msg);
-}
-
-static void
-pneum_api_handler (void *msg)
-{
-  u16 id = ntohs(*((u16 *)msg));
-  if (id == VL_API_RX_THREAD_EXIT) {
-    pneum_main_t *pm = &pneum_main;
-    vl_msg_api_free(msg);
-    longjmp(pm->rx_thread_jmpbuf, 1);
-  }
-  msgbuf_t *msgbuf = (msgbuf_t *)(((u8 *)msg) - offsetof(msgbuf_t, data));
-  int l = ntohl(msgbuf->data_len);
-  if (l == 0)
-    clib_warning("Message ID %d has wrong length: %d\n", id, l);
-
-  /* Call Python callback */
-  ASSERT(pneum_callback);
-  (pneum_callback)(msg, l);
-  pneum_free(msg);
-}
-
-static void *
-pneum_rx_thread_fn (void *arg)
-{
-  unix_shared_memory_queue_t *q;
-  pneum_main_t *pm = &pneum_main;
-  api_main_t *am = &api_main;
-  uword msg;
-
-  q = am->vl_input_queue;
-
-  /* So we can make the rx thread terminate cleanly */
-  if (setjmp(pm->rx_thread_jmpbuf) == 0) {
-    pm->rx_thread_jmpbuf_valid = 1;
-    while (1)
-      while (!unix_shared_memory_queue_sub(q, (u8 *)&msg, 0))
-        pneum_api_handler((void *)msg);
-  }
-  pthread_exit(0);
-}
-
-uword *
-pneum_msg_table_get_hash (void)
-{
-  api_main_t *am = &api_main;
-  return (am->msg_index_by_name_and_crc);
-}
-
-int
-pneum_msg_table_size(void)
-{
-  api_main_t *am = &api_main;
-  return hash_elts(am->msg_index_by_name_and_crc);
-}
-
-int
-pneum_connect (char * name, char * chroot_prefix, pneum_callback_t cb)
-{
-  int rv = 0;
-  pneum_main_t *pm = &pneum_main;
-
-  if (chroot_prefix != NULL)
-    vl_set_memory_root_path (chroot_prefix);
-
-  if ((rv = vl_client_api_map("/vpe-api"))) {
-    clib_warning ("vl_client_api map rv %d", rv);
-    return rv;
-  }
-
-  if (vl_client_connect(name, 0, 32) < 0) {
-    vl_client_api_unmap();
-    return (-1);
-  }
-
-  if (cb) {
-    /* Start the rx queue thread */
-    rv = pthread_create(&pm->rx_thread_handle, NULL, pneum_rx_thread_fn, 0);
-    if (rv) {
-      clib_warning("pthread_create returned %d", rv);
-      vl_client_api_unmap();
-      return (-1);
-    }
-    pneum_callback = cb;
-  }
-
-  pm->connected_to_vlib = 1;
-
-  return (0);
-}
-
-int
-pneum_disconnect (void)
-{
-  api_main_t *am = &api_main;
-  pneum_main_t *pm = &pneum_main;
-
-  if (pm->rx_thread_jmpbuf_valid) {
-    vl_api_rx_thread_exit_t *ep;
-    uword junk;
-    ep = vl_msg_api_alloc (sizeof (*ep));
-    ep->_vl_msg_id = ntohs(VL_API_RX_THREAD_EXIT);
-    vl_msg_api_send_shmem(am->vl_input_queue, (u8 *)&ep);
-    pthread_join(pm->rx_thread_handle, (void **) &junk);
-  }
-  if (pm->connected_to_vlib) {
-    vl_client_disconnect();
-    vl_client_api_unmap();
-    pneum_callback = 0;
-  }
-  memset (pm, 0, sizeof (*pm));
-
-  return (0);
-}
-
-int
-pneum_read (char **p, int *l)
-{
-  unix_shared_memory_queue_t *q;
-  api_main_t *am = &api_main;
-  pneum_main_t *pm = &pneum_main;
-  uword msg;
-
-  if (!pm->connected_to_vlib) return -1;
-
-  *l = 0;
-
-  if (am->our_pid == 0) return (-1);
-
-  q = am->vl_input_queue;
-  int rv = unix_shared_memory_queue_sub(q, (u8 *)&msg, 0);
-  if (rv == 0) {
-    u16 msg_id = ntohs(*((u16 *)msg));
-    msgbuf_t *msgbuf = (msgbuf_t *)(((u8 *)msg) - offsetof(msgbuf_t, data));
-    *l = ntohl(msgbuf->data_len);
-    if (*l == 0) {
-      printf("Unregistered API message: %d\n", msg_id);
-      return (-1);
-    }
-    *p = (char *)msg;
-  } else {
-    printf("Read failed with %d\n", rv);
-  }
-  return (rv);
-}
-
-/*
- * XXX: Makes the assumption that client_index is the first member
- */
-typedef VL_API_PACKED(struct _vl_api_header {
-  u16 _vl_msg_id;
-  u32 client_index;
-}) vl_api_header_t;
-
-static unsigned int
-pneum_client_index (void)
-{
-  return (api_main.my_client_index);
-}
-
-int
-pneum_write (char *p, int l)
-{
-  int rv = -1;
-  api_main_t *am = &api_main;
-  vl_api_header_t *mp = vl_msg_api_alloc(l);
-  unix_shared_memory_queue_t *q;
-  pneum_main_t *pm = &pneum_main;
-
-  if (!pm->connected_to_vlib) return -1;
-  if (!mp) return (-1);
-  memcpy(mp, p, l);
-  mp->client_index = pneum_client_index();
-  q = am->shmem_hdr->vl_input_queue;
-  rv = unix_shared_memory_queue_add(q, (u8 *)&mp, 0);
-  if (rv != 0) {
-    printf("vpe_api_write fails: %d\n", rv);
-    /* Clear message */
-    pneum_free(mp);
-  }
-  return (rv);
-}
-
-uint32_t
-pneum_get_msg_index (unsigned char * name)
-{
-  return vl_api_get_msg_index (name);
-}
diff --git a/vpp-api/python/pneum/pneum.h b/vpp-api/python/pneum/pneum.h
deleted file mode 100644
index a347bd25..00000000
--- a/vpp-api/python/pneum/pneum.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_pneum_h
-#define included_pneum_h
-
-#include <stdint.h>
-#include <vppinfra/types.h>
-
-typedef void (*pneum_callback_t)(unsigned char * data, int len);
-int pneum_connect(char * name, char * chroot_prefix, pneum_callback_t cb);
-int pneum_disconnect(void);
-int pneum_read(char **data, int *l);
-int pneum_write(char *data, int len);
-void pneum_free(void * msg);
-uword * pneum_msg_table_get_hash (void);
-int pneum_msg_table_size(void);
-uint32_t pneum_get_msg_index(unsigned char * name);
-
-#endif
diff --git a/vpp-api/python/pneum/test_pneum.c b/vpp-api/python/pneum/test_pneum.c
deleted file mode 100644
index e873114f..00000000
--- a/vpp-api/python/pneum/test_pneum.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *------------------------------------------------------------------
- * test_pneum.c
- * 
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License. 
- *------------------------------------------------------------------
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <netdb.h>
-
-#include <time.h>       /* time_t, time (for timestamp in second) */
-#include <sys/timeb.h>  /* ftime, timeb (for timestamp in millisecond) */
-#include <sys/time.h>   /* gettimeofday, timeval (for timestamp in microsecond) */
-
-#include <vnet/vnet.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vnet/ip/ip.h>
-
-#include <vpp-api/vpe_msg_enum.h>
-#include <signal.h>
-#include <setjmp.h>
-#include "pneum.h"
-
-#define vl_typedefs             /* define message structures */
-#include <vpp-api/vpe_all_api_h.h> 
-#undef vl_typedefs
-
-/* we are not linking with vlib */
-vlib_main_t vlib_global_main;
-vlib_main_t **vlib_mains;
-
-volatile int sigterm_received = 0;
-volatile u32 result_ready;
-volatile u16 result_msg_id;
-
-/* M_NOALLOC: construct, but don't yet send a message */
-
-#define M_NOALLOC(T,t)                          \
-  do {						\
-    result_ready = 0;                           \
-    memset (mp, 0, sizeof (*mp));		\
-    mp->_vl_msg_id = ntohs (VL_API_##T);	\
-    mp->client_index = am->my_client_index;	\
-  } while(0);
-
-
-
-int
-wrap_pneum_callback (char *data, int len)
-{
-  //printf("Callback %d\n", len);
-  result_ready = 1;
-  result_msg_id = ntohs(*((u16 *)data));
-  return (0);
-}
-
-int main (int argc, char ** argv)
-{
-  api_main_t * am = &api_main;
-  vl_api_show_version_t message;
-  vl_api_show_version_t *mp;
-  int async = 1;
-  int rv = pneum_connect("pneum_client", NULL, NULL);
-
-  if (rv != 0) {
-    printf("Connect failed: %d\n", rv);
-    exit(rv);
-  }
- 
- struct timeb timer_msec;
-  long long int timestamp_msec_start; /* timestamp in millisecond. */
-  if (!ftime(&timer_msec)) {
-    timestamp_msec_start = ((long long int) timer_msec.time) * 1000ll + 
-      (long long int) timer_msec.millitm;
-  }
-  else {
-    timestamp_msec_start = -1;
-  }
-
- 
-  /*
-   * Test vpe_api_write and vpe_api_read to send and recv message for an
-   * API 
-   */
-  int i;
-  long int no_msgs = 10000;
-  mp = &message;
-
-  for (i = 0; i < no_msgs; i++) {
-    /* Construct the API message */
-    M_NOALLOC(SHOW_VERSION, show_version);
-    pneum_write((char *)mp, sizeof(*mp));
-#ifndef __COVERITY__
-    /* As given, async is always 1. Shut up Coverity about it */
-    if (!async)
-      while (result_ready == 0);
-#endif
-  }
-  if (async) {
-    vl_api_control_ping_t control;
-    vl_api_control_ping_t *mp;
-    mp = &control;
-    M_NOALLOC(CONTROL_PING, control_ping);
-    pneum_write((char *)mp, sizeof(*mp));
-
-    while (result_msg_id != VL_API_CONTROL_PING_REPLY);
-  }
-
-  long long int timestamp_msec_end; /* timestamp in millisecond. */
-  if (!ftime(&timer_msec)) {
-    timestamp_msec_end = ((long long int) timer_msec.time) * 1000ll + 
-      (long long int) timer_msec.millitm;
-  }
-  else {
-    timestamp_msec_end = -1;
-  }
-  
-  printf("Took %lld msec, %lld msgs/msec \n", (timestamp_msec_end - timestamp_msec_start),
-	 no_msgs/(timestamp_msec_end - timestamp_msec_start));
-  fformat(stdout, "Exiting...\n");
-  pneum_disconnect();
-  exit (0);
-}
diff --git a/vpp-api/python/setup.cfg b/vpp-api/python/setup.cfg
deleted file mode 100644
index d645be77..00000000
--- a/vpp-api/python/setup.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdist_wheel]
-# This flag says that the code is written to work on both Python 2 and Python
-# 3. If at all possible, it is good practice to do this. If you cannot, you
-# will need to generate wheels for each Python version that you support.
-universal=0
diff --git a/vpp-api/python/setup.py b/vpp-api/python/setup.py
deleted file mode 100644
index 99a0147a..00000000
--- a/vpp-api/python/setup.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-try:
-    from setuptools import setup, Extension
-except ImportError:
-    from distutils.core import setup, Extension
-
-setup (name = 'vpp_papi',
-       version = '1.3',
-       description = 'VPP Python binding',
-       author = 'Ole Troan',
-       author_email = 'ot@cisco.com',
-       test_suite = 'tests',
-       packages=['vpp_papi'],
-       ext_modules = [
-           Extension(
-               'vpp_api',
-               sources = ['vpp_papi/pneum_wrap.c'],
-               libraries = ['pneum'],
-           )],
-       long_description = '''VPP Python language binding.''',
-)
diff --git a/vpp-api/python/tests/test_cli.py b/vpp-api/python/tests/test_cli.py
deleted file mode 100755
index 66fb6943..00000000
--- a/vpp-api/python/tests/test_cli.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
-import unittest, sys, time, threading, struct
-import test_base
-import vpp_papi
-from ipaddress import *
-
-import glob, subprocess
-class TestPAPI(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        #
-        # Start main VPP process
-        cls.vpp_bin = glob.glob(test_base.scriptdir+'/../../../build-root/install-vpp*-native/vpp/bin/vpp')[0]
-        print("VPP BIN:", cls.vpp_bin)
-        cls.vpp = subprocess.Popen([cls.vpp_bin, "unix", "nodaemon"], stderr=subprocess.PIPE)
-        print('Started VPP')
-        # For some reason unless we let VPP start up the API cannot connect.
-        time.sleep(0.3)
-    @classmethod
-    def tearDownClass(cls):
-        cls.vpp.terminate()
-
-    def setUp(self):
-        print("Connecting API")
-        r = vpp_papi.connect("test_papi")
-        self.assertEqual(r, 0)
-
-    def tearDown(self):
-        r = vpp_papi.disconnect()
-        self.assertEqual(r, 0)
-
-    #
-    # The tests themselves
-    #
-
-    #
-    # Basic request / reply
-    #
-    def test_cli_request(self):
-        print(vpp_papi.cli_exec('show version verbose'))
-        #t = vpp_papi.cli_inband_request(len(cmd), cmd)
-        #print('T:',t)
-        #reply = t.reply[0].decode().rstrip('\x00')
-        #print(reply)
-        #program = t.program.decode().rstrip('\x00')
-        #self.assertEqual('vpe', program)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/vpp-api/python/tests/test_modules.py b/vpp-api/python/tests/test_modules.py
deleted file mode 100755
index fdcd092c..00000000
--- a/vpp-api/python/tests/test_modules.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from __future__ import print_function
-import unittest
-import vpp_papi
-import pot, snat
-print('Plugins:')
-vpp_papi.plugin_show()
-r = vpp_papi.connect('ole')
-
-r = vpp_papi.show_version()
-print('R:', r)
-
-r = snat.snat_interface_add_del_feature(1, 1, 1)
-print('R:', r)
-
-list_name = 'foobar'
-r = pot.pot_profile_add(0, 1, 123, 123, 0, 12, 0, 23, len(list_name), list_name)
-print('R:', r)
-vpp_papi.disconnect()
diff --git a/vpp-api/python/tests/test_papi.py b/vpp-api/python/tests/test_papi.py
deleted file mode 100755
index 8cbbfc59..00000000
--- a/vpp-api/python/tests/test_papi.py
+++ /dev/null
@@ -1,119 +0,0 @@
-from __future__ import print_function
-import unittest, sys, time, threading, struct, logging, os
-import vpp_papi
-from ipaddress import *
-scriptdir = os.path.dirname(os.path.realpath(__file__))
-papi_event = threading.Event()
-print(vpp_papi.vpe.VL_API_SW_INTERFACE_SET_FLAGS)
-def papi_event_handler(result):
-    if result.vl_msg_id == vpp_papi.vpe.VL_API_SW_INTERFACE_SET_FLAGS:
-        return
-    if result.vl_msg_id == vpp_papi.vpe.VL_API_VNET_INTERFACE_COUNTERS:
-        print('Interface counters', result)
-        return
-    if result.vl_msg_id == vpp_papi.vpe.VL_API_VNET_IP6_FIB_COUNTERS:
-        print('IPv6 FIB counters', result)
-        papi_event.set()
-        return
-
-    print('Unknown message id:', result.vl_msg_id)
-
-import glob, subprocess
-class TestPAPI(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        #
-        # Start main VPP process
-        cls.vpp_bin = glob.glob(scriptdir+'/../../../build-root/install-vpp*-native/vpp/bin/vpp')[0]
-        print("VPP BIN:", cls.vpp_bin)
-        cls.vpp = subprocess.Popen([cls.vpp_bin, "unix", "nodaemon"], stderr=subprocess.PIPE)
-        print('Started VPP')
-        # For some reason unless we let VPP start up the API cannot connect.
-        time.sleep(0.3)
-    @classmethod
-    def tearDownClass(cls):
-        cls.vpp.terminate()
-
-    def setUp(self):
-        print("Connecting API")
-        r = vpp_papi.connect("test_papi")
-        self.assertEqual(r, 0)
-
-    def tearDown(self):
-        r = vpp_papi.disconnect()
-        self.assertEqual(r, 0)
-
-    #
-    # The tests themselves
-    #
-
-    #
-    # Basic request / reply
-    #
-    def test_show_version(self):
-        t = vpp_papi.show_version()
-        print('T', t);
-        program = t.program.decode().rstrip('\x00')
-        self.assertEqual('vpe', program)
-
-    #
-    # Details / Dump
-    #
-    def test_details_dump(self):
-        t = vpp_papi.sw_interface_dump(0, b'')
-        print('Dump/details T', t)
-
-    #
-    # Arrays
-    #
-    def test_arrays(self):
-        t = vpp_papi.vnet_get_summary_stats()
-        print('Summary stats', t)
-        print('Packets:', t.total_pkts[0])
-        print('Packets:', t.total_pkts[1])
-    #
-    # Variable sized arrays and counters
-    #
-    #@unittest.skip("stats")
-    def test_want_stats(self):
-        pid = 123
-        vpp_papi.register_event_callback(papi_event_handler)
-        papi_event.clear()
-
-        # Need to configure IPv6 to get som IPv6 FIB stats
-        t = vpp_papi.create_loopback('')
-        print(t)
-        self.assertEqual(t.retval, 0)
-
-        ifindex = t.sw_if_index
-        addr = str(IPv6Address(u'1::1').packed)
-        t = vpp_papi.sw_interface_add_del_address(ifindex, 1, 1, 0, 16, addr)
-        print(t)
-        self.assertEqual(t.retval, 0)
-
-        # Check if interface is up
-        # XXX: Add new API to query interface state based on ifindex, instead of dump all.
-        t = vpp_papi.sw_interface_set_flags(ifindex, 1, 1, 0)
-        self.assertEqual(t.retval, 0)
-
-        t = vpp_papi.want_stats(True, pid)
-
-        print (t)
-
-        #
-        # Wait for some stats
-        #
-        self.assertEqual(papi_event.wait(15), True)
-        t = vpp_papi.want_stats(False, pid)
-        print (t)
-
-
-    #
-    # Plugins?
-    #
-
-if __name__ == '__main__':
-    #logging.basicConfig(level=logging.DEBUG)
-    unittest.main()
-def test_papi():
-    print('test')
diff --git a/vpp-api/python/tests/test_version.py b/vpp-api/python/tests/test_version.py
deleted file mode 100755
index de39cc24..00000000
--- a/vpp-api/python/tests/test_version.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from __future__ import print_function
-import unittest, sys, time, threading, struct
-
-import vpp_papi
-from ipaddress import *
-import glob, subprocess
-class TestPAPI(unittest.TestCase):
-    def setUp(self):
-        print("Connecting API")
-        r = vpp_papi.connect("test_papi")
-        self.assertEqual(r, 0)
-
-    def tearDown(self):
-        r = vpp_papi.disconnect()
-        self.assertEqual(r, 0)
-
-    #
-    # The tests themselves
-    #
-
-    #
-    # Basic request / reply
-    #
-    def test_show_version(self):
-        print(vpp_papi.show_version())
-
-    #
-    # Details / Dump
-    #
-    def test_details_dump(self):
-        t = vpp_papi.sw_interface_dump(0, b'')
-        print('Dump/details T', t)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/vpp-api/python/tests/test_vpp_papi2.py b/vpp-api/python/tests/test_vpp_papi2.py
deleted file mode 100755
index f45f791e..00000000
--- a/vpp-api/python/tests/test_vpp_papi2.py
+++ /dev/null
@@ -1,487 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
-import unittest, sys, threading, struct, logging, os
-from vpp_papi import VPP
-from ipaddress import *
-import glob, json
-
-papi_event = threading.Event()
-import glob
-
-import fnmatch
-import os
-
-jsonfiles = []
-for root, dirnames, filenames in os.walk('../../../build-root/'):
-    if root.find('install-') == -1: continue
-    for filename in fnmatch.filter(filenames, '*.api.json'):
-        jsonfiles.append(os.path.join(root, filename))
-
-class TestPAPI(unittest.TestCase):
-    show_version_msg = '''["show_version",
-              ["u16", "_vl_msg_id"],
-              ["u32", "client_index"],
-              ["u32", "context"],
-              {"crc" : "0xf18f9480"}
-        ]'''
-
-    ip_address_details_msg = '''["ip_address_details",
-            ["u16", "_vl_msg_id"],
-            ["u32", "client_index"],
-            ["u32", "context"],
-            ["u8", "ip", 16],
-            ["u8", "prefix_length"],
-            {"crc" : "0x87d522a1"}
-        ]'''
-
-    cli_inband_msg = '''["cli_inband",
-            ["u16", "_vl_msg_id"],
-            ["u32", "client_index"],
-            ["u32", "context"],
-            ["u32", "length"],
-            ["u8", "cmd", 0, "length"],
-            {"crc" : "0x22345937"}
-        ]'''
-
-    def test_adding_new_message_object(self):
-        p = json.loads(TestPAPI.show_version_msg)
-        msglist = VPP(testmode=json)
-        msgdef = msglist.add_message(p[0], p[1:])
-
-        # Verify that message can be retrieved
-        self.assertTrue(msglist['show_version'])
-        self.assertFalse(msglist['foobar'])
-
-        # Test duplicate
-        self.assertRaises(ValueError, msglist.add_message, p[0], p[1:])
-
-        # Look at return tuple
-        self.assertTrue(msglist.ret_tup('show_version'))
-
-    def test_adding_new_message_object_with_array(self):
-        p = json.loads(TestPAPI.ip_address_details_msg)
-        msglist = VPP(testmode=True)
-        msglist.add_message(p[0], p[1:])
-
-        self.assertTrue(msglist['ip_address_details'])
-
-    def test_message_to_bytes(self):
-        msglist = VPP(testmode=True)
-        p = json.loads(TestPAPI.show_version_msg)
-        msgdef = msglist.add_message(p[0], p[1:])
-
-        # Give me a byte string for given message and given arguments
-
-        b = msglist.encode(msgdef, {'_vl_msg_id' : 50, 'context' : 123 })
-        self.assertEqual(10, len(b))
-        rv = msglist.decode(msgdef, b)
-        self.assertEqual(rv._0, 50)
-        self.assertEqual(rv.context, 123)
-
-
-        p = json.loads(TestPAPI.ip_address_details_msg)
-        msgdef = msglist.add_message(p[0], p[1:])
-
-        # Give me a byte string for given message and given arguments
-        b = msglist.encode(msgdef, {'_vl_msg_id' : 50, 'context' : 123,
-                                    'ip' : b'\xf0\xf1\xf2',
-                                    'prefix_length' :  12})
-        self.assertEqual(27, len(b))
-        rv = msglist.decode(msgdef, b)
-
-        self.assertEqual(rv.context, 123)
-        self.assertEqual(rv.ip, b'\xf0\xf1\xf2\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-        self.assertEqual(rv.prefix_length, 12)
-
-        p = json.loads(TestPAPI.cli_inband_msg)
-        msgdef = msglist.add_message(p[0], p[1:])
-
-        # Give me a byte string for given message and given arguments
-        b = msglist.encode(msgdef, { '_vl_msg_id' : 50, 'context' : 123,
-                                     'length' : 20, 'cmd' : 'show version verbose'})
-        self.assertEqual(34, len(b))
-        rv = msglist.decode(msgdef, b)
-        self.assertEqual(rv._0, 50)
-        self.assertEqual(rv.context, 123)
-        self.assertEqual(rv.cmd.decode('ascii'), 'show version verbose')
-
-        variable_array_16_msg = '''["variable_array_16",
-            ["u32", "length"],
-            ["u16", "list", 0, "length"]
-        ]'''
-
-        p = json.loads(variable_array_16_msg)
-        msgdef = msglist.add_message(p[0], p[1:])
-
-        # Give me a byte string for given message and given arguments
-        b = msglist.encode(msgdef, { 'list' : [1, 2], 'length' :2})
-        self.assertEqual(8, len(b))
-        rv = msglist.decode(msgdef, b)
-        self.assertEqual(2, rv.length)
-        self.assertEqual([1,2], rv.list)
-
-    def test_add_new_types(self):
-        counter_type = '''["ip4_fib_counter",
-            ["u32", "address"],
-            ["u8", "address_length"],
-            ["u64", "packets"],
-            ["u64", "bytes"],
-            {"crc" : "0xb2739495"}
-        ]'''
-
-        with_type_msg = '''["with_type_msg",
-            ["u32", "length"],
-            ["u16", "list", 0, "length"],
-            ["vl_api_ip4_fib_counter_t", "counter"]
-        ]'''
-
-        # Add new type
-        msglist = VPP(testmode=True)
-        p = json.loads(counter_type)
-        msglist.add_type(p[0], p[1:])
-        p = json.loads(with_type_msg)
-        msgdef = msglist.add_message(p[0], p[1:])
-        b = msglist.encode(msgdef, {'length' : 2, 'list' : [1,2],
-                           'counter' : { 'address' : 4, 'address_length' : 12,
-                                       'packets': 1235, 'bytes' : 5678}})
-        self.assertEqual(29, len(b)) # feil
-        rv = msglist.decode(msgdef, b)
-        self.assertEqual(2, rv.length)
-        self.assertEqual(5678, rv.counter.bytes)
-
-    def test_add_new_compound_type_with_array(self):
-        counter_type = '''["ip4_fib_counter",
-            ["u32", "address"],
-            ["u8", "address_length"],
-            ["u64", "packets"],
-            ["u64", "bytes"],
-            {"crc" : "0xb2739495"}
-        ]'''
-
-        with_type_msg = '''["with_type_msg",
-            ["u32", "length"],
-            ["u16", "list", 0, "length"],
-            ["vl_api_ip4_fib_counter_t", "counter", 2]
-
-        ]'''
-
-        # Add new type
-        msglist = VPP(testmode=True)
-        p = json.loads(counter_type)
-        msglist.add_type(p[0], p[1:])
-        p = json.loads(with_type_msg)
-        msgdef = msglist.add_message(p[0], p[1:])
-        b = msglist.encode(msgdef, {'length' : 2, 'list' : [1,2],
-                           'counter' : [{ 'address' : 4, 'address_length' : 12,
-                                        'packets': 1235, 'bytes' : 5678},
-                                      { 'address' : 111, 'address_length' : 222,
-                                        'packets': 333, 'bytes' : 444}]})
-        self.assertEqual(50, len(b))
-        rv = msglist.decode(msgdef, b)
-        self.assertEqual([1,2], rv.list)
-        self.assertEqual(1235, rv.counter[0].packets)
-
-        with_type_variable_msg = '''["with_type_variable_msg",
-            ["u32", "length"],
-            ["vl_api_ip4_fib_counter_t", "counter", 0, "length"]
-
-        ]'''
-
-        p = json.loads(with_type_variable_msg)
-        msgdef = msglist.add_message(p[0], p[1:])
-        b = msglist.encode(msgdef, {'length' : 2,
-                           'counter' : [{ 'address' : 4, 'address_length' : 12,
-                                        'packets': 1235, 'bytes' : 5678},
-                                      { 'address' : 111, 'address_length' : 222,
-                                        'packets': 333, 'bytes' : 444}]})
-        self.assertEqual(46, len(b))
-        rv = msglist.decode(msgdef, b)
-        self.assertEqual(2, rv.length)
-        self.assertEqual(1235, rv.counter[0].packets)
-        self.assertEqual(333, rv.counter[1].packets)
-
-    def test_simple_array(self):
-        msglist = VPP(testmode=True)
-
-        simple_byte_array = '''["simple_byte_array",
-            ["u32", "length"],
-            ["u8", "namecommand", 64]
-
-        ]'''
-        p = json.loads(simple_byte_array)
-        msgdef = msglist.add_message(p[0], p[1:])
-        b = msglist.encode(msgdef, {'length': 2, 'namecommand': 'foobar'})
-        self.assertEqual(68, len(b))
-        rv = msglist.decode(msgdef, b)
-        self.assertEqual(2, rv.length)
-
-        simple_array = '''["simple_array",
-            ["u32", "length"],
-            ["u32", "list", 2]
-
-        ]'''
-        p = json.loads(simple_array)
-        msgdef = msglist.add_message(p[0], p[1:])
-        b = msglist.encode(msgdef, {'length': 2, 'list': [1,2]})
-        self.assertEqual(12, len(b))
-        rv = msglist.decode(msgdef, b)
-        self.assertEqual(2, rv.length)
-        self.assertEqual([1,2], rv.list)
-
-        simple_variable_array = '''["simple_variable_array",
-            ["u32", "length"],
-            ["u32", "list", 0, "length"]
-
-        ]'''
-        p = json.loads(simple_variable_array)
-        msgdef = msglist.add_message(p[0], p[1:])
-        b = msglist.encode(msgdef, {'length':2, 'list': [1,2]})
-        self.assertEqual(12, len(b))
-        rv = msglist.decode(msgdef, b)
-        self.assertEqual(2, rv.length)
-        self.assertEqual([1,2], rv.list)
-
-        simple_variable_byte_array = '''["simple_variable_byte_array",
-            ["u32", "length"],
-            ["u8", "list", 0, "length"]
-        ]'''
-        p = json.loads(simple_variable_byte_array)
-        msgdef =msglist.add_message(p[0], p[1:])
-        b = msglist.encode(msgdef, {'length': 6, 'list' : 'foobar'})
-        self.assertEqual(10, len(b))
-        rv = msglist.decode(msgdef, b)
-        self.assertEqual(6, rv.length)
-        self.assertEqual('foobar', rv.list)
-
-    def test_old_vla_array(self):
-        msglist = VPP(testmode = True)
-
-        # VLA
-        vla_byte_array = '''["vla_byte_array",
-            ["u32", "foobar"],
-            ["u32", "list", 2],
-            ["u32", "propercount"],
-            ["u8", "propermask", 0, "propercount"],
-            ["u8", "oldmask", 0],
-            {"crc" : "0xb2739495"}
-        ]'''
-        p = json.loads(vla_byte_array)
-        msgdef = msglist.add_message(p[0], p[1:])
-        b = msglist.encode(msgdef, {'list' : [123, 456], 'oldmask': b'foobar',
-                                    'propercount' : 2,
-                                    'propermask' : [8,9]})
-        self.assertEqual(24, len(b))
-        rv = msglist.decode(msgdef, b)
-        self.assertEqual(b'foobar', rv.oldmask)
-
-    def test_old_vla_array_not_last_member(self):
-        msglist = VPP(testmode = True)
-
-        # VLA
-        vla_byte_array = '''["vla_byte_array",
-            ["u8", "oldmask", 0],
-            ["u32", "foobar"],
-            {"crc" : "0xb2739495"}
-        ]'''
-        p = json.loads(vla_byte_array)
-        self.assertRaises(ValueError, msglist.add_message, p[0], p[1:])
-
-    def test_old_vla_array_u32(self):
-        msglist = VPP(testmode = True)
-
-        # VLA
-        vla_byte_array = '''["vla_byte_array",
-            ["u32", "foobar"],
-            ["u32", "oldmask", 0],
-            {"crc" : "0xb2739495"}
-        ]'''
-        p = json.loads(vla_byte_array)
-        msgdef = msglist.add_message(p[0], p[1:])
-        b = msglist.encode(msgdef, {'foobar' : 123, 'oldmask': [123, 456, 789]})
-        self.assertEqual(16, len(b))
-        rv = msglist.decode(msgdef, b)
-        self.assertEqual([123, 456, 789], rv.oldmask)
-
-    def test_old_vla_array_compound(self):
-        msglist = VPP(testmode = True)
-
-        # VLA
-        counter_type = '''["ip4_fib_counter",
-            ["u32", "address"],
-            ["u8", "address_length"],
-            ["u64", "packets"],
-            ["u64", "bytes"],
-            {"crc" : "0xb2739495"}
-        ]'''
-
-        vla_byte_array = '''["vla_byte_array",
-            ["vl_api_ip4_fib_counter_t", "counter", 0],
-            {"crc" : "0xb2739495"}
-        ]'''
-
-        p = json.loads(counter_type)
-        msglist.add_type(p[0], p[1:])
-
-        p = json.loads(vla_byte_array)
-        with self.assertRaises(NotImplementedError):
-            msgdef = msglist.add_message(p[0], p[1:])
-
-    def test_array_count_not_previous(self):
-        msglist = VPP(testmode = True)
-
-        # VLA
-        vla_byte_array = '''["vla_byte_array",
-            ["u32", "count"],
-            ["u32", "filler"],
-            ["u32", "lst", 0, "count"],
-            {"crc" : "0xb2739495"}
-        ]'''
-
-        p = json.loads(vla_byte_array)
-        msgdef = msglist.add_message(p[0], p[1:])
-        b = msglist.encode(msgdef, {'count': 3, 'lst': [1,2,3], 'filler' : 1 })
-        rv = msglist.decode(msgdef, b)
-        self.assertEqual(rv.lst, [1,2,3])
-
-    def test_argument_name(self):
-        msglist = VPP(testmode=True)
-
-
-        simple_name = '''["simple_name",
-            ["u32", "length"],
-            ["u8", "name"]
-        ]'''
-        p = json.loads(simple_name)
-        msgdef = msglist.add_message(p[0], p[1:])
-        b = msglist.encode(msgdef, {'length': 6, 'name': 1})
-        self.assertEqual(5, len(b))
-        rv = msglist.decode(msgdef, b)
-        self.assertEqual(6, rv.length)
-        self.assertEqual(1, rv.name)
-
-class TestConnectedPAPI(unittest.TestCase):
-    def test_request_reply_function(self):
-        vpp = VPP(jsonfiles)
-
-        vpp.connect('test_vpp_papi2')
-
-        rv = vpp.show_version()
-        self.assertEqual(0, rv.retval)
-        self.assertEqual('vpe', rv.program.decode().rstrip('\0x00'))
-        vpp.disconnect()
-
-
-    def test_dump_details_function(self):
-        vpp = VPP(jsonfiles)
-        vpp.connect('test_vpp_papi3')
-
-        rv = vpp.sw_interface_dump()
-        #self.assertEqual(0, rv.retval)
-        print('RV', rv)
-        vpp.disconnect()
-
-    def test_vla(self):
-        vpp = VPP(jsonfiles)
-
-        vpp.connect('test_vpp_papi3')
-
-        cmd = 'show version verbose'
-        rv = vpp.cli_inband(length=len(cmd), cmd=cmd)
-        self.assertEqual(0, rv.retval)
-        print('RV', rv.reply)
-
-        cmd = 'show vlib graph'
-        rv = vpp.cli_inband(length=len(cmd), cmd=cmd)
-        self.assertEqual(0, rv.retval)
-        print('RV', rv.reply)
-        vpp.disconnect()
-
-    def test_events(self):
-        vpp = VPP(jsonfiles)
-
-        vpp.connect('test_vpp_papi3')
-
-        vpp.register_event_callback(event_handler)
-
-        rv = vpp.want_interface_events(enable_disable = True)
-        self.assertEqual(0, rv.retval)
-        print('RV', rv)
-
-        rv = vpp.create_loopback()
-        print('RV', rv)
-        self.assertEqual(0, rv.retval)
-
-        rv = vpp.sw_interface_set_flags(sw_if_index = 1, admin_up_down = 1)
-        print('RV', rv)
-        self.assertEqual(0, rv.retval)
-        rv = vpp.sw_interface_set_flags(sw_if_index = 1, admin_up_down = 0)
-        print('RV', rv)
-        self.assertEqual(0, rv.retval)
-        self.assertEqual(papi_event.wait(10), True)
-
-        vpp.disconnect()
-
-def event_handler(msgname, result):
-    print('IN EVENT HANDLER:', msgname, result)
-    papi_event.set()
-
-class TestACL(unittest.TestCase):
-    def test_acl_create(self):
-        vpp = VPP(jsonfiles)
-
-        vpp.connect('acl-test')
-
-        rv = vpp.acl_plugin_get_version()
-        print('RV', rv)
-        self.assertEqual(rv.major, 1)
-        self.assertEqual(rv.minor, 1)
-
-        rv = vpp.acl_add_replace(acl_index = 0xFFFFFFFF,
-            r = [{
-                "is_permit" : 1,
-                "is_ipv6" : 0,
-                "proto" : 6,
-                "srcport_or_icmptype_first" : 80,
-                }],
-            count = 1)
-        print ('RV', rv)
-        rv = vpp.acl_add_replace(acl_index = 0xFFFFFFFF,
-            r = [{
-                "is_permit" : 1,
-                "is_ipv6" : 0,
-                "proto" : 6,
-                "srcport_or_icmptype_first" : 81,
-                }],
-            count = 1)
-        self.assertEqual(rv.retval, 0)
-        print ('RV', rv)
-        ai = rv.acl_index
-        rv = vpp.acl_dump()
-        print ('RV', rv)
-
-        #rv = vpp.acl_del(acl_index = ai)
-        #self.assertEqual(rv.retval, 0)
-
-        #rv = vpp.acl_dump()
-        #self.assertEqual([], vpp.acl_dump())
-
-        vpp.disconnect()
-
-    def test_status(self):
-        vpp = VPP(jsonfiles)
-        vpp.status()
-
-    def test_acl_interface_get(self):
-        vpp = VPP(jsonfiles)
-
-        vpp.connect('test_vpp_papi2')
-
-        rv = vpp.macip_acl_interface_get()
-
-        print('RV', rv)
-
-        vpp.disconnect()
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/vpp-api/python/vpp_papi/__init__.py b/vpp-api/python/vpp_papi/__init__.py
deleted file mode 100644
index 6688ffb8..00000000
--- a/vpp-api/python/vpp_papi/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
-from . vpp_papi import *
-
diff --git a/vpp-api/python/vpp_papi/pneum_wrap.c b/vpp-api/python/vpp_papi/pneum_wrap.c
deleted file mode 100644
index 5763707b..00000000
--- a/vpp-api/python/vpp_papi/pneum_wrap.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <Python.h>
-#include "../pneum/pneum.h"
-#include <vppinfra/hash.h>
-
-static PyObject *pneum_callback = NULL;
-
-static void
-wrap_pneum_callback (unsigned char * data, int len)
-{
-  PyGILState_STATE gstate;
-  PyObject *result;//, *arglist;
-
-  gstate = PyGILState_Ensure();
-
-  /* Time to call the callback */
-#if PY_VERSION_HEX >= 0x03000000
-  result = PyObject_CallFunction(pneum_callback, "y#", data, len);
-#else
-  result = PyObject_CallFunction(pneum_callback, "s#", data, len);
-#endif
-  if (result)
-    Py_DECREF(result);
-  else
-    PyErr_Print();
-
-  PyGILState_Release(gstate);
-}
-
-static PyObject *
-wrap_connect (PyObject *self, PyObject *args)
-{
-  char * name, * chroot_prefix = NULL;
-  int rv;
-  PyObject * temp = NULL;
-  pneum_callback_t cb = NULL;
-
-  if (!PyArg_ParseTuple(args, "s|Os:wrap_connect",
-			&name, &temp, &chroot_prefix))
-    return (NULL);
-
-  if (temp)
-    {
-      if (!PyCallable_Check(temp))
-	{
-	  PyErr_SetString(PyExc_TypeError, "parameter must be callable");
-	  return NULL;
-	}
-
-      Py_XINCREF(temp);         /* Add a reference to new callback */
-      Py_XDECREF(pneum_callback);  /* Dispose of previous callback */
-      pneum_callback = temp;       /* Remember new callback */
-      cb = wrap_pneum_callback;
-    }
-  Py_BEGIN_ALLOW_THREADS
-    rv = pneum_connect(name, chroot_prefix, cb);
-  Py_END_ALLOW_THREADS
-  return PyLong_FromLong(rv);
-}
-
-static PyObject *
-wrap_disconnect (PyObject *self, PyObject *args)
-{
-  int rv;
-  Py_BEGIN_ALLOW_THREADS
-  rv = pneum_disconnect();
-  Py_END_ALLOW_THREADS
-  return PyLong_FromLong(rv);
-}
-static PyObject *
-wrap_write (PyObject *self, PyObject *args)
-{
-  char *data;
-  int len, rv;
-
-  if (!PyArg_ParseTuple(args, "s#", &data, &len))
-    return NULL;
-  Py_BEGIN_ALLOW_THREADS
-  rv = pneum_write(data, len);
-  Py_END_ALLOW_THREADS
-
-  return PyLong_FromLong(rv);
-}
-
-static PyObject *
-wrap_read (PyObject *self, PyObject *args)
-{
-  char *data;
-  int len, rv;
-
-  Py_BEGIN_ALLOW_THREADS
-  rv = pneum_read(&data, &len);
-  Py_END_ALLOW_THREADS
-
-  if (rv != 0) { Py_RETURN_NONE; }
-#if PY_VERSION_HEX >= 0x03000000
-  PyObject *ret = Py_BuildValue("y#", data, len);
-#else
-  PyObject *ret = Py_BuildValue("s#", data, len);
-#endif
-  if (!ret) { Py_RETURN_NONE; }
-
-  pneum_free(data);
-  return ret;
-}
-
-static PyObject *
-wrap_msg_table (PyObject *self, PyObject *args)
-{
-  int i = 0, rv = 0;
-  hash_pair_t *hp;
-  uword *h = pneum_msg_table_get_hash();
-  PyObject *ret = PyList_New(pneum_msg_table_size());
-  if (!ret) goto error;
-  hash_foreach_pair (hp, h,
-  ({
-    PyObject *item = PyTuple_New(2);
-    if (!item) goto error;
-    rv = PyTuple_SetItem(item, 0, PyLong_FromLong((u32)hp->value[0]));
-    if (rv) goto error;
-    rv = PyTuple_SetItem(item, 1, PyString_FromString((char *)hp->key));
-    if (rv) goto error;
-    PyList_SetItem(ret, i, item);
-    i++;
-  }));
-
-  return ret;
-
- error:
-  /* TODO: Raise exception */
-  printf("msg_table failed");
-  Py_RETURN_NONE;
-}
-
-static PyMethodDef vpp_api_Methods[] = {
-  {"connect", wrap_connect, METH_VARARGS, "Connect to the VPP API."},
-  {"disconnect", wrap_disconnect, METH_VARARGS, "Disconnect from the VPP API."},
-  {"write", wrap_write, METH_VARARGS, "Write data to the VPP API."},
-  {"read", wrap_read, METH_VARARGS, "Read data from the VPP API."},
-  {"msg_table", wrap_msg_table, METH_VARARGS, "Get API dictionary."},
-  {NULL, NULL, 0, NULL}        /* Sentinel */
-};
-
-#if PY_VERSION_HEX >= 0x03000000
-PyMODINIT_FUNC
-PyInit_vpp_api (void)
-#else
-void
-initvpp_api (void)
-#endif
-{
-#if PY_VERSION_HEX >= 0x03000000
-  static struct PyModuleDef vpp_api_module = {
-#if PY_VERSION_HEX >= 0x03020000
-    PyModuleDef_HEAD_INIT,
-#else
-    {
-      PyObject_HEAD_INIT(NULL)
-      NULL, /* m_init */
-      0,    /* m_index */
-      NULL, /* m_copy */
-    },
-#endif
-    (char *) "vpp_api",
-    NULL,
-    -1,
-    vpp_api_Methods,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-  };
-#endif
-
-  /* Ensure threading is initialised */
-  if (!PyEval_ThreadsInitialized()) {
-    PyEval_InitThreads();
-  }
-
-#if PY_VERSION_HEX >= 0x03000000
-  return PyModule_Create(&vpp_api_module);
-#else
-  Py_InitModule((char *) "vpp_api", vpp_api_Methods);
-  return;
-#endif
-}
diff --git a/vpp-api/python/vpp_papi/vpp_papi.py b/vpp-api/python/vpp_papi/vpp_papi.py
deleted file mode 100644
index 6b6b79fd..00000000
--- a/vpp-api/python/vpp_papi/vpp_papi.py
+++ /dev/null
@@ -1,450 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-from __future__ import print_function
-import sys, os, logging, collections, struct, json, threading, glob
-logging.basicConfig(level=logging.DEBUG)
-import vpp_api
-
-def eprint(*args, **kwargs):
-    print(*args, file=sys.stderr, **kwargs)
-
-class VPP():
-    def __init__(self, apifiles = None, testmode = False):
-        self.messages = {}
-        self.id_names = []
-        self.id_msgdef = []
-        self.buffersize = 10000
-        self.connected = False
-        self.header = struct.Struct('>HI')
-        self.results = {}
-        self.timeout = 5
-        self.apifile = []
-
-        if not apifiles:
-            # Pick up API definitions from default directory
-            apifiles = glob.glob('/usr/share/vpp/api/*.api.json')
-
-        for file in apifiles:
-            self.apifile.append(file)
-            with open(file) as apidef_file:
-                api = json.load(apidef_file)
-                for t in api['types']:
-                    self.add_type(t[0], t[1:])
-
-                for m in api['messages']:
-                    self.add_message(m[0], m[1:])
-
-        # Basic sanity check
-        if len(self.messages) == 0 and not testmode:
-            raise ValueError(1, 'Missing JSON message definitions')
-
-
-    class ContextId(object):
-        def __init__(self):
-            self.context = 0
-        def __call__(self):
-            self.context += 1
-            return self.context
-    get_context = ContextId()
-
-    def status(self):
-        print('Connected') if self.connected else print('Not Connected')
-        print('Read API definitions from', self.apifile)
-
-    def __struct (self, t, n = None, e = -1, vl = None):
-        base_types = { 'u8' : 'B',
-                       'u16' : 'H',
-                       'u32' : 'I',
-                       'i32' : 'i',
-                       'u64' : 'Q',
-                       'f64' : 'd',
-                       }
-        pack = None
-        if t in base_types:
-            pack = base_types[t]
-            if not vl:
-                if e > 0 and t == 'u8':
-                    # Fixed byte array
-                    return struct.Struct('>' + str(e) + 's')
-                if e > 0:
-                    # Fixed array of base type
-                    return [e, struct.Struct('>' + base_types[t])]
-                elif e == 0:
-                    # Old style variable array
-                    return [-1, struct.Struct('>' + base_types[t])]
-            else:
-                # Variable length array
-                return [vl, struct.Struct('>s')] if t == 'u8' else \
-                    [vl, struct.Struct('>' + base_types[t])]
-
-            return struct.Struct('>' + base_types[t])
-
-        if t in self.messages:
-            ### Return a list in case of array ###
-            if e > 0 and not vl:
-                return [e, lambda self, encode, buf, offset, args: (
-                    self.__struct_type(encode, self.messages[t], buf, offset,
-                                       args))]
-            if vl:
-                return [vl, lambda self, encode, buf, offset, args: (
-                    self.__struct_type(encode, self.messages[t], buf, offset,
-                                       args))]
-            elif e == 0:
-                # Old style VLA
-                raise NotImplementedError(1, 'No support for compound types ' + t)
-            return lambda self, encode, buf, offset, args: (
-                self.__struct_type(encode, self.messages[t], buf, offset, args)
-            )
-
-        raise ValueError(1, 'Invalid message type: ' + t)
-
-    def __struct_type(self, encode, msgdef, buf, offset, kwargs):
-        if encode:
-            return self.__struct_type_encode(msgdef, buf, offset, kwargs)
-        else:
-            return self.__struct_type_decode(msgdef, buf, offset)
-
-    def __struct_type_encode(self, msgdef, buf, offset, kwargs):
-        off = offset
-        size = 0
-
-        for k in kwargs:
-            if k not in msgdef['args']:
-                raise ValueError(1, 'Invalid field-name in message call ' + k)
-
-        for k,v in msgdef['args'].iteritems():
-            off += size
-            if k in kwargs:
-                if type(v) is list:
-                    if callable(v[1]):
-                        e = kwargs[v[0]] if v[0] in kwargs else v[0]
-                        size = 0
-                        for i in range(e):
-                            size += v[1](self, True, buf, off + size,
-                                         kwargs[k][i])
-                    else:
-                        if v[0] in kwargs:
-                            l = kwargs[v[0]]
-                        else:
-                            l = len(kwargs[k])
-                        if v[1].size == 1:
-                            buf[off:off + l] = bytearray(kwargs[k])
-                            size = l
-                        else:
-                            size = 0
-                            for i in kwargs[k]:
-                                v[1].pack_into(buf, off + size, i)
-                                size += v[1].size
-                else:
-                    if callable(v):
-                        size = v(self, True, buf, off, kwargs[k])
-                    else:
-                        v.pack_into(buf, off, kwargs[k])
-                        size = v.size
-            else:
-                size = v.size if not type(v) is list else 0
-
-        return off + size - offset
-
-
-    def __getitem__(self, name):
-        if name in self.messages:
-            return self.messages[name]
-        return None
-
-    def encode(self, msgdef, kwargs):
-        # Make suitably large buffer
-        buf = bytearray(self.buffersize)
-        offset = 0
-        size = self.__struct_type(True, msgdef, buf, offset, kwargs)
-        return buf[:offset + size]
-
-    def decode(self, msgdef, buf):
-        return self.__struct_type(False, msgdef, buf, 0, None)[1]
-
-    def __struct_type_decode(self, msgdef, buf, offset):
-        res = []
-        off = offset
-        size = 0
-        for k,v in msgdef['args'].iteritems():
-            off += size
-            if type(v) is list:
-                lst = []
-                if callable(v[1]): # compound type
-                    size = 0
-                    if v[0] in msgdef['args']: # vla
-                        e = res[v[2]]
-                    else: # fixed array
-                        e = v[0]
-                    res.append(lst)
-                    for i in range(e):
-                        (s,l) = v[1](self, False, buf, off + size, None)
-                        lst.append(l)
-                        size += s
-                    continue
-                if v[1].size == 1:
-                    if type(v[0]) is int:
-                        size = len(buf) - off
-                    else:
-                        size = res[v[2]]
-                    res.append(buf[off:off + size])
-                else:
-                    e = v[0] if type(v[0]) is int else res[v[2]]
-                    if e == -1:
-                        e = (len(buf) - off) / v[1].size
-                    lst = []
-                    res.append(lst)
-                    size = 0
-                    for i in range(e):
-                        lst.append(v[1].unpack_from(buf, off + size)[0])
-                        size += v[1].size
-            else:
-                if callable(v):
-                    (s,l) = v(self, False, buf, off, None)
-                    res.append(l)
-                    size += s
-                else:
-                    res.append(v.unpack_from(buf, off)[0])
-                    size = v.size
-
-        return off + size - offset, msgdef['return_tuple']._make(res)
-
-    def ret_tup(self, name):
-        if name in self.messages and 'return_tuple' in self.messages[name]:
-            return self.messages[name]['return_tuple']
-        return None
-
-    def add_message(self, name, msgdef):
-        if name in self.messages:
-            raise ValueError('Duplicate message name: ' + name)
-
-        args = collections.OrderedDict()
-        argtypes = collections.OrderedDict()
-        fields = []
-        msg = {}
-        for i, f in enumerate(msgdef):
-            if type(f) is dict and 'crc' in f:
-                msg['crc'] = f['crc']
-                continue
-            field_type = f[0]
-            field_name = f[1]
-            if len(f) == 3 and f[2] == 0 and i != len(msgdef) - 2:
-                raise ValueError('Variable Length Array must be last: ' + name)
-            args[field_name] = self.__struct(*f)
-            argtypes[field_name] = field_type
-            if len(f) == 4: # Find offset to # elements field
-                args[field_name].append(args.keys().index(f[3]) - i)
-            fields.append(field_name)
-        msg['return_tuple'] = collections.namedtuple(name, fields,
-                                                     rename = True)
-        self.messages[name] = msg
-        self.messages[name]['args'] = args
-        self.messages[name]['argtypes'] = argtypes
-        return self.messages[name]
-
-    def add_type(self, name, typedef):
-        return self.add_message('vl_api_' + name + '_t', typedef)
-
-    def make_function(self, name, i, msgdef, multipart, async):
-        if (async):
-            f = lambda **kwargs: (self._call_vpp_async(i, msgdef, multipart, **kwargs))
-        else:
-            f = lambda **kwargs: (self._call_vpp(i, msgdef, multipart, **kwargs))
-        args = self.messages[name]['args']
-        argtypes = self.messages[name]['argtypes']
-        f.__name__ = str(name)
-        f.__doc__ = ", ".join(["%s %s" % (argtypes[k], k) for k in args.keys()])
-        return f
-
-    def _register_functions(self, async=False):
-        self.id_names = [None] * (self.vpp_dictionary_maxid + 1)
-        self.id_msgdef = [None] * (self.vpp_dictionary_maxid + 1)
-        for name, msgdef in self.messages.iteritems():
-            if name in self.vpp_dictionary:
-                if self.messages[name]['crc'] != self.vpp_dictionary[name]['crc']:
-                    raise ValueError(3, 'Failed CRC checksum ' + name +
-                                     ' ' + self.messages[name]['crc'] +
-                                     ' ' + self.vpp_dictionary[name]['crc'])
-                i = self.vpp_dictionary[name]['id']
-                self.id_msgdef[i] = msgdef
-                self.id_names[i] = name
-                multipart = True if name.find('_dump') > 0 else False
-                setattr(self, name, self.make_function(name, i, msgdef, multipart, async))
-
-    def _write (self, buf):
-        if not self.connected:
-            raise IOError(1, 'Not connected')
-        return vpp_api.write(str(buf))
-
-    def _load_dictionary(self):
-        self.vpp_dictionary = {}
-        self.vpp_dictionary_maxid = 0
-        d = vpp_api.msg_table()
-
-        if not d:
-            raise IOError(3, 'Cannot get VPP API dictionary')
-        for i,n in d:
-            name, crc =  n.rsplit('_', 1)
-            crc = '0x' + crc
-            self.vpp_dictionary[name] = { 'id' : i, 'crc' : crc }
-            self.vpp_dictionary_maxid = max(self.vpp_dictionary_maxid, i)
-
-    def connect(self, name, chroot_prefix = None, async = False):
-        msg_handler = self.msg_handler if not async else self.msg_handler_async
-        if not chroot_prefix:
-            rv = vpp_api.connect(name, msg_handler)
-        else:
-            rv = vpp_api.connect(name, msg_handler, chroot_prefix)
-
-        if rv != 0:
-            raise IOError(2, 'Connect failed')
-        self.connected = True
-
-        self._load_dictionary()
-        self._register_functions(async=async)
-
-        # Initialise control ping
-        self.control_ping_index = self.vpp_dictionary['control_ping']['id']
-        self.control_ping_msgdef = self.messages['control_ping']
-
-    def disconnect(self):
-        rv = vpp_api.disconnect()
-        return rv
-
-    def results_wait(self, context):
-        return (self.results[context]['e'].wait(self.timeout))
-
-    def results_prepare(self, context):
-        self.results[context] = {}
-        self.results[context]['e'] = threading.Event()
-        self.results[context]['e'].clear()
-        self.results[context]['r'] = []
-
-    def results_clean(self, context):
-        del self.results[context]
-
-    def msg_handler(self, msg):
-        if not msg:
-            eprint('vpp_api.read failed')
-            return
-
-        i, ci = self.header.unpack_from(msg, 0)
-        if self.id_names[i] == 'rx_thread_exit':
-            return;
-
-        #
-        # Decode message and returns a tuple.
-        #
-        msgdef = self.id_msgdef[i]
-        if not msgdef:
-            raise IOError(2, 'Reply message undefined')
-
-        r = self.decode(msgdef, msg)
-        if 'context' in r._asdict():
-            if r.context > 0:
-                context = r.context
-
-        msgname = type(r).__name__
-
-        #
-        # XXX: Call provided callback for event
-        # Are we guaranteed to not get an event during processing of other messages?
-        # How to differentiate what's a callback message and what not? Context = 0?
-        #
-        #if not is_waiting_for_reply():
-        if r.context == 0 and self.event_callback:
-            self.event_callback(msgname, r)
-            return
-
-        #
-        # Collect results until control ping
-        #
-        if msgname == 'control_ping_reply':
-            self.results[context]['e'].set()
-            return
-
-        if not context in self.results:
-            eprint('Not expecting results for this context', context, r)
-            return
-
-        if 'm' in self.results[context]:
-            self.results[context]['r'].append(r)
-            return
-
-        self.results[context]['r'] = r
-        self.results[context]['e'].set()
-
-    def msg_handler_async(self, msg):
-        if not msg:
-            eprint('vpp_api.read failed')
-            return
-
-        i, ci = self.header.unpack_from(msg, 0)
-        if self.id_names[i] == 'rx_thread_exit':
-            return;
-
-        #
-        # Decode message and returns a tuple.
-        #
-        msgdef = self.id_msgdef[i]
-        if not msgdef:
-            raise IOError(2, 'Reply message undefined')
-
-        r = self.decode(msgdef, msg)
-        msgname = type(r).__name__
-
-        self.event_callback(msgname, r)
-
-    def _control_ping(self, context):
-        self._write(self.encode(self.control_ping_msgdef,
-                        { '_vl_msg_id' : self.control_ping_index,
-                          'context' : context}))
-
-    def _call_vpp(self, i, msgdef, multipart, **kwargs):
-        if not 'context' in kwargs:
-            context = self.get_context()
-            kwargs['context'] = context
-        else:
-            context = kwargs['context']
-        kwargs['_vl_msg_id'] = i
-        b = self.encode(msgdef, kwargs)
-
-        self.results_prepare(context)
-        self._write(b)
-
-        if multipart:
-            self.results[context]['m'] = True
-            self._control_ping(context)
-        self.results_wait(context)
-        r = self.results[context]['r']
-        self.results_clean(context)
-        return r
-
-    def _call_vpp_async(self, i, msgdef, multipart, **kwargs):
-        if not 'context' in kwargs:
-            context = self.get_context()
-            kwargs['context'] = context
-        else:
-            context = kwargs['context']
-        kwargs['_vl_msg_id'] = i
-        b = self.encode(msgdef, kwargs)
-
-        self._write(b)
-
-    def register_event_callback(self, callback):
-        self.event_callback = callback
-
diff --git a/vpp/Makefile.am b/vpp/Makefile.am
deleted file mode 100644
index 25d72749..00000000
--- a/vpp/Makefile.am
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @VCGN@ @IPV6SR@ @APICLI@
-
-noinst_PROGRAMS = 
-BUILT_SOURCES =
-bin_PROGRAMS = 
-CLEANFILES = 
-
-bin_PROGRAMS += vpp
-
-vpp_SOURCES =					\
-  vnet/main.c					\
-  app/vpe_cli.c					\
-  app/version.c					\
-  oam/oam.c					\
-  stats/stats.c
-
-vpp_SOURCES +=					\
-  vpp-api/api.c					\
-  vpp-api/custom_dump.c				\
-  vpp-api/json_format.c
-
-if WITH_APICLI
-  vpp_SOURCES +=				\
-  vpp-api/api_format.c				\
-  vpp-api/api_main.c				
-endif
-
-
-# comment out to disable stats upload to gmond 
-
-vpp_SOURCES +=					\
-  vpp-api/gmon.c	
-
-nobase_include_HEADERS =			\
-  vpp-api/vpe_all_api_h.h			\
-  vpp-api/vpe_msg_enum.h			\
-  vpp-api/vpe.api.h
-
-# install the API definition, so we can produce java bindings, etc.
-
-apidir = $(prefix)/vpp-api
-api_DATA = vpp-api/vpe.api.json
-
-BUILT_SOURCES += vpp-api/vpe.api.h app/version.h vpp-api/vpe.api.json
-
-app/version.o:	app/version.h
-
-.PHONY:	app/version.h
-
-app/version.h:
-	@echo "  VERSION " $@ 
-	@echo "#define VPP_BUILD_DATE \"$$(date)\"" > $@
-	@echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $@
-	@echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $@
-	@echo "#define VPP_BUILD_TOPDIR \"$$(git rev-parse --show-toplevel)\"" 	>> $@
-	@echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@
-
-# Generate a plugin configuration script. Misconfiguring a
-# plugin can cause very subtle problems.
-
-bin_SCRIPTS = vpp_plugin_configure
-
-BUILT_SOURCES += vpp_plugin_configure
-
-.PHONY: vpp_plugin_configure
-
-if WITH_DPDK
-PLUGIN_DPDK_ARG="--with-dpdk"
-else
-PLUGIN_DPDK_ARG=""
-endif
-
-vpp_plugin_configure:
-	@echo "PLUGIN CONFIGURE " $@ 
-	@echo "#!/bin/bash" > $@
-	@echo " " >> $@
-	@echo "set +eu" >> $@
-	@echo " " >> $@
-	@echo "if [ -f ./configure ] ; then" >> $@
-	@echo "    CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ./configure --with-plugin-toolkit $(PLUGIN_DPDK_ARG)" >> $@
-	@echo "else" >> $@
-	@echo "    if [ -f ../configure ] ; then" >> $@
-	@echo "        CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ../configure --with-plugin-toolkit $(PLUGIN_DPDK_ARG)" >> $@
-	@echo "    else" >> $@
-	@echo "        echo Couldnt find ./configure or ../configure " >> $@
-	@echo "        exit 1" >> $@
-	@echo "    fi" >> $@
-	@echo "fi" >> $@
-
-vpp_LDADD = -lvlibapi -lvlibmemory  -lvlib_unix -lvlib
-
-vpp_LDADD += -lvnet
-
-vpp_LDADD += -lsvm -lsvmdb -lrt
-
-vpp_LDADD += -lvnetplugin
-
-if WITH_DPDK
-vpp_LDFLAGS = -Wl,--whole-archive
-if ENABLE_DPDK_SHARED
-vpp_LDFLAGS += -ldpdk
-else
-vpp_LDFLAGS += -l:libdpdk.a
-endif
-vpp_LDFLAGS += -Wl,--no-whole-archive
-if WITH_DPDK_CRYPTO
-vpp_LDADD += -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB
-endif
-if WITH_DPDK_MLX5_PMD
-vpp_LDFLAGS += -libverbs -lmlx5 -lnuma
-endif
-endif
-
-vpp_LDADD += -lvppinfra -lm -lpthread -ldl
-
-if WITH_IPV6SR
-  vpp_LDADD += -lcrypto
-endif
-
-# Set the suffix list
-SUFFIXES = .api.h .api .api.json
-
-# The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk
-# and requires a symbolic link at the top of the vpp source tree
-
-include $(top_srcdir)/suffix-rules.mk
-
-noinst_PROGRAMS += test_client
-
-test_client_SOURCES = vpp-api/test_client.c
-test_client_LDADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
-	-lpthread -lm -lrt
-
-noinst_PROGRAMS += test_client test_ha
-
-test_ha_SOURCES = vpp-api/test_ha.c
-test_ha_LDADD = -lvlibmemoryclient -lvlibapi -lsvmdb -lsvm -lvppinfra \
-		-lpthread -lm -lrt
-
-
-noinst_PROGRAMS += summary_stats_client
-
-summary_stats_client_SOURCES = vpp-api/summary_stats_client.c
-summary_stats_client_LDADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
-	-lpthread -lm -lrt
-
-bin_PROGRAMS += vpp_get_metrics
-
-vpp_get_metrics_SOURCES = vpp-api/vpp_get_metrics.c
-vpp_get_metrics_LDADD = -lsvmdb -lsvm -lvppinfra \
-		-lpthread -lm -lrt
diff --git a/vpp/app/l2t.c b/vpp/app/l2t.c
deleted file mode 100644
index 45dd2807..00000000
--- a/vpp/app/l2t.c
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-
-#if DPDK == 0
-#include <vnet/devices/pci/ixge.h>
-#else
-#include <vnet/devices/dpdk/dpdk.h>
-#endif
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <app/l2t.h>
-
-l2t_main_t l2t_main;
-
-/* $$$$ unused?
- * get_interface_ethernet_address
- * paints the ethernet address for a given interface
- * into the supplied destination
- */
-void
-get_interface_ethernet_address (l2t_main_t * lm, u8 * dst, u32 sw_if_index)
-{
-  ethernet_main_t *em = ethernet_get_main (lm->vlib_main);
-  ethernet_interface_t *ei;
-  vnet_hw_interface_t *hi;
-
-  hi = vnet_get_sup_hw_interface (lm->vnet_main, sw_if_index);
-  ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
-  clib_memcpy (dst, ei->address, sizeof (ei->address));
-}
-
-/* packet trace format function */
-u8 *
-format_l2t_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  l2t_trace_t *t = va_arg (*args, l2t_trace_t *);
-
-  if (t->is_user_to_network)
-    s = format (s, "L2T: %U (client) -> %U (our) session %d",
-		format_ip6_address, &t->client_address,
-		format_ip6_address, &t->our_address, t->session_index);
-  else
-    s = format (s, "L2T: %U (our) -> %U (client) session %d)",
-		format_ip6_address, &t->our_address,
-		format_ip6_address, &t->client_address, t->session_index);
-  return s;
-}
-
-u8 *
-format_l2t_session (u8 * s, va_list * args)
-{
-  l2t_session_t *session = va_arg (*args, l2t_session_t *);
-  l2t_main_t *lm = &l2t_main;
-  u32 counter_index;
-  vlib_counter_t v;
-
-  s = format (s, "[%d] %U (our) %U (client) vlan-id %d rx_sw_if_index %d\n",
-	      session - lm->sessions,
-	      format_ip6_address, &session->our_address,
-	      format_ip6_address, &session->client_address,
-	      clib_net_to_host_u16 (session->vlan_id), session->sw_if_index);
-
-  s = format (s, "   local cookie %llx remote cookie %llx\n",
-	      clib_net_to_host_u64 (session->local_cookie),
-	      clib_net_to_host_u64 (session->remote_cookie));
-
-  if (session->cookie_flags & L2TP_COOKIE_ROLLOVER_LOCAL)
-    {
-      s = format (s, "   local rollover cookie %llx\n",
-		  clib_net_to_host_u64 (session->lcl_ro_cookie));
-    }
-
-  s = format (s, "   local session-id %d remote session-id %d\n",
-	      clib_net_to_host_u32 (session->local_session_id),
-	      clib_net_to_host_u32 (session->remote_session_id));
-
-  s = format (s, "   l2 specific sublayer %s\n",
-	      session->l2_sublayer_present ? "preset" : "absent");
-
-  counter_index =
-    session_index_to_counter_index (session - lm->sessions,
-				    SESSION_COUNTER_USER_TO_NETWORK);
-
-  vlib_get_combined_counter (&lm->counter_main, counter_index, &v);
-  if (v.packets != 0)
-    s = format (s, "   user-to-net: %llu pkts %llu bytes\n",
-		v.packets, v.bytes);
-
-  vlib_get_combined_counter (&lm->counter_main, counter_index + 1, &v);
-
-  if (v.packets != 0)
-    s = format (s, "   net-to-user: %llu pkts %llu bytes\n",
-		v.packets, v.bytes);
-  return s;
-}
-
-static clib_error_t *
-show_session_summary_command_fn (vlib_main_t * vm,
-				 unformat_input_t * input,
-				 vlib_cli_command_t * cmd)
-{
-  l2t_main_t *lm = &l2t_main;
-
-  vlib_cli_output (vm, "%d active sessions\n", pool_elts (lm->sessions));
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-static VLIB_CLI_COMMAND (show_session_summary_command) = {
-  .path = "show session",
-  .short_help = "show session summary",
-  .function = show_session_summary_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-show_session_detail_command_fn (vlib_main_t * vm,
-				unformat_input_t * input,
-				vlib_cli_command_t * cmd)
-{
-  l2t_session_t *session;
-  l2t_main_t *lm = &l2t_main;
-
-  /* *INDENT-OFF* */
-  pool_foreach (session, lm->sessions,
-  ({
-    vlib_cli_output (vm, "%U", format_l2t_session, session);
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-static VLIB_CLI_COMMAND (show_session_detail_command) = {
-  .path = "show session detail",
-  .short_help = "show session table detail",
-  .function = show_session_detail_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-test_counters_command_fn (vlib_main_t * vm,
-			  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  l2t_session_t *session;
-  l2t_main_t *lm = &l2t_main;
-  u32 session_index;
-  u32 counter_index;
-  u32 nincr = 0;
-
-  /* *INDENT-OFF* */
-  pool_foreach (session, lm->sessions,
-  ({
-    session_index = session - lm->sessions;
-    counter_index =
-      session_index_to_counter_index (session_index,
-                                      SESSION_COUNTER_USER_TO_NETWORK);
-    vlib_increment_combined_counter (&lm->counter_main,
-                                     counter_index,
-                                     1/*pkt*/, 1111 /*bytes*/);
-    vlib_increment_combined_counter (&lm->counter_main,
-                                     counter_index+1,
-                                     1/*pkt*/, 2222 /*bytes*/);
-    nincr++;
-  }));
-  /* *INDENT-ON* */
-  vlib_cli_output (vm, "Incremented %d active counters\n", nincr);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-static VLIB_CLI_COMMAND (test_counters_command) = {
-  .path = "test counters",
-  .short_help = "increment all active counters",
-  .function = test_counters_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-clear_counters_command_fn (vlib_main_t * vm,
-			   unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  l2t_session_t *session;
-  l2t_main_t *lm = &l2t_main;
-  u32 session_index;
-  u32 counter_index;
-  u32 nincr = 0;
-
-  /* *INDENT-OFF* */
-  pool_foreach (session, lm->sessions,
-  ({
-    session_index = session - lm->sessions;
-    counter_index =
-      session_index_to_counter_index (session_index,
-                                      SESSION_COUNTER_USER_TO_NETWORK);
-    vlib_zero_combined_counter (&lm->counter_main, counter_index);
-    vlib_zero_combined_counter (&lm->counter_main, counter_index+1);
-    nincr++;
-  }));
-  /* *INDENT-ON* */
-  vlib_cli_output (vm, "Cleared %d active counters\n", nincr);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-static VLIB_CLI_COMMAND (clear_counters_command) = {
-  .path = "clear counters",
-  .short_help = "clear all active counters",
-  .function = clear_counters_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-l2tp_session_add_command_fn (vlib_main_t * vm,
-			     unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  ip6_address_t client_address, our_address;
-  ip6_address_t *dst_address_copy, *src_address_copy;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u32 vlan_id;
-  u32 sw_if_index = (u32) ~ 0;
-  l2t_main_t *lm = &l2t_main;
-  l2t_session_t *s;
-  uword *p;
-  vnet_hw_interface_t *hi;
-  vnet_sw_interface_t *si;
-  u32 next_index;
-  uword vlan_and_sw_if_index_key;
-  u32 counter_index;
-  u64 local_cookie = (u64) ~ 0, remote_cookie = (u64) ~ 0;
-  u32 local_session_id = 1, remote_session_id = 1;
-  int our_address_set = 0, client_address_set = 0;
-  int l2_sublayer_present = 0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "client %U",
-		    unformat_ip6_address, &client_address))
-	client_address_set = 1;
-      else if (unformat (line_input, "our %U",
-			 unformat_ip6_address, &our_address))
-	our_address_set = 1;
-      else if (unformat (line_input, "vlan %d", &vlan_id))
-	;
-      else if (unformat (line_input, "l2-interface %U",
-			 unformat_vnet_sw_interface,
-			 vnet_get_main (), &sw_if_index))
-	;
-      else if (unformat (line_input, "interface %U",
-			 unformat_vnet_sw_interface,
-			 vnet_get_main (), &sw_if_index))
-	;
-      else if (unformat (line_input, "local-cookie %llx", &local_cookie))
-	;
-      else if (unformat (line_input, "remote-cookie %llx", &remote_cookie))
-	;
-      else if (unformat (line_input, "local-session-id %d",
-			 &local_session_id))
-	;
-      else if (unformat (line_input, "remote-session-id %d",
-			 &remote_session_id))
-	;
-      else if (unformat (line_input, "l2-sublayer-present"))
-	l2_sublayer_present = 1;
-      else
-	return clib_error_return (0, "parse error: '%U'",
-				  format_unformat_error, line_input);
-    }
-
-  unformat_free (line_input);
-
-  if (sw_if_index == (u32) ~ 0)
-    return clib_error_return (0, "l2-interface not specified");
-  if (our_address_set == 0)
-    return clib_error_return (0, "our address not specified");
-  if (client_address_set == 0)
-    return clib_error_return (0, "client address not specified");
-
-  remote_session_id = clib_host_to_net_u32 (remote_session_id);
-  local_session_id = clib_host_to_net_u32 (local_session_id);
-
-  switch (lm->lookup_type)
-    {
-    case L2T_LOOKUP_SRC_ADDRESS:
-      p = hash_get_mem (lm->session_by_src_address, &client_address);
-      if (p)
-	return clib_error_return
-	  (0, "Session w/ client address %U already exists",
-	   format_ip6_address, &client_address);
-      break;
-
-    case L2T_LOOKUP_DST_ADDRESS:
-      p = hash_get_mem (lm->session_by_dst_address, &our_address);
-      if (p)
-	return clib_error_return
-	  (0, "Session w/ our address %U already exists",
-	   format_ip6_address, &our_address);
-      break;
-
-    case L2T_LOOKUP_SESSION_ID:
-      p = hash_get (lm->session_by_session_id, local_session_id);
-      if (p)
-	return clib_error_return
-	  (0,
-	   "Session w/ local session id %d already exists",
-	   clib_net_to_host_u32 (local_session_id));
-      break;
-
-    default:
-      ASSERT (0);
-    }
-
-  pool_get (lm->sessions, s);
-  memset (s, 0, sizeof (*s));
-  clib_memcpy (&s->our_address, &our_address, sizeof (s->our_address));
-  clib_memcpy (&s->client_address, &client_address,
-	       sizeof (s->client_address));
-  s->sw_if_index = sw_if_index;
-  s->vlan_id = clib_host_to_net_u16 (vlan_id);
-  s->local_cookie = clib_host_to_net_u64 (local_cookie);
-  l2tp_session_set_remote_cookie (s, remote_cookie);
-  s->local_session_id = local_session_id;
-  s->remote_session_id = remote_session_id;
-  s->l2_sublayer_present = l2_sublayer_present;
-
-  hi = vnet_get_sup_hw_interface (lm->vnet_main, sw_if_index);
-  si = vnet_get_sup_sw_interface (lm->vnet_main, sw_if_index);
-
-  next_index = vlib_node_add_next (vm, l2t_ip6_node.index,
-				   hi->output_node_index);
-  s->l2_output_next_index = next_index;
-  s->l2_output_sw_if_index = si->sw_if_index;
-
-  /* Setup hash table entries */
-  switch (lm->lookup_type)
-    {
-    case L2T_LOOKUP_SRC_ADDRESS:
-      src_address_copy = clib_mem_alloc (sizeof (*src_address_copy));
-      clib_memcpy (src_address_copy, &client_address,
-		   sizeof (*src_address_copy));
-      hash_set_mem (lm->session_by_src_address, src_address_copy,
-		    s - lm->sessions);
-      break;
-    case L2T_LOOKUP_DST_ADDRESS:
-      dst_address_copy = clib_mem_alloc (sizeof (*dst_address_copy));
-      clib_memcpy (dst_address_copy, &our_address,
-		   sizeof (*dst_address_copy));
-      hash_set_mem (lm->session_by_dst_address, dst_address_copy,
-		    s - lm->sessions);
-      break;
-    case L2T_LOOKUP_SESSION_ID:
-      hash_set (lm->session_by_session_id, local_session_id,
-		s - lm->sessions);
-      break;
-
-    default:
-      ASSERT (0);
-    }
-
-  vlan_and_sw_if_index_key = ((uword) (s->vlan_id) << 32) | sw_if_index;
-  hash_set (lm->session_by_vlan_and_rx_sw_if_index,
-	    vlan_and_sw_if_index_key, s - lm->sessions);
-
-  /* validate counters */
-  counter_index =
-    session_index_to_counter_index (s - lm->sessions,
-				    SESSION_COUNTER_USER_TO_NETWORK);
-  vlib_validate_counter (&lm->counter_main, counter_index);
-  vlib_validate_counter (&lm->counter_main, counter_index + 1);
-
-  /* Set promiscuous mode on the l2 interface */
-  ethernet_set_flags (lm->vnet_main, hi->hw_if_index,
-		      ETHERNET_INTERFACE_FLAG_ACCEPT_ALL);
-  vnet_hw_interface_rx_redirect_to_node (lm->vnet_main, hi->hw_if_index,
-					 l2t_l2_node.index);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-static VLIB_CLI_COMMAND (l2tp_session_add_command) = {
-  .path = "l2tp session add",
-  .short_help =
-  "l2tp session add client <ip6> our <ip6> vlan <id> local-cookie <hex> remote-cookie <hex> local-session <dec> remote-session <dec> l2-interface <int>",
-  .function = l2tp_session_add_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-l2tp_session_del_command_fn (vlib_main_t * vm,
-			     unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  l2t_main_t *lm = &l2t_main;
-  u32 session_index;
-  l2t_session_t *s;
-  hash_pair_t *hp;
-  void *key;
-  uword vlan_and_sw_if_index_key;
-
-  if (!unformat (input, "%d", &session_index))
-    return clib_error_return (0, "missing session index: '%U'",
-			      format_unformat_error, input);
-
-  if (pool_is_free_index (lm->sessions, session_index))
-    return clib_error_return (0, "session %d not in use", session_index);
-
-  s = pool_elt_at_index (lm->sessions, session_index);
-
-  switch (lm->lookup_type)
-    {
-    case L2T_LOOKUP_SRC_ADDRESS:
-      hp = hash_get_pair_mem (lm->session_by_src_address, &s->client_address);
-      if (hp)
-	{
-	  key = (void *) (hp->key);
-	  hash_unset_mem (lm->session_by_src_address, &s->client_address);
-	  clib_mem_free (key);
-	}
-      else
-	clib_warning ("session %d src address key %U AWOL",
-		      s - lm->sessions,
-		      format_ip6_address, &s->client_address);
-      break;
-
-    case L2T_LOOKUP_DST_ADDRESS:
-      hp = hash_get_pair_mem (lm->session_by_dst_address, &s->our_address);
-      if (hp)
-	{
-	  key = (void *) (hp->key);
-	  hash_unset_mem (lm->session_by_dst_address, &s->our_address);
-	  clib_mem_free (key);
-	}
-      else
-	clib_warning ("session %d dst address key %U AWOL",
-		      s - lm->sessions, format_ip6_address, &s->our_address);
-      break;
-
-    case L2T_LOOKUP_SESSION_ID:
-      hash_unset (lm->session_by_session_id, s->local_session_id);
-      break;
-
-    default:
-      ASSERT (0);
-    }
-
-  vlan_and_sw_if_index_key = ((uword) (s->vlan_id) << 32) | s->sw_if_index;
-
-  hash_unset (lm->session_by_vlan_and_rx_sw_if_index,
-	      vlan_and_sw_if_index_key);
-
-  pool_put (lm->sessions, s);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-static VLIB_CLI_COMMAND (l2tp_session_del_command) = {
-  .path = "l2tp session delete",
-  .short_help =
-  "l2tp session delete <session-id>",
-  .function = l2tp_session_del_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-l2tp_session_cookie_command_fn (vlib_main_t * vm,
-				unformat_input_t * input,
-				vlib_cli_command_t * cmd)
-{
-  l2t_main_t *lm = &l2t_main;
-  u32 session_index;
-  l2t_session_t *s;
-  u64 lcl_ro_cookie = (u64) ~ 0, rem_ro_cookie = (u64) ~ 0;
-  u8 cookie_flags = 0;
-
-  if (!unformat (input, "%d", &session_index))
-    return clib_error_return (0, "missing session index: '%U'",
-			      format_unformat_error, input);
-
-  if (pool_is_free_index (lm->sessions, session_index))
-    return clib_error_return (0, "session %d not in use", session_index);
-
-  s = pool_elt_at_index (lm->sessions, session_index);
-
-  if (unformat (input, "commit"))
-    {
-      if (!s->cookie_flags)
-	{
-	  return clib_error_return (0, "no rollover cookie ready to commit");
-	}
-      else
-	{
-	  l2tp_session_cookie_commit (s);
-	  return 0;
-	}
-    }
-  if (!unformat (input, "rollover"))
-    return clib_error_return (0, "missing 'commit|rollover': '%U'",
-			      format_unformat_error, input);
-  if (unformat (input, "local %llx", &lcl_ro_cookie))
-    {
-      cookie_flags |= L2TP_COOKIE_ROLLOVER_LOCAL;
-      l2tp_session_set_local_rollover_cookie (s, lcl_ro_cookie);
-    }
-  if (unformat (input, "remote %llx", &rem_ro_cookie))
-    {
-      cookie_flags |= L2TP_COOKIE_ROLLOVER_REMOTE;
-      l2tp_session_set_remote_cookie (s, rem_ro_cookie);
-    }
-  if (!cookie_flags)
-    return clib_error_return (0, "no rollover cookie specified");
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-static VLIB_CLI_COMMAND (l2tp_session_cookie_command) = {
-  .path = "l2tp session cookie",
-  .short_help =
-  "l2tp session cookie <session id> commit|rollover [local <hex>] [remote <hex>]",
-  .function = l2tp_session_cookie_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/app/l2t_l2.c b/vpp/app/l2t_l2.c
deleted file mode 100644
index 07d30d9a..00000000
--- a/vpp/app/l2t_l2.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-
-#if DPDK == 0
-#include <vnet/devices/pci/ixgev.h>
-#include <vnet/devices/pci/ixge.h>
-#include <vnet/devices/pci/ige.h>
-#else
-#include <vnet/devices/dpdk/dpdk.h>
-#endif
-
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <app/l2t.h>
-
-l2t_main_t l2t_main;
-
-/* Statistics (not really errors) */
-#define foreach_l2t_l2_error                       \
-_(NETWORK_TO_USER, "L2 network to user (ip6) pkts")
-
-static char *l2t_l2_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2t_l2_error
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) L2T_L2_ERROR_##sym,
-  foreach_l2t_l2_error
-#undef _
-    L2T_L2_N_ERROR,
-} l2t_l2_error_t;
-
-/*
- * Packets go to ethernet-input when they don't match a mapping
- */
-typedef enum
-{
-  L2T_L2_NEXT_DROP,
-  L2T_L2_NEXT_ETHERNET_INPUT,
-  L2T_L2_NEXT_IP6_LOOKUP,
-  L2T_L2_N_NEXT,
-} l2t_l2_next_t;
-
-vlib_node_registration_t l2t_l2_node;
-
-#define NSTAGES 3
-
-static inline void
-stage0 (vlib_main_t * vm, vlib_node_runtime_t * node, u32 buffer_index)
-{
-  vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index);
-  vlib_prefetch_buffer_header (b, STORE);
-  CLIB_PREFETCH (b->data, 2 * CLIB_CACHE_LINE_BYTES, STORE);
-}
-
-static inline void
-stage1 (vlib_main_t * vm, vlib_node_runtime_t * node, u32 bi)
-{
-  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
-  l2t_main_t *lm = &l2t_main;
-  ethernet_header_t *eh;
-  ethernet_vlan_header_t *vh;
-  u32 session_index;
-  uword *p;
-  uword vlan_and_sw_if_index_key;
-
-  /* just in case, needed to test with the tun/tap device */
-  vlib_buffer_reset (b);
-
-  eh = vlib_buffer_get_current (b);
-
-  /* Not a VLAN pkt? send to ethernet-input... */
-  if (PREDICT_FALSE (eh->type != clib_host_to_net_u16 (0x8100)))
-    {
-      vnet_buffer (b)->l2t.next_index = L2T_L2_NEXT_ETHERNET_INPUT;
-      return;
-    }
-  vh = (ethernet_vlan_header_t *) (eh + 1);
-
-  /* look up session */
-  vlan_and_sw_if_index_key = ((uword) (vh->priority_cfi_and_id) << 32)
-    | vnet_buffer (b)->sw_if_index[VLIB_RX];
-
-  p = hash_get (lm->session_by_vlan_and_rx_sw_if_index,
-		vlan_and_sw_if_index_key);
-
-  if (PREDICT_FALSE (p == 0))
-    {
-      /* $$$ drop here if not for our MAC? */
-      vnet_buffer (b)->l2t.next_index = L2T_L2_NEXT_ETHERNET_INPUT;
-      return;
-    }
-  else
-    {
-      session_index = p[0];
-    }
-
-  /* Remember mapping index, prefetch the mini counter */
-  vnet_buffer (b)->l2t.next_index = L2T_L2_NEXT_IP6_LOOKUP;
-  vnet_buffer (b)->l2t.session_index = session_index;
-
-  /* Each mapping has 2 x (pkt, byte) counters, hence the shift */
-  CLIB_PREFETCH (lm->counter_main.mini + (p[0] << 1), CLIB_CACHE_LINE_BYTES,
-		 STORE);
-}
-
-static inline u32
-last_stage (vlib_main_t * vm, vlib_node_runtime_t * node, u32 bi)
-{
-  vlib_buffer_t *b = vlib_get_buffer (vm, bi);
-  l2t_main_t *lm = &l2t_main;
-  ethernet_header_t *eh = vlib_buffer_get_current (b);
-  vlib_node_t *n = vlib_get_node (vm, l2t_l2_node.index);
-  u32 node_counter_base_index = n->error_heap_index;
-  vlib_error_main_t *em = &vm->error_main;
-  l2tpv3_header_t *l2t;		/* l2 header */
-  ethernet_vlan_header_t *vh;	/* 802.1q vlan header */
-  u32 counter_index;
-  l2t_session_t *s;
-  ip6_header_t *ip6;
-  u16 payload_ethertype;
-  u8 dst_mac_address[6];
-  u8 src_mac_address[6];
-  u16 payload_length;
-  i32 backup;
-
-  /* Other-than-output pkt? We're done... */
-  if (vnet_buffer (b)->l2t.next_index != L2T_L2_NEXT_IP6_LOOKUP)
-    return vnet_buffer (b)->l2t.next_index;
-
-  vh = (ethernet_vlan_header_t *) (eh + 1);
-
-  em->counters[node_counter_base_index + L2T_L2_ERROR_NETWORK_TO_USER] += 1;
-
-  counter_index =
-    session_index_to_counter_index (vnet_buffer (b)->l2t.session_index,
-				    SESSION_COUNTER_NETWORK_TO_USER);
-
-  /* per-mapping byte stats include the ethernet header */
-  vlib_increment_combined_counter (&lm->counter_main, counter_index,
-				   1 /* packet_increment */ ,
-				   vlib_buffer_length_in_chain (vm, b) +
-				   sizeof (ethernet_header_t));
-
-  s = pool_elt_at_index (lm->sessions, vnet_buffer (b)->l2t.session_index);
-
-  /* Save src/dst MAC addresses */
-#define _(i)  dst_mac_address[i] = eh->dst_address[i];
-  _(0) _(1) _(2) _(3) _(4) _(5);
-#undef _
-#define _(i)  src_mac_address[i] = eh->src_address[i];
-  _(0) _(1) _(2) _(3) _(4) _(5);
-#undef _
-
-  payload_ethertype = vh->type;
-
-  /* Splice out the 802.1q vlan tag */
-  vlib_buffer_advance (b, 4);
-  eh = vlib_buffer_get_current (b);
-
-  /* restore src/dst MAC addresses */
-#define _(i)   eh->dst_address[i] = dst_mac_address[i];
-  _(0) _(1) _(2) _(3) _(4) _(5);
-#undef _
-#define _(i)  eh->src_address[i] = src_mac_address[i];
-  _(0) _(1) _(2) _(3) _(4) _(5);
-#undef _
-  eh->type = payload_ethertype;
-
-  /* Paint on an l2tpv3 hdr */
-  backup = sizeof (*l2t);
-#if 0
-  /* back up 4 bytes less if no l2 sublayer */
-  backup -= s->l2_sublayer_present ? 0 : 4;
-#endif
-
-  vlib_buffer_advance (b, -backup);
-  l2t = vlib_buffer_get_current (b);
-
-  l2t->session_id = s->remote_session_id;
-  l2t->cookie = s->remote_cookie;
-
-#if 0
-  if (s->l2_sublayer_present)
-    l2t->l2_specific_sublayer = 0;
-#endif
-
-  /* Paint on an ip6 header */
-  vlib_buffer_advance (b, -(sizeof (*ip6)));
-  ip6 = vlib_buffer_get_current (b);
-
-  ip6->ip_version_traffic_class_and_flow_label =
-    clib_host_to_net_u32 (0x6 << 28);
-
-  /* calculate ip6 payload length */
-  payload_length = vlib_buffer_length_in_chain (vm, b);
-  payload_length -= sizeof (*ip6);
-
-  ip6->payload_length = clib_host_to_net_u16 (payload_length);
-  ip6->protocol = 0x73;		/* l2tpv3 */
-  ip6->hop_limit = 0xff;
-  ip6->src_address.as_u64[0] = s->our_address.as_u64[0];
-  ip6->src_address.as_u64[1] = s->our_address.as_u64[1];
-  ip6->dst_address.as_u64[0] = s->client_address.as_u64[0];
-  ip6->dst_address.as_u64[1] = s->client_address.as_u64[1];
-
-  return L2T_L2_NEXT_IP6_LOOKUP;
-}
-
-#include <vnet/pipeline.h>
-
-static uword
-l2t_l2_node_fn (vlib_main_t * vm,
-		vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return dispatch_pipeline (vm, node, frame);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2t_l2_node) = {
-  .function = l2t_l2_node_fn,
-  .name = "l2t-l2-input",
-  .vector_size = sizeof (u32),
-  .format_trace = format_l2t_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(l2t_l2_error_strings),
-  .error_strings = l2t_l2_error_strings,
-
-  .n_next_nodes = L2T_L2_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [L2T_L2_NEXT_IP6_LOOKUP] = "ip6-lookup",
-    [L2T_L2_NEXT_ETHERNET_INPUT] = "ethernet-input",
-    [L2T_L2_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2t_l2_node, l2t_l2_node_fn);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/app/sticky_hash.c b/vpp/app/sticky_hash.c
deleted file mode 100644
index 5569c677..00000000
--- a/vpp/app/sticky_hash.c
+++ /dev/null
@@ -1,581 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/l2/l2_classify.h>
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ip/ip_packet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vppinfra/error.h>
-
-typedef struct
-{
-  u32 fwd_entry_index;
-  u32 rev_entry_index;
-  /* Not strictly needed, for show command */
-  u32 fib_index;
-} sticky_hash_session_t;
-
-typedef struct
-{
-  u32 cached_next_index;
-
-  /* next index added to l2_classify */
-  u32 fwd_miss_next_index;
-
-  /* session pool */
-  sticky_hash_session_t *sessions;
-
-  /* Forward and reverse data session setup buffers */
-  u8 fdata[3 * sizeof (u32x4)];
-  u8 rdata[3 * sizeof (u32x4)];
-
-  /* convenience variables */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-  vnet_classify_main_t *vnet_classify_main;
-  l2_input_classify_main_t *l2_input_classify_main;
-}
-sticky_hash_main_t;
-
-typedef struct
-{
-  /* $$$$ fill in with per-pkt trace data */
-  u32 next_index;
-  u32 sw_if_index;
-} sticky_hash_miss_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_sticky_hash_miss_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  sticky_hash_miss_trace_t *t = va_arg (*args, sticky_hash_miss_trace_t *);
-
-  s = format (s, "STICKY_HASH_MISS: sw_if_index %d", t->sw_if_index);
-  return s;
-}
-
-typedef CLIB_PACKED (struct
-		     {
-		     ethernet_header_t eh; ip4_header_t ip;
-		     }) classify_data_or_mask_t;
-
-sticky_hash_main_t sticky_hash_main;
-
-vlib_node_registration_t sticky_hash_miss_node;
-
-#define foreach_sticky_hash_miss_error \
-_(MISSES, "forward flow classify misses")
-
-typedef enum
-{
-#define _(sym,str) STICKY_HASH_MISS_ERROR_##sym,
-  foreach_sticky_hash_miss_error
-#undef _
-    STICKY_HASH_MISS_N_ERROR,
-} sticky_hash_miss_error_t;
-
-static char *sticky_hash_miss_error_strings[] = {
-#define _(sym,string) string,
-  foreach_sticky_hash_miss_error
-#undef _
-};
-
-/*
- * To drop a pkt and increment one of the previous counters:
- *
- * set b0->error = error_node->errors[STICKY_HASH_MISS_ERROR_EXAMPLE];
- * set next0 to a disposition index bound to "error-drop".
- *
- * To manually increment the specific counter STICKY_HASH_MISS_ERROR_EXAMPLE:
- *
- *  vlib_node_t *n = vlib_get_node (vm, sticky_hash_miss.index);
- *  u32 node_counter_base_index = n->error_heap_index;
- *  vlib_error_main_t * em = &vm->error_main;
- *  em->counters[node_counter_base_index + STICKY_HASH_MISS_ERROR_EXAMPLE] += 1;
- *
- */
-
-typedef enum
-{
-  STICKY_HASH_MISS_NEXT_IP4_INPUT,
-  STICKY_HASH_MISS_N_NEXT,
-} sticky_hash_miss_next_t;
-
-static uword
-sticky_hash_miss_node_fn (vlib_main_t * vm,
-			  vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  sticky_hash_miss_next_t next_index;
-  sticky_hash_main_t *mp = &sticky_hash_main;
-  vlib_node_t *n = vlib_get_node (vm, sticky_hash_miss_node.index);
-  u32 node_counter_base_index = n->error_heap_index;
-  vlib_error_main_t *em = &vm->error_main;
-  vnet_classify_main_t *cm = mp->vnet_classify_main;
-  ip4_main_t *im = &ip4_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-	  u32 sw_if_index0;
-	  u32 fib_index0, ft_index0, rt_index0;
-	  vnet_classify_table_3_t *ft0, *rt0;
-	  vnet_classify_entry_3_t *fe0, *re0;
-	  classify_data_or_mask_t *h0;
-	  u8 was_found0;
-	  ip4_fib_t *fib0;
-	  sticky_hash_session_t *s;
-	  u32 tmp;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  next0 = mp->cached_next_index;
-
-	  h0 = vlib_buffer_get_current (b0);
-
-	  /* Add forward and reverse entries for this flow */
-	  clib_memcpy (mp->fdata, h0, sizeof (mp->fdata));
-	  clib_memcpy (mp->rdata, h0, sizeof (mp->rdata));
-
-	  h0 = (classify_data_or_mask_t *) (mp->rdata);
-
-	  /* swap src + dst addresses to form reverse data */
-	  tmp = h0->ip.src_address.as_u32;
-	  h0->ip.src_address.as_u32 = h0->ip.dst_address.as_u32;
-	  h0->ip.dst_address.as_u32 = tmp;
-
-	  /* dig up fwd + rev tables */
-	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index, sw_if_index0);
-	  fib0 = vec_elt_at_index (im->fibs, fib_index0);
-
-	  ft_index0 = fib0->fwd_classify_table_index;
-	  rt_index0 = fib0->rev_classify_table_index;
-
-	  ft0 = (vnet_classify_table_3_t *)
-	    pool_elt_at_index (cm->tables, ft_index0);
-	  rt0 = (vnet_classify_table_3_t *)
-	    pool_elt_at_index (cm->tables, rt_index0);
-
-	  fe0 =
-	    vnet_classify_find_or_add_entry_3 (ft0, mp->fdata, &was_found0);
-	  fe0->next_index = L2_INPUT_CLASSIFY_NEXT_IP4_INPUT;
-	  fe0->advance = sizeof (ethernet_header_t);
-
-	  re0 = vnet_classify_find_or_add_entry_3 (rt0, mp->rdata, 0);
-	  re0->next_index = L2_INPUT_CLASSIFY_NEXT_IP4_INPUT;	/* $$$ FIXME */
-	  re0->advance = sizeof (ethernet_header_t);
-
-	  /* Note: we could get a whole vector of misses for the same sess */
-	  if (was_found0 == 0)
-	    {
-	      pool_get (mp->sessions, s);
-
-	      fe0->opaque_index = s - mp->sessions;
-	      re0->opaque_index = s - mp->sessions;
-
-	      s->fwd_entry_index = fe0 - ft0->entries;
-	      s->rev_entry_index = re0 - rt0->entries;
-	      s->fib_index = fib_index0;
-	    }
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      sticky_hash_miss_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = sw_if_index0;
-	      t->next_index = next0;
-	    }
-
-	  em->counters[node_counter_base_index +
-		       STICKY_HASH_MISS_ERROR_MISSES] += 1;
-
-	  vlib_buffer_advance (b0, sizeof (ethernet_header_t));
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (sticky_hash_miss_node) = {
-  .function = sticky_hash_miss_node_fn,
-  .name = "sticky-hash-miss",
-  .vector_size = sizeof (u32),
-  .format_trace = format_sticky_hash_miss_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(sticky_hash_miss_error_strings),
-  .error_strings = sticky_hash_miss_error_strings,
-
-  .n_next_nodes = STICKY_HASH_MISS_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [STICKY_HASH_MISS_NEXT_IP4_INPUT] = "ip4-input",
-  },
-};
-/* *INDENT-ON* */
-
-clib_error_t *
-sticky_hash_miss_init (vlib_main_t * vm)
-{
-  sticky_hash_main_t *mp = &sticky_hash_main;
-
-  mp->vlib_main = vm;
-  mp->vnet_main = vnet_get_main ();
-  mp->vnet_classify_main = &vnet_classify_main;
-  mp->l2_input_classify_main = &l2_input_classify_main;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (sticky_hash_miss_init);
-
-static int ip4_sticky_hash_enable_disable
-  (sticky_hash_main_t * mp,
-   u32 fwd_sw_if_index, u8 * fwd_mask,
-   u32 rev_sw_if_index, u8 * rev_mask, u32 nbuckets, int enable_disable)
-{
-  ip4_main_t *im = &ip4_main;
-  u32 fib_index;
-  ip4_fib_t *fib;
-  vnet_classify_main_t *cm = mp->vnet_classify_main;
-  l2_input_classify_main_t *l2cm = mp->l2_input_classify_main;
-  vnet_classify_table_3_t *ft, *rt;
-
-  fib_index = vec_elt (im->fib_index_by_sw_if_index, fwd_sw_if_index);
-  fib = vec_elt_at_index (im->fibs, fib_index);
-
-  if (fib->fwd_classify_table_index == ~0)
-    {
-      /* Set up forward table */
-      ft = (vnet_classify_table_3_t *)
-	vnet_classify_new_table (cm, fwd_mask, nbuckets,
-				 0 /* skip */ , 3 /* match */ );
-      fib->fwd_classify_table_index
-	= ft - (vnet_classify_table_3_t *) cm->tables;
-      mp->fwd_miss_next_index =
-	vlib_node_add_next (mp->vlib_main, l2_input_classify_node.index,
-			    sticky_hash_miss_node.index);
-      ft->miss_next_index = mp->fwd_miss_next_index;
-
-      /* Set up reverse table */
-      rt = (vnet_classify_table_3_t *)
-	vnet_classify_new_table (cm, rev_mask, nbuckets,
-				 0 /* skip */ , 3 /* match */ );
-      fib->rev_classify_table_index
-	= rt - (vnet_classify_table_3_t *) cm->tables;
-    }
-
-  vec_validate
-    (l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP4],
-     fwd_sw_if_index);
-
-  vec_validate
-    (l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP6],
-     fwd_sw_if_index);
-
-  vec_validate
-    (l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_OTHER],
-     fwd_sw_if_index);
-
-  l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP4]
-    [fwd_sw_if_index] = fib->fwd_classify_table_index;
-
-  l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP6]
-    [fwd_sw_if_index] = ~0;
-
-  l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_OTHER]
-    [fwd_sw_if_index] = ~0;
-
-
-  vec_validate
-    (l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP4],
-     rev_sw_if_index);
-
-  vec_validate
-    (l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP6],
-     rev_sw_if_index);
-
-  vec_validate
-    (l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_OTHER],
-     rev_sw_if_index);
-
-
-  l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP4]
-    [rev_sw_if_index] = fib->rev_classify_table_index;
-
-  l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP6]
-    [rev_sw_if_index] = ~0;
-
-  l2cm->classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_OTHER]
-    [rev_sw_if_index] = ~0;
-
-  vnet_l2_input_classify_enable_disable (fwd_sw_if_index, enable_disable);
-  vnet_l2_input_classify_enable_disable (rev_sw_if_index, enable_disable);
-  return 0;
-}
-
-static clib_error_t *
-ip4_sticky_hash_init_command_fn (vlib_main_t * vm,
-				 unformat_input_t * input,
-				 vlib_cli_command_t * cmd)
-{
-  u32 fwd_sw_if_index = ~0, rev_sw_if_index = ~0;
-  int enable_disable = 1;
-  u32 nbuckets = 2;
-  int rv;
-  sticky_hash_main_t *mp = &sticky_hash_main;
-  classify_data_or_mask_t fwd_mask, rev_mask;
-  u8 *fm = 0, *rm = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat
-	  (input, "fwd %U", unformat_vnet_sw_interface, mp->vnet_main,
-	   &fwd_sw_if_index))
-	;
-      if (unformat
-	  (input, "rev %U", unformat_vnet_sw_interface, mp->vnet_main,
-	   &rev_sw_if_index))
-	;
-      else if (unformat (input, "nbuckets %d", &nbuckets))
-	;
-      else if (unformat (input, "disable"))
-	enable_disable = 0;
-
-      else
-	break;
-    }
-
-  nbuckets = 1 << max_log2 (nbuckets);
-
-  if (fwd_sw_if_index == ~0)
-    return clib_error_return (0, "fwd interface not set");
-
-  if (rev_sw_if_index == ~0)
-    return clib_error_return (0, "rev interface not set");
-
-  if (!is_pow2 (nbuckets))
-    return clib_error_return (0, "nbuckets %d not a power of 2", nbuckets);
-
-  ASSERT (sizeof (fwd_mask) <= 3 * sizeof (u32x4));
-
-  /* Mask on src/dst address, depending on direction */
-  memset (&fwd_mask, 0, sizeof (fwd_mask));
-  memset (&fwd_mask.ip.src_address, 0xff, 4);
-
-  memset (&rev_mask, 0, sizeof (rev_mask));
-  memset (&rev_mask.ip.dst_address, 0xff, 4);
-
-  vec_validate (fm, 3 * sizeof (u32x4) - 1);
-  vec_validate (rm, 3 * sizeof (u32x4) - 1);
-
-  clib_memcpy (fm, &fwd_mask, sizeof (fwd_mask));
-  clib_memcpy (rm, &rev_mask, sizeof (rev_mask));
-
-  rv = ip4_sticky_hash_enable_disable (mp, fwd_sw_if_index, fm,
-				       rev_sw_if_index, rm,
-				       nbuckets, enable_disable);
-
-  vec_free (fm);
-  vec_free (rm);
-  switch (rv)
-    {
-    case 0:
-      return 0;
-
-    default:
-      return clib_error_return (0,
-				"ip4_sticky_hash_enable_disable returned %d",
-				rv);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (sticky_hash_init_command, static) = {
-  .path = "ip sticky classify",
-  .short_help = "ip sticky classify fwd <intfc> rev <intfc> "
-  "[nbuckets <nn>][disable]",
-  .function = ip4_sticky_hash_init_command_fn,
-};
-/* *INDENT-ON* */
-
-
-u8 *
-format_sticky_hash_session (u8 * s, va_list * args)
-{
-  sticky_hash_main_t *mp = va_arg (*args, sticky_hash_main_t *);
-  sticky_hash_session_t *session = va_arg (*args, sticky_hash_session_t *);
-  vnet_classify_table_3_t *t;
-  vnet_classify_entry_3_t *e;
-  ip4_main_t *im = &ip4_main;
-  vnet_classify_main_t *cm = mp->vnet_classify_main;
-  ip4_fib_t *fib;
-  classify_data_or_mask_t *match;
-
-  fib = vec_elt_at_index (im->fibs, session->fib_index);
-
-  t = (vnet_classify_table_3_t *)
-    pool_elt_at_index (cm->tables, fib->fwd_classify_table_index);
-  e = pool_elt_at_index (t->entries, session->fwd_entry_index);
-  match = (classify_data_or_mask_t *) (e->key);
-
-  s = format
-    (s,
-     "[%6d] fwd src %U next index %d session %d fib %d\n"
-     "         hits %lld last-heard %.6f\n",
-     e - t->entries,
-     format_ip4_address, &match->ip.src_address,
-     e->next_index, e->opaque_index, fib->table_id, e->hits, e->last_heard);
-
-  if (e->opaque_index != session - mp->sessions)
-    s = format (s, "WARNING: forward session index mismatch!\n");
-
-  t = (vnet_classify_table_3_t *)
-    pool_elt_at_index (cm->tables, fib->rev_classify_table_index);
-  e = pool_elt_at_index (t->entries, session->rev_entry_index);
-  match = (classify_data_or_mask_t *) (e->key);
-
-  s = format
-    (s,
-     "[%6d] rev dst %U next index %d session %d\n"
-     "         hits %lld last-heard %.6f\n",
-     e - t->entries,
-     format_ip4_address, &match->ip.dst_address,
-     e->next_index, e->opaque_index, e->hits, e->last_heard);
-
-  if (e->opaque_index != session - mp->sessions)
-    s = format (s, "WARNING: reverse session index mismatch!\n");
-  s = format (s, "---------\n");
-
-  return s;
-}
-
-static clib_error_t *
-show_ip4_sticky_hash_command_fn (vlib_main_t * vm,
-				 unformat_input_t * input,
-				 vlib_cli_command_t * cmd)
-{
-  sticky_hash_main_t *mp = &sticky_hash_main;
-  sticky_hash_session_t *s;
-  int verbose = 0;
-  int dump_classifier_tables = 0;
-  ip4_fib_t *fib;
-  ip4_main_t *im4 = &ip4_main;
-  vnet_classify_main_t *cm = mp->vnet_classify_main;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "verbose"))
-	verbose = 1;
-      else if (unformat (input, "dump-tables")
-	       || unformat (input, "dump-classifier-tables"))
-	dump_classifier_tables = 1;
-      else
-	break;
-    }
-
-  if (pool_elts (mp->sessions) == 0)
-    vlib_cli_output (vm, "No ip sticky hash sessions");
-
-
-  vlib_cli_output (vm, "%d active sessions\n", pool_elts (mp->sessions));
-
-  vec_foreach (fib, im4->fibs)
-  {
-    if (fib->fwd_classify_table_index != ~0)
-      vlib_cli_output (vm, "fib %d fwd table: \n%U",
-		       fib->table_id,
-		       format_classify_table,
-		       cm,
-		       pool_elt_at_index
-		       (cm->tables, fib->fwd_classify_table_index),
-		       dump_classifier_tables);
-    if (fib->rev_classify_table_index != ~0)
-      vlib_cli_output (vm, "fib %d rev table: \n%U",
-		       fib->table_id,
-		       format_classify_table,
-		       cm,
-		       pool_elt_at_index
-		       (cm->tables, fib->rev_classify_table_index),
-		       dump_classifier_tables);
-  }
-
-  if (verbose)
-    {
-      /* *INDENT-OFF* */
-      pool_foreach (s, mp->sessions,
-      ({
-        vlib_cli_output (vm, "%U", format_sticky_hash_session, mp, s);
-      }));
-      /* *INDENT-ON* */
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_sticky_hash_command, static) = {
-  .path = "show sticky classify",
-  .short_help = "Display sticky classifier tables",
-  .function = show_ip4_sticky_hash_command_fn,
-};
-/* *INDENT-ON* */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/app/version.c b/vpp/app/version.c
deleted file mode 100644
index f8840811..00000000
--- a/vpp/app/version.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vppinfra/cpu.h>
-#include <app/version.h>
-
-#if DPDK > 0
-#include <rte_version.h>
-#include <vnet/vnet.h>
-#include <vnet/devices/dpdk/dpdk.h>
-#endif /* DPDK */
-
-static char *vpe_version_string =
-  "vpp v" VPP_BUILD_VER
-  " built by " VPP_BUILD_USER " on " VPP_BUILD_HOST " at " VPP_BUILD_DATE;
-
-static char *vpe_compiler =
-#if defined(__INTEL_COMPILER)
-#define __(x) #x
-#define _(x) __(x)
-  "icc " _(__INTEL_COMPILER) " (" __VERSION__ ")";
-#undef _
-#undef __
-#elif defined(__clang__)
-  "Clang/LLVM " __clang_version__;
-#elif defined (__GNUC__)
-  "GCC " __VERSION__;
-#else
-  "unknown compiler";
-#endif
-
-static clib_error_t *
-show_vpe_version_command_fn (vlib_main_t * vm,
-			     unformat_input_t * input,
-			     vlib_cli_command_t * cmd)
-{
-  if (unformat (input, "verbose"))
-    {
-#define _(a,b,c) vlib_cli_output (vm, "%-25s " b, a ":", c);
-      _("Version", "%s", "v" VPP_BUILD_VER);
-      _("Compiled by", "%s", VPP_BUILD_USER);
-      _("Compile host", "%s", VPP_BUILD_HOST);
-      _("Compile date", "%s", VPP_BUILD_DATE);
-      _("Compile location", "%s", VPP_BUILD_TOPDIR);
-      _("Compiler", "%s", vpe_compiler);
-      _("Current PID", "%d", getpid ());
-#if DPDK > 0
-      _("DPDK Version", "%s", rte_version ());
-      _("DPDK EAL init args", "%s", dpdk_config_main.eal_init_args_str);
-#endif
-#undef _
-    }
-  else
-    vlib_cli_output (vm, "%s", vpe_version_string);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_vpe_version_command, static) = {
-  .path = "show version",
-  .short_help = "show version information",
-  .function = show_vpe_version_command_fn,
-};
-/* *INDENT-ON* */
-
-char *
-vpe_api_get_build_directory (void)
-{
-  return VPP_BUILD_TOPDIR;
-}
-
-char *
-vpe_api_get_version (void)
-{
-  return VPP_BUILD_VER;
-}
-
-char *
-vpe_api_get_build_date (void)
-{
-  return VPP_BUILD_DATE;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/app/vpe_cli.c b/vpp/app/vpe_cli.c
deleted file mode 100644
index a26bf71f..00000000
--- a/vpp/app/vpe_cli.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/adj/adj.h>
-#include <vnet/fib/fib_table.h>
-
-typedef struct
-{
-  u8 mac_addr[6];
-} mac_addr_t;
-
-static clib_error_t *
-virtual_ip_cmd_fn_command_fn (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  vnet_main_t *vnm = vnet_get_main ();
-  ip46_address_t next_hop, *next_hops;
-  fib_route_path_t *rpaths;
-  fib_prefix_t prefix;
-  u8 mac_addr[6];
-  mac_addr_t *mac_addrs = 0;
-  u32 sw_if_index;
-  u32 i;
-
-  next_hops = NULL;
-  rpaths = NULL;
-  prefix.fp_len = 32;
-  prefix.fp_proto = FIB_PROTOCOL_IP4;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  if (!unformat (line_input, "%U %U",
-		 unformat_ip4_address, &prefix.fp_addr.ip4,
-		 unformat_vnet_sw_interface, vnm, &sw_if_index))
-    goto barf;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "mac %U",
-		    unformat_ethernet_address, &mac_addr))
-	{
-	  mac_addr_t *ma;
-	  vec_add2 (mac_addrs, ma, 1);
-	  clib_memcpy (ma, mac_addr, sizeof (mac_addr));
-	}
-      else if (unformat (line_input, "next-hop %U",
-			 unformat_ip4_address, &next_hop.ip4))
-	{
-	  vec_add1 (next_hops, next_hop);
-	}
-      else
-	{
-	barf:
-	  return clib_error_return (0, "unknown input `%U'",
-				    format_unformat_error, input);
-	}
-    }
-  if (vec_len (mac_addrs) == 0 || vec_len (mac_addrs) != vec_len (next_hops))
-    goto barf;
-
-  /* Create / delete special interface route /32's */
-
-  for (i = 0; i < vec_len (mac_addrs); i++)
-    {
-      fib_route_path_t *rpath;
-
-      adj_nbr_add_or_lock_w_rewrite (FIB_PROTOCOL_IP4,
-				     VNET_LINK_IP4,
-				     &next_hops[i],
-				     sw_if_index, mac_addrs[i].mac_addr);
-
-      vec_add2 (rpaths, rpath, 1);
-
-      rpath->frp_proto = FIB_PROTOCOL_IP4;
-      rpath->frp_addr = next_hops[i];
-      rpath->frp_sw_if_index = sw_if_index;
-      rpath->frp_fib_index = ~0;
-      rpath->frp_weight = 1;
-      rpath->frp_label_stack = NULL;
-    }
-
-  fib_table_entry_path_add2 (0,	// default FIB table
-			     &prefix,
-			     FIB_SOURCE_CLI, FIB_ENTRY_FLAG_NONE, rpaths);
-
-  vec_free (mac_addrs);
-  vec_free (next_hops);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (virtual_ip_cmd_fn_command, static) = {
-  .path = "ip virtual",
-  .short_help = "ip virtual <addr> <interface> [mac <Mi>]+",
-  .function = virtual_ip_cmd_fn_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/conf/80-vpp.conf b/vpp/conf/80-vpp.conf
deleted file mode 100644
index 8fdf184c..00000000
--- a/vpp/conf/80-vpp.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Number of 2MB hugepages desired
-vm.nr_hugepages=1024
-
-# Must be greater than or equal to (2 * vm.nr_hugepages).
-vm.max_map_count=3096
-
-# All groups allowed to access hugepages
-vm.hugetlb_shm_group=0
-
-# Shared Memory Max must be greator or equal to the total size of hugepages.
-# For 2MB pages, TotalHugepageSize = vm.nr_hugepages * 2 * 1024 * 1024
-# If the existing kernel.shmmax setting  (cat /sys/proc/kernel/shmmax)
-# is greater than the calculated TotalHugepageSize then set this parameter
-# to current shmmax value.
-kernel.shmmax=2147483648
diff --git a/vpp/conf/startup.conf b/vpp/conf/startup.conf
deleted file mode 100644
index bce00202..00000000
--- a/vpp/conf/startup.conf
+++ /dev/null
@@ -1,99 +0,0 @@
-
-unix {
-  nodaemon
-  log /tmp/vpp.log
-  full-coredump
-}
-
-api-trace {
-  on
-}
-
-api-segment {
-  gid vpp
-}
-
-cpu {
-	## In the VPP there is one main thread and optionally the user can create worker(s)
-	## The main thread and worker thread(s) can be pinned to CPU core(s) manually or automatically
-
-	## Manual pinning of thread(s) to CPU core(s)
-
-	## Set logical CPU core where main thread runs
-	# main-core 1
-
-	## Set logical CPU core(s) where worker threads are running
-	# corelist-workers 2-3,18-19
-
-	## Automatic pinning of thread(s) to CPU core(s)
-
-	## Sets number of CPU core(s) to be skipped (1 ... N-1)
-	## Skipped CPU core(s) are not used for pinning main thread and working thread(s).
-	## The main thread is automatically pinned to the first available CPU core and worker(s)
-	## are pinned to next free CPU core(s) after core assigned to main thread
-	# skip-cores 4
-
-	## Specify a number of workers to be created
-	## Workers are pinned to N consecutive CPU cores while skipping "skip-cores" CPU core(s)
-	## and main thread's CPU core
-	# workers 2
-
-	## Set scheduling policy and priority of main and worker threads
-
-	## Scheduling policy options are: other (SCHED_OTHER), batch (SCHED_BATCH)
-	## idle (SCHED_IDLE), fifo (SCHED_FIFO), rr (SCHED_RR)
-	# scheduler-policy fifo
-
-	## Scheduling priority is used only for "real-time policies (fifo and rr),
-	## and has to be in the range of priorities supported for a particular policy
-	# scheduler-priority 50
-}
-
-dpdk {
-	## Change default settings for all intefaces
-	# dev default {
-		## Number of receive queues, enables RSS
-		## Default is 1
-		# num-rx-queues 3
-
-		## Number of transmit queues, Default is equal
-		## to number of worker threads or 1 if no workers treads
-		# num-tx-queues 3
-
-		## Number of descriptors in transmit and receive rings
-		## increasing or reducing number can impact performance
-		## Default is 1024 for both rx and tx
-		# num-rx-desc 512
-		# num-tx-desc 512
-
-		## VLAN strip offload mode for interface
-		## Default is off
-		# vlan-strip-offload on
-	# }
-
-	## Whitelist specific interface by specifying PCI address
-	# dev 0000:02:00.0
-
-	## Whitelist specific interface by specifying PCI address and in
-	## addition specify custom parameters for this interface
-	# dev 0000:02:00.1 {
-	#	num-rx-queues 2
-	# }
-
-	## Change UIO driver used by VPP, Options are: uio_pci_generic, vfio-pci
-	## and igb_uio (default)
-	# uio-driver uio_pci_generic
-
-	## Disable mutli-segment buffers, improves performance but
-	## disables Jumbo MTU support
-	# no-multi-seg
-
-	## Increase number of buffers allocated, needed only in scenarios with
-	## large number of interfaces and worker threads. Value is per CPU socket.
-	## Default is 32768
-	# num-mbufs 128000
-
-	## Change hugepages allocation per-socket, needed only if there is need for
-	## larger number of mbufs. Default is 256M on each detected CPU socket
-	# socket-mem 2048,2048
-}
diff --git a/vpp/conf/startup.uiopcigeneric.conf b/vpp/conf/startup.uiopcigeneric.conf
deleted file mode 100644
index 03a89dff..00000000
--- a/vpp/conf/startup.uiopcigeneric.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-
-unix {
-  nodaemon
-  log /tmp/vpp.log
-  full-coredump
-}
-
-dpdk {
-    uio-driver uio_pci_generic
-}
-
-api-trace {
-  on
-}
-
-api-segment {
-  gid vpp
-}
diff --git a/vpp/configure.ac b/vpp/configure.ac
deleted file mode 100644
index 8c333fd1..00000000
--- a/vpp/configure.ac
+++ /dev/null
@@ -1,80 +0,0 @@
-AC_INIT(vpp, 1.1)
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-AC_ARG_WITH(dpdk,
-            AC_HELP_STRING([--with-dpdk],[Use DPDK]),
-            [with_dpdk=1],
-            [with_dpdk=0])
-
-AC_ARG_WITH(dpdk_crypto,
-            AC_HELP_STRING([--with-dpdk-crypto],[Use DPDK cryptodev]),
-            [with_dpdk_crypto=1],
-            [with_dpdk_crypto=0])
-
-AC_ARG_WITH(dpdk_mlx5_pmd,
-            AC_HELP_STRING([--with-dpdk-mlx5-pmd],[Use Mellanox ConnetxX-4 DPDK PMD]),
-            [with_dpdk_mlx5_pmd=1],
-            [with_dpdk_mlx5_pmd=0])
-
-AC_ARG_ENABLE(dpdk-shared,
-              AC_HELP_STRING([--enable-dpdk-shared],[Link with DPDK shared lib]),
-              [enable_dpdk_shared=1],
-              [enable_dpdk_shared=0])
-
-AC_ARG_WITH(ipsec,
-            AC_HELP_STRING([--without-ipsec],[Disable ipsec]),
-            [with_ipsec=0],
-            [with_ipsec=1])
-
-AC_ARG_WITH(vcgn,
-            AC_HELP_STRING([--without-vcgn],[Disable vcgn]),
-            [with_vcgn=0],
-            [with_vcgn=1])
-
-AC_ARG_WITH(ipv6sr,
-            AC_HELP_STRING([--without-ipv6sr],[Disable ipv6sr]),
-            [with_ipv6sr=0],
-            [with_ipv6sr=1])
-
-AC_ARG_WITH(apicli,
-            AC_HELP_STRING([--without-apicli],[Disable binary api CLI]),
-            [with_apicli=0],
-            [with_apicli=1])
-
-AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1")
-AM_CONDITIONAL(ENABLE_DPDK_SHARED, test "$enable_dpdk_shared" = "1")
-AC_SUBST(DPDK,["-DDPDK=${with_dpdk} -DDPDK_SHARED_LIB=${enable_dpdk_shared}"])
-AM_CONDITIONAL(WITH_DPDK_CRYPTO, test "$with_dpdk_crypto" = "1")
-AC_SUBST(DPDK_CRYPTO,[-DDPDK_CRYPTO=${with_dpdk_crypto}])
-AM_CONDITIONAL(WITH_DPDK_MLX5_PMD, test "$with_dpdk_mlx5_pmd" = "1")
-
-AM_COND_IF(
-	[ENABLE_DPDK_SHARED],
-	[
-		AC_CHECK_HEADERS(
-			[rte_config.h],
-			[], [AC_MSG_ERROR([DPDK header files not found])],
-		)
-		AC_CHECK_LIB(
-			[dpdk], [rte_eal_init],
-			[], [AC_MSG_ERROR([DPDK shared library not found])],
-		)
-	],
-)
-
-AM_CONDITIONAL(WITH_IPSEC, test "$with_ipsec" = "1")
-AC_SUBST(IPSEC,[-DIPSEC=${with_ipsec}])
-
-AM_CONDITIONAL(WITH_VCGN, test "$with_vcgn" = "1")
-AC_SUBST(VCGN,[-DVCGN=${with_vcgn}])
-
-AM_CONDITIONAL(WITH_IPV6SR, test "$with_ipv6sr" = "1")
-AC_SUBST(IPV6SR,[-DIPV6SR=${with_ipv6sr}])
-
-AM_CONDITIONAL(WITH_APICLI, test "$with_apicli" = "1")
-AC_SUBST(APICLI,[-DVPP_API_TEST_BUILTIN=${with_apicli}])
-
-AC_OUTPUT([Makefile])
diff --git a/vpp/oam/oam.c b/vpp/oam/oam.c
deleted file mode 100644
index 8bf46cda..00000000
--- a/vpp/oam/oam.c
+++ /dev/null
@@ -1,648 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <oam/oam.h>
-
-#if DPDK > 0
-#include <vnet/devices/dpdk/dpdk.h>
-#endif
-
-oam_main_t oam_main;
-
-static vlib_node_registration_t oam_node;
-
-static void
-init_oam_packet_template (oam_main_t * om, oam_target_t * t)
-{
-  oam_template_t *h;
-  int i;
-  ip_csum_t sum;
-  u16 csum;
-
-  vec_validate_aligned (t->template, 0, CLIB_CACHE_LINE_BYTES);
-
-  h = t->template;
-  memset (h, 0, sizeof (*h));
-
-  h->ip4.src_address.as_u32 = t->src_address.as_u32;
-  h->ip4.dst_address.as_u32 = t->dst_address.as_u32;
-  h->ip4.ip_version_and_header_length = 0x45;
-  h->ip4.length = clib_host_to_net_u16 (sizeof (*h));
-  h->ip4.ttl = 64;		/* as in linux */
-  h->ip4.protocol = IP_PROTOCOL_ICMP;
-  h->ip4.checksum = ip4_header_checksum (&h->ip4);
-
-  /*
-   * Template has seq = 0. Each time we send one of these puppies,
-   * change the sequence number and fix the execrated checksum
-   */
-  h->icmp.type = ICMP4_echo_request;
-  h->id = clib_host_to_net_u16 (t->id);
-
-  for (i = 0; i < ARRAY_LEN (h->data); i++)
-    h->data[i] = 'A' + i;
-
-  sum = ip_incremental_checksum (0, &h->icmp,
-				 sizeof (h->icmp) + sizeof (h->id) +
-				 sizeof (h->seq) + sizeof (h->data));
-  csum = ~ip_csum_fold (sum);
-  h->icmp.checksum = csum;
-}
-
-int
-vpe_oam_add_del_target (ip4_address_t * src_address,
-			ip4_address_t * dst_address, u32 fib_id, int is_add)
-{
-  u64 key;
-  uword *p;
-  oam_main_t *om = &oam_main;
-  oam_target_t *t;
-  ip4_main_t *im = &ip4_main;
-  u32 fib_index;
-
-  /* Make sure the FIB actually exists */
-  p = hash_get (im->fib_index_by_table_id, fib_id);
-  if (!p)
-    return VNET_API_ERROR_NO_SUCH_FIB;
-
-  fib_index = p[0];
-
-  key = ((u64) fib_index << 32) | (dst_address->as_u32);
-  p = hash_get (om->target_by_address_and_fib_id, key);
-
-  if (is_add)
-    {
-      if (p)
-	return VNET_API_ERROR_INVALID_REGISTRATION;	/* already there... */
-
-      pool_get (om->targets, t);
-      memset (t, 0, sizeof (*t));
-      t->src_address.as_u32 = src_address->as_u32;
-      t->dst_address.as_u32 = dst_address->as_u32;
-      t->fib_id = fib_id;
-      t->fib_index = fib_index;
-      t->state = OAM_STATE_DEAD;
-      t->last_heard_time = vlib_time_now (om->vlib_main);
-      t->last_heard_seq = (u16) ~ om->misses_allowed;
-      t->id = (u16) random_u32 (&om->random_seed);
-      t->seq = 1;
-      init_oam_packet_template (om, t);
-      hash_set (om->target_by_address_and_fib_id, key, t - om->targets);
-    }
-  else
-    {
-      if (!p)
-	return VNET_API_ERROR_NO_SUCH_ENTRY;	/* no such oam target */
-      t = pool_elt_at_index (om->targets, p[0]);
-      vec_free (t->template);
-      hash_unset (om->target_by_address_and_fib_id, key);
-      pool_put (om->targets, t);
-    }
-  return 0;
-}
-
-static clib_error_t *
-oam_add_del_target_command_fn (vlib_main_t * vm,
-			       unformat_input_t * input,
-			       vlib_cli_command_t * cmd)
-{
-  int is_add = -1;
-  ip4_address_t src_address;
-  int src_set = 0;
-  ip4_address_t dst_address;
-  int dst_set = 0;
-  u32 fib_id = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "add"))
-	is_add = 1;
-      else if (unformat (input, "del"))
-	is_add = 0;
-      else if (unformat (input, "src %U", unformat_ip4_address, &src_address))
-	src_set = 1;
-      else if (unformat (input, "dst %U", unformat_ip4_address, &dst_address))
-	dst_set = 1;
-      else if (unformat (input, "fib %d", &fib_id))
-	;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-
-  if (is_add == -1)
-    return clib_error_return (0, "missing add / del qualifier");
-  if (src_set == 0)
-    return clib_error_return (0, "src address not set");
-  if (dst_set == 0)
-    return clib_error_return (0, "dst address not set");
-
-  (void) vpe_oam_add_del_target (&src_address, &dst_address, fib_id, is_add);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (oam_add_del_target_command, static) = {
-  .path = "oam",
-  .short_help = "oam [add|del] target <ip4-address> fib <fib-id>",
-  .function = oam_add_del_target_command_fn,
-};
-/* *INDENT-ON* */
-
-static uword
-oam_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f_arg)
-{
-  oam_main_t *om = &oam_main;
-  uword *event_data = 0;
-  oam_target_t *t;
-  oam_template_t *h0;
-  u32 bi0;
-  u16 new_seq;
-  ip_csum_t sum0;
-  vlib_frame_t *f;
-  u32 *to_next, *from;
-  u32 ip4_lookup_node_index;
-  vlib_node_t *ip4_lookup_node;
-  vlib_buffer_t *b0;
-  static u32 *buffers;
-  oam_template_copy_t *copy_src, *copy_dst;
-  void send_oam_event (oam_target_t * t);
-  u32 nalloc;
-
-  /* Enqueue pkts to ip4-lookup */
-  ip4_lookup_node = vlib_get_node_by_name (vm, (u8 *) "ip4-lookup");
-  ip4_lookup_node_index = ip4_lookup_node->index;
-
-  while (1)
-    {
-      /* Only timeout events at the moment */
-      vlib_process_wait_for_event_or_clock (vm, om->interval);
-      vec_reset_length (event_data);
-
-      if (pool_elts (om->targets) == 0)
-	continue;
-
-      if (vec_len (buffers) < pool_elts (om->targets))
-	vec_validate (buffers, pool_elts (om->targets) - 1);
-
-      nalloc = vlib_buffer_alloc (vm, buffers, pool_elts (om->targets));
-      if (nalloc < pool_elts (om->targets))
-	{
-	  vlib_buffer_free (vm, buffers, nalloc);
-	  continue;
-	}
-
-      f = vlib_get_frame_to_node (vm, ip4_lookup_node_index);
-      f->n_vectors = 0;
-      to_next = vlib_frame_vector_args (f);
-      from = buffers;
-
-      /* *INDENT-OFF* */
-      pool_foreach (t, om->targets,
-      ({
-        /* State transition announcement... */
-        if ((t->seq - t->last_heard_seq) >= om->misses_allowed)
-          {
-            if (t->state == OAM_STATE_ALIVE)
-              {
-                if (CLIB_DEBUG > 0)
-                  clib_warning ("oam target %U now DEAD",
-                                format_ip4_address, &t->dst_address);
-                t->state = OAM_STATE_DEAD;
-                send_oam_event (t);
-              }
-          }
-        else
-          {
-            if (t->state == OAM_STATE_DEAD)
-              {
-                if (CLIB_DEBUG > 0)
-                  clib_warning ("oam target %U now ALIVE",
-                                format_ip4_address, &t->dst_address);
-                t->state = OAM_STATE_ALIVE;
-                send_oam_event (t);
-              }
-          }
-
-        /* Send a new icmp */
-        t->seq++;
-        new_seq = clib_host_to_net_u16 (t->seq);
-
-        bi0 = from[0];
-        from++;
-
-        b0 = vlib_get_buffer (vm, bi0);
-        vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
-        vnet_buffer (b0)->sw_if_index [VLIB_TX] = t->fib_index;
-
-        /* Marginally faster than memcpy, probably */
-        copy_dst = (oam_template_copy_t *) b0->data;
-        copy_src = (oam_template_copy_t *) t->template;
-
-        copy_dst->v8[0] = copy_src->v8[0];
-        copy_dst->v8[1] = copy_src->v8[1];
-        copy_dst->v8[2] = copy_src->v8[2];
-        copy_dst->v8[3] = copy_src->v8[3];
-        copy_dst->v4 = copy_src->v4;
-
-        b0->current_data = 0;
-        b0->current_length = sizeof (*t->template);
-        h0 = vlib_buffer_get_current (b0);
-
-        sum0 = h0->icmp.checksum;
-        sum0 = ip_csum_update(sum0, 0 /* old seq */,
-                              new_seq, oam_template_t, seq);
-        h0->seq = new_seq;
-        h0->icmp.checksum = ip_csum_fold (sum0);
-
-        to_next[0] = bi0;
-        to_next++;
-        f->n_vectors++;
-        if (f->n_vectors == VLIB_FRAME_SIZE)
-          {
-            clib_warning ("Too many OAM clients...");
-            goto out;
-          }
-      }));
-      /* *INDENT-ON* */
-
-    out:
-      vlib_put_frame_to_node (vm, ip4_lookup_node_index, f);
-    }
-  return 0;			/* not so much */
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (oam_process_node,static) = {
-  .function = oam_process,
-  .type = VLIB_NODE_TYPE_PROCESS,
-  .name = "vpe-oam-process",
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-oam_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  oam_main_t *om = &oam_main;
-  f64 interval;
-  u32 misses_allowed;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "interval %f", &interval))
-	om->interval = interval;
-      else if (unformat (input, "misses-allowed %d", &misses_allowed))
-	om->interval = misses_allowed;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  return 0;
-}
-
-VLIB_CONFIG_FUNCTION (oam_config, "oam");
-
-static clib_error_t *
-oam_init (vlib_main_t * vm)
-{
-  oam_main_t *om = &oam_main;
-
-  om->vlib_main = vm;
-  om->vnet_main = vnet_get_main ();
-  om->interval = 2.04;
-  om->misses_allowed = 3;
-  om->random_seed = (u32) (vlib_time_now (vm) * 1e6);
-  om->target_by_address_and_fib_id = hash_create (0, sizeof (uword));
-  om->icmp_id = random_u32 (&om->random_seed);
-
-  ip4_icmp_register_type (vm, ICMP4_echo_reply, oam_node.index);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (oam_init);
-
-static u8 *
-format_oam_target (u8 * s, va_list * args)
-{
-  oam_target_t *t = va_arg (*args, oam_target_t *);
-  int verbose = va_arg (*args, int);
-
-  if (t == 0)
-    return format (s, "%=6s%=14s%=14s%=12s%=10s",
-		   "Fib", "Src", "Dst", "Last Heard", "State");
-
-  s = format (s, "%=6d%=14U%=14U%=12.2f%=10s",
-	      t->fib_id,
-	      format_ip4_address, &t->src_address,
-	      format_ip4_address, &t->dst_address,
-	      t->last_heard_time,
-	      (t->state == OAM_STATE_ALIVE) ? "alive" : "dead");
-  if (verbose)
-    s = format (s, "   seq %d last_heard_seq %d", t->seq, t->last_heard_seq);
-
-  return s;
-}
-
-static clib_error_t *
-show_oam_command_fn (vlib_main_t * vm,
-		     unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  oam_main_t *om = &oam_main;
-  oam_target_t *t;
-  int verbose = 0;
-
-  if (unformat (input, "verbose") || unformat (input, "v"))
-    verbose = 1;
-
-  /* print header */
-  vlib_cli_output (vm, "%U", format_oam_target, 0, verbose);
-
-  /* *INDENT-OFF* */
-  pool_foreach (t, om->targets,
-  ({
-    vlib_cli_output (vm, "%U", format_oam_target, t, verbose);
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_oam_command, static) = {
-  .path = "show oam",
-  .short_help = "show oam",
-  .function = show_oam_command_fn,
-};
-/* *INDENT-ON* */
-
-typedef struct
-{
-  u32 target_pool_index;
-  ip4_address_t address;
-} oam_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_swap_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  oam_trace_t *t = va_arg (*args, oam_trace_t *);
-
-  s = format (s, "OAM: rx from address %U, target index %d",
-	      format_ip4_address, &t->address, t->target_pool_index);
-  return s;
-}
-
-
-#define foreach_oam_error                               \
-_(PROCESSED, "vpe icmp4 oam replies processed")         \
-_(DROPPED, "icmp4 replies dropped (no registration)")
-
-typedef enum
-{
-#define _(sym,str) OAM_ERROR_##sym,
-  foreach_oam_error
-#undef _
-    OAM_N_ERROR,
-} oam_error_t;
-
-static char *oam_error_strings[] = {
-#define _(sym,string) string,
-  foreach_oam_error
-#undef _
-};
-
-/*
- * To drop a pkt and increment one of the previous counters:
- *
- * set b0->error = error_node->errors[OAM_ERROR_EXAMPLE];
- * set next0 to a disposition index bound to "error-drop".
- *
- * To manually increment the specific counter OAM_ERROR_EXAMPLE:
- *
- *  vlib_node_t *n = vlib_get_node (vm, oam.index);
- *  u32 node_counter_base_index = n->error_heap_index;
- *  vlib_error_main_t * em = &vm->error_main;
- *  em->counters[node_counter_base_index + OAM_ERROR_EXAMPLE] += 1;
- *
- */
-
-typedef enum
-{
-  OAM_NEXT_DROP,
-  OAM_NEXT_PUNT,
-  OAM_N_NEXT,
-} oam_next_t;
-
-static uword
-oam_node_fn (vlib_main_t * vm,
-	     vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  oam_next_t next_index;
-  oam_main_t *om = &oam_main;
-  u32 next0 = OAM_NEXT_DROP;	/* all pkts go to the hopper... */
-  u32 next1 = OAM_NEXT_DROP;
-  uword *u0, *u1;
-  oam_template_t *oam0, *oam1;
-  u32 fib_index0, fib_index1;
-  u64 key0, key1;
-  oam_target_t *t0, *t1;
-  ip4_main_t *im = &ip4_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 sw_if_index0, sw_if_index1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-	  /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-
-	  oam0 = vlib_buffer_get_current (b0);
-	  oam1 = vlib_buffer_get_current (b1);
-	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index, sw_if_index0);
-	  fib_index1 = vec_elt (im->fib_index_by_sw_if_index, sw_if_index1);
-
-	  key0 = ((u64) fib_index0 << 32) | oam0->ip4.src_address.as_u32;
-	  u0 = hash_get (om->target_by_address_and_fib_id, key0);
-	  if (u0)
-	    {
-	      t0 = pool_elt_at_index (om->targets, u0[0]);
-	      t0->last_heard_time = vlib_time_now (vm);
-	      t0->last_heard_seq = clib_net_to_host_u16 (oam0->seq);
-	      b0->error = node->errors[OAM_ERROR_PROCESSED];
-	    }
-	  else
-	    b0->error = node->errors[OAM_ERROR_DROPPED];
-
-	  key1 = ((u64) fib_index1 << 32) | oam1->ip4.src_address.as_u32;
-	  u1 = hash_get (om->target_by_address_and_fib_id, key1);
-	  if (u1)
-	    {
-	      t1 = pool_elt_at_index (om->targets, u1[0]);
-	      t1->last_heard_time = vlib_time_now (vm);
-	      t1->last_heard_seq = clib_net_to_host_u16 (oam1->seq);
-	      b1->error = node->errors[OAM_ERROR_PROCESSED];
-	    }
-	  else
-	    b1->error = node->errors[OAM_ERROR_DROPPED];
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-	    {
-	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  oam_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-		  t->target_pool_index = u0 ? u0[0] : (u32) ~ 0;
-		  t->address.as_u32 = oam0->ip4.src_address.as_u32;
-		}
-	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
-		{
-		  oam_trace_t *t = vlib_add_trace (vm, node, b1, sizeof (*t));
-		  t->target_pool_index = u1 ? u1[0] : (u32) ~ 0;
-		  t->address.as_u32 = oam1->ip4.src_address.as_u32;
-
-		}
-	    }
-
-	  if (vm->os_punt_frame)
-	    next0 = next1 = OAM_NEXT_PUNT;
-
-	  /* verify speculative enqueues, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, bi1, next0, next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0, sw_if_index0;
-	  vlib_buffer_t *b0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-
-	  oam0 = vlib_buffer_get_current (b0);
-	  fib_index0 = vec_elt (im->fib_index_by_sw_if_index, sw_if_index0);
-
-	  key0 = ((u64) fib_index0 << 32) | oam0->ip4.src_address.as_u32;
-	  u0 = hash_get (om->target_by_address_and_fib_id, key0);
-	  if (u0)
-	    {
-	      t0 = pool_elt_at_index (om->targets, u0[0]);
-	      t0->last_heard_time = vlib_time_now (vm);
-	      t0->last_heard_seq = clib_net_to_host_u16 (oam0->seq);
-	      b0->error = node->errors[OAM_ERROR_PROCESSED];
-	    }
-	  else
-	    b0->error = node->errors[OAM_ERROR_DROPPED];
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      oam_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->target_pool_index = u0 ? u0[0] : (u32) ~ 0;
-	      t->address.as_u32 = oam0->ip4.src_address.as_u32;
-	    }
-
-	  if (vm->os_punt_frame)
-	    next0 = OAM_NEXT_PUNT;
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (oam_node,static) = {
-  .function = oam_node_fn,
-  .name = "vpe-icmp4-oam",
-  .vector_size = sizeof (u32),
-  .format_trace = format_swap_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(oam_error_strings),
-  .error_strings = oam_error_strings,
-
-  .n_next_nodes = OAM_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [OAM_NEXT_DROP] = "error-drop",
-    [OAM_NEXT_PUNT] = "error-punt",
-  },
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/oam/oam.h b/vpp/oam/oam.h
deleted file mode 100644
index f6af9788..00000000
--- a/vpp/oam/oam.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_oam_h__
-#define __included_oam_h__
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/interface.h>
-
-/* 36 octets, make a note of it... */
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  ip4_header_t ip4;
-  icmp46_header_t icmp;
-  u16 id;
-  u16 seq;
-  u8 data[8];
-}) oam_template_t;
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  u64 v8[4];
-  u32 v4;
-}) oam_template_copy_t;
-/* *INDENT-ON* */
-
-typedef enum
-{
-  OAM_STATE_UNKNOWN = 0,
-  OAM_STATE_ALIVE,
-  OAM_STATE_DEAD,
-} oam_state_t;
-
-typedef struct
-{
-  ip4_address_t src_address;
-  ip4_address_t dst_address;
-  u32 fib_id;
-  u32 fib_index;
-  f64 last_heard_time;
-  u16 seq;
-  u16 last_heard_seq;
-  u16 id;
-  u8 state;
-  oam_template_t *template;
-} oam_target_t;
-
-typedef struct
-{
-  /* OAM targets */
-  oam_target_t *targets;
-  uword *target_by_address_and_fib_id;
-
-  /* Config parameters */
-  f64 interval;
-  u32 misses_allowed;
-
-  /* random number seed */
-  u32 random_seed;
-  u16 icmp_id;
-
-  /* oam packet template */
-  vlib_packet_template_t packet_template;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} oam_main_t;
-
-int vpe_oam_add_del_target (ip4_address_t * src_address,
-			    ip4_address_t * dst_address,
-			    u32 fib_id, int is_add);
-
-#endif /* __included_oam_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/stats/stats.c b/vpp/stats/stats.c
deleted file mode 100644
index c46e2d5a..00000000
--- a/vpp/stats/stats.c
+++ /dev/null
@@ -1,987 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <stats/stats.h>
-#include <signal.h>
-#include <vlib/threads.h>
-#include <vnet/fib/fib_entry.h>
-#include <vnet/fib/fib_table.h>
-#include <vnet/dpo/load_balance.h>
-
-#define STATS_DEBUG 0
-
-stats_main_t stats_main;
-
-#include <vnet/ip/ip.h>
-
-#include <vpp-api/vpe_msg_enum.h>
-
-#define f64_endian(a)
-#define f64_print(a,b)
-
-#define vl_typedefs		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_printfun
-
-#define foreach_stats_msg                               \
-_(WANT_STATS, want_stats)                               \
-_(WANT_STATS_REPLY, want_stats_reply)                   \
-_(VNET_INTERFACE_COUNTERS, vnet_interface_counters)     \
-_(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters)         \
-_(VNET_IP6_FIB_COUNTERS, vnet_ip6_fib_counters)
-
-/* These constants ensure msg sizes <= 1024, aka ring allocation */
-#define SIMPLE_COUNTER_BATCH_SIZE	126
-#define COMBINED_COUNTER_BATCH_SIZE	63
-#define IP4_FIB_COUNTER_BATCH_SIZE	48
-#define IP6_FIB_COUNTER_BATCH_SIZE	30
-
-/* 5ms */
-#define STATS_RELEASE_DELAY_NS (1000 * 1000 * 5)
-/*                              ns/us  us/ms        */
-
-void
-dslock (stats_main_t * sm, int release_hint, int tag)
-{
-  u32 thread_id;
-  data_structure_lock_t *l = sm->data_structure_lock;
-
-  if (PREDICT_FALSE (l == 0))
-    return;
-
-  thread_id = os_get_cpu_number ();
-  if (l->lock && l->thread_id == thread_id)
-    {
-      l->count++;
-      return;
-    }
-
-  if (release_hint)
-    l->release_hint++;
-
-  while (__sync_lock_test_and_set (&l->lock, 1))
-    /* zzzz */ ;
-  l->tag = tag;
-  l->thread_id = thread_id;
-  l->count = 1;
-}
-
-void
-stats_dslock_with_hint (int hint, int tag)
-{
-  stats_main_t *sm = &stats_main;
-  dslock (sm, hint, tag);
-}
-
-void
-dsunlock (stats_main_t * sm)
-{
-  u32 thread_id;
-  data_structure_lock_t *l = sm->data_structure_lock;
-
-  if (PREDICT_FALSE (l == 0))
-    return;
-
-  thread_id = os_get_cpu_number ();
-  ASSERT (l->lock && l->thread_id == thread_id);
-  l->count--;
-  if (l->count == 0)
-    {
-      l->tag = -l->tag;
-      l->release_hint = 0;
-      CLIB_MEMORY_BARRIER ();
-      l->lock = 0;
-    }
-}
-
-void
-stats_dsunlock (int hint, int tag)
-{
-  stats_main_t *sm = &stats_main;
-  dsunlock (sm);
-}
-
-static void
-do_simple_interface_counters (stats_main_t * sm)
-{
-  vl_api_vnet_interface_counters_t *mp = 0;
-  vnet_interface_main_t *im = sm->interface_main;
-  api_main_t *am = sm->api_main;
-  vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
-  unix_shared_memory_queue_t *q = shmem_hdr->vl_input_queue;
-  vlib_simple_counter_main_t *cm;
-  u32 items_this_message = 0;
-  u64 v, *vp = 0;
-  int i;
-
-  /*
-   * Prevent interface registration from expanding / moving the vectors...
-   * That tends never to happen, so we can hold this lock for a while.
-   */
-  vnet_interface_counter_lock (im);
-
-  vec_foreach (cm, im->sw_if_counters)
-  {
-
-    for (i = 0; i < vec_len (cm->maxi); i++)
-      {
-	if (mp == 0)
-	  {
-	    items_this_message = clib_min (SIMPLE_COUNTER_BATCH_SIZE,
-					   vec_len (cm->maxi) - i);
-
-	    mp = vl_msg_api_alloc_as_if_client
-	      (sizeof (*mp) + items_this_message * sizeof (v));
-	    mp->_vl_msg_id = ntohs (VL_API_VNET_INTERFACE_COUNTERS);
-	    mp->vnet_counter_type = cm - im->sw_if_counters;
-	    mp->is_combined = 0;
-	    mp->first_sw_if_index = htonl (i);
-	    mp->count = 0;
-	    vp = (u64 *) mp->data;
-	  }
-	v = vlib_get_simple_counter (cm, i);
-	clib_mem_unaligned (vp, u64) = clib_host_to_net_u64 (v);
-	vp++;
-	mp->count++;
-	if (mp->count == items_this_message)
-	  {
-	    mp->count = htonl (items_this_message);
-	    /* Send to the main thread... */
-	    vl_msg_api_send_shmem (q, (u8 *) & mp);
-	    mp = 0;
-	  }
-      }
-    ASSERT (mp == 0);
-  }
-  vnet_interface_counter_unlock (im);
-}
-
-static void
-do_combined_interface_counters (stats_main_t * sm)
-{
-  vl_api_vnet_interface_counters_t *mp = 0;
-  vnet_interface_main_t *im = sm->interface_main;
-  api_main_t *am = sm->api_main;
-  vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
-  unix_shared_memory_queue_t *q = shmem_hdr->vl_input_queue;
-  vlib_combined_counter_main_t *cm;
-  u32 items_this_message = 0;
-  vlib_counter_t v, *vp = 0;
-  int i;
-
-  vnet_interface_counter_lock (im);
-
-  vec_foreach (cm, im->combined_sw_if_counters)
-  {
-
-    for (i = 0; i < vec_len (cm->maxi); i++)
-      {
-	if (mp == 0)
-	  {
-	    items_this_message = clib_min (COMBINED_COUNTER_BATCH_SIZE,
-					   vec_len (cm->maxi) - i);
-
-	    mp = vl_msg_api_alloc_as_if_client
-	      (sizeof (*mp) + items_this_message * sizeof (v));
-	    mp->_vl_msg_id = ntohs (VL_API_VNET_INTERFACE_COUNTERS);
-	    mp->vnet_counter_type = cm - im->combined_sw_if_counters;
-	    mp->is_combined = 1;
-	    mp->first_sw_if_index = htonl (i);
-	    mp->count = 0;
-	    vp = (vlib_counter_t *) mp->data;
-	  }
-	vlib_get_combined_counter (cm, i, &v);
-	clib_mem_unaligned (&vp->packets, u64)
-	  = clib_host_to_net_u64 (v.packets);
-	clib_mem_unaligned (&vp->bytes, u64) = clib_host_to_net_u64 (v.bytes);
-	vp++;
-	mp->count++;
-	if (mp->count == items_this_message)
-	  {
-	    mp->count = htonl (items_this_message);
-	    /* Send to the main thread... */
-	    vl_msg_api_send_shmem (q, (u8 *) & mp);
-	    mp = 0;
-	  }
-      }
-    ASSERT (mp == 0);
-  }
-  vnet_interface_counter_unlock (im);
-}
-
-/* from .../vnet/vnet/ip/lookup.c. Yuck */
-typedef CLIB_PACKED (struct
-		     {
-		     ip4_address_t address;
-u32 address_length: 6;
-u32 index:	     26;
-		     }) ip4_route_t;
-
-static void
-ip46_fib_stats_delay (stats_main_t * sm, u32 sec, u32 nsec)
-{
-  struct timespec _req, *req = &_req;
-  struct timespec _rem, *rem = &_rem;
-
-  req->tv_sec = sec;
-  req->tv_nsec = nsec;
-  while (1)
-    {
-      if (nanosleep (req, rem) == 0)
-	break;
-      *req = *rem;
-      if (errno == EINTR)
-	continue;
-      clib_unix_warning ("nanosleep");
-      break;
-    }
-}
-
-static void
-do_ip4_fibs (stats_main_t * sm)
-{
-  ip4_main_t *im4 = &ip4_main;
-  api_main_t *am = sm->api_main;
-  vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
-  unix_shared_memory_queue_t *q = shmem_hdr->vl_input_queue;
-  static ip4_route_t *routes;
-  ip4_route_t *r;
-  fib_table_t *fib;
-  ip_lookup_main_t *lm = &im4->lookup_main;
-  static uword *results;
-  vl_api_vnet_ip4_fib_counters_t *mp = 0;
-  u32 items_this_message;
-  vl_api_ip4_fib_counter_t *ctrp = 0;
-  u32 start_at_fib_index = 0;
-  int i;
-
-again:
-  /* *INDENT-OFF* */
-  pool_foreach (fib, im4->fibs,
-  ({
-    /* We may have bailed out due to control-plane activity */
-    while ((fib - im4->fibs) < start_at_fib_index)
-      continue;
-
-    if (mp == 0)
-      {
-	items_this_message = IP4_FIB_COUNTER_BATCH_SIZE;
-	mp = vl_msg_api_alloc_as_if_client
-	  (sizeof (*mp) +
-	   items_this_message * sizeof (vl_api_ip4_fib_counter_t));
-	mp->_vl_msg_id = ntohs (VL_API_VNET_IP4_FIB_COUNTERS);
-	mp->count = 0;
-	mp->vrf_id = ntohl (fib->ft_table_id);
-	ctrp = (vl_api_ip4_fib_counter_t *) mp->c;
-      }
-    else
-      {
-	/* happens if the last FIB was empty... */
-	ASSERT (mp->count == 0);
-	mp->vrf_id = ntohl (fib->ft_table_id);
-      }
-
-    dslock (sm, 0 /* release hint */ , 1 /* tag */ );
-
-    vec_reset_length (routes);
-    vec_reset_length (results);
-
-    for (i = 0; i < ARRAY_LEN (fib->v4.fib_entry_by_dst_address); i++)
-      {
-	uword *hash = fib->v4.fib_entry_by_dst_address[i];
-	hash_pair_t *p;
-	ip4_route_t x;
-
-	x.address_length = i;
-
-        hash_foreach_pair (p, hash,
-        ({
-          x.address.data_u32 = p->key;
-          if (lm->fib_result_n_words > 1)
-            {
-              x.index = vec_len (results);
-              vec_add (results, p->value, lm->fib_result_n_words);
-            }
-          else
-            x.index = p->value[0];
-
-          vec_add1 (routes, x);
-          if (sm->data_structure_lock->release_hint)
-            {
-              start_at_fib_index = fib - im4->fibs;
-              dsunlock (sm);
-              ip46_fib_stats_delay (sm, 0 /* sec */,
-                                    STATS_RELEASE_DELAY_NS);
-              mp->count = 0;
-              ctrp = (vl_api_ip4_fib_counter_t *)mp->c;
-              goto again;
-            }
-        }));
-      }
-
-    vec_foreach (r, routes)
-      {
-        vlib_counter_t c;
-
-        vlib_get_combined_counter (&load_balance_main.lbm_to_counters,
-                                   r->index, &c);
-        /*
-         * If it has actually
-         * seen at least one packet, send it.
-         */
-        if (c.packets > 0)
-          {
-
-            /* already in net byte order */
-            ctrp->address = r->address.as_u32;
-            ctrp->address_length = r->address_length;
-            ctrp->packets = clib_host_to_net_u64 (c.packets);
-            ctrp->bytes = clib_host_to_net_u64 (c.bytes);
-            mp->count++;
-            ctrp++;
-
-            if (mp->count == items_this_message)
-              {
-                mp->count = htonl (items_this_message);
-                /*
-                 * If the main thread's input queue is stuffed,
-                 * drop the data structure lock (which the main thread
-                 * may want), and take a pause.
-                 */
-                unix_shared_memory_queue_lock (q);
-                if (unix_shared_memory_queue_is_full (q))
-                  {
-                    dsunlock (sm);
-                    vl_msg_api_send_shmem_nolock (q, (u8 *) & mp);
-                    unix_shared_memory_queue_unlock (q);
-                    mp = 0;
-                    ip46_fib_stats_delay (sm, 0 /* sec */ ,
-                                          STATS_RELEASE_DELAY_NS);
-                    goto again;
-                  }
-                vl_msg_api_send_shmem_nolock (q, (u8 *) & mp);
-                unix_shared_memory_queue_unlock (q);
-
-                items_this_message = IP4_FIB_COUNTER_BATCH_SIZE;
-                mp = vl_msg_api_alloc_as_if_client
-                  (sizeof (*mp) +
-                   items_this_message * sizeof (vl_api_ip4_fib_counter_t));
-                mp->_vl_msg_id = ntohs (VL_API_VNET_IP4_FIB_COUNTERS);
-                mp->count = 0;
-                mp->vrf_id = ntohl (fib->ft_table_id);
-                ctrp = (vl_api_ip4_fib_counter_t *) mp->c;
-              }
-          }			/* for each (mp or single) adj */
-        if (sm->data_structure_lock->release_hint)
-          {
-            start_at_fib_index = fib - im4->fibs;
-            dsunlock (sm);
-            ip46_fib_stats_delay (sm, 0 /* sec */ , STATS_RELEASE_DELAY_NS);
-            mp->count = 0;
-            ctrp = (vl_api_ip4_fib_counter_t *) mp->c;
-            goto again;
-          }
-      }				/* vec_foreach (routes) */
-
-    dsunlock (sm);
-
-    /* Flush any data from this fib */
-    if (mp->count)
-      {
-	mp->count = htonl (mp->count);
-	vl_msg_api_send_shmem (q, (u8 *) & mp);
-	mp = 0;
-      }
-  }));
-  /* *INDENT-ON* */
-
-  /* If e.g. the last FIB had no reportable routes, free the buffer */
-  if (mp)
-    vl_msg_api_free (mp);
-}
-
-typedef struct
-{
-  ip6_address_t address;
-  u32 address_length;
-  u32 index;
-} ip6_route_t;
-
-typedef struct
-{
-  u32 fib_index;
-  ip6_route_t **routep;
-  stats_main_t *sm;
-} add_routes_in_fib_arg_t;
-
-static void
-add_routes_in_fib (BVT (clib_bihash_kv) * kvp, void *arg)
-{
-  add_routes_in_fib_arg_t *ap = arg;
-  stats_main_t *sm = ap->sm;
-
-  if (sm->data_structure_lock->release_hint)
-    clib_longjmp (&sm->jmp_buf, 1);
-
-  if (kvp->key[2] >> 32 == ap->fib_index)
-    {
-      ip6_address_t *addr;
-      ip6_route_t *r;
-      addr = (ip6_address_t *) kvp;
-      vec_add2 (*ap->routep, r, 1);
-      r->address = addr[0];
-      r->address_length = kvp->key[2] & 0xFF;
-      r->index = kvp->value;
-    }
-}
-
-static void
-do_ip6_fibs (stats_main_t * sm)
-{
-  ip6_main_t *im6 = &ip6_main;
-  api_main_t *am = sm->api_main;
-  vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr;
-  unix_shared_memory_queue_t *q = shmem_hdr->vl_input_queue;
-  static ip6_route_t *routes;
-  ip6_route_t *r;
-  fib_table_t *fib;
-  static uword *results;
-  vl_api_vnet_ip6_fib_counters_t *mp = 0;
-  u32 items_this_message;
-  vl_api_ip6_fib_counter_t *ctrp = 0;
-  u32 start_at_fib_index = 0;
-  BVT (clib_bihash) * h = &im6->ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash;
-  add_routes_in_fib_arg_t _a, *a = &_a;
-
-again:
-  /* *INDENT-OFF* */
-  pool_foreach (fib, im6->fibs,
-  ({
-    /* We may have bailed out due to control-plane activity */
-    while ((fib - im6->fibs) < start_at_fib_index)
-      continue;
-
-    if (mp == 0)
-      {
-	items_this_message = IP6_FIB_COUNTER_BATCH_SIZE;
-	mp = vl_msg_api_alloc_as_if_client
-	  (sizeof (*mp) +
-	   items_this_message * sizeof (vl_api_ip6_fib_counter_t));
-	mp->_vl_msg_id = ntohs (VL_API_VNET_IP6_FIB_COUNTERS);
-	mp->count = 0;
-	mp->vrf_id = ntohl (fib->ft_table_id);
-	ctrp = (vl_api_ip6_fib_counter_t *) mp->c;
-      }
-
-    dslock (sm, 0 /* release hint */ , 1 /* tag */ );
-
-    vec_reset_length (routes);
-    vec_reset_length (results);
-
-    a->fib_index = fib - im6->fibs;
-    a->routep = &routes;
-    a->sm = sm;
-
-    if (clib_setjmp (&sm->jmp_buf, 0) == 0)
-      {
-	start_at_fib_index = fib - im6->fibs;
-	BV (clib_bihash_foreach_key_value_pair) (h, add_routes_in_fib, a);
-      }
-    else
-      {
-	dsunlock (sm);
-	ip46_fib_stats_delay (sm, 0 /* sec */ ,
-			      STATS_RELEASE_DELAY_NS);
-	mp->count = 0;
-	ctrp = (vl_api_ip6_fib_counter_t *) mp->c;
-	goto again;
-      }
-
-    vec_foreach (r, routes)
-    {
-        vlib_counter_t c;
-
-        vlib_get_combined_counter (&load_balance_main.lbm_to_counters,
-                                   r->index, &c);
-        /*
-         * If it has actually
-         * seen at least one packet, send it.
-         */
-        if (c.packets > 0)
-          {
-            /* already in net byte order */
-            ctrp->address[0] = r->address.as_u64[0];
-            ctrp->address[1] = r->address.as_u64[1];
-            ctrp->address_length = (u8) r->address_length;
-            ctrp->packets = clib_host_to_net_u64 (c.packets);
-            ctrp->bytes = clib_host_to_net_u64 (c.bytes);
-            mp->count++;
-            ctrp++;
-
-            if (mp->count == items_this_message)
-              {
-                mp->count = htonl (items_this_message);
-                /*
-                 * If the main thread's input queue is stuffed,
-                 * drop the data structure lock (which the main thread
-                 * may want), and take a pause.
-                 */
-                unix_shared_memory_queue_lock (q);
-                if (unix_shared_memory_queue_is_full (q))
-                  {
-                    dsunlock (sm);
-                    vl_msg_api_send_shmem_nolock (q, (u8 *) & mp);
-                    unix_shared_memory_queue_unlock (q);
-                    mp = 0;
-                    ip46_fib_stats_delay (sm, 0 /* sec */ ,
-                                          STATS_RELEASE_DELAY_NS);
-                    goto again;
-                  }
-                vl_msg_api_send_shmem_nolock (q, (u8 *) & mp);
-                unix_shared_memory_queue_unlock (q);
-
-                items_this_message = IP6_FIB_COUNTER_BATCH_SIZE;
-                mp = vl_msg_api_alloc_as_if_client
-                  (sizeof (*mp) +
-                   items_this_message * sizeof (vl_api_ip6_fib_counter_t));
-                mp->_vl_msg_id = ntohs (VL_API_VNET_IP6_FIB_COUNTERS);
-                mp->count = 0;
-                mp->vrf_id = ntohl (fib->ft_table_id);
-                ctrp = (vl_api_ip6_fib_counter_t *) mp->c;
-              }
-          }
-
-        if (sm->data_structure_lock->release_hint)
-          {
-            start_at_fib_index = fib - im6->fibs;
-            dsunlock (sm);
-            ip46_fib_stats_delay (sm, 0 /* sec */ , STATS_RELEASE_DELAY_NS);
-            mp->count = 0;
-            ctrp = (vl_api_ip6_fib_counter_t *) mp->c;
-            goto again;
-          }
-    }				/* vec_foreach (routes) */
-
-    dsunlock (sm);
-
-    /* Flush any data from this fib */
-    if (mp->count)
-      {
-	mp->count = htonl (mp->count);
-	vl_msg_api_send_shmem (q, (u8 *) & mp);
-	mp = 0;
-      }
-  }));
-  /* *INDENT-ON* */
-
-  /* If e.g. the last FIB had no reportable routes, free the buffer */
-  if (mp)
-    vl_msg_api_free (mp);
-}
-
-static void
-stats_thread_fn (void *arg)
-{
-  stats_main_t *sm = &stats_main;
-  vlib_worker_thread_t *w = (vlib_worker_thread_t *) arg;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-
-  /* stats thread wants no signals. */
-  {
-    sigset_t s;
-    sigfillset (&s);
-    pthread_sigmask (SIG_SETMASK, &s, 0);
-  }
-
-  if (vec_len (tm->thread_prefix))
-    vlib_set_thread_name ((char *)
-			  format (0, "%v_stats%c", tm->thread_prefix, '\0'));
-
-  clib_mem_set_heap (w->thread_mheap);
-
-  while (1)
-    {
-      /* 10 second poll interval */
-      ip46_fib_stats_delay (sm, 10 /* secs */ , 0 /* nsec */ );
-
-      if (!(sm->enable_poller))
-	continue;
-      do_simple_interface_counters (sm);
-      do_combined_interface_counters (sm);
-      do_ip4_fibs (sm);
-      do_ip6_fibs (sm);
-    }
-}
-
-static void
-vl_api_vnet_interface_counters_t_handler (vl_api_vnet_interface_counters_t *
-					  mp)
-{
-  vpe_client_registration_t *reg;
-  stats_main_t *sm = &stats_main;
-  unix_shared_memory_queue_t *q, *q_prev = NULL;
-  vl_api_vnet_interface_counters_t *mp_copy = NULL;
-  u32 mp_size;
-
-#if STATS_DEBUG > 0
-  char *counter_name;
-  u32 count, sw_if_index;
-  int i;
-#endif
-
-  mp_size = sizeof (*mp) + (ntohl (mp->count) *
-			    (mp->is_combined ? sizeof (vlib_counter_t) :
-			     sizeof (u64)));
-
-  /* *INDENT-OFF* */
-  pool_foreach(reg, sm->stats_registrations,
-  ({
-    q = vl_api_client_index_to_input_queue (reg->client_index);
-    if (q)
-      {
-        if (q_prev && (q_prev->cursize < q_prev->maxsize))
-          {
-            mp_copy = vl_msg_api_alloc_as_if_client(mp_size);
-            clib_memcpy(mp_copy, mp, mp_size);
-            vl_msg_api_send_shmem (q_prev, (u8 *)&mp);
-            mp = mp_copy;
-          }
-        q_prev = q;
-      }
-  }));
-  /* *INDENT-ON* */
-
-#if STATS_DEBUG > 0
-  count = ntohl (mp->count);
-  sw_if_index = ntohl (mp->first_sw_if_index);
-  if (mp->is_combined == 0)
-    {
-      u64 *vp, v;
-      vp = (u64 *) mp->data;
-
-      switch (mp->vnet_counter_type)
-	{
-	case VNET_INTERFACE_COUNTER_DROP:
-	  counter_name = "drop";
-	  break;
-	case VNET_INTERFACE_COUNTER_PUNT:
-	  counter_name = "punt";
-	  break;
-	case VNET_INTERFACE_COUNTER_IP4:
-	  counter_name = "ip4";
-	  break;
-	case VNET_INTERFACE_COUNTER_IP6:
-	  counter_name = "ip6";
-	  break;
-	case VNET_INTERFACE_COUNTER_RX_NO_BUF:
-	  counter_name = "rx-no-buff";
-	  break;
-	case VNET_INTERFACE_COUNTER_RX_MISS:
-	  , counter_name = "rx-miss";
-	  break;
-	case VNET_INTERFACE_COUNTER_RX_ERROR:
-	  , counter_name = "rx-error (fifo-full)";
-	  break;
-	case VNET_INTERFACE_COUNTER_TX_ERROR:
-	  , counter_name = "tx-error (fifo-full)";
-	  break;
-	default:
-	  counter_name = "bogus";
-	  break;
-	}
-      for (i = 0; i < count; i++)
-	{
-	  v = clib_mem_unaligned (vp, u64);
-	  v = clib_net_to_host_u64 (v);
-	  vp++;
-	  fformat (stdout, "%U.%s %lld\n", format_vnet_sw_if_index_name,
-		   sm->vnet_main, sw_if_index, counter_name, v);
-	  sw_if_index++;
-	}
-    }
-  else
-    {
-      vlib_counter_t *vp;
-      u64 packets, bytes;
-      vp = (vlib_counter_t *) mp->data;
-
-      switch (mp->vnet_counter_type)
-	{
-	case VNET_INTERFACE_COUNTER_RX:
-	  counter_name = "rx";
-	  break;
-	case VNET_INTERFACE_COUNTER_TX:
-	  counter_name = "tx";
-	  break;
-	default:
-	  counter_name = "bogus";
-	  break;
-	}
-      for (i = 0; i < count; i++)
-	{
-	  packets = clib_mem_unaligned (&vp->packets, u64);
-	  packets = clib_net_to_host_u64 (packets);
-	  bytes = clib_mem_unaligned (&vp->bytes, u64);
-	  bytes = clib_net_to_host_u64 (bytes);
-	  vp++;
-	  fformat (stdout, "%U.%s.packets %lld\n",
-		   format_vnet_sw_if_index_name,
-		   sm->vnet_main, sw_if_index, counter_name, packets);
-	  fformat (stdout, "%U.%s.bytes %lld\n",
-		   format_vnet_sw_if_index_name,
-		   sm->vnet_main, sw_if_index, counter_name, bytes);
-	  sw_if_index++;
-	}
-    }
-#endif
-  if (q_prev && (q_prev->cursize < q_prev->maxsize))
-    {
-      vl_msg_api_send_shmem (q_prev, (u8 *) & mp);
-    }
-  else
-    {
-      vl_msg_api_free (mp);
-    }
-}
-
-static void
-vl_api_vnet_ip4_fib_counters_t_handler (vl_api_vnet_ip4_fib_counters_t * mp)
-{
-  vpe_client_registration_t *reg;
-  stats_main_t *sm = &stats_main;
-  unix_shared_memory_queue_t *q, *q_prev = NULL;
-  vl_api_vnet_ip4_fib_counters_t *mp_copy = NULL;
-  u32 mp_size;
-
-  mp_size = sizeof (*mp_copy) +
-    ntohl (mp->count) * sizeof (vl_api_ip4_fib_counter_t);
-
-  /* *INDENT-OFF* */
-  pool_foreach(reg, sm->stats_registrations,
-  ({
-    q = vl_api_client_index_to_input_queue (reg->client_index);
-    if (q)
-      {
-        if (q_prev && (q_prev->cursize < q_prev->maxsize))
-          {
-            mp_copy = vl_msg_api_alloc_as_if_client(mp_size);
-            clib_memcpy(mp_copy, mp, mp_size);
-            vl_msg_api_send_shmem (q_prev, (u8 *)&mp);
-            mp = mp_copy;
-          }
-        q_prev = q;
-      }
-  }));
-  /* *INDENT-ON* */
-  if (q_prev && (q_prev->cursize < q_prev->maxsize))
-    {
-      vl_msg_api_send_shmem (q_prev, (u8 *) & mp);
-    }
-  else
-    {
-      vl_msg_api_free (mp);
-    }
-}
-
-static void
-vl_api_vnet_ip6_fib_counters_t_handler (vl_api_vnet_ip6_fib_counters_t * mp)
-{
-  vpe_client_registration_t *reg;
-  stats_main_t *sm = &stats_main;
-  unix_shared_memory_queue_t *q, *q_prev = NULL;
-  vl_api_vnet_ip6_fib_counters_t *mp_copy = NULL;
-  u32 mp_size;
-
-  mp_size = sizeof (*mp_copy) +
-    ntohl (mp->count) * sizeof (vl_api_ip6_fib_counter_t);
-
-  /* *INDENT-OFF* */
-  pool_foreach(reg, sm->stats_registrations,
-  ({
-    q = vl_api_client_index_to_input_queue (reg->client_index);
-    if (q)
-      {
-        if (q_prev && (q_prev->cursize < q_prev->maxsize))
-          {
-            mp_copy = vl_msg_api_alloc_as_if_client(mp_size);
-            clib_memcpy(mp_copy, mp, mp_size);
-            vl_msg_api_send_shmem (q_prev, (u8 *)&mp);
-            mp = mp_copy;
-          }
-        q_prev = q;
-      }
-  }));
-  /* *INDENT-ON* */
-  if (q_prev && (q_prev->cursize < q_prev->maxsize))
-    {
-      vl_msg_api_send_shmem (q_prev, (u8 *) & mp);
-    }
-  else
-    {
-      vl_msg_api_free (mp);
-    }
-}
-
-static void
-vl_api_want_stats_reply_t_handler (vl_api_want_stats_reply_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-vl_api_want_stats_t_handler (vl_api_want_stats_t * mp)
-{
-  stats_main_t *sm = &stats_main;
-  vpe_client_registration_t *rp;
-  vl_api_want_stats_reply_t *rmp;
-  uword *p;
-  i32 retval = 0;
-  unix_shared_memory_queue_t *q;
-
-  p = hash_get (sm->stats_registration_hash, mp->client_index);
-  if (p)
-    {
-      if (mp->enable_disable)
-	{
-	  clib_warning ("pid %d: already enabled...", mp->pid);
-	  retval = -2;
-	  goto reply;
-	}
-      else
-	{
-	  rp = pool_elt_at_index (sm->stats_registrations, p[0]);
-	  pool_put (sm->stats_registrations, rp);
-	  hash_unset (sm->stats_registration_hash, mp->client_index);
-	  goto reply;
-	}
-    }
-  if (mp->enable_disable == 0)
-    {
-      clib_warning ("pid %d: already disabled...", mp->pid);
-      retval = -3;
-      goto reply;
-    }
-  pool_get (sm->stats_registrations, rp);
-  rp->client_index = mp->client_index;
-  rp->client_pid = mp->pid;
-  hash_set (sm->stats_registration_hash, rp->client_index,
-	    rp - sm->stats_registrations);
-
-reply:
-  if (pool_elts (sm->stats_registrations))
-    sm->enable_poller = 1;
-  else
-    sm->enable_poller = 0;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-
-  if (!q)
-    return;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_WANT_STATS_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = retval;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-int
-stats_memclnt_delete_callback (u32 client_index)
-{
-  vpe_client_registration_t *rp;
-  stats_main_t *sm = &stats_main;
-  uword *p;
-
-  p = hash_get (sm->stats_registration_hash, client_index);
-  if (p)
-    {
-      rp = pool_elt_at_index (sm->stats_registrations, p[0]);
-      pool_put (sm->stats_registrations, rp);
-      hash_unset (sm->stats_registration_hash, client_index);
-    }
-
-  return 0;
-}
-
-#define vl_api_vnet_ip4_fib_counters_t_endian vl_noop_handler
-#define vl_api_vnet_ip4_fib_counters_t_print vl_noop_handler
-#define vl_api_vnet_ip6_fib_counters_t_endian vl_noop_handler
-#define vl_api_vnet_ip6_fib_counters_t_print vl_noop_handler
-
-static clib_error_t *
-stats_init (vlib_main_t * vm)
-{
-  stats_main_t *sm = &stats_main;
-  api_main_t *am = &api_main;
-  void *vlib_worker_thread_bootstrap_fn (void *arg);
-
-  sm->vlib_main = vm;
-  sm->vnet_main = vnet_get_main ();
-  sm->interface_main = &vnet_get_main ()->interface_main;
-  sm->api_main = am;
-  sm->stats_poll_interval_in_seconds = 10;
-  sm->data_structure_lock =
-    clib_mem_alloc_aligned (sizeof (data_structure_lock_t),
-			    CLIB_CACHE_LINE_BYTES);
-  memset (sm->data_structure_lock, 0, sizeof (*sm->data_structure_lock));
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 0 /* do NOT trace! */);
-  foreach_stats_msg;
-#undef _
-
-  /* tell the msg infra not to free these messages... */
-  am->message_bounce[VL_API_VNET_INTERFACE_COUNTERS] = 1;
-  am->message_bounce[VL_API_VNET_IP4_FIB_COUNTERS] = 1;
-  am->message_bounce[VL_API_VNET_IP6_FIB_COUNTERS] = 1;
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (stats_init);
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_THREAD (stats_thread_reg, static) = {
-  .name = "stats",
-  .function = stats_thread_fn,
-  .fixed_count = 1,
-  .count = 1,
-  .no_data_structure_clone = 1,
-  .use_pthreads = 1,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/stats/stats.h b/vpp/stats/stats.h
deleted file mode 100644
index 118115be..00000000
--- a/vpp/stats/stats.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_stats_h__
-#define __included_stats_h__
-
-#include <time.h>
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/interface.h>
-#include <pthread.h>
-#include <vlib/threads.h>
-#include <vlib/unix/unix.h>
-#include <vlibmemory/api.h>
-#include <vlibmemory/unix_shared_memory_queue.h>
-#include <vlibapi/api_helper_macros.h>
-
-typedef struct
-{
-  volatile u32 lock;
-  volatile u32 release_hint;
-  u32 thread_id;
-  u32 count;
-  int tag;
-} data_structure_lock_t;
-
-typedef struct
-{
-  void *mheap;
-  pthread_t thread_self;
-  pthread_t thread_handle;
-
-  u32 stats_poll_interval_in_seconds;
-  u32 enable_poller;
-
-  uword *stats_registration_hash;
-  vpe_client_registration_t *stats_registrations;
-
-  /* control-plane data structure lock */
-  data_structure_lock_t *data_structure_lock;
-
-  /* bail out of FIB walk if set */
-  clib_longjmp_t jmp_buf;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-  vnet_interface_main_t *interface_main;
-  api_main_t *api_main;
-} stats_main_t;
-
-stats_main_t stats_main;
-
-void dslock (stats_main_t * sm, int release_hint, int tag);
-void dsunlock (stats_main_t * sm);
-
-#endif /* __included_stats_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/suffix-rules.mk b/vpp/suffix-rules.mk
deleted file mode 120000
index f6098400..00000000
--- a/vpp/suffix-rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-../build-data/suffix-rules.mk
\ No newline at end of file
diff --git a/vpp/vnet/main.c b/vpp/vnet/main.c
deleted file mode 100644
index 56790fda..00000000
--- a/vpp/vnet/main.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vppinfra/cpu.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vnet/plugin/plugin.h>
-#include <vnet/ethernet/ethernet.h>
-
-#include <vpp-api/vpe_msg_enum.h>
-
-#if DPDK
-#include <vnet/devices/dpdk/dpdk.h>
-
-/*
- * Called by the dpdk driver's rte_delay_us() function.
- * Return 0 to have the dpdk do a regular delay loop.
- * Return 1 if to skip the delay loop because we are suspending
- * the calling vlib process instead.
- */
-int
-rte_delay_us_override (unsigned us)
-{
-  vlib_main_t *vm;
-
-  /* Don't bother intercepting for short delays */
-  if (us < 10)
-    return 0;
-
-  /*
-   * Only intercept if we are in a vlib process.
-   * If we are called from a vlib worker thread or the vlib main
-   * thread then do not intercept. (Must not be called from an
-   * independent pthread).
-   */
-  if (os_get_cpu_number () == 0)
-    {
-      /*
-       * We're in the vlib main thread or a vlib process. Make sure
-       * the process is running and we're not still initializing.
-       */
-      vm = vlib_get_main ();
-      if (vlib_in_process_context (vm))
-	{
-	  /* Only suspend for the admin_down_process */
-	  vlib_process_t *proc = vlib_get_current_process (vm);
-	  if (!(proc->flags & VLIB_PROCESS_IS_RUNNING) ||
-	      (proc->node_runtime.function != admin_up_down_process))
-	    return 0;
-
-	  f64 delay = 1e-6 * us;
-	  vlib_process_suspend (vm, delay);
-	  return 1;
-	}
-    }
-  return 0;			// no override
-}
-
-#if RTE_VERSION >= RTE_VERSION_NUM(16, 11, 0, 0)
-static void
-rte_delay_us_override_cb (unsigned us)
-{
-  if (rte_delay_us_override (us) == 0)
-    rte_delay_us_block (us);
-}
-#endif
-#endif
-
-static void
-vpe_main_init (vlib_main_t * vm)
-{
-  if (CLIB_DEBUG > 0)
-    vlib_unix_cli_set_prompt ("DBGvpp# ");
-  else
-    vlib_unix_cli_set_prompt ("vpp# ");
-
-  /* Turn off network stack components which we don't want */
-  vlib_mark_init_function_complete (vm, srp_init);
-
-#if DPDK
-#if RTE_VERSION >= RTE_VERSION_NUM(16, 11, 0, 0)
-  /* register custom delay function */
-  rte_delay_us_callback_register (rte_delay_us_override_cb);
-#endif
-#endif
-}
-
-/*
- * Load plugins from /usr/lib/vpp_plugins by default
- */
-char *vlib_plugin_path = "/usr/lib/vpp_plugins";
-
-void *
-vnet_get_handoff_structure (void)
-{
-  static vnet_plugin_handoff_t _rv, *rv = &_rv;
-
-  rv->vnet_main = vnet_get_main ();
-  rv->ethernet_main = &ethernet_main;
-  return (void *) rv;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int i;
-  vlib_main_t *vm = &vlib_global_main;
-  void vl_msg_api_set_first_available_msg_id (u16);
-  uword main_heap_size = (1ULL << 30);
-  u8 *sizep;
-  u32 size;
-  void vlib_set_get_handoff_structure_cb (void *cb);
-
-#if __x86_64__
-  const char *msg = "ERROR: This binary requires CPU with %s extensions.\n";
-#define _(a,b)                                  \
-    if (!clib_cpu_supports_ ## a ())            \
-      {                                         \
-	fprintf(stderr, msg, b);                \
-	exit(1);                                \
-      }
-
-#if __AVX2__
-  _(avx2, "AVX2")
-#endif
-#if __AVX__
-    _(avx, "AVX")
-#endif
-#if __SSE4_2__
-    _(sse42, "SSE4.2")
-#endif
-#if __SSE4_1__
-    _(sse41, "SSE4.1")
-#endif
-#if __SSSE3__
-    _(ssse3, "SSSE3")
-#endif
-#if __SSE3__
-    _(sse3, "SSE3")
-#endif
-#undef _
-#endif
-    /*
-     * Load startup config from file.
-     * usage: vpp -c /etc/vpp/startup.conf
-     */
-    if ((argc == 3) && !strncmp (argv[1], "-c", 2))
-    {
-      FILE *fp;
-      char inbuf[4096];
-      int argc_ = 1;
-      char **argv_ = NULL;
-      char *arg = NULL;
-      char *p;
-
-      fp = fopen (argv[2], "r");
-      if (fp == NULL)
-	{
-	  fprintf (stderr, "open configuration file '%s' failed\n", argv[2]);
-	  return 1;
-	}
-      argv_ = calloc (1, sizeof (char *));
-      if (argv_ == NULL)
-	return 1;
-      arg = strndup (argv[0], 1024);
-      if (arg == NULL)
-	return 1;
-      argv_[0] = arg;
-
-      while (1)
-	{
-	  if (fgets (inbuf, 4096, fp) == 0)
-	    break;
-	  p = strtok (inbuf, " \t\n");
-	  while (p != NULL)
-	    {
-	      if (*p == '#')
-		break;
-	      argc_++;
-	      char **tmp = realloc (argv_, argc_ * sizeof (char *));
-	      if (tmp == NULL)
-		return 1;
-	      argv_ = tmp;
-	      arg = strndup (p, 1024);
-	      if (arg == NULL)
-		return 1;
-	      argv_[argc_ - 1] = arg;
-	      p = strtok (NULL, " \t\n");
-	    }
-	}
-
-      fclose (fp);
-
-      char **tmp = realloc (argv_, (argc_ + 1) * sizeof (char *));
-      if (tmp == NULL)
-	return 1;
-      argv_ = tmp;
-      argv_[argc_] = NULL;
-
-      argc = argc_;
-      argv = argv_;
-    }
-
-  /*
-   * Look for and parse the "heapsize" config parameter.
-   * Manual since none of the clib infra has been bootstrapped yet.
-   *
-   * Format: heapsize <nn>[mM][gG]
-   */
-
-  for (i = 1; i < (argc - 1); i++)
-    {
-      if (!strncmp (argv[i], "plugin_path", 11))
-	{
-	  if (i < (argc - 1))
-	    vlib_plugin_path = argv[++i];
-	}
-      else if (!strncmp (argv[i], "heapsize", 8))
-	{
-	  sizep = (u8 *) argv[i + 1];
-	  size = 0;
-	  while (*sizep >= '0' && *sizep <= '9')
-	    {
-	      size *= 10;
-	      size += *sizep++ - '0';
-	    }
-	  if (size == 0)
-	    {
-	      fprintf
-		(stderr,
-		 "warning: heapsize parse error '%s', use default %lld\n",
-		 argv[i], (long long int) main_heap_size);
-	      goto defaulted;
-	    }
-
-	  main_heap_size = size;
-
-	  if (*sizep == 'g' || *sizep == 'G')
-	    main_heap_size <<= 30;
-	  else if (*sizep == 'm' || *sizep == 'M')
-	    main_heap_size <<= 20;
-	}
-    }
-
-defaulted:
-
-  /* Set up the plugin message ID allocator right now... */
-  vl_msg_api_set_first_available_msg_id (VL_MSG_FIRST_AVAILABLE);
-
-  /* Allocate main heap */
-  if (clib_mem_init (0, main_heap_size))
-    {
-      vm->init_functions_called = hash_create (0, /* value bytes */ 0);
-      vpe_main_init (vm);
-#if DPDK == 0
-      unix_physmem_init (vm, 0 /* fail_if_physical_memory_not_present */ );
-#endif
-      vlib_set_get_handoff_structure_cb (&vnet_get_handoff_structure);
-      return vlib_unix_main (argc, argv);
-    }
-  else
-    {
-      {
-	int rv __attribute__ ((unused)) =
-	  write (2, "Main heap allocation failure!\r\n", 31);
-      }
-      return 1;
-    }
-}
-
-static clib_error_t *
-heapsize_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  u32 junk;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%dm", &junk)
-	  || unformat (input, "%dM", &junk)
-	  || unformat (input, "%dg", &junk) || unformat (input, "%dG", &junk))
-	return 0;
-      else
-	return clib_error_return (0, "unknown input '%U'",
-				  format_unformat_error, input);
-    }
-  return 0;
-}
-
-VLIB_CONFIG_FUNCTION (heapsize_config, "heapsize");
-
-static clib_error_t *
-plugin_path_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  u8 *junk;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%s", &junk))
-	{
-	  vec_free (junk);
-	  return 0;
-	}
-      else
-	return clib_error_return (0, "unknown input '%U'",
-				  format_unformat_error, input);
-    }
-  return 0;
-}
-
-VLIB_CONFIG_FUNCTION (plugin_path_config, "plugin_path");
-
-void vl_msg_api_post_mortem_dump (void);
-
-void
-os_panic (void)
-{
-  vl_msg_api_post_mortem_dump ();
-  abort ();
-}
-
-void vhost_user_unmap_all (void) __attribute__ ((weak));
-void
-vhost_user_unmap_all (void)
-{
-}
-
-void
-os_exit (int code)
-{
-  static int recursion_block;
-
-  if (code)
-    {
-      if (recursion_block)
-	abort ();
-
-      recursion_block = 1;
-
-      vl_msg_api_post_mortem_dump ();
-      vhost_user_unmap_all ();
-      abort ();
-    }
-  exit (code);
-}
-
-void
-vl_msg_api_barrier_sync (void)
-{
-  vlib_worker_thread_barrier_sync (vlib_get_main ());
-}
-
-void
-vl_msg_api_barrier_release (void)
-{
-  vlib_worker_thread_barrier_release (vlib_get_main ());
-}
-
-/* This application needs 1 thread stack for the stats pthread */
-u32
-vlib_app_num_thread_stacks_needed (void)
-{
-  return 1;
-}
-
-/*
- * Depending on the configuration selected above,
- * it may be necessary to generate stub graph nodes.
- * It is never OK to ignore "node 'x' refers to unknown node 'y'
- * messages!
- */
-
-#if CLIB_DEBUG > 0
-
-static clib_error_t *
-test_crash_command_fn (vlib_main_t * vm,
-		       unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  u64 *p = (u64 *) 0xdefec8ed;
-
-  *p = 0xdeadbeef;
-
-  /* Not so much... */
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (test_crash_command, static) = {
-  .path = "test crash",
-  .short_help = "crash the bus!",
-  .function = test_crash_command_fn,
-};
-/* *INDENT-ON* */
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c
deleted file mode 100644
index 01022608..00000000
--- a/vpp/vpp-api/api.c
+++ /dev/null
@@ -1,4921 +0,0 @@
-/*
- *------------------------------------------------------------------
- * api.c - message handler registration
- *
- * Copyright (c) 2010-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <pwd.h>
-#include <grp.h>
-
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-#include <vppinfra/error.h>
-
-#include <vnet/api_errno.h>
-#include <vnet/vnet.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/l2_bd.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ip/ip6.h>
-#include <vnet/ip/ip6_neighbor.h>
-#include <vnet/mpls/mpls.h>
-#include <vnet/mpls/mpls_tunnel.h>
-#include <vnet/dhcp/proxy.h>
-#include <vnet/dhcp/client.h>
-#if IPV6SR > 0
-#include <vnet/sr/sr.h>
-#endif
-#include <vnet/dhcpv6/proxy.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vnet/classify/vnet_classify.h>
-#include <vnet/classify/input_acl.h>
-#include <vnet/classify/policer_classify.h>
-#include <vnet/classify/flow_classify.h>
-#include <vnet/l2/l2_classify.h>
-#include <vnet/vxlan/vxlan.h>
-#include <vnet/l2/l2_vtr.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <vnet/map/map.h>
-#include <vnet/cop/cop.h>
-#include <vnet/ip/ip6_hop_by_hop.h>
-#include <vnet/ip/ip_source_and_port_range_check.h>
-#include <vnet/policer/policer.h>
-#include <vnet/flow/flow_report.h>
-#include <vnet/flow/flow_report_classify.h>
-#include <vnet/ip/punt.h>
-#include <vnet/feature/feature.h>
-
-#undef BIHASH_TYPE
-#undef __included_bihash_template_h__
-#include <vnet/l2/l2_fib.h>
-
-#if DPDK > 0
-#include <vnet/devices/dpdk/dpdk.h>
-#endif
-
-#include <stats/stats.h>
-#include <oam/oam.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/arp_packet.h>
-#include <vnet/interface.h>
-#include <vnet/l2/l2_fib.h>
-#include <vnet/l2/l2_bd.h>
-#include <vpp-api/vpe_msg_enum.h>
-#include <vnet/span/span.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/fib_api.h>
-#include <vnet/dpo/drop_dpo.h>
-#include <vnet/dpo/receive_dpo.h>
-#include <vnet/dpo/lookup_dpo.h>
-#include <vnet/dpo/classify_dpo.h>
-#include <vnet/dpo/ip_null_dpo.h>
-#define vl_typedefs		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_typedefs
-#define vl_endianfun		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_endianfun
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_printfun
-#include <vlibapi/api_helper_macros.h>
-#define foreach_vpe_api_msg                                             \
-_(WANT_OAM_EVENTS, want_oam_events)                                     \
-_(OAM_ADD_DEL, oam_add_del)                                             \
-_(MPLS_ROUTE_ADD_DEL, mpls_route_add_del)                               \
-_(MPLS_IP_BIND_UNBIND, mpls_ip_bind_unbind)                             \
-_(IS_ADDRESS_REACHABLE, is_address_reachable)                           \
-_(SW_INTERFACE_SET_MPLS_ENABLE, sw_interface_set_mpls_enable)           \
-_(SW_INTERFACE_SET_VPATH, sw_interface_set_vpath)                       \
-_(SW_INTERFACE_SET_VXLAN_BYPASS, sw_interface_set_vxlan_bypass)         \
-_(SW_INTERFACE_SET_L2_XCONNECT, sw_interface_set_l2_xconnect)           \
-_(SW_INTERFACE_SET_L2_BRIDGE, sw_interface_set_l2_bridge)               \
-_(SW_INTERFACE_SET_DPDK_HQOS_PIPE, sw_interface_set_dpdk_hqos_pipe)     \
-_(SW_INTERFACE_SET_DPDK_HQOS_SUBPORT, sw_interface_set_dpdk_hqos_subport) \
-_(SW_INTERFACE_SET_DPDK_HQOS_TCTBL, sw_interface_set_dpdk_hqos_tctbl)   \
-_(BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del)                         \
-_(BRIDGE_DOMAIN_DUMP, bridge_domain_dump)                               \
-_(BRIDGE_DOMAIN_DETAILS, bridge_domain_details)                         \
-_(BRIDGE_DOMAIN_SW_IF_DETAILS, bridge_domain_sw_if_details)             \
-_(L2FIB_ADD_DEL, l2fib_add_del)                                         \
-_(L2_FLAGS, l2_flags)                                                   \
-_(BRIDGE_FLAGS, bridge_flags)                                           \
-_(CREATE_VLAN_SUBIF, create_vlan_subif)                                 \
-_(CREATE_SUBIF, create_subif)                                           \
-_(MPLS_TUNNEL_ADD_DEL, mpls_tunnel_add_del)				\
-_(PROXY_ARP_ADD_DEL, proxy_arp_add_del)                                 \
-_(PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable)       \
-_(VNET_GET_SUMMARY_STATS, vnet_get_summary_stats)			\
-_(RESET_FIB, reset_fib)							\
-_(DHCP_PROXY_CONFIG,dhcp_proxy_config)					\
-_(DHCP_PROXY_CONFIG_2,dhcp_proxy_config_2)				\
-_(DHCP_PROXY_SET_VSS,dhcp_proxy_set_vss)                                \
-_(DHCP_CLIENT_CONFIG, dhcp_client_config)				\
-_(CREATE_LOOPBACK, create_loopback)					\
-_(CONTROL_PING, control_ping)                                           \
-_(CLI_REQUEST, cli_request)                                             \
-_(CLI_INBAND, cli_inband)						\
-_(SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit)			\
-_(L2_PATCH_ADD_DEL, l2_patch_add_del)					\
-_(CLASSIFY_ADD_DEL_TABLE, classify_add_del_table)			\
-_(CLASSIFY_ADD_DEL_SESSION, classify_add_del_session)			\
-_(CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table)     \
-_(CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables)   \
-_(GET_NODE_INDEX, get_node_index)                                       \
-_(ADD_NODE_NEXT, add_node_next)						\
-_(VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel)                           \
-_(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump)                                 \
-_(L2_FIB_CLEAR_TABLE, l2_fib_clear_table)                               \
-_(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter)                     \
-_(L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)         \
-_(SHOW_VERSION, show_version)						\
-_(L2_FIB_TABLE_DUMP, l2_fib_table_dump)	                                \
-_(L2_FIB_TABLE_ENTRY, l2_fib_table_entry)                               \
-_(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel)                   \
-_(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump)                         \
-_(INTERFACE_NAME_RENUMBER, interface_name_renumber)			\
-_(WANT_IP4_ARP_EVENTS, want_ip4_arp_events)                             \
-_(WANT_IP6_ND_EVENTS, want_ip6_nd_events)                               \
-_(INPUT_ACL_SET_INTERFACE, input_acl_set_interface)                     \
-_(DELETE_LOOPBACK, delete_loopback)                                     \
-_(BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del)                                 \
-_(COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable)		\
-_(COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable)		\
-_(GET_NODE_GRAPH, get_node_graph)                                       \
-_(IOAM_ENABLE, ioam_enable)                                             \
-_(IOAM_DISABLE, ioam_disable)                                           \
-_(SR_MULTICAST_MAP_ADD_DEL, sr_multicast_map_add_del)                   \
-_(POLICER_ADD_DEL, policer_add_del)                                     \
-_(POLICER_DUMP, policer_dump)                                           \
-_(POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface)       \
-_(POLICER_CLASSIFY_DUMP, policer_classify_dump)                         \
-_(MPLS_TUNNEL_DUMP, mpls_tunnel_dump)                                   \
-_(MPLS_TUNNEL_DETAILS, mpls_tunnel_details)                             \
-_(MPLS_FIB_DUMP, mpls_fib_dump)                                         \
-_(MPLS_FIB_DETAILS, mpls_fib_details)                                   \
-_(CLASSIFY_TABLE_IDS,classify_table_ids)                                \
-_(CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface)             \
-_(CLASSIFY_TABLE_INFO,classify_table_info)                              \
-_(CLASSIFY_SESSION_DUMP,classify_session_dump)                          \
-_(CLASSIFY_SESSION_DETAILS,classify_session_details)                    \
-_(SET_IPFIX_EXPORTER, set_ipfix_exporter)                               \
-_(IPFIX_EXPORTER_DUMP, ipfix_exporter_dump)                             \
-_(SET_IPFIX_CLASSIFY_STREAM, set_ipfix_classify_stream)                 \
-_(IPFIX_CLASSIFY_STREAM_DUMP, ipfix_classify_stream_dump)               \
-_(IPFIX_CLASSIFY_TABLE_ADD_DEL, ipfix_classify_table_add_del)           \
-_(IPFIX_CLASSIFY_TABLE_DUMP, ipfix_classify_table_dump)                 \
-_(GET_NEXT_INDEX, get_next_index)                                       \
-_(PG_CREATE_INTERFACE, pg_create_interface)                             \
-_(PG_CAPTURE, pg_capture)                                               \
-_(PG_ENABLE_DISABLE, pg_enable_disable)                                 \
-_(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL,                               \
-  ip_source_and_port_range_check_add_del)                               \
-_(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL,                     \
-  ip_source_and_port_range_check_interface_add_del)                     \
-_(DELETE_SUBIF, delete_subif)                                           \
-_(L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite)           \
-_(PUNT, punt)                                                           \
-_(FLOW_CLASSIFY_SET_INTERFACE, flow_classify_set_interface)             \
-_(FLOW_CLASSIFY_DUMP, flow_classify_dump)                               \
-_(FEATURE_ENABLE_DISABLE, feature_enable_disable)
-
-#define QUOTE_(x) #x
-#define QUOTE(x) QUOTE_(x)
-typedef enum
-{
-  RESOLVE_IP4_ADD_DEL_ROUTE = 1,
-  RESOLVE_IP6_ADD_DEL_ROUTE,
-} resolve_t;
-
-static vlib_node_registration_t vpe_resolver_process_node;
-vpe_api_main_t vpe_api_main;
-
-static int arp_change_delete_callback (u32 pool_index, u8 * notused);
-static int nd_change_delete_callback (u32 pool_index, u8 * notused);
-
-/* Clean up all registrations belonging to the indicated client */
-int
-vl_api_memclnt_delete_callback (u32 client_index)
-{
-  vpe_api_main_t *vam = &vpe_api_main;
-  vpe_client_registration_t *rp;
-  uword *p;
-  int stats_memclnt_delete_callback (u32 client_index);
-
-  stats_memclnt_delete_callback (client_index);
-
-#define _(a)                                                    \
-    p = hash_get (vam->a##_registration_hash, client_index);    \
-    if (p) {                                                    \
-        rp = pool_elt_at_index (vam->a##_registrations, p[0]);  \
-        pool_put (vam->a##_registrations, rp);                  \
-        hash_unset (vam->a##_registration_hash, client_index);  \
-    }
-  foreach_registration_hash;
-#undef _
-  return 0;
-}
-
-pub_sub_handler (oam_events, OAM_EVENTS);
-
-#define RESOLUTION_EVENT 1
-#define RESOLUTION_PENDING_EVENT 2
-#define IP4_ARP_EVENT 3
-#define IP6_ND_EVENT 4
-
-int ip4_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp);
-
-int ip6_add_del_route_t_handler (vl_api_ip_add_del_route_t * mp);
-
-void
-handle_ip4_arp_event (u32 pool_index)
-{
-  vpe_api_main_t *vam = &vpe_api_main;
-  vnet_main_t *vnm = vam->vnet_main;
-  vlib_main_t *vm = vam->vlib_main;
-  vl_api_ip4_arp_event_t *event;
-  vl_api_ip4_arp_event_t *mp;
-  unix_shared_memory_queue_t *q;
-
-  /* Client can cancel, die, etc. */
-  if (pool_is_free_index (vam->arp_events, pool_index))
-    return;
-
-  event = pool_elt_at_index (vam->arp_events, pool_index);
-
-  q = vl_api_client_index_to_input_queue (event->client_index);
-  if (!q)
-    {
-      (void) vnet_add_del_ip4_arp_change_event
-	(vnm, arp_change_delete_callback,
-	 event->pid, &event->address,
-	 vpe_resolver_process_node.index, IP4_ARP_EVENT,
-	 ~0 /* pool index, notused */ , 0 /* is_add */ );
-      return;
-    }
-
-  if (q->cursize < q->maxsize)
-    {
-      mp = vl_msg_api_alloc (sizeof (*mp));
-      clib_memcpy (mp, event, sizeof (*mp));
-      vl_msg_api_send_shmem (q, (u8 *) & mp);
-    }
-  else
-    {
-      static f64 last_time;
-      /*
-       * Throttle syslog msgs.
-       * It's pretty tempting to just revoke the registration...
-       */
-      if (vlib_time_now (vm) > last_time + 10.0)
-	{
-	  clib_warning ("arp event for %U to pid %d: queue stuffed!",
-			format_ip4_address, &event->address, event->pid);
-	  last_time = vlib_time_now (vm);
-	}
-    }
-}
-
-void
-handle_ip6_nd_event (u32 pool_index)
-{
-  vpe_api_main_t *vam = &vpe_api_main;
-  vnet_main_t *vnm = vam->vnet_main;
-  vlib_main_t *vm = vam->vlib_main;
-  vl_api_ip6_nd_event_t *event;
-  vl_api_ip6_nd_event_t *mp;
-  unix_shared_memory_queue_t *q;
-
-  /* Client can cancel, die, etc. */
-  if (pool_is_free_index (vam->nd_events, pool_index))
-    return;
-
-  event = pool_elt_at_index (vam->nd_events, pool_index);
-
-  q = vl_api_client_index_to_input_queue (event->client_index);
-  if (!q)
-    {
-      (void) vnet_add_del_ip6_nd_change_event
-	(vnm, nd_change_delete_callback,
-	 event->pid, &event->address,
-	 vpe_resolver_process_node.index, IP6_ND_EVENT,
-	 ~0 /* pool index, notused */ , 0 /* is_add */ );
-      return;
-    }
-
-  if (q->cursize < q->maxsize)
-    {
-      mp = vl_msg_api_alloc (sizeof (*mp));
-      clib_memcpy (mp, event, sizeof (*mp));
-      vl_msg_api_send_shmem (q, (u8 *) & mp);
-    }
-  else
-    {
-      static f64 last_time;
-      /*
-       * Throttle syslog msgs.
-       * It's pretty tempting to just revoke the registration...
-       */
-      if (vlib_time_now (vm) > last_time + 10.0)
-	{
-	  clib_warning ("ip6 nd event for %U to pid %d: queue stuffed!",
-			format_ip6_address, &event->address, event->pid);
-	  last_time = vlib_time_now (vm);
-	}
-    }
-}
-
-static uword
-resolver_process (vlib_main_t * vm,
-		  vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  uword event_type;
-  uword *event_data = 0;
-  f64 timeout = 100.0;
-  int i;
-
-  while (1)
-    {
-      vlib_process_wait_for_event_or_clock (vm, timeout);
-
-      event_type = vlib_process_get_events (vm, &event_data);
-
-      switch (event_type)
-	{
-	case RESOLUTION_PENDING_EVENT:
-	  timeout = 1.0;
-	  break;
-
-	case RESOLUTION_EVENT:
-	  clib_warning ("resolver: BOGUS TYPE");
-	  break;
-
-	case IP4_ARP_EVENT:
-	  for (i = 0; i < vec_len (event_data); i++)
-	    handle_ip4_arp_event (event_data[i]);
-	  break;
-
-	case IP6_ND_EVENT:
-	  for (i = 0; i < vec_len (event_data); i++)
-	    handle_ip6_nd_event (event_data[i]);
-	  break;
-
-	case ~0:		/* timeout */
-	  break;
-	}
-
-      vec_reset_length (event_data);
-    }
-  return 0;			/* or not */
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (vpe_resolver_process_node,static) = {
-  .function = resolver_process,
-  .type = VLIB_NODE_TYPE_PROCESS,
-  .name = "vpe-route-resolver-process",
-};
-/* *INDENT-ON* */
-
-static int
-mpls_route_add_del_t_handler (vnet_main_t * vnm,
-			      vl_api_mpls_route_add_del_t * mp)
-{
-  u32 fib_index, next_hop_fib_index;
-  mpls_label_t *label_stack = NULL;
-  int rv, ii, n_labels;;
-
-  fib_prefix_t pfx = {
-    .fp_len = 21,
-    .fp_proto = FIB_PROTOCOL_MPLS,
-    .fp_eos = mp->mr_eos,
-    .fp_label = ntohl (mp->mr_label),
-  };
-  if (pfx.fp_eos)
-    {
-      if (mp->mr_next_hop_proto_is_ip4)
-	{
-	  pfx.fp_payload_proto = DPO_PROTO_IP4;
-	}
-      else
-	{
-	  pfx.fp_payload_proto = DPO_PROTO_IP6;
-	}
-    }
-  else
-    {
-      pfx.fp_payload_proto = DPO_PROTO_MPLS;
-    }
-
-  rv = add_del_route_check (FIB_PROTOCOL_MPLS,
-			    mp->mr_table_id,
-			    mp->mr_next_hop_sw_if_index,
-			    dpo_proto_to_fib (pfx.fp_payload_proto),
-			    mp->mr_next_hop_table_id,
-			    mp->mr_create_table_if_needed,
-			    &fib_index, &next_hop_fib_index);
-
-  if (0 != rv)
-    return (rv);
-
-  ip46_address_t nh;
-  memset (&nh, 0, sizeof (nh));
-
-  if (mp->mr_next_hop_proto_is_ip4)
-    memcpy (&nh.ip4, mp->mr_next_hop, sizeof (nh.ip4));
-  else
-    memcpy (&nh.ip6, mp->mr_next_hop, sizeof (nh.ip6));
-
-  n_labels = mp->mr_next_hop_n_out_labels;
-  if (n_labels == 0)
-    ;
-  else if (1 == n_labels)
-    vec_add1 (label_stack, ntohl (mp->mr_next_hop_out_label_stack[0]));
-  else
-    {
-      vec_validate (label_stack, n_labels - 1);
-      for (ii = 0; ii < n_labels; ii++)
-	label_stack[ii] = ntohl (mp->mr_next_hop_out_label_stack[ii]);
-    }
-
-  return (add_del_route_t_handler (mp->mr_is_multipath, mp->mr_is_add, 0,	// mp->is_drop,
-				   0,	// mp->is_unreach,
-				   0,	// mp->is_prohibit,
-				   0,	// mp->is_local,
-				   mp->mr_is_classify,
-				   mp->mr_classify_table_index,
-				   mp->mr_is_resolve_host,
-				   mp->mr_is_resolve_attached,
-				   fib_index, &pfx,
-				   mp->mr_next_hop_proto_is_ip4,
-				   &nh, ntohl (mp->mr_next_hop_sw_if_index),
-				   next_hop_fib_index,
-				   mp->mr_next_hop_weight,
-				   ntohl (mp->mr_next_hop_via_label),
-				   label_stack));
-}
-
-void
-vl_api_mpls_route_add_del_t_handler (vl_api_mpls_route_add_del_t * mp)
-{
-  vl_api_mpls_route_add_del_reply_t *rmp;
-  vnet_main_t *vnm;
-  int rv;
-
-  vnm = vnet_get_main ();
-  vnm->api_errno = 0;
-
-  rv = mpls_route_add_del_t_handler (vnm, mp);
-
-  rv = (rv == 0) ? vnm->api_errno : rv;
-
-  REPLY_MACRO (VL_API_MPLS_ROUTE_ADD_DEL_REPLY);
-}
-
-static int
-mpls_ip_bind_unbind_handler (vnet_main_t * vnm,
-			     vl_api_mpls_ip_bind_unbind_t * mp)
-{
-  u32 mpls_fib_index, ip_fib_index;
-
-  mpls_fib_index =
-    fib_table_find (FIB_PROTOCOL_MPLS, ntohl (mp->mb_mpls_table_id));
-
-  if (~0 == mpls_fib_index)
-    {
-      if (mp->mb_create_table_if_needed)
-	{
-	  mpls_fib_index =
-	    fib_table_find_or_create_and_lock (FIB_PROTOCOL_MPLS,
-					       ntohl (mp->mb_mpls_table_id));
-	}
-      else
-	return VNET_API_ERROR_NO_SUCH_FIB;
-    }
-
-  ip_fib_index = fib_table_find ((mp->mb_is_ip4 ?
-				  FIB_PROTOCOL_IP4 :
-				  FIB_PROTOCOL_IP6),
-				 ntohl (mp->mb_ip_table_id));
-  if (~0 == ip_fib_index)
-    return VNET_API_ERROR_NO_SUCH_FIB;
-
-  fib_prefix_t pfx = {
-    .fp_len = mp->mb_address_length,
-  };
-
-  if (mp->mb_is_ip4)
-    {
-      pfx.fp_proto = FIB_PROTOCOL_IP4;
-      clib_memcpy (&pfx.fp_addr.ip4, mp->mb_address,
-		   sizeof (pfx.fp_addr.ip4));
-    }
-  else
-    {
-      pfx.fp_proto = FIB_PROTOCOL_IP6;
-      clib_memcpy (&pfx.fp_addr.ip6, mp->mb_address,
-		   sizeof (pfx.fp_addr.ip6));
-    }
-
-  if (mp->mb_is_bind)
-    fib_table_entry_local_label_add (ip_fib_index, &pfx,
-				     ntohl (mp->mb_label));
-  else
-    fib_table_entry_local_label_remove (ip_fib_index, &pfx,
-					ntohl (mp->mb_label));
-
-  return (0);
-}
-
-void
-vl_api_mpls_ip_bind_unbind_t_handler (vl_api_mpls_ip_bind_unbind_t * mp)
-{
-  vl_api_mpls_route_add_del_reply_t *rmp;
-  vnet_main_t *vnm;
-  int rv;
-
-  vnm = vnet_get_main ();
-  vnm->api_errno = 0;
-
-  rv = mpls_ip_bind_unbind_handler (vnm, mp);
-
-  rv = (rv == 0) ? vnm->api_errno : rv;
-
-  REPLY_MACRO (VL_API_MPLS_ROUTE_ADD_DEL_REPLY);
-}
-
-static void
-vl_api_sw_interface_set_vpath_t_handler (vl_api_sw_interface_set_vpath_t * mp)
-{
-  vl_api_sw_interface_set_vpath_reply_t *rmp;
-  int rv = 0;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_VPATH, mp->enable);
-  vnet_feature_enable_disable ("ip4-unicast", "vpath-input-ip4",
-			       sw_if_index, mp->enable, 0, 0);
-  vnet_feature_enable_disable ("ip4-multicast", "vpath-input-ip4",
-			       sw_if_index, mp->enable, 0, 0);
-  vnet_feature_enable_disable ("ip6-unicast", "vpath-input-ip6",
-			       sw_if_index, mp->enable, 0, 0);
-  vnet_feature_enable_disable ("ip6-multicast", "vpath-input-ip6",
-			       sw_if_index, mp->enable, 0, 0);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_VPATH_REPLY);
-}
-
-static void
-  vl_api_sw_interface_set_vxlan_bypass_t_handler
-  (vl_api_sw_interface_set_vxlan_bypass_t * mp)
-{
-  vl_api_sw_interface_set_vxlan_bypass_reply_t *rmp;
-  int rv = 0;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  if (mp->is_ipv6)
-    {
-      /* not yet implemented */
-    }
-  else
-    vnet_feature_enable_disable ("ip4-unicast", "ip4-vxlan-bypass",
-				 sw_if_index, mp->enable, 0, 0);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_VXLAN_BYPASS_REPLY);
-}
-
-static void
-  vl_api_sw_interface_set_l2_xconnect_t_handler
-  (vl_api_sw_interface_set_l2_xconnect_t * mp)
-{
-  vl_api_sw_interface_set_l2_xconnect_reply_t *rmp;
-  int rv = 0;
-  u32 rx_sw_if_index = ntohl (mp->rx_sw_if_index);
-  u32 tx_sw_if_index = ntohl (mp->tx_sw_if_index);
-  vlib_main_t *vm = vlib_get_main ();
-  vnet_main_t *vnm = vnet_get_main ();
-
-  VALIDATE_RX_SW_IF_INDEX (mp);
-
-  if (mp->enable)
-    {
-      VALIDATE_TX_SW_IF_INDEX (mp);
-      rv = set_int_l2_mode (vm, vnm, MODE_L2_XC,
-			    rx_sw_if_index, 0, 0, 0, tx_sw_if_index);
-    }
-  else
-    {
-      rv = set_int_l2_mode (vm, vnm, MODE_L3, rx_sw_if_index, 0, 0, 0, 0);
-    }
-
-  BAD_RX_SW_IF_INDEX_LABEL;
-  BAD_TX_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_L2_XCONNECT_REPLY);
-}
-
-static void
-  vl_api_sw_interface_set_l2_bridge_t_handler
-  (vl_api_sw_interface_set_l2_bridge_t * mp)
-{
-  bd_main_t *bdm = &bd_main;
-  vl_api_sw_interface_set_l2_bridge_reply_t *rmp;
-  int rv = 0;
-  u32 rx_sw_if_index = ntohl (mp->rx_sw_if_index);
-  u32 bd_id = ntohl (mp->bd_id);
-  u32 bd_index;
-  u32 bvi = mp->bvi;
-  u8 shg = mp->shg;
-  vlib_main_t *vm = vlib_get_main ();
-  vnet_main_t *vnm = vnet_get_main ();
-
-  VALIDATE_RX_SW_IF_INDEX (mp);
-
-  bd_index = bd_find_or_add_bd_index (bdm, bd_id);
-
-  if (mp->enable)
-    {
-      //VALIDATE_TX_SW_IF_INDEX(mp);
-      rv = set_int_l2_mode (vm, vnm, MODE_L2_BRIDGE,
-			    rx_sw_if_index, bd_index, bvi, shg, 0);
-    }
-  else
-    {
-      rv = set_int_l2_mode (vm, vnm, MODE_L3, rx_sw_if_index, 0, 0, 0, 0);
-    }
-
-  BAD_RX_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_L2_BRIDGE_REPLY);
-}
-
-static void
-  vl_api_sw_interface_set_dpdk_hqos_pipe_t_handler
-  (vl_api_sw_interface_set_dpdk_hqos_pipe_t * mp)
-{
-  vl_api_sw_interface_set_dpdk_hqos_pipe_reply_t *rmp;
-  int rv = 0;
-
-#if DPDK > 0
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_t *xd;
-
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  u32 subport = ntohl (mp->subport);
-  u32 pipe = ntohl (mp->pipe);
-  u32 profile = ntohl (mp->profile);
-  vnet_hw_interface_t *hw;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  /* hw_if & dpdk device */
-  hw = vnet_get_sup_hw_interface (dm->vnet_main, sw_if_index);
-
-  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
-
-  rv = rte_sched_pipe_config (xd->hqos_ht->hqos, subport, pipe, profile);
-
-  BAD_SW_IF_INDEX_LABEL;
-#else
-  clib_warning ("setting HQoS pipe parameters without DPDK not implemented");
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif /* DPDK */
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_DPDK_HQOS_PIPE_REPLY);
-}
-
-static void
-  vl_api_sw_interface_set_dpdk_hqos_subport_t_handler
-  (vl_api_sw_interface_set_dpdk_hqos_subport_t * mp)
-{
-  vl_api_sw_interface_set_dpdk_hqos_subport_reply_t *rmp;
-  int rv = 0;
-
-#if DPDK > 0
-  dpdk_main_t *dm = &dpdk_main;
-  dpdk_device_t *xd;
-  struct rte_sched_subport_params p;
-
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  u32 subport = ntohl (mp->subport);
-  p.tb_rate = ntohl (mp->tb_rate);
-  p.tb_size = ntohl (mp->tb_size);
-  p.tc_rate[0] = ntohl (mp->tc_rate[0]);
-  p.tc_rate[1] = ntohl (mp->tc_rate[1]);
-  p.tc_rate[2] = ntohl (mp->tc_rate[2]);
-  p.tc_rate[3] = ntohl (mp->tc_rate[3]);
-  p.tc_period = ntohl (mp->tc_period);
-
-  vnet_hw_interface_t *hw;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  /* hw_if & dpdk device */
-  hw = vnet_get_sup_hw_interface (dm->vnet_main, sw_if_index);
-
-  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
-
-  rv = rte_sched_subport_config (xd->hqos_ht->hqos, subport, &p);
-
-  BAD_SW_IF_INDEX_LABEL;
-#else
-  clib_warning
-    ("setting HQoS subport parameters without DPDK not implemented");
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif /* DPDK */
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_DPDK_HQOS_SUBPORT_REPLY);
-}
-
-static void
-  vl_api_sw_interface_set_dpdk_hqos_tctbl_t_handler
-  (vl_api_sw_interface_set_dpdk_hqos_tctbl_t * mp)
-{
-  vl_api_sw_interface_set_dpdk_hqos_tctbl_reply_t *rmp;
-  int rv = 0;
-
-#if DPDK > 0
-  dpdk_main_t *dm = &dpdk_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  dpdk_device_t *xd;
-
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  u32 entry = ntohl (mp->entry);
-  u32 tc = ntohl (mp->tc);
-  u32 queue = ntohl (mp->queue);
-  u32 val, i;
-
-  vnet_hw_interface_t *hw;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  /* hw_if & dpdk device */
-  hw = vnet_get_sup_hw_interface (dm->vnet_main, sw_if_index);
-
-  xd = vec_elt_at_index (dm->devices, hw->dev_instance);
-
-  if (tc >= RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE)
-    {
-      clib_warning ("invalid traffic class !!");
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto done;
-    }
-  if (queue >= RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS)
-    {
-      clib_warning ("invalid queue !!");
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto done;
-    }
-
-  /* Detect the set of worker threads */
-  uword *p = hash_get_mem (tm->thread_registrations_by_name, "workers");
-
-  if (p == 0)
-    {
-      clib_warning ("worker thread registration AWOL !!");
-      rv = VNET_API_ERROR_INVALID_VALUE_2;
-      goto done;
-    }
-
-  vlib_thread_registration_t *tr = (vlib_thread_registration_t *) p[0];
-  int worker_thread_first = tr->first_index;
-  int worker_thread_count = tr->count;
-
-  val = tc * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + queue;
-  for (i = 0; i < worker_thread_count; i++)
-    xd->hqos_wt[worker_thread_first + i].hqos_tc_table[entry] = val;
-
-  BAD_SW_IF_INDEX_LABEL;
-done:
-#else
-  clib_warning ("setting HQoS DSCP table entry without DPDK not implemented");
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif /* DPDK */
-
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_DPDK_HQOS_TCTBL_REPLY);
-}
-
-static void
-vl_api_bridge_domain_add_del_t_handler (vl_api_bridge_domain_add_del_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  bd_main_t *bdm = &bd_main;
-  vl_api_bridge_domain_add_del_reply_t *rmp;
-  int rv = 0;
-  u32 enable_flags = 0, disable_flags = 0;
-  u32 bd_id = ntohl (mp->bd_id);
-  u32 bd_index;
-
-  if (mp->is_add)
-    {
-      bd_index = bd_find_or_add_bd_index (bdm, bd_id);
-
-      if (mp->flood)
-	enable_flags |= L2_FLOOD;
-      else
-	disable_flags |= L2_FLOOD;
-
-      if (mp->uu_flood)
-	enable_flags |= L2_UU_FLOOD;
-      else
-	disable_flags |= L2_UU_FLOOD;
-
-      if (mp->forward)
-	enable_flags |= L2_FWD;
-      else
-	disable_flags |= L2_FWD;
-
-      if (mp->arp_term)
-	enable_flags |= L2_ARP_TERM;
-      else
-	disable_flags |= L2_ARP_TERM;
-
-      if (mp->learn)
-	enable_flags |= L2_LEARN;
-      else
-	disable_flags |= L2_LEARN;
-
-      if (enable_flags)
-	bd_set_flags (vm, bd_index, enable_flags, 1 /* enable */ );
-
-      if (disable_flags)
-	bd_set_flags (vm, bd_index, disable_flags, 0 /* disable */ );
-
-      bd_set_mac_age (vm, bd_index, mp->mac_age);
-    }
-  else
-    rv = bd_delete_bd_index (bdm, bd_id);
-
-  REPLY_MACRO (VL_API_BRIDGE_DOMAIN_ADD_DEL_REPLY);
-}
-
-static void
-vl_api_bridge_domain_details_t_handler (vl_api_bridge_domain_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-  vl_api_bridge_domain_sw_if_details_t_handler
-  (vl_api_bridge_domain_sw_if_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-send_bridge_domain_details (unix_shared_memory_queue_t * q,
-			    l2_bridge_domain_t * bd_config,
-			    u32 n_sw_ifs, u32 context)
-{
-  vl_api_bridge_domain_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_BRIDGE_DOMAIN_DETAILS);
-  mp->bd_id = ntohl (bd_config->bd_id);
-  mp->flood = bd_feature_flood (bd_config);
-  mp->uu_flood = bd_feature_uu_flood (bd_config);
-  mp->forward = bd_feature_forward (bd_config);
-  mp->learn = bd_feature_learn (bd_config);
-  mp->arp_term = bd_feature_arp_term (bd_config);
-  mp->bvi_sw_if_index = ntohl (bd_config->bvi_sw_if_index);
-  mp->mac_age = bd_config->mac_age;
-  mp->n_sw_ifs = ntohl (n_sw_ifs);
-  mp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-send_bd_sw_if_details (l2input_main_t * l2im,
-		       unix_shared_memory_queue_t * q,
-		       l2_flood_member_t * member, u32 bd_id, u32 context)
-{
-  vl_api_bridge_domain_sw_if_details_t *mp;
-  l2_input_config_t *input_cfg;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_BRIDGE_DOMAIN_SW_IF_DETAILS);
-  mp->bd_id = ntohl (bd_id);
-  mp->sw_if_index = ntohl (member->sw_if_index);
-  input_cfg = vec_elt_at_index (l2im->configs, member->sw_if_index);
-  mp->shg = input_cfg->shg;
-  mp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_bridge_domain_dump_t_handler (vl_api_bridge_domain_dump_t * mp)
-{
-  bd_main_t *bdm = &bd_main;
-  l2input_main_t *l2im = &l2input_main;
-  unix_shared_memory_queue_t *q;
-  l2_bridge_domain_t *bd_config;
-  u32 bd_id, bd_index;
-  u32 end;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-
-  if (q == 0)
-    return;
-
-  bd_id = ntohl (mp->bd_id);
-
-  bd_index = (bd_id == ~0) ? 0 : bd_find_or_add_bd_index (bdm, bd_id);
-  end = (bd_id == ~0) ? vec_len (l2im->bd_configs) : bd_index + 1;
-  for (; bd_index < end; bd_index++)
-    {
-      bd_config = l2input_bd_config_from_index (l2im, bd_index);
-      /* skip dummy bd_id 0 */
-      if (bd_config && (bd_config->bd_id > 0))
-	{
-	  u32 n_sw_ifs;
-	  l2_flood_member_t *m;
-
-	  n_sw_ifs = vec_len (bd_config->members);
-	  send_bridge_domain_details (q, bd_config, n_sw_ifs, mp->context);
-
-	  vec_foreach (m, bd_config->members)
-	  {
-	    send_bd_sw_if_details (l2im, q, m, bd_config->bd_id, mp->context);
-	  }
-	}
-    }
-}
-
-static void
-vl_api_l2fib_add_del_t_handler (vl_api_l2fib_add_del_t * mp)
-{
-  bd_main_t *bdm = &bd_main;
-  l2input_main_t *l2im = &l2input_main;
-  vl_api_l2fib_add_del_reply_t *rmp;
-  int rv = 0;
-  u64 mac = 0;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  u32 bd_id = ntohl (mp->bd_id);
-  u32 bd_index;
-  u32 static_mac;
-  u32 filter_mac;
-  u32 bvi_mac;
-  uword *p;
-
-  mac = mp->mac;
-
-  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-  if (!p)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_ENTRY;
-      goto bad_sw_if_index;
-    }
-  bd_index = p[0];
-
-  if (mp->is_add)
-    {
-      filter_mac = mp->filter_mac ? 1 : 0;
-      if (filter_mac == 0)
-	{
-	  VALIDATE_SW_IF_INDEX (mp);
-	  if (vec_len (l2im->configs) <= sw_if_index)
-	    {
-	      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-	      goto bad_sw_if_index;
-	    }
-	  else
-	    {
-	      l2_input_config_t *config;
-	      config = vec_elt_at_index (l2im->configs, sw_if_index);
-	      if (config->bridge == 0)
-		{
-		  rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-		  goto bad_sw_if_index;
-		}
-	    }
-	}
-      static_mac = mp->static_mac ? 1 : 0;
-      bvi_mac = mp->bvi_mac ? 1 : 0;
-      l2fib_add_entry (mac, bd_index, sw_if_index, static_mac, filter_mac,
-		       bvi_mac);
-    }
-  else
-    {
-      l2fib_del_entry (mac, bd_index);
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_L2FIB_ADD_DEL_REPLY);
-}
-
-static void
-vl_api_l2_flags_t_handler (vl_api_l2_flags_t * mp)
-{
-  vl_api_l2_flags_reply_t *rmp;
-  int rv = 0;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  u32 flags = ntohl (mp->feature_bitmap);
-  u32 rbm = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-#define _(a,b) \
-    if (flags & L2INPUT_FEAT_ ## a) \
-        rbm = l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_ ## a, mp->is_set);
-  foreach_l2input_feat;
-#undef _
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_L2_FLAGS_REPLY,
-  ({
-    rmp->resulting_feature_bitmap = ntohl(rbm);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_bridge_flags_t_handler (vl_api_bridge_flags_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  bd_main_t *bdm = &bd_main;
-  vl_api_bridge_flags_reply_t *rmp;
-  int rv = 0;
-  u32 bd_id = ntohl (mp->bd_id);
-  u32 bd_index;
-  u32 flags = ntohl (mp->feature_bitmap);
-  uword *p;
-
-  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-  if (p == 0)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_ENTRY;
-      goto out;
-    }
-
-  bd_index = p[0];
-
-  bd_set_flags (vm, bd_index, flags, mp->is_set);
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_BRIDGE_FLAGS_REPLY,
-  ({
-    rmp->resulting_feature_bitmap = ntohl(flags);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_bd_ip_mac_add_del_t_handler (vl_api_bd_ip_mac_add_del_t * mp)
-{
-  bd_main_t *bdm = &bd_main;
-  vl_api_bd_ip_mac_add_del_reply_t *rmp;
-  int rv = 0;
-  u32 bd_id = ntohl (mp->bd_id);
-  u32 bd_index;
-  uword *p;
-
-  p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-  if (p == 0)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_ENTRY;
-      goto out;
-    }
-
-  bd_index = p[0];
-  if (bd_add_del_ip_mac (bd_index, mp->ip_address,
-			 mp->mac_address, mp->is_ipv6, mp->is_add))
-    rv = VNET_API_ERROR_UNSPECIFIED;
-
-out:
-  REPLY_MACRO (VL_API_BD_IP_MAC_ADD_DEL_REPLY);
-}
-
-static void
-vl_api_create_vlan_subif_t_handler (vl_api_create_vlan_subif_t * mp)
-{
-  vl_api_create_vlan_subif_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 hw_if_index, sw_if_index = (u32) ~ 0;
-  vnet_hw_interface_t *hi;
-  int rv = 0;
-  u32 id;
-  vnet_sw_interface_t template;
-  uword *p;
-  vnet_interface_main_t *im = &vnm->interface_main;
-  u64 sup_and_sub_key;
-  u64 *kp;
-  unix_shared_memory_queue_t *q;
-  clib_error_t *error;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  hw_if_index = ntohl (mp->sw_if_index);
-  hi = vnet_get_hw_interface (vnm, hw_if_index);
-
-  id = ntohl (mp->vlan_id);
-  if (id == 0 || id > 4095)
-    {
-      rv = VNET_API_ERROR_INVALID_VLAN;
-      goto out;
-    }
-
-  sup_and_sub_key = ((u64) (hi->sw_if_index) << 32) | (u64) id;
-
-  p = hash_get_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key);
-  if (p)
-    {
-      rv = VNET_API_ERROR_VLAN_ALREADY_EXISTS;
-      goto out;
-    }
-
-  kp = clib_mem_alloc (sizeof (*kp));
-  *kp = sup_and_sub_key;
-
-  memset (&template, 0, sizeof (template));
-  template.type = VNET_SW_INTERFACE_TYPE_SUB;
-  template.sup_sw_if_index = hi->sw_if_index;
-  template.sub.id = id;
-  template.sub.eth.raw_flags = 0;
-  template.sub.eth.flags.one_tag = 1;
-  template.sub.eth.outer_vlan_id = id;
-  template.sub.eth.flags.exact_match = 1;
-
-  error = vnet_create_sw_interface (vnm, &template, &sw_if_index);
-  if (error)
-    {
-      clib_error_report (error);
-      rv = VNET_API_ERROR_INVALID_REGISTRATION;
-      goto out;
-    }
-  hash_set (hi->sub_interface_sw_if_index_by_id, id, sw_if_index);
-  hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, sw_if_index);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-out:
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_CREATE_VLAN_SUBIF_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = ntohl (rv);
-  rmp->sw_if_index = ntohl (sw_if_index);
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_create_subif_t_handler (vl_api_create_subif_t * mp)
-{
-  vl_api_create_subif_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index = ~0;
-  int rv = 0;
-  u32 sub_id;
-  vnet_sw_interface_t *si;
-  vnet_hw_interface_t *hi;
-  vnet_sw_interface_t template;
-  uword *p;
-  vnet_interface_main_t *im = &vnm->interface_main;
-  u64 sup_and_sub_key;
-  u64 *kp;
-  clib_error_t *error;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  si = vnet_get_sup_sw_interface (vnm, ntohl (mp->sw_if_index));
-  hi = vnet_get_sup_hw_interface (vnm, ntohl (mp->sw_if_index));
-
-  if (hi->bond_info == VNET_HW_INTERFACE_BOND_INFO_SLAVE)
-    {
-      rv = VNET_API_ERROR_BOND_SLAVE_NOT_ALLOWED;
-      goto out;
-    }
-
-  sw_if_index = si->sw_if_index;
-  sub_id = ntohl (mp->sub_id);
-
-  sup_and_sub_key = ((u64) (sw_if_index) << 32) | (u64) sub_id;
-
-  p = hash_get_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key);
-  if (p)
-    {
-      if (CLIB_DEBUG > 0)
-	clib_warning ("sup sw_if_index %d, sub id %d already exists\n",
-		      sw_if_index, sub_id);
-      rv = VNET_API_ERROR_SUBIF_ALREADY_EXISTS;
-      goto out;
-    }
-
-  kp = clib_mem_alloc (sizeof (*kp));
-  *kp = sup_and_sub_key;
-
-  memset (&template, 0, sizeof (template));
-  template.type = VNET_SW_INTERFACE_TYPE_SUB;
-  template.sup_sw_if_index = sw_if_index;
-  template.sub.id = sub_id;
-  template.sub.eth.flags.no_tags = mp->no_tags;
-  template.sub.eth.flags.one_tag = mp->one_tag;
-  template.sub.eth.flags.two_tags = mp->two_tags;
-  template.sub.eth.flags.dot1ad = mp->dot1ad;
-  template.sub.eth.flags.exact_match = mp->exact_match;
-  template.sub.eth.flags.default_sub = mp->default_sub;
-  template.sub.eth.flags.outer_vlan_id_any = mp->outer_vlan_id_any;
-  template.sub.eth.flags.inner_vlan_id_any = mp->inner_vlan_id_any;
-  template.sub.eth.outer_vlan_id = ntohs (mp->outer_vlan_id);
-  template.sub.eth.inner_vlan_id = ntohs (mp->inner_vlan_id);
-
-  error = vnet_create_sw_interface (vnm, &template, &sw_if_index);
-  if (error)
-    {
-      clib_error_report (error);
-      rv = VNET_API_ERROR_SUBIF_CREATE_FAILED;
-      goto out;
-    }
-
-  hash_set (hi->sub_interface_sw_if_index_by_id, sub_id, sw_if_index);
-  hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, sw_if_index);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-out:
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CREATE_SUBIF_REPLY,
-  ({
-    rmp->sw_if_index = ntohl(sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_mpls_tunnel_add_del_t_handler (vl_api_mpls_tunnel_add_del_t * mp)
-{
-  vl_api_mpls_tunnel_add_del_reply_t *rmp;
-  int rv = 0;
-  stats_main_t *sm = &stats_main;
-  u32 tunnel_sw_if_index;
-  int ii;
-
-  dslock (sm, 1 /* release hint */ , 5 /* tag */ );
-
-  if (mp->mt_is_add)
-    {
-      fib_route_path_t rpath, *rpaths = NULL;
-      mpls_label_t *label_stack = NULL;
-
-      memset (&rpath, 0, sizeof (rpath));
-
-      if (mp->mt_next_hop_proto_is_ip4)
-	{
-	  rpath.frp_proto = FIB_PROTOCOL_IP4;
-	  clib_memcpy (&rpath.frp_addr.ip4,
-		       mp->mt_next_hop, sizeof (rpath.frp_addr.ip4));
-	}
-      else
-	{
-	  rpath.frp_proto = FIB_PROTOCOL_IP6;
-	  clib_memcpy (&rpath.frp_addr.ip6,
-		       mp->mt_next_hop, sizeof (rpath.frp_addr.ip6));
-	}
-      rpath.frp_sw_if_index = ntohl (mp->mt_next_hop_sw_if_index);
-
-      for (ii = 0; ii < mp->mt_next_hop_n_out_labels; ii++)
-	vec_add1 (label_stack, ntohl (mp->mt_next_hop_out_label_stack[ii]));
-
-      vec_add1 (rpaths, rpath);
-
-      vnet_mpls_tunnel_add (rpaths, label_stack,
-			    mp->mt_l2_only, &tunnel_sw_if_index);
-      vec_free (rpaths);
-      vec_free (label_stack);
-    }
-  else
-    {
-      tunnel_sw_if_index = ntohl (mp->mt_sw_if_index);
-      vnet_mpls_tunnel_del (tunnel_sw_if_index);
-    }
-
-  dsunlock (sm);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_MPLS_TUNNEL_ADD_DEL_REPLY,
-  ({
-    rmp->sw_if_index = ntohl(tunnel_sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_proxy_arp_add_del_t_handler (vl_api_proxy_arp_add_del_t * mp)
-{
-  vl_api_proxy_arp_add_del_reply_t *rmp;
-  u32 fib_index;
-  int rv;
-  ip4_main_t *im = &ip4_main;
-  stats_main_t *sm = &stats_main;
-  int vnet_proxy_arp_add_del (ip4_address_t * lo_addr,
-			      ip4_address_t * hi_addr,
-			      u32 fib_index, int is_del);
-  uword *p;
-
-  dslock (sm, 1 /* release hint */ , 6 /* tag */ );
-
-  p = hash_get (im->fib_index_by_table_id, ntohl (mp->vrf_id));
-
-  if (!p)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_FIB;
-      goto out;
-    }
-
-  fib_index = p[0];
-
-  rv = vnet_proxy_arp_add_del ((ip4_address_t *) mp->low_address,
-			       (ip4_address_t *) mp->hi_address,
-			       fib_index, mp->is_add == 0);
-
-out:
-  dsunlock (sm);
-  REPLY_MACRO (VL_API_PROXY_ARP_ADD_DEL_REPLY);
-}
-
-static void
-  vl_api_proxy_arp_intfc_enable_disable_t_handler
-  (vl_api_proxy_arp_intfc_enable_disable_t * mp)
-{
-  int rv = 0;
-  vnet_main_t *vnm = vnet_get_main ();
-  vl_api_proxy_arp_intfc_enable_disable_reply_t *rmp;
-  vnet_sw_interface_t *si;
-  u32 sw_if_index;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
-    {
-      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-      goto out;
-    }
-
-  si = vnet_get_sw_interface (vnm, sw_if_index);
-
-  ASSERT (si);
-
-  if (mp->enable_disable)
-    si->flags |= VNET_SW_INTERFACE_FLAG_PROXY_ARP;
-  else
-    si->flags &= ~VNET_SW_INTERFACE_FLAG_PROXY_ARP;
-
-  BAD_SW_IF_INDEX_LABEL;
-
-out:
-  REPLY_MACRO (VL_API_PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY);
-}
-
-static void
-vl_api_is_address_reachable_t_handler (vl_api_is_address_reachable_t * mp)
-{
-#if 0
-  vpe_main_t *rm = &vpe_main;
-  ip4_main_t *im4 = &ip4_main;
-  ip6_main_t *im6 = &ip6_main;
-  ip_lookup_main_t *lm;
-  union
-  {
-    ip4_address_t ip4;
-    ip6_address_t ip6;
-  } addr;
-  u32 adj_index, sw_if_index;
-  vl_api_is_address_reachable_t *rmp;
-  ip_adjacency_t *adj;
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    {
-      increment_missing_api_client_counter (rm->vlib_main);
-      return;
-    }
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  clib_memcpy (rmp, mp, sizeof (*rmp));
-
-  sw_if_index = mp->next_hop_sw_if_index;
-  clib_memcpy (&addr, mp->address, sizeof (addr));
-  if (mp->is_ipv6)
-    {
-      lm = &im6->lookup_main;
-      adj_index = ip6_fib_lookup (im6, sw_if_index, &addr.ip6);
-    }
-  else
-    {
-      lm = &im4->lookup_main;
-      // FIXME NOT an ADJ
-      adj_index = ip4_fib_lookup (im4, sw_if_index, &addr.ip4);
-    }
-  if (adj_index == ~0)
-    {
-      rmp->is_error = 1;
-      goto send;
-    }
-  adj = ip_get_adjacency (lm, adj_index);
-
-  if (adj->lookup_next_index == IP_LOOKUP_NEXT_REWRITE
-      && adj->rewrite_header.sw_if_index == sw_if_index)
-    {
-      rmp->is_known = 1;
-    }
-  else
-    {
-      if (adj->lookup_next_index == IP_LOOKUP_NEXT_ARP
-	  && adj->rewrite_header.sw_if_index == sw_if_index)
-	{
-	  if (mp->is_ipv6)
-	    ip6_probe_neighbor (rm->vlib_main, &addr.ip6, sw_if_index);
-	  else
-	    ip4_probe_neighbor (rm->vlib_main, &addr.ip4, sw_if_index);
-	}
-      else if (adj->lookup_next_index == IP_LOOKUP_NEXT_DROP)
-	{
-	  rmp->is_known = 1;
-	  goto send;
-	}
-      rmp->is_known = 0;
-    }
-
-send:
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-#endif
-}
-
-static void
-  vl_api_sw_interface_set_mpls_enable_t_handler
-  (vl_api_sw_interface_set_mpls_enable_t * mp)
-{
-  vl_api_sw_interface_set_mpls_enable_reply_t *rmp;
-  int rv = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  mpls_sw_interface_enable_disable (&mpls_main,
-				    ntohl (mp->sw_if_index), mp->enable);
-
-  BAD_SW_IF_INDEX_LABEL;
-  REPLY_MACRO (VL_API_SW_INTERFACE_SET_MPLS_ENABLE_REPLY);
-}
-
-void
-send_oam_event (oam_target_t * t)
-{
-  vpe_api_main_t *vam = &vpe_api_main;
-  unix_shared_memory_queue_t *q;
-  vpe_client_registration_t *reg;
-  vl_api_oam_event_t *mp;
-
-  /* *INDENT-OFF* */
-  pool_foreach(reg, vam->oam_events_registrations,
-  ({
-    q = vl_api_client_index_to_input_queue (reg->client_index);
-    if (q)
-      {
-        mp = vl_msg_api_alloc (sizeof (*mp));
-        mp->_vl_msg_id = ntohs (VL_API_OAM_EVENT);
-        clib_memcpy (mp->dst_address, &t->dst_address,
-                     sizeof (mp->dst_address));
-        mp->state = t->state;
-        vl_msg_api_send_shmem (q, (u8 *)&mp);
-      }
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_oam_add_del_t_handler (vl_api_oam_add_del_t * mp)
-{
-  vl_api_oam_add_del_reply_t *rmp;
-  int rv;
-
-  rv = vpe_oam_add_del_target ((ip4_address_t *) mp->src_address,
-			       (ip4_address_t *) mp->dst_address,
-			       ntohl (mp->vrf_id), (int) (mp->is_add));
-
-  REPLY_MACRO (VL_API_OAM_ADD_DEL_REPLY);
-}
-
-static void
-vl_api_vnet_get_summary_stats_t_handler (vl_api_vnet_get_summary_stats_t * mp)
-{
-  stats_main_t *sm = &stats_main;
-  vnet_interface_main_t *im = sm->interface_main;
-  vl_api_vnet_summary_stats_reply_t *rmp;
-  vlib_combined_counter_main_t *cm;
-  vlib_counter_t v;
-  int i, which;
-  u64 total_pkts[VLIB_N_RX_TX];
-  u64 total_bytes[VLIB_N_RX_TX];
-
-  unix_shared_memory_queue_t *q =
-    vl_api_client_index_to_input_queue (mp->client_index);
-
-  if (!q)
-    return;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_VNET_SUMMARY_STATS_REPLY);
-  rmp->context = mp->context;
-  rmp->retval = 0;
-
-  memset (total_pkts, 0, sizeof (total_pkts));
-  memset (total_bytes, 0, sizeof (total_bytes));
-
-  vnet_interface_counter_lock (im);
-
-  vec_foreach (cm, im->combined_sw_if_counters)
-  {
-    which = cm - im->combined_sw_if_counters;
-
-    for (i = 0; i < vec_len (cm->maxi); i++)
-      {
-	vlib_get_combined_counter (cm, i, &v);
-	total_pkts[which] += v.packets;
-	total_bytes[which] += v.bytes;
-      }
-  }
-  vnet_interface_counter_unlock (im);
-
-  rmp->total_pkts[VLIB_RX] = clib_host_to_net_u64 (total_pkts[VLIB_RX]);
-  rmp->total_bytes[VLIB_RX] = clib_host_to_net_u64 (total_bytes[VLIB_RX]);
-  rmp->total_pkts[VLIB_TX] = clib_host_to_net_u64 (total_pkts[VLIB_TX]);
-  rmp->total_bytes[VLIB_TX] = clib_host_to_net_u64 (total_bytes[VLIB_TX]);
-  rmp->vector_rate =
-    clib_host_to_net_u64 (vlib_last_vector_length_per_node (sm->vlib_main));
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED (struct {
-  ip4_address_t address;
-  u32 address_length: 6;
-  u32 index:26;
-}) ip4_route_t;
-/* *INDENT-ON* */
-
-static int
-ip4_reset_fib_t_handler (vl_api_reset_fib_t * mp)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  ip4_main_t *im4 = &ip4_main;
-  static u32 *sw_if_indices_to_shut;
-  stats_main_t *sm = &stats_main;
-  fib_table_t *fib_table;
-  ip4_fib_t *fib;
-  u32 sw_if_index;
-  int i;
-  int rv = VNET_API_ERROR_NO_SUCH_FIB;
-  u32 target_fib_id = ntohl (mp->vrf_id);
-
-  dslock (sm, 1 /* release hint */ , 8 /* tag */ );
-
-  /* *INDENT-OFF* */
-  pool_foreach (fib_table, im4->fibs,
-  ({
-    fib = &fib_table->v4;
-    vnet_sw_interface_t * si;
-
-    if (fib->table_id != target_fib_id)
-      continue;
-
-    /* remove any mpls encap/decap labels */
-    mpls_fib_reset_labels (fib->table_id);
-
-    /* remove any proxy arps in this fib */
-    vnet_proxy_arp_fib_reset (fib->table_id);
-
-    /* Set the flow hash for this fib to the default */
-    vnet_set_ip4_flow_hash (fib->table_id, IP_FLOW_HASH_DEFAULT);
-
-    vec_reset_length (sw_if_indices_to_shut);
-
-    /* Shut down interfaces in this FIB / clean out intfc routes */
-    pool_foreach (si, im->sw_interfaces,
-    ({
-      u32 sw_if_index = si->sw_if_index;
-
-      if (sw_if_index < vec_len (im4->fib_index_by_sw_if_index)
-          && (im4->fib_index_by_sw_if_index[si->sw_if_index] ==
-              fib->index))
-        vec_add1 (sw_if_indices_to_shut, si->sw_if_index);
-    }));
-
-    for (i = 0; i < vec_len (sw_if_indices_to_shut); i++) {
-      sw_if_index = sw_if_indices_to_shut[i];
-      // vec_foreach (sw_if_index, sw_if_indices_to_shut) {
-
-      u32 flags = vnet_sw_interface_get_flags (vnm, sw_if_index);
-      flags &= ~(VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-      vnet_sw_interface_set_flags (vnm, sw_if_index, flags);
-    }
-
-    fib_table_flush(fib->index, FIB_PROTOCOL_IP4, FIB_SOURCE_API);
-    fib_table_flush(fib->index, FIB_PROTOCOL_IP4, FIB_SOURCE_INTERFACE);
-
-    rv = 0;
-    break;
-    })); /* pool_foreach (fib) */
-    /* *INDENT-ON* */
-
-  dsunlock (sm);
-  return rv;
-}
-
-static int
-ip6_reset_fib_t_handler (vl_api_reset_fib_t * mp)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  ip6_main_t *im6 = &ip6_main;
-  stats_main_t *sm = &stats_main;
-  static u32 *sw_if_indices_to_shut;
-  fib_table_t *fib_table;
-  ip6_fib_t *fib;
-  u32 sw_if_index;
-  int i;
-  int rv = VNET_API_ERROR_NO_SUCH_FIB;
-  u32 target_fib_id = ntohl (mp->vrf_id);
-
-  dslock (sm, 1 /* release hint */ , 9 /* tag */ );
-
-  /* *INDENT-OFF* */
-  pool_foreach (fib_table, im6->fibs,
-  ({
-    vnet_sw_interface_t * si;
-    fib = &(fib_table->v6);
-
-    if (fib->table_id != target_fib_id)
-      continue;
-
-    vec_reset_length (sw_if_indices_to_shut);
-
-    /* Shut down interfaces in this FIB / clean out intfc routes */
-    pool_foreach (si, im->sw_interfaces,
-                  ({
-                    if (im6->fib_index_by_sw_if_index[si->sw_if_index] ==
-                        fib->index)
-                      vec_add1 (sw_if_indices_to_shut, si->sw_if_index);
-                  }));
-
-    for (i = 0; i < vec_len (sw_if_indices_to_shut); i++) {
-      sw_if_index = sw_if_indices_to_shut[i];
-      // vec_foreach (sw_if_index, sw_if_indices_to_shut) {
-
-      u32 flags = vnet_sw_interface_get_flags (vnm, sw_if_index);
-      flags &= ~(VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-      vnet_sw_interface_set_flags (vnm, sw_if_index, flags);
-    }
-
-    fib_table_flush(fib->index, FIB_PROTOCOL_IP6, FIB_SOURCE_API);
-    fib_table_flush(fib->index, FIB_PROTOCOL_IP6, FIB_SOURCE_INTERFACE);
-
-    rv = 0;
-    break;
-  })); /* pool_foreach (fib) */
-  /* *INDENT-ON* */
-
-  dsunlock (sm);
-  return rv;
-}
-
-static void
-vl_api_reset_fib_t_handler (vl_api_reset_fib_t * mp)
-{
-  int rv;
-  vl_api_reset_fib_reply_t *rmp;
-
-  if (mp->is_ipv6)
-    rv = ip6_reset_fib_t_handler (mp);
-  else
-    rv = ip4_reset_fib_t_handler (mp);
-
-  REPLY_MACRO (VL_API_RESET_FIB_REPLY);
-}
-
-
-static void
-dhcpv4_proxy_config (vl_api_dhcp_proxy_config_t * mp)
-{
-  vl_api_dhcp_proxy_config_reply_t *rmp;
-  int rv;
-
-  rv = dhcp_proxy_set_server ((ip4_address_t *) (&mp->dhcp_server),
-			      (ip4_address_t *) (&mp->dhcp_src_address),
-			      (u32) ntohl (mp->vrf_id),
-			      (int) mp->insert_circuit_id,
-			      (int) (mp->is_add == 0));
-
-  REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_REPLY);
-}
-
-
-static void
-dhcpv6_proxy_config (vl_api_dhcp_proxy_config_t * mp)
-{
-  vl_api_dhcp_proxy_config_reply_t *rmp;
-  int rv = -1;
-
-  rv = dhcpv6_proxy_set_server ((ip6_address_t *) (&mp->dhcp_server),
-				(ip6_address_t *) (&mp->dhcp_src_address),
-				(u32) ntohl (mp->vrf_id),
-				(int) mp->insert_circuit_id,
-				(int) (mp->is_add == 0));
-
-  REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_REPLY);
-}
-
-static void
-dhcpv4_proxy_config_2 (vl_api_dhcp_proxy_config_2_t * mp)
-{
-  vl_api_dhcp_proxy_config_reply_t *rmp;
-  int rv;
-
-  rv = dhcp_proxy_set_server_2 ((ip4_address_t *) (&mp->dhcp_server),
-				(ip4_address_t *) (&mp->dhcp_src_address),
-				(u32) ntohl (mp->rx_vrf_id),
-				(u32) ntohl (mp->server_vrf_id),
-				(int) mp->insert_circuit_id,
-				(int) (mp->is_add == 0));
-
-  REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_2_REPLY);
-}
-
-
-static void
-dhcpv6_proxy_config_2 (vl_api_dhcp_proxy_config_2_t * mp)
-{
-  vl_api_dhcp_proxy_config_reply_t *rmp;
-  int rv = -1;
-
-  rv = dhcpv6_proxy_set_server_2 ((ip6_address_t *) (&mp->dhcp_server),
-				  (ip6_address_t *) (&mp->dhcp_src_address),
-				  (u32) ntohl (mp->rx_vrf_id),
-				  (u32) ntohl (mp->server_vrf_id),
-				  (int) mp->insert_circuit_id,
-				  (int) (mp->is_add == 0));
-
-  REPLY_MACRO (VL_API_DHCP_PROXY_CONFIG_2_REPLY);
-}
-
-
-static void
-vl_api_dhcp_proxy_set_vss_t_handler (vl_api_dhcp_proxy_set_vss_t * mp)
-{
-  vl_api_dhcp_proxy_set_vss_reply_t *rmp;
-  int rv;
-  if (!mp->is_ipv6)
-    rv = dhcp_proxy_set_option82_vss (ntohl (mp->tbl_id),
-				      ntohl (mp->oui),
-				      ntohl (mp->fib_id),
-				      (int) mp->is_add == 0);
-  else
-    rv = dhcpv6_proxy_set_vss (ntohl (mp->tbl_id),
-			       ntohl (mp->oui),
-			       ntohl (mp->fib_id), (int) mp->is_add == 0);
-
-  REPLY_MACRO (VL_API_DHCP_PROXY_SET_VSS_REPLY);
-}
-
-
-static void vl_api_dhcp_proxy_config_t_handler
-  (vl_api_dhcp_proxy_config_t * mp)
-{
-  if (mp->is_ipv6 == 0)
-    dhcpv4_proxy_config (mp);
-  else
-    dhcpv6_proxy_config (mp);
-}
-
-static void vl_api_dhcp_proxy_config_2_t_handler
-  (vl_api_dhcp_proxy_config_2_t * mp)
-{
-  if (mp->is_ipv6 == 0)
-    dhcpv4_proxy_config_2 (mp);
-  else
-    dhcpv6_proxy_config_2 (mp);
-}
-
-void
-dhcp_compl_event_callback (u32 client_index, u32 pid, u8 * hostname,
-			   u8 is_ipv6, u8 * host_address, u8 * router_address,
-			   u8 * host_mac)
-{
-  unix_shared_memory_queue_t *q;
-  vl_api_dhcp_compl_event_t *mp;
-
-  q = vl_api_client_index_to_input_queue (client_index);
-  if (!q)
-    return;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  mp->client_index = client_index;
-  mp->pid = pid;
-  mp->is_ipv6 = is_ipv6;
-  clib_memcpy (&mp->hostname, hostname, vec_len (hostname));
-  mp->hostname[vec_len (hostname) + 1] = '\n';
-  clib_memcpy (&mp->host_address[0], host_address, 16);
-  clib_memcpy (&mp->router_address[0], router_address, 16);
-
-  if (NULL != host_mac)
-    clib_memcpy (&mp->host_mac[0], host_mac, 6);
-
-  mp->_vl_msg_id = ntohs (VL_API_DHCP_COMPL_EVENT);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void vl_api_dhcp_client_config_t_handler
-  (vl_api_dhcp_client_config_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_dhcp_client_config_reply_t *rmp;
-  int rv = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = dhcp_client_config (vm, ntohl (mp->sw_if_index),
-			   mp->hostname, mp->is_add, mp->client_index,
-			   mp->want_dhcp_event ? dhcp_compl_event_callback :
-			   NULL, mp->pid);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_DHCP_CLIENT_CONFIG_REPLY);
-}
-
-static void
-vl_api_create_loopback_t_handler (vl_api_create_loopback_t * mp)
-{
-  vl_api_create_loopback_reply_t *rmp;
-  u32 sw_if_index;
-  int rv;
-
-  rv = vnet_create_loopback_interface (&sw_if_index, mp->mac_address);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CREATE_LOOPBACK_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_delete_loopback_t_handler (vl_api_delete_loopback_t * mp)
-{
-  vl_api_delete_loopback_reply_t *rmp;
-  u32 sw_if_index;
-  int rv;
-
-  sw_if_index = ntohl (mp->sw_if_index);
-  rv = vnet_delete_loopback_interface (sw_if_index);
-
-  REPLY_MACRO (VL_API_DELETE_LOOPBACK_REPLY);
-}
-
-static void
-vl_api_control_ping_t_handler (vl_api_control_ping_t * mp)
-{
-  vl_api_control_ping_reply_t *rmp;
-  int rv = 0;
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CONTROL_PING_REPLY,
-  ({
-    rmp->vpe_pid = ntohl (getpid());
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-shmem_cli_output (uword arg, u8 * buffer, uword buffer_bytes)
-{
-  u8 **shmem_vecp = (u8 **) arg;
-  u8 *shmem_vec;
-  void *oldheap;
-  api_main_t *am = &api_main;
-  u32 offset;
-
-  shmem_vec = *shmem_vecp;
-
-  offset = vec_len (shmem_vec);
-
-  pthread_mutex_lock (&am->vlib_rp->mutex);
-  oldheap = svm_push_data_heap (am->vlib_rp);
-
-  vec_validate (shmem_vec, offset + buffer_bytes - 1);
-
-  clib_memcpy (shmem_vec + offset, buffer, buffer_bytes);
-
-  svm_pop_heap (oldheap);
-  pthread_mutex_unlock (&am->vlib_rp->mutex);
-
-  *shmem_vecp = shmem_vec;
-}
-
-
-static void
-vl_api_cli_request_t_handler (vl_api_cli_request_t * mp)
-{
-  vl_api_cli_reply_t *rp;
-  unix_shared_memory_queue_t *q;
-  vlib_main_t *vm = vlib_get_main ();
-  api_main_t *am = &api_main;
-  unformat_input_t input;
-  u8 *shmem_vec = 0;
-  void *oldheap;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  rp = vl_msg_api_alloc (sizeof (*rp));
-  rp->_vl_msg_id = ntohs (VL_API_CLI_REPLY);
-  rp->context = mp->context;
-
-  unformat_init_vector (&input, (u8 *) (uword) mp->cmd_in_shmem);
-
-  vlib_cli_input (vm, &input, shmem_cli_output, (uword) & shmem_vec);
-
-  pthread_mutex_lock (&am->vlib_rp->mutex);
-  oldheap = svm_push_data_heap (am->vlib_rp);
-
-  vec_add1 (shmem_vec, 0);
-
-  svm_pop_heap (oldheap);
-  pthread_mutex_unlock (&am->vlib_rp->mutex);
-
-  rp->reply_in_shmem = (uword) shmem_vec;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rp);
-}
-
-static void
-inband_cli_output (uword arg, u8 * buffer, uword buffer_bytes)
-{
-  u8 **mem_vecp = (u8 **) arg;
-  u8 *mem_vec = *mem_vecp;
-  u32 offset = vec_len (mem_vec);
-
-  vec_validate (mem_vec, offset + buffer_bytes - 1);
-  clib_memcpy (mem_vec + offset, buffer, buffer_bytes);
-  *mem_vecp = mem_vec;
-}
-
-static void
-vl_api_cli_inband_t_handler (vl_api_cli_inband_t * mp)
-{
-  vl_api_cli_inband_reply_t *rmp;
-  int rv = 0;
-  unix_shared_memory_queue_t *q;
-  vlib_main_t *vm = vlib_get_main ();
-  unformat_input_t input;
-  u8 *out_vec = 0;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  unformat_init_string (&input, (char *) mp->cmd, ntohl (mp->length));
-  vlib_cli_input (vm, &input, inband_cli_output, (uword) & out_vec);
-
-  u32 len = vec_len (out_vec);
-  /* *INDENT-OFF* */
-  REPLY_MACRO3(VL_API_CLI_INBAND_REPLY, len,
-  ({
-    rmp->length = htonl (len);
-    clib_memcpy (rmp->reply, out_vec, len);
-  }));
-  /* *INDENT-ON* */
-  vec_free (out_vec);
-}
-
-static void
-vl_api_set_arp_neighbor_limit_t_handler (vl_api_set_arp_neighbor_limit_t * mp)
-{
-  int rv;
-  vl_api_set_arp_neighbor_limit_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  clib_error_t *error;
-
-  vnm->api_errno = 0;
-
-  if (mp->is_ipv6)
-    error = ip6_set_neighbor_limit (ntohl (mp->arp_neighbor_limit));
-  else
-    error = ip4_set_arp_limit (ntohl (mp->arp_neighbor_limit));
-
-  if (error)
-    {
-      clib_error_report (error);
-      rv = VNET_API_ERROR_UNSPECIFIED;
-    }
-  else
-    {
-      rv = vnm->api_errno;
-    }
-
-  REPLY_MACRO (VL_API_SET_ARP_NEIGHBOR_LIMIT_REPLY);
-}
-
-static void vl_api_sr_tunnel_add_del_t_handler
-  (vl_api_sr_tunnel_add_del_t * mp)
-{
-#if IP6SR == 0
-  clib_warning ("unimplemented");
-#else
-  ip6_sr_add_del_tunnel_args_t _a, *a = &_a;
-  int rv = 0;
-  vl_api_sr_tunnel_add_del_reply_t *rmp;
-  ip6_address_t *segments = 0, *seg;
-  ip6_address_t *tags = 0, *tag;
-  ip6_address_t *this_address;
-  int i;
-
-  if (mp->n_segments == 0)
-    {
-      rv = -11;
-      goto out;
-    }
-
-  memset (a, 0, sizeof (*a));
-  a->src_address = (ip6_address_t *) & mp->src_address;
-  a->dst_address = (ip6_address_t *) & mp->dst_address;
-  a->dst_mask_width = mp->dst_mask_width;
-  a->flags_net_byte_order = mp->flags_net_byte_order;
-  a->is_del = (mp->is_add == 0);
-  a->rx_table_id = ntohl (mp->outer_vrf_id);
-  a->tx_table_id = ntohl (mp->inner_vrf_id);
-
-  a->name = format (0, "%s", mp->name);
-  if (!(vec_len (a->name)))
-    a->name = 0;
-
-  a->policy_name = format (0, "%s", mp->policy_name);
-  if (!(vec_len (a->policy_name)))
-    a->policy_name = 0;
-
-  /* Yank segments and tags out of the API message */
-  this_address = (ip6_address_t *) mp->segs_and_tags;
-  for (i = 0; i < mp->n_segments; i++)
-    {
-      vec_add2 (segments, seg, 1);
-      clib_memcpy (seg->as_u8, this_address->as_u8, sizeof (*this_address));
-      this_address++;
-    }
-  for (i = 0; i < mp->n_tags; i++)
-    {
-      vec_add2 (tags, tag, 1);
-      clib_memcpy (tag->as_u8, this_address->as_u8, sizeof (*this_address));
-      this_address++;
-    }
-
-  a->segments = segments;
-  a->tags = tags;
-
-  rv = ip6_sr_add_del_tunnel (a);
-
-out:
-
-  REPLY_MACRO (VL_API_SR_TUNNEL_ADD_DEL_REPLY);
-#endif
-}
-
-static void vl_api_sr_policy_add_del_t_handler
-  (vl_api_sr_policy_add_del_t * mp)
-{
-#if IP6SR == 0
-  clib_warning ("unimplemented");
-#else
-  ip6_sr_add_del_policy_args_t _a, *a = &_a;
-  int rv = 0;
-  vl_api_sr_policy_add_del_reply_t *rmp;
-  int i;
-
-  memset (a, 0, sizeof (*a));
-  a->is_del = (mp->is_add == 0);
-
-  a->name = format (0, "%s", mp->name);
-  if (!(vec_len (a->name)))
-    {
-      rv = VNET_API_ERROR_NO_SUCH_NODE2;
-      goto out;
-    }
-
-  if (!(mp->tunnel_names[0]))
-    {
-      rv = VNET_API_ERROR_NO_SUCH_NODE2;
-      goto out;
-    }
-
-  // start deserializing tunnel_names
-  int num_tunnels = mp->tunnel_names[0];	//number of tunnels
-  u8 *deser_tun_names = mp->tunnel_names;
-  deser_tun_names += 1;		//moving along
-
-  u8 *tun_name = 0;
-  int tun_name_len = 0;
-
-  for (i = 0; i < num_tunnels; i++)
-    {
-      tun_name_len = *deser_tun_names;
-      deser_tun_names += 1;
-      vec_resize (tun_name, tun_name_len);
-      memcpy (tun_name, deser_tun_names, tun_name_len);
-      vec_add1 (a->tunnel_names, tun_name);
-      deser_tun_names += tun_name_len;
-      tun_name = 0;
-    }
-
-  rv = ip6_sr_add_del_policy (a);
-
-out:
-
-  REPLY_MACRO (VL_API_SR_POLICY_ADD_DEL_REPLY);
-#endif
-}
-
-static void vl_api_sr_multicast_map_add_del_t_handler
-  (vl_api_sr_multicast_map_add_del_t * mp)
-{
-#if IP6SR == 0
-  clib_warning ("unimplemented");
-#else
-  ip6_sr_add_del_multicastmap_args_t _a, *a = &_a;
-  int rv = 0;
-  vl_api_sr_multicast_map_add_del_reply_t *rmp;
-
-  memset (a, 0, sizeof (*a));
-  a->is_del = (mp->is_add == 0);
-
-  a->multicast_address = (ip6_address_t *) & mp->multicast_address;
-  a->policy_name = format (0, "%s", mp->policy_name);
-
-  if (a->multicast_address == 0)
-    {
-      rv = -1;
-      goto out;
-    }
-
-  if (!(a->policy_name))
-    {
-      rv = -2;
-      goto out;
-    }
-
-#if DPDK > 0			/* Cannot call replicate without DPDK */
-  rv = ip6_sr_add_del_multicastmap (a);
-#else
-  clib_warning ("multicast replication without DPDK not implemented");
-  rv = VNET_API_ERROR_UNIMPLEMENTED;
-#endif /* DPDK */
-
-out:
-
-  REPLY_MACRO (VL_API_SR_MULTICAST_MAP_ADD_DEL_REPLY);
-#endif
-}
-
-#define foreach_classify_add_del_table_field    \
-_(table_index)                                  \
-_(nbuckets)                                     \
-_(memory_size)                                  \
-_(skip_n_vectors)                               \
-_(match_n_vectors)                              \
-_(next_table_index)                             \
-_(miss_next_index)                              \
-_(current_data_flag)                            \
-_(current_data_offset)
-
-static void vl_api_classify_add_del_table_t_handler
-  (vl_api_classify_add_del_table_t * mp)
-{
-  vl_api_classify_add_del_table_reply_t *rmp;
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  vnet_classify_table_t *t;
-  int rv;
-
-#define _(a) u32 a;
-  foreach_classify_add_del_table_field;
-#undef _
-
-#define _(a) a = ntohl(mp->a);
-  foreach_classify_add_del_table_field;
-#undef _
-
-  /* The underlying API fails silently, on purpose, so check here */
-  if (mp->is_add == 0)		/* delete */
-    {
-      if (pool_is_free_index (cm->tables, table_index))
-	{
-	  rv = VNET_API_ERROR_NO_SUCH_TABLE;
-	  goto out;
-	}
-    }
-  else				/* add or update */
-    {
-      if (table_index != ~0 && pool_is_free_index (cm->tables, table_index))
-	table_index = ~0;
-    }
-
-  rv = vnet_classify_add_del_table
-    (cm, mp->mask, nbuckets, memory_size,
-     skip_n_vectors, match_n_vectors,
-     next_table_index, miss_next_index, &table_index,
-     current_data_flag, current_data_offset, mp->is_add, mp->del_chain);
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CLASSIFY_ADD_DEL_TABLE_REPLY,
-  ({
-    if (rv == 0 && mp->is_add)
-      {
-        t = pool_elt_at_index (cm->tables, table_index);
-        rmp->skip_n_vectors = ntohl(t->skip_n_vectors);
-        rmp->match_n_vectors = ntohl(t->match_n_vectors);
-        rmp->new_table_index = ntohl(table_index);
-      }
-    else
-      {
-        rmp->skip_n_vectors = ~0;
-        rmp->match_n_vectors = ~0;
-        rmp->new_table_index = ~0;
-      }
-  }));
-  /* *INDENT-ON* */
-}
-
-static void vl_api_classify_add_del_session_t_handler
-  (vl_api_classify_add_del_session_t * mp)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  vl_api_classify_add_del_session_reply_t *rmp;
-  int rv;
-  u32 table_index, hit_next_index, opaque_index, metadata;
-  i32 advance;
-  u8 action;
-
-  table_index = ntohl (mp->table_index);
-  hit_next_index = ntohl (mp->hit_next_index);
-  opaque_index = ntohl (mp->opaque_index);
-  advance = ntohl (mp->advance);
-  action = mp->action;
-  metadata = ntohl (mp->metadata);
-
-  rv = vnet_classify_add_del_session
-    (cm, table_index, mp->match, hit_next_index, opaque_index,
-     advance, action, metadata, mp->is_add);
-
-  REPLY_MACRO (VL_API_CLASSIFY_ADD_DEL_SESSION_REPLY);
-}
-
-static void vl_api_classify_set_interface_ip_table_t_handler
-  (vl_api_classify_set_interface_ip_table_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_classify_set_interface_ip_table_reply_t *rmp;
-  int rv;
-  u32 table_index, sw_if_index;
-
-  table_index = ntohl (mp->table_index);
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  if (mp->is_ipv6)
-    rv = vnet_set_ip6_classify_intfc (vm, sw_if_index, table_index);
-  else
-    rv = vnet_set_ip4_classify_intfc (vm, sw_if_index, table_index);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_CLASSIFY_SET_INTERFACE_IP_TABLE_REPLY);
-}
-
-static void vl_api_classify_set_interface_l2_tables_t_handler
-  (vl_api_classify_set_interface_l2_tables_t * mp)
-{
-  vl_api_classify_set_interface_l2_tables_reply_t *rmp;
-  int rv;
-  u32 sw_if_index, ip4_table_index, ip6_table_index, other_table_index;
-  int enable;
-
-  ip4_table_index = ntohl (mp->ip4_table_index);
-  ip6_table_index = ntohl (mp->ip6_table_index);
-  other_table_index = ntohl (mp->other_table_index);
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  if (mp->is_input)
-    rv = vnet_l2_input_classify_set_tables (sw_if_index, ip4_table_index,
-					    ip6_table_index,
-					    other_table_index);
-  else
-    rv = vnet_l2_output_classify_set_tables (sw_if_index, ip4_table_index,
-					     ip6_table_index,
-					     other_table_index);
-
-  if (rv == 0)
-    {
-      if (ip4_table_index != ~0 || ip6_table_index != ~0
-	  || other_table_index != ~0)
-	enable = 1;
-      else
-	enable = 0;
-
-      if (mp->is_input)
-	vnet_l2_input_classify_enable_disable (sw_if_index, enable);
-      else
-	vnet_l2_output_classify_enable_disable (sw_if_index, enable);
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_CLASSIFY_SET_INTERFACE_L2_TABLES_REPLY);
-}
-
-static void
-vl_api_l2_fib_clear_table_t_handler (vl_api_l2_fib_clear_table_t * mp)
-{
-  int rv = 0;
-  vl_api_l2_fib_clear_table_reply_t *rmp;
-
-  /* DAW-FIXME: This API should only clear non-static l2fib entries, but
-   *            that is not currently implemented.  When that TODO is fixed
-   *            this call should be changed to pass 1 instead of 0.
-   */
-  l2fib_clear_table (0);
-
-  REPLY_MACRO (VL_API_L2_FIB_CLEAR_TABLE_REPLY);
-}
-
-extern void l2_efp_filter_configure (vnet_main_t * vnet_main,
-				     u32 sw_if_index, u32 enable);
-
-static void
-vl_api_l2_interface_efp_filter_t_handler (vl_api_l2_interface_efp_filter_t *
-					  mp)
-{
-  int rv;
-  vl_api_l2_interface_efp_filter_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-
-  // enable/disable the feature
-  l2_efp_filter_configure (vnm, mp->sw_if_index, mp->enable_disable);
-  rv = vnm->api_errno;
-
-  REPLY_MACRO (VL_API_L2_INTERFACE_EFP_FILTER_REPLY);
-}
-
-static void
-  vl_api_l2_interface_vlan_tag_rewrite_t_handler
-  (vl_api_l2_interface_vlan_tag_rewrite_t * mp)
-{
-  int rv = 0;
-  vl_api_l2_interface_vlan_tag_rewrite_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-  u32 vtr_op;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  vtr_op = ntohl (mp->vtr_op);
-
-  /* The L2 code is unsuspicious */
-  switch (vtr_op)
-    {
-    case L2_VTR_DISABLED:
-    case L2_VTR_PUSH_1:
-    case L2_VTR_PUSH_2:
-    case L2_VTR_POP_1:
-    case L2_VTR_POP_2:
-    case L2_VTR_TRANSLATE_1_1:
-    case L2_VTR_TRANSLATE_1_2:
-    case L2_VTR_TRANSLATE_2_1:
-    case L2_VTR_TRANSLATE_2_2:
-      break;
-
-    default:
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto bad_sw_if_index;
-    }
-
-  rv = l2vtr_configure (vm, vnm, ntohl (mp->sw_if_index), vtr_op,
-			ntohl (mp->push_dot1q), ntohl (mp->tag1),
-			ntohl (mp->tag2));
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_L2_INTERFACE_VLAN_TAG_REWRITE_REPLY);
-}
-
-static void
-vl_api_l2_fib_table_entry_t_handler (vl_api_l2_fib_table_entry_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-send_l2fib_table_entry (vpe_api_main_t * am,
-			unix_shared_memory_queue_t * q,
-			l2fib_entry_key_t * l2fe_key,
-			l2fib_entry_result_t * l2fe_res, u32 context)
-{
-  vl_api_l2_fib_table_entry_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_L2_FIB_TABLE_ENTRY);
-
-  mp->bd_id =
-    ntohl (l2input_main.bd_configs[l2fe_key->fields.bd_index].bd_id);
-
-  mp->mac = l2fib_make_key (l2fe_key->fields.mac, 0);
-  mp->sw_if_index = ntohl (l2fe_res->fields.sw_if_index);
-  mp->static_mac = l2fe_res->fields.static_mac;
-  mp->filter_mac = l2fe_res->fields.filter;
-  mp->bvi_mac = l2fe_res->fields.bvi;
-  mp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_l2_fib_table_dump_t_handler (vl_api_l2_fib_table_dump_t * mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  bd_main_t *bdm = &bd_main;
-  l2fib_entry_key_t *l2fe_key = NULL;
-  l2fib_entry_result_t *l2fe_res = NULL;
-  u32 ni, bd_id = ntohl (mp->bd_id);
-  u32 bd_index;
-  unix_shared_memory_queue_t *q;
-  uword *p;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  /* see l2fib_table_dump: ~0 means "any" */
-  if (bd_id == ~0)
-    bd_index = ~0;
-  else
-    {
-      p = hash_get (bdm->bd_index_by_bd_id, bd_id);
-      if (p == 0)
-	return;
-
-      bd_index = p[0];
-    }
-
-  l2fib_table_dump (bd_index, &l2fe_key, &l2fe_res);
-
-  vec_foreach_index (ni, l2fe_key)
-  {
-    send_l2fib_table_entry (am, q, vec_elt_at_index (l2fe_key, ni),
-			    vec_elt_at_index (l2fe_res, ni), mp->context);
-  }
-  vec_free (l2fe_key);
-  vec_free (l2fe_res);
-}
-
-static void
-vl_api_show_version_t_handler (vl_api_show_version_t * mp)
-{
-  vl_api_show_version_reply_t *rmp;
-  int rv = 0;
-  char *vpe_api_get_build_directory (void);
-  char *vpe_api_get_version (void);
-  char *vpe_api_get_build_date (void);
-
-  unix_shared_memory_queue_t *q =
-    vl_api_client_index_to_input_queue (mp->client_index);
-
-  if (!q)
-    return;
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_SHOW_VERSION_REPLY,
-  ({
-    strncpy ((char *) rmp->program, "vpe", ARRAY_LEN(rmp->program)-1);
-    strncpy ((char *) rmp->build_directory, vpe_api_get_build_directory(),
-             ARRAY_LEN(rmp->build_directory)-1);
-    strncpy ((char *) rmp->version, vpe_api_get_version(),
-             ARRAY_LEN(rmp->version)-1);
-    strncpy ((char *) rmp->build_date, vpe_api_get_build_date(),
-             ARRAY_LEN(rmp->build_date)-1);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_get_node_index_t_handler (vl_api_get_node_index_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_get_node_index_reply_t *rmp;
-  vlib_node_t *n;
-  int rv = 0;
-  u32 node_index = ~0;
-
-  n = vlib_get_node_by_name (vm, mp->node_name);
-
-  if (n == 0)
-    rv = VNET_API_ERROR_NO_SUCH_NODE;
-  else
-    node_index = n->index;
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_GET_NODE_INDEX_REPLY,
-  ({
-    rmp->node_index = ntohl(node_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_get_next_index_t_handler (vl_api_get_next_index_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_get_next_index_reply_t *rmp;
-  vlib_node_t *node, *next_node;
-  int rv = 0;
-  u32 next_node_index = ~0, next_index = ~0;
-  uword *p;
-
-  node = vlib_get_node_by_name (vm, mp->node_name);
-
-  if (node == 0)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_NODE;
-      goto out;
-    }
-
-  next_node = vlib_get_node_by_name (vm, mp->next_name);
-
-  if (next_node == 0)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_NODE2;
-      goto out;
-    }
-  else
-    next_node_index = next_node->index;
-
-  p = hash_get (node->next_slot_by_node, next_node_index);
-
-  if (p == 0)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_ENTRY;
-      goto out;
-    }
-  else
-    next_index = p[0];
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_GET_NEXT_INDEX_REPLY,
-  ({
-    rmp->next_index = ntohl(next_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_add_node_next_t_handler (vl_api_add_node_next_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_add_node_next_reply_t *rmp;
-  vlib_node_t *n, *next;
-  int rv = 0;
-  u32 next_index = ~0;
-
-  n = vlib_get_node_by_name (vm, mp->node_name);
-
-  if (n == 0)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_NODE;
-      goto out;
-    }
-
-  next = vlib_get_node_by_name (vm, mp->next_name);
-
-  if (next == 0)
-    rv = VNET_API_ERROR_NO_SUCH_NODE2;
-  else
-    next_index = vlib_node_add_next (vm, n->index, next->index);
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_GET_NODE_INDEX_REPLY,
-  ({
-    rmp->next_index = ntohl(next_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void vl_api_vxlan_add_del_tunnel_t_handler
-  (vl_api_vxlan_add_del_tunnel_t * mp)
-{
-  vl_api_vxlan_add_del_tunnel_reply_t *rmp;
-  int rv = 0;
-  vnet_vxlan_add_del_tunnel_args_t _a, *a = &_a;
-  u32 encap_fib_index;
-  uword *p;
-  ip4_main_t *im = &ip4_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  u32 sw_if_index = ~0;
-
-  p = hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id));
-  if (!p)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_FIB;
-      goto out;
-    }
-  encap_fib_index = p[0];
-  memset (a, 0, sizeof (*a));
-
-  a->is_add = mp->is_add;
-  a->is_ip6 = mp->is_ipv6;
-
-  /* ip addresses sent in network byte order */
-  ip46_from_addr_buf (mp->is_ipv6, mp->dst_address, &a->dst);
-  ip46_from_addr_buf (mp->is_ipv6, mp->src_address, &a->src);
-
-  /* Check src & dst are different */
-  if (ip46_address_cmp (&a->dst, &a->src) == 0)
-    {
-      rv = VNET_API_ERROR_SAME_SRC_DST;
-      goto out;
-    }
-  a->mcast_sw_if_index = ntohl (mp->mcast_sw_if_index);
-  if (ip46_address_is_multicast (&a->dst) &&
-      pool_is_free_index (vnm->interface_main.sw_interfaces,
-			  a->mcast_sw_if_index))
-    {
-      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-      goto out;
-    }
-  a->encap_fib_index = encap_fib_index;
-  a->decap_next_index = ntohl (mp->decap_next_index);
-  a->vni = ntohl (mp->vni);
-  rv = vnet_vxlan_add_del_tunnel (a, &sw_if_index);
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_VXLAN_ADD_DEL_TUNNEL_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void send_vxlan_tunnel_details
-  (vxlan_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_vxlan_tunnel_details_t *rmp;
-  ip4_main_t *im4 = &ip4_main;
-  ip6_main_t *im6 = &ip6_main;
-  u8 is_ipv6 = !ip46_address_is_ip4 (&t->dst);
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_VXLAN_TUNNEL_DETAILS);
-  if (is_ipv6)
-    {
-      memcpy (rmp->src_address, t->src.ip6.as_u8, 16);
-      memcpy (rmp->dst_address, t->dst.ip6.as_u8, 16);
-      rmp->encap_vrf_id = htonl (im6->fibs[t->encap_fib_index].ft_table_id);
-    }
-  else
-    {
-      memcpy (rmp->src_address, t->src.ip4.as_u8, 4);
-      memcpy (rmp->dst_address, t->dst.ip4.as_u8, 4);
-      rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id);
-    }
-  rmp->mcast_sw_if_index = htonl (t->mcast_sw_if_index);
-  rmp->vni = htonl (t->vni);
-  rmp->decap_next_index = htonl (t->decap_next_index);
-  rmp->sw_if_index = htonl (t->sw_if_index);
-  rmp->is_ipv6 = is_ipv6;
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void vl_api_vxlan_tunnel_dump_t_handler
-  (vl_api_vxlan_tunnel_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  vxlan_main_t *vxm = &vxlan_main;
-  vxlan_tunnel_t *t;
-  u32 sw_if_index;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  if (~0 == sw_if_index)
-    {
-      /* *INDENT-OFF* */
-      pool_foreach (t, vxm->tunnels,
-      ({
-        send_vxlan_tunnel_details(t, q, mp->context);
-      }));
-      /* *INDENT-ON* */
-    }
-  else
-    {
-      if ((sw_if_index >= vec_len (vxm->tunnel_index_by_sw_if_index)) ||
-	  (~0 == vxm->tunnel_index_by_sw_if_index[sw_if_index]))
-	{
-	  return;
-	}
-      t = &vxm->tunnels[vxm->tunnel_index_by_sw_if_index[sw_if_index]];
-      send_vxlan_tunnel_details (t, q, mp->context);
-    }
-}
-
-static void
-vl_api_l2_patch_add_del_t_handler (vl_api_l2_patch_add_del_t * mp)
-{
-  extern int vnet_l2_patch_add_del (u32 rx_sw_if_index, u32 tx_sw_if_index,
-				    int is_add);
-  vl_api_l2_patch_add_del_reply_t *rmp;
-  int vnet_l2_patch_add_del (u32 rx_sw_if_index, u32 tx_sw_if_index,
-			     int is_add);
-  int rv = 0;
-
-  VALIDATE_RX_SW_IF_INDEX (mp);
-  VALIDATE_TX_SW_IF_INDEX (mp);
-
-  rv = vnet_l2_patch_add_del (ntohl (mp->rx_sw_if_index),
-			      ntohl (mp->tx_sw_if_index),
-			      (int) (mp->is_add != 0));
-
-  BAD_RX_SW_IF_INDEX_LABEL;
-  BAD_TX_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_L2_PATCH_ADD_DEL_REPLY);
-}
-
-static void
-  vl_api_vxlan_gpe_add_del_tunnel_t_handler
-  (vl_api_vxlan_gpe_add_del_tunnel_t * mp)
-{
-  vl_api_vxlan_gpe_add_del_tunnel_reply_t *rmp;
-  int rv = 0;
-  vnet_vxlan_gpe_add_del_tunnel_args_t _a, *a = &_a;
-  u32 encap_fib_index, decap_fib_index;
-  u8 protocol;
-  uword *p;
-  ip4_main_t *im = &ip4_main;
-  u32 sw_if_index = ~0;
-
-
-  p = hash_get (im->fib_index_by_table_id, ntohl (mp->encap_vrf_id));
-  if (!p)
-    {
-      rv = VNET_API_ERROR_NO_SUCH_FIB;
-      goto out;
-    }
-  encap_fib_index = p[0];
-
-  protocol = mp->protocol;
-
-  /* Interpret decap_vrf_id as an opaque if sending to other-than-ip4-input */
-  if (protocol == VXLAN_GPE_INPUT_NEXT_IP4_INPUT)
-    {
-      p = hash_get (im->fib_index_by_table_id, ntohl (mp->decap_vrf_id));
-      if (!p)
-	{
-	  rv = VNET_API_ERROR_NO_SUCH_INNER_FIB;
-	  goto out;
-	}
-      decap_fib_index = p[0];
-    }
-  else
-    {
-      decap_fib_index = ntohl (mp->decap_vrf_id);
-    }
-
-  /* Check src & dst are different */
-  if ((mp->is_ipv6 && memcmp (mp->local, mp->remote, 16) == 0) ||
-      (!mp->is_ipv6 && memcmp (mp->local, mp->remote, 4) == 0))
-    {
-      rv = VNET_API_ERROR_SAME_SRC_DST;
-      goto out;
-    }
-  memset (a, 0, sizeof (*a));
-
-  a->is_add = mp->is_add;
-  a->is_ip6 = mp->is_ipv6;
-  /* ip addresses sent in network byte order */
-  if (a->is_ip6)
-    {
-      clib_memcpy (&(a->local.ip6), mp->local, 16);
-      clib_memcpy (&(a->remote.ip6), mp->remote, 16);
-    }
-  else
-    {
-      clib_memcpy (&(a->local.ip4), mp->local, 4);
-      clib_memcpy (&(a->remote.ip4), mp->remote, 4);
-    }
-  a->encap_fib_index = encap_fib_index;
-  a->decap_fib_index = decap_fib_index;
-  a->protocol = protocol;
-  a->vni = ntohl (mp->vni);
-  rv = vnet_vxlan_gpe_add_del_tunnel (a, &sw_if_index);
-
-out:
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_VXLAN_GPE_ADD_DEL_TUNNEL_REPLY,
-  ({
-    rmp->sw_if_index = ntohl (sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void send_vxlan_gpe_tunnel_details
-  (vxlan_gpe_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_vxlan_gpe_tunnel_details_t *rmp;
-  ip4_main_t *im4 = &ip4_main;
-  ip6_main_t *im6 = &ip6_main;
-  u8 is_ipv6 = !(t->flags & VXLAN_GPE_TUNNEL_IS_IPV4);
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_VXLAN_GPE_TUNNEL_DETAILS);
-  if (is_ipv6)
-    {
-      memcpy (rmp->local, &(t->local.ip6), 16);
-      memcpy (rmp->remote, &(t->remote.ip6), 16);
-      rmp->encap_vrf_id = htonl (im6->fibs[t->encap_fib_index].ft_table_id);
-      rmp->decap_vrf_id = htonl (im6->fibs[t->decap_fib_index].ft_table_id);
-    }
-  else
-    {
-      memcpy (rmp->local, &(t->local.ip4), 4);
-      memcpy (rmp->remote, &(t->remote.ip4), 4);
-      rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id);
-      rmp->decap_vrf_id = htonl (im4->fibs[t->decap_fib_index].ft_table_id);
-    }
-  rmp->vni = htonl (t->vni);
-  rmp->protocol = t->protocol;
-  rmp->sw_if_index = htonl (t->sw_if_index);
-  rmp->is_ipv6 = is_ipv6;
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void vl_api_vxlan_gpe_tunnel_dump_t_handler
-  (vl_api_vxlan_gpe_tunnel_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  vxlan_gpe_main_t *vgm = &vxlan_gpe_main;
-  vxlan_gpe_tunnel_t *t;
-  u32 sw_if_index;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  if (~0 == sw_if_index)
-    {
-      /* *INDENT-OFF* */
-      pool_foreach (t, vgm->tunnels,
-      ({
-        send_vxlan_gpe_tunnel_details(t, q, mp->context);
-      }));
-      /* *INDENT-ON* */
-    }
-  else
-    {
-      if ((sw_if_index >= vec_len (vgm->tunnel_index_by_sw_if_index)) ||
-	  (~0 == vgm->tunnel_index_by_sw_if_index[sw_if_index]))
-	{
-	  return;
-	}
-      t = &vgm->tunnels[vgm->tunnel_index_by_sw_if_index[sw_if_index]];
-      send_vxlan_gpe_tunnel_details (t, q, mp->context);
-    }
-}
-
-static void
-vl_api_interface_name_renumber_t_handler (vl_api_interface_name_renumber_t *
-					  mp)
-{
-  vl_api_interface_name_renumber_reply_t *rmp;
-  int rv = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = vnet_interface_name_renumber
-    (ntohl (mp->sw_if_index), ntohl (mp->new_show_dev_instance));
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_INTERFACE_NAME_RENUMBER_REPLY);
-}
-
-static int
-arp_change_data_callback (u32 pool_index, u8 * new_mac,
-			  u32 sw_if_index, u32 address)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vlib_main_t *vm = am->vlib_main;
-  vl_api_ip4_arp_event_t *event;
-  static f64 arp_event_last_time;
-  f64 now = vlib_time_now (vm);
-
-  if (pool_is_free_index (am->arp_events, pool_index))
-    return 1;
-
-  event = pool_elt_at_index (am->arp_events, pool_index);
-  /* *INDENT-OFF* */
-  if (memcmp (&event->new_mac, new_mac, sizeof (event->new_mac)))
-    {
-      clib_memcpy (event->new_mac, new_mac, sizeof (event->new_mac));
-    }
-  else
-    {				/* same mac */
-      if (sw_if_index == event->sw_if_index &&
-	  (!event->mac_ip ||
-	   /* for BD case, also check IP address with 10 sec timeout */
-	   (address == event->address &&
-	    (now - arp_event_last_time) < 10.0)))
-	return 1;
-    }
-  /* *INDENT-ON* */
-
-  arp_event_last_time = now;
-  event->sw_if_index = sw_if_index;
-  if (event->mac_ip)
-    event->address = address;
-  return 0;
-}
-
-static int
-nd_change_data_callback (u32 pool_index, u8 * new_mac,
-			 u32 sw_if_index, ip6_address_t * address)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vlib_main_t *vm = am->vlib_main;
-  vl_api_ip6_nd_event_t *event;
-  static f64 nd_event_last_time;
-  f64 now = vlib_time_now (vm);
-
-  if (pool_is_free_index (am->nd_events, pool_index))
-    return 1;
-
-  event = pool_elt_at_index (am->nd_events, pool_index);
-
-  /* *INDENT-OFF* */
-  if (memcmp (&event->new_mac, new_mac, sizeof (event->new_mac)))
-    {
-      clib_memcpy (event->new_mac, new_mac, sizeof (event->new_mac));
-    }
-  else
-    {				/* same mac */
-      if (sw_if_index == event->sw_if_index &&
-	  (!event->mac_ip ||
-	   /* for BD case, also check IP address with 10 sec timeout */
-	   (ip6_address_is_equal (address,
-				  (ip6_address_t *) event->address) &&
-	    (now - nd_event_last_time) < 10.0)))
-	return 1;
-    }
-  /* *INDENT-ON* */
-
-  nd_event_last_time = now;
-  event->sw_if_index = sw_if_index;
-  if (event->mac_ip)
-    clib_memcpy (event->address, address, sizeof (event->address));
-  return 0;
-}
-
-static int
-arp_change_delete_callback (u32 pool_index, u8 * notused)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-
-  if (pool_is_free_index (am->arp_events, pool_index))
-    return 1;
-
-  pool_put_index (am->arp_events, pool_index);
-  return 0;
-}
-
-static int
-nd_change_delete_callback (u32 pool_index, u8 * notused)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-
-  if (pool_is_free_index (am->nd_events, pool_index))
-    return 1;
-
-  pool_put_index (am->nd_events, pool_index);
-  return 0;
-}
-
-static void
-vl_api_want_ip4_arp_events_t_handler (vl_api_want_ip4_arp_events_t * mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  vl_api_want_ip4_arp_events_reply_t *rmp;
-  vl_api_ip4_arp_event_t *event;
-  int rv;
-
-  if (mp->enable_disable)
-    {
-      pool_get (am->arp_events, event);
-      memset (event, 0, sizeof (*event));
-
-      event->_vl_msg_id = ntohs (VL_API_IP4_ARP_EVENT);
-      event->client_index = mp->client_index;
-      event->context = mp->context;
-      event->address = mp->address;
-      event->pid = mp->pid;
-      if (mp->address == 0)
-	event->mac_ip = 1;
-
-      rv = vnet_add_del_ip4_arp_change_event
-	(vnm, arp_change_data_callback,
-	 mp->pid, &mp->address /* addr, in net byte order */ ,
-	 vpe_resolver_process_node.index,
-	 IP4_ARP_EVENT, event - am->arp_events, 1 /* is_add */ );
-    }
-  else
-    {
-      rv = vnet_add_del_ip4_arp_change_event
-	(vnm, arp_change_delete_callback,
-	 mp->pid, &mp->address /* addr, in net byte order */ ,
-	 vpe_resolver_process_node.index,
-	 IP4_ARP_EVENT, ~0 /* pool index */ , 0 /* is_add */ );
-    }
-  REPLY_MACRO (VL_API_WANT_IP4_ARP_EVENTS_REPLY);
-}
-
-static void
-vl_api_want_ip6_nd_events_t_handler (vl_api_want_ip6_nd_events_t * mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vnet_main_t *vnm = vnet_get_main ();
-  vl_api_want_ip6_nd_events_reply_t *rmp;
-  vl_api_ip6_nd_event_t *event;
-  int rv;
-
-  if (mp->enable_disable)
-    {
-      pool_get (am->nd_events, event);
-      memset (event, 0, sizeof (*event));
-
-      event->_vl_msg_id = ntohs (VL_API_IP6_ND_EVENT);
-      event->client_index = mp->client_index;
-      event->context = mp->context;
-      clib_memcpy (event->address, mp->address, 16);
-      event->pid = mp->pid;
-      if (ip6_address_is_zero ((ip6_address_t *) mp->address))
-	event->mac_ip = 1;
-
-      rv = vnet_add_del_ip6_nd_change_event
-	(vnm, nd_change_data_callback,
-	 mp->pid, mp->address /* addr, in net byte order */ ,
-	 vpe_resolver_process_node.index,
-	 IP6_ND_EVENT, event - am->nd_events, 1 /* is_add */ );
-    }
-  else
-    {
-      rv = vnet_add_del_ip6_nd_change_event
-	(vnm, nd_change_delete_callback,
-	 mp->pid, mp->address /* addr, in net byte order */ ,
-	 vpe_resolver_process_node.index,
-	 IP6_ND_EVENT, ~0 /* pool index */ , 0 /* is_add */ );
-    }
-  REPLY_MACRO (VL_API_WANT_IP6_ND_EVENTS_REPLY);
-}
-
-static void vl_api_input_acl_set_interface_t_handler
-  (vl_api_input_acl_set_interface_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_input_acl_set_interface_reply_t *rmp;
-  int rv;
-  u32 sw_if_index, ip4_table_index, ip6_table_index, l2_table_index;
-
-  ip4_table_index = ntohl (mp->ip4_table_index);
-  ip6_table_index = ntohl (mp->ip6_table_index);
-  l2_table_index = ntohl (mp->l2_table_index);
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = vnet_set_input_acl_intfc (vm, sw_if_index, ip4_table_index,
-				 ip6_table_index, l2_table_index, mp->is_add);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_INPUT_ACL_SET_INTERFACE_REPLY);
-}
-
-static void vl_api_cop_interface_enable_disable_t_handler
-  (vl_api_cop_interface_enable_disable_t * mp)
-{
-  vl_api_cop_interface_enable_disable_reply_t *rmp;
-  int rv;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  int enable_disable;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  enable_disable = (int) mp->enable_disable;
-
-  rv = cop_interface_enable_disable (sw_if_index, enable_disable);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_COP_INTERFACE_ENABLE_DISABLE_REPLY);
-}
-
-static void vl_api_cop_whitelist_enable_disable_t_handler
-  (vl_api_cop_whitelist_enable_disable_t * mp)
-{
-  vl_api_cop_whitelist_enable_disable_reply_t *rmp;
-  cop_whitelist_enable_disable_args_t _a, *a = &_a;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  int rv;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  a->sw_if_index = sw_if_index;
-  a->ip4 = mp->ip4;
-  a->ip6 = mp->ip6;
-  a->default_cop = mp->default_cop;
-  a->fib_id = ntohl (mp->fib_id);
-
-  rv = cop_whitelist_enable_disable (a);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_COP_WHITELIST_ENABLE_DISABLE_REPLY);
-}
-
-static void
-vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp)
-{
-  int rv = 0;
-  u8 *vector = 0;
-  api_main_t *am = &api_main;
-  vlib_main_t *vm = vlib_get_main ();
-  void *oldheap;
-  vl_api_get_node_graph_reply_t *rmp;
-
-  pthread_mutex_lock (&am->vlib_rp->mutex);
-  oldheap = svm_push_data_heap (am->vlib_rp);
-
-  /*
-   * Keep the number of memcpy ops to a minimum (e.g. 1).
-   */
-  vec_validate (vector, 16384);
-  vec_reset_length (vector);
-
-  /* $$$$ FIXME */
-  vector = vlib_node_serialize (&vm->node_main, vector,
-				(u32) ~ 0 /* all threads */ ,
-				1 /* include nexts */ ,
-				1 /* include stats */ );
-
-  svm_pop_heap (oldheap);
-  pthread_mutex_unlock (&am->vlib_rp->mutex);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_GET_NODE_GRAPH_REPLY,
-  ({
-    rmp->reply_in_shmem = (uword) vector;
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_ioam_enable_t_handler (vl_api_ioam_enable_t * mp)
-{
-  int rv = 0;
-  vl_api_ioam_enable_reply_t *rmp;
-  clib_error_t *error;
-
-  /* Ignoring the profile id as currently a single profile
-   * is supported */
-  error = ip6_ioam_enable (mp->trace_enable, mp->pot_enable,
-			   mp->seqno, mp->analyse);
-  if (error)
-    {
-      clib_error_report (error);
-      rv = clib_error_get_code (error);
-    }
-
-  REPLY_MACRO (VL_API_IOAM_ENABLE_REPLY);
-}
-
-static void
-vl_api_ioam_disable_t_handler (vl_api_ioam_disable_t * mp)
-{
-  int rv = 0;
-  vl_api_ioam_disable_reply_t *rmp;
-  clib_error_t *error;
-
-  error = clear_ioam_rewrite_fn ();
-  if (error)
-    {
-      clib_error_report (error);
-      rv = clib_error_get_code (error);
-    }
-
-  REPLY_MACRO (VL_API_IOAM_DISABLE_REPLY);
-}
-
-static void
-vl_api_policer_add_del_t_handler (vl_api_policer_add_del_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_policer_add_del_reply_t *rmp;
-  int rv = 0;
-  u8 *name = NULL;
-  sse2_qos_pol_cfg_params_st cfg;
-  clib_error_t *error;
-  u32 policer_index;
-
-  name = format (0, "%s", mp->name);
-
-  memset (&cfg, 0, sizeof (cfg));
-  cfg.rfc = mp->type;
-  cfg.rnd_type = mp->round_type;
-  cfg.rate_type = mp->rate_type;
-  cfg.rb.kbps.cir_kbps = mp->cir;
-  cfg.rb.kbps.eir_kbps = mp->eir;
-  cfg.rb.kbps.cb_bytes = mp->cb;
-  cfg.rb.kbps.eb_bytes = mp->eb;
-  cfg.conform_action.action_type = mp->conform_action_type;
-  cfg.conform_action.dscp = mp->conform_dscp;
-  cfg.exceed_action.action_type = mp->exceed_action_type;
-  cfg.exceed_action.dscp = mp->exceed_dscp;
-  cfg.violate_action.action_type = mp->violate_action_type;
-  cfg.violate_action.dscp = mp->violate_dscp;
-  cfg.color_aware = mp->color_aware;
-
-  error = policer_add_del (vm, name, &cfg, &policer_index, mp->is_add);
-
-  if (error)
-    rv = VNET_API_ERROR_UNSPECIFIED;
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_POLICER_ADD_DEL_REPLY,
-  ({
-    if (rv == 0 &&  mp->is_add)
-      rmp->policer_index = ntohl(policer_index);
-    else
-      rmp->policer_index = ~0;
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-send_policer_details (u8 * name,
-		      sse2_qos_pol_cfg_params_st * config,
-		      policer_read_response_type_st * templ,
-		      unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_policer_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_POLICER_DETAILS);
-  mp->context = context;
-  mp->cir = htonl (config->rb.kbps.cir_kbps);
-  mp->eir = htonl (config->rb.kbps.eir_kbps);
-  mp->cb = htonl (config->rb.kbps.cb_bytes);
-  mp->eb = htonl (config->rb.kbps.eb_bytes);
-  mp->rate_type = config->rate_type;
-  mp->round_type = config->rnd_type;
-  mp->type = config->rfc;
-  mp->conform_action_type = config->conform_action.action_type;
-  mp->conform_dscp = config->conform_action.dscp;
-  mp->exceed_action_type = config->exceed_action.action_type;
-  mp->exceed_dscp = config->exceed_action.dscp;
-  mp->violate_action_type = config->violate_action.action_type;
-  mp->violate_dscp = config->violate_action.dscp;
-  mp->single_rate = templ->single_rate ? 1 : 0;
-  mp->color_aware = templ->color_aware ? 1 : 0;
-  mp->scale = htonl (templ->scale);
-  mp->cir_tokens_per_period = htonl (templ->cir_tokens_per_period);
-  mp->pir_tokens_per_period = htonl (templ->pir_tokens_per_period);
-  mp->current_limit = htonl (templ->current_limit);
-  mp->current_bucket = htonl (templ->current_bucket);
-  mp->extended_limit = htonl (templ->extended_limit);
-  mp->extended_bucket = htonl (templ->extended_bucket);
-  mp->last_update_time = clib_host_to_net_u64 (templ->last_update_time);
-
-  strncpy ((char *) mp->name, (char *) name, ARRAY_LEN (mp->name) - 1);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_policer_dump_t_handler (vl_api_policer_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  vnet_policer_main_t *pm = &vnet_policer_main;
-  hash_pair_t *hp;
-  uword *p;
-  u32 pool_index;
-  u8 *match_name = 0;
-  u8 *name;
-  sse2_qos_pol_cfg_params_st *config;
-  policer_read_response_type_st *templ;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  if (mp->match_name_valid)
-    {
-      match_name = format (0, "%s%c", mp->match_name, 0);
-    }
-
-  if (mp->match_name_valid)
-    {
-      p = hash_get_mem (pm->policer_config_by_name, match_name);
-      if (p)
-	{
-	  pool_index = p[0];
-	  config = pool_elt_at_index (pm->configs, pool_index);
-	  templ = pool_elt_at_index (pm->policer_templates, pool_index);
-	  send_policer_details (match_name, config, templ, q, mp->context);
-	}
-    }
-  else
-    {
-      /* *INDENT-OFF* */
-      hash_foreach_pair (hp, pm->policer_config_by_name,
-      ({
-        name = (u8 *) hp->key;
-        pool_index = hp->value[0];
-        config = pool_elt_at_index (pm->configs, pool_index);
-        templ = pool_elt_at_index (pm->policer_templates, pool_index);
-        send_policer_details(name, config, templ, q, mp->context);
-      }));
-      /* *INDENT-ON* */
-    }
-}
-
-static void
-  vl_api_policer_classify_set_interface_t_handler
-  (vl_api_policer_classify_set_interface_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_policer_classify_set_interface_reply_t *rmp;
-  int rv;
-  u32 sw_if_index, ip4_table_index, ip6_table_index, l2_table_index;
-
-  ip4_table_index = ntohl (mp->ip4_table_index);
-  ip6_table_index = ntohl (mp->ip6_table_index);
-  l2_table_index = ntohl (mp->l2_table_index);
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = vnet_set_policer_classify_intfc (vm, sw_if_index, ip4_table_index,
-					ip6_table_index, l2_table_index,
-					mp->is_add);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_POLICER_CLASSIFY_SET_INTERFACE_REPLY);
-}
-
-static void
-send_policer_classify_details (u32 sw_if_index,
-			       u32 table_index,
-			       unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_policer_classify_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_POLICER_CLASSIFY_DETAILS);
-  mp->context = context;
-  mp->sw_if_index = htonl (sw_if_index);
-  mp->table_index = htonl (table_index);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_policer_classify_dump_t_handler (vl_api_policer_classify_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  policer_classify_main_t *pcm = &policer_classify_main;
-  u32 *vec_tbl;
-  int i;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  vec_tbl = pcm->classify_table_index_by_sw_if_index[mp->type];
-
-  if (vec_len (vec_tbl))
-    {
-      for (i = 0; i < vec_len (vec_tbl); i++)
-	{
-	  if (vec_elt (vec_tbl, i) == ~0)
-	    continue;
-
-	  send_policer_classify_details (i, vec_elt (vec_tbl, i), q,
-					 mp->context);
-	}
-    }
-}
-
-static void
-vl_api_mpls_tunnel_details_t_handler (vl_api_mpls_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-typedef struct mpls_tunnel_send_walk_ctx_t_
-{
-  unix_shared_memory_queue_t *q;
-  u32 index;
-  u32 context;
-} mpls_tunnel_send_walk_ctx_t;
-
-static void
-send_mpls_tunnel_entry (u32 mti, void *arg)
-{
-  mpls_tunnel_send_walk_ctx_t *ctx;
-  vl_api_mpls_tunnel_details_t *mp;
-  const mpls_tunnel_t *mt;
-  u32 nlabels;
-
-  ctx = arg;
-
-  if (~0 != ctx->index && mti != ctx->index)
-    return;
-
-  mt = mpls_tunnel_get (mti);
-  nlabels = vec_len (mt->mt_label_stack);
-
-  mp = vl_msg_api_alloc (sizeof (*mp) + nlabels * sizeof (u32));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_MPLS_TUNNEL_DETAILS);
-  mp->context = ctx->context;
-
-  mp->tunnel_index = ntohl (mti);
-  memcpy (mp->mt_next_hop_out_labels,
-	  mt->mt_label_stack, nlabels * sizeof (u32));
-
-  // FIXME
-
-  vl_msg_api_send_shmem (ctx->q, (u8 *) & mp);
-}
-
-static void
-vl_api_mpls_tunnel_dump_t_handler (vl_api_mpls_tunnel_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  mpls_tunnel_send_walk_ctx_t ctx = {
-    .q = q,
-    .index = ntohl (mp->tunnel_index),
-    .context = mp->context,
-  };
-  mpls_tunnel_walk (send_mpls_tunnel_entry, &ctx);
-}
-
-static void
-vl_api_mpls_fib_details_t_handler (vl_api_mpls_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-vl_api_mpls_fib_details_t_endian (vl_api_mpls_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-vl_api_mpls_fib_details_t_print (vl_api_mpls_fib_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-send_mpls_fib_details (vpe_api_main_t * am,
-		       unix_shared_memory_queue_t * q,
-		       u32 table_id, u32 label, u32 eos,
-		       fib_route_path_encode_t * api_rpaths, u32 context)
-{
-  vl_api_mpls_fib_details_t *mp;
-  fib_route_path_encode_t *api_rpath;
-  vl_api_fib_path2_t *fp;
-  int path_count;
-
-  path_count = vec_len (api_rpaths);
-  mp = vl_msg_api_alloc (sizeof (*mp) + path_count * sizeof (*fp));
-  if (!mp)
-    return;
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_MPLS_FIB_DETAILS);
-  mp->context = context;
-
-  mp->table_id = htonl (table_id);
-  mp->eos_bit = eos;
-  mp->label = htonl (label);
-
-  mp->count = htonl (path_count);
-  fp = mp->path;
-  vec_foreach (api_rpath, api_rpaths)
-  {
-    memset (fp, 0, sizeof (*fp));
-    fp->weight = htonl (api_rpath->rpath.frp_weight);
-    fp->sw_if_index = htonl (api_rpath->rpath.frp_sw_if_index);
-    copy_fib_next_hop (api_rpath, fp);
-    fp++;
-  }
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_mpls_fib_dump_t_handler (vl_api_mpls_fib_dump_t * mp)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  unix_shared_memory_queue_t *q;
-  mpls_main_t *mm = &mpls_main;
-  fib_table_t *fib_table;
-  fib_node_index_t lfei, *lfeip, *lfeis = NULL;
-  mpls_label_t key;
-  fib_prefix_t pfx;
-  u32 fib_index;
-  fib_route_path_encode_t *api_rpaths;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  /* *INDENT-OFF* */
-  pool_foreach (fib_table, mm->fibs,
-  ({
-    hash_foreach(key, lfei, fib_table->mpls.mf_entries,
-    ({
-	vec_add1(lfeis, lfei);
-    }));
-  }));
-  vec_sort_with_function(lfeis, fib_entry_cmp_for_sort);
-
-  vec_foreach(lfeip, lfeis)
-  {
-    fib_entry_get_prefix(*lfeip, &pfx);
-    fib_index = fib_entry_get_fib_index(*lfeip);
-    fib_table = fib_table_get(fib_index, pfx.fp_proto);
-    api_rpaths = NULL;
-    fib_entry_encode(*lfeip, &api_rpaths);
-    send_mpls_fib_details (am, q,
-			   fib_table->ft_table_id,
-			   pfx.fp_label,
-			   pfx.fp_eos,
-                           api_rpaths,
-			   mp->context);
-    vec_free(api_rpaths);
-  }
-
-  vec_free (lfeis);
-}
-
-static void
-vl_api_classify_table_ids_t_handler (vl_api_classify_table_ids_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  vnet_classify_table_t *t;
-  u32 *table_ids = 0;
-  u32 count;
-
-  /* *INDENT-OFF* */
-  pool_foreach (t, cm->tables,
-  ({
-    vec_add1 (table_ids, ntohl(t - cm->tables));
-  }));
-  /* *INDENT-ON* */
-  count = vec_len (table_ids);
-
-  vl_api_classify_table_ids_reply_t *rmp;
-  rmp = vl_msg_api_alloc_as_if_client (sizeof (*rmp) + count * sizeof (u32));
-  rmp->_vl_msg_id = ntohs (VL_API_CLASSIFY_TABLE_IDS_REPLY);
-  rmp->context = mp->context;
-  rmp->count = ntohl (count);
-  clib_memcpy (rmp->ids, table_ids, count * sizeof (u32));
-  rmp->retval = 0;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-
-  vec_free (table_ids);
-}
-
-static void
-  vl_api_classify_table_by_interface_t_handler
-  (vl_api_classify_table_by_interface_t * mp)
-{
-  vl_api_classify_table_by_interface_reply_t *rmp;
-  int rv = 0;
-
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  u32 *acl = 0;
-
-  vec_validate (acl, INPUT_ACL_N_TABLES - 1);
-  vec_set (acl, ~0);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  input_acl_main_t *am = &input_acl_main;
-
-  int if_idx;
-  u32 type;
-
-  for (type = 0; type < INPUT_ACL_N_TABLES; type++)
-    {
-      u32 *vec_tbl = am->classify_table_index_by_sw_if_index[type];
-      if (vec_len (vec_tbl))
-	{
-	  for (if_idx = 0; if_idx < vec_len (vec_tbl); if_idx++)
-	    {
-	      if (vec_elt (vec_tbl, if_idx) == ~0 || sw_if_index != if_idx)
-		{
-		  continue;
-		}
-	      acl[type] = vec_elt (vec_tbl, if_idx);
-	    }
-	}
-    }
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_CLASSIFY_TABLE_BY_INTERFACE_REPLY,
-  ({
-    rmp->sw_if_index = ntohl(sw_if_index);
-    rmp->l2_table_id = ntohl(acl[INPUT_ACL_TABLE_L2]);
-    rmp->ip4_table_id = ntohl(acl[INPUT_ACL_TABLE_IP4]);
-    rmp->ip6_table_id = ntohl(acl[INPUT_ACL_TABLE_IP6]);
-  }));
-  /* *INDENT-ON* */
-  vec_free (acl);
-}
-
-static void
-vl_api_classify_table_info_t_handler (vl_api_classify_table_info_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  vl_api_classify_table_info_reply_t *rmp = 0;
-
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  u32 table_id = ntohl (mp->table_id);
-  vnet_classify_table_t *t;
-
-  /* *INDENT-OFF* */
-  pool_foreach (t, cm->tables,
-  ({
-    if (table_id == t - cm->tables)
-      {
-        rmp = vl_msg_api_alloc_as_if_client
-          (sizeof (*rmp) + t->match_n_vectors * sizeof (u32x4));
-        rmp->_vl_msg_id = ntohs (VL_API_CLASSIFY_TABLE_INFO_REPLY);
-        rmp->context = mp->context;
-        rmp->table_id = ntohl(table_id);
-        rmp->nbuckets = ntohl(t->nbuckets);
-        rmp->match_n_vectors = ntohl(t->match_n_vectors);
-        rmp->skip_n_vectors = ntohl(t->skip_n_vectors);
-        rmp->active_sessions = ntohl(t->active_elements);
-        rmp->next_table_index = ntohl(t->next_table_index);
-        rmp->miss_next_index = ntohl(t->miss_next_index);
-        rmp->mask_length = ntohl(t->match_n_vectors * sizeof (u32x4));
-        clib_memcpy(rmp->mask, t->mask, t->match_n_vectors * sizeof(u32x4));
-        rmp->retval = 0;
-        break;
-      }
-  }));
-  /* *INDENT-ON* */
-
-  if (rmp == 0)
-    {
-      rmp = vl_msg_api_alloc (sizeof (*rmp));
-      rmp->_vl_msg_id = ntohs ((VL_API_CLASSIFY_TABLE_INFO_REPLY));
-      rmp->context = mp->context;
-      rmp->retval = ntohl (VNET_API_ERROR_CLASSIFY_TABLE_NOT_FOUND);
-    }
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t *
-					   mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-send_classify_session_details (unix_shared_memory_queue_t * q,
-			       u32 table_id,
-			       u32 match_length,
-			       vnet_classify_entry_t * e, u32 context)
-{
-  vl_api_classify_session_details_t *rmp;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_CLASSIFY_SESSION_DETAILS);
-  rmp->context = context;
-  rmp->table_id = ntohl (table_id);
-  rmp->hit_next_index = ntohl (e->next_index);
-  rmp->advance = ntohl (e->advance);
-  rmp->opaque_index = ntohl (e->opaque_index);
-  rmp->match_length = ntohl (match_length);
-  clib_memcpy (rmp->match, e->key, match_length);
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_classify_session_dump_t_handler (vl_api_classify_session_dump_t * mp)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  unix_shared_memory_queue_t *q;
-
-  u32 table_id = ntohl (mp->table_id);
-  vnet_classify_table_t *t;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  /* *INDENT-OFF* */
-  pool_foreach (t, cm->tables,
-  ({
-    if (table_id == t - cm->tables)
-      {
-        vnet_classify_bucket_t * b;
-        vnet_classify_entry_t * v, * save_v;
-        int i, j, k;
-
-        for (i = 0; i < t->nbuckets; i++)
-          {
-            b = &t->buckets [i];
-            if (b->offset == 0)
-              continue;
-
-            save_v = vnet_classify_get_entry (t, b->offset);
-            for (j = 0; j < (1<<b->log2_pages); j++)
-              {
-                for (k = 0; k < t->entries_per_page; k++)
-                  {
-                    v = vnet_classify_entry_at_index
-                      (t, save_v, j*t->entries_per_page + k);
-                    if (vnet_classify_entry_is_free (v))
-                      continue;
-
-                    send_classify_session_details
-                      (q, table_id, t->match_n_vectors * sizeof (u32x4),
-                       v, mp->context);
-                  }
-              }
-          }
-        break;
-      }
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_set_ipfix_exporter_t_handler (vl_api_set_ipfix_exporter_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  flow_report_main_t *frm = &flow_report_main;
-  vl_api_set_ipfix_exporter_reply_t *rmp;
-  ip4_address_t collector, src;
-  u16 collector_port = UDP_DST_PORT_ipfix;
-  u32 path_mtu;
-  u32 template_interval;
-  u8 udp_checksum;
-  u32 fib_id;
-  u32 fib_index = ~0;
-  int rv = 0;
-
-  memcpy (collector.data, mp->collector_address, sizeof (collector.data));
-  collector_port = ntohs (mp->collector_port);
-  if (collector_port == (u16) ~ 0)
-    collector_port = UDP_DST_PORT_ipfix;
-  memcpy (src.data, mp->src_address, sizeof (src.data));
-  fib_id = ntohl (mp->vrf_id);
-
-  ip4_main_t *im = &ip4_main;
-  if (fib_id == ~0)
-    {
-      fib_index = ~0;
-    }
-  else
-    {
-      uword *p = hash_get (im->fib_index_by_table_id, fib_id);
-      if (!p)
-	{
-	  rv = VNET_API_ERROR_NO_SUCH_FIB;
-	  goto out;
-	}
-      fib_index = p[0];
-    }
-
-  path_mtu = ntohl (mp->path_mtu);
-  if (path_mtu == ~0)
-    path_mtu = 512;		// RFC 7011 section 10.3.3.
-  template_interval = ntohl (mp->template_interval);
-  if (template_interval == ~0)
-    template_interval = 20;
-  udp_checksum = mp->udp_checksum;
-
-  if (collector.as_u32 == 0)
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto out;
-    }
-
-  if (src.as_u32 == 0)
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto out;
-    }
-
-  if (path_mtu > 1450 /* vpp does not support fragmentation */ )
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto out;
-    }
-
-  if (path_mtu < 68)
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto out;
-    }
-
-  /* Reset report streams if we are reconfiguring IP addresses */
-  if (frm->ipfix_collector.as_u32 != collector.as_u32 ||
-      frm->src_address.as_u32 != src.as_u32 ||
-      frm->collector_port != collector_port)
-    vnet_flow_reports_reset (frm);
-
-  frm->ipfix_collector.as_u32 = collector.as_u32;
-  frm->collector_port = collector_port;
-  frm->src_address.as_u32 = src.as_u32;
-  frm->fib_index = fib_index;
-  frm->path_mtu = path_mtu;
-  frm->template_interval = template_interval;
-  frm->udp_checksum = udp_checksum;
-
-  /* Turn on the flow reporting process */
-  vlib_process_signal_event (vm, flow_report_process_node.index, 1, 0);
-
-out:
-  REPLY_MACRO (VL_API_SET_IPFIX_EXPORTER_REPLY);
-}
-
-static void
-vl_api_ipfix_exporter_dump_t_handler (vl_api_ipfix_exporter_dump_t * mp)
-{
-  flow_report_main_t *frm = &flow_report_main;
-  unix_shared_memory_queue_t *q;
-  vl_api_ipfix_exporter_details_t *rmp;
-  ip4_main_t *im = &ip4_main;
-  u32 vrf_id;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_IPFIX_EXPORTER_DETAILS);
-  rmp->context = mp->context;
-  memcpy (rmp->collector_address, frm->ipfix_collector.data,
-	  sizeof (frm->ipfix_collector.data));
-  rmp->collector_port = htons (frm->collector_port);
-  memcpy (rmp->src_address, frm->src_address.data,
-	  sizeof (frm->src_address.data));
-  if (frm->fib_index == ~0)
-    vrf_id = ~0;
-  else
-    vrf_id = im->fibs[frm->fib_index].ft_table_id;
-  rmp->vrf_id = htonl (vrf_id);
-  rmp->path_mtu = htonl (frm->path_mtu);
-  rmp->template_interval = htonl (frm->template_interval);
-  rmp->udp_checksum = (frm->udp_checksum != 0);
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-  vl_api_set_ipfix_classify_stream_t_handler
-  (vl_api_set_ipfix_classify_stream_t * mp)
-{
-  vl_api_set_ipfix_classify_stream_reply_t *rmp;
-  flow_report_classify_main_t *fcm = &flow_report_classify_main;
-  flow_report_main_t *frm = &flow_report_main;
-  u32 domain_id = 0;
-  u32 src_port = UDP_DST_PORT_ipfix;
-  int rv = 0;
-
-  domain_id = ntohl (mp->domain_id);
-  src_port = ntohs (mp->src_port);
-
-  if (fcm->src_port != 0 &&
-      (fcm->domain_id != domain_id || fcm->src_port != (u16) src_port))
-    {
-      int rv = vnet_stream_change (frm, fcm->domain_id, fcm->src_port,
-				   domain_id, (u16) src_port);
-      ASSERT (rv == 0);
-    }
-
-  fcm->domain_id = domain_id;
-  fcm->src_port = (u16) src_port;
-
-  REPLY_MACRO (VL_API_SET_IPFIX_CLASSIFY_STREAM_REPLY);
-}
-
-static void
-  vl_api_ipfix_classify_stream_dump_t_handler
-  (vl_api_ipfix_classify_stream_dump_t * mp)
-{
-  flow_report_classify_main_t *fcm = &flow_report_classify_main;
-  unix_shared_memory_queue_t *q;
-  vl_api_ipfix_classify_stream_details_t *rmp;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_IPFIX_CLASSIFY_STREAM_DETAILS);
-  rmp->context = mp->context;
-  rmp->domain_id = htonl (fcm->domain_id);
-  rmp->src_port = htons (fcm->src_port);
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-  vl_api_ipfix_classify_table_add_del_t_handler
-  (vl_api_ipfix_classify_table_add_del_t * mp)
-{
-  vl_api_ipfix_classify_table_add_del_reply_t *rmp;
-  flow_report_classify_main_t *fcm = &flow_report_classify_main;
-  flow_report_main_t *frm = &flow_report_main;
-  vnet_flow_report_add_del_args_t args;
-  ipfix_classify_table_t *table;
-  int is_add;
-  u32 classify_table_index;
-  u8 ip_version;
-  u8 transport_protocol;
-  int rv = 0;
-
-  classify_table_index = ntohl (mp->table_id);
-  ip_version = mp->ip_version;
-  transport_protocol = mp->transport_protocol;
-  is_add = mp->is_add;
-
-  if (fcm->src_port == 0)
-    {
-      /* call set_ipfix_classify_stream first */
-      rv = VNET_API_ERROR_UNSPECIFIED;
-      goto out;
-    }
-
-  memset (&args, 0, sizeof (args));
-
-  table = 0;
-  int i;
-  for (i = 0; i < vec_len (fcm->tables); i++)
-    if (ipfix_classify_table_index_valid (i))
-      if (fcm->tables[i].classify_table_index == classify_table_index)
-	{
-	  table = &fcm->tables[i];
-	  break;
-	}
-
-  if (is_add)
-    {
-      if (table)
-	{
-	  rv = VNET_API_ERROR_VALUE_EXIST;
-	  goto out;
-	}
-      table = ipfix_classify_add_table ();
-      table->classify_table_index = classify_table_index;
-    }
-  else
-    {
-      if (!table)
-	{
-	  rv = VNET_API_ERROR_NO_SUCH_ENTRY;
-	  goto out;
-	}
-    }
-
-  table->ip_version = ip_version;
-  table->transport_protocol = transport_protocol;
-
-  args.opaque.as_uword = table - fcm->tables;
-  args.rewrite_callback = ipfix_classify_template_rewrite;
-  args.flow_data_callback = ipfix_classify_send_flows;
-  args.is_add = is_add;
-  args.domain_id = fcm->domain_id;
-  args.src_port = fcm->src_port;
-
-  rv = vnet_flow_report_add_del (frm, &args);
-
-  /* If deleting, or add failed */
-  if (is_add == 0 || (rv && is_add))
-    ipfix_classify_delete_table (table - fcm->tables);
-
-out:
-  REPLY_MACRO (VL_API_SET_IPFIX_CLASSIFY_STREAM_REPLY);
-}
-
-static void
-send_ipfix_classify_table_details (u32 table_index,
-				   unix_shared_memory_queue_t * q,
-				   u32 context)
-{
-  flow_report_classify_main_t *fcm = &flow_report_classify_main;
-  vl_api_ipfix_classify_table_details_t *mp;
-
-  ipfix_classify_table_t *table = &fcm->tables[table_index];
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IPFIX_CLASSIFY_TABLE_DETAILS);
-  mp->context = context;
-  mp->table_id = htonl (table->classify_table_index);
-  mp->ip_version = table->ip_version;
-  mp->transport_protocol = table->transport_protocol;
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-  vl_api_ipfix_classify_table_dump_t_handler
-  (vl_api_ipfix_classify_table_dump_t * mp)
-{
-  flow_report_classify_main_t *fcm = &flow_report_classify_main;
-  unix_shared_memory_queue_t *q;
-  u32 i;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (!q)
-    return;
-
-  for (i = 0; i < vec_len (fcm->tables); i++)
-    if (ipfix_classify_table_index_valid (i))
-      send_ipfix_classify_table_details (i, q, mp->context);
-}
-
-static void
-vl_api_pg_create_interface_t_handler (vl_api_pg_create_interface_t * mp)
-{
-  vl_api_pg_create_interface_reply_t *rmp;
-  int rv = 0;
-
-  pg_main_t *pg = &pg_main;
-  u32 pg_if_id = pg_interface_add_or_get (pg, ntohl (mp->interface_id));
-  pg_interface_t *pi = pool_elt_at_index (pg->interfaces, pg_if_id);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_PG_CREATE_INTERFACE_REPLY,
-  ({
-    rmp->sw_if_index = ntohl(pi->sw_if_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_pg_capture_t_handler (vl_api_pg_capture_t * mp)
-{
-  vl_api_pg_capture_reply_t *rmp;
-  int rv = 0;
-
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-  vnet_hw_interface_t *hi = 0;
-
-  u8 *intf_name = format (0, "pg%d", ntohl (mp->interface_id), 0);
-  u32 hw_if_index = ~0;
-  uword *p = hash_get_mem (im->hw_interface_by_name, intf_name);
-  if (p)
-    hw_if_index = *p;
-  vec_free (intf_name);
-
-  if (hw_if_index != ~0)
-    {
-      pg_capture_args_t _a, *a = &_a;
-
-      u32 len = ntohl (mp->pcap_name_length);
-      u8 *pcap_file_name = vec_new (u8, len);
-      clib_memcpy (pcap_file_name, mp->pcap_file_name, len);
-
-      hi = vnet_get_sup_hw_interface (vnm, hw_if_index);
-      a->hw_if_index = hw_if_index;
-      a->dev_instance = hi->dev_instance;
-      a->is_enabled = mp->is_enabled;
-      a->pcap_file_name = pcap_file_name;
-      a->count = ntohl (mp->count);
-
-      clib_error_t *e = pg_capture (a);
-      if (e)
-	{
-	  clib_error_report (e);
-	  rv = VNET_API_ERROR_CANNOT_CREATE_PCAP_FILE;
-	}
-
-      vec_free (pcap_file_name);
-    }
-  REPLY_MACRO (VL_API_PG_CAPTURE_REPLY);
-}
-
-static void
-vl_api_pg_enable_disable_t_handler (vl_api_pg_enable_disable_t * mp)
-{
-  vl_api_pg_enable_disable_reply_t *rmp;
-  int rv = 0;
-
-  pg_main_t *pg = &pg_main;
-  u32 stream_index = ~0;
-
-  int is_enable = mp->is_enabled != 0;
-  u32 len = ntohl (mp->stream_name_length) - 1;
-
-  if (len > 0)
-    {
-      u8 *stream_name = vec_new (u8, len);
-      clib_memcpy (stream_name, mp->stream_name, len);
-      uword *p = hash_get_mem (pg->stream_index_by_name, stream_name);
-      if (p)
-	stream_index = *p;
-      vec_free (stream_name);
-    }
-
-  pg_enable_disable (stream_index, is_enable);
-
-  REPLY_MACRO (VL_API_PG_ENABLE_DISABLE_REPLY);
-}
-
-static void
-  vl_api_ip_source_and_port_range_check_add_del_t_handler
-  (vl_api_ip_source_and_port_range_check_add_del_t * mp)
-{
-  vl_api_ip_source_and_port_range_check_add_del_reply_t *rmp;
-  int rv = 0;
-
-  u8 is_ipv6 = mp->is_ipv6;
-  u8 is_add = mp->is_add;
-  u8 mask_length = mp->mask_length;
-  ip4_address_t ip4_addr;
-  ip6_address_t ip6_addr;
-  u16 *low_ports = 0;
-  u16 *high_ports = 0;
-  u32 vrf_id;
-  u16 tmp_low, tmp_high;
-  u8 num_ranges;
-  int i;
-
-  // Validate port range
-  num_ranges = mp->number_of_ranges;
-  if (num_ranges > 32)
-    {				// This is size of array in VPE.API
-      rv = VNET_API_ERROR_EXCEEDED_NUMBER_OF_RANGES_CAPACITY;
-      goto reply;
-    }
-
-  vec_reset_length (low_ports);
-  vec_reset_length (high_ports);
-
-  for (i = 0; i < num_ranges; i++)
-    {
-      tmp_low = mp->low_ports[i];
-      tmp_high = mp->high_ports[i];
-      // If tmp_low <= tmp_high then only need to check tmp_low = 0
-      // If tmp_low <= tmp_high then only need to check tmp_high > 65535
-      if (tmp_low > tmp_high || tmp_low == 0 || tmp_high > 65535)
-	{
-	  rv = VNET_API_ERROR_INVALID_VALUE;
-	  goto reply;
-	}
-      vec_add1 (low_ports, tmp_low);
-      vec_add1 (high_ports, tmp_high + 1);
-    }
-
-  // Validate mask_length
-  if ((is_ipv6 && mask_length > 128) || (!is_ipv6 && mask_length > 32))
-    {
-      rv = VNET_API_ERROR_ADDRESS_LENGTH_MISMATCH;
-      goto reply;
-    }
-
-  vrf_id = ntohl (mp->vrf_id);
-
-  if (vrf_id < 1)
-    {
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto reply;
-    }
-
-
-  if (is_ipv6)
-    {
-      clib_memcpy (ip6_addr.as_u8, mp->address, sizeof (ip6_addr.as_u8));
-      rv = ip6_source_and_port_range_check_add_del (&ip6_addr,
-						    mask_length,
-						    vrf_id,
-						    low_ports,
-						    high_ports, is_add);
-    }
-  else
-    {
-      clib_memcpy (ip4_addr.data, mp->address, sizeof (ip4_addr));
-      rv = ip4_source_and_port_range_check_add_del (&ip4_addr,
-						    mask_length,
-						    vrf_id,
-						    low_ports,
-						    high_ports, is_add);
-    }
-
-reply:
-  vec_free (low_ports);
-  vec_free (high_ports);
-  REPLY_MACRO (VL_API_IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL_REPLY);
-}
-
-static void
-  vl_api_ip_source_and_port_range_check_interface_add_del_t_handler
-  (vl_api_ip_source_and_port_range_check_interface_add_del_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_ip_source_and_port_range_check_interface_add_del_reply_t *rmp;
-  ip4_main_t *im = &ip4_main;
-  int rv;
-  u32 sw_if_index;
-  u32 fib_index[IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS];
-  u32 vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS];
-  uword *p = 0;
-  int i;
-
-  vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_OUT] =
-    ntohl (mp->tcp_out_vrf_id);
-  vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_OUT] =
-    ntohl (mp->udp_out_vrf_id);
-  vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_TCP_IN] =
-    ntohl (mp->tcp_in_vrf_id);
-  vrf_id[IP_SOURCE_AND_PORT_RANGE_CHECK_PROTOCOL_UDP_IN] =
-    ntohl (mp->udp_in_vrf_id);
-
-
-  for (i = 0; i < IP_SOURCE_AND_PORT_RANGE_CHECK_N_PROTOCOLS; i++)
-    {
-      if (vrf_id[i] != 0 && vrf_id[i] != ~0)
-	{
-	  p = hash_get (im->fib_index_by_table_id, vrf_id[i]);
-
-	  if (p == 0)
-	    {
-	      rv = VNET_API_ERROR_INVALID_VALUE;
-	      goto reply;
-	    }
-
-	  fib_index[i] = p[0];
-	}
-      else
-	fib_index[i] = ~0;
-    }
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv =
-    set_ip_source_and_port_range_check (vm, fib_index, sw_if_index,
-					mp->is_add);
-
-  BAD_SW_IF_INDEX_LABEL;
-reply:
-
-  REPLY_MACRO (VL_API_IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL_REPLY);
-}
-
-static void
-vl_api_delete_subif_t_handler (vl_api_delete_subif_t * mp)
-{
-  vl_api_delete_subif_reply_t *rmp;
-  int rv;
-
-  rv = vnet_delete_sub_interface (ntohl (mp->sw_if_index));
-
-  REPLY_MACRO (VL_API_DELETE_SUBIF_REPLY);
-}
-
-static void
-  vl_api_l2_interface_pbb_tag_rewrite_t_handler
-  (vl_api_l2_interface_pbb_tag_rewrite_t * mp)
-{
-  vl_api_l2_interface_pbb_tag_rewrite_reply_t *rmp;
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
-  u32 vtr_op;
-  int rv = 0;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  vtr_op = ntohl (mp->vtr_op);
-
-  switch (vtr_op)
-    {
-    case L2_VTR_DISABLED:
-    case L2_VTR_PUSH_2:
-    case L2_VTR_POP_2:
-    case L2_VTR_TRANSLATE_2_1:
-      break;
-
-    default:
-      rv = VNET_API_ERROR_INVALID_VALUE;
-      goto bad_sw_if_index;
-    }
-
-  rv = l2pbb_configure (vm, vnm, ntohl (mp->sw_if_index), vtr_op,
-			mp->b_dmac, mp->b_smac, ntohs (mp->b_vlanid),
-			ntohl (mp->i_sid), ntohs (mp->outer_tag));
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_L2_INTERFACE_PBB_TAG_REWRITE_REPLY);
-
-}
-
-static void
-vl_api_punt_t_handler (vl_api_punt_t * mp)
-{
-  vl_api_punt_reply_t *rmp;
-  vlib_main_t *vm = vlib_get_main ();
-  int rv = 0;
-  clib_error_t *error;
-
-  error = vnet_punt_add_del (vm, mp->ipv, mp->l4_protocol,
-			     ntohs (mp->l4_port), mp->is_add);
-  if (error)
-    {
-      rv = -1;
-      clib_error_report (error);
-    }
-
-  REPLY_MACRO (VL_API_PUNT_REPLY);
-}
-
-static void
-  vl_api_flow_classify_set_interface_t_handler
-  (vl_api_flow_classify_set_interface_t * mp)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  vl_api_flow_classify_set_interface_reply_t *rmp;
-  int rv;
-  u32 sw_if_index, ip4_table_index, ip6_table_index;
-
-  ip4_table_index = ntohl (mp->ip4_table_index);
-  ip6_table_index = ntohl (mp->ip6_table_index);
-  sw_if_index = ntohl (mp->sw_if_index);
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = vnet_set_flow_classify_intfc (vm, sw_if_index, ip4_table_index,
-				     ip6_table_index, mp->is_add);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_FLOW_CLASSIFY_SET_INTERFACE_REPLY);
-}
-
-static void
-send_flow_classify_details (u32 sw_if_index,
-			    u32 table_index,
-			    unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_flow_classify_details_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_FLOW_CLASSIFY_DETAILS);
-  mp->context = context;
-  mp->sw_if_index = htonl (sw_if_index);
-  mp->table_index = htonl (table_index);
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_flow_classify_dump_t_handler (vl_api_flow_classify_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  flow_classify_main_t *pcm = &flow_classify_main;
-  u32 *vec_tbl;
-  int i;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  vec_tbl = pcm->classify_table_index_by_sw_if_index[mp->type];
-
-  if (vec_len (vec_tbl))
-    {
-      for (i = 0; i < vec_len (vec_tbl); i++)
-	{
-	  if (vec_elt (vec_tbl, i) == ~0)
-	    continue;
-
-	  send_flow_classify_details (i, vec_elt (vec_tbl, i), q,
-				      mp->context);
-	}
-    }
-}
-
-static void
-vl_api_feature_enable_disable_t_handler (vl_api_feature_enable_disable_t * mp)
-{
-  vl_api_feature_enable_disable_reply_t *rmp;
-  int rv = 0;
-  u8 *arc_name, *feature_name;
-
-  VALIDATE_SW_IF_INDEX (mp);
-
-  arc_name = format (0, "%s%c", mp->arc_name, 0);
-  feature_name = format (0, "%s%c", mp->feature_name, 0);
-
-  vnet_feature_registration_t *reg;
-  reg =
-    vnet_get_feature_reg ((const char *) arc_name,
-			  (const char *) feature_name);
-  if (reg == 0)
-    rv = VNET_API_ERROR_INVALID_VALUE;
-  else
-    {
-      u32 sw_if_index;
-      clib_error_t *error = 0;
-
-      sw_if_index = ntohl (mp->sw_if_index);
-      if (reg->enable_disable_cb)
-	error = reg->enable_disable_cb (sw_if_index, mp->enable);
-      if (!error)
-	vnet_feature_enable_disable ((const char *) arc_name,
-				     (const char *) feature_name,
-				     sw_if_index, mp->enable, 0, 0);
-      else
-	{
-	  clib_error_report (error);
-	  rv = VNET_API_ERROR_CANNOT_ENABLE_DISABLE_FEATURE;
-	}
-    }
-
-  vec_free (feature_name);
-  vec_free (arc_name);
-
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO (VL_API_FEATURE_ENABLE_DISABLE_REPLY);
-}
-
-#define BOUNCE_HANDLER(nn)                                              \
-static void vl_api_##nn##_t_handler (                                   \
-    vl_api_##nn##_t *mp)                                                \
-{                                                                       \
-    vpe_client_registration_t *reg;                                     \
-    vpe_api_main_t * vam = &vpe_api_main;                               \
-    unix_shared_memory_queue_t * q;                                     \
-                                                                        \
-    /* One registration only... */                                      \
-    pool_foreach(reg, vam->nn##_registrations,                          \
-    ({                                                                  \
-        q = vl_api_client_index_to_input_queue (reg->client_index);     \
-        if (q) {                                                        \
-            /*                                                          \
-             * If the queue is stuffed, turf the msg and complain       \
-             * It's unlikely that the intended recipient is             \
-             * alive; avoid deadlock at all costs.                      \
-             */                                                         \
-            if (q->cursize == q->maxsize) {                             \
-                clib_warning ("ERROR: receiver queue full, drop msg");  \
-                vl_msg_api_free (mp);                                   \
-                return;                                                 \
-            }                                                           \
-            vl_msg_api_send_shmem (q, (u8 *)&mp);                       \
-            return;                                                     \
-        }                                                               \
-    }));                                                                \
-    vl_msg_api_free (mp);                                               \
-}
-
-static void setup_message_id_table (api_main_t * am);
-
-/*
- * vpe_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
- * added the client registration handlers.
- * See .../open-repo/vlib/memclnt_vlib.c:memclnt_process()
- */
-static clib_error_t *
-vpe_api_hookup (vlib_main_t * vm)
-{
-  api_main_t *am = &api_main;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
-  /*
-   * Manually register the sr tunnel add del msg, so we trace
-   * enough bytes to capture a typical segment list
-   */
-  vl_msg_api_set_handlers (VL_API_SR_TUNNEL_ADD_DEL,
-			   "sr_tunnel_add_del",
-			   vl_api_sr_tunnel_add_del_t_handler,
-			   vl_noop_handler,
-			   vl_api_sr_tunnel_add_del_t_endian,
-			   vl_api_sr_tunnel_add_del_t_print, 256, 1);
-
-
-  /*
-   * Manually register the sr policy add del msg, so we trace
-   * enough bytes to capture a typical tunnel name list
-   */
-  vl_msg_api_set_handlers (VL_API_SR_POLICY_ADD_DEL,
-			   "sr_policy_add_del",
-			   vl_api_sr_policy_add_del_t_handler,
-			   vl_noop_handler,
-			   vl_api_sr_policy_add_del_t_endian,
-			   vl_api_sr_policy_add_del_t_print, 256, 1);
-
-  /*
-   * Trace space for 8 MPLS encap labels, classifier mask+match
-   */
-  am->api_trace_cfg[VL_API_MPLS_TUNNEL_ADD_DEL].size += 8 * sizeof (u32);
-  am->api_trace_cfg[VL_API_CLASSIFY_ADD_DEL_TABLE].size += 5 * sizeof (u32x4);
-  am->api_trace_cfg[VL_API_CLASSIFY_ADD_DEL_SESSION].size
-    += 5 * sizeof (u32x4);
-  am->api_trace_cfg[VL_API_VXLAN_ADD_DEL_TUNNEL].size += 16 * sizeof (u32);
-
-  /*
-   * Thread-safe API messages
-   */
-  am->is_mp_safe[VL_API_IP_ADD_DEL_ROUTE] = 1;
-  am->is_mp_safe[VL_API_GET_NODE_GRAPH] = 1;
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (am);
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (vpe_api_hookup);
-
-static clib_error_t *
-vpe_api_init (vlib_main_t * vm)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-
-  am->vlib_main = vm;
-  am->vnet_main = vnet_get_main ();
-  am->interface_events_registration_hash = hash_create (0, sizeof (uword));
-  am->to_netconf_server_registration_hash = hash_create (0, sizeof (uword));
-  am->from_netconf_server_registration_hash = hash_create (0, sizeof (uword));
-  am->to_netconf_client_registration_hash = hash_create (0, sizeof (uword));
-  am->from_netconf_client_registration_hash = hash_create (0, sizeof (uword));
-  am->oam_events_registration_hash = hash_create (0, sizeof (uword));
-  am->bfd_events_registration_hash = hash_create (0, sizeof (uword));
-
-  vl_api_init (vm);
-  vl_set_memory_region_name ("/vpe-api");
-  vl_enable_disable_memory_api (vm, 1 /* enable it */ );
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (vpe_api_init);
-
-
-static clib_error_t *
-api_segment_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  u8 *chroot_path;
-  u64 baseva, size, pvt_heap_size;
-  int uid, gid, rv;
-  const int max_buf_size = 4096;
-  char *s, *buf;
-  struct passwd _pw, *pw;
-  struct group _grp, *grp;
-  clib_error_t *e;
-  buf = vec_new (char, 128);
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "prefix %s", &chroot_path))
-	{
-	  vec_add1 (chroot_path, 0);
-	  vl_set_memory_root_path ((char *) chroot_path);
-	}
-      else if (unformat (input, "uid %d", &uid))
-	vl_set_memory_uid (uid);
-      else if (unformat (input, "gid %d", &gid))
-	vl_set_memory_gid (gid);
-      else if (unformat (input, "baseva %llx", &baseva))
-	vl_set_global_memory_baseva (baseva);
-      else if (unformat (input, "global-size %lldM", &size))
-	vl_set_global_memory_size (size * (1ULL << 20));
-      else if (unformat (input, "global-size %lldG", &size))
-	vl_set_global_memory_size (size * (1ULL << 30));
-      else if (unformat (input, "global-size %lld", &size))
-	vl_set_global_memory_size (size);
-      else if (unformat (input, "global-pvt-heap-size %lldM", &pvt_heap_size))
-	vl_set_global_pvt_heap_size (pvt_heap_size * (1ULL << 20));
-      else if (unformat (input, "global-pvt-heap-size size %lld",
-			 &pvt_heap_size))
-	vl_set_global_pvt_heap_size (pvt_heap_size);
-      else if (unformat (input, "api-pvt-heap-size %lldM", &pvt_heap_size))
-	vl_set_api_pvt_heap_size (pvt_heap_size * (1ULL << 20));
-      else if (unformat (input, "api-pvt-heap-size size %lld",
-			 &pvt_heap_size))
-	vl_set_api_pvt_heap_size (pvt_heap_size);
-      else if (unformat (input, "api-size %lldM", &size))
-	vl_set_api_memory_size (size * (1ULL << 20));
-      else if (unformat (input, "api-size %lldG", &size))
-	vl_set_api_memory_size (size * (1ULL << 30));
-      else if (unformat (input, "api-size %lld", &size))
-	vl_set_api_memory_size (size);
-      else if (unformat (input, "uid %s", &s))
-	{
-	  /* lookup the username */
-	  pw = NULL;
-	  while (((rv =
-		   getpwnam_r (s, &_pw, buf, vec_len (buf), &pw)) == ERANGE)
-		 && (vec_len (buf) <= max_buf_size))
-	    {
-	      vec_resize (buf, vec_len (buf) * 2);
-	    }
-	  if (rv < 0)
-	    {
-	      e = clib_error_return_code (0, rv,
-					  CLIB_ERROR_ERRNO_VALID |
-					  CLIB_ERROR_FATAL,
-					  "cannot fetch username %s", s);
-	      vec_free (s);
-	      vec_free (buf);
-	      return e;
-	    }
-	  if (pw == NULL)
-	    {
-	      e =
-		clib_error_return_fatal (0, "username %s does not exist", s);
-	      vec_free (s);
-	      vec_free (buf);
-	      return e;
-	    }
-	  vec_free (s);
-	  vl_set_memory_uid (pw->pw_uid);
-	}
-      else if (unformat (input, "gid %s", &s))
-	{
-	  /* lookup the group name */
-	  grp = NULL;
-	  while (((rv =
-		   getgrnam_r (s, &_grp, buf, vec_len (buf), &grp)) == ERANGE)
-		 && (vec_len (buf) <= max_buf_size))
-	    {
-	      vec_resize (buf, vec_len (buf) * 2);
-	    }
-	  if (rv != 0)
-	    {
-	      e = clib_error_return_code (0, rv,
-					  CLIB_ERROR_ERRNO_VALID |
-					  CLIB_ERROR_FATAL,
-					  "cannot fetch group %s", s);
-	      vec_free (s);
-	      vec_free (buf);
-	      return e;
-	    }
-	  if (grp == NULL)
-	    {
-	      e = clib_error_return_fatal (0, "group %s does not exist", s);
-	      vec_free (s);
-	      vec_free (buf);
-	      return e;
-	    }
-	  vec_free (s);
-	  vec_free (buf);
-	  vl_set_memory_gid (grp->gr_gid);
-	}
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-  return 0;
-}
-
-VLIB_EARLY_CONFIG_FUNCTION (api_segment_config, "api-segment");
-
-void *
-get_unformat_vnet_sw_interface (void)
-{
-  return (void *) &unformat_vnet_sw_interface;
-}
-
-static u8 *
-format_arp_event (u8 * s, va_list * args)
-{
-  vl_api_ip4_arp_event_t *event = va_arg (*args, vl_api_ip4_arp_event_t *);
-
-  s = format (s, "pid %d: ", event->pid);
-  if (event->mac_ip)
-    s = format (s, "bd mac/ip4 binding events");
-  else
-    s = format (s, "resolution for %U", format_ip4_address, &event->address);
-  return s;
-}
-
-static u8 *
-format_nd_event (u8 * s, va_list * args)
-{
-  vl_api_ip6_nd_event_t *event = va_arg (*args, vl_api_ip6_nd_event_t *);
-
-  s = format (s, "pid %d: ", event->pid);
-  if (event->mac_ip)
-    s = format (s, "bd mac/ip6 binding events");
-  else
-    s = format (s, "resolution for %U", format_ip6_address, event->address);
-  return s;
-}
-
-static clib_error_t *
-show_ip_arp_nd_events_fn (vlib_main_t * vm,
-			  unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vpe_api_main_t *am = &vpe_api_main;
-  vl_api_ip4_arp_event_t *arp_event;
-  vl_api_ip6_nd_event_t *nd_event;
-
-  if ((pool_elts (am->arp_events) == 0) && (pool_elts (am->nd_events) == 0))
-    {
-      vlib_cli_output (vm, "No active arp or nd event registrations");
-      return 0;
-    }
-
-  /* *INDENT-OFF* */
-  pool_foreach (arp_event, am->arp_events,
-  ({
-    vlib_cli_output (vm, "%U", format_arp_event, arp_event);
-  }));
-
-  pool_foreach (nd_event, am->nd_events,
-  ({
-    vlib_cli_output (vm, "%U", format_nd_event, nd_event);
-  }));
-  /* *INDENT-ON* */
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_ip_arp_nd_events, static) = {
-  .path = "show arp-nd-event registrations",
-  .function = show_ip_arp_nd_events_fn,
-  .short_help = "Show ip4 arp and ip6 nd event registrations",
-};
-/* *INDENT-ON* */
-
-#define vl_msg_name_crc_list
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_memclnt;
-  foreach_vl_msg_name_crc_vpe;
-#undef _
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/vpp-api/api_format.c b/vpp/vpp-api/api_format.c
deleted file mode 120000
index f37e6575..00000000
--- a/vpp/vpp-api/api_format.c
+++ /dev/null
@@ -1 +0,0 @@
-../../vpp-api-test/vat/api_format.c
\ No newline at end of file
diff --git a/vpp/vpp-api/api_main.c b/vpp/vpp-api/api_main.c
deleted file mode 100644
index db532061..00000000
--- a/vpp/vpp-api/api_main.c
+++ /dev/null
@@ -1,192 +0,0 @@
-#include "vat.h"
-
-vat_main_t vat_main;
-
-void
-vat_suspend (vlib_main_t * vm, f64 interval)
-{
-  vlib_process_suspend (vm, interval);
-}
-
-static u8 *
-format_api_error (u8 * s, va_list * args)
-{
-  vat_main_t *vam = va_arg (*args, vat_main_t *);
-  i32 error = va_arg (*args, u32);
-  uword *p;
-
-  p = hash_get (vam->error_string_by_error_number, -error);
-
-  if (p)
-    s = format (s, "%s", p[0]);
-  else
-    s = format (s, "%d", error);
-  return s;
-}
-
-
-static void
-init_error_string_table (vat_main_t * vam)
-{
-
-  vam->error_string_by_error_number = hash_create (0, sizeof (uword));
-
-#define _(n,v,s) hash_set (vam->error_string_by_error_number, -v, s);
-  foreach_vnet_api_error;
-#undef _
-
-  hash_set (vam->error_string_by_error_number, 99, "Misc");
-}
-
-static clib_error_t *
-api_main_init (vlib_main_t * vm)
-{
-  vat_main_t *vam = &vat_main;
-
-  vam->vlib_main = vm;
-  vam->my_client_index = (u32) ~ 0;
-  init_error_string_table (vam);
-  vat_api_hookup (vam);
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (api_main_init);
-
-static clib_error_t *
-api_command_fn (vlib_main_t * vm,
-		unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vat_main_t *vam = &vat_main;
-  unformat_input_t _input;
-  uword c;
-  u8 *cmdp, *argsp, *this_cmd;
-  uword *p;
-  u32 arg_len;
-  int rv;
-  int (*fp) (vat_main_t *);
-  api_main_t *am = &api_main;
-
-  vam->vl_input_queue = am->shmem_hdr->vl_input_queue;
-
-  vec_reset_length (vam->inbuf);
-  vam->input = &_input;
-
-  while (((c = unformat_get_input (input)) != '\n') &&
-	 (c != UNFORMAT_END_OF_INPUT))
-    vec_add1 (vam->inbuf, c);
-
-  /* Add 1 octet's worth of extra space in case there are no args... */
-  vec_add1 (vam->inbuf, 0);
-
-  /*$$$$ reinstall macro evaluator */
-
-  /* Split input into cmd + args */
-  this_cmd = cmdp = vam->inbuf;
-
-  while (cmdp < (this_cmd + vec_len (this_cmd)))
-    {
-      if (*cmdp == ' ' || *cmdp == '\t' || *cmdp == '\n')
-	{
-	  cmdp++;
-	}
-      else
-	break;
-    }
-
-  argsp = cmdp;
-  while (argsp < (this_cmd + vec_len (this_cmd)))
-    {
-      if (*argsp != ' ' && *argsp != '\t' && *argsp != '\n')
-	{
-	  argsp++;
-	}
-      else
-	break;
-    }
-  *argsp++ = 0;
-
-  while (argsp < (this_cmd + vec_len (this_cmd)))
-    {
-      if (*argsp == ' ' || *argsp == '\t' || *argsp == '\n')
-	{
-	  argsp++;
-	}
-      else
-	break;
-    }
-
-  /* Blank input line? */
-  if (*cmdp == 0)
-    return 0;
-
-  p = hash_get_mem (vam->function_by_name, cmdp);
-  if (p == 0)
-    {
-      return clib_error_return (0, "'%s': function not found\n", cmdp);
-    }
-
-  arg_len = strlen ((char *) argsp);
-
-  unformat_init_string (vam->input, (char *) argsp, arg_len);
-  fp = (void *) p[0];
-
-  rv = (*fp) (vam);
-
-  if (rv < 0)
-    {
-      unformat_free (vam->input);
-      return clib_error_return (0,
-				"%s error: %U\n", cmdp,
-				format_api_error, vam, rv);
-
-      if (vam->regenerate_interface_table)
-	{
-	  vam->regenerate_interface_table = 0;
-	  api_sw_interface_dump (vam);
-	}
-    }
-  unformat_free (vam->input);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (api_command, static) =
-{
-  .path = "binary-api",
-  .short_help = "binary-api <name> [<args>]",
-  .function = api_command_fn,
-};
-/* *INDENT-ON* */
-
-void
-api_cli_output (void *notused, const char *fmt, ...)
-{
-  va_list va;
-  vat_main_t *vam = &vat_main;
-  vlib_main_t *vm = vam->vlib_main;
-  vlib_process_t *cp = vlib_get_current_process (vm);
-  u8 *s;
-
-  va_start (va, fmt);
-  s = va_format (0, fmt, &va);
-  va_end (va);
-
-  /* Terminate with \n if not present. */
-  if (vec_len (s) > 0 && s[vec_len (s) - 1] != '\n')
-    vec_add1 (s, '\n');
-
-  if ((!cp) || (!cp->output_function))
-    fformat (stdout, "%v", s);
-  else
-    cp->output_function (cp->output_function_arg, s, vec_len (s));
-
-  vec_free (s);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/vpp-api/custom_dump.c b/vpp/vpp-api/custom_dump.c
deleted file mode 100644
index bfebf49f..00000000
--- a/vpp/vpp-api/custom_dump.c
+++ /dev/null
@@ -1,3139 +0,0 @@
-/*
- *------------------------------------------------------------------
- * custom_dump.c - pretty-print API messages for replay
- *
- * Copyright (c) 2014-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/unix/tuntap.h>
-#include <vnet/mpls/mpls.h>
-#include <vnet/dhcp/proxy.h>
-#include <vnet/dhcpv6/proxy.h>
-#include <vnet/l2tp/l2tp.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/sr/sr_packet.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <vnet/classify/policer_classify.h>
-#include <vnet/policer/xlate.h>
-#include <vnet/policer/policer.h>
-#include <vnet/classify/flow_classify.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vnet/lisp-cp/lisp_types.h>
-
-#include <stats/stats.h>
-#include <oam/oam.h>
-
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/l2/l2_vtr.h>
-
-#include <vpp-api/vpe_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-
-#define FINISH                                  \
-    vec_add1 (s, 0);                            \
-    vl_print (handle, (char *)s);               \
-    vec_free (s);                               \
-    return handle;
-
-
-static void *vl_api_create_loopback_t_print
-  (vl_api_create_loopback_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: create_loopback ");
-  s = format (s, "mac %U ", format_ethernet_address, &mp->mac_address);
-
-  FINISH;
-}
-
-static void *vl_api_delete_loopback_t_print
-  (vl_api_delete_loopback_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: delete_loopback ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_set_flags_t_print
-  (vl_api_sw_interface_set_flags_t * mp, void *handle)
-{
-  u8 *s;
-  s = format (0, "SCRIPT: sw_interface_set_flags ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  if (mp->admin_up_down)
-    s = format (s, "admin-up ");
-  else
-    s = format (s, "admin-down ");
-
-  if (mp->link_up_down)
-    s = format (s, "link-up");
-  else
-    s = format (s, "link-down");
-
-  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);
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-  if (mp->del_all)
-    s = format (s, "del-all ");
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_set_table_t_print
-  (vl_api_sw_interface_set_table_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_set_table ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  if (mp->vrf_id)
-    s = format (s, "vrf %d ", ntohl (mp->vrf_id));
-
-  if (mp->is_ipv6)
-    s = format (s, "ipv6 ");
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_set_mpls_enable_t_print
-  (vl_api_sw_interface_set_mpls_enable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_set_mpls_enable ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  if (mp->enable == 0)
-    s = format (s, "disable");
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_set_vpath_t_print
-  (vl_api_sw_interface_set_vpath_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_set_vpath ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  if (mp->enable)
-    s = format (s, "enable ");
-  else
-    s = format (s, "disable ");
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_set_vxlan_bypass_t_print
-  (vl_api_sw_interface_set_vxlan_bypass_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_set_vxlan_bypass ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  if (mp->is_ipv6)
-    s = format (s, "ip6");
-
-  if (mp->enable)
-    s = format (s, "enable ");
-  else
-    s = format (s, "disable ");
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_set_l2_xconnect_t_print
-  (vl_api_sw_interface_set_l2_xconnect_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_set_l2_xconnect ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->rx_sw_if_index));
-
-  if (mp->enable)
-    {
-      s = format (s, "tx_sw_if_index %d ", ntohl (mp->tx_sw_if_index));
-    }
-  else
-    s = format (s, "delete ");
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_set_l2_bridge_t_print
-  (vl_api_sw_interface_set_l2_bridge_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_set_l2_bridge ");
-
-  s = format (s, "sw_if_index %d ", ntohl (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 " : " "));
-    }
-  else
-    s = format (s, "disable ");
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_set_dpdk_hqos_pipe_t_print
-  (vl_api_sw_interface_set_dpdk_hqos_pipe_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_set_dpdk_hqos_pipe ");
-
-  s = format (s, "sw_if_index %u ", ntohl (mp->sw_if_index));
-
-  s = format (s, "subport %u  pipe %u  profile %u ",
-	      ntohl (mp->subport), ntohl (mp->pipe), ntohl (mp->profile));
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_set_dpdk_hqos_subport_t_print
-  (vl_api_sw_interface_set_dpdk_hqos_subport_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_set_dpdk_hqos_subport ");
-
-  s = format (s, "sw_if_index %u ", ntohl (mp->sw_if_index));
-
-  s =
-    format (s,
-	    "subport %u  rate %u  bkt_size %u  tc0 %u tc1 %u tc2 %u tc3 %u period %u",
-	    ntohl (mp->subport), ntohl (mp->tb_rate), ntohl (mp->tb_size),
-	    ntohl (mp->tc_rate[0]), ntohl (mp->tc_rate[1]),
-	    ntohl (mp->tc_rate[2]), ntohl (mp->tc_rate[3]),
-	    ntohl (mp->tc_period));
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_set_dpdk_hqos_tctbl_t_print
-  (vl_api_sw_interface_set_dpdk_hqos_tctbl_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_set_dpdk_hqos_tctbl ");
-
-  s = format (s, "sw_if_index %u ", ntohl (mp->sw_if_index));
-
-  s = format (s, "entry %u  tc %u  queue %u",
-	      ntohl (mp->entry), ntohl (mp->tc), ntohl (mp->queue));
-
-  FINISH;
-}
-
-static void *vl_api_bridge_domain_add_del_t_print
-  (vl_api_bridge_domain_add_del_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: bridge_domain_add_del ");
-
-  s = format (s, "bd_id %d ", ntohl (mp->bd_id));
-
-  if (mp->is_add)
-    {
-      s = format (s, "flood %d uu-flood %d forward %d learn %d arp-term %d",
-		  mp->flood, mp->uu_flood, mp->forward, mp->learn,
-		  mp->arp_term);
-    }
-  else
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-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);
-
-  s = format (0, "SCRIPT: bridge_domain_dump ");
-
-  if (bd_id != ~0)
-    s = format (s, "bd_id %d ", bd_id);
-
-  FINISH;
-}
-
-static void *vl_api_l2fib_add_del_t_print
-  (vl_api_l2fib_add_del_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: l2fib_add_del ");
-
-  s = format (s, "mac %U ", format_ethernet_address, &mp->mac);
-
-  s = format (s, "bd_id %d ", ntohl (mp->bd_id));
-
-
-  if (mp->is_add)
-    {
-      s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-      if (mp->static_mac)
-	s = format (s, "%s", "static ");
-      if (mp->filter_mac)
-	s = format (s, "%s", "filter ");
-      if (mp->bvi_mac)
-	s = format (s, "%s", "bvi ");
-    }
-  else
-    {
-      s = format (s, "del ");
-    }
-
-  FINISH;
-}
-
-static void *
-vl_api_l2_flags_t_print (vl_api_l2_flags_t * mp, void *handle)
-{
-  u8 *s;
-  u32 flags = ntohl (mp->feature_bitmap);
-
-  s = format (0, "SCRIPT: l2_flags ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-#define _(a,b) \
-    if (flags & L2INPUT_FEAT_ ## a) s = format (s, #a " ");
-  foreach_l2input_feat;
-#undef _
-
-  FINISH;
-}
-
-static void *vl_api_bridge_flags_t_print
-  (vl_api_bridge_flags_t * mp, void *handle)
-{
-  u8 *s;
-  u32 flags = ntohl (mp->feature_bitmap);
-
-  s = format (0, "SCRIPT: bridge_flags ");
-
-  s = format (s, "bd_id %d ", ntohl (mp->bd_id));
-
-  if (flags & L2_LEARN)
-    s = format (s, "learn ");
-  if (flags & L2_FWD)
-    s = format (s, "forward ");
-  if (flags & L2_FLOOD)
-    s = format (s, "flood ");
-  if (flags & L2_UU_FLOOD)
-    s = format (s, "uu-flood ");
-  if (flags & L2_ARP_TERM)
-    s = format (s, "arp-term ");
-
-  if (mp->is_set == 0)
-    s = format (s, "clear ");
-
-  FINISH;
-}
-
-static void *vl_api_bd_ip_mac_add_del_t_print
-  (vl_api_bd_ip_mac_add_del_t * mp, void *handle)
-{
-  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, "%U ", format_ethernet_address, mp->mac_address);
-  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)
-{
-  u8 *s;
-  u8 null_mac[6];
-
-  memset (null_mac, 0, sizeof (null_mac));
-
-  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);
-
-  FINISH;
-}
-
-static void *vl_api_tap_modify_t_print
-  (vl_api_tap_modify_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 ");
-
-  FINISH;
-}
-
-
-static void *vl_api_ip_add_del_route_t_print
-  (vl_api_ip_add_del_route_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: ip_add_del_route ");
-  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));
-
-  if (mp->is_ipv6)
-    s = format (s, "%U/%d ", format_ip6_address, mp->dst_address,
-		mp->dst_address_length);
-  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));
-  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);
-    }
-
-  if (mp->table_id != 0)
-    s = format (s, "vrf %d ", ntohl (mp->table_id));
-
-  if (mp->create_vrf_if_needed)
-    s = format (s, "create-vrf ");
-
-  if (mp->next_hop_weight != 1)
-    s = format (s, "weight %d ", mp->next_hop_weight);
-
-  if (mp->not_last)
-    s = format (s, "not-last ");
-
-  if (mp->is_multipath)
-    s = format (s, "multipath ");
-
-  if (mp->is_multipath)
-    s = format (s, "multipath ");
-
-  if (mp->next_hop_table_id)
-    s = format (s, "lookup-in-vrf %d ", ntohl (mp->next_hop_table_id));
-
-  FINISH;
-}
-
-static void *vl_api_proxy_arp_add_del_t_print
-  (vl_api_proxy_arp_add_del_t * mp, void *handle)
-{
-  u8 *s;
-
-  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);
-
-  if (mp->vrf_id)
-    s = format (s, "vrf %d ", ntohl (mp->vrf_id));
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_proxy_arp_intfc_enable_disable_t_print
-  (vl_api_proxy_arp_intfc_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: proxy_arp_intfc_enable_disable ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  s = format (s, "enable %d ", mp->enable_disable);
-
-  FINISH;
-}
-
-static void *vl_api_mpls_tunnel_add_del_t_print
-  (vl_api_mpls_tunnel_add_del_t * mp, void *handle)
-{
-  u8 *s;
-
-  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);
-  else
-    s = format (s, "%U ", format_ip6_address, mp->mt_next_hop);
-
-  if (mp->mt_l2_only)
-    s = format (s, "l2-only ");
-
-  if (mp->mt_is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_set_unnumbered_t_print
-  (vl_api_sw_interface_set_unnumbered_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_set_unnumbered ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  s = format (s, "unnum_if_index %d ", ntohl (mp->unnumbered_sw_if_index));
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-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));
-
-  if (mp->is_static)
-    s = format (s, "is_static ");
-
-  s = format (s, "vrf_id %d ", ntohl (mp->vrf_id));
-
-  if (memcmp (mp->mac_address, null_mac, 6))
-    s = format (s, "mac %U ", format_ethernet_address, mp->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);
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *
-vl_api_reset_vrf_t_print (vl_api_reset_vrf_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: reset_vrf ");
-
-  if (mp->vrf_id)
-    s = format (s, "vrf %d ", ntohl (mp->vrf_id));
-
-  if (mp->is_ipv6 != 0)
-    s = format (s, "ipv6 ");
-
-  FINISH;
-}
-
-static void *vl_api_create_vlan_subif_t_print
-  (vl_api_create_vlan_subif_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: create_vlan_subif ");
-
-  if (mp->sw_if_index)
-    s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  if (mp->vlan_id)
-    s = format (s, "vlan_id %d ", ntohl (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)
-
-static void *vl_api_create_subif_t_print
-  (vl_api_create_subif_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: create_subif ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  s = format (s, "sub_id %d ", ntohl (mp->sub_id));
-
-  if (mp->outer_vlan_id)
-    s = format (s, "outer_vlan_id %d ", ntohs (mp->outer_vlan_id));
-
-  if (mp->inner_vlan_id)
-    s = format (s, "inner_vlan_id %d ", ntohs (mp->inner_vlan_id));
-
-#define _(a) if (mp->a) s = format (s, "%s ", #a);
-  foreach_create_subif_bit;
-#undef _
-
-  FINISH;
-}
-
-static void *vl_api_delete_subif_t_print
-  (vl_api_delete_subif_t * mp, void *handle)
-{
-  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 ");
-
-  FINISH;
-}
-
-static void *
-vl_api_reset_fib_t_print (vl_api_reset_fib_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: reset_fib ");
-
-  if (mp->vrf_id)
-    s = format (s, "vrf %d ", ntohl (mp->vrf_id));
-
-  if (mp->is_ipv6 != 0)
-    s = format (s, "ipv6 ");
-
-  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 ");
-
-  s = format (s, "vrf_id %d ", ntohl (mp->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 ");
-
-  s = format (s, "insert-cid %d ", mp->insert_circuit_id);
-
-  FINISH;
-}
-
-static void *vl_api_dhcp_proxy_config_2_t_print
-  (vl_api_dhcp_proxy_config_2_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 ");
-
-  s = format (s, "insert-cid %d ", mp->insert_circuit_id);
-
-  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));
-
-  s = format (s, "fib_id %d ", ntohl (mp->fib_id));
-
-  s = format (s, "oui %d ", ntohl (mp->oui));
-
-  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 ", 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)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: set_ip_flow_hash ");
-
-  s = format (s, "vrf_id %d ", ntohl (mp->vrf_id));
-
-  if (mp->src)
-    s = format (s, "src ");
-
-  if (mp->dst)
-    s = format (s, "dst ");
-
-  if (mp->sport)
-    s = format (s, "sport ");
-
-  if (mp->dport)
-    s = format (s, "dport ");
-
-  if (mp->proto)
-    s = format (s, "proto ");
-
-  if (mp->reverse)
-    s = format (s, "reverse ");
-
-  if (mp->is_ipv6 != 0)
-    s = format (s, "ipv6 ");
-
-  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/%d ", format_ip6_address, mp->address,
-	      mp->address_length);
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_ip6nd_ra_prefix_t_print
-  (vl_api_sw_interface_ip6nd_ra_prefix_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_ip6nd_ra_prefix ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  s = format (s, "%U/%d ", format_ip6_address, mp->address,
-	      mp->address_length);
-
-  s = format (s, "val_life %d ", ntohl (mp->val_lifetime));
-
-  s = format (s, "pref_life %d ", ntohl (mp->pref_lifetime));
-
-  if (mp->use_default)
-    s = format (s, "def ");
-
-  if (mp->no_advertise)
-    s = format (s, "noadv ");
-
-  if (mp->off_link)
-    s = format (s, "offl ");
-
-  if (mp->no_autoconfig)
-    s = format (s, "noauto ");
-
-  if (mp->no_onlink)
-    s = format (s, "nolink ");
-
-  if (mp->is_no)
-    s = format (s, "isno ");
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_ip6nd_ra_config_t_print
-  (vl_api_sw_interface_ip6nd_ra_config_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_ip6nd_ra_config ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  s = format (s, "maxint %d ", ntohl (mp->max_interval));
-
-  s = format (s, "minint %d ", ntohl (mp->min_interval));
-
-  s = format (s, "life %d ", ntohl (mp->lifetime));
-
-  s = format (s, "count %d ", ntohl (mp->initial_count));
-
-  s = format (s, "interval %d ", ntohl (mp->initial_interval));
-
-  if (mp->suppress)
-    s = format (s, "suppress ");
-
-  if (mp->managed)
-    s = format (s, "managed ");
-
-  if (mp->other)
-    s = format (s, "other ");
-
-  if (mp->ll_option)
-    s = format (s, "ll ");
-
-  if (mp->send_unicast)
-    s = format (s, "send ");
-
-  if (mp->cease)
-    s = format (s, "cease ");
-
-  if (mp->is_no)
-    s = format (s, "isno ");
-
-  if (mp->default_router)
-    s = format (s, "def ");
-
-  FINISH;
-}
-
-static void *vl_api_set_arp_neighbor_limit_t_print
-  (vl_api_set_arp_neighbor_limit_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: set_arp_neighbor_limit ");
-
-  s = format (s, "arp_nbr_limit %d ", ntohl (mp->arp_neighbor_limit));
-
-  if (mp->is_ipv6 != 0)
-    s = format (s, "ipv6 ");
-
-  FINISH;
-}
-
-static void *vl_api_l2_patch_add_del_t_print
-  (vl_api_l2_patch_add_del_t * mp, void *handle)
-{
-  u8 *s;
-
-  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, "tx_sw_if_index %d ", ntohl (mp->tx_sw_if_index));
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_sr_tunnel_add_del_t_print
-  (vl_api_sr_tunnel_add_del_t * mp, void *handle)
-{
-  u8 *s;
-  ip6_address_t *this_address;
-  int i;
-  u16 flags_host_byte_order;
-  u8 pl_flag;
-
-  s = format (0, "SCRIPT: sr_tunnel_add_del ");
-
-  if (mp->name[0])
-    s = format (s, "name %s ", mp->name);
-
-  s = format (s, "src %U dst %U/%d ", format_ip6_address,
-	      (ip6_address_t *) mp->src_address,
-	      format_ip6_address,
-	      (ip6_address_t *) mp->dst_address, mp->dst_mask_width);
-
-  this_address = (ip6_address_t *) mp->segs_and_tags;
-  for (i = 0; i < mp->n_segments; i++)
-    {
-      s = format (s, "next %U ", format_ip6_address, this_address);
-      this_address++;
-    }
-  for (i = 0; i < mp->n_tags; i++)
-    {
-      s = format (s, "tag %U ", format_ip6_address, this_address);
-      this_address++;
-    }
-
-  flags_host_byte_order = clib_net_to_host_u16 (mp->flags_net_byte_order);
-
-  if (flags_host_byte_order & IP6_SR_HEADER_FLAG_CLEANUP)
-    s = format (s, " clean ");
-
-  if (flags_host_byte_order & IP6_SR_HEADER_FLAG_PROTECTED)
-    s = format (s, "protected ");
-
-  for (i = 1; i <= 4; i++)
-    {
-      pl_flag = ip6_sr_policy_list_flags (flags_host_byte_order, i);
-
-      switch (pl_flag)
-	{
-	case IP6_SR_HEADER_FLAG_PL_ELT_NOT_PRESENT:
-	  continue;
-
-	case IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE:
-	  s = format (s, "InPE %d ", i);
-	  break;
-
-	case IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE:
-	  s = format (s, "EgPE %d ", i);
-	  break;
-
-	case IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR:
-	  s = format (s, "OrgSrc %d ", i);
-	  break;
-
-	default:
-	  clib_warning ("BUG: pl elt %d value %d", i, pl_flag);
-	  break;
-	}
-    }
-
-  if (mp->policy_name[0])
-    s = format (s, "policy_name %s ", mp->policy_name);
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_sr_policy_add_del_t_print
-  (vl_api_sr_policy_add_del_t * mp, void *handle)
-{
-  u8 *s;
-  int i;
-
-  s = format (0, "SCRIPT: sr_policy_add_del ");
-
-  if (mp->name[0])
-    s = format (s, "name %s ", mp->name);
-
-
-  if (mp->tunnel_names[0])
-    {
-      // start deserializing tunnel_names
-      int num_tunnels = mp->tunnel_names[0];	//number of tunnels
-      u8 *deser_tun_names = mp->tunnel_names;
-      deser_tun_names += 1;	//moving along
-
-      u8 *tun_name = 0;
-      int tun_name_len = 0;
-
-      for (i = 0; i < num_tunnels; i++)
-	{
-	  tun_name_len = *deser_tun_names;
-	  deser_tun_names += 1;
-	  vec_resize (tun_name, tun_name_len);
-	  memcpy (tun_name, deser_tun_names, tun_name_len);
-	  s = format (s, "tunnel %s ", tun_name);
-	  deser_tun_names += tun_name_len;
-	  tun_name = 0;
-	}
-    }
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_sr_multicast_map_add_del_t_print
-  (vl_api_sr_multicast_map_add_del_t * mp, void *handle)
-{
-
-  u8 *s = 0;
-  /* int i; */
-
-  s = format (0, "SCRIPT: sr_multicast_map_add_del ");
-
-  if (mp->multicast_address[0])
-    s = format (s, "address %U ", format_ip6_address, &mp->multicast_address);
-
-  if (mp->policy_name[0])
-    s = format (s, "sr-policy %s ", &mp->policy_name);
-
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-
-static void *vl_api_classify_add_del_table_t_print
-  (vl_api_classify_add_del_table_t * mp, void *handle)
-{
-  u8 *s;
-  int i;
-
-  s = format (0, "SCRIPT: classify_add_del_table ");
-
-  if (mp->is_add == 0)
-    {
-      s = format (s, "table %d ", ntohl (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));
-      if (mp->current_data_flag)
-	s = format (s, "current-data-offset %d ",
-		    ntohl (mp->current_data_offset));
-      s = format (s, "mask hex ");
-      for (i = 0; i < ntohl (mp->match_n_vectors) * sizeof (u32x4); i++)
-	s = format (s, "%02x", mp->mask[i]);
-      vec_add1 (s, ' ');
-    }
-
-  FINISH;
-}
-
-static void *vl_api_classify_add_del_session_t_print
-  (vl_api_classify_add_del_session_t * mp, void *handle)
-{
-  u8 *s;
-  int i, limit = 0;
-
-  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, "action %d ", mp->action);
-  if (mp->action)
-    s = format (s, "metadata %d ", ntohl (mp->metadata));
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  s = format (s, "match hex ");
-  for (i = 5 * sizeof (u32x4) - 1; i > 0; i--)
-    {
-      if (mp->match[i] != 0)
-	{
-	  limit = i + 1;
-	  break;
-	}
-    }
-
-  for (i = 0; i < limit; i++)
-    s = format (s, "%02x", mp->match[i]);
-
-  FINISH;
-}
-
-static void *vl_api_classify_set_interface_ip_table_t_print
-  (vl_api_classify_set_interface_ip_table_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: classify_set_interface_ip_table ");
-
-  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));
-
-  FINISH;
-}
-
-static void *vl_api_classify_set_interface_l2_tables_t_print
-  (vl_api_classify_set_interface_l2_tables_t * mp, void *handle)
-{
-  u8 *s;
-
-  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, "is-input %d ", mp->is_input);
-
-  FINISH;
-}
-
-static void *vl_api_add_node_next_t_print
-  (vl_api_add_node_next_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: add_node_next ");
-
-  s = format (0, "node %s next %s ", mp->node_name, mp->next_name);
-
-  FINISH;
-}
-
-static void *vl_api_l2tpv3_create_tunnel_t_print
-  (vl_api_l2tpv3_create_tunnel_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: l2tpv3_create_tunnel ");
-
-  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_cookie %lld ",
-	      clib_net_to_host_u64 (mp->local_cookie));
-  s = format (s, "remote_cookie %lld ",
-	      clib_net_to_host_u64 (mp->remote_cookie));
-  if (mp->l2_sublayer_present)
-    s = format (s, "l2-sublayer-present ");
-
-  FINISH;
-}
-
-static void *vl_api_l2tpv3_set_tunnel_cookies_t_print
-  (vl_api_l2tpv3_set_tunnel_cookies_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: l2tpv3_set_tunnel_cookies ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  s = format (s, "new_local_cookie %llu ",
-	      clib_net_to_host_u64 (mp->new_local_cookie));
-
-  s = format (s, "new_remote_cookie %llu ",
-	      clib_net_to_host_u64 (mp->new_remote_cookie));
-
-  FINISH;
-}
-
-static void *vl_api_l2tpv3_interface_enable_disable_t_print
-  (vl_api_l2tpv3_interface_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: l2tpv3_interface_enable_disable ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  if (mp->enable_disable == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_l2tpv3_set_lookup_key_t_print
-  (vl_api_l2tpv3_set_lookup_key_t * mp, void *handle)
-{
-  u8 *s;
-  char *str = "unknown";
-
-  s = format (0, "SCRIPT: l2tpv3_set_lookup_key ");
-
-  switch (mp->key)
-    {
-    case L2T_LOOKUP_SRC_ADDRESS:
-      str = "lookup_v6_src";
-      break;
-    case L2T_LOOKUP_DST_ADDRESS:
-      str = "lookup_v6_dst";
-      break;
-    case L2T_LOOKUP_SESSION_ID:
-      str = "lookup_session_id";
-      break;
-    default:
-      break;
-    }
-
-  s = format (s, "%s ", str);
-
-  FINISH;
-}
-
-static void *vl_api_sw_if_l2tpv3_tunnel_dump_t_print
-  (vl_api_sw_if_l2tpv3_tunnel_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_if_l2tpv3_tunnel_dump ");
-
-  FINISH;
-}
-
-static void *vl_api_vxlan_add_del_tunnel_t_print
-  (vl_api_vxlan_add_del_tunnel_t * mp, void *handle)
-{
-  u8 *s;
-  s = format (0, "SCRIPT: vxlan_add_del_tunnel ");
-
-  ip46_address_t src, dst;
-
-  ip46_from_addr_buf (mp->is_ipv6, mp->dst_address, &dst);
-  ip46_from_addr_buf (mp->is_ipv6, mp->src_address, &src);
-
-  u8 is_grp = ip46_address_is_multicast (&dst);
-  char *dst_name = is_grp ? "group" : "dst";
-
-  s = format (s, "src %U ", format_ip46_address, &src, IP46_TYPE_ANY);
-  s = format (s, "%s %U ", dst_name, format_ip46_address,
-	      &dst, IP46_TYPE_ANY);
-
-  if (is_grp)
-    s = format (s, "mcast_sw_if_index %d ", ntohl (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, "decap-next %d ", ntohl (mp->decap_next_index));
-
-  s = format (s, "vni %d ", ntohl (mp->vni));
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_vxlan_tunnel_dump_t_print
-  (vl_api_vxlan_tunnel_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: vxlan_tunnel_dump ");
-
-  s = format (s, "sw_if_index %d ", ntohl (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)
-{
-  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 (s, "src %U ", format_ip46_address,
-	      (ip46_address_t *) & (mp->src_address),
-	      mp->is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4);
-
-  if (mp->teb)
-    s = format (s, "teb ");
-
-  if (mp->outer_fib_id)
-    s = format (s, "outer-fib-id %d ", ntohl (mp->outer_fib_id));
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_gre_tunnel_dump_t_print
-  (vl_api_gre_tunnel_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: gre_tunnel_dump ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  FINISH;
-}
-
-static void *vl_api_l2_fib_clear_table_t_print
-  (vl_api_l2_fib_clear_table_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: l2_fib_clear_table ");
-
-  FINISH;
-}
-
-static void *vl_api_l2_interface_efp_filter_t_print
-  (vl_api_l2_interface_efp_filter_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: l2_interface_efp_filter ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-  if (mp->enable_disable)
-    s = format (s, "enable ");
-  else
-    s = format (s, "disable ");
-
-  FINISH;
-}
-
-static void *vl_api_l2_interface_vlan_tag_rewrite_t_print
-  (vl_api_l2_interface_vlan_tag_rewrite_t * mp, void *handle)
-{
-  u8 *s;
-
-  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));
-
-  FINISH;
-}
-
-static void *vl_api_create_vhost_user_if_t_print
-  (vl_api_create_vhost_user_if_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: create_vhost_user_if ");
-
-  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));
-  if (mp->tag[0])
-    s = format (s, "tag %s", mp->tag);
-
-  FINISH;
-}
-
-static void *vl_api_modify_vhost_user_if_t_print
-  (vl_api_modify_vhost_user_if_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: modify_vhost_user_if ");
-
-  s = format (s, "sw_if_index %d ", ntohl (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));
-
-  FINISH;
-}
-
-static void *vl_api_delete_vhost_user_if_t_print
-  (vl_api_delete_vhost_user_if_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: delete_vhost_user_if ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_vhost_user_dump_t_print
-  (vl_api_sw_interface_vhost_user_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_vhost_user_dump ");
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_dump_t_print
-  (vl_api_sw_interface_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_dump ");
-
-  if (mp->name_filter_valid)
-    s = format (s, "name_filter %s ", mp->name_filter);
-  else
-    s = format (s, "all ");
-
-  FINISH;
-}
-
-static void *vl_api_l2_fib_table_dump_t_print
-  (vl_api_l2_fib_table_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: l2_fib_table_dump ");
-
-  s = format (s, "bd_id %d ", ntohl (mp->bd_id));
-
-  FINISH;
-}
-
-static void *vl_api_control_ping_t_print
-  (vl_api_control_ping_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: control_ping ");
-
-  FINISH;
-}
-
-static void *vl_api_want_interface_events_t_print
-  (vl_api_want_interface_events_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: want_interface_events pid %d enable %d ",
-	      ntohl (mp->pid), ntohl (mp->enable_disable));
-
-  FINISH;
-}
-
-static void *vl_api_cli_request_t_print
-  (vl_api_cli_request_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: cli_request ");
-
-  FINISH;
-}
-
-static void *vl_api_cli_inband_t_print
-  (vl_api_cli_inband_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: cli_inband ");
-
-  FINISH;
-}
-
-static void *vl_api_memclnt_create_t_print
-  (vl_api_memclnt_create_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: memclnt_create name %s ", mp->name);
-
-  FINISH;
-}
-
-static void *vl_api_show_version_t_print
-  (vl_api_show_version_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: show_version ");
-
-  FINISH;
-}
-
-static void *vl_api_vxlan_gpe_add_del_tunnel_t_print
-  (vl_api_vxlan_gpe_add_del_tunnel_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: vxlan_gpe_add_del_tunnel ");
-
-  s = format (s, "local %U ", format_ip46_address, &mp->local, mp->is_ipv6);
-
-  s = format (s, "remote %U ", format_ip46_address, &mp->remote, mp->is_ipv6);
-
-  s = format (s, "protocol %d ", ntohl (mp->protocol));
-
-  s = format (s, "vni %d ", ntohl (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));
-
-  if (mp->decap_vrf_id)
-    s = format (s, "decap-vrf-id %d ", ntohl (mp->decap_vrf_id));
-
-  FINISH;
-}
-
-static void *vl_api_vxlan_gpe_tunnel_dump_t_print
-  (vl_api_vxlan_gpe_tunnel_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: vxlan_gpe_tunnel_dump ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  FINISH;
-}
-
-static void *vl_api_interface_name_renumber_t_print
-  (vl_api_interface_name_renumber_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: interface_renumber ");
-
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  s = format (s, "new_show_dev_instance %d ",
-	      ntohl (mp->new_show_dev_instance));
-
-  FINISH;
-}
-
-static void *vl_api_want_ip4_arp_events_t_print
-  (vl_api_want_ip4_arp_events_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: want_ip4_arp_events ");
-  s = format (s, "pid %d address %U ", mp->pid,
-	      format_ip4_address, &mp->address);
-  if (mp->enable_disable == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_want_ip6_nd_events_t_print
-  (vl_api_want_ip6_nd_events_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: want_ip6_nd_events ");
-  s = format (s, "pid %d address %U ", mp->pid,
-	      format_ip6_address, mp->address);
-  if (mp->enable_disable == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_input_acl_set_interface_t_print
-  (vl_api_input_acl_set_interface_t * mp, void *handle)
-{
-  u8 *s;
-
-  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));
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_ip_address_dump_t_print
-  (vl_api_ip_address_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: ip6_address_dump ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-  s = format (s, "is_ipv6 %d ", mp->is_ipv6 != 0);
-
-  FINISH;
-}
-
-static void *
-vl_api_ip_dump_t_print (vl_api_ip_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: ip_dump ");
-  s = format (s, "is_ipv6 %d ", mp->is_ipv6 != 0);
-
-  FINISH;
-}
-
-static void *vl_api_cop_interface_enable_disable_t_print
-  (vl_api_cop_interface_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: cop_interface_enable_disable ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-  if (mp->enable_disable)
-    s = format (s, "enable ");
-  else
-    s = format (s, "disable ");
-
-  FINISH;
-}
-
-static void *vl_api_cop_whitelist_enable_disable_t_print
-  (vl_api_cop_whitelist_enable_disable_t * mp, void *handle)
-{
-  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));
-  if (mp->ip4)
-    s = format (s, "ip4 ");
-  if (mp->ip6)
-    s = format (s, "ip6 ");
-  if (mp->default_cop)
-    s = format (s, "default ");
-
-  FINISH;
-}
-
-static void *vl_api_af_packet_create_t_print
-  (vl_api_af_packet_create_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: af_packet_create ");
-  s = format (s, "host_if_name %s ", mp->host_if_name);
-  if (mp->use_random_hw_addr)
-    s = format (s, "hw_addr random ");
-  else
-    s = format (s, "hw_addr %U ", format_ethernet_address, mp->hw_addr);
-
-  FINISH;
-}
-
-static void *vl_api_af_packet_delete_t_print
-  (vl_api_af_packet_delete_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: af_packet_delete ");
-  s = format (s, "host_if_name %s ", mp->host_if_name);
-
-  FINISH;
-}
-
-static u8 *
-format_policer_action (u8 * s, va_list * va)
-{
-  u32 action = va_arg (*va, u32);
-  u32 dscp = va_arg (*va, u32);
-  char *t = 0;
-
-  if (action == SSE2_QOS_ACTION_DROP)
-    s = format (s, "drop");
-  else if (action == SSE2_QOS_ACTION_TRANSMIT)
-    s = format (s, "transmit");
-  else if (action == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
-    {
-      s = format (s, "mark-and-transmit ");
-      switch (dscp)
-	{
-#define _(v,f,str) case VNET_DSCP_##f: t = str; break;
-	  foreach_vnet_dscp
-#undef _
-	default:
-	  break;
-	}
-      s = format (s, "%s", t);
-    }
-
-  return s;
-}
-
-static void *vl_api_policer_add_del_t_print
-  (vl_api_policer_add_del_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: policer_add_del ");
-  s = format (s, "name %s ", mp->name);
-  s = format (s, "cir %d ", mp->cir);
-  s = format (s, "eir %d ", mp->eir);
-  s = format (s, "cb %d ", mp->cb);
-  s = format (s, "eb %d ", mp->eb);
-
-  switch (mp->rate_type)
-    {
-    case SSE2_QOS_RATE_KBPS:
-      s = format (s, "rate_type kbps ");
-      break;
-    case SSE2_QOS_RATE_PPS:
-      s = format (s, "rate_type pps ");
-      break;
-    default:
-      break;
-    }
-
-  switch (mp->round_type)
-    {
-    case SSE2_QOS_ROUND_TO_CLOSEST:
-      s = format (s, "round_type closest ");
-      break;
-    case SSE2_QOS_ROUND_TO_UP:
-      s = format (s, "round_type up ");
-      break;
-    case SSE2_QOS_ROUND_TO_DOWN:
-      s = format (s, "round_type down ");
-      break;
-    default:
-      break;
-    }
-
-  switch (mp->type)
-    {
-    case SSE2_QOS_POLICER_TYPE_1R2C:
-      s = format (s, "type 1r2c ");
-      break;
-    case SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697:
-      s = format (s, "type 1r3c ");
-      break;
-    case SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698:
-      s = format (s, "type 2r3c-2698 ");
-      break;
-    case SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115:
-      s = format (s, "type 2r3c-4115 ");
-      break;
-    case SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1:
-      s = format (s, "type 2r3c-mef5cf1 ");
-      break;
-    default:
-      break;
-    }
-
-  s = format (s, "conform_action %U ", format_policer_action,
-	      mp->conform_action_type, mp->conform_dscp);
-  s = format (s, "exceed_action %U ", format_policer_action,
-	      mp->exceed_action_type, mp->exceed_dscp);
-  s = format (s, "violate_action %U ", format_policer_action,
-	      mp->violate_action_type, mp->violate_dscp);
-
-  if (mp->color_aware)
-    s = format (s, "color-aware ");
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_policer_dump_t_print
-  (vl_api_policer_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: policer_dump ");
-  if (mp->match_name_valid)
-    s = format (s, "name %s ", mp->match_name);
-
-  FINISH;
-}
-
-static void *vl_api_policer_classify_set_interface_t_print
-  (vl_api_policer_classify_set_interface_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: policer_classify_set_interface ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-  if (mp->ip4_table_index != ~0)
-    s = format (s, "ip4-table %d ", ntohl (mp->ip4_table_index));
-  if (mp->ip6_table_index != ~0)
-    s = format (s, "ip6-table %d ", ntohl (mp->ip6_table_index));
-  if (mp->l2_table_index != ~0)
-    s = format (s, "l2-table %d ", ntohl (mp->l2_table_index));
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_policer_classify_dump_t_print
-  (vl_api_policer_classify_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: policer_classify_dump ");
-  switch (mp->type)
-    {
-    case POLICER_CLASSIFY_TABLE_IP4:
-      s = format (s, "type ip4 ");
-      break;
-    case POLICER_CLASSIFY_TABLE_IP6:
-      s = format (s, "type ip6 ");
-      break;
-    case POLICER_CLASSIFY_TABLE_L2:
-      s = format (s, "type l2 ");
-      break;
-    default:
-      break;
-    }
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_clear_stats_t_print
-  (vl_api_sw_interface_clear_stats_t * mp, void *handle)
-{
-  u8 *s;
-
-  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));
-
-  FINISH;
-}
-
-static void *vl_api_mpls_tunnel_dump_t_print
-  (vl_api_mpls_tunnel_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: mpls_tunnel_dump ");
-
-  s = format (s, "tunnel_index %d ", ntohl (mp->tunnel_index));
-
-  FINISH;
-}
-
-static void *vl_api_mpls_fib_dump_t_print
-  (vl_api_mpls_fib_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: mpls_fib_decap_dump ");
-
-  FINISH;
-}
-
-static void *vl_api_ip_fib_dump_t_print
-  (vl_api_ip_fib_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: ip_fib_dump ");
-
-  FINISH;
-}
-
-static void *vl_api_ip6_fib_dump_t_print
-  (vl_api_ip6_fib_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: ip6_fib_dump ");
-
-  FINISH;
-}
-
-static void *vl_api_classify_table_ids_t_print
-  (vl_api_classify_table_ids_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: classify_table_ids ");
-
-  FINISH;
-}
-
-static void *vl_api_classify_table_by_interface_t_print
-  (vl_api_classify_table_by_interface_t * mp, void *handle)
-{
-  u8 *s;
-
-  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));
-
-  FINISH;
-}
-
-static void *vl_api_classify_table_info_t_print
-  (vl_api_classify_table_info_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: classify_table_info ");
-  if (mp->table_id != ~0)
-    s = format (s, "table_id %d ", ntohl (mp->table_id));
-
-  FINISH;
-}
-
-static void *vl_api_classify_session_dump_t_print
-  (vl_api_classify_session_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: classify_session_dump ");
-  if (mp->table_id != ~0)
-    s = format (s, "table_id %d ", ntohl (mp->table_id));
-
-  FINISH;
-}
-
-static void *vl_api_set_ipfix_exporter_t_print
-  (vl_api_set_ipfix_exporter_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: set_ipfix_exporter ");
-
-  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, "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, "udp-checksum %d ", mp->udp_checksum);
-
-  FINISH;
-}
-
-static void *vl_api_ipfix_exporter_dump_t_print
-  (vl_api_ipfix_exporter_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: ipfix_exporter_dump ");
-
-  FINISH;
-}
-
-static void *vl_api_set_ipfix_classify_stream_t_print
-  (vl_api_set_ipfix_classify_stream_t * mp, void *handle)
-{
-  u8 *s;
-
-  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));
-
-  FINISH;
-}
-
-static void *vl_api_ipfix_classify_stream_dump_t_print
-  (vl_api_ipfix_classify_stream_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: ipfix_classify_stream_dump ");
-
-  FINISH;
-}
-
-static void *vl_api_ipfix_classify_table_add_del_t_print
-  (vl_api_ipfix_classify_table_add_del_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: ipfix_classify_table_add_del ");
-
-  s = format (s, "table-id %d ", ntohl (mp->table_id));
-  s = format (s, "ip-version %d ", mp->ip_version);
-  s = format (s, "transport-protocol %d ", mp->transport_protocol);
-
-  FINISH;
-}
-
-static void *vl_api_ipfix_classify_table_dump_t_print
-  (vl_api_ipfix_classify_table_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: ipfix_classify_table_dump ");
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_span_enable_disable_t_print
-  (vl_api_sw_interface_span_enable_disable_t * mp, void *handle)
-{
-  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));
-
-  switch (mp->state)
-    {
-    case 0:
-      s = format (s, "disable ");
-      break;
-    case 1:
-      s = format (s, "rx ");
-      break;
-    case 2:
-      s = format (s, "tx ");
-      break;
-    case 3:
-    default:
-      s = format (s, "both ");
-      break;
-    }
-
-  FINISH;
-}
-
-static void *
-vl_api_sw_interface_span_dump_t_print (vl_api_sw_interface_span_dump_t * mp,
-				       void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_span_dump ");
-
-  FINISH;
-}
-
-static void *vl_api_get_next_index_t_print
-  (vl_api_get_next_index_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: get_next_index ");
-  s = format (s, "node-name %s ", mp->node_name);
-  s = format (s, "next-node-name %s ", mp->next_name);
-
-  FINISH;
-}
-
-static void *vl_api_pg_create_interface_t_print
-  (vl_api_pg_create_interface_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: pg_create_interface ");
-  s = format (0, "if_id %d", ntohl (mp->interface_id));
-
-  FINISH;
-}
-
-static void *vl_api_pg_capture_t_print
-  (vl_api_pg_capture_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: pg_capture ");
-  s = format (0, "if_id %d ", ntohl (mp->interface_id));
-  s = format (0, "pcap %s", mp->pcap_file_name);
-  if (mp->count != ~0)
-    s = format (s, "count %d ", ntohl (mp->count));
-  if (!mp->is_enabled)
-    s = format (s, "disable");
-
-  FINISH;
-}
-
-static void *vl_api_pg_enable_disable_t_print
-  (vl_api_pg_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: pg_enable_disable ");
-  if (ntohl (mp->stream_name_length) > 0)
-    s = format (s, "stream %s", mp->stream_name);
-  if (!mp->is_enabled)
-    s = format (s, "disable");
-
-  FINISH;
-}
-
-static void *vl_api_ip_source_and_port_range_check_add_del_t_print
-  (vl_api_ip_source_and_port_range_check_add_del_t * mp, void *handle)
-{
-  u8 *s;
-  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);
-
-  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));
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_ip_source_and_port_range_check_interface_add_del_t_print
-  (vl_api_ip_source_and_port_range_check_interface_add_del_t * mp,
-   void *handle)
-{
-  u8 *s;
-
-  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));
-
-  if (mp->tcp_out_vrf_id != ~0)
-    s = format (s, "tcp-out-vrf %d ", ntohl (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));
-
-  if (mp->tcp_in_vrf_id != ~0)
-    s = format (s, "tcp-in-vrf %d ", ntohl (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));
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_lisp_enable_disable_t_print
-  (vl_api_lisp_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_enable_disable %s",
-	      mp->is_en ? "enable" : "disable");
-
-  FINISH;
-}
-
-static void *vl_api_lisp_gpe_add_del_iface_t_print
-  (vl_api_lisp_gpe_add_del_iface_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_gpe_add_del_iface ");
-
-  s = format (s, "%s ", mp->is_add ? "up" : "down");
-  s = format (s, "vni %d ", mp->vni);
-  s = format (s, "%s %d ", mp->is_l2 ? "bd_id" : "table_id", mp->dp_table);
-
-  FINISH;
-}
-
-static void *vl_api_lisp_pitr_set_locator_set_t_print
-  (vl_api_lisp_pitr_set_locator_set_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_pitr_set_locator_set ");
-
-  if (mp->is_add)
-    s = format (s, "locator-set %s ", mp->ls_name);
-  else
-    s = format (s, "del");
-
-  FINISH;
-}
-
-static u8 *
-format_lisp_flat_eid (u8 * s, va_list * args)
-{
-  u32 type = va_arg (*args, u32);
-  u8 *eid = va_arg (*args, u8 *);
-  u32 eid_len = va_arg (*args, u32);
-
-  switch (type)
-    {
-    case 0:
-      return format (s, "%U/%d", format_ip4_address, eid, eid_len);
-    case 1:
-      return format (s, "%U/%d", format_ip6_address, eid, eid_len);
-    case 3:
-      return format (s, "%U", format_ethernet_address, eid);
-    }
-  return 0;
-}
-
-/** Used for transferring locators via VPP API */
-typedef CLIB_PACKED (struct
-		     {
-		     u8 is_ip4;
-	     /**< is locator an IPv4 address */
-		     u8 priority;
-	       /**< locator priority */
-		     u8 weight;
-	       /**< locator weight */
-		     u8 addr[16];
-	       /**< IPv4/IPv6 address */
-		     }) rloc_t;
-
-static u8 *
-format_rloc (u8 * s, va_list * args)
-{
-  rloc_t *rloc = va_arg (*args, rloc_t *);
-
-  if (rloc->is_ip4)
-    s = format (s, "%U ", format_ip4_address, rloc->addr);
-  else
-    s = format (s, "%U ", format_ip6_address, rloc->addr);
-
-  s = format (s, "p %d w %d", rloc->priority, rloc->weight);
-
-  return s;
-}
-
-static void *vl_api_lisp_add_del_remote_mapping_t_print
-  (vl_api_lisp_add_del_remote_mapping_t * mp, void *handle)
-{
-  u8 *s;
-  u32 i, rloc_num = 0;
-
-  s = format (0, "SCRIPT: lisp_add_del_remote_mapping ");
-
-  if (mp->del_all)
-    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, "eid %U ", format_lisp_flat_eid,
-	      mp->eid_type, mp->eid, mp->eid_len);
-
-  if (mp->is_src_dst)
-    {
-      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);
-
-  if (0 == rloc_num)
-    s = format (s, "action %d", mp->action);
-  else
-    {
-      rloc_t *rloc = (rloc_t *) mp->rlocs;
-      for (i = 0; i < rloc_num; i++)
-	s = format (s, "%U ", format_rloc, &rloc[i]);
-    }
-
-  FINISH;
-}
-
-static void *vl_api_lisp_add_del_adjacency_t_print
-  (vl_api_lisp_add_del_adjacency_t * mp, void *handle)
-{
-  u8 *s;
-
-  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, "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);
-
-  FINISH;
-}
-
-static void *vl_api_lisp_add_del_map_request_itr_rlocs_t_print
-  (vl_api_lisp_add_del_map_request_itr_rlocs_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_add_del_map_request_itr_rlocs ");
-
-  if (mp->is_add)
-    s = format (s, "%s", mp->locator_set_name);
-  else
-    s = format (s, "del");
-
-  FINISH;
-}
-
-static void *vl_api_lisp_eid_table_add_del_map_t_print
-  (vl_api_lisp_eid_table_add_del_map_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_eid_table_add_del_map ");
-
-  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));
-  FINISH;
-}
-
-static void *vl_api_lisp_add_del_local_eid_t_print
-  (vl_api_lisp_add_del_local_eid_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_add_del_local_eid ");
-
-  if (!mp->is_add)
-    s = format (s, "del ");
-
-  s = format (s, "vni %d ", clib_net_to_host_u32 (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);
-  if (*mp->key)
-    {
-      u32 key_id = mp->key_id;
-      s = format (s, "key-id %U", format_hmac_key_id, key_id);
-      s = format (s, "secret-key %s", mp->key);
-    }
-  FINISH;
-}
-
-static void *vl_api_lisp_gpe_add_del_fwd_entry_t_print
-  (vl_api_lisp_gpe_add_del_fwd_entry_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_gpe_add_del_fwd_entry TODO");
-
-  FINISH;
-}
-
-static void *vl_api_lisp_add_del_map_resolver_t_print
-  (vl_api_lisp_add_del_map_resolver_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_add_del_map_resolver ");
-
-  if (!mp->is_add)
-    s = format (s, "del ");
-
-  if (mp->is_ipv6)
-    s = format (s, "%U ", format_ip6_address, mp->ip_address);
-  else
-    s = format (s, "%U ", format_ip4_address, mp->ip_address);
-
-  FINISH;
-}
-
-static void *vl_api_lisp_gpe_enable_disable_t_print
-  (vl_api_lisp_gpe_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_gpe_enable_disable ");
-
-  s = format (s, "%s ", mp->is_en ? "enable" : "disable");
-
-  FINISH;
-}
-
-typedef CLIB_PACKED (struct
-		     {
-		     u32 sw_if_index;
-		   /**< locator sw_if_index */
-		     u8 priority;
-	       /**< locator priority */
-		     u8 weight;
-	       /**< locator weight */
-		     }) ls_locator_t;
-
-static u8 *
-format_locator (u8 * s, va_list * args)
-{
-  ls_locator_t *l = va_arg (*args, ls_locator_t *);
-
-  return format (s, "sw_if_index %d p %d w %d",
-		 l->sw_if_index, l->priority, l->weight);
-}
-
-static void *vl_api_lisp_add_del_locator_set_t_print
-  (vl_api_lisp_add_del_locator_set_t * mp, void *handle)
-{
-  u8 *s;
-  u32 loc_num = 0, i;
-  ls_locator_t *locs;
-
-  s = format (0, "SCRIPT: lisp_add_del_locator_set ");
-
-  if (!mp->is_add)
-    s = format (s, "del ");
-
-  s = format (s, "locator-set %s ", mp->locator_set_name);
-
-  loc_num = clib_net_to_host_u32 (mp->locator_num);
-  locs = (ls_locator_t *) mp->locators;
-
-  for (i = 0; i < loc_num; i++)
-    s = format (s, "%U ", format_locator, &locs[i]);
-
-  FINISH;
-}
-
-static void *vl_api_lisp_add_del_locator_t_print
-  (vl_api_lisp_add_del_locator_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_add_del_locator ");
-
-  if (!mp->is_add)
-    s = format (s, "del ");
-
-  s = format (s, "locator-set %s ", mp->locator_set_name);
-  s = format (s, "sw_if_index %d ", mp->sw_if_index);
-  s = format (s, "p %d w %d ", mp->priority, mp->weight);
-
-  FINISH;
-}
-
-static void *vl_api_lisp_locator_set_dump_t_print
-  (vl_api_lisp_locator_set_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_locator_set_dump ");
-  if (mp->filter == 1)
-    s = format (s, "local");
-  else if (mp->filter == 2)
-    s = format (s, "remote");
-
-  FINISH;
-}
-
-static void *vl_api_lisp_locator_dump_t_print
-  (vl_api_lisp_locator_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  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));
-  else
-    s = format (s, "ls_name %s", mp->ls_name);
-
-  FINISH;
-}
-
-static void *vl_api_lisp_map_request_mode_t_print
-  (vl_api_lisp_map_request_mode_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_map_request_mode ");
-
-  switch (mp->mode)
-    {
-    case 0:
-      s = format (s, "dst-only");
-      break;
-    case 1:
-      s = format (s, "src-dst");
-    default:
-      break;
-    }
-
-  FINISH;
-}
-
-static void *vl_api_lisp_eid_table_dump_t_print
-  (vl_api_lisp_eid_table_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_eid_table_dump ");
-
-  if (mp->eid_set)
-    {
-      s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni));
-      s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid_type,
-		  mp->eid, mp->prefix_length);
-      switch (mp->filter)
-	{
-	case 1:
-	  s = format (s, "local ");
-	  break;
-	case 2:
-	  s = format (s, "remote ");
-	  break;
-	}
-    }
-
-  FINISH;
-}
-
-static void *vl_api_lisp_rloc_probe_enable_disable_t_print
-  (vl_api_lisp_rloc_probe_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_rloc_probe_enable_disable ");
-  if (mp->is_enabled)
-    s = format (s, "enable");
-  else
-    s = format (s, "disable");
-
-  FINISH;
-}
-
-static void *vl_api_lisp_map_register_enable_disable_t_print
-  (vl_api_lisp_map_register_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_map_register_enable_disable ");
-  if (mp->is_enabled)
-    s = format (s, "enable");
-  else
-    s = format (s, "disable");
-
-  FINISH;
-}
-
-static void *vl_api_lisp_adjacencies_get_t_print
-  (vl_api_lisp_adjacencies_get_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_adjacencies_get ");
-  s = format (s, "vni %d", clib_net_to_host_u32 (mp->vni));
-
-  FINISH;
-}
-
-static void *vl_api_lisp_eid_table_map_dump_t_print
-  (vl_api_lisp_eid_table_map_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: lisp_eid_table_map_dump ");
-
-  if (mp->is_l2)
-    s = format (s, "l2");
-  else
-    s = format (s, "l3");
-
-  FINISH;
-}
-
-static void *vl_api_ipsec_gre_add_del_tunnel_t_print
-  (vl_api_ipsec_gre_add_del_tunnel_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: ipsec_gre_add_del_tunnel ");
-
-  s = format (s, "dst %U ", format_ip4_address,
-	      (ip4_address_t *) & (mp->dst_address));
-
-  s = format (s, "src %U ", format_ip4_address,
-	      (ip4_address_t *) & (mp->src_address));
-
-  s = format (s, "local_sa %d ", ntohl (mp->local_sa_id));
-
-  s = format (s, "remote_sa %d ", ntohl (mp->remote_sa_id));
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_ipsec_gre_tunnel_dump_t_print
-  (vl_api_ipsec_gre_tunnel_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: ipsec_gre_tunnel_dump ");
-
-  if (mp->sw_if_index != ~0)
-    s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
-  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);
-
-  s = format (0, "SCRIPT: l2_interface_pbb_tag_rewrite ");
-
-  s = format (s, "sw_if_index %d ", ntohl (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, "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));
-    }
-
-  FINISH;
-}
-
-static void *vl_api_flow_classify_set_interface_t_print
-  (vl_api_flow_classify_set_interface_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: flow_classify_set_interface ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-  if (mp->ip4_table_index != ~0)
-    s = format (s, "ip4-table %d ", ntohl (mp->ip4_table_index));
-  if (mp->ip6_table_index != ~0)
-    s = format (s, "ip6-table %d ", ntohl (mp->ip6_table_index));
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *
-vl_api_punt_t_print (vl_api_punt_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: punt ");
-
-  if (mp->ipv != (u8) ~ 0)
-    s = format (s, "ip %d ", mp->ipv);
-
-  s = format (s, "protocol %d ", mp->l4_protocol);
-
-  if (mp->l4_port != (u16) ~ 0)
-    s = format (s, "port %d ", ntohs (mp->l4_port));
-
-  if (!mp->is_add)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_flow_classify_dump_t_print
-  (vl_api_flow_classify_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: flow_classify_dump ");
-  switch (mp->type)
-    {
-    case FLOW_CLASSIFY_TABLE_IP4:
-      s = format (s, "type ip4 ");
-      break;
-    case FLOW_CLASSIFY_TABLE_IP6:
-      s = format (s, "type ip6 ");
-      break;
-    default:
-      break;
-    }
-
-  FINISH;
-}
-
-static void *vl_api_get_first_msg_id_t_print
-  (vl_api_get_first_msg_id_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: get_first_msg_id %s ", mp->name);
-
-  FINISH;
-}
-
-static void *vl_api_ioam_enable_t_print
-  (vl_api_ioam_enable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: ioam_enable ");
-
-  if (mp->trace_enable)
-    s = format (s, "trace enabled");
-
-  if (mp->pot_enable)
-    s = format (s, "POT enabled");
-
-  if (mp->seqno)
-    s = format (s, "Seqno enabled");
-
-  if (mp->analyse)
-    s = format (s, "Analyse enabled");
-
-  FINISH;
-}
-
-static void *vl_api_ioam_disable_t_print
-  (vl_api_ioam_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: ioam_disable ");
-  s = format (s, "trace disabled");
-  s = format (s, "POT disabled");
-  s = format (s, "Seqno disabled");
-  s = format (s, "Analyse disabled");
-
-  FINISH;
-}
-
-static void *vl_api_feature_enable_disable_t_print
-  (vl_api_feature_enable_disable_t * mp, void *handle)
-{
-  u8 *s;
-
-  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));
-  if (!mp->enable)
-    s = format (s, "disable");
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_tag_add_del_t_print
-  (vl_api_sw_interface_tag_add_del_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: sw_interface_tag_add_del ");
-  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-  if (mp->is_add)
-    s = format (s, "tag %s ", mp->tag);
-  else
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_sw_interface_set_mtu_t_print
-  (vl_api_sw_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));
-
-  FINISH;
-}
-
-#define foreach_custom_print_no_arg_function                            \
-_(lisp_eid_table_vni_dump)                                              \
-_(lisp_map_resolver_dump)                                               \
-_(lisp_map_server_dump)                                                 \
-_(show_lisp_rloc_probe_state)                                           \
-_(show_lisp_map_register_state)                                         \
-_(show_lisp_map_request_mode)                                           \
-_(lisp_gpe_tunnel_dump)
-
-#define _(f)                                                            \
-static void * vl_api_ ## f ## _t_print                                  \
-  (vl_api_ ## f ## _t * mp, void * handle)                              \
-{                                                                       \
-  u8 * s;                                                               \
-  s = format (0, "SCRIPT: " #f );                                       \
-  FINISH;                                                               \
-}
-foreach_custom_print_no_arg_function
-#undef _
-#define foreach_custom_print_function                                   \
-_(CREATE_LOOPBACK, create_loopback)                                     \
-_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags)                       \
-_(SW_INTERFACE_ADD_DEL_ADDRESS, sw_interface_add_del_address)           \
-_(SW_INTERFACE_SET_TABLE, sw_interface_set_table)                       \
-_(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)         \
-_(TAP_CONNECT, tap_connect)                                             \
-_(TAP_MODIFY, tap_modify)                                               \
-_(TAP_DELETE, tap_delete)                                               \
-_(SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump)                         \
-_(IP_ADD_DEL_ROUTE, ip_add_del_route)                                   \
-_(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)		                \
-_(SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered)             \
-_(IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del)                             \
-_(RESET_VRF, reset_vrf)                                                 \
-_(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)                       \
-_(L2_PATCH_ADD_DEL, l2_patch_add_del)                                   \
-_(SR_TUNNEL_ADD_DEL, sr_tunnel_add_del)					\
-_(SR_POLICY_ADD_DEL, sr_policy_add_del)					\
-_(SR_MULTICAST_MAP_ADD_DEL, sr_multicast_map_add_del)                   \
-_(SW_INTERFACE_SET_L2_XCONNECT, sw_interface_set_l2_xconnect)           \
-_(L2FIB_ADD_DEL, l2fib_add_del)                                         \
-_(L2_FLAGS, l2_flags)                                                   \
-_(BRIDGE_FLAGS, bridge_flags)                                           \
-_(CLASSIFY_ADD_DEL_TABLE, classify_add_del_table)			\
-_(CLASSIFY_ADD_DEL_SESSION, classify_add_del_session)			\
-_(SW_INTERFACE_SET_L2_BRIDGE, sw_interface_set_l2_bridge)		\
-_(SW_INTERFACE_SET_DPDK_HQOS_PIPE, sw_interface_set_dpdk_hqos_pipe)     \
-_(SW_INTERFACE_SET_DPDK_HQOS_SUBPORT, sw_interface_set_dpdk_hqos_subport)\
-_(SW_INTERFACE_SET_DPDK_HQOS_TCTBL, sw_interface_set_dpdk_hqos_tctbl)   \
-_(BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del)                         \
-_(BRIDGE_DOMAIN_DUMP, bridge_domain_dump)                               \
-_(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_PROXY_CONFIG_2, dhcp_proxy_config_2)	                        \
-_(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)     \
-_(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)                                 \
-_(GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel)                               \
-_(GRE_TUNNEL_DUMP, gre_tunnel_dump)                                     \
-_(L2_FIB_CLEAR_TABLE, l2_fib_clear_table)                               \
-_(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter)                     \
-_(L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)         \
-_(CREATE_VHOST_USER_IF, create_vhost_user_if)				\
-_(MODIFY_VHOST_USER_IF, modify_vhost_user_if)				\
-_(DELETE_VHOST_USER_IF, delete_vhost_user_if)				\
-_(SW_INTERFACE_DUMP, sw_interface_dump)					\
-_(CONTROL_PING, control_ping)						\
-_(WANT_INTERFACE_EVENTS, want_interface_events)				\
-_(CLI_REQUEST, cli_request)						\
-_(CLI_INBAND, cli_inband)						\
-_(MEMCLNT_CREATE, memclnt_create)					\
-_(SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump)           \
-_(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)                         \
-_(INTERFACE_NAME_RENUMBER, interface_name_renumber)			\
-_(WANT_IP4_ARP_EVENTS, want_ip4_arp_events)                             \
-_(WANT_IP6_ND_EVENTS, want_ip6_nd_events)                               \
-_(INPUT_ACL_SET_INTERFACE, input_acl_set_interface)                     \
-_(IP_ADDRESS_DUMP, ip_address_dump)                                     \
-_(IP_DUMP, ip_dump)                                                     \
-_(DELETE_LOOPBACK, delete_loopback)                                     \
-_(BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del)					\
-_(COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable) 		\
-_(COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable)           \
-_(AF_PACKET_CREATE, af_packet_create)					\
-_(AF_PACKET_DELETE, af_packet_delete)					\
-_(SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats)                   \
-_(MPLS_FIB_DUMP, mpls_fib_dump)                                         \
-_(MPLS_TUNNEL_DUMP, mpls_tunnel_dump)                                   \
-_(CLASSIFY_TABLE_IDS,classify_table_ids)                                \
-_(CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface)             \
-_(CLASSIFY_TABLE_INFO,classify_table_info)                              \
-_(CLASSIFY_SESSION_DUMP,classify_session_dump)                          \
-_(SET_IPFIX_EXPORTER, set_ipfix_exporter)                               \
-_(IPFIX_EXPORTER_DUMP, ipfix_exporter_dump)                             \
-_(SET_IPFIX_CLASSIFY_STREAM, set_ipfix_classify_stream)                 \
-_(IPFIX_CLASSIFY_STREAM_DUMP, ipfix_classify_stream_dump)               \
-_(IPFIX_CLASSIFY_TABLE_ADD_DEL, ipfix_classify_table_add_del)           \
-_(IPFIX_CLASSIFY_TABLE_DUMP, ipfix_classify_table_dump)                 \
-_(SW_INTERFACE_SPAN_ENABLE_DISABLE, sw_interface_span_enable_disable)   \
-_(SW_INTERFACE_SPAN_DUMP, sw_interface_span_dump)                       \
-_(GET_NEXT_INDEX, get_next_index)                                       \
-_(PG_CREATE_INTERFACE,pg_create_interface)                              \
-_(PG_CAPTURE, pg_capture)                                               \
-_(PG_ENABLE_DISABLE, pg_enable_disable)                                 \
-_(POLICER_ADD_DEL, policer_add_del)                                     \
-_(POLICER_DUMP, policer_dump)                                           \
-_(POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface)       \
-_(POLICER_CLASSIFY_DUMP, policer_classify_dump)                         \
-_(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL,                               \
-  ip_source_and_port_range_check_add_del)                               \
-_(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL,                     \
-  ip_source_and_port_range_check_interface_add_del)                     \
-_(LISP_ENABLE_DISABLE, lisp_enable_disable)                             \
-_(LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable)                     \
-_(LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface)                       \
-_(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set)                 \
-_(LISP_MAP_REQUEST_MODE, lisp_map_request_mode)                         \
-_(SHOW_LISP_MAP_REQUEST_MODE, show_lisp_map_request_mode)               \
-_(LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping)             \
-_(LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency)                       \
-_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS,                                   \
-  lisp_add_del_map_request_itr_rlocs)                                   \
-_(LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map)               \
-_(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid)                       \
-_(LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry)               \
-_(LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set)                   \
-_(LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver)                 \
-_(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator)                           \
-_(LISP_EID_TABLE_DUMP, lisp_eid_table_dump)                             \
-_(LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump)                     \
-_(LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_dump)                     \
-_(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump)                           \
-_(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump)                       \
-_(LISP_MAP_SERVER_DUMP, lisp_map_server_dump)                           \
-_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump)                         \
-_(LISP_LOCATOR_DUMP, lisp_locator_dump)                                 \
-_(LISP_ADJACENCIES_GET, lisp_adjacencies_get)                           \
-_(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)                         \
-_(DELETE_SUBIF, delete_subif)                                           \
-_(L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite)           \
-_(PUNT, punt)                                                           \
-_(FLOW_CLASSIFY_SET_INTERFACE, flow_classify_set_interface)             \
-_(FLOW_CLASSIFY_DUMP, flow_classify_dump)				\
-_(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)                                           \
-_(FEATURE_ENABLE_DISABLE, feature_enable_disable)			\
-_(SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del)			\
-_(SW_INTERFACE_SET_MTU, sw_interface_set_mtu)
-  void
-vl_msg_api_custom_dump_configure (api_main_t * am)
-{
-#define _(n,f) am->msg_print_handlers[VL_API_##n]       \
-    = (void *) vl_api_##f##_t_print;
-  foreach_custom_print_function;
-#undef _
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/vpp-api/gmon.c b/vpp/vpp-api/gmon.c
deleted file mode 100644
index e5cb1271..00000000
--- a/vpp/vpp-api/gmon.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vnet/api_errno.h>
-
-#include <svmdb.h>
-
-typedef struct
-{
-  svmdb_client_t *svmdb_client;
-  f64 *vector_rate_ptr;
-  f64 *input_rate_ptr;
-  f64 *sig_error_rate_ptr;
-  pid_t *vpef_pid_ptr;
-  u64 last_sig_errors;
-  u64 current_sig_errors;
-  uword *sig_error_bitmap;
-  vlib_main_t *vlib_main;
-  vlib_main_t **my_vlib_mains;
-
-} gmon_main_t;
-
-#if DPDK == 0
-static inline u64
-vnet_get_aggregate_rx_packets (void)
-{
-  return 0;
-}
-#else
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/devices/dpdk/dpdk.h>
-#endif
-
-gmon_main_t gmon_main;
-
-static u64
-get_significant_errors (gmon_main_t * gm)
-{
-  vlib_main_t *this_vlib_main;
-  vlib_error_main_t *em;
-  uword code;
-  int vm_index;
-  u64 significant_errors = 0;
-
-  /* *INDENT-OFF* */
-  clib_bitmap_foreach (code, gm->sig_error_bitmap,
-  ({
-    for (vm_index = 0; vm_index < vec_len (gm->my_vlib_mains); vm_index++)
-      {
-        this_vlib_main = gm->my_vlib_mains[vm_index];
-        em = &this_vlib_main->error_main;
-        significant_errors += em->counters[code] -
-          ((vec_len(em->counters_last_clear) > code) ?
-           em->counters_last_clear[code] : 0);
-      }
-  }));
-  /* *INDENT-ON* */
-
-  return (significant_errors);
-}
-
-static clib_error_t *
-publish_pid (vlib_main_t * vm)
-{
-  gmon_main_t *gm = &gmon_main;
-
-  *gm->vpef_pid_ptr = getpid ();
-
-  return 0;
-}
-
-VLIB_API_INIT_FUNCTION (publish_pid);
-
-
-static uword
-gmon_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  f64 vector_rate;
-  u64 input_packets, last_input_packets, new_sig_errors;
-  f64 last_runtime, dt, now;
-  gmon_main_t *gm = &gmon_main;
-  int i;
-
-  last_runtime = 0.0;
-  last_input_packets = 0;
-
-  last_runtime = 0.0;
-  last_input_packets = 0;
-
-  /* Initial wait for the world to settle down */
-  vlib_process_suspend (vm, 5.0);
-
-  if (vec_len (vlib_mains) == 0)
-    vec_add1 (gm->my_vlib_mains, &vlib_global_main);
-  else
-    {
-      for (i = 0; i < vec_len (vlib_mains); i++)
-	vec_add1 (gm->my_vlib_mains, vlib_mains[i]);
-    }
-
-  while (1)
-    {
-      vlib_process_suspend (vm, 5.0);
-      vector_rate = vlib_last_vector_length_per_node (vm);
-      *gm->vector_rate_ptr = vector_rate;
-      now = vlib_time_now (vm);
-      dt = now - last_runtime;
-      input_packets = vnet_get_aggregate_rx_packets ();
-      *gm->input_rate_ptr = (f64) (input_packets - last_input_packets) / dt;
-      last_runtime = now;
-      last_input_packets = input_packets;
-
-      new_sig_errors = get_significant_errors (gm);
-      *gm->sig_error_rate_ptr =
-	((f64) (new_sig_errors - gm->last_sig_errors)) / dt;
-      gm->last_sig_errors = new_sig_errors;
-    }
-
-  return 0;			/* not so much */
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (gmon_process_node,static) = {
-  .function = gmon_process,
-  .type = VLIB_NODE_TYPE_PROCESS,
-  .name = "gmon-process",
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-gmon_init (vlib_main_t * vm)
-{
-  gmon_main_t *gm = &gmon_main;
-  api_main_t *am = &api_main;
-  pid_t *swp = 0;
-  f64 *v = 0;
-  clib_error_t *error;
-  svmdb_map_args_t _ma, *ma = &_ma;
-
-  if ((error = vlib_call_init_function (vm, vpe_api_init)))
-    return (error);
-
-  if ((error = vlib_call_init_function (vm, vlibmemory_init)))
-    return (error);
-
-  gm->vlib_main = vm;
-
-  memset (ma, 0, sizeof (*ma));
-  ma->root_path = am->root_path;
-  ma->uid = am->api_uid;
-  ma->gid = am->api_gid;
-
-  gm->svmdb_client = svmdb_map (ma);
-
-  /* Find or create, set to zero */
-  vec_add1 (v, 0.0);
-  svmdb_local_set_vec_variable (gm->svmdb_client,
-				"vpp_vector_rate", (char *) v, sizeof (*v));
-  vec_free (v);
-  vec_add1 (v, 0.0);
-  svmdb_local_set_vec_variable (gm->svmdb_client,
-				"vpp_input_rate", (char *) v, sizeof (*v));
-  vec_free (v);
-  vec_add1 (v, 0.0);
-  svmdb_local_set_vec_variable (gm->svmdb_client,
-				"vpp_sig_error_rate",
-				(char *) v, sizeof (*v));
-  vec_free (v);
-
-  vec_add1 (swp, 0.0);
-  svmdb_local_set_vec_variable (gm->svmdb_client,
-				"vpp_pid", (char *) swp, sizeof (*swp));
-  vec_free (swp);
-
-  /* the value cells will never move, so acquire references to them */
-  gm->vector_rate_ptr =
-    svmdb_local_get_variable_reference (gm->svmdb_client,
-					SVMDB_NAMESPACE_VEC,
-					"vpp_vector_rate");
-  gm->input_rate_ptr =
-    svmdb_local_get_variable_reference (gm->svmdb_client,
-					SVMDB_NAMESPACE_VEC,
-					"vpp_input_rate");
-  gm->sig_error_rate_ptr =
-    svmdb_local_get_variable_reference (gm->svmdb_client,
-					SVMDB_NAMESPACE_VEC,
-					"vpp_sig_error_rate");
-  gm->vpef_pid_ptr =
-    svmdb_local_get_variable_reference (gm->svmdb_client,
-					SVMDB_NAMESPACE_VEC, "vpp_pid");
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (gmon_init);
-
-static clib_error_t *
-gmon_exit (vlib_main_t * vm)
-{
-  gmon_main_t *gm = &gmon_main;
-
-  if (gm->vector_rate_ptr)
-    {
-      *gm->vector_rate_ptr = 0.0;
-      *gm->vpef_pid_ptr = 0;
-      *gm->input_rate_ptr = 0.0;
-      *gm->sig_error_rate_ptr = 0.0;
-      svm_region_unmap ((void *) gm->svmdb_client->db_rp);
-      vec_free (gm->svmdb_client);
-    }
-  return 0;
-}
-
-VLIB_MAIN_LOOP_EXIT_FUNCTION (gmon_exit);
-
-static int
-significant_error_enable_disable (gmon_main_t * gm, u32 index, int enable)
-{
-  vlib_main_t *vm = gm->vlib_main;
-  vlib_error_main_t *em = &vm->error_main;
-
-  if (index >= vec_len (em->counters))
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-  gm->sig_error_bitmap =
-    clib_bitmap_set (gm->sig_error_bitmap, index, enable);
-  return 0;
-}
-
-static clib_error_t *
-set_significant_error_command_fn (vlib_main_t * vm,
-				  unformat_input_t * input,
-				  vlib_cli_command_t * cmd)
-{
-  u32 index;
-  int enable = 1;
-  int rv;
-  gmon_main_t *gm = &gmon_main;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "%d", &index))
-	;
-      else if (unformat (input, "disable"))
-	enable = 0;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-
-  rv = significant_error_enable_disable (gm, index, enable);
-
-  switch (rv)
-    {
-    case 0:
-      break;
-
-    default:
-      return clib_error_return
-	(0, "significant_error_enable_disable returned %d", rv);
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_significant_error_command, static) = {
-  .path = "set significant error",
-  .short_help = "set significant error <counter-index-nnn> [disable]",
-  .function = set_significant_error_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/vpp-api/json_format.c b/vpp/vpp-api/json_format.c
deleted file mode 100644
index 63454b87..00000000
--- a/vpp/vpp-api/json_format.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- *------------------------------------------------------------------
- * json_format.c
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
-
-*/
-#include <inttypes.h>
-#include "json_format.h"
-#include <vnet/ip/ip.h>
-#include <vppinfra/vec.h>
-
-#define VAT_TAB_WIDTH               2
-
-typedef struct vat_print_ctx_s
-{
-  FILE *ofp;
-  u32 indent;
-} vat_print_ctx_t;
-
-/* Format an IP4 address. */
-static u8 *
-vat_json_format_ip4_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
-}
-
-/* Format an IP6 address. */
-static u8 *
-vat_json_format_ip6_address (u8 * s, va_list * args)
-{
-  ip6_address_t *a = va_arg (*args, ip6_address_t *);
-  u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
-
-  i_max_n_zero = ARRAY_LEN (a->as_u16);
-  max_n_zeros = 0;
-  i_first_zero = i_max_n_zero;
-  n_zeros = 0;
-  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
-    {
-      u32 is_zero = a->as_u16[i] == 0;
-      if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
-	{
-	  i_first_zero = i;
-	  n_zeros = 0;
-	}
-      n_zeros += is_zero;
-      if ((!is_zero && n_zeros > max_n_zeros)
-	  || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
-	{
-	  i_max_n_zero = i_first_zero;
-	  max_n_zeros = n_zeros;
-	  i_first_zero = ARRAY_LEN (a->as_u16);
-	  n_zeros = 0;
-	}
-    }
-
-  last_double_colon = 0;
-  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
-    {
-      if (i == i_max_n_zero && max_n_zeros > 1)
-	{
-	  s = format (s, "::");
-	  i += max_n_zeros - 1;
-	  last_double_colon = 1;
-	}
-      else
-	{
-	  s = format (s, "%s%x",
-		      (last_double_colon || i == 0) ? "" : ":",
-		      clib_net_to_host_u16 (a->as_u16[i]));
-	  last_double_colon = 0;
-	}
-    }
-
-  return s;
-}
-
-static void
-vat_json_indent_print (vat_print_ctx_t * ctx)
-{
-  int i;
-  for (i = 0; i < ctx->indent * VAT_TAB_WIDTH; i++)
-    {
-      fformat (ctx->ofp, " ");
-    }
-}
-
-static void
-vat_json_indent_line (vat_print_ctx_t * ctx, char *fmt, ...)
-{
-  va_list va;
-
-  vat_json_indent_print (ctx);
-  va_start (va, fmt);
-  va_fformat (ctx->ofp, fmt, &va);
-  va_end (va);
-}
-
-static u8
-is_num_only (vat_json_node_t * p)
-{
-  vat_json_node_t *elem;
-  vec_foreach (elem, p)
-  {
-    if (VAT_JSON_INT != elem->type && VAT_JSON_UINT != elem->type)
-      {
-	return 0;
-      }
-  }
-  return 1;
-}
-
-static void
-vat_json_print_internal (vat_print_ctx_t * ctx, vat_json_node_t * node)
-{
-#define P(fmt,...) fformat(ctx->ofp, fmt, ##__VA_ARGS__)
-#define PL(fmt,...) fformat(ctx->ofp, fmt"\n", ##__VA_ARGS__)
-#define PPL(fmt,...) vat_json_indent_line(ctx, fmt"\n", ##__VA_ARGS__)
-#define PP(fmt,...) vat_json_indent_line(ctx, fmt, ##__VA_ARGS__)
-#define INCR (ctx->indent++)
-#define DECR (ctx->indent--)
-
-  vat_json_pair_t *pair;
-  u32 i, count;
-  vat_json_node_t *elem;
-  u8 num_only = 0;
-
-  if (!node)
-    {
-      return;
-    }
-
-  switch (node->type)
-    {
-    case VAT_JSON_OBJECT:
-      count = vec_len (node->pairs);
-      if (count >= 1)
-	{
-	  PL ("{");
-	  INCR;
-	  for (i = 0; i < count; i++)
-	    {
-	      pair = &node->pairs[i];
-	      PP ("\"%s\": ", pair->name);
-	      vat_json_print_internal (ctx, &pair->value);
-	      if (i < count - 1)
-		{
-		  P (",");
-		}
-	      PL ();
-	    }
-	  DECR;
-	  PP ("}");
-	}
-      else
-	{
-	  P ("{}");
-	}
-      break;
-    case VAT_JSON_ARRAY:
-      num_only = is_num_only (node->array);
-      count = vec_len (node->array);
-      if (count >= 1)
-	{
-	  if (num_only)
-	    P ("[");
-	  else
-	    PL ("[ ");
-	  INCR;
-	  for (i = 0; i < count; i++)
-	    {
-	      elem = &node->array[i];
-	      if (!num_only)
-		{
-		  vat_json_indent_print (ctx);
-		}
-	      vat_json_print_internal (ctx, elem);
-	      if (i < count - 1)
-		{
-		  if (num_only)
-		    {
-		      P (", ");
-		    }
-		  else
-		    {
-		      P (",");
-		    }
-		}
-	      if (!num_only)
-		PL ();
-	    }
-	  DECR;
-	  if (!num_only)
-	    PP ("]");
-	  else
-	    P ("]");
-	}
-      else
-	{
-	  P ("[]");
-	}
-      break;
-    case VAT_JSON_INT:
-      P ("%d", node->sint);
-      break;
-    case VAT_JSON_UINT:
-      P ("%" PRIu64, node->uint);
-      break;
-    case VAT_JSON_REAL:
-      P ("%f", node->real);
-      break;
-    case VAT_JSON_STRING:
-      P ("\"%s\"", node->string);
-      break;
-    case VAT_JSON_IPV4:
-      P ("\"%U\"", vat_json_format_ip4_address, &node->ip4);
-      break;
-    case VAT_JSON_IPV6:
-      P ("\"%U\"", vat_json_format_ip6_address, &node->ip6);
-      break;
-    default:
-      break;
-    }
-#undef PPL
-#undef PP
-#undef PL
-#undef P
-}
-
-void
-vat_json_print (FILE * ofp, vat_json_node_t * node)
-{
-  vat_print_ctx_t ctx;
-  memset (&ctx, 0, sizeof ctx);
-  ctx.indent = 0;
-  ctx.ofp = ofp;
-  fformat (ofp, "\n");
-  vat_json_print_internal (&ctx, node);
-  fformat (ofp, "\n");
-}
-
-void
-vat_json_free (vat_json_node_t * node)
-{
-  int i = 0;
-
-  if (NULL == node)
-    {
-      return;
-    }
-  switch (node->type)
-    {
-    case VAT_JSON_OBJECT:
-      for (i = 0; i < vec_len (node->pairs); i++)
-	{
-	  vat_json_free (&node->pairs[i].value);
-	}
-      if (NULL != node->pairs)
-	{
-	  vec_free (node->pairs);
-	}
-      break;
-    case VAT_JSON_ARRAY:
-      for (i = 0; i < vec_len (node->array); i++)
-	{
-	  vat_json_free (&node->array[i]);
-	}
-      if (NULL != node->array)
-	{
-	  vec_free (node->array);
-	}
-      break;
-    case VAT_JSON_STRING:
-      if (NULL != node->string)
-	{
-	  vec_free (node->string);
-	}
-      break;
-    default:
-      break;
-    }
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/vpp-api/json_format.h b/vpp/vpp-api/json_format.h
deleted file mode 100644
index 154fb3df..00000000
--- a/vpp/vpp-api/json_format.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- *------------------------------------------------------------------
- * json_format.h
- *
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#ifndef __JSON_FORMAT_H__
-#define __JSON_FORMAT_H__
-
-#include <vppinfra/clib.h>
-#include <vppinfra/format.h>
-#include <netinet/ip.h>
-
-/* JSON value type */
-typedef enum
-{
-  VAT_JSON_NONE,
-  VAT_JSON_OBJECT,
-  VAT_JSON_ARRAY,
-  VAT_JSON_STRING,
-  VAT_JSON_REAL,
-  VAT_JSON_UINT,
-  VAT_JSON_INT,
-  VAT_JSON_IPV4,
-  VAT_JSON_IPV6,
-  VAT_JSON_MAX
-} vat_json_val_type_t;
-
-typedef struct vat_json_node_s vat_json_node_t;
-typedef struct vat_json_pair_s vat_json_pair_t;
-
-/* JSON object structure */
-struct vat_json_node_s
-{
-  vat_json_val_type_t type;
-  union
-  {
-    vat_json_pair_t *pairs;
-    vat_json_node_t *array;
-    u8 *string;
-    struct in_addr ip4;
-    struct in6_addr ip6;
-    u64 uint;
-    i64 sint;
-    f64 real;
-  };
-};
-
-struct vat_json_pair_s
-{
-  const char *name;
-  vat_json_node_t value;
-};
-
-void vat_json_print (FILE * ofp, vat_json_node_t * node);
-void vat_json_free (vat_json_node_t * node);
-
-static_always_inline void
-vat_json_init_object (vat_json_node_t * json)
-{
-  json->type = VAT_JSON_OBJECT;
-  json->pairs = NULL;
-}
-
-static_always_inline void
-vat_json_init_array (vat_json_node_t * json)
-{
-  json->type = VAT_JSON_ARRAY;
-  json->array = NULL;
-}
-
-static_always_inline void
-vat_json_set_string (vat_json_node_t * json, u8 * str)
-{
-  json->type = VAT_JSON_STRING;
-  json->string = str;
-}
-
-static_always_inline void
-vat_json_set_string_copy (vat_json_node_t * json, const u8 * str)
-{
-  u8 *ns = NULL;
-  vec_validate (ns, strlen ((const char *) str));
-  strcpy ((char *) ns, (const char *) str);
-  vec_add1 (ns, '\0');
-  vat_json_set_string (json, ns);
-}
-
-static_always_inline void
-vat_json_set_int (vat_json_node_t * json, i64 num)
-{
-  json->type = VAT_JSON_INT;
-  json->sint = num;
-}
-
-static_always_inline void
-vat_json_set_uint (vat_json_node_t * json, u64 num)
-{
-  json->type = VAT_JSON_UINT;
-  json->uint = num;
-}
-
-static_always_inline void
-vat_json_set_real (vat_json_node_t * json, f64 real)
-{
-  json->type = VAT_JSON_REAL;
-  json->real = real;
-}
-
-static_always_inline void
-vat_json_set_ip4 (vat_json_node_t * json, struct in_addr ip4)
-{
-  json->type = VAT_JSON_IPV4;
-  json->ip4 = ip4;
-}
-
-static_always_inline void
-vat_json_set_ip6 (vat_json_node_t * json, struct in6_addr ip6)
-{
-  json->type = VAT_JSON_IPV6;
-  json->ip6 = ip6;
-}
-
-static_always_inline vat_json_node_t *
-vat_json_object_add (vat_json_node_t * json, const char *name)
-{
-  ASSERT (VAT_JSON_OBJECT == json->type);
-  uword pos = vec_len (json->pairs);
-  vec_validate (json->pairs, pos);
-  json->pairs[pos].name = name;
-  return &json->pairs[pos].value;
-}
-
-static_always_inline vat_json_node_t *
-vat_json_array_add (vat_json_node_t * json)
-{
-  ASSERT (VAT_JSON_ARRAY == json->type);
-  uword pos = vec_len (json->array);
-  vec_validate (json->array, pos);
-  return &json->array[pos];
-}
-
-static_always_inline vat_json_node_t *
-vat_json_object_add_list (vat_json_node_t * json, const char *name)
-{
-  vat_json_node_t *array_node = vat_json_object_add (json, name);
-  vat_json_init_array (array_node);
-  return array_node;
-}
-
-static_always_inline void
-vat_json_object_add_string_copy (vat_json_node_t * json,
-				 const char *name, u8 * str)
-{
-  vat_json_set_string_copy (vat_json_object_add (json, name), str);
-}
-
-static_always_inline void
-vat_json_object_add_uint (vat_json_node_t * json,
-			  const char *name, u64 number)
-{
-  vat_json_set_uint (vat_json_object_add (json, name), number);
-}
-
-static_always_inline void
-vat_json_object_add_int (vat_json_node_t * json, const char *name, i64 number)
-{
-  vat_json_set_int (vat_json_object_add (json, name), number);
-}
-
-static_always_inline void
-vat_json_object_add_real (vat_json_node_t * json, const char *name, f64 real)
-{
-  vat_json_set_real (vat_json_object_add (json, name), real);
-}
-
-static_always_inline void
-vat_json_object_add_ip4 (vat_json_node_t * json,
-			 const char *name, struct in_addr ip4)
-{
-  vat_json_set_ip4 (vat_json_object_add (json, name), ip4);
-}
-
-static_always_inline void
-vat_json_object_add_ip6 (vat_json_node_t * json,
-			 const char *name, struct in6_addr ip6)
-{
-  vat_json_set_ip6 (vat_json_object_add (json, name), ip6);
-}
-
-static_always_inline void
-vat_json_array_add_int (vat_json_node_t * json, i64 number)
-{
-  vat_json_set_int (vat_json_array_add (json), number);
-}
-
-static_always_inline void
-vat_json_array_add_uint (vat_json_node_t * json, u64 number)
-{
-  vat_json_set_uint (vat_json_array_add (json), number);
-}
-
-static_always_inline void
-vat_json_object_add_bytes (vat_json_node_t * json,
-			   const char *name, u8 * array, uword size)
-{
-  ASSERT (VAT_JSON_OBJECT == json->type);
-  vat_json_node_t *json_array = vat_json_object_add (json, name);
-  vat_json_init_array (json_array);
-  int i;
-  for (i = 0; i < size; i++)
-    {
-      vat_json_array_add_uint (json_array, array[i]);
-    }
-}
-
-static_always_inline vat_json_node_t *
-vat_json_object_get_element (vat_json_node_t * json, const char *name)
-{
-  int i = 0;
-
-  ASSERT (VAT_JSON_OBJECT == json->type);
-  for (i = 0; i < vec_len (json->pairs); i++)
-    {
-      if (0 == strcmp (json->pairs[i].name, name))
-	{
-	  return &json->pairs[i].value;
-	}
-    }
-  return NULL;
-}
-
-#endif /* __JSON_FORMAT_H__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/vpp-api/summary_stats_client.c b/vpp/vpp-api/summary_stats_client.c
deleted file mode 100644
index 54e16669..00000000
--- a/vpp/vpp-api/summary_stats_client.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- *------------------------------------------------------------------
- * summary_stats_client -
- *
- * Copyright (c) 2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-#include <vppinfra/error.h>
-
-#include <vnet/vnet.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-
-#include <vpp-api/vpe_msg_enum.h>
-
-#include <vnet/ip/ip.h>
-
-#define f64_endian(a)
-#define f64_print(a,b)
-
-#define vl_typedefs		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_printfun
-
-vl_shmem_hdr_t *shmem_hdr;
-
-typedef struct
-{
-  volatile int sigterm_received;
-
-  struct sockaddr_in send_data_addr;
-  int send_data_socket;
-  u8 *display_name;
-
-  /* convenience */
-  unix_shared_memory_queue_t *vl_input_queue;
-  u32 my_client_index;
-} test_main_t;
-
-test_main_t test_main;
-
-/*
- * Satisfy external references when -lvlib is not available.
- */
-vlib_main_t vlib_global_main;
-vlib_main_t **vlib_mains;
-
-void
-vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...)
-{
-  clib_warning ("vlib_cli_output callled...");
-}
-
-
-static void
-vl_api_vnet_summary_stats_reply_t_handler (vl_api_vnet_summary_stats_reply_t *
-					   mp)
-{
-  test_main_t *tm = &test_main;
-  static u8 *sb;
-  int n;
-
-  printf ("total rx pkts %llu, total rx bytes %llu\n",
-	  (unsigned long long) mp->total_pkts[0],
-	  (unsigned long long) mp->total_bytes[0]);
-  printf ("total tx pkts %llu, total tx bytes %llu\n",
-	  (unsigned long long) mp->total_pkts[1],
-	  (unsigned long long) mp->total_bytes[1]);
-  printf ("vector rate %.2f\n", mp->vector_rate);
-
-  vec_reset_length (sb);
-  sb = format (sb, "%v,%.0f,%llu,%llu,%llu,%llu\n%c",
-	       tm->display_name, mp->vector_rate,
-	       (unsigned long long) mp->total_pkts[0],
-	       (unsigned long long) mp->total_bytes[0],
-	       (unsigned long long) mp->total_pkts[1],
-	       (unsigned long long) mp->total_bytes[1], 0);
-
-  n = sendto (tm->send_data_socket, sb, vec_len (sb),
-	      0, (struct sockaddr *) &tm->send_data_addr,
-	      sizeof (tm->send_data_addr));
-
-  if (n != vec_len (sb))
-    clib_unix_warning ("sendto");
-
-}
-
-#define foreach_api_msg                                                 \
-_(VNET_SUMMARY_STATS_REPLY, vnet_summary_stats_reply)
-
-int
-connect_to_vpe (char *name)
-{
-  int rv = 0;
-
-  rv = vl_client_connect_to_vlib ("/vpe-api", name, 32);
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_api_msg;
-#undef _
-
-  shmem_hdr = api_main.shmem_hdr;
-
-  return rv;
-}
-
-int
-disconnect_from_vpe (void)
-{
-  vl_client_disconnect_from_vlib ();
-  return 0;
-}
-
-static void
-sigterm_handler (int sig)
-{
-  test_main_t *tm = &test_main;
-  tm->sigterm_received = 1;
-}
-
-/* Parse an IP4 address %d.%d.%d.%d. */
-uword
-unformat_ip4_address (unformat_input_t * input, va_list * args)
-{
-  u8 *result = va_arg (*args, u8 *);
-  unsigned a[4];
-
-  if (!unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]))
-    return 0;
-
-  if (a[0] >= 256 || a[1] >= 256 || a[2] >= 256 || a[3] >= 256)
-    return 0;
-
-  result[0] = a[0];
-  result[1] = a[1];
-  result[2] = a[2];
-  result[3] = a[3];
-
-  return 1;
-}
-
-int
-main (int argc, char **argv)
-{
-  api_main_t *am = &api_main;
-  test_main_t *tm = &test_main;
-  vl_api_vnet_get_summary_stats_t *mp;
-  unformat_input_t _input, *input = &_input;
-  clib_error_t *error = 0;
-  ip4_address_t collector_ip;
-  u8 *display_name = 0;
-  u16 collector_port = 7654;
-
-  collector_ip.as_u32 = (u32) ~ 0;
-
-  unformat_init_command_line (input, argv);
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "collector-ip %U",
-		    unformat_ip4_address, &collector_ip))
-	;
-      else if (unformat (input, "display-name %v", &display_name))
-	;
-      else if (unformat (input, "collector-port %d", &collector_port))
-	;
-      else
-	{
-	  error =
-	    clib_error_return
-	    (0, "Usage: %s collector-ip <ip>\n"
-	     "    [display-name <string>] [collector-port <num>]\n"
-	     "    port defaults to 7654", argv[0]);
-	  break;
-	}
-    }
-
-  if (error == 0 && collector_ip.as_u32 == (u32) ~ 0)
-    error = clib_error_return (0, "collector-ip not set...\n");
-
-
-  if (error)
-    {
-      clib_error_report (error);
-      exit (1);
-    }
-
-  if (display_name == 0)
-    {
-      display_name = format (0, "vpe-to-%d.%d.%d.%d",
-			     collector_ip.as_u8[0],
-			     collector_ip.as_u8[1],
-			     collector_ip.as_u8[2], collector_ip.as_u8[3]);
-    }
-
-
-  connect_to_vpe ("test_client");
-
-  tm->vl_input_queue = shmem_hdr->vl_input_queue;
-  tm->my_client_index = am->my_client_index;
-  tm->display_name = display_name;
-
-  signal (SIGTERM, sigterm_handler);
-  signal (SIGINT, sigterm_handler);
-  signal (SIGQUIT, sigterm_handler);
-
-  /* data (multicast) RX socket */
-  tm->send_data_socket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
-  if (tm->send_data_socket < 0)
-    {
-      clib_unix_warning (0, "data_rx_socket");
-      exit (1);
-    }
-
-  memset (&tm->send_data_addr, 0, sizeof (tm->send_data_addr));
-  tm->send_data_addr.sin_family = AF_INET;
-  tm->send_data_addr.sin_addr.s_addr = collector_ip.as_u32;
-  tm->send_data_addr.sin_port = htons (collector_port);
-
-  fformat (stdout, "Send SIGINT or SIGTERM to quit...\n");
-
-  while (1)
-    {
-      sleep (5);
-
-      if (tm->sigterm_received)
-	break;
-      /* Poll for stats */
-      mp = vl_msg_api_alloc (sizeof (*mp));
-      memset (mp, 0, sizeof (*mp));
-      mp->_vl_msg_id = ntohs (VL_API_VNET_GET_SUMMARY_STATS);
-      mp->client_index = tm->my_client_index;
-      vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-    }
-
-  fformat (stdout, "Exiting...\n");
-
-  disconnect_from_vpe ();
-  exit (0);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/vpp-api/test_client.c b/vpp/vpp-api/test_client.c
deleted file mode 100644
index e0d7054a..00000000
--- a/vpp/vpp-api/test_client.c
+++ /dev/null
@@ -1,1531 +0,0 @@
-/*
- *------------------------------------------------------------------
- * api.c - message handler registration
- *
- * Copyright (c) 2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-#include <vppinfra/error.h>
-
-#include <vnet/vnet.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-
-#include <vpp-api/vpe_msg_enum.h>
-
-#include <vnet/ip/ip.h>
-#include <vnet/interface.h>
-
-#define f64_endian(a)
-#define f64_print(a,b)
-
-#define vl_typedefs		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_printfun
-
-vl_shmem_hdr_t *shmem_hdr;
-
-typedef struct
-{
-  int link_events_on;
-  int stats_on;
-  int oam_events_on;
-
-  /* convenience */
-  unix_shared_memory_queue_t *vl_input_queue;
-  u32 my_client_index;
-} test_main_t;
-
-test_main_t test_main;
-
-/*
- * Satisfy external references when -lvlib is not available.
- */
-vlib_main_t vlib_global_main;
-vlib_main_t **vlib_mains;
-
-void
-vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...)
-{
-  clib_warning ("vlib_cli_output callled...");
-}
-
-u8 *
-format_ethernet_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-
-  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
-		 a[0], a[1], a[2], a[3], a[4], a[5]);
-}
-
-static void
-vl_api_sw_interface_details_t_handler (vl_api_sw_interface_details_t * mp)
-{
-  char *duplex, *speed;
-
-  switch (mp->link_duplex << VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT)
-    {
-    case VNET_HW_INTERFACE_FLAG_HALF_DUPLEX:
-      duplex = "half";
-      break;
-    case VNET_HW_INTERFACE_FLAG_FULL_DUPLEX:
-      duplex = "full";
-      break;
-    default:
-      duplex = "bogus";
-      break;
-    }
-  switch (mp->link_speed << VNET_HW_INTERFACE_FLAG_SPEED_SHIFT)
-    {
-    case VNET_HW_INTERFACE_FLAG_SPEED_10M:
-      speed = "10Mbps";
-      break;
-    case VNET_HW_INTERFACE_FLAG_SPEED_100M:
-      speed = "100Mbps";
-      break;
-    case VNET_HW_INTERFACE_FLAG_SPEED_1G:
-      speed = "1Gbps";
-      break;
-    case VNET_HW_INTERFACE_FLAG_SPEED_10G:
-      speed = "10Gbps";
-      break;
-    case VNET_HW_INTERFACE_FLAG_SPEED_40G:
-      speed = "40Gbps";
-      break;
-    case VNET_HW_INTERFACE_FLAG_SPEED_100G:
-      speed = "100Gbps";
-      break;
-    default:
-      speed = "bogus";
-      break;
-    }
-  fformat (stdout, "details: %s sw_if_index %d sup_sw_if_index %d "
-	   "link_duplex %s link_speed %s",
-	   mp->interface_name, ntohl (mp->sw_if_index),
-	   ntohl (mp->sup_sw_if_index), duplex, speed);
-
-  if (mp->l2_address_length)
-    fformat (stdout, "  l2 address: %U\n",
-	     format_ethernet_address, mp->l2_address);
-  else
-    fformat (stdout, "\n");
-}
-
-static void
-vl_api_sw_interface_set_flags_t_handler (vl_api_sw_interface_set_flags_t * mp)
-{
-  fformat (stdout, "set flags: sw_if_index %d, admin %s link %s\n",
-	   ntohl (mp->sw_if_index),
-	   mp->admin_up_down ? "up" : "down",
-	   mp->link_up_down ? "up" : "down");
-}
-
-static void
-  vl_api_sw_interface_set_flags_reply_t_handler
-  (vl_api_sw_interface_set_flags_reply_t * mp)
-{
-  fformat (stdout, "set flags reply: reply %d\n", ntohl (mp->retval));
-}
-
-static void
-  vl_api_want_interface_events_reply_t_handler
-  (vl_api_want_interface_events_reply_t * mp)
-{
-}
-
-static void
-vl_api_want_stats_reply_t_handler (vl_api_want_stats_reply_t * mp)
-{
-  fformat (stdout, "want stats reply %d\n", ntohl (mp->retval));
-}
-
-static void
-vl_api_want_oam_events_reply_t_handler (vl_api_want_oam_events_reply_t * mp)
-{
-  fformat (stdout, "want oam reply %d\n", ntohl (mp->retval));
-}
-
-static void
-vl_api_ip_add_del_route_reply_t_handler (vl_api_ip_add_del_route_reply_t * mp)
-{
-  fformat (stdout, "add_route reply %d\n", ntohl (mp->retval));
-}
-
-static void
-  vl_api_sw_interface_add_del_address_reply_t_handler
-  (vl_api_sw_interface_add_del_address_reply_t * mp)
-{
-  fformat (stdout, "add_del_address reply %d\n", ntohl (mp->retval));
-}
-
-static void
-  vl_api_sw_interface_set_table_reply_t_handler
-  (vl_api_sw_interface_set_table_reply_t * mp)
-{
-  fformat (stdout, "set_table reply %d\n", ntohl (mp->retval));
-}
-
-static void
-vl_api_tap_connect_reply_t_handler (vl_api_tap_connect_reply_t * mp)
-{
-  fformat (stdout, "tap connect reply %d, sw_if_index %d\n",
-	   ntohl (mp->retval), ntohl (mp->sw_if_index));
-}
-
-static void
-vl_api_create_vlan_subif_reply_t_handler (vl_api_create_vlan_subif_reply_t *
-					  mp)
-{
-  fformat (stdout, "create vlan subif reply %d, sw_if_index %d\n",
-	   ntohl (mp->retval), ntohl (mp->sw_if_index));
-}
-
-static void vl_api_proxy_arp_add_del_reply_t_handler
-  (vl_api_proxy_arp_add_del_reply_t * mp)
-{
-  fformat (stdout, "add del proxy arp reply %d\n", ntohl (mp->retval));
-}
-
-static void vl_api_proxy_arp_intfc_enable_disable_reply_t_handler
-  (vl_api_proxy_arp_intfc_enable_disable_reply_t * mp)
-{
-  fformat (stdout, "proxy arp intfc ena/dis reply %d\n", ntohl (mp->retval));
-}
-
-static void vl_api_ip_neighbor_add_del_reply_t_handler
-  (vl_api_ip_neighbor_add_del_reply_t * mp)
-{
-  fformat (stdout, "ip neighbor add del reply %d\n", ntohl (mp->retval));
-}
-
-static void
-vl_api_vnet_interface_counters_t_handler (vl_api_vnet_interface_counters_t *
-					  mp)
-{
-  char *counter_name;
-  u32 count, sw_if_index;
-  int i;
-
-  count = ntohl (mp->count);
-  sw_if_index = ntohl (mp->first_sw_if_index);
-  if (mp->is_combined == 0)
-    {
-      u64 *vp, v;
-      vp = (u64 *) mp->data;
-
-      switch (mp->vnet_counter_type)
-	{
-	case VNET_INTERFACE_COUNTER_DROP:
-	  counter_name = "drop";
-	  break;
-	case VNET_INTERFACE_COUNTER_PUNT:
-	  counter_name = "punt";
-	  break;
-	case VNET_INTERFACE_COUNTER_IP4:
-	  counter_name = "ip4";
-	  break;
-	case VNET_INTERFACE_COUNTER_IP6:
-	  counter_name = "ip6";
-	  break;
-	case VNET_INTERFACE_COUNTER_RX_NO_BUF:
-	  counter_name = "rx-no-buf";
-	  break;
-	case VNET_INTERFACE_COUNTER_RX_MISS:
-	  counter_name = "rx-miss";
-	  break;
-	case VNET_INTERFACE_COUNTER_RX_ERROR:
-	  counter_name = "rx-error";
-	  break;
-	case VNET_INTERFACE_COUNTER_TX_ERROR:
-	  counter_name = "tx-error (fifo-full)";
-	  break;
-	default:
-	  counter_name = "bogus";
-	  break;
-	}
-      for (i = 0; i < count; i++)
-	{
-	  v = clib_mem_unaligned (vp, u64);
-	  v = clib_net_to_host_u64 (v);
-	  vp++;
-	  fformat (stdout, "%d.%s %lld\n", sw_if_index, counter_name, v);
-	  sw_if_index++;
-	}
-    }
-  else
-    {
-      vlib_counter_t *vp;
-      u64 packets, bytes;
-      vp = (vlib_counter_t *) mp->data;
-
-      switch (mp->vnet_counter_type)
-	{
-	case VNET_INTERFACE_COUNTER_RX:
-	  counter_name = "rx";
-	  break;
-	case VNET_INTERFACE_COUNTER_TX:
-	  counter_name = "tx";
-	  break;
-	default:
-	  counter_name = "bogus";
-	  break;
-	}
-      for (i = 0; i < count; i++)
-	{
-	  packets = clib_mem_unaligned (&vp->packets, u64);
-	  packets = clib_net_to_host_u64 (packets);
-	  bytes = clib_mem_unaligned (&vp->bytes, u64);
-	  bytes = clib_net_to_host_u64 (bytes);
-	  vp++;
-	  fformat (stdout, "%d.%s.packets %lld\n",
-		   sw_if_index, counter_name, packets);
-	  fformat (stdout, "%d.%s.bytes %lld\n",
-		   sw_if_index, counter_name, bytes);
-	  sw_if_index++;
-	}
-    }
-}
-
-/* Format an IP4 address. */
-u8 *
-format_ip4_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
-}
-
-/* Format an IP4 route destination and length. */
-u8 *
-format_ip4_address_and_length (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  u8 l = va_arg (*args, u32);
-  return format (s, "%U/%d", format_ip4_address, a, l);
-}
-
-static void
-vl_api_vnet_ip4_fib_counters_t_handler (vl_api_vnet_ip4_fib_counters_t * mp)
-{
-  int i;
-  vl_api_ip4_fib_counter_t *ctrp;
-  u32 count;
-
-  count = ntohl (mp->count);
-
-  fformat (stdout, "fib id %d, count this msg %d\n",
-	   ntohl (mp->vrf_id), count);
-
-  ctrp = mp->c;
-  for (i = 0; i < count; i++)
-    {
-      fformat (stdout, "%U: %lld packets, %lld bytes\n",
-	       format_ip4_address_and_length, &ctrp->address,
-	       (u32) ctrp->address_length,
-	       clib_net_to_host_u64 (ctrp->packets),
-	       clib_net_to_host_u64 (ctrp->bytes));
-      ctrp++;
-    }
-}
-
-/* Format an IP6 address. */
-u8 *
-format_ip6_address (u8 * s, va_list * args)
-{
-  ip6_address_t *a = va_arg (*args, ip6_address_t *);
-  u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
-
-  i_max_n_zero = ARRAY_LEN (a->as_u16);
-  max_n_zeros = 0;
-  i_first_zero = i_max_n_zero;
-  n_zeros = 0;
-  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
-    {
-      u32 is_zero = a->as_u16[i] == 0;
-      if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
-	{
-	  i_first_zero = i;
-	  n_zeros = 0;
-	}
-      n_zeros += is_zero;
-      if ((!is_zero && n_zeros > max_n_zeros)
-	  || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
-	{
-	  i_max_n_zero = i_first_zero;
-	  max_n_zeros = n_zeros;
-	  i_first_zero = ARRAY_LEN (a->as_u16);
-	  n_zeros = 0;
-	}
-    }
-
-  last_double_colon = 0;
-  for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
-    {
-      if (i == i_max_n_zero && max_n_zeros > 1)
-	{
-	  s = format (s, "::");
-	  i += max_n_zeros - 1;
-	  last_double_colon = 1;
-	}
-      else
-	{
-	  s = format (s, "%s%x",
-		      (last_double_colon || i == 0) ? "" : ":",
-		      clib_net_to_host_u16 (a->as_u16[i]));
-	  last_double_colon = 0;
-	}
-    }
-
-  return s;
-}
-
-/* Format an IP6 route destination and length. */
-u8 *
-format_ip6_address_and_length (u8 * s, va_list * args)
-{
-  ip6_address_t *a = va_arg (*args, ip6_address_t *);
-  u8 l = va_arg (*args, u32);
-  return format (s, "%U/%d", format_ip6_address, a, l);
-}
-
-static void
-vl_api_vnet_ip6_fib_counters_t_handler (vl_api_vnet_ip6_fib_counters_t * mp)
-{
-  int i;
-  vl_api_ip6_fib_counter_t *ctrp;
-  u32 count;
-
-  count = ntohl (mp->count);
-
-  fformat (stdout, "fib id %d, count this msg %d\n",
-	   ntohl (mp->vrf_id), count);
-
-  ctrp = mp->c;
-  for (i = 0; i < count; i++)
-    {
-      fformat (stdout, "%U: %lld packets, %lld bytes\n",
-	       format_ip6_address_and_length, &ctrp->address,
-	       (u32) ctrp->address_length,
-	       clib_net_to_host_u64 (ctrp->packets),
-	       clib_net_to_host_u64 (ctrp->bytes));
-      ctrp++;
-    }
-}
-
-static void
-vl_api_oam_event_t_handler (vl_api_oam_event_t * mp)
-{
-  fformat (stdout, "OAM: %U now %s\n",
-	   format_ip4_address, &mp->dst_address,
-	   mp->state == 1 ? "alive" : "dead");
-}
-
-static void
-vl_api_oam_add_del_reply_t_handler (vl_api_oam_add_del_reply_t * mp)
-{
-  fformat (stdout, "oam add del reply %d\n", ntohl (mp->retval));
-}
-
-static void
-vl_api_reset_fib_reply_t_handler (vl_api_reset_fib_reply_t * mp)
-{
-  fformat (stdout, "fib reset reply %d\n", ntohl (mp->retval));
-}
-
-static void
-vl_api_dhcp_proxy_set_vss_reply_t_handler (vl_api_dhcp_proxy_set_vss_reply_t *
-					   mp)
-{
-  fformat (stdout, "dhcp proxy set vss reply %d\n", ntohl (mp->retval));
-}
-
-static void
-vl_api_dhcp_proxy_config_reply_t_handler (vl_api_dhcp_proxy_config_reply_t *
-					  mp)
-{
-  fformat (stdout, "dhcp proxy config reply %d\n", ntohl (mp->retval));
-}
-
-static void
-vl_api_set_ip_flow_hash_reply_t_handler (vl_api_set_ip_flow_hash_reply_t * mp)
-{
-  fformat (stdout, "set ip flow hash reply %d\n", ntohl (mp->retval));
-}
-
-static void
-  vl_api_sw_interface_ip6nd_ra_config_reply_t_handler
-  (vl_api_sw_interface_ip6nd_ra_config_reply_t * mp)
-{
-  fformat (stdout, "ip6 nd ra-config  reply %d\n", ntohl (mp->retval));
-}
-
-static void
-  vl_api_sw_interface_ip6nd_ra_prefix_reply_t_handler
-  (vl_api_sw_interface_ip6nd_ra_prefix_reply_t * mp)
-{
-  fformat (stdout, "ip6 nd ra-prefix  reply %d\n", ntohl (mp->retval));
-}
-
-static void
-  vl_api_sw_interface_ip6_enable_disable_reply_t_handler
-  (vl_api_sw_interface_ip6_enable_disable_reply_t * mp)
-{
-  fformat (stdout, "ip6 enable/disable reply %d\n", ntohl (mp->retval));
-}
-
-static void
-  vl_api_sw_interface_ip6_set_link_local_address_reply_t_handler
-  (vl_api_sw_interface_ip6_set_link_local_address_reply_t * mp)
-{
-  fformat (stdout, "ip6 set link-local address reply %d\n",
-	   ntohl (mp->retval));
-}
-
-static void vl_api_create_loopback_reply_t_handler
-  (vl_api_create_loopback_reply_t * mp)
-{
-  fformat (stdout, "create loopback status %d, sw_if_index %d\n",
-	   ntohl (mp->retval), ntohl (mp->sw_if_index));
-}
-
-static void
-vl_api_sr_tunnel_add_del_reply_t_handler (vl_api_sr_tunnel_add_del_reply_t *
-					  mp)
-{
-  fformat (stdout, "sr tunnel add/del reply %d\n", ntohl (mp->retval));
-}
-
-static void vl_api_l2_patch_add_del_reply_t_handler
-  (vl_api_l2_patch_add_del_reply_t * mp)
-{
-  fformat (stdout, "l2 patch reply %d\n", ntohl (mp->retval));
-}
-
-static void vl_api_sw_interface_set_l2_xconnect_reply_t_handler
-  (vl_api_sw_interface_set_l2_xconnect_reply_t * mp)
-{
-  fformat (stdout, "l2_xconnect reply %d\n", ntohl (mp->retval));
-}
-
-static void vl_api_sw_interface_set_l2_bridge_reply_t_handler
-  (vl_api_sw_interface_set_l2_bridge_reply_t * mp)
-{
-  fformat (stdout, "l2_bridge reply %d\n", ntohl (mp->retval));
-}
-
-static void
-noop_handler (void *notused)
-{
-}
-
-#define vl_api_vnet_ip4_fib_counters_t_endian noop_handler
-#define vl_api_vnet_ip4_fib_counters_t_print noop_handler
-#define vl_api_vnet_ip6_fib_counters_t_endian noop_handler
-#define vl_api_vnet_ip6_fib_counters_t_print noop_handler
-
-#define foreach_api_msg                                                 \
-_(SW_INTERFACE_DETAILS, sw_interface_details)                           \
-_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags)                       \
-_(SW_INTERFACE_SET_FLAGS_REPLY, sw_interface_set_flags_reply)           \
-_(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply)             \
-_(WANT_STATS_REPLY, want_stats_reply)                                   \
-_(WANT_OAM_EVENTS_REPLY, want_oam_events_reply)                         \
-_(OAM_EVENT, oam_event)                                                 \
-_(OAM_ADD_DEL_REPLY, oam_add_del_reply)				        \
-_(VNET_INTERFACE_COUNTERS, vnet_interface_counters)                     \
-_(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters)                         \
-_(VNET_IP6_FIB_COUNTERS, vnet_ip6_fib_counters)                         \
-_(IP_ADD_DEL_ROUTE_REPLY, ip_add_del_route_reply)                       \
-_(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY, sw_interface_add_del_address_reply) \
-_(SW_INTERFACE_SET_TABLE_REPLY, sw_interface_set_table_reply)           \
-_(TAP_CONNECT_REPLY, tap_connect_reply)                                 \
-_(CREATE_VLAN_SUBIF_REPLY, create_vlan_subif_reply)                     \
-_(PROXY_ARP_ADD_DEL_REPLY, proxy_arp_add_del_reply)			\
-_(PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY, proxy_arp_intfc_enable_disable_reply) \
-_(IP_NEIGHBOR_ADD_DEL_REPLY, ip_neighbor_add_del_reply)                 \
-_(RESET_FIB_REPLY, reset_fib_reply)                                     \
-_(DHCP_PROXY_CONFIG_REPLY, dhcp_proxy_config_reply)                     \
-_(DHCP_PROXY_SET_VSS_REPLY, dhcp_proxy_set_vss_reply)                   \
-_(SET_IP_FLOW_HASH_REPLY, set_ip_flow_hash_reply)                       \
-_(SW_INTERFACE_IP6ND_RA_CONFIG_REPLY, sw_interface_ip6nd_ra_config_reply) \
-_(SW_INTERFACE_IP6ND_RA_PREFIX_REPLY, sw_interface_ip6nd_ra_prefix_reply) \
-_(SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY, sw_interface_ip6_enable_disable_reply) \
-_(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_REPLY, sw_interface_ip6_set_link_local_address_reply) \
- _(CREATE_LOOPBACK_REPLY, create_loopback_reply)			\
-_(L2_PATCH_ADD_DEL_REPLY, l2_patch_add_del_reply)			\
-_(SR_TUNNEL_ADD_DEL_REPLY,sr_tunnel_add_del_reply)          \
-_(SW_INTERFACE_SET_L2_XCONNECT_REPLY, sw_interface_set_l2_xconnect_reply) \
-_(SW_INTERFACE_SET_L2_BRIDGE_REPLY, sw_interface_set_l2_bridge_reply)
-
-int
-connect_to_vpe (char *name)
-{
-  int rv = 0;
-
-  rv = vl_client_connect_to_vlib ("/vpe-api", name, 32);
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           noop_handler,                        \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_api_msg;
-#undef _
-
-  shmem_hdr = api_main.shmem_hdr;
-
-  return rv;
-}
-
-int
-disconnect_from_vpe (void)
-{
-  vl_client_disconnect_from_vlib ();
-  return 0;
-}
-
-void
-link_up_down_enable_disable (test_main_t * tm, int enable)
-{
-  vl_api_want_interface_events_t *mp;
-
-  /* Request admin / link up down messages */
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_WANT_INTERFACE_EVENTS);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->enable_disable = enable;
-  mp->pid = getpid ();
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-  tm->link_events_on = enable;
-}
-
-void
-stats_enable_disable (test_main_t * tm, int enable)
-{
-  vl_api_want_stats_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_WANT_STATS);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->enable_disable = enable;
-  mp->pid = getpid ();
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-  tm->stats_on = enable;
-}
-
-void
-oam_events_enable_disable (test_main_t * tm, int enable)
-{
-  vl_api_want_oam_events_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_WANT_OAM_EVENTS);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->enable_disable = enable;
-  mp->pid = getpid ();
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-  tm->oam_events_on = enable;
-}
-
-void
-oam_add_del (test_main_t * tm, int is_add)
-{
-  vl_api_oam_add_del_t *mp;
-  ip4_address_t tmp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_OAM_ADD_DEL);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->is_add = is_add;
-
-  tmp.as_u32 = ntohl (0xc0a80101);	/* 192.168.1.1 */
-  clib_memcpy (mp->src_address, tmp.as_u8, 4);
-
-  tmp.as_u32 = ntohl (0xc0a80103);	/* 192.168.1.3 */
-  clib_memcpy (mp->dst_address, tmp.as_u8, 4);
-
-  mp->vrf_id = 0;
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-dump (test_main_t * tm)
-{
-  vl_api_sw_interface_dump_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_DUMP);
-  mp->client_index = tm->my_client_index;
-  mp->name_filter_valid = 1;
-  strncpy ((char *) mp->name_filter, "eth", sizeof (mp->name_filter) - 1);
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-add_del_ip4_route (test_main_t * tm, int enable_disable)
-{
-  vl_api_ip_add_del_route_t *mp;
-  u32 tmp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP_ADD_DEL_ROUTE);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->table_id = ntohl (0);
-  mp->create_vrf_if_needed = 1;
-
-  mp->next_hop_sw_if_index = ntohl (5);
-  mp->is_add = enable_disable;
-  mp->next_hop_weight = 1;
-
-  /* Next hop: 6.0.0.1 */
-  tmp = ntohl (0x06000001);
-  clib_memcpy (mp->next_hop_address, &tmp, sizeof (tmp));
-
-  /* Destination: 10.0.0.1/32 */
-  tmp = ntohl (0x0);
-  clib_memcpy (mp->dst_address, &tmp, sizeof (tmp));
-  mp->dst_address_length = 0;
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-add_del_ip6_route (test_main_t * tm, int enable_disable)
-{
-  vl_api_ip_add_del_route_t *mp;
-  u64 tmp[2];
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP_ADD_DEL_ROUTE);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->next_hop_sw_if_index = ntohl (5);
-  mp->is_add = enable_disable;
-  mp->is_ipv6 = 1;
-  mp->next_hop_weight = 1;
-  mp->dst_address_length = 64;
-
-  /* add/del dabe::/64 via db01::11 */
-
-  tmp[0] = clib_host_to_net_u64 (0xdabe000000000000ULL);
-  tmp[1] = clib_host_to_net_u64 (0x0ULL);
-  clib_memcpy (mp->dst_address, &tmp[0], 8);
-  clib_memcpy (&mp->dst_address[8], &tmp[1], 8);
-
-  tmp[0] = clib_host_to_net_u64 (0xdb01000000000000ULL);
-  tmp[1] = clib_host_to_net_u64 (0x11ULL);
-  clib_memcpy (mp->next_hop_address, &tmp[0], 8);
-  clib_memcpy (&mp->next_hop_address[8], &tmp[1], 8);
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-add_del_interface_address (test_main_t * tm, int enable_disable)
-{
-  vl_api_sw_interface_add_del_address_t *mp;
-  u32 tmp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_ADD_DEL_ADDRESS);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->sw_if_index = ntohl (5);
-  mp->is_add = enable_disable;
-  mp->address_length = 8;
-
-  tmp = ntohl (0x01020304);
-  clib_memcpy (mp->address, &tmp, 4);
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-add_del_v6_interface_address (test_main_t * tm, int enable_disable)
-{
-  vl_api_sw_interface_add_del_address_t *mp;
-  u64 tmp[2];
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_ADD_DEL_ADDRESS);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->is_ipv6 = 1;
-  mp->sw_if_index = ntohl (5);
-  mp->is_add = enable_disable;
-  mp->address_length = 64;
-
-  tmp[0] = clib_host_to_net_u64 (0xdb01000000000000ULL);
-  tmp[1] = clib_host_to_net_u64 (0x11ULL);
-
-  clib_memcpy (mp->address, &tmp[0], 8);
-  clib_memcpy (&mp->address[8], &tmp[1], 8);
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-del_all_interface_addresses (test_main_t * tm)
-{
-  vl_api_sw_interface_add_del_address_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_ADD_DEL_ADDRESS);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->sw_if_index = ntohl (5);
-  mp->del_all = 1;
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-set_interface_table (test_main_t * tm, int is_ipv6, u32 vrf_id)
-{
-  vl_api_sw_interface_set_table_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_TABLE);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->sw_if_index = ntohl (5);
-  mp->is_ipv6 = is_ipv6;
-  mp->vrf_id = ntohl (vrf_id);
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-connect_unix_tap (test_main_t * tm, char *name)
-{
-  vl_api_tap_connect_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_TAP_CONNECT);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  strncpy ((char *) mp->tap_name, name, sizeof (mp->tap_name) - 1);
-  mp->use_random_mac = 1;
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-create_vlan_subif (test_main_t * tm, u32 vlan_id)
-{
-  vl_api_create_vlan_subif_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_CREATE_VLAN_SUBIF);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->sw_if_index = ntohl (5);
-  mp->vlan_id = ntohl (vlan_id);
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-add_del_proxy_arp (test_main_t * tm, int is_add)
-{
-  vl_api_proxy_arp_add_del_t *mp;
-  u32 tmp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_PROXY_ARP_ADD_DEL);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->vrf_id = ntohl (11);
-  mp->is_add = is_add;
-
-  /* proxy fib 11, 1.1.1.1 -> 1.1.1.10 */
-  tmp = ntohl (0x01010101);
-  clib_memcpy (mp->low_address, &tmp, 4);
-
-  tmp = ntohl (0x0101010a);
-  clib_memcpy (mp->hi_address, &tmp, 4);
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-proxy_arp_intfc_enable_disable (test_main_t * tm, int enable_disable)
-{
-  vl_api_proxy_arp_intfc_enable_disable_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_PROXY_ARP_INTFC_ENABLE_DISABLE);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->sw_if_index = ntohl (6);
-  mp->enable_disable = enable_disable;
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-add_ip4_neighbor (test_main_t * tm, int add_del)
-{
-  vl_api_ip_neighbor_add_del_t *mp;
-  u32 tmp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP_NEIGHBOR_ADD_DEL);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->vrf_id = ntohl (11);
-  mp->sw_if_index = ntohl (6);
-  mp->is_add = add_del;
-
-  memset (mp->mac_address, 0xbe, sizeof (mp->mac_address));
-
-  tmp = ntohl (0x0101010a);
-  clib_memcpy (mp->dst_address, &tmp, 4);
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-add_ip6_neighbor (test_main_t * tm, int add_del)
-{
-  vl_api_ip_neighbor_add_del_t *mp;
-  u64 tmp[2];
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_IP_NEIGHBOR_ADD_DEL);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->vrf_id = ntohl (11);
-  mp->sw_if_index = ntohl (6);
-  mp->is_add = add_del;
-  mp->is_ipv6 = 1;
-
-  memset (mp->mac_address, 0xbe, sizeof (mp->mac_address));
-
-  tmp[0] = clib_host_to_net_u64 (0xdb01000000000000ULL);
-  tmp[1] = clib_host_to_net_u64 (0x11ULL);
-
-  clib_memcpy (mp->dst_address, &tmp[0], 8);
-  clib_memcpy (&mp->dst_address[8], &tmp[1], 8);
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-reset_fib (test_main_t * tm, u8 is_ip6)
-{
-  vl_api_reset_fib_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_RESET_FIB);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->vrf_id = ntohl (11);
-  mp->is_ipv6 = is_ip6;
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-dhcpv6_set_vss (test_main_t * tm)
-{
-  vl_api_dhcp_proxy_set_vss_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_DHCP_PROXY_SET_VSS);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->oui = ntohl (6);
-  mp->fib_id = ntohl (60);
-  mp->is_add = 1;
-  mp->is_ipv6 = 1;
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-dhcpv4_set_vss (test_main_t * tm)
-{
-  vl_api_dhcp_proxy_set_vss_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_DHCP_PROXY_SET_VSS);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->oui = ntohl (4);
-  mp->fib_id = ntohl (40);
-  mp->is_add = 1;
-  mp->is_ipv6 = 0;
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-dhcp_set_vss (test_main_t * tm)
-{
-  dhcpv4_set_vss (tm);
-  dhcpv6_set_vss (tm);
-}
-
-void
-dhcp_set_proxy (test_main_t * tm, int ipv6)
-{
-  vl_api_dhcp_proxy_config_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_DHCP_PROXY_CONFIG);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->vrf_id = ntohl (0);
-  mp->is_ipv6 = ipv6;
-  mp->insert_circuit_id = 1;
-  mp->is_add = 1;
-  mp->dhcp_server[0] = 0x20;
-  mp->dhcp_server[1] = 0x01;
-  mp->dhcp_server[2] = 0xab;
-  mp->dhcp_server[3] = 0xcd;
-  mp->dhcp_server[4] = 0x12;
-  mp->dhcp_server[5] = 0x34;
-  mp->dhcp_server[6] = 0xfe;
-  mp->dhcp_server[7] = 0xdc;
-  mp->dhcp_server[14] = 0;
-  mp->dhcp_server[15] = 0x2;
-
-  mp->dhcp_src_address[0] = 0x20;
-  mp->dhcp_src_address[1] = 0x01;
-  mp->dhcp_src_address[2] = 0xab;
-  mp->dhcp_src_address[3] = 0xcd;
-  mp->dhcp_src_address[4] = 0x12;
-  mp->dhcp_src_address[5] = 0x34;
-  mp->dhcp_src_address[6] = 0x56;
-  mp->dhcp_src_address[7] = 0x78;
-  mp->dhcp_src_address[14] = 0;
-  mp->dhcp_src_address[15] = 0x2;
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-set_ip_flow_hash (test_main_t * tm, u8 is_ip6)
-{
-  vl_api_set_ip_flow_hash_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SET_IP_FLOW_HASH);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->vrf_id = 0;
-  mp->is_ipv6 = is_ip6;
-  mp->dst = 1;
-  mp->reverse = 1;
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-ip6nd_ra_config (test_main_t * tm, int is_no)
-{
-  vl_api_sw_interface_ip6nd_ra_config_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->sw_if_index = ntohl (5);
-  mp->is_no = is_no;
-
-  mp->suppress = 1;
-
-
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_IP6ND_RA_CONFIG);
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-ip6nd_ra_prefix (test_main_t * tm, int is_no)
-{
-  vl_api_sw_interface_ip6nd_ra_prefix_t *mp;
-  u64 tmp[2];
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->sw_if_index = ntohl (5);
-  mp->is_no = is_no;
-
-  mp->use_default = 1;
-
-
-  tmp[0] = clib_host_to_net_u64 (0xdb01000000000000ULL);
-  tmp[1] = clib_host_to_net_u64 (0x11ULL);
-
-
-  clib_memcpy (mp->address, &tmp[0], 8);
-  clib_memcpy (&mp->address[8], &tmp[1], 8);
-
-  mp->address_length = 64;
-
-
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_IP6ND_RA_PREFIX);
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-ip6_enable_disable (test_main_t * tm, int enable)
-{
-  vl_api_sw_interface_ip6_enable_disable_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->sw_if_index = ntohl (5);
-  mp->enable = (enable == 1);;
-
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_IP6_ENABLE_DISABLE);
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-loop_create (test_main_t * tm)
-{
-  vl_api_create_loopback_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-
-  mp->_vl_msg_id = ntohs (VL_API_CREATE_LOOPBACK);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-ip6_set_link_local_address (test_main_t * tm)
-{
-  vl_api_sw_interface_ip6_set_link_local_address_t *mp;
-  u64 tmp[2];
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->sw_if_index = ntohl (5);
-
-  tmp[0] = clib_host_to_net_u64 (0xfe80000000000000ULL);
-  tmp[1] = clib_host_to_net_u64 (0x11ULL);
-
-  clib_memcpy (mp->address, &tmp[0], 8);
-  clib_memcpy (&mp->address[8], &tmp[1], 8);
-
-  mp->address_length = 64;
-
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS);
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-
-void
-set_flags (test_main_t * tm, int up_down)
-{
-  vl_api_sw_interface_set_flags_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_FLAGS);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->sw_if_index = ntohl (5);
-  mp->admin_up_down = up_down;
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-
-}
-
-void
-l2_patch_add_del (test_main_t * tm, int is_add)
-{
-  vl_api_l2_patch_add_del_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_L2_PATCH_ADD_DEL);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->is_add = is_add;
-  mp->rx_sw_if_index = ntohl (1);
-  mp->tx_sw_if_index = ntohl (2);
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-l2_xconnect (test_main_t * tm)
-{
-  vl_api_sw_interface_set_l2_xconnect_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_L2_XCONNECT);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->rx_sw_if_index = ntohl (5);
-  mp->tx_sw_if_index = ntohl (6);
-  mp->enable = 1;
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-void
-l2_bridge (test_main_t * tm)
-{
-  vl_api_sw_interface_set_l2_bridge_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_SET_L2_BRIDGE);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-  mp->rx_sw_if_index = ntohl (5);
-  mp->bd_id = ntohl (6);
-  mp->bvi = ntohl (1);
-  mp->shg = ntohl (0);
-  mp->enable = 1;
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-int
-main (int argc, char **argv)
-{
-  api_main_t *am = &api_main;
-  test_main_t *tm = &test_main;
-  int ch;
-
-  connect_to_vpe ("test_client");
-
-  tm->vl_input_queue = shmem_hdr->vl_input_queue;
-  tm->my_client_index = am->my_client_index;
-
-  fformat (stdout, "Type 'h' for help, 'q' to quit...\n");
-
-  while (1)
-    {
-      ch = getchar ();
-      switch (ch)
-	{
-	case 'q':
-	  goto done;
-	case 'd':
-	  dump (tm);
-	  break;
-	case 'L':
-	  link_up_down_enable_disable (tm, 1 /* enable_disable */ );
-	  break;
-	case 'l':
-	  link_up_down_enable_disable (tm, 0 /* enable_disable */ );
-	  break;
-	case 'S':
-	  stats_enable_disable (tm, 1 /* enable_disable */ );
-	  break;
-	case 's':
-	  stats_enable_disable (tm, 0 /* enable_disable */ );
-	  break;
-	case '3':
-	  add_del_ip4_route (tm, 0 /* add */ );
-	  break;
-	case '4':
-	  add_del_ip4_route (tm, 1 /* add */ );
-	  break;
-	case '5':
-	  add_del_ip6_route (tm, 0 /* add */ );
-	  break;
-	case '6':
-	  add_del_ip6_route (tm, 1 /* add */ );
-	  break;
-	case 'A':
-	  add_del_interface_address (tm, 1 /* add */ );
-	  break;
-	case 'a':
-	  add_del_interface_address (tm, 0 /* add */ );
-	  break;
-	case 'B':
-	  add_del_v6_interface_address (tm, 1 /* add */ );
-	  break;
-	case 'b':
-	  add_del_v6_interface_address (tm, 0 /* add */ );
-	  break;
-	case 'E':
-	  l2_patch_add_del (tm, 1 /* is_add */ );
-	  break;
-	case 'e':
-	  l2_patch_add_del (tm, 0 /* is_add */ );
-	  break;
-	case 'z':
-	  del_all_interface_addresses (tm);
-	  break;
-	case 't':
-	  set_interface_table (tm, 0 /* is_ipv6 */ ,
-			       11 /* my amp goes to 11 */ );
-	  break;
-	case 'T':
-	  set_interface_table (tm, 1 /* is_ipv6 */ ,
-			       12 /* my amp goes to 12 */ );
-	  break;
-
-	case 'u':
-	  create_vlan_subif (tm, 123);
-	  break;
-
-	case 'c':
-	  connect_unix_tap (tm, "foo");
-	  break;
-
-	case 'n':
-	  add_ip4_neighbor (tm, 1 /* is_add */ );
-	  add_ip6_neighbor (tm, 1 /* is_add */ );
-	  break;
-
-	case 'N':
-	  add_ip4_neighbor (tm, 0 /* is_add */ );
-	  add_ip6_neighbor (tm, 0 /* is_add */ );
-	  break;
-
-	case 'p':
-	  add_del_proxy_arp (tm, 1 /* add */ );
-	  break;
-
-	case 'i':
-	  proxy_arp_intfc_enable_disable (tm, 1 /* enable */ );
-	  break;
-
-	case 'O':
-	  oam_events_enable_disable (tm, 0 /* enable */ );
-	  break;
-
-	case 'o':
-	  oam_events_enable_disable (tm, 1 /* enable */ );
-	  break;
-
-	case '0':
-	  oam_add_del (tm, 0 /* is_add */ );
-	  break;
-
-	case '1':
-	  oam_add_del (tm, 1 /* is_add */ );
-	  break;
-
-	case 'r':
-	  reset_fib (tm, 0 /* is_ip6 */ );
-	  break;
-
-	case 'R':
-	  reset_fib (tm, 1 /* is_ip6 */ );
-	  break;
-
-	case 'j':
-	  dhcp_set_vss (tm);
-	  break;
-
-	case 'k':
-	  dhcp_set_proxy (tm, 0);
-	  break;
-
-	case 'K':
-	  dhcp_set_proxy (tm, 1 /*ipv6 */ );
-	  break;
-
-	case 'v':
-	  set_ip_flow_hash (tm, 0 /* is_ip6 */ );
-	  break;
-
-	case 'V':
-	  ip6_set_link_local_address (tm);
-	  break;
-
-	case 'w':
-	  ip6_enable_disable (tm, 1 /* enable */ );
-	  break;
-
-	case 'W':
-	  ip6_enable_disable (tm, 0 /* disable */ );
-	  break;
-
-	case 'x':
-	  ip6nd_ra_config (tm, 0 /* is_no */ );
-	  break;
-	case 'X':
-	  ip6nd_ra_config (tm, 1 /* is_no */ );
-	  break;
-	case 'y':
-	  ip6nd_ra_prefix (tm, 0 /* is_no */ );
-	  break;
-	case 'Y':
-	  ip6nd_ra_prefix (tm, 1 /* is_no */ );
-	  break;
-
-	case '7':
-	  loop_create (tm);
-	  break;
-
-	case 'F':
-	  set_flags (tm, 1 /* up_down */ );
-	  break;
-
-	case 'f':
-	  set_flags (tm, 0 /* up_down */ );
-	  break;
-
-	case '@':
-	  l2_xconnect (tm);
-	  break;
-
-	case '#':
-	  l2_bridge (tm);
-	  break;
-
-	case 'h':
-	  fformat (stdout, "q=quit,d=dump,L=link evts on,l=link evts off\n");
-	  fformat (stdout, "S=stats on,s=stats off\n");
-	  fformat (stdout, "4=add v4 route, 3=del v4 route\n");
-	  fformat (stdout, "6=add v6 route, 5=del v6 route\n");
-	  fformat (stdout, "A=add v4 intfc route, a=del v4 intfc route\n");
-	  fformat (stdout, "B=add v6 intfc route, b=del v6 intfc route\n");
-	  fformat (stdout, "z=del all intfc routes\n");
-	  fformat (stdout, "t=set v4 intfc table, T=set v6 intfc table\n");
-	  fformat (stdout, "c=connect unix tap\n");
-	  fformat (stdout,
-		   "j=set dhcpv4 and v6 link-address/option-82 params\n");
-	  fformat (stdout, "k=set dhcpv4 relay agent params\n");
-	  fformat (stdout, "K=set dhcpv6 relay agent params\n");
-	  fformat (stdout, "E=add l2 patch, e=del l2 patch\n");
-	  fformat (stdout, "V=ip6 set link-local address \n");
-	  fformat (stdout, "w=ip6 enable \n");
-	  fformat (stdout, "W=ip6 disable \n");
-	  fformat (stdout, "x=ip6 nd config \n");
-	  fformat (stdout, "X=no ip6 nd config\n");
-	  fformat (stdout, "y=ip6 nd prefix \n");
-	  fformat (stdout, "Y=no ip6 nd prefix\n");
-	  fformat (stdout, "@=l2 xconnect\n");
-	  fformat (stdout, "#=l2 bridge\n");
-
-	default:
-	  break;
-	}
-
-    }
-
-done:
-
-  if (tm->link_events_on)
-    link_up_down_enable_disable (tm, 0 /* enable */ );
-  if (tm->stats_on)
-    stats_enable_disable (tm, 0 /* enable */ );
-  if (tm->oam_events_on)
-    oam_events_enable_disable (tm, 0 /* enable */ );
-
-  disconnect_from_vpe ();
-  exit (0);
-}
-
-#undef vl_api_version
-#define vl_api_version(n,v) static u32 vpe_api_version = v;
-#include <vpp-api/vpe.api.h>
-#undef vl_api_version
-
-void
-vl_client_add_api_signatures (vl_api_memclnt_create_t * mp)
-{
-  /*
-   * Send the main API signature in slot 0. This bit of code must
-   * match the checks in ../vpe/api/api.c: vl_msg_api_version_check().
-   */
-  mp->api_versions[0] = clib_host_to_net_u32 (vpe_api_version);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/vpp-api/test_ha.c b/vpp/vpp-api/test_ha.c
deleted file mode 100644
index 91364d8b..00000000
--- a/vpp/vpp-api/test_ha.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- *------------------------------------------------------------------
- * api.c - message handler registration
- *
- * Copyright (c) 2010 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-#include <vppinfra/error.h>
-
-#include <vnet/vnet.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <svm.h>
-#include <svmdb.h>
-
-#include <vpp-api/vpe_msg_enum.h>
-
-#include <vnet/ip/ip.h>
-
-#define f64_endian(a)
-#define f64_print(a,b)
-
-#define vl_typedefs		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <vpp-api/vpe_all_api_h.h>
-#undef vl_printfun
-
-vl_shmem_hdr_t *shmem_hdr;
-
-typedef struct
-{
-  u32 pings_sent;
-  u32 pings_replied;
-  volatile u32 signal_received;
-
-  /* convenience */
-  unix_shared_memory_queue_t *vl_input_queue;
-  u32 my_client_index;
-  svmdb_client_t *svmdb_client;
-} test_main_t;
-
-test_main_t test_main;
-
-static void vl_api_control_ping_reply_t_handler
-  (vl_api_control_ping_reply_t * mp)
-{
-  test_main_t *tm = &test_main;
-
-  fformat (stdout, "control ping reply from pid %d\n", ntohl (mp->vpe_pid));
-  tm->pings_replied++;
-}
-
-vlib_main_t vlib_global_main;
-vlib_main_t **vlib_mains;
-
-void
-vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...)
-{
-  clib_warning ("BUG: vlib_cli_output callled...");
-}
-
-#define foreach_api_msg                         \
-_(CONTROL_PING_REPLY,control_ping_reply)
-
-void
-ping (test_main_t * tm)
-{
-  vl_api_control_ping_t *mp;
-
-  mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_CONTROL_PING);
-  mp->client_index = tm->my_client_index;
-  mp->context = 0xdeadbeef;
-
-  vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);
-}
-
-static void
-noop_handler (void *notused)
-{
-}
-
-int
-connect_to_vpe (char *name)
-{
-  int rv = 0;
-  test_main_t *tm = &test_main;
-  api_main_t *am = &api_main;
-
-  rv = vl_client_connect_to_vlib ("/vpe-api", name, 32);
-  if (rv < 0)
-    return rv;
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           noop_handler,                        \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_api_msg;
-#undef _
-
-  shmem_hdr = api_main.shmem_hdr;
-  tm->vl_input_queue = shmem_hdr->vl_input_queue;
-  tm->my_client_index = am->my_client_index;
-  return 0;
-}
-
-int
-disconnect_from_vpe (void)
-{
-  vl_client_disconnect_from_vlib ();
-
-  return 0;
-}
-
-void
-signal_handler (int signo)
-{
-  test_main_t *tm = &test_main;
-
-  tm->signal_received = 1;
-}
-
-
-int
-main (int argc, char **argv)
-{
-  test_main_t *tm = &test_main;
-  api_main_t *am = &api_main;
-  u32 swt_pid = 0;
-  int connected = 0;
-
-  signal (SIGINT, signal_handler);
-
-  while (1)
-    {
-      if (tm->signal_received)
-	break;
-
-      if (am->shmem_hdr)
-	swt_pid = am->shmem_hdr->vl_pid;
-
-      /* If kill returns 0, the vpe-f process is alive */
-      if (kill (swt_pid, 0) == 0)
-	{
-	  /* Try to connect */
-	  if (connected == 0)
-	    {
-	      fformat (stdout, "Connect to VPE-f\n");
-	      if (connect_to_vpe ("test_ha_client") >= 0)
-		{
-		  tm->pings_sent = 0;
-		  tm->pings_replied = 0;
-		  connected = 1;
-		}
-	      else
-		{
-		  fformat (stdout, "Connect failed, sleep and retry...\n");
-		  sleep (1);
-		  continue;
-		}
-	    }
-	  tm->pings_sent++;
-	  ping (tm);
-
-	  sleep (1);
-
-	  /* havent heard back in 3 seconds, disco / reco */
-	  if ((tm->pings_replied + 3) <= tm->pings_sent)
-	    {
-	      fformat (stdout, "VPE-f pid %d not responding\n", swt_pid);
-	      swt_pid = 0;
-	      disconnect_from_vpe ();
-	      connected = 0;
-	    }
-	}
-      else
-	{
-	  if (connected)
-	    {
-	      fformat (stdout, "VPE-f pid %d died\n", swt_pid);
-	      swt_pid = 0;
-	      disconnect_from_vpe ();
-	      connected = 0;
-	    }
-	  sleep (1);
-	}
-    }
-
-  fformat (stdout, "Signal received, graceful exit\n");
-  disconnect_from_vpe ();
-  exit (0);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/vpp-api/vat.h b/vpp/vpp-api/vat.h
deleted file mode 120000
index b7a00e90..00000000
--- a/vpp/vpp-api/vat.h
+++ /dev/null
@@ -1 +0,0 @@
-../../vpp-api-test/vat/vat.h
\ No newline at end of file
diff --git a/vpp/vpp-api/vpe.api b/vpp/vpp-api/vpe.api
deleted file mode 100644
index abd0e8f1..00000000
--- a/vpp/vpp-api/vpe.api
+++ /dev/null
@@ -1,2782 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \file
-
-    This file defines vpe control-plane API messages which are generally
-    called through a shared memory interface. 
-*/
-
-/* 
- * Note: API placement cleanup in progress
- * If you're looking for interface APIs, please
- * see .../vnet/vnet/{interface.api,interface_api.c}
- * IP APIs: see .../vnet/vnet/ip/{ip.api, ip_api.c}
- * TAP APIs: see .../vnet/vnet/unix/{tap.api, tap_api.c}
- * VXLAN APIs: see .../vnet/vnet/vxlan/{vxlan.api, vxlan_api.c}
- * AF-PACKET APIs: ... see /vnet/devices/af_packet/{af_packet.api, af_packet_api.c}
- * NETMAP APIs: see ... /vnet/vnet/devices/netmap/{netmap.api, netmap_api.c}
- * VHOST-USER APIs: see .../vnet/devices/virtio/{vhost_user.api, vhost_user_api.c}
- * VXLAN GPE APIs: see .../vnet/vnet/vxlan-gpe/{vxlan_gpe.api, vxlan_gpe_api.c}
- * GRE APIs: see .../vnet/vnet/gre/{gre.api, gre_api.c}
- * L2TP APIs: see .../vnet/vnet/l2tp/{l2tp.api, l2tp_api.c}
- * BFD APIs: see .../vnet/vnet/bfd/{bfd.api, bfd_api.c}
- * IPSEC APIs: see .../vnet/vnet/ipsec/{ipsec.api, ipsec_api.c}
- * IPSEC-GRE APIs: see .../vnet/vnet/ipsec-gre/{ipsec_gre.api, ipsec_gre_api.c}
- * LISP APIs: see .../vnet/vnet/lisp/{lisp.api, lisp_api.c}
- * LISP-GPE APIs: see .../vnet/vnet/lisp-gpe/{lisp_gpe.api, lisp_gpe_api.c}
- */
-
-/** \brief Create a new subinterface with the given vlan id
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - software index of the new vlan's parent interface
-    @param vlan_id - vlan tag of the new interface
-*/
-define create_vlan_subif
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u32 vlan_id;
-};
-
-/** \brief Reply for the vlan subinterface create request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-    @param sw_if_index - software index allocated for the new subinterface
-*/
-define create_vlan_subif_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-};
-
-/** \brief Enable or Disable MPLS on and interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - index of the interface
-    @param enable - if non-zero enable, else disable
-*/
-define sw_interface_set_mpls_enable
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 enable;
-};
-
-/** \brief Reply for MPLS state on an interface
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define sw_interface_set_mpls_enable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief MPLS Route Add / del route
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param mr_label - The MPLS label value
-    @param mr_eos - The End of stack bit
-    @param mr_table_id - The MPLS table-id the route is added in
-    @param mr_classify_table_index - If this is a classify route, 
-                                     this is the classify table index
-    @param  mr_create_table_if_needed - If the MPLS or IP tables do not exist,
-                                        create them
-    @param mr_is_add - Is this a route add or delete
-    @param mr_is_classify - Is this route result a classify
-    @param mr_is_multipath - Is this route update a multipath - i.e. is this
-                             a path addition to an existing route
-    @param mr_is_resolve_host - Recurse resolution constraint via a host prefix
-    @param mr_is_resolve_attached - Recurse resolution constraint via attached prefix
-    @param mr_next_hop_proto_is_ip4 - The next-hop is IPV4
-    @param mr_next_hop_weight - The weight, for UCMP
-    @param mr_next_hop[16] - the nextop address
-    @param mr_next_hop_sw_if_index - the next-hop SW interface
-    @param mr_next_hop_table_id - the next-hop table-id (if appropriate)
-    @param mr_next_hop_n_out_labels - the number of labels in the label stack
-    @param mr_next_hop_out_label_stack - the next-hop output label stack, outer most first
-    @param next_hop_via_label - The next-hop is a resolved via a local label
-*/
-define mpls_route_add_del
-{
-  u32 client_index;
-  u32 context;
-  u32 mr_label;
-  u8 mr_eos;
-  u32 mr_table_id;
-  u32 mr_classify_table_index;
-  u8 mr_create_table_if_needed;
-  u8 mr_is_add;
-  u8 mr_is_classify;
-  u8 mr_is_multipath;
-  u8 mr_is_resolve_host;
-  u8 mr_is_resolve_attached;
-  u8 mr_next_hop_proto_is_ip4;
-  u8 mr_next_hop_weight;
-  u8 mr_next_hop[16];
-  u8 mr_next_hop_n_out_labels;
-  u32 mr_next_hop_sw_if_index;
-  u32 mr_next_hop_table_id;
-  u32 mr_next_hop_via_label;
-  u32 mr_next_hop_out_label_stack[mr_next_hop_n_out_labels];
-};
-
-/** \brief Reply for MPLS route add / del request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define mpls_route_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Dump MPLS fib table
-    @param client_index - opaque cookie to identify the sender
-*/
-define mpls_fib_dump
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief FIB path
-    @param sw_if_index - index of the interface
-    @param weight - The weight, for UCMP
-    @param is_local - local if non-zero, else remote
-    @param is_drop - Drop the packet
-    @param is_unreach - Drop the packet and rate limit send ICMP unreachable
-    @param is_prohibit - Drop the packet and rate limit send ICMP prohibited
-    @param afi - the afi of the next hop, IP46_TYPE_IP4=1, IP46_TYPE_IP6=2
-    @param next_hop[16] - the next hop address
-
-    WARNING: this type is replicated, pending cleanup completion
-
-*/
-typeonly manual_print manual_endian define fib_path2
-{
-  u32 sw_if_index;
-  u32 weight;
-  u8 is_local;
-  u8 is_drop;
-  u8 is_unreach;
-  u8 is_prohibit;
-  u8 afi;
-  u8 next_hop[16];
-};
-
-/** \brief mpls FIB table response
-    @param table_id - MPLS fib table id
-    @param s_bit - End-of-stack bit
-    @param label - MPLS label value
-    @param count - the number of fib_path in path
-    @param path  - array of of fib_path structures
-*/
-manual_endian manual_print define mpls_fib_details
-{
-  u32 context;
-  u32 table_id;
-  u8  eos_bit;
-  u32 label;
-  u32 count;
-  vl_api_fib_path2_t path[count];
-};
-
-/** \brief Bind/Unbind an MPLS local label to an IP prefix. i.e. create
-           a per-prefix label entry.
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param mb_mpls_table_id - The MPLS table-id the MPLS entry will be added in
-    @param mb_label - The MPLS label value to bind
-    @param mb_ip_table_id - The IP table-id of the IP prefix to bind to.
-    @param mb_create_table_if_needed - Create either/both tables if required.
-    @param mb_is_bind - Bind or unbind
-    @param mb_is_ip4 - The prefix to bind to is IPv4
-    @param mb_address_length - Length of IP prefix
-    @param mb_address[16] - IP prefix/
-*/
-define mpls_ip_bind_unbind
-{
-  u32 client_index;
-  u32 context;
-  u32 mb_mpls_table_id;
-  u32 mb_label;
-  u32 mb_ip_table_id;
-  u8 mb_create_table_if_needed;
-  u8 mb_is_bind;
-  u8 mb_is_ip4;
-  u8 mb_address_length;
-  u8 mb_address[16];
-};
-
-/** \brief Reply for MPLS IP bind/unbind request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define mpls_ip_bind_unbind_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief MPLS tunnel Add / del route
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param mt_is_add - Is this a route add or delete
-    @param mt_sw_if_index - The SW interface index of the tunnel to delete
-    @param mt_next_hop_proto_is_ip4 - The next-hop is IPV4
-    @param mt_next_hop_weight - The weight, for UCMP
-    @param mt_next_hop[16] - the nextop address
-    @param mt_next_hop_sw_if_index - the next-hop SW interface
-    @param mt_next_hop_table_id - the next-hop table-id (if appropriate)
-    @param mt_next_hop_n_out_labels - the number of next-hop output labels
-    @param mt_next_hop_out_label_stack - the next-hop output label stack,  outer most first
-*/
-define mpls_tunnel_add_del
-{
-  u32 client_index;
-  u32 context;
-  u32 mt_sw_if_index;
-  u8 mt_is_add;
-  u8 mt_l2_only;
-  u8 mt_next_hop_proto_is_ip4;
-  u8 mt_next_hop_weight;
-  u8 mt_next_hop[16];
-  u8 mt_next_hop_n_out_labels;
-  u32 mt_next_hop_sw_if_index;
-  u32 mt_next_hop_table_id;
-  u32 mt_next_hop_out_label_stack[mt_next_hop_n_out_labels];
-};
-
-/** \brief Reply for MPLS tunnel add / del request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-    @param sw_if_index - SW interface index of the tunnel created
-*/
-define mpls_tunnel_add_del_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-};
-
-/** \brief Dump mpls eth tunnel table
-    @param client_index - opaque cookie to identify the sender
-    @param tunnel_index - eth tunnel identifier or -1 in case of all tunnels
-*/
-define mpls_tunnel_dump
-{
-  u32 client_index;
-  u32 context;
-  i32 tunnel_index;
-};
-
-/** \brief mpls eth tunnel operational state response
-    @param tunnel_index - eth tunnel identifier
-    @param intfc_address - interface ipv4 addr
-    @param mask_width - interface ipv4 addr mask
-    @param hw_if_index - interface id
-    @param l2_only -
-    @param tunnel_dst_mac -
-    @param tx_sw_if_index -
-    @param encap_index - reference to mpls label table
-    @param nlabels - number of resolved labels
-    @param labels - resolved labels
-*/
-define mpls_tunnel_details
-{
-  u32 context;
-  u32 tunnel_index;
-  u8 mt_l2_only;
-  u8 mt_sw_if_index;
-  u8 mt_next_hop_proto_is_ip4;
-  u8 mt_next_hop[16];
-  u32 mt_next_hop_sw_if_index;
-  u32 mt_next_hop_table_id;
-  u32 mt_next_hop_n_labels;
-  u32 mt_next_hop_out_labels[mt_next_hop_n_labels];
-};
-
-/** \brief Proxy ARP add / del request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param vrf_id - VRF / Fib table ID
-    @param is_add - 1 if adding the Proxy ARP range, 0 if deleting
-    @param low_address[4] - Low address of the Proxy ARP range
-    @param hi_address[4] - High address of the Proxy ARP range
-*/
-define proxy_arp_add_del
-{
-  u32 client_index;
-  u32 context;
-  u32 vrf_id;
-  u8 is_add;
-  u8 low_address[4];
-  u8 hi_address[4];
-};
-
-/** \brief Reply for proxy arp add / del request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define proxy_arp_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Proxy ARP add / del request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - Which interface to enable / disable Proxy Arp on
-    @param enable_disable - 1 to enable Proxy ARP on interface, 0 to disable
-*/
-define proxy_arp_intfc_enable_disable
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  /* 1 = on, 0 = off */
-  u8 enable_disable;
-};
-
-/** \brief Reply for Proxy ARP interface enable / disable request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define proxy_arp_intfc_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Reset VRF (remove all routes etc) request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_ipv6 - 1 for IPv6 neighbor, 0 for IPv4
-    @param vrf_id - ID of th FIB table / VRF to reset
-*/
-define reset_vrf
-{
-  u32 client_index;
-  u32 context;
-  u8 is_ipv6;
-  u32 vrf_id;
-};
-
-/** \brief Reply for Reset VRF request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define reset_vrf_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Is Address Reachable request - DISABLED
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param next_hop_sw_if_index - index of interface used to get to next hop
-    @param is_ipv6 - 1 for IPv6, 0 for IPv4
-    @param is_error - address not found or does not match intf
-    @param address[] - Address in question 
-*/
-define is_address_reachable
-{
-  u32 client_index;		/* (api_main_t *) am->my_client_index */
-  u32 context;
-  u32 next_hop_sw_if_index;
-  u8 is_known;			/* on reply, this is the answer */
-  u8 is_ipv6;
-  u8 is_error;			/* address not found or does not match intf */
-  u8 address[16];
-};
-
-/** \brief Want Stats, register for stats updates
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param enable_disable - 1 = enable stats, 0 = disable
-    @param pid - pid of process requesting stats updates
-*/
-define want_stats
-{
-  u32 client_index;
-  u32 context;
-  u32 enable_disable;
-  u32 pid;
-};
-
-/** \brief Reply for Want Stats request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define want_stats_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-typeonly manual_print manual_endian define ip4_fib_counter
-{
-  u32 address;
-  u8 address_length;
-  u64 packets;
-  u64 bytes;
-};
-
-manual_print manual_endian define vnet_ip4_fib_counters
-{
-  u32 vrf_id;
-  u32 count;
-  vl_api_ip4_fib_counter_t c[count];
-};
-
-typeonly manual_print manual_endian define ip6_fib_counter
-{
-  u64 address[2];
-  u8 address_length;
-  u64 packets;
-  u64 bytes;
-};
-
-manual_print manual_endian define vnet_ip6_fib_counters
-{
-  u32 vrf_id;
-  u32 count;
-  vl_api_ip6_fib_counter_t c[count];
-};
-
-/** \brief Request for a single block of summary stats
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define vnet_get_summary_stats
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Reply for vnet_get_summary_stats request
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for request
-    @param total_pkts -  
-    @param total_bytes -
-    @param vector_rate - 
-*/
-define vnet_summary_stats_reply
-{
-  u32 context;
-  i32 retval;
-  u64 total_pkts[2];
-  u64 total_bytes[2];
-  f64 vector_rate;
-};
-
-/** \brief OAM event structure
-    @param dst_address[] - 
-    @param state
-*/
-define oam_event
-{
-  u8 dst_address[4];
-  u8 state;
-};
-
-/** \brief Want OAM events request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param enable_disable- enable if non-zero, else disable
-    @param pid - pid of the requesting process
-*/
-define want_oam_events
-{
-  u32 client_index;
-  u32 context;
-  u32 enable_disable;
-  u32 pid;
-};
-
-/** \brief Want OAM events response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the want oam stats request
-*/
-define want_oam_events_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief OAM add / del target request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param vrf_id - vrf_id of the target
-    @param src_address[] - source address to use for the updates 
-    @param dst_address[] - destination address of the target
-    @param is_add - add target if non-zero, else delete
-*/
-define oam_add_del
-{
-  u32 client_index;
-  u32 context;
-  u32 vrf_id;
-  u8 src_address[4];
-  u8 dst_address[4];
-  u8 is_add;
-};
-
-/** \brief OAM add / del target response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code of the request
-*/
-define oam_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Reset fib table request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param vrf_id - vrf/table id of the fib table to reset
-    @param is_ipv6 - an ipv6 fib to reset if non-zero, else ipv4
-*/
-define reset_fib
-{
-  u32 client_index;
-  u32 context;
-  u32 vrf_id;
-  u8 is_ipv6;
-};
-
-/** \brief Reset fib response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the reset bfib request
-*/
-define reset_fib_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief DHCP Proxy config add / del request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param vrf_id - vrf id
-    @param if_ipv6 - ipv6 if non-zero, else ipv4
-    @param is_add - add the config if non-zero, else delete
-    @param insert_circuit_id - option82 suboption 1 fib number
-    @param dhcp_server[] - server address
-    @param dhcp_src_address[] - <fix this, need details>
-*/
-define dhcp_proxy_config
-{
-  u32 client_index;
-  u32 context;
-  u32 vrf_id;
-  u8 is_ipv6;
-  u8 is_add;
-  u8 insert_circuit_id;
-  u8 dhcp_server[16];
-  u8 dhcp_src_address[16];
-};
-
-/** \brief DHCP Proxy config response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define dhcp_proxy_config_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief DHCP Proxy set / unset vss request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param tbl_id - table id
-    @param oui - first part of vpn id
-    @param fib_id - second part of vpn id
-    @param is_ipv6 - ip6 if non-zero, else ip4
-    @param is_add - set vss if non-zero, else delete
-*/
-define dhcp_proxy_set_vss
-{
-  u32 client_index;
-  u32 context;
-  u32 tbl_id;
-  u32 oui;
-  u32 fib_id;
-  u8 is_ipv6;
-  u8 is_add;
-};
-
-/** \brief DHCP proxy set / unset vss response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define dhcp_proxy_set_vss_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Create loopback interface request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param mac_address - mac addr to assign to the interface if none-zero
-*/
-define create_loopback
-{
-  u32 client_index;
-  u32 context;
-  u8 mac_address[6];
-};
-
-/** \brief Create loopback interface response
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - sw index of the interface that was created
-    @param retval - return code for the request
-*/
-define create_loopback_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-};
-
-/** \brief Delete loopback interface request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - sw index of the interface that was created
-*/
-define delete_loopback
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-};
-
-/** \brief Delete loopback interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define delete_loopback_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Control ping from client to api server request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define control_ping
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Control ping from the client to the server response
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-    @param vpe_pid - the pid of the vpe, returned by the server
-*/
-define control_ping_reply
-{
-  u32 context;
-  i32 retval;
-  u32 client_index;
-  u32 vpe_pid;
-};
-
-/** \brief Process a vpe parser cli string request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param cmd_in_shmem - pointer to cli command string
-*/
-define cli_request
-{
-  u32 client_index;
-  u32 context;
-  u64 cmd_in_shmem;
-};
-define cli_inband
-{
-  u32 client_index;
-  u32 context;
-  u32 length;
-  u8 cmd[length];
-};
-
-/** \brief vpe parser cli string response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for request
-    @param reply_in_shmem - Reply string from cli processing if any
-*/
-define cli_reply
-{
-  u32 context;
-  i32 retval;
-  u64 reply_in_shmem;
-};
-define cli_inband_reply
-{
-  u32 context;
-  i32 retval;
-  u32 length;
-  u8 reply[length];
-};
-
-/** \brief Set max allowed ARP or ip6 neighbor entries request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_ipv6 - neighbor limit if non-zero, else ARP limit
-    @param arp_neighbor_limit - the new limit, defaults are ~ 50k
-*/
-define set_arp_neighbor_limit
-{
-  u32 client_index;
-  u32 context;
-  u8 is_ipv6;
-  u32 arp_neighbor_limit;
-};
-
-/** \brief Set max allowed ARP or ip6 neighbor entries response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for request
-*/
-define set_arp_neighbor_limit_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief L2 interface patch add / del request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param rx_sw_if_index - receive side interface 
-    @param tx_sw_if_index - transmit side interface
-    @param is_add - if non-zero set up the interface patch, else remove it
-*/
-define l2_patch_add_del
-{
-  u32 client_index;
-  u32 context;
-  u32 rx_sw_if_index;
-  u32 tx_sw_if_index;
-  u8 is_add;
-};
-
-/** \brief L2 interface patch add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define l2_patch_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IPv6 segment routing tunnel add / del request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add the tunnel if non-zero, else delete it
-    @param name[] - tunnel name (len. 64)
-    @param src_address[] -
-    @param dst_address[] -
-    @param dst_mask_width -
-    @param inner_vrf_id -
-    @param outer_vrf_id -
-    @param flags_net_byte_order -
-    @param n_segments -
-    @param n_tags -
-    @param segs_and_tags[] -
-    @param policy_name[] - name of policy to associate this tunnel to (len. 64)
-*/
-define sr_tunnel_add_del
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 name[64];
-  u8 src_address[16];
-  u8 dst_address[16];
-  u8 dst_mask_width;
-  u32 inner_vrf_id;
-  u32 outer_vrf_id;
-  u16 flags_net_byte_order;
-  u8 n_segments;
-  u8 n_tags;
-  u8 policy_name[64];
-  u8 segs_and_tags[0];
-};
-
-/** \brief IPv6 segment routing tunnel add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define sr_tunnel_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IPv6 segment routing policy add / del request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add the tunnel if non-zero, else delete it
-    @param name[] - policy name (len. 64)
-    @param tunnel_names[] -
-*/
-define sr_policy_add_del
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 name[64];
-  u8 tunnel_names[0];
-};
-
-/** \brief IPv6 segment routing policy add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define sr_policy_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IPv6 segment routing multicast map to policy add / del request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add the tunnel if non-zero, else delete it
-    @param multicast_address[] - IP6 multicast address
-    @param policy_name[] = policy name (len.64)
-*/
-define sr_multicast_map_add_del
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 multicast_address[16];
-  u8 policy_name[64];
-};
-
-/** \brief IPv6 segment routing multicast map to policy add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define sr_multicast_map_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Interface set vpath request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface used to reach neighbor
-    @param enable - if non-zero enable, else disable
-*/
-define sw_interface_set_vpath
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 enable;
-};
-
-/** \brief Interface set vpath response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define sw_interface_set_vpath_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Set L2 XConnect between two interfaces request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param rx_sw_if_index - Receive interface index
-    @param tx_sw_if_index - Transmit interface index
-    @param enable - enable xconnect if not 0, else set to L3 mode
-*/
-define sw_interface_set_l2_xconnect
-{
-  u32 client_index;
-  u32 context;
-  u32 rx_sw_if_index;
-  u32 tx_sw_if_index;
-  u8 enable;
-};
-
-/** \brief Set L2 XConnect response
-    @param context - sender context, to match reply w/ request
-    @param retval - L2 XConnect request return code
-*/
-define sw_interface_set_l2_xconnect_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Interface bridge mode request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param rx_sw_if_index - the interface
-    @param bd_id - bridge domain id
-    @param bvi - Setup interface as a bvi, bridge mode only
-    @param shg - Shared horizon group, for bridge mode only
-    @param enable - Enable beige mode if not 0, else set to L3 mode
-*/
-define sw_interface_set_l2_bridge
-{
-  u32 client_index;
-  u32 context;
-  u32 rx_sw_if_index;
-  u32 bd_id;
-  u8 shg;
-  u8 bvi;
-  u8 enable;
-};
-
-/** \brief Interface bridge mode response
-    @param context - sender context, to match reply w/ request
-    @param retval - Bridge mode request return code
-*/
-define sw_interface_set_l2_bridge_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief L2 FIB add entry request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param mac - the entry's mac address
-    @param bd_id - the entry's bridge domain id
-    @param sw_if_index - the interface
-    @param is_add - If non zero add the entry, else delete it
-    @param static_mac - 
-    @param filter_mac -
-*/
-define l2fib_add_del
-{
-  u32 client_index;
-  u32 context;
-  u64 mac;
-  u32 bd_id;
-  u32 sw_if_index;
-  u8 is_add;
-  u8 static_mac;
-  u8 filter_mac;
-  u8 bvi_mac;
-};
-
-/** \brief L2 FIB add entry response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the add l2fib entry request
-*/
-define l2fib_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Set L2 flags request !!! TODO - need more info, feature bits in l2_input.h
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface 
-    @param is_set - if non-zero, set the bits, else clear them
-    @param feature_bitmap - non-zero bits to set or clear
-*/
-define l2_flags
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 is_set;
-  u32 feature_bitmap;
-};
-
-/** \brief Set L2 bits response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the set l2 bits request
-*/
-define l2_flags_reply
-{
-  u32 context;
-  i32 retval;
-  u32 resulting_feature_bitmap;
-};
-
-/** \brief Set bridge flags (such as L2_LEARN, L2_FWD, L2_FLOOD, 
-    L2_UU_FLOOD, or L2_ARP_TERM) request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param bd_id - the bridge domain to set the flags for
-    @param is_set - if non-zero, set the flags, else clear them
-    @param feature_bitmap - bits that are non-zero to set or clear
-*/
-define bridge_flags
-{
-  u32 client_index;
-  u32 context;
-  u32 bd_id;
-  u8 is_set;
-  u32 feature_bitmap;
-};
-
-/** \brief Set bridge flags response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the set bridge flags request
-    @param resulting_feature_bitmap - the feature bitmap value after the request is implemented
-*/
-define bridge_flags_reply
-{
-  u32 context;
-  i32 retval;
-  u32 resulting_feature_bitmap;
-};
-
-/** \brief Set bridge domain ip to mac entry request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param bd_id - the bridge domain to set the flags for
-    @param is_add - if non-zero, add the entry, else clear it
-    @param is_ipv6 - if non-zero, ipv6 address, else ipv4 address
-    @param mac_address - MAC address
-    @param 
-*/
-define bd_ip_mac_add_del
-{
-  u32 client_index;
-  u32 context;
-  u32 bd_id;
-  u8 is_add;
-  u8 is_ipv6;
-  u8 ip_address[16];
-  u8 mac_address[6];
-};
-
-/** \brief Set bridge domain ip to mac entry response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the set bridge flags request
-*/
-define bd_ip_mac_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Add/Delete classification table request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add- if non-zero add the table, else delete it
-    @param del_chain - if non-zero delete the whole chain of tables
-    @param table_index - if add, reuturns index of the created table, else specifies the table to delete  
-    @param nbuckets - number of buckets when adding a table
-    @param memory_size - memory size when adding a table
-    @param match_n_vectors - number of match vectors
-    @param next_table_index - index of next table
-    @param miss_next_index - index of miss table
-    @param current_data_flag - option to use current node's packet payload
-            as the starting point from where packets are classified,
-            This option is only valid for L2/L3 input ACL for now.
-            0: by default, classify data from the buffer's start location
-            1: classify packets from VPP node’s current data pointer
-    @param current_data_offset - a signed value to shift the start location of
-            the packet to be classified
-            For example, if input IP ACL node is used, L2 header’s first byte
-            can be accessible by configuring current_data_offset to -14
-            if there is no vlan tag.
-            This is valid only if current_data_flag is set to 1.
-    @param mask[] - match mask
-*/
-define classify_add_del_table
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 del_chain;
-  u32 table_index;
-  u32 nbuckets;
-  u32 memory_size;
-  u32 skip_n_vectors;
-  u32 match_n_vectors;
-  u32 next_table_index;
-  u32 miss_next_index;
-  u32 current_data_flag;
-  i32 current_data_offset;
-  u8 mask[0];
-};
-
-/** \brief Add/Delete classification table response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the table add/del requst
-    @param new_table_index - for add, returned index of the new table
-    @param skip_n_vectors - for add, returned value of skip_n_vectors in table
-    @param match_n_vectors -for add, returned value of match_n_vectors in table
-*/
-define classify_add_del_table_reply
-{
-  u32 context;
-  i32 retval;
-  u32 new_table_index;
-  u32 skip_n_vectors;
-  u32 match_n_vectors;
-};
-
-/** \brief Classify add / del session request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add session if non-zero, else delete
-    @param table_index - index of the table to add/del the session, required
-    @param hit_next_index - for add, hit_next_index of new session, required
-    @param opaque_index - for add, opaque_index of new session
-    @param advance -for add, advance value for session
-    @param action -
-           0: no action (by default)
-              metadata is not used.
-           1: Classified IP packets will be looked up from the
-              specified ipv4 fib table (configured by metadata as VRF id).
-              Only valid for L3 input ACL node
-           2: Classified IP packets will be looked up from the
-              specified ipv6 fib table (configured by metadata as VRF id).
-              Only valid for L3 input ACL node
-    @param metadata - valid only if action != 0
-           VRF id if action is 1 or 2.
-    @param match[] - for add, match value for session, required
-*/
-define classify_add_del_session
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u32 table_index;
-  u32 hit_next_index;
-  u32 opaque_index;
-  i32 advance;
-  u8 action;
-  u32 metadata;
-  u8 match[0];
-};
-
-/** \brief Classify add / del session response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the add/del session request
-*/
-define classify_add_del_session_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Set/unset the classification table for an interface request 
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_ipv6 - ipv6 if non-zero, else ipv4
-    @param sw_if_index - interface to associate with the table
-    @param table_index - index of the table, if ~0 unset the table
-*/
-define classify_set_interface_ip_table
-{
-  u32 client_index;
-  u32 context;
-  u8 is_ipv6;
-  u32 sw_if_index;
-  u32 table_index;		/* ~0 => off */
-};
-
-/** \brief Set/unset interface classification table response 
-    @param context - sender context, to match reply w/ request
-    @param retval - return code
-*/
-define classify_set_interface_ip_table_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Set/unset l2 classification tables for an interface request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface to set/unset tables for
-    @param ip4_table_index - ip4 index, use ~0 for all 3 indexes to unset
-    @param ip6_table_index - ip6 index
-    @param other_table_index - other index
-*/
-define classify_set_interface_l2_tables
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  /* 3 x ~0 => off */
-  u32 ip4_table_index;
-  u32 ip6_table_index;
-  u32 other_table_index;
-  u8 is_input;
-};
-
-/** \brief Set/unset l2 classification tables for an interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define classify_set_interface_l2_tables_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Get node index using name request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param node_name[] - name of the node
-*/
-define get_node_index
-{
-  u32 client_index;
-  u32 context;
-  u8 node_name[64];
-};
-
-/** \brief Get node index using name request
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-    @param node_index - index of the desired node if found, else ~0
-*/
-define get_node_index_reply
-{
-  u32 context;
-  i32 retval;
-  u32 node_index;
-};
-
-/** \brief Set the next node for a given node request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param node_name[] - node to add the next node to
-    @param next_name[] - node to add as the next node
-*/
-define add_node_next
-{
-  u32 client_index;
-  u32 context;
-  u8 node_name[64];
-  u8 next_name[64];
-};
-
-/** \brief IP Set the next node for a given node response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the add next node request
-    @param next_index - the index of the next node if success, else ~0
-*/
-define add_node_next_reply
-{
-  u32 context;
-  i32 retval;
-  u32 next_index;
-};
-
-/** \brief DHCP Proxy config 2 add / del request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param rx_vrf_id - receive vrf id
-    @param server_vrf_id - server vrf id
-    @param if_ipv6 - ipv6 if non-zero, else ipv4
-    @param is_add - add the config if non-zero, else delete
-    @param insert_circuit_id - option82 suboption 1 fib number
-    @param dhcp_server[] - server address
-    @param dhcp_src_address[] - <fix this, need details>
-*/
-define dhcp_proxy_config_2
-{
-  u32 client_index;
-  u32 context;
-  u32 rx_vrf_id;
-  u32 server_vrf_id;
-  u8 is_ipv6;
-  u8 is_add;
-  u8 insert_circuit_id;
-  u8 dhcp_server[16];
-  u8 dhcp_src_address[16];
-};
-
-/** \brief DHCP Proxy config 2 add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for request
-*/
-define dhcp_proxy_config_2_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief L2 fib clear table request, clear all mac entries in the l2 fib
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define l2_fib_clear_table
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief L2 fib clear table response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define l2_fib_clear_table_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief L2 interface ethernet flow point filtering enable/disable request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface to enable/disable filtering on
-    @param enable_disable - if non-zero enable filtering, else disable
-*/
-define l2_interface_efp_filter
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u32 enable_disable;
-};
-
-/** \brief L2 interface ethernet flow point filtering response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define l2_interface_efp_filter_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief L2 interface vlan tag rewrite configure request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface the operation is applied to
-    @param vtr_op - Choose from l2_vtr_op_t enum values
-    @param push_dot1q - first pushed flag dot1q id set, else dot1ad
-    @param tag1 - Needed for any push or translate vtr op
-    @param tag2 - Needed for any push 2 or translate x-2 vtr ops
-*/
-define l2_interface_vlan_tag_rewrite
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u32 vtr_op;
-  u32 push_dot1q;		// ethertype of first pushed tag is dot1q/dot1ad
-  u32 tag1;			// first pushed tag
-  u32 tag2;			// second pushed tag
-};
-
-/** \brief L2 interface vlan tag rewrite response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define l2_interface_vlan_tag_rewrite_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-define create_subif
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u32 sub_id;
-
-  /* These fields map directly onto the subif template */
-  u8 no_tags;
-  u8 one_tag;
-  u8 two_tags;
-  u8 dot1ad;			// 0 = dot1q, 1=dot1ad
-  u8 exact_match;
-  u8 default_sub;
-  u8 outer_vlan_id_any;
-  u8 inner_vlan_id_any;
-  u16 outer_vlan_id;
-  u16 inner_vlan_id;
-};
-
-define create_subif_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-};
-
-/** \brief show version
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define show_version
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief show version response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-    @param program - name of the program (vpe)
-    @param version  - version of the program
-    @param build_directory - root of the workspace where the program was built
-*/
-define show_version_reply
-{
-  u32 context;
-  i32 retval;
-  u8 program[32];
-  u8 version[32];
-  u8 build_date[32];
-  u8 build_directory[256];
-};
-
-/** \brief l2 fib table entry structure
-    @param bd_id - the l2 fib / bridge domain table id
-    @param mac - the entry's mac address
-    @param sw_if_index - index of the interface
-    @param static_mac - the entry is statically configured.
-    @param filter_mac - the entry is a mac filter entry.
-    @param bvi_mac - the mac address is a bridge virtual interface
-*/
-define l2_fib_table_entry
-{
-  u32 context;
-  u32 bd_id;
-  u64 mac;
-  u32 sw_if_index;
-  u8 static_mac;
-  u8 filter_mac;
-  u8 bvi_mac;
-};
-
-/** \brief Dump l2 fib (aka bridge domain) table
-    @param client_index - opaque cookie to identify the sender
-    @param bd_id - the l2 fib / bridge domain table identifier
-*/
-define l2_fib_table_dump
-{
-  u32 client_index;
-  u32 context;
-  u32 bd_id;
-};
-
-/* Gross kludge, DGMS */
-define interface_name_renumber
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u32 new_show_dev_instance;
-};
-
-define interface_name_renumber_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Register for ip4 arp resolution events
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param enable_disable - 1 => register for events, 0 => cancel registration
-    @param pid - sender's pid
-    @param address - the exact ip4 address of interest
-*/
-define want_ip4_arp_events
-{
-  u32 client_index;
-  u32 context;
-  u8 enable_disable;
-  u32 pid;
-  u32 address;
-};
-
-/** \brief Reply for interface events registration
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define want_ip4_arp_events_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Tell client about an ip4 arp resolution event
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param address - the exact ip4 address of interest
-    @param pid - client pid registered to receive notification
-    @param sw_if_index - interface which received ARP packet
-    @param new_mac - the new mac address 
-    @param mac_ip - 0: resolution event, 1: mac/ip binding in bd
-*/
-define ip4_arp_event
-{
-  u32 client_index;
-  u32 context;
-  u32 address;
-  u32 pid;
-  u32 sw_if_index;
-  u8 new_mac[6];
-  u8 mac_ip;
-};
-
-/** \brief Register for ip6 nd resolution events
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param enable_disable - 1 => register for events, 0 => cancel registration
-    @param pid - sender's pid
-    @param address - the exact ip6 address of interest
-*/
-define want_ip6_nd_events
-{
-  u32 client_index;
-  u32 context;
-  u8 enable_disable;
-  u32 pid;
-  u8 address[16];
-};
-
-/** \brief Reply for ip6 nd resolution events registration
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define want_ip6_nd_events_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Tell client about an ip6 nd resolution or mac/ip event
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param pid - client pid registered to receive notification
-    @param sw_if_index - interface which received ARP packet
-    @param address - the exact ip6 address of interest
-    @param new_mac - the new mac address 
-    @param mac_ip - 0: resolution event, 1: mac/ip binding in bd
-*/
-define ip6_nd_event
-{
-  u32 client_index;
-  u32 context;
-  u32 pid;
-  u32 sw_if_index;
-  u8 address[16];
-  u8 new_mac[6];
-  u8 mac_ip;
-};
-    
-/** \brief L2 bridge domain add or delete request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param bd_id - the bridge domain to create
-    @param flood - enable/disable bcast/mcast flooding in the bd
-    @param uu_flood - enable/disable uknown unicast flood in the bd
-    @param forward - enable/disable forwarding on all interfaces in the bd
-    @param learn - enable/disable learning on all interfaces in the bd
-    @param arp_term - enable/disable arp termination in the bd
-    @param mac_age - mac aging time in min, 0 for disabled
-    @param is_add - add or delete flag
-*/
-define bridge_domain_add_del
-{
-  u32 client_index;
-  u32 context;
-  u32 bd_id;
-  u8 flood;
-  u8 uu_flood;
-  u8 forward;
-  u8 learn;
-  u8 arp_term;
-  u8 mac_age;
-  u8 is_add;
-};
-
-/** \brief L2 bridge domain add or delete response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the set bridge flags request
-*/
-define bridge_domain_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief L2 bridge domain request operational state details
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param bd_id - the bridge domain id desired or ~0 to request all bds
-*/
-define bridge_domain_dump
-{
-  u32 client_index;
-  u32 context;
-  u32 bd_id;
-};
-
-/** \brief L2 bridge domain operational state response
-    @param bd_id - the bridge domain id
-    @param flood - bcast/mcast flooding state on all interfaces in the bd
-    @param uu_flood - uknown unicast flooding state on all interfaces in the bd
-    @param forward - forwarding state on all interfaces in the bd
-    @param learn - learning state on all interfaces in the bd
-    @param arp_term - arp termination state on all interfaces in the bd
-    @param mac_age - mac aging time in min, 0 for disabled
-    @param n_sw_ifs - number of sw_if_index's in the domain
-*/
-define bridge_domain_details
-{
-  u32 context;
-  u32 bd_id;
-  u8 flood;
-  u8 uu_flood;
-  u8 forward;
-  u8 learn;
-  u8 arp_term;
-  u8 mac_age;
-  u32 bvi_sw_if_index;
-  u32 n_sw_ifs;
-};
-
-/** \brief L2 bridge domain sw interface operational state response
-    @param bd_id - the bridge domain id
-    @param sw_if_index - sw_if_index in the domain
-    @param shg - split horizon group for the interface
-*/
-define bridge_domain_sw_if_details
-{
-  u32 context;
-  u32 bd_id;
-  u32 sw_if_index;
-  u8 shg;
-};
-
-/** \brief DHCP Client config add / del request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - index of the interface for DHCP client
-    @param hostname - hostname
-    @param is_add - add the config if non-zero, else delete
-    @param want_dhcp_event - DHCP event sent to the sender
-           via dhcp_compl_event API message if non-zero
-    @param pid - sender's pid
-*/
-define dhcp_client_config
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 hostname[64];
-  u8 is_add;
-  u8 want_dhcp_event;
-  u32 pid;
-};
-
-/** \brief DHCP Client config response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define dhcp_client_config_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Set/unset input ACL interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface to set/unset input ACL
-    @param ip4_table_index - ip4 classify table index (~0 for skip)
-    @param ip6_table_index - ip6 classify table index (~0 for skip)
-    @param l2_table_index  -  l2 classify table index (~0 for skip)
-    @param is_add - Set input ACL if non-zero, else unset
-    Note: User is recommeneded to use just one valid table_index per call.
-          (ip4_table_index, ip6_table_index, or l2_table_index)
-*/
-define input_acl_set_interface
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u32 ip4_table_index;
-  u32 ip6_table_index;
-  u32 l2_table_index;
-  u8 is_add;
-};
-
-/** \brief Set/unset input ACL interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define input_acl_set_interface_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Tell client about a DHCP completion event
-    @param client_index - opaque cookie to identify the sender
-    @param pid - client pid registered to receive notification
-    @param is_ipv6 - if non-zero the address is ipv6, else ipv4
-    @param host_address - Host IP address
-    @param router_address - Router IP address
-    @param host_mac - Host MAC address
-*/
-define dhcp_compl_event
-{
-  u32 client_index;
-  u32 pid;
-  u8 hostname[64];
-  u8 is_ipv6;
-  u8 host_address[16];
-  u8 router_address[16];
-  u8 host_mac[6];
-};
-
-/** \brief cop: enable/disable junk filtration features on an interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_inded - desired interface
-    @param enable_disable - 1 => enable, 0 => disable
-*/
-
-define cop_interface_enable_disable
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 enable_disable;
-};
-
-/** \brief cop: interface enable/disable junk filtration reply
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define cop_interface_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief cop: enable/disable whitelist filtration features on an interface
-    Note: the supplied fib_id must match in order to remove the feature!
-    
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface handle, physical interfaces only
-    @param fib_id - fib identifier for the whitelist / blacklist fib
-    @param ip4 - 1 => enable ip4 filtration, 0=> disable ip4 filtration
-    @param ip6 - 1 => enable ip6 filtration, 0=> disable ip6 filtration
-    @param default_cop -  1 => enable non-ip4, non-ip6 filtration 0=> disable it
-*/
-
-define cop_whitelist_enable_disable
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u32 fib_id;
-  u8 ip4;
-  u8 ip6;
-  u8 default_cop;
-};
-
-/** \brief cop: interface enable/disable junk filtration reply
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define cop_whitelist_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief get_node_graph - get a copy of the vpp node graph
-    including the current set of graph arcs.
-
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-
-define get_node_graph
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief get_node_graph_reply
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-    @param reply_in_shmem - result from vlib_node_serialize, in shared
-    memory. Process with vlib_node_unserialize, remember to switch
-    heaps and free the result.
-*/
-
-define get_node_graph_reply
-{
-  u32 context;
-  i32 retval;
-  u64 reply_in_shmem;
-};
-
-/** \brief IOAM enable : Enable in-band OAM
-    @param id - profile id
-    @param seqno - To enable Seqno Processing
-    @param analyse - Enabling analysis of iOAM at decap node 
-    @param pow_enable - Proof of Work enabled or not flag
-    @param trace_enable - iOAM Trace enabled or not flag
-*/
-define ioam_enable
-{
-  u32 client_index;
-  u32 context;
-  u16 id;
-  u8 seqno;
-  u8 analyse;
-  u8 pot_enable;
-  u8 trace_enable;
-  u32 node_id;
-};
-
-/** \brief iOAM Trace profile add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define ioam_enable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief iOAM disable
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param index - MAP Domain index
-*/
-define ioam_disable
-{
-  u32 client_index;
-  u32 context;
-  u16 id;
-};
-
-/** \brief iOAM disable response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define ioam_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Add/del policer
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add policer if non-zero, else delete
-    @param name - policer name
-    @param cir - CIR
-    @param eir - EIR
-    @param cb - Committed Burst
-    @param eb - Excess or Peak Burst
-    @param rate_type - rate type
-    @param round_type - rounding type
-    @param type - policer algorithm
-    @param color_aware - 0=color-blind, 1=color-aware
-    @param conform_action_type - conform action type
-    @param conform_dscp - DSCP for conform mar-and-transmit action
-    @param exceed_action_type - exceed action type
-    @param exceed_dscp - DSCP for exceed mar-and-transmit action
-    @param violate_action_type - violate action type
-    @param violate_dscp - DSCP for violate mar-and-transmit action
-*/
-define policer_add_del
-{
-  u32 client_index;
-  u32 context;
-
-  u8 is_add;
-  u8 name[64];
-  u32 cir;
-  u32 eir;
-  u64 cb;
-  u64 eb;
-  u8 rate_type;
-  u8 round_type;
-  u8 type;
-  u8 color_aware;
-  u8 conform_action_type;
-  u8 conform_dscp;
-  u8 exceed_action_type;
-  u8 exceed_dscp;
-  u8 violate_action_type;
-  u8 violate_dscp;
-};
-
-/** \brief Add/del policer response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-    @param policer_index - for add, returned index of the new policer
-*/
-define policer_add_del_reply
-{
-  u32 context;
-  i32 retval;
-  u32 policer_index;
-};
-
-/** \brief Get list of policers
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param match_name_valid - if 0 request all policers otherwise use match_name
-    @param match_name - policer name
-*/
-define policer_dump
-{
-  u32 client_index;
-  u32 context;
-
-  u8 match_name_valid;
-  u8 match_name[64];
-};
-
-/** \brief Policer operational state response.
-    @param context - sender context, to match reply w/ request
-    @param name - policer name
-    @param cir - CIR
-    @param eir - EIR
-    @param cb - Committed Burst
-    @param eb - Excess or Peak Burst
-    @param rate_type - rate type
-    @param round_type - rounding type
-    @param type - policer algorithm
-    @param conform_action_type - conform action type
-    @param conform_dscp - DSCP for conform mar-and-transmit action
-    @param exceed_action_type - exceed action type
-    @param exceed_dscp - DSCP for exceed mar-and-transmit action
-    @param violate_action_type - violate action type
-    @param violate_dscp - DSCP for violate mar-and-transmit action
-    @param single_rate - 1 = single rate policer, 0 = two rate policer
-    @param color_aware - for hierarchical policing
-    @param scale - power-of-2 shift amount for lower rates
-    @param cir_tokens_per_period - number of tokens for each period
-    @param pir_tokens_per_period - number of tokens for each period for 2-rate policer
-    @param current_limit - current limit
-    @param current_bucket - current bucket
-    @param extended_limit - extended limit
-    @param extended_bucket - extended bucket
-    @param last_update_time - last update time
-*/
-define policer_details
-{
-  u32 context;
-
-  u8 name[64];
-  u32 cir;
-  u32 eir;
-  u64 cb;
-  u64 eb;
-  u8 rate_type;
-  u8 round_type;
-  u8 type;
-  u8 conform_action_type;
-  u8 conform_dscp;
-  u8 exceed_action_type;
-  u8 exceed_dscp;
-  u8 violate_action_type;
-  u8 violate_dscp;
-  u8 single_rate;
-  u8 color_aware;
-  u32 scale;
-  u32 cir_tokens_per_period;
-  u32 pir_tokens_per_period;
-  u32 current_limit;
-  u32 current_bucket;
-  u32 extended_limit;
-  u32 extended_bucket;
-  u64 last_update_time;
-};
-
-/** \brief Set/unset policer classify interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface to set/unset policer classify
-    @param ip4_table_index - ip4 classify table index (~0 for skip)
-    @param ip6_table_index - ip6 classify table index (~0 for skip)
-    @param l2_table_index  -  l2 classify table index (~0 for skip)
-    @param is_add - Set if non-zero, else unset
-    Note: User is recommeneded to use just one valid table_index per call.
-          (ip4_table_index, ip6_table_index, or l2_table_index)
-*/
-define policer_classify_set_interface
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u32 ip4_table_index;
-  u32 ip6_table_index;
-  u32 l2_table_index;
-  u8 is_add;
-};
-
-/** \brief Set/unset policer classify interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define policer_classify_set_interface_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Get list of policer classify interfaces and tables
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param type - classify table type
-*/
-define policer_classify_dump
-{
-  u32 client_index;
-  u32 context;
-  u8 type;
-};
-
-/** \brief Policer iclassify operational state response.
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - software interface index
-    @param table_index - classify table index
-*/
-define policer_classify_details
-{
-  u32 context;
-  u32 sw_if_index;
-  u32 table_index;
-};
-
-/** \brief Classify get table IDs request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define classify_table_ids
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Reply for classify get table IDs request
-    @param context - sender context which was passed in the request
-    @param count - number of ids returned in response
-    @param ids - array of classify table ids
-*/
-define classify_table_ids_reply
-{
-  u32 context;
-  i32 retval;
-  u32 count;
-  u32 ids[count];
-};
-
-/** \brief Classify table ids by interface index request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - index of the interface
-*/
-define classify_table_by_interface
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-};
-
-/** \brief Reply for classify table id by interface index request
-    @param context - sender context which was passed in the request
-    @param count - number of ids returned in response
-    @param sw_if_index - index of the interface
-    @param l2_table_id - l2 classify table index
-    @param ip4_table_id - ip4 classify table index
-    @param ip6_table_id - ip6 classify table index
-*/
-define classify_table_by_interface_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-  u32 l2_table_id;
-  u32 ip4_table_id;
-  u32 ip6_table_id;
-};
-
-/** \brief Classify table info
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param table_id - classify table index
-*/
-define classify_table_info
-{
-  u32 client_index;
-  u32 context;
-  u32 table_id;
-};
-
-/** \brief Reply for classify table info request
-    @param context - sender context which was passed in the request
-    @param count - number of ids returned in response
-    @param table_id - classify table index
-    @param nbuckets - number of buckets when adding a table
-    @param match_n_vectors - number of match vectors
-    @param skip_n_vectors - number of skip_n_vectors
-    @param active_sessions - number of sessions (active entries)
-    @param next_table_index - index of next table
-    @param miss_next_index - index of miss table
-    @param mask[] - match mask
-*/
-define classify_table_info_reply
-{
-  u32 context;
-  i32 retval;
-  u32 table_id;
-  u32 nbuckets;
-  u32 match_n_vectors;
-  u32 skip_n_vectors;
-  u32 active_sessions;
-  u32 next_table_index;
-  u32 miss_next_index;
-  u32 mask_length;
-  u8 mask[mask_length];
-};
-
-/** \brief Classify sessions dump request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param table_id - classify table index
-*/
-define classify_session_dump
-{
-  u32 client_index;
-  u32 context;
-  u32 table_id;
-};
-
-/** \brief Reply for classify table session dump request
-    @param context - sender context which was passed in the request
-    @param count - number of ids returned in response
-    @param table_id - classify table index
-    @param hit_next_index - hit_next_index of session
-    @param opaque_index - for add, opaque_index of session
-    @param advance - advance value of session
-    @param match[] - match value for session
-*/
-define classify_session_details
-{
-  u32 context;
-  i32 retval;
-  u32 table_id;
-  u32 hit_next_index;
-  i32 advance;
-  u32 opaque_index;
-  u32 match_length;
-  u8 match[match_length];
-};
-
-/** \brief Configure IPFIX exporter process request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param collector_address - address of IPFIX collector
-    @param collector_port - port of IPFIX collector
-    @param src_address - address of IPFIX exporter
-    @param vrf_id - VRF / fib table ID
-    @param path_mtu - Path MTU between exporter and collector
-    @param template_interval - number of seconds after which to resend template
-    @param udp_checksum - UDP checksum calculation enable flag
-*/
-define set_ipfix_exporter
-{
-  u32 client_index;
-  u32 context;
-  u8 collector_address[16];
-  u16 collector_port;
-  u8 src_address[16];
-  u32 vrf_id;
-  u32 path_mtu;
-  u32 template_interval;
-  u8 udp_checksum;
-};
-
-/** \brief Reply to IPFIX exporter configure request
-    @param context - sender context which was passed in the request
-*/
-define set_ipfix_exporter_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief IPFIX exporter dump request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define ipfix_exporter_dump
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Reply to IPFIX exporter dump request
-    @param context - sender context which was passed in the request
-    @param collector_address - address of IPFIX collector
-    @param collector_port - port of IPFIX collector
-    @param src_address - address of IPFIX exporter
-    @param fib_index - fib table index
-    @param path_mtu - Path MTU between exporter and collector
-    @param template_interval - number of seconds after which to resend template
-    @param udp_checksum - UDP checksum calculation enable flag
-*/
-define ipfix_exporter_details
-{
-  u32 context;
-  u8 collector_address[16];
-  u16 collector_port;
-  u8 src_address[16];
-  u32 vrf_id;
-  u32 path_mtu;
-  u32 template_interval;
-  u8 udp_checksum;
-};
-
-/** \brief IPFIX classify stream configure request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param domain_id - domain ID reported in IPFIX messages for classify stream
-    @param src_port - source port of UDP session for classify stream
-*/
-define set_ipfix_classify_stream {
-    u32 client_index;
-    u32 context;
-    u32 domain_id;
-    u16 src_port;
-};
-
-/** \brief IPFIX classify stream configure response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define set_ipfix_classify_stream_reply {
-    u32 context;
-    i32 retval;
-};
-
-/** \brief IPFIX classify stream dump request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define ipfix_classify_stream_dump {
-    u32 client_index;
-    u32 context;
-};
-
-/** \brief Reply to IPFIX classify stream dump request
-    @param context - sender context, to match reply w/ request
-    @param domain_id - domain ID reported in IPFIX messages for classify stream
-    @param src_port - source port of UDP session for classify stream
-*/
-define ipfix_classify_stream_details {
-    u32 context;
-    u32 domain_id;
-    u16 src_port;
-};
-
-/** \brief IPFIX add or delete classifier table request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param table_id - classifier table ID
-    @param ip_version - version of IP used in the classifier table
-    @param transport_protocol - transport protocol used in the classifier table or 255 for unspecified
-*/
-define ipfix_classify_table_add_del {
-    u32 client_index;
-    u32 context;
-    u32 table_id;
-    u8 ip_version;
-    u8 transport_protocol;
-    u8 is_add;
-};
-
-/** \brief IPFIX add classifier table response
-    @param context - sender context which was passed in the request
-*/
-define ipfix_classify_table_add_del_reply {
-    u32 context;
-    i32 retval;
-};
-
-/** \brief IPFIX classify tables dump request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define ipfix_classify_table_dump {
-    u32 client_index;
-    u32 context;
-};
-
-/** \brief Reply to IPFIX classify tables dump request
-    @param context - sender context, to match reply w/ request
-    @param table_id - classifier table ID
-    @param ip_version - version of IP used in the classifier table
-    @param transport_protocol - transport protocol used in the classifier table or 255 for unspecified
-*/
-define ipfix_classify_table_details {
-    u32 context;
-    u32 table_id;
-    u8 ip_version;
-    u8 transport_protocol;
-};
-
-/** \brief Set/unset flow classify interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface to set/unset flow classify
-    @param ip4_table_index - ip4 classify table index (~0 for skip)
-    @param ip6_table_index - ip6 classify table index (~0 for skip)
-    @param l2_table_index  -  l2 classify table index (~0 for skip)
-    @param is_add - Set if non-zero, else unset
-    Note: User is recommeneded to use just one valid table_index per call.
-          (ip4_table_index, ip6_table_index, or l2_table_index)
-*/
-define flow_classify_set_interface {
-    u32 client_index;
-    u32 context;
-    u32 sw_if_index;
-    u32 ip4_table_index;
-    u32 ip6_table_index;
-    u8  is_add;
-};
-
-/** \brief Set/unset flow classify interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define flow_classify_set_interface_reply {
-    u32 context;
-    i32 retval;
-};
-
-/** \brief Get list of flow classify interfaces and tables
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param type - classify table type
-*/
-define flow_classify_dump {
-    u32 client_index;
-    u32 context;
-    u8 type;
-};
-
-/** \brief Flow classify operational state response.
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - software interface index
-    @param table_index - classify table index
-*/
-define flow_classify_details {
-    u32 context;
-    u32 sw_if_index;
-    u32 table_index;
-};
-
-/** \brief Query relative index via node names
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param node_name - name of node to find relative index from
-    @param next_name - next node from node_name to find relative index of
-*/
-define get_next_index
-{
-  u32 client_index;
-  u32 context;
-  u8 node_name[64];
-  u8 next_name[64];
-};
-
-/** \brief Reply for get next node index
-    @param context - sender context which was passed in the request
-    @param retval - return value
-    @param next_index - index of the next_node
-*/
-define get_next_index_reply
-{
-  u32 context;
-  i32 retval;
-  u32 next_index;
-};
-
-/** \brief PacketGenerator create interface request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param interface_id - interface index
-*/
-define pg_create_interface
-{
-  u32 client_index;
-  u32 context;
-  u32 interface_id;
-};
-
-/** \brief PacketGenerator create interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define pg_create_interface_reply
-{
-  u32 context;
-  i32 retval;
-  u32 sw_if_index;
-};
-
-/** \brief PacketGenerator capture packets on given interface request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param interface_id - pg interface index
-    @param is_enabled - 1 if enabling streams, 0 if disabling
-    @param count - number of packets to be captured
-    @param pcap_file - pacp file name to store captured packets
-*/
-define pg_capture
-{
-  u32 client_index;
-  u32 context;
-  u32 interface_id;
-  u8 is_enabled;
-  u32 count;
-  u32 pcap_name_length;
-  u8 pcap_file_name[pcap_name_length];
-};
-
-/** \brief PacketGenerator capture packets response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define pg_capture_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Enable / disable packet generator request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_enabled - 1 if enabling streams, 0 if disabling
-    @param stream - stream name to be enable/disabled, if not specified handle all streams
-*/
-define pg_enable_disable
-{
-  u32 client_index;
-  u32 context;
-  u8 is_enabled;
-  u32 stream_name_length;
-  u8 stream_name[stream_name_length];
-};
-
-/** \brief Reply for enable / disable packet generator
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define pg_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Configure IP source and L4 port-range check
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_ip6 - 1 if source address type is IPv6
-    @param is_add - 1 if add, 0 if delete
-    @param mask_length - mask length for address entry
-    @param address - array of address bytes
-    @param number_of_ranges - length of low_port and high_port arrays (must match)
-    @param low_ports[32] - up to 32 low end of port range entries (must have corresponding high_ports entry)
-    @param high_ports[32] - up to 32 high end of port range entries (must have corresponding low_ports entry)
-    @param vrf_id - fib table/vrf id to associate the source and port-range check with
-    @note To specify a single port set low_port and high_port entry the same
-*/
-define ip_source_and_port_range_check_add_del
-{
-  u32 client_index;
-  u32 context;
-  u8 is_ipv6;
-  u8 is_add;
-  u8 mask_length;
-  u8 address[16];
-  u8 number_of_ranges;
-  u16 low_ports[32];
-  u16 high_ports[32];
-  u32 vrf_id;
-};
-
-/** \brief Configure IP source and L4 port-range check reply
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ip_source_and_port_range_check_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Set interface source and L4 port-range request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param interface_id - interface index
-    @param tcp_vrf_id - VRF associated with source and TCP port-range check
-    @param udp_vrf_id - VRF associated with source and TCP port-range check
-*/
-define ip_source_and_port_range_check_interface_add_del
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u32 sw_if_index;
-  u32 tcp_in_vrf_id;
-  u32 tcp_out_vrf_id;
-  u32 udp_in_vrf_id;
-  u32 udp_out_vrf_id;
-};
-
-/** \brief Set interface source and L4 port-range response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define ip_source_and_port_range_check_interface_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Delete sub interface request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - sw index of the interface that was created by create_subif
-*/
-define delete_subif {
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-};
-
-/** \brief Delete sub interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define delete_subif_reply {
-  u32 context;
-  i32 retval;
-};
-
-/** \brief DPDK interface HQoS pipe profile set request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - the interface
-    @param subport - subport ID
-    @param pipe - pipe ID within its subport
-    @param profile - pipe profile ID
-*/
-define sw_interface_set_dpdk_hqos_pipe {
-    u32 client_index;
-    u32 context;
-    u32 sw_if_index;
-    u32 subport;
-    u32 pipe;
-    u32 profile;
-};
-
-/** \brief DPDK interface HQoS pipe profile set reply
-    @param context - sender context, to match reply w/ request
-    @param retval - request return code
-*/
-define sw_interface_set_dpdk_hqos_pipe_reply {
-    u32 context;
-    i32 retval;
-};
-
-/** \brief DPDK interface HQoS subport parameters set request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - the interface
-    @param subport - subport ID
-    @param tb_rate - subport token bucket rate (measured in bytes/second)
-    @param tb_size - subport token bucket size (measured in credits)
-    @param tc_rate - subport traffic class 0 .. 3 rates (measured in bytes/second)
-    @param tc_period - enforcement period for rates (measured in milliseconds)
-*/
-define sw_interface_set_dpdk_hqos_subport {
-    u32 client_index;
-    u32 context;
-    u32 sw_if_index;
-    u32 subport;
-    u32 tb_rate;
-    u32 tb_size;
-    u32 tc_rate[4];
-    u32 tc_period;
-};
-
-/** \brief DPDK interface HQoS subport parameters set reply
-    @param context - sender context, to match reply w/ request
-    @param retval - request return code
-*/
-define sw_interface_set_dpdk_hqos_subport_reply {
-    u32 context;
-    i32 retval;
-};
-
-/** \brief DPDK interface HQoS tctbl entry set request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - the interface
-    @param entry - entry index ID
-    @param tc - traffic class (0 .. 3)
-    @param queue - traffic class queue (0 .. 3)
-*/
-define sw_interface_set_dpdk_hqos_tctbl {
-    u32 client_index;
-    u32 context;
-    u32 sw_if_index;
-    u32 entry;
-    u32 tc;
-    u32 queue;
-};
-
-/** \brief DPDK interface HQoS tctbl entry set reply
-    @param context - sender context, to match reply w/ request
-    @param retval - request return code
-*/
-define sw_interface_set_dpdk_hqos_tctbl_reply {
-    u32 context;
-    i32 retval;
-};
-
-/** \brief L2 interface pbb tag rewrite configure request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface the operation is applied to
-    @param vtr_op - Choose from l2_vtr_op_t enum values
-    @param inner_tag - needed for translate_qinq vtr op only
-    @param outer_tag - needed for translate_qinq vtr op only 
-    @param b_dmac - B-tag remote mac address, needed for any push or translate_qinq vtr op
-    @param b_smac - B-tag local mac address, needed for any push or translate qinq vtr op
-    @param b_vlanid - B-tag vlanid, needed for any push or translate qinq vtr op
-    @param i_sid - I-tag service id, needed for any push or translate qinq vtr op
-*/
-define l2_interface_pbb_tag_rewrite
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u32 vtr_op;
-  u16 outer_tag;
-  u8  b_dmac[6];
-  u8  b_smac[6];
-  u16 b_vlanid;
-  u32 i_sid;
-};
-
-/** \brief L2 interface pbb tag rewrite response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define l2_interface_pbb_tag_rewrite_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Punt traffic to the host
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add punt if non-zero, else delete
-    @param ipv - L3 protocol 4 - IPv4, 6 - IPv6, ~0 - All
-    @param l4_protocol - L4 protocol to be punted, only UDP (0x11) is supported
-    @param l4_port - TCP/UDP port to be punted
-*/
-define punt {
-    u32 client_index;
-    u32 context;
-    u8 is_add;
-    u8 ipv;
-    u8 l4_protocol;
-    u16 l4_port;
-};
-
-/** \brief Reply to the punt request
-    @param context - sender context which was passed in the request
-    @param retval - return code of punt request
-*/
-define punt_reply
-{
-    u32 context;
-    i32 retval;
-};
-
-/** \brief Feature path enable/disable request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - the interface
-    @param enable - 1 = on, 0 = off
-*/
-define feature_enable_disable {
-    u32 client_index;
-    u32 context;
-    u32 sw_if_index;
-    u8 enable;
-    u8 arc_name[64];
-    u8 feature_name[64];
-};
-
-/** \brief Reply to the eature path enable/disable request
-    @param context - sender context which was passed in the request
-    @param retval - return code for the request
-*/
-define feature_enable_disable_reply
-{
-    u32 context;
-    i32 retval;
-};
-
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/vpp-api/vpe_all_api_h.h b/vpp/vpp-api/vpe_all_api_h.h
deleted file mode 100644
index 98717eaa..00000000
--- a/vpp/vpp-api/vpe_all_api_h.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * Add to the bottom of the #include list, or elves will steal your
- * keyboard in the middle of the night!
- */
-
-/* Include the (first) vlib-api API definition layer */
-#include <vlibmemory/vl_memory_api_h.h>
-
-/* Include the (second) vnet API definition layer */
-#define included_from_layer_3
-#include <vnet/vnet_all_api_h.h>
-#undef included_from_layer_3
-
-/* Include the current layer (third) vpp API definition layer */
-#include <vpp-api/vpe.api.h>
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/vpp-api/vpe_msg_enum.h b/vpp/vpp-api/vpe_msg_enum.h
deleted file mode 100644
index 1da3ec0c..00000000
--- a/vpp/vpp-api/vpe_msg_enum.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vpe_msg_enum_h
-#define included_vpe_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum
-{
-  VL_ILLEGAL_MESSAGE_ID = 0,
-#include <vpp-api/vpe_all_api_h.h>
-  VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* included_vpe_msg_enum_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vpp/vpp-api/vpp_get_metrics.c b/vpp/vpp-api/vpp_get_metrics.c
deleted file mode 100644
index bbfa605a..00000000
--- a/vpp/vpp-api/vpp_get_metrics.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <pwd.h>
-#include <grp.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vnet/api_errno.h>
-
-#include <svmdb.h>
-
-svmdb_client_t *c;
-volatile int signal_received;
-
-static void
-unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc)
-{
-  static int once;
-
-  if (once)
-    exit (1);
-
-  once = 1;
-  signal_received = 1;
-}
-
-static void
-setup_signal_handlers (void)
-{
-  uword i;
-  struct sigaction sa;
-
-  for (i = 1; i < 32; i++)
-    {
-      memset (&sa, 0, sizeof (sa));
-      sa.sa_sigaction = (void *) unix_signal_handler;
-      sa.sa_flags = SA_SIGINFO;
-
-      switch (i)
-	{
-	  /* these signals take the default action */
-	case SIGABRT:
-	case SIGKILL:
-	case SIGSTOP:
-	case SIGUSR1:
-	case SIGUSR2:
-	  continue;
-
-	  /* ignore SIGPIPE, SIGCHLD */
-	case SIGPIPE:
-	case SIGCHLD:
-	  sa.sa_sigaction = (void *) SIG_IGN;
-	  break;
-
-	  /* catch and handle all other signals */
-	default:
-	  break;
-	}
-
-      if (sigaction (i, &sa, 0) < 0)
-	return clib_unix_warning (0, "sigaction %U", format_signal, i);
-    }
-}
-
-int
-main (int argc, char **argv)
-{
-  unformat_input_t input;
-  char *chroot_path = 0;
-  u8 *chroot_path_u8;
-  int interval = 0;
-  f64 *vector_ratep, *rx_ratep, *sig_error_ratep;
-  pid_t *vpp_pidp;
-  svmdb_map_args_t _ma, *ma = &_ma;
-  int uid, gid, rv;
-  struct passwd _pw, *pw;
-  struct group _grp, *grp;
-  char *s, buf[128];
-
-  unformat_init_command_line (&input, argv);
-
-  uid = geteuid ();
-  gid = getegid ();
-
-  while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (&input, "chroot %s", &chroot_path_u8))
-	{
-	  chroot_path = (char *) chroot_path_u8;
-	}
-      else if (unformat (&input, "interval %d", &interval))
-	;
-      else if (unformat (&input, "uid %d", &uid))
-	;
-      else if (unformat (&input, "gid %d", &gid))
-	;
-      else if (unformat (&input, "uid %s", &s))
-	{
-	  /* lookup the username */
-	  pw = NULL;
-	  rv = getpwnam_r (s, &_pw, buf, sizeof (buf), &pw);
-	  if (rv < 0)
-	    {
-	      fformat (stderr, "cannot fetch username %s", s);
-	      exit (1);
-	    }
-	  if (pw == NULL)
-	    {
-	      fformat (stderr, "username %s does not exist", s);
-	      exit (1);
-	    }
-	  vec_free (s);
-	  uid = pw->pw_uid;
-	}
-      else if (unformat (&input, "gid %s", &s))
-	{
-	  /* lookup the group name */
-	  grp = NULL;
-	  rv = getgrnam_r (s, &_grp, buf, sizeof (buf), &grp);
-	  if (rv != 0)
-	    {
-	      fformat (stderr, "cannot fetch group %s", s);
-	      exit (1);
-	    }
-	  if (grp == NULL)
-	    {
-	      fformat (stderr, "group %s does not exist", s);
-	      exit (1);
-	    }
-	  vec_free (s);
-	  gid = grp->gr_gid;
-	}
-      else
-	{
-	  fformat (stderr,
-		   "usage: vpp_get_metrics [chroot <path>] [interval <nn>]\n");
-	  exit (1);
-	}
-    }
-
-  setup_signal_handlers ();
-
-  memset (ma, 0, sizeof (*ma));
-  ma->root_path = chroot_path;
-  ma->uid = uid;
-  ma->gid = gid;
-
-  c = svmdb_map (ma);
-
-  vpp_pidp =
-    svmdb_local_get_variable_reference (c, SVMDB_NAMESPACE_VEC, "vpp_pid");
-  vector_ratep =
-    svmdb_local_get_variable_reference (c, SVMDB_NAMESPACE_VEC,
-					"vpp_vector_rate");
-  rx_ratep =
-    svmdb_local_get_variable_reference (c, SVMDB_NAMESPACE_VEC,
-					"vpp_input_rate");
-  sig_error_ratep =
-    svmdb_local_get_variable_reference (c, SVMDB_NAMESPACE_VEC,
-					"vpp_sig_error_rate");
-
-  /*
-   * Make sure vpp is actually running. Otherwise, there's every
-   * chance that the database region will be wiped out by the
-   * process monitor script
-   */
-
-  if (vpp_pidp == 0 || vector_ratep == 0 || rx_ratep == 0
-      || sig_error_ratep == 0)
-    {
-      fformat (stdout, "vpp not running\n");
-      exit (1);
-    }
-
-  do
-    {
-      /*
-       * Once vpp exits, the svm db region will be recreated...
-       * Can't use kill (*vpp_pidp, 0) if running as non-root /
-       * accessing the shared-VM database via group perms.
-       */
-      if (*vpp_pidp == 0)
-	{
-	  fformat (stdout, "vpp not running\n");
-	  exit (1);
-	}
-      fformat (stdout,
-	       "%d: vpp_vector_rate=%.2f, vpp_input_rate=%f, vpp_sig_error_rate=%f\n",
-	       *vpp_pidp, *vector_ratep, *rx_ratep, *sig_error_ratep);
-
-      if (interval)
-	sleep (interval);
-      if (signal_received)
-	break;
-    }
-  while (interval);
-
-  svmdb_unmap (c);
-  exit (0);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppapigen/Makefile.am b/vppapigen/Makefile.am
deleted file mode 100644
index 16a48736..00000000
--- a/vppapigen/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign
-
-bin_PROGRAMS = vppapigen
-bin_SCRIPTS =
-
-BUILT_SOURCES = gram.h
-
-gram.h: gram.y
-	$(YACC) -d @srcdir@/gram.y
-	mv y.tab.h gram.h
-	rm y.tab.c
-
-vppapigen_SOURCES = gram.y lex.c node.c
-vppapigen_CPPFLAGS =
-vppapigen_LDADD = -lvppinfra
-vppapigen_LDFLAGS = -static
diff --git a/vppapigen/configure.ac b/vppapigen/configure.ac
deleted file mode 100644
index 16ad59d2..00000000
--- a/vppapigen/configure.ac
+++ /dev/null
@@ -1,14 +0,0 @@
-#                                               -*- Autoconf -*-
-# Copyright (c) 2008 by cisco Systems, Inc.
-# All rights reserved.
-# Process this file with autoconf to produce a configure script.
-
-AC_INIT(vppapigen, 1.0)
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_YACC
-
-AC_OUTPUT([Makefile])
diff --git a/vppapigen/gram.y b/vppapigen/gram.y
deleted file mode 100644
index de26af8d..00000000
--- a/vppapigen/gram.y
+++ /dev/null
@@ -1,90 +0,0 @@
-%{
-/*
- * gram.y - message definition language
- *
- * Copyright (c) 2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-extern void yyerror (char *s);
-extern int yylex (void);
-    
-#define YYSTYPE void *
-    
-void generate (YYSTYPE);
- YYSTYPE add_slist(YYSTYPE, YYSTYPE);
- YYSTYPE add_define(YYSTYPE, YYSTYPE);
- YYSTYPE suppress_version(void);
- YYSTYPE add_defbody(YYSTYPE, YYSTYPE);
- YYSTYPE add_primtype(YYSTYPE, YYSTYPE, YYSTYPE);
- YYSTYPE add_complex(YYSTYPE, YYSTYPE);
- YYSTYPE add_union(YYSTYPE, YYSTYPE);
- YYSTYPE add_scalar_vbl(YYSTYPE);
- YYSTYPE add_vector_vbl(YYSTYPE, YYSTYPE);
- YYSTYPE add_variable_length_vector_vbl(YYSTYPE, YYSTYPE);
- YYSTYPE set_flags(YYSTYPE, YYSTYPE);
-%}
-
-%token NAME RPAR LPAR SEMI LBRACK RBRACK NUMBER PRIMTYPE BARF
-%token TPACKED DEFINE LCURLY RCURLY STRING UNION
-%token HELPER_STRING COMMA 
-%token NOVERSION MANUAL_PRINT MANUAL_ENDIAN TYPEONLY DONT_TRACE
-
-%%
-
-pgm:	  slist                 {generate ($1);}
-          ;
-
-slist:	  slist stmt            {$$ = add_slist ($1, $2);}
-        | stmt                  {$$ = $1;}
-          ;
-
-stmt:     flist defn            {$$ = set_flags($1, $2);}
-        | defn                  {$$ = $1;}
-          ;
-
-flist:    flist flag            {$$ = (YYSTYPE)(unsigned long long)
-                                     ((unsigned long long) $1 
-                                    | (unsigned long long) $2);}
-        | flag                  {$$ = $1;}
-          ;
-
-flag:   
-          MANUAL_PRINT          {$$ = $1;}
-        | MANUAL_ENDIAN         {$$ = $1;}
-        | DONT_TRACE            {$$ = $1;}
-        | TYPEONLY              {$$ = $1;}
-          ;
-
-defn:     DEFINE NAME LCURLY defbody RCURLY SEMI 
-                                {$$ = add_define($2, $4);}
-
-        | NOVERSION SEMI
-                                {$$ = suppress_version();}
-          ;
-
-defbody:  defbody onedef        {$$ = add_defbody($1, $2);}
-        | onedef                {$$ = $1;}
-          ;
-
-onedef:   PRIMTYPE vbl SEMI      {$$ = add_primtype($1, $2, 0);}
-        | TPACKED PRIMTYPE vbl SEMI {$$ = add_primtype($1, $2, $3);}
-        | NAME vbl SEMI          {$$ = add_complex($1, $2);}
-        | UNION NAME LCURLY defbody RCURLY SEMI 
-                                 {$$ = add_union($2, $4);}
-          ;
-
-vbl:      NAME                      {$$ = add_scalar_vbl($1);}
-        | NAME LBRACK NUMBER RBRACK {$$ = add_vector_vbl($1, $3);}
-        | NAME LBRACK NAME RBRACK {$$ = add_variable_length_vector_vbl($1, $3);}
-          ;
diff --git a/vppapigen/lex.c b/vppapigen/lex.c
deleted file mode 100644
index e807d46b..00000000
--- a/vppapigen/lex.c
+++ /dev/null
@@ -1,1067 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * lex.c - API generator lexical analyzer
- *
- * Copyright (c) 1996-2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <ctype.h>
-#include <time.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "lex.h"
-#include "node.h"
-#include "gram.h"
-
-FILE *ifp, *ofp, *pythonfp, *jsonfp;
-char *vlib_app_name = "vpp";
-int dump_tree;
-time_t starttime;
-char *input_filename;
-char *current_filename;
-int current_filename_allocated;
-unsigned long input_crc;
-unsigned long message_crc;
-int yydebug;
-
-/*
- * lexer variable definitions 
- */
-
-static const char *version = "0.1";
-static int the_lexer_linenumber = 1;
-static enum lex_state the_lexer_state = START_STATE;
-
-/*
- * private prototypes
- */
-static void usage (char *);
-static int name_check (const char *, YYSTYPE *);
-static int name_compare (const char *, const char *);
-extern int yydebug;
-extern YYSTYPE yylval;
-
-unsigned int crc32c_table[256] = { 
-  0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4,  
-  0xC79A971F, 0x35F1141C, 0x26A1E7E8, 0xD4CA64EB,  
-  0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B,  
-  0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24,  
-  0x105EC76F, 0xE235446C, 0xF165B798, 0x030E349B,  
-  0xD7C45070, 0x25AFD373, 0x36FF2087, 0xC494A384,  
-  0x9A879FA0, 0x68EC1CA3, 0x7BBCEF57, 0x89D76C54,  
-  0x5D1D08BF, 0xAF768BBC, 0xBC267848, 0x4E4DFB4B,  
-  0x20BD8EDE, 0xD2D60DDD, 0xC186FE29, 0x33ED7D2A,  
-  0xE72719C1, 0x154C9AC2, 0x061C6936, 0xF477EA35,  
-  0xAA64D611, 0x580F5512, 0x4B5FA6E6, 0xB93425E5,  
-  0x6DFE410E, 0x9F95C20D, 0x8CC531F9, 0x7EAEB2FA,  
-  0x30E349B1, 0xC288CAB2, 0xD1D83946, 0x23B3BA45,  
-  0xF779DEAE, 0x05125DAD, 0x1642AE59, 0xE4292D5A,  
-  0xBA3A117E, 0x4851927D, 0x5B016189, 0xA96AE28A,  
-  0x7DA08661, 0x8FCB0562, 0x9C9BF696, 0x6EF07595,  
-  0x417B1DBC, 0xB3109EBF, 0xA0406D4B, 0x522BEE48,  
-  0x86E18AA3, 0x748A09A0, 0x67DAFA54, 0x95B17957,  
-  0xCBA24573, 0x39C9C670, 0x2A993584, 0xD8F2B687,  
-  0x0C38D26C, 0xFE53516F, 0xED03A29B, 0x1F682198,  
-  0x5125DAD3, 0xA34E59D0, 0xB01EAA24, 0x42752927,  
-  0x96BF4DCC, 0x64D4CECF, 0x77843D3B, 0x85EFBE38,  
-  0xDBFC821C, 0x2997011F, 0x3AC7F2EB, 0xC8AC71E8,  
-  0x1C661503, 0xEE0D9600, 0xFD5D65F4, 0x0F36E6F7,  
-  0x61C69362, 0x93AD1061, 0x80FDE395, 0x72966096,  
-  0xA65C047D, 0x5437877E, 0x4767748A, 0xB50CF789,  
-  0xEB1FCBAD, 0x197448AE, 0x0A24BB5A, 0xF84F3859,  
-  0x2C855CB2, 0xDEEEDFB1, 0xCDBE2C45, 0x3FD5AF46,  
-  0x7198540D, 0x83F3D70E, 0x90A324FA, 0x62C8A7F9,  
-  0xB602C312, 0x44694011, 0x5739B3E5, 0xA55230E6,  
-  0xFB410CC2, 0x092A8FC1, 0x1A7A7C35, 0xE811FF36,  
-  0x3CDB9BDD, 0xCEB018DE, 0xDDE0EB2A, 0x2F8B6829,  
-  0x82F63B78, 0x709DB87B, 0x63CD4B8F, 0x91A6C88C,  
-  0x456CAC67, 0xB7072F64, 0xA457DC90, 0x563C5F93,  
-  0x082F63B7, 0xFA44E0B4, 0xE9141340, 0x1B7F9043,  
-  0xCFB5F4A8, 0x3DDE77AB, 0x2E8E845F, 0xDCE5075C,  
-  0x92A8FC17, 0x60C37F14, 0x73938CE0, 0x81F80FE3,  
-  0x55326B08, 0xA759E80B, 0xB4091BFF, 0x466298FC,  
-  0x1871A4D8, 0xEA1A27DB, 0xF94AD42F, 0x0B21572C,  
-  0xDFEB33C7, 0x2D80B0C4, 0x3ED04330, 0xCCBBC033,  
-  0xA24BB5A6, 0x502036A5, 0x4370C551, 0xB11B4652,  
-  0x65D122B9, 0x97BAA1BA, 0x84EA524E, 0x7681D14D,  
-  0x2892ED69, 0xDAF96E6A, 0xC9A99D9E, 0x3BC21E9D,  
-  0xEF087A76, 0x1D63F975, 0x0E330A81, 0xFC588982,  
-  0xB21572C9, 0x407EF1CA, 0x532E023E, 0xA145813D,  
-  0x758FE5D6, 0x87E466D5, 0x94B49521, 0x66DF1622,  
-  0x38CC2A06, 0xCAA7A905, 0xD9F75AF1, 0x2B9CD9F2,  
-  0xFF56BD19, 0x0D3D3E1A, 0x1E6DCDEE, 0xEC064EED,  
-  0xC38D26C4, 0x31E6A5C7, 0x22B65633, 0xD0DDD530,  
-  0x0417B1DB, 0xF67C32D8, 0xE52CC12C, 0x1747422F,  
-  0x49547E0B, 0xBB3FFD08, 0xA86F0EFC, 0x5A048DFF,  
-  0x8ECEE914, 0x7CA56A17, 0x6FF599E3, 0x9D9E1AE0,  
-  0xD3D3E1AB, 0x21B862A8, 0x32E8915C, 0xC083125F,  
-  0x144976B4, 0xE622F5B7, 0xF5720643, 0x07198540,  
-  0x590AB964, 0xAB613A67, 0xB831C993, 0x4A5A4A90,  
-  0x9E902E7B, 0x6CFBAD78, 0x7FAB5E8C, 0x8DC0DD8F,  
-  0xE330A81A, 0x115B2B19, 0x020BD8ED, 0xF0605BEE,  
-  0x24AA3F05, 0xD6C1BC06, 0xC5914FF2, 0x37FACCF1,  
-  0x69E9F0D5, 0x9B8273D6, 0x88D28022, 0x7AB90321,  
-  0xAE7367CA, 0x5C18E4C9, 0x4F48173D, 0xBD23943E,  
-  0xF36E6F75, 0x0105EC76, 0x12551F82, 0xE03E9C81,  
-  0x34F4F86A, 0xC69F7B69, 0xD5CF889D, 0x27A40B9E,  
-  0x79B737BA, 0x8BDCB4B9, 0x988C474D, 0x6AE7C44E,  
-  0xBE2DA0A5, 0x4C4623A6, 0x5F16D052, 0xAD7D5351  
-}; 
-
-static inline unsigned long CRC8 (unsigned long crc,
-                                  unsigned char d)
-{
-    return ((crc >> 8) ^ crc32c_table[(crc ^ d) & 0xFF]);
-}
-static inline unsigned long CRC16 (unsigned long crc,
-                                   unsigned short d)
-{
-    crc = CRC8 (crc, d & 0xff);
-    d = d >> 8;
-    crc = CRC8 (crc, d & 0xff);
-    return crc;
-}
-
-
-static unsigned long
-crc_eliding_c_comments (const char *buf, unsigned long crc)
-{
-    const char *p;
-    enum { cOTHER,              /*  */
-           cSTRING,             /* "...    */
-           cSBACKSLASH,         /* "...\   */
-           cCHAR,               /* '...    */
-           cCBACKSLASH,         /* '...\   */
-           cSLASH,              /* /       */
-           cSLASH_SLASH,        /* //...   */
-           cSLASH_STAR,         /* / *...  */
-           cSTAR                /* / *...* */
-    } ss = cOTHER;
-
-    for (p = buf; ;) {
-        unsigned char c = *p++;
-
-        switch (c) {
-        case 0:
-            switch (ss) {
-            case cOTHER:
-                return (crc);
-            case cSTRING: case cSBACKSLASH:
-            case cCHAR: case cCBACKSLASH:
-            case cSLASH: case cSLASH_SLASH: case cSLASH_STAR: case cSTAR:
-                fprintf (stderr, "Inopportune EOF: %s\n", buf);
-                exit (1);
-            }
-            break;
-        case '\"':
-            switch (ss) {
-            case cOTHER: ss = cSTRING; break; /* start string */
-            case cSTRING: ss = cOTHER; break; /* end string */
-            case cSBACKSLASH: ss = cSTRING; break;
-            case cCHAR: break;
-            case cCBACKSLASH: ss = cCHAR; break;
-            case cSLASH: crc = CRC8 (crc, '/'); ss = cOTHER; break;
-            case cSLASH_SLASH: continue; /* in comment */
-            case cSLASH_STAR: continue; /* in comment */
-            case cSTAR: ss = cSLASH_STAR; continue; /* in comment */
-            }
-            break;
-        case '\\':
-            switch (ss) {
-            case cOTHER: break;
-            case cSTRING: ss = cSBACKSLASH; break;
-            case cSBACKSLASH: ss = cSTRING; break;
-            case cCHAR: ss = cCBACKSLASH; break;
-            case cCBACKSLASH: ss = cCHAR; break;
-            case cSLASH: crc = CRC8 (crc, '/'); ; ss = cOTHER; break;
-            case cSLASH_SLASH: continue; /* in comment */
-            case cSLASH_STAR: continue; /* in comment */
-            case cSTAR: ss = cSLASH_STAR; continue; /* in comment */
-            }
-            break;
-        case '/':
-            switch (ss) {
-            case cOTHER: ss = cSLASH; continue; /* potential comment */
-            case cSTRING: break;
-            case cSBACKSLASH: ss = cSTRING; break;
-            case cCHAR: break;
-            case cCBACKSLASH: ss = cCHAR; break;
-            case cSLASH: ss = cSLASH_SLASH; continue; /* start comment */
-            case cSLASH_SLASH: continue; /* in comment */
-            case cSLASH_STAR: continue; /* in comment */
-            case cSTAR: ss = cOTHER; continue; /* end of comment */
-            }
-            break;
-        case '*':
-            switch (ss) {
-            case cOTHER: break;
-            case cSTRING: break;
-            case cSBACKSLASH: ss = cSTRING; break;
-            case cCHAR: break;
-            case cCBACKSLASH: ss = cCHAR; break;
-            case cSLASH: ss = cSLASH_STAR; continue; /* start comment */
-            case cSLASH_SLASH: continue; /* in comment */
-            case cSLASH_STAR: ss = cSTAR; continue; /* potential end */
-            case cSTAR: continue; /* still potential end of comment */
-            }
-            break;
-        case '\n': case '\r': case ' ': case '\t': case '\014':
-            switch (ss) {
-            case cOTHER: continue; /* ignore all whitespace */
-            case cSTRING: break;
-            case cSBACKSLASH: ss = cSTRING; break;
-            case cCHAR: break;
-            case cCBACKSLASH: ss = cCHAR; break;
-            case cSLASH: c = '/'; ss = cOTHER; break;
-            case cSLASH_SLASH:
-                if (c == '\n' || c == '\r') ss = cOTHER; /* end comment */
-                continue;
-            case cSLASH_STAR: continue; /* in comment */
-            case cSTAR: ss = cSLASH_STAR; continue; /* in comment */
-            }
-        default:
-            switch (ss) {
-            case cOTHER: break;
-            case cSTRING: break;
-            case cSBACKSLASH: ss = cSTRING; break;
-            case cCHAR: break;
-            case cCBACKSLASH: ss = cCHAR; break;
-            case cSLASH: crc = CRC8 (crc, '/'); ss = cOTHER; break;
-            case cSLASH_SLASH: continue; /* in comment */
-            case cSLASH_STAR: continue; /* in comment */
-            case cSTAR: ss = cSLASH_STAR; continue; /* in comment */
-            }
-        }
-        crc = CRC8 (crc, c);
-    }
-}
-
-/*
- * main 
- */
-int main (int argc, char **argv)
-{
-    int curarg = 1;
-    char *ofile=0;
-    char *pythonfile=0;
-    char *jsonfile=0;
-    char *show_name=0;
-
-    while (curarg < argc) {
-        if (!strncmp (argv [curarg], "--verbose", 3)) {
-            fprintf (stderr, "%s version %s\n", argv [0], version);
-            curarg++;
-            continue;
-        }
-        
-        if (!strncmp (argv [curarg], "--yydebug", 3)) {
-            yydebug = 1;
-            curarg++;
-            continue;
-        }
-        
-        if (!strncmp (argv [curarg], "--dump", 3)) {
-            dump_tree = 1;
-            curarg++;
-            continue;
-        }
-        
-        if (!strncmp (argv[curarg], "--show-name", 3)) {
-            curarg++;
-            if (curarg < argc) {
-                show_name = argv[curarg];
-                curarg++;
-                continue;
-            } else {
-                fprintf(stderr, "Missing filename after --show-name \n");
-                exit(1);
-            }
-        }
-
-        if (!strncmp (argv [curarg], "--input", 3)) {
-            curarg++;
-            if (curarg < argc) {
-                input_filename = argv[curarg];
-                if (!strcmp (argv [curarg], "-"))
-                    ifp = stdin;
-                else
-                    ifp = fopen (argv [curarg], "r");
-                if (ifp == NULL) {
-                    fprintf (stderr, "Couldn't open input file %s\n", 
-                             argv[curarg]);
-                    exit (1);
-                }
-                curarg++;
-            } else {
-                fprintf(stderr, "Missing filename after --input\n");
-                exit(1);
-            }
-            continue;
-        }
-        if (!strncmp (argv [curarg], "--output", 3)) {
-            curarg++;
-            if (curarg < argc) {
-                ofp = fopen (argv[curarg], "w");
-                if (ofp == NULL) {
-                    fprintf (stderr, "Couldn't open output file %s\n", 
-                         argv[curarg]);
-                    exit (1);
-                }
-                ofile = argv[curarg];
-                curarg++;
-            } else {
-                fprintf(stderr, "Missing filename after --output\n");
-                exit(1);
-            }
-            continue;
-        }
-        if (!strncmp (argv [curarg], "--python", 8)) {
-            curarg++;
-            if (curarg < argc) {
-	        if (!strcmp(argv[curarg], "-")) {
-		    pythonfp = stdout;
-		} else {
-		    pythonfp = fopen(argv[curarg], "w");
-		    pythonfile = argv[curarg];
-		}
-                if (pythonfp == NULL) {
-                    fprintf (stderr, "Couldn't open python output file %s\n",
-                         argv[curarg]);
-                    exit (1);
-                }
-                curarg++;
-            } else {
-                fprintf(stderr, "Missing filename after --python\n");
-                exit(1);
-            }
-            continue;
-        }
-        if (!strncmp (argv [curarg], "--json", 6)) {
-            curarg++;
-            if (curarg < argc) {
-	        if (!strcmp(argv[curarg], "-")) {
-		    jsonfp = stdout;
-		} else {
-		    jsonfp = fopen(argv[curarg], "w");
-		    jsonfile = argv[curarg];
-		}
-                if (jsonfp == NULL) {
-                    fprintf (stderr, "Couldn't open JSON output file %s\n",
-                         argv[curarg]);
-                    exit (1);
-                }
-                curarg++;
-            } else {
-                fprintf(stderr, "Missing filename after --json\n");
-                exit(1);
-            }
-            continue;
-        }
-        if (!strncmp (argv [curarg], "--app", 4)) {
-            curarg++;
-            if (curarg < argc) {
-                vlib_app_name = argv[curarg];
-                curarg++;
-            } else {
-                fprintf(stderr, "Missing app name after --app\n");
-                exit(1);
-            }
-            continue;
-        }
-
-        usage(argv[0]);
-        exit (1);
-    }
-    if (ofp == NULL) {
-        ofile = 0;
-    }
-    if (pythonfp == NULL) {
-        pythonfile = 0;
-    }
-    if (jsonfp == NULL) {
-        jsonfile = 0;
-    }
-    if (ifp == NULL) {
-        fprintf(stderr, "No input file specified...\n");
-        exit(1);
-    }
-    if (show_name) {
-        input_filename = show_name;
-    }
-
-    starttime = time (0);
-
-    if (yyparse() == 0) {
-        fclose (ifp);
-        curarg -= 2;
-        if (ofile) {
-            printf ("Output written to %s\n", ofile);
-            fclose (ofp);
-        }
-        if (pythonfile) {
-            printf ("Python bindings written to %s\n", pythonfile);
-            fclose (pythonfp);
-        }
-        if (jsonfile) {
-            printf ("JSON bindings written to %s\n", jsonfile);
-            fclose (jsonfp);
-        }
-    }
-    else {
-        fclose (ifp);
-        if (ofp)
-            fclose (ofp);
-        if (ofile) {
-            printf ("Removing %s\n", ofile);
-            unlink (ofile);
-        }
-        if (pythonfile) {
-            printf ("Removing %s\n", pythonfile);
-            unlink (pythonfile);
-        }
-        if (jsonfile) {
-            printf ("Removing %s\n", jsonfile);
-            unlink (jsonfile);
-        }
-        exit (1);
-    }
-    exit (0);
-}
-
-/*
- * usage
- */
-static void usage (char *progname)
-{
-    fprintf (stderr, 
-             "usage: %s --input <filename> [--output <filename>] "
-	     "[--json <filename>] [--python <filename>]\n%s",
-             progname,
-             "          [--yydebug] [--dump-tree]\n");
-    exit (1);
-}
-
-/*
- * yyerror 
- */
-void yyerror (char *s)
-{
-    fprintf (stderr, "%s:%d %s\n", current_filename, the_lexer_linenumber, s);
-}
-
-static char namebuf [MAXNAME];
-
-static inline char
-getc_char (FILE *ifp)
-{
-    return ((char)(getc(ifp) & 0x7f));
-}
-
-/*
- * yylex (well, yylex_1: The real yylex below does crc-hackery)
- */
-static int yylex_1 (void)
-{
-    int nameidx=0;
-    char c;
-    enum { LP_INITIAL_WHITESPACE, LP_LINE_NUMBER,
-	   LP_PRE_FILENAME_WHITESPACE, LP_FILENAME,
-	   LP_POST_FILENAME,
-	   LP_OTHER
-    } lp_substate = LP_INITIAL_WHITESPACE;
-
- again:
-    switch (the_lexer_state) {
-        /*
-         * START state -- looking for something interesting 
-         */
-    case START_STATE:
-        c = getc_char (ifp);
-        if (feof (ifp))
-            return (EOF);
-
-        switch (c) {
-        case '\n':
-            the_lexer_linenumber++;
-            goto again;
-
-        case '#':
-            the_lexer_state = LINE_PRAGMA_STATE;
-            lp_substate = LP_INITIAL_WHITESPACE;
-            goto again;
-
-            /* FALLTHROUGH */
-        case '\t':
-        case ' ':
-            goto again;
-            
-        case '(':
-            return (LPAR);
-
-        case ')':
-            return (RPAR);
-
-        case ';':
-            return (SEMI);
-
-        case '[':
-            return (LBRACK);
-            
-        case ']':
-            return (RBRACK);
-
-        case '{':
-            return (LCURLY);
-            
-        case '}':
-            return (RCURLY);
-
-        case ',':
-            return (COMMA);
-
-        case '"':
-            nameidx = 0;
-            the_lexer_state = STRING_STATE;
-            goto again;
-
-        case '@':
-            nameidx = 0;
-            the_lexer_state = HELPER_STATE;
-            goto again;
-
-        case '/':
-            c = getc_char (ifp);
-            if (feof (ifp))
-                return (EOF);
-
-            if (c == '/') {
-                the_lexer_state = CPP_COMMENT_STATE;
-                goto again;
-            } else if (c == '*') {
-                the_lexer_state = C_COMMENT_STATE;
-                goto again;
-            } else {
-                fprintf (stderr, "unknown token /%c at line %d\n",
-                         c, the_lexer_linenumber);
-                return (BARF);
-            }
-
-        case '\\':
-            c = getc_char (ifp);
-            if (feof (ifp))
-                return (EOF);
-            
-            /* Note fallthrough... */
-
-        default:
-            if (isalpha (c) || c == '_') {
-                namebuf [0] = c;
-                nameidx = 1;
-                the_lexer_state = NAME_STATE;
-                goto again;
-            } else if (isdigit(c)) {
-                namebuf [0] = c;
-                nameidx = 1;
-                the_lexer_state = NUMBER_STATE;
-                goto again;
-            }
-
-            fprintf (stderr, "unknown token %c at line %d\n",
-                     c, the_lexer_linenumber);
-            return (BARF);
-        }
-
-        /*
-         * NAME state -- eat the rest of a name 
-         */
-    case NAME_STATE:
-        c = getc_char (ifp);
-        if (feof (ifp))
-            return (EOF);
-        
-        if (!isalnum (c) && c != '_') {
-            ungetc (c, ifp);
-            namebuf [nameidx] = 0;
-            the_lexer_state = START_STATE;
-            return (name_check (namebuf, &yylval));
-        }                
-        if (nameidx >= (MAXNAME-1)) {
-            fprintf(stderr, "lex input buffer overflow...\n");
-            exit(1);
-        }
-        namebuf [nameidx++] = c;
-        goto again;
-        
-        /*
-         * NUMBER state -- eat the rest of a number
-         */
-    case NUMBER_STATE:
-        c = getc_char (ifp);
-        if (feof (ifp))
-            return (EOF);
-        
-        if (!isdigit (c)) {
-            ungetc (c, ifp);
-            namebuf [nameidx] = 0;
-            the_lexer_state = START_STATE;
-            yylval = (void *) atol(namebuf);
-            return (NUMBER);
-        }                
-        if (nameidx >= (MAXNAME-1)) {
-            fprintf(stderr, "lex input buffer overflow...\n");
-            exit(1);
-        }
-        namebuf [nameidx++] = c;
-        goto again;
-
-        /*
-         * C_COMMENT state -- eat a peach
-         */
-    case C_COMMENT_STATE:
-        c = getc_char (ifp);
-        if (feof (ifp))
-            return (EOF);
-        if (c == '*') {
-            c = getc_char (ifp);
-            if (feof (ifp))
-                return (EOF);
-            if (c == '/') {
-                the_lexer_state = START_STATE;
-                goto again;
-            }
-        }
-        if (c == '\n')
-            the_lexer_linenumber++;
-        goto again;
-            
-        /*
-         * CPP_COMMENT state -- eat a plum 
-         */
-
-    case CPP_COMMENT_STATE:
-        c = getc_char (ifp);
-        if (feof (ifp))
-            return (EOF);
-        if (c == '\n') {
-            the_lexer_linenumber++;
-            the_lexer_state = START_STATE;
-            goto again;
-        }
-        goto again;
-
-    case STRING_STATE:
-        c = getc_char (ifp);
-        if (feof (ifp))
-            return (EOF);
-        switch (c) {
-        case '\\':
-            c = getc_char (ifp);
-            if (feof (ifp))
-                return (EOF);
-            namebuf[nameidx++] = c;
-            goto again;
-
-        case '"':
-            namebuf[nameidx] = 0;
-            yylval = (YYSTYPE) sxerox (namebuf);
-            the_lexer_state = START_STATE;
-            return (STRING);
-
-        default:
-            if (c == '\n')
-                the_lexer_linenumber++;
-
-            if (nameidx >= (MAXNAME-1)) {
-                fprintf(stderr, "lex input buffer overflow...\n");
-                exit(1);
-            }
-            namebuf[nameidx++] = c;
-            goto again;
-        }
-        break;
-
-    case HELPER_STATE:
-        c = getc_char (ifp);
-        if (feof (ifp))
-            return (EOF);
-        switch (c) {
-        case '\\':
-            c = getc_char (ifp);
-            if (feof (ifp))
-                return (EOF);
-            namebuf[nameidx] = c;
-            goto again;
-
-        case '@':
-            namebuf[nameidx] = 0;
-            yylval = (YYSTYPE) sxerox (namebuf);
-            the_lexer_state = START_STATE;
-            return (HELPER_STRING);
-
-        default:
-            if (c == '\n')
-                the_lexer_linenumber++;
-
-            /*
-             * CPP makes it approximately impossible to 
-             * type "#define FOO 123", so we provide a 
-             * lexical trick to achieve that result 
-             */
-
-            if (c == '$')
-                c = '#';
-
-            if (nameidx >= (MAXNAME-1)) {
-                fprintf(stderr, "lex input buffer overflow...\n");
-                exit(1);
-            }
-            namebuf[nameidx++] = c;
-            goto again;
-        }
-        break;
-
-    case LINE_PRAGMA_STATE:
-	/* We're only interested in lines of the form # 259 "foo.c" 17 */
-
-        switch (lp_substate) {
-
-        case LP_INITIAL_WHITESPACE: /* no number seen yet */
-            c = getc_char(ifp);
-            if (feof(ifp))
-                return(EOF);
-            if (c >= '0' && c <= '9') {
-                namebuf[nameidx++] = c;
-                lp_substate = LP_LINE_NUMBER;
-            } else if (c == '\n') {
-		goto lp_end_of_line;
-	    } else if (c != ' ' && c != '\t') {
-		/* Nothing */
-	    } else {
-		lp_substate = LP_OTHER;
-	    }
-	    goto again;
-
-        case LP_LINE_NUMBER:	/* eating linenumber */
-            c = getc_char(ifp);
-            if (feof(ifp))
-                return(EOF);
-            if (c >= '0' && c <= '9') {
-                namebuf[nameidx++] = c;
-	    } else if (c == ' ' || c == '\t') {
-                namebuf[nameidx++] = 0;
-                the_lexer_linenumber = atol(namebuf);
-                lp_substate = LP_PRE_FILENAME_WHITESPACE;
-            } else if (c == '\n') {
-		goto lp_end_of_line;
-            } else {
-		lp_substate = LP_OTHER;
-	    }
-            goto again;
-
-        case LP_PRE_FILENAME_WHITESPACE: /* awaiting filename */
-            c = getc_char(ifp);
-            if (feof(ifp))
-                return(EOF);
-            
-            if (c == '"') {
-                lp_substate = LP_FILENAME;
-                nameidx = 0;
-            } else if (c == ' ' || c == '\t') {
-		/* nothing */
-	    } else if (c == '\n') {
-		goto lp_end_of_line;
-	    } else {
-		lp_substate = LP_OTHER;
-	    }
-            goto again;
-
-        case LP_FILENAME:	/* eating filename */
-            c = getc_char(ifp);
-            if (feof(ifp))
-                return(EOF);
-
-            if (c == '"') {
-                lp_substate = LP_POST_FILENAME;
-                namebuf[nameidx] = 0;
-            } else if (c == '\n') {
-		goto lp_end_of_line; /* syntax error... */
-	    } else {
-                namebuf[nameidx++] = c;
-            }
-            goto again;
-
-        case LP_POST_FILENAME:	/* ignoring rest of line */
-        case LP_OTHER:
-            c = getc_char(ifp);
-            if (feof(ifp))
-                return(EOF);
-
-            if (c == '\n') {
-	        if (lp_substate == LP_POST_FILENAME) {
-		    if (current_filename_allocated) {
-			current_filename_allocated = 0;
-			free(current_filename);
-		    }
-
-		    if (!strcmp(namebuf, "<stdin>")) {
-			current_filename = input_filename;
-		    } else {
-			current_filename = sxerox(namebuf);
-			current_filename_allocated = 1;
-		    }
-		}
-	    lp_end_of_line:
-                the_lexer_state = START_STATE;
-                nameidx = 0;
-            }
-            goto again;
-        }
-        break;
-    }
-    fprintf (stderr, "LEXER BUG!\n");
-    exit (1);
-    /* NOTREACHED */
-    return (0);
-}
-
-/*
- * Parse a token and side-effect input_crc
- * in a whitespace- and comment-insensitive fashion.
- */
-int yylex (void)
-{
-    /*
-     * Accumulate a crc32-based signature while processing the
-     * input file.  The goal is to come up with a magic number
-     * which changes precisely when the original input file changes
-     * but which ignores whitespace changes.
-     */
-    unsigned long crc = input_crc;
-    int node_type = yylex_1 ();
-    unsigned long crc2 = message_crc;
-    int use_helper_string = 0;
-    unsigned short code;
-
-    switch (node_type) {
-    case PRIMTYPE:
-    case NAME:
-    case NUMBER:
-    case STRING:
-    case HELPER_STRING: 
-        use_helper_string = 1;
-        break;
-
-     /* Other node types have no "substate" */
-     /* This code is written in this curious fashion because we
-      * want the generated CRC to be independent of the particular
-      * values a particular version of lex/bison assigned to various states.
-      */
-
-    case RPAR:               code = 258; break;
-    case LPAR:               code = 259; break;
-    case SEMI:               code = 260; break;
-    case LBRACK:             code = 261; break;
-    case RBRACK:             code = 262; break;
-    case BARF:               code = 265; break;
-    case TPACKED:            code = 266; break;
-    case DEFINE:             code = 267; break;
-    case LCURLY:             code = 268; break;
-    case RCURLY:             code = 269; break;
-    case UNION:              code = 271; break;
-    case COMMA:              code = 273; break;
-    case NOVERSION:          code = 274; break;
-    case MANUAL_PRINT:       code = 275; break;
-    case MANUAL_ENDIAN:      code = 276; break;
-    case TYPEONLY:           code = 278; break;
-    case DONT_TRACE:         code = 279; break;
-        
-    case EOF: code = ~0; break; /* hysterical compatibility */
-
-    default:
-        fprintf(stderr, "yylex: node_type %d missing state CRC cookie\n",
-                node_type);
-        exit(1);
-    }
-
-    if (use_helper_string)
-    {
-        /* We know these types accumulated token text into namebuf */
-        /* HELPER_STRING may still contain C comments.  Argh. */
-        crc = crc_eliding_c_comments (namebuf, crc);
-        crc2 = crc_eliding_c_comments (namebuf, crc2);
-    } else
-    {
-        crc = CRC16 (crc, code);
-        crc2 = CRC16 (crc2, code);
-    }
-
-    input_crc = crc;
-    message_crc = crc2;
-    return (node_type);
-}
-
-/*
- * name_check -- see if the name we just ate
- * matches a known keyword.  If so, set yylval
- * to a new instance of <subclass of node>, and return PARSER_MACRO
- *
- * Otherwise, set yylval to sxerox (s) and return NAME
- */
-
-static struct keytab {
-    char *name;
-    enum node_subclass subclass_id;
-} keytab [] = 
-/* Keep the table sorted, binary search used below! */
-{
-    {"define",          NODE_DEFINE},  
-    {"dont_trace",      NODE_DONT_TRACE},
-    {"f64",             NODE_F64},
-    {"i16",             NODE_I16},
-    {"i32",             NODE_I32},
-    {"i64",             NODE_I64},
-    {"i8",              NODE_I8},
-    {"manual_endian",   NODE_MANUAL_ENDIAN},
-    {"manual_print",    NODE_MANUAL_PRINT},
-    {"noversion",       NODE_NOVERSION},
-    {"packed",          NODE_PACKED},
-    {"typeonly",        NODE_TYPEONLY},
-    {"u16", 	        NODE_U16},
-    {"u32",		NODE_U32},
-    {"u64",             NODE_U64},
-    {"u8", 		NODE_U8},
-    {"union",           NODE_UNION},
-    {"uword",           NODE_UWORD},
-};
- 
-static int name_check (const char *s, YYSTYPE *token_value)
-{
-    enum node_subclass subclass_id;
-    int top, bot, mid;
-    int result;
-
-    for (top = 0, bot = (sizeof(keytab) / sizeof(struct keytab))-1; 
-         bot >= top; ) {
-        mid = (top + bot) / 2;
-        result = name_compare (s, keytab[mid].name);
-        if (result < 0)
-            bot = mid - 1;
-        else if (result > 0)
-            top = mid + 1;
-        else {
-            subclass_id = keytab[mid].subclass_id;
-
-            switch (subclass_id) {
-            case NODE_U8:
-            case NODE_U16:
-            case NODE_U32:
-            case NODE_U64:
-            case NODE_I8:
-            case NODE_I16:
-            case NODE_I32:
-            case NODE_I64:
-            case NODE_F64:
-            case NODE_UWORD:
-                *token_value = make_node(subclass_id);
-                return (PRIMTYPE);
-
-            case NODE_PACKED:
-                *token_value = make_node(subclass_id);
-                return (TPACKED);
-
-            case NODE_DEFINE:
-                message_crc = 0;
-                *token_value = make_node(subclass_id);
-                return(DEFINE);
-
-            case NODE_MANUAL_PRINT:
-                *token_value = (YYSTYPE) NODE_FLAG_MANUAL_PRINT;
-                return (MANUAL_PRINT);
-
-            case NODE_MANUAL_ENDIAN:
-                *token_value = (YYSTYPE) NODE_FLAG_MANUAL_ENDIAN;
-                return (MANUAL_ENDIAN);
-
-            case NODE_TYPEONLY:
-                *token_value = (YYSTYPE) NODE_FLAG_TYPEONLY;
-                return(TYPEONLY);
-
-            case NODE_DONT_TRACE:
-                *token_value = (YYSTYPE) NODE_FLAG_DONT_TRACE;
-                return(DONT_TRACE);
-
-            case NODE_NOVERSION:
-                return(NOVERSION);
-
-            case NODE_UNION:
-                return(UNION);
-
-            default:
-                fprintf (stderr, "fatal: keytab botch!\n");
-                exit (1);
-            }
-        }
-    }
-    *token_value = (YYSTYPE) sxerox (s);
-    return (NAME);
-}
-
-/*
- * sxerox
- */
-
-char *sxerox (const char *s)
-{
-    int len = strlen (s);
-    char *rv;
-
-    rv = (char *) malloc (len+1);
-    if (rv == 0) {
-        fprintf(stderr, "Out of memory...");
-        exit (1);
-    }
-        
-    strcpy (rv, s);
-    return (rv);
-}
-
-/*
- * name_compare
- */
-
-int name_compare (const char *s1, const char *s2)
-{
-    char c1, c2;
-
-    while (*s1 && *s2) {
-        c1 = *s1++;
-        c2 = *s2++;
-
-        c1 = tolower (c1);
-        c2 = tolower (c2);
-        if (c1 < c2)
-            return (-1);
-        else if (c1 > c2)
-            return (1);
-    }
-    if (*s1 < *s2)
-        return (-1);
-    else if (*s1 > *s2)
-        return (1);
-    return (0);
-}
diff --git a/vppapigen/lex.h b/vppapigen/lex.h
deleted file mode 100644
index e9b0954c..00000000
--- a/vppapigen/lex.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *------------------------------------------------------------------
- * lex.h - definitions for the api generator's lexical
- * analyzer.
- *
- * Copyright (c) 1996-2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#ifndef _LEX_H_
-#define _LEX_H_ 1
-
-extern int yylex (void);
-extern void yyerror (char *);
-extern int yyparse (void);
-
-#ifndef YYSTYPE
-#define YYSTYPE void *
-#endif
-
-#include "gram.h"
-
-enum lex_state {
-    START_STATE = 1,
-    NAME_STATE,
-    NUMBER_STATE,
-    C_COMMENT_STATE,
-    CPP_COMMENT_STATE,
-    STRING_STATE,
-    HELPER_STATE,
-    LINE_PRAGMA_STATE,
-};
-
-#define MAXNAME 64000
-
-extern unsigned long input_crc;
-extern unsigned long message_crc;
-
-#endif /* _LEX_H_ */
diff --git a/vppapigen/node.c b/vppapigen/node.c
deleted file mode 100644
index abb909a1..00000000
--- a/vppapigen/node.c
+++ /dev/null
@@ -1,1531 +0,0 @@
-/* 
- *------------------------------------------------------------------
- * node.c - the api generator's semantic back-end
- *
- * Copyright (c) 2004-2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <ctype.h>
-#include <time.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-
-#include "lex.h"
-#include "node.h"
-
-#define YYSTYPE void *
-
-FILE *ofp;
-FILE *pythonfp;
-FILE *jsonfp;
-time_t starttime;
-char *vlib_app_name;
-char *input_filename;
-node_vft_t *the_vft[NODE_N_TYPES];
-static int indent;
-static int dont_output_version;
-int dump_tree;
-static char *fixed_name;
-static char tmpbuf [MAXNAME];
-static char *current_def_name;
-static char *current_union_name;
-static char *current_type_fmt;
-static char *current_type_cast;
-static char current_id;
-static char current_is_complex;
-static char *current_endianfun;
-static char *current_type_name;
-
-void indent_me(FILE *ofp)
-{
-    int i;
-
-    for (i = 0; i < indent; i++)
-        putc(' ', ofp);
-}
-
-char *uppercase (char *s)
-{
-    char *cp;
-
-    cp = tmpbuf;
-
-    while (*s && (cp < tmpbuf + (sizeof(tmpbuf)-1))) {
-        if (*s >= 'a' && *s <= 'z')
-            *cp++ = *s++ - ('a' - 'A');
-        else
-            *cp++ = *s++;
-    }
-    *cp = 0;
-    return(tmpbuf);
-}
-
-char *lowercase (char *s)
-{
-    char *cp;
-
-    cp = tmpbuf;
-
-    while (*s && (cp < tmpbuf + (sizeof(tmpbuf)-1))) {
-        if (*s >= 'A' && *s <= 'Z')
-            *cp++ = *s++ + ('a' - 'A');
-        else
-            *cp++ = *s++;
-    }
-    *cp = 0;
-    return(tmpbuf);
-}
-
-void primtype_recursive_print(node_t *this, i8 *fmt)
-{
-    fputs((char *)fmt, stdout);
-
-    if (this->deeper) {
-        node_vft_t *vftp = the_vft[this->deeper->type];
-        vftp->print(this->deeper);
-    }
-}
-
-void primtype_recursive_generate(node_t *this, enum passid which, FILE *ofp,
-                                 i8 *type_name, i8 *type_fmt, i8 *type_cast)
-{
-    node_vft_t *vftp;
-
-    current_type_name = (char *)type_name;
-    current_type_cast = (char *)type_cast;
-
-    switch(which) {
-    case TYPEDEF_PASS:
-        fputs((char *)type_name, ofp);
-        fputs(" ", ofp);
-        break;
-
-    case PRINTFUN_PASS:
-        current_type_fmt = (char *)type_fmt;
-        break;
-
-    case ENDIANFUN_PASS:
-        vftp = the_vft[this->type];
-        current_endianfun = vftp->endian_converter;
-        break;
-
-    case PYTHON_PASS:
-        fputs("('", pythonfp);
-        fputs((char *)type_name, pythonfp);
-        fputs("', ", pythonfp);
-        break;
-
-    case JSON_PASS:
-        fputs("[\"", jsonfp);
-        fputs((char *)type_name, jsonfp);
-        fputs("\", ", jsonfp);
-        break;
-
-    default:
-        fprintf(stderr, "primtype_recursive_generate: unimp pass %d\n", which);
-        break;
-    }
-
-    if (this->deeper) {
-        vftp = the_vft[this->deeper->type];
-        vftp->generate(this->deeper, which, ofp);
-    }
-}
-
-void node_illegal_print (node_t *this)
-{
-    fprintf(stderr, "node_illegal_print called\n");
-    exit(0);
-}
-
-void node_illegal_generate (node_t *this, enum passid notused, FILE *ofp)
-{
-    fprintf(stderr, "node_illegal_generate called\n");
-    exit(0);
-}
-
-node_vft_t node_illegal_vft = {
-    node_illegal_print,
-    node_illegal_generate,
-    "illegal"
-};
-
-void node_u8_print (node_t *this)
-{
-    primtype_recursive_print(this, "u8 ");
-}
-
-void node_u8_generate (node_t *this, enum passid which, FILE *ofp)
-{
-    primtype_recursive_generate(this, which, ofp, "u8", "%u", "(unsigned)");
-}
-
-node_vft_t node_u8_vft = {
-    node_u8_print,
-    node_u8_generate,
-    NULL
-};
-
-void node_u16_print (node_t *this)
-{
-    primtype_recursive_print(this, "u16 ");
-}
-
-void node_u16_generate (node_t *this, enum passid which, FILE *ofp)
-{
-    primtype_recursive_generate(this, which, ofp, "u16", "%u", "(unsigned)");
-}
-
-node_vft_t node_u16_vft = {
-    node_u16_print,
-    node_u16_generate,
-    "clib_net_to_host_u16"
-};
-
-void node_u32_print (node_t *this)
-{
-    primtype_recursive_print(this, "u32 ");
-}
-
-void node_u32_generate (node_t *this, enum passid which, FILE *ofp)
-{
-    primtype_recursive_generate(this, which, ofp, "u32", "%u", "(unsigned)");
-}
-
-node_vft_t node_u32_vft = {
-    node_u32_print,
-    node_u32_generate,
-    "clib_net_to_host_u32",
-};
-
-void node_u64_print (node_t *this)
-{
-    primtype_recursive_print(this, "u64 ");
-}
-
-void node_u64_generate (node_t *this, enum passid which, FILE *ofp)
-{
-    primtype_recursive_generate(this, which, ofp, "u64", "%llu", 
-                                "(long long)");
-}
-
-node_vft_t node_u64_vft = {
-    node_u64_print,
-    node_u64_generate,
-    "clib_net_to_host_u64"
-};
-
-void node_i8_print (node_t *this)
-{
-    primtype_recursive_print(this, "i8 ");
-}
-
-void node_i8_generate (node_t *this, enum passid which, FILE *ofp)
-{
-    primtype_recursive_generate(this, which, ofp, "i8", "%d", "(int)");
-}
-
-node_vft_t node_i8_vft = {
-    node_i8_print,
-    node_i8_generate,
-    ""
-};
-
-void node_i16_print (node_t *this)
-{
-    primtype_recursive_print(this, "i16 ");
-}
-
-void node_i16_generate (node_t *this, enum passid which, FILE *ofp)
-{
-    primtype_recursive_generate(this, which, ofp, "i16", "%d", "(int)");
-}
-
-node_vft_t node_i16_vft = {
-    node_i16_print,
-    node_i16_generate,
-    "clib_net_to_host_u16"
-};
-
-void node_i32_print (node_t *this)
-{
-    primtype_recursive_print(this, "i32 ");
-}
-
-void node_i32_generate (node_t *this, enum passid which, FILE *ofp)
-{
-    primtype_recursive_generate(this, which, ofp, "i32", "%ld", "(long)");
-}
-
-node_vft_t node_i32_vft = {
-    node_i32_print,
-    node_i32_generate,
-    "clib_net_to_host_u32"
-};
-
-void node_i64_print (node_t *this)
-{
-    primtype_recursive_print(this, "i64 ");
-}
-
-void node_i64_generate (node_t *this, enum passid which, FILE *ofp)
-{
-    primtype_recursive_generate(this, which, ofp, "i64", "%lld", 
-                                "(long long)");
-}
-
-node_vft_t node_i64_vft = {
-    node_i64_print,
-    node_i64_generate,
-    "clib_net_to_host_u64"
-};
-
-void node_f64_print (node_t *this)
-{
-    primtype_recursive_print(this, "f64 ");
-}
-
-void node_f64_generate (node_t *this, enum passid which, FILE *ofp)
-{
-    primtype_recursive_generate(this, which, ofp, "f64", "%.2f", 
-                                "(double)");
-}
-
-node_vft_t node_f64_vft = {
-    node_f64_print,
-    node_f64_generate,
-    " ",                        /* FP numbers are sent in host byte order */
-};
-
-
-void node_packed_print (node_t *this)
-{
-    primtype_recursive_print (this, "packed ");
-}
-
-void node_packed_generate (node_t *this, enum passid which, FILE *ofp)
-{
-    primtype_recursive_generate(this, which, ofp, "PACKED", "", "");
-}
-
-node_vft_t node_packed_vft = {
-    node_packed_print,
-    node_packed_generate,
-    0,
-};
-
-void node_define_print (node_t *this)
-{
-    fprintf(stdout, "define %s {\n", CDATA0);
-    if (this->deeper) {
-        node_vft_t *vftp = the_vft[this->deeper->type];
-        fprintf(stdout, "    ");
-        vftp->print(this->deeper);
-    }
-    fprintf(stdout, "};\n");
-}
-
-void node_define_generate (node_t *this, enum passid which, FILE *fp)
-{
-    node_t *child, *save_child;
-
-    switch(which) {
-    case TYPEDEF_PASS:
-        fprintf(fp, "typedef VL_API_PACKED(struct _vl_api_%s {\n", CDATA0);
-        child = this->deeper;
-        indent += 4;
-        while (child) {
-            node_vft_t *vftp = the_vft[child->type];
-            indent_me(fp);
-            vftp->generate(child, which, fp);
-            child = child->peer;
-        }
-        indent -= 4;
-        fprintf(fp, "}) vl_api_%s_t;\n\n", CDATA0);
-        break;
-
-    case ENDIANFUN_PASS:
-    case PRINTFUN_PASS:
-        child = this->deeper;
-        while (child) {
-            node_vft_t *vftp = the_vft[child->type];
-            vftp->generate(child, which, fp);
-            child = child->peer;
-        }
-        break;
-
-    case PYTHON_PASS:
-      fprintf(fp, "('%s',\n", CDATA0);
-        child = this->deeper;
-        indent += 4;
-        while (child) {
-            node_vft_t *vftp = the_vft[child->type];
-            indent_me(fp);
-            vftp->generate(child, which, fp);
-            child = child->peer;
-        }
-        indent -= 4;
-        fprintf(fp, "),\n\n");
-        break;
-
-    case JSON_PASS:
-        fprintf(fp, "[\"%s\",\n", CDATA0);
-        child = this->deeper;
-        indent += 4;
-        while (child) {
-            node_vft_t *vftp = the_vft[child->type];
-            indent_me(fp);
-            vftp->generate(child, which, fp);
-            child = child->peer;
-	    fprintf(fp, ",\n");
-        }
-	indent_me(fp);
-	fprintf (fp, "{\"crc\" : \"0x%08x\"}\n", (u32)(u64)CDATA3);
-        indent -= 4;
-	indent_me(fp);
-        fprintf(fp, "]");
-        break;
-
-    default:
-        fprintf(stderr, "node_define_generate: unimp pass %d\n", which);
-        break;
-    }
-}
-
-node_vft_t node_define_vft = {
-    node_define_print,
-    node_define_generate,
-    0,
-};
-
-void node_union_print (node_t *this)
-{
-    primtype_recursive_print (this, "union ");
-}
-
-void node_union_generate (node_t *this, enum passid which, FILE *fp)
-{
-    node_t *child;
-    node_t *uelem;
-    int case_id=1;
-
-    switch(which) {
-    case TYPEDEF_PASS:
-        fprintf(fp, "u8 _%s_which;\n", CDATA0);
-        indent_me(fp);
-        fprintf(fp, "union _%s {\n", CDATA0);
-        child = this->deeper;
-        indent += 4;
-    
-        while (child) {
-            node_vft_t *vftp = the_vft[child->type];
-            indent_me(fp);
-            vftp->generate(child, which, fp);
-            child = child->peer;
-        }
-        indent -= 4;
-        indent_me(fp);
-        fprintf(fp, "} %s;\n", CDATA0);
-        break;
-
-    case PRINTFUN_PASS:
-    case ENDIANFUN_PASS:
-        uelem = this->deeper;
-        
-        indent_me(fp);
-        fprintf(fp, "switch(a->_%s_which) {\n",
-                CDATA0);
-        indent += 4;
-        current_union_name = CDATA0;
-
-        /* Walk the list of objects in this union */
-        while (uelem) {
-            node_vft_t *vftp = the_vft[uelem->type];
-            indent -= 4;
-            indent_me(fp);
-            fprintf(fp, "case %d:\n", case_id);
-            case_id++;
-            indent += 4;
-            /* Drill down on each element */
-            vftp->generate(uelem, which, fp);
-            indent_me(fp);
-            fprintf(fp, "break;\n");
-            uelem = uelem->peer;
-        }
-        current_union_name = 0;
-        indent -= 4;
-        indent_me(fp);
-        fprintf(fp, "default:\n");
-        indent += 4;
-        indent_me(fp);                 
-        if (which == PRINTFUN_PASS) {
-            fprintf(fp, 
-                    "vl_print(handle, \"WARNING: _%s_which not set.\\n\");\n",
-                    CDATA0);
-        }
-        indent_me(fp);
-        fprintf(fp, "break;\n");
-        indent -= 4;
-        indent_me(fp);
-        fprintf(fp, "}\n");
-        break;
-
-    default:
-        fprintf(stderr, "node_union_generate: unimp pass %d\n", which);
-        break;
-    }
-}
-
-
-node_vft_t node_union_vft = {
-    node_union_print,
-    node_union_generate,
-    0,
-};
-
-void node_scalar_print (node_t *this)
-{
-    fprintf(stdout, "%s", CDATA0);
-    primtype_recursive_print (this, "");
-}
-
-void node_scalar_generate (node_t *this, enum passid which, FILE *fp)
-{
-    char *union_prefix = "";
-
-    if (current_union_name) {
-        sprintf(tmpbuf, "%s.", current_union_name);
-        union_prefix = tmpbuf;
-    }
-
-    switch(which) {
-    case TYPEDEF_PASS:
-        fprintf(fp, "%s;\n", CDATA0);
-        break;
-
-    case PRINTFUN_PASS:
-        indent_me(fp);
-        if (current_is_complex) {
-            fprintf(fp, "vl_api_%s_t_print(a->%s%s, handle);\n", 
-                    current_type_name, union_prefix, CDATA0);
-        } else {
-            if (!strcmp(current_type_fmt, "uword")) {
-                fprintf(fp, 
-           "vl_print(handle, \"%s%s: \" _uword_fmt \"\\n\", %s a->%s%s);\n", 
-                        union_prefix, CDATA0, "(_uword_cast)",
-                        union_prefix, CDATA0);
-            } else {
-                fprintf(fp, 
-                        "vl_print(handle, \"%s%s: %s\\n\", %s a->%s%s);\n", 
-                        union_prefix, CDATA0, 
-                        current_type_fmt, current_type_cast,
-                        union_prefix, CDATA0);
-            }
-        }
-        break;
-
-    case ENDIANFUN_PASS:
-        indent_me(fp);
-        if (current_is_complex) {
-            fprintf(fp, "vl_api%s_t_endian(a->%s%s);\n", 
-                    current_type_name, union_prefix, CDATA0);
-        } else {
-            /* Current_endianfun == NULL means e.g. it's a u8... */
-            if (current_endianfun) {
-                fprintf(fp, "a->%s%s = %s(a->%s%s);\n", union_prefix,
-                        CDATA0, current_endianfun, 
-                        union_prefix, CDATA0);
-            } else {
-                fprintf(fp, "/* a->%s%s = a->%s%s (no-op) */\n",
-                        union_prefix, CDATA0, 
-                        union_prefix, CDATA0);
-            }
-        }
-        break;
-    case PYTHON_PASS:
-        fprintf(fp, "'%s'),\n", CDATA0);
-        break;
-
-    case JSON_PASS:
-        fprintf(fp, "\"%s\"]", CDATA0);
-        break;
-
-    default:
-        fprintf(stderr, "node_scalar_generate: unimp pass %d\n", which);
-    }
-    if (this->deeper) {
-        fprintf(stderr, "broken recursion in node_scalar_generate\n");
-    }
-}
-
-
-node_vft_t node_scalar_vft = {
-    node_scalar_print,
-    node_scalar_generate,
-    0,
-};
-
-void node_vector_print (node_t *this)
-{
-    primtype_recursive_print (this, "vector ");
-}
-
-void node_vector_generate (node_t *this, enum passid which, FILE *fp)
-{
-    char *union_prefix = "";
-
-    if (current_union_name) {
-        sprintf(tmpbuf, "%s.", current_union_name);
-        union_prefix = tmpbuf;
-    }
-
-    switch(which) {
-    case TYPEDEF_PASS:
-        fprintf(fp, "%s[%d];\n", CDATA0, IDATA1);
-        break;
-
-    case PRINTFUN_PASS:
-        /* Don't bother about "u8 data [0];" et al. */
-        if (IDATA1 == 0)
-            break;
-
-        indent_me(fp);
-        fprintf(fp, "{\n");
-        indent += 4;
-        indent_me(fp);
-        fprintf(fp, "int _i;\n");
-        indent_me(fp);
-        fprintf(fp, "for (_i = 0; _i < %d; _i++) {\n", 
-                IDATA1);
-        indent += 4;
-        indent_me(fp);
-        if (current_is_complex) {
-            fprintf(fp, "vl_print(handle, \"%s%s[%%d]: ",
-                    union_prefix, CDATA0);
-            fprintf(fp, 
-                    "vl_print_%s (handle, a->%s%s[_i]);\n", 
-                    CDATA0, union_prefix, CDATA0);
-        } else {
-            fprintf(fp, 
-         "vl_print(handle, \"%s%s[%%d]: %s\\n\", _i, a->%s%s[_i]);\n",
-                    union_prefix, CDATA0, 
-                    current_type_fmt, 
-                    union_prefix, CDATA0);
-        }
-        indent -= 4;
-        indent_me(fp);
-        fprintf(fp, "}\n");
-        indent -= 4;
-        indent_me(fp);
-        fprintf(fp, "}\n");
-        break;
-
-    case ENDIANFUN_PASS:
-        /* Don't bother about "u8 data [0];" et al. */
-        if (IDATA1 == 0)
-            break;
-        /* If this is a simple endian swap, but the endian swap method is a no-op,
-         * then indicate this is a no-op in a comment.
-         */
-	if (!current_is_complex && current_endianfun == NULL) {
-            indent_me(fp);
-            fprintf(fp, "/* a->%s%s[0..%d] = a->%s%s[0..%d] (no-op) */\n",
-                    union_prefix, CDATA0, IDATA1 - 1,
-                    union_prefix, CDATA0, IDATA1 - 1);
-            break;
-        }
-
-        indent_me(fp);
-        fprintf(fp, "{\n");
-        indent += 4;
-        indent_me(fp);
-        fprintf(fp, "int _i;\n");
-        indent_me(fp);
-        fprintf(fp, "for (_i = 0; _i < %d; _i++) {\n", 
-                IDATA1);
-        indent += 4;
-        indent_me(fp);
-        if (current_is_complex) {
-            fprintf(fp, 
-                    "vl_api_%s_t_endian (a->%s%s[_i]);\n", 
-                    current_type_name, union_prefix, CDATA0);
-        } else {
-            fprintf(fp, 
-                    "a->%s%s[_i] = %s(a->%s%s[_i]);\n", 
-                    union_prefix, CDATA0, 
-                    current_endianfun, 
-                    union_prefix, CDATA0);
-        }
-        indent -= 4;
-        indent_me(fp);
-        fprintf(fp, "}\n");
-        indent -= 4;
-        indent_me(fp);
-        fprintf(fp, "}\n");
-        break;
-    case PYTHON_PASS:
-        if (CDATA2 != 0) { // variable length vector
-            fprintf(fp, "'%s', '%d', '%s'),\n", CDATA0, IDATA1, CDATA2);
-        } else {
-            fprintf(fp, "'%s', '%d'),\n", CDATA0, IDATA1);
-        }
-        break;
-
-    case JSON_PASS:
-      if (CDATA2 != 0) { /* variable length vector */
-            fprintf(fp, "\"%s\", %d, \"%s\"]", CDATA0, IDATA1, CDATA2);
-        } else {
-            fprintf(fp, "\"%s\", %d]", CDATA0, IDATA1);
-        }
-        break;
-
-    default:
-        fprintf(stderr, "node_vector_generate: unimp pass %d\n", which);
-    }
-    if (this->deeper) {
-        fprintf(stderr, "broken recursion in node_vector_generate\n");
-    }
-}
-
-node_vft_t node_vector_vft = {
-    node_vector_print,
-    node_vector_generate,
-    0,
-};
-
-void node_complex_print (node_t *this)
-{
-    primtype_recursive_print (this, "complex ");
-}
-
-void node_complex_generate (node_t *this, enum passid which, FILE *fp)
-{
-    node_t *deeper;
-    node_vft_t *vftp;
-    char *member_name = "broken!";
-    char *union_prefix = "";
-
-    if (current_union_name) {
-        sprintf(tmpbuf, "%s.", current_union_name);
-        union_prefix = tmpbuf;
-    }
-
-    current_is_complex++;
-    
-    switch(which) {
-    case TYPEDEF_PASS:
-        fprintf(fp, "%s ", CDATA0);
-        deeper = this->deeper;
-        if (deeper) {
-            vftp = the_vft[deeper->type];
-            vftp->generate(deeper, which, fp);
-        }
-        break;
-
-    case PRINTFUN_PASS:
-        deeper = this->deeper;
-        while (deeper) {
-            if (deeper->type == NODE_SCALAR ||
-                deeper->type == NODE_VECTOR) {
-                member_name = deeper->data[0];
-                break;
-            }
-            deeper = deeper->deeper;
-        }
-        indent_me(fp);
-        fprintf(fp, "vl_print(handle, \"%s%s ----- \\n\");\n", 
-                union_prefix, member_name);
-        indent_me(fp);
-        fprintf(fp, "%s_print(&a->%s%s, handle);\n", 
-                CDATA0, union_prefix, member_name);
-        indent_me(fp);
-        fprintf(fp, "vl_print(handle, \"%s%s ----- END \\n\");\n", 
-                union_prefix, member_name);
-        break;
-
-    case ENDIANFUN_PASS:
-        deeper = this->deeper;
-        while (deeper) {
-            if (deeper->type == NODE_SCALAR ||
-                deeper->type == NODE_VECTOR) {
-                member_name = deeper->data[0];
-                break;
-            }
-            deeper = deeper->deeper;
-        }
-
-        indent_me(fp);
-        fprintf(fp, "%s_endian(&a->%s%s);\n", 
-                CDATA0, union_prefix, member_name);
-        break;
-    case PYTHON_PASS:
-        fprintf(fp, "('%s',", CDATA0);
-        deeper = this->deeper;
-        if (deeper) {
-            vftp = the_vft[deeper->type];
-            vftp->generate(deeper, which, fp);
-        }
-        break;
-
-    case JSON_PASS:
-        fprintf(fp, "[\"%s\", ", CDATA0);
-        deeper = this->deeper;
-        if (deeper) {
-            vftp = the_vft[deeper->type];
-            vftp->generate(deeper, which, fp);
-        }
-        break;
-
-    default:
-        fprintf(stderr, "node_complex_generate unimp pass %d...\n", which);
-        break;
-    }
-    current_is_complex--;
-}
-
-node_vft_t node_complex_vft = {
-    node_complex_print,
-    node_complex_generate,
-    0,
-};
-
-void node_noversion_print (node_t *this)
-{
-    primtype_recursive_print (this, "noversion ");
-}
-
-void node_noversion_generate (node_t *this, enum passid which, FILE *ofp)
-{
-    fprintf(stderr, "node_noversion_generate called...\n");
-}
-
-node_vft_t node_noversion_vft = {
-    node_noversion_print,
-    node_noversion_generate,
-    0,
-};
-
-void node_uword_print (node_t *this)
-{
-    primtype_recursive_print(this, "uword ");
-}
-
-void node_uword_generate (node_t *this, enum passid which, FILE *ofp)
-{
-    primtype_recursive_generate(this, which, ofp, "uword", "uword", "");
-}
-
-node_vft_t node_uword_vft = {
-    node_uword_print,
-    node_uword_generate,
-    "clib_net_to_host_uword",
-};
-
-node_vft_t *the_vft[NODE_N_TYPES] = {
-    &node_illegal_vft,
-    &node_u8_vft,
-    &node_u16_vft,
-    &node_u32_vft,
-    &node_u64_vft,
-    &node_i8_vft,
-    &node_i16_vft,
-    &node_i32_vft,
-    &node_i64_vft,
-    &node_f64_vft,
-    &node_packed_vft,
-    &node_define_vft,
-    &node_union_vft,
-    &node_scalar_vft,
-    &node_vector_vft,
-    &node_complex_vft,
-    &node_noversion_vft,
-    &node_uword_vft,
-};
-
-void *make_node (enum node_subclass type)
-{
-    node_t *rv;
-
-    rv = (node_t *) malloc (sizeof (*rv));
-    if (rv == 0) {
-        fprintf (stderr, "fatal: make_node out of memory\n");
-        exit (1);
-    }
-    bzero (rv, sizeof (*rv));
-    rv->type = type;
-    return ((void *) rv);
-}
-
-YYSTYPE deeper (YYSTYPE arg1, YYSTYPE arg2)
-{
-    node_t *np1 = (node_t *) arg1;
-    node_t *np2 = (node_t *) arg2;
-    node_t *hook_point;
-    
-    hook_point = np1;
-
-    while (hook_point->deeper)
-        hook_point = hook_point->deeper;
-
-    hook_point->deeper = np2;
-    return (arg1);
-}
-
-YYSTYPE addpeer (YYSTYPE arg1, YYSTYPE arg2)
-{
-    node_t *np1 = (node_t *) arg1;
-    node_t *np2 = (node_t *) arg2;
-    node_t *hook_point;
-    
-    hook_point = np1;
-
-    while (hook_point->peer)
-        hook_point = hook_point->peer;
-
-    hook_point->peer = np2;
-    return (arg1);
-}
-
-/*
- * add_slist (stmt_list, stmt)
- */
-
-YYSTYPE add_slist (YYSTYPE a1, YYSTYPE a2)
-{
-    if (a1 && a2)
-        return (addpeer(a1, a2));
-    else if(a1)
-        return(a1);
-    else 
-        return(a2);
-}
-
-/*
- * add_define (char *name, defn_list);
- */
-YYSTYPE add_define (YYSTYPE a1, YYSTYPE a2)
-{
-    node_t *np;
-
-    np = make_node(NODE_DEFINE);
-    np->data[0] = a1;
-    np->data[3] = (void *) message_crc;
-    deeper((YYSTYPE)np, a2);
-    return ((YYSTYPE) np);
-}
-
-/*
- * add_defbody (defn_list, new_defn)
- */
-YYSTYPE add_defbody (YYSTYPE a1, YYSTYPE a2)
-{
-    return (addpeer(a1, a2));
-}
-
-/*
- * add_primtype ([packed], primitive type, instance)
- */ 
-
-YYSTYPE add_primtype (YYSTYPE a1, YYSTYPE a2, YYSTYPE a3)
-{
-    node_t *np1;
-
-    np1 = (node_t *)a1;
-    
-    /* Hook instance to type node */
-    deeper (a1, a2);
-    if (a3) {
-        deeper(a1, a3);
-    }
-    return (a1);
-}
-
-/*
- * add_complex(char *type_name, instance)
- */
-
-YYSTYPE add_complex (YYSTYPE a1, YYSTYPE a2)
-{
-    node_t *np;
-
-    np = make_node(NODE_COMPLEX);
-    np->data[0] = (void *) a1;
-
-    deeper((YYSTYPE)np, a2);
-    return ((YYSTYPE) np);
-}
-
-/*
- * add_union(char *type_name, definition)
- */
-
-YYSTYPE add_union (YYSTYPE a1, YYSTYPE a2)
-{
-    node_t *np;
-
-    np = make_node(NODE_UNION);
-    np->data[0] = (void *) a1;
-
-    deeper((YYSTYPE)np, a2);
-    return ((YYSTYPE) np);
-}
-
-
-/*
- * add_vector_vbl (node_t *variable, YYSTYPE size)
- */
-
-YYSTYPE add_vector_vbl (YYSTYPE a1, YYSTYPE a2)
-{
-    node_t *np;
-
-    np = make_node(NODE_VECTOR);
-    np->data[0] = (void *) a1;
-    np->data[1] = (void *) a2;
-    return ((YYSTYPE) np);
-}
-
-/*
- * add_vector_vbl (char *vector_name, char *vector_length_var)
- */
-
-YYSTYPE add_variable_length_vector_vbl (YYSTYPE vector_name, YYSTYPE vector_length_var)
-{
-    node_t *np;
-
-    np = make_node(NODE_VECTOR);
-    np->data[0] = (void *) vector_name;
-    np->data[1] = (void *) 0; // vector size used for vpe.api.h generation (array of length zero)
-    np->data[2] = (void *) vector_length_var; // name of the variable that stores vector length
-    return ((YYSTYPE) np);
-}
-
-/*
- * add_scalar_vbl (char *name)
- */
-YYSTYPE add_scalar_vbl (YYSTYPE a1)
-{
-    node_t *np;
-
-    np = make_node(NODE_SCALAR);
-    np->data[0] = (void *) a1;
-    return ((YYSTYPE) np);
-}
-
-/*
- * set_flags (int flags, msg(=0?))
- */ 
-YYSTYPE set_flags(YYSTYPE a1, YYSTYPE a2)
-{
-    node_t *np;
-    int flags;
-
-    np = (node_t *)a2;
-    if (!np)
-        return(0);
-
-    flags = (int)(uword) a1;
-
-    np->flags |= flags;
-    return (a2);
-}
-/*
- * suppress_version
- */
-YYSTYPE suppress_version (void)
-{
-    dont_output_version = 1;
-    return (0);
-}
-
-void dump(node_t *np)
-{
-    node_vft_t *vftp;
-
-    while (np) {
-        vftp = the_vft[np->type];
-        vftp->print(np);
-        np = np->peer;
-    }
-}
-
-char *fixup_input_filename(void)
-{
-    char *cp;
-
-    cp = (char *)input_filename;
-
-    while (*cp)
-        cp++;
-
-    cp--;
-
-    while (cp > input_filename && *cp != '/')
-        cp--;
-    if (*cp == '/')
-        cp++;
-
-    strncpy (tmpbuf, cp, sizeof(tmpbuf)-1);
-
-    cp = tmpbuf;
-
-    while (*cp)
-        cp++;
-
-    cp--;
-
-    while (cp > tmpbuf && *cp != '.')
-        cp--;
-    
-    if (*cp == '.')
-        *cp = 0;
-
-    return (sxerox(tmpbuf));
-}
-
-void generate_top_boilerplate(FILE *fp)
-
-{
-    char *datestring = ctime(&starttime);
-    fixed_name = fixup_input_filename();
-
-    datestring[24] = 0;
-
-    fprintf (fp, "/*\n");
-    fprintf (fp, " * VLIB API definitions %s\n", datestring);
-    fprintf (fp, " * Input file: %s\n", input_filename);
-    fprintf (fp, " * Automatically generated: please edit the input file ");
-    fprintf (fp, "NOT this file!\n");
-    fprintf (fp, " */\n\n");
-    fprintf (fp, "#if defined(vl_msg_id)||defined(vl_union_id)||");
-    fprintf (fp, "defined(vl_printfun) \\\n ||defined(vl_endianfun)||");
-    fprintf (fp, " defined(vl_api_version)||defined(vl_typedefs) \\\n");
-    fprintf (fp, " ||defined(vl_msg_name)||defined(vl_msg_name_crc_list)\n");
-    fprintf (fp, "/* ok, something was selected */\n");
-    fprintf (fp, "#else\n");
-    fprintf (fp, "#warning no content included from %s\n", input_filename);
-    fprintf (fp, "#endif\n\n");
-    fprintf (fp, "#define VL_API_PACKED(x) x __attribute__ ((packed))\n\n");
-}
-
-void generate_bottom_boilerplate(FILE *fp)
-
-{
-    fprintf (fp, "\n#ifdef vl_api_version\n");
-
-    if (dont_output_version) {
-        fprintf (fp, "/* WARNING: API FILE VERSION CHECK DISABLED */\n");
-        input_crc = 0;
-    }
-
-    fprintf (fp, "vl_api_version(%s, 0x%08x)\n\n", 
-             fixed_name, (unsigned int)input_crc);
-    fprintf (fp, "#endif\n\n");
-}
-
-void generate_msg_ids(YYSTYPE a1, FILE *fp)
-{
-    node_t *np = (node_t *)a1;
-
-    fprintf (fp, "\n/****** Message ID / handler enum ******/\n\n");
-    fprintf (fp, "#ifdef vl_msg_id\n");
-
-    while (np) {
-        if (np->type == NODE_DEFINE) {
-            if (!(np->flags & NODE_FLAG_TYPEONLY)) {
-                fprintf (fp, "vl_msg_id(VL_API_%s, vl_api_%s_t_handler)\n", 
-                         uppercase(np->data[0]), (i8 *)np->data[0]);
-            } else {
-                fprintf (fp, "/* typeonly: %s */\n", (i8 *)np->data[0]);
-            }
-        }
-        np = np->peer;
-    }
-    fprintf (fp, "#endif\n");
-
-}
-
-void generate_msg_names(YYSTYPE a1, FILE *fp)
-{
-    node_t *np = (node_t *)a1;
-
-    fprintf (fp, "\n/****** Message names ******/\n\n");
-
-    fprintf (fp, "#ifdef vl_msg_name\n");
-
-    while (np) {
-        if (np->type == NODE_DEFINE) {
-            if (!(np->flags & NODE_FLAG_TYPEONLY)) {
-                fprintf (fp, "vl_msg_name(vl_api_%s_t, %d)\n",
-                         (i8 *) np->data[0], 
-                         (np->flags & NODE_FLAG_DONT_TRACE ? 0 : 1));
-            } else {
-                fprintf (fp, "/* typeonly: %s */\n", (i8 *)np->data[0]);
-            }
-        }
-        np = np->peer;
-    }
-    fprintf (fp, "#endif\n\n");
-}
-
-void generate_msg_name_crc_list (YYSTYPE a1, FILE *fp)
-{
-    node_t *np = (node_t *)a1;
-    char *unique_suffix, *cp;
-
-    unique_suffix = sxerox(fixed_name);
-
-    cp = unique_suffix;
-    while (*cp && (*cp != '.'))
-        cp++;
-    if (*cp == '.')
-        *cp = 0;
-
-    fprintf (fp, "\n/****** Message name, crc list ******/\n\n");
-
-    fprintf (fp, "#ifdef vl_msg_name_crc_list\n");
-    fprintf (fp, "#define foreach_vl_msg_name_crc_%s ", unique_suffix);
-
-    while (np) {
-        if (np->type == NODE_DEFINE) {
-            if (!(np->flags & NODE_FLAG_TYPEONLY)) {
-                fprintf (fp, "\\\n_(VL_API_%s, %s, %08x) ",
-                         uppercase (np->data[0]), (i8 *) np->data[0],
-                         (u32)(u64)np->data[3]);
-            }
-        }
-        np = np->peer;
-    }
-    fprintf (fp, "\n#endif\n\n");
-    free (unique_suffix);
-}
-
-void generate_typedefs(YYSTYPE a1, FILE *fp)
-{
-    node_t *np = (node_t *)a1;
-    node_vft_t *vftp;
-
-    fprintf(fp, "\n/****** Typedefs *****/\n\n");
-    fprintf(fp, "#ifdef vl_typedefs\n\n");
-
-    /* Walk the top-level node-list */
-    while (np) {
-        if (np->type == NODE_DEFINE) {
-            /* Yeah, this is pedantic */
-            vftp = the_vft[np->type];
-            vftp->generate(np, TYPEDEF_PASS, fp);
-        }
-        np = np->peer;
-    }
-    fprintf(fp, "#endif /* vl_typedefs */\n\n");
-}
-
-void union_walk_one_defn(node_t *np, FILE *fp)
-{
-    node_t *vblp;
-    node_t *uelem;
-
-    /* Walk the list of typed objects in this msg def */
-    while (np) {
-        if (np->type == NODE_UNION) {
-            current_union_name = np->data[0];
-            uelem = np->deeper;
-
-            /* Walk the list of objects in this union */
-            while (uelem) {
-                vblp = uelem->deeper;
-                /* Drill down on each element, find the variable name */
-                while(vblp) {
-                    if (vblp->type == NODE_SCALAR ||
-                        vblp->type == NODE_VECTOR ||
-                        vblp->type == NODE_COMPLEX) {
-                        fprintf(ofp, "#define %s_", 
-                                uppercase(current_def_name));
-                        fprintf(ofp, "%s_", uppercase(current_union_name));
-                        fprintf(ofp, "%s %d\n",uppercase(vblp->data[0]),
-                                current_id);
-                        current_id++;
-                        break;
-                    }
-                    vblp = vblp->deeper;
-                }
-                uelem = uelem->peer;
-            }
-            current_union_name = 0;
-            current_id = 1;
-        }
-        np = np->peer;
-    }
-}
-
-void generate_uniondefs(YYSTYPE a1, FILE *fp)
-{
-    node_t *np = (node_t *)a1;
-
-    fprintf(fp, "/****** Discriminated Union Definitions *****/\n\n");
-    fprintf(fp, "#ifdef vl_union_id\n\n");
-
-    /* Walk the top-level node-list */
-    while (np) {
-        if (np->type == NODE_DEFINE) {
-            current_id = 1;
-            current_def_name = np->data[0];
-            union_walk_one_defn(np->deeper, fp);
-        }
-        np = np->peer;
-    }
-    fprintf(fp, "\n#endif /* vl_union_id */\n\n");
-}
-
-void generate_printfun(YYSTYPE a1, FILE *fp)
-{
-    node_t *np = (node_t *)a1;
-    node_vft_t *vftp;
-
-    fprintf(fp, "/****** Print functions *****/\n\n");
-    fprintf(fp, "#ifdef vl_printfun\n\n");
-
-    fprintf(fp, "#ifdef LP64\n");
-    fputs ("#define _uword_fmt \"%lld\"\n", fp);
-    fputs ("#define _uword_cast (long long)\n", fp);
-    fprintf(fp, "#else\n");
-    fputs("#define _uword_fmt \"%ld\"\n", fp);
-    fputs ("#define _uword_cast long\n", fp);
-    fprintf(fp, "#endif\n\n");
-
-    /* Walk the top-level node-list */
-    while (np) {
-        if (np->type == NODE_DEFINE) {
-            if (!(np->flags & NODE_FLAG_MANUAL_PRINT)) {
-                fprintf(fp, 
-       "static inline void *vl_api_%s_t_print (vl_api_%s_t *a,",
-                        (i8 *)np->data[0], (i8 *) np->data[0]);
-                fprintf(fp, "void *handle)\n{\n");
-                /* output the message name */
-                fprintf(fp, 
-                    "    vl_print(handle, \"vl_api_%s_t:\\n\");\n",
-                        (i8 *)np->data[0]);
-
-                indent += 4;
-                /* Yeah, this is pedantic */
-                vftp = the_vft[np->type];
-                vftp->generate(np, PRINTFUN_PASS, fp);
-                fprintf(fp, "    return handle;\n");
-                fprintf(fp, "}\n\n");
-                indent -= 4;
-            } else {
-                fprintf(fp, "/***** manual: vl_api_%s_t_print  *****/\n\n",
-                        (i8 *) np->data[0]);
-            }
-        }
-        np = np->peer;
-    }
-    fprintf(fp, "#endif /* vl_printfun */\n\n");
-}
-
-void generate_endianfun(YYSTYPE a1, FILE *fp)
-{
-    node_t *np = (node_t *)a1;
-    node_vft_t *vftp;
-
-    fprintf(fp, "\n/****** Endian swap functions *****/\n\n");
-    fprintf(fp, "#ifdef vl_endianfun\n\n");
-    fprintf(fp, "#undef clib_net_to_host_uword\n");
-    fprintf(fp, "#ifdef LP64\n");
-    fprintf(fp, "#define clib_net_to_host_uword clib_net_to_host_u64\n");
-    fprintf(fp, "#else\n");
-    fprintf(fp, "#define clib_net_to_host_uword clib_net_to_host_u32\n");
-    fprintf(fp, "#endif\n\n");
-
-    /* Walk the top-level node-list */
-    while (np) {
-        if (np->type == NODE_DEFINE) {
-            if (!(np->flags & NODE_FLAG_MANUAL_ENDIAN)) {
-                fprintf(fp, 
-               "static inline void vl_api_%s_t_endian (vl_api_%s_t *a)\n{\n",
-                        (i8 *) np->data[0], (i8 *) np->data[0]);
-                indent += 4;
-                /* Yeah, this is pedantic */
-                vftp = the_vft[np->type];
-                vftp->generate(np, ENDIANFUN_PASS, fp);
-                fprintf(fp, "}\n\n");
-                indent -= 4;
-            } else {
-                fprintf(fp, "/***** manual: vl_api_%s_t_endian  *****/\n\n",
-                        (i8 *) np->data[0]);
-            }
-        }
-        np = np->peer;
-    }
-    fprintf(fp, "#endif /* vl_endianfun */\n\n");
-}
-
-void add_msg_ids(YYSTYPE a1)
-{
-    node_t *np = (node_t *)a1;
-    node_t *new_u16;
-    node_t *new_vbl;
-
-    /* Walk the top-level node-list */
-    while (np) {
-        if (np->type == NODE_DEFINE) {
-            if (!(np->flags & NODE_FLAG_TYPEONLY)) {
-	        /* add the parse tree for "u16 _vl_msg_id" */
-                new_u16 = make_node(NODE_U16);
-                new_u16->peer = np->deeper;
-                np->deeper = new_u16;
-                new_vbl = make_node(NODE_SCALAR);
-                new_vbl->data[0] = sxerox("_vl_msg_id");
-                new_u16->deeper = new_vbl;
-	    }
-        }
-        np = np->peer;
-    }
-}
-
-void generate_python_msg_definitions(YYSTYPE a1, FILE *fp)
-{
-    node_t *np = (node_t *)a1;
-    node_vft_t *vftp;
-    fprintf (fp, "messages = [\n");
-    /* Walk the top-level node-list */
-    while (np) {
-      if (np->type == NODE_DEFINE && !(np->flags & NODE_FLAG_TYPEONLY)) {
-        /* Yeah, this is pedantic */
-        vftp = the_vft[np->type];
-        vftp->generate(np, PYTHON_PASS, fp);
-      }
-      np = np->peer;
-    }
-    fprintf (fp, "\n]\n");
-}
-
-static bool
-is_typeonly_check(node_t *np, bool typeonly)
-{
-  bool is_typeonly = (np->flags & NODE_FLAG_TYPEONLY);
-  return (is_typeonly == typeonly);
-}
-
-static void
-generate_json_definitions(YYSTYPE a1, FILE *fp, bool typeonly)
-{
-    node_t *np = (node_t *)a1;
-    node_vft_t *vftp;
-    indent_me(fp);
-    if (typeonly)
-      fprintf (fp, "\"types\" : [\n");
-    else
-      fprintf (fp, "\"messages\" : [\n");
-
-    /* Walk the top-level node-list */
-    bool comma = false;
-    indent += 4;
-    while (np) {
-      if (np->type == NODE_DEFINE && is_typeonly_check(np, typeonly)) {
-        /* Yeah, this is pedantic */
-        vftp = the_vft[np->type];
-	indent_me(fp);
-        vftp->generate(np, JSON_PASS, fp);
-	comma = true;
-      }
-      np = np->peer;
-      if (comma && np &&
-	  np->type == NODE_DEFINE && is_typeonly_check(np, typeonly))
-	fprintf (fp, ",\n");
-
-    }
-    indent -= 4;
-    fprintf (fp, "\n");
-    indent_me(fp);
-    fprintf(fp, "]");
-}
-
-void generate_python_typeonly_definitions(YYSTYPE a1, FILE *fp)
-{
-    node_t *np = (node_t *)a1;
-    node_vft_t *vftp;
-    fprintf (fp, "types = [\n");
-    /* Walk the top-level node-list */
-    while (np) {
-      if (np->type == NODE_DEFINE && (np->flags & NODE_FLAG_TYPEONLY)) {
-        vftp = the_vft[np->type];
-        vftp->generate(np, PYTHON_PASS, fp);
-      }
-      np = np->peer;
-    }
-    fprintf (fp, "\n]\n");
-}
-
-void generate_python(YYSTYPE a1, FILE *fp)
-{
-    generate_python_typeonly_definitions(a1, fp);
-    generate_python_msg_definitions(a1, fp);
-
-    /*
-     * API CRC signature
-     */
-    fprintf (fp, "vl_api_version = 0x%08x\n\n", (unsigned int)input_crc);
-}
-
-void generate_json(YYSTYPE a1, FILE *fp)
-{
-    fprintf (fp, "{\n");
-    indent += 4;
-    generate_json_definitions(a1, fp, true);
-    fprintf (fp, ",\n");
-    generate_json_definitions(a1, fp, false);
-
-    /*
-     * API CRC signature
-     */
-    fprintf (fp, ",\n\"vl_api_version\" :\"0x%08x\"\n",
-	     (unsigned int)input_crc);
-    fprintf (fp, "}\n");
-}
-
-void generate(YYSTYPE a1)
-{
-    if (dump_tree) {
-        dump((node_t *)a1);
-    }
-
-    add_msg_ids(a1);
-
-    if (ofp) {
-        generate_top_boilerplate(ofp);
-
-        generate_msg_ids(a1, ofp);
-        generate_msg_names(a1, ofp);
-        generate_msg_name_crc_list(a1, ofp);
-        generate_typedefs(a1, ofp);
-        generate_uniondefs(a1, ofp);
-        generate_printfun(a1, ofp);
-        generate_endianfun(a1, ofp);
-        
-        generate_bottom_boilerplate(ofp);
-    }
-    if (pythonfp) {
-      generate_python(a1, pythonfp);
-    }
-    if (jsonfp) {
-      generate_json(a1, jsonfp);
-    }
-}
diff --git a/vppapigen/node.h b/vppapigen/node.h
deleted file mode 100644
index 297d6036..00000000
--- a/vppapigen/node.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *------------------------------------------------------------------
- * node.h - definitions for an API generator
- *
- * Copyright (c) 2004-2009 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#ifndef _node_h_
-#define _node_h_
-
-/*
- * Global prototypes
- */
-
-char *sxerox (const char *s);
-
-enum node_subclass {  /* WARNING: indices must match the vft... */
-    NODE_ILLEGAL=0,
-    NODE_U8,
-    NODE_U16,
-    NODE_U32,
-    NODE_U64,
-    NODE_I8,
-    NODE_I16,
-    NODE_I32,
-    NODE_I64,
-    NODE_F64,
-    NODE_PACKED,
-    NODE_DEFINE,
-    NODE_UNION,
-    NODE_SCALAR,
-    NODE_VECTOR,
-    NODE_COMPLEX,
-    NODE_NOVERSION,
-    NODE_UWORD,
-    NODE_N_TYPES,  /* number of node types with VFT's */
-
-    /* pseudo-node(s) used in the lexer keyword table, but
-       NOT in need of a VFT... */
-    NODE_TYPEONLY,
-    NODE_MANUAL_PRINT,
-    NODE_MANUAL_ENDIAN,
-    NODE_DONT_TRACE,
-};
-
-enum passid {
-    TYPEDEF_PASS=1,
-    UNION_DEF_PASS,
-    ENDIANFUN_PASS,
-    PRINTFUN_PASS,
-    PYTHON_PASS,
-    JSON_PASS,
-};
-
-extern void *make_node (enum node_subclass type);
-
-typedef struct node_ {
-    enum node_subclass type;
-    struct node_ *peer;
-    struct node_ *deeper;
-    int flags;
-    void *data[4];
-} node_t;
-
-/* To shut up gcc-4.2.x warnings */
-#define CDATA0 ((char *)(this->data[0]))
-#define IDATA1 ((int)(uword)(this->data[1]))
-#define CDATA2 ((char *)(this->data[2]))
-#define CDATA3 ((char *)(this->data[3]))
-
-#define NODE_FLAG_MANUAL_PRINT (1<<0)
-#define NODE_FLAG_MANUAL_ENDIAN (1<<1)
-#define NODE_FLAG_TYPEONLY (1<<3)
-#define NODE_FLAG_DONT_TRACE (1<<4)
-
-typedef struct node_vft_ {
-    void (*print)(struct node_ *);
-    void (*generate)(struct node_ *, enum passid id, FILE *ofp);
-    char *endian_converter;
-} node_vft_t;    
-
-#endif /* _node_h */
diff --git a/vppinfra/.gitignore b/vppinfra/.gitignore
deleted file mode 100644
index b25c15b8..00000000
--- a/vppinfra/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
diff --git a/vppinfra/INSTALL b/vppinfra/INSTALL
deleted file mode 100644
index 23e5f25d..00000000
--- a/vppinfra/INSTALL
+++ /dev/null
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/vppinfra/Make.defs b/vppinfra/Make.defs
deleted file mode 100644
index dcb51e16..00000000
--- a/vppinfra/Make.defs
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright (c) 2001, 2002 Eliot Dresselhaus
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-#  The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# Basic toolchain defines.
-CC = $(CROSS_COMPILE)gcc
-LD = $(CROSS_COMPILE)ld
-AR = $(CROSS_COMPILE)ar
-RANLIB = $(CROSS_COMPILE)ranlib
-INSTALL = install
-
-ifneq ($(origin CROSS_COMPILE), undefined)
-  IS_CROSS_COMPILE=yes
-endif
-
-CLIB_ARCH = $(shell $(CC) -dumpmachine)
-
-# Where to get linux kernel includes.
-# By default get linux includes from /usr/include/linux...
-KERNEL_PREFIX ?= /usr
-
-# Where to find compiler include directory (since we may
-# be using -nostdinc).
-CC_PREFIX = $(shell dirname `$(CC) --print-libgcc-file-name`)
-
-# Where to get LIBC includes for cross compiles
-LIBC_PREFIX ?= $(CC_PREFIX)/../../../../$(CLIB_ARCH)
-
-# Where to find CLIB includes/libraries for cross compiles
-CLIB_PREFIX ?= /usr/local/$(CLIB_ARCH)
-
-OBJ = $(CLIB_ARCH).o
-SHARED_OBJ = shared.$(OBJ)
-KERNEL_OBJ = kernel.$(OBJ)
-MODULE_OBJ = module.$(OBJ)
-
-DEP = $(CLIB_ARCH).d
-SHARED_DEP = shared.$(DEP)
-KERNEL_DEP = kernel.$(DEP)
-
-STATIC_LIB = $(CLIB_ARCH).a
-SHARED_LIB = $(CLIB_ARCH).so
-KERNEL_LIB = kernel.$(CLIB_ARCH).a
-
-STATIC_CFLAGS = $(DEFAULT_CFLAGS)
-SHARED_CFLAGS = $(STATIC_CFLAGS) -fPIC
-
-# Compile flags common to user/kernel
-CLIB_COMMON_CFLAGS += -Wall
-
-DEBUG ?= no
-ifeq ($(DEBUG),yes)
-	COPTS ?= -g -O0
-	CLIB_COMMON_CFLAGS += -DDEBUG
-else
-	COPTS ?= -O2
-endif
-
-CLIB_COMMON_CFLAGS += $(COPTS) 
-
-CLIB_USER_CFLAGS = $(CLIB_COMMON_CFLAGS)
-
-ifeq ($(IS_CROSS_COMPILE),yes)
-  CLIB_USER_CFLAGS += -nostdinc
-  CLIB_USER_CFLAGS += -idirafter $(CC_PREFIX)/include
-  CLIB_USER_CFLAGS += -idirafter $(KERNEL_PREFIX)/include
-  CLIB_USER_CFLAGS += -idirafter $(LIBC_PREFIX)/include
-  CLIB_COMMON_CFLAGS += -idirafter $(CLIB_PREFIX)/include
-endif
-
-STATIC_CFLAGS = $(CLIB_USER_CFLAGS)
-SHARED_CFLAGS = $(STATIC_CFLAGS) -fPIC
-
-%.$(SHARED_OBJ): %.c
-	$(CC) -c $(SHARED_CFLAGS) -o $@ $<
-
-%.$(OBJ): %.c
-	$(CC) -c $(STATIC_CFLAGS) -o $@ $<
-
-# Kernel version of clib
-
-CLIB_KERNEL_CFLAGS = $(CLIB_COMMON_CFLAGS)
-
-CLIB_KERNEL_CFLAGS += -nostdinc
-CLIB_KERNEL_CFLAGS += -idirafter $(CC_PREFIX)/include
-CLIB_KERNEL_CFLAGS += -idirafter $(KERNEL_PREFIX)/include
-
-# Kernel always uses mheap allocator (no malloc)
-CLIB_KERNEL_CFLAGS += -DCLIB_MEM_MHEAP
-
-CLIB_KERNEL_CFLAGS += -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB
-
-CLIB_KERNEL_CFLAGS += -fno-common -fomit-frame-pointer -fno-strict-aliasing
-
-ifeq ($(findstring mips,$(CLIB_ARCH)),mips)
-  CLIB_KERNEL_CFLAGS += -G0 \
-	-mno-abicalls -fno-pic -mlong-calls \
-	-mcpu=r8000 -mips2 -Wa,--trap 
-endif
-
-%.$(KERNEL_OBJ): %.c
-	$(CC) $(CLIB_KERNEL_CFLAGS) -c -o $@ $<
-
-# Dependencies
-%.$(DEP): %.c
-	$(CC) $(CLIB_USER_CFLAGS) -c -M $< | sed -e s/.o:/.$(OBJ):/ > $@
-
-%.$(SHARED_DEP): %.c
-	$(CC) $(CLIB_USER_CFLAGS) -c -M $< | sed -e s/.o:/.$(SHARED_OBJ):/ > $@
-
-%.$(KERNEL_DEP): %.c
-	$(CC) $(CLIB_KERNEL_CFLAGS) -c -M $< | sed -e s/.o:/.$(KERNEL_OBJ):/ > $@
diff --git a/vppinfra/Makefile.am b/vppinfra/Makefile.am
deleted file mode 100644
index 6183cd7a..00000000
--- a/vppinfra/Makefile.am
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CPPFLAGS = -Wall -Werror
-
-if WITH_UNIX
-  lib_LTLIBRARIES = libvppinfra.la
-endif
-
-lib_LIBRARIES =
-
-TESTS =
-
-if ENABLE_TESTS
-TESTS  +=  test_bihash_template \
-	   test_dlist \
-	   test_elog \
-	   test_elf \
-	   test_fifo \
-	   test_format \
-	   test_hash \
-	   test_heap \
-	   test_longjmp \
-	   test_macros \
-	   test_md5 \
-	   test_mheap \
-	   test_pool_iterate \
-	   test_ptclosure \
-	   test_random \
-	   test_random_isaac \
-	   test_serialize \
-	   test_slist \
-	   test_socket \
-	   test_time \
-	   test_timing_wheel \
-	   test_vec \
-	   test_zvec 
-endif
-
-noinst_PROGRAMS = $(TESTS)
-check_PROGRAMS	= $(TESTS)
-
-test_bihash_template_SOURCES = vppinfra/test_bihash_template.c
-test_dlist_SOURCES = vppinfra/test_dlist.c
-test_elog_SOURCES = vppinfra/test_elog.c
-test_elf_SOURCES = vppinfra/test_elf.c
-test_fifo_SOURCES = vppinfra/test_fifo.c
-test_format_SOURCES = vppinfra/test_format.c
-test_hash_SOURCES = vppinfra/test_hash.c
-test_heap_SOURCES = vppinfra/test_heap.c
-test_longjmp_SOURCES = vppinfra/test_longjmp.c
-test_macros_SOURCES = vppinfra/test_macros.c
-test_md5_SOURCES = vppinfra/test_md5.c
-test_mheap_SOURCES = vppinfra/test_mheap.c
-test_pool_iterate_SOURCES = vppinfra/test_pool_iterate.c
-test_ptclosure_SOURCES = vppinfra/test_ptclosure.c
-test_random_SOURCES = vppinfra/test_random.c
-test_random_isaac_SOURCES = vppinfra/test_random_isaac.c
-test_serialize_SOURCES = vppinfra/test_serialize.c
-test_slist_SOURCES = vppinfra/test_slist.c
-test_socket_SOURCES = vppinfra/test_socket.c
-test_time_SOURCES = vppinfra/test_time.c
-test_timing_wheel_SOURCES = vppinfra/test_timing_wheel.c
-test_vec_SOURCES = vppinfra/test_vec.c
-test_zvec_SOURCES = vppinfra/test_zvec.c
-
-# All unit tests use ASSERT for failure
-# So we'll need -DDEBUG to enable ASSERTs
-test_bihash_template_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_dlist_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_elog_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_elf_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_fifo_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_format_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_hash_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_heap_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_longjmp_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_macros_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_md5_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_mheap_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_pool_iterate_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_ptclosure_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_random_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_random_isaac_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_socket_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_serialize_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_slist_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_time_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_timing_wheel_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_vec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_zvec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-
-test_bihash_template_LDADD =	libvppinfra.la
-test_dlist_LDADD =	libvppinfra.la
-test_elog_LDADD =	libvppinfra.la
-test_elf_LDADD =	libvppinfra.la
-test_fifo_LDADD =	libvppinfra.la
-test_format_LDADD =	libvppinfra.la
-test_hash_LDADD =	libvppinfra.la
-test_heap_LDADD =	libvppinfra.la
-test_longjmp_LDADD =	libvppinfra.la
-test_macros_LDADD =	libvppinfra.la
-test_md5_LDADD =	libvppinfra.la
-test_mheap_LDADD =	libvppinfra.la
-test_pool_iterate_LDADD =	libvppinfra.la
-test_ptclosure_LDADD =	libvppinfra.la
-test_random_LDADD =	libvppinfra.la
-test_random_isaac_LDADD =	libvppinfra.la
-test_serialize_LDADD =	libvppinfra.la
-test_slist_LDADD =	libvppinfra.la
-test_socket_LDADD =	libvppinfra.la
-test_time_LDADD =	libvppinfra.la -lm
-test_timing_wheel_LDADD =	libvppinfra.la -lm
-test_vec_LDADD =	libvppinfra.la
-test_zvec_LDADD =	libvppinfra.la
-
-test_bihash_template_LDFLAGS = -static
-test_dlist_LDFLAGS = -static
-test_elog_LDFLAGS = -static
-test_elf_LDFLAGS = -static
-test_fifo_LDFLAGS = -static
-test_format_LDFLAGS = -static
-test_hash_LDFLAGS = -static
-test_heap_LDFLAGS = -static
-test_longjmp_LDFLAGS = -static
-test_macros_LDFLAGS = -static
-test_md5_LDFLAGS = -static
-test_mheap_LDFLAGS = -static
-test_pool_iterate_LDFLAGS = -static
-test_ptclosure_LDFLAGS = -static
-test_random_LDFLAGS = -static
-test_random_isaac_LDFLAGS = -static
-test_serialize_LDFLAGS = -static
-test_slist_LDFLAGS = -static
-test_socket_LDFLAGS = -static
-test_time_LDFLAGS = -static
-test_timing_wheel_LDFLAGS = -static
-test_vec_LDFLAGS = -static
-test_zvec_LDFLAGS = -static
-
-# noinst_PROGRAMS += test_vhash
-# test_vhash_SOURCES = vppinfra/test_vhash.c vppinfra/vhash.c
-# test_vhash_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-# test_vhash_LDADD = libvppinfra.la
-# test_vhash_LDFLAGS = -static
-
-nobase_include_HEADERS = \
-  vppinfra/asm_mips.h \
-  vppinfra/asm_x86.h \
-  vppinfra/bihash_8_8.h \
-  vppinfra/bihash_24_8.h \
-  vppinfra/bihash_template.h \
-  vppinfra/bihash_template.c \
-  vppinfra/bitmap.h \
-  vppinfra/bitops.h \
-  vppinfra/byte_order.h \
-  vppinfra/cache.h \
-  vppinfra/clib.h \
-  vppinfra/cpu.h \
-  vppinfra/dlist.h \
-  vppinfra/elf.h \
-  vppinfra/elf_clib.h \
-  vppinfra/elog.h \
-  vppinfra/fheap.h \
-  vppinfra/error.h \
-  vppinfra/error_bootstrap.h \
-  vppinfra/fifo.h \
-  vppinfra/format.h \
-  vppinfra/graph.h \
-  vppinfra/hash.h \
-  vppinfra/heap.h \
-  vppinfra/longjmp.h \
-  vppinfra/macros.h \
-  vppinfra/math.h \
-  vppinfra/md5.h \
-  vppinfra/mem.h \
-  vppinfra/memcpy_sse3.h \
-  vppinfra/memcpy_avx.h \
-  vppinfra/mhash.h \
-  vppinfra/mheap.h \
-  vppinfra/mheap_bootstrap.h \
-  vppinfra/os.h \
-  vppinfra/pipeline.h \
-  vppinfra/pool.h \
-  vppinfra/ptclosure.h \
-  vppinfra/random.h \
-  vppinfra/random_buffer.h \
-  vppinfra/random_isaac.h \
-  vppinfra/serialize.h \
-  vppinfra/slist.h \
-  vppinfra/smp.h \
-  vppinfra/socket.h \
-  vppinfra/sparse_vec.h \
-  vppinfra/string.h \
-  vppinfra/time.h \
-  vppinfra/timing_wheel.h \
-  vppinfra/timer.h \
-  vppinfra/types.h \
-  vppinfra/unix.h \
-  vppinfra/vec.h \
-  vppinfra/vec_bootstrap.h \
-  vppinfra/vector.h \
-  vppinfra/vector_altivec.h \
-  vppinfra/vector_funcs.h \
-  vppinfra/vector_iwmmxt.h \
-  vppinfra/vector_neon.h \
-  vppinfra/vector_sse2.h \
-  vppinfra/valgrind.h \
-  vppinfra/vm_unix.h \
-  vppinfra/xxhash.h \
-  vppinfra/xy.h \
-  vppinfra/zvec.h
-
-CLIB_CORE = \
-  vppinfra/asm_x86.c \
-  vppinfra/backtrace.c \
-  vppinfra/bihash_8_8.h \
-  vppinfra/bihash_24_8.h \
-  vppinfra/bihash_template.h \
-  vppinfra/cpu.c \
-  vppinfra/elf.c \
-  vppinfra/elog.c \
-  vppinfra/error.c \
-  vppinfra/fifo.c \
-  vppinfra/fheap.c \
-  vppinfra/format.c \
-  vppinfra/graph.c \
-  vppinfra/hash.c \
-  vppinfra/heap.c \
-  vppinfra/longjmp.S \
-  vppinfra/macros.c \
-  vppinfra/mhash.c \
-  vppinfra/mheap.c \
-  vppinfra/md5.c \
-  vppinfra/mem_mheap.c \
-  vppinfra/ptclosure.c \
-  vppinfra/random.c \
-  vppinfra/random_buffer.c \
-  vppinfra/random_isaac.c \
-  vppinfra/serialize.c \
-  vppinfra/slist.c \
-  vppinfra/std-formats.c \
-  vppinfra/string.c \
-  vppinfra/time.c \
-  vppinfra/timing_wheel.c \
-  vppinfra/unformat.c \
-  vppinfra/vec.c \
-  vppinfra/vector.c \
-  vppinfra/zvec.c
-
-# Core plus Unix additions
-libvppinfra_la_SOURCES =			\
-  $(CLIB_CORE)					\
-  vppinfra/elf_clib.c				\
-  vppinfra/socket.c				\
-  vppinfra/timer.c				\
-  vppinfra/unix-formats.c			\
-  vppinfra/unix-misc.c
-
-bin_PROGRAMS = elftool
-
-elftool_SOURCES = tools/elftool.c
-elftool_CPPFLAGS = $(AM_CPPFLAGS)
-elftool_LDADD = libvppinfra.la -lpthread -lrt -lm
diff --git a/vppinfra/README b/vppinfra/README
deleted file mode 100644
index 579696b6..00000000
--- a/vppinfra/README
+++ /dev/null
@@ -1,43 +0,0 @@
-Welcome to vppinfra a programming library of basic data structures.
-
-vec.c		dynamic vectors
-bitmap.h	dynamic bitmaps
-heap.c		allocation heap of objects (sub-objects have variable size)
-pool.h		allocation pool (like heap with size always 1)
-hash.c		dynamic hash tables
-mheap.c		memory allocator (a la dlmalloc)
-
-format.c	extendable printf-like thing built on top of vectors
-std-formats.c	formats for unix data structures, networking stuff, ...
-timer.c		arrange for functions to be called at given times.
-
-
-Build, Test, Install, Use...
-----------------------------
-    If this package came from the distribution tar ball, skip to the
-    Build Section.  If this was a gentoo ebuild, after emerge/ebuild,
-    skip to the Use Section; otherwise, start with Pre-Build.
-
-Pre-Build
------------
-    1) svn checkout svn://teaktechnologies.com/fn/trunk/clib clib
-    2) autoreconf [-v][-f][-i]	# regenerate configuration files
-
-Build
------
-    1) cd BUILD			#  which may be different than this SRC dir
-    2) ${SRC}/configure [--host=CHOST]
-    3) make
-
-Test
-----
-    If not cross-compiling (i.e. CBUILD == CHOST), use "make check" to
-    run the validation programs.
-
-Install
--------
-    With the root effective user ID (i.e. su or sudo), run "make install".
-
-Use
----
-    We need to reference man pages and theory of operation.
diff --git a/vppinfra/configure.ac b/vppinfra/configure.ac
deleted file mode 100644
index 88939383..00000000
--- a/vppinfra/configure.ac
+++ /dev/null
@@ -1,52 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_INIT(libvppinfra,1.0,)
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_HEADERS(config/config.h)
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([gnu no-dist-gzip dist-bzip2])
-AM_SILENT_RULES([yes])
-
-# Checks for programs.
-AC_PROG_CC
-AM_PROG_AS
-AM_PROG_LIBTOOL
-
-######################################################################
-
-dnl ------------
-dnl Check CFLAGS, CC
-dnl ------------
-AC_ARG_WITH(cc,
-	    AC_HELP_STRING([--with-cc],[Set CC for use as C compiler.]),
-	    [CC="$with_cc"])
-
-AC_ARG_WITH(cflags,
-	    AC_HELP_STRING([--with-cflags],[Set CFLAGS for use by C compiler.]),
-	    [CFLAGS="$with_cflags"])
-
-AC_ARG_WITH(ldflags,
-	    AC_HELP_STRING([--with-ldflags],[Set LDFLAGS for linking.]),
-	    [LDFLAGS="$with_ldflags"])
-
-######################################################################
-
-AC_ARG_ENABLE(tests,
-              AC_HELP_STRING([--enable-tests],[Enable unit tests]),
-              [enable_tests=1],
-              [enable_tests=0])
-
-AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" = "1")
-
-AC_ARG_WITH(unix,
-            AC_HELP_STRING([--with-unix],[Compile unix version of clib]),
-	    [],
-	    [case $host_os in
-	      darwin* | linux*) with_unix=yes;;
-	      *) with_unix=no;;
-	      esac])
-
-AM_CONDITIONAL(WITH_UNIX, test "$with_unix" = "yes")
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/vppinfra/dir.dox b/vppinfra/dir.dox
deleted file mode 100644
index dee0cd9c..00000000
--- a/vppinfra/dir.dox
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** @dir
- * @brief VPP infrastructure library and tools.
- */
diff --git a/vppinfra/mkinstalldirs b/vppinfra/mkinstalldirs
deleted file mode 100755
index d2d5f21b..00000000
--- a/vppinfra/mkinstalldirs
+++ /dev/null
@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-case $dirmode in
-  '')
-    if mkdir -p -- . 2>/dev/null; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    fi
-    ;;
-esac
-
-for file
-do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-  shift
-
-  pathcomp=
-  for d
-  do
-    pathcomp="$pathcomp$d"
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
-      else
-  	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
-      fi
-    fi
-
-    pathcomp="$pathcomp/"
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here
diff --git a/vppinfra/tools/dir.dox b/vppinfra/tools/dir.dox
deleted file mode 100644
index 40426e04..00000000
--- a/vppinfra/tools/dir.dox
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** @dir
- * @brief VPP instrastructure tools.
- */
diff --git a/vppinfra/tools/elftool.c b/vppinfra/tools/elftool.c
deleted file mode 100644
index d9d3704b..00000000
--- a/vppinfra/tools/elftool.c
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2008 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/elf.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#ifndef CLIB_UNIX
-#error "unix only"
-#endif
-
-typedef struct {
-  elf_main_t elf_main;
-  char * input_file;
-  char * output_file;
-  char * set_interpreter;
-  char * set_rpath;
-  int unset_rpath;
-  int verbose;
-  int quiet;
-  int allow_elf_shared;
-  /* for use in the optimized / simplified case */
-  u64 file_size;
-  u64 interpreter_offset;
-  u64 rpath_offset;
-} elf_tool_main_t;
-
-static clib_error_t * elf_set_interpreter (elf_main_t * em, 
-                                           elf_tool_main_t * tm)
-{
-  elf_segment_t * g;
-  elf_section_t * s;
-  clib_error_t * error;
-  char * interp = tm->set_interpreter;
-
-  switch (em->first_header.file_type)
-    {
-    case ELF_EXEC:
-      break;
-
-    case ELF_SHARED:
-      if (tm->allow_elf_shared)
-        break;
-      /* Note flowthrough */
-    default:
-      return clib_error_return (0, "unacceptable file_type");    
-    }
-
-  vec_foreach (g, em->segments)
-    {
-      if (g->header.type == ELF_SEGMENT_INTERP)
-	break;
-    }
-
-  if (g >= vec_end (em->segments))
-    return clib_error_return (0, "interpreter not found");
-
-  if (g->header.memory_size < 1 + strlen (interp))
-    return clib_error_return (0, "given interpreter does not fit; must be less than %d bytes (`%s' given)",
-			      g->header.memory_size, interp);
-
-  error = elf_get_section_by_start_address (em, g->header.virtual_address, &s);
-  if (error)
-    return error;
-
-  /* Put in new null terminated string. */
-  memset (s->contents, 0, vec_len (s->contents));
-  clib_memcpy (s->contents, interp, strlen (interp));
-
-  return 0;
-}
-
-static void
-delete_rpath_for_section (elf_main_t * em, elf_section_t * s)
-{
-  elf64_dynamic_entry_t * e;
-  elf64_dynamic_entry_t * new_es = 0;
-
-  vec_foreach (e, em->dynamic_entries)
-    {
-      switch (e->type)
-	{
-	case ELF_DYNAMIC_ENTRY_RPATH:
-	case ELF_DYNAMIC_ENTRY_RUN_PATH:
-	  break;
-
-	default:
-	  vec_add1 (new_es, e[0]);
-	  break;
-	}
-    }
-
-  /* Pad so as to keep section size constant. */
-  {
-    elf64_dynamic_entry_t e_end;
-    e_end.type = ELF_DYNAMIC_ENTRY_END;
-    e_end.data = 0;
-    while (vec_len (new_es) < vec_len (em->dynamic_entries))
-      vec_add1 (new_es, e_end);
-  }
-
-  vec_free (em->dynamic_entries);
-  em->dynamic_entries = new_es;
-
-  elf_set_dynamic_entries (em);
-}
-
-static void delete_rpath (elf_main_t * em)
-{
-  elf_section_t * s;
-
-  vec_foreach (s, em->sections)
-    {
-      switch (s->header.type)
-	{
-	case ELF_SECTION_DYNAMIC:
-	  delete_rpath_for_section (em, s);
-	  break;
-
-	default:
-	  break;
-	}
-    }
-}
-
-static clib_error_t *
-set_rpath_for_section (elf_main_t * em, elf_section_t * s, char * new_rpath)
-{
-  elf64_dynamic_entry_t * e;
-  char * old_rpath;
-  int old_len, new_len = strlen (new_rpath);
-  u8 * new_string_table = vec_dup (em->dynamic_string_table);
-
-  vec_foreach (e, em->dynamic_entries)
-    {
-      switch (e->type)
-	{
-	case ELF_DYNAMIC_ENTRY_RPATH:
-	case ELF_DYNAMIC_ENTRY_RUN_PATH:
-	  old_rpath = (char *) new_string_table + e->data;
-	  old_len = strlen (old_rpath);
-	  if (old_len < new_len)
-	    return clib_error_return (0, "rpath of `%s' does not fit (old rpath `%s')",
-				      new_rpath, old_rpath);
-	  strcpy (old_rpath, new_rpath);
-	  break;
-
-	default:
-	  break;
-	}
-    }
-
-  elf_set_section_contents (em, em->dynamic_string_table_section_index,
-			    new_string_table,
-			    vec_bytes (new_string_table));
-
-  return 0;
-}
-
-static clib_error_t *
-set_rpath (elf_main_t * em, char * rpath)
-{
-  clib_error_t * error = 0;
-  elf_section_t * s;
-
-  vec_foreach (s, em->sections)
-    {
-      switch (s->header.type)
-	{
-	case ELF_SECTION_DYNAMIC:
-	  error = set_rpath_for_section (em, s, rpath);
-	  if (error)
-	    return error;
-	  break;
-
-	default:
-	  break;
-	}
-    }
-
-  return error;
-}
-
-static clib_error_t *
-set_interpreter_rpath (elf_tool_main_t * tm)
-{
-  int ifd = -1, ofd = -1;
-  struct stat fd_stat;
-  u8 *idp = 0;                  /* warning be gone */
-  u64 mmap_length = 0, i;
-  u32 run_length;
-  u8 in_run;
-  u64 offset0 = 0, offset1 = 0;
-  clib_error_t * error = 0;
-  int fix_in_place = 0;
-
-  if (!strcmp (tm->input_file, tm->output_file))
-    fix_in_place = 1;
-
-  ifd = open (tm->input_file, O_RDWR);
-  if (ifd < 0)
-    {
-      error = clib_error_return_unix (0, "open `%s'", tm->input_file);
-      goto done;
-    }
-
-  if (fstat (ifd, &fd_stat) < 0)
-    {
-      error = clib_error_return_unix (0, "fstat `%s'", tm->input_file);
-      goto done;
-    }
-
-  if (!(fd_stat.st_mode & S_IFREG)) 
-    {
-      error = clib_error_return (0, "%s is not a regular file", tm->input_file);
-      goto done;
-    }
-
-  mmap_length = fd_stat.st_size;
-  if (mmap_length < 4)
-    {
-      error = clib_error_return (0, "%s too short", tm->input_file);
-      goto done;
-    }
-
-  /* COW-mapping, since we intend to write the fixups */
-  if (fix_in_place)
-    idp = mmap (0, mmap_length, PROT_READ | PROT_WRITE, MAP_SHARED, 
-              ifd, /* offset */ 0);
-  else
-    idp = mmap (0, mmap_length, PROT_READ | PROT_WRITE, MAP_PRIVATE, 
-              ifd, /* offset */ 0);
-  if (~pointer_to_uword (idp) == 0)
-    {
-      mmap_length = 0;
-      error = clib_error_return_unix (0, "mmap `%s'", tm->input_file);
-      goto done;
-    }
-  
-  if (idp[0] != 0x7f || idp[1] != 'E' || idp[2] != 'L' || idp[3] != 'F')
-    {
-      error = clib_error_return (0, "not an ELF file '%s'", tm->input_file);
-      goto done;
-    }
-
-  in_run = 0;
-  run_length = 0;
-
-  for (i = 0; i < mmap_length; i++)
-    {
-      if (idp[i] == '/')
-        {
-          if (in_run)
-            run_length++;
-          else
-            {
-              in_run = 1;
-              run_length = 1;
-            }
-        }
-      else
-        {
-          if (in_run && run_length >= 16)
-            {
-              if (offset0 == 0)
-                  offset0 = (i - run_length);
-              else if (offset1 == 0)
-                {
-                  offset1 = (i - run_length);
-                  goto found_both;
-                }
-            }
-          in_run = 0;
-          run_length = 0;
-        }
-    }
-
-  if (offset0 == 0)
-    {
-      error = clib_error_return (0, "no fixup markers in %s", 
-                                 tm->input_file);
-      goto done;
-    }
-
- found_both:
-  if (0)
-    clib_warning ("offset0 %lld (0x%llx), offset1 %lld (0x%llx)", 
-                  offset0, offset0, offset1, offset1);
-
-  /* Executable file case */
-  if (offset0 && offset1)
-    {
-      tm->interpreter_offset = offset0;
-      tm->rpath_offset = offset1;
-    }
-  else /* shared library case */                         
-    {
-      tm->interpreter_offset = 0;
-      tm->rpath_offset = offset0;
-    }
-  
-  if (tm->interpreter_offset)
-    clib_memcpy (&idp[tm->interpreter_offset], tm->set_interpreter, 
-            strlen (tm->set_interpreter)+1);
-
-  if (tm->rpath_offset)
-    clib_memcpy (&idp[tm->rpath_offset], tm->set_rpath, 
-            strlen (tm->set_rpath)+1);
-
-  /* Write the output file... */
-  if (fix_in_place == 0)
-    {
-      ofd = open (tm->output_file, O_RDWR | O_CREAT | O_TRUNC, 0644);
-      if (ofd < 0)
-        {
-          error = clib_error_return_unix (0, "create `%s'", tm->output_file);
-          goto done;
-        }
-
-      if (write (ofd, idp, mmap_length) != mmap_length)
-        error = clib_error_return_unix (0, "write `%s'", tm->output_file);
-    }
-
- done:
-  if (mmap_length > 0 && idp)
-    munmap (idp, mmap_length);
-  if (ifd >= 0)
-    close (ifd);
-  if (ofd >= 0)
-    close (ofd);
-  return error;
-}
-
-
-int main (int argc, char * argv[])
-{
-  elf_tool_main_t _tm, * tm = &_tm;
-  elf_main_t * em = &tm->elf_main;
-  unformat_input_t i;
-  clib_error_t * error = 0;
-
-  memset (tm, 0, sizeof (tm[0]));
-  unformat_init_command_line (&i, argv);
-
-  while (unformat_check_input (&i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (&i, "in %s", &tm->input_file))
-	;
-      else if (unformat (&i, "out %s", &tm->output_file))
-	;
-      else if (unformat (&i, "set-interpreter %s", &tm->set_interpreter))
-	;
-      else if (unformat (&i, "set-rpath %s", &tm->set_rpath))
-	;
-      else if (unformat (&i, "unset-rpath"))
-	tm->unset_rpath = 1;
-      else if (unformat (&i, "verbose"))
-	tm->verbose = ~0;
-      else if (unformat (&i, "verbose-symbols"))
-	tm->verbose |= FORMAT_ELF_MAIN_SYMBOLS;
-      else if (unformat (&i, "verbose-relocations"))
-	tm->verbose |= FORMAT_ELF_MAIN_RELOCATIONS;
-      else if (unformat (&i, "verbose-dynamic"))
-	tm->verbose |= FORMAT_ELF_MAIN_DYNAMIC;
-      else if (unformat (&i, "quiet"))
-	tm->quiet = 1;
-      else if (unformat (&i, "allow-elf-shared"))
-        tm->allow_elf_shared = 1;
-      else
-	{
-	  error = unformat_parse_error (&i);
-	  goto done;
-	}
-    }
-
-  if (! tm->input_file)
-    {
-      error = clib_error_return (0, "no input file");
-      goto done;
-    }
-
-  /* Do the typical case a stone-simple way... */
-  if (tm->quiet && tm->set_interpreter && tm->set_rpath && tm->output_file)
-    {
-      error = set_interpreter_rpath (tm);
-      goto done;
-    }
-
-  error = elf_read_file (em, tm->input_file);
-
-  if (error)
-    goto done;
-
-  if (tm->verbose)
-    fformat (stdout, "%U", format_elf_main, em, tm->verbose);
-
-  if (tm->set_interpreter)
-    {
-      error = elf_set_interpreter (em, tm);
-      if (error)
-	goto done;
-    }
-
-  if (tm->set_rpath)
-    {
-      error = set_rpath (em, tm->set_rpath);
-      if (error)
-	goto done;
-    }
-
-  if (tm->unset_rpath)
-    delete_rpath (em);
-
-  if (tm->output_file)
-    error = elf_write_file (em, tm->output_file);
-
-  elf_main_free (em);
-
- done:
-  if (error)
-    {
-      if (tm->quiet == 0)
-        clib_error_report (error);
-      return 1;
-    }
-  else
-    return 0;
-}
diff --git a/vppinfra/unix_error.def b/vppinfra/unix_error.def
deleted file mode 100644
index 76633dbb..00000000
--- a/vppinfra/unix_error.def
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-_ (EPERM, "Operation not permitted")
-_ (ENOENT, "No such file or directory")
-_ (ESRCH, "No such process")
-_ (EINTR, "Interrupted system call")
-_ (EIO, "I/O error")
-_ (ENXIO, "No such device or address")
-_ (E2BIG, "Arg list too long")
-_ (ENOEXEC, "Exec format error")
-_ (EBADF, "Bad file number")
-_ (ECHILD, "No child processes")
-_ (ENOMEM, "Out of memory")
-_ (EACCES, "Permission denied")
-_ (EFAULT, "Bad address")
-_ (ENOTBLK, "Block device required")
-_ (EBUSY, "Device or resource busy")
-_ (EEXIST, "File exists")
-_ (EXDEV, "Cross-device link")
-_ (ENODEV, "No such device")
-_ (ENOTDIR, "Not a directory")
-_ (EISDIR, "Is a directory")
-_ (EINVAL, "Invalid argument")
-_ (ENFILE, "File table overflow")
-_ (EMFILE, "Too many open files")
-_ (ENOTTY, "Not a typewriter")
-_ (ETXTBSY, "Text file busy")
-_ (EFBIG, "File too large")
-_ (ENOSPC, "No space left on device")
-_ (ESPIPE, "Illegal seek")
-_ (EROFS, "Read-only file system")
-_ (EMLINK, "Too many links")
-_ (EPIPE, "Broken pipe")
-_ (EDOM, "Math argument out of domain of func")
-_ (ERANGE, "Math result not representable")
-_ (EDEADLK, "Resource deadlock would occur")
-_ (ENAMETOOLONG, "File name too long")
-_ (ENOLCK, "No record locks available")
-_ (ENOSYS, "Function not implemented")
-_ (ENOTEMPTY, "Directory not empty")
-_ (ELOOP, "Too many symbolic links encountered")
-_ (EWOULDBLOCK, "Operation would block")
-_ (ENOMSG, "No message of desired type")
-_ (EIDRM, "Identifier removed")
-_ (ECHRNG, "Channel number out of range")
-_ (EL2NSYNC, "Level 2 not synchronized")
-_ (EL3HLT, "Level 3 halted")
-_ (EL3RST, "Level 3 reset")
-_ (ELNRNG, "Link number out of range")
-_ (EUNATCH, "Protocol driver not attached")
-_ (ENOCSI, "No CSI structure available")
-_ (EL2HLT, "Level 2 halted")
-_ (EBADE, "Invalid exchange")
-_ (EBADR, "Invalid request descriptor")
-_ (EXFULL, "Exchange full")
-_ (ENOANO, "No anode")
-_ (EBADRQC, "Invalid request code")
-_ (EBADSLT, "Invalid slot")
-_ (EBFONT, "Bad font file format")
-_ (ENOSTR, "Device not a stream")
-_ (ENODATA, "No data available")
-_ (ETIME, "Timer expired")
-_ (ENOSR, "Out of streams resources")
-_ (ENONET, "Machine is not on the network")
-_ (ENOPKG, "Package not installed")
-_ (EREMOTE, "Object is remote")
-_ (ENOLINK, "Link has been severed")
-_ (EADV, "Advertise error")
-_ (ESRMNT, "Srmount error")
-_ (ECOMM, "Communication error on send")
-_ (EPROTO, "Protocol error")
-_ (EMULTIHOP, "Multihop attempted")
-_ (EDOTDOT, "RFS specific error")
-_ (EBADMSG, "Not a data message")
-_ (EOVERFLOW, "Value too large for defined data type")
-_ (ENOTUNIQ, "Name not unique on network")
-_ (EBADFD, "File descriptor in bad state")
-_ (EREMCHG, "Remote address changed")
-_ (ELIBACC, "Can not access a needed shared library")
-_ (ELIBBAD, "Accessing a corrupted shared library")
-_ (ELIBSCN, "lib section in a.out corrupted")
-_ (ELIBMAX, "Attempting to link in too many shared libraries")
-_ (ELIBEXEC, "Cannot exec a shared library directly")
-_ (EILSEQ, "Illegal byte sequence")
-_ (ERESTART, "Interrupted system call should be restarted")
-_ (ESTRPIPE, "Streams pipe error")
-_ (EUSERS, "Too many users")
-_ (ENOTSOCK, "Socket operation on non-socket")
-_ (EDESTADDRREQ, "Destination address required")
-_ (EMSGSIZE, "Message too long")
-_ (EPROTOTYPE, "Protocol wrong type for socket")
-_ (ENOPROTOOPT, "Protocol not available")
-_ (EPROTONOSUPPORT, "Protocol not supported")
-_ (ESOCKTNOSUPPORT, "Socket type not supported")
-_ (EOPNOTSUPP, "Operation not supported on transport endpoint")
-_ (EPFNOSUPPORT, "Protocol family not supported")
-_ (EAFNOSUPPORT, "Address family not supported by protocol")
-_ (EADDRINUSE, "Address already in use")
-_ (EADDRNOTAVAIL, "Cannot assign requested address")
-_ (ENETDOWN, "Network is down")
-_ (ENETUNREACH, "Network is unreachable")
-_ (ENETRESET, "Network dropped connection because of reset")
-_ (ECONNABORTED, "Software caused connection abort")
-_ (ECONNRESET, "Connection reset by peer")
-_ (ENOBUFS, "No buffer space available")
-_ (EISCONN, "Transport endpoint is already connected")
-_ (ENOTCONN, "Transport endpoint is not connected")
-_ (ESHUTDOWN, "Cannot send after transport endpoint shutdown")
-_ (ETOOMANYREFS, "Too many references: cannot splice")
-_ (ETIMEDOUT, "Connection timed out")
-_ (ECONNREFUSED, "Connection refused")
-_ (EHOSTDOWN, "Host is down")
-_ (EHOSTUNREACH, "No route to host")
-_ (EALREADY, "Operation already in progress")
-_ (EINPROGRESS, "Operation now in progress")
-_ (ESTALE, "Stale NFS file handle")
-_ (EUCLEAN, "Structure needs cleaning")
-_ (ENOTNAM, "Not a XENIX named type file")
-_ (ENAVAIL, "No XENIX semaphores available")
-_ (EISNAM, "Is a named type file")
-_ (EREMOTEIO, "Remote I/O error")
-_ (EDQUOT, "Quota exceeded")
-_ (ENOMEDIUM, "No medium found")
-_ (EMEDIUMTYPE, "Wrong medium type")
diff --git a/vppinfra/vppinfra/anneal.c b/vppinfra/vppinfra/anneal.c
deleted file mode 100644
index 35d10946..00000000
--- a/vppinfra/vppinfra/anneal.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-  Copyright (c) 2011 Cisco and/or its affiliates.
-
-  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#include <vppinfra/anneal.h>
-
-/*
- * Optimize an objective function by simulated annealing
- *
- * Here are a couple of short, easily-understood
- * descriptions of simulated annealing:
- *
- * http://www.cs.sandia.gov/opt/survey/sa.html
- * Numerical Recipes in C, 2nd ed., 444ff
- *
- * The description in the Wikipedia is not helpful.
- *
- * The algorithm tries to produce a decent answer to combinatorially
- * explosive optimization problems by analogy to slow cooling
- * of hot metal, aka annealing.
- *
- * There are (at least) three problem-dependent annealing parameters
- * to consider:
- *
- * t0, the initial "temperature. Should be set so that the probability
- * of accepting a transition to a higher cost configuration is
- * initially about 0.8.
- *
- * ntemps, the number of temperatures to use. Each successive temperature
- * is some fraction of the previous temperature.
- *
- * nmoves_per_temp, the number of configurations to try at each temperature
- *
- * It is a black art to set ntemps, nmoves_per_temp, and the rate
- * at which the temperature drops. Go too fast with too few iterations,
- * and the computation falls into a local minimum instead of the
- * (desired) global minimum.
- */
-
-void
-clib_anneal (clib_anneal_param_t * p)
-{
-  f64 t;
-  f64 cost, prev_cost, delta_cost, initial_cost, best_cost;
-  f64 random_accept, delta_cost_over_t;
-  f64 total_increase = 0.0, average_increase;
-  u32 i, j;
-  u32 number_of_increases = 0;
-  u32 accepted_this_temperature;
-  u32 best_saves_this_temperature;
-  int accept;
-
-  t = p->initial_temperature;
-  best_cost = initial_cost = prev_cost = p->anneal_metric (p->opaque);
-  p->anneal_save_best_configuration (p->opaque);
-
-  if (p->flags & CLIB_ANNEAL_VERBOSE)
-    fformat (stdout, "Initial cost %.2f\n", initial_cost);
-
-  for (i = 0; i < p->number_of_temperatures; i++)
-    {
-      accepted_this_temperature = 0;
-      best_saves_this_temperature = 0;
-
-      p->anneal_restore_best_configuration (p->opaque);
-      cost = best_cost;
-
-      for (j = 0; j < p->number_of_configurations_per_temperature; j++)
-	{
-	  p->anneal_new_configuration (p->opaque);
-	  cost = p->anneal_metric (p->opaque);
-
-	  delta_cost = cost - prev_cost;
-
-	  /* cost function looks better, accept this move */
-	  if (p->flags & CLIB_ANNEAL_MINIMIZE)
-	    accept = delta_cost < 0.0;
-	  else
-	    accept = delta_cost > 0.0;
-
-	  if (accept)
-	    {
-	      if (p->flags & CLIB_ANNEAL_MINIMIZE)
-		if (cost < best_cost)
-		  {
-		    if (p->flags & CLIB_ANNEAL_VERBOSE)
-		      fformat (stdout, "New best cost %.2f\n", cost);
-		    best_cost = cost;
-		    p->anneal_save_best_configuration (p->opaque);
-		    best_saves_this_temperature++;
-		  }
-
-	      accepted_this_temperature++;
-	      prev_cost = cost;
-	      continue;
-	    }
-
-	  /* cost function worse, keep stats to suggest t0 */
-	  total_increase += (p->flags & CLIB_ANNEAL_MINIMIZE) ?
-	    delta_cost : -delta_cost;
-
-	  number_of_increases++;
-
-	  /*
-	   * Accept a higher cost with Pr { e^(-(delta_cost / T)) },
-	   * equivalent to rnd[0,1] < e^(-(delta_cost / T))
-	   *
-	   * AKA, the Boltzmann factor.
-	   */
-	  random_accept = random_f64 (&p->random_seed);
-
-	  delta_cost_over_t = delta_cost / t;
-
-	  if (random_accept < exp (-delta_cost_over_t))
-	    {
-	      accepted_this_temperature++;
-	      prev_cost = cost;
-	      continue;
-	    }
-	  p->anneal_restore_previous_configuration (p->opaque);
-	}
-
-      if (p->flags & CLIB_ANNEAL_VERBOSE)
-	{
-	  fformat (stdout, "Temp %.2f, cost %.2f, accepted %d, bests %d\n", t,
-		   prev_cost, accepted_this_temperature,
-		   best_saves_this_temperature);
-	  fformat (stdout, "Improvement %.2f\n", initial_cost - prev_cost);
-	  fformat (stdout, "-------------\n");
-	}
-
-      t = t * p->temperature_step;
-    }
-
-  /*
-   * Empirically, one wants the probability of accepting a move
-   * at the initial temperature to be about 0.8.
-   */
-  average_increase = total_increase / (f64) number_of_increases;
-  p->suggested_initial_temperature = average_increase / 0.22;	/* 0.22 = -ln (0.8) */
-
-  p->final_temperature = t;
-  p->final_metric = p->anneal_metric (p->opaque);
-
-  if (p->flags & CLIB_ANNEAL_VERBOSE)
-    {
-      fformat (stdout, "Average cost increase from a bad move: %.2f\n",
-	       average_increase);
-      fformat (stdout, "Suggested t0 = %.2f\n",
-	       p->suggested_initial_temperature);
-    }
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/anneal.h b/vppinfra/vppinfra/anneal.h
deleted file mode 100644
index 148d38ba..00000000
--- a/vppinfra/vppinfra/anneal.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-  Copyright (c) 2011 Cisco and/or its affiliates.
-
-  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#ifndef __included_anneal_h__
-#define __included_anneal_h__
-
-#include <vppinfra/clib.h>
-#include <vppinfra/format.h>
-#include <vppinfra/random.h>
-#include <math.h>
-
-typedef struct
-{
-  /* Initial temperature */
-  f64 initial_temperature;
-
-  /* Temperature fraction at each step, 0.95 is reasonable */
-  f64 temperature_step;
-
-  /* Number of temperatures used */
-  u32 number_of_temperatures;
-
-  /* Number of configurations tried at each temperature */
-  u32 number_of_configurations_per_temperature;
-
-  u32 flags;
-#define CLIB_ANNEAL_VERBOSE (1<<0)
-#define CLIB_ANNEAL_MINIMIZE (1<<1)	/* mutually exclusive */
-#define CLIB_ANNEAL_MAXIMIZE (1<<2)	/* mutually exclusive */
-
-  /* Random number seed, set to ensure repeatable results */
-  u32 random_seed;
-
-  /* Opaque data passed to callbacks */
-  void *opaque;
-
-  /* Final temperature (output) */
-  f64 final_temperature;
-
-  /* Final metric (output) */
-  f64 final_metric;
-
-  /* Suggested initial temperature (output) */
-  f64 suggested_initial_temperature;
-
-
-  /*--- Callbacks ---*/
-
-  /* objective function to minimize */
-    f64 (*anneal_metric) (void *opaque);
-
-  /* Generate a new configuration */
-  void (*anneal_new_configuration) (void *opaque);
-
-  /* Restore the previous configuration */
-  void (*anneal_restore_previous_configuration) (void *opaque);
-
-  /* Save best configuration found e.g at a certain temperature */
-  void (*anneal_save_best_configuration) (void *opaque);
-
-  /* restore best configuration found e.g at a certain temperature */
-  void (*anneal_restore_best_configuration) (void *opaque);
-
-} clib_anneal_param_t;
-
-void clib_anneal (clib_anneal_param_t * p);
-
-#endif /* __included_anneal_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/asm_mips.h b/vppinfra/vppinfra/asm_mips.h
deleted file mode 100644
index 7c9e6958..00000000
--- a/vppinfra/vppinfra/asm_mips.h
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2004 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_asm_mips_h
-#define included_asm_mips_h
-
-/* Encoding of MIPS instructions. */
-/* Encoding of opcode field (op). */
-#define mips_foreach_opcode						\
-  _(SPECIAL) _(REGIMM) _(j) _(jal) _(beq) _(bne) _(blez) _(bgtz)	\
-  _(addi) _(addiu) _(slti) _(sltiu) _(andi) _(ori) _(xori) _(lui)	\
-  _(COP0) _(COP1) _(COP2) _(COP1X) _(beql) _(bnel) _(blezl) _(bgtzl)	\
-  _(daddi) _(daddiu) _(ldl) _(ldr) _(SPECIAL2) _(jalx) _(MDMX) _(O37)	\
-  _(lb) _(lh) _(lwl) _(lw) _(lbu) _(lhu) _(lwr) _(lwu)			\
-  _(sb) _(sh) _(swl) _(sw) _(sdl) _(sdr) _(swr) _(cache)		\
-  _(ll) _(lwc1) _(lwc2) _(pref) _(lld) _(ldc1) _(ldc2) _(ld)		\
-  _(sc) _(swc1) _(swc2) _(o73)  _(scd) _(sdc1) _(sdc2) _(sd)
-
-/* Encoding of funct field. */
-#define mips_foreach_special_funct					\
-  _(sll) _(MOVCI) _(srl) _(sra) _(sllv) _(o05) _(srlv) _(srav)		\
-  _(jr) _(jalr) _(movz) _(movn) _(syscall) _(break) _(o16) _(sync)	\
-  _(mfhi) _(mthi) _(mflo) _(mtlo) _(dsllv) _(o25) _(dsrlv) _(dsrav)	\
-  _(mult) _(multu) _(div) _(divu) _(dmult) _(dmultu) _(ddiv) _(ddivu)	\
-  _(add) _(addu) _(sub) _(subu) _(and) _(or) _(xor) _(nor)		\
-  _(o50) _(o51) _(slt) _(sltu) _(dadd) _(daddu) _(dsub) _(dsubu)	\
-  _(tge) _(tgeu) _(tlt) _(tltu) _(teq) _(o65) _(tne) _(o67)		\
-  _(dsll) _(o71) _(dsrl) _(dsra) _(dsll32) _(o75) _(dsrl32) _(dsra32)
-
-/* SPECIAL2 encoding of funct field. */
-#define mips_foreach_special2_funct				\
-  _(madd) _(maddu) _(mul) _(o03) _(msub) _(msubu) _(o06) _(o07)	\
-  _(o10) _(o11) _(o12) _(o13) _(o14) _(o15) _(o16) _(o17)	\
-  _(o20) _(o21) _(o22) _(o23) _(o24) _(o25) _(o26) _(o27)	\
-  _(o30) _(o31) _(o32) _(o33) _(o34) _(o35) _(o36) _(o37)	\
-  _(clz) _(clo) _(o42) _(o43) _(dclz) _(dclo) _(o46) _(o47)	\
-  _(o50) _(o51) _(o52) _(o53) _(o54) _(o55) _(o56) _(o57)	\
-  _(o60) _(o61) _(o62) _(o63) _(o64) _(o65) _(o66) _(o67)	\
-  _(o70) _(o71) _(o72) _(o73) _(o74) _(o75) _(o76) _(sdbbp)
-
-/* REGIMM encoding of rt field. */
-#define mips_foreach_regimm_rt						\
-  _(bltz) _(bgez) _(bltzl) _(bgezl) _(o04) _(o05) _(o06) _(o07)		\
-  _(tgei) _(tgeiu) _(tltiu) _(teqi) _(o14) _(tnei) _(o16) _(o17)	\
-  _(bltzal) _(bgezal) _(bltzall) _(bgezall) _(o24) _(o25) _(o26) _(o27)	\
-  _(o30) _(o31) _(o32) _(o33) _(o34) _(o35) _(o36) _(o37)
-
-/* COP0 encoding of rs field. */
-#define mips_foreach_cop0_rs					\
-  _(mfc0) _(dmfc0) _(o02) _(o03) _(mtc0) _(dmtc0) _(o06) _(o07)	\
-  _(o10) _(o11) _(o12) _(o13) _(o14) _(o15) _(o16) _(o17)	\
-  _(C0) _(o21) _(o22) _(o23) _(o24) _(o25) _(o26) _(o27)	\
-  _(o30) _(o31) _(o32) _(o33) _(o34) _(o35) _(o36) _(o37)
-
-/* COP0 encoding of funct when rs == RS_CO */
-#define mips_foreach_cop0_funct					\
-  _(o00) _(tlbr) _(tlbwi) _(o03) _(o04) _(o05) _(tlbwr) _(o07)	\
-  _(tlbp) _(o11) _(o12) _(o13) _(o14) _(o15) _(o16) _(o17)	\
-  _(o20) _(o21) _(o22) _(o23) _(o24) _(o25) _(o26) _(o27)	\
-  _(eret) _(o31) _(o32) _(o33) _(o34) _(o35) _(o36) _(deret)	\
-  _(wait) _(o41) _(o42) _(o43) _(o44) _(o45) _(o46) _(o47)	\
-  _(o50) _(o51) _(o52) _(o53) _(o54) _(o55) _(o56) _(o57)	\
-  _(o60) _(o61) _(o62) _(o63) _(o64) _(o65) _(o66) _(o67)	\
-  _(o70) _(o71) _(o72) _(o73) _(o74) _(o75) _(o76) _(o77)
-
-/* COP1 encoding of rs field. */
-#define mips_foreach_cop1_rs						\
-  _(mfc1) _(dmfc1) _(cfc1) _(o03) _(mtc1) _(dmtc1) _(ctc1) _(o07)	\
-  _(BC1) _(o11) _(o12) _(o13) _(o14) _(o15) _(o16) _(o17)		\
-  _(S) _(D) _(o22) _(o23) _(W) _(L) _(o26) _(o27)			\
-  _(o30) _(o31) _(o32) _(o33) _(o34) _(o35) _(o36) _(o37)
-
-/* COP1 encoding of funct for S and D */
-#define mips_foreach_cop1_funct								\
-  _(add) _(sub) _(mul) _(div) _(sqrt) _(abs) _(mov) _(neg)				\
-  _(roundl) _(truncl) _(ceill) _(floorl) _(roundw) _(truncw) _(ceilw) _(floorw) 	\
-  _(o20) _(MOVCF) _(movz) _(movn) _(o24) _(recip) _(rsqrt) _(o27)			\
-  _(o30) _(o31) _(o32) _(o33) _(o34) _(o35) _(o36) _(o37)				\
-  _(cvts) _(cvtd) _(o42) _(o43) _(cvtw) _(cvtl) _(o46) _(o47)				\
-  _(o50) _(o51) _(o52) _(o53) _(o54) _(o55) _(o56) _(o57)				\
-  _(cf) _(cun) _(ceq) _(cueq) _(colt) _(cult) _(cole) _(cule)				\
-  _(csf) _(cngle) _(cseq) _(cngl) _(clt) _(cnge) _(cle) _(cngt)
-
-/* COP1X encoding of funct */
-#define mips_foreach_cop1x_funct					\
-  _(lwxc1) _(ldxc1) _(o02) _(o03) _(o04) _(luxc1) _(o06) _(o07)		\
-  _(swxc1) _(sdxc1) _(o12) _(o13) _(o14) _(suxc1) _(o16) _(prefx)	\
-  _(o20) _(o21) _(o22) _(o23) _(o24) _(o25) _(o26) _(o27)		\
-  _(o30) _(o31) _(o32) _(o33) _(o34) _(o35) _(o36) _(o37)		\
-  _(madds) _(maddd) _(o42) _(o43) _(o44) _(o45) _(o46) _(o47)		\
-  _(msubs) _(msubd) _(o52) _(o53) _(o54) _(o55) _(o56) _(o57)		\
-  _(nmadds) _(nmaddd) _(o62) _(o63) _(o64) _(o65) _(o66) _(o67)		\
-  _(nmsubs) _(nmsubd) _(o72) _(o73) _(o74) _(o75) _(o76) _(o77)
-
-#define mips_foreach_mdmx_funct						\
-  _(msgn) _(ceq) _(pickf) _(pickt) _(clt) _(cle) _(min) _(max)		\
-  _(o10) _(o11) _(sub) _(add) _(and) _(xor) _(or) _(nor)		\
-  _(sll) _(o21) _(srl) _(sra) _(o24) _(o25) _(o26) _(o27)		\
-  _(alniob) _(alnvob) _(alniqh) _(alnvqh) _(o34) _(o35) _(o36) _(shfl)	\
-  _(rzu) _(rnau) _(rneu) _(o43) _(rzs) _(rnas) _(rnes) _(o47)		\
-  _(o50) _(o51) _(o52) _(o53) _(o54) _(o55) _(o56) _(o57)		\
-  _(mul) _(o61) _(muls) _(mula) _(o64) _(o65) _(suba) _(adda)		\
-  _(o70) _(o71) _(o72) _(o73) _(o74) _(o75) _(wac) _(rac)
-
-#define _(f) MIPS_OPCODE_##f,
-typedef enum
-{
-  mips_foreach_opcode
-} mips_insn_opcode_t;
-#undef _
-
-#define _(f) MIPS_SPECIAL_FUNCT_##f,
-typedef enum
-{
-  mips_foreach_special_funct
-} mips_insn_special_funct_t;
-#undef _
-
-#define _(f) MIPS_SPECIAL2_FUNCT_##f,
-typedef enum
-{
-  mips_foreach_special2_funct
-} mips_insn_special2_funct_t;
-#undef _
-
-#define _(f) MIPS_REGIMM_RT_##f,
-typedef enum
-{
-  mips_foreach_regimm_rt
-} mips_insn_regimm_rt_t;
-#undef _
-
-#define _(f) MIPS_COP0_RS_##f,
-typedef enum
-{
-  mips_foreach_cop0_rs
-} mips_insn_cop0_rs_t;
-#undef _
-
-#define _(f) MIPS_COP0_FUNCT_##f,
-typedef enum
-{
-  mips_foreach_cop0_funct
-} mips_insn_cop0_funct_t;
-#undef _
-
-#define _(f) MIPS_COP1_RS_##f,
-typedef enum
-{
-  mips_foreach_cop1_rs
-} mips_insn_cop1_rs_t;
-#undef _
-
-#define _(f) MIPS_COP1_FUNCT_##f,
-typedef enum
-{
-  mips_foreach_cop1_funct
-} mips_insn_cop1_funct_t;
-#undef _
-
-#define _(f) MIPS_COP1X_FUNCT_##f,
-typedef enum
-{
-  mips_foreach_cop1x_funct
-} mips_insn_cop1x_funct_t;
-#undef _
-
-#define _(f) MIPS_MDMX_FUNCT_##f,
-typedef enum
-{
-  mips_foreach_mdmx_funct
-} mips_insn_mdmx_funct_t;
-#undef _
-
-always_inline mips_insn_opcode_t
-mips_insn_get_op (u32 insn)
-{
-  return (insn >> 26) & 0x3f;
-}
-
-always_inline u32
-mips_insn_get_rs (u32 insn)
-{
-  return (insn >> 21) & 0x1f;
-}
-
-always_inline u32
-mips_insn_get_rt (u32 insn)
-{
-  return (insn >> 16) & 0x1f;
-}
-
-always_inline u32
-mips_insn_get_rd (u32 insn)
-{
-  return (insn >> 11) & 0x1f;
-}
-
-always_inline u32
-mips_insn_get_sa (u32 insn)
-{
-  return (insn >> 6) & 0x1f;
-}
-
-always_inline u32
-mips_insn_get_funct (u32 insn)
-{
-  return (insn >> 0) & 0x3f;
-}
-
-always_inline i32
-mips_insn_get_immediate (u32 insn)
-{
-  return (((i32) insn) << 16) >> 16;
-}
-
-always_inline u32
-mips_insn_encode_i_type (int op, int rs, int rt, int immediate)
-{
-  u32 insn;
-  insn = immediate;
-  insn |= rt << 16;
-  insn |= rs << 21;
-  insn |= op << 26;
-
-  ASSERT (mips_insn_get_immediate (insn) == immediate);
-  ASSERT (mips_insn_get_rt (insn) == rt);
-  ASSERT (mips_insn_get_rs (insn) == rt);
-  ASSERT (mips_insn_get_op (insn) == op);
-
-  return insn;
-}
-
-always_inline u32
-mips_insn_encode_j_type (int op, u32 addr)
-{
-  u32 insn;
-
-  insn = (addr & ((1 << 28) - 1)) / 4;
-  insn |= op << 26;
-
-  return insn;
-}
-
-always_inline u32
-mips_insn_encode_r_type (int op, int rs, int rt, int rd, int sa, int funct)
-{
-  u32 insn;
-  insn = funct;
-  insn |= sa << 6;
-  insn |= rd << 11;
-  insn |= rt << 16;
-  insn |= rs << 21;
-  insn |= op << 26;
-
-  ASSERT (mips_insn_get_funct (insn) == funct);
-  ASSERT (mips_insn_get_sa (insn) == sa);
-  ASSERT (mips_insn_get_rd (insn) == rd);
-  ASSERT (mips_insn_get_rt (insn) == rt);
-  ASSERT (mips_insn_get_rs (insn) == rt);
-  ASSERT (mips_insn_get_op (insn) == op);
-
-  return insn;
-}
-
-#define mips_insn_r(op,funct,rd,rs,rt,sa)		\
-  mips_insn_encode_r_type (MIPS_OPCODE_##op,		\
-			   (rs), (rt), (rd), (sa),	\
-			   MIPS_##op##_FUNCT_##funct)
-
-#define mips_insn_i(op,rs,rt,imm) \
-  mips_insn_encode_i_type (MIPS_OPCODE_##op, (rs), (rt), (imm))
-
-#define mips_insn_j(op,target) \
-  mips_insn_encode_i_type (MIPS_OPCODE_##op, (rs), (rt), (imm))
-
-/* Generate unsigned load instructions of data of various sizes. */
-always_inline u32
-mips_insn_load (u32 rd, i32 offset, u32 base, u32 log2_bytes)
-{
-  int op;
-
-  ASSERT (log2_bytes < 4);
-  switch (log2_bytes)
-    {
-    case 0:
-      op = MIPS_OPCODE_lbu;
-      break;
-    case 1:
-      op = MIPS_OPCODE_lhu;
-      break;
-    case 2:
-      op = MIPS_OPCODE_lwu;
-      break;
-    case 3:
-      op = MIPS_OPCODE_ld;
-      break;
-    }
-
-  return mips_insn_encode_i_type (op, base, rd, offset);
-}
-
-typedef enum
-{
-  MIPS_REG_SP = 29,
-  MIPS_REG_RA = 31,
-} mips_reg_t;
-
-#endif /* included_asm_mips_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/asm_x86.c b/vppinfra/vppinfra/asm_x86.c
deleted file mode 100644
index 16e41c24..00000000
--- a/vppinfra/vppinfra/asm_x86.c
+++ /dev/null
@@ -1,1947 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* FIXME
-   opcode name remove to save table space; enum
-   x87
-   3dnow
-   cbw naming
-*/
-
-#include <vppinfra/error.h>
-#include <vppinfra/byte_order.h>
-#include <vppinfra/asm_x86.h>
-
-#define foreach_x86_gp_register			\
-  _  (AX)  _ (CX)  _ (DX)  _ (BX)		\
-  _  (SP)  _ (BP)  _ (SI)  _ (DI)
-
-typedef enum {
-#define _(r) X86_INSN_GP_REG_##r,
-  foreach_x86_gp_register
-#undef _
-} x86_insn_gp_register_t;
-
-typedef union {
-  struct {
-    u8 rm : 3;
-    u8 reg : 3;
-    u8 mode : 2;
-  };
-  u8 byte;
-} x86_insn_modrm_byte_t;
-
-typedef union {
-  struct {
-    u8 base : 3;
-    u8 index : 3;
-    u8 log2_scale : 2;
-  };
-  u8 byte;
-} x86_insn_sib_byte_t;
-
-always_inline uword
-x86_insn_has_modrm_byte (x86_insn_t * insn)
-{
-  int i;
-  for (i = 0; i < ARRAY_LEN (insn->operands); i++)
-    switch (insn->operands[i].code)
-      {
-      case 'G': case 'E': case 'M': case 'R':
-	return 1;
-      }
-  return 0;
-}
-
-always_inline uword
-x86_insn_immediate_type (x86_insn_t * insn)
-{
-  int i;
-  for (i = 0; i < ARRAY_LEN (insn->operands); i++)
-    switch (insn->operands[i].code)
-      {
-      case 'J':
-      case 'I':
-      case 'O':
-	return insn->operands[i].type;
-      }
-  return 0;
-}
-
-/* Opcode extension in modrm byte reg field. */
-#define foreach_x86_insn_modrm_reg_group		\
-  _ (1) _ (1a) _ (2) _ (3) _ (4) _ (5) _ (6) _ (7)	\
-  _ (8) _ (9) _ (10) _ (11) _ (12) _ (13) _ (14)	\
-  _ (15) _ (16) _ (p)
-
-#define foreach_x86_insn_sse_group				\
-  _ (10) _ (28) _ (50) _ (58) _ (60) _ (68) _ (70) _ (78)	\
-  _ (c0) _ (d0) _ (d8) _ (e0) _ (e8) _ (f0) _ (f8)
-
-enum {
-#define _(x) X86_INSN_MODRM_REG_GROUP_##x,
-  foreach_x86_insn_modrm_reg_group
-#undef _
-#define _(x) X86_INSN_SSE_GROUP_##x,
-  foreach_x86_insn_sse_group
-#undef _
-};
-
-enum {
-#define _(x)								\
-  X86_INSN_FLAG_MODRM_REG_GROUP_##x					\
-  = X86_INSN_FLAG_SET_MODRM_REG_GROUP (1 + X86_INSN_MODRM_REG_GROUP_##x),
-  foreach_x86_insn_modrm_reg_group
-#undef _
-
-#define _(x)							\
-  X86_INSN_FLAG_SSE_GROUP_##x					\
-  = X86_INSN_FLAG_SET_SSE_GROUP (1 + X86_INSN_SSE_GROUP_##x),
-  foreach_x86_insn_sse_group
-#undef _
-};
-
-#define foreach_x86_gp_reg			\
-  _ (AX) _ (CX) _ (DX) _ (BX)			\
-  _ (SP) _ (BP) _ (SI) _ (DI)
-
-#define foreach_x86_condition			\
-  _ (o) _ (no)  _ (b) _ (nb)			\
-  _ (z) _ (nz) _ (be) _ (nbe)			\
-  _ (s) _ (ns)  _ (p) _ (np)			\
-  _ (l) _ (nl) _ (le) _ (nle)
-
-#define _3f(x,f,o0,o1,o2)			\
-{						\
-  .name = #x,					\
-  .flags = (f),					\
-  .operands[0] = { .data = #o0 },		\
-  .operands[1] = { .data = #o1 },		\
-  .operands[2] = { .data = #o2 },		\
-}
-
-#define _2f(x,f,o0,o1)	_3f(x,f,o0,o1,__)
-#define _1f(x,f,o0)	_2f(x,f,o0,__)
-#define _0f(x,f)	_1f(x,f,__)
-
-#define _3(x,o0,o1,o2)	_3f(x,0,o0,o1,o2)
-#define _2(x,o0,o1)	_2f(x,0,o0,o1)
-#define _1(x,o0)	_1f(x,0,o0)
-#define _0(x)		_0f(x,0)
-
-static x86_insn_t x86_insns_one_byte[256] = {
-
-#define _(x)					\
-  _2 (x, Eb, Gb),				\
-  _2 (x, Ev, Gv),				\
-  _2 (x, Gb, Eb),				\
-  _2 (x, Gv, Ev),				\
-  _2 (x, AL, Ib),				\
-  _2 (x, AX, Iz)
-
-  /* 0x00 */
-  _ (add),
-  _0 (push_es),
-  _0 (pop_es),
-  _ (or),
-  _0 (push_cs),
-  _0 (escape_two_byte),
-
-  /* 0x10 */
-  _ (adc),
-  _0 (push_ss),
-  _0 (pop_ss),
-  _ (sbb),
-  _0 (push_ds),
-  _0 (pop_ds),
-
-  /* 0x20 */
-  _ (and),
-  _0 (segment_es),
-  _0 (daa),
-  _ (sub),
-  _0 (segment_cs),
-  _0 (das),
-
-  /* 0x30 */
-  _ (xor),
-  _0 (segment_ss),
-  _0 (aaa),
-  _ (cmp),
-  _0 (segment_ds),
-  _0 (aas),
-
-#undef _
-
-  /* 0x40 */
-#define _(r) _1 (inc, r),
-  foreach_x86_gp_reg
-#undef _
-#define _(r) _1 (dec, r),
-  foreach_x86_gp_reg
-#undef _
-
-  /* 0x50 */
-#define _(r) _1f (push, X86_INSN_FLAG_DEFAULT_64_BIT, r),
-  foreach_x86_gp_reg
-#undef _
-#define _(r) _1f (pop, X86_INSN_FLAG_DEFAULT_64_BIT, r),
-  foreach_x86_gp_reg
-#undef _
-
-  /* 0x60 */
-  _0 (pusha),
-  _0 (popa),
-  _2 (bound, Gv, Ma),
-  _2 (movsxd, Gv, Ed),
-  _0 (segment_fs),
-  _0 (segment_gs),
-  _0 (operand_type),
-  _0 (address_size),
-  _1f (push, X86_INSN_FLAG_DEFAULT_64_BIT, Iz),
-  _3 (imul, Gv, Ev, Iz),
-  _1f (push, X86_INSN_FLAG_DEFAULT_64_BIT, Ib),
-  _3 (imul, Gv, Ev, Ib),
-  _1 (insb, DX),
-  _1 (insw, DX),
-  _1 (outsb, DX),
-  _1 (outsw, DX),
-
-  /* 0x70 */
-#define _(x) _1 (j##x, Jb),
-  foreach_x86_condition
-#undef _
-
-  /* 0x80 */
-  _2f (modrm_group_1, X86_INSN_FLAG_MODRM_REG_GROUP_1, Eb, Ib),
-  _2f (modrm_group_1, X86_INSN_FLAG_MODRM_REG_GROUP_1, Ev, Iz),
-  _2f (modrm_group_1, X86_INSN_FLAG_MODRM_REG_GROUP_1, Eb, Ib),
-  _2f (modrm_group_1, X86_INSN_FLAG_MODRM_REG_GROUP_1, Ev, Ib),
-  _2 (test, Eb, Gb),
-  _2 (test, Ev, Gv),
-  _2 (xchg, Eb, Gb),
-  _2 (xchg, Ev, Gv),
-  _2 (mov, Eb, Gb),
-  _2 (mov, Ev, Gv),
-  _2 (mov, Gb, Eb),
-  _2 (mov, Gv, Ev),
-  _2 (mov, Ev, Sw),
-  _2 (lea, Gv, Ev),
-  _2 (mov, Sw, Ew),
-  _1f (modrm_group_1a, X86_INSN_FLAG_MODRM_REG_GROUP_1a, Ev),
-
-  /* 0x90 */
-  _0 (nop),
-  _1 (xchg, CX),
-  _1 (xchg, DX),
-  _1 (xchg, BX),
-  _1 (xchg, SP),
-  _1 (xchg, BP),
-  _1 (xchg, SI),
-  _1 (xchg, DI),
-  _0 (cbw),
-  _0 (cwd),
-  _1 (call, Ap),
-  _0 (wait),
-  _0 (pushf),
-  _0 (popf),
-  _0 (sahf),
-  _0 (lahf),
-
-  /* 0xa0 */
-  _2 (mov, AL, Ob),
-  _2 (mov, AX, Ov),
-  _2 (mov, Ob, AL),
-  _2 (mov, Ov, AX),
-  _0 (movsb),
-  _0 (movsw),
-  _0 (cmpsb),
-  _0 (cmpsw),
-  _2 (test, AL, Ib),
-  _2 (test, AX, Iz),
-  _1 (stosb, AL),
-  _1 (stosw, AX),
-  _1 (lodsb, AL),
-  _1 (lodsw, AX),
-  _1 (scasb, AL),
-  _1 (scasw, AX),
-
-  /* 0xb0 */
-  _2 (mov, AL, Ib),
-  _2 (mov, CL, Ib),
-  _2 (mov, DL, Ib),
-  _2 (mov, BL, Ib),
-  _2 (mov, AH, Ib),
-  _2 (mov, CH, Ib),
-  _2 (mov, DH, Ib),
-  _2 (mov, BH, Ib),
-#define _(r) _2 (mov, r, Iv),
-  foreach_x86_gp_reg
-#undef _
-
-  /* 0xc0 */
-  _2f (modrm_group_2, X86_INSN_FLAG_MODRM_REG_GROUP_2, Eb, Ib),
-  _2f (modrm_group_2, X86_INSN_FLAG_MODRM_REG_GROUP_2, Ev, Ib),
-  _1 (ret, Iw),
-  _0 (ret),
-  _2 (les, Gz, Mp),
-  _2 (lds, Gz, Mp),
-  _2f (modrm_group_11, X86_INSN_FLAG_MODRM_REG_GROUP_11, Eb, Ib),
-  _2f (modrm_group_11, X86_INSN_FLAG_MODRM_REG_GROUP_11, Ev, Iz),
-  _2 (enter, Iw, Ib),
-  _0 (leave),
-  _1 (ret, Iw),
-  _0 (ret),
-  _0 (int3),
-  _1 (int, Ib),
-  _0 (into),
-  _0 (iret),
-
-  /* 0xd0 */
-  _2f (modrm_group_2, X86_INSN_FLAG_MODRM_REG_GROUP_2, Eb, 1b),
-  _2f (modrm_group_2, X86_INSN_FLAG_MODRM_REG_GROUP_2, Ev, 1b),
-  _2f (modrm_group_2, X86_INSN_FLAG_MODRM_REG_GROUP_2, Eb, CL),
-  _2f (modrm_group_2, X86_INSN_FLAG_MODRM_REG_GROUP_2, Ev, CL),
-  _0 (aam),
-  _0 (aad),
-  _0 (salc),
-  _0 (xlat),
-  /* FIXME x87 */
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-
-  /* 0xe0 */
-  _1 (loopnz, Jb),
-  _1 (loopz, Jb),
-  _1 (loop, Jb),
-  _1 (jcxz, Jb),
-  _2 (in, AL, Ib),
-  _2 (in, AX, Ib),
-  _2 (out, Ib, AL),
-  _2 (out, Ib, AX),
-  _1f (call, X86_INSN_FLAG_DEFAULT_64_BIT, Jz),
-  _1f ( jmp, X86_INSN_FLAG_DEFAULT_64_BIT, Jz),
-  _1 (jmp, Ap),
-  _1 (jmp, Jb),
-  _2 (in, AL, DX),
-  _2 (in, AX, DX),
-  _2 (out, DX, AL),
-  _2 (out, DX, AX),
-
-  /* 0xf0 */
-  _0 (lock),
-  _0 (int1),
-  _0 (repne),
-  _0 (rep),
-  _0 (hlt),
-  _0 (cmc),
-  _0f (modrm_group_3, X86_INSN_FLAG_MODRM_REG_GROUP_3),
-  _0f (modrm_group_3, X86_INSN_FLAG_MODRM_REG_GROUP_3),
-  _0 (clc),
-  _0 (stc),
-  _0 (cli),
-  _0 (sti),
-  _0 (cld),
-  _0 (std),
-  _1f (modrm_group_4, X86_INSN_FLAG_MODRM_REG_GROUP_4, Eb),
-  _0f (modrm_group_5, X86_INSN_FLAG_MODRM_REG_GROUP_5),
-};
-
-static x86_insn_t x86_insns_two_byte[256] = {
-  /* 0x00 */
-  _0f (modrm_group_6, X86_INSN_FLAG_MODRM_REG_GROUP_6),
-  _0f (modrm_group_7, X86_INSN_FLAG_MODRM_REG_GROUP_7),
-  _2 (lar, Gv, Ew),
-  _2 (lsl, Gv, Ew),
-  _0 (bad),
-  _0 (syscall),
-  _0 (clts),
-  _0 (sysret),
-  _0 (invd),
-  _0 (wbinvd),
-  _0 (bad),
-  _0 (ud2),
-  _0 (bad),
-  _0f (modrm_group_p, X86_INSN_FLAG_MODRM_REG_GROUP_p),
-  _0 (femms),
-  _0 (escape_3dnow),
-
-  /* 0x10 */
-  _2f (movups, X86_INSN_FLAG_SSE_GROUP_10, Gx, Ex),
-  _2f (movups, X86_INSN_FLAG_SSE_GROUP_10, Ex, Gx),
-  _2f (movlps, X86_INSN_FLAG_SSE_GROUP_10, Ex, Gx),
-  _2f (movlps, X86_INSN_FLAG_SSE_GROUP_10, Gx, Ex),
-  _2f (unpcklps, X86_INSN_FLAG_SSE_GROUP_10, Gx, Ex),
-  _2f (unpckhps, X86_INSN_FLAG_SSE_GROUP_10, Gx, Ex),
-  _2f (movhps, X86_INSN_FLAG_SSE_GROUP_10, Ex, Gx),
-  _2f (movhps, X86_INSN_FLAG_SSE_GROUP_10, Gx, Ex),
-  _0f (modrm_group_16, X86_INSN_FLAG_MODRM_REG_GROUP_16),
-  _0 (nop),
-  _0 (nop),
-  _0 (nop),
-  _0 (nop),
-  _0 (nop),
-  _0 (nop),
-  _0 (nop),
-
-  /* 0x20 */
-  _2 (mov, Rv, Cv),
-  _2 (mov, Rv, Dv),
-  _2 (mov, Cv, Rv),
-  _2 (mov, Dv, Rv),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-  _2f (movaps, X86_INSN_FLAG_SSE_GROUP_28, Gx, Ex),
-  _2f (movaps, X86_INSN_FLAG_SSE_GROUP_28, Ex, Gx),
-  _2f (cvtpi2ps, X86_INSN_FLAG_SSE_GROUP_28, Gx, Ex),
-  _2f (movntps, X86_INSN_FLAG_SSE_GROUP_28, Mx, Gx),
-  _2f (cvttps2pi, X86_INSN_FLAG_SSE_GROUP_28, Gx, Ex),
-  _2f (cvtps2pi, X86_INSN_FLAG_SSE_GROUP_28, Gx, Ex),
-  _2f (ucomiss, X86_INSN_FLAG_SSE_GROUP_28, Gx, Ex),
-  _2f (comiss, X86_INSN_FLAG_SSE_GROUP_28, Gx, Ex),
-
-  /* 0x30 */
-  _0 (wrmsr),
-  _0 (rdtsc),
-  _0 (rdmsr),
-  _0 (rdpmc),
-  _0 (sysenter),
-  _0 (sysexit),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-  _0 (bad),
-
-  /* 0x40 */
-#define _(x) _2 (cmov##x, Gv, Ev),
-  foreach_x86_condition
-#undef _
-
-  /* 0x50 */
-  _2f (movmskps, X86_INSN_FLAG_SSE_GROUP_50, Gd, Rx),
-  _2f (sqrtps, X86_INSN_FLAG_SSE_GROUP_50, Gx, Ex),
-  _2f (rsqrtps, X86_INSN_FLAG_SSE_GROUP_50, Gx, Ex),
-  _2f (rcpps, X86_INSN_FLAG_SSE_GROUP_50, Gx, Ex),
-  _2f (andps, X86_INSN_FLAG_SSE_GROUP_50, Gx, Ex),
-  _2f (andnps, X86_INSN_FLAG_SSE_GROUP_50, Gx, Ex),
-  _2f (orps, X86_INSN_FLAG_SSE_GROUP_50, Gx, Ex),
-  _2f (xorps, X86_INSN_FLAG_SSE_GROUP_50, Gx, Ex),
-  _2f (addps, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
-  _2f (mulps, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
-  _2f (cvtps2pd, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
-  _2f (cvtdq2ps, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
-  _2f (subps, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
-  _2f (minps, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
-  _2f (divps, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
-  _2f (maxps, X86_INSN_FLAG_SSE_GROUP_58, Gx, Ex),
-
-  /* 0x60 */
-  _2f (punpcklbw, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
-  _2f (punpcklwd, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
-  _2f (punpckldq, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
-  _2f (packsswb, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
-  _2f (pcmpgtb, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
-  _2f (pcmpgtw, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
-  _2f (pcmpgtd, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
-  _2f (packuswb, X86_INSN_FLAG_SSE_GROUP_60, Gm, Em),
-  _2f (punpckhbw, X86_INSN_FLAG_SSE_GROUP_68, Gm, Em),
-  _2f (punpckhwd, X86_INSN_FLAG_SSE_GROUP_68, Gm, Em),
-  _2f (punpckhdq, X86_INSN_FLAG_SSE_GROUP_68, Gm, Em),
-  _2f (packssdw, X86_INSN_FLAG_SSE_GROUP_68, Gm, Em),
-  _0f (bad, X86_INSN_FLAG_SSE_GROUP_68),
-  _0f (bad, X86_INSN_FLAG_SSE_GROUP_68),
-  _2f (movd, X86_INSN_FLAG_SSE_GROUP_68, Gm, Em),
-  _2f (movq, X86_INSN_FLAG_SSE_GROUP_68, Gm, Em),
-
-  /* 0x70 */
-  _3f (pshufw, X86_INSN_FLAG_SSE_GROUP_70, Gm, Em, Ib),
-  _0f (modrm_group_12, X86_INSN_FLAG_MODRM_REG_GROUP_12),
-  _0f (modrm_group_13, X86_INSN_FLAG_MODRM_REG_GROUP_13),
-  _0f (modrm_group_14, X86_INSN_FLAG_MODRM_REG_GROUP_14),
-  _2f (pcmpeqb, X86_INSN_FLAG_SSE_GROUP_70, Gm, Em),
-  _2f (pcmpeqw, X86_INSN_FLAG_SSE_GROUP_70, Gm, Em),
-  _2f (pcmpeqd, X86_INSN_FLAG_SSE_GROUP_70, Gm, Em),
-  _0f (emms, X86_INSN_FLAG_SSE_GROUP_70),
-  _0f (bad, X86_INSN_FLAG_SSE_GROUP_78),
-  _0f (bad, X86_INSN_FLAG_SSE_GROUP_78),
-  _0f (bad, X86_INSN_FLAG_SSE_GROUP_78),
-  _0f (bad, X86_INSN_FLAG_SSE_GROUP_78),
-  _0f (bad, X86_INSN_FLAG_SSE_GROUP_78),
-  _0f (bad, X86_INSN_FLAG_SSE_GROUP_78),
-  _2f (movd, X86_INSN_FLAG_SSE_GROUP_78, Em, Gm),
-  _2f (movq, X86_INSN_FLAG_SSE_GROUP_78, Em, Gm),
-
-  /* 0x80 */
-#define _(x) _1 (jmp##x, Jz),
-  foreach_x86_condition
-#undef _
-
-  /* 0x90 */
-#define _(x) _1 (set##x, Eb),
-  foreach_x86_condition
-#undef _
-
-  /* 0xa0 */
-  _0 (push_fs),
-  _0 (pop_fs),
-  _0 (cpuid),
-  _2 (bt, Ev, Gv),
-  _3 (shld, Ev, Gv, Ib),
-  _3 (shld, Ev, Gv, CL),
-  _0 (bad),
-  _0 (bad),
-  _0 (push_gs),
-  _0 (pop_gs),
-  _0 (rsm),
-  _2 (bts, Ev, Gv),
-  _3 (shrd, Ev, Gv, Ib),
-  _3 (shrd, Ev, Gv, CL),
-  _0f (modrm_group_15, X86_INSN_FLAG_MODRM_REG_GROUP_15),
-  _2 (imul, Gv, Ev),
-
-  /* 0xb0 */
-  _2 (cmpxchg, Eb, Gb),
-  _2 (cmpxchg, Ev, Gv),
-  _2 (lss, Gz, Mp),
-  _2 (btr, Ev, Gv),
-  _2 (lfs, Gz, Mp),
-  _2 (lgs, Gz, Mp),
-  _2 (movzbl, Gv, Eb),
-  _2 (movzwl, Gv, Ew),
-  _0 (bad),
-  _0f (modrm_group_10, X86_INSN_FLAG_MODRM_REG_GROUP_10),
-  _2f (modrm_group_8, X86_INSN_FLAG_MODRM_REG_GROUP_8, Ev, Ib),
-  _2 (btc, Ev, Gv),
-  _2 (bsf, Gv, Ev),
-  _2 (bsr, Gv, Ev),
-  _2 (movsx, Gv, Eb),
-  _2 (movsx, Gv, Ew),
-
-  /* 0xc0 */
-  _2 (xadd, Eb, Gb),
-  _2 (xadd, Ev, Gv),
-  _3f (cmpps, X86_INSN_FLAG_SSE_GROUP_c0, Gx, Ex, Ib),
-  _2 (movnti, Mv, Gv),
-  _3f (pinsrw, X86_INSN_FLAG_SSE_GROUP_c0, Gm, Ew, Ib),
-  _3f (pextrw, X86_INSN_FLAG_SSE_GROUP_c0, Gd, Rm, Ib),
-  _3f (shufps, X86_INSN_FLAG_SSE_GROUP_c0, Gx, Ex, Ib),
-  _1f (modrm_group_9, X86_INSN_FLAG_MODRM_REG_GROUP_9, Mx),
-#define _(r) _1 (bswap, r),
-  foreach_x86_gp_reg
-#undef _
-
-  /* 0xd0 */
-  _0f (bad, X86_INSN_FLAG_SSE_GROUP_d0),
-  _2f (psrlw, X86_INSN_FLAG_SSE_GROUP_d0, Gm, Em),
-  _2f (psrld, X86_INSN_FLAG_SSE_GROUP_d0, Gm, Em),
-  _2f (psrlq, X86_INSN_FLAG_SSE_GROUP_d0, Gm, Em),
-  _2f (paddq, X86_INSN_FLAG_SSE_GROUP_d0, Gm, Em),
-  _2f (pmullw, X86_INSN_FLAG_SSE_GROUP_d0, Gm, Em),
-  _0f (bad, X86_INSN_FLAG_SSE_GROUP_d0),
-  _2f (pmovmskb, X86_INSN_FLAG_SSE_GROUP_d0, Gd, Rm),
-  _2f (psubusb, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
-  _2f (psubusw, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
-  _2f (pminub, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
-  _2f (pand, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
-  _2f (paddusb, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
-  _2f (paddusw, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
-  _2f (pmaxub, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
-  _2f (pandn, X86_INSN_FLAG_SSE_GROUP_d8, Gm, Em),
-
-  /* 0xe0 */
-  _2f (pavgb, X86_INSN_FLAG_SSE_GROUP_e0, Gm, Em),
-  _2f (psraw, X86_INSN_FLAG_SSE_GROUP_e0, Gm, Em),
-  _2f (psrad, X86_INSN_FLAG_SSE_GROUP_e0, Gm, Em),
-  _2f (pavgw, X86_INSN_FLAG_SSE_GROUP_e0, Gm, Em),
-  _2f (pmulhuw, X86_INSN_FLAG_SSE_GROUP_e0, Gm, Em),
-  _2f (pmulhw, X86_INSN_FLAG_SSE_GROUP_e0, Gm, Em),
-  _2f (bad, X86_INSN_FLAG_SSE_GROUP_e0, Gm, Em),
-  _2f (movntq, X86_INSN_FLAG_SSE_GROUP_e0, Mm, Gm),
-  _2f (psubsb, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
-  _2f (psubsw, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
-  _2f (pminsw, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
-  _2f (por, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
-  _2f (paddsb, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
-  _2f (paddsw, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
-  _2f (pmaxsw, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
-  _2f (pxor, X86_INSN_FLAG_SSE_GROUP_e8, Gm, Em),
-
-  /* 0xf0 */
-  _0f (bad, X86_INSN_FLAG_SSE_GROUP_f0),
-  _2f (psllw, X86_INSN_FLAG_SSE_GROUP_f0, Gm, Em),
-  _2f (pslld, X86_INSN_FLAG_SSE_GROUP_f0, Gm, Em),
-  _2f (psllq, X86_INSN_FLAG_SSE_GROUP_f0, Gm, Em),
-  _2f (pmuludq, X86_INSN_FLAG_SSE_GROUP_f0, Gm, Em),
-  _2f (pmaddwd, X86_INSN_FLAG_SSE_GROUP_f0, Gm, Em),
-  _2f (psadbw, X86_INSN_FLAG_SSE_GROUP_f0, Gm, Em),
-  _2f (maskmovq, X86_INSN_FLAG_SSE_GROUP_f0, Gm, Em),
-  _2f (psubb, X86_INSN_FLAG_SSE_GROUP_f8, Gm, Em),
-  _2f (psubw, X86_INSN_FLAG_SSE_GROUP_f8, Gm, Em),
-  _2f (psubd, X86_INSN_FLAG_SSE_GROUP_f8, Gm, Em),
-  _2f (psubq, X86_INSN_FLAG_SSE_GROUP_f8, Gm, Em),
-  _2f (paddb, X86_INSN_FLAG_SSE_GROUP_f8, Gm, Em),
-  _2f (paddw, X86_INSN_FLAG_SSE_GROUP_f8, Gm, Em),
-  _2f (paddd, X86_INSN_FLAG_SSE_GROUP_f8, Gm, Em),
-  _0f (bad, X86_INSN_FLAG_SSE_GROUP_f8),
-};
-
-typedef struct {
-  x86_insn_t insns[8];
-} x86_insn_group8_t;
-
-/* Escape groups are indexed by modrm reg field. */
-static x86_insn_group8_t x86_insn_modrm_reg_groups[] = {
-  [X86_INSN_MODRM_REG_GROUP_1].insns = {
-    _0 (add), _0 ( or), _0 (adc), _0 (sbb),
-    _0 (and), _0 (sub), _0 (xor), _0 (cmp),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_1a].insns = {
-    _0f (pop, X86_INSN_FLAG_DEFAULT_64_BIT),
-    _0 (bad), _0 (bad), _0 (bad),
-    _0 (bad), _0 (bad), _0 (bad), _0 (bad),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_2].insns = {
-    _0 (rol), _0 (ror), _0 (rcl), _0 (rcr),
-    _0 (shl), _0 (shr), _0 (sal), _0 (sar),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_3].insns = {
-    _0 (test), _0 (test), _0 (not), _0 (neg),
-    _0 (mul), _0 (imul), _0 (div), _0 (idiv),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_4].insns = {
-    _0 (inc), _0 (dec), _0 (bad), _0 (bad),
-    _0 (bad), _0 (bad), _0 (bad), _0 (bad),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_5].insns = {
-    _1 (inc, Ev),
-    _1 (dec, Ev),
-    _1f (call, X86_INSN_FLAG_DEFAULT_64_BIT, Ev),
-    _1 (call, Mp),
-    _1f (jmp, X86_INSN_FLAG_DEFAULT_64_BIT, Ev),
-    _1 (jmp, Mp),
-    _1f (push, X86_INSN_FLAG_DEFAULT_64_BIT, Ev),
-    _0 (bad),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_6].insns = {
-    _1 (sldt, Ev),
-    _1 (str, Ev),
-    _1 (lldt, Ev),
-    _1 (ltr, Ev),
-    _1 (verr, Ev),
-    _1 (verw, Ev),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_7].insns = {
-    _1 (sgdt, Mv),
-    _1 (sidt, Mv),
-    _1 (lgdt, Mv),
-    _1 (lidt, Mv),
-    _1 (smsw, Ev),
-    _0 (bad),
-    _1 (lmsw, Ew),
-    _1 (invlpg, Mv),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_8].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _2 (bt, Ev, Ib),
-    _2 (bts, Ev, Ib),
-    _2 (btr, Ev, Ib),
-    _2 (btc, Ev, Ib),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_9].insns = {
-    _0 (bad),
-    _1 (cmpxchg, Mx),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_10].insns = {
-    _0 (bad), _0 (bad), _0 (bad), _0 (bad),
-    _0 (bad), _0 (bad), _0 (bad), _0 (bad),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_11].insns = {
-    _0 (mov), _0 (bad), _0 (bad), _0 (bad),
-    _0 (bad), _0 (bad), _0 (bad), _0 (bad),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_12].insns = {
-    _0 (bad),
-    _0 (bad),
-    _2 (psrlw, Rm, Ib),
-    _0 (bad),
-    _2 (psraw, Rm, Ib),
-    _0 (bad),
-    _2 (psllw, Rm, Ib),
-    _0 (bad),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_13].insns = {
-    _0 (bad),
-    _0 (bad),
-    _2 (psrld, Rm, Ib),
-    _0 (bad),
-    _2 (psrad, Rm, Ib),
-    _0 (bad),
-    _2 (pslld, Rm, Ib),
-    _0 (bad),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_14].insns = {
-    _0 (bad),
-    _0 (bad),
-    _2 (psrlq, Rm, Ib),
-    _0f (bad, 0),
-    _0 (bad),
-    _0 (bad),
-    _2 (psllq, Rm, Ib),
-    _0f (bad, 0),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_15].insns = {
-    _1 (fxsave, Mv),
-    _1 (fxrstor, Mv),
-    _1 (ldmxcsr, Mv),
-    _1 (stmxcsr, Mv),
-    _0 (bad),
-    _1 (lfence, Mv),
-    _1 (mfence, Mv),
-    _1 (sfence, Mv),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_16].insns = {
-    _1 (prefetch_nta, Mv),
-    _1 (prefetch_t0, Mv),
-    _1 (prefetch_t1, Mv),
-    _1 (prefetch_t2, Mv),
-    _1 (prefetch_nop, Mv),
-    _1 (prefetch_nop, Mv),
-    _1 (prefetch_nop, Mv),
-    _1 (prefetch_nop, Mv),
-  },
-
-  [X86_INSN_MODRM_REG_GROUP_p].insns = {
-    _1 (prefetch_exclusive, Mv),
-    _1 (prefetch_modified, Mv),
-    _1 (prefetch_nop, Mv),
-    _1 (prefetch_modified, Mv),
-    _1 (prefetch_nop, Mv),
-    _1 (prefetch_nop, Mv),
-    _1 (prefetch_nop, Mv),
-    _1 (prefetch_nop, Mv),
-  },
-};
-
-static x86_insn_group8_t x86_insn_sse_groups_repz[] = {
-  [X86_INSN_SSE_GROUP_10].insns = {
-    _2 (movss, Gx, Ex),
-    _2 (movss, Ex, Gx),
-    _2 (movsldup, Gx, Ex),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _2 (movshdup, Gx, Ex),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_28].insns = {
-    _0 (bad),
-    _0 (bad),
-    _2 (cvtsi2ss, Gx, Ev),
-    _0 (bad),
-    _2 (cvttss2si, Gv, Ex),
-    _2 (cvtss2si, Gv, Ex),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_50].insns = {
-    _0 (bad),
-    _2 (sqrtss, Gx, Ex),
-    _2 (rsqrtps, Gx, Ex),
-    _2 (rcpss, Gx, Ex),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_58].insns = {
-    _2 (addss, Gx, Ex),
-    _2 (mulss, Gx, Ex),
-    _2 (cvtss2sd, Gx, Ex),
-    _2 (cvttps2dq, Gx, Ex),
-    _2 (subss, Gx, Ex),
-    _2 (minss, Gx, Ex),
-    _2 (divss, Gx, Ex),
-    _2 (maxss, Gx, Ex),
-  },
-
-  [X86_INSN_SSE_GROUP_60].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_68].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _2 (movdqu, Gx, Ex),
-  },
-
-  [X86_INSN_SSE_GROUP_70].insns = {
-    _3 (pshufhw, Gx, Ex, Ib),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_78].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _2 (movq, Gx, Ex),
-    _2 (movdqu, Ex, Gx),
-  },
-
-  [X86_INSN_SSE_GROUP_c0].insns = {
-    _0 (bad),
-    _0 (bad),
-    _3 (cmpss, Gx, Ex, Ib),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_d0].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _2 (movq2dq, Gx, Em),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_d8].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_e0].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _2 (cvtdq2pd, Gx, Ex),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_e8].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_f0].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_f8].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-};
-
-static x86_insn_group8_t x86_insn_sse_groups_operand_size[] = {
-  [X86_INSN_SSE_GROUP_10].insns = {
-    _2 (movupd, Gx, Ex),
-    _2 (movupd, Ex, Gx),
-    _2 (movlpd, Gx, Ex),
-    _2 (movlpd, Ex, Gx),
-    _2 (unpcklpd, Gx, Ex),
-    _2 (unpckhpd, Gx, Ex),
-    _2 (movhpd, Gx, Mx),
-    _2 (movhpd, Mx, Gx),
-  },
-
-  [X86_INSN_SSE_GROUP_28].insns = {
-    _2 (movapd, Gx, Ex),
-    _2 (movapd, Ex, Gx),
-    _2 (cvtpi2pd, Gx, Ex),
-    _2 (movntpd, Mx, Gx),
-    _2 (cvttpd2pi, Gx, Mx),
-    _2 (cvtpd2pi, Gx, Mx),
-    _2 (ucomisd, Gx, Ex),
-    _2 (comisd, Gx, Ex),
-  },
-
-  [X86_INSN_SSE_GROUP_50].insns = {
-    _2 (movmskpd, Gd, Rx),
-    _2 (sqrtpd, Gx, Ex),
-    _0 (bad),
-    _0 (bad),
-    _2 (andpd, Gx, Ex),
-    _2 (andnpd, Gx, Ex),
-    _2 (orpd, Gx, Ex),
-    _2 (xorpd, Gx, Ex),
-  },
-
-  [X86_INSN_SSE_GROUP_58].insns = {
-    _2 (addpd, Gx, Ex),
-    _2 (mulpd, Gx, Ex),
-    _2 (cvtpd2ps, Gx, Ex),
-    _2 (cvtps2dq, Gx, Ex),
-    _2 (subpd, Gx, Ex),
-    _2 (minpd, Gx, Ex),
-    _2 (divpd, Gx, Ex),
-    _2 (maxpd, Gx, Ex),
-  },
-
-  [X86_INSN_SSE_GROUP_60].insns = {
-    _2 (punpcklbw, Gx, Ex),
-    _2 (punpcklwd, Gx, Ex),
-    _2 (punpckldq, Gx, Ex),
-    _2 (packsswb, Gx, Ex),
-    _2 (pcmpgtb, Gx, Ex),
-    _2 (pcmpgtw, Gx, Ex),
-    _2 (pcmpgtd, Gx, Ex),
-    _2 (packuswb, Gx, Ex),
-  },
-
-  [X86_INSN_SSE_GROUP_68].insns = {
-    _2 (punpckhbw, Gx, Ex),
-    _2 (punpckhwd, Gx, Ex),
-    _2 (punpckhdq, Gx, Ex),
-    _2 (packssdw, Gx, Ex),
-    _2 (punpcklqdq, Gx, Ex),
-    _2 (punpckhqdq, Gx, Ex),
-    _2 (movd, Gx, Ev),
-    _2 (movdqa, Gx, Ex),
-  },
-
-  [X86_INSN_SSE_GROUP_70].insns = {
-    _3 (pshufd, Gx, Ex, Ib),
-    _0f (modrm_group_12, X86_INSN_FLAG_MODRM_REG_GROUP_12),
-    _0f (modrm_group_13, X86_INSN_FLAG_MODRM_REG_GROUP_13),
-    _0f (modrm_group_14, X86_INSN_FLAG_MODRM_REG_GROUP_14),
-    _2 (pcmpeqb, Gx, Ex),
-    _2 (pcmpeqw, Gx, Ex),
-    _2 (pcmpeqd, Gx, Ex),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_78].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _2 (haddpd, Gx, Ex),
-    _2 (hsubpd, Gx, Ex),
-    _2 (movd, Ev, Gx),
-    _2 (movdqa, Ex, Gx),
-  },
-
-  [X86_INSN_SSE_GROUP_c0].insns = {
-    _0 (bad),
-    _0 (bad),
-    _3 (cmppd, Gx, Ex, Ib),
-    _0 (bad),
-    _3 (pinsrw, Gx, Ew, Ib),
-    _3 (pextrw, Gd, Gx, Ib),
-    _3 (shufpd, Gx, Ex, Ib),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_d0].insns = {
-    _2 (addsubpd, Gx, Ex),
-    _2 (psrlw, Gx, Ex),
-    _2 (psrld, Gx, Ex),
-    _2 (psrlq, Gx, Ex),
-    _2 (paddq, Gx, Ex),
-    _2 (pmullw, Gx, Ex),
-    _2 (movq, Ex, Gx),
-    _2 (pmovmskb, Gd, Rx),
-  },
-
-  [X86_INSN_SSE_GROUP_d8].insns = {
-    _2 (psubusb, Gx, Ex),
-    _2 (psubusw, Gx, Ex),
-    _2 (pminub, Gx, Ex),
-    _2 (pand, Gx, Ex),
-    _2 (paddusb, Gx, Ex),
-    _2 (paddusw, Gx, Ex),
-    _2 (pmaxub, Gx, Ex),
-    _2 (pandn, Gx, Ex),
-  },
-
-  [X86_INSN_SSE_GROUP_e0].insns = {
-    _2 (pavgb, Gx, Ex),
-    _2 (psraw, Gx, Ex),
-    _2 (psrad, Gx, Ex),
-    _2 (pavgw, Gx, Ex),
-    _2 (pmulhuw, Gx, Ex),
-    _2 (pmulhw, Gx, Ex),
-    _2 (cvttpd2dq, Gx, Ex),
-    _2 (movntdq, Mx, Gx),
-  },
-
-  [X86_INSN_SSE_GROUP_e8].insns = {
-    _2 (psubsb, Gx, Ex),
-    _2 (psubsw, Gx, Ex),
-    _2 (pminsw, Gx, Ex),
-    _2 (por, Gx, Ex),
-    _2 (paddsb, Gx, Ex),
-    _2 (paddsw, Gx, Ex),
-    _2 (pmaxsw, Gx, Ex),
-    _2 (pxor, Gx, Ex),
-  },
-
-  [X86_INSN_SSE_GROUP_f0].insns = {
-    _0 (bad),
-    _2 (psllw, Gx, Ex),
-    _2 (pslld, Gx, Ex),
-    _2 (psllq, Gx, Ex),
-    _2 (pmuludq, Gx, Ex),
-    _2 (pmaddwd, Gx, Ex),
-    _2 (psadbw, Gx, Ex),
-    _2 (maskmovdqu, Gx, Ex),
-  },
-
-  [X86_INSN_SSE_GROUP_f8].insns = {
-    _2 (psubb, Gx, Ex),
-    _2 (psubw, Gx, Ex),
-    _2 (psubd, Gx, Ex),
-    _2 (psubq, Gx, Ex),
-    _2 (paddb, Gx, Ex),
-    _2 (paddw, Gx, Ex),
-    _2 (paddd, Gx, Ex),
-    _0 (bad),
-  },
-};
-
-static x86_insn_group8_t x86_insn_sse_groups_repnz[] = {
-  [X86_INSN_SSE_GROUP_10].insns = {
-    _2 (movsd, Gx, Ex),
-    _2 (movsd, Ex, Gx),
-    _2 (movddup, Gx, Ex),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_28].insns = {
-    _0 (bad),
-    _0 (bad),
-    _2 (cvtsi2sd, Gx, Ev),
-    _0 (bad),
-    _2 (cvttsd2si, Gv, Ex),
-    _2 (cvtsd2si, Gv, Ex),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_50].insns = {
-    _0 (bad),
-    _2 (sqrtsd, Gx, Ex),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_58].insns = {
-    _2 (addsd, Gx, Ex),
-    _2 (mulsd, Gx, Ex),
-    _2 (cvtsd2ss, Gx, Ex),
-    _0 (bad),
-    _2 (subsd, Gx, Ex),
-    _2 (minsd, Gx, Ex),
-    _2 (divsd, Gx, Ex),
-    _2 (maxsd, Gx, Ex),
-  },
-
-  [X86_INSN_SSE_GROUP_60].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_68].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_70].insns = {
-    _3 (pshuflw, Gx, Ex, Ib),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_78].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _2 (haddps, Gx, Ex),
-    _2 (hsubps, Gx, Ex),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_c0].insns = {
-    _0 (bad),
-    _0 (bad),
-    _3 (cmpsd, Gx, Ex, Ib),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_d0].insns = {
-    _2 (addsubps, Gx, Ex),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _2 (movdq2q, Gm, Ex),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_d8].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_e0].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _2 (cvtpd2dq, Gx, Ex),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_e8].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_f0].insns = {
-    _2 (lddqu, Gx, Mx),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-
-  [X86_INSN_SSE_GROUP_f8].insns = {
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-    _0 (bad),
-  },
-};
-
-#undef _
-
-/* Parses memory displacements and immediates. */
-static u8 * x86_insn_parse_number (u32 log2_n_bytes,
-				   u8 * code, u8 * code_end,
-				   i64 * result)
-{
-  i64 x = 0;
-
-  if (code + (1 << log2_n_bytes) > code_end)
-    return 0;
-
-  switch (log2_n_bytes)
-    {
-    case 3:
-      x = clib_little_to_host_unaligned_mem_u64 ((u64 *) code);
-      break;
-
-    case 2:
-      x = (i32) clib_little_to_host_unaligned_mem_u32 ((u32 *) code);
-      break;
-
-    case 1:
-      x = (i16) clib_little_to_host_unaligned_mem_u16 ((u16 *) code);
-      break;
-
-    case 0:
-      x = (i8) code[0];
-      break;
-
-    default:
-      ASSERT (0);
-    }
-
-  *result = x;
-  return code + (1 << log2_n_bytes);
-}
-
-static u32
-x86_insn_log2_immediate_bytes (x86_insn_parse_t * p, x86_insn_t * insn)
-{
-  u32 i = ~0;
-  switch (x86_insn_immediate_type (insn))
-    {
-    case 'b': i = 0; break;
-    case 'w': i = 1; break;
-    case 'd': i = 2; break;
-    case 'q': i = 3; break;
-
-    case 'z':
-      i = p->log2_effective_operand_bytes;
-      if (i > 2) i = 2;
-      break;
-
-    case 'v':
-      i = p->log2_effective_operand_bytes;
-      break;
-
-    default:
-      i = ~0;
-      break;
-    }
-
-  return i;
-}
-
-static u8 *
-x86_insn_parse_modrm_byte (x86_insn_parse_t * x,
-			   x86_insn_modrm_byte_t modrm,
-			   u32 parse_flags,
-			   u8 * code,
-			   u8 * code_end)
-{
-  u8 effective_address_bits;
-
-  if (parse_flags & X86_INSN_PARSE_64_BIT)
-    effective_address_bits = (x->flags & X86_INSN_ADDRESS_SIZE) ? 32 : 64;
-  else if (parse_flags & X86_INSN_PARSE_32_BIT)
-    effective_address_bits = (x->flags & X86_INSN_ADDRESS_SIZE) ? 16 : 32;
-  else
-    effective_address_bits = (x->flags & X86_INSN_ADDRESS_SIZE) ? 32 : 16;
-
-  x->log2_effective_address_bytes = 1;
-  x->log2_effective_address_bytes += effective_address_bits > 16;
-  x->log2_effective_address_bytes += effective_address_bits > 32;
-
-  x->regs[0] |= modrm.reg;
-  if (modrm.mode == 3)
-    x->regs[1] |= modrm.rm;
-  else
-    {
-      u32 log2_disp_bytes = ~0;
-
-      x->flags |= X86_INSN_IS_ADDRESS;
-
-      if (effective_address_bits != 16)
-	{
-	  u8 has_sib_byte = 0;
-
-	  switch (modrm.mode)
-	    {
-	    case 0:
-	      /* When base is bp displacement is present for mode 0. */
-	      if (modrm.rm == X86_INSN_GP_REG_BP)
-		{
-		  log2_disp_bytes = x->log2_effective_address_bytes;
-		  break;
-		}
-	      else if (modrm.rm == X86_INSN_GP_REG_SP
-		       && effective_address_bits != 16)
-		{
-		  has_sib_byte = 1;
-		  break;
-		}
-	      /* fall through */
-	    case 1:
-	    case 2:
-	      x->regs[1] |= modrm.rm;
-	      x->flags |= X86_INSN_HAS_BASE;
-	      if (modrm.mode != 0)
-		{
-		  log2_disp_bytes = (modrm.mode == 1
-				     ? 0
-				     : x->log2_effective_address_bytes);
-		  if (log2_disp_bytes > 2)
-		    log2_disp_bytes = 2;
-		}
-	      break;
-	    }
-
-	  if (has_sib_byte)
-	    {
-	      x86_insn_sib_byte_t sib;
-
-	      if (code >= code_end)
-		return 0;
-	      sib.byte = *code++;
-
-	      x->log2_index_scale = 1 << sib.log2_scale;
-	      x->regs[1] |= sib.base;
-	      x->flags |= X86_INSN_HAS_BASE;
-
-	      if (sib.index != X86_INSN_GP_REG_SP)
-		{
-		  x->regs[2] |= sib.index;
-		  x->flags |= X86_INSN_HAS_INDEX;
-		}
-	    }
-	}
-      else
-	{
-	  /* effective_address_bits == 16 */
-	  switch (modrm.mode)
-	    {
-	    case 0:
-	      if (modrm.rm == 6)
-		{
-		  /* [disp16] */
-		  log2_disp_bytes = 1;
-		  break;
-		}
-	      /* fall through */
-	    case 1:
-	    case 2:
-	      switch (modrm.rm)
-		{
-		case 0:		/* [bx + si/di] */
-		case 1:
-		  x->regs[1] = X86_INSN_GP_REG_BX;
-		  x->regs[2] = X86_INSN_GP_REG_SI + (modrm.rm & 1);
-		  x->flags |= X86_INSN_HAS_BASE | X86_INSN_HAS_INDEX;
-		  break;
-
-		case 2:		/* [bp + si/di] */
-		case 3:
-		  x->regs[1] = X86_INSN_GP_REG_BP;
-		  x->regs[2] = X86_INSN_GP_REG_SI + (modrm.rm & 1);
-		  x->flags |= X86_INSN_HAS_BASE | X86_INSN_HAS_INDEX;
-		  break;
-
-		case 4:		/* [si/di] */
-		case 5:
-		  x->regs[1] = X86_INSN_GP_REG_SI + (modrm.rm & 1);
-		  x->flags |= X86_INSN_HAS_BASE;
-		  break;
-
-		case 6:		/* [bp + disp] */
-		  x->regs[1] = X86_INSN_GP_REG_BP;
-		  x->flags |= X86_INSN_HAS_BASE;
-		  break;
-
-		case 7:		/* [bx + disp] */
-		  x->regs[1] = X86_INSN_GP_REG_BX;
-		  x->flags |= X86_INSN_HAS_BASE;
-		  break;
-		}
-
-	      if (modrm.mode != 0)
-		log2_disp_bytes = modrm.mode == 1 ? 0 : 1;
-	      break;
-	    }
-	}
-      
-      if (log2_disp_bytes != ~0)
-	{
-	  i64 disp;
-	  code = x86_insn_parse_number (log2_disp_bytes, code, code_end,
-					&disp);
-	  if (code)
-	    x->displacement = disp;
-	}
-    }
-
-  return code;
-}
-
-u8 * x86_insn_parse (x86_insn_parse_t * p, u8 * code_start)
-{
-  u8 i, * code, * code_end;
-  x86_insn_t * insn, * group_insn;
-  u8 default_operand_bits, effective_operand_bits;
-  u32 opcode, parse_flags;
-
-  /* Preserve global parse flags. */
-  parse_flags = p->flags & (X86_INSN_PARSE_32_BIT | X86_INSN_PARSE_64_BIT);
-  memset (p, 0, sizeof (p[0]));
-  p->flags = parse_flags;
-
-  /* 64 implies 32 bit parsing. */
-  if (parse_flags & X86_INSN_PARSE_64_BIT)
-    parse_flags |= X86_INSN_PARSE_32_BIT;
-
-  /* Instruction must be <= 15 bytes. */
-  code = code_start;
-  code_end = code + 15;
-
-  /* Parse legacy prefixes. */
-  while (1)
-    {
-      if (code >= code_end)
-	goto insn_too_long;
-      i = code[0];
-      code++;
-      switch (i)
-	{
-	default: goto prefix_done;
-
-	  /* Set flags based on prefix. */
-#define _(x,o) case o: p->flags |= X86_INSN_##x; break;
-	  foreach_x86_legacy_prefix;
-#undef _
-	}
-    }
- prefix_done:
-
-  /* REX prefix. */
-  if ((parse_flags & X86_INSN_PARSE_64_BIT) && i >= 0x40 && i <= 0x4f)
-    {
-      p->regs[0] |= ((i & (1 << 2)) != 0) << 3;	/* r bit */
-      p->regs[1] |= ((i & (1 << 0)) != 0) << 3;	/* b bit */
-      p->regs[2] |= ((i & (1 << 1)) != 0) << 3;	/* x bit */
-      p->flags |= ((i & (1 << 3))		/* w bit */
-		   ? X86_INSN_OPERAND_SIZE_64 : 0);
-      if (code >= code_end)
-	goto insn_too_long;
-      i = *code++;
-    }
-
-  opcode = i;
-  if (opcode == 0x0f)
-    {
-      /* two byte opcode. */;
-      if (code >= code_end)
-	goto insn_too_long;
-      i = *code++;
-      opcode = (opcode << 8) | i;
-      insn = x86_insns_two_byte + i;
-    }
-  else
-    {
-      static x86_insn_t arpl = {
-	.name = "arpl",
-	.operands[0].data = "Ew",
-	.operands[1].data = "Gw",
-      };
-
-      if (PREDICT_FALSE (i == 0x63
-			 && ! (parse_flags & X86_INSN_PARSE_64_BIT)))
-	insn = &arpl;
-      else
-	insn = x86_insns_one_byte + i;
-    }
-
-  if ((i = X86_INSN_FLAG_GET_SSE_GROUP (insn->flags)) != 0)
-    {
-      x86_insn_group8_t * g8;
-
-      if (p->flags & X86_INSN_OPERAND_SIZE)
-	g8 = x86_insn_sse_groups_operand_size;
-      else if (p->flags & X86_INSN_REPZ)
-	g8 = x86_insn_sse_groups_repz;
-      else if (p->flags & X86_INSN_REPNZ)
-	g8 = x86_insn_sse_groups_repnz;
-      else
-	g8 = 0;
-
-      /* insn flags have 1 + group so != 0 test above can work. */
-      ASSERT ((i - 1) < ARRAY_LEN (x86_insn_sse_groups_operand_size));
-      if (g8)
-	insn = g8[i - 1].insns + (opcode & 7);
-    }
-
-  /* Parse modrm and displacement if present. */
-  if (x86_insn_has_modrm_byte (insn))
-    {
-      x86_insn_modrm_byte_t modrm;
-
-      if (code >= code_end)
-	goto insn_too_long;
-      modrm.byte = *code++;
-
-      /* Handle special 0x0f01 and 0x0fae encodings. */
-      if (PREDICT_FALSE (modrm.mode == 3
-			 && (opcode == 0x0f01
-			     || opcode == 0x0fae)))
-	{
-	  static x86_insn_t x86_insns_0f01_special[] = {
-	    _0 (swapgs), _0 (rdtscp), _0 (bad), _0 (bad),
-	    _0 (bad), _0 (bad), _0 (bad), _0 (bad),
-	  };
-	  static x86_insn_t x86_insns_0fae_special[] = {
-	    _0 (vmrun), _0 (vmmcall), _0 (vmload), _0 (vmsave),
-	    _0 (stgi), _0 (clgi), _0 (skinit), _0 (invlpga),
-	  };
-
-	  if (opcode == 0x0f01)
-	    insn = x86_insns_0f01_special;
-	  else
-	    insn = x86_insns_0fae_special;
-	  insn += modrm.rm;
-	  opcode = (opcode << 8) | modrm.byte;
-	}
-      else
-	{
-	  code = x86_insn_parse_modrm_byte (p, modrm, parse_flags,
-					    code, code_end);
-	  if (! code)
-	    goto insn_too_long;
-	}
-    }
-
-  group_insn = 0;
-  if ((i = X86_INSN_FLAG_GET_MODRM_REG_GROUP (insn->flags)) != 0)
-    {
-      u32 g = i - 1;
-      ASSERT (g < ARRAY_LEN (x86_insn_modrm_reg_groups));
-      group_insn = x86_insn_modrm_reg_groups[g].insns + (p->regs[0] & 7);
-    }
-
-  p->insn = insn[0];
-  if (group_insn)
-    {
-      u32 k;
-      p->insn.name = group_insn->name;
-      p->insn.flags |= group_insn->flags;
-      for (k = 0; k < ARRAY_LEN (group_insn->operands); k++)
-	if (x86_insn_operand_is_valid (group_insn, k))
-	  p->insn.operands[k] = group_insn->operands[k];
-    }
-
-  default_operand_bits
-    = ((((parse_flags & X86_INSN_PARSE_32_BIT) != 0)
-	^ ((p->flags & X86_INSN_OPERAND_SIZE) != 0))
-       ? BITS (u32) : BITS (u16));
-
-  if ((parse_flags & X86_INSN_PARSE_64_BIT)
-      && (p->insn.flags & X86_INSN_FLAG_DEFAULT_64_BIT))
-    default_operand_bits = BITS (u64);
-
-  effective_operand_bits = default_operand_bits;
-  if (p->flags & X86_INSN_OPERAND_SIZE_64)
-    effective_operand_bits = BITS (u64);
-
-  p->log2_effective_operand_bytes = 1;
-  p->log2_effective_operand_bytes += effective_operand_bits > 16;
-  p->log2_effective_operand_bytes += effective_operand_bits > 32;
-
-  /* Parse immediate if present. */
-  {
-    u32 l = x86_insn_log2_immediate_bytes (p, insn);
-    if (l <= 3)
-      {
-	code = x86_insn_parse_number (l, code, code_end, &p->immediate);
-	if (! code)
-	  goto insn_too_long;
-      }
-  }
-
-  return code;
-
- insn_too_long:
-  return 0;
-}
-
-static u8 * format_x86_gp_reg_operand (u8 * s, va_list * va)
-{
-  u32 r = va_arg (*va, u32);
-  u32 log2_n_bytes = va_arg (*va, u32);
-
-  const char names8[8] = "acdbsbsd";
-  const char names16[8] = "xxxxppii";
-
-  ASSERT (r < 16);
-
-  /* Add % register prefix. */
-  vec_add1 (s, '%');
-
-  switch (log2_n_bytes)
-    {
-    case 0:
-      {
-
-	if (r < 8)
-	  s = format (s, "%c%c", names8[r & 3], (r >> 2) ? 'l' : 'h');
-	else
-	  s = format (s, "r%db", r);
-      }
-      break;
-      
-      case 2:
-      case 3:
-	s = format (s, "%c", log2_n_bytes == 2 ? 'e' : 'r');
-	/* fall through */
-      case 1:
-	if (r < 8)
-	  s = format (s, "%c%c", names8[r], names16[r]);
-	else
-	  {
-	    s = format (s, "%d", r);
-	    if (log2_n_bytes != 3)
-	      s = format (s, "%c", log2_n_bytes == 1 ? 'w' : 'd');
-	  }
-	break;
-
-    default:
-      ASSERT (0);
-    }
-
-  return s;
-}
-
-static u8 * format_x86_reg_operand (u8 * s, va_list * va)
-{
-  u32 reg = va_arg (*va, u32);
-  u32 log2_n_bytes = va_arg (*va, u32);
-  u32 type = va_arg (*va, u32);
-
-  switch (type)
-    {
-    default:
-      ASSERT (0);
-      break;
-
-    case 'x':
-      ASSERT (reg < 16);
-      return format (s, "%%xmm%d", reg);
-
-    case 'm':
-      ASSERT (reg < 8);
-      return format (s, "%%mm%d", reg);
-
-      /* Explicit byte/word/double-word/quad-word */
-    case 'b': log2_n_bytes = 0; break;
-    case 'w': log2_n_bytes = 1; break;
-    case 'd': log2_n_bytes = 2; break;
-    case 'q': log2_n_bytes = 3; break;
-
-      /* Use effective operand size. */
-    case 'v': break;
-
-      /* word or double-word depending on effective operand size. */
-    case 'z':
-      log2_n_bytes = clib_min (log2_n_bytes, 2);
-      break;
-    }
-
-  s = format (s, "%U", format_x86_gp_reg_operand, reg, log2_n_bytes);
-  return s;
-}
-
-static u8 * format_x86_mem_operand (u8 * s, va_list * va)
-{
-  x86_insn_parse_t * p = va_arg (*va, x86_insn_parse_t *);
-
-  if (p->displacement != 0)
-    s = format (s, "0x%x", p->displacement);
-
-  if (p->flags & X86_INSN_HAS_BASE)
-    {
-      s = format (s, "(%U",
-		  format_x86_gp_reg_operand, p->regs[1],
-		    p->log2_effective_address_bytes);
-      if (p->flags & X86_INSN_HAS_INDEX)
-	{
-	  s = format (s, ",%U",
-		      format_x86_gp_reg_operand, p->regs[2],
-		        p->log2_effective_address_bytes);
-	  if (p->log2_index_scale != 0)
-	    s = format (s, ",%d", 1 << p->log2_index_scale);
-	}
-      s = format (s, ")");
-    }
-
-  /* [RIP+disp] PC relative addressing in 64 bit mode. */
-  else if (p->flags & X86_INSN_PARSE_64_BIT)
-    s = format (s, "(%%rip)");
-
-  return s;
-}
-
-static u8 * format_x86_insn_operand (u8 * s, va_list * va)
-{
-  x86_insn_parse_t * p = va_arg (*va, x86_insn_parse_t *);
-  x86_insn_t * insn = &p->insn;
-  u32 o = va_arg (*va, u32);
-  u8 c, t;
-
-  ASSERT (o < ARRAY_LEN (insn->operands));
-  c = insn->operands[o].code;
-  t = insn->operands[o].type;
-
-  /* Register encoded in instruction. */
-  if (c < 8)
-    return format (s, "%U",
-		   format_x86_gp_reg_operand, c,
-		   p->log2_effective_operand_bytes);
-
-  switch (c)
-    {
-    /* Memory or reg field from modrm byte. */
-    case 'M':
-      ASSERT (p->flags & X86_INSN_IS_ADDRESS);
-      /* FALLTHROUGH */
-    case 'E':
-      if (p->flags & X86_INSN_IS_ADDRESS)
-	s = format (s, "%U", format_x86_mem_operand, p);
-      else
-	s = format (s, "%U",
-		    format_x86_reg_operand, p->regs[1],
-		    p->log2_effective_operand_bytes, t);
-      break;
-
-    /* reg field from modrm byte. */
-    case 'R':
-    case 'G':
-      s = format (s, "%U",
-		  format_x86_reg_operand, p->regs[0],
-		  p->log2_effective_operand_bytes, t);
-      break;
-
-    case 'I':
-      {
-	u32 l = x86_insn_log2_immediate_bytes (p, insn);
-	i64 mask = pow2_mask (8ULL << l);
-	s = format (s, "$0x%Lx", p->immediate & mask);
-      }
-      break;
-
-    case 'J':
-      if (p->immediate < 0)
-	s = format (s, "- 0x%Lx", -p->immediate);
-      else
-	s = format (s, "+ 0x%Lx", p->immediate);
-      break;
-
-    case 'O':
-      s = format (s, "0x%Lx", p->immediate);
-      break;
-
-    case 'A':
-      /* AX/AL */
-      s = format (s, "%U",
-		  format_x86_gp_reg_operand, X86_INSN_GP_REG_AX,
-		  t == 'L' ? 0 : p->log2_effective_operand_bytes);
-      break;
-
-    case 'B':
-      /* BX/BL/BP */
-      s = format (s, "%U",
-		  format_x86_gp_reg_operand,
-		  t == 'P' ? X86_INSN_GP_REG_BP : X86_INSN_GP_REG_BX,
-		  t == 'L' ? 0 : p->log2_effective_operand_bytes);
-      break;
-
-    case 'C':
-      /* CX/CL */
-      s = format (s, "%U",
-		  format_x86_gp_reg_operand, X86_INSN_GP_REG_CX,
-		  t == 'L' ? 0 : p->log2_effective_operand_bytes);
-      break;
-
-    case 'D':
-      /* DX/DL/DI */
-      s = format (s, "%U",
-		  format_x86_gp_reg_operand,
-		  t == 'I' ? X86_INSN_GP_REG_DI : X86_INSN_GP_REG_DX,
-		  t == 'L' ? 0 : p->log2_effective_operand_bytes);
-      break;
-
-    case 'S':
-      /* SI/SP */
-      s = format (s, "%U",
-		  format_x86_gp_reg_operand,
-		  t == 'I' ? X86_INSN_GP_REG_SI : X86_INSN_GP_REG_SP,
-		  p->log2_effective_operand_bytes);
-      break;
-
-    case '1':
-      s = format (s, "1");
-      break;
-
-    default:
-      ASSERT (0);
-    }
-
-  return s;
-}
-
-u8 * format_x86_insn_parse (u8 * s, va_list * va)
-{
-  x86_insn_parse_t * p = va_arg (*va, x86_insn_parse_t *);
-  x86_insn_t * insn = &p->insn;
-  u32 o, i, is_src_dst;
-
-  s = format (s, "%s", insn->name);
-
-  if (! x86_insn_operand_is_valid (insn, 0))
-    goto done;
-
-  is_src_dst = x86_insn_operand_is_valid (insn, 1);
-
-  /* If instruction has immediate add suffix to opcode to
-     indicate operand size. */
-  if (is_src_dst)
-    {
-      u32 b;
-
-      b = x86_insn_log2_immediate_bytes (p, insn);
-      if (b < p->log2_effective_operand_bytes
-	  && (p->flags & X86_INSN_IS_ADDRESS))
-	s = format (s, "%c", "bwlq"[b]);
-    }
-
-  for (i = 0; i < ARRAY_LEN (insn->operands); i++)
-    {
-      o = is_src_dst + i;
-      if (! x86_insn_operand_is_valid (insn, o))
-	break;
-      s = format (s, "%s%U",
-		  i == 0 ? " " : ", ",
-		  format_x86_insn_operand, p, o);
-    }
-
-  if (is_src_dst)
-    s = format (s, ", %U",
-		format_x86_insn_operand, p, 0);
-
- done:
-  return s;
-}
diff --git a/vppinfra/vppinfra/asm_x86.h b/vppinfra/vppinfra/asm_x86.h
deleted file mode 100644
index dacef617..00000000
--- a/vppinfra/vppinfra/asm_x86.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_asm_x86_h
-#define included_asm_x86_h
-
-#include <vppinfra/format.h>
-
-typedef union
-{
-  struct
-  {
-    u8 code;
-    u8 type;
-  };
-  u8 data[2];
-} x86_insn_operand_t;
-
-typedef struct
-{
-  /* Instruction name. */
-  char *name;
-
-  /* X86 instructions may have up to 3 operands. */
-  x86_insn_operand_t operands[3];
-
-  u16 flags;
-#define X86_INSN_FLAG_DEFAULT_64_BIT		(1 << 0)
-#define X86_INSN_FLAG_SET_SSE_GROUP(n)		((n) << 5)
-#define X86_INSN_FLAG_GET_SSE_GROUP(f)		(((f) >> 5) & 0x1f)
-#define X86_INSN_FLAG_SET_MODRM_REG_GROUP(n)	(((n) & 0x3f) << 10)
-#define X86_INSN_FLAG_GET_MODRM_REG_GROUP(f)	(((f) >> 10) & 0x3f)
-} x86_insn_t;
-
-always_inline uword
-x86_insn_operand_is_valid (x86_insn_t * i, uword o)
-{
-  ASSERT (o < ARRAY_LEN (i->operands));
-  return i->operands[o].code != '_';
-}
-
-#define foreach_x86_legacy_prefix		\
-  _ (OPERAND_SIZE, 0x66)			\
-  _ (ADDRESS_SIZE, 0x67)			\
-  _ (SEGMENT_CS, 0x2e)				\
-  _ (SEGMENT_DS, 0x3e)				\
-  _ (SEGMENT_ES, 0x26)				\
-  _ (SEGMENT_FS, 0x64)				\
-  _ (SEGMENT_GS, 0x65)				\
-  _ (SEGMENT_SS, 0x36)				\
-  _ (LOCK, 0xf0)				\
-  _ (REPZ, 0xf3)				\
-  _ (REPNZ, 0xf2)
-
-#define foreach_x86_insn_parse_flag		\
-  /* Parse in 32/64-bit mode. */		\
-  _ (PARSE_32_BIT, 0)				\
-  _ (PARSE_64_BIT, 0)				\
-  _ (IS_ADDRESS, 0)				\
- /* regs[1/2] is a valid base/index register */	\
-  _ (HAS_BASE, 0)				\
-  _ (HAS_INDEX, 0)				\
- /* rex w bit */				\
- _ (OPERAND_SIZE_64, 0)
-
-typedef enum
-{
-#define _(f,o) X86_INSN_FLAG_BIT_##f,
-  foreach_x86_insn_parse_flag foreach_x86_legacy_prefix
-#undef _
-} x86_insn_parse_flag_bit_t;
-
-typedef enum
-{
-#define _(f,o) X86_INSN_##f = 1 << X86_INSN_FLAG_BIT_##f,
-  foreach_x86_insn_parse_flag foreach_x86_legacy_prefix
-#undef _
-} x86_insn_parse_flag_t;
-
-typedef struct
-{
-  /* Registers in instruction.
-     [0] is modrm reg field
-     [1] is base reg
-     [2] is index reg. */
-  u8 regs[3];
-
-  /* Scale for index register. */
-  u8 log2_index_scale:2;
-  u8 log2_effective_operand_bytes:3;
-  u8 log2_effective_address_bytes:3;
-
-  i32 displacement;
-
-  /* Parser flags: set of x86_insn_parse_flag_t enums. */
-  u32 flags;
-
-  i64 immediate;
-
-  x86_insn_t insn;
-} x86_insn_parse_t;
-
-u8 *x86_insn_parse (x86_insn_parse_t * p, u8 * code_start);
-format_function_t format_x86_insn_parse;
-
-#endif /* included_asm_x86_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/backtrace.c b/vppinfra/vppinfra/backtrace.c
deleted file mode 100644
index bbfb792c..00000000
--- a/vppinfra/vppinfra/backtrace.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2004 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/clib.h>
-#include <vppinfra/error.h>
-
-#ifdef __mips__
-
-/* Let code below know we've defined _clib_backtrace */
-#define clib_backtrace_defined
-
-#include <vppinfra/asm_mips.h>
-
-uword
-clib_backtrace (uword * callers, uword max_callers, uword n_frames_to_skip)
-{
-  u32 *pc;
-  void *sp;
-  uword i, saved_pc;
-
-  /* Figure current PC, saved PC and stack pointer. */
-  asm volatile (".set push\n"
-		".set noat\n" "move %[saved_pc], $31\n" "move %[sp], $29\n"
-		/* Fetches current PC. */
-		"la $at, 1f\n"
-		"jalr %[pc], $at\n"
-		"nop\n"
-		"1:\n"
-		".set pop\n":[pc] "=r" (pc),
-		[saved_pc] "=r" (saved_pc),[sp] "=r" (sp));
-
-  /* Also skip current frame. */
-  n_frames_to_skip += 1;
-
-  for (i = 0; i < max_callers + n_frames_to_skip; i++)
-    {
-      mips_insn_opcode_t op;
-      mips_insn_special_funct_t funct;
-      i32 insn, rs, rt, rd, immediate, found_saved_pc;
-      u32 *start_pc;
-
-      /* Parse instructions until we reach prologue for this
-         stack frame.  We'll need to figure out where saved
-         PC is and where previous stack frame lives. */
-      start_pc = pc;
-      found_saved_pc = 0;
-      while (1)
-	{
-	  insn = *--pc;
-	  op = mips_insn_get_op (insn);
-	  funct = mips_insn_get_funct (insn);
-	  rs = mips_insn_get_rs (insn);
-	  rt = mips_insn_get_rt (insn);
-	  rd = mips_insn_get_rd (insn);
-	  immediate = mips_insn_get_immediate (insn);
-
-	  switch (op)
-	    {
-	    default:
-	      break;
-
-	    case MIPS_OPCODE_sd:
-	    case MIPS_OPCODE_sw:
-	      /* Trace stores of return address. */
-	      if (rt == MIPS_REG_RA)
-		{
-		  void *addr = sp + immediate;
-
-		  /* If RA is stored somewhere other than in the
-		     stack frame, give up. */
-		  if (rs != MIPS_REG_SP)
-		    goto backtrace_done;
-
-		  ASSERT (immediate % 4 == 0);
-		  if (op == MIPS_OPCODE_sw)
-		    saved_pc = ((u32 *) addr)[0];
-		  else
-		    saved_pc = ((u64 *) addr)[0];
-		  found_saved_pc = 1;
-		}
-	      break;
-
-	    case MIPS_OPCODE_addiu:
-	    case MIPS_OPCODE_daddiu:
-	    case MIPS_OPCODE_addi:
-	    case MIPS_OPCODE_daddi:
-	      if (rt == MIPS_REG_SP)
-		{
-		  if (rs != MIPS_REG_SP)
-		    goto backtrace_done;
-
-		  ASSERT (immediate % 4 == 0);
-
-		  /* Assume positive offset is part of the epilogue.
-		     E.g.
-		     jr ra
-		     add sp,sp,100
-		   */
-		  if (immediate > 0)
-		    continue;
-
-		  /* Negative offset means allocate stack space.
-		     This could either be the prologue or could be due to
-		     alloca. */
-		  sp -= immediate;
-
-		  /* This frame will not save RA. */
-		  if (i == 0)
-		    goto found_prologue;
-
-		  /* Assume that addiu sp,sp,-N without store of ra means
-		     that we have not found the prologue yet. */
-		  if (found_saved_pc)
-		    goto found_prologue;
-		}
-	      break;
-
-	    case MIPS_OPCODE_slti:
-	    case MIPS_OPCODE_sltiu:
-	    case MIPS_OPCODE_andi:
-	    case MIPS_OPCODE_ori:
-	    case MIPS_OPCODE_xori:
-	    case MIPS_OPCODE_lui:
-	    case MIPS_OPCODE_ldl:
-	    case MIPS_OPCODE_ldr:
-	    case MIPS_OPCODE_lb:
-	    case MIPS_OPCODE_lh:
-	    case MIPS_OPCODE_lwl:
-	    case MIPS_OPCODE_lw:
-	    case MIPS_OPCODE_lbu:
-	    case MIPS_OPCODE_lhu:
-	    case MIPS_OPCODE_lwr:
-	    case MIPS_OPCODE_lwu:
-	    case MIPS_OPCODE_ld:
-	      /* Give up when we find anyone setting the stack pointer. */
-	      if (rt == MIPS_REG_SP)
-		goto backtrace_done;
-	      break;
-
-	    case MIPS_OPCODE_SPECIAL:
-	      if (rd == MIPS_REG_SP)
-		switch (funct)
-		  {
-		  default:
-		    /* Give up when we find anyone setting the stack pointer. */
-		    goto backtrace_done;
-
-		  case MIPS_SPECIAL_FUNCT_break:
-		  case MIPS_SPECIAL_FUNCT_jr:
-		  case MIPS_SPECIAL_FUNCT_sync:
-		  case MIPS_SPECIAL_FUNCT_syscall:
-		  case MIPS_SPECIAL_FUNCT_tge:
-		  case MIPS_SPECIAL_FUNCT_tgeu:
-		  case MIPS_SPECIAL_FUNCT_tlt:
-		  case MIPS_SPECIAL_FUNCT_tltu:
-		  case MIPS_SPECIAL_FUNCT_teq:
-		  case MIPS_SPECIAL_FUNCT_tne:
-		    /* These instructions can validly have rd == MIPS_REG_SP */
-		    break;
-		  }
-	      break;
-	    }
-	}
-
-    found_prologue:
-      /* Check sanity of saved pc. */
-      if (saved_pc & 3)
-	goto backtrace_done;
-      if (saved_pc == 0)
-	goto backtrace_done;
-
-      if (i >= n_frames_to_skip)
-	callers[i - n_frames_to_skip] = saved_pc;
-      pc = uword_to_pointer (saved_pc, u32 *);
-    }
-
-backtrace_done:
-  if (i < n_frames_to_skip)
-    return 0;
-  else
-    return i - n_frames_to_skip;
-}
-#endif /* __mips__ */
-
-#ifndef clib_backtrace_defined
-#define clib_backtrace_defined
-
-typedef struct clib_generic_stack_frame_t
-{
-  struct clib_generic_stack_frame_t *prev;
-  void *return_address;
-} clib_generic_stack_frame_t;
-
-/* This will only work if we have a frame pointer.
-   Without a frame pointer we have to parse the machine code to
-   parse the stack frames. */
-uword
-clib_backtrace (uword * callers, uword max_callers, uword n_frames_to_skip)
-{
-  clib_generic_stack_frame_t *f;
-  uword i;
-
-  f = __builtin_frame_address (0);
-
-  /* Also skip current frame. */
-  n_frames_to_skip += 1;
-
-  for (i = 0; i < max_callers + n_frames_to_skip; i++)
-    {
-      f = f->prev;
-      if (!f)
-	goto backtrace_done;
-      if (clib_abs ((void *) f - (void *) f->prev) > (64 * 1024))
-	goto backtrace_done;
-      if (i >= n_frames_to_skip)
-	callers[i - n_frames_to_skip] = pointer_to_uword (f->return_address);
-    }
-
-backtrace_done:
-  if (i < n_frames_to_skip)
-    return 0;
-  else
-    return i - n_frames_to_skip;
-}
-#endif /* clib_backtrace_defined */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/bihash_24_8.h b/vppinfra/vppinfra/bihash_24_8.h
deleted file mode 100644
index 353f06bf..00000000
--- a/vppinfra/vppinfra/bihash_24_8.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#undef BIHASH_TYPE
-
-#define BIHASH_TYPE _24_8
-#define BIHASH_KVP_PER_PAGE 4
-
-#ifndef __included_bihash_24_8_h__
-#define __included_bihash_24_8_h__
-
-#include <vppinfra/heap.h>
-#include <vppinfra/format.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/xxhash.h>
-
-typedef struct
-{
-  u64 key[3];
-  u64 value;
-} clib_bihash_kv_24_8_t;
-
-static inline int
-clib_bihash_is_free_24_8 (const clib_bihash_kv_24_8_t * v)
-{
-  /* Free values are memset to 0xff, check a bit... */
-  if (v->key[0] == ~0ULL && v->value == ~0ULL)
-    return 1;
-  return 0;
-}
-
-static inline u64
-clib_bihash_hash_24_8 (const clib_bihash_kv_24_8_t * v)
-{
-#if __SSE4_2__
-  u32 value = 0;
-  value = _mm_crc32_u64 (value, v->key[0]);
-  value = _mm_crc32_u64 (value, v->key[1]);
-  value = _mm_crc32_u64 (value, v->key[2]);
-  return value;
-#else
-  u64 tmp = v->key[0] ^ v->key[1] ^ v->key[2];
-  return clib_xxhash (tmp);
-#endif
-}
-
-static inline u8 *
-format_bihash_kvp_24_8 (u8 * s, va_list * args)
-{
-  clib_bihash_kv_24_8_t *v = va_arg (*args, clib_bihash_kv_24_8_t *);
-
-  s = format (s, "key %llu %llu %llu value %llu",
-	      v->key[0], v->key[1], v->key[2], v->value);
-  return s;
-}
-
-static inline int
-clib_bihash_key_compare_24_8 (const u64 * a, const u64 * b)
-{
-  return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) == 0;
-}
-
-#undef __included_bihash_template_h__
-#include <vppinfra/bihash_template.h>
-
-#endif /* __included_bihash_24_8_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/bihash_8_8.h b/vppinfra/vppinfra/bihash_8_8.h
deleted file mode 100644
index a0d6df2e..00000000
--- a/vppinfra/vppinfra/bihash_8_8.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#undef BIHASH_TYPE
-
-#define BIHASH_TYPE _8_8
-#define BIHASH_KVP_PER_PAGE 4
-
-#ifndef __included_bihash_8_8_h__
-#define __included_bihash_8_8_h__
-
-#include <vppinfra/heap.h>
-#include <vppinfra/format.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/xxhash.h>
-
-#if __SSE4_2__
-#include <x86intrin.h>
-#endif
-
-/** 8 octet key, 8 octet key value pair */
-typedef struct
-{
-  u64 key;			/**< the key */
-  u64 value;			/**< the value */
-} clib_bihash_kv_8_8_t;
-
-/** Decide if a clib_bihash_kv_8_8_t instance is free
-    @param v- pointer to the (key,value) pair
-*/
-static inline int
-clib_bihash_is_free_8_8 (clib_bihash_kv_8_8_t * v)
-{
-  if (v->key == ~0ULL && v->value == ~0ULL)
-    return 1;
-  return 0;
-}
-
-/** Hash a clib_bihash_kv_8_8_t instance
-    @param v - pointer to the (key,value) pair, hash the key (only)
-*/
-static inline u64
-clib_bihash_hash_8_8 (clib_bihash_kv_8_8_t * v)
-{
-#if __SSE4_2__
-  return _mm_crc32_u64 (0, v->key);
-#else
-  return clib_xxhash (v->key);
-#endif
-}
-
-/** Format a clib_bihash_kv_8_8_t instance
-    @param s - u8 * vector under construction
-    @param args (vararg) - the (key,value) pair to format
-    @return s - the u8 * vector under construction
-*/
-static inline u8 *
-format_bihash_kvp_8_8 (u8 * s, va_list * args)
-{
-  clib_bihash_kv_8_8_t *v = va_arg (*args, clib_bihash_kv_8_8_t *);
-
-  s = format (s, "key %llu value %llu", v->key, v->value);
-  return s;
-}
-
-/** Compare two clib_bihash_kv_8_8_t instances
-    @param a - first key
-    @param b - second key
-*/
-static inline int
-clib_bihash_key_compare_8_8 (u64 a, u64 b)
-{
-  return a == b;
-}
-
-#undef __included_bihash_template_h__
-#include <vppinfra/bihash_template.h>
-
-#endif /* __included_bihash_8_8_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/bihash_doc.h b/vppinfra/vppinfra/bihash_doc.h
deleted file mode 100644
index e6ab9db6..00000000
--- a/vppinfra/vppinfra/bihash_doc.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#error do not #include this file!
-
-/** \file
-
-    Bounded-index extensible hashing. The basic algorithm performs
-    thread-safe constant-time lookups in the face of a rational number
-    of hash collisions. The computed hash code h(k) must have
-    reasonable statistics with respect to the key space. It won't do
-    to have h(k) = 0 or 1, for all values of k.
-
-    Each bucket in the power-of-two bucket array contains the index
-    (in a private vppinfra memory heap) of the "backing store" for the
-    bucket, as well as a size field. The size field (log2_pages)
-    corresponds to 1, 2, 4, ... contiguous "pages" containing the
-    (key,value) pairs in the bucket.
-
-    When a single page fills, we allocate two contiguous pages.  We
-    recompute h(k) for each (key,value) pair, using an additional bit
-    to deal the (key, value) pairs into the "top" and "bottom" pages.
-
-    At lookup time, we compute h(k), using lg(bucket-array-size) to
-    pick the bucket. We read the bucket to find the base of the
-    backing pages.  We use an additional log2_pages' worth of bits
-    from h(k) to compute the offset of the page which will contain the
-    (key,value) pair we're trying to find.
-*/
-
-/** template key/value backing page structure */
-typedef struct clib_bihash_value
-{
-  union
-  {
-
-    clib_bihash_kv kvp[BIHASH_KVP_PER_PAGE]; /**< the actual key/value pairs */
-    clib_bihash_value *next_free;  /**< used when a KVP page (or block thereof) is on a freelist */
-  };
-} clib_bihash_value_t
-/** bihash bucket structure */
-  typedef struct
-{
-  union
-  {
-    struct
-    {
-      u32 offset;  /**< backing page offset in the clib memory heap */
-      u8 pad[3];   /**< log2 (size of the packing page block) */
-      u8 log2_pages;
-    };
-    u64 as_u64;
-  };
-} clib_bihash_bucket_t;
-
-/** A bounded index extensible hash table */
-typedef struct
-{
-  clib_bihash_bucket_t *buckets;  /**< Hash bucket vector, power-of-two in size */
-  volatile u32 *writer_lock;  /**< Writer lock, in its own cache line */
-    BVT (clib_bihash_value) ** working_copies;
-					    /**< Working copies (various sizes), to avoid locking against readers */
-  clib_bihash_bucket_t saved_bucket; /**< Saved bucket pointer */
-  u32 nbuckets;			     /**< Number of hash buckets */
-  u32 log2_nbuckets;		     /**< lg(nbuckets) */
-  u8 *name;			     /**< hash table name */
-    BVT (clib_bihash_value) ** freelists;
-				      /**< power of two freelist vector */
-  void *mheap;	/**< clib memory heap */
-} clib_bihash_t;
-
-/** Get pointer to value page given its clib mheap offset */
-static inline void *clib_bihash_get_value (clib_bihash * h, uword offset);
-
-/** Get clib mheap offset given a pointer */
-static inline uword clib_bihash_get_offset (clib_bihash * h, void *v);
-
-/** initialize a bounded index extensible hash table
-
-    @param h - the bi-hash table to initialize
-    @param name - name of the hash table
-    @param nbuckets - the number of buckets, will be rounded up to
-a power of two
-    @param memory_size - clib mheap size, in bytes
-*/
-
-void clib_bihash_init
-  (clib_bihash * h, char *name, u32 nbuckets, uword memory_size);
-
-/** Destroy a bounded index extensible hash table
-    @param h - the bi-hash table to free
-*/
-
-void clib_bihash_free (clib_bihash * h);
-
-/** Add or delete a (key,value) pair from a bi-hash table
-
-    @param h - the bi-hash table to search
-    @param add_v - the (key,value) pair to add
-    @param is_add - add=1, delete=0
-    @returns 0 on success, < 0 on error
-    @note This function will replace an existing (key,value) pair if the
-    new key matches an existing key
-*/
-int clib_bihash_add_del (clib_bihash * h, clib_bihash_kv * add_v, int is_add);
-
-
-/** Search a bi-hash table
-
-    @param h - the bi-hash table to search
-    @param search_v - (key,value) pair containing the search key
-    @param return_v - (key,value) pair which matches search_v.key
-    @returns 0 on success (with return_v set), < 0 on error
-*/
-int clib_bihash_search (clib_bihash * h,
-			clib_bihash_kv * search_v, clib_bihash_kv * return_v);
-
-
-/** Visit active (key,value) pairs in a bi-hash table
-
-    @param h - the bi-hash table to search
-    @param callback - function to call with each active (key,value) pair
-    @param arg - arbitrary second argument passed to the callback function
-    First argument is the (key,value) pair to visit
-    @note Trying to supply a proper function prototype for the
-    callback function appears to be a fool's errand.
-*/
-void clib_bihash_foreach_key_value_pair (clib_bihash * h,
-					 void *callback, void *arg);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/bihash_template.c b/vppinfra/vppinfra/bihash_template.c
deleted file mode 100644
index 4b0b4257..00000000
--- a/vppinfra/vppinfra/bihash_template.c
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** @cond DOCUMENTATION_IS_IN_BIHASH_DOC_H */
-
-void BV (clib_bihash_init)
-  (BVT (clib_bihash) * h, char *name, u32 nbuckets, uword memory_size)
-{
-  void *oldheap;
-
-  nbuckets = 1 << (max_log2 (nbuckets));
-
-  h->name = (u8 *) name;
-  h->nbuckets = nbuckets;
-  h->log2_nbuckets = max_log2 (nbuckets);
-
-  h->mheap = mheap_alloc (0 /* use VM */ , memory_size);
-
-  oldheap = clib_mem_set_heap (h->mheap);
-  vec_validate_aligned (h->buckets, nbuckets - 1, CLIB_CACHE_LINE_BYTES);
-  h->writer_lock = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
-					   CLIB_CACHE_LINE_BYTES);
-
-  clib_mem_set_heap (oldheap);
-}
-
-void BV (clib_bihash_free) (BVT (clib_bihash) * h)
-{
-  mheap_free (h->mheap);
-  memset (h, 0, sizeof (*h));
-}
-
-static
-BVT (clib_bihash_value) *
-BV (value_alloc) (BVT (clib_bihash) * h, u32 log2_pages)
-{
-  BVT (clib_bihash_value) * rv = 0;
-  void *oldheap;
-
-  ASSERT (h->writer_lock[0]);
-  if (log2_pages >= vec_len (h->freelists) || h->freelists[log2_pages] == 0)
-    {
-      oldheap = clib_mem_set_heap (h->mheap);
-
-      vec_validate (h->freelists, log2_pages);
-      vec_validate_aligned (rv, (1 << log2_pages) - 1, CLIB_CACHE_LINE_BYTES);
-      clib_mem_set_heap (oldheap);
-      goto initialize;
-    }
-  rv = h->freelists[log2_pages];
-  h->freelists[log2_pages] = rv->next_free;
-
-initialize:
-  ASSERT (rv);
-  ASSERT (vec_len (rv) == (1 << log2_pages));
-  /*
-   * Latest gcc complains that the length arg is zero
-   * if we replace (1<<log2_pages) with vec_len(rv).
-   * No clue.
-   */
-  memset (rv, 0xff, sizeof (*rv) * (1 << log2_pages));
-  return rv;
-}
-
-static void
-BV (value_free) (BVT (clib_bihash) * h, BVT (clib_bihash_value) * v)
-{
-  u32 log2_pages;
-
-  ASSERT (h->writer_lock[0]);
-
-  log2_pages = min_log2 (vec_len (v));
-
-  ASSERT (vec_len (h->freelists) > log2_pages);
-
-  v->next_free = h->freelists[log2_pages];
-  h->freelists[log2_pages] = v;
-}
-
-static inline void
-BV (make_working_copy) (BVT (clib_bihash) * h, clib_bihash_bucket_t * b)
-{
-  BVT (clib_bihash_value) * v;
-  clib_bihash_bucket_t working_bucket __attribute__ ((aligned (8)));
-  void *oldheap;
-  BVT (clib_bihash_value) * working_copy;
-  u32 cpu_number = os_get_cpu_number ();
-
-  if (cpu_number >= vec_len (h->working_copies))
-    {
-      oldheap = clib_mem_set_heap (h->mheap);
-      vec_validate (h->working_copies, cpu_number);
-      clib_mem_set_heap (oldheap);
-    }
-
-  /*
-   * working_copies are per-cpu so that near-simultaneous
-   * updates from multiple threads will not result in sporadic, spurious
-   * lookup failures.
-   */
-  working_copy = h->working_copies[cpu_number];
-
-  h->saved_bucket.as_u64 = b->as_u64;
-  oldheap = clib_mem_set_heap (h->mheap);
-
-  if ((1 << b->log2_pages) > vec_len (working_copy))
-    {
-      vec_validate_aligned (working_copy, (1 << b->log2_pages) - 1,
-			    sizeof (u64));
-      h->working_copies[cpu_number] = working_copy;
-    }
-
-  _vec_len (working_copy) = 1 << b->log2_pages;
-  clib_mem_set_heap (oldheap);
-
-  v = BV (clib_bihash_get_value) (h, b->offset);
-
-  clib_memcpy (working_copy, v, sizeof (*v) * (1 << b->log2_pages));
-  working_bucket.as_u64 = b->as_u64;
-  working_bucket.offset = BV (clib_bihash_get_offset) (h, working_copy);
-  CLIB_MEMORY_BARRIER ();
-  b->as_u64 = working_bucket.as_u64;
-  h->working_copies[cpu_number] = working_copy;
-}
-
-static
-BVT (clib_bihash_value) *
-BV (split_and_rehash)
-  (BVT (clib_bihash) * h,
-   BVT (clib_bihash_value) * old_values, u32 new_log2_pages)
-{
-  BVT (clib_bihash_value) * new_values, *v, *new_v;
-  int i, j, k;
-
-  new_values = BV (value_alloc) (h, new_log2_pages);
-
-  v = old_values;
-  for (i = 0; i < vec_len (old_values); i++)
-    {
-      u64 new_hash;
-
-      for (j = 0; j < BIHASH_KVP_PER_PAGE; j++)
-	{
-	  if (BV (clib_bihash_is_free) (&(v->kvp[j])) == 0)
-	    {
-	      new_hash = BV (clib_bihash_hash) (&(v->kvp[j]));
-	      new_hash >>= h->log2_nbuckets;
-	      new_hash &= (1 << new_log2_pages) - 1;
-
-	      new_v = &new_values[new_hash];
-
-	      for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
-		{
-		  if (BV (clib_bihash_is_free) (&(new_v->kvp[k])))
-		    {
-		      clib_memcpy (&(new_v->kvp[k]), &(v->kvp[j]),
-				   sizeof (new_v->kvp[k]));
-		      goto doublebreak;
-		    }
-		}
-	      /* Crap. Tell caller to try again */
-	      BV (value_free) (h, new_values);
-	      return 0;
-	    }
-	doublebreak:
-	  ;
-	}
-      v++;
-    }
-  return new_values;
-}
-
-int BV (clib_bihash_add_del)
-  (BVT (clib_bihash) * h, BVT (clib_bihash_kv) * add_v, int is_add)
-{
-  u32 bucket_index;
-  clib_bihash_bucket_t *b, tmp_b;
-  BVT (clib_bihash_value) * v, *new_v, *save_new_v, *working_copy;
-  u32 value_index;
-  int rv = 0;
-  int i;
-  u64 hash, new_hash;
-  u32 new_log2_pages;
-  u32 cpu_number = os_get_cpu_number ();
-
-  hash = BV (clib_bihash_hash) (add_v);
-
-  bucket_index = hash & (h->nbuckets - 1);
-  b = &h->buckets[bucket_index];
-
-  hash >>= h->log2_nbuckets;
-
-  while (__sync_lock_test_and_set (h->writer_lock, 1))
-    ;
-
-  /* First elt in the bucket? */
-  if (b->offset == 0)
-    {
-      if (is_add == 0)
-	{
-	  rv = -1;
-	  goto unlock;
-	}
-
-      v = BV (value_alloc) (h, 0);
-      *v->kvp = *add_v;
-      tmp_b.as_u64 = 0;
-      tmp_b.offset = BV (clib_bihash_get_offset) (h, v);
-
-      b->as_u64 = tmp_b.as_u64;
-      goto unlock;
-    }
-
-  BV (make_working_copy) (h, b);
-
-  v = BV (clib_bihash_get_value) (h, h->saved_bucket.offset);
-  value_index = hash & ((1 << h->saved_bucket.log2_pages) - 1);
-  v += value_index;
-
-  if (is_add)
-    {
-      /*
-       * For obvious (in hindsight) reasons, see if we're supposed to
-       * replace an existing key, then look for an empty slot.
-       */
-      for (i = 0; i < BIHASH_KVP_PER_PAGE; i++)
-	{
-	  if (!memcmp (&(v->kvp[i]), &add_v->key, sizeof (add_v->key)))
-	    {
-	      clib_memcpy (&(v->kvp[i]), add_v, sizeof (*add_v));
-	      CLIB_MEMORY_BARRIER ();
-	      /* Restore the previous (k,v) pairs */
-	      b->as_u64 = h->saved_bucket.as_u64;
-	      goto unlock;
-	    }
-	}
-      for (i = 0; i < BIHASH_KVP_PER_PAGE; i++)
-	{
-	  if (BV (clib_bihash_is_free) (&(v->kvp[i])))
-	    {
-	      clib_memcpy (&(v->kvp[i]), add_v, sizeof (*add_v));
-	      CLIB_MEMORY_BARRIER ();
-	      b->as_u64 = h->saved_bucket.as_u64;
-	      goto unlock;
-	    }
-	}
-      /* no room at the inn... split case... */
-    }
-  else
-    {
-      for (i = 0; i < BIHASH_KVP_PER_PAGE; i++)
-	{
-	  if (!memcmp (&(v->kvp[i]), &add_v->key, sizeof (add_v->key)))
-	    {
-	      memset (&(v->kvp[i]), 0xff, sizeof (*(add_v)));
-	      CLIB_MEMORY_BARRIER ();
-	      b->as_u64 = h->saved_bucket.as_u64;
-	      goto unlock;
-	    }
-	}
-      rv = -3;
-      b->as_u64 = h->saved_bucket.as_u64;
-      goto unlock;
-    }
-
-  new_log2_pages = h->saved_bucket.log2_pages + 1;
-
-expand_again:
-  working_copy = h->working_copies[cpu_number];
-  new_v = BV (split_and_rehash) (h, working_copy, new_log2_pages);
-  if (new_v == 0)
-    {
-      new_log2_pages++;
-      goto expand_again;
-    }
-
-  /* Try to add the new entry */
-  save_new_v = new_v;
-  new_hash = BV (clib_bihash_hash) (add_v);
-  new_hash >>= h->log2_nbuckets;
-  new_hash &= (1 << min_log2 (vec_len (new_v))) - 1;
-  new_v += new_hash;
-
-  for (i = 0; i < BIHASH_KVP_PER_PAGE; i++)
-    {
-      if (BV (clib_bihash_is_free) (&(new_v->kvp[i])))
-	{
-	  clib_memcpy (&(new_v->kvp[i]), add_v, sizeof (*add_v));
-	  goto expand_ok;
-	}
-    }
-  /* Crap. Try again */
-  new_log2_pages++;
-  BV (value_free) (h, save_new_v);
-  goto expand_again;
-
-expand_ok:
-  tmp_b.log2_pages = min_log2 (vec_len (save_new_v));
-  tmp_b.offset = BV (clib_bihash_get_offset) (h, save_new_v);
-  CLIB_MEMORY_BARRIER ();
-  b->as_u64 = tmp_b.as_u64;
-  v = BV (clib_bihash_get_value) (h, h->saved_bucket.offset);
-  BV (value_free) (h, v);
-
-unlock:
-  CLIB_MEMORY_BARRIER ();
-  h->writer_lock[0] = 0;
-  return rv;
-}
-
-int BV (clib_bihash_search)
-  (const BVT (clib_bihash) * h,
-   BVT (clib_bihash_kv) * search_key, BVT (clib_bihash_kv) * valuep)
-{
-  u64 hash;
-  u32 bucket_index;
-  uword value_index;
-  BVT (clib_bihash_value) * v;
-  clib_bihash_bucket_t *b;
-  int i;
-
-  ASSERT (valuep);
-
-  hash = BV (clib_bihash_hash) (search_key);
-
-  bucket_index = hash & (h->nbuckets - 1);
-  b = &h->buckets[bucket_index];
-
-  if (b->offset == 0)
-    return -1;
-
-  hash >>= h->log2_nbuckets;
-
-  v = BV (clib_bihash_get_value) (h, b->offset);
-  value_index = hash & ((1 << b->log2_pages) - 1);
-  v += value_index;
-
-  for (i = 0; i < BIHASH_KVP_PER_PAGE; i++)
-    {
-      if (BV (clib_bihash_key_compare) (v->kvp[i].key, search_key->key))
-	{
-	  *valuep = v->kvp[i];
-	  return 0;
-	}
-    }
-  return -1;
-}
-
-u8 *BV (format_bihash) (u8 * s, va_list * args)
-{
-  BVT (clib_bihash) * h = va_arg (*args, BVT (clib_bihash) *);
-  int verbose = va_arg (*args, int);
-  clib_bihash_bucket_t *b;
-  BVT (clib_bihash_value) * v;
-  int i, j, k;
-  u64 active_elements = 0;
-
-  s = format (s, "Hash table %s\n", h->name ? h->name : (u8 *) "(unnamed)");
-
-  for (i = 0; i < h->nbuckets; i++)
-    {
-      b = &h->buckets[i];
-      if (b->offset == 0)
-	{
-	  if (verbose > 1)
-	    s = format (s, "[%d]: empty\n", i);
-	  continue;
-	}
-
-      if (verbose)
-	{
-	  s = format (s, "[%d]: heap offset %d, len %d\n", i,
-		      b->offset, (1 << b->log2_pages));
-	}
-
-      v = BV (clib_bihash_get_value) (h, b->offset);
-      for (j = 0; j < (1 << b->log2_pages); j++)
-	{
-	  for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
-	    {
-	      if (BV (clib_bihash_is_free) (&v->kvp[k]))
-		{
-		  if (verbose > 1)
-		    s = format (s, "    %d: empty\n",
-				j * BIHASH_KVP_PER_PAGE + k);
-		  continue;
-		}
-	      if (verbose)
-		{
-		  s = format (s, "    %d: %U\n",
-			      j * BIHASH_KVP_PER_PAGE + k,
-			      BV (format_bihash_kvp), &(v->kvp[k]));
-		}
-	      active_elements++;
-	    }
-	  v++;
-	}
-    }
-
-  s = format (s, "    %lld active elements\n", active_elements);
-  s = format (s, "    %d free lists\n", vec_len (h->freelists));
-
-  return s;
-}
-
-void BV (clib_bihash_foreach_key_value_pair)
-  (BVT (clib_bihash) * h, void *callback, void *arg)
-{
-  int i, j, k;
-  clib_bihash_bucket_t *b;
-  BVT (clib_bihash_value) * v;
-  void (*fp) (BVT (clib_bihash_kv) *, void *) = callback;
-
-  for (i = 0; i < h->nbuckets; i++)
-    {
-      b = &h->buckets[i];
-      if (b->offset == 0)
-	continue;
-
-      v = BV (clib_bihash_get_value) (h, b->offset);
-      for (j = 0; j < (1 << b->log2_pages); j++)
-	{
-	  for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
-	    {
-	      if (BV (clib_bihash_is_free) (&v->kvp[k]))
-		continue;
-
-	      (*fp) (&v->kvp[k], arg);
-	    }
-	  v++;
-	}
-    }
-}
-
-/** @endcond */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/bihash_template.h b/vppinfra/vppinfra/bihash_template.h
deleted file mode 100644
index f70190c6..00000000
--- a/vppinfra/vppinfra/bihash_template.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-  Copyright (c) 2014 Cisco and/or its affiliates.
-
-  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-/** @cond DOCUMENTATION_IS_IN_BIHASH_DOC_H */
-
-/*
- * Note: to instantiate the template multiple times in a single file,
- * #undef __included_bihash_template_h__...
- */
-#ifndef __included_bihash_template_h__
-#define __included_bihash_template_h__
-
-#include <vppinfra/heap.h>
-#include <vppinfra/format.h>
-#include <vppinfra/pool.h>
-
-#ifndef BIHASH_TYPE
-#error BIHASH_TYPE not defined
-#endif
-
-#define _bv(a,b) a##b
-#define __bv(a,b) _bv(a,b)
-#define BV(a) __bv(a,BIHASH_TYPE)
-
-#define _bvt(a,b) a##b##_t
-#define __bvt(a,b) _bvt(a,b)
-#define BVT(a) __bvt(a,BIHASH_TYPE)
-
-typedef struct BV (clib_bihash_value)
-{
-  union
-  {
-    BVT (clib_bihash_kv) kvp[BIHASH_KVP_PER_PAGE];
-    struct BV (clib_bihash_value) * next_free;
-  };
-} BVT (clib_bihash_value);
-
-/*
- * This is shared across all uses of the template, so it needs
- * a "personal" #include recursion block
- */
-#ifndef __defined_clib_bihash_bucket_t__
-#define __defined_clib_bihash_bucket_t__
-typedef struct
-{
-  union
-  {
-    struct
-    {
-      u32 offset;
-      u8 pad[3];
-      u8 log2_pages;
-    };
-    u64 as_u64;
-  };
-} clib_bihash_bucket_t;
-#endif /* __defined_clib_bihash_bucket_t__ */
-
-typedef struct
-{
-  BVT (clib_bihash_value) * values;
-  clib_bihash_bucket_t *buckets;
-  volatile u32 *writer_lock;
-
-    BVT (clib_bihash_value) ** working_copies;
-  clib_bihash_bucket_t saved_bucket;
-
-  u32 nbuckets;
-  u32 log2_nbuckets;
-  u8 *name;
-
-    BVT (clib_bihash_value) ** freelists;
-  void *mheap;
-
-} BVT (clib_bihash);
-
-
-static inline void *BV (clib_bihash_get_value) (const BVT (clib_bihash) * h,
-						uword offset)
-{
-  u8 *hp = h->mheap;
-  u8 *vp = hp + offset;
-
-  return (void *) vp;
-}
-
-static inline uword BV (clib_bihash_get_offset) (const BVT (clib_bihash) * h,
-						 void *v)
-{
-  u8 *hp, *vp;
-
-  hp = (u8 *) h->mheap;
-  vp = (u8 *) v;
-
-  ASSERT ((vp - hp) < 0x100000000ULL);
-  return vp - hp;
-}
-
-void BV (clib_bihash_init)
-  (BVT (clib_bihash) * h, char *name, u32 nbuckets, uword memory_size);
-
-void BV (clib_bihash_free) (BVT (clib_bihash) * h);
-
-int BV (clib_bihash_add_del) (BVT (clib_bihash) * h,
-			      BVT (clib_bihash_kv) * add_v, int is_add);
-int BV (clib_bihash_search) (const BVT (clib_bihash) * h,
-			     BVT (clib_bihash_kv) * search_v,
-			     BVT (clib_bihash_kv) * return_v);
-
-void BV (clib_bihash_foreach_key_value_pair) (BVT (clib_bihash) * h,
-					      void *callback, void *arg);
-
-format_function_t BV (format_bihash);
-format_function_t BV (format_bihash_kvp);
-
-
-static inline int BV (clib_bihash_search_inline)
-  (const BVT (clib_bihash) * h, BVT (clib_bihash_kv) * kvp)
-{
-  u64 hash;
-  u32 bucket_index;
-  uword value_index;
-  BVT (clib_bihash_value) * v;
-  clib_bihash_bucket_t *b;
-  int i;
-
-  hash = BV (clib_bihash_hash) (kvp);
-
-  bucket_index = hash & (h->nbuckets - 1);
-  b = &h->buckets[bucket_index];
-
-  if (b->offset == 0)
-    return -1;
-
-  hash >>= h->log2_nbuckets;
-
-  v = BV (clib_bihash_get_value) (h, b->offset);
-  value_index = hash & ((1 << b->log2_pages) - 1);
-  v += value_index;
-
-  for (i = 0; i < BIHASH_KVP_PER_PAGE; i++)
-    {
-      if (BV (clib_bihash_key_compare) (v->kvp[i].key, kvp->key))
-	{
-	  *kvp = v->kvp[i];
-	  return 0;
-	}
-    }
-  return -1;
-}
-
-static inline int BV (clib_bihash_search_inline_2)
-  (const BVT (clib_bihash) * h,
-   BVT (clib_bihash_kv) * search_key, BVT (clib_bihash_kv) * valuep)
-{
-  u64 hash;
-  u32 bucket_index;
-  uword value_index;
-  BVT (clib_bihash_value) * v;
-  clib_bihash_bucket_t *b;
-  int i;
-
-  ASSERT (valuep);
-
-  hash = BV (clib_bihash_hash) (search_key);
-
-  bucket_index = hash & (h->nbuckets - 1);
-  b = &h->buckets[bucket_index];
-
-  if (b->offset == 0)
-    return -1;
-
-  hash >>= h->log2_nbuckets;
-
-  v = BV (clib_bihash_get_value) (h, b->offset);
-  value_index = hash & ((1 << b->log2_pages) - 1);
-  v += value_index;
-
-  for (i = 0; i < BIHASH_KVP_PER_PAGE; i++)
-    {
-      if (BV (clib_bihash_key_compare) (v->kvp[i].key, search_key->key))
-	{
-	  *valuep = v->kvp[i];
-	  return 0;
-	}
-    }
-  return -1;
-}
-
-
-#endif /* __included_bihash_template_h__ */
-
-/** @endcond */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/bitmap.h b/vppinfra/vppinfra/bitmap.h
deleted file mode 100644
index 9e1ae493..00000000
--- a/vppinfra/vppinfra/bitmap.h
+++ /dev/null
@@ -1,774 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003, 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_bitmap_h
-#define included_clib_bitmap_h
-
-/** \file
-    Bitmaps built as vectors of machine words
-*/
-
-#include <vppinfra/vec.h>
-#include <vppinfra/random.h>
-#include <vppinfra/error.h>
-#include <vppinfra/bitops.h>	/* for count_set_bits */
-
-typedef uword clib_bitmap_t;
-
-/** predicate function; is an entire bitmap empty?
-    @param ai - pointer to a bitmap
-    @returns 1 if the entire bitmap is zero, 0 otherwise
-*/
-always_inline uword
-clib_bitmap_is_zero (uword * ai)
-{
-  uword i;
-  for (i = 0; i < vec_len (ai); i++)
-    if (ai[i] != 0)
-      return 0;
-  return 1;
-}
-
-/** predicate function; are two bitmaps equal?
-    @param a - pointer to a bitmap
-    @param b - pointer to a bitmap
-    @returns 1 if the bitmaps are equal, 0 otherwise
-*/
-always_inline uword
-clib_bitmap_is_equal (uword * a, uword * b)
-{
-  uword i;
-  if (vec_len (a) != vec_len (b))
-    return 0;
-  for (i = 0; i < vec_len (a); i++)
-    if (a[i] != b[i])
-      return 0;
-  return 1;
-}
-
-/** Duplicate a bitmap
-    @param v - pointer to a bitmap
-    @returns a duplicate of the bitmap
-*/
-#define clib_bitmap_dup(v) vec_dup(v)
-
-/** Free a bitmap
-    @param v - pointer to the bitmap to free
-*/
-#define clib_bitmap_free(v) vec_free(v)
-
-/** Number of bytes in a bitmap
-    @param v - pointer to the bitmap
-*/
-#define clib_bitmap_bytes(v) vec_bytes(v)
-
-/** Clear a bitmap
-    @param v - pointer to the bitmap to clear
-*/
-#define clib_bitmap_zero(v) vec_zero(v)
-
-/** Allocate a bitmap with the supplied number of bits
-    @param [out] v - the resulting bitmap
-    @param n_bits - the required number of bits
-*/
-
-#define clib_bitmap_alloc(v,n_bits) \
-  v = vec_new (uword, ((n_bits) + BITS (uword) - 1) / BITS (uword))
-
-#define clib_bitmap_vec_validate(v,i) vec_validate_aligned((v),(i),sizeof(uword))
-
-/* Make sure that a bitmap is at least n_bits in size */
-#define clib_bitmap_validate(v,n_bits) \
-  clib_bitmap_vec_validate ((v), ((n_bits) - 1) / BITS (uword))
-
-/* low-level routine to remove trailing zeros from a bitmap */
-always_inline uword *
-_clib_bitmap_remove_trailing_zeros (uword * a)
-{
-  word i;
-  if (a)
-    {
-      for (i = _vec_len (a) - 1; i >= 0; i--)
-	if (a[i] != 0)
-	  break;
-      _vec_len (a) = i + 1;
-    }
-  return a;
-}
-
-/** Sets the ith bit of a bitmap to new_value.
-    No sanity checking. Be careful.
-    @param a - pointer to the bitmap
-    @param i - the bit position to interrogate
-    @param new_value - new value for the bit
-    @returns the old value of the bit
-*/
-always_inline uword
-clib_bitmap_set_no_check (uword * a, uword i, uword new_value)
-{
-  uword i0 = i / BITS (a[0]);
-  uword i1 = i % BITS (a[0]);
-  uword bit = (uword) 1 << i1;
-  uword ai, old_value;
-
-  /* Removed ASSERT since uword * a may not be a vector. */
-  /* ASSERT (i0 < vec_len (a)); */
-
-  ai = a[i0];
-  old_value = (ai & bit) != 0;
-  ai &= ~bit;
-  ai |= ((uword) (new_value != 0)) << i1;
-  a[i0] = ai;
-  return old_value;
-}
-
-/** Sets the ith bit of a bitmap to new_value
-    Removes trailing zeros from the bitmap
-    @param ai - pointer to the bitmap
-    @param i - the bit position to interrogate
-    @param value - new value for the bit
-    @returns the old value of the bit
-*/
-always_inline uword *
-clib_bitmap_set (uword * ai, uword i, uword value)
-{
-  uword i0 = i / BITS (ai[0]);
-  uword i1 = i % BITS (ai[0]);
-  uword a;
-
-  /* Check for writing a zero to beyond end of bitmap. */
-  if (value == 0 && i0 >= vec_len (ai))
-    return ai;			/* Implied trailing zeros. */
-
-  clib_bitmap_vec_validate (ai, i0);
-
-  a = ai[i0];
-  a &= ~((uword) 1 << i1);
-  a |= ((uword) (value != 0)) << i1;
-  ai[i0] = a;
-
-  /* If bits have been cleared, test for zero. */
-  if (a == 0)
-    ai = _clib_bitmap_remove_trailing_zeros (ai);
-
-  return ai;
-}
-
-/** Gets the ith bit value from a bitmap
-    @param ai - pointer to the bitmap
-    @param i - the bit position to interrogate
-    @returns the indicated bit value
-*/
-always_inline uword
-clib_bitmap_get (uword * ai, uword i)
-{
-  uword i0 = i / BITS (ai[0]);
-  uword i1 = i % BITS (ai[0]);
-  return i0 < vec_len (ai) && 0 != ((ai[i0] >> i1) & 1);
-}
-
-/** Gets the ith bit value from a bitmap
-    Does not sanity-check the bit position. Be careful.
-    @param ai - pointer to the bitmap
-    @param i - the bit position to interrogate
-    @returns the indicated bit value, or garbage if the bit position is
-    out of range.
-*/
-always_inline uword
-clib_bitmap_get_no_check (uword * ai, uword i)
-{
-  uword i0 = i / BITS (ai[0]);
-  uword i1 = i % BITS (ai[0]);
-  return 0 != ((ai[i0] >> i1) & 1);
-}
-
-always_inline uword
-clib_bitmap_get_multiple_no_check (uword * ai, uword i, uword n_bits)
-{
-  uword i0 = i / BITS (ai[0]);
-  uword i1 = i % BITS (ai[0]);
-  ASSERT (i1 + n_bits <= BITS (uword));
-  return 0 != ((ai[i0] >> i1) & pow2_mask (n_bits));
-}
-
-/** Gets the ith through ith + n_bits bit values from a bitmap
-    @param bitmap - pointer to the bitmap
-    @param i - the first bit position to retrieve
-    @param n_bits - the number of bit positions to retrieve
-    @returns the indicated range of bits
-*/
-always_inline uword
-clib_bitmap_get_multiple (uword * bitmap, uword i, uword n_bits)
-{
-  uword i0, i1, result;
-  uword l = vec_len (bitmap);
-
-  ASSERT (n_bits <= BITS (result));
-
-  i0 = i / BITS (bitmap[0]);
-  i1 = i % BITS (bitmap[0]);
-
-  /* Check first word. */
-  result = 0;
-  if (i0 < l)
-    {
-      result |= (bitmap[i0] >> i1);
-      if (n_bits < BITS (bitmap[0]))
-	result &= (((uword) 1 << n_bits) - 1);
-    }
-
-  /* Check for overlap into next word. */
-  i0++;
-  if (i1 + n_bits > BITS (bitmap[0]) && i0 < l)
-    {
-      n_bits -= BITS (bitmap[0]) - i1;
-      result |=
-	(bitmap[i0] & (((uword) 1 << n_bits) - 1)) << (BITS (bitmap[0]) - i1);
-    }
-
-  return result;
-}
-
-/** sets the ith through ith + n_bits bits in a bitmap
-    @param bitmap - pointer to the bitmap
-    @param i - the first bit position to retrieve
-    @param value - the values to set
-    @param n_bits - the number of bit positions to set
-    @returns a pointer to the updated bitmap, which may expand and move
-*/
-
-always_inline uword *
-clib_bitmap_set_multiple (uword * bitmap, uword i, uword value, uword n_bits)
-{
-  uword i0, i1, l, t, m;
-
-  ASSERT (n_bits <= BITS (value));
-
-  i0 = i / BITS (bitmap[0]);
-  i1 = i % BITS (bitmap[0]);
-
-  /* Allocate bitmap. */
-  clib_bitmap_vec_validate (bitmap, (i + n_bits) / BITS (bitmap[0]));
-  l = vec_len (bitmap);
-
-  m = ~0;
-  if (n_bits < BITS (value))
-    m = (((uword) 1 << n_bits) - 1);
-  value &= m;
-
-  /* Insert into first word. */
-  t = bitmap[i0];
-  t &= ~(m << i1);
-  t |= value << i1;
-  bitmap[i0] = t;
-
-  /* Insert into second word. */
-  i0++;
-  if (i1 + n_bits > BITS (bitmap[0]) && i0 < l)
-    {
-      t = BITS (bitmap[0]) - i1;
-      value >>= t;
-      n_bits -= t;
-      t = bitmap[i0];
-      m = ((uword) 1 << n_bits) - 1;
-      t &= ~m;
-      t |= value;
-      bitmap[i0] = t;
-    }
-
-  return bitmap;
-}
-
-always_inline uword *
-clfib_bitmap_set_region (uword * bitmap, uword i, uword value, uword n_bits)
-{
-  uword a0, a1, b0;
-  uword i_end, mask;
-
-  a0 = i / BITS (bitmap[0]);
-  a1 = i % BITS (bitmap[0]);
-
-  i_end = i + n_bits;
-  b0 = i_end / BITS (bitmap[0]);
-
-  clib_bitmap_vec_validate (bitmap, b0);
-
-  /* First word. */
-  mask = n_bits < BITS (bitmap[0]) ? pow2_mask (n_bits) : ~0;
-  mask <<= a1;
-
-  if (value)
-    bitmap[a0] |= mask;
-  else
-    bitmap[a0] &= ~mask;
-
-  for (a0++; a0 < b0; a0++)
-    bitmap[a0] = value ? ~0 : 0;
-
-  if (a0 == b0)
-    {
-      word n_bits_left = n_bits - (BITS (bitmap[0]) - a1);
-      mask = pow2_mask (n_bits_left);
-      if (value)
-	bitmap[a0] |= mask;
-      else
-	bitmap[a0] &= ~mask;
-    }
-
-  return bitmap;
-}
-
-/** Macro to iterate across set bits in a bitmap
-
-    @param i - the current set bit
-    @param ai - the bitmap
-    @param body - the expression to evaluate for each set bit
-*/
-#define clib_bitmap_foreach(i,ai,body)					\
-do {									\
-  uword __bitmap_i, __bitmap_ai, __bitmap_len, __bitmap_first_set;	\
-  __bitmap_len = vec_len ((ai));					\
-  for (__bitmap_i = 0; __bitmap_i < __bitmap_len; __bitmap_i++)		\
-    {									\
-      __bitmap_ai = (ai)[__bitmap_i];					\
-      while (__bitmap_ai != 0)						\
-	{								\
-	  __bitmap_first_set = first_set (__bitmap_ai);			\
-	  (i) = (__bitmap_i * BITS ((ai)[0])				\
-		 + min_log2 (__bitmap_first_set));			\
-	  do { body; } while (0);					\
-	  __bitmap_ai ^= __bitmap_first_set;				\
-	}								\
-    }									\
-} while (0)
-
-
-/** Return the lowest numbered set bit in a bitmap
-    @param ai - pointer to the bitmap
-    @returns lowest numbered set bit, or ~0 if the entire bitmap is zero
-*/
-always_inline uword
-clib_bitmap_first_set (uword * ai)
-{
-  uword i;
-  for (i = 0; i < vec_len (ai); i++)
-    {
-      uword x = ai[i];
-      if (x != 0)
-	return i * BITS (ai[0]) + log2_first_set (x);
-    }
-  return ~0;
-}
-
-/** Return the higest numbered set bit in a bitmap
-    @param ai - pointer to the bitmap
-    @returns lowest numbered set bit, or ~0 if the entire bitmap is zero
-*/
-always_inline uword
-clib_bitmap_last_set (uword * ai)
-{
-  uword i;
-
-  for (i = vec_len (ai); i > 0; i--)
-    {
-      uword x = ai[i - 1];
-      if (x != 0)
-	{
-	  uword first_bit;
-	  count_leading_zeros (first_bit, x);
-	  return (i) * BITS (ai[0]) - first_bit - 1;
-	}
-    }
-  return ~0;
-}
-
-/** Return the lowest numbered clear bit in a bitmap
-    @param ai - pointer to the bitmap
-    @returns lowest numbered clear bit
-*/
-always_inline uword
-clib_bitmap_first_clear (uword * ai)
-{
-  uword i;
-  for (i = 0; i < vec_len (ai); i++)
-    {
-      uword x = ~ai[i];
-      if (x != 0)
-	return i * BITS (ai[0]) + log2_first_set (x);
-    }
-  return i * BITS (ai[0]);
-}
-
-/** Return the number of set bits in a bitmap
-    @param ai - pointer to the bitmap
-    @returns the number of set bits in the bitmap
-*/
-always_inline uword
-clib_bitmap_count_set_bits (uword * ai)
-{
-  uword i;
-  uword n_set = 0;
-  for (i = 0; i < vec_len (ai); i++)
-    n_set += count_set_bits (ai[i]);
-  return n_set;
-}
-
-/** Logical operator across two bitmaps
-
-    @param ai - pointer to the destination bitmap
-    @param bi - pointer to the source bitmap
-    @returns ai = ai and bi. ai is modified, bi is not modified
-*/
-always_inline uword *clib_bitmap_and (uword * ai, uword * bi);
-
-/** Logical operator across two bitmaps
-
-    @param ai - pointer to the destination bitmap
-    @param bi - pointer to the source bitmap
-    @returns ai = ai & ~bi. ai is modified, bi is not modified
-*/
-always_inline uword *clib_bitmap_andnot (uword * ai, uword * bi);
-
-/** Logical operator across two bitmaps
-
-    @param ai - pointer to the destination bitmap
-    @param bi - pointer to the source bitmap
-    @returns ai = ai & ~bi. ai is modified, bi is not modified
-*/
-always_inline uword *clib_bitmap_or (uword * ai, uword * bi);
-/** Logical operator across two bitmaps
-
-    @param ai - pointer to the destination bitmap
-    @param bi - pointer to the source bitmap
-    @returns ai = ai or bi. ai is modified, bi is not modified
-*/
-always_inline uword *clib_bitmap_or (uword * ai, uword * bi);
-
-/** Logical operator across two bitmaps
-
-    @param ai - pointer to the destination bitmap
-    @param bi - pointer to the source bitmap
-    @returns ai = ai xor bi. ai is modified, bi is not modified
-*/
-always_inline uword *clib_bitmap_xor (uword * ai, uword * bi);
-
-/* ALU function definition macro for functions taking two bitmaps. */
-#define _(name, body, check_zero)				\
-always_inline uword *						\
-clib_bitmap_##name (uword * ai, uword * bi)			\
-{								\
-  uword i, a, b, bi_len, n_trailing_zeros;			\
-								\
-  n_trailing_zeros = 0;						\
-  bi_len = vec_len (bi);					\
-  if (bi_len > 0)						\
-    clib_bitmap_vec_validate (ai, bi_len - 1);			\
-  for (i = 0; i < vec_len (ai); i++)				\
-    {								\
-      a = ai[i];						\
-      b = i < bi_len ? bi[i] : 0;				\
-      do { body; } while (0);					\
-      ai[i] = a;						\
-      if (check_zero)						\
-	n_trailing_zeros = a ? 0 : (n_trailing_zeros + 1);	\
-    }								\
-  if (check_zero)						\
-    _vec_len (ai) -= n_trailing_zeros;				\
-  return ai;							\
-}
-
-/* ALU functions: */
-_(and, a = a & b, 1)
-_(andnot, a = a & ~b, 1) _(or, a = a | b, 0) _(xor, a = a ^ b, 1)
-#undef _
-/** Logical operator across two bitmaps which duplicates the first bitmap
-
-    @param ai - pointer to the destination bitmap
-    @param bi - pointer to the source bitmap
-    @returns aiDup = ai and bi. Neither ai nor bi are modified
-*/
-     always_inline uword *
-     clib_bitmap_dup_and (uword * ai, uword * bi);
-
-/** Logical operator across two bitmaps which duplicates the first bitmap
-
-    @param ai - pointer to the destination bitmap
-    @param bi - pointer to the source bitmap
-    @returns aiDup = ai & ~bi. Neither ai nor bi are modified
-*/
-     always_inline uword *
-     clib_bitmap_dup_andnot (uword * ai, uword * bi);
-
-/** Logical operator across two bitmaps which duplicates the first bitmap
-
-    @param ai - pointer to the destination bitmap
-    @param bi - pointer to the source bitmap
-    @returns aiDup = ai or bi. Neither ai nor bi are modified
-*/
-     always_inline uword *
-     clib_bitmap_dup_or (uword * ai, uword * bi);
-
-/** Logical operator across two bitmaps which duplicates the first bitmap
-
-    @param ai - pointer to the destination bitmap
-    @param bi - pointer to the source bitmap
-    @returns aiDup = ai xor bi. Neither ai nor bi are modified
-*/
-     always_inline uword *
-     clib_bitmap_dup_xor (uword * ai, uword * bi);
-
-#define _(name)						\
-  always_inline uword *					\
-  clib_bitmap_dup_##name (uword * ai, uword * bi)	\
-{ return clib_bitmap_##name (clib_bitmap_dup (ai), bi); }
-
-_(and);
-_(andnot);
-_(or);
-_(xor);
-
-#undef _
-
-/* ALU function definition macro for functions taking one bitmap and an immediate. */
-#define _(name, body, check_zero)			\
-always_inline uword *					\
-clib_bitmap_##name (uword * ai, uword i)		\
-{							\
-  uword i0 = i / BITS (ai[0]);				\
-  uword i1 = i % BITS (ai[0]);				\
-  uword a, b;						\
-  clib_bitmap_vec_validate (ai, i0);			\
-  a = ai[i0];						\
-  b = (uword) 1 << i1;					\
-  do { body; } while (0);				\
-  ai[i0] = a;						\
-  if (check_zero && a == 0)				\
-    ai = _clib_bitmap_remove_trailing_zeros (ai);	\
-  return ai;						\
-}
-
-/* ALU functions immediate: */
-_(andi, a = a & b, 1)
-_(andnoti, a = a & ~b, 1) _(ori, a = a | b, 0) _(xori, a = a ^ b, 1)
-#undef _
-/** Return a random bitmap of the requested length
-    @param ai - pointer to the destination bitmap
-    @param n_bits - number of bits to allocate
-    @param [in,out] seed - pointer to the random number seed
-    @returns a reasonably random bitmap based. See random.h.
-*/
-     always_inline uword *
-     clib_bitmap_random (uword * ai, uword n_bits, u32 * seed)
-{
-  vec_reset_length (ai);
-
-  if (n_bits > 0)
-    {
-      uword i = n_bits - 1;
-      uword i0, i1;
-      uword log2_rand_max;
-
-      log2_rand_max = min_log2 (random_u32_max ());
-
-      i0 = i / BITS (ai[0]);
-      i1 = i % BITS (ai[0]);
-
-      clib_bitmap_vec_validate (ai, i0);
-      for (i = 0; i <= i0; i++)
-	{
-	  uword n;
-	  for (n = 0; n < BITS (ai[i]); n += log2_rand_max)
-	    ai[i] |= random_u32 (seed) << n;
-	}
-      if (i1 + 1 < BITS (ai[0]))
-	ai[i0] &= (((uword) 1 << (i1 + 1)) - 1);
-    }
-  return ai;
-}
-
-/** Return the next set bit in a bitmap starting at bit i
-    @param ai - pointer to the bitmap
-    @param i - first bit position to test
-    @returns first set bit position at or after i,
-    ~0 if no further set bits are found
-*/
-always_inline uword
-clib_bitmap_next_set (uword * ai, uword i)
-{
-  uword i0 = i / BITS (ai[0]);
-  uword i1 = i % BITS (ai[0]);
-  uword t;
-
-  if (i0 < vec_len (ai))
-    {
-      t = (ai[i0] >> i1) << i1;
-      if (t)
-	return log2_first_set (t) + i0 * BITS (ai[0]);
-
-      for (i0++; i0 < vec_len (ai); i0++)
-	{
-	  t = ai[i0];
-	  if (t)
-	    return log2_first_set (t) + i0 * BITS (ai[0]);
-	}
-    }
-
-  return ~0;
-}
-
-/** Return the next clear bit in a bitmap starting at bit i
-    @param ai - pointer to the bitmap
-    @param i - first bit position to test
-    @returns first clear bit position at or after i
-*/
-always_inline uword
-clib_bitmap_next_clear (uword * ai, uword i)
-{
-  uword i0 = i / BITS (ai[0]);
-  uword i1 = i % BITS (ai[0]);
-  uword t;
-
-  if (i0 < vec_len (ai))
-    {
-      t = (~ai[i0] >> i1) << i1;
-      if (t)
-	return log2_first_set (t) + i0 * BITS (ai[0]);
-
-      for (i0++; i0 < vec_len (ai); i0++)
-	{
-	  t = ~ai[i0];
-	  if (t)
-	    return log2_first_set (t) + i0 * BITS (ai[0]);
-	}
-    }
-  return i;
-}
-
-/** unformat a list of bit ranges into a bitmap (eg "0-3,5-7,11" )
-
-    uword * bitmap;
-    rv = unformat ("%U", unformat_bitmap_list, &bitmap);
-
-    Standard unformat_function_t arguments
-
-    @param input - pointer an unformat_input_t
-    @param va - varargs list comprising a single uword **
-    @returns 1 on success, 0 on failure
-*/
-static inline uword
-unformat_bitmap_list (unformat_input_t * input, va_list * va)
-{
-  uword **bitmap_return = va_arg (*va, uword **);
-  uword *bitmap = 0;
-
-  u32 a, b;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      int i;
-      if (unformat (input, "%u-%u,", &a, &b))
-	;
-      else if (unformat (input, "%u,", &a))
-	b = a;
-      else if (unformat (input, "%u-%u", &a, &b))
-	;
-      else if (unformat (input, "%u", &a))
-	b = a;
-      else if (bitmap)
-	{
-	  unformat_put_input (input);
-	  break;
-	}
-      else
-	goto error;
-
-      if (b < a)
-	goto error;
-
-      for (i = a; i <= b; i++)
-	bitmap = clib_bitmap_set (bitmap, i, 1);
-    }
-  *bitmap_return = bitmap;
-  return 1;
-error:
-  clib_bitmap_free (bitmap);
-  return 0;
-}
-
-/** Format a bitmap as a string of hex bytes
-
-    uword * bitmap;
-    s = format ("%U", format_bitmap_hex, bitmap);
-
-    Standard format_function_t arguments
-
-    @param s - string under construction
-    @param args - varargs list comprising a single uword *
-    @returns string under construction
-*/
-static inline u8 *
-format_bitmap_hex (u8 * s, va_list * args)
-{
-  uword *bitmap = va_arg (*args, uword *);
-  int i, is_trailing_zero = 1;
-
-  if (!bitmap)
-    return format (s, "0");
-
-  i = vec_bytes (bitmap) * 2;
-
-  while (i > 0)
-    {
-      u8 x = clib_bitmap_get_multiple (bitmap, --i * 4, 4);
-
-      if (x && is_trailing_zero)
-	is_trailing_zero = 0;
-
-      if (x || !is_trailing_zero)
-	s = format (s, "%x", x);
-    }
-  return s;
-}
-#endif /* included_clib_bitmap_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/bitops.h b/vppinfra/vppinfra/bitops.h
deleted file mode 100644
index ab91b8ae..00000000
--- a/vppinfra/vppinfra/bitops.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_bitops_h
-#define included_clib_bitops_h
-
-#include <vppinfra/clib.h>
-
-/* Population count from Hacker's Delight. */
-always_inline uword
-count_set_bits (uword x)
-{
-#if uword_bits == 64
-  const uword c1 = 0x5555555555555555;
-  const uword c2 = 0x3333333333333333;
-  const uword c3 = 0x0f0f0f0f0f0f0f0f;
-#else
-  const uword c1 = 0x55555555;
-  const uword c2 = 0x33333333;
-  const uword c3 = 0x0f0f0f0f;
-#endif
-
-  /* Sum 1 bit at a time. */
-  x = x - ((x >> (uword) 1) & c1);
-
-  /* 2 bits at a time. */
-  x = (x & c2) + ((x >> (uword) 2) & c2);
-
-  /* 4 bits at a time. */
-  x = (x + (x >> (uword) 4)) & c3;
-
-  /* 8, 16, 32 bits at a time. */
-  x = x + (x >> (uword) 8);
-  x = x + (x >> (uword) 16);
-#if uword_bits == 64
-  x = x + (x >> (uword) 32);
-#endif
-
-  return x & (2 * BITS (uword) - 1);
-}
-
-/* Based on "Hacker's Delight" code from GLS. */
-typedef struct
-{
-  uword masks[1 + log2_uword_bits];
-} compress_main_t;
-
-always_inline void
-compress_init (compress_main_t * cm, uword mask)
-{
-  uword q, m, zm, n, i;
-
-  m = ~mask;
-  zm = mask;
-
-  cm->masks[0] = mask;
-  for (i = 0; i < log2_uword_bits; i++)
-    {
-      q = m;
-      m ^= m << 1;
-      m ^= m << 2;
-      m ^= m << 4;
-      m ^= m << 8;
-      m ^= m << 16;
-#if uword_bits > 32
-      m ^= m << (uword) 32;
-#endif
-      cm->masks[1 + i] = n = (m << 1) & zm;
-      m = q & ~m;
-      q = zm & n;
-      zm = zm ^ q ^ (q >> (1 << i));
-    }
-}
-
-always_inline uword
-compress_bits (compress_main_t * cm, uword x)
-{
-  uword q, r;
-
-  r = x & cm->masks[0];
-  q = r & cm->masks[1];
-  r ^= q ^ (q >> 1);
-  q = r & cm->masks[2];
-  r ^= q ^ (q >> 2);
-  q = r & cm->masks[3];
-  r ^= q ^ (q >> 4);
-  q = r & cm->masks[4];
-  r ^= q ^ (q >> 8);
-  q = r & cm->masks[5];
-  r ^= q ^ (q >> 16);
-#if uword_bits > 32
-  q = r & cm->masks[6];
-  r ^= q ^ (q >> (uword) 32);
-#endif
-
-  return r;
-}
-
-always_inline uword
-rotate_left (uword x, uword i)
-{
-  return (x << i) | (x >> (BITS (i) - i));
-}
-
-always_inline uword
-rotate_right (uword x, uword i)
-{
-  return (x >> i) | (x << (BITS (i) - i));
-}
-
-/* Returns snoob from Hacker's Delight.  Next highest number
-   with same number of set bits. */
-always_inline uword
-next_with_same_number_of_set_bits (uword x)
-{
-  uword smallest, ripple, ones;
-  smallest = x & -x;
-  ripple = x + smallest;
-  ones = x ^ ripple;
-  ones = ones >> (2 + log2_first_set (x));
-  return ripple | ones;
-}
-
-#define foreach_set_bit(var,mask,body)					\
-do {									\
-  uword _foreach_set_bit_m_##var = (mask);				\
-  uword _foreach_set_bit_f_##var;					\
-  while (_foreach_set_bit_m_##var != 0)					\
-    {									\
-      _foreach_set_bit_f_##var = first_set (_foreach_set_bit_m_##var);	\
-      _foreach_set_bit_m_##var ^= _foreach_set_bit_f_##var;		\
-      (var) = min_log2 (_foreach_set_bit_f_##var);			\
-      do { body; } while (0);						\
-    }									\
-} while (0)
-
-#endif /* included_clib_bitops_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/byte_order.h b/vppinfra/vppinfra/byte_order.h
deleted file mode 100644
index b263538c..00000000
--- a/vppinfra/vppinfra/byte_order.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2004 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_byte_order_h
-#define included_clib_byte_order_h
-
-#include <vppinfra/clib.h>
-
-#if (__BYTE_ORDER__)==( __ORDER_LITTLE_ENDIAN__)
-#define CLIB_ARCH_IS_BIG_ENDIAN (0)
-#define CLIB_ARCH_IS_LITTLE_ENDIAN (1)
-#else
-/* Default is big endian. */
-#define CLIB_ARCH_IS_BIG_ENDIAN (1)
-#define CLIB_ARCH_IS_LITTLE_ENDIAN (0)
-#endif
-
-/* Big/little endian. */
-#define clib_arch_is_big_endian    CLIB_ARCH_IS_BIG_ENDIAN
-#define clib_arch_is_little_endian CLIB_ARCH_IS_LITTLE_ENDIAN
-
-always_inline u16
-clib_byte_swap_u16 (u16 x)
-{
-  return (x >> 8) | (x << 8);
-}
-
-always_inline i16
-clib_byte_swap_i16 (i16 x)
-{
-  return clib_byte_swap_u16 (x);
-}
-
-always_inline u32
-clib_byte_swap_u32 (u32 x)
-{
-#if defined (i386) || defined (__x86_64__)
-  if (!__builtin_constant_p (x))
-    {
-      asm volatile ("bswap %0":"=r" (x):"0" (x));
-      return x;
-    }
-#endif
-  return ((x << 24) | ((x & 0xff00) << 8) | ((x >> 8) & 0xff00) | (x >> 24));
-}
-
-always_inline i32
-clib_byte_swap_i32 (i32 x)
-{
-  return clib_byte_swap_u32 (x);
-}
-
-always_inline u64
-clib_byte_swap_u64 (u64 x)
-{
-#if defined (__x86_64__)
-  if (!__builtin_constant_p (x))
-    {
-      asm volatile ("bswapq %0":"=r" (x):"0" (x));
-      return x;
-    }
-#endif
-#define _(x,n,i) \
-  ((((x) >> (8*(i))) & 0xff) << (8*((n)-(i)-1)))
-  return (_(x, 8, 0) | _(x, 8, 1)
-	  | _(x, 8, 2) | _(x, 8, 3)
-	  | _(x, 8, 4) | _(x, 8, 5) | _(x, 8, 6) | _(x, 8, 7));
-#undef _
-}
-
-always_inline i64
-clib_byte_swap_i64 (i64 x)
-{
-  return clib_byte_swap_u64 (x);
-}
-
-#define _(sex,type)						\
-/* HOST -> SEX */						\
-always_inline type						\
-clib_host_to_##sex##_##type (type x)				\
-{								\
-  if (! clib_arch_is_##sex##_endian)				\
-    x = clib_byte_swap_##type (x);				\
-  return x;							\
-}								\
-								\
-always_inline type						\
-clib_host_to_##sex##_mem_##type (type * x)			\
-{								\
-  type v = x[0];						\
-  return clib_host_to_##sex##_##type (v);			\
-}								\
-								\
-always_inline type						\
-clib_host_to_##sex##_unaligned_mem_##type (type * x)		\
-{								\
-  type v = clib_mem_unaligned (x, type);			\
-  return clib_host_to_##sex##_##type (v);			\
-}								\
-								\
-/* SEX -> HOST */						\
-always_inline type						\
-clib_##sex##_to_host_##type (type x)				\
-{ return clib_host_to_##sex##_##type (x); }			\
-								\
-always_inline type						\
-clib_##sex##_to_host_mem_##type (type * x)			\
-{ return clib_host_to_##sex##_mem_##type (x); }			\
-								\
-always_inline type						\
-clib_##sex##_to_host_unaligned_mem_##type (type * x)		\
-{ return clib_host_to_##sex##_unaligned_mem_##type (x); }
-
-#ifndef __cplusplus
-_(little, u16)
-_(little, u32)
-_(little, u64)
-_(little, i16)
-_(little, i32)
-_(little, i64)
-_(big, u16) _(big, u32) _(big, u64) _(big, i16) _(big, i32) _(big, i64)
-#endif
-#undef _
-/* Network "net" alias for "big". */
-#define _(type)						\
-always_inline type					\
-clib_net_to_host_##type (type x)			\
-{ return clib_big_to_host_##type (x); }			\
-							\
-always_inline type					\
-clib_net_to_host_mem_##type (type * x)			\
-{ return clib_big_to_host_mem_##type (x); }		\
-							\
-always_inline type					\
-clib_net_to_host_unaligned_mem_##type (type * x)	\
-{ return clib_big_to_host_unaligned_mem_##type (x); }	\
-							\
-always_inline type					\
-clib_host_to_net_##type (type x)			\
-{ return clib_host_to_big_##type (x); }			\
-							\
-always_inline type					\
-clib_host_to_net_mem_##type (type * x)			\
-{ return clib_host_to_big_mem_##type (x); }		\
-							\
-always_inline type					\
-clib_host_to_net_unaligned_mem_##type (type * x)	\
-{ return clib_host_to_big_unaligned_mem_##type (x); }
-#ifndef __cplusplus
-  _(u16);
-_(i16);
-_(u32);
-_(i32);
-_(u64);
-_(i64);
-#endif
-
-#undef _
-
-#endif /* included_clib_byte_order_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/cache.h b/vppinfra/vppinfra/cache.h
deleted file mode 100644
index 8e1f9483..00000000
--- a/vppinfra/vppinfra/cache.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_cache_h
-#define included_clib_cache_h
-
-#include <vppinfra/error_bootstrap.h>
-
-/*
- * Allow CFLAGS to override the arch-specific cache line size
- */
-#ifndef CLIB_LOG2_CACHE_LINE_BYTES
-
-#if defined(__x86_64__) || defined(__ARM_ARCH_7A__)
-#define CLIB_LOG2_CACHE_LINE_BYTES 6
-#endif
-
-#ifdef __aarch64__
-#define CLIB_LOG2_CACHE_LINE_BYTES 7
-#endif
-
-/* Default cache line size of 32 bytes. */
-#ifndef CLIB_LOG2_CACHE_LINE_BYTES
-#define CLIB_LOG2_CACHE_LINE_BYTES 5
-#endif
-
-#endif /* CLIB_LOG2_CACHE_LINE_BYTES defined */
-
-#if (CLIB_LOG2_CACHE_LINE_BYTES >= 9)
-#error Cache line size 512 bytes or greater
-#endif
-
-#define CLIB_CACHE_LINE_BYTES (1 << CLIB_LOG2_CACHE_LINE_BYTES)
-#define CLIB_CACHE_LINE_ALIGN_MARK(mark) u8 mark[0] __attribute__((aligned(CLIB_CACHE_LINE_BYTES)))
-
-/* Read/write arguments to __builtin_prefetch. */
-#define CLIB_PREFETCH_READ 0
-#define CLIB_PREFETCH_LOAD 0	/* alias for read */
-#define CLIB_PREFETCH_WRITE 1
-#define CLIB_PREFETCH_STORE 1	/* alias for write */
-
-#define _CLIB_PREFETCH(n,size,type)				\
-  if ((size) > (n)*CLIB_CACHE_LINE_BYTES)			\
-    __builtin_prefetch (_addr + (n)*CLIB_CACHE_LINE_BYTES,	\
-			CLIB_PREFETCH_##type,			\
-			/* locality */ 3);
-
-#define CLIB_PREFETCH(addr,size,type)		\
-do {						\
-  void * _addr = (addr);			\
-						\
-  ASSERT ((size) <= 4*CLIB_CACHE_LINE_BYTES);	\
-  _CLIB_PREFETCH (0, size, type);		\
-  _CLIB_PREFETCH (1, size, type);		\
-  _CLIB_PREFETCH (2, size, type);		\
-  _CLIB_PREFETCH (3, size, type);		\
-} while (0)
-
-#undef _
-
-#endif /* included_clib_cache_h */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/clib.h b/vppinfra/vppinfra/clib.h
deleted file mode 100644
index 0386c756..00000000
--- a/vppinfra/vppinfra/clib.h
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_h
-#define included_clib_h
-
-/* Standalone means to not assume we are running on a Unix box. */
-#if ! defined (CLIB_STANDALONE) && ! defined (CLIB_LINUX_KERNEL)
-#define CLIB_UNIX
-#endif
-
-#include <vppinfra/types.h>
-
-/* Global DEBUG flag.  Setting this to 1 or 0 turns off
-   ASSERT (see vppinfra/error.h) & other debugging code. */
-#ifndef CLIB_DEBUG
-#define CLIB_DEBUG 0
-#endif
-
-#ifndef NULL
-#define NULL ((void *) 0)
-#endif
-
-#define BITS(x)		(8*sizeof(x))
-#define ARRAY_LEN(x)	(sizeof (x)/sizeof (x[0]))
-
-#define _STRUCT_FIELD(t,f) (((t *) 0)->f)
-#define STRUCT_OFFSET_OF(t,f) ((uword) & _STRUCT_FIELD (t, f))
-#define STRUCT_BIT_OFFSET_OF(t,f) (BITS(u8) * (uword) & _STRUCT_FIELD (t, f))
-#define STRUCT_SIZE_OF(t,f)   (sizeof (_STRUCT_FIELD (t, f)))
-#define STRUCT_BITS_OF(t,f)   (BITS (_STRUCT_FIELD (t, f)))
-#define STRUCT_ARRAY_LEN(t,f) ARRAY_LEN (_STRUCT_FIELD (t, f))
-#define STRUCT_MARK(mark)     u8 mark[0]
-#define STRUCT_MARK_PTR(v, f) &(v)->f
-
-/* Stride in bytes between struct array elements. */
-#define STRUCT_STRIDE_OF(t,f)			\
-  (  ((uword) & (((t *) 0)[1].f))		\
-   - ((uword) & (((t *) 0)[0].f)))
-
-#define STRUCT_OFFSET_OF_VAR(v,f) ((uword) (&(v)->f) - (uword) (v))
-
-/* Used to pack structure elements. */
-#define CLIB_PACKED(x)	x __attribute__ ((packed))
-#define CLIB_UNUSED(x)	x __attribute__ ((unused))
-
-#define never_inline __attribute__ ((__noinline__))
-
-#if CLIB_DEBUG > 0
-#define always_inline static inline
-#define static_always_inline static inline
-#else
-#define always_inline static inline __attribute__ ((__always_inline__))
-#define static_always_inline static inline __attribute__ ((__always_inline__))
-#endif
-
-
-/* Reserved (unused) structure element with address offset between
-   from and to. */
-#define CLIB_PAD_FROM_TO(from,to) u8 pad_##from[(to) - (from)]
-
-/* Hints to compiler about hot/cold code. */
-#define PREDICT_FALSE(x) __builtin_expect((x),0)
-#define PREDICT_TRUE(x) __builtin_expect((x),1)
-
-/* Full memory barrier (read and write). */
-#define CLIB_MEMORY_BARRIER() __sync_synchronize ()
-
-/* Arranges for function to be called before main. */
-#define INIT_FUNCTION(decl)			\
-  decl __attribute ((constructor));		\
-  decl
-
-/* Arranges for function to be called before exit. */
-#define EXIT_FUNCTION(decl)			\
-  decl __attribute ((destructor));		\
-  decl
-
-/* Use __builtin_clz if available. */
-#ifdef __GNUC__
-#include <features.h>
-#if __GNUC_PREREQ(3, 4)
-#if uword_bits == 64
-#define count_leading_zeros(count,x) count = __builtin_clzll (x)
-#define count_trailing_zeros(count,x) count = __builtin_ctzll (x)
-#else
-#define count_leading_zeros(count,x) count = __builtin_clzl (x)
-#define count_trailing_zeros(count,x) count = __builtin_ctzl (x)
-#endif
-#endif
-#endif
-
-#ifndef count_leading_zeros
-
-/* Misc. integer arithmetic functions. */
-#if defined (i386)
-#define count_leading_zeros(count, x)		\
-  do {						\
-    word _clz;					\
-    __asm__ ("bsrl %1,%0"			\
-	     : "=r" (_clz) : "rm" ((word) (x)));\
-    (count) = _clz ^ 31;			\
-  } while (0)
-
-#define count_trailing_zeros(count, x)			\
-  __asm__ ("bsfl %1,%0" : "=r" (count) : "rm" ((word)(x)))
-#endif /* i386 */
-
-#if defined (__alpha__) && defined (HAVE_CIX)
-#define count_leading_zeros(count, x)		\
-  __asm__ ("ctlz %1,%0"				\
-	   : "=r" ((word) (count))		\
-	   : "r" ((word) (x)))
-#define count_trailing_zeros(count, x)		\
-  __asm__ ("cttz %1,%0"				\
-	   : "=r" ((word) (count))		\
-	   : "r" ((word) (x)))
-#endif /* alpha && HAVE_CIX */
-
-#if __mips >= 4
-
-/* Select between 32/64 opcodes. */
-#if uword_bits == 32
-#define count_leading_zeros(_count, _x)		\
-  __asm__ ("clz %[count],%[x]"			\
-	   : [count] "=r" ((word) (_count))	\
-	   : [x] "r" ((word) (_x)))
-#else
-#define count_leading_zeros(_count, _x)		\
-  __asm__ ("dclz %[count],%[x]"			\
-	   : [count] "=r" ((word) (_count))	\
-	   : [x] "r" ((word) (_x)))
-#endif
-
-#endif /* __mips >= 4 */
-
-#endif /* count_leading_zeros */
-
-#if defined (count_leading_zeros)
-always_inline uword
-min_log2 (uword x)
-{
-  uword n;
-  count_leading_zeros (n, x);
-  return BITS (uword) - n - 1;
-}
-#else
-always_inline uword
-min_log2 (uword x)
-{
-  uword a = x, b = BITS (uword) / 2, c = 0, r = 0;
-
-  /* Reduce x to 4 bit result. */
-#define _					\
-{						\
-  c = a >> b;					\
-  if (c) a = c;					\
-  if (c) r += b;				\
-  b /= 2;					\
-}
-
-  if (BITS (uword) > 32)
-    _;
-  _;
-  _;
-  _;
-#undef _
-
-  /* Do table lookup on 4 bit partial. */
-  if (BITS (uword) > 32)
-    {
-      const u64 table = 0x3333333322221104LL;
-      uword t = (table >> (4 * a)) & 0xf;
-      r = t < 4 ? r + t : ~0;
-    }
-  else
-    {
-      const u32 table = 0x22221104;
-      uword t = (a & 8) ? 3 : ((table >> (4 * a)) & 0xf);
-      r = t < 4 ? r + t : ~0;
-    }
-
-  return r;
-}
-#endif
-
-always_inline uword
-max_log2 (uword x)
-{
-  uword l = min_log2 (x);
-  if (x > ((uword) 1 << l))
-    l++;
-  return l;
-}
-
-always_inline u64
-min_log2_u64 (u64 x)
-{
-  if (BITS (uword) == 64)
-    return min_log2 (x);
-  else
-    {
-      uword l, y;
-      y = x;
-      l = 0;
-      if (y == 0)
-	{
-	  l += 32;
-	  x >>= 32;
-	}
-      l += min_log2 (x);
-      return l;
-    }
-}
-
-always_inline uword
-pow2_mask (uword x)
-{
-  return ((uword) 1 << x) - (uword) 1;
-}
-
-always_inline uword
-max_pow2 (uword x)
-{
-  word y = (word) 1 << min_log2 (x);
-  if (x > y)
-    y *= 2;
-  return y;
-}
-
-always_inline uword
-is_pow2 (uword x)
-{
-  return 0 == (x & (x - 1));
-}
-
-always_inline uword
-round_pow2 (uword x, uword pow2)
-{
-  return (x + pow2 - 1) & ~(pow2 - 1);
-}
-
-always_inline u64
-round_pow2_u64 (u64 x, u64 pow2)
-{
-  return (x + pow2 - 1) & ~(pow2 - 1);
-}
-
-always_inline uword
-first_set (uword x)
-{
-  return x & -x;
-}
-
-always_inline uword
-log2_first_set (uword x)
-{
-  uword result;
-#ifdef count_trailing_zeros
-  count_trailing_zeros (result, x);
-#else
-  result = min_log2 (first_set (x));
-#endif
-  return result;
-}
-
-always_inline f64
-flt_round_down (f64 x)
-{
-  return (int) x;
-}
-
-always_inline word
-flt_round_nearest (f64 x)
-{
-  return (word) (x + .5);
-}
-
-always_inline f64
-flt_round_to_multiple (f64 x, f64 f)
-{
-  return f * flt_round_nearest (x / f);
-}
-
-#define clib_max(x,y)				\
-({						\
-  __typeof__ (x) _x = (x);			\
-  __typeof__ (y) _y = (y);			\
-  _x > _y ? _x : _y;				\
-})
-
-#define clib_min(x,y)				\
-({						\
-  __typeof__ (x) _x = (x);			\
-  __typeof__ (y) _y = (y);			\
-  _x < _y ? _x : _y;				\
-})
-
-#define clib_abs(x)				\
-({						\
-  __typeof__ (x) _x = (x);			\
-  _x < 0 ? -_x : _x;				\
-})
-
-/* Standard standalone-only function declarations. */
-#ifndef CLIB_UNIX
-void clib_standalone_init (void *memory, uword memory_bytes);
-
-void qsort (void *base, uword n, uword size,
-	    int (*)(const void *, const void *));
-#endif
-
-/* Stack backtrace. */
-uword
-clib_backtrace (uword * callers, uword max_callers, uword n_frames_to_skip);
-
-#endif /* included_clib_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/cpu.c b/vppinfra/vppinfra/cpu.c
deleted file mode 100644
index a26d5c9a..00000000
--- a/vppinfra/vppinfra/cpu.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vppinfra/clib.h>
-#include <vppinfra/format.h>
-#include <vppinfra/cpu.h>
-
-#define foreach_x86_cpu_uarch \
- _(0x06, 0x4f, "Broadwell", "Broadwell-EP/EX") \
- _(0x06, 0x3d, "Broadwell", "Broadwell") \
- _(0x06, 0x3f, "Haswell", "Haswell-E") \
- _(0x06, 0x3c, "Haswell", "Haswell") \
- _(0x06, 0x3e, "IvyBridge", "IvyBridge-E/EN/EP") \
- _(0x06, 0x3a, "IvyBridge", "IvyBridge") \
- _(0x06, 0x2a, "SandyBridge", "SandyBridge") \
- _(0x06, 0x2d, "SandyBridge", "SandyBridge-E/EN/EP") \
- _(0x06, 0x25, "Westmere", "Arrandale,Clarksdale") \
- _(0x06, 0x2c, "Westmere", "Westmere-EP/EX,Gulftown") \
- _(0x06, 0x2f, "Westmere", "Westmere-EX") \
- _(0x06, 0x1e, "Nehalem", "Clarksfield,Lynnfield,Jasper Forest") \
- _(0x06, 0x1a, "Nehalem", "Nehalem-EP,Bloomfield)") \
- _(0x06, 0x2e, "Nehalem", "Nehalem-EX") \
- _(0x06, 0x17, "Penryn", "Yorkfield,Wolfdale,Penryn,Harpertown (DP)") \
- _(0x06, 0x1d, "Penryn", "Dunnington (MP)") \
- _(0x06, 0x37, "Atom", "Bay Trail") \
- _(0x06, 0x36, "Atom", "Cedarview") \
- _(0x06, 0x26, "Atom", "Lincroft") \
- _(0x06, 0x1c, "Atom", "Pineview/Silverthorne")
-
-u8 *
-format_cpu_uarch (u8 * s, va_list * args)
-{
-#if __x86_64__
-  u32 __attribute__ ((unused)) eax, ebx, ecx, edx;
-  u8 model, family;
-
-  if (__get_cpuid (1, &eax, &ebx, &ecx, &edx) == 0)
-    return format (s, "unknown (missing cpuid)");
-
-  model = ((eax >> 4) & 0x0f) | ((eax >> 12) & 0xf0);
-  family = (eax >> 8) & 0x0f;
-
-#define _(f,m,a,c) if ((model == m) && (family == f)) return format(s, "%s (%s)", a, c);
-  foreach_x86_cpu_uarch
-#undef _
-    return format (s, "unknown (family 0x%02x model 0x%02x)", family, model);
-
-#else /* ! __x86_64__ */
-  return format (s, "unknown");
-#endif
-}
-
-u8 *
-format_cpu_model_name (u8 * s, va_list * args)
-{
-#if __x86_64__
-  u32 __attribute__ ((unused)) eax, ebx, ecx, edx;
-  u8 *name = 0;
-  u32 *name_u32;
-
-  if (__get_cpuid (1, &eax, &ebx, &ecx, &edx) == 0)
-    return format (s, "unknown (missing cpuid)");
-
-  __get_cpuid (0x80000000, &eax, &ebx, &ecx, &edx);
-  if (eax < 0x80000004)
-    return format (s, "unknown (missing ext feature)");
-
-  vec_validate (name, 48);
-  name_u32 = (u32 *) name;
-
-  __get_cpuid (0x80000002, &eax, &ebx, &ecx, &edx);
-  name_u32[0] = eax;
-  name_u32[1] = ebx;
-  name_u32[2] = ecx;
-  name_u32[3] = edx;
-
-  __get_cpuid (0x80000003, &eax, &ebx, &ecx, &edx);
-  name_u32[4] = eax;
-  name_u32[5] = ebx;
-  name_u32[6] = ecx;
-  name_u32[7] = edx;
-
-  __get_cpuid (0x80000004, &eax, &ebx, &ecx, &edx);
-  name_u32[8] = eax;
-  name_u32[9] = ebx;
-  name_u32[10] = ecx;
-  name_u32[11] = edx;
-
-  s = format (s, "%s", name);
-  vec_free (name);
-  return s;
-
-#elif defined(__aarch64__)
-  return format (s, "armv8");
-#else /* ! __x86_64__ */
-  return format (s, "unknown");
-#endif
-}
-
-u8 *
-format_cpu_flags (u8 * s, va_list * args)
-{
-#if defined(__x86_64__)
-#define _(flag, func, reg, bit) \
-  if (clib_cpu_supports_ ## flag()) \
-    s = format (s, #flag " ");
-  foreach_x86_64_flags return s;
-#undef _
-#else /* ! __x86_64__ */
-  return format (s, "unknown");
-#endif
-}
-
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/cpu.h b/vppinfra/vppinfra/cpu.h
deleted file mode 100644
index 9c149f3f..00000000
--- a/vppinfra/vppinfra/cpu.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_clib_cpu_h
-#define included_clib_cpu_h
-
-#include <vppinfra/format.h>
-
-/*
- * multiarchitecture support. Adding new entry will produce
- * new graph node function variant optimized for specific cpu
- * microarchitecture.
- * Order is important for runtime selection, as 1st match wins...
- */
-
-#if __x86_64__ && CLIB_DEBUG == 0
-#define foreach_march_variant(macro, x) \
-  macro(avx2,  x, "arch=core-avx2")
-#else
-#define foreach_march_variant(macro, x)
-#endif
-
-
-#if __GNUC__ > 4  && !__clang__
-#define CLIB_CPU_OPTIMIZED __attribute__ ((optimize ("tree-vectorize")))
-#else
-#define CLIB_CPU_OPTIMIZED
-#endif
-
-
-#define CLIB_MULTIARCH_ARCH_CHECK(arch, fn, tgt)			\
-  if (clib_cpu_supports_ ## arch())					\
-    return & fn ## _ ##arch;
-
-#define CLIB_MULTIARCH_SELECT_FN(fn,...)                               \
-  __VA_ARGS__ void * fn ## _multiarch_select(void)                     \
-{                                                                      \
-  foreach_march_variant(CLIB_MULTIARCH_ARCH_CHECK, fn)                 \
-  return & fn;                                                         \
-}
-
-
-#define foreach_x86_64_flags \
-_ (sse3,     1, ecx, 0)   \
-_ (ssse3,    1, ecx, 9)   \
-_ (sse41,    1, ecx, 19)  \
-_ (sse42,    1, ecx, 20)  \
-_ (avx,      1, ecx, 28)  \
-_ (avx2,     7, ebx, 5)   \
-_ (avx512f,  7, ebx, 16)  \
-_ (aes,      1, ecx, 25)  \
-_ (sha,      7, ebx, 29)  \
-_ (invariant_tsc, 0x80000007, edx, 8)
-
-#if defined(__x86_64__)
-#include "cpuid.h"
-
-static inline int
-clib_get_cpuid (const u32 lev, u32 * eax, u32 * ebx, u32 * ecx, u32 * edx)
-{
-  if ((u32) __get_cpuid_max (0x80000000 & lev, 0) < lev)
-    return 0;
-  if (lev == 7)
-    __cpuid_count (lev, 0, *eax, *ebx, *ecx, *edx);
-  else
-    __cpuid (lev, *eax, *ebx, *ecx, *edx);
-  return 1;
-}
-
-
-#define _(flag, func, reg, bit) \
-static inline int							\
-clib_cpu_supports_ ## flag()						\
-{									\
-  u32 __attribute__((unused)) eax, ebx = 0, ecx = 0, edx  = 0;		\
-  clib_get_cpuid (func, &eax, &ebx, &ecx, &edx);			\
-									\
-  return ((reg & (1 << bit)) != 0);					\
-}
-foreach_x86_64_flags
-#undef _
-#else
-
-#define _(flag, func, reg, bit) \
-static inline int clib_cpu_supports_ ## flag() { return 0; }
-foreach_x86_64_flags
-#undef _
-#endif
-#endif
-  format_function_t format_cpu_uarch;
-format_function_t format_cpu_model_name;
-format_function_t format_cpu_flags;
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/dir.dox b/vppinfra/vppinfra/dir.dox
deleted file mode 100644
index 440c44e8..00000000
--- a/vppinfra/vppinfra/dir.dox
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Copyright (c) 2016 Comcast Cable Communications Management, LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** @dir
- * @brief VPP infrastructure library source.
- */
diff --git a/vppinfra/vppinfra/dlist.h b/vppinfra/vppinfra/dlist.h
deleted file mode 100644
index 7d09b2bb..00000000
--- a/vppinfra/vppinfra/dlist.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#ifndef included_dlist_h
-#define included_dlist_h
-
-#include <stdarg.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/error.h>
-#include <vppinfra/format.h>
-#include <vppinfra/cache.h>
-
-typedef struct
-{
-  u32 next;
-  u32 prev;
-  u32 value;
-} dlist_elt_t;
-
-static inline void
-clib_dlist_init (dlist_elt_t * pool, u32 index)
-{
-  dlist_elt_t *head = pool_elt_at_index (pool, index);
-  memset (head, 0xFF, sizeof (*head));
-}
-
-static inline void
-clib_dlist_addtail (dlist_elt_t * pool, u32 head_index, u32 new_index)
-{
-  dlist_elt_t *head = pool_elt_at_index (pool, head_index);
-  u32 old_last_index;
-  dlist_elt_t *old_last;
-  dlist_elt_t *new;
-
-  ASSERT (head->value == ~0);
-
-  new = pool_elt_at_index (pool, new_index);
-
-  if (PREDICT_FALSE (head->next == ~0))
-    {
-      head->next = head->prev = new_index;
-      new->next = new->prev = head_index;
-      return;
-    }
-
-  old_last_index = head->prev;
-  old_last = pool_elt_at_index (pool, old_last_index);
-
-  new->next = old_last->next;
-  new->prev = old_last_index;
-  old_last->next = new_index;
-  head->prev = new_index;
-}
-
-static inline void
-clib_dlist_addhead (dlist_elt_t * pool, u32 head_index, u32 new_index)
-{
-  dlist_elt_t *head = pool_elt_at_index (pool, head_index);
-  dlist_elt_t *old_first;
-  u32 old_first_index;
-  dlist_elt_t *new;
-
-  ASSERT (head->value == ~0);
-
-  new = pool_elt_at_index (pool, new_index);
-
-  if (PREDICT_FALSE (head->next == ~0))
-    {
-      head->next = head->prev = new_index;
-      new->next = new->prev = head_index;
-      return;
-    }
-
-  old_first_index = head->next;
-  old_first = pool_elt_at_index (pool, old_first_index);
-
-  new->next = old_first_index;
-  new->prev = old_first->prev;
-  old_first->prev = new_index;
-  head->next = new_index;
-}
-
-static inline void
-clib_dlist_remove (dlist_elt_t * pool, u32 index)
-{
-  dlist_elt_t *elt = pool_elt_at_index (pool, index);
-  dlist_elt_t *next_elt, *prev_elt;
-
-  /* listhead, not so much */
-  ASSERT (elt->value != ~0);
-
-  next_elt = pool_elt_at_index (pool, elt->next);
-  prev_elt = pool_elt_at_index (pool, elt->prev);
-
-  next_elt->prev = elt->prev;
-  prev_elt->next = elt->next;
-
-  elt->prev = elt->next = ~0;
-}
-
-static inline u32
-clib_dlist_remove_head (dlist_elt_t * pool, u32 head_index)
-{
-  dlist_elt_t *head = pool_elt_at_index (pool, head_index);
-  u32 rv;
-
-  ASSERT (head->value == ~0);
-
-  if (head->next == ~0)
-    return ~0;
-
-  rv = head->next;
-  clib_dlist_remove (pool, rv);
-  return rv;
-}
-
-static inline u32
-clib_dlist_remove_tail (dlist_elt_t * pool, u32 head_index)
-{
-  dlist_elt_t *head = pool_elt_at_index (pool, head_index);
-  u32 rv;
-
-  ASSERT (head->value == ~0);
-
-  if (head->prev == ~0)
-    return ~0;
-
-  rv = head->prev;
-  clib_dlist_remove (pool, rv);
-  return rv;
-}
-
-#endif /* included_dlist_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/elf.c b/vppinfra/vppinfra/elf.c
deleted file mode 100644
index 84d6282f..00000000
--- a/vppinfra/vppinfra/elf.c
+++ /dev/null
@@ -1,2040 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vppinfra/bitmap.h>
-#include <vppinfra/byte_order.h>
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/elf.h>
-
-always_inline void
-elf_swap_first_header (elf_main_t * em, elf_first_header_t * h)
-{
-  h->architecture = elf_swap_u16 (em, h->architecture);
-  h->file_type = elf_swap_u16 (em, h->file_type);
-  h->file_version = elf_swap_u32 (em, h->file_version);
-}
-
-always_inline void
-elf_swap_verneed (elf_dynamic_version_need_t * n)
-{
-#define _(t,f) n->f = clib_byte_swap_##t (n->f);
-  foreach_elf_dynamic_version_need_field
-#undef _
-}
-
-always_inline void
-elf_swap_verneed_aux (elf_dynamic_version_need_aux_t * n)
-{
-#define _(t,f) n->f = clib_byte_swap_##t (n->f);
-  foreach_elf_dynamic_version_need_aux_field
-#undef _
-}
-
-clib_error_t *
-elf_get_section_by_name (elf_main_t * em, char *section_name,
-			 elf_section_t ** result)
-{
-  uword *p;
-
-  p = hash_get_mem (em->section_by_name, section_name);
-  if (!p)
-    return clib_error_return (0, "no such section `%s'", section_name);
-
-  *result = vec_elt_at_index (em->sections, p[0]);
-  return 0;
-}
-
-elf_section_t *
-elf_get_section_by_start_address_no_check (elf_main_t * em,
-					   uword start_address)
-{
-  uword *p = hash_get (em->section_by_start_address, start_address);
-  return p ? vec_elt_at_index (em->sections, p[0]) : 0;
-}
-
-clib_error_t *
-elf_get_section_by_start_address (elf_main_t * em, uword start_address,
-				  elf_section_t ** result)
-{
-  elf_section_t *s =
-    elf_get_section_by_start_address_no_check (em, start_address);
-  if (!s)
-    return clib_error_return (0, "no section with address 0x%wx",
-			      start_address);
-  *result = s;
-  return 0;
-}
-
-static u8 *
-format_elf_section_type (u8 * s, va_list * args)
-{
-  elf_section_type_t type = va_arg (*args, elf_section_type_t);
-  char *t = 0;
-
-  switch (type)
-    {
-#define _(f,i) case ELF_SECTION_##f: t = #f; break;
-      foreach_elf_section_type
-#undef _
-    }
-
-  if (!t)
-    s = format (s, "unknown 0x%x", type);
-  else
-    s = format (s, "%s", t);
-  return s;
-}
-
-static u8 *
-format_elf_section (u8 * s, va_list * args)
-{
-  elf_main_t *em = va_arg (*args, elf_main_t *);
-  elf_section_t *es = va_arg (*args, elf_section_t *);
-  elf64_section_header_t *h = &es->header;
-
-  if (!h)
-    return format (s, "%=40s%=10s%=20s%=8s%=16s%=16s%=16s",
-		   "Name", "Index", "Type", "Size", "Align", "Address",
-		   "File offset");
-
-  s = format (s, "%-40s%10d%=20U%8Lx%16d%16Lx %Lx-%Lx",
-	      elf_section_name (em, es),
-	      es->index,
-	      format_elf_section_type, h->type,
-	      h->file_size,
-	      h->align,
-	      h->exec_address, h->file_offset, h->file_offset + h->file_size);
-
-  if (h->flags != 0)
-    {
-#define _(f,i) \
-  if (h->flags & ELF_SECTION_FLAG_##f) s = format (s, " %s", #f);
-      foreach_elf_section_flag;
-#undef _
-    }
-
-  return s;
-}
-
-static u8 *
-format_elf_segment_type (u8 * s, va_list * args)
-{
-  elf_segment_type_t type = va_arg (*args, elf_segment_type_t);
-  char *t = 0;
-
-  switch (type)
-    {
-#define _(f,i) case ELF_SEGMENT_##f: t = #f; break;
-      foreach_elf_segment_type
-#undef _
-    }
-
-  if (!t)
-    s = format (s, "unknown 0x%x", type);
-  else
-    s = format (s, "%s", t);
-  return s;
-}
-
-static u8 *
-format_elf_segment (u8 * s, va_list * args)
-{
-  elf_segment_t *es = va_arg (*args, elf_segment_t *);
-  elf64_segment_header_t *h = &es->header;
-
-  if (!h)
-    return format (s, "%=16s%=16s%=16s%=16s",
-		   "Type", "Virt. Address", "Phys. Address", "Size");
-
-  s = format (s, "%=16U%16Lx%16Lx%16Lx%16Lx",
-	      format_elf_segment_type, h->type,
-	      h->virtual_address,
-	      h->physical_address, h->memory_size, h->file_offset);
-
-  if (h->flags != 0)
-    {
-#define _(f,i) \
-  if (h->flags & ELF_SEGMENT_FLAG_##f) s = format (s, " %s", #f);
-      foreach_elf_segment_flag;
-#undef _
-    }
-
-  return s;
-}
-
-static u8 *
-format_elf_symbol_binding_and_type (u8 * s, va_list * args)
-{
-  int bt = va_arg (*args, int);
-  int b, t;
-  char *type_string = 0;
-  char *binding_string = 0;
-
-  switch ((b = ((bt >> 4) & 0xf)))
-    {
-#define _(f,n) case n: binding_string = #f; break;
-      foreach_elf_symbol_binding;
-#undef _
-    default:
-      break;
-    }
-
-  switch ((t = ((bt >> 0) & 0xf)))
-    {
-#define _(f,n) case n: type_string = #f; break;
-      foreach_elf_symbol_type;
-#undef _
-    default:
-      break;
-    }
-
-  if (binding_string)
-    s = format (s, "%s", binding_string);
-  else
-    s = format (s, "binding 0x%x", b);
-
-  if (type_string)
-    s = format (s, " %s", type_string);
-  else
-    s = format (s, " type 0x%x", t);
-
-  return s;
-}
-
-static u8 *
-format_elf_symbol_visibility (u8 * s, va_list * args)
-{
-  int visibility = va_arg (*args, int);
-  char *t = 0;
-
-  switch (visibility)
-    {
-#define _(f,n) case n: t = #f; break;
-      foreach_elf_symbol_visibility
-#undef _
-    }
-
-  if (t)
-    return format (s, "%s", t);
-  else
-    return format (s, "unknown 0x%x", visibility);
-}
-
-static u8 *
-format_elf_symbol_section_name (u8 * s, va_list * args)
-{
-  elf_main_t *em = va_arg (*args, elf_main_t *);
-  int si = va_arg (*args, int);
-  char *t = 0;
-
-  if (si < vec_len (em->sections))
-    {
-      elf_section_t *es = vec_elt_at_index (em->sections, si);
-      return format (s, "%s", elf_section_name (em, es));
-    }
-
-  if (si >= ELF_SYMBOL_SECTION_RESERVED_LO
-      && si <= ELF_SYMBOL_SECTION_RESERVED_HI)
-    {
-      switch (si)
-	{
-#define _(f,n) case n: t = #f; break;
-	  foreach_elf_symbol_reserved_section_index
-#undef _
-	default:
-	  break;
-	}
-    }
-
-  if (t)
-    return format (s, "%s", t);
-  else
-    return format (s, "unknown 0x%x", si);
-}
-
-u8 *
-format_elf_symbol (u8 * s, va_list * args)
-{
-  elf_main_t *em = va_arg (*args, elf_main_t *);
-  elf_symbol_table_t *t = va_arg (*args, elf_symbol_table_t *);
-  elf64_symbol_t *sym = va_arg (*args, elf64_symbol_t *);
-
-  if (!sym)
-    return format (s, "%=32s%=16s%=16s%=16s%=16s%=16s",
-		   "Symbol", "Size", "Value", "Type", "Visibility",
-		   "Section");
-
-  s = format (s, "%-32s%16Ld%16Lx%=16U%=16U%U",
-	      elf_symbol_name (t, sym),
-	      sym->size, sym->value,
-	      format_elf_symbol_binding_and_type, sym->binding_and_type,
-	      format_elf_symbol_visibility, sym->visibility,
-	      format_elf_symbol_section_name, em, sym->section_index);
-
-  return s;
-}
-
-static u8 *
-format_elf_relocation_type (u8 * s, va_list * args)
-{
-  elf_main_t *em = va_arg (*args, elf_main_t *);
-  int type = va_arg (*args, int);
-  char *t = 0;
-
-  switch (em->first_header.architecture)
-    {
-#define _(f,i) [i] = #f,
-
-    case ELF_ARCH_X86_64:
-      {
-	static char *tab[] = {
-	  foreach_elf_x86_64_relocation_type
-	};
-
-#undef _
-	if (type < ARRAY_LEN (tab))
-	  t = tab[type];
-	break;
-      }
-
-    default:
-      break;
-    }
-
-  if (!t)
-    s = format (s, "0x%02x", type);
-  else
-    s = format (s, "%s", t);
-
-  return s;
-}
-
-static u8 *
-format_elf_relocation (u8 * s, va_list * args)
-{
-  elf_main_t *em = va_arg (*args, elf_main_t *);
-  elf_relocation_with_addend_t *r =
-    va_arg (*args, elf_relocation_with_addend_t *);
-  elf_symbol_table_t *t;
-  elf64_symbol_t *sym;
-
-  if (!r)
-    return format (s, "%=16s%=16s%=16s", "Address", "Type", "Symbol");
-
-  t = vec_elt_at_index (em->symbol_tables, 0);
-  sym = vec_elt_at_index (t->symbols, r->symbol_and_type >> 32);
-
-  s = format (s, "%16Lx%16U",
-	      r->address,
-	      format_elf_relocation_type, em, r->symbol_and_type & 0xff);
-
-  if (sym->section_index != 0)
-    {
-      elf_section_t *es;
-      es = vec_elt_at_index (em->sections, sym->section_index);
-      s = format (s, " (section %s)", elf_section_name (em, es));
-    }
-
-  if (sym->name != 0)
-    s = format (s, " %s", elf_symbol_name (t, sym));
-
-  {
-    i64 a = r->addend;
-    if (a != 0)
-      s = format (s, " %c 0x%Lx", a > 0 ? '+' : '-', a > 0 ? a : -a);
-  }
-
-  return s;
-}
-
-static u8 *
-format_elf_dynamic_entry_type (u8 * s, va_list * args)
-{
-  u32 type = va_arg (*args, u32);
-  char *t = 0;
-  switch (type)
-    {
-#define _(f,n) case n: t = #f; break;
-      foreach_elf_dynamic_entry_type;
-#undef _
-    default:
-      break;
-    }
-  if (t)
-    return format (s, "%s", t);
-  else
-    return format (s, "unknown 0x%x", type);
-}
-
-static u8 *
-format_elf_dynamic_entry (u8 * s, va_list * args)
-{
-  elf_main_t *em = va_arg (*args, elf_main_t *);
-  elf64_dynamic_entry_t *e = va_arg (*args, elf64_dynamic_entry_t *);
-
-  if (!e)
-    return format (s, "%=40s%=16s", "Type", "Data");
-
-  s = format (s, "%=40U", format_elf_dynamic_entry_type, (u32) e->type);
-  switch (e->type)
-    {
-    case ELF_DYNAMIC_ENTRY_NEEDED_LIBRARY:
-    case ELF_DYNAMIC_ENTRY_RPATH:
-    case ELF_DYNAMIC_ENTRY_RUN_PATH:
-      s = format (s, "%s", em->dynamic_string_table + e->data);
-      break;
-
-    case ELF_DYNAMIC_ENTRY_INIT_FUNCTION:
-    case ELF_DYNAMIC_ENTRY_FINI_FUNCTION:
-    case ELF_DYNAMIC_ENTRY_SYMBOL_HASH:
-    case ELF_DYNAMIC_ENTRY_GNU_HASH:
-    case ELF_DYNAMIC_ENTRY_STRING_TABLE:
-    case ELF_DYNAMIC_ENTRY_SYMBOL_TABLE:
-    case ELF_DYNAMIC_ENTRY_PLT_GOT:
-    case ELF_DYNAMIC_ENTRY_PLT_RELOCATION_ADDRESS:
-    case ELF_DYNAMIC_ENTRY_RELA_ADDRESS:
-    case ELF_DYNAMIC_ENTRY_VERSION_NEED:
-    case ELF_DYNAMIC_ENTRY_VERSYM:
-      {
-	elf_section_t *es =
-	  elf_get_section_by_start_address_no_check (em, e->data);
-	if (es)
-	  s = format (s, "section %s", elf_section_name (em, es));
-	else
-	  s = format (s, "0x%Lx", e->data);
-	break;
-      }
-
-    default:
-      s = format (s, "0x%Lx", e->data);
-      break;
-    }
-
-  return s;
-}
-
-static u8 *
-format_elf_architecture (u8 * s, va_list * args)
-{
-  int a = va_arg (*args, int);
-  char *t;
-
-  switch (a)
-    {
-#define _(f,n) case n: t = #f; break;
-      foreach_elf_architecture;
-#undef _
-    default:
-      return format (s, "unknown 0x%x", a);
-    }
-
-  return format (s, "%s", t);
-}
-
-static u8 *
-format_elf_abi (u8 * s, va_list * args)
-{
-  int a = va_arg (*args, int);
-  char *t;
-
-  switch (a)
-    {
-#define _(f,n) case n: t = #f; break;
-      foreach_elf_abi;
-#undef _
-    default:
-      return format (s, "unknown 0x%x", a);
-    }
-
-  return format (s, "%s", t);
-}
-
-static u8 *
-format_elf_file_class (u8 * s, va_list * args)
-{
-  int a = va_arg (*args, int);
-  char *t;
-
-  switch (a)
-    {
-#define _(f) case ELF_##f: t = #f; break;
-      foreach_elf_file_class;
-#undef _
-    default:
-      return format (s, "unknown 0x%x", a);
-    }
-
-  return format (s, "%s", t);
-}
-
-static u8 *
-format_elf_file_type (u8 * s, va_list * args)
-{
-  int a = va_arg (*args, int);
-  char *t;
-
-  if (a >= ELF_ARCH_SPECIFIC_LO && a <= ELF_ARCH_SPECIFIC_HI)
-    return format (s, "arch-specific 0x%x", a - ELF_ARCH_SPECIFIC_LO);
-
-  if (a >= ELF_OS_SPECIFIC_LO && a <= ELF_OS_SPECIFIC_HI)
-    return format (s, "os-specific 0x%x", a - ELF_OS_SPECIFIC_LO);
-
-  switch (a)
-    {
-#define _(f,n) case n: t = #f; break;
-      foreach_elf_file_type;
-#undef _
-    default:
-      return format (s, "unknown 0x%x", a);
-    }
-
-  return format (s, "%s", t);
-}
-
-static u8 *
-format_elf_data_encoding (u8 * s, va_list * args)
-{
-  int a = va_arg (*args, int);
-  char *t;
-
-  switch (a)
-    {
-#define _(f) case ELF_##f: t = #f; break;
-      foreach_elf_data_encoding;
-#undef _
-    default:
-      return format (s, "unknown 0x%x", a);
-    }
-
-  return format (s, "%s", t);
-}
-
-static int
-elf_section_offset_compare (void *a1, void *a2)
-{
-  elf_section_t *s1 = a1;
-  elf_section_t *s2 = a2;
-
-  return ((i64) s1->header.file_offset - (i64) s2->header.file_offset);
-}
-
-static int
-elf_segment_va_compare (void *a1, void *a2)
-{
-  elf_segment_t *s1 = a1;
-  elf_segment_t *s2 = a2;
-
-  return ((i64) s1->header.virtual_address -
-	  (i64) s2->header.virtual_address);
-}
-
-u8 *
-format_elf_main (u8 * s, va_list * args)
-{
-  elf_main_t *em = va_arg (*args, elf_main_t *);
-  u32 verbose = va_arg (*args, u32);
-  elf64_file_header_t *fh = &em->file_header;
-
-  s =
-    format (s,
-	    "File header: machine: %U, file type/class %U/%U, data-encoding: %U, abi: %U version %d\n",
-	    format_elf_architecture, em->first_header.architecture,
-	    format_elf_file_type, em->first_header.file_type,
-	    format_elf_file_class, em->first_header.file_class,
-	    format_elf_data_encoding, em->first_header.data_encoding,
-	    format_elf_abi, em->first_header.abi,
-	    em->first_header.abi_version);
-
-  s = format (s, "  entry 0x%Lx, arch-flags 0x%x",
-	      em->file_header.entry_point, em->file_header.flags);
-
-  if (em->interpreter)
-    s = format (s, "\n  interpreter: %s", em->interpreter);
-
-  {
-    elf_section_t *h, *copy;
-
-    copy = 0;
-    vec_foreach (h, em->sections) if (h->header.type != ~0)
-      vec_add1 (copy, h[0]);
-
-    vec_sort_with_function (copy, elf_section_offset_compare);
-
-    s = format (s, "\nSections %d at file offset 0x%Lx-0x%Lx:\n",
-		fh->section_header_count,
-		fh->section_header_file_offset,
-		fh->section_header_file_offset +
-		(u64) fh->section_header_count * fh->section_header_size);
-    s = format (s, "%U\n", format_elf_section, em, 0);
-    vec_foreach (h, copy) s = format (s, "%U\n", format_elf_section, em, h);
-
-    vec_free (copy);
-  }
-
-  {
-    elf_segment_t *h, *copy;
-
-    copy = 0;
-    vec_foreach (h, em->segments)
-      if (h->header.type != ELF_SEGMENT_UNUSED && h->header.type != ~0)
-      vec_add1 (copy, h[0]);
-
-    /* Sort segments by address. */
-    vec_sort_with_function (copy, elf_segment_va_compare);
-
-    s = format (s, "\nSegments: %d at file offset 0x%Lx-0x%Lx:\n",
-		fh->segment_header_count,
-		fh->segment_header_file_offset,
-		(u64) fh->segment_header_file_offset +
-		(u64) fh->segment_header_count *
-		(u64) fh->segment_header_size);
-
-    s = format (s, "%U\n", format_elf_segment, 0);
-    vec_foreach (h, copy) s = format (s, "%U\n", format_elf_segment, h);
-
-    vec_free (copy);
-  }
-
-  if ((verbose & FORMAT_ELF_MAIN_SYMBOLS) && vec_len (em->symbol_tables) > 0)
-    {
-      elf_symbol_table_t *t;
-      elf64_symbol_t *sym;
-      elf_section_t *es;
-
-      vec_foreach (t, em->symbol_tables)
-      {
-	es = vec_elt_at_index (em->sections, t->section_index);
-	s =
-	  format (s, "\nSymbols for section %s:\n",
-		  elf_section_name (em, es));
-
-	s = format (s, "%U\n", format_elf_symbol, em, 0, 0);
-	vec_foreach (sym, t->symbols)
-	  s = format (s, "%U\n", format_elf_symbol, em, t, sym);
-      }
-    }
-
-  if ((verbose & FORMAT_ELF_MAIN_RELOCATIONS)
-      && vec_len (em->relocation_tables) > 0)
-    {
-      elf_relocation_table_t *t;
-      elf_relocation_with_addend_t *r;
-      elf_section_t *es;
-
-      vec_foreach (t, em->relocation_tables)
-      {
-	es = vec_elt_at_index (em->sections, t->section_index);
-	r = t->relocations;
-	s = format (s, "\nRelocations for section %s:\n",
-		    elf_section_name (em, es));
-
-	s = format (s, "%U\n", format_elf_relocation, em, 0);
-	vec_foreach (r, t->relocations)
-	{
-	  s = format (s, "%U\n", format_elf_relocation, em, r);
-	}
-      }
-    }
-
-  if ((verbose & FORMAT_ELF_MAIN_DYNAMIC)
-      && vec_len (em->dynamic_entries) > 0)
-    {
-      elf64_dynamic_entry_t *es, *e;
-      s = format (s, "\nDynamic linker information:\n");
-      es = vec_dup (em->dynamic_entries);
-      s = format (s, "%U\n", format_elf_dynamic_entry, em, 0);
-      vec_foreach (e, es)
-	s = format (s, "%U\n", format_elf_dynamic_entry, em, e);
-    }
-
-  return s;
-}
-
-static void
-elf_parse_segments (elf_main_t * em, void *data)
-{
-  void *d = data + em->file_header.segment_header_file_offset;
-  uword n = em->file_header.segment_header_count;
-  uword i;
-
-  vec_resize (em->segments, n);
-
-  for (i = 0; i < n; i++)
-    {
-      em->segments[i].index = i;
-
-      if (em->first_header.file_class == ELF_64BIT)
-	{
-	  elf64_segment_header_t *h = d;
-#define _(t,f) em->segments[i].header.f = elf_swap_##t (em, h->f);
-	  foreach_elf64_segment_header
-#undef _
-	    d = (h + 1);
-	}
-      else
-	{
-	  elf32_segment_header_t *h = d;
-#define _(t,f) em->segments[i].header.f = elf_swap_##t (em, h->f);
-	  foreach_elf32_segment_header
-#undef _
-	    d = (h + 1);
-	}
-    }
-}
-
-static void
-elf_parse_sections (elf_main_t * em, void *data)
-{
-  elf64_file_header_t *fh = &em->file_header;
-  elf_section_t *s;
-  void *d = data + fh->section_header_file_offset;
-  uword n = fh->section_header_count;
-  uword i;
-
-  vec_resize (em->sections, n);
-
-  for (i = 0; i < n; i++)
-    {
-      s = em->sections + i;
-
-      s->index = i;
-
-      if (em->first_header.file_class == ELF_64BIT)
-	{
-	  elf64_section_header_t *h = d;
-#define _(t,f) em->sections[i].header.f = elf_swap_##t (em, h->f);
-	  foreach_elf64_section_header
-#undef _
-	    d = (h + 1);
-	}
-      else
-	{
-	  elf32_section_header_t *h = d;
-#define _(t,f) em->sections[i].header.f = elf_swap_##t (em, h->f);
-	  foreach_elf32_section_header
-#undef _
-	    d = (h + 1);
-	}
-
-      if (s->header.type != ELF_SECTION_NO_BITS)
-	vec_add (s->contents, data + s->header.file_offset,
-		 s->header.file_size);
-    }
-
-  s = vec_elt_at_index (em->sections, fh->section_header_string_table_index);
-
-  em->section_by_name
-    = hash_create_string ( /* # elts */ vec_len (em->sections),
-			  /* sizeof of value */ sizeof (uword));
-
-  vec_foreach (s, em->sections)
-  {
-    hash_set_mem (em->section_by_name,
-		  elf_section_name (em, s), s - em->sections);
-    hash_set (em->section_by_start_address,
-	      s->header.exec_address, s - em->sections);
-  }
-}
-
-static void
-add_symbol_table (elf_main_t * em, elf_section_t * s)
-{
-  elf_symbol_table_t *tab;
-  elf32_symbol_t *sym32;
-  elf64_symbol_t *sym64;
-  uword i;
-
-  if (s->header.type == ELF_SECTION_DYNAMIC_SYMBOL_TABLE)
-    em->dynamic_symbol_table_index = vec_len (em->symbol_tables);
-
-  vec_add2 (em->symbol_tables, tab, 1);
-
-  tab->section_index = s->index;
-
-  if (em->first_header.file_class == ELF_64BIT)
-    {
-      tab->symbols =
-	elf_get_section_contents (em, s - em->sections,
-				  sizeof (tab->symbols[0]));
-      for (i = 0; i < vec_len (tab->symbols); i++)
-	{
-#define _(t,f) tab->symbols[i].f = elf_swap_##t (em, tab->symbols[i].f);
-	  foreach_elf64_symbol_header;
-#undef _
-	}
-    }
-  else
-    {
-      sym32 =
-	elf_get_section_contents (em, s - em->sections, sizeof (sym32[0]));
-      vec_clone (tab->symbols, sym32);
-      for (i = 0; i < vec_len (tab->symbols); i++)
-	{
-#define _(t,f) tab->symbols[i].f = elf_swap_##t (em, sym32[i].f);
-	  foreach_elf32_symbol_header;
-#undef _
-	}
-    }
-
-  if (s->header.link == 0)
-    return;
-
-  tab->string_table =
-    elf_get_section_contents (em, s->header.link,
-			      sizeof (tab->string_table[0]));
-  tab->symbol_by_name =
-    hash_create_string ( /* # elts */ vec_len (tab->symbols),
-			/* sizeof of value */ sizeof (uword));
-
-  vec_foreach (sym64, tab->symbols)
-  {
-    if (sym64->name != 0)
-      hash_set_mem (tab->symbol_by_name,
-		    tab->string_table + sym64->name, sym64 - tab->symbols);
-  }
-}
-
-static void
-add_relocation_table (elf_main_t * em, elf_section_t * s)
-{
-  uword has_addend = s->header.type == ELF_SECTION_RELOCATION_ADD;
-  elf_relocation_table_t *t;
-  uword i;
-
-  vec_add2 (em->relocation_tables, t, 1);
-  t->section_index = s - em->sections;
-
-  if (em->first_header.file_class == ELF_64BIT)
-    {
-      elf64_relocation_t *r, *rs;
-
-      rs = elf_get_section_contents (em, t->section_index,
-				     sizeof (rs[0]) +
-				     has_addend * sizeof (rs->addend[0]));
-
-      if (em->need_byte_swap)
-	{
-	  r = rs;
-	  for (i = 0; i < vec_len (r); i++)
-	    {
-	      r->address = elf_swap_u64 (em, r->address);
-	      r->symbol_and_type = elf_swap_u32 (em, r->symbol_and_type);
-	      if (has_addend)
-		r->addend[0] = elf_swap_u64 (em, r->addend[0]);
-	      r = elf_relocation_next (r, s->header.type);
-	    }
-	}
-
-      vec_resize (t->relocations, vec_len (rs));
-      clib_memcpy (t->relocations, rs, vec_bytes (t->relocations));
-      vec_free (rs);
-    }
-  else
-    {
-      elf_relocation_with_addend_t *r;
-      elf32_relocation_t *r32, *r32s;
-
-      r32s = elf_get_section_contents (em, t->section_index,
-				       sizeof (r32s[0]) +
-				       has_addend * sizeof (r32s->addend[0]));
-      vec_resize (t->relocations, vec_len (r32s));
-
-      r32 = r32s;
-      vec_foreach (r, t->relocations)
-      {
-	r->address = elf_swap_u32 (em, r32->address);
-	r->symbol_and_type = elf_swap_u32 (em, r->symbol_and_type);
-	r->addend = has_addend ? elf_swap_u32 (em, r32->addend[0]) : 0;
-	r32 = elf_relocation_next (r32, s->header.type);
-      }
-
-      vec_free (r32s);
-    }
-}
-
-void
-elf_parse_symbols (elf_main_t * em)
-{
-  elf_section_t *s;
-
-  /* No need to parse symbols twice. */
-  if (em->parsed_symbols)
-    return;
-  em->parsed_symbols = 1;
-
-  vec_foreach (s, em->sections)
-  {
-    switch (s->header.type)
-      {
-      case ELF_SECTION_SYMBOL_TABLE:
-      case ELF_SECTION_DYNAMIC_SYMBOL_TABLE:
-	add_symbol_table (em, s);
-	break;
-
-      case ELF_SECTION_RELOCATION_ADD:
-      case ELF_SECTION_RELOCATION:
-	add_relocation_table (em, s);
-	break;
-
-      default:
-	break;
-      }
-  }
-}
-
-void
-elf_set_dynamic_entries (elf_main_t * em)
-{
-  uword i;
-
-  /* Start address for sections may have changed. */
-  {
-    elf64_dynamic_entry_t *e;
-
-    vec_foreach (e, em->dynamic_entries)
-    {
-      switch (e->type)
-	{
-	case ELF_DYNAMIC_ENTRY_INIT_FUNCTION:
-	case ELF_DYNAMIC_ENTRY_FINI_FUNCTION:
-	case ELF_DYNAMIC_ENTRY_SYMBOL_HASH:
-	case ELF_DYNAMIC_ENTRY_GNU_HASH:
-	case ELF_DYNAMIC_ENTRY_STRING_TABLE:
-	case ELF_DYNAMIC_ENTRY_SYMBOL_TABLE:
-	case ELF_DYNAMIC_ENTRY_PLT_GOT:
-	case ELF_DYNAMIC_ENTRY_PLT_RELOCATION_ADDRESS:
-	case ELF_DYNAMIC_ENTRY_RELA_ADDRESS:
-	case ELF_DYNAMIC_ENTRY_VERSION_NEED:
-	case ELF_DYNAMIC_ENTRY_VERSYM:
-	  {
-	    elf_section_t *es =
-	      elf_get_section_by_start_address_no_check (em, e->data);
-	    /* If section is not found just leave e->data alone. */
-	    if (es)
-	      e->data = es->header.exec_address;
-	    break;
-	  }
-
-	default:
-	  break;
-	}
-    }
-  }
-
-  if (em->first_header.file_class == ELF_64BIT)
-    {
-      elf64_dynamic_entry_t *e, *es;
-
-      es = em->dynamic_entries;
-      if (em->need_byte_swap)
-	{
-	  es = vec_dup (es);
-	  vec_foreach (e, es)
-	  {
-	    e->type = elf_swap_u64 (em, e->type);
-	    e->data = elf_swap_u64 (em, e->data);
-	  }
-	}
-
-      elf_set_section_contents (em, em->dynamic_section_index, es,
-				vec_bytes (es));
-      if (es != em->dynamic_entries)
-	vec_free (es);
-    }
-  else
-    {
-      elf32_dynamic_entry_t *es;
-
-      vec_clone (es, em->dynamic_entries);
-      if (em->need_byte_swap)
-	{
-	  for (i = 0; i < vec_len (es); i++)
-	    {
-	      es[i].type = elf_swap_u32 (em, em->dynamic_entries[i].type);
-	      es[i].data = elf_swap_u32 (em, em->dynamic_entries[i].data);
-	    }
-	}
-
-      elf_set_section_contents (em, em->dynamic_section_index, es,
-				vec_bytes (es));
-      vec_free (es);
-    }
-}
-
-clib_error_t *
-elf_parse (elf_main_t * em, void *data, uword data_bytes)
-{
-  elf_first_header_t *h = data;
-  elf64_file_header_t *fh = &em->file_header;
-  clib_error_t *error = 0;
-
-  {
-    char *save = em->file_name;
-    memset (em, 0, sizeof (em[0]));
-    em->file_name = save;
-  }
-
-  em->first_header = h[0];
-  em->need_byte_swap =
-    CLIB_ARCH_IS_BIG_ENDIAN != (h->data_encoding ==
-				ELF_TWOS_COMPLEMENT_BIG_ENDIAN);
-  elf_swap_first_header (em, &em->first_header);
-
-  if (!(h->magic[0] == 0x7f
-	&& h->magic[1] == 'E' && h->magic[2] == 'L' && h->magic[3] == 'F'))
-    return clib_error_return (0, "`%s': bad magic", em->file_name);
-
-  if (h->file_class == ELF_64BIT)
-    {
-      elf64_file_header_t *h64 = (void *) (h + 1);
-#define _(t,f) fh->f = elf_swap_##t (em, h64->f);
-      foreach_elf64_file_header
-#undef _
-    }
-  else
-    {
-      elf32_file_header_t *h32 = (void *) (h + 1);
-
-#define _(t,f) fh->f = elf_swap_##t (em, h32->f);
-      foreach_elf32_file_header
-#undef _
-    }
-
-  elf_parse_segments (em, data);
-  elf_parse_sections (em, data);
-
-  /* Figure which sections are contained in each segment. */
-  {
-    elf_segment_t *g;
-    elf_section_t *s;
-    vec_foreach (g, em->segments)
-    {
-      u64 g_lo, g_hi;
-      u64 s_lo, s_hi;
-
-      if (g->header.memory_size == 0)
-	continue;
-
-      g_lo = g->header.virtual_address;
-      g_hi = g_lo + g->header.memory_size;
-
-      vec_foreach (s, em->sections)
-      {
-	s_lo = s->header.exec_address;
-	s_hi = s_lo + s->header.file_size;
-
-	if (s_lo >= g_lo && s_hi <= g_hi)
-	  {
-	    g->section_index_bitmap =
-	      clib_bitmap_ori (g->section_index_bitmap, s->index);
-	    s->segment_index_bitmap =
-	      clib_bitmap_ori (s->segment_index_bitmap, g->index);
-	  }
-      }
-    }
-  }
-
-  return error;
-}
-
-#ifdef CLIB_UNIX
-
-static void
-add_dynamic_entries (elf_main_t * em, elf_section_t * s)
-{
-  uword i;
-
-  /* Can't have more than one dynamic section. */
-  ASSERT (em->dynamic_section_index == 0);
-  em->dynamic_section_index = s->index;
-
-  if (em->first_header.file_class == ELF_64BIT)
-    {
-      elf64_dynamic_entry_t *e;
-
-      e = elf_get_section_contents (em, s - em->sections, sizeof (e[0]));
-      if (em->need_byte_swap)
-	for (i = 0; i < vec_len (e); i++)
-	  {
-	    e[i].type = elf_swap_u64 (em, e[i].type);
-	    e[i].data = elf_swap_u64 (em, e[i].data);
-	  }
-
-      em->dynamic_entries = e;
-    }
-  else
-    {
-      elf32_dynamic_entry_t *e;
-
-      e = elf_get_section_contents (em, s - em->sections, sizeof (e[0]));
-      vec_clone (em->dynamic_entries, e);
-      if (em->need_byte_swap)
-	for (i = 0; i < vec_len (e); i++)
-	  {
-	    em->dynamic_entries[i].type = elf_swap_u32 (em, e[i].type);
-	    em->dynamic_entries[i].data = elf_swap_u32 (em, e[i].data);
-	  }
-
-      vec_free (e);
-    }
-}
-
-static void
-byte_swap_verneed (elf_main_t * em, elf_dynamic_version_need_union_t * vus)
-{
-  uword *entries_swapped = 0;
-  uword i, j;
-
-  for (i = 0; i < vec_len (vus); i++)
-    {
-      elf_dynamic_version_need_union_t *n = vec_elt_at_index (vus, i);
-      elf_dynamic_version_need_union_t *a;
-
-      if (clib_bitmap_get (entries_swapped, i))
-	continue;
-
-      elf_swap_verneed (&n->need);
-      entries_swapped = clib_bitmap_set (entries_swapped, i, 1);
-
-      if (n->need.first_aux_offset != 0)
-	{
-	  ASSERT (n->need.first_aux_offset % sizeof (n[0]) == 0);
-	  j = i + (n->need.first_aux_offset / sizeof (n[0]));
-	  while (1)
-	    {
-	      a = vec_elt_at_index (vus, j);
-	      if (!clib_bitmap_get (entries_swapped, j))
-		{
-		  entries_swapped = clib_bitmap_set (entries_swapped, j, 1);
-		  elf_swap_verneed_aux (&a->aux);
-		}
-	      if (a->aux.next_offset == 0)
-		break;
-	      ASSERT (a->aux.next_offset % sizeof (a->aux) == 0);
-	      j += (a->aux.next_offset / sizeof (a->aux));
-	    }
-	}
-    }
-
-  clib_bitmap_free (entries_swapped);
-}
-
-static void set_dynamic_verneed (elf_main_t * em) __attribute__ ((unused));
-static void
-set_dynamic_verneed (elf_main_t * em)
-{
-  elf_dynamic_version_need_union_t *vus = em->verneed;
-
-  if (em->need_byte_swap)
-    {
-      vus = vec_dup (vus);
-      byte_swap_verneed (em, vus);
-    }
-
-  elf_set_section_contents (em, em->verneed_section_index, vus,
-			    vec_bytes (vus));
-  if (vus != em->verneed)
-    vec_free (vus);
-}
-
-static void
-set_symbol_table (elf_main_t * em, u32 table_index) __attribute__ ((unused));
-static void
-set_symbol_table (elf_main_t * em, u32 table_index)
-{
-  elf_symbol_table_t *tab = vec_elt_at_index (em->symbol_tables, table_index);
-
-  if (em->first_header.file_class == ELF_64BIT)
-    {
-      elf64_symbol_t *s, *syms;
-
-      syms = vec_dup (tab->symbols);
-      vec_foreach (s, syms)
-      {
-#define _(t,f) s->f = elf_swap_##t (em, s->f);
-	foreach_elf64_symbol_header;
-#undef _
-      }
-
-      elf_set_section_contents (em, tab->section_index,
-				syms, vec_bytes (syms));
-    }
-  else
-    {
-      elf32_symbol_t *syms;
-      uword i;
-      vec_clone (syms, tab->symbols);
-      for (i = 0; i < vec_len (tab->symbols); i++)
-	{
-#define _(t,f) syms[i].f = elf_swap_##t (em, tab->symbols[i].f);
-	  foreach_elf32_symbol_header;
-#undef _
-	}
-
-      elf_set_section_contents (em, tab->section_index,
-				syms, vec_bytes (syms));
-    }
-}
-
-static char *
-elf_find_interpreter (elf_main_t * em, void *data)
-{
-  elf_segment_t *g;
-  elf_section_t *s;
-  uword *p;
-
-  vec_foreach (g, em->segments)
-  {
-    if (g->header.type == ELF_SEGMENT_INTERP)
-      break;
-  }
-
-  if (g >= vec_end (em->segments))
-    return 0;
-
-  p = hash_get (em->section_by_start_address, g->header.virtual_address);
-  if (!p)
-    return 0;
-
-  s = vec_elt_at_index (em->sections, p[0]);
-  return (char *) vec_dup (s->contents);
-}
-
-static void *
-elf_get_section_contents_with_starting_address (elf_main_t * em,
-						uword start_address,
-						uword elt_size,
-						u32 * section_index_result)
-{
-  elf_section_t *s;
-  clib_error_t *error;
-
-  error = elf_get_section_by_start_address (em, start_address, &s);
-  if (error)
-    {
-      clib_error_report (error);
-      return 0;
-    }
-
-  if (section_index_result)
-    *section_index_result = s->index;
-
-  return elf_get_section_contents (em, s->index, elt_size);
-}
-
-static void
-elf_parse_dynamic (elf_main_t * em)
-{
-  elf_section_t *s;
-  elf64_dynamic_entry_t *e;
-
-  vec_foreach (s, em->sections)
-  {
-    switch (s->header.type)
-      {
-      case ELF_SECTION_DYNAMIC:
-	add_dynamic_entries (em, s);
-	break;
-
-      default:
-	break;
-      }
-  }
-
-  em->dynamic_string_table_section_index = ~0;
-  em->dynamic_string_table = 0;
-
-  vec_foreach (e, em->dynamic_entries)
-  {
-    switch (e->type)
-      {
-      case ELF_DYNAMIC_ENTRY_STRING_TABLE:
-	ASSERT (vec_len (em->dynamic_string_table) == 0);
-	em->dynamic_string_table
-	  =
-	  elf_get_section_contents_with_starting_address (em, e->data,
-							  sizeof (u8),
-							  &em->
-							  dynamic_string_table_section_index);
-	break;
-
-      case ELF_DYNAMIC_ENTRY_SYMBOL_TABLE:
-	{
-	  elf_section_t *s;
-	  clib_error_t *error;
-
-	  error = elf_get_section_by_start_address (em, e->data, &s);
-	  if (error)
-	    {
-	      clib_error_report (error);
-	      return;
-	    }
-
-	  em->dynamic_symbol_table_section_index = s - em->sections;
-	}
-	break;
-
-      case ELF_DYNAMIC_ENTRY_VERSYM:
-	em->versym
-	  =
-	  elf_get_section_contents_with_starting_address (em, e->data,
-							  sizeof (em->versym
-								  [0]),
-							  &em->
-							  versym_section_index);
-	if (em->need_byte_swap)
-	  {
-	    uword i;
-	    for (i = 0; i < vec_len (em->versym); i++)
-	      em->versym[i] = clib_byte_swap_u16 (em->versym[i]);
-	  }
-	break;
-
-      case ELF_DYNAMIC_ENTRY_VERSION_NEED:
-	em->verneed
-	  =
-	  elf_get_section_contents_with_starting_address (em, e->data,
-							  sizeof (em->verneed
-								  [0]),
-							  &em->
-							  verneed_section_index);
-	if (em->need_byte_swap)
-	  byte_swap_verneed (em, em->verneed);
-	break;
-
-      default:
-	break;
-      }
-  }
-}
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-clib_error_t *
-elf_read_file (elf_main_t * em, char *file_name)
-{
-  int fd;
-  struct stat fd_stat;
-  uword mmap_length = 0;
-  void *data = 0;
-  clib_error_t *error = 0;
-
-  elf_main_init (em);
-
-  fd = open (file_name, 0);
-  if (fd < 0)
-    {
-      error = clib_error_return_unix (0, "open `%s'", file_name);
-      goto done;
-    }
-
-  if (fstat (fd, &fd_stat) < 0)
-    {
-      error = clib_error_return_unix (0, "fstat `%s'", file_name);
-      goto done;
-    }
-  mmap_length = fd_stat.st_size;
-
-  data = mmap (0, mmap_length, PROT_READ, MAP_SHARED, fd, /* offset */ 0);
-  if (~pointer_to_uword (data) == 0)
-    {
-      error = clib_error_return_unix (0, "mmap `%s'", file_name);
-      goto done;
-    }
-
-  em->file_name = file_name;
-
-  error = elf_parse (em, data, mmap_length);
-  if (error)
-    goto done;
-
-  elf_parse_symbols (em);
-  elf_parse_dynamic (em);
-
-  em->interpreter = elf_find_interpreter (em, data);
-
-  munmap (data, mmap_length);
-  close (fd);
-
-  return /* no error */ 0;
-
-done:
-  elf_main_free (em);
-  if (fd >= 0)
-    close (fd);
-  if (data)
-    munmap (data, mmap_length);
-  return error;
-}
-
-typedef struct
-{
-  u8 *new_table;
-
-  u8 *old_table;
-
-  uword *hash;
-} string_table_builder_t;
-
-static u32
-string_table_add_name (string_table_builder_t * b, u8 * n)
-{
-  uword *p, i, j, l;
-
-  p = hash_get_mem (b->hash, n);
-  if (p)
-    return p[0];
-
-  l = strlen ((char *) n);
-  i = vec_len (b->new_table);
-  vec_add (b->new_table, n, l + 1);
-
-  for (j = 0; j <= l; j++)
-    {
-      if (j > 0)
-	{
-	  p = hash_get_mem (b->hash, n + j);
-
-	  /* Sub-string already in table? */
-	  if (p)
-	    continue;
-	}
-
-      hash_set_mem (b->hash, n + j, i + j);
-    }
-
-  return i;
-}
-
-static u32 string_table_add_name_index (string_table_builder_t * b, u32 index)
-  __attribute__ ((unused));
-static u32
-string_table_add_name_index (string_table_builder_t * b, u32 index)
-{
-  u8 *n = b->old_table + index;
-  return string_table_add_name (b, n);
-}
-
-static void string_table_init (string_table_builder_t * b, u8 * old_table)
-  __attribute__ ((unused));
-static void
-string_table_init (string_table_builder_t * b, u8 * old_table)
-{
-  memset (b, 0, sizeof (b[0]));
-  b->old_table = old_table;
-  b->hash = hash_create_string (0, sizeof (uword));
-}
-
-static u8 *string_table_done (string_table_builder_t * b)
-  __attribute__ ((unused));
-static u8 *
-string_table_done (string_table_builder_t * b)
-{
-  hash_free (b->hash);
-  return b->new_table;
-}
-
-static void
-layout_sections (elf_main_t * em)
-{
-  elf_section_t *s;
-  u32 n_sections_with_changed_exec_address = 0;
-  u32 *deferred_symbol_and_string_sections = 0;
-  u32 n_deleted_sections = 0;
-  /* note: rebuild is always zero. Intent lost in the sands of time */
-#if 0
-  int rebuild = 0;
-
-  /* Re-build section string table (sections may have been deleted). */
-  if (rebuild)
-    {
-      u8 *st = 0;
-
-      vec_foreach (s, em->sections)
-      {
-	u8 *name;
-	if (s->header.type == ~0)
-	  continue;
-	name = elf_section_name (em, s);
-	s->header.name = vec_len (st);
-	vec_add (st, name, strlen ((char *) name) + 1);
-      }
-
-      s =
-	vec_elt_at_index (em->sections,
-			  em->file_header.section_header_string_table_index);
-
-      vec_free (s->contents);
-      s->contents = st;
-    }
-
-  /* Re-build dynamic string table. */
-  if (rebuild && em->dynamic_string_table_section_index != ~0)
-    {
-      string_table_builder_t b;
-
-      string_table_init (&b, em->dynamic_string_table);
-
-      /* Add all dynamic symbols. */
-      {
-	elf_symbol_table_t *symtab;
-	elf64_symbol_t *sym;
-
-	symtab =
-	  vec_elt_at_index (em->symbol_tables,
-			    em->dynamic_symbol_table_index);
-	vec_foreach (sym, symtab->symbols)
-	{
-	  u8 *name = elf_symbol_name (symtab, sym);
-	  sym->name = string_table_add_name (&b, name);
-	}
-
-	set_symbol_table (em, em->dynamic_symbol_table_index);
-      }
-
-      /* Add all dynamic entries. */
-      {
-	elf64_dynamic_entry_t *e;
-
-	vec_foreach (e, em->dynamic_entries)
-	{
-	  switch (e->type)
-	    {
-	    case ELF_DYNAMIC_ENTRY_NEEDED_LIBRARY:
-	    case ELF_DYNAMIC_ENTRY_RPATH:
-	    case ELF_DYNAMIC_ENTRY_RUN_PATH:
-	      e->data = string_table_add_name_index (&b, e->data);
-	      break;
-	    }
-	}
-      }
-
-      /* Add all version needs. */
-      if (vec_len (em->verneed) > 0)
-	{
-	  elf_dynamic_version_need_union_t *n, *a;
-
-	  n = em->verneed;
-	  while (1)
-	    {
-	      n->need.file_name_offset =
-		string_table_add_name_index (&b, n->need.file_name_offset);
-
-	      if (n->need.first_aux_offset != 0)
-		{
-		  a = n + n->need.first_aux_offset / sizeof (n[0]);
-		  while (1)
-		    {
-		      a->aux.name =
-			string_table_add_name_index (&b, a->aux.name);
-		      if (a->aux.next_offset == 0)
-			break;
-		      a += a->aux.next_offset / sizeof (a[0]);
-		    }
-		}
-
-	      if (n->need.next_offset == 0)
-		break;
-
-	      n += n->need.next_offset / sizeof (n[0]);
-	    }
-
-	  set_dynamic_verneed (em);
-	}
-
-      s =
-	vec_elt_at_index (em->sections,
-			  em->dynamic_string_table_section_index);
-
-      vec_free (s->contents);
-      s->contents = string_table_done (&b);
-    }
-#endif /* dead code */
-
-  /* Figure file offsets and exec addresses for sections. */
-  {
-    u64 exec_address = 0, file_offset = 0;
-    u64 file_size, align_size;
-
-    vec_foreach (s, em->sections)
-    {
-      /* Ignore deleted and unused sections. */
-      switch (s->header.type)
-	{
-	case ~0:
-	  n_deleted_sections++;
-	case ELF_SECTION_UNUSED:
-	  continue;
-
-	case ELF_SECTION_STRING_TABLE:
-	case ELF_SECTION_SYMBOL_TABLE:
-	  if (!(s->index == em->dynamic_string_table_section_index
-		|| s->index ==
-		em->file_header.section_header_string_table_index))
-	    {
-	      vec_add1 (deferred_symbol_and_string_sections, s->index);
-	      continue;
-	    }
-	  break;
-
-	default:
-	  break;
-	}
-
-      exec_address = round_pow2_u64 (exec_address, s->header.align);
-
-      /* Put sections we added at end of file. */
-      if (s->header.file_offset == ~0)
-	s->header.file_offset = file_offset;
-
-      /* Follow gaps in original file. */
-      if (s->header.exec_address > exec_address)
-	{
-	  exec_address = s->header.exec_address;
-	  file_offset = s->header.file_offset;
-	}
-
-      if (s->header.flags & ELF_SECTION_FLAG_ALLOC)
-	{
-	  s->exec_address_change = exec_address - s->header.exec_address;
-	  n_sections_with_changed_exec_address += s->exec_address_change != 0;
-	  s->header.exec_address = exec_address;
-	}
-
-      if (s->header.type == ELF_SECTION_NO_BITS)
-	file_size = s->header.file_size;
-      else
-	file_size = vec_len (s->contents);
-
-      {
-	u64 align;
-
-	if (s + 1 >= vec_end (em->sections))
-	  align = 16;
-	else if (s[1].header.type == ELF_SECTION_NO_BITS)
-	  align = 8;
-	else
-	  align = s[1].header.align;
-
-	if (s->header.flags & ELF_SECTION_FLAG_ALLOC)
-	  {
-	    u64 v = round_pow2_u64 (exec_address + file_size, align);
-	    align_size = v - exec_address;
-	  }
-	else
-	  {
-	    u64 v = round_pow2_u64 (file_offset + file_size, align);
-	    align_size = v - file_offset;
-	  }
-      }
-
-      s->header.file_offset = file_offset;
-      s->header.file_size = file_size;
-      s->align_size = align_size;
-
-      if (s->header.type != ELF_SECTION_NO_BITS)
-	file_offset += align_size;
-      exec_address += align_size;
-    }
-
-    /* Section headers go after last section but before symbol/string
-       tables. */
-    {
-      elf64_file_header_t *fh = &em->file_header;
-
-      fh->section_header_file_offset = file_offset;
-      fh->section_header_count = vec_len (em->sections) - n_deleted_sections;
-      file_offset += (u64) fh->section_header_count * fh->section_header_size;
-    }
-
-    {
-      int i;
-      for (i = 0; i < vec_len (deferred_symbol_and_string_sections); i++)
-	{
-	  s =
-	    vec_elt_at_index (em->sections,
-			      deferred_symbol_and_string_sections[i]);
-
-	  s->header.file_offset = file_offset;
-	  s->header.file_size = vec_len (s->contents);
-
-	  align_size = round_pow2 (vec_len (s->contents), 16);
-	  s->align_size = align_size;
-	  file_offset += align_size;
-	}
-      vec_free (deferred_symbol_and_string_sections);
-    }
-  }
-
-  /* Update dynamic entries now that sections have been assigned
-     possibly new addresses. */
-#if 0
-  if (rebuild)
-    elf_set_dynamic_entries (em);
-#endif
-
-  /* Update segments for changed section addresses. */
-  {
-    elf_segment_t *g;
-    uword si;
-
-    vec_foreach (g, em->segments)
-    {
-      u64 s_lo, s_hi, f_lo = 0;
-      u32 n_sections = 0;
-
-      if (g->header.memory_size == 0)
-	continue;
-
-      s_lo = s_hi = 0;
-	/* *INDENT-OFF* */
-	clib_bitmap_foreach (si, g->section_index_bitmap, ({
-	  u64 lo, hi;
-
-	  s = vec_elt_at_index (em->sections, si);
-	  lo = s->header.exec_address;
-	  hi = lo + s->align_size;
-	  if (n_sections == 0)
-	    {
-	      s_lo = lo;
-	      s_hi = hi;
-	      f_lo = s->header.file_offset;
-	      n_sections++;
-	    }
-	  else
-	    {
-	      if (lo < s_lo)
-		{
-		  s_lo = lo;
-		  f_lo = s->header.file_offset;
-		}
-	      if (hi > s_hi)
-		s_hi = hi;
-	    }
-	}));
-	/* *INDENT-ON* */
-
-      if (n_sections == 0)
-	continue;
-
-      /* File offset zero includes ELF headers/segment headers.
-         Don't change that. */
-      if (g->header.file_offset == 0 && g->header.type == ELF_SEGMENT_LOAD)
-	{
-	  s_lo = g->header.virtual_address;
-	  f_lo = g->header.file_offset;
-	}
-
-      g->header.virtual_address = s_lo;
-      g->header.physical_address = s_lo;
-      g->header.file_offset = f_lo;
-      g->header.memory_size = s_hi - s_lo;
-    }
-  }
-}
-
-clib_error_t *
-elf_write_file (elf_main_t * em, char *file_name)
-{
-  int fd;
-  FILE *f;
-  clib_error_t *error = 0;
-
-  fd = open (file_name, O_CREAT | O_RDWR | O_TRUNC, 0755);
-  if (fd < 0)
-    return clib_error_return_unix (0, "open `%s'", file_name);
-
-  f = fdopen (fd, "w");
-
-  /* Section contents may have changed.  So, we need to update
-     stuff to reflect this. */
-  layout_sections (em);
-
-  /* Write first header. */
-  {
-    elf_first_header_t h = em->first_header;
-
-    elf_swap_first_header (em, &h);
-    if (fwrite (&h, sizeof (h), 1, f) != 1)
-      {
-	error = clib_error_return_unix (0, "write first header");
-	goto error;
-      }
-  }
-
-  /* Write file header. */
-  {
-    elf64_file_header_t h = em->file_header;
-
-    /* Segment headers are after first header. */
-    h.segment_header_file_offset = sizeof (elf_first_header_t);
-    if (em->first_header.file_class == ELF_64BIT)
-      h.segment_header_file_offset += sizeof (elf64_file_header_t);
-    else
-      h.segment_header_file_offset += sizeof (elf32_file_header_t);
-
-    if (em->first_header.file_class == ELF_64BIT)
-      {
-#define _(t,field) h.field = elf_swap_##t (em, h.field);
-	foreach_elf64_file_header;
-#undef _
-
-	if (fwrite (&h, sizeof (h), 1, f) != 1)
-	  {
-	    error = clib_error_return_unix (0, "write file header");
-	    goto error;
-	  }
-      }
-    else
-      {
-	elf32_file_header_t h32;
-
-#define _(t,field) h32.field = elf_swap_##t (em, h.field);
-	foreach_elf32_file_header;
-#undef _
-
-	if (fwrite (&h32, sizeof (h32), 1, f) != 1)
-	  {
-	    error = clib_error_return_unix (0, "write file header");
-	    goto error;
-	  }
-      }
-  }
-
-  /* Write segment headers. */
-  {
-    elf_segment_t *s;
-
-    vec_foreach (s, em->segments)
-    {
-      elf64_segment_header_t h;
-
-      if (s->header.type == ~0)
-	continue;
-
-      h = s->header;
-
-      if (em->first_header.file_class == ELF_64BIT)
-	{
-#define _(t,field) h.field = elf_swap_##t (em, h.field);
-	  foreach_elf64_segment_header;
-#undef _
-
-	  if (fwrite (&h, sizeof (h), 1, f) != 1)
-	    {
-	      error =
-		clib_error_return_unix (0, "write segment header %U",
-					format_elf_segment, em, s);
-	      goto error;
-	    }
-	}
-      else
-	{
-	  elf32_segment_header_t h32;
-
-#define _(t,field) h32.field = elf_swap_##t (em, h.field);
-	  foreach_elf32_segment_header;
-#undef _
-
-	  if (fwrite (&h32, sizeof (h32), 1, f) != 1)
-	    {
-	      error =
-		clib_error_return_unix (0, "write segment header %U",
-					format_elf_segment, em, s);
-	      goto error;
-	    }
-	}
-    }
-  }
-
-  /* Write contents for all sections. */
-  {
-    elf_section_t *s;
-
-    vec_foreach (s, em->sections)
-    {
-      if (s->header.file_size == 0)
-	continue;
-
-      if (fseek (f, s->header.file_offset, SEEK_SET) < 0)
-	{
-	  fclose (f);
-	  return clib_error_return_unix (0, "fseek 0x%Lx",
-					 s->header.file_offset);
-	}
-
-      if (s->header.type == ELF_SECTION_NO_BITS)
-	/* don't write for .bss sections */ ;
-      else if (fwrite (s->contents, vec_len (s->contents), 1, f) != 1)
-	{
-	  error =
-	    clib_error_return_unix (0, "write %s section contents",
-				    elf_section_name (em, s));
-	  goto error;
-	}
-    }
-
-    /* Finally write section headers. */
-    if (fseek (f, em->file_header.section_header_file_offset, SEEK_SET) < 0)
-      {
-	fclose (f);
-	return clib_error_return_unix
-	  (0, "fseek 0x%Lx", em->file_header.section_header_file_offset);
-      }
-
-    vec_foreach (s, em->sections)
-    {
-      elf64_section_header_t h;
-
-      if (s->header.type == ~0)
-	continue;
-
-      h = s->header;
-
-      if (em->first_header.file_class == ELF_64BIT)
-	{
-#define _(t,field) h.field = elf_swap_##t (em, h.field);
-	  foreach_elf64_section_header;
-#undef _
-
-	  if (fwrite (&h, sizeof (h), 1, f) != 1)
-	    {
-	      error =
-		clib_error_return_unix (0, "write %s section header",
-					elf_section_name (em, s));
-	      goto error;
-	    }
-	}
-      else
-	{
-	  elf32_section_header_t h32;
-
-#define _(t,field) h32.field = elf_swap_##t (em, h.field);
-	  foreach_elf32_section_header;
-#undef _
-
-	  if (fwrite (&h32, sizeof (h32), 1, f) != 1)
-	    {
-	      error =
-		clib_error_return_unix (0, "write %s section header",
-					elf_section_name (em, s));
-	      goto error;
-	    }
-	}
-    }
-  }
-
-error:
-  fclose (f);
-  return error;
-}
-
-clib_error_t *
-elf_delete_named_section (elf_main_t * em, char *section_name)
-{
-  elf_section_t *s;
-  clib_error_t *error;
-
-  error = elf_get_section_by_name (em, section_name, &s);
-  if (error)
-    return error;
-
-  s->header.type = ~0;
-
-  return 0;
-}
-
-void
-elf_create_section_with_contents (elf_main_t * em,
-				  char *section_name,
-				  elf64_section_header_t * header,
-				  void *contents, uword n_content_bytes)
-{
-  elf_section_t *s, *sts;
-  u8 *st, *c;
-  uword *p, is_new_section;
-
-  /* See if section already exists with given name.
-     If so, just replace contents. */
-  is_new_section = 0;
-  if ((p = hash_get_mem (em->section_by_name, section_name)))
-    {
-      s = vec_elt_at_index (em->sections, p[0]);
-      _vec_len (s->contents) = 0;
-      c = s->contents;
-    }
-  else
-    {
-      vec_add2 (em->sections, s, 1);
-      is_new_section = 1;
-      c = 0;
-    }
-
-  sts =
-    vec_elt_at_index (em->sections,
-		      em->file_header.section_header_string_table_index);
-  st = sts->contents;
-
-  s->header = header[0];
-
-  s->header.file_offset = ~0;
-  s->header.file_size = n_content_bytes;
-  s->index = s - em->sections;
-
-  /* Add name to string table. */
-  s->header.name = vec_len (st);
-  vec_add (st, section_name, strlen (section_name));
-  vec_add1 (st, 0);
-  sts->contents = st;
-
-  vec_resize (c, n_content_bytes);
-  clib_memcpy (c, contents, n_content_bytes);
-  s->contents = c;
-
-  em->file_header.section_header_count += is_new_section
-    && s->header.type != ~0;
-}
-
-uword
-elf_delete_segment_with_type (elf_main_t * em,
-			      elf_segment_type_t segment_type)
-{
-  uword n_deleted = 0;
-  elf_segment_t *s;
-
-  vec_foreach (s, em->segments) if (s->header.type == segment_type)
-    {
-      s->header.type = ~0;
-      n_deleted += 1;
-    }
-
-  ASSERT (em->file_header.segment_header_count >= n_deleted);
-  em->file_header.segment_header_count -= n_deleted;
-
-  return n_deleted;
-}
-
-#endif /* CLIB_UNIX */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/elf.h b/vppinfra/vppinfra/elf.h
deleted file mode 100644
index 008ea284..00000000
--- a/vppinfra/vppinfra/elf.h
+++ /dev/null
@@ -1,1062 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_elf_h
-#define included_clib_elf_h
-
-#include <vppinfra/format.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/byte_order.h>
-
-#define foreach_elf_file_class \
-  _ (CLASS_NONE) _ (32BIT) _ (64BIT)
-
-#define foreach_elf_data_encoding		\
-  _ (ENCODING_NONE)				\
-  _ (TWOS_COMPLEMENT_LITTLE_ENDIAN)		\
-  _ (TWOS_COMPLEMENT_BIG_ENDIAN)
-
-#define ELF_VERSION_NONE (0)
-#define ELF_VERSION_CURRENT (1)
-
-#define foreach_elf_abi				\
-  _ (SYSV, 0)					\
-  _ (HPUX, 1)					\
-  _ (NETBSD, 2)					\
-  _ (LINUX, 3)					\
-  _ (SOLARIS, 6)				\
-  _ (AIX, 7)					\
-  _ (IRIX, 8)					\
-  _ (FREEBSD, 9)				\
-  _ (COMPAQ_TRU64, 10)				\
-  _ (MODESTO, 11)				\
-  _ (OPENBSD, 12)				\
-  _ (ARM, 97)					\
-  _ (STANDALONE, 255)
-
-/* Legal values for type (object file type).  */
-#define foreach_elf_file_type			\
-  _ (NONE, 0)					\
-  _ (RELOC, 1)					\
-  _ (EXEC, 2)					\
-  _ (SHARED, 3)					\
-  _ (CORE, 4)					\
-  _ (OS_SPECIFIC_LO, 0xfe00)			\
-  _ (OS_SPECIFIC_HI, 0xfeff)			\
-  _ (ARCH_SPECIFIC_LO, 0xff00)			\
-  _ (ARCH_SPECIFIC_HI, 0xffff)
-
-/* Legal values for architecture.  */
-#define foreach_elf_architecture					\
-  _ (NONE, 0)			/* No machine */			\
-  _ (M32, 1)			/* AT&T WE 32100 */			\
-  _ (SPARC, 2)			/* SUN SPARC */				\
-  _ (386, 3)			/* Intel 80386 */			\
-  _ (68K, 4)			/* Motorola m68k family */		\
-  _ (88K, 5)			/* Motorola m88k family */		\
-  _ (860, 7)			/* Intel 80860 */			\
-  _ (MIPS, 8)			/* MIPS R3000 big-endian */		\
-  _ (S370, 9)			/* IBM System/370 */			\
-  _ (MIPS_RS3_LE, 10)		/* MIPS R3000 little-endian */		\
-  _ (PARISC, 15)		/* HPPA */				\
-  _ (VPP500, 17)		/* Fujitsu VPP500 */			\
-  _ (SPARC32PLUS, 18)		/* Sun's "v8plus" */			\
-  _ (960, 19)			/* Intel 80960 */			\
-  _ (PPC, 20)			/* PowerPC */				\
-  _ (PPC64, 21)			/* PowerPC 64-bit */			\
-  _ (S390, 22)			/* IBM S390 */				\
-  _ (V800, 36)			/* NEC V800 series */			\
-  _ (FR20, 37)			/* Fujitsu FR20 */			\
-  _ (RH32, 38)			/* TRW RH-32 */				\
-  _ (RCE, 39)			/* Motorola RCE */			\
-  _ (ARM, 40)			/* ARM */				\
-  _ (FAKE_ALPHA, 41)		/* Digital Alpha */			\
-  _ (SH, 42)			/* Hitachi SH */			\
-  _ (SPARCV9, 43)		/* SPARC v9 64-bit */			\
-  _ (TRICORE, 44)		/* Siemens Tricore */			\
-  _ (ARC, 45)			/* Argonaut RISC Core */		\
-  _ (H8_300, 46)		/* Hitachi H8/300 */			\
-  _ (H8_300H, 47)		/* Hitachi H8/300H */			\
-  _ (H8S, 48)			/* Hitachi H8S */			\
-  _ (H8_500, 49)		/* Hitachi H8/500 */			\
-  _ (IA_64, 50)			/* Intel Merced */			\
-  _ (MIPS_X, 51)		/* Stanford MIPS-X */			\
-  _ (COLDFIRE, 52)		/* Motorola Coldfire */			\
-  _ (68HC12, 53)		/* Motorola M68HC12 */			\
-  _ (MMA, 54)			/* Fujitsu MMA Multimedia Accel. */	\
-  _ (PCP, 55)			/* Siemens PCP */			\
-  _ (NCPU, 56)			/* Sony nCPU embeeded RISC */		\
-  _ (NDR1, 57)			/* Denso NDR1 microprocessor */		\
-  _ (STARCORE, 58)		/* Motorola Start*Core processor */	\
-  _ (ME16, 59)			/* Toyota ME16 processor */		\
-  _ (ST100, 60)			/* STMicroelectronic ST100  */		\
-  _ (TINYJ, 61)			/* Advanced Logic Corp. Tinyj */	\
-  _ (X86_64, 62)		/* AMD x86-64 architecture */		\
-  _ (PDSP, 63)			/* Sony DSP Processor */		\
-  _ (FX66, 66)			/* Siemens FX66 microcontroller */	\
-  _ (ST9PLUS, 67)		/* STMicroelectronics ST9+ 8/16 mc */	\
-  _ (ST7, 68)			/* STmicroelectronics ST7 8 bit mc */	\
-  _ (68HC16, 69)		/* Motorola MC68HC16 */			\
-  _ (68HC11, 70)		/* Motorola MC68HC11 */			\
-  _ (68HC08, 71)		/* Motorola MC68HC08 */			\
-  _ (68HC05, 72)		/* Motorola MC68HC05 */			\
-  _ (SVX, 73)			/* Silicon Graphics SVx */		\
-  _ (ST19, 74)			/* STMicroelectronics ST19 8 bit mc */	\
-  _ (VAX, 75)			/* Digital VAX */			\
-  _ (CRIS, 76)			/* Axis 32-bit embedded proc. */	\
-  _ (JAVELIN, 77)		/* Infineon 32-bit embedded proc. */	\
-  _ (FIREPATH, 78)		/* Element 14 64-bit DSP Processor */	\
-  _ (ZSP, 79)			/* LSI Logic 16-bit DSP Processor */	\
-  _ (MMIX, 80)			/* Knuth's 64-bit processor */		\
-  _ (HUANY, 81)			/* Harvard machine-independent */	\
-  _ (PRISM, 82)			/* SiTera Prism */			\
-  _ (AVR, 83)			/* Atmel AVR 8-bit microcontroller */	\
-  _ (FR30, 84)			/* Fujitsu FR30 */			\
-  _ (D10V, 85)			/* Mitsubishi D10V */			\
-  _ (D30V, 86)			/* Mitsubishi D30V */			\
-  _ (V850, 87)			/* NEC v850 */				\
-  _ (M32R, 88)			/* Mitsubishi M32R */			\
-  _ (MN10300, 89)		/* Matsushita MN10300 */		\
-  _ (MN10200, 90)		/* Matsushita MN10200 */		\
-  _ (PJ, 91)			/* picoJava */				\
-  _ (OPENRISC, 92)		/* OpenRISC 32-bit processor */		\
-  _ (ARC_A5, 93)		/* ARC Cores Tangent-A5 */		\
-  _ (XTENSA, 94)		/* Tensilica Xtensa Architecture */	\
-  _ (ALPHA, 0x9026)
-
-#define _(f) ELF_##f,
-
-typedef enum
-{
-  foreach_elf_file_class ELF_N_FILE_CLASS,
-} elf_file_class_t;
-
-typedef enum
-{
-  foreach_elf_data_encoding ELF_N_DATA_ENCODING,
-} elf_data_encoding_t;
-
-#undef _
-
-#define _(f,i) ELF_##f = i,
-
-typedef enum
-{
-  foreach_elf_abi
-} elf_abi_t;
-
-typedef enum
-{
-  foreach_elf_file_type
-} elf_file_type_t;
-
-#undef _
-
-typedef enum
-{
-#define _(f,i) ELF_ARCH_##f = i,
-  foreach_elf_architecture
-#undef _
-} elf_architecture_t;
-
-typedef struct
-{
-  /* 0x7f ELF */
-  u8 magic[4];
-
-  elf_file_class_t file_class:8;
-  elf_data_encoding_t data_encoding:8;
-  u8 file_version_ident;
-  elf_abi_t abi:8;
-  u8 abi_version;
-
-  u8 pad[7];
-
-  elf_file_type_t file_type:16;
-  elf_architecture_t architecture:16;
-
-  u32 file_version;
-} elf_first_header_t;
-
-/* 32/64 bit file header following basic file header. */
-#define foreach_elf32_file_header		\
-  _ (u32, entry_point)				\
-  _ (u32, segment_header_file_offset)		\
-  _ (u32, section_header_file_offset)		\
-  _ (u32, flags)				\
-  _ (u16, n_bytes_this_header)			\
-  _ (u16, segment_header_size)			\
-  _ (u16, segment_header_count)			\
-  _ (u16, section_header_size)			\
-  _ (u16, section_header_count)			\
-  _ (u16, section_header_string_table_index)
-
-#define foreach_elf64_file_header		\
-  _ (u64, entry_point)				\
-  _ (u64, segment_header_file_offset)		\
-  _ (u64, section_header_file_offset)		\
-  _ (u32, flags)				\
-  _ (u16, n_bytes_this_header)			\
-  _ (u16, segment_header_size)			\
-  _ (u16, segment_header_count)			\
-  _ (u16, section_header_size)			\
-  _ (u16, section_header_count)			\
-  _ (u16, section_header_string_table_index)
-
-/* Section header.  */
-#define foreach_elf32_section_header		\
-  _ (u32, name)					\
-  _ (u32, type)					\
-  _ (u32, flags)				\
-  _ (u32, exec_address)				\
-  _ (u32, file_offset)				\
-  _ (u32, file_size)				\
-  _ (u32, link)					\
-  _ (u32, additional_info)			\
-  _ (u32, align)				\
-  _ (u32, entry_size)
-
-#define foreach_elf64_section_header		\
-  _ (u32, name)					\
-  _ (u32, type)					\
-  _ (u64, flags)				\
-  _ (u64, exec_address)				\
-  _ (u64, file_offset)				\
-  _ (u64, file_size)				\
-  _ (u32, link)					\
-  _ (u32, additional_info)			\
-  _ (u64, align)				\
-  _ (u64, entry_size)
-
-/* Program segment header.  */
-#define foreach_elf32_segment_header		\
-  _ (u32, type)					\
-  _ (u32, file_offset)				\
-  _ (u32, virtual_address)			\
-  _ (u32, physical_address)			\
-  _ (u32, file_size)				\
-  _ (u32, memory_size)				\
-  _ (u32, flags)				\
-  _ (u32, align)
-
-#define foreach_elf64_segment_header		\
-  _ (u32, type)					\
-  _ (u32, flags)				\
-  _ (u64, file_offset)				\
-  _ (u64, virtual_address)			\
-  _ (u64, physical_address)			\
-  _ (u64, file_size)				\
-  _ (u64, memory_size)				\
-  _ (u64, align)
-
-/* Symbol table.  */
-#define foreach_elf32_symbol_header		\
-  _ (u32, name)					\
-  _ (u32, value)				\
-  _ (u32, size)					\
-  /* binding upper 4 bits; type lower 4 bits */	\
-  _ (u8, binding_and_type)			\
-  _ (u8, visibility)				\
-  _ (u16, section_index)
-
-#define foreach_elf64_symbol_header		\
-  _ (u32, name)					\
-  _ (u8, binding_and_type)			\
-  _ (u8, visibility)				\
-  _ (u16, section_index)			\
-  _ (u64, value)				\
-  _ (u64, size)
-
-#define _(t,f) t f;
-
-typedef struct
-{
-foreach_elf32_file_header} elf32_file_header_t;
-
-typedef struct
-{
-foreach_elf64_file_header} elf64_file_header_t;
-
-typedef struct
-{
-foreach_elf32_section_header} elf32_section_header_t;
-
-typedef struct
-{
-foreach_elf64_section_header} elf64_section_header_t;
-
-typedef struct
-{
-foreach_elf32_segment_header} elf32_segment_header_t;
-
-typedef struct
-{
-foreach_elf64_segment_header} elf64_segment_header_t;
-
-typedef struct
-{
-foreach_elf32_symbol_header} elf32_symbol_t;
-
-typedef struct
-{
-foreach_elf64_symbol_header} elf64_symbol_t;
-#undef _
-
-/* Special section names.  */
-#define foreach_elf_symbol_reserved_section_index			\
-  _ (ABSOLUTE, 0xfff1)		/* Associated symbol is absolute */	\
-  _ (COMMON, 0xfff2)		/* Associated symbol is common */	\
-  _ (XINDEX, 0xffff)		/* Index is in extra table.  */
-
-#define ELF_SYMBOL_SECTION_RESERVED_LO 0xff00
-#define ELF_SYMBOL_SECTION_RESERVED_HI 0xffff
-#define ELF_SYMBOL_SECTION_ARCH_SPECIFIC_LO 0xff00
-#define ELF_SYMBOL_SECTION_ARCH_SPECIFIC_HI 0xff1f
-#define ELF_SYMBOL_SECTION_OS_SPECIFIC_LO 0xff20
-#define ELF_SYMBOL_SECTION_OS_SPECIFIC_HI 0xff3f
-
-/* Section types. */
-#define foreach_elf_section_type					\
-  _ (UNUSED, 0)								\
-  _ (PROGRAM_DATA, 1)							\
-  _ (SYMBOL_TABLE, 2)							\
-  _ (STRING_TABLE, 3)							\
-  _ (RELOCATION_ADD, 4)							\
-  _ (SYMBOL_TABLE_HASH, 5)						\
-  _ (DYNAMIC, 6)		/* Dynamic linking information */	\
-  _ (NOTE, 7)			/* Notes */				\
-  _ (NO_BITS, 8)		/* Program space with no data (bss) */	\
-  _ (RELOCATION, 9)		/* Relocation entries, no addends */	\
-  _ (DYNAMIC_SYMBOL_TABLE, 11)	/* Dynamic linker symbol table */	\
-  _ (INIT_ARRAY, 14)		/* Array of constructors */		\
-  _ (FINI_ARRAY, 15)		/* Array of destructors */		\
-  _ (PREINIT_ARRAY, 16)		/* Array of pre-constructors */		\
-  _ (GROUP, 17)			/* Section group */			\
-  _ (SYMTAB_SHNDX, 18)		/* Extended section indices */		\
-  _ (OS_SPECIFIC_LO, 0x60000000) /* Start OS-specific */		\
-  _ (GNU_LIBLIST, 0x6ffffff7)	/* Prelink library list */		\
-  _ (CHECKSUM, 0x6ffffff8)	/* Checksum for DSO content.  */	\
-  _ (SUNW_MOVE, 0x6ffffffa)						\
-  _ (SUNW_COMDAT, 0x6ffffffb)						\
-  _ (SUNW_SYMINFO, 0x6ffffffc)						\
-  _ (GNU_VERDEF, 0x6ffffffd)	/* Version definition section.  */	\
-  _ (GNU_VERNEED, 0x6ffffffe) /* Version needs section.  */		\
-  _ (GNU_VERSYM, 0x6fffffff)	/* Version symbol table.  */		\
-  _ (ARCH_SPECIFIC_LO, 0x70000000) /* Start of processor-specific */	\
-  _ (ARCH_SPECIFIC_HI, 0x7fffffff) /* End of processor-specific */	\
-  _ (APP_SPECIFIC_LO, 0x80000000) /* Start of application-specific */	\
-  _ (APP_SPECIFIC_HI, 0x8fffffff)	/* End of application-specific */
-
-/* Section flags. */
-#define foreach_elf_section_flag		\
-  _ (WRITE, 0)					\
-  _ (ALLOC, 1)					\
-  _ (EXEC, 2)					\
-  _ (MERGE, 3)					\
-  _ (STRING_TABLE, 5)				\
-  _ (INFO_LINK, 6)				\
-  _ (PRESERVE_LINK_ORDER, 7)			\
-  _ (OS_NON_CONFORMING, 8)			\
-  _ (GROUP, 9)					\
-  _ (TLS, 10)					\
-  _ (OS_SPECIFIC_LO, 20)			\
-  _ (OS_SPECIFIC_HI, 27)			\
-  _ (ARCH_SPECIFIC_LO, 28)			\
-  _ (ARCH_SPECIFIC_HI, 31)
-
-typedef enum
-{
-#define _(f,i) ELF_SECTION_##f = i,
-  foreach_elf_section_type
-#undef _
-    ELF_SECTION_OS_SPECIFIC_HI = 0x6fffffff,
-} elf_section_type_t;
-
-typedef enum
-{
-#define _(f,i) ELF_SECTION_FLAG_BIT_##f = i,
-  foreach_elf_section_flag
-#undef _
-} elf_section_flag_bit_t;
-
-typedef enum
-{
-#define _(f,i) ELF_SECTION_FLAG_##f = 1 << ELF_SECTION_FLAG_BIT_##f,
-  foreach_elf_section_flag
-#undef _
-} elf_section_flag_t;
-
-/* Symbol bindings (upper 4 bits of binding_and_type). */
-#define foreach_elf_symbol_binding					\
-  _ (LOCAL, 0)			/* Local symbol */			\
-  _ (GLOBAL, 1)			/* Global symbol */			\
-  _ (WEAK, 2)			/* Weak symbol */			\
-  _ (OS_SPECIFIC_LO, 10)	/* Start of OS-specific */		\
-  _ (OS_SPECIFIC_HI, 12)	/* End of OS-specific */		\
-  _ (ARCH_SPECIFIC_LO, 13)	/* Start of processor-specific */	\
-  _ (ARCH_SPECIFIC_HI, 15)	/* End of processor-specific */
-
-/* Symbol types (lower 4 bits of binding_and_type). */
-#define foreach_elf_symbol_type						\
-  _ (NONE, 0)								\
-  _ (DATA, 1)			/* Symbol is a data object */		\
-  _ (CODE, 2)			/* Symbol is a code object */		\
-  _ (SECTION, 3)		/* Symbol associated with a section */	\
-  _ (FILE, 4)			/* Symbol's name is file name */	\
-  _ (COMMON, 5)			/* Symbol is a common data object */	\
-  _ (TLS, 6)			/* Symbol is thread-local data */	\
-  _ (OS_SPECIFIC_LO, 10)	/* Start of OS-specific */		\
-  _ (OS_SPECIFIC_HI, 12)	/* End of OS-specific */		\
-  _ (ARCH_SPECIFIC_LO, 13)	/* Start of processor-specific */	\
-  _ (ARCH_SPECIFIC_HI, 15)	/* End of processor-specific */
-
-/* Symbol visibility. */
-#define foreach_elf_symbol_visibility					\
-  _ (DEFAULT, 0)		/* Default symbol visibility rules */	\
-  _ (INTERNAL, 1)		/* Processor specific hidden class */	\
-  _ (HIDDEN, 2)			/* Unavailable in other modules */	\
-  _ (PROTECTED, 3)		/* Not preemptible, not exported */
-
-/* The syminfo section if available contains additional
-   information about every dynamic symbol.  */
-typedef struct
-{
-  u16 bound_to;
-  u16 flags;
-} elf_symbol_info_t;
-
-/* Possible values for bound_to.  */
-#define foreach_elf_symbol_info_bound_to			\
-  _ (SELF, 0xffff)		/* Symbol bound to self */	\
-  _ (PARENT, 0xfffe)		/* Symbol bound to parent */	\
-  _ (RESERVED_LO, 0xff00)					\
-  _ (RESERVED_HI, 0xffff)
-
-/* Symbol info flags. */
-#define foreach_elf_symbol_info_flags					\
-  _ (DIRECT)			/* Direct bound symbol */		\
-  _ (PASS_THRU)			/* Pass-thru symbol for translator */	\
-  _ (COPY)			/* Symbol is a copy-reloc */		\
-  _ (LAZY_LOAD)			/* Symbol bound to object to be lazy loaded */
-
-/* Relocation table entry with/without addend. */
-typedef struct
-{
-  u32 address;
-  u32 symbol_and_type;		/* high 24 symbol, low 8 type. */
-  i32 addend[0];
-} elf32_relocation_t;
-
-typedef struct
-{
-  u64 address;
-  u64 symbol_and_type;		/* high 32 symbol, low 32 type. */
-  i64 addend[0];
-} elf64_relocation_t;
-
-typedef struct
-{
-  u64 address;
-  u64 symbol_and_type;
-  u64 addend;
-} elf_relocation_with_addend_t;
-
-#define elf_relocation_next(r,type)					\
-  ((void *) ((r) + 1)							\
-   + ((type) == ELF_SECTION_RELOCATION_ADD ? sizeof ((r)->addend[0]) : 0))
-
-/* Segment type. */
-#define foreach_elf_segment_type					\
-  _ (UNUSED, 0)								\
-  _ (LOAD, 1)			/* Loadable program segment */		\
-  _ (DYNAMIC, 2)		/* Dynamic linking information */	\
-  _ (INTERP, 3)			/* Program interpreter */		\
-  _ (NOTE, 4)			/* Auxiliary information */		\
-  _ (SEGMENT_TABLE, 6)		/* Entry for header table itself */	\
-  _ (TLS, 7)			/* Thread-local storage segment */	\
-  _ (OS_SPECIFIC_LO, 0x60000000) /* Start of OS-specific */		\
-  _ (GNU_EH_FRAME, 0x6474e550)	/* GCC .eh_frame_hdr segment */		\
-  _ (GNU_STACK, 0x6474e551)	/* Indicates stack executability */	\
-  _ (GNU_RELRO, 0x6474e552)	/* Read-only after relocation */	\
-  _ (SUNW_BSS, 0x6ffffffa)	/* Sun specific BSS */			\
-  _ (SUNW_STACK, 0x6ffffffb)	/* Sun specific stack */		\
-  _ (OS_SPECIFIC_HI, 0x6fffffff) /* End of OS-specific */		\
-  _ (ARCH_SPECIFIC_LO, 0x70000000) /* Start of processor-specific */	\
-  _ (ARCH_SPECIFIC_HI, 0x7fffffff)	/* End of processor-specific */
-
-/* Segment flags. */
-#define foreach_elf_segment_flag		\
-  _ (EXEC, 0)					\
-  _ (WRITE, 1)					\
-  _ (READ, 2)					\
-  _ (OS_SPECIFIC_LO, 20)			\
-  _ (OS_SPECIFIC_HI, 27)			\
-  _ (ARCH_SPECIFIC_LO, 28)			\
-  _ (ARCH_SPECIFIC_HI, 31)
-
-typedef enum
-{
-#define _(f,i) ELF_SEGMENT_##f = i,
-  foreach_elf_segment_type
-#undef _
-} elf_segment_type_t;
-
-typedef enum
-{
-#define _(f,i) ELF_SEGMENT_FLAG_BIT_##f = i,
-  foreach_elf_segment_flag
-#undef _
-} elf_segment_flag_bit_t;
-
-typedef enum
-{
-#define _(f,i) ELF_SEGMENT_FLAG_##f = 1 << ELF_SEGMENT_FLAG_BIT_##f,
-  foreach_elf_segment_flag
-#undef _
-} elf_segment_flag_t;
-
-#define foreach_elf32_dynamic_entry_header	\
-  _ (u32, type)					\
-  _ (u32, data)
-
-#define foreach_elf64_dynamic_entry_header	\
-  _ (u64, type)					\
-  _ (u64, data)
-
-#define _(t,f) t f;
-
-typedef struct
-{
-foreach_elf32_dynamic_entry_header} elf32_dynamic_entry_t;
-
-typedef struct
-{
-foreach_elf64_dynamic_entry_header} elf64_dynamic_entry_t;
-
-#undef _
-
-#define foreach_elf_dynamic_entry_type					\
-  _ (END, 0)			/* Marks end of dynamic section */	\
-  _ (NEEDED_LIBRARY, 1)		/* Name of needed library */		\
-  _ (PLT_RELOCATION_SIZE, 2)	/* Size in bytes of PLT relocs */	\
-  _ (PLT_GOT, 3)		/* Processor defined value */		\
-  _ (SYMBOL_HASH, 4)		/* Address of symbol hash table */	\
-  _ (STRING_TABLE, 5)		/* Address of string table */		\
-  _ (SYMBOL_TABLE, 6)		/* Address of symbol table */		\
-  _ (RELA_ADDRESS, 7)		/* Address of Rela relocs */		\
-  _ (RELA_SIZE, 8)		/* Total size of Rela relocs */		\
-  _ (RELA_ENTRY_SIZE, 9)	/* Size of one Rela reloc */		\
-  _ (STRING_TABLE_SIZE, 10)	/* Size of string table */		\
-  _ (SYMBOL_TABLE_ENTRY_SIZE, 11) /* Size of one symbol table entry */	\
-  _ (INIT_FUNCTION, 12)		/* Address of init function */		\
-  _ (FINI_FUNCTION, 13)		/* Address of termination function */	\
-  _ (SONAME, 14)		/* Name of shared object */		\
-  _ (RPATH, 15)			/* Library search path (deprecated) */	\
-  _ (SYMBOLIC, 16)		/* Start symbol search here */		\
-  _ (REL, 17)			/* Address of Rel relocs */		\
-  _ (RELSZ, 18)			/* Total size of Rel relocs */		\
-  _ (RELENT, 19)		/* Size of one Rel reloc */		\
-  _ (PLT_RELOCATION_TYPE, 20)	/* Type of reloc in PLT */		\
-  _ (DEBUG, 21)			/* For debugging; unspecified */	\
-  _ (TEXTREL, 22)		/* Reloc might modify .text */		\
-  _ (PLT_RELOCATION_ADDRESS, 23) /* Address of PLT relocs */		\
-  _ (BIND_NOW, 24)		/* Process relocations of object */	\
-  _ (INIT_ARRAY, 25)		/* Array with addresses of init fct */	\
-  _ (FINI_ARRAY, 26)		/* Array with addresses of fini fct */	\
-  _ (INIT_ARRAYSZ, 27)		/* Size in bytes of DT_INIT_ARRAY */	\
-  _ (FINI_ARRAYSZ, 28)		/* Size in bytes of DT_FINI_ARRAY */	\
-  _ (RUN_PATH, 29)		/* Library search path */		\
-  _ (FLAGS, 30)			/* Flags for object being loaded */	\
-  _ (ENCODING, 31)		/* Start of encoded range */		\
-  _ (PREINIT_ARRAY, 32)		/* Array with addresses of fns */	\
-  _ (PREINIT_ARRAY_SIZE, 33)	/* Size of PREINIT_ARRAY in bytes. */	\
-  _ (GNU_PRELINKED, 0x6ffffdf5)	/* Prelinking timestamp */		\
-  _ (GNU_CONFLICTSZ, 0x6ffffdf6)	/* Size of conflict section */	\
-  _ (GNU_LIBLISTSZ, 0x6ffffdf7)	/* Size of library list */		\
-  _ (CHECKSUM, 0x6ffffdf8)						\
-  _ (PLTPADSZ, 0x6ffffdf9)						\
-  _ (MOVEENT, 0x6ffffdfa)						\
-  _ (MOVESZ, 0x6ffffdfb)						\
-  _ (FEATURE_1,	0x6ffffdfc)	/* Feature selection (DTF_*).  */	\
-  _ (POSFLAG_1,	0x6ffffdfd)	/* Flags for following entries.  */	\
-  _ (SYMINSZ, 0x6ffffdfe)	/* Size of syminfo table (in bytes) */	\
-  _ (SYMINENT, 0x6ffffdff)	/* Entry size of syminfo */		\
-  _ (GNU_HASH, 0x6ffffef5)						\
-  _ (GNU_CONFLICT, 0x6ffffef8)	/* Start of conflict section */		\
-  _ (GNU_LIBLIST, 0x6ffffef9)	/* Library list */			\
-  _ (CONFIG, 0x6ffffefa)	/* Configuration information.  */	\
-  _ (DEPAUDIT, 0x6ffffefb)	/* Dependency auditing.  */		\
-  _ (AUDIT, 0x6ffffefc)	/* Object auditing.  */				\
-  _ (PLTPAD, 0x6ffffefd)	/* PLT padding.  */			\
-  _ (MOVETAB, 0x6ffffefe)	/* Move table.  */			\
-  _ (SYMINFO, 0x6ffffeff)	/* Syminfo table.  */			\
-  _ (VERSYM, 0x6ffffff0)						\
-  _ (RELACOUNT, 0x6ffffff9)						\
-  _ (RELCOUNT, 0x6ffffffa)						\
-  _ (FLAGS_1, 0x6ffffffb)	/* State flags, see DF_1_* below.  */	\
-  _ (VERSION_DEF, 0x6ffffffc)	/* Address of version definition table */ \
-  _ (VERSION_DEF_COUNT, 0x6ffffffd)	/* Number of version definitions */ \
-  _ (VERSION_NEED, 0x6ffffffe)	/* Address of table with needed versions */ \
-  _ (VERSION_NEED_COUNT, 0x6fffffff)	/* Number of needed versions */	\
-  _ (AUXILIARY, 0x7ffffffd)      /* Shared object to load before self */ \
-  _ (FILTER, 0x7fffffff)	/* Shared object to get values from */
-
-typedef enum
-{
-#define _(f,n) ELF_DYNAMIC_ENTRY_##f = (n),
-  foreach_elf_dynamic_entry_type
-#undef _
-} elf_dynamic_entry_type_t;
-
-/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
-#define ELF_DYNAMIC_FLAGS_ORIGIN	(1 << 0)	/* Object may use DF_ORIGIN */
-#define ELF_DYNAMIC_FLAGS_SYMBOLIC	(1 << 1)	/* Symbol resolutions starts here */
-#define ELF_DYNAMIC_FLAGS_TEXT_RELOCATIONS (1 << 2)	/* Object contains text relocations */
-#define ELF_DYNAMIC_FLAGS_BIND_NOW	(1 << 3)	/* No lazy binding for this object */
-#define ELF_DYNAMIC_FLAGS_STATIC_TLS	(1 << 4)	/* Module uses the static TLS model */
-
-/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
-   entry in the dynamic section.  */
-#define DF_1_NOW	0x00000001	/* Set RTLD_NOW for this object.  */
-#define DF_1_GLOBAL	0x00000002	/* Set RTLD_GLOBAL for this object.  */
-#define DF_1_GROUP	0x00000004	/* Set RTLD_GROUP for this object.  */
-#define DF_1_NODELETE	0x00000008	/* Set RTLD_NODELETE for this object. */
-#define DF_1_LOADFLTR	0x00000010	/* Trigger filtee loading at runtime. */
-#define DF_1_INITFIRST	0x00000020	/* Set RTLD_INITFIRST for this object */
-#define DF_1_NOOPEN	0x00000040	/* Set RTLD_NOOPEN for this object.  */
-#define DF_1_ORIGIN	0x00000080	/* $ORIGIN must be handled.  */
-#define DF_1_DIRECT	0x00000100	/* Direct binding enabled.  */
-#define DF_1_TRANS	0x00000200
-#define DF_1_INTERPOSE	0x00000400	/* Object is used to interpose.  */
-#define DF_1_NODEFLIB	0x00000800	/* Ignore default lib search path.  */
-#define DF_1_NODUMP	0x00001000	/* Object can't be dldump'ed.  */
-#define DF_1_CONFALT	0x00002000	/* Configuration alternative created. */
-#define DF_1_ENDFILTEE	0x00004000	/* Filtee terminates filters search. */
-#define	DF_1_DISPRELDNE	0x00008000	/* Disp reloc applied at build time. */
-#define	DF_1_DISPRELPND	0x00010000	/* Disp reloc applied at run-time.  */
-
-/* Flags for the feature selection in DT_FEATURE_1.  */
-#define DTF_1_PARINIT	0x00000001
-#define DTF_1_CONFEXP	0x00000002
-
-/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
-#define DF_P1_LAZYLOAD	0x00000001	/* Lazyload following object.  */
-#define DF_P1_GROUPPERM	0x00000002	/* Symbols from next object are not
-					   generally available.  */
-
-/* Version definition sections.  */
-typedef struct
-{
-  u16 version;
-  u16 flags;
-  u16 index;
-  u16 aux_count;
-  u32 name_hash;
-  u32 aux_byte_offset;
-  u32 byte_offset_next_version_definition;
-} elf_dynamic_version_definition_t;
-
-typedef struct
-{
-  u32 name;
-  u32 next_offset;		/* byte offset of ver def aux next entry */
-} elf_dynamic_version_definition_aux_t;
-
-/* Version definition flags. */
-#define ELF_DYNAMIC_VERSION_FILE (1 << 0)	/* Version definition of file itself */
-#define ELF_DYNAMIC_VERSION_WEAK (1 << 1)	/* Weak version identifier */
-
-/* Version symbol index. */
-#define	ELF_DYNAMIC_VERSYM_LOCAL 0	/* Symbol is local.  */
-#define	ELF_DYNAMIC_VERSYM_GLOBAL 1	/* Symbol is global.  */
-#define	ELF_DYNAMIC_VERSYM_RESERVED_LO	0xff00	/* Beginning of reserved entries.  */
-#define	ELF_DYNAMIC_VERSYM_ELIMINATE	0xff01	/* Symbol is to be eliminated.  */
-
-/* Version dependency section.  */
-#define foreach_elf_dynamic_version_need_field	\
-  _ (u16, version)				\
-  _ (u16, aux_count)				\
-  _ (u32, file_name_offset)			\
-  _ (u32, first_aux_offset)			\
-  _ (u32, next_offset)
-
-#define foreach_elf_dynamic_version_need_aux_field	\
-  _ (u32, hash)						\
-  _ (u16, flags)					\
-  _ (u16, versym_index)					\
-  _ (u32, name)						\
-  _ (u32, next_offset)
-
-typedef struct
-{
-#define _(t,f) t f;
-  foreach_elf_dynamic_version_need_field
-#undef _
-} elf_dynamic_version_need_t;
-
-typedef struct
-{
-#define _(t,f) t f;
-  foreach_elf_dynamic_version_need_aux_field
-#undef _
-} elf_dynamic_version_need_aux_t;
-
-typedef union
-{
-  elf_dynamic_version_need_t need;
-  elf_dynamic_version_need_aux_t aux;
-} elf_dynamic_version_need_union_t;
-
-/* Note section contents.  Each entry in the note section begins with
-   a header of a fixed form.  */
-
-typedef struct
-{
-  u32 name_size;
-  u32 descriptor_size;
-  u32 type;
-} elf_note_t;
-
-/* Known names of notes.  */
-
-/* Solaris entries in the note section have this name.  */
-#define ELF_NOTE_SOLARIS	"SUNW Solaris"
-
-/* Note entries for GNU systems have this name.  */
-#define ELF_NOTE_GNU		"GNU"
-
-
-/* Defined types of notes for Solaris.  */
-
-/* Value of descriptor (one word) is desired pagesize for the binary.  */
-#define ELF_NOTE_PAGESIZE_HINT	1
-
-
-/* Defined note types for GNU systems.  */
-
-/* ABI information.  The descriptor consists of words:
-   word 0: OS descriptor
-   word 1: major version of the ABI
-   word 2: minor version of the ABI
-   word 3: subminor version of the ABI
-*/
-#ifndef ELF_NOTE_ABI
-#define ELF_NOTE_ABI		1
-#endif
-
-/* Known OSes.  These value can appear in word 0 of an ELF_NOTE_ABI
-   note section entry.  */
-#define ELF_NOTE_OS_LINUX	0
-#define ELF_NOTE_OS_GNU		1
-#define ELF_NOTE_OS_SOLARIS2	2
-#define ELF_NOTE_OS_FREEBSD	3
-
-/* AMD x86-64 relocations.  */
-#define foreach_elf_x86_64_relocation_type				\
-  _ (NONE, 0)			/* No reloc */				\
-  _ (DIRECT_64, 1)		/* Direct 64 bit  */			\
-  _ (PC_REL_I32, 2)	        /* PC relative 32 bit signed */		\
-  _ (GOT_REL_32, 3)		/* 32 bit GOT entry */			\
-  _ (PLT_REL_32, 4)		/* 32 bit PLT address */		\
-  _ (COPY, 5)			/* Copy symbol at runtime */		\
-  _ (CREATE_GOT, 6)		/* Create GOT entry */			\
-  _ (CREATE_PLT, 7)		/* Create PLT entry */			\
-  _ (RELATIVE, 8)		/* Adjust by program base */		\
-  _ (PC_REL_I32_GOT, 9)	/* 32 bit PC relative offset to GOT */		\
-  _ (DIRECT_U32, 10)		/* Direct 32 bit zero extended */	\
-  _ (DIRECT_I32, 11)		/* Direct 32 bit sign extended */	\
-  _ (DIRECT_U16, 12)		/* Direct 16 bit zero extended */	\
-  _ (PC_REL_I16, 13)	/* 16 bit sign extended pc relative */		\
-  _ (DIRECT_I8, 14)		/* Direct 8 bit sign extended  */	\
-  _ (PC_REL_I8, 15)	/* 8 bit sign extended pc relative */		\
-  _ (DTPMOD64, 16)		/* ID of module containing symbol */	\
-  _ (DTPOFF64, 17)		/* Offset in module's TLS block */	\
-  _ (TPOFF64, 18)		/* Offset in initial TLS block */	\
-  _ (TLSGD, 19)	/* 32 bit signed PC relative offset to two GOT entries for GD symbol */	\
-  _ (TLSLD, 20) /* 32 bit signed PC relative offset to two GOT entries for LD symbol */	\
-  _ (DTPOFF32, 21)		/* Offset in TLS block */		\
-  _ (GOTTPOFF, 22) /* 32 bit signed PC relative offset to GOT entry for IE symbol */ \
-  _ (TPOFF32, 23)		/* Offset in initial TLS, block) */
-
-typedef struct
-{
-  elf64_symbol_t *symbols;
-
-  u32 section_index;
-
-  u8 *string_table;
-
-  uword *symbol_by_name;
-} elf_symbol_table_t;
-
-always_inline void
-elf_symbol_table_free (elf_symbol_table_t * s)
-{
-  vec_free (s->symbols);
-  hash_free (s->symbol_by_name);
-}
-
-always_inline u8 *
-elf_symbol_name (elf_symbol_table_t * t, elf64_symbol_t * sym)
-{
-  return vec_elt_at_index (t->string_table, sym->name);
-}
-
-typedef struct
-{
-  elf_relocation_with_addend_t *relocations;
-
-  u32 section_index;
-} elf_relocation_table_t;
-
-always_inline void
-elf_relocation_table_free (elf_relocation_table_t * r)
-{
-  vec_free (r->relocations);
-}
-
-typedef struct
-{
-  elf64_section_header_t header;
-
-  u32 index;
-
-  /* Index of segments containing this section. */
-  uword *segment_index_bitmap;
-
-  /* Aligned size (included padding not included in
-     header.file_size). */
-  u64 align_size;
-
-  i64 exec_address_change;
-
-  u8 *contents;
-} elf_section_t;
-
-typedef struct
-{
-  elf64_segment_header_t header;
-
-  /* Sections contained in this segment. */
-  uword *section_index_bitmap;
-
-  u32 index;
-
-  u8 *contents;
-} elf_segment_t;
-
-typedef struct
-{
-  u8 need_byte_swap;
-
-  u8 parsed_symbols;
-
-  char *file_name;
-
-  elf_first_header_t first_header;
-
-  elf64_file_header_t file_header;
-
-  elf_segment_t *segments;
-
-  elf_section_t *sections;
-
-  uword *section_by_name;
-  uword *section_by_start_address;
-
-  elf_symbol_table_t *symbol_tables;
-  elf_relocation_table_t *relocation_tables;
-
-  char *interpreter;
-
-  elf64_dynamic_entry_t *dynamic_entries;
-  u8 *dynamic_string_table;
-  u32 dynamic_string_table_section_index;
-  u32 dynamic_symbol_table_section_index;
-  u32 dynamic_symbol_table_index;
-  u32 dynamic_section_index;
-  u16 *versym;
-  u32 versym_section_index;
-  elf_dynamic_version_need_union_t *verneed;
-  u32 verneed_section_index;
-} elf_main_t;
-
-always_inline void
-elf_main_init (elf_main_t * em)
-{
-  memset (em, 0, sizeof (em[0]));
-}
-
-always_inline void
-elf_main_free (elf_main_t * em)
-{
-  uword i;
-
-  for (i = 0; i < vec_len (em->segments); i++)
-    vec_free (em->segments[i].contents);
-  vec_free (em->segments);
-
-  for (i = 0; i < vec_len (em->sections); i++)
-    vec_free (em->sections[i].contents);
-  vec_free (em->sections);
-
-  hash_free (em->section_by_name);
-  for (i = 0; i < vec_len (em->symbol_tables); i++)
-    elf_symbol_table_free (em->symbol_tables + i);
-  for (i = 0; i < vec_len (em->relocation_tables); i++)
-    elf_relocation_table_free (em->relocation_tables + i);
-
-  vec_free (em->dynamic_entries);
-  vec_free (em->interpreter);
-}
-
-always_inline void
-elf_get_segment_contents (elf_main_t * em, void *data, uword segment_index)
-{
-  elf_segment_t *g = vec_elt_at_index (em->segments, segment_index);
-  if (!g->contents)
-    vec_add (g->contents, data + g->header.file_offset,
-	     g->header.memory_size);
-}
-
-always_inline void *
-elf_get_section_contents (elf_main_t * em,
-			  uword section_index, uword elt_size)
-{
-  elf_section_t *s;
-  void *result;
-
-  s = vec_elt_at_index (em->sections, section_index);
-
-  result = 0;
-  if (vec_len (s->contents) > 0)
-    {
-      /* Make vector copy of contents with given element size. */
-      result = _vec_resize (result,
-			    vec_len (s->contents) / elt_size,
-			    vec_len (s->contents),
-			    /* header_bytes */ 0,
-			    /* align */ 0);
-      clib_memcpy (result, s->contents, vec_len (s->contents));
-    }
-
-  return result;
-}
-
-always_inline void
-elf_set_section_contents (elf_main_t * em,
-			  uword section_index,
-			  void *new_contents, uword n_content_bytes)
-{
-  elf_section_t *s;
-
-  s = vec_elt_at_index (em->sections, section_index);
-  vec_free (s->contents);
-  vec_add (s->contents, new_contents, n_content_bytes);
-}
-
-always_inline u8 *
-elf_section_name (elf_main_t * em, elf_section_t * s)
-{
-  elf_section_t *es = vec_elt_at_index (em->sections,
-					em->
-					file_header.section_header_string_table_index);
-  return vec_elt_at_index (es->contents, s->header.name);
-}
-
-always_inline u8
-elf_swap_u8 (elf_main_t * em, u8 x)
-{
-  return x;
-}
-
-always_inline u16
-elf_swap_u16 (elf_main_t * em, u16 x)
-{
-  return em->need_byte_swap ? clib_byte_swap_u16 (x) : x;
-}
-
-always_inline u32
-elf_swap_u32 (elf_main_t * em, u32 x)
-{
-  return em->need_byte_swap ? clib_byte_swap_u32 (x) : x;
-}
-
-always_inline u64
-elf_swap_u64 (elf_main_t * em, u64 x)
-{
-  return em->need_byte_swap ? clib_byte_swap_u64 (x) : x;
-}
-
-#define FORMAT_ELF_MAIN_SYMBOLS (1 << 0)
-#define FORMAT_ELF_MAIN_RELOCATIONS (1 << 1)
-#define FORMAT_ELF_MAIN_DYNAMIC (1 << 2)
-
-format_function_t format_elf_main;
-format_function_t format_elf_symbol;
-
-clib_error_t *elf_read_file (elf_main_t * em, char *file_name);
-clib_error_t *elf_write_file (elf_main_t * em, char *file_name);
-clib_error_t *elf_delete_named_section (elf_main_t * em, char *section_name);
-clib_error_t *elf_parse (elf_main_t * em, void *data, uword data_bytes);
-void elf_parse_symbols (elf_main_t * em);
-
-clib_error_t *elf_get_section_by_name (elf_main_t * em, char *section_name,
-				       elf_section_t ** result);
-clib_error_t *elf_get_section_by_start_address (elf_main_t * em,
-						uword start_address,
-						elf_section_t ** result);
-
-void
-elf_create_section_with_contents (elf_main_t * em,
-				  char *section_name,
-				  elf64_section_header_t * header,
-				  void *contents, uword n_content_bytes);
-uword elf_delete_segment_with_type (elf_main_t * em,
-				    elf_segment_type_t segment_type);
-void elf_set_dynamic_entries (elf_main_t * em);
-
-#endif /* included_clib_elf_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/elf_clib.c b/vppinfra/vppinfra/elf_clib.c
deleted file mode 100644
index 7bb72ee3..00000000
--- a/vppinfra/vppinfra/elf_clib.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vppinfra/elf_clib.h>
-
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-typedef struct
-{
-  char **path;
-} path_search_t;
-
-always_inline void
-path_search_free (path_search_t * p)
-{
-  uword i;
-  for (i = 0; i < vec_len (p->path); i++)
-    vec_free (p->path[i]);
-  vec_free (p->path);
-}
-
-static char **
-split_string (char *string, u8 delimiter)
-{
-  char **result = 0;
-  char *p, *start, *s;
-
-  p = string;
-  while (1)
-    {
-      start = p;
-      while (*p != 0 && *p != delimiter)
-	p++;
-      s = 0;
-      vec_add (s, start, p - start);
-      vec_add1 (s, 0);
-      vec_add1 (result, s);
-      if (*p == 0)
-	break;
-      p++;
-    }
-
-  return result;
-}
-
-static int
-file_exists_and_is_executable (char *dir, char *file)
-{
-  char *path = (char *) format (0, "%s/%s%c", dir, file, 0);
-  struct stat s;
-  uword yes;
-
-  yes = (stat (path, &s) >= 0
-	 && S_ISREG (s.st_mode)
-	 && 0 != (s.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)));
-
-  vec_free (path);
-
-  return yes;
-}
-
-static char *
-path_search (char *file)
-{
-  path_search_t ps;
-  uword i;
-  char *result;
-
-  /* Relative or absolute path. */
-  if (file[0] == '.' || file[0] == '/')
-    return file;
-
-  if (getenv ("PATH") == 0)
-    return file;
-
-  ps.path = split_string (getenv ("PATH"), ':');
-
-  for (i = 0; i < vec_len (ps.path); i++)
-    if (file_exists_and_is_executable (ps.path[i], file))
-      break;
-
-  result = 0;
-  if (i < vec_len (ps.path))
-    result = (char *) format (0, "%s/%s%c", ps.path[i], file);
-
-  path_search_free (&ps);
-
-  return result;
-}
-
-static clib_error_t *
-clib_elf_parse_file (clib_elf_main_t * cem,
-		     char *file_name, void *link_address)
-{
-  elf_main_t *em;
-  elf_section_t *s;
-  int fd;
-  struct stat fd_stat;
-  uword mmap_length = 0;
-  void *data = 0;
-  clib_error_t *error = 0;
-
-  vec_add2 (cem->elf_mains, em, 1);
-
-  fd = open (file_name, 0);
-  if (fd < 0)
-    {
-      error = clib_error_return_unix (0, "open `%s'", file_name);
-      goto done;
-    }
-
-  if (fstat (fd, &fd_stat) < 0)
-    {
-      error = clib_error_return_unix (0, "fstat `%s'", file_name);
-      goto done;
-    }
-  mmap_length = fd_stat.st_size;
-
-  data = mmap (0, mmap_length, PROT_READ, MAP_SHARED, fd, /* offset */ 0);
-  if (~pointer_to_uword (data) == 0)
-    {
-      error = clib_error_return_unix (0, "mmap `%s'", file_name);
-      goto done;
-    }
-
-  error = elf_parse (em, data, mmap_length);
-  if (error)
-    goto done;
-
-  /* Look for CLIB special sections. */
-  {
-    char *section_name_start = CLIB_ELF_SECTION_ADD_PREFIX ();
-    uword section_name_start_len = strlen (section_name_start);
-
-    vec_foreach (s, em->sections)
-    {
-      u8 *name = elf_section_name (em, s);
-      uword *p;
-      clib_elf_section_t *vs;
-      clib_elf_section_bounds_t *b;
-
-      /* Section name must begin with CLIB_ELF_SECTION key. */
-      if (memcmp (name, section_name_start, section_name_start_len))
-	continue;
-
-      name += section_name_start_len;
-      p = hash_get_mem (cem->section_by_name, name);
-      if (p)
-	vs = vec_elt_at_index (cem->sections, p[0]);
-      else
-	{
-	  name = format (0, "%s%c", name, 0);
-	  if (!cem->section_by_name)
-	    cem->section_by_name = hash_create_string (0, sizeof (uword));
-	  hash_set_mem (cem->section_by_name, name, vec_len (cem->sections));
-	  vec_add2 (cem->sections, vs, 1);
-	  vs->name = name;
-	}
-
-      vec_add2 (vs->bounds, b, 1);
-      b->lo = link_address + s->header.exec_address;
-      b->hi = b->lo + s->header.file_size;
-    }
-  }
-
-  /* Parse symbols for this file. */
-  {
-    elf_symbol_table_t *t;
-    elf64_symbol_t *s;
-
-    elf_parse_symbols (em);
-    vec_foreach (t, em->symbol_tables)
-    {
-      vec_foreach (s, t->symbols)
-      {
-	s->value += pointer_to_uword (link_address);
-      }
-    }
-  }
-
-  /* No need to keep section contents around. */
-  {
-    elf_section_t *s;
-    vec_foreach (s, em->sections)
-    {
-      if (s->header.type != ELF_SECTION_STRING_TABLE)
-	vec_free (s->contents);
-    }
-  }
-
-done:
-  if (error)
-    elf_main_free (em);
-  if (fd >= 0)
-    close (fd);
-  if (data)
-    munmap (data, mmap_length);
-  return error;
-}
-
-#define __USE_GNU
-#include <link.h>
-
-static int
-add_section (struct dl_phdr_info *info, size_t size, void *opaque)
-{
-  clib_elf_main_t *cem = opaque;
-  clib_error_t *error;
-  char *name = (char *) info->dlpi_name;
-  void *addr = (void *) info->dlpi_addr;
-  uword is_main;
-
-  is_main = strlen (name) == 0;
-  if (is_main)
-    {
-      static int done;
-
-      /* Only do main program once. */
-      if (done++)
-	return 0;
-
-      name = path_search (cem->exec_path);
-      if (!name)
-	{
-	  clib_error ("failed to find %s on PATH", cem->exec_path);
-	  return 0;
-	}
-      addr = 0;
-    }
-
-  error = clib_elf_parse_file (cem, name, addr);
-  if (error)
-    clib_error_report (error);
-
-  if (is_main && name != cem->exec_path)
-    vec_free (name);
-
-  return 0;
-}
-
-static clib_elf_main_t clib_elf_main;
-
-void
-clib_elf_main_init (char *exec_path)
-{
-  clib_elf_main_t *cem = &clib_elf_main;
-
-  cem->exec_path = exec_path;
-
-  dl_iterate_phdr (add_section, cem);
-}
-
-clib_elf_section_bounds_t *
-clib_elf_get_section_bounds (char *name)
-{
-  clib_elf_main_t *em = &clib_elf_main;
-  uword *p = hash_get (em->section_by_name, name);
-  return p ? vec_elt_at_index (em->sections, p[0])->bounds : 0;
-}
-
-static uword
-symbol_by_address_or_name (char *by_name,
-			   uword by_address, clib_elf_symbol_t * s)
-{
-  clib_elf_main_t *cem = &clib_elf_main;
-  elf_main_t *em;
-
-  vec_foreach (em, cem->elf_mains)
-  {
-    elf_symbol_table_t *t;
-    s->elf_main_index = em - cem->elf_mains;
-    vec_foreach (t, em->symbol_tables)
-    {
-      s->symbol_table_index = t - em->symbol_tables;
-      if (by_name)
-	{
-	  uword *p = hash_get (t->symbol_by_name, by_name);
-	  if (p)
-	    {
-	      s->symbol = vec_elt (t->symbols, p[0]);
-	      return 1;
-	    }
-	}
-      else
-	{
-	  elf64_symbol_t *x;
-	  /* FIXME linear search. */
-	  vec_foreach (x, t->symbols)
-	  {
-	    if (by_address >= x->value && by_address < x->value + x->size)
-	      {
-		s->symbol = x[0];
-		return 1;
-	      }
-	  }
-	}
-    }
-  }
-
-  return 0;
-}
-
-uword
-clib_elf_symbol_by_name (char *by_name, clib_elf_symbol_t * s)
-{
-  return symbol_by_address_or_name (by_name, /* by_address */ 0, s);
-}
-
-uword
-clib_elf_symbol_by_address (uword by_address, clib_elf_symbol_t * s)
-{
-  return symbol_by_address_or_name ( /* by_name */ 0, by_address, s);
-}
-
-u8 *
-format_clib_elf_symbol (u8 * s, va_list * args)
-{
-  clib_elf_main_t *cem = &clib_elf_main;
-  clib_elf_symbol_t *sym = va_arg (*args, clib_elf_symbol_t *);
-  elf_main_t *em;
-  elf_symbol_table_t *t;
-
-  if (!sym)
-    /* Just print table headings. */
-    return format (s, "%U", format_elf_symbol, 0, 0, 0);
-
-  else
-    {
-      em = vec_elt_at_index (cem->elf_mains, sym->elf_main_index);
-      t = vec_elt_at_index (em->symbol_tables, sym->symbol_table_index);
-      return format (s, "%U", format_elf_symbol, em, t, &sym->symbol);
-    }
-}
-
-u8 *
-format_clib_elf_symbol_with_address (u8 * s, va_list * args)
-{
-  uword address = va_arg (*args, uword);
-  clib_elf_main_t *cem = &clib_elf_main;
-  clib_elf_symbol_t sym;
-  elf_main_t *em;
-  elf_symbol_table_t *t;
-
-  if (clib_elf_symbol_by_address (address, &sym))
-    {
-      em = vec_elt_at_index (cem->elf_mains, sym.elf_main_index);
-      t = vec_elt_at_index (em->symbol_tables, sym.symbol_table_index);
-      s = format (s, "%s + 0x%wx",
-		  elf_symbol_name (t, &sym.symbol),
-		  address - sym.symbol.value);
-    }
-  else
-    s = format (s, "0x%wx", address);
-
-  return s;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/elf_clib.h b/vppinfra/vppinfra/elf_clib.h
deleted file mode 100644
index 25b928c2..00000000
--- a/vppinfra/vppinfra/elf_clib.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2012 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_elf_self_h
-#define included_clib_elf_self_h
-
-#include <vppinfra/elf.h>
-#include <vppinfra/hash.h>
-
-#define CLIB_ELF_SECTION_DATA_ALIGN 32
-
-#define CLIB_ELF_SECTION_ADD_PREFIX(n) "clib_elf_section_" n
-
-/* Attribute used is so that static registrations work even if
-   variable is not referenced. */
-#define CLIB_ELF_SECTION(SECTION)					\
-   __attribute__ ((used,						\
-		   aligned (CLIB_ELF_SECTION_DATA_ALIGN),		\
-		   section (CLIB_ELF_SECTION_ADD_PREFIX (SECTION))))
-
-/* Given pointer to previous data A get next pointer.  EXTRA gives extra
-   space beyond A + 1 used in object. */
-#define clib_elf_section_data_next(a,extra)				\
-  uword_to_pointer (round_pow2 (pointer_to_uword (a + 1) + (extra),	\
-				CLIB_ELF_SECTION_DATA_ALIGN),		\
-		    void *)
-
-typedef struct
-{
-  void *lo, *hi;
-} clib_elf_section_bounds_t;
-
-typedef struct
-{
-  /* Vector of bounds for this section.  Multiple shared objects may have instances
-     of the same sections. */
-  clib_elf_section_bounds_t *bounds;
-
-  /* Name of ELF section (e.g. .text). */
-  u8 *name;
-} clib_elf_section_t;
-
-typedef struct
-{
-  /* Vector of sections. */
-  clib_elf_section_t *sections;
-
-  /* Hash map of name to section index. */
-  uword *section_by_name;
-
-  /* Unix path that we were exec()ed with. */
-  char *exec_path;
-
-  elf_main_t *elf_mains;
-} clib_elf_main_t;
-
-always_inline void
-clib_elf_main_free (clib_elf_main_t * m)
-{
-  clib_elf_section_t *s;
-  vec_foreach (s, m->sections)
-  {
-    vec_free (s->bounds);
-    vec_free (s->name);
-  }
-  vec_free (m->sections);
-  hash_free (m->section_by_name);
-
-  {
-    elf_main_t *em;
-    vec_foreach (em, m->elf_mains)
-    {
-      elf_main_free (em);
-    }
-    vec_free (m->elf_mains);
-  }
-}
-
-/* Call with exec_path equal to argv[0] from C main. */
-void clib_elf_main_init (char *exec_path);
-
-clib_elf_section_bounds_t *clib_elf_get_section_bounds (char *name);
-
-typedef struct
-{
-  /* The symbol. */
-  elf64_symbol_t symbol;
-
-  /* elf_main_t where symbol came from. */
-  u32 elf_main_index;
-
-  /* Symbol table in elf_main_t where this symbol came from. */
-  u32 symbol_table_index;
-} clib_elf_symbol_t;
-
-/* Returns 1 if found; otherwise zero. */
-uword clib_elf_symbol_by_name (char *name, clib_elf_symbol_t * result);
-uword clib_elf_symbol_by_address (uword address, clib_elf_symbol_t * result);
-
-format_function_t format_clib_elf_symbol, format_clib_elf_symbol_with_address;
-
-#endif /* included_clib_elf_self_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/elog.c b/vppinfra/vppinfra/elog.c
deleted file mode 100644
index e9f06d09..00000000
--- a/vppinfra/vppinfra/elog.c
+++ /dev/null
@@ -1,1061 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005,2009 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/elog.h>
-#include <vppinfra/cache.h>
-#include <vppinfra/error.h>
-#include <vppinfra/format.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/math.h>
-
-static inline void
-elog_lock (elog_main_t * em)
-{
-  if (PREDICT_FALSE (em->lock != 0))
-    while (__sync_lock_test_and_set (em->lock, 1))
-      ;
-}
-
-static inline void
-elog_unlock (elog_main_t * em)
-{
-  if (PREDICT_FALSE (em->lock != 0))
-    {
-      CLIB_MEMORY_BARRIER ();
-      *em->lock = 0;
-    }
-}
-
-/* Non-inline version. */
-void *
-elog_event_data (elog_main_t * em,
-		 elog_event_type_t * type, elog_track_t * track, u64 cpu_time)
-{
-  return elog_event_data_inline (em, type, track, cpu_time);
-}
-
-static void
-new_event_type (elog_main_t * em, uword i)
-{
-  elog_event_type_t *t = vec_elt_at_index (em->event_types, i);
-
-  if (!em->event_type_by_format)
-    em->event_type_by_format =
-      hash_create_vec ( /* size */ 0, sizeof (u8), sizeof (uword));
-
-  hash_set_mem (em->event_type_by_format, t->format, i);
-}
-
-static uword
-find_or_create_type (elog_main_t * em, elog_event_type_t * t)
-{
-  uword *p = hash_get_mem (em->event_type_by_format, t->format);
-  uword i;
-
-  if (p)
-    i = p[0];
-  else
-    {
-      i = vec_len (em->event_types);
-      vec_add1 (em->event_types, t[0]);
-      new_event_type (em, i);
-    }
-
-  return i;
-}
-
-/* External function to register types. */
-word
-elog_event_type_register (elog_main_t * em, elog_event_type_t * t)
-{
-  elog_event_type_t *static_type = t;
-  word l;
-
-  elog_lock (em);
-
-  l = vec_len (em->event_types);
-
-  t->type_index_plus_one = 1 + l;
-
-  ASSERT (t->format);
-
-  /* If format args are not specified try to be smart about providing defaults
-     so most of the time user does not have to specify them. */
-  if (!t->format_args)
-    {
-      uword i, l;
-      char *this_arg;
-
-      l = strlen (t->format);
-      for (i = 0; i < l; i++)
-	{
-	  if (t->format[i] != '%')
-	    continue;
-	  if (i + 1 >= l)
-	    continue;
-	  if (t->format[i + 1] == '%')	/* %% */
-	    continue;
-
-	  switch (t->format[i + 1])
-	    {
-	    default:
-	    case 'd':
-	    case 'x':
-	    case 'u':
-	      this_arg = "i4";	/* size of u32 */
-	      break;
-	    case 'f':
-	      this_arg = "f8";	/* defaults to f64 */
-	      break;
-	    case 's':
-	      this_arg = "s0";	/* defaults to null terminated string. */
-	      break;
-	    }
-
-	  t->format_args =
-	    (char *) format ((u8 *) t->format_args, "%s", this_arg);
-	}
-
-      /* Null terminate. */
-      vec_add1 (t->format_args, 0);
-    }
-
-  vec_add1 (em->event_types, t[0]);
-
-  t = em->event_types + l;
-
-  /* Make copies of strings for hashing etc. */
-  if (t->function)
-    t->format = (char *) format (0, "%s %s%c", t->function, t->format, 0);
-  else
-    t->format = (char *) format (0, "%s%c", t->format, 0);
-
-  t->format_args = (char *) format (0, "%s%c", t->format_args, 0);
-
-  /* Construct string table. */
-  {
-    uword i;
-    t->n_enum_strings = static_type->n_enum_strings;
-    for (i = 0; i < t->n_enum_strings; i++)
-      {
-	if (!static_type->enum_strings[i])
-	  static_type->enum_strings[i] = "MISSING";
-	vec_add1 (t->enum_strings_vector,
-		  (char *) format (0, "%s%c", static_type->enum_strings[i],
-				   0));
-      }
-  }
-
-  new_event_type (em, l);
-  elog_unlock (em);
-
-  return l;
-}
-
-word
-elog_track_register (elog_main_t * em, elog_track_t * t)
-{
-  word l;
-
-  elog_lock (em);
-
-  l = vec_len (em->tracks);
-
-  t->track_index_plus_one = 1 + l;
-
-  ASSERT (t->name);
-
-  vec_add1 (em->tracks, t[0]);
-
-  t = em->tracks + l;
-
-  t->name = (char *) format (0, "%s%c", t->name, 0);
-
-  elog_unlock (em);
-
-  return l;
-}
-
-static uword
-parse_2digit_decimal (char *p, uword * number)
-{
-  uword i = 0;
-  u8 digits[2];
-
-  digits[0] = digits[1] = 0;
-  while (p[i] >= '0' && p[i] <= '9')
-    {
-      if (i >= 2)
-	break;
-      digits[i] = p[i] - '0';
-      i++;
-    }
-
-  if (i >= 1 && i <= 2)
-    {
-      if (i == 1)
-	*number = digits[0];
-      else
-	*number = 10 * digits[0] + digits[1];
-      return i;
-    }
-  else
-    return 0;
-}
-
-static u8 *
-fixed_format (u8 * s, char *fmt, char *result, uword * result_len)
-{
-  char *f = fmt;
-  char *percent;
-  uword l = 0;
-
-  while (1)
-    {
-      if (f[0] == 0)
-	break;
-      if (f[0] == '%' && f[1] != '%')
-	break;
-      f++;
-    }
-  if (f > fmt)
-    vec_add (s, fmt, f - fmt);
-
-  if (f[0] != '%')
-    goto done;
-
-  /* Skip percent. */
-  percent = f++;
-
-  /* Skip possible +-= justification. */
-  f += f[0] == '+' || f[0] == '-' || f[0] == '=';
-
-  /* Skip possible X.Y width. */
-  while ((f[0] >= '0' && f[0] <= '9') || f[0] == '.')
-    f++;
-
-  /* Skip wlL as in e.g. %Ld. */
-  f += f[0] == 'w' || f[0] == 'l' || f[0] == 'L';
-
-  /* Finally skip format letter. */
-  f += f[0] != 0;
-
-  ASSERT (*result_len > f - percent);
-  l = clib_min (f - percent, *result_len - 1);
-  clib_memcpy (result, percent, l);
-  result[l] = 0;
-
-done:
-  *result_len = f - fmt;
-  return s;
-}
-
-u8 *
-format_elog_event (u8 * s, va_list * va)
-{
-  elog_main_t *em = va_arg (*va, elog_main_t *);
-  elog_event_t *e = va_arg (*va, elog_event_t *);
-  elog_event_type_t *t;
-  char *a, *f;
-  void *d = (u8 *) e->data;
-  char arg_format[64];
-
-  t = vec_elt_at_index (em->event_types, e->type);
-
-  f = t->format;
-  a = t->format_args;
-  while (1)
-    {
-      uword n_bytes = 0, n_digits, f_bytes = 0;
-
-      f_bytes = sizeof (arg_format);
-      s = fixed_format (s, f, arg_format, &f_bytes);
-      f += f_bytes;
-
-      if (a == 0 || a[0] == 0)
-	{
-	  /* Format must also be at end. */
-	  ASSERT (f[0] == 0);
-	  break;
-	}
-
-      /* Don't go past end of event data. */
-      ASSERT (d < (void *) (e->data + sizeof (e->data)));
-
-      n_digits = parse_2digit_decimal (a + 1, &n_bytes);
-      switch (a[0])
-	{
-	case 'i':
-	case 't':
-	case 'T':
-	  {
-	    u32 i = 0;
-	    u64 l = 0;
-
-	    if (n_bytes == 1)
-	      i = ((u8 *) d)[0];
-	    else if (n_bytes == 2)
-	      i = clib_mem_unaligned (d, u16);
-	    else if (n_bytes == 4)
-	      i = clib_mem_unaligned (d, u32);
-	    else if (n_bytes == 8)
-	      l = clib_mem_unaligned (d, u64);
-	    else
-	      ASSERT (0);
-	    if (a[0] == 't')
-	      {
-		char *e =
-		  vec_elt (t->enum_strings_vector, n_bytes == 8 ? l : i);
-		s = format (s, arg_format, e);
-	      }
-	    else if (a[0] == 'T')
-	      {
-		char *e =
-		  vec_elt_at_index (em->string_table, n_bytes == 8 ? l : i);
-		s = format (s, arg_format, e);
-	      }
-	    else if (n_bytes == 8)
-	      s = format (s, arg_format, l);
-	    else
-	      s = format (s, arg_format, i);
-	  }
-	  break;
-
-	case 'f':
-	  {
-	    f64 x = 0;
-	    if (n_bytes == 4)
-	      x = clib_mem_unaligned (d, f32);
-	    else if (n_bytes == 8)
-	      x = clib_mem_unaligned (d, f64);
-	    else
-	      ASSERT (0);
-	    s = format (s, arg_format, x);
-	  }
-	  break;
-
-	case 's':
-	  s = format (s, arg_format, d);
-	  if (n_bytes == 0)
-	    n_bytes = strlen (d) + 1;
-	  break;
-
-	default:
-	  ASSERT (0);
-	  break;
-	}
-
-      ASSERT (n_digits > 0 && n_digits <= 2);
-      a += 1 + n_digits;
-      d += n_bytes;
-    }
-
-  return s;
-}
-
-u8 *
-format_elog_track (u8 * s, va_list * va)
-{
-  elog_main_t *em = va_arg (*va, elog_main_t *);
-  elog_event_t *e = va_arg (*va, elog_event_t *);
-  elog_track_t *t = vec_elt_at_index (em->tracks, e->track);
-  return format (s, "%s", t->name);
-}
-
-void
-elog_time_now (elog_time_stamp_t * et)
-{
-  u64 cpu_time_now, os_time_now_nsec;
-
-#ifdef CLIB_UNIX
-  {
-#include <sys/syscall.h>
-    struct timespec ts;
-    syscall (SYS_clock_gettime, CLOCK_REALTIME, &ts);
-    cpu_time_now = clib_cpu_time_now ();
-    os_time_now_nsec = 1e9 * ts.tv_sec + ts.tv_nsec;
-  }
-#else
-  cpu_time_now = clib_cpu_time_now ();
-  os_time_now_nsec = 0;
-#endif
-
-  et->cpu = cpu_time_now;
-  et->os_nsec = os_time_now_nsec;
-}
-
-always_inline i64
-elog_time_stamp_diff_os_nsec (elog_time_stamp_t * t1, elog_time_stamp_t * t2)
-{
-  return (i64) t1->os_nsec - (i64) t2->os_nsec;
-}
-
-always_inline i64
-elog_time_stamp_diff_cpu (elog_time_stamp_t * t1, elog_time_stamp_t * t2)
-{
-  return (i64) t1->cpu - (i64) t2->cpu;
-}
-
-always_inline f64
-elog_nsec_per_clock (elog_main_t * em)
-{
-  return ((f64) elog_time_stamp_diff_os_nsec (&em->serialize_time,
-					      &em->init_time)
-	  / (f64) elog_time_stamp_diff_cpu (&em->serialize_time,
-					    &em->init_time));
-}
-
-void
-elog_alloc (elog_main_t * em, u32 n_events)
-{
-  if (em->event_ring)
-    vec_free (em->event_ring);
-
-  /* Ring size must be a power of 2. */
-  em->event_ring_size = n_events = max_pow2 (n_events);
-
-  /* Leave an empty ievent at end so we can always speculatively write
-     and event there (possibly a long form event). */
-  vec_resize_aligned (em->event_ring, n_events, CLIB_CACHE_LINE_BYTES);
-}
-
-void
-elog_init (elog_main_t * em, u32 n_events)
-{
-  memset (em, 0, sizeof (em[0]));
-
-  em->lock = 0;
-
-  if (n_events > 0)
-    elog_alloc (em, n_events);
-
-  clib_time_init (&em->cpu_timer);
-
-  em->n_total_events_disable_limit = ~0;
-
-  /* Make track 0. */
-  em->default_track.name = "default";
-  elog_track_register (em, &em->default_track);
-
-  elog_time_now (&em->init_time);
-}
-
-/* Returns number of events in ring and start index. */
-static uword
-elog_event_range (elog_main_t * em, uword * lo)
-{
-  uword l = em->event_ring_size;
-  u64 i = em->n_total_events;
-
-  /* Ring never wrapped? */
-  if (i <= (u64) l)
-    {
-      if (lo)
-	*lo = 0;
-      return i;
-    }
-  else
-    {
-      if (lo)
-	*lo = i & (l - 1);
-      return l;
-    }
-}
-
-elog_event_t *
-elog_peek_events (elog_main_t * em)
-{
-  elog_event_t *e, *f, *es = 0;
-  uword i, j, n;
-
-  n = elog_event_range (em, &j);
-  for (i = 0; i < n; i++)
-    {
-      vec_add2 (es, e, 1);
-      f = vec_elt_at_index (em->event_ring, j);
-      e[0] = f[0];
-
-      /* Convert absolute time from cycles to seconds from start. */
-      e->time =
-	(e->time_cycles -
-	 em->init_time.cpu) * em->cpu_timer.seconds_per_clock;
-
-      j = (j + 1) & (em->event_ring_size - 1);
-    }
-
-  return es;
-}
-
-/* Add a formatted string to the string table. */
-u32
-elog_string (elog_main_t * em, char *fmt, ...)
-{
-  u32 offset;
-  va_list va;
-
-  va_start (va, fmt);
-  offset = vec_len (em->string_table);
-  em->string_table = (char *) va_format ((u8 *) em->string_table, fmt, &va);
-  va_end (va);
-
-  /* Null terminate string if it is not already. */
-  if (vec_end (em->string_table)[-1] != 0)
-    vec_add1 (em->string_table, 0);
-
-  return offset;
-}
-
-elog_event_t *
-elog_get_events (elog_main_t * em)
-{
-  if (!em->events)
-    em->events = elog_peek_events (em);
-  return em->events;
-}
-
-static void
-maybe_fix_string_table_offset (elog_event_t * e,
-			       elog_event_type_t * t, u32 offset)
-{
-  void *d = (u8 *) e->data;
-  char *a;
-
-  if (offset == 0)
-    return;
-
-  a = t->format_args;
-
-  while (1)
-    {
-      uword n_bytes = 0, n_digits;
-
-      if (a[0] == 0)
-	break;
-
-      /* Don't go past end of event data. */
-      ASSERT (d < (void *) (e->data + sizeof (e->data)));
-
-      n_digits = parse_2digit_decimal (a + 1, &n_bytes);
-      switch (a[0])
-	{
-	case 'T':
-	  ASSERT (n_bytes == 4);
-	  clib_mem_unaligned (d, u32) += offset;
-	  break;
-
-	case 'i':
-	case 't':
-	case 'f':
-	case 's':
-	  break;
-
-	default:
-	  ASSERT (0);
-	  break;
-	}
-
-      ASSERT (n_digits > 0 && n_digits <= 2);
-      a += 1 + n_digits;
-      d += n_bytes;
-    }
-}
-
-static int
-elog_cmp (void *a1, void *a2)
-{
-  elog_event_t *e1 = a1;
-  elog_event_t *e2 = a2;
-
-  return e1->time - e2->time;
-}
-
-void
-elog_merge (elog_main_t * dst, u8 * dst_tag, elog_main_t * src, u8 * src_tag)
-{
-  elog_event_t *e;
-  uword l;
-  u32 string_table_offset_for_src_events;
-  u32 track_offset_for_src_tracks;
-  elog_track_t newt;
-  int i;
-
-  memset (&newt, 0, sizeof (newt));
-
-  elog_get_events (src);
-  elog_get_events (dst);
-
-  string_table_offset_for_src_events = vec_len (dst->string_table);
-  vec_append (dst->string_table, src->string_table);
-
-  l = vec_len (dst->events);
-  vec_add (dst->events, src->events, vec_len (src->events));
-
-  /* Prepend the supplied tag (if any) to all dst track names */
-  if (dst_tag)
-    {
-      for (i = 0; i < vec_len (dst->tracks); i++)
-	{
-	  elog_track_t *t = vec_elt_at_index (dst->tracks, i);
-	  char *new_name;
-
-	  new_name = (char *) format (0, "%s:%s%c", dst_tag, t->name, 0);
-	  vec_free (t->name);
-	  t->name = new_name;
-	}
-    }
-
-  track_offset_for_src_tracks = vec_len (dst->tracks);
-
-  /* Copy / tag source tracks */
-  for (i = 0; i < vec_len (src->tracks); i++)
-    {
-      elog_track_t *t = vec_elt_at_index (src->tracks, i);
-      if (src_tag)
-	newt.name = (char *) format (0, "%s:%s%c", src_tag, t->name, 0);
-      else
-	newt.name = (char *) format (0, "%s%c", t->name, 0);
-      (void) elog_track_register (dst, &newt);
-      vec_free (newt.name);
-    }
-
-  /* Across all (copied) src events... */
-  for (e = dst->events + l; e < vec_end (dst->events); e++)
-    {
-      elog_event_type_t *t = vec_elt_at_index (src->event_types, e->type);
-
-      /* Remap type from src -> dst. */
-      e->type = find_or_create_type (dst, t);
-
-      /* Remap string table offsets for 'T' format args */
-      maybe_fix_string_table_offset (e, t,
-				     string_table_offset_for_src_events);
-
-      /* Remap track */
-      e->track += track_offset_for_src_tracks;
-    }
-
-  /* Adjust event times for relative starting times of event streams. */
-  {
-    f64 dt_event, dt_os_nsec, dt_clock_nsec;
-
-    /* Set clock parameters if dst was not generated by unserialize. */
-    if (dst->serialize_time.cpu == 0)
-      {
-	dst->init_time = src->init_time;
-	dst->serialize_time = src->serialize_time;
-	dst->nsec_per_cpu_clock = src->nsec_per_cpu_clock;
-      }
-
-    dt_os_nsec =
-      elog_time_stamp_diff_os_nsec (&src->init_time, &dst->init_time);
-
-    dt_event = dt_os_nsec;
-    dt_clock_nsec =
-      (elog_time_stamp_diff_cpu (&src->init_time, &dst->init_time) * .5 *
-       (dst->nsec_per_cpu_clock + src->nsec_per_cpu_clock));
-
-    /* Heuristic to see if src/dst came from same time source.
-       If frequencies are "the same" and os clock and cpu clock agree
-       to within 100e-9 secs about time difference between src/dst
-       init_time, then we use cpu clock.  Otherwise we use OS clock. */
-    if (fabs (src->nsec_per_cpu_clock - dst->nsec_per_cpu_clock) < 1e-2
-	&& fabs (dt_os_nsec - dt_clock_nsec) < 100)
-      dt_event = dt_clock_nsec;
-
-    /* Convert to seconds. */
-    dt_event *= 1e-9;
-
-    if (dt_event > 0)
-      {
-	/* Src started after dst. */
-	for (e = dst->events + l; e < vec_end (dst->events); e++)
-	  e->time += dt_event;
-      }
-    else
-      {
-	/* Dst started after src. */
-	for (e = dst->events + 0; e < dst->events + l; e++)
-	  e->time += dt_event;
-      }
-  }
-
-  /* Sort events by increasing time. */
-  vec_sort_with_function (dst->events, elog_cmp);
-
-  /* Recreate the event ring or the results won't serialize */
-  {
-    int i;
-
-    ASSERT (dst->cpu_timer.seconds_per_clock);
-
-    elog_alloc (dst, vec_len (dst->events));
-    for (i = 0; i < vec_len (dst->events); i++)
-      {
-	elog_event_t *es, *ed;
-
-	es = dst->events + i;
-	ed = dst->event_ring + i;
-
-	ed[0] = es[0];
-
-	/* Invert elog_peek_events calculation */
-	ed->time_cycles =
-	  (es->time / dst->cpu_timer.seconds_per_clock) + dst->init_time.cpu;
-      }
-    dst->n_total_events = vec_len (dst->events);
-  }
-}
-
-static void
-serialize_elog_event (serialize_main_t * m, va_list * va)
-{
-  elog_main_t *em = va_arg (*va, elog_main_t *);
-  elog_event_t *e = va_arg (*va, elog_event_t *);
-  elog_event_type_t *t = vec_elt_at_index (em->event_types, e->type);
-  u8 *d = e->data;
-  u8 *p = (u8 *) t->format_args;
-
-  serialize_integer (m, e->type, sizeof (e->type));
-  serialize_integer (m, e->track, sizeof (e->track));
-  serialize (m, serialize_f64, e->time);
-
-  while (*p)
-    {
-      uword n_digits, n_bytes = 0;
-
-      n_digits = parse_2digit_decimal ((char *) p + 1, &n_bytes);
-
-      switch (p[0])
-	{
-	case 'i':
-	case 't':
-	case 'T':
-	  if (n_bytes == 1)
-	    serialize_integer (m, d[0], sizeof (u8));
-	  else if (n_bytes == 2)
-	    serialize_integer (m, clib_mem_unaligned (d, u16), sizeof (u16));
-	  else if (n_bytes == 4)
-	    serialize_integer (m, clib_mem_unaligned (d, u32), sizeof (u32));
-	  else if (n_bytes == 8)
-	    serialize (m, serialize_64, clib_mem_unaligned (d, u64));
-	  else
-	    ASSERT (0);
-	  break;
-
-	case 's':
-	  serialize_cstring (m, (char *) d);
-	  if (n_bytes == 0)
-	    n_bytes = strlen ((char *) d) + 1;
-	  break;
-
-	case 'f':
-	  if (n_bytes == 4)
-	    serialize (m, serialize_f32, clib_mem_unaligned (d, f32));
-	  else if (n_bytes == 8)
-	    serialize (m, serialize_f64, clib_mem_unaligned (d, f64));
-	  else
-	    ASSERT (0);
-	  break;
-
-	default:
-	  ASSERT (0);
-	  break;
-	}
-
-      p += 1 + n_digits;
-      d += n_bytes;
-    }
-}
-
-static void
-unserialize_elog_event (serialize_main_t * m, va_list * va)
-{
-  elog_main_t *em = va_arg (*va, elog_main_t *);
-  elog_event_t *e = va_arg (*va, elog_event_t *);
-  elog_event_type_t *t;
-  u8 *p, *d;
-
-  {
-    u16 tmp[2];
-
-    unserialize_integer (m, &tmp[0], sizeof (e->type));
-    unserialize_integer (m, &tmp[1], sizeof (e->track));
-
-    e->type = tmp[0];
-    e->track = tmp[1];
-
-    /* Make sure it fits. */
-    ASSERT (e->type == tmp[0]);
-    ASSERT (e->track == tmp[1]);
-  }
-
-  t = vec_elt_at_index (em->event_types, e->type);
-
-  unserialize (m, unserialize_f64, &e->time);
-
-  d = e->data;
-  p = (u8 *) t->format_args;
-
-  while (p && *p)
-    {
-      uword n_digits, n_bytes = 0;
-      u32 tmp;
-
-      n_digits = parse_2digit_decimal ((char *) p + 1, &n_bytes);
-
-      switch (p[0])
-	{
-	case 'i':
-	case 't':
-	case 'T':
-	  if (n_bytes == 1)
-	    {
-	      unserialize_integer (m, &tmp, sizeof (u8));
-	      d[0] = tmp;
-	    }
-	  else if (n_bytes == 2)
-	    {
-	      unserialize_integer (m, &tmp, sizeof (u16));
-	      clib_mem_unaligned (d, u16) = tmp;
-	    }
-	  else if (n_bytes == 4)
-	    {
-	      unserialize_integer (m, &tmp, sizeof (u32));
-	      clib_mem_unaligned (d, u32) = tmp;
-	    }
-	  else if (n_bytes == 8)
-	    {
-	      u64 x;
-	      unserialize (m, unserialize_64, &x);
-	      clib_mem_unaligned (d, u64) = x;
-	    }
-	  else
-	    ASSERT (0);
-	  break;
-
-	case 's':
-	  {
-	    char *t;
-	    unserialize_cstring (m, &t);
-	    if (n_bytes == 0)
-	      n_bytes = strlen (t) + 1;
-	    clib_memcpy (d, t, clib_min (n_bytes, vec_len (t)));
-	    vec_free (t);
-	    break;
-	  }
-
-	case 'f':
-	  if (n_bytes == 4)
-	    {
-	      f32 x;
-	      unserialize (m, unserialize_f32, &x);
-	      clib_mem_unaligned (d, f32) = x;
-	    }
-	  else if (n_bytes == 8)
-	    {
-	      f64 x;
-	      unserialize (m, unserialize_f64, &x);
-	      clib_mem_unaligned (d, f64) = x;
-	    }
-	  else
-	    ASSERT (0);
-	  break;
-
-	default:
-	  ASSERT (0);
-	  break;
-	}
-
-      p += 1 + n_digits;
-      d += n_bytes;
-    }
-}
-
-static void
-serialize_elog_event_type (serialize_main_t * m, va_list * va)
-{
-  elog_event_type_t *t = va_arg (*va, elog_event_type_t *);
-  int n = va_arg (*va, int);
-  int i, j;
-  for (i = 0; i < n; i++)
-    {
-      serialize_cstring (m, t[i].format);
-      serialize_cstring (m, t[i].format_args);
-      serialize_integer (m, t[i].type_index_plus_one,
-			 sizeof (t->type_index_plus_one));
-      serialize_integer (m, t[i].n_enum_strings,
-			 sizeof (t[i].n_enum_strings));
-      for (j = 0; j < t[i].n_enum_strings; j++)
-	serialize_cstring (m, t[i].enum_strings_vector[j]);
-    }
-}
-
-static void
-unserialize_elog_event_type (serialize_main_t * m, va_list * va)
-{
-  elog_event_type_t *t = va_arg (*va, elog_event_type_t *);
-  int n = va_arg (*va, int);
-  int i, j;
-  for (i = 0; i < n; i++)
-    {
-      unserialize_cstring (m, &t[i].format);
-      unserialize_cstring (m, &t[i].format_args);
-      unserialize_integer (m, &t[i].type_index_plus_one,
-			   sizeof (t->type_index_plus_one));
-      unserialize_integer (m, &t[i].n_enum_strings,
-			   sizeof (t[i].n_enum_strings));
-      vec_resize (t[i].enum_strings_vector, t[i].n_enum_strings);
-      for (j = 0; j < t[i].n_enum_strings; j++)
-	unserialize_cstring (m, &t[i].enum_strings_vector[j]);
-    }
-}
-
-static void
-serialize_elog_track (serialize_main_t * m, va_list * va)
-{
-  elog_track_t *t = va_arg (*va, elog_track_t *);
-  int n = va_arg (*va, int);
-  int i;
-  for (i = 0; i < n; i++)
-    {
-      serialize_cstring (m, t[i].name);
-    }
-}
-
-static void
-unserialize_elog_track (serialize_main_t * m, va_list * va)
-{
-  elog_track_t *t = va_arg (*va, elog_track_t *);
-  int n = va_arg (*va, int);
-  int i;
-  for (i = 0; i < n; i++)
-    {
-      unserialize_cstring (m, &t[i].name);
-    }
-}
-
-static void
-serialize_elog_time_stamp (serialize_main_t * m, va_list * va)
-{
-  elog_time_stamp_t *st = va_arg (*va, elog_time_stamp_t *);
-  serialize (m, serialize_64, st->os_nsec);
-  serialize (m, serialize_64, st->cpu);
-}
-
-static void
-unserialize_elog_time_stamp (serialize_main_t * m, va_list * va)
-{
-  elog_time_stamp_t *st = va_arg (*va, elog_time_stamp_t *);
-  unserialize (m, unserialize_64, &st->os_nsec);
-  unserialize (m, unserialize_64, &st->cpu);
-}
-
-static char *elog_serialize_magic = "elog v0";
-
-void
-serialize_elog_main (serialize_main_t * m, va_list * va)
-{
-  elog_main_t *em = va_arg (*va, elog_main_t *);
-  elog_event_t *e;
-
-  serialize_magic (m, elog_serialize_magic, strlen (elog_serialize_magic));
-
-  serialize_integer (m, em->event_ring_size, sizeof (u32));
-
-  elog_time_now (&em->serialize_time);
-  serialize (m, serialize_elog_time_stamp, &em->serialize_time);
-  serialize (m, serialize_elog_time_stamp, &em->init_time);
-
-  vec_serialize (m, em->event_types, serialize_elog_event_type);
-  vec_serialize (m, em->tracks, serialize_elog_track);
-  vec_serialize (m, em->string_table, serialize_vec_8);
-
-  /* Free old events (cached) in case they have changed. */
-  vec_free (em->events);
-  elog_get_events (em);
-
-  serialize_integer (m, vec_len (em->events), sizeof (u32));
-
-  /* SMP logs can easily have local time paradoxes... */
-  vec_sort_with_function (em->events, elog_cmp);
-
-  vec_foreach (e, em->events) serialize (m, serialize_elog_event, em, e);
-}
-
-void
-unserialize_elog_main (serialize_main_t * m, va_list * va)
-{
-  elog_main_t *em = va_arg (*va, elog_main_t *);
-  uword i;
-  u32 rs;
-
-  unserialize_check_magic (m, elog_serialize_magic,
-			   strlen (elog_serialize_magic));
-
-  unserialize_integer (m, &rs, sizeof (u32));
-  em->event_ring_size = rs;
-  elog_init (em, em->event_ring_size);
-
-  unserialize (m, unserialize_elog_time_stamp, &em->serialize_time);
-  unserialize (m, unserialize_elog_time_stamp, &em->init_time);
-  em->nsec_per_cpu_clock = elog_nsec_per_clock (em);
-
-  vec_unserialize (m, &em->event_types, unserialize_elog_event_type);
-  for (i = 0; i < vec_len (em->event_types); i++)
-    new_event_type (em, i);
-
-  vec_unserialize (m, &em->tracks, unserialize_elog_track);
-  vec_unserialize (m, &em->string_table, unserialize_vec_8);
-
-  {
-    u32 ne;
-    elog_event_t *e;
-
-    unserialize_integer (m, &ne, sizeof (u32));
-    vec_resize (em->events, ne);
-    vec_foreach (e, em->events)
-      unserialize (m, unserialize_elog_event, em, e);
-  }
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/elog.h b/vppinfra/vppinfra/elog.h
deleted file mode 100644
index 9756fb83..00000000
--- a/vppinfra/vppinfra/elog.h
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005,2009 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-/* High speed event logging with much thanks to Dave Barach. */
-
-#ifndef included_clib_elog_h
-#define included_clib_elog_h
-
-#include <vppinfra/cache.h>
-#include <vppinfra/error.h>	/* for ASSERT */
-#include <vppinfra/serialize.h>
-#include <vppinfra/time.h>	/* for clib_cpu_time_now */
-#include <vppinfra/mhash.h>
-
-typedef struct
-{
-  union
-  {
-    /* Absolute time stamp in CPU clock cycles. */
-    u64 time_cycles;
-
-    /* Absolute time as floating point number in seconds. */
-    f64 time;
-  };
-
-  /* Event type index. */
-  u16 type;
-
-  /* Track for this event.  Tracks allow events to be sorted and
-     displayed by track.  Think of 2 dimensional display with time and
-     track being the x and y axes. */
-  u16 track;
-
-  /* 20-bytes of data follows and pads to 32 bytes. */
-  u8 data[20];
-} elog_event_t;
-
-typedef struct
-{
-  /* Type index plus one assigned to this type.
-     This is used to mark type as seen. */
-  u32 type_index_plus_one;
-
-  /* String table as a vector constructed when type is registered. */
-  char **enum_strings_vector;
-
-  /* Format string. (example: "my-event (%d,%d)"). */
-  char *format;
-
-  /* Specifies how arguments to format are parsed from event data.
-     String of characters '0' '1' or '2' '3' to specify log2 size of data
-     (e.g. for u8, u16, u32 or u64),
-     's' means a null-terminated C string
-     't' means argument is an index into enum string table for this type.
-     'e' is a float,
-     'f' is a double. */
-  char *format_args;
-
-  /* Function name generating event. */
-  char *function;
-
-  /* Number of elements in string enum table. */
-  u32 n_enum_strings;
-
-  /* String table for enum/number to string formatting. */
-  char *enum_strings[];
-} elog_event_type_t;
-
-typedef struct
-{
-  /* Track name vector. */
-  char *name;
-
-  /* Set to one when track has been added to
-     main structure. */
-  u32 track_index_plus_one;
-} elog_track_t;
-
-typedef struct
-{
-  /* CPU cycle counter. */
-  u64 cpu;
-
-  /* OS timer in nano secs since epoch Jan 1 1970. */
-  u64 os_nsec;
-} elog_time_stamp_t;
-
-typedef struct
-{
-  /* Total number of events in buffer. */
-  u32 n_total_events;
-
-  /* When count reaches limit logging is disabled.  This is
-     used for event triggers. */
-  u32 n_total_events_disable_limit;
-
-  /* Dummy event to use when logger is disabled. */
-  elog_event_t dummy_event;
-
-  /* Power of 2 number of elements in ring. */
-  uword event_ring_size;
-
-  /* Vector of events (circular buffer).  Power of 2 size.
-     Used when events are being collected. */
-  elog_event_t *event_ring;
-
-  /* Vector of event types. */
-  elog_event_type_t *event_types;
-
-  /* Hash table mapping type format to type index. */
-  uword *event_type_by_format;
-
-  /* Events may refer to strings in string table. */
-  char *string_table;
-
-  /* Vector of tracks. */
-  elog_track_t *tracks;
-
-  /* Default track. */
-  elog_track_t default_track;
-
-  /* Place holder for CPU clock frequency. */
-  clib_time_t cpu_timer;
-
-  elog_time_stamp_t init_time, serialize_time;
-
-  /* SMP lock, non-zero means locking required */
-  uword *lock;
-
-  /* Use serialize_time and init_time to give estimate for
-     cpu clock frequency. */
-  f64 nsec_per_cpu_clock;
-
-  /* Vector of events converted to generic form after collection. */
-  elog_event_t *events;
-} elog_main_t;
-
-always_inline uword
-elog_n_events_in_buffer (elog_main_t * em)
-{
-  return clib_min (em->n_total_events, em->event_ring_size);
-}
-
-always_inline uword
-elog_buffer_capacity (elog_main_t * em)
-{
-  return em->event_ring_size;
-}
-
-always_inline void
-elog_reset_buffer (elog_main_t * em)
-{
-  em->n_total_events = 0;
-  em->n_total_events_disable_limit = ~0;
-}
-
-always_inline void
-elog_enable_disable (elog_main_t * em, int is_enabled)
-{
-  em->n_total_events = 0;
-  em->n_total_events_disable_limit = is_enabled ? ~0 : 0;
-}
-
-/* Disable logging after specified number of ievents have been logged.
-   This is used as a "debug trigger" when a certain event has occurred.
-   Events will be logged both before and after the "event" but the
-   event will not be lost as long as N < RING_SIZE. */
-always_inline void
-elog_disable_after_events (elog_main_t * em, uword n)
-{
-  em->n_total_events_disable_limit = em->n_total_events + n;
-}
-
-/* Signal a trigger.  We do this when we encounter an event that we want to save
-   context around (before and after). */
-always_inline void
-elog_disable_trigger (elog_main_t * em)
-{
-  em->n_total_events_disable_limit =
-    em->n_total_events + vec_len (em->event_ring) / 2;
-}
-
-/* External function to register types/tracks. */
-word elog_event_type_register (elog_main_t * em, elog_event_type_t * t);
-word elog_track_register (elog_main_t * em, elog_track_t * t);
-
-always_inline uword
-elog_is_enabled (elog_main_t * em)
-{
-  return em->n_total_events < em->n_total_events_disable_limit;
-}
-
-/* Add an event to the log.  Returns a pointer to the
-   data for caller to write into. */
-always_inline void *
-elog_event_data_inline (elog_main_t * em,
-			elog_event_type_t * type,
-			elog_track_t * track, u64 cpu_time)
-{
-  elog_event_t *e;
-  uword ei;
-  word type_index, track_index;
-
-  /* Return the user dummy memory to scribble data into. */
-  if (PREDICT_FALSE (!elog_is_enabled (em)))
-    return em->dummy_event.data;
-
-  type_index = (word) type->type_index_plus_one - 1;
-  track_index = (word) track->track_index_plus_one - 1;
-  if (PREDICT_FALSE ((type_index | track_index) < 0))
-    {
-      if (type_index < 0)
-	type_index = elog_event_type_register (em, type);
-      if (track_index < 0)
-	track_index = elog_track_register (em, track);
-    }
-
-  ASSERT (type_index < vec_len (em->event_types));
-  ASSERT (track_index < vec_len (em->tracks));
-  ASSERT (is_pow2 (vec_len (em->event_ring)));
-
-  if (em->lock)
-    ei = clib_smp_atomic_add (&em->n_total_events, 1);
-  else
-    ei = em->n_total_events++;
-
-  ei &= em->event_ring_size - 1;
-  e = vec_elt_at_index (em->event_ring, ei);
-
-  e->time_cycles = cpu_time;
-  e->type = type_index;
-  e->track = track_index;
-
-  /* Return user data for caller to fill in. */
-  return e->data;
-}
-
-/* External version of inline. */
-void *elog_event_data (elog_main_t * em,
-		       elog_event_type_t * type,
-		       elog_track_t * track, u64 cpu_time);
-
-/* Non-inline version. */
-always_inline void *
-elog_event_data_not_inline (elog_main_t * em,
-			    elog_event_type_t * type,
-			    elog_track_t * track, u64 cpu_time)
-{
-  /* Return the user dummy memory to scribble data into. */
-  if (PREDICT_FALSE (!elog_is_enabled (em)))
-    return em->dummy_event.data;
-  return elog_event_data (em, type, track, cpu_time);
-}
-
-/* Most common forms: log a single 32 bit datum, w / w-out track */
-always_inline void
-elog (elog_main_t * em, elog_event_type_t * type, u32 data)
-{
-  u32 *d = elog_event_data_not_inline (em,
-				       type,
-				       &em->default_track,
-				       clib_cpu_time_now ());
-  d[0] = data;
-}
-
-/* Inline version of above. */
-always_inline void
-elog_inline (elog_main_t * em, elog_event_type_t * type, u32 data)
-{
-  u32 *d = elog_event_data_inline (em,
-				   type,
-				   &em->default_track,
-				   clib_cpu_time_now ());
-  d[0] = data;
-}
-
-always_inline void
-elog_track (elog_main_t * em, elog_event_type_t * type, elog_track_t * track,
-	    u32 data)
-{
-  u32 *d = elog_event_data_not_inline (em,
-				       type,
-				       track,
-				       clib_cpu_time_now ());
-  d[0] = data;
-}
-
-always_inline void
-elog_track_inline (elog_main_t * em, elog_event_type_t * type,
-		   elog_track_t * track, u32 data)
-{
-  u32 *d = elog_event_data_inline (em,
-				   type,
-				   track,
-				   clib_cpu_time_now ());
-  d[0] = data;
-}
-
-always_inline void *
-elog_data (elog_main_t * em, elog_event_type_t * type, elog_track_t * track)
-{
-  return elog_event_data_not_inline (em, type, track, clib_cpu_time_now ());
-}
-
-always_inline void *
-elog_data_inline (elog_main_t * em, elog_event_type_t * type,
-		  elog_track_t * track)
-{
-  return elog_event_data_inline (em, type, track, clib_cpu_time_now ());
-}
-
-/* Macro shorthands for generating/declaring events. */
-#define __ELOG_TYPE_VAR(f) f
-#define __ELOG_TRACK_VAR(f) f
-
-#define ELOG_TYPE_DECLARE(f) static elog_event_type_t __ELOG_TYPE_VAR(f)
-
-#define ELOG_TYPE_INIT_FORMAT_AND_FUNCTION(fmt,func) \
-  { .format = fmt, .function = func, }
-
-#define ELOG_TYPE_INIT(fmt) \
-  ELOG_TYPE_INIT_FORMAT_AND_FUNCTION(fmt,(char *) __FUNCTION__)
-
-#define ELOG_TYPE_DECLARE_HELPER(f,fmt,func)		\
-  static elog_event_type_t __ELOG_TYPE_VAR(f) =		\
-    ELOG_TYPE_INIT_FORMAT_AND_FUNCTION (fmt, func)
-
-#define ELOG_TYPE_DECLARE_FORMAT_AND_FUNCTION(f,fmt)		\
-  ELOG_TYPE_DECLARE_HELPER (f, fmt, (char *) __FUNCTION__)
-
-#define ELOG_TYPE_DECLARE_FORMAT(f,fmt)		\
-  ELOG_TYPE_DECLARE_HELPER (f, fmt, 0)
-
-/* Shorthands with and without __FUNCTION__.
-   D for decimal; X for hex.  F for __FUNCTION__. */
-#define ELOG_TYPE(f,fmt) ELOG_TYPE_DECLARE_FORMAT_AND_FUNCTION(f,fmt)
-#define ELOG_TYPE_D(f)  ELOG_TYPE_DECLARE_FORMAT (f, #f " %d")
-#define ELOG_TYPE_X(f)  ELOG_TYPE_DECLARE_FORMAT (f, #f " 0x%x")
-#define ELOG_TYPE_DF(f) ELOG_TYPE_DECLARE_FORMAT_AND_FUNCTION (f, #f " %d")
-#define ELOG_TYPE_XF(f) ELOG_TYPE_DECLARE_FORMAT_AND_FUNCTION (f, #f " 0x%x")
-#define ELOG_TYPE_FD(f) ELOG_TYPE_DECLARE_FORMAT_AND_FUNCTION (f, #f " %d")
-#define ELOG_TYPE_FX(f) ELOG_TYPE_DECLARE_FORMAT_AND_FUNCTION (f, #f " 0x%x")
-
-#define ELOG_TRACK_DECLARE(f) static elog_track_t __ELOG_TRACK_VAR(f)
-#define ELOG_TRACK(f) ELOG_TRACK_DECLARE(f) = { .name = #f, }
-
-/* Log 32 bits of data. */
-#define ELOG(em,f,data) elog ((em), &__ELOG_TYPE_VAR(f), data)
-#define ELOG_INLINE(em,f,data) elog_inline ((em), &__ELOG_TYPE_VAR(f), data)
-
-/* Return data pointer to fill in. */
-#define ELOG_TRACK_DATA(em,f,track) \
-  elog_data ((em), &__ELOG_TYPE_VAR(f), &__ELOG_TRACK_VAR(track))
-#define ELOG_TRACK_DATA_INLINE(em,f,track) \
-  elog_data_inline ((em), &__ELOG_TYPE_VAR(f), &__ELOG_TRACK_VAR(track))
-
-/* Shorthand with default track. */
-#define ELOG_DATA(em,f) elog_data ((em), &__ELOG_TYPE_VAR (f), &(em)->default_track)
-#define ELOG_DATA_INLINE(em,f) elog_data_inline ((em), &__ELOG_TYPE_VAR (f), &(em)->default_track)
-
-u32 elog_string (elog_main_t * em, char *format, ...);
-void elog_time_now (elog_time_stamp_t * et);
-
-/* Convert ievents to events and return them as a vector.
-   Sets em->events to resulting vector. */
-elog_event_t *elog_get_events (elog_main_t * em);
-
-/* Convert ievents to events and return them as a vector with no side effects. */
-elog_event_t *elog_peek_events (elog_main_t * em);
-
-/* Merge two logs, add supplied track tags. */
-void elog_merge (elog_main_t * dst, u8 * dst_tag,
-		 elog_main_t * src, u8 * src_tag);
-
-/* 2 arguments elog_main_t and elog_event_t to format event or track name. */
-u8 *format_elog_event (u8 * s, va_list * va);
-u8 *format_elog_track (u8 * s, va_list * va);
-
-void serialize_elog_main (serialize_main_t * m, va_list * va);
-void unserialize_elog_main (serialize_main_t * m, va_list * va);
-
-void elog_init (elog_main_t * em, u32 n_events);
-void elog_alloc (elog_main_t * em, u32 n_events);
-
-#ifdef CLIB_UNIX
-always_inline clib_error_t *
-elog_write_file (elog_main_t * em, char *unix_file)
-{
-  serialize_main_t m;
-  clib_error_t *error;
-
-  error = serialize_open_unix_file (&m, unix_file);
-  if (error)
-    return error;
-  error = serialize (&m, serialize_elog_main, em);
-  if (!error)
-    serialize_close (&m);
-  return error;
-}
-
-always_inline clib_error_t *
-elog_read_file (elog_main_t * em, char *unix_file)
-{
-  serialize_main_t m;
-  clib_error_t *error;
-
-  error = unserialize_open_unix_file (&m, unix_file);
-  if (error)
-    return error;
-  error = unserialize (&m, unserialize_elog_main, em);
-  if (!error)
-    unserialize_close (&m);
-  return error;
-}
-
-#endif /* CLIB_UNIX */
-
-#endif /* included_clib_elog_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/error.c b/vppinfra/vppinfra/error.c
deleted file mode 100644
index 2722fb7b..00000000
--- a/vppinfra/vppinfra/error.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-/* Error reporting. */
-#include <stdarg.h>
-
-#include <vppinfra/clib.h>	/* for HAVE_ERRNO */
-
-#ifdef CLIB_LINUX_KERNEL
-#include <linux/unistd.h>	/* for write */
-#include <linux/kernel.h>	/* for printk */
-#endif
-
-#ifdef CLIB_UNIX
-#include <unistd.h>		/* for write */
-#include <stdio.h>		/* for printf */
-#define HAVE_ERRNO
-#endif
-
-#ifdef CLIB_STANDALONE
-#include <vppinfra/standalone_stdio.h>	/* for printf */
-#endif
-
-#include <vppinfra/string.h>
-#include <vppinfra/mem.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/format.h>
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/os.h>	/* for os_panic/os_exit/os_puts */
-
-typedef struct
-{
-  clib_error_handler_func_t *func;
-  void *arg;
-} clib_error_handler_t;
-
-static clib_error_handler_t *handlers = 0;
-
-void
-clib_error_register_handler (clib_error_handler_func_t func, void *arg)
-{
-  clib_error_handler_t h = {.func = func,.arg = arg, };
-  vec_add1 (handlers, h);
-}
-
-static void
-debugger (void)
-{
-  os_panic ();
-}
-
-static void
-error_exit (int code)
-{
-  os_exit (code);
-}
-
-static u8 *
-dispatch_message (u8 * msg)
-{
-  word i;
-
-  if (!msg)
-    return msg;
-
-  for (i = 0; i < vec_len (handlers); i++)
-    handlers[i].func (handlers[i].arg, msg, vec_len (msg));
-
-  /* If no message handler is specified provide a default one. */
-  if (vec_len (handlers) == 0)
-    os_puts (msg, vec_len (msg), /* is_error */ 1);
-
-  return msg;
-}
-
-void
-_clib_error (int how_to_die,
-	     char *function_name, uword line_number, char *fmt, ...)
-{
-  u8 *msg = 0;
-  va_list va;
-
-  if (function_name)
-    {
-      msg = format (msg, "%s:", function_name);
-      if (line_number > 0)
-	msg = format (msg, "%wd:", line_number);
-      msg = format (msg, " ");
-    }
-
-  va_start (va, fmt);
-  msg = va_format (msg, fmt, &va);
-  va_end (va);
-
-#ifdef HAVE_ERRNO
-  if (how_to_die & CLIB_ERROR_ERRNO_VALID)
-    msg = format (msg, ": %s (errno %d)", strerror (errno), errno);
-#endif
-
-  if (vec_end (msg)[-1] != '\n')
-    vec_add1 (msg, '\n');
-
-  msg = dispatch_message (msg);
-
-  vec_free (msg);
-
-  if (how_to_die & CLIB_ERROR_ABORT)
-    debugger ();
-  if (how_to_die & CLIB_ERROR_FATAL)
-    error_exit (1);
-}
-
-clib_error_t *
-_clib_error_return (clib_error_t * errors,
-		    any code, uword flags, char *where, char *fmt, ...)
-{
-  clib_error_t *e;
-  va_list va;
-
-#ifdef HAVE_ERRNO
-  /* Save errno since it may be re-set before we'll need it. */
-  word errno_save = errno;
-#endif
-
-  va_start (va, fmt);
-  vec_add2 (errors, e, 1);
-  if (fmt)
-    e->what = va_format (0, fmt, &va);
-
-#ifdef HAVE_ERRNO
-  if (flags & CLIB_ERROR_ERRNO_VALID)
-    {
-      if (e->what)
-	e->what = format (e->what, ": ");
-      e->what = format (e->what, "%s", strerror (errno_save));
-    }
-#endif
-
-  e->where = (u8 *) where;
-  e->code = code;
-  e->flags = flags;
-  va_end (va);
-  return errors;
-}
-
-void *
-clib_error_free_vector (clib_error_t * errors)
-{
-  clib_error_t *e;
-  vec_foreach (e, errors) vec_free (e->what);
-  vec_free (errors);
-  return 0;
-}
-
-u8 *
-format_clib_error (u8 * s, va_list * va)
-{
-  clib_error_t *errors = va_arg (*va, clib_error_t *);
-  clib_error_t *e;
-
-  vec_foreach (e, errors)
-  {
-    if (!e->what)
-      continue;
-
-    if (e->where)
-      {
-	u8 *where = 0;
-
-	if (e > errors)
-	  where = format (where, "from ");
-	where = format (where, "%s", e->where);
-
-	s = format (s, "%v: ", where);
-	vec_free (where);
-      }
-
-    s = format (s, "%v\n", e->what);
-  }
-
-  return s;
-}
-
-clib_error_t *
-_clib_error_report (clib_error_t * errors)
-{
-  if (errors)
-    {
-      u8 *msg = format (0, "%U", format_clib_error, errors);
-
-      msg = dispatch_message (msg);
-      vec_free (msg);
-
-      if (errors->flags & CLIB_ERROR_ABORT)
-	debugger ();
-      if (errors->flags & CLIB_ERROR_FATAL)
-	error_exit (1);
-
-      clib_error_free (errors);
-    }
-  return 0;
-}
-
-#ifdef TEST
-
-static error_t *
-foo1 (int x)
-{
-  return error_return (0, "x is odd %d", x);
-}
-
-static error_t *
-foo2 (int x)
-{
-  return error_return (0, "x is even %d", x);
-}
-
-static error_t *
-foo (int x)
-{
-  error_t *e;
-  if (x & 1)
-    e = foo1 (x);
-  else
-    e = foo2 (x);
-  if (e)
-    return error_return (e, 0);
-}
-
-static void
-error_handler (void *arg, char *msg, int msg_len)
-{
-  write (2, msg, msg_len);
-}
-
-int
-main (int argc, char *argv[])
-{
-  error_t *e;
-
-  register_error_handler (error_handler, 0);
-
-  e = foo (getpid ());
-  if (e)
-    error_report (e);
-  return 0;
-}
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/error.h b/vppinfra/vppinfra/error.h
deleted file mode 100644
index 63d73af3..00000000
--- a/vppinfra/vppinfra/error.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_error_h
-#define included_error_h
-
-#include <vppinfra/clib.h>	/* for CLIB_LINUX_KERNEL */
-#include <vppinfra/error_bootstrap.h>
-
-#ifdef CLIB_UNIX
-#include <errno.h>
-#endif
-
-#ifdef CLIB_LINUX_KERNEL
-#include <linux/errno.h>
-#endif
-
-#include <stdarg.h>
-#include <vppinfra/vec.h>
-
-/* Callback functions for error reporting. */
-typedef void clib_error_handler_func_t (void *arg, u8 * msg, int msg_len);
-void clib_error_register_handler (clib_error_handler_func_t func, void *arg);
-
-#define clib_warning(format,args...) \
-  _clib_error (CLIB_ERROR_WARNING, clib_error_function, __LINE__, format, ## args)
-
-#define clib_error(format,args...) \
-  _clib_error (CLIB_ERROR_FATAL, clib_error_function, __LINE__, format, ## args)
-
-#define clib_unix_error(format,args...) \
-  _clib_error (CLIB_ERROR_FATAL | CLIB_ERROR_ERRNO_VALID, clib_error_function, __LINE__, format, ## args)
-
-#define clib_unix_warning(format,args...) \
-  _clib_error (CLIB_ERROR_WARNING | CLIB_ERROR_ERRNO_VALID, clib_error_function, __LINE__, format, ## args)
-
-/* For programming errors and assert. */
-#define clib_panic(format,args...) \
-  _clib_error (CLIB_ERROR_ABORT, (char *) clib_error_function, __LINE__, format, ## args)
-
-typedef struct
-{
-  /* Error message. */
-  u8 *what;
-
-  /* Where error occurred (e.g. __FUNCTION__ __LINE__) */
-  const u8 *where;
-
-  uword flags;
-
-  /* Error code (e.g. errno for Unix errors). */
-  any code;
-} clib_error_t;
-
-#define clib_error_get_code(err) ((err) ? (err)->code : 0)
-#define clib_error_set_code(err, c)		\
-do {						\
-  if (err)					\
-    (err)->code = (c);				\
-} while (0)
-
-extern void *clib_error_free_vector (clib_error_t * errors);
-
-#define clib_error_free(e) e = clib_error_free_vector(e)
-
-extern clib_error_t *_clib_error_return (clib_error_t * errors,
-					 any code,
-					 uword flags,
-					 char *where, char *fmt, ...);
-
-#define clib_error_return_code(e,code,flags,args...) \
-  _clib_error_return((e),(code),(flags),(char *)clib_error_function,args)
-
-#define clib_error_create(args...) \
-  clib_error_return_code(0,0,0,args)
-
-#define clib_error_return(e,args...) \
-  clib_error_return_code(e,0,0,args)
-
-#define clib_error_return_unix(e,args...) \
-  clib_error_return_code(e,errno,CLIB_ERROR_ERRNO_VALID,args)
-
-#define clib_error_return_fatal(e,args...) \
-  clib_error_return_code(e,0,CLIB_ERROR_FATAL,args)
-
-#define clib_error_return_unix_fatal(e,args...) \
-  clib_error_return_code(e,errno,CLIB_ERROR_ERRNO_VALID|CLIB_ERROR_FATAL,args)
-
-extern clib_error_t *_clib_error_report (clib_error_t * errors);
-
-#define clib_error_report(e) do { (e) = _clib_error_report (e); } while (0)
-
-u8 *format_clib_error (u8 * s, va_list * va);
-
-always_inline word
-unix_error_is_fatal (word error)
-{
-#ifdef CLIB_UNIX
-  switch (error)
-    {
-    case EWOULDBLOCK:
-    case EINTR:
-      return 0;
-    }
-#endif
-  return 1;
-}
-
-#define IF_ERROR_IS_FATAL_RETURN_ELSE_FREE(e)			\
-do {								\
-  if (e)							\
-    {								\
-      if (unix_error_is_fatal (clib_error_get_code (e)))	\
-	return (e);						\
-      else							\
-	clib_error_free (e);					\
-    }								\
-} while (0)
-
-#define ERROR_RETURN_IF(x)				\
-do {							\
-  clib_error_t * _error_return_if = (x);		\
-  if (_error_return_if)					\
-    return clib_error_return (_error_return_if, 0);	\
-} while (0)
-
-#define ERROR_ASSERT(truth)			\
-({						\
-  clib_error_t * _error_assert = 0;		\
-  if (CLIB_DEBUG > 0 && ! (truth))		\
-    {						\
-      _error_assert = clib_error_return_fatal	\
-        (0, "%s:%d (%s) assertion `%s' fails",	\
-	 __FILE__,				\
-	 (uword) __LINE__,			\
-	 clib_error_function,			\
-	 # truth);				\
-    }						\
-  _error_assert;				\
-})
-
-/* Assert to remain even if CLIB_DEBUG is set to 0. */
-#define CLIB_ERROR_ASSERT(truth)		\
-({						\
-  clib_error_t * _error_assert = 0;		\
-  if (! (truth))				\
-    {						\
-      _error_assert =				\
-        clib_error_return_fatal			\
-        (0, "%s:%d (%s) assertion `%s' fails",	\
-         __FILE__,				\
-	 (uword) __LINE__,			\
-	 clib_error_function,			\
-	 # truth);				\
-    }						\
-  _error_assert;				\
-})
-
-#endif /* included_error_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/error_bootstrap.h b/vppinfra/vppinfra/error_bootstrap.h
deleted file mode 100644
index 3416c2f9..00000000
--- a/vppinfra/vppinfra/error_bootstrap.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_error_bootstrap_h
-#define included_error_bootstrap_h
-
-/* Bootstrap include so that #include <vppinfra/mem.h> can include e.g.
-   <vppinfra/mheap.h> which depends on <vppinfra/vec.h>. */
-
-#include <vppinfra/clib.h>	/* for uword */
-
-enum
-{
-  CLIB_ERROR_FATAL = 1 << 0,
-  CLIB_ERROR_ABORT = 1 << 1,
-  CLIB_ERROR_WARNING = 1 << 2,
-  CLIB_ERROR_ERRNO_VALID = 1 << 16,
-  CLIB_ERROR_NO_RATE_LIMIT = 1 << 17,
-};
-
-/* Current function name.  Need (char *) cast to silence gcc4 pointer signedness warning. */
-#define clib_error_function ((char *) __FUNCTION__)
-
-#ifndef CLIB_ASSERT_ENABLE
-#define CLIB_ASSERT_ENABLE (CLIB_DEBUG > 0)
-#endif
-
-/* Low level error reporting function.
-   Code specifies whether to call exit, abort or nothing at
-   all (for non-fatal warnings). */
-extern void _clib_error (int code,
-			 char *function_name,
-			 uword line_number, char *format, ...);
-
-#define ASSERT(truth)					\
-do {							\
-  if (CLIB_ASSERT_ENABLE && ! (truth))			\
-    {							\
-      _clib_error (CLIB_ERROR_ABORT, 0, 0,		\
-		   "%s:%d (%s) assertion `%s' fails",	\
-		   __FILE__,				\
-		   (uword) __LINE__,			\
-		   clib_error_function,			\
-		   # truth);				\
-    }							\
-} while (0)
-
-#if defined(__clang__)
-#define STATIC_ASSERT(truth,...)
-#else
-#define STATIC_ASSERT(truth,...) _Static_assert(truth, __VA_ARGS__)
-#endif
-
-#define STATIC_ASSERT_SIZEOF(d, s) \
-  STATIC_ASSERT (sizeof (d) == s, "Size of " #d " must be " # s " bytes")
-
-/* Assert without allocating memory. */
-#define ASSERT_AND_PANIC(truth)			\
-do {						\
-  if (CLIB_ASSERT_ENABLE && ! (truth))		\
-    os_panic ();				\
-} while (0)
-
-#endif /* included_error_bootstrap_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/fheap.c b/vppinfra/vppinfra/fheap.c
deleted file mode 100644
index 13692456..00000000
--- a/vppinfra/vppinfra/fheap.c
+++ /dev/null
@@ -1,473 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vppinfra/fheap.h>
-
-/* Fibonacci heaps. */
-always_inline fheap_node_t *
-fheap_get_node (fheap_t * f, u32 i)
-{
-  return i != ~0 ? vec_elt_at_index (f->nodes, i) : 0;
-}
-
-always_inline fheap_node_t *
-fheap_get_root (fheap_t * f)
-{
-  return fheap_get_node (f, f->min_root);
-}
-
-static void
-fheap_validate (fheap_t * f)
-{
-  fheap_node_t *n, *m;
-  uword ni, si;
-
-  if (!CLIB_DEBUG || !f->enable_validate)
-    return;
-
-  vec_foreach_index (ni, f->nodes)
-  {
-    n = vec_elt_at_index (f->nodes, ni);
-
-    if (!n->is_valid)
-      continue;
-
-    /* Min root must have minimal key. */
-    m = vec_elt_at_index (f->nodes, f->min_root);
-    ASSERT (n->key >= m->key);
-
-    /* Min root must have no parent. */
-    if (ni == f->min_root)
-      ASSERT (n->parent == ~0);
-
-    /* Check sibling linkages. */
-    if (n->next_sibling == ~0)
-      ASSERT (n->prev_sibling == ~0);
-    else if (n->prev_sibling == ~0)
-      ASSERT (n->next_sibling == ~0);
-    else
-      {
-	fheap_node_t *prev, *next;
-	u32 si = n->next_sibling, si_start = si;
-	do
-	  {
-	    m = vec_elt_at_index (f->nodes, si);
-	    prev = vec_elt_at_index (f->nodes, m->prev_sibling);
-	    next = vec_elt_at_index (f->nodes, m->next_sibling);
-	    ASSERT (prev->next_sibling == si);
-	    ASSERT (next->prev_sibling == si);
-	    si = m->next_sibling;
-	  }
-	while (si != si_start);
-      }
-
-    /* Loop through all siblings. */
-    {
-      u32 n_siblings = 0;
-
-      foreach_fheap_node_sibling (f, si, n->next_sibling, (
-							    {
-							    m =
-							    vec_elt_at_index
-							    (f->nodes, si);
-							    /* All siblings must have same parent. */
-							    ASSERT (m->parent
-								    ==
-								    n->
-								    parent);
-							    n_siblings += 1;}
-				  ));
-
-      /* Either parent is non-empty or there are siblings present. */
-      if (n->parent == ~0 && ni != f->min_root)
-	ASSERT (n_siblings > 0);
-    }
-
-    /* Loop through all children. */
-    {
-      u32 found_first_child = n->first_child == ~0;
-      u32 n_children = 0;
-
-      foreach_fheap_node_sibling (f, si, n->first_child, (
-							   {
-							   m =
-							   vec_elt_at_index
-							   (f->nodes, si);
-							   /* Children must have larger keys than their parent. */
-							   ASSERT (m->key >=
-								   n->key);
-							   if
-							   (!found_first_child)
-							   found_first_child =
-							   si ==
-							   n->first_child;
-							   n_children += 1;}
-				  ));
-
-      /* Check that first child is present on list. */
-      ASSERT (found_first_child);
-
-      /* Make sure rank is correct. */
-      ASSERT (n->rank == n_children);
-    }
-  }
-
-  /* Increment serial number for each successful validate.
-     Failure can be used as condition for gdb breakpoints. */
-  f->validate_serial++;
-}
-
-always_inline void
-fheap_node_add_sibling (fheap_t * f, u32 ni, u32 ni_to_add)
-{
-  fheap_node_t *n = vec_elt_at_index (f->nodes, ni);
-  fheap_node_t *n_to_add = vec_elt_at_index (f->nodes, ni_to_add);
-  fheap_node_t *n_next = fheap_get_node (f, n->next_sibling);
-  fheap_node_t *parent;
-
-  /* Empty list? */
-  if (n->next_sibling == ~0)
-    {
-      ASSERT (n->prev_sibling == ~0);
-      n->next_sibling = n->prev_sibling = ni_to_add;
-      n_to_add->next_sibling = n_to_add->prev_sibling = ni;
-    }
-  else
-    {
-      /* Add node after existing node. */
-      n_to_add->prev_sibling = ni;
-      n_to_add->next_sibling = n->next_sibling;
-
-      n->next_sibling = ni_to_add;
-      n_next->prev_sibling = ni_to_add;
-    }
-
-  n_to_add->parent = n->parent;
-  parent = fheap_get_node (f, n->parent);
-  if (parent)
-    parent->rank += 1;
-}
-
-void
-fheap_add (fheap_t * f, u32 ni, u32 key)
-{
-  fheap_node_t *r, *n;
-  u32 ri;
-
-  n = vec_elt_at_index (f->nodes, ni);
-
-  memset (n, 0, sizeof (n[0]));
-  n->parent = n->first_child = n->next_sibling = n->prev_sibling = ~0;
-  n->key = key;
-
-  r = fheap_get_root (f);
-  ri = f->min_root;
-  if (!r)
-    {
-      /* No root?  Add node as new root. */
-      f->min_root = ni;
-    }
-  else
-    {
-      /* Add node as sibling of current root. */
-      fheap_node_add_sibling (f, ri, ni);
-
-      /* New node may become new root. */
-      if (r->key > n->key)
-	f->min_root = ni;
-    }
-
-  fheap_validate (f);
-}
-
-always_inline u32
-fheap_node_remove_internal (fheap_t * f, u32 ni, u32 invalidate)
-{
-  fheap_node_t *n = vec_elt_at_index (f->nodes, ni);
-  u32 prev_ni = n->prev_sibling;
-  u32 next_ni = n->next_sibling;
-  u32 list_has_single_element = prev_ni == ni;
-  fheap_node_t *prev = fheap_get_node (f, prev_ni);
-  fheap_node_t *next = fheap_get_node (f, next_ni);
-  fheap_node_t *p = fheap_get_node (f, n->parent);
-
-  if (p)
-    {
-      ASSERT (p->rank > 0);
-      p->rank -= 1;
-      p->first_child = list_has_single_element ? ~0 : next_ni;
-    }
-
-  if (prev)
-    {
-      ASSERT (prev->next_sibling == ni);
-      prev->next_sibling = next_ni;
-    }
-  if (next)
-    {
-      ASSERT (next->prev_sibling == ni);
-      next->prev_sibling = prev_ni;
-    }
-
-  n->prev_sibling = n->next_sibling = ni;
-  n->parent = ~0;
-  n->is_valid = invalidate == 0;
-
-  return list_has_single_element ? ~0 : next_ni;
-}
-
-always_inline u32
-fheap_node_remove (fheap_t * f, u32 ni)
-{
-  return fheap_node_remove_internal (f, ni, /* invalidate */ 0);
-}
-
-always_inline u32
-fheap_node_remove_and_invalidate (fheap_t * f, u32 ni)
-{
-  return fheap_node_remove_internal (f, ni, /* invalidate */ 1);
-}
-
-static void
-fheap_link_root (fheap_t * f, u32 ni)
-{
-  fheap_node_t *n = vec_elt_at_index (f->nodes, ni);
-  fheap_node_t *r, *lo, *hi;
-  u32 ri, lo_i, hi_i, k;
-
-  while (1)
-    {
-      k = n->rank;
-      vec_validate_init_empty (f->root_list_by_rank, k, ~0);
-      ri = f->root_list_by_rank[k];
-      r = fheap_get_node (f, ri);
-      if (!r)
-	{
-	  f->root_list_by_rank[k] = ni;
-	  return;
-	}
-
-      f->root_list_by_rank[k] = ~0;
-
-      /* Sort n/r into lo/hi by their keys. */
-      lo = r, lo_i = ri;
-      hi = n, hi_i = ni;
-      if (hi->key < lo->key)
-	{
-	  u32 ti;
-	  fheap_node_t *tn;
-	  ti = lo_i, tn = lo;
-	  lo = hi, lo_i = hi_i;
-	  hi = tn, hi_i = ti;
-	}
-
-      /* Remove larger key. */
-      fheap_node_remove (f, hi_i);
-
-      /* Add larger key as child of smaller one. */
-      if (lo->first_child == ~0)
-	{
-	  hi->parent = lo_i;
-	  lo->first_child = hi_i;
-	  lo->rank = 1;
-	}
-      else
-	fheap_node_add_sibling (f, lo->first_child, hi_i);
-
-      /* Following Fredman & Trajan: "When making a root node X a child of another node in a linking step,
-         we unmark X". */
-      hi->is_marked = 0;
-
-      ni = lo_i;
-      n = lo;
-    }
-}
-
-u32
-fheap_del_min (fheap_t * f, u32 * min_key)
-{
-  fheap_node_t *r = fheap_get_root (f);
-  u32 to_delete_min_ri = f->min_root;
-  u32 ri, ni;
-
-  /* Empty heap? */
-  if (!r)
-    return ~0;
-
-  /* Root's children become siblings.  Call this step a; see below. */
-  if (r->first_child != ~0)
-    {
-      u32 ci, cni, rni;
-      fheap_node_t *c, *cn, *rn;
-
-      /* Splice child & root circular lists together. */
-      ci = r->first_child;
-      c = vec_elt_at_index (f->nodes, ci);
-
-      cni = c->next_sibling;
-      rni = r->next_sibling;
-      cn = vec_elt_at_index (f->nodes, cni);
-      rn = vec_elt_at_index (f->nodes, rni);
-
-      r->next_sibling = cni;
-      c->next_sibling = rni;
-      cn->prev_sibling = to_delete_min_ri;
-      rn->prev_sibling = ci;
-    }
-
-  /* Remove min root. */
-  ri = fheap_node_remove_and_invalidate (f, to_delete_min_ri);
-
-  /* Find new min root from among siblings including the ones we've just added. */
-  f->min_root = ~0;
-  if (ri != ~0)
-    {
-      u32 ri_last, ri_next, i, min_ds;
-
-      r = fheap_get_node (f, ri);
-      ri_last = r->prev_sibling;
-      while (1)
-	{
-	  /* Step a above can put children (with r->parent != ~0) on root list. */
-	  r->parent = ~0;
-
-	  ri_next = r->next_sibling;
-	  fheap_link_root (f, ri);
-	  if (ri == ri_last)
-	    break;
-	  ri = ri_next;
-	  r = fheap_get_node (f, ri);
-	}
-
-      min_ds = ~0;
-      vec_foreach_index (i, f->root_list_by_rank)
-      {
-	ni = f->root_list_by_rank[i];
-	if (ni == ~0)
-	  continue;
-	f->root_list_by_rank[i] = ~0;
-	r = fheap_get_node (f, ni);
-	if (r->key < min_ds)
-	  {
-	    f->min_root = ni;
-	    min_ds = r->key;
-	    ASSERT (r->parent == ~0);
-	  }
-      }
-    }
-
-  /* Return deleted min root. */
-  r = vec_elt_at_index (f->nodes, to_delete_min_ri);
-  if (min_key)
-    *min_key = r->key;
-
-  fheap_validate (f);
-
-  return to_delete_min_ri;
-}
-
-static void
-fheap_mark_parent (fheap_t * f, u32 pi)
-{
-  fheap_node_t *p = vec_elt_at_index (f->nodes, pi);
-
-  /* Parent is a root: do nothing. */
-  if (p->parent == ~0)
-    return;
-
-  /* If not marked, mark it. */
-  if (!p->is_marked)
-    {
-      p->is_marked = 1;
-      return;
-    }
-
-  /* Its a previously marked, non-root parent.
-     Cut edge to its parent and add to root list. */
-  fheap_node_remove (f, pi);
-  fheap_node_add_sibling (f, f->min_root, pi);
-
-  /* Unmark it since its now a root node. */
-  p->is_marked = 0;
-
-  /* "Cascading cuts": check parent. */
-  if (p->parent != ~0)
-    fheap_mark_parent (f, p->parent);
-}
-
-/* Set key to new smaller value. */
-void
-fheap_decrease_key (fheap_t * f, u32 ni, u32 new_key)
-{
-  fheap_node_t *n = vec_elt_at_index (f->nodes, ni);
-  fheap_node_t *r = fheap_get_root (f);
-
-  n->key = new_key;
-
-  if (n->parent != ~0)
-    {
-      fheap_mark_parent (f, n->parent);
-
-      /* Remove node and add to root list. */
-      fheap_node_remove (f, ni);
-      fheap_node_add_sibling (f, f->min_root, ni);
-    }
-
-  if (n->key < r->key)
-    f->min_root = ni;
-
-  fheap_validate (f);
-}
-
-void
-fheap_del (fheap_t * f, u32 ni)
-{
-  fheap_node_t *n;
-
-  n = vec_elt_at_index (f->nodes, ni);
-
-  if (n->parent == ~0)
-    {
-      ASSERT (ni == f->min_root);
-      fheap_del_min (f, 0);
-    }
-  else
-    {
-      u32 ci;
-
-      fheap_mark_parent (f, n->parent);
-
-      /* Add children to root list. */
-      foreach_fheap_node_sibling (f, ci, n->first_child, (
-							   {
-							   fheap_node_remove
-							   (f, ci);
-							   fheap_node_add_sibling
-							   (f, f->min_root,
-							    ci);}
-				  ));
-
-      fheap_node_remove_and_invalidate (f, ni);
-    }
-
-  fheap_validate (f);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/fheap.h b/vppinfra/vppinfra/fheap.h
deleted file mode 100644
index 6d4965f1..00000000
--- a/vppinfra/vppinfra/fheap.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_clib_fheap_h
-#define included_clib_fheap_h
-
-/* Fibonacci Heaps Fredman, M. L.; Tarjan (1987).
-   "Fibonacci heaps and their uses in improved network optimization algorithms" */
-
-#include <vppinfra/vec.h>
-
-typedef struct
-{
-  /* Node index of parent. */
-  u32 parent;
-
-  /* Node index of first child. */
-  u32 first_child;
-
-  /* Next and previous nodes in doubly linked list of siblings. */
-  u32 next_sibling, prev_sibling;
-
-  /* Key (distance) for this node.  Parent always has key
-     <= than keys of children. */
-  u32 key;
-
-  /* Number of children (as opposed to descendents). */
-  u32 rank;
-
-  u32 is_marked;
-
-  /* Set to one when node is inserted; zero when deleted. */
-  u32 is_valid;
-} fheap_node_t;
-
-#define foreach_fheap_node_sibling(f,ni,first_ni,body)			\
-do {									\
-  u32 __fheap_foreach_first_ni = (first_ni);				\
-  u32 __fheap_foreach_ni = __fheap_foreach_first_ni;			\
-  u32 __fheap_foreach_next_ni;						\
-  fheap_node_t * __fheap_foreach_n;					\
-  if (__fheap_foreach_ni != ~0)						\
-    while (1)								\
-      {									\
-	__fheap_foreach_n = fheap_get_node ((f), __fheap_foreach_ni);	\
-	__fheap_foreach_next_ni = __fheap_foreach_n -> next_sibling;	\
-	(ni) = __fheap_foreach_ni;					\
-									\
-	body;								\
-									\
-	/* End of circular list? */					\
-	if (__fheap_foreach_next_ni == __fheap_foreach_first_ni)	\
-	  break;							\
-									\
-	__fheap_foreach_ni = __fheap_foreach_next_ni;			\
-									\
-      }									\
-} while (0)
-
-typedef struct
-{
-  u32 min_root;
-
-  /* Vector of nodes. */
-  fheap_node_t *nodes;
-
-  u32 *root_list_by_rank;
-
-  u32 enable_validate;
-
-  u32 validate_serial;
-} fheap_t;
-
-/* Initialize empty heap. */
-always_inline void
-fheap_init (fheap_t * f, u32 n_nodes)
-{
-  fheap_node_t *save_nodes = f->nodes;
-  u32 *save_root_list = f->root_list_by_rank;
-
-  memset (f, 0, sizeof (f[0]));
-
-  f->nodes = save_nodes;
-  f->root_list_by_rank = save_root_list;
-
-  vec_validate (f->nodes, n_nodes - 1);
-  vec_reset_length (f->root_list_by_rank);
-
-  f->min_root = ~0;
-}
-
-always_inline void
-fheap_free (fheap_t * f)
-{
-  vec_free (f->nodes);
-  vec_free (f->root_list_by_rank);
-}
-
-always_inline u32
-fheap_find_min (fheap_t * f)
-{
-  return f->min_root;
-}
-
-always_inline u32
-fheap_is_empty (fheap_t * f)
-{
-  return f->min_root == ~0;
-}
-
-/* Add/delete nodes. */
-void fheap_add (fheap_t * f, u32 ni, u32 key);
-void fheap_del (fheap_t * f, u32 ni);
-
-/* Delete and return minimum. */
-u32 fheap_del_min (fheap_t * f, u32 * min_key);
-
-/* Change key value. */
-void fheap_decrease_key (fheap_t * f, u32 ni, u32 new_key);
-
-#endif /* included_clib_fheap_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/fifo.c b/vppinfra/vppinfra/fifo.c
deleted file mode 100644
index 5b4c76d1..00000000
--- a/vppinfra/vppinfra/fifo.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/cache.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/error.h>
-#include <vppinfra/string.h>
-
-/*
-  General first in/first out queues.
-  FIFOs can have arbitrary size and type.
-  Let T be any type (i.e. char, int, struct foo, etc.).
-
-  A null fifo is initialized:
-
-    T * f = 0;
-
-  For example, typedef struct { int a, b; } T;
-
-  Elements can be added in 3 ways.
-
-    #1 1 element is added:
-       T x;
-       x.a = 10; x.b = 20;
-       fifo_add1 (f, x);
-
-    #2 n elements are added
-       T buf[10];
-       initialize buf[0] .. buf[9];
-       fifo_add (f, buf, 10);
-
-    #3 1 element is added, pointer is returned
-       T * x;
-       fifo_add2 (f, x);
-       x->a = 10;
-       x->b = 20;
-
-   Elements are removed 1 at a time:
-       T x;
-       fifo_sub1 (f, x);
-
-   fifo_free (f) frees fifo.
-*/
-
-void *
-_clib_fifo_resize (void *v_old, uword n_new_elts, uword elt_bytes)
-{
-  void *v_new, *end, *head;
-  uword n_old_elts, header_bytes;
-  uword n_copy_bytes, n_zero_bytes;
-  clib_fifo_header_t *f_new, *f_old;
-
-  n_old_elts = clib_fifo_elts (v_old);
-  n_new_elts += n_old_elts;
-  if (n_new_elts < 32)
-    n_new_elts = 32;
-  else
-    n_new_elts = max_pow2 (n_new_elts);
-
-  header_bytes = vec_header_bytes (sizeof (clib_fifo_header_t));
-
-  v_new = clib_mem_alloc_no_fail (n_new_elts * elt_bytes + header_bytes);
-  v_new += header_bytes;
-
-  f_new = clib_fifo_header (v_new);
-  f_new->head_index = 0;
-  f_new->tail_index = n_old_elts;
-  _vec_len (v_new) = n_new_elts;
-
-  /* Copy old -> new. */
-  n_copy_bytes = n_old_elts * elt_bytes;
-  if (n_copy_bytes > 0)
-    {
-      f_old = clib_fifo_header (v_old);
-      end = v_old + _vec_len (v_old) * elt_bytes;
-      head = v_old + f_old->head_index * elt_bytes;
-
-      if (head + n_copy_bytes >= end)
-	{
-	  uword n = end - head;
-	  clib_memcpy (v_new, head, n);
-	  clib_memcpy (v_new + n, v_old, n_copy_bytes - n);
-	}
-      else
-	clib_memcpy (v_new, head, n_copy_bytes);
-    }
-
-  /* Zero empty space. */
-  n_zero_bytes = (n_new_elts - n_old_elts) * elt_bytes;
-  memset (v_new + n_copy_bytes, 0, n_zero_bytes);
-
-  clib_fifo_free (v_old);
-
-  return v_new;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/fifo.h b/vppinfra/vppinfra/fifo.h
deleted file mode 100644
index b0b35e25..00000000
--- a/vppinfra/vppinfra/fifo.h
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_fifo_h
-#define included_fifo_h
-
-#include <vppinfra/cache.h>
-#include <vppinfra/error.h>	/* for ASSERT */
-#include <vppinfra/vec.h>
-
-typedef struct
-{
-  /* First index of valid data in fifo. */
-  u32 head_index;
-
-  /* One beyond last index in fifo. */
-  u32 tail_index;
-} clib_fifo_header_t;
-
-always_inline clib_fifo_header_t *
-clib_fifo_header (void *f)
-{
-  return vec_header (f, sizeof (clib_fifo_header_t));
-}
-
-/* Aliases. */
-#define clib_fifo_len(v) vec_len(v)
-#define _clib_fifo_len(v) _vec_len(v)
-#define clib_fifo_end(v) vec_end(v)
-
-always_inline uword
-clib_fifo_elts (void *v)
-{
-  word l, r;
-  clib_fifo_header_t *f = clib_fifo_header (v);
-
-  if (!v)
-    return 0;
-
-  l = _clib_fifo_len (v);
-  r = (word) f->tail_index - (word) f->head_index;
-  r = r < 0 ? r + l : r;
-  ASSERT (r >= 0 && r <= l);
-  return r;
-}
-
-always_inline uword
-clib_fifo_free_elts (void *v)
-{
-  return clib_fifo_len (v) - clib_fifo_elts (v);
-}
-
-always_inline void
-clib_fifo_reset (void *v)
-{
-  clib_fifo_header_t *f = clib_fifo_header (v);
-  if (v)
-    {
-      f->head_index = f->tail_index = 0;
-      _vec_len (v) = 0;
-    }
-}
-
-/* External resize function. */
-void *_clib_fifo_resize (void *v, uword n_elts, uword elt_bytes);
-
-#define clib_fifo_resize(f,n_elts) \
-  f = _clib_fifo_resize ((f), (n_elts), sizeof ((f)[0]))
-
-always_inline void *
-_clib_fifo_validate (void *v, uword n_elts, uword elt_bytes)
-{
-  if (clib_fifo_free_elts (v) < n_elts)
-    v = _clib_fifo_resize (v, n_elts, elt_bytes);
-  return v;
-}
-
-#define clib_fifo_validate(f,n_elts) \
-  f = _clib_fifo_validate ((f), (n_elts), sizeof (f[0]))
-
-/* Advance tail pointer by N_ELTS which can be either positive or negative. */
-always_inline void *
-_clib_fifo_advance_tail (void *v, word n_elts, uword elt_bytes,
-			 uword * tail_return)
-{
-  word i, l, n_free;
-  clib_fifo_header_t *f;
-
-  n_free = clib_fifo_free_elts (v);
-  if (n_free < n_elts)
-    {
-      v = _clib_fifo_resize (v, n_elts, elt_bytes);
-      n_free = clib_fifo_free_elts (v);
-    }
-
-  ASSERT (n_free >= n_elts);
-  n_free -= n_elts;
-
-  f = clib_fifo_header (v);
-  l = _clib_fifo_len (v);
-  i = f->tail_index;
-
-  if (n_free == 0)
-    {
-      /* Mark fifo full. */
-      f->tail_index = f->head_index + l;
-    }
-  else
-    {
-      word n = f->tail_index + n_elts;
-      if (n >= l)
-	n -= l;
-      else if (n < 0)
-	n += l;
-      ASSERT (n >= 0 && n < l);
-      f->tail_index = n;
-    }
-
-  ASSERT (clib_fifo_free_elts (v) == n_free);
-
-  if (tail_return)
-    *tail_return = n_elts > 0 ? i : f->tail_index;
-
-  return v;
-}
-
-#define clib_fifo_advance_tail(f,n_elts)				\
-({									\
-  uword _i;								\
-  (f) = _clib_fifo_advance_tail ((f), (n_elts), sizeof ((f)[0]), &_i);	\
-  (f) + _i;								\
-})
-
-always_inline uword
-clib_fifo_advance_head (void *v, uword n_elts)
-{
-  clib_fifo_header_t *f;
-  uword l, i, n;
-
-  ASSERT (clib_fifo_elts (v) >= n_elts);
-  f = clib_fifo_header (v);
-  l = _clib_fifo_len (v);
-
-  /* If fifo was full, restore tail pointer. */
-  if (f->tail_index == f->head_index + l)
-    f->tail_index = f->head_index;
-
-  n = i = f->head_index;
-  n += n_elts;
-  n = n >= l ? n - l : n;
-  ASSERT (n < l);
-  f->head_index = n;
-
-  return i;
-}
-
-/* Add given element to fifo. */
-#define clib_fifo_add1(f,e)					\
-do {								\
-  uword _i;							\
-  (f) = _clib_fifo_advance_tail ((f), 1, sizeof ((f)[0]), &_i);	\
-  (f)[_i] = (e);						\
-} while (0)
-
-/* Add element to fifo; return pointer to new element. */
-#define clib_fifo_add2(f,p)					\
-do {								\
-  uword _i;							\
-  (f) = _clib_fifo_advance_tail ((f), 1, sizeof ((f)[0]), &_i);	\
-  (p) = (f) + _i;						\
-} while (0)
-
-/* Add several elements to fifo. */
-#define clib_fifo_add(f,e,n)						\
-do {									\
-  uword _i, _l; word _n0, _n1;						\
-									\
-  _n0 = (n);								\
-  (f) = _clib_fifo_advance_tail ((f), _n0, sizeof ((f)[0]), &_i);	\
-  _l = clib_fifo_len (f);						\
-  _n1 = _i + _n0 - _l;							\
-  _n1 = _n1 < 0 ? 0 : _n1;						\
-  _n0 -= _n1;								\
-  clib_memcpy ((f) + _i, (e), _n0 * sizeof ((f)[0]));			\
-  if (_n1)								\
-    clib_memcpy ((f) + 0, (e) + _n0, _n1 * sizeof ((f)[0]));		\
-} while (0)
-
-/* Subtract element from fifo. */
-#define clib_fifo_sub1(f,e)			\
-do {						\
-  uword _i;					\
-  ASSERT (clib_fifo_elts (f) >= 1);		\
-  _i = clib_fifo_advance_head ((f), 1);		\
-  (e) = (f)[_i];				\
-} while (0)
-
-#define clib_fifo_sub2(f,p)			\
-do {						\
-  uword _i;					\
-  ASSERT (clib_fifo_elts (f) >= 1);		\
-  _i = clib_fifo_advance_head ((f), 1);		\
-  (p) = (f) + _i;				\
-} while (0)
-
-always_inline uword
-clib_fifo_head_index (void *v)
-{
-  clib_fifo_header_t *f = clib_fifo_header (v);
-  return v ? f->head_index : 0;
-}
-
-always_inline uword
-clib_fifo_tail_index (void *v)
-{
-  clib_fifo_header_t *f = clib_fifo_header (v);
-  return v ? f->tail_index : 0;
-}
-
-#define clib_fifo_head(v) ((v) + clib_fifo_head_index (v))
-#define clib_fifo_tail(v) ((v) + clib_fifo_tail_index (v))
-
-#define clib_fifo_free(f) vec_free_h((f),sizeof(clib_fifo_header_t))
-
-always_inline uword
-clib_fifo_elt_index (void *v, uword i)
-{
-  clib_fifo_header_t *f = clib_fifo_header (v);
-  uword result = 0;
-
-  ASSERT (i < clib_fifo_elts (v));
-
-  if (v)
-    {
-      result = f->head_index + i;
-      if (result >= _vec_len (v))
-	result -= _vec_len (v);
-    }
-
-  return result;
-}
-
-#define clib_fifo_elt_at_index(v,i) ((v) + clib_fifo_elt_index (v, (i)))
-
-#define clib_fifo_foreach(v,f,body)		\
-do {						\
-  uword _i, _l, _n;				\
-						\
-  _i = clib_fifo_head_index (f);		\
-  _l = clib_fifo_len (f);			\
-  _n = clib_fifo_elts (f);			\
-  while (_n > 0)				\
-    {						\
-      (v) = (f) + _i;				\
-      do { body; } while (0);			\
-      _n--;					\
-      _i++;					\
-      _i = _i >= _l ? 0 : _i;			\
-    }						\
-} while (0)
-
-#endif /* included_fifo_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/format.c b/vppinfra/vppinfra/format.c
deleted file mode 100644
index 78e52e9a..00000000
--- a/vppinfra/vppinfra/format.c
+++ /dev/null
@@ -1,814 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*------------------------------------------------------------------
- * format.c -- see notice below
- *
- * October 2003, Eliot Dresselhaus
- *
- * Modifications to this file Copyright (c) 2003 by cisco Systems, Inc.
- * All rights reserved.
- *------------------------------------------------------------------
- */
-
-/*
-  Copyright (c) 2001, 2002, 2003, 2006 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <stdarg.h>		/* va_start, etc */
-
-#ifdef CLIB_UNIX
-#include <unistd.h>
-#include <stdio.h>
-#endif
-
-#ifdef CLIB_STANDALONE
-#include <vppinfra/standalone_stdio.h>
-#endif
-
-#include <vppinfra/mem.h>
-#include <vppinfra/format.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/error.h>
-#include <vppinfra/string.h>
-#include <vppinfra/os.h>	/* os_puts */
-
-typedef struct
-{
-  /* Output number in this base. */
-  u8 base;
-
-  /* Number of show of 64 bit number. */
-  u8 n_bits;
-
-  /* Signed or unsigned. */
-  u8 is_signed;
-
-  /* Output digits uppercase (not lowercase) %X versus %x. */
-  u8 uppercase_digits;
-} format_integer_options_t;
-
-static u8 *format_integer (u8 * s, u64 number,
-			   format_integer_options_t * options);
-static u8 *format_float (u8 * s, f64 x, uword n_digits_to_print,
-			 uword output_style);
-
-typedef struct
-{
-  /* String justification: + => right, - => left, = => center. */
-  uword justify;
-
-  /* Width of string (before and after decimal point for numbers).
-     0 => natural width. */
-  uword width[2];
-
-  /* Long => 'l', long long 'L', int 0. */
-  uword how_long;
-
-  /* Pad character.  Defaults to space. */
-  uword pad_char;
-} format_info_t;
-
-static u8 *
-justify (u8 * s, format_info_t * fi, uword s_len_orig)
-{
-  uword i0, l0, l1;
-
-  i0 = s_len_orig;
-  l0 = i0 + fi->width[0];
-  l1 = vec_len (s);
-
-  /* If width is zero user returned width. */
-  if (l0 == i0)
-    l0 = l1;
-
-  if (l1 > l0)
-    _vec_len (s) = l0;
-  else if (l0 > l1)
-    {
-      uword n = l0 - l1;
-      uword n_left = 0, n_right = 0;
-
-      switch (fi->justify)
-	{
-	case '-':
-	  n_right = n;
-	  break;
-
-	case '+':
-	  n_left = n;
-	  break;
-
-	case '=':
-	  n_right = n_left = n / 2;
-	  if (n % 2)
-	    n_left++;
-	  break;
-	}
-      if (n_left > 0)
-	{
-	  vec_insert (s, n_left, i0);
-	  memset (s + i0, fi->pad_char, n_left);
-	  l1 = vec_len (s);
-	}
-      if (n_right > 0)
-	{
-	  vec_resize (s, n_right);
-	  memset (s + l1, fi->pad_char, n_right);
-	}
-    }
-  return s;
-}
-
-static u8 *
-do_percent (u8 ** _s, u8 * fmt, va_list * va)
-{
-  u8 *s = *_s;
-  uword c;
-
-  u8 *f = fmt;
-
-  format_info_t fi = {
-    .justify = '+',
-    .width = {0},
-    .pad_char = ' ',
-    .how_long = 0,
-  };
-
-  uword i;
-
-  ASSERT (f[0] == '%');
-
-  switch (c = *++f)
-    {
-    case '%':
-      /* %% => % */
-      vec_add1 (s, c);
-      f++;
-      goto done;
-
-    case '-':
-    case '+':
-    case '=':
-      fi.justify = c;
-      c = *++f;
-      break;
-    }
-
-  /* Parse width0 . width1. */
-  {
-    uword is_first_digit = 1;
-
-    fi.width[0] = fi.width[1] = 0;
-    for (i = 0; i < 2; i++)
-      {
-	if (c == '0' && i == 0 && is_first_digit)
-	  fi.pad_char = '0';
-	is_first_digit = 0;
-	if (c == '*')
-	  {
-	    fi.width[i] = va_arg (*va, int);
-	    c = *++f;
-	  }
-	else
-	  {
-	    while (c >= '0' && c <= '9')
-	      {
-		fi.width[i] = 10 * fi.width[i] + (c - '0');
-		c = *++f;
-	      }
-	  }
-	if (c != '.')
-	  break;
-	c = *++f;
-      }
-  }
-
-  /* Parse %l* and %L* */
-  switch (c)
-    {
-    case 'w':
-      /* word format. */
-      fi.how_long = 'w';
-      c = *++f;
-      break;
-
-    case 'L':
-    case 'l':
-      fi.how_long = c;
-      c = *++f;
-      if (c == 'l' && *f == 'l')
-	{
-	  fi.how_long = 'L';
-	  c = *++f;
-	}
-      break;
-    }
-
-  /* Finally we are ready for format letter. */
-  if (c != 0)
-    {
-      uword s_initial_len = vec_len (s);
-      format_integer_options_t o = {
-	.is_signed = 0,
-	.base = 10,
-	.n_bits = BITS (uword),
-	.uppercase_digits = 0,
-      };
-
-      f++;
-
-      switch (c)
-	{
-	default:
-	  {
-	    /* Try to give a helpful error message. */
-	    vec_free (s);
-	    s = format (s, "**** CLIB unknown format `%%%c' ****", c);
-	    goto done;
-	  }
-
-	case 'c':
-	  vec_add1 (s, va_arg (*va, int));
-	  break;
-
-	case 'p':
-	  vec_add1 (s, '0');
-	  vec_add1 (s, 'x');
-
-	  o.is_signed = 0;
-	  o.n_bits = BITS (uword *);
-	  o.base = 16;
-	  o.uppercase_digits = 0;
-
-	  s = format_integer (s, pointer_to_uword (va_arg (*va, void *)), &o);
-	  break;
-
-	case 'x':
-	case 'X':
-	case 'u':
-	case 'd':
-	  {
-	    u64 number;
-
-	    o.base = 10;
-	    if (c == 'x' || c == 'X')
-	      o.base = 16;
-	    o.is_signed = c == 'd';
-	    o.uppercase_digits = c == 'X';
-
-	    switch (fi.how_long)
-	      {
-	      case 'L':
-		number = va_arg (*va, unsigned long long);
-		o.n_bits = BITS (unsigned long long);
-		break;
-
-	      case 'l':
-		number = va_arg (*va, long);
-		o.n_bits = BITS (long);
-		break;
-
-	      case 'w':
-		number = va_arg (*va, word);
-		o.n_bits = BITS (uword);
-		break;
-
-	      default:
-		number = va_arg (*va, int);
-		o.n_bits = BITS (int);
-		break;
-	      }
-
-	    s = format_integer (s, number, &o);
-	  }
-	  break;
-
-	case 's':
-	case 'S':
-	  {
-	    char *cstring = va_arg (*va, char *);
-	    uword len;
-
-	    if (!cstring)
-	      {
-		cstring = "(nil)";
-		len = 5;
-	      }
-	    else if (fi.width[1] != 0)
-	      len = clib_min (strlen (cstring), fi.width[1]);
-	    else
-	      len = strlen (cstring);
-
-	    /* %S => format string as C identifier (replace _ with space). */
-	    if (c == 'S')
-	      {
-		for (i = 0; i < len; i++)
-		  vec_add1 (s, cstring[i] == '_' ? ' ' : cstring[i]);
-	      }
-	    else
-	      vec_add (s, cstring, len);
-	  }
-	  break;
-
-	case 'v':
-	  {
-	    u8 *v = va_arg (*va, u8 *);
-	    uword len;
-
-	    if (fi.width[1] != 0)
-	      len = clib_min (vec_len (v), fi.width[1]);
-	    else
-	      len = vec_len (v);
-
-	    vec_add (s, v, len);
-	  }
-	  break;
-
-	case 'f':
-	case 'g':
-	case 'e':
-	  /* Floating point. */
-	  ASSERT (fi.how_long == 0 || fi.how_long == 'l');
-	  s = format_float (s, va_arg (*va, double), fi.width[1], c);
-	  break;
-
-	case 'U':
-	  /* User defined function. */
-	  {
-	    typedef u8 *(user_func_t) (u8 * s, va_list * args);
-	    user_func_t *u = va_arg (*va, user_func_t *);
-
-	    s = (*u) (s, va);
-	  }
-	  break;
-	}
-
-      s = justify (s, &fi, s_initial_len);
-    }
-
-done:
-  *_s = s;
-  return f;
-}
-
-u8 *
-va_format (u8 * s, const char *fmt, va_list * va)
-{
-  u8 *f = (u8 *) fmt, *g;
-  u8 c;
-
-  g = f;
-  while (1)
-    {
-      c = *f;
-
-      if (!c)
-	break;
-
-      if (c == '%')
-	{
-	  if (f > g)
-	    vec_add (s, g, f - g);
-	  f = g = do_percent (&s, f, va);
-	}
-      else
-	{
-	  f++;
-	}
-    }
-
-  if (f > g)
-    vec_add (s, g, f - g);
-
-  return s;
-}
-
-u8 *
-format (u8 * s, const char *fmt, ...)
-{
-  va_list va;
-  va_start (va, fmt);
-  s = va_format (s, fmt, &va);
-  va_end (va);
-  return s;
-}
-
-word
-va_fformat (FILE * f, char *fmt, va_list * va)
-{
-  word ret;
-  u8 *s;
-
-  s = va_format (0, fmt, va);
-
-#ifdef CLIB_UNIX
-  if (f)
-    {
-      ret = fwrite (s, vec_len (s), 1, f);
-    }
-  else
-#endif /* CLIB_UNIX */
-    {
-      ret = 0;
-      os_puts (s, vec_len (s), /* is_error */ 0);
-    }
-
-  vec_free (s);
-  return ret;
-}
-
-word
-fformat (FILE * f, char *fmt, ...)
-{
-  va_list va;
-  word ret;
-
-  va_start (va, fmt);
-  ret = va_fformat (f, fmt, &va);
-  va_end (va);
-
-  return (ret);
-}
-
-#ifdef CLIB_UNIX
-word
-fdformat (int fd, char *fmt, ...)
-{
-  word ret;
-  u8 *s;
-  va_list va;
-
-  va_start (va, fmt);
-  s = va_format (0, fmt, &va);
-  va_end (va);
-
-  ret = write (fd, s, vec_len (s));
-  vec_free (s);
-  return ret;
-}
-#endif
-
-/* Format integral type. */
-static u8 *
-format_integer (u8 * s, u64 number, format_integer_options_t * options)
-{
-  u64 q;
-  u32 r;
-  u8 digit_buffer[128];
-  u8 *d = digit_buffer + sizeof (digit_buffer);
-  word c, base;
-
-  if (options->is_signed && (i64) number < 0)
-    {
-      number = -number;
-      vec_add1 (s, '-');
-    }
-
-  if (options->n_bits < BITS (number))
-    number &= ((u64) 1 << options->n_bits) - 1;
-
-  base = options->base;
-
-  while (1)
-    {
-      q = number / base;
-      r = number % base;
-
-      if (r < 10 + 26 + 26)
-	{
-	  if (r < 10)
-	    c = '0' + r;
-	  else if (r < 10 + 26)
-	    c = 'a' + (r - 10);
-	  else
-	    c = 'A' + (r - 10 - 26);
-
-	  if (options->uppercase_digits
-	      && base <= 10 + 26 && c >= 'a' && c <= 'z')
-	    c += 'A' - 'a';
-
-	  *--d = c;
-	}
-      else			/* will never happen, warning be gone */
-	{
-	  *--d = '?';
-	}
-
-      if (q == 0)
-	break;
-
-      number = q;
-    }
-
-  vec_add (s, d, digit_buffer + sizeof (digit_buffer) - d);
-  return s;
-}
-
-/* Floating point formatting. */
-/* Deconstruct IEEE 64 bit number into sign exponent and fraction. */
-#define f64_down(f,sign,expon,fraction)				\
-do {								\
-  union { u64 u; f64 f; } _f64_down_tmp;			\
-  _f64_down_tmp.f = (f);					\
-  (sign) = (_f64_down_tmp.u >> 63);				\
-  (expon) = ((_f64_down_tmp.u >> 52) & 0x7ff) - 1023;		\
-  (fraction) = ((_f64_down_tmp.u << 12) >> 12) | ((u64) 1 << 52); \
-} while (0)
-
-/* Construct IEEE 64 bit number. */
-static f64
-f64_up (uword sign, word expon, u64 fraction)
-{
-  union
-  {
-    u64 u;
-    f64 f;
-  } tmp;
-
-  tmp.u = (u64) ((sign) != 0) << 63;
-
-  expon += 1023;
-  if (expon > 1023)
-    expon = 1023;
-  if (expon < 0)
-    expon = 0;
-  tmp.u |= (u64) expon << 52;
-
-  tmp.u |= fraction & (((u64) 1 << 52) - 1);
-
-  return tmp.f;
-}
-
-/* Returns approximate precision of number given its exponent. */
-static f64
-f64_precision (int base2_expon)
-{
-  static int n_bits = 0;
-
-  if (!n_bits)
-    {
-      /* Compute number of significant bits in floating point representation. */
-      f64 one = 0;
-      f64 small = 1;
-
-      while (one != 1)
-	{
-	  small *= .5;
-	  n_bits++;
-	  one = 1 + small;
-	}
-    }
-
-  return f64_up (0, base2_expon - n_bits, 0);
-}
-
-/* Return x 10^n */
-static f64
-times_power_of_ten (f64 x, int n)
-{
-  if (n >= 0)
-    {
-      static f64 t[8] = { 1e+0, 1e+1, 1e+2, 1e+3, 1e+4, 1e+5, 1e+6, 1e+7, };
-      while (n >= 8)
-	{
-	  x *= 1e+8;
-	  n -= 8;
-	}
-      return x * t[n];
-    }
-  else
-    {
-      static f64 t[8] = { 1e-0, 1e-1, 1e-2, 1e-3, 1e-4, 1e-5, 1e-6, 1e-7, };
-      while (n <= -8)
-	{
-	  x *= 1e-8;
-	  n += 8;
-	}
-      return x * t[-n];
-    }
-
-}
-
-/* Write x = y * 10^expon with 1 < y < 10. */
-static f64
-normalize (f64 x, word * expon_return, f64 * prec_return)
-{
-  word expon2, expon10;
-  CLIB_UNUSED (u64 fraction);
-  CLIB_UNUSED (word sign);
-  f64 prec;
-
-  f64_down (x, sign, expon2, fraction);
-
-  expon10 =
-    .5 +
-    expon2 * .301029995663981195213738894724493 /* Log (2) / Log (10) */ ;
-
-  prec = f64_precision (expon2);
-  x = times_power_of_ten (x, -expon10);
-  prec = times_power_of_ten (prec, -expon10);
-
-  while (x < 1)
-    {
-      x *= 10;
-      prec *= 10;
-      expon10--;
-    }
-
-  while (x > 10)
-    {
-      x *= .1;
-      prec *= .1;
-      expon10++;
-    }
-
-  if (x + prec >= 10)
-    {
-      x = 1;
-      expon10++;
-    }
-
-  *expon_return = expon10;
-  *prec_return = prec;
-
-  return x;
-}
-
-static u8 *
-add_some_zeros (u8 * s, uword n_zeros)
-{
-  while (n_zeros > 0)
-    {
-      vec_add1 (s, '0');
-      n_zeros--;
-    }
-  return s;
-}
-
-/* Format a floating point number with the given number of fractional
-   digits (e.g. 1.2345 with 2 fraction digits yields "1.23") and output style. */
-static u8 *
-format_float (u8 * s, f64 x, uword n_fraction_digits, uword output_style)
-{
-  f64 prec;
-  word sign, expon, n_fraction_done, added_decimal_point;
-  /* Position of decimal point relative to where we are. */
-  word decimal_point;
-
-  /* Default number of digits to print when its not specified. */
-  if (n_fraction_digits == ~0)
-    n_fraction_digits = 7;
-  n_fraction_done = 0;
-  decimal_point = 0;
-  added_decimal_point = 0;
-  sign = expon = 0;
-
-  /* Special case: zero. */
-  if (x == 0)
-    {
-    do_zero:
-      vec_add1 (s, '0');
-      goto done;
-    }
-
-  if (x < 0)
-    {
-      x = -x;
-      sign = 1;
-    }
-
-  /* Check for infinity. */
-  if (x == x / 2)
-    return format (s, "%cinfinity", sign ? '-' : '+');
-
-  x = normalize (x, &expon, &prec);
-
-  /* Not enough digits to print anything: so just print 0 */
-  if ((word) - expon > (word) n_fraction_digits
-      && (output_style == 'f' || (output_style == 'g')))
-    goto do_zero;
-
-  if (sign)
-    vec_add1 (s, '-');
-
-  if (output_style == 'f'
-      || (output_style == 'g' && expon > -10 && expon < 10))
-    {
-      if (expon < 0)
-	{
-	  /* Add decimal point and leading zeros. */
-	  vec_add1 (s, '.');
-	  n_fraction_done = clib_min (-(expon + 1), n_fraction_digits);
-	  s = add_some_zeros (s, n_fraction_done);
-	  decimal_point = -n_fraction_done;
-	  added_decimal_point = 1;
-	}
-      else
-	decimal_point = expon + 1;
-    }
-  else
-    {
-      /* Exponential output style. */
-      decimal_point = 1;
-      output_style = 'e';
-    }
-
-  while (1)
-    {
-      uword digit;
-
-      /* Number is smaller than precision: call it zero. */
-      if (x < prec)
-	break;
-
-      digit = x;
-      x -= digit;
-      if (x + prec >= 1)
-	{
-	  digit++;
-	  x -= 1;
-	}
-
-      /* Round last printed digit. */
-      if (decimal_point <= 0
-	  && n_fraction_done + 1 == n_fraction_digits && digit < 9)
-	digit += x >= .5;
-
-      vec_add1 (s, '0' + digit);
-
-      /* Move rightwards towards/away from decimal point. */
-      decimal_point--;
-
-      n_fraction_done += decimal_point < 0;
-      if (decimal_point <= 0 && n_fraction_done >= n_fraction_digits)
-	break;
-
-      if (decimal_point == 0 && x != 0)
-	{
-	  vec_add1 (s, '.');
-	  added_decimal_point = 1;
-	}
-
-      x *= 10;
-      prec *= 10;
-    }
-
-done:
-  if (decimal_point > 0)
-    {
-      s = add_some_zeros (s, decimal_point);
-      decimal_point = 0;
-    }
-
-  if (n_fraction_done < n_fraction_digits)
-    {
-      if (!added_decimal_point)
-	vec_add1 (s, '.');
-      s = add_some_zeros (s, n_fraction_digits - n_fraction_done);
-    }
-
-  if (output_style == 'e')
-    s = format (s, "e%wd", expon);
-
-  return s;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/format.h b/vppinfra/vppinfra/format.h
deleted file mode 100644
index bc0d6d15..00000000
--- a/vppinfra/vppinfra/format.h
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_format_h
-#define included_format_h
-
-#include <stdarg.h>
-
-#include <vppinfra/clib.h>	/* for CLIB_UNIX, etc. */
-#include <vppinfra/vec.h>
-#include <vppinfra/error.h>	/* for ASSERT */
-#include <vppinfra/string.h>
-
-typedef u8 *(format_function_t) (u8 * s, va_list * args);
-
-u8 *va_format (u8 * s, const char *format, va_list * args);
-u8 *format (u8 * s, const char *format, ...);
-
-#ifdef CLIB_UNIX
-
-#include <stdio.h>
-
-#else /* ! CLIB_UNIX */
-
-/* We're not Unix and have not stdio.h */
-#define FILE void
-#define stdin ((FILE *) 0)
-#define stdout ((FILE *) 1)
-#define stderr ((FILE *) 2)
-
-#endif
-
-word va_fformat (FILE * f, char *fmt, va_list * va);
-word fformat (FILE * f, char *fmt, ...);
-word fdformat (int fd, char *fmt, ...);
-
-always_inline uword
-format_get_indent (u8 * s)
-{
-  uword indent = 0;
-  u8 *nl;
-
-  if (!s)
-    return indent;
-
-  nl = vec_end (s) - 1;
-  while (nl >= s)
-    {
-      if (*nl-- == '\n')
-	break;
-      indent++;
-    }
-  return indent;
-}
-
-#define _(f) u8 * f (u8 * s, va_list * va)
-
-/* Standard user-defined formats. */
-_(format_vec32);
-_(format_vec_uword);
-_(format_ascii_bytes);
-_(format_hex_bytes);
-_(format_white_space);
-_(format_f64);
-_(format_time_interval);
-
-#ifdef CLIB_UNIX
-/* Unix specific formats. */
-_(format_address_family);
-_(format_unix_arphrd);
-_(format_unix_interface_flags);
-_(format_network_address);
-_(format_network_protocol);
-_(format_network_port);
-_(format_sockaddr);
-_(format_ip4_tos_byte);
-_(format_ip4_packet);
-_(format_icmp4_type_and_code);
-_(format_ethernet_packet);
-_(format_hostname);
-_(format_timeval);
-_(format_time_float);
-_(format_signal);
-_(format_ucontext_pc);
-#endif
-
-#undef _
-
-/* Unformat. */
-
-typedef struct _unformat_input_t
-{
-  /* Input buffer (vector). */
-  u8 *buffer;
-
-  /* Current index in input buffer. */
-  uword index;
-
-  /* Vector of buffer marks.  Used to delineate pieces of the buffer
-     for error reporting and for parse recovery. */
-  uword *buffer_marks;
-
-  /* User's function to fill the buffer when its empty
-     (and argument). */
-    uword (*fill_buffer) (struct _unformat_input_t * i);
-
-  /* Return values for fill buffer function which indicate whether not
-     input has been exhausted. */
-#define UNFORMAT_END_OF_INPUT (~0)
-#define UNFORMAT_MORE_INPUT   0
-
-  /* User controlled argument to fill buffer function. */
-  void *fill_buffer_arg;
-} unformat_input_t;
-
-always_inline void
-unformat_init (unformat_input_t * i,
-	       uword (*fill_buffer) (unformat_input_t *),
-	       void *fill_buffer_arg)
-{
-  memset (i, 0, sizeof (i[0]));
-  i->fill_buffer = fill_buffer;
-  i->fill_buffer_arg = fill_buffer_arg;
-}
-
-always_inline void
-unformat_free (unformat_input_t * i)
-{
-  vec_free (i->buffer);
-  vec_free (i->buffer_marks);
-  memset (i, 0, sizeof (i[0]));
-}
-
-always_inline uword
-unformat_check_input (unformat_input_t * i)
-{
-  /* Low level fill input function. */
-  extern uword _unformat_fill_input (unformat_input_t * i);
-
-  if (i->index >= vec_len (i->buffer) && i->index != UNFORMAT_END_OF_INPUT)
-    _unformat_fill_input (i);
-
-  return i->index;
-}
-
-/* Return true if input is exhausted */
-always_inline uword
-unformat_is_eof (unformat_input_t * input)
-{
-  return unformat_check_input (input) == UNFORMAT_END_OF_INPUT;
-}
-
-/* Return next element in input vector,
-   possibly calling fill input to get more. */
-always_inline uword
-unformat_get_input (unformat_input_t * input)
-{
-  uword i = unformat_check_input (input);
-  if (i < vec_len (input->buffer))
-    {
-      input->index = i + 1;
-      i = input->buffer[i];
-    }
-  return i;
-}
-
-/* Back up input pointer by one. */
-always_inline void
-unformat_put_input (unformat_input_t * input)
-{
-  input->index -= 1;
-}
-
-/* Peek current input character without advancing. */
-always_inline uword
-unformat_peek_input (unformat_input_t * input)
-{
-  uword c = unformat_get_input (input);
-  if (c != UNFORMAT_END_OF_INPUT)
-    unformat_put_input (input);
-  return c;
-}
-
-/* Skip current input line. */
-always_inline void
-unformat_skip_line (unformat_input_t * i)
-{
-  uword c;
-
-  while ((c = unformat_get_input (i)) != UNFORMAT_END_OF_INPUT && c != '\n')
-    ;
-}
-
-uword unformat_skip_white_space (unformat_input_t * input);
-
-/* Unformat function. */
-typedef uword (unformat_function_t) (unformat_input_t * input,
-				     va_list * args);
-
-/* External functions. */
-
-/* General unformatting function with programmable input stream. */
-uword unformat (unformat_input_t * i, char *fmt, ...);
-
-/* Call user defined parse function.
-   unformat_user (i, f, ...) is equivalent to unformat (i, "%U", f, ...) */
-uword unformat_user (unformat_input_t * input, unformat_function_t * func,
-		     ...);
-
-/* Alternate version which allows for extensions. */
-uword va_unformat (unformat_input_t * i, char *fmt, va_list * args);
-
-/* Setup for unformat of Unix style command line. */
-void unformat_init_command_line (unformat_input_t * input, char *argv[]);
-
-/* Setup for unformat of given string. */
-void unformat_init_string (unformat_input_t * input,
-			   char *string, int string_len);
-
-always_inline void
-unformat_init_cstring (unformat_input_t * input, char *string)
-{
-  unformat_init_string (input, string, strlen (string));
-}
-
-/* Setup for unformat of given vector string; vector will be freed by unformat_string. */
-void unformat_init_vector (unformat_input_t * input, u8 * vector_string);
-
-/* Format function for unformat input usable when an unformat error
-   has occurred. */
-u8 *format_unformat_error (u8 * s, va_list * va);
-
-#define unformat_parse_error(input)						\
-  clib_error_return (0, "parse error `%U'", format_unformat_error, input)
-
-/* Print all input: not just error context. */
-u8 *format_unformat_input (u8 * s, va_list * va);
-
-/* Unformat (parse) function which reads a %s string and converts it
-   to and unformat_input_t. */
-unformat_function_t unformat_input;
-
-/* Parse a line ending with \n and return it. */
-unformat_function_t unformat_line;
-
-/* Parse a line ending with \n and return it as an unformat_input_t. */
-unformat_function_t unformat_line_input;
-
-/* Parse a token containing given set of characters. */
-unformat_function_t unformat_token;
-
-/* Parses a hexstring into a vector of bytes. */
-unformat_function_t unformat_hex_string;
-
-/* Returns non-zero match if input is exhausted.
-   Useful to ensure that the entire input matches with no trailing junk. */
-unformat_function_t unformat_eof;
-
-/* Parse memory size e.g. 100, 100k, 100m, 100g. */
-unformat_function_t unformat_memory_size;
-
-/* Unparse memory size e.g. 100, 100k, 100m, 100g. */
-u8 *format_memory_size (u8 * s, va_list * va);
-
-/* Format c identifier: e.g. a_name -> "a name". */
-u8 *format_c_identifier (u8 * s, va_list * va);
-
-/* Format hexdump with both hex and printable chars - compatible with text2pcap */
-u8 *format_hexdump (u8 * s, va_list * va);
-
-/* Unix specific formats. */
-#ifdef CLIB_UNIX
-/* Setup input from Unix file. */
-void unformat_init_unix_file (unformat_input_t * input, int file_descriptor);
-
-/* Take input from Unix environment variable; returns
-   1 if variable exists zero otherwise. */
-uword unformat_init_unix_env (unformat_input_t * input, char *var);
-#endif /* CLIB_UNIX */
-
-/* Test code. */
-int test_format_main (unformat_input_t * input);
-int test_unformat_main (unformat_input_t * input);
-
-/* This is not the right place for this, but putting it in vec.h
-created circular dependency problems. */
-int test_vec_main (unformat_input_t * input);
-
-#endif /* included_format_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/graph.c b/vppinfra/vppinfra/graph.c
deleted file mode 100644
index 98a29046..00000000
--- a/vppinfra/vppinfra/graph.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vppinfra/graph.h>
-
-/* Set link distance, creating link if not found. */
-u32
-graph_set_link (graph_t * g, u32 src, u32 dst, u32 distance)
-{
-  graph_node_t *src_node, *dst_node;
-  graph_link_t *l;
-  u32 old_distance;
-
-  /* The following validate will not work if src or dst are on the
-     pool free list. */
-  if (src < vec_len (g->nodes))
-    ASSERT (!pool_is_free_index (g->nodes, src));
-  if (dst < vec_len (g->nodes))
-    ASSERT (!pool_is_free_index (g->nodes, dst));
-
-  /* Make new (empty) nodes to make src and dst valid. */
-  pool_validate_index (g->nodes, clib_max (src, dst));
-
-  src_node = pool_elt_at_index (g->nodes, src);
-  dst_node = pool_elt_at_index (g->nodes, dst);
-
-  l = graph_dir_get_link_to_node (&src_node->next, dst);
-  if (l)
-    {
-      old_distance = l->distance;
-      l->distance = distance;
-
-      l = graph_dir_get_link_to_node (&dst_node->prev, src);
-      l->distance = distance;
-    }
-  else
-    {
-      uword li_next, li_prev;
-
-      old_distance = ~0;
-
-      li_next = graph_dir_add_link (&src_node->next, dst, distance);
-      li_prev = graph_dir_add_link (&dst_node->prev, src, distance);
-
-      l = vec_elt_at_index (src_node->next.links, li_next);
-      l->link_to_self_index = li_prev;
-
-      l = vec_elt_at_index (dst_node->prev.links, li_prev);
-      l->link_to_self_index = li_next;
-    }
-
-  return old_distance;
-}
-
-void
-graph_del_link (graph_t * g, u32 src, u32 dst)
-{
-  graph_node_t *src_node, *dst_node;
-
-  src_node = pool_elt_at_index (g->nodes, src);
-  dst_node = pool_elt_at_index (g->nodes, dst);
-
-  graph_dir_del_link (&src_node->next, dst);
-  graph_dir_del_link (&dst_node->next, src);
-}
-
-/* Delete source node and all links from other nodes from/to source. */
-uword
-graph_del_node (graph_t * g, u32 src)
-{
-  graph_node_t *src_node, *n;
-  uword index;
-  graph_link_t *l;
-
-  src_node = pool_elt_at_index (g->nodes, src);
-
-  vec_foreach (l, src_node->next.links)
-  {
-    n = pool_elt_at_index (g->nodes, l->node_index);
-    graph_dir_del_link (&n->prev, src);
-  }
-
-  vec_foreach (l, src_node->prev.links)
-  {
-    n = pool_elt_at_index (g->nodes, l->node_index);
-    graph_dir_del_link (&n->next, src);
-  }
-
-  graph_dir_free (&src_node->next);
-  graph_dir_free (&src_node->prev);
-
-  index = src_node - g->nodes;
-  pool_put (g->nodes, src_node);
-  memset (src_node, ~0, sizeof (src_node[0]));
-
-  return index;
-}
-
-uword
-unformat_graph (unformat_input_t * input, va_list * args)
-{
-  graph_t *g = va_arg (*args, graph_t *);
-  typedef struct
-  {
-    u32 src, dst, distance;
-  } T;
-  T *links = 0, *l;
-  uword result;
-
-  while (1)
-    {
-      vec_add2 (links, l, 1);
-      if (!unformat (input, "%d%d%d", &l->src, &l->dst, &l->distance))
-	break;
-    }
-  _vec_len (links) -= 1;
-  result = vec_len (links) > 0;
-  vec_foreach (l, links)
-  {
-    graph_set_link (g, l->src, l->dst, l->distance);
-    graph_set_link (g, l->dst, l->src, l->distance);
-  }
-
-  vec_free (links);
-  return result;
-}
-
-u8 *
-format_graph_node (u8 * s, va_list * args)
-{
-  graph_t *g = va_arg (*args, graph_t *);
-  u32 node_index = va_arg (*args, u32);
-
-  if (g->format_node)
-    s = format (s, "%U", g->format_node, g, node_index);
-  else
-    s = format (s, "%d", node_index);
-
-  return s;
-}
-
-u8 *
-format_graph (u8 * s, va_list * args)
-{
-  graph_t *g = va_arg (*args, graph_t *);
-  graph_node_t *n;
-  graph_link_t *l;
-  uword indent = format_get_indent (s);
-
-  s = format (s, "graph %d nodes", pool_elts (g->nodes));
-  /* *INDENT-OFF* */
-  pool_foreach (n, g->nodes, ({
-    s = format (s, "\n%U", format_white_space, indent + 2);
-    s = format (s, "%U -> ", format_graph_node, g, n - g->nodes);
-    vec_foreach (l, n->next.links)
-      s = format (s, "%U (%d), ",
-		  format_graph_node, g, l->node_index,
-		  l->distance);
-  }));
-  /* *INDENT-ON* */
-
-  return s;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/graph.h b/vppinfra/vppinfra/graph.h
deleted file mode 100644
index 1c26118f..00000000
--- a/vppinfra/vppinfra/graph.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_clib_graph_h
-#define included_clib_graph_h
-
-#include <vppinfra/format.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/pool.h>
-
-/* Generic graphs. */
-typedef struct
-{
-  /* Next node along this link. */
-  u32 node_index;
-
-  /* Other direction link index to reach back to current node. */
-  u32 link_to_self_index;
-
-  /* Distance to next node. */
-  u32 distance;
-} graph_link_t;
-
-/* Direction on graph: either next or previous. */
-typedef struct
-{
-  /* Vector of links. */
-  graph_link_t *links;
-
-  /* Hash mapping node index to link which visits this node. */
-  uword *link_index_by_node_index;
-} graph_dir_t;
-
-always_inline void
-graph_dir_free (graph_dir_t * d)
-{
-  vec_free (d->links);
-  hash_free (d->link_index_by_node_index);
-}
-
-always_inline graph_link_t *
-graph_dir_get_link_to_node (graph_dir_t * d, u32 node_index)
-{
-  uword *p = hash_get (d->link_index_by_node_index, node_index);
-  return p ? vec_elt_at_index (d->links, p[0]) : 0;
-}
-
-always_inline uword
-graph_dir_add_link (graph_dir_t * d, u32 node_index, u32 distance)
-{
-  graph_link_t *l;
-  ASSERT (!graph_dir_get_link_to_node (d, node_index));
-  vec_add2 (d->links, l, 1);
-  l->node_index = node_index;
-  l->distance = distance;
-  hash_set (d->link_index_by_node_index, node_index, l - d->links);
-  return l - d->links;
-}
-
-always_inline void
-graph_dir_del_link (graph_dir_t * d, u32 node_index)
-{
-  graph_link_t *l = graph_dir_get_link_to_node (d, node_index);
-  uword li = l - d->links;
-  uword n_links = vec_len (d->links);
-
-  ASSERT (l != 0);
-  hash_unset (d->link_index_by_node_index, node_index);
-  n_links -= 1;
-  if (li < n_links)
-    d->links[li] = d->links[n_links];
-  _vec_len (d->links) = n_links;
-}
-
-typedef struct
-{
-  /* Nodes we are connected to plus distances. */
-  graph_dir_t next, prev;
-} graph_node_t;
-
-typedef struct
-{
-  /* Pool of nodes. */
-  graph_node_t *nodes;
-
-  void *opaque;
-
-  format_function_t *format_node;
-} graph_t;
-
-/* Set link distance, creating link if not found. */
-u32 graph_set_link (graph_t * g, u32 src, u32 dst, u32 distance);
-
-always_inline void
-graph_set_bidirectional_link (graph_t * g, u32 src, u32 dst, u32 distance)
-{
-  graph_set_link (g, src, dst, distance);
-  graph_set_link (g, dst, src, distance);
-}
-
-void graph_del_link (graph_t * g, u32 src, u32 dst);
-uword graph_del_node (graph_t * g, u32 src);
-
-unformat_function_t unformat_graph;
-format_function_t format_graph;
-format_function_t format_graph_node;
-
-#endif /* included_clib_graph_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/hash.c b/vppinfra/vppinfra/hash.c
deleted file mode 100644
index 062ad882..00000000
--- a/vppinfra/vppinfra/hash.c
+++ /dev/null
@@ -1,1095 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001-2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/mem.h>
-#include <vppinfra/byte_order.h>	/* for clib_arch_is_big_endian */
-
-always_inline void
-zero_pair (hash_t * h, hash_pair_t * p)
-{
-  memset (p, 0, hash_pair_bytes (h));
-}
-
-always_inline void
-init_pair (hash_t * h, hash_pair_t * p)
-{
-  memset (p->value, ~0, hash_value_bytes (h));
-}
-
-always_inline hash_pair_union_t *
-get_pair (void *v, uword i)
-{
-  hash_t *h = hash_header (v);
-  hash_pair_t *p;
-  ASSERT (i < vec_len (v));
-  p = v;
-  p += i << h->log2_pair_size;
-  return (hash_pair_union_t *) p;
-}
-
-always_inline void
-set_is_user (void *v, uword i, uword is_user)
-{
-  hash_t *h = hash_header (v);
-  uword i0 = i / BITS (h->is_user[0]);
-  uword i1 = (uword) 1 << (i % BITS (h->is_user[0]));
-  if (is_user)
-    h->is_user[i0] |= i1;
-  else
-    h->is_user[i0] &= ~i1;
-}
-
-static u8 *hash_format_pair_default (u8 * s, va_list * args);
-
-#if uword_bits == 64
-
-static inline u64
-zap64 (u64 x, word n)
-{
-#define _(n) (((u64) 1 << (u64) (8*(n))) - (u64) 1)
-  static u64 masks_little_endian[] = {
-    0, _(1), _(2), _(3), _(4), _(5), _(6), _(7),
-  };
-  static u64 masks_big_endian[] = {
-    0, ~_(7), ~_(6), ~_(5), ~_(4), ~_(3), ~_(2), ~_(1),
-  };
-#undef _
-  if (clib_arch_is_big_endian)
-    return x & masks_big_endian[n];
-  else
-    return x & masks_little_endian[n];
-}
-
-static inline u64
-hash_memory64 (void *p, word n_bytes, u64 state)
-{
-  u64 *q = p;
-  u64 a, b, c, n;
-
-  a = b = 0x9e3779b97f4a7c13LL;
-  c = state;
-  n = n_bytes;
-
-  while (n >= 3 * sizeof (u64))
-    {
-      a += clib_mem_unaligned (q + 0, u64);
-      b += clib_mem_unaligned (q + 1, u64);
-      c += clib_mem_unaligned (q + 2, u64);
-      hash_mix64 (a, b, c);
-      n -= 3 * sizeof (u64);
-      q += 3;
-    }
-
-  c += n_bytes;
-  switch (n / sizeof (u64))
-    {
-    case 2:
-      a += clib_mem_unaligned (q + 0, u64);
-      b += clib_mem_unaligned (q + 1, u64);
-      if (n % sizeof (u64))
-	c += zap64 (clib_mem_unaligned (q + 2, u64), n % sizeof (u64)) << 8;
-      break;
-
-    case 1:
-      a += clib_mem_unaligned (q + 0, u64);
-      if (n % sizeof (u64))
-	b += zap64 (clib_mem_unaligned (q + 1, u64), n % sizeof (u64));
-      break;
-
-    case 0:
-      if (n % sizeof (u64))
-	a += zap64 (clib_mem_unaligned (q + 0, u64), n % sizeof (u64));
-      break;
-    }
-
-  hash_mix64 (a, b, c);
-
-  return c;
-}
-
-#else /* if uword_bits == 64 */
-
-static inline u32
-zap32 (u32 x, word n)
-{
-#define _(n) (((u32) 1 << (u32) (8*(n))) - (u32) 1)
-  static u32 masks_little_endian[] = {
-    0, _(1), _(2), _(3),
-  };
-  static u32 masks_big_endian[] = {
-    0, ~_(3), ~_(2), ~_(1),
-  };
-#undef _
-  if (clib_arch_is_big_endian)
-    return x & masks_big_endian[n];
-  else
-    return x & masks_little_endian[n];
-}
-
-static inline u32
-hash_memory32 (void *p, word n_bytes, u32 state)
-{
-  u32 *q = p;
-  u32 a, b, c, n;
-
-  a = b = 0x9e3779b9;
-  c = state;
-  n = n_bytes;
-
-  while (n >= 3 * sizeof (u32))
-    {
-      a += clib_mem_unaligned (q + 0, u32);
-      b += clib_mem_unaligned (q + 1, u32);
-      c += clib_mem_unaligned (q + 2, u32);
-      hash_mix32 (a, b, c);
-      n -= 3 * sizeof (u32);
-      q += 3;
-    }
-
-  c += n_bytes;
-  switch (n / sizeof (u32))
-    {
-    case 2:
-      a += clib_mem_unaligned (q + 0, u32);
-      b += clib_mem_unaligned (q + 1, u32);
-      if (n % sizeof (u32))
-	c += zap32 (clib_mem_unaligned (q + 2, u32), n % sizeof (u32)) << 8;
-      break;
-
-    case 1:
-      a += clib_mem_unaligned (q + 0, u32);
-      if (n % sizeof (u32))
-	b += zap32 (clib_mem_unaligned (q + 1, u32), n % sizeof (u32));
-      break;
-
-    case 0:
-      if (n % sizeof (u32))
-	a += zap32 (clib_mem_unaligned (q + 0, u32), n % sizeof (u32));
-      break;
-    }
-
-  hash_mix32 (a, b, c);
-
-  return c;
-}
-#endif
-
-uword
-hash_memory (void *p, word n_bytes, uword state)
-{
-  uword *q = p;
-
-#if uword_bits == 64
-  return hash_memory64 (q, n_bytes, state);
-#else
-  return hash_memory32 (q, n_bytes, state);
-#endif
-}
-
-#if uword_bits == 64
-always_inline uword
-hash_uword (uword x)
-{
-  u64 a, b, c;
-
-  a = b = 0x9e3779b97f4a7c13LL;
-  c = 0;
-  a += x;
-  hash_mix64 (a, b, c);
-  return c;
-}
-#else
-always_inline uword
-hash_uword (uword x)
-{
-  u32 a, b, c;
-
-  a = b = 0x9e3779b9;
-  c = 0;
-  a += x;
-  hash_mix32 (a, b, c);
-  return c;
-}
-#endif
-
-/* Call sum function.  Hash code will be sum function value
-   modulo the prime length of the hash table. */
-always_inline uword
-key_sum (hash_t * h, uword key)
-{
-  uword sum;
-  switch (pointer_to_uword ((void *) h->key_sum))
-    {
-    case KEY_FUNC_NONE:
-      sum = hash_uword (key);
-      break;
-
-    case KEY_FUNC_POINTER_UWORD:
-      sum = hash_uword (*uword_to_pointer (key, uword *));
-      break;
-
-    case KEY_FUNC_POINTER_U32:
-      sum = hash_uword (*uword_to_pointer (key, u32 *));
-      break;
-
-    case KEY_FUNC_STRING:
-      sum = string_key_sum (h, key);
-      break;
-
-    default:
-      sum = h->key_sum (h, key);
-      break;
-    }
-
-  return sum;
-}
-
-always_inline uword
-key_equal1 (hash_t * h, uword key1, uword key2, uword e)
-{
-  switch (pointer_to_uword ((void *) h->key_equal))
-    {
-    case KEY_FUNC_NONE:
-      break;
-
-    case KEY_FUNC_POINTER_UWORD:
-      e =
-	*uword_to_pointer (key1, uword *) == *uword_to_pointer (key2,
-								uword *);
-      break;
-
-    case KEY_FUNC_POINTER_U32:
-      e = *uword_to_pointer (key1, u32 *) == *uword_to_pointer (key2, u32 *);
-      break;
-
-    case KEY_FUNC_STRING:
-      e = string_key_equal (h, key1, key2);
-      break;
-
-    default:
-      e = h->key_equal (h, key1, key2);
-      break;
-    }
-  return e;
-}
-
-/* Compares two keys: returns 1 if equal, 0 if not. */
-always_inline uword
-key_equal (hash_t * h, uword key1, uword key2)
-{
-  uword e = key1 == key2;
-  if (CLIB_DEBUG > 0 && key1 == key2)
-    ASSERT (key_equal1 (h, key1, key2, e));
-  if (!e)
-    e = key_equal1 (h, key1, key2, e);
-  return e;
-}
-
-static hash_pair_union_t *
-get_indirect (void *v, hash_pair_indirect_t * pi, uword key)
-{
-  hash_t *h = hash_header (v);
-  hash_pair_t *p0, *p1;
-
-  p0 = p1 = pi->pairs;
-  if (h->log2_pair_size > 0)
-    p1 = hash_forward (h, p0, indirect_pair_get_len (pi));
-  else
-    p1 += vec_len (p0);
-
-  while (p0 < p1)
-    {
-      if (key_equal (h, p0->key, key))
-	return (hash_pair_union_t *) p0;
-      p0 = hash_forward1 (h, p0);
-    }
-
-  return (hash_pair_union_t *) 0;
-}
-
-static hash_pair_union_t *
-set_indirect_is_user (void *v, uword i, hash_pair_union_t * p, uword key)
-{
-  hash_t *h = hash_header (v);
-  hash_pair_t *q;
-  hash_pair_indirect_t *pi = &p->indirect;
-  uword log2_bytes = 0;
-
-  if (h->log2_pair_size == 0)
-    q = vec_new (hash_pair_t, 2);
-  else
-    {
-      log2_bytes = 1 + hash_pair_log2_bytes (h);
-      q = clib_mem_alloc (1ULL << log2_bytes);
-    }
-  clib_memcpy (q, &p->direct, hash_pair_bytes (h));
-
-  pi->pairs = q;
-  if (h->log2_pair_size > 0)
-    indirect_pair_set (pi, log2_bytes, 2);
-
-  set_is_user (v, i, 0);
-
-  /* First element is used by existing pair, second will be used by caller. */
-  q = hash_forward1 (h, q);
-  q->key = key;
-  init_pair (h, q);
-  return (hash_pair_union_t *) q;
-}
-
-static hash_pair_union_t *
-set_indirect (void *v, hash_pair_indirect_t * pi, uword key,
-	      uword * found_key)
-{
-  hash_t *h = hash_header (v);
-  hash_pair_t *new_pair;
-  hash_pair_union_t *q;
-
-  q = get_indirect (v, pi, key);
-  if (q)
-    {
-      *found_key = 1;
-      return q;
-    }
-
-  if (h->log2_pair_size == 0)
-    vec_add2 (pi->pairs, new_pair, 1);
-  else
-    {
-      uword len, new_len, log2_bytes;
-
-      len = indirect_pair_get_len (pi);
-      log2_bytes = indirect_pair_get_log2_bytes (pi);
-
-      new_len = len + 1;
-      if (new_len * hash_pair_bytes (h) > (1ULL << log2_bytes))
-	{
-	  pi->pairs = clib_mem_realloc (pi->pairs,
-					1ULL << (log2_bytes + 1),
-					1ULL << log2_bytes);
-	  log2_bytes++;
-	}
-
-      indirect_pair_set (pi, log2_bytes, new_len);
-      new_pair = pi->pairs + (len << h->log2_pair_size);
-    }
-  new_pair->key = key;
-  init_pair (h, new_pair);
-  *found_key = 0;
-  return (hash_pair_union_t *) new_pair;
-}
-
-static void
-unset_indirect (void *v, uword i, hash_pair_t * q)
-{
-  hash_t *h = hash_header (v);
-  hash_pair_union_t *p = get_pair (v, i);
-  hash_pair_t *e;
-  hash_pair_indirect_t *pi = &p->indirect;
-  uword len, is_vec;
-
-  is_vec = h->log2_pair_size == 0;
-
-  ASSERT (!hash_is_user (v, i));
-  len = is_vec ? vec_len (pi->pairs) : indirect_pair_get_len (pi);
-  e = hash_forward (h, pi->pairs, len - 1);
-  ASSERT (q >= pi->pairs && q <= e);
-
-  /* We have two or fewer pairs and we are delete one pair.
-     Make indirect pointer direct and free indirect memory. */
-  if (len <= 2)
-    {
-      hash_pair_t *r = pi->pairs;
-
-      if (len == 2)
-	{
-	  clib_memcpy (p, q == r ? hash_forward1 (h, r) : r,
-		       hash_pair_bytes (h));
-	  set_is_user (v, i, 1);
-	}
-      else
-	zero_pair (h, &p->direct);
-
-      if (is_vec)
-	vec_free (r);
-      else if (r)
-	clib_mem_free (r);
-    }
-  else
-    {
-      /* If deleting a pair we need to keep non-null pairs together. */
-      if (q < e)
-	clib_memcpy (q, e, hash_pair_bytes (h));
-      else
-	zero_pair (h, q);
-      if (is_vec)
-	_vec_len (pi->pairs) -= 1;
-      else
-	indirect_pair_set (pi, indirect_pair_get_log2_bytes (pi), len - 1);
-    }
-}
-
-enum lookup_opcode
-{
-  GET = 1,
-  SET = 2,
-  UNSET = 3,
-};
-
-static hash_pair_t *
-lookup (void *v, uword key, enum lookup_opcode op,
-	void *new_value, void *old_value)
-{
-  hash_t *h = hash_header (v);
-  hash_pair_union_t *p = 0;
-  uword found_key = 0;
-  uword i;
-
-  if (!v)
-    return 0;
-
-  i = key_sum (h, key) & (_vec_len (v) - 1);
-  p = get_pair (v, i);
-
-  if (hash_is_user (v, i))
-    {
-      found_key = key_equal (h, p->direct.key, key);
-      if (found_key)
-	{
-	  if (op == UNSET)
-	    {
-	      set_is_user (v, i, 0);
-	      if (old_value)
-		clib_memcpy (old_value, p->direct.value,
-			     hash_value_bytes (h));
-	      zero_pair (h, &p->direct);
-	    }
-	}
-      else
-	{
-	  if (op == SET)
-	    p = set_indirect_is_user (v, i, p, key);
-	  else
-	    p = 0;
-	}
-    }
-  else
-    {
-      hash_pair_indirect_t *pi = &p->indirect;
-
-      if (op == SET)
-	{
-	  if (!pi->pairs)
-	    {
-	      p->direct.key = key;
-	      set_is_user (v, i, 1);
-	    }
-	  else
-	    p = set_indirect (v, pi, key, &found_key);
-	}
-      else
-	{
-	  p = get_indirect (v, pi, key);
-	  found_key = p != 0;
-	  if (found_key && op == UNSET)
-	    {
-	      if (old_value)
-		clib_memcpy (old_value, &p->direct.value,
-			     hash_value_bytes (h));
-
-	      unset_indirect (v, i, &p->direct);
-
-	      /* Nullify p (since it's just been deleted).
-	         Otherwise we might be tempted to play with it. */
-	      p = 0;
-	    }
-	}
-    }
-
-  if (op == SET && p != 0)
-    {
-      /* Save away old value for caller. */
-      if (old_value && found_key)
-	clib_memcpy (old_value, &p->direct.value, hash_value_bytes (h));
-      clib_memcpy (&p->direct.value, new_value, hash_value_bytes (h));
-    }
-
-  if (op == SET)
-    h->elts += !found_key;
-  if (op == UNSET)
-    h->elts -= found_key;
-
-  return &p->direct;
-}
-
-/* Fetch value of key. */
-uword *
-_hash_get (void *v, uword key)
-{
-  hash_t *h = hash_header (v);
-  hash_pair_t *p;
-
-  /* Don't even search table if its empty. */
-  if (!v || h->elts == 0)
-    return 0;
-
-  p = lookup (v, key, GET, 0, 0);
-  if (!p)
-    return 0;
-  if (h->log2_pair_size == 0)
-    return &p->key;
-  else
-    return &p->value[0];
-}
-
-hash_pair_t *
-_hash_get_pair (void *v, uword key)
-{
-  return lookup (v, key, GET, 0, 0);
-}
-
-hash_pair_t *
-hash_next (void *v, hash_next_t * hn)
-{
-  hash_t *h = hash_header (v);
-  hash_pair_t *p;
-
-  while (1)
-    {
-      if (hn->i == 0 && hn->j == 0)
-	{
-	  /* Save flags. */
-	  hn->f = h->flags;
-
-	  /* Prevent others from re-sizing hash table. */
-	  h->flags |=
-	    (HASH_FLAG_NO_AUTO_GROW
-	     | HASH_FLAG_NO_AUTO_SHRINK | HASH_FLAG_HASH_NEXT_IN_PROGRESS);
-	}
-      else if (hn->i >= hash_capacity (v))
-	{
-	  /* Restore flags. */
-	  h->flags = hn->f;
-	  memset (hn, 0, sizeof (hn[0]));
-	  return 0;
-	}
-
-      p = hash_forward (h, v, hn->i);
-      if (hash_is_user (v, hn->i))
-	{
-	  hn->i++;
-	  return p;
-	}
-      else
-	{
-	  hash_pair_indirect_t *pi = (void *) p;
-	  uword n;
-
-	  if (h->log2_pair_size > 0)
-	    n = indirect_pair_get_len (pi);
-	  else
-	    n = vec_len (pi->pairs);
-
-	  if (hn->j >= n)
-	    {
-	      hn->i++;
-	      hn->j = 0;
-	    }
-	  else
-	    return hash_forward (h, pi->pairs, hn->j++);
-	}
-    }
-}
-
-/* Remove key from table. */
-void *
-_hash_unset (void *v, uword key, void *old_value)
-{
-  hash_t *h;
-
-  if (!v)
-    return v;
-
-  (void) lookup (v, key, UNSET, 0, old_value);
-
-  h = hash_header (v);
-  if (!(h->flags & HASH_FLAG_NO_AUTO_SHRINK))
-    {
-      /* Resize when 1/4 full. */
-      if (h->elts > 32 && 4 * (h->elts + 1) < vec_len (v))
-	v = hash_resize (v, vec_len (v) / 2);
-    }
-
-  return v;
-}
-
-void *
-_hash_create (uword elts, hash_t * h_user)
-{
-  hash_t *h;
-  uword log2_pair_size;
-  void *v;
-
-  /* Size of hash is power of 2 >= ELTS and larger than
-     number of bits in is_user bitmap elements. */
-  elts = clib_max (elts, BITS (h->is_user[0]));
-  elts = 1ULL << max_log2 (elts);
-
-  log2_pair_size = 1;
-  if (h_user)
-    log2_pair_size = h_user->log2_pair_size;
-
-  v = _vec_resize (0,
-		   /* vec len: */ elts,
-		   /* data bytes: */
-		   (elts << log2_pair_size) * sizeof (hash_pair_t),
-		   /* header bytes: */
-		   sizeof (h[0]) +
-		   (elts / BITS (h->is_user[0])) * sizeof (h->is_user[0]),
-		   /* alignment */ sizeof (hash_pair_t));
-  h = hash_header (v);
-
-  if (h_user)
-    h[0] = h_user[0];
-
-  h->log2_pair_size = log2_pair_size;
-  h->elts = 0;
-
-  /* Default flags to never shrinking hash tables.
-     Shrinking tables can cause "jackpot" cases. */
-  if (!h_user)
-    h->flags = HASH_FLAG_NO_AUTO_SHRINK;
-
-  if (!h->format_pair)
-    {
-      h->format_pair = hash_format_pair_default;
-      h->format_pair_arg = 0;
-    }
-
-  return v;
-}
-
-void *
-_hash_free (void *v)
-{
-  hash_t *h = hash_header (v);
-  hash_pair_union_t *p;
-  uword i;
-
-  if (!v)
-    return v;
-
-  /* We zero all freed memory in case user would be tempted to use it. */
-  for (i = 0; i < hash_capacity (v); i++)
-    {
-      if (hash_is_user (v, i))
-	continue;
-      p = get_pair (v, i);
-      if (h->log2_pair_size == 0)
-	vec_free (p->indirect.pairs);
-      else if (p->indirect.pairs)
-	clib_mem_free (p->indirect.pairs);
-    }
-
-  vec_free_header (h);
-
-  return 0;
-}
-
-static void *
-hash_resize_internal (void *old, uword new_size, uword free_old)
-{
-  void *new;
-  hash_pair_t *p;
-
-  new = 0;
-  if (new_size > 0)
-    {
-      hash_t *h = old ? hash_header (old) : 0;
-      new = _hash_create (new_size, h);
-      /* *INDENT-OFF* */
-      hash_foreach_pair (p, old, {
-	new = _hash_set3 (new, p->key, &p->value[0], 0);
-      });
-      /* *INDENT-ON* */
-    }
-
-  if (free_old)
-    hash_free (old);
-  return new;
-}
-
-void *
-hash_resize (void *old, uword new_size)
-{
-  return hash_resize_internal (old, new_size, 1);
-}
-
-void *
-hash_dup (void *old)
-{
-  return hash_resize_internal (old, vec_len (old), 0);
-}
-
-void *
-_hash_set3 (void *v, uword key, void *value, void *old_value)
-{
-  hash_t *h;
-
-  if (!v)
-    v = hash_create (0, sizeof (uword));
-
-  h = hash_header (v);
-  (void) lookup (v, key, SET, value, old_value);
-
-  if (!(h->flags & HASH_FLAG_NO_AUTO_GROW))
-    {
-      /* Resize when 3/4 full. */
-      if (4 * (h->elts + 1) > 3 * vec_len (v))
-	v = hash_resize (v, 2 * vec_len (v));
-    }
-
-  return v;
-}
-
-uword
-vec_key_sum (hash_t * h, uword key)
-{
-  void *v = uword_to_pointer (key, void *);
-  return hash_memory (v, vec_len (v) * h->user, 0);
-}
-
-uword
-vec_key_equal (hash_t * h, uword key1, uword key2)
-{
-  void *v1 = uword_to_pointer (key1, void *);
-  void *v2 = uword_to_pointer (key2, void *);
-  uword l1 = vec_len (v1);
-  uword l2 = vec_len (v2);
-  return l1 == l2 && 0 == memcmp (v1, v2, l1 * h->user);
-}
-
-u8 *
-vec_key_format_pair (u8 * s, va_list * args)
-{
-  void *CLIB_UNUSED (user_arg) = va_arg (*args, void *);
-  void *v = va_arg (*args, void *);
-  hash_pair_t *p = va_arg (*args, hash_pair_t *);
-  hash_t *h = hash_header (v);
-  void *u = uword_to_pointer (p->key, void *);
-  int i;
-
-  switch (h->user)
-    {
-    case 1:
-      s = format (s, "%v", u);
-      break;
-
-    case 2:
-      {
-	u16 *w = u;
-	for (i = 0; i < vec_len (w); i++)
-	  s = format (s, "0x%x, ", w[i]);
-	break;
-      }
-
-    case 4:
-      {
-	u32 *w = u;
-	for (i = 0; i < vec_len (w); i++)
-	  s = format (s, "0x%x, ", w[i]);
-	break;
-      }
-
-    case 8:
-      {
-	u64 *w = u;
-	for (i = 0; i < vec_len (w); i++)
-	  s = format (s, "0x%Lx, ", w[i]);
-	break;
-      }
-
-    default:
-      s = format (s, "0x%U", format_hex_bytes, u, vec_len (u) * h->user);
-      break;
-    }
-
-  if (hash_value_bytes (h) > 0)
-    s = format (s, " -> 0x%wx", p->value[0]);
-
-  return s;
-}
-
-uword
-mem_key_sum (hash_t * h, uword key)
-{
-  uword *v = uword_to_pointer (key, void *);
-  return hash_memory (v, h->user, 0);
-}
-
-uword
-mem_key_equal (hash_t * h, uword key1, uword key2)
-{
-  void *v1 = uword_to_pointer (key1, void *);
-  void *v2 = uword_to_pointer (key2, void *);
-  return v1 && v2 && 0 == memcmp (v1, v2, h->user);
-}
-
-uword
-string_key_sum (hash_t * h, uword key)
-{
-  char *v = uword_to_pointer (key, char *);
-  return hash_memory (v, strlen (v), 0);
-}
-
-uword
-string_key_equal (hash_t * h, uword key1, uword key2)
-{
-  void *v1 = uword_to_pointer (key1, void *);
-  void *v2 = uword_to_pointer (key2, void *);
-  return v1 && v2 && 0 == strcmp (v1, v2);
-}
-
-u8 *
-string_key_format_pair (u8 * s, va_list * args)
-{
-  void *CLIB_UNUSED (user_arg) = va_arg (*args, void *);
-  void *v = va_arg (*args, void *);
-  hash_pair_t *p = va_arg (*args, hash_pair_t *);
-  hash_t *h = hash_header (v);
-  void *u = uword_to_pointer (p->key, void *);
-
-  s = format (s, "%s", u);
-
-  if (hash_value_bytes (h) > 0)
-    s =
-      format (s, " -> 0x%8U", format_hex_bytes, &p->value[0],
-	      hash_value_bytes (h));
-
-  return s;
-}
-
-static u8 *
-hash_format_pair_default (u8 * s, va_list * args)
-{
-  void *CLIB_UNUSED (user_arg) = va_arg (*args, void *);
-  void *v = va_arg (*args, void *);
-  hash_pair_t *p = va_arg (*args, hash_pair_t *);
-  hash_t *h = hash_header (v);
-
-  s = format (s, "0x%08x", p->key);
-  if (hash_value_bytes (h) > 0)
-    s =
-      format (s, " -> 0x%8U", format_hex_bytes, &p->value[0],
-	      hash_value_bytes (h));
-  return s;
-}
-
-uword
-hash_bytes (void *v)
-{
-  uword i, bytes;
-  hash_t *h = hash_header (v);
-
-  if (!v)
-    return 0;
-
-  bytes = vec_capacity (v, hash_header_bytes (v));
-
-  for (i = 0; i < hash_capacity (v); i++)
-    {
-      if (!hash_is_user (v, i))
-	{
-	  hash_pair_union_t *p = get_pair (v, i);
-	  if (h->log2_pair_size > 0)
-	    bytes += 1 << indirect_pair_get_log2_bytes (&p->indirect);
-	  else
-	    bytes += vec_capacity (p->indirect.pairs, 0);
-	}
-    }
-  return bytes;
-}
-
-u8 *
-format_hash (u8 * s, va_list * va)
-{
-  void *v = va_arg (*va, void *);
-  int verbose = va_arg (*va, int);
-  hash_pair_t *p;
-  hash_t *h = hash_header (v);
-  uword i;
-
-  s = format (s, "hash %p, %wd elts, capacity %wd, %wd bytes used,\n",
-	      v, hash_elts (v), hash_capacity (v), hash_bytes (v));
-
-  {
-    uword *occupancy = 0;
-
-    /* Count number of buckets with each occupancy. */
-    for (i = 0; i < hash_capacity (v); i++)
-      {
-	uword j;
-
-	if (hash_is_user (v, i))
-	  {
-	    j = 1;
-	  }
-	else
-	  {
-	    hash_pair_union_t *p = get_pair (v, i);
-	    if (h->log2_pair_size > 0)
-	      j = indirect_pair_get_len (&p->indirect);
-	    else
-	      j = vec_len (p->indirect.pairs);
-	  }
-
-	vec_validate (occupancy, j);
-	occupancy[j]++;
-      }
-
-    s = format (s, "  profile ");
-    for (i = 0; i < vec_len (occupancy); i++)
-      s = format (s, "%wd%c", occupancy[i],
-		  i + 1 == vec_len (occupancy) ? '\n' : ' ');
-
-    s = format (s, "  lookup # of compares: ");
-    for (i = 1; i < vec_len (occupancy); i++)
-      s = format (s, "%wd: .%03d%c", i,
-		  (1000 * i * occupancy[i]) / hash_elts (v),
-		  i + 1 == vec_len (occupancy) ? '\n' : ' ');
-
-    vec_free (occupancy);
-  }
-
-  if (verbose)
-    {
-      /* *INDENT-OFF* */
-      hash_foreach_pair (p, v, {
-	s = format (s, "  %U\n", h->format_pair, h->format_pair_arg, v, p);
-      });
-      /* *INDENT-ON* */
-    }
-
-  return s;
-}
-
-static uword
-unformat_hash_string_internal (unformat_input_t * input,
-			       va_list * va, int is_vec)
-{
-  uword *hash = va_arg (*va, uword *);
-  int *result = va_arg (*va, int *);
-  u8 *string = 0;
-  uword *p;
-
-  if (!unformat (input, is_vec ? "%v%_" : "%s%_", &string))
-    return 0;
-
-  p = hash_get_mem (hash, string);
-  if (p)
-    *result = *p;
-
-  vec_free (string);
-  return p ? 1 : 0;
-}
-
-uword
-unformat_hash_vec_string (unformat_input_t * input, va_list * va)
-{
-  return unformat_hash_string_internal (input, va, /* is_vec */ 1);
-}
-
-uword
-unformat_hash_string (unformat_input_t * input, va_list * va)
-{
-  return unformat_hash_string_internal (input, va, /* is_vec */ 0);
-}
-
-clib_error_t *
-hash_validate (void *v)
-{
-  hash_t *h = hash_header (v);
-  uword i, j;
-  uword *keys = 0;
-  clib_error_t *error = 0;
-
-#define CHECK(x) if ((error = ERROR_ASSERT (x))) goto done;
-
-  for (i = 0; i < hash_capacity (v); i++)
-    {
-      hash_pair_union_t *pu = get_pair (v, i);
-
-      if (hash_is_user (v, i))
-	{
-	  CHECK (pu->direct.key != 0);
-	  vec_add1 (keys, pu->direct.key);
-	}
-      else
-	{
-	  hash_pair_t *p;
-	  hash_pair_indirect_t *pi = &pu->indirect;
-	  uword n;
-
-	  n = h->log2_pair_size > 0
-	    ? indirect_pair_get_len (pi) : vec_len (pi->pairs);
-
-	  for (p = pi->pairs; n-- > 0; p = hash_forward1 (h, p))
-	    {
-	      /* Assert key uniqueness. */
-	      for (j = 0; j < vec_len (keys); j++)
-		CHECK (keys[j] != p->key);
-	      vec_add1 (keys, p->key);
-	    }
-	}
-    }
-
-  CHECK (vec_len (keys) == h->elts);
-
-  vec_free (keys);
-done:
-  return error;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/hash.h b/vppinfra/vppinfra/hash.h
deleted file mode 100644
index 3f0efaa7..00000000
--- a/vppinfra/vppinfra/hash.h
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001-2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_hash_h
-#define included_hash_h
-
-#include <vppinfra/error.h>
-#include <vppinfra/format.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/vector.h>
-
-struct hash_header;
-
-typedef uword (hash_key_sum_function_t) (struct hash_header *, uword key);
-typedef uword (hash_key_equal_function_t)
-  (struct hash_header *, uword key1, uword key2);
-
-/* Vector header for hash tables. */
-typedef struct hash_header
-{
-  /* Number of elements in hash table. */
-  uword elts;
-
-  /* Flags as follows. */
-  u32 flags;
-
-  /* Set if user does not want table to auto-resize when sufficiently full. */
-#define HASH_FLAG_NO_AUTO_GROW		(1 << 0)
-  /* Set if user does not want table to auto-resize when sufficiently empty. */
-#define HASH_FLAG_NO_AUTO_SHRINK	(1 << 1)
-  /* Set when hash_next is in the process of iterating through this hash table. */
-#define HASH_FLAG_HASH_NEXT_IN_PROGRESS (1 << 2)
-
-  u32 log2_pair_size;
-
-  /* Function to compute the "sum" of a hash key.
-     Hash function is this sum modulo the prime size of
-     the hash table (vec_len (v)). */
-  hash_key_sum_function_t *key_sum;
-
-  /* Special values for key_sum "function". */
-#define KEY_FUNC_NONE		(0)	/*< sum = key */
-#define KEY_FUNC_POINTER_UWORD	(1)	/*< sum = *(uword *) key */
-#define KEY_FUNC_POINTER_U32	(2)	/*< sum = *(u32 *) key */
-#define KEY_FUNC_STRING         (3)	/*< sum = string_key_sum, etc. */
-
-  /* key comparison function */
-  hash_key_equal_function_t *key_equal;
-
-  /* Hook for user's data.  Used to parameterize sum/equal functions. */
-  any user;
-
-  /* Format a (k,v) pair */
-  format_function_t *format_pair;
-
-  /* Format function arg */
-  void *format_pair_arg;
-
-  /* Bit i is set if pair i is a user object (as opposed to being
-     either zero or an indirect array of pairs). */
-  uword is_user[0];
-} hash_t;
-
-/* Hash header size in bytes */
-always_inline uword
-hash_header_bytes (void *v)
-{
-  hash_t *h;
-  uword is_user_bytes =
-    (sizeof (h->is_user[0]) * vec_len (v)) / BITS (h->is_user[0]);
-  return sizeof (h[0]) + is_user_bytes;
-}
-
-/* Returns a pointer to the hash header given the vector pointer */
-always_inline hash_t *
-hash_header (void *v)
-{
-  return vec_header (v, hash_header_bytes (v));
-}
-
-/* Number of elements in the hash table */
-always_inline uword
-hash_elts (void *v)
-{
-  hash_t *h = hash_header (v);
-  return v ? h->elts : 0;
-}
-
-/* Number of elements the hash table can hold */
-always_inline uword
-hash_capacity (void *v)
-{
-  return vec_len (v);
-}
-
-/* Returns 1 if the hash pair contains user data */
-always_inline uword
-hash_is_user (void *v, uword i)
-{
-  hash_t *h = hash_header (v);
-  uword i0 = i / BITS (h->is_user[0]);
-  uword i1 = i % BITS (h->is_user[0]);
-  return (h->is_user[i0] & ((uword) 1 << i1)) != 0;
-}
-
-/* Set the format function and format argument for a hash table */
-always_inline void
-hash_set_pair_format (void *v,
-		      format_function_t * format_pair, void *format_pair_arg)
-{
-  hash_t *h = hash_header (v);
-  h->format_pair = format_pair;
-  h->format_pair_arg = format_pair_arg;
-}
-
-/* Set hash table flags */
-always_inline void
-hash_set_flags (void *v, uword flags)
-{
-  hash_header (v)->flags |= flags;
-}
-
-/* Key value pairs. */
-typedef struct
-{
-  /* The Key */
-  uword key;
-
-  /* The Value. Length is 2^log2_pair_size - 1. */
-  uword value[0];
-} hash_pair_t;
-
-/* The indirect pair structure
-
-    If log2_pair_size > 0 we overload hash pairs
-    with indirect pairs for buckets with more than one
-    pair. */
-typedef struct
-{
-  /* pair vector */
-  hash_pair_t *pairs;
-  /* padding */
-  u8 pad[sizeof (uword) - sizeof (hash_pair_t *)];
-  /* allocated length */
-  uword alloc_len;
-}
-hash_pair_indirect_t;
-
-/* Direct / Indirect pair union */
-typedef union
-{
-  hash_pair_t direct;
-  hash_pair_indirect_t indirect;
-} hash_pair_union_t;
-
-#define LOG2_ALLOC_BITS (5)
-#define PAIR_BITS	(BITS (uword) - LOG2_ALLOC_BITS)
-
-/* Log2 number of bytes allocated in pairs array. */
-always_inline uword
-indirect_pair_get_log2_bytes (hash_pair_indirect_t * p)
-{
-  return p->alloc_len >> PAIR_BITS;
-}
-
-/* Get the length of an indirect pair */
-always_inline uword
-indirect_pair_get_len (hash_pair_indirect_t * p)
-{
-  if (!p->pairs)
-    return 0;
-  else
-    return p->alloc_len & (((uword) 1 << PAIR_BITS) - 1);
-}
-
-/* Set the length of an indirect pair */
-always_inline void
-indirect_pair_set (hash_pair_indirect_t * p, uword log2_alloc, uword len)
-{
-  ASSERT (len < ((uword) 1 << PAIR_BITS));
-  ASSERT (log2_alloc < ((uword) 1 << LOG2_ALLOC_BITS));
-  p->alloc_len = (log2_alloc << PAIR_BITS) | len;
-}
-
-/* internal routine to fetch value for given key */
-uword *_hash_get (void *v, uword key);
-
-/* internal routine to fetch value (key, value) pair for given key */
-hash_pair_t *_hash_get_pair (void *v, uword key);
-
-/* internal routine to unset a (key, value) pair */
-void *_hash_unset (void *v, uword key, void *old_value);
-
-/* internal routine to set a (key, value) pair, return the old value */
-void *_hash_set3 (void *v, uword key, void *value, void *old_value);
-
-/* Resize a hash table */
-void *hash_resize (void *old, uword new_size);
-
-/* duplicate a hash table */
-void *hash_dup (void *old);
-
-/* Returns the number of bytes used by a hash table */
-uword hash_bytes (void *v);
-
-/* Public macro to set a (key, value) pair, return the old value */
-#define hash_set3(h,key,value,old_value)				\
-({									\
-  uword _v = (uword) (value);						\
-  (h) = _hash_set3 ((h), (uword) (key), (void *) &_v, (old_value));	\
-})
-
-/* Public macro to fetch value for given key */
-#define hash_get(h,key)		_hash_get ((h), (uword) (key))
-
-/* Public macro to fetch value (key, value) pair for given key */
-#define hash_get_pair(h,key)	_hash_get_pair ((h), (uword) (key))
-
-/* Public macro to set a (key, value) pair */
-#define hash_set(h,key,value)	hash_set3(h,key,value,0)
-
-/* Public macro to set (key, 0) pair */
-#define hash_set1(h,key)	(h) = _hash_set3(h,(uword) (key),0,0)
-
-/* Public macro to unset a (key, value) pair */
-#define hash_unset(h,key)	((h) = _hash_unset ((h), (uword) (key),0))
-
-/* Public macro to unset a (key, value) pair, return the old value */
-#define hash_unset3(h,key,old_value) ((h) = _hash_unset ((h), (uword) (key), (void *) (old_value)))
-
-/* get/set/unset for pointer keys. */
-
-/* Public macro to fetch value for given pointer key */
-#define hash_get_mem(h,key)	_hash_get ((h), pointer_to_uword (key))
-
-/* Public macro to fetch (key, value) for given pointer key */
-#define hash_get_pair_mem(h,key) _hash_get_pair ((h), pointer_to_uword (key))
-
-/* Public macro to set (key, value) for pointer key */
-#define hash_set_mem(h,key,value) hash_set3 (h, pointer_to_uword (key), (value), 0)
-
-/* Public macro to set (key, 0) for pointer key */
-#define hash_set1_mem(h,key)     hash_set3 ((h), pointer_to_uword (key), 0, 0)
-
-/* Public macro to unset (key, value) for pointer key */
-#define hash_unset_mem(h,key)    ((h) = _hash_unset ((h), pointer_to_uword (key),0))
-
-/* internal routine to free a hash table */
-extern void *_hash_free (void *v);
-
-/* Public macro to free a hash table */
-#define hash_free(h) (h) = _hash_free ((h))
-
-clib_error_t *hash_validate (void *v);
-
-/* Public inline funcion to get the number of value bytes for a hash table */
-always_inline uword
-hash_value_bytes (hash_t * h)
-{
-  hash_pair_t *p;
-  return (sizeof (p->value[0]) << h->log2_pair_size) - sizeof (p->key);
-}
-
-/* Public inline funcion to get log2(size of a (key,value) pair) */
-always_inline uword
-hash_pair_log2_bytes (hash_t * h)
-{
-  uword log2_bytes = h->log2_pair_size;
-  ASSERT (BITS (hash_pair_t) == 32 || BITS (hash_pair_t) == 64);
-  if (BITS (hash_pair_t) == 32)
-    log2_bytes += 2;
-  else if (BITS (hash_pair_t) == 64)
-    log2_bytes += 3;
-  return log2_bytes;
-}
-
-/* Public inline funcion to get size of a (key,value) pair */
-always_inline uword
-hash_pair_bytes (hash_t * h)
-{
-  return (uword) 1 << hash_pair_log2_bytes (h);
-}
-
-/* Public inline funcion to advance a pointer past one (key,value) pair */
-always_inline void *
-hash_forward1 (hash_t * h, void *v)
-{
-  return (u8 *) v + hash_pair_bytes (h);
-}
-
-/* Public inline funcion to advance a pointer past N (key,value) pairs */
-always_inline void *
-hash_forward (hash_t * h, void *v, uword n)
-{
-  return (u8 *) v + ((n * sizeof (hash_pair_t)) << h->log2_pair_size);
-}
-
-/** Iterate over hash pairs.
-
-    @param p    The current (key,value) pair. This should be of type
-                <code>(hash_pair_t *)</code>.
-    @param v    The hash table to iterate.
-    @param body The operation to perform on each (key,value) pair.
-
-    Executes the expression or code block @c body with each active hash pair.
-*/
-/* A previous version of this macro made use of the hash_pair_union_t
- * structure; this version does not since that approach mightily upset
- * the static analysis tool. In the rare chance someone is reading this
- * code, pretend that _p below is of type hash_pair_union_t and that when
- * used as an rvalue it's really using one of the union members as the
- * rvalue. If you were confused before you might be marginally less
- * confused after.
- */
-#define hash_foreach_pair(p,v,body)                                         \
-do {                                                                        \
- __label__ _hash_foreach_done;                                              \
-  hash_t * _h = hash_header (v);                                            \
-  void * _p;                                                                \
-  hash_pair_t * _q, * _q_end;                                               \
-  uword _i, _i1, _id, _pair_increment;                                      \
-                                                                            \
-  _p = (v);                                                                 \
-  _i = 0;                                                                   \
-  _pair_increment = 1;                                                      \
-  if ((v))                                                                  \
-      _pair_increment = 1 << _h->log2_pair_size;                            \
-  while (_i < hash_capacity (v))                                            \
-    {                                                                       \
-      _id = _h->is_user[_i / BITS (_h->is_user[0])];                        \
-      _i1 = _i + BITS (_h->is_user[0]);                                     \
-                                                                            \
-      do {                                                                  \
-        if (_id & 1)                                                        \
-          {                                                                 \
-            _q = _p;                                                        \
-            _q_end = _q + _pair_increment;                                  \
-          }                                                                 \
-        else                                                                \
-          {                                                                 \
-            hash_pair_indirect_t * _pi = _p;                                \
-            _q = _pi->pairs;                                                \
-            if (_h->log2_pair_size > 0)                                     \
-              _q_end = hash_forward (_h, _q, indirect_pair_get_len (_pi));  \
-            else                                                            \
-              _q_end = vec_end (_q);                                        \
-          }                                                                 \
-                                                                            \
-        /* Loop through all elements in bucket.                             \
-           Bucket may have 0 1 or more (indirect case) pairs. */            \
-        while (_q < _q_end)                                                 \
-          {                                                                 \
-            uword _break_in_body = 1;                                       \
-            (p) = _q;                                                       \
-            do {                                                            \
-              body;                                                         \
-              _break_in_body = 0;                                           \
-            } while (0);                                                    \
-            if (_break_in_body)                                             \
-              goto _hash_foreach_done;                                      \
-            _q += _pair_increment;                                          \
-          }                                                                 \
-                                                                            \
-        _p = (hash_pair_t *)_p + _pair_increment;                           \
-        _id = _id / 2;                                                      \
-        _i++;                                                               \
-      } while (_i < _i1);                                                   \
-    }                                                                       \
-  _hash_foreach_done:                                                       \
-  /* Be silent Mr. Compiler-Warning. */                                     \
-  ;                                                                         \
- } while (0)
-
-/* Iterate over key/value pairs
-
-    @param key_var the current key
-    @param value_var the current value
-    @param h the hash table to iterate across
-    @param body the operation to perform on each (key_var,value_var) pair.
-
-    calls body with each active hash pair
-*/
-/* Iteratate over key/value pairs. */
-#define hash_foreach(key_var,value_var,h,body)			\
-do {								\
-  hash_pair_t * _r;						\
-  hash_foreach_pair (_r, (h), {					\
-    (key_var) = (__typeof__ (key_var)) _r->key;			\
-    (value_var) = (__typeof__ (value_var)) _r->value[0];	\
-    do { body; } while (0);					\
-  });								\
-} while (0)
-
-/* Iterate over key/value pairs for pointer key hash tables
-
-    @param key_var the current key
-    @param value_var the current value
-    @param h the hash table to iterate across
-    @param body the operation to perform on each (key_var,value_var) pair.
-
-    calls body with each active hash pair
-*/
-#define hash_foreach_mem(key_var,value_var,h,body)			\
-do {									\
-  hash_pair_t * _r;							\
-  hash_foreach_pair (_r, (h), {						\
-    (key_var) = (__typeof__ (key_var)) uword_to_pointer (_r->key, void *); \
-    (value_var) = (__typeof__ (value_var)) _r->value[0];		\
-    do { body; } while (0);						\
-  });									\
-} while (0)
-
-/* Support for iteration through hash table. */
-
-/* This struct saves iteration state for hash_next.
-   None of these fields are meant to be visible to the user.
-   Hence, the cryptic short-hand names. */
-typedef struct
-{
-  uword i, j, f;
-} hash_next_t;
-
-hash_pair_t *hash_next (void *v, hash_next_t * hn);
-
-void *_hash_create (uword elts, hash_t * h);
-
-always_inline void
-hash_set_value_bytes (hash_t * h, uword value_bytes)
-{
-  hash_pair_t *p;
-  h->log2_pair_size =
-    max_log2 ((sizeof (p->key) + value_bytes + sizeof (p->key) -
-	       1) / sizeof (p->key));
-}
-
-#define hash_create2(_elts,_user,_value_bytes,               \
-                     _key_sum,_key_equal,                    \
-                     _format_pair,_format_pair_arg)          \
-({							     \
-  hash_t _h;						     \
-  memset (&_h, 0, sizeof (_h));				     \
-  _h.user = (_user);				             \
-  _h.key_sum   = (hash_key_sum_function_t *) (_key_sum);     \
-  _h.key_equal = (_key_equal);				     \
-  hash_set_value_bytes (&_h, (_value_bytes));		     \
-  _h.format_pair = (format_function_t *) (_format_pair);     \
-  _h.format_pair_arg = (_format_pair_arg);                   \
-  _hash_create ((_elts), &_h);				     \
-})
-
-/* Hash function based on that of Bob Jenkins (bob_jenkins@compuserve.com).
-   Public domain per: http://www.burtleburtle.net/bob/hash/doobs.html
-   Thanks, Bob. */
-
-#define hash_mix_step(a,b,c,s0,s1,s2)		\
-do {						\
-  (a) -= (b) + (c); (a) ^= (c) >> (s0);		\
-  (b) -= (c) + (a); (b) ^= (a) << (s1);		\
-  (c) -= (a) + (b); (c) ^= (b) >> (s2);		\
-} while (0)
-
-#define hash_mix32_step_1(a,b,c) hash_mix_step(a,b,c,13,8,13)
-#define hash_mix32_step_2(a,b,c) hash_mix_step(a,b,c,12,16,5)
-#define hash_mix32_step_3(a,b,c) hash_mix_step(a,b,c,3,10,15)
-
-#define hash_mix64_step_1(a,b,c) hash_mix_step(a,b,c,43,9,8)
-#define hash_mix64_step_2(a,b,c) hash_mix_step(a,b,c,38,23,5)
-#define hash_mix64_step_3(a,b,c) hash_mix_step(a,b,c,35,49,11)
-#define hash_mix64_step_4(a,b,c) hash_mix_step(a,b,c,12,18,22)
-
-/* Hash function based on that of Bob Jenkins (bob_jenkins@compuserve.com).
-   Thanks, Bob. */
-#define hash_mix64(a0,b0,c0)			\
-do {						\
-  hash_mix64_step_1 (a0, b0, c0);		\
-  hash_mix64_step_2 (a0, b0, c0);		\
-  hash_mix64_step_3 (a0, b0, c0);		\
-  hash_mix64_step_4 (a0, b0, c0);		\
-} while (0)					\
-
-#define hash_mix32(a0,b0,c0)			\
-do {						\
-  hash_mix32_step_1 (a0, b0, c0);		\
-  hash_mix32_step_2 (a0, b0, c0);		\
-  hash_mix32_step_3 (a0, b0, c0);		\
-} while (0)					\
-
-/* Finalize from Bob Jenkins lookup3.c */
-
-always_inline uword
-hash32_rotate_left (u32 x, u32 i)
-{
-  return (x << i) | (x >> (BITS (i) - i));
-}
-
-#define hash_v3_mix32(a,b,c)					\
-do {								\
-  (a) -= (c); (a) ^= hash32_rotate_left ((c), 4); (c) += (b);	\
-  (b) -= (a); (b) ^= hash32_rotate_left ((a), 6); (a) += (c);	\
-  (c) -= (b); (c) ^= hash32_rotate_left ((b), 8); (b) += (a);	\
-  (a) -= (c); (a) ^= hash32_rotate_left ((c),16); (c) += (b);	\
-  (b) -= (a); (b) ^= hash32_rotate_left ((a),19); (a) += (c);	\
-  (c) -= (b); (c) ^= hash32_rotate_left ((b), 4); (b) += (a);	\
-} while (0)
-
-#define hash_v3_finalize32(a,b,c)			\
-do {							\
-  (c) ^= (b); (c) -= hash32_rotate_left ((b), 14);	\
-  (a) ^= (c); (a) -= hash32_rotate_left ((c), 11);	\
-  (b) ^= (a); (b) -= hash32_rotate_left ((a), 25);	\
-  (c) ^= (b); (c) -= hash32_rotate_left ((b), 16);	\
-  (a) ^= (c); (a) -= hash32_rotate_left ((c),  4);	\
-  (b) ^= (a); (b) -= hash32_rotate_left ((a), 14);	\
-  (c) ^= (b); (c) -= hash32_rotate_left ((b), 24);	\
-} while (0)
-
-/* 32 bit mixing/finalize in steps. */
-
-#define hash_v3_mix32_step1(a,b,c)				\
-do {								\
-  (a) -= (c); (a) ^= hash32_rotate_left ((c), 4); (c) += (b);	\
-  (b) -= (a); (b) ^= hash32_rotate_left ((a), 6); (a) += (c);	\
-} while (0)
-
-#define hash_v3_mix32_step2(a,b,c)				\
-do {								\
-  (c) -= (b); (c) ^= hash32_rotate_left ((b), 8); (b) += (a);	\
-  (a) -= (c); (a) ^= hash32_rotate_left ((c),16); (c) += (b);	\
-} while (0)
-
-#define hash_v3_mix32_step3(a,b,c)				\
-do {								\
-  (b) -= (a); (b) ^= hash32_rotate_left ((a),19); (a) += (c);	\
-  (c) -= (b); (c) ^= hash32_rotate_left ((b), 4); (b) += (a);	\
-} while (0)
-
-#define hash_v3_finalize32_step1(a,b,c)			\
-do {							\
-  (c) ^= (b); (c) -= hash32_rotate_left ((b), 14);	\
-  (a) ^= (c); (a) -= hash32_rotate_left ((c), 11);	\
-} while (0)
-
-#define hash_v3_finalize32_step2(a,b,c)			\
-do {							\
-  (b) ^= (a); (b) -= hash32_rotate_left ((a), 25);	\
-  (c) ^= (b); (c) -= hash32_rotate_left ((b), 16);	\
-} while (0)
-
-#define hash_v3_finalize32_step3(a,b,c)			\
-do {							\
-  (a) ^= (c); (a) -= hash32_rotate_left ((c),  4);	\
-  (b) ^= (a); (b) -= hash32_rotate_left ((a), 14);	\
-  (c) ^= (b); (c) -= hash32_rotate_left ((b), 24);	\
-} while (0)
-
-/* Vector v3 mixing/finalize. */
-#define hash_v3_mix_step_1_u32x(a,b,c)				\
-do {								\
-  (a) -= (c); (a) ^= u32x_irotate_left ((c), 4); (c) += (b);	\
-  (b) -= (a); (b) ^= u32x_irotate_left ((a), 6); (a) += (c);	\
-  (c) -= (b); (c) ^= u32x_irotate_left ((b), 8); (b) += (a);	\
-} while (0)
-
-#define hash_v3_mix_step_2_u32x(a,b,c)				\
-do {								\
-  (a) -= (c); (a) ^= u32x_irotate_left ((c),16); (c) += (b);	\
-  (b) -= (a); (b) ^= u32x_irotate_left ((a),19); (a) += (c);	\
-  (c) -= (b); (c) ^= u32x_irotate_left ((b), 4); (b) += (a);	\
-} while (0)
-
-#define hash_v3_finalize_step_1_u32x(a,b,c)		\
-do {							\
-  (c) ^= (b); (c) -= u32x_irotate_left ((b), 14);	\
-  (a) ^= (c); (a) -= u32x_irotate_left ((c), 11);	\
-  (b) ^= (a); (b) -= u32x_irotate_left ((a), 25);	\
-} while (0)
-
-#define hash_v3_finalize_step_2_u32x(a,b,c)		\
-do {							\
-  (c) ^= (b); (c) -= u32x_irotate_left ((b), 16);	\
-  (a) ^= (c); (a) -= u32x_irotate_left ((c),  4);	\
-  (b) ^= (a); (b) -= u32x_irotate_left ((a), 14);	\
-  (c) ^= (b); (c) -= u32x_irotate_left ((b), 24);	\
-} while (0)
-
-#define hash_v3_mix_u32x(a,b,c)			\
-do {						\
-  hash_v3_mix_step_1_u32x(a,b,c);		\
-  hash_v3_mix_step_2_u32x(a,b,c);		\
-} while (0)
-
-#define hash_v3_finalize_u32x(a,b,c)		\
-do {						\
-  hash_v3_finalize_step_1_u32x(a,b,c);		\
-  hash_v3_finalize_step_2_u32x(a,b,c);		\
-} while (0)
-
-extern uword hash_memory (void *p, word n_bytes, uword state);
-
-extern uword mem_key_sum (hash_t * h, uword key);
-extern uword mem_key_equal (hash_t * h, uword key1, uword key2);
-
-#define hash_create_mem(elts,key_bytes,value_bytes)	\
-  hash_create2((elts),(key_bytes),(value_bytes),mem_key_sum,mem_key_equal,0,0)
-
-extern uword vec_key_sum (hash_t * h, uword key);
-extern uword vec_key_equal (hash_t * h, uword key1, uword key2);
-extern u8 *vec_key_format_pair (u8 * s, va_list * args);
-
-#define hash_create_vec(elts,key_bytes,value_bytes)	\
-  hash_create2((elts),(key_bytes),(value_bytes),\
-               vec_key_sum,vec_key_equal,vec_key_format_pair,0)
-
-extern uword string_key_sum (hash_t * h, uword key);
-extern uword string_key_equal (hash_t * h, uword key1, uword key2);
-extern u8 *string_key_format_pair (u8 * s, va_list * args);
-
-#define hash_create_string(elts,value_bytes)                    \
-  hash_create2((elts),0,(value_bytes),                          \
-               (hash_key_sum_function_t *) KEY_FUNC_STRING,     \
-               (hash_key_equal_function_t *)KEY_FUNC_STRING,    \
-               0, 0)
-
-#define hash_create(elts,value_bytes)				\
-  hash_create2((elts),0,(value_bytes),				\
-               (hash_key_sum_function_t *) KEY_FUNC_NONE,	\
-               (hash_key_equal_function_t *) KEY_FUNC_NONE,	\
-               0,0)
-
-#define hash_create_uword(elts,value_bytes)				\
-  hash_create2((elts),0,(value_bytes),					\
-               (hash_key_sum_function_t *) KEY_FUNC_POINTER_UWORD,	\
-               (hash_key_equal_function_t *) KEY_FUNC_POINTER_UWORD,	\
-               0,0)
-
-#define hash_create_u32(elts,value_bytes)				\
-  hash_create2((elts),0,(value_bytes),					\
-               (hash_key_sum_function_t *) KEY_FUNC_POINTER_U32,	\
-               (hash_key_equal_function_t *) KEY_FUNC_POINTER_U32,	\
-               0,0)
-
-u8 *format_hash (u8 * s, va_list * va);
-
-/* Looks up input in hash table indexed by either vec string or
-   c string (null terminated). */
-unformat_function_t unformat_hash_vec_string;
-unformat_function_t unformat_hash_string;
-
-/* Main test routine. */
-int test_hash_main (unformat_input_t * input);
-
-static inline void
-hash_delete (void *bob)
-{
-}
-
-#endif /* included_hash_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/heap.c b/vppinfra/vppinfra/heap.c
deleted file mode 100644
index 2a5fb5c8..00000000
--- a/vppinfra/vppinfra/heap.c
+++ /dev/null
@@ -1,828 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/cache.h>	/* for CLIB_CACHE_LINE_BYTES */
-#include <vppinfra/mem.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/error.h>
-
-always_inline heap_elt_t *
-elt_at (heap_header_t * h, uword i)
-{
-  ASSERT (i < vec_len (h->elts));
-  return h->elts + i;
-}
-
-always_inline heap_elt_t *
-last (heap_header_t * h)
-{
-  return elt_at (h, h->tail);
-}
-
-always_inline heap_elt_t *
-first (heap_header_t * h)
-{
-  return elt_at (h, h->head);
-}
-
-/* Objects sizes are binned into N_BINS bins.
-   Objects with size <= SMALL_BINS have their own bins.
-   Larger objects are grouped together in power or 2 sized
-   bins.
-
-   Sizes are in units of elt_bytes bytes. */
-
-/* Convert size to bin. */
-always_inline uword
-size_to_bin (uword size)
-{
-  uword bin;
-
-  ASSERT (size > 0);
-
-  if (size <= HEAP_SMALL_BINS)
-    {
-      bin = size - 1;
-      if (size == 0)
-	bin = 0;
-    }
-  else
-    {
-      bin = HEAP_SMALL_BINS + max_log2 (size) - (HEAP_LOG2_SMALL_BINS + 1);
-      if (bin >= HEAP_N_BINS)
-	bin = HEAP_N_BINS - 1;
-    }
-
-  return bin;
-}
-
-/* Convert bin to size. */
-always_inline __attribute__ ((unused))
-     uword bin_to_size (uword bin)
-{
-  uword size;
-
-  if (bin <= HEAP_SMALL_BINS - 1)
-    size = bin + 1;
-  else
-    size = (uword) 1 << ((bin - HEAP_SMALL_BINS) + HEAP_LOG2_SMALL_BINS + 1);
-
-  return size;
-}
-
-static void
-elt_delete (heap_header_t * h, heap_elt_t * e)
-{
-  heap_elt_t *l = vec_end (h->elts) - 1;
-
-  ASSERT (e >= h->elts && e <= l);
-
-  /* Update doubly linked pointers. */
-  {
-    heap_elt_t *p = heap_prev (e);
-    heap_elt_t *n = heap_next (e);
-
-    if (p == e)
-      {
-	n->prev = 0;
-	h->head = n - h->elts;
-      }
-    else if (n == e)
-      {
-	p->next = 0;
-	h->tail = p - h->elts;
-      }
-    else
-      {
-	p->next = n - p;
-	n->prev = p - n;
-      }
-  }
-
-  /* Add to index free list or delete from end. */
-  if (e < l)
-    vec_add1 (h->free_elts, e - h->elts);
-  else
-    _vec_len (h->elts)--;
-}
-
-/*
-  Before: P ... E
-  After : P ... NEW ... E
-*/
-always_inline void
-elt_insert_before (heap_header_t * h, heap_elt_t * e, heap_elt_t * new)
-{
-  heap_elt_t *p = heap_prev (e);
-
-  if (p == e)
-    {
-      new->prev = 0;
-      new->next = e - new;
-      p->prev = new - p;
-      h->head = new - h->elts;
-    }
-  else
-    {
-      new->prev = p - new;
-      new->next = e - new;
-      e->prev = new - e;
-      p->next = new - p;
-    }
-}
-
-/*
-  Before: E ... N
-  After : E ... NEW ... N
-*/
-always_inline void
-elt_insert_after (heap_header_t * h, heap_elt_t * e, heap_elt_t * new)
-{
-  heap_elt_t *n = heap_next (e);
-
-  if (n == e)
-    {
-      new->next = 0;
-      new->prev = e - new;
-      e->next = new - e;
-      h->tail = new - h->elts;
-    }
-  else
-    {
-      new->prev = e - new;
-      new->next = n - new;
-      e->next = new - e;
-      n->prev = new - n;
-    }
-}
-
-always_inline heap_elt_t *
-elt_new (heap_header_t * h)
-{
-  heap_elt_t *e;
-  uword l;
-  if ((l = vec_len (h->free_elts)) > 0)
-    {
-      e = elt_at (h, h->free_elts[l - 1]);
-      _vec_len (h->free_elts) -= 1;
-    }
-  else
-    vec_add2 (h->elts, e, 1);
-  return e;
-}
-
-/* Return pointer to object at given offset.
-   Used to write free list index of free objects. */
-always_inline u32 *
-elt_data (void *v, heap_elt_t * e)
-{
-  heap_header_t *h = heap_header (v);
-  return v + heap_offset (e) * h->elt_bytes;
-}
-
-always_inline void
-set_free_elt (void *v, heap_elt_t * e, uword fi)
-{
-  heap_header_t *h = heap_header (v);
-
-  e->offset |= HEAP_ELT_FREE_BIT;
-  if (h->elt_bytes >= sizeof (u32))
-    {
-      *elt_data (v, e) = fi;
-    }
-  else
-    {
-      /* For elt_bytes < 4 we must store free index in separate
-         vector. */
-      uword elt_index = e - h->elts;
-      vec_validate (h->small_free_elt_free_index, elt_index);
-      h->small_free_elt_free_index[elt_index] = fi;
-    }
-}
-
-always_inline uword
-get_free_elt (void *v, heap_elt_t * e, uword * bin_result)
-{
-  heap_header_t *h = heap_header (v);
-  uword fb, fi;
-
-  ASSERT (heap_is_free (e));
-  fb = size_to_bin (heap_elt_size (v, e));
-
-  if (h->elt_bytes >= sizeof (u32))
-    {
-      fi = *elt_data (v, e);
-    }
-  else
-    {
-      uword elt_index = e - h->elts;
-      fi = vec_elt (h->small_free_elt_free_index, elt_index);
-    }
-
-  *bin_result = fb;
-  return fi;
-}
-
-always_inline void
-remove_free_block (void *v, uword b, uword i)
-{
-  heap_header_t *h = heap_header (v);
-  uword l;
-
-  ASSERT (b < vec_len (h->free_lists));
-  ASSERT (i < vec_len (h->free_lists[b]));
-
-  l = vec_len (h->free_lists[b]);
-
-  if (i < l - 1)
-    {
-      uword t = h->free_lists[b][l - 1];
-      h->free_lists[b][i] = t;
-      set_free_elt (v, elt_at (h, t), i);
-    }
-  _vec_len (h->free_lists[b]) = l - 1;
-}
-
-static heap_elt_t *
-search_free_list (void *v, uword size)
-{
-  heap_header_t *h = heap_header (v);
-  heap_elt_t *f, *u;
-  uword b, fb, f_size, f_index;
-  word s, l;
-
-  if (!v)
-    return 0;
-
-  /* Search free lists for bins >= given size. */
-  for (b = size_to_bin (size); b < vec_len (h->free_lists); b++)
-    if ((l = vec_len (h->free_lists[b])) > 0)
-      {
-	/* Find an object that is large enough.
-	   Search list in reverse so that more recently freed objects will be
-	   allocated again sooner. */
-	do
-	  {
-	    l--;
-	    f_index = h->free_lists[b][l];
-	    f = elt_at (h, f_index);
-	    f_size = heap_elt_size (v, f);
-	    if ((s = f_size - size) >= 0)
-	      break;
-	  }
-	while (l >= 0);
-
-	/* If we fail to find a large enough object, try the next larger size. */
-	if (l < 0)
-	  continue;
-
-	ASSERT (heap_is_free (f));
-
-	/* Link in used object (u) after free object (f). */
-	if (s == 0)
-	  {
-	    u = f;
-	    fb = HEAP_N_BINS;
-	  }
-	else
-	  {
-	    u = elt_new (h);
-	    f = elt_at (h, f_index);
-	    elt_insert_after (h, f, u);
-	    fb = size_to_bin (s);
-	  }
-
-	u->offset = heap_offset (f) + s;
-
-	if (fb != b)
-	  {
-	    if (fb < HEAP_N_BINS)
-	      {
-		uword i;
-		vec_validate (h->free_lists, fb);
-		i = vec_len (h->free_lists[fb]);
-		vec_add1 (h->free_lists[fb], f - h->elts);
-		set_free_elt (v, f, i);
-	      }
-
-	    remove_free_block (v, b, l);
-	  }
-
-	return u;
-      }
-
-  return 0;
-}
-
-static void combine_free_blocks (void *v, heap_elt_t * e0, heap_elt_t * e1);
-
-static inline void
-dealloc_elt (void *v, heap_elt_t * e)
-{
-  heap_header_t *h = heap_header (v);
-  uword b, l;
-  heap_elt_t *n, *p;
-
-  b = size_to_bin (heap_elt_size (v, e));
-  vec_validate (h->free_lists, b);
-  l = vec_len (h->free_lists[b]);
-  vec_add1 (h->free_lists[b], e - h->elts);
-  set_free_elt (v, e, l);
-
-  /* See if we can combine the block we just freed with neighboring free blocks. */
-  p = heap_prev (e);
-  if (!heap_is_free (p))
-    p = e;
-
-  n = heap_next (e);
-  if (!heap_is_free (n))
-    n = e;
-
-  if (p != n)
-    combine_free_blocks (v, p, n);
-}
-
-void *
-_heap_alloc (void *v,
-	     uword size,
-	     uword align,
-	     uword elt_bytes, uword * offset_return, uword * handle_return)
-{
-  uword offset = 0, align_size;
-  heap_header_t *h;
-  heap_elt_t *e;
-
-  if (size == 0)
-    goto error;
-
-  /* Round up alignment to power of 2. */
-  if (align <= 1)
-    {
-      align = 0;
-      align_size = size;
-    }
-  else
-    {
-      align = max_pow2 (align);
-      align_size = size + align - 1;
-    }
-
-  e = search_free_list (v, align_size);
-
-  /* If nothing found on free list, allocate object from end of vector. */
-  if (!e)
-    {
-      uword max_len;
-
-      offset = vec_len (v);
-      max_len = heap_get_max_len (v);
-
-      if (max_len && offset + align_size > max_len)
-	goto error;
-
-      h = heap_header (v);
-      if (!v || !(h->flags & HEAP_IS_STATIC))
-	v = _vec_resize (v,
-			 align_size,
-			 (offset + align_size) * elt_bytes,
-			 sizeof (h[0]), HEAP_DATA_ALIGN);
-      else
-	_vec_len (v) += align_size;
-
-      if (offset == 0)
-	{
-	  h = heap_header (v);
-	  h->elt_bytes = elt_bytes;
-	}
-    }
-
-  h = heap_header (v);
-
-  /* Add new element to doubly linked chain of elements. */
-  if (!e)
-    {
-      e = elt_new (h);
-      e->offset = offset;
-      elt_insert_after (h, last (h), e);
-    }
-
-  if (align > 0)
-    {
-      uword e_index;
-      uword new_offset, old_offset;
-
-      old_offset = e->offset;
-      new_offset = (old_offset + align - 1) & ~(align - 1);
-      e->offset = new_offset;
-      e_index = e - h->elts;
-
-      /* Free fragments before and after aligned object. */
-      if (new_offset > old_offset)
-	{
-	  heap_elt_t *before_e = elt_new (h);
-	  before_e->offset = old_offset;
-	  elt_insert_before (h, h->elts + e_index, before_e);
-	  dealloc_elt (v, before_e);
-	}
-
-      if (new_offset + size < old_offset + align_size)
-	{
-	  heap_elt_t *after_e = elt_new (h);
-	  after_e->offset = new_offset + size;
-	  elt_insert_after (h, h->elts + e_index, after_e);
-	  dealloc_elt (v, after_e);
-	}
-
-      e = h->elts + e_index;
-    }
-
-  h->used_count++;
-
-  /* Keep track of used elements when debugging.
-     This allows deallocation to check that passed objects are valid. */
-  if (CLIB_DEBUG > 0)
-    {
-      uword handle = e - h->elts;
-      ASSERT (!clib_bitmap_get (h->used_elt_bitmap, handle));
-      h->used_elt_bitmap = clib_bitmap_ori (h->used_elt_bitmap, handle);
-    }
-
-  *offset_return = e->offset;
-  *handle_return = e - h->elts;
-  return v;
-
-error:
-  *offset_return = *handle_return = ~0;
-  return v;
-}
-
-void
-heap_dealloc (void *v, uword handle)
-{
-  heap_header_t *h = heap_header (v);
-  heap_elt_t *e;
-
-  ASSERT (handle < vec_len (h->elts));
-
-  /* For debugging we keep track of indices for valid objects.
-     We make sure user is not trying to free object with an invalid index. */
-  if (CLIB_DEBUG > 0)
-    {
-      ASSERT (clib_bitmap_get (h->used_elt_bitmap, handle));
-      h->used_elt_bitmap = clib_bitmap_andnoti (h->used_elt_bitmap, handle);
-    }
-
-  h->used_count--;
-
-  e = h->elts + handle;
-  ASSERT (!heap_is_free (e));
-
-  dealloc_elt (v, e);
-}
-
-/* While freeing objects at INDEX we noticed free blocks i0 <= index and
-   i1 >= index.  We combine these two or three blocks into one big free block. */
-static void
-combine_free_blocks (void *v, heap_elt_t * e0, heap_elt_t * e1)
-{
-  heap_header_t *h = heap_header (v);
-  uword total_size, i, b, tb, ti, i_last, g_offset;
-  heap_elt_t *e;
-
-  struct
-  {
-    u32 index;
-    u32 bin;
-    u32 bin_index;
-  } f[3], g;
-
-  /* Compute total size of free objects i0 through i1. */
-  total_size = 0;
-  for (i = 0, e = e0; 1; e = heap_next (e), i++)
-    {
-      ASSERT (i < ARRAY_LEN (f));
-
-      ti = get_free_elt (v, e, &tb);
-
-      ASSERT (tb < vec_len (h->free_lists));
-      ASSERT (ti < vec_len (h->free_lists[tb]));
-
-      f[i].index = h->free_lists[tb][ti];
-      f[i].bin = tb;
-      f[i].bin_index = ti;
-
-      total_size += heap_elt_size (v, elt_at (h, f[i].index));
-
-      if (e == e1)
-	{
-	  i_last = i;
-	  break;
-	}
-    }
-
-  /* Compute combined bin.  See if all objects can be
-     combined into existing bin. */
-  b = size_to_bin (total_size);
-  g.index = g.bin_index = 0;
-  for (i = 0; i <= i_last; i++)
-    if (b == f[i].bin)
-      {
-	g = f[i];
-	break;
-      }
-
-  /* Make sure we found a bin. */
-  if (i > i_last)
-    {
-      g.index = elt_new (h) - h->elts;
-      vec_validate (h->free_lists, b);
-      g.bin_index = vec_len (h->free_lists[b]);
-      vec_add1 (h->free_lists[b], g.index);
-      elt_insert_before (h, elt_at (h, f[0].index), elt_at (h, g.index));
-    }
-
-  g_offset = elt_at (h, f[0].index)->offset;
-
-  /* Delete unused bins. */
-  for (i = 0; i <= i_last; i++)
-    if (g.index != f[i].index)
-      {
-	ti = get_free_elt (v, elt_at (h, f[i].index), &tb);
-	remove_free_block (v, tb, ti);
-	elt_delete (h, elt_at (h, f[i].index));
-      }
-
-  /* Initialize new element. */
-  elt_at (h, g.index)->offset = g_offset;
-  set_free_elt (v, elt_at (h, g.index), g.bin_index);
-}
-
-uword
-heap_len (void *v, word handle)
-{
-  heap_header_t *h = heap_header (v);
-
-  if (CLIB_DEBUG > 0)
-    ASSERT (clib_bitmap_get (h->used_elt_bitmap, handle));
-  return heap_elt_size (v, elt_at (h, handle));
-}
-
-void *
-_heap_free (void *v)
-{
-  heap_header_t *h = heap_header (v);
-  uword b;
-
-  if (!v)
-    return v;
-
-  clib_bitmap_free (h->used_elt_bitmap);
-  for (b = 0; b < vec_len (h->free_lists); b++)
-    vec_free (h->free_lists[b]);
-  vec_free (h->free_lists);
-  vec_free (h->elts);
-  vec_free (h->free_elts);
-  vec_free (h->small_free_elt_free_index);
-  if (!(h->flags & HEAP_IS_STATIC))
-    vec_free_h (v, sizeof (h[0]));
-  return v;
-}
-
-uword
-heap_bytes (void *v)
-{
-  heap_header_t *h = heap_header (v);
-  uword bytes, b;
-
-  if (!v)
-    return 0;
-
-  bytes = sizeof (h[0]);
-  bytes += vec_len (v) * sizeof (h->elt_bytes);
-  for (b = 0; b < vec_len (h->free_lists); b++)
-    bytes += vec_capacity (h->free_lists[b], 0);
-  bytes += vec_bytes (h->free_lists);
-  bytes += vec_capacity (h->elts, 0);
-  bytes += vec_capacity (h->free_elts, 0);
-  bytes += vec_bytes (h->used_elt_bitmap);
-
-  return bytes;
-}
-
-static u8 *
-debug_elt (u8 * s, void *v, word i, word n)
-{
-  heap_elt_t *e, *e0, *e1;
-  heap_header_t *h = heap_header (v);
-  word j;
-
-  if (vec_len (h->elts) == 0)
-    return s;
-
-  if (i < 0)
-    e0 = first (h);
-  else
-    {
-      e0 = h->elts + i;
-      for (j = 0; j < n / 2; j++)
-	e0 = heap_prev (e0);
-    }
-
-  if (n < 0)
-    e1 = h->elts + h->tail;
-  else
-    {
-      e1 = h->elts + i;
-      for (j = 0; j < n / 2; j++)
-	e1 = heap_next (e1);
-    }
-
-  i = -n / 2;
-  for (e = e0; 1; e = heap_next (e))
-    {
-      if (heap_is_free (e))
-	s = format (s, "index %4d, free\n", e - h->elts);
-      else if (h->format_elt)
-	s = format (s, "%U", h->format_elt, v, elt_data (v, e));
-      else
-	s = format (s, "index %4d, used\n", e - h->elts);
-      i++;
-      if (e == e1)
-	break;
-    }
-
-  return s;
-}
-
-u8 *
-format_heap (u8 * s, va_list * va)
-{
-  void *v = va_arg (*va, void *);
-  uword verbose = va_arg (*va, uword);
-  heap_header_t *h = heap_header (v);
-  heap_header_t zero;
-
-  memset (&zero, 0, sizeof (zero));
-
-  if (!v)
-    h = &zero;
-
-  {
-    f64 elt_bytes = vec_len (v) * h->elt_bytes;
-    f64 overhead_bytes = heap_bytes (v);
-
-    s = format (s, "heap %p, %6d objects, size %.1fk + overhead %.1fk\n",
-		v, h->used_count, elt_bytes / 1024,
-		(overhead_bytes - elt_bytes) / 1024);
-  }
-
-  if (v && verbose)
-    s = debug_elt (s, v, -1, -1);
-
-  return s;
-}
-
-void
-heap_validate (void *v)
-{
-  heap_header_t *h = heap_header (v);
-  uword i, o, s;
-  u8 *free_map;
-  heap_elt_t *e, *n;
-
-  uword used_count, total_size;
-  uword free_count, free_size;
-
-  ASSERT (h->used_count == clib_bitmap_count_set_bits (h->used_elt_bitmap));
-
-  ASSERT (first (h)->prev == 0);
-  ASSERT (last (h)->next == 0);
-
-  /* Validate number of elements and size. */
-  free_size = free_count = 0;
-  for (i = 0; i < vec_len (h->free_lists); i++)
-    {
-      free_count += vec_len (h->free_lists[i]);
-      for (o = 0; o < vec_len (h->free_lists[i]); o++)
-	{
-	  e = h->elts + h->free_lists[i][o];
-	  s = heap_elt_size (v, e);
-	  ASSERT (size_to_bin (s) == i);
-	  ASSERT (heap_is_free (e));
-	  free_size += s;
-	}
-    }
-
-  {
-    uword elt_free_size, elt_free_count;
-
-    used_count = total_size = elt_free_size = elt_free_count = 0;
-    for (e = first (h); 1; e = n)
-      {
-	int is_free = heap_is_free (e);
-	used_count++;
-	s = heap_elt_size (v, e);
-	total_size += s;
-	ASSERT (is_free ==
-		!clib_bitmap_get (h->used_elt_bitmap, e - h->elts));
-	if (is_free)
-	  {
-	    elt_free_count++;
-	    elt_free_size += s;
-	  }
-	n = heap_next (e);
-	if (e == n)
-	  {
-	    ASSERT (last (h) == n);
-	    break;
-	  }
-
-	/* We should never have two free adjacent elements. */
-	ASSERT (!(heap_is_free (e) && heap_is_free (n)));
-      }
-
-    ASSERT (free_count == elt_free_count);
-    ASSERT (free_size == elt_free_size);
-    ASSERT (used_count == h->used_count + free_count);
-    ASSERT (total_size == vec_len (v));
-  }
-
-  free_map = vec_new (u8, used_count);
-
-  e = first (h);
-  for (i = o = 0; 1; i++)
-    {
-      ASSERT (heap_offset (e) == o);
-      s = heap_elt_size (v, e);
-
-      if (heap_is_free (e))
-	{
-	  uword fb, fi;
-
-	  fi = get_free_elt (v, e, &fb);
-
-	  ASSERT (fb < vec_len (h->free_lists));
-	  ASSERT (fi < vec_len (h->free_lists[fb]));
-	  ASSERT (h->free_lists[fb][fi] == e - h->elts);
-
-	  ASSERT (!free_map[i]);
-	  free_map[i] = 1;
-	}
-
-      n = heap_next (e);
-
-      if (e == n)
-	break;
-
-      ASSERT (heap_prev (n) == e);
-
-      o += s;
-      e = n;
-    }
-
-  vec_free (free_map);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/heap.h b/vppinfra/vppinfra/heap.h
deleted file mode 100644
index 8c1aae46..00000000
--- a/vppinfra/vppinfra/heap.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-/* Heaps of objects of type T (e.g. int, struct foo, ...).
-
-   Usage.  To declare a null heap:
-
-     T * heap = 0;
-
-   To allocate:
-
-     offset = heap_alloc (heap, size, handle);
-
-   New object is heap[offset] ... heap[offset + size]
-   Handle is used to free/query object.
-
-   To free object:
-
-     heap_dealloc (heap, handle);
-
-   To query the size of an object:
-
-     heap_size (heap, handle)
-
-*/
-
-#ifndef included_heap_h
-#define included_heap_h
-
-#include <vppinfra/clib.h>
-#include <vppinfra/cache.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/format.h>
-#include <vppinfra/bitmap.h>
-
-/* Doubly linked list of elements. */
-typedef struct
-{
-  /* Offset of this element (plus free bit).
-     If element is free, data at offset contains pointer to free list. */
-  u32 offset;
-
-  /* Index of next and previous elements relative to current element. */
-  i32 next, prev;
-} heap_elt_t;
-
-/* Use high bit of offset as free bit. */
-#define HEAP_ELT_FREE_BIT	(1 << 31)
-
-always_inline uword
-heap_is_free (heap_elt_t * e)
-{
-  return (e->offset & HEAP_ELT_FREE_BIT) != 0;
-}
-
-always_inline uword
-heap_offset (heap_elt_t * e)
-{
-  return e->offset & ~HEAP_ELT_FREE_BIT;
-}
-
-always_inline heap_elt_t *
-heap_next (heap_elt_t * e)
-{
-  return e + e->next;
-}
-
-always_inline heap_elt_t *
-heap_prev (heap_elt_t * e)
-{
-  return e + e->prev;
-}
-
-always_inline uword
-heap_elt_size (void *v, heap_elt_t * e)
-{
-  heap_elt_t *n = heap_next (e);
-  uword next_offset = n != e ? heap_offset (n) : vec_len (v);
-  return next_offset - heap_offset (e);
-}
-
-/* Sizes are binned.  Sizes 1 to 2^log2_small_bins have their
-   own free lists.  Larger sizes are grouped in powers of two. */
-#define HEAP_LOG2_SMALL_BINS	(5)
-#define HEAP_SMALL_BINS		(1 << HEAP_LOG2_SMALL_BINS)
-#define HEAP_N_BINS		(2 * HEAP_SMALL_BINS)
-
-/* Header for heaps. */
-typedef struct
-{
-  /* Vector of used and free elements. */
-  heap_elt_t *elts;
-
-  /* For elt_bytes < sizeof (u32) we need some extra space
-     per elt to store free list index. */
-  u32 *small_free_elt_free_index;
-
-  /* Vector of free indices of elts array. */
-  u32 *free_elts;
-
-  /* Indices of free elts indexed by size bin. */
-  u32 **free_lists;
-
-  format_function_t *format_elt;
-
-  /* Used for validattion/debugging. */
-  uword *used_elt_bitmap;
-
-  /* First and last element of doubly linked chain of elements. */
-  u32 head, tail;
-
-  u32 used_count, max_len;
-
-  /* Number of bytes in a help element. */
-  u32 elt_bytes;
-
-  u32 flags;
-  /* Static heaps are made from external memory given to
-     us by user and are not re-sizeable vectors. */
-#define HEAP_IS_STATIC (1)
-} heap_header_t;
-
-/* Start of heap elements is always cache aligned. */
-#define HEAP_DATA_ALIGN (CLIB_CACHE_LINE_BYTES)
-
-always_inline heap_header_t *
-heap_header (void *v)
-{
-  return vec_header (v, sizeof (heap_header_t));
-}
-
-always_inline uword
-heap_header_bytes ()
-{
-  return vec_header_bytes (sizeof (heap_header_t));
-}
-
-always_inline void
-heap_dup_header (heap_header_t * old, heap_header_t * new)
-{
-  uword i;
-
-  new[0] = old[0];
-  new->elts = vec_dup (new->elts);
-  new->free_elts = vec_dup (new->free_elts);
-  new->free_lists = vec_dup (new->free_lists);
-  for (i = 0; i < vec_len (new->free_lists); i++)
-    new->free_lists[i] = vec_dup (new->free_lists[i]);
-  new->used_elt_bitmap = clib_bitmap_dup (new->used_elt_bitmap);
-  new->small_free_elt_free_index = vec_dup (new->small_free_elt_free_index);
-}
-
-/* Make a duplicate copy of a heap. */
-#define heap_dup(v) _heap_dup(v, vec_len (v) * sizeof (v[0]))
-
-always_inline void *
-_heap_dup (void *v_old, uword v_bytes)
-{
-  heap_header_t *h_old, *h_new;
-  void *v_new;
-
-  h_old = heap_header (v_old);
-
-  if (!v_old)
-    return v_old;
-
-  v_new = 0;
-  v_new =
-    _vec_resize (v_new, _vec_len (v_old), v_bytes, sizeof (heap_header_t),
-		 HEAP_DATA_ALIGN);
-  h_new = heap_header (v_new);
-  heap_dup_header (h_old, h_new);
-  clib_memcpy (v_new, v_old, v_bytes);
-  return v_new;
-}
-
-always_inline uword
-heap_elts (void *v)
-{
-  heap_header_t *h = heap_header (v);
-  return h->used_count;
-}
-
-uword heap_bytes (void *v);
-
-always_inline void *
-_heap_new (u32 len, u32 n_elt_bytes)
-{
-  void *v = _vec_resize (0, len, (uword) len * n_elt_bytes,
-			 sizeof (heap_header_t),
-			 HEAP_DATA_ALIGN);
-  heap_header (v)->elt_bytes = n_elt_bytes;
-  return v;
-}
-
-#define heap_new(v) (v) = _heap_new (0, sizeof ((v)[0]))
-
-always_inline void
-heap_set_format (void *v, format_function_t * format_elt)
-{
-  ASSERT (v);
-  heap_header (v)->format_elt = format_elt;
-}
-
-always_inline void
-heap_set_max_len (void *v, uword max_len)
-{
-  ASSERT (v);
-  heap_header (v)->max_len = max_len;
-}
-
-always_inline uword
-heap_get_max_len (void *v)
-{
-  return v ? heap_header (v)->max_len : 0;
-}
-
-/* Create fixed size heap with given block of memory. */
-always_inline void *
-heap_create_from_memory (void *memory, uword max_len, uword elt_bytes)
-{
-  heap_header_t *h;
-  void *v;
-
-  if (max_len * elt_bytes < sizeof (h[0]))
-    return 0;
-
-  h = memory;
-  memset (h, 0, sizeof (h[0]));
-  h->max_len = max_len;
-  h->elt_bytes = elt_bytes;
-  h->flags = HEAP_IS_STATIC;
-
-  v = (void *) (memory + heap_header_bytes ());
-  _vec_len (v) = 0;
-  return v;
-}
-
-/* Execute BODY for each allocated heap element. */
-#define heap_foreach(var,len,heap,body)			\
-do {							\
-  if (vec_len (heap) > 0)				\
-    {							\
-      heap_header_t * _h = heap_header (heap);		\
-      heap_elt_t * _e   = _h->elts + _h->head;		\
-      heap_elt_t * _end = _h->elts + _h->tail;		\
-      while (1)						\
-	{						\
-	  if (! heap_is_free (_e))			\
-	    {						\
-	      (var) = (heap) + heap_offset (_e);	\
-	      (len) = heap_elt_size ((heap), _e);	\
-	      do { body; } while (0);			\
-	    }						\
-	  if (_e == _end)				\
-	    break;					\
-	  _e = heap_next (_e);				\
-	}						\
-    }							\
-} while (0)
-
-#define heap_elt_at_index(v,index) vec_elt_at_index(v,index)
-
-always_inline heap_elt_t *
-heap_get_elt (void *v, uword handle)
-{
-  heap_header_t *h = heap_header (v);
-  heap_elt_t *e = vec_elt_at_index (h->elts, handle);
-  ASSERT (!heap_is_free (e));
-  return e;
-}
-
-#define heap_elt_with_handle(v,handle)			\
-({							\
-  heap_elt_t * _e = heap_get_elt ((v), (handle));	\
-  (v) + heap_offset (_e);				\
-})
-
-always_inline uword
-heap_is_free_handle (void *v, uword heap_handle)
-{
-  heap_header_t *h = heap_header (v);
-  heap_elt_t *e = vec_elt_at_index (h->elts, heap_handle);
-  return heap_is_free (e);
-}
-
-extern uword heap_len (void *v, word handle);
-
-/* Low level allocation call. */
-extern void *_heap_alloc (void *v, uword size, uword alignment,
-			  uword elt_bytes, uword * offset, uword * handle);
-
-#define heap_alloc_aligned(v,size,align,handle)			\
-({								\
-  uword _o, _h;							\
-  uword _a = (align);						\
-  uword _s = (size);						\
-  (v) = _heap_alloc ((v), _s, _a, sizeof ((v)[0]), &_o, &_h);	\
-  (handle) = _h;						\
-  _o;								\
-})
-
-#define heap_alloc(v,size,handle) heap_alloc_aligned((v),(size),0,(handle))
-
-extern void heap_dealloc (void *v, uword handle);
-extern void heap_validate (void *v);
-
-/* Format heap internal data structures as string. */
-extern u8 *format_heap (u8 * s, va_list * va);
-
-void *_heap_free (void *v);
-
-#define heap_free(v) (v)=_heap_free(v)
-
-#endif /* included_heap_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/longjmp.S b/vppinfra/vppinfra/longjmp.S
deleted file mode 100644
index d4dd4c7d..00000000
--- a/vppinfra/vppinfra/longjmp.S
+++ /dev/null
@@ -1,690 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-	
-#if defined(__x86_64__)
-	.global clib_setjmp
-	.align 4
-	.type clib_setjmp, @function
-clib_setjmp:
-	movq %rbx, 8*0(%rdi)
-	movq %rbp, 8*1(%rdi)
-	movq %r12, 8*2(%rdi)
-	movq %r13, 8*3(%rdi)
-	movq %r14, 8*4(%rdi)
-	movq %r15, 8*5(%rdi)
-
-	/* Save SP after return. */
-	leaq 8(%rsp), %rdx
-	movq %rdx, 8*6(%rdi)
-	
-	/* Save PC we are returning to from stack frame. */
-	movq 0(%rsp), %rax
-	movq %rax, 8*7(%rdi)
-	
-	/* Give back user's return value. */
-	movq %rsi, %rax
-	ret
-	
-	.global clib_longjmp
-	.align 4
-	.type clib_longjmp, @function
-clib_longjmp:	
-        /* Restore regs. */
-	movq 8*0(%rdi), %rbx
-	movq 8*1(%rdi), %rbp
-	movq 8*2(%rdi), %r12
-	movq 8*3(%rdi), %r13
-	movq 8*4(%rdi), %r14
-	movq 8*5(%rdi), %r15
-	movq 8*6(%rdi), %rsp
-	movq 8*7(%rdi), %rdx
-	
-	/* Give back user's return value. */
-	movq %rsi, %rax
-	
-	/* Away we go. */
-	jmpq *%rdx	
-	
-	.global clib_calljmp
-	.align 4
-	.type clib_calljmp, @function
-clib_calljmp:
-	/* Make sure stack is 16-byte aligned. */
-	movq %rdx, %rax
-	andq $0xf, %rax
-	subq %rax, %rdx
-	
-	/* Get return address. */
-	pop %rax
-	
-	/* Switch to new stack. */
-	xchgq %rsp, %rdx
-	
-	/* Save return address on new stack. */
-	push %rax
-	
-	/* Save old stack pointer on new stack. */
-	push %rdx
-	
-	/* Get function. */
-	movq %rdi, %rdx
-	
-	/* Move argument into place. */
-	movq %rsi, %rdi
-	
-	/* Away we go. */
-	callq *%rdx
-	
-	/* Switch back to old stack. */
-	movq 8(%rsp), %rdx
-	movq 0(%rsp), %rcx
-	xchgq %rcx, %rsp
-	
-	/* Return to caller. */
-	jmpq *%rdx
-
-#elif defined(i386)
-	.global clib_setjmp
-	.align 4
-	.type clib_setjmp, @function
-clib_setjmp:
-	movl 4(%esp), %ecx
-	
-	movl %ebp, 4*0(%ecx)
-	movl %ebx, 4*1(%ecx)
-	movl %edi, 4*2(%ecx)
-	movl %esi, 4*3(%ecx)
-
-	/* Save SP after return. */
-	leal 4(%esp), %edx
-	movl %edx, 4*4(%ecx)
-	
-	/* Save PC we are returning to from stack frame. */
-	movl 0(%esp), %eax
-	movl %eax, 4*5(%ecx)
-	
-	/* Give back user's return value. */
-	movl 8(%esp), %eax
-	ret
-	
-	.global clib_longjmp
-	.align 4
-	.type clib_longjmp, @function
-clib_longjmp:	
-	movl 4(%esp), %ecx
-	
-	/* Give back user's return value. */
-	movl 8(%esp), %eax
-	
-        /* Restore regs. */
-	movl 4*0(%ecx), %ebp
-	movl 4*1(%ecx), %ebx
-	movl 4*2(%ecx), %edi
-	movl 4*3(%ecx), %esi
-	movl 4*4(%ecx), %esp
-	movl 4*5(%ecx), %edx
-	
-	/* Away we go. */
-	jmp *%edx	
-	
-	.global clib_calljmp
-	.align 4
-	.type clib_calljmp, @function
-clib_calljmp:	
-	/* Get new stack pointer. */
-	movl 12(%esp), %edx
-	
-	/* Switch stacks. */
-	xchgl %esp, %edx
-	
-	/* Save old stack pointer on new stack. */
-	sub $8, %esp
-	movl %edx, 4(%esp)
-	
-	/* Put function argument in stack frame. */
-	movl 8(%edx), %eax
-	movl %eax, 0(%esp)
-	
-	/* Get function. */
-	movl 4(%edx), %eax
-	
-	/* Away we go. */
-	call *%eax
-	
-	/* Switch back to old stack. */
-	movl 4(%esp), %edx
-	xchgl %edx, %esp
-	
-	/* Return to caller. */
-	ret
-	
-#elif defined(__SPU__)
-	
-#elif defined(__powerpc64__)
-	
-	.text
-
-#define _prologue(n)				\
-    .align 2 ;					\
-    .globl n, .##n ;				\
-    .section ".opd", "aw" ;			\
-    .align 3 ;					\
-n:  .quad .##n, .TOC.@tocbase, 0 ;		\
-    .previous ;					\
-    .size n, 24 ;				\
-    .type .##n, @function ;			\
-.##n:
-
-#define _foreach_14_31							\
-_ (14, 0)  _ (15, 1)  _ (16, 2)  _ (17, 3)  _ (18, 4)  _ (19, 5)	\
-_ (20, 6)  _ (21, 7)  _ (22, 8)  _ (23, 9)  _ (24, 10) _ (25, 11)	\
-_ (26, 12) _ (27, 13) _ (28, 14) _ (29, 15) _ (30, 16) _ (31, 17)
-
-#define _foreach_20_31						\
-_ (20, 0) _ (21, 1) _ (22, 2) _ (23, 3) _ (24, 4)  _ (25, 5)	\
-_ (26, 6) _ (27, 7) _ (28, 8) _ (29, 9) _ (30, 10) _ (31, 11)
-	
-#ifdef __ALTIVEC__
-#define CLIB_POWERPC_ALTIVEC_N_REGS 12
-#else
-#define CLIB_POWERPC_ALTIVEC_N_REGS 0
-#endif
-
-_prologue (clib_setjmp)
-	mflr 0
-	std 0, 8*0(3)
-	std 1, 8*1(3)
-	std 2, 8*2(3)
-	mfcr 0
-	std 0, 8*3(3)
-	mfspr 0, 256
-	stw 0, 8*4(3)
-	
-	/* gprs 14 - 31 */
-#define _(a,b) std a, 8*((b) + 4 + 18*0)(3) ; 
-	_foreach_14_31
-#undef _
-	
-	/* fprs 14 - 31 */
-#define _(a,b) stfd a, 8*((b) + 4 + 18*1)(3) ; 
-	_foreach_14_31
-#undef _
-
-#if CLIB_POWERPC_ALTIVEC_N_REGS > 0
-	/* vrs 20 - 31 */
-	li 5, 8*(4 + 18*2)
-#define _(a,b) stvx a, 5, 3 ; addi 5, 5, 16 ;
-	_foreach_20_31
-#undef _
-#endif /* CLIB_POWERPC_ALTIVEC_N_REGS > 0 */
-	
-	/* Return value. */
-	mr 3, 4
-	
-	blr
-	
-_prologue (clib_longjmp)
-	ld 0, 8*0(3)
-	mtlr 0
-	ld 1, 8*1(3)
-	ld 2, 8*2(3)
-	ld 0, 8*3(3)
-	mtcrf 0xff, 0
-	lwz 0, 8*3(3)
-	mtspr 256, 0
-	
-	/* gprs 14 - 31 */
-#define _(a,b) ld a, 8*((b) + 4 + 18*0)(3) ; 
-	_foreach_14_31
-#undef _
-	
-	/* fprs 14 - 31 */
-#define _(a,b) lfd a, 8*((b) + 4 + 18*1)(3) ; 
-	_foreach_14_31
-#undef _
-	
-#if CLIB_POWERPC_ALTIVEC_N_REGS > 0
-	/* vrs 20 - 31 */
-	li 5, 8*(4 + 18*2)
-#define _(a,b) lvx a, 5, 3 ; addi 5, 5, 16 ;
-	_foreach_20_31
-#undef _
-#endif /* CLIB_POWERPC_ALTIVEC_N_REGS > 0 */
-	
-	/* Return value. */
-	mr 3, 4
-	
-	blr
-
-	.globl clib_calljmp
-	.section	".opd","aw"
-	.align 3
-clib_calljmp:
-	.quad	.L.clib_calljmp,.TOC.@tocbase,0
-	.previous
-	.type	clib_calljmp, @function
-.L.clib_calljmp:
-	mflr 0
-	mr 9,3
-	std 0,16(1)
-	stdu 1,-112(1)
-#APP
-	std 1,-8(5)
-	addi 5,5,-256
-	mr 1,5
-#NO_APP
-	ld 10,0(9)
-	std 2,40(1)
-	mr 3,4
-	mtctr 10
-	ld 11,16(9)
-	ld 2,8(9)
-	bctrl
-	ld 2,40(1)
-#APP
-	addi 1,1,256
-	ld 1,-8(1)
-#NO_APP
-	addi 1,1,112
-	ld 0,16(1)
-	mtlr 0
-	blr
-	.long 0
-	.byte 0,0,0,1,128,0,0,0
-	.size	clib_calljmp,.-.L.clib_calljmp
-	
-#elif defined(__powerpc__)
-	
-#define _foreach_14_31							\
-_ (14, 0)  _ (15, 1)  _ (16, 2)  _ (17, 3)  _ (18, 4)  _ (19, 5)	\
-_ (20, 6)  _ (21, 7)  _ (22, 8)  _ (23, 9)  _ (24, 10) _ (25, 11)	\
-_ (26, 12) _ (27, 13) _ (28, 14) _ (29, 15) _ (30, 16) _ (31, 17)
-
-#define _foreach_20_31						\
-_ (20, 0) _ (21, 1) _ (22, 2) _ (23, 3) _ (24, 4)  _ (25, 5)	\
-_ (26, 6) _ (27, 7) _ (28, 8) _ (29, 9) _ (30, 10) _ (31, 11)
-	
-#ifdef __ALTIVEC__
-#define CLIB_POWERPC_ALTIVEC_N_REGS 12
-#else
-#define CLIB_POWERPC_ALTIVEC_N_REGS 0
-#endif
-
-	.global clib_setjmp
-	.align 4
-	.type clib_setjmp, @function
-clib_setjmp:
-	mflr 0
-	stw 0, 4*0(3)
-	stw 1, 4*1(3)
-	mfcr 0
-	stw 0, 4*2(3)
-#if CLIB_POWERPC_ALTIVEC_N_REGS > 0
-	mfspr 0, 256
-#endif
-	stw 0, 4*3(3)
-	
-#if CLIB_POWERPC_ALTIVEC_N_REGS > 0
-	li 5, 4*4
-#define _(a,b) stvx a, 3, 5 ; addi 5, 5, 16 ;
-	_foreach_20_31
-#undef _
-#endif /* CLIB_POWERPC_ALTIVEC_N_REGS > 0 */
-	
-	/* gp 14 - 31 */
-#define _(a,b) stw a,  4*(1*(b) + 4 + 4*CLIB_POWERPC_ALTIVEC_N_REGS + 0*18)(3) ; 
-	_foreach_14_31
-#undef _
-	
-	/* fp 14 - 31 */
-#define _(a,b) stfd a, 4*(2*(b) + 4 + 4*CLIB_POWERPC_ALTIVEC_N_REGS + 1*18)(3) ;
-	_foreach_14_31
-#undef _
-
-	/* Return value. */
-	mr 3, 4
-	
-	blr
-	
-	.global clib_longjmp
-	.align 4
-	.type clib_longjmp, @function
-clib_longjmp:	
-	
-	lwz 0, 4*0(3)
-	mtlr 0
-	lwz 1, 4*1(3)
-	lwz 0, 4*2(3)
-	mtcr 0
-	lwz 0, 4*3(3)
-#if CLIB_POWERPC_ALTIVEC_N_REGS > 0
-	mtspr 256, 0
-#endif
-	
-#if CLIB_POWERPC_ALTIVEC_N_REGS > 0
-	li 5, 4*4
-#define _(a,b) lvx a, 3, 5 ; addi 5, 5, 16 ;
-	_foreach_20_31
-#undef _
-#endif /* CLIB_POWERPC_ALTIVEC_N_REGS > 0 */
-	
-	/* gp 14 - 31 */
-#define _(a,b) lwz a, 4*(1*(b) + 4 + 4*CLIB_POWERPC_ALTIVEC_N_REGS + 0*18)(3) ;
-	_foreach_14_31
-#undef _
-	
-	/* fp 14 - 31 */
-#define _(a,b) lfd a, 4*(2*(b) + 4 + 4*CLIB_POWERPC_ALTIVEC_N_REGS + 1*18)(3) ;
-	_foreach_14_31
-#undef _
-
-	/* Return value. */
-	mr 3, 4
-	
-	blr
-
-	.global clib_calljmp
-	.align 4
-	.type clib_calljmp, @function
-clib_calljmp:	
-	/* Make sure stack is 16 byte aligned. */
-	andi. 0, 5, 0xf
-	sub  5, 5, 0
-	addi 5, 5, -16
-	
-	/* Save old stack/link pointer on new stack. */
-	stw 1, 0(5)
-	mflr 0
-	stw 0, 4(5)
-	
-	/* account for (sp, lr) tuple, and keep aligned */
-	addi 5, 5, -16
-	
-	/* Switch stacks. */
-	mr 1, 5
-	
-	/* Move argument into place. */
-	mtctr 3
-	mr 3, 4
-	
-	/* Away we go. */
-	bctrl
-	
-	/* back to our synthetic frame */
-	addi 1,1,16
-	
-	/* Switch back to old stack. */
-	lwz 0, 4(1)
-	mtlr 0
-	lwz 0, 0(1)
-	mr 1, 0
-	
-	/* Return to caller. */
-	blr
-	
-#elif defined(__arm__)
-	
-	.global clib_setjmp
-	.align 4
-	.type clib_setjmp, %function
-clib_setjmp:
-	mov ip, r0		/* jmp buffer */
-
-	/* Save integer registers */
-	stmia ip!, {v1-v6, sl, fp, sp, lr}
-	
-#ifdef __IWMMXT__
-	/* Save the call-preserved iWMMXt registers.  */
-	wstrd wr10, [ip], #8
-	wstrd wr11, [ip], #8
-	wstrd wr12, [ip], #8
-	wstrd wr13, [ip], #8
-	wstrd wr14, [ip], #8
-	wstrd wr15, [ip], #8
-#endif
-
-	/* Give back user's return value. */
-	mov r0, r1
-	bx lr
-	
-	.global clib_longjmp
-	.align 4
-	.type clib_longjmp, %function
-clib_longjmp:	
-	mov ip, r0		/* jmp buffer */
-
-	/* Restore integer registers. */
-	ldmia     ip!,  {v1-v6, sl, fp, sp, lr}
-	
-#ifdef __IWMMXT__
-	/* Save the call-preserved iWMMXt registers.  */
-	wldrd wr10, [ip], #8
-	wldrd wr11, [ip], #8
-	wldrd wr12, [ip], #8
-	wldrd wr13, [ip], #8
-	wldrd wr14, [ip], #8
-	wldrd wr15, [ip], #8
-#endif
-	
-	/* Give back user's return value. */
-	mov r0, r1
-	bx lr
-
-	.global clib_calljmp
-	.align 4
-	.type clib_calljmp, %function
-clib_calljmp:	
-	/* Make sure stack is 8 byte aligned. */
-	bic r2, r2, #7
-	
-	/* Allocate space for stack/link pointer on new stack. */
-	sub r2, r2, #8	
-	
-	/* Save old stack/link pointer on new stack. */
-	str sp, [r2, #0]
-	str lr, [r2, #4]
-	
-	/* Switch stacks. */
-	mov sp, r2
-	
-	/* Save function to call. */
-	mov ip, r0
-	
-	/* Move argument into place. */
-	mov r0, r1
-	
-	/* Away we go. */
-	bx ip
-	
-	/* Switch back to old stack. */
-	ldr lr, [sp, #4]
-	ldr ip, [sp, #0]
-	mov sp, ip
-	
-	/* Return to caller. */
-	bx lr
-	
-#elif defined(__xtensa__)
-	
-	/* FIXME implement if needed. */
-	.global clib_setjmp
-	.align 4
-	.type clib_setjmp, %function
-clib_setjmp:
-1:	j 1b
-
-	.global clib_longjmp
-	.align 4
-	.type clib_longjmp, @function
-clib_longjmp:	
-1:	j 1b
-	
-	.global clib_calljmp
-	.align 4
-	.type clib_calljmp, %function
-clib_calljmp:	
-1:	j 1b
-	
-#elif defined(__TMS320C6X__)
-	
-	/* FIXME implement if needed. */
-	.global clib_setjmp
-	.align 4
-	.type clib_setjmp, %function
-clib_setjmp:
-1:	B	.S1     1b
-
-	.global clib_longjmp
-	.align 4
-	.type clib_longjmp, @function
-clib_longjmp:	
-1:	B	.S1     1b
-	
-	.global clib_calljmp
-	.align 4
-	.type clib_calljmp, %function
-clib_calljmp:	
-1:	B	.S1     1b
-	
-#elif defined (__aarch64__)
-/*
-   Copyright (c) 2011, 2012 ARM Ltd
-   All rights reserved.
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-   3. The name of the company may not be used to endorse or promote
-      products derived from this software without specific prior written
-      permission.
-   THIS SOFTWARE IS PROVIDED BY ARM LTD ``AS IS'' AND ANY EXPRESS OR IMPLIED
-   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-   IN NO EVENT SHALL ARM LTD BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-   TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#define GPR_LAYOUT			\
-	REG_PAIR (x19, x20,  0);	\
-	REG_PAIR (x21, x22, 16);	\
-	REG_PAIR (x23, x24, 32);	\
-	REG_PAIR (x25, x26, 48);	\
-	REG_PAIR (x27, x28, 64);	\
-	REG_PAIR (x29, x30, 80);	\
-	REG_ONE (x16,      96)
-#define FPR_LAYOUT			\
-	REG_PAIR ( d8,  d9, 112);	\
-	REG_PAIR (d10, d11, 128);	\
-	REG_PAIR (d12, d13, 144);	\
-	REG_PAIR (d14, d15, 160);
-// int clib_setjmp (jmp_buf)
-	.global	clib_setjmp
-	.type	clib_setjmp, %function
-clib_setjmp:
-	mov	x16, sp
-#define REG_PAIR(REG1, REG2, OFFS)	stp REG1, REG2, [x0, OFFS]
-#define REG_ONE(REG1, OFFS)		str REG1, [x0, OFFS]
-	GPR_LAYOUT
-	FPR_LAYOUT
-#undef REG_PAIR
-#undef REG_ONE
-	mov	x0, x1
-	ret
-	.size	clib_setjmp, .-clib_setjmp
-// void clib_longjmp (jmp_buf, int) __attribute__ ((noreturn))
-	.global	clib_longjmp
-	.type	clib_longjmp, %function
-clib_longjmp:
-#define REG_PAIR(REG1, REG2, OFFS)	ldp REG1, REG2, [x0, OFFS]
-#define REG_ONE(REG1, OFFS)		ldr REG1, [x0, OFFS]
-	GPR_LAYOUT
-	FPR_LAYOUT
-#undef REG_PAIR
-#undef REG_ONE
-	mov	sp, x16
-	mov     x0, x1
-	// cmp	w1, #0
-	// cinc	w0, w1, eq
-	// use br not ret, as ret is guaranteed to mispredict
-	br	x30
-	.size	clib_longjmp, .-clib_longjmp
-
-
-// void clib_calljmp (x0=function, x1=arg, x2=new_stack)
-	.global	clib_calljmp
-	.type	clib_calljmp, %function
-clib_calljmp:
-	// save fn ptr
-	mov     x3, x0
-	// set up fn arg
-	mov     x0, x1
-	// switch stacks
-	mov     x4, sp
-	
-	// space for saved sp, lr on new stack
-	sub     x2, x2, #16
-	mov     sp, x2
-	
-	// save old sp and link register on new stack
-        str     x4, [sp]
-	str     x30,[sp,#8]
-        mov     x4, sp
-
-	// go there
-        blr     x3
-	
-	// restore old sp and link register
-	mov     x4, sp
-        
-	ldr     x3, [x4]
-	ldr     x30,[x4, #8]
-        mov     sp, x3
-	ret
-	.size	clib_calljmp, .-clib_calljmp
-#else
-#error "unknown machine"
-#endif	
-
-.section .note.GNU-stack,"",%progbits
diff --git a/vppinfra/vppinfra/longjmp.h b/vppinfra/vppinfra/longjmp.h
deleted file mode 100644
index 8d83203e..00000000
--- a/vppinfra/vppinfra/longjmp.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_longjmp_h
-#define included_clib_longjmp_h
-
-#include <vppinfra/types.h>
-
-#if defined(__x86_64__)
-/* rbx, rbp, r12, r13, r14, r15, eip, rsp */
-#define CLIB_ARCH_LONGJMP_REGS 8
-
-#elif defined(i386)
-/* ebx, ebp, esi, edi, eip, rsp */
-#define CLIB_ARCH_LONGJMP_REGS 6
-
-#elif (defined(__powerpc64__) || defined(__powerpc__))
-
-#ifdef __ALTIVEC__
-#define CLIB_POWERPC_ALTIVEC_N_REGS 12
-#else
-#define CLIB_POWERPC_ALTIVEC_N_REGS 0
-#endif
-
-/* r1 r2 link condition+vsave regs 14-31 fp regs 14-31 vector regs 20-31 */
-#define CLIB_ARCH_LONGJMP_REGS				\
-  (/* r1 lr cr vrsave */				\
-   4							\
-   /* gp */						\
-   + (31 - 14 + 1)					\
-   /* fp */						\
-   + (sizeof (f64) / sizeof (uword)) * (31 - 14 + 1)	\
-   /* vector regs */					\
-   + (16 / sizeof (uword)) * CLIB_POWERPC_ALTIVEC_N_REGS)
-
-#elif defined(__SPU__)
-/* FIXME */
-#define CLIB_ARCH_LONGJMP_REGS (10)
-
-#elif defined(__arm__)
-
-#ifndef __IWMMXT__
-/* v1-v6 sl fp sp lr */
-#define CLIB_ARCH_LONGJMP_REGS (10)
-#else
-/* For iwmmxt we save 6 extra 8 byte registers. */
-#define CLIB_ARCH_LONGJMP_REGS (10 + (6*2))
-#endif
-
-#elif defined(__xtensa__)
-
-/* setjmp/longjmp not supported for the moment. */
-#define CLIB_ARCH_LONGJMP_REGS 0
-
-#elif defined(__TMS320C6X__)
-
-/* setjmp/longjmp not supported for the moment. */
-#define CLIB_ARCH_LONGJMP_REGS 0
-
-#elif defined(__aarch64__)
-#define CLIB_ARCH_LONGJMP_REGS (22)
-#else
-#error "unknown machine"
-#endif
-
-typedef struct
-{
-  uword regs[CLIB_ARCH_LONGJMP_REGS];
-} clib_longjmp_t __attribute__ ((aligned (16)));
-
-/* Return given value to saved context. */
-void clib_longjmp (clib_longjmp_t * save, uword return_value);
-
-/* Save context.  Returns given value if jump is not taken;
-   otherwise returns value from clib_longjmp if long jump is taken. */
-uword clib_setjmp (clib_longjmp_t * save, uword return_value_not_taken);
-
-/* Call function on given stack. */
-uword clib_calljmp (uword (*func) (uword func_arg),
-		    uword func_arg, void *stack);
-
-#endif /* included_clib_longjmp_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/macros.c b/vppinfra/vppinfra/macros.c
deleted file mode 100644
index ce4cc9bc..00000000
--- a/vppinfra/vppinfra/macros.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
-  macros.c - a simple macro expander
-
-  Copyright (c) 2010, 2014 Cisco and/or its affiliates.
-
-  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#include <vppinfra/macros.h>
-
-static inline int
-macro_isalnum (i8 c)
-{
-  if ((c >= 'A' && c <= 'Z')
-      || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || (c == '_'))
-    return 1;
-  return 0;
-}
-
-static i8 *
-builtin_eval (macro_main_t * mm, i8 * varname, i32 complain)
-{
-  uword *p;
-  i8 *(*fp) (macro_main_t *, i32);
-
-  p = hash_get_mem (mm->the_builtin_eval_hash, varname);
-  if (p == 0)
-    return 0;
-  fp = (void *) (p[0]);
-  return (*fp) (mm, complain);
-}
-
-int
-clib_macro_unset (macro_main_t * mm, char *name)
-{
-  hash_pair_t *p;
-  u8 *key, *value;
-
-  p = hash_get_pair (mm->the_value_table_hash, name);
-
-  if (p == 0)
-    return 1;
-
-  key = (u8 *) (p->key);
-  value = (u8 *) (p->value[0]);
-  hash_unset_mem (mm->the_value_table_hash, name);
-
-  vec_free (value);
-  vec_free (key);
-  return 0;
-}
-
-int
-clib_macro_set_value (macro_main_t * mm, char *name, char *value)
-{
-  u8 *key_copy, *value_copy;
-  int rv;
-
-  rv = clib_macro_unset (mm, name);
-
-  key_copy = format (0, "%s%c", name, 0);
-  value_copy = format (0, "%s%c", value, 0);
-
-  hash_set_mem (mm->the_value_table_hash, key_copy, value_copy);
-  return rv;
-}
-
-i8 *
-clib_macro_get_value (macro_main_t * mm, char *name)
-{
-  uword *p;
-
-  p = hash_get_mem (mm->the_value_table_hash, name);
-  if (p)
-    return (i8 *) (p[0]);
-  else
-    return 0;
-}
-
-/*
- * eval: takes a string, returns a vector.
- * looks up $foobar in the variable table.
- */
-i8 *
-clib_macro_eval (macro_main_t * mm, i8 * s, i32 complain)
-{
-  i8 *rv = 0;
-  i8 *varname, *varvalue;
-  i8 *ts;
-
-  while (*s)
-    {
-      switch (*s)
-	{
-	case '\\':
-	  s++;
-	  /* fallthrough */
-
-	default:
-	  vec_add1 (rv, *s);
-	  s++;
-	  break;
-
-	case '$':
-	  s++;
-	  varname = 0;
-	  /*
-	   * Make vector with variable name in it.
-	   */
-	  while (*s && (macro_isalnum (*s) || (*s == '_') || (*s == '(')))
-	    {
-
-	      /* handle $(foo) */
-	      if (*s == '(')
-		{
-		  s++;		/* skip '(' */
-		  while (*s && *s != ')')
-		    {
-		      vec_add1 (varname, *s);
-		      s++;
-		    }
-		  if (*s)
-		    s++;	/* skip ')' */
-		  break;
-		}
-	      vec_add1 (varname, *s);
-	      s++;
-	    }
-	  /* null terminate */
-	  vec_add1 (varname, 0);
-	  /* Look for a builtin, e.g. $my_hostname */
-	  if (!(varvalue = builtin_eval (mm, varname, complain)))
-	    {
-	      /* Look in value table */
-	      if (!varvalue)
-		{
-		  char *tmp = clib_macro_get_value (mm, varname);
-		  if (tmp)
-		    varvalue = (i8 *) format (0, "%s%c", tmp, 0);
-		}
-#ifdef CLIB_UNIX
-	      /* Look in environment. */
-	      if (!varvalue)
-		{
-		  char *tmp = getenv (varname);
-		  if (tmp)
-		    varvalue = (i8 *) format (0, "%s%c", tmp, 0);
-		}
-#endif /* CLIB_UNIX */
-	    }
-	  if (varvalue)
-	    {
-	      /* recursively evaluate */
-	      ts = clib_macro_eval (mm, varvalue, complain);
-	      vec_free (varvalue);
-	      /* add results to answer */
-	      vec_append (rv, ts);
-	      /* Remove NULL termination or the results are sad */
-	      _vec_len (rv) = vec_len (rv) - 1;
-	      vec_free (ts);
-	    }
-	  else
-	    {
-	      if (complain)
-		clib_warning ("Undefined Variable Reference: %s\n", varname);
-	      vec_append (rv, format (0, "UNSET "));
-	      _vec_len (rv) = vec_len (rv) - 1;
-
-	    }
-	  vec_free (varname);
-	}
-    }
-  vec_add1 (rv, 0);
-  return (rv);
-}
-
-/*
- * eval: takes a string, returns a vector.
- * looks up $foobar in the variable table.
- */
-i8 *
-clib_macro_eval_dollar (macro_main_t * mm, i8 * s, i32 complain)
-{
-  i8 *s2;
-  i8 *rv;
-
-  s2 = (i8 *) format (0, "$(%s)%c", s, 0);
-  rv = clib_macro_eval (mm, s2, complain);
-  vec_free (s2);
-  return (rv);
-}
-
-void
-clib_macro_add_builtin (macro_main_t * mm, char *name, void *eval_fn)
-{
-  hash_set_mem (mm->the_builtin_eval_hash, name, (uword) eval_fn);
-}
-
-#ifdef CLIB_UNIX
-static i8 *
-eval_hostname (macro_main_t * mm, i32 complain)
-{
-  char tmp[128];
-  if (gethostname (tmp, sizeof (tmp)))
-    return ((i8 *) format (0, "gethostname-error%c", 0));
-  return ((i8 *) format (0, "%s%c", tmp, 0));
-}
-#endif
-
-void
-clib_macro_init (macro_main_t * mm)
-{
-  if (mm->the_builtin_eval_hash != 0)
-    {
-      clib_warning ("mm %p already initialized", mm);
-      return;
-    }
-
-  mm->the_builtin_eval_hash = hash_create_string (0, sizeof (uword));
-  mm->the_value_table_hash = hash_create_string (0, sizeof (uword));
-
-#ifdef CLIB_UNIX
-  hash_set_mem (mm->the_builtin_eval_hash, "hostname", (uword) eval_hostname);
-#endif
-}
-
-void
-clib_macro_free (macro_main_t * mm)
-{
-  hash_pair_t *p;
-  u8 **strings_to_free = 0;
-  int i;
-
-  hash_free (mm->the_builtin_eval_hash);
-
-  /* *INDENT-OFF* */
-  hash_foreach_pair (p, mm->the_value_table_hash,
-  ({
-    vec_add1 (strings_to_free, (u8 *) (p->key));
-    vec_add1 (strings_to_free, (u8 *) (p->value[0]));
-  }));
-  /* *INDENT-ON* */
-
-  for (i = 0; i < vec_len (strings_to_free); i++)
-    vec_free (strings_to_free[i]);
-  vec_free (strings_to_free);
-  hash_free (mm->the_value_table_hash);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/macros.h b/vppinfra/vppinfra/macros.h
deleted file mode 100644
index 5c2e7033..00000000
--- a/vppinfra/vppinfra/macros.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-  macros.h - definitions for a simple macro expander
-
-  Copyright (c) 2010, 2014 Cisco and/or its affiliates.
-
-  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#ifndef included_macros_h
-#define included_macros_h
-
-#include <vppinfra/vec.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/format.h>
-
-#ifdef CLIB_UNIX
-#include <stdlib.h>
-#include <unistd.h>
-#endif
-
-typedef struct
-{
-  uword *the_builtin_eval_hash;
-  uword *the_value_table_hash;
-} macro_main_t;
-
-int clib_macro_unset (macro_main_t * mm, char *name);
-int clib_macro_set_value (macro_main_t * mm, char *name, char *value);
-void clib_macro_add_builtin (macro_main_t * mm, char *name, void *eval_fn);
-i8 *clib_macro_get_value (macro_main_t * mm, char *name);
-i8 *clib_macro_eval (macro_main_t * mm, i8 * s, i32 complain);
-i8 *clib_macro_eval_dollar (macro_main_t * mm, i8 * s, i32 complain);
-void clib_macro_init (macro_main_t * mm);
-void clib_macro_free (macro_main_t * mm);
-
-#endif /* included_macros_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/math.h b/vppinfra/vppinfra/math.h
deleted file mode 100644
index 48f8c0f4..00000000
--- a/vppinfra/vppinfra/math.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_math_h
-#define included_math_h
-
-#include <vppinfra/clib.h>
-
-always_inline f64
-sqrt (f64 x)
-{
-  return __builtin_sqrt (x);
-}
-
-always_inline f64
-fabs (f64 x)
-{
-  return __builtin_fabs (x);
-}
-
-#endif /* included_math_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/md5.c b/vppinfra/vppinfra/md5.c
deleted file mode 100644
index 9ac1efc7..00000000
--- a/vppinfra/vppinfra/md5.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
- */
-
-#include <vppinfra/string.h>	/* for memset */
-#include <vppinfra/byte_order.h>
-#include <vppinfra/md5.h>
-
-/* F, G, H and I are basic MD5 functions. */
-#define F(b, c, d) (d ^ (b & (c ^ d)))
-#define G(b, c, d) F (d, b, c)
-#define H(b, c, d) (b ^ c ^ d)
-#define I(b, c, d) (c ^ (b | ~d))
-
-/* ROTATE_LEFT rotates x left n bits. */
-#define ROTATE_LEFT(x,n) \
-  (((x) << (n)) | ((x) >> (32 - (n))))
-
-/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
-   Rotation is separate from addition to prevent recomputation. */
-#define FF(a,b,c,d,x,s,ac)			\
-do {						\
-  a += F (b, c, d) + x + ac;			\
-  a = ROTATE_LEFT (a, s);			\
-  a += b;					\
-} while (0)
-
-#define GG(a,b,c,d,x,s,ac)			\
-do {						\
-  a += G (b, c, d) + x + ac;			\
-  a = ROTATE_LEFT (a, s);			\
-  a += b;					\
-} while (0)
-
-#define HH(a,b,c,d,x,s,ac)			\
-do {						\
-  a += H (b, c, d) + x + ac;			\
-  a = ROTATE_LEFT (a, s);			\
-  a += b;					\
-} while (0)
-
-#define II(a,b,c,d,x,s,ac)			\
-do {						\
-  a += I (b, c, d) + x + ac;			\
-  a = ROTATE_LEFT (a, s);			\
-  a += b;					\
-} while (0)
-
-#undef _
-
-/* MD5 basic transformation. Transforms state based on block. */
-static void
-md5_transform (md5_context_t * m, u32 * data, u32 * result, int zero_buffer)
-{
-  u32 a = m->state[0], b = m->state[1], c = m->state[2], d = m->state[3];
-  u32 *x = data;
-
-/* Constants for MD5Transform routine. */
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-
-  /* Round 1 */
-  FF (a, b, c, d, clib_host_to_little_u32 (x[0]), S11, 0xd76aa478);	/* 1 */
-  FF (d, a, b, c, clib_host_to_little_u32 (x[1]), S12, 0xe8c7b756);	/* 2 */
-  FF (c, d, a, b, clib_host_to_little_u32 (x[2]), S13, 0x242070db);	/* 3 */
-  FF (b, c, d, a, clib_host_to_little_u32 (x[3]), S14, 0xc1bdceee);	/* 4 */
-  FF (a, b, c, d, clib_host_to_little_u32 (x[4]), S11, 0xf57c0faf);	/* 5 */
-  FF (d, a, b, c, clib_host_to_little_u32 (x[5]), S12, 0x4787c62a);	/* 6 */
-  FF (c, d, a, b, clib_host_to_little_u32 (x[6]), S13, 0xa8304613);	/* 7 */
-  FF (b, c, d, a, clib_host_to_little_u32 (x[7]), S14, 0xfd469501);	/* 8 */
-  FF (a, b, c, d, clib_host_to_little_u32 (x[8]), S11, 0x698098d8);	/* 9 */
-  FF (d, a, b, c, clib_host_to_little_u32 (x[9]), S12, 0x8b44f7af);	/* 10 */
-  FF (c, d, a, b, clib_host_to_little_u32 (x[10]), S13, 0xffff5bb1);	/* 11 */
-  FF (b, c, d, a, clib_host_to_little_u32 (x[11]), S14, 0x895cd7be);	/* 12 */
-  FF (a, b, c, d, clib_host_to_little_u32 (x[12]), S11, 0x6b901122);	/* 13 */
-  FF (d, a, b, c, clib_host_to_little_u32 (x[13]), S12, 0xfd987193);	/* 14 */
-  FF (c, d, a, b, clib_host_to_little_u32 (x[14]), S13, 0xa679438e);	/* 15 */
-  FF (b, c, d, a, clib_host_to_little_u32 (x[15]), S14, 0x49b40821);	/* 16 */
-
-  /* Round 2 */
-  GG (a, b, c, d, x[1], S21, 0xf61e2562);	/* 17 */
-  GG (d, a, b, c, x[6], S22, 0xc040b340);	/* 18 */
-  GG (c, d, a, b, x[11], S23, 0x265e5a51);	/* 19 */
-  GG (b, c, d, a, x[0], S24, 0xe9b6c7aa);	/* 20 */
-  GG (a, b, c, d, x[5], S21, 0xd62f105d);	/* 21 */
-  GG (d, a, b, c, x[10], S22, 0x02441453);	/* 22 */
-  GG (c, d, a, b, x[15], S23, 0xd8a1e681);	/* 23 */
-  GG (b, c, d, a, x[4], S24, 0xe7d3fbc8);	/* 24 */
-  GG (a, b, c, d, x[9], S21, 0x21e1cde6);	/* 25 */
-  GG (d, a, b, c, x[14], S22, 0xc33707d6);	/* 26 */
-  GG (c, d, a, b, x[3], S23, 0xf4d50d87);	/* 27 */
-  GG (b, c, d, a, x[8], S24, 0x455a14ed);	/* 28 */
-  GG (a, b, c, d, x[13], S21, 0xa9e3e905);	/* 29 */
-  GG (d, a, b, c, x[2], S22, 0xfcefa3f8);	/* 30 */
-  GG (c, d, a, b, x[7], S23, 0x676f02d9);	/* 31 */
-  GG (b, c, d, a, x[12], S24, 0x8d2a4c8a);	/* 32 */
-
-  /* Round 3 */
-  HH (a, b, c, d, x[5], S31, 0xfffa3942);	/* 33 */
-  HH (d, a, b, c, x[8], S32, 0x8771f681);	/* 34 */
-  HH (c, d, a, b, x[11], S33, 0x6d9d6122);	/* 35 */
-  HH (b, c, d, a, x[14], S34, 0xfde5380c);	/* 36 */
-  HH (a, b, c, d, x[1], S31, 0xa4beea44);	/* 37 */
-  HH (d, a, b, c, x[4], S32, 0x4bdecfa9);	/* 38 */
-  HH (c, d, a, b, x[7], S33, 0xf6bb4b60);	/* 39 */
-  HH (b, c, d, a, x[10], S34, 0xbebfbc70);	/* 40 */
-  HH (a, b, c, d, x[13], S31, 0x289b7ec6);	/* 41 */
-  HH (d, a, b, c, x[0], S32, 0xeaa127fa);	/* 42 */
-  HH (c, d, a, b, x[3], S33, 0xd4ef3085);	/* 43 */
-  HH (b, c, d, a, x[6], S34, 0x04881d05);	/* 44 */
-  HH (a, b, c, d, x[9], S31, 0xd9d4d039);	/* 45 */
-  HH (d, a, b, c, x[12], S32, 0xe6db99e5);	/* 46 */
-  HH (c, d, a, b, x[15], S33, 0x1fa27cf8);	/* 47 */
-  HH (b, c, d, a, x[2], S34, 0xc4ac5665);	/* 48 */
-
-  /* Round 4 */
-  II (a, b, c, d, x[0], S41, 0xf4292244);	/* 49 */
-  II (d, a, b, c, x[7], S42, 0x432aff97);	/* 50 */
-  II (c, d, a, b, x[14], S43, 0xab9423a7);	/* 51 */
-  II (b, c, d, a, x[5], S44, 0xfc93a039);	/* 52 */
-  II (a, b, c, d, x[12], S41, 0x655b59c3);	/* 53 */
-  II (d, a, b, c, x[3], S42, 0x8f0ccc92);	/* 54 */
-  II (c, d, a, b, x[10], S43, 0xffeff47d);	/* 55 */
-  II (b, c, d, a, x[1], S44, 0x85845dd1);	/* 56 */
-  II (a, b, c, d, x[8], S41, 0x6fa87e4f);	/* 57 */
-  II (d, a, b, c, x[15], S42, 0xfe2ce6e0);	/* 58 */
-  II (c, d, a, b, x[6], S43, 0xa3014314);	/* 59 */
-  II (b, c, d, a, x[13], S44, 0x4e0811a1);	/* 60 */
-  II (a, b, c, d, x[4], S41, 0xf7537e82);	/* 61 */
-  II (d, a, b, c, x[11], S42, 0xbd3af235);	/* 62 */
-  II (c, d, a, b, x[2], S43, 0x2ad7d2bb);	/* 63 */
-  II (b, c, d, a, x[9], S44, 0xeb86d391);	/* 64 */
-
-  a += m->state[0];
-  b += m->state[1];
-  c += m->state[2];
-  d += m->state[3];
-
-  if (result)
-    {
-      result[0] = clib_host_to_little_u32 (a);
-      result[1] = clib_host_to_little_u32 (b);
-      result[2] = clib_host_to_little_u32 (c);
-      result[3] = clib_host_to_little_u32 (d);
-    }
-  else
-    {
-      m->state[0] = a;
-      m->state[1] = b;
-      m->state[2] = c;
-      m->state[3] = d;
-    }
-
-  /* Zero sensitive information. */
-  if (result)
-    memset (m, ~0, sizeof (m[0]));
-  else if (zero_buffer)
-    memset (m->input_buffer.b8, 0, sizeof (m->input_buffer));
-}
-
-/* MD5 initialization. Begins an MD5 operation, writing a new context. */
-void
-md5_init (md5_context_t * c)
-{
-  memset (c, 0, sizeof (c[0]));
-
-  /* Load magic initialization constants. */
-  c->state[0] = 0x67452301;
-  c->state[1] = 0xefcdab89;
-  c->state[2] = 0x98badcfe;
-  c->state[3] = 0x10325476;
-}
-
-always_inline void __attribute__ ((unused))
-md5_fill_buffer_aligned (md5_context_t * c, u32 * d32)
-{
-  int i;
-  for (i = 0; i < ARRAY_LEN (c->input_buffer.b32); i++)
-    c->input_buffer.b32[i] = d32[i];
-}
-
-/* MD5 block update operation. Continues an MD5 message-digest
-  operation, processing another message block, and updating the
-  context.
- */
-void
-md5_add (md5_context_t * c, void *data, int data_bytes)
-{
-  u32 data_bytes_left;
-  void *d;
-
-  if (data_bytes == 0)
-    return;
-
-  d = data;
-  data_bytes_left = data_bytes;
-
-  if ((pointer_to_uword (d) % sizeof (u32)) == 0
-      && (c->n_bits % BITS (c->input_buffer)) == 0
-      && data_bytes >= sizeof (c->input_buffer))
-    {
-      int is_last_iteration;
-      /* Fast aligned version. */
-      do
-	{
-	  data_bytes_left -= sizeof (c->input_buffer);
-	  is_last_iteration = data_bytes_left < sizeof (c->input_buffer);
-	  md5_transform (c, d, /* result */ 0,	/* zero_buffer */
-			 is_last_iteration);
-	  d += sizeof (c->input_buffer);
-	}
-      while (!is_last_iteration);
-    }
-
-  /* Slow unaligned version. */
-  {
-    int bi;
-    u8 *d8 = d;
-
-    bi = (c->n_bits / BITS (u8)) % ARRAY_LEN (c->input_buffer.b8);
-
-    while (data_bytes_left > 0)
-      {
-	c->input_buffer.b8[bi] = d8[0];
-	data_bytes_left -= 1;
-	d8++;
-	bi++;
-	if (bi == ARRAY_LEN (c->input_buffer.b8))
-	  {
-	    bi = 0;
-	    md5_transform (c, c->input_buffer.b32,
-			   /* result */ 0,
-			   /* zero_buffer */ 1);
-	  }
-      }
-  }
-
-  c->n_bits += data_bytes * BITS (u8);
-}
-
-void
-md5_finish (md5_context_t * c, u8 * digest)
-{
-  u64 n_bits_save;
-  int bi, n_pad;
-  static u8 padding[sizeof (c->input_buffer)] = { 0x80, 0, };
-
-  n_bits_save = c->n_bits;
-  bi = (n_bits_save / BITS (u8)) % ARRAY_LEN (c->input_buffer.b8);
-
-  n_pad = sizeof (c->input_buffer) - (bi + sizeof (u64));
-  if (n_pad <= 0)
-    n_pad += sizeof (c->input_buffer);
-  md5_add (c, padding, n_pad);
-
-  c->input_buffer.b64[ARRAY_LEN (c->input_buffer.b64) - 1]
-    = clib_host_to_little_u64 (n_bits_save);
-
-  md5_transform (c, c->input_buffer.b32, (u32 *) digest,
-		 /* zero_buffer */ 1);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/md5.h b/vppinfra/vppinfra/md5.h
deleted file mode 100644
index 52123886..00000000
--- a/vppinfra/vppinfra/md5.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-  Copyright (c) 2004 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_md5_h
-#define included_md5_h
-
-#include <vppinfra/clib.h>
-
-typedef struct
-{
-  u64 n_bits;
-
-  u32 state[4];
-
-  union
-  {
-    u64 b64[8];
-    u32 b32[16];
-    u8 b8[16 * 4];
-  } input_buffer;
-
-  /* Resulting message digest filled in by md5_finish. */
-} md5_context_t;
-
-void md5_init (md5_context_t * c);
-void md5_add (md5_context_t * c, void *data, int data_bytes);
-void md5_finish (md5_context_t * c, u8 digest[16]);
-
-#endif /* included_md5_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/mem.h b/vppinfra/vppinfra/mem.h
deleted file mode 100644
index 1260eab2..00000000
--- a/vppinfra/vppinfra/mem.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef _included_clib_mem_h
-#define _included_clib_mem_h
-
-#include <stdarg.h>
-
-#include <vppinfra/clib.h>	/* uword, etc */
-#include <vppinfra/mheap_bootstrap.h>
-#include <vppinfra/os.h>
-#include <vppinfra/string.h>	/* memcpy, memset */
-#include <vppinfra/valgrind.h>
-
-#define CLIB_MAX_MHEAPS 256
-
-/* Per CPU heaps. */
-extern void *clib_per_cpu_mheaps[CLIB_MAX_MHEAPS];
-
-always_inline void *
-clib_mem_get_per_cpu_heap (void)
-{
-  int cpu = os_get_cpu_number ();
-  return clib_per_cpu_mheaps[cpu];
-}
-
-always_inline void *
-clib_mem_set_per_cpu_heap (u8 * new_heap)
-{
-  int cpu = os_get_cpu_number ();
-  void *old = clib_per_cpu_mheaps[cpu];
-  clib_per_cpu_mheaps[cpu] = new_heap;
-  return old;
-}
-
-/* Memory allocator which may call os_out_of_memory() if it fails */
-always_inline void *
-clib_mem_alloc_aligned_at_offset (uword size, uword align, uword align_offset,
-				  int os_out_of_memory_on_failure)
-{
-  void *heap, *p;
-  uword offset, cpu;
-
-  if (align_offset > align)
-    {
-      if (align > 0)
-	align_offset %= align;
-      else
-	align_offset = align;
-    }
-
-  cpu = os_get_cpu_number ();
-  heap = clib_per_cpu_mheaps[cpu];
-  heap = mheap_get_aligned (heap, size, align, align_offset, &offset);
-  clib_per_cpu_mheaps[cpu] = heap;
-
-  if (offset != ~0)
-    {
-      p = heap + offset;
-#if CLIB_DEBUG > 0
-      VALGRIND_MALLOCLIKE_BLOCK (p, mheap_data_bytes (heap, offset), 0, 0);
-#endif
-      return p;
-    }
-  else
-    {
-      if (os_out_of_memory_on_failure)
-	os_out_of_memory ();
-      return 0;
-    }
-}
-
-/* Memory allocator which calls os_out_of_memory() when it fails */
-always_inline void *
-clib_mem_alloc (uword size)
-{
-  return clib_mem_alloc_aligned_at_offset (size, /* align */ 1,
-					   /* align_offset */ 0,
-					   /* os_out_of_memory */ 1);
-}
-
-always_inline void *
-clib_mem_alloc_aligned (uword size, uword align)
-{
-  return clib_mem_alloc_aligned_at_offset (size, align, /* align_offset */ 0,
-					   /* os_out_of_memory */ 1);
-}
-
-/* Memory allocator which calls os_out_of_memory() when it fails */
-always_inline void *
-clib_mem_alloc_or_null (uword size)
-{
-  return clib_mem_alloc_aligned_at_offset (size, /* align */ 1,
-					   /* align_offset */ 0,
-					   /* os_out_of_memory */ 0);
-}
-
-always_inline void *
-clib_mem_alloc_aligned_or_null (uword size, uword align)
-{
-  return clib_mem_alloc_aligned_at_offset (size, align, /* align_offset */ 0,
-					   /* os_out_of_memory */ 0);
-}
-
-
-
-/* Memory allocator which panics when it fails.
-   Use macro so that clib_panic macro can expand __FUNCTION__ and __LINE__. */
-#define clib_mem_alloc_aligned_no_fail(size,align)				\
-({										\
-  uword _clib_mem_alloc_size = (size);						\
-  void * _clib_mem_alloc_p;							\
-  _clib_mem_alloc_p = clib_mem_alloc_aligned (_clib_mem_alloc_size, (align));	\
-  if (! _clib_mem_alloc_p)							\
-    clib_panic ("failed to allocate %d bytes", _clib_mem_alloc_size);		\
-  _clib_mem_alloc_p;								\
-})
-
-#define clib_mem_alloc_no_fail(size) clib_mem_alloc_aligned_no_fail(size,1)
-
-/* Alias to stack allocator for naming consistency. */
-#define clib_mem_alloc_stack(bytes) __builtin_alloca(bytes)
-
-always_inline uword
-clib_mem_is_heap_object (void *p)
-{
-  void *heap = clib_mem_get_per_cpu_heap ();
-  uword offset = (uword) p - (uword) heap;
-  mheap_elt_t *e, *n;
-
-  if (offset >= vec_len (heap))
-    return 0;
-
-  e = mheap_elt_at_uoffset (heap, offset);
-  n = mheap_next_elt (e);
-
-  /* Check that heap forward and reverse pointers agree. */
-  return e->n_user_data == n->prev_n_user_data;
-}
-
-always_inline void
-clib_mem_free (void *p)
-{
-  u8 *heap = clib_mem_get_per_cpu_heap ();
-
-  /* Make sure object is in the correct heap. */
-  ASSERT (clib_mem_is_heap_object (p));
-
-  mheap_put (heap, (u8 *) p - heap);
-
-#if CLIB_DEBUG > 0
-  VALGRIND_FREELIKE_BLOCK (p, 0);
-#endif
-}
-
-always_inline void *
-clib_mem_realloc (void *p, uword new_size, uword old_size)
-{
-  /* By default use alloc, copy and free to emulate realloc. */
-  void *q = clib_mem_alloc (new_size);
-  if (q)
-    {
-      uword copy_size;
-      if (old_size < new_size)
-	copy_size = old_size;
-      else
-	copy_size = new_size;
-      clib_memcpy (q, p, copy_size);
-      clib_mem_free (p);
-    }
-  return q;
-}
-
-always_inline uword
-clib_mem_size (void *p)
-{
-  ASSERT (clib_mem_is_heap_object (p));
-  mheap_elt_t *e = mheap_user_pointer_to_elt (p);
-  return mheap_elt_data_bytes (e);
-}
-
-always_inline void *
-clib_mem_get_heap (void)
-{
-  return clib_mem_get_per_cpu_heap ();
-}
-
-always_inline void *
-clib_mem_set_heap (void *heap)
-{
-  return clib_mem_set_per_cpu_heap (heap);
-}
-
-void *clib_mem_init (void *heap, uword size);
-
-void clib_mem_exit (void);
-
-uword clib_mem_get_page_size (void);
-
-void clib_mem_validate (void);
-
-void clib_mem_trace (int enable);
-
-typedef struct
-{
-  /* Total number of objects allocated. */
-  uword object_count;
-
-  /* Total allocated bytes.  Bytes used and free.
-     used + free = total */
-  uword bytes_total, bytes_used, bytes_free;
-
-  /* Number of bytes used by mheap data structure overhead
-     (e.g. free lists, mheap header). */
-  uword bytes_overhead;
-
-  /* Amount of free space returned to operating system. */
-  uword bytes_free_reclaimed;
-
-  /* For malloc which puts small objects in sbrk region and
-     large objects in mmap'ed regions. */
-  uword bytes_used_sbrk;
-  uword bytes_used_mmap;
-
-  /* Max. number of bytes in this heap. */
-  uword bytes_max;
-} clib_mem_usage_t;
-
-void clib_mem_usage (clib_mem_usage_t * usage);
-
-u8 *format_clib_mem_usage (u8 * s, va_list * args);
-
-/* Include appropriate VM functions depending on whether
-   we are compiling for linux kernel, for Unix or standalone. */
-#ifdef CLIB_LINUX_KERNEL
-#include <vppinfra/vm_linux_kernel.h>
-#endif
-
-#ifdef CLIB_UNIX
-#include <vppinfra/vm_unix.h>
-#endif
-
-#ifdef CLIB_STANDALONE
-#include <vppinfra/vm_standalone.h>
-#endif
-
-#include <vppinfra/error.h>	/* clib_panic */
-
-#endif /* _included_clib_mem_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/mem_mheap.c b/vppinfra/vppinfra/mem_mheap.c
deleted file mode 100644
index 9b2af520..00000000
--- a/vppinfra/vppinfra/mem_mheap.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/format.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/os.h>
-
-/* Valgrind stuff. */
-#include <vppinfra/memcheck.h>
-#include <vppinfra/valgrind.h>
-
-void *clib_per_cpu_mheaps[CLIB_MAX_MHEAPS];
-
-void
-clib_mem_exit (void)
-{
-  u8 *heap = clib_mem_get_per_cpu_heap ();
-  if (heap)
-    mheap_free (heap);
-  clib_mem_set_per_cpu_heap (0);
-}
-
-/* Initialize CLIB heap based on memory/size given by user.
-   Set memory to 0 and CLIB will try to allocate its own heap. */
-void *
-clib_mem_init (void *memory, uword memory_size)
-{
-  u8 *heap;
-
-  if (memory || memory_size)
-    heap = mheap_alloc (memory, memory_size);
-  else
-    {
-      /* Allocate lots of address space since this will limit
-         the amount of memory the program can allocate.
-         In the kernel we're more conservative since some architectures
-         (e.g. mips) have pretty small kernel virtual address spaces. */
-#ifdef __KERNEL__
-#define MAX_VM_MEG 64
-#else
-#define MAX_VM_MEG 1024
-#endif
-
-      uword alloc_size = MAX_VM_MEG << 20;
-      uword tries = 16;
-
-      while (1)
-	{
-	  heap = mheap_alloc (0, alloc_size);
-	  if (heap)
-	    break;
-	  alloc_size = (alloc_size * 3) / 4;
-	  tries--;
-	  if (tries == 0)
-	    break;
-	}
-    }
-
-  clib_mem_set_heap (heap);
-
-  return heap;
-}
-
-#ifdef CLIB_LINUX_KERNEL
-#include <asm/page.h>
-
-uword
-clib_mem_get_page_size (void)
-{
-  return PAGE_SIZE;
-}
-#endif
-
-#ifdef CLIB_UNIX
-uword
-clib_mem_get_page_size (void)
-{
-  return getpagesize ();
-}
-#endif
-
-/* Make a guess for standalone. */
-#ifdef CLIB_STANDALONE
-uword
-clib_mem_get_page_size (void)
-{
-  return 4096;
-}
-#endif
-
-u8 *
-format_clib_mem_usage (u8 * s, va_list * va)
-{
-  int verbose = va_arg (*va, int);
-  return format (s, "%U", format_mheap, clib_mem_get_heap (), verbose);
-}
-
-void
-clib_mem_usage (clib_mem_usage_t * u)
-{
-  mheap_usage (clib_mem_get_heap (), u);
-}
-
-/* Call serial number for debugger breakpoints. */
-uword clib_mem_validate_serial = 0;
-
-void
-clib_mem_validate (void)
-{
-  if (MHEAP_HAVE_SMALL_OBJECT_CACHE)
-    clib_warning ("clib_mem_validate disabled (small object cache is ON)");
-  else
-    {
-      mheap_validate (clib_mem_get_heap ());
-      clib_mem_validate_serial++;
-    }
-}
-
-void
-clib_mem_trace (int enable)
-{
-  mheap_trace (clib_mem_get_heap (), enable);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/memcheck.h b/vppinfra/vppinfra/memcheck.h
deleted file mode 100644
index 44db3a8a..00000000
--- a/vppinfra/vppinfra/memcheck.h
+++ /dev/null
@@ -1,317 +0,0 @@
-
-/*
-   ----------------------------------------------------------------
-
-   Notice that the following BSD-style license applies to this one
-   file (memcheck.h) only.  The rest of Valgrind is licensed under the
-   terms of the GNU General Public License, version 2, unless
-   otherwise indicated.  See the COPYING file in the source
-   distribution for details.
-
-   ----------------------------------------------------------------
-
-   This file is part of MemCheck, a heavyweight Valgrind tool for
-   detecting memory errors.
-
-   Copyright (C) 2000-2009 Julian Seward.  All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. The origin of this software must not be misrepresented; you must
-      not claim that you wrote the original software.  If you use this
-      software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   3. Altered source versions must be plainly marked as such, and must
-      not be misrepresented as being the original software.
-
-   4. The name of the author may not be used to endorse or promote
-      products derived from this software without specific prior written
-      permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   ----------------------------------------------------------------
-
-   Notice that the above BSD-style license applies to this one file
-   (memcheck.h) only.  The entire rest of Valgrind is licensed under
-   the terms of the GNU General Public License, version 2.  See the
-   COPYING file in the source distribution for details.
-
-   ----------------------------------------------------------------
-*/
-
-
-#ifndef __MEMCHECK_H
-#define __MEMCHECK_H
-
-
-/* This file is for inclusion into client (your!) code.
-
-   You can use these macros to manipulate and query memory permissions
-   inside your own programs.
-
-   See comment near the top of valgrind.h on how to use them.
-*/
-
-#include "valgrind.h"
-
-/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !!
-   This enum comprises an ABI exported by Valgrind to programs
-   which use client requests.  DO NOT CHANGE THE ORDER OF THESE
-   ENTRIES, NOR DELETE ANY -- add new ones at the end. */
-typedef enum
-{
-  VG_USERREQ__MAKE_MEM_NOACCESS = VG_USERREQ_TOOL_BASE ('M', 'C'),
-  VG_USERREQ__MAKE_MEM_UNDEFINED,
-  VG_USERREQ__MAKE_MEM_DEFINED,
-  VG_USERREQ__DISCARD,
-  VG_USERREQ__CHECK_MEM_IS_ADDRESSABLE,
-  VG_USERREQ__CHECK_MEM_IS_DEFINED,
-  VG_USERREQ__DO_LEAK_CHECK,
-  VG_USERREQ__COUNT_LEAKS,
-
-  VG_USERREQ__GET_VBITS,
-  VG_USERREQ__SET_VBITS,
-
-  VG_USERREQ__CREATE_BLOCK,
-
-  VG_USERREQ__MAKE_MEM_DEFINED_IF_ADDRESSABLE,
-
-  /* Not next to VG_USERREQ__COUNT_LEAKS because it was added later. */
-  VG_USERREQ__COUNT_LEAK_BLOCKS,
-
-  /* This is just for memcheck's internal use - don't use it */
-  _VG_USERREQ__MEMCHECK_RECORD_OVERLAP_ERROR
-    = VG_USERREQ_TOOL_BASE ('M', 'C') + 256
-} Vg_MemCheckClientRequest;
-
-
-
-/* Client-code macros to manipulate the state of memory. */
-
-/* Mark memory at _qzz_addr as unaddressable for _qzz_len bytes. */
-#define VALGRIND_MAKE_MEM_NOACCESS(_qzz_addr,_qzz_len)           \
-   (__extension__({unsigned long _qzz_res;                       \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
-                            VG_USERREQ__MAKE_MEM_NOACCESS,       \
-                            _qzz_addr, _qzz_len, 0, 0, 0);       \
-    _qzz_res;                                                    \
-   }))
-
-/* Similarly, mark memory at _qzz_addr as addressable but undefined
-   for _qzz_len bytes. */
-#define VALGRIND_MAKE_MEM_UNDEFINED(_qzz_addr,_qzz_len)          \
-   (__extension__({unsigned long _qzz_res;                       \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
-                            VG_USERREQ__MAKE_MEM_UNDEFINED,      \
-                            _qzz_addr, _qzz_len, 0, 0, 0);       \
-    _qzz_res;                                                    \
-   }))
-
-/* Similarly, mark memory at _qzz_addr as addressable and defined
-   for _qzz_len bytes. */
-#define VALGRIND_MAKE_MEM_DEFINED(_qzz_addr,_qzz_len)            \
-   (__extension__({unsigned long _qzz_res;                       \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
-                            VG_USERREQ__MAKE_MEM_DEFINED,        \
-                            _qzz_addr, _qzz_len, 0, 0, 0);       \
-    _qzz_res;                                                    \
-   }))
-
-/* Similar to VALGRIND_MAKE_MEM_DEFINED except that addressability is
-   not altered: bytes which are addressable are marked as defined,
-   but those which are not addressable are left unchanged. */
-#define VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(_qzz_addr,_qzz_len) \
-   (__extension__({unsigned long _qzz_res;                       \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
-                            VG_USERREQ__MAKE_MEM_DEFINED_IF_ADDRESSABLE, \
-                            _qzz_addr, _qzz_len, 0, 0, 0);       \
-    _qzz_res;                                                    \
-   }))
-
-/* Create a block-description handle.  The description is an ascii
-   string which is included in any messages pertaining to addresses
-   within the specified memory range.  Has no other effect on the
-   properties of the memory range. */
-#define VALGRIND_CREATE_BLOCK(_qzz_addr,_qzz_len, _qzz_desc)	 \
-	(__extension__({unsigned long _qzz_res;			 \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
-                            VG_USERREQ__CREATE_BLOCK,            \
-                            _qzz_addr, _qzz_len, _qzz_desc,      \
-                            0, 0);                               \
-    _qzz_res;							 \
-   }))
-
-/* Discard a block-description-handle. Returns 1 for an
-   invalid handle, 0 for a valid handle. */
-#define VALGRIND_DISCARD(_qzz_blkindex)                          \
-   (__extension__ ({unsigned long _qzz_res;                      \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
-                            VG_USERREQ__DISCARD,                 \
-                            0, _qzz_blkindex, 0, 0, 0);          \
-    _qzz_res;                                                    \
-   }))
-
-
-/* Client-code macros to check the state of memory. */
-
-/* Check that memory at _qzz_addr is addressable for _qzz_len bytes.
-   If suitable addressibility is not established, Valgrind prints an
-   error message and returns the address of the first offending byte.
-   Otherwise it returns zero. */
-#define VALGRIND_CHECK_MEM_IS_ADDRESSABLE(_qzz_addr,_qzz_len)    \
-   (__extension__({unsigned long _qzz_res;                       \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
-                            VG_USERREQ__CHECK_MEM_IS_ADDRESSABLE,\
-                            _qzz_addr, _qzz_len, 0, 0, 0);       \
-    _qzz_res;                                                    \
-   }))
-
-/* Check that memory at _qzz_addr is addressable and defined for
-   _qzz_len bytes.  If suitable addressibility and definedness are not
-   established, Valgrind prints an error message and returns the
-   address of the first offending byte.  Otherwise it returns zero. */
-#define VALGRIND_CHECK_MEM_IS_DEFINED(_qzz_addr,_qzz_len)        \
-   (__extension__({unsigned long _qzz_res;                       \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
-                            VG_USERREQ__CHECK_MEM_IS_DEFINED,    \
-                            _qzz_addr, _qzz_len, 0, 0, 0);       \
-    _qzz_res;                                                    \
-   }))
-
-/* Use this macro to force the definedness and addressibility of an
-   lvalue to be checked.  If suitable addressibility and definedness
-   are not established, Valgrind prints an error message and returns
-   the address of the first offending byte.  Otherwise it returns
-   zero. */
-#define VALGRIND_CHECK_VALUE_IS_DEFINED(__lvalue)                \
-   VALGRIND_CHECK_MEM_IS_DEFINED(                                \
-      (volatile unsigned char *)&(__lvalue),                     \
-                      (unsigned long)(sizeof (__lvalue)))
-
-
-/* Do a full memory leak check (like --leak-check=full) mid-execution. */
-#define VALGRIND_DO_LEAK_CHECK                                   \
-   {unsigned long _qzz_res;                                      \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
-                            VG_USERREQ__DO_LEAK_CHECK,           \
-                            0, 0, 0, 0, 0);                      \
-   }
-
-/* Do a summary memory leak check (like --leak-check=summary) mid-execution. */
-#define VALGRIND_DO_QUICK_LEAK_CHECK				 \
-   {unsigned long _qzz_res;                                      \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
-                            VG_USERREQ__DO_LEAK_CHECK,           \
-                            1, 0, 0, 0, 0);                      \
-   }
-
-/* Return number of leaked, dubious, reachable and suppressed bytes found by
-   all previous leak checks.  They must be lvalues.  */
-#define VALGRIND_COUNT_LEAKS(leaked, dubious, reachable, suppressed)     \
-   /* For safety on 64-bit platforms we assign the results to private
-      unsigned long variables, then assign these to the lvalues the user
-      specified, which works no matter what type 'leaked', 'dubious', etc
-      are.  We also initialise '_qzz_leaked', etc because
-      VG_USERREQ__COUNT_LEAKS doesn't mark the values returned as
-      defined. */                                                        \
-   {unsigned long _qzz_res;                                              \
-    unsigned long _qzz_leaked    = 0, _qzz_dubious    = 0;               \
-    unsigned long _qzz_reachable = 0, _qzz_suppressed = 0;               \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                              \
-                               VG_USERREQ__COUNT_LEAKS,                  \
-                               &_qzz_leaked, &_qzz_dubious,              \
-                               &_qzz_reachable, &_qzz_suppressed, 0);    \
-    leaked     = _qzz_leaked;                                            \
-    dubious    = _qzz_dubious;                                           \
-    reachable  = _qzz_reachable;                                         \
-    suppressed = _qzz_suppressed;                                        \
-   }
-
-/* Return number of leaked, dubious, reachable and suppressed bytes found by
-   all previous leak checks.  They must be lvalues.  */
-#define VALGRIND_COUNT_LEAK_BLOCKS(leaked, dubious, reachable, suppressed) \
-   /* For safety on 64-bit platforms we assign the results to private
-      unsigned long variables, then assign these to the lvalues the user
-      specified, which works no matter what type 'leaked', 'dubious', etc
-      are.  We also initialise '_qzz_leaked', etc because
-      VG_USERREQ__COUNT_LEAKS doesn't mark the values returned as
-      defined. */                                                        \
-   {unsigned long _qzz_res;                                              \
-    unsigned long _qzz_leaked    = 0, _qzz_dubious    = 0;               \
-    unsigned long _qzz_reachable = 0, _qzz_suppressed = 0;               \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                              \
-                               VG_USERREQ__COUNT_LEAK_BLOCKS,            \
-                               &_qzz_leaked, &_qzz_dubious,              \
-                               &_qzz_reachable, &_qzz_suppressed, 0);    \
-    leaked     = _qzz_leaked;                                            \
-    dubious    = _qzz_dubious;                                           \
-    reachable  = _qzz_reachable;                                         \
-    suppressed = _qzz_suppressed;                                        \
-   }
-
-
-/* Get the validity data for addresses [zza..zza+zznbytes-1] and copy it
-   into the provided zzvbits array.  Return values:
-      0   if not running on valgrind
-      1   success
-      2   [previously indicated unaligned arrays;  these are now allowed]
-      3   if any parts of zzsrc/zzvbits are not addressable.
-   The metadata is not copied in cases 0, 2 or 3 so it should be
-   impossible to segfault your system by using this call.
-*/
-#define VALGRIND_GET_VBITS(zza,zzvbits,zznbytes)                 \
-   (__extension__({unsigned long _qzz_res;                       \
-    char* czza     = (char*)zza;                                 \
-    char* czzvbits = (char*)zzvbits;                             \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
-                            VG_USERREQ__GET_VBITS,               \
-                            czza, czzvbits, zznbytes, 0, 0 );    \
-    _qzz_res;                                                    \
-   }))
-
-/* Set the validity data for addresses [zza..zza+zznbytes-1], copying it
-   from the provided zzvbits array.  Return values:
-      0   if not running on valgrind
-      1   success
-      2   [previously indicated unaligned arrays;  these are now allowed]
-      3   if any parts of zza/zzvbits are not addressable.
-   The metadata is not copied in cases 0, 2 or 3 so it should be
-   impossible to segfault your system by using this call.
-*/
-#define VALGRIND_SET_VBITS(zza,zzvbits,zznbytes)                 \
-   (__extension__({unsigned int _qzz_res;                        \
-    char* czza     = (char*)zza;                                 \
-    char* czzvbits = (char*)zzvbits;                             \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
-                            VG_USERREQ__SET_VBITS,               \
-                            czza, czzvbits, zznbytes, 0, 0 );    \
-    _qzz_res;                                                    \
-   }))
-
-#endif
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/memcpy_avx.h b/vppinfra/vppinfra/memcpy_avx.h
deleted file mode 100644
index e3feb76b..00000000
--- a/vppinfra/vppinfra/memcpy_avx.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef included_clib_memcpy_avx_h
-#define included_clib_memcpy_avx_h
-
-#include <stdint.h>
-#include <x86intrin.h>
-
-typedef u8 u8x16u __attribute__ ((vector_size (16), aligned (1)));
-typedef u8 u8x32u __attribute__ ((vector_size (32), aligned (1)));
-
-static inline void
-clib_mov16 (u8 * dst, const u8 * src)
-{
-  *(u8x16u *) dst = *(u8x16u *) src;
-}
-
-static inline void
-clib_mov32 (u8 * dst, const u8 * src)
-{
-  *(u8x32u *) dst = *(u8x32u *) src;
-}
-
-static inline void
-clib_mov64 (u8 * dst, const u8 * src)
-{
-  clib_mov32 ((u8 *) dst + 0 * 32, (const u8 *) src + 0 * 32);
-  clib_mov32 ((u8 *) dst + 1 * 32, (const u8 *) src + 1 * 32);
-}
-
-static inline void
-clib_mov128 (u8 * dst, const u8 * src)
-{
-  clib_mov64 ((u8 *) dst + 0 * 64, (const u8 *) src + 0 * 64);
-  clib_mov64 ((u8 *) dst + 1 * 64, (const u8 *) src + 1 * 64);
-}
-
-static inline void
-clib_mov256 (u8 * dst, const u8 * src)
-{
-  clib_mov128 ((u8 *) dst + 0 * 128, (const u8 *) src + 0 * 128);
-  clib_mov128 ((u8 *) dst + 1 * 128, (const u8 *) src + 1 * 128);
-}
-
-static inline void
-clib_mov64blocks (u8 * dst, const u8 * src, size_t n)
-{
-  __m256i ymm0, ymm1;
-
-  while (n >= 64)
-    {
-      ymm0 =
-	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 0 * 32));
-      n -= 64;
-      ymm1 =
-	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 1 * 32));
-      src = (const u8 *) src + 64;
-      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 0 * 32), ymm0);
-      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 1 * 32), ymm1);
-      dst = (u8 *) dst + 64;
-    }
-}
-
-static inline void
-clib_mov256blocks (u8 * dst, const u8 * src, size_t n)
-{
-  __m256i ymm0, ymm1, ymm2, ymm3, ymm4, ymm5, ymm6, ymm7;
-
-  while (n >= 256)
-    {
-      ymm0 =
-	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 0 * 32));
-      n -= 256;
-      ymm1 =
-	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 1 * 32));
-      ymm2 =
-	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 2 * 32));
-      ymm3 =
-	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 3 * 32));
-      ymm4 =
-	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 4 * 32));
-      ymm5 =
-	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 5 * 32));
-      ymm6 =
-	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 6 * 32));
-      ymm7 =
-	_mm256_loadu_si256 ((const __m256i *) ((const u8 *) src + 7 * 32));
-      src = (const u8 *) src + 256;
-      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 0 * 32), ymm0);
-      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 1 * 32), ymm1);
-      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 2 * 32), ymm2);
-      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 3 * 32), ymm3);
-      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 4 * 32), ymm4);
-      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 5 * 32), ymm5);
-      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 6 * 32), ymm6);
-      _mm256_storeu_si256 ((__m256i *) ((u8 *) dst + 7 * 32), ymm7);
-      dst = (u8 *) dst + 256;
-    }
-}
-
-static inline void *
-clib_memcpy (void *dst, const void *src, size_t n)
-{
-  uword dstu = (uword) dst;
-  uword srcu = (uword) src;
-  void *ret = dst;
-  size_t dstofss;
-  size_t bits;
-
-	/**
-         * Copy less than 16 bytes
-         */
-  if (n < 16)
-    {
-      if (n & 0x01)
-	{
-	  *(u8 *) dstu = *(const u8 *) srcu;
-	  srcu = (uword) ((const u8 *) srcu + 1);
-	  dstu = (uword) ((u8 *) dstu + 1);
-	}
-      if (n & 0x02)
-	{
-	  *(uint16_t *) dstu = *(const uint16_t *) srcu;
-	  srcu = (uword) ((const uint16_t *) srcu + 1);
-	  dstu = (uword) ((uint16_t *) dstu + 1);
-	}
-      if (n & 0x04)
-	{
-	  *(uint32_t *) dstu = *(const uint32_t *) srcu;
-	  srcu = (uword) ((const uint32_t *) srcu + 1);
-	  dstu = (uword) ((uint32_t *) dstu + 1);
-	}
-      if (n & 0x08)
-	{
-	  *(uint64_t *) dstu = *(const uint64_t *) srcu;
-	}
-      return ret;
-    }
-
-	/**
-         * Fast way when copy size doesn't exceed 512 bytes
-         */
-  if (n <= 32)
-    {
-      clib_mov16 ((u8 *) dst, (const u8 *) src);
-      clib_mov16 ((u8 *) dst - 16 + n, (const u8 *) src - 16 + n);
-      return ret;
-    }
-  if (n <= 64)
-    {
-      clib_mov32 ((u8 *) dst, (const u8 *) src);
-      clib_mov32 ((u8 *) dst - 32 + n, (const u8 *) src - 32 + n);
-      return ret;
-    }
-  if (n <= 512)
-    {
-      if (n >= 256)
-	{
-	  n -= 256;
-	  clib_mov256 ((u8 *) dst, (const u8 *) src);
-	  src = (const u8 *) src + 256;
-	  dst = (u8 *) dst + 256;
-	}
-      if (n >= 128)
-	{
-	  n -= 128;
-	  clib_mov128 ((u8 *) dst, (const u8 *) src);
-	  src = (const u8 *) src + 128;
-	  dst = (u8 *) dst + 128;
-	}
-      if (n >= 64)
-	{
-	  n -= 64;
-	  clib_mov64 ((u8 *) dst, (const u8 *) src);
-	  src = (const u8 *) src + 64;
-	  dst = (u8 *) dst + 64;
-	}
-    COPY_BLOCK_64_BACK31:
-      if (n > 32)
-	{
-	  clib_mov32 ((u8 *) dst, (const u8 *) src);
-	  clib_mov32 ((u8 *) dst - 32 + n, (const u8 *) src - 32 + n);
-	  return ret;
-	}
-      if (n > 0)
-	{
-	  clib_mov32 ((u8 *) dst - 32 + n, (const u8 *) src - 32 + n);
-	}
-      return ret;
-    }
-
-	/**
-         * Make store aligned when copy size exceeds 512 bytes
-         */
-  dstofss = (uword) dst & 0x1F;
-  if (dstofss > 0)
-    {
-      dstofss = 32 - dstofss;
-      n -= dstofss;
-      clib_mov32 ((u8 *) dst, (const u8 *) src);
-      src = (const u8 *) src + dstofss;
-      dst = (u8 *) dst + dstofss;
-    }
-
-	/**
-         * Copy 256-byte blocks.
-         * Use copy block function for better instruction order control,
-         * which is important when load is unaligned.
-         */
-  clib_mov256blocks ((u8 *) dst, (const u8 *) src, n);
-  bits = n;
-  n = n & 255;
-  bits -= n;
-  src = (const u8 *) src + bits;
-  dst = (u8 *) dst + bits;
-
-	/**
-         * Copy 64-byte blocks.
-         * Use copy block function for better instruction order control,
-         * which is important when load is unaligned.
-         */
-  if (n >= 64)
-    {
-      clib_mov64blocks ((u8 *) dst, (const u8 *) src, n);
-      bits = n;
-      n = n & 63;
-      bits -= n;
-      src = (const u8 *) src + bits;
-      dst = (u8 *) dst + bits;
-    }
-
-	/**
-         * Copy whatever left
-         */
-  goto COPY_BLOCK_64_BACK31;
-}
-
-
-#endif /* included_clib_mamcpy_avx_h */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/memcpy_sse3.h b/vppinfra/vppinfra/memcpy_sse3.h
deleted file mode 100644
index 4fc48c86..00000000
--- a/vppinfra/vppinfra/memcpy_sse3.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef included_clib_memcpy_sse3_h
-#define included_clib_memcpy_sse3_h
-
-#include <stdint.h>
-#include <x86intrin.h>
-
-typedef u8 u8x16u __attribute__ ((vector_size (16), aligned (1)));
-typedef u8 u8x32u __attribute__ ((vector_size (32), aligned (1)));
-
-static inline void
-clib_mov16 (u8 * dst, const u8 * src)
-{
-  *(u8x16u *) dst = *(u8x16u *) src;
-}
-
-static inline void
-clib_mov32 (u8 * dst, const u8 * src)
-{
-  *(u8x32u *) dst = *(u8x32u *) src;
-}
-
-static inline void
-clib_mov64 (u8 * dst, const u8 * src)
-{
-  clib_mov32 ((u8 *) dst + 0 * 32, (const u8 *) src + 0 * 32);
-  clib_mov32 ((u8 *) dst + 1 * 32, (const u8 *) src + 1 * 32);
-}
-
-static inline void
-clib_mov128 (u8 * dst, const u8 * src)
-{
-  clib_mov64 ((u8 *) dst + 0 * 64, (const u8 *) src + 0 * 64);
-  clib_mov64 ((u8 *) dst + 1 * 64, (const u8 *) src + 1 * 64);
-}
-
-static inline void
-clib_mov256 (u8 * dst, const u8 * src)
-{
-  clib_mov128 ((u8 *) dst + 0 * 128, (const u8 *) src + 0 * 128);
-  clib_mov128 ((u8 *) dst + 1 * 128, (const u8 *) src + 1 * 128);
-}
-
-/**
- * Macro for copying unaligned block from one location to another with constant load offset,
- * 47 bytes leftover maximum,
- * locations should not overlap.
- * Requirements:
- * - Store is aligned
- * - Load offset is <offset>, which must be immediate value within [1, 15]
- * - For <src>, make sure <offset> bit backwards & <16 - offset> bit forwards are available for loading
- * - <dst>, <src>, <len> must be variables
- * - __m128i <xmm0> ~ <xmm8> must be pre-defined
- */
-#define CLIB_MVUNALIGN_LEFT47_IMM(dst, src, len, offset)                                                    \
-({                                                                                                          \
-    int tmp;                                                                                                \
-    while (len >= 128 + 16 - offset) {                                                                      \
-        xmm0 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 0 * 16));                       \
-        len -= 128;                                                                                         \
-        xmm1 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 1 * 16));                       \
-        xmm2 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 2 * 16));                       \
-        xmm3 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 3 * 16));                       \
-        xmm4 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 4 * 16));                       \
-        xmm5 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 5 * 16));                       \
-        xmm6 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 6 * 16));                       \
-        xmm7 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 7 * 16));                       \
-        xmm8 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 8 * 16));                       \
-        src = (const u8 *)src + 128;                                                                        \
-        _mm_storeu_si128((__m128i *)((u8 *)dst + 0 * 16), _mm_alignr_epi8(xmm1, xmm0, offset));             \
-        _mm_storeu_si128((__m128i *)((u8 *)dst + 1 * 16), _mm_alignr_epi8(xmm2, xmm1, offset));             \
-        _mm_storeu_si128((__m128i *)((u8 *)dst + 2 * 16), _mm_alignr_epi8(xmm3, xmm2, offset));             \
-        _mm_storeu_si128((__m128i *)((u8 *)dst + 3 * 16), _mm_alignr_epi8(xmm4, xmm3, offset));             \
-        _mm_storeu_si128((__m128i *)((u8 *)dst + 4 * 16), _mm_alignr_epi8(xmm5, xmm4, offset));             \
-        _mm_storeu_si128((__m128i *)((u8 *)dst + 5 * 16), _mm_alignr_epi8(xmm6, xmm5, offset));             \
-        _mm_storeu_si128((__m128i *)((u8 *)dst + 6 * 16), _mm_alignr_epi8(xmm7, xmm6, offset));             \
-        _mm_storeu_si128((__m128i *)((u8 *)dst + 7 * 16), _mm_alignr_epi8(xmm8, xmm7, offset));             \
-        dst = (u8 *)dst + 128;                                                                              \
-    }                                                                                                       \
-    tmp = len;                                                                                              \
-    len = ((len - 16 + offset) & 127) + 16 - offset;                                                        \
-    tmp -= len;                                                                                             \
-    src = (const u8 *)src + tmp;                                                                            \
-    dst = (u8 *)dst + tmp;                                                                                  \
-    if (len >= 32 + 16 - offset) {                                                                          \
-        while (len >= 32 + 16 - offset) {                                                                   \
-            xmm0 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 0 * 16));                   \
-            len -= 32;                                                                                      \
-            xmm1 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 1 * 16));                   \
-            xmm2 = _mm_loadu_si128((const __m128i *)((const u8 *)src - offset + 2 * 16));                   \
-            src = (const u8 *)src + 32;                                                                     \
-            _mm_storeu_si128((__m128i *)((u8 *)dst + 0 * 16), _mm_alignr_epi8(xmm1, xmm0, offset));         \
-            _mm_storeu_si128((__m128i *)((u8 *)dst + 1 * 16), _mm_alignr_epi8(xmm2, xmm1, offset));         \
-            dst = (u8 *)dst + 32;                                                                           \
-        }                                                                                                   \
-        tmp = len;                                                                                          \
-        len = ((len - 16 + offset) & 31) + 16 - offset;                                                     \
-        tmp -= len;                                                                                         \
-        src = (const u8 *)src + tmp;                                                                        \
-        dst = (u8 *)dst + tmp;                                                                              \
-    }                                                                                                       \
-})
-
-/**
- * Macro for copying unaligned block from one location to another,
- * 47 bytes leftover maximum,
- * locations should not overlap.
- * Use switch here because the aligning instruction requires immediate value for shift count.
- * Requirements:
- * - Store is aligned
- * - Load offset is <offset>, which must be within [1, 15]
- * - For <src>, make sure <offset> bit backwards & <16 - offset> bit forwards are available for loading
- * - <dst>, <src>, <len> must be variables
- * - __m128i <xmm0> ~ <xmm8> used in CLIB_MVUNALIGN_LEFT47_IMM must be pre-defined
- */
-#define CLIB_MVUNALIGN_LEFT47(dst, src, len, offset)                  \
-({                                                                    \
-    switch (offset) {                                                 \
-    case 0x01: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x01); break;   \
-    case 0x02: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x02); break;   \
-    case 0x03: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x03); break;   \
-    case 0x04: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x04); break;   \
-    case 0x05: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x05); break;   \
-    case 0x06: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x06); break;   \
-    case 0x07: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x07); break;   \
-    case 0x08: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x08); break;   \
-    case 0x09: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x09); break;   \
-    case 0x0A: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x0A); break;   \
-    case 0x0B: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x0B); break;   \
-    case 0x0C: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x0C); break;   \
-    case 0x0D: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x0D); break;   \
-    case 0x0E: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x0E); break;   \
-    case 0x0F: CLIB_MVUNALIGN_LEFT47_IMM(dst, src, n, 0x0F); break;   \
-    default:;                                                         \
-    }                                                                 \
-})
-
-static inline void *
-clib_memcpy (void *dst, const void *src, size_t n)
-{
-  __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8;
-  uword dstu = (uword) dst;
-  uword srcu = (uword) src;
-  void *ret = dst;
-  size_t dstofss;
-  size_t srcofs;
-
-	/**
-	 * Copy less than 16 bytes
-	 */
-  if (n < 16)
-    {
-      if (n & 0x01)
-	{
-	  *(u8 *) dstu = *(const u8 *) srcu;
-	  srcu = (uword) ((const u8 *) srcu + 1);
-	  dstu = (uword) ((u8 *) dstu + 1);
-	}
-      if (n & 0x02)
-	{
-	  *(u16 *) dstu = *(const u16 *) srcu;
-	  srcu = (uword) ((const u16 *) srcu + 1);
-	  dstu = (uword) ((u16 *) dstu + 1);
-	}
-      if (n & 0x04)
-	{
-	  *(u32 *) dstu = *(const u32 *) srcu;
-	  srcu = (uword) ((const u32 *) srcu + 1);
-	  dstu = (uword) ((u32 *) dstu + 1);
-	}
-      if (n & 0x08)
-	{
-	  *(u64 *) dstu = *(const u64 *) srcu;
-	}
-      return ret;
-    }
-
-	/**
-	 * Fast way when copy size doesn't exceed 512 bytes
-	 */
-  if (n <= 32)
-    {
-      clib_mov16 ((u8 *) dst, (const u8 *) src);
-      clib_mov16 ((u8 *) dst - 16 + n, (const u8 *) src - 16 + n);
-      return ret;
-    }
-  if (n <= 48)
-    {
-      clib_mov32 ((u8 *) dst, (const u8 *) src);
-      clib_mov16 ((u8 *) dst - 16 + n, (const u8 *) src - 16 + n);
-      return ret;
-    }
-  if (n <= 64)
-    {
-      clib_mov32 ((u8 *) dst, (const u8 *) src);
-      clib_mov16 ((u8 *) dst + 32, (const u8 *) src + 32);
-      clib_mov16 ((u8 *) dst - 16 + n, (const u8 *) src - 16 + n);
-      return ret;
-    }
-  if (n <= 128)
-    {
-      goto COPY_BLOCK_128_BACK15;
-    }
-  if (n <= 512)
-    {
-      if (n >= 256)
-	{
-	  n -= 256;
-	  clib_mov128 ((u8 *) dst, (const u8 *) src);
-	  clib_mov128 ((u8 *) dst + 128, (const u8 *) src + 128);
-	  src = (const u8 *) src + 256;
-	  dst = (u8 *) dst + 256;
-	}
-    COPY_BLOCK_255_BACK15:
-      if (n >= 128)
-	{
-	  n -= 128;
-	  clib_mov128 ((u8 *) dst, (const u8 *) src);
-	  src = (const u8 *) src + 128;
-	  dst = (u8 *) dst + 128;
-	}
-    COPY_BLOCK_128_BACK15:
-      if (n >= 64)
-	{
-	  n -= 64;
-	  clib_mov64 ((u8 *) dst, (const u8 *) src);
-	  src = (const u8 *) src + 64;
-	  dst = (u8 *) dst + 64;
-	}
-    COPY_BLOCK_64_BACK15:
-      if (n >= 32)
-	{
-	  n -= 32;
-	  clib_mov32 ((u8 *) dst, (const u8 *) src);
-	  src = (const u8 *) src + 32;
-	  dst = (u8 *) dst + 32;
-	}
-      if (n > 16)
-	{
-	  clib_mov16 ((u8 *) dst, (const u8 *) src);
-	  clib_mov16 ((u8 *) dst - 16 + n, (const u8 *) src - 16 + n);
-	  return ret;
-	}
-      if (n > 0)
-	{
-	  clib_mov16 ((u8 *) dst - 16 + n, (const u8 *) src - 16 + n);
-	}
-      return ret;
-    }
-
-	/**
-	 * Make store aligned when copy size exceeds 512 bytes,
-	 * and make sure the first 15 bytes are copied, because
-	 * unaligned copy functions require up to 15 bytes
-	 * backwards access.
-	 */
-  dstofss = 16 - ((uword) dst & 0x0F) + 16;
-  n -= dstofss;
-  clib_mov32 ((u8 *) dst, (const u8 *) src);
-  src = (const u8 *) src + dstofss;
-  dst = (u8 *) dst + dstofss;
-  srcofs = ((uword) src & 0x0F);
-
-	/**
-	 * For aligned copy
-	 */
-  if (srcofs == 0)
-    {
-		/**
-		 * Copy 256-byte blocks
-		 */
-      for (; n >= 256; n -= 256)
-	{
-	  clib_mov256 ((u8 *) dst, (const u8 *) src);
-	  dst = (u8 *) dst + 256;
-	  src = (const u8 *) src + 256;
-	}
-
-		/**
-		 * Copy whatever left
-		 */
-      goto COPY_BLOCK_255_BACK15;
-    }
-
-	/**
-	 * For copy with unaligned load
-	 */
-  CLIB_MVUNALIGN_LEFT47 (dst, src, n, srcofs);
-
-	/**
-	 * Copy whatever left
-	 */
-  goto COPY_BLOCK_64_BACK15;
-}
-
-
-#undef CLIB_MVUNALIGN_LEFT47_IMM
-#undef CLIB_MVUNALIGN_LEFT47
-
-#endif /* included_clib_memcpy_sse3_h */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/mhash.c b/vppinfra/vppinfra/mhash.c
deleted file mode 100644
index c917e164..00000000
--- a/vppinfra/vppinfra/mhash.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2010 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/mhash.h>
-
-always_inline u32
-load_partial_u32 (void *d, uword n)
-{
-  if (n == 4)
-    return ((u32 *) d)[0];
-  if (n == 3)
-    return ((u16 *) d)[0] | (((u8 *) d)[2] << 16);
-  if (n == 2)
-    return ((u16 *) d)[0];
-  if (n == 1)
-    return ((u8 *) d)[0];
-  ASSERT (0);
-  return 0;
-}
-
-always_inline u32
-mhash_key_sum_inline (void *data, uword n_data_bytes, u32 seed)
-{
-  u32 *d32 = data;
-  u32 a, b, c, n_left;
-
-  a = b = c = seed;
-  n_left = n_data_bytes;
-  a ^= n_data_bytes;
-
-  while (n_left > 12)
-    {
-      a += d32[0];
-      b += d32[1];
-      c += d32[2];
-      hash_v3_mix32 (a, b, c);
-      n_left -= 12;
-      d32 += 3;
-    }
-
-  if (n_left > 8)
-    {
-      c += load_partial_u32 (d32 + 2, n_left - 8);
-      n_left = 8;
-    }
-  if (n_left > 4)
-    {
-      b += load_partial_u32 (d32 + 1, n_left - 4);
-      n_left = 4;
-    }
-  if (n_left > 0)
-    a += load_partial_u32 (d32 + 0, n_left - 0);
-
-  hash_v3_finalize32 (a, b, c);
-
-  return c;
-}
-
-#define foreach_mhash_key_size			\
-  _ (2) _ (3) _ (4) _ (5) _ (6) _ (7)		\
-  _ (8) _ (12) _ (16) _ (20)			\
-  _ (24) _ (28) _ (32) _ (36)			\
-  _ (40) _ (44) _ (48) _ (52)			\
-  _ (56) _ (60) _ (64)
-
-#define _(N_KEY_BYTES)							\
-  static uword								\
-  mhash_key_sum_##N_KEY_BYTES (hash_t * h, uword key)			\
-  {									\
-    mhash_t * hv = uword_to_pointer (h->user, mhash_t *);		\
-    return mhash_key_sum_inline (mhash_key_to_mem (hv, key),		\
-				 (N_KEY_BYTES),				\
-				 hv->hash_seed);			\
-  }									\
-									\
-  static uword								\
-  mhash_key_equal_##N_KEY_BYTES (hash_t * h, uword key1, uword key2)	\
-  {									\
-    mhash_t * hv = uword_to_pointer (h->user, mhash_t *);		\
-    void * k1 = mhash_key_to_mem (hv, key1);				\
-    void * k2 = mhash_key_to_mem (hv, key2);				\
-    return ! memcmp (k1, k2, (N_KEY_BYTES));				\
-  }
-
-foreach_mhash_key_size
-#undef _
-static uword
-mhash_key_sum_c_string (hash_t * h, uword key)
-{
-  mhash_t *hv = uword_to_pointer (h->user, mhash_t *);
-  void *k = mhash_key_to_mem (hv, key);
-  return mhash_key_sum_inline (k, strlen (k), hv->hash_seed);
-}
-
-static uword
-mhash_key_equal_c_string (hash_t * h, uword key1, uword key2)
-{
-  mhash_t *hv = uword_to_pointer (h->user, mhash_t *);
-  void *k1 = mhash_key_to_mem (hv, key1);
-  void *k2 = mhash_key_to_mem (hv, key2);
-  return strcmp (k1, k2) == 0;
-}
-
-static uword
-mhash_key_sum_vec_string (hash_t * h, uword key)
-{
-  mhash_t *hv = uword_to_pointer (h->user, mhash_t *);
-  void *k = mhash_key_to_mem (hv, key);
-  return mhash_key_sum_inline (k, vec_len (k), hv->hash_seed);
-}
-
-static uword
-mhash_key_equal_vec_string (hash_t * h, uword key1, uword key2)
-{
-  mhash_t *hv = uword_to_pointer (h->user, mhash_t *);
-  void *k1 = mhash_key_to_mem (hv, key1);
-  void *k2 = mhash_key_to_mem (hv, key2);
-  return vec_len (k1) == vec_len (k2) && memcmp (k1, k2, vec_len (k1)) == 0;
-}
-
-/* The CLIB hash user pointer must always point to a valid mhash_t.
-   Now, the address of mhash_t can change (think vec_resize).
-   So we must always be careful that it points to the correct
-   address. */
-always_inline void
-mhash_sanitize_hash_user (mhash_t * mh)
-{
-  uword *hash = mh->hash;
-  hash_t *h = hash_header (hash);
-  h->user = pointer_to_uword (mh);
-}
-
-void
-mhash_init (mhash_t * h, uword n_value_bytes, uword n_key_bytes)
-{
-  static struct
-  {
-    hash_key_sum_function_t *key_sum;
-    hash_key_equal_function_t *key_equal;
-  } t[] =
-  {
-#define _(N_KEY_BYTES)					\
-    [N_KEY_BYTES] = {					\
-      .key_sum = mhash_key_sum_##N_KEY_BYTES,		\
-      .key_equal = mhash_key_equal_##N_KEY_BYTES,	\
-    },
-
-    foreach_mhash_key_size
-#undef _
-      [MHASH_C_STRING_KEY] =
-    {
-    .key_sum = mhash_key_sum_c_string,.key_equal = mhash_key_equal_c_string,},
-      [MHASH_VEC_STRING_KEY] =
-    {
-  .key_sum = mhash_key_sum_vec_string,.key_equal =
-	mhash_key_equal_vec_string,},};
-
-  if (mhash_key_vector_is_heap (h))
-    heap_free (h->key_vector_or_heap);
-  else
-    vec_free (h->key_vector_or_heap);
-  vec_free (h->key_vector_free_indices);
-  {
-    int i;
-    for (i = 0; i < vec_len (h->key_tmps); i++)
-      vec_free (h->key_tmps[i]);
-  }
-  vec_free (h->key_tmps);
-  hash_free (h->hash);
-
-  memset (h, 0, sizeof (h[0]));
-  h->n_key_bytes = n_key_bytes;
-
-#if 0
-  if (h->n_key_bytes > 0)
-    {
-      vec_validate (h->key_tmp, h->n_key_bytes - 1);
-      _vec_len (h->key_tmp) = 0;
-    }
-#endif
-
-  ASSERT (n_key_bytes < ARRAY_LEN (t));
-  h->hash = hash_create2 ( /* elts */ 0,
-			  /* user */ pointer_to_uword (h),
-			  /* value_bytes */ n_value_bytes,
-			  t[n_key_bytes].key_sum, t[n_key_bytes].key_equal,
-			  /* format pair/arg */
-			  0, 0);
-}
-
-static uword
-mhash_set_tmp_key (mhash_t * h, const void *key)
-{
-  u8 *key_tmp;
-  int my_cpu = os_get_cpu_number ();
-
-  vec_validate (h->key_tmps, my_cpu);
-  key_tmp = h->key_tmps[my_cpu];
-
-  vec_reset_length (key_tmp);
-
-  if (mhash_key_vector_is_heap (h))
-    {
-      uword is_c_string = h->n_key_bytes == MHASH_C_STRING_KEY;
-
-      if (is_c_string)
-	vec_add (key_tmp, key, strlen (key) + 1);
-      else
-	vec_add (key_tmp, key, vec_len (key));
-    }
-  else
-    vec_add (key_tmp, key, h->n_key_bytes);
-
-  h->key_tmps[my_cpu] = key_tmp;
-
-  return ~0;
-}
-
-hash_pair_t *
-mhash_get_pair (mhash_t * h, const void *key)
-{
-  uword ikey;
-  mhash_sanitize_hash_user (h);
-  ikey = mhash_set_tmp_key (h, key);
-  return hash_get_pair (h->hash, ikey);
-}
-
-typedef struct
-{
-  u32 heap_handle;
-
-  /* Must conincide with vec_header. */
-  vec_header_t vec;
-} mhash_string_key_t;
-
-uword
-mhash_set_mem (mhash_t * h, void *key, uword * new_value, uword * old_value)
-{
-  u8 *k;
-  uword ikey, i, l = 0, n_key_bytes, old_n_elts, key_alloc_from_free_list = 0;
-
-  mhash_sanitize_hash_user (h);
-
-  if (mhash_key_vector_is_heap (h))
-    {
-      mhash_string_key_t *sk;
-      uword is_c_string = h->n_key_bytes == MHASH_C_STRING_KEY;
-      uword handle;
-
-      n_key_bytes = is_c_string ? (strlen (key) + 1) : vec_len (key);
-      i =
-	heap_alloc (h->key_vector_or_heap, n_key_bytes + sizeof (sk[0]),
-		    handle);
-
-      sk = (void *) (h->key_vector_or_heap + i);
-      sk->heap_handle = handle;
-      sk->vec.len = n_key_bytes;
-      clib_memcpy (sk->vec.vector_data, key, n_key_bytes);
-
-      /* Advance key past vector header. */
-      i += sizeof (sk[0]);
-    }
-  else
-    {
-      key_alloc_from_free_list = (l =
-				  vec_len (h->key_vector_free_indices)) > 0;
-      if (key_alloc_from_free_list)
-	{
-	  i = h->key_vector_free_indices[l - 1];
-	  k = vec_elt_at_index (h->key_vector_or_heap, i);
-	  _vec_len (h->key_vector_free_indices) = l - 1;
-	}
-      else
-	{
-	  vec_add2 (h->key_vector_or_heap, k, h->n_key_bytes);
-	  i = k - h->key_vector_or_heap;
-	}
-
-      n_key_bytes = h->n_key_bytes;
-      clib_memcpy (k, key, n_key_bytes);
-    }
-  ikey = i;
-
-  old_n_elts = hash_elts (h->hash);
-  h->hash = _hash_set3 (h->hash, ikey, new_value, old_value);
-
-  /* If element already existed remove duplicate key. */
-  if (hash_elts (h->hash) == old_n_elts)
-    {
-      hash_pair_t *p;
-
-      /* Fetch old key for return value. */
-      p = hash_get_pair (h->hash, ikey);
-      ikey = p->key;
-
-      /* Remove duplicate key. */
-      if (mhash_key_vector_is_heap (h))
-	{
-	  mhash_string_key_t *sk;
-	  sk = (void *) (h->key_vector_or_heap + i - sizeof (sk[0]));
-	  heap_dealloc (h->key_vector_or_heap, sk->heap_handle);
-	}
-      else
-	{
-	  if (key_alloc_from_free_list)
-	    {
-	      h->key_vector_free_indices[l] = i;
-	      _vec_len (h->key_vector_free_indices) = l + 1;
-	    }
-	  else
-	    _vec_len (h->key_vector_or_heap) -= h->n_key_bytes;
-	}
-    }
-
-  return ikey;
-}
-
-uword
-mhash_unset (mhash_t * h, void *key, uword * old_value)
-{
-  hash_pair_t *p;
-  uword i;
-
-  mhash_sanitize_hash_user (h);
-  i = mhash_set_tmp_key (h, key);
-
-  p = hash_get_pair (h->hash, i);
-  if (!p)
-    return 0;
-
-  ASSERT (p->key != ~0);
-  i = p->key;
-
-  if (mhash_key_vector_is_heap (h))
-    {
-      mhash_string_key_t *sk;
-      sk = (void *) (h->key_vector_or_heap + i) - sizeof (sk[0]);
-      heap_dealloc (h->key_vector_or_heap, sk->heap_handle);
-    }
-  else
-    vec_add1 (h->key_vector_free_indices, i);
-
-  hash_unset3 (h->hash, i, old_value);
-  return 1;
-}
-
-u8 *
-format_mhash_key (u8 * s, va_list * va)
-{
-  mhash_t *h = va_arg (*va, mhash_t *);
-  u32 ki = va_arg (*va, u32);
-  void *k = mhash_key_to_mem (h, ki);
-
-  if (mhash_key_vector_is_heap (h))
-    {
-      uword is_c_string = h->n_key_bytes == MHASH_C_STRING_KEY;
-      u32 l = is_c_string ? strlen (k) : vec_len (k);
-      vec_add (s, k, l);
-    }
-  else if (h->format_key)
-    s = format (s, "%U", h->format_key, k);
-  else
-    s = format (s, "%U", format_hex_bytes, k, h->n_key_bytes);
-
-  return s;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/mhash.h b/vppinfra/vppinfra/mhash.h
deleted file mode 100644
index 102adf4e..00000000
--- a/vppinfra/vppinfra/mhash.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_clib_mhash_h
-#define included_clib_mhash_h
-
-/*
-  Copyright (c) 2010 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/format.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/heap.h>
-
-/* Hash table plus vector of keys. */
-typedef struct
-{
-  /* Vector or heap used to store keys.  Hash table stores keys as byte
-     offsets into this vector. */
-  u8 *key_vector_or_heap;
-
-  /* Byte offsets of free keys in vector (used to store free keys when
-     n_key_bytes > 1). */
-  u32 *key_vector_free_indices;
-
-  u8 **key_tmps;
-
-  /* Possibly fixed size of key.
-     0 means keys are vectors of u8's.
-     1 means keys are null terminated c strings. */
-#define MHASH_VEC_STRING_KEY 0
-#define MHASH_C_STRING_KEY 1
-  u32 n_key_bytes;
-
-  /* Seed value for Jenkins hash. */
-  u32 hash_seed;
-
-  /* Hash table mapping key -> value. */
-  uword *hash;
-
-  /* Format function for keys. */
-  format_function_t *format_key;
-} mhash_t;
-
-void mhash_init (mhash_t * h, uword n_value_bytes, uword n_key_bytes);
-
-always_inline void
-mhash_init_c_string (mhash_t * h, uword n_value_bytes)
-{
-  mhash_init (h, n_value_bytes, MHASH_C_STRING_KEY);
-}
-
-always_inline void
-mhash_init_vec_string (mhash_t * h, uword n_value_bytes)
-{
-  mhash_init (h, n_value_bytes, MHASH_VEC_STRING_KEY);
-}
-
-always_inline void *
-mhash_key_to_mem (mhash_t * h, uword key)
-{
-  if (key == ~0)
-    {
-      u8 *key_tmp;
-
-      int my_cpu = os_get_cpu_number ();
-      vec_validate (h->key_tmps, my_cpu);
-      key_tmp = h->key_tmps[my_cpu];
-      return key_tmp;
-    }
-  return vec_elt_at_index (h->key_vector_or_heap, key);
-}
-
-hash_pair_t *mhash_get_pair (mhash_t * h, const void *key);
-uword mhash_set_mem (mhash_t * h, void *key, uword * new_value,
-		     uword * old_value);
-uword mhash_unset (mhash_t * h, void *key, uword * old_value);
-
-always_inline uword *
-mhash_get (mhash_t * h, const void *key)
-{
-  hash_pair_t *p = mhash_get_pair (h, key);
-  return p ? &p->value[0] : 0;
-}
-
-always_inline uword
-mhash_set (mhash_t * h, void *key, uword new_value, uword * old_value)
-{
-  return mhash_set_mem (h, key, &new_value, old_value);
-}
-
-always_inline uword
-mhash_unset_key (mhash_t * h, uword key, uword * old_value)
-{
-  void *k = mhash_key_to_mem (h, key);
-  return mhash_unset (h, k, old_value);
-}
-
-always_inline uword
-mhash_value_bytes (mhash_t * m)
-{
-  hash_t *h = hash_header (m->hash);
-  return hash_value_bytes (h);
-}
-
-always_inline uword
-mhash_elts (mhash_t * m)
-{
-  return hash_elts (m->hash);
-}
-
-always_inline uword
-mhash_key_vector_is_heap (mhash_t * h)
-{
-  return h->n_key_bytes <= 1;
-}
-
-always_inline void
-mhash_free (mhash_t * h)
-{
-  if (mhash_key_vector_is_heap (h))
-    heap_free (h->key_vector_or_heap);
-  else
-    vec_free (h->key_vector_or_heap);
-  vec_free (h->key_vector_free_indices);
-  hash_free (h->hash);
-}
-
-#define mhash_foreach(k,v,mh,body)				\
-do {								\
-  hash_pair_t * _mhash_foreach_p;				\
-  hash_foreach_pair (_mhash_foreach_p, (mh)->hash, ({		\
-    (k) = mhash_key_to_mem ((mh), _mhash_foreach_p->key);	\
-    (v) = &_mhash_foreach_p->value[0];				\
-    body;							\
-  }));								\
-} while (0)
-
-format_function_t format_mhash_key;
-
-#endif /* included_clib_mhash_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/mheap.c b/vppinfra/vppinfra/mheap.c
deleted file mode 100644
index b8828f9e..00000000
--- a/vppinfra/vppinfra/mheap.c
+++ /dev/null
@@ -1,1649 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/bitops.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/format.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/os.h>
-#include <vppinfra/time.h>
-
-#ifdef CLIB_UNIX
-#include <vppinfra/elf_clib.h>
-#endif
-
-static void mheap_get_trace (void *v, uword offset, uword size);
-static void mheap_put_trace (void *v, uword offset, uword size);
-static int mheap_trace_sort (const void *t1, const void *t2);
-
-always_inline void
-mheap_maybe_lock (void *v)
-{
-  mheap_t *h = mheap_header (v);
-  if (v && (h->flags & MHEAP_FLAG_THREAD_SAFE))
-    {
-      u32 my_cpu = os_get_cpu_number ();
-      if (h->owner_cpu == my_cpu)
-	{
-	  h->recursion_count++;
-	  return;
-	}
-
-      while (__sync_lock_test_and_set (&h->lock, 1))
-	;
-
-      h->owner_cpu = my_cpu;
-      h->recursion_count = 1;
-    }
-}
-
-always_inline void
-mheap_maybe_unlock (void *v)
-{
-  mheap_t *h = mheap_header (v);
-  if (v && h->flags & MHEAP_FLAG_THREAD_SAFE)
-    {
-      ASSERT (os_get_cpu_number () == h->owner_cpu);
-      if (--h->recursion_count == 0)
-	{
-	  h->owner_cpu = ~0;
-	  CLIB_MEMORY_BARRIER ();
-	  h->lock = 0;
-	}
-    }
-}
-
-/* Find bin for objects with size at least n_user_data_bytes. */
-always_inline uword
-user_data_size_to_bin_index (uword n_user_data_bytes)
-{
-  uword n_user_data_words;
-  word small_bin, large_bin;
-
-  /* User size must be at least big enough to hold free elt. */
-  n_user_data_bytes = clib_max (n_user_data_bytes, MHEAP_MIN_USER_DATA_BYTES);
-
-  /* Round to words. */
-  n_user_data_words =
-    (round_pow2 (n_user_data_bytes, MHEAP_USER_DATA_WORD_BYTES) /
-     MHEAP_USER_DATA_WORD_BYTES);
-
-  ASSERT (n_user_data_words > 0);
-  small_bin =
-    n_user_data_words -
-    (MHEAP_MIN_USER_DATA_BYTES / MHEAP_USER_DATA_WORD_BYTES);
-  ASSERT (small_bin >= 0);
-
-  large_bin =
-    MHEAP_N_SMALL_OBJECT_BINS + max_log2 (n_user_data_bytes) -
-    MHEAP_LOG2_N_SMALL_OBJECT_BINS;
-
-  return small_bin < MHEAP_N_SMALL_OBJECT_BINS ? small_bin : large_bin;
-}
-
-always_inline uword
-mheap_elt_size_to_user_n_bytes (uword n_bytes)
-{
-  ASSERT (n_bytes >= sizeof (mheap_elt_t));
-  return (n_bytes - STRUCT_OFFSET_OF (mheap_elt_t, user_data));
-}
-
-always_inline uword __attribute__ ((unused))
-mheap_elt_size_to_user_n_words (uword n_bytes)
-{
-  ASSERT (n_bytes % MHEAP_USER_DATA_WORD_BYTES == 0);
-  return mheap_elt_size_to_user_n_bytes (n_bytes) /
-    MHEAP_USER_DATA_WORD_BYTES;
-}
-
-always_inline void
-mheap_elt_set_size (void *v,
-		    uword uoffset, uword n_user_data_bytes, uword is_free)
-{
-  mheap_elt_t *e, *n;
-
-  e = mheap_elt_at_uoffset (v, uoffset);
-
-  ASSERT (n_user_data_bytes % MHEAP_USER_DATA_WORD_BYTES == 0);
-
-  e->n_user_data = n_user_data_bytes / MHEAP_USER_DATA_WORD_BYTES;
-  e->is_free = is_free;
-  ASSERT (e->prev_n_user_data * sizeof (e->user_data[0]) >=
-	  MHEAP_MIN_USER_DATA_BYTES);
-
-  n = mheap_next_elt (e);
-  n->prev_n_user_data = e->n_user_data;
-  n->prev_is_free = is_free;
-}
-
-always_inline void
-set_first_free_elt_offset (mheap_t * h, uword bin, uword uoffset)
-{
-  uword i0, i1;
-
-  h->first_free_elt_uoffset_by_bin[bin] = uoffset;
-
-  i0 = bin / BITS (h->non_empty_free_elt_heads[0]);
-  i1 = (uword) 1 << (uword) (bin % BITS (h->non_empty_free_elt_heads[0]));
-
-  ASSERT (i0 < ARRAY_LEN (h->non_empty_free_elt_heads));
-  if (h->first_free_elt_uoffset_by_bin[bin] == MHEAP_GROUNDED)
-    h->non_empty_free_elt_heads[i0] &= ~i1;
-  else
-    h->non_empty_free_elt_heads[i0] |= i1;
-}
-
-always_inline void
-set_free_elt (void *v, uword uoffset, uword n_user_data_bytes)
-{
-  mheap_t *h = mheap_header (v);
-  mheap_elt_t *e = mheap_elt_at_uoffset (v, uoffset);
-  mheap_elt_t *n = mheap_next_elt (e);
-  uword bin = user_data_size_to_bin_index (n_user_data_bytes);
-
-  ASSERT (n->prev_is_free);
-  ASSERT (e->is_free);
-
-  e->free_elt.prev_uoffset = MHEAP_GROUNDED;
-  e->free_elt.next_uoffset = h->first_free_elt_uoffset_by_bin[bin];
-
-  /* Fill in next free elt's previous pointer. */
-  if (e->free_elt.next_uoffset != MHEAP_GROUNDED)
-    {
-      mheap_elt_t *nf = mheap_elt_at_uoffset (v, e->free_elt.next_uoffset);
-      ASSERT (nf->is_free);
-      nf->free_elt.prev_uoffset = uoffset;
-    }
-
-  set_first_free_elt_offset (h, bin, uoffset);
-}
-
-always_inline void
-new_free_elt (void *v, uword uoffset, uword n_user_data_bytes)
-{
-  mheap_elt_set_size (v, uoffset, n_user_data_bytes, /* is_free */ 1);
-  set_free_elt (v, uoffset, n_user_data_bytes);
-}
-
-always_inline void
-remove_free_elt (void *v, mheap_elt_t * e, uword bin)
-{
-  mheap_t *h = mheap_header (v);
-  mheap_elt_t *p, *n;
-#if CLIB_VEC64 > 0
-  u64 no, po;
-#else
-  u32 no, po;
-#endif
-
-  no = e->free_elt.next_uoffset;
-
-  n = no != MHEAP_GROUNDED ? mheap_elt_at_uoffset (v, no) : 0;
-  po = e->free_elt.prev_uoffset;
-  p = po != MHEAP_GROUNDED ? mheap_elt_at_uoffset (v, po) : 0;
-
-  if (!p)
-    set_first_free_elt_offset (h, bin, no);
-  else
-    p->free_elt.next_uoffset = no;
-
-  if (n)
-    n->free_elt.prev_uoffset = po;
-}
-
-always_inline void
-remove_free_elt2 (void *v, mheap_elt_t * e)
-{
-  uword bin;
-  bin = user_data_size_to_bin_index (mheap_elt_data_bytes (e));
-  remove_free_elt (v, e, bin);
-}
-
-#define MHEAP_VM_MAP		(1 << 0)
-#define MHEAP_VM_UNMAP		(1 << 1)
-#define MHEAP_VM_NOMAP		(0 << 1)
-#define MHEAP_VM_ROUND		(1 << 2)
-#define MHEAP_VM_ROUND_UP	MHEAP_VM_ROUND
-#define MHEAP_VM_ROUND_DOWN	(0 << 2)
-
-static uword mheap_page_size;
-
-static_always_inline uword
-mheap_page_round (uword addr)
-{
-  return (addr + mheap_page_size - 1) & ~(mheap_page_size - 1);
-}
-
-static_always_inline uword
-mheap_page_truncate (uword addr)
-{
-  return addr & ~(mheap_page_size - 1);
-}
-
-static_always_inline uword
-mheap_vm (void *v, uword flags, clib_address_t start_addr, uword size)
-{
-  mheap_t *h = mheap_header (v);
-  clib_address_t start_page, end_page, end_addr;
-  uword mapped_bytes;
-
-  ASSERT (!(h->flags & MHEAP_FLAG_DISABLE_VM));
-
-  end_addr = start_addr + size;
-
-  /* Round start/end address up to page boundary. */
-  start_page = mheap_page_round (start_addr);
-
-  if ((flags & MHEAP_VM_ROUND) == MHEAP_VM_ROUND_UP)
-    end_page = mheap_page_round (end_addr);
-  else
-    end_page = mheap_page_truncate (end_addr);
-
-  mapped_bytes = 0;
-  if (end_page > start_page)
-    {
-      mapped_bytes = end_page - start_page;
-      if (flags & MHEAP_VM_MAP)
-	clib_mem_vm_map ((void *) start_page, end_page - start_page);
-      else if (flags & MHEAP_VM_UNMAP)
-	clib_mem_vm_unmap ((void *) start_page, end_page - start_page);
-    }
-
-  return mapped_bytes;
-}
-
-static_always_inline uword
-mheap_vm_elt (void *v, uword flags, uword offset)
-{
-  mheap_elt_t *e;
-  clib_address_t start_addr, end_addr;
-
-  e = mheap_elt_at_uoffset (v, offset);
-  start_addr = (clib_address_t) ((void *) e->user_data);
-  end_addr = (clib_address_t) mheap_next_elt (e);
-  return mheap_vm (v, flags, start_addr, end_addr - start_addr);
-}
-
-always_inline uword
-mheap_small_object_cache_mask (mheap_small_object_cache_t * c, uword bin)
-{
-  uword mask;
-
-/* $$$$ ELIOT FIXME: add Altivec version of this routine */
-#if !defined (CLIB_HAVE_VEC128) || defined (__ALTIVEC__)
-  mask = 0;
-#else
-  u8x16 b = u8x16_splat (bin);
-
-  ASSERT (bin < 256);
-
-#define _(i) ((uword) u8x16_compare_byte_mask (u8x16_is_equal (b, c->bins.as_u8x16[i])) << (uword) ((i)*16))
-  mask = _(0) | _(1);
-  if (BITS (uword) > 32)
-    mask |= _(2) | _(3);
-#undef _
-
-#endif
-  return mask;
-}
-
-always_inline uword
-mheap_get_small_object (mheap_t * h, uword bin)
-{
-  mheap_small_object_cache_t *c = &h->small_object_cache;
-  uword mask = mheap_small_object_cache_mask (c, bin + 1);
-  uword offset = MHEAP_GROUNDED;
-
-  if (mask)
-    {
-      uword i = min_log2 (mask);
-      uword o = c->offsets[i];
-      ASSERT (o != MHEAP_GROUNDED);
-      c->bins.as_u8[i] = 0;
-      offset = o;
-    }
-
-  return offset;
-}
-
-always_inline uword
-mheap_put_small_object (mheap_t * h, uword bin, uword offset)
-{
-  mheap_small_object_cache_t *c = &h->small_object_cache;
-  uword free_mask = mheap_small_object_cache_mask (c, 0);
-  uword b = bin + 1;
-  uword i;
-
-  if (free_mask != 0)
-    {
-      i = min_log2 (free_mask);
-      c->bins.as_u8[i] = b;
-      c->offsets[i] = offset;
-      return 0;
-    }
-  else
-    /* Nothing free with right size: cyclic replacement. */
-    {
-      uword old_offset;
-
-      i = c->replacement_index++;
-      i %= BITS (uword);
-      c->bins.as_u8[i] = b;
-      old_offset = c->offsets[i];
-      c->offsets[i] = offset;
-
-      /* Return old offset so it can be freed. */
-      return old_offset;
-    }
-}
-
-static uword
-mheap_get_search_free_bin (void *v,
-			   uword bin,
-			   uword * n_user_data_bytes_arg,
-			   uword align, uword align_offset)
-{
-  mheap_t *h = mheap_header (v);
-  mheap_elt_t *e;
-
-  /* Free object is at offset f0 ... f1;
-     Allocatted object is at offset o0 ... o1. */
-  word o0, o1, f0, f1, search_n_user_data_bytes;
-  word lo_free_usize, hi_free_usize;
-
-  ASSERT (h->first_free_elt_uoffset_by_bin[bin] != MHEAP_GROUNDED);
-  e = mheap_elt_at_uoffset (v, h->first_free_elt_uoffset_by_bin[bin]);
-
-  search_n_user_data_bytes = *n_user_data_bytes_arg;
-
-  /* Silence compiler warning. */
-  o0 = o1 = f0 = f1 = 0;
-
-  h->stats.free_list.n_search_attempts += 1;
-
-  /* Find an object that is large enough with correct alignment at given alignment offset. */
-  while (1)
-    {
-      uword this_object_n_user_data_bytes = mheap_elt_data_bytes (e);
-
-      ASSERT (e->is_free);
-      if (bin < MHEAP_N_SMALL_OBJECT_BINS)
-	ASSERT (this_object_n_user_data_bytes >= search_n_user_data_bytes);
-
-      h->stats.free_list.n_objects_searched += 1;
-
-      if (this_object_n_user_data_bytes < search_n_user_data_bytes)
-	goto next;
-
-      /* Bounds of free object: from f0 to f1. */
-      f0 = ((void *) e->user_data - v);
-      f1 = f0 + this_object_n_user_data_bytes;
-
-      /* Place candidate object at end of free block and align as requested. */
-      o0 = ((f1 - search_n_user_data_bytes) & ~(align - 1)) - align_offset;
-      while (o0 < f0)
-	o0 += align;
-
-      /* Make sure that first free fragment is either empty or
-         large enough to be valid. */
-      while (1)
-	{
-	  lo_free_usize = o0 != f0 ? o0 - f0 - MHEAP_ELT_OVERHEAD_BYTES : 0;
-	  if (o0 <= f0 || lo_free_usize >= (word) MHEAP_MIN_USER_DATA_BYTES)
-	    break;
-	  o0 -= align;
-	}
-
-      o1 = o0 + search_n_user_data_bytes;
-
-      /* Does it fit? */
-      if (o0 >= f0 && o1 <= f1)
-	goto found;
-
-    next:
-      /* Reached end of free list without finding large enough object. */
-      if (e->free_elt.next_uoffset == MHEAP_GROUNDED)
-	return MHEAP_GROUNDED;
-
-      /* Otherwise keep searching for large enough object. */
-      e = mheap_elt_at_uoffset (v, e->free_elt.next_uoffset);
-    }
-
-found:
-  /* Free fragment at end. */
-  hi_free_usize = f1 != o1 ? f1 - o1 - MHEAP_ELT_OVERHEAD_BYTES : 0;
-
-  /* If fragment at end is too small to be a new object,
-     give user's object a bit more space than requested. */
-  if (hi_free_usize < (word) MHEAP_MIN_USER_DATA_BYTES)
-    {
-      search_n_user_data_bytes += f1 - o1;
-      o1 = f1;
-      hi_free_usize = 0;
-    }
-
-  /* Need to make sure that relevant memory areas are mapped. */
-  if (!(h->flags & MHEAP_FLAG_DISABLE_VM))
-    {
-      mheap_elt_t *f0_elt = mheap_elt_at_uoffset (v, f0);
-      mheap_elt_t *f1_elt = mheap_elt_at_uoffset (v, f1);
-      mheap_elt_t *o0_elt = mheap_elt_at_uoffset (v, o0);
-      mheap_elt_t *o1_elt = mheap_elt_at_uoffset (v, o1);
-
-      uword f0_page_start, f0_page_end;
-      uword o0_page_start, o0_page_end;
-
-      /* Free elt is mapped.  Addresses after that may not be mapped. */
-      f0_page_start = mheap_page_round (pointer_to_uword (f0_elt->user_data));
-      f0_page_end = mheap_page_truncate (pointer_to_uword (f1_elt));
-
-      o0_page_start = mheap_page_truncate (pointer_to_uword (o0_elt));
-      o0_page_end = mheap_page_round (pointer_to_uword (o1_elt->user_data));
-
-      if (o0_page_start < f0_page_start)
-	o0_page_start = f0_page_start;
-      if (o0_page_end > f0_page_end)
-	o0_page_end = f0_page_end;
-
-      if (o0_page_end > o0_page_start)
-	clib_mem_vm_map (uword_to_pointer (o0_page_start, void *),
-			 o0_page_end - o0_page_start);
-    }
-
-  /* Remove free object from free list. */
-  remove_free_elt (v, e, bin);
-
-  /* Free fragment at begining. */
-  if (lo_free_usize > 0)
-    {
-      ASSERT (lo_free_usize >= (word) MHEAP_MIN_USER_DATA_BYTES);
-      mheap_elt_set_size (v, f0, lo_free_usize, /* is_free */ 1);
-      new_free_elt (v, f0, lo_free_usize);
-    }
-
-  mheap_elt_set_size (v, o0, search_n_user_data_bytes, /* is_free */ 0);
-
-  if (hi_free_usize > 0)
-    {
-      uword uo = o1 + MHEAP_ELT_OVERHEAD_BYTES;
-      mheap_elt_set_size (v, uo, hi_free_usize, /* is_free */ 1);
-      new_free_elt (v, uo, hi_free_usize);
-    }
-
-  /* Return actual size of block. */
-  *n_user_data_bytes_arg = search_n_user_data_bytes;
-
-  h->stats.free_list.n_objects_found += 1;
-
-  return o0;
-}
-
-/* Search free lists for object with given size and alignment. */
-static uword
-mheap_get_search_free_list (void *v,
-			    uword * n_user_bytes_arg,
-			    uword align, uword align_offset)
-{
-  mheap_t *h = mheap_header (v);
-  uword bin, n_user_bytes, i, bi;
-
-  n_user_bytes = *n_user_bytes_arg;
-  bin = user_data_size_to_bin_index (n_user_bytes);
-
-  if (MHEAP_HAVE_SMALL_OBJECT_CACHE
-      && (h->flags & MHEAP_FLAG_SMALL_OBJECT_CACHE)
-      && bin < 255
-      && align == STRUCT_SIZE_OF (mheap_elt_t, user_data[0])
-      && align_offset == 0)
-    {
-      uword r = mheap_get_small_object (h, bin);
-      h->stats.n_small_object_cache_attempts += 1;
-      if (r != MHEAP_GROUNDED)
-	{
-	  h->stats.n_small_object_cache_hits += 1;
-	  return r;
-	}
-    }
-
-  for (i = bin / BITS (uword); i < ARRAY_LEN (h->non_empty_free_elt_heads);
-       i++)
-    {
-      uword non_empty_bin_mask = h->non_empty_free_elt_heads[i];
-
-      /* No need to search smaller bins. */
-      if (i == bin / BITS (uword))
-	non_empty_bin_mask &= ~pow2_mask (bin % BITS (uword));
-
-      /* Search each occupied free bin which is large enough. */
-      foreach_set_bit (bi, non_empty_bin_mask, (
-						 {
-						 uword r =
-						 mheap_get_search_free_bin (v,
-									    bi
-									    +
-									    i
-									    *
-									    BITS
-									    (uword),
-									    n_user_bytes_arg,
-									    align,
-									    align_offset);
-						 if (r !=
-						     MHEAP_GROUNDED) return
-						 r;}
-		       ));
-    }
-
-  return MHEAP_GROUNDED;
-}
-
-static never_inline void *
-mheap_get_extend_vector (void *v,
-			 uword n_user_data_bytes,
-			 uword align,
-			 uword align_offset, uword * offset_return)
-{
-  /* Bounds of free and allocated objects (as above). */
-  uword f0, f1, o0, o1;
-  word free_size;
-  mheap_t *h = mheap_header (v);
-  mheap_elt_t *e;
-
-  if (_vec_len (v) == 0)
-    {
-      _vec_len (v) = MHEAP_ELT_OVERHEAD_BYTES;
-
-      /* Create first element of heap. */
-      e = mheap_elt_at_uoffset (v, _vec_len (v));
-      e->prev_n_user_data = MHEAP_N_USER_DATA_INVALID;
-    }
-
-  f0 = _vec_len (v);
-
-  o0 = round_pow2 (f0, align) - align_offset;
-  while (1)
-    {
-      free_size = o0 - f0 - MHEAP_ELT_OVERHEAD_BYTES;
-      if (o0 == f0 || free_size >= (word) sizeof (mheap_elt_t))
-	break;
-
-      o0 += align;
-    }
-
-  o1 = o0 + n_user_data_bytes;
-  f1 = o1 + MHEAP_ELT_OVERHEAD_BYTES;
-
-  ASSERT (v != 0);
-  h = mheap_header (v);
-
-  /* Make sure we have space for object plus overhead. */
-  if (f1 > h->max_size)
-    {
-      *offset_return = MHEAP_GROUNDED;
-      return v;
-    }
-
-  _vec_len (v) = f1;
-
-  if (!(h->flags & MHEAP_FLAG_DISABLE_VM))
-    {
-      mheap_elt_t *f0_elt = mheap_elt_at_uoffset (v, f0);
-      mheap_elt_t *f1_elt = mheap_elt_at_uoffset (v, f1);
-
-      uword f0_page = mheap_page_round (pointer_to_uword (f0_elt->user_data));
-      uword f1_page = mheap_page_round (pointer_to_uword (f1_elt->user_data));
-
-      if (f1_page > f0_page)
-	mheap_vm (v, MHEAP_VM_MAP, f0_page, f1_page - f0_page);
-    }
-
-  if (free_size > 0)
-    new_free_elt (v, f0, free_size);
-
-  mheap_elt_set_size (v, o0, n_user_data_bytes, /* is_free */ 0);
-
-  /* Mark last element. */
-  e = mheap_elt_at_uoffset (v, f1);
-  e->n_user_data = MHEAP_N_USER_DATA_INVALID;
-
-  *offset_return = o0;
-
-  return v;
-}
-
-void *
-mheap_get_aligned (void *v,
-		   uword n_user_data_bytes,
-		   uword align, uword align_offset, uword * offset_return)
-{
-  mheap_t *h;
-  uword offset;
-  u64 cpu_times[2];
-
-  cpu_times[0] = clib_cpu_time_now ();
-
-  align = clib_max (align, STRUCT_SIZE_OF (mheap_elt_t, user_data[0]));
-  align = max_pow2 (align);
-
-  /* Correct align offset to be smaller than alignment. */
-  align_offset &= (align - 1);
-
-  /* Align offset must be multiple of minimum object size. */
-  if (align_offset % STRUCT_SIZE_OF (mheap_elt_t, user_data[0]) != 0)
-    {
-      *offset_return = MHEAP_GROUNDED;
-      return v;
-    }
-
-  /* Round requested size. */
-  n_user_data_bytes = clib_max (n_user_data_bytes, MHEAP_MIN_USER_DATA_BYTES);
-  n_user_data_bytes =
-    round_pow2 (n_user_data_bytes,
-		STRUCT_SIZE_OF (mheap_elt_t, user_data[0]));
-
-  if (!v)
-    v = mheap_alloc (0, 64 << 20);
-
-  mheap_maybe_lock (v);
-
-  h = mheap_header (v);
-
-  if (h->flags & MHEAP_FLAG_VALIDATE)
-    mheap_validate (v);
-
-  /* First search free lists for object. */
-  offset =
-    mheap_get_search_free_list (v, &n_user_data_bytes, align, align_offset);
-
-  h = mheap_header (v);
-
-  /* If that fails allocate object at end of heap by extending vector. */
-  if (offset == MHEAP_GROUNDED && _vec_len (v) < h->max_size)
-    {
-      v =
-	mheap_get_extend_vector (v, n_user_data_bytes, align, align_offset,
-				 &offset);
-      h = mheap_header (v);
-      h->stats.n_vector_expands += offset != MHEAP_GROUNDED;
-    }
-
-  *offset_return = offset;
-  if (offset != MHEAP_GROUNDED)
-    {
-      h->n_elts += 1;
-
-      if (h->flags & MHEAP_FLAG_TRACE)
-	{
-	  /* Recursion block for case when we are traceing main clib heap. */
-	  h->flags &= ~MHEAP_FLAG_TRACE;
-
-	  mheap_get_trace (v, offset, n_user_data_bytes);
-
-	  h->flags |= MHEAP_FLAG_TRACE;
-	}
-    }
-
-  if (h->flags & MHEAP_FLAG_VALIDATE)
-    mheap_validate (v);
-
-  mheap_maybe_unlock (v);
-
-  cpu_times[1] = clib_cpu_time_now ();
-  h->stats.n_clocks_get += cpu_times[1] - cpu_times[0];
-  h->stats.n_gets += 1;
-
-  return v;
-}
-
-static void
-free_last_elt (void *v, mheap_elt_t * e)
-{
-  mheap_t *h = mheap_header (v);
-
-  /* Possibly delete preceeding free element also. */
-  if (e->prev_is_free)
-    {
-      e = mheap_prev_elt (e);
-      remove_free_elt2 (v, e);
-    }
-
-  if (e->prev_n_user_data == MHEAP_N_USER_DATA_INVALID)
-    {
-      if (!(h->flags & MHEAP_FLAG_DISABLE_VM))
-	mheap_vm_elt (v, MHEAP_VM_UNMAP, mheap_elt_uoffset (v, e));
-      _vec_len (v) = 0;
-    }
-  else
-    {
-      uword uo = mheap_elt_uoffset (v, e);
-      if (!(h->flags & MHEAP_FLAG_DISABLE_VM))
-	mheap_vm_elt (v, MHEAP_VM_UNMAP, uo);
-      e->n_user_data = MHEAP_N_USER_DATA_INVALID;
-      _vec_len (v) = uo;
-    }
-}
-
-void
-mheap_put (void *v, uword uoffset)
-{
-  mheap_t *h;
-  uword n_user_data_bytes, bin;
-  mheap_elt_t *e, *n;
-  uword trace_uoffset, trace_n_user_data_bytes;
-  u64 cpu_times[2];
-
-  cpu_times[0] = clib_cpu_time_now ();
-
-  h = mheap_header (v);
-
-  mheap_maybe_lock (v);
-
-  if (h->flags & MHEAP_FLAG_VALIDATE)
-    mheap_validate (v);
-
-  ASSERT (h->n_elts > 0);
-  h->n_elts--;
-  h->stats.n_puts += 1;
-
-  e = mheap_elt_at_uoffset (v, uoffset);
-  n = mheap_next_elt (e);
-  n_user_data_bytes = mheap_elt_data_bytes (e);
-
-  trace_uoffset = uoffset;
-  trace_n_user_data_bytes = n_user_data_bytes;
-
-  bin = user_data_size_to_bin_index (n_user_data_bytes);
-  if (MHEAP_HAVE_SMALL_OBJECT_CACHE
-      && bin < 255 && (h->flags & MHEAP_FLAG_SMALL_OBJECT_CACHE))
-    {
-      uoffset = mheap_put_small_object (h, bin, uoffset);
-      if (uoffset == 0)
-	goto done;
-
-      e = mheap_elt_at_uoffset (v, uoffset);
-      n = mheap_next_elt (e);
-      n_user_data_bytes = mheap_elt_data_bytes (e);
-    }
-
-  /* Assert that forward and back pointers are equal. */
-  if (e->n_user_data != n->prev_n_user_data)
-    os_panic ();
-
-  /* Forward and backwards is_free must agree. */
-  if (e->is_free != n->prev_is_free)
-    os_panic ();
-
-  /* Object was already freed. */
-  if (e->is_free)
-    os_panic ();
-
-  /* Special case: delete last element in heap. */
-  if (n->n_user_data == MHEAP_N_USER_DATA_INVALID)
-    free_last_elt (v, e);
-
-  else
-    {
-      uword f0, f1, n_combine;
-
-      f0 = uoffset;
-      f1 = f0 + n_user_data_bytes;
-      n_combine = 0;
-
-      if (e->prev_is_free)
-	{
-	  mheap_elt_t *p = mheap_prev_elt (e);
-	  f0 = mheap_elt_uoffset (v, p);
-	  remove_free_elt2 (v, p);
-	  n_combine++;
-	}
-
-      if (n->is_free)
-	{
-	  mheap_elt_t *m = mheap_next_elt (n);
-	  f1 = (void *) m - v;
-	  remove_free_elt2 (v, n);
-	  n_combine++;
-	}
-
-      if (n_combine)
-	mheap_elt_set_size (v, f0, f1 - f0, /* is_free */ 1);
-      else
-	e->is_free = n->prev_is_free = 1;
-      set_free_elt (v, f0, f1 - f0);
-
-      if (!(h->flags & MHEAP_FLAG_DISABLE_VM))
-	mheap_vm_elt (v, MHEAP_VM_UNMAP, f0);
-    }
-
-done:
-  h = mheap_header (v);
-
-  if (h->flags & MHEAP_FLAG_TRACE)
-    {
-      /* Recursion block for case when we are traceing main clib heap. */
-      h->flags &= ~MHEAP_FLAG_TRACE;
-
-      mheap_put_trace (v, trace_uoffset, trace_n_user_data_bytes);
-
-      h->flags |= MHEAP_FLAG_TRACE;
-    }
-
-  if (h->flags & MHEAP_FLAG_VALIDATE)
-    mheap_validate (v);
-
-  mheap_maybe_unlock (v);
-
-  cpu_times[1] = clib_cpu_time_now ();
-  h->stats.n_clocks_put += cpu_times[1] - cpu_times[0];
-}
-
-void *
-mheap_alloc_with_flags (void *memory, uword memory_size, uword flags)
-{
-  mheap_t *h;
-  void *v;
-  uword size;
-
-  if (!mheap_page_size)
-    mheap_page_size = clib_mem_get_page_size ();
-
-  if (!memory)
-    {
-      /* No memory given, try to VM allocate some. */
-      memory = clib_mem_vm_alloc (memory_size);
-      if (!memory)
-	return 0;
-
-      /* No memory region implies we have virtual memory. */
-      flags &= ~MHEAP_FLAG_DISABLE_VM;
-    }
-
-  /* Make sure that given memory is page aligned. */
-  {
-    uword am, av, ah;
-
-    am = pointer_to_uword (memory);
-    av = mheap_page_round (am);
-    v = uword_to_pointer (av, void *);
-    h = mheap_header (v);
-    ah = pointer_to_uword (h);
-    while (ah < am)
-      ah += mheap_page_size;
-
-    h = uword_to_pointer (ah, void *);
-    v = mheap_vector (h);
-
-    if (PREDICT_FALSE (memory + memory_size < v))
-      {
-	/*
-	 * This will happen when the requested memory_size is too
-	 * small to cope with the heap header and/or memory alignment.
-	 */
-	clib_mem_vm_free (memory, memory_size);
-	return 0;
-      }
-
-    size = memory + memory_size - v;
-  }
-
-  /* VM map header so we can use memory. */
-  if (!(flags & MHEAP_FLAG_DISABLE_VM))
-    clib_mem_vm_map (h, sizeof (h[0]));
-
-  /* Zero vector header: both heap header and vector length. */
-  memset (h, 0, sizeof (h[0]));
-  _vec_len (v) = 0;
-
-  h->vm_alloc_offset_from_header = (void *) h - memory;
-  h->vm_alloc_size = memory_size;
-
-  h->max_size = size;
-  h->owner_cpu = ~0;
-
-  /* Set flags based on those given less builtin-flags. */
-  h->flags |= (flags & ~MHEAP_FLAG_TRACE);
-
-  /* Unmap remainder of heap until we will be ready to use it. */
-  if (!(h->flags & MHEAP_FLAG_DISABLE_VM))
-    mheap_vm (v, MHEAP_VM_UNMAP | MHEAP_VM_ROUND_UP,
-	      (clib_address_t) v, h->max_size);
-
-  /* Initialize free list heads to empty. */
-  memset (h->first_free_elt_uoffset_by_bin, 0xFF,
-	  sizeof (h->first_free_elt_uoffset_by_bin));
-
-  return v;
-}
-
-void *
-mheap_alloc (void *memory, uword size)
-{
-  uword flags = 0;
-
-  if (memory != 0)
-    flags |= MHEAP_FLAG_DISABLE_VM;
-
-#ifdef CLIB_HAVE_VEC128
-  flags |= MHEAP_FLAG_SMALL_OBJECT_CACHE;
-#endif
-
-  return mheap_alloc_with_flags (memory, size, flags);
-}
-
-void *
-_mheap_free (void *v)
-{
-  mheap_t *h = mheap_header (v);
-
-  if (v)
-    clib_mem_vm_free ((void *) h - h->vm_alloc_offset_from_header,
-		      h->vm_alloc_size);
-
-  return 0;
-}
-
-/* Call user's function with each object in heap. */
-void
-mheap_foreach (void *v,
-	       uword (*func) (void *arg, void *v, void *elt_data,
-			      uword elt_size), void *arg)
-{
-  mheap_elt_t *e;
-  u8 *stack_heap, *clib_mem_mheap_save;
-  u8 tmp_heap_memory[16 * 1024];
-
-  mheap_maybe_lock (v);
-
-  if (vec_len (v) == 0)
-    goto done;
-
-  clib_mem_mheap_save = 0;
-  stack_heap = 0;
-
-  /* Allocate a new temporary heap on the stack.
-     This is so that our hash table & user's callback function can
-     themselves allocate memory somewhere without getting in the way
-     of the heap we are looking at. */
-  if (v == clib_mem_get_heap ())
-    {
-      stack_heap = mheap_alloc (tmp_heap_memory, sizeof (tmp_heap_memory));
-      clib_mem_mheap_save = v;
-      clib_mem_set_heap (stack_heap);
-    }
-
-  for (e = v;
-       e->n_user_data != MHEAP_N_USER_DATA_INVALID; e = mheap_next_elt (e))
-    {
-      void *p = mheap_elt_data (v, e);
-      if (e->is_free)
-	continue;
-      if ((*func) (arg, v, p, mheap_elt_data_bytes (e)))
-	break;
-    }
-
-  /* Restore main CLIB heap. */
-  if (clib_mem_mheap_save)
-    clib_mem_set_heap (clib_mem_mheap_save);
-
-done:
-  mheap_maybe_unlock (v);
-}
-
-/* Bytes in mheap header overhead not including data bytes. */
-always_inline uword
-mheap_bytes_overhead (void *v)
-{
-  mheap_t *h = mheap_header (v);
-  return v ? sizeof (h[0]) + h->n_elts * sizeof (mheap_elt_t) : 0;
-}
-
-/* Total number of bytes including both data and overhead. */
-uword
-mheap_bytes (void *v)
-{
-  return mheap_bytes_overhead (v) + vec_bytes (v);
-}
-
-static void
-mheap_usage_no_lock (void *v, clib_mem_usage_t * usage)
-{
-  mheap_t *h = mheap_header (v);
-  uword used = 0, free = 0, free_vm_unmapped = 0;
-
-  if (vec_len (v) > 0)
-    {
-      mheap_elt_t *e;
-
-      for (e = v;
-	   e->n_user_data != MHEAP_N_USER_DATA_INVALID;
-	   e = mheap_next_elt (e))
-	{
-	  uword size = mheap_elt_data_bytes (e);
-	  if (e->is_free)
-	    {
-	      free += size;
-	      if (!(h->flags & MHEAP_FLAG_DISABLE_VM))
-		free_vm_unmapped +=
-		  mheap_vm_elt (v, MHEAP_VM_NOMAP, mheap_elt_uoffset (v, e));
-	    }
-	  else
-	    used += size;
-	}
-    }
-
-  usage->object_count = mheap_elts (v);
-  usage->bytes_total = mheap_bytes (v);
-  usage->bytes_overhead = mheap_bytes_overhead (v);
-  usage->bytes_max = mheap_max_size (v);
-  usage->bytes_used = used;
-  usage->bytes_free = free;
-  usage->bytes_free_reclaimed = free_vm_unmapped;
-}
-
-void
-mheap_usage (void *v, clib_mem_usage_t * usage)
-{
-  mheap_maybe_lock (v);
-  mheap_usage_no_lock (v, usage);
-  mheap_maybe_unlock (v);
-}
-
-static u8 *
-format_mheap_byte_count (u8 * s, va_list * va)
-{
-  uword n_bytes = va_arg (*va, uword);
-  if (n_bytes < 1024)
-    return format (s, "%wd", n_bytes);
-  else
-    return format (s, "%wdk", n_bytes / 1024);
-}
-
-/* Returns first corrupt heap element. */
-static mheap_elt_t *
-mheap_first_corrupt (void *v)
-{
-  mheap_elt_t *e, *n;
-
-  if (vec_len (v) == 0)
-    return 0;
-
-  e = v;
-  while (1)
-    {
-      if (e->n_user_data == MHEAP_N_USER_DATA_INVALID)
-	break;
-
-      n = mheap_next_elt (e);
-
-      if (e->n_user_data != n->prev_n_user_data)
-	return e;
-
-      if (e->is_free != n->prev_is_free)
-	return e;
-
-      e = n;
-    }
-
-  return 0;
-}
-
-static u8 *
-format_mheap_stats (u8 * s, va_list * va)
-{
-  mheap_t *h = va_arg (*va, mheap_t *);
-  mheap_stats_t *st = &h->stats;
-  uword indent = format_get_indent (s);
-
-  s =
-    format (s,
-	    "alloc. from small object cache: %Ld hits %Ld attempts (%.2f%%) replacements %d",
-	    st->n_small_object_cache_hits, st->n_small_object_cache_attempts,
-	    (st->n_small_object_cache_attempts !=
-	     0 ? 100. * (f64) st->n_small_object_cache_hits /
-	     (f64) st->n_small_object_cache_attempts : 0.),
-	    h->small_object_cache.replacement_index);
-
-  s =
-    format (s,
-	    "\n%Ualloc. from free-list: %Ld attempts, %Ld hits (%.2f%%), %Ld considered (per-attempt %.2f)",
-	    format_white_space, indent, st->free_list.n_search_attempts,
-	    st->free_list.n_objects_found,
-	    (st->free_list.n_search_attempts !=
-	     0 ? 100. * (f64) st->free_list.n_objects_found /
-	     (f64) st->free_list.n_search_attempts : 0.),
-	    st->free_list.n_objects_searched,
-	    (st->free_list.n_search_attempts !=
-	     0 ? (f64) st->free_list.n_objects_searched /
-	     (f64) st->free_list.n_search_attempts : 0.));
-
-  s = format (s, "\n%Ualloc. from vector-expand: %Ld",
-	      format_white_space, indent, st->n_vector_expands);
-
-  s = format (s, "\n%Uallocs: %Ld %.2f clocks/call",
-	      format_white_space, indent,
-	      st->n_gets, (f64) st->n_clocks_get / (f64) st->n_gets);
-
-  s = format (s, "\n%Ufrees: %Ld %.2f clocks/call",
-	      format_white_space, indent,
-	      st->n_puts, (f64) st->n_clocks_put / (f64) st->n_puts);
-
-  return s;
-}
-
-u8 *
-format_mheap (u8 * s, va_list * va)
-{
-  void *v = va_arg (*va, u8 *);
-  int verbose = va_arg (*va, int);
-
-  mheap_t *h;
-  uword i, size, indent;
-  clib_mem_usage_t usage;
-  mheap_elt_t *first_corrupt;
-
-  mheap_maybe_lock (v);
-
-  h = mheap_header (v);
-
-  mheap_usage_no_lock (v, &usage);
-
-  indent = format_get_indent (s);
-
-  s =
-    format (s,
-	    "%d objects, %U of %U used, %U free, %U reclaimed, %U overhead",
-	    usage.object_count, format_mheap_byte_count, usage.bytes_used,
-	    format_mheap_byte_count, usage.bytes_total,
-	    format_mheap_byte_count, usage.bytes_free,
-	    format_mheap_byte_count, usage.bytes_free_reclaimed,
-	    format_mheap_byte_count, usage.bytes_overhead);
-
-  if (usage.bytes_max != ~0)
-    s = format (s, ", %U capacity", format_mheap_byte_count, usage.bytes_max);
-
-  /* Show histogram of sizes. */
-  if (verbose > 1)
-    {
-      uword hist[MHEAP_N_BINS];
-      mheap_elt_t *e;
-      uword i, n_hist;
-
-      memset (hist, 0, sizeof (hist));
-
-      n_hist = 0;
-      for (e = v;
-	   e->n_user_data != MHEAP_N_USER_DATA_INVALID;
-	   e = mheap_next_elt (e))
-	{
-	  uword n_user_data_bytes = mheap_elt_data_bytes (e);
-	  uword bin = user_data_size_to_bin_index (n_user_data_bytes);
-	  if (!e->is_free)
-	    {
-	      hist[bin] += 1;
-	      n_hist += 1;
-	    }
-	}
-
-      s = format (s, "\n%U%=12s%=12s%=16s",
-		  format_white_space, indent + 2,
-		  "Size", "Count", "Fraction");
-
-      for (i = 0; i < ARRAY_LEN (hist); i++)
-	{
-	  if (hist[i] == 0)
-	    continue;
-	  s = format (s, "\n%U%12d%12wd%16.4f",
-		      format_white_space, indent + 2,
-		      MHEAP_MIN_USER_DATA_BYTES +
-		      i * MHEAP_USER_DATA_WORD_BYTES, hist[i],
-		      (f64) hist[i] / (f64) n_hist);
-	}
-    }
-
-  if (verbose)
-    s = format (s, "\n%U%U",
-		format_white_space, indent + 2, format_mheap_stats, h);
-
-  if ((h->flags & MHEAP_FLAG_TRACE) && vec_len (h->trace_main.traces) > 0)
-    {
-      /* Make a copy of traces since we'll be sorting them. */
-      mheap_trace_t *t, *traces_copy;
-      uword indent, total_objects_traced;
-
-      traces_copy = vec_dup (h->trace_main.traces);
-      qsort (traces_copy, vec_len (traces_copy), sizeof (traces_copy[0]),
-	     mheap_trace_sort);
-
-      total_objects_traced = 0;
-      s = format (s, "\n");
-      vec_foreach (t, traces_copy)
-      {
-	/* Skip over free elements. */
-	if (t->n_allocations == 0)
-	  continue;
-
-	total_objects_traced += t->n_allocations;
-
-	/* When not verbose only report allocations of more than 1k. */
-	if (!verbose && t->n_bytes < 1024)
-	  continue;
-
-	if (t == traces_copy)
-	  s = format (s, "%=9s%=9s %=10s Traceback\n", "Bytes", "Count",
-		      "Sample");
-	s = format (s, "%9d%9d %p", t->n_bytes, t->n_allocations,
-		    t->offset + v);
-	indent = format_get_indent (s);
-	for (i = 0; i < ARRAY_LEN (t->callers) && t->callers[i]; i++)
-	  {
-	    if (i > 0)
-	      s = format (s, "%U", format_white_space, indent);
-#ifdef CLIB_UNIX
-	    s =
-	      format (s, " %U\n", format_clib_elf_symbol_with_address,
-		      t->callers[i]);
-#else
-	    s = format (s, " %p\n", t->callers[i]);
-#endif
-	  }
-      }
-
-      s = format (s, "%d total traced objects\n", total_objects_traced);
-
-      vec_free (traces_copy);
-    }
-
-  first_corrupt = mheap_first_corrupt (v);
-  if (first_corrupt)
-    {
-      size = mheap_elt_data_bytes (first_corrupt);
-      s = format (s, "\n  first corrupt object: %p, size %wd\n  %U",
-		  first_corrupt, size, format_hex_bytes, first_corrupt, size);
-    }
-
-  /* FIXME.  This output could be wrong in the unlikely case that format
-     uses the same mheap as we are currently inspecting. */
-  if (verbose > 1)
-    {
-      mheap_elt_t *e;
-      uword i, o;
-
-      s = format (s, "\n");
-
-      e = mheap_elt_at_uoffset (v, 0);
-      i = 0;
-      while (1)
-	{
-	  if ((i % 8) == 0)
-	    s = format (s, "%8d: ", i);
-
-	  o = mheap_elt_uoffset (v, e);
-
-	  if (e->is_free)
-	    s = format (s, "(%8d) ", o);
-	  else
-	    s = format (s, " %8d  ", o);
-
-	  if ((i % 8) == 7 || (i + 1) >= h->n_elts)
-	    s = format (s, "\n");
-	}
-    }
-
-  mheap_maybe_unlock (v);
-
-  return s;
-}
-
-void
-dmh (void *v)
-{
-  fformat (stderr, "%U", format_mheap, v, 1);
-}
-
-static void
-mheap_validate_breakpoint ()
-{
-  os_panic ();
-}
-
-void
-mheap_validate (void *v)
-{
-  mheap_t *h = mheap_header (v);
-  uword i, s;
-
-  uword elt_count, elt_size;
-  uword free_count_from_free_lists, free_size_from_free_lists;
-  uword small_elt_free_count, small_elt_free_size;
-
-#define CHECK(x) if (! (x)) { mheap_validate_breakpoint (); os_panic (); }
-
-  if (vec_len (v) == 0)
-    return;
-
-  mheap_maybe_lock (v);
-
-  /* Validate number of elements and size. */
-  free_size_from_free_lists = free_count_from_free_lists = 0;
-  for (i = 0; i < ARRAY_LEN (h->first_free_elt_uoffset_by_bin); i++)
-    {
-      mheap_elt_t *e, *n;
-      uword is_first;
-
-      CHECK ((h->first_free_elt_uoffset_by_bin[i] != MHEAP_GROUNDED)
-	     ==
-	     ((h->non_empty_free_elt_heads[i /
-					   BITS (uword)] & ((uword) 1 <<
-							    (uword) (i %
-								     BITS
-								     (uword))))
-	      != 0));
-
-      if (h->first_free_elt_uoffset_by_bin[i] == MHEAP_GROUNDED)
-	continue;
-
-      e = mheap_elt_at_uoffset (v, h->first_free_elt_uoffset_by_bin[i]);
-      is_first = 1;
-      while (1)
-	{
-	  uword s;
-
-	  n = mheap_next_elt (e);
-
-	  /* Object must be marked free. */
-	  CHECK (e->is_free);
-
-	  /* Next object's previous free bit must also be set. */
-	  CHECK (n->prev_is_free);
-
-	  if (is_first)
-	    CHECK (e->free_elt.prev_uoffset == MHEAP_GROUNDED);
-	  is_first = 0;
-
-	  s = mheap_elt_data_bytes (e);
-	  CHECK (user_data_size_to_bin_index (s) == i);
-
-	  free_count_from_free_lists += 1;
-	  free_size_from_free_lists += s;
-
-	  if (e->free_elt.next_uoffset == MHEAP_GROUNDED)
-	    break;
-
-	  n = mheap_elt_at_uoffset (v, e->free_elt.next_uoffset);
-
-	  /* Check free element linkages. */
-	  CHECK (n->free_elt.prev_uoffset == mheap_elt_uoffset (v, e));
-
-	  e = n;
-	}
-    }
-
-  /* Go through small object cache. */
-  small_elt_free_count = small_elt_free_size = 0;
-  for (i = 0; i < ARRAY_LEN (h->small_object_cache.bins.as_u8); i++)
-    {
-      if (h->small_object_cache.bins.as_u8[i] != 0)
-	{
-	  mheap_elt_t *e;
-	  uword b = h->small_object_cache.bins.as_u8[i] - 1;
-	  uword o = h->small_object_cache.offsets[i];
-	  uword s;
-
-	  e = mheap_elt_at_uoffset (v, o);
-
-	  /* Object must be allocated. */
-	  CHECK (!e->is_free);
-
-	  s = mheap_elt_data_bytes (e);
-	  CHECK (user_data_size_to_bin_index (s) == b);
-
-	  small_elt_free_count += 1;
-	  small_elt_free_size += s;
-	}
-    }
-
-  {
-    mheap_elt_t *e, *n;
-    uword elt_free_size, elt_free_count;
-
-    elt_count = elt_size = elt_free_size = elt_free_count = 0;
-    for (e = v; e->n_user_data != MHEAP_N_USER_DATA_INVALID; e = n)
-      {
-	if (e->prev_n_user_data != MHEAP_N_USER_DATA_INVALID)
-	  CHECK (e->prev_n_user_data * sizeof (e->user_data[0]) >=
-		 MHEAP_MIN_USER_DATA_BYTES);
-
-	CHECK (e->n_user_data * sizeof (e->user_data[0]) >=
-	       MHEAP_MIN_USER_DATA_BYTES);
-
-	n = mheap_next_elt (e);
-
-	CHECK (e->is_free == n->prev_is_free);
-
-	elt_count++;
-	s = mheap_elt_data_bytes (e);
-	elt_size += s;
-
-	if (e->is_free)
-	  {
-	    elt_free_count++;
-	    elt_free_size += s;
-	  }
-
-	/* Consecutive free objects should have been combined. */
-	CHECK (!(e->prev_is_free && n->prev_is_free));
-      }
-
-    CHECK (free_count_from_free_lists == elt_free_count);
-    CHECK (free_size_from_free_lists == elt_free_size);
-    CHECK (elt_count == h->n_elts + elt_free_count + small_elt_free_count);
-    CHECK (elt_size + (elt_count + 1) * MHEAP_ELT_OVERHEAD_BYTES ==
-	   vec_len (v));
-  }
-
-  {
-    mheap_elt_t *e, *n;
-
-    for (e = v; e->n_user_data == MHEAP_N_USER_DATA_INVALID; e = n)
-      {
-	n = mheap_next_elt (e);
-	CHECK (e->n_user_data == n->prev_n_user_data);
-      }
-  }
-
-#undef CHECK
-
-  mheap_maybe_unlock (v);
-
-  h->validate_serial += 1;
-}
-
-static void
-mheap_get_trace (void *v, uword offset, uword size)
-{
-  mheap_t *h;
-  mheap_trace_main_t *tm;
-  mheap_trace_t *t;
-  uword i, n_callers, trace_index, *p;
-  mheap_trace_t trace;
-
-  /* Spurious Coverity warnings be gone. */
-  memset (&trace, 0, sizeof (trace));
-
-  n_callers = clib_backtrace (trace.callers, ARRAY_LEN (trace.callers),
-			      /* Skip mheap_get_aligned's frame */ 1);
-  if (n_callers == 0)
-    return;
-
-  for (i = n_callers; i < ARRAY_LEN (trace.callers); i++)
-    trace.callers[i] = 0;
-
-  h = mheap_header (v);
-  tm = &h->trace_main;
-
-  if (!tm->trace_by_callers)
-    tm->trace_by_callers =
-      hash_create_mem (0, sizeof (trace.callers), sizeof (uword));
-
-  p = hash_get_mem (tm->trace_by_callers, &trace.callers);
-  if (p)
-    {
-      trace_index = p[0];
-      t = tm->traces + trace_index;
-    }
-  else
-    {
-      i = vec_len (tm->trace_free_list);
-      if (i > 0)
-	{
-	  trace_index = tm->trace_free_list[i - 1];
-	  _vec_len (tm->trace_free_list) = i - 1;
-	}
-      else
-	{
-	  mheap_trace_t *old_start = tm->traces;
-	  mheap_trace_t *old_end = vec_end (tm->traces);
-
-	  vec_add2 (tm->traces, t, 1);
-
-	  if (tm->traces != old_start)
-	    {
-	      hash_pair_t *p;
-	      mheap_trace_t *q;
-            /* *INDENT-OFF* */
-	    hash_foreach_pair (p, tm->trace_by_callers,
-            ({
-              q = uword_to_pointer (p->key, mheap_trace_t *);
-              ASSERT (q >= old_start && q < old_end);
-	      p->key = pointer_to_uword (tm->traces + (q - old_start));
-	    }));
-            /* *INDENT-ON* */
-	    }
-	  trace_index = t - tm->traces;
-	}
-
-      t = tm->traces + trace_index;
-      t[0] = trace;
-      t->n_allocations = 0;
-      t->n_bytes = 0;
-      hash_set_mem (tm->trace_by_callers, t->callers, trace_index);
-    }
-
-  t->n_allocations += 1;
-  t->n_bytes += size;
-  t->offset = offset;		/* keep a sample to autopsy */
-  hash_set (tm->trace_index_by_offset, offset, t - tm->traces);
-}
-
-static void
-mheap_put_trace (void *v, uword offset, uword size)
-{
-  mheap_t *h;
-  mheap_trace_main_t *tm;
-  mheap_trace_t *t;
-  uword trace_index, *p;
-
-  h = mheap_header (v);
-  tm = &h->trace_main;
-  p = hash_get (tm->trace_index_by_offset, offset);
-  if (!p)
-    return;
-
-  trace_index = p[0];
-  hash_unset (tm->trace_index_by_offset, offset);
-  ASSERT (trace_index < vec_len (tm->traces));
-
-  t = tm->traces + trace_index;
-  ASSERT (t->n_allocations > 0);
-  ASSERT (t->n_bytes >= size);
-  t->n_allocations -= 1;
-  t->n_bytes -= size;
-  if (t->n_allocations == 0)
-    {
-      hash_unset_mem (tm->trace_by_callers, t->callers);
-      vec_add1 (tm->trace_free_list, trace_index);
-      memset (t, 0, sizeof (t[0]));
-    }
-}
-
-static int
-mheap_trace_sort (const void *_t1, const void *_t2)
-{
-  const mheap_trace_t *t1 = _t1;
-  const mheap_trace_t *t2 = _t2;
-  word cmp;
-
-  cmp = (word) t2->n_bytes - (word) t1->n_bytes;
-  if (!cmp)
-    cmp = (word) t2->n_allocations - (word) t1->n_allocations;
-  return cmp;
-}
-
-always_inline void
-mheap_trace_main_free (mheap_trace_main_t * tm)
-{
-  vec_free (tm->traces);
-  vec_free (tm->trace_free_list);
-  hash_free (tm->trace_by_callers);
-  hash_free (tm->trace_index_by_offset);
-}
-
-void
-mheap_trace (void *v, int enable)
-{
-  mheap_t *h;
-
-  h = mheap_header (v);
-
-  if (enable)
-    {
-      h->flags |= MHEAP_FLAG_TRACE;
-    }
-  else
-    {
-      mheap_trace_main_free (&h->trace_main);
-      h->flags &= ~MHEAP_FLAG_TRACE;
-    }
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/mheap.h b/vppinfra/vppinfra/mheap.h
deleted file mode 100644
index 5b7cdfba..00000000
--- a/vppinfra/vppinfra/mheap.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_mheap_h
-#define included_mheap_h
-
-#include <vppinfra/vec.h>
-#include <vppinfra/error.h>	/* clib_error_t */
-#include <vppinfra/mem.h>	/* clib_mem_usage_t */
-#include <vppinfra/format.h>	/* for unformat_input_t */
-
-/* Allocate size bytes.  New heap and offset are returned.
-   offset == ~0 means allocation failed. */
-always_inline void *
-mheap_get (void *v, uword size, uword * offset_return)
-{
-  return mheap_get_aligned (v, size, 0, 0, offset_return);
-}
-
-/* Create allocation heap of given size.
- * The actual usable size is smaller than the requested size.
- * memory_bytes must be greater than mheap_page_size + sizeof (mheap_t) + 16.
- * Otherwise, allocation may fail and return 0.
- */
-void *mheap_alloc (void *memory, uword memory_bytes);
-void *mheap_alloc_with_flags (void *memory, uword memory_bytes, uword flags);
-
-#define mheap_free(v) (v) = _mheap_free(v)
-void *_mheap_free (void *v);
-
-void mheap_foreach (void *v,
-		    uword (*func) (void *arg, void *v, void *elt_data,
-				   uword elt_size), void *arg);
-
-/* Format mheap data structures as string. */
-u8 *format_mheap (u8 * s, va_list * va);
-
-/* Validate internal consistency. */
-void mheap_validate (void *h);
-
-/* Query bytes used. */
-uword mheap_bytes (void *v);
-
-void mheap_usage (void *v, clib_mem_usage_t * usage);
-
-/* Enable disable traceing. */
-void mheap_trace (void *v, int enable);
-
-/* Test routine. */
-int test_mheap_main (unformat_input_t * input);
-
-#endif /* included_mheap_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/mheap_bootstrap.h b/vppinfra/vppinfra/mheap_bootstrap.h
deleted file mode 100644
index 4b21051b..00000000
--- a/vppinfra/vppinfra/mheap_bootstrap.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_mem_mheap_h
-#define included_mem_mheap_h
-
-/* Bootstrap include so that #include <vppinfra/mem.h> can include e.g.
-   <vppinfra/mheap.h> which depends on <vppinfra/vec.h>. */
-
-#include <vppinfra/vec_bootstrap.h>
-#include <vppinfra/error_bootstrap.h>
-#include <vppinfra/os.h>
-#include <vppinfra/vector.h>
-
-/* Each element in heap is immediately followed by this struct. */
-typedef struct
-{
-  /* Number of mheap_size_t words of user data in previous object.
-     Used to find mheap_elt_t for previous object. */
-#if CLIB_VEC64 > 0
-  u64 prev_n_user_data:63;
-
-  /* Used to mark end/start of of doubly-linked list of mheap_elt_t's. */
-#define MHEAP_N_USER_DATA_INVALID (0x7fffffffffffffffULL)
-#define MHEAP_GROUNDED (~0ULL)
-
-  /* Set if previous object is free. */
-  u64 prev_is_free:1;
-
-  /* Number of mheap_size_t words of user data that follow this object. */
-  u64 n_user_data:63;
-
-  /* Set if this object is on free list (and therefore following free_elt
-     is valid). */
-  u64 is_free:1;
-
-#else
-  u32 prev_n_user_data:31;
-
-  /* Used to mark end/start of of doubly-linked list of mheap_elt_t's. */
-#define MHEAP_N_USER_DATA_INVALID (0x7fffffff)
-#define MHEAP_GROUNDED (~0)
-
-  /* Set if previous object is free. */
-  u32 prev_is_free:1;
-
-  /* Number of mheap_size_t words of user data that follow this object. */
-  u32 n_user_data:31;
-
-  /* Set if this object is on free list (and therefore following free_elt
-     is valid). */
-  u32 is_free:1;
-#endif
-
-  union
-  {
-#if CLIB_VEC64 > 0
-    /* For allocated objects: user data follows.
-       User data is allocated in units of typeof (user_data[0]). */
-    u64 user_data[0];
-
-    /* For free objects, offsets of next and previous free objects of this size;
-       ~0 means end of doubly-linked list.
-       This is stored in user data (guaranteed to be at least 8 bytes)
-       but only for *free* objects. */
-    struct
-    {
-      u64 next_uoffset, prev_uoffset;
-    } free_elt;
-#else
-    /* For allocated objects: user data follows.
-       User data is allocated in units of typeof (user_data[0]). */
-    u32 user_data[0];
-
-    /* For free objects, offsets of next and previous free objects of this size;
-       ~0 means end of doubly-linked list.
-       This is stored in user data (guaranteed to be at least 8 bytes)
-       but only for *free* objects. */
-    struct
-    {
-      u32 next_uoffset, prev_uoffset;
-    } free_elt;
-#endif
-  };
-} mheap_elt_t;
-
-/* Number of bytes of "overhead": e.g. not user data. */
-#define MHEAP_ELT_OVERHEAD_BYTES (sizeof (mheap_elt_t) - STRUCT_OFFSET_OF (mheap_elt_t, user_data))
-
-/* User objects must be large enough to hold 2 x u32 free offsets in free elt. */
-#define MHEAP_MIN_USER_DATA_BYTES MHEAP_ELT_OVERHEAD_BYTES
-
-/* Number of byte in user data "words". */
-#define MHEAP_USER_DATA_WORD_BYTES STRUCT_SIZE_OF (mheap_elt_t, user_data[0])
-
-typedef struct
-{
-  /* Address of callers: outer first, inner last. */
-  uword callers[12];
-
-  /* Count of allocations with this traceback. */
-#if CLIB_VEC64 > 0
-  u64 n_allocations;
-#else
-  u32 n_allocations;
-#endif
-
-  /* Count of bytes allocated with this traceback. */
-  u32 n_bytes;
-
-  /* Offset of this item */
-  uword offset;
-} mheap_trace_t;
-
-typedef struct
-{
-  mheap_trace_t *traces;
-
-  /* Indices of free traces. */
-  u32 *trace_free_list;
-
-  /* Hash table mapping callers to trace index. */
-  uword *trace_by_callers;
-
-  /* Hash table mapping mheap offset to trace index. */
-  uword *trace_index_by_offset;
-} mheap_trace_main_t;
-
-  /* Small object bin i is for objects with
-     user_size >  sizeof (mheap_elt_t) + sizeof (mheap_elt_t) * (i - 1)
-     user_size <= sizeof (mheap_elt_t) + sizeof (mheap_size_t) * i. */
-#define MHEAP_LOG2_N_SMALL_OBJECT_BINS 8
-#define MHEAP_N_SMALL_OBJECT_BINS (1 << MHEAP_LOG2_N_SMALL_OBJECT_BINS)
-
-#define MHEAP_N_BINS							\
-  (MHEAP_N_SMALL_OBJECT_BINS						\
-   + (STRUCT_BITS_OF (mheap_elt_t, user_data[0]) - MHEAP_LOG2_N_SMALL_OBJECT_BINS))
-
-typedef struct
-{
-  struct
-  {
-    u64 n_search_attempts;
-    u64 n_objects_searched;
-    u64 n_objects_found;
-  } free_list;
-
-  u64 n_vector_expands;
-
-  u64 n_small_object_cache_hits;
-  u64 n_small_object_cache_attempts;
-
-  u64 n_gets, n_puts;
-  u64 n_clocks_get, n_clocks_put;
-} mheap_stats_t;
-
-/* Without vector instructions don't bother with small object cache. */
-#ifdef CLIB_HAVE_VEC128
-#define MHEAP_HAVE_SMALL_OBJECT_CACHE 1
-#else
-#define MHEAP_HAVE_SMALL_OBJECT_CACHE 0
-#endif
-
-#if CLIB_VEC64 > 0
-#undef MHEAP_HAVE_SMALL_OBJECT_CACHE
-#define MHEAP_HAVE_SMALL_OBJECT_CACHE 0
-#endif
-
-/* For objects with align == 4 and align_offset == 0 (e.g. vector strings). */
-typedef struct
-{
-  union
-  {
-#ifdef CLIB_HAVE_VEC128
-    u8x16 as_u8x16[BITS (uword) / 16];
-#endif
-
-    /* Store bin + 1; zero means unused. */
-    u8 as_u8[BITS (uword)];
-  } bins;
-
-  uword offsets[BITS (uword)];
-
-  u32 replacement_index;
-} mheap_small_object_cache_t;
-
-/* Vec header for heaps. */
-typedef struct
-{
-  /* User offsets for head of doubly-linked list of free objects of this size. */
-#if CLIB_VEC64 > 0
-  u64 first_free_elt_uoffset_by_bin[MHEAP_N_BINS];
-#else
-  u32 first_free_elt_uoffset_by_bin[MHEAP_N_BINS];
-#endif
-
-  /* Bitmap of non-empty free list bins. */
-  uword non_empty_free_elt_heads[(MHEAP_N_BINS + BITS (uword) - 1) /
-				 BITS (uword)];
-
-  mheap_small_object_cache_t small_object_cache;
-
-  u32 flags;
-#define MHEAP_FLAG_TRACE			(1 << 0)
-#define MHEAP_FLAG_DISABLE_VM			(1 << 1)
-#define MHEAP_FLAG_THREAD_SAFE			(1 << 2)
-#define MHEAP_FLAG_SMALL_OBJECT_CACHE		(1 << 3)
-#define MHEAP_FLAG_VALIDATE			(1 << 4)
-
-  /* Lock use when MHEAP_FLAG_THREAD_SAFE is set. */
-  volatile u32 lock;
-  volatile u32 owner_cpu;
-  int recursion_count;
-
-  /* Number of allocated objects. */
-  u64 n_elts;
-
-  /* Maximum size (in bytes) this heap is allowed to grow to.
-     Set to ~0 to grow heap (via vec_resize) arbitrarily. */
-  u64 max_size;
-
-  uword vm_alloc_offset_from_header;
-  uword vm_alloc_size;
-
-  /* Each successful mheap_validate call increments this serial number.
-     Used to debug heap corruption problems.  GDB breakpoints can be
-     made conditional on validate_serial. */
-  u64 validate_serial;
-
-  mheap_trace_main_t trace_main;
-
-  mheap_stats_t stats;
-} mheap_t;
-
-always_inline mheap_t *
-mheap_header (u8 * v)
-{
-  return vec_aligned_header (v, sizeof (mheap_t), 16);
-}
-
-always_inline u8 *
-mheap_vector (mheap_t * h)
-{
-  return vec_aligned_header_end (h, sizeof (mheap_t), 16);
-}
-
-always_inline uword
-mheap_elt_uoffset (void *v, mheap_elt_t * e)
-{
-  return (uword) e->user_data - (uword) v;
-}
-
-always_inline mheap_elt_t *
-mheap_user_pointer_to_elt (void *v)
-{
-  return v - STRUCT_OFFSET_OF (mheap_elt_t, user_data);
-}
-
-/* For debugging we keep track of offsets for valid objects.
-   We make sure user is not trying to free object with invalid offset. */
-always_inline uword
-mheap_offset_is_valid (void *v, uword uo)
-{
-  return uo >= MHEAP_ELT_OVERHEAD_BYTES && uo <= vec_len (v);
-}
-
-always_inline mheap_elt_t *
-mheap_elt_at_uoffset (void *v, uword uo)
-{
-  ASSERT (mheap_offset_is_valid (v, uo));
-  return (mheap_elt_t *) (v + uo - STRUCT_OFFSET_OF (mheap_elt_t, user_data));
-}
-
-always_inline void *
-mheap_elt_data (void *v, mheap_elt_t * e)
-{
-  return v + mheap_elt_uoffset (v, e);
-}
-
-always_inline uword
-mheap_elt_data_bytes (mheap_elt_t * e)
-{
-  return e->n_user_data * sizeof (e->user_data[0]);
-}
-
-always_inline uword
-mheap_data_bytes (void *v, uword uo)
-{
-  mheap_elt_t *e = mheap_elt_at_uoffset (v, uo);
-  return mheap_elt_data_bytes (e);
-}
-
-#define mheap_len(v,d) (mheap_data_bytes((v),(void *) (d) - (void *) (v)) / sizeof ((d)[0]))
-
-always_inline mheap_elt_t *
-mheap_next_elt (mheap_elt_t * e)
-{
-  ASSERT (e->n_user_data < MHEAP_N_USER_DATA_INVALID);
-  return (mheap_elt_t *) (e->user_data + e->n_user_data);
-}
-
-always_inline mheap_elt_t *
-mheap_prev_elt (mheap_elt_t * e)
-{
-  ASSERT (e->prev_n_user_data < MHEAP_N_USER_DATA_INVALID);
-  return ((void *) e
-	  - e->prev_n_user_data * sizeof (e->user_data[0])
-	  - MHEAP_ELT_OVERHEAD_BYTES);
-}
-
-/* Exported operations. */
-
-always_inline uword
-mheap_elts (void *v)
-{
-  return v ? mheap_header (v)->n_elts : 0;
-}
-
-always_inline uword
-mheap_max_size (void *v)
-{
-  return v ? mheap_header (v)->max_size : ~0;
-}
-
-/* Free previously allocated offset. */
-void mheap_put (void *v, uword offset);
-
-/* Allocate object from mheap. */
-void *mheap_get_aligned (void *v, uword size, uword align, uword align_offset,
-			 uword * offset_return);
-
-#endif /* included_mem_mheap_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/mod_test_hash.c b/vppinfra/vppinfra/mod_test_hash.c
deleted file mode 100644
index b3fa676d..00000000
--- a/vppinfra/vppinfra/mod_test_hash.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vppinfra/linux_kernel_init.h>
-#include <vppinfra/hash.h>
-
-CLIB_LINUX_KERNEL_MODULE ("test_hash", test_hash_main,
-			  /* kernel-thread flags */ 0 & CLONE_KERNEL);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/os.h b/vppinfra/vppinfra/os.h
deleted file mode 100644
index a5c74f8c..00000000
--- a/vppinfra/vppinfra/os.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001-2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_os_h
-#define included_os_h
-
-#include <vppinfra/clib.h>
-#include <vppinfra/types.h>
-
-/* External panic function. */
-void os_panic (void);
-
-/* External exit function analagous to unix exit. */
-void os_exit (int code);
-
-/* External function to print a line. */
-void os_puts (u8 * string, uword length, uword is_error);
-
-/* External function to handle out of memory. */
-void os_out_of_memory (void);
-
-/* Estimate, measure or divine CPU timestamp clock frequency. */
-f64 os_cpu_clock_frequency (void);
-
-uword os_get_cpu_number (void);
-uword os_get_ncpus (void);
-
-#include <vppinfra/smp.h>
-
-#endif /* included_os_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/pfhash.c b/vppinfra/vppinfra/pfhash.c
deleted file mode 100644
index 3b9fa8f3..00000000
--- a/vppinfra/vppinfra/pfhash.c
+++ /dev/null
@@ -1,689 +0,0 @@
-/*
-  Copyright (c) 2013 Cisco and/or its affiliates.
-
-  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#include <vppinfra/pfhash.h>
-#include <vppinfra/format.h>
-
-/* This is incredibly handy when debugging */
-u32 vl (void *v) __attribute__ ((weak));
-u32
-vl (void *v)
-{
-  return vec_len (v);
-}
-
-#if defined(CLIB_HAVE_VEC128) && ! defined (__ALTIVEC__)
-
-typedef struct
-{
-  u8 *key[16];
-  u64 value;
-} pfhash_show_t;
-
-static int
-sh_compare (pfhash_show_t * sh0, pfhash_show_t * sh1)
-{
-  return ((i32) (sh0->value) - ((i32) sh1->value));
-}
-
-u8 *
-format_pfhash (u8 * s, va_list * args)
-{
-  pfhash_t *p = va_arg (*args, pfhash_t *);
-  int verbose = va_arg (*args, int);
-
-  if (p == 0 || p->overflow_hash == 0 || p->buckets == 0)
-    {
-      s = format (s, "*** uninitialized ***");
-      return s;
-    }
-
-  s = format (s, "Prefetch hash '%s'\n", p->name);
-  s =
-    format (s, " %d buckets, %u bucket overflows, %.1f%% bucket overflow \n",
-	    vec_len (p->buckets), p->overflow_count,
-	    100.0 * ((f64) p->overflow_count) / ((f64) vec_len (p->buckets)));
-  if (p->nitems)
-    s =
-      format (s,
-	      "  %u items, %u items in overflow, %.1f%% items in overflow\n",
-	      p->nitems, p->nitems_in_overflow,
-	      100.0 * ((f64) p->nitems_in_overflow) / ((f64) p->nitems));
-
-  if (verbose)
-    {
-      pfhash_show_t *shs = 0, *sh;
-      hash_pair_t *hp;
-      int i, j;
-
-      for (i = 0; i < vec_len (p->buckets); i++)
-	{
-	  pfhash_kv_t *kv;
-	  pfhash_kv_16_t *kv16;
-	  pfhash_kv_8_t *kv8;
-	  pfhash_kv_8v8_t *kv8v8;
-	  pfhash_kv_4_t *kv4;
-
-	  if (p->buckets[i] == 0 || p->buckets[i] == PFHASH_BUCKET_OVERFLOW)
-	    continue;
-
-	  kv = pool_elt_at_index (p->kvp, p->buckets[i]);
-
-	  switch (p->key_size)
-	    {
-	    case 16:
-	      kv16 = &kv->kv16;
-	      for (j = 0; j < 3; j++)
-		{
-		  if (kv16->values[j] != (u32) ~ 0)
-		    {
-		      vec_add2 (shs, sh, 1);
-		      clib_memcpy (sh->key, &kv16->kb.k_u32x4[j],
-				   p->key_size);
-		      sh->value = kv16->values[j];
-		    }
-		}
-	      break;
-	    case 8:
-	      if (p->value_size == 4)
-		{
-		  kv8 = &kv->kv8;
-		  for (j = 0; j < 5; j++)
-		    {
-		      if (kv8->values[j] != (u32) ~ 0)
-			{
-			  vec_add2 (shs, sh, 1);
-			  clib_memcpy (sh->key, &kv8->kb.k_u64[j],
-				       p->key_size);
-			  sh->value = kv8->values[j];
-			}
-		    }
-		}
-	      else
-		{
-		  kv8v8 = &kv->kv8v8;
-		  for (j = 0; j < 4; j++)
-		    {
-		      if (kv8v8->values[j] != (u64) ~ 0)
-			{
-			  vec_add2 (shs, sh, 1);
-			  clib_memcpy (sh->key, &kv8v8->kb.k_u64[j],
-				       p->key_size);
-			  sh->value = kv8v8->values[j];
-			}
-		    }
-
-		}
-	      break;
-	    case 4:
-	      kv4 = &kv->kv4;
-	      for (j = 0; j < 8; j++)
-		{
-		  if (kv4->values[j] != (u32) ~ 0)
-		    {
-		      vec_add2 (shs, sh, 1);
-		      clib_memcpy (sh->key, &kv4->kb.kb[j], p->key_size);
-		      sh->value = kv4->values[j];
-		    }
-		}
-	      break;
-	    }
-	}
-
-      /* *INDENT-OFF* */
-      hash_foreach_pair (hp, p->overflow_hash,
-      ({
-        vec_add2 (shs, sh, 1);
-        clib_memcpy (sh->key, (u8 *)hp->key, p->key_size);
-        sh->value = hp->value[0];
-      }));
-      /* *INDENT-ON* */
-
-      vec_sort_with_function (shs, sh_compare);
-
-      for (i = 0; i < vec_len (shs); i++)
-	{
-	  sh = vec_elt_at_index (shs, i);
-	  s = format (s, " %U value %u\n", format_hex_bytes, sh->key,
-		      p->key_size, sh->value);
-	}
-      vec_free (shs);
-    }
-  return s;
-}
-
-
-void abort (void);
-
-void
-pfhash_init (pfhash_t * p, char *name, u32 key_size, u32 value_size,
-	     u32 nbuckets)
-{
-  pfhash_kv_t *kv;
-  memset (p, 0, sizeof (*p));
-  u32 key_bytes;
-
-  switch (key_size)
-    {
-    case 4:
-      key_bytes = 4;
-      break;
-    case 8:
-      key_bytes = 8;
-      break;
-    case 16:
-      key_bytes = 16;
-      break;
-    default:
-      ASSERT (0);
-      abort ();
-    }
-
-  switch (value_size)
-    {
-    case 4:
-    case 8:
-      break;
-    default:
-      ASSERT (0);
-      abort ();
-    }
-
-
-  p->name = format (0, "%s", name);
-  vec_add1 (p->name, 0);
-  p->overflow_hash = hash_create_mem (0, key_bytes, sizeof (uword));
-
-  nbuckets = 1 << (max_log2 (nbuckets));
-
-  /* This sets the entire bucket array to zero */
-  vec_validate (p->buckets, nbuckets - 1);
-  p->key_size = key_size;
-  p->value_size = value_size;
-
-  /*
-   * Unset buckets implicitly point at the 0th pool elt.
-   * All search routines will return ~0 if they go there.
-   */
-  pool_get_aligned (p->kvp, kv, 16);
-  memset (kv, 0xff, sizeof (*kv));
-}
-
-static pfhash_kv_16_t *
-pfhash_get_kv_16 (pfhash_t * p, u32 bucket_contents,
-		  u32x4 * key, u32 * match_index)
-{
-  u32x4 diff[3];
-  u32 is_equal[3];
-  pfhash_kv_16_t *kv = 0;
-
-  *match_index = (u32) ~ 0;
-
-  kv = &p->kvp[bucket_contents].kv16;
-
-  diff[0] = u32x4_sub (kv->kb.k_u32x4[0], key[0]);
-  diff[1] = u32x4_sub (kv->kb.k_u32x4[1], key[0]);
-  diff[2] = u32x4_sub (kv->kb.k_u32x4[2], key[0]);
-
-  is_equal[0] = u32x4_zero_byte_mask (diff[0]) == 0xffff;
-  is_equal[1] = u32x4_zero_byte_mask (diff[1]) == 0xffff;
-  is_equal[2] = u32x4_zero_byte_mask (diff[2]) == 0xffff;
-
-  if (is_equal[0])
-    *match_index = 0;
-  if (is_equal[1])
-    *match_index = 1;
-  if (is_equal[2])
-    *match_index = 2;
-
-  return kv;
-}
-
-static pfhash_kv_8_t *
-pfhash_get_kv_8 (pfhash_t * p, u32 bucket_contents,
-		 u64 * key, u32 * match_index)
-{
-  pfhash_kv_8_t *kv;
-
-  *match_index = (u32) ~ 0;
-
-  kv = &p->kvp[bucket_contents].kv8;
-
-  if (kv->kb.k_u64[0] == key[0])
-    *match_index = 0;
-  if (kv->kb.k_u64[1] == key[0])
-    *match_index = 1;
-  if (kv->kb.k_u64[2] == key[0])
-    *match_index = 2;
-  if (kv->kb.k_u64[3] == key[0])
-    *match_index = 3;
-  if (kv->kb.k_u64[4] == key[0])
-    *match_index = 4;
-
-  return kv;
-}
-
-static pfhash_kv_8v8_t *
-pfhash_get_kv_8v8 (pfhash_t * p,
-		   u32 bucket_contents, u64 * key, u32 * match_index)
-{
-  pfhash_kv_8v8_t *kv;
-
-  *match_index = (u32) ~ 0;
-
-  kv = &p->kvp[bucket_contents].kv8v8;
-
-  if (kv->kb.k_u64[0] == key[0])
-    *match_index = 0;
-  if (kv->kb.k_u64[1] == key[0])
-    *match_index = 1;
-  if (kv->kb.k_u64[2] == key[0])
-    *match_index = 2;
-  if (kv->kb.k_u64[3] == key[0])
-    *match_index = 3;
-
-  return kv;
-}
-
-static pfhash_kv_4_t *
-pfhash_get_kv_4 (pfhash_t * p, u32 bucket_contents,
-		 u32 * key, u32 * match_index)
-{
-  u32x4 vector_key;
-  u32x4 is_equal[2];
-  u32 zbm[2], winner_index;
-  pfhash_kv_4_t *kv;
-
-  *match_index = (u32) ~ 0;
-
-  kv = &p->kvp[bucket_contents].kv4;
-
-  vector_key = u32x4_splat (key[0]);
-
-  is_equal[0] = u32x4_is_equal (kv->kb.k_u32x4[0], vector_key);
-  is_equal[1] = u32x4_is_equal (kv->kb.k_u32x4[1], vector_key);
-  zbm[0] = ~u32x4_zero_byte_mask (is_equal[0]) & 0xFFFF;
-  zbm[1] = ~u32x4_zero_byte_mask (is_equal[1]) & 0xFFFF;
-
-  if (PREDICT_FALSE ((zbm[0] == 0) && (zbm[1] == 0)))
-    return kv;
-
-  winner_index = min_log2 (zbm[0]) >> 2;
-  winner_index = zbm[1] ? (4 + (min_log2 (zbm[1]) >> 2)) : winner_index;
-
-  *match_index = winner_index;
-  return kv;
-}
-
-static pfhash_kv_t *
-pfhash_get_internal (pfhash_t * p, u32 bucket_contents,
-		     void *key, u32 * match_index)
-{
-  pfhash_kv_t *kv = 0;
-
-  switch (p->key_size)
-    {
-    case 16:
-      kv =
-	(pfhash_kv_t *) pfhash_get_kv_16 (p, bucket_contents, key,
-					  match_index);
-      break;
-    case 8:
-      if (p->value_size == 4)
-	kv = (pfhash_kv_t *) pfhash_get_kv_8 (p, bucket_contents,
-					      key, match_index);
-      else
-	kv = (pfhash_kv_t *) pfhash_get_kv_8v8 (p, bucket_contents,
-						key, match_index);
-      break;
-    case 4:
-      kv =
-	(pfhash_kv_t *) pfhash_get_kv_4 (p, bucket_contents, key,
-					 match_index);
-      break;
-    default:
-      ASSERT (0);
-    }
-  return kv;
-}
-
-u64
-pfhash_get (pfhash_t * p, u32 bucket, void *key)
-{
-  pfhash_kv_t *kv;
-  u32 match_index = ~0;
-  pfhash_kv_16_t *kv16;
-  pfhash_kv_8_t *kv8;
-  pfhash_kv_8v8_t *kv8v8;
-  pfhash_kv_4_t *kv4;
-
-  u32 bucket_contents = pfhash_read_bucket_prefetch_kv (p, bucket);
-
-  if (bucket_contents == PFHASH_BUCKET_OVERFLOW)
-    {
-      uword *hp;
-
-      hp = hash_get_mem (p->overflow_hash, key);
-      if (hp)
-	return hp[0];
-      return (u64) ~ 0;
-    }
-
-  kv = pfhash_get_internal (p, bucket_contents, key, &match_index);
-  if (match_index == (u32) ~ 0)
-    return (u64) ~ 0;
-
-  kv16 = (void *) kv;
-  kv8 = (void *) kv;
-  kv4 = (void *) kv;
-  kv8v8 = (void *) kv;
-
-  switch (p->key_size)
-    {
-    case 16:
-      return (kv16->values[match_index] == (u32) ~ 0)
-	? (u64) ~ 0 : (u64) kv16->values[match_index];
-    case 8:
-      if (p->value_size == 4)
-	return (kv8->values[match_index] == (u32) ~ 0)
-	  ? (u64) ~ 0 : (u64) kv8->values[match_index];
-      else
-	return kv8v8->values[match_index];
-    case 4:
-      return (kv4->values[match_index] == (u32) ~ 0)
-	? (u64) ~ 0 : (u64) kv4->values[match_index];
-    default:
-      ASSERT (0);
-    }
-  return (u64) ~ 0;
-}
-
-void
-pfhash_set (pfhash_t * p, u32 bucket, void *key, void *value)
-{
-  u32 bucket_contents = pfhash_read_bucket_prefetch_kv (p, bucket);
-  u32 match_index = (u32) ~ 0;
-  pfhash_kv_t *kv;
-  pfhash_kv_16_t *kv16;
-  pfhash_kv_8_t *kv8;
-  pfhash_kv_8v8_t *kv8v8;
-  pfhash_kv_4_t *kv4;
-  int i;
-  u8 *kcopy;
-
-  if (bucket_contents == PFHASH_BUCKET_OVERFLOW)
-    {
-      hash_pair_t *hp;
-      hp = hash_get_pair_mem (p->overflow_hash, key);
-      if (hp)
-	{
-	  clib_warning ("replace value 0x%08x with value 0x%08x",
-			hp->value[0], (u64) value);
-	  hp->value[0] = (u64) value;
-	  return;
-	}
-      kcopy = clib_mem_alloc (p->key_size);
-      clib_memcpy (kcopy, key, p->key_size);
-      hash_set_mem (p->overflow_hash, kcopy, value);
-      p->nitems++;
-      p->nitems_in_overflow++;
-      return;
-    }
-
-  if (bucket_contents == 0)
-    {
-      pool_get_aligned (p->kvp, kv, 16);
-      memset (kv, 0xff, sizeof (*kv));
-      p->buckets[bucket] = kv - p->kvp;
-    }
-  else
-    kv = pfhash_get_internal (p, bucket_contents, key, &match_index);
-
-  kv16 = (void *) kv;
-  kv8 = (void *) kv;
-  kv8v8 = (void *) kv;
-  kv4 = (void *) kv;
-
-  p->nitems++;
-
-  if (match_index != (u32) ~ 0)
-    {
-      switch (p->key_size)
-	{
-	case 16:
-	  kv16->values[match_index] = (u32) (u64) value;
-	  return;
-
-	case 8:
-	  if (p->value_size == 4)
-	    kv8->values[match_index] = (u32) (u64) value;
-	  else
-	    kv8v8->values[match_index] = (u64) value;
-	  return;
-
-	case 4:
-	  kv4->values[match_index] = (u64) value;
-	  return;
-
-	default:
-	  ASSERT (0);
-	}
-    }
-
-  switch (p->key_size)
-    {
-    case 16:
-      for (i = 0; i < 3; i++)
-	{
-	  if (kv16->values[i] == (u32) ~ 0)
-	    {
-	      clib_memcpy (&kv16->kb.k_u32x4[i], key, p->key_size);
-	      kv16->values[i] = (u32) (u64) value;
-	      return;
-	    }
-	}
-      /* copy bucket contents to overflow hash tbl */
-      for (i = 0; i < 3; i++)
-	{
-	  kcopy = clib_mem_alloc (p->key_size);
-	  clib_memcpy (kcopy, &kv16->kb.k_u32x4[i], p->key_size);
-	  hash_set_mem (p->overflow_hash, kcopy, kv16->values[i]);
-	  p->nitems_in_overflow++;
-	}
-      /* Add new key to overflow */
-      kcopy = clib_mem_alloc (p->key_size);
-      clib_memcpy (kcopy, key, p->key_size);
-      hash_set_mem (p->overflow_hash, kcopy, value);
-      p->buckets[bucket] = PFHASH_BUCKET_OVERFLOW;
-      p->overflow_count++;
-      p->nitems_in_overflow++;
-      return;
-
-    case 8:
-      if (p->value_size == 4)
-	{
-	  for (i = 0; i < 5; i++)
-	    {
-	      if (kv8->values[i] == (u32) ~ 0)
-		{
-		  clib_memcpy (&kv8->kb.k_u64[i], key, 8);
-		  kv8->values[i] = (u32) (u64) value;
-		  return;
-		}
-	    }
-	  /* copy bucket contents to overflow hash tbl */
-	  for (i = 0; i < 5; i++)
-	    {
-	      kcopy = clib_mem_alloc (p->key_size);
-	      clib_memcpy (kcopy, &kv8->kb.k_u64[i], 8);
-	      hash_set_mem (p->overflow_hash, kcopy, kv8->values[i]);
-	      p->nitems_in_overflow++;
-	    }
-	}
-      else
-	{
-	  for (i = 0; i < 4; i++)
-	    {
-	      if (kv8v8->values[i] == (u64) ~ 0)
-		{
-		  clib_memcpy (&kv8v8->kb.k_u64[i], key, 8);
-		  kv8v8->values[i] = (u64) value;
-		  return;
-		}
-	    }
-	  /* copy bucket contents to overflow hash tbl */
-	  for (i = 0; i < 4; i++)
-	    {
-	      kcopy = clib_mem_alloc (p->key_size);
-	      clib_memcpy (kcopy, &kv8v8->kb.k_u64[i], 8);
-	      hash_set_mem (p->overflow_hash, kcopy, kv8v8->values[i]);
-	      p->nitems_in_overflow++;
-	    }
-
-	}
-      /* Add new key to overflow */
-      kcopy = clib_mem_alloc (p->key_size);
-      clib_memcpy (kcopy, key, p->key_size);
-      hash_set_mem (p->overflow_hash, kcopy, value);
-      p->buckets[bucket] = PFHASH_BUCKET_OVERFLOW;
-      p->overflow_count++;
-      p->nitems_in_overflow++;
-      return;
-
-    case 4:
-      for (i = 0; i < 8; i++)
-	{
-	  if (kv4->values[i] == (u32) ~ 0)
-	    {
-	      clib_memcpy (&kv4->kb.kb[i], key, 4);
-	      kv4->values[i] = (u32) (u64) value;
-	      return;
-	    }
-	}
-      /* copy bucket contents to overflow hash tbl */
-      for (i = 0; i < 8; i++)
-	{
-	  kcopy = clib_mem_alloc (p->key_size);
-	  clib_memcpy (kcopy, &kv4->kb.kb[i], 4);
-	  hash_set_mem (p->overflow_hash, kcopy, kv4->values[i]);
-	  p->nitems_in_overflow++;
-	}
-      /* Add new key to overflow */
-      kcopy = clib_mem_alloc (p->key_size);
-      clib_memcpy (kcopy, key, p->key_size);
-      hash_set_mem (p->overflow_hash, kcopy, value);
-      p->buckets[bucket] = PFHASH_BUCKET_OVERFLOW;
-      p->overflow_count++;
-      p->nitems_in_overflow++;
-      return;
-
-    default:
-      ASSERT (0);
-    }
-}
-
-void
-pfhash_unset (pfhash_t * p, u32 bucket, void *key)
-{
-  u32 bucket_contents = pfhash_read_bucket_prefetch_kv (p, bucket);
-  u32 match_index = (u32) ~ 0;
-  pfhash_kv_t *kv;
-  pfhash_kv_16_t *kv16;
-  pfhash_kv_8_t *kv8;
-  pfhash_kv_8v8_t *kv8v8;
-  pfhash_kv_4_t *kv4;
-  void *oldkey;
-
-  if (bucket_contents == PFHASH_BUCKET_OVERFLOW)
-    {
-      hash_pair_t *hp;
-      hp = hash_get_pair_mem (p->overflow_hash, key);
-      if (hp)
-	{
-	  oldkey = (void *) hp->key;
-	  hash_unset_mem (p->overflow_hash, key);
-	  clib_mem_free (oldkey);
-	  p->nitems--;
-	  p->nitems_in_overflow--;
-	}
-      return;
-    }
-
-  kv = pfhash_get_internal (p, bucket_contents, key, &match_index);
-  if (match_index == (u32) ~ 0)
-    return;
-
-  p->nitems--;
-
-  kv16 = (void *) kv;
-  kv8 = (void *) kv;
-  kv8v8 = (void *) kv;
-  kv4 = (void *) kv;
-
-  switch (p->key_size)
-    {
-    case 16:
-      kv16->values[match_index] = (u32) ~ 0;
-      return;
-
-    case 8:
-      if (p->value_size == 4)
-	kv8->values[match_index] = (u32) ~ 0;
-      else
-	kv8v8->values[match_index] = (u64) ~ 0;
-      return;
-
-    case 4:
-      kv4->values[match_index] = (u32) ~ 0;
-      return;
-
-    default:
-      ASSERT (0);
-    }
-}
-
-void
-pfhash_free (pfhash_t * p)
-{
-  hash_pair_t *hp;
-  int i;
-  u8 **keys = 0;
-
-  vec_free (p->name);
-
-  pool_free (p->kvp);
-
-  /* *INDENT-OFF* */
-  hash_foreach_pair (hp, p->overflow_hash,
-  ({
-    vec_add1 (keys, (u8 *)hp->key);
-  }));
-  /* *INDENT-ON* */
-  hash_free (p->overflow_hash);
-  for (i = 0; i < vec_len (keys); i++)
-    vec_free (keys[i]);
-  vec_free (keys);
-}
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/pfhash.h b/vppinfra/vppinfra/pfhash.h
deleted file mode 100644
index e054c668..00000000
--- a/vppinfra/vppinfra/pfhash.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
-  Copyright (c) 2013 Cisco and/or its affiliates.
-
-  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#ifndef included_clib_pfhash_h
-#define included_clib_pfhash_h
-
-
-#include <vppinfra/clib.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/pool.h>
-
-#if defined(CLIB_HAVE_VEC128) && ! defined (__ALTIVEC__)
-
-typedef struct
-{
-  /* 3 x 16 = 48 key bytes */
-  union
-  {
-    u32x4 k_u32x4[3];
-    u64 k_u64[6];
-  } kb;
-  /* 3 x 4 = 12 value bytes */
-  u32 values[3];
-  u32 pad;
-} pfhash_kv_16_t;
-
-typedef struct
-{
-  /* 5 x 8 = 40 key bytes */
-  union
-  {
-    u64 k_u64[5];
-  } kb;
-
-  /* 5 x 4 = 20 value bytes */
-  u32 values[5];
-  u32 pad;
-} pfhash_kv_8_t;
-
-typedef struct
-{
-  /* 4 x 8 = 32 key bytes */
-  union
-  {
-    u64 k_u64[4];
-  } kb;
-
-  /* 4 x 8 = 32 value bytes */
-  u64 values[4];
-} pfhash_kv_8v8_t;
-
-typedef struct
-{
-  /* 8 x 4 = 32 key bytes */
-  union
-  {
-    u32x4 k_u32x4[2];
-    u32 kb[8];
-  } kb;
-
-  /* 8 x 4 = 32 value bytes */
-  u32 values[8];
-} pfhash_kv_4_t;
-
-typedef union
-{
-  pfhash_kv_16_t kv16;
-  pfhash_kv_8_t kv8;
-  pfhash_kv_8v8_t kv8v8;
-  pfhash_kv_4_t kv4;
-} pfhash_kv_t;
-
-typedef struct
-{
-  /* Bucket vector */
-  u32 *buckets;
-#define PFHASH_BUCKET_OVERFLOW (u32)~0
-
-  /* Pool of key/value pairs */
-  pfhash_kv_t *kvp;
-
-  /* overflow plain-o-hash */
-  uword *overflow_hash;
-
-  /* Pretty-print name */
-  u8 *name;
-
-  u32 key_size;
-  u32 value_size;
-
-  u32 overflow_count;
-  u32 nitems;
-  u32 nitems_in_overflow;
-} pfhash_t;
-
-void pfhash_init (pfhash_t * p, char *name, u32 key_size, u32 value_size,
-		  u32 nbuckets);
-void pfhash_free (pfhash_t * p);
-u64 pfhash_get (pfhash_t * p, u32 bucket, void *key);
-void pfhash_set (pfhash_t * p, u32 bucket, void *key, void *value);
-void pfhash_unset (pfhash_t * p, u32 bucket, void *key);
-
-format_function_t format_pfhash;
-
-static inline void
-pfhash_prefetch_bucket (pfhash_t * p, u32 bucket)
-{
-  CLIB_PREFETCH (&p->buckets[bucket], CLIB_CACHE_LINE_BYTES, LOAD);
-}
-
-static inline u32
-pfhash_read_bucket_prefetch_kv (pfhash_t * p, u32 bucket)
-{
-  u32 bucket_contents = p->buckets[bucket];
-  if (PREDICT_TRUE ((bucket_contents & PFHASH_BUCKET_OVERFLOW) == 0))
-    CLIB_PREFETCH (&p->kvp[bucket_contents], CLIB_CACHE_LINE_BYTES, LOAD);
-  return bucket_contents;
-}
-
-/*
- * pfhash_search_kv_16
- * See if the supplied 16-byte key matches one of three 16-byte (key,value) pairs.
- * Return the indicated value, or ~0 if no match
- *
- * Note: including the overflow test, the fast path is 35 instrs
- * on x86_64. Elves will steal your keyboard in the middle of the night if
- * you "improve" it without checking the generated code!
- */
-static inline u32
-pfhash_search_kv_16 (pfhash_t * p, u32 bucket_contents, u32x4 * key)
-{
-  u32x4 diff0, diff1, diff2;
-  u32 is_equal0, is_equal1, is_equal2;
-  u32 no_match;
-  pfhash_kv_16_t *kv;
-  u32 rv;
-
-  if (PREDICT_FALSE (bucket_contents == PFHASH_BUCKET_OVERFLOW))
-    {
-      uword *hp;
-      hp = hash_get_mem (p->overflow_hash, key);
-      if (hp)
-	return hp[0];
-      return (u32) ~ 0;
-    }
-
-  kv = &p->kvp[bucket_contents].kv16;
-
-  diff0 = u32x4_sub (kv->kb.k_u32x4[0], key[0]);
-  diff1 = u32x4_sub (kv->kb.k_u32x4[1], key[0]);
-  diff2 = u32x4_sub (kv->kb.k_u32x4[2], key[0]);
-
-  no_match = is_equal0 = (i16) u32x4_zero_byte_mask (diff0);
-  is_equal1 = (i16) u32x4_zero_byte_mask (diff1);
-  no_match |= is_equal1;
-  is_equal2 = (i16) u32x4_zero_byte_mask (diff2);
-  no_match |= is_equal2;
-  /* If any of the three items matched, no_match will be zero after this line */
-  no_match = ~no_match;
-
-  rv = (is_equal0 & kv->values[0])
-    | (is_equal1 & kv->values[1]) | (is_equal2 & kv->values[2]) | no_match;
-
-  return rv;
-}
-
-static inline u32
-pfhash_search_kv_8 (pfhash_t * p, u32 bucket_contents, u64 * key)
-{
-  pfhash_kv_8_t *kv;
-  u32 rv = (u32) ~ 0;
-
-  if (PREDICT_FALSE (bucket_contents == PFHASH_BUCKET_OVERFLOW))
-    {
-      uword *hp;
-      hp = hash_get_mem (p->overflow_hash, key);
-      if (hp)
-	return hp[0];
-      return (u32) ~ 0;
-    }
-
-  kv = &p->kvp[bucket_contents].kv8;
-
-  rv = (kv->kb.k_u64[0] == key[0]) ? kv->values[0] : rv;
-  rv = (kv->kb.k_u64[1] == key[0]) ? kv->values[1] : rv;
-  rv = (kv->kb.k_u64[2] == key[0]) ? kv->values[2] : rv;
-  rv = (kv->kb.k_u64[3] == key[0]) ? kv->values[3] : rv;
-  rv = (kv->kb.k_u64[4] == key[0]) ? kv->values[4] : rv;
-
-  return rv;
-}
-
-static inline u64
-pfhash_search_kv_8v8 (pfhash_t * p, u32 bucket_contents, u64 * key)
-{
-  pfhash_kv_8v8_t *kv;
-  u64 rv = (u64) ~ 0;
-
-  if (PREDICT_FALSE (bucket_contents == PFHASH_BUCKET_OVERFLOW))
-    {
-      uword *hp;
-      hp = hash_get_mem (p->overflow_hash, key);
-      if (hp)
-	return hp[0];
-      return (u64) ~ 0;
-    }
-
-  kv = &p->kvp[bucket_contents].kv8v8;
-
-  rv = (kv->kb.k_u64[0] == key[0]) ? kv->values[0] : rv;
-  rv = (kv->kb.k_u64[1] == key[0]) ? kv->values[1] : rv;
-  rv = (kv->kb.k_u64[2] == key[0]) ? kv->values[2] : rv;
-  rv = (kv->kb.k_u64[3] == key[0]) ? kv->values[3] : rv;
-
-  return rv;
-}
-
-static inline u32
-pfhash_search_kv_4 (pfhash_t * p, u32 bucket_contents, u32 * key)
-{
-  u32x4 vector_key;
-  u32x4 is_equal[2];
-  u32 zbm[2], winner_index;
-  pfhash_kv_4_t *kv;
-
-  if (PREDICT_FALSE (bucket_contents == PFHASH_BUCKET_OVERFLOW))
-    {
-      uword *hp;
-      hp = hash_get_mem (p->overflow_hash, key);
-      if (hp)
-	return hp[0];
-      return (u32) ~ 0;
-    }
-
-  kv = &p->kvp[bucket_contents].kv4;
-
-  vector_key = u32x4_splat (key[0]);
-
-  is_equal[0] = u32x4_is_equal (kv->kb.k_u32x4[0], vector_key);
-  is_equal[1] = u32x4_is_equal (kv->kb.k_u32x4[1], vector_key);
-  zbm[0] = ~u32x4_zero_byte_mask (is_equal[0]) & 0xFFFF;
-  zbm[1] = ~u32x4_zero_byte_mask (is_equal[1]) & 0xFFFF;
-
-  if (PREDICT_FALSE ((zbm[0] == 0) && (zbm[1] == 0)))
-    return (u32) ~ 0;
-
-  winner_index = min_log2 (zbm[0]) >> 2;
-  winner_index = zbm[1] ? (4 + (min_log2 (zbm[1]) >> 2)) : winner_index;
-
-  return kv->values[winner_index];
-}
-
-#endif /* CLIB_HAVE_VEC128 */
-
-#endif /* included_clib_pfhash_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/phash.c b/vppinfra/vppinfra/phash.c
deleted file mode 100644
index 14da5225..00000000
--- a/vppinfra/vppinfra/phash.c
+++ /dev/null
@@ -1,1017 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-/* This is all stolen from Bob Jenkins and reworked for clib.  Thanks
-   once again Bob for the great work. */
-
-/*
-------------------------------------------------------------------------------
-perfect.c: code to generate code for a hash for perfect hashing.
-(c) Bob Jenkins, September 1996, December 1999
-You may use this code in any way you wish, and it is free.  No warranty.
-I hereby place this in the public domain.
-Source is http://burtleburtle.net/bob/c/perfect.c
-
-This generates a minimal perfect hash function.  That means, given a
-set of n keys, this determines a hash function that maps each of
-those keys into a value in 0..n-1 with no collisions.
-
-The perfect hash function first uses a normal hash function on the key
-to determine (a,b) such that the pair (a,b) is distinct for all
-keys, then it computes a^scramble[tab[b]] to get the final perfect hash.
-tab[] is an array of 1-byte values and scramble[] is a 256-term array of
-2-byte or 4-byte values.  If there are n keys, the length of tab[] is a
-power of two between n/3 and n.
-
-I found the idea of computing distinct (a,b) values in "Practical minimal
-perfect hash functions for large databases", Fox, Heath, Chen, and Daoud,
-Communications of the ACM, January 1992.  They found the idea in Chichelli
-(CACM Jan 1980).  Beyond that, our methods differ.
-
-The key is hashed to a pair (a,b) where a in 0..*alen*-1 and b in
-0..*blen*-1.  A fast hash function determines both a and b
-simultaneously.  Any decent hash function is likely to produce
-hashes so that (a,b) is distinct for all pairs.  I try the hash
-using different values of *salt* until all pairs are distinct.
-
-The final hash is (a XOR scramble[tab[b]]).  *scramble* is a
-predetermined mapping of 0..255 into 0..smax-1.  *tab* is an
-array that we fill in in such a way as to make the hash perfect.
-
-First we fill in all values of *tab* that are used by more than one
-key.  We try all possible values for each position until one works.
-
-This leaves m unmapped keys and m values that something could hash to.
-If you treat unmapped keys as lefthand nodes and unused hash values
-as righthand nodes, and draw a line connecting each key to each hash
-value it could map to, you get a bipartite graph.  We attempt to
-find a perfect matching in this graph.  If we succeed, we have
-determined a perfect hash for the whole set of keys.
-
-*scramble* is used because (a^tab[i]) clusters keys around *a*.
-------------------------------------------------------------------------------
-*/
-
-#include <vppinfra/bitmap.h>
-#include <vppinfra/format.h>
-#include <vppinfra/phash.h>
-#include <vppinfra/random.h>
-
-static void
-init_keys_direct_u32 (phash_main_t * pm)
-{
-  int n_keys_left, b_mask, a_shift;
-  u32 seed;
-  phash_key_t *k;
-
-  seed = pm->hash_seed;
-  b_mask = (1 << pm->b_bits) - 1;
-  a_shift = BITS (seed) - pm->a_bits;
-
-  k = pm->keys;
-  n_keys_left = vec_len (pm->keys);
-
-  while (n_keys_left >= 2)
-    {
-      u32 x0, y0, z0;
-      u32 x1, y1, z1;
-
-      x0 = y0 = z0 = seed;
-      x1 = y1 = z1 = seed;
-      x0 += (u32) k[0].key;
-      x1 += (u32) k[1].key;
-
-      hash_mix32 (x0, y0, z0);
-      hash_mix32 (x1, y1, z1);
-
-      k[0].b = z0 & b_mask;
-      k[1].b = z1 & b_mask;
-      k[0].a = z0 >> a_shift;
-      k[1].a = z1 >> a_shift;
-      if (PREDICT_FALSE (a_shift >= BITS (z0)))
-	k[0].a = k[1].a = 0;
-
-      k += 2;
-      n_keys_left -= 2;
-    }
-
-  if (n_keys_left >= 1)
-    {
-      u32 x0, y0, z0;
-
-      x0 = y0 = z0 = seed;
-      x0 += k[0].key;
-
-      hash_mix32 (x0, y0, z0);
-
-      k[0].b = z0 & b_mask;
-      k[0].a = z0 >> a_shift;
-      if (PREDICT_FALSE (a_shift >= BITS (z0)))
-	k[0].a = 0;
-
-      k += 1;
-      n_keys_left -= 1;
-    }
-}
-
-static void
-init_keys_direct_u64 (phash_main_t * pm)
-{
-  int n_keys_left, b_mask, a_shift;
-  u64 seed;
-  phash_key_t *k;
-
-  seed = pm->hash_seed;
-  b_mask = (1 << pm->b_bits) - 1;
-  a_shift = BITS (seed) - pm->a_bits;
-
-  k = pm->keys;
-  n_keys_left = vec_len (pm->keys);
-
-  while (n_keys_left >= 2)
-    {
-      u64 x0, y0, z0;
-      u64 x1, y1, z1;
-
-      x0 = y0 = z0 = seed;
-      x1 = y1 = z1 = seed;
-      x0 += (u64) k[0].key;
-      x1 += (u64) k[1].key;
-
-      hash_mix64 (x0, y0, z0);
-      hash_mix64 (x1, y1, z1);
-
-      k[0].b = z0 & b_mask;
-      k[1].b = z1 & b_mask;
-      k[0].a = z0 >> a_shift;
-      k[1].a = z1 >> a_shift;
-      if (PREDICT_FALSE (a_shift >= BITS (z0)))
-	k[0].a = k[1].a = 0;
-
-      k += 2;
-      n_keys_left -= 2;
-    }
-
-  if (n_keys_left >= 1)
-    {
-      u64 x0, y0, z0;
-
-      x0 = y0 = z0 = seed;
-      x0 += k[0].key;
-
-      hash_mix64 (x0, y0, z0);
-
-      k[0].b = z0 & b_mask;
-      k[0].a = z0 >> a_shift;
-      if (PREDICT_FALSE (a_shift >= BITS (z0)))
-	k[0].a = 0;
-
-      k += 1;
-      n_keys_left -= 1;
-    }
-}
-
-static void
-init_keys_indirect_u32 (phash_main_t * pm)
-{
-  int n_keys_left, b_mask, a_shift;
-  u32 seed;
-  phash_key_t *k;
-
-  seed = pm->hash_seed;
-  b_mask = (1 << pm->b_bits) - 1;
-  a_shift = BITS (seed) - pm->a_bits;
-
-  k = pm->keys;
-  n_keys_left = vec_len (pm->keys);
-
-  while (n_keys_left >= 2)
-    {
-      u32 xyz[6];
-      u32 x0, y0, z0;
-      u32 x1, y1, z1;
-
-      pm->key_seed2 (pm->private, k[0].key, k[1].key, &xyz);
-
-      x0 = y0 = z0 = seed;
-      x1 = y1 = z1 = seed;
-      x0 += xyz[0];
-      y0 += xyz[1];
-      z0 += xyz[2];
-      x1 += xyz[3];
-      y1 += xyz[4];
-      z1 += xyz[5];
-
-      hash_mix32 (x0, y0, z0);
-      hash_mix32 (x1, y1, z1);
-
-      k[0].b = z0 & b_mask;
-      k[1].b = z1 & b_mask;
-      k[0].a = z0 >> a_shift;
-      k[1].a = z1 >> a_shift;
-      if (PREDICT_FALSE (a_shift >= BITS (z0)))
-	k[0].a = k[1].a = 0;
-
-      k += 2;
-      n_keys_left -= 2;
-    }
-
-  if (n_keys_left >= 1)
-    {
-      u32 xyz[3];
-      u32 x0, y0, z0;
-
-      pm->key_seed1 (pm->private, k[0].key, &xyz);
-
-      x0 = y0 = z0 = seed;
-      x0 += xyz[0];
-      y0 += xyz[1];
-      z0 += xyz[2];
-
-      hash_mix32 (x0, y0, z0);
-
-      k[0].b = z0 & b_mask;
-      k[0].a = z0 >> a_shift;
-      if (PREDICT_FALSE (a_shift >= BITS (z0)))
-	k[0].a = 0;
-
-      k += 1;
-      n_keys_left -= 1;
-    }
-}
-
-static void
-init_keys_indirect_u64 (phash_main_t * pm)
-{
-  int n_keys_left, b_mask, a_shift;
-  u64 seed;
-  phash_key_t *k;
-
-  seed = pm->hash_seed;
-  b_mask = (1 << pm->b_bits) - 1;
-  a_shift = BITS (seed) - pm->a_bits;
-
-  k = pm->keys;
-  n_keys_left = vec_len (pm->keys);
-
-  while (n_keys_left >= 2)
-    {
-      u64 xyz[6];
-      u64 x0, y0, z0;
-      u64 x1, y1, z1;
-
-      pm->key_seed2 (pm->private, k[0].key, k[1].key, &xyz);
-
-      x0 = y0 = z0 = seed;
-      x1 = y1 = z1 = seed;
-      x0 += xyz[0];
-      y0 += xyz[1];
-      z0 += xyz[2];
-      x1 += xyz[3];
-      y1 += xyz[4];
-      z1 += xyz[5];
-
-      hash_mix64 (x0, y0, z0);
-      hash_mix64 (x1, y1, z1);
-
-      k[0].b = z0 & b_mask;
-      k[1].b = z1 & b_mask;
-      k[0].a = z0 >> a_shift;
-      k[1].a = z1 >> a_shift;
-      if (PREDICT_FALSE (a_shift >= BITS (z0)))
-	k[0].a = k[1].a = 0;
-
-      k += 2;
-      n_keys_left -= 2;
-    }
-
-  if (n_keys_left >= 1)
-    {
-      u64 xyz[3];
-      u64 x0, y0, z0;
-
-      pm->key_seed1 (pm->private, k[0].key, &xyz);
-
-      x0 = y0 = z0 = seed;
-      x0 += xyz[0];
-      y0 += xyz[1];
-      z0 += xyz[2];
-
-      hash_mix64 (x0, y0, z0);
-
-      k[0].b = z0 & b_mask;
-      k[0].a = z0 >> a_shift;
-      if (PREDICT_FALSE (a_shift >= BITS (z0)))
-	k[0].a = 0;
-
-      k += 1;
-      n_keys_left -= 1;
-    }
-}
-
-/*
- * insert keys into table according to key->b
- * check if the initial hash might work
- */
-static int
-init_tabb (phash_main_t * pm)
-{
-  int no_collisions;
-  phash_tabb_t *tb;
-  phash_key_t *k, *l;
-
-  if (pm->key_seed1)
-    {
-      if (pm->flags & PHASH_FLAG_MIX64)
-	init_keys_indirect_u64 (pm);
-      else
-	init_keys_indirect_u32 (pm);
-    }
-  else
-    {
-      if (pm->flags & PHASH_FLAG_MIX64)
-	init_keys_direct_u64 (pm);
-      else
-	init_keys_direct_u32 (pm);
-    }
-
-  if (!pm->tabb)
-    vec_resize (pm->tabb, 1 << pm->b_bits);
-  else
-    vec_foreach (tb, pm->tabb) phash_tabb_free (tb);
-
-  /* Two keys with the same (a,b) guarantees a collision */
-  no_collisions = 1;
-  vec_foreach (k, pm->keys)
-  {
-    u32 i, *ki;
-
-    tb = pm->tabb + k->b;
-    ki = tb->keys;
-    for (i = 0; i < vec_len (ki); i++)
-      {
-	l = pm->keys + ki[i];
-	if (k->a == l->a)
-	  {
-	    /* Given keys are supposed to be unique. */
-	    if (pm->key_is_equal
-		&& pm->key_is_equal (pm->private, l->key, k->key))
-	      clib_error ("duplicate keys");
-	    no_collisions = 0;
-	    goto done;
-	  }
-      }
-
-    vec_add1 (tb->keys, k - pm->keys);
-  }
-
-done:
-  return no_collisions;
-}
-
-/* Try to apply an augmenting list */
-static int
-apply (phash_main_t * pm, u32 tail, u32 rollback)
-{
-  phash_key_t *k;
-  phash_tabb_t *pb;
-  phash_tabq_t *q_child, *q_parent;
-  u32 ki, i, hash, child, parent;
-  u32 stabb;			/* scramble[tab[b]] */
-  int no_collision;
-
-  no_collision = 1;
-
-  /* Walk from child to parent until root is reached. */
-  for (child = tail - 1; child; child = parent)
-    {
-      q_child = &pm->tabq[child];
-      parent = q_child->parent_q;
-      q_parent = &pm->tabq[parent];
-
-      /* find parent's list of siblings */
-      ASSERT (q_parent->b_q < vec_len (pm->tabb));
-      pb = pm->tabb + q_parent->b_q;
-
-      /* erase old hash values */
-      stabb = pm->scramble[pb->val_b];
-      for (i = 0; i < vec_len (pb->keys); i++)
-	{
-	  ki = pb->keys[i];
-	  k = pm->keys + ki;
-	  hash = k->a ^ stabb;
-
-	  /* Erase hash for all of child's siblings. */
-	  if (ki == pm->tabh[hash])
-	    pm->tabh[hash] = ~0;
-	}
-
-      /* change pb->val_b, which will change the hashes of all parent siblings */
-      pb->val_b = rollback ? q_child->oldval_q : q_child->newval_q;
-
-      /* set new hash values */
-      stabb = pm->scramble[pb->val_b];
-      for (i = 0; i < vec_len (pb->keys); i++)
-	{
-	  ki = pb->keys[i];
-	  k = pm->keys + ki;
-
-	  hash = k->a ^ stabb;
-	  if (rollback)
-	    {
-	      if (parent == 0)
-		continue;	/* root never had a hash */
-	    }
-	  else if (pm->tabh[hash] != ~0)
-	    {
-	      /* Very rare case: roll back any changes. */
-	      apply (pm, tail, /* rollback changes */ 1);
-	      no_collision = 0;
-	      goto done;
-	    }
-	  pm->tabh[hash] = ki;
-	}
-    }
-
-done:
-  return no_collision;
-}
-
-
-/*
--------------------------------------------------------------------------------
-augment(): Add item to the mapping.
-
-Construct a spanning tree of *b*s with *item* as root, where each
-parent can have all its hashes changed (by some new val_b) with
-at most one collision, and each child is the b of that collision.
-
-I got this from Tarjan's "Data Structures and Network Algorithms".  The
-path from *item* to a *b* that can be remapped with no collision is
-an "augmenting path".  Change values of tab[b] along the path so that
-the unmapped key gets mapped and the unused hash value gets used.
-
-Assuming 1 key per b, if m out of n hash values are still unused,
-you should expect the transitive closure to cover n/m nodes before
-an unused node is found.  Sum(i=1..n)(n/i) is about nlogn, so expect
-this approach to take about nlogn time to map all single-key b's.
--------------------------------------------------------------------------------
-
-high_water: a value higher than any now in tabb[].water_b.
-*/
-static int
-augment (phash_main_t * pm, u32 b_root, u32 high_water)
-{
-  u32 q;			/* current position walking through the queue */
-  u32 tail;			/* tail of the queue.  0 is the head of the queue. */
-  phash_tabb_t *tb_parent, *tb_child, *tb_hit;
-  phash_key_t *k_parent, *k_child;
-  u32 v, v_limit;		/* possible value for myb->val_b */
-  u32 i, ki, hash;
-
-  v_limit =
-    1 << ((pm->flags & PHASH_FLAG_USE_SCRAMBLE) ? pm->s_bits : BITS (u8));
-
-  /* Initialize the root of the spanning tree. */
-  pm->tabq[0].b_q = b_root;
-  tail = 1;
-
-  /* construct the spanning tree by walking the queue, add children to tail */
-  for (q = 0; q < tail; q++)
-    {
-      if ((pm->flags & PHASH_FLAG_FAST_MODE)
-	  && !(pm->flags & PHASH_FLAG_MINIMAL) && q == 1)
-	break;			/* don't do transitive closure */
-
-      tb_parent = pm->tabb + pm->tabq[q].b_q;	/* the b for this node */
-
-      for (v = 0; v < v_limit; v++)
-	{
-	  tb_child = 0;
-
-	  for (i = 0; i < vec_len (tb_parent->keys); i++)
-	    {
-	      ki = tb_parent->keys[i];
-	      k_parent = pm->keys + ki;
-
-	      hash = k_parent->a ^ pm->scramble[v];
-	      if (hash >= pm->hash_max)
-		goto try_next_v;	/* hash code out of bounds => we can't use this v */
-
-	      ki = pm->tabh[hash];
-	      if (ki == ~0)
-		continue;
-
-	      k_child = pm->keys + ki;
-	      tb_hit = pm->tabb + k_child->b;
-
-	      if (tb_child)
-		{
-		  /* Hit at most one child b. */
-		  if (tb_child == tb_hit)
-		    goto try_next_v;
-		}
-	      else
-		{
-		  /* Remember this as child b. */
-		  tb_child = tb_hit;
-		  if (tb_hit->water_b == high_water)
-		    goto try_next_v;	/* already explored */
-		}
-	    }
-
-	  /* tb_parent with v has either one or zero collisions. */
-
-	  /* add childb to the queue of reachable things */
-	  if (tb_child)
-	    tb_child->water_b = high_water;
-	  pm->tabq[tail].b_q = tb_child ? tb_child - pm->tabb : ~0;
-	  pm->tabq[tail].newval_q = v;	/* how to make parent (myb) use this hash */
-	  pm->tabq[tail].oldval_q = tb_parent->val_b;	/* need this for rollback */
-	  pm->tabq[tail].parent_q = q;
-	  ++tail;
-
-	  /* Found a v with no collisions? */
-	  if (!tb_child)
-	    {
-	      /* Try to apply the augmenting path. */
-	      if (apply (pm, tail, /* rollback */ 0))
-		return 1;	/* success, item was added to the perfect hash */
-	      --tail;		/* don't know how to handle such a child! */
-	    }
-
-	try_next_v:
-	  ;
-	}
-    }
-  return 0;
-}
-
-
-static phash_tabb_t *sort_tabb;
-
-static int
-phash_tabb_compare (void *a1, void *a2)
-{
-  u32 *b1 = a1;
-  u32 *b2 = a2;
-  phash_tabb_t *tb1, *tb2;
-
-  tb1 = sort_tabb + b1[0];
-  tb2 = sort_tabb + b2[0];
-
-  return ((int) vec_len (tb2->keys) - (int) vec_len (tb1->keys));
-}
-
-/* find a mapping that makes this a perfect hash */
-static int
-perfect (phash_main_t * pm)
-{
-  u32 i;
-
-  /* clear any state from previous attempts */
-  if (vec_bytes (pm->tabh))
-    memset (pm->tabh, ~0, vec_bytes (pm->tabh));
-
-  vec_validate (pm->tabb_sort, vec_len (pm->tabb) - 1);
-  for (i = 0; i < vec_len (pm->tabb_sort); i++)
-    pm->tabb_sort[i] = i;
-
-  sort_tabb = pm->tabb;
-
-  vec_sort_with_function (pm->tabb_sort, phash_tabb_compare);
-
-  /* In descending order by number of keys, map all *b*s */
-  for (i = 0; i < vec_len (pm->tabb_sort); i++)
-    {
-      if (!augment (pm, pm->tabb_sort[i], i + 1))
-	return 0;
-    }
-
-  /* Success!  We found a perfect hash of all keys into 0..nkeys-1. */
-  return 1;
-}
-
-
-/*
- * Find initial a_bits = log2 (a_max), b_bits = log2 (b_max).
- * Initial a_max and b_max values were found empirically.  Some factors:
- *
- * If s_max<256 there is no scramble, so tab[b] needs to cover 0..s_max-1.
- *
- * a_max and b_max must be powers of 2 because the values in 0..a_max-1 and
- * 0..b_max-1 are produced by applying a bitmask to the initial hash function.
- *
- * a_max must be less than s_max, in fact less than n_keys, because otherwise
- * there would often be no i such that a^scramble[i] is in 0..n_keys-1 for
- * all the *a*s associated with a given *b*, so there would be no legal
- * value to assign to tab[b].  This only matters when we're doing a minimal
- * perfect hash.
- *
- * It takes around 800 trials to find distinct (a,b) with nkey=s_max*(5/8)
- * and a_max*b_max = s_max*s_max/32.
- *
- * Values of b_max less than s_max/4 never work, and s_max/2 always works.
- *
- * We want b_max as small as possible because it is the number of bytes in
- * the huge array we must create for the perfect hash.
- *
- * When nkey <= s_max*(5/8), b_max=s_max/4 works much more often with
- * a_max=s_max/8 than with a_max=s_max/4.  Above s_max*(5/8), b_max=s_max/4
- * doesn't seem to care whether a_max=s_max/8 or a_max=s_max/4.  I think it
- * has something to do with 5/8 = 1/8 * 5.  For example examine 80000,
- * 85000, and 90000 keys with different values of a_max.  This only matters
- * if we're doing a minimal perfect hash.
- *
- * When a_max*b_max <= 1<<U32BITS, the initial hash must produce one integer.
- * Bigger than that it must produce two integers, which increases the
- * cost of the hash per character hashed.
- */
-static void
-guess_initial_parameters (phash_main_t * pm)
-{
-  u32 s_bits, s_max, a_max, b_max, n_keys;
-  int is_minimal, is_fast_mode;
-  const u32 b_max_use_scramble_threshold = 4096;
-
-  is_minimal = (pm->flags & PHASH_FLAG_MINIMAL) != 0;
-  is_fast_mode = (pm->flags & PHASH_FLAG_FAST_MODE) != 0;
-
-  n_keys = vec_len (pm->keys);
-  s_bits = max_log2 (n_keys);
-  s_max = 1 << s_bits;
-  a_max = 0;
-
-  if (is_minimal)
-    {
-      switch (s_bits)
-	{
-	case 0:
-	  a_max = 1;
-	  b_max = 1;
-	case 1:
-	case 2:
-	case 3:
-	case 4:
-	case 5:
-	case 6:
-	case 7:
-	case 8:
-	  /*
-	   * Was: a_max = is_minimal ? s_max / 2 : s_max;
-	   * However, we know that is_minimal must be true, so the
-	   * if-arm of the ternary expression is always executed.
-	   */
-	  a_max = s_max / 2;
-	  b_max = s_max / 2;
-	  break;
-	case 9:
-	case 10:
-	case 11:
-	case 12:
-	case 13:
-	case 14:
-	case 15:
-	case 16:
-	case 17:
-	  if (is_fast_mode)
-	    {
-	      a_max = s_max / 2;
-	      b_max = s_max / 4;
-	    }
-	  else if (s_max / 4 < b_max_use_scramble_threshold)
-	    {
-	      if (n_keys <= s_max * 0.52)
-		a_max = b_max = s_max / 8;
-	      else
-		a_max = b_max = s_max / 4;
-	    }
-	  else
-	    {
-	      a_max = ((n_keys <= s_max * (5.0 / 8.0)) ? s_max / 8 :
-		       (n_keys <=
-			s_max * (3.0 / 4.0)) ? s_max / 4 : s_max / 2);
-	      b_max = s_max / 4;	/* always give the small size a shot */
-	    }
-	  break;
-	case 18:
-	  if (is_fast_mode)
-	    a_max = b_max = s_max / 2;
-	  else
-	    {
-	      a_max = s_max / 8;	/* never require the multiword hash */
-	      b_max = (n_keys <= s_max * (5.0 / 8.0)) ? s_max / 4 : s_max / 2;
-	    }
-	  break;
-	case 19:
-	case 20:
-	  a_max = (n_keys <= s_max * (5.0 / 8.0)) ? s_max / 8 : s_max / 2;
-	  b_max = (n_keys <= s_max * (5.0 / 8.0)) ? s_max / 4 : s_max / 2;
-	  break;
-	default:
-	  /* Just find a hash as quick as possible.
-	     We'll be thrashing virtual memory at this size. */
-	  a_max = b_max = s_max / 2;
-	  break;
-	}
-    }
-  else
-    {
-      /* Non-minimal perfect hash. */
-      if (is_fast_mode && n_keys > s_max * 0.8)
-	{
-	  s_max *= 2;
-	  s_bits += 1;
-	}
-
-      if (s_max / 4 <= (1 << 14))
-	b_max = ((n_keys <= s_max * 0.56) ? s_max / 32 :
-		 (n_keys <= s_max * 0.74) ? s_max / 16 : s_max / 8);
-      else
-	b_max = ((n_keys <= s_max * 0.6) ? s_max / 16 :
-		 (n_keys <= s_max * 0.8) ? s_max / 8 : s_max / 4);
-
-      if (is_fast_mode && b_max < s_max / 8)
-	b_max = s_max / 8;
-
-      if (a_max < 1)
-	a_max = 1;
-      if (b_max < 1)
-	b_max = 1;
-    }
-
-  ASSERT (s_max == (1 << s_bits));
-  ASSERT (is_pow2 (a_max));
-  ASSERT (is_pow2 (b_max));
-  pm->s_bits = s_bits;
-  pm->a_bits = min_log2 (a_max);
-  pm->b_bits = min_log2 (b_max);
-  if (b_max >= b_max_use_scramble_threshold)
-    pm->flags |= PHASH_FLAG_USE_SCRAMBLE;
-}
-
-/* compute p(x), where p is a permutation of 0..(1<<nbits)-1 */
-/* permute(0)=0.  This is intended and useful. */
-always_inline u32
-scramble_permute (u32 x, u32 nbits)
-{
-  int i;
-  int mask = (1 << nbits) - 1;
-  int const2 = 1 + nbits / 2;
-  int const3 = 1 + nbits / 3;
-  int const4 = 1 + nbits / 4;
-  int const5 = 1 + nbits / 5;
-  for (i = 0; i < 20; i++)
-    {
-      x = (x + (x << const2)) & mask;
-      x = (x ^ (x >> const3));
-      x = (x + (x << const4)) & mask;
-      x = (x ^ (x >> const5));
-    }
-  return x;
-}
-
-/* initialize scramble[] with distinct random values in 0..smax-1 */
-static void
-scramble_init (phash_main_t * pm)
-{
-  u32 i;
-
-  /* fill scramble[] with distinct random integers in 0..smax-1 */
-  vec_validate (pm->scramble, (1 << (pm->s_bits < 8 ? 8 : pm->s_bits)) - 1);
-  for (i = 0; i < vec_len (pm->scramble); i++)
-    pm->scramble[i] = scramble_permute (i, pm->s_bits);
-}
-
-/* Try to find a perfect hash function. */
-clib_error_t *
-phash_find_perfect_hash (phash_main_t * pm)
-{
-  clib_error_t *error = 0;
-  u32 max_a_bits, n_tries_this_a_b, want_minimal;
-
-  /* guess initial values for s_max, a_max and b_max */
-  guess_initial_parameters (pm);
-
-  want_minimal = pm->flags & PHASH_FLAG_MINIMAL;
-
-new_s:
-  if (pm->b_bits == 0)
-    pm->a_bits = pm->s_bits;
-
-  max_a_bits = pm->s_bits - want_minimal;
-  if (max_a_bits < 1)
-    max_a_bits = 1;
-
-  pm->hash_max = want_minimal ? vec_len (pm->keys) : (1 << pm->s_bits);
-
-  scramble_init (pm);
-
-  /* Allocate working memory. */
-  vec_free (pm->tabh);
-  vec_validate_init_empty (pm->tabh, pm->hash_max - 1, ~0);
-  vec_free (pm->tabq);
-  vec_validate (pm->tabq, 1 << pm->b_bits);
-
-  /* Actually find the perfect hash */
-  n_tries_this_a_b = 0;
-  while (1)
-    {
-      /* Choose random hash seeds until keys become unique. */
-      pm->hash_seed = random_u64 (&pm->random_seed);
-      pm->n_seed_trials++;
-      if (init_tabb (pm))
-	{
-	  /* Found unique (A, B). */
-
-	  /* Hash may already be perfect. */
-	  if (pm->b_bits == 0)
-	    goto done;
-
-	  pm->n_perfect_calls++;
-	  if (perfect (pm))
-	    goto done;
-
-	  goto increase_b;
-	}
-
-      /* Keep trying with different seed value. */
-      n_tries_this_a_b++;
-      if (n_tries_this_a_b < 2048)
-	continue;
-
-      /* Try to put more bits in (A,B) to make distinct (A,B) more likely */
-      if (pm->a_bits < max_a_bits)
-	pm->a_bits++;
-      else if (pm->b_bits < pm->s_bits)
-	{
-	increase_b:
-	  vec_resize (pm->tabb, vec_len (pm->tabb));
-	  vec_resize (pm->tabq, vec_len (pm->tabq));
-	  pm->b_bits++;
-	}
-      else
-	{
-	  /* Can't increase (A, B) any more, so try increasing S. */
-	  goto new_s;
-	}
-    }
-
-done:
-  /* Construct mapping table for hash lookups. */
-  if (!error)
-    {
-      u32 b, v;
-
-      pm->a_shift = ((pm->flags & PHASH_FLAG_MIX64) ? 64 : 32) - pm->a_bits;
-      pm->b_mask = (1 << pm->b_bits) - 1;
-
-      vec_resize (pm->tab, vec_len (pm->tabb));
-      for (b = 0; b < vec_len (pm->tabb); b++)
-	{
-	  v = pm->tabb[b].val_b;
-
-	  /* Apply scramble now for small enough value of b_bits. */
-	  if (!(pm->flags & PHASH_FLAG_USE_SCRAMBLE))
-	    v = pm->scramble[v];
-
-	  pm->tab[b] = v;
-	}
-    }
-
-  /* Free working memory. */
-  phash_main_free_working_memory (pm);
-
-  return error;
-}
-
-/* Slow hash computation for general keys. */
-uword
-phash_hash_slow (phash_main_t * pm, uword key)
-{
-  u32 a, b, v;
-
-  if (pm->flags & PHASH_FLAG_MIX64)
-    {
-      u64 x0, y0, z0;
-
-      x0 = y0 = z0 = pm->hash_seed;
-
-      if (pm->key_seed1)
-	{
-	  u64 xyz[3];
-	  pm->key_seed1 (pm->private, key, &xyz);
-	  x0 += xyz[0];
-	  y0 += xyz[1];
-	  z0 += xyz[2];
-	}
-      else
-	x0 += key;
-
-      hash_mix64 (x0, y0, z0);
-
-      a = z0 >> pm->a_shift;
-      b = z0 & pm->b_mask;
-    }
-  else
-    {
-      u32 x0, y0, z0;
-
-      x0 = y0 = z0 = pm->hash_seed;
-
-      if (pm->key_seed1)
-	{
-	  u32 xyz[3];
-	  pm->key_seed1 (pm->private, key, &xyz);
-	  x0 += xyz[0];
-	  y0 += xyz[1];
-	  z0 += xyz[2];
-	}
-      else
-	x0 += key;
-
-      hash_mix32 (x0, y0, z0);
-
-      a = z0 >> pm->a_shift;
-      b = z0 & pm->b_mask;
-    }
-
-  v = pm->tab[b];
-  if (pm->flags & PHASH_FLAG_USE_SCRAMBLE)
-    v = pm->scramble[v];
-  return a ^ v;
-}
-
-/* Verify that perfect hash is perfect. */
-clib_error_t *
-phash_validate (phash_main_t * pm)
-{
-  phash_key_t *k;
-  uword *unique_bitmap = 0;
-  clib_error_t *error = 0;
-
-  vec_foreach (k, pm->keys)
-  {
-    uword h = phash_hash_slow (pm, k->key);
-
-    if (h >= pm->hash_max)
-      {
-	error = clib_error_return (0, "hash out of range %wd", h);
-	goto done;
-      }
-
-    if (clib_bitmap_get (unique_bitmap, h))
-      {
-	error = clib_error_return (0, "hash non-unique");
-	goto done;
-      }
-
-    unique_bitmap = clib_bitmap_ori (unique_bitmap, h);
-  }
-
-done:
-  clib_bitmap_free (unique_bitmap);
-  return error;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/phash.h b/vppinfra/vppinfra/phash.h
deleted file mode 100644
index 746a0fdd..00000000
--- a/vppinfra/vppinfra/phash.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_phash_h
-#define included_phash_h
-
-#include <vppinfra/hash.h>	/* for Bob's mixing functions */
-
-typedef struct
-{
-  /* Maybe either pointer to vector or inline word. */
-  uword key;
-
-  /* Hash code (A, B). */
-  u32 a, b;
-} phash_key_t;
-
-/* Table indexed by B. */
-typedef struct
-{
-  /* Vector of key indices with this same value of B. */
-  u32 *keys;
-
-  /* hash=a^tabb[b].val_b */
-  u32 val_b;
-
-  /* High watermark of who has visited this map node. */
-  u32 water_b;
-} phash_tabb_t;
-
-always_inline void
-phash_tabb_free (phash_tabb_t * b)
-{
-  vec_free (b->keys);
-  b->val_b = b->water_b = 0;
-}
-
-typedef struct
-{
-  /* b that currently occupies this hash */
-  u32 b_q;
-
-  /* Queue position of parent that could use this hash. */
-  u32 parent_q;
-
-  /* What to change parent tab[b] to use this hash. */
-  u32 newval_q;
-
-  /* Original value of tab[b]. */
-  u32 oldval_q;
-} phash_tabq_t;
-
-typedef struct
-{
-  u8 a_bits, b_bits, s_bits, a_shift;
-  u32 b_mask;
-  u32 *tab;
-  u32 *scramble;
-
-  /* Seed value for hash mixer. */
-  u64 hash_seed;
-
-  u32 flags;
-
-  /* Key functions want 64 bit keys.
-     Use hash_mix64 rather than hash_mix32. */
-#define PHASH_FLAG_MIX64		(1 << 0)
-#define PHASH_FLAG_MIX32		(0 << 0)
-
-  /* When b_bits is large enough (>= 12) we scramble. */
-#define PHASH_FLAG_USE_SCRAMBLE		(1 << 1)
-
-  /* Slow mode gives smaller tables but at the expense of more run time. */
-#define PHASH_FLAG_SLOW_MODE		(0 << 2)
-#define PHASH_FLAG_FAST_MODE		(1 << 2)
-
-  /* Generate minimal perfect hash instead of perfect hash. */
-#define PHASH_FLAG_NON_MINIMAL		(0 << 3)
-#define PHASH_FLAG_MINIMAL		(1 << 3)
-
-  /* vec_len (keys) for minimal hash;
-     1 << s_bits for non-minimal hash. */
-  u32 hash_max;
-
-  /* Vector of keys. */
-  phash_key_t *keys;
-
-  /* Used by callbacks to identify keys. */
-  void *private;
-
-  /* Key comparison callback. */
-  int (*key_is_equal) (void *private, uword key1, uword key2);
-
-  /* Callback to reduce single key -> hash seeds. */
-  void (*key_seed1) (void *private, uword key, void *seed);
-
-  /* Callback to reduce two key2 -> hash seeds. */
-  void (*key_seed2) (void *private, uword key1, uword key2, void *seed);
-
-  /* Stuff used to compute perfect hash. */
-  u32 random_seed;
-
-  /* Stuff indexed by B. */
-  phash_tabb_t *tabb;
-
-  /* Table of B ordered by number of keys in tabb[b]. */
-  u32 *tabb_sort;
-
-  /* Unique key (or ~0 if none) for a given hash
-     H = A ^ scramble[tab[B].val_b]. */
-  u32 *tabh;
-
-  /* Stuff indexed by q. */
-  phash_tabq_t *tabq;
-
-  /* Stats. */
-  u32 n_seed_trials, n_perfect_calls;
-} phash_main_t;
-
-always_inline void
-phash_main_free_working_memory (phash_main_t * pm)
-{
-  vec_free (pm->tabb);
-  vec_free (pm->tabq);
-  vec_free (pm->tabh);
-  vec_free (pm->tabb_sort);
-  if (!(pm->flags & PHASH_FLAG_USE_SCRAMBLE))
-    vec_free (pm->scramble);
-}
-
-always_inline void
-phash_main_free (phash_main_t * pm)
-{
-  phash_main_free_working_memory (pm);
-  vec_free (pm->tab);
-  vec_free (pm->keys);
-  memset (pm, 0, sizeof (pm[0]));
-}
-
-/* Slow hash computation for general keys. */
-uword phash_hash_slow (phash_main_t * pm, uword key);
-
-/* Main routine to compute perfect hash. */
-clib_error_t *phash_find_perfect_hash (phash_main_t * pm);
-
-/* Validates that hash is indeed perfect. */
-clib_error_t *phash_validate (phash_main_t * pm);
-
-/* Unit test. */
-int phash_test_main (unformat_input_t * input);
-
-#endif /* included_phash_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/pipeline.h b/vppinfra/vppinfra/pipeline.h
deleted file mode 100644
index 5a9799b4..00000000
--- a/vppinfra/vppinfra/pipeline.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * pipeline.h: software pipeline infrastructure
- *
- * Copyright (c) 2010 Eliot Dresselhaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef included_clib_pipeline_h
-#define included_clib_pipeline_h
-
-#define clib_pipeline_stage(F,TYPE,ARG,I,BODY)		\
-  always_inline void F##_inline (void * _, u32 I)	\
-  { TYPE ARG = _; { BODY; } }				\
-  never_inline  void F##_no_inline (TYPE ARG, u32 I)	\
-  { F##_inline (ARG, I); }
-
-#define clib_pipeline_stage_static(F,TYPE,ARG,I,BODY)		\
-  static_always_inline void F##_inline (void * _, u32 I)	\
-  { TYPE ARG = _; { BODY; } }					\
-  never_inline  void F##_no_inline (TYPE ARG, u32 I)		\
-  { F##_inline (ARG, I); }
-
-#define clib_pipeline_stage_no_inline(F,TYPE,ARG,I,BODY)	\
-  never_inline void F##_no_inline (void * _, u32 I)		\
-  { TYPE ARG = _; { BODY; } }					\
-  never_inline  void F##_inline (TYPE ARG, u32 I)		\
-  { F##_no_inline (ARG, I); }
-
-#define _clib_pipeline_var(v) _clib_pipeline_##v
-
-#define clib_pipeline_stage_execute(F,A,I,S) \
-  F##_##S (A, _clib_pipeline_var(i) - (I))
-
-#define clib_pipeline_main_stage(F,A,I) \
-  clib_pipeline_stage_execute (F, A, I, inline)
-#define clib_pipeline_init_stage(F,A,I) \
-  if (_clib_pipeline_var(i) >= (I)) clib_pipeline_stage_execute (F, A, I, no_inline)
-#define clib_pipeline_exit_stage(F,A,I)					\
-  if (_clib_pipeline_var(i) >= (I) && _clib_pipeline_var(i) - (I) < _clib_pipeline_var(n_vectors)) \
-    clib_pipeline_stage_execute (F, A, I, no_inline)
-
-#define clib_pipeline_init_loop				\
-  for (_clib_pipeline_var(i) = 0;			\
-       _clib_pipeline_var(i) <				\
-	 clib_min (_clib_pipeline_var(n_stages) - 1,	\
-		   _clib_pipeline_var(n_vectors));	\
-       _clib_pipeline_var(i)++)
-
-#define clib_pipeline_main_loop					\
-  for (; _clib_pipeline_var(i) < _clib_pipeline_var(n_vectors);	\
-       _clib_pipeline_var(i)++)
-
-#define clib_pipeline_exit_loop						\
-  for (; _clib_pipeline_var(i) < (_clib_pipeline_var(n_vectors)		\
-				  + _clib_pipeline_var(n_stages) - 1);	\
-       _clib_pipeline_var(i)++)
-
-#define clib_pipeline_run_2_stage(N,ARG,STAGE0,STAGE1)	\
-do {							\
-  uword _clib_pipeline_var(n_vectors) = (N);		\
-  uword _clib_pipeline_var(n_stages) = 2;		\
-  uword _clib_pipeline_var(i);				\
-							\
-  clib_pipeline_init_loop				\
-    {							\
-      clib_pipeline_init_stage (STAGE0, ARG, 0);	\
-    }							\
-							\
-  clib_pipeline_main_loop				\
-    {							\
-      clib_pipeline_main_stage (STAGE0, ARG, 0);	\
-      clib_pipeline_main_stage (STAGE1, ARG, 1);	\
-    }							\
-							\
-  clib_pipeline_exit_loop				\
-    {							\
-      clib_pipeline_exit_stage (STAGE1, ARG, 1);	\
-    }							\
-} while (0)
-
-#define clib_pipeline_run_3_stage(N,ARG,STAGE0,STAGE1,STAGE2)	\
-do {								\
-  uword _clib_pipeline_var(n_vectors) = (N);			\
-  uword _clib_pipeline_var(n_stages) = 3;			\
-  uword _clib_pipeline_var(i);					\
-								\
-  clib_pipeline_init_loop					\
-    {								\
-      clib_pipeline_init_stage (STAGE0, ARG, 0);		\
-      clib_pipeline_init_stage (STAGE1, ARG, 1);		\
-    }								\
-								\
-  clib_pipeline_main_loop					\
-    {								\
-      clib_pipeline_main_stage (STAGE0, ARG, 0);		\
-      clib_pipeline_main_stage (STAGE1, ARG, 1);		\
-      clib_pipeline_main_stage (STAGE2, ARG, 2);		\
-    }								\
-								\
-  clib_pipeline_exit_loop					\
-    {								\
-      clib_pipeline_exit_stage (STAGE1, ARG, 1);		\
-      clib_pipeline_exit_stage (STAGE2, ARG, 2);		\
-    }								\
-} while (0)
-
-#define clib_pipeline_run_4_stage(N,ARG,STAGE0,STAGE1,STAGE2,STAGE3)	\
-do {									\
-  uword _clib_pipeline_var(n_vectors) = (N);				\
-  uword _clib_pipeline_var(n_stages) = 4;				\
-  uword _clib_pipeline_var(i);						\
-									\
-  clib_pipeline_init_loop						\
-    {									\
-      clib_pipeline_init_stage (STAGE0, ARG, 0);			\
-      clib_pipeline_init_stage (STAGE1, ARG, 1);			\
-      clib_pipeline_init_stage (STAGE2, ARG, 2);			\
-    }									\
-									\
-  clib_pipeline_main_loop						\
-    {									\
-      clib_pipeline_main_stage (STAGE0, ARG, 0);			\
-      clib_pipeline_main_stage (STAGE1, ARG, 1);			\
-      clib_pipeline_main_stage (STAGE2, ARG, 2);			\
-      clib_pipeline_main_stage (STAGE3, ARG, 3);			\
-    }									\
-									\
-  clib_pipeline_exit_loop						\
-    {									\
-      clib_pipeline_exit_stage (STAGE1, ARG, 1);			\
-      clib_pipeline_exit_stage (STAGE2, ARG, 2);			\
-      clib_pipeline_exit_stage (STAGE3, ARG, 3);			\
-    }									\
-} while (0)
-
-#endif /* included_clib_pipeline_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/pool.h b/vppinfra/vppinfra/pool.h
deleted file mode 100644
index e1c89e0a..00000000
--- a/vppinfra/vppinfra/pool.h
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003, 2004 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-/** @file
- * @brief Fixed length block allocator.
-   Pools are built from clib vectors and bitmaps. Use pools when
-   repeatedly allocating and freeing fixed-size data. Pools are
-   fast, and avoid memory fragmentation.
- */
-
-#ifndef included_pool_h
-#define included_pool_h
-
-#include <vppinfra/bitmap.h>
-#include <vppinfra/error.h>
-#include <vppinfra/mheap.h>
-
-
-typedef struct
-{
-  /** Bitmap of indices of free objects. */
-  uword *free_bitmap;
-
-  /** Vector of free indices.  One element for each set bit in bitmap. */
-  u32 *free_indices;
-} pool_header_t;
-
-/** Align pool header so that pointers are naturally aligned. */
-#define pool_aligned_header_bytes \
-  vec_aligned_header_bytes (sizeof (pool_header_t), sizeof (void *))
-
-/** Get pool header from user pool pointer */
-always_inline pool_header_t *
-pool_header (void *v)
-{
-  return vec_aligned_header (v, sizeof (pool_header_t), sizeof (void *));
-}
-
-/** Validate a pool */
-always_inline void
-pool_validate (void *v)
-{
-  pool_header_t *p = pool_header (v);
-  uword i, n_free_bitmap;
-
-  if (!v)
-    return;
-
-  n_free_bitmap = clib_bitmap_count_set_bits (p->free_bitmap);
-  ASSERT (n_free_bitmap == vec_len (p->free_indices));
-  for (i = 0; i < vec_len (p->free_indices); i++)
-    ASSERT (clib_bitmap_get (p->free_bitmap, p->free_indices[i]) == 1);
-}
-
-always_inline void
-pool_header_validate_index (void *v, uword index)
-{
-  pool_header_t *p = pool_header (v);
-
-  if (v)
-    vec_validate (p->free_bitmap, index / BITS (uword));
-}
-
-#define pool_validate_index(v,i)				\
-do {								\
-  uword __pool_validate_index = (i);				\
-  vec_validate_ha ((v), __pool_validate_index,			\
-		   pool_aligned_header_bytes, /* align */ 0);		\
-  pool_header_validate_index ((v), __pool_validate_index);	\
-} while (0)
-
-/** Number of active elements in a pool.
- * @return Number of active elements in a pool
- */
-always_inline uword
-pool_elts (void *v)
-{
-  uword ret = vec_len (v);
-  if (v)
-    ret -= vec_len (pool_header (v)->free_indices);
-  return ret;
-}
-
-/** Number of elements in pool vector.
-
-    @note You probably want to call pool_elts() instead.
-*/
-#define pool_len(p)	vec_len(p)
-
-/** Number of elements in pool vector (usable as an lvalue)
-
-    @note You probably don't want to use this macro.
-*/
-#define _pool_len(p)	_vec_len(p)
-
-/** Memory usage of pool header. */
-always_inline uword
-pool_header_bytes (void *v)
-{
-  pool_header_t *p = pool_header (v);
-
-  if (!v)
-    return 0;
-
-  return vec_bytes (p->free_bitmap) + vec_bytes (p->free_indices);
-}
-
-/** Memory usage of pool. */
-#define pool_bytes(P) (vec_bytes (P) + pool_header_bytes (P))
-
-/** Local variable naming macro. */
-#define _pool_var(v) _pool_##v
-
-/** Queries whether pool has at least N_FREE free elements. */
-always_inline uword
-pool_free_elts (void *v)
-{
-  pool_header_t *p = pool_header (v);
-  uword n_free = 0;
-
-  if (v)
-    {
-      n_free += vec_len (p->free_indices);
-
-      /* Space left at end of vector? */
-      n_free += vec_capacity (v, sizeof (p[0])) - vec_len (v);
-    }
-
-  return n_free;
-}
-
-/** Allocate an object E from a pool P (general version).
-
-   First search free list.  If nothing is free extend vector of objects.
-*/
-#define pool_get_aligned(P,E,A)						\
-do {									\
-  pool_header_t * _pool_var (p) = pool_header (P);			\
-  uword _pool_var (l);							\
-									\
-  _pool_var (l) = 0;							\
-  if (P)								\
-    _pool_var (l) = vec_len (_pool_var (p)->free_indices);		\
-									\
-  if (_pool_var (l) > 0)						\
-    {									\
-      /* Return free element from free list. */				\
-      uword _pool_var (i) = _pool_var (p)->free_indices[_pool_var (l) - 1]; \
-      (E) = (P) + _pool_var (i);					\
-      _pool_var (p)->free_bitmap =					\
-	clib_bitmap_andnoti (_pool_var (p)->free_bitmap, _pool_var (i)); \
-      _vec_len (_pool_var (p)->free_indices) = _pool_var (l) - 1;	\
-    }									\
-  else									\
-    {									\
-      /* Nothing on free list, make a new element and return it. */	\
-      P = _vec_resize (P,						\
-		       /* length_increment */ 1,			\
-		       /* new size */ (vec_len (P) + 1) * sizeof (P[0]), \
-		       pool_aligned_header_bytes,				\
-		       /* align */ (A));				\
-      E = vec_end (P) - 1;						\
-    }									\
-} while (0)
-
-/** Allocate an object E from a pool P (unspecified alignment). */
-#define pool_get(P,E) pool_get_aligned(P,E,0)
-
-/** Use free bitmap to query whether given element is free. */
-#define pool_is_free(P,E)						\
-({									\
-  pool_header_t * _pool_var (p) = pool_header (P);			\
-  uword _pool_var (i) = (E) - (P);					\
-  (_pool_var (i) < vec_len (P)) ? clib_bitmap_get (_pool_var (p)->free_bitmap, _pool_i) : 1; \
-})
-
-/** Use free bitmap to query whether given index is free */
-#define pool_is_free_index(P,I) pool_is_free((P),(P)+(I))
-
-/** Free an object E in pool P. */
-#define pool_put(P,E)							\
-do {									\
-  pool_header_t * _pool_var (p) = pool_header (P);			\
-  uword _pool_var (l) = (E) - (P);					\
-  ASSERT (vec_is_member (P, E));					\
-  ASSERT (! pool_is_free (P, E));					\
-									\
-  /* Add element to free bitmap and to free list. */			\
-  _pool_var (p)->free_bitmap =						\
-    clib_bitmap_ori (_pool_var (p)->free_bitmap, _pool_var (l));	\
-  vec_add1 (_pool_var (p)->free_indices, _pool_var (l));		\
-} while (0)
-
-/** Free pool element with given index. */
-#define pool_put_index(p,i)			\
-do {						\
-  typeof (p) _e = (p) + (i);			\
-  pool_put (p, _e);				\
-} while (0)
-
-/** Allocate N more free elements to pool (general version). */
-#define pool_alloc_aligned(P,N,A)					\
-do {									\
-  pool_header_t * _p;							\
-  (P) = _vec_resize ((P), 0, (vec_len (P) + (N)) * sizeof (P[0]),	\
-		     pool_aligned_header_bytes,				\
-		     (A));						\
-  _p = pool_header (P);							\
-  vec_resize (_p->free_indices, (N));					\
-  _vec_len (_p->free_indices) -= (N);					\
-} while (0)
-
-/** Allocate N more free elements to pool (unspecified alignment). */
-#define pool_alloc(P,N) pool_alloc_aligned(P,N,0)
-
-/** Low-level free pool operator (do not call directly). */
-always_inline void *
-_pool_free (void *v)
-{
-  pool_header_t *p = pool_header (v);
-  if (!v)
-    return v;
-  clib_bitmap_free (p->free_bitmap);
-  vec_free (p->free_indices);
-  vec_free_h (v, pool_aligned_header_bytes);
-  return 0;
-}
-
-/** Free a pool. */
-#define pool_free(p) (p) = _pool_free(p)
-
-/** Optimized iteration through pool.
-
-    @param LO pointer to first element in chunk
-    @param HI pointer to last element in chunk
-    @param POOL pool to iterate across
-    @param BODY operation to perform
-
-    Optimized version which assumes that BODY is smart enough to
-    process multiple (LOW,HI) chunks. See also pool_foreach().
- */
-#define pool_foreach_region(LO,HI,POOL,BODY)				\
-do {									\
-  uword _pool_var (i), _pool_var (lo), _pool_var (hi), _pool_var (len);	\
-  uword _pool_var (bl), * _pool_var (b);				\
-  pool_header_t * _pool_var (p);					\
-									\
-  _pool_var (p) = pool_header (POOL);					\
-  _pool_var (b) = (POOL) ? _pool_var (p)->free_bitmap : 0;		\
-  _pool_var (bl) = vec_len (_pool_var (b));				\
-  _pool_var (len) = vec_len (POOL);					\
-  _pool_var (lo) = 0;							\
-									\
-  for (_pool_var (i) = 0;						\
-       _pool_var (i) <= _pool_var (bl);					\
-       _pool_var (i)++)							\
-    {									\
-      uword _pool_var (m), _pool_var (f);				\
-      _pool_var (m) = (_pool_var (i) < _pool_var (bl)			\
-		       ? _pool_var (b) [_pool_var (i)]			\
-		       : 1);						\
-      while (_pool_var (m) != 0)					\
-	{								\
-	  _pool_var (f) = first_set (_pool_var (m));			\
-	  _pool_var (hi) = (_pool_var (i) * BITS (_pool_var (b)[0])	\
-			    + min_log2 (_pool_var (f)));		\
-	  _pool_var (hi) = (_pool_var (i) < _pool_var (bl)		\
-			    ? _pool_var (hi) : _pool_var (len));	\
-	  _pool_var (m) ^= _pool_var (f);				\
-	  if (_pool_var (hi) > _pool_var (lo))				\
-	    {								\
-	      (LO) = _pool_var (lo);					\
-	      (HI) = _pool_var (hi);					\
-	      do { BODY; } while (0);					\
-	    }								\
-	  _pool_var (lo) = _pool_var (hi) + 1;				\
-	}								\
-    }									\
-} while (0)
-
-/** Iterate through pool.
-
-    @param VAR A variable of same type as pool vector to be used as an
-               iterator.
-    @param POOL The pool to iterate across.
-    @param BODY The operation to perform, typically a code block. See
-                the example below.
-
-    This macro will call @c BODY with each active pool element.
-
-    It is a bad idea to allocate or free pool element from within
-    @c pool_foreach. Build a vector of indices and dispose of them later.
-
-
-    @par Example
-    @code{.c}
-    proc_t *procs;   // a pool of processes.
-    proc_t *proc;    // pointer to one process; used as the iterator.
-
-    pool_foreach (proc, procs, ({
-        if (proc->state != PROC_STATE_RUNNING)
-            continue;
-
-        // check a running proc in some way
-        ...
-    }));
-    @endcode
-
-    @warning Because @c pool_foreach is a macro, syntax errors can be
-    difficult to find inside @c BODY, let alone actual code bugs. One
-    can temporarily split a complex @c pool_foreach into a trivial
-    @c pool_foreach which builds a vector of active indices, and a
-    vec_foreach() (or plain for-loop) to walk the active index vector.
- */
-#define pool_foreach(VAR,POOL,BODY)					\
-do {									\
-  uword _pool_foreach_lo, _pool_foreach_hi;				\
-  pool_foreach_region (_pool_foreach_lo, _pool_foreach_hi, (POOL),	\
-    ({									\
-      for ((VAR) = (POOL) + _pool_foreach_lo;				\
-	   (VAR) < (POOL) + _pool_foreach_hi;				\
-	   (VAR)++)							\
-	do { BODY; } while (0);						\
-    }));								\
-} while (0)
-
-/** Returns pointer to element at given index.
-
-    ASSERTs that the supplied index is valid.
-    Even though one can write correct code of the form
-    @code
-        p = pool_base + index;
-    @endcode
-    use of @c pool_elt_at_index is strongly suggested.
- */
-#define pool_elt_at_index(p,i)			\
-({						\
-  typeof (p) _e = (p) + (i);			\
-  ASSERT (! pool_is_free (p, _e));		\
-  _e;						\
-})
-
-/** Return next occupied pool index after @c i, useful for safe iteration. */
-#define pool_next_index(P,I)                                            \
-({                                                                      \
-  pool_header_t * _pool_var (p) = pool_header (P);                      \
-  uword _pool_var (rv) = (I) + 1;                                       \
-                                                                        \
-  _pool_var(rv) =                                                       \
-    (_pool_var (rv) < vec_len (P) ?                                     \
-     clib_bitmap_next_clear (_pool_var (p)->free_bitmap, _pool_var(rv)) \
-     : ~0);                                                             \
-  _pool_var(rv);                                                        \
-})
-
-/** Iterate pool by index. */
-#define pool_foreach_index(i,v,body)		\
-  for ((i) = 0; (i) < vec_len (v); (i)++)	\
-    {						\
-      if (! pool_is_free_index ((v), (i)))	\
-	do { body; } while (0);			\
-    }
-
-#endif /* included_pool_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/ptclosure.c b/vppinfra/vppinfra/ptclosure.c
deleted file mode 100644
index cda873ef..00000000
--- a/vppinfra/vppinfra/ptclosure.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vppinfra/ptclosure.h>
-
-u8 **
-clib_ptclosure_alloc (int n)
-{
-  u8 **rv = 0;
-  u8 *row;
-  int i;
-
-  ASSERT (n > 0);
-
-  vec_validate (rv, n - 1);
-  for (i = 0; i < n; i++)
-    {
-      row = 0;
-      vec_validate (row, n - 1);
-
-      rv[i] = row;
-    }
-  return rv;
-}
-
-void
-clib_ptclosure_free (u8 ** ptc)
-{
-  u8 *row;
-  int n = vec_len (ptc);
-  int i;
-
-  ASSERT (n > 0);
-
-  for (i = 0; i < n; i++)
-    {
-      row = ptc[i];
-      vec_free (row);
-    }
-  vec_free (ptc);
-}
-
-void
-clib_ptclosure_copy (u8 ** dst, u8 ** src)
-{
-  int i, n;
-  u8 *src_row, *dst_row;
-
-  n = vec_len (dst);
-
-  for (i = 0; i < vec_len (dst); i++)
-    {
-      src_row = src[i];
-      dst_row = dst[i];
-      clib_memcpy (dst_row, src_row, n);
-    }
-}
-
-/*
- * compute the positive transitive closure
- * of a relation via Warshall's algorithm.
- *
- * Ref:
- * Warshall, Stephen (January 1962). "A theorem on Boolean matrices".
- * Journal of the ACM 9 (1): 11–12.
- *
- * foo[i][j] = 1 means that item i
- * "bears the relation" to item j.
- *
- * For example: "item i must be before item j"
- *
- * You could use a bitmap, but since the algorithm is
- * O(n**3) in the first place, large N is inadvisable...
- *
- */
-
-u8 **
-clib_ptclosure (u8 ** orig)
-{
-  int i, j, k;
-  int n;
-  u8 **prev, **cur;
-
-  n = vec_len (orig);
-  prev = clib_ptclosure_alloc (n);
-  cur = clib_ptclosure_alloc (n);
-
-  clib_ptclosure_copy (prev, orig);
-
-  for (k = 0; k < n; k++)
-    {
-      for (i = 0; i < n; i++)
-	{
-	  for (j = 0; j < n; j++)
-	    {
-	      cur[i][j] = prev[i][j] || (prev[i][k] && prev[k][j]);
-	    }
-	}
-      clib_ptclosure_copy (prev, cur);
-    }
-  clib_ptclosure_free (prev);
-  return cur;
-}
-
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/ptclosure.h b/vppinfra/vppinfra/ptclosure.h
deleted file mode 100644
index ee1609a1..00000000
--- a/vppinfra/vppinfra/ptclosure.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_clib_ptclosure_h
-#define included_clib_ptclosure_h
-
-#include <vppinfra/vec.h>
-#include <vppinfra/format.h>
-#include <vppinfra/error.h>
-
-/*
- * set r[i][j] if item i "bears the relation to" item j
- *
- */
-
-u8 **clib_ptclosure_alloc (int n);
-void clib_ptclosure_free (u8 ** ptc);
-void clib_ptclosure_copy (u8 ** dst, u8 ** src);
-u8 **clib_ptclosure (u8 ** orig);
-
-#endif /* included_clib_ptclosure_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/qhash.c b/vppinfra/vppinfra/qhash.c
deleted file mode 100644
index f4e38c4a..00000000
--- a/vppinfra/vppinfra/qhash.c
+++ /dev/null
@@ -1,858 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2006 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/qhash.h>
-
-#define QHASH_ALL_VALID ((1 << QHASH_KEYS_PER_BUCKET) - 1)
-
-void *
-_qhash_resize (void *v, uword length, uword elt_bytes)
-{
-  qhash_t *h;
-  uword l;
-
-  l = clib_max (max_log2 (length), 2 + QHASH_LOG2_KEYS_PER_BUCKET);
-
-  /* Round up if less than 1/2 full. */
-  l += ((f64) length / (f64) (1 << l)) < .5;
-
-  v = _vec_resize (0, 1 << l, elt_bytes << l, sizeof (h[0]),
-		   /* align */ sizeof (uword));
-
-  h = qhash_header (v);
-  h->n_elts = 0;
-  h->log2_hash_size = l;
-  h->hash_keys =
-    clib_mem_alloc_aligned_no_fail (sizeof (h->hash_keys[0]) << l,
-				    CLIB_CACHE_LINE_BYTES);
-  vec_resize (h->hash_key_valid_bitmap,
-	      1 << (l - QHASH_LOG2_KEYS_PER_BUCKET));
-  memset (v, ~0, elt_bytes << l);
-
-  return v;
-}
-
-static u8 min_log2_table[256];
-
-static inline uword
-qhash_min_log2 (uword x)
-{
-  ASSERT (is_pow2 (x));
-  ASSERT (x < 256);
-  return min_log2_table[x];
-}
-
-static void
-qhash_min_log2_init ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    min_log2_table[i] = min_log2 (i);
-}
-
-always_inline uword
-qhash_get_valid_elt_mask (qhash_t * h, uword i)
-{
-  return h->hash_key_valid_bitmap[i / QHASH_KEYS_PER_BUCKET];
-}
-
-always_inline void
-qhash_set_valid_elt_mask (qhash_t * h, uword i, uword mask)
-{
-  h->hash_key_valid_bitmap[i / QHASH_KEYS_PER_BUCKET] = mask;
-}
-
-always_inline uword
-qhash_search_bucket (uword * hash_keys, uword search_key, uword m)
-{
-  uword t;
-#define _(i) ((hash_keys[i] == search_key) << i)
-  t = (_(0) | _(1) | _(2) | _(3));
-  if (QHASH_KEYS_PER_BUCKET > 4)
-    t |= (_(4) | _(5) | _(6) | _(7));
-  if (QHASH_KEYS_PER_BUCKET > 8)
-    t |= (_(8) | _(9) | _(10) | _(11) | _(12) | _(13) | _(14) | _(15));
-#undef _
-  return m & t;
-}
-
-/* Lookup multiple keys in the same hash table. */
-void
-qhash_get_multiple (void *v,
-		    uword * search_keys,
-		    uword n_search_keys, u32 * result_indices)
-{
-  qhash_t *h = qhash_header (v);
-  uword *k, *hash_keys;
-  uword n_left, bucket_mask;
-  u32 *r;
-
-  if (!v)
-    {
-      memset (result_indices, ~0, sizeof (result_indices[0]) * n_search_keys);
-      return;
-    }
-
-  bucket_mask = pow2_mask (h->log2_hash_size) & ~(QHASH_KEYS_PER_BUCKET - 1);
-
-  k = search_keys;
-  n_left = n_search_keys;
-  hash_keys = h->hash_keys;
-  r = result_indices;
-
-  while (n_left >= 2)
-    {
-      u32 a0, b0, c0, bi0, valid0, match0;
-      u32 a1, b1, c1, bi1, valid1, match1;
-      uword k0, k1, *h0, *h1;
-
-      k0 = k[0];
-      k1 = k[1];
-      n_left -= 2;
-      k += 2;
-
-      a0 = a1 = h->hash_seeds[0];
-      b0 = b1 = h->hash_seeds[1];
-      c0 = c1 = h->hash_seeds[2];
-      a0 ^= k0;
-      a1 ^= k1;
-#if uword_bits == 64
-      b0 ^= k0 >> 32;
-      b1 ^= k1 >> 32;
-#endif
-
-      hash_mix32_step_1 (a0, b0, c0);
-      hash_mix32_step_1 (a1, b1, c1);
-      hash_mix32_step_2 (a0, b0, c0);
-      hash_mix32_step_2 (a1, b1, c1);
-      hash_mix32_step_3 (a0, b0, c0);
-      hash_mix32_step_3 (a1, b1, c1);
-
-      bi0 = c0 & bucket_mask;
-      bi1 = c1 & bucket_mask;
-
-      h0 = hash_keys + bi0;
-      h1 = hash_keys + bi1;
-
-      /* Search two buckets. */
-      valid0 = qhash_get_valid_elt_mask (h, bi0);
-      valid1 = qhash_get_valid_elt_mask (h, bi1);
-
-      match0 = qhash_search_bucket (h0, k0, valid0);
-      match1 = qhash_search_bucket (h1, k1, valid1);
-
-      bi0 += qhash_min_log2 (match0);
-      bi1 += qhash_min_log2 (match1);
-
-      r[0] = match0 ? bi0 : ~0;
-      r[1] = match1 ? bi1 : ~0;
-      r += 2;
-
-      /* Full buckets trigger search of overflow hash. */
-      if (PREDICT_FALSE (!match0 && valid0 == QHASH_ALL_VALID))
-	{
-	  uword *p = hash_get (h->overflow_hash, k0);
-	  r[-2] = p ? p[0] : ~0;
-	}
-
-      /* Full buckets trigger search of overflow hash. */
-      if (PREDICT_FALSE (!match1 && valid1 == QHASH_ALL_VALID))
-	{
-	  uword *p = hash_get (h->overflow_hash, k1);
-	  r[-1] = p ? p[0] : ~0;
-	}
-    }
-
-  while (n_left >= 1)
-    {
-      u32 a0, b0, c0, bi0, valid0, match0;
-      uword k0, *h0;
-
-      k0 = k[0];
-      n_left -= 1;
-      k += 1;
-
-      a0 = h->hash_seeds[0];
-      b0 = h->hash_seeds[1];
-      c0 = h->hash_seeds[2];
-      a0 ^= k0;
-#if uword_bits == 64
-      b0 ^= k0 >> 32;
-#endif
-
-      hash_mix32 (a0, b0, c0);
-
-      bi0 = c0 & bucket_mask;
-
-      h0 = hash_keys + bi0;
-
-      /* Search one bucket. */
-      valid0 = qhash_get_valid_elt_mask (h, bi0);
-      match0 = qhash_search_bucket (h0, k0, valid0);
-
-      bi0 += qhash_min_log2 (match0);
-
-      r[0] = match0 ? bi0 : ~0;
-      r += 1;
-
-      /* Full buckets trigger search of overflow hash. */
-      if (PREDICT_FALSE (!match0 && valid0 == QHASH_ALL_VALID))
-	{
-	  uword *p = hash_get (h->overflow_hash, k0);
-	  r[-1] = p ? p[0] : ~0;
-	}
-    }
-}
-
-/* Lookup multiple keys in the same hash table.
-   Returns index of first matching key. */
-u32
-qhash_get_first_match (void *v,
-		       uword * search_keys,
-		       uword n_search_keys, uword * matching_key)
-{
-  qhash_t *h = qhash_header (v);
-  uword *k, *hash_keys;
-  uword n_left, match_mask, bucket_mask;
-
-  if (!v)
-    return ~0;
-
-  match_mask = 0;
-  bucket_mask = pow2_mask (h->log2_hash_size) & ~(QHASH_KEYS_PER_BUCKET - 1);
-
-  k = search_keys;
-  n_left = n_search_keys;
-  hash_keys = h->hash_keys;
-  while (n_left >= 2)
-    {
-      u32 a0, b0, c0, bi0, valid0;
-      u32 a1, b1, c1, bi1, valid1;
-      uword k0, k1, *h0, *h1;
-
-      k0 = k[0];
-      k1 = k[1];
-      n_left -= 2;
-      k += 2;
-
-      a0 = a1 = h->hash_seeds[0];
-      b0 = b1 = h->hash_seeds[1];
-      c0 = c1 = h->hash_seeds[2];
-      a0 ^= k0;
-      a1 ^= k1;
-#if uword_bits == 64
-      b0 ^= k0 >> 32;
-      b1 ^= k1 >> 32;
-#endif
-
-      hash_mix32_step_1 (a0, b0, c0);
-      hash_mix32_step_1 (a1, b1, c1);
-      hash_mix32_step_2 (a0, b0, c0);
-      hash_mix32_step_2 (a1, b1, c1);
-      hash_mix32_step_3 (a0, b0, c0);
-      hash_mix32_step_3 (a1, b1, c1);
-
-      bi0 = c0 & bucket_mask;
-      bi1 = c1 & bucket_mask;
-
-      h0 = hash_keys + bi0;
-      h1 = hash_keys + bi1;
-
-      /* Search two buckets. */
-      valid0 = qhash_get_valid_elt_mask (h, bi0);
-      valid1 = qhash_get_valid_elt_mask (h, bi1);
-      match_mask = qhash_search_bucket (h0, k0, valid0);
-      match_mask |= (qhash_search_bucket (h1, k1, valid1)
-		     << QHASH_KEYS_PER_BUCKET);
-      if (match_mask)
-	{
-	  uword bi, is_match1;
-
-	  bi = qhash_min_log2 (match_mask);
-	  is_match1 = bi >= QHASH_KEYS_PER_BUCKET;
-
-	  bi += ((is_match1 ? bi1 : bi0)
-		 - (is_match1 << QHASH_LOG2_KEYS_PER_BUCKET));
-	  *matching_key = (k - 2 - search_keys) + is_match1;
-	  return bi;
-	}
-
-      /* Full buckets trigger search of overflow hash. */
-      if (PREDICT_FALSE (valid0 == QHASH_ALL_VALID
-			 || valid1 == QHASH_ALL_VALID))
-	{
-	  uword *p = 0;
-	  uword ki = k - 2 - search_keys;
-
-	  if (valid0 == QHASH_ALL_VALID)
-	    p = hash_get (h->overflow_hash, k0);
-
-	  if (!p && valid1 == QHASH_ALL_VALID)
-	    {
-	      p = hash_get (h->overflow_hash, k1);
-	      ki++;
-	    }
-
-	  if (p)
-	    {
-	      *matching_key = ki;
-	      return p[0];
-	    }
-	}
-    }
-
-  while (n_left >= 1)
-    {
-      u32 a0, b0, c0, bi0, valid0;
-      uword k0, *h0;
-
-      k0 = k[0];
-      n_left -= 1;
-      k += 1;
-
-      a0 = h->hash_seeds[0];
-      b0 = h->hash_seeds[1];
-      c0 = h->hash_seeds[2];
-      a0 ^= k0;
-#if uword_bits == 64
-      b0 ^= k0 >> 32;
-#endif
-
-      hash_mix32 (a0, b0, c0);
-
-      bi0 = c0 & bucket_mask;
-
-      h0 = hash_keys + bi0;
-
-      /* Search one bucket. */
-      valid0 = qhash_get_valid_elt_mask (h, bi0);
-      match_mask = qhash_search_bucket (h0, k0, valid0);
-      if (match_mask)
-	{
-	  uword bi;
-	  bi = bi0 + qhash_min_log2 (match_mask);
-	  *matching_key = (k - 1 - search_keys);
-	  return bi;
-	}
-
-      /* Full buckets trigger search of overflow hash. */
-      if (PREDICT_FALSE (valid0 == QHASH_ALL_VALID))
-	{
-	  uword *p = hash_get (h->overflow_hash, k0);
-	  if (p)
-	    {
-	      *matching_key = (k - 1 - search_keys);
-	      return p[0];
-	    }
-	}
-    }
-
-  return ~0;
-}
-
-static void *
-qhash_set_overflow (void *v, uword elt_bytes,
-		    uword key, uword bi, uword * n_elts, u32 * result)
-{
-  qhash_t *h = qhash_header (v);
-  uword *p = hash_get (h->overflow_hash, key);
-  uword i;
-
-  bi /= QHASH_KEYS_PER_BUCKET;
-
-  if (p)
-    i = p[0];
-  else
-    {
-      uword l = vec_len (h->overflow_free_indices);
-      if (l > 0)
-	{
-	  i = h->overflow_free_indices[l - 1];
-	  _vec_len (h->overflow_free_indices) = l - 1;
-	}
-      else
-	i = (1 << h->log2_hash_size) + hash_elts (h->overflow_hash);
-      hash_set (h->overflow_hash, key, i);
-      vec_validate (h->overflow_counts, bi);
-      h->overflow_counts[bi] += 1;
-      *n_elts += 1;
-
-      l = vec_len (v);
-      if (i >= l)
-	{
-	  uword dl = round_pow2 (1 + i - l, 8);
-	  v = _vec_resize (v, dl, (l + dl) * elt_bytes, sizeof (h[0]),
-			   /* align */ sizeof (uword));
-	  memset (v + l * elt_bytes, ~0, dl * elt_bytes);
-	}
-    }
-
-  *result = i;
-
-  return v;
-}
-
-static uword
-qhash_unset_overflow (void *v, uword key, uword bi, uword * n_elts)
-{
-  qhash_t *h = qhash_header (v);
-  uword *p = hash_get (h->overflow_hash, key);
-  uword result;
-
-  bi /= QHASH_KEYS_PER_BUCKET;
-
-  if (p)
-    {
-      result = p[0];
-      hash_unset (h->overflow_hash, key);
-      ASSERT (bi < vec_len (h->overflow_counts));
-      ASSERT (h->overflow_counts[bi] > 0);
-      ASSERT (*n_elts > 0);
-      vec_add1 (h->overflow_free_indices, result);
-      h->overflow_counts[bi] -= 1;
-      *n_elts -= 1;
-    }
-  else
-    result = ~0;
-
-  return result;
-}
-
-always_inline uword
-qhash_find_free (uword i, uword valid_mask)
-{
-  return first_set (~valid_mask & pow2_mask (QHASH_KEYS_PER_BUCKET));
-}
-
-void *
-_qhash_set_multiple (void *v,
-		     uword elt_bytes,
-		     uword * search_keys,
-		     uword n_search_keys, u32 * result_indices)
-{
-  qhash_t *h = qhash_header (v);
-  uword *k, *hash_keys;
-  uword n_left, n_elts, bucket_mask;
-  u32 *r;
-
-  if (vec_len (v) < n_search_keys)
-    v = _qhash_resize (v, n_search_keys, elt_bytes);
-
-  if (qhash_min_log2 (2) != 1)
-    {
-      qhash_min_log2_init ();
-      ASSERT (qhash_min_log2 (2) == 1);
-    }
-
-  ASSERT (v != 0);
-
-  bucket_mask = pow2_mask (h->log2_hash_size) & ~(QHASH_KEYS_PER_BUCKET - 1);
-
-  hash_keys = h->hash_keys;
-  k = search_keys;
-  r = result_indices;
-  n_left = n_search_keys;
-  n_elts = h->n_elts;
-
-  while (n_left >= 2)
-    {
-      u32 a0, b0, c0, bi0, match0, valid0, free0;
-      u32 a1, b1, c1, bi1, match1, valid1, free1;
-      uword k0, *h0;
-      uword k1, *h1;
-
-      k0 = k[0];
-      k1 = k[1];
-
-      /* Keys must be unique. */
-      ASSERT (k0 != k1);
-
-      n_left -= 2;
-      k += 2;
-
-      a0 = a1 = h->hash_seeds[0];
-      b0 = b1 = h->hash_seeds[1];
-      c0 = c1 = h->hash_seeds[2];
-      a0 ^= k0;
-      a1 ^= k1;
-#if uword_bits == 64
-      b0 ^= k0 >> 32;
-      b1 ^= k1 >> 32;
-#endif
-
-      hash_mix32_step_1 (a0, b0, c0);
-      hash_mix32_step_1 (a1, b1, c1);
-      hash_mix32_step_2 (a0, b0, c0);
-      hash_mix32_step_2 (a1, b1, c1);
-      hash_mix32_step_3 (a0, b0, c0);
-      hash_mix32_step_3 (a1, b1, c1);
-
-      bi0 = c0 & bucket_mask;
-      bi1 = c1 & bucket_mask;
-
-      h0 = hash_keys + bi0;
-      h1 = hash_keys + bi1;
-
-      /* Search two buckets. */
-      valid0 = qhash_get_valid_elt_mask (h, bi0);
-      valid1 = qhash_get_valid_elt_mask (h, bi1);
-
-      match0 = qhash_search_bucket (h0, k0, valid0);
-      match1 = qhash_search_bucket (h1, k1, valid1);
-
-      /* Find first free element starting at hash offset into bucket. */
-      free0 = qhash_find_free (c0 & (QHASH_KEYS_PER_BUCKET - 1), valid0);
-
-      valid1 = valid1 | (bi0 == bi1 ? free0 : 0);
-      free1 = qhash_find_free (c1 & (QHASH_KEYS_PER_BUCKET - 1), valid1);
-
-      n_elts += (match0 == 0) + (match1 == 0);
-
-      match0 = match0 ? match0 : free0;
-      match1 = match1 ? match1 : free1;
-
-      valid0 |= match0;
-      valid1 |= match1;
-
-      h0 += qhash_min_log2 (match0);
-      h1 += qhash_min_log2 (match1);
-
-      if (PREDICT_FALSE (!match0 || !match1))
-	goto slow_path2;
-
-      h0[0] = k0;
-      h1[0] = k1;
-      r[0] = h0 - hash_keys;
-      r[1] = h1 - hash_keys;
-      r += 2;
-      qhash_set_valid_elt_mask (h, bi0, valid0);
-      qhash_set_valid_elt_mask (h, bi1, valid1);
-      continue;
-
-    slow_path2:
-      if (!match0)
-	{
-	  n_elts -= 1;
-	  v = qhash_set_overflow (v, elt_bytes, k0, bi0, &n_elts, &r[0]);
-	}
-      else
-	{
-	  h0[0] = k0;
-	  r[0] = h0 - hash_keys;
-	  qhash_set_valid_elt_mask (h, bi0, valid0);
-	}
-      if (!match1)
-	{
-	  n_elts -= 1;
-	  v = qhash_set_overflow (v, elt_bytes, k1, bi1, &n_elts, &r[1]);
-	}
-      else
-	{
-	  h1[0] = k1;
-	  r[1] = h1 - hash_keys;
-	  qhash_set_valid_elt_mask (h, bi1, valid1);
-	}
-      r += 2;
-    }
-
-  while (n_left >= 1)
-    {
-      u32 a0, b0, c0, bi0, match0, valid0, free0;
-      uword k0, *h0;
-
-      k0 = k[0];
-      n_left -= 1;
-      k += 1;
-
-      a0 = h->hash_seeds[0];
-      b0 = h->hash_seeds[1];
-      c0 = h->hash_seeds[2];
-      a0 ^= k0;
-#if uword_bits == 64
-      b0 ^= k0 >> 32;
-#endif
-
-      hash_mix32 (a0, b0, c0);
-
-      bi0 = c0 & bucket_mask;
-
-      h0 = hash_keys + bi0;
-
-      valid0 = qhash_get_valid_elt_mask (h, bi0);
-
-      /* Find first free element starting at hash offset into bucket. */
-      free0 = qhash_find_free (c0 & (QHASH_KEYS_PER_BUCKET - 1), valid0);
-
-      match0 = qhash_search_bucket (h0, k0, valid0);
-
-      n_elts += (match0 == 0);
-
-      match0 = match0 ? match0 : free0;
-
-      valid0 |= match0;
-
-      h0 += qhash_min_log2 (match0);
-
-      if (PREDICT_FALSE (!match0))
-	goto slow_path1;
-
-      h0[0] = k0;
-      r[0] = h0 - hash_keys;
-      r += 1;
-      qhash_set_valid_elt_mask (h, bi0, valid0);
-      continue;
-
-    slow_path1:
-      n_elts -= 1;
-      v = qhash_set_overflow (v, elt_bytes, k0, bi0, &n_elts, &r[0]);
-      r += 1;
-    }
-
-  h = qhash_header (v);
-  h->n_elts = n_elts;
-
-  return v;
-}
-
-static uword
-unset_slow_path (void *v, uword elt_bytes,
-		 uword k0, uword bi0, uword valid0, uword match0,
-		 uword * n_elts)
-{
-  qhash_t *h = qhash_header (v);
-  uword i, j = 0, k, l, t = ~0;
-  hash_pair_t *p, *found;
-
-  if (!match0)
-    {
-      if (valid0 == QHASH_ALL_VALID)
-	t = qhash_unset_overflow (v, k0, bi0, n_elts);
-      return t;
-    }
-
-  i = bi0 / QHASH_KEYS_PER_BUCKET;
-  t = bi0 + qhash_min_log2 (match0);
-
-  if (valid0 == QHASH_ALL_VALID
-      && i < vec_len (h->overflow_counts) && h->overflow_counts[i] > 0)
-    {
-      found = 0;
-      /* *INDENT-OFF* */
-      hash_foreach_pair (p, h->overflow_hash, ({
-	j = qhash_hash_mix (h, p->key) / QHASH_KEYS_PER_BUCKET;
-	if (j == i)
-	  {
-	    found = p;
-	    break;
-	  }
-      }));
-      /* *INDENT-ON* */
-      ASSERT (found != 0);
-      ASSERT (j == i);
-
-      l = found->value[0];
-      k = found->key;
-      hash_unset3 (h->overflow_hash, k, &j);
-      vec_add1 (h->overflow_free_indices, j);
-      h->overflow_counts[i] -= 1;
-
-      qhash_set_valid_elt_mask (h, bi0, valid0);
-
-      h->hash_keys[t] = k;
-      clib_memswap (v + t * elt_bytes, v + l * elt_bytes, elt_bytes);
-      t = l;
-    }
-  else
-    qhash_set_valid_elt_mask (h, bi0, valid0 ^ match0);
-
-  return t;
-}
-
-void
-_qhash_unset_multiple (void *v,
-		       uword elt_bytes,
-		       uword * search_keys,
-		       uword n_search_keys, u32 * result_indices)
-{
-  qhash_t *h = qhash_header (v);
-  uword *k, *hash_keys;
-  uword n_left, n_elts, bucket_mask;
-  u32 *r;
-
-  if (!v)
-    {
-      uword i;
-      for (i = 0; i < n_search_keys; i++)
-	result_indices[i] = ~0;
-    }
-
-  bucket_mask = pow2_mask (h->log2_hash_size) & ~(QHASH_KEYS_PER_BUCKET - 1);
-
-  hash_keys = h->hash_keys;
-  k = search_keys;
-  r = result_indices;
-  n_left = n_search_keys;
-  n_elts = h->n_elts;
-
-  while (n_left >= 2)
-    {
-      u32 a0, b0, c0, bi0, match0, valid0;
-      u32 a1, b1, c1, bi1, match1, valid1;
-      uword k0, *h0;
-      uword k1, *h1;
-
-      k0 = k[0];
-      k1 = k[1];
-
-      /* Keys must be unique. */
-      ASSERT (k0 != k1);
-
-      n_left -= 2;
-      k += 2;
-
-      a0 = a1 = h->hash_seeds[0];
-      b0 = b1 = h->hash_seeds[1];
-      c0 = c1 = h->hash_seeds[2];
-      a0 ^= k0;
-      a1 ^= k1;
-#if uword_bits == 64
-      b0 ^= k0 >> 32;
-      b1 ^= k1 >> 32;
-#endif
-
-      hash_mix32_step_1 (a0, b0, c0);
-      hash_mix32_step_1 (a1, b1, c1);
-      hash_mix32_step_2 (a0, b0, c0);
-      hash_mix32_step_2 (a1, b1, c1);
-      hash_mix32_step_3 (a0, b0, c0);
-      hash_mix32_step_3 (a1, b1, c1);
-
-      bi0 = c0 & bucket_mask;
-      bi1 = c1 & bucket_mask;
-
-      h0 = hash_keys + bi0;
-      h1 = hash_keys + bi1;
-
-      /* Search two buckets. */
-      valid0 = qhash_get_valid_elt_mask (h, bi0);
-      valid1 = qhash_get_valid_elt_mask (h, bi1);
-
-      match0 = qhash_search_bucket (h0, k0, valid0);
-      match1 = qhash_search_bucket (h1, k1, valid1);
-
-      n_elts -= (match0 != 0) + (match1 != 0);
-
-      if (PREDICT_FALSE (valid0 == QHASH_ALL_VALID
-			 || valid1 == QHASH_ALL_VALID))
-	goto slow_path2;
-
-      valid0 ^= match0;
-      qhash_set_valid_elt_mask (h, bi0, valid0);
-
-      valid1 = bi0 == bi1 ? valid0 : valid1;
-      valid1 ^= match1;
-
-      qhash_set_valid_elt_mask (h, bi1, valid1);
-
-      r[0] = match0 ? bi0 + qhash_min_log2 (match0) : ~0;
-      r[1] = match1 ? bi1 + qhash_min_log2 (match1) : ~0;
-      r += 2;
-      continue;
-
-    slow_path2:
-      r[0] = unset_slow_path (v, elt_bytes, k0, bi0, valid0, match0, &n_elts);
-      if (bi0 == bi1)
-	{
-	  /* Search again in same bucket to test new overflow element. */
-	  valid1 = qhash_get_valid_elt_mask (h, bi0);
-	  if (!match1)
-	    {
-	      match1 = qhash_search_bucket (h1, k1, valid1);
-	      n_elts -= (match1 != 0);
-	    }
-	}
-      r[1] = unset_slow_path (v, elt_bytes, k1, bi1, valid1, match1, &n_elts);
-      r += 2;
-    }
-
-  while (n_left >= 1)
-    {
-      u32 a0, b0, c0, bi0, match0, valid0;
-      uword k0, *h0;
-
-      k0 = k[0];
-      n_left -= 1;
-      k += 1;
-
-      a0 = h->hash_seeds[0];
-      b0 = h->hash_seeds[1];
-      c0 = h->hash_seeds[2];
-      a0 ^= k0;
-#if uword_bits == 64
-      b0 ^= k0 >> 32;
-#endif
-
-      hash_mix32 (a0, b0, c0);
-
-      bi0 = c0 & bucket_mask;
-
-      h0 = hash_keys + bi0;
-
-      valid0 = qhash_get_valid_elt_mask (h, bi0);
-
-      match0 = qhash_search_bucket (h0, k0, valid0);
-      n_elts -= (match0 != 0);
-      qhash_set_valid_elt_mask (h, bi0, valid0 ^ match0);
-
-      r[0] = match0 ? bi0 + qhash_min_log2 (match0) : ~0;
-      r += 1;
-
-      if (PREDICT_FALSE (valid0 == QHASH_ALL_VALID))
-	r[-1] = unset_slow_path (v, elt_bytes, k0, bi0, valid0, match0,
-				 &n_elts);
-    }
-
-  h->n_elts = n_elts;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/qhash.h b/vppinfra/vppinfra/qhash.h
deleted file mode 100644
index 9dbbd971..00000000
--- a/vppinfra/vppinfra/qhash.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2006 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_qhash_h
-#define included_qhash_h
-
-#include <vppinfra/cache.h>
-#include <vppinfra/hash.h>
-
-/* Word hash tables. */
-typedef struct
-{
-  /* Number of elements in hash. */
-  u32 n_elts;
-
-  u32 log2_hash_size;
-
-  /* Jenkins hash seeds. */
-  u32 hash_seeds[3];
-
-  /* Fall back CLIB hash for overflow in fixed sized buckets. */
-  uword *overflow_hash;
-
-  u32 *overflow_counts, *overflow_free_indices;
-
-  u8 *hash_key_valid_bitmap;
-
-  uword *hash_keys;
-} qhash_t;
-
-always_inline qhash_t *
-qhash_header (void *v)
-{
-  return vec_header (v, sizeof (qhash_t));
-}
-
-always_inline uword
-qhash_elts (void *v)
-{
-  return v ? qhash_header (v)->n_elts : 0;
-}
-
-always_inline uword
-qhash_n_overflow (void *v)
-{
-  return v ? hash_elts (qhash_header (v)->overflow_hash) : 0;
-}
-
-#define QHASH_LOG2_KEYS_PER_BUCKET 2
-#define QHASH_KEYS_PER_BUCKET (1 << QHASH_LOG2_KEYS_PER_BUCKET)
-
-always_inline uword
-qhash_hash_mix (qhash_t * h, uword key)
-{
-  u32 a, b, c;
-
-  a = h->hash_seeds[0];
-  b = h->hash_seeds[1];
-  c = h->hash_seeds[2];
-
-  a ^= key;
-#if uword_bits == 64
-  b ^= key >> 32;
-#endif
-
-  hash_mix32 (a, b, c);
-
-  return c & pow2_mask (h->log2_hash_size);
-}
-
-#define qhash_resize(v,n) (v) = _qhash_resize ((v), (n), sizeof ((v)[0]))
-
-#define qhash_foreach(var,v,body)
-
-#define qhash_set_multiple(v,keys,n,results) \
-  (v) = _qhash_set_multiple ((v), sizeof ((v)[0]), (keys), (n), (results))
-
-#define qhash_unset_multiple(v,keys,n,results) \
-  _qhash_unset_multiple ((v), sizeof ((v)[0]), (keys), (n), (results))
-
-#define qhash_get(v,key)					\
-({								\
-  uword _qhash_get_k = (key);					\
-  qhash_get_first_match ((v), &_qhash_get_k, 1, &_qhash_get_k);	\
-})
-
-#define qhash_set(v,k)						\
-({								\
-  uword _qhash_set_k = (k);					\
-  qhash_set_multiple ((v), &_qhash_set_k, 1, &_qhash_set_k);	\
-  _qhash_set_k;							\
-})
-
-#define qhash_unset(v,k)						\
-({									\
-  uword _qhash_unset_k = (k);						\
-  qhash_unset_multiple ((v), &_qhash_unset_k, 1, &_qhash_unset_k);	\
-  _qhash_unset_k;							\
-})
-
-void *_qhash_resize (void *v, uword length, uword elt_bytes);
-
-/* Lookup multiple keys in the same hash table. */
-void
-qhash_get_multiple (void *v,
-		    uword * search_keys,
-		    uword n_search_keys, u32 * result_indices);
-
-/* Lookup multiple keys in the same hash table.
-   Returns index of first matching key. */
-u32
-qhash_get_first_match (void *v,
-		       uword * search_keys,
-		       uword n_search_keys, uword * matching_key);
-
-/* Set/unset helper functions. */
-void *_qhash_set_multiple (void *v,
-			   uword elt_bytes,
-			   uword * search_keys,
-			   uword n_search_keys, u32 * result_indices);
-void
-_qhash_unset_multiple (void *v,
-		       uword elt_bytes,
-		       uword * search_keys,
-		       uword n_search_keys, u32 * result_indices);
-
-#endif /* included_qhash_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/qsort.c b/vppinfra/vppinfra/qsort.c
deleted file mode 100644
index 2faa5897..00000000
--- a/vppinfra/vppinfra/qsort.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * Imported into CLIB by Eliot Dresselhaus from:
- *
- *  This file is part of
- *	MakeIndex - A formatter and format independent index processor
- *
- *  This file is public domain software donated by
- *  Nelson Beebe (beebe@science.utah.edu).
- *
- *  modifications copyright (c) 2003 Cisco Systems, Inc.
- */
-
-#include <vppinfra/clib.h>
-
-/*
- * qsort.c: Our own version of the system qsort routine which is faster by an
- * average of 25%, with lows and highs of 10% and 50%. The THRESHold below is
- * the insertion sort threshold, and has been adjusted for records of size 48
- * bytes. The MTHREShold is where we stop finding a better median.
- */
-
-#define THRESH  4		/* threshold for insertion */
-#define MTHRESH 6		/* threshold for median */
-
-typedef struct
-{
-  word qsz;			/* size of each record */
-  word thresh;			/* THRESHold in chars */
-  word mthresh;			/* MTHRESHold in chars */
-  int (*qcmp) (const void *, const void *);	/* the comparison routine */
-} qst_t;
-
-static void qst (qst_t * q, char *base, char *max);
-
-/*
- * qqsort: First, set up some global parameters for qst to share.
- * Then, quicksort with qst(), and then a cleanup insertion sort ourselves.
- * Sound simple?  It's not...
- */
-
-void
-qsort (void *base, uword n, uword size,
-       int (*compar) (const void *, const void *))
-{
-  char *i;
-  char *j;
-  char *lo;
-  char *hi;
-  char *min;
-  char c;
-  char *max;
-  qst_t _q, *q = &_q;
-
-  if (n <= 1)
-    return;
-
-  q->qsz = size;
-  q->qcmp = compar;
-  q->thresh = q->qsz * THRESH;
-  q->mthresh = q->qsz * MTHRESH;
-  max = base + n * q->qsz;
-  if (n >= THRESH)
-    {
-      qst (q, base, max);
-      hi = base + q->thresh;
-    }
-  else
-    {
-      hi = max;
-    }
-  /*
-   * First put smallest element, which must be in the first THRESH, in the
-   * first position as a sentinel.  This is done just by searching the
-   * first THRESH elements (or the first n if n < THRESH), finding the min,
-   * and swapping it into the first position.
-   */
-  for (j = lo = base; (lo += q->qsz) < hi;)
-    {
-      if ((*compar) (j, lo) > 0)
-	j = lo;
-    }
-  if (j != base)
-    {				/* swap j into place */
-      for (i = base, hi = base + q->qsz; i < hi;)
-	{
-	  c = *j;
-	  *j++ = *i;
-	  *i++ = c;
-	}
-    }
-  /*
-   * With our sentinel in place, we now run the following hyper-fast
-   * insertion sort. For each remaining element, min, from [1] to [n-1],
-   * set hi to the index of the element AFTER which this one goes. Then, do
-   * the standard insertion sort shift on a character at a time basis for
-   * each element in the frob.
-   */
-  for (min = base; (hi = min += q->qsz) < max;)
-    {
-      while ((*q->qcmp) (hi -= q->qsz, min) > 0);
-      if ((hi += q->qsz) != min)
-	{
-	  for (lo = min + q->qsz; --lo >= min;)
-	    {
-	      c = *lo;
-	      for (i = j = lo; (j -= q->qsz) >= hi; i = j)
-		*i = *j;
-	      *i = c;
-	    }
-	}
-    }
-}
-
-
-
-/*
- * qst: Do a quicksort.  First, find the median element, and put that one in
- * the first place as the discriminator.  (This "median" is just the median
- * of the first, last and middle elements).  (Using this median instead of
- * the first element is a big win). Then, the usual partitioning/swapping,
- * followed by moving the discriminator into the right place.  Then, figure
- * out the sizes of the two partions, do the smaller one recursively and the
- * larger one via a repeat of this code.  Stopping when there are less than
- * THRESH elements in a partition and cleaning up with an insertion sort (in
- * our caller) is a huge win. All data swaps are done in-line, which is
- * space-losing but time-saving. (And there are only three places where this
- * is done).
- */
-
-static void
-qst (qst_t * q, char *base, char *max)
-{
-  char *i;
-  char *j;
-  char *jj;
-  char *mid;
-  int ii;
-  char c;
-  char *tmp;
-  int lo;
-  int hi;
-  int qsz = q->qsz;
-
-  lo = (int) (max - base);	/* number of elements as chars */
-  do
-    {
-      /*
-       * At the top here, lo is the number of characters of elements in the
-       * current partition.  (Which should be max - base). Find the median
-       * of the first, last, and middle element and make that the middle
-       * element.  Set j to largest of first and middle.  If max is larger
-       * than that guy, then it's that guy, else compare max with loser of
-       * first and take larger.  Things are set up to prefer the middle,
-       * then the first in case of ties.
-       */
-      mid = i = base + qsz * ((unsigned) (lo / qsz) >> 1);
-      if (lo >= q->mthresh)
-	{
-	  j = ((*q->qcmp) ((jj = base), i) > 0 ? jj : i);
-	  if ((*q->qcmp) (j, (tmp = max - qsz)) > 0)
-	    {
-	      /* switch to first loser */
-	      j = (j == jj ? i : jj);
-	      if ((*q->qcmp) (j, tmp) < 0)
-		j = tmp;
-	    }
-	  if (j != i)
-	    {
-	      ii = qsz;
-	      do
-		{
-		  c = *i;
-		  *i++ = *j;
-		  *j++ = c;
-		}
-	      while (--ii);
-	    }
-	}
-      /* Semi-standard quicksort partitioning/swapping */
-      for (i = base, j = max - qsz;;)
-	{
-	  while (i < mid && (*q->qcmp) (i, mid) <= 0)
-	    i += qsz;
-	  while (j > mid)
-	    {
-	      if ((*q->qcmp) (mid, j) <= 0)
-		{
-		  j -= qsz;
-		  continue;
-		}
-	      tmp = i + qsz;	/* value of i after swap */
-	      if (i == mid)
-		{		/* j <-> mid, new mid is j */
-		  mid = jj = j;
-		}
-	      else
-		{		/* i <-> j */
-		  jj = j;
-		  j -= qsz;
-		}
-	      goto swap;
-	    }
-	  if (i == mid)
-	    {
-	      break;
-	    }
-	  else
-	    {			/* i <-> mid, new mid is i */
-	      jj = mid;
-	      tmp = mid = i;	/* value of i after swap */
-	      j -= qsz;
-	    }
-	swap:
-	  ii = qsz;
-	  do
-	    {
-	      c = *i;
-	      *i++ = *jj;
-	      *jj++ = c;
-	    }
-	  while (--ii);
-	  i = tmp;
-	}
-      /*
-       * Look at sizes of the two partitions, do the smaller one first by
-       * recursion, then do the larger one by making sure lo is its size,
-       * base and max are update correctly, and branching back. But only
-       * repeat (recursively or by branching) if the partition is of at
-       * least size THRESH.
-       */
-      i = (j = mid) + qsz;
-      if ((lo = (int) (j - base)) <= (hi = (int) (max - i)))
-	{
-	  if (lo >= q->thresh)
-	    qst (q, base, j);
-	  base = i;
-	  lo = hi;
-	}
-      else
-	{
-	  if (hi >= q->thresh)
-	    qst (q, i, max);
-	  max = j;
-	}
-    }
-  while (lo >= q->thresh);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/random.c b/vppinfra/vppinfra/random.c
deleted file mode 100644
index fa5bcc8c..00000000
--- a/vppinfra/vppinfra/random.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/random.h>
-
-/* Default random seed for standalone version of library.
-   Value can be overridden by platform code from e.g.
-   machine's clock count register. */
-u32 standalone_random_default_seed = 1;
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/random.h b/vppinfra/vppinfra/random.h
deleted file mode 100644
index 5c139d05..00000000
--- a/vppinfra/vppinfra/random.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_random_h
-#define included_random_h
-
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>	/* for vec_resize */
-#include <vppinfra/format.h>	/* for unformat_input_t */
-
-/** \file
-    Linear Congruential Random Number Generator
-
-    This specific random number generator is described in
-    "Numerical Recipes in C", 2nd edition, page 284. If you need
-    random numbers with really excellent statistics, take a look
-    at Chapter 7...
-
-    By definition, a linear congruential random number generator
-    is of the form: rand[i+1] = a*rand[i] + c (mod m) for specific
-    values of (a,c,m).
-
-    In this case, choose m = 2**32 and use the low-order 32-bits of
-    the 64-bit product a*N[i]. Knuth suggests the use of a=1664525,
-    H.W. Lewis has tested C=1013904223 extensively. This routine is
-    reputedly as good as any 32-bit LCRN, and costs only a single
-    multiply-add.
-
-    Several variants: 32/64-bit, machine word width,
-    f64 on the closed interval [0,1].
-*/
-
-/** \brief 32-bit random number generator */
-always_inline u32
-random_u32 (u32 * seed)
-{
-  *seed = (1664525 * *seed) + 1013904223;
-  return *seed;
-}
-
-/* External test routine. */
-int test_random_main (unformat_input_t * input);
-
-/** \brief Maximum value returned by random_u32() */
-always_inline u32
-random_u32_max (void)
-{
-  return 0xffffffff;
-}
-
-#ifdef CLIB_UNIX
-
-#include <unistd.h>		/* for getpid */
-
-/** \brief Default random seed (unix/linux user-mode) */
-always_inline uword
-random_default_seed (void)
-{
-  return getpid ();
-}
-
-#endif
-
-#ifdef CLIB_LINUX_KERNEL
-
-#include <linux/sched.h>	/* for jiffies */
-
-/** \brief Default random seed (Linux kernel) */
-always_inline uword
-random_default_seed (void)
-{
-  return jiffies;
-}
-
-#endif
-
-#ifdef CLIB_STANDALONE
-extern u32 standalone_random_default_seed;
-
-always_inline u32
-random_default_seed (void)
-{
-  return standalone_random_default_seed;
-}
-#endif
-
-/** \brief 64-bit random number generator
- * Again, constants courtesy of Donald Knuth.
- *
- */
-always_inline u64
-random_u64 (u64 * seed)
-{
-  *seed = 6364136223846793005ULL * *seed + 1442695040888963407ULL;
-  return *seed;
-}
-
-/** \brief machine word size random number generator */
-
-always_inline uword
-random_uword (u32 * seed)
-{
-  if (sizeof (uword) == sizeof (u64))
-    return random_u64 ((u64 *) seed);
-  else
-    return random_u32 (seed);
-}
-
-/** \brief Generate f64 random number in the interval [0,1] */
-always_inline f64
-random_f64 (u32 * seed)
-{
-  return (f64) random_u32 (seed) / (f64) random_u32_max ();
-}
-
-/** \brief Generate random character vector
-
-    From the alphabet a-z, lower case.
-    Returns a vector of the supplied length which is NOT guaranteed to be
-    NULL-terminated. FIXME?
-*/
-always_inline u8 *
-random_string (u32 * seed, uword len)
-{
-  u8 *alphabet = (u8 *) "abcdefghijklmnopqrstuvwxyz";
-  u8 *s = 0;
-  word i;
-
-  vec_resize (s, len);
-  for (i = 0; i < len; i++)
-    s[i] = alphabet[random_u32 (seed) % 26];
-
-  return s;
-}
-
-#endif /* included_random_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/random_buffer.c b/vppinfra/vppinfra/random_buffer.c
deleted file mode 100644
index df036980..00000000
--- a/vppinfra/vppinfra/random_buffer.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/random_buffer.h>
-
-/* Fill random buffer. */
-void
-clib_random_buffer_fill (clib_random_buffer_t * b, uword n_words)
-{
-  uword *w, n = n_words;
-
-  if (n < 256)
-    n = 256;
-
-  n = round_pow2 (n, 2 << ISAAC_LOG2_SIZE);
-
-  vec_add2 (b->buffer, w, n);
-  do
-    {
-      isaac2 (b->ctx, w);
-      w += 2 * ISAAC_SIZE;
-      n -= 2 * ISAAC_SIZE;
-    }
-  while (n > 0);
-}
-
-void
-clib_random_buffer_init (clib_random_buffer_t * b, uword seed)
-{
-  uword i, j;
-
-  memset (b, 0, sizeof (b[0]));
-
-  /* Seed ISAAC. */
-  for (i = 0; i < ARRAY_LEN (b->ctx); i++)
-    {
-      uword s[ISAAC_SIZE];
-
-      for (j = 0; j < ARRAY_LEN (s); j++)
-	s[j] = ARRAY_LEN (b->ctx) * (seed + j) + i;
-
-      isaac_init (&b->ctx[i], s);
-    }
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/random_buffer.h b/vppinfra/vppinfra/random_buffer.h
deleted file mode 100644
index eb318548..00000000
--- a/vppinfra/vppinfra/random_buffer.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_random_buffer_h
-#define included_clib_random_buffer_h
-
-#include <vppinfra/clib.h>
-#include <vppinfra/random_isaac.h>
-
-typedef struct
-{
-  /* Two parallel ISAAC contexts for speed. */
-  isaac_t ctx[2];
-
-  /* Random buffer. */
-  uword *buffer;
-
-  /* Cache up to 1 word worth of bytes for random data
-     less than one word at a time. */
-  uword n_cached_bytes;
-
-  union
-  {
-    u8 cached_bytes[sizeof (uword)];
-    uword cached_word;
-  };
-}
-clib_random_buffer_t;
-
-always_inline void
-clib_random_buffer_free (clib_random_buffer_t * b)
-{
-  vec_free (b->buffer);
-}
-
-/* Fill random buffer. */
-void clib_random_buffer_fill (clib_random_buffer_t * b, uword n_words);
-
-/* Initialize random buffer. */
-void clib_random_buffer_init (clib_random_buffer_t * b, uword seed);
-
-/* Returns word aligned random data, possibly filling buffer. */
-always_inline void *
-clib_random_buffer_get_data (clib_random_buffer_t * b, uword n_bytes)
-{
-  uword n_words, i, l;
-
-  l = b->n_cached_bytes;
-  if (n_bytes <= l)
-    {
-      b->n_cached_bytes = l - n_bytes;
-      return &b->cached_bytes[l];
-    }
-
-  n_words = n_bytes / sizeof (uword);
-  if (n_bytes % sizeof (uword))
-    n_words++;
-
-  /* Enough random words left? */
-  if (PREDICT_FALSE (n_words > vec_len (b->buffer)))
-    clib_random_buffer_fill (b, n_words);
-
-  i = vec_len (b->buffer) - n_words;
-  _vec_len (b->buffer) = i;
-
-  if (n_bytes < sizeof (uword))
-    {
-      b->cached_word = b->buffer[i];
-      b->n_cached_bytes = sizeof (uword) - n_bytes;
-      return b->cached_bytes;
-    }
-  else
-    return b->buffer + i;
-}
-
-#endif /* included_clib_random_buffer_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/random_isaac.c b/vppinfra/vppinfra/random_isaac.c
deleted file mode 100644
index 6f00fc32..00000000
--- a/vppinfra/vppinfra/random_isaac.c
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  ------------------------------------------------------------------------------
-  By Bob Jenkins, 1996, Public Domain
-  MODIFIED:
-  960327: Creation (addition of randinit, really)
-  970719: use context, not global variables, for internal state
-  980324: renamed seed to flag
-  980605: recommend ISAAC_LOG2_SIZE=4 for noncryptography.
-  010626: note this is public domain
-  ------------------------------------------------------------------------------
-
-  Modified for CLIB by Eliot Dresselhaus.
-  Dear Bob, Thanks for all the great work. - Eliot
-
-  modifications copyright (c) 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-/* ISAAC is Bob Jenkins' random number generator.
-   http://burtleburtle.net/bob/rand/isaacafa.html */
-
-#include <vppinfra/random_isaac.h>
-
-#if uword_bits != 32 && uword_bits != 64
-#error "isaac only works for 32 or 64 bit words"
-#endif
-
-#if uword_bits == 32
-
-#define ind32(mm,x)  (*(u32 *)((u8 *)(mm) + ((x) & ((ISAAC_SIZE-1)<<2))))
-#define rngstep32(mix,a,b,mm,m,m2,r,x,y)		\
-{							\
-  x = *m;						\
-  a = (a^(mix)) + *(m2++);				\
-  *(m++) = y = ind32(mm,x) + a + b;			\
-  *(r++) = b = ind32(mm,y>>ISAAC_LOG2_SIZE) + x;	\
-}
-
-void
-isaac (isaac_t * ctx, uword * results)
-{
-  u32 a, b, c, x, y, *m, *mm, *m2, *r, *mend;
-
-  mm = ctx->memory;
-  r = results;
-  a = ctx->a;
-  b = ctx->b;
-  c = ctx->c;
-
-  b += ++c;
-  mend = m2 = mm + ARRAY_LEN (ctx->memory) / 2;
-  m = mm;
-  while (m < mend)
-    {
-      rngstep32 (a << 13, a, b, mm, m, m2, r, x, y);
-      rngstep32 (a >> 6, a, b, mm, m, m2, r, x, y);
-      rngstep32 (a << 2, a, b, mm, m, m2, r, x, y);
-      rngstep32 (a >> 16, a, b, mm, m, m2, r, x, y);
-    }
-
-  m2 = mm;
-  while (m2 < mend)
-    {
-      rngstep32 (a << 13, a, b, mm, m, m2, r, x, y);
-      rngstep32 (a >> 6, a, b, mm, m, m2, r, x, y);
-      rngstep32 (a << 2, a, b, mm, m, m2, r, x, y);
-      rngstep32 (a >> 16, a, b, mm, m, m2, r, x, y);
-    }
-
-  ctx->a = a;
-  ctx->b = b;
-  ctx->c = c;
-}
-
-/* Perform 2 isaac runs with different contexts simultaneously. */
-void
-isaac2 (isaac_t * ctx, uword * results)
-{
-#define _(n) \
-  u32 a##n, b##n, c##n, x##n, y##n, * m##n, * mm##n, * m2##n, * r##n, * mend##n
-
-  _(0);
-  _(1);
-  (void) mend1;			/* "set but unused variable" error on mend1 with gcc 4.9  */
-#undef _
-
-#define _(n)							\
-do {								\
-  mm##n = ctx[(n)].memory;					\
-  r##n = results + (n) * ISAAC_SIZE;				\
-  a##n = ctx[(n)].a;						\
-  b##n = ctx[(n)].b;						\
-  c##n = ctx[(n)].c;						\
-  b##n += ++c##n;						\
-  mend##n = m2##n = mm##n + ARRAY_LEN (ctx[(n)].memory) / 2;	\
-  m##n = mm##n;							\
-} while (0)
-
-  _(0);
-  _(1);
-
-#undef _
-
-  while (m0 < mend0)
-    {
-      rngstep32 (a0 << 13, a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep32 (a1 << 13, a1, b1, mm1, m1, m21, r1, x1, y1);
-      rngstep32 (a0 >> 6, a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep32 (a1 >> 6, a1, b1, mm1, m1, m21, r1, x1, y1);
-      rngstep32 (a0 << 2, a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep32 (a1 << 2, a1, b1, mm1, m1, m21, r1, x1, y1);
-      rngstep32 (a0 >> 16, a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep32 (a1 >> 16, a1, b1, mm1, m1, m21, r1, x1, y1);
-    }
-
-  m20 = mm0;
-  m21 = mm1;
-  while (m20 < mend0)
-    {
-      rngstep32 (a0 << 13, a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep32 (a1 << 13, a1, b1, mm1, m1, m21, r1, x1, y1);
-      rngstep32 (a0 >> 6, a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep32 (a1 >> 6, a1, b1, mm1, m1, m21, r1, x1, y1);
-      rngstep32 (a0 << 2, a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep32 (a1 << 2, a1, b1, mm1, m1, m21, r1, x1, y1);
-      rngstep32 (a0 >> 16, a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep32 (a1 >> 16, a1, b1, mm1, m1, m21, r1, x1, y1);
-    }
-
-  ctx[0].a = a0;
-  ctx[0].b = b0;
-  ctx[0].c = c0;
-  ctx[1].a = a1;
-  ctx[1].b = b1;
-  ctx[1].c = c1;
-}
-
-#define mix32(a,b,c,d,e,f,g,h)			\
-{						\
-   a^=b<<11; d+=a; b+=c;			\
-   b^=c>>2;  e+=b; c+=d;			\
-   c^=d<<8;  f+=c; d+=e;			\
-   d^=e>>16; g+=d; e+=f;			\
-   e^=f<<10; h+=e; f+=g;			\
-   f^=g>>4;  a+=f; g+=h;			\
-   g^=h<<8;  b+=g; h+=a;			\
-   h^=a>>9;  c+=h; a+=b;			\
-}
-
-void
-isaac_init (isaac_t * ctx, uword * seeds)
-{
-  word i;
-  u32 a, b, c, d, e, f, g, h, *m, *r;
-
-  ctx->a = ctx->b = ctx->c = 0;
-  m = ctx->memory;
-  r = seeds;
-
-  a = b = c = d = e = f = g = h = 0x9e3779b9;	/* the golden ratio */
-
-  for (i = 0; i < 4; ++i)	/* scramble it */
-    mix32 (a, b, c, d, e, f, g, h);
-
-  /* initialize using the contents of r[] as the seed */
-  for (i = 0; i < ISAAC_SIZE; i += 8)
-    {
-      a += r[i];
-      b += r[i + 1];
-      c += r[i + 2];
-      d += r[i + 3];
-      e += r[i + 4];
-      f += r[i + 5];
-      g += r[i + 6];
-      h += r[i + 7];
-      mix32 (a, b, c, d, e, f, g, h);
-      m[i] = a;
-      m[i + 1] = b;
-      m[i + 2] = c;
-      m[i + 3] = d;
-      m[i + 4] = e;
-      m[i + 5] = f;
-      m[i + 6] = g;
-      m[i + 7] = h;
-    }
-
-  /* do a second pass to make all of the seed affect all of m */
-  for (i = 0; i < ISAAC_SIZE; i += 8)
-    {
-      a += m[i];
-      b += m[i + 1];
-      c += m[i + 2];
-      d += m[i + 3];
-      e += m[i + 4];
-      f += m[i + 5];
-      g += m[i + 6];
-      h += m[i + 7];
-      mix32 (a, b, c, d, e, f, g, h);
-      m[i] = a;
-      m[i + 1] = b;
-      m[i + 2] = c;
-      m[i + 3] = d;
-      m[i + 4] = e;
-      m[i + 5] = f;
-      m[i + 6] = g;
-      m[i + 7] = h;
-    }
-}
-#endif /* uword_bits == 32 */
-
-#if uword_bits == 64
-
-#define ind64(mm,x)  (*(u64 *)((u8 *)(mm) + ((x) & ((ISAAC_SIZE-1)<<3))))
-#define rngstep64(mix,a,b,mm,m,m2,r,x,y)		\
-{							\
-  x = *m;						\
-  a = (mix) + *(m2++);					\
-  *(m++) = y = ind64(mm,x) + a + b;			\
-  *(r++) = b = ind64(mm,y>>ISAAC_LOG2_SIZE) + x;	\
-}
-
-void
-isaac (isaac_t * ctx, uword * results)
-{
-  u64 a, b, c, x, y, *m, *mm, *m2, *r, *mend;
-
-  mm = ctx->memory;
-  r = results;
-  a = ctx->a;
-  b = ctx->b;
-  c = ctx->c;
-
-  b += ++c;
-  mend = m2 = mm + ARRAY_LEN (ctx->memory) / 2;
-  m = mm;
-  while (m < mend)
-    {
-      rngstep64 (~(a ^ (a << 21)), a, b, mm, m, m2, r, x, y);
-      rngstep64 (a ^ (a >> 5), a, b, mm, m, m2, r, x, y);
-      rngstep64 (a ^ (a << 12), a, b, mm, m, m2, r, x, y);
-      rngstep64 (a ^ (a >> 33), a, b, mm, m, m2, r, x, y);
-    }
-
-  m2 = mm;
-  while (m2 < mend)
-    {
-      rngstep64 (~(a ^ (a << 21)), a, b, mm, m, m2, r, x, y);
-      rngstep64 (a ^ (a >> 5), a, b, mm, m, m2, r, x, y);
-      rngstep64 (a ^ (a << 12), a, b, mm, m, m2, r, x, y);
-      rngstep64 (a ^ (a >> 33), a, b, mm, m, m2, r, x, y);
-    }
-
-  ctx->a = a;
-  ctx->b = b;
-  ctx->c = c;
-}
-
-/* Perform 2 isaac runs with different contexts simultaneously. */
-void
-isaac2 (isaac_t * ctx, uword * results)
-{
-#define _(n) \
-  u64 a##n, b##n, c##n, x##n, y##n, * m##n, * mm##n, * m2##n, * r##n, * mend##n
-
-  _(0);
-  _(1);
-
-#undef _
-
-#define _(n)							\
-do {								\
-  mm##n = ctx[(n)].memory;					\
-  r##n = results + (n) * ISAAC_SIZE;				\
-  a##n = ctx[(n)].a;						\
-  b##n = ctx[(n)].b;						\
-  c##n = ctx[(n)].c;						\
-  b##n += ++c##n;						\
-  mend##n = m2##n = mm##n + ARRAY_LEN (ctx[(n)].memory) / 2;	\
-  m##n = mm##n;							\
-} while (0)
-
-  _(0);
-  _(1);
-
-#undef _
-
-  (void) mend1;			/* compiler warning */
-
-  while (m0 < mend0)
-    {
-      rngstep64 (~(a0 ^ (a0 << 21)), a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep64 (~(a1 ^ (a1 << 21)), a1, b1, mm1, m1, m21, r1, x1, y1);
-      rngstep64 (a0 ^ (a0 >> 5), a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep64 (a1 ^ (a1 >> 5), a1, b1, mm1, m1, m21, r1, x1, y1);
-      rngstep64 (a0 ^ (a0 << 12), a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep64 (a1 ^ (a1 << 12), a1, b1, mm1, m1, m21, r1, x1, y1);
-      rngstep64 (a0 ^ (a0 >> 33), a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep64 (a1 ^ (a1 >> 33), a1, b1, mm1, m1, m21, r1, x1, y1);
-    }
-
-  m20 = mm0;
-  m21 = mm1;
-  while (m20 < mend0)
-    {
-      rngstep64 (~(a0 ^ (a0 << 21)), a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep64 (~(a1 ^ (a1 << 21)), a1, b1, mm1, m1, m21, r1, x1, y1);
-      rngstep64 (a0 ^ (a0 >> 5), a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep64 (a1 ^ (a1 >> 5), a1, b1, mm1, m1, m21, r1, x1, y1);
-      rngstep64 (a0 ^ (a0 << 12), a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep64 (a1 ^ (a1 << 12), a1, b1, mm1, m1, m21, r1, x1, y1);
-      rngstep64 (a0 ^ (a0 >> 33), a0, b0, mm0, m0, m20, r0, x0, y0);
-      rngstep64 (a1 ^ (a1 >> 33), a1, b1, mm1, m1, m21, r1, x1, y1);
-    }
-
-  ctx[0].a = a0;
-  ctx[0].b = b0;
-  ctx[0].c = c0;
-  ctx[1].a = a1;
-  ctx[1].b = b1;
-  ctx[1].c = c1;
-}
-
-#define mix64(a,b,c,d,e,f,g,h)			\
-{						\
-   a-=e; f^=h>>9;  h+=a;			\
-   b-=f; g^=a<<9;  a+=b;			\
-   c-=g; h^=b>>23; b+=c;			\
-   d-=h; a^=c<<15; c+=d;			\
-   e-=a; b^=d>>14; d+=e;			\
-   f-=b; c^=e<<20; e+=f;			\
-   g-=c; d^=f>>17; f+=g;			\
-   h-=d; e^=g<<14; g+=h;			\
-}
-
-void
-isaac_init (isaac_t * ctx, uword * seeds)
-{
-  word i;
-  u64 a, b, c, d, e, f, g, h, *m, *r;
-
-  ctx->a = ctx->b = ctx->c = 0;
-  m = ctx->memory;
-  r = seeds;
-
-  a = b = c = d = e = f = g = h = 0x9e3779b97f4a7c13LL;	/* the golden ratio */
-
-  for (i = 0; i < 4; ++i)	/* scramble it */
-    mix64 (a, b, c, d, e, f, g, h);
-
-  for (i = 0; i < ISAAC_SIZE; i += 8)	/* fill in mm[] with messy stuff */
-    {
-      a += r[i];
-      b += r[i + 1];
-      c += r[i + 2];
-      d += r[i + 3];
-      e += r[i + 4];
-      f += r[i + 5];
-      g += r[i + 6];
-      h += r[i + 7];
-      mix64 (a, b, c, d, e, f, g, h);
-      m[i] = a;
-      m[i + 1] = b;
-      m[i + 2] = c;
-      m[i + 3] = d;
-      m[i + 4] = e;
-      m[i + 5] = f;
-      m[i + 6] = g;
-      m[i + 7] = h;
-    }
-
-  /* do a second pass to make all of the seed affect all of mm */
-  for (i = 0; i < ISAAC_SIZE; i += 8)
-    {
-      a += m[i];
-      b += m[i + 1];
-      c += m[i + 2];
-      d += m[i + 3];
-      e += m[i + 4];
-      f += m[i + 5];
-      g += m[i + 6];
-      h += m[i + 7];
-      mix64 (a, b, c, d, e, f, g, h);
-      m[i] = a;
-      m[i + 1] = b;
-      m[i + 2] = c;
-      m[i + 3] = d;
-      m[i + 4] = e;
-      m[i + 5] = f;
-      m[i + 6] = g;
-      m[i + 7] = h;
-    }
-}
-#endif /* uword_bits == 64 */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/random_isaac.h b/vppinfra/vppinfra/random_isaac.h
deleted file mode 100644
index 803fbd62..00000000
--- a/vppinfra/vppinfra/random_isaac.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  ------------------------------------------------------------------------------
-  By Bob Jenkins, 1996, Public Domain
-  MODIFIED:
-  960327: Creation (addition of randinit, really)
-  970719: use context, not global variables, for internal state
-  980324: renamed seed to flag
-  980605: recommend ISAAC_LOG2_SIZE=4 for noncryptography.
-  010626: note this is public domain
-  ------------------------------------------------------------------------------
-
-  Modified for CLIB by Eliot Dresselhaus.
-  Dear Bob, Thanks for all the great work. - Eliot
-
-  modifications copyright (c) 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_random_isaac_h
-#define included_random_isaac_h
-
-#include <vppinfra/clib.h>	/* for u32/u64 */
-#include <vppinfra/format.h>	/* for unformat_input_t */
-
-/* Bob recommends 8 for crypto, 4 for simulations */
-#define ISAAC_LOG2_SIZE   (4)
-#define ISAAC_SIZE (1 << ISAAC_LOG2_SIZE)
-
-typedef struct
-{
-  uword memory[ISAAC_SIZE];
-  uword a, b, c;
-} isaac_t;
-
-void isaac (isaac_t * ctx, uword * results);
-void isaac2 (isaac_t * ctx, uword * results);
-void isaac_init (isaac_t * ctx, uword * results);
-
-int test_isaac_main (unformat_input_t * input);
-
-#endif /* included_random_isaac_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/serialize.c b/vppinfra/vppinfra/serialize.c
deleted file mode 100644
index 5d401a08..00000000
--- a/vppinfra/vppinfra/serialize.c
+++ /dev/null
@@ -1,1254 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-/* Turn data structures into byte streams for saving or transport. */
-
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/serialize.h>
-
-void
-serialize_64 (serialize_main_t * m, va_list * va)
-{
-  u64 x = va_arg (*va, u64);
-  u32 lo, hi;
-  lo = x;
-  hi = x >> 32;
-  serialize_integer (m, lo, sizeof (lo));
-  serialize_integer (m, hi, sizeof (hi));
-}
-
-void
-serialize_32 (serialize_main_t * m, va_list * va)
-{
-  u32 x = va_arg (*va, u32);
-  serialize_integer (m, x, sizeof (x));
-}
-
-void
-serialize_16 (serialize_main_t * m, va_list * va)
-{
-  u32 x = va_arg (*va, u32);
-  serialize_integer (m, x, sizeof (u16));
-}
-
-void
-serialize_8 (serialize_main_t * m, va_list * va)
-{
-  u32 x = va_arg (*va, u32);
-  serialize_integer (m, x, sizeof (u8));
-}
-
-void
-unserialize_64 (serialize_main_t * m, va_list * va)
-{
-  u64 *x = va_arg (*va, u64 *);
-  u32 lo, hi;
-  unserialize_integer (m, &lo, sizeof (lo));
-  unserialize_integer (m, &hi, sizeof (hi));
-  *x = ((u64) hi << 32) | (u64) lo;
-}
-
-void
-unserialize_32 (serialize_main_t * m, va_list * va)
-{
-  u32 *x = va_arg (*va, u32 *);
-  unserialize_integer (m, x, sizeof (x[0]));
-}
-
-void
-unserialize_16 (serialize_main_t * m, va_list * va)
-{
-  u16 *x = va_arg (*va, u16 *);
-  u32 t;
-  unserialize_integer (m, &t, sizeof (x[0]));
-  x[0] = t;
-}
-
-void
-unserialize_8 (serialize_main_t * m, va_list * va)
-{
-  u8 *x = va_arg (*va, u8 *);
-  u32 t;
-  unserialize_integer (m, &t, sizeof (x[0]));
-  x[0] = t;
-}
-
-void
-serialize_f64 (serialize_main_t * m, va_list * va)
-{
-  f64 x = va_arg (*va, f64);
-  union
-  {
-    f64 f;
-    u64 i;
-  } y;
-  y.f = x;
-  serialize (m, serialize_64, y.i);
-}
-
-void
-serialize_f32 (serialize_main_t * m, va_list * va)
-{
-  f32 x = va_arg (*va, f64);
-  union
-  {
-    f32 f;
-    u32 i;
-  } y;
-  y.f = x;
-  serialize_integer (m, y.i, sizeof (y.i));
-}
-
-void
-unserialize_f64 (serialize_main_t * m, va_list * va)
-{
-  f64 *x = va_arg (*va, f64 *);
-  union
-  {
-    f64 f;
-    u64 i;
-  } y;
-  unserialize (m, unserialize_64, &y.i);
-  *x = y.f;
-}
-
-void
-unserialize_f32 (serialize_main_t * m, va_list * va)
-{
-  f32 *x = va_arg (*va, f32 *);
-  union
-  {
-    f32 f;
-    u32 i;
-  } y;
-  unserialize_integer (m, &y.i, sizeof (y.i));
-  *x = y.f;
-}
-
-void
-serialize_cstring (serialize_main_t * m, char *s)
-{
-  u32 len = s ? strlen (s) : 0;
-  void *p;
-
-  serialize_likely_small_unsigned_integer (m, len);
-  if (len > 0)
-    {
-      p = serialize_get (m, len);
-      clib_memcpy (p, s, len);
-    }
-}
-
-void
-unserialize_cstring (serialize_main_t * m, char **s)
-{
-  char *p, *r = 0;
-  u32 len;
-
-  len = unserialize_likely_small_unsigned_integer (m);
-
-  /*
-   * Given broken enough data, we could get len = 0xFFFFFFFF.
-   * Add one, it overflows, we call vec_new (char, 0), then
-   * memcpy until we bus error.
-   */
-  if (len > 0 && len != 0xFFFFFFFF)
-    {
-      r = vec_new (char, len + 1);
-      p = unserialize_get (m, len);
-      clib_memcpy (r, p, len);
-
-      /* Null terminate. */
-      r[len] = 0;
-    }
-  *s = r;
-}
-
-/* vec_serialize/vec_unserialize helper functions for basic vector types. */
-void
-serialize_vec_8 (serialize_main_t * m, va_list * va)
-{
-  u8 *s = va_arg (*va, u8 *);
-  u32 n = va_arg (*va, u32);
-  u8 *p = serialize_get (m, n * sizeof (u8));
-  clib_memcpy (p, s, n * sizeof (u8));
-}
-
-void
-unserialize_vec_8 (serialize_main_t * m, va_list * va)
-{
-  u8 *s = va_arg (*va, u8 *);
-  u32 n = va_arg (*va, u32);
-  u8 *p = unserialize_get (m, n);
-  clib_memcpy (s, p, n);
-}
-
-#define _(n_bits)							\
-  void serialize_vec_##n_bits (serialize_main_t * m, va_list * va)	\
-  {									\
-    u##n_bits * s = va_arg (*va, u##n_bits *);				\
-    u32 n = va_arg (*va, u32);						\
-    u##n_bits * p = serialize_get (m, n * sizeof (s[0]));		\
-									\
-    while (n >= 4)							\
-      {									\
-	p[0] = clib_host_to_net_u##n_bits (s[0]);			\
-	p[1] = clib_host_to_net_u##n_bits (s[1]);			\
-	p[2] = clib_host_to_net_u##n_bits (s[2]);			\
-	p[3] = clib_host_to_net_u##n_bits (s[3]);			\
-	s += 4;								\
-	p += 4;								\
-	n -= 4;								\
-      }									\
-									\
-    while (n >= 1)							\
-      {									\
-	p[0] = clib_host_to_net_u##n_bits (s[0]);			\
-	s += 1;								\
-	p += 1;								\
-	n -= 1;								\
-      }									\
-  }									\
-									\
-  void unserialize_vec_##n_bits (serialize_main_t * m, va_list * va)	\
-  {									\
-    u##n_bits * s = va_arg (*va, u##n_bits *);				\
-    u32 n = va_arg (*va, u32);						\
-    u##n_bits * p = unserialize_get (m, n * sizeof (s[0]));		\
-									\
-    while (n >= 4)							\
-      {									\
-	s[0] = clib_net_to_host_mem_u##n_bits (&p[0]);			\
-	s[1] = clib_net_to_host_mem_u##n_bits (&p[1]);			\
-	s[2] = clib_net_to_host_mem_u##n_bits (&p[2]);			\
-	s[3] = clib_net_to_host_mem_u##n_bits (&p[3]);			\
-	s += 4;								\
-	p += 4;								\
-	n -= 4;								\
-      }									\
-									\
-    while (n >= 1)							\
-      {									\
-	s[0] = clib_net_to_host_mem_u##n_bits (&p[0]);			\
-	s += 1;								\
-	p += 1;								\
-	n -= 1;								\
-      }									\
-  }
-
-_(16);
-_(32);
-_(64);
-
-#undef _
-
-#define SERIALIZE_VECTOR_CHUNK_SIZE 64
-
-void
-serialize_vector (serialize_main_t * m, va_list * va)
-{
-  void *vec = va_arg (*va, void *);
-  u32 elt_bytes = va_arg (*va, u32);
-  serialize_function_t *f = va_arg (*va, serialize_function_t *);
-  u32 l = vec_len (vec);
-  void *p = vec;
-
-  serialize_integer (m, l, sizeof (l));
-
-  /* Serialize vector in chunks for cache locality. */
-  while (l != 0)
-    {
-      u32 n = clib_min (SERIALIZE_VECTOR_CHUNK_SIZE, l);
-      serialize (m, f, p, n);
-      l -= n;
-      p += SERIALIZE_VECTOR_CHUNK_SIZE * elt_bytes;
-    }
-}
-
-void *
-unserialize_vector_ha (serialize_main_t * m,
-		       u32 elt_bytes,
-		       u32 header_bytes,
-		       u32 align, u32 max_length, serialize_function_t * f)
-{
-  void *v, *p;
-  u32 l;
-
-  unserialize_integer (m, &l, sizeof (l));
-  if (l > max_length)
-    serialize_error (&m->header,
-		     clib_error_create ("bad vector length %d", l));
-  p = v = _vec_resize (0, l, (uword) l * elt_bytes, header_bytes,
-		       /* align */ align);
-
-  while (l != 0)
-    {
-      u32 n = clib_min (SERIALIZE_VECTOR_CHUNK_SIZE, l);
-      unserialize (m, f, p, n);
-      l -= n;
-      p += SERIALIZE_VECTOR_CHUNK_SIZE * elt_bytes;
-    }
-  return v;
-}
-
-void
-unserialize_aligned_vector (serialize_main_t * m, va_list * va)
-{
-  void **vec = va_arg (*va, void **);
-  u32 elt_bytes = va_arg (*va, u32);
-  serialize_function_t *f = va_arg (*va, serialize_function_t *);
-  u32 align = va_arg (*va, u32);
-
-  *vec = unserialize_vector_ha (m, elt_bytes,
-				/* header_bytes */ 0,
-				/* align */ align,
-				/* max_length */ ~0,
-				f);
-}
-
-void
-unserialize_vector (serialize_main_t * m, va_list * va)
-{
-  void **vec = va_arg (*va, void **);
-  u32 elt_bytes = va_arg (*va, u32);
-  serialize_function_t *f = va_arg (*va, serialize_function_t *);
-
-  *vec = unserialize_vector_ha (m, elt_bytes,
-				/* header_bytes */ 0,
-				/* align */ 0,
-				/* max_length */ ~0,
-				f);
-}
-
-void
-serialize_bitmap (serialize_main_t * m, uword * b)
-{
-  u32 l, i, n_u32s;
-
-  l = vec_len (b);
-  n_u32s = l * sizeof (b[0]) / sizeof (u32);
-  serialize_integer (m, n_u32s, sizeof (n_u32s));
-
-  /* Send 32 bit words, low-order word first on 64 bit. */
-  for (i = 0; i < l; i++)
-    {
-      serialize_integer (m, b[i], sizeof (u32));
-      if (BITS (uword) == 64)
-	serialize_integer (m, (u64) b[i] >> (u64) 32, sizeof (u32));
-    }
-}
-
-uword *
-unserialize_bitmap (serialize_main_t * m)
-{
-  uword *b = 0;
-  u32 i, n_u32s;
-
-  unserialize_integer (m, &n_u32s, sizeof (n_u32s));
-  if (n_u32s == 0)
-    return b;
-
-  i = (n_u32s * sizeof (u32) + sizeof (b[0]) - 1) / sizeof (b[0]);
-  vec_resize (b, i);
-  for (i = 0; i < n_u32s; i++)
-    {
-      u32 data;
-      unserialize_integer (m, &data, sizeof (u32));
-
-      /* Low-word is first on 64 bit. */
-      if (BITS (uword) == 64)
-	{
-	  if ((i % 2) == 0)
-	    b[i / 2] |= (u64) data << (u64) 0;
-	  else
-	    b[i / 2] |= (u64) data << (u64) 32;
-	}
-      else
-	{
-	  b[i] = data;
-	}
-    }
-
-  return b;
-}
-
-void
-serialize_pool (serialize_main_t * m, va_list * va)
-{
-  void *pool = va_arg (*va, void *);
-  u32 elt_bytes = va_arg (*va, u32);
-  serialize_function_t *f = va_arg (*va, serialize_function_t *);
-  u32 l, lo, hi;
-  pool_header_t *p;
-
-  l = vec_len (pool);
-  serialize_integer (m, l, sizeof (u32));
-  if (l == 0)
-    return;
-  p = pool_header (pool);
-
-  /* No need to send free bitmap.  Need to send index vector
-     to guarantee that unserialized pool will be identical. */
-  vec_serialize (m, p->free_indices, serialize_vec_32);
-
-  pool_foreach_region (lo, hi, pool,
-		       serialize (m, f, pool + lo * elt_bytes, hi - lo));
-}
-
-static void *
-unserialize_pool_helper (serialize_main_t * m,
-			 u32 elt_bytes, u32 align, serialize_function_t * f)
-{
-  void *v;
-  u32 i, l, lo, hi;
-  pool_header_t *p;
-
-  unserialize_integer (m, &l, sizeof (l));
-  if (l == 0)
-    {
-      return 0;
-    }
-
-  v = _vec_resize (0, l, (uword) l * elt_bytes, sizeof (p[0]), align);
-  p = pool_header (v);
-
-  vec_unserialize (m, &p->free_indices, unserialize_vec_32);
-
-  /* Construct free bitmap. */
-  p->free_bitmap = 0;
-  for (i = 0; i < vec_len (p->free_indices); i++)
-    p->free_bitmap = clib_bitmap_ori (p->free_bitmap, p->free_indices[i]);
-
-  pool_foreach_region (lo, hi, v,
-		       unserialize (m, f, v + lo * elt_bytes, hi - lo));
-
-  return v;
-}
-
-void
-unserialize_pool (serialize_main_t * m, va_list * va)
-{
-  void **result = va_arg (*va, void **);
-  u32 elt_bytes = va_arg (*va, u32);
-  serialize_function_t *f = va_arg (*va, serialize_function_t *);
-  *result = unserialize_pool_helper (m, elt_bytes, /* align */ 0, f);
-}
-
-void
-unserialize_aligned_pool (serialize_main_t * m, va_list * va)
-{
-  void **result = va_arg (*va, void **);
-  u32 elt_bytes = va_arg (*va, u32);
-  u32 align = va_arg (*va, u32);
-  serialize_function_t *f = va_arg (*va, serialize_function_t *);
-  *result = unserialize_pool_helper (m, elt_bytes, align, f);
-}
-
-static void
-serialize_vec_heap_elt (serialize_main_t * m, va_list * va)
-{
-  heap_elt_t *e = va_arg (*va, heap_elt_t *);
-  u32 i, n = va_arg (*va, u32);
-  for (i = 0; i < n; i++)
-    {
-      serialize_integer (m, e[i].offset, sizeof (e[i].offset));
-      serialize_integer (m, e[i].next, sizeof (e[i].next));
-      serialize_integer (m, e[i].prev, sizeof (e[i].prev));
-    }
-}
-
-static void
-unserialize_vec_heap_elt (serialize_main_t * m, va_list * va)
-{
-  heap_elt_t *e = va_arg (*va, heap_elt_t *);
-  u32 i, n = va_arg (*va, u32);
-  for (i = 0; i < n; i++)
-    {
-      unserialize_integer (m, &e[i].offset, sizeof (e[i].offset));
-      unserialize_integer (m, &e[i].next, sizeof (e[i].next));
-      unserialize_integer (m, &e[i].prev, sizeof (e[i].prev));
-    }
-}
-
-void
-serialize_heap (serialize_main_t * m, va_list * va)
-{
-  void *heap = va_arg (*va, void *);
-  serialize_function_t *f = va_arg (*va, serialize_function_t *);
-  u32 i, l;
-  heap_header_t *h;
-
-  l = vec_len (heap);
-  serialize_integer (m, l, sizeof (u32));
-  if (l == 0)
-    return;
-
-  h = heap_header (heap);
-
-#define foreach_serialize_heap_header_integer \
-  _ (head) _ (tail) _ (used_count) _ (max_len) _ (flags) _ (elt_bytes)
-
-#define _(f) serialize_integer (m, h->f, sizeof (h->f));
-  foreach_serialize_heap_header_integer;
-#undef _
-
-  serialize_integer (m, vec_len (h->free_lists), sizeof (u32));
-  for (i = 0; i < vec_len (h->free_lists); i++)
-    vec_serialize (m, h->free_lists[i], serialize_vec_32);
-
-  vec_serialize (m, h->elts, serialize_vec_heap_elt);
-  vec_serialize (m, h->small_free_elt_free_index, serialize_vec_32);
-  vec_serialize (m, h->free_elts, serialize_vec_32);
-
-  /* Serialize data in heap. */
-  {
-    heap_elt_t *e, *end;
-    e = h->elts + h->head;
-    end = h->elts + h->tail;
-    while (1)
-      {
-	if (!heap_is_free (e))
-	  {
-	    void *v = heap + heap_offset (e) * h->elt_bytes;
-	    u32 n = heap_elt_size (heap, e);
-	    serialize (m, f, v, n);
-	  }
-	if (e == end)
-	  break;
-	e = heap_next (e);
-      }
-  }
-}
-
-void
-unserialize_heap (serialize_main_t * m, va_list * va)
-{
-  void **result = va_arg (*va, void **);
-  serialize_function_t *f = va_arg (*va, serialize_function_t *);
-  u32 i, vl, fl;
-  heap_header_t h;
-  void *heap;
-
-  unserialize_integer (m, &vl, sizeof (u32));
-  if (vl == 0)
-    {
-      *result = 0;
-      return;
-    }
-
-  memset (&h, 0, sizeof (h));
-#define _(f) unserialize_integer (m, &h.f, sizeof (h.f));
-  foreach_serialize_heap_header_integer;
-#undef _
-
-  unserialize_integer (m, &fl, sizeof (u32));
-  vec_resize (h.free_lists, fl);
-
-  for (i = 0; i < vec_len (h.free_lists); i++)
-    vec_unserialize (m, &h.free_lists[i], unserialize_vec_32);
-
-  vec_unserialize (m, &h.elts, unserialize_vec_heap_elt);
-  vec_unserialize (m, &h.small_free_elt_free_index, unserialize_vec_32);
-  vec_unserialize (m, &h.free_elts, unserialize_vec_32);
-
-  /* Re-construct used elt bitmap. */
-  if (CLIB_DEBUG > 0)
-    {
-      heap_elt_t *e;
-      vec_foreach (e, h.elts)
-      {
-	if (!heap_is_free (e))
-	  h.used_elt_bitmap = clib_bitmap_ori (h.used_elt_bitmap, e - h.elts);
-      }
-    }
-
-  heap = *result = _heap_new (vl, h.elt_bytes);
-  heap_header (heap)[0] = h;
-
-  /* Unserialize data in heap. */
-  {
-    heap_elt_t *e, *end;
-    e = h.elts + h.head;
-    end = h.elts + h.tail;
-    while (1)
-      {
-	if (!heap_is_free (e))
-	  {
-	    void *v = heap + heap_offset (e) * h.elt_bytes;
-	    u32 n = heap_elt_size (heap, e);
-	    unserialize (m, f, v, n);
-	  }
-	if (e == end)
-	  break;
-	e = heap_next (e);
-      }
-  }
-}
-
-void
-serialize_magic (serialize_main_t * m, void *magic, u32 magic_bytes)
-{
-  void *p;
-  serialize_integer (m, magic_bytes, sizeof (magic_bytes));
-  p = serialize_get (m, magic_bytes);
-  clib_memcpy (p, magic, magic_bytes);
-}
-
-void
-unserialize_check_magic (serialize_main_t * m, void *magic, u32 magic_bytes)
-{
-  u32 l;
-  void *d;
-
-  unserialize_integer (m, &l, sizeof (l));
-  if (l != magic_bytes)
-    {
-    bad:
-      serialize_error_return (m, "bad magic number");
-    }
-  d = serialize_get (m, magic_bytes);
-  if (memcmp (magic, d, magic_bytes))
-    goto bad;
-}
-
-clib_error_t *
-va_serialize (serialize_main_t * sm, va_list * va)
-{
-  serialize_main_header_t *m = &sm->header;
-  serialize_function_t *f = va_arg (*va, serialize_function_t *);
-  clib_error_t *error = 0;
-
-  m->recursion_level += 1;
-  if (m->recursion_level == 1)
-    {
-      uword r = clib_setjmp (&m->error_longjmp, 0);
-      error = uword_to_pointer (r, clib_error_t *);
-    }
-
-  if (!error)
-    f (sm, va);
-
-  m->recursion_level -= 1;
-  return error;
-}
-
-clib_error_t *
-serialize (serialize_main_t * m, ...)
-{
-  clib_error_t *error;
-  va_list va;
-
-  va_start (va, m);
-  error = va_serialize (m, &va);
-  va_end (va);
-  return error;
-}
-
-clib_error_t *
-unserialize (serialize_main_t * m, ...)
-{
-  clib_error_t *error;
-  va_list va;
-
-  va_start (va, m);
-  error = va_serialize (m, &va);
-  va_end (va);
-  return error;
-}
-
-static void *
-serialize_write_not_inline (serialize_main_header_t * m,
-			    serialize_stream_t * s,
-			    uword n_bytes_to_write, uword flags)
-{
-  uword cur_bi, n_left_b, n_left_o;
-
-  ASSERT (s->current_buffer_index <= s->n_buffer_bytes);
-  cur_bi = s->current_buffer_index;
-  n_left_b = s->n_buffer_bytes - cur_bi;
-  n_left_o = vec_len (s->overflow_buffer);
-
-  /* Prepend overflow buffer if present. */
-  do
-    {
-      if (n_left_o > 0 && n_left_b > 0)
-	{
-	  uword n = clib_min (n_left_b, n_left_o);
-	  clib_memcpy (s->buffer + cur_bi, s->overflow_buffer, n);
-	  cur_bi += n;
-	  n_left_b -= n;
-	  n_left_o -= n;
-	  if (n_left_o == 0)
-	    _vec_len (s->overflow_buffer) = 0;
-	  else
-	    vec_delete (s->overflow_buffer, n, 0);
-	}
-
-      /* Call data function when buffer is complete.  Data function should
-         dispatch with current buffer and give us a new one to write more
-         data into. */
-      if (n_left_b == 0)
-	{
-	  s->current_buffer_index = cur_bi;
-	  m->data_function (m, s);
-	  cur_bi = s->current_buffer_index;
-	  n_left_b = s->n_buffer_bytes - cur_bi;
-	}
-    }
-  while (n_left_o > 0);
-
-  if (n_left_o > 0 || n_left_b < n_bytes_to_write)
-    {
-      u8 *r;
-      vec_add2 (s->overflow_buffer, r, n_bytes_to_write);
-      return r;
-    }
-  else
-    {
-      s->current_buffer_index = cur_bi + n_bytes_to_write;
-      return s->buffer + cur_bi;
-    }
-}
-
-static void *
-serialize_read_not_inline (serialize_main_header_t * m,
-			   serialize_stream_t * s,
-			   uword n_bytes_to_read, uword flags)
-{
-  uword cur_bi, cur_oi, n_left_b, n_left_o, n_left_to_read;
-
-  ASSERT (s->current_buffer_index <= s->n_buffer_bytes);
-
-  cur_bi = s->current_buffer_index;
-  cur_oi = s->current_overflow_index;
-
-  n_left_b = s->n_buffer_bytes - cur_bi;
-  n_left_o = vec_len (s->overflow_buffer) - cur_oi;
-
-  /* Read from overflow? */
-  if (n_left_o >= n_bytes_to_read)
-    {
-      s->current_overflow_index = cur_oi + n_bytes_to_read;
-      return vec_elt_at_index (s->overflow_buffer, cur_oi);
-    }
-
-  /* Reset overflow buffer. */
-  if (n_left_o == 0 && s->overflow_buffer)
-    {
-      s->current_overflow_index = 0;
-      _vec_len (s->overflow_buffer) = 0;
-    }
-
-  n_left_to_read = n_bytes_to_read;
-  while (n_left_to_read > 0)
-    {
-      uword n;
-
-      /* If we don't have enough data between overflow and normal buffer
-         call read function. */
-      if (n_left_o + n_left_b < n_bytes_to_read)
-	{
-	  /* Save any left over buffer in overflow vector. */
-	  if (n_left_b > 0)
-	    {
-	      vec_add (s->overflow_buffer, s->buffer + cur_bi, n_left_b);
-	      n_left_o += n_left_b;
-	      n_left_to_read -= n_left_b;
-	      /* Advance buffer to end --- even if
-	         SERIALIZE_FLAG_NO_ADVANCE_CURRENT_BUFFER_INDEX is set. */
-	      cur_bi = s->n_buffer_bytes;
-	      n_left_b = 0;
-	    }
-
-	  if (m->data_function)
-	    {
-	      m->data_function (m, s);
-	      cur_bi = s->current_buffer_index;
-	      n_left_b = s->n_buffer_bytes - cur_bi;
-	    }
-	}
-
-      /* For first time through loop return if we have enough data
-         in normal buffer and overflow vector is empty. */
-      if (n_left_o == 0
-	  && n_left_to_read == n_bytes_to_read && n_left_b >= n_left_to_read)
-	{
-	  s->current_buffer_index = cur_bi + n_bytes_to_read;
-	  return s->buffer + cur_bi;
-	}
-
-      if (!m->data_function || serialize_stream_is_end_of_stream (s))
-	{
-	  /* This can happen for a peek at end of file.
-	     Pad overflow buffer with 0s. */
-	  vec_resize (s->overflow_buffer, n_left_to_read);
-	  n_left_o += n_left_to_read;
-	  n_left_to_read = 0;
-	}
-      else
-	{
-	  /* Copy from buffer to overflow vector. */
-	  n = clib_min (n_left_to_read, n_left_b);
-	  vec_add (s->overflow_buffer, s->buffer + cur_bi, n);
-	  cur_bi += n;
-	  n_left_b -= n;
-	  n_left_o += n;
-	  n_left_to_read -= n;
-	}
-    }
-
-  s->current_buffer_index = cur_bi;
-  s->current_overflow_index = cur_oi + n_bytes_to_read;
-  return vec_elt_at_index (s->overflow_buffer, cur_oi);
-}
-
-void *
-serialize_read_write_not_inline (serialize_main_header_t * m,
-				 serialize_stream_t * s,
-				 uword n_bytes, uword flags)
-{
-  return (((flags & SERIALIZE_FLAG_IS_READ) ? serialize_read_not_inline :
-	   serialize_write_not_inline) (m, s, n_bytes, flags));
-}
-
-static void
-serialize_read_write_close (serialize_main_header_t * m,
-			    serialize_stream_t * s, uword flags)
-{
-  if (serialize_stream_is_end_of_stream (s))
-    return;
-
-  if (flags & SERIALIZE_FLAG_IS_WRITE)
-    /* "Write" 0 bytes to flush overflow vector. */
-    serialize_write_not_inline (m, s, /* n bytes */ 0, flags);
-
-  serialize_stream_set_end_of_stream (s);
-
-  /* Call it one last time to flush buffer and close. */
-  m->data_function (m, s);
-
-  vec_free (s->overflow_buffer);
-}
-
-void
-serialize_close (serialize_main_t * m)
-{
-  serialize_read_write_close (&m->header, &m->stream,
-			      SERIALIZE_FLAG_IS_WRITE);
-}
-
-void
-unserialize_close (serialize_main_t * m)
-{
-  serialize_read_write_close (&m->header, &m->stream, SERIALIZE_FLAG_IS_READ);
-}
-
-void
-serialize_open_data (serialize_main_t * m, u8 * data, uword n_data_bytes)
-{
-  memset (m, 0, sizeof (m[0]));
-  m->stream.buffer = data;
-  m->stream.n_buffer_bytes = n_data_bytes;
-}
-
-void
-unserialize_open_data (serialize_main_t * m, u8 * data, uword n_data_bytes)
-{
-  serialize_open_data (m, data, n_data_bytes);
-}
-
-static void
-serialize_vector_write (serialize_main_header_t * m, serialize_stream_t * s)
-{
-  if (!serialize_stream_is_end_of_stream (s))
-    {
-      /* Double buffer size. */
-      uword l = vec_len (s->buffer);
-      vec_resize (s->buffer, l > 0 ? l : 64);
-      s->n_buffer_bytes = vec_len (s->buffer);
-    }
-}
-
-void
-serialize_open_vector (serialize_main_t * m, u8 * vector)
-{
-  memset (m, 0, sizeof (m[0]));
-  m->header.data_function = serialize_vector_write;
-  m->stream.buffer = vector;
-  m->stream.current_buffer_index = 0;
-  m->stream.n_buffer_bytes = vec_len (vector);
-}
-
-void *
-serialize_close_vector (serialize_main_t * m)
-{
-  serialize_stream_t *s = &m->stream;
-  void *result;
-
-  serialize_close (m);		/* frees overflow buffer */
-
-  if (s->buffer)
-    _vec_len (s->buffer) = s->current_buffer_index;
-  result = s->buffer;
-  memset (m, 0, sizeof (m[0]));
-  return result;
-}
-
-void
-serialize_multiple_1 (serialize_main_t * m,
-		      void *data, uword data_stride, uword n_data)
-{
-  u8 *d = data;
-  u8 *p;
-  uword n_left = n_data;
-
-  while (n_left >= 4)
-    {
-      p = serialize_get (m, 4 * sizeof (d[0]));
-      p[0] = d[0 * data_stride];
-      p[1] = d[1 * data_stride];
-      p[2] = d[2 * data_stride];
-      p[3] = d[3 * data_stride];
-      n_left -= 4;
-      d += 4 * data_stride;
-    }
-
-  if (n_left > 0)
-    {
-      p = serialize_get (m, n_left * sizeof (p[0]));
-      while (n_left > 0)
-	{
-	  p[0] = d[0];
-	  p += 1;
-	  d += 1 * data_stride;
-	  n_left -= 1;
-	}
-    }
-}
-
-void
-serialize_multiple_2 (serialize_main_t * m,
-		      void *data, uword data_stride, uword n_data)
-{
-  void *d = data;
-  u16 *p;
-  uword n_left = n_data;
-
-  while (n_left >= 4)
-    {
-      p = serialize_get (m, 4 * sizeof (p[0]));
-      clib_mem_unaligned (p + 0, u16) =
-	clib_host_to_net_mem_u16 (d + 0 * data_stride);
-      clib_mem_unaligned (p + 1, u16) =
-	clib_host_to_net_mem_u16 (d + 1 * data_stride);
-      clib_mem_unaligned (p + 2, u16) =
-	clib_host_to_net_mem_u16 (d + 2 * data_stride);
-      clib_mem_unaligned (p + 3, u16) =
-	clib_host_to_net_mem_u16 (d + 3 * data_stride);
-      n_left -= 4;
-      d += 4 * data_stride;
-    }
-
-  if (n_left > 0)
-    {
-      p = serialize_get (m, n_left * sizeof (p[0]));
-      while (n_left > 0)
-	{
-	  clib_mem_unaligned (p + 0, u16) =
-	    clib_host_to_net_mem_u16 (d + 0 * data_stride);
-	  p += 1;
-	  d += 1 * data_stride;
-	  n_left -= 1;
-	}
-    }
-}
-
-void
-serialize_multiple_4 (serialize_main_t * m,
-		      void *data, uword data_stride, uword n_data)
-{
-  void *d = data;
-  u32 *p;
-  uword n_left = n_data;
-
-  while (n_left >= 4)
-    {
-      p = serialize_get (m, 4 * sizeof (p[0]));
-      clib_mem_unaligned (p + 0, u32) =
-	clib_host_to_net_mem_u32 (d + 0 * data_stride);
-      clib_mem_unaligned (p + 1, u32) =
-	clib_host_to_net_mem_u32 (d + 1 * data_stride);
-      clib_mem_unaligned (p + 2, u32) =
-	clib_host_to_net_mem_u32 (d + 2 * data_stride);
-      clib_mem_unaligned (p + 3, u32) =
-	clib_host_to_net_mem_u32 (d + 3 * data_stride);
-      n_left -= 4;
-      d += 4 * data_stride;
-    }
-
-  if (n_left > 0)
-    {
-      p = serialize_get (m, n_left * sizeof (p[0]));
-      while (n_left > 0)
-	{
-	  clib_mem_unaligned (p + 0, u32) =
-	    clib_host_to_net_mem_u32 (d + 0 * data_stride);
-	  p += 1;
-	  d += 1 * data_stride;
-	  n_left -= 1;
-	}
-    }
-}
-
-void
-unserialize_multiple_1 (serialize_main_t * m,
-			void *data, uword data_stride, uword n_data)
-{
-  u8 *d = data;
-  u8 *p;
-  uword n_left = n_data;
-
-  while (n_left >= 4)
-    {
-      p = unserialize_get (m, 4 * sizeof (d[0]));
-      d[0 * data_stride] = p[0];
-      d[1 * data_stride] = p[1];
-      d[2 * data_stride] = p[2];
-      d[3 * data_stride] = p[3];
-      n_left -= 4;
-      d += 4 * data_stride;
-    }
-
-  if (n_left > 0)
-    {
-      p = unserialize_get (m, n_left * sizeof (p[0]));
-      while (n_left > 0)
-	{
-	  d[0] = p[0];
-	  p += 1;
-	  d += 1 * data_stride;
-	  n_left -= 1;
-	}
-    }
-}
-
-void
-unserialize_multiple_2 (serialize_main_t * m,
-			void *data, uword data_stride, uword n_data)
-{
-  void *d = data;
-  u16 *p;
-  uword n_left = n_data;
-
-  while (n_left >= 4)
-    {
-      p = unserialize_get (m, 4 * sizeof (p[0]));
-      clib_mem_unaligned (d + 0 * data_stride, u16) =
-	clib_net_to_host_mem_u16 (p + 0);
-      clib_mem_unaligned (d + 1 * data_stride, u16) =
-	clib_net_to_host_mem_u16 (p + 1);
-      clib_mem_unaligned (d + 2 * data_stride, u16) =
-	clib_net_to_host_mem_u16 (p + 2);
-      clib_mem_unaligned (d + 3 * data_stride, u16) =
-	clib_net_to_host_mem_u16 (p + 3);
-      n_left -= 4;
-      d += 4 * data_stride;
-    }
-
-  if (n_left > 0)
-    {
-      p = unserialize_get (m, n_left * sizeof (p[0]));
-      while (n_left > 0)
-	{
-	  clib_mem_unaligned (d + 0 * data_stride, u16) =
-	    clib_net_to_host_mem_u16 (p + 0);
-	  p += 1;
-	  d += 1 * data_stride;
-	  n_left -= 1;
-	}
-    }
-}
-
-void
-unserialize_multiple_4 (serialize_main_t * m,
-			void *data, uword data_stride, uword n_data)
-{
-  void *d = data;
-  u32 *p;
-  uword n_left = n_data;
-
-  while (n_left >= 4)
-    {
-      p = unserialize_get (m, 4 * sizeof (p[0]));
-      clib_mem_unaligned (d + 0 * data_stride, u32) =
-	clib_net_to_host_mem_u32 (p + 0);
-      clib_mem_unaligned (d + 1 * data_stride, u32) =
-	clib_net_to_host_mem_u32 (p + 1);
-      clib_mem_unaligned (d + 2 * data_stride, u32) =
-	clib_net_to_host_mem_u32 (p + 2);
-      clib_mem_unaligned (d + 3 * data_stride, u32) =
-	clib_net_to_host_mem_u32 (p + 3);
-      n_left -= 4;
-      d += 4 * data_stride;
-    }
-
-  if (n_left > 0)
-    {
-      p = unserialize_get (m, n_left * sizeof (p[0]));
-      while (n_left > 0)
-	{
-	  clib_mem_unaligned (d + 0 * data_stride, u32) =
-	    clib_net_to_host_mem_u32 (p + 0);
-	  p += 1;
-	  d += 1 * data_stride;
-	  n_left -= 1;
-	}
-    }
-}
-
-#ifdef CLIB_UNIX
-
-#include <unistd.h>
-#include <fcntl.h>
-
-static void
-unix_file_write (serialize_main_header_t * m, serialize_stream_t * s)
-{
-  int fd, n;
-
-  fd = s->data_function_opaque;
-  n = write (fd, s->buffer, s->current_buffer_index);
-  if (n < 0)
-    {
-      if (!unix_error_is_fatal (errno))
-	n = 0;
-      else
-	serialize_error (m, clib_error_return_unix (0, "write"));
-    }
-  if (n == s->current_buffer_index)
-    _vec_len (s->buffer) = 0;
-  else
-    vec_delete (s->buffer, n, 0);
-  s->current_buffer_index = vec_len (s->buffer);
-}
-
-static void
-unix_file_read (serialize_main_header_t * m, serialize_stream_t * s)
-{
-  int fd, n;
-
-  fd = s->data_function_opaque;
-  n = read (fd, s->buffer, vec_len (s->buffer));
-  if (n < 0)
-    {
-      if (!unix_error_is_fatal (errno))
-	n = 0;
-      else
-	serialize_error (m, clib_error_return_unix (0, "read"));
-    }
-  else if (n == 0)
-    serialize_stream_set_end_of_stream (s);
-  s->current_buffer_index = 0;
-  s->n_buffer_bytes = n;
-}
-
-static void
-serialize_open_unix_file_descriptor_helper (serialize_main_t * m, int fd,
-					    uword is_read)
-{
-  memset (m, 0, sizeof (m[0]));
-  vec_resize (m->stream.buffer, 4096);
-
-  if (!is_read)
-    {
-      m->stream.n_buffer_bytes = vec_len (m->stream.buffer);
-      _vec_len (m->stream.buffer) = 0;
-    }
-
-  m->header.data_function = is_read ? unix_file_read : unix_file_write;
-  m->stream.data_function_opaque = fd;
-}
-
-void
-serialize_open_unix_file_descriptor (serialize_main_t * m, int fd)
-{
-  serialize_open_unix_file_descriptor_helper (m, fd, /* is_read */ 0);
-}
-
-void
-unserialize_open_unix_file_descriptor (serialize_main_t * m, int fd)
-{
-  serialize_open_unix_file_descriptor_helper (m, fd, /* is_read */ 1);
-}
-
-static clib_error_t *
-serialize_open_unix_file_helper (serialize_main_t * m, char *file,
-				 uword is_read)
-{
-  int fd, mode;
-
-  mode = is_read ? O_RDONLY : O_RDWR | O_CREAT | O_TRUNC;
-  fd = open (file, mode, 0666);
-  if (fd < 0)
-    return clib_error_return_unix (0, "open `%s'", file);
-
-  serialize_open_unix_file_descriptor_helper (m, fd, is_read);
-  return 0;
-}
-
-clib_error_t *
-serialize_open_unix_file (serialize_main_t * m, char *file)
-{
-  return serialize_open_unix_file_helper (m, file, /* is_read */ 0);
-}
-
-clib_error_t *
-unserialize_open_unix_file (serialize_main_t * m, char *file)
-{
-  return serialize_open_unix_file_helper (m, file, /* is_read */ 1);
-}
-
-#endif /* CLIB_UNIX */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/serialize.h b/vppinfra/vppinfra/serialize.h
deleted file mode 100644
index 6cc2372e..00000000
--- a/vppinfra/vppinfra/serialize.h
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_serialize_h
-#define included_clib_serialize_h
-
-#include <stdarg.h>
-#include <vppinfra/byte_order.h>
-#include <vppinfra/types.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/longjmp.h>
-
-struct serialize_main_header_t;
-struct serialize_stream_t;
-
-typedef void (serialize_data_function_t) (struct serialize_main_header_t * h,
-					  struct serialize_stream_t * s);
-
-typedef struct serialize_stream_t
-{
-  /* Current data buffer being serialized/unserialized. */
-  u8 *buffer;
-
-  /* Size of buffer in bytes. */
-  u32 n_buffer_bytes;
-
-  /* Current index into buffer. */
-  u32 current_buffer_index;
-
-  /* Overflow buffer for when there is not enough room at the end of
-     buffer to hold serialized/unserialized data. */
-  u8 *overflow_buffer;
-
-  /* Current index in overflow buffer for reads. */
-  u32 current_overflow_index;
-
-  u32 flags;
-#define SERIALIZE_END_OF_STREAM (1 << 0)
-
-  uword data_function_opaque;
-
-  u32 opaque[64 - 4 * sizeof (u32) - 1 * sizeof (uword) -
-	     2 * sizeof (void *)];
-} serialize_stream_t;
-
-always_inline void
-serialize_stream_set_end_of_stream (serialize_stream_t * s)
-{
-  s->flags |= SERIALIZE_END_OF_STREAM;
-}
-
-always_inline uword
-serialize_stream_is_end_of_stream (serialize_stream_t * s)
-{
-  return (s->flags & SERIALIZE_END_OF_STREAM) != 0;
-}
-
-typedef struct serialize_main_header_t
-{
-  u32 recursion_level;
-
-  /* Data callback function and opaque data. */
-  serialize_data_function_t *data_function;
-
-  /* Error if signaled by data function. */
-  clib_error_t *error;
-
-  /* Exit unwind point if error occurs. */
-  clib_longjmp_t error_longjmp;
-} serialize_main_header_t;
-
-always_inline void
-serialize_error (serialize_main_header_t * m, clib_error_t * error)
-{
-  clib_longjmp (&m->error_longjmp, pointer_to_uword (error));
-}
-
-#define serialize_error_return(m,args...)			\
-  serialize_error (&(m)->header, clib_error_return (0, args))
-
-void *serialize_read_write_not_inline (serialize_main_header_t * m,
-				       serialize_stream_t * s,
-				       uword n_bytes, uword flags);
-
-#define SERIALIZE_FLAG_IS_READ  (1 << 0)
-#define SERIALIZE_FLAG_IS_WRITE (1 << 1)
-
-always_inline void *
-serialize_stream_read_write (serialize_main_header_t * header,
-			     serialize_stream_t * s,
-			     uword n_bytes, uword flags)
-{
-  uword i, j, l;
-
-  l = vec_len (s->overflow_buffer);
-  i = s->current_buffer_index;
-  j = i + n_bytes;
-  s->current_buffer_index = j;
-  if (l == 0 && j <= s->n_buffer_bytes)
-    {
-      return s->buffer + i;
-    }
-  else
-    {
-      s->current_buffer_index = i;
-      return serialize_read_write_not_inline (header, s, n_bytes, flags);
-    }
-}
-
-typedef struct
-{
-  serialize_main_header_t header;
-  serialize_stream_t stream;
-} serialize_main_t;
-
-always_inline void
-serialize_set_end_of_stream (serialize_main_t * m)
-{
-  serialize_stream_set_end_of_stream (&m->stream);
-}
-
-always_inline uword
-serialize_is_end_of_stream (serialize_main_t * m)
-{
-  return serialize_stream_is_end_of_stream (&m->stream);
-}
-
-typedef struct
-{
-  serialize_main_header_t header;
-  serialize_stream_t *streams;
-} serialize_multiple_main_t;
-
-typedef void (serialize_function_t) (serialize_main_t * m, va_list * va);
-
-always_inline void *
-unserialize_get (serialize_main_t * m, uword n_bytes)
-{
-  return serialize_stream_read_write (&m->header, &m->stream, n_bytes,
-				      SERIALIZE_FLAG_IS_READ);
-}
-
-always_inline void *
-serialize_get (serialize_main_t * m, uword n_bytes)
-{
-  return serialize_stream_read_write (&m->header, &m->stream, n_bytes,
-				      SERIALIZE_FLAG_IS_WRITE);
-}
-
-always_inline void
-serialize_integer (serialize_main_t * m, u64 x, u32 n_bytes)
-{
-  u8 *p = serialize_get (m, n_bytes);
-  if (n_bytes == 1)
-    p[0] = x;
-  else if (n_bytes == 2)
-    clib_mem_unaligned (p, u16) = clib_host_to_net_u16 (x);
-  else if (n_bytes == 4)
-    clib_mem_unaligned (p, u32) = clib_host_to_net_u32 (x);
-  else if (n_bytes == 8)
-    clib_mem_unaligned (p, u64) = clib_host_to_net_u64 (x);
-  else
-    ASSERT (0);
-}
-
-always_inline void
-unserialize_integer (serialize_main_t * m, void *x, u32 n_bytes)
-{
-  u8 *p = unserialize_get (m, n_bytes);
-  if (n_bytes == 1)
-    *(u8 *) x = p[0];
-  else if (n_bytes == 2)
-    *(u16 *) x = clib_net_to_host_unaligned_mem_u16 ((u16 *) p);
-  else if (n_bytes == 4)
-    *(u32 *) x = clib_net_to_host_unaligned_mem_u32 ((u32 *) p);
-  else if (n_bytes == 8)
-    *(u64 *) x = clib_net_to_host_unaligned_mem_u64 ((u64 *) p);
-  else
-    ASSERT (0);
-}
-
-/* As above but tries to be more compact. */
-always_inline void
-serialize_likely_small_unsigned_integer (serialize_main_t * m, u64 x)
-{
-  u64 r = x;
-  u8 *p;
-
-  /* Low bit set means it fits into 1 byte. */
-  if (r < (1 << 7))
-    {
-      p = serialize_get (m, 1);
-      p[0] = 1 + 2 * r;
-      return;
-    }
-
-  /* Low 2 bits 1 0 means it fits into 2 bytes. */
-  r -= (1 << 7);
-  if (r < (1 << 14))
-    {
-      p = serialize_get (m, 2);
-      clib_mem_unaligned (p, u16) = clib_host_to_little_u16 (4 * r + 2);
-      return;
-    }
-
-  r -= (1 << 14);
-  if (r < (1 << 29))
-    {
-      p = serialize_get (m, 4);
-      clib_mem_unaligned (p, u32) = clib_host_to_little_u32 (8 * r + 4);
-      return;
-    }
-
-  p = serialize_get (m, 9);
-  p[0] = 0;			/* Only low 3 bits are used. */
-  clib_mem_unaligned (p + 1, u64) = clib_host_to_little_u64 (x);
-}
-
-always_inline u64
-unserialize_likely_small_unsigned_integer (serialize_main_t * m)
-{
-  u8 *p = unserialize_get (m, 1);
-  u64 r;
-  u32 y = p[0];
-
-  if (y & 1)
-    return y / 2;
-
-  r = 1 << 7;
-  if (y & 2)
-    {
-      p = unserialize_get (m, 1);
-      r += (y / 4) + (p[0] << 6);
-      return r;
-    }
-
-  r += 1 << 14;
-  if (y & 4)
-    {
-      p = unserialize_get (m, 3);
-      r += ((y / 8)
-	    + (p[0] << (5 + 8 * 0))
-	    + (p[1] << (5 + 8 * 1)) + (p[2] << (5 + 8 * 2)));
-      return r;
-    }
-
-  p = unserialize_get (m, 8);
-  r = clib_mem_unaligned (p, u64);
-  r = clib_little_to_host_u64 (r);
-
-  return r;
-}
-
-always_inline void
-serialize_likely_small_signed_integer (serialize_main_t * m, i64 s)
-{
-  u64 u = s < 0 ? -(2 * s + 1) : 2 * s;
-  serialize_likely_small_unsigned_integer (m, u);
-}
-
-always_inline i64
-unserialize_likely_small_signed_integer (serialize_main_t * m)
-{
-  u64 u = unserialize_likely_small_unsigned_integer (m);
-  i64 s = u / 2;
-  return (u & 1) ? -s : s;
-}
-
-void
-serialize_multiple_1 (serialize_main_t * m,
-		      void *data, uword data_stride, uword n_data);
-void
-serialize_multiple_2 (serialize_main_t * m,
-		      void *data, uword data_stride, uword n_data);
-void
-serialize_multiple_4 (serialize_main_t * m,
-		      void *data, uword data_stride, uword n_data);
-
-void
-unserialize_multiple_1 (serialize_main_t * m,
-			void *data, uword data_stride, uword n_data);
-void
-unserialize_multiple_2 (serialize_main_t * m,
-			void *data, uword data_stride, uword n_data);
-void
-unserialize_multiple_4 (serialize_main_t * m,
-			void *data, uword data_stride, uword n_data);
-
-always_inline void
-serialize_multiple (serialize_main_t * m,
-		    void *data,
-		    uword n_data_bytes, uword data_stride, uword n_data)
-{
-  if (n_data_bytes == 1)
-    serialize_multiple_1 (m, data, data_stride, n_data);
-  else if (n_data_bytes == 2)
-    serialize_multiple_2 (m, data, data_stride, n_data);
-  else if (n_data_bytes == 4)
-    serialize_multiple_4 (m, data, data_stride, n_data);
-  else
-    ASSERT (0);
-}
-
-always_inline void
-unserialize_multiple (serialize_main_t * m,
-		      void *data,
-		      uword n_data_bytes, uword data_stride, uword n_data)
-{
-  if (n_data_bytes == 1)
-    unserialize_multiple_1 (m, data, data_stride, n_data);
-  else if (n_data_bytes == 2)
-    unserialize_multiple_2 (m, data, data_stride, n_data);
-  else if (n_data_bytes == 4)
-    unserialize_multiple_4 (m, data, data_stride, n_data);
-  else
-    ASSERT (0);
-}
-
-/* Basic types. */
-serialize_function_t serialize_64, unserialize_64;
-serialize_function_t serialize_32, unserialize_32;
-serialize_function_t serialize_16, unserialize_16;
-serialize_function_t serialize_8, unserialize_8;
-serialize_function_t serialize_f64, unserialize_f64;
-serialize_function_t serialize_f32, unserialize_f32;
-
-/* Basic vector types. */
-serialize_function_t serialize_vec_8, unserialize_vec_8;
-serialize_function_t serialize_vec_16, unserialize_vec_16;
-serialize_function_t serialize_vec_32, unserialize_vec_32;
-serialize_function_t serialize_vec_64, unserialize_vec_64;
-
-/* Serialize generic vectors. */
-serialize_function_t serialize_vector, unserialize_vector,
-  unserialize_aligned_vector;
-
-#define vec_serialize(m,v,f) \
-  serialize ((m), serialize_vector, (v), sizeof ((v)[0]), (f))
-
-#define vec_unserialize(m,v,f) \
-  unserialize ((m), unserialize_vector, (v), sizeof ((*(v))[0]), (f))
-
-#define vec_unserialize_aligned(m,v,f) \
-  unserialize ((m), unserialize_aligned_vector, (v), sizeof ((*(v))[0]), (f))
-
-/* Serialize pools. */
-serialize_function_t serialize_pool, unserialize_pool,
-  unserialize_aligned_pool;
-
-#define pool_serialize(m,v,f) \
-  serialize ((m), serialize_pool, (v), sizeof ((v)[0]), (f))
-
-#define pool_unserialize(m,v,f) \
-  unserialize ((m), unserialize_pool, (v), sizeof ((*(v))[0]), (f))
-
-#define pool_unserialize_aligned(m,v,a,f)				\
-  unserialize ((m), unserialize_aligned_pool, (v), sizeof ((*(v))[0]), (a), (f))
-
-/* Serialize heaps. */
-serialize_function_t serialize_heap, unserialize_heap;
-
-void serialize_bitmap (serialize_main_t * m, uword * b);
-uword *unserialize_bitmap (serialize_main_t * m);
-
-void serialize_cstring (serialize_main_t * m, char *string);
-void unserialize_cstring (serialize_main_t * m, char **string);
-
-void serialize_close (serialize_main_t * m);
-void unserialize_close (serialize_main_t * m);
-
-void serialize_open_data (serialize_main_t * m, u8 * data,
-			  uword n_data_bytes);
-void unserialize_open_data (serialize_main_t * m, u8 * data,
-			    uword n_data_bytes);
-
-/* Starts serialization with expanding vector as buffer. */
-void serialize_open_vector (serialize_main_t * m, u8 * vector);
-
-/* Serialization is done: returns vector buffer to caller. */
-void *serialize_close_vector (serialize_main_t * m);
-
-void unserialize_open_vector (serialize_main_t * m, u8 * vector);
-
-#ifdef CLIB_UNIX
-clib_error_t *serialize_open_unix_file (serialize_main_t * m, char *file);
-clib_error_t *unserialize_open_unix_file (serialize_main_t * m, char *file);
-
-void serialize_open_unix_file_descriptor (serialize_main_t * m, int fd);
-void unserialize_open_unix_file_descriptor (serialize_main_t * m, int fd);
-#endif /* CLIB_UNIX */
-
-/* Main routines. */
-clib_error_t *serialize (serialize_main_t * m, ...);
-clib_error_t *unserialize (serialize_main_t * m, ...);
-clib_error_t *va_serialize (serialize_main_t * m, va_list * va);
-
-void serialize_magic (serialize_main_t * m, void *magic, u32 magic_bytes);
-void unserialize_check_magic (serialize_main_t * m, void *magic,
-			      u32 magic_bytes);
-
-#endif /* included_clib_serialize_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/slist.c b/vppinfra/vppinfra/slist.c
deleted file mode 100644
index 892517bb..00000000
--- a/vppinfra/vppinfra/slist.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
-  Copyright (c) 2012 Cisco and/or its affiliates.
-
-  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#include <vppinfra/slist.h>
-
-/*
- * skip-list implementation
- *
- * Good news / bad news. As balanced binary tree schemes go,
- * this one seems pretty fast and is reasonably simple. There's a very
- * limited amount that can be done to mitigate sdram read latency.
- *
- * Each active clib_slist_elt_t is on from 1 to N lists. Each active element
- * is always on the "level-0" list. Since most elements are *only* on
- * level 0, we keep the level 0 (and level 1) in the element. For those
- * elements on more than two lists, we switch to a vector. Hence, the
- * "n" union in slib_slist_elt_t.
- *
- * The low-order bit of elt->n.next0[0] is 1 for inlined next indices,
- * 0 for vector indices (since the allocator always aligns to at least
- * a 4-byte boundary). We can only represent 2e9 items, but since the
- * practical performance limit is O(1e7), it doesn't matter.
- *
- * We create a "head" element which (by construction) is always
- * lexically lighter than any other element. This makes a large number
- * of irritating special cases go away.
- *
- * User code is in charge of comparing a supplied key with
- * the key component of a user pool element. The user tells this code
- * to add or delete (opaque key, 32-bit integer) pairs to the skip-list.
- *
- * The algorithm adds new elements to one or more lists.
- * For levels greater than zero, the probability of a new element landing on
- * a list is branching_factor**N. Branching_factor = 0.2 seems to work
- * OK, yielding about 50 compares per search at O(1e7) items.
- */
-
-clib_error_t *
-clib_slist_init (clib_slist_t * sp, f64 branching_factor,
-		 clib_slist_key_compare_function_t compare,
-		 format_function_t format_user_element)
-{
-  clib_slist_elt_t *head;
-  memset (sp, 0, sizeof (sp[0]));
-  sp->branching_factor = branching_factor;
-  sp->format_user_element = format_user_element;
-  sp->compare = compare;
-  sp->seed = 0xdeaddabe;
-  pool_get (sp->elts, head);
-  vec_add1 (head->n.nexts, (u32) ~ 0);
-  head->user_pool_index = (u32) ~ 0;
-  vec_validate (sp->path, 1);
-  vec_validate (sp->occupancy, 0);
-
-  return 0;
-}
-
-/*
- * slist_search_internal
- */
-static inline clib_slist_search_result_t
-slist_search_internal (clib_slist_t * sp, void *key, int need_full_path)
-{
-  int level, comp_result;
-  clib_slist_elt_t *search_elt, *head_elt;
-
-  sp->ncompares = 0;
-  /*
-   * index 0 is the magic listhead element which is
-   * lexically lighter than / to the left of every element
-   */
-  search_elt = head_elt = pool_elt_at_index (sp->elts, 0);
-
-  /*
-   * Initial negotiating position, only the head_elt is
-   * lighter than the supplied key
-   */
-  memset (sp->path, 0, vec_len (head_elt->n.nexts) * sizeof (u32));
-
-  /* Walk the fastest lane first */
-  level = vec_len (head_elt->n.nexts) - 1;
-  _vec_len (sp->path) = level + 1;
-
-  while (1)
-    {
-      u32 next_index_this_level;
-      clib_slist_elt_t *prefetch_elt;
-
-      /*
-       * Prefetching the next element at this level makes a measurable
-       * difference, but doesn't fix the dependent read stall problem
-       */
-      prefetch_elt = sp->elts +
-	clib_slist_get_next_at_level (search_elt, level);
-
-      CLIB_PREFETCH (prefetch_elt, CLIB_CACHE_LINE_BYTES, READ);
-
-      /* Compare the key with the current element */
-      comp_result = (search_elt == head_elt) ? 1 :
-	sp->compare (key, search_elt->user_pool_index);
-
-      sp->ncompares++;
-      /* key "lighter" than this element */
-      if (comp_result < 0)
-	{
-	  /*
-	   * Back up to previous item on this list
-	   * and search the next finer-grained list
-	   * starting there.
-	   */
-	  search_elt = pool_elt_at_index (sp->elts, sp->path[level]);
-	next_list:
-	  if (level > 0)
-	    {
-	      level--;
-	      continue;
-	    }
-	  else
-	    {
-	      return CLIB_SLIST_NO_MATCH;
-	    }
-	}
-      /* Match */
-      if (comp_result == 0)
-	{
-	  /*
-	   * If we're trying to delete an element, we need to
-	   * track down all of the elements which point at it.
-	   * Otherwise, don't bother with it
-	   */
-	  if (need_full_path && level > 0)
-	    {
-	      search_elt = pool_elt_at_index (sp->elts, sp->path[level]);
-	      level--;
-	      continue;
-	    }
-	  level = vec_len (head_elt->n.nexts);
-	  sp->path[level] = search_elt - sp->elts;
-	  _vec_len (sp->path) = level + 1;
-	  return CLIB_SLIST_MATCH;
-	}
-      /*
-       * comp_result positive, key is to the right of
-       * this element
-       */
-      sp->path[level] = search_elt - sp->elts;
-
-      /* Out of list at this level? */
-      next_index_this_level =
-	clib_slist_get_next_at_level (search_elt, level);
-      if (next_index_this_level == (u32) ~ 0)
-	goto next_list;
-
-      /* No, try the next element */
-      search_elt = pool_elt_at_index (sp->elts, next_index_this_level);
-    }
-  return 0;			/* notreached */
-}
-
-u32
-clib_slist_search (clib_slist_t * sp, void *key, u32 * ncompares)
-{
-  clib_slist_search_result_t rv;
-
-  rv = slist_search_internal (sp, key, 0 /* dont need full path */ );
-  if (rv == CLIB_SLIST_MATCH)
-    {
-      clib_slist_elt_t *elt;
-      elt = pool_elt_at_index (sp->elts, sp->path[vec_len (sp->path) - 1]);
-      if (ncompares)
-	*ncompares = sp->ncompares;
-      return elt->user_pool_index;
-    }
-  return (u32) ~ 0;
-}
-
-void
-clib_slist_add (clib_slist_t * sp, void *key, u32 user_pool_index)
-{
-  clib_slist_elt_t *new_elt;
-  clib_slist_search_result_t search_result;
-  int level;
-
-  search_result = slist_search_internal (sp, key,
-					 0 /* don't need full path */ );
-
-  /* Special case: key exists, just replace user_pool_index */
-  if (PREDICT_FALSE (search_result == CLIB_SLIST_MATCH))
-    {
-      clib_slist_elt_t *elt;
-      elt = pool_elt_at_index (sp->elts, sp->path[0]);
-      elt->user_pool_index = user_pool_index;
-      return;
-    }
-
-  pool_get (sp->elts, new_elt);
-  new_elt->n.nexts = 0;
-  new_elt->user_pool_index = user_pool_index;
-
-  /* sp->path lists elements to the left of key, by level */
-  for (level = 0; level < vec_len (sp->path); level++)
-    {
-      clib_slist_elt_t *prev_elt_this_level;
-      u32 prev_elt_next_index_this_level;
-
-      /* Add to list at the current level */
-      prev_elt_this_level = pool_elt_at_index (sp->elts, sp->path[level]);
-      prev_elt_next_index_this_level = clib_slist_get_next_at_level
-	(prev_elt_this_level, level);
-
-      clib_slist_set_next_at_level (new_elt, prev_elt_next_index_this_level,
-				    level);
-
-      clib_slist_set_next_at_level (prev_elt_this_level, new_elt - sp->elts,
-				    level);
-      sp->occupancy[level]++;
-
-      /* Randomly add to the next-higher level */
-      if (random_f64 (&sp->seed) > sp->branching_factor)
-	break;
-    }
-  {
-    /* Time to add a new ply? */
-    clib_slist_elt_t *head_elt = pool_elt_at_index (sp->elts, 0);
-    int top_level = vec_len (head_elt->n.nexts) - 1;
-    if (((f64) sp->occupancy[top_level]) * sp->branching_factor > 1.0)
-      {
-	vec_add1 (sp->occupancy, 0);
-	vec_add1 (head_elt->n.nexts, (u32) ~ 0);
-	/* full match case returns n+1 items */
-	vec_validate (sp->path, vec_len (head_elt->n.nexts));
-      }
-  }
-}
-
-clib_slist_search_result_t
-clib_slist_del (clib_slist_t * sp, void *key)
-{
-  clib_slist_search_result_t search_result;
-  clib_slist_elt_t *del_elt;
-  int level;
-
-  search_result = slist_search_internal (sp, key, 1 /* need full path */ );
-
-  if (PREDICT_FALSE (search_result == CLIB_SLIST_NO_MATCH))
-    return search_result;
-
-  del_elt = pool_elt_at_index (sp->elts, sp->path[vec_len (sp->path) - 1]);
-  ASSERT (vec_len (sp->path) > 1);
-
-  for (level = 0; level < vec_len (sp->path) - 1; level++)
-    {
-      clib_slist_elt_t *path_elt;
-      u32 path_elt_next_index;
-
-      path_elt = pool_elt_at_index (sp->elts, sp->path[level]);
-      path_elt_next_index = clib_slist_get_next_at_level (path_elt, level);
-
-      /* Splice the item out of the list if it's adjacent to the victim */
-      if (path_elt_next_index == del_elt - sp->elts)
-	{
-	  sp->occupancy[level]--;
-	  path_elt_next_index = clib_slist_get_next_at_level (del_elt, level);
-	  clib_slist_set_next_at_level (path_elt, path_elt_next_index, level);
-	}
-    }
-
-  /* If this element is on more than two lists it has a vector of nexts */
-  if (!(del_elt->n.next0[0] & 1))
-    vec_free (del_elt->n.nexts);
-  pool_put (sp->elts, del_elt);
-  return CLIB_SLIST_MATCH;
-}
-
-u8 *
-format_slist (u8 * s, va_list * args)
-{
-  clib_slist_t *sl = va_arg (*args, clib_slist_t *);
-  int verbose = va_arg (*args, int);
-  int i;
-  clib_slist_elt_t *head_elt, *elt;
-
-  s = format (s, "slist 0x%x, %u items, branching_factor %.2f\n", sl,
-	      sl->occupancy ? sl->occupancy[0] : 0, sl->branching_factor);
-
-  if (pool_elts (sl->elts) == 0)
-    return s;
-
-  head_elt = pool_elt_at_index (sl->elts, 0);
-
-  for (i = 0; i < vec_len (head_elt->n.nexts); i++)
-    {
-      s = format (s, "level %d: %d elts\n", i,
-		  sl->occupancy ? sl->occupancy[i] : 0);
-
-      if (verbose && head_elt->n.nexts[i] != (u32) ~ 0)
-	{
-	  elt = pool_elt_at_index (sl->elts, head_elt->n.nexts[i]);
-	  while (elt)
-	    {
-	      u32 next_index;
-	      s = format (s, "%U(%d) ", sl->format_user_element,
-			  elt->user_pool_index, elt - sl->elts);
-	      next_index = clib_slist_get_next_at_level (elt, i);
-	      ASSERT (next_index != 0x7fffffff);
-	      if (next_index == (u32) ~ 0)
-		break;
-	      else
-		elt = pool_elt_at_index (sl->elts, next_index);
-	    }
-	}
-      s = format (s, "\n");
-    }
-  return s;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/slist.h b/vppinfra/vppinfra/slist.h
deleted file mode 100644
index a7c77e27..00000000
--- a/vppinfra/vppinfra/slist.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-  Copyright (c) 2012 Cisco and/or its affiliates.
-
-  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#ifndef included_slist_h
-#define included_slist_h
-
-#include <stdarg.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/error.h>
-#include <vppinfra/format.h>
-#include <vppinfra/cache.h>
-
-typedef word (clib_slist_key_compare_function_t)
-  (void *key, u32 elt_pool_index);
-
-typedef enum
-{
-  CLIB_SLIST_MATCH = 0,
-  CLIB_SLIST_NO_MATCH
-} clib_slist_search_result_t;
-
-typedef struct
-{
-  /* Vector of next elements. Every valid instance has at least one */
-  union
-  {
-    u32 next0[2];
-    u32 *nexts;
-  } n;
-
-  /* Index of item in user's pool */
-  u32 user_pool_index;
-  /* $$$ pad to even divisor of cache line */
-} clib_slist_elt_t;
-
-static inline u32
-clib_slist_get_next_at_level (clib_slist_elt_t * elt, int level)
-{
-  if (elt->n.next0[0] & 1)
-    {
-      ASSERT (level < 2);
-      if (level == 1)
-	return elt->n.next0[1];
-      /* preserve ~0 (end of list) */
-      return (elt->n.next0[0] == (u32) ~ 0) ? elt->n.next0[0] :
-	(elt->n.next0[0] >> 1);
-    }
-  else
-    {
-      ASSERT (level < vec_len (elt->n.nexts));
-      return elt->n.nexts[level];
-    }
-}
-
-static inline void
-clib_slist_set_next_at_level (clib_slist_elt_t * elt, u32 index, int level)
-{
-  u32 old_level0_value[2];
-  /* level0 and not a vector */
-  if (level < 2 && (elt->n.next0[0] == 0 || elt->n.next0[0] & 1))
-    {
-      if (level == 0)
-	{
-	  elt->n.next0[0] = (index << 1) | 1;
-	  return;
-	}
-      elt->n.next0[1] = index;
-      return;
-    }
-  /* have to save old level0 values? */
-  if (elt->n.next0[0] & 1)
-    {
-      old_level0_value[0] = (elt->n.next0[0] == (u32) ~ 0) ?
-	elt->n.next0[0] : elt->n.next0[0] >> 1;
-      old_level0_value[1] = elt->n.next0[1];
-      elt->n.nexts = 0;
-      vec_add1 (elt->n.nexts, old_level0_value[0]);
-      vec_add1 (elt->n.nexts, old_level0_value[1]);
-    }
-  vec_validate (elt->n.nexts, level);
-  elt->n.nexts[level] = index;
-}
-
-
-typedef struct
-{
-  /* pool of skip-list elements */
-  clib_slist_elt_t *elts;
-
-  /* last search path */
-  u32 *path;
-
-  /* last search number of compares */
-  u32 ncompares;
-
-  /* occupancy stats */
-  u32 *occupancy;
-
-  /* Comparison function */
-  clib_slist_key_compare_function_t *compare;
-
-  /* Format function */
-  format_function_t *format_user_element;
-
-  /* items appear in successive plies with Pr (1 / branching_factor) */
-  f64 branching_factor;
-
-  /* random seed */
-  u32 seed;
-} clib_slist_t;
-
-clib_error_t *clib_slist_init (clib_slist_t * sp, f64 branching_factor,
-			       clib_slist_key_compare_function_t compare,
-			       format_function_t format_user_element);
-
-format_function_t format_slist;
-
-void clib_slist_add (clib_slist_t * sp, void *key, u32 user_pool_index);
-clib_slist_search_result_t clib_slist_del (clib_slist_t * sp, void *key);
-u32 clib_slist_search (clib_slist_t * sp, void *key, u32 * ncompares);
-
-#endif /* included_slist_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/smp.c b/vppinfra/vppinfra/smp.c
deleted file mode 100644
index 8ac19960..00000000
--- a/vppinfra/vppinfra/smp.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/longjmp.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/os.h>
-
-void
-clib_smp_free (clib_smp_main_t * m)
-{
-  clib_mem_vm_free (m->vm_base,
-		    (uword) ((1 + m->n_cpus) << m->log2_n_per_cpu_vm_bytes));
-}
-
-static uword
-allocate_per_cpu_mheap (uword cpu)
-{
-  clib_smp_main_t *m = &clib_smp_main;
-  void *heap;
-  uword vm_size, stack_size, mheap_flags;
-
-  ASSERT (os_get_cpu_number () == cpu);
-
-  vm_size = (uword) 1 << m->log2_n_per_cpu_vm_bytes;
-  stack_size = (uword) 1 << m->log2_n_per_cpu_stack_bytes;
-
-  mheap_flags = MHEAP_FLAG_SMALL_OBJECT_CACHE;
-
-  /* Heap extends up to start of stack. */
-  heap = mheap_alloc_with_flags (clib_smp_vm_base_for_cpu (m, cpu),
-				 vm_size - stack_size, mheap_flags);
-  clib_mem_set_heap (heap);
-
-  if (cpu == 0)
-    {
-      /* Now that we have a heap, allocate main structure on cpu 0. */
-      vec_resize (m->per_cpu_mains, m->n_cpus);
-
-      /* Allocate shared global heap (thread safe). */
-      m->global_heap =
-	mheap_alloc_with_flags (clib_smp_vm_base_for_cpu (m, cpu + m->n_cpus),
-				vm_size,
-				mheap_flags | MHEAP_FLAG_THREAD_SAFE);
-    }
-
-  m->per_cpu_mains[cpu].heap = heap;
-  return 0;
-}
-
-void
-clib_smp_init (void)
-{
-  clib_smp_main_t *m = &clib_smp_main;
-  uword cpu;
-
-  m->vm_base =
-    clib_mem_vm_alloc ((uword) (m->n_cpus + 1) << m->log2_n_per_cpu_vm_bytes);
-  if (!m->vm_base)
-    clib_error ("error allocating virtual memory");
-
-  for (cpu = 0; cpu < m->n_cpus; cpu++)
-    clib_calljmp (allocate_per_cpu_mheap, cpu,
-		  clib_smp_stack_top_for_cpu (m, cpu));
-}
-
-void
-clib_smp_lock_init (clib_smp_lock_t ** pl)
-{
-  clib_smp_lock_t *l;
-  uword i, n_bytes, n_fifo_elts;
-
-  /* No locking necessary if n_cpus <= 1.
-     Null means no locking is necessary. */
-  if (clib_smp_main.n_cpus < 2)
-    {
-      *pl = 0;
-      return;
-    }
-
-  /* Need n_cpus - 1 elts in waiting fifo.  One CPU holds lock
-     and others could potentially be waiting. */
-  n_fifo_elts = clib_smp_main.n_cpus - 1;
-
-  n_bytes = sizeof (l[0]) + n_fifo_elts * sizeof (l->waiting_fifo[0]);
-  ASSERT_AND_PANIC (n_bytes % CLIB_CACHE_LINE_BYTES == 0);
-
-  l = clib_mem_alloc_aligned (n_bytes, CLIB_CACHE_LINE_BYTES);
-
-  memset (l, 0, n_bytes);
-  l->n_waiting_fifo_elts = n_fifo_elts;
-
-  for (i = 0; i < l->n_waiting_fifo_elts; i++)
-    l->waiting_fifo[i].wait_type = CLIB_SMP_LOCK_WAIT_EMPTY;
-
-  *pl = l;
-}
-
-void
-clib_smp_lock_free (clib_smp_lock_t ** pl)
-{
-  if (*pl)
-    clib_mem_free (*pl);
-  *pl = 0;
-}
-
-void
-clib_smp_lock_slow_path (clib_smp_lock_t * l,
-			 uword my_cpu,
-			 clib_smp_lock_header_t h0, clib_smp_lock_type_t type)
-{
-  clib_smp_lock_header_t h1, h2, h3;
-  uword is_reader = type == CLIB_SMP_LOCK_TYPE_READER;
-  uword n_fifo_elts = l->n_waiting_fifo_elts;
-  uword my_tail;
-
-  /* Atomically advance waiting FIFO tail pointer; my_tail will point
-     to entry where we can insert ourselves to wait for lock to be granted. */
-  while (1)
-    {
-      h1 = h0;
-      my_tail = h1.waiting_fifo.head_index + h1.waiting_fifo.n_elts;
-      my_tail = my_tail >= n_fifo_elts ? my_tail - n_fifo_elts : my_tail;
-      h1.waiting_fifo.n_elts += 1;
-      h1.request_cpu = my_cpu;
-
-      ASSERT_AND_PANIC (h1.waiting_fifo.n_elts <= n_fifo_elts);
-      ASSERT_AND_PANIC (my_tail >= 0 && my_tail < n_fifo_elts);
-
-      h2 = clib_smp_lock_set_header (l, h1, h0);
-
-      /* Tail successfully advanced? */
-      if (clib_smp_lock_header_is_equal (h0, h2))
-	break;
-
-      /* It is possible that if head and tail are both zero, CPU with lock would have unlocked lock. */
-      else if (type == CLIB_SMP_LOCK_TYPE_SPIN)
-	{
-	  while (!h2.writer_has_lock)
-	    {
-	      ASSERT_AND_PANIC (h2.waiting_fifo.n_elts == 0);
-	      h1 = h2;
-	      h1.request_cpu = my_cpu;
-	      h1.writer_has_lock = 1;
-
-	      h3 = clib_smp_lock_set_header (l, h1, h2);
-
-	      /* Got it? */
-	      if (clib_smp_lock_header_is_equal (h2, h3))
-		return;
-
-	      h2 = h3;
-	    }
-	}
-
-      /* Try to advance tail again. */
-      h0 = h2;
-    }
-
-  {
-    clib_smp_lock_waiting_fifo_elt_t *w;
-
-    w = l->waiting_fifo + my_tail;
-
-    while (w->wait_type != CLIB_SMP_LOCK_WAIT_EMPTY)
-      clib_smp_pause ();
-
-    w->wait_type = (is_reader
-		    ? CLIB_SMP_LOCK_WAIT_READER : CLIB_SMP_LOCK_WAIT_WRITER);
-
-    /* Wait until CPU holding the lock grants us the lock. */
-    while (w->wait_type != CLIB_SMP_LOCK_WAIT_DONE)
-      clib_smp_pause ();
-
-    w->wait_type = CLIB_SMP_LOCK_WAIT_EMPTY;
-  }
-}
-
-void
-clib_smp_unlock_slow_path (clib_smp_lock_t * l,
-			   uword my_cpu,
-			   clib_smp_lock_header_t h0,
-			   clib_smp_lock_type_t type)
-{
-  clib_smp_lock_header_t h1, h2;
-  clib_smp_lock_waiting_fifo_elt_t *head;
-  clib_smp_lock_wait_type_t head_wait_type;
-  uword is_reader = type == CLIB_SMP_LOCK_TYPE_READER;
-  uword n_fifo_elts = l->n_waiting_fifo_elts;
-  uword head_index, must_wait_for_readers;
-
-  while (1)
-    {
-      /* Advance waiting fifo giving lock to first waiter. */
-      while (1)
-	{
-	  ASSERT_AND_PANIC (h0.waiting_fifo.n_elts != 0);
-
-	  h1 = h0;
-
-	  head_index = h1.waiting_fifo.head_index;
-	  head = l->waiting_fifo + head_index;
-	  if (is_reader)
-	    {
-	      ASSERT_AND_PANIC (h1.n_readers_with_lock > 0);
-	      h1.n_readers_with_lock -= 1;
-	    }
-	  else
-	    {
-	      /* Writer will already have lock. */
-	      ASSERT_AND_PANIC (h1.writer_has_lock);
-	    }
-
-	  while ((head_wait_type =
-		  head->wait_type) == CLIB_SMP_LOCK_WAIT_EMPTY)
-	    clib_smp_pause ();
-
-	  /* Don't advance FIFO to writer unless all readers have unlocked. */
-	  must_wait_for_readers =
-	    (type != CLIB_SMP_LOCK_TYPE_SPIN
-	     && head_wait_type == CLIB_SMP_LOCK_WAIT_WRITER
-	     && h1.n_readers_with_lock != 0);
-
-	  if (!must_wait_for_readers)
-	    {
-	      head_index += 1;
-	      h1.waiting_fifo.n_elts -= 1;
-	      if (type != CLIB_SMP_LOCK_TYPE_SPIN)
-		{
-		  if (head_wait_type == CLIB_SMP_LOCK_WAIT_WRITER)
-		    h1.writer_has_lock = h1.n_readers_with_lock == 0;
-		  else
-		    {
-		      h1.writer_has_lock = 0;
-		      h1.n_readers_with_lock += 1;
-		    }
-		}
-	    }
-
-	  h1.waiting_fifo.head_index =
-	    head_index == n_fifo_elts ? 0 : head_index;
-	  h1.request_cpu = my_cpu;
-
-	  ASSERT_AND_PANIC (h1.waiting_fifo.head_index >= 0
-			    && h1.waiting_fifo.head_index < n_fifo_elts);
-	  ASSERT_AND_PANIC (h1.waiting_fifo.n_elts >= 0
-			    && h1.waiting_fifo.n_elts <= n_fifo_elts);
-
-	  h2 = clib_smp_lock_set_header (l, h1, h0);
-
-	  if (clib_smp_lock_header_is_equal (h2, h0))
-	    break;
-
-	  h0 = h2;
-
-	  if (h0.waiting_fifo.n_elts == 0)
-	    return clib_smp_unlock_inline (l, type);
-	}
-
-      if (must_wait_for_readers)
-	return;
-
-      /* Wake up head of waiting fifo. */
-      {
-	uword done_waking;
-
-	/* Shift lock to first thread waiting in fifo. */
-	head->wait_type = CLIB_SMP_LOCK_WAIT_DONE;
-
-	/* For read locks we may be able to wake multiple readers. */
-	done_waking = 1;
-	if (head_wait_type == CLIB_SMP_LOCK_WAIT_READER)
-	  {
-	    uword hi = h0.waiting_fifo.head_index;
-	    if (h0.waiting_fifo.n_elts != 0
-		&& l->waiting_fifo[hi].wait_type == CLIB_SMP_LOCK_WAIT_READER)
-	      done_waking = 0;
-	  }
-
-	if (done_waking)
-	  break;
-      }
-    }
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/smp.h b/vppinfra/vppinfra/smp.h
deleted file mode 100644
index 7e703b3d..00000000
--- a/vppinfra/vppinfra/smp.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001-2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_smp_h
-#define included_clib_smp_h
-
-#include <vppinfra/cache.h>
-#include <vppinfra/os.h>	/* for os_panic */
-
-#define clib_smp_compare_and_swap(addr,new,old) __sync_val_compare_and_swap(addr,old,new)
-#define clib_smp_swap(addr,new) __sync_lock_test_and_set(addr,new)
-#define clib_smp_atomic_add(addr,increment) __sync_fetch_and_add(addr,increment)
-
-#if defined (i386) || defined (__x86_64__)
-#define clib_smp_pause() do { asm volatile ("pause"); } while (0)
-#endif
-
-#ifndef clib_smp_pause
-#define clib_smp_pause() do { } while (0)
-#endif
-
-#ifdef CLIB_UNIX
-#include <sched.h>
-
-always_inline void
-os_sched_yield (void)
-{
-  sched_yield ();
-}
-#else
-always_inline void
-os_sched_yield (void)
-{
-  clib_smp_pause ();
-}
-#endif
-
-
-#endif /* included_clib_smp_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/smp_fifo.c b/vppinfra/vppinfra/smp_fifo.c
deleted file mode 100644
index bb74064d..00000000
--- a/vppinfra/vppinfra/smp_fifo.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2012 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/smp_fifo.h>
-#include <vppinfra/mem.h>
-
-clib_smp_fifo_t *
-clib_smp_fifo_init (uword max_n_elts, uword n_bytes_per_elt)
-{
-  clib_smp_fifo_t *f;
-  uword n_bytes_per_elt_cache_aligned;
-
-  f = clib_mem_alloc_aligned (sizeof (f[0]), CLIB_CACHE_LINE_BYTES);
-
-  memset (f, 0, sizeof (f[0]));
-
-  max_n_elts = max_n_elts ? max_n_elts : 32;
-  f->log2_max_n_elts = max_log2 (max_n_elts);
-  f->max_n_elts_less_one = (1 << f->log2_max_n_elts) - 1;
-
-  n_bytes_per_elt_cache_aligned =
-    clib_smp_fifo_round_elt_bytes (n_bytes_per_elt);
-  clib_exec_on_global_heap (
-			     {
-			     f->data =
-			     clib_mem_alloc_aligned
-			     (n_bytes_per_elt_cache_aligned <<
-			      f->log2_max_n_elts, CLIB_CACHE_LINE_BYTES);}
-  );
-
-  /* Zero all data and mark all elements free. */
-  {
-    uword i;
-    for (i = 0; i <= f->max_n_elts_less_one; i++)
-      {
-	void *d = clib_smp_fifo_elt_at_index (f, n_bytes_per_elt, i);
-	clib_smp_fifo_data_footer_t *t;
-
-	memset (d, 0, n_bytes_per_elt_cache_aligned);
-
-	t = clib_smp_fifo_get_data_footer (d, n_bytes_per_elt);
-	clib_smp_fifo_data_footer_set_state (t,
-					     CLIB_SMP_FIFO_DATA_STATE_free);
-      }
-  }
-
-  return f;
-}
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/smp_fifo.h b/vppinfra/vppinfra/smp_fifo.h
deleted file mode 100644
index c74a77c8..00000000
--- a/vppinfra/vppinfra/smp_fifo.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2012 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_smp_vec_h
-#define included_clib_smp_vec_h
-
-#include <vppinfra/smp.h>
-
-#define foreach_clib_smp_fifo_data_state	\
-  _ (free)					\
-  _ (write_alloc)				\
-  _ (write_done)				\
-  _ (read_fetch)
-
-typedef enum
-{
-#define _(f) CLIB_SMP_FIFO_DATA_STATE_##f,
-  foreach_clib_smp_fifo_data_state
-#undef _
-    CLIB_SMP_FIFO_N_DATA_STATE,
-} clib_smp_fifo_data_state_t;
-
-/* Footer at end of each data element. */
-typedef struct
-{
-  /* Magic number marking valid footer plus state encoded in low bits. */
-  u32 magic_state;
-} clib_smp_fifo_data_footer_t;
-
-#define CLIB_SMP_DATA_FOOTER_MAGIC 0xfafbfcf0
-
-always_inline clib_smp_fifo_data_state_t
-clib_smp_fifo_data_footer_get_state (clib_smp_fifo_data_footer_t * f)
-{
-  u32 s = f->magic_state - CLIB_SMP_DATA_FOOTER_MAGIC;
-
-  /* Check that magic number plus state is still valid. */
-  if (s >= CLIB_SMP_FIFO_N_DATA_STATE)
-    os_panic ();
-
-  return s;
-}
-
-always_inline void
-clib_smp_fifo_data_footer_set_state (clib_smp_fifo_data_footer_t * f,
-				     clib_smp_fifo_data_state_t s)
-{
-  f->magic_state = CLIB_SMP_DATA_FOOTER_MAGIC + s;
-}
-
-typedef struct
-{
-  /* Read/write indices each on their own cache line.
-     Atomic incremented for each read/write. */
-  u32 read_index, write_index;
-
-  /* Power of 2 number of elements in fifo less one. */
-  u32 max_n_elts_less_one;
-
-  /* Log2 of above. */
-  u32 log2_max_n_elts;
-
-  /* Cache aligned data. */
-  void *data;
-} clib_smp_fifo_t;
-
-/* External functions. */
-clib_smp_fifo_t *clib_smp_fifo_init (uword max_n_elts, uword n_bytes_per_elt);
-
-/* Elements are always cache-line sized; this is to avoid smp cache thrashing. */
-always_inline uword
-clib_smp_fifo_round_elt_bytes (uword n_bytes_per_elt)
-{
-  return round_pow2 (n_bytes_per_elt, CLIB_CACHE_LINE_BYTES);
-}
-
-always_inline uword
-clib_smp_fifo_n_elts (clib_smp_fifo_t * f)
-{
-  uword n = f->write_index - f->read_index;
-  ASSERT (n <= f->max_n_elts_less_one + 1);
-  return n;
-}
-
-always_inline clib_smp_fifo_data_footer_t *
-clib_smp_fifo_get_data_footer (void *d, uword n_bytes_per_elt)
-{
-  clib_smp_fifo_data_footer_t *f;
-  f = d + clib_smp_fifo_round_elt_bytes (n_bytes_per_elt) - sizeof (f[0]);
-  return f;
-}
-
-always_inline void *
-clib_smp_fifo_elt_at_index (clib_smp_fifo_t * f, uword n_bytes_per_elt,
-			    uword i)
-{
-  uword n_bytes_per_elt_cache_aligned;
-
-  ASSERT (i <= f->max_n_elts_less_one);
-
-  n_bytes_per_elt_cache_aligned =
-    clib_smp_fifo_round_elt_bytes (n_bytes_per_elt);
-
-  return f->data + i * n_bytes_per_elt_cache_aligned;
-}
-
-always_inline void *
-clib_smp_fifo_write_alloc (clib_smp_fifo_t * f, uword n_bytes_per_elt)
-{
-  void *d;
-  clib_smp_fifo_data_footer_t *t;
-  clib_smp_fifo_data_state_t s;
-  u32 wi0, wi1;
-
-  wi0 = f->write_index;
-
-  /* Fifo full? */
-  if (wi0 - f->read_index > f->max_n_elts_less_one)
-    return 0;
-
-  while (1)
-    {
-      wi1 = wi0 + 1;
-
-      d =
-	clib_smp_fifo_elt_at_index (f, n_bytes_per_elt,
-				    wi0 & f->max_n_elts_less_one);
-      t = clib_smp_fifo_get_data_footer (d, n_bytes_per_elt);
-
-      s = clib_smp_fifo_data_footer_get_state (t);
-      if (s != CLIB_SMP_FIFO_DATA_STATE_free)
-	{
-	  d = 0;
-	  break;
-	}
-
-      wi1 = clib_smp_compare_and_swap (&f->write_index, wi1, wi0);
-
-      if (wi1 == wi0)
-	{
-	  clib_smp_fifo_data_footer_set_state (t,
-					       CLIB_SMP_FIFO_DATA_STATE_write_alloc);
-	  break;
-	}
-
-      /* Other cpu wrote write index first: try again. */
-      wi0 = wi1;
-    }
-
-  return d;
-}
-
-always_inline void
-clib_smp_fifo_write_done (clib_smp_fifo_t * f, void *d, uword n_bytes_per_elt)
-{
-  clib_smp_fifo_data_footer_t *t;
-
-  /* Flush out pending writes before we change state to write_done.
-     This will hold off readers until data is flushed. */
-  CLIB_MEMORY_BARRIER ();
-
-  t = clib_smp_fifo_get_data_footer (d, n_bytes_per_elt);
-
-  ASSERT (clib_smp_fifo_data_footer_get_state (t) ==
-	  CLIB_SMP_FIFO_DATA_STATE_write_alloc);
-  clib_smp_fifo_data_footer_set_state (t,
-				       CLIB_SMP_FIFO_DATA_STATE_write_done);
-}
-
-always_inline void *
-clib_smp_fifo_read_fetch (clib_smp_fifo_t * f, uword n_bytes_per_elt)
-{
-  void *d;
-  clib_smp_fifo_data_footer_t *t;
-  clib_smp_fifo_data_state_t s;
-  u32 ri0, ri1;
-
-  ri0 = f->read_index;
-
-  /* Fifo empty? */
-  if (f->write_index - ri0 == 0)
-    return 0;
-
-  while (1)
-    {
-      ri1 = ri0 + 1;
-
-      d =
-	clib_smp_fifo_elt_at_index (f, n_bytes_per_elt,
-				    ri0 & f->max_n_elts_less_one);
-      t = clib_smp_fifo_get_data_footer (d, n_bytes_per_elt);
-
-      s = clib_smp_fifo_data_footer_get_state (t);
-      if (s != CLIB_SMP_FIFO_DATA_STATE_write_done)
-	{
-	  d = 0;
-	  break;
-	}
-
-      ri1 = clib_smp_compare_and_swap (&f->read_index, ri1, ri0);
-      if (ri1 == ri0)
-	{
-	  clib_smp_fifo_data_footer_set_state (t,
-					       CLIB_SMP_FIFO_DATA_STATE_read_fetch);
-	  break;
-	}
-
-      ri0 = ri1;
-    }
-
-  return d;
-}
-
-always_inline void
-clib_smp_fifo_read_done (clib_smp_fifo_t * f, void *d, uword n_bytes_per_elt)
-{
-  clib_smp_fifo_data_footer_t *t;
-
-  t = clib_smp_fifo_get_data_footer (d, n_bytes_per_elt);
-
-  ASSERT (clib_smp_fifo_data_footer_get_state (t) ==
-	  CLIB_SMP_FIFO_DATA_STATE_read_fetch);
-  clib_smp_fifo_data_footer_set_state (t, CLIB_SMP_FIFO_DATA_STATE_free);
-}
-
-always_inline void
-clib_smp_fifo_memcpy (uword * dst, uword * src, uword n_bytes)
-{
-  word n_bytes_left = n_bytes;
-
-  while (n_bytes_left >= 4 * sizeof (uword))
-    {
-      dst[0] = src[0];
-      dst[1] = src[1];
-      dst[2] = src[2];
-      dst[3] = src[3];
-      dst += 4;
-      src += 4;
-      n_bytes_left -= 4 * sizeof (dst[0]);
-    }
-
-  while (n_bytes_left > 0)
-    {
-      dst[0] = src[0];
-      dst += 1;
-      src += 1;
-      n_bytes_left -= 1 * sizeof (dst[0]);
-    }
-}
-
-always_inline void
-clib_smp_fifo_write_inline (clib_smp_fifo_t * f, void *elt_to_write,
-			    uword n_bytes_per_elt)
-{
-  uword *dst;
-  dst = clib_smp_fifo_write_alloc (f, n_bytes_per_elt);
-  clib_smp_fifo_memcpy (dst, elt_to_write, n_bytes_per_elt);
-  clib_smp_fifo_write_done (f, dst, n_bytes_per_elt);
-}
-
-always_inline void
-clib_smp_fifo_read_inline (clib_smp_fifo_t * f, void *elt_to_read,
-			   uword n_bytes_per_elt)
-{
-  uword *src;
-  src = clib_smp_fifo_read_fetch (f, n_bytes_per_elt);
-  clib_smp_fifo_memcpy (elt_to_read, src, n_bytes_per_elt);
-  clib_smp_fifo_read_done (f, src, n_bytes_per_elt);
-}
-
-#endif /* included_clib_smp_vec_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/socket.c b/vppinfra/vppinfra/socket.c
deleted file mode 100644
index 99b353fc..00000000
--- a/vppinfra/vppinfra/socket.c
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003, 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <sys/un.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <string.h>		/* strchr */
-
-#include <vppinfra/mem.h>
-#include <vppinfra/vec.h>
-#include <vppinfra/socket.h>
-#include <vppinfra/format.h>
-#include <vppinfra/error.h>
-
-void
-clib_socket_tx_add_formatted (clib_socket_t * s, char *fmt, ...)
-{
-  va_list va;
-  va_start (va, fmt);
-  clib_socket_tx_add_va_formatted (s, fmt, &va);
-  va_end (va);
-}
-
-/* Return and bind to an unused port. */
-static word
-find_free_port (word sock)
-{
-  word port;
-
-  for (port = IPPORT_USERRESERVED; port < 1 << 16; port++)
-    {
-      struct sockaddr_in a;
-
-      memset (&a, 0, sizeof (a));	/* Warnings be gone */
-
-      a.sin_family = PF_INET;
-      a.sin_addr.s_addr = INADDR_ANY;
-      a.sin_port = htons (port);
-
-      if (bind (sock, (struct sockaddr *) &a, sizeof (a)) >= 0)
-	break;
-    }
-
-  return port < 1 << 16 ? port : -1;
-}
-
-/* Convert a config string to a struct sockaddr and length for use
-   with bind or connect. */
-static clib_error_t *
-socket_config (char *config,
-	       void *addr, socklen_t * addr_len, u32 ip4_default_address)
-{
-  clib_error_t *error = 0;
-
-  if (!config)
-    config = "";
-
-  /* Anything that begins with a / is a local PF_LOCAL socket. */
-  if (config[0] == '/')
-    {
-      struct sockaddr_un *su = addr;
-      su->sun_family = PF_LOCAL;
-      clib_memcpy (&su->sun_path, config,
-		   clib_min (sizeof (su->sun_path), 1 + strlen (config)));
-      *addr_len = sizeof (su[0]);
-    }
-
-  /* Hostname or hostname:port or port. */
-  else
-    {
-      char *host_name;
-      int port = -1;
-      struct sockaddr_in *sa = addr;
-
-      host_name = 0;
-      port = -1;
-      if (config[0] != 0)
-	{
-	  unformat_input_t i;
-
-	  unformat_init_string (&i, config, strlen (config));
-	  if (unformat (&i, "%s:%d", &host_name, &port)
-	      || unformat (&i, "%s:0x%x", &host_name, &port))
-	    ;
-	  else if (unformat (&i, "%s", &host_name))
-	    ;
-	  else
-	    error = clib_error_return (0, "unknown input `%U'",
-				       format_unformat_error, &i);
-	  unformat_free (&i);
-
-	  if (error)
-	    goto done;
-	}
-
-      sa->sin_family = PF_INET;
-      *addr_len = sizeof (sa[0]);
-      if (port != -1)
-	sa->sin_port = htons (port);
-      else
-	sa->sin_port = 0;
-
-      if (host_name)
-	{
-	  struct in_addr host_addr;
-
-	  /* Recognize localhost to avoid host lookup in most common cast. */
-	  if (!strcmp (host_name, "localhost"))
-	    sa->sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-
-	  else if (inet_aton (host_name, &host_addr))
-	    sa->sin_addr = host_addr;
-
-	  else if (host_name && strlen (host_name) > 0)
-	    {
-	      struct hostent *host = gethostbyname (host_name);
-	      if (!host)
-		error = clib_error_return (0, "unknown host `%s'", config);
-	      else
-		clib_memcpy (&sa->sin_addr.s_addr, host->h_addr_list[0],
-			     host->h_length);
-	    }
-
-	  else
-	    sa->sin_addr.s_addr = htonl (ip4_default_address);
-
-	  vec_free (host_name);
-	  if (error)
-	    goto done;
-	}
-    }
-
-done:
-  return error;
-}
-
-static clib_error_t *
-default_socket_write (clib_socket_t * s)
-{
-  clib_error_t *err = 0;
-  word written = 0;
-  word fd = 0;
-  word tx_len;
-
-  fd = s->fd;
-
-  /* Map standard input to standard output.
-     Typically, fd is a socket for which read/write both work. */
-  if (fd == 0)
-    fd = 1;
-
-  tx_len = vec_len (s->tx_buffer);
-  written = write (fd, s->tx_buffer, tx_len);
-
-  /* Ignore certain errors. */
-  if (written < 0 && !unix_error_is_fatal (errno))
-    written = 0;
-
-  /* A "real" error occurred. */
-  if (written < 0)
-    {
-      err = clib_error_return_unix (0, "write %wd bytes", tx_len);
-      vec_free (s->tx_buffer);
-      goto done;
-    }
-
-  /* Reclaim the transmitted part of the tx buffer on successful writes. */
-  else if (written > 0)
-    {
-      if (written == tx_len)
-	_vec_len (s->tx_buffer) = 0;
-      else
-	vec_delete (s->tx_buffer, written, 0);
-    }
-
-  /* If a non-fatal error occurred AND
-     the buffer is full, then we must free it. */
-  else if (written == 0 && tx_len > 64 * 1024)
-    {
-      vec_free (s->tx_buffer);
-    }
-
-done:
-  return err;
-}
-
-static clib_error_t *
-default_socket_read (clib_socket_t * sock, int n_bytes)
-{
-  word fd, n_read;
-  u8 *buf;
-
-  /* RX side of socket is down once end of file is reached. */
-  if (sock->flags & SOCKET_RX_END_OF_FILE)
-    return 0;
-
-  fd = sock->fd;
-
-  n_bytes = clib_max (n_bytes, 4096);
-  vec_add2 (sock->rx_buffer, buf, n_bytes);
-
-  if ((n_read = read (fd, buf, n_bytes)) < 0)
-    {
-      n_read = 0;
-
-      /* Ignore certain errors. */
-      if (!unix_error_is_fatal (errno))
-	goto non_fatal;
-
-      return clib_error_return_unix (0, "read %d bytes", n_bytes);
-    }
-
-  /* Other side closed the socket. */
-  if (n_read == 0)
-    sock->flags |= SOCKET_RX_END_OF_FILE;
-
-non_fatal:
-  _vec_len (sock->rx_buffer) += n_read - n_bytes;
-
-  return 0;
-}
-
-static clib_error_t *
-default_socket_close (clib_socket_t * s)
-{
-  if (close (s->fd) < 0)
-    return clib_error_return_unix (0, "close");
-  return 0;
-}
-
-static void
-socket_init_funcs (clib_socket_t * s)
-{
-  if (!s->write_func)
-    s->write_func = default_socket_write;
-  if (!s->read_func)
-    s->read_func = default_socket_read;
-  if (!s->close_func)
-    s->close_func = default_socket_close;
-}
-
-clib_error_t *
-clib_socket_init (clib_socket_t * s)
-{
-  union
-  {
-    struct sockaddr sa;
-    struct sockaddr_un su;
-  } addr;
-  socklen_t addr_len = 0;
-  clib_error_t *error = 0;
-  word port;
-
-  error = socket_config (s->config, &addr.sa, &addr_len,
-			 (s->flags & SOCKET_IS_SERVER
-			  ? INADDR_LOOPBACK : INADDR_ANY));
-  if (error)
-    goto done;
-
-  socket_init_funcs (s);
-
-  s->fd = socket (addr.sa.sa_family, SOCK_STREAM, 0);
-  if (s->fd < 0)
-    {
-      error = clib_error_return_unix (0, "socket");
-      goto done;
-    }
-
-  port = 0;
-  if (addr.sa.sa_family == PF_INET)
-    port = ((struct sockaddr_in *) &addr)->sin_port;
-
-  if (s->flags & SOCKET_IS_SERVER)
-    {
-      uword need_bind = 1;
-
-      if (addr.sa.sa_family == PF_INET)
-	{
-	  if (port == 0)
-	    {
-	      port = find_free_port (s->fd);
-	      if (port < 0)
-		{
-		  error = clib_error_return (0, "no free port");
-		  goto done;
-		}
-	      need_bind = 0;
-	    }
-	}
-      if (addr.sa.sa_family == PF_LOCAL)
-	unlink (((struct sockaddr_un *) &addr)->sun_path);
-
-      /* Make address available for multiple users. */
-      {
-	int v = 1;
-	if (setsockopt (s->fd, SOL_SOCKET, SO_REUSEADDR, &v, sizeof (v)) < 0)
-	  clib_unix_warning ("setsockopt SO_REUSEADDR fails");
-      }
-
-      if (need_bind && bind (s->fd, &addr.sa, addr_len) < 0)
-	{
-	  error = clib_error_return_unix (0, "bind");
-	  goto done;
-	}
-
-      if (listen (s->fd, 5) < 0)
-	{
-	  error = clib_error_return_unix (0, "listen");
-	  goto done;
-	}
-    }
-  else
-    {
-      if ((s->flags & SOCKET_NON_BLOCKING_CONNECT)
-	  && fcntl (s->fd, F_SETFL, O_NONBLOCK) < 0)
-	{
-	  error = clib_error_return_unix (0, "fcntl NONBLOCK");
-	  goto done;
-	}
-
-      if (connect (s->fd, &addr.sa, addr_len) < 0
-	  && !((s->flags & SOCKET_NON_BLOCKING_CONNECT) &&
-	       errno == EINPROGRESS))
-	{
-	  error = clib_error_return_unix (0, "connect");
-	  goto done;
-	}
-    }
-
-  return error;
-
-done:
-  if (s->fd > 0)
-    close (s->fd);
-  return error;
-}
-
-clib_error_t *
-clib_socket_accept (clib_socket_t * server, clib_socket_t * client)
-{
-  clib_error_t *err = 0;
-  socklen_t len = 0;
-
-  memset (client, 0, sizeof (client[0]));
-
-  /* Accept the new socket connection. */
-  client->fd = accept (server->fd, 0, 0);
-  if (client->fd < 0)
-    return clib_error_return_unix (0, "accept");
-
-  /* Set the new socket to be non-blocking. */
-  if (fcntl (client->fd, F_SETFL, O_NONBLOCK) < 0)
-    {
-      err = clib_error_return_unix (0, "fcntl O_NONBLOCK");
-      goto close_client;
-    }
-
-  /* Get peer info. */
-  len = sizeof (client->peer);
-  if (getpeername (client->fd, (struct sockaddr *) &client->peer, &len) < 0)
-    {
-      err = clib_error_return_unix (0, "getpeername");
-      goto close_client;
-    }
-
-  client->flags = SOCKET_IS_CLIENT;
-
-  socket_init_funcs (client);
-  return 0;
-
-close_client:
-  close (client->fd);
-  return err;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/socket.h b/vppinfra/vppinfra/socket.h
deleted file mode 100644
index 08e22e7e..00000000
--- a/vppinfra/vppinfra/socket.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef _clib_included_socket_h
-#define _clib_included_socket_h
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <vppinfra/clib.h>
-#include <vppinfra/error.h>
-#include <vppinfra/format.h>
-
-typedef struct _socket_t
-{
-  /* File descriptor. */
-  i32 fd;
-
-  /* Config string for socket HOST:PORT or just HOST. */
-  char *config;
-
-  u32 flags;
-#define SOCKET_IS_SERVER (1 << 0)
-#define SOCKET_IS_CLIENT (0 << 0)
-#define SOCKET_NON_BLOCKING_CONNECT (1 << 1)
-
-  /* Read returned end-of-file. */
-#define SOCKET_RX_END_OF_FILE (1 << 2)
-
-  /* Transmit buffer.  Holds data waiting to be written. */
-  u8 *tx_buffer;
-
-  /* Receive buffer.  Holds data read from socket. */
-  u8 *rx_buffer;
-
-  /* Peer socket we are connected to. */
-  struct sockaddr_in peer;
-
-  clib_error_t *(*write_func) (struct _socket_t * sock);
-  clib_error_t *(*read_func) (struct _socket_t * sock, int min_bytes);
-  clib_error_t *(*close_func) (struct _socket_t * sock);
-  void *private_data;
-} clib_socket_t;
-
-/* socket config format is host:port.
-   Unspecified port causes a free one to be chosen starting
-   from IPPORT_USERRESERVED (5000). */
-clib_error_t *clib_socket_init (clib_socket_t * socket);
-
-clib_error_t *clib_socket_accept (clib_socket_t * server,
-				  clib_socket_t * client);
-
-always_inline uword
-clib_socket_is_server (clib_socket_t * sock)
-{
-  return (sock->flags & SOCKET_IS_SERVER) != 0;
-}
-
-always_inline uword
-clib_socket_is_client (clib_socket_t * s)
-{
-  return !clib_socket_is_server (s);
-}
-
-always_inline int
-clib_socket_rx_end_of_file (clib_socket_t * s)
-{
-  return s->flags & SOCKET_RX_END_OF_FILE;
-}
-
-always_inline void *
-clib_socket_tx_add (clib_socket_t * s, int n_bytes)
-{
-  u8 *result;
-  vec_add2 (s->tx_buffer, result, n_bytes);
-  return result;
-}
-
-always_inline void
-clib_socket_tx_add_va_formatted (clib_socket_t * s, char *fmt, va_list * va)
-{
-  s->tx_buffer = va_format (s->tx_buffer, fmt, va);
-}
-
-always_inline clib_error_t *
-clib_socket_tx (clib_socket_t * s)
-{
-  return s->write_func (s);
-}
-
-always_inline clib_error_t *
-clib_socket_rx (clib_socket_t * s, int n_bytes)
-{
-  return s->read_func (s, n_bytes);
-}
-
-always_inline void
-clib_socket_free (clib_socket_t * s)
-{
-  vec_free (s->tx_buffer);
-  vec_free (s->rx_buffer);
-  if (clib_mem_is_heap_object (s->config))
-    vec_free (s->config);
-  memset (s, 0, sizeof (s[0]));
-}
-
-always_inline clib_error_t *
-clib_socket_close (clib_socket_t * sock)
-{
-  clib_error_t *err;
-  err = (*sock->close_func) (sock);
-  return err;
-}
-
-void clib_socket_tx_add_formatted (clib_socket_t * s, char *fmt, ...);
-
-#endif /* _clib_included_socket_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/sparse_vec.h b/vppinfra/vppinfra/sparse_vec.h
deleted file mode 100644
index ec8f0a1c..00000000
--- a/vppinfra/vppinfra/sparse_vec.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_sparse_vec_h
-#define included_sparse_vec_h
-
-#include <vppinfra/vec.h>
-#include <vppinfra/bitops.h>
-
-/* Sparsely indexed vectors.  Basic idea taken from Hacker's delight.
-   Eliot added ranges. */
-typedef struct
-{
-  /* Bitmap one for each sparse index. */
-  uword *is_member_bitmap;
-
-  /* member_counts[i] = total number of members with j < i. */
-  u16 *member_counts;
-
-#define SPARSE_VEC_IS_RANGE (1 << 0)
-#define SPARSE_VEC_IS_VALID_RANGE (1 << 1)
-  u8 *range_flags;
-} sparse_vec_header_t;
-
-always_inline sparse_vec_header_t *
-sparse_vec_header (void *v)
-{
-  return vec_header (v, sizeof (sparse_vec_header_t));
-}
-
-/* Index 0 is always used to mark indices that are not valid in
-   sparse vector.  For example, you look up V[0x1234] and 0x1234 is not
-   known you'll get 0 back as an index. */
-#define SPARSE_VEC_INVALID_INDEX (0)
-
-always_inline void *
-sparse_vec_new (uword elt_bytes, uword sparse_index_bits)
-{
-  void *v;
-  sparse_vec_header_t *h;
-  word n;
-
-  ASSERT (sparse_index_bits <= 16);
-
-  v = _vec_resize (0,
-		   /* length increment */ 8,
-		   /* data bytes */ 8 * elt_bytes,
-		   /* header bytes */ sizeof (h[0]),
-		   /* data align */ 0);
-
-  /* Make space for invalid entry (entry 0). */
-  _vec_len (v) = 1;
-
-  h = sparse_vec_header (v);
-
-  n = sparse_index_bits - min_log2 (BITS (uword));
-  if (n < 0)
-    n = 0;
-  n = 1ULL << n;
-  vec_resize (h->is_member_bitmap, n);
-  vec_resize (h->member_counts, n);
-
-  return v;
-}
-
-always_inline uword
-sparse_vec_index_internal (void *v,
-			   uword sparse_index,
-			   uword maybe_range, u32 * insert)
-{
-  sparse_vec_header_t *h;
-  uword i, b, d, w;
-  u8 is_member;
-
-  h = sparse_vec_header (v);
-  i = sparse_index / BITS (h->is_member_bitmap[0]);
-  b = (uword) 1 << (uword) (sparse_index % BITS (h->is_member_bitmap[0]));
-
-  ASSERT (i < vec_len (h->is_member_bitmap));
-  ASSERT (i < vec_len (h->member_counts));
-
-  w = h->is_member_bitmap[i];
-  d = h->member_counts[i] + count_set_bits (w & (b - 1));
-
-  is_member = (w & b) != 0;
-  if (maybe_range)
-    {
-      u8 r = h->range_flags[d];
-      u8 is_range, is_valid_range;
-
-      is_range = maybe_range & (r & SPARSE_VEC_IS_RANGE);
-      is_valid_range = (r & SPARSE_VEC_IS_VALID_RANGE) != 0;
-
-      is_member = is_range ? is_valid_range : is_member;
-    }
-
-  if (insert)
-    {
-      *insert = !is_member;
-      if (!is_member)
-	{
-	  uword j;
-	  w |= b;
-	  h->is_member_bitmap[i] = w;
-	  for (j = i + 1; j < vec_len (h->member_counts); j++)
-	    h->member_counts[j] += 1;
-	}
-
-      return 1 + d;
-    }
-
-  d = is_member ? d : 0;
-
-  return is_member + d;
-}
-
-always_inline uword
-sparse_vec_index (void *v, uword sparse_index)
-{
-  return sparse_vec_index_internal (v, sparse_index,
-				    /* maybe range */ 0,
-				    /* insert? */ 0);
-}
-
-always_inline void
-sparse_vec_index2 (void *v,
-		   u32 si0, u32 si1, u32 * i0_return, u32 * i1_return)
-{
-  sparse_vec_header_t *h;
-  uword b0, b1, w0, w1, v0, v1;
-  u32 i0, i1, d0, d1;
-  u8 is_member0, is_member1;
-
-  h = sparse_vec_header (v);
-
-  i0 = si0 / BITS (h->is_member_bitmap[0]);
-  i1 = si1 / BITS (h->is_member_bitmap[0]);
-
-  b0 = (uword) 1 << (uword) (si0 % BITS (h->is_member_bitmap[0]));
-  b1 = (uword) 1 << (uword) (si1 % BITS (h->is_member_bitmap[0]));
-
-  ASSERT (i0 < vec_len (h->is_member_bitmap));
-  ASSERT (i1 < vec_len (h->is_member_bitmap));
-
-  ASSERT (i0 < vec_len (h->member_counts));
-  ASSERT (i1 < vec_len (h->member_counts));
-
-  w0 = h->is_member_bitmap[i0];
-  w1 = h->is_member_bitmap[i1];
-
-  v0 = w0 & (b0 - 1);
-  v1 = w1 & (b1 - 1);
-
-  /* Speculate that masks will have zero or one bits set. */
-  d0 = h->member_counts[i0] + (v0 != 0);
-  d1 = h->member_counts[i1] + (v1 != 0);
-
-  /* Validate speculation. */
-  if (PREDICT_FALSE (!is_pow2 (v0) || !is_pow2 (v1)))
-    {
-      d0 += count_set_bits (v0) - (v0 != 0);
-      d1 += count_set_bits (v1) - (v1 != 0);
-    }
-
-  is_member0 = (w0 & b0) != 0;
-  is_member1 = (w1 & b1) != 0;
-
-  d0 = is_member0 ? d0 : 0;
-  d1 = is_member1 ? d1 : 0;
-
-  *i0_return = is_member0 + d0;
-  *i1_return = is_member1 + d1;
-}
-
-#define sparse_vec_free(v) vec_free(v)
-
-#define sparse_vec_elt_at_index(v,i) \
-  vec_elt_at_index ((v), sparse_vec_index ((v), (i)))
-
-#define sparse_vec_validate(v,i)					\
-({									\
-  uword _i;								\
-  u32 _insert;								\
-									\
-  if (! (v))								\
-    (v) = sparse_vec_new (sizeof ((v)[0]), BITS (u16));			\
-									\
-  _i = sparse_vec_index_internal ((v), (i),				\
-				  /* maybe range */ 0,			\
-				  /* insert? */ &_insert);		\
-  if (_insert)								\
-    vec_insert_ha ((v), 1, _i,						\
-		   /* header size */ sizeof (sparse_vec_header_t),	\
-		   /* align */ 0);					\
-									\
-  /* Invalid index is 0. */						\
-  ASSERT (_i > 0);							\
-									\
-  (v) + _i;								\
-})
-
-#endif /* included_sparse_vec_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/std-formats.c b/vppinfra/vppinfra/std-formats.c
deleted file mode 100644
index ac98f999..00000000
--- a/vppinfra/vppinfra/std-formats.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/format.h>
-#include <ctype.h>
-
-/* Format vectors. */
-u8 *
-format_vec32 (u8 * s, va_list * va)
-{
-  u32 *v = va_arg (*va, u32 *);
-  char *fmt = va_arg (*va, char *);
-  uword i;
-  for (i = 0; i < vec_len (v); i++)
-    {
-      if (i > 0)
-	s = format (s, ", ");
-      s = format (s, fmt, v[i]);
-    }
-  return s;
-}
-
-u8 *
-format_vec_uword (u8 * s, va_list * va)
-{
-  uword *v = va_arg (*va, uword *);
-  char *fmt = va_arg (*va, char *);
-  uword i;
-  for (i = 0; i < vec_len (v); i++)
-    {
-      if (i > 0)
-	s = format (s, ", ");
-      s = format (s, fmt, v[i]);
-    }
-  return s;
-}
-
-/* Ascii buffer and length. */
-u8 *
-format_ascii_bytes (u8 * s, va_list * va)
-{
-  u8 *v = va_arg (*va, u8 *);
-  uword n_bytes = va_arg (*va, uword);
-  vec_add (s, v, n_bytes);
-  return s;
-}
-
-/* Format hex dump. */
-u8 *
-format_hex_bytes (u8 * s, va_list * va)
-{
-  u8 *bytes = va_arg (*va, u8 *);
-  int n_bytes = va_arg (*va, int);
-  uword i;
-
-  /* Print short or long form depending on byte count. */
-  uword short_form = n_bytes <= 32;
-  uword indent = format_get_indent (s);
-
-  if (n_bytes == 0)
-    return s;
-
-  for (i = 0; i < n_bytes; i++)
-    {
-      if (!short_form && (i % 32) == 0)
-	s = format (s, "%08x: ", i);
-
-      s = format (s, "%02x", bytes[i]);
-
-      if (!short_form && ((i + 1) % 32) == 0 && (i + 1) < n_bytes)
-	s = format (s, "\n%U", format_white_space, indent);
-    }
-
-  return s;
-}
-
-/* Add variable number of spaces. */
-u8 *
-format_white_space (u8 * s, va_list * va)
-{
-  uword n = va_arg (*va, uword);
-  while (n-- > 0)
-    vec_add1 (s, ' ');
-  return s;
-}
-
-u8 *
-format_time_interval (u8 * s, va_list * args)
-{
-  u8 *fmt = va_arg (*args, u8 *);
-  f64 t = va_arg (*args, f64);
-  u8 *f;
-
-  const f64 seconds_per_minute = 60;
-  const f64 seconds_per_hour = 60 * seconds_per_minute;
-  const f64 seconds_per_day = 24 * seconds_per_hour;
-  uword days, hours, minutes, secs, msecs, usecs;
-
-  days = t / seconds_per_day;
-  t -= days * seconds_per_day;
-
-  hours = t / seconds_per_hour;
-  t -= hours * seconds_per_hour;
-
-  minutes = t / seconds_per_minute;
-  t -= minutes * seconds_per_minute;
-
-  secs = t;
-  t -= secs;
-
-  msecs = 1e3 * t;
-  usecs = 1e6 * t;
-
-  for (f = fmt; *f; f++)
-    {
-      uword what, c;
-      char *what_fmt = "%d";
-
-      switch (c = *f)
-	{
-	default:
-	  vec_add1 (s, c);
-	  continue;
-
-	case 'd':
-	  what = days;
-	  what_fmt = "%d";
-	  break;
-	case 'h':
-	  what = hours;
-	  what_fmt = "%02d";
-	  break;
-	case 'm':
-	  what = minutes;
-	  what_fmt = "%02d";
-	  break;
-	case 's':
-	  what = secs;
-	  what_fmt = "%02d";
-	  break;
-	case 'f':
-	  what = msecs;
-	  what_fmt = "%03d";
-	  break;
-	case 'u':
-	  what = usecs;
-	  what_fmt = "%06d";
-	  break;
-	}
-
-      s = format (s, what_fmt, what);
-    }
-
-  return s;
-}
-
-/* Unparse memory size e.g. 100, 100k, 100m, 100g. */
-u8 *
-format_memory_size (u8 * s, va_list * va)
-{
-  uword size = va_arg (*va, uword);
-  uword l, u, log_u;
-
-  l = size > 0 ? min_log2 (size) : 0;
-  if (l < 10)
-    log_u = 0;
-  else if (l < 20)
-    log_u = 10;
-  else if (l < 30)
-    log_u = 20;
-  else
-    log_u = 30;
-
-  u = (uword) 1 << log_u;
-  if (size & (u - 1))
-    s = format (s, "%.2f", (f64) size / (f64) u);
-  else
-    s = format (s, "%d", size >> log_u);
-
-  if (log_u != 0)
-    s = format (s, "%c", " kmg"[log_u / 10]);
-
-  return s;
-}
-
-/* Parse memory size e.g. 100, 100k, 100m, 100g. */
-uword
-unformat_memory_size (unformat_input_t * input, va_list * va)
-{
-  uword amount, shift, c;
-  uword *result = va_arg (*va, uword *);
-
-  if (!unformat (input, "%wd%_", &amount))
-    return 0;
-
-  c = unformat_get_input (input);
-  switch (c)
-    {
-    case 'k':
-    case 'K':
-      shift = 10;
-      break;
-    case 'm':
-    case 'M':
-      shift = 20;
-      break;
-    case 'g':
-    case 'G':
-      shift = 30;
-      break;
-    default:
-      shift = 0;
-      unformat_put_input (input);
-      break;
-    }
-
-  *result = amount << shift;
-  return 1;
-}
-
-/* Format c identifier: e.g. a_name -> "a name".
-   Words for both vector names and null terminated c strings. */
-u8 *
-format_c_identifier (u8 * s, va_list * va)
-{
-  u8 *id = va_arg (*va, u8 *);
-  uword i, l;
-
-  l = ~0;
-  if (clib_mem_is_vec (id))
-    l = vec_len (id);
-
-  if (id)
-    for (i = 0; id[i] != 0 && i < l; i++)
-      {
-	u8 c = id[i];
-
-	if (c == '_')
-	  c = ' ';
-	vec_add1 (s, c);
-      }
-
-  return s;
-}
-
-u8 *
-format_hexdump (u8 * s, va_list * args)
-{
-  u8 *data = va_arg (*args, u8 *);
-  uword len = va_arg (*args, uword);
-  int i, index = 0;
-  const int line_len = 16;
-  u8 *line_hex = 0;
-  u8 *line_str = 0;
-  uword indent = format_get_indent (s);
-
-  if (!len)
-    return s;
-
-  for (i = 0; i < len; i++)
-    {
-      line_hex = format (line_hex, "%02x ", data[i]);
-      line_str = format (line_str, "%c", isprint (data[i]) ? data[i] : '.');
-      if (!((i + 1) % line_len))
-	{
-	  s = format (s, "%U%05x: %v[%v]",
-		      format_white_space, index ? indent : 0,
-		      index, line_hex, line_str);
-	  if (i < len - 1)
-	    s = format (s, "\n");
-	  index = i + 1;
-	  vec_reset_length (line_hex);
-	  vec_reset_length (line_str);
-	}
-    }
-
-  while (i++ % line_len)
-    line_hex = format (line_hex, "   ");
-
-  if (vec_len (line_hex))
-    s = format (s, "%U%05x: %v[%v]",
-		format_white_space, indent, index, line_hex, line_str);
-
-  vec_free (line_hex);
-  vec_free (line_str);
-
-  return s;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/string.c b/vppinfra/vppinfra/string.c
deleted file mode 100644
index ba21e7b3..00000000
--- a/vppinfra/vppinfra/string.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2006 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/string.h>
-#include <vppinfra/error.h>
-
-/* Exchanges source and destination. */
-void
-clib_memswap (void *_a, void *_b, uword bytes)
-{
-  uword pa = pointer_to_uword (_a);
-  uword pb = pointer_to_uword (_b);
-
-#define _(TYPE)					\
-  if (0 == ((pa | pb) & (sizeof (TYPE) - 1)))	\
-    {						\
-      TYPE * a = uword_to_pointer (pa, TYPE *);	\
-      TYPE * b = uword_to_pointer (pb, TYPE *);	\
-						\
-      while (bytes >= 2*sizeof (TYPE))		\
-	{					\
-	  TYPE a0, a1, b0, b1;			\
-	  bytes -= 2*sizeof (TYPE);		\
-	  a += 2;				\
-	  b += 2;				\
-	  a0 = a[-2]; a1 = a[-1];		\
-	  b0 = b[-2]; b1 = b[-1];		\
-	  a[-2] = b0; a[-1] = b1;		\
-	  b[-2] = a0; b[-1] = a1;		\
-	}					\
-      pa = pointer_to_uword (a);		\
-      pb = pointer_to_uword (b);		\
-    }
-
-  if (BITS (uword) == BITS (u64))
-    _(u64);
-  _(u32);
-  _(u16);
-  _(u8);
-
-#undef _
-
-  ASSERT (bytes < 2);
-  if (bytes)
-    {
-      u8 *a = uword_to_pointer (pa, u8 *);
-      u8 *b = uword_to_pointer (pb, u8 *);
-      u8 a0 = a[0], b0 = b[0];
-      a[0] = b0;
-      b[0] = a0;
-    }
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/string.h b/vppinfra/vppinfra/string.h
deleted file mode 100644
index 69a99a3f..00000000
--- a/vppinfra/vppinfra/string.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_string_h
-#define included_clib_string_h
-
-#include <vppinfra/clib.h>	/* for CLIB_LINUX_KERNEL */
-#include <vppinfra/vector.h>
-
-#ifdef CLIB_LINUX_KERNEL
-#include <linux/string.h>
-#endif
-
-#ifdef CLIB_UNIX
-#include <string.h>
-#endif
-
-#ifdef CLIB_STANDALONE
-#include <vppinfra/standalone_string.h>
-#endif
-
-/* Exchanges source and destination. */
-void clib_memswap (void *_a, void *_b, uword bytes);
-
-/*
- * the vector unit memcpy variants confuse coverity
- * so don't let it anywhere near them.
- */
-#ifndef __COVERITY__
-#if __AVX__
-#include <vppinfra/memcpy_avx.h>
-#elif __SSSE3__
-#include <vppinfra/memcpy_sse3.h>
-#else
-#define clib_memcpy(a,b,c) memcpy(a,b,c)
-#endif
-#else /* __COVERITY__ */
-#define clib_memcpy(a,b,c) memcpy(a,b,c)
-#endif
-
-#endif /* included_clib_string_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_bihash_template.c b/vppinfra/vppinfra/test_bihash_template.c
deleted file mode 100644
index c505bd83..00000000
--- a/vppinfra/vppinfra/test_bihash_template.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vppinfra/time.h>
-#include <vppinfra/cache.h>
-#include <vppinfra/error.h>
-
-#include <vppinfra/bihash_8_8.h>
-#include <vppinfra/bihash_template.h>
-
-#include <vppinfra/bihash_template.c>
-
-typedef struct
-{
-  u64 seed;
-  u32 nbuckets;
-  u32 nitems;
-  u32 search_iter;
-  int careful_delete_tests;
-  int verbose;
-  int non_random_keys;
-  uword *key_hash;
-  u64 *keys;
-    BVT (clib_bihash) hash;
-  clib_time_t clib_time;
-
-  unformat_input_t *input;
-
-} test_main_t;
-
-test_main_t test_main;
-
-uword
-vl (void *v)
-{
-  return vec_len (v);
-}
-
-static clib_error_t *
-test_bihash (test_main_t * tm)
-{
-  int i, j;
-  uword *p;
-  uword total_searches;
-  f64 before, delta;
-  BVT (clib_bihash) * h;
-  BVT (clib_bihash_kv) kv;
-
-  h = &tm->hash;
-
-  BV (clib_bihash_init) (h, "test", tm->nbuckets, 3ULL << 30);
-
-  fformat (stdout, "Pick %lld unique %s keys...\n",
-	   tm->nitems, tm->non_random_keys ? "non-random" : "random");
-
-  for (i = 0; i < tm->nitems; i++)
-    {
-      u64 rndkey;
-
-      if (tm->non_random_keys == 0)
-	{
-
-	again:
-	  rndkey = random_u64 (&tm->seed);
-
-	  p = hash_get (tm->key_hash, rndkey);
-	  if (p)
-	    goto again;
-	}
-      else
-	rndkey = (u64) (i + 1) << 16;
-
-      hash_set (tm->key_hash, rndkey, i + 1);
-      vec_add1 (tm->keys, rndkey);
-    }
-
-  fformat (stdout, "Add items...\n");
-  for (i = 0; i < tm->nitems; i++)
-    {
-      kv.key = tm->keys[i];
-      kv.value = i + 1;
-
-      BV (clib_bihash_add_del) (h, &kv, 1 /* is_add */ );
-
-      if (tm->verbose > 1)
-	{
-	  fformat (stdout, "--------------------\n");
-	  fformat (stdout, "After adding key %llu value %lld...\n",
-		   tm->keys[i], (u64) (i + 1));
-	  fformat (stdout, "%U", BV (format_bihash), h,
-		   2 /* very verbose */ );
-	}
-    }
-
-  fformat (stdout, "%U", BV (format_bihash), h, 0 /* very verbose */ );
-
-  fformat (stdout, "Search for items %d times...\n", tm->search_iter);
-
-  before = clib_time_now (&tm->clib_time);
-
-  for (j = 0; j < tm->search_iter; j++)
-    {
-      u64 hash1 = clib_xxhash (tm->keys[0]);
-
-      for (i = 0; i < tm->nitems; i++)
-	{
-	  if (i < (tm->nitems - 3))
-	    {
-	      clib_bihash_bucket_t *b;
-	      BVT (clib_bihash_value) * v;
-	      u64 hash2 = clib_xxhash (tm->keys[i + 3]);
-	      u32 bucket_index = hash2 & (h->nbuckets - 1);
-	      b = &h->buckets[bucket_index];
-	      CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD);
-
-	      bucket_index = hash1 & (h->nbuckets - 1);
-	      b = &h->buckets[bucket_index];
-	      v = BV (clib_bihash_get_value) (h, b->offset);
-	      hash1 >>= h->log2_nbuckets;
-	      hash1 = hash1 & ((1 << b->log2_pages) - 1);
-	      v += hash1;
-	      CLIB_PREFETCH (v, CLIB_CACHE_LINE_BYTES, LOAD);
-
-	      hash1 = hash2;
-	    }
-
-	  kv.key = tm->keys[i];
-	  if (BV (clib_bihash_search) (h, &kv, &kv) < 0)
-	    clib_warning ("search for key %lld failed unexpectedly\n",
-			  tm->keys[i]);
-	  if (kv.value != (u64) (i + 1))
-	    clib_warning ("search for key %lld returned %lld, not %lld\n",
-			  tm->keys, kv.value, (u64) (i + 1));
-	}
-    }
-
-  delta = clib_time_now (&tm->clib_time) - before;
-  total_searches = (uword) tm->search_iter * (uword) tm->nitems;
-
-  if (delta > 0)
-    fformat (stdout, "%.f searches per second\n",
-	     ((f64) total_searches) / delta);
-
-  fformat (stdout, "%lld searches in %.6f seconds\n", total_searches, delta);
-
-  fformat (stdout, "Standard E-hash search for items %d times...\n",
-	   tm->search_iter);
-
-  before = clib_time_now (&tm->clib_time);
-
-  for (j = 0; j < tm->search_iter; j++)
-    {
-      for (i = 0; i < tm->nitems; i++)
-	{
-	  p = hash_get (tm->key_hash, tm->keys[i]);
-	  if (p == 0 || p[0] != (uword) (i + 1))
-	    clib_warning ("ugh, couldn't find %lld\n", tm->keys[i]);
-	}
-    }
-
-  delta = clib_time_now (&tm->clib_time) - before;
-  total_searches = (uword) tm->search_iter * (uword) tm->nitems;
-
-  fformat (stdout, "%lld searches in %.6f seconds\n", total_searches, delta);
-
-  if (delta > 0)
-    fformat (stdout, "%.f searches per second\n",
-	     ((f64) total_searches) / delta);
-
-  fformat (stdout, "Delete items...\n");
-
-  for (i = 0; i < tm->nitems; i++)
-    {
-      int j;
-      int rv;
-
-      kv.key = tm->keys[i];
-      kv.value = (u64) (i + 1);
-      rv = BV (clib_bihash_add_del) (h, &kv, 0 /* is_add */ );
-
-      if (rv < 0)
-	clib_warning ("delete key %lld not ok but should be", tm->keys[i]);
-
-      if (tm->careful_delete_tests)
-	{
-	  for (j = 0; j < tm->nitems; j++)
-	    {
-	      kv.key = tm->keys[j];
-	      rv = BV (clib_bihash_search) (h, &kv, &kv);
-	      if (j <= i && rv >= 0)
-		{
-		  clib_warning
-		    ("i %d j %d search ok but should not be, value %lld",
-		     i, j, kv.value);
-		}
-	      if (j > i && rv < 0)
-		{
-		  clib_warning ("i %d j %d search not ok but should be",
-				i, j);
-		}
-	    }
-	}
-    }
-
-  fformat (stdout, "After deletions, should be empty...\n");
-
-  fformat (stdout, "%U", BV (format_bihash), h, 0 /* very verbose */ );
-  return 0;
-}
-
-clib_error_t *
-test_bihash_main (test_main_t * tm)
-{
-  unformat_input_t *i = tm->input;
-  clib_error_t *error;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "seed %u", &tm->seed))
-	;
-
-      else if (unformat (i, "nbuckets %d", &tm->nbuckets))
-	;
-      else if (unformat (i, "non-random-keys"))
-	tm->non_random_keys = 1;
-      else if (unformat (i, "nitems %d", &tm->nitems))
-	;
-      else if (unformat (i, "careful %d", &tm->careful_delete_tests))
-	;
-      else if (unformat (i, "verbose %d", &tm->verbose))
-	;
-      else if (unformat (i, "search %d", &tm->search_iter))
-	;
-      else if (unformat (i, "verbose"))
-	tm->verbose = 1;
-      else
-	return clib_error_return (0, "unknown input '%U'",
-				  format_unformat_error, i);
-    }
-
-  error = test_bihash (tm);
-
-  return error;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  clib_error_t *error;
-  test_main_t *tm = &test_main;
-
-  clib_mem_init (0, 3ULL << 30);
-
-  tm->input = &i;
-  tm->seed = 0xdeaddabe;
-
-  tm->nbuckets = 2;
-  tm->nitems = 5;
-  tm->verbose = 1;
-  tm->search_iter = 1;
-  tm->careful_delete_tests = 0;
-  tm->key_hash = hash_create (0, sizeof (uword));
-  clib_time_init (&tm->clib_time);
-
-  unformat_init_command_line (&i, argv);
-  error = test_bihash_main (tm);
-  unformat_free (&i);
-
-  if (error)
-    {
-      clib_error_report (error);
-      return 1;
-    }
-  return 0;
-}
-#endif /* CLIB_UNIX */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_dlist.c b/vppinfra/vppinfra/test_dlist.c
deleted file mode 100644
index c5535c85..00000000
--- a/vppinfra/vppinfra/test_dlist.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vppinfra/dlist.h>
-
-typedef struct
-{
-  dlist_elt_t *test_pool;
-  u32 head_index;
-} test_main_t;
-
-test_main_t test_main;
-
-int
-test_dlist_main (unformat_input_t * input)
-{
-  test_main_t *tm = &test_main;
-  dlist_elt_t *head, *elt;
-  u32 elt_index, head_index;
-  u32 value;
-  int i;
-
-  pool_get (tm->test_pool, head);
-  head_index = head - tm->test_pool;
-  clib_dlist_init (tm->test_pool, head - tm->test_pool);
-
-  for (i = 1; i <= 3; i++)
-    {
-      pool_get (tm->test_pool, elt);
-      elt_index = elt - tm->test_pool;
-
-      clib_dlist_init (tm->test_pool, elt_index);
-      elt->value = i;
-      clib_dlist_addtail (tm->test_pool, head_index, elt_index);
-    }
-
-  head = pool_elt_at_index (tm->test_pool, head_index);
-
-  fformat (stdout, "Dump forward links\n");
-  elt_index = head->next;
-  i = 1;
-  value = 0;
-  while (value != ~0)
-    {
-      elt = pool_elt_at_index (tm->test_pool, elt_index);
-      fformat (stdout, "elt %d value %d\n", i++, elt->value);
-      elt_index = elt->next;
-      value = elt->value;
-    }
-
-  fformat (stdout, "Dump reverse links\n");
-  elt_index = head->prev;
-  i = 1;
-  value = 0;
-  while (value != ~0)
-    {
-      elt = pool_elt_at_index (tm->test_pool, elt_index);
-      fformat (stdout, "elt %d value %d\n", i++, elt->value);
-      elt_index = elt->prev;
-      value = elt->value;
-    }
-
-  fformat (stdout, "remove first element\n");
-
-  elt_index = clib_dlist_remove_head (tm->test_pool, head_index);
-  elt = pool_elt_at_index (tm->test_pool, elt_index);
-
-  fformat (stdout, "removed index %d value %d\n", elt_index, elt->value);
-
-  head = pool_elt_at_index (tm->test_pool, head_index);
-
-  fformat (stdout, "Dump forward links\n");
-  elt_index = head->next;
-  i = 1;
-  value = 0;
-  while (value != ~0)
-    {
-      elt = pool_elt_at_index (tm->test_pool, elt_index);
-      fformat (stdout, "elt %d value %d\n", i++, elt->value);
-      elt_index = elt->next;
-      value = elt->value;
-    }
-
-  fformat (stdout, "Dump reverse links\n");
-  elt_index = head->prev;
-  i = 1;
-  value = 0;
-  while (value != ~0)
-    {
-      elt = pool_elt_at_index (tm->test_pool, elt_index);
-      fformat (stdout, "elt %d value %d\n", i++, elt->value);
-      elt_index = elt->prev;
-      value = elt->value;
-    }
-
-  fformat (stdout, "re-insert index %d value %d at head\n", 1, 1);
-
-  clib_dlist_addhead (tm->test_pool, head_index, 1);
-
-  fformat (stdout, "Dump forward links\n");
-  elt_index = head->next;
-  i = 1;
-  value = 0;
-  while (value != ~0)
-    {
-      elt = pool_elt_at_index (tm->test_pool, elt_index);
-      fformat (stdout, "elt %d value %d\n", i++, elt->value);
-      elt_index = elt->next;
-      value = elt->value;
-    }
-
-  fformat (stdout, "Dump reverse links\n");
-  elt_index = head->prev;
-  i = 1;
-  value = 0;
-  while (value != ~0)
-    {
-      elt = pool_elt_at_index (tm->test_pool, elt_index);
-      fformat (stdout, "elt %d value %d\n", i++, elt->value);
-      elt_index = elt->prev;
-      value = elt->value;
-    }
-
-  fformat (stdout, "Remove middle element\n");
-
-  clib_dlist_remove (tm->test_pool, 2);
-  elt = pool_elt_at_index (tm->test_pool, 2);
-
-  fformat (stdout, "removed index %d value %d\n", elt_index, elt->value);
-
-  fformat (stdout, "Dump forward links\n");
-  elt_index = head->next;
-  i = 1;
-  value = 0;
-  while (value != ~0)
-    {
-      elt = pool_elt_at_index (tm->test_pool, elt_index);
-      fformat (stdout, "elt %d value %d\n", i++, elt->value);
-      elt_index = elt->next;
-      value = elt->value;
-    }
-
-  fformat (stdout, "Dump reverse links\n");
-  elt_index = head->prev;
-  i = 1;
-  value = 0;
-  while (value != ~0)
-    {
-      elt = pool_elt_at_index (tm->test_pool, elt_index);
-      fformat (stdout, "elt %d value %d\n", i++, elt->value);
-      elt_index = elt->prev;
-      value = elt->value;
-    }
-
-  return 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int ret;
-
-  clib_mem_init (0, 3ULL << 30);
-
-  unformat_init_command_line (&i, argv);
-  ret = test_dlist_main (&i);
-  unformat_free (&i);
-
-  return ret;
-}
-#endif /* CLIB_UNIX */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_elf.c b/vppinfra/vppinfra/test_elf.c
deleted file mode 100644
index 84fe0776..00000000
--- a/vppinfra/vppinfra/test_elf.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2008 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/elf.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#ifndef CLIB_UNIX
-#error "unix only"
-#endif
-
-static clib_error_t *
-elf_set_interpreter (elf_main_t * em, char *interp)
-{
-  elf_segment_t *g;
-  elf_section_t *s;
-  clib_error_t *error;
-
-  vec_foreach (g, em->segments)
-  {
-    if (g->header.type == ELF_SEGMENT_INTERP)
-      break;
-  }
-
-  if (g >= vec_end (em->segments))
-    return clib_error_return (0, "interpreter not found");
-
-  if (g->header.memory_size < 1 + strlen (interp))
-    return clib_error_return (0,
-			      "given interpreter does not fit; must be less than %d bytes (`%s' given)",
-			      g->header.memory_size, interp);
-
-  error =
-    elf_get_section_by_start_address (em, g->header.virtual_address, &s);
-  if (error)
-    return error;
-
-  /* Put in new null terminated string. */
-  memset (s->contents, 0, vec_len (s->contents));
-  clib_memcpy (s->contents, interp, strlen (interp));
-
-  return 0;
-}
-
-static void
-delete_dynamic_rpath_entries_from_section (elf_main_t * em, elf_section_t * s)
-{
-  elf64_dynamic_entry_t *e;
-  elf64_dynamic_entry_t *new_es = 0;
-
-  vec_foreach (e, em->dynamic_entries)
-  {
-    switch (e->type)
-      {
-      case ELF_DYNAMIC_ENTRY_RPATH:
-      case ELF_DYNAMIC_ENTRY_RUN_PATH:
-	break;
-
-      default:
-	vec_add1 (new_es, e[0]);
-	break;
-      }
-  }
-
-  /* Pad so as to keep section size constant. */
-  {
-    elf64_dynamic_entry_t e_end;
-    e_end.type = ELF_DYNAMIC_ENTRY_END;
-    e_end.data = 0;
-    while (vec_len (new_es) < vec_len (em->dynamic_entries))
-      vec_add1 (new_es, e_end);
-  }
-
-  elf_set_dynamic_entries (em);
-}
-
-static void
-elf_delete_dynamic_rpath_entries (elf_main_t * em)
-{
-  elf_section_t *s;
-
-  vec_foreach (s, em->sections)
-  {
-    switch (s->header.type)
-      {
-      case ELF_SECTION_DYNAMIC:
-	delete_dynamic_rpath_entries_from_section (em, s);
-	break;
-
-      default:
-	break;
-      }
-  }
-}
-
-typedef struct
-{
-  elf_main_t elf_main;
-  char *input_file;
-  char *output_file;
-  char *set_interpreter;
-  int verbose;
-} elf_test_main_t;
-
-int
-main (int argc, char *argv[])
-{
-  elf_test_main_t _tm, *tm = &_tm;
-  elf_main_t *em = &tm->elf_main;
-  unformat_input_t i;
-  clib_error_t *error = 0;
-
-  memset (tm, 0, sizeof (tm[0]));
-
-  unformat_init_command_line (&i, argv);
-  while (unformat_check_input (&i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (&i, "in %s", &tm->input_file))
-	;
-      else if (unformat (&i, "out %s", &tm->output_file))
-	;
-      else if (unformat (&i, "set-interpreter %s", &tm->set_interpreter))
-	;
-      else if (unformat (&i, "verbose"))
-	tm->verbose = ~0;
-      else if (unformat (&i, "verbose-symbols"))
-	tm->verbose |= FORMAT_ELF_MAIN_SYMBOLS;
-      else if (unformat (&i, "verbose-relocations"))
-	tm->verbose |= FORMAT_ELF_MAIN_RELOCATIONS;
-      else if (unformat (&i, "verbose-dynamic"))
-	tm->verbose |= FORMAT_ELF_MAIN_DYNAMIC;
-      else
-	{
-	  error = unformat_parse_error (&i);
-	  goto done;
-	}
-    }
-
-  if (!tm->input_file)
-    {
-      clib_warning ("No input file! Using test_bihash_template");
-      tm->input_file = "test_bihash_template";
-    }
-
-  error = elf_read_file (em, tm->input_file);
-  if (error)
-    goto done;
-
-  if (tm->set_interpreter)
-    {
-      clib_error_t *error = elf_set_interpreter (em, tm->set_interpreter);
-      if (error)
-	goto done;
-      elf_delete_dynamic_rpath_entries (em);
-    }
-
-  if (tm->verbose)
-    fformat (stdout, "%U", format_elf_main, em, tm->verbose);
-
-  if (tm->output_file)
-    error = elf_write_file (em, tm->output_file);
-
-  elf_main_free (em);
-
-done:
-  if (error)
-    {
-      clib_error_report (error);
-      return 1;
-    }
-  else
-    return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_elog.c b/vppinfra/vppinfra/test_elog.c
deleted file mode 100644
index 89905adb..00000000
--- a/vppinfra/vppinfra/test_elog.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/elog.h>
-#include <vppinfra/error.h>
-#include <vppinfra/format.h>
-#include <vppinfra/random.h>
-#include <vppinfra/serialize.h>
-#include <vppinfra/unix.h>
-
-int
-test_elog_main (unformat_input_t * input)
-{
-  clib_error_t *error = 0;
-  u32 i, n_iter, seed, max_events;
-  elog_main_t _em, *em = &_em;
-  u32 verbose;
-  f64 min_sample_time;
-  char *dump_file, *load_file, *merge_file, **merge_files;
-  u8 *tag, **tags;
-
-  n_iter = 100;
-  max_events = 100000;
-  seed = 1;
-  verbose = 0;
-  dump_file = 0;
-  load_file = 0;
-  merge_files = 0;
-  tags = 0;
-  min_sample_time = 2;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "iter %d", &n_iter))
-	;
-      else if (unformat (input, "seed %d", &seed))
-	;
-      else if (unformat (input, "dump %s", &dump_file))
-	;
-      else if (unformat (input, "load %s", &load_file))
-	;
-      else if (unformat (input, "tag %s", &tag))
-	vec_add1 (tags, tag);
-      else if (unformat (input, "merge %s", &merge_file))
-	vec_add1 (merge_files, merge_file);
-
-      else if (unformat (input, "verbose %=", &verbose, 1))
-	;
-      else if (unformat (input, "max-events %d", &max_events))
-	;
-      else if (unformat (input, "sample-time %f", &min_sample_time))
-	;
-      else
-	{
-	  error = clib_error_create ("unknown input `%U'\n",
-				     format_unformat_error, input);
-	  goto done;
-	}
-    }
-
-#ifdef CLIB_UNIX
-  if (load_file)
-    {
-      if ((error = elog_read_file (em, load_file)))
-	goto done;
-    }
-
-  else if (merge_files)
-    {
-      uword i;
-      elog_main_t *ems;
-
-      vec_clone (ems, merge_files);
-
-      elog_init (em, max_events);
-      for (i = 0; i < vec_len (ems); i++)
-	{
-	  if ((error =
-	       elog_read_file (i == 0 ? em : &ems[i], merge_files[i])))
-	    goto done;
-	  if (i > 0)
-	    {
-	      elog_merge (em, tags[0], &ems[i], tags[i]);
-	      tags[0] = 0;
-	    }
-	}
-    }
-
-  else
-#endif /* CLIB_UNIX */
-    {
-      f64 t[2];
-
-      elog_init (em, max_events);
-      elog_enable_disable (em, 1);
-      t[0] = unix_time_now ();
-
-      for (i = 0; i < n_iter; i++)
-	{
-	  u32 j, n, sum;
-
-	  n = 1 + (random_u32 (&seed) % 128);
-	  sum = 0;
-	  for (j = 0; j < n; j++)
-	    sum += random_u32 (&seed);
-
-	  {
-	    ELOG_TYPE_XF (e);
-	    ELOG (em, e, sum);
-	  }
-
-	  {
-	    ELOG_TYPE_XF (e);
-	    ELOG (em, e, sum + 1);
-	  }
-
-	  {
-	    struct
-	    {
-	      u32 string_index;
-	      f32 f;
-	    } *d;
-	    ELOG_TYPE_DECLARE (e) =
-	    {
-	      .format = "fumble %s %.9f",.format_args =
-		"t4f4",.n_enum_strings = 4,.enum_strings =
-	      {
-	    "string0", "string1", "string2", "string3",},};
-
-	    d = ELOG_DATA (em, e);
-
-	    d->string_index = sum & 3;
-	    d->f = (sum & 0xff) / 128.;
-	  }
-
-	  {
-	    ELOG_TYPE_DECLARE (e) =
-	    {
-	    .format = "bar %d.%d.%d.%d",.format_args = "i1i1i1i1",};
-	    ELOG_TRACK (my_track);
-	    u8 *d = ELOG_TRACK_DATA (em, e, my_track);
-	    d[0] = i + 0;
-	    d[1] = i + 1;
-	    d[2] = i + 2;
-	    d[3] = i + 3;
-	  }
-
-	  {
-	    ELOG_TYPE_DECLARE (e) =
-	    {
-	    .format = "bar `%s'",.format_args = "s20",};
-	    struct
-	    {
-	      char s[20];
-	    } *d;
-	    u8 *v;
-
-	    d = ELOG_DATA (em, e);
-	    v = format (0, "foo %d%c", i, 0);
-	    clib_memcpy (d->s, v, clib_min (vec_len (v), sizeof (d->s)));
-	  }
-
-	  {
-	    ELOG_TYPE_DECLARE (e) =
-	    {
-	    .format = "bar `%s'",.format_args = "T4",};
-	    struct
-	    {
-	      u32 offset;
-	    } *d;
-
-	    d = ELOG_DATA (em, e);
-	    d->offset = elog_string (em, "string table %d", i);
-	  }
-	}
-
-      do
-	{
-	  t[1] = unix_time_now ();
-	}
-      while (t[1] - t[0] < min_sample_time);
-    }
-
-#ifdef CLIB_UNIX
-  if (dump_file)
-    {
-      if ((error = elog_write_file (em, dump_file)))
-	goto done;
-    }
-#endif
-
-  if (verbose)
-    {
-      elog_event_t *e, *es;
-      es = elog_get_events (em);
-      vec_foreach (e, es)
-      {
-	clib_warning ("%18.9f: %12U %U\n", e->time,
-		      format_elog_track, em, e, format_elog_event, em, e);
-      }
-    }
-
-done:
-  if (error)
-    clib_error_report (error);
-  return 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int r;
-
-  unformat_init_command_line (&i, argv);
-  r = test_elog_main (&i);
-  unformat_free (&i);
-  return r;
-}
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_fifo.c b/vppinfra/vppinfra/test_fifo.c
deleted file mode 100644
index 45392bc3..00000000
--- a/vppinfra/vppinfra/test_fifo.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/fifo.h>
-#include <vppinfra/random.h>
-
-typedef struct
-{
-  int a, b, c;
-} A;
-
-always_inline void
-A_set (A * a, int k)
-{
-  a->a = 1 * k;
-  a->b = 2 * k;
-  a->c = 3 * k;
-}
-
-always_inline int
-A_is_valid (A * a, int k)
-{
-  return a->a == 1 * k && a->b == 2 * k && a->c == 3 * k;
-}
-
-int
-test_fifo_main (unformat_input_t * input)
-{
-  u32 n_added, n_removed, i, j, n_iter, seed, verbose;
-  A *as = 0, *a;
-
-  n_iter = 1000;
-  seed = random_default_seed ();
-  verbose = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "iter %d", &n_iter))
-	;
-      else if (unformat (input, "seed %d", &seed))
-	;
-      else if (unformat (input, "verbose %=", &verbose, 1))
-	;
-      else
-	{
-	  clib_warning ("unknown input `%U'\n", format_unformat_error, input);
-	  return 1;
-	}
-    }
-
-  if (verbose)
-    clib_warning ("iter %d seed %d\n", n_iter, seed);
-
-  n_added = n_removed = 0;
-  for (i = 0; i < n_iter; i++)
-    {
-      if (clib_fifo_elts (as) > 0 && (random_u32 (&seed) & 1))
-	{
-	  A tmp;
-	  clib_fifo_sub1 (as, tmp);
-	  ASSERT (A_is_valid (&tmp, n_removed));
-	  n_removed++;
-	}
-      else
-	{
-	  clib_fifo_add2 (as, a);
-	  A_set (a, n_added);
-	  n_added++;
-	}
-
-      ASSERT (clib_fifo_elts (as) == n_added - n_removed);
-
-      j = 0;
-      /* *INDENT-OFF* */
-      clib_fifo_foreach (a, as, {
-	ASSERT (A_is_valid (a, n_removed + j));
-	j++;
-      });
-      /* *INDENT-ON* */
-
-      ASSERT (j == clib_fifo_elts (as));
-    }
-
-  clib_fifo_free (as);
-
-  return 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int r;
-
-  unformat_init_command_line (&i, argv);
-  r = test_fifo_main (&i);
-  unformat_free (&i);
-
-  return r;
-}
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_format.c b/vppinfra/vppinfra/test_format.c
deleted file mode 100644
index cc95a00e..00000000
--- a/vppinfra/vppinfra/test_format.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/format.h>
-
-static int verbose;
-static u8 *test_vec;
-
-static u8 *
-format_test1 (u8 * s, va_list * va)
-{
-  uword x = va_arg (*va, uword);
-  f64 y = va_arg (*va, f64);
-  return format (s, "%12d %12f%12.4e", x, y, y);
-}
-
-static int
-expectation (const char *exp, char *fmt, ...)
-{
-  int ret = 0;
-
-  va_list va;
-  va_start (va, fmt);
-  test_vec = va_format (test_vec, fmt, &va);
-  va_end (va);
-
-  vec_add1 (test_vec, 0);
-  if (strcmp (exp, (char *) test_vec))
-    {
-      fformat (stdout, "FAIL: %s (expected vs. result)\n\"%s\"\n\"%v\"\n",
-	       fmt, exp, test_vec);
-      ret = 1;
-    }
-  else if (verbose)
-    fformat (stdout, "PASS: %s\n", fmt);
-  vec_delete (test_vec, vec_len (test_vec), 0);
-  return ret;
-}
-
-int
-test_format_main (unformat_input_t * input)
-{
-  int ret = 0;
-  u8 *food = format (0, "food");
-
-  ret |= expectation ("foo", "foo");
-  ret |= expectation ("foo", "%s", "foo");
-  ret |= expectation ("9876", "%d", 9876);
-  ret |= expectation ("-9876", "%wd", (word) - 9876);
-  ret |= expectation ("98765432", "%u", 98765432);
-  ret |= expectation ("1200ffee", "%x", 0x1200ffee);
-  ret |= expectation ("BABEBABE", "%X", 0xbabebabe);
-  ret |= expectation ("10%a", "%d%%%c", 10, 'a');
-  ret |= expectation ("123456789abcdef0", "%016Lx", 0x123456789abcdef0LL);
-  ret |= expectation ("00000123", "%08x", 0x123);
-  ret |= expectation ("             23           23    2.3037e1",
-		      "%40U", format_test1, 23, 23.0367);
-  ret |= expectation ("left      ", "%-10s", "left");
-  ret |= expectation ("  center  ", "%=10s", "center");
-  ret |= expectation ("     right", "%+10s", "right");
-  ret |= expectation ("123456", "%.0f", 123456.);
-  ret |= expectation ("1234567.0", "%.1f", 1234567.);
-  ret |= expectation ("foo", "%.*s", 3, "food");
-  ret |= expectation ("food      ", "%.*s", 10, "food          ");
-  ret |= expectation ("(nil)", "%.*s", 3, (void *) 0);
-  ret |= expectation ("foo", "%.*v", 3, food);
-  ret |= expectation ("foobar", "%.*v%s", 3, food, "bar");
-  ret |= expectation ("foo bar", "%S", "foo_bar");
-  vec_free (food);
-  vec_free (test_vec);
-  return ret;
-}
-
-typedef struct
-{
-  int a, b;
-} foo_t;
-
-static u8 *
-format_foo (u8 * s, va_list * va)
-{
-  foo_t *foo = va_arg (*va, foo_t *);
-  return format (s, "{a %d, b %d}", foo->a, foo->b);
-}
-
-static uword
-unformat_foo (unformat_input_t * i, va_list * va)
-{
-  foo_t *foo = va_arg (*va, foo_t *);
-  return unformat (i, "{%D,%D}",
-		   sizeof (foo->a), &foo->a, sizeof (foo->b), &foo->b);
-}
-
-int
-test_unformat_main (unformat_input_t * input)
-{
-  u32 v[8];
-  long l;
-  long long ll;
-  f64 f;
-  u8 *s;
-  foo_t foo = {.a = ~0,.b = ~0 };
-
-  v[0] = v[1] = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "01 %d %d", &v[0], &v[1]))
-	fformat (stdout, "got 01 %d %d\n", v[0], v[1]);
-      else if (unformat (input, "d %d", &v[0]))
-	fformat (stdout, "got it d %d\n", v[0]);
-      else if (unformat (input, "ld %ld", &l))
-	fformat (stdout, "got it ld %ld\n", l);
-      else if (unformat (input, "lld %lld", &ll))
-	fformat (stdout, "got it lld %lld\n", ll);
-      else if (unformat (input, "string %s", &s))
-	fformat (stdout, "got string `%s'\n", s);
-      else if (unformat (input, "float %f", &f))
-	fformat (stdout, "got float `%.4f'\n", f);
-      else if (unformat (input, "foo %U", unformat_foo, &foo))
-	fformat (stdout, "got a foo `%U'\n", format_foo, &foo);
-      else if (unformat (input, "ignore-me1"))
-	fformat (stdout, "got an `ignore-me1'\n");
-      else if (unformat (input, "ignore-me2"))
-	fformat (stdout, "got an `ignore-me2'\n");
-      else if (unformat (input, "gi%d_%d@-", &v[0], &v[1]))
-	fformat (stdout, "got `gi%d_%d@-'\n", v[0], v[1]);
-      else if (unformat (input, "%_%d.%d.%d.%d%_->%_%d.%d.%d.%d%_",
-			 &v[0], &v[1], &v[2], &v[3],
-			 &v[4], &v[5], &v[6], &v[7]))
-	fformat (stdout, "got %d.%d.%d.%d -> %d.%d.%d.%d",
-		 v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7]);
-      else
-	{
-	  clib_warning ("unknown input `%U'\n", format_unformat_error, input);
-	  return 1;
-	}
-    }
-
-  return 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-
-  verbose = (argc > 1);
-  unformat_init_command_line (&i, argv);
-
-  if (unformat (&i, "unformat"))
-    return test_unformat_main (&i);
-  else
-    return test_format_main (&i);
-}
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_hash.c b/vppinfra/vppinfra/test_hash.c
deleted file mode 100644
index 94110ab6..00000000
--- a/vppinfra/vppinfra/test_hash.c
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifdef CLIB_LINUX_KERNEL
-#include <linux/unistd.h>
-#endif
-
-#ifdef CLIB_UNIX
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <vppinfra/time.h>
-#endif
-
-#include <vppinfra/random.h>
-#include <vppinfra/mem.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/format.h>
-#include <vppinfra/bitmap.h>
-
-static int verbose;
-#define if_verbose(format,args...) \
-  if (verbose) { clib_warning(format, ## args); }
-
-typedef struct
-{
-  int n_iterations;
-
-  int n_iterations_per_print;
-
-  /* Number of pairs to insert into hash. */
-  int n_pairs;
-
-  /* True to validate correctness of hash functions. */
-  int n_iterations_per_validate;
-
-  /* Non-zero if hash table size is to be fixed. */
-  int fixed_hash_size;
-
-  /* Verbosity level for hash formats. */
-  int verbose;
-
-  /* Random number seed. */
-  u32 seed;
-} hash_test_t;
-
-static clib_error_t *
-hash_next_test (word * h)
-{
-  hash_next_t hn = { 0 };
-  hash_pair_t *p0, *p1;
-  clib_error_t *error = 0;
-
-  /* *INDENT-OFF* */
-  hash_foreach_pair (p0, h, {
-    p1 = hash_next (h, &hn);
-    error = CLIB_ERROR_ASSERT (p0 == p1);
-    if (error)
-      break;
-  });
-  /* *INDENT-ON* */
-
-  if (!error)
-    error = CLIB_ERROR_ASSERT (!hash_next (h, &hn));
-
-  return error;
-}
-
-static u8 *
-test1_format (u8 * s, va_list * args)
-{
-  void *CLIB_UNUSED (user_arg) = va_arg (*args, void *);
-  void *v = va_arg (*args, void *);
-  hash_pair_t *p = va_arg (*args, hash_pair_t *);
-  hash_t *h = hash_header (v);
-
-  return format (s, "0x%8U -> 0x%8U",
-		 format_hex_bytes, &p->key, sizeof (p->key),
-		 format_hex_bytes, &p->value[0], hash_value_bytes (h));
-}
-
-static clib_error_t *
-test_word_key (hash_test_t * ht)
-{
-  word *h = 0;
-  word i, j;
-
-  word *keys = 0, *vals = 0;
-  uword *is_inserted = 0;
-
-  clib_error_t *error = 0;
-
-  vec_resize (keys, ht->n_pairs);
-  vec_resize (vals, vec_len (keys));
-
-  h = hash_create (ht->fixed_hash_size, sizeof (vals[0]));
-
-  hash_set_pair_format (h, test1_format, 0);
-  if (ht->fixed_hash_size)
-    hash_set_flags (h, HASH_FLAG_NO_AUTO_GROW | HASH_FLAG_NO_AUTO_SHRINK);
-
-  {
-    uword *unique = 0;
-    u32 k;
-
-    for (i = 0; i < vec_len (keys); i++)
-      {
-	do
-	  {
-	    k = random_u32 (&ht->seed) & 0xfffff;
-	  }
-	while (clib_bitmap_get (unique, k));
-	unique = clib_bitmap_ori (unique, k);
-	keys[i] = k;
-	vals[i] = i;
-      }
-
-    clib_bitmap_free (unique);
-  }
-
-  for (i = 0; i < ht->n_iterations; i++)
-    {
-      u32 vi = random_u32 (&ht->seed) % vec_len (keys);
-
-      if (clib_bitmap_get (is_inserted, vi))
-	hash_unset (h, keys[vi]);
-      else
-	hash_set (h, keys[vi], vals[vi]);
-
-      is_inserted = clib_bitmap_xori (is_inserted, vi);
-
-      if (ht->n_iterations_per_print > 0
-	  && ((i + 1) % ht->n_iterations_per_print) == 0)
-	if_verbose ("iteration %d\n  %U", i + 1, format_hash, h, ht->verbose);
-
-      if (ht->n_iterations_per_validate == 0
-	  || (i + 1) % ht->n_iterations_per_validate)
-	continue;
-
-      {
-	hash_pair_t *p;
-	uword ki;
-
-	  /* *INDENT-OFF* */
-	  hash_foreach_pair (p, h, {
-	      ki = p->value[0];
-	      ASSERT (keys[ki] == p->key);
-	  });
-	  /* *INDENT-ON* */
-      }
-
-      clib_mem_validate ();
-
-      if ((error = hash_validate (h)))
-	goto done;
-
-      for (j = 0; j < vec_len (keys); j++)
-	{
-	  uword *v;
-	  v = hash_get (h, keys[j]);
-	  if ((error =
-	       CLIB_ERROR_ASSERT (clib_bitmap_get (is_inserted, j) ==
-				  (v != 0))))
-	    goto done;
-	  if (v)
-	    {
-	      if ((error = CLIB_ERROR_ASSERT (v[0] == vals[j])))
-		goto done;
-	    }
-	}
-    }
-
-  if ((error = hash_next_test (h)))
-    goto done;
-
-  if_verbose ("%U", format_hash, h, ht->verbose);
-
-  for (i = 0; i < vec_len (keys); i++)
-    {
-      if (!clib_bitmap_get (is_inserted, i))
-	continue;
-
-      hash_unset (h, keys[i]);
-      is_inserted = clib_bitmap_xori (is_inserted, i);
-
-      if (ht->n_iterations_per_validate == 0
-	  || (i + 1) % ht->n_iterations_per_validate)
-	continue;
-
-      clib_mem_validate ();
-
-      if ((error = hash_validate (h)))
-	goto done;
-
-      for (j = 0; j < vec_len (keys); j++)
-	{
-	  uword *v;
-	  v = hash_get (h, keys[j]);
-	  if ((error =
-	       CLIB_ERROR_ASSERT (clib_bitmap_get (is_inserted, j) ==
-				  (v != 0))))
-	    goto done;
-	  if (v)
-	    {
-	      if ((error = CLIB_ERROR_ASSERT (v[0] == vals[j])))
-		goto done;
-	    }
-	}
-    }
-
-done:
-  hash_free (h);
-  vec_free (keys);
-  vec_free (vals);
-  clib_bitmap_free (is_inserted);
-
-  if (verbose)
-    fformat (stderr, "%U\n", format_clib_mem_usage, /* verbose */ 0);
-
-  return error;
-}
-
-static u8 *
-test2_format (u8 * s, va_list * args)
-{
-  void *CLIB_UNUSED (user_arg) = va_arg (*args, void *);
-  void *v = va_arg (*args, void *);
-  hash_pair_t *p = va_arg (*args, hash_pair_t *);
-  hash_t *h = hash_header (v);
-
-  return format (s, "0x%8U <- %v",
-		 format_hex_bytes, &p->value[0], hash_value_bytes (h),
-		 p->key);
-}
-
-static clib_error_t *
-test_string_key (hash_test_t * ht)
-{
-  word i, j;
-
-  u8 **keys = 0;
-  word *vals = 0;
-  uword *is_inserted = 0;
-
-  word *h = 0;
-
-  clib_error_t *error = 0;
-
-  vec_resize (keys, ht->n_pairs);
-  vec_resize (vals, vec_len (keys));
-
-  h =
-    hash_create_vec (ht->fixed_hash_size, sizeof (keys[0][0]),
-		     sizeof (uword));
-  hash_set_pair_format (h, test2_format, 0);
-  if (ht->fixed_hash_size)
-    hash_set_flags (h, HASH_FLAG_NO_AUTO_SHRINK | HASH_FLAG_NO_AUTO_GROW);
-
-  for (i = 0; i < vec_len (keys); i++)
-    {
-      keys[i] = random_string (&ht->seed, 5 + (random_u32 (&ht->seed) & 0xf));
-      keys[i] = format (keys[i], "%x", i);
-      vals[i] = random_u32 (&ht->seed);
-    }
-
-  for (i = 0; i < ht->n_iterations; i++)
-    {
-      u32 vi = random_u32 (&ht->seed) % vec_len (keys);
-
-      if (clib_bitmap_get (is_inserted, vi))
-	hash_unset_mem (h, keys[vi]);
-      else
-	hash_set_mem (h, keys[vi], vals[vi]);
-
-      is_inserted = clib_bitmap_xori (is_inserted, vi);
-
-      if (ht->n_iterations_per_print > 0
-	  && ((i + 1) % ht->n_iterations_per_print) == 0)
-	if_verbose ("iteration %d\n  %U", i + 1, format_hash, h, ht->verbose);
-
-      if (ht->n_iterations_per_validate == 0
-	  || (i + 1) % ht->n_iterations_per_validate)
-	continue;
-
-      clib_mem_validate ();
-
-      if ((error = hash_validate (h)))
-	goto done;
-
-      for (j = 0; j < vec_len (keys); j++)
-	{
-	  uword *v;
-	  v = hash_get_mem (h, keys[j]);
-	  if ((error =
-	       CLIB_ERROR_ASSERT (clib_bitmap_get (is_inserted, j) ==
-				  (v != 0))))
-	    goto done;
-	  if (v)
-	    {
-	      if ((error = CLIB_ERROR_ASSERT (v[0] == vals[j])))
-		goto done;
-	    }
-	}
-    }
-
-  if ((error = hash_next_test (h)))
-    goto done;
-
-  if_verbose ("%U", format_hash, h, ht->verbose);
-
-  for (i = 0; i < vec_len (keys); i++)
-    {
-      if (!clib_bitmap_get (is_inserted, i))
-	continue;
-
-      hash_unset_mem (h, keys[i]);
-      is_inserted = clib_bitmap_xori (is_inserted, i);
-
-      if (ht->n_iterations_per_validate == 0
-	  || (i + 1) % ht->n_iterations_per_validate)
-	continue;
-
-      clib_mem_validate ();
-
-      if ((error = hash_validate (h)))
-	goto done;
-
-      for (j = 0; j < vec_len (keys); j++)
-	{
-	  uword *v;
-	  v = hash_get_mem (h, keys[j]);
-	  if ((error =
-	       CLIB_ERROR_ASSERT (clib_bitmap_get (is_inserted, j) ==
-				  (v != 0))))
-	    goto done;
-	  if (v)
-	    {
-	      if ((error = CLIB_ERROR_ASSERT (v[0] == vals[j])))
-		goto done;
-	    }
-	}
-    }
-
-done:
-  hash_free (h);
-  vec_free (vals);
-  clib_bitmap_free (is_inserted);
-
-  for (i = 0; i < vec_len (keys); i++)
-    vec_free (keys[i]);
-  vec_free (keys);
-
-  if (verbose)
-    fformat (stderr, "%U\n", format_clib_mem_usage, /* verbose */ 0);
-
-  return error;
-}
-
-int
-test_hash_main (unformat_input_t * input)
-{
-  hash_test_t _ht = { 0 }, *ht = &_ht;
-  clib_error_t *error;
-
-  ht->n_iterations = 100;
-  ht->n_pairs = 10;
-  ht->fixed_hash_size = 0;	/* zero means non-fixed size */
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (0 == unformat (input, "iter %d", &ht->n_iterations)
-	  && 0 == unformat (input, "print %d", &ht->n_iterations_per_print)
-	  && 0 == unformat (input, "elts %d", &ht->n_pairs)
-	  && 0 == unformat (input, "size %d", &ht->fixed_hash_size)
-	  && 0 == unformat (input, "seed %d", &ht->seed)
-	  && 0 == unformat (input, "verbose %=", &ht->verbose, 1)
-	  && 0 == unformat (input, "valid %d",
-			    &ht->n_iterations_per_validate))
-	{
-	  clib_warning ("unknown input `%U'", format_unformat_error, input);
-	  return 1;
-	}
-    }
-
-  if (!ht->seed)
-    ht->seed = random_default_seed ();
-
-  if_verbose ("testing %d iterations, seed %d", ht->n_iterations, ht->seed);
-
-  error = test_word_key (ht);
-  if (error)
-    clib_error_report (error);
-
-  error = test_string_key (ht);
-  if (error)
-    clib_error_report (error);
-
-  return 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int ret;
-
-  verbose = (argc > 1);
-  unformat_init_command_line (&i, argv);
-  ret = test_hash_main (&i);
-  unformat_free (&i);
-
-  return ret;
-}
-#endif /* CLIB_UNIX */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_heap.c b/vppinfra/vppinfra/test_heap.c
deleted file mode 100644
index 3d5171bf..00000000
--- a/vppinfra/vppinfra/test_heap.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <vppinfra/mem.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/format.h>
-
-static int verbose;
-#define if_verbose(format,args...) \
-  if (verbose) { clib_warning(format, ## args); }
-
-int
-main (int argc, char *argv[])
-{
-  word i, j, k, n, check_mask;
-  u32 seed;
-  u32 *h = 0;
-  uword *objects = 0;
-  uword *handles = 0;
-  uword objects_used;
-  uword align, fixed_size;
-
-  n = 10;
-  seed = (u32) getpid ();
-  check_mask = 0;
-  fixed_size = 0;
-
-  if (argc > 1)
-    {
-      n = atoi (argv[1]);
-      verbose = 1;
-    }
-  if (argc > 2)
-    {
-      word i = atoi (argv[2]);
-      if (i)
-	seed = i;
-    }
-  if (argc > 3)
-    check_mask = atoi (argv[3]);
-
-  align = 0;
-  if (argc > 4)
-    align = 1 << atoi (argv[4]);
-
-  if_verbose ("testing %wd iterations seed %wd\n", n, seed);
-
-  if (verbose)
-    fformat (stderr, "%U\n", format_clib_mem_usage, /* verbose */ 0);
-
-  vec_resize (objects, 1000);
-  if (vec_bytes (objects))	/* stupid warning be gone */
-    memset (objects, ~0, vec_bytes (objects));
-  vec_resize (handles, vec_len (objects));
-
-  objects_used = 0;
-
-  if (fixed_size)
-    {
-      uword max_len = 1024 * 1024;
-      void *memory = clib_mem_alloc (max_len * sizeof (h[0]));
-      h = heap_create_from_memory (memory, max_len, sizeof (h[0]));
-    }
-
-  for (i = 0; i < n; i++)
-    {
-      while (1)
-	{
-	  j = random_u32 (&seed) % vec_len (objects);
-	  if (objects[j] != ~0 || i + objects_used < n)
-	    break;
-	}
-
-      if (objects[j] != ~0)
-	{
-	  heap_dealloc (h, handles[j]);
-	  objects_used--;
-	  objects[j] = ~0;
-	}
-      else
-	{
-	  u32 *data;
-	  uword size;
-
-	  size = 1 + (random_u32 (&seed) % 100);
-	  objects[j] = heap_alloc_aligned (h, size, align, handles[j]);
-	  objects_used++;
-
-	  if (align)
-	    ASSERT (0 == (objects[j] & (align - 1)));
-	  ASSERT (objects[j] < vec_len (h));
-	  ASSERT (size <= heap_len (h, handles[j]));
-
-	  /* Set newly allocated object with test data. */
-	  if (check_mask & 2)
-	    {
-	      data = h + objects[j];
-
-	      for (k = 0; k < size; k++)
-		data[k] = objects[j] + k;
-	    }
-	}
-
-      if (check_mask & 1)
-	heap_validate (h);
-
-      if (check_mask & 4)
-	{
-	  /* Duplicate heap at each iteration. */
-	  u32 *h1 = heap_dup (h);
-	  heap_free (h);
-	  h = h1;
-	}
-
-      /* Verify that all used objects have correct test data. */
-      if (check_mask & 2)
-	{
-	  for (j = 0; j < vec_len (objects); j++)
-	    if (objects[j] != ~0)
-	      {
-		u32 *data = h + objects[j];
-		for (k = 0; k < heap_len (h, handles[j]); k++)
-		  ASSERT (data[k] == objects[j] + k);
-	      }
-	}
-    }
-
-  if (verbose)
-    fformat (stderr, "%U\n", format_heap, h, 1);
-
-  {
-    u32 *h1 = heap_dup (h);
-    if (verbose)
-      fformat (stderr, "%U\n", format_heap, h1, 1);
-    heap_free (h1);
-  }
-
-  heap_free (h);
-  if (verbose)
-    fformat (stderr, "%U\n", format_heap, h, 1);
-  ASSERT (objects_used == 0);
-
-  vec_free (objects);
-  vec_free (handles);
-
-  if (fixed_size)
-    vec_free_h (h, sizeof (heap_header_t));
-
-  if (verbose)
-    fformat (stderr, "%U\n", format_clib_mem_usage, /* verbose */ 0);
-
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_longjmp.c b/vppinfra/vppinfra/test_longjmp.c
deleted file mode 100644
index 2415c4f0..00000000
--- a/vppinfra/vppinfra/test_longjmp.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/clib.h>
-#include <vppinfra/longjmp.h>
-#include <vppinfra/format.h>
-
-static void test_calljmp (unformat_input_t * input);
-
-static int i;
-
-static int verbose;
-#define if_verbose(format,args...) \
-  if (verbose) { clib_warning(format, ## args); }
-
-static never_inline void
-f2 (clib_longjmp_t * env)
-{
-  i++;
-  clib_longjmp (env, 1);
-}
-
-static never_inline void
-f1 (clib_longjmp_t * env)
-{
-  i++;
-  f2 (env);
-}
-
-int
-test_longjmp_main (unformat_input_t * input)
-{
-  clib_longjmp_t env;
-
-  i = 0;
-  if (clib_setjmp (&env, 0) == 0)
-    {
-      if_verbose ("calling long jumper %d", i);
-      f1 (&env);
-    }
-  if_verbose ("back from long jump %d", i);
-
-  test_calljmp (input);
-
-  return 0;
-}
-
-static uword
-f3 (uword arg)
-{
-  uword i, j, array[10];
-
-  for (i = 0; i < ARRAY_LEN (array); i++)
-    array[i] = arg + i;
-
-  j = 0;
-  for (i = 0; i < ARRAY_LEN (array); i++)
-    j ^= array[i];
-
-  return j;
-}
-
-static void
-test_calljmp (unformat_input_t * input)
-{
-  static u8 stack[32 * 1024] __attribute__ ((aligned (16)));
-  uword v;
-
-  v = clib_calljmp (f3, 0, stack + sizeof (stack));
-  ASSERT (v == f3 (0));
-  if_verbose ("calljump ok");
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int res;
-
-  verbose = (argc > 1);
-  unformat_init_command_line (&i, argv);
-  res = test_longjmp_main (&i);
-  unformat_free (&i);
-  return res;
-}
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_macros.c b/vppinfra/vppinfra/test_macros.c
deleted file mode 100644
index de8f2c49..00000000
--- a/vppinfra/vppinfra/test_macros.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-  Copyright (c) 2014 Cisco and/or its affiliates.
-
-  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#include <vppinfra/macros.h>
-
-macro_main_t macro_main;
-
-int
-test_macros_main (unformat_input_t * input)
-{
-  macro_main_t *mm = &macro_main;
-
-  clib_macro_init (mm);
-
-  fformat (stdout, "hostname: %s\n",
-	   clib_macro_eval_dollar (mm, "hostname", 1 /* complain */ ));
-
-  clib_macro_set_value (mm, "foo", "this is foo which contains $(bar)");
-  clib_macro_set_value (mm, "bar", "bar");
-
-  fformat (stdout, "evaluate: %s\n",
-	   clib_macro_eval (mm, "returns '$(foo)'", 1 /* complain */ ));
-
-  clib_macro_free (mm);
-
-  return 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int ret;
-
-  unformat_init_command_line (&i, argv);
-  ret = test_macros_main (&i);
-  unformat_free (&i);
-
-  return ret;
-}
-#endif /* CLIB_UNIX */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_md5.c b/vppinfra/vppinfra/test_md5.c
deleted file mode 100644
index 4be6f964..00000000
--- a/vppinfra/vppinfra/test_md5.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2004 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/vec.h>
-#include <vppinfra/format.h>
-#include <vppinfra/error.h>
-#include <vppinfra/md5.h>
-
-#include <fcntl.h>
-#include <unistd.h>
-
-static clib_error_t *md5_test_suite (void);
-
-int
-main (int argc, char *argv[])
-{
-  int i;
-
-  if (argc == 1)
-    {
-      clib_error_t *e;
-      e = md5_test_suite ();
-      if (e)
-	{
-	  clib_error_report (e);
-	  exit (1);
-	}
-    }
-
-  for (i = 1; i < argc; i++)
-    {
-      md5_context_t m;
-      u8 digest[16];
-      u8 buffer[64 * 1024];
-      int fd, n;
-
-      fd = open (argv[i], 0);
-      if (fd < 0)
-	clib_unix_error ("can't open %s", argv[i]);
-
-      md5_init (&m);
-      while ((n = read (fd, buffer, sizeof (buffer))) > 0)
-	md5_add (&m, buffer, n);
-      close (fd);
-      md5_finish (&m, digest);
-      fformat (stdout, "%U  %s\n",
-	       format_hex_bytes, digest, sizeof (digest), argv[i]);
-    }
-
-  return 0;
-}
-
-static clib_error_t *
-md5_test_suite (void)
-{
-  typedef struct
-  {
-    char *input;
-    char *output;
-  } md5_test_t;
-
-  static md5_test_t tests[] = {
-    {.input = "",
-     .output = "d41d8cd98f00b204e9800998ecf8427e",},
-    {.input = "a",
-     .output = "0cc175b9c0f1b6a831c399e269772661",},
-    {.input = "abc",
-     .output = "900150983cd24fb0d6963f7d28e17f72",},
-    {.input = "message digest",
-     .output = "f96b697d7cb7938d525a2f31aaf161d0",},
-    {.input = "abcdefghijklmnopqrstuvwxyz",
-     .output = "c3fcd3d76192e4007dfb496cca67e13b",},
-    {.input =
-     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-     .output = "d174ab98d277d9f5a5611c2c9f419d9f",},
-    {.input =
-     "12345678901234567890123456789012345678901234567890123456789012345678901234567890",
-     .output = "57edf4a22be3c955ac49da2e2107b67a",},
-  };
-
-  int i;
-  u8 *s;
-  md5_context_t m;
-  u8 digest[16];
-
-  for (i = 0; i < ARRAY_LEN (tests); i++)
-    {
-      md5_init (&m);
-      md5_add (&m, tests[i].input, strlen (tests[i].input));
-      md5_finish (&m, digest);
-      s = format (0, "%U", format_hex_bytes, digest, sizeof (digest));
-      if (memcmp (s, tests[i].output, 2 * sizeof (digest)))
-	return clib_error_return
-	  (0, "%s -> %v expected %s", tests[i].input, s, tests[i].output);
-      vec_free (s);
-    }
-
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_mheap.c b/vppinfra/vppinfra/test_mheap.c
deleted file mode 100644
index 6bc36b89..00000000
--- a/vppinfra/vppinfra/test_mheap.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifdef CLIB_LINUX_KERNEL
-#include <linux/unistd.h>
-#endif
-
-#ifdef CLIB_UNIX
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>		/* scanf */
-#endif
-
-#include <vppinfra/mheap.h>
-#include <vppinfra/format.h>
-#include <vppinfra/random.h>
-
-static int verbose = 0;
-#define if_verbose(format,args...) \
-  if (verbose) { clib_warning(format, ## args); }
-
-int
-test_mheap_main (unformat_input_t * input)
-{
-  int i, j, k, n_iterations;
-  void *h, *h_mem;
-  uword *objects = 0;
-  u32 objects_used, really_verbose, n_objects, max_object_size;
-  u32 check_mask, seed, trace, use_vm;
-  u32 print_every = 0;
-  u32 *data;
-  mheap_t *mh;
-
-  /* Validation flags. */
-  check_mask = 0;
-#define CHECK_VALIDITY 1
-#define CHECK_DATA     2
-#define CHECK_ALIGN    4
-
-  n_iterations = 10;
-  seed = 0;
-  max_object_size = 100;
-  n_objects = 1000;
-  trace = 0;
-  really_verbose = 0;
-  use_vm = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (0 == unformat (input, "iter %d", &n_iterations)
-	  && 0 == unformat (input, "count %d", &n_objects)
-	  && 0 == unformat (input, "size %d", &max_object_size)
-	  && 0 == unformat (input, "seed %d", &seed)
-	  && 0 == unformat (input, "print %d", &print_every)
-	  && 0 == unformat (input, "validdata %|",
-			    &check_mask, CHECK_DATA | CHECK_VALIDITY)
-	  && 0 == unformat (input, "valid %|",
-			    &check_mask, CHECK_VALIDITY)
-	  && 0 == unformat (input, "verbose %=", &really_verbose, 1)
-	  && 0 == unformat (input, "trace %=", &trace, 1)
-	  && 0 == unformat (input, "vm %=", &use_vm, 1)
-	  && 0 == unformat (input, "align %|", &check_mask, CHECK_ALIGN))
-	{
-	  clib_warning ("unknown input `%U'", format_unformat_error, input);
-	  return 1;
-	}
-    }
-
-  /* Zero seed means use default. */
-  if (!seed)
-    seed = random_default_seed ();
-
-  if_verbose
-    ("testing %d iterations, %d %saligned objects, max. size %d, seed %d",
-     n_iterations, n_objects, (check_mask & CHECK_ALIGN) ? "randomly " : "un",
-     max_object_size, seed);
-
-  vec_resize (objects, n_objects);
-  if (vec_bytes (objects))	/* stupid warning be gone */
-    memset (objects, ~0, vec_bytes (objects));
-  objects_used = 0;
-
-  /* Allocate initial heap. */
-  {
-    uword size =
-      max_pow2 (2 * n_objects * max_object_size * sizeof (data[0]));
-
-    h_mem = clib_mem_alloc (size);
-    if (!h_mem)
-      return 0;
-
-    h = mheap_alloc (h_mem, size);
-  }
-
-  if (trace)
-    mheap_trace (h, trace);
-
-  mh = mheap_header (h);
-
-  if (use_vm)
-    mh->flags &= ~MHEAP_FLAG_DISABLE_VM;
-  else
-    mh->flags |= MHEAP_FLAG_DISABLE_VM;
-
-  if (check_mask & CHECK_VALIDITY)
-    mh->flags |= MHEAP_FLAG_VALIDATE;
-
-  for (i = 0; i < n_iterations; i++)
-    {
-      while (1)
-	{
-	  j = random_u32 (&seed) % vec_len (objects);
-	  if (objects[j] != ~0 || i + objects_used < n_iterations)
-	    break;
-	}
-
-      if (objects[j] != ~0)
-	{
-	  mheap_put (h, objects[j]);
-	  objects_used--;
-	  objects[j] = ~0;
-	}
-      else
-	{
-	  uword size, align, align_offset;
-
-	  size = (random_u32 (&seed) % max_object_size) * sizeof (data[0]);
-	  align = align_offset = 0;
-	  if (check_mask & CHECK_ALIGN)
-	    {
-	      align = 1 << (random_u32 (&seed) % 10);
-	      align_offset = round_pow2 (random_u32 (&seed) & (align - 1),
-					 sizeof (u32));
-	    }
-
-	  h = mheap_get_aligned (h, size, align, align_offset, &objects[j]);
-
-	  if (align > 0)
-	    ASSERT (0 == ((objects[j] + align_offset) & (align - 1)));
-
-	  ASSERT (objects[j] != ~0);
-	  objects_used++;
-
-	  /* Set newly allocated object with test data. */
-	  if (check_mask & CHECK_DATA)
-	    {
-	      uword len;
-
-	      data = (void *) h + objects[j];
-	      len = mheap_len (h, data);
-
-	      ASSERT (size <= mheap_data_bytes (h, objects[j]));
-
-	      data[0] = len;
-	      for (k = 1; k < len; k++)
-		data[k] = objects[j] + k;
-	    }
-	}
-
-      /* Verify that all used objects have correct test data. */
-      if (check_mask & 2)
-	{
-	  for (j = 0; j < vec_len (objects); j++)
-	    if (objects[j] != ~0)
-	      {
-		u32 *data = h + objects[j];
-		uword len = data[0];
-		for (k = 1; k < len; k++)
-		  ASSERT (data[k] == objects[j] + k);
-	      }
-	}
-      if (print_every != 0 && i > 0 && (i % print_every) == 0)
-	fformat (stderr, "iteration %d: %U\n", i, format_mheap, h,
-		 really_verbose);
-    }
-
-  if (verbose)
-    fformat (stderr, "%U\n", format_mheap, h, really_verbose);
-  mheap_free (h);
-  clib_mem_free (h_mem);
-  vec_free (objects);
-
-  return 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int ret;
-
-  verbose = (argc > 1);
-  unformat_init_command_line (&i, argv);
-  ret = test_mheap_main (&i);
-  unformat_free (&i);
-
-  return ret;
-}
-#endif /* CLIB_UNIX */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_pfhash.c b/vppinfra/vppinfra/test_pfhash.c
deleted file mode 100644
index ddbdbb34..00000000
--- a/vppinfra/vppinfra/test_pfhash.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
-  Copyright (c) 2013 Cisco and/or its affiliates.
-
-  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#include <vppinfra/pfhash.h>
-#include <vppinfra/format.h>
-#include <vppinfra/random.h>
-
-#if defined(CLIB_HAVE_VEC128) && ! defined (__ALTIVEC__)
-
-int verbose = 0;
-
-always_inline u8 *
-random_aligned_string (u32 * seed, uword len)
-{
-  u8 *alphabet = (u8 *) "abcdefghijklmnopqrstuvwxyz";
-  u8 *s = 0;
-  word i;
-
-  vec_resize_aligned (s, len, 16);
-  for (i = 0; i < len; i++)
-    s[i] = alphabet[random_u32 (seed) % 26];
-
-  return s;
-}
-
-void exit (int);
-
-int
-test_pfhash_main (unformat_input_t * input)
-{
-  u32 seed = 0xdeaddabe;
-  int i, iter;
-  u32 nkeys = 4;
-  u32 niter = 1;
-  u32 nbuckets = 1;
-  u32 bucket;
-  u32 sizes[3] = { 16, 8, 4 }, this_size, size;
-  u8 **keys = 0;
-  pfhash_t _rec, *p = &_rec;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "seed %d", &seed))
-	;
-      else if (unformat (input, "niter %d", &niter))
-	;
-      else if (unformat (input, "nkeys %d", &nkeys))
-	;
-      else if (unformat (input, "nbuckets %d", &nbuckets))
-	;
-      else if (unformat (input, "verbose %d", &verbose))
-	;
-      else if (unformat (input, "verbose"))
-	verbose = 1;
-      else
-	clib_error ("unknown input `%U'", format_unformat_error, input);
-    }
-
-  vec_validate (keys, nkeys - 1);
-
-  for (i = 0; i < nkeys; i++)
-    {
-      int j, k;
-
-    again:
-      keys[i] = random_aligned_string (&seed, 16);
-      for (j = 0; j < (i - 1); j++)
-	{
-	  /* Make sure we don't have a dup key in the min key size */
-	  for (k = 0; k < 4; k++)
-	    {
-	      if (keys[i][k] != keys[j][k])
-		goto check_next_key;
-	    }
-	  vec_free (keys[i]);
-	  goto again;
-	check_next_key:
-	  ;
-	}
-    }
-
-  /* test 8 byte key, 8 byte value case separately */
-
-  for (size = 8; size < 9; size++)
-    {
-      this_size = 8;
-
-      fformat (stdout, "%d-byte key 8 byte value test\n", this_size);
-
-      pfhash_init (p, "test", 8 /* key size */ , 8 /* value size */ ,
-		   nbuckets + 1);
-
-      for (iter = 0; iter < niter; iter++)
-	{
-	  bucket = 0;
-	  for (i = 0; i < nkeys; i++)
-	    {
-	      bucket = (i % nbuckets) + 1;
-	      pfhash_set (p, bucket, keys[i],
-			  (void *) (u64) 0x100000000ULL + i + 1);
-	    }
-
-	  for (i = 0; i < nkeys; i++)
-	    {
-	      bucket = (i % nbuckets) + 1;
-	      if (pfhash_get (p, bucket, keys[i])
-		  != (u64) 0x100000000ULL + i + 1)
-		{
-		  clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
-		  (void) pfhash_get (p, bucket, keys[i]);
-		}
-	    }
-
-	  /* test inline functions */
-	  for (i = 0; i < nkeys; i++)
-	    {
-	      u32 bucket_contents;
-	      u64 value = 0xdeadbeef;
-	      bucket = (i % nbuckets) + 1;
-
-	      pfhash_prefetch_bucket (p, bucket);
-	      bucket_contents = pfhash_read_bucket_prefetch_kv (p, bucket);
-
-	      value = pfhash_search_kv_8v8 (p, bucket_contents,
-					    (u64 *) keys[i]);
-	      if (value != (u64) 0x100000000ULL + i + 1)
-		clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
-	    }
-
-	  if (verbose)
-	    fformat (stdout, "%U\n", format_pfhash, p, verbose > 1);
-
-	  for (i = 0; i < nkeys; i++)
-	    {
-	      bucket = (i % nbuckets) + 1;
-	      pfhash_unset (p, bucket, keys[i]);
-	    }
-
-	  for (i = 0; i < nkeys; i++)
-	    {
-	      bucket = (i % nbuckets) + 1;
-	      if (pfhash_get (p, bucket, keys[i]) != (u64) ~ 0)
-		{
-		  clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
-		  (void) pfhash_get (p, bucket, keys[i]);
-		}
-	    }
-	  /* test inline functions */
-	  for (i = 0; i < nkeys; i++)
-	    {
-	      u32 bucket_contents;
-	      u64 value = 0xdeadbeef;
-	      bucket = (i % nbuckets) + 1;
-
-	      pfhash_prefetch_bucket (p, bucket);
-	      bucket_contents = pfhash_read_bucket_prefetch_kv (p, bucket);
-
-	      value = pfhash_search_kv_8v8 (p, bucket_contents,
-					    (u64 *) keys[i]);
-
-	      if (value != (u64) ~ 0)
-		clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
-	    }
-	}
-      pfhash_free (p);
-    }
-
-  /* test other cases */
-
-  for (size = 0; size < ARRAY_LEN (sizes); size++)
-    {
-      this_size = sizes[size];
-
-      fformat (stdout, "%d-byte key test\n", this_size);
-
-      pfhash_init (p, "test", this_size, 4 /* value size */ , nbuckets + 1);
-
-      for (iter = 0; iter < niter; iter++)
-	{
-	  bucket = 0;
-	  for (i = 0; i < nkeys; i++)
-	    {
-	      bucket = (i % nbuckets) + 1;
-	      pfhash_set (p, bucket, keys[i], (void *) (u64) i + 1);
-	    }
-
-	  for (i = 0; i < nkeys; i++)
-	    {
-	      bucket = (i % nbuckets) + 1;
-	      if (pfhash_get (p, bucket, keys[i]) != i + 1)
-		{
-		  clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
-		  (void) pfhash_get (p, bucket, keys[i]);
-		}
-	    }
-
-	  /* test inline functions */
-	  for (i = 0; i < nkeys; i++)
-	    {
-	      u32 bucket_contents;
-	      u32 value = 0xdeadbeef;
-	      bucket = (i % nbuckets) + 1;
-
-	      pfhash_prefetch_bucket (p, bucket);
-	      bucket_contents = pfhash_read_bucket_prefetch_kv (p, bucket);
-	      switch (p->key_size)
-		{
-		case 16:
-		  value =
-		    pfhash_search_kv_16 (p, bucket_contents,
-					 (u32x4 *) keys[i]);
-		  break;
-		case 8:
-		  value =
-		    pfhash_search_kv_8 (p, bucket_contents, (u64 *) keys[i]);
-		  break;
-		case 4:
-		  value =
-		    pfhash_search_kv_4 (p, bucket_contents, (u32 *) keys[i]);
-		  break;
-		}
-
-	      if (value != (i + 1))
-		clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
-	    }
-
-	  if (verbose)
-	    fformat (stdout, "%U\n", format_pfhash, p, verbose > 1);
-
-	  for (i = 0; i < nkeys; i++)
-	    {
-	      bucket = (i % nbuckets) + 1;
-	      pfhash_unset (p, bucket, keys[i]);
-	    }
-
-	  for (i = 0; i < nkeys; i++)
-	    {
-	      bucket = (i % nbuckets) + 1;
-	      if (pfhash_get (p, bucket, keys[i]) != (u64) ~ 0)
-		{
-		  clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
-		  (void) pfhash_get (p, bucket, keys[i]);
-		}
-	    }
-	  /* test inline functions */
-	  for (i = 0; i < nkeys; i++)
-	    {
-	      u32 bucket_contents;
-	      u32 value = 0xdeadbeef;
-	      bucket = (i % nbuckets) + 1;
-
-	      pfhash_prefetch_bucket (p, bucket);
-	      bucket_contents = pfhash_read_bucket_prefetch_kv (p, bucket);
-	      switch (p->key_size)
-		{
-		case 16:
-		  value =
-		    pfhash_search_kv_16 (p, bucket_contents,
-					 (u32x4 *) keys[i]);
-		  break;
-		case 8:
-		  value =
-		    pfhash_search_kv_8 (p, bucket_contents, (u64 *) keys[i]);
-		  break;
-		case 4:
-		  value =
-		    pfhash_search_kv_4 (p, bucket_contents, (u32 *) keys[i]);
-		  break;
-		}
-	      if (value != (u32) ~ 0)
-		clib_warning ("key %d bucket %d lookup FAIL\n", i, bucket);
-	    }
-	}
-      pfhash_free (p);
-    }
-
-  exit (0);
-}
-#else
-int
-test_pfhash_main (unformat_input_t * input)
-{
-  clib_warning ("MMX unit not available");
-  return 0;
-}
-#endif
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int ret;
-
-  unformat_init_command_line (&i, argv);
-  ret = test_pfhash_main (&i);
-  unformat_free (&i);
-
-  return ret;
-}
-#endif /* CLIB_UNIX */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_phash.c b/vppinfra/vppinfra/test_phash.c
deleted file mode 100644
index 9ed2ac7b..00000000
--- a/vppinfra/vppinfra/test_phash.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/phash.h>
-#include <vppinfra/format.h>
-#include <vppinfra/random.h>
-
-static int verbose;
-#define if_verbose(format,args...) \
-  if (verbose) { clib_warning(format, ## args); }
-
-int
-test_phash_main (unformat_input_t * input)
-{
-  phash_main_t _pm = { 0 }, *pm = &_pm;
-  int n_keys, random_keys;
-  u32 seed;
-  clib_error_t *error;
-
-  random_keys = 1;
-  n_keys = 1000;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (0 == unformat (input, "keys %d", &n_keys)
-	  && 0 == unformat (input, "verbose %=", &verbose, 1)
-	  && 0 == unformat (input, "random-keys %=", &random_keys, 1)
-	  && 0 == unformat (input, "sequential-keys %=", &random_keys, 0)
-	  && 0 == unformat (input, "seed %d", &pm->random_seed)
-	  && 0 == unformat (input, "64-bit %|", &pm->flags, PHASH_FLAG_MIX64)
-	  && 0 == unformat (input, "32-bit %|", &pm->flags, PHASH_FLAG_MIX32)
-	  && 0 == unformat (input, "fast %|", &pm->flags,
-			    PHASH_FLAG_FAST_MODE)
-	  && 0 == unformat (input, "slow %|", &pm->flags,
-			    PHASH_FLAG_SLOW_MODE)
-	  && 0 == unformat (input, "minimal %|", &pm->flags,
-			    PHASH_FLAG_MINIMAL)
-	  && 0 == unformat (input, "non-minimal %|", &pm->flags,
-			    PHASH_FLAG_NON_MINIMAL))
-	clib_error ("unknown input `%U'", format_unformat_error, input);
-    }
-
-  if (!pm->random_seed)
-    pm->random_seed = random_default_seed ();
-
-  if_verbose
-    ("%d %d-bit keys, random seed %d, %s mode, looking for %sminimal hash",
-     n_keys, (pm->flags & PHASH_FLAG_MIX64) ? 64 : 32, pm->random_seed,
-     (pm->flags & PHASH_FLAG_FAST_MODE) ? "fast" : "slow",
-     (pm->flags & PHASH_FLAG_MINIMAL) ? "" : "non-");
-
-  seed = pm->random_seed;
-
-  /* Initialize random keys. */
-  {
-    phash_key_t *k;
-
-    vec_resize (pm->keys, n_keys);
-    vec_foreach (k, pm->keys)
-    {
-      k->key = k - pm->keys;
-      if (random_keys)
-	{
-	  if (pm->flags & PHASH_FLAG_MIX64)
-	    k->key = random_u64 (&seed);
-	  else
-	    k->key = random_u32 (&seed);
-	}
-    }
-  }
-
-  error = phash_find_perfect_hash (pm);
-  if (error)
-    {
-      clib_error_report (error);
-      return 1;
-    }
-  else
-    {
-      if_verbose ("(%d,%d) (a,b) bits, %d seeds tried, %d tree walks",
-		  pm->a_bits, pm->b_bits,
-		  pm->n_seed_trials, pm->n_perfect_calls);
-
-      error = phash_validate (pm);
-      if (error)
-	{
-	  clib_error_report (error);
-	  return 1;
-	}
-    }
-
-  return 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int res;
-
-  verbose = (argc > 1);
-  unformat_init_command_line (&i, argv);
-  res = test_phash_main (&i);
-  unformat_free (&i);
-  return res;
-}
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_pool.c b/vppinfra/vppinfra/test_pool.c
deleted file mode 100644
index 67a5e50a..00000000
--- a/vppinfra/vppinfra/test_pool.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/mem.h>
-#include <vppinfra/pool.h>
-
-#ifdef __KERNEL__
-#include <linux/unistd.h>
-#else
-#include <unistd.h>
-#endif
-
-int
-main (int argc, char *argv[])
-{
-  int i, n, seed;
-
-  int *p = 0, *e, j, *o = 0;
-
-  n = atoi (argv[1]);
-  seed = getpid ();
-  srandom (1);
-
-  for (i = 0; i < n; i++)
-    {
-      if (vec_len (o) < 10 || (random () & 1))
-	{
-	  pool_get (p, e);
-	  j = e - p;
-	  *e = j;
-	  vec_add1 (o, j);
-	}
-      else
-	{
-	  j = random () % vec_len (o);
-	  e = p + j;
-	  pool_put (p, e);
-	  vec_delete (o, 1, j);
-	}
-    }
-  p = pool_free (p);
-  vec_free (o);
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_pool_iterate.c b/vppinfra/vppinfra/test_pool_iterate.c
deleted file mode 100644
index 27ce4bb3..00000000
--- a/vppinfra/vppinfra/test_pool_iterate.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-  Copyright (c) 2011 Cisco and/or its affiliates.
-
-  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#include <vppinfra/mem.h>
-#include <vppinfra/pool.h>
-
-#ifdef __KERNEL__
-#include <linux/unistd.h>
-#else
-#include <unistd.h>
-#endif
-
-int
-main (int argc, char *argv[])
-{
-  int i;
-  uword next;
-  u32 *tp = 0;
-  u32 *junk;
-
-  for (i = 0; i < 70; i++)
-    pool_get (tp, junk);
-
-  (void) junk;			/* compiler warning */
-
-  pool_put_index (tp, 1);
-  pool_put_index (tp, 65);
-
-  next = ~0;
-  do
-    {
-      next = pool_next_index (tp, next);
-      fformat (stdout, "next index %d\n", next);
-    }
-  while (next != ~0);
-
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_ptclosure.c b/vppinfra/vppinfra/test_ptclosure.c
deleted file mode 100644
index be7d51df..00000000
--- a/vppinfra/vppinfra/test_ptclosure.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vppinfra/ptclosure.h>
-#include <vppinfra/hash.h>
-
-typedef struct
-{
-  uword *index_by_name;
-  u8 *items;
-} test_main_t;
-
-test_main_t test_main;
-
-static char *items[] = {
-  "d",
-  "a",
-  "b",
-  "c",
-};
-
-char *constraints[] = {
-  "a,b",
-  "b,c",
-  "d,b",
-  //    "c,a", /* no partial order possible */
-};
-
-u32
-vl (void *p)
-{
-  return vec_len (p);
-}
-
-static void
-dump_closure (test_main_t * tm, char *s, u8 ** orig)
-{
-  int i, j;
-
-  fformat (stdout, "--------- %s --------------\n", s);
-  for (i = 0; i < vec_len (orig); i++)
-    {
-      for (j = 0; j < vec_len (orig); j++)
-	if (orig[i][j])
-	  {
-	    fformat (stdout, "%s <before> %s\n", items[i], items[j]);
-	  }
-    }
-}
-
-int
-comma_split (u8 * s, u8 ** a, u8 ** b)
-{
-  *a = s;
-
-  while (*s && *s != ',')
-    s++;
-
-  if (*s == ',')
-    *s = 0;
-  else
-    return 1;
-
-  *b = (u8 *) (s + 1);
-  return 0;
-}
-
-int
-test_ptclosure_main (unformat_input_t * input)
-{
-  test_main_t *tm = &test_main;
-  u8 *item_name;
-  int i, j;
-  u8 **orig;
-  u8 **closure;
-  u8 *a_name, *b_name;
-  int a_index, b_index;
-  uword *p;
-  u8 *this_constraint;
-  int n;
-  u32 *result = 0;
-
-  tm->index_by_name = hash_create_string (0, sizeof (uword));
-
-  n = ARRAY_LEN (items);
-
-  for (i = 0; i < n; i++)
-    {
-      item_name = (u8 *) items[i];
-      hash_set_mem (tm->index_by_name, item_name, i);
-    }
-
-  orig = clib_ptclosure_alloc (n);
-
-  for (i = 0; i < ARRAY_LEN (constraints); i++)
-    {
-      this_constraint = format (0, "%s%c", constraints[i], 0);
-
-      if (comma_split (this_constraint, &a_name, &b_name))
-	{
-	  clib_warning ("couldn't split '%s'", constraints[i]);
-	  return 1;
-	}
-
-      p = hash_get_mem (tm->index_by_name, a_name);
-      if (p == 0)
-	{
-	  clib_warning ("couldn't find '%s'", a_name);
-	  return 1;
-	}
-      a_index = p[0];
-
-      p = hash_get_mem (tm->index_by_name, b_name);
-      if (p == 0)
-	{
-	  clib_warning ("couldn't find '%s'", b_name);
-	  return 1;
-	}
-      b_index = p[0];
-
-      orig[a_index][b_index] = 1;
-      vec_free (this_constraint);
-    }
-
-  dump_closure (tm, "original relation", orig);
-
-  closure = clib_ptclosure (orig);
-
-  dump_closure (tm, "closure", closure);
-
-  /*
-   * Output partial order
-   */
-
-again:
-  for (i = 0; i < n; i++)
-    {
-      for (j = 0; j < n; j++)
-	{
-	  if (closure[i][j])
-	    goto item_constrained;
-	}
-      /* Item i can be output */
-      vec_add1 (result, i);
-      {
-	int k;
-	for (k = 0; k < n; k++)
-	  closure[k][i] = 0;
-	/* "Magic" a before a, to keep from ever outputting it again */
-	closure[i][i] = 1;
-	goto again;
-      }
-    item_constrained:
-      ;
-    }
-
-  if (vec_len (result) != n)
-    {
-      clib_warning ("no partial order exists");
-      exit (1);
-    }
-
-  fformat (stdout, "Partial order:\n");
-
-  for (i = vec_len (result) - 1; i >= 0; i--)
-    {
-      fformat (stdout, "%s\n", items[result[i]]);
-    }
-
-  vec_free (result);
-  clib_ptclosure_free (orig);
-  clib_ptclosure_free (closure);
-
-  return 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int ret;
-
-  clib_mem_init (0, 3ULL << 30);
-
-  unformat_init_command_line (&i, argv);
-  ret = test_ptclosure_main (&i);
-  unformat_free (&i);
-
-  return ret;
-}
-#endif /* CLIB_UNIX */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_qhash.c b/vppinfra/vppinfra/test_qhash.c
deleted file mode 100644
index fdbf0bbe..00000000
--- a/vppinfra/vppinfra/test_qhash.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vppinfra/bitmap.h>
-#include <vppinfra/os.h>
-#include <vppinfra/qhash.h>
-#include <vppinfra/random.h>
-#include <vppinfra/time.h>
-
-typedef struct
-{
-  u32 n_iter, seed, n_keys, n_hash_keys, verbose;
-
-  u32 max_vector;
-
-  uword *hash;
-
-  uword *keys_in_hash_bitmap;
-
-  u32 *qhash;
-
-  uword *keys;
-
-  uword *lookup_keys;
-  uword *lookup_key_indices;
-  u32 *lookup_results;
-
-  u32 *get_multiple_results;
-
-  clib_time_t time;
-
-  f64 overflow_fraction, ave_elts;
-  f64 get_time, hash_get_time;
-  f64 set_time, set_count;
-  f64 unset_time, unset_count;
-  f64 hash_set_time, hash_unset_time;
-} test_qhash_main_t;
-
-clib_error_t *
-test_qhash_main (unformat_input_t * input)
-{
-  clib_error_t *error = 0;
-  test_qhash_main_t _tm, *tm = &_tm;
-  uword i, iter;
-
-  memset (tm, 0, sizeof (tm[0]));
-  tm->n_iter = 10;
-  tm->seed = 1;
-  tm->n_keys = 10;
-  tm->max_vector = 1;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "iter %d", &tm->n_iter))
-	;
-      else if (unformat (input, "seed %d", &tm->seed))
-	;
-      else if (unformat (input, "keys %d", &tm->n_keys))
-	;
-      else if (unformat (input, "size %d", &tm->n_hash_keys))
-	;
-      else if (unformat (input, "vector %d", &tm->max_vector))
-	;
-      else if (unformat (input, "verbose"))
-	tm->verbose = 1;
-      else
-	{
-	  error = clib_error_create ("unknown input `%U'\n",
-				     format_unformat_error, input);
-	  goto done;
-	}
-    }
-
-  if (!tm->seed)
-    tm->seed = random_default_seed ();
-
-  clib_time_init (&tm->time);
-
-  clib_warning ("iter %d, seed %u, keys %d, max vector %d, ",
-		tm->n_iter, tm->seed, tm->n_keys, tm->max_vector);
-
-  vec_resize (tm->keys, tm->n_keys);
-  vec_resize (tm->get_multiple_results, tm->n_keys);
-  for (i = 0; i < vec_len (tm->keys); i++)
-    tm->keys[i] = random_uword (&tm->seed);
-
-  if (!tm->n_hash_keys)
-    tm->n_hash_keys = 2 * max_pow2 (tm->n_keys);
-  tm->n_hash_keys = clib_max (tm->n_keys, tm->n_hash_keys);
-  qhash_resize (tm->qhash, tm->n_hash_keys);
-
-  {
-    qhash_t *h = qhash_header (tm->qhash);
-    int i;
-    for (i = 0; i < ARRAY_LEN (h->hash_seeds); i++)
-      h->hash_seeds[i] = random_uword (&tm->seed);
-  }
-
-  vec_resize (tm->lookup_keys, tm->max_vector);
-  vec_resize (tm->lookup_key_indices, tm->max_vector);
-  vec_resize (tm->lookup_results, tm->max_vector);
-
-  for (iter = 0; iter < tm->n_iter; iter++)
-    {
-      uword *p, j, n, is_set;
-
-      n = tm->max_vector;
-
-      is_set = random_u32 (&tm->seed) & 1;
-      is_set |= hash_elts (tm->hash) < (tm->n_keys / 4);
-      if (hash_elts (tm->hash) > (3 * tm->n_keys) / 4)
-	is_set = 0;
-
-      _vec_len (tm->lookup_keys) = n;
-      _vec_len (tm->lookup_key_indices) = n;
-      j = 0;
-      while (j < n)
-	{
-	  i = random_u32 (&tm->seed) % vec_len (tm->keys);
-	  if (clib_bitmap_get (tm->keys_in_hash_bitmap, i) != is_set)
-	    {
-	      f64 t[2];
-	      tm->lookup_key_indices[j] = i;
-	      tm->lookup_keys[j] = tm->keys[i];
-	      t[0] = clib_time_now (&tm->time);
-	      if (is_set)
-		hash_set (tm->hash, tm->keys[i], i);
-	      else
-		hash_unset (tm->hash, tm->keys[i]);
-	      t[1] = clib_time_now (&tm->time);
-	      if (is_set)
-		tm->hash_set_time += t[1] - t[0];
-	      else
-		tm->hash_unset_time += t[1] - t[0];
-	      tm->keys_in_hash_bitmap
-		= clib_bitmap_set (tm->keys_in_hash_bitmap, i, is_set);
-	      j++;
-	    }
-	}
-
-      {
-	f64 t[2];
-
-	if (is_set)
-	  {
-	    t[0] = clib_time_now (&tm->time);
-	    qhash_set_multiple (tm->qhash,
-				tm->lookup_keys,
-				vec_len (tm->lookup_keys),
-				tm->lookup_results);
-	    t[1] = clib_time_now (&tm->time);
-	    tm->set_time += t[1] - t[0];
-	    tm->set_count += vec_len (tm->lookup_keys);
-	    for (i = 0; i < vec_len (tm->lookup_keys); i++)
-	      {
-		uword r = tm->lookup_results[i];
-		*vec_elt_at_index (tm->qhash, r) = tm->lookup_key_indices[i];
-	      }
-	  }
-	else
-	  {
-	    t[0] = clib_time_now (&tm->time);
-	    qhash_unset_multiple (tm->qhash,
-				  tm->lookup_keys,
-				  vec_len (tm->lookup_keys),
-				  tm->lookup_results);
-	    t[1] = clib_time_now (&tm->time);
-	    tm->unset_time += t[1] - t[0];
-	    tm->unset_count += vec_len (tm->lookup_keys);
-
-	    for (i = 0; i < vec_len (tm->lookup_keys); i++)
-	      {
-		uword r = tm->lookup_results[i];
-		*vec_elt_at_index (tm->qhash, r) = ~0;
-	      }
-	  }
-      }
-
-      if (qhash_elts (tm->qhash) != hash_elts (tm->hash))
-	os_panic ();
-
-      {
-	qhash_t *h;
-	uword i, k, l, count;
-
-	h = qhash_header (tm->qhash);
-
-	for (i = k = 0; k < vec_len (h->hash_key_valid_bitmap); k++)
-	  i += count_set_bits (h->hash_key_valid_bitmap[k]);
-	k = hash_elts (h->overflow_hash);
-	l = qhash_elts (tm->qhash);
-	if (i + k != l)
-	  os_panic ();
-
-	count = hash_elts (h->overflow_hash);
-	for (i = 0; i < (1 << h->log2_hash_size); i++)
-	  count += tm->qhash[i] != ~0;
-	if (count != qhash_elts (tm->qhash))
-	  os_panic ();
-
-	{
-	  u32 *tmp = 0;
-
-	  /* *INDENT-OFF* */
-	  hash_foreach (k, l, h->overflow_hash, ({
-	    j = qhash_hash_mix (h, k) / QHASH_KEYS_PER_BUCKET;
-	    vec_validate (tmp, j);
-	    tmp[j] += 1;
-	  }));
-	  /* *INDENT-ON* */
-
-	  for (k = 0; k < vec_len (tmp); k++)
-	    {
-	      if (k >= vec_len (h->overflow_counts))
-		os_panic ();
-	      if (h->overflow_counts[k] != tmp[k])
-		os_panic ();
-	    }
-	  for (; k < vec_len (h->overflow_counts); k++)
-	    if (h->overflow_counts[k] != 0)
-	      os_panic ();
-
-	  vec_free (tmp);
-	}
-      }
-
-      {
-	f64 t[2];
-
-	t[0] = clib_time_now (&tm->time);
-	qhash_get_multiple (tm->qhash, tm->keys, vec_len (tm->keys),
-			    tm->get_multiple_results);
-	t[1] = clib_time_now (&tm->time);
-	tm->get_time += t[1] - t[0];
-
-	for (i = 0; i < vec_len (tm->keys); i++)
-	  {
-	    u32 r;
-
-	    t[0] = clib_time_now (&tm->time);
-	    p = hash_get (tm->hash, tm->keys[i]);
-	    t[1] = clib_time_now (&tm->time);
-	    tm->hash_get_time += t[1] - t[0];
-
-	    r = qhash_get (tm->qhash, tm->keys[i]);
-	    if (p)
-	      {
-		if (p[0] != i)
-		  os_panic ();
-		if (*vec_elt_at_index (tm->qhash, r) != i)
-		  os_panic ();
-	      }
-	    else
-	      {
-		if (r != ~0)
-		  os_panic ();
-	      }
-	    if (r != tm->get_multiple_results[i])
-	      os_panic ();
-	  }
-      }
-
-      tm->overflow_fraction +=
-	((f64) qhash_n_overflow (tm->qhash) / qhash_elts (tm->qhash));
-      tm->ave_elts += qhash_elts (tm->qhash);
-    }
-
-  fformat (stderr, "%d iter %.6e overflow, %.4f ave. elts\n",
-	   tm->n_iter,
-	   tm->overflow_fraction / tm->n_iter, tm->ave_elts / tm->n_iter);
-
-  tm->get_time /= tm->n_iter * vec_len (tm->keys);
-  tm->hash_get_time /= tm->n_iter * vec_len (tm->keys);
-
-  tm->set_time /= tm->set_count;
-  tm->unset_time /= tm->unset_count;
-  tm->hash_set_time /= tm->set_count;
-  tm->hash_unset_time /= tm->unset_count;
-
-  fformat (stderr,
-	   "get/set/unset clocks %.2e %.2e %.2e clib %.2e %.2e %.2e ratio %.2f %.2f %.2f\n",
-	   tm->get_time * tm->time.clocks_per_second,
-	   tm->set_time * tm->time.clocks_per_second,
-	   tm->unset_time * tm->time.clocks_per_second,
-	   tm->hash_get_time * tm->time.clocks_per_second,
-	   tm->hash_set_time * tm->time.clocks_per_second,
-	   tm->hash_unset_time * tm->time.clocks_per_second,
-	   tm->hash_get_time / tm->get_time, tm->hash_set_time / tm->set_time,
-	   tm->hash_unset_time / tm->unset_time);
-
-
-done:
-  return error;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  clib_error_t *error;
-
-  unformat_init_command_line (&i, argv);
-  error = test_qhash_main (&i);
-  unformat_free (&i);
-  if (error)
-    {
-      clib_error_report (error);
-      return 1;
-    }
-  else
-    return 0;
-}
-#endif /* CLIB_UNIX */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_random.c b/vppinfra/vppinfra/test_random.c
deleted file mode 100644
index 49759eac..00000000
--- a/vppinfra/vppinfra/test_random.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/format.h>
-#include <vppinfra/bitmap.h>
-
-static u32 known_random_sequence[] = {
-  0x00000000, 0x3c6ef35f, 0x47502932, 0xd1ccf6e9,
-  0xaaf95334, 0x6252e503, 0x9f2ec686, 0x57fe6c2d,
-  0xa3d95fa8, 0x81fdbee7, 0x94f0af1a, 0xcbf633b1,
-};
-
-
-int
-test_random_main (unformat_input_t * input)
-{
-  uword n_iterations;
-  uword i, repeat_count;
-  uword *bitmap = 0;
-  uword print;
-  u32 seed;
-  u32 *seedp = &seed;
-
-  /* first, check known sequence from Numerical Recipes in C, 2nd ed.
-     page 284 */
-  seed = known_random_sequence[0];
-  for (i = 0; i < ARRAY_LEN (known_random_sequence) - 1; i++)
-    {
-      u32 rv;
-      rv = random_u32 (seedp);
-      if (rv != known_random_sequence[i + 1])
-	{
-	  fformat (stderr, "known sequence check FAILS at index %d", i + 1);
-	  break;
-	}
-    }
-
-  clib_warning ("known sequence check passes");
-
-  n_iterations = 1000;
-  seed = 0;
-  print = 1 << 24;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (0 == unformat (input, "iter %d", &n_iterations)
-	  && 0 == unformat (input, "print %d", &print)
-	  && 0 == unformat (input, "seed %d", &seed))
-	clib_error ("unknown input `%U'", format_unformat_error, input);
-    }
-
-  if (!seed)
-    seed = random_default_seed ();
-
-  if (n_iterations == 0)
-    n_iterations = random_u32_max ();
-
-  clib_warning ("%d iterations, seed %d\n", n_iterations, seed);
-
-  repeat_count = 0;
-  for (i = 0; i < n_iterations; i++)
-    {
-      uword r = random_u32 (&seed);
-      uword b, ri, rj;
-
-      ri = r / BITS (bitmap[0]);
-      rj = (uword) 1 << (r % BITS (bitmap[0]));
-
-      vec_validate (bitmap, ri);
-      b = bitmap[ri];
-
-      if (b & rj)
-	goto repeat;
-      b |= rj;
-      bitmap[ri] = b;
-
-      if (0 == (i & (print - 1)))
-	fformat (stderr, "0x%08x iterations %d repeats\n", i, repeat_count);
-      continue;
-
-    repeat:
-      fformat (stderr, "repeat found at iteration  %d/%d\n", i, n_iterations);
-      repeat_count++;
-      continue;
-    }
-
-  return 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int ret;
-
-  clib_mem_init (0, 3ULL << 30);
-
-  unformat_init_command_line (&i, argv);
-  ret = test_random_main (&i);
-  unformat_free (&i);
-
-  return ret;
-}
-#endif /* CLIB_UNIX */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_random_isaac.c b/vppinfra/vppinfra/test_random_isaac.c
deleted file mode 100644
index 337d30dd..00000000
--- a/vppinfra/vppinfra/test_random_isaac.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/format.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/random.h>
-#include <vppinfra/random_isaac.h>
-
-static int verbose;
-#define if_verbose(format,args...) \
-  if (verbose) { clib_warning(format, ## args); }
-
-int
-test_isaac_main (unformat_input_t * input)
-{
-  uword n_iterations, seed;
-  uword i, repeat_count;
-  uword *hash = 0;
-  uword print;
-  isaac_t ctx;
-  uword results[ISAAC_SIZE] = { 0 };
-  uword n_results;
-
-  n_iterations = 1000;
-  seed = 0;
-  print = 1 << 24;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (0 == unformat (input, "iter %d", &n_iterations)
-	  && 0 == unformat (input, "print %d", &print)
-	  && 0 == unformat (input, "seed %d", &seed))
-	clib_error ("unknown input `%U'", format_unformat_error, input);
-    }
-
-  if (!seed)
-    seed = random_default_seed ();
-
-  results[0] = seed;
-
-  if (n_iterations == 0)
-    n_iterations = ~0;
-
-  if_verbose ("%d iterations, seed %d\n", n_iterations, seed);
-
-  repeat_count = 0;
-  isaac_init (&ctx, results);
-  isaac (&ctx, results);
-  n_results = 0;
-  for (i = 0; i < n_iterations; i++)
-    {
-      uword r = results[n_results++];
-
-      if (!hash)
-	hash = hash_create (0, /* value bytes */ 0);
-
-      if (hash_get (hash, r))
-	goto repeat;
-
-      hash_set1 (hash, r);
-
-      if (n_results >= ARRAY_LEN (results))
-	{
-	  isaac (&ctx, results);
-	  n_results = 0;
-	}
-
-      if (verbose && 0 == (i & (print - 1)))
-	fformat (stderr, "0x%08x iterations %d repeats\n", i, repeat_count);
-
-      if (hash_elts (hash) > 0x100000)
-	hash_free (hash);
-
-      continue;
-
-    repeat:
-      fformat (stderr, "repeat found at iteration  %d/%d\n", i, n_iterations);
-      repeat_count++;
-      continue;
-    }
-
-  return repeat_count > 0 ? 1 : 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int ret;
-
-  verbose = (argc > 1);
-  unformat_init_command_line (&i, argv);
-  ret = test_isaac_main (&i);
-  unformat_free (&i);
-
-  return ret;
-}
-#endif /* CLIB_UNIX */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_serialize.c b/vppinfra/vppinfra/test_serialize.c
deleted file mode 100644
index e00eec32..00000000
--- a/vppinfra/vppinfra/test_serialize.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/format.h>
-#include <vppinfra/random.h>
-#include <vppinfra/serialize.h>
-#include <vppinfra/os.h>
-
-#define foreach_my_vector_type			\
-  _ (u8, a8)					\
-  _ (u16, a16)					\
-  _ (u32, a32)
-
-typedef struct
-{
-#define _(t,f) t f;
-  foreach_my_vector_type
-#undef _
-} my_vector_type_t;
-
-static void
-serialize_my_vector_type_single (serialize_main_t * m, va_list * va)
-{
-  my_vector_type_t *v = va_arg (*va, my_vector_type_t *);
-  u32 n = va_arg (*va, u32);
-  u32 i;
-
-  for (i = 0; i < n; i++)
-    {
-#define _(t,f) serialize_integer (m, v[i].f, sizeof (v[i].f));
-      foreach_my_vector_type;
-    }
-#undef _
-}
-
-static void
-unserialize_my_vector_type_single (serialize_main_t * m, va_list * va)
-{
-  my_vector_type_t *v = va_arg (*va, my_vector_type_t *);
-  u32 n = va_arg (*va, u32);
-  u32 i;
-
-  for (i = 0; i < n; i++)
-    {
-#define _(t,f) { u32 tmp; unserialize_integer (m, &tmp, sizeof (v[i].f)); v[i].f = tmp; }
-      foreach_my_vector_type;
-#undef _
-    }
-}
-
-static void
-serialize_my_vector_type_multiple (serialize_main_t * m, va_list * va)
-{
-  my_vector_type_t *v = va_arg (*va, my_vector_type_t *);
-  u32 n = va_arg (*va, u32);
-
-#define _(t,f)					\
-  serialize_multiple				\
-    (m,						\
-     &v[0].f,					\
-     STRUCT_SIZE_OF (my_vector_type_t, f),	\
-     STRUCT_STRIDE_OF (my_vector_type_t, f),	\
-     n);
-
-  foreach_my_vector_type;
-
-#undef _
-}
-
-static void
-unserialize_my_vector_type_multiple (serialize_main_t * m, va_list * va)
-{
-  my_vector_type_t *v = va_arg (*va, my_vector_type_t *);
-  u32 n = va_arg (*va, u32);
-
-#define _(t,f)					\
-  unserialize_multiple				\
-    (m,						\
-     &v[0].f,					\
-     STRUCT_SIZE_OF (my_vector_type_t, f),	\
-     STRUCT_STRIDE_OF (my_vector_type_t, f),	\
-     n);
-
-  foreach_my_vector_type;
-
-#undef _
-}
-
-typedef struct
-{
-  u32 n_iter;
-  u32 seed;
-  u32 verbose;
-  u32 multiple;
-  u32 max_len;
-
-  my_vector_type_t **test_vectors;
-
-  char *dump_file;
-
-  serialize_main_t serialize_main;
-  serialize_main_t unserialize_main;
-} test_serialize_main_t;
-
-int
-test_serialize_main (unformat_input_t * input)
-{
-  clib_error_t *error = 0;
-  test_serialize_main_t _tm, *tm = &_tm;
-  serialize_main_t *sm = &tm->serialize_main;
-  serialize_main_t *um = &tm->unserialize_main;
-  uword i;
-
-  memset (tm, 0, sizeof (tm[0]));
-  tm->n_iter = 100;
-  tm->seed = 1;
-  tm->max_len = 128;
-  tm->verbose = 0;
-  tm->multiple = 1;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "iter %d", &tm->n_iter))
-	;
-      else if (unformat (input, "seed %d", &tm->seed))
-	;
-      else if (unformat (input, "file %s", &tm->dump_file))
-	;
-      else if (unformat (input, "max-len %d", &tm->max_len))
-	;
-      else if (unformat (input, "multiple %=", &tm->multiple, 1))
-	;
-      else if (unformat (input, "single %=", &tm->multiple, 0))
-	;
-      else if (unformat (input, "verbose %=", &tm->verbose, 1))
-	;
-      else
-	{
-	  error = clib_error_create ("unknown input `%U'\n",
-				     format_unformat_error, input);
-	  goto done;
-	}
-    }
-
-  if (tm->seed == 0)
-    tm->seed = random_default_seed ();
-
-  clib_warning ("iter %d seed %d max-len %d", tm->n_iter, tm->seed,
-		tm->max_len);
-
-#ifdef CLIB_UNIX
-  if (tm->dump_file)
-    serialize_open_unix_file (sm, tm->dump_file);
-  else
-#endif
-    serialize_open_vector (sm, 0);
-
-  vec_resize (tm->test_vectors, tm->n_iter);
-  for (i = 0; i < tm->n_iter; i++)
-    {
-      uword l = 1 + (random_u32 (&tm->seed) % tm->max_len);
-      my_vector_type_t *mv;
-
-      vec_resize (tm->test_vectors[i], l);
-      vec_foreach (mv, tm->test_vectors[i])
-      {
-#define _(t,f) mv->f = random_u32 (&tm->seed) & pow2_mask (31);
-	foreach_my_vector_type;
-#undef _
-      }
-
-      vec_serialize (sm, tm->test_vectors[i],
-		     tm->multiple ? serialize_my_vector_type_multiple :
-		     serialize_my_vector_type_single);
-    }
-
-  if (tm->verbose)
-    clib_warning ("overflow vector max bytes %d",
-		  vec_max_len (sm->stream.overflow_buffer));
-
-  serialize_close (sm);
-
-#ifdef CLIB_UNIX
-  if (tm->dump_file)
-    {
-      if ((error = unserialize_open_unix_file (um, tm->dump_file)))
-	goto done;
-    }
-  else
-#endif
-    {
-      u8 *v = serialize_close_vector (sm);
-      unserialize_open_data (um, v, vec_len (v));
-    }
-
-  for (i = 0; i < tm->n_iter; i++)
-    {
-      my_vector_type_t *mv0;
-      my_vector_type_t *mv1;
-
-      vec_unserialize (um, &mv0,
-		       tm->multiple ? unserialize_my_vector_type_multiple :
-		       unserialize_my_vector_type_single);
-      mv1 = tm->test_vectors[i];
-
-      if (vec_len (mv0) != vec_len (mv1))
-	os_panic ();
-      if (memcmp (mv0, mv1, vec_len (mv0) * sizeof (mv0[0])))
-	os_panic ();
-
-      vec_free (mv0);
-    }
-
-done:
-  if (error)
-    clib_error_report (error);
-  return 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int r;
-
-  unformat_init_command_line (&i, argv);
-  r = test_serialize_main (&i);
-  unformat_free (&i);
-  return r;
-}
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_slist.c b/vppinfra/vppinfra/test_slist.c
deleted file mode 100644
index 3c3cbf73..00000000
--- a/vppinfra/vppinfra/test_slist.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifdef CLIB_UNIX
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#endif
-
-#include <vppinfra/slist.h>
-
-typedef struct
-{
-  u32 *random_pool;
-  u32 seed;
-  u32 iter;
-  u32 verbose;
-  f64 branching_factor;
-  clib_slist_t slist;
-} test_main_t;
-
-test_main_t test_main;
-
-#define foreach_simple_test                     \
-_(2)                                            \
-_(4)                                            \
-_(3)                                            \
-_(1)
-
-
-void
-run_test (test_main_t * tm)
-{
-  int i;
-  u32 *tv;
-  u32 ncompares;
-  u64 total_compares = 0;
-
-  if (1)
-    {
-      /*
-       * Add a bunch of random numbers to the skip-list,
-       * sorting them.
-       */
-      for (i = 0; i < tm->iter; i++)
-	{
-	  pool_get (tm->random_pool, tv);
-	  *tv = random_u32 (&tm->seed);
-	  clib_slist_add (&tm->slist, tv, tv - tm->random_pool);
-	}
-      /* make sure we can find each one */
-      for (i = 0; i < tm->iter; i++)
-	{
-	  u32 search_result;
-	  tv = pool_elt_at_index (tm->random_pool, i);
-
-	  search_result = clib_slist_search (&tm->slist, tv, &ncompares);
-	  ASSERT (search_result == i);
-
-	  total_compares += ncompares;
-	}
-
-      fformat (stdout, "%.2f avg compares/search\n",
-	       (f64) total_compares / (f64) i);
-
-      fformat (stdout, "%U\n", format_slist, &tm->slist,
-	       tm->iter < 1000 /* verbose */ );
-
-      /* delete half of them */
-      for (i = tm->iter / 2; i < tm->iter; i++)
-	{
-	  tv = pool_elt_at_index (tm->random_pool, i);
-	  (void) clib_slist_del (&tm->slist, tv);
-	}
-
-      /* make sure we can find the set we should find, and no others */
-      for (i = 0; i < tm->iter; i++)
-	{
-	  u32 search_result;
-	  tv = pool_elt_at_index (tm->random_pool, i);
-
-	  search_result = clib_slist_search (&tm->slist, tv, &ncompares);
-	  if (i >= tm->iter / 2)
-	    ASSERT (search_result == (u32) ~ 0);
-	  else
-	    ASSERT (search_result == i);
-
-	}
-
-      fformat (stdout, "%U\n", format_slist, &tm->slist,
-	       tm->iter < 1000 /* verbose */ );
-
-      /* delete the rest */
-      for (i = 0; i < tm->iter; i++)
-	{
-	  tv = pool_elt_at_index (tm->random_pool, i);
-
-	  (void) clib_slist_del (&tm->slist, tv);
-	}
-
-      fformat (stdout, "%U\n", format_slist, &tm->slist,
-	       tm->iter < 1000 /* verbose */ );
-    }
-  else
-    {
-
-#define _(n)                                                            \
-    do {                                                                \
-      pool_get (tm->random_pool, tv);                                   \
-      *tv = n;                                                          \
-      clib_slist_add (&tm->slist, tv, tv - tm->random_pool);            \
-      fformat(stdout, "%U\n", format_slist, &tm->slist, 1 /* verbose */); \
-    } while (0);
-      foreach_simple_test;
-#undef _
-    }
-
-  return;
-}
-
-word
-test_compare (void *key, u32 elt_index)
-{
-  u32 *k = (u32 *) key;
-  u32 elt = test_main.random_pool[elt_index];
-
-  if (*k < elt)
-    return -1;
-  if (*k > elt)
-    return 1;
-  return 0;
-}
-
-u8 *
-test_format (u8 * s, va_list * args)
-{
-  u32 elt_index = va_arg (*args, u32);
-  u32 elt = test_main.random_pool[elt_index];
-
-  return format (s, "%u", elt);
-}
-
-void
-initialize_slist (test_main_t * tm)
-{
-  clib_slist_init (&tm->slist, tm->branching_factor,
-		   test_compare, test_format);
-}
-
-int
-test_slist_main (unformat_input_t * input)
-{
-  test_main_t *tm = &test_main;
-  u32 tmp;
-
-  tm->seed = 0xbabeb00b;
-  tm->iter = 100000;
-  tm->verbose = 1;
-  tm->branching_factor = 1.0 / 5.0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "seed %d", &tm->seed))
-	continue;
-      else if (unformat (input, "iter %d", &tm->iter))
-	continue;
-      else if (unformat (input, "verbose"))
-	tm->verbose = 1;
-      else if (unformat (input, "branch %d", &tmp))
-	{
-	  if (tmp > 0)
-	    tm->branching_factor = 1.0 / (f64) tmp;
-	  else
-	    fformat (stderr, "warning: branch = 0, ignored\n");
-	}
-      else
-	{
-	  clib_error ("unknown input `%U'", format_unformat_error, input);
-	  goto usage;
-	}
-    }
-  initialize_slist (tm);
-  run_test (tm);
-
-  return 0;
-
-usage:
-  fformat (stderr, "usage: test_slist seed <seed> iter <iter> [verbose]\n");
-  return 1;
-
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int ret;
-
-  clib_mem_init (0, (u64) 4 << 30);
-
-  unformat_init_command_line (&i, argv);
-  ret = test_slist_main (&i);
-  unformat_free (&i);
-
-  return ret;
-}
-#endif /* CLIB_UNIX */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_socket.c b/vppinfra/vppinfra/test_socket.c
deleted file mode 100644
index 0b05467a..00000000
--- a/vppinfra/vppinfra/test_socket.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/format.h>
-#include <vppinfra/socket.h>
-
-static int verbose;
-#define if_verbose(format,args...) \
-  if (verbose) { clib_warning(format, ## args); }
-
-int
-test_socket_main (unformat_input_t * input)
-{
-  clib_socket_t _s = { 0 }, *s = &_s;
-  char *config;
-  clib_error_t *error;
-
-  s->config = "localhost:22";
-  s->flags = SOCKET_IS_CLIENT;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "server %s %=", &config,
-		    &s->flags, SOCKET_IS_SERVER))
-	;
-      else if (unformat (input, "client %s %=", &config,
-			 &s->flags, SOCKET_IS_CLIENT))
-	;
-      else
-	{
-	  error = clib_error_create ("unknown input `%U'\n",
-				     format_unformat_error, input);
-	  goto done;
-	}
-    }
-
-  error = clib_socket_init (s);
-  if (error)
-    goto done;
-
-  if (0)
-    {
-      struct
-      {
-	int a, b;
-      } *msg;
-      msg = clib_socket_tx_add (s, sizeof (msg[0]));
-      msg->a = 99;
-      msg->b = 100;
-    }
-  else
-    clib_socket_tx_add_formatted (s, "hello there mr server %d\n", 99);
-
-  error = clib_socket_tx (s);
-  if (error)
-    goto done;
-
-  while (1)
-    {
-      error = clib_socket_rx (s, 100);
-      if (error)
-	break;
-
-      if (clib_socket_rx_end_of_file (s))
-	break;
-
-      if_verbose ("%v", s->rx_buffer);
-      _vec_len (s->rx_buffer) = 0;
-    }
-
-  error = clib_socket_close (s);
-
-done:
-  if (error)
-    clib_error_report (error);
-  return 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int r;
-
-  verbose = (argc > 1);
-  unformat_init_command_line (&i, argv);
-  r = test_socket_main (&i);
-  unformat_free (&i);
-  return r;
-}
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_time.c b/vppinfra/vppinfra/test_time.c
deleted file mode 100644
index 63cfeac5..00000000
--- a/vppinfra/vppinfra/test_time.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/format.h>
-#include <vppinfra/time.h>
-#include <vppinfra/math.h>	/* for sqrt */
-
-static int verbose;
-#define if_verbose(format,args...) \
-  if (verbose) { clib_warning(format, ## args); }
-
-static int
-test_time_main (unformat_input_t * input)
-{
-  f64 wait, error;
-  f64 t, tu[3], ave, rms;
-  clib_time_t c;
-  int i, n, j;
-
-  clib_time_init (&c);
-  wait = 1e-3;
-  n = 1000;
-  unformat (input, "%f %d", &wait, &n);
-  ave = rms = 0;
-  tu[0] = unix_time_now ();
-  tu[1] = unix_time_now ();
-  for (i = 0; i < n; i++)
-    {
-      j = 0;
-      t = clib_time_now (&c);
-      while (clib_time_now (&c) < t + wait)
-	j++;
-      t = j;
-      ave += t;
-      rms += t * t;
-    }
-  tu[2] = unix_time_now ();
-  ave /= n;
-  rms = sqrt (rms / n - ave * ave);
-
-  error = ((tu[2] - tu[1]) - 2 * (tu[1] - tu[0]) - n * wait) / n;
-  if_verbose ("tested %d x %.6e sec waits, error %.6e loops %.6e +- %.6e\n",
-	      n, wait, error, ave, rms);
-
-  return 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int ret;
-
-  verbose = (argc > 1);
-  unformat_init_command_line (&i, argv);
-  ret = test_time_main (&i);
-  unformat_free (&i);
-
-  return ret;
-}
-#endif /* CLIB_UNIX */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_timing_wheel.c b/vppinfra/vppinfra/test_timing_wheel.c
deleted file mode 100644
index 0ce15ad8..00000000
--- a/vppinfra/vppinfra/test_timing_wheel.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vppinfra/bitmap.h>
-#include <vppinfra/error.h>
-#include <vppinfra/format.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/random.h>
-#include <vppinfra/time.h>
-#include <vppinfra/timing_wheel.h>
-#include <vppinfra/zvec.h>
-
-#include <vppinfra/math.h>
-
-#if __GNUC__ < 4
-#define SQRT(a) a
-#else
-#define SQRT(a) sqrt(a)
-#endif
-
-typedef struct
-{
-  uword n_iter;
-
-  u32 n_events;
-  u32 seed;
-  u32 verbose;
-
-  /* Time is "synthetic" e.g. not taken from CPU timer. */
-  u32 synthetic_time;
-
-  clib_time_t time;
-  timing_wheel_t timing_wheel;
-
-  u64 *events;
-
-  f64 max_time;
-  f64 wait_time;
-
-  f64 total_iterate_time;
-  f64 time_iterate_start;
-
-  f64 time_per_status_update;
-  f64 time_next_status_update;
-} test_timing_wheel_main_t;
-
-typedef struct
-{
-  f64 dt;
-  f64 fraction;
-  u64 count;
-} test_timing_wheel_tmp_t;
-
-static void
-set_event (test_timing_wheel_main_t * tm, uword i)
-{
-  timing_wheel_t *w = &tm->timing_wheel;
-  u64 cpu_time;
-
-  cpu_time = w->current_time_index << w->log2_clocks_per_bin;
-  if (tm->synthetic_time)
-    cpu_time += random_u32 (&tm->seed) % tm->n_iter;
-  else
-    cpu_time +=
-      random_f64 (&tm->seed) * tm->max_time * tm->time.clocks_per_second;
-
-  timing_wheel_insert (w, cpu_time, i);
-  timing_wheel_validate (w);
-  tm->events[i] = cpu_time;
-}
-
-static int
-test_timing_wheel_tmp_cmp (void *a1, void *a2)
-{
-  test_timing_wheel_tmp_t *f1 = a1;
-  test_timing_wheel_tmp_t *f2 = a2;
-
-  return f1->dt < f2->dt ? -1 : (f1->dt > f2->dt ? +1 : 0);
-}
-
-clib_error_t *
-test_timing_wheel_main (unformat_input_t * input)
-{
-  clib_error_t *error = 0;
-  test_timing_wheel_main_t _tm, *tm = &_tm;
-  timing_wheel_t *w = &tm->timing_wheel;
-  uword iter, i;
-
-  memset (tm, 0, sizeof (tm[0]));
-  tm->n_iter = 10;
-  tm->time_per_status_update = 0;
-  tm->n_events = 100;
-  tm->seed = 1;
-  tm->synthetic_time = 1;
-  tm->max_time = 1;
-  tm->wait_time = 1e-3;
-
-  w->validate = 0;
-  w->n_wheel_elt_time_bits = 32;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "iter %wd", &tm->n_iter))
-	;
-      else if (unformat (input, "events %d", &tm->n_events))
-	;
-      else
-	if (unformat (input, "elt-time-bits %d", &w->n_wheel_elt_time_bits))
-	;
-      else if (unformat (input, "seed %d", &tm->seed))
-	;
-      else if (unformat (input, "verbose"))
-	tm->verbose = 1;
-      else if (unformat (input, "validate"))
-	w->validate = 1;
-
-      else if (unformat (input, "real-time"))
-	tm->synthetic_time = 0;
-      else if (unformat (input, "synthetic-time"))
-	tm->synthetic_time = 1;
-      else if (unformat (input, "max-time %f", &tm->max_time))
-	;
-      else if (unformat (input, "wait-time %f", &tm->wait_time))
-	;
-      else if (unformat (input, "iter-time %f", &tm->total_iterate_time))
-	;
-      else if (unformat (input, "print %f", &tm->time_per_status_update))
-	;
-
-      else
-	{
-	  error = clib_error_create ("unknown input `%U'\n",
-				     format_unformat_error, input);
-	  goto done;
-	}
-    }
-
-  if (!tm->seed)
-    tm->seed = random_default_seed ();
-
-  clib_time_init (&tm->time);
-
-  if (tm->synthetic_time)
-    {
-      w->min_sched_time = tm->time.seconds_per_clock;
-      w->max_sched_time = w->min_sched_time * 256;
-      timing_wheel_init (w, 0, tm->time.clocks_per_second);
-    }
-  else
-    {
-      timing_wheel_init (w, clib_cpu_time_now (), tm->time.clocks_per_second);
-    }
-
-  clib_warning ("iter %wd, events %d, seed %u, %U",
-		tm->n_iter, tm->n_events, tm->seed,
-		format_timing_wheel, &tm->timing_wheel, /* verbose */ 0);
-
-  /* Make some events. */
-  vec_resize (tm->events, tm->n_events);
-  for (i = 0; i < vec_len (tm->events); i++)
-    set_event (tm, i);
-
-  {
-    u32 *expired = 0;
-    f64 ave_error = 0;
-    f64 rms_error = 0;
-    f64 max_error = 0, min_error = 1e30;
-    u32 *error_hist = 0;
-    uword n_expired = 0;
-    uword *expired_bitmap[2] = { 0 };
-    uword n_events_in_wheel = vec_len (tm->events);
-
-    vec_resize (expired, 32);
-    vec_resize (error_hist, 1024);
-
-    tm->time_iterate_start = clib_time_now (&tm->time);
-    tm->time_next_status_update =
-      tm->time_iterate_start + tm->time_per_status_update;
-
-    if (tm->total_iterate_time != 0)
-      tm->n_iter = ~0;
-
-    for (iter = 0; iter < tm->n_iter || n_events_in_wheel > 0; iter++)
-      {
-	u64 cpu_time, min_next_time[2];
-
-	if (tm->synthetic_time)
-	  cpu_time = iter << w->log2_clocks_per_bin;
-	else
-	  cpu_time = clib_cpu_time_now ();
-
-	_vec_len (expired) = 0;
-	expired =
-	  timing_wheel_advance (w, cpu_time, expired, &min_next_time[0]);
-	timing_wheel_validate (w);
-
-	/* Update bitmap of expired events. */
-	if (w->validate)
-	  {
-	    for (i = 0; i < vec_len (tm->events); i++)
-	      {
-		uword is_expired;
-
-		is_expired =
-		  (cpu_time >> w->log2_clocks_per_bin) >=
-		  (tm->events[i] >> w->log2_clocks_per_bin);
-		expired_bitmap[0] =
-		  clib_bitmap_set (expired_bitmap[0], i, is_expired);
-
-		/* Validate min next time. */
-		if (is_expired)
-		  ASSERT (min_next_time[0] > tm->events[i]);
-		else
-		  ASSERT (min_next_time[0] <= tm->events[i]);
-	      }
-	  }
-
-	n_expired += vec_len (expired);
-	for (i = 0; i < vec_len (expired); i++)
-	  {
-	    word j, idt;
-	    i64 dt_cpu;
-	    f64 fdt_cpu;
-
-	    j = expired[i];
-	    expired_bitmap[1] = clib_bitmap_ori (expired_bitmap[1], j);
-
-	    dt_cpu = cpu_time - tm->events[j];
-
-	    /* Event must be scheduled in correct bin. */
-	    if (tm->synthetic_time)
-	      ASSERT (dt_cpu >= 0 && dt_cpu <= (1 << w->log2_clocks_per_bin));
-
-	    fdt_cpu = dt_cpu * tm->time.seconds_per_clock;
-
-	    ave_error += fdt_cpu;
-	    rms_error += fdt_cpu * fdt_cpu;
-
-	    if (fdt_cpu > max_error)
-	      max_error = fdt_cpu;
-	    if (fdt_cpu < min_error)
-	      min_error = fdt_cpu;
-
-	    idt =
-	      (cpu_time >> w->log2_clocks_per_bin) -
-	      (tm->events[j] >> w->log2_clocks_per_bin);
-	    idt = zvec_signed_to_unsigned (idt);
-	    vec_validate (error_hist, idt);
-	    error_hist[idt] += 1;
-	  }
-
-	if (w->validate)
-	  for (i = 0; i < vec_len (tm->events); i++)
-	    {
-	      int is_expired = clib_bitmap_get (expired_bitmap[0], i);
-	      int is_expired_w = clib_bitmap_get (expired_bitmap[1], i);
-	      ASSERT (is_expired == is_expired_w);
-	    }
-
-	min_next_time[1] = ~0;
-	for (i = 0; i < vec_len (tm->events); i++)
-	  {
-	    if (!clib_bitmap_get (expired_bitmap[1], i))
-	      min_next_time[1] = clib_min (min_next_time[1], tm->events[i]);
-	  }
-	if (min_next_time[0] != min_next_time[1])
-	  clib_error ("min next time wrong 0x%Lx != 0x%Lx", min_next_time[0],
-		      min_next_time[1]);
-
-	if (tm->time_per_status_update != 0
-	    && clib_time_now (&tm->time) >= tm->time_next_status_update)
-	  {
-	    f64 ave = 0, rms = 0;
-
-	    tm->time_next_status_update += tm->time_per_status_update;
-	    if (n_expired > 0)
-	      {
-		ave = ave_error / n_expired;
-		rms = SQRT (rms_error / n_expired - ave * ave);
-	      }
-
-	    clib_warning
-	      ("%12wd iter done %10wd expired; ave. error %.4e +- %.4e, range %.4e %.4e",
-	       iter, n_expired, ave, rms, min_error, max_error);
-	  }
-
-	if (tm->total_iterate_time != 0
-	    && (clib_time_now (&tm->time) - tm->time_iterate_start
-		>= tm->total_iterate_time))
-	  tm->n_iter = iter;
-
-	/* Add new events to wheel to replace expired ones. */
-	n_events_in_wheel -= vec_len (expired);
-	if (iter < tm->n_iter)
-	  {
-	    for (i = 0; i < vec_len (expired); i++)
-	      {
-		uword j = expired[i];
-		set_event (tm, j);
-		expired_bitmap[1] =
-		  clib_bitmap_andnoti (expired_bitmap[1], j);
-	      }
-	    n_events_in_wheel += vec_len (expired);
-	  }
-      }
-
-    ave_error /= n_expired;
-    rms_error = SQRT (rms_error / n_expired - ave_error * ave_error);
-
-    clib_warning
-      ("%wd iter done %wd expired; ave. error %.4e +- %.4e, range %.4e %.4e",
-       1 + iter, n_expired, ave_error, rms_error, min_error, max_error);
-
-    {
-      test_timing_wheel_tmp_t *fs, *f;
-      f64 total_fraction;
-
-      fs = 0;
-      for (i = 0; i < vec_len (error_hist); i++)
-	{
-	  if (error_hist[i] == 0)
-	    continue;
-	  vec_add2 (fs, f, 1);
-	  f->dt =
-	    (((i64) zvec_unsigned_to_signed (i) << w->log2_clocks_per_bin) *
-	     tm->time.seconds_per_clock);
-	  f->fraction = (f64) error_hist[i] / (f64) n_expired;
-	  f->count = error_hist[i];
-	}
-
-      vec_sort_with_function (fs, test_timing_wheel_tmp_cmp);
-
-      total_fraction = 0;
-      vec_foreach (f, fs)
-      {
-	total_fraction += f->fraction;
-	if (f == fs)
-	  fformat (stdout, "%=12s %=16s %=16s %s\n", "Error max", "Fraction",
-		   "Total", "Count");
-	fformat (stdout, "%12.4e %16.4f%% %16.4f%% %Ld\n", f->dt,
-		 f->fraction * 100, total_fraction * 100, f->count);
-      }
-    }
-
-    clib_warning ("%U", format_timing_wheel, w, /* verbose */ 1);
-  }
-
-done:
-  return error;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  clib_error_t *error;
-
-  unformat_init_command_line (&i, argv);
-  error = test_timing_wheel_main (&i);
-  unformat_free (&i);
-  if (error)
-    {
-      clib_error_report (error);
-      return 1;
-    }
-  else
-    return 0;
-}
-#endif /* CLIB_UNIX */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_vec.c b/vppinfra/vppinfra/test_vec.c
deleted file mode 100644
index f0497ac6..00000000
--- a/vppinfra/vppinfra/test_vec.c
+++ /dev/null
@@ -1,1159 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-  Written by Fred Delley <fdelley@cisco.com> .
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifdef CLIB_LINUX_KERNEL
-#include <linux/unistd.h>
-#endif
-
-#ifdef CLIB_UNIX
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#endif
-
-#include <vppinfra/clib.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/format.h>
-#include <vppinfra/error.h>
-#include <vppinfra/random.h>
-#include <vppinfra/time.h>
-
-#include "test_vec.h"
-
-static int verbose;
-#define if_verbose(format,args...) \
-  if (verbose) { clib_warning(format, ## args); }
-
-#define MAX_CHANGE 100
-
-
-typedef enum
-{
-  /* Values have to be sequential and start with 0. */
-  OP_IS_VEC_RESIZE = 0,
-  OP_IS_VEC_ADD1,
-  OP_IS_VEC_ADD2,
-  OP_IS_VEC_ADD,
-  OP_IS_VEC_INSERT,
-  OP_IS_VEC_INSERT_ELTS,
-  OP_IS_VEC_DELETE,
-  OP_IS_VEC_DUP,
-  OP_IS_VEC_IS_EQUAL,
-  OP_IS_VEC_ZERO,
-  OP_IS_VEC_SET,
-  OP_IS_VEC_VALIDATE,
-  OP_IS_VEC_FREE,
-  OP_IS_VEC_INIT,
-  OP_IS_VEC_CLONE,
-  OP_IS_VEC_APPEND,
-  OP_IS_VEC_PREPEND,
-  /* Operations on vectors with custom headers. */
-  OP_IS_VEC_INIT_H,
-  OP_IS_VEC_RESIZE_H,
-  OP_IS_VEC_FREE_H,
-  OP_MAX,
-} op_t;
-
-#define FIRST_VEC_OP		OP_IS_VEC_RESIZE
-#define LAST_VEC_OP		OP_IS_VEC_PREPEND
-#define FIRST_VEC_HDR_OP	OP_IS_VEC_INIT_H
-#define LAST_VEC_HDR_OP		OP_IS_VEC_FREE_H
-
-uword g_prob_ratio[] = {
-  [OP_IS_VEC_RESIZE] = 5,
-  [OP_IS_VEC_ADD1] = 5,
-  [OP_IS_VEC_ADD2] = 5,
-  [OP_IS_VEC_ADD] = 5,
-  [OP_IS_VEC_INSERT] = 5,
-  [OP_IS_VEC_INSERT_ELTS] = 5,
-  [OP_IS_VEC_DELETE] = 30,
-  [OP_IS_VEC_DUP] = 5,
-  [OP_IS_VEC_IS_EQUAL] = 5,
-  [OP_IS_VEC_ZERO] = 2,
-  [OP_IS_VEC_SET] = 3,
-  [OP_IS_VEC_VALIDATE] = 5,
-  [OP_IS_VEC_FREE] = 5,
-  [OP_IS_VEC_INIT] = 5,
-  [OP_IS_VEC_CLONE] = 5,
-  [OP_IS_VEC_APPEND] = 5,
-  [OP_IS_VEC_PREPEND] = 5,
-  /* Operations on vectors with custom headers. */
-  [OP_IS_VEC_INIT_H] = 5,
-  [OP_IS_VEC_RESIZE_H] = 5,
-  [OP_IS_VEC_FREE_H] = 5,
-};
-
-op_t *g_prob;
-op_t *g_prob_wh;
-
-uword g_call_stats[OP_MAX];
-
-
-/* A structure for both vector headers and vector elements might be useful to
-   uncover potential alignement issues. */
-
-typedef struct
-{
-  u8 field1[4];
-    CLIB_PACKED (u32 field2);
-} hdr_t;
-
-typedef struct
-{
-  u8 field1[3];
-    CLIB_PACKED (u32 field2);
-} elt_t;
-
-#ifdef CLIB_UNIX
-u32 g_seed = 0xdeadbabe;
-uword g_verbose = 1;
-#endif
-
-op_t *g_op_prob;
-uword g_set_verbose_at = ~0;
-uword g_dump_period = ~0;
-
-
-static u8 *
-format_vec_op_type (u8 * s, va_list * args)
-{
-  op_t op = va_arg (*args, int);
-
-  switch (op)
-    {
-#define _(n)					\
-      case OP_IS_##n:				\
-	s = format (s, "OP_IS_" #n);		\
-	break;
-
-      _(VEC_RESIZE);
-      _(VEC_ADD1);
-      _(VEC_ADD2);
-      _(VEC_ADD);
-      _(VEC_INSERT);
-      _(VEC_INSERT_ELTS);
-      _(VEC_DELETE);
-      _(VEC_DUP);
-      _(VEC_IS_EQUAL);
-      _(VEC_ZERO);
-      _(VEC_SET);
-      _(VEC_VALIDATE);
-      _(VEC_FREE);
-      _(VEC_INIT);
-      _(VEC_CLONE);
-      _(VEC_APPEND);
-      _(VEC_PREPEND);
-      _(VEC_INIT_H);
-      _(VEC_RESIZE_H);
-      _(VEC_FREE_H);
-
-    default:
-      s = format (s, "Unknown vec op (%d)", op);
-      break;
-    }
-
-#undef _
-
-  return s;
-}
-
-static void
-dump_call_stats (uword * stats)
-{
-  uword i;
-
-  fformat (stdout, "Call Stats\n----------\n");
-
-  for (i = 0; i < OP_MAX; i++)
-    fformat (stdout, "%-8d %U\n", stats[i], format_vec_op_type, i);
-}
-
-
-/* XXX - Purposely low value for debugging the validator. Will be set it to a
-   more sensible value later. */
-#define MAX_VEC_LEN 10
-
-#define create_random_vec_wh(elt_type, len, hdr_bytes, seed)			\
-({										\
-  elt_type * _v(v) = NULL;							\
-  uword _v(l) = (len);								\
-  uword _v(h) = (hdr_bytes);							\
-  u8 * _v(hdr);									\
-										\
-  if (_v(l) == 0)								\
-    goto __done__;								\
-										\
-  /* ~0 means select random length between 0 and MAX_VEC_LEN. */		\
-  if (_v(l) == ~0)								\
-    _v(l) = bounded_random_u32 (&(seed), 0, MAX_VEC_LEN);			\
-										\
-  _v(v) = _vec_resize (NULL, _v(l), _v(l) * sizeof (elt_type), _v(h), 0);	\
-  fill_with_random_data (_v(v), vec_bytes (_v(v)), (seed));			\
-										\
-  /* Fill header with random data as well. */					\
-  if (_v(h) > 0)								\
-    {										\
-      _v(hdr) = vec_header (_v(v), _v(h));					\
-      fill_with_random_data (_v(hdr), _v(h), (seed));				\
-    }										\
-										\
-__done__:									\
-  _v(v);									\
-})
-
-#define create_random_vec(elt_type, len, seed) \
-create_random_vec_wh (elt_type, len, 0, seed)
-
-#define compute_vec_hash(hash, vec)			\
-({							\
-  u8 * _v(v) = (u8 *) (vec);				\
-  uword _v(n) = vec_len (vec) * sizeof ((vec)[0]);	\
-  u8 _v(hh) = (u8) (hash);				\
-							\
-  compute_mem_hash (_v(hh), _v(v), _v(n));		\
-})
-
-static elt_t *
-validate_vec_free (elt_t * vec)
-{
-  vec_free (vec);
-  ASSERT (vec == NULL);
-  return vec;
-}
-
-static elt_t *
-validate_vec_free_h (elt_t * vec, uword hdr_bytes)
-{
-  vec_free_h (vec, hdr_bytes);
-  ASSERT (vec == NULL);
-  return vec;
-}
-
-static void
-validate_vec_hdr (elt_t * vec, uword hdr_bytes)
-{
-  u8 *hdr;
-  u8 *hdr_end;
-  vec_header_t *vh;
-
-  if (!vec)
-    return;
-
-  vh = _vec_find (vec);
-  hdr = vec_header (vec, hdr_bytes);
-  hdr_end = vec_header_end (hdr, hdr_bytes);
-
-  ASSERT (hdr_end == (u8 *) vec);
-  ASSERT ((u8 *) vh - (u8 *) hdr >= hdr_bytes);
-}
-
-static void
-validate_vec_len (elt_t * vec)
-{
-  u8 *ptr;
-  u8 *end;
-  uword len;
-  uword bytes;
-  uword i;
-  elt_t *elt;
-
-  if (!vec)
-    return;
-
-  ptr = (u8 *) vec;
-  end = (u8 *) vec_end (vec);
-  len = vec_len (vec);
-  bytes = sizeof (vec[0]) * len;
-
-  ASSERT (bytes == vec_bytes (vec));
-  ASSERT ((ptr + bytes) == end);
-
-  i = 0;
-
-  /* XXX - TODO: confirm that auto-incrementing in vec_is_member() would not
-     have the expected result. */
-  while (vec_is_member (vec, (__typeof__ (vec[0]) *) ptr))
-    {
-      ptr++;
-      i++;
-    }
-
-  ASSERT (ptr == end);
-  ASSERT (i == bytes);
-
-  i = 0;
-
-  vec_foreach (elt, vec) i++;
-
-  ASSERT (i == len);
-}
-
-static void
-validate_vec (elt_t * vec, uword hdr_bytes)
-{
-  validate_vec_hdr (vec, hdr_bytes);
-  validate_vec_len (vec);
-
-  if (!vec || vec_len (vec) == 0)
-    {
-      VERBOSE3 ("Vector at %p has zero elements.\n\n", vec);
-    }
-  else
-    {
-      if (hdr_bytes > 0)
-	VERBOSE3 ("Header: %U\n",
-		  format_hex_bytes, vec_header (vec, sizeof (vec[0])),
-		  sizeof (vec[0]));
-
-      VERBOSE3 ("%U\n\n",
-		format_hex_bytes, vec, vec_len (vec) * sizeof (vec[0]));
-    }
-}
-
-static elt_t *
-validate_vec_resize (elt_t * vec, uword num_elts)
-{
-  uword len1 = vec_len (vec);
-  uword len2;
-  u8 hash = compute_vec_hash (0, vec);
-
-  vec_resize (vec, num_elts);
-  len2 = vec_len (vec);
-
-  ASSERT (len2 == len1 + num_elts);
-  ASSERT (compute_vec_hash (hash, vec) == 0);
-  validate_vec (vec, 0);
-  return vec;
-}
-
-static elt_t *
-validate_vec_resize_h (elt_t * vec, uword num_elts, uword hdr_bytes)
-{
-  uword len1, len2;
-  u8 *end1, *end2;
-  u8 *hdr = NULL;
-  u8 hash, hdr_hash;
-
-  len1 = vec_len (vec);
-
-  if (vec)
-    hdr = vec_header (vec, hdr_bytes);
-
-  hash = compute_vec_hash (0, vec);
-  hdr_hash = compute_mem_hash (0, hdr, hdr_bytes);
-
-  vec_resize_ha (vec, num_elts, hdr_bytes, 0);
-  len2 = vec_len (vec);
-
-  ASSERT (len2 == len1 + num_elts);
-
-  end1 = (u8 *) (vec + len1);
-  end2 = (u8 *) vec_end (vec);
-
-  while (end1 != end2)
-    {
-      ASSERT (*end1 == 0);
-      end1++;
-    }
-
-  if (vec)
-    hdr = vec_header (vec, hdr_bytes);
-
-  ASSERT (compute_vec_hash (hash, vec) == 0);
-  ASSERT (compute_mem_hash (hdr_hash, hdr, hdr_bytes) == 0);
-  validate_vec (vec, 1);
-  return vec;
-}
-
-static elt_t *
-generic_validate_vec_add (elt_t * vec, uword num_elts, uword is_add2)
-{
-  uword len1 = vec_len (vec);
-  uword len2;
-  u8 hash = compute_vec_hash (0, vec);
-  elt_t *new;
-
-  if (is_add2)
-    {
-      vec_add2 (vec, new, num_elts);
-    }
-  else
-    {
-      new = create_random_vec (elt_t, num_elts, g_seed);
-
-      VERBOSE3 ("%U\n", format_hex_bytes, new,
-		vec_len (new) * sizeof (new[0]));
-
-      /* Add the hash value of the new elements to that of the old vector. */
-      hash = compute_vec_hash (hash, new);
-
-      if (num_elts == 1)
-	vec_add1 (vec, new[0]);
-      else if (num_elts > 1)
-	vec_add (vec, new, num_elts);
-
-      vec_free (new);
-    }
-
-  len2 = vec_len (vec);
-  ASSERT (len2 == len1 + num_elts);
-
-  ASSERT (compute_vec_hash (hash, vec) == 0);
-  validate_vec (vec, 0);
-  return vec;
-}
-
-static elt_t *
-validate_vec_add1 (elt_t * vec)
-{
-  return generic_validate_vec_add (vec, 1, 0);
-}
-
-static elt_t *
-validate_vec_add2 (elt_t * vec, uword num_elts)
-{
-  return generic_validate_vec_add (vec, num_elts, 1);
-}
-
-static elt_t *
-validate_vec_add (elt_t * vec, uword num_elts)
-{
-  return generic_validate_vec_add (vec, num_elts, 0);
-}
-
-static elt_t *
-validate_vec_insert (elt_t * vec, uword num_elts, uword start_elt)
-{
-  uword len1 = vec_len (vec);
-  uword len2;
-  u8 hash;
-
-  /* vec_insert() would not handle it properly. */
-  if (start_elt > len1 || num_elts == 0)
-    return vec;
-
-  hash = compute_vec_hash (0, vec);
-  vec_insert (vec, num_elts, start_elt);
-  len2 = vec_len (vec);
-
-  ASSERT (len2 == len1 + num_elts);
-  ASSERT (compute_vec_hash (hash, vec) == 0);
-  validate_vec (vec, 0);
-  return vec;
-}
-
-static elt_t *
-validate_vec_insert_elts (elt_t * vec, uword num_elts, uword start_elt)
-{
-  uword len1 = vec_len (vec);
-  uword len2;
-  elt_t *new;
-  u8 hash;
-
-  /* vec_insert_elts() would not handle it properly. */
-  if (start_elt > len1 || num_elts == 0)
-    return vec;
-
-  new = create_random_vec (elt_t, num_elts, g_seed);
-
-  VERBOSE3 ("%U\n", format_hex_bytes, new, vec_len (new) * sizeof (new[0]));
-
-  /* Add the hash value of the new elements to that of the old vector. */
-  hash = compute_vec_hash (0, vec);
-  hash = compute_vec_hash (hash, new);
-
-  vec_insert_elts (vec, new, num_elts, start_elt);
-  len2 = vec_len (vec);
-
-  vec_free (new);
-
-  ASSERT (len2 == len1 + num_elts);
-  ASSERT (compute_vec_hash (hash, vec) == 0);
-  validate_vec (vec, 0);
-  return vec;
-}
-
-static elt_t *
-validate_vec_delete (elt_t * vec, uword num_elts, uword start_elt)
-{
-  uword len1 = vec_len (vec);
-  uword len2;
-  u8 *start;
-  u8 hash;
-  u8 hash_del;
-
-  /* vec_delete() would not handle it properly. */
-  if (start_elt + num_elts > len1)
-    return vec;
-
-  start = (u8 *) vec + (start_elt * sizeof (vec[0]));
-
-  hash = compute_vec_hash (0, vec);
-  hash_del = compute_mem_hash (0, start, num_elts * sizeof (vec[0]));
-  hash ^= hash_del;
-
-  vec_delete (vec, num_elts, start_elt);
-  len2 = vec_len (vec);
-
-  ASSERT (len2 == len1 - num_elts);
-  ASSERT (compute_vec_hash (hash, vec) == 0);
-  validate_vec (vec, 0);
-  return vec;
-}
-
-static elt_t *
-validate_vec_dup (elt_t * vec)
-{
-  elt_t *new;
-  u8 hash;
-
-  hash = compute_vec_hash (0, vec);
-  new = vec_dup (vec);
-
-  ASSERT (compute_vec_hash (hash, new) == 0);
-
-  validate_vec (new, 0);
-  return new;
-}
-
-static elt_t *
-validate_vec_zero (elt_t * vec)
-{
-  u8 *ptr;
-  u8 *end;
-
-  vec_zero (vec);
-
-  ptr = (u8 *) vec;
-  end = (u8 *) (vec + vec_len (vec));
-
-  while (ptr != end)
-    {
-      ASSERT (ptr < (u8 *) vec_end (vec));
-      ASSERT (ptr[0] == 0);
-      ptr++;
-    }
-
-  validate_vec (vec, 0);
-  return vec;
-}
-
-static void
-validate_vec_is_equal (elt_t * vec)
-{
-  elt_t *new = NULL;
-
-  if (vec_len (vec) <= 0)
-    return;
-
-  new = vec_dup (vec);
-  ASSERT (vec_is_equal (new, vec));
-  vec_free (new);
-}
-
-static elt_t *
-validate_vec_set (elt_t * vec)
-{
-  uword i;
-  uword len = vec_len (vec);
-  elt_t *new;
-
-  if (!vec)
-    return NULL;
-
-  new = create_random_vec (elt_t, 1, g_seed);
-
-  VERBOSE3 ("%U\n", format_hex_bytes, new, vec_len (new) * sizeof (new[0]));
-
-  vec_set (vec, new[0]);
-
-  for (i = 0; i < len; i++)
-    ASSERT (memcmp (&vec[i], &new[0], sizeof (vec[0])) == 0);
-
-  vec_free (new);
-  validate_vec (vec, 0);
-  return vec;
-}
-
-static elt_t *
-validate_vec_validate (elt_t * vec, uword index)
-{
-  uword len = vec_len (vec);
-  word num_new = index - len + 1;
-  u8 *ptr;
-  u8 *end;
-  u8 hash = compute_vec_hash (0, vec);
-
-  if (num_new < 0)
-    num_new = 0;
-
-  vec_validate (vec, index);
-
-  /* Old len but new vec pointer! */
-  ptr = (u8 *) (vec + len);
-  end = (u8 *) (vec + len + num_new);
-
-  ASSERT (len + num_new == vec_len (vec));
-  ASSERT (compute_vec_hash (hash, vec) == 0);
-
-  while (ptr != end)
-    {
-      ASSERT (ptr < (u8 *) vec_end (vec));
-      ASSERT (ptr[0] == 0);
-      ptr++;
-    }
-
-  validate_vec (vec, 0);
-  return vec;
-}
-
-static elt_t *
-validate_vec_init (uword num_elts)
-{
-  u8 *ptr;
-  u8 *end;
-  uword len;
-  elt_t *new;
-
-  new = vec_new (elt_t, num_elts);
-  len = vec_len (new);
-
-  ASSERT (len == num_elts);
-
-  ptr = (u8 *) new;
-  end = (u8 *) (new + len);
-
-  while (ptr != end)
-    {
-      ASSERT (ptr < (u8 *) vec_end (new));
-      ASSERT (ptr[0] == 0);
-      ptr++;
-    }
-
-  validate_vec (new, 0);
-  return new;
-}
-
-static elt_t *
-validate_vec_init_h (uword num_elts, uword hdr_bytes)
-{
-  uword i = 0;
-  u8 *ptr;
-  u8 *end;
-  uword len;
-  elt_t *new;
-
-  new = vec_new_ha (elt_t, num_elts, hdr_bytes, 0);
-  len = vec_len (new);
-
-  ASSERT (len == num_elts);
-
-  /* We have 2 zero-regions to check: header & vec data (skip _VEC struct). */
-  for (i = 0; i < 2; i++)
-    {
-      if (i == 0)
-	{
-	  ptr = (u8 *) vec_header (new, hdr_bytes);
-	  end = ptr + hdr_bytes;
-	}
-      else
-	{
-	  ptr = (u8 *) new;
-	  end = (u8 *) (new + len);
-	}
-
-      while (ptr != end)
-	{
-	  ASSERT (ptr < (u8 *) vec_end (new));
-	  ASSERT (ptr[0] == 0);
-	  ptr++;
-	}
-    }
-
-  validate_vec (new, 1);
-  return new;
-}
-
-/* XXX - I don't understand the purpose of the vec_clone() call. */
-static elt_t *
-validate_vec_clone (elt_t * vec)
-{
-  elt_t *new;
-
-  vec_clone (new, vec);
-
-  ASSERT (vec_len (new) == vec_len (vec));
-  ASSERT (compute_vec_hash (0, new) == 0);
-  validate_vec (new, 0);
-  return new;
-}
-
-static elt_t *
-validate_vec_append (elt_t * vec)
-{
-  elt_t *new;
-  uword num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
-  uword len;
-  u8 hash = 0;
-
-  new = create_random_vec (elt_t, num_elts, g_seed);
-
-  len = vec_len (vec) + vec_len (new);
-  hash = compute_vec_hash (0, vec);
-  hash = compute_vec_hash (hash, new);
-
-  vec_append (vec, new);
-  vec_free (new);
-
-  ASSERT (vec_len (vec) == len);
-  ASSERT (compute_vec_hash (hash, vec) == 0);
-  validate_vec (vec, 0);
-  return vec;
-}
-
-static elt_t *
-validate_vec_prepend (elt_t * vec)
-{
-  elt_t *new;
-  uword num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
-  uword len;
-  u8 hash = 0;
-
-  new = create_random_vec (elt_t, num_elts, g_seed);
-
-  len = vec_len (vec) + vec_len (new);
-  hash = compute_vec_hash (0, vec);
-  hash = compute_vec_hash (hash, new);
-
-  vec_prepend (vec, new);
-  vec_free (new);
-
-  ASSERT (vec_len (vec) == len);
-  ASSERT (compute_vec_hash (hash, vec) == 0);
-  validate_vec (vec, 0);
-  return vec;
-}
-
-static void
-run_validator_wh (uword iter)
-{
-  elt_t *vec;
-  uword i;
-  uword op;
-  uword num_elts;
-  uword len;
-  uword dump_time;
-  f64 time[3];			/* [0]: start, [1]: last, [2]: current */
-
-  vec = create_random_vec_wh (elt_t, ~0, sizeof (hdr_t), g_seed);
-  validate_vec (vec, 0);
-  VERBOSE2 ("Start with len %d\n", vec_len (vec));
-
-  time[0] = unix_time_now ();
-  time[1] = time[0];
-  dump_time = g_dump_period;
-
-  for (i = 1; i <= iter; i++)
-    {
-      if (i >= g_set_verbose_at)
-	g_verbose = 2;
-
-      op = bounded_random_u32 (&g_seed, 0, vec_len (g_prob_wh) - 1);
-      op = g_prob_wh[op];
-
-      switch (op)
-	{
-	case OP_IS_VEC_INIT_H:
-	  num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
-	  vec_free_h (vec, sizeof (hdr_t));
-	  VERBOSE2 ("vec_init_h(), new elts %d\n", num_elts);
-	  vec = validate_vec_init_h (num_elts, sizeof (hdr_t));
-	  break;
-
-	case OP_IS_VEC_RESIZE_H:
-	  len = vec_len (vec);
-	  num_elts = bounded_random_u32 (&g_seed, len, len + MAX_CHANGE);
-	  VERBOSE2 ("vec_resize_h(), %d new elts.\n", num_elts);
-	  vec = validate_vec_resize_h (vec, num_elts, sizeof (hdr_t));
-	  break;
-
-	case OP_IS_VEC_FREE_H:
-	  VERBOSE2 ("vec_free_h()\n");
-	  vec = validate_vec_free_h (vec, sizeof (hdr_t));
-	  break;
-
-	default:
-	  ASSERT (0);
-	  break;
-	}
-
-      g_call_stats[op]++;
-
-      if (i == dump_time)
-	{
-	  time[2] = unix_time_now ();
-	  VERBOSE1 ("%d vec ops in %f secs. (last %d in %f secs.).\n",
-		    i, time[2] - time[0], g_dump_period, time[2] - time[1]);
-	  time[1] = time[2];
-	  dump_time += g_dump_period;
-
-	  VERBOSE1 ("vec len %d\n", vec_len (vec));
-	  VERBOSE2 ("%U\n\n",
-		    format_hex_bytes, vec, vec_len (vec) * sizeof (vec[0]));
-	}
-
-      VERBOSE2 ("len %d\n", vec_len (vec));
-    }
-
-  validate_vec (vec, sizeof (hdr_t));
-  vec_free_h (vec, sizeof (hdr_t));
-}
-
-static void
-run_validator (uword iter)
-{
-  elt_t *vec;
-  elt_t *new;
-  uword i;
-  uword op;
-  uword num_elts;
-  uword index;
-  uword len;
-  uword dump_time;
-  f64 time[3];			/* [0]: start, [1]: last, [2]: current */
-
-  vec = create_random_vec (elt_t, ~0, g_seed);
-  validate_vec (vec, 0);
-  VERBOSE2 ("Start with len %d\n", vec_len (vec));
-
-  time[0] = unix_time_now ();
-  time[1] = time[0];
-  dump_time = g_dump_period;
-
-  for (i = 1; i <= iter; i++)
-    {
-      if (i >= g_set_verbose_at)
-	g_verbose = 2;
-
-      op = bounded_random_u32 (&g_seed, 0, vec_len (g_prob) - 1);
-      op = g_prob[op];
-
-      switch (op)
-	{
-	case OP_IS_VEC_RESIZE:
-	  len = vec_len (vec);
-	  num_elts = bounded_random_u32 (&g_seed, len, len + MAX_CHANGE);
-	  VERBOSE2 ("vec_resize(), %d new elts.\n", num_elts);
-	  vec = validate_vec_resize (vec, num_elts);
-	  break;
-
-	case OP_IS_VEC_ADD1:
-	  VERBOSE2 ("vec_add1()\n");
-	  vec = validate_vec_add1 (vec);
-	  break;
-
-	case OP_IS_VEC_ADD2:
-	  num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
-	  VERBOSE2 ("vec_add2(), %d new elts.\n", num_elts);
-	  vec = validate_vec_add2 (vec, num_elts);
-	  break;
-
-	case OP_IS_VEC_ADD:
-	  num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
-	  VERBOSE2 ("vec_add(), %d new elts.\n", num_elts);
-	  vec = validate_vec_add (vec, num_elts);
-	  break;
-
-	case OP_IS_VEC_INSERT:
-	  len = vec_len (vec);
-	  num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
-	  index = bounded_random_u32 (&g_seed, 0,
-				      (len > 0) ? (len - 1) : (0));
-	  VERBOSE2 ("vec_insert(), %d new elts, index %d.\n", num_elts,
-		    index);
-	  vec = validate_vec_insert (vec, num_elts, index);
-	  break;
-
-	case OP_IS_VEC_INSERT_ELTS:
-	  len = vec_len (vec);
-	  num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
-	  index = bounded_random_u32 (&g_seed, 0,
-				      (len > 0) ? (len - 1) : (0));
-	  VERBOSE2 ("vec_insert_elts(), %d new elts, index %d.\n",
-		    num_elts, index);
-	  vec = validate_vec_insert_elts (vec, num_elts, index);
-	  break;
-
-	case OP_IS_VEC_DELETE:
-	  len = vec_len (vec);
-	  index = bounded_random_u32 (&g_seed, 0, len - 1);
-	  num_elts = bounded_random_u32 (&g_seed, 0,
-					 (len > index) ? (len - index) : (0));
-	  VERBOSE2 ("vec_delete(), %d elts, index %d.\n", num_elts, index);
-	  vec = validate_vec_delete (vec, num_elts, index);
-	  break;
-
-	case OP_IS_VEC_DUP:
-	  VERBOSE2 ("vec_dup()\n");
-	  new = validate_vec_dup (vec);
-	  vec_free (new);
-	  break;
-
-	case OP_IS_VEC_IS_EQUAL:
-	  VERBOSE2 ("vec_is_equal()\n");
-	  validate_vec_is_equal (vec);
-	  break;
-
-	case OP_IS_VEC_ZERO:
-	  VERBOSE2 ("vec_zero()\n");
-	  vec = validate_vec_zero (vec);
-	  break;
-
-	case OP_IS_VEC_SET:
-	  VERBOSE2 ("vec_set()\n");
-	  vec = validate_vec_set (vec);
-	  break;
-
-	case OP_IS_VEC_VALIDATE:
-	  len = vec_len (vec);
-	  index = bounded_random_u32 (&g_seed, 0, len - 1 + MAX_CHANGE);
-	  VERBOSE2 ("vec_validate(), index %d\n", index);
-	  vec = validate_vec_validate (vec, index);
-	  break;
-
-	case OP_IS_VEC_FREE:
-	  VERBOSE2 ("vec_free()\n");
-	  vec = validate_vec_free (vec);
-	  break;
-
-	case OP_IS_VEC_INIT:
-	  num_elts = bounded_random_u32 (&g_seed, 0, MAX_CHANGE);
-	  vec_free (vec);
-	  VERBOSE2 ("vec_init(), new elts %d\n", num_elts);
-	  vec = validate_vec_init (num_elts);
-	  break;
-
-	case OP_IS_VEC_CLONE:
-	  VERBOSE2 ("vec_clone()\n");
-	  new = validate_vec_clone (vec);
-	  vec_free (new);
-	  break;
-
-	case OP_IS_VEC_APPEND:
-	  VERBOSE2 ("vec_append()\n");
-	  vec = validate_vec_append (vec);
-	  break;
-
-	case OP_IS_VEC_PREPEND:
-	  VERBOSE2 ("vec_prepend()\n");
-	  vec = validate_vec_prepend (vec);
-	  break;
-
-	default:
-	  ASSERT (0);
-	  break;
-	}
-
-      g_call_stats[op]++;
-
-      if (i == dump_time)
-	{
-	  time[2] = unix_time_now ();
-	  VERBOSE1 ("%d vec ops in %f secs. (last %d in %f secs.).\n",
-		    i, time[2] - time[0], g_dump_period, time[2] - time[1]);
-	  time[1] = time[2];
-	  dump_time += g_dump_period;
-
-	  VERBOSE1 ("vec len %d\n", vec_len (vec));
-	  VERBOSE2 ("%U\n\n",
-		    format_hex_bytes, vec, vec_len (vec) * sizeof (vec[0]));
-	}
-
-      VERBOSE2 ("len %d\n", vec_len (vec));
-    }
-
-  validate_vec (vec, 0);
-  vec_free (vec);
-}
-
-static void
-prob_init (void)
-{
-  uword i, j, ratio, len, index;
-
-  /* Create the vector to implement the statistical profile:
-     vec [ op1 op1 op1 op2 op3 op3 op3 op4 op4 .... ] */
-  for (i = FIRST_VEC_OP; i <= LAST_VEC_OP; i++)
-    {
-      ratio = g_prob_ratio[i];
-      if (ratio <= 0)
-	continue;
-
-      len = vec_len (g_prob);
-      index = len - 1 + ratio;
-      ASSERT (index >= 0);
-
-      /* Pre-allocate new elements. */
-      vec_validate (g_prob, index);
-
-      for (j = len; j <= index; j++)
-	g_prob[j] = i;
-    }
-
-  /* Operations on vectors with headers. */
-  for (i = FIRST_VEC_HDR_OP; i <= LAST_VEC_HDR_OP; i++)
-    {
-      ratio = g_prob_ratio[i];
-      if (ratio <= 0)
-	continue;
-
-      len = vec_len (g_prob_wh);
-      index = len - 1 + ratio;
-      ASSERT (index >= 0);
-
-      /* Pre-allocate new elements. */
-      vec_validate (g_prob_wh, index);
-
-      for (j = len; j <= index; j++)
-	g_prob_wh[j] = i;
-    }
-
-  VERBOSE3 ("prob_vec, len %d\n%U\n", vec_len (g_prob),
-	    format_hex_bytes, g_prob, vec_len (g_prob) * sizeof (g_prob[0]));
-  VERBOSE3 ("prob_vec_wh, len %d\n%U\n", vec_len (g_prob_wh),
-	    format_hex_bytes, g_prob_wh,
-	    vec_len (g_prob_wh) * sizeof (g_prob_wh[0]));
-}
-
-static void
-prob_free (void)
-{
-  vec_free (g_prob);
-  vec_free (g_prob_wh);
-}
-
-int
-test_vec_main (unformat_input_t * input)
-{
-  uword iter = 1000;
-  uword help = 0;
-  uword big = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (0 == unformat (input, "iter %d", &iter)
-	  && 0 == unformat (input, "seed %d", &g_seed)
-	  && 0 == unformat (input, "verbose %d", &g_verbose)
-	  && 0 == unformat (input, "set %d", &g_set_verbose_at)
-	  && 0 == unformat (input, "dump %d", &g_dump_period)
-	  && 0 == unformat (input, "help %=", &help, 1)
-	  && 0 == unformat (input, "big %=", &big, 1))
-	{
-	  clib_error ("unknown input `%U'", format_unformat_error, input);
-	  goto usage;
-	}
-    }
-
-  if (big)
-    {
-      u8 *bigboy = 0;
-      u64 one_gig = (1 << 30);
-      u64 size;
-      u64 index;
-
-      fformat (stdout, "giant vector test...");
-      size = 5ULL * one_gig;
-
-      vec_validate (bigboy, size);
-
-      for (index = size; index >= 0; index--)
-	bigboy[index] = index & 0xff;
-      return 0;
-    }
-
-
-  if (help)
-    goto usage;
-
-  prob_init ();
-  run_validator (iter);
-  run_validator_wh (iter);
-  if (verbose)
-    dump_call_stats (g_call_stats);
-  prob_free ();
-
-  if (verbose)
-    {
-      memory_snap ();
-    }
-  return 0;
-
-usage:
-  fformat (stdout, "Usage: test_vec iter <N> seed <N> verbose <N> "
-	   "set <N> dump <N>\n");
-  if (help)
-    return 0;
-
-  return -1;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int ret;
-
-  mheap_alloc (0, (uword) 10ULL << 30);
-
-  verbose = (argc > 1);
-  unformat_init_command_line (&i, argv);
-  ret = test_vec_main (&i);
-  unformat_free (&i);
-
-  return ret;
-}
-#endif /* CLIB_UNIX */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_vec.h b/vppinfra/vppinfra/test_vec.h
deleted file mode 100644
index 28e8e2a0..00000000
--- a/vppinfra/vppinfra/test_vec.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_test_vec_h
-#define included_test_vec_h
-
-
-#include <vppinfra/clib.h>
-#include <vppinfra/mem.h>
-#include <vppinfra/format.h>
-#include <vppinfra/error.h>
-
-
-extern uword g_verbose;
-extern u32 g_seed;
-
-always_inline u8 *
-format_u32_binary (u8 * s, va_list * va)
-{
-  u32 val = va_arg (*va, u32);
-  word i = 0;
-
-  for (i = BITS (val) - 1; i >= 0; i--)
-    {
-      if (val & (1 << i))
-	s = format (s, "1");
-      else
-	s = format (s, "0");
-    }
-
-  return s;
-}
-
-#define VERBOSE1(fmt, args...)			\
-do {						\
-  if (g_verbose >= 1)				\
-    fformat (stdout, fmt, ## args);		\
-} while (0)
-
-#define VERBOSE2(fmt, args...)			\
-do {						\
-  if (g_verbose >= 2)				\
-    fformat (stdout, fmt, ## args);		\
-} while (0)
-
-#define VERBOSE3(fmt, args...)			\
-do {						\
-  if (g_verbose >= 3)				\
-    fformat (stdout, fmt, ## args);		\
-} while (0)
-
-#define clib_mem_free_safe(p)			\
-do {						\
-  if (p)					\
-    {						\
-      clib_mem_free (p);			\
-      (p) = NULL;				\
-    }						\
-} while (0)
-
-/* XXX - I get undefined symbol trying to call random_u32() <vppinfra/random.h> */
-/* Simple random number generator with period 2^31 - 1. */
-static u32
-my_random_u32 (u32 * seed_return)
-{
-  /* Unlikely mask value to XOR into seed.
-     Otherwise small seed values would give
-     non-random seeming smallish numbers. */
-  const u32 mask = 0x12345678;
-  u32 seed, a, b, result;
-
-  seed = *seed_return;
-  seed ^= mask;
-
-  a = seed / 127773;
-  b = seed % 127773;
-  seed = 16807 * b - 2836 * a;
-
-  if ((i32) seed < 0)
-    seed += ((u32) 1 << 31) - 1;
-
-  result = seed;
-
-  *seed_return = seed ^ mask;
-
-  return result;
-}
-
-static u32
-bounded_random_u32 (u32 * seed, uword lo, uword hi)
-{
-  if (lo == hi)
-    return lo;
-
-  ASSERT (lo < hi);
-
-  return ((my_random_u32 (seed) % (hi - lo + ((hi != ~0) ? (1) : (0)))) + lo);
-}
-
-#define fill_with_random_data(ptr, bytes, seed)			\
-do {								\
-  u8 * _v(p) = (u8 *) (ptr);					\
-  uword _v(b) = (bytes);					\
-  uword _v(i);							\
-								\
-  for (_v(i) = 0; _v(i) < _v(b); _v(i)++)			\
-    _v(p)[_v(i)] = (u8) bounded_random_u32 (&(seed), 0, 255);	\
-								\
-} while (0)
-
-#define compute_mem_hash(hash, ptr, bytes)	\
-({						\
-  u8 * _v(p) = (u8 *) (ptr);			\
-  uword _v(b) = (uword) (bytes);		\
-  uword _v(i);					\
-  uword _v(h) = (u8) (hash);			\
-						\
-  if (_v(p) && _v(b) > 0)			\
-    {						\
-      for (_v(i) = 0; _v(i) < _v(b); _v(i)++)	\
-	_v(h) ^= _v(p)[_v(i)];			\
-    }						\
-						\
-  _v(h);					\
-})
-
-#define log2_align_down(value, align)		\
-({						\
-  uword _v = (uword) (value);			\
-  uword _a = (uword) (align);			\
-  uword _m = (1 << _a) - 1;			\
-						\
-  _v = _v & ~_m;				\
-})
-
-#define log2_align_up(value, align)		\
-({						\
-  uword _v = (uword) (value);			\
-  uword _a = (uword) (align);			\
-  uword _m = (1 << _a) - 1;			\
-						\
-  _v = (_v + _m) & ~_m;				\
-})
-
-#define log2_align_ptr_down(ptr, align) \
-uword_to_pointer (log2_align_down (pointer_to_uword (ptr), align), void *)
-
-#define log2_align_ptr_up(ptr, align) \
-uword_to_pointer (log2_align_up (pointer_to_uword (ptr), align), void *)
-
-#define MAX_LOG2_ALIGN		6
-#define MAX_UNALIGN_OFFSET	((1 << MAX_LOG2_ALIGN) - 1)
-
-/* Allocates pointer to memory whose address is:
-   addr = <log2_align>-aligned address */
-always_inline void *
-alloc_aligned (uword size, uword log2_align, void **ptr_to_free)
-{
-  void *p;
-
-  if (size <= 0)
-    return NULL;
-
-  p = (void *) clib_mem_alloc (size + (1 << log2_align) - 1);
-
-  if (ptr_to_free)
-    *ptr_to_free = p;
-
-  return (p) ? log2_align_ptr_up (p, log2_align) : (NULL);
-}
-
-/* Allocates pointer to memory whose address is:
-   addr = MAX_LOG2_ALIGN-aligned address + <offset> */
-always_inline void *
-alloc_unaligned (uword size, uword offset, void **ptr_to_free)
-{
-  void *p;
-
-  if (size <= 0)
-    return NULL;
-
-  ASSERT (offset <= MAX_UNALIGN_OFFSET);
-
-  p =
-    alloc_aligned (size + (1 << MAX_LOG2_ALIGN), MAX_LOG2_ALIGN, ptr_to_free);
-
-  if (!p)
-    return NULL;
-
-  return (void *) ((u8 *) p + (offset % MAX_UNALIGN_OFFSET));
-}
-
-#define memory_snap()						\
-do {								\
-  clib_mem_usage_t _usage = { 0 };				\
-  clib_mem_usage (&_usage);					\
-  fformat (stdout, "%U\n", format_clib_mem_usage, _usage, 0);	\
-} while (0)
-
-
-#endif /* included_test_vec_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_vhash.c b/vppinfra/vppinfra/test_vhash.c
deleted file mode 100644
index 7293fdde..00000000
--- a/vppinfra/vppinfra/test_vhash.c
+++ /dev/null
@@ -1,757 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2010 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#if 0
-#ifdef __OPTIMIZE__
-#undef CLIB_DEBUG
-#endif
-#endif
-
-#include <vppinfra/bitmap.h>
-#include <vppinfra/error.h>
-#include <vppinfra/os.h>
-#include <vppinfra/random.h>
-#include <vppinfra/time.h>
-#include <vppinfra/vhash.h>
-
-#ifdef CLIB_HAVE_VEC128
-
-typedef struct
-{
-  u32 n_iter;
-  u32 seed;
-  u32 verbose;
-  u32 n_keys;
-  u32 log2_size;
-  u32 n_key_u32;
-
-  u32 n_vectors_div_4;
-  u32 n_vectors_mod_4;
-
-  u32 *keys;
-  u32 *results;
-
-  u32 *vhash_get_key_indices;
-  u32 *vhash_get_results;
-
-  u32 *vhash_key_indices;
-  u32 *vhash_results;
-
-  vhash_t vhash;
-
-  uword **key_hash;
-
-  struct
-  {
-    u64 n_clocks;
-    u64 n_vectors;
-    u64 n_calls;
-  } get_stats, set_stats, unset_stats;
-} test_vhash_main_t;
-
-always_inline u32
-test_vhash_key_gather (void *_tm, u32 vi, u32 wi, u32 n_key_u32s)
-{
-  test_vhash_main_t *tm = _tm;
-  ASSERT (n_key_u32s == tm->n_key_u32);
-  ASSERT (wi < n_key_u32s);
-  vi = vec_elt (tm->vhash_key_indices, vi);
-  return vec_elt (tm->keys, vi * n_key_u32s + wi);
-}
-
-always_inline u32x4
-test_vhash_4key_gather (void *_tm, u32 vi, u32 wi, u32 n_key_u32s)
-{
-  test_vhash_main_t *tm = _tm;
-  u32 *p;
-  u32x4_union_t x;
-
-  ASSERT (n_key_u32s == tm->n_key_u32);
-  ASSERT (wi < n_key_u32s);
-
-  p = vec_elt_at_index (tm->vhash_key_indices, vi + 0);
-  x.as_u32[0] = tm->keys[p[0] * n_key_u32s + wi];
-  x.as_u32[1] = tm->keys[p[1] * n_key_u32s + wi];
-  x.as_u32[2] = tm->keys[p[2] * n_key_u32s + wi];
-  x.as_u32[3] = tm->keys[p[3] * n_key_u32s + wi];
-  return x.as_u32x4;
-}
-
-always_inline u32
-test_vhash_get_result (void *_tm,
-		       u32 vector_index, u32 result_index, u32 n_key_u32s)
-{
-  test_vhash_main_t *tm = _tm;
-  u32 *p = vec_elt_at_index (tm->vhash_results, vector_index);
-  p[0] = result_index;
-  return result_index;
-}
-
-always_inline u32x4
-test_vhash_get_4result (void *_tm,
-			u32 vector_index, u32x4 results, u32 n_key_u32s)
-{
-  test_vhash_main_t *tm = _tm;
-  u32 *p = vec_elt_at_index (tm->vhash_results, vector_index);
-  *(u32x4 *) p = results;
-  return results;
-}
-
-always_inline u32
-test_vhash_set_result (void *_tm,
-		       u32 vector_index, u32 old_result, u32 n_key_u32s)
-{
-  test_vhash_main_t *tm = _tm;
-  u32 *p = vec_elt_at_index (tm->vhash_results, vector_index);
-  u32 new_result = p[0];
-  p[0] = old_result;
-  return new_result;
-}
-
-always_inline u32
-test_vhash_unset_result (void *_tm, u32 i, u32 old_result, u32 n_key_u32s)
-{
-  test_vhash_main_t *tm = _tm;
-  u32 *p = vec_elt_at_index (tm->vhash_results, i);
-  p[0] = old_result;
-  return 0;
-}
-
-#define _(N_KEY_U32)							\
-  always_inline u32							\
-  test_vhash_key_gather_##N_KEY_U32 (void * _tm, u32 vi, u32 i)		\
-  { return test_vhash_key_gather (_tm, vi, i, N_KEY_U32); }		\
-									\
-  always_inline u32x4							\
-  test_vhash_key_gather_4_##N_KEY_U32 (void * _tm, u32 vi, u32 i)	\
-  {  return test_vhash_4key_gather (_tm, vi, i, N_KEY_U32); }		\
-									\
-  clib_pipeline_stage							\
-  (test_vhash_gather_keys_stage_##N_KEY_U32,				\
-   test_vhash_main_t *, tm, i,						\
-   {									\
-     vhash_gather_4key_stage						\
-       (&tm->vhash,							\
-	/* vector_index */ i,						\
-	test_vhash_key_gather_4_##N_KEY_U32,				\
-	tm,								\
-	N_KEY_U32);							\
-   })									\
-									\
-  clib_pipeline_stage_no_inline						\
-  (test_vhash_gather_keys_mod_stage_##N_KEY_U32,			\
-   test_vhash_main_t *, tm, i,						\
-   {									\
-     vhash_gather_key_stage						\
-       (&tm->vhash,							\
-	/* vector_index */ tm->n_vectors_div_4,				\
-	/* n_vectors */ tm->n_vectors_mod_4,				\
-	test_vhash_key_gather_##N_KEY_U32,				\
-	tm,								\
-	N_KEY_U32);							\
-   })									\
-									\
-  clib_pipeline_stage							\
-  (test_vhash_hash_finalize_stage_##N_KEY_U32,				\
-   test_vhash_main_t *, tm, i,						\
-   {									\
-     vhash_finalize_stage (&tm->vhash, i, N_KEY_U32);			\
-   })									\
-									\
-  clib_pipeline_stage_no_inline						\
-  (test_vhash_hash_finalize_mod_stage_##N_KEY_U32,			\
-   test_vhash_main_t *, tm, i,						\
-   {									\
-     vhash_finalize_stage (&tm->vhash, tm->n_vectors_div_4, N_KEY_U32);	\
-   })									\
-									\
-  clib_pipeline_stage							\
-  (test_vhash_get_stage_##N_KEY_U32,					\
-   test_vhash_main_t *, tm, i,						\
-   {									\
-     vhash_get_4_stage (&tm->vhash,					\
-			/* vector_index */ i,				\
-			test_vhash_get_4result,				\
-			tm, N_KEY_U32);					\
-   })									\
-									\
-  clib_pipeline_stage_no_inline						\
-  (test_vhash_get_mod_stage_##N_KEY_U32,				\
-   test_vhash_main_t *, tm, i,						\
-   {									\
-     vhash_get_stage (&tm->vhash,					\
-		      /* vector_index */ tm->n_vectors_div_4,		\
-		      /* n_vectors */ tm->n_vectors_mod_4,		\
-		      test_vhash_get_result,				\
-		      tm, N_KEY_U32);					\
-   })									\
-									\
-  clib_pipeline_stage							\
-  (test_vhash_set_stage_##N_KEY_U32,					\
-   test_vhash_main_t *, tm, i,						\
-   {									\
-     vhash_set_stage (&tm->vhash,					\
-		      /* vector_index */ i,				\
-		      /* n_vectors */ VECTOR_WORD_TYPE_LEN (u32),	\
-		      test_vhash_set_result,				\
-		      tm, N_KEY_U32);					\
-   })									\
-									\
-  clib_pipeline_stage_no_inline						\
-  (test_vhash_set_mod_stage_##N_KEY_U32,				\
-   test_vhash_main_t *, tm, i,						\
-   {									\
-     vhash_set_stage (&tm->vhash,					\
-		      /* vector_index */ tm->n_vectors_div_4,		\
-		      /* n_vectors */ tm->n_vectors_mod_4,		\
-		      test_vhash_set_result,				\
-		      tm, N_KEY_U32);					\
-   })									\
-									\
-  clib_pipeline_stage							\
-  (test_vhash_unset_stage_##N_KEY_U32,					\
-   test_vhash_main_t *, tm, i,						\
-   {									\
-     vhash_unset_stage (&tm->vhash,					\
-			/* vector_index */ i,				\
-			/* n_vectors */ VECTOR_WORD_TYPE_LEN (u32),	\
-			test_vhash_unset_result,			\
-			tm, N_KEY_U32);					\
-   })									\
-									\
-  clib_pipeline_stage_no_inline						\
-  (test_vhash_unset_mod_stage_##N_KEY_U32,				\
-   test_vhash_main_t *, tm, i,						\
-   {									\
-     vhash_unset_stage (&tm->vhash,					\
-			/* vector_index */ tm->n_vectors_div_4,		\
-			/* n_vectors */ tm->n_vectors_mod_4,		\
-			test_vhash_unset_result,			\
-			tm, N_KEY_U32);					\
-   })
-
-_(1);
-_(2);
-_(3);
-_(4);
-_(5);
-_(6);
-
-#undef _
-
-#define _(N_KEY_U32)							\
-  clib_pipeline_stage							\
-  (test_vhash_hash_mix_stage_##N_KEY_U32,				\
-   test_vhash_main_t *, tm, i,						\
-   {									\
-     vhash_mix_stage (&tm->vhash, i, N_KEY_U32);			\
-   })									\
-									\
-  clib_pipeline_stage_no_inline						\
-  (test_vhash_hash_mix_mod_stage_##N_KEY_U32,				\
-   test_vhash_main_t *, tm, i,						\
-   {									\
-     vhash_mix_stage (&tm->vhash, tm->n_vectors_div_4, N_KEY_U32);	\
-   })
-
-_(4);
-_(5);
-_(6);
-
-#undef _
-
-typedef enum
-{
-  GET, SET, UNSET,
-} test_vhash_op_t;
-
-static void
-test_vhash_op (test_vhash_main_t * tm,
-	       u32 * key_indices,
-	       u32 * results, uword n_keys, test_vhash_op_t op)
-{
-  vhash_validate_sizes (&tm->vhash, tm->n_key_u32, n_keys);
-
-  tm->vhash_results = results;
-  tm->vhash_key_indices = key_indices;
-  tm->n_vectors_div_4 = n_keys / 4;
-  tm->n_vectors_mod_4 = n_keys % 4;
-
-  if (tm->n_vectors_div_4 > 0)
-    {
-      switch (tm->n_key_u32)
-	{
-	default:
-	  ASSERT (0);
-	  break;
-
-#define _(N_KEY_U32)						\
-	case N_KEY_U32:						\
-	  if (op == GET)					\
-	    clib_pipeline_run_3_stage				\
-	      (tm->n_vectors_div_4,				\
-	       tm,						\
-	       test_vhash_gather_keys_stage_##N_KEY_U32,	\
-	       test_vhash_hash_finalize_stage_##N_KEY_U32,	\
-	       test_vhash_get_stage_##N_KEY_U32);		\
-	  else if (op == SET)					\
-	    clib_pipeline_run_3_stage				\
-	      (tm->n_vectors_div_4,				\
-	       tm,						\
-	       test_vhash_gather_keys_stage_##N_KEY_U32,	\
-	       test_vhash_hash_finalize_stage_##N_KEY_U32,	\
-	       test_vhash_set_stage_##N_KEY_U32);		\
-	  else							\
-	    clib_pipeline_run_3_stage				\
-	      (tm->n_vectors_div_4,				\
-	       tm,						\
-	       test_vhash_gather_keys_stage_##N_KEY_U32,	\
-	       test_vhash_hash_finalize_stage_##N_KEY_U32,	\
-	       test_vhash_unset_stage_##N_KEY_U32);		\
-	  break;
-
-	  _(1);
-	  _(2);
-	  _(3);
-
-#undef _
-
-#define _(N_KEY_U32)						\
-	case N_KEY_U32:						\
-	  if (op == GET)					\
-	    clib_pipeline_run_4_stage				\
-	      (tm->n_vectors_div_4,				\
-	       tm,						\
-	       test_vhash_gather_keys_stage_##N_KEY_U32,	\
-	       test_vhash_hash_mix_stage_##N_KEY_U32,		\
-	       test_vhash_hash_finalize_stage_##N_KEY_U32,	\
-	       test_vhash_get_stage_##N_KEY_U32);		\
-	  else if (op == SET)					\
-	    clib_pipeline_run_4_stage				\
-	      (tm->n_vectors_div_4,				\
-	       tm,						\
-	       test_vhash_gather_keys_stage_##N_KEY_U32,	\
-	       test_vhash_hash_mix_stage_##N_KEY_U32,		\
-	       test_vhash_hash_finalize_stage_##N_KEY_U32,	\
-	       test_vhash_set_stage_##N_KEY_U32);		\
-	  else							\
-	    clib_pipeline_run_4_stage				\
-	      (tm->n_vectors_div_4,				\
-	       tm,						\
-	       test_vhash_gather_keys_stage_##N_KEY_U32,	\
-	       test_vhash_hash_mix_stage_##N_KEY_U32,		\
-	       test_vhash_hash_finalize_stage_##N_KEY_U32,	\
-	       test_vhash_unset_stage_##N_KEY_U32);		\
-	  break;
-
-	  _(4);
-	  _(5);
-	  _(6);
-
-#undef _
-	}
-    }
-
-
-  if (tm->n_vectors_mod_4 > 0)
-    {
-      switch (tm->n_key_u32)
-	{
-	default:
-	  ASSERT (0);
-	  break;
-
-#define _(N_KEY_U32)						\
-	case N_KEY_U32:						\
-	  if (op == GET)					\
-	    clib_pipeline_run_3_stage				\
-	      (1,						\
-	       tm,						\
-	       test_vhash_gather_keys_mod_stage_##N_KEY_U32,	\
-	       test_vhash_hash_finalize_mod_stage_##N_KEY_U32,	\
-	       test_vhash_get_mod_stage_##N_KEY_U32);		\
-	  else if (op == SET)					\
-	    clib_pipeline_run_3_stage				\
-	      (1,						\
-	       tm,						\
-	       test_vhash_gather_keys_mod_stage_##N_KEY_U32,	\
-	       test_vhash_hash_finalize_mod_stage_##N_KEY_U32,	\
-	       test_vhash_set_mod_stage_##N_KEY_U32);		\
-	  else							\
-	    clib_pipeline_run_3_stage				\
-	      (1,						\
-	       tm,						\
-	       test_vhash_gather_keys_mod_stage_##N_KEY_U32,	\
-	       test_vhash_hash_finalize_mod_stage_##N_KEY_U32,	\
-	       test_vhash_unset_mod_stage_##N_KEY_U32);		\
-	break;
-
-	  _(1);
-	  _(2);
-	  _(3);
-
-#undef _
-
-#define _(N_KEY_U32)						\
-	case N_KEY_U32:						\
-	  if (op == GET)					\
-	    clib_pipeline_run_4_stage				\
-	      (1,						\
-	       tm,						\
-	       test_vhash_gather_keys_mod_stage_##N_KEY_U32,	\
-	       test_vhash_hash_mix_mod_stage_##N_KEY_U32,	\
-	       test_vhash_hash_finalize_mod_stage_##N_KEY_U32,	\
-	       test_vhash_get_mod_stage_##N_KEY_U32);		\
-	  else if (op == SET)					\
-	    clib_pipeline_run_4_stage				\
-	      (1,						\
-	       tm,						\
-	       test_vhash_gather_keys_mod_stage_##N_KEY_U32,	\
-	       test_vhash_hash_mix_mod_stage_##N_KEY_U32,	\
-	       test_vhash_hash_finalize_mod_stage_##N_KEY_U32,	\
-	       test_vhash_set_mod_stage_##N_KEY_U32);		\
-	  else							\
-	    clib_pipeline_run_4_stage				\
-	      (1,						\
-	       tm,						\
-	       test_vhash_gather_keys_mod_stage_##N_KEY_U32,	\
-	       test_vhash_hash_mix_mod_stage_##N_KEY_U32,	\
-	       test_vhash_hash_finalize_mod_stage_##N_KEY_U32,	\
-	       test_vhash_unset_mod_stage_##N_KEY_U32);		\
-	  break;
-
-	  _(4);
-	  _(5);
-	  _(6);
-
-#undef _
-	}
-    }
-}
-
-int
-test_vhash_main (unformat_input_t * input)
-{
-  clib_error_t *error = 0;
-  test_vhash_main_t _tm, *tm = &_tm;
-  vhash_t *vh = &tm->vhash;
-  uword i, j;
-
-  memset (tm, 0, sizeof (tm[0]));
-  tm->n_iter = 100;
-  tm->seed = 1;
-  tm->n_keys = 1;
-  tm->n_key_u32 = 1;
-  tm->log2_size = 8;
-  tm->verbose = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "iter %d", &tm->n_iter))
-	;
-      else if (unformat (input, "seed %d", &tm->seed))
-	;
-      else if (unformat (input, "n-keys %d", &tm->n_keys))
-	;
-      else if (unformat (input, "log2-size %d", &tm->log2_size))
-	;
-      else if (unformat (input, "key-words %d", &tm->n_key_u32))
-	;
-      else if (unformat (input, "verbose %=", &tm->verbose, 1))
-	;
-      else
-	{
-	  error = clib_error_create ("unknown input `%U'\n",
-				     format_unformat_error, input);
-	  goto done;
-	}
-    }
-
-  if (tm->seed == 0)
-    tm->seed = random_default_seed ();
-
-  clib_warning ("iter %d seed %d n-keys %d log2-size %d key-words %d",
-		tm->n_iter, tm->seed, tm->n_keys, tm->log2_size,
-		tm->n_key_u32);
-
-  {
-    u32 seeds[3];
-    seeds[0] = seeds[1] = seeds[2] = 0xdeadbeef;
-    vhash_init (vh, tm->log2_size, tm->n_key_u32, seeds);
-  }
-
-  /* Choose unique keys. */
-  vec_resize (tm->keys, tm->n_keys * tm->n_key_u32);
-  vec_resize (tm->key_hash, tm->n_key_u32);
-  for (i = j = 0; i < vec_len (tm->keys); i++, j++)
-    {
-      j = j == tm->n_key_u32 ? 0 : j;
-      do
-	{
-	  tm->keys[i] = random_u32 (&tm->seed);
-	}
-      while (hash_get (tm->key_hash[j], tm->keys[i]));
-      hash_set (tm->key_hash[j], tm->keys[i], 0);
-    }
-
-  vec_resize (tm->results, tm->n_keys);
-  for (i = 0; i < vec_len (tm->results); i++)
-    {
-      do
-	{
-	  tm->results[i] = random_u32 (&tm->seed);
-	}
-      while (tm->results[i] == ~0);
-    }
-
-  vec_resize_aligned (tm->vhash_get_results, tm->n_keys,
-		      CLIB_CACHE_LINE_BYTES);
-  vec_clone (tm->vhash_get_key_indices, tm->results);
-  for (i = 0; i < vec_len (tm->vhash_get_key_indices); i++)
-    tm->vhash_get_key_indices[i] = i;
-
-  {
-    uword *is_set_bitmap = 0;
-    uword *to_set_bitmap = 0;
-    uword *to_unset_bitmap = 0;
-    u32 *to_set = 0, *to_unset = 0;
-    u32 *to_set_results = 0, *to_unset_results = 0;
-    u64 t[2];
-
-    for (i = 0; i < tm->n_iter; i++)
-      {
-	vec_reset_length (to_set);
-	vec_reset_length (to_unset);
-	vec_reset_length (to_set_results);
-	vec_reset_length (to_unset_results);
-
-	do
-	  {
-	    to_set_bitmap = clib_bitmap_random (to_set_bitmap,
-						tm->n_keys, &tm->seed);
-	  }
-	while (clib_bitmap_is_zero (to_set_bitmap));
-	to_unset_bitmap = clib_bitmap_dup_and (to_set_bitmap, is_set_bitmap);
-	to_set_bitmap = clib_bitmap_andnot (to_set_bitmap, to_unset_bitmap);
-
-	/* *INDENT-OFF* */
-	clib_bitmap_foreach (j, to_set_bitmap, ({
-	      vec_add1 (to_set, j);
-	      vec_add1 (to_set_results, tm->results[j]);
-	}));
-	/* *INDENT-ON* */
-	/* *INDENT-OFF* */
-	clib_bitmap_foreach (j, to_unset_bitmap, ({
-	      vec_add1 (to_unset, j);
-	      vec_add1 (to_unset_results, 0xdeadbeef);
-	}));
-	/* *INDENT-ON* */
-
-	if (vec_len (to_set) > 0)
-	  {
-	    t[0] = clib_cpu_time_now ();
-	    test_vhash_op (tm, to_set, to_set_results, vec_len (to_set), SET);
-	    t[1] = clib_cpu_time_now ();
-	    tm->set_stats.n_clocks += t[1] - t[0];
-	    tm->set_stats.n_vectors += vec_len (to_set);
-	    tm->set_stats.n_calls += 1;
-	    is_set_bitmap = clib_bitmap_or (is_set_bitmap, to_set_bitmap);
-	  }
-
-	t[0] = clib_cpu_time_now ();
-	test_vhash_op (tm, tm->vhash_get_key_indices,
-		       tm->vhash_get_results,
-		       vec_len (tm->vhash_get_key_indices), GET);
-	t[1] = clib_cpu_time_now ();
-	tm->get_stats.n_clocks += t[1] - t[0];
-	tm->get_stats.n_vectors += vec_len (tm->vhash_get_key_indices);
-	tm->get_stats.n_calls += 1;
-
-	for (j = 0; j < vec_len (tm->vhash_get_results); j++)
-	  {
-	    u32 r0 = tm->vhash_get_results[j];
-	    u32 r1 = tm->results[j];
-	    if (clib_bitmap_get (is_set_bitmap, j))
-	      {
-		if (r0 != r1)
-		  os_panic ();
-	      }
-	    else
-	      {
-		if (r0 != ~0)
-		  os_panic ();
-	      }
-	  }
-
-	if (vh->n_elts != clib_bitmap_count_set_bits (is_set_bitmap))
-	  os_panic ();
-
-	if (vec_len (to_unset) > 0)
-	  {
-	    t[0] = clib_cpu_time_now ();
-	    test_vhash_op (tm, to_unset, to_unset_results,
-			   vec_len (to_unset), UNSET);
-	    t[1] = clib_cpu_time_now ();
-	    tm->unset_stats.n_clocks += t[1] - t[0];
-	    tm->unset_stats.n_vectors += vec_len (to_unset);
-	    tm->unset_stats.n_calls += 1;
-	    is_set_bitmap =
-	      clib_bitmap_andnot (is_set_bitmap, to_unset_bitmap);
-	  }
-
-	t[0] = clib_cpu_time_now ();
-	test_vhash_op (tm, tm->vhash_get_key_indices,
-		       tm->vhash_get_results,
-		       vec_len (tm->vhash_get_key_indices), GET);
-	t[1] = clib_cpu_time_now ();
-	tm->get_stats.n_clocks += t[1] - t[0];
-	tm->get_stats.n_vectors += vec_len (tm->vhash_get_key_indices);
-	tm->get_stats.n_calls += 1;
-
-	for (j = 0; j < vec_len (tm->vhash_get_results); j++)
-	  {
-	    u32 r0 = tm->vhash_get_results[j];
-	    u32 r1 = tm->results[j];
-	    if (clib_bitmap_get (is_set_bitmap, j))
-	      {
-		if (r0 != r1)
-		  os_panic ();
-	      }
-	    else
-	      {
-		if (r0 != ~0)
-		  os_panic ();
-	      }
-	  }
-
-	if (vh->n_elts != clib_bitmap_count_set_bits (is_set_bitmap))
-	  os_panic ();
-      }
-
-    vhash_resize (vh, tm->log2_size + 1);
-
-    test_vhash_op (tm, tm->vhash_get_key_indices,
-		   tm->vhash_get_results,
-		   vec_len (tm->vhash_get_key_indices), GET);
-
-    for (j = 0; j < vec_len (tm->vhash_get_results); j++)
-      {
-	u32 r0 = tm->vhash_get_results[j];
-	u32 r1 = tm->results[j];
-	if (clib_bitmap_get (is_set_bitmap, j))
-	  {
-	    if (r0 != r1)
-	      os_panic ();
-	  }
-	else
-	  {
-	    if (r0 != ~0)
-	      os_panic ();
-	  }
-      }
-
-    if (vh->n_elts != clib_bitmap_count_set_bits (is_set_bitmap))
-      os_panic ();
-  }
-
-  {
-    clib_time_t ct;
-
-    clib_time_init (&ct);
-
-    clib_warning ("%.4e clocks/get %.4e gets/call %.4e gets/sec",
-		  (f64) tm->get_stats.n_clocks /
-		  (f64) tm->get_stats.n_vectors,
-		  (f64) tm->get_stats.n_vectors / (f64) tm->get_stats.n_calls,
-		  (f64) tm->get_stats.n_vectors /
-		  (f64) (tm->get_stats.n_clocks * ct.seconds_per_clock));
-    if (tm->set_stats.n_calls > 0)
-      clib_warning ("%.4e clocks/set %.4e sets/call %.4e sets/sec",
-		    (f64) tm->set_stats.n_clocks /
-		    (f64) tm->set_stats.n_vectors,
-		    (f64) tm->set_stats.n_vectors /
-		    (f64) tm->set_stats.n_calls,
-		    (f64) tm->set_stats.n_vectors /
-		    (f64) (tm->set_stats.n_clocks * ct.seconds_per_clock));
-    if (tm->unset_stats.n_calls > 0)
-      clib_warning ("%.4e clocks/unset %.4e unsets/call %.4e unsets/sec",
-		    (f64) tm->unset_stats.n_clocks /
-		    (f64) tm->unset_stats.n_vectors,
-		    (f64) tm->unset_stats.n_vectors /
-		    (f64) tm->unset_stats.n_calls,
-		    (f64) tm->unset_stats.n_vectors /
-		    (f64) (tm->unset_stats.n_clocks * ct.seconds_per_clock));
-  }
-
-done:
-  if (error)
-    clib_error_report (error);
-  return 0;
-}
-
-#endif /* CLIB_HAVE_VEC128 */
-
-#ifndef CLIB_HAVE_VEC128
-int
-test_vhash_main (unformat_input_t * input)
-{
-  clib_error ("compiled without vector support");
-  return 0;
-}
-#endif
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int r;
-
-  unformat_init_command_line (&i, argv);
-  r = test_vhash_main (&i);
-  unformat_free (&i);
-  return r;
-}
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/test_zvec.c b/vppinfra/vppinfra/test_zvec.c
deleted file mode 100644
index 874fdefa..00000000
--- a/vppinfra/vppinfra/test_zvec.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/zvec.h>
-#include <vppinfra/format.h>
-#include <vppinfra/random.h>
-
-static int verbose;
-#define if_verbose(format,args...) \
-  if (verbose) { clib_warning(format, ## args); }
-
-int
-test_zvec_main (unformat_input_t * input)
-{
-  uword n_iterations;
-  uword i;
-  u32 seed;
-
-  n_iterations = 1024;
-  seed = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (0 == unformat (input, "iter %d", &n_iterations)
-	  && 0 == unformat (input, "seed %d", &seed))
-	clib_error ("unknown input `%U'", format_unformat_error, input);
-    }
-
-  if_verbose ("%d iterations, seed %d\n", n_iterations, seed);
-
-  for (i = 0; i < n_iterations; i++)
-    {
-      uword coding, data, d[2], limit, n_zdata_bits[2];
-
-      if (seed)
-	coding = random_u32 (&seed);
-      else
-	coding = i;
-
-      limit = coding - 1;
-      if (limit > (1 << 16))
-	limit = 1 << 16;
-      for (data = 0; data <= limit; data++)
-	{
-	  d[0] = zvec_encode (coding, data, &n_zdata_bits[0]);
-
-	  if (coding != 0)
-	    ASSERT ((d[0] >> n_zdata_bits[0]) == 0);
-
-	  d[1] = zvec_decode (coding, d[0], &n_zdata_bits[1]);
-	  ASSERT (data == d[1]);
-
-	  ASSERT (n_zdata_bits[0] == n_zdata_bits[1]);
-	}
-    }
-
-  return 0;
-}
-
-#ifdef CLIB_UNIX
-int
-main (int argc, char *argv[])
-{
-  unformat_input_t i;
-  int ret;
-
-  verbose = (argc > 1);
-  unformat_init_command_line (&i, argv);
-  ret = test_zvec_main (&i);
-  unformat_free (&i);
-
-  return ret;
-}
-#endif /* CLIB_UNIX */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/time.c b/vppinfra/vppinfra/time.c
deleted file mode 100644
index 2bdb9da4..00000000
--- a/vppinfra/vppinfra/time.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/os.h>
-#include <vppinfra/time.h>
-#include <vppinfra/format.h>
-#include <vppinfra/cpu.h>
-
-#ifdef CLIB_UNIX
-
-#include <math.h>
-#include <sys/time.h>
-#include <fcntl.h>
-
-/* Not very accurate way of determining cpu clock frequency
-   for unix.  Better to use /proc/cpuinfo on linux. */
-static f64
-estimate_clock_frequency (f64 sample_time)
-{
-  /* Round to nearest 100KHz. */
-  const f64 round_to_units = 100e5;
-
-  f64 time_now, time_start, time_limit, freq;
-  u64 ifreq, t[2];
-
-  time_start = time_now = unix_time_now ();
-  time_limit = time_now + sample_time;
-  t[0] = clib_cpu_time_now ();
-  while (time_now < time_limit)
-    time_now = unix_time_now ();
-  t[1] = clib_cpu_time_now ();
-
-  freq = (t[1] - t[0]) / (time_now - time_start);
-  ifreq = flt_round_nearest (freq / round_to_units);
-  freq = ifreq * round_to_units;
-
-  return freq;
-}
-
-/* Fetch cpu frequency via parseing /proc/cpuinfo.
-   Only works for Linux. */
-static f64
-clock_frequency_from_proc_filesystem (void)
-{
-  f64 cpu_freq = 1e9;		/* better than 40... */
-  f64 ppc_timebase = 0;		/* warnings be gone */
-  int fd;
-  unformat_input_t input;
-
-/* $$$$ aarch64 kernel doesn't report "cpu MHz" */
-#if defined(__aarch64__)
-  return 0.0;
-#endif
-
-  cpu_freq = 0;
-  fd = open ("/proc/cpuinfo", 0);
-  if (fd < 0)
-    return cpu_freq;
-
-  unformat_init_unix_file (&input, fd);
-
-  ppc_timebase = 0;
-  while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (&input, "cpu MHz : %f", &cpu_freq))
-	cpu_freq *= 1e6;
-      else if (unformat (&input, "timebase : %f", &ppc_timebase))
-	;
-      else
-	unformat_skip_line (&input);
-    }
-
-  unformat_free (&input);
-
-  close (fd);
-
-  /* Override CPU frequency with time base for PPC. */
-  if (ppc_timebase != 0)
-    cpu_freq = ppc_timebase;
-
-  return cpu_freq;
-}
-
-/* Fetch cpu frequency via reading /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq
-   Only works for Linux. */
-static f64
-clock_frequency_from_sys_filesystem (void)
-{
-  f64 cpu_freq;
-  int fd;
-  unformat_input_t input;
-
-  /* Time stamp always runs at max frequency. */
-  cpu_freq = 0;
-  fd = open ("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq", 0);
-  if (fd < 0)
-    goto done;
-
-  unformat_init_unix_file (&input, fd);
-  unformat (&input, "%f", &cpu_freq);
-  cpu_freq *= 1e3;		/* measured in kHz */
-  unformat_free (&input);
-  close (fd);
-done:
-  return cpu_freq;
-}
-
-f64
-os_cpu_clock_frequency (void)
-{
-  f64 cpu_freq;
-
-  if (clib_cpu_supports_invariant_tsc ())
-    return estimate_clock_frequency (1e-3);
-
-  /* First try /sys version. */
-  cpu_freq = clock_frequency_from_sys_filesystem ();
-  if (cpu_freq != 0)
-    return cpu_freq;
-
-  /* Next try /proc version. */
-  cpu_freq = clock_frequency_from_proc_filesystem ();
-  if (cpu_freq != 0)
-    return cpu_freq;
-
-  /* If /proc/cpuinfo fails (e.g. not running on Linux) fall back to
-     gettimeofday based estimated clock frequency. */
-  return estimate_clock_frequency (1e-3);
-}
-
-#endif /* CLIB_UNIX */
-
-/* Initialize time. */
-void
-clib_time_init (clib_time_t * c)
-{
-  memset (c, 0, sizeof (c[0]));
-  c->clocks_per_second = os_cpu_clock_frequency ();
-  c->seconds_per_clock = 1 / c->clocks_per_second;
-  c->log2_clocks_per_second = min_log2_u64 ((u64) c->clocks_per_second);
-
-  /* Initially verify frequency every sec */
-  c->log2_clocks_per_frequency_verify = c->log2_clocks_per_second;
-
-  c->last_verify_reference_time = unix_time_now ();
-  c->last_cpu_time = clib_cpu_time_now ();
-  c->init_cpu_time = c->last_verify_cpu_time = c->last_cpu_time;
-}
-
-void
-clib_time_verify_frequency (clib_time_t * c)
-{
-  f64 now_reference = unix_time_now ();
-  f64 dtr = now_reference - c->last_verify_reference_time;
-  f64 dtr_max;
-  u64 dtc = c->last_cpu_time - c->last_verify_cpu_time;
-  f64 round_units = 100e5;
-
-  c->last_verify_cpu_time = c->last_cpu_time;
-  c->last_verify_reference_time = now_reference;
-
-  /*
-   * Is the reported reference interval non-positive,
-   * or off by a factor of two - or 8 seconds - whichever is larger?
-   * Someone reset the clock behind our back.
-   */
-  dtr_max = (f64) (2ULL << c->log2_clocks_per_frequency_verify) /
-    (f64) (1ULL << c->log2_clocks_per_second);
-  dtr_max = dtr_max > 8.0 ? dtr_max : 8.0;
-
-  if (dtr <= 0.0 || dtr > dtr_max)
-    {
-      c->log2_clocks_per_frequency_verify = c->log2_clocks_per_second;
-      return;
-    }
-
-  c->clocks_per_second =
-    flt_round_nearest ((f64) dtc / (dtr * round_units)) * round_units;
-  c->seconds_per_clock = 1 / c->clocks_per_second;
-
-  /* Double time between verifies; max at 64 secs ~ 1 minute. */
-  if (c->log2_clocks_per_frequency_verify < c->log2_clocks_per_second + 6)
-    c->log2_clocks_per_frequency_verify += 1;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/time.h b/vppinfra/vppinfra/time.h
deleted file mode 100644
index 3b89cf78..00000000
--- a/vppinfra/vppinfra/time.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_time_h
-#define included_time_h
-
-#include <vppinfra/clib.h>
-
-typedef struct
-{
-  /* Total run time in clock cycles
-     since clib_time_init call. */
-  u64 total_cpu_time;
-
-  /* Last recorded time stamp. */
-  u64 last_cpu_time;
-
-  /* CPU clock frequency. */
-  f64 clocks_per_second;
-
-  /* 1 / cpu clock frequency: conversion factor
-     from clock cycles into seconds. */
-  f64 seconds_per_clock;
-
-  /* Time stamp of call to clib_time_init call. */
-  u64 init_cpu_time;
-
-  u64 last_verify_cpu_time;
-
-  /* Same but for reference time (if present). */
-  f64 last_verify_reference_time;
-
-  u32 log2_clocks_per_second, log2_clocks_per_frequency_verify;
-} clib_time_t;
-
-/* Return CPU time stamp as 64bit number. */
-#if defined(__x86_64__) || defined(i386)
-always_inline u64
-clib_cpu_time_now (void)
-{
-  u32 a, d;
-  asm volatile ("rdtsc":"=a" (a), "=d" (d));
-  return (u64) a + ((u64) d << (u64) 32);
-}
-
-#elif defined (__powerpc64__)
-
-always_inline u64
-clib_cpu_time_now (void)
-{
-  u64 t;
-  asm volatile ("mftb %0":"=r" (t));
-  return t;
-}
-
-#elif defined (__SPU__)
-
-always_inline u64
-clib_cpu_time_now (void)
-{
-#ifdef _XLC
-  return spu_rdch (0x8);
-#else
-  return 0 /* __builtin_si_rdch (0x8) FIXME */ ;
-#endif
-}
-
-#elif defined (__powerpc__)
-
-always_inline u64
-clib_cpu_time_now (void)
-{
-  u32 hi1, hi2, lo;
-  asm volatile ("1:\n"
-		"mftbu %[hi1]\n"
-		"mftb  %[lo]\n"
-		"mftbu %[hi2]\n"
-		"cmpw %[hi1],%[hi2]\n"
-		"bne 1b\n":[hi1] "=r" (hi1),[hi2] "=r" (hi2),[lo] "=r" (lo));
-  return (u64) lo + ((u64) hi2 << (u64) 32);
-}
-
-#elif defined (__arm__)
-#if defined(__ARM_ARCH_8A__)
-always_inline u64
-clib_cpu_time_now (void)	/* We may run arm64 in aarch32 mode, to leverage 64bit counter */
-{
-  u64 tsc;
-  asm volatile ("mrrc p15, 0, %Q0, %R0, c9":"=r" (tsc));
-  return tsc;
-}
-#elif defined(__ARM_ARCH_7A__)
-always_inline u64
-clib_cpu_time_now (void)
-{
-  u32 tsc;
-  asm volatile ("mrc p15, 0, %0, c9, c13, 0":"=r" (tsc));
-  return (u64) tsc;
-}
-#else
-always_inline u64
-clib_cpu_time_now (void)
-{
-  u32 lo;
-  asm volatile ("mrc p15, 0, %[lo], c15, c12, 1":[lo] "=r" (lo));
-  return (u64) lo;
-}
-#endif
-
-#elif defined (__xtensa__)
-
-/* Stub for now. */
-always_inline u64
-clib_cpu_time_now (void)
-{
-  return 0;
-}
-
-#elif defined (__TMS320C6X__)
-
-always_inline u64
-clib_cpu_time_now (void)
-{
-  u32 l, h;
-
-  asm volatile (" dint\n"
-		" mvc .s2 TSCL,%0\n"
-		" mvc .s2 TSCH,%1\n" " rint\n":"=b" (l), "=b" (h));
-
-  return ((u64) h << 32) | l;
-}
-
-#elif defined (__aarch64__)
-always_inline u64
-clib_cpu_time_now (void)
-{
-  u64 tsc;
-
-  /* Works on Cavium ThunderX. Other platforms: YMMV */
-  asm volatile ("mrs %0, cntvct_el0":"=r" (tsc));
-
-  return tsc;
-}
-
-#else
-#error "don't know how to read CPU time stamp"
-
-#endif
-
-void clib_time_verify_frequency (clib_time_t * c);
-
-always_inline f64
-clib_time_now_internal (clib_time_t * c, u64 n)
-{
-  u64 l = c->last_cpu_time;
-  u64 t = c->total_cpu_time;
-  t += n - l;
-  c->total_cpu_time = t;
-  c->last_cpu_time = n;
-  if (PREDICT_FALSE
-      ((c->last_cpu_time -
-	c->last_verify_cpu_time) >> c->log2_clocks_per_frequency_verify))
-    clib_time_verify_frequency (c);
-  return t * c->seconds_per_clock;
-}
-
-always_inline f64
-clib_time_now (clib_time_t * c)
-{
-  return clib_time_now_internal (c, clib_cpu_time_now ());
-}
-
-always_inline void
-clib_cpu_time_wait (u64 dt)
-{
-  u64 t_end = clib_cpu_time_now () + dt;
-  while (clib_cpu_time_now () < t_end)
-    ;
-}
-
-void clib_time_init (clib_time_t * c);
-
-#ifdef CLIB_UNIX
-
-#include <time.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <unistd.h>
-#include <sys/syscall.h>
-
-/* Use 64bit floating point to represent time offset from epoch. */
-always_inline f64
-unix_time_now (void)
-{
-  /* clock_gettime without indirect syscall uses GLIBC wrappers which
-     we don't want.  Just the bare metal, please. */
-  struct timespec ts;
-  syscall (SYS_clock_gettime, CLOCK_REALTIME, &ts);
-  return ts.tv_sec + 1e-9 * ts.tv_nsec;
-}
-
-/* As above but integer number of nano-seconds. */
-always_inline u64
-unix_time_now_nsec (void)
-{
-  struct timespec ts;
-  syscall (SYS_clock_gettime, CLOCK_REALTIME, &ts);
-  return 1e9 * ts.tv_sec + ts.tv_nsec;
-}
-
-always_inline f64
-unix_usage_now (void)
-{
-  struct rusage u;
-  getrusage (RUSAGE_SELF, &u);
-  return u.ru_utime.tv_sec + 1e-6 * u.ru_utime.tv_usec
-    + u.ru_stime.tv_sec + 1e-6 * u.ru_stime.tv_usec;
-}
-
-always_inline void
-unix_sleep (f64 dt)
-{
-  struct timespec t;
-  t.tv_sec = dt;
-  t.tv_nsec = 1e9 * dt;
-  nanosleep (&t, 0);
-}
-
-#else /* ! CLIB_UNIX */
-
-always_inline f64
-unix_time_now (void)
-{
-  return 0;
-}
-
-always_inline u64
-unix_time_now_nsec (void)
-{
-  return 0;
-}
-
-always_inline f64
-unix_usage_now (void)
-{
-  return 0;
-}
-
-always_inline void
-unix_sleep (f64 dt)
-{
-}
-
-#endif
-
-#endif /* included_time_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/timer.c b/vppinfra/vppinfra/timer.c
deleted file mode 100644
index 0221cb74..00000000
--- a/vppinfra/vppinfra/timer.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-
-#include <vppinfra/vec.h>
-#include <vppinfra/time.h>
-#include <vppinfra/timer.h>
-#include <vppinfra/error.h>
-
-typedef struct
-{
-  f64 time;
-  timer_func_t *func;
-  any arg;
-} timer_callback_t;
-
-/* Vector of currently unexpired timers. */
-static timer_callback_t *timers;
-
-/* Convert time from 64bit floating format to struct timeval. */
-always_inline void
-f64_to_tv (f64 t, struct timeval *tv)
-{
-  tv->tv_sec = t;
-  tv->tv_usec = 1e6 * (t - tv->tv_sec);
-  while (tv->tv_usec >= 1000000)
-    {
-      tv->tv_usec -= 1000000;
-      tv->tv_sec += 1;
-    }
-}
-
-/* Sort timers so that timer soonest to expire is at end. */
-static int
-timer_compare (const void *_a, const void *_b)
-{
-  const timer_callback_t *a = _a;
-  const timer_callback_t *b = _b;
-  f64 dt = b->time - a->time;
-  return dt < 0 ? -1 : (dt > 0 ? +1 : 0);
-}
-
-static inline void
-sort_timers (timer_callback_t * timers)
-{
-  qsort (timers, vec_len (timers), sizeof (timers[0]), timer_compare);
-}
-
-#define TIMER_SIGNAL SIGALRM
-
-/* Don't bother set timer if time different is less than this value. */
-/* We would like to initialize this to 0.75 / (f64) HZ,
- * but HZ may not be a compile-time constant on some systems,
- * so instead we do the initialization before first use.
- */
-static f64 time_resolution;
-
-/* Interrupt handler.  Call functions for all expired timers.
-   Set time for next timer interrupt. */
-static void
-timer_interrupt (int signum)
-{
-  f64 now = unix_time_now ();
-  f64 dt;
-  timer_callback_t *t;
-
-  while (1)
-    {
-      if (vec_len (timers) <= 0)
-	return;
-
-      /* Consider last (earliest) timer in reverse sorted
-         vector of pending timers. */
-      t = vec_end (timers) - 1;
-
-      ASSERT (now >= 0 && finite (now));
-
-      /* Time difference between when timer goes off and now. */
-      dt = t->time - now;
-
-      /* If timer is within threshold of going off
-         call user's callback. */
-      if (dt <= time_resolution && finite (dt))
-	{
-	  _vec_len (timers) -= 1;
-	  (*t->func) (t->arg, -dt);
-	}
-      else
-	{
-	  /* Set timer for to go off in future. */
-	  struct itimerval itv;
-	  memset (&itv, 0, sizeof (itv));
-	  f64_to_tv (dt, &itv.it_value);
-	  if (setitimer (ITIMER_REAL, &itv, 0) < 0)
-	    clib_unix_error ("sititmer");
-	  return;
-	}
-    }
-}
-
-void
-timer_block (sigset_t * save)
-{
-  sigset_t block_timer;
-
-  memset (&block_timer, 0, sizeof (block_timer));
-  sigaddset (&block_timer, TIMER_SIGNAL);
-  sigprocmask (SIG_BLOCK, &block_timer, save);
-}
-
-void
-timer_unblock (sigset_t * save)
-{
-  sigprocmask (SIG_SETMASK, save, 0);
-}
-
-/* Arrange for function to be called some time,
-   roughly equal to dt seconds, in the future. */
-void
-timer_call (timer_func_t * func, any arg, f64 dt)
-{
-  timer_callback_t *t;
-  sigset_t save;
-
-  /* Install signal handler on first call. */
-  static word signal_installed = 0;
-
-  if (!signal_installed)
-    {
-      struct sigaction sa;
-
-      /* Initialize time_resolution before first call to timer_interrupt */
-      time_resolution = 0.75 / (f64) HZ;
-
-      memset (&sa, 0, sizeof (sa));
-      sa.sa_handler = timer_interrupt;
-
-      if (sigaction (TIMER_SIGNAL, &sa, 0) < 0)
-	clib_panic ("sigaction");
-
-      signal_installed = 1;
-    }
-
-  timer_block (&save);
-
-  /* Add new timer. */
-  vec_add2 (timers, t, 1);
-
-  t->time = unix_time_now () + dt;
-  t->func = func;
-  t->arg = arg;
-
-  {
-    word reset_timer = vec_len (timers) == 1;
-
-    if (_vec_len (timers) > 1)
-      {
-	reset_timer += t->time < (t - 1)->time;
-	sort_timers (timers);
-      }
-
-    if (reset_timer)
-      timer_interrupt (TIMER_SIGNAL);
-  }
-
-  timer_unblock (&save);
-}
-
-#ifdef TEST
-
-#include <vppinfra/random.h>
-
-/* Compute average delay of function calls to foo.
-   If this is a small number over a lot of iterations we know
-   the code is working. */
-
-static f64 ave_delay = 0;
-static word ave_delay_count = 0;
-
-always_inline
-update (f64 delay)
-{
-  ave_delay += delay;
-  ave_delay_count += 1;
-}
-
-typedef struct
-{
-  f64 time_requested, time_called;
-} foo_t;
-
-static f64 foo_base_time = 0;
-static foo_t *foos = 0;
-
-void
-foo (any arg, f64 delay)
-{
-  foos[arg].time_called = unix_time_now () - foo_base_time;
-  update (delay);
-}
-
-typedef struct
-{
-  word count;
-  word limit;
-} bar_t;
-
-void
-bar (any arg, f64 delay)
-{
-  bar_t *b = (bar_t *) arg;
-
-  fformat (stdout, "bar %d delay %g\n", b->count++, delay);
-
-  update (delay);
-  if (b->count < b->limit)
-    timer_call (bar, arg, random_f64 ());
-}
-
-int
-main (int argc, char *argv[])
-{
-  word i, n = atoi (argv[1]);
-  word run_foo = argc > 2;
-bar_t b = { limit:10 };
-
-  if (run_foo)
-    {
-      f64 time_limit;
-
-      time_limit = atof (argv[2]);
-
-      vec_resize (foos, n);
-      for (i = 0; i < n; i++)
-	{
-	  foos[i].time_requested = time_limit * random_f64 ();
-	  foos[i].time_called = 1e100;
-	}
-
-      foo_base_time = unix_time_now ();
-      for (i = 0; i < n; i++)
-	timer_call (foo, i, foos[i].time_requested);
-    }
-  else
-    timer_call (bar, (any) & b, random_f64 ());
-
-  while (vec_len (timers) > 0)
-    sched_yield ();
-
-  if (vec_len (foos) > 0)
-    {
-      f64 min = 1e100, max = -min;
-      f64 ave = 0, rms = 0;
-
-      for (i = 0; i < n; i++)
-	{
-	  f64 dt = foos[i].time_requested - foos[i].time_called;
-	  if (dt < min)
-	    min = dt;
-	  if (dt > max)
-	    max = dt;
-	  ave += dt;
-	  rms += dt * dt;
-	}
-      ave /= n;
-      rms = sqrt (rms / n - ave * ave);
-      fformat (stdout, "error min %g max %g ave %g +- %g\n", min, max, ave,
-	       rms);
-    }
-
-  fformat (stdout, "%d function calls, ave. timer delay %g secs\n",
-	   ave_delay_count, ave_delay / ave_delay_count);
-
-  return 0;
-}
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/timer.h b/vppinfra/vppinfra/timer.h
deleted file mode 100644
index 764103f7..00000000
--- a/vppinfra/vppinfra/timer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_timer_h
-#define included_timer_h
-
-#include <signal.h>
-
-typedef void (timer_func_t) (any arg, f64 delay);
-
-/* Arrange for function to be called after time interval (in seconds) has elapsed. */
-extern void timer_call (timer_func_t * func, any arg, f64 time_interval);
-
-/* Block/unblock timer interrupts. */
-extern void timer_block (sigset_t * save);
-extern void timer_unblock (sigset_t * save);
-
-#endif /* included_timer_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/timing_wheel.c b/vppinfra/vppinfra/timing_wheel.c
deleted file mode 100644
index 4c8a2c58..00000000
--- a/vppinfra/vppinfra/timing_wheel.c
+++ /dev/null
@@ -1,750 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vppinfra/bitmap.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/timing_wheel.h>
-
-void
-timing_wheel_init (timing_wheel_t * w, u64 current_cpu_time,
-		   f64 cpu_clocks_per_second)
-{
-  if (w->max_sched_time <= w->min_sched_time)
-    {
-      w->min_sched_time = 1e-6;
-      w->max_sched_time = 1e-3;
-    }
-
-  w->cpu_clocks_per_second = cpu_clocks_per_second;
-  w->log2_clocks_per_bin =
-    max_log2 (w->cpu_clocks_per_second * w->min_sched_time);
-  w->log2_bins_per_wheel =
-    max_log2 (w->cpu_clocks_per_second * w->max_sched_time);
-  w->log2_bins_per_wheel -= w->log2_clocks_per_bin;
-  w->log2_clocks_per_wheel = w->log2_bins_per_wheel + w->log2_clocks_per_bin;
-  w->bins_per_wheel = 1 << w->log2_bins_per_wheel;
-  w->bins_per_wheel_mask = w->bins_per_wheel - 1;
-
-  w->current_time_index = current_cpu_time >> w->log2_clocks_per_bin;
-
-  if (w->n_wheel_elt_time_bits <= 0 ||
-      w->n_wheel_elt_time_bits >= STRUCT_BITS_OF (timing_wheel_elt_t,
-						  cpu_time_relative_to_base))
-    w->n_wheel_elt_time_bits =
-      STRUCT_BITS_OF (timing_wheel_elt_t, cpu_time_relative_to_base) - 1;
-
-  w->cpu_time_base = current_cpu_time;
-  w->time_index_next_cpu_time_base_update
-    =
-    w->current_time_index +
-    ((u64) 1 << (w->n_wheel_elt_time_bits - w->log2_clocks_per_bin));
-}
-
-always_inline uword
-get_level_and_relative_time (timing_wheel_t * w, u64 cpu_time,
-			     uword * rtime_result)
-{
-  u64 dt, rtime;
-  uword level_index;
-
-  dt = (cpu_time >> w->log2_clocks_per_bin);
-
-  /* Time should always move forward. */
-  ASSERT (dt >= w->current_time_index);
-
-  dt -= w->current_time_index;
-
-  /* Find level and offset within level.  Level i has bins of size 2^((i+1)*M) */
-  rtime = dt;
-  for (level_index = 0; (rtime >> w->log2_bins_per_wheel) != 0; level_index++)
-    rtime = (rtime >> w->log2_bins_per_wheel) - 1;
-
-  /* Return offset within level and level index. */
-  ASSERT (rtime < w->bins_per_wheel);
-  *rtime_result = rtime;
-  return level_index;
-}
-
-always_inline uword
-time_index_to_wheel_index (timing_wheel_t * w, uword level_index, u64 ti)
-{
-  return (ti >> (level_index * w->log2_bins_per_wheel)) &
-    w->bins_per_wheel_mask;
-}
-
-/* Find current time on this level. */
-always_inline uword
-current_time_wheel_index (timing_wheel_t * w, uword level_index)
-{
-  return time_index_to_wheel_index (w, level_index, w->current_time_index);
-}
-
-/* Circular wheel indexing. */
-always_inline uword
-wheel_add (timing_wheel_t * w, word x)
-{
-  return x & w->bins_per_wheel_mask;
-}
-
-always_inline uword
-rtime_to_wheel_index (timing_wheel_t * w, uword level_index, uword rtime)
-{
-  uword t = current_time_wheel_index (w, level_index);
-  return wheel_add (w, t + rtime);
-}
-
-static clib_error_t *
-validate_level (timing_wheel_t * w, uword level_index, uword * n_elts)
-{
-  timing_wheel_level_t *level;
-  timing_wheel_elt_t *e;
-  uword wi;
-  clib_error_t *error = 0;
-
-#define _(x)					\
-  do {						\
-    error = CLIB_ERROR_ASSERT (x);		\
-    ASSERT (! error);				\
-    if (error) return error;			\
-  } while (0)
-
-  level = vec_elt_at_index (w->levels, level_index);
-  for (wi = 0; wi < vec_len (level->elts); wi++)
-    {
-      /* Validate occupancy bitmap. */
-      _(clib_bitmap_get_no_check (level->occupancy_bitmap, wi) ==
-	(vec_len (level->elts[wi]) > 0));
-
-      *n_elts += vec_len (level->elts[wi]);
-
-      vec_foreach (e, level->elts[wi])
-      {
-	/* Validate time bin and level. */
-	u64 e_time;
-	uword e_ti, e_li, e_wi;
-
-	e_time = e->cpu_time_relative_to_base + w->cpu_time_base;
-	e_li = get_level_and_relative_time (w, e_time, &e_ti);
-	e_wi = rtime_to_wheel_index (w, level_index, e_ti);
-
-	if (e_li == level_index - 1)
-	  /* If this element was scheduled on the previous level
-	     it must be wrapped. */
-	  _(e_ti + current_time_wheel_index (w, level_index - 1)
-	    >= w->bins_per_wheel);
-	else
-	  {
-	    _(e_li == level_index);
-	    if (e_li == 0)
-	      _(e_wi == wi);
-	    else
-	      _(e_wi == wi || e_wi + 1 == wi || e_wi - 1 == wi);
-	  }
-      }
-    }
-
-#undef _
-
-  return error;
-}
-
-void
-timing_wheel_validate (timing_wheel_t * w)
-{
-  uword l;
-  clib_error_t *error = 0;
-  uword n_elts;
-
-  if (!w->validate)
-    return;
-
-  n_elts = pool_elts (w->overflow_pool);
-  for (l = 0; l < vec_len (w->levels); l++)
-    {
-      error = validate_level (w, l, &n_elts);
-      if (error)
-	clib_error_report (error);
-    }
-}
-
-always_inline void
-free_elt_vector (timing_wheel_t * w, timing_wheel_elt_t * ev)
-{
-  /* Poison free elements so we never use them by mistake. */
-  if (CLIB_DEBUG > 0)
-    memset (ev, ~0, vec_len (ev) * sizeof (ev[0]));
-  _vec_len (ev) = 0;
-  vec_add1 (w->free_elt_vectors, ev);
-}
-
-static timing_wheel_elt_t *
-insert_helper (timing_wheel_t * w, uword level_index, uword rtime)
-{
-  timing_wheel_level_t *level;
-  timing_wheel_elt_t *e;
-  uword wheel_index;
-
-  /* Circular buffer. */
-  vec_validate (w->levels, level_index);
-  level = vec_elt_at_index (w->levels, level_index);
-
-  if (PREDICT_FALSE (!level->elts))
-    {
-      uword max = w->bins_per_wheel - 1;
-      clib_bitmap_validate (level->occupancy_bitmap, max);
-      vec_validate (level->elts, max);
-    }
-
-  wheel_index = rtime_to_wheel_index (w, level_index, rtime);
-
-  level->occupancy_bitmap =
-    clib_bitmap_ori (level->occupancy_bitmap, wheel_index);
-
-  /* Allocate an elt vector from free list if there is one. */
-  if (!level->elts[wheel_index] && vec_len (w->free_elt_vectors))
-    level->elts[wheel_index] = vec_pop (w->free_elt_vectors);
-
-  /* Add element to vector for this time bin. */
-  vec_add2 (level->elts[wheel_index], e, 1);
-
-  return e;
-}
-
-/* Insert user data on wheel at given CPU time stamp. */
-static void
-timing_wheel_insert_helper (timing_wheel_t * w, u64 insert_cpu_time,
-			    u32 user_data)
-{
-  timing_wheel_elt_t *e;
-  u64 dt;
-  uword rtime, level_index;
-
-  level_index = get_level_and_relative_time (w, insert_cpu_time, &rtime);
-
-  dt = insert_cpu_time - w->cpu_time_base;
-  if (PREDICT_TRUE (0 == (dt >> BITS (e->cpu_time_relative_to_base))))
-    {
-      e = insert_helper (w, level_index, rtime);
-      e->user_data = user_data;
-      e->cpu_time_relative_to_base = dt;
-    }
-  else
-    {
-      /* Time too far in the future: add to overflow vector. */
-      timing_wheel_overflow_elt_t *oe;
-      pool_get (w->overflow_pool, oe);
-      oe->user_data = user_data;
-      oe->cpu_time = insert_cpu_time;
-    }
-}
-
-always_inline uword
-elt_is_deleted (timing_wheel_t * w, u32 user_data)
-{
-  return (hash_elts (w->deleted_user_data_hash) > 0
-	  && hash_get (w->deleted_user_data_hash, user_data));
-}
-
-static timing_wheel_elt_t *
-delete_user_data (timing_wheel_elt_t * elts, u32 user_data)
-{
-  uword found_match;
-  timing_wheel_elt_t *e, *new_elts;
-
-  /* Quickly scan to see if there are any elements to delete
-     in this bucket. */
-  found_match = 0;
-  vec_foreach (e, elts)
-  {
-    found_match = e->user_data == user_data;
-    if (found_match)
-      break;
-  }
-  if (!found_match)
-    return elts;
-
-  /* Re-scan to build vector of new elts with matching user_data deleted. */
-  new_elts = 0;
-  vec_foreach (e, elts)
-  {
-    if (e->user_data != user_data)
-      vec_add1 (new_elts, e[0]);
-  }
-
-  vec_free (elts);
-  return new_elts;
-}
-
-/* Insert user data on wheel at given CPU time stamp. */
-void
-timing_wheel_insert (timing_wheel_t * w, u64 insert_cpu_time, u32 user_data)
-{
-  /* Remove previously deleted elements. */
-  if (elt_is_deleted (w, user_data))
-    {
-      timing_wheel_level_t *l;
-      uword wi;
-
-      /* Delete elts with given user data so that stale events don't expire. */
-      vec_foreach (l, w->levels)
-      {
-	  /* *INDENT-OFF* */
-	  clib_bitmap_foreach (wi, l->occupancy_bitmap, ({
-	    l->elts[wi] = delete_user_data (l->elts[wi], user_data);
-	    if (vec_len (l->elts[wi]) == 0)
-	      l->occupancy_bitmap = clib_bitmap_andnoti (l->occupancy_bitmap, wi);
-	  }));
-	  /* *INDENT-ON* */
-      }
-
-      {
-	timing_wheel_overflow_elt_t *oe;
-	/* *INDENT-OFF* */
-	pool_foreach (oe, w->overflow_pool, ({
-	  if (oe->user_data == user_data)
-	    pool_put (w->overflow_pool, oe);
-	}));
-	/* *INDENT-ON* */
-      }
-
-      hash_unset (w->deleted_user_data_hash, user_data);
-    }
-
-  timing_wheel_insert_helper (w, insert_cpu_time, user_data);
-}
-
-void
-timing_wheel_delete (timing_wheel_t * w, u32 user_data)
-{
-  if (!w->deleted_user_data_hash)
-    w->deleted_user_data_hash =
-      hash_create ( /* capacity */ 0, /* value bytes */ 0);
-
-  hash_set1 (w->deleted_user_data_hash, user_data);
-}
-
-/* Returns time of next expiring element. */
-u64
-timing_wheel_next_expiring_elt_time (timing_wheel_t * w)
-{
-  timing_wheel_level_t *l;
-  timing_wheel_elt_t *e;
-  uword li, wi, wi0;
-  u32 min_dt;
-  u64 min_t;
-  uword wrapped = 0;
-
-  min_dt = ~0;
-  min_t = ~0ULL;
-  vec_foreach (l, w->levels)
-  {
-    if (!l->occupancy_bitmap)
-      continue;
-
-    li = l - w->levels;
-    wi0 = wi = current_time_wheel_index (w, li);
-    wrapped = 0;
-    while (1)
-      {
-	if (clib_bitmap_get_no_check (l->occupancy_bitmap, wi))
-	  {
-	    vec_foreach (e, l->elts[wi])
-	      min_dt = clib_min (min_dt, e->cpu_time_relative_to_base);
-
-	    if (wrapped && li + 1 < vec_len (w->levels))
-	      {
-		uword wi1 = current_time_wheel_index (w, li + 1);
-		if (l[1].occupancy_bitmap
-		    && clib_bitmap_get_no_check (l[1].occupancy_bitmap, wi1))
-		  {
-		    vec_foreach (e, l[1].elts[wi1])
-		    {
-		      min_dt =
-			clib_min (min_dt, e->cpu_time_relative_to_base);
-		    }
-		  }
-	      }
-
-	    min_t = w->cpu_time_base + min_dt;
-	    goto done;
-	  }
-
-	wi = wheel_add (w, wi + 1);
-	if (wi == wi0)
-	  break;
-
-	wrapped = wi != wi + 1;
-      }
-  }
-
-  {
-    timing_wheel_overflow_elt_t *oe;
-
-    if (min_dt != ~0)
-      min_t = w->cpu_time_base + min_dt;
-
-    /* *INDENT-OFF* */
-    pool_foreach (oe, w->overflow_pool,
-		  ({ min_t = clib_min (min_t, oe->cpu_time); }));
-    /* *INDENT-ON* */
-
-  done:
-    return min_t;
-  }
-}
-
-static inline void
-insert_elt (timing_wheel_t * w, timing_wheel_elt_t * e)
-{
-  u64 t = w->cpu_time_base + e->cpu_time_relative_to_base;
-  timing_wheel_insert_helper (w, t, e->user_data);
-}
-
-always_inline u64
-elt_cpu_time (timing_wheel_t * w, timing_wheel_elt_t * e)
-{
-  return w->cpu_time_base + e->cpu_time_relative_to_base;
-}
-
-always_inline void
-validate_expired_elt (timing_wheel_t * w, timing_wheel_elt_t * e,
-		      u64 current_cpu_time)
-{
-  if (CLIB_DEBUG > 0)
-    {
-      u64 e_time = elt_cpu_time (w, e);
-
-      /* Verify that element is actually expired. */
-      ASSERT ((e_time >> w->log2_clocks_per_bin)
-	      <= (current_cpu_time >> w->log2_clocks_per_bin));
-    }
-}
-
-static u32 *
-expire_bin (timing_wheel_t * w,
-	    uword level_index,
-	    uword wheel_index, u64 advance_cpu_time, u32 * expired_user_data)
-{
-  timing_wheel_level_t *level = vec_elt_at_index (w->levels, level_index);
-  timing_wheel_elt_t *e;
-  u32 *x;
-  uword i, j, e_len;
-
-  e = vec_elt (level->elts, wheel_index);
-  e_len = vec_len (e);
-
-  vec_add2 (expired_user_data, x, e_len);
-  for (i = j = 0; i < e_len; i++)
-    {
-      validate_expired_elt (w, &e[i], advance_cpu_time);
-      x[j] = e[i].user_data;
-
-      /* Only advance if elt is not to be deleted. */
-      j += !elt_is_deleted (w, e[i].user_data);
-    }
-
-  /* Adjust for deleted elts. */
-  if (j < e_len)
-    _vec_len (expired_user_data) -= e_len - j;
-
-  free_elt_vector (w, e);
-
-  level->elts[wheel_index] = 0;
-  clib_bitmap_set_no_check (level->occupancy_bitmap, wheel_index, 0);
-
-  return expired_user_data;
-}
-
-/* Called rarely. 32 bit times should only overflow every 4 seconds or so on a fast machine. */
-static u32 *
-advance_cpu_time_base (timing_wheel_t * w, u32 * expired_user_data)
-{
-  timing_wheel_level_t *l;
-  timing_wheel_elt_t *e;
-  u64 delta;
-
-  w->stats.cpu_time_base_advances++;
-  delta = ((u64) 1 << w->n_wheel_elt_time_bits);
-  w->cpu_time_base += delta;
-  w->time_index_next_cpu_time_base_update += delta >> w->log2_clocks_per_bin;
-
-  vec_foreach (l, w->levels)
-  {
-    uword wi;
-      /* *INDENT-OFF* */
-      clib_bitmap_foreach (wi, l->occupancy_bitmap, ({
-	vec_foreach (e, l->elts[wi])
-	  {
-	    /* This should always be true since otherwise we would have already expired
-	       this element. */
-	    ASSERT (e->cpu_time_relative_to_base >= delta);
-	    e->cpu_time_relative_to_base -= delta;
-	  }
-      }));
-      /* *INDENT-ON* */
-  }
-
-  /* See which overflow elements fit now. */
-  {
-    timing_wheel_overflow_elt_t *oe;
-    /* *INDENT-OFF* */
-    pool_foreach (oe, w->overflow_pool, ({
-      /* It fits now into 32 bits. */
-      if (0 == ((oe->cpu_time - w->cpu_time_base) >> BITS (e->cpu_time_relative_to_base)))
-	{
-	  u64 ti = oe->cpu_time >> w->log2_clocks_per_bin;
-	  if (ti < w->current_time_index)
-	    {
-	      /* This can happen when timing wheel is not advanced for a long time
-		 (for example when at a gdb breakpoint for a while). */
-	      if (! elt_is_deleted (w, oe->user_data))
-		vec_add1 (expired_user_data, oe->user_data);
-	    }
-	  else
-	    timing_wheel_insert_helper (w, oe->cpu_time, oe->user_data);
-	  pool_put (w->overflow_pool, oe);
-	}
-    }));
-    /* *INDENT-ON* */
-  }
-  return expired_user_data;
-}
-
-static u32 *
-refill_level (timing_wheel_t * w,
-	      uword level_index,
-	      u64 advance_cpu_time,
-	      uword from_wheel_index,
-	      uword to_wheel_index, u32 * expired_user_data)
-{
-  timing_wheel_level_t *level;
-  timing_wheel_elt_t *to_insert = w->unexpired_elts_pending_insert;
-  u64 advance_time_index = advance_cpu_time >> w->log2_clocks_per_bin;
-
-  vec_validate (w->stats.refills, level_index);
-  w->stats.refills[level_index] += 1;
-
-  if (level_index + 1 >= vec_len (w->levels))
-    goto done;
-
-  level = vec_elt_at_index (w->levels, level_index + 1);
-  if (!level->occupancy_bitmap)
-    goto done;
-
-  while (1)
-    {
-      timing_wheel_elt_t *e, *es;
-
-      if (clib_bitmap_get_no_check
-	  (level->occupancy_bitmap, from_wheel_index))
-	{
-	  es = level->elts[from_wheel_index];
-	  level->elts[from_wheel_index] = 0;
-	  clib_bitmap_set_no_check (level->occupancy_bitmap, from_wheel_index,
-				    0);
-
-	  vec_foreach (e, es)
-	  {
-	    u64 e_time = elt_cpu_time (w, e);
-	    u64 ti = e_time >> w->log2_clocks_per_bin;
-	    if (ti <= advance_time_index)
-	      {
-		validate_expired_elt (w, e, advance_cpu_time);
-		if (!elt_is_deleted (w, e->user_data))
-		  vec_add1 (expired_user_data, e->user_data);
-	      }
-	    else
-	      vec_add1 (to_insert, e[0]);
-	  }
-	  free_elt_vector (w, es);
-	}
-
-      if (from_wheel_index == to_wheel_index)
-	break;
-
-      from_wheel_index = wheel_add (w, from_wheel_index + 1);
-    }
-
-  timing_wheel_validate (w);
-done:
-  w->unexpired_elts_pending_insert = to_insert;
-  return expired_user_data;
-}
-
-/* Advance wheel and return any expired user data in vector. */
-u32 *
-timing_wheel_advance (timing_wheel_t * w, u64 advance_cpu_time,
-		      u32 * expired_user_data,
-		      u64 * next_expiring_element_cpu_time)
-{
-  timing_wheel_level_t *level;
-  uword level_index, advance_rtime, advance_level_index, advance_wheel_index;
-  uword n_expired_user_data_before;
-  u64 current_time_index, advance_time_index;
-
-  n_expired_user_data_before = vec_len (expired_user_data);
-
-  /* Re-fill lower levels when time wraps. */
-  current_time_index = w->current_time_index;
-  advance_time_index = advance_cpu_time >> w->log2_clocks_per_bin;
-
-  {
-    u64 current_ti, advance_ti;
-
-    current_ti = current_time_index >> w->log2_bins_per_wheel;
-    advance_ti = advance_time_index >> w->log2_bins_per_wheel;
-
-    if (PREDICT_FALSE (current_ti != advance_ti))
-      {
-	if (w->unexpired_elts_pending_insert)
-	  _vec_len (w->unexpired_elts_pending_insert) = 0;
-
-	level_index = 0;
-	while (current_ti != advance_ti)
-	  {
-	    uword c, a;
-	    c = current_ti & (w->bins_per_wheel - 1);
-	    a = advance_ti & (w->bins_per_wheel - 1);
-	    if (c != a)
-	      expired_user_data = refill_level (w,
-						level_index,
-						advance_cpu_time,
-						c, a, expired_user_data);
-	    current_ti >>= w->log2_bins_per_wheel;
-	    advance_ti >>= w->log2_bins_per_wheel;
-	    level_index++;
-	  }
-      }
-  }
-
-  advance_level_index =
-    get_level_and_relative_time (w, advance_cpu_time, &advance_rtime);
-  advance_wheel_index =
-    rtime_to_wheel_index (w, advance_level_index, advance_rtime);
-
-  /* Empty all occupied bins for entire levels that we advance past. */
-  for (level_index = 0; level_index < advance_level_index; level_index++)
-    {
-      uword wi;
-
-      if (level_index >= vec_len (w->levels))
-	break;
-
-      level = vec_elt_at_index (w->levels, level_index);
-      /* *INDENT-OFF* */
-      clib_bitmap_foreach (wi, level->occupancy_bitmap, ({
-        expired_user_data = expire_bin (w, level_index, wi, advance_cpu_time,
-					expired_user_data);
-      }));
-      /* *INDENT-ON* */
-    }
-
-  if (PREDICT_TRUE (level_index < vec_len (w->levels)))
-    {
-      uword wi;
-      level = vec_elt_at_index (w->levels, level_index);
-      wi = current_time_wheel_index (w, level_index);
-      if (level->occupancy_bitmap)
-	while (1)
-	  {
-	    if (clib_bitmap_get_no_check (level->occupancy_bitmap, wi))
-	      expired_user_data =
-		expire_bin (w, advance_level_index, wi, advance_cpu_time,
-			    expired_user_data);
-
-	    if (wi == advance_wheel_index)
-	      break;
-
-	    wi = wheel_add (w, wi + 1);
-	  }
-    }
-
-  /* Advance current time index. */
-  w->current_time_index = advance_time_index;
-
-  if (vec_len (w->unexpired_elts_pending_insert) > 0)
-    {
-      timing_wheel_elt_t *e;
-      vec_foreach (e, w->unexpired_elts_pending_insert) insert_elt (w, e);
-      _vec_len (w->unexpired_elts_pending_insert) = 0;
-    }
-
-  /* Don't advance until necessary. */
-  while (PREDICT_FALSE
-	 (advance_time_index >= w->time_index_next_cpu_time_base_update))
-    expired_user_data = advance_cpu_time_base (w, expired_user_data);
-
-  if (next_expiring_element_cpu_time)
-    {
-      u64 min_t;
-
-      /* Anything expired?  If so we need to recompute next expiring elt time. */
-      if (vec_len (expired_user_data) == n_expired_user_data_before
-	  && w->cached_min_cpu_time_on_wheel != 0ULL)
-	min_t = w->cached_min_cpu_time_on_wheel;
-      else
-	{
-	  min_t = timing_wheel_next_expiring_elt_time (w);
-	  w->cached_min_cpu_time_on_wheel = min_t;
-	}
-
-      *next_expiring_element_cpu_time = min_t;
-    }
-
-  return expired_user_data;
-}
-
-u8 *
-format_timing_wheel (u8 * s, va_list * va)
-{
-  timing_wheel_t *w = va_arg (*va, timing_wheel_t *);
-  int verbose = va_arg (*va, int);
-  uword indent = format_get_indent (s);
-
-  s = format (s, "level 0: %.4e - %.4e secs, 2^%d - 2^%d clocks",
-	      (f64) (1 << w->log2_clocks_per_bin) / w->cpu_clocks_per_second,
-	      (f64) (1 << w->log2_clocks_per_wheel) /
-	      w->cpu_clocks_per_second, w->log2_clocks_per_bin,
-	      w->log2_clocks_per_wheel);
-
-  if (verbose)
-    {
-      int l;
-
-      s = format (s, "\n%Utime base advances %Ld, every %.4e secs",
-		  format_white_space, indent + 2,
-		  w->stats.cpu_time_base_advances,
-		  (f64) ((u64) 1 << w->n_wheel_elt_time_bits) /
-		  w->cpu_clocks_per_second);
-
-      for (l = 0; l < vec_len (w->levels); l++)
-	s = format (s, "\n%Ulevel %d: refills %Ld",
-		    format_white_space, indent + 2,
-		    l,
-		    l <
-		    vec_len (w->stats.refills) ? w->stats.
-		    refills[l] : (u64) 0);
-    }
-
-  return s;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/timing_wheel.h b/vppinfra/vppinfra/timing_wheel.h
deleted file mode 100644
index 7daea994..00000000
--- a/vppinfra/vppinfra/timing_wheel.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_clib_timing_wheel_h
-#define included_clib_timing_wheel_h
-
-#include <vppinfra/format.h>
-
-typedef struct
-{
-  /* Time of this element in units cpu clock ticks relative to time
-     base. 32 bits should be large enough for serveral kilo-seconds
-     to elapse before we have to re-set time base. */
-  u32 cpu_time_relative_to_base;
-
-  /* User data to store in this bin. */
-  u32 user_data;
-} timing_wheel_elt_t;
-
-/* Overflow wheel elements where time does not fit into 32 bits. */
-typedef struct
-{
-  /* Absolute time of this element. */
-  u64 cpu_time;
-
-  /* User data to store in this bin. */
-  u32 user_data;
-
-  u32 pad;
-} timing_wheel_overflow_elt_t;
-
-typedef struct
-{
-  /* 2^M bits: 1 means vector is non-zero else zero. */
-  uword *occupancy_bitmap;
-
-  /* 2^M element table of element vectors, one for each time bin. */
-  timing_wheel_elt_t **elts;
-} timing_wheel_level_t;
-
-typedef struct
-{
-  /* Vector of refill counts per level. */
-  u64 *refills;
-
-  /* Number of times cpu time base was rescaled. */
-  u64 cpu_time_base_advances;
-} timing_wheel_stats_t;
-
-typedef struct
-{
-  /* Each bin is a power of two clock ticks (N)
-     chosen so that 2^N >= min_sched_time. */
-  u8 log2_clocks_per_bin;
-
-  /* Wheels are 2^M bins where 2^(N+M) >= max_sched_time. */
-  u8 log2_bins_per_wheel;
-
-  /* N + M. */
-  u8 log2_clocks_per_wheel;
-
-  /* Number of bits to use in cpu_time_relative_to_base field
-     of timing_wheel_elt_t. */
-  u8 n_wheel_elt_time_bits;
-
-  /* 2^M. */
-  u32 bins_per_wheel;
-
-  /* 2^M - 1. */
-  u32 bins_per_wheel_mask;
-
-  timing_wheel_level_t *levels;
-
-  timing_wheel_overflow_elt_t *overflow_pool;
-
-  /* Free list of element vector so we can recycle old allocated vectors. */
-  timing_wheel_elt_t **free_elt_vectors;
-
-  timing_wheel_elt_t *unexpired_elts_pending_insert;
-
-  /* Hash table of user data values which have been deleted but not yet re-inserted. */
-  uword *deleted_user_data_hash;
-
-  /* Enable validation for debugging. */
-  u32 validate;
-
-  /* Time index.  Measures time in units of 2^N clock ticks from
-     when wheel starts. */
-  u64 current_time_index;
-
-  /* All times are 32 bit numbers relative to cpu_time_base.
-     So, roughly every 2^(32 + N) clocks we'll need to subtract from
-     all timing_wheel_elt_t times to make sure they never overflow. */
-  u64 cpu_time_base;
-
-  /* When current_time_index is >= this we update cpu_time_base
-     to avoid overflowing 32 bit cpu_time_relative_to_base
-     in timing_wheel_elt_t. */
-  u64 time_index_next_cpu_time_base_update;
-
-  /* Cached earliest element on wheel; 0 if not valid. */
-  u64 cached_min_cpu_time_on_wheel;
-
-  f64 min_sched_time, max_sched_time, cpu_clocks_per_second;
-
-  timing_wheel_stats_t stats;
-} timing_wheel_t;
-
-/* Initialization function. */
-void timing_wheel_init (timing_wheel_t * w,
-			u64 current_cpu_time, f64 cpu_clocks_per_second);
-
-/* Insert user data on wheel at given CPU time stamp. */
-void timing_wheel_insert (timing_wheel_t * w, u64 insert_cpu_time,
-			  u32 user_data);
-
-/* Delete user data from wheel (until it is again inserted). */
-void timing_wheel_delete (timing_wheel_t * w, u32 user_data);
-
-/* Advance wheel and return any expired user data in vector.  If non-zero
-   min_next_expiring_element_cpu_time will return a cpu time stamp
-   before which there are guaranteed to be no elements in the current wheel. */
-u32 *timing_wheel_advance (timing_wheel_t * w, u64 advance_cpu_time,
-			   u32 * expired_user_data,
-			   u64 * min_next_expiring_element_cpu_time);
-
-/* Returns absolute time in clock cycles of next expiring element. */
-u64 timing_wheel_next_expiring_elt_time (timing_wheel_t * w);
-
-/* Format a timing wheel. */
-format_function_t format_timing_wheel;
-
-/* Testing function to validate wheel. */
-void timing_wheel_validate (timing_wheel_t * w);
-
-#endif /* included_clib_timing_wheel_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/types.h b/vppinfra/vppinfra/types.h
deleted file mode 100644
index f87bb48c..00000000
--- a/vppinfra/vppinfra/types.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001-2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_types_h
-#define included_clib_types_h
-
-/* Standard CLIB types. */
-
-/* Define signed and unsigned 8, 16, 32, and 64 bit types
-   and machine signed/unsigned word for all architectures. */
-typedef char i8;
-typedef short i16;
-
-/* Avoid conflicts with Linux asm/types.h when __KERNEL__ */
-#if defined(CLIB_LINUX_KERNEL)
-/* Linux also defines u8/u16/u32/u64 types. */
-#include <asm/types.h>
-#define CLIB_AVOID_CLASH_WITH_LINUX_TYPES
-
-#else /* ! CLIB_LINUX_KERNEL */
-
-typedef unsigned char u8;
-typedef unsigned short u16;
-#endif /* ! CLIB_LINUX_KERNEL */
-
-#if defined (__x86_64__)
-#ifndef __COVERITY__
-typedef int i128 __attribute__ ((mode (TI)));
-typedef unsigned int u128 __attribute__ ((mode (TI)));
-#endif
-#endif
-
-#if (defined(i386) || defined(_mips) || defined(powerpc) || defined (__SPU__) || defined(__sparc__) || defined(__arm__) || defined (__xtensa__) || defined(__TMS320C6X__))
-typedef int i32;
-typedef long long i64;
-
-#ifndef CLIB_AVOID_CLASH_WITH_LINUX_TYPES
-typedef unsigned int u32;
-typedef unsigned long long u64;
-#endif /* CLIB_AVOID_CLASH_WITH_LINUX_TYPES */
-
-#elif defined(_mips) && __mips == 64
-#define log2_uword_bits 6
-#define clib_address_bits _MIPS_SZPTR
-
-#elif defined(alpha) || defined(__x86_64__) || defined (__powerpc64__) || defined (__aarch64__)
-typedef int i32;
-typedef long i64;
-
-#define log2_uword_bits 6
-#define clib_address_bits 64
-
-#ifndef CLIB_AVOID_CLASH_WITH_LINUX_TYPES
-typedef unsigned int u32;
-typedef unsigned long u64;
-#endif /* CLIB_AVOID_CLASH_WITH_LINUX_TYPES */
-
-#else
-#error "can't define types"
-#endif
-
-/* Default to 32 bit machines with 32 bit addresses. */
-#ifndef log2_uword_bits
-#define log2_uword_bits 5
-#endif
-
-/* #ifdef's above define log2_uword_bits. */
-#define uword_bits (1 << log2_uword_bits)
-
-#ifndef clib_address_bits
-#define clib_address_bits 32
-#endif
-
-/* Word types. */
-#if uword_bits == 64
-/* 64 bit word machines. */
-typedef i64 word;
-typedef u64 uword;
-#else
-/* 32 bit word machines. */
-typedef i32 word;
-typedef u32 uword;
-#endif
-
-/* integral type of a pointer (used to cast pointers). */
-#if clib_address_bits == 64
-typedef u64 clib_address_t;
-#else
-typedef u32 clib_address_t;
-#endif
-
-/* These are needed to convert between pointers and machine words.
-   MIPS is currently the only machine that can have different sized
-   pointers and machine words (but only when compiling with 64 bit
-   registers and 32 bit pointers). */
-static inline __attribute__ ((always_inline)) uword
-pointer_to_uword (const void *p)
-{
-  return (uword) (clib_address_t) p;
-}
-
-#define uword_to_pointer(u,type) ((type) (clib_address_t) (u))
-
-/* Any type: can be either word or pointer. */
-typedef word any;
-
-/* Floating point types. */
-typedef double f64;
-typedef float f32;
-
-typedef __complex__ float cf32;
-typedef __complex__ double cf64;
-
-/* Floating point word size. */
-typedef f64 fword;
-
-/* Can be used as either {r,l}value, e.g. these both work
-     clib_mem_unaligned (p, u64) = 99
-     clib_mem_unaligned (p, u64) += 99 */
-
-#define clib_mem_unaligned(pointer,type) \
-  (((struct { CLIB_PACKED (type _data); } *) (pointer))->_data)
-
-/* Access memory with specified alignment depending on align argument.
-   As with clib_mem_unaligned, may be used as {r,l}value. */
-#define clib_mem_aligned(addr,type,align)		\
-  (((struct {						\
-       type _data					\
-       __attribute__ ((aligned (align), packed));	\
-    } *) (addr))->_data)
-
-#endif /* included_clib_types_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/unformat.c b/vppinfra/vppinfra/unformat.c
deleted file mode 100644
index ac8b7ddc..00000000
--- a/vppinfra/vppinfra/unformat.c
+++ /dev/null
@@ -1,1077 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/format.h>
-
-/* Call user's function to fill input buffer. */
-uword
-_unformat_fill_input (unformat_input_t * i)
-{
-  uword l, first_mark;
-
-  if (i->index == UNFORMAT_END_OF_INPUT)
-    return i->index;
-
-  first_mark = l = vec_len (i->buffer);
-  if (vec_len (i->buffer_marks) > 0)
-    first_mark = i->buffer_marks[0];
-
-  /* Re-use buffer when no marks. */
-  if (first_mark > 0)
-    vec_delete (i->buffer, first_mark, 0);
-
-  i->index = vec_len (i->buffer);
-  for (l = 0; l < vec_len (i->buffer_marks); l++)
-    i->buffer_marks[l] -= first_mark;
-
-  /* Call user's function to fill the buffer. */
-  if (i->fill_buffer)
-    i->index = i->fill_buffer (i);
-
-  /* If input pointer is still beyond end of buffer even after
-     fill then we've run out of input. */
-  if (i->index >= vec_len (i->buffer))
-    i->index = UNFORMAT_END_OF_INPUT;
-
-  return i->index;
-}
-
-always_inline uword
-is_white_space (uword c)
-{
-  switch (c)
-    {
-    case ' ':
-    case '\t':
-    case '\n':
-    case '\r':
-      return 1;
-
-    default:
-      return 0;
-    }
-}
-
-/* Format function for dumping input stream. */
-u8 *
-format_unformat_error (u8 * s, va_list * va)
-{
-  unformat_input_t *i = va_arg (*va, unformat_input_t *);
-  uword l = vec_len (i->buffer);
-
-  /* Only show so much of the input buffer (it could be really large). */
-  uword n_max = 30;
-
-  if (i->index < l)
-    {
-      uword n = l - i->index;
-      u8 *p, *p_end;
-
-      p = i->buffer + i->index;
-      p_end = p + (n > n_max ? n_max : n);
-
-      /* Skip white space at end. */
-      if (n <= n_max)
-	{
-	  while (p_end > p && is_white_space (p_end[-1]))
-	    p_end--;
-	}
-
-      while (p < p_end)
-	{
-	  switch (*p)
-	    {
-	    case '\r':
-	      vec_add (s, "\\r", 2);
-	      break;
-	    case '\n':
-	      vec_add (s, "\\n", 2);
-	      break;
-	    case '\t':
-	      vec_add (s, "\\t", 2);
-	      break;
-	    default:
-	      vec_add1 (s, *p);
-	      break;
-	    }
-	  p++;
-	}
-
-      if (n > n_max)
-	vec_add (s, "...", 3);
-    }
-
-  return s;
-}
-
-/* Print everything: not just error context. */
-u8 *
-format_unformat_input (u8 * s, va_list * va)
-{
-  unformat_input_t *i = va_arg (*va, unformat_input_t *);
-  uword l, n;
-
-  if (i->index == UNFORMAT_END_OF_INPUT)
-    s = format (s, "{END_OF_INPUT}");
-  else
-    {
-      l = vec_len (i->buffer);
-      n = l - i->index;
-      if (n > 0)
-	vec_add (s, i->buffer + i->index, n);
-    }
-
-  return s;
-}
-
-#if CLIB_DEBUG > 0
-void
-di (unformat_input_t * i)
-{
-  fformat (stderr, "%U\n", format_unformat_input, i);
-}
-#endif
-
-/* Parse delimited vector string.  If string starts with { then string
-   is delimited by balenced parenthesis.  Other string is delimited by
-   white space.  {} were chosen since they are special to the shell. */
-static uword
-unformat_string (unformat_input_t * input,
-		 uword delimiter_character,
-		 uword format_character, va_list * va)
-{
-  u8 **string_return = va_arg (*va, u8 **);
-  u8 *s = 0;
-  word paren = 0;
-  word is_paren_delimited = 0;
-  word backslash = 0;
-  uword c;
-
-  switch (delimiter_character)
-    {
-    case '%':
-    case ' ':
-    case '\t':
-      delimiter_character = 0;
-      break;
-    }
-
-  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
-    {
-      word add_to_vector;
-
-      /* Null return string means to skip over delimited input. */
-      add_to_vector = string_return != 0;
-
-      if (backslash)
-	backslash = 0;
-      else
-	switch (c)
-	  {
-	  case '\\':
-	    backslash = 1;
-	    add_to_vector = 0;
-	    break;
-
-	  case '{':
-	    if (paren == 0 && vec_len (s) == 0)
-	      {
-		is_paren_delimited = 1;
-		add_to_vector = 0;
-	      }
-	    paren++;
-	    break;
-
-	  case '}':
-	    paren--;
-	    if (is_paren_delimited && paren == 0)
-	      goto done;
-	    break;
-
-	  case ' ':
-	  case '\t':
-	  case '\n':
-	  case '\r':
-	    if (!is_paren_delimited)
-	      {
-		unformat_put_input (input);
-		goto done;
-	      }
-	    break;
-
-	  default:
-	    if (!is_paren_delimited && c == delimiter_character)
-	      {
-		unformat_put_input (input);
-		goto done;
-	      }
-	  }
-
-      if (add_to_vector)
-	vec_add1 (s, c);
-    }
-
-done:
-  if (string_return)
-    {
-      /* Match the string { END-OF-INPUT as a single brace. */
-      if (c == UNFORMAT_END_OF_INPUT && vec_len (s) == 0 && paren == 1)
-	vec_add1 (s, '{');
-
-      /* Don't match null string. */
-      if (c == UNFORMAT_END_OF_INPUT && vec_len (s) == 0)
-	return 0;
-
-      /* Null terminate C string. */
-      if (format_character == 's')
-	vec_add1 (s, 0);
-
-      *string_return = s;
-    }
-  else
-    vec_free (s);		/* just to make sure */
-
-  return 1;
-}
-
-uword
-unformat_hex_string (unformat_input_t * input, va_list * va)
-{
-  u8 **hexstring_return = va_arg (*va, u8 **);
-  u8 *s;
-  uword n, d, c;
-
-  n = 0;
-  d = 0;
-  s = 0;
-  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
-    {
-      if (c >= '0' && c <= '9')
-	d = 16 * d + c - '0';
-      else if (c >= 'a' && c <= 'f')
-	d = 16 * d + 10 + c - 'a';
-      else if (c >= 'A' && c <= 'F')
-	d = 16 * d + 10 + c - 'A';
-      else
-	{
-	  unformat_put_input (input);
-	  break;
-	}
-      n++;
-
-      if (n == 2)
-	{
-	  vec_add1 (s, d);
-	  n = d = 0;
-	}
-    }
-
-  /* Hex string must have even number of digits. */
-  if (n % 2)
-    {
-      vec_free (s);
-      return 0;
-    }
-
-  *hexstring_return = s;
-  return 1;
-}
-
-/* unformat (input "foo%U", unformat_eof) matches terminal foo only */
-uword
-unformat_eof (unformat_input_t * input, va_list * va)
-{
-  return unformat_check_input (input) == UNFORMAT_END_OF_INPUT;
-}
-
-/* Parse a token containing given set of characters. */
-uword
-unformat_token (unformat_input_t * input, va_list * va)
-{
-  u8 *token_chars = va_arg (*va, u8 *);
-  u8 **string_return = va_arg (*va, u8 **);
-  u8 *s, map[256];
-  uword i, c;
-
-  if (!token_chars)
-    token_chars = (u8 *) "a-zA-Z0-9_";
-
-  memset (map, 0, sizeof (map));
-  for (s = token_chars; *s;)
-    {
-      /* Parse range. */
-      if (s[0] < s[2] && s[1] == '-')
-	{
-	  for (i = s[0]; i <= s[2]; i++)
-	    map[i] = 1;
-	  s = s + 3;
-	}
-      else
-	{
-	  map[s[0]] = 1;
-	  s = s + 1;
-	}
-    }
-
-  s = 0;
-  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
-    {
-      if (!map[c])
-	{
-	  unformat_put_input (input);
-	  break;
-	}
-
-      vec_add1 (s, c);
-    }
-
-  if (vec_len (s) == 0)
-    return 0;
-
-  *string_return = s;
-  return 1;
-}
-
-/* Unformat (parse) function which reads a %s string and converts it
-   to and unformat_input_t. */
-uword
-unformat_input (unformat_input_t * i, va_list * args)
-{
-  unformat_input_t *sub_input = va_arg (*args, unformat_input_t *);
-  u8 *s;
-
-  if (unformat (i, "%v", &s))
-    {
-      unformat_init_vector (sub_input, s);
-      return 1;
-    }
-
-  return 0;
-}
-
-/* Parse a line ending with \n and return it. */
-uword
-unformat_line (unformat_input_t * i, va_list * va)
-{
-  u8 *line = 0, **result = va_arg (*va, u8 **);
-  uword c;
-
-  while ((c = unformat_get_input (i)) != '\n' && c != UNFORMAT_END_OF_INPUT)
-    {
-      vec_add1 (line, c);
-    }
-
-  *result = line;
-  return 1;
-}
-
-/* Parse a line ending with \n and return it as an unformat_input_t. */
-uword
-unformat_line_input (unformat_input_t * i, va_list * va)
-{
-  unformat_input_t *result = va_arg (*va, unformat_input_t *);
-  u8 *line;
-  unformat_user (i, unformat_line, &line);
-  unformat_init_vector (result, line);
-  return 1;
-}
-
-/* Values for is_signed. */
-#define UNFORMAT_INTEGER_SIGNED		1
-#define UNFORMAT_INTEGER_UNSIGNED	0
-
-static uword
-unformat_integer (unformat_input_t * input,
-		  va_list * va, uword base, uword is_signed, uword data_bytes)
-{
-  uword c, digit;
-  uword value = 0;
-  uword n_digits = 0;
-  uword n_input = 0;
-  uword sign = 0;
-
-  /* We only support bases <= 64. */
-  if (base < 2 || base > 64)
-    goto error;
-
-  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
-    {
-      switch (c)
-	{
-	case '-':
-	  if (n_input == 0)
-	    {
-	      if (is_signed)
-		{
-		  sign = 1;
-		  goto next_digit;
-		}
-	      else
-		/* Leading sign for unsigned number. */
-		goto error;
-	    }
-	  /* Sign after input (e.g. 100-200). */
-	  goto put_input_done;
-
-	case '+':
-	  if (n_input > 0)
-	    goto put_input_done;
-	  sign = 0;
-	  goto next_digit;
-
-	case '0' ... '9':
-	  digit = c - '0';
-	  break;
-
-	case 'a' ... 'z':
-	  digit = 10 + (c - 'a');
-	  break;
-
-	case 'A' ... 'Z':
-	  digit = 10 + (base >= 36 ? 26 : 0) + (c - 'A');
-	  break;
-
-	case '/':
-	  digit = 62;
-	  break;
-
-	case '?':
-	  digit = 63;
-	  break;
-
-	default:
-	  goto put_input_done;
-	}
-
-      if (digit >= base)
-	{
-	put_input_done:
-	  unformat_put_input (input);
-	  goto done;
-	}
-
-      {
-	uword new_value = base * value + digit;
-
-	/* Check for overflow. */
-	if (new_value < value)
-	  goto error;
-	value = new_value;
-      }
-      n_digits += 1;
-
-    next_digit:
-      n_input++;
-    }
-
-done:
-  if (sign)
-    value = -value;
-
-  if (n_digits > 0)
-    {
-      void *v = va_arg (*va, void *);
-
-      if (data_bytes == ~0)
-	data_bytes = sizeof (int);
-
-      switch (data_bytes)
-	{
-	case 1:
-	  *(u8 *) v = value;
-	  break;
-	case 2:
-	  *(u16 *) v = value;
-	  break;
-	case 4:
-	  *(u32 *) v = value;
-	  break;
-	case 8:
-	  *(u64 *) v = value;
-	  break;
-	default:
-	  goto error;
-	}
-
-      return 1;
-    }
-
-error:
-  return 0;
-}
-
-/* Return x 10^n */
-static f64
-times_power_of_ten (f64 x, int n)
-{
-  if (n >= 0)
-    {
-      static f64 t[8] = { 1e+0, 1e+1, 1e+2, 1e+3, 1e+4, 1e+5, 1e+6, 1e+7, };
-      while (n >= 8)
-	{
-	  x *= 1e+8;
-	  n -= 8;
-	}
-      return x * t[n];
-    }
-  else
-    {
-      static f64 t[8] = { 1e-0, 1e-1, 1e-2, 1e-3, 1e-4, 1e-5, 1e-6, 1e-7, };
-      while (n <= -8)
-	{
-	  x *= 1e-8;
-	  n += 8;
-	}
-      return x * t[-n];
-    }
-
-}
-
-static uword
-unformat_float (unformat_input_t * input, va_list * va)
-{
-  uword c;
-  u64 values[3];
-  uword n_digits[3], value_index = 0;
-  uword signs[2], sign_index = 0;
-  uword n_input = 0;
-
-  memset (values, 0, sizeof (values));
-  memset (n_digits, 0, sizeof (n_digits));
-  memset (signs, 0, sizeof (signs));
-
-  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
-    {
-      switch (c)
-	{
-	case '-':
-	  if (value_index == 2 && n_digits[2] == 0)
-	    /* sign of exponent: it's ok. */ ;
-
-	  else if (value_index < 2 && n_digits[0] > 0)
-	    {
-	      /* 123- */
-	      unformat_put_input (input);
-	      goto done;
-	    }
-
-	  else if (n_input > 0)
-	    goto error;
-
-	  signs[sign_index++] = 1;
-	  goto next_digit;
-
-	case '+':
-	  if (value_index == 2 && n_digits[2] == 0)
-	    /* sign of exponent: it's ok. */ ;
-
-	  else if (value_index < 2 && n_digits[0] > 0)
-	    {
-	      /* 123+ */
-	      unformat_put_input (input);
-	      goto done;
-	    }
-
-	  else if (n_input > 0)
-	    goto error;
-	  signs[sign_index++] = 0;
-	  goto next_digit;
-
-	case 'e':
-	case 'E':
-	  if (n_input == 0)
-	    goto error;
-	  value_index = 2;
-	  sign_index = 1;
-	  break;
-
-	case '.':
-	  if (value_index > 0)
-	    goto error;
-	  value_index = 1;
-	  break;
-
-	case '0' ... '9':
-	  {
-	    u64 tmp;
-
-	    tmp = values[value_index] * 10 + c - '0';
-
-	    /* Check for overflow. */
-	    if (tmp < values[value_index])
-	      goto error;
-	    values[value_index] = tmp;
-	    n_digits[value_index] += 1;
-	  }
-	  break;
-
-	default:
-	  unformat_put_input (input);
-	  goto done;
-	}
-
-    next_digit:
-      n_input++;
-    }
-
-done:
-  {
-    f64 f_values[2], *value_return;
-    word expon;
-
-    /* Must have either whole or fraction digits. */
-    if (n_digits[0] + n_digits[1] <= 0)
-      goto error;
-
-    f_values[0] = values[0];
-    if (signs[0])
-      f_values[0] = -f_values[0];
-
-    f_values[1] = values[1];
-    f_values[1] = times_power_of_ten (f_values[1], -n_digits[1]);
-
-    f_values[0] += f_values[1];
-
-    expon = values[2];
-    if (signs[1])
-      expon = -expon;
-
-    f_values[0] = times_power_of_ten (f_values[0], expon);
-
-    value_return = va_arg (*va, f64 *);
-    *value_return = f_values[0];
-    return 1;
-  }
-
-error:
-  return 0;
-}
-
-static char *
-match_input_with_format (unformat_input_t * input, char *f)
-{
-  uword cf, ci;
-
-  ASSERT (*f != 0);
-
-  while (1)
-    {
-      cf = *f;
-      if (cf == 0 || cf == '%' || cf == ' ')
-	break;
-      f++;
-
-      ci = unformat_get_input (input);
-
-      if (cf != ci)
-	return 0;
-    }
-  return f;
-}
-
-static char *
-do_percent (unformat_input_t * input, va_list * va, char *f)
-{
-  uword cf, n, data_bytes = ~0;
-
-  cf = *f++;
-
-  switch (cf)
-    {
-    default:
-      break;
-
-    case 'w':
-      /* Word types. */
-      cf = *f++;
-      data_bytes = sizeof (uword);
-      break;
-
-    case 'l':
-      cf = *f++;
-      if (cf == 'l')
-	{
-	  cf = *f++;
-	  data_bytes = sizeof (long long);
-	}
-      else
-	{
-	  data_bytes = sizeof (long);
-	}
-      break;
-
-    case 'L':
-      cf = *f++;
-      data_bytes = sizeof (long long);
-      break;
-    }
-
-  n = 0;
-  switch (cf)
-    {
-    case 'D':
-      data_bytes = va_arg (*va, int);
-    case 'd':
-      n = unformat_integer (input, va, 10,
-			    UNFORMAT_INTEGER_SIGNED, data_bytes);
-      break;
-
-    case 'u':
-      n = unformat_integer (input, va, 10,
-			    UNFORMAT_INTEGER_UNSIGNED, data_bytes);
-      break;
-
-    case 'b':
-      n = unformat_integer (input, va, 2,
-			    UNFORMAT_INTEGER_UNSIGNED, data_bytes);
-      break;
-
-    case 'o':
-      n = unformat_integer (input, va, 8,
-			    UNFORMAT_INTEGER_UNSIGNED, data_bytes);
-      break;
-
-    case 'X':
-      data_bytes = va_arg (*va, int);
-    case 'x':
-      n = unformat_integer (input, va, 16,
-			    UNFORMAT_INTEGER_UNSIGNED, data_bytes);
-      break;
-
-    case 'f':
-      n = unformat_float (input, va);
-      break;
-
-    case 's':
-    case 'v':
-      n = unformat_string (input, f[0], cf, va);
-      break;
-
-    case 'U':
-      {
-	unformat_function_t *f = va_arg (*va, unformat_function_t *);
-	n = f (input, va);
-      }
-      break;
-
-    case '=':
-    case '|':
-      {
-	int *var = va_arg (*va, int *);
-	uword val = va_arg (*va, int);
-
-	if (cf == '|')
-	  val |= *var;
-	*var = val;
-	n = 1;
-      }
-      break;
-    }
-
-  return n ? f : 0;
-}
-
-uword
-unformat_skip_white_space (unformat_input_t * input)
-{
-  uword n = 0;
-  uword c;
-
-  while ((c = unformat_get_input (input)) != UNFORMAT_END_OF_INPUT)
-    {
-      if (!is_white_space (c))
-	{
-	  unformat_put_input (input);
-	  break;
-	}
-      n++;
-    }
-  return n;
-}
-
-uword
-va_unformat (unformat_input_t * input, char *fmt, va_list * va)
-{
-  char *f;
-  uword input_matches_format;
-  uword default_skip_input_white_space;
-  uword n_input_white_space_skipped;
-  uword last_non_white_space_match_percent;
-  uword last_non_white_space_match_format;
-
-  vec_add1_aligned (input->buffer_marks, input->index,
-		    sizeof (input->buffer_marks[0]));
-
-  f = fmt;
-  default_skip_input_white_space = 1;
-  input_matches_format = 0;
-  last_non_white_space_match_percent = 0;
-  last_non_white_space_match_format = 0;
-
-  while (1)
-    {
-      char cf;
-      uword is_percent, skip_input_white_space;
-
-      cf = *f;
-      is_percent = 0;
-
-      /* Always skip input white space at start of format string.
-         Otherwise use default skip value which can be changed by %_
-         (see below). */
-      skip_input_white_space = f == fmt || default_skip_input_white_space;
-
-      /* Spaces in format request skipping input white space. */
-      if (is_white_space (cf))
-	{
-	  skip_input_white_space = 1;
-
-	  /* Multiple format spaces are equivalent to a single white
-	     space. */
-	  while (is_white_space (*++f))
-	    ;
-	}
-      else if (cf == '%')
-	{
-	  /* %_ toggles whether or not to skip input white space. */
-	  switch (*++f)
-	    {
-	    case '_':
-	      default_skip_input_white_space =
-		!default_skip_input_white_space;
-	      f++;
-	      /* For transition from skip to no-skip in middle of format
-	         string, skip input white space.  For example, the following matches:
-	         fmt = "%_%d.%d%_->%_%d.%d%_"
-	         input "1.2 -> 3.4"
-	         Without this the space after -> does not get skipped. */
-	      if (!default_skip_input_white_space
-		  && !(f == fmt + 2 || *f == 0))
-		unformat_skip_white_space (input);
-	      continue;
-
-	      /* %% means match % */
-	    case '%':
-	      break;
-
-	      /* % at end of format string. */
-	    case 0:
-	      goto parse_fail;
-
-	    default:
-	      is_percent = 1;
-	      break;
-	    }
-	}
-
-      n_input_white_space_skipped = 0;
-      if (skip_input_white_space)
-	n_input_white_space_skipped = unformat_skip_white_space (input);
-
-      /* End of format string. */
-      if (cf == 0)
-	{
-	  /* Force parse error when format string ends and input is
-	     not white or at end.  As an example, this is to prevent
-	     format "foo" from matching input "food".
-	     The last_non_white_space_match_percent is to make
-	     "foo %d" match input "foo 10,bletch" with %d matching 10. */
-	  if (skip_input_white_space
-	      && !last_non_white_space_match_percent
-	      && !last_non_white_space_match_format
-	      && n_input_white_space_skipped == 0
-	      && input->index != UNFORMAT_END_OF_INPUT)
-	    goto parse_fail;
-	  break;
-	}
-
-      last_non_white_space_match_percent = is_percent;
-      last_non_white_space_match_format = 0;
-
-      /* Explicit spaces in format must match input white space. */
-      if (cf == ' ' && !default_skip_input_white_space)
-	{
-	  if (n_input_white_space_skipped == 0)
-	    goto parse_fail;
-	}
-
-      else if (is_percent)
-	{
-	  if (!(f = do_percent (input, va, f)))
-	    goto parse_fail;
-	}
-
-      else
-	{
-	  char *g = match_input_with_format (input, f);
-	  if (!g)
-	    goto parse_fail;
-	  last_non_white_space_match_format = g > f;
-	  f = g;
-	}
-    }
-
-  input_matches_format = 1;
-parse_fail:
-
-  /* Rewind buffer marks. */
-  {
-    uword l = vec_len (input->buffer_marks);
-
-    /* If we did not match back up buffer to last mark. */
-    if (!input_matches_format)
-      input->index = input->buffer_marks[l - 1];
-
-    _vec_len (input->buffer_marks) = l - 1;
-  }
-
-  return input_matches_format;
-}
-
-uword
-unformat (unformat_input_t * input, char *fmt, ...)
-{
-  va_list va;
-  uword result;
-  va_start (va, fmt);
-  result = va_unformat (input, fmt, &va);
-  va_end (va);
-  return result;
-}
-
-uword
-unformat_user (unformat_input_t * input, unformat_function_t * func, ...)
-{
-  va_list va;
-  uword result, l;
-
-  /* Save place in input buffer in case parse fails. */
-  l = vec_len (input->buffer_marks);
-  vec_add1_aligned (input->buffer_marks, input->index,
-		    sizeof (input->buffer_marks[0]));
-
-  va_start (va, func);
-  result = func (input, &va);
-  va_end (va);
-
-  if (!result && input->index != UNFORMAT_END_OF_INPUT)
-    input->index = input->buffer_marks[l];
-
-  _vec_len (input->buffer_marks) = l;
-
-  return result;
-}
-
-/* Setup for unformat of Unix style command line. */
-void
-unformat_init_command_line (unformat_input_t * input, char *argv[])
-{
-  uword i;
-
-  unformat_init (input, 0, 0);
-
-  /* Concatenate argument strings with space in between. */
-  for (i = 1; argv[i]; i++)
-    {
-      vec_add (input->buffer, argv[i], strlen (argv[i]));
-      if (argv[i + 1])
-	vec_add1 (input->buffer, ' ');
-    }
-}
-
-void
-unformat_init_string (unformat_input_t * input, char *string, int string_len)
-{
-  unformat_init (input, 0, 0);
-  if (string_len > 0)
-    vec_add (input->buffer, string, string_len);
-}
-
-void
-unformat_init_vector (unformat_input_t * input, u8 * vector_string)
-{
-  unformat_init (input, 0, 0);
-  input->buffer = vector_string;
-}
-
-#ifdef CLIB_UNIX
-
-static uword
-unix_file_fill_buffer (unformat_input_t * input)
-{
-  int fd = pointer_to_uword (input->fill_buffer_arg);
-  uword l, n;
-
-  l = vec_len (input->buffer);
-  vec_resize (input->buffer, 4096);
-  n = read (fd, input->buffer + l, 4096);
-  if (n > 0)
-    _vec_len (input->buffer) = l + n;
-
-  if (n <= 0)
-    return UNFORMAT_END_OF_INPUT;
-  else
-    return input->index;
-}
-
-void
-unformat_init_unix_file (unformat_input_t * input, int file_descriptor)
-{
-  unformat_init (input, unix_file_fill_buffer,
-		 uword_to_pointer (file_descriptor, void *));
-}
-
-/* Take input from Unix environment variable. */
-uword
-unformat_init_unix_env (unformat_input_t * input, char *var)
-{
-  char *val = getenv (var);
-  if (val)
-    unformat_init_string (input, val, strlen (val));
-  return val != 0;
-}
-
-#endif /* CLIB_UNIX */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/unix-formats.c b/vppinfra/vppinfra/unix-formats.c
deleted file mode 100644
index a4c81ca2..00000000
--- a/vppinfra/vppinfra/unix-formats.c
+++ /dev/null
@@ -1,918 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifdef __KERNEL__
-
-# include <linux/unistd.h>
-# include <linux/signal.h>
-
-#else /* ! __KERNEL__ */
-
-#define _GNU_SOURCE		/* to get REG_* in ucontext.h */
-#include <ucontext.h>
-#undef _GNU_SOURCE
-#undef __USE_GNU
-
-#include <unistd.h>
-#include <signal.h>
-
-#include <time.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <math.h>
-
-#include <vppinfra/time.h>
-
-#ifdef AF_NETLINK
-#include <linux/types.h>
-#include <linux/netlink.h>
-#endif
-
-#endif /* ! __KERNEL__ */
-
-
-#ifdef __KERNEL__
-# include <linux/socket.h>
-# include <linux/in.h>
-# include <linux/ip.h>
-# include <linux/tcp.h>
-# include <linux/udp.h>
-# include <linux/icmp.h>
-# include <linux/if_ether.h>
-# include <linux/if_arp.h>
-#else
-# include <net/if.h>            /* struct ifnet may live here */
-# include <netinet/in.h>
-# include <netinet/ip.h>
-# include <netinet/tcp.h>
-# include <netinet/udp.h>
-# include <netinet/ip_icmp.h>
-# include <netinet/if_ether.h>
-#endif /* __KERNEL__ */
-
-#include <vppinfra/bitops.h> /* foreach_set_bit */
-#include <vppinfra/format.h>
-#include <vppinfra/error.h>
-
-/* Format unix network address family (e.g. AF_INET). */
-u8 * format_address_family (u8 * s, va_list * va)
-{
-  uword family = va_arg (*va, uword);
-  u8 * t = (u8 *) "UNKNOWN";
-  switch (family)
-    {
-#define _(x) case PF_##x: t = (u8 *) #x; break
-      _ (UNSPEC);
-      _ (UNIX);			/* Unix domain sockets 		*/
-      _ (INET);			/* Internet IP Protocol 	*/
-#ifdef PF_AX25
-      _ (AX25);			/* Amateur Radio AX.25 		*/
-#endif
-#ifdef PF_IPX
-      _ (IPX);			/* Novell IPX 			*/
-#endif
-#ifdef PF_APPLETALK
-      _ (APPLETALK);		/* AppleTalk DDP 		*/
-#endif
-#ifdef PF_NETROM
-      _ (NETROM);		/* Amateur Radio NET/ROM 	*/
-#endif
-#ifdef PF_BRIDGE
-      _ (BRIDGE);		/* Multiprotocol bridge 	*/
-#endif
-#ifdef PF_ATMPVC
-      _ (ATMPVC);		/* ATM PVCs			*/
-#endif
-#ifdef PF_X25
-      _ (X25);			/* Reserved for X.25 project 	*/
-#endif
-#ifdef PF_INET6
-      _ (INET6);		/* IP version 6			*/
-#endif
-#ifdef PF_ROSE
-      _ (ROSE);			/* Amateur Radio X.25 PLP	*/
-#endif
-#ifdef PF_DECnet
-      _ (DECnet);		/* Reserved for DECnet project	*/
-#endif
-#ifdef PF_NETBEUI
-      _ (NETBEUI);		/* Reserved for 802.2LLC project*/
-#endif
-#ifdef PF_SECURITY
-      _ (SECURITY);		/* Security callback pseudo AF */
-#endif
-#ifdef PF_KEY
-      _ (KEY);			/* PF_KEY key management API */
-#endif
-#ifdef PF_NETLINK
-      _ (NETLINK);
-#endif
-#ifdef PF_PACKET
-      _ (PACKET);		/* Packet family		*/
-#endif
-#ifdef PF_ASH
-      _ (ASH);			/* Ash				*/
-#endif
-#ifdef PF_ECONET
-      _ (ECONET);		/* Acorn Econet			*/
-#endif
-#ifdef PF_ATMSVC
-      _ (ATMSVC);		/* ATM SVCs			*/
-#endif
-#ifdef PF_SNA
-      _ (SNA);			/* Linux SNA Project */
-#endif
-#ifdef PF_IRDA
-      _ (IRDA);			/* IRDA sockets			*/
-#endif
-#undef _
-    }
-  vec_add (s, t, strlen ((char *) t));
-  return s;
-}
-
-u8 * format_network_protocol (u8 * s, va_list * args)
-{
-  uword family = va_arg (*args, uword);
-  uword protocol = va_arg (*args, uword);
-
-#ifndef __KERNEL__
-  struct protoent * p = getprotobynumber (protocol);
-
-  ASSERT (family == AF_INET);
-  if (p)
-    return format (s, "%s", p->p_name);
-  else
-    return format (s, "%d", protocol);
-#else
-  return format (s, "%d/%d", family, protocol);
-#endif
-}
-
-u8 * format_network_port (u8 * s, va_list * args)
-{
-  uword proto = va_arg (*args, uword);
-  uword port = va_arg (*args, uword);
-
-#ifndef __KERNEL__
-  struct servent * p = getservbyport (port, proto == IPPROTO_UDP ? "udp" : "tcp");
-
-  if (p)
-    return format (s, "%s", p->s_name);
-  else
-    return format (s, "%d", port);
-#else
-  return format (s, "%s/%d", proto == IPPROTO_UDP ? "udp" : "tcp", port);
-#endif
-}
-
-/* Format generic network address: takes two arguments family and address.
-   Assumes network byte order. */
-u8 * format_network_address (u8 * s, va_list * args)
-{
-  uword family = va_arg (*args, uword);
-  u8 * addr    = va_arg (*args, u8 *);
-
-  switch (family)
-    {
-    case AF_INET:
-      s = format (s, "%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
-      break;
-
-    case AF_UNSPEC:
-      /* We use AF_UNSPEC for ethernet addresses. */
-      s = format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
-		  addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
-      break;
-
-    default:
-      clib_error ("unsupported address family %d", family);
-    }
-
-  return s;
-}
-
-u8 * format_sockaddr (u8 * s, va_list * args)
-{
-  void * v = va_arg (*args, void *);
-  struct sockaddr * sa = v;
-
-  switch (sa->sa_family)
-    {
-    case AF_INET:
-      {
-	struct sockaddr_in * i = v;
-	s = format (s, "%U:%U",
-		    format_network_address, AF_INET, &i->sin_addr.s_addr,
-		    format_network_port, IPPROTO_TCP, ntohs (i->sin_port));
-      }
-      break;
-
-#ifndef __KERNEL__
-#ifdef AF_NETLINK
-    case AF_NETLINK:
-      {
-	struct sockaddr_nl * n = v;
-	s = format (s, "KERNEL-NETLINK");
-	if (n->nl_groups)
-	  s = format (s, " (groups 0x%x)", n->nl_groups);
-	break;
-      }
-#endif
-#endif
-
-    default:
-      s = format (s, "sockaddr family %d", sa->sa_family);
-      break;
-    }
-
-  return s;
-}
-
-u8 * format_tcp4_packet (u8 * s, va_list * args)
-{
-  u8 * p = va_arg (*args, u8 *);
-  struct iphdr * ip = (void *) p;
-  struct tcphdr * tcp = (void *) (ip + 1);
-
-  s = format (s, "tcp %U:%U -> %U:%U",
-	      format_network_address, AF_INET,  &ip->saddr,
-	      format_network_port, IPPROTO_TCP, ntohs (tcp->source),
-	      format_network_address, AF_INET,  &ip->daddr,
-	      format_network_port, IPPROTO_TCP, ntohs (tcp->dest));
-
-  s = format (s, ", seq 0x%08x -> 0x%08x", tcp->seq, tcp->ack_seq);
-#define _(f) if (tcp->f) s = format (s, ", " #f);
-  _ (syn); _ (ack); _ (fin); _ (rst); _ (psh); _ (urg);
-#undef _
-
-  if (tcp->window)
-    s = format (s, ", window 0x%04x", tcp->window);
-  if (tcp->urg)
-    s = format (s, ", urg 0x%04x", tcp->urg_ptr);
-
-  return s;
-}
-
-u8 * format_udp4_packet (u8 * s, va_list * args)
-{
-  u8 * p = va_arg (*args, u8 *);
-  struct iphdr * ip = (void *) p;
-  struct udphdr * udp = (void *) (ip + 1);
-
-  s = format (s, "udp %U:%U -> %U:%U",
-	      format_network_address, AF_INET,  &ip->saddr,
-	      format_network_port, IPPROTO_UDP, ntohs (udp->source),
-	      format_network_address, AF_INET,  &ip->daddr,
-	      format_network_port, IPPROTO_UDP, ntohs (udp->dest));
-
-  return s;
-}
-
-u8 * format_icmp4_type_and_code (u8 * s, va_list * args)
-{
-  uword icmp_type = va_arg (*args, uword);
-  uword icmp_code = va_arg (*args, uword);
-
-  switch (icmp_type)
-    {
-#define _(f,str) case ICMP_##f: s = format (s, str); break;
-      _ (ECHOREPLY, "echo reply");
-      _ (DEST_UNREACH, "unreachable");
-      _ (SOURCE_QUENCH, "source quench");
-      _ (REDIRECT, "redirect");
-      _ (ECHO, "echo request");
-      _ (TIME_EXCEEDED, "time exceeded");
-      _ (PARAMETERPROB, "parameter problem");
-      _ (TIMESTAMP, "timestamp request");
-      _ (TIMESTAMPREPLY, "timestamp reply");
-      _ (INFO_REQUEST, "information request");
-      _ (INFO_REPLY, "information reply");
-      _ (ADDRESS, "address mask request");
-      _ (ADDRESSREPLY, "address mask reply");
-#undef _
-    default:
-      s = format (s, "unknown type 0x%x", icmp_type);
-    }
-
-  if (icmp_type == ICMP_DEST_UNREACH)
-    {
-      switch (icmp_code)
-	{
-#define _(f,str) case ICMP_##f: s = format (s, " " # str); break;
-	  _ (NET_UNREACH, "network");
-	  _ (HOST_UNREACH, "host");
-	  _ (PROT_UNREACH, "protocol");
-	  _ (PORT_UNREACH, "port");
-	  _ (FRAG_NEEDED, ": fragmentation needed/DF set");
-	  _ (SR_FAILED, "source route failed");
-	  _ (NET_UNKNOWN, "network unknown");
-	  _ (HOST_UNKNOWN, "host unknown");
-	  _ (HOST_ISOLATED, "host isolated");
-	  _ (NET_ANO, "network: admin. prohibited");
-	  _ (HOST_ANO, "host: admin. prohibited");
-	  _ (NET_UNR_TOS, "network for type-of-service");
-	  _ (HOST_UNR_TOS, "host for type-of-service");
-	  _ (PKT_FILTERED, ": packet filtered");
-	  _ (PREC_VIOLATION, "precedence violation");
-	  _ (PREC_CUTOFF, "precedence cut off");
-#undef _
-	default:
-	  s = format (s, "unknown code 0x%x", icmp_code);
-	}
-    }
-  else if (icmp_type == ICMP_REDIRECT)
-    {
-      switch (icmp_code)
-	{
-#define _(f,str) case ICMP_##f: s = format (s, " " # str); break;
-	  _ (REDIR_NET, "network");
-	  _ (REDIR_HOST, "host");
-	  _ (REDIR_NETTOS, "network for type-of-service");
-	  _ (REDIR_HOSTTOS, "host for type-of-service");
-#undef _
-	default:
-	  s = format (s, "unknown code 0x%x", icmp_code);
-	}
-    }
-  else if (icmp_type == ICMP_TIME_EXCEEDED)
-    {
-      switch (icmp_code)
-	{
-#define _(f,str) case ICMP_##f: s = format (s, " " # str); break;
-	  _ (EXC_TTL, "time-to-live zero in transit");
-	  _ (EXC_FRAGTIME, "time-to-live zero during reassembly");
-#undef _
-	default:
-	  s = format (s, "unknown code 0x%x", icmp_code);
-	}
-    }
-
-  return s;
-}
-
-typedef struct {
-  u8 type;
-  u8 code;
-  u16 checksum;
-} icmp4_t;
-
-u8 * format_icmp4_packet (u8 * s, va_list * args)
-{
-  u8 * p = va_arg (*args, u8 *);
-  struct iphdr * ip = (void *) p;
-  icmp4_t * icmp = (void *) (ip + 1);
-  s = format (s, "icmp %U %U -> %U",
-	      format_icmp4_type_and_code, icmp->type, icmp->code,
-	      format_network_address, AF_INET,  &ip->saddr,
-	      format_network_address, AF_INET,  &ip->daddr);
-
-  return s;
-}
-
-u8 * format_ip4_tos_byte (u8 * s, va_list * args)
-{
-  uword tos = va_arg (*args, uword);
-
-  if (tos & IPTOS_LOWDELAY)
-    s = format (s, "minimize-delay, ");
-  if (tos & IPTOS_MINCOST)
-    s = format (s, "minimize-cost, ");
-  if (tos & IPTOS_THROUGHPUT)
-    s = format (s, "maximize-throughput, ");
-  if (tos & IPTOS_RELIABILITY)
-    s = format (s, "maximize-reliability, ");
-
-  switch (IPTOS_PREC (tos))
-    {
-#define _(x,y) case IPTOS_PREC_##x: s = format (s, y); break
-      _ (NETCONTROL, "network");
-      _ (INTERNETCONTROL, "internet");
-      _ (CRITIC_ECP, "critical");
-      _ (FLASH, "flash");
-      _ (FLASHOVERRIDE, "flash-override");
-      _ (IMMEDIATE, "immediate");
-      _ (PRIORITY, "priority");
-      _ (ROUTINE, "routine");
-#undef _
-    }
-
-  return s;
-}
-
-u8 * format_ip4_packet (u8 * s, va_list * args)
-{
-  u8 * p = va_arg (*args, u8 *);
-  struct iphdr * ip = (void *) p;
-
-  static format_function_t * f[256];
-
-  if (! f[IPPROTO_TCP])
-    {
-      f[IPPROTO_TCP] = format_tcp4_packet;
-      f[IPPROTO_UDP] = format_udp4_packet;
-      f[IPPROTO_ICMP] = format_icmp4_packet;
-    }
-
-  if (f[ip->protocol])
-    return format (s, "%U", f[ip->protocol], p);
-
-  s = format (s, "%U: %U -> %U",
-	      format_network_protocol, AF_INET, ip->protocol,
-	      format_network_address, AF_INET,  &ip->saddr,
-	      format_network_address, AF_INET,  &ip->daddr);
-
-  return s;
-}
-
-#define foreach_unix_arphrd_type		\
-  _ (NETROM, 0)					\
-  _ (ETHER, 1)					\
-  _ (EETHER, 2)					\
-  _ (AX25, 3)					\
-  _ (PRONET, 4)					\
-  _ (CHAOS, 5)					\
-  _ (IEEE802, 6)				\
-  _ (ARCNET, 7)					\
-  _ (APPLETLK, 8)				\
-  _ (DLCI, 15)					\
-  _ (ATM, 19)					\
-  _ (METRICOM, 23)				\
-  _ (IEEE1394, 24)				\
-  _ (EUI64, 27)					\
-  _ (INFINIBAND, 32)				\
-  _ (SLIP, 256)					\
-  _ (CSLIP, 257)				\
-  _ (SLIP6, 258)				\
-  _ (CSLIP6, 259)				\
-  _ (RSRVD, 260)				\
-  _ (ADAPT, 264)				\
-  _ (ROSE, 270)					\
-  _ (X25, 271)					\
-  _ (HWX25, 272)				\
-  _ (PPP, 512)					\
-  _ (HDLC, 513)					\
-  _ (LAPB, 516)					\
-  _ (DDCMP, 517)				\
-  _ (RAWHDLC, 518)				\
-  _ (TUNNEL, 768)				\
-  _ (TUNNEL6, 769)				\
-  _ (FRAD, 770)					\
-  _ (SKIP, 771)					\
-  _ (LOOPBACK, 772)				\
-  _ (LOCALTLK, 773)				\
-  _ (FDDI, 774)					\
-  _ (BIF, 775)					\
-  _ (SIT, 776)					\
-  _ (IPDDP, 777)				\
-  _ (IPGRE, 778)				\
-  _ (PIMREG, 779)				\
-  _ (HIPPI, 780)				\
-  _ (ASH, 781)					\
-  _ (ECONET, 782)				\
-  _ (IRDA, 783)					\
-  _ (FCPP, 784)					\
-  _ (FCAL, 785)					\
-  _ (FCPL, 786)					\
-  _ (FCFABRIC, 787)				\
-  _ (IEEE802_TR, 800)				\
-  _ (IEEE80211, 801)				\
-  _ (IEEE80211_PRISM, 802)			\
-  _ (IEEE80211_RADIOTAP, 803)			\
-  _ (VOID, 0xFFFF)				\
-  _ (NONE, 0xFFFE)
-
-u8 * format_unix_arphrd (u8 * s, va_list * args)
-{
-#ifndef __COVERITY__ /* doesn't understand this at all... */
-  u32 x = va_arg (*args, u32);
-  char * t;
-  switch (x)
-    {
-#define _(f,n) case ARPHRD_##f: t = #f; break;
-      foreach_unix_arphrd_type
-#undef _
-    default:
-      t = 0;
-      break;
-    }
-
-  if (t)
-    s = format (s, "%s", t);
-  else
-    s = format (s, "unknown 0x%x", x);
-#endif
-  return s;
-}
-
-#define foreach_unix_interface_flag		\
-  _ (up)					\
-  _ (broadcast)					\
-  _ (debug)					\
-  _ (loopback)					\
-  _ (pointopoint)				\
-  _ (notrailers)				\
-  _ (running)					\
-  _ (noarp)					\
-  _ (promisc)					\
-  _ (allmulti)					\
-  _ (master)					\
-  _ (slave)					\
-  _ (multicast)					\
-  _ (portsel)					\
-  _ (automedia)					\
-  _ (dynamic)					\
-  _ (lower_up)					\
-  _ (dormant)					\
-  _ (echo)
-
-static char * unix_interface_flag_names[] = {
-#define _(f) #f,
-  foreach_unix_interface_flag
-#undef _
-};
-
-u8 * format_unix_interface_flags (u8 * s, va_list * args)
-{
-  u32 x = va_arg (*args, u32);
-  u32 i;
-
-  if (x == 0)
-    s = format (s, "none");
-  else foreach_set_bit (i, x, ({
-    if (i < ARRAY_LEN (unix_interface_flag_names))
-      s = format (s, "%s", unix_interface_flag_names[i]);
-    else
-      s = format (s, "unknown %d", i);
-    if (x >> (i + 1))
-      s = format (s, ", ");
-  }));
-  return s;
-}
-
-typedef struct {
-  u16 ar_hrd;			/* format of hardware address	*/
-  u16 ar_pro;			/* format of protocol address	*/
-  u8  ar_hln;			/* length of hardware address	*/
-  u8  ar_pln;			/* length of protocol address	*/
-  u16 ar_op;			/* ARP opcode (command)		*/
-  u8  ar_sha[6];		/* sender hardware address	*/
-  u8  ar_spa[4];		/* sender IP address		*/
-  u8  ar_tha[6];		/* target hardware address	*/
-  u8  ar_tpa[4];		/* target IP address		*/
-} arp_ether_ip4_t;
-
-u8 * format_arp_packet (u8 * s, va_list * args)
-{
-  arp_ether_ip4_t * a = va_arg (*args, arp_ether_ip4_t *);
-  char * op = "unknown";
-
-  if (a->ar_pro != ETH_P_IP ||
-      a->ar_hrd != ARPHRD_ETHER)
-    return s;
-
-  switch (a->ar_op)
-    {
-#define _(f) case ARPOP_##f: op = #f; break;
-      _ (REQUEST);
-      _ (REPLY);
-      _ (RREQUEST);
-      _ (RREPLY);
-#undef _
-    }
-
-  s = format (s, "%s %U %U -> %U %U",
-	      op,
-	      format_network_address, AF_INET,   a->ar_spa,
-	      format_network_address, AF_UNSPEC, a->ar_sha,
-	      format_network_address, AF_INET,   a->ar_tpa,
-	      format_network_address, AF_UNSPEC, a->ar_tha);
-  return s;
-}
-
-u8 * format_ethernet_proto (u8 * s, va_list * args)
-{
-  uword type = va_arg (*args, uword);
-  char * t = 0;
-
-  switch (type)
-    {
-    case 0: t = "BPDU"; break;
-#define _(f) case ETH_P_##f: t = #f; break;
-      _ (LOOP);
-      _ (PUP);
-#ifdef ETH_P_PUPAT
-      _ (PUPAT);
-#endif
-      _ (IP);
-      _ (X25);
-      _ (ARP);
-      _ (BPQ);
-#ifdef ETH_P_PUPAT
-      _ (IEEEPUP);
-      _ (IEEEPUPAT);
-#endif
-      _ (DEC);
-      _ (DNA_DL);
-      _ (DNA_RC);
-      _ (DNA_RT);
-      _ (LAT);
-      _ (DIAG);
-      _ (CUST);
-      _ (SCA);
-      _ (RARP);
-      _ (ATALK);
-      _ (AARP);
-      _ (IPX);
-      _ (IPV6);
-#ifdef ETH_P_PPP_DISC
-      _ (PPP_DISC);
-      _ (PPP_SES);
-#endif
-#ifdef ETH_P_ATMMPOA
-      _ (ATMMPOA);
-      _ (ATMFATE);
-#endif
-      _ (802_3);
-      _ (AX25);
-      _ (ALL);
-      _ (802_2);
-      _ (SNAP);
-      _ (DDCMP);
-      _ (WAN_PPP);
-      _ (PPP_MP);
-      _ (LOCALTALK);
-      _ (PPPTALK);
-      _ (TR_802_2);
-      _ (MOBITEX);
-      _ (CONTROL);
-      _ (IRDA);
-#ifdef ETH_P_ECONET
-      _ (ECONET);
-#endif
-#undef _
-    }
-
-  if (t)
-    vec_add (s, t, strlen (t));
-  else
-    s = format (s, "ether-type 0x%x", type);
-  return s;
-}
-
-u8 * format_ethernet_packet (u8 * s, va_list * args)
-{
-  struct ethhdr * h = va_arg (*args, struct ethhdr *);
-  uword proto = h->h_proto;
-  u8 * payload = (void *) (h + 1);
-  uword indent;
-
-  /* Check for 802.2/802.3 encapsulation. */
-  if (proto < ETH_DATA_LEN)
-    {
-      typedef struct {
-	u8 dsap, ssap, control;
-	u8 orig_code[3];
-	u16 proto;
-      } ethhdr_802_t;
-      ethhdr_802_t * h1 = (void *) (h + 1);
-      proto = h1->proto;
-      payload = (void *) (h1 + 1);
-    }
-
-  indent = format_get_indent (s);
-
-  s = format (s, "%U: %U -> %U",
-	      format_ethernet_proto, proto,
-	      format_network_address, AF_UNSPEC, h->h_source,
-	      format_network_address, AF_UNSPEC, h->h_dest);
-
-  switch (proto)
-    {
-    case ETH_P_ARP:
-      s = format (s, "\n%U%U",
-		  format_white_space, indent,
-		  format_arp_packet, payload);
-      break;
-    }
-
-  return s;
-}
-
-#ifndef __KERNEL__
-u8 * format_hostname (u8 * s, va_list * args)
-{
-  char buffer[1024];
-  char * b = buffer;
-  if (gethostname (b, sizeof (buffer)) < 0)
-    b = "noname";
-  return format (s, "%s", b);
-}
-#endif
-
-#ifndef __KERNEL__
-u8 * format_timeval (u8 * s, va_list * args)
-{
-  char * fmt = va_arg (*args, char *);
-  struct timeval * tv = va_arg (*args, struct timeval *);
-  struct tm * tm;
-  word msec;
-  char * f, c;
-
-  if (! fmt)
-    fmt = "y/m/d H:M:S:F";
-
-  if (! tv)
-    {
-      static struct timeval now;
-      gettimeofday (&now, 0);
-      tv = &now;
-    }
-
-  msec = flt_round_nearest (1e-3 * tv->tv_usec);
-  if (msec >= 1000)
-    { msec = 0; tv->tv_sec++; }
-
-  {
-    time_t t = tv->tv_sec;
-    tm = localtime (&t);
-  }
-
-  for (f = fmt; *f; f++)
-    {
-      uword what;
-      char * what_fmt = "%d";
-
-      switch (c = *f)
-	{
-	default:
-	  vec_add1 (s, c);
-	  continue;
-
-	case 'y':
-	  what = 1900 + tm->tm_year;
-	  what_fmt = "%4d";
-	  break;
-	case 'm':
-	  what = tm->tm_mon + 1;
-	  what_fmt = "%2d";
-	  break;
-	case 'd':
-	  what = tm->tm_mday;
-	  what_fmt = "%2d";
-	  break;
-	case 'H':
-	  what = tm->tm_hour;
-	  what_fmt = "%02d";
-	  break;
-	case 'M':
-	  what = tm->tm_min;
-	  what_fmt = "%02d";
-	  break;
-	case 'S':
-	  what = tm->tm_sec;
-	  what_fmt = "%02d";
-	  break;
-	case 'F':
-	  what = msec;
-	  what_fmt = "%03d";
-	  break;
-	}
-
-      s = format (s, what_fmt, what);
-    }
-
-  return s;
-}
-
-u8 * format_time_float (u8 * s, va_list * args)
-{
-  u8 * fmt = va_arg (*args, u8 *);
-  f64 t = va_arg (*args, f64);
-  struct timeval tv;
-  if (t <= 0)
-    t = unix_time_now ();
-  tv.tv_sec = t;
-  tv.tv_usec = 1e6*(t - tv.tv_sec);
-  return format (s, "%U", format_timeval, fmt, &tv);
-}
-
-u8 * format_signal (u8 * s, va_list * args)
-{
-  uword signum = va_arg (*args, uword);
-  char * t = 0;
-  switch (signum)
-    {
-#define _(x) case x: t = #x; break;
-      _ (SIGHUP);
-      _ (SIGINT);
-      _ (SIGQUIT);
-      _ (SIGILL);
-      _ (SIGTRAP);
-      _ (SIGABRT);
-      _ (SIGBUS);
-      _ (SIGFPE);
-      _ (SIGKILL);
-      _ (SIGUSR1);
-      _ (SIGSEGV);
-      _ (SIGUSR2);
-      _ (SIGPIPE);
-      _ (SIGALRM);
-      _ (SIGTERM);
-#ifdef SIGSTKFLT
-      _ (SIGSTKFLT);
-#endif
-      _ (SIGCHLD);
-      _ (SIGCONT);
-      _ (SIGSTOP);
-      _ (SIGTSTP);
-      _ (SIGTTIN);
-      _ (SIGTTOU);
-      _ (SIGURG);
-      _ (SIGXCPU);
-      _ (SIGXFSZ);
-      _ (SIGVTALRM);
-      _ (SIGPROF);
-      _ (SIGWINCH);
-      _ (SIGIO);
-      _ (SIGPWR);
-#ifdef SIGSYS
-      _ (SIGSYS);
-#endif
-#undef _
-    default:
-      return format (s, "unknown %d", signum);
-    }
-
-  vec_add (s, t, strlen (t));
-  return s;
-}
-
-u8 * format_ucontext_pc (u8 * s, va_list * args)
-{
-  ucontext_t * uc __attribute__((unused));
-  unsigned long * regs = 0;
-  uword reg_no = 0;
-
-  uc = va_arg (*args, ucontext_t *);
-
-#if defined (powerpc)
-  regs = &uc->uc_mcontext.uc_regs->gregs[0];
-#elif defined (powerpc64)
-  regs = &uc->uc_mcontext.uc_regs->gp_regs[0];
-#elif defined (i386) || defined (__x86_64__)
-  regs = (void *) &uc->uc_mcontext.gregs[0];
-#endif
-
-#if defined (powerpc) || defined (powerpc64)
-  reg_no = PT_NIP;
-#elif defined (i386)
-  reg_no = REG_EIP;
-#elif defined (__x86_64__)
-  reg_no = REG_RIP;
-#else
-  reg_no = 0;
-  regs = 0;
-#endif
-
-  if (! regs)
-    return format (s, "unsupported");
-  else
-    return format (s, "%p", regs[reg_no]);
-}
-
-#endif /* __KERNEL__ */
diff --git a/vppinfra/vppinfra/unix-kelog.c b/vppinfra/vppinfra/unix-kelog.c
deleted file mode 100644
index 88428ee8..00000000
--- a/vppinfra/vppinfra/unix-kelog.c
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
-  Copyright (c) 2010 Cisco and/or its affiliates.
-
-  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-#include <vppinfra/error.h>
-#include <vppinfra/unix.h>
-#include <vppinfra/elog.h>
-#include <vppinfra/format.h>
-#include <vppinfra/os.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <time.h>
-
-typedef enum
-{
-  RUNNING = 0,
-  WAKEUP,
-} sched_event_type_t;
-
-typedef struct
-{
-  u32 cpu;
-  u8 *task;
-  u32 pid;
-  f64 timestamp;
-  sched_event_type_t type;
-} sched_event_t;
-
-void
-kelog_init (elog_main_t * em, char *kernel_tracer, u32 n_events)
-{
-  int enable_fd, current_tracer_fd, data_fd;
-  int len;
-  struct timespec ts, ts2;
-  char *trace_enable = "/debug/tracing/tracing_enabled";
-  char *current_tracer = "/debug/tracing/current_tracer";
-  char *trace_data = "/debug/tracing/trace";
-  f64 realtime, monotonic;
-  f64 freq, secs_per_clock;
-
-  ASSERT (kernel_tracer);
-
-  /*$$$$ fixme */
-  n_events = 1 << 18;
-
-  /* init first so we won't hurt ourselves if we bail */
-  elog_init (em, n_events);
-
-  enable_fd = open (trace_enable, O_RDWR);
-  if (enable_fd < 0)
-    {
-      clib_warning ("Couldn't open %s", trace_enable);
-      return;
-    }
-  /* disable kernel tracing */
-  if (write (enable_fd, "0\n", 2) != 2)
-    {
-      clib_unix_warning ("disable tracing");
-      close (enable_fd);
-      return;
-    }
-
-  /*
-   * open + clear the data buffer.
-   * see .../linux/kernel/trace/trace.c:tracing_open()
-   */
-  data_fd = open (trace_data, O_RDWR | O_TRUNC);
-  if (data_fd < 0)
-    {
-      clib_warning ("Couldn't open+clear %s", trace_data);
-      return;
-    }
-  close (data_fd);
-
-  /* configure tracing */
-  current_tracer_fd = open (current_tracer, O_RDWR);
-
-  if (current_tracer_fd < 0)
-    {
-      clib_warning ("Couldn't open %s", current_tracer);
-      close (enable_fd);
-      return;
-    }
-
-  len = strlen (kernel_tracer);
-
-  if (write (current_tracer_fd, kernel_tracer, len) != len)
-    {
-      clib_unix_warning ("configure trace");
-      close (current_tracer_fd);
-      close (enable_fd);
-      return;
-    }
-
-  close (current_tracer_fd);
-
-  /*
-   * The kernel event log uses CLOCK_MONOTONIC timestamps,
-   * not CLOCK_REALTIME timestamps. These differ by a constant
-   * but the constant is not available in user mode.
-   * This estimate will be off by one syscall round-trip.
-   */
-  clib_time_init (&em->cpu_timer);
-  em->init_time.cpu = em->cpu_timer.init_cpu_time;
-  syscall (SYS_clock_gettime, CLOCK_MONOTONIC, &ts);
-
-  /* enable kernel tracing */
-  if (write (enable_fd, "1\n", 2) != 2)
-    {
-      clib_unix_warning ("enable tracing");
-      close (enable_fd);
-      return;
-    }
-
-  close (enable_fd);
-}
-
-
-u8 *
-format_sched_event (u8 * s, va_list * va)
-{
-  sched_event_t *e = va_arg (*va, sched_event_t *);
-
-  s = format (s, "cpu %d task %10s type %s timestamp %12.6f\n",
-	      e->cpu, e->task, e->type ? "WAKEUP " : "RUNNING", e->timestamp);
-
-  return s;
-}
-
-sched_event_t *
-parse_sched_switch_trace (u8 * tdata, u32 * index)
-{
-  u8 *cp = tdata + *index;
-  u8 *limit = tdata + vec_len (tdata);
-  int colons;
-  static sched_event_t event;
-  sched_event_t *e = &event;
-  static u8 *task_name;
-  u32 secs, usecs;
-  int i;
-
-again:
-  /* eat leading w/s */
-  while (cp < limit && (*cp == ' ' && *cp == '\t'))
-    cp++;
-  if (cp == limit)
-    return 0;
-
-  /* header line */
-  if (*cp == '#')
-    {
-      while (cp < limit && (*cp != '\n'))
-	cp++;
-      if (*cp == '\n')
-	{
-	  cp++;
-	  goto again;
-	}
-      clib_warning ("bugger 0");
-      return 0;
-    }
-
-  while (cp < limit && *cp != ']')
-    cp++;
-
-  if (*cp == 0)
-    return 0;
-
-  if (*cp != ']')
-    {
-      clib_warning ("bugger 0.1");
-      return 0;
-    }
-
-  cp++;
-  while (cp < limit && (*cp == ' ' && *cp == '\t'))
-    cp++;
-  if (cp == limit)
-    {
-      clib_warning ("bugger 0.2");
-      return 0;
-    }
-
-  secs = atoi (cp);
-
-  while (cp < limit && (*cp != '.'))
-    cp++;
-
-  if (cp == limit)
-    {
-      clib_warning ("bugger 0.3");
-      return 0;
-    }
-
-  cp++;
-
-  usecs = atoi (cp);
-
-  e->timestamp = ((f64) secs) + ((f64) usecs) * 1e-6;
-
-  /* eat up to third colon */
-  for (i = 0; i < 3; i++)
-    {
-      while (cp < limit && *cp != ':')
-	cp++;
-      cp++;
-    }
-  --cp;
-  if (*cp != ':')
-    {
-      clib_warning ("bugger 1");
-      return 0;
-    }
-  /* aim at '>' (switch-to) / '+' (wakeup) */
-  cp += 5;
-  if (cp >= limit)
-    {
-      clib_warning ("bugger 2");
-      return 0;
-    }
-  if (*cp == '>')
-    e->type = RUNNING;
-  else if (*cp == '+')
-    e->type = WAKEUP;
-  else
-    {
-      clib_warning ("bugger 3");
-      return 0;
-    }
-
-  cp += 3;
-  if (cp >= limit)
-    {
-      clib_warning ("bugger 4");
-      return 0;
-    }
-
-  e->cpu = atoi (cp);
-  cp += 4;
-
-  if (cp >= limit)
-    {
-      clib_warning ("bugger 4");
-      return 0;
-    }
-  while (cp < limit && (*cp == ' ' || *cp == '\t'))
-    cp++;
-
-  e->pid = atoi (cp);
-
-  for (i = 0; i < 2; i++)
-    {
-      while (cp < limit && *cp != ':')
-	cp++;
-      cp++;
-    }
-  --cp;
-  if (*cp != ':')
-    {
-      clib_warning ("bugger 5");
-      return 0;
-    }
-
-  cp += 3;
-  if (cp >= limit)
-    {
-      clib_warning ("bugger 6");
-      return 0;
-    }
-  while (cp < limit && (*cp != ' ' && *cp != '\n'))
-    {
-      vec_add1 (task_name, *cp);
-      cp++;
-    }
-  vec_add1 (task_name, 0);
-  /* _vec_len() = 0 in caller */
-  e->task = task_name;
-
-  if (cp < limit)
-    cp++;
-
-  *index = cp - tdata;
-  return e;
-}
-
-static u32
-elog_id_for_pid (elog_main_t * em, u8 * name, u32 pid)
-{
-  uword *p, r;
-  mhash_t *h = &em->string_table_hash;
-
-  if (!em->string_table_hash.hash)
-    mhash_init (h, sizeof (uword), sizeof (pid));
-
-  p = mhash_get (h, &pid);
-  if (p)
-    return p[0];
-  r = elog_string (em, "%s(%d)", name, pid);
-  mhash_set (h, &pid, r, /* old_value */ 0);
-  return r;
-}
-
-void
-kelog_collect_sched_switch_trace (elog_main_t * em)
-{
-  int enable_fd, data_fd;
-  char *trace_enable = "/debug/tracing/tracing_enabled";
-  char *trace_data = "/debug/tracing/trace";
-  u8 *data = 0;
-  u8 *dp;
-  int bytes, total_bytes;
-  u32 pos;
-  sched_event_t *evt;
-  u64 nsec_to_add;
-  u32 index;
-  f64 clocks_per_sec;
-
-  enable_fd = open (trace_enable, O_RDWR);
-  if (enable_fd < 0)
-    {
-      clib_warning ("Couldn't open %s", trace_enable);
-      return;
-    }
-  /* disable kernel tracing */
-  if (write (enable_fd, "0\n", 2) != 2)
-    {
-      clib_unix_warning ("disable tracing");
-      close (enable_fd);
-      return;
-    }
-  close (enable_fd);
-
-  /* Read the trace data */
-  data_fd = open (trace_data, O_RDWR);
-  if (data_fd < 0)
-    {
-      clib_warning ("Couldn't open %s", trace_data);
-      return;
-    }
-
-  /*
-   * Extract trace into a vector. Note that seq_printf() [kernel]
-   * is not guaranteed to produce 4096 bytes at a time.
-   */
-  vec_validate (data, 4095);
-  total_bytes = 0;
-  pos = 0;
-  while (1)
-    {
-      bytes = read (data_fd, data + pos, 4096);
-      if (bytes <= 0)
-	break;
-
-      total_bytes += bytes;
-      _vec_len (data) = total_bytes;
-
-      pos = vec_len (data);
-      vec_validate (data, vec_len (data) + 4095);
-    }
-  vec_add1 (data, 0);
-
-  /* Synthesize events */
-  em->is_enabled = 1;
-
-  index = 0;
-  while ((evt = parse_sched_switch_trace (data, &index)))
-    {
-      u64 fake_cpu_clock;
-
-      fake_cpu_clock = evt->timestamp * em->cpu_timer.clocks_per_second;
-      {
-	ELOG_TYPE_DECLARE (e) =
-	{
-	  .format = "%d: %s %s",.format_args = "i4T4t4",.n_enum_strings =
-	    2,.enum_strings =
-	  {
-	  "running", "wakeup",}
-	,};
-	struct
-	{
-	  u32 cpu, string_table_offset, which;
-	} *ed;
-
-	ed = elog_event_data_not_inline (em, &__ELOG_TYPE_VAR (e),
-					 &em->default_track, fake_cpu_clock);
-	ed->cpu = evt->cpu;
-	ed->string_table_offset = elog_id_for_pid (em, evt->task, evt->pid);
-	ed->which = evt->type;
-      }
-      _vec_len (evt->task) = 0;
-    }
-  em->is_enabled = 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/unix-misc.c b/vppinfra/vppinfra/unix-misc.c
deleted file mode 100644
index 2928369d..00000000
--- a/vppinfra/vppinfra/unix-misc.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/error.h>
-#include <vppinfra/os.h>
-#include <vppinfra/unix.h>
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/uio.h>		/* writev */
-#include <fcntl.h>
-#include <stdio.h>		/* for sprintf */
-
-clib_error_t *
-unix_file_n_bytes (char *file, uword * result)
-{
-  struct stat s;
-
-  if (stat (file, &s) < 0)
-    return clib_error_return_unix (0, "stat `%s'", file);
-
-  if (S_ISREG (s.st_mode))
-    *result = s.st_size;
-  else
-    *result = 0;
-
-  return /* no error */ 0;
-}
-
-clib_error_t *
-unix_file_read_contents (char *file, u8 * result, uword n_bytes)
-{
-  int fd = -1;
-  uword n_done, n_left;
-  clib_error_t *error = 0;
-  u8 *v = result;
-
-  if ((fd = open (file, 0)) < 0)
-    return clib_error_return_unix (0, "open `%s'", file);
-
-  n_left = n_bytes;
-  n_done = 0;
-  while (n_left > 0)
-    {
-      int n_read;
-      if ((n_read = read (fd, v + n_done, n_left)) < 0)
-	{
-	  error = clib_error_return_unix (0, "open `%s'", file);
-	  goto done;
-	}
-
-      /* End of file. */
-      if (n_read == 0)
-	break;
-
-      n_left -= n_read;
-      n_done += n_read;
-    }
-
-  if (n_left > 0)
-    {
-      error =
-	clib_error_return (0,
-			   " `%s' expected to read %wd bytes; read only %wd",
-			   file, n_bytes, n_bytes - n_left);
-      goto done;
-    }
-
-done:
-  close (fd);
-  return error;
-}
-
-clib_error_t *
-unix_file_contents (char *file, u8 ** result)
-{
-  uword n_bytes;
-  clib_error_t *error = 0;
-  u8 *v;
-
-  if ((error = unix_file_n_bytes (file, &n_bytes)))
-    return error;
-
-  v = 0;
-  vec_resize (v, n_bytes);
-
-  error = unix_file_read_contents (file, v, n_bytes);
-
-  if (error)
-    vec_free (v);
-  else
-    *result = v;
-
-  return error;
-}
-
-clib_error_t *
-unix_proc_file_contents (char *file, u8 ** result)
-{
-  u8 *rv = 0;
-  uword pos;
-  int bytes, fd;
-
-  /* Unfortunately, stat(/proc/XXX) returns zero... */
-  fd = open (file, O_RDONLY);
-
-  if (fd < 0)
-    return clib_error_return_unix (0, "open `%s'", file);
-
-  vec_validate (rv, 4095);
-  pos = 0;
-  while (1)
-    {
-      bytes = read (fd, rv + pos, 4096);
-      if (bytes < 0)
-	{
-	  close (fd);
-	  vec_free (rv);
-	  return clib_error_return_unix (0, "read '%s'", file);
-	}
-
-      if (bytes == 0)
-	{
-	  _vec_len (rv) = pos;
-	  break;
-	}
-      pos += bytes;
-      vec_validate (rv, pos + 4095);
-    }
-  *result = rv;
-  close (fd);
-  return 0;
-}
-
-void os_panic (void) __attribute__ ((weak));
-
-void
-os_panic (void)
-{
-  abort ();
-}
-
-void os_exit (int) __attribute__ ((weak));
-
-void
-os_exit (int code)
-{
-  exit (code);
-}
-
-void os_puts (u8 * string, uword string_length, uword is_error)
-  __attribute__ ((weak));
-
-void
-os_puts (u8 * string, uword string_length, uword is_error)
-{
-  int cpu = os_get_cpu_number ();
-  int ncpus = os_get_ncpus ();
-  char buf[64];
-  int fd = is_error ? 2 : 1;
-  struct iovec iovs[2];
-  int n_iovs = 0;
-
-  if (ncpus > 1)
-    {
-      snprintf (buf, sizeof (buf), "%d: ", cpu);
-
-      iovs[n_iovs].iov_base = buf;
-      iovs[n_iovs].iov_len = strlen (buf);
-      n_iovs++;
-    }
-
-  iovs[n_iovs].iov_base = string;
-  iovs[n_iovs].iov_len = string_length;
-  n_iovs++;
-
-  if (writev (fd, iovs, n_iovs) < 0)
-    ;
-}
-
-void os_out_of_memory (void) __attribute__ ((weak));
-void
-os_out_of_memory (void)
-{
-  os_panic ();
-}
-
-uword os_get_cpu_number (void) __attribute__ ((weak));
-uword
-os_get_cpu_number (void)
-{
-  return 0;
-}
-
-uword os_get_ncpus (void) __attribute__ ((weak));
-uword
-os_get_ncpus (void)
-{
-  return 1;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/unix.h b/vppinfra/vppinfra/unix.h
deleted file mode 100644
index 29114cfe..00000000
--- a/vppinfra/vppinfra/unix.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_unix_h
-#define included_clib_unix_h
-
-#include <vppinfra/error.h>
-
-/* Number of bytes in a Unix file. */
-clib_error_t *unix_file_n_bytes (char *file, uword * result);
-
-/* Read file contents into given buffer. */
-clib_error_t *unix_file_read_contents (char *file, u8 * result,
-				       uword n_bytes);
-
-/* Read and return contents of Unix file. */
-clib_error_t *unix_file_contents (char *file, u8 ** result);
-
-/* As above but for /proc file system on Linux. */
-clib_error_t *unix_proc_file_contents (char *file, u8 ** result);
-
-#endif /* included_clib_unix_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/valgrind.h b/vppinfra/vppinfra/valgrind.h
deleted file mode 100644
index e74d7e82..00000000
--- a/vppinfra/vppinfra/valgrind.h
+++ /dev/null
@@ -1,4030 +0,0 @@
-/* -*- c -*-
-   ----------------------------------------------------------------
-
-   Notice that the following BSD-style license applies to this one
-   file (valgrind.h) only.  The rest of Valgrind is licensed under the
-   terms of the GNU General Public License, version 2, unless
-   otherwise indicated.  See the COPYING file in the source
-   distribution for details.
-
-   ----------------------------------------------------------------
-
-   This file is part of Valgrind, a dynamic binary instrumentation
-   framework.
-
-   Copyright (C) 2000-2009 Julian Seward.  All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. The origin of this software must not be misrepresented; you must
-      not claim that you wrote the original software.  If you use this
-      software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   3. Altered source versions must be plainly marked as such, and must
-      not be misrepresented as being the original software.
-
-   4. The name of the author may not be used to endorse or promote
-      products derived from this software without specific prior written
-      permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   ----------------------------------------------------------------
-
-   Notice that the above BSD-style license applies to this one file
-   (valgrind.h) only.  The entire rest of Valgrind is licensed under
-   the terms of the GNU General Public License, version 2.  See the
-   COPYING file in the source distribution for details.
-
-   ----------------------------------------------------------------
-*/
-
-
-/* This file is for inclusion into client (your!) code.
-
-   You can use these macros to manipulate and query Valgrind's
-   execution inside your own programs.
-
-   The resulting executables will still run without Valgrind, just a
-   little bit more slowly than they otherwise would, but otherwise
-   unchanged.  When not running on valgrind, each client request
-   consumes very few (eg. 7) instructions, so the resulting performance
-   loss is negligible unless you plan to execute client requests
-   millions of times per second.  Nevertheless, if that is still a
-   problem, you can compile with the NVALGRIND symbol defined (gcc
-   -DNVALGRIND) so that client requests are not even compiled in.  */
-
-#ifndef __VALGRIND_H
-#define __VALGRIND_H
-
-#include <stdarg.h>
-
-/* Nb: this file might be included in a file compiled with -ansi.  So
-   we can't use C++ style "//" comments nor the "asm" keyword (instead
-   use "__asm__"). */
-
-/* Derive some tags indicating what the target platform is.  Note
-   that in this file we're using the compiler's CPP symbols for
-   identifying architectures, which are different to the ones we use
-   within the rest of Valgrind.  Note, __powerpc__ is active for both
-   32 and 64-bit PPC, whereas __powerpc64__ is only active for the
-   latter (on Linux, that is). */
-#undef PLAT_x86_linux
-#undef PLAT_amd64_linux
-#undef PLAT_ppc32_linux
-#undef PLAT_ppc64_linux
-#undef PLAT_ppc32_aix5
-#undef PLAT_ppc64_aix5
-
-
-#if defined(_AIX) && defined(__64BIT__)
-#define PLAT_ppc64_aix5 1
-#elif defined(_AIX) && !defined(__64BIT__)
-#define PLAT_ppc32_aix5 1
-#elif defined(__APPLE__) && defined(__i386__)
-#define PLAT_x86_darwin 1
-#elif defined(__APPLE__) && defined(__x86_64__)
-#define PLAT_amd64_darwin 1
-#elif defined(__i386__)
-#define PLAT_x86_linux 1
-#elif defined(__x86_64__)
-#define PLAT_amd64_linux 1
-#elif defined(__powerpc__) && !defined(__powerpc64__)
-#define PLAT_ppc32_linux 1
-#elif defined(__powerpc__) && defined(__powerpc64__)
-#define PLAT_ppc64_linux 1
-#else
-/* If we're not compiling for our target platform, don't generate
-   any inline asms.  */
-#if !defined(NVALGRIND)
-#define NVALGRIND 1
-#endif
-#endif
-
-
-/* ------------------------------------------------------------------ */
-/* ARCHITECTURE SPECIFICS for SPECIAL INSTRUCTIONS.  There is nothing */
-/* in here of use to end-users -- skip to the next section.           */
-/* ------------------------------------------------------------------ */
-
-#if defined(NVALGRIND)
-
-/* Define NVALGRIND to completely remove the Valgrind magic sequence
-   from the compiled code (analogous to NDEBUG's effects on
-   assert()) */
-#define VALGRIND_DO_CLIENT_REQUEST(                               \
-        _zzq_rlval, _zzq_default, _zzq_request,                   \
-        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
-   {                                                              \
-      (_zzq_rlval) = (_zzq_default);                              \
-   }
-
-#else /* ! NVALGRIND */
-
-/* The following defines the magic code sequences which the JITter
-   spots and handles magically.  Don't look too closely at them as
-   they will rot your brain.
-
-   The assembly code sequences for all architectures is in this one
-   file.  This is because this file must be stand-alone, and we don't
-   want to have multiple files.
-
-   For VALGRIND_DO_CLIENT_REQUEST, we must ensure that the default
-   value gets put in the return slot, so that everything works when
-   this is executed not under Valgrind.  Args are passed in a memory
-   block, and so there's no intrinsic limit to the number that could
-   be passed, but it's currently five.
-
-   The macro args are:
-      _zzq_rlval    result lvalue
-      _zzq_default  default value (result returned when running on real CPU)
-      _zzq_request  request code
-      _zzq_arg1..5  request params
-
-   The other two macros are used to support function wrapping, and are
-   a lot simpler.  VALGRIND_GET_NR_CONTEXT returns the value of the
-   guest's NRADDR pseudo-register and whatever other information is
-   needed to safely run the call original from the wrapper: on
-   ppc64-linux, the R2 value at the divert point is also needed.  This
-   information is abstracted into a user-visible type, OrigFn.
-
-   VALGRIND_CALL_NOREDIR_* behaves the same as the following on the
-   guest, but guarantees that the branch instruction will not be
-   redirected: x86: call *%eax, amd64: call *%rax, ppc32/ppc64:
-   branch-and-link-to-r11.  VALGRIND_CALL_NOREDIR is just text, not a
-   complete inline asm, since it needs to be combined with more magic
-   inline asm stuff to be useful.
-*/
-
-/* ------------------------- x86-{linux,darwin} ---------------- */
-
-#if defined(PLAT_x86_linux)  ||  defined(PLAT_x86_darwin)
-
-typedef struct
-{
-  unsigned int nraddr;		/* where's the code? */
-}
-OrigFn;
-
-#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
-                     "roll $3,  %%edi ; roll $13, %%edi\n\t"      \
-                     "roll $29, %%edi ; roll $19, %%edi\n\t"
-
-#define VALGRIND_DO_CLIENT_REQUEST(                               \
-        _zzq_rlval, _zzq_default, _zzq_request,                   \
-        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
-  { volatile unsigned int _zzq_args[6];                           \
-    volatile unsigned int _zzq_result;                            \
-    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
-    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
-    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
-    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
-    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
-    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
-    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %EDX = client_request ( %EAX ) */         \
-                     "xchgl %%ebx,%%ebx"                          \
-                     : "=d" (_zzq_result)                         \
-                     : "a" (&_zzq_args[0]), "0" (_zzq_default)    \
-                     : "cc", "memory"                             \
-                    );                                            \
-    _zzq_rlval = _zzq_result;                                     \
-  }
-
-#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
-  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
-    volatile unsigned int __addr;                                 \
-    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %EAX = guest_NRADDR */                    \
-                     "xchgl %%ecx,%%ecx"                          \
-                     : "=a" (__addr)                              \
-                     :                                            \
-                     : "cc", "memory"                             \
-                    );                                            \
-    _zzq_orig->nraddr = __addr;                                   \
-  }
-
-#define VALGRIND_CALL_NOREDIR_EAX                                 \
-                     __SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* call-noredir *%EAX */                     \
-                     "xchgl %%edx,%%edx\n\t"
-#endif /* PLAT_x86_linux || PLAT_x86_darwin */
-
-/* ------------------------ amd64-{linux,darwin} --------------- */
-
-#if defined(PLAT_amd64_linux)  ||  defined(PLAT_amd64_darwin)
-
-typedef struct
-{
-  unsigned long long int nraddr;	/* where's the code? */
-}
-OrigFn;
-
-#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
-                     "rolq $3,  %%rdi ; rolq $13, %%rdi\n\t"      \
-                     "rolq $61, %%rdi ; rolq $51, %%rdi\n\t"
-
-#define VALGRIND_DO_CLIENT_REQUEST(                               \
-        _zzq_rlval, _zzq_default, _zzq_request,                   \
-        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
-  { volatile unsigned long long int _zzq_args[6];                 \
-    volatile unsigned long long int _zzq_result;                  \
-    _zzq_args[0] = (unsigned long long int)(_zzq_request);        \
-    _zzq_args[1] = (unsigned long long int)(_zzq_arg1);           \
-    _zzq_args[2] = (unsigned long long int)(_zzq_arg2);           \
-    _zzq_args[3] = (unsigned long long int)(_zzq_arg3);           \
-    _zzq_args[4] = (unsigned long long int)(_zzq_arg4);           \
-    _zzq_args[5] = (unsigned long long int)(_zzq_arg5);           \
-    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %RDX = client_request ( %RAX ) */         \
-                     "xchgq %%rbx,%%rbx"                          \
-                     : "=d" (_zzq_result)                         \
-                     : "a" (&_zzq_args[0]), "0" (_zzq_default)    \
-                     : "cc", "memory"                             \
-                    );                                            \
-    _zzq_rlval = _zzq_result;                                     \
-  }
-
-#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
-  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
-    volatile unsigned long long int __addr;                       \
-    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %RAX = guest_NRADDR */                    \
-                     "xchgq %%rcx,%%rcx"                          \
-                     : "=a" (__addr)                              \
-                     :                                            \
-                     : "cc", "memory"                             \
-                    );                                            \
-    _zzq_orig->nraddr = __addr;                                   \
-  }
-
-#define VALGRIND_CALL_NOREDIR_RAX                                 \
-                     __SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* call-noredir *%RAX */                     \
-                     "xchgq %%rdx,%%rdx\n\t"
-#endif /* PLAT_amd64_linux || PLAT_amd64_darwin */
-
-/* ------------------------ ppc32-linux ------------------------ */
-
-#if defined(PLAT_ppc32_linux)
-
-typedef struct
-{
-  unsigned int nraddr;		/* where's the code? */
-}
-OrigFn;
-
-#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
-                     "rlwinm 0,0,3,0,0  ; rlwinm 0,0,13,0,0\n\t"  \
-                     "rlwinm 0,0,29,0,0 ; rlwinm 0,0,19,0,0\n\t"
-
-#define VALGRIND_DO_CLIENT_REQUEST(                               \
-        _zzq_rlval, _zzq_default, _zzq_request,                   \
-        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
-                                                                  \
-  {          unsigned int  _zzq_args[6];                          \
-             unsigned int  _zzq_result;                           \
-             unsigned int* _zzq_ptr;                              \
-    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
-    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
-    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
-    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
-    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
-    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
-    _zzq_ptr = _zzq_args;                                         \
-    __asm__ volatile("mr 3,%1\n\t" /*default*/                    \
-                     "mr 4,%2\n\t" /*ptr*/                        \
-                     __SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %R3 = client_request ( %R4 ) */           \
-                     "or 1,1,1\n\t"                               \
-                     "mr %0,3"     /*result*/                     \
-                     : "=b" (_zzq_result)                         \
-                     : "b" (_zzq_default), "b" (_zzq_ptr)         \
-                     : "cc", "memory", "r3", "r4");               \
-    _zzq_rlval = _zzq_result;                                     \
-  }
-
-#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
-  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
-    unsigned int __addr;                                          \
-    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %R3 = guest_NRADDR */                     \
-                     "or 2,2,2\n\t"                               \
-                     "mr %0,3"                                    \
-                     : "=b" (__addr)                              \
-                     :                                            \
-                     : "cc", "memory", "r3"                       \
-                    );                                            \
-    _zzq_orig->nraddr = __addr;                                   \
-  }
-
-#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
-                     __SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* branch-and-link-to-noredir *%R11 */       \
-                     "or 3,3,3\n\t"
-#endif /* PLAT_ppc32_linux */
-
-/* ------------------------ ppc64-linux ------------------------ */
-
-#if defined(PLAT_ppc64_linux)
-
-typedef struct
-{
-  unsigned long long int nraddr;	/* where's the code? */
-  unsigned long long int r2;	/* what tocptr do we need? */
-}
-OrigFn;
-
-#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
-                     "rotldi 0,0,3  ; rotldi 0,0,13\n\t"          \
-                     "rotldi 0,0,61 ; rotldi 0,0,51\n\t"
-
-#define VALGRIND_DO_CLIENT_REQUEST(                               \
-        _zzq_rlval, _zzq_default, _zzq_request,                   \
-        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
-                                                                  \
-  {          unsigned long long int  _zzq_args[6];                \
-    register unsigned long long int  _zzq_result __asm__("r3");   \
-    register unsigned long long int* _zzq_ptr __asm__("r4");      \
-    _zzq_args[0] = (unsigned long long int)(_zzq_request);        \
-    _zzq_args[1] = (unsigned long long int)(_zzq_arg1);           \
-    _zzq_args[2] = (unsigned long long int)(_zzq_arg2);           \
-    _zzq_args[3] = (unsigned long long int)(_zzq_arg3);           \
-    _zzq_args[4] = (unsigned long long int)(_zzq_arg4);           \
-    _zzq_args[5] = (unsigned long long int)(_zzq_arg5);           \
-    _zzq_ptr = _zzq_args;                                         \
-    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %R3 = client_request ( %R4 ) */           \
-                     "or 1,1,1"                                   \
-                     : "=r" (_zzq_result)                         \
-                     : "0" (_zzq_default), "r" (_zzq_ptr)         \
-                     : "cc", "memory");                           \
-    _zzq_rlval = _zzq_result;                                     \
-  }
-
-#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
-  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
-    register unsigned long long int __addr __asm__("r3");         \
-    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %R3 = guest_NRADDR */                     \
-                     "or 2,2,2"                                   \
-                     : "=r" (__addr)                              \
-                     :                                            \
-                     : "cc", "memory"                             \
-                    );                                            \
-    _zzq_orig->nraddr = __addr;                                   \
-    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %R3 = guest_NRADDR_GPR2 */                \
-                     "or 4,4,4"                                   \
-                     : "=r" (__addr)                              \
-                     :                                            \
-                     : "cc", "memory"                             \
-                    );                                            \
-    _zzq_orig->r2 = __addr;                                       \
-  }
-
-#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
-                     __SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* branch-and-link-to-noredir *%R11 */       \
-                     "or 3,3,3\n\t"
-
-#endif /* PLAT_ppc64_linux */
-
-/* ------------------------ ppc32-aix5 ------------------------- */
-
-#if defined(PLAT_ppc32_aix5)
-
-typedef struct
-{
-  unsigned int nraddr;		/* where's the code? */
-  unsigned int r2;		/* what tocptr do we need? */
-}
-OrigFn;
-
-#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
-                     "rlwinm 0,0,3,0,0  ; rlwinm 0,0,13,0,0\n\t"  \
-                     "rlwinm 0,0,29,0,0 ; rlwinm 0,0,19,0,0\n\t"
-
-#define VALGRIND_DO_CLIENT_REQUEST(                               \
-        _zzq_rlval, _zzq_default, _zzq_request,                   \
-        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
-                                                                  \
-  {          unsigned int  _zzq_args[7];                          \
-    register unsigned int  _zzq_result;                           \
-    register unsigned int* _zzq_ptr;                              \
-    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
-    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
-    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
-    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
-    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
-    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
-    _zzq_args[6] = (unsigned int)(_zzq_default);                  \
-    _zzq_ptr = _zzq_args;                                         \
-    __asm__ volatile("mr 4,%1\n\t"                                \
-                     "lwz 3, 24(4)\n\t"                           \
-                     __SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %R3 = client_request ( %R4 ) */           \
-                     "or 1,1,1\n\t"                               \
-                     "mr %0,3"                                    \
-                     : "=b" (_zzq_result)                         \
-                     : "b" (_zzq_ptr)                             \
-                     : "r3", "r4", "cc", "memory");               \
-    _zzq_rlval = _zzq_result;                                     \
-  }
-
-#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
-  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
-    register unsigned int __addr;                                 \
-    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %R3 = guest_NRADDR */                     \
-                     "or 2,2,2\n\t"                               \
-                     "mr %0,3"                                    \
-                     : "=b" (__addr)                              \
-                     :                                            \
-                     : "r3", "cc", "memory"                       \
-                    );                                            \
-    _zzq_orig->nraddr = __addr;                                   \
-    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %R3 = guest_NRADDR_GPR2 */                \
-                     "or 4,4,4\n\t"                               \
-                     "mr %0,3"                                    \
-                     : "=b" (__addr)                              \
-                     :                                            \
-                     : "r3", "cc", "memory"                       \
-                    );                                            \
-    _zzq_orig->r2 = __addr;                                       \
-  }
-
-#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
-                     __SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* branch-and-link-to-noredir *%R11 */       \
-                     "or 3,3,3\n\t"
-
-#endif /* PLAT_ppc32_aix5 */
-
-/* ------------------------ ppc64-aix5 ------------------------- */
-
-#if defined(PLAT_ppc64_aix5)
-
-typedef struct
-{
-  unsigned long long int nraddr;	/* where's the code? */
-  unsigned long long int r2;	/* what tocptr do we need? */
-}
-OrigFn;
-
-#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
-                     "rotldi 0,0,3  ; rotldi 0,0,13\n\t"          \
-                     "rotldi 0,0,61 ; rotldi 0,0,51\n\t"
-
-#define VALGRIND_DO_CLIENT_REQUEST(                               \
-        _zzq_rlval, _zzq_default, _zzq_request,                   \
-        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
-                                                                  \
-  {          unsigned long long int  _zzq_args[7];                \
-    register unsigned long long int  _zzq_result;                 \
-    register unsigned long long int* _zzq_ptr;                    \
-    _zzq_args[0] = (unsigned int long long)(_zzq_request);        \
-    _zzq_args[1] = (unsigned int long long)(_zzq_arg1);           \
-    _zzq_args[2] = (unsigned int long long)(_zzq_arg2);           \
-    _zzq_args[3] = (unsigned int long long)(_zzq_arg3);           \
-    _zzq_args[4] = (unsigned int long long)(_zzq_arg4);           \
-    _zzq_args[5] = (unsigned int long long)(_zzq_arg5);           \
-    _zzq_args[6] = (unsigned int long long)(_zzq_default);        \
-    _zzq_ptr = _zzq_args;                                         \
-    __asm__ volatile("mr 4,%1\n\t"                                \
-                     "ld 3, 48(4)\n\t"                            \
-                     __SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %R3 = client_request ( %R4 ) */           \
-                     "or 1,1,1\n\t"                               \
-                     "mr %0,3"                                    \
-                     : "=b" (_zzq_result)                         \
-                     : "b" (_zzq_ptr)                             \
-                     : "r3", "r4", "cc", "memory");               \
-    _zzq_rlval = _zzq_result;                                     \
-  }
-
-#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
-  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
-    register unsigned long long int __addr;                       \
-    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %R3 = guest_NRADDR */                     \
-                     "or 2,2,2\n\t"                               \
-                     "mr %0,3"                                    \
-                     : "=b" (__addr)                              \
-                     :                                            \
-                     : "r3", "cc", "memory"                       \
-                    );                                            \
-    _zzq_orig->nraddr = __addr;                                   \
-    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* %R3 = guest_NRADDR_GPR2 */                \
-                     "or 4,4,4\n\t"                               \
-                     "mr %0,3"                                    \
-                     : "=b" (__addr)                              \
-                     :                                            \
-                     : "r3", "cc", "memory"                       \
-                    );                                            \
-    _zzq_orig->r2 = __addr;                                       \
-  }
-
-#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
-                     __SPECIAL_INSTRUCTION_PREAMBLE               \
-                     /* branch-and-link-to-noredir *%R11 */       \
-                     "or 3,3,3\n\t"
-
-#endif /* PLAT_ppc64_aix5 */
-
-/* Insert assembly code for other platforms here... */
-
-#endif /* NVALGRIND */
-
-
-/* ------------------------------------------------------------------ */
-/* PLATFORM SPECIFICS for FUNCTION WRAPPING.  This is all very        */
-/* ugly.  It's the least-worst tradeoff I can think of.               */
-/* ------------------------------------------------------------------ */
-
-/* This section defines magic (a.k.a appalling-hack) macros for doing
-   guaranteed-no-redirection macros, so as to get from function
-   wrappers to the functions they are wrapping.  The whole point is to
-   construct standard call sequences, but to do the call itself with a
-   special no-redirect call pseudo-instruction that the JIT
-   understands and handles specially.  This section is long and
-   repetitious, and I can't see a way to make it shorter.
-
-   The naming scheme is as follows:
-
-      CALL_FN_{W,v}_{v,W,WW,WWW,WWWW,5W,6W,7W,etc}
-
-   'W' stands for "word" and 'v' for "void".  Hence there are
-   different macros for calling arity 0, 1, 2, 3, 4, etc, functions,
-   and for each, the possibility of returning a word-typed result, or
-   no result.
-*/
-
-/* Use these to write the name of your wrapper.  NOTE: duplicates
-   VG_WRAP_FUNCTION_Z{U,Z} in pub_tool_redir.h. */
-
-/* Use an extra level of macroisation so as to ensure the soname/fnname
-   args are fully macro-expanded before pasting them together. */
-#define VG_CONCAT4(_aa,_bb,_cc,_dd) _aa##_bb##_cc##_dd
-
-#define I_WRAP_SONAME_FNNAME_ZU(soname,fnname)                    \
-   VG_CONCAT4(_vgwZU_,soname,_,fnname)
-
-#define I_WRAP_SONAME_FNNAME_ZZ(soname,fnname)                    \
-   VG_CONCAT4(_vgwZZ_,soname,_,fnname)
-
-/* Use this macro from within a wrapper function to collect the
-   context (address and possibly other info) of the original function.
-   Once you have that you can then use it in one of the CALL_FN_
-   macros.  The type of the argument _lval is OrigFn. */
-#define VALGRIND_GET_ORIG_FN(_lval)  VALGRIND_GET_NR_CONTEXT(_lval)
-
-/* Derivatives of the main macros below, for calling functions
-   returning void. */
-
-#define CALL_FN_v_v(fnptr)                                        \
-   do { volatile unsigned long _junk;                             \
-        CALL_FN_W_v(_junk,fnptr); } while (0)
-
-#define CALL_FN_v_W(fnptr, arg1)                                  \
-   do { volatile unsigned long _junk;                             \
-        CALL_FN_W_W(_junk,fnptr,arg1); } while (0)
-
-#define CALL_FN_v_WW(fnptr, arg1,arg2)                            \
-   do { volatile unsigned long _junk;                             \
-        CALL_FN_W_WW(_junk,fnptr,arg1,arg2); } while (0)
-
-#define CALL_FN_v_WWW(fnptr, arg1,arg2,arg3)                      \
-   do { volatile unsigned long _junk;                             \
-        CALL_FN_W_WWW(_junk,fnptr,arg1,arg2,arg3); } while (0)
-
-#define CALL_FN_v_WWWW(fnptr, arg1,arg2,arg3,arg4)                \
-   do { volatile unsigned long _junk;                             \
-        CALL_FN_W_WWWW(_junk,fnptr,arg1,arg2,arg3,arg4); } while (0)
-
-#define CALL_FN_v_5W(fnptr, arg1,arg2,arg3,arg4,arg5)             \
-   do { volatile unsigned long _junk;                             \
-        CALL_FN_W_5W(_junk,fnptr,arg1,arg2,arg3,arg4,arg5); } while (0)
-
-#define CALL_FN_v_6W(fnptr, arg1,arg2,arg3,arg4,arg5,arg6)        \
-   do { volatile unsigned long _junk;                             \
-        CALL_FN_W_6W(_junk,fnptr,arg1,arg2,arg3,arg4,arg5,arg6); } while (0)
-
-#define CALL_FN_v_7W(fnptr, arg1,arg2,arg3,arg4,arg5,arg6,arg7)   \
-   do { volatile unsigned long _junk;                             \
-        CALL_FN_W_7W(_junk,fnptr,arg1,arg2,arg3,arg4,arg5,arg6,arg7); } while (0)
-
-/* ------------------------- x86-{linux,darwin} ---------------- */
-
-#if defined(PLAT_x86_linux)  ||  defined(PLAT_x86_darwin)
-
-/* These regs are trashed by the hidden call.  No need to mention eax
-   as gcc can already see that, plus causes gcc to bomb. */
-#define __CALLER_SAVED_REGS /*"eax"*/ "ecx", "edx"
-
-/* These CALL_FN_ macros assume that on x86-linux, sizeof(unsigned
-   long) == 4. */
-
-#define CALL_FN_W_v(lval, orig)                                   \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[1];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      __asm__ volatile(                                           \
-         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
-         VALGRIND_CALL_NOREDIR_EAX                                \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_W(lval, orig, arg1)                             \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[2];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      __asm__ volatile(                                           \
-         "pushl 4(%%eax)\n\t"                                     \
-         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
-         VALGRIND_CALL_NOREDIR_EAX                                \
-         "addl $4, %%esp\n"                                       \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      __asm__ volatile(                                           \
-         "pushl 8(%%eax)\n\t"                                     \
-         "pushl 4(%%eax)\n\t"                                     \
-         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
-         VALGRIND_CALL_NOREDIR_EAX                                \
-         "addl $8, %%esp\n"                                       \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[4];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      __asm__ volatile(                                           \
-         "pushl 12(%%eax)\n\t"                                    \
-         "pushl 8(%%eax)\n\t"                                     \
-         "pushl 4(%%eax)\n\t"                                     \
-         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
-         VALGRIND_CALL_NOREDIR_EAX                                \
-         "addl $12, %%esp\n"                                      \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[5];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      __asm__ volatile(                                           \
-         "pushl 16(%%eax)\n\t"                                    \
-         "pushl 12(%%eax)\n\t"                                    \
-         "pushl 8(%%eax)\n\t"                                     \
-         "pushl 4(%%eax)\n\t"                                     \
-         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
-         VALGRIND_CALL_NOREDIR_EAX                                \
-         "addl $16, %%esp\n"                                      \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[6];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      __asm__ volatile(                                           \
-         "pushl 20(%%eax)\n\t"                                    \
-         "pushl 16(%%eax)\n\t"                                    \
-         "pushl 12(%%eax)\n\t"                                    \
-         "pushl 8(%%eax)\n\t"                                     \
-         "pushl 4(%%eax)\n\t"                                     \
-         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
-         VALGRIND_CALL_NOREDIR_EAX                                \
-         "addl $20, %%esp\n"                                      \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[7];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      _argvec[6] = (unsigned long)(arg6);                         \
-      __asm__ volatile(                                           \
-         "pushl 24(%%eax)\n\t"                                    \
-         "pushl 20(%%eax)\n\t"                                    \
-         "pushl 16(%%eax)\n\t"                                    \
-         "pushl 12(%%eax)\n\t"                                    \
-         "pushl 8(%%eax)\n\t"                                     \
-         "pushl 4(%%eax)\n\t"                                     \
-         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
-         VALGRIND_CALL_NOREDIR_EAX                                \
-         "addl $24, %%esp\n"                                      \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7)                            \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[8];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      _argvec[6] = (unsigned long)(arg6);                         \
-      _argvec[7] = (unsigned long)(arg7);                         \
-      __asm__ volatile(                                           \
-         "pushl 28(%%eax)\n\t"                                    \
-         "pushl 24(%%eax)\n\t"                                    \
-         "pushl 20(%%eax)\n\t"                                    \
-         "pushl 16(%%eax)\n\t"                                    \
-         "pushl 12(%%eax)\n\t"                                    \
-         "pushl 8(%%eax)\n\t"                                     \
-         "pushl 4(%%eax)\n\t"                                     \
-         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
-         VALGRIND_CALL_NOREDIR_EAX                                \
-         "addl $28, %%esp\n"                                      \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7,arg8)                       \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[9];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      _argvec[6] = (unsigned long)(arg6);                         \
-      _argvec[7] = (unsigned long)(arg7);                         \
-      _argvec[8] = (unsigned long)(arg8);                         \
-      __asm__ volatile(                                           \
-         "pushl 32(%%eax)\n\t"                                    \
-         "pushl 28(%%eax)\n\t"                                    \
-         "pushl 24(%%eax)\n\t"                                    \
-         "pushl 20(%%eax)\n\t"                                    \
-         "pushl 16(%%eax)\n\t"                                    \
-         "pushl 12(%%eax)\n\t"                                    \
-         "pushl 8(%%eax)\n\t"                                     \
-         "pushl 4(%%eax)\n\t"                                     \
-         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
-         VALGRIND_CALL_NOREDIR_EAX                                \
-         "addl $32, %%esp\n"                                      \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7,arg8,arg9)                  \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[10];                         \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      _argvec[6] = (unsigned long)(arg6);                         \
-      _argvec[7] = (unsigned long)(arg7);                         \
-      _argvec[8] = (unsigned long)(arg8);                         \
-      _argvec[9] = (unsigned long)(arg9);                         \
-      __asm__ volatile(                                           \
-         "pushl 36(%%eax)\n\t"                                    \
-         "pushl 32(%%eax)\n\t"                                    \
-         "pushl 28(%%eax)\n\t"                                    \
-         "pushl 24(%%eax)\n\t"                                    \
-         "pushl 20(%%eax)\n\t"                                    \
-         "pushl 16(%%eax)\n\t"                                    \
-         "pushl 12(%%eax)\n\t"                                    \
-         "pushl 8(%%eax)\n\t"                                     \
-         "pushl 4(%%eax)\n\t"                                     \
-         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
-         VALGRIND_CALL_NOREDIR_EAX                                \
-         "addl $36, %%esp\n"                                      \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                  arg7,arg8,arg9,arg10)           \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[11];                         \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      _argvec[6] = (unsigned long)(arg6);                         \
-      _argvec[7] = (unsigned long)(arg7);                         \
-      _argvec[8] = (unsigned long)(arg8);                         \
-      _argvec[9] = (unsigned long)(arg9);                         \
-      _argvec[10] = (unsigned long)(arg10);                       \
-      __asm__ volatile(                                           \
-         "pushl 40(%%eax)\n\t"                                    \
-         "pushl 36(%%eax)\n\t"                                    \
-         "pushl 32(%%eax)\n\t"                                    \
-         "pushl 28(%%eax)\n\t"                                    \
-         "pushl 24(%%eax)\n\t"                                    \
-         "pushl 20(%%eax)\n\t"                                    \
-         "pushl 16(%%eax)\n\t"                                    \
-         "pushl 12(%%eax)\n\t"                                    \
-         "pushl 8(%%eax)\n\t"                                     \
-         "pushl 4(%%eax)\n\t"                                     \
-         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
-         VALGRIND_CALL_NOREDIR_EAX                                \
-         "addl $40, %%esp\n"                                      \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
-                                  arg6,arg7,arg8,arg9,arg10,      \
-                                  arg11)                          \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[12];                         \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      _argvec[6] = (unsigned long)(arg6);                         \
-      _argvec[7] = (unsigned long)(arg7);                         \
-      _argvec[8] = (unsigned long)(arg8);                         \
-      _argvec[9] = (unsigned long)(arg9);                         \
-      _argvec[10] = (unsigned long)(arg10);                       \
-      _argvec[11] = (unsigned long)(arg11);                       \
-      __asm__ volatile(                                           \
-         "pushl 44(%%eax)\n\t"                                    \
-         "pushl 40(%%eax)\n\t"                                    \
-         "pushl 36(%%eax)\n\t"                                    \
-         "pushl 32(%%eax)\n\t"                                    \
-         "pushl 28(%%eax)\n\t"                                    \
-         "pushl 24(%%eax)\n\t"                                    \
-         "pushl 20(%%eax)\n\t"                                    \
-         "pushl 16(%%eax)\n\t"                                    \
-         "pushl 12(%%eax)\n\t"                                    \
-         "pushl 8(%%eax)\n\t"                                     \
-         "pushl 4(%%eax)\n\t"                                     \
-         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
-         VALGRIND_CALL_NOREDIR_EAX                                \
-         "addl $44, %%esp\n"                                      \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
-                                  arg6,arg7,arg8,arg9,arg10,      \
-                                  arg11,arg12)                    \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[13];                         \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      _argvec[6] = (unsigned long)(arg6);                         \
-      _argvec[7] = (unsigned long)(arg7);                         \
-      _argvec[8] = (unsigned long)(arg8);                         \
-      _argvec[9] = (unsigned long)(arg9);                         \
-      _argvec[10] = (unsigned long)(arg10);                       \
-      _argvec[11] = (unsigned long)(arg11);                       \
-      _argvec[12] = (unsigned long)(arg12);                       \
-      __asm__ volatile(                                           \
-         "pushl 48(%%eax)\n\t"                                    \
-         "pushl 44(%%eax)\n\t"                                    \
-         "pushl 40(%%eax)\n\t"                                    \
-         "pushl 36(%%eax)\n\t"                                    \
-         "pushl 32(%%eax)\n\t"                                    \
-         "pushl 28(%%eax)\n\t"                                    \
-         "pushl 24(%%eax)\n\t"                                    \
-         "pushl 20(%%eax)\n\t"                                    \
-         "pushl 16(%%eax)\n\t"                                    \
-         "pushl 12(%%eax)\n\t"                                    \
-         "pushl 8(%%eax)\n\t"                                     \
-         "pushl 4(%%eax)\n\t"                                     \
-         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
-         VALGRIND_CALL_NOREDIR_EAX                                \
-         "addl $48, %%esp\n"                                      \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#endif /* PLAT_x86_linux || PLAT_x86_darwin */
-
-/* ------------------------ amd64-{linux,darwin} --------------- */
-
-#if defined(PLAT_amd64_linux)  ||  defined(PLAT_amd64_darwin)
-
-/* ARGREGS: rdi rsi rdx rcx r8 r9 (the rest on stack in R-to-L order) */
-
-/* These regs are trashed by the hidden call. */
-#define __CALLER_SAVED_REGS /*"rax",*/ "rcx", "rdx", "rsi",       \
-                            "rdi", "r8", "r9", "r10", "r11"
-
-/* These CALL_FN_ macros assume that on amd64-linux, sizeof(unsigned
-   long) == 8. */
-
-/* NB 9 Sept 07.  There is a nasty kludge here in all these CALL_FN_
-   macros.  In order not to trash the stack redzone, we need to drop
-   %rsp by 128 before the hidden call, and restore afterwards.  The
-   nastyness is that it is only by luck that the stack still appears
-   to be unwindable during the hidden call - since then the behaviour
-   of any routine using this macro does not match what the CFI data
-   says.  Sigh.
-
-   Why is this important?  Imagine that a wrapper has a stack
-   allocated local, and passes to the hidden call, a pointer to it.
-   Because gcc does not know about the hidden call, it may allocate
-   that local in the redzone.  Unfortunately the hidden call may then
-   trash it before it comes to use it.  So we must step clear of the
-   redzone, for the duration of the hidden call, to make it safe.
-
-   Probably the same problem afflicts the other redzone-style ABIs too
-   (ppc64-linux, ppc32-aix5, ppc64-aix5); but for those, the stack is
-   self describing (none of this CFI nonsense) so at least messing
-   with the stack pointer doesn't give a danger of non-unwindable
-   stack. */
-
-#define CALL_FN_W_v(lval, orig)                                   \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[1];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      __asm__ volatile(                                           \
-         "subq $128,%%rsp\n\t"                                    \
-         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
-         VALGRIND_CALL_NOREDIR_RAX                                \
-         "addq $128,%%rsp\n\t"                                    \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_W(lval, orig, arg1)                             \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[2];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      __asm__ volatile(                                           \
-         "subq $128,%%rsp\n\t"                                    \
-         "movq 8(%%rax), %%rdi\n\t"                               \
-         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
-         VALGRIND_CALL_NOREDIR_RAX                                \
-         "addq $128,%%rsp\n\t"                                    \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      __asm__ volatile(                                           \
-         "subq $128,%%rsp\n\t"                                    \
-         "movq 16(%%rax), %%rsi\n\t"                              \
-         "movq 8(%%rax), %%rdi\n\t"                               \
-         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
-         VALGRIND_CALL_NOREDIR_RAX                                \
-         "addq $128,%%rsp\n\t"                                    \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[4];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      __asm__ volatile(                                           \
-         "subq $128,%%rsp\n\t"                                    \
-         "movq 24(%%rax), %%rdx\n\t"                              \
-         "movq 16(%%rax), %%rsi\n\t"                              \
-         "movq 8(%%rax), %%rdi\n\t"                               \
-         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
-         VALGRIND_CALL_NOREDIR_RAX                                \
-         "addq $128,%%rsp\n\t"                                    \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[5];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      __asm__ volatile(                                           \
-         "subq $128,%%rsp\n\t"                                    \
-         "movq 32(%%rax), %%rcx\n\t"                              \
-         "movq 24(%%rax), %%rdx\n\t"                              \
-         "movq 16(%%rax), %%rsi\n\t"                              \
-         "movq 8(%%rax), %%rdi\n\t"                               \
-         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
-         VALGRIND_CALL_NOREDIR_RAX                                \
-         "addq $128,%%rsp\n\t"                                    \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[6];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      __asm__ volatile(                                           \
-         "subq $128,%%rsp\n\t"                                    \
-         "movq 40(%%rax), %%r8\n\t"                               \
-         "movq 32(%%rax), %%rcx\n\t"                              \
-         "movq 24(%%rax), %%rdx\n\t"                              \
-         "movq 16(%%rax), %%rsi\n\t"                              \
-         "movq 8(%%rax), %%rdi\n\t"                               \
-         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
-         VALGRIND_CALL_NOREDIR_RAX                                \
-         "addq $128,%%rsp\n\t"                                    \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[7];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      _argvec[6] = (unsigned long)(arg6);                         \
-      __asm__ volatile(                                           \
-         "subq $128,%%rsp\n\t"                                    \
-         "movq 48(%%rax), %%r9\n\t"                               \
-         "movq 40(%%rax), %%r8\n\t"                               \
-         "movq 32(%%rax), %%rcx\n\t"                              \
-         "movq 24(%%rax), %%rdx\n\t"                              \
-         "movq 16(%%rax), %%rsi\n\t"                              \
-         "movq 8(%%rax), %%rdi\n\t"                               \
-         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
-         "addq $128,%%rsp\n\t"                                    \
-         VALGRIND_CALL_NOREDIR_RAX                                \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7)                            \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[8];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      _argvec[6] = (unsigned long)(arg6);                         \
-      _argvec[7] = (unsigned long)(arg7);                         \
-      __asm__ volatile(                                           \
-         "subq $128,%%rsp\n\t"                                    \
-         "pushq 56(%%rax)\n\t"                                    \
-         "movq 48(%%rax), %%r9\n\t"                               \
-         "movq 40(%%rax), %%r8\n\t"                               \
-         "movq 32(%%rax), %%rcx\n\t"                              \
-         "movq 24(%%rax), %%rdx\n\t"                              \
-         "movq 16(%%rax), %%rsi\n\t"                              \
-         "movq 8(%%rax), %%rdi\n\t"                               \
-         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
-         VALGRIND_CALL_NOREDIR_RAX                                \
-         "addq $8, %%rsp\n"                                       \
-         "addq $128,%%rsp\n\t"                                    \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7,arg8)                       \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[9];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      _argvec[6] = (unsigned long)(arg6);                         \
-      _argvec[7] = (unsigned long)(arg7);                         \
-      _argvec[8] = (unsigned long)(arg8);                         \
-      __asm__ volatile(                                           \
-         "subq $128,%%rsp\n\t"                                    \
-         "pushq 64(%%rax)\n\t"                                    \
-         "pushq 56(%%rax)\n\t"                                    \
-         "movq 48(%%rax), %%r9\n\t"                               \
-         "movq 40(%%rax), %%r8\n\t"                               \
-         "movq 32(%%rax), %%rcx\n\t"                              \
-         "movq 24(%%rax), %%rdx\n\t"                              \
-         "movq 16(%%rax), %%rsi\n\t"                              \
-         "movq 8(%%rax), %%rdi\n\t"                               \
-         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
-         VALGRIND_CALL_NOREDIR_RAX                                \
-         "addq $16, %%rsp\n"                                      \
-         "addq $128,%%rsp\n\t"                                    \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7,arg8,arg9)                  \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[10];                         \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      _argvec[6] = (unsigned long)(arg6);                         \
-      _argvec[7] = (unsigned long)(arg7);                         \
-      _argvec[8] = (unsigned long)(arg8);                         \
-      _argvec[9] = (unsigned long)(arg9);                         \
-      __asm__ volatile(                                           \
-         "subq $128,%%rsp\n\t"                                    \
-         "pushq 72(%%rax)\n\t"                                    \
-         "pushq 64(%%rax)\n\t"                                    \
-         "pushq 56(%%rax)\n\t"                                    \
-         "movq 48(%%rax), %%r9\n\t"                               \
-         "movq 40(%%rax), %%r8\n\t"                               \
-         "movq 32(%%rax), %%rcx\n\t"                              \
-         "movq 24(%%rax), %%rdx\n\t"                              \
-         "movq 16(%%rax), %%rsi\n\t"                              \
-         "movq 8(%%rax), %%rdi\n\t"                               \
-         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
-         VALGRIND_CALL_NOREDIR_RAX                                \
-         "addq $24, %%rsp\n"                                      \
-         "addq $128,%%rsp\n\t"                                    \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                  arg7,arg8,arg9,arg10)           \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[11];                         \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      _argvec[6] = (unsigned long)(arg6);                         \
-      _argvec[7] = (unsigned long)(arg7);                         \
-      _argvec[8] = (unsigned long)(arg8);                         \
-      _argvec[9] = (unsigned long)(arg9);                         \
-      _argvec[10] = (unsigned long)(arg10);                       \
-      __asm__ volatile(                                           \
-         "subq $128,%%rsp\n\t"                                    \
-         "pushq 80(%%rax)\n\t"                                    \
-         "pushq 72(%%rax)\n\t"                                    \
-         "pushq 64(%%rax)\n\t"                                    \
-         "pushq 56(%%rax)\n\t"                                    \
-         "movq 48(%%rax), %%r9\n\t"                               \
-         "movq 40(%%rax), %%r8\n\t"                               \
-         "movq 32(%%rax), %%rcx\n\t"                              \
-         "movq 24(%%rax), %%rdx\n\t"                              \
-         "movq 16(%%rax), %%rsi\n\t"                              \
-         "movq 8(%%rax), %%rdi\n\t"                               \
-         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
-         VALGRIND_CALL_NOREDIR_RAX                                \
-         "addq $32, %%rsp\n"                                      \
-         "addq $128,%%rsp\n\t"                                    \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                  arg7,arg8,arg9,arg10,arg11)     \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[12];                         \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      _argvec[6] = (unsigned long)(arg6);                         \
-      _argvec[7] = (unsigned long)(arg7);                         \
-      _argvec[8] = (unsigned long)(arg8);                         \
-      _argvec[9] = (unsigned long)(arg9);                         \
-      _argvec[10] = (unsigned long)(arg10);                       \
-      _argvec[11] = (unsigned long)(arg11);                       \
-      __asm__ volatile(                                           \
-         "subq $128,%%rsp\n\t"                                    \
-         "pushq 88(%%rax)\n\t"                                    \
-         "pushq 80(%%rax)\n\t"                                    \
-         "pushq 72(%%rax)\n\t"                                    \
-         "pushq 64(%%rax)\n\t"                                    \
-         "pushq 56(%%rax)\n\t"                                    \
-         "movq 48(%%rax), %%r9\n\t"                               \
-         "movq 40(%%rax), %%r8\n\t"                               \
-         "movq 32(%%rax), %%rcx\n\t"                              \
-         "movq 24(%%rax), %%rdx\n\t"                              \
-         "movq 16(%%rax), %%rsi\n\t"                              \
-         "movq 8(%%rax), %%rdi\n\t"                               \
-         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
-         VALGRIND_CALL_NOREDIR_RAX                                \
-         "addq $40, %%rsp\n"                                      \
-         "addq $128,%%rsp\n\t"                                    \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                arg7,arg8,arg9,arg10,arg11,arg12) \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[13];                         \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)(arg1);                         \
-      _argvec[2] = (unsigned long)(arg2);                         \
-      _argvec[3] = (unsigned long)(arg3);                         \
-      _argvec[4] = (unsigned long)(arg4);                         \
-      _argvec[5] = (unsigned long)(arg5);                         \
-      _argvec[6] = (unsigned long)(arg6);                         \
-      _argvec[7] = (unsigned long)(arg7);                         \
-      _argvec[8] = (unsigned long)(arg8);                         \
-      _argvec[9] = (unsigned long)(arg9);                         \
-      _argvec[10] = (unsigned long)(arg10);                       \
-      _argvec[11] = (unsigned long)(arg11);                       \
-      _argvec[12] = (unsigned long)(arg12);                       \
-      __asm__ volatile(                                           \
-         "subq $128,%%rsp\n\t"                                    \
-         "pushq 96(%%rax)\n\t"                                    \
-         "pushq 88(%%rax)\n\t"                                    \
-         "pushq 80(%%rax)\n\t"                                    \
-         "pushq 72(%%rax)\n\t"                                    \
-         "pushq 64(%%rax)\n\t"                                    \
-         "pushq 56(%%rax)\n\t"                                    \
-         "movq 48(%%rax), %%r9\n\t"                               \
-         "movq 40(%%rax), %%r8\n\t"                               \
-         "movq 32(%%rax), %%rcx\n\t"                              \
-         "movq 24(%%rax), %%rdx\n\t"                              \
-         "movq 16(%%rax), %%rsi\n\t"                              \
-         "movq 8(%%rax), %%rdi\n\t"                               \
-         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
-         VALGRIND_CALL_NOREDIR_RAX                                \
-         "addq $48, %%rsp\n"                                      \
-         "addq $128,%%rsp\n\t"                                    \
-         : /*out*/   "=a" (_res)                                  \
-         : /*in*/    "a" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#endif /* PLAT_amd64_linux || PLAT_amd64_darwin */
-
-/* ------------------------ ppc32-linux ------------------------ */
-
-#if defined(PLAT_ppc32_linux)
-
-/* This is useful for finding out about the on-stack stuff:
-
-   extern int f9  ( int,int,int,int,int,int,int,int,int );
-   extern int f10 ( int,int,int,int,int,int,int,int,int,int );
-   extern int f11 ( int,int,int,int,int,int,int,int,int,int,int );
-   extern int f12 ( int,int,int,int,int,int,int,int,int,int,int,int );
-
-   int g9 ( void ) {
-      return f9(11,22,33,44,55,66,77,88,99);
-   }
-   int g10 ( void ) {
-      return f10(11,22,33,44,55,66,77,88,99,110);
-   }
-   int g11 ( void ) {
-      return f11(11,22,33,44,55,66,77,88,99,110,121);
-   }
-   int g12 ( void ) {
-      return f12(11,22,33,44,55,66,77,88,99,110,121,132);
-   }
-*/
-
-/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
-
-/* These regs are trashed by the hidden call. */
-#define __CALLER_SAVED_REGS                                       \
-   "lr", "ctr", "xer",                                            \
-   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
-   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
-   "r11", "r12", "r13"
-
-/* These CALL_FN_ macros assume that on ppc32-linux,
-   sizeof(unsigned long) == 4. */
-
-#define CALL_FN_W_v(lval, orig)                                   \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[1];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr %0,3"                                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_W(lval, orig, arg1)                             \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[2];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)arg1;                           \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
-         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr %0,3"                                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)arg1;                           \
-      _argvec[2] = (unsigned long)arg2;                           \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
-         "lwz 4,8(11)\n\t"                                        \
-         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr %0,3"                                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[4];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)arg1;                           \
-      _argvec[2] = (unsigned long)arg2;                           \
-      _argvec[3] = (unsigned long)arg3;                           \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
-         "lwz 4,8(11)\n\t"                                        \
-         "lwz 5,12(11)\n\t"                                       \
-         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr %0,3"                                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[5];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)arg1;                           \
-      _argvec[2] = (unsigned long)arg2;                           \
-      _argvec[3] = (unsigned long)arg3;                           \
-      _argvec[4] = (unsigned long)arg4;                           \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
-         "lwz 4,8(11)\n\t"                                        \
-         "lwz 5,12(11)\n\t"                                       \
-         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
-         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr %0,3"                                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[6];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)arg1;                           \
-      _argvec[2] = (unsigned long)arg2;                           \
-      _argvec[3] = (unsigned long)arg3;                           \
-      _argvec[4] = (unsigned long)arg4;                           \
-      _argvec[5] = (unsigned long)arg5;                           \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
-         "lwz 4,8(11)\n\t"                                        \
-         "lwz 5,12(11)\n\t"                                       \
-         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
-         "lwz 7,20(11)\n\t"                                       \
-         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr %0,3"                                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[7];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)arg1;                           \
-      _argvec[2] = (unsigned long)arg2;                           \
-      _argvec[3] = (unsigned long)arg3;                           \
-      _argvec[4] = (unsigned long)arg4;                           \
-      _argvec[5] = (unsigned long)arg5;                           \
-      _argvec[6] = (unsigned long)arg6;                           \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
-         "lwz 4,8(11)\n\t"                                        \
-         "lwz 5,12(11)\n\t"                                       \
-         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
-         "lwz 7,20(11)\n\t"                                       \
-         "lwz 8,24(11)\n\t"                                       \
-         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr %0,3"                                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7)                            \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[8];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)arg1;                           \
-      _argvec[2] = (unsigned long)arg2;                           \
-      _argvec[3] = (unsigned long)arg3;                           \
-      _argvec[4] = (unsigned long)arg4;                           \
-      _argvec[5] = (unsigned long)arg5;                           \
-      _argvec[6] = (unsigned long)arg6;                           \
-      _argvec[7] = (unsigned long)arg7;                           \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
-         "lwz 4,8(11)\n\t"                                        \
-         "lwz 5,12(11)\n\t"                                       \
-         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
-         "lwz 7,20(11)\n\t"                                       \
-         "lwz 8,24(11)\n\t"                                       \
-         "lwz 9,28(11)\n\t"                                       \
-         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr %0,3"                                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7,arg8)                       \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[9];                          \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)arg1;                           \
-      _argvec[2] = (unsigned long)arg2;                           \
-      _argvec[3] = (unsigned long)arg3;                           \
-      _argvec[4] = (unsigned long)arg4;                           \
-      _argvec[5] = (unsigned long)arg5;                           \
-      _argvec[6] = (unsigned long)arg6;                           \
-      _argvec[7] = (unsigned long)arg7;                           \
-      _argvec[8] = (unsigned long)arg8;                           \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
-         "lwz 4,8(11)\n\t"                                        \
-         "lwz 5,12(11)\n\t"                                       \
-         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
-         "lwz 7,20(11)\n\t"                                       \
-         "lwz 8,24(11)\n\t"                                       \
-         "lwz 9,28(11)\n\t"                                       \
-         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
-         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr %0,3"                                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7,arg8,arg9)                  \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[10];                         \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)arg1;                           \
-      _argvec[2] = (unsigned long)arg2;                           \
-      _argvec[3] = (unsigned long)arg3;                           \
-      _argvec[4] = (unsigned long)arg4;                           \
-      _argvec[5] = (unsigned long)arg5;                           \
-      _argvec[6] = (unsigned long)arg6;                           \
-      _argvec[7] = (unsigned long)arg7;                           \
-      _argvec[8] = (unsigned long)arg8;                           \
-      _argvec[9] = (unsigned long)arg9;                           \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "addi 1,1,-16\n\t"                                       \
-         /* arg9 */                                               \
-         "lwz 3,36(11)\n\t"                                       \
-         "stw 3,8(1)\n\t"                                         \
-         /* args1-8 */                                            \
-         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
-         "lwz 4,8(11)\n\t"                                        \
-         "lwz 5,12(11)\n\t"                                       \
-         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
-         "lwz 7,20(11)\n\t"                                       \
-         "lwz 8,24(11)\n\t"                                       \
-         "lwz 9,28(11)\n\t"                                       \
-         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
-         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "addi 1,1,16\n\t"                                        \
-         "mr %0,3"                                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                  arg7,arg8,arg9,arg10)           \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[11];                         \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)arg1;                           \
-      _argvec[2] = (unsigned long)arg2;                           \
-      _argvec[3] = (unsigned long)arg3;                           \
-      _argvec[4] = (unsigned long)arg4;                           \
-      _argvec[5] = (unsigned long)arg5;                           \
-      _argvec[6] = (unsigned long)arg6;                           \
-      _argvec[7] = (unsigned long)arg7;                           \
-      _argvec[8] = (unsigned long)arg8;                           \
-      _argvec[9] = (unsigned long)arg9;                           \
-      _argvec[10] = (unsigned long)arg10;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "addi 1,1,-16\n\t"                                       \
-         /* arg10 */                                              \
-         "lwz 3,40(11)\n\t"                                       \
-         "stw 3,12(1)\n\t"                                        \
-         /* arg9 */                                               \
-         "lwz 3,36(11)\n\t"                                       \
-         "stw 3,8(1)\n\t"                                         \
-         /* args1-8 */                                            \
-         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
-         "lwz 4,8(11)\n\t"                                        \
-         "lwz 5,12(11)\n\t"                                       \
-         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
-         "lwz 7,20(11)\n\t"                                       \
-         "lwz 8,24(11)\n\t"                                       \
-         "lwz 9,28(11)\n\t"                                       \
-         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
-         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "addi 1,1,16\n\t"                                        \
-         "mr %0,3"                                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                  arg7,arg8,arg9,arg10,arg11)     \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[12];                         \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)arg1;                           \
-      _argvec[2] = (unsigned long)arg2;                           \
-      _argvec[3] = (unsigned long)arg3;                           \
-      _argvec[4] = (unsigned long)arg4;                           \
-      _argvec[5] = (unsigned long)arg5;                           \
-      _argvec[6] = (unsigned long)arg6;                           \
-      _argvec[7] = (unsigned long)arg7;                           \
-      _argvec[8] = (unsigned long)arg8;                           \
-      _argvec[9] = (unsigned long)arg9;                           \
-      _argvec[10] = (unsigned long)arg10;                         \
-      _argvec[11] = (unsigned long)arg11;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "addi 1,1,-32\n\t"                                       \
-         /* arg11 */                                              \
-         "lwz 3,44(11)\n\t"                                       \
-         "stw 3,16(1)\n\t"                                        \
-         /* arg10 */                                              \
-         "lwz 3,40(11)\n\t"                                       \
-         "stw 3,12(1)\n\t"                                        \
-         /* arg9 */                                               \
-         "lwz 3,36(11)\n\t"                                       \
-         "stw 3,8(1)\n\t"                                         \
-         /* args1-8 */                                            \
-         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
-         "lwz 4,8(11)\n\t"                                        \
-         "lwz 5,12(11)\n\t"                                       \
-         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
-         "lwz 7,20(11)\n\t"                                       \
-         "lwz 8,24(11)\n\t"                                       \
-         "lwz 9,28(11)\n\t"                                       \
-         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
-         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "addi 1,1,32\n\t"                                        \
-         "mr %0,3"                                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                arg7,arg8,arg9,arg10,arg11,arg12) \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[13];                         \
-      volatile unsigned long _res;                                \
-      _argvec[0] = (unsigned long)_orig.nraddr;                   \
-      _argvec[1] = (unsigned long)arg1;                           \
-      _argvec[2] = (unsigned long)arg2;                           \
-      _argvec[3] = (unsigned long)arg3;                           \
-      _argvec[4] = (unsigned long)arg4;                           \
-      _argvec[5] = (unsigned long)arg5;                           \
-      _argvec[6] = (unsigned long)arg6;                           \
-      _argvec[7] = (unsigned long)arg7;                           \
-      _argvec[8] = (unsigned long)arg8;                           \
-      _argvec[9] = (unsigned long)arg9;                           \
-      _argvec[10] = (unsigned long)arg10;                         \
-      _argvec[11] = (unsigned long)arg11;                         \
-      _argvec[12] = (unsigned long)arg12;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "addi 1,1,-32\n\t"                                       \
-         /* arg12 */                                              \
-         "lwz 3,48(11)\n\t"                                       \
-         "stw 3,20(1)\n\t"                                        \
-         /* arg11 */                                              \
-         "lwz 3,44(11)\n\t"                                       \
-         "stw 3,16(1)\n\t"                                        \
-         /* arg10 */                                              \
-         "lwz 3,40(11)\n\t"                                       \
-         "stw 3,12(1)\n\t"                                        \
-         /* arg9 */                                               \
-         "lwz 3,36(11)\n\t"                                       \
-         "stw 3,8(1)\n\t"                                         \
-         /* args1-8 */                                            \
-         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
-         "lwz 4,8(11)\n\t"                                        \
-         "lwz 5,12(11)\n\t"                                       \
-         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
-         "lwz 7,20(11)\n\t"                                       \
-         "lwz 8,24(11)\n\t"                                       \
-         "lwz 9,28(11)\n\t"                                       \
-         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
-         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "addi 1,1,32\n\t"                                        \
-         "mr %0,3"                                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[0])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#endif /* PLAT_ppc32_linux */
-
-/* ------------------------ ppc64-linux ------------------------ */
-
-#if defined(PLAT_ppc64_linux)
-
-/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
-
-/* These regs are trashed by the hidden call. */
-#define __CALLER_SAVED_REGS                                       \
-   "lr", "ctr", "xer",                                            \
-   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
-   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
-   "r11", "r12", "r13"
-
-/* These CALL_FN_ macros assume that on ppc64-linux, sizeof(unsigned
-   long) == 8. */
-
-#define CALL_FN_W_v(lval, orig)                                   \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+0];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1] = (unsigned long)_orig.r2;                       \
-      _argvec[2] = (unsigned long)_orig.nraddr;                   \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "std 2,-16(11)\n\t"  /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)" /* restore tocptr */                      \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_W(lval, orig, arg1)                             \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+1];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "std 2,-16(11)\n\t"  /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)" /* restore tocptr */                      \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+2];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "std 2,-16(11)\n\t"  /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)" /* restore tocptr */                      \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+3];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "std 2,-16(11)\n\t"  /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)" /* restore tocptr */                      \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+4];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "std 2,-16(11)\n\t"  /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)" /* restore tocptr */                      \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+5];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "std 2,-16(11)\n\t"  /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)" /* restore tocptr */                      \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+6];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "std 2,-16(11)\n\t"  /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)" /* restore tocptr */                      \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7)                            \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+7];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "std 2,-16(11)\n\t"  /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
-         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)" /* restore tocptr */                      \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7,arg8)                       \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+8];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "std 2,-16(11)\n\t"  /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
-         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
-         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)" /* restore tocptr */                      \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7,arg8,arg9)                  \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+9];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      _argvec[2+9] = (unsigned long)arg9;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "std 2,-16(11)\n\t"  /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "addi 1,1,-128\n\t"  /* expand stack frame */            \
-         /* arg9 */                                               \
-         "ld  3,72(11)\n\t"                                       \
-         "std 3,112(1)\n\t"                                       \
-         /* args1-8 */                                            \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
-         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
-         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
-         "addi 1,1,128"     /* restore frame */                   \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                  arg7,arg8,arg9,arg10)           \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+10];                       \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      _argvec[2+9] = (unsigned long)arg9;                         \
-      _argvec[2+10] = (unsigned long)arg10;                       \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "std 2,-16(11)\n\t"  /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "addi 1,1,-128\n\t"  /* expand stack frame */            \
-         /* arg10 */                                              \
-         "ld  3,80(11)\n\t"                                       \
-         "std 3,120(1)\n\t"                                       \
-         /* arg9 */                                               \
-         "ld  3,72(11)\n\t"                                       \
-         "std 3,112(1)\n\t"                                       \
-         /* args1-8 */                                            \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
-         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
-         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
-         "addi 1,1,128"     /* restore frame */                   \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                  arg7,arg8,arg9,arg10,arg11)     \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+11];                       \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      _argvec[2+9] = (unsigned long)arg9;                         \
-      _argvec[2+10] = (unsigned long)arg10;                       \
-      _argvec[2+11] = (unsigned long)arg11;                       \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "std 2,-16(11)\n\t"  /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "addi 1,1,-144\n\t"  /* expand stack frame */            \
-         /* arg11 */                                              \
-         "ld  3,88(11)\n\t"                                       \
-         "std 3,128(1)\n\t"                                       \
-         /* arg10 */                                              \
-         "ld  3,80(11)\n\t"                                       \
-         "std 3,120(1)\n\t"                                       \
-         /* arg9 */                                               \
-         "ld  3,72(11)\n\t"                                       \
-         "std 3,112(1)\n\t"                                       \
-         /* args1-8 */                                            \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
-         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
-         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
-         "addi 1,1,144"     /* restore frame */                   \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                arg7,arg8,arg9,arg10,arg11,arg12) \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+12];                       \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      _argvec[2+9] = (unsigned long)arg9;                         \
-      _argvec[2+10] = (unsigned long)arg10;                       \
-      _argvec[2+11] = (unsigned long)arg11;                       \
-      _argvec[2+12] = (unsigned long)arg12;                       \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         "std 2,-16(11)\n\t"  /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "addi 1,1,-144\n\t"  /* expand stack frame */            \
-         /* arg12 */                                              \
-         "ld  3,96(11)\n\t"                                       \
-         "std 3,136(1)\n\t"                                       \
-         /* arg11 */                                              \
-         "ld  3,88(11)\n\t"                                       \
-         "std 3,128(1)\n\t"                                       \
-         /* arg10 */                                              \
-         "ld  3,80(11)\n\t"                                       \
-         "std 3,120(1)\n\t"                                       \
-         /* arg9 */                                               \
-         "ld  3,72(11)\n\t"                                       \
-         "std 3,112(1)\n\t"                                       \
-         /* args1-8 */                                            \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
-         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
-         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
-         "addi 1,1,144"     /* restore frame */                   \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#endif /* PLAT_ppc64_linux */
-
-/* ------------------------ ppc32-aix5 ------------------------- */
-
-#if defined(PLAT_ppc32_aix5)
-
-/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
-
-/* These regs are trashed by the hidden call. */
-#define __CALLER_SAVED_REGS                                       \
-   "lr", "ctr", "xer",                                            \
-   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
-   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
-   "r11", "r12", "r13"
-
-/* Expand the stack frame, copying enough info that unwinding
-   still works.  Trashes r3. */
-
-#define VG_EXPAND_FRAME_BY_trashes_r3(_n_fr)                      \
-         "addi 1,1,-" #_n_fr "\n\t"                               \
-         "lwz  3," #_n_fr "(1)\n\t"                               \
-         "stw  3,0(1)\n\t"
-
-#define VG_CONTRACT_FRAME_BY(_n_fr)                               \
-         "addi 1,1," #_n_fr "\n\t"
-
-/* These CALL_FN_ macros assume that on ppc32-aix5, sizeof(unsigned
-   long) == 4. */
-
-#define CALL_FN_W_v(lval, orig)                                   \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+0];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1] = (unsigned long)_orig.r2;                       \
-      _argvec[2] = (unsigned long)_orig.nraddr;                   \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
-         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
-         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_W(lval, orig, arg1)                             \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+1];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
-         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
-         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
-         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+2];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
-         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
-         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
-         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
-         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+3];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
-         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
-         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
-         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
-         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
-         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+4];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
-         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
-         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
-         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
-         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
-         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
-         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+5];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
-         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
-         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
-         "lwz  4, 8(11)\n\t" /* arg2->r4 */                       \
-         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
-         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
-         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
-         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+6];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
-         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
-         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
-         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
-         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
-         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
-         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
-         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
-         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7)                            \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+7];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
-         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
-         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
-         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
-         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
-         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
-         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
-         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
-         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
-         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7,arg8)                       \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+8];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
-         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
-         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
-         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
-         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
-         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
-         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
-         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
-         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
-         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
-         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7,arg8,arg9)                  \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+9];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      _argvec[2+9] = (unsigned long)arg9;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
-         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
-         VG_EXPAND_FRAME_BY_trashes_r3(64)                        \
-         /* arg9 */                                               \
-         "lwz 3,36(11)\n\t"                                       \
-         "stw 3,56(1)\n\t"                                        \
-         /* args1-8 */                                            \
-         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
-         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
-         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
-         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
-         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
-         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
-         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
-         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
-         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(64)                                 \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                  arg7,arg8,arg9,arg10)           \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+10];                       \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      _argvec[2+9] = (unsigned long)arg9;                         \
-      _argvec[2+10] = (unsigned long)arg10;                       \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
-         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
-         VG_EXPAND_FRAME_BY_trashes_r3(64)                        \
-         /* arg10 */                                              \
-         "lwz 3,40(11)\n\t"                                       \
-         "stw 3,60(1)\n\t"                                        \
-         /* arg9 */                                               \
-         "lwz 3,36(11)\n\t"                                       \
-         "stw 3,56(1)\n\t"                                        \
-         /* args1-8 */                                            \
-         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
-         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
-         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
-         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
-         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
-         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
-         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
-         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
-         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(64)                                 \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                  arg7,arg8,arg9,arg10,arg11)     \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+11];                       \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      _argvec[2+9] = (unsigned long)arg9;                         \
-      _argvec[2+10] = (unsigned long)arg10;                       \
-      _argvec[2+11] = (unsigned long)arg11;                       \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
-         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
-         VG_EXPAND_FRAME_BY_trashes_r3(72)                        \
-         /* arg11 */                                              \
-         "lwz 3,44(11)\n\t"                                       \
-         "stw 3,64(1)\n\t"                                        \
-         /* arg10 */                                              \
-         "lwz 3,40(11)\n\t"                                       \
-         "stw 3,60(1)\n\t"                                        \
-         /* arg9 */                                               \
-         "lwz 3,36(11)\n\t"                                       \
-         "stw 3,56(1)\n\t"                                        \
-         /* args1-8 */                                            \
-         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
-         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
-         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
-         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
-         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
-         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
-         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
-         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
-         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(72)                                 \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                arg7,arg8,arg9,arg10,arg11,arg12) \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+12];                       \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      _argvec[2+9] = (unsigned long)arg9;                         \
-      _argvec[2+10] = (unsigned long)arg10;                       \
-      _argvec[2+11] = (unsigned long)arg11;                       \
-      _argvec[2+12] = (unsigned long)arg12;                       \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
-         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
-         VG_EXPAND_FRAME_BY_trashes_r3(72)                        \
-         /* arg12 */                                              \
-         "lwz 3,48(11)\n\t"                                       \
-         "stw 3,68(1)\n\t"                                        \
-         /* arg11 */                                              \
-         "lwz 3,44(11)\n\t"                                       \
-         "stw 3,64(1)\n\t"                                        \
-         /* arg10 */                                              \
-         "lwz 3,40(11)\n\t"                                       \
-         "stw 3,60(1)\n\t"                                        \
-         /* arg9 */                                               \
-         "lwz 3,36(11)\n\t"                                       \
-         "stw 3,56(1)\n\t"                                        \
-         /* args1-8 */                                            \
-         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
-         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
-         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
-         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
-         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
-         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
-         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
-         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
-         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(72)                                 \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#endif /* PLAT_ppc32_aix5 */
-
-/* ------------------------ ppc64-aix5 ------------------------- */
-
-#if defined(PLAT_ppc64_aix5)
-
-/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
-
-/* These regs are trashed by the hidden call. */
-#define __CALLER_SAVED_REGS                                       \
-   "lr", "ctr", "xer",                                            \
-   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
-   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
-   "r11", "r12", "r13"
-
-/* Expand the stack frame, copying enough info that unwinding
-   still works.  Trashes r3. */
-
-#define VG_EXPAND_FRAME_BY_trashes_r3(_n_fr)                      \
-         "addi 1,1,-" #_n_fr "\n\t"                               \
-         "ld   3," #_n_fr "(1)\n\t"                               \
-         "std  3,0(1)\n\t"
-
-#define VG_CONTRACT_FRAME_BY(_n_fr)                               \
-         "addi 1,1," #_n_fr "\n\t"
-
-/* These CALL_FN_ macros assume that on ppc64-aix5, sizeof(unsigned
-   long) == 8. */
-
-#define CALL_FN_W_v(lval, orig)                                   \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+0];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1] = (unsigned long)_orig.r2;                       \
-      _argvec[2] = (unsigned long)_orig.nraddr;                   \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "std  2,-16(11)\n\t" /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_W(lval, orig, arg1)                             \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+1];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "std  2,-16(11)\n\t" /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+2];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "std  2,-16(11)\n\t" /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+3];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "std  2,-16(11)\n\t" /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+4];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "std  2,-16(11)\n\t" /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+5];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "std  2,-16(11)\n\t" /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+6];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "std  2,-16(11)\n\t" /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7)                            \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+7];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "std  2,-16(11)\n\t" /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
-         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7,arg8)                       \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+8];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "std  2,-16(11)\n\t" /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
-         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
-         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
-                                 arg7,arg8,arg9)                  \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+9];                        \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      _argvec[2+9] = (unsigned long)arg9;                         \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "std  2,-16(11)\n\t" /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         VG_EXPAND_FRAME_BY_trashes_r3(128)                       \
-         /* arg9 */                                               \
-         "ld  3,72(11)\n\t"                                       \
-         "std 3,112(1)\n\t"                                       \
-         /* args1-8 */                                            \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
-         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
-         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
-         VG_CONTRACT_FRAME_BY(128)                                \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                  arg7,arg8,arg9,arg10)           \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+10];                       \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      _argvec[2+9] = (unsigned long)arg9;                         \
-      _argvec[2+10] = (unsigned long)arg10;                       \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "std  2,-16(11)\n\t" /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         VG_EXPAND_FRAME_BY_trashes_r3(128)                       \
-         /* arg10 */                                              \
-         "ld  3,80(11)\n\t"                                       \
-         "std 3,120(1)\n\t"                                       \
-         /* arg9 */                                               \
-         "ld  3,72(11)\n\t"                                       \
-         "std 3,112(1)\n\t"                                       \
-         /* args1-8 */                                            \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
-         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
-         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
-         VG_CONTRACT_FRAME_BY(128)                                \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                  arg7,arg8,arg9,arg10,arg11)     \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+11];                       \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      _argvec[2+9] = (unsigned long)arg9;                         \
-      _argvec[2+10] = (unsigned long)arg10;                       \
-      _argvec[2+11] = (unsigned long)arg11;                       \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "std  2,-16(11)\n\t" /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         VG_EXPAND_FRAME_BY_trashes_r3(144)                       \
-         /* arg11 */                                              \
-         "ld  3,88(11)\n\t"                                       \
-         "std 3,128(1)\n\t"                                       \
-         /* arg10 */                                              \
-         "ld  3,80(11)\n\t"                                       \
-         "std 3,120(1)\n\t"                                       \
-         /* arg9 */                                               \
-         "ld  3,72(11)\n\t"                                       \
-         "std 3,112(1)\n\t"                                       \
-         /* args1-8 */                                            \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
-         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
-         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
-         VG_CONTRACT_FRAME_BY(144)                                \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
-                                arg7,arg8,arg9,arg10,arg11,arg12) \
-   do {                                                           \
-      volatile OrigFn        _orig = (orig);                      \
-      volatile unsigned long _argvec[3+12];                       \
-      volatile unsigned long _res;                                \
-      /* _argvec[0] holds current r2 across the call */           \
-      _argvec[1]   = (unsigned long)_orig.r2;                     \
-      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
-      _argvec[2+1] = (unsigned long)arg1;                         \
-      _argvec[2+2] = (unsigned long)arg2;                         \
-      _argvec[2+3] = (unsigned long)arg3;                         \
-      _argvec[2+4] = (unsigned long)arg4;                         \
-      _argvec[2+5] = (unsigned long)arg5;                         \
-      _argvec[2+6] = (unsigned long)arg6;                         \
-      _argvec[2+7] = (unsigned long)arg7;                         \
-      _argvec[2+8] = (unsigned long)arg8;                         \
-      _argvec[2+9] = (unsigned long)arg9;                         \
-      _argvec[2+10] = (unsigned long)arg10;                       \
-      _argvec[2+11] = (unsigned long)arg11;                       \
-      _argvec[2+12] = (unsigned long)arg12;                       \
-      __asm__ volatile(                                           \
-         "mr 11,%1\n\t"                                           \
-         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
-         "std  2,-16(11)\n\t" /* save tocptr */                   \
-         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
-         VG_EXPAND_FRAME_BY_trashes_r3(144)                       \
-         /* arg12 */                                              \
-         "ld  3,96(11)\n\t"                                       \
-         "std 3,136(1)\n\t"                                       \
-         /* arg11 */                                              \
-         "ld  3,88(11)\n\t"                                       \
-         "std 3,128(1)\n\t"                                       \
-         /* arg10 */                                              \
-         "ld  3,80(11)\n\t"                                       \
-         "std 3,120(1)\n\t"                                       \
-         /* arg9 */                                               \
-         "ld  3,72(11)\n\t"                                       \
-         "std 3,112(1)\n\t"                                       \
-         /* args1-8 */                                            \
-         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
-         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
-         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
-         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
-         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
-         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
-         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
-         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
-         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
-         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
-         "mr 11,%1\n\t"                                           \
-         "mr %0,3\n\t"                                            \
-         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
-         VG_CONTRACT_FRAME_BY(144)                                \
-         VG_CONTRACT_FRAME_BY(512)                                \
-         : /*out*/   "=r" (_res)                                  \
-         : /*in*/    "r" (&_argvec[2])                            \
-         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
-      );                                                          \
-      lval = (__typeof__(lval)) _res;                             \
-   } while (0)
-
-#endif /* PLAT_ppc64_aix5 */
-
-
-/* ------------------------------------------------------------------ */
-/* ARCHITECTURE INDEPENDENT MACROS for CLIENT REQUESTS.               */
-/*                                                                    */
-/* ------------------------------------------------------------------ */
-
-/* Some request codes.  There are many more of these, but most are not
-   exposed to end-user view.  These are the public ones, all of the
-   form 0x1000 + small_number.
-
-   Core ones are in the range 0x00000000--0x0000ffff.  The non-public
-   ones start at 0x2000.
-*/
-
-/* These macros are used by tools -- they must be public, but don't
-   embed them into other programs. */
-#define VG_USERREQ_TOOL_BASE(a,b) \
-   ((unsigned int)(((a)&0xff) << 24 | ((b)&0xff) << 16))
-#define VG_IS_TOOL_USERREQ(a, b, v) \
-   (VG_USERREQ_TOOL_BASE(a,b) == ((v) & 0xffff0000))
-
-/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !!
-   This enum comprises an ABI exported by Valgrind to programs
-   which use client requests.  DO NOT CHANGE THE ORDER OF THESE
-   ENTRIES, NOR DELETE ANY -- add new ones at the end. */
-typedef enum
-{ VG_USERREQ__RUNNING_ON_VALGRIND = 0x1001,
-  VG_USERREQ__DISCARD_TRANSLATIONS = 0x1002,
-
-  /* These allow any function to be called from the simulated
-     CPU but run on the real CPU.  Nb: the first arg passed to
-     the function is always the ThreadId of the running
-     thread!  So CLIENT_CALL0 actually requires a 1 arg
-     function, etc. */
-  VG_USERREQ__CLIENT_CALL0 = 0x1101,
-  VG_USERREQ__CLIENT_CALL1 = 0x1102,
-  VG_USERREQ__CLIENT_CALL2 = 0x1103,
-  VG_USERREQ__CLIENT_CALL3 = 0x1104,
-
-  /* Can be useful in regression testing suites -- eg. can
-     send Valgrind's output to /dev/null and still count
-     errors. */
-  VG_USERREQ__COUNT_ERRORS = 0x1201,
-
-  /* These are useful and can be interpreted by any tool that
-     tracks malloc() et al, by using vg_replace_malloc.c. */
-  VG_USERREQ__MALLOCLIKE_BLOCK = 0x1301,
-  VG_USERREQ__FREELIKE_BLOCK = 0x1302,
-  /* Memory pool support. */
-  VG_USERREQ__CREATE_MEMPOOL = 0x1303,
-  VG_USERREQ__DESTROY_MEMPOOL = 0x1304,
-  VG_USERREQ__MEMPOOL_ALLOC = 0x1305,
-  VG_USERREQ__MEMPOOL_FREE = 0x1306,
-  VG_USERREQ__MEMPOOL_TRIM = 0x1307,
-  VG_USERREQ__MOVE_MEMPOOL = 0x1308,
-  VG_USERREQ__MEMPOOL_CHANGE = 0x1309,
-  VG_USERREQ__MEMPOOL_EXISTS = 0x130a,
-
-  /* Allow printfs to valgrind log. */
-  VG_USERREQ__PRINTF = 0x1401,
-  VG_USERREQ__PRINTF_BACKTRACE = 0x1402,
-
-  /* Stack support. */
-  VG_USERREQ__STACK_REGISTER = 0x1501,
-  VG_USERREQ__STACK_DEREGISTER = 0x1502,
-  VG_USERREQ__STACK_CHANGE = 0x1503,
-
-  /* Wine support */
-  VG_USERREQ__LOAD_PDB_DEBUGINFO = 0x1601
-} Vg_ClientRequest;
-
-#if !defined(__GNUC__)
-#define __extension__		/* */
-#endif
-
-/* Returns the number of Valgrinds this code is running under.  That
-   is, 0 if running natively, 1 if running under Valgrind, 2 if
-   running under Valgrind which is running under another Valgrind,
-   etc. */
-#define RUNNING_ON_VALGRIND  __extension__                        \
-   ({unsigned int _qzz_res;                                       \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* if not */,          \
-                               VG_USERREQ__RUNNING_ON_VALGRIND,   \
-                               0, 0, 0, 0, 0);                    \
-    _qzz_res;                                                     \
-   })
-
-
-/* Discard translation of code in the range [_qzz_addr .. _qzz_addr +
-   _qzz_len - 1].  Useful if you are debugging a JITter or some such,
-   since it provides a way to make sure valgrind will retranslate the
-   invalidated area.  Returns no value. */
-#define VALGRIND_DISCARD_TRANSLATIONS(_qzz_addr,_qzz_len)         \
-   {unsigned int _qzz_res;                                        \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
-                               VG_USERREQ__DISCARD_TRANSLATIONS,  \
-                               _qzz_addr, _qzz_len, 0, 0, 0);     \
-   }
-
-
-/* These requests are for getting Valgrind itself to print something.
-   Possibly with a backtrace.  This is a really ugly hack.  The return value
-   is the number of characters printed, excluding the "**<pid>** " part at the
-   start and the backtrace (if present). */
-
-#if defined(NVALGRIND)
-
-#define VALGRIND_PRINTF(...)
-#define VALGRIND_PRINTF_BACKTRACE(...)
-
-#else /* NVALGRIND */
-
-/* Modern GCC will optimize the static routine out if unused,
-   and unused attribute will shut down warnings about it.  */
-static int VALGRIND_PRINTF (const char *format, ...)
-  __attribute__ ((format (__printf__, 1, 2), __unused__));
-static int
-VALGRIND_PRINTF (const char *format, ...)
-{
-  unsigned long _qzz_res;
-  va_list vargs;
-  va_start (vargs, format);
-  VALGRIND_DO_CLIENT_REQUEST (_qzz_res, 0, VG_USERREQ__PRINTF,
-			      (unsigned long) format, (unsigned long) vargs,
-			      0, 0, 0);
-  va_end (vargs);
-  return (int) _qzz_res;
-}
-
-static int VALGRIND_PRINTF_BACKTRACE (const char *format, ...)
-  __attribute__ ((format (__printf__, 1, 2), __unused__));
-static int
-VALGRIND_PRINTF_BACKTRACE (const char *format, ...)
-{
-  unsigned long _qzz_res;
-  va_list vargs;
-  va_start (vargs, format);
-  VALGRIND_DO_CLIENT_REQUEST (_qzz_res, 0, VG_USERREQ__PRINTF_BACKTRACE,
-			      (unsigned long) format, (unsigned long) vargs,
-			      0, 0, 0);
-  va_end (vargs);
-  return (int) _qzz_res;
-}
-
-#endif /* NVALGRIND */
-
-
-/* These requests allow control to move from the simulated CPU to the
-   real CPU, calling an arbitary function.
-
-   Note that the current ThreadId is inserted as the first argument.
-   So this call:
-
-     VALGRIND_NON_SIMD_CALL2(f, arg1, arg2)
-
-   requires f to have this signature:
-
-     Word f(Word tid, Word arg1, Word arg2)
-
-   where "Word" is a word-sized type.
-
-   Note that these client requests are not entirely reliable.  For example,
-   if you call a function with them that subsequently calls printf(),
-   there's a high chance Valgrind will crash.  Generally, your prospects of
-   these working are made higher if the called function does not refer to
-   any global variables, and does not refer to any libc or other functions
-   (printf et al).  Any kind of entanglement with libc or dynamic linking is
-   likely to have a bad outcome, for tricky reasons which we've grappled
-   with a lot in the past.
-*/
-#define VALGRIND_NON_SIMD_CALL0(_qyy_fn)                          \
-   __extension__                                                  \
-   ({unsigned long _qyy_res;                                      \
-    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
-                               VG_USERREQ__CLIENT_CALL0,          \
-                               _qyy_fn,                           \
-                               0, 0, 0, 0);                       \
-    _qyy_res;                                                     \
-   })
-
-#define VALGRIND_NON_SIMD_CALL1(_qyy_fn, _qyy_arg1)               \
-   __extension__                                                  \
-   ({unsigned long _qyy_res;                                      \
-    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
-                               VG_USERREQ__CLIENT_CALL1,          \
-                               _qyy_fn,                           \
-                               _qyy_arg1, 0, 0, 0);               \
-    _qyy_res;                                                     \
-   })
-
-#define VALGRIND_NON_SIMD_CALL2(_qyy_fn, _qyy_arg1, _qyy_arg2)    \
-   __extension__                                                  \
-   ({unsigned long _qyy_res;                                      \
-    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
-                               VG_USERREQ__CLIENT_CALL2,          \
-                               _qyy_fn,                           \
-                               _qyy_arg1, _qyy_arg2, 0, 0);       \
-    _qyy_res;                                                     \
-   })
-
-#define VALGRIND_NON_SIMD_CALL3(_qyy_fn, _qyy_arg1, _qyy_arg2, _qyy_arg3) \
-   __extension__                                                  \
-   ({unsigned long _qyy_res;                                      \
-    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
-                               VG_USERREQ__CLIENT_CALL3,          \
-                               _qyy_fn,                           \
-                               _qyy_arg1, _qyy_arg2,              \
-                               _qyy_arg3, 0);                     \
-    _qyy_res;                                                     \
-   })
-
-
-/* Counts the number of errors that have been recorded by a tool.  Nb:
-   the tool must record the errors with VG_(maybe_record_error)() or
-   VG_(unique_error)() for them to be counted. */
-#define VALGRIND_COUNT_ERRORS                                     \
-   __extension__                                                  \
-   ({unsigned int _qyy_res;                                       \
-    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
-                               VG_USERREQ__COUNT_ERRORS,          \
-                               0, 0, 0, 0, 0);                    \
-    _qyy_res;                                                     \
-   })
-
-/* Several Valgrind tools (Memcheck, Massif, Helgrind, DRD) rely on knowing
-   when heap blocks are allocated in order to give accurate results.  This
-   happens automatically for the standard allocator functions such as
-   malloc(), calloc(), realloc(), memalign(), new, new[], free(), delete,
-   delete[], etc.
-
-   But if your program uses a custom allocator, this doesn't automatically
-   happen, and Valgrind will not do as well.  For example, if you allocate
-   superblocks with mmap() and then allocates chunks of the superblocks, all
-   Valgrind's observations will be at the mmap() level and it won't know that
-   the chunks should be considered separate entities.  In Memcheck's case,
-   that means you probably won't get heap block overrun detection (because
-   there won't be redzones marked as unaddressable) and you definitely won't
-   get any leak detection.
-
-   The following client requests allow a custom allocator to be annotated so
-   that it can be handled accurately by Valgrind.
-
-   VALGRIND_MALLOCLIKE_BLOCK marks a region of memory as having been allocated
-   by a malloc()-like function.  For Memcheck (an illustrative case), this
-   does two things:
-
-   - It records that the block has been allocated.  This means any addresses
-     within the block mentioned in error messages will be
-     identified as belonging to the block.  It also means that if the block
-     isn't freed it will be detected by the leak checker.
-
-   - It marks the block as being addressable and undefined (if 'is_zeroed' is
-     not set), or addressable and defined (if 'is_zeroed' is set).  This
-     controls how accesses to the block by the program are handled.
-
-   'addr' is the start of the usable block (ie. after any
-   redzone), 'sizeB' is its size.  'rzB' is the redzone size if the allocator
-   can apply redzones -- these are blocks of padding at the start and end of
-   each block.  Adding redzones is recommended as it makes it much more likely
-   Valgrind will spot block overruns.  `is_zeroed' indicates if the memory is
-   zeroed (or filled with another predictable value), as is the case for
-   calloc().
-
-   VALGRIND_MALLOCLIKE_BLOCK should be put immediately after the point where a
-   heap block -- that will be used by the client program -- is allocated.
-   It's best to put it at the outermost level of the allocator if possible;
-   for example, if you have a function my_alloc() which calls
-   internal_alloc(), and the client request is put inside internal_alloc(),
-   stack traces relating to the heap block will contain entries for both
-   my_alloc() and internal_alloc(), which is probably not what you want.
-
-   For Memcheck users: if you use VALGRIND_MALLOCLIKE_BLOCK to carve out
-   custom blocks from within a heap block, B, that has been allocated with
-   malloc/calloc/new/etc, then block B will be *ignored* during leak-checking
-   -- the custom blocks will take precedence.
-
-   VALGRIND_FREELIKE_BLOCK is the partner to VALGRIND_MALLOCLIKE_BLOCK.  For
-   Memcheck, it does two things:
-
-   - It records that the block has been deallocated.  This assumes that the
-     block was annotated as having been allocated via
-     VALGRIND_MALLOCLIKE_BLOCK.  Otherwise, an error will be issued.
-
-   - It marks the block as being unaddressable.
-
-   VALGRIND_FREELIKE_BLOCK should be put immediately after the point where a
-   heap block is deallocated.
-
-   In many cases, these two client requests will not be enough to get your
-   allocator working well with Memcheck.  More specifically, if your allocator
-   writes to freed blocks in any way then a VALGRIND_MAKE_MEM_UNDEFINED call
-   will be necessary to mark the memory as addressable just before the zeroing
-   occurs, otherwise you'll get a lot of invalid write errors.  For example,
-   you'll need to do this if your allocator recycles freed blocks, but it
-   zeroes them before handing them back out (via VALGRIND_MALLOCLIKE_BLOCK).
-   Alternatively, if your allocator reuses freed blocks for allocator-internal
-   data structures, VALGRIND_MAKE_MEM_UNDEFINED calls will also be necessary.
-
-   Really, what's happening is a blurring of the lines between the client
-   program and the allocator... after VALGRIND_FREELIKE_BLOCK is called, the
-   memory should be considered unaddressable to the client program, but the
-   allocator knows more than the rest of the client program and so may be able
-   to safely access it.  Extra client requests are necessary for Valgrind to
-   understand the distinction between the allocator and the rest of the
-   program.
-
-   Note: there is currently no VALGRIND_REALLOCLIKE_BLOCK client request;  it
-   has to be emulated with MALLOCLIKE/FREELIKE and memory copying.
-
-   Ignored if addr == 0.
-*/
-#define VALGRIND_MALLOCLIKE_BLOCK(addr, sizeB, rzB, is_zeroed)	\
-   {unsigned int _qzz_res;					\
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,			\
-                               VG_USERREQ__MALLOCLIKE_BLOCK,	\
-                               addr, sizeB, rzB, is_zeroed, 0);	\
-    (void) _qzz_res; /* compiler warning */			\
-   }
-
-/* See the comment for VALGRIND_MALLOCLIKE_BLOCK for details.
-   Ignored if addr == 0.
-*/
-#define VALGRIND_FREELIKE_BLOCK(addr, rzB)			\
-   {unsigned int _qzz_res;					\
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,			\
-                               VG_USERREQ__FREELIKE_BLOCK,	\
-                               addr, rzB, 0, 0, 0);		\
-    (void) _qzz_res; /* compiler warning */			\
-   }
-
-/* Create a memory pool. */
-#define VALGRIND_CREATE_MEMPOOL(pool, rzB, is_zeroed)             \
-   {unsigned int _qzz_res;                                        \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
-                               VG_USERREQ__CREATE_MEMPOOL,        \
-                               pool, rzB, is_zeroed, 0, 0);       \
-   }
-
-/* Destroy a memory pool. */
-#define VALGRIND_DESTROY_MEMPOOL(pool)                            \
-   {unsigned int _qzz_res;                                        \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
-                               VG_USERREQ__DESTROY_MEMPOOL,       \
-                               pool, 0, 0, 0, 0);                 \
-   }
-
-/* Associate a piece of memory with a memory pool. */
-#define VALGRIND_MEMPOOL_ALLOC(pool, addr, size)                  \
-   {unsigned int _qzz_res;                                        \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
-                               VG_USERREQ__MEMPOOL_ALLOC,         \
-                               pool, addr, size, 0, 0);           \
-   }
-
-/* Disassociate a piece of memory from a memory pool. */
-#define VALGRIND_MEMPOOL_FREE(pool, addr)                         \
-   {unsigned int _qzz_res;                                        \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
-                               VG_USERREQ__MEMPOOL_FREE,          \
-                               pool, addr, 0, 0, 0);              \
-   }
-
-/* Disassociate any pieces outside a particular range. */
-#define VALGRIND_MEMPOOL_TRIM(pool, addr, size)                   \
-   {unsigned int _qzz_res;                                        \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
-                               VG_USERREQ__MEMPOOL_TRIM,          \
-                               pool, addr, size, 0, 0);           \
-   }
-
-/* Resize and/or move a piece associated with a memory pool. */
-#define VALGRIND_MOVE_MEMPOOL(poolA, poolB)                       \
-   {unsigned int _qzz_res;                                        \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
-                               VG_USERREQ__MOVE_MEMPOOL,          \
-                               poolA, poolB, 0, 0, 0);            \
-   }
-
-/* Resize and/or move a piece associated with a memory pool. */
-#define VALGRIND_MEMPOOL_CHANGE(pool, addrA, addrB, size)         \
-   {unsigned int _qzz_res;                                        \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
-                               VG_USERREQ__MEMPOOL_CHANGE,        \
-                               pool, addrA, addrB, size, 0);      \
-   }
-
-/* Return 1 if a mempool exists, else 0. */
-#define VALGRIND_MEMPOOL_EXISTS(pool)                             \
-   __extension__                                                  \
-   ({unsigned int _qzz_res;                                       \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
-                               VG_USERREQ__MEMPOOL_EXISTS,        \
-                               pool, 0, 0, 0, 0);                 \
-    _qzz_res;                                                     \
-   })
-
-/* Mark a piece of memory as being a stack. Returns a stack id. */
-#define VALGRIND_STACK_REGISTER(start, end)                       \
-   __extension__                                                  \
-   ({unsigned int _qzz_res;                                       \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
-                               VG_USERREQ__STACK_REGISTER,        \
-                               start, end, 0, 0, 0);              \
-    _qzz_res;                                                     \
-   })
-
-/* Unmark the piece of memory associated with a stack id as being a
-   stack. */
-#define VALGRIND_STACK_DEREGISTER(id)                             \
-   {unsigned int _qzz_res;                                        \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
-                               VG_USERREQ__STACK_DEREGISTER,      \
-                               id, 0, 0, 0, 0);                   \
-   }
-
-/* Change the start and end address of the stack id. */
-#define VALGRIND_STACK_CHANGE(id, start, end)                     \
-   {unsigned int _qzz_res;                                        \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
-                               VG_USERREQ__STACK_CHANGE,          \
-                               id, start, end, 0, 0);             \
-   }
-
-/* Load PDB debug info for Wine PE image_map. */
-#define VALGRIND_LOAD_PDB_DEBUGINFO(fd, ptr, total_size, delta)   \
-   {unsigned int _qzz_res;                                        \
-    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
-                               VG_USERREQ__LOAD_PDB_DEBUGINFO,    \
-                               fd, ptr, total_size, delta, 0);    \
-   }
-
-
-#undef PLAT_x86_linux
-#undef PLAT_amd64_linux
-#undef PLAT_ppc32_linux
-#undef PLAT_ppc64_linux
-#undef PLAT_ppc32_aix5
-#undef PLAT_ppc64_aix5
-
-#endif /* __VALGRIND_H */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vec.c b/vppinfra/vppinfra/vec.c
deleted file mode 100644
index 2d7ae1d4..00000000
--- a/vppinfra/vppinfra/vec.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/vec.h>
-#include <vppinfra/mem.h>
-
-/* Vector resize operator.  Called as needed by various macros such as
-   vec_add1() when we need to allocate memory. */
-void *
-vec_resize_allocate_memory (void *v,
-			    word length_increment,
-			    uword data_bytes,
-			    uword header_bytes, uword data_align)
-{
-  vec_header_t *vh = _vec_find (v);
-  uword old_alloc_bytes, new_alloc_bytes;
-  void *old, *new;
-
-  header_bytes = vec_header_bytes (header_bytes);
-
-  data_bytes += header_bytes;
-
-  if (!v)
-    {
-      new = clib_mem_alloc_aligned_at_offset (data_bytes, data_align, header_bytes, 1	/* yes, call os_out_of_memory */
-	);
-      data_bytes = clib_mem_size (new);
-      memset (new, 0, data_bytes);
-      v = new + header_bytes;
-      _vec_len (v) = length_increment;
-      return v;
-    }
-
-  vh->len += length_increment;
-  old = v - header_bytes;
-
-  /* Vector header must start heap object. */
-  ASSERT (clib_mem_is_heap_object (old));
-
-  old_alloc_bytes = clib_mem_size (old);
-
-  /* Need to resize? */
-  if (data_bytes <= old_alloc_bytes)
-    return v;
-
-  new_alloc_bytes = (old_alloc_bytes * 3) / 2;
-  if (new_alloc_bytes < data_bytes)
-    new_alloc_bytes = data_bytes;
-
-  new =
-    clib_mem_alloc_aligned_at_offset (new_alloc_bytes, data_align,
-				      header_bytes,
-				      1 /* yes, call os_out_of_memory */ );
-
-  /* FIXME fail gracefully. */
-  if (!new)
-    clib_panic
-      ("vec_resize fails, length increment %d, data bytes %d, alignment %d",
-       length_increment, data_bytes, data_align);
-
-  clib_memcpy (new, old, old_alloc_bytes);
-  clib_mem_free (old);
-  v = new;
-
-  /* Allocator may give a bit of extra room. */
-  new_alloc_bytes = clib_mem_size (v);
-
-  /* Zero new memory. */
-  memset (v + old_alloc_bytes, 0, new_alloc_bytes - old_alloc_bytes);
-
-  return v + header_bytes;
-}
-
-uword
-clib_mem_is_vec_h (void *v, uword header_bytes)
-{
-  return clib_mem_is_heap_object (vec_header (v, header_bytes));
-}
-
-/** \cond */
-
-#ifdef TEST
-
-#include <stdio.h>
-
-void
-main (int argc, char *argv[])
-{
-  word n = atoi (argv[1]);
-  word i, *x = 0;
-
-  typedef struct
-  {
-    word x, y, z;
-  } FOO;
-
-  FOO *foos = vec_init (FOO, 10), *f;
-
-  vec_validate (foos, 100);
-  foos[100].x = 99;
-
-  _vec_len (foos) = 0;
-  for (i = 0; i < n; i++)
-    {
-      vec_add1 (x, i);
-      vec_add2 (foos, f, 1);
-      f->x = 2 * i;
-      f->y = 3 * i;
-      f->z = 4 * i;
-    }
-
-  {
-    word n = 2;
-    word m = 42;
-    vec_delete (foos, n, m);
-  }
-
-  {
-    word n = 2;
-    word m = 42;
-    vec_insert (foos, n, m);
-  }
-
-  vec_free (x);
-  vec_free (foos);
-  exit (0);
-}
-#endif
-/** \endcond */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vec.h b/vppinfra/vppinfra/vec.h
deleted file mode 100644
index eed96d6b..00000000
--- a/vppinfra/vppinfra/vec.h
+++ /dev/null
@@ -1,973 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_vec_h
-#define included_vec_h
-
-#include <vppinfra/clib.h>	/* word, etc */
-#include <vppinfra/mem.h>	/* clib_mem_free */
-#include <vppinfra/string.h>	/* memcpy, memmove */
-#include <vppinfra/vec_bootstrap.h>
-
-/** \file
-
-   CLIB vectors are ubiquitous dynamically resized arrays with by user
-   defined "headers".  Many CLIB data structures (e.g. hash, heap,
-   pool) are vectors with various different headers.
-
-   The memory layout looks like this:
-
-~~~~~~~~
-                    user header (aligned to uword boundary)
-                    vector length: number of elements
-   user's pointer-> vector element #0
-                    vector element #1
-                    ...
-~~~~~~~~
-
-   The user pointer contains the address of vector element # 0.  Null
-   pointer vectors are valid and mean a zero length vector.
-
-   You can reset the length of an allocated vector to zero via the
-   vec_reset_length(v) macro, or by setting the vector length field to
-   zero (e.g. _vec_len (v) = 0). Vec_reset_length(v) preferred: it
-   understands Null pointers.
-
-   Typically, the header is not present.  Headers allow for other
-   data structures to be built atop CLIB vectors.
-
-   Users may specify the alignment for data elements via the
-   vec_*_aligned macros.
-
-   Vectors elements can be any C type e.g. (int, double, struct bar).
-   This is also true for data types built atop vectors (e.g. heap,
-   pool, etc.).
-
-   Many macros have _a variants supporting alignment of vector data
-   and _h variants supporting non zero length vector headers.
-   The _ha variants support both.
-
-   Standard programming error: memorize a pointer to the ith element
-   of a vector then expand it. Vectors expand by 3/2, so such code
-   may appear to work for a period of time. Memorize vector indices
-   which are invariant.
- */
-
-/** \brief Low-level resize allocation function, usually not called directly
-
-    @param v pointer to a vector
-    @param length_increment length increment in elements
-    @param data_bytes requested size in bytes
-    @param header_bytes header size in bytes (may be zero)
-    @param data_align alignment (may be zero)
-    @return v_prime pointer to resized vector, may or may not equal v
-*/
-void *vec_resize_allocate_memory (void *v,
-				  word length_increment,
-				  uword data_bytes,
-				  uword header_bytes, uword data_align);
-
-/** \brief Low-level vector resize function, usually not called directly
-
-    @param v pointer to a vector
-    @param length_increment length increment in elements
-    @param data_bytes requested size in bytes
-    @param header_bytes header size in bytes (may be zero)
-    @param data_align alignment (may be zero)
-    @return v_prime pointer to resized vector, may or may not equal v
-*/
-
-always_inline void *
-_vec_resize (void *v,
-	     word length_increment,
-	     uword data_bytes, uword header_bytes, uword data_align)
-{
-  vec_header_t *vh = _vec_find (v);
-  uword new_data_bytes, aligned_header_bytes;
-
-  aligned_header_bytes = vec_header_bytes (header_bytes);
-
-  new_data_bytes = data_bytes + aligned_header_bytes;
-
-  if (PREDICT_TRUE (v != 0))
-    {
-      void *p = v - aligned_header_bytes;
-
-      /* Vector header must start heap object. */
-      ASSERT (clib_mem_is_heap_object (p));
-
-      /* Typically we'll not need to resize. */
-      if (new_data_bytes <= clib_mem_size (p))
-	{
-	  vh->len += length_increment;
-	  return v;
-	}
-    }
-
-  /* Slow path: call helper function. */
-  return vec_resize_allocate_memory (v, length_increment, data_bytes,
-				     header_bytes,
-				     clib_max (sizeof (vec_header_t),
-					       data_align));
-}
-
-/** \brief Predicate function, says whether the supplied vector is a clib heap
-    object (general version).
-
-    @param v pointer to a vector
-    @param header_bytes vector header size in bytes (may be zero)
-    @return 0 or 1
-*/
-uword clib_mem_is_vec_h (void *v, uword header_bytes);
-
-
-/** \brief Predicate function, says whether the supplied vector is a clib heap
-    object
-
-    @param v pointer to a vector
-    @return 0 or 1
-*/
-always_inline uword
-clib_mem_is_vec (void *v)
-{
-  return clib_mem_is_vec_h (v, 0);
-}
-
-/* Local variable naming macro (prevents collisions with other macro naming). */
-#define _v(var) _vec_##var
-
-/** \brief Resize a vector (general version).
-   Add N elements to end of given vector V, return pointer to start of vector.
-   Vector will have room for H header bytes and will have user's data aligned
-   at alignment A (rounded to next power of 2).
-
-    @param V pointer to a vector
-    @param N number of elements to add
-    @param H header size in bytes (may be zero)
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-
-#define vec_resize_ha(V,N,H,A)							\
-do {										\
-  word _v(n) = (N);								\
-  word _v(l) = vec_len (V);							\
-  V = _vec_resize ((V), _v(n), (_v(l) + _v(n)) * sizeof ((V)[0]), (H), (A));	\
-} while (0)
-
-/** \brief Resize a vector (no header, unspecified alignment)
-   Add N elements to end of given vector V, return pointer to start of vector.
-   Vector will have room for H header bytes and will have user's data aligned
-   at alignment A (rounded to next power of 2).
-
-    @param V pointer to a vector
-    @param N number of elements to add
-    @return V (value-result macro parameter)
-*/
-#define vec_resize(V,N)     vec_resize_ha(V,N,0,0)
-
-/** \brief Resize a vector (no header, alignment specified).
-   Add N elements to end of given vector V, return pointer to start of vector.
-   Vector will have room for H header bytes and will have user's data aligned
-   at alignment A (rounded to next power of 2).
-
-    @param V pointer to a vector
-    @param N number of elements to add
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-
-#define vec_resize_aligned(V,N,A) vec_resize_ha(V,N,0,A)
-
-/** \brief Allocate space for N more elements
-
-    @param V pointer to a vector
-    @param N number of elements to add
-    @param H header size in bytes (may be zero)
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-
-#define vec_alloc_ha(V,N,H,A)			\
-do {						\
-    uword _v(l) = vec_len (V);			\
-    vec_resize_ha (V, N, H, A);			\
-    _vec_len (V) = _v(l);			\
-} while (0)
-
-/** \brief Allocate space for N more elements
-    (no header, unspecified alignment)
-
-    @param V pointer to a vector
-    @param N number of elements to add
-    @return V (value-result macro parameter)
-*/
-#define vec_alloc(V,N) vec_alloc_ha(V,N,0,0)
-
-/** \brief Allocate space for N more elements (no header, given alignment)
-    @param V pointer to a vector
-    @param N number of elements to add
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-
-#define vec_alloc_aligned(V,N,A) vec_alloc_ha(V,N,0,A)
-
-/** \brief Create new vector of given type and length (general version).
-    @param T type of elements in new vector
-    @param N number of elements to add
-    @param H header size in bytes (may be zero)
-    @param A alignment (may be zero)
-    @return V new vector
-*/
-#define vec_new_ha(T,N,H,A)					\
-({								\
-  word _v(n) = (N);						\
-  _vec_resize ((T *) 0, _v(n), _v(n) * sizeof (T), (H), (A));	\
-})
-
-/** \brief Create new vector of given type and length
-    (unspecified alignment, no header).
-
-    @param T type of elements in new vector
-    @param N number of elements to add
-    @return V new vector
-*/
-#define vec_new(T,N)           vec_new_ha(T,N,0,0)
-/** \brief Create new vector of given type and length
-    (alignment specified, no header).
-
-    @param T type of elements in new vector
-    @param N number of elements to add
-    @param A alignment (may be zero)
-    @return V new vector
-*/
-#define vec_new_aligned(T,N,A) vec_new_ha(T,N,0,A)
-
-/** \brief Free vector's memory (general version)
-
-    @param V pointer to a vector
-    @param H size of header in bytes
-    @return V (value-result parameter, V=0)
-*/
-#define vec_free_h(V,H)				\
-do {						\
-  if (V)					\
-    {						\
-      clib_mem_free (vec_header ((V), (H)));	\
-      V = 0;					\
-    }						\
-} while (0)
-
-/** \brief Free vector's memory (no header).
-    @param V pointer to a vector
-    @return V (value-result parameter, V=0)
-*/
-#define vec_free(V) vec_free_h(V,0)
-
-/**\brief Free vector user header (syntactic sugar)
-   @param h vector header
-   @void
-*/
-#define vec_free_header(h) clib_mem_free (h)
-
-/** \brief Return copy of vector (general version).
-
-    @param V pointer to a vector
-    @param H size of header in bytes
-    @param A alignment (may be zero)
-
-    @return Vdup copy of vector
-*/
-
-#define vec_dup_ha(V,H,A)				\
-({							\
-  __typeof__ ((V)[0]) * _v(v) = 0;			\
-  uword _v(l) = vec_len (V);				\
-  if (_v(l) > 0)					\
-    {							\
-      vec_resize_ha (_v(v), _v(l), (H), (A));		\
-      clib_memcpy (_v(v), (V), _v(l) * sizeof ((V)[0]));\
-    }							\
-  _v(v);						\
-})
-
-/** \brief Return copy of vector (no header, no alignment)
-
-    @param V pointer to a vector
-    @return Vdup copy of vector
-*/
-#define vec_dup(V) vec_dup_ha(V,0,0)
-
-/** \brief Return copy of vector (no header, alignment specified).
-
-    @param V pointer to a vector
-    @param A alignment (may be zero)
-
-    @return Vdup copy of vector
-*/
-#define vec_dup_aligned(V,A) vec_dup_ha(V,0,A)
-
-/** \brief Copy a vector, memcpy wrapper. Assumes sizeof(SRC[0]) ==
-    sizeof(DST[0])
-
-    @param DST destination
-    @param SRC source
-*/
-#define vec_copy(DST,SRC) clib_memcpy (DST, SRC, vec_len (DST) * \
-				       sizeof ((DST)[0]))
-
-/** \brief Clone a vector. Make a new vector with the
-    same size as a given vector but possibly with a different type.
-
-    @param NEW_V pointer to new vector
-    @param OLD_V pointer to old vector
-*/
-#define vec_clone(NEW_V,OLD_V)							\
-do {										\
-  (NEW_V) = 0;									\
-  (NEW_V) = _vec_resize ((NEW_V), vec_len (OLD_V),				\
-			 vec_len (OLD_V) * sizeof ((NEW_V)[0]), (0), (0));	\
-} while (0)
-
-/** \brief Make sure vector is long enough for given index (general version).
-
-    @param V (possibly NULL) pointer to a vector.
-    @param I vector index which will be valid upon return
-    @param H header size in bytes (may be zero)
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-
-#define vec_validate_ha(V,I,H,A)					\
-do {									\
-  word _v(i) = (I);							\
-  word _v(l) = vec_len (V);						\
-  if (_v(i) >= _v(l))							\
-    {									\
-      vec_resize_ha ((V), 1 + (_v(i) - _v(l)), (H), (A));		\
-      /* Must zero new space since user may have previously		\
-	 used e.g. _vec_len (v) -= 10 */				\
-      memset ((V) + _v(l), 0, (1 + (_v(i) - _v(l))) * sizeof ((V)[0]));	\
-    }									\
-} while (0)
-
-/** \brief Make sure vector is long enough for given index
-    (no header, unspecified alignment)
-
-    @param V (possibly NULL) pointer to a vector.
-    @param I vector index which will be valid upon return
-    @return V (value-result macro parameter)
-*/
-#define vec_validate(V,I)           vec_validate_ha(V,I,0,0)
-
-/** \brief Make sure vector is long enough for given index
-    (no header, specified alignment)
-
-    @param V (possibly NULL) pointer to a vector.
-    @param I vector index which will be valid upon return
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-
-#define vec_validate_aligned(V,I,A) vec_validate_ha(V,I,0,A)
-
-/** \brief Make sure vector is long enough for given index
-    and initialize empty space (general version)
-
-    @param V (possibly NULL) pointer to a vector.
-    @param I vector index which will be valid upon return
-    @param INIT initial value (can be a complex expression!)
-    @param H header size in bytes (may be zero)
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-#define vec_validate_init_empty_ha(V,I,INIT,H,A)		\
-do {								\
-  word _v(i) = (I);						\
-  word _v(l) = vec_len (V);					\
-  if (_v(i) >= _v(l))						\
-    {								\
-      vec_resize_ha ((V), 1 + (_v(i) - _v(l)), (H), (A));	\
-      while (_v(l) <= _v(i))					\
-	{							\
-	  (V)[_v(l)] = (INIT);					\
-	  _v(l)++;						\
-	}							\
-    }								\
-} while (0)
-
-/** \brief Make sure vector is long enough for given index
-    and initialize empty space (no header, unspecified alignment)
-
-    @param V (possibly NULL) pointer to a vector.
-    @param I vector index which will be valid upon return
-    @param INIT initial value (can be a complex expression!)
-    @param H header size in bytes (may be zero)
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-
-#define vec_validate_init_empty(V,I,INIT) \
-  vec_validate_init_empty_ha(V,I,INIT,0,0)
-
-/** \brief Make sure vector is long enough for given index
-    and initialize empty space (no header, alignment alignment)
-
-    @param V (possibly NULL) pointer to a vector.
-    @param I vector index which will be valid upon return
-    @param INIT initial value (can be a complex expression!)
-    @param H header size in bytes (may be zero)
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-#define vec_validate_init_empty_aligned(V,I,A) \
-  vec_validate_init_empty_ha(V,I,INIT,0,A)
-
-/** \brief Add 1 element to end of vector (general version).
-
-    @param V pointer to a vector
-    @param E element to add
-    @param H header size in bytes (may be zero)
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-#define vec_add1_ha(V,E,H,A)						\
-do {									\
-  word _v(l) = vec_len (V);						\
-  V = _vec_resize ((V), 1, (_v(l) + 1) * sizeof ((V)[0]), (H), (A));	\
-  (V)[_v(l)] = (E);							\
-} while (0)
-
-/** \brief Add 1 element to end of vector (unspecified alignment).
-
-    @param V pointer to a vector
-    @param E element to add
-    @return V (value-result macro parameter)
-*/
-#define vec_add1(V,E)           vec_add1_ha(V,E,0,0)
-
-/** \brief Add 1 element to end of vector (alignment specified).
-
-    @param V pointer to a vector
-    @param E element to add
-    @param H header size in bytes (may be zero)
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-#define vec_add1_aligned(V,E,A) vec_add1_ha(V,E,0,A)
-
-/** \brief Add N elements to end of vector V,
-    return pointer to new elements in P. (general version)
-
-    @param V pointer to a vector
-    @param P pointer to new vector element(s)
-    @param N number of elements to add
-    @param H header size in bytes (may be zero)
-    @param A alignment (may be zero)
-    @return V and P (value-result macro parameters)
-*/
-#define vec_add2_ha(V,P,N,H,A)							\
-do {										\
-  word _v(n) = (N);								\
-  word _v(l) = vec_len (V);							\
-  V = _vec_resize ((V), _v(n), (_v(l) + _v(n)) * sizeof ((V)[0]), (H), (A));	\
-  P = (V) + _v(l);								\
-} while (0)
-
-/** \brief Add N elements to end of vector V,
-    return pointer to new elements in P. (no header, unspecified alignment)
-
-    @param V pointer to a vector
-    @param P pointer to new vector element(s)
-    @param N number of elements to add
-    @return V and P (value-result macro parameters)
-*/
-
-#define vec_add2(V,P,N)           vec_add2_ha(V,P,N,0,0)
-
-/** \brief Add N elements to end of vector V,
-    return pointer to new elements in P. (no header, alignment specified)
-
-    @param V pointer to a vector
-    @param P pointer to new vector element(s)
-    @param N number of elements to add
-    @param A alignment (may be zero)
-    @return V and P (value-result macro parameters)
-*/
-
-#define vec_add2_aligned(V,P,N,A) vec_add2_ha(V,P,N,0,A)
-
-/** \brief Add N elements to end of vector V (general version)
-
-    @param V pointer to a vector
-    @param E pointer to element(s) to add
-    @param N number of elements to add
-    @param H header size in bytes (may be zero)
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-#define vec_add_ha(V,E,N,H,A)							\
-do {										\
-  word _v(n) = (N);								\
-  word _v(l) = vec_len (V);							\
-  V = _vec_resize ((V), _v(n), (_v(l) + _v(n)) * sizeof ((V)[0]), (H), (A));	\
-  clib_memcpy ((V) + _v(l), (E), _v(n) * sizeof ((V)[0]));			\
-} while (0)
-
-/** \brief Add N elements to end of vector V (no header, unspecified alignment)
-
-    @param V pointer to a vector
-    @param E pointer to element(s) to add
-    @param N number of elements to add
-    @return V (value-result macro parameter)
-*/
-#define vec_add(V,E,N)           vec_add_ha(V,E,N,0,0)
-
-/** \brief Add N elements to end of vector V (no header, specified alignment)
-
-    @param V pointer to a vector
-    @param E pointer to element(s) to add
-    @param N number of elements to add
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-#define vec_add_aligned(V,E,N,A) vec_add_ha(V,E,N,0,A)
-
-/** \brief Returns last element of a vector and decrements its length
-
-    @param V pointer to a vector
-    @return E element removed from the end of the vector
-*/
-#define vec_pop(V)				\
-({						\
-  uword _v(l) = vec_len (V);			\
-  ASSERT (_v(l) > 0);				\
-  _v(l) -= 1;					\
-  _vec_len (V) = _v (l);			\
-  (V)[_v(l)];					\
-})
-
-/** \brief Set E to the last element of a vector, decrement vector length
-    @param V pointer to a vector
-    @param E pointer to the last vector element
-    @return E element removed from the end of the vector
-    (value-result macro parameter
-*/
-
-#define vec_pop2(V,E)				\
-({						\
-  uword _v(l) = vec_len (V);			\
-  if (_v(l) > 0) (E) = vec_pop (V);		\
-  _v(l) > 0;					\
-})
-
-/** \brief Insert N vector elements starting at element M,
-    initialize new elements (general version).
-
-    @param V (possibly NULL) pointer to a vector.
-    @param N number of elements to insert
-    @param M insertion point
-    @param INIT initial value (can be a complex expression!)
-    @param H header size in bytes (may be zero)
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-#define vec_insert_init_empty_ha(V,N,M,INIT,H,A)	\
-do {							\
-  word _v(l) = vec_len (V);				\
-  word _v(n) = (N);					\
-  word _v(m) = (M);					\
-  V = _vec_resize ((V),					\
-		   _v(n),				\
-		   (_v(l) + _v(n))*sizeof((V)[0]),	\
-		   (H), (A));				\
-  ASSERT (_v(m) <= _v(l));				\
-  memmove ((V) + _v(m) + _v(n),				\
-	   (V) + _v(m),					\
-	   (_v(l) - _v(m)) * sizeof ((V)[0]));		\
-  memset  ((V) + _v(m), INIT, _v(n) * sizeof ((V)[0]));	\
-} while (0)
-
-/** \brief Insert N vector elements starting at element M,
-    initialize new elements to zero (general version)
-
-    @param V (possibly NULL) pointer to a vector.
-    @param N number of elements to insert
-    @param M insertion point
-    @param H header size in bytes (may be zero)
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-#define vec_insert_ha(V,N,M,H,A)    vec_insert_init_empty_ha(V,N,M,0,H,A)
-
-/** \brief Insert N vector elements starting at element M,
-    initialize new elements to zero (no header, unspecified alignment)
-
-    @param V (possibly NULL) pointer to a vector.
-    @param N number of elements to insert
-    @param M insertion point
-    @return V (value-result macro parameter)
-*/
-#define vec_insert(V,N,M)           vec_insert_ha(V,N,M,0,0)
-
-/** \brief Insert N vector elements starting at element M,
-    initialize new elements to zero (no header, alignment specified)
-
-    @param V (possibly NULL) pointer to a vector.
-    @param N number of elements to insert
-    @param M insertion point
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-#define vec_insert_aligned(V,N,M,A) vec_insert_ha(V,N,M,0,A)
-
-/** \brief Insert N vector elements starting at element M,
-    initialize new elements (no header, unspecified alignment)
-
-    @param V (possibly NULL) pointer to a vector.
-    @param N number of elements to insert
-    @param M insertion point
-    @param INIT initial value (can be a complex expression!)
-    @return V (value-result macro parameter)
-*/
-
-#define vec_insert_init_empty(V,N,M,INIT) \
-  vec_insert_init_empty_ha(V,N,M,INIT,0,0)
-/* Resize vector by N elements starting from element M, initialize new elements to INIT (alignment specified, no header). */
-
-/** \brief Insert N vector elements starting at element M,
-    initialize new elements (no header, specified alignment)
-
-    @param V (possibly NULL) pointer to a vector.
-    @param N number of elements to insert
-    @param M insertion point
-    @param INIT initial value (can be a complex expression!)
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-#define vec_insert_init_empty_aligned(V,N,M,INIT,A) \
-  vec_insert_init_empty_ha(V,N,M,INIT,0,A)
-
-/** \brief Insert N vector elements starting at element M,
-    insert given elements (general version)
-
-    @param V (possibly NULL) pointer to a vector.
-    @param E element(s) to insert
-    @param N number of elements to insert
-    @param M insertion point
-    @param H header size in bytes (may be zero)
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-
-#define vec_insert_elts_ha(V,E,N,M,H,A)			\
-do {							\
-  word _v(l) = vec_len (V);				\
-  word _v(n) = (N);					\
-  word _v(m) = (M);					\
-  V = _vec_resize ((V),					\
-		   _v(n),				\
-		   (_v(l) + _v(n))*sizeof((V)[0]),	\
-		   (H), (A));				\
-  ASSERT (_v(m) <= _v(l));				\
-  memmove ((V) + _v(m) + _v(n),				\
-	   (V) + _v(m),					\
-	   (_v(l) - _v(m)) * sizeof ((V)[0]));		\
-  clib_memcpy ((V) + _v(m), (E),			\
-	       _v(n) * sizeof ((V)[0]));		\
-} while (0)
-
-/** \brief Insert N vector elements starting at element M,
-    insert given elements (no header, unspecified alignment)
-
-    @param V (possibly NULL) pointer to a vector.
-    @param E element(s) to insert
-    @param N number of elements to insert
-    @param M insertion point
-    @return V (value-result macro parameter)
-*/
-#define vec_insert_elts(V,E,N,M)           vec_insert_elts_ha(V,E,N,M,0,0)
-
-/** \brief Insert N vector elements starting at element M,
-    insert given elements (no header, specified alignment)
-
-    @param V (possibly NULL) pointer to a vector.
-    @param E element(s) to insert
-    @param N number of elements to insert
-    @param M insertion point
-    @param A alignment (may be zero)
-    @return V (value-result macro parameter)
-*/
-#define vec_insert_elts_aligned(V,E,N,M,A) vec_insert_elts_ha(V,E,N,M,0,A)
-
-/** \brief Delete N elements starting at element M
-
-    @param V pointer to a vector
-    @param N number of elements to delete
-    @param M first element to delete
-    @return V (value-result macro parameter)
-*/
-#define vec_delete(V,N,M)					\
-do {								\
-  word _v(l) = vec_len (V);					\
-  word _v(n) = (N);						\
-  word _v(m) = (M);						\
-  /* Copy over deleted elements. */				\
-  if (_v(l) - _v(n) - _v(m) > 0)				\
-    memmove ((V) + _v(m), (V) + _v(m) + _v(n),			\
-	     (_v(l) - _v(n) - _v(m)) * sizeof ((V)[0]));	\
-  /* Zero empty space at end (for future re-allocation). */	\
-  if (_v(n) > 0)						\
-    memset ((V) + _v(l) - _v(n), 0, _v(n) * sizeof ((V)[0]));	\
-  _vec_len (V) -= _v(n);					\
-} while (0)
-
-/** \brief Delete the element at index I
-
-    @param V pointer to a vector
-    @param I index to delete
-*/
-#define vec_del1(v,i)				\
-do {						\
-  uword _vec_del_l = _vec_len (v) - 1;		\
-  uword _vec_del_i = (i);			\
-  if (_vec_del_i < _vec_del_l)			\
-    (v)[_vec_del_i] = (v)[_vec_del_l];		\
-  _vec_len (v) = _vec_del_l;			\
-} while (0)
-
-/** \brief Append v2 after v1. Result in v1.
-    @param V1 target vector
-    @param V2 vector to append
-*/
-
-#define vec_append(v1,v2)						\
-do {									\
-  uword _v(l1) = vec_len (v1);						\
-  uword _v(l2) = vec_len (v2);						\
-									\
-  v1 = _vec_resize ((v1), _v(l2),					\
-		    (_v(l1) + _v(l2)) * sizeof ((v1)[0]), 0, 0);	\
-  clib_memcpy ((v1) + _v(l1), (v2), _v(l2) * sizeof ((v2)[0]));		\
-} while (0)
-
-/** \brief Append v2 after v1. Result in v1. Specified alignment.
-    @param V1 target vector
-    @param V2 vector to append
-    @param align required alignment
-*/
-
-#define vec_append_aligned(v1,v2,align)					\
-do {									\
-  uword _v(l1) = vec_len (v1);						\
-  uword _v(l2) = vec_len (v2);						\
-									\
-  v1 = _vec_resize ((v1), _v(l2),					\
-		    (_v(l1) + _v(l2)) * sizeof ((v1)[0]), 0, align);	\
-  clib_memcpy ((v1) + _v(l1), (v2), _v(l2) * sizeof ((v2)[0]));		\
-} while (0)
-
-/** \brief Prepend v2 before v1. Result in v1.
-    @param V1 target vector
-    @param V2 vector to prepend
-*/
-
-#define vec_prepend(v1,v2)                                              \
-do {                                                                    \
-  uword _v(l1) = vec_len (v1);                                          \
-  uword _v(l2) = vec_len (v2);                                          \
-                                                                        \
-  v1 = _vec_resize ((v1), _v(l2),                                       \
-		    (_v(l1) + _v(l2)) * sizeof ((v1)[0]), 0, 0);	\
-  memmove ((v1) + _v(l2), (v1), _v(l1) * sizeof ((v1)[0]));             \
-  clib_memcpy ((v1), (v2), _v(l2) * sizeof ((v2)[0]));                  \
-} while (0)
-
-/** \brief Prepend v2 before v1. Result in v1. Specified alignment
-    @param V1 target vector
-    @param V2 vector to prepend
-    @param align required alignment
-*/
-
-#define vec_prepend_aligned(v1,v2,align)                                \
-do {                                                                    \
-  uword _v(l1) = vec_len (v1);                                          \
-  uword _v(l2) = vec_len (v2);                                          \
-                                                                        \
-  v1 = _vec_resize ((v1), _v(l2),                                       \
-		    (_v(l1) + _v(l2)) * sizeof ((v1)[0]), 0, align);	\
-  memmove ((v1) + _v(l2), (v1), _v(l1) * sizeof ((v1)[0]));             \
-  clib_memcpy ((v1), (v2), _v(l2) * sizeof ((v2)[0]));                  \
-} while (0)
-
-
-/** \brief Zero all vector elements. Null-pointer tolerant.
-    @param var Vector to zero
-*/
-#define vec_zero(var)						\
-do {								\
-  if (var)							\
-    memset ((var), 0, vec_len (var) * sizeof ((var)[0]));	\
-} while (0)
-
-/** \brief Set all vector elements to given value. Null-pointer tolerant.
-    @param v vector to set
-    @param val value for each vector element
-*/
-#define vec_set(v,val)				\
-do {						\
-  word _v(i);					\
-  __typeof__ ((v)[0]) _val = (val);		\
-  for (_v(i) = 0; _v(i) < vec_len (v); _v(i)++)	\
-    (v)[_v(i)] = _val;				\
-} while (0)
-
-#ifdef CLIB_UNIX
-#include <stdlib.h>		/* for qsort */
-#endif
-
-/** \brief Compare two vectors, not NULL-pointer tolerant
-
-    @param v1 Pointer to a vector
-    @param v2 Pointer to a vector
-    @return 1 if equal, 0 if unequal
-*/
-#define vec_is_equal(v1,v2) \
-  (vec_len (v1) == vec_len (v2) && ! memcmp ((v1), (v2), vec_len (v1) * sizeof ((v1)[0])))
-
-/** \brief Compare two vectors (only applicable to vectors of signed numbers).
-   Used in qsort compare functions.
-
-    @param v1 Pointer to a vector
-    @param v2 Pointer to a vector
-    @return -1, 0, +1
-*/
-#define vec_cmp(v1,v2)					\
-({							\
-  word _v(i), _v(cmp), _v(l);				\
-  _v(l) = clib_min (vec_len (v1), vec_len (v2));	\
-  _v(cmp) = 0;						\
-  for (_v(i) = 0; _v(i) < _v(l); _v(i)++) {		\
-    _v(cmp) = (v1)[_v(i)] - (v2)[_v(i)];		\
-    if (_v(cmp))					\
-      break;						\
-  }							\
-  if (_v(cmp) == 0 && _v(l) > 0)			\
-    _v(cmp) = vec_len(v1) - vec_len(v2);		\
-  (_v(cmp) < 0 ? -1 : (_v(cmp) > 0 ? +1 : 0));		\
-})
-
-/** \brief Search a vector for the index of the entry that matches.
-
-    @param v1 Pointer to a vector
-    @param v2 Entry to match
-    @return index of match or ~0
-*/
-#define vec_search(v,E)					\
-({							\
-  word _v(i) = 0;					\
-  while (_v(i) < vec_len(v))				\
-  {							\
-    if (v[_v(i)] == E)				        \
-      break;						\
-    _v(i)++;						\
-  }							\
-  if (_v(i) == vec_len(v))				\
-    _v(i) = ~0;					        \
-  _v(i);						\
-})
-
-/** \brief Sort a vector using the supplied element comparison function
-
-    @param vec vector to sort
-    @param f comparison function
-*/
-#define vec_sort_with_function(vec,f)				\
-do {								\
-  qsort (vec, vec_len (vec), sizeof (vec[0]), (void *) (f));	\
-} while (0)
-
-/** \brief Make a vector containing a NULL terminated c-string.
-
-    @param V (possibly NULL) pointer to a vector.
-    @param S pointer to string buffer.
-    @param L string length (NOT including the terminating NULL; a la strlen())
-*/
-#define vec_validate_init_c_string(V, S, L)     \
-  do {                                          \
-    vec_reset_length (V);                       \
-    vec_validate ((V), (L));                    \
-    if ((S) && (L))                             \
-        clib_memcpy ((V), (S), (L));            \
-    (V)[(L)] = 0;                               \
-  } while (0)
-
-
-/** \brief Test whether a vector is a NULL terminated c-string.
-
-    @param V (possibly NULL) pointer to a vector.
-    @return BOOLEAN indicating if the vector c-string is null terminated.
-*/
-#define vec_c_string_is_terminated(V)                   \
-  (((V) != 0) && (vec_len (V) != 0) && ((V)[vec_len ((V)) - 1] == 0))
-
-/** \brief (If necessary) NULL terminate a vector containing a c-string.
-
-    @param V (possibly NULL) pointer to a vector.
-    @return V (value-result macro parameter)
-*/
-#define vec_terminate_c_string(V)               \
-  do {                                          \
-    u32 vl = vec_len ((V));                     \
-    if (!vec_c_string_is_terminated(V))         \
-      {                                         \
-        vec_validate ((V), vl);                 \
-        (V)[vl] = 0;                            \
-      }                                         \
-  } while (0)
-
-#endif /* included_vec_h */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vec_bootstrap.h b/vppinfra/vppinfra/vec_bootstrap.h
deleted file mode 100644
index 3b8c7707..00000000
--- a/vppinfra/vppinfra/vec_bootstrap.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_vec_bootstrap_h
-#define included_clib_vec_bootstrap_h
-
-/** \file
-    Vector bootsrap header file
-*/
-
-/* Bootstrap include so that #include <vppinfra/mem.h> can include e.g.
-   <vppinfra/mheap.h> which depends on <vppinfra/vec.h>. */
-
-/** \brief vector header structure
-
-   Bookeeping header preceding vector elements in memory.
-   User header information may preceed standard vec header.
-   If you change u32 len -> u64 len, single vectors can
-   exceed 2**32 elements. Clib heaps are vectors. */
-
-typedef struct
-{
-#if CLIB_VEC64 > 0
-  u64 len;
-#else
-  u32 len; /**< Number of elements in vector (NOT its allocated length). */
-#endif
-  u8 vector_data[0];  /**< Vector data . */
-} vec_header_t;
-
-/** \brief Find the vector header
-
-    Given the user's pointer to a vector, find the corresponding
-    vector header
-
-    @param v pointer to a vector
-    @return pointer to the vector's vector_header_t
-*/
-#define _vec_find(v)	((vec_header_t *) (v) - 1)
-
-#define _vec_round_size(s) \
-  (((s) + sizeof (uword) - 1) &~ (sizeof (uword) - 1))
-
-always_inline uword
-vec_header_bytes (uword header_bytes)
-{
-  return round_pow2 (header_bytes + sizeof (vec_header_t),
-		     sizeof (vec_header_t));
-}
-
-/** \brief Find a user vector header
-
-    Finds the user header of a vector with unspecified alignment given
-    the user pointer to the vector.
-*/
-
-always_inline void *
-vec_header (void *v, uword header_bytes)
-{
-  return v - vec_header_bytes (header_bytes);
-}
-
-/** \brief Find the end of user vector header
-
-    Finds the end of the user header of a vector with unspecified
-    alignment given the user pointer to the vector.
-*/
-
-always_inline void *
-vec_header_end (void *v, uword header_bytes)
-{
-  return v + vec_header_bytes (header_bytes);
-}
-
-always_inline uword
-vec_aligned_header_bytes (uword header_bytes, uword align)
-{
-  return round_pow2 (header_bytes + sizeof (vec_header_t), align);
-}
-
-always_inline void *
-vec_aligned_header (void *v, uword header_bytes, uword align)
-{
-  return v - vec_aligned_header_bytes (header_bytes, align);
-}
-
-always_inline void *
-vec_aligned_header_end (void *v, uword header_bytes, uword align)
-{
-  return v + vec_aligned_header_bytes (header_bytes, align);
-}
-
-
-/** \brief Number of elements in vector (lvalue-capable)
-
-   _vec_len (v) does not check for null, but can be used as a lvalue
-   (e.g. _vec_len (v) = 99).
-*/
-
-#define _vec_len(v)	(_vec_find(v)->len)
-
-/** \brief Number of elements in vector (rvalue-only, NULL tolerant)
-
-    vec_len (v) checks for NULL, but cannot be used as an lvalue.
-    If in doubt, use vec_len...
-*/
-
-#define vec_len(v)	((v) ? _vec_len(v) : 0)
-
-/** \brief Reset vector length to zero
-    NULL-pointer tolerant
-*/
-
-#define vec_reset_length(v) do { if (v) _vec_len (v) = 0; } while (0)
-
-/** \brief Number of data bytes in vector. */
-
-#define vec_bytes(v) (vec_len (v) * sizeof (v[0]))
-
-/** \brief Total number of bytes that can fit in vector with current allocation. */
-
-#define vec_capacity(v,b)							\
-({										\
-  void * _vec_capacity_v = (void *) (v);					\
-  uword _vec_capacity_b = (b);							\
-  _vec_capacity_b = sizeof (vec_header_t) + _vec_round_size (_vec_capacity_b);	\
-  _vec_capacity_v ? clib_mem_size (_vec_capacity_v - _vec_capacity_b) : 0;	\
-})
-
-/** \brief Total number of elements that can fit into vector. */
-#define vec_max_len(v) (vec_capacity(v,0) / sizeof (v[0]))
-
-/** \brief End (last data address) of vector. */
-#define vec_end(v)	((v) + vec_len (v))
-
-/** \brief True if given pointer is within given vector. */
-#define vec_is_member(v,e) ((e) >= (v) && (e) < vec_end (v))
-
-/** \brief Get vector value at index i checking that i is in bounds. */
-#define vec_elt_at_index(v,i)			\
-({						\
-  ASSERT ((i) < vec_len (v));			\
-  (v) + (i);					\
-})
-
-/** \brief Get vector value at index i */
-#define vec_elt(v,i) (vec_elt_at_index(v,i))[0]
-
-/** \brief Vector iterator */
-#define vec_foreach(var,vec) for (var = (vec); var < vec_end (vec); var++)
-
-/** \brief Vector iterator (reverse) */
-#define vec_foreach_backwards(var,vec) \
-for (var = vec_end (vec) - 1; var >= (vec); var--)
-
-/** \brief Iterate over vector indices. */
-#define vec_foreach_index(var,v) for ((var) = 0; (var) < vec_len (v); (var)++)
-
-#endif /* included_clib_vec_bootstrap_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vector.c b/vppinfra/vppinfra/vector.c
deleted file mode 100644
index 68b4fdc2..00000000
--- a/vppinfra/vppinfra/vector.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/types.h>
-
-#if defined (__SSE2__)
-u8 u32x4_compare_word_mask_table[256] = {
-  [0xf0] = (1 << 1),
-  [0x0f] = (1 << 0),
-  [0xff] = (1 << 0) | (1 << 1),
-};
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vector.h b/vppinfra/vppinfra/vector.h
deleted file mode 100644
index 491e7cfe..00000000
--- a/vppinfra/vppinfra/vector.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_vector_h
-#define included_clib_vector_h
-
-#include <vppinfra/clib.h>
-
-/* Vector types. */
-
-#if defined (__MMX__) || defined (__IWMMXT__) || defined (__aarch64__)
-#define CLIB_HAVE_VEC64
-#endif
-
-#if defined (__SSE2__) && __GNUC__ >= 4
-#define CLIB_HAVE_VEC128
-#endif
-
-#if defined (__ALTIVEC__)
-#define CLIB_HAVE_VEC128
-#endif
-
-/* 128 implies 64 */
-#ifdef CLIB_HAVE_VEC128
-#define CLIB_HAVE_VEC64
-#endif
-
-#define _vector_size(n) __attribute__ ((vector_size (n)))
-
-#if defined (__aarch64__) || defined (__arm__)
-typedef unsigned int u32x4 _vector_size (16);
-typedef u8 u8x16 _vector_size (16);
-typedef u16 u16x8 _vector_size (16);
-typedef u32 u32x4 _vector_size (16);
-typedef u64 u64x2 _vector_size (16);
-#endif
-
-#ifdef CLIB_HAVE_VEC64
-/* Signed 64 bit. */
-typedef char i8x8 _vector_size (8);
-typedef short i16x4 _vector_size (8);
-typedef int i32x2 _vector_size (8);
-
-/* Unsigned 64 bit. */
-typedef unsigned char u8x8 _vector_size (8);
-typedef unsigned short u16x4 _vector_size (8);
-typedef unsigned int u32x2 _vector_size (8);
-
-/* Floating point 64 bit. */
-typedef float f32x2 _vector_size (8);
-#endif /* CLIB_HAVE_VEC64 */
-
-#ifdef CLIB_HAVE_VEC128
-/* Signed 128 bit. */
-typedef i8 i8x16 _vector_size (16);
-typedef i16 i16x8 _vector_size (16);
-typedef i32 i32x4 _vector_size (16);
-typedef long long i64x2 _vector_size (16);
-
-/* Unsigned 128 bit. */
-typedef u8 u8x16 _vector_size (16);
-typedef u16 u16x8 _vector_size (16);
-typedef u32 u32x4 _vector_size (16);
-typedef u64 u64x2 _vector_size (16);
-
-typedef f32 f32x4 _vector_size (16);
-typedef f64 f64x2 _vector_size (16);
-
-/* Signed 256 bit. */
-typedef i8 i8x32 _vector_size (32);
-typedef i16 i16x16 _vector_size (32);
-typedef i32 i32x8 _vector_size (32);
-typedef long long i64x4 _vector_size (32);
-
-/* Unsigned 256 bit. */
-typedef u8 u8x32 _vector_size (32);
-typedef u16 u16x16 _vector_size (32);
-typedef u32 u32x8 _vector_size (32);
-typedef u64 u64x4 _vector_size (32);
-
-typedef f32 f32x8 _vector_size (32);
-typedef f64 f64x4 _vector_size (32);
-#endif /* CLIB_HAVE_VEC128 */
-
-/* Vector word sized types. */
-#ifndef CLIB_VECTOR_WORD_BITS
-#ifdef CLIB_HAVE_VEC128
-#define CLIB_VECTOR_WORD_BITS 128
-#else
-#define CLIB_VECTOR_WORD_BITS 64
-#endif
-#endif /* CLIB_VECTOR_WORD_BITS */
-
-/* Vector word sized types. */
-#if CLIB_VECTOR_WORD_BITS == 128
-typedef i8 i8x _vector_size (16);
-typedef i16 i16x _vector_size (16);
-typedef i32 i32x _vector_size (16);
-typedef i64 i64x _vector_size (16);
-typedef u8 u8x _vector_size (16);
-typedef u16 u16x _vector_size (16);
-typedef u32 u32x _vector_size (16);
-typedef u64 u64x _vector_size (16);
-#endif
-#if CLIB_VECTOR_WORD_BITS == 64
-typedef i8 i8x _vector_size (8);
-typedef i16 i16x _vector_size (8);
-typedef i32 i32x _vector_size (8);
-typedef i64 i64x _vector_size (8);
-typedef u8 u8x _vector_size (8);
-typedef u16 u16x _vector_size (8);
-typedef u32 u32x _vector_size (8);
-typedef u64 u64x _vector_size (8);
-#endif
-
-#undef _vector_size
-
-#define VECTOR_WORD_TYPE(t) t##x
-#define VECTOR_WORD_TYPE_LEN(t) (sizeof (VECTOR_WORD_TYPE(t)) / sizeof (t))
-
-/* Union types. */
-#if (defined(CLIB_HAVE_VEC128) || defined(CLIB_HAVE_VEC64))
-
-#define _(t)					\
-  typedef union {				\
-    t##x as_##t##x;				\
-    t as_##t[VECTOR_WORD_TYPE_LEN (t)];	\
-  } t##x##_union_t;
-
-_(u8);
-_(u16);
-_(u32);
-_(u64);
-_(i8);
-_(i16);
-_(i32);
-_(i64);
-
-#undef _
-
-#endif
-
-#ifdef CLIB_HAVE_VEC64
-
-#define _(t,n)					\
-  typedef union {				\
-    t##x##n as_##t##x##n;			\
-    t as_##t[n];				\
-  } t##x##n##_union_t;				\
-
-_(u8, 8);
-_(u16, 4);
-_(u32, 2);
-_(i8, 8);
-_(i16, 4);
-_(i32, 2);
-
-#undef _
-
-#endif
-
-#ifdef CLIB_HAVE_VEC128
-
-#define _(t,n)					\
-  typedef union {				\
-    t##x##n as_##t##x##n;			\
-    t as_##t[n];				\
-  } t##x##n##_union_t;				\
-
-_(u8, 16);
-_(u16, 8);
-_(u32, 4);
-_(u64, 2);
-_(i8, 16);
-_(i16, 8);
-_(i32, 4);
-_(i64, 2);
-_(f32, 4);
-_(f64, 2);
-
-#undef _
-
-#endif
-
-/* When we don't have vector types, still define e.g. u32x4_union_t but as an array. */
-#if !defined(CLIB_HAVE_VEC128) && !defined(CLIB_HAVE_VEC64)
-
-#define _(t,n)					\
-  typedef union {				\
-    t as_##t[n];				\
-  } t##x##n##_union_t;				\
-
-_(u8, 16);
-_(u16, 8);
-_(u32, 4);
-_(u64, 2);
-_(i8, 16);
-_(i16, 8);
-_(i32, 4);
-_(i64, 2);
-
-#undef _
-
-#endif
-
-#if defined (__SSE2__) && __GNUC__ >= 4
-#include <vppinfra/vector_sse2.h>
-#endif
-
-#if defined (__ALTIVEC__)
-#include <vppinfra/vector_altivec.h>
-#endif
-
-#if defined (__IWMMXT__)
-#include <vppinfra/vector_iwmmxt.h>
-#endif
-
-#if defined (__aarch64__)
-#include <vppinfra/vector_neon.h>
-#endif
-
-#if (defined(CLIB_HAVE_VEC128) || defined(CLIB_HAVE_VEC64))
-#include <vppinfra/vector_funcs.h>
-#endif
-
-#endif /* included_clib_vector_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vector_altivec.h b/vppinfra/vppinfra/vector_altivec.h
deleted file mode 100644
index 0e9de820..00000000
--- a/vppinfra/vppinfra/vector_altivec.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2009 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_vector_altivec_h
-#define included_vector_altivec_h
-
-/* Splats. */
-#define _(t,n,ti,fi,tr,fr)						\
-  always_inline t##x##n t##x##n##_splat (t v)				\
-  { return (t##x##n) __builtin_altivec_##fi ((ti) v); }			\
-									\
-  always_inline t##x##n t##x##n##_splat_word (t##x##n x, int word_index) \
-  { return (t##x##n) __builtin_altivec_##fr ((tr) x, word_index); }
-
-#define u16x8_splat(i) ((u16x8) __builtin_altivec_vspltish (i))
-#define i16x8_splat(i) ((i16x8) __builtin_altivec_vspltish (i))
-#define u32x4_splat(i) ((u32x4) __builtin_altivec_vspltisw (i))
-#define i32x4_splat(i) ((i32x4) __builtin_altivec_vspltisw (i))
-
-#define u16x8_splat_word(x,i) ((u16x8) __builtin_altivec_vsplth ((i16x8) (x), (i)))
-#define i16x8_splat_word(x,i) ((i16x8) __builtin_altivec_vsplth ((i16x8) (x), (i)))
-#define u32x4_splat_word(x,i) ((u32x4) __builtin_altivec_vspltw ((i32x4) (x), (i)))
-#define i32x4_splat_word(x,i) ((i32x4) __builtin_altivec_vspltw ((i32x4) (x), (i)))
-
-#undef _
-
-/* 128 bit shifts. */
-#define _(t,ti,lr,f)						\
-  always_inline t t##_##lr (t x, t y)				\
-  { return (t) __builtin_altivec_##f ((ti) x, (ti) y); }	\
-								\
-  always_inline t t##_i##lr (t x, int i)			\
-  {								\
-    t j = {i,i,i,i}; \
-    return t##_##lr (x, j);					\
-  }
-
-_(u16x8, i16x8, shift_left, vslh);
-_(u32x4, i32x4, shift_left, vslw);
-_(u16x8, i16x8, shift_right, vsrh);
-_(u32x4, i32x4, shift_right, vsrw);
-_(i16x8, i16x8, shift_right, vsrah);
-_(i32x4, i32x4, shift_right, vsraw);
-_(u16x8, i16x8, rotate_left, vrlh);
-_(i16x8, i16x8, rotate_left, vrlh);
-_(u32x4, i32x4, rotate_left, vrlw);
-_(i32x4, i32x4, rotate_left, vrlw);
-
-#undef _
-
-#define _(t,it,lr,f)						\
-  always_inline t t##_word_shift_##lr (t x, int n_words)	\
-  {								\
-    i32x4 n_bits = {0,0,0,n_words * BITS (it)};			\
-    return (t) __builtin_altivec_##f ((i32x4) x, n_bits);	\
-  }
-
-_(u32x4, u32, left, vslo)
-_(i32x4, i32, left, vslo)
-_(u32x4, u32, right, vsro)
-_(i32x4, i32, right, vsro)
-_(u16x8, u16, left, vslo)
-_(i16x8, i16, left, vslo)
-_(u16x8, u16, right, vsro) _(i16x8, i16, right, vsro)
-#undef _
-     always_inline
-       u32
-     u32x4_get0 (u32x4 x)
-{
-  u32x4_union_t y;
-  y.as_u32x4 = x;
-  return y.as_u32[3];
-}
-
-/* Interleave. */
-#define _(t,it,lh,f)						\
-  always_inline t t##_interleave_##lh (t x, t y)		\
-  { return (t) __builtin_altivec_##f ((it) x, (it) y); }
-
-_(u32x4, i32x4, lo, vmrglw)
-_(i32x4, i32x4, lo, vmrglw)
-_(u16x8, i16x8, lo, vmrglh)
-_(i16x8, i16x8, lo, vmrglh)
-_(u32x4, i32x4, hi, vmrghw)
-_(i32x4, i32x4, hi, vmrghw)
-_(u16x8, i16x8, hi, vmrghh) _(i16x8, i16x8, hi, vmrghh)
-#undef _
-/* Unaligned loads/stores. */
-#ifndef __cplusplus
-#define _(t)						\
-  always_inline void t##_store_unaligned (t x, t * a)	\
-  { clib_mem_unaligned (a, t) = x; }			\
-  always_inline t t##_load_unaligned (t * a)		\
-  { return clib_mem_unaligned (a, t); }
-  _(u8x16) _(u16x8) _(u32x4) _(u64x2) _(i8x16) _(i16x8) _(i32x4) _(i64x2)
-#undef _
-#endif
-#define _signed_binop(n,m,f,g)						\
-  /* Unsigned */							\
-  always_inline u##n##x##m						\
-  u##n##x##m##_##f (u##n##x##m x, u##n##x##m y)				\
-  { return (u##n##x##m) __builtin_altivec_##g ((i##n##x##m) x, (i##n##x##m) y); } \
-									\
-  /* Signed */								\
-  always_inline i##n##x##m						\
-  i##n##x##m##_##f (i##n##x##m x, i##n##x##m y)				\
-  { return (i##n##x##m) __builtin_altivec_##g ((i##n##x##m) x, (i##n##x##m) y); }
-/* Compare operations. */
-  _signed_binop (16, 8, is_equal, vcmpequh)
-_signed_binop (32, 4, is_equal, vcmpequw)
-#undef _signed_binop
-     always_inline u16x8 u16x8_is_zero (u16x8 x)
-{
-  u16x8 zero = { 0 };
-  return u16x8_is_equal (x, zero);
-}
-
-always_inline u32x4
-u32x4_is_zero (u32x4 x)
-{
-  u32x4 zero = { 0 };
-  return u32x4_is_equal (x, zero);
-}
-
-always_inline u32
-u32x4_zero_byte_mask (u32x4 x)
-{
-  u32x4 cmp = u32x4_is_zero (x);
-  u32x4 tmp = { 0x000f, 0x00f0, 0x0f00, 0xf000, };
-  cmp &= tmp;
-  cmp |= u32x4_word_shift_right (cmp, 2);
-  cmp |= u32x4_word_shift_right (cmp, 1);
-  return u32x4_get0 (cmp);
-}
-
-#endif /* included_vector_altivec_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vector_funcs.h b/vppinfra/vppinfra/vector_funcs.h
deleted file mode 100644
index db09de0f..00000000
--- a/vppinfra/vppinfra/vector_funcs.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2008 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_vector_funcs_h
-#define included_vector_funcs_h
-
-#include <vppinfra/byte_order.h>
-
-/* Addition/subtraction. */
-#if CLIB_VECTOR_WORD_BITS == 128
-#define u8x_add u8x16_add
-#define u16x_add u16x8_add
-#define u32x_add u32x4_add
-#define u64x_add u64x2_add
-#define i8x_add i8x16_add
-#define i16x_add i16x8_add
-#define i32x_add i32x4_add
-#define i64x_add i64x2_add
-#define u8x_sub u8x16_sub
-#define u16x_sub u16x8_sub
-#define u32x_sub u32x4_sub
-#define u64x_sub u64x2_sub
-#define i8x_sub i8x16_sub
-#define i16x_sub i16x8_sub
-#define i32x_sub i32x4_sub
-#define i64x_sub i64x2_sub
-#endif
-
-#if CLIB_VECTOR_WORD_BITS == 64
-#define u8x_add u8x8_add
-#define u16x_add u16x4_add
-#define u32x_add u32x2_add
-#define i8x_add i8x8_add
-#define i16x_add i16x4_add
-#define i32x_add i32x2_add
-#define u8x_sub u8x8_sub
-#define u16x_sub u16x4_sub
-#define u32x_sub u32x2_sub
-#define i8x_sub i8x8_sub
-#define i16x_sub i16x4_sub
-#define i32x_sub i32x2_sub
-#endif
-
-/* Saturating addition/subtraction. */
-#if CLIB_VECTOR_WORD_BITS == 128
-#define u8x_add_saturate u8x16_add_saturate
-#define u16x_add_saturate u16x8_add_saturate
-#define i8x_add_saturate i8x16_add_saturate
-#define i16x_add_saturate i16x8_add_saturate
-#define u8x_sub_saturate u8x16_sub_saturate
-#define u16x_sub_saturate u16x8_sub_saturate
-#define i8x_sub_saturate i8x16_sub_saturate
-#define i16x_sub_saturate i16x8_sub_saturate
-#endif
-
-#if CLIB_VECTOR_WORD_BITS == 64
-#define u8x_add_saturate u8x8_add_saturate
-#define u16x_add_saturate u16x4_add_saturate
-#define i8x_add_saturate i8x8_add_saturate
-#define i16x_add_saturate i16x4_add_saturate
-#define u8x_sub_saturate u8x8_sub_saturate
-#define u16x_sub_saturate u16x4_sub_saturate
-#define i8x_sub_saturate i8x8_sub_saturate
-#define i16x_sub_saturate i16x4_sub_saturate
-#endif
-
-#define _vector_interleave(a,b,t)		\
-do {						\
-  t _tmp_lo = t##_interleave_lo (a, b);		\
-  t _tmp_hi = t##_interleave_hi (a, b);		\
-  if (CLIB_ARCH_IS_LITTLE_ENDIAN)		\
-    (a) = _tmp_lo, (b) = _tmp_hi;		\
-  else						\
-    (a) = _tmp_hi, (b) = _tmp_lo;		\
-} while (0)
-
-/* 128 bit interleaves. */
-#define u8x16_interleave(a,b) _vector_interleave(a,b,u8x16)
-#define i8x16_interleave(a,b) _vector_interleave(a,b,i8x16)
-#define u16x8_interleave(a,b) _vector_interleave(a,b,u16x8)
-#define i16x8_interleave(a,b) _vector_interleave(a,b,i16x8)
-#define u32x4_interleave(a,b) _vector_interleave(a,b,u32x4)
-#define i32x4_interleave(a,b) _vector_interleave(a,b,i32x4)
-#define u64x2_interleave(a,b) _vector_interleave(a,b,u64x2)
-#define i64x2_interleave(a,b) _vector_interleave(a,b,i64x2)
-
-/* 64 bit interleaves. */
-#define u8x8_interleave(a,b) _vector_interleave(a,b,u8x8)
-#define i8x8_interleave(a,b) _vector_interleave(a,b,i8x8)
-#define u16x4_interleave(a,b) _vector_interleave(a,b,u16x4)
-#define i16x4_interleave(a,b) _vector_interleave(a,b,i16x4)
-#define u32x2_interleave(a,b) _vector_interleave(a,b,u32x2)
-#define i32x2_interleave(a,b) _vector_interleave(a,b,i32x2)
-
-/* Word sized interleaves. */
-#if CLIB_VECTOR_WORD_BITS == 128
-#define u8x_interleave u8x16_interleave
-#define u16x_interleave u16x8_interleave
-#define u32x_interleave u32x4_interleave
-#define u64x_interleave u64x2_interleave
-#endif
-
-#if CLIB_VECTOR_WORD_BITS == 64
-#define u8x_interleave u8x8_interleave
-#define u16x_interleave u16x4_interleave
-#define u32x_interleave u32x2_interleave
-#define u64x_interleave(a,b)	/* do nothing */
-#endif
-
-/* Vector word sized shifts. */
-#if CLIB_VECTOR_WORD_BITS == 128
-#define u8x_shift_left u8x16_shift_left
-#define i8x_shift_left i8x16_shift_left
-#define u16x_shift_left u16x8_shift_left
-#define i16x_shift_left i16x8_shift_left
-#define u32x_shift_left u32x4_shift_left
-#define i32x_shift_left i32x4_shift_left
-#define u64x_shift_left u64x2_shift_left
-#define i64x_shift_left i64x2_shift_left
-#define u8x_shift_right u8x16_shift_right
-#define i8x_shift_right i8x16_shift_right
-#define u16x_shift_right u16x8_shift_right
-#define i16x_shift_right i16x8_shift_right
-#define u32x_shift_right u32x4_shift_right
-#define i32x_shift_right i32x4_shift_right
-#define u64x_shift_right u64x2_shift_right
-#define i64x_shift_right i64x2_shift_right
-#define u8x_rotate_left u8x16_rotate_left
-#define i8x_rotate_left i8x16_rotate_left
-#define u16x_rotate_left u16x8_rotate_left
-#define i16x_rotate_left i16x8_rotate_left
-#define u32x_rotate_left u32x4_rotate_left
-#define i32x_rotate_left i32x4_rotate_left
-#define u64x_rotate_left u64x2_rotate_left
-#define i64x_rotate_left i64x2_rotate_left
-#define u8x_rotate_right u8x16_rotate_right
-#define i8x_rotate_right i8x16_rotate_right
-#define u16x_rotate_right u16x8_rotate_right
-#define i16x_rotate_right i16x8_rotate_right
-#define u32x_rotate_right u32x4_rotate_right
-#define i32x_rotate_right i32x4_rotate_right
-#define u64x_rotate_right u64x2_rotate_right
-#define i64x_rotate_right i64x2_rotate_right
-#define u8x_ishift_left u8x16_ishift_left
-#define i8x_ishift_left i8x16_ishift_left
-#define u16x_ishift_left u16x8_ishift_left
-#define i16x_ishift_left i16x8_ishift_left
-#define u32x_ishift_left u32x4_ishift_left
-#define i32x_ishift_left i32x4_ishift_left
-#define u64x_ishift_left u64x2_ishift_left
-#define i64x_ishift_left i64x2_ishift_left
-#define u8x_ishift_right u8x16_ishift_right
-#define i8x_ishift_right i8x16_ishift_right
-#define u16x_ishift_right u16x8_ishift_right
-#define i16x_ishift_right i16x8_ishift_right
-#define u32x_ishift_right u32x4_ishift_right
-#define i32x_ishift_right i32x4_ishift_right
-#define u64x_ishift_right u64x2_ishift_right
-#define i64x_ishift_right i64x2_ishift_right
-#define u8x_irotate_left u8x16_irotate_left
-#define i8x_irotate_left i8x16_irotate_left
-#define u16x_irotate_left u16x8_irotate_left
-#define i16x_irotate_left i16x8_irotate_left
-#define u32x_irotate_left u32x4_irotate_left
-#define i32x_irotate_left i32x4_irotate_left
-#define u64x_irotate_left u64x2_irotate_left
-#define i64x_irotate_left i64x2_irotate_left
-#define u8x_irotate_right u8x16_irotate_right
-#define i8x_irotate_right i8x16_irotate_right
-#define u16x_irotate_right u16x8_irotate_right
-#define i16x_irotate_right i16x8_irotate_right
-#define u32x_irotate_right u32x4_irotate_right
-#define i32x_irotate_right i32x4_irotate_right
-#define u64x_irotate_right u64x2_irotate_right
-#define i64x_irotate_right i64x2_irotate_right
-#endif
-
-#if CLIB_VECTOR_WORD_BITS == 64
-#define u8x_shift_left u8x8_shift_left
-#define i8x_shift_left i8x8_shift_left
-#define u16x_shift_left u16x4_shift_left
-#define i16x_shift_left i16x4_shift_left
-#define u32x_shift_left u32x2_shift_left
-#define i32x_shift_left i32x2_shift_left
-#define u8x_shift_right u8x8_shift_right
-#define i8x_shift_right i8x8_shift_right
-#define u16x_shift_right u16x4_shift_right
-#define i16x_shift_right i16x4_shift_right
-#define u32x_shift_right u32x2_shift_right
-#define i32x_shift_right i32x2_shift_right
-#define u8x_rotate_left u8x8_rotate_left
-#define i8x_rotate_left i8x8_rotate_left
-#define u16x_rotate_left u16x4_rotate_left
-#define i16x_rotate_left i16x4_rotate_left
-#define u32x_rotate_left u32x2_rotate_left
-#define i32x_rotate_left i32x2_rotate_left
-#define u8x_rotate_right u8x8_rotate_right
-#define i8x_rotate_right i8x8_rotate_right
-#define u16x_rotate_right u16x4_rotate_right
-#define i16x_rotate_right i16x4_rotate_right
-#define u32x_rotate_right u32x2_rotate_right
-#define i32x_rotate_right i32x2_rotate_right
-#define u8x_ishift_left u8x8_ishift_left
-#define i8x_ishift_left i8x8_ishift_left
-#define u16x_ishift_left u16x4_ishift_left
-#define i16x_ishift_left i16x4_ishift_left
-#define u32x_ishift_left u32x2_ishift_left
-#define i32x_ishift_left i32x2_ishift_left
-#define u8x_ishift_right u8x8_ishift_right
-#define i8x_ishift_right i8x8_ishift_right
-#define u16x_ishift_right u16x4_ishift_right
-#define i16x_ishift_right i16x4_ishift_right
-#define u32x_ishift_right u32x2_ishift_right
-#define i32x_ishift_right i32x2_ishift_right
-#define u8x_irotate_left u8x8_irotate_left
-#define i8x_irotate_left i8x8_irotate_left
-#define u16x_irotate_left u16x4_irotate_left
-#define i16x_irotate_left i16x4_irotate_left
-#define u32x_irotate_left u32x2_irotate_left
-#define i32x_irotate_left i32x2_irotate_left
-#define u8x_irotate_right u8x8_irotate_right
-#define i8x_irotate_right i8x8_irotate_right
-#define u16x_irotate_right u16x4_irotate_right
-#define i16x_irotate_right i16x4_irotate_right
-#define u32x_irotate_right u32x2_irotate_right
-#define i32x_irotate_right i32x2_irotate_right
-#endif
-
-#if CLIB_VECTOR_WORD_BITS == 128
-#define u8x_splat u8x16_splat
-#define i8x_splat i8x16_splat
-#define u16x_splat u16x8_splat
-#define i16x_splat i16x8_splat
-#define u32x_splat u32x4_splat
-#define i32x_splat i32x4_splat
-#define u64x_splat u64x2_splat
-#define i64x_splat i64x2_splat
-#endif
-
-#if CLIB_VECTOR_WORD_BITS == 64
-#define u8x_splat u8x8_splat
-#define i8x_splat i8x8_splat
-#define u16x_splat u16x4_splat
-#define i16x_splat i16x4_splat
-#define u32x_splat u32x2_splat
-#define i32x_splat i32x2_splat
-#endif
-
-#define u32x4_transpose_step(x,y)		\
-do {						\
-  u32x4 _x = (x);				\
-  u32x4 _y = (y);				\
-  (x) = u32x4_interleave_lo (_x, _y);		\
-  (y) = u32x4_interleave_hi (_x, _y);		\
-} while (0)
-
-/* 4x4 transpose: x_ij -> x_ji */
-#define u32x4_transpose(x0,x1,x2,x3)		\
-do {						\
-  u32x4 _x0 = (u32x4) (x0);			\
-  u32x4 _x1 = (u32x4) (x1);			\
-  u32x4 _x2 = (u32x4) (x2);			\
-  u32x4 _x3 = (u32x4) (x3);			\
-  u32x4_transpose_step (_x0, _x2);		\
-  u32x4_transpose_step (_x1, _x3);		\
-  u32x4_transpose_step (_x0, _x1);		\
-  u32x4_transpose_step (_x2, _x3);		\
-  (x0) = (u32x4) _x0;				\
-  (x1) = (u32x4) _x1;				\
-  (x2) = (u32x4) _x2;				\
-  (x3) = (u32x4) _x3;				\
-} while (0)
-
-#define i32x4_transpose(x0,x1,x2,x3)		\
-do {						\
-  u32x4 _x0 = (u32x4) (x0);			\
-  u32x4 _x1 = (u32x4) (x1);			\
-  u32x4 _x2 = (u32x4) (x2);			\
-  u32x4 _x3 = (u32x4) (x3);			\
-  u32x4_transpose_step (_x0, _x2);		\
-  u32x4_transpose_step (_x1, _x3);		\
-  u32x4_transpose_step (_x0, _x1);		\
-  u32x4_transpose_step (_x2, _x3);		\
-  (x0) = (i32x4) _x0;				\
-  (x1) = (i32x4) _x1;				\
-  (x2) = (i32x4) _x2;				\
-  (x3) = (i32x4) _x3;				\
-} while (0)
-
-#undef _
-
-#endif /* included_vector_funcs_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vector_iwmmxt.h b/vppinfra/vppinfra/vector_iwmmxt.h
deleted file mode 100644
index 8e662045..00000000
--- a/vppinfra/vppinfra/vector_iwmmxt.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2008 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_vector_iwmmxt_h
-#define included_vector_iwmmxt_h
-
-#include <vppinfra/error.h>	/* for ASSERT */
-
-/* 64 bit interleaves. */
-always_inline u8x8
-u8x8_interleave_hi (u8x8 a, u8x8 b)
-{
-  return __builtin_arm_wunpckihb (a, b);
-}
-
-always_inline u8x8
-u8x8_interleave_lo (u8x8 a, u8x8 b)
-{
-  return __builtin_arm_wunpckilb (a, b);
-}
-
-always_inline u16x4
-u16x4_interleave_hi (u16x4 a, u16x4 b)
-{
-  return __builtin_arm_wunpckihh (a, b);
-}
-
-always_inline u16x4
-u16x4_interleave_lo (u16x4 a, u16x4 b)
-{
-  return __builtin_arm_wunpckilh (a, b);
-}
-
-always_inline u32x2
-u32x2_interleave_hi (u32x2 a, u32x2 b)
-{
-  return __builtin_arm_wunpckihw (a, b);
-}
-
-always_inline u32x2
-u32x2_interleave_lo (u32x2 a, u32x2 b)
-{
-  return __builtin_arm_wunpckilw (a, b);
-}
-
-always_inline u32x2
-u32x2_splat (u32 a)
-{
-  u32x2 x = { a };
-  x = u32x2_interleave_lo (x, x);
-  return x;
-}
-
-always_inline u16x4
-u16x4_splat (u16 a)
-{
-  u32 t = (u32) a | ((u32) a << 16);
-  return u32x2_splat (t);
-}
-
-always_inline u8x8
-u8x8_splat (u8 a)
-{
-  u32 t = (u32) a | ((u32) a << 8);
-  t |= t << 16;
-  return u32x2_splat (t);
-}
-
-#define i32x2_splat u32x2_splat
-#define i16x4_splat u16x4_splat
-#define i8x8_splat u8x8_splat
-
-/* 64 bit shifts. */
-
-/* As of July 2008 the __builtin_arm shifts cause gcc-4.3.1 to crash
-   so we use asm versions. */
-#define _(t,u,lr,f)				\
-  always_inline t				\
-  t##_##lr (t x, int i)				\
-  {						\
-    i16x4 y;					\
-    asm (#f " %[y], %[x], %[shift]"		\
-	 : [y] "=y" (y)				\
-	 : [x] "y" (x), [shift] "i" (i * u));	\
-    return y;					\
-  }
-
-_(u16x4, 1, shift_left, wsllhi)
-_(u32x2, 1, shift_left, wsllwi)
-_(u16x4, 1, shift_right, wsrlhi)
-_(u32x2, 1, shift_right, wsrlwi)
-_(i16x4, 1, shift_left, wsllhi)
-_(i32x2, 1, shift_left, wsllwi)
-_(i16x4, 1, shift_right, wsrahi) _(i32x2, 1, shift_right, wsrawi)
-/* Word shifts. */
-  _(u8x8, 8, word_shift_left, wslldi)
-_(u16x4, 16, word_shift_left, wslldi)
-_(u32x2, 32, word_shift_left, wslldi)
-_(u8x8, 8, word_shift_right, wsrldi)
-_(u16x4, 16, word_shift_right, wsrldi)
-_(u32x2, 32, word_shift_right, wsrldi)
-_(i8x8, 8, word_shift_left, wslldi)
-_(i16x4, 16, word_shift_left, wslldi)
-_(i32x2, 32, word_shift_left, wslldi)
-_(i8x8, 8, word_shift_right, wsrldi)
-_(i16x4, 16, word_shift_right, wsrldi) _(i32x2, 32, word_shift_right, wsrldi)
-#undef _
-#endif /* included_vector_iwmmxt_h */
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vector_neon.h b/vppinfra/vppinfra/vector_neon.h
deleted file mode 100644
index cea52759..00000000
--- a/vppinfra/vppinfra/vector_neon.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_vector_neon_h
-#define included_vector_neon_h
-#include <arm_neon.h>
-
-/* Splats. */
-
-#define u8x16_splat(i) vdupq_n_u8(i)
-#define u16x8_splat(i) vdupq_n_u16(i)
-#define i16x8_splat(i) vdupq_n_s16(i)
-#define u32x4_splat(i) vdupq_n_u32(i)
-#define i32x4_splat(i) vdupq_n_s32(i)
-
-/* Arithmetic */
-#define u16x8_add(a,b) vaddq_u16(a,b)
-#define i16x8_add(a,b) vaddq_s16(a,b)
-#define u16x8_sub_saturate(a,b) vsubq_u16(a,b)
-#define i16x8_sub_saturate(a,b) vsubq_s16(a,b)
-
-#define u16x8_is_equal(a,b) vceqq_u16(a,b)
-#define i16x8_is_equal(a,b) vceqq_i16(a,b)
-
-always_inline u32
-u16x8_zero_byte_mask (u16x8 input)
-{
-  u8x16 vall_one = vdupq_n_u8 (0x0);
-  u8x16 res_values = { 0x01, 0x02, 0x04, 0x08,
-    0x10, 0x20, 0x40, 0x80,
-    0x01, 0x02, 0x04, 0x08,
-    0x10, 0x20, 0x40, 0x80
-  };
-
-  /* input --> [0x80, 0x40, 0x01, 0xf0, ... ] */
-  u8x16 test_result =
-    vreinterpretq_u8_u16 (vceqq_u16 (input, vreinterpretq_u16_u8 (vall_one)));
-  u8x16 before_merge = vminq_u8 (test_result, res_values);
-  /*before_merge--> [0x80, 0x00, 0x00, 0x10, ... ] */
-  /* u8x16 --> [a,b,c,d, e,f,g,h, i,j,k,l, m,n,o,p] */
-  /* pair add until we have 2 uint64_t  */
-  u16x8 merge1 = vpaddlq_u8 (before_merge);
-  /* u16x8-->  [a+b,c+d, e+f,g+h, i+j,k+l, m+n,o+p] */
-  u32x4 merge2 = vpaddlq_u16 (merge1);
-  /* u32x4-->  [a+b+c+d, e+f+g+h, i+j+k+l, m+n+o+p] */
-  u64x2 merge3 = vpaddlq_u32 (merge2);
-  /* u64x2-->  [a+b+c+d+e+f+g+h,  i+j+k+l+m+n+o+p]  */
-  return (u32) (vgetq_lane_u64 (merge3, 1) << 8) + vgetq_lane_u64 (merge3, 0);
-}
-
-#endif /* included_vector_neon_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vector_sse2.h b/vppinfra/vppinfra/vector_sse2.h
deleted file mode 100644
index f782e8fd..00000000
--- a/vppinfra/vppinfra/vector_sse2.h
+++ /dev/null
@@ -1,711 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_vector_sse2_h
-#define included_vector_sse2_h
-
-#include <vppinfra/error_bootstrap.h>	/* for ASSERT */
-#include <x86intrin.h>
-
-/* 128 bit interleaves. */
-always_inline u8x16
-u8x16_interleave_hi (u8x16 a, u8x16 b)
-{
-  return (u8x16) _mm_unpackhi_epi8 ((__m128i) a, (__m128i) b);
-}
-
-always_inline u8x16
-u8x16_interleave_lo (u8x16 a, u8x16 b)
-{
-  return (u8x16) _mm_unpacklo_epi8 ((__m128i) a, (__m128i) b);
-}
-
-always_inline u16x8
-u16x8_interleave_hi (u16x8 a, u16x8 b)
-{
-  return (u16x8) _mm_unpackhi_epi16 ((__m128i) a, (__m128i) b);
-}
-
-always_inline u16x8
-u16x8_interleave_lo (u16x8 a, u16x8 b)
-{
-  return (u16x8) _mm_unpacklo_epi16 ((__m128i) a, (__m128i) b);
-}
-
-always_inline u32x4
-u32x4_interleave_hi (u32x4 a, u32x4 b)
-{
-  return (u32x4) _mm_unpackhi_epi32 ((__m128i) a, (__m128i) b);
-}
-
-always_inline u32x4
-u32x4_interleave_lo (u32x4 a, u32x4 b)
-{
-  return (u32x4) _mm_unpacklo_epi32 ((__m128i) a, (__m128i) b);
-}
-
-always_inline u64x2
-u64x2_interleave_hi (u64x2 a, u64x2 b)
-{
-  return (u64x2) _mm_unpackhi_epi64 ((__m128i) a, (__m128i) b);
-}
-
-always_inline u64x2
-u64x2_interleave_lo (u64x2 a, u64x2 b)
-{
-  return (u64x2) _mm_unpacklo_epi64 ((__m128i) a, (__m128i) b);
-}
-
-/* 64 bit interleaves. */
-always_inline u8x8
-u8x8_interleave_hi (u8x8 a, u8x8 b)
-{
-  return (u8x8) _m_punpckhbw ((__m64) a, (__m64) b);
-}
-
-always_inline u8x8
-u8x8_interleave_lo (u8x8 a, u8x8 b)
-{
-  return (u8x8) _m_punpcklbw ((__m64) a, (__m64) b);
-}
-
-always_inline u16x4
-u16x4_interleave_hi (u16x4 a, u16x4 b)
-{
-  return (u16x4) _m_punpckhwd ((__m64) a, (__m64) b);
-}
-
-always_inline u16x4
-u16x4_interleave_lo (u16x4 a, u16x4 b)
-{
-  return (u16x4) _m_punpcklwd ((__m64) a, (__m64) b);
-}
-
-always_inline u32x2
-u32x2_interleave_hi (u32x2 a, u32x2 b)
-{
-  return (u32x2) _m_punpckhdq ((__m64) a, (__m64) b);
-}
-
-always_inline u32x2
-u32x2_interleave_lo (u32x2 a, u32x2 b)
-{
-  return (u32x2) _m_punpckldq ((__m64) a, (__m64) b);
-}
-
-/* 128 bit packs. */
-always_inline u8x16
-u16x8_pack (u16x8 lo, u16x8 hi)
-{
-  return (u8x16) _mm_packus_epi16 ((__m128i) lo, (__m128i) hi);
-}
-
-always_inline i8x16
-i16x8_pack (i16x8 lo, i16x8 hi)
-{
-  return (i8x16) _mm_packs_epi16 ((__m128i) lo, (__m128i) hi);
-}
-
-always_inline u16x8
-u32x4_pack (u32x4 lo, u32x4 hi)
-{
-  return (u16x8) _mm_packs_epi32 ((__m128i) lo, (__m128i) hi);
-}
-
-/* 64 bit packs. */
-always_inline u8x8
-u16x4_pack (u16x4 lo, u16x4 hi)
-{
-  return (u8x8) _m_packuswb ((__m64) lo, (__m64) hi);
-}
-
-always_inline i8x8
-i16x4_pack (i16x4 lo, i16x4 hi)
-{
-  return (i8x8) _m_packsswb ((__m64) lo, (__m64) hi);
-}
-
-always_inline u16x4
-u32x2_pack (u32x2 lo, u32x2 hi)
-{
-  return (u16x4) _m_packssdw ((__m64) lo, (__m64) hi);
-}
-
-always_inline i16x4
-i32x2_pack (i32x2 lo, i32x2 hi)
-{
-  return (i16x4) _m_packssdw ((__m64) lo, (__m64) hi);
-}
-
-/* Splats: replicate scalar value into vector. */
-always_inline u64x2
-u64x2_splat (u64 a)
-{
-  u64x2 x = { a };
-  x = u64x2_interleave_lo (x, x);
-  return x;
-}
-
-always_inline u32x4
-u32x4_splat (u32 a)
-{
-  u32x4 x = { a };
-  x = u32x4_interleave_lo (x, x);
-  x = (u32x4) u64x2_interleave_lo ((u64x2) x, (u64x2) x);
-  return x;
-}
-
-always_inline u16x8
-u16x8_splat (u16 a)
-{
-  u32 t = (u32) a | ((u32) a << 16);
-  return (u16x8) u32x4_splat (t);
-}
-
-always_inline u8x16
-u8x16_splat (u8 a)
-{
-  u32 t = (u32) a | ((u32) a << 8);
-  t |= t << 16;
-  return (u8x16) u16x8_splat (t);
-}
-
-always_inline u32x2
-u32x2_splat (u32 a)
-{
-  u32x2 x = { a };
-  x = u32x2_interleave_lo (x, x);
-  return x;
-}
-
-always_inline u16x4
-u16x4_splat (u16 a)
-{
-  u32 t = (u32) a | ((u32) a << 16);
-  return (u16x4) u32x2_splat (t);
-}
-
-always_inline u8x8
-u8x8_splat (u8 a)
-{
-  u32 t = (u32) a | ((u32) a << 8);
-  t |= t << 16;
-  return (u8x8) u32x2_splat (t);
-}
-
-#define i64x2_splat u64x2_splat
-#define i32x4_splat u32x4_splat
-#define i16x8_splat u16x8_splat
-#define i8x16_splat u8x16_splat
-#define i32x2_splat u32x2_splat
-#define i16x4_splat u16x4_splat
-#define i8x8_splat u8x8_splat
-
-#ifndef __ICC
-always_inline u64x2
-u64x2_read_lo (u64x2 x, u64 * a)
-{
-  return (u64x2) _mm_loadl_pi ((__m128) x, (__m64 *) a);
-}
-
-always_inline u64x2
-u64x2_read_hi (u64x2 x, u64 * a)
-{
-  return (u64x2) _mm_loadh_pi ((__m128) x, (__m64 *) a);
-}
-
-always_inline void
-u64x2_write_lo (u64x2 x, u64 * a)
-{
-  _mm_storel_pi ((__m64 *) a, (__m128) x);
-}
-
-always_inline void
-u64x2_write_hi (u64x2 x, u64 * a)
-{
-  _mm_storeh_pi ((__m64 *) a, (__m128) x);
-}
-#endif
-
-/* Unaligned loads/stores. */
-
-#define _(t)						\
-  always_inline void t##_store_unaligned (t x, t * a)	\
-  { _mm_storeu_si128 ((__m128i *) a, (__m128i) x); }	\
-  always_inline t t##_load_unaligned (t * a)		\
-  { return (t) _mm_loadu_si128 ((__m128i *) a); }
-
-_(u8x16) _(u16x8) _(u32x4) _(u64x2) _(i8x16) _(i16x8) _(i32x4) _(i64x2)
-#undef _
-#define _signed_binop(n,m,f,g)                                         \
-  /* Unsigned */                                                       \
-  always_inline u##n##x##m                                             \
-  u##n##x##m##_##f (u##n##x##m x, u##n##x##m y)                        \
-  { return (u##n##x##m) _mm_##g##n ((__m128i) x, (__m128i) y); } \
-                                                                       \
-  /* Signed */                                                         \
-  always_inline i##n##x##m                                             \
-  i##n##x##m##_##f (i##n##x##m x, i##n##x##m y)                        \
-  { return (i##n##x##m) _mm_##g##n ((__m128i) x, (__m128i) y); }
-/* Addition/subtraction. */
-  _signed_binop (8, 16, add, add_epi)
-_signed_binop (16, 8, add, add_epi)
-_signed_binop (32, 4, add, add_epi)
-_signed_binop (64, 2, add, add_epi)
-_signed_binop (8, 16, sub, sub_epi)
-_signed_binop (16, 8, sub, sub_epi)
-_signed_binop (32, 4, sub, sub_epi) _signed_binop (64, 2, sub, sub_epi)
-/* Addition/subtraction with saturation. */
-  _signed_binop (8, 16, add_saturate, adds_epu)
-_signed_binop (16, 8, add_saturate, adds_epu)
-_signed_binop (8, 16, sub_saturate, subs_epu)
-_signed_binop (16, 8, sub_saturate, subs_epu)
-/* Multiplication. */
-     always_inline i16x8 i16x8_mul_lo (i16x8 x, i16x8 y)
-{
-  return (i16x8) _mm_mullo_epi16 ((__m128i) x, (__m128i) y);
-}
-
-always_inline u16x8
-u16x8_mul_lo (u16x8 x, u16x8 y)
-{
-  return (u16x8) _mm_mullo_epi16 ((__m128i) x, (__m128i) y);
-}
-
-always_inline i16x8
-i16x8_mul_hi (i16x8 x, i16x8 y)
-{
-  return (i16x8) _mm_mulhi_epu16 ((__m128i) x, (__m128i) y);
-}
-
-always_inline u16x8
-u16x8_mul_hi (u16x8 x, u16x8 y)
-{
-  return (u16x8) _mm_mulhi_epu16 ((__m128i) x, (__m128i) y);
-}
-
-/* 128 bit shifts. */
-
-#define _(p,a,b,c,f)           \
-  always_inline p##a##x##b p##a##x##b##_ishift_##c (p##a##x##b x, int i)       \
-  { return (p##a##x##b) _mm_##f##i_epi##a ((__m128i) x, i); }                  \
-                                                                               \
-  always_inline p##a##x##b p##a##x##b##_shift_##c (p##a##x##b x, p##a##x##b y) \
-  { return (p##a##x##b) _mm_##f##_epi##a ((__m128i) x, (__m128i) y); }
-
-_(u, 16, 8, left, sll)
-_(u, 32, 4, left, sll)
-_(u, 64, 2, left, sll)
-_(u, 16, 8, right, srl)
-_(u, 32, 4, right, srl)
-_(u, 64, 2, right, srl)
-_(i, 16, 8, left, sll)
-_(i, 32, 4, left, sll)
-_(i, 64, 2, left, sll) _(i, 16, 8, right, sra) _(i, 32, 4, right, sra)
-#undef _
-/* 64 bit shifts. */
-  always_inline u16x4
-u16x4_shift_left (u16x4 x, u16x4 i)
-{
-  return (u16x4) _m_psllw ((__m64) x, (__m64) i);
-};
-
-always_inline u32x2
-u32x2_shift_left (u32x2 x, u32x2 i)
-{
-  return (u32x2) _m_pslld ((__m64) x, (__m64) i);
-};
-
-always_inline u16x4
-u16x4_shift_right (u16x4 x, u16x4 i)
-{
-  return (u16x4) _m_psrlw ((__m64) x, (__m64) i);
-};
-
-always_inline u32x2
-u32x2_shift_right (u32x2 x, u32x2 i)
-{
-  return (u32x2) _m_psrld ((__m64) x, (__m64) i);
-};
-
-always_inline i16x4
-i16x4_shift_left (i16x4 x, i16x4 i)
-{
-  return (i16x4) _m_psllw ((__m64) x, (__m64) i);
-};
-
-always_inline i32x2
-i32x2_shift_left (i32x2 x, i32x2 i)
-{
-  return (i32x2) _m_pslld ((__m64) x, (__m64) i);
-};
-
-always_inline i16x4
-i16x4_shift_right (i16x4 x, i16x4 i)
-{
-  return (i16x4) _m_psraw ((__m64) x, (__m64) i);
-};
-
-always_inline i32x2
-i32x2_shift_right (i32x2 x, i32x2 i)
-{
-  return (i32x2) _m_psrad ((__m64) x, (__m64) i);
-};
-
-#define u8x16_word_shift_left(a,n)  (u8x16) _mm_slli_si128((__m128i) a, n)
-#define u8x16_word_shift_right(a,n) (u8x16) _mm_srli_si128((__m128i) a, n)
-
-#define i8x16_word_shift_left(a,n) \
-  ((i8x16) u8x16_word_shift_left((u8x16) (a), (n)))
-#define i8x16_word_shift_right(a,n) \
-  ((i8x16) u8x16_word_shift_right((u8x16) (a), (n)))
-
-#define u16x8_word_shift_left(a,n) \
-  ((u16x8) u8x16_word_shift_left((u8x16) (a), (n) * sizeof (u16)))
-#define i16x8_word_shift_left(a,n) \
-  ((u16x8) u8x16_word_shift_left((u8x16) (a), (n) * sizeof (u16)))
-#define u16x8_word_shift_right(a,n) \
-  ((u16x8) u8x16_word_shift_right((u8x16) (a), (n) * sizeof (u16)))
-#define i16x8_word_shift_right(a,n) \
-  ((i16x8) u8x16_word_shift_right((u8x16) (a), (n) * sizeof (u16)))
-
-#define u32x4_word_shift_left(a,n) \
-  ((u32x4) u8x16_word_shift_left((u8x16) (a), (n) * sizeof (u32)))
-#define i32x4_word_shift_left(a,n) \
-  ((u32x4) u8x16_word_shift_left((u8x16) (a), (n) * sizeof (u32)))
-#define u32x4_word_shift_right(a,n) \
-  ((u32x4) u8x16_word_shift_right((u8x16) (a), (n) * sizeof (u32)))
-#define i32x4_word_shift_right(a,n) \
-  ((i32x4) u8x16_word_shift_right((u8x16) (a), (n) * sizeof (u32)))
-
-#define u64x2_word_shift_left(a,n) \
-  ((u64x2) u8x16_word_shift_left((u8x16) (a), (n) * sizeof (u64)))
-#define i64x2_word_shift_left(a,n) \
-  ((u64x2) u8x16_word_shift_left((u8x16) (a), (n) * sizeof (u64)))
-#define u64x2_word_shift_right(a,n) \
-  ((u64x2) u8x16_word_shift_right((u8x16) (a), (n) * sizeof (u64)))
-#define i64x2_word_shift_right(a,n) \
-  ((i64x2) u8x16_word_shift_right((u8x16) (a), (n) * sizeof (u64)))
-
-/* SSE2 has no rotate instructions: use shifts to simulate them. */
-#define _(t,n,lr1,lr2)					\
-  always_inline t##x##n					\
-  t##x##n##_irotate_##lr1 (t##x##n w, int i)		\
-  {							\
-    ASSERT (i >= 0 && i <= BITS (t));			\
-    return (t##x##n##_ishift_##lr1 (w, i)		\
-	    | t##x##n##_ishift_##lr2 (w, BITS (t) - i)); \
-  }							\
-							\
-  always_inline t##x##n					\
-  t##x##n##_rotate_##lr1 (t##x##n w, t##x##n i)		\
-  {							\
-    t##x##n j = t##x##n##_splat (BITS (t));		\
-    return (t##x##n##_shift_##lr1 (w, i)		\
-	    | t##x##n##_shift_##lr2 (w, j - i));	\
-  }
-
-_(u16, 8, left, right);
-_(u16, 8, right, left);
-_(u32, 4, left, right);
-_(u32, 4, right, left);
-_(u64, 2, left, right);
-_(u64, 2, right, left);
-
-#undef _
-
-#ifndef __clang__
-#define _(t,n,lr1,lr2)						\
-  always_inline t##x##n						\
-  t##x##n##_word_rotate2_##lr1 (t##x##n w0, t##x##n w1, int i)	\
-  {								\
-    int m = sizeof (t##x##n) / sizeof (t);			\
-    ASSERT (i >= 0 && i < m);					\
-    return (t##x##n##_word_shift_##lr1 (w0, i)			\
-	    | t##x##n##_word_shift_##lr2 (w1, m - i));		\
-  }								\
-								\
-  always_inline t##x##n						\
-  t##x##n##_word_rotate_##lr1 (t##x##n w0, int i)		\
-  { return t##x##n##_word_rotate2_##lr1 (w0, w0, i); }
-
-_(u8, 16, left, right);
-_(u8, 16, right, left);
-_(u16, 8, left, right);
-_(u16, 8, right, left);
-_(u32, 4, left, right);
-_(u32, 4, right, left);
-_(u64, 2, left, right);
-_(u64, 2, right, left);
-
-#undef _
-#endif
-
-/* Compare operations. */
-always_inline u8x16
-u8x16_is_equal (u8x16 x, u8x16 y)
-{
-  return (u8x16) _mm_cmpeq_epi8 ((__m128i) x, (__m128i) y);
-}
-
-always_inline i8x16
-i8x16_is_equal (i8x16 x, i8x16 y)
-{
-  return (i8x16) _mm_cmpeq_epi8 ((__m128i) x, (__m128i) y);
-}
-
-always_inline u16x8
-u16x8_is_equal (u16x8 x, u16x8 y)
-{
-  return (u16x8) _mm_cmpeq_epi16 ((__m128i) x, (__m128i) y);
-}
-
-always_inline i16x8
-i16x8_is_equal (i16x8 x, i16x8 y)
-{
-  return (i16x8) _mm_cmpeq_epi16 ((__m128i) x, (__m128i) y);
-}
-
-always_inline u32x4
-u32x4_is_equal (u32x4 x, u32x4 y)
-{
-  return (u32x4) _mm_cmpeq_epi32 ((__m128i) x, (__m128i) y);
-}
-
-always_inline i32x4
-i32x4_is_equal (i32x4 x, i32x4 y)
-{
-  return (i32x4) _mm_cmpeq_epi32 ((__m128i) x, (__m128i) y);
-}
-
-always_inline u8x16
-i8x16_is_greater (i8x16 x, i8x16 y)
-{
-  return (u8x16) _mm_cmpgt_epi8 ((__m128i) x, (__m128i) y);
-}
-
-always_inline u16x8
-i16x8_is_greater (i16x8 x, i16x8 y)
-{
-  return (u16x8) _mm_cmpgt_epi16 ((__m128i) x, (__m128i) y);
-}
-
-always_inline u32x4
-i32x4_is_greater (i32x4 x, i32x4 y)
-{
-  return (u32x4) _mm_cmpgt_epi32 ((__m128i) x, (__m128i) y);
-}
-
-always_inline u8x16
-u8x16_is_zero (u8x16 x)
-{
-  u8x16 zero = { 0 };
-  return u8x16_is_equal (x, zero);
-}
-
-always_inline u16x8
-u16x8_is_zero (u16x8 x)
-{
-  u16x8 zero = { 0 };
-  return u16x8_is_equal (x, zero);
-}
-
-always_inline u32x4
-u32x4_is_zero (u32x4 x)
-{
-  u32x4 zero = { 0 };
-  return u32x4_is_equal (x, zero);
-}
-
-#define u32x4_select(A,MASK)						\
-({									\
-  u32x4 _x, _y;								\
-  _x = (A);								\
-  asm volatile ("pshufd %[mask], %[x], %[y]"				\
-		: /* outputs */ [y] "=x" (_y)				\
-		: /* inputs */  [x] "x" (_x), [mask] "i" (MASK));	\
-  _y;									\
-})
-
-#define u32x4_splat_word(x,i)			\
-  u32x4_select ((x), (((i) << (2*0))		\
-		      | ((i) << (2*1))		\
-		      | ((i) << (2*2))		\
-		      | ((i) << (2*3))))
-
-/* Extract low order 32 bit word. */
-always_inline u32
-u32x4_get0 (u32x4 x)
-{
-  u32 result;
-  asm volatile ("movd %[x], %[result]": /* outputs */ [result] "=r" (result)
-		: /* inputs */ [x] "x" (x));
-  return result;
-}
-
-always_inline u32x4
-u32x4_set0 (u32 x)
-{
-  u32x4 result;
-  asm volatile ("movd %[x], %[result]": /* outputs */ [result] "=x" (result)
-		: /* inputs */ [x] "r" (x));
-  return result;
-}
-
-always_inline i32x4
-i32x4_set0 (i32 x)
-{
-  return (i32x4) u32x4_set0 ((u32) x);
-}
-
-always_inline i32
-i32x4_get0 (i32x4 x)
-{
-  return (i32) u32x4_get0 ((u32x4) x);
-}
-
-/* Converts all ones/zeros compare mask to bitmap. */
-always_inline u32
-u8x16_compare_byte_mask (u8x16 x)
-{
-  return _mm_movemask_epi8 ((__m128i) x);
-}
-
-extern u8 u32x4_compare_word_mask_table[256];
-
-always_inline u32
-u32x4_compare_word_mask (u32x4 x)
-{
-  u32 m = u8x16_compare_byte_mask ((u8x16) x);
-  return (u32x4_compare_word_mask_table[(m >> 0) & 0xff]
-	  | (u32x4_compare_word_mask_table[(m >> 8) & 0xff] << 2));
-}
-
-always_inline u32
-u8x16_zero_byte_mask (u8x16 x)
-{
-  u8x16 zero = { 0 };
-  return u8x16_compare_byte_mask (u8x16_is_equal (x, zero));
-}
-
-always_inline u32
-u16x8_zero_byte_mask (u16x8 x)
-{
-  u16x8 zero = { 0 };
-  return u8x16_compare_byte_mask ((u8x16) u16x8_is_equal (x, zero));
-}
-
-always_inline u32
-u32x4_zero_byte_mask (u32x4 x)
-{
-  u32x4 zero = { 0 };
-  return u8x16_compare_byte_mask ((u8x16) u32x4_is_equal (x, zero));
-}
-
-always_inline u8x16
-u8x16_max (u8x16 x, u8x16 y)
-{
-  return (u8x16) _mm_max_epu8 ((__m128i) x, (__m128i) y);
-}
-
-always_inline u32
-u8x16_max_scalar (u8x16 x)
-{
-  x = u8x16_max (x, u8x16_word_shift_right (x, 8));
-  x = u8x16_max (x, u8x16_word_shift_right (x, 4));
-  x = u8x16_max (x, u8x16_word_shift_right (x, 2));
-  x = u8x16_max (x, u8x16_word_shift_right (x, 1));
-  return _mm_extract_epi16 ((__m128i) x, 0) & 0xff;
-}
-
-always_inline u8x16
-u8x16_min (u8x16 x, u8x16 y)
-{
-  return (u8x16) _mm_min_epu8 ((__m128i) x, (__m128i) y);
-}
-
-always_inline u8
-u8x16_min_scalar (u8x16 x)
-{
-  x = u8x16_min (x, u8x16_word_shift_right (x, 8));
-  x = u8x16_min (x, u8x16_word_shift_right (x, 4));
-  x = u8x16_min (x, u8x16_word_shift_right (x, 2));
-  x = u8x16_min (x, u8x16_word_shift_right (x, 1));
-  return _mm_extract_epi16 ((__m128i) x, 0) & 0xff;
-}
-
-always_inline i16x8
-i16x8_max (i16x8 x, i16x8 y)
-{
-  return (i16x8) _mm_max_epi16 ((__m128i) x, (__m128i) y);
-}
-
-always_inline i16
-i16x8_max_scalar (i16x8 x)
-{
-  x = i16x8_max (x, i16x8_word_shift_right (x, 4));
-  x = i16x8_max (x, i16x8_word_shift_right (x, 2));
-  x = i16x8_max (x, i16x8_word_shift_right (x, 1));
-  return _mm_extract_epi16 ((__m128i) x, 0);
-}
-
-always_inline i16x8
-i16x8_min (i16x8 x, i16x8 y)
-{
-  return (i16x8) _mm_min_epi16 ((__m128i) x, (__m128i) y);
-}
-
-always_inline i16
-i16x8_min_scalar (i16x8 x)
-{
-  x = i16x8_min (x, i16x8_word_shift_right (x, 4));
-  x = i16x8_min (x, i16x8_word_shift_right (x, 2));
-  x = i16x8_min (x, i16x8_word_shift_right (x, 1));
-  return _mm_extract_epi16 ((__m128i) x, 0);
-}
-
-#undef _signed_binop
-
-#endif /* included_vector_sse2_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vhash.c b/vppinfra/vppinfra/vhash.c
deleted file mode 100644
index f9dac0d9..00000000
--- a/vppinfra/vppinfra/vhash.c
+++ /dev/null
@@ -1,772 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2010 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/vhash.h>
-
-#ifdef CLIB_HAVE_VEC128
-
-/* Overflow search buckets have an extra u32x4 for saving key_hash data.
-   This makes it easier to refill main search bucket from overflow vector. */
-typedef struct
-{
-  /* 4 results for this bucket. */
-  u32x4_union_t result;
-
-  /* 4 hash codes for this bucket.  These are used to refill main
-     search buckets from overflow buckets when space becomes available. */
-  u32x4_union_t key_hash;
-
-  /* n_key_u32s u32x4s of key data follow. */
-  u32x4_union_t key[0];
-} vhash_overflow_search_bucket_t;
-
-always_inline void
-set_overflow_result (vhash_overflow_search_bucket_t * b,
-		     u32 i, u32 result, u32 key_hash)
-{
-  b->result.as_u32[i] = result;
-  b->key_hash.as_u32[i] = key_hash;
-}
-
-always_inline void
-free_overflow_bucket (vhash_overflow_buckets_t * ob,
-		      vhash_overflow_search_bucket_t * b, u32 i)
-{
-  u32 o = (u32x4_union_t *) b - ob->search_buckets;
-  ASSERT (o < vec_len (ob->search_buckets));
-  vec_add1 (ob->free_indices, 4 * o + i);
-}
-
-always_inline vhash_overflow_search_bucket_t *
-get_overflow_search_bucket (vhash_overflow_buckets_t * obs, u32 i,
-			    u32 n_key_u32s)
-{
-  return ((vhash_overflow_search_bucket_t *)
-	  vec_elt_at_index (obs->search_buckets, i));
-}
-
-always_inline vhash_overflow_search_bucket_t *
-next_overflow_bucket (vhash_overflow_search_bucket_t * b, u32 n_key_u32s)
-{
-  return (vhash_overflow_search_bucket_t *) & b->key[n_key_u32s];
-}
-
-#define foreach_vhash_overflow_bucket(b,ob,n_key_u32s)			\
-  for ((b) = (vhash_overflow_search_bucket_t *) ob->search_buckets;	\
-       (u32x4_union_t *) (b) < vec_end (ob->search_buckets);		\
-       b = next_overflow_bucket (b, n_key_u32s))
-
-u32
-vhash_get_overflow (vhash_t * h, u32 key_hash, u32 vi, u32 n_key_u32s)
-{
-  vhash_overflow_buckets_t *ob = vhash_get_overflow_buckets (h, key_hash);
-  vhash_overflow_search_bucket_t *b;
-  u32 i, result = 0;
-
-  foreach_vhash_overflow_bucket (b, ob, n_key_u32s)
-  {
-    u32x4 r = b->result.as_u32x4;
-
-    for (i = 0; i < n_key_u32s; i++)
-      r &= vhash_bucket_compare (h, &b->key[0], i, vi);
-
-    result = vhash_merge_results (r);
-    if (result)
-      break;
-  }
-
-  return result;
-}
-
-u32
-vhash_set_overflow (vhash_t * h,
-		    u32 key_hash, u32 vi, u32 new_result, u32 n_key_u32s)
-{
-  vhash_overflow_buckets_t *ob = vhash_get_overflow_buckets (h, key_hash);
-  vhash_overflow_search_bucket_t *b;
-  u32 i_set, i, old_result;
-
-  foreach_vhash_overflow_bucket (b, ob, n_key_u32s)
-  {
-    u32x4 r;
-
-    r = b->result.as_u32x4;
-    for (i = 0; i < n_key_u32s; i++)
-      r &= vhash_bucket_compare (h, &b->key[0], i, vi);
-
-    old_result = vhash_merge_results (r);
-    if (old_result)
-      {
-	i_set = vhash_non_empty_result_index (r);
-	set_overflow_result (b, i_set, new_result, key_hash);
-	return old_result;
-      }
-  }
-
-  /* Check free list. */
-  if (vec_len (ob->free_indices) == 0)
-    {
-      /* Out of free overflow buckets.  Resize. */
-      u32 j, *p;
-      i = vec_len (ob->search_buckets);
-      vec_resize_aligned (ob->search_buckets,
-			  sizeof (b[0]) / sizeof (u32x4) + n_key_u32s,
-			  CLIB_CACHE_LINE_BYTES);
-      vec_add2 (ob->free_indices, p, 4);
-      for (j = 0; j < 4; j++)
-	p[j] = 4 * i + j;
-    }
-
-  i = vec_pop (ob->free_indices);
-
-  i_set = i & 3;
-  b = ((vhash_overflow_search_bucket_t *)
-       vec_elt_at_index (ob->search_buckets, i / 4));
-
-  /* Insert result. */
-  set_overflow_result (b, i_set, new_result, key_hash);
-
-  /* Insert key. */
-  for (i = 0; i < n_key_u32s; i++)
-    b->key[i].as_u32[i_set] = vhash_get_key_word (h, i, vi);
-
-  ob->n_overflow++;
-  h->n_elts++;
-
-  return /* old result was invalid */ 0;
-}
-
-u32
-vhash_unset_overflow (vhash_t * h, u32 key_hash, u32 vi, u32 n_key_u32s)
-{
-  vhash_overflow_buckets_t *ob = vhash_get_overflow_buckets (h, key_hash);
-  vhash_overflow_search_bucket_t *b;
-  u32 i_set, i, old_result;
-
-  foreach_vhash_overflow_bucket (b, ob, n_key_u32s)
-  {
-    u32x4 r;
-
-    r = b->result.as_u32x4;
-    for (i = 0; i < n_key_u32s; i++)
-      r &= vhash_bucket_compare (h, &b->key[0], i, vi);
-
-    old_result = vhash_merge_results (r);
-    if (old_result)
-      {
-	i_set = vhash_non_empty_result_index (r);
-
-	/* Invalidate result and invert key hash so that this will
-	   never match since all keys in this overflow bucket have
-	   matching key hashs. */
-	set_overflow_result (b, i_set, 0, ~key_hash);
-
-	free_overflow_bucket (ob, b, i_set);
-
-	ASSERT (ob->n_overflow > 0);
-	ob->n_overflow--;
-	h->n_elts--;
-	return old_result;
-      }
-  }
-
-  /* Could not find key. */
-  return 0;
-}
-
-void
-vhash_unset_refill_from_overflow (vhash_t * h,
-				  vhash_search_bucket_t * sb,
-				  u32 key_hash, u32 n_key_u32s)
-{
-  vhash_overflow_buckets_t *obs = vhash_get_overflow_buckets (h, key_hash);
-  vhash_overflow_search_bucket_t *ob;
-  u32 i, j, i_refill, bucket_mask = h->bucket_mask.as_u32[0];
-
-  /* Find overflow element with matching key hash. */
-  foreach_vhash_overflow_bucket (ob, obs, n_key_u32s)
-  {
-    for (i = 0; i < 4; i++)
-      {
-	if (!ob->result.as_u32[i])
-	  continue;
-	if ((ob->key_hash.as_u32[i] & bucket_mask)
-	    != (key_hash & bucket_mask))
-	  continue;
-
-	i_refill = vhash_empty_result_index (sb->result.as_u32x4);
-	sb->result.as_u32[i_refill] = ob->result.as_u32[i];
-	for (j = 0; j < n_key_u32s; j++)
-	  sb->key[j].as_u32[i_refill] = ob->key[j].as_u32[i];
-	set_overflow_result (ob, i, 0, ~key_hash);
-	free_overflow_bucket (obs, ob, i);
-	return;
-      }
-  }
-}
-
-void
-vhash_init (vhash_t * h, u32 log2_n_keys, u32 n_key_u32, u32 * hash_seeds)
-{
-  uword i, j, m;
-  vhash_search_bucket_t *b;
-
-  memset (h, 0, sizeof (h[0]));
-
-  /* Must have at least 4 keys (e.g. one search bucket). */
-  log2_n_keys = clib_max (log2_n_keys, 2);
-
-  h->log2_n_keys = log2_n_keys;
-  h->n_key_u32 = n_key_u32;
-  m = pow2_mask (h->log2_n_keys) & ~3;
-  for (i = 0; i < VECTOR_WORD_TYPE_LEN (u32); i++)
-    h->bucket_mask.as_u32[i] = m;
-
-  /* Allocate and zero search buckets. */
-  i = (sizeof (b[0]) / sizeof (u32x4) + n_key_u32) << (log2_n_keys - 2);
-  vec_validate_aligned (h->search_buckets, i - 1, CLIB_CACHE_LINE_BYTES);
-
-  for (i = 0; i < ARRAY_LEN (h->find_first_zero_table); i++)
-    h->find_first_zero_table[i] = min_log2 (first_set (~i));
-
-  for (i = 0; i < ARRAY_LEN (h->hash_seeds); i++)
-    for (j = 0; j < VECTOR_WORD_TYPE_LEN (u32); j++)
-      h->hash_seeds[i].as_u32[j] = hash_seeds[i];
-}
-
-static_always_inline u32
-vhash_main_key_gather (void *_vm, u32 vi, u32 wi, u32 n_key_u32)
-{
-  vhash_main_t *vm = _vm;
-  return vec_elt (vm->keys, vi * n_key_u32 + wi);
-}
-
-static_always_inline u32x4
-vhash_main_4key_gather (void *_vm, u32 vi, u32 wi, u32 n_key_u32s)
-{
-  vhash_main_t *vm = _vm;
-  u32x4_union_t x;
-
-  ASSERT (n_key_u32s == vm->n_key_u32);
-  ASSERT (wi < n_key_u32s);
-
-  x.as_u32[0] = vec_elt (vm->keys, (vi + 0) * n_key_u32s + wi);
-  x.as_u32[1] = vec_elt (vm->keys, (vi + 1) * n_key_u32s + wi);
-  x.as_u32[2] = vec_elt (vm->keys, (vi + 2) * n_key_u32s + wi);
-  x.as_u32[3] = vec_elt (vm->keys, (vi + 3) * n_key_u32s + wi);
-  return x.as_u32x4;
-}
-
-static_always_inline u32
-vhash_main_set_result (void *_vm, u32 vi, u32 old_result, u32 n_key_u32)
-{
-  vhash_main_t *vm = _vm;
-  u32 *p = vec_elt_at_index (vm->results, vi);
-  u32 new_result = p[0];
-  p[0] = old_result;
-  return new_result;
-}
-
-static_always_inline u32
-vhash_main_get_result (void *_vm, u32 vi, u32 old_result, u32 n_key_u32)
-{
-  vhash_main_t *vm = _vm;
-  vec_elt (vm->results, vi) = old_result;
-  return old_result;
-}
-
-static_always_inline u32x4
-vhash_main_get_4result (void *_vm, u32 vi, u32x4 old_result, u32 n_key_u32)
-{
-  vhash_main_t *vm = _vm;
-  u32x4 *p = (u32x4 *) vec_elt_at_index (vm->results, vi);
-  p[0] = old_result;
-  return old_result;
-}
-
-#define _(N_KEY_U32)							\
-  static_always_inline u32						\
-  vhash_main_key_gather_##N_KEY_U32 (void * _vm, u32 vi, u32 i)		\
-  { return vhash_main_key_gather (_vm, vi, i, N_KEY_U32); }		\
-									\
-  static_always_inline u32x4						\
-  vhash_main_4key_gather_##N_KEY_U32 (void * _vm, u32 vi, u32 i)	\
-  { return vhash_main_4key_gather (_vm, vi, i, N_KEY_U32); }		\
-									\
-  clib_pipeline_stage_static						\
-  (vhash_main_gather_keys_stage_##N_KEY_U32,				\
-   vhash_main_t *, vm, i,						\
-   {									\
-     vhash_gather_4key_stage						\
-       (vm->vhash,							\
-	/* vector_index */ i,						\
-	vhash_main_4key_gather_##N_KEY_U32,				\
-	vm,								\
-	N_KEY_U32);							\
-   })									\
-									\
-  clib_pipeline_stage_no_inline						\
-  (vhash_main_gather_keys_mod_stage_##N_KEY_U32,			\
-   vhash_main_t *, vm, i,						\
-   {									\
-     vhash_gather_key_stage						\
-       (vm->vhash,							\
-	/* vector_index */ vm->n_vectors_div_4,				\
-	/* n_vectors */ vm->n_vectors_mod_4,				\
-	vhash_main_key_gather_##N_KEY_U32,				\
-	vm,								\
-	N_KEY_U32);							\
-   })									\
-									\
-  clib_pipeline_stage							\
-  (vhash_main_hash_finalize_stage_##N_KEY_U32,				\
-   vhash_main_t *, vm, i,						\
-   {									\
-     vhash_finalize_stage (vm->vhash, i, N_KEY_U32);			\
-   })									\
-									\
-  clib_pipeline_stage_no_inline						\
-  (vhash_main_hash_finalize_mod_stage_##N_KEY_U32,			\
-   vhash_main_t *, vm, i,						\
-   {									\
-     vhash_finalize_stage (vm->vhash, vm->n_vectors_div_4, N_KEY_U32);	\
-   })									\
-									\
-  clib_pipeline_stage_static						\
-  (vhash_main_get_stage_##N_KEY_U32,					\
-   vhash_main_t *, vm, i,						\
-   {									\
-     vhash_get_4_stage (vm->vhash,					\
-			/* vector_index */ i,				\
-			vhash_main_get_4result,				\
-			vm, N_KEY_U32);					\
-   })									\
-									\
-  clib_pipeline_stage_no_inline						\
-  (vhash_main_get_mod_stage_##N_KEY_U32,				\
-   vhash_main_t *, vm, i,						\
-   {									\
-     vhash_get_stage (vm->vhash,					\
-		      /* vector_index */ vm->n_vectors_div_4,		\
-		      /* n_vectors */ vm->n_vectors_mod_4,		\
-		      vhash_main_get_result,				\
-		      vm, N_KEY_U32);					\
-   })									\
-									\
-  clib_pipeline_stage_static						\
-  (vhash_main_set_stage_##N_KEY_U32,					\
-   vhash_main_t *, vm, i,						\
-   {									\
-     vhash_set_stage (vm->vhash,					\
-		      /* vector_index */ i,				\
-		      /* n_vectors */ VECTOR_WORD_TYPE_LEN (u32),	\
-		      vhash_main_set_result,				\
-		      vm, N_KEY_U32);					\
-   })									\
-									\
-  clib_pipeline_stage_no_inline						\
-  (vhash_main_set_mod_stage_##N_KEY_U32,				\
-   vhash_main_t *, vm, i,						\
-   {									\
-     vhash_set_stage (vm->vhash,					\
-		      /* vector_index */ vm->n_vectors_div_4,		\
-		      /* n_vectors */ vm->n_vectors_mod_4,		\
-		      vhash_main_set_result,				\
-		      vm, N_KEY_U32);					\
-   })									\
-									\
-  clib_pipeline_stage_static						\
-  (vhash_main_unset_stage_##N_KEY_U32,					\
-   vhash_main_t *, vm, i,						\
-   {									\
-     vhash_unset_stage (vm->vhash,					\
-		      /* vector_index */ i,				\
-		      /* n_vectors */ VECTOR_WORD_TYPE_LEN (u32),	\
-		      vhash_main_get_result,				\
-		      vm, N_KEY_U32);					\
-   })									\
-									\
-  clib_pipeline_stage_no_inline						\
-  (vhash_main_unset_mod_stage_##N_KEY_U32,				\
-   vhash_main_t *, vm, i,						\
-   {									\
-     vhash_unset_stage (vm->vhash,					\
-		      /* vector_index */ vm->n_vectors_div_4,		\
-		      /* n_vectors */ vm->n_vectors_mod_4,		\
-		      vhash_main_get_result,				\
-		      vm, N_KEY_U32);					\
-   })
-
-_(1);
-_(2);
-_(3);
-_(4);
-_(5);
-_(6);
-
-#undef _
-
-#define _(N_KEY_U32)							\
-  clib_pipeline_stage							\
-  (vhash_main_hash_mix_stage_##N_KEY_U32,				\
-   vhash_main_t *, vm, i,						\
-   {									\
-     vhash_mix_stage (vm->vhash, i, N_KEY_U32);				\
-   })									\
-									\
-  clib_pipeline_stage_no_inline						\
-  (vhash_main_hash_mix_mod_stage_##N_KEY_U32,				\
-   vhash_main_t *, vm, i,						\
-   {									\
-     vhash_mix_stage (vm->vhash, vm->n_vectors_div_4, N_KEY_U32);	\
-   })
-
-_(4);
-_(5);
-_(6);
-
-#undef _
-
-typedef enum
-{
-  GET, SET, UNSET,
-} vhash_main_op_t;
-
-static void
-vhash_main_op (vhash_main_t * vm, vhash_main_op_t op)
-{
-  u32 n_keys = vec_len (vm->results);
-
-  vm->n_key_u32 = vm->vhash->n_key_u32;
-
-  vhash_validate_sizes (vm->vhash, vm->n_key_u32, n_keys);
-
-  vm->n_vectors_div_4 = n_keys / 4;
-  vm->n_vectors_mod_4 = n_keys % 4;
-
-  if (vm->n_vectors_div_4 > 0)
-    {
-      switch (vm->n_key_u32)
-	{
-	default:
-	  ASSERT (0);
-	  break;
-
-#define _(N_KEY_U32)						\
-	case N_KEY_U32:						\
-	  if (op == GET)					\
-	    clib_pipeline_run_3_stage				\
-	      (vm->n_vectors_div_4,				\
-	       vm,						\
-	       vhash_main_gather_keys_stage_##N_KEY_U32,	\
-	       vhash_main_hash_finalize_stage_##N_KEY_U32,	\
-	       vhash_main_get_stage_##N_KEY_U32);		\
-	  else if (op == SET)					\
-	    clib_pipeline_run_3_stage				\
-	      (vm->n_vectors_div_4,				\
-	       vm,						\
-	       vhash_main_gather_keys_stage_##N_KEY_U32,	\
-	       vhash_main_hash_finalize_stage_##N_KEY_U32,	\
-	       vhash_main_set_stage_##N_KEY_U32);		\
-	  else							\
-	    clib_pipeline_run_3_stage				\
-	      (vm->n_vectors_div_4,				\
-	       vm,						\
-	       vhash_main_gather_keys_stage_##N_KEY_U32,	\
-	       vhash_main_hash_finalize_stage_##N_KEY_U32,	\
-	       vhash_main_unset_stage_##N_KEY_U32);		\
-	  break;
-
-	  _(1);
-	  _(2);
-	  _(3);
-
-#undef _
-
-#define _(N_KEY_U32)						\
-	case N_KEY_U32:						\
-	  if (op == GET)					\
-	    clib_pipeline_run_4_stage				\
-	      (vm->n_vectors_div_4,				\
-	       vm,						\
-	       vhash_main_gather_keys_stage_##N_KEY_U32,	\
-	       vhash_main_hash_mix_stage_##N_KEY_U32,		\
-	       vhash_main_hash_finalize_stage_##N_KEY_U32,	\
-	       vhash_main_get_stage_##N_KEY_U32);		\
-	  else if (op == SET)					\
-	    clib_pipeline_run_4_stage				\
-	      (vm->n_vectors_div_4,				\
-	       vm,						\
-	       vhash_main_gather_keys_stage_##N_KEY_U32,	\
-	       vhash_main_hash_mix_stage_##N_KEY_U32,		\
-	       vhash_main_hash_finalize_stage_##N_KEY_U32,	\
-	       vhash_main_set_stage_##N_KEY_U32);		\
-	  else							\
-	    clib_pipeline_run_4_stage				\
-	      (vm->n_vectors_div_4,				\
-	       vm,						\
-	       vhash_main_gather_keys_stage_##N_KEY_U32,	\
-	       vhash_main_hash_mix_stage_##N_KEY_U32,		\
-	       vhash_main_hash_finalize_stage_##N_KEY_U32,	\
-	       vhash_main_unset_stage_##N_KEY_U32);		\
-	  break;
-
-	  _(4);
-	  _(5);
-	  _(6);
-
-#undef _
-	}
-    }
-
-
-  if (vm->n_vectors_mod_4 > 0)
-    {
-      switch (vm->n_key_u32)
-	{
-	default:
-	  ASSERT (0);
-	  break;
-
-#define _(N_KEY_U32)						\
-	case N_KEY_U32:						\
-	  if (op == GET)					\
-	    clib_pipeline_run_3_stage				\
-	      (1,						\
-	       vm,						\
-	       vhash_main_gather_keys_mod_stage_##N_KEY_U32,	\
-	       vhash_main_hash_finalize_mod_stage_##N_KEY_U32,	\
-	       vhash_main_get_mod_stage_##N_KEY_U32);		\
-	  else if (op == SET)					\
-	    clib_pipeline_run_3_stage				\
-	      (1,						\
-	       vm,						\
-	       vhash_main_gather_keys_mod_stage_##N_KEY_U32,	\
-	       vhash_main_hash_finalize_mod_stage_##N_KEY_U32,	\
-	       vhash_main_set_mod_stage_##N_KEY_U32);		\
-	  else							\
-	    clib_pipeline_run_3_stage				\
-	      (1,						\
-	       vm,						\
-	       vhash_main_gather_keys_mod_stage_##N_KEY_U32,	\
-	       vhash_main_hash_finalize_mod_stage_##N_KEY_U32,	\
-	       vhash_main_unset_mod_stage_##N_KEY_U32);		\
-	break;
-
-	  _(1);
-	  _(2);
-	  _(3);
-
-#undef _
-
-#define _(N_KEY_U32)						\
-	case N_KEY_U32:						\
-	  if (op == GET)					\
-	    clib_pipeline_run_4_stage				\
-	      (1,						\
-	       vm,						\
-	       vhash_main_gather_keys_mod_stage_##N_KEY_U32,	\
-	       vhash_main_hash_mix_mod_stage_##N_KEY_U32,	\
-	       vhash_main_hash_finalize_mod_stage_##N_KEY_U32,	\
-	       vhash_main_get_mod_stage_##N_KEY_U32);		\
-	  else if (op == SET)					\
-	    clib_pipeline_run_4_stage				\
-	      (1,						\
-	       vm,						\
-	       vhash_main_gather_keys_mod_stage_##N_KEY_U32,	\
-	       vhash_main_hash_mix_mod_stage_##N_KEY_U32,	\
-	       vhash_main_hash_finalize_mod_stage_##N_KEY_U32,	\
-	       vhash_main_set_mod_stage_##N_KEY_U32);		\
-	  else							\
-	    clib_pipeline_run_4_stage				\
-	      (1,						\
-	       vm,						\
-	       vhash_main_gather_keys_mod_stage_##N_KEY_U32,	\
-	       vhash_main_hash_mix_mod_stage_##N_KEY_U32,	\
-	       vhash_main_hash_finalize_mod_stage_##N_KEY_U32,	\
-	       vhash_main_unset_mod_stage_##N_KEY_U32);		\
-	  break;
-
-	  _(4);
-	  _(5);
-	  _(6);
-
-#undef _
-	}
-    }
-}
-
-void
-vhash_main_get (vhash_main_t * vm)
-{
-  vhash_main_op (vm, GET);
-}
-
-void
-vhash_main_set (vhash_main_t * vm)
-{
-  vhash_main_op (vm, SET);
-}
-
-void
-vhash_main_unset (vhash_main_t * vm)
-{
-  vhash_main_op (vm, UNSET);
-}
-
-u32
-vhash_resize_incremental (vhash_resize_t * vr, u32 vector_index,
-			  u32 n_keys_this_call)
-{
-  vhash_t *old = vr->old;
-  vhash_main_t *vm = &vr->new;
-  vhash_t *new = vm->vhash;
-  uword i, j, n_key_u32;
-
-  n_key_u32 = old->n_key_u32;
-
-  if (vector_index == 0)
-    {
-      u32 hash_seeds[3];
-      hash_seeds[0] = old->hash_seeds[0].as_u32[0];
-      hash_seeds[1] = old->hash_seeds[1].as_u32[0];
-      hash_seeds[2] = old->hash_seeds[2].as_u32[0];
-      vhash_init (new, old->log2_n_keys + 1, n_key_u32, hash_seeds);
-    }
-
-  vec_reset_length (vm->keys);
-  vec_reset_length (vm->results);
-
-  if (0 == (vector_index >> old->log2_n_keys))
-    {
-      for (i = vector_index; 0 == (i >> (old->log2_n_keys - 2)); i++)
-	{
-	  vhash_search_bucket_t *b =
-	    vhash_get_search_bucket_with_index (old, 4 * i, n_key_u32);
-	  u32 r, *k;
-
-#define _(I)					\
-  if ((r = b->result.as_u32[I]) != 0)		\
-    {						\
-      vec_add1 (vm->results, r - 1);		\
-      vec_add2 (vm->keys, k, n_key_u32);	\
-      for (j = 0; j < n_key_u32; j++)		\
-	k[j] = b->key[j].as_u32[I];		\
-    }
-
-	  _(0);
-	  _(1);
-	  _(2);
-	  _(3);
-
-#undef _
-
-	  if (vec_len (vm->results) >= n_keys_this_call)
-	    {
-	      vhash_main_op (vm, SET);
-	      return i;
-	    }
-	}
-    }
-
-  /* Add overflow buckets. */
-  {
-    vhash_overflow_buckets_t *ob;
-    vhash_overflow_search_bucket_t *b;
-
-    for (ob = old->overflow_buckets;
-	 ob < old->overflow_buckets + ARRAY_LEN (old->overflow_buckets); ob++)
-      {
-	foreach_vhash_overflow_bucket (b, ob, old->n_key_u32)
-	{
-	  u32 r, *k;
-
-#define _(I)					\
-  if ((r = b->result.as_u32[I]) != 0)		\
-    {						\
-      vec_add1 (vm->results, r - 1);		\
-      vec_add2 (vm->keys, k, n_key_u32);	\
-      for (j = 0; j < n_key_u32; j++)		\
-	k[j] = b->key[j].as_u32[I];		\
-    }
-
-	  _(0);
-	  _(1);
-	  _(2);
-	  _(3);
-
-#undef _
-	}
-      }
-  }
-
-  vhash_main_op (vm, SET);
-
-  /* Let caller know we are done. */
-  return ~0;
-}
-
-void
-vhash_resize (vhash_t * old, u32 log2_n_keys)
-{
-  static vhash_resize_t vr;
-  vhash_t new;
-  u32 i = 0;
-
-  vr.old = old;
-  vr.new.vhash = &new;
-
-  while (1)
-    {
-      i = vhash_resize_incremental (&vr, i, 1024);
-      if (i == ~0)
-	break;
-    }
-
-  vhash_free (old);
-  *old = new;
-}
-
-#endif /* CLIB_HAVE_VEC128 */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vhash.h b/vppinfra/vppinfra/vhash.h
deleted file mode 100644
index 5ab42292..00000000
--- a/vppinfra/vppinfra/vhash.h
+++ /dev/null
@@ -1,850 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2010 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_vhash_h
-#define included_clib_vhash_h
-
-#include <vppinfra/vector.h>
-
-#ifdef CLIB_HAVE_VEC128
-
-#include <vppinfra/cache.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/pipeline.h>
-
-/* Gathers 32 bits worth of key with given index. */
-typedef u32 (vhash_key_function_t) (void *state, u32 vector_index,
-				    u32 key_word_index);
-typedef u32x4 (vhash_4key_function_t) (void *state, u32 vector_index,
-				       u32 key_word_index);
-/* Sets/gets result of hash lookup. */
-typedef u32 (vhash_result_function_t) (void *state, u32 vector_index,
-				       u32 result, u32 n_key_u32);
-typedef u32x4 (vhash_4result_function_t) (void *state, u32 vector_index,
-					  u32x4 results, u32 n_key_u32);
-
-typedef struct
-{
-  u32x4_union_t hashed_key[3];
-} vhash_hashed_key_t;
-
-/* Search buckets are really this structure. */
-typedef struct
-{
-  /* 4 results for this bucket.
-     Zero is used to mark empty results.  This means user can't use the result ~0
-     since user results differ from internal results stored in buckets by 1.
-     e.g. internal result = user result + 1. */
-  u32x4_union_t result;
-
-  /* n_key_u32s u32x4s of key data follow. */
-  u32x4_union_t key[0];
-} vhash_search_bucket_t;
-
-typedef struct
-{
-  u32x4_union_t *search_buckets;
-
-  /* Vector of bucket free indices. */
-  u32 *free_indices;
-
-  /* Number of entries in this overflow bucket. */
-  u32 n_overflow;
-} vhash_overflow_buckets_t;
-
-typedef struct
-{
-  /* 2^log2_n_keys keys grouped in groups of 4.
-     Each bucket contains 4 results plus 4 keys for a
-     total of (1 + n_key_u32) u32x4s. */
-  u32x4_union_t *search_buckets;
-
-  /* When a bucket of 4 results/keys are full we search
-     the overflow.  hash_key is used to select which overflow
-     bucket. */
-  vhash_overflow_buckets_t overflow_buckets[16];
-
-  /* Total count of occupied elements in hash table. */
-  u32 n_elts;
-
-  u32 log2_n_keys;
-
-  /* Number of 32 bit words in a hash key. */
-  u32 n_key_u32;
-
-  u32x4_union_t bucket_mask;
-
-  /* table[i] = min_log2 (first_set (~i)). */
-  u8 find_first_zero_table[16];
-
-  /* Hash seeds for Jenkins hash. */
-  u32x4_union_t hash_seeds[3];
-
-  /* Key work space is a vector of length
-     n_key_u32s << log2_n_key_word_len_u32x. */
-  u32 log2_n_key_word_len_u32x;
-
-  /* Work space to store keys between pipeline stages. */
-  u32x4_union_t *key_work_space;
-
-  /* Hash work space to store Jenkins hash values between
-     pipeline stages. */
-  vhash_hashed_key_t *hash_work_space;
-} vhash_t;
-
-always_inline vhash_overflow_buckets_t *
-vhash_get_overflow_buckets (vhash_t * h, u32 key)
-{
-  u32 i = (((key & h->bucket_mask.as_u32[0]) >> 2) & 0xf);
-  ASSERT (i < ARRAY_LEN (h->overflow_buckets));
-  return h->overflow_buckets + i;
-}
-
-always_inline uword
-vhash_is_non_empty_overflow_bucket (vhash_t * h, u32 key)
-{
-  u32 i = (((key & h->bucket_mask.as_u32[0]) >> 2) & 0xf);
-  ASSERT (i < ARRAY_LEN (h->overflow_buckets));
-  return h->overflow_buckets[i].n_overflow > 0;
-}
-
-always_inline void
-vhash_free_overflow_buckets (vhash_overflow_buckets_t * obs)
-{
-  vec_free (obs->search_buckets);
-  vec_free (obs->free_indices);
-}
-
-always_inline void
-vhash_free (vhash_t * h)
-{
-  uword i;
-  for (i = 0; i < ARRAY_LEN (h->overflow_buckets); i++)
-    vhash_free_overflow_buckets (&h->overflow_buckets[i]);
-  vec_free (h->search_buckets);
-  vec_free (h->key_work_space);
-  vec_free (h->hash_work_space);
-}
-
-always_inline void
-vhash_set_key_word (vhash_t * h, u32 wi, u32 vi, u32 value)
-{
-  u32 i0 = (wi << h->log2_n_key_word_len_u32x) + (vi / 4);
-  u32 i1 = vi % 4;
-  vec_elt (h->key_work_space, i0).as_u32[i1] = value;
-}
-
-always_inline void
-vhash_set_key_word_u32x (vhash_t * h, u32 wi, u32 vi, u32x value)
-{
-  u32 i0 = (wi << h->log2_n_key_word_len_u32x) + (vi / 4);
-  vec_elt (h->key_work_space, i0).as_u32x4 = value;
-}
-
-always_inline u32
-vhash_get_key_word (vhash_t * h, u32 wi, u32 vi)
-{
-  u32 i0 = (wi << h->log2_n_key_word_len_u32x) + (vi / 4);
-  u32 i1 = vi % 4;
-  return vec_elt (h->key_work_space, i0).as_u32[i1];
-}
-
-always_inline u32x
-vhash_get_key_word_u32x (vhash_t * h, u32 wi, u32 vi)
-{
-  u32 i0 = (wi << h->log2_n_key_word_len_u32x) + vi;
-  return vec_elt (h->key_work_space, i0).as_u32x4;
-}
-
-always_inline void
-vhash_validate_sizes (vhash_t * h, u32 n_key_u32, u32 n_vectors)
-{
-  u32 n, l;
-
-  n = max_pow2 (n_vectors) / 4;
-  n = clib_max (n, 8);
-
-  h->log2_n_key_word_len_u32x = l = min_log2 (n);
-  vec_validate_aligned (h->key_work_space, (n_key_u32 << l) - 1,
-			CLIB_CACHE_LINE_BYTES);
-  vec_validate_aligned (h->hash_work_space, n - 1, CLIB_CACHE_LINE_BYTES);
-}
-
-always_inline void
-vhash_gather_key_stage (vhash_t * h,
-			u32 vector_index,
-			u32 n_vectors,
-			vhash_key_function_t key_function,
-			void *state, u32 n_key_u32s)
-{
-  u32 i, j, vi;
-
-  /* Gather keys for 4 packets (for 128 bit vector length e.g. u32x4). */
-  for (i = 0; i < n_vectors; i++)
-    {
-      vi = vector_index * 4 + i;
-      for (j = 0; j < n_key_u32s; j++)
-	vhash_set_key_word (h, j, vi, key_function (state, vi, j));
-    }
-}
-
-always_inline void
-vhash_gather_4key_stage (vhash_t * h,
-			 u32 vector_index,
-			 vhash_4key_function_t key_function,
-			 void *state, u32 n_key_u32s)
-{
-  u32 j, vi;
-  vi = vector_index * 4;
-  for (j = 0; j < n_key_u32s; j++)
-    vhash_set_key_word_u32x (h, j, vi, key_function (state, vi, j));
-}
-
-always_inline void
-vhash_mix_stage (vhash_t * h, u32 vector_index, u32 n_key_u32s)
-{
-  i32 i, n_left;
-  u32x a, b, c;
-
-  /* Only need to do this for keys longer than 12 bytes. */
-  ASSERT (n_key_u32s > 3);
-
-  a = h->hash_seeds[0].as_u32x4;
-  b = h->hash_seeds[1].as_u32x4;
-  c = h->hash_seeds[2].as_u32x4;
-  for (i = 0, n_left = n_key_u32s - 3; n_left > 0; n_left -= 3, i += 3)
-    {
-      a +=
-	vhash_get_key_word_u32x (h, n_key_u32s - 1 - (i + 0), vector_index);
-      if (n_left > 1)
-	b +=
-	  vhash_get_key_word_u32x (h, n_key_u32s - 1 - (i + 1), vector_index);
-      if (n_left > 2)
-	c +=
-	  vhash_get_key_word_u32x (h, n_key_u32s - 1 - (i + 2), vector_index);
-
-      hash_v3_mix_u32x (a, b, c);
-    }
-
-  /* Save away a, b, c for later finalize. */
-  {
-    vhash_hashed_key_t *hk =
-      vec_elt_at_index (h->hash_work_space, vector_index);
-    hk->hashed_key[0].as_u32x4 = a;
-    hk->hashed_key[1].as_u32x4 = b;
-    hk->hashed_key[2].as_u32x4 = c;
-  }
-}
-
-always_inline vhash_search_bucket_t *
-vhash_get_search_bucket_with_index (vhash_t * h, u32 i, u32 n_key_u32s)
-{
-  return ((vhash_search_bucket_t *)
-	  vec_elt_at_index (h->search_buckets,
-			    (i / 4) *
-			    ((sizeof (vhash_search_bucket_t) /
-			      sizeof (u32x4)) + n_key_u32s)));
-}
-
-always_inline vhash_search_bucket_t *
-vhash_get_search_bucket (vhash_t * h, u32 key_hash, u32 n_key_u32s)
-{
-  u32 i = key_hash & h->bucket_mask.as_u32[0];
-  return vhash_get_search_bucket_with_index (h, i, n_key_u32s);
-}
-
-always_inline u32x4
-vhash_get_4_search_bucket_byte_offsets (vhash_t * h, u32x4 key_hash,
-					u32 n_key_u32s)
-{
-  vhash_search_bucket_t *b;
-  u32 n_bytes_per_bucket = sizeof (b[0]) + n_key_u32s * sizeof (b->key[0]);
-  u32x4 r = key_hash & h->bucket_mask.as_u32x4;
-
-  /* Multiply with shifts and adds to get bucket byte offset. */
-#define _(x) u32x4_ishift_left (r, (x) - 2)
-  if (n_bytes_per_bucket == (1 << 5))
-    r = _(5);
-  else if (n_bytes_per_bucket == ((1 << 5) + (1 << 4)))
-    r = _(5) + _(4);
-  else if (n_bytes_per_bucket == (1 << 6))
-    r = _(6);
-  else if (n_bytes_per_bucket == ((1 << 6) + (1 << 4)))
-    r = _(6) + _(4);
-  else if (n_bytes_per_bucket == ((1 << 6) + (1 << 5)))
-    r = _(6) + _(5);
-  else if (n_bytes_per_bucket == ((1 << 6) + (1 << 5) + (1 << 4)))
-    r = _(6) + _(5) + _(4);
-  else
-    ASSERT (0);
-#undef _
-  return r;
-}
-
-always_inline void
-vhash_finalize_stage (vhash_t * h, u32 vector_index, u32 n_key_u32s)
-{
-  i32 n_left;
-  u32x a, b, c;
-  vhash_hashed_key_t *hk =
-    vec_elt_at_index (h->hash_work_space, vector_index);
-
-  if (n_key_u32s <= 3)
-    {
-      a = h->hash_seeds[0].as_u32x4;
-      b = h->hash_seeds[1].as_u32x4;
-      c = h->hash_seeds[2].as_u32x4;
-      n_left = n_key_u32s;
-    }
-  else
-    {
-      a = hk->hashed_key[0].as_u32x4;
-      b = hk->hashed_key[1].as_u32x4;
-      c = hk->hashed_key[2].as_u32x4;
-      n_left = 3;
-    }
-
-  if (n_left > 0)
-    a += vhash_get_key_word_u32x (h, 0, vector_index);
-  if (n_left > 1)
-    b += vhash_get_key_word_u32x (h, 1, vector_index);
-  if (n_left > 2)
-    c += vhash_get_key_word_u32x (h, 2, vector_index);
-
-  hash_v3_finalize_u32x (a, b, c);
-
-  /* Only save away last 32 bits of hash code. */
-  hk->hashed_key[2].as_u32x4 = c;
-
-  /* Prefetch buckets.  This costs a bit for small tables but saves
-     big for large ones. */
-  {
-    vhash_search_bucket_t *b0, *b1, *b2, *b3;
-    u32x4_union_t kh;
-
-    kh.as_u32x4 = vhash_get_4_search_bucket_byte_offsets (h, c, n_key_u32s);
-    hk->hashed_key[1].as_u32x4 = kh.as_u32x4;
-
-    b0 = (void *) h->search_buckets + kh.as_u32[0];
-    b1 = (void *) h->search_buckets + kh.as_u32[1];
-    b2 = (void *) h->search_buckets + kh.as_u32[2];
-    b3 = (void *) h->search_buckets + kh.as_u32[3];
-
-    CLIB_PREFETCH (b0, sizeof (b0[0]) + n_key_u32s * sizeof (b0->key[0]),
-		   READ);
-    CLIB_PREFETCH (b1, sizeof (b1[0]) + n_key_u32s * sizeof (b1->key[0]),
-		   READ);
-    CLIB_PREFETCH (b2, sizeof (b2[0]) + n_key_u32s * sizeof (b2->key[0]),
-		   READ);
-    CLIB_PREFETCH (b3, sizeof (b3[0]) + n_key_u32s * sizeof (b3->key[0]),
-		   READ);
-  }
-}
-
-always_inline u32
-vhash_merge_results (u32x4 r)
-{
-  r = r | u32x4_word_shift_right (r, 2);
-  r = r | u32x4_word_shift_right (r, 1);
-  return u32x4_get0 (r);
-}
-
-/* Bucket is full if none of its 4 results are 0. */
-always_inline u32
-vhash_search_bucket_is_full (u32x4 r)
-{
-  return u32x4_zero_byte_mask (r) == 0;
-}
-
-always_inline u32
-vhash_non_empty_result_index (u32x4 x)
-{
-  u32 empty_mask = u32x4_zero_byte_mask (x);
-  ASSERT (empty_mask != 0xffff);
-  return min_log2 (0xffff & ~empty_mask) / 4;
-}
-
-always_inline u32
-vhash_empty_result_index (u32x4 x)
-{
-  u32 empty_mask = u32x4_zero_byte_mask (x);
-  ASSERT (empty_mask != 0);
-  return min_log2 (0xffff & empty_mask) / 4;
-}
-
-always_inline u32x4
-vhash_bucket_compare (vhash_t * h,
-		      u32x4_union_t * bucket, u32 key_word_index, u32 vi)
-{
-  u32 k = vhash_get_key_word (h, key_word_index, vi);
-  u32x4 x = { k, k, k, k };
-  return u32x4_is_equal (bucket[key_word_index].as_u32x4, x);
-}
-
-#define vhash_bucket_compare_4(h,wi,vi,b0,b1,b2,b3,cmp0,cmp1,cmp2,cmp3)	\
-do {									\
-  u32x4 _k4 = vhash_get_key_word_u32x ((h), (wi), (vi));		\
-  u32x4 _k0 = u32x4_splat_word (_k4, 0);				\
-  u32x4 _k1 = u32x4_splat_word (_k4, 1);				\
-  u32x4 _k2 = u32x4_splat_word (_k4, 2);				\
-  u32x4 _k3 = u32x4_splat_word (_k4, 3);				\
-									\
-  cmp0 = u32x4_is_equal (b0->key[wi].as_u32x4, _k0);			\
-  cmp1 = u32x4_is_equal (b1->key[wi].as_u32x4, _k1);			\
-  cmp2 = u32x4_is_equal (b2->key[wi].as_u32x4, _k2);			\
-  cmp3 = u32x4_is_equal (b3->key[wi].as_u32x4, _k3);			\
-} while (0)
-
-u32 vhash_get_overflow (vhash_t * h, u32 key_hash, u32 vi, u32 n_key_u32s);
-
-always_inline void
-vhash_get_stage (vhash_t * h,
-		 u32 vector_index,
-		 u32 n_vectors,
-		 vhash_result_function_t result_function,
-		 void *state, u32 n_key_u32s)
-{
-  u32 i, j;
-  vhash_hashed_key_t *hk =
-    vec_elt_at_index (h->hash_work_space, vector_index);
-  vhash_search_bucket_t *b;
-
-  for (i = 0; i < n_vectors; i++)
-    {
-      u32 vi = vector_index * 4 + i;
-      u32 key_hash = hk->hashed_key[2].as_u32[i];
-      u32 result;
-      u32x4 r, r0;
-
-      b = vhash_get_search_bucket (h, key_hash, n_key_u32s);
-
-      r = r0 = b->result.as_u32x4;
-      for (j = 0; j < n_key_u32s; j++)
-	r &= vhash_bucket_compare (h, &b->key[0], j, vi);
-
-      /* At this point only one of 4 results should be non-zero.
-         So we can or all 4 together and get the valid result (if there is one). */
-      result = vhash_merge_results (r);
-
-      if (!result && vhash_search_bucket_is_full (r0))
-	result = vhash_get_overflow (h, key_hash, vi, n_key_u32s);
-
-      result_function (state, vi, result - 1, n_key_u32s);
-    }
-}
-
-always_inline void
-vhash_get_4_stage (vhash_t * h,
-		   u32 vector_index,
-		   vhash_4result_function_t result_function,
-		   void *state, u32 n_key_u32s)
-{
-  u32 i, vi;
-  vhash_hashed_key_t *hk =
-    vec_elt_at_index (h->hash_work_space, vector_index);
-  vhash_search_bucket_t *b0, *b1, *b2, *b3;
-  u32x4 r0, r1, r2, r3, r0_before, r1_before, r2_before, r3_before;
-  u32x4_union_t kh;
-
-  kh.as_u32x4 = hk->hashed_key[1].as_u32x4;
-
-  b0 = (void *) h->search_buckets + kh.as_u32[0];
-  b1 = (void *) h->search_buckets + kh.as_u32[1];
-  b2 = (void *) h->search_buckets + kh.as_u32[2];
-  b3 = (void *) h->search_buckets + kh.as_u32[3];
-
-  r0 = r0_before = b0->result.as_u32x4;
-  r1 = r1_before = b1->result.as_u32x4;
-  r2 = r2_before = b2->result.as_u32x4;
-  r3 = r3_before = b3->result.as_u32x4;
-
-  vi = vector_index * 4;
-
-  for (i = 0; i < n_key_u32s; i++)
-    {
-      u32x4 c0, c1, c2, c3;
-      vhash_bucket_compare_4 (h, i, vector_index,
-			      b0, b1, b2, b3, c0, c1, c2, c3);
-      r0 &= c0;
-      r1 &= c1;
-      r2 &= c2;
-      r3 &= c3;
-    }
-
-  u32x4_transpose (r0, r1, r2, r3);
-
-  /* Gather together 4 results. */
-  {
-    u32x4_union_t r;
-    u32x4 ones = { 1, 1, 1, 1 };
-    u32 not_found_mask;
-
-    r.as_u32x4 = r0 | r1 | r2 | r3;
-    not_found_mask = u32x4_zero_byte_mask (r.as_u32x4);
-    not_found_mask &= ((vhash_search_bucket_is_full (r0_before) << (4 * 0))
-		       | (vhash_search_bucket_is_full (r1_before) << (4 * 1))
-		       | (vhash_search_bucket_is_full (r2_before) << (4 * 2))
-		       | (vhash_search_bucket_is_full (r3_before) <<
-			  (4 * 3)));
-    if (not_found_mask)
-      {
-	u32x4_union_t key_hash;
-
-	key_hash.as_u32x4 =
-	  hk->hashed_key[2].as_u32x4 & h->bucket_mask.as_u32x4;
-
-	/* Slow path: one of the buckets may have been full and we need to search overflow. */
-	if (not_found_mask & (1 << (4 * 0)))
-	  r.as_u32[0] = vhash_get_overflow (h, key_hash.as_u32[0],
-					    vi + 0, n_key_u32s);
-	if (not_found_mask & (1 << (4 * 1)))
-	  r.as_u32[1] = vhash_get_overflow (h, key_hash.as_u32[1],
-					    vi + 1, n_key_u32s);
-	if (not_found_mask & (1 << (4 * 2)))
-	  r.as_u32[2] = vhash_get_overflow (h, key_hash.as_u32[2],
-					    vi + 2, n_key_u32s);
-	if (not_found_mask & (1 << (4 * 3)))
-	  r.as_u32[3] = vhash_get_overflow (h, key_hash.as_u32[3],
-					    vi + 3, n_key_u32s);
-      }
-
-    result_function (state, vi, r.as_u32x4 - ones, n_key_u32s);
-  }
-}
-
-u32
-vhash_set_overflow (vhash_t * h,
-		    u32 key_hash, u32 vi, u32 new_result, u32 n_key_u32s);
-
-always_inline void
-vhash_set_stage (vhash_t * h,
-		 u32 vector_index,
-		 u32 n_vectors,
-		 vhash_result_function_t result_function,
-		 void *state, u32 n_key_u32s)
-{
-  u32 i, j, n_new_elts = 0;
-  vhash_hashed_key_t *hk =
-    vec_elt_at_index (h->hash_work_space, vector_index);
-  vhash_search_bucket_t *b;
-
-  for (i = 0; i < n_vectors; i++)
-    {
-      u32 vi = vector_index * 4 + i;
-      u32 key_hash = hk->hashed_key[2].as_u32[i];
-      u32 old_result, new_result;
-      u32 i_set;
-      u32x4 r, r0, cmp;
-
-      b = vhash_get_search_bucket (h, key_hash, n_key_u32s);
-
-      cmp = vhash_bucket_compare (h, &b->key[0], 0, vi);
-      for (j = 1; j < n_key_u32s; j++)
-	cmp &= vhash_bucket_compare (h, &b->key[0], j, vi);
-
-      r0 = b->result.as_u32x4;
-      r = r0 & cmp;
-
-      /* At this point only one of 4 results should be non-zero.
-         So we can or all 4 together and get the valid result (if there is one). */
-      old_result = vhash_merge_results (r);
-
-      if (!old_result && vhash_search_bucket_is_full (r0))
-	old_result = vhash_get_overflow (h, key_hash, vi, n_key_u32s);
-
-      /* Get new result; possibly do something with old result. */
-      new_result = result_function (state, vi, old_result - 1, n_key_u32s);
-
-      /* User cannot use ~0 as a hash result since a result of 0 is
-         used to mark unused bucket entries. */
-      ASSERT (new_result + 1 != 0);
-      new_result += 1;
-
-      /* Set over-writes existing result. */
-      if (old_result)
-	{
-	  i_set = vhash_non_empty_result_index (r);
-	  b->result.as_u32[i_set] = new_result;
-	}
-      else
-	{
-	  /* Set allocates new result. */
-	  u32 valid_mask;
-
-	  valid_mask = (((b->result.as_u32[0] != 0) << 0)
-			| ((b->result.as_u32[1] != 0) << 1)
-			| ((b->result.as_u32[2] != 0) << 2)
-			| ((b->result.as_u32[3] != 0) << 3));
-
-	  /* Rotate 4 bit valid mask so that key_hash corresponds to bit 0. */
-	  i_set = key_hash & 3;
-	  valid_mask =
-	    ((valid_mask >> i_set) | (valid_mask << (4 - i_set))) & 0xf;
-
-	  /* Insert into first empty position in bucket after key_hash. */
-	  i_set = (i_set + h->find_first_zero_table[valid_mask]) & 3;
-
-	  if (valid_mask != 0xf)
-	    {
-	      n_new_elts += 1;
-
-	      b->result.as_u32[i_set] = new_result;
-
-	      /* Insert new key into search bucket. */
-	      for (j = 0; j < n_key_u32s; j++)
-		b->key[j].as_u32[i_set] = vhash_get_key_word (h, j, vi);
-	    }
-	  else
-	    vhash_set_overflow (h, key_hash, vi, new_result, n_key_u32s);
-	}
-    }
-
-  h->n_elts += n_new_elts;
-}
-
-u32 vhash_unset_overflow (vhash_t * h, u32 key_hash, u32 vi, u32 n_key_u32s);
-
-void
-vhash_unset_refill_from_overflow (vhash_t * h,
-				  vhash_search_bucket_t * b,
-				  u32 key_hash, u32 n_key_u32s);
-
-/* Note: Eliot tried doing 4 unsets at once and could not get a speed up
-   and abandoned vhash_unset_4_stage. */
-always_inline void
-vhash_unset_stage (vhash_t * h,
-		   u32 vector_index,
-		   u32 n_vectors,
-		   vhash_result_function_t result_function,
-		   void *state, u32 n_key_u32s)
-{
-  u32 i, j, n_elts_unset = 0;
-  vhash_hashed_key_t *hk =
-    vec_elt_at_index (h->hash_work_space, vector_index);
-  vhash_search_bucket_t *b;
-
-  for (i = 0; i < n_vectors; i++)
-    {
-      u32 vi = vector_index * 4 + i;
-      u32 key_hash = hk->hashed_key[2].as_u32[i];
-      u32 old_result;
-      u32x4 cmp, r0;
-
-      b = vhash_get_search_bucket (h, key_hash, n_key_u32s);
-
-      cmp = vhash_bucket_compare (h, &b->key[0], 0, vi);
-      for (j = 1; j < n_key_u32s; j++)
-	cmp &= vhash_bucket_compare (h, &b->key[0], j, vi);
-
-      r0 = b->result.as_u32x4;
-
-      /* At this point cmp is all ones where key matches and zero otherwise.
-         So, this will invalidate results for matching key and do nothing otherwise. */
-      b->result.as_u32x4 = r0 & ~cmp;
-
-      old_result = vhash_merge_results (r0 & cmp);
-
-      n_elts_unset += old_result != 0;
-
-      if (vhash_search_bucket_is_full (r0))
-	{
-	  if (old_result)
-	    vhash_unset_refill_from_overflow (h, b, key_hash, n_key_u32s);
-	  else
-	    old_result = vhash_unset_overflow (h, key_hash, vi, n_key_u32s);
-	}
-
-      result_function (state, vi, old_result - 1, n_key_u32s);
-    }
-  ASSERT (h->n_elts >= n_elts_unset);
-  h->n_elts -= n_elts_unset;
-}
-
-void vhash_init (vhash_t * h, u32 log2_n_keys, u32 n_key_u32,
-		 u32 * hash_seeds);
-
-void vhash_resize (vhash_t * old, u32 log2_n_keys);
-
-typedef struct
-{
-  vhash_t *vhash;
-
-  union
-  {
-    struct
-    {
-      u32 *keys;
-      u32 *results;
-    };
-
-    /* Vector layout for get keys. */
-    struct
-    {
-      u32x4_union_t *get_keys;
-      u32x4_union_t *get_results;
-    };
-  };
-
-  u32 n_vectors_div_4;
-  u32 n_vectors_mod_4;
-
-  u32 n_key_u32;
-
-  u32 n_keys;
-} vhash_main_t;
-
-always_inline u32
-vhash_get_alloc_keys (vhash_main_t * vm, u32 n_keys, u32 n_key_u32)
-{
-  u32 i, n;
-
-  i = vm->n_keys;
-  vm->n_keys = i + n_keys;
-
-  n = (round_pow2 (vm->n_keys, 4) / 4) * n_key_u32;
-
-  vec_validate_aligned (vm->get_keys, n - 1, sizeof (vm->get_keys[0]));
-  vec_validate_aligned (vm->get_results, n - 1, sizeof (vm->get_results[0]));
-
-  return i;
-}
-
-always_inline void
-vhash_get_set_key_word (vhash_main_t * vm, u32 vi, u32 wi, u32 n_key_u32,
-			u32 value)
-{
-  u32x4_union_t *k = vec_elt_at_index (vm->get_keys, (vi / 4) * n_key_u32);
-  ASSERT (wi < n_key_u32);
-  k[wi].as_u32[vi % 4] = value;
-}
-
-always_inline u32
-vhash_get_fetch_result (vhash_main_t * vm, u32 vi)
-{
-  u32x4_union_t *r = vec_elt_at_index (vm->get_results, vi / 4);
-  return r->as_u32[vi % 4];
-}
-
-void vhash_main_get (vhash_main_t * vm);
-
-always_inline u32
-vhash_set_alloc_keys (vhash_main_t * vm, u32 n_keys, u32 n_key_u32)
-{
-  u32 i;
-
-  i = vm->n_keys;
-  vm->n_keys = i + n_keys;
-
-  vec_resize (vm->keys, n_keys * n_key_u32);
-  vec_resize (vm->results, n_keys);
-
-  return i;
-}
-
-always_inline void
-vhash_set_set_key_word (vhash_main_t * vm, u32 vi, u32 wi, u32 n_key_u32,
-			u32 value)
-{
-  u32 *k = vec_elt_at_index (vm->keys, vi * n_key_u32);
-  ASSERT (wi < n_key_u32);
-  k[wi] = value;
-}
-
-always_inline void
-vhash_set_set_result (vhash_main_t * vm, u32 vi, u32 result)
-{
-  u32 *r = vec_elt_at_index (vm->results, vi);
-  r[0] = result;
-}
-
-always_inline u32
-vhash_set_fetch_old_result (vhash_main_t * vm, u32 vi)
-{
-  u32 *r = vec_elt_at_index (vm->results, vi);
-  return r[0];
-}
-
-void vhash_main_set (vhash_main_t * vm);
-
-always_inline u32
-vhash_unset_alloc_keys (vhash_main_t * vm, u32 n_keys, u32 n_key_u32)
-{
-  return vhash_set_alloc_keys (vm, n_keys, n_key_u32);
-}
-
-always_inline void
-vhash_unset_set_key_word (vhash_main_t * vm, u32 vi, u32 wi, u32 n_key_u32,
-			  u32 value)
-{
-  vhash_set_set_key_word (vm, vi, wi, n_key_u32, value);
-}
-
-always_inline void
-vhash_unset_set_result (vhash_main_t * vm, u32 vi, u32 result)
-{
-  vhash_set_set_result (vm, vi, result);
-}
-
-always_inline u32
-vhash_unset_fetch_old_result (vhash_main_t * vm, u32 vi)
-{
-  return vhash_set_fetch_old_result (vm, vi);
-}
-
-void vhash_main_unset (vhash_main_t * vm);
-
-typedef struct
-{
-  vhash_main_t new;
-
-  vhash_t *old;
-} vhash_resize_t;
-
-u32 vhash_resize_incremental (vhash_resize_t * vr, u32 vector_index,
-			      u32 n_vectors);
-
-#endif /* CLIB_HAVE_VEC128 */
-
-#endif /* included_clib_vhash_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vm_linux_kernel.h b/vppinfra/vppinfra/vm_linux_kernel.h
deleted file mode 100644
index fd9e6148..00000000
--- a/vppinfra/vppinfra/vm_linux_kernel.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_vm_linux_kernel_h
-#define included_vm_linux_kernel_h
-
-#include <linux/vmalloc.h>
-#include <linux/gfp.h>		/* for GFP_* */
-#include <asm/pgtable.h>	/* for PAGE_KERNEL */
-
-/* Allocate virtual address space. */
-always_inline void *
-clib_mem_vm_alloc (uword size)
-{
-  return vmalloc (size);
-}
-
-always_inline void
-clib_mem_vm_free (void *addr, uword size)
-{
-  vfree (addr);
-}
-
-always_inline void *
-clib_mem_vm_unmap (void *addr, uword size)
-{
-  return 0;
-}
-
-always_inline void *
-clib_mem_vm_map (void *addr, uword size)
-{
-  return addr;
-}
-
-#endif /* included_vm_linux_kernel_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vm_standalone.h b/vppinfra/vppinfra/vm_standalone.h
deleted file mode 100644
index 2cd431bc..00000000
--- a/vppinfra/vppinfra/vm_standalone.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_vm_standalone_h
-#define included_vm_standalone_h
-
-/* Stubs for standalone "system" which has no VM support. */
-
-always_inline void *
-clib_mem_vm_alloc (uword size)
-{
-  return 0;
-}
-
-always_inline void
-clib_mem_vm_free (void *addr, uword size)
-{
-}
-
-always_inline void *
-clib_mem_vm_unmap (void *addr, uword size)
-{
-  return 0;
-}
-
-always_inline void *
-clib_mem_vm_map (void *addr, uword size)
-{
-  return addr;
-}
-
-#endif /* included_vm_standalone_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/vm_unix.h b/vppinfra/vppinfra/vm_unix.h
deleted file mode 100644
index 07e86516..00000000
--- a/vppinfra/vppinfra/vm_unix.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_vm_unix_h
-#define included_vm_unix_h
-
-#include <unistd.h>
-#include <sys/mman.h>
-
-/* Allocate virtual address space. */
-always_inline void *
-clib_mem_vm_alloc (uword size)
-{
-  void *mmap_addr;
-  uword flags = MAP_PRIVATE;
-
-#ifdef MAP_ANONYMOUS
-  flags |= MAP_ANONYMOUS;
-#endif
-
-  mmap_addr = mmap (0, size, PROT_READ | PROT_WRITE, flags, -1, 0);
-  if (mmap_addr == (void *) -1)
-    mmap_addr = 0;
-
-  return mmap_addr;
-}
-
-always_inline void
-clib_mem_vm_free (void *addr, uword size)
-{
-  munmap (addr, size);
-}
-
-always_inline void *
-clib_mem_vm_unmap (void *addr, uword size)
-{
-  void *mmap_addr;
-  uword flags = MAP_PRIVATE | MAP_FIXED;
-
-  /* To unmap we "map" with no protection.  If we actually called
-     munmap then other callers could steal the address space.  By
-     changing to PROT_NONE the kernel can free up the pages which is
-     really what we want "unmap" to mean. */
-  mmap_addr = mmap (addr, size, PROT_NONE, flags, -1, 0);
-  if (mmap_addr == (void *) -1)
-    mmap_addr = 0;
-
-  return mmap_addr;
-}
-
-always_inline void *
-clib_mem_vm_map (void *addr, uword size)
-{
-  void *mmap_addr;
-  uword flags = MAP_PRIVATE | MAP_FIXED;
-
-  mmap_addr = mmap (addr, size, (PROT_READ | PROT_WRITE), flags, -1, 0);
-  if (mmap_addr == (void *) -1)
-    mmap_addr = 0;
-
-  return mmap_addr;
-}
-
-#endif /* included_vm_unix_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/xxhash.h b/vppinfra/vppinfra/xxhash.h
deleted file mode 100644
index ea1e21bf..00000000
--- a/vppinfra/vppinfra/xxhash.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Original license for the code used to construct
-  clib_xxhash(...).
-
-  xxHash - Fast Hash algorithm
-  Copyright (C) 2012-2014, Yann Collet.
-  BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are
-  met:
-
-  * Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the following disclaimer
-  in the documentation and/or other materials provided with the
-  distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef __included_xxhash_h__
-#define __included_xxhash_h__
-
-#define PRIME64_1 11400714785074694791ULL
-#define PRIME64_2 14029467366897019727ULL
-#define PRIME64_3  1609587929392839161ULL
-#define PRIME64_4  9650029242287828579ULL
-#define PRIME64_5  2870177450012600261ULL
-#define XXH_rotl64(x,r) ((x << r) | (x >> (64 - r)))
-
-static inline u64
-clib_xxhash (u64 key)
-{
-  u64 k1, h64;
-
-  k1 = key;
-  h64 = 0x9e3779b97f4a7c13LL + PRIME64_5 + 8;
-  k1 *= PRIME64_2;
-  k1 = XXH_rotl64 (k1, 31);
-  k1 *= PRIME64_1;
-  h64 ^= k1;
-  h64 = XXH_rotl64 (h64, 27) * PRIME64_1 + PRIME64_4;
-
-  h64 ^= h64 >> 33;
-  h64 *= PRIME64_2;
-  h64 ^= h64 >> 29;
-  h64 *= PRIME64_3;
-  h64 ^= h64 >> 32;
-  return h64;
-}
-
-#endif /* __included_xxhash_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/xy.h b/vppinfra/vppinfra/xy.h
deleted file mode 100644
index fb562161..00000000
--- a/vppinfra/vppinfra/xy.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* (X,Y) coordinates. */
-
-/*
-  Copyright (c) 2008 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_clib_xy_h
-#define included_clib_xy_h
-
-#include <vppinfra/types.h>
-
-/* Basic definitions: coordinates and points. */
-typedef double xy_float_t;
-typedef __complex__ double xy_t;
-typedef __complex__ int ixy_t;
-
-typedef __complex__ char i8xy_t;
-typedef __complex__ short i16xy_t;
-typedef __complex__ int i32xy_t;
-
-/* X/Y components of a point: can be used as either rvalue/lvalue. */
-#define xy_x(x) __real__ (x)
-#define xy_y(x) __imag__ (x)
-
-/* Unit vectors in x/y directions. */
-#define xy_x_unit_vector (1)
-#define xy_y_unit_vector (1I)
-
-#endif /* included_clib_xy_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/zvec.c b/vppinfra/vppinfra/zvec.c
deleted file mode 100644
index d062e5f7..00000000
--- a/vppinfra/vppinfra/zvec.c
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003, 2005 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <vppinfra/bitmap.h>
-#include <vppinfra/bitops.h>	/* for next_with_same_number_of_set_bits */
-#include <vppinfra/error.h>	/* for ASSERT */
-#include <vppinfra/mem.h>
-#include <vppinfra/os.h>	/* for os_panic */
-#include <vppinfra/vec.h>
-#include <vppinfra/zvec.h>
-
-/* Consider coding as bitmap, coding = 2^c_0 + 2^c_1 + ... + 2^c_n
-   With c_0 < c_1 < ... < c_n.  coding == 0 represents c_n = BITS (uword).
-
-   Unsigned integers i = 0 ... are represented as follows:
-
-       0 <= i < 2^c_0       	(i << 1) | (1 << 0) binary:   i 1
-   2^c_0 <= i < 2^c_0 + 2^c_1   (i << 2) | (1 << 1) binary: i 1 0
-   ...                                              binary: i 0 ... 0
-
-   Smaller numbers use less bits.  Coding is chosen so that encoding
-   of given histogram of typical values gives smallest number of bits.
-   The number and position of coding bits c_i are used to best fit the
-   histogram of typical values.
-*/
-
-/* Decode given compressed data.  Return number of compressed data
-   bits used. */
-uword
-zvec_decode (uword coding, uword zdata, uword * n_zdata_bits)
-{
-  uword c, d, result, n_bits;
-  uword explicit_end, implicit_end;
-
-  result = 0;
-  n_bits = 0;
-  while (1)
-    {
-      c = first_set (coding);
-      implicit_end = c == coding;
-      explicit_end = (zdata & 1) & ~implicit_end;
-      d = (zdata >> explicit_end) & (c - 1);
-      if (explicit_end | implicit_end)
-	{
-	  result += d;
-	  n_bits += min_log2 (c) + explicit_end;
-	  break;
-	}
-      n_bits += 1;
-      result += c;
-      coding ^= c;
-      zdata >>= 1;
-    }
-
-  if (coding == 0)
-    n_bits = BITS (uword);
-
-  *n_zdata_bits = n_bits;
-  return result;
-}
-
-uword
-zvec_encode (uword coding, uword data, uword * n_result_bits)
-{
-  uword c, shift, result;
-  uword explicit_end, implicit_end;
-
-  /* Data must be in range.  Note special coding == 0
-     would break for data - 1 <= coding. */
-  ASSERT (data <= coding - 1);
-
-  shift = 0;
-  while (1)
-    {
-      c = first_set (coding);
-      implicit_end = c == coding;
-      explicit_end = ((data & (c - 1)) == data);
-      if (explicit_end | implicit_end)
-	{
-	  uword t = explicit_end & ~implicit_end;
-	  result = ((data << t) | t) << shift;
-	  *n_result_bits =
-	    /* data bits */ (c == 0 ? BITS (uword) : min_log2 (c))
-	    /* shift bits */  + shift + t;
-	  return result;
-	}
-      data -= c;
-      coding ^= c;
-      shift++;
-    }
-
-  /* Never reached. */
-  ASSERT (0);
-  return ~0;
-}
-
-always_inline uword
-get_data (void *data, uword data_bytes, uword is_signed)
-{
-  if (data_bytes == 1)
-    return is_signed ? zvec_signed_to_unsigned (*(i8 *) data) : *(u8 *) data;
-  else if (data_bytes == 2)
-    return is_signed ? zvec_signed_to_unsigned (*(i16 *) data) : *(u16 *)
-      data;
-  else if (data_bytes == 4)
-    return is_signed ? zvec_signed_to_unsigned (*(i32 *) data) : *(u32 *)
-      data;
-  else if (data_bytes == 8)
-    return is_signed ? zvec_signed_to_unsigned (*(i64 *) data) : *(u64 *)
-      data;
-  else
-    {
-      os_panic ();
-      return ~0;
-    }
-}
-
-always_inline void
-put_data (void *data, uword data_bytes, uword is_signed, uword x)
-{
-  if (data_bytes == 1)
-    {
-      if (is_signed)
-	*(i8 *) data = zvec_unsigned_to_signed (x);
-      else
-	*(u8 *) data = x;
-    }
-  else if (data_bytes == 2)
-    {
-      if (is_signed)
-	*(i16 *) data = zvec_unsigned_to_signed (x);
-      else
-	*(u16 *) data = x;
-    }
-  else if (data_bytes == 4)
-    {
-      if (is_signed)
-	*(i32 *) data = zvec_unsigned_to_signed (x);
-      else
-	*(u32 *) data = x;
-    }
-  else if (data_bytes == 8)
-    {
-      if (is_signed)
-	*(i64 *) data = zvec_unsigned_to_signed (x);
-      else
-	*(u64 *) data = x;
-    }
-  else
-    {
-      os_panic ();
-    }
-}
-
-always_inline uword *
-zvec_encode_inline (uword * zvec,
-		    uword * zvec_n_bits,
-		    uword coding,
-		    void *data,
-		    uword data_stride,
-		    uword n_data, uword data_bytes, uword is_signed)
-{
-  uword i;
-
-  i = *zvec_n_bits;
-  while (n_data >= 1)
-    {
-      uword d0, z0, l0;
-
-      d0 = get_data (data + 0 * data_stride, data_bytes, is_signed);
-      data += 1 * data_stride;
-      n_data -= 1;
-
-      z0 = zvec_encode (coding, d0, &l0);
-      zvec = clib_bitmap_set_multiple (zvec, i, z0, l0);
-      i += l0;
-    }
-
-  *zvec_n_bits = i;
-  return zvec;
-}
-
-#define _(TYPE,IS_SIGNED)					\
-  uword * zvec_encode_##TYPE (uword * zvec,			\
-			      uword * zvec_n_bits,		\
-			      uword coding,			\
-			      void * data,			\
-			      uword data_stride,		\
-			      uword n_data)			\
-  {								\
-    return zvec_encode_inline (zvec, zvec_n_bits,		\
-			    coding,				\
-			    data, data_stride, n_data,		\
-			    /* data_bytes */ sizeof (TYPE),	\
-			    /* is_signed */ IS_SIGNED);		\
-  }
-
-_(u8, /* is_signed */ 0);
-_(u16, /* is_signed */ 0);
-_(u32, /* is_signed */ 0);
-_(u64, /* is_signed */ 0);
-_(i8, /* is_signed */ 1);
-_(i16, /* is_signed */ 1);
-_(i32, /* is_signed */ 1);
-_(i64, /* is_signed */ 1);
-
-#undef _
-
-always_inline uword
-coding_max_n_bits (uword coding)
-{
-  uword n_bits;
-  (void) zvec_decode (coding, 0, &n_bits);
-  return n_bits;
-}
-
-always_inline void
-zvec_decode_inline (uword * zvec,
-		    uword * zvec_n_bits,
-		    uword coding,
-		    void *data,
-		    uword data_stride,
-		    uword n_data, uword data_bytes, uword is_signed)
-{
-  uword i, n_max;
-
-  i = *zvec_n_bits;
-  n_max = coding_max_n_bits (coding);
-  while (n_data >= 1)
-    {
-      uword d0, z0, l0;
-
-      z0 = clib_bitmap_get_multiple (zvec, i, n_max);
-      d0 = zvec_decode (coding, z0, &l0);
-      i += l0;
-      put_data (data + 0 * data_stride, data_bytes, is_signed, d0);
-      data += 1 * data_stride;
-      n_data -= 1;
-    }
-  *zvec_n_bits = i;
-}
-
-#define _(TYPE,IS_SIGNED)					\
-  void zvec_decode_##TYPE (uword * zvec,			\
-			   uword * zvec_n_bits,			\
-			   uword coding,			\
-			   void * data,				\
-			   uword data_stride,			\
-			   uword n_data)			\
-  {								\
-    return zvec_decode_inline (zvec, zvec_n_bits,		\
-			       coding,				\
-			       data, data_stride, n_data,	\
-			       /* data_bytes */ sizeof (TYPE),	\
-			       /* is_signed */ IS_SIGNED);	\
-  }
-
-_(u8, /* is_signed */ 0);
-_(u16, /* is_signed */ 0);
-_(u32, /* is_signed */ 0);
-_(u64, /* is_signed */ 0);
-_(i8, /* is_signed */ 1);
-_(i16, /* is_signed */ 1);
-_(i32, /* is_signed */ 1);
-_(i64, /* is_signed */ 1);
-
-#undef _
-
-/* Compute number of bits needed to encode given histogram. */
-static uword
-zvec_coding_bits (uword coding, uword * histogram_counts, uword min_bits)
-{
-  uword n_type_bits, n_bits;
-  uword this_count, last_count, max_count_index;
-  uword i, b, l;
-
-  n_bits = 0;
-  n_type_bits = 1;
-  last_count = 0;
-  max_count_index = vec_len (histogram_counts) - 1;
-
-  /* Coding is not large enough to encode given data. */
-  if (coding <= max_count_index)
-    return ~0;
-
-  i = 0;
-  while (coding != 0)
-    {
-      b = first_set (coding);
-      l = min_log2 (b);
-      i += b;
-
-      this_count =
-	histogram_counts[i > max_count_index ? max_count_index : i - 1];
-
-      /* No more data to encode? */
-      if (this_count == last_count)
-	break;
-
-      /* Last coding is i 0 ... 0 so we don't need an extra type bit. */
-      if (coding == b)
-	n_type_bits--;
-
-      n_bits += (this_count - last_count) * (n_type_bits + l);
-
-      /* This coding cannot be minimal: so return. */
-      if (n_bits >= min_bits)
-	return ~0;
-
-      last_count = this_count;
-      coding ^= b;
-      n_type_bits++;
-    }
-
-  return n_bits;
-}
-
-uword
-_zvec_coding_from_histogram (void *histogram,
-			     uword histogram_len,
-			     uword histogram_elt_count_offset,
-			     uword histogram_elt_bytes,
-			     uword max_value_to_encode,
-			     zvec_coding_info_t * coding_return)
-{
-  uword coding, min_coding;
-  uword min_coding_bits, coding_bits;
-  uword i, n_bits_set, total_count;
-  uword *counts;
-  zvec_histogram_count_t *h_count = histogram + histogram_elt_count_offset;
-
-  if (histogram_len < 1)
-    {
-      coding_return->coding = 0;
-      coding_return->min_coding_bits = 0;
-      coding_return->n_data = 0;
-      coding_return->n_codes = 0;
-      coding_return->ave_coding_bits = 0;
-      return 0;
-    }
-
-  total_count = 0;
-  counts = vec_new (uword, histogram_len);
-  for (i = 0; i < histogram_len; i++)
-    {
-      zvec_histogram_count_t this_count = h_count[0];
-      total_count += this_count;
-      counts[i] = total_count;
-      h_count =
-	(zvec_histogram_count_t *) ((void *) h_count + histogram_elt_bytes);
-    }
-
-  min_coding = 0;
-  min_coding_bits = ~0;
-
-  {
-    uword base_coding =
-      max_value_to_encode !=
-      ~0 ? (1 + max_value_to_encode) : vec_len (counts);
-    uword max_coding = max_pow2 (2 * base_coding);
-
-    for (n_bits_set = 1; n_bits_set <= 8; n_bits_set++)
-      {
-	for (coding = pow2_mask (n_bits_set);
-	     coding < max_coding;
-	     coding = next_with_same_number_of_set_bits (coding))
-	  {
-	    coding_bits = zvec_coding_bits (coding, counts, min_coding_bits);
-	    if (coding_bits >= min_coding_bits)
-	      continue;
-	    min_coding_bits = coding_bits;
-	    min_coding = coding;
-	  }
-      }
-  }
-
-  if (coding_return)
-    {
-      coding_return->coding = min_coding;
-      coding_return->min_coding_bits = min_coding_bits;
-      coding_return->n_data = total_count;
-      coding_return->n_codes = vec_len (counts);
-      coding_return->ave_coding_bits =
-	(f64) min_coding_bits / (f64) total_count;
-    }
-
-  vec_free (counts);
-
-  return min_coding;
-}
-
-u8 *
-format_zvec_coding (u8 * s, va_list * args)
-{
-  zvec_coding_info_t *c = va_arg (*args, zvec_coding_info_t *);
-  return format (s,
-		 "zvec coding 0x%x, %d elts, %d codes, %d bits total, %.4f ave bits/code",
-		 c->coding, c->n_data, c->n_codes, c->min_coding_bits,
-		 c->ave_coding_bits);
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/vppinfra/vppinfra/zvec.h b/vppinfra/vppinfra/zvec.h
deleted file mode 100644
index 7d35a3fe..00000000
--- a/vppinfra/vppinfra/zvec.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
-  Copyright (c) 2001, 2002, 2003 Eliot Dresselhaus
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef included_zvec_h
-#define included_zvec_h
-
-#include <vppinfra/clib.h>
-#include <vppinfra/error.h>	/* for ASSERT */
-#include <vppinfra/format.h>
-
-/* zvec: compressed vectors.
-
-   Data is entropy coded with 32 bit "codings".
-
-   Consider coding as bitmap, coding = 2^c_0 + 2^c_1 + ... + 2^c_n
-   With c_0 < c_1 < ... < c_n.  coding == 0 represents c_n = BITS (uword).
-
-   Unsigned integers i = 0 ... are represented as follows:
-
-       0 <= i < 2^c_0       	(i << 1) | (1 << 0) binary:   i 1
-   2^c_0 <= i < 2^c_0 + 2^c_1   (i << 2) | (1 << 1) binary: i 1 0
-   ...                                              binary: i 0 ... 0
-
-   Smaller numbers use less bits.  Coding is chosen so that encoding
-   of given histogram of typical values gives smallest number of bits.
-   The number and position of coding bits c_i are used to best fit the
-   histogram of typical values.
-*/
-
-typedef struct
-{
-  /* Smallest coding for given histogram of typical data. */
-  u32 coding;
-
-  /* Number of data in histogram. */
-  u32 n_data;
-
-  /* Number of codes (unique values) in histogram. */
-  u32 n_codes;
-
-  /* Number of bits in smallest coding of data. */
-  u32 min_coding_bits;
-
-  /* Average number of bits per code. */
-  f64 ave_coding_bits;
-} zvec_coding_info_t;
-
-/* Encode/decode data. */
-uword zvec_encode (uword coding, uword data, uword * n_result_bits);
-uword zvec_decode (uword coding, uword zdata, uword * n_zdata_bits);
-
-format_function_t format_zvec_coding;
-
-typedef u32 zvec_histogram_count_t;
-
-#define zvec_coding_from_histogram(h,count_field,len,max_value_to_encode,zc) \
-  _zvec_coding_from_histogram ((h), (len),				\
-			       STRUCT_OFFSET_OF_VAR (h, count_field),	\
-			       sizeof (h[0]),				\
-			       max_value_to_encode,			\
-			       (zc))
-
-uword
-_zvec_coding_from_histogram (void *_histogram,
-			     uword histogram_len,
-			     uword histogram_elt_count_offset,
-			     uword histogram_elt_bytes,
-			     uword max_value_to_encode,
-			     zvec_coding_info_t * coding_info_return);
-
-#define _(TYPE,IS_SIGNED)						\
-  uword * zvec_encode_##TYPE (uword * zvec, uword * zvec_n_bits, uword coding, \
-			   void * data, uword data_stride, uword n_data);
-
-_(u8, /* is_signed */ 0);
-_(u16, /* is_signed */ 0);
-_(u32, /* is_signed */ 0);
-_(u64, /* is_signed */ 0);
-_(i8, /* is_signed */ 1);
-_(i16, /* is_signed */ 1);
-_(i32, /* is_signed */ 1);
-_(i64, /* is_signed */ 1);
-
-#undef _
-
-#define _(TYPE,IS_SIGNED)			\
-  void zvec_decode_##TYPE (uword * zvec,	\
-			   uword * zvec_n_bits,	\
-			   uword coding,	\
-			   void * data,		\
-			   uword data_stride,	\
-			   uword n_data)
-
-_(u8, /* is_signed */ 0);
-_(u16, /* is_signed */ 0);
-_(u32, /* is_signed */ 0);
-_(u64, /* is_signed */ 0);
-_(i8, /* is_signed */ 1);
-_(i16, /* is_signed */ 1);
-_(i32, /* is_signed */ 1);
-_(i64, /* is_signed */ 1);
-
-#undef _
-
-/* Signed <=> unsigned conversion.
-      -1, -2, -3, ... =>    1, 3, 5, ... odds
-   0, +1, +2, +3, ... => 0, 2, 4, 6, ... evens */
-always_inline uword
-zvec_signed_to_unsigned (word s)
-{
-  uword a = s < 0;
-  s = 2 * s + a;
-  return a ? -s : s;
-}
-
-always_inline word
-zvec_unsigned_to_signed (uword u)
-{
-  uword a = u & 1;
-  u >>= 1;
-  return a ? -u : u;
-}
-
-#endif /* included_zvec_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
-- 
cgit 1.2.3-korg


From 37d77e9edbf845de23d41c343c11b34a575761ff Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Wed, 28 Dec 2016 15:14:46 +0100
Subject: test: fix paths after source code move

Change-Id: I3100260bb697f9af2f73ad3777e8b27069c5babe
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile      | 5 ++---
 test/Makefile | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1b75779a..eeb9837a 100644
--- a/Makefile
+++ b/Makefile
@@ -223,10 +223,9 @@ define test
 	  BR=$(BR) \
 	  VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
 	  VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
-	  VPP_TEST_API_TEST_BIN=$(BR)/install-$(2)-native/vpp-api-test/bin/vpp_api_test \
-	  VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/plugins/lib64/vpp_plugins \
+	  VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
 	  VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
-	  LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp-api/lib64/ \
+	  LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \
 	  WS_ROOT=$(WS_ROOT) V=$(V) TEST=$(TEST) VPP_PYTHON_PREFIX=$(VPP_PYTHON_PREFIX) $(3)
 endef
 
diff --git a/test/Makefile b/test/Makefile
index 54fe0582..204afd38 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -30,7 +30,7 @@ $(PIP_PATCH_DONE): $(PIP_INSTALL_DONE)
 	@touch $@
 
 $(PAPI_INSTALL_DONE): $(PIP_PATCH_DONE)
-	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && cd $(WS_ROOT)/vpp-api/python && python setup.py install"
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && cd $(WS_ROOT)/src/vpp-api/python && python setup.py install"
 	@touch $@
 
 define retest-func
-- 
cgit 1.2.3-korg


From cb034b9b374927c7552e36dcbc306d8456b2a0cb Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Wed, 28 Dec 2016 18:38:59 +0100
Subject: Move java,lua api and remaining plugins to src/

Change-Id: I1c3b87e886603678368428ae56a6bd3327cbc90d
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 .gitignore                                         |   10 +-
 Makefile                                           |   21 +-
 build-data/packages/plugins.mk                     |   34 -
 build-data/packages/vnet.mk                        |   47 -
 build-data/packages/vpp-api.mk                     |    9 -
 build-data/platforms.mk                            |   20 +-
 build-data/platforms/vpp.mk                        |    4 +-
 build-data/platforms/vpp_lite.mk                   |    2 +-
 build-root/deb/debian/.gitignore                   |    4 +-
 build-root/deb/debian/control                      |   16 +-
 build-root/packages/tools.mk                       |    2 +-
 build-root/rpm/vpp.spec                            |   70 +-
 build-root/scripts/find-api-core-contents          |    2 +-
 build-root/scripts/find-dev-contents               |    8 +-
 build-root/scripts/find-plugins-contents           |    4 +-
 build-root/scripts/find-python-api-contents        |    8 -
 build-root/scripts/find-vpp-api-java-contents      |    8 +
 build-root/scripts/find-vpp-api-lua-contents       |    6 +
 build-root/scripts/find-vpp-api-python-contents    |    8 +
 doxygen/Makefile                                   |    7 +-
 plugins/Makefile.am                                |   15 -
 plugins/acl-plugin/Makefile.am                     |  114 --
 plugins/acl-plugin/acl/acl.api                     |  444 -----
 plugins/acl-plugin/acl/acl.c                       | 1901 -------------------
 plugins/acl-plugin/acl/acl.h                       |  148 --
 plugins/acl-plugin/acl/acl_all_api_h.h             |  321 ----
 plugins/acl-plugin/acl/acl_msg_enum.h              |   28 -
 plugins/acl-plugin/acl/acl_test.c                  | 1024 ----------
 .../fd/vpp/jvpp/acl/test/AclExpectedDumpData.java  |  135 --
 .../jvpp/io/fd/vpp/jvpp/acl/test/AclTestData.java  |  101 -
 .../io/fd/vpp/jvpp/acl/test/AclTestRequests.java   |  141 --
 .../io/fd/vpp/jvpp/acl/test/FutureApiTest.java     |   68 -
 .../acl/jvpp/io/fd/vpp/jvpp/acl/test/Readme.txt    |    1 -
 plugins/acl-plugin/acl/jvpp_acl.c                  |  124 --
 plugins/acl-plugin/acl/jvpp_acl.h                  |   45 -
 plugins/acl-plugin/acl/l2sess.c                    |  243 ---
 plugins/acl-plugin/acl/l2sess.h                    |  150 --
 plugins/acl-plugin/acl/l2sess_node.c               |  816 --------
 plugins/acl-plugin/acl/node_in.c                   |  168 --
 plugins/acl-plugin/acl/node_in.h                   |   12 -
 plugins/acl-plugin/acl/node_out.c                  |  175 --
 plugins/acl-plugin/acl/node_out.h                  |   12 -
 plugins/acl-plugin/configure.ac                    |   24 -
 plugins/acl-plugin/test/run-python                 |   28 -
 plugins/acl-plugin/test/run-scapy                  |   26 -
 plugins/acl-plugin/test/test_acl_plugin.py         |  118 --
 plugins/configure.ac                               |    5 -
 plugins/ioam-plugin/Makefile.am                    |  338 ----
 plugins/ioam-plugin/configure.ac                   |   25 -
 plugins/ioam-plugin/ioam/dir.dox                   |   18 -
 plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.c      |  232 ---
 plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.h      |   47 -
 plugins/ioam-plugin/ioam/encap/ip6_ioam_pot.c      |  276 ---
 plugins/ioam-plugin/ioam/encap/ip6_ioam_seqno.c    |  109 --
 plugins/ioam-plugin/ioam/encap/ip6_ioam_seqno.h    |   70 -
 .../ioam/encap/ip6_ioam_seqno_analyse.c            |  141 --
 plugins/ioam-plugin/ioam/encap/ip6_ioam_trace.c    |  438 -----
 .../ioam-plugin/ioam/export-common/ioam_export.h   |  616 ------
 .../export-vxlan-gpe/vxlan_gpe_ioam_export.api     |   42 -
 .../ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c  |  271 ---
 .../vxlan_gpe_ioam_export_all_api_h.h              |   16 -
 .../vxlan_gpe_ioam_export_msg_enum.h               |   28 -
 .../export-vxlan-gpe/vxlan_gpe_ioam_export_test.c  |  215 ---
 .../vxlan_gpe_ioam_export_thread.c                 |   49 -
 .../ioam/export-vxlan-gpe/vxlan_gpe_node.c         |  162 --
 plugins/ioam-plugin/ioam/export/ioam_export.api    |   42 -
 plugins/ioam-plugin/ioam/export/ioam_export.c      |  282 ---
 .../ioam/export/ioam_export_all_api_h.h            |   16 -
 .../ioam-plugin/ioam/export/ioam_export_msg_enum.h |   28 -
 plugins/ioam-plugin/ioam/export/ioam_export_test.c |  206 ---
 .../ioam-plugin/ioam/export/ioam_export_thread.c   |   38 -
 plugins/ioam-plugin/ioam/export/jvpp_ioam_export.c |  124 --
 plugins/ioam-plugin/ioam/export/jvpp_ioam_export.h |   45 -
 plugins/ioam-plugin/ioam/export/node.c             |  151 --
 plugins/ioam-plugin/ioam/ioam_plugin_doc.md        |  464 -----
 .../jvpp/ioamexport/test/IoamExportApiTest.java    |   56 -
 .../jvpp/io/fd/vpp/jvpp/ioamexport/test/Readme.txt |    1 -
 .../fd/vpp/jvpp/ioampot/test/IoamPotApiTest.java   |   75 -
 .../jvpp/io/fd/vpp/jvpp/ioampot/test/Readme.txt    |    1 -
 .../vpp/jvpp/ioamtrace/test/IoamTraceApiTest.java  |   77 -
 .../jvpp/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt  |    1 -
 plugins/ioam-plugin/ioam/lib-pot/jvpp_ioam_pot.c   |  124 --
 plugins/ioam-plugin/ioam/lib-pot/jvpp_ioam_pot.h   |   45 -
 plugins/ioam-plugin/ioam/lib-pot/math64.h          |  159 --
 plugins/ioam-plugin/ioam/lib-pot/pot.api           |  133 --
 plugins/ioam-plugin/ioam/lib-pot/pot_all_api_h.h   |   16 -
 plugins/ioam-plugin/ioam/lib-pot/pot_api.c         |  292 ---
 plugins/ioam-plugin/ioam/lib-pot/pot_msg_enum.h    |   28 -
 plugins/ioam-plugin/ioam/lib-pot/pot_test.c        |  365 ----
 plugins/ioam-plugin/ioam/lib-pot/pot_util.c        |  445 -----
 plugins/ioam-plugin/ioam/lib-pot/pot_util.h        |  195 --
 .../ioam-plugin/ioam/lib-trace/jvpp_ioam_trace.c   |  124 --
 .../ioam-plugin/ioam/lib-trace/jvpp_ioam_trace.h   |   45 -
 plugins/ioam-plugin/ioam/lib-trace/trace.api       |   92 -
 .../ioam-plugin/ioam/lib-trace/trace_all_api_h.h   |   16 -
 plugins/ioam-plugin/ioam/lib-trace/trace_api.c     |  252 ---
 .../ioam-plugin/ioam/lib-trace/trace_msg_enum.h    |   28 -
 plugins/ioam-plugin/ioam/lib-trace/trace_test.c    |  292 ---
 plugins/ioam-plugin/ioam/lib-trace/trace_util.c    |  206 ---
 plugins/ioam-plugin/ioam/lib-trace/trace_util.h    |  247 ---
 .../ioam-plugin/ioam/lib-vxlan-gpe/ioam_decap.c    |  223 ---
 .../ioam-plugin/ioam/lib-vxlan-gpe/ioam_encap.c    |  194 --
 plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_pop.c  |  353 ----
 .../ioam-plugin/ioam/lib-vxlan-gpe/ioam_transit.c  |  188 --
 .../ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe.api   |  181 --
 .../ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h       |   16 -
 .../ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_api.c |  378 ----
 .../ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c            |  773 --------
 .../ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h            |  183 --
 .../ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h     |   61 -
 .../ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c      |  552 ------
 .../ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h       |  172 --
 .../ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h        |   28 -
 .../ioam/lib-vxlan-gpe/vxlan_gpe_test.c            |  600 ------
 plugins/lb-plugin/Makefile.am                      |   55 -
 plugins/lb-plugin/configure.ac                     |    9 -
 plugins/lb-plugin/lb/api.c                         |  228 ---
 plugins/lb-plugin/lb/cli.c                         |  250 ---
 plugins/lb-plugin/lb/lb.api                        |   71 -
 plugins/lb-plugin/lb/lb.c                          |  844 ---------
 plugins/lb-plugin/lb/lb.h                          |  333 ----
 plugins/lb-plugin/lb/lb_test.c                     |  293 ---
 plugins/lb-plugin/lb/lbhash.h                      |  216 ---
 plugins/lb-plugin/lb/node.c                        |  419 -----
 plugins/lb-plugin/lb/refcount.c                    |   41 -
 plugins/lb-plugin/lb/refcount.h                    |   67 -
 plugins/lb-plugin/lb/util.c                        |   72 -
 plugins/lb-plugin/lb/util.h                        |   40 -
 plugins/lb-plugin/lb_plugin_doc.md                 |  141 --
 plugins/sample-plugin/Makefile.am                  |   56 -
 plugins/sample-plugin/configure.ac                 |    9 -
 plugins/sample-plugin/sample/node.c                |  295 ---
 plugins/sample-plugin/sample/sample.api            |   39 -
 plugins/sample-plugin/sample/sample.c              |  255 ---
 plugins/sample-plugin/sample/sample.h              |   40 -
 plugins/sample-plugin/sample/sample_all_api_h.h    |   16 -
 plugins/sample-plugin/sample/sample_msg_enum.h     |   28 -
 plugins/sample-plugin/sample/sample_test.c         |  213 ---
 plugins/snat-plugin/Makefile.am                    |  113 --
 plugins/snat-plugin/configure.ac                   |   32 -
 plugins/snat-plugin/snat/in2out.c                  | 1597 ----------------
 .../io/fd/vpp/jvpp/snat/test/CallbackApiTest.java  |   68 -
 .../snat/jvpp/io/fd/vpp/jvpp/snat/test/Readme.txt  |    1 -
 plugins/snat-plugin/snat/jvpp_snat.c               |  124 --
 plugins/snat-plugin/snat/jvpp_snat.h               |   45 -
 plugins/snat-plugin/snat/out2in.c                  | 1261 -------------
 plugins/snat-plugin/snat/snat.api                  |  283 ---
 plugins/snat-plugin/snat/snat.c                    | 1957 --------------------
 plugins/snat-plugin/snat/snat.h                    |  259 ---
 plugins/snat-plugin/snat/snat_all_api_h.h          |   19 -
 plugins/snat-plugin/snat/snat_msg_enum.h           |   31 -
 plugins/snat-plugin/snat/snat_test.c               |  602 ------
 src/Makefile.am                                    |   10 +-
 src/configure.ac                                   |   42 +-
 src/examples/sample-plugin/Makefile.am             |   56 +
 src/examples/sample-plugin/configure.ac            |    9 +
 src/examples/sample-plugin/sample/node.c           |  295 +++
 src/examples/sample-plugin/sample/sample.api       |   39 +
 src/examples/sample-plugin/sample/sample.c         |  255 +++
 src/examples/sample-plugin/sample/sample.h         |   40 +
 .../sample-plugin/sample/sample_all_api_h.h        |   16 +
 .../sample-plugin/sample/sample_msg_enum.h         |   28 +
 src/examples/sample-plugin/sample/sample_test.c    |  213 +++
 src/m4/ax_vpp_find_jdk8.m4                         |   29 +
 src/plugins/Makefile.am                            |   18 +
 src/plugins/acl.am                                 |   35 +
 src/plugins/acl/acl.api                            |  444 +++++
 src/plugins/acl/acl.c                              | 1901 +++++++++++++++++++
 src/plugins/acl/acl.h                              |  148 ++
 src/plugins/acl/acl_all_api_h.h                    |  321 ++++
 src/plugins/acl/acl_msg_enum.h                     |   28 +
 src/plugins/acl/acl_test.c                         | 1024 ++++++++++
 src/plugins/acl/l2sess.c                           |  243 +++
 src/plugins/acl/l2sess.h                           |  150 ++
 src/plugins/acl/l2sess_node.c                      |  816 ++++++++
 src/plugins/acl/node_in.c                          |  168 ++
 src/plugins/acl/node_in.h                          |   12 +
 src/plugins/acl/node_out.c                         |  175 ++
 src/plugins/acl/node_out.h                         |   12 +
 src/plugins/acl/test/run-python                    |   28 +
 src/plugins/acl/test/run-scapy                     |   26 +
 src/plugins/acl/test/test_acl_plugin.py            |  118 ++
 src/plugins/ioam.am                                |  150 ++
 src/plugins/ioam/dir.dox                           |   18 +
 src/plugins/ioam/encap/ip6_ioam_e2e.c              |  232 +++
 src/plugins/ioam/encap/ip6_ioam_e2e.h              |   47 +
 src/plugins/ioam/encap/ip6_ioam_pot.c              |  276 +++
 src/plugins/ioam/encap/ip6_ioam_seqno.c            |  109 ++
 src/plugins/ioam/encap/ip6_ioam_seqno.h            |   70 +
 src/plugins/ioam/encap/ip6_ioam_seqno_analyse.c    |  141 ++
 src/plugins/ioam/encap/ip6_ioam_trace.c            |  438 +++++
 src/plugins/ioam/export-common/ioam_export.h       |  616 ++++++
 .../export-vxlan-gpe/vxlan_gpe_ioam_export.api     |   42 +
 .../ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c  |  271 +++
 .../vxlan_gpe_ioam_export_all_api_h.h              |   16 +
 .../vxlan_gpe_ioam_export_msg_enum.h               |   28 +
 .../export-vxlan-gpe/vxlan_gpe_ioam_export_test.c  |  215 +++
 .../vxlan_gpe_ioam_export_thread.c                 |   49 +
 src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c |  162 ++
 src/plugins/ioam/export/ioam_export.api            |   42 +
 src/plugins/ioam/export/ioam_export.c              |  282 +++
 src/plugins/ioam/export/ioam_export_all_api_h.h    |   16 +
 src/plugins/ioam/export/ioam_export_msg_enum.h     |   28 +
 src/plugins/ioam/export/ioam_export_test.c         |  206 +++
 src/plugins/ioam/export/ioam_export_thread.c       |   38 +
 src/plugins/ioam/export/node.c                     |  151 ++
 src/plugins/ioam/ioam_plugin_doc.md                |  464 +++++
 src/plugins/ioam/lib-pot/math64.h                  |  159 ++
 src/plugins/ioam/lib-pot/pot.api                   |  133 ++
 src/plugins/ioam/lib-pot/pot_all_api_h.h           |   16 +
 src/plugins/ioam/lib-pot/pot_api.c                 |  292 +++
 src/plugins/ioam/lib-pot/pot_msg_enum.h            |   28 +
 src/plugins/ioam/lib-pot/pot_test.c                |  365 ++++
 src/plugins/ioam/lib-pot/pot_util.c                |  445 +++++
 src/plugins/ioam/lib-pot/pot_util.h                |  195 ++
 src/plugins/ioam/lib-trace/trace.api               |   92 +
 src/plugins/ioam/lib-trace/trace_all_api_h.h       |   16 +
 src/plugins/ioam/lib-trace/trace_api.c             |  252 +++
 src/plugins/ioam/lib-trace/trace_msg_enum.h        |   28 +
 src/plugins/ioam/lib-trace/trace_test.c            |  292 +++
 src/plugins/ioam/lib-trace/trace_util.c            |  206 +++
 src/plugins/ioam/lib-trace/trace_util.h            |  247 +++
 src/plugins/ioam/lib-vxlan-gpe/ioam_decap.c        |  223 +++
 src/plugins/ioam/lib-vxlan-gpe/ioam_encap.c        |  194 ++
 src/plugins/ioam/lib-vxlan-gpe/ioam_pop.c          |  353 ++++
 src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c      |  188 ++
 src/plugins/ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api  |  181 ++
 .../ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h       |   16 +
 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c     |  378 ++++
 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c    |  773 ++++++++
 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h    |  183 ++
 .../ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h     |   61 +
 .../ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c      |  552 ++++++
 .../ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h       |  172 ++
 .../ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h        |   28 +
 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c    |  600 ++++++
 src/plugins/lb.am                                  |   42 +
 src/plugins/lb/api.c                               |  228 +++
 src/plugins/lb/cli.c                               |  250 +++
 src/plugins/lb/lb.api                              |   71 +
 src/plugins/lb/lb.c                                |  844 +++++++++
 src/plugins/lb/lb.h                                |  333 ++++
 src/plugins/lb/lb_plugin_doc.md                    |  141 ++
 src/plugins/lb/lb_test.c                           |  293 +++
 src/plugins/lb/lbhash.h                            |  216 +++
 src/plugins/lb/node.c                              |  419 +++++
 src/plugins/lb/refcount.c                          |   41 +
 src/plugins/lb/refcount.h                          |   67 +
 src/plugins/lb/util.c                              |   72 +
 src/plugins/lb/util.h                              |   40 +
 src/plugins/snat.am                                |   33 +
 src/plugins/snat/in2out.c                          | 1597 ++++++++++++++++
 src/plugins/snat/out2in.c                          | 1261 +++++++++++++
 src/plugins/snat/snat.api                          |  283 +++
 src/plugins/snat/snat.c                            | 1957 ++++++++++++++++++++
 src/plugins/snat/snat.h                            |  259 +++
 src/plugins/snat/snat_all_api_h.h                  |   19 +
 src/plugins/snat/snat_msg_enum.h                   |   31 +
 src/plugins/snat/snat_test.c                       |  602 ++++++
 src/suffix-rules.mk                                |    6 +-
 src/tools/g2/configure.ac                          |   12 -
 src/tools/perftool/configure.ac                    |   12 -
 src/tools/vppapigen/configure.ac                   |   14 -
 src/vpp-api/java/Makefile.am                       |  199 ++
 src/vpp-api/java/Readme.txt                        |  236 +++
 .../fd/vpp/jvpp/acl/test/AclExpectedDumpData.java  |  135 ++
 .../io/fd/vpp/jvpp/acl/test/AclTestData.java       |  101 +
 .../io/fd/vpp/jvpp/acl/test/AclTestRequests.java   |  141 ++
 .../io/fd/vpp/jvpp/acl/test/FutureApiTest.java     |   68 +
 .../jvpp-acl/io/fd/vpp/jvpp/acl/test/Readme.txt    |    1 +
 src/vpp-api/java/jvpp-acl/jvpp_acl.c               |  124 ++
 src/vpp-api/java/jvpp-acl/jvpp_acl.h               |   45 +
 src/vpp-api/java/jvpp-common/jvpp_common.c         |   65 +
 src/vpp-api/java/jvpp-common/jvpp_common.h         |   67 +
 .../io/fd/vpp/jvpp/core/test/CallbackApiTest.java  |   96 +
 .../test/CallbackJVppFacadeNotificationTest.java   |   87 +
 .../vpp/jvpp/core/test/CallbackJVppFacadeTest.java |  103 ++
 .../core/test/CallbackNotificationApiTest.java     |   94 +
 .../io/fd/vpp/jvpp/core/test/ControlPingTest.java  |   68 +
 .../vpp/jvpp/core/test/CreateSubInterfaceTest.java |  120 ++
 .../jvpp/core/test/FutureApiNotificationTest.java  |   55 +
 .../io/fd/vpp/jvpp/core/test/FutureApiTest.java    |  123 ++
 .../io/fd/vpp/jvpp/core/test/L2AclTest.java        |  195 ++
 .../fd/vpp/jvpp/core/test/LispAdjacencyTest.java   |  124 ++
 .../fd/vpp/jvpp/core/test/NotificationUtils.java   |   53 +
 .../jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt  |   17 +
 src/vpp-api/java/jvpp-core/jvpp_core.c             |  117 ++
 .../jvpp/ioamexport/test/IoamExportApiTest.java    |   56 +
 .../io/fd/vpp/jvpp/ioamexport/test/Readme.txt      |    1 +
 .../java/jvpp-ioamexport/jvpp_ioam_export.c        |  124 ++
 .../java/jvpp-ioamexport/jvpp_ioam_export.h        |   45 +
 .../fd/vpp/jvpp/ioampot/test/IoamPotApiTest.java   |   75 +
 .../io/fd/vpp/jvpp/ioampot/test/Readme.txt         |    1 +
 src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c      |  124 ++
 src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h      |   45 +
 .../vpp/jvpp/ioamtrace/test/IoamTraceApiTest.java  |   77 +
 .../io/fd/vpp/jvpp/ioamtrace/test/Readme.txt       |    1 +
 src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c  |  124 ++
 src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.h  |   45 +
 .../java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java    |   56 +
 .../jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java |   76 +
 .../io/fd/vpp/jvpp/JVppRegistryImpl.java           |  147 ++
 .../io/fd/vpp/jvpp/NativeLibraryLoader.java        |   73 +
 .../io/fd/vpp/jvpp/VppBaseCallException.java       |   60 +
 .../io/fd/vpp/jvpp/VppCallbackException.java       |   47 +
 .../io/fd/vpp/jvpp/VppConnection.java              |   45 +
 .../io/fd/vpp/jvpp/VppInvocationException.java     |   33 +
 .../io/fd/vpp/jvpp/VppJNIConnection.java           |  137 ++
 .../fd/vpp/jvpp/callback/ControlPingCallback.java  |   29 +
 .../io/fd/vpp/jvpp/callback/JVppCallback.java      |   29 +
 .../jvpp/callback/JVppNotificationCallback.java    |   24 +
 .../io/fd/vpp/jvpp/dto/ControlPing.java            |   34 +
 .../io/fd/vpp/jvpp/dto/ControlPingReply.java       |   58 +
 .../jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java |   24 +
 .../io/fd/vpp/jvpp/dto/JVppNotification.java       |   23 +
 .../io/fd/vpp/jvpp/dto/JVppReply.java              |   24 +
 .../io/fd/vpp/jvpp/dto/JVppReplyDump.java          |   25 +
 .../io/fd/vpp/jvpp/dto/JVppRequest.java            |   34 +
 .../vpp/jvpp/future/AbstractFutureJVppInvoker.java |  141 ++
 .../io/fd/vpp/jvpp/future/FutureJVppInvoker.java   |   49 +
 .../jvpp/notification/NotificationRegistry.java    |   25 +
 .../notification/NotificationRegistryProvider.java |   28 +
 .../io/fd/vpp/jvpp/test/ConnectionTest.java        |   44 +
 src/vpp-api/java/jvpp-registry/jvpp_registry.c     |  352 ++++
 .../io/fd/vpp/jvpp/snat/test/CallbackApiTest.java  |   68 +
 .../jvpp-snat/io/fd/vpp/jvpp/snat/test/Readme.txt  |    1 +
 src/vpp-api/java/jvpp-snat/jvpp_snat.c             |  124 ++
 src/vpp-api/java/jvpp-snat/jvpp_snat.h             |   45 +
 src/vpp-api/java/jvpp/gen/jvpp_gen.py              |  185 ++
 src/vpp-api/java/jvpp/gen/jvppgen/__init__.py      |    0
 src/vpp-api/java/jvpp/gen/jvppgen/callback_gen.py  |  105 ++
 src/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py       |  308 +++
 src/vpp-api/java/jvpp/gen/jvppgen/jni_gen.py       |  295 +++
 src/vpp-api/java/jvpp/gen/jvppgen/jvpp_c_gen.py    |  343 ++++
 .../jvpp/gen/jvppgen/jvpp_callback_facade_gen.py   |  324 ++++
 .../jvpp/gen/jvppgen/jvpp_future_facade_gen.py     |  331 ++++
 src/vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py |  219 +++
 .../java/jvpp/gen/jvppgen/notification_gen.py      |  199 ++
 src/vpp-api/java/jvpp/gen/jvppgen/types_gen.py     |  227 +++
 src/vpp-api/java/jvpp/gen/jvppgen/util.py          |  220 +++
 src/vpp-api/lua/README.md                          |   50 +
 src/vpp-api/lua/bench.lua                          |   70 +
 src/vpp-api/lua/examples/cli/README.md             |    5 +
 src/vpp-api/lua/examples/cli/lua-cli.lua           |  747 ++++++++
 src/vpp-api/lua/examples/example-acl-plugin.lua    |  110 ++
 src/vpp-api/lua/examples/example-classifier.lua    |   51 +
 src/vpp-api/lua/examples/example-cli.lua           |   44 +
 src/vpp-api/lua/examples/lute/README.md            |   66 +
 src/vpp-api/lua/examples/lute/lute.lua             |  777 ++++++++
 .../lua/examples/lute/script-inout-acl-noacl.lute  |  329 ++++
 .../lua/examples/lute/script-inout-acl-old.lute    |  329 ++++
 .../lua/examples/lute/script-inout-acl.lute        |  329 ++++
 src/vpp-api/lua/examples/lute/script.lute          |    7 +
 src/vpp-api/lua/examples/lute/sessions-acl.lute    |  308 +++
 src/vpp-api/lua/vpp-lapi.lua                       |  989 ++++++++++
 src/vpp.am                                         |    2 +-
 src/vppapigen.am                                   |    6 +-
 vpp-api/Makefile.am                                |    4 -
 vpp-api/configure.ac                               |   12 -
 vpp-api/java/Makefile.am                           |  116 --
 vpp-api/java/Readme.txt                            |  236 ---
 vpp-api/java/configure.ac                          |   24 -
 vpp-api/java/jvpp-common/jvpp_common.c             |   65 -
 vpp-api/java/jvpp-common/jvpp_common.h             |   67 -
 .../io/fd/vpp/jvpp/core/test/CallbackApiTest.java  |   96 -
 .../test/CallbackJVppFacadeNotificationTest.java   |   87 -
 .../vpp/jvpp/core/test/CallbackJVppFacadeTest.java |  103 --
 .../core/test/CallbackNotificationApiTest.java     |   94 -
 .../io/fd/vpp/jvpp/core/test/ControlPingTest.java  |   68 -
 .../vpp/jvpp/core/test/CreateSubInterfaceTest.java |  120 --
 .../jvpp/core/test/FutureApiNotificationTest.java  |   55 -
 .../io/fd/vpp/jvpp/core/test/FutureApiTest.java    |  123 --
 .../io/fd/vpp/jvpp/core/test/L2AclTest.java        |  195 --
 .../fd/vpp/jvpp/core/test/LispAdjacencyTest.java   |  124 --
 .../fd/vpp/jvpp/core/test/NotificationUtils.java   |   53 -
 .../jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt  |   17 -
 vpp-api/java/jvpp-core/jvpp_core.c                 |  117 --
 .../java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java    |   56 -
 .../jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java |   76 -
 .../io/fd/vpp/jvpp/JVppRegistryImpl.java           |  147 --
 .../io/fd/vpp/jvpp/NativeLibraryLoader.java        |   73 -
 .../io/fd/vpp/jvpp/VppBaseCallException.java       |   60 -
 .../io/fd/vpp/jvpp/VppCallbackException.java       |   47 -
 .../io/fd/vpp/jvpp/VppConnection.java              |   45 -
 .../io/fd/vpp/jvpp/VppInvocationException.java     |   33 -
 .../io/fd/vpp/jvpp/VppJNIConnection.java           |  137 --
 .../fd/vpp/jvpp/callback/ControlPingCallback.java  |   29 -
 .../io/fd/vpp/jvpp/callback/JVppCallback.java      |   29 -
 .../jvpp/callback/JVppNotificationCallback.java    |   24 -
 .../io/fd/vpp/jvpp/dto/ControlPing.java            |   34 -
 .../io/fd/vpp/jvpp/dto/ControlPingReply.java       |   58 -
 .../jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java |   24 -
 .../io/fd/vpp/jvpp/dto/JVppNotification.java       |   23 -
 .../io/fd/vpp/jvpp/dto/JVppReply.java              |   24 -
 .../io/fd/vpp/jvpp/dto/JVppReplyDump.java          |   25 -
 .../io/fd/vpp/jvpp/dto/JVppRequest.java            |   34 -
 .../vpp/jvpp/future/AbstractFutureJVppInvoker.java |  141 --
 .../io/fd/vpp/jvpp/future/FutureJVppInvoker.java   |   49 -
 .../jvpp/notification/NotificationRegistry.java    |   25 -
 .../notification/NotificationRegistryProvider.java |   28 -
 .../io/fd/vpp/jvpp/test/ConnectionTest.java        |   44 -
 vpp-api/java/jvpp-registry/jvpp_registry.c         |  352 ----
 vpp-api/java/jvpp/gen/jvpp_gen.py                  |  171 --
 vpp-api/java/jvpp/gen/jvppgen/__init__.py          |    0
 vpp-api/java/jvpp/gen/jvppgen/callback_gen.py      |  105 --
 vpp-api/java/jvpp/gen/jvppgen/dto_gen.py           |  308 ---
 vpp-api/java/jvpp/gen/jvppgen/jni_gen.py           |  295 ---
 vpp-api/java/jvpp/gen/jvppgen/jvpp_c_gen.py        |  343 ----
 .../jvpp/gen/jvppgen/jvpp_callback_facade_gen.py   |  324 ----
 .../jvpp/gen/jvppgen/jvpp_future_facade_gen.py     |  331 ----
 vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py     |  219 ---
 vpp-api/java/jvpp/gen/jvppgen/notification_gen.py  |  199 --
 vpp-api/java/jvpp/gen/jvppgen/types_gen.py         |  227 ---
 vpp-api/java/jvpp/gen/jvppgen/util.py              |  220 ---
 vpp-api/java/m4/ax_check_java_home.m4              |   80 -
 vpp-api/java/m4/ax_check_java_plugin.m4            |  101 -
 vpp-api/java/m4/ax_java_check_class.m4             |   85 -
 vpp-api/java/m4/ax_java_options.m4                 |   48 -
 vpp-api/java/m4/ax_libgcj_jar.m4                   |   83 -
 vpp-api/java/m4/ax_prog_jar.m4                     |   49 -
 vpp-api/java/m4/ax_prog_java.m4                    |  115 --
 vpp-api/java/m4/ax_prog_java_cc.m4                 |  104 --
 vpp-api/java/m4/ax_prog_java_works.m4              |  134 --
 vpp-api/java/m4/ax_prog_javac.m4                   |   79 -
 vpp-api/java/m4/ax_prog_javac_works.m4             |   72 -
 vpp-api/java/m4/ax_prog_javadoc.m4                 |   50 -
 vpp-api/java/m4/ax_prog_javah.m4                   |   64 -
 vpp-api/java/m4/ax_try_compile_java.m4             |   55 -
 vpp-api/java/m4/ax_try_run_java.m4                 |   56 -
 vpp-api/lua/README.md                              |   50 -
 vpp-api/lua/bench.lua                              |   70 -
 vpp-api/lua/examples/cli/README.md                 |    5 -
 vpp-api/lua/examples/cli/lua-cli.lua               |  747 --------
 vpp-api/lua/examples/example-acl-plugin.lua        |  110 --
 vpp-api/lua/examples/example-classifier.lua        |   51 -
 vpp-api/lua/examples/example-cli.lua               |   44 -
 vpp-api/lua/examples/lute/README.md                |   66 -
 vpp-api/lua/examples/lute/lute.lua                 |  777 --------
 .../lua/examples/lute/script-inout-acl-noacl.lute  |  329 ----
 .../lua/examples/lute/script-inout-acl-old.lute    |  329 ----
 vpp-api/lua/examples/lute/script-inout-acl.lute    |  329 ----
 vpp-api/lua/examples/lute/script.lute              |    7 -
 vpp-api/lua/examples/lute/sessions-acl.lute        |  308 ---
 vpp-api/lua/vpp-lapi.lua                           |  989 ----------
 444 files changed, 38673 insertions(+), 40252 deletions(-)
 delete mode 100644 build-data/packages/plugins.mk
 delete mode 100644 build-data/packages/vnet.mk
 delete mode 100644 build-data/packages/vpp-api.mk
 delete mode 100755 build-root/scripts/find-python-api-contents
 create mode 100755 build-root/scripts/find-vpp-api-java-contents
 create mode 100755 build-root/scripts/find-vpp-api-lua-contents
 create mode 100755 build-root/scripts/find-vpp-api-python-contents
 delete mode 100644 plugins/acl-plugin/Makefile.am
 delete mode 100644 plugins/acl-plugin/acl/acl.api
 delete mode 100644 plugins/acl-plugin/acl/acl.c
 delete mode 100644 plugins/acl-plugin/acl/acl.h
 delete mode 100644 plugins/acl-plugin/acl/acl_all_api_h.h
 delete mode 100644 plugins/acl-plugin/acl/acl_msg_enum.h
 delete mode 100644 plugins/acl-plugin/acl/acl_test.c
 delete mode 100644 plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/AclExpectedDumpData.java
 delete mode 100644 plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/AclTestData.java
 delete mode 100644 plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/AclTestRequests.java
 delete mode 100644 plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/FutureApiTest.java
 delete mode 100644 plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/Readme.txt
 delete mode 100644 plugins/acl-plugin/acl/jvpp_acl.c
 delete mode 100644 plugins/acl-plugin/acl/jvpp_acl.h
 delete mode 100644 plugins/acl-plugin/acl/l2sess.c
 delete mode 100644 plugins/acl-plugin/acl/l2sess.h
 delete mode 100644 plugins/acl-plugin/acl/l2sess_node.c
 delete mode 100644 plugins/acl-plugin/acl/node_in.c
 delete mode 100644 plugins/acl-plugin/acl/node_in.h
 delete mode 100644 plugins/acl-plugin/acl/node_out.c
 delete mode 100644 plugins/acl-plugin/acl/node_out.h
 delete mode 100644 plugins/acl-plugin/configure.ac
 delete mode 100755 plugins/acl-plugin/test/run-python
 delete mode 100755 plugins/acl-plugin/test/run-scapy
 delete mode 100644 plugins/acl-plugin/test/test_acl_plugin.py
 delete mode 100644 plugins/ioam-plugin/Makefile.am
 delete mode 100644 plugins/ioam-plugin/configure.ac
 delete mode 100644 plugins/ioam-plugin/ioam/dir.dox
 delete mode 100644 plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.c
 delete mode 100644 plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.h
 delete mode 100644 plugins/ioam-plugin/ioam/encap/ip6_ioam_pot.c
 delete mode 100644 plugins/ioam-plugin/ioam/encap/ip6_ioam_seqno.c
 delete mode 100644 plugins/ioam-plugin/ioam/encap/ip6_ioam_seqno.h
 delete mode 100644 plugins/ioam-plugin/ioam/encap/ip6_ioam_seqno_analyse.c
 delete mode 100644 plugins/ioam-plugin/ioam/encap/ip6_ioam_trace.c
 delete mode 100644 plugins/ioam-plugin/ioam/export-common/ioam_export.h
 delete mode 100644 plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
 delete mode 100644 plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
 delete mode 100644 plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h
 delete mode 100644 plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h
 delete mode 100644 plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
 delete mode 100644 plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
 delete mode 100644 plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_node.c
 delete mode 100644 plugins/ioam-plugin/ioam/export/ioam_export.api
 delete mode 100644 plugins/ioam-plugin/ioam/export/ioam_export.c
 delete mode 100644 plugins/ioam-plugin/ioam/export/ioam_export_all_api_h.h
 delete mode 100644 plugins/ioam-plugin/ioam/export/ioam_export_msg_enum.h
 delete mode 100644 plugins/ioam-plugin/ioam/export/ioam_export_test.c
 delete mode 100644 plugins/ioam-plugin/ioam/export/ioam_export_thread.c
 delete mode 100644 plugins/ioam-plugin/ioam/export/jvpp_ioam_export.c
 delete mode 100644 plugins/ioam-plugin/ioam/export/jvpp_ioam_export.h
 delete mode 100644 plugins/ioam-plugin/ioam/export/node.c
 delete mode 100644 plugins/ioam-plugin/ioam/ioam_plugin_doc.md
 delete mode 100644 plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamexport/test/IoamExportApiTest.java
 delete mode 100644 plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamexport/test/Readme.txt
 delete mode 100644 plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioampot/test/IoamPotApiTest.java
 delete mode 100644 plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioampot/test/Readme.txt
 delete mode 100644 plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamtrace/test/IoamTraceApiTest.java
 delete mode 100644 plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt
 delete mode 100644 plugins/ioam-plugin/ioam/lib-pot/jvpp_ioam_pot.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-pot/jvpp_ioam_pot.h
 delete mode 100644 plugins/ioam-plugin/ioam/lib-pot/math64.h
 delete mode 100644 plugins/ioam-plugin/ioam/lib-pot/pot.api
 delete mode 100644 plugins/ioam-plugin/ioam/lib-pot/pot_all_api_h.h
 delete mode 100644 plugins/ioam-plugin/ioam/lib-pot/pot_api.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-pot/pot_msg_enum.h
 delete mode 100644 plugins/ioam-plugin/ioam/lib-pot/pot_test.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-pot/pot_util.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-pot/pot_util.h
 delete mode 100644 plugins/ioam-plugin/ioam/lib-trace/jvpp_ioam_trace.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-trace/jvpp_ioam_trace.h
 delete mode 100644 plugins/ioam-plugin/ioam/lib-trace/trace.api
 delete mode 100644 plugins/ioam-plugin/ioam/lib-trace/trace_all_api_h.h
 delete mode 100644 plugins/ioam-plugin/ioam/lib-trace/trace_api.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-trace/trace_msg_enum.h
 delete mode 100644 plugins/ioam-plugin/ioam/lib-trace/trace_test.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-trace/trace_util.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-trace/trace_util.h
 delete mode 100644 plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_decap.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_encap.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_pop.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_transit.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe.api
 delete mode 100644 plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h
 delete mode 100644 plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h
 delete mode 100644 plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h
 delete mode 100644 plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c
 delete mode 100644 plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h
 delete mode 100644 plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h
 delete mode 100644 plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
 delete mode 100644 plugins/lb-plugin/Makefile.am
 delete mode 100644 plugins/lb-plugin/configure.ac
 delete mode 100644 plugins/lb-plugin/lb/api.c
 delete mode 100644 plugins/lb-plugin/lb/cli.c
 delete mode 100644 plugins/lb-plugin/lb/lb.api
 delete mode 100644 plugins/lb-plugin/lb/lb.c
 delete mode 100644 plugins/lb-plugin/lb/lb.h
 delete mode 100644 plugins/lb-plugin/lb/lb_test.c
 delete mode 100644 plugins/lb-plugin/lb/lbhash.h
 delete mode 100644 plugins/lb-plugin/lb/node.c
 delete mode 100644 plugins/lb-plugin/lb/refcount.c
 delete mode 100644 plugins/lb-plugin/lb/refcount.h
 delete mode 100644 plugins/lb-plugin/lb/util.c
 delete mode 100644 plugins/lb-plugin/lb/util.h
 delete mode 100644 plugins/lb-plugin/lb_plugin_doc.md
 delete mode 100644 plugins/sample-plugin/Makefile.am
 delete mode 100644 plugins/sample-plugin/configure.ac
 delete mode 100644 plugins/sample-plugin/sample/node.c
 delete mode 100644 plugins/sample-plugin/sample/sample.api
 delete mode 100644 plugins/sample-plugin/sample/sample.c
 delete mode 100644 plugins/sample-plugin/sample/sample.h
 delete mode 100644 plugins/sample-plugin/sample/sample_all_api_h.h
 delete mode 100644 plugins/sample-plugin/sample/sample_msg_enum.h
 delete mode 100644 plugins/sample-plugin/sample/sample_test.c
 delete mode 100644 plugins/snat-plugin/Makefile.am
 delete mode 100644 plugins/snat-plugin/configure.ac
 delete mode 100644 plugins/snat-plugin/snat/in2out.c
 delete mode 100644 plugins/snat-plugin/snat/jvpp/io/fd/vpp/jvpp/snat/test/CallbackApiTest.java
 delete mode 100644 plugins/snat-plugin/snat/jvpp/io/fd/vpp/jvpp/snat/test/Readme.txt
 delete mode 100644 plugins/snat-plugin/snat/jvpp_snat.c
 delete mode 100644 plugins/snat-plugin/snat/jvpp_snat.h
 delete mode 100644 plugins/snat-plugin/snat/out2in.c
 delete mode 100644 plugins/snat-plugin/snat/snat.api
 delete mode 100644 plugins/snat-plugin/snat/snat.c
 delete mode 100644 plugins/snat-plugin/snat/snat.h
 delete mode 100644 plugins/snat-plugin/snat/snat_all_api_h.h
 delete mode 100644 plugins/snat-plugin/snat/snat_msg_enum.h
 delete mode 100644 plugins/snat-plugin/snat/snat_test.c
 create mode 100644 src/examples/sample-plugin/Makefile.am
 create mode 100644 src/examples/sample-plugin/configure.ac
 create mode 100644 src/examples/sample-plugin/sample/node.c
 create mode 100644 src/examples/sample-plugin/sample/sample.api
 create mode 100644 src/examples/sample-plugin/sample/sample.c
 create mode 100644 src/examples/sample-plugin/sample/sample.h
 create mode 100644 src/examples/sample-plugin/sample/sample_all_api_h.h
 create mode 100644 src/examples/sample-plugin/sample/sample_msg_enum.h
 create mode 100644 src/examples/sample-plugin/sample/sample_test.c
 create mode 100644 src/m4/ax_vpp_find_jdk8.m4
 create mode 100644 src/plugins/acl.am
 create mode 100644 src/plugins/acl/acl.api
 create mode 100644 src/plugins/acl/acl.c
 create mode 100644 src/plugins/acl/acl.h
 create mode 100644 src/plugins/acl/acl_all_api_h.h
 create mode 100644 src/plugins/acl/acl_msg_enum.h
 create mode 100644 src/plugins/acl/acl_test.c
 create mode 100644 src/plugins/acl/l2sess.c
 create mode 100644 src/plugins/acl/l2sess.h
 create mode 100644 src/plugins/acl/l2sess_node.c
 create mode 100644 src/plugins/acl/node_in.c
 create mode 100644 src/plugins/acl/node_in.h
 create mode 100644 src/plugins/acl/node_out.c
 create mode 100644 src/plugins/acl/node_out.h
 create mode 100755 src/plugins/acl/test/run-python
 create mode 100755 src/plugins/acl/test/run-scapy
 create mode 100644 src/plugins/acl/test/test_acl_plugin.py
 create mode 100644 src/plugins/ioam.am
 create mode 100644 src/plugins/ioam/dir.dox
 create mode 100644 src/plugins/ioam/encap/ip6_ioam_e2e.c
 create mode 100644 src/plugins/ioam/encap/ip6_ioam_e2e.h
 create mode 100644 src/plugins/ioam/encap/ip6_ioam_pot.c
 create mode 100644 src/plugins/ioam/encap/ip6_ioam_seqno.c
 create mode 100644 src/plugins/ioam/encap/ip6_ioam_seqno.h
 create mode 100644 src/plugins/ioam/encap/ip6_ioam_seqno_analyse.c
 create mode 100644 src/plugins/ioam/encap/ip6_ioam_trace.c
 create mode 100644 src/plugins/ioam/export-common/ioam_export.h
 create mode 100644 src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
 create mode 100644 src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
 create mode 100644 src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h
 create mode 100644 src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h
 create mode 100644 src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
 create mode 100644 src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
 create mode 100644 src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c
 create mode 100644 src/plugins/ioam/export/ioam_export.api
 create mode 100644 src/plugins/ioam/export/ioam_export.c
 create mode 100644 src/plugins/ioam/export/ioam_export_all_api_h.h
 create mode 100644 src/plugins/ioam/export/ioam_export_msg_enum.h
 create mode 100644 src/plugins/ioam/export/ioam_export_test.c
 create mode 100644 src/plugins/ioam/export/ioam_export_thread.c
 create mode 100644 src/plugins/ioam/export/node.c
 create mode 100644 src/plugins/ioam/ioam_plugin_doc.md
 create mode 100644 src/plugins/ioam/lib-pot/math64.h
 create mode 100644 src/plugins/ioam/lib-pot/pot.api
 create mode 100644 src/plugins/ioam/lib-pot/pot_all_api_h.h
 create mode 100644 src/plugins/ioam/lib-pot/pot_api.c
 create mode 100644 src/plugins/ioam/lib-pot/pot_msg_enum.h
 create mode 100644 src/plugins/ioam/lib-pot/pot_test.c
 create mode 100644 src/plugins/ioam/lib-pot/pot_util.c
 create mode 100644 src/plugins/ioam/lib-pot/pot_util.h
 create mode 100644 src/plugins/ioam/lib-trace/trace.api
 create mode 100644 src/plugins/ioam/lib-trace/trace_all_api_h.h
 create mode 100644 src/plugins/ioam/lib-trace/trace_api.c
 create mode 100644 src/plugins/ioam/lib-trace/trace_msg_enum.h
 create mode 100644 src/plugins/ioam/lib-trace/trace_test.c
 create mode 100644 src/plugins/ioam/lib-trace/trace_util.c
 create mode 100644 src/plugins/ioam/lib-trace/trace_util.h
 create mode 100644 src/plugins/ioam/lib-vxlan-gpe/ioam_decap.c
 create mode 100644 src/plugins/ioam/lib-vxlan-gpe/ioam_encap.c
 create mode 100644 src/plugins/ioam/lib-vxlan-gpe/ioam_pop.c
 create mode 100644 src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c
 create mode 100644 src/plugins/ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api
 create mode 100644 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h
 create mode 100644 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
 create mode 100644 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
 create mode 100644 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h
 create mode 100644 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h
 create mode 100644 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c
 create mode 100644 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h
 create mode 100644 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h
 create mode 100644 src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
 create mode 100644 src/plugins/lb.am
 create mode 100644 src/plugins/lb/api.c
 create mode 100644 src/plugins/lb/cli.c
 create mode 100644 src/plugins/lb/lb.api
 create mode 100644 src/plugins/lb/lb.c
 create mode 100644 src/plugins/lb/lb.h
 create mode 100644 src/plugins/lb/lb_plugin_doc.md
 create mode 100644 src/plugins/lb/lb_test.c
 create mode 100644 src/plugins/lb/lbhash.h
 create mode 100644 src/plugins/lb/node.c
 create mode 100644 src/plugins/lb/refcount.c
 create mode 100644 src/plugins/lb/refcount.h
 create mode 100644 src/plugins/lb/util.c
 create mode 100644 src/plugins/lb/util.h
 create mode 100644 src/plugins/snat.am
 create mode 100644 src/plugins/snat/in2out.c
 create mode 100644 src/plugins/snat/out2in.c
 create mode 100644 src/plugins/snat/snat.api
 create mode 100644 src/plugins/snat/snat.c
 create mode 100644 src/plugins/snat/snat.h
 create mode 100644 src/plugins/snat/snat_all_api_h.h
 create mode 100644 src/plugins/snat/snat_msg_enum.h
 create mode 100644 src/plugins/snat/snat_test.c
 delete mode 100644 src/tools/g2/configure.ac
 delete mode 100644 src/tools/perftool/configure.ac
 delete mode 100644 src/tools/vppapigen/configure.ac
 create mode 100644 src/vpp-api/java/Makefile.am
 create mode 100644 src/vpp-api/java/Readme.txt
 create mode 100644 src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/AclExpectedDumpData.java
 create mode 100644 src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/AclTestData.java
 create mode 100644 src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/AclTestRequests.java
 create mode 100644 src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/FutureApiTest.java
 create mode 100644 src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/Readme.txt
 create mode 100644 src/vpp-api/java/jvpp-acl/jvpp_acl.c
 create mode 100644 src/vpp-api/java/jvpp-acl/jvpp_acl.h
 create mode 100644 src/vpp-api/java/jvpp-common/jvpp_common.c
 create mode 100644 src/vpp-api/java/jvpp-common/jvpp_common.h
 create mode 100644 src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java
 create mode 100644 src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeNotificationTest.java
 create mode 100644 src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeTest.java
 create mode 100644 src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackNotificationApiTest.java
 create mode 100644 src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/ControlPingTest.java
 create mode 100644 src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CreateSubInterfaceTest.java
 create mode 100644 src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiNotificationTest.java
 create mode 100644 src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java
 create mode 100644 src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/L2AclTest.java
 create mode 100644 src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/LispAdjacencyTest.java
 create mode 100644 src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/NotificationUtils.java
 create mode 100644 src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt
 create mode 100644 src/vpp-api/java/jvpp-core/jvpp_core.c
 create mode 100644 src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/IoamExportApiTest.java
 create mode 100644 src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/Readme.txt
 create mode 100644 src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c
 create mode 100644 src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.h
 create mode 100644 src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/IoamPotApiTest.java
 create mode 100644 src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/Readme.txt
 create mode 100644 src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
 create mode 100644 src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h
 create mode 100644 src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/IoamTraceApiTest.java
 create mode 100644 src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt
 create mode 100644 src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c
 create mode 100644 src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.h
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppNotification.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistry.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistryProvider.java
 create mode 100644 src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java
 create mode 100644 src/vpp-api/java/jvpp-registry/jvpp_registry.c
 create mode 100644 src/vpp-api/java/jvpp-snat/io/fd/vpp/jvpp/snat/test/CallbackApiTest.java
 create mode 100644 src/vpp-api/java/jvpp-snat/io/fd/vpp/jvpp/snat/test/Readme.txt
 create mode 100644 src/vpp-api/java/jvpp-snat/jvpp_snat.c
 create mode 100644 src/vpp-api/java/jvpp-snat/jvpp_snat.h
 create mode 100755 src/vpp-api/java/jvpp/gen/jvpp_gen.py
 create mode 100644 src/vpp-api/java/jvpp/gen/jvppgen/__init__.py
 create mode 100644 src/vpp-api/java/jvpp/gen/jvppgen/callback_gen.py
 create mode 100644 src/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py
 create mode 100644 src/vpp-api/java/jvpp/gen/jvppgen/jni_gen.py
 create mode 100644 src/vpp-api/java/jvpp/gen/jvppgen/jvpp_c_gen.py
 create mode 100644 src/vpp-api/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py
 create mode 100644 src/vpp-api/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py
 create mode 100644 src/vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py
 create mode 100644 src/vpp-api/java/jvpp/gen/jvppgen/notification_gen.py
 create mode 100644 src/vpp-api/java/jvpp/gen/jvppgen/types_gen.py
 create mode 100644 src/vpp-api/java/jvpp/gen/jvppgen/util.py
 create mode 100644 src/vpp-api/lua/README.md
 create mode 100644 src/vpp-api/lua/bench.lua
 create mode 100644 src/vpp-api/lua/examples/cli/README.md
 create mode 100644 src/vpp-api/lua/examples/cli/lua-cli.lua
 create mode 100644 src/vpp-api/lua/examples/example-acl-plugin.lua
 create mode 100644 src/vpp-api/lua/examples/example-classifier.lua
 create mode 100644 src/vpp-api/lua/examples/example-cli.lua
 create mode 100644 src/vpp-api/lua/examples/lute/README.md
 create mode 100644 src/vpp-api/lua/examples/lute/lute.lua
 create mode 100644 src/vpp-api/lua/examples/lute/script-inout-acl-noacl.lute
 create mode 100644 src/vpp-api/lua/examples/lute/script-inout-acl-old.lute
 create mode 100644 src/vpp-api/lua/examples/lute/script-inout-acl.lute
 create mode 100644 src/vpp-api/lua/examples/lute/script.lute
 create mode 100644 src/vpp-api/lua/examples/lute/sessions-acl.lute
 create mode 100644 src/vpp-api/lua/vpp-lapi.lua
 delete mode 100644 vpp-api/Makefile.am
 delete mode 100644 vpp-api/configure.ac
 delete mode 100644 vpp-api/java/Makefile.am
 delete mode 100644 vpp-api/java/Readme.txt
 delete mode 100644 vpp-api/java/configure.ac
 delete mode 100644 vpp-api/java/jvpp-common/jvpp_common.c
 delete mode 100644 vpp-api/java/jvpp-common/jvpp_common.h
 delete mode 100644 vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java
 delete mode 100644 vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeNotificationTest.java
 delete mode 100644 vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeTest.java
 delete mode 100644 vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackNotificationApiTest.java
 delete mode 100644 vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/ControlPingTest.java
 delete mode 100644 vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CreateSubInterfaceTest.java
 delete mode 100644 vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiNotificationTest.java
 delete mode 100644 vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java
 delete mode 100644 vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/L2AclTest.java
 delete mode 100644 vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/LispAdjacencyTest.java
 delete mode 100644 vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/NotificationUtils.java
 delete mode 100644 vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt
 delete mode 100644 vpp-api/java/jvpp-core/jvpp_core.c
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppNotification.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistry.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistryProvider.java
 delete mode 100644 vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java
 delete mode 100644 vpp-api/java/jvpp-registry/jvpp_registry.c
 delete mode 100755 vpp-api/java/jvpp/gen/jvpp_gen.py
 delete mode 100644 vpp-api/java/jvpp/gen/jvppgen/__init__.py
 delete mode 100644 vpp-api/java/jvpp/gen/jvppgen/callback_gen.py
 delete mode 100644 vpp-api/java/jvpp/gen/jvppgen/dto_gen.py
 delete mode 100644 vpp-api/java/jvpp/gen/jvppgen/jni_gen.py
 delete mode 100644 vpp-api/java/jvpp/gen/jvppgen/jvpp_c_gen.py
 delete mode 100644 vpp-api/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py
 delete mode 100644 vpp-api/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py
 delete mode 100644 vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py
 delete mode 100644 vpp-api/java/jvpp/gen/jvppgen/notification_gen.py
 delete mode 100644 vpp-api/java/jvpp/gen/jvppgen/types_gen.py
 delete mode 100644 vpp-api/java/jvpp/gen/jvppgen/util.py
 delete mode 100644 vpp-api/java/m4/ax_check_java_home.m4
 delete mode 100644 vpp-api/java/m4/ax_check_java_plugin.m4
 delete mode 100644 vpp-api/java/m4/ax_java_check_class.m4
 delete mode 100644 vpp-api/java/m4/ax_java_options.m4
 delete mode 100644 vpp-api/java/m4/ax_libgcj_jar.m4
 delete mode 100644 vpp-api/java/m4/ax_prog_jar.m4
 delete mode 100644 vpp-api/java/m4/ax_prog_java.m4
 delete mode 100644 vpp-api/java/m4/ax_prog_java_cc.m4
 delete mode 100644 vpp-api/java/m4/ax_prog_java_works.m4
 delete mode 100644 vpp-api/java/m4/ax_prog_javac.m4
 delete mode 100644 vpp-api/java/m4/ax_prog_javac_works.m4
 delete mode 100644 vpp-api/java/m4/ax_prog_javadoc.m4
 delete mode 100644 vpp-api/java/m4/ax_prog_javah.m4
 delete mode 100644 vpp-api/java/m4/ax_try_compile_java.m4
 delete mode 100644 vpp-api/java/m4/ax_try_run_java.m4
 delete mode 100644 vpp-api/lua/README.md
 delete mode 100644 vpp-api/lua/bench.lua
 delete mode 100644 vpp-api/lua/examples/cli/README.md
 delete mode 100644 vpp-api/lua/examples/cli/lua-cli.lua
 delete mode 100644 vpp-api/lua/examples/example-acl-plugin.lua
 delete mode 100644 vpp-api/lua/examples/example-classifier.lua
 delete mode 100644 vpp-api/lua/examples/example-cli.lua
 delete mode 100644 vpp-api/lua/examples/lute/README.md
 delete mode 100644 vpp-api/lua/examples/lute/lute.lua
 delete mode 100644 vpp-api/lua/examples/lute/script-inout-acl-noacl.lute
 delete mode 100644 vpp-api/lua/examples/lute/script-inout-acl-old.lute
 delete mode 100644 vpp-api/lua/examples/lute/script-inout-acl.lute
 delete mode 100644 vpp-api/lua/examples/lute/script.lute
 delete mode 100644 vpp-api/lua/examples/lute/sessions-acl.lute
 delete mode 100644 vpp-api/lua/vpp-lapi.lua

(limited to 'Makefile')

diff --git a/.gitignore b/.gitignore
index c12eedfb..61c407ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,11 +80,11 @@ GTAGS
 *.pyc
 
 # Python api generator
-/vpp-api/python/build
-/vpp-api/python/dist
-/vpp-api/python/vpp_papi.egg-info
-/vpp-api/python/vpp_papi/memclnt.py
-/vpp-api/python/vpp_papi/vpe.py
+/src/vpp-api/python/build
+/src/vpp-api/python/dist
+/src/vpp-api/python/vpp_papi.egg-info
+/src/vpp-api/python/vpp_papi/memclnt.py
+/src/vpp-api/python/vpp_papi/vpe.py
 
 # Build files in the test directory
 /test/*.ok
diff --git a/Makefile b/Makefile
index eeb9837a..9187404c 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ endif
 
 .PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
-.PHONY: ctags cscope plugins plugins-release build-vpp-api
+.PHONY: ctags cscope
 .PHONY: test test-debug retest retest-debug test-doc test-wipe-doc test-help test-wipe
 .PHONY: test-cov test-wipe-cov
 
@@ -69,8 +69,6 @@ help:
 	@echo " wipe-release        - wipe all products of release build "
 	@echo " build               - build debug binaries"
 	@echo " build-release       - build release binaries"
-	@echo " plugins             - build debug plugin binaries"
-	@echo " plugins-release     - build release plugin binaries"
 	@echo " rebuild             - wipe and build debug binares"
 	@echo " rebuild-release     - wipe and build release binares"
 	@echo " run                 - run debug binary"
@@ -83,8 +81,6 @@ help:
 	@echo " retest              - run functional tests"
 	@echo " retest-debug        - run functional tests (debug build)"
 	@echo " test-help           - show help on test framework"
-	@echo " build-vat           - build vpp-api-test tool"
-	@echo " build-vpp-api       - build vpp-api"
 	@echo " run-vat             - run vpp-api-test tool"
 	@echo " pkg-deb             - build DEB packages"
 	@echo " pkg-rpm             - build RPM packages"
@@ -206,19 +202,10 @@ wipe-release: $(BR)/.bootstrap.ok
 
 rebuild-release: wipe-release build-release
 
-plugins: $(BR)/.bootstrap.ok
-	$(call make,$(PLATFORM)_debug,plugins-install)
-
-plugins-release: $(BR)/.bootstrap.ok
-	$(call make,$(PLATFORM),plugins-install)
-
-build-vpp-api: $(BR)/.bootstrap.ok
-	$(call make,$(PLATFORM)_debug,vpp-api-install)
-
 VPP_PYTHON_PREFIX=$(BR)/python
 
 define test
-	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-api-install plugins-install vpp-install,)
+	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
 	make -C test \
 	  BR=$(BR) \
 	  VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
@@ -265,12 +252,12 @@ define run
 	@echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
 	@echo "         Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
 	@cd $(STARTUP_DIR) && \
-	  sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) plugin_path $(1)/plugins/lib64/vpp_plugins
+	  sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) plugin_path $(1)/vpp/lib64/vpp_plugins
 endef
 else
 define run
 	@cd $(STARTUP_DIR) && \
-	  sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(1)/plugins/lib64/vpp_plugins
+	  sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(1)/vpp/lib64/vpp_plugins
 endef
 endif
 
diff --git a/build-data/packages/plugins.mk b/build-data/packages/plugins.mk
deleted file mode 100644
index b4d67a28..00000000
--- a/build-data/packages/plugins.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-plugins_configure_depend = 			\
-    vpp-api-install				\
-    vpp-install
-
-plugins_CPPFLAGS = $(call installed_includes_fn, \
-    vpp  \
-    vpp-api)
-
-plugins_LDFLAGS = $(call installed_libs_fn,     \
-    vpp)
-
-ifeq ($($(PLATFORM)_enable_tests),yes)
-plugins_configure_args += --enable-tests
-endif
-
-# Platform dependent configure flags
-plugins_configure_args += $(plugins_configure_args_$(PLATFORM))
-
-# include & link with openssl only if needed
-ifneq ($($(PLATFORM)_uses_openssl),no)
-plugins_CPPFLAGS += $(call installed_includes_fn, openssl)
-plugins_LDFLAGS += $(call installed_libs_fn, openssl)
-endif
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-plugins_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-plugins_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-plugins_configure_depend += dpdk-install
-plugins_CPPFLAGS += $(call installed_includes_fn, dpdk)
-plugins_LDFLAGS += $(call installed_libs_fn, dpdk)
-endif
-endif
diff --git a/build-data/packages/vnet.mk b/build-data/packages/vnet.mk
deleted file mode 100644
index 57c444e8..00000000
--- a/build-data/packages/vnet.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-vnet_configure_depend = 			\
-    vppinfra-install 				\
-    svm-install					\
-    vlib-api-install 				\
-    vlib-install 
-
-vnet_CPPFLAGS = $(call installed_includes_fn, 	\
-    vppinfra 					\
-    svm						\
-    vlib 					\
-    vlib-api)
-
-vnet_LDFLAGS = $(call installed_libs_fn, 	\
-    vppinfra					\
-    svm						\
-    vlib					\
-    vlib-api)
-
-ifeq ($($(PLATFORM)_enable_tests),yes)
-vnet_configure_args += --enable-tests
-endif
-
-# Platform dependent configure flags
-vnet_configure_args += $(vnet_configure_args_$(PLATFORM))
-
-# include & link with openssl only if needed
-ifneq ($($(PLATFORM)_uses_openssl),no)
-vnet_CPPFLAGS += $(call installed_includes_fn, openssl)
-vnet_LDFLAGS += $(call installed_libs_fn, openssl)
-endif
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-vnet_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-vnet_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-vnet_configure_depend += dpdk-install
-vnet_CPPFLAGS += $(call installed_includes_fn, dpdk)
-vnet_LDFLAGS += $(call installed_libs_fn, dpdk)
-endif
-ifeq ($($(PLATFORM)_uses_dpdk_cryptodev),yes)
-vnet_configure_args += --with-dpdk-crypto
-endif
-ifeq ($($(PLATFORM)_uses_dpdk_mlx5_pmd),yes)
-vnet_configure_args += --with-dpdk-mlx5-pmd
-endif
-endif
diff --git a/build-data/packages/vpp-api.mk b/build-data/packages/vpp-api.mk
deleted file mode 100644
index d9e8d72e..00000000
--- a/build-data/packages/vpp-api.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-vpp-api_configure_depend =			\
-	vpp-install
-
-vpp-api_CPPFLAGS = $(call installed_includes_fn,	\
-	vpp)
-
-vpp-api_LDFLAGS =
-
-vpp-api_CPPFLAGS += -I/usr/lib/jvm/java-8-openjdk-amd64/include
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 88dd3ed8..6f21b6dc 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -25,7 +25,7 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 									\
 	: generate file manifests ;					\
 	find $(INSTALL_PREFIX)$(ARCH)/*/bin -type f -print		\
-	  | sed -e 's:.*:../& /usr/bin:'				\
+	  | sed -e 's:.*:../& /usr/bin:' | grep -v vppapigen		\
 	    > deb/debian/vpp.install ;					\
 									\
 	: core api definitions ;					\
@@ -51,9 +51,17 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	./scripts/find-plugins-contents $(INSTALL_PREFIX)$(ARCH)	\
 	 deb/debian/vpp-plugins.install ;				\
 									\
-	: python-api package ;						\
-	./scripts/find-python-api-contents $(INSTALL_PREFIX)$(ARCH)	\
-	 deb/debian/vpp-python-api.install ;				\
+	: vpp-api-lua package ;						\
+	./scripts/find-vpp-api-lua-contents $(INSTALL_PREFIX)$(ARCH)	\
+	 deb/debian/vpp-api-lua.install ;				\
+									\
+	: vpp-api-java package ;					\
+	./scripts/find-vpp-api-java-contents $(INSTALL_PREFIX)$(ARCH)	\
+	 deb/debian/vpp-api-java.install ;				\
+									\
+	: vpp-api-python package ;					\
+	./scripts/find-vpp-api-python-contents $(INSTALL_PREFIX)$(ARCH)	\
+	 deb/debian/vpp-api-python.install ;				\
 									\
 	: dpdk headers ;						\
 	./scripts/find-dpdk-contents $(INSTALL_PREFIX)$(ARCH)		\
@@ -70,9 +78,9 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	: dev package needs a couple of additions ;			\
 	echo ../build-tool-native/tools/vppapigen /usr/bin		\
 	   >> deb/debian/vpp-dev.install ;				\
-	echo ../../vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin		\
+	echo ../../src/vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin	\
 	   >> deb/debian/vpp-dev.install ;				\
-	for i in $$(ls ../vpp-api/java/jvpp/gen/jvppgen/*.py); do	\
+	for i in $$(ls ../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do	\
 	   echo ../$${i} /usr/lib/python2.7/dist-packages/jvppgen	\
 	       >> deb/debian/vpp-dev.install;				\
 	done;								\
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 513a4db4..c9a214ac 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -29,15 +29,13 @@ vpp_uses_dpdk = yes
 # Uncoment to enable building unit tests
 # vpp_enable_tests = yes
 
-vpp_root_packages = vpp vpp-api gmod plugins
+vpp_root_packages = vpp gmod
 
 vpp_configure_args_vpp = --with-dpdk
 
 # Set these parameters carefully. The vlib_buffer_t is 128 bytes, i.e.
 vlib_configure_args_vpp = --with-pre-data=128
 
-plugins_configure_args_vpp = --with-dpdk
-
 # DPDK configuration parameters
 # vpp_uses_dpdk_cryptodev = yes
 # vpp_uses_dpdk_mlx5_pmd = yes
diff --git a/build-data/platforms/vpp_lite.mk b/build-data/platforms/vpp_lite.mk
index 55805d10..a556b487 100644
--- a/build-data/platforms/vpp_lite.mk
+++ b/build-data/platforms/vpp_lite.mk
@@ -27,7 +27,7 @@ vpp_lite_uses_dpdk = no
 # Uncoment to enable building unit tests
 #vpp_lite_enable_tests = yes
 
-vpp_lite_root_packages = vpp vpp-api gmod
+vpp_lite_root_packages = vpp gmod
 
 vlib_configure_args_vpp_lite = --with-pre-data=128
 
diff --git a/build-root/deb/debian/.gitignore b/build-root/deb/debian/.gitignore
index 75d8fbbc..c5e915a8 100644
--- a/build-root/deb/debian/.gitignore
+++ b/build-root/deb/debian/.gitignore
@@ -11,4 +11,6 @@ vpp-dpdk-dev/
 vpp-dpdk-dkms/
 vpp-dbg/
 vppctl/
-vpp-python-api/
+vpp-api-lua/
+vpp-api-java/
+vpp-api-python/
diff --git a/build-root/deb/debian/control b/build-root/deb/debian/control
index 643774e3..de48c903 100644
--- a/build-root/deb/debian/control
+++ b/build-root/deb/debian/control
@@ -60,7 +60,21 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: DPDK 2.1 igb_uio_driver
  This package contains Linux kernel modules distributed with DPDK.
 
-Package: vpp-python-api
+Package: vpp-api-lua
+Architecture: any
+Depends: ${python:Depends}, ${misc:Depends}, vpp (= ${source:Version})
+Description: VPP LUA API bindings
+  This package contains VPP lua api bindings
+  .
+
+Package: vpp-api-java
+Architecture: any
+Depends: ${python:Depends}, ${misc:Depends}, vpp (= ${source:Version})
+Description: VPP Java API bindings
+  This package contains VPP java api bindings
+  .
+
+Package: vpp-api-python
 Architecture: any
 Depends: ${python:Depends}, ${misc:Depends}, vpp (= ${source:Version})
 Description: VPP Python API bindings
diff --git a/build-root/packages/tools.mk b/build-root/packages/tools.mk
index 506e024b..d64a7959 100644
--- a/build-root/packages/tools.mk
+++ b/build-root/packages/tools.mk
@@ -1,3 +1,3 @@
 tools_source = src
-tools_configure_args = --disable-vlib
+tools_configure_args = --disable-vlib --disable-svm --disable-japi
 
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index 654424c0..149ac51c 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -71,12 +71,28 @@ Requires: vpp = %{_version}-%{_release}
 %description plugins
 This package contains VPP plugins
 
-%package python-api
+%package api-lua
+Summary: VPP api lua bindings
+Group: Development/Libraries
+Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
+
+%description api-lua
+This package contains the lua bindings for the vpp api
+
+%package api-java
+Summary: VPP api java bindings
+Group: Development/Libraries
+Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
+
+%description api-java
+This package contains the java bindings for the vpp api
+
+%package api-python
 Summary: VPP api python bindings
 Group: Development/Libraries
 Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}, python-setuptools
 
-%description python-api
+%description api-python
 This package contains the python bindings for the vpp api
 
 %prep
@@ -131,6 +147,22 @@ do
 	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
 done
 
+# Lua bindings
+mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/cli
+mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/lute
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua && git ls-files .)
+do
+	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua/$file \
+	   %{buildroot}/usr/share/doc/vpp/examples/lua/$file
+done
+
+# Java bindings
+mkdir -p -m755 %{buildroot}/usr/share/java
+for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/java -type f -name '*.jar' -print )
+do
+	install -p -m 644 $file %{buildroot}/usr/share/java
+done
+
 # Python bindings
 mkdir -p -m755 %{buildroot}%{python2_sitelib}
 install -p -m 666 %{_mu_build_dir}/%{_vpp_install_dir}/*/lib/python2.7/site-packages/vpp_papi-*.egg %{buildroot}%{python2_sitelib}
@@ -151,16 +183,16 @@ do
 done
 
 mkdir -p -m755 %{buildroot}%{python2_sitelib}/jvppgen
-install -p -m755 %{_mu_build_dir}/../vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin
-for i in $(ls %{_mu_build_dir}/../vpp-api/java/jvpp/gen/jvppgen/*.py); do
+install -p -m755 %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin
+for i in $(ls %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do
    install -p -m666 ${i} %{buildroot}%{python2_sitelib}/jvppgen
 done;
 
 # sample plugin
 mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/sample
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../plugins/sample-plugin && git ls-files .)
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin && git ls-files .)
 do
-	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../plugins/sample-plugin/$file \
+	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin/$file \
 	   %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/$file
 done
 
@@ -170,24 +202,12 @@ done
 # 
 mkdir -p -m755 %{buildroot}/usr/lib/vpp_plugins
 mkdir -p -m755 %{buildroot}/usr/lib/vpp_api_test_plugins
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_plugins && find -type f -print)
-do
-        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_plugins/$file \
-           %{buildroot}/usr/lib/vpp_plugins/$file
-done
-
 for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins && find -type f -print)
 do
         install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins/$file \
            %{buildroot}/usr/lib/vpp_plugins/$file
 done
 
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins && find -type f -print)
-do
-        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins/$file \
-           %{buildroot}/usr/lib/vpp_api_test_plugins/$file
-done
-
 for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins && find -type f -print)
 do
         install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins/$file \
@@ -208,13 +228,13 @@ done
 sysctl --system
 %systemd_post vpp.service
 
-%post python-api
+%post api-python
 easy_install -z %{python2_sitelib}/vpp_papi-*.egg
 
 %preun
 %systemd_preun vpp.service
 
-%preun python-api
+%preun api-python
 easy_install -mxNq vpp_papi
 
 %postun
@@ -255,7 +275,15 @@ fi
 %{_libdir}/*
 /usr/share/vpp/api/*
 
-%files python-api
+%files api-lua
+%defattr(644,root,root)
+/usr/share/doc/vpp/examples/lua
+
+%files api-java
+%defattr(644,root,root)
+/usr/share/java/*
+
+%files api-python
 %defattr(644,root,root)
 %{python2_sitelib}/vpp_papi-*.egg
 
diff --git a/build-root/scripts/find-api-core-contents b/build-root/scripts/find-api-core-contents
index f1f96f1f..c1af69db 100755
--- a/build-root/scripts/find-api-core-contents
+++ b/build-root/scripts/find-api-core-contents
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-for i in $(find ${1}/vpp -name *.api.json -type f -print); do
+for i in $(find ${1}/vpp/share/vpp/api/core -name *.api.json -type f -print); do
     echo ../${i} /usr/share/vpp/api/ >> ${2}
 done
 for i in $(find ${1}/vlib-api -name *.api.json -type f -print); do
diff --git a/build-root/scripts/find-dev-contents b/build-root/scripts/find-dev-contents
index 2dc6cc4d..d4f7b63f 100755
--- a/build-root/scripts/find-dev-contents
+++ b/build-root/scripts/find-dev-contents
@@ -16,16 +16,16 @@ do
 done        
 
 # sample plugin
-paths=`(cd ..; find plugins/sample-plugin -type f -print | grep -v autom4te)`
+paths=`(cd ..; find src/examples/sample-plugin -type f -print | grep -v autom4te)`
 
 for path in $paths
 do
-    relpath=`echo $path | sed -e 's:.*plugins/::'`
+    relpath=`echo $path | sed -e 's:.*src/examples/::'`
     dir=`dirname $relpath`
     if [ $dir = "sample-plugin" ] ; then
-        echo ../../$path /usr/share/doc/vpp/examples/plugins/sample-plugin >> $2
+        echo ../../$path /usr/share/doc/vpp/examples/sample-plugin/ >> $2
     else
         echo ../../$path \
-        /usr/share/doc/vpp/examples/plugins/$dir >> $2
+        /usr/share/doc/vpp/examples/$dir >> $2
     fi
 done        
diff --git a/build-root/scripts/find-plugins-contents b/build-root/scripts/find-plugins-contents
index 4108f790..ae2a4271 100755
--- a/build-root/scripts/find-plugins-contents
+++ b/build-root/scripts/find-plugins-contents
@@ -2,11 +2,11 @@
 
 rm -f $2
 
-for i in ${1}/{plugins,vpp}/lib64/vpp_plugins/*.so; do
+for i in ${1}/vpp/lib64/vpp_plugins/*.so; do
 	echo ../${i} /usr/lib/vpp_plugins >> ${2}
 done
 
-for i in ${1}/{plugins,vpp}/lib64/vpp_api_test_plugins/*.so; do
+for i in ${1}/vpp/lib64/vpp_api_test_plugins/*.so; do
 	echo ../${i} /usr/lib/vpp_api_test_plugins >> ${2}
 done
 
diff --git a/build-root/scripts/find-python-api-contents b/build-root/scripts/find-python-api-contents
deleted file mode 100755
index 24e8532c..00000000
--- a/build-root/scripts/find-python-api-contents
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-rm -f $2
-
-for i in $(find ${1}/{vpp,vpp-api}/lib/python2.7/site-packages/ -type f -print); do
-    echo ../${i} /usr/lib/python2.7/site-packages/vpp_papi >> ${2}
-done
-
diff --git a/build-root/scripts/find-vpp-api-java-contents b/build-root/scripts/find-vpp-api-java-contents
new file mode 100755
index 00000000..5f1bf197
--- /dev/null
+++ b/build-root/scripts/find-vpp-api-java-contents
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+rm -f $2
+
+for i in $(find ${1}/vpp/share/java/ -type f -print); do
+  echo ../${i} /usr/share/java >> ${2}
+done
+
diff --git a/build-root/scripts/find-vpp-api-lua-contents b/build-root/scripts/find-vpp-api-lua-contents
new file mode 100755
index 00000000..f1173db8
--- /dev/null
+++ b/build-root/scripts/find-vpp-api-lua-contents
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+#i for now put everything into examples directory
+
+echo ../../src/vpp-api/lua /usr/share/vpp/examples > ${2}
+
diff --git a/build-root/scripts/find-vpp-api-python-contents b/build-root/scripts/find-vpp-api-python-contents
new file mode 100755
index 00000000..819c9122
--- /dev/null
+++ b/build-root/scripts/find-vpp-api-python-contents
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+rm -f $2
+
+for i in $(find ${1}/vpp/lib/python2.7/site-packages/ -type f -print); do
+    echo ../${i} /usr/lib/python2.7/site-packages/vpp_papi >> ${2}
+done
+
diff --git a/doxygen/Makefile b/doxygen/Makefile
index ffce3c13..face5b44 100644
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -52,8 +52,7 @@ DOXY_SRC_DIRECTORIES = \
 	$(DOXY_SRC)/vlibsocket \
 	$(DOXY_SRC)/vnet \
 	$(DOXY_SRC)/vpp \
-	$(DOXY_SRC)/vpp-api \
-	vpp-api
+	$(DOXY_SRC)/vpp-api
 
 # Input directories and files
 DOXY_INPUT ?= \
@@ -74,8 +73,8 @@ DOXY_INPUT := $(subst $(WS_ROOT)/,,$(DOXY_INPUT))
 DOXY_EXCLUDE ?= \
 	$(DOXY_SRC)/vlib/vlib/buffer.c \
 	$(DOXY_SRC)/vlib/example \
-	plugins/sample-plugin \
-	vpp-api/lua
+	$(DOXY_SRC)/vpp-api/lua \
+	plugins/sample-plugin
 
 # Generate a regexp for filenames to exclude
 DOXY_EXCLUDE_REGEXP = ($(subst .,\.,$(shell echo '$(strip $(DOXY_EXCLUDE))' | sed -e 's/ /|/g')))
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index a101e47f..20676fc8 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -28,22 +28,7 @@ if ENABLE_sample_PLUGIN
 SUBDIRS += sample-plugin
 endif
 
-if ENABLE_ioam_PLUGIN
-SUBDIRS += ioam-plugin
-endif
-
 if ENABLE_vcgn_PLUGIN
 SUBDIRS += vcgn-plugin
 endif
 
-if ENABLE_snat_PLUGIN
-SUBDIRS += snat-plugin
-endif
-
-if ENABLE_lb_PLUGIN
-SUBDIRS += lb-plugin
-endif
-
-if ENABLE_acl_PLUGIN
-SUBDIRS += acl-plugin
-endif
diff --git a/plugins/acl-plugin/Makefile.am b/plugins/acl-plugin/Makefile.am
deleted file mode 100644
index 798a32bb..00000000
--- a/plugins/acl-plugin/Makefile.am
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall
-AM_LDFLAGS = -module -shared -avoid-version
-
-vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
-vpppluginsdir = ${libdir}/vpp_plugins
-
-vppapitestplugins_LTLIBRARIES = acl_test_plugin.la
-vppplugins_LTLIBRARIES = acl_plugin.la
-
-acl_plugin_la_SOURCES =				\
-	acl/acl.c				\
-	acl/node_in.c				\
-	acl/node_out.c				\
-	acl/l2sess.c				\
-	acl/l2sess_node.c			\
-	acl/l2sess.h				\
-	acl/acl_plugin.api.h
-
-BUILT_SOURCES = acl/acl.api.h acl/acl.api.json
-
-SUFFIXES = .api.h .api .api.json
-
-#
-# ACL API
-#
-%.api.h: %.api
-	mkdir -p `dirname $@` ; \
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
-	| vppapigen --input - --output $@ --show-name $@
-
-%.api.json: %.api
-	@echo "  JSON APIGEN  " $@ ;                            \
-	mkdir -p `dirname $@` ;                                 \
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^                      \
-	| vppapigen --input - --json $@
-
-apidir = $(prefix)/acl
-api_DATA = acl/acl.api.json
-
-noinst_HEADERS =				\
-  acl/acl_all_api_h.h				\
-  acl/acl_msg_enum.h				\
-  acl/acl.api.h
-
-acl_test_plugin_la_SOURCES = acl/acl_test.c acl/acl_plugin.api.h
-
-# Remove *.la files
-install-data-hook:
-	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
-	@(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
-
-#
-# Java code generation
-#
-jvpp_registry_root = ../../vpp-api/java
-jvpp_registry_version = 17.04
-jacl_jarfile = jvpp-acl-$(PACKAGE_VERSION).jar
-jvpp_package_dir = io/fd/vpp/jvpp/acl
-jvpp_root = acl/jvpp
-jvpp_target_dir = target
-jvpp_target = $(jvpp_root)/$(jvpp_target_dir)
-
-lib_LTLIBRARIES = libjvpp_acl.la
-libjvpp_acl_la_SOURCES = acl/acl.api.h acl/jvpp_acl.c acl/jvpp/io_fd_vpp_jvpp_acl_JVppAclImpl.h
-libjvpp_acl_la_LIBADD = -lvlibmemoryclient -lvlibapi -lvppinfra \
-	              -lpthread -lm -lrt -L$(jvpp_registry_root)/.libs -ljvpp_common
-libjvpp_acl_la_LDFLAGS = -module
-libjvpp_acl_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I../ -I$(srcdir)/../
-
-BUILT_SOURCES += $(jvpp_root)/io_fd_vpp_jvpp_acl_JVppAclImpl.h
-
-$(jvpp_root)/io_fd_vpp_jvpp_acl_JVppAclImpl.h: acl/acl.api.json
-	dir=`pwd`;						\
-	mkdir -p $(jvpp_target); \
-	mkdir -p $(jvpp_root)/$(jvpp_package_dir); 		\
-	cd $(jvpp_root)/$(jvpp_package_dir);			\
-	mkdir -p types dto future callfacade callback notification test; 	\
-	@srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/acl/acl.api.json --plugin_name acl;		\
-	cd -;							\
-	mv -f $(jvpp_root)/$(jvpp_package_dir)/jvpp_acl_gen.h $(jvpp_root)/jvpp_acl_gen.h;							\
-	cp $(srcdir)/$(jvpp_root)/$(jvpp_package_dir)/test/*.java $(jvpp_root)/$(jvpp_package_dir)/test/;				\
-	cd $(jvpp_root);				\
-	$(JAVAC) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d $(jvpp_target_dir) $(jvpp_package_dir)/*.java \
-		$(jvpp_package_dir)/types/*.java \
-		$(jvpp_package_dir)/dto/*.java \
-		$(jvpp_package_dir)/callback/*.java \
-		$(jvpp_package_dir)/notification/*.java \
-		$(jvpp_package_dir)/future/*.java 	\
-		$(jvpp_package_dir)/callfacade/*.java 	\
-		$(jvpp_package_dir)/test/*.java \
-		|| (echo "acl jvpp compilation failed: $$?"; exit 1);	\
-	$(JAVAH) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d . io.fd.vpp.jvpp.acl.JVppAclImpl ;
-
-$(jacl_jarfile): libjvpp_acl.la
-	cp .libs/libjvpp_acl.so.0.0.0 $(jvpp_target);				\
-	cd $(jvpp_target);				\
-	$(JAR) cfv $(JARFLAGS) ../../../$@ libjvpp_acl.so.0.0.0 $(jvpp_package_dir)/* ; cd ..;
-
-all-local: $(jacl_jarfile)
diff --git a/plugins/acl-plugin/acl/acl.api b/plugins/acl-plugin/acl/acl.api
deleted file mode 100644
index 58a5a171..00000000
--- a/plugins/acl-plugin/acl/acl.api
+++ /dev/null
@@ -1,444 +0,0 @@
-/* Hey Emacs use -*- mode: C -*- */
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** \file
-    This file defines the vpp control-plane API messages
-    used to control the ACL plugin
-*/
-
-
-/** \brief Get the plugin version
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-
-define acl_plugin_get_version
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Reply to get the plugin version
-    @param context - returned sender context, to match reply w/ request
-    @param major - Incremented every time a known breaking behavior change is introduced
-    @param minor - Incremented with small changes, may be used to avoid buggy versions
-*/
-
-define acl_plugin_get_version_reply
-{
-  u32 context;
-  u32 major;
-  u32 minor;
-};
-
-/** \brief Access List Rule entry
-    @param is_permit - deny (0), permit (1), or permit+reflect(2) action on this rule.
-    @param is_ipv6   - IP addresses in this rule are IPv6 (1) or IPv4 (0)
-    @param src_ip_addr - Source prefix value
-    @param src_ip_prefix_len - Source prefix length
-    @param dst_ip_addr - Destination prefix value
-    @param dst_ip_prefix_len - Destination prefix length
-    @param proto - L4 protocol (http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml)
-    @param srcport_or_icmptype_first - beginning of source port or ICMP4/6 type range
-    @param srcport_or_icmptype_last - end of source port or ICMP4/6 type range
-    @param dstport_or_icmpcode_first - beginning of destination port or ICMP4/6 code range
-    @param dstport_or_icmpcode_last - end of destination port or ICMP4/6 code range
-    @param tcp_flags_mask - if proto==6, match masked TCP flags with this value
-    @param tcp_flags_value - if proto==6, mask to AND the TCP flags in the packet with
-*/
-
-typeonly manual_print manual_endian define acl_rule
-{
-  u8 is_permit;
-  u8 is_ipv6;
-  u8 src_ip_addr[16];
-  u8 src_ip_prefix_len;
-  u8 dst_ip_addr[16];
-  u8 dst_ip_prefix_len;
-/*
- * L4 protocol. IANA number. 1 = ICMP, 58 = ICMPv6, 6 = TCP, 17 = UDP.
- * 0 => ignore L4 and ignore the ports/tcpflags when matching.
- */
-  u8 proto;
-/*
- * If the L4 protocol is TCP or UDP, the below
- * hold ranges of ports, else if the L4 is ICMP/ICMPv6
- * they hold ranges of ICMP(v6) types/codes.
- *
- * Ranges are inclusive, i.e. to match "any" TCP/UDP port,
- * use first=0,last=65535. For ICMP(v6),
- * use first=0,last=255.
- */
-  u16 srcport_or_icmptype_first;
-  u16 srcport_or_icmptype_last;
-  u16 dstport_or_icmpcode_first;
-  u16 dstport_or_icmpcode_last;
-/*
- * for proto = 6, this matches if the
- * TCP flags in the packet, ANDed with tcp_flags_mask,
- * is equal to tcp_flags_value.
- */
-  u8 tcp_flags_mask;
-  u8 tcp_flags_value;
-};
-
-/** \brief MACIP Access List Rule entry
-    @param is_permit - deny (0), permit (1) action on this rule.
-    @param is_ipv6   - IP addresses in this rule are IPv6 (1) or IPv4 (0)
-    @param src_mac - match masked source MAC address against this value
-    @param src_mac_mask - AND source MAC address with this value before matching
-    @param src_ip_addr - Source prefix value
-    @param src_ip_prefix_len - Source prefix length
-*/
-
-typeonly manual_print manual_endian define macip_acl_rule
-{
-  u8 is_permit;
-  u8 is_ipv6;
-/*
- * The source mac of the packet ANDed with src_mac_mask.
- * The source ip[46] address in the packet is matched
- * against src_ip_addr, with src_ip_prefix_len set to 0.
- *
- * For better performance, minimize the number of
- * (src_mac_mask, src_ip_prefix_len) combinations
- * in a MACIP ACL.
- */
-  u8 src_mac[6];
-  u8 src_mac_mask[6];
-  u8 src_ip_addr[16];
-  u8 src_ip_prefix_len;
-};
-
-/** \brief Replace an existing ACL in-place or create a new ACL
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param acl_index - an existing ACL entry (0..0xfffffffe) to replace, or 0xffffffff to make new ACL
-    @param tag - a string value stored along with the ACL, for descriptive purposes
-    @param count - number of ACL rules
-    @r - Rules for this access-list
-*/
-
-manual_print manual_endian define acl_add_replace
-{
-  u32 client_index;
-  u32 context;
-  u32 acl_index; /* ~0 to add, existing ACL# to replace */
-  u8 tag[64]; /* What gets in here gets out in the corresponding tag field when dumping the ACLs. */
-  u32 count;
-  vl_api_acl_rule_t r[count];
-};
-
-/** \brief Reply to add/replace ACL
-    @param context - returned sender context, to match reply w/ request
-    @param acl_index - index of the updated or newly created ACL
-    @param retval 0 - no error
-*/
-
-define acl_add_replace_reply
-{
-  u32 context;
-  u32 acl_index;
-  i32 retval;
-};
-
-/** \brief Delete an ACL
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param acl_index - ACL index to delete
-*/
-
-define acl_del
-{
-  u32 client_index;
-  u32 context;
-  u32 acl_index;
-};
-
-/** \brief Reply to delete the ACL
-    @param context - returned sender context, to match reply w/ request
-    @param retval 0 - no error
-*/
-
-define acl_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/* acl_interface_add_del(_reply) to be deprecated in lieu of acl_interface_set_acl_list */
-/** \brief Use acl_interface_set_acl_list instead
-    Append/remove an ACL index to/from the list of ACLs checked for an interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add or delete the ACL index from the list
-    @param is_input - check the ACL on input (1) or output (0)
-    @param sw_if_index - the interface to alter the list of ACLs on
-    @param acl_index - index of ACL for the operation
-*/
-
-define acl_interface_add_del
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-/*
- * is_input = 0 => ACL applied on interface egress
- * is_input = 1 => ACL applied on interface ingress
- */
-  u8 is_input;
-  u32 sw_if_index;
-  u32 acl_index;
-};
-
-/** \brief Reply to alter the ACL list
-    @param context - returned sender context, to match reply w/ request
-    @param retval 0 - no error
-*/
-
-define acl_interface_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Set the vector of input/output ACLs checked for an interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - the interface to alter the list of ACLs on
-    @param count - total number of ACL indices in the vector
-    @param n_input - this many first elements correspond to input ACLs, the rest - output
-    @param acls - vector of ACL indices
-*/
-
-manual_endian define acl_interface_set_acl_list
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index;
-  u8 count;
-  u8 n_input; /* First n_input ACLs are set as a list of input ACLs, the rest are applied as output */
-  u32 acls[count];
-};
-
-/** \brief Reply to set the ACL list on an interface
-    @param context - returned sender context, to match reply w/ request
-    @param retval 0 - no error
-*/
-
-define acl_interface_set_acl_list_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Dump the specific ACL contents or all of the ACLs' contents
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param acl_index - ACL index to dump, ~0 to dump all ACLs
-*/
-
-define acl_dump
-{
-  u32 client_index;
-  u32 context;
-  u32 acl_index; /* ~0 for all ACLs */
-};
-
-/** \brief Details about a single ACL contents
-    @param context - returned sender context, to match reply w/ request
-    @param acl_index - ACL index whose contents are being sent in this message
-    @param tag - Descriptive tag value which was supplied at ACL creation
-    @param count - Number of rules in this ACL
-    @param r - Array of rules within this ACL
-*/
-
-manual_print manual_endian define acl_details
-{
-  u32 context;
-  u32 acl_index;
-  u8 tag[64]; /* Same blob that was supplied to us when creating the ACL, one hopes. */
-  u32 count;
-  vl_api_acl_rule_t r[count];
-};
-
-/** \brief Dump the list(s) of ACL applied to specific or all interfaces
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param sw_if_index - interface to dump the ACL list for
-*/
-
-define acl_interface_list_dump
-{
-  u32 client_index;
-  u32 context;
-  u32 sw_if_index; /* ~0 for all interfaces */
-};
-
-/** \brief Details about a single ACL contents
-    @param context - returned sender context, to match reply w/ request
-    @param sw_if_index - interface for which the list of ACLs is applied
-    @param count - total length of acl indices vector
-    @param n_input - this many of indices in the beginning are input ACLs, the rest - output
-    @param acls - the vector of ACL indices
-*/
-
-manual_endian define acl_interface_list_details
-{
-  u32 context;
-  u32 sw_if_index;
-  u8 count;
-  u8 n_input;
-  u32 acls[count];
-};
-
-/** \brief Add a MACIP ACL
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param tag - descriptive value for this MACIP ACL
-    @param count - number of rules in this ACL
-    @param r - vector of MACIP ACL rules
-*/
-
-manual_print manual_endian define macip_acl_add
-{
-  u32 client_index;
-  u32 context;
-  u8 tag[64];
-  u32 count;
-  vl_api_macip_acl_rule_t r[count];
-};
-
-/** \brief Reply to add MACIP ACL
-    @param context - returned sender context, to match reply w/ request
-    @param acl_index - index of the newly created ACL
-    @param retval 0 - no error
-*/
-
-define macip_acl_add_reply
-{
-  u32 context;
-  u32 acl_index;
-  i32 retval;
-};
-
-/** \brief Delete a MACIP ACL
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param acl_index - MACIP ACL index to delete
-*/
-
-define macip_acl_del
-{
-  u32 client_index;
-  u32 context;
-  u32 acl_index;
-};
-
-/** \brief Reply to delete the MACIP ACL
-    @param context - returned sender context, to match reply w/ request
-    @param retval 0 - no error
-*/
-
-define macip_acl_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Add or delete a MACIP ACL to/from interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - add (1) or delete (0) ACL from being used on an interface
-    @param sw_if_index - interface to apply the action to
-    @param acl_index - MACIP ACL index
-*/
-
-define macip_acl_interface_add_del
-{
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  /* macip ACLs are always input */
-  u32 sw_if_index;
-  u32 acl_index;
-};
-
-/** \brief Reply to apply/unapply  the MACIP ACL
-    @param context - returned sender context, to match reply w/ request
-    @param retval 0 - no error
-*/
-
-define macip_acl_interface_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Dump one or all defined MACIP ACLs
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param acl_index - MACIP ACL index or ~0 to dump all ACLs
-*/
-
-define macip_acl_dump
-{
-  u32 client_index;
-  u32 context;
-  u32 acl_index; /* ~0 for all ACLs */
-};
-
-/** \brief Details about one MACIP ACL
-    @param context - returned sender context, to match reply w/ request
-    @param acl_index - index of this MACIP ACL
-    @param tag - descriptive tag which was supplied during the creation
-    @param count - length of the vector of MACIP ACL rules
-    @param r - rules comprising this ACL
-*/
-
-manual_print manual_endian define macip_acl_details
-{
-  u32 context;
-  u32 acl_index;
-  u8 tag[64];
-  u32 count;
-  vl_api_macip_acl_rule_t r[count];
-};
-
-/** \brief Get the vector of MACIP ACL IDs applied to the interfaces
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-
-define macip_acl_interface_get
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Reply with the vector of MACIP ACLs by sw_if_index
-    @param context - returned sender context, to match reply w/ request
-    @param count - total number of elements in the vector
-    @param acls - the vector of active MACACL indices per sw_if_index
-*/
-
-define macip_acl_interface_get_reply
-{
-  u32 context;
-  u32 count;
-  u32 acls[count];
-};
-
diff --git a/plugins/acl-plugin/acl/acl.c b/plugins/acl-plugin/acl/acl.c
deleted file mode 100644
index 8ff5a6b7..00000000
--- a/plugins/acl-plugin/acl/acl.c
+++ /dev/null
@@ -1,1901 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stddef.h>
-
-#include <vnet/vnet.h>
-#include <vnet/plugin/plugin.h>
-#include <acl/acl.h>
-#include <acl/l2sess.h>
-
-#include <vnet/l2/l2_classify.h>
-#include <vnet/classify/input_acl.h>
-
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-
-/* define message IDs */
-#include <acl/acl_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <acl/acl_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <acl/acl_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <acl/acl_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <acl/acl_all_api_h.h>
-#undef vl_api_version
-
-#include "node_in.h"
-#include "node_out.h"
-
-acl_main_t acl_main;
-
-/*
- * A handy macro to set up a message reply.
- * Assumes that the following variables are available:
- * mp - pointer to request message
- * rmp - pointer to reply message type
- * rv - return value
- */
-
-#define REPLY_MACRO(t)                                          \
-do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
-    vl_api_client_index_to_input_queue (mp->client_index);      \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-                                                                \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-#define REPLY_MACRO2(t, body)                                   \
-do {                                                            \
-    unix_shared_memory_queue_t * q;                             \
-    rv = vl_msg_api_pd_handler (mp, rv);                        \
-    q = vl_api_client_index_to_input_queue (mp->client_index);  \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+am->msg_id_base);                               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-    do {body;} while (0);                                       \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-#define REPLY_MACRO3(t, n, body)                                \
-do {                                                            \
-    unix_shared_memory_queue_t * q;                             \
-    rv = vl_msg_api_pd_handler (mp, rv);                        \
-    q = vl_api_client_index_to_input_queue (mp->client_index);  \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp) + n);                 \
-    rmp->_vl_msg_id = ntohs((t)+am->msg_id_base);                               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-    do {body;} while (0);                                       \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-
-/* List of message types that this plugin understands */
-
-#define foreach_acl_plugin_api_msg		\
-_(ACL_PLUGIN_GET_VERSION, acl_plugin_get_version) \
-_(ACL_ADD_REPLACE, acl_add_replace)				\
-_(ACL_DEL, acl_del)				\
-_(ACL_INTERFACE_ADD_DEL, acl_interface_add_del)	\
-_(ACL_INTERFACE_SET_ACL_LIST, acl_interface_set_acl_list)	\
-_(ACL_DUMP, acl_dump)  \
-_(ACL_INTERFACE_LIST_DUMP, acl_interface_list_dump) \
-_(MACIP_ACL_ADD, macip_acl_add) \
-_(MACIP_ACL_DEL, macip_acl_del) \
-_(MACIP_ACL_INTERFACE_ADD_DEL, macip_acl_interface_add_del) \
-_(MACIP_ACL_DUMP, macip_acl_dump) \
-_(MACIP_ACL_INTERFACE_GET, macip_acl_interface_get)
-
-/*
- * This routine exists to convince the vlib plugin framework that
- * we haven't accidentally copied a random .dll into the plugin directory.
- *
- * Also collects global variable pointers passed from the vpp engine
- */
-
-clib_error_t *
-vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
-		      int from_early_init)
-{
-  acl_main_t *am = &acl_main;
-  clib_error_t *error = 0;
-
-  am->vlib_main = vm;
-  am->vnet_main = h->vnet_main;
-  am->ethernet_main = h->ethernet_main;
-
-  l2sess_vlib_plugin_register(vm, h, from_early_init);
-
-  return error;
-}
-
-
-static void
-vl_api_acl_plugin_get_version_t_handler (vl_api_acl_plugin_get_version_t * mp)
-{
-  acl_main_t *am = &acl_main;
-  vl_api_acl_plugin_get_version_reply_t *rmp;
-  int msg_size = sizeof (*rmp);
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  rmp = vl_msg_api_alloc (msg_size);
-  memset (rmp, 0, msg_size);
-  rmp->_vl_msg_id =
-    ntohs (VL_API_ACL_PLUGIN_GET_VERSION_REPLY + am->msg_id_base);
-  rmp->context = mp->context;
-  rmp->major = htonl (ACL_PLUGIN_VERSION_MAJOR);
-  rmp->minor = htonl (ACL_PLUGIN_VERSION_MINOR);
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-
-static int
-acl_add_list (u32 count, vl_api_acl_rule_t rules[],
-	      u32 * acl_list_index, u8 * tag)
-{
-  acl_main_t *am = &acl_main;
-  acl_list_t *a;
-  acl_rule_t *r;
-  acl_rule_t *acl_new_rules;
-  int i;
-
-  if (*acl_list_index != ~0)
-    {
-      /* They supplied some number, let's see if this ACL exists */
-      if (pool_is_free_index (am->acls, *acl_list_index))
-	{
-	  /* tried to replace a non-existent ACL, no point doing anything */
-	  return -1;
-	}
-    }
-
-  /* Create and populate the rules */
-  acl_new_rules = clib_mem_alloc_aligned (sizeof (acl_rule_t) * count,
-					  CLIB_CACHE_LINE_BYTES);
-  if (!acl_new_rules)
-    {
-      /* Could not allocate rules. New or existing ACL - bail out regardless */
-      return -1;
-    }
-
-  for (i = 0; i < count; i++)
-    {
-      r = &acl_new_rules[i];
-      r->is_permit = rules[i].is_permit;
-      r->is_ipv6 = rules[i].is_ipv6;
-      if (r->is_ipv6)
-        {
-          memcpy (&r->src, rules[i].src_ip_addr, sizeof (r->src));
-          memcpy (&r->dst, rules[i].dst_ip_addr, sizeof (r->dst));
-        }
-      else
-        {
-          memcpy (&r->src.ip4, rules[i].src_ip_addr, sizeof (r->src.ip4));
-          memcpy (&r->dst.ip4, rules[i].dst_ip_addr, sizeof (r->dst.ip4));
-        }
-      r->src_prefixlen = rules[i].src_ip_prefix_len;
-      r->dst_prefixlen = rules[i].dst_ip_prefix_len;
-      r->proto = rules[i].proto;
-      r->src_port_or_type_first = rules[i].srcport_or_icmptype_first;
-      r->src_port_or_type_last = rules[i].srcport_or_icmptype_last;
-      r->dst_port_or_code_first = rules[i].dstport_or_icmpcode_first;
-      r->dst_port_or_code_last = rules[i].dstport_or_icmpcode_last;
-      r->tcp_flags_value = rules[i].tcp_flags_value;
-      r->tcp_flags_mask = rules[i].tcp_flags_mask;
-    }
-
-  if (~0 == *acl_list_index)
-    {
-      /* Get ACL index */
-      pool_get_aligned (am->acls, a, CLIB_CACHE_LINE_BYTES);
-      memset (a, 0, sizeof (*a));
-      /* Will return the newly allocated ACL index */
-      *acl_list_index = a - am->acls;
-    }
-  else
-    {
-      a = am->acls + *acl_list_index;
-      /* Get rid of the old rules */
-      clib_mem_free (a->rules);
-    }
-  a->rules = acl_new_rules;
-  a->count = count;
-  memcpy (a->tag, tag, sizeof (a->tag));
-
-  return 0;
-}
-
-static int
-acl_del_list (u32 acl_list_index)
-{
-  acl_main_t *am = &acl_main;
-  acl_list_t *a;
-  int i, ii;
-  if (pool_is_free_index (am->acls, acl_list_index))
-    {
-      return -1;
-    }
-
-  /* delete any references to the ACL */
-  for (i = 0; i < vec_len (am->output_acl_vec_by_sw_if_index); i++)
-    {
-      for (ii = 0; ii < vec_len (am->output_acl_vec_by_sw_if_index[i]);
-	   /* see body */ )
-	{
-	  if (acl_list_index == am->output_acl_vec_by_sw_if_index[i][ii])
-	    {
-	      vec_del1 (am->output_acl_vec_by_sw_if_index[i], ii);
-	    }
-	  else
-	    {
-	      ii++;
-	    }
-	}
-    }
-  for (i = 0; i < vec_len (am->input_acl_vec_by_sw_if_index); i++)
-    {
-      for (ii = 0; ii < vec_len (am->input_acl_vec_by_sw_if_index[i]);
-	   /* see body */ )
-	{
-	  if (acl_list_index == am->input_acl_vec_by_sw_if_index[i][ii])
-	    {
-	      vec_del1 (am->input_acl_vec_by_sw_if_index[i], ii);
-	    }
-	  else
-	    {
-	      ii++;
-	    }
-	}
-    }
-
-  /* now we can delete the ACL itself */
-  a = &am->acls[acl_list_index];
-  if (a->rules)
-    {
-      clib_mem_free (a->rules);
-    }
-  pool_put (am->acls, a);
-  return 0;
-}
-
-/* Some aids in ASCII graphing the content */
-#define XX "\377"
-#define __ "\000"
-#define _(x)
-#define v
-
-u8 ip4_5tuple_mask[] =
-_("             dmac               smac            etype ")
-_(ether) __ __ __ __ __ __ v __ __ __ __ __ __ v __ __ v
-  _("        v ihl totlen   ")
-  _(0x0000)
-  __ __ __ __
-  _("        ident fl+fo    ")
-  _(0x0004)
-  __ __ __ __
-  _("       ttl pr checksum ")
-  _(0x0008)
-  __ XX __ __
-  _("        src address    ")
-  _(0x000C)
-  XX XX XX XX
-  _("        dst address    ")
-  _(0x0010)
-  XX XX XX XX
-  _("L4 T/U  sport dport    ")
-  _(tcpudp)
-  XX XX XX XX
-  _(padpad)
-  __ __ __ __
-  _(padpad)
-  __ __ __ __
-  _(padeth)
-  __ __;
-
-     u8 ip6_5tuple_mask[] =
-       _("             dmac               smac            etype ")
-  _(ether) __ __ __ __ __ __ v __ __ __ __ __ __ v __ __ v
-  _("        v  tc + flow ")
-  _(0x0000) __ __ __ __
-  _("        plen  nh hl  ")
-  _(0x0004) __ __ XX __
-  _("        src address  ")
-  _(0x0008) XX XX XX XX
-  _(0x000C) XX XX XX XX
-  _(0x0010) XX XX XX XX
-  _(0x0014) XX XX XX XX
-  _("        dst address  ")
-  _(0x0018) XX XX XX XX
-  _(0x001C) XX XX XX XX
-  _(0x0020) XX XX XX XX
-  _(0x0024) XX XX XX XX
-  _("L4T/U  sport dport   ")
-  _(tcpudp) XX XX XX XX _(padpad) __ __ __ __ _(padeth) __ __;
-
-#undef XX
-#undef __
-#undef _
-#undef v
-
-     static int count_skip (u8 * p, u32 size)
-{
-  u64 *p64 = (u64 *) p;
-  /* Be tolerant to null pointer */
-  if (0 == p)
-    return 0;
-
-  while ((0ULL == *p64) && ((u8 *) p64 - p) < size)
-    {
-      p64++;
-    }
-  return (p64 - (u64 *) p) / 2;
-}
-
-static int
-acl_classify_add_del_table_big (vnet_classify_main_t * cm, u8 * mask,
-			    u32 mask_len, u32 next_table_index,
-			    u32 miss_next_index, u32 * table_index,
-			    int is_add)
-{
-  u32 nbuckets = 65536;
-  u32 memory_size = 2 << 30;
-  u32 skip = count_skip (mask, mask_len);
-  u32 match = (mask_len / 16) - skip;
-  u8 *skip_mask_ptr = mask + 16 * skip;
-  u32 current_data_flag = 0;
-  int current_data_offset = 0;
-
-  if (0 == match)
-    match = 1;
-
-  return vnet_classify_add_del_table (cm, skip_mask_ptr, nbuckets,
-				      memory_size, skip, match,
-				      next_table_index, miss_next_index,
-				      table_index, current_data_flag,
-				      current_data_offset, is_add,
-				      1 /* delete_chain */);
-}
-
-static int
-acl_classify_add_del_table_small (vnet_classify_main_t * cm, u8 * mask,
-			    u32 mask_len, u32 next_table_index,
-			    u32 miss_next_index, u32 * table_index,
-			    int is_add)
-{
-  u32 nbuckets = 32;
-  u32 memory_size = 2 << 20;
-  u32 skip = count_skip (mask, mask_len);
-  u32 match = (mask_len / 16) - skip;
-  u8 *skip_mask_ptr = mask + 16 * skip;
-  u32 current_data_flag = 0;
-  int current_data_offset = 0;
-
-  if (0 == match)
-    match = 1;
-
-  return vnet_classify_add_del_table (cm, skip_mask_ptr, nbuckets,
-				      memory_size, skip, match,
-				      next_table_index, miss_next_index,
-				      table_index, current_data_flag,
-				      current_data_offset, is_add,
-				      1 /* delete_chain */);
-}
-
-
-static int
-acl_unhook_l2_input_classify (acl_main_t * am, u32 sw_if_index)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  u32 ip4_table_index = ~0;
-  u32 ip6_table_index = ~0;
-
-  vec_validate_init_empty (am->acl_ip4_input_classify_table_by_sw_if_index,
-			   sw_if_index, ~0);
-  vec_validate_init_empty (am->acl_ip6_input_classify_table_by_sw_if_index,
-			   sw_if_index, ~0);
-
-  vnet_l2_input_classify_enable_disable (sw_if_index, 0);
-
-  if (am->acl_ip4_input_classify_table_by_sw_if_index[sw_if_index] != ~0)
-    {
-      ip4_table_index =
-	am->acl_ip4_input_classify_table_by_sw_if_index[sw_if_index];
-      am->acl_ip4_input_classify_table_by_sw_if_index[sw_if_index] = ~0;
-      acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
-				  sizeof (ip4_5tuple_mask) - 1, ~0,
-				  am->l2_input_classify_next_acl,
-				  &ip4_table_index, 0);
-    }
-  if (am->acl_ip6_input_classify_table_by_sw_if_index[sw_if_index] != ~0)
-    {
-      ip6_table_index =
-	am->acl_ip6_input_classify_table_by_sw_if_index[sw_if_index];
-      am->acl_ip6_input_classify_table_by_sw_if_index[sw_if_index] = ~0;
-      acl_classify_add_del_table_big (cm, ip6_5tuple_mask,
-				  sizeof (ip6_5tuple_mask) - 1, ~0,
-				  am->l2_input_classify_next_acl,
-				  &ip6_table_index, 0);
-    }
-
-  return 0;
-}
-
-static int
-acl_unhook_l2_output_classify (acl_main_t * am, u32 sw_if_index)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  u32 ip4_table_index = ~0;
-  u32 ip6_table_index = ~0;
-
-  vec_validate_init_empty (am->acl_ip4_output_classify_table_by_sw_if_index,
-			   sw_if_index, ~0);
-  vec_validate_init_empty (am->acl_ip6_output_classify_table_by_sw_if_index,
-			   sw_if_index, ~0);
-
-  vnet_l2_output_classify_enable_disable (sw_if_index, 0);
-
-  if (am->acl_ip4_output_classify_table_by_sw_if_index[sw_if_index] != ~0)
-    {
-      ip4_table_index =
-	am->acl_ip4_output_classify_table_by_sw_if_index[sw_if_index];
-      am->acl_ip4_output_classify_table_by_sw_if_index[sw_if_index] = ~0;
-      acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
-				  sizeof (ip4_5tuple_mask) - 1, ~0,
-				  am->l2_output_classify_next_acl,
-				  &ip4_table_index, 0);
-    }
-  if (am->acl_ip6_output_classify_table_by_sw_if_index[sw_if_index] != ~0)
-    {
-      ip6_table_index =
-	am->acl_ip6_output_classify_table_by_sw_if_index[sw_if_index];
-      am->acl_ip6_output_classify_table_by_sw_if_index[sw_if_index] = ~0;
-      acl_classify_add_del_table_big (cm, ip6_5tuple_mask,
-				  sizeof (ip6_5tuple_mask) - 1, ~0,
-				  am->l2_output_classify_next_acl,
-				  &ip6_table_index, 0);
-    }
-
-  return 0;
-}
-
-static int
-acl_hook_l2_input_classify (acl_main_t * am, u32 sw_if_index)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  u32 ip4_table_index = ~0;
-  u32 ip6_table_index = ~0;
-  int rv;
-
-  /* in case there were previous tables attached */
-  acl_unhook_l2_input_classify (am, sw_if_index);
-  rv =
-    acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
-				sizeof (ip4_5tuple_mask) - 1, ~0,
-				am->l2_input_classify_next_acl,
-				&ip4_table_index, 1);
-  if (rv)
-    return rv;
-  rv =
-    acl_classify_add_del_table_big (cm, ip6_5tuple_mask,
-				sizeof (ip6_5tuple_mask) - 1, ~0,
-				am->l2_input_classify_next_acl,
-				&ip6_table_index, 1);
-  if (rv)
-    {
-      acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
-				  sizeof (ip4_5tuple_mask) - 1, ~0,
-				  am->l2_input_classify_next_acl,
-				  &ip4_table_index, 0);
-      return rv;
-    }
-  rv =
-    vnet_l2_input_classify_set_tables (sw_if_index, ip4_table_index,
-				       ip6_table_index, ~0);
-  clib_warning
-    ("ACL enabling on interface sw_if_index %d, setting tables to the following: ip4: %d ip6: %d\n",
-     sw_if_index, ip4_table_index, ip6_table_index);
-  if (rv)
-    {
-      acl_classify_add_del_table_big (cm, ip6_5tuple_mask,
-				  sizeof (ip6_5tuple_mask) - 1, ~0,
-				  am->l2_input_classify_next_acl,
-				  &ip6_table_index, 0);
-      acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
-				  sizeof (ip4_5tuple_mask) - 1, ~0,
-				  am->l2_input_classify_next_acl,
-				  &ip4_table_index, 0);
-      return rv;
-    }
-
-  am->acl_ip4_input_classify_table_by_sw_if_index[sw_if_index] =
-    ip4_table_index;
-  am->acl_ip6_input_classify_table_by_sw_if_index[sw_if_index] =
-    ip6_table_index;
-
-  vnet_l2_input_classify_enable_disable (sw_if_index, 1);
-  return rv;
-}
-
-static int
-acl_hook_l2_output_classify (acl_main_t * am, u32 sw_if_index)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  u32 ip4_table_index = ~0;
-  u32 ip6_table_index = ~0;
-  int rv;
-
-  /* in case there were previous tables attached */
-  acl_unhook_l2_output_classify (am, sw_if_index);
-  rv =
-    acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
-				sizeof (ip4_5tuple_mask) - 1, ~0,
-				am->l2_output_classify_next_acl,
-				&ip4_table_index, 1);
-  if (rv)
-    return rv;
-  rv =
-    acl_classify_add_del_table_big (cm, ip6_5tuple_mask,
-				sizeof (ip6_5tuple_mask) - 1, ~0,
-				am->l2_output_classify_next_acl,
-				&ip6_table_index, 1);
-  if (rv)
-    {
-      acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
-				  sizeof (ip4_5tuple_mask) - 1, ~0,
-				  am->l2_output_classify_next_acl,
-				  &ip4_table_index, 0);
-      return rv;
-    }
-  rv =
-    vnet_l2_output_classify_set_tables (sw_if_index, ip4_table_index,
-					ip6_table_index, ~0);
-  clib_warning
-    ("ACL enabling on interface sw_if_index %d, setting tables to the following: ip4: %d ip6: %d\n",
-     sw_if_index, ip4_table_index, ip6_table_index);
-  if (rv)
-    {
-      acl_classify_add_del_table_big (cm, ip6_5tuple_mask,
-				  sizeof (ip6_5tuple_mask) - 1, ~0,
-				  am->l2_output_classify_next_acl,
-				  &ip6_table_index, 0);
-      acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
-				  sizeof (ip4_5tuple_mask) - 1, ~0,
-				  am->l2_output_classify_next_acl,
-				  &ip4_table_index, 0);
-      return rv;
-    }
-
-  am->acl_ip4_output_classify_table_by_sw_if_index[sw_if_index] =
-    ip4_table_index;
-  am->acl_ip6_output_classify_table_by_sw_if_index[sw_if_index] =
-    ip6_table_index;
-
-  vnet_l2_output_classify_enable_disable (sw_if_index, 1);
-  return rv;
-}
-
-
-int
-acl_interface_in_enable_disable (acl_main_t * am, u32 sw_if_index,
-				 int enable_disable)
-{
-  int rv;
-
-  /* Utterly wrong? */
-  if (pool_is_free_index (am->vnet_main->interface_main.sw_interfaces,
-			  sw_if_index))
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-  if (enable_disable)
-    {
-      rv = acl_hook_l2_input_classify (am, sw_if_index);
-    }
-  else
-    {
-      rv = acl_unhook_l2_input_classify (am, sw_if_index);
-    }
-
-  return rv;
-}
-
-int
-acl_interface_out_enable_disable (acl_main_t * am, u32 sw_if_index,
-				  int enable_disable)
-{
-  int rv;
-
-  /* Utterly wrong? */
-  if (pool_is_free_index (am->vnet_main->interface_main.sw_interfaces,
-			  sw_if_index))
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-  if (enable_disable)
-    {
-      rv = acl_hook_l2_output_classify (am, sw_if_index);
-    }
-  else
-    {
-      rv = acl_unhook_l2_output_classify (am, sw_if_index);
-    }
-
-  return rv;
-}
-
-
-static int
-acl_interface_add_inout_acl (u32 sw_if_index, u8 is_input, u32 acl_list_index)
-{
-  acl_main_t *am = &acl_main;
-  if (is_input)
-    {
-      vec_validate (am->input_acl_vec_by_sw_if_index, sw_if_index);
-      vec_add (am->input_acl_vec_by_sw_if_index[sw_if_index], &acl_list_index,
-	       1);
-      acl_interface_in_enable_disable (am, sw_if_index, 1);
-    }
-  else
-    {
-      vec_validate (am->output_acl_vec_by_sw_if_index, sw_if_index);
-      vec_add (am->output_acl_vec_by_sw_if_index[sw_if_index],
-	       &acl_list_index, 1);
-      acl_interface_out_enable_disable (am, sw_if_index, 1);
-    }
-  return 0;
-}
-
-static int
-acl_interface_del_inout_acl (u32 sw_if_index, u8 is_input, u32 acl_list_index)
-{
-  acl_main_t *am = &acl_main;
-  int i;
-  int rv = -1;
-  if (is_input)
-    {
-      vec_validate (am->input_acl_vec_by_sw_if_index, sw_if_index);
-      for (i = 0; i < vec_len (am->input_acl_vec_by_sw_if_index[sw_if_index]);
-	   i++)
-	{
-	  if (acl_list_index ==
-	      am->input_acl_vec_by_sw_if_index[sw_if_index][i])
-	    {
-	      vec_del1 (am->input_acl_vec_by_sw_if_index[sw_if_index], i);
-	      rv = 0;
-	      break;
-	    }
-	}
-      if (0 == vec_len (am->input_acl_vec_by_sw_if_index[sw_if_index]))
-	{
-	  acl_interface_in_enable_disable (am, sw_if_index, 0);
-	}
-    }
-  else
-    {
-      vec_validate (am->output_acl_vec_by_sw_if_index, sw_if_index);
-      for (i = 0;
-	   i < vec_len (am->output_acl_vec_by_sw_if_index[sw_if_index]); i++)
-	{
-	  if (acl_list_index ==
-	      am->output_acl_vec_by_sw_if_index[sw_if_index][i])
-	    {
-	      vec_del1 (am->output_acl_vec_by_sw_if_index[sw_if_index], i);
-	      rv = 0;
-	      break;
-	    }
-	}
-      if (0 == vec_len (am->output_acl_vec_by_sw_if_index[sw_if_index]))
-	{
-	  acl_interface_out_enable_disable (am, sw_if_index, 0);
-	}
-    }
-  return rv;
-}
-
-static void
-acl_interface_reset_inout_acls (u32 sw_if_index, u8 is_input)
-{
-  acl_main_t *am = &acl_main;
-  if (is_input)
-    {
-      acl_interface_in_enable_disable (am, sw_if_index, 0);
-      vec_validate (am->input_acl_vec_by_sw_if_index, sw_if_index);
-      vec_reset_length (am->input_acl_vec_by_sw_if_index[sw_if_index]);
-    }
-  else
-    {
-      acl_interface_out_enable_disable (am, sw_if_index, 0);
-      vec_validate (am->output_acl_vec_by_sw_if_index, sw_if_index);
-      vec_reset_length (am->output_acl_vec_by_sw_if_index[sw_if_index]);
-    }
-}
-
-static int
-acl_interface_add_del_inout_acl (u32 sw_if_index, u8 is_add, u8 is_input,
-				 u32 acl_list_index)
-{
-  int rv = -1;
-  if (is_add)
-    {
-      rv =
-	acl_interface_add_inout_acl (sw_if_index, is_input, acl_list_index);
-    }
-  else
-    {
-      rv =
-	acl_interface_del_inout_acl (sw_if_index, is_input, acl_list_index);
-    }
-  return rv;
-}
-
-
-static void *
-get_ptr_to_offset (vlib_buffer_t * b0, int offset)
-{
-  u8 *p = vlib_buffer_get_current (b0) + offset;
-  return p;
-}
-
-static u8
-acl_get_l4_proto (vlib_buffer_t * b0, int node_is_ip6)
-{
-  u8 proto;
-  int proto_offset;
-  if (node_is_ip6)
-    {
-      proto_offset = 20;
-    }
-  else
-    {
-      proto_offset = 23;
-    }
-  proto = *((u8 *) vlib_buffer_get_current (b0) + proto_offset);
-  return proto;
-}
-
-static int
-acl_match_addr (ip46_address_t * addr1, ip46_address_t * addr2, int prefixlen,
-		int is_ip6)
-{
-  if (prefixlen == 0)
-    {
-      /* match any always succeeds */
-      return 1;
-    }
-  if (is_ip6)
-    {
-      if (memcmp (addr1, addr2, prefixlen / 8))
-	{
-	  /* If the starting full bytes do not match, no point in bittwidling the thumbs further */
-	  return 0;
-	}
-      if (prefixlen % 8)
-	{
-	  u8 b1 = *((u8 *) addr1 + 1 + prefixlen / 8);
-	  u8 b2 = *((u8 *) addr2 + 1 + prefixlen / 8);
-	  u8 mask0 = (0xff - ((1 << (8 - (prefixlen % 8))) - 1));
-	  return (b1 & mask0) == b2;
-	}
-      else
-	{
-	  /* The prefix fits into integer number of bytes, so nothing left to do */
-	  return 1;
-	}
-    }
-  else
-    {
-      uint32_t a1 = ntohl (addr1->ip4.as_u32);
-      uint32_t a2 = ntohl (addr2->ip4.as_u32);
-      uint32_t mask0 = 0xffffffff - ((1 << (32 - prefixlen)) - 1);
-      return (a1 & mask0) == a2;
-    }
-}
-
-static int
-acl_match_port (u16 port, u16 port_first, u16 port_last, int is_ip6)
-{
-  return ((port >= port_first) && (port <= port_last));
-}
-
-static int
-acl_packet_match (acl_main_t * am, u32 acl_index, vlib_buffer_t * b0,
-		  u8 * r_action, int *r_is_ip6, u32 * r_acl_match_p,
-		  u32 * r_rule_match_p, u32 * trace_bitmap)
-{
-  ethernet_header_t *h0;
-  u16 type0;
-
-  ip46_address_t src, dst;
-  int is_ip6;
-  int is_ip4;
-  u8 proto;
-  u16 src_port;
-  u16 dst_port;
-  u8 tcp_flags = 0;
-  int i;
-  acl_list_t *a;
-  acl_rule_t *r;
-
-  h0 = vlib_buffer_get_current (b0);
-  type0 = clib_net_to_host_u16 (h0->type);
-  is_ip4 = (type0 == ETHERNET_TYPE_IP4);
-  is_ip6 = (type0 == ETHERNET_TYPE_IP6);
-
-  if (!(is_ip4 || is_ip6))
-    {
-      return 0;
-    }
-  /* The bunch of hardcoded offsets here is intentional to get rid of them
-     ASAP, when getting to a faster matching code */
-  if (is_ip4)
-    {
-      clib_memcpy (&src.ip4, get_ptr_to_offset (b0, 26), 4);
-      clib_memcpy (&dst.ip4, get_ptr_to_offset (b0, 30), 4);
-      proto = acl_get_l4_proto (b0, 0);
-      if (1 == proto)
-	{
-	  *trace_bitmap |= 0x00000001;
-	  /* type */
-	  src_port = *(u8 *) get_ptr_to_offset (b0, 34);
-	  /* code */
-	  dst_port = *(u8 *) get_ptr_to_offset (b0, 35);
-	}
-      else
-	{
-	  /* assume TCP/UDP */
-	  src_port = (*(u16 *) get_ptr_to_offset (b0, 34));
-	  dst_port = (*(u16 *) get_ptr_to_offset (b0, 36));
-	  /* UDP gets ability to check on an oddball data byte as a bonus */
-	  tcp_flags = *(u8 *) get_ptr_to_offset (b0, 14 + 20 + 13);
-	}
-    }
-  else /* is_ipv6 implicitly */
-    {
-      clib_memcpy (&src, get_ptr_to_offset (b0, 22), 16);
-      clib_memcpy (&dst, get_ptr_to_offset (b0, 38), 16);
-      proto = acl_get_l4_proto (b0, 1);
-      if (58 == proto)
-	{
-	  *trace_bitmap |= 0x00000002;
-	  /* type */
-	  src_port = *(u8 *) get_ptr_to_offset (b0, 54);
-	  /* code */
-	  dst_port = *(u8 *) get_ptr_to_offset (b0, 55);
-	}
-      else
-	{
-	  /* assume TCP/UDP */
-	  src_port = (*(u16 *) get_ptr_to_offset (b0, 54));
-	  dst_port = (*(u16 *) get_ptr_to_offset (b0, 56));
-	  tcp_flags = *(u8 *) get_ptr_to_offset (b0, 14 + 40 + 13);
-	}
-    }
-  if (pool_is_free_index (am->acls, acl_index))
-    {
-      if (r_acl_match_p)
-	*r_acl_match_p = acl_index;
-      if (r_rule_match_p)
-	*r_rule_match_p = -1;
-      /* the ACL does not exist but is used for policy. Block traffic. */
-      return 0;
-    }
-  a = am->acls + acl_index;
-  for (i = 0; i < a->count; i++)
-    {
-      r = a->rules + i;
-      if (is_ip6 != r->is_ipv6)
-	{
-	  continue;
-	}
-      if (!acl_match_addr (&dst, &r->dst, r->dst_prefixlen, is_ip6))
-	continue;
-      if (!acl_match_addr (&src, &r->src, r->src_prefixlen, is_ip6))
-	continue;
-      if (r->proto)
-	{
-	  if (proto != r->proto)
-	    continue;
-	  if (!acl_match_port
-	      (src_port, r->src_port_or_type_first, r->src_port_or_type_last,
-	       is_ip6))
-	    continue;
-	  if (!acl_match_port
-	      (dst_port, r->dst_port_or_code_first, r->dst_port_or_code_last,
-	       is_ip6))
-	    continue;
-	  /* No need for check of proto == TCP, since in other rules both fields should be zero, so this match will succeed */
-	  if ((tcp_flags & r->tcp_flags_mask) != r->tcp_flags_value)
-	    continue;
-	}
-      /* everything matches! */
-      *r_action = r->is_permit;
-      *r_is_ip6 = is_ip6;
-      if (r_acl_match_p)
-	*r_acl_match_p = acl_index;
-      if (r_rule_match_p)
-	*r_rule_match_p = i;
-      return 1;
-    }
-  return 0;
-}
-
-void
-input_acl_packet_match (u32 sw_if_index, vlib_buffer_t * b0, u32 * nextp,
-			u32 * acl_match_p, u32 * rule_match_p,
-			u32 * trace_bitmap)
-{
-  acl_main_t *am = &acl_main;
-  uint8_t action = 0;
-  int is_ip6 = 0;
-  int i;
-  vec_validate (am->input_acl_vec_by_sw_if_index, sw_if_index);
-  for (i = 0; i < vec_len (am->input_acl_vec_by_sw_if_index[sw_if_index]);
-       i++)
-    {
-      if (acl_packet_match
-	  (am, am->input_acl_vec_by_sw_if_index[sw_if_index][i], b0, &action,
-	   &is_ip6, acl_match_p, rule_match_p, trace_bitmap))
-	{
-	  if (is_ip6)
-	    {
-	      *nextp = am->acl_in_ip6_match_next[action];
-	    }
-	  else
-	    {
-	      *nextp = am->acl_in_ip4_match_next[action];
-	    }
-	  return;
-	}
-    }
-  if (vec_len (am->input_acl_vec_by_sw_if_index[sw_if_index]) > 0)
-    {
-      /* If there are ACLs and none matched, deny by default */
-      *nextp = 0;
-    }
-
-}
-
-void
-output_acl_packet_match (u32 sw_if_index, vlib_buffer_t * b0, u32 * nextp,
-			 u32 * acl_match_p, u32 * rule_match_p,
-			 u32 * trace_bitmap)
-{
-  acl_main_t *am = &acl_main;
-  uint8_t action = 0;
-  int is_ip6 = 0;
-  int i;
-  vec_validate (am->output_acl_vec_by_sw_if_index, sw_if_index);
-  for (i = 0; i < vec_len (am->output_acl_vec_by_sw_if_index[sw_if_index]);
-       i++)
-    {
-      if (acl_packet_match
-	  (am, am->output_acl_vec_by_sw_if_index[sw_if_index][i], b0, &action,
-	   &is_ip6, acl_match_p, rule_match_p, trace_bitmap))
-	{
-	  if (is_ip6)
-	    {
-	      *nextp = am->acl_out_ip6_match_next[action];
-	    }
-	  else
-	    {
-	      *nextp = am->acl_out_ip4_match_next[action];
-	    }
-	  return;
-	}
-    }
-  if (vec_len (am->output_acl_vec_by_sw_if_index[sw_if_index]) > 0)
-    {
-      /* If there are ACLs and none matched, deny by default */
-      *nextp = 0;
-    }
-}
-
-typedef struct
-{
-  u8 is_ipv6;
-  u8 mac_mask[6];
-  u8 prefix_len;
-  u32 count;
-  u32 table_index;
-} macip_match_type_t;
-
-static u32
-macip_find_match_type (macip_match_type_t * mv, u8 * mac_mask, u8 prefix_len,
-		       u8 is_ipv6)
-{
-  u32 i;
-  if (mv)
-    {
-      for (i = 0; i < vec_len (mv); i++)
-	{
-	  if ((mv[i].prefix_len == prefix_len) && (mv[i].is_ipv6 == is_ipv6)
-	      && (0 == memcmp (mv[i].mac_mask, mac_mask, 6)))
-	    {
-	      return i;
-	    }
-	}
-    }
-  return ~0;
-}
-
-
-/* Get metric used to sort match types.
-   The more specific and the more often seen - the bigger the metric */
-static int
-match_type_metric (macip_match_type_t * m)
-{
-  /* FIXME: count the ones in the MAC mask as well, check how well this heuristic works in real life */
-  return m->prefix_len + m->is_ipv6 + 10 * m->count;
-}
-
-static int
-match_type_compare (macip_match_type_t * m1, macip_match_type_t * m2)
-{
-  /* Ascending sort based on the metric values */
-  return match_type_metric (m1) - match_type_metric (m2);
-}
-
-/* Get the offset of L3 source within ethernet packet */
-static int
-get_l3_src_offset(int is6)
-{
-  if(is6)
-    return (sizeof(ethernet_header_t) + offsetof(ip6_header_t, src_address));
-  else
-    return (sizeof(ethernet_header_t) + offsetof(ip4_header_t, src_address));
-}
-
-static int
-macip_create_classify_tables (acl_main_t * am, u32 macip_acl_index)
-{
-  macip_match_type_t *mvec = NULL;
-  macip_match_type_t *mt;
-  macip_acl_list_t *a = &am->macip_acls[macip_acl_index];
-  int i;
-  u32 match_type_index;
-  u32 last_table;
-  u8 mask[5 * 16];
-  vnet_classify_main_t *cm = &vnet_classify_main;
-
-  /* Count the number of different types of rules */
-  for (i = 0; i < a->count; i++)
-    {
-      if (~0 ==
-	  (match_type_index =
-	   macip_find_match_type (mvec, a->rules[i].src_mac_mask,
-				  a->rules[i].src_prefixlen,
-				  a->rules[i].is_ipv6)))
-	{
-	  match_type_index = vec_len (mvec);
-	  vec_validate (mvec, match_type_index);
-	  memcpy (mvec[match_type_index].mac_mask,
-		  a->rules[match_type_index].src_mac_mask, 6);
-	  mvec[match_type_index].prefix_len = a->rules[i].src_prefixlen;
-	  mvec[match_type_index].is_ipv6 = a->rules[i].is_ipv6;
-	  mvec[match_type_index].table_index = ~0;
-	}
-      mvec[match_type_index].count++;
-    }
-  /* Put the most frequently used tables last in the list so we can create classifier tables in reverse order */
-  vec_sort_with_function (mvec, match_type_compare);
-  /* Create the classifier tables */
-  last_table = ~0;
-  vec_foreach (mt, mvec)
-  {
-    int mask_len;
-    int is6 = mt->is_ipv6;
-    int l3_src_offs = get_l3_src_offset(is6);
-    memset (mask, 0, sizeof (mask));
-    memcpy (&mask[6], mt->mac_mask, 6);
-    for (i = 0; i < (mt->prefix_len / 8); i++)
-      {
-	mask[l3_src_offs + i] = 0xff;
-      }
-    if (mt->prefix_len % 8)
-      {
-	mask[l3_src_offs + (mt->prefix_len / 8)] =
-	  0xff - ((1 << (8 - mt->prefix_len % 8)) - 1);
-      }
-    /*
-     * Round-up the number of bytes needed to store the prefix,
-     * and round up the number of vectors too
-     */
-    mask_len = ((l3_src_offs + ((mt->prefix_len+7) / 8) +
-                (sizeof (u32x4)-1))/sizeof(u32x4)) * sizeof (u32x4);
-    acl_classify_add_del_table_small (cm, mask, mask_len, last_table,
-				(~0 == last_table) ? 0 : ~0, &mt->table_index,
-				1);
-    last_table = mt->table_index;
-  }
-  a->ip4_table_index = ~0;
-  a->ip6_table_index = ~0;
-  a->l2_table_index = last_table;
-
-  /* Populate the classifier tables with rules from the MACIP ACL */
-  for (i = 0; i < a->count; i++)
-    {
-      u32 action = 0;
-      u32 metadata = 0;
-      int is6 = a->rules[i].is_ipv6;
-      int l3_src_offs = get_l3_src_offset(is6);
-      memset (mask, 0, sizeof (mask));
-      memcpy (&mask[6], a->rules[i].src_mac, 6);
-      if (is6)
-	{
-	  memcpy (&mask[l3_src_offs], &a->rules[i].src_ip_addr.ip6, 16);
-	}
-      else
-	{
-	  memcpy (&mask[l3_src_offs], &a->rules[i].src_ip_addr.ip4, 4);
-	}
-      match_type_index =
-	macip_find_match_type (mvec, a->rules[i].src_mac_mask,
-			       a->rules[i].src_prefixlen,
-			       a->rules[i].is_ipv6);
-      /* add session to table mvec[match_type_index].table_index; */
-      vnet_classify_add_del_session (cm, mvec[match_type_index].table_index,
-				     mask, a->rules[i].is_permit ? ~0 : 0, i,
-				     0, action, metadata, 1);
-    }
-  return 0;
-}
-
-static void
-macip_destroy_classify_tables (acl_main_t * am, u32 macip_acl_index)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  macip_acl_list_t *a = &am->macip_acls[macip_acl_index];
-
-  if (a->ip4_table_index != ~0)
-    {
-      acl_classify_add_del_table_small (cm, 0, ~0, ~0, ~0, &a->ip4_table_index, 0);
-      a->ip4_table_index = ~0;
-    }
-  if (a->ip6_table_index != ~0)
-    {
-      acl_classify_add_del_table_small (cm, 0, ~0, ~0, ~0, &a->ip6_table_index, 0);
-      a->ip6_table_index = ~0;
-    }
-  if (a->l2_table_index != ~0)
-    {
-      acl_classify_add_del_table_small (cm, 0, ~0, ~0, ~0, &a->l2_table_index, 0);
-      a->l2_table_index = ~0;
-    }
-}
-
-static int
-macip_acl_add_list (u32 count, vl_api_macip_acl_rule_t rules[],
-		    u32 * acl_list_index, u8 * tag)
-{
-  acl_main_t *am = &acl_main;
-  macip_acl_list_t *a;
-  macip_acl_rule_t *r;
-  macip_acl_rule_t *acl_new_rules;
-  int i;
-
-  /* Create and populate the rules */
-  acl_new_rules = clib_mem_alloc_aligned (sizeof (macip_acl_rule_t) * count,
-					  CLIB_CACHE_LINE_BYTES);
-  if (!acl_new_rules)
-    {
-      /* Could not allocate rules. New or existing ACL - bail out regardless */
-      return -1;
-    }
-
-  for (i = 0; i < count; i++)
-    {
-      r = &acl_new_rules[i];
-      r->is_permit = rules[i].is_permit;
-      r->is_ipv6 = rules[i].is_ipv6;
-      memcpy (&r->src_mac, rules[i].src_mac, 6);
-      memcpy (&r->src_mac_mask, rules[i].src_mac_mask, 6);
-      if(rules[i].is_ipv6)
-        memcpy (&r->src_ip_addr.ip6, rules[i].src_ip_addr, 16);
-      else
-        memcpy (&r->src_ip_addr.ip4, rules[i].src_ip_addr, 4);
-      r->src_prefixlen = rules[i].src_ip_prefix_len;
-    }
-
-  /* Get ACL index */
-  pool_get_aligned (am->macip_acls, a, CLIB_CACHE_LINE_BYTES);
-  memset (a, 0, sizeof (*a));
-  /* Will return the newly allocated ACL index */
-  *acl_list_index = a - am->macip_acls;
-
-  a->rules = acl_new_rules;
-  a->count = count;
-  memcpy (a->tag, tag, sizeof (a->tag));
-
-  /* Create and populate the classifer tables */
-  macip_create_classify_tables (am, *acl_list_index);
-
-  return 0;
-}
-
-
-/* No check for validity of sw_if_index - the callers were supposed to validate */
-
-static int
-macip_acl_interface_del_acl (acl_main_t * am, u32 sw_if_index)
-{
-  int rv;
-  u32 macip_acl_index;
-  macip_acl_list_t *a;
-  vec_validate_init_empty (am->macip_acl_by_sw_if_index, sw_if_index, ~0);
-  macip_acl_index = am->macip_acl_by_sw_if_index[sw_if_index];
-  /* No point in deleting MACIP ACL which is not applied */
-  if (~0 == macip_acl_index)
-    return -1;
-  a = &am->macip_acls[macip_acl_index];
-  /* remove the classifier tables off the interface L2 ACL */
-  rv =
-    vnet_set_input_acl_intfc (am->vlib_main, sw_if_index, a->ip4_table_index,
-			      a->ip6_table_index, a->l2_table_index, 0);
-  /* Unset the MACIP ACL index */
-  am->macip_acl_by_sw_if_index[sw_if_index] = ~0;
-  return rv;
-}
-
-/* No check for validity of sw_if_index - the callers were supposed to validate */
-
-static int
-macip_acl_interface_add_acl (acl_main_t * am, u32 sw_if_index,
-			     u32 macip_acl_index)
-{
-  macip_acl_list_t *a;
-  int rv;
-  if (pool_is_free_index (am->macip_acls, macip_acl_index))
-    {
-      return -1;
-    }
-  a = &am->macip_acls[macip_acl_index];
-  vec_validate_init_empty (am->macip_acl_by_sw_if_index, sw_if_index, ~0);
-  /* If there already a MACIP ACL applied, unapply it */
-  if (~0 != am->macip_acl_by_sw_if_index[sw_if_index])
-    macip_acl_interface_del_acl(am, sw_if_index);
-  am->macip_acl_by_sw_if_index[sw_if_index] = macip_acl_index;
-  /* Apply the classifier tables for L2 ACLs */
-  rv =
-    vnet_set_input_acl_intfc (am->vlib_main, sw_if_index, a->ip4_table_index,
-			      a->ip6_table_index, a->l2_table_index, 1);
-  return rv;
-}
-
-static int
-macip_acl_del_list (u32 acl_list_index)
-{
-  acl_main_t *am = &acl_main;
-  macip_acl_list_t *a;
-  int i;
-  if (pool_is_free_index (am->macip_acls, acl_list_index))
-    {
-      return -1;
-    }
-
-  /* delete any references to the ACL */
-  for (i = 0; i < vec_len (am->macip_acl_by_sw_if_index); i++)
-    {
-      if (am->macip_acl_by_sw_if_index[i] == acl_list_index)
-	{
-	  macip_acl_interface_del_acl (am, i);
-	}
-    }
-
-  /* Now that classifier tables are detached, clean them up */
-  macip_destroy_classify_tables (am, acl_list_index);
-
-  /* now we can delete the ACL itself */
-  a = &am->macip_acls[acl_list_index];
-  if (a->rules)
-    {
-      clib_mem_free (a->rules);
-    }
-  pool_put (am->macip_acls, a);
-  return 0;
-}
-
-
-static int
-macip_acl_interface_add_del_acl (u32 sw_if_index, u8 is_add,
-				 u32 acl_list_index)
-{
-  acl_main_t *am = &acl_main;
-  int rv = -1;
-  if (is_add)
-    {
-      rv = macip_acl_interface_add_acl (am, sw_if_index, acl_list_index);
-    }
-  else
-    {
-      rv = macip_acl_interface_del_acl (am, sw_if_index);
-    }
-  return rv;
-}
-
-/* API message handler */
-static void
-vl_api_acl_add_replace_t_handler (vl_api_acl_add_replace_t * mp)
-{
-  vl_api_acl_add_replace_reply_t *rmp;
-  acl_main_t *am = &acl_main;
-  int rv;
-  u32 acl_list_index = ntohl (mp->acl_index);
-
-  rv = acl_add_list (ntohl (mp->count), mp->r, &acl_list_index, mp->tag);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_ACL_ADD_REPLACE_REPLY,
-  ({
-    rmp->acl_index = htonl(acl_list_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_acl_del_t_handler (vl_api_acl_del_t * mp)
-{
-  acl_main_t *sm = &acl_main;
-  vl_api_acl_del_reply_t *rmp;
-  int rv;
-
-  rv = acl_del_list (ntohl (mp->acl_index));
-
-  REPLY_MACRO (VL_API_ACL_DEL_REPLY);
-}
-
-static void
-vl_api_acl_interface_add_del_t_handler (vl_api_acl_interface_add_del_t * mp)
-{
-  acl_main_t *sm = &acl_main;
-  vnet_interface_main_t *im = &sm->vnet_main->interface_main;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  vl_api_acl_interface_add_del_reply_t *rmp;
-  int rv = -1;
-
-  if (pool_is_free_index(im->sw_interfaces, sw_if_index))
-    rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-  else
-    rv =
-      acl_interface_add_del_inout_acl (sw_if_index, mp->is_add,
-				     mp->is_input, ntohl (mp->acl_index));
-
-  REPLY_MACRO (VL_API_ACL_INTERFACE_ADD_DEL_REPLY);
-}
-
-static void
-vl_api_acl_interface_set_acl_list_t_handler
-  (vl_api_acl_interface_set_acl_list_t * mp)
-{
-  acl_main_t *sm = &acl_main;
-  vl_api_acl_interface_set_acl_list_reply_t *rmp;
-  int rv = 0;
-  int i;
-  vnet_interface_main_t *im = &sm->vnet_main->interface_main;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  if (pool_is_free_index(im->sw_interfaces, sw_if_index))
-    rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-  else
-    {
-      acl_interface_reset_inout_acls (sw_if_index, 0);
-      acl_interface_reset_inout_acls (sw_if_index, 1);
-
-      for (i = 0; i < mp->count; i++)
-        {
-          acl_interface_add_del_inout_acl (sw_if_index, 1, (i < mp->n_input),
-				       ntohl (mp->acls[i]));
-        }
-    }
-
-  REPLY_MACRO (VL_API_ACL_INTERFACE_SET_ACL_LIST_REPLY);
-}
-
-static void
-copy_acl_rule_to_api_rule (vl_api_acl_rule_t * api_rule, acl_rule_t * r)
-{
-  api_rule->is_permit = r->is_permit;
-  api_rule->is_ipv6 = r->is_ipv6;
-  if(r->is_ipv6)
-    {
-      memcpy (api_rule->src_ip_addr, &r->src, sizeof (r->src));
-      memcpy (api_rule->dst_ip_addr, &r->dst, sizeof (r->dst));
-    }
-  else
-    {
-      memcpy (api_rule->src_ip_addr, &r->src.ip4, sizeof (r->src.ip4));
-      memcpy (api_rule->dst_ip_addr, &r->dst.ip4, sizeof (r->dst.ip4));
-    }
-  api_rule->src_ip_prefix_len = r->src_prefixlen;
-  api_rule->dst_ip_prefix_len = r->dst_prefixlen;
-  api_rule->proto = r->proto;
-  api_rule->srcport_or_icmptype_first = r->src_port_or_type_first;
-  api_rule->srcport_or_icmptype_last = r->src_port_or_type_last;
-  api_rule->dstport_or_icmpcode_first = r->dst_port_or_code_first;
-  api_rule->dstport_or_icmpcode_last = r->dst_port_or_code_last;
-  api_rule->tcp_flags_mask = r->tcp_flags_mask;
-  api_rule->tcp_flags_value = r->tcp_flags_value;
-}
-
-static void
-send_acl_details (acl_main_t * am, unix_shared_memory_queue_t * q,
-		  acl_list_t * acl, u32 context)
-{
-  vl_api_acl_details_t *mp;
-  vl_api_acl_rule_t *rules;
-  int i;
-  int msg_size = sizeof (*mp) + sizeof (mp->r[0]) * acl->count;
-
-  mp = vl_msg_api_alloc (msg_size);
-  memset (mp, 0, msg_size);
-  mp->_vl_msg_id = ntohs (VL_API_ACL_DETAILS + am->msg_id_base);
-
-  /* fill in the message */
-  mp->context = context;
-  mp->count = htonl (acl->count);
-  mp->acl_index = htonl (acl - am->acls);
-  memcpy (mp->tag, acl->tag, sizeof (mp->tag));
-  // clib_memcpy (mp->r, acl->rules, acl->count * sizeof(acl->rules[0]));
-  rules = mp->r;
-  for (i = 0; i < acl->count; i++)
-    {
-      copy_acl_rule_to_api_rule (&rules[i], &acl->rules[i]);
-    }
-
-  clib_warning("Sending acl details for ACL index %d", ntohl(mp->acl_index));
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-
-static void
-vl_api_acl_dump_t_handler (vl_api_acl_dump_t * mp)
-{
-  acl_main_t *am = &acl_main;
-  u32 acl_index;
-  acl_list_t *acl;
-
-  int rv = -1;
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  if (mp->acl_index == ~0)
-    {
-    /* *INDENT-OFF* */
-    /* Just dump all ACLs */
-    pool_foreach (acl, am->acls,
-    ({
-      send_acl_details(am, q, acl, mp->context);
-    }));
-    /* *INDENT-ON* */
-    }
-  else
-    {
-      acl_index = ntohl (mp->acl_index);
-      if (!pool_is_free_index (am->acls, acl_index))
-	{
-	  acl = &am->acls[acl_index];
-	  send_acl_details (am, q, acl, mp->context);
-	}
-    }
-
-  if (rv == -1)
-    {
-      /* FIXME API: should we signal an error here at all ? */
-      return;
-    }
-}
-
-static void
-send_acl_interface_list_details (acl_main_t * am,
-				 unix_shared_memory_queue_t * q,
-				 u32 sw_if_index, u32 context)
-{
-  vl_api_acl_interface_list_details_t *mp;
-  int msg_size;
-  int n_input;
-  int n_output;
-  int count;
-  int i = 0;
-
-  vec_validate (am->input_acl_vec_by_sw_if_index, sw_if_index);
-  vec_validate (am->output_acl_vec_by_sw_if_index, sw_if_index);
-
-  n_input = vec_len (am->input_acl_vec_by_sw_if_index[sw_if_index]);
-  n_output = vec_len (am->output_acl_vec_by_sw_if_index[sw_if_index]);
-  count = n_input + n_output;
-
-  msg_size = sizeof (*mp);
-  msg_size += sizeof (mp->acls[0]) * count;
-
-  mp = vl_msg_api_alloc (msg_size);
-  memset (mp, 0, msg_size);
-  mp->_vl_msg_id =
-    ntohs (VL_API_ACL_INTERFACE_LIST_DETAILS + am->msg_id_base);
-
-  /* fill in the message */
-  mp->context = context;
-  mp->sw_if_index = htonl (sw_if_index);
-  mp->count = count;
-  mp->n_input = n_input;
-  for (i = 0; i < n_input; i++)
-    {
-      mp->acls[i] = htonl (am->input_acl_vec_by_sw_if_index[sw_if_index][i]);
-    }
-  for (i = 0; i < n_output; i++)
-    {
-      mp->acls[n_input + i] =
-	htonl (am->output_acl_vec_by_sw_if_index[sw_if_index][i]);
-    }
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-static void
-vl_api_acl_interface_list_dump_t_handler (vl_api_acl_interface_list_dump_t *
-					  mp)
-{
-  acl_main_t *am = &acl_main;
-  vnet_sw_interface_t *swif;
-  vnet_interface_main_t *im = &am->vnet_main->interface_main;
-
-  u32 sw_if_index;
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  if (mp->sw_if_index == ~0)
-    {
-    /* *INDENT-OFF* */
-    pool_foreach (swif, im->sw_interfaces,
-    ({
-      send_acl_interface_list_details(am, q, swif->sw_if_index, mp->context);
-    }));
-    /* *INDENT-ON* */
-    }
-  else
-    {
-      sw_if_index = ntohl (mp->sw_if_index);
-      if (!pool_is_free_index(im->sw_interfaces, sw_if_index))
-        send_acl_interface_list_details (am, q, sw_if_index, mp->context);
-    }
-}
-
-/* MACIP ACL API handlers */
-
-static void
-vl_api_macip_acl_add_t_handler (vl_api_macip_acl_add_t * mp)
-{
-  vl_api_macip_acl_add_reply_t *rmp;
-  acl_main_t *am = &acl_main;
-  int rv;
-  u32 acl_list_index = ~0;
-
-  rv =
-    macip_acl_add_list (ntohl (mp->count), mp->r, &acl_list_index, mp->tag);
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2(VL_API_MACIP_ACL_ADD_REPLY,
-  ({
-    rmp->acl_index = htonl(acl_list_index);
-  }));
-  /* *INDENT-ON* */
-}
-
-static void
-vl_api_macip_acl_del_t_handler (vl_api_macip_acl_del_t * mp)
-{
-  acl_main_t *sm = &acl_main;
-  vl_api_macip_acl_del_reply_t *rmp;
-  int rv;
-
-  rv = macip_acl_del_list (ntohl (mp->acl_index));
-
-  REPLY_MACRO (VL_API_MACIP_ACL_DEL_REPLY);
-}
-
-static void
-vl_api_macip_acl_interface_add_del_t_handler
-  (vl_api_macip_acl_interface_add_del_t * mp)
-{
-  acl_main_t *sm = &acl_main;
-  vl_api_macip_acl_interface_add_del_reply_t *rmp;
-  int rv = -1;
-  vnet_interface_main_t *im = &sm->vnet_main->interface_main;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-
-  if (pool_is_free_index(im->sw_interfaces, sw_if_index))
-    rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-  else
-    rv =
-      macip_acl_interface_add_del_acl (ntohl (mp->sw_if_index), mp->is_add,
-				     ntohl (mp->acl_index));
-
-  REPLY_MACRO (VL_API_MACIP_ACL_INTERFACE_ADD_DEL_REPLY);
-}
-
-static void
-send_macip_acl_details (acl_main_t * am, unix_shared_memory_queue_t * q,
-			macip_acl_list_t * acl, u32 context)
-{
-  vl_api_macip_acl_details_t *mp;
-  vl_api_macip_acl_rule_t *rules;
-  macip_acl_rule_t *r;
-  int i;
-  int msg_size = sizeof (*mp) + (acl ? sizeof (mp->r[0]) * acl->count : 0);
-
-  mp = vl_msg_api_alloc (msg_size);
-  memset (mp, 0, msg_size);
-  mp->_vl_msg_id = ntohs (VL_API_MACIP_ACL_DETAILS + am->msg_id_base);
-
-  /* fill in the message */
-  mp->context = context;
-  if (acl)
-    {
-      memcpy (mp->tag, acl->tag, sizeof (mp->tag));
-      mp->count = htonl (acl->count);
-      mp->acl_index = htonl (acl - am->macip_acls);
-      rules = mp->r;
-      for (i = 0; i < acl->count; i++)
-	{
-	  r = &acl->rules[i];
-	  rules[i].is_permit = r->is_permit;
-	  rules[i].is_ipv6 = r->is_ipv6;
-	  memcpy (rules[i].src_mac, &r->src_mac, sizeof (r->src_mac));
-	  memcpy (rules[i].src_mac_mask, &r->src_mac_mask,
-		  sizeof (r->src_mac_mask));
-          if (r->is_ipv6)
-            memcpy (rules[i].src_ip_addr, &r->src_ip_addr.ip6,
-		  sizeof (r->src_ip_addr.ip6));
-          else
-            memcpy (rules[i].src_ip_addr, &r->src_ip_addr.ip4,
-		  sizeof (r->src_ip_addr.ip4));
-	  rules[i].src_ip_prefix_len = r->src_prefixlen;
-	}
-    }
-  else
-    {
-      /* No martini, no party - no ACL applied to this interface. */
-      mp->acl_index = ~0;
-      mp->count = 0;
-    }
-
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
-}
-
-
-static void
-vl_api_macip_acl_dump_t_handler (vl_api_macip_acl_dump_t * mp)
-{
-  acl_main_t *am = &acl_main;
-  macip_acl_list_t *acl;
-
-  unix_shared_memory_queue_t *q;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  if (mp->acl_index == ~0)
-    {
-      /* Just dump all ACLs for now, with sw_if_index = ~0 */
-      pool_foreach (acl, am->macip_acls, (
-					   {
-					   send_macip_acl_details (am, q, acl,
-								   mp->
-								   context);}
-		    ));
-      /* *INDENT-ON* */
-    }
-  else
-    {
-      u32 acl_index = ntohl (mp->acl_index);
-      if (!pool_is_free_index (am->macip_acls, acl_index))
-	{
-	  acl = &am->macip_acls[acl_index];
-	  send_macip_acl_details (am, q, acl, mp->context);
-	}
-    }
-}
-
-static void
-vl_api_macip_acl_interface_get_t_handler (vl_api_macip_acl_interface_get_t *
-					  mp)
-{
-  acl_main_t *am = &acl_main;
-  vl_api_macip_acl_interface_get_reply_t *rmp;
-  u32 count = vec_len (am->macip_acl_by_sw_if_index);
-  int msg_size = sizeof (*rmp) + sizeof (rmp->acls[0]) * count;
-  unix_shared_memory_queue_t *q;
-  int i;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    {
-      return;
-    }
-
-  rmp = vl_msg_api_alloc (msg_size);
-  memset (rmp, 0, msg_size);
-  rmp->_vl_msg_id =
-    ntohs (VL_API_MACIP_ACL_INTERFACE_GET_REPLY + am->msg_id_base);
-  rmp->context = mp->context;
-  rmp->count = htonl (count);
-  for (i = 0; i < count; i++)
-    {
-      rmp->acls[i] = htonl (am->macip_acl_by_sw_if_index[i]);
-    }
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-
-
-/* Set up the API message handling tables */
-static clib_error_t *
-acl_plugin_api_hookup (vlib_main_t * vm)
-{
-  acl_main_t *sm = &acl_main;
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,					\
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_acl_plugin_api_msg;
-#undef _
-
-  return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <acl/acl_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (acl_main_t * sm, api_main_t * am)
-{
-#define _(id,n,crc) \
-  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
-  foreach_vl_msg_name_crc_acl;
-#undef _
-}
-
-u32
-register_match_action_nexts (u32 next_in_ip4, u32 next_in_ip6,
-			     u32 next_out_ip4, u32 next_out_ip6)
-{
-  acl_main_t *am = &acl_main;
-  u32 act = am->n_match_actions;
-  if (am->n_match_actions == 255)
-    {
-      return ~0;
-    }
-  am->n_match_actions++;
-  am->acl_in_ip4_match_next[act] = next_in_ip4;
-  am->acl_in_ip6_match_next[act] = next_in_ip6;
-  am->acl_out_ip4_match_next[act] = next_out_ip4;
-  am->acl_out_ip6_match_next[act] = next_out_ip6;
-  return act;
-}
-
-void
-acl_setup_nodes (void)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  acl_main_t *am = &acl_main;
-  vlib_node_t *n;
-
-  n = vlib_get_node_by_name (vm, (u8 *) "l2-input-classify");
-  am->l2_input_classify_next_acl =
-    vlib_node_add_next_with_slot (vm, n->index, acl_in_node.index, ~0);
-  n = vlib_get_node_by_name (vm, (u8 *) "l2-output-classify");
-  am->l2_output_classify_next_acl =
-    vlib_node_add_next_with_slot (vm, n->index, acl_out_node.index, ~0);
-
-  feat_bitmap_init_next_nodes (vm, acl_in_node.index, L2INPUT_N_FEAT,
-			       l2input_get_feat_names (),
-			       am->acl_in_node_input_next_node_index);
-
-  memset (&am->acl_in_ip4_match_next[0], 0,
-	  sizeof (am->acl_in_ip4_match_next));
-  memset (&am->acl_in_ip6_match_next[0], 0,
-	  sizeof (am->acl_in_ip6_match_next));
-  memset (&am->acl_out_ip4_match_next[0], 0,
-	  sizeof (am->acl_out_ip4_match_next));
-  memset (&am->acl_out_ip6_match_next[0], 0,
-	  sizeof (am->acl_out_ip6_match_next));
-  am->n_match_actions = 0;
-
-  register_match_action_nexts (0, 0, 0, 0);	/* drop */
-  register_match_action_nexts (~0, ~0, ~0, ~0);	/* permit */
-  register_match_action_nexts (ACL_IN_L2S_INPUT_IP4_ADD, ACL_IN_L2S_INPUT_IP6_ADD, ACL_OUT_L2S_OUTPUT_IP4_ADD, ACL_OUT_L2S_OUTPUT_IP6_ADD);	/* permit + create session */
-}
-
-
-
-static clib_error_t *
-acl_init (vlib_main_t * vm)
-{
-  acl_main_t *am = &acl_main;
-  clib_error_t *error = 0;
-  memset (am, 0, sizeof (*am));
-  am->vlib_main = vm;
-  am->vnet_main = vnet_get_main ();
-
-  u8 *name = format (0, "acl_%08x%c", api_version, 0);
-
-  /* Ask for a correctly-sized block of API message decode slots */
-  am->msg_id_base = vl_msg_api_get_msg_ids ((char *) name,
-					    VL_MSG_FIRST_AVAILABLE);
-
-  error = acl_plugin_api_hookup (vm);
-  acl_setup_nodes ();
-
- /* Add our API messages to the global name_crc hash table */
-  setup_message_id_table (am, &api_main);
-
-  vec_free (name);
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (acl_init);
diff --git a/plugins/acl-plugin/acl/acl.h b/plugins/acl-plugin/acl/acl.h
deleted file mode 100644
index afc9b289..00000000
--- a/plugins/acl-plugin/acl/acl.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_acl_h
-#define included_acl_h
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/l2/l2_output.h>
-
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-
-#define  ACL_PLUGIN_VERSION_MAJOR 1
-#define  ACL_PLUGIN_VERSION_MINOR 1
-
-extern vlib_node_registration_t acl_in_node;
-extern vlib_node_registration_t acl_out_node;
-
-void input_acl_packet_match(u32 sw_if_index, vlib_buffer_t * b0, u32 *nextp, u32 *acl_match_p, u32 *rule_match_p, u32 *trace_bitmap);
-void output_acl_packet_match(u32 sw_if_index, vlib_buffer_t * b0, u32 *nextp, u32 *acl_match_p, u32 *rule_match_p, u32 *trace_bitmap);
-
-enum address_e { IP4, IP6 };
-typedef struct
-{
-  enum address_e type;
-  union {
-    ip6_address_t ip6;
-    ip4_address_t ip4;
-  } addr;
-} address_t;
-
-/*
- * ACL rules
- */
-typedef struct
-{
-  u8 is_permit;
-  u8 is_ipv6;
-  ip46_address_t src;
-  u8 src_prefixlen;
-  ip46_address_t dst;
-  u8 dst_prefixlen;
-  u8 proto;
-  u16 src_port_or_type_first;
-  u16 src_port_or_type_last;
-  u16 dst_port_or_code_first;
-  u16 dst_port_or_code_last;
-  u8 tcp_flags_value;
-  u8 tcp_flags_mask;
-} acl_rule_t;
-
-typedef struct
-{
-  u8 is_permit;
-  u8 is_ipv6;
-  u8 src_mac[6];
-  u8 src_mac_mask[6];
-  ip46_address_t src_ip_addr;
-  u8 src_prefixlen;
-} macip_acl_rule_t;
-
-/*
- * ACL
- */
-typedef struct
-{
-  u8 tag[64];
-  u32 count;
-  acl_rule_t *rules;
-} acl_list_t;
-
-typedef struct
-{
-  u8 tag[64];
-  u32 count;
-  macip_acl_rule_t *rules;
-  /* References to the classifier tables that will enforce the rules */
-  u32 ip4_table_index;
-  u32 ip6_table_index;
-  u32 l2_table_index;
-} macip_acl_list_t;
-
-typedef struct {
-  /* API message ID base */
-  u16 msg_id_base;
-
-  acl_list_t *acls;	/* Pool of ACLs */
-  macip_acl_list_t *macip_acls;	/* Pool of MAC-IP ACLs */
-
-  /* ACLs associated with interfaces */
-  u32 **input_acl_vec_by_sw_if_index;
-  u32 **output_acl_vec_by_sw_if_index;
-
-  /*
-   * Classify tables used to grab the packets for the ACL check,
-   * and serving as the 5-tuple session tables at the same time
-   */
-  u32 *acl_ip4_input_classify_table_by_sw_if_index;
-  u32 *acl_ip6_input_classify_table_by_sw_if_index;
-  u32 *acl_ip4_output_classify_table_by_sw_if_index;
-  u32 *acl_ip6_output_classify_table_by_sw_if_index;
-
-  /* MACIP (input) ACLs associated with the interfaces */
-  u32 *macip_acl_by_sw_if_index;
-
-  /* next indices for our nodes in the l2-classify tables */
-  u32 l2_input_classify_next_acl;
-  u32 l2_output_classify_next_acl;
-
-  /* next node indices for feature bitmap */
-  u32 acl_in_node_input_next_node_index[32];
-  /* the respective thing for the output feature */
-  l2_output_next_nodes_st acl_out_output_next_nodes;
-
-  /* ACL match actions (must be coherent across in/out ACLs to next indices (can differ) */
-
-  u32 acl_in_ip4_match_next[256];
-  u32 acl_in_ip6_match_next[256];
-  u32 acl_out_ip4_match_next[256];
-  u32 acl_out_ip6_match_next[256];
-  u32 n_match_actions;
-
-
-  /* convenience */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-  ethernet_main_t * ethernet_main;
-} acl_main_t;
-
-extern acl_main_t acl_main;
-
-
-#endif
diff --git a/plugins/acl-plugin/acl/acl_all_api_h.h b/plugins/acl-plugin/acl/acl_all_api_h.h
deleted file mode 100644
index 96eca56d..00000000
--- a/plugins/acl-plugin/acl/acl_all_api_h.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Include the generated file, see BUILT_SOURCES in Makefile.am */
-#include <acl/acl.api.h>
-
-#ifdef vl_printfun
-
-#ifdef LP64
-#define _uword_fmt "%lld"
-#define _uword_cast (long long)
-#else
-#define _uword_fmt "%ld"
-#define _uword_cast long
-#endif
-
-static inline void *
-vl_api_acl_rule_t_print (vl_api_acl_rule_t * a, void *handle)
-{
-  vl_print (handle, "vl_api_acl_rule_t:\n");
-  vl_print (handle, "is_permit: %u\n", (unsigned) a->is_permit);
-  vl_print (handle, "is_ipv6: %u\n", (unsigned) a->is_ipv6);
-  {
-    int _i;
-    for (_i = 0; _i < 16; _i++)
-      {
-        vl_print (handle, "src_ip_addr[%d]: %u\n", _i, a->src_ip_addr[_i]);
-      }
-  }
-  vl_print (handle, "src_ip_prefix_len: %u\n",
-            (unsigned) a->src_ip_prefix_len);
-  {
-    int _i;
-    for (_i = 0; _i < 16; _i++)
-      {
-        vl_print (handle, "dst_ip_addr[%d]: %u\n", _i, a->dst_ip_addr[_i]);
-      }
-  }
-  vl_print (handle, "dst_ip_prefix_len: %u\n",
-            (unsigned) a->dst_ip_prefix_len);
-  vl_print (handle, "proto: %u\n", (unsigned) a->proto);
-  vl_print (handle, "srcport_or_icmptype_first: %u\n",
-            (unsigned) a->srcport_or_icmptype_first);
-  vl_print (handle, "srcport_or_icmptype_last: %u\n",
-            (unsigned) a->srcport_or_icmptype_last);
-  vl_print (handle, "dstport_or_icmpcode_first: %u\n",
-            (unsigned) a->dstport_or_icmpcode_first);
-  vl_print (handle, "dstport_or_icmpcode_last: %u\n",
-            (unsigned) a->dstport_or_icmpcode_last);
-  vl_print (handle, "tcp_flags_mask: %u\n", (unsigned) a->tcp_flags_mask);
-  vl_print (handle, "tcp_flags_value: %u\n", (unsigned) a->tcp_flags_value);
-  return handle;
-}
-
-static inline void *
-vl_api_acl_add_replace_t_print (vl_api_acl_add_replace_t * a, void *handle)
-{
-  int i;
-  vl_print (handle, "vl_api_acl_add_replace_t:\n");
-  vl_print (handle, "_vl_msg_id: %u\n", (unsigned) a->_vl_msg_id);
-  vl_print (handle, "client_index: %u\n", (unsigned) a->client_index);
-  vl_print (handle, "context: %u\n", (unsigned) a->context);
-  vl_print (handle, "acl_index: %u\n", (unsigned) a->acl_index);
-  vl_print (handle, "count: %u\n", (unsigned) a->count);
-  vl_print (handle, "r ----- \n");
-  for (i = 0; i < a->count; i++)
-    {
-      vl_print (handle, "  r[%d]:\n", i);
-      vl_api_acl_rule_t_print (&a->r[i], handle);
-    }
-  vl_print (handle, "r ----- END \n");
-  return handle;
-}
-
-
-static inline void *vl_api_acl_details_t_print (vl_api_acl_details_t *a,void *handle)
-{
-    vl_print(handle, "vl_api_acl_details_t:\n");
-    vl_print(handle, "_vl_msg_id: %u\n", (unsigned) a->_vl_msg_id);
-    vl_print(handle, "context: %u\n", (unsigned) a->context);
-    vl_print(handle, "acl_index: %u\n", (unsigned) a->acl_index);
-    {
-        int _i;
-        for (_i = 0; _i < 64; _i++) {
-            vl_print(handle, "tag[%d]: %u\n", _i, a->tag[_i]);
-        }
-    }
-    vl_print(handle, "count: %u\n", (unsigned) a->count);
-    vl_print(handle, "r ----- \n");
-    // FIXME vl_api_acl_rule_t_print(&a->r, handle);
-    vl_print(handle, "r ----- END \n");
-    return handle;
-}
-
-static inline void *
-vl_api_macip_acl_rule_t_print (vl_api_macip_acl_rule_t * a, void *handle)
-{
-  vl_print (handle, "vl_api_macip_acl_rule_t:\n");
-  vl_print (handle, "is_permit: %u\n", (unsigned) a->is_permit);
-  vl_print (handle, "is_ipv6: %u\n", (unsigned) a->is_ipv6);
-  {
-    int _i;
-    for (_i = 0; _i < 6; _i++)
-      {
-        vl_print (handle, "src_mac[%d]: %u\n", _i, a->src_mac[_i]);
-      }
-  }
-  {
-    int _i;
-    for (_i = 0; _i < 6; _i++)
-      {
-        vl_print (handle, "src_mac_mask[%d]: %u\n", _i, a->src_mac_mask[_i]);
-      }
-  }
-  {
-    int _i;
-    for (_i = 0; _i < 16; _i++)
-      {
-        vl_print (handle, "src_ip_addr[%d]: %u\n", _i, a->src_ip_addr[_i]);
-      }
-  }
-  vl_print (handle, "src_ip_prefix_len: %u\n",
-            (unsigned) a->src_ip_prefix_len);
-  return handle;
-}
-
-static inline void *
-vl_api_macip_acl_add_t_print (vl_api_macip_acl_add_t * a, void *handle)
-{
-  int i;
-  vl_print (handle, "vl_api_macip_acl_add_t:\n");
-  vl_print (handle, "_vl_msg_id: %u\n", (unsigned) a->_vl_msg_id);
-  vl_print (handle, "client_index: %u\n", (unsigned) a->client_index);
-  vl_print (handle, "context: %u\n", (unsigned) a->context);
-  vl_print (handle, "count: %u\n", (unsigned) a->count);
-  vl_print (handle, "r ----- \n");
-  for (i = 0; i < a->count; i++)
-    {
-      vl_print (handle, "  r[%d]:\n", i);
-      vl_api_macip_acl_rule_t_print (&a->r[i], handle);
-    }
-  vl_print (handle, "r ----- END \n");
-  return handle;
-}
-
-static inline void *vl_api_macip_acl_details_t_print (vl_api_macip_acl_details_t *a,void *handle)
-{
-    int i;
-    vl_print(handle, "vl_api_macip_acl_details_t:\n");
-    vl_print(handle, "_vl_msg_id: %u\n", (unsigned) a->_vl_msg_id);
-    vl_print(handle, "context: %u\n", (unsigned) a->context);
-    vl_print(handle, "acl_index: %u\n", (unsigned) a->acl_index);
-    {
-        int _i;
-        for (_i = 0; _i < 64; _i++) {
-            vl_print(handle, "tag[%d]: %u\n", _i, a->tag[_i]);
-        }
-    }
-    vl_print(handle, "count: %u\n", (unsigned) a->count);
-    vl_print(handle, "r ----- \n");
-    for (i = 0; i < a->count; i++)
-      {
-        vl_print (handle, "  r[%d]:\n", i);
-        vl_api_macip_acl_rule_t_print (&a->r[i], handle);
-      }
-    vl_print(handle, "r ----- END \n");
-    return handle;
-}
-
-#endif /* vl_printfun */
-
-
-#ifdef vl_endianfun
-
-#undef clib_net_to_host_uword
-#ifdef LP64
-#define clib_net_to_host_uword clib_net_to_host_u64
-#else
-#define clib_net_to_host_uword clib_net_to_host_u32
-#endif
-
-/*
- * Manual endian/print functions created by copypasting the automatically
- * generated ones with small required adjustments. Appears the codegen
- * can't make code to print the contents of custom-type array.
- */
-
-static inline void
-vl_api_acl_rule_t_endian (vl_api_acl_rule_t * a)
-{
-  /* a->is_permit = a->is_permit (no-op) */
-  /* a->is_ipv6 = a->is_ipv6 (no-op) */
-  /* a->src_ip_addr[0..15] = a->src_ip_addr[0..15] (no-op) */
-  /* a->src_ip_prefix_len = a->src_ip_prefix_len (no-op) */
-  /* a->dst_ip_addr[0..15] = a->dst_ip_addr[0..15] (no-op) */
-  /* a->dst_ip_prefix_len = a->dst_ip_prefix_len (no-op) */
-  /* a->proto = a->proto (no-op) */
-  a->srcport_or_icmptype_first =
-    clib_net_to_host_u16 (a->srcport_or_icmptype_first);
-  a->srcport_or_icmptype_last =
-    clib_net_to_host_u16 (a->srcport_or_icmptype_last);
-  a->dstport_or_icmpcode_first =
-    clib_net_to_host_u16 (a->dstport_or_icmpcode_first);
-  a->dstport_or_icmpcode_last =
-    clib_net_to_host_u16 (a->dstport_or_icmpcode_last);
-  /* a->tcp_flags_mask = a->tcp_flags_mask (no-op) */
-  /* a->tcp_flags_value = a->tcp_flags_value (no-op) */
-}
-
-static inline void
-vl_api_acl_add_replace_t_endian (vl_api_acl_add_replace_t * a)
-{
-  int i;
-  a->_vl_msg_id = clib_net_to_host_u16 (a->_vl_msg_id);
-  a->client_index = clib_net_to_host_u32 (a->client_index);
-  a->context = clib_net_to_host_u32 (a->context);
-  a->acl_index = clib_net_to_host_u32 (a->acl_index);
-  a->count = clib_net_to_host_u32 (a->count);
-  for (i = 0; i < a->count; i++)
-    {
-      vl_api_acl_rule_t_endian (&a->r[i]);
-    }
-}
-
-static inline void vl_api_acl_details_t_endian (vl_api_acl_details_t *a)
-{
-    int i;
-    a->_vl_msg_id = clib_net_to_host_u16(a->_vl_msg_id);
-    a->context = clib_net_to_host_u32(a->context);
-    a->acl_index = clib_net_to_host_u32(a->acl_index);
-    /* a->tag[0..63] = a->tag[0..63] (no-op) */
-    a->count = clib_net_to_host_u32(a->count);
-    for (i = 0; i < a->count; i++)
-    {
-      vl_api_acl_rule_t_endian (&a->r[i]);
-    }
-}
-
-static inline void vl_api_acl_interface_list_details_t_endian (vl_api_acl_interface_list_details_t *a)
-{
-    int i;
-    a->_vl_msg_id = clib_net_to_host_u16(a->_vl_msg_id);
-    a->context = clib_net_to_host_u32(a->context);
-    a->sw_if_index = clib_net_to_host_u32(a->sw_if_index);
-    /* a->count = a->count (no-op) */
-    /* a->n_input = a->n_input (no-op) */
-    for(i=0; i<a->count; i++) {
-      a->acls[i] = clib_net_to_host_u32(a->acls[i]);
-    }
-}
-
-static inline void vl_api_acl_interface_set_acl_list_t_endian (vl_api_acl_interface_set_acl_list_t *a)
-{
-    int i;
-    a->_vl_msg_id = clib_net_to_host_u16(a->_vl_msg_id);
-    a->client_index = clib_net_to_host_u32(a->client_index);
-    a->context = clib_net_to_host_u32(a->context);
-    a->sw_if_index = clib_net_to_host_u32(a->sw_if_index);
-    /* a->count = a->count (no-op) */
-    /* a->n_input = a->n_input (no-op) */
-    for(i=0; i<a->count; i++) {
-      a->acls[i] = clib_net_to_host_u32(a->acls[i]);
-    }
-}
-
-static inline void
-vl_api_macip_acl_rule_t_endian (vl_api_macip_acl_rule_t * a)
-{
-  /* a->is_permit = a->is_permit (no-op) */
-  /* a->is_ipv6 = a->is_ipv6 (no-op) */
-  /* a->src_mac[0..5] = a->src_mac[0..5] (no-op) */
-  /* a->src_mac_mask[0..5] = a->src_mac_mask[0..5] (no-op) */
-  /* a->src_ip_addr[0..15] = a->src_ip_addr[0..15] (no-op) */
-  /* a->src_ip_prefix_len = a->src_ip_prefix_len (no-op) */
-}
-
-static inline void
-vl_api_macip_acl_add_t_endian (vl_api_macip_acl_add_t * a)
-{
-  int i;
-  a->_vl_msg_id = clib_net_to_host_u16 (a->_vl_msg_id);
-  a->client_index = clib_net_to_host_u32 (a->client_index);
-  a->context = clib_net_to_host_u32 (a->context);
-  a->count = clib_net_to_host_u32 (a->count);
-  for (i = 0; i < a->count; i++)
-    {
-      vl_api_macip_acl_rule_t_endian (&a->r[i]);
-    }
-}
-
-static inline void vl_api_macip_acl_details_t_endian (vl_api_macip_acl_details_t *a)
-{
-    int i;
-    a->_vl_msg_id = clib_net_to_host_u16(a->_vl_msg_id);
-    a->context = clib_net_to_host_u32(a->context);
-    a->acl_index = clib_net_to_host_u32(a->acl_index);
-    /* a->tag[0..63] = a->tag[0..63] (no-op) */
-    a->count = clib_net_to_host_u32(a->count);
-    for (i = 0; i < a->count; i++)
-      {
-        vl_api_macip_acl_rule_t_endian (&a->r[i]);
-      }
-}
-
-
-
-
-#endif /* vl_printfun */
-
-
diff --git a/plugins/acl-plugin/acl/acl_msg_enum.h b/plugins/acl-plugin/acl/acl_msg_enum.h
deleted file mode 100644
index 14d8b48c..00000000
--- a/plugins/acl-plugin/acl/acl_msg_enum.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_acl_msg_enum_h
-#define included_acl_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <acl/acl_all_api_h.h>
-    /* We'll want to know how many messages IDs we need... */
-    VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif
diff --git a/plugins/acl-plugin/acl/acl_test.c b/plugins/acl-plugin/acl/acl_test.c
deleted file mode 100644
index a0e413e1..00000000
--- a/plugins/acl-plugin/acl/acl_test.c
+++ /dev/null
@@ -1,1024 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * acl_test.c - test harness plugin
- *------------------------------------------------------------------
- */
-
-#include <vat/vat.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-#include <vppinfra/error.h>
-#include <vnet/ip/ip.h>
-#include <arpa/inet.h>
-
-uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
-
-/* Declare message IDs */
-#include <acl/acl_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <acl/acl_all_api_h.h>
-#undef vl_typedefs
-
-/* define message structures */
-#define vl_endianfun
-#include <acl/acl_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <acl/acl_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number. */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <acl/acl_all_api_h.h>
-#undef vl_api_version
-
-typedef struct {
-    /* API message ID base */
-    u16 msg_id_base;
-    vat_main_t *vat_main;
-} acl_test_main_t;
-
-acl_test_main_t acl_test_main;
-
-#define foreach_standard_reply_retval_handler   \
-_(acl_del_reply) \
-_(acl_interface_add_del_reply) \
-_(macip_acl_interface_add_del_reply) \
-_(acl_interface_set_acl_list_reply) \
-_(macip_acl_del_reply)
-
-#define foreach_reply_retval_aclindex_handler  \
-_(acl_add_replace_reply) \
-_(macip_acl_add_reply)
-
-#define _(n)                                            \
-    static void vl_api_##n##_t_handler                  \
-    (vl_api_##n##_t * mp)                               \
-    {                                                   \
-        vat_main_t * vam = acl_test_main.vat_main;   \
-        i32 retval = ntohl(mp->retval);                 \
-        if (vam->async_mode) {                          \
-            vam->async_errors += (retval < 0);          \
-        } else {                                        \
-            vam->retval = retval;                       \
-            vam->result_ready = 1;                      \
-        }                                               \
-    }
-foreach_standard_reply_retval_handler;
-#undef _
-
-#define _(n)                                            \
-    static void vl_api_##n##_t_handler                  \
-    (vl_api_##n##_t * mp)                               \
-    {                                                   \
-        vat_main_t * vam = acl_test_main.vat_main;   \
-        i32 retval = ntohl(mp->retval);                 \
-        if (vam->async_mode) {                          \
-            vam->async_errors += (retval < 0);          \
-        } else {                                        \
-            clib_warning("ACL index: %d", ntohl(mp->acl_index)); \
-            vam->retval = retval;                       \
-            vam->result_ready = 1;                      \
-        }                                               \
-    }
-foreach_reply_retval_aclindex_handler;
-#undef _
-
-/* These two ought to be in a library somewhere but they aren't */
-static uword
-my_unformat_mac_address (unformat_input_t * input, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  return unformat (input, "%x:%x:%x:%x:%x:%x", &a[0], &a[1], &a[2], &a[3],
-                   &a[4], &a[5]);
-}
-
-static u8 *
-my_format_mac_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
-                 a[0], a[1], a[2], a[3], a[4], a[5]);
-}
-
-
-
-static void vl_api_acl_plugin_get_version_reply_t_handler
-    (vl_api_acl_plugin_get_version_reply_t * mp)
-    {
-        vat_main_t * vam = acl_test_main.vat_main;
-        clib_warning("ACL plugin version: %d.%d", ntohl(mp->major), ntohl(mp->minor));
-        vam->result_ready = 1;
-    }
-
-static void vl_api_acl_interface_list_details_t_handler
-    (vl_api_acl_interface_list_details_t * mp)
-    {
-        int i;
-        vat_main_t * vam = acl_test_main.vat_main;
-        u8 *out = 0;
-        vl_api_acl_interface_list_details_t_endian(mp);
-	out = format(out, "sw_if_index: %d, count: %d, n_input: %d\n", mp->sw_if_index, mp->count, mp->n_input);
-        out = format(out, "   input ");
-	for(i=0; i<mp->count; i++) {
-          out = format(out, "%d ", mp->acls[i]);
-          if (i == mp->n_input-1)
-            out = format(out, "\n  output ");
-	}
-        out = format(out, "\n");
-        clib_warning("%s", out);
-        vec_free(out);
-        vam->result_ready = 1;
-    }
-
-
-static inline u8 *
-vl_api_acl_rule_t_pretty_format (u8 *out, vl_api_acl_rule_t * a)
-{
-  int af = a->is_ipv6 ? AF_INET6 : AF_INET;
-  u8 src[INET6_ADDRSTRLEN];
-  u8 dst[INET6_ADDRSTRLEN];
-  inet_ntop(af, a->src_ip_addr, (void *)src, sizeof(src));
-  inet_ntop(af, a->dst_ip_addr, (void *)dst, sizeof(dst));
-
-  out = format(out, "%s action %d src %s/%d dst %s/%d proto %d sport %d-%d dport %d-%d tcpflags %d %d",
-                     a->is_ipv6 ? "ipv6" : "ipv4", a->is_permit,
-                     src, a->src_ip_prefix_len,
-                     dst, a->dst_ip_prefix_len,
-                     a->proto,
-                     a->srcport_or_icmptype_first, a->srcport_or_icmptype_last,
-	             a->dstport_or_icmpcode_first, a->dstport_or_icmpcode_last,
-                     a->tcp_flags_mask, a->tcp_flags_value);
-  return(out);
-}
-
-
-
-static void vl_api_acl_details_t_handler
-    (vl_api_acl_details_t * mp)
-    {
-        int i;
-        vat_main_t * vam = acl_test_main.vat_main;
-        vl_api_acl_details_t_endian(mp);
-        u8 *out = 0;
-        out = format(0, "acl_index: %d, count: %d\n   tag {%s}\n", mp->acl_index, mp->count, mp->tag);
-	for(i=0; i<mp->count; i++) {
-          out = format(out, "   ");
-          out = vl_api_acl_rule_t_pretty_format(out, &mp->r[i]);
-          out = format(out, "%s\n", i<mp->count-1 ? "," : "");
-	}
-        clib_warning("%s", out);
-        vec_free(out);
-        vam->result_ready = 1;
-    }
-
-static inline u8 *
-vl_api_macip_acl_rule_t_pretty_format (u8 *out, vl_api_macip_acl_rule_t * a)
-{
-  int af = a->is_ipv6 ? AF_INET6 : AF_INET;
-  u8 src[INET6_ADDRSTRLEN];
-  inet_ntop(af, a->src_ip_addr, (void *)src, sizeof(src));
-
-  out = format(out, "%s action %d ip %s/%d mac %U mask %U",
-                     a->is_ipv6 ? "ipv6" : "ipv4", a->is_permit,
-                     src, a->src_ip_prefix_len,
-                     my_format_mac_address, a->src_mac,
-                     my_format_mac_address, a->src_mac_mask);
-  return(out);
-}
-
-
-static void vl_api_macip_acl_details_t_handler
-    (vl_api_macip_acl_details_t * mp)
-    {
-        int i;
-        vat_main_t * vam = acl_test_main.vat_main;
-        vl_api_macip_acl_details_t_endian(mp);
-        u8 *out = format(0,"MACIP acl_index: %d, count: %d\n   tag {%s}\n", mp->acl_index, mp->count, mp->tag);
-	for(i=0; i<mp->count; i++) {
-          out = format(out, "   ");
-          out = vl_api_macip_acl_rule_t_pretty_format(out, &mp->r[i]);
-          out = format(out, "%s\n", i<mp->count-1 ? "," : "");
-	}
-        clib_warning("%s", out);
-        vec_free(out);
-        vam->result_ready = 1;
-    }
-
-static void vl_api_macip_acl_interface_get_reply_t_handler
-    (vl_api_macip_acl_interface_get_reply_t * mp)
-    {
-        int i;
-        vat_main_t * vam = acl_test_main.vat_main;
-        u8 *out = format(0, "sw_if_index with MACIP ACL count: %d\n", ntohl(mp->count));
-	for(i=0; i<ntohl(mp->count); i++) {
-          out = format(out, "  macip_acl_interface_add_del sw_if_index %d add acl %d\n", i, ntohl(mp->acls[i]));
-	}
-        out = format(out, "\n");
-        clib_warning("%s", out);
-        vec_free(out);
-        vam->result_ready = 1;
-    }
-
-
-/*
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg                                       \
-_(ACL_ADD_REPLACE_REPLY, acl_add_replace_reply) \
-_(ACL_DEL_REPLY, acl_del_reply) \
-_(ACL_INTERFACE_ADD_DEL_REPLY, acl_interface_add_del_reply)  \
-_(ACL_INTERFACE_SET_ACL_LIST_REPLY, acl_interface_set_acl_list_reply) \
-_(ACL_INTERFACE_LIST_DETAILS, acl_interface_list_details)  \
-_(ACL_DETAILS, acl_details)  \
-_(MACIP_ACL_ADD_REPLY, macip_acl_add_reply) \
-_(MACIP_ACL_DEL_REPLY, macip_acl_del_reply) \
-_(MACIP_ACL_DETAILS, macip_acl_details)  \
-_(MACIP_ACL_INTERFACE_ADD_DEL_REPLY, macip_acl_interface_add_del_reply)  \
-_(MACIP_ACL_INTERFACE_GET_REPLY, macip_acl_interface_get_reply)  \
-_(ACL_PLUGIN_GET_VERSION_REPLY, acl_plugin_get_version_reply)
-
-/* M: construct, but don't yet send a message */
-
-#define M(T,t)                                                  \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp));                         \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-#define M2(T,t,n)                                               \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W                                       \
-do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
-                                                \
-    while (vat_time_now (vam) < timeout) {      \
-        if (vam->result_ready == 1) {           \
-            return (vam->retval);               \
-        }                                       \
-    }                                           \
-    return -99;                                 \
-} while(0);
-
-static int api_acl_plugin_get_version (vat_main_t * vam)
-{
-    acl_test_main_t * sm = &acl_test_main;
-    vl_api_acl_plugin_get_version_t * mp;
-    u32 msg_size = sizeof(*mp);
-    f64 timeout;
-
-    vam->result_ready = 0;
-    mp = vl_msg_api_alloc_as_if_client(msg_size);
-    memset (mp, 0, msg_size);
-    mp->_vl_msg_id = ntohs (VL_API_ACL_PLUGIN_GET_VERSION + sm->msg_id_base);
-    mp->client_index = vam->my_client_index;
-
-    /* send it... */
-    S;
-
-    /* Wait for a reply... */
-    W;
-
-    return 0;
-}
-
-static int api_macip_acl_interface_get (vat_main_t * vam)
-{
-    acl_test_main_t * sm = &acl_test_main;
-    vl_api_acl_plugin_get_version_t * mp;
-    u32 msg_size = sizeof(*mp);
-    f64 timeout;
-
-    vam->result_ready = 0;
-    mp = vl_msg_api_alloc_as_if_client(msg_size);
-    memset (mp, 0, msg_size);
-    mp->_vl_msg_id = ntohs (VL_API_MACIP_ACL_INTERFACE_GET + sm->msg_id_base);
-    mp->client_index = vam->my_client_index;
-
-    /* send it... */
-    S;
-
-    /* Wait for a reply... */
-    W;
-
-    return 0;
-}
-
-#define vec_validate_acl_rules(v, idx) \
-  do {                                 \
-    if (vec_len(v) < idx+1) {  \
-      vec_validate(v, idx); \
-      v[idx].is_permit = 0x1; \
-      v[idx].srcport_or_icmptype_last = 0xffff; \
-      v[idx].dstport_or_icmpcode_last = 0xffff; \
-    } \
-  } while (0)
-
-
-static int api_acl_add_replace (vat_main_t * vam)
-{
-    acl_test_main_t * sm = &acl_test_main;
-    unformat_input_t * i = vam->input;
-    f64 timeout;
-    vl_api_acl_add_replace_t * mp;
-    u32 acl_index = ~0;
-    u32 msg_size = sizeof (*mp); /* without the rules */
-
-    vl_api_acl_rule_t *rules = 0;
-    int rule_idx = 0;
-    int n_rules = 0;
-    u32 proto = 0;
-    u32 port1 = 0;
-    u32 port2 = 0;
-    u32 action = 0;
-    u32 tcpflags, tcpmask;
-    u32 src_prefix_length = 0, dst_prefix_length = 0;
-    ip4_address_t src_v4address, dst_v4address;
-    ip6_address_t src_v6address, dst_v6address;
-    u8 *tag = 0;
-
-    if (!unformat (i, "%d", &acl_index)) {
-	/* Just assume -1 */
-    }
-
-    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-        if (unformat (i, "ipv6"))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            rules[rule_idx].is_ipv6 = 1;
-          }
-        else if (unformat (i, "ipv4"))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            rules[rule_idx].is_ipv6 = 0;
-          }
-        else if (unformat (i, "permit+reflect"))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            rules[rule_idx].is_permit = 2;
-          }
-        else if (unformat (i, "permit"))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            rules[rule_idx].is_permit = 1;
-          }
-        else if (unformat (i, "action %d", &action))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            rules[rule_idx].is_permit = action;
-          }
-        else if (unformat (i, "src %U/%d",
-         unformat_ip4_address, &src_v4address, &src_prefix_length))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            memcpy (rules[rule_idx].src_ip_addr, &src_v4address, 4);
-            rules[rule_idx].src_ip_prefix_len = src_prefix_length;
-            rules[rule_idx].is_ipv6 = 0;
-          }
-        else if (unformat (i, "src %U/%d",
-         unformat_ip6_address, &src_v6address, &src_prefix_length))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            memcpy (rules[rule_idx].src_ip_addr, &src_v6address, 16);
-            rules[rule_idx].src_ip_prefix_len = src_prefix_length;
-            rules[rule_idx].is_ipv6 = 1;
-          }
-        else if (unformat (i, "dst %U/%d",
-         unformat_ip4_address, &dst_v4address, &dst_prefix_length))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            memcpy (rules[rule_idx].dst_ip_addr, &dst_v4address, 4);
-            rules[rule_idx].dst_ip_prefix_len = dst_prefix_length;
-            rules[rule_idx].is_ipv6 = 0;
-          }
-        else if (unformat (i, "dst %U/%d",
-         unformat_ip6_address, &dst_v6address, &dst_prefix_length))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            memcpy (rules[rule_idx].dst_ip_addr, &dst_v6address, 16);
-            rules[rule_idx].dst_ip_prefix_len = dst_prefix_length;
-            rules[rule_idx].is_ipv6 = 1;
-          }
-        else if (unformat (i, "sport %d-%d", &port1, &port2))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            rules[rule_idx].srcport_or_icmptype_first = htons(port1);
-            rules[rule_idx].srcport_or_icmptype_last = htons(port2);
-          }
-        else if (unformat (i, "sport %d", &port1))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            rules[rule_idx].srcport_or_icmptype_first = htons(port1);
-            rules[rule_idx].srcport_or_icmptype_last = htons(port1);
-          }
-        else if (unformat (i, "dport %d-%d", &port1, &port2))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            rules[rule_idx].dstport_or_icmpcode_first = htons(port1);
-            rules[rule_idx].dstport_or_icmpcode_last = htons(port2);
-          }
-        else if (unformat (i, "dport %d", &port1))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            rules[rule_idx].dstport_or_icmpcode_first = htons(port1);
-            rules[rule_idx].dstport_or_icmpcode_last = htons(port1);
-          }
-        else if (unformat (i, "tcpflags %d %d", &tcpflags, &tcpmask))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            rules[rule_idx].tcp_flags_value = tcpflags;
-            rules[rule_idx].tcp_flags_mask = tcpmask;
-          }
-        else if (unformat (i, "proto %d", &proto))
-          {
-            vec_validate_acl_rules(rules, rule_idx);
-            rules[rule_idx].proto = proto;
-          }
-        else if (unformat (i, "tag %s", &tag))
-          {
-          }
-        else if (unformat (i, ","))
-          {
-            rule_idx++;
-            vec_validate_acl_rules(rules, rule_idx);
-          }
-        else
-    break;
-    }
-
-    /* Construct the API message */
-    vam->result_ready = 0;
-
-    if(rules)
-      n_rules = vec_len(rules);
-    else
-      n_rules = 0;
-
-    msg_size += n_rules*sizeof(rules[0]);
-
-    mp = vl_msg_api_alloc_as_if_client(msg_size);
-    memset (mp, 0, msg_size);
-    mp->_vl_msg_id = ntohs (VL_API_ACL_ADD_REPLACE + sm->msg_id_base);
-    mp->client_index = vam->my_client_index;
-    if (n_rules > 0)
-      clib_memcpy(mp->r, rules, n_rules*sizeof (vl_api_acl_rule_t));
-    if (tag)
-      {
-        if (vec_len(tag) >= sizeof(mp->tag))
-          {
-            tag[sizeof(mp->tag)-1] = 0;
-            _vec_len(tag) = sizeof(mp->tag);
-          }
-        clib_memcpy(mp->tag, tag, vec_len(tag));
-        vec_free(tag);
-      }
-    mp->acl_index = ntohl(acl_index);
-    mp->count = htonl(n_rules);
-
-    /* send it... */
-    S;
-
-    /* Wait for a reply... */
-    W;
-}
-
-static int api_acl_del (vat_main_t * vam)
-{
-    acl_test_main_t * sm = &acl_test_main;
-    unformat_input_t * i = vam->input;
-    f64 timeout;
-    vl_api_acl_del_t * mp;
-    u32 acl_index = ~0;
-
-    if (!unformat (i, "%d", &acl_index)) {
-      errmsg ("missing acl index\n");
-      return -99;
-    }
-
-    /* Construct the API message */
-    M(ACL_DEL, acl_del);
-    mp->acl_index = ntohl(acl_index);
-
-    /* send it... */
-    S;
-
-    /* Wait for a reply... */
-    W;
-}
-
-static int api_macip_acl_del (vat_main_t * vam)
-{
-    acl_test_main_t * sm = &acl_test_main;
-    unformat_input_t * i = vam->input;
-    f64 timeout;
-    vl_api_acl_del_t * mp;
-    u32 acl_index = ~0;
-
-    if (!unformat (i, "%d", &acl_index)) {
-      errmsg ("missing acl index\n");
-      return -99;
-    }
-
-    /* Construct the API message */
-    M(MACIP_ACL_DEL, acl_del);
-    mp->acl_index = ntohl(acl_index);
-
-    /* send it... */
-    S;
-
-    /* Wait for a reply... */
-    W;
-}
-
-static int api_acl_interface_add_del (vat_main_t * vam)
-{
-    acl_test_main_t * sm = &acl_test_main;
-    unformat_input_t * i = vam->input;
-    f64 timeout;
-    vl_api_acl_interface_add_del_t * mp;
-    u32 sw_if_index = ~0;
-    u32 acl_index = ~0;
-    u8 is_input = 0;
-    u8 is_add = 0;
-
-//    acl_interface_add_del <intfc> | sw_if_index <if-idx> acl_index <acl-idx> [out] [del]
-
-    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-        if (unformat (i, "%d", &acl_index))
-    ;
-        else
-    break;
-    }
-
-
-    /* Parse args required to build the message */
-    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
-        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
-            ;
-        else if (unformat (i, "sw_if_index %d", &sw_if_index))
-            ;
-        else if (unformat (i, "add"))
-            is_add = 1;
-        else if (unformat (i, "del"))
-            is_add = 0;
-        else if (unformat (i, "acl %d", &acl_index))
-            ;
-        else if (unformat (i, "input"))
-            is_input = 1;
-        else if (unformat (i, "output"))
-            is_input = 0;
-        else
-            break;
-    }
-
-    if (sw_if_index == ~0) {
-        errmsg ("missing interface name / explicit sw_if_index number \n");
-        return -99;
-    }
-
-    if (acl_index == ~0) {
-        errmsg ("missing ACL index\n");
-        return -99;
-    }
-
-
-
-    /* Construct the API message */
-    M(ACL_INTERFACE_ADD_DEL, acl_interface_add_del);
-    mp->acl_index = ntohl(acl_index);
-    mp->sw_if_index = ntohl(sw_if_index);
-    mp->is_add = is_add;
-    mp->is_input = is_input;
-
-    /* send it... */
-    S;
-
-    /* Wait for a reply... */
-    W;
-}
-
-static int api_macip_acl_interface_add_del (vat_main_t * vam)
-{
-    acl_test_main_t * sm = &acl_test_main;
-    unformat_input_t * i = vam->input;
-    f64 timeout;
-    vl_api_macip_acl_interface_add_del_t * mp;
-    u32 sw_if_index = ~0;
-    u32 acl_index = ~0;
-    u8 is_add = 0;
-
-    /* Parse args required to build the message */
-    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
-        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
-            ;
-        else if (unformat (i, "sw_if_index %d", &sw_if_index))
-            ;
-        else if (unformat (i, "add"))
-            is_add = 1;
-        else if (unformat (i, "del"))
-            is_add = 0;
-        else if (unformat (i, "acl %d", &acl_index))
-            ;
-        else
-            break;
-    }
-
-    if (sw_if_index == ~0) {
-        errmsg ("missing interface name / explicit sw_if_index number \n");
-        return -99;
-    }
-
-    if (acl_index == ~0) {
-        errmsg ("missing ACL index\n");
-        return -99;
-    }
-
-
-
-    /* Construct the API message */
-    M(MACIP_ACL_INTERFACE_ADD_DEL, macip_acl_interface_add_del);
-    mp->acl_index = ntohl(acl_index);
-    mp->sw_if_index = ntohl(sw_if_index);
-    mp->is_add = is_add;
-
-    /* send it... */
-    S;
-
-    /* Wait for a reply... */
-    W;
-}
-
-static int api_acl_interface_set_acl_list (vat_main_t * vam)
-{
-    acl_test_main_t * sm = &acl_test_main;
-    unformat_input_t * i = vam->input;
-    f64 timeout;
-    vl_api_acl_interface_set_acl_list_t * mp;
-    u32 sw_if_index = ~0;
-    u32 acl_index = ~0;
-    u32 *inacls = 0;
-    u32 *outacls = 0;
-    u8 is_input = 0;
-
-//  acl_interface_set_acl_list <intfc> | sw_if_index <if-idx> input [acl-idx list] output [acl-idx list]
-
-    /* Parse args required to build the message */
-    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
-        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
-            ;
-        else if (unformat (i, "sw_if_index %d", &sw_if_index))
-            ;
-        else if (unformat (i, "%d", &acl_index))
-          {
-            if(is_input)
-              vec_add1(inacls, htonl(acl_index));
-            else
-              vec_add1(outacls, htonl(acl_index));
-          }
-        else if (unformat (i, "acl %d", &acl_index))
-            ;
-        else if (unformat (i, "input"))
-            is_input = 1;
-        else if (unformat (i, "output"))
-            is_input = 0;
-        else
-            break;
-    }
-
-    if (sw_if_index == ~0) {
-        errmsg ("missing interface name / explicit sw_if_index number \n");
-        return -99;
-    }
-
-    /* Construct the API message */
-    M2(ACL_INTERFACE_SET_ACL_LIST, acl_interface_set_acl_list, sizeof(u32) * (vec_len(inacls) + vec_len(outacls)));
-    mp->sw_if_index = ntohl(sw_if_index);
-    mp->n_input = vec_len(inacls);
-    mp->count = vec_len(inacls) + vec_len(outacls);
-    vec_append(inacls, outacls);
-    if (vec_len(inacls) > 0)
-      clib_memcpy(mp->acls, inacls, vec_len(inacls)*sizeof(u32));
-
-    /* send it... */
-    S;
-
-    /* Wait for a reply... */
-    W;
-}
-
-
-static int api_acl_interface_list_dump (vat_main_t * vam)
-{
-    acl_test_main_t * sm = &acl_test_main;
-    unformat_input_t * i = vam->input;
-    f64 timeout;
-    u32 sw_if_index = ~0;
-    vl_api_acl_interface_list_dump_t * mp;
-
-    /* Parse args required to build the message */
-    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
-        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
-            ;
-        else if (unformat (i, "sw_if_index %d", &sw_if_index))
-            ;
-        else
-            break;
-    }
-
-    /* Construct the API message */
-    M(ACL_INTERFACE_LIST_DUMP, acl_interface_list_dump);
-    mp->sw_if_index = ntohl (sw_if_index);
-
-    /* send it... */
-    S;
-
-    /* Wait for a reply... */
-    W;
-}
-
-static int api_acl_dump (vat_main_t * vam)
-{
-    acl_test_main_t * sm = &acl_test_main;
-    unformat_input_t * i = vam->input;
-    f64 timeout;
-    u32 acl_index = ~0;
-    vl_api_acl_dump_t * mp;
-
-    /* Parse args required to build the message */
-    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
-        if (unformat (i, "%d", &acl_index))
-            ;
-        else
-            break;
-    }
-
-    /* Construct the API message */
-    M(ACL_DUMP, acl_dump);
-    mp->acl_index = ntohl (acl_index);
-
-    /* send it... */
-    S;
-
-    /* Wait for a reply... */
-    W;
-}
-
-static int api_macip_acl_dump (vat_main_t * vam)
-{
-    acl_test_main_t * sm = &acl_test_main;
-    unformat_input_t * i = vam->input;
-    f64 timeout;
-    u32 acl_index = ~0;
-    vl_api_acl_dump_t * mp;
-
-    /* Parse args required to build the message */
-    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
-        if (unformat (i, "%d", &acl_index))
-            ;
-        else
-            break;
-    }
-
-    /* Construct the API message */
-    M(MACIP_ACL_DUMP, macip_acl_dump);
-    mp->acl_index = ntohl (acl_index);
-
-    /* send it... */
-    S;
-
-    /* Wait for a reply... */
-    W;
-}
-
-#define vec_validate_macip_acl_rules(v, idx) \
-  do {                                 \
-    if (vec_len(v) < idx+1) {  \
-      vec_validate(v, idx); \
-      v[idx].is_permit = 0x1; \
-    } \
-  } while (0)
-
-
-static int api_macip_acl_add (vat_main_t * vam)
-{
-    acl_test_main_t * sm = &acl_test_main;
-    unformat_input_t * i = vam->input;
-    f64 timeout;
-    vl_api_macip_acl_add_t * mp;
-    u32 msg_size = sizeof (*mp); /* without the rules */
-
-    vl_api_macip_acl_rule_t *rules = 0;
-    int rule_idx = 0;
-    int n_rules = 0;
-    u32 src_prefix_length = 0;
-    u32 action = 0;
-    ip4_address_t src_v4address;
-    ip6_address_t src_v6address;
-    u8 src_mac[6];
-    u8 *tag = 0;
-    u8 mac_mask_all_1[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-
-    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-        if (unformat (i, "ipv6"))
-          {
-            vec_validate_macip_acl_rules(rules, rule_idx);
-            rules[rule_idx].is_ipv6 = 1;
-          }
-        else if (unformat (i, "ipv4"))
-          {
-            vec_validate_macip_acl_rules(rules, rule_idx);
-            rules[rule_idx].is_ipv6 = 1;
-          }
-        else if (unformat (i, "permit"))
-          {
-            vec_validate_macip_acl_rules(rules, rule_idx);
-            rules[rule_idx].is_permit = 1;
-          }
-        else if (unformat (i, "deny"))
-          {
-            vec_validate_macip_acl_rules(rules, rule_idx);
-            rules[rule_idx].is_permit = 0;
-          }
-        else if (unformat (i, "action %d", &action))
-          {
-            vec_validate_macip_acl_rules(rules, rule_idx);
-            rules[rule_idx].is_permit = action;
-          }
-        else if (unformat (i, "ip %U/%d",
-         unformat_ip4_address, &src_v4address, &src_prefix_length))
-          {
-            vec_validate_macip_acl_rules(rules, rule_idx);
-            memcpy (rules[rule_idx].src_ip_addr, &src_v4address, 4);
-            rules[rule_idx].src_ip_prefix_len = src_prefix_length;
-            rules[rule_idx].is_ipv6 = 0;
-          }
-        else if (unformat (i, "ip %U/%d",
-         unformat_ip6_address, &src_v6address, &src_prefix_length))
-          {
-            vec_validate_macip_acl_rules(rules, rule_idx);
-            memcpy (rules[rule_idx].src_ip_addr, &src_v6address, 16);
-            rules[rule_idx].src_ip_prefix_len = src_prefix_length;
-            rules[rule_idx].is_ipv6 = 1;
-          }
-        else if (unformat (i, "mac %U",
-         my_unformat_mac_address, &src_mac))
-          {
-            vec_validate_macip_acl_rules(rules, rule_idx);
-            memcpy (rules[rule_idx].src_mac, &src_mac, 6);
-            memcpy (rules[rule_idx].src_mac_mask, &mac_mask_all_1, 6);
-          }
-        else if (unformat (i, "mask %U",
-         my_unformat_mac_address, &src_mac))
-          {
-            vec_validate_macip_acl_rules(rules, rule_idx);
-            memcpy (rules[rule_idx].src_mac_mask, &src_mac, 6);
-          }
-        else if (unformat (i, "tag %s", &tag))
-          {
-          }
-        else if (unformat (i, ","))
-          {
-            rule_idx++;
-            vec_validate_macip_acl_rules(rules, rule_idx);
-          }
-        else
-    break;
-    }
-
-    /* Construct the API message */
-    vam->result_ready = 0;
-
-    if(rules)
-      n_rules = vec_len(rules);
-    else
-      n_rules = 0;
-
-    msg_size += n_rules*sizeof(rules[0]);
-
-    mp = vl_msg_api_alloc_as_if_client(msg_size);
-    memset (mp, 0, msg_size);
-    mp->_vl_msg_id = ntohs (VL_API_MACIP_ACL_ADD + sm->msg_id_base);
-    mp->client_index = vam->my_client_index;
-    if (n_rules > 0)
-      clib_memcpy(mp->r, rules, n_rules*sizeof (mp->r[0]));
-    if (tag)
-      {
-        if (vec_len(tag) >= sizeof(mp->tag))
-          {
-            tag[sizeof(mp->tag)-1] = 0;
-            _vec_len(tag) = sizeof(mp->tag);
-          }
-        clib_memcpy(mp->tag, tag, vec_len(tag));
-        vec_free(tag);
-      }
-
-    mp->count = htonl(n_rules);
-
-    /* send it... */
-    S;
-
-    /* Wait for a reply... */
-    W;
-}
-
-/*
- * List of messages that the api test plugin sends,
- * and that the data plane plugin processes
- */
-#define foreach_vpe_api_msg \
-_(acl_plugin_get_version, "") \
-_(acl_add_replace, "<acl-idx> [<ipv4|ipv6> <permit|permit+reflect|deny|action N> [src IP/plen] [dst IP/plen] [sport X-Y] [dport X-Y] [proto P] [tcpflags FL MASK], ... , ...") \
-_(acl_del, "<acl-idx>") \
-_(acl_dump, "[<acl-idx>]") \
-_(acl_interface_add_del, "<intfc> | sw_if_index <if-idx> [add|del] [input|output] acl <acl-idx>") \
-_(acl_interface_set_acl_list, "<intfc> | sw_if_index <if-idx> input [acl-idx list] output [acl-idx list]") \
-_(acl_interface_list_dump, "[<intfc> | sw_if_index <if-idx>]") \
-_(macip_acl_add, "...") \
-_(macip_acl_del, "<acl-idx>")\
-_(macip_acl_dump, "[<acl-idx>]") \
-_(macip_acl_interface_add_del, "<intfc> | sw_if_index <if-idx> [add|del] acl <acl-idx>") \
-_(macip_acl_interface_get, "")
-
-
-
-void vat_api_hookup (vat_main_t *vam)
-{
-    acl_test_main_t * sm = &acl_test_main;
-    /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,                                  \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-    foreach_vpe_api_reply_msg;
-#undef _
-
-    /* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
-    foreach_vpe_api_msg;
-#undef _
-
-    /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
-    foreach_vpe_api_msg;
-#undef _
-}
-
-clib_error_t * vat_plugin_register (vat_main_t *vam)
-{
-  acl_test_main_t * sm = &acl_test_main;
-  u8 * name;
-
-  sm->vat_main = vam;
-
-  name = format (0, "acl_%08x%c", api_version, 0);
-  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (sm->msg_id_base != (u16) ~0)
-    vat_api_hookup (vam);
-
-  vec_free(name);
-
-  return 0;
-}
diff --git a/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/AclExpectedDumpData.java b/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/AclExpectedDumpData.java
deleted file mode 100644
index 979edbc4..00000000
--- a/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/AclExpectedDumpData.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.acl.test;
-
-
-import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_ADDRESS_2_AS_ARRAY;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_ADDRESS_AS_ARRAY;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_DST_ICMP_TYPE_END;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_DST_ICMP_TYPE_START;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_MAC;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_MAC_MASK;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_PREFIX;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_PREFIX_2;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_SRC_ICMP_TYPE_END;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_SRC_ICMP_TYPE_START;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.ICMP_PROTOCOL;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_ADDRESS_2_AS_ARRAY;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_ADDRESS_AS_ARRAY;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_DST_PORT_RANGE_END;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_DST_PORT_RANGE_START;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_MAC;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_MAC_MASK;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_PREFIX;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_PREFIX_2;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_SRC_PORT_RANGE_END;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_SRC_PORT_RANGE_START;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.UDP_PROTOCOL;
-
-import io.fd.vpp.jvpp.acl.dto.AclDetails;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetails;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDetails;
-import io.fd.vpp.jvpp.acl.types.AclRule;
-import io.fd.vpp.jvpp.acl.types.MacipAclRule;
-import java.util.Arrays;
-
-class AclExpectedDumpData {
-
-    static void verifyMacIpDump(final MacipAclDetails macipAclDetails) {
-        // asserting data create by previous call
-        assertEquals(0, macipAclDetails.aclIndex);
-        assertEquals(2, macipAclDetails.count);
-
-        final MacipAclRule currentIpv4Rule = macipAclDetails.r[0];
-        final MacipAclRule currentIpv6Rule = macipAclDetails.r[1];
-
-        // Comparing one property at the time to better pointer if something is wrong
-        //Ipv4 rule
-        assertEquals(0, currentIpv4Rule.isIpv6);
-        assertEquals(1, currentIpv4Rule.isPermit);
-
-        // cutting expected ipv4 to 4 bytes,vpp sends it as 16 always
-        assertArrays(FIRST_RULE_ADDRESS_AS_ARRAY, Arrays.copyOfRange(currentIpv4Rule.srcIpAddr, 0, 4));
-        assertEquals(FIRST_RULE_PREFIX, currentIpv4Rule.srcIpPrefixLen);
-        assertArrays(FIRST_RULE_MAC, currentIpv4Rule.srcMac);
-        assertArrays(FIRST_RULE_MAC_MASK, currentIpv4Rule.srcMacMask);
-
-        //Ipv6 rule
-        assertEquals(1, currentIpv6Rule.isIpv6);
-        assertEquals(0, currentIpv6Rule.isPermit);
-        assertArrays(SECOND_RULE_ADDRESS_AS_ARRAY, currentIpv6Rule.srcIpAddr);
-        assertEquals(SECOND_RULE_PREFIX, currentIpv6Rule.srcIpPrefixLen);
-        assertArrays(SECOND_RULE_MAC, currentIpv6Rule.srcMac);
-        assertArrays(SECOND_RULE_MAC_MASK, currentIpv6Rule.srcMacMask);
-    }
-
-    static void verifyAclDump(final AclDetails aclDetails) {
-        assertEquals(0, aclDetails.aclIndex);
-        assertEquals(2, aclDetails.count);
-
-        final AclRule currentIpv4Rule = aclDetails.r[0];
-        final AclRule currentIpv6Rule = aclDetails.r[1];
-
-        // Comparing one property at the time to better pointer if something is wrong
-        //Ipv4 rule
-        assertEquals(0, currentIpv4Rule.isIpv6);
-        assertEquals(1, currentIpv4Rule.isPermit);
-
-        // cutting expected ipv4 to 4 bytes,vpp sends it as 16 always
-        assertArrays(FIRST_RULE_ADDRESS_AS_ARRAY, Arrays.copyOfRange(currentIpv4Rule.srcIpAddr, 0, 4));
-        assertEquals(FIRST_RULE_PREFIX, currentIpv4Rule.srcIpPrefixLen);
-        assertArrays(FIRST_RULE_ADDRESS_2_AS_ARRAY, Arrays.copyOfRange(currentIpv4Rule.dstIpAddr, 0, 4));
-        assertEquals(FIRST_RULE_PREFIX_2, currentIpv4Rule.dstIpPrefixLen);
-
-        assertEquals(ICMP_PROTOCOL, currentIpv4Rule.proto);
-        assertEquals(FIRST_RULE_SRC_ICMP_TYPE_START, currentIpv4Rule.srcportOrIcmptypeFirst);
-        assertEquals(FIRST_RULE_SRC_ICMP_TYPE_END, currentIpv4Rule.srcportOrIcmptypeLast);
-        assertEquals(FIRST_RULE_DST_ICMP_TYPE_START, currentIpv4Rule.dstportOrIcmpcodeFirst);
-        assertEquals(FIRST_RULE_DST_ICMP_TYPE_END, currentIpv4Rule.dstportOrIcmpcodeLast);
-
-        assertArrays(SECOND_RULE_ADDRESS_AS_ARRAY, currentIpv6Rule.srcIpAddr);
-        assertEquals(SECOND_RULE_PREFIX, currentIpv6Rule.srcIpPrefixLen);
-        assertArrays(SECOND_RULE_ADDRESS_2_AS_ARRAY, currentIpv6Rule.dstIpAddr);
-        assertEquals(SECOND_RULE_PREFIX_2, currentIpv6Rule.dstIpPrefixLen);
-
-        assertEquals(UDP_PROTOCOL, currentIpv6Rule.proto);
-        assertEquals(SECOND_RULE_SRC_PORT_RANGE_START, currentIpv6Rule.srcportOrIcmptypeFirst);
-        assertEquals(SECOND_RULE_SRC_PORT_RANGE_END, currentIpv6Rule.srcportOrIcmptypeLast);
-        assertEquals(SECOND_RULE_DST_PORT_RANGE_START, currentIpv6Rule.dstportOrIcmpcodeFirst);
-        assertEquals(SECOND_RULE_DST_PORT_RANGE_END, currentIpv6Rule.dstportOrIcmpcodeLast);
-    }
-
-    static void verifyAclInterfaceList(final AclInterfaceListDetails aclInterfaceListDetails) {
-        assertEquals(1, aclInterfaceListDetails.count);
-        assertEquals(1, aclInterfaceListDetails.acls[0]);
-        assertEquals(0, aclInterfaceListDetails.nInput);
-        assertEquals(0, aclInterfaceListDetails.swIfIndex);
-    }
-
-    private static void assertArrays(final byte[] expected, final byte[] actual) {
-        if (!Arrays.equals(expected, actual)) {
-            throw new IllegalArgumentException(
-                    String.format("Expected[%s]/Actual[%s]", Arrays.toString(expected), Arrays.toString(actual)));
-        }
-    }
-
-    private static void assertEquals(final int expected, final int actual) {
-        if (expected != actual) {
-            throw new IllegalArgumentException(String.format("Expected[%s]/Actual[%s]", expected, actual));
-        }
-    }
-}
diff --git a/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/AclTestData.java b/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/AclTestData.java
deleted file mode 100644
index 5d228eea..00000000
--- a/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/AclTestData.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.acl.test;
-
-
-import io.fd.vpp.jvpp.acl.types.AclRule;
-import io.fd.vpp.jvpp.acl.types.MacipAclRule;
-
-class AclTestData {
-
-    static final byte[] FIRST_RULE_ADDRESS_AS_ARRAY = {-64, -88, 2, 1};
-    static final byte[] FIRST_RULE_ADDRESS_2_AS_ARRAY = {-64, -88, 2, 3};
-    static final byte[] SECOND_RULE_ADDRESS_AS_ARRAY =
-            {32, 1, 13, -72, 10, 11, 18, -16, 0, 0, 0, 0, 0, 0, 0, 1};
-    static final byte[] SECOND_RULE_ADDRESS_2_AS_ARRAY =
-            {32, 1, 13, -72, 10, 11, 18, -16, 0, 0, 0, 0, 0, 0, 0, 1};
-    static final byte[] FIRST_RULE_MAC = {11, 11, 11, 11, 11, 11};
-    static final byte[] FIRST_RULE_MAC_MASK = {0, 0, 0, 0, 0, 0};
-    static final byte[] SECOND_RULE_MAC = {11, 12, 11, 11, 12, 11};
-    static final byte[] SECOND_RULE_MAC_MASK = {(byte) 170, 0, 0, 0, 0, 0};
-    static final int FIRST_RULE_PREFIX = 32;
-    static final int FIRST_RULE_PREFIX_2 = 24;
-    static final int SECOND_RULE_PREFIX = 64;
-    static final int SECOND_RULE_PREFIX_2 = 62;
-    static final int FIRST_RULE_DST_ICMP_TYPE_START = 0;
-    static final int FIRST_RULE_DST_ICMP_TYPE_END = 8;
-    static final int FIRST_RULE_SRC_ICMP_TYPE_START = 1;
-    static final int FIRST_RULE_SRC_ICMP_TYPE_END = 7;
-    static final int ICMP_PROTOCOL = 1;
-    static final int SECOND_RULE_DST_PORT_RANGE_START = 2000;
-    static final int SECOND_RULE_DST_PORT_RANGE_END = 6000;
-    static final int SECOND_RULE_SRC_PORT_RANGE_START = 400;
-    static final int SECOND_RULE_SRC_PORT_RANGE_END = 2047;
-    static final int UDP_PROTOCOL = 17;
-
-
-    static MacipAclRule[] createMacipRules() {
-        MacipAclRule ruleOne = new MacipAclRule();
-        ruleOne.isIpv6 = 0;
-        ruleOne.isPermit = 1;
-        ruleOne.srcIpAddr = FIRST_RULE_ADDRESS_AS_ARRAY;
-        ruleOne.srcIpPrefixLen = FIRST_RULE_PREFIX;
-        ruleOne.srcMac = FIRST_RULE_MAC;
-        ruleOne.srcMacMask = FIRST_RULE_MAC_MASK;// no mask
-
-        MacipAclRule ruleTwo = new MacipAclRule();
-        ruleTwo.isIpv6 = 1;
-        ruleTwo.isPermit = 0;
-        ruleTwo.srcIpAddr = SECOND_RULE_ADDRESS_AS_ARRAY;
-        ruleTwo.srcIpPrefixLen = SECOND_RULE_PREFIX;
-        ruleTwo.srcMac = SECOND_RULE_MAC;
-        ruleTwo.srcMacMask = SECOND_RULE_MAC_MASK;
-
-        return new MacipAclRule[]{ruleOne, ruleTwo};
-    }
-
-    static AclRule[] createAclRules() {
-        AclRule ruleOne = new AclRule();
-
-        ruleOne.isIpv6 = 0;
-        ruleOne.isPermit = 1;
-        ruleOne.srcIpAddr = FIRST_RULE_ADDRESS_AS_ARRAY;
-        ruleOne.srcIpPrefixLen = FIRST_RULE_PREFIX;
-        ruleOne.dstIpAddr = FIRST_RULE_ADDRESS_2_AS_ARRAY;
-        ruleOne.dstIpPrefixLen = FIRST_RULE_PREFIX_2;
-        ruleOne.dstportOrIcmpcodeFirst = FIRST_RULE_DST_ICMP_TYPE_START;
-        ruleOne.dstportOrIcmpcodeLast = FIRST_RULE_DST_ICMP_TYPE_END;
-        ruleOne.srcportOrIcmptypeFirst = FIRST_RULE_SRC_ICMP_TYPE_START;
-        ruleOne.srcportOrIcmptypeLast = FIRST_RULE_SRC_ICMP_TYPE_END;
-        ruleOne.proto = ICMP_PROTOCOL; //ICMP
-
-        AclRule ruleTwo = new AclRule();
-        ruleTwo.isIpv6 = 1;
-        ruleTwo.isPermit = 0;
-        ruleTwo.srcIpAddr = SECOND_RULE_ADDRESS_AS_ARRAY;
-        ruleTwo.srcIpPrefixLen = SECOND_RULE_PREFIX;
-        ruleTwo.dstIpAddr = SECOND_RULE_ADDRESS_2_AS_ARRAY;
-        ruleTwo.dstIpPrefixLen = SECOND_RULE_PREFIX_2;
-        ruleTwo.dstportOrIcmpcodeFirst = SECOND_RULE_DST_PORT_RANGE_START;
-        ruleTwo.dstportOrIcmpcodeLast = SECOND_RULE_DST_PORT_RANGE_END;
-        ruleTwo.srcportOrIcmptypeFirst = SECOND_RULE_SRC_PORT_RANGE_START;
-        ruleTwo.srcportOrIcmptypeLast = SECOND_RULE_SRC_PORT_RANGE_END;
-        ruleTwo.proto = UDP_PROTOCOL; //UDP
-
-        return new AclRule[]{ruleOne, ruleTwo};
-    }
-}
diff --git a/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/AclTestRequests.java b/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/AclTestRequests.java
deleted file mode 100644
index b580ee8c..00000000
--- a/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/AclTestRequests.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.acl.test;
-
-import static io.fd.vpp.jvpp.acl.test.AclTestData.createAclRules;
-import static io.fd.vpp.jvpp.acl.test.AclTestData.createMacipRules;
-
-import io.fd.vpp.jvpp.VppInvocationException;
-import io.fd.vpp.jvpp.acl.dto.AclAddReplace;
-import io.fd.vpp.jvpp.acl.dto.AclAddReplaceReply;
-import io.fd.vpp.jvpp.acl.dto.AclDel;
-import io.fd.vpp.jvpp.acl.dto.AclDelReply;
-import io.fd.vpp.jvpp.acl.dto.AclDetailsReplyDump;
-import io.fd.vpp.jvpp.acl.dto.AclDump;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDump;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclList;
-import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclListReply;
-import io.fd.vpp.jvpp.acl.dto.MacipAclAdd;
-import io.fd.vpp.jvpp.acl.dto.MacipAclAddReply;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDel;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDelReply;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDetailsReplyDump;
-import io.fd.vpp.jvpp.acl.dto.MacipAclDump;
-import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
-import java.util.concurrent.ExecutionException;
-
-class AclTestRequests {
-
-    static MacipAclDetailsReplyDump sendMacIpDumpRequest(final FutureJVppAclFacade jvpp)
-            throws ExecutionException, InterruptedException {
-        System.out.println("Sending MacipAclDump request...");
-        MacipAclDetailsReplyDump dump = jvpp.macipAclDump(new MacipAclDump()).toCompletableFuture().get();
-        System.out.println("MacipAclDump returned");
-        return dump;
-    }
-
-    static void sendMacIpAddRequest(final FutureJVppAclFacade jvpp) throws InterruptedException, ExecutionException {
-        final MacipAclAdd request = createMacIpAddRequest();
-        System.out.printf("Sending MacipAclAdd request %s%n", request.toString());
-        final MacipAclAddReply reply = jvpp.macipAclAdd(createMacIpAddRequest()).toCompletableFuture().get();
-        System.out.printf("MacipAclAdd send result = %s%n", reply);
-    }
-
-    static void sendMacIpDelRequest(final FutureJVppAclFacade jvpp) throws InterruptedException, ExecutionException {
-        final MacipAclDel request = new MacipAclDel();
-        request.aclIndex = 0;
-        System.out.printf("Sending MacipAclDel request %s%n", request.toString());
-        final MacipAclDelReply reply = jvpp.macipAclDel(request).toCompletableFuture().get();
-        System.out.printf("MacipAclDel send result = %s%n", reply);
-    }
-
-    static void sendAclAddRequest(final FutureJVppAclFacade jvpp) throws InterruptedException, ExecutionException {
-        final AclAddReplace request = createAclAddRequest();
-        System.out.printf("Sending AclAddReplace request %s%n", request.toString());
-        final AclAddReplaceReply reply = jvpp.aclAddReplace(request).toCompletableFuture().get();
-        System.out.printf("AclAddReplace send result = %s%n", reply);
-    }
-
-    static AclDetailsReplyDump sendAclDumpRequest(final FutureJVppAclFacade jvpp)
-            throws InterruptedException, VppInvocationException, ExecutionException {
-        System.out.println("Sending AclDump request...");
-        final AclDetailsReplyDump dump = jvpp.aclDump(new AclDump()).toCompletableFuture().get();
-        System.out.printf("AclDump send result = %s%n", dump);
-        return dump;
-    }
-
-    static void sendAclDelRequest(final FutureJVppAclFacade jvpp) throws InterruptedException, ExecutionException {
-        final AclDel request = new AclDel();
-        request.aclIndex = 0;
-        System.out.printf("Sending AclDel request %s%n", request.toString());
-        final AclDelReply reply = jvpp.aclDel(request).toCompletableFuture().get();
-        System.out.printf("AclDel send result = %s%n", reply);
-    }
-
-    static AclInterfaceListDetailsReplyDump sendAclInterfaceListDumpRequest(final FutureJVppAclFacade jvpp)
-            throws InterruptedException, ExecutionException {
-        final AclInterfaceListDump request = new AclInterfaceListDump();
-        request.swIfIndex = 0;
-        System.out.printf("Sending AclInterfaceListDump request %s%n", request.toString());
-        final AclInterfaceListDetailsReplyDump dump = jvpp.aclInterfaceListDump(request).toCompletableFuture().get();
-        System.out.printf("AclInterfaceListDump send result = %s%n", dump);
-        return dump;
-    }
-
-    static void sendAclInterfaceSetAclList(final FutureJVppAclFacade jvpp)
-            throws InterruptedException, ExecutionException {
-        final AclInterfaceSetAclList request = new AclInterfaceSetAclList();
-        request.count = 1;
-        request.acls = new int[]{1};
-        request.swIfIndex = 0;
-        request.nInput = 0;
-        System.out.printf("Sending AclInterfaceSetAclList request %s%n", request.toString());
-        final AclInterfaceSetAclListReply reply = jvpp.aclInterfaceSetAclList(request).toCompletableFuture().get();
-        System.out.printf("AclInterfaceSetAclList send result = %s%n", reply);
-    }
-
-    static void sendAclInterfaceDeleteList(final FutureJVppAclFacade jvpp)
-            throws InterruptedException, ExecutionException {
-        // uses same api but sets list to empty
-        final AclInterfaceSetAclList request = new AclInterfaceSetAclList();
-        request.count = 0;
-        request.acls = new int[]{};
-        request.swIfIndex = 0;
-        request.nInput = 0;
-        System.out.printf("Sending AclInterfaceSetAclList(Delete) request %s%n", request.toString());
-        final AclInterfaceSetAclListReply reply = jvpp.aclInterfaceSetAclList(request).toCompletableFuture().get();
-        System.out.printf("AclInterfaceSetAclList(Delete) send result = %s%n", reply);
-    }
-
-    private static MacipAclAdd createMacIpAddRequest() {
-        MacipAclAdd request = new MacipAclAdd();
-
-        request.count = 2;
-        request.r = createMacipRules();
-        return request;
-    }
-
-    private static AclAddReplace createAclAddRequest() {
-        AclAddReplace request = new AclAddReplace();
-
-        request.aclIndex = -1;// to define new one
-        request.count = 2;
-        request.r = createAclRules();
-        return request;
-    }
-}
diff --git a/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/FutureApiTest.java b/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/FutureApiTest.java
deleted file mode 100644
index 94490193..00000000
--- a/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/FutureApiTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.acl.test;
-
-import static io.fd.vpp.jvpp.acl.test.AclExpectedDumpData.verifyAclDump;
-import static io.fd.vpp.jvpp.acl.test.AclExpectedDumpData.verifyAclInterfaceList;
-import static io.fd.vpp.jvpp.acl.test.AclExpectedDumpData.verifyMacIpDump;
-import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendAclAddRequest;
-import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendAclDelRequest;
-import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendAclDumpRequest;
-import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendAclInterfaceDeleteList;
-import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendAclInterfaceListDumpRequest;
-import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendAclInterfaceSetAclList;
-import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendMacIpAddRequest;
-import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendMacIpDelRequest;
-import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendMacIpDumpRequest;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.acl.JVppAclImpl;
-import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
-
-public class FutureApiTest {
-
-    public static void main(String[] args) throws Exception {
-        testCallbackApi();
-    }
-
-    private static void testCallbackApi() throws Exception {
-        System.out.println("Testing Java callback API for acl plugin");
-        try (final JVppRegistry registry = new JVppRegistryImpl("macipAclAddTest");
-             final FutureJVppAclFacade jvpp = new FutureJVppAclFacade(registry, new JVppAclImpl())) {
-
-            // adds,dump and verifies  Mac-Ip acl
-            sendMacIpAddRequest(jvpp);
-            verifyMacIpDump(sendMacIpDumpRequest(jvpp).macipAclDetails.get(0));
-
-            // adds,dumps and verifies Acl acl
-            sendAclAddRequest(jvpp);
-            verifyAclDump(sendAclDumpRequest(jvpp).aclDetails.get(0));
-
-            // adds,dumps and verifies Interface for acl
-            sendAclInterfaceSetAclList(jvpp);
-            verifyAclInterfaceList(sendAclInterfaceListDumpRequest(jvpp).aclInterfaceListDetails.get(0));
-
-            // deletes all created data
-            sendAclInterfaceDeleteList(jvpp);
-            sendAclDelRequest(jvpp);
-            sendMacIpDelRequest(jvpp);
-
-            System.out.println("Disconnecting...");
-        }
-    }
-}
diff --git a/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/Readme.txt b/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/Readme.txt
deleted file mode 100644
index f68e7aba..00000000
--- a/plugins/acl-plugin/acl/jvpp/io/fd/vpp/jvpp/acl/test/Readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-17.01.jar:build-vpp-native/plugins/acl-plugin/jvpp-acl-1.0.jar io.fd.vpp.jvpp.acl.test.FutureApiTest
diff --git a/plugins/acl-plugin/acl/jvpp_acl.c b/plugins/acl-plugin/acl/jvpp_acl.c
deleted file mode 100644
index 0af53bc9..00000000
--- a/plugins/acl-plugin/acl/jvpp_acl.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-
-#include <acl/acl_msg_enum.h>
-#define vl_typedefs             /* define message structures */
-#include <acl/acl_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun
-#include <acl/acl_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <acl/acl_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <acl/acl_all_api_h.h>
-#undef vl_api_version
-
-#include <vnet/api_errno.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-
-#if VPPJNI_DEBUG == 1
-  #define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
-#else
-  #define DEBUG_LOG(...)
-#endif
-
-#include <jvpp-common/jvpp_common.h>
-
-#include "acl/jvpp/io_fd_vpp_jvpp_acl_JVppAclImpl.h"
-#include "jvpp_acl.h"
-#include "acl/jvpp/jvpp_acl_gen.h"
-
-/*
- * Class:     io_fd_vpp_jvpp_acl_JVppaclImpl
- * Method:    init0
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_acl_JVppAclImpl_init0
-  (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
-  acl_main_t * plugin_main = &acl_main;
-  u8 * name;
-  clib_warning ("Java_io_fd_vpp_jvpp_acl_JVppAclImpl_init0");
-
-  plugin_main->my_client_index = my_client_index;
-  plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
-
-  name = format (0, "acl_%08x%c", api_version, 0);
-  plugin_main->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (plugin_main->msg_id_base == (u16) ~0) {
-    jclass exClass = (*env)->FindClass(env, "java/lang/IllegalStateException");
-    (*env)->ThrowNew(env, exClass, "acl plugin is not loaded in VPP");
-  } else {
-    plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
-    plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
-
-    #define _(N,n)                                  \
-        vl_msg_api_set_handlers(VL_API_##N + plugin_main->msg_id_base, #n,     \
-                vl_api_##n##_t_handler,             \
-                vl_noop_handler,                    \
-                vl_api_##n##_t_endian,              \
-                vl_api_##n##_t_print,               \
-                sizeof(vl_api_##n##_t), 1);
-        foreach_api_reply_handler;
-    #undef _
-  }
-}
-
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_acl_JVppAclImpl_close0
-(JNIEnv *env, jclass clazz) {
-  acl_main_t * plugin_main = &acl_main;
-
-    // cleanup:
-    (*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
-    (*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
-
-    plugin_main->callbackClass = NULL;
-    plugin_main->callbackObject = NULL;
-}
-
-/* Attach thread to JVM and cache class references when initiating JVPP ACL */
-jint JNI_OnLoad(JavaVM *vm, void *reserved) {
-    JNIEnv* env;
-
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return JNI_EVERSION;
-    }
-
-    if (cache_class_references(env) != 0) {
-        clib_warning ("Failed to cache class references\n");
-        return JNI_ERR;
-    }
-
-    return JNI_VERSION_1_8;
-}
-
-/* Clean up cached references when disposing JVPP ACL */
-void JNI_OnUnload(JavaVM *vm, void *reserved) {
-    JNIEnv* env;
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return;
-    }
-    delete_class_references(env);
-}
diff --git a/plugins/acl-plugin/acl/jvpp_acl.h b/plugins/acl-plugin/acl/jvpp_acl.h
deleted file mode 100644
index 2b73d672..00000000
--- a/plugins/acl-plugin/acl/jvpp_acl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_jvpp_acl_h__
-#define __included_jvpp_acl_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/api_errno.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <jni.h>
-
-/* Global state for JVPP-acl */
-typedef struct {
-    /* Base message index for the acl plugin */
-    u16 msg_id_base;
-
-    /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
-
-    /* VPP api client index */
-    u32 my_client_index;
-
-    /* Callback object and class references enabling asynchronous Java calls */
-    jobject callbackObject;
-    jclass callbackClass;
-
-} acl_main_t;
-
-acl_main_t acl_main __attribute__((aligned (64)));
-
-
-#endif /* __included_jvpp_acl_h__ */
diff --git a/plugins/acl-plugin/acl/l2sess.c b/plugins/acl-plugin/acl/l2sess.c
deleted file mode 100644
index cc9bde44..00000000
--- a/plugins/acl-plugin/acl/l2sess.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * l2sess.c - simple MAC-swap API / debug CLI handling
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vnet/plugin/plugin.h>
-#include <acl/l2sess.h>
-
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-#include <vppinfra/timing_wheel.h>
-
-#include <vnet/l2/l2_output.h>
-#include <vnet/l2/l2_input.h>
-
-void
-l2sess_vlib_plugin_register (vlib_main_t * vm, void* hh,
-		      int from_early_init)
-{
-  l2sess_main_t *sm = &l2sess_main;
-  vnet_plugin_handoff_t * h = hh;
-  memset (sm, 0, sizeof (*sm));
-
-  sm->vlib_main = vm;
-  sm->vnet_main = h->vnet_main;
-  sm->ethernet_main = h->ethernet_main;
-}
-
-void
-l2sess_init_next_features_input (vlib_main_t * vm, l2sess_main_t * sm)
-{
-#define _(node_name, node_var, is_out, is_ip6, is_track) \
-  if (!is_out) feat_bitmap_init_next_nodes(vm, node_var.index, L2INPUT_N_FEAT,  l2input_get_feat_names (), sm->node_var ## _input_next_node_index);
-  foreach_l2sess_node
-#undef _
-}
-
-void
-l2sess_add_our_next_nodes (vlib_main_t * vm, l2sess_main_t * sm,
-			   u8 * prev_node_name, int add_output_nodes)
-{
-  vlib_node_t *n;
-  n = vlib_get_node_by_name (vm, prev_node_name);
-#define _(node_name, node_var, is_out, is_ip6, is_track) \
-  if (is_out == add_output_nodes) { \
-    u32 idx = vlib_node_add_next_with_slot(vm, n->index, node_var.index, ~0); \
-    if (is_track) { \
-      sm->next_slot_track_node_by_is_ip6_is_out[is_ip6][is_out] = idx; \
-    } \
-  }
-  foreach_l2sess_node
-#undef _
-}
-
-void
-l2sess_setup_nodes (void)
-{
-  vlib_main_t *vm = vlib_get_main ();
-  l2sess_main_t *sm = &l2sess_main;
-
-  l2sess_init_next_features_input (vm, sm);
-
-  l2sess_add_our_next_nodes (vm, sm, (u8 *) "l2-input-classify", 0);
-  l2sess_add_our_next_nodes (vm, sm, (u8 *) "l2-output-classify", 1);
-
-}
-
-static char *
-get_l4_proto_str (int is_ip6, uint8_t l4_proto)
-{
-  switch (l4_proto)
-    {
-    case 6:
-      return "tcp";
-    case 17:
-      return "udp";
-    case 1:
-      return "icmp";
-    case 58:
-      return "icmp6";
-    default:
-      return "<?l4-unknown?>";
-    }
-}
-
-static clib_error_t *
-l2sess_show_command_fn (vlib_main_t * vm,
-			unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  l2sess_main_t *sm = &l2sess_main;
-  clib_time_t *ct = &vm->clib_time;
-  l2s_session_t *s;
-  u64 now = clib_cpu_time_now ();
-
-  vlib_cli_output (vm, "Timing wheel info: \n%U", format_timing_wheel,
-		   &sm->timing_wheel, 255);
-
-  pool_foreach (s, sm->sessions, (
-				   {
-				   f64 ctime =
-				   (now -
-				    s->create_time) * ct->seconds_per_clock;
-				   f64 atime0 =
-				   (now -
-				    s->side[0].active_time) *
-				   ct->seconds_per_clock;
-				   f64 atime1 =
-				   (now -
-				    s->side[1].active_time) *
-				   ct->seconds_per_clock;
-/*
-    f64 ctime = (s->create_time - vm->cpu_time_main_loop_start) * ct->seconds_per_clock;
-    f64 atime0 = (s->side[0].active_time - vm->cpu_time_main_loop_start) * ct->seconds_per_clock;
-    f64 atime1 = (s->side[1].active_time - vm->cpu_time_main_loop_start) * ct->seconds_per_clock;
-*/
-				   u8 * out0 =
-				   format (0,
-					   "%5d: create time: %U pkts/bytes/active time: [ %ld %ld %U : %ld %ld %U ]\n",
-					   (s - sm->sessions),
-					   format_time_interval, "h:m:s:u",
-					   ctime, s->side[0].n_packets,
-					   s->side[0].n_bytes,
-					   format_time_interval, "h:m:s:u",
-					   atime0, s->side[1].n_packets,
-					   s->side[1].n_bytes,
-					   format_time_interval, "h:m:s:u",
-					   atime1); u8 * out1 = 0;
-				   if (s->is_ip6)
-				   {
-				   out1 =
-				   format (0, "%s %U :%u <-> %U :%u",
-					   get_l4_proto_str (s->is_ip6,
-							     s->l4_proto),
-					   format_ip6_address,
-					   &s->side[0].addr.ip6,
-					   s->side[0].port,
-					   format_ip6_address,
-					   &s->side[1].addr.ip6,
-					   s->side[1].port);}
-				   else
-				   {
-				   out1 =
-				   format (0, "%s %U :%u <-> %U :%u",
-					   get_l4_proto_str (s->is_ip6,
-							     s->l4_proto),
-					   format_ip4_address,
-					   &s->side[0].addr.ip4,
-					   s->side[0].port,
-					   format_ip4_address,
-					   &s->side[1].addr.ip4,
-					   s->side[1].port);}
-				   vlib_cli_output (vm, "%s       %s", out0,
-						    out1); vec_free (out0);
-				   vec_free (out1);}
-		));
-  return 0;
-}
-
-static clib_error_t *
-l2sess_show_count_command_fn (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cmd)
-{
-  l2sess_main_t *sm = &l2sess_main;
-
-  vlib_cli_output (vm, "Timing wheel info: \n%U", format_timing_wheel,
-		   &sm->timing_wheel, 255);
-  vlib_cli_output (vm, "session pool len: %d, pool elts: %d",
-		   pool_len (sm->sessions), pool_elts (sm->sessions));
-  vlib_cli_output (vm,
-		   "attempted to delete sessions which were already free: %d",
-		   sm->counter_attempted_delete_free_session);
-  return 0;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (l2sess_show_command, static) = {
-    .path = "show l2sess",
-    .short_help = "show l2sess",
-    .function = l2sess_show_command_fn,
-};
-
-VLIB_CLI_COMMAND (l2sess_show_count_command, static) = {
-    .path = "show l2sess count",
-    .short_help = "show l2sess count",
-    .function = l2sess_show_count_command_fn,
-};
-/* *INDENT-OFF* */
-
-static inline u64
-time_sec_to_clock( clib_time_t *ct, f64 sec)
-{
-  return (u64)(((f64)sec)/ct->seconds_per_clock);
-}
-
-static clib_error_t * l2sess_init (vlib_main_t * vm)
-{
-  l2sess_main_t * sm = &l2sess_main;
-  clib_error_t * error = 0;
-  u64 cpu_time_now = clib_cpu_time_now();
-
-
-  clib_time_t *ct = &vm->clib_time;
-  sm->udp_session_idle_timeout = time_sec_to_clock(ct, UDP_SESSION_IDLE_TIMEOUT_SEC);
-  sm->tcp_session_idle_timeout = time_sec_to_clock(ct, TCP_SESSION_IDLE_TIMEOUT_SEC);
-  sm->tcp_session_transient_timeout = time_sec_to_clock(ct, TCP_SESSION_TRANSIENT_TIMEOUT_SEC);
-
-  /* The min sched time of 10e-1 causes erroneous behavior... */
-  sm->timing_wheel.min_sched_time = 10e-2;
-  sm->timing_wheel.max_sched_time = 3600.0*48.0;
-  timing_wheel_init (&sm->timing_wheel, cpu_time_now, vm->clib_time.clocks_per_second);
-  sm->timer_wheel_next_expiring_time = 0;
-  sm->timer_wheel_tick = time_sec_to_clock(ct, sm->timing_wheel.min_sched_time);
-  /* Pre-allocate expired nodes. */
-  vec_alloc (sm->data_from_advancing_timing_wheel, 32);
-
-  l2sess_setup_nodes();
-  l2output_init_output_node_vec (&sm->output_next_nodes.output_node_index_vec);
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (l2sess_init);
-
-
diff --git a/plugins/acl-plugin/acl/l2sess.h b/plugins/acl-plugin/acl/l2sess.h
deleted file mode 100644
index db899917..00000000
--- a/plugins/acl-plugin/acl/l2sess.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_l2sess_h__
-#define __included_l2sess_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-#include <vppinfra/timing_wheel.h>
-
-#include <vnet/l2/l2_output.h>
-#include <vnet/l2/l2_input.h>
-
-#define _(node_name, node_var, is_out, is_ip6, is_track)
-#undef _
-#define foreach_l2sess_node \
-  _("aclp-l2s-input-ip4-add", l2sess_in_ip4_add, 0, 0, 0)  \
-  _("aclp-l2s-input-ip6-add", l2sess_in_ip6_add, 0, 1, 0)  \
-  _("aclp-l2s-output-ip4-add", l2sess_out_ip4_add, 1, 0, 0) \
-  _("aclp-l2s-output-ip6-add", l2sess_out_ip6_add, 1, 1, 0) \
-  _("aclp-l2s-input-ip4-track", l2sess_in_ip4_track, 0, 0, 1) \
-  _("aclp-l2s-input-ip6-track", l2sess_in_ip6_track, 0, 1, 1) \
-  _("aclp-l2s-output-ip4-track",l2sess_out_ip4_track, 1, 0, 1) \
-  _("aclp-l2s-output-ip6-track", l2sess_out_ip6_track, 1, 1, 1)
-
-#define _(node_name, node_var, is_out, is_ip6, is_track)  \
-  extern vlib_node_registration_t node_var;
-foreach_l2sess_node
-#undef _
-
-#define TCP_FLAG_FIN    0x01
-#define TCP_FLAG_SYN    0x02
-#define TCP_FLAG_RST    0x04
-#define TCP_FLAG_PUSH   0x08
-#define TCP_FLAG_ACK    0x10
-#define TCP_FLAG_URG    0x20
-#define TCP_FLAG_ECE    0x40
-#define TCP_FLAG_CWR    0x80
-#define TCP_FLAGS_RSTFINACKSYN (TCP_FLAG_RST + TCP_FLAG_FIN + TCP_FLAG_SYN + TCP_FLAG_ACK)
-#define TCP_FLAGS_ACKSYN (TCP_FLAG_SYN + TCP_FLAG_ACK)
-
-typedef struct {
-  ip46_address_t addr;
-  u64 active_time;
-  u64 n_packets;
-  u64 n_bytes;
-  u16 port;
-} l2s_session_side_t;
-
-enum {
-  L2S_SESSION_SIDE_IN = 0,
-  L2S_SESSION_SIDE_OUT,
-  L2S_N_SESSION_SIDES
-};
-
-typedef struct {
-  u64 create_time;
-  l2s_session_side_t side[L2S_N_SESSION_SIDES];
-  u8 l4_proto;
-  u8 is_ip6;
-  u16 tcp_flags_seen; /* u16 because of two sides */
-} l2s_session_t;
-
-#define PROD
-#ifdef PROD
-#define UDP_SESSION_IDLE_TIMEOUT_SEC 600
-#define TCP_SESSION_IDLE_TIMEOUT_SEC (3600*24)
-#define TCP_SESSION_TRANSIENT_TIMEOUT_SEC 120
-#else
-#define UDP_SESSION_IDLE_TIMEOUT_SEC 15
-#define TCP_SESSION_IDLE_TIMEOUT_SEC 15
-#define TCP_SESSION_TRANSIENT_TIMEOUT_SEC 5
-#endif
-
-typedef struct {
-    /*
-     * the next two fields are present for all nodes, but
-     *  only one of them is used per node - depending
-     * on whether the node is an input or output one.
-     */
-#define _(node_name, node_var, is_out, is_ip6, is_track) \
-    u32 node_var ## _input_next_node_index[32]; \
-    l2_output_next_nodes_st node_var ## _next_nodes;
-foreach_l2sess_node
-#undef _
-    l2_output_next_nodes_st output_next_nodes;
-
-    /* Next indices of the tracker nodes */
-    u32 next_slot_track_node_by_is_ip6_is_out[2][2];
-
-    /* 
-     * Pairing of "forward" and "reverse" tables by table index.
-     * Each relationship has two entries - for one and the other table,
-     * so it is bidirectional.
-     */
-     
-    u32 *fwd_to_rev_by_table_index;
-
-    /*
-     * The vector of per-interface session pools
-     */
-
-    l2s_session_t *sessions;
-
-    /* The session timeouts */
-    u64 tcp_session_transient_timeout;
-    u64 tcp_session_idle_timeout;
-    u64 udp_session_idle_timeout;
-
-    /* Timing wheel to time out the idle sessions */
-    timing_wheel_t timing_wheel;
-    u32 *data_from_advancing_timing_wheel;
-    u64 timer_wheel_next_expiring_time;
-    u64 timer_wheel_tick;
-
-    /* convenience */
-    vlib_main_t * vlib_main;
-    vnet_main_t * vnet_main;
-    ethernet_main_t * ethernet_main;
-
-    /* Counter(s) */
-    u64 counter_attempted_delete_free_session;
-} l2sess_main_t;
-
-l2sess_main_t l2sess_main;
-
-/* Just exposed for acl.c */
-
-void
-l2sess_vlib_plugin_register (vlib_main_t * vm, void * hh,
-                      int from_early_init);
-
-
-#endif /* __included_l2sess_h__ */
diff --git a/plugins/acl-plugin/acl/l2sess_node.c b/plugins/acl-plugin/acl/l2sess_node.c
deleted file mode 100644
index 520e5929..00000000
--- a/plugins/acl-plugin/acl/l2sess_node.c
+++ /dev/null
@@ -1,816 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <netinet/in.h>
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-#include <acl/l2sess.h>
-#include <vnet/l2/l2_classify.h>
-
-
-typedef struct
-{
-  u32 next_index;
-  u32 sw_if_index;
-  u32 trace_flags;
-  u32 session_tables[2];
-  u32 session_nexts[2];
-  u8 l4_proto;
-} l2sess_trace_t;
-
-/* packet trace format function */
-
-#define _(node_name, node_var, is_out, is_ip6, is_track) \
-static u8 * format_## node_var ##_trace (u8 * s, va_list * args)      \
-{  \
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); \
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); \
-  l2sess_trace_t * t = va_arg (*args, l2sess_trace_t *); \
- \
-  s = format (s, node_name ": sw_if_index %d, next index %d trace_flags %08x L4 proto %d\n" \
-                           "                 tables [ %d, %d ] nexts [ %d, %d ]", \
-              t->sw_if_index, t->next_index, t->trace_flags, t->l4_proto, \
-              t->session_tables[0], t->session_tables[1], \
-              t->session_nexts[0], t->session_nexts[1]); \
-  return s; \
-}
-foreach_l2sess_node
-#undef _
-#define foreach_l2sess_error \
-_(SWAPPED, "Mac swap packets processed")
-  typedef enum
-{
-#define _(sym,str) L2SESS_ERROR_##sym,
-  foreach_l2sess_error
-#undef _
-    L2SESS_N_ERROR,
-} l2sess_error_t;
-
-static char *l2sess_error_strings[] = {
-#define _(sym,string) string,
-  foreach_l2sess_error
-#undef _
-};
-
-typedef enum
-{
-  L2SESS_NEXT_DROP,
-  L2SESS_N_NEXT,
-} l2sess_next_t;
-
-u8
-l2sess_get_l4_proto (vlib_buffer_t * b0, int node_is_ip6)
-{
-  u8 proto;
-  int proto_offset;
-  if (node_is_ip6)
-    {
-      proto_offset = 20;
-    }
-  else
-    {
-      proto_offset = 23;
-    }
-  proto = *((u8 *) vlib_buffer_get_current (b0) + proto_offset);
-  return proto;
-}
-
-
-u8
-l2sess_get_tcp_flags (vlib_buffer_t * b0, int node_is_ip6)
-{
-  u8 flags;
-  int flags_offset;
-  if (node_is_ip6)
-    {
-      flags_offset = 14 + 40 + 13;	/* FIXME: no extension headers assumed */
-    }
-  else
-    {
-      flags_offset = 14 + 20 + 13;
-    }
-  flags = *((u8 *) vlib_buffer_get_current (b0) + flags_offset);
-  return flags;
-}
-
-static inline int
-l4_tcp_or_udp (u8 proto)
-{
-  return ((proto == 6) || (proto == 17));
-}
-
-void
-l2sess_get_session_tables (l2sess_main_t * sm, u32 sw_if_index,
-			   int node_is_out, int node_is_ip6, u8 l4_proto,
-			   u32 * session_tables)
-{
-/*
- * Based on the direction, l3 and l4 protocol, fill a u32[2] array:
- * [0] is index for the "direct match" path, [1] is for "mirrored match".
- * Store the indices of the tables to add the session to in session_tables[]
- */
-  l2_output_classify_main_t *l2om = &l2_output_classify_main;
-  l2_input_classify_main_t *l2im = &l2_input_classify_main;
-
-  u32 output_table_index;
-  u32 input_table_index;
-
-  if (!l4_tcp_or_udp (l4_proto))
-    {
-      return;
-    }
-
-  if (node_is_ip6)
-    {
-      vec_validate_init_empty (l2im->
-			       classify_table_index_by_sw_if_index
-			       [L2_INPUT_CLASSIFY_TABLE_IP6], sw_if_index,
-			       ~0);
-      input_table_index =
-	l2im->
-	classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP6]
-	[sw_if_index];
-      vec_validate_init_empty (l2om->
-			       classify_table_index_by_sw_if_index
-			       [L2_OUTPUT_CLASSIFY_TABLE_IP6], sw_if_index,
-			       ~0);
-      output_table_index =
-	l2om->
-	classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_IP6]
-	[sw_if_index];
-    }
-  else
-    {
-      vec_validate_init_empty (l2im->
-			       classify_table_index_by_sw_if_index
-			       [L2_INPUT_CLASSIFY_TABLE_IP4], sw_if_index,
-			       ~0);
-      input_table_index =
-	l2im->
-	classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP4]
-	[sw_if_index];
-      vec_validate_init_empty (l2om->
-			       classify_table_index_by_sw_if_index
-			       [L2_OUTPUT_CLASSIFY_TABLE_IP4], sw_if_index,
-			       ~0);
-      output_table_index =
-	l2om->
-	classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_IP4]
-	[sw_if_index];
-    }
-
-  if (node_is_out)
-    {
-      session_tables[0] = output_table_index;
-      session_tables[1] = input_table_index;
-    }
-  else
-    {
-      session_tables[0] = input_table_index;
-      session_tables[1] = output_table_index;
-    }
-}
-
-void
-l2sess_get_session_nexts (l2sess_main_t * sm, u32 sw_if_index,
-			  int node_is_out, int node_is_ip6, u8 l4_proto,
-			  u32 * session_nexts)
-{
-/*
- * Based on the direction, l3 and l4 protocol, fill a u32[2] array:
- * [0] is the index for the "direct match" path, [1] is for "mirrored match".
- * Store the match_next_index in session_nexts[] for a new session entry which is being added to session tables.
- */
-  u32 input_node_index;
-  u32 output_node_index;
-
-  if (!l4_tcp_or_udp (l4_proto))
-    {
-      return;
-    }
-
-  input_node_index =
-    sm->next_slot_track_node_by_is_ip6_is_out[node_is_ip6][0];
-  output_node_index =
-    sm->next_slot_track_node_by_is_ip6_is_out[node_is_ip6][1];
-
-  if (node_is_out)
-    {
-      session_nexts[0] = output_node_index;
-      session_nexts[1] = input_node_index;
-    }
-  else
-    {
-      session_nexts[0] = input_node_index;
-      session_nexts[1] = output_node_index;
-    }
-}
-
-
-static inline void
-swap_bytes (vlib_buffer_t * b0, int off_a, int off_b, int nbytes)
-{
-  u8 tmp;
-  u8 *pa = vlib_buffer_get_current (b0) + off_a;
-  u8 *pb = vlib_buffer_get_current (b0) + off_b;
-  while (nbytes--)
-    {
-      tmp = *pa;
-      *pa++ = *pb;
-      *pb++ = tmp;
-    }
-}
-
-/*
- * This quite pro[bv]ably is a terrible idea performance wise. Moreso doing it twice.
- * Would having a long (ish) chunk of memory work better for this ?
- * We will see when we get to the performance of this.
- */
-void
-l2sess_flip_l3l4_fields (vlib_buffer_t * b0, int node_is_ip6, u8 l4_proto)
-{
-  if (!l4_tcp_or_udp (l4_proto))
-    {
-      return;
-    }
-  if (node_is_ip6)
-    {
-      swap_bytes (b0, 22, 38, 16);	/* L3 */
-      swap_bytes (b0, 54, 56, 2);	/* L4 (when no EH!) */
-    }
-  else
-    {
-      swap_bytes (b0, 26, 30, 4);	/* L3 */
-      swap_bytes (b0, 34, 36, 2);	/* L4 */
-    }
-}
-
-void
-l2sess_add_session (vlib_buffer_t * b0, int node_is_out, int node_is_ip6,
-		    u32 session_table, u32 session_match_next,
-		    u32 opaque_index)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  u32 action = 0;
-  u32 metadata = 0;
-
-#ifdef DEBUG_SESSIONS
-  printf ("Adding session to table %d with next %d\n", session_table,
-	  session_match_next);
-#endif
-  vnet_classify_add_del_session (cm, session_table,
-				 vlib_buffer_get_current (b0),
-				 session_match_next, opaque_index, 0, action,
-				 metadata, 1);
-}
-
-
-
-static void *
-get_ptr_to_offset (vlib_buffer_t * b0, int offset)
-{
-  u8 *p = vlib_buffer_get_current (b0) + offset;
-  return p;
-}
-
-
-/*
- * FIXME: Hardcoded offsets are ugly, although if casting to structs one
- * would need to take care about alignment.. So let's for now be naive and simple.
- */
-
-void
-session_store_ip4_l3l4_info (vlib_buffer_t * b0, l2s_session_t * sess,
-			     int node_is_out)
-{
-  clib_memcpy (&sess->side[1 - node_is_out].addr.ip4,
-	       get_ptr_to_offset (b0, 26), 4);
-  clib_memcpy (&sess->side[node_is_out].addr.ip4, get_ptr_to_offset (b0, 30),
-	       4);
-  sess->side[1 - node_is_out].port =
-    ntohs (*(u16 *) get_ptr_to_offset (b0, 34));
-  sess->side[node_is_out].port = ntohs (*(u16 *) get_ptr_to_offset (b0, 36));
-}
-
-void
-session_store_ip6_l3l4_info (vlib_buffer_t * b0, l2s_session_t * sess,
-			     int node_is_out)
-{
-  clib_memcpy (&sess->side[1 - node_is_out].addr.ip6,
-	       get_ptr_to_offset (b0, 22), 16);
-  clib_memcpy (&sess->side[node_is_out].addr.ip4, get_ptr_to_offset (b0, 38),
-	       16);
-  sess->side[1 - node_is_out].port =
-    ntohs (*(u16 *) get_ptr_to_offset (b0, 54));
-  sess->side[node_is_out].port = ntohs (*(u16 *) get_ptr_to_offset (b0, 56));
-}
-
-static void
-build_match_from_session (l2sess_main_t * sm, u8 * match,
-			  l2s_session_t * sess, int is_out)
-{
-  if (sess->is_ip6)
-    {
-      match[20] = sess->l4_proto;
-      clib_memcpy (&match[22], &sess->side[1 - is_out].addr.ip6, 16);
-      clib_memcpy (&match[38], &sess->side[is_out].addr.ip4, 16);
-      *(u16 *) & match[54] = htons (sess->side[1 - is_out].port);
-      *(u16 *) & match[56] = htons (sess->side[is_out].port);
-    }
-  else
-    {
-      match[23] = sess->l4_proto;
-      clib_memcpy (&match[26], &sess->side[1 - is_out].addr.ip6, 4);
-      clib_memcpy (&match[30], &sess->side[is_out].addr.ip4, 4);
-      *(u16 *) & match[34] = htons (sess->side[1 - is_out].port);
-      *(u16 *) & match[36] = htons (sess->side[is_out].port);
-    }
-}
-
-static void
-delete_session (l2sess_main_t * sm, u32 sw_if_index, u32 session_index)
-{
-  vnet_classify_main_t *cm = &vnet_classify_main;
-  u8 match[5 * 16];		/* For building the mock of the packet to delete the classifier session */
-  u32 session_tables[2] = { ~0, ~0 };
-  l2s_session_t *sess = sm->sessions + session_index;
-  if (pool_is_free (sm->sessions, sess))
-    {
-      sm->counter_attempted_delete_free_session++;
-      return;
-    }
-  l2sess_get_session_tables (sm, sw_if_index, 0, sess->is_ip6, sess->l4_proto,
-			     session_tables);
-  if (session_tables[1] != ~0)
-    {
-      build_match_from_session (sm, match, sess, 1);
-      vnet_classify_add_del_session (cm, session_tables[1], match, 0, 0, 0, 0,
-				     0, 0);
-    }
-  if (session_tables[1] != ~0)
-    {
-      build_match_from_session (sm, match, sess, 1);
-      vnet_classify_add_del_session (cm, session_tables[1], match, 0, 0, 0, 0,
-				     0, 0);
-    }
-  pool_put (sm->sessions, sess);
-}
-
-static void
-udp_session_account_buffer (vlib_buffer_t * b0, l2s_session_t * s,
-			    int which_side, u64 now)
-{
-  l2s_session_side_t *ss = &s->side[which_side];
-  ss->active_time = now;
-  ss->n_packets++;
-  ss->n_bytes += b0->current_data + b0->current_length;
-}
-
-static inline u64
-udp_session_get_timeout (l2sess_main_t * sm, l2s_session_t * sess, u64 now)
-{
-  return (sm->udp_session_idle_timeout);
-}
-
-static void
-tcp_session_account_buffer (vlib_buffer_t * b0, l2s_session_t * s,
-			    int which_side, u64 now)
-{
-  l2s_session_side_t *ss = &s->side[which_side];
-  ss->active_time = now;
-  ss->n_packets++;
-  ss->n_bytes += b0->current_data + b0->current_length;
-  /* Very very lightweight TCP state tracking: just record which flags were seen */
-  s->tcp_flags_seen |=
-    l2sess_get_tcp_flags (b0, s->is_ip6) << (8 * which_side);
-}
-
-/*
- * Since we are tracking for the purposes of timing the sessions out,
- * we mostly care about two states: established (maximize the idle timeouts)
- * and transient (halfopen/halfclosed/reset) - we need to have a reasonably short timeout to
- * quickly get rid of sessions but not short enough to violate the TCP specs.
- */
-
-static inline u64
-tcp_session_get_timeout (l2sess_main_t * sm, l2s_session_t * sess, u64 now)
-{
-  /* seen both SYNs and ACKs but not FINs means we are in establshed state */
-  u16 masked_flags =
-    sess->tcp_flags_seen & ((TCP_FLAGS_RSTFINACKSYN << 8) +
-			    TCP_FLAGS_RSTFINACKSYN);
-  if (((TCP_FLAGS_ACKSYN << 8) + TCP_FLAGS_ACKSYN) == masked_flags)
-    {
-      return (sm->tcp_session_idle_timeout);
-    }
-  else
-    {
-      return (sm->tcp_session_transient_timeout);
-    }
-}
-
-static inline u64
-session_get_timeout (l2sess_main_t * sm, l2s_session_t * sess, u64 now)
-{
-  u64 timeout;
-
-  switch (sess->l4_proto)
-    {
-    case 6:
-      timeout = tcp_session_get_timeout (sm, sess, now);
-      break;
-    case 17:
-      timeout = udp_session_get_timeout (sm, sess, now);
-      break;
-    default:
-      timeout = 0;
-    }
-
-  return timeout;
-}
-
-static inline u64
-get_session_last_active_time(l2s_session_t * sess)
-{
-  u64 last_active =
-    sess->side[0].active_time >
-    sess->side[1].active_time ? sess->side[0].active_time : sess->side[1].
-    active_time;
-  return last_active;
-}
-
-static int
-session_is_alive (l2sess_main_t * sm, l2s_session_t * sess, u64 now, u64 *last_active_cache)
-{
-  u64 last_active = get_session_last_active_time(sess);
-  u64 timeout = session_get_timeout (sm, sess, now);
-  int is_alive = ((now - last_active) < timeout);
-  if (last_active_cache)
-    *last_active_cache = last_active;
-  return is_alive;
-}
-
-static void
-check_idle_sessions (l2sess_main_t * sm, u32 sw_if_index, u64 now)
-{
-  sm->timer_wheel_next_expiring_time = 0;
-  sm->data_from_advancing_timing_wheel
-    =
-    timing_wheel_advance (&sm->timing_wheel, now,
-			  sm->data_from_advancing_timing_wheel,
-			  &sm->timer_wheel_next_expiring_time);
-#ifdef DEBUG_SESSIONS_VERBOSE
-  {
-    clib_time_t *ct = &sm->vlib_main->clib_time;
-    f64 ctime;
-    ctime = now * ct->seconds_per_clock;
-    clib_warning ("Now        : %U", format_time_interval, "h:m:s:u", ctime);
-    ctime = sm->timer_wheel_next_expiring_time * ct->seconds_per_clock;
-    clib_warning ("Next expire: %U", format_time_interval, "h:m:s:u", ctime);
-    clib_warning ("Expired items: %d",
-		  (int) vec_len (sm->data_from_advancing_timing_wheel));
-  }
-#endif
-
-  sm->timer_wheel_next_expiring_time = now + sm->timer_wheel_tick;
-  if (PREDICT_FALSE ( 0 == sm->data_from_advancing_timing_wheel )) {
-    return;
-  }
-
-  if (PREDICT_FALSE (_vec_len (sm->data_from_advancing_timing_wheel) > 0))
-    {
-      uword i;
-      for (i = 0; i < _vec_len (sm->data_from_advancing_timing_wheel); i++)
-	{
-	  u32 session_index = sm->data_from_advancing_timing_wheel[i];
-	  if (!pool_is_free_index (sm->sessions, session_index))
-	    {
-	      l2s_session_t *sess = sm->sessions + session_index;
-              u64 last_active;
-              if (session_is_alive (sm, sess, now, &last_active))
-                {
-#ifdef DEBUG_SESSIONS
-	      clib_warning ("Restarting timer for session %d", (int) session_index);
-#endif
-                    /* Pretend we did this in the past, at last_active moment */
-                    timing_wheel_insert (&sm->timing_wheel,
-                                         last_active + session_get_timeout (sm, sess,
-                                                                    last_active),
-                                         session_index);
-                }
-              else
-                {
-#ifdef DEBUG_SESSIONS
-	      clib_warning ("Deleting session %d", (int) session_index);
-#endif
-	      delete_session (sm, sw_if_index, session_index);
-                }
-	    }
-	}
-      _vec_len (sm->data_from_advancing_timing_wheel) = 0;
-    }
-}
-
-static uword
-l2sess_node_fn (vlib_main_t * vm,
-		vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  l2sess_next_t next_index;
-  u32 pkts_swapped = 0;
-  u32 cached_sw_if_index = (u32) ~ 0;
-  u32 cached_next_index = (u32) ~ 0;
-  u32 feature_bitmap0;
-  u32 trace_flags0;
-
-  l2sess_main_t *sm = &l2sess_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      /* Only a single loop for now for simplicity */
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0 = L2SESS_NEXT_DROP;
-	  u32 sw_if_index0;
-	  //ethernet_header_t *en0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  //en0 = vlib_buffer_get_current (b0);
-
-/*
- * The non-boilerplate is in the block below.
- * Note first a magic macro block that sets up the behavior qualifiers:
- *     node_is_out : 1 = is output, 0 = is input
- *     node_is_ip6 : 1 = is ip6, 0 = is ip4
- *     node_is_track : 1 = is a state tracking node, 0 - is a session addition node
- *
- * Subsequently the code adjusts its behavior depending on these variables.
- * It's most probably not great performance wise but much easier to work with.
- *
- */
-	  {
-	    int node_is_out = -1;
-	    CLIB_UNUSED (int node_is_ip6) = -1;
-	    CLIB_UNUSED (int node_is_track) = -1;
-	    u32 node_index = 0;
-	    u32 session_tables[2] = { ~0, ~0 };
-	    u32 session_nexts[2] = { ~0, ~0 };
-	    l2_output_next_nodes_st *next_nodes = 0;
-	    u32 *input_feat_next_node_index;
-	    u8 l4_proto;
-	    u64 now = clib_cpu_time_now ();
-
-/* 
- * Set the variables according to which of the 8 nodes we are.
- * Hopefully the compiler is smart enough to eliminate the extraneous.
- */
-#define _(node_name, node_var, is_out, is_ip6, is_track)                 \
-if(node_var.index == node->node_index)                                   \
-  {                                                                      \
-    node_is_out = is_out;                                                \
-    node_is_ip6 = is_ip6;                                                \
-    node_is_track = is_track;                                            \
-    node_index = node_var.index;                                         \
-    next_nodes = &sm->node_var ## _next_nodes;                           \
-    input_feat_next_node_index = sm->node_var ## _input_next_node_index; \
-  }
-	    foreach_l2sess_node
-#undef _
-	      trace_flags0 = 0;
-	    if (node_is_out)
-	      {
-		sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	      }
-	    else
-	      {
-		sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	      }
-	    /* potentially also remove the nodes here */
-	    feature_bitmap0 = vnet_buffer (b0)->l2.feature_bitmap;
-
-	    if (node_is_track)
-	      {
-		u32 sess_index = vnet_buffer (b0)->l2_classify.opaque_index;
-		l2s_session_t *sess = sm->sessions + sess_index;
-		l4_proto = sess->l4_proto;
-
-		if (session_is_alive (sm, sess, now, 0))
-		  {
-		    if (6 == l4_proto)
-		      {
-			tcp_session_account_buffer (b0, sess, node_is_out,
-						    now);
-		      }
-		    else
-		      {
-			udp_session_account_buffer (b0, sess, node_is_out,
-						    now);
-		      }
-		  }
-		else
-		  {
-		    timing_wheel_delete (&sm->timing_wheel, sess_index);
-		    delete_session (sm, sw_if_index0, sess_index);
-		    /* FIXME: drop the packet that hit the obsolete node, for now. We really ought to recycle it. */
-		    next0 = 0;
-		  }
-	      }
-	    else
-	      {
-		/*
-		 * "-add" node: take l2opaque which arrived to us, and deduce
-		 * the tables out of that. ~0 means the topmost classifier table
-		 * applied for this AF on the RX(for input)/TX(for output)) sw_if_index.
-		 * Also add the mirrored session to the paired table.
-		 */
-		l2s_session_t *sess;
-		u32 sess_index;
-
-		l4_proto = l2sess_get_l4_proto (b0, node_is_ip6);
-
-		pool_get (sm->sessions, sess);
-		sess_index = sess - sm->sessions;
-		sess->create_time = now;
-		sess->side[node_is_out].active_time = now;
-		sess->side[1 - node_is_out].active_time = now;
-		sess->l4_proto = l4_proto;
-		sess->is_ip6 = node_is_ip6;
-		if (node_is_ip6)
-		  {
-		    session_store_ip6_l3l4_info (b0, sess, node_is_out);
-		  }
-		else
-		  {
-		    session_store_ip4_l3l4_info (b0, sess, node_is_out);
-		  }
-
-		l2sess_get_session_tables (sm, sw_if_index0, node_is_out,
-					   node_is_ip6, l4_proto,
-					   session_tables);
-		l2sess_get_session_nexts (sm, sw_if_index0, node_is_out,
-					  node_is_ip6, l4_proto,
-					  session_nexts);
-		l2sess_flip_l3l4_fields (b0, node_is_ip6, l4_proto);
-		if (session_tables[1] != ~0)
-		  {
-		    l2sess_add_session (b0, node_is_out, node_is_ip6,
-					session_tables[1], session_nexts[1],
-					sess_index);
-		  }
-		l2sess_flip_l3l4_fields (b0, node_is_ip6, l4_proto);
-		if (session_tables[0] != ~0)
-		  {
-		    l2sess_add_session (b0, node_is_out, node_is_ip6,
-					session_tables[0], session_nexts[0],
-					sess_index);
-		  }
-		if (6 == sess->l4_proto)
-		  {
-		    tcp_session_account_buffer (b0, sess, node_is_out, now);
-		  }
-		else
-		  {
-		    udp_session_account_buffer (b0, sess, node_is_out, now);
-		  }
-		timing_wheel_insert (&sm->timing_wheel,
-				     now + session_get_timeout (sm, sess,
-								now),
-				     sess_index);
-	      }
-
-	    if (now >= sm->timer_wheel_next_expiring_time)
-	      {
-		check_idle_sessions (sm, sw_if_index0, now);
-	      }
-
-	    if (node_is_out)
-	      {
-		if (feature_bitmap0)
-		  {
-		    trace_flags0 |= 0x10;
-		  }
-		if (sw_if_index0 == cached_sw_if_index)
-		  {
-		    trace_flags0 |= 0x20;
-		  }
-		l2_output_dispatch (sm->vlib_main,
-				    sm->vnet_main,
-				    node,
-				    node_index,
-				    &cached_sw_if_index,
-				    &cached_next_index,
-				    next_nodes,
-				    b0, sw_if_index0, feature_bitmap0,
-				    &next0);
-		trace_flags0 |= 2;
-
-	      }
-	    else
-	      {
-		next0 =
-		  feat_bitmap_get_next_node_index (input_feat_next_node_index,
-						   feature_bitmap0);
-		trace_flags0 |= 4;
-
-	      }
-
-
-
-	    if (next0 >= node->n_next_nodes)
-	      {
-		trace_flags0 |= 1;
-	      }
-
-	    if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			       && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	      {
-		l2sess_trace_t *t =
-		  vlib_add_trace (vm, node, b0, sizeof (*t));
-		t->sw_if_index = sw_if_index0;
-		t->next_index = next0;
-		t->trace_flags = trace_flags0;
-		t->l4_proto = l4_proto;
-		t->session_tables[0] = session_tables[0];
-		t->session_tables[1] = session_tables[1];
-		t->session_nexts[0] = session_nexts[0];
-		t->session_nexts[1] = session_nexts[1];
-	      }
-
-	  }
-	  pkts_swapped += 1;
-	  if (next0 >= node->n_next_nodes)
-	    {
-	      next0 = 0;
-	    }
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-  vlib_node_increment_counter (vm, node->node_index,
-			       L2SESS_ERROR_SWAPPED, pkts_swapped);
-  return frame->n_vectors;
-}
-
-
-#define _(node_name, node_var, is_out, is_ip6, is_track) \
-static uword                                             \
-node_var ## node_fn (vlib_main_t * vm,                   \
-                  vlib_node_runtime_t * node,            \
-                  vlib_frame_t * frame)                  \
-{                                                        \
-  return l2sess_node_fn(vm, node, frame);                \
-}                                                        \
-VLIB_REGISTER_NODE (node_var) = {                        \
-  .function = node_var ## node_fn,                       \
-  .name = node_name,                                     \
-  .vector_size = sizeof (u32),                           \
-  .format_trace = format_ ## node_var ## _trace,         \
-  .type = VLIB_NODE_TYPE_INTERNAL,                       \
-                                                         \
-  .n_errors = ARRAY_LEN(l2sess_error_strings),           \
-  .error_strings = l2sess_error_strings,                 \
-                                                         \
-  .n_next_nodes = L2SESS_N_NEXT,                         \
-  .next_nodes = {                                        \
-        [L2SESS_NEXT_DROP] = "error-drop",               \
-  },                                                     \
-};
-foreach_l2sess_node
-#undef _
diff --git a/plugins/acl-plugin/acl/node_in.c b/plugins/acl-plugin/acl/node_in.c
deleted file mode 100644
index 2a5199a9..00000000
--- a/plugins/acl-plugin/acl/node_in.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-#include <acl/acl.h>
-#include "node_in.h"
-
-typedef struct
-{
-  u32 next_index;
-  u32 sw_if_index;
-  u32 match_acl_index;
-  u32 match_rule_index;
-  u32 trace_bitmap;
-} acl_in_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_acl_in_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  acl_in_trace_t *t = va_arg (*args, acl_in_trace_t *);
-
-  s =
-    format (s,
-	    "ACL_IN: sw_if_index %d, next index %d, match: inacl %d rule %d trace_bits %08x",
-	    t->sw_if_index, t->next_index, t->match_acl_index,
-	    t->match_rule_index, t->trace_bitmap);
-  return s;
-}
-
-vlib_node_registration_t acl_in_node;
-
-#define foreach_acl_in_error \
-_(ACL_CHECK, "InACL check packets processed")
-
-typedef enum
-{
-#define _(sym,str) ACL_IN_ERROR_##sym,
-  foreach_acl_in_error
-#undef _
-    ACL_IN_N_ERROR,
-} acl_in_error_t;
-
-static char *acl_in_error_strings[] = {
-#define _(sym,string) string,
-  foreach_acl_in_error
-#undef _
-};
-
-static uword
-acl_in_node_fn (vlib_main_t * vm,
-		vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  acl_in_next_t next_index;
-  u32 pkts_acl_checked = 0;
-  u32 feature_bitmap0;
-  u32 trace_bitmap = 0;
-  u32 *input_feat_next_node_index =
-    acl_main.acl_in_node_input_next_node_index;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0 = ~0;
-	  u32 sw_if_index0;
-	  u32 next = ~0;
-	  u32 match_acl_index = ~0;
-	  u32 match_rule_index = ~0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-	  feature_bitmap0 = vnet_buffer (b0)->l2.feature_bitmap;
-
-	  input_acl_packet_match (sw_if_index0, b0, &next, &match_acl_index,
-				  &match_rule_index, &trace_bitmap);
-	  if (next != ~0)
-	    {
-	      next0 = next;
-	    }
-	  if (next0 == ~0)
-	    {
-	      next0 =
-		feat_bitmap_get_next_node_index (input_feat_next_node_index,
-						 feature_bitmap0);
-	    }
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      acl_in_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = sw_if_index0;
-	      t->next_index = next0;
-	      t->match_acl_index = match_acl_index;
-	      t->match_rule_index = match_rule_index;
-	      t->trace_bitmap = trace_bitmap;
-	    }
-
-	  next0 = next0 < node->n_next_nodes ? next0 : 0;
-
-	  pkts_acl_checked += 1;
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, acl_in_node.index,
-			       ACL_IN_ERROR_ACL_CHECK, pkts_acl_checked);
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (acl_in_node) =
-{
-  .function = acl_in_node_fn,.name = "acl-plugin-in",.vector_size =
-    sizeof (u32),.format_trace = format_acl_in_trace,.type =
-    VLIB_NODE_TYPE_INTERNAL,.n_errors =
-    ARRAY_LEN (acl_in_error_strings),.error_strings =
-    acl_in_error_strings,.n_next_nodes = ACL_IN_N_NEXT,
-    /* edit / add dispositions here */
-    .next_nodes =
-  {
-  [ACL_IN_ERROR_DROP] = "error-drop",
-      [ACL_IN_ETHERNET_INPUT] = "ethernet-input",
-      [ACL_IN_L2S_INPUT_IP4_ADD] = "aclp-l2s-input-ip4-add",
-      [ACL_IN_L2S_INPUT_IP6_ADD] = "aclp-l2s-input-ip6-add",}
-,};
diff --git a/plugins/acl-plugin/acl/node_in.h b/plugins/acl-plugin/acl/node_in.h
deleted file mode 100644
index 502bbf8d..00000000
--- a/plugins/acl-plugin/acl/node_in.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _NODE_IN_H_
-#define _NODE_IN_H_
-
-typedef enum {
-  ACL_IN_ERROR_DROP,
-  ACL_IN_ETHERNET_INPUT,
-  ACL_IN_L2S_INPUT_IP4_ADD,
-  ACL_IN_L2S_INPUT_IP6_ADD,
-  ACL_IN_N_NEXT,
-} acl_in_next_t;
-
-#endif
diff --git a/plugins/acl-plugin/acl/node_out.c b/plugins/acl-plugin/acl/node_out.c
deleted file mode 100644
index 50af3679..00000000
--- a/plugins/acl-plugin/acl/node_out.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-#include <acl/acl.h>
-
-#include "node_out.h"
-
-typedef struct
-{
-  u32 next_index;
-  u32 sw_if_index;
-  u32 match_acl_index;
-  u32 match_rule_index;
-  u32 trace_bitmap;
-} acl_out_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_acl_out_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  acl_out_trace_t *t = va_arg (*args, acl_out_trace_t *);
-  s =
-    format (s,
-	    "ACL_OUT: sw_if_index %d, next index %d, match: outacl %d rule %d trace_bits %08x",
-	    t->sw_if_index, t->next_index, t->match_acl_index,
-	    t->match_rule_index, t->trace_bitmap);
-  return s;
-}
-
-vlib_node_registration_t acl_out_node;
-
-#define foreach_acl_out_error \
-_(ACL_CHECK, "OutACL check packets processed")
-
-typedef enum
-{
-#define _(sym,str) ACL_OUT_ERROR_##sym,
-  foreach_acl_out_error
-#undef _
-    ACL_OUT_N_ERROR,
-} acl_out_error_t;
-
-static char *acl_out_error_strings[] = {
-#define _(sym,string) string,
-  foreach_acl_out_error
-#undef _
-};
-
-static uword
-acl_out_node_fn (vlib_main_t * vm,
-		 vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  acl_main_t *am = &acl_main;
-  l2_output_next_nodes_st *next_nodes = &am->acl_out_output_next_nodes;
-  u32 n_left_from, *from, *to_next;
-  acl_out_next_t next_index;
-  u32 pkts_acl_checked = 0;
-  u32 feature_bitmap0;
-  u32 cached_sw_if_index = (u32) ~ 0;
-  u32 cached_next_index = (u32) ~ 0;
-  u32 match_acl_index = ~0;
-  u32 match_rule_index = ~0;
-  u32 trace_bitmap = 0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0 = ~0;
-	  u32 next = 0;
-	  u32 sw_if_index0;
-
-	  /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	  feature_bitmap0 = vnet_buffer (b0)->l2.feature_bitmap;
-
-	  output_acl_packet_match (sw_if_index0, b0, &next, &match_acl_index,
-				   &match_rule_index, &trace_bitmap);
-	  if (next != ~0)
-	    {
-	      next0 = next;
-	    }
-	  if (next0 == ~0)
-	    {
-	      l2_output_dispatch (vm,
-				  am->vnet_main,
-				  node,
-				  acl_out_node.index,
-				  &cached_sw_if_index,
-				  &cached_next_index,
-				  next_nodes,
-				  b0, sw_if_index0, feature_bitmap0, &next0);
-	    }
-
-
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      acl_out_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->sw_if_index = sw_if_index0;
-	      t->next_index = next0;
-	      t->match_acl_index = match_acl_index;
-	      t->match_rule_index = match_rule_index;
-	      t->trace_bitmap = trace_bitmap;
-	    }
-
-	  pkts_acl_checked += 1;
-
-	  /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, acl_out_node.index,
-			       ACL_OUT_ERROR_ACL_CHECK, pkts_acl_checked);
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (acl_out_node) =
-{
-  .function = acl_out_node_fn,.name = "acl-plugin-out",.vector_size =
-    sizeof (u32),.format_trace = format_acl_out_trace,.type =
-    VLIB_NODE_TYPE_INTERNAL,.n_errors =
-    ARRAY_LEN (acl_out_error_strings),.error_strings =
-    acl_out_error_strings,.n_next_nodes = ACL_OUT_N_NEXT,
-    /* edit / add dispositions here */
-    .next_nodes =
-  {
-  [ACL_OUT_ERROR_DROP] = "error-drop",
-      [ACL_OUT_INTERFACE_OUTPUT] = "interface-output",
-      [ACL_OUT_L2S_OUTPUT_IP4_ADD] = "aclp-l2s-output-ip4-add",
-      [ACL_OUT_L2S_OUTPUT_IP6_ADD] = "aclp-l2s-output-ip6-add",}
-,};
diff --git a/plugins/acl-plugin/acl/node_out.h b/plugins/acl-plugin/acl/node_out.h
deleted file mode 100644
index c919f3b7..00000000
--- a/plugins/acl-plugin/acl/node_out.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _NODE_OUT_H_
-#define _NODE_OUT_H_
-
-typedef enum {
-  ACL_OUT_ERROR_DROP,
-  ACL_OUT_INTERFACE_OUTPUT,
-  ACL_OUT_L2S_OUTPUT_IP4_ADD,
-  ACL_OUT_L2S_OUTPUT_IP6_ADD,
-  ACL_OUT_N_NEXT,
-} acl_out_next_t;
-
-#endif
diff --git a/plugins/acl-plugin/configure.ac b/plugins/acl-plugin/configure.ac
deleted file mode 100644
index 204f4e4d..00000000
--- a/plugins/acl-plugin/configure.ac
+++ /dev/null
@@ -1,24 +0,0 @@
-AC_INIT(acl_plugin, 1.0)
-AC_CONFIG_MACRO_DIR([../../vpp-api/java/m4])
-LT_INIT
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-AC_PREFIX_DEFAULT([/usr])
-
-AC_PROG_CC
-
-if test -f /usr/bin/lsb_release  && test `lsb_release -si` == "Ubuntu"  && test `lsb_release -sr` == "14.04"  && test -d /usr/lib/jvm/java-8-openjdk-amd64/ ; then
-    JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
-    JAVAC=${JAVA_HOME}/bin/javac
-    PATH=${JAVA_HOME}/bin/:${PATH}
-    break
-fi
-
-AX_CHECK_JAVA_HOME
-AX_PROG_JAVAC
-AX_PROG_JAVAH
-AX_PROG_JAR
-AX_PROG_JAVADOC
-AX_PROG_JAVA
-
-AC_OUTPUT([Makefile])
diff --git a/plugins/acl-plugin/test/run-python b/plugins/acl-plugin/test/run-python
deleted file mode 100755
index 215eb17a..00000000
--- a/plugins/acl-plugin/test/run-python
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# Do all the legwork to run a scapy shell with APIs available for load
-#
-CURR_DIR=`pwd`
-ROOT_DIR=`git rev-parse --show-toplevel`
-cd $ROOT_DIR
-sudo apt-get install -y python-virtualenv
-# uncomment the line below to enable build of plugins and api each time
-# make plugins && make build-vpp-api || exit
-virtualenv virtualenv
-virtualenv/bin/pip install ipaddress
-virtualenv/bin/pip install scapy
-# install the python API into the virtualenv
-cd $ROOT_DIR/vpp-api/python/
-$ROOT_DIR/virtualenv/bin/python setup.py install
-# install the python ACL plugin API into the virtualenv
-ACL_PLUGIN_SETUP_DIR=`find $ROOT_DIR/build-root -name acl-plugin`
-cd $ACL_PLUGIN_SETUP_DIR; 
-$ROOT_DIR/virtualenv/bin/python setup.py install
-cd $ROOT_DIR
-# figure out the shared library path and start scapy
-export LD_LIBRARY_PATH=`pwd`/`find . -name "libpneum.so" -exec dirname {} \; | grep lib64 | head -n 1`
-cd $CURR_DIR
-sudo LD_LIBRARY_PATH=$LD_LIBRARY_PATH $ROOT_DIR/virtualenv/bin/python $1 $2 $3 $4 $5 $6 $7 $8 $9
-
-
-
diff --git a/plugins/acl-plugin/test/run-scapy b/plugins/acl-plugin/test/run-scapy
deleted file mode 100755
index 266f07d1..00000000
--- a/plugins/acl-plugin/test/run-scapy
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# Do all the legwork to run a scapy shell with APIs available for load
-#
-ROOT_DIR=`git rev-parse --show-toplevel`
-cd $ROOT_DIR
-sudo apt-get install -y python-virtualenv
-# uncomment the line below to enable the build of plugins and API each time..
-# make plugins && make build-vpp-api || exit
-virtualenv virtualenv
-virtualenv/bin/pip install ipaddress
-virtualenv/bin/pip install scapy
-# install the python API into the virtualenv
-cd $ROOT_DIR/vpp-api/python/
-$ROOT_DIR/virtualenv/bin/python setup.py install
-# install the python ACL plugin API into the virtualenv
-ACL_PLUGIN_SETUP_DIR=`find $ROOT_DIR/build-root -name acl-plugin`
-cd $ACL_PLUGIN_SETUP_DIR; 
-$ROOT_DIR/virtualenv/bin/python setup.py install
-cd $ROOT_DIR
-# figure out the shared library path and start scapy
-export LD_LIBRARY_PATH=`pwd`/`find . -name "libpneum.so" -exec dirname {} \; | grep lib64 | head -n 1`
-sudo LD_LIBRARY_PATH=$LD_LIBRARY_PATH virtualenv/bin/scapy
-
-
-
diff --git a/plugins/acl-plugin/test/test_acl_plugin.py b/plugins/acl-plugin/test/test_acl_plugin.py
deleted file mode 100644
index 7fc72d67..00000000
--- a/plugins/acl-plugin/test/test_acl_plugin.py
+++ /dev/null
@@ -1,118 +0,0 @@
-from __future__ import print_function
-import unittest, sys, time, threading, struct, logging, os
-import vpp_papi
-# import vpp_papi_plugins.acl
-from ipaddress import *
-papi_event = threading.Event()
-print(vpp_papi.vpe.VL_API_SW_INTERFACE_SET_FLAGS)
-def papi_event_handler(result):
-    if result.vl_msg_id == vpp_papi.vpe.VL_API_SW_INTERFACE_SET_FLAGS:
-        return
-    if result.vl_msg_id == vpp_papi.vpe.VL_API_VNET_INTERFACE_COUNTERS:
-        print('Interface counters', result)
-        return
-    if result.vl_msg_id == vpp_papi.vpe.VL_API_VNET_IP6_FIB_COUNTERS:
-        print('IPv6 FIB counters', result)
-        papi_event.set()
-        return
-
-    print('Unknown message id:', result.vl_msg_id)
-
-import glob, subprocess
-class TestAclPlugin(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        print("Setup")
-    @classmethod
-    def tearDownClass(cls):
-        print("Teardown")
-
-    def setUp(self):
-        print("Connecting API")
-        r = vpp_papi.connect("test_papi")
-        self.assertEqual(r, 0)
-
-    def tearDown(self):
-        r = vpp_papi.disconnect()
-        self.assertEqual(r, 0)
-
-    #
-    # The tests themselves
-    #
-
-    #
-    # Basic request / reply
-    #
-    def test_show_version(self):
-        t = vpp_papi.show_version()
-        print('T', t);
-        program = t.program.decode().rstrip('\x00')
-        self.assertEqual('vpe', program)
-
-    def x_test_acl_add(self):
-        print("Test ACL add")
-        self.assertEqual(1, 1)
-    
-    #
-    # Details / Dump
-    #
-    def x_test_details_dump(self):
-        t = vpp_papi.sw_interface_dump(0, b'')
-        print('Dump/details T', t)
-
-    #
-    # Arrays
-    #
-    def x_test_arrays(self):
-        t = vpp_papi.vnet_get_summary_stats()
-        print('Summary stats', t)
-        print('Packets:', t.total_pkts[0])
-        print('Packets:', t.total_pkts[1])
-    #
-    # Variable sized arrays and counters
-    #
-    #@unittest.skip("stats")
-    def x_test_want_stats(self):
-        pid = 123
-        vpp_papi.register_event_callback(papi_event_handler)
-        papi_event.clear()
-
-        # Need to configure IPv6 to get som IPv6 FIB stats
-        t = vpp_papi.create_loopback('')
-        print(t)
-        self.assertEqual(t.retval, 0)
-
-        ifindex = t.sw_if_index
-        addr = str(IPv6Address(u'1::1').packed)
-        t = vpp_papi.sw_interface_add_del_address(ifindex, 1, 1, 0, 16, addr)
-        print(t)
-        self.assertEqual(t.retval, 0)
-
-        # Check if interface is up
-        # XXX: Add new API to query interface state based on ifindex, instead of dump all.
-        t = vpp_papi.sw_interface_set_flags(ifindex, 1, 1, 0)
-        self.assertEqual(t.retval, 0)
-
-        t = vpp_papi.want_stats(True, pid)
-
-        print (t)
-
-        #
-        # Wait for some stats
-        #
-        self.assertEqual(papi_event.wait(15), True)
-        t = vpp_papi.want_stats(False, pid)
-        print (t)
-
-
-    #
-    # Plugins?
-    #
-
-if __name__ == '__main__' or __name__ == '__builtin__':
-    print("This is main")
-    suite = unittest.TestLoader().loadTestsFromTestCase(TestAclPlugin)
-    unittest.TextTestRunner(verbosity=2).run(suite)
-    #logging.basicConfig(level=logging.DEBUG)
-    # unittest.main()
-
diff --git a/plugins/configure.ac b/plugins/configure.ac
index 9c631634..b6ba4152 100644
--- a/plugins/configure.ac
+++ b/plugins/configure.ac
@@ -53,11 +53,6 @@ AM_CONDITIONAL(ENABLE_$1_PLUGIN, test "$enable_the_plugin" = "1")
 # SUBDIRS += new-plugin
 # endif
 
-PLUGIN_ENABLED(ioam)
-PLUGIN_ENABLED(snat)
-PLUGIN_ENABLED(lb)
-PLUGIN_ENABLED(acl)
-
 # Disabled plugins, require --enable-XXX-plugin
 PLUGIN_DISABLED(vcgn)
 PLUGIN_DISABLED(sample)
diff --git a/plugins/ioam-plugin/Makefile.am b/plugins/ioam-plugin/Makefile.am
deleted file mode 100644
index b00b088c..00000000
--- a/plugins/ioam-plugin/Makefile.am
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall
-AM_LDFLAGS = -module -shared -avoid-version
-
-########################################
-# iOAM Proof of Transit
-########################################
-
-ioam_pot_plugin_la_SOURCES =			\
-	ioam/lib-pot/pot_util.c			\
-	ioam/encap/ip6_ioam_pot.c		\
-	ioam/lib-pot/pot_util.h			\
-	ioam/lib-pot/math64.h			\
-	ioam/lib-pot/pot_api.c
-
-BUILT_SOURCES =					\
-	ioam/lib-pot/pot.api.h			\
-	ioam/lib-pot/pot.api.json
-
-SUFFIXES = .api.h .api
-
-%.api.h: %.api
-	mkdir -p `dirname $@` ; \
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
-	| vppapigen --input - --output $@ --show-name $@
-
-%.api.json: %.api
-	@echo "  JSON APIGEN  " $@ ;				\
-	mkdir -p `dirname $@` ;					\
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
-	| vppapigen --input - --json $@
-
-apidir = $(prefix)/ioam/
-api_DATA =					\
-	ioam/lib-pot/pot.api.json		\
-	ioam/lib-trace/trace.api.json		\
-	ioam/export/ioam_export.api.json
-
-noinst_HEADERS =				\
-  ioam/lib-pot/pot_all_api_h.h			\
-  ioam/lib-pot/pot_msg_enum.h			\
-  ioam/lib-pot/pot.api.h			\
-  ioam/lib-pot/pot_util.h			\
-  ioam/lib-pot/math64.h
-
-ioam_pot_test_plugin_la_SOURCES =		\
-	ioam/lib-pot/pot_test.c			\
-	ioam/lib-pot/pot_plugin.api.h
-
-vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
-vpppluginsdir = ${libdir}/vpp_plugins
-
-vppapitestplugins_LTLIBRARIES = ioam_pot_test_plugin.la
-vppplugins_LTLIBRARIES = ioam_pot_plugin.la
-
-########################################
-# iOAM trace export for IPv6
-########################################
-
-ioam_export_plugin_la_SOURCES =   \
-ioam/export/ioam_export.c         \
-ioam/export/node.c                \
-ioam/export/ioam_export.api.h     \
-ioam/export/ioam_export_thread.c
-
-BUILT_SOURCES +=				\
-	ioam/export/ioam_export.api.h		\
-	ioam/export/ioam_export.api.json
-
-noinst_HEADERS +=                       \
-  ioam/export/ioam_export_all_api_h.h   \
-  ioam/export/ioam_export_msg_enum.h    \
-  ioam/export/ioam_export.api.h
-
-ioam_export_test_plugin_la_SOURCES =  \
-  ioam/export/ioam_export_test.c      \
-  ioam/export/ioam_export_plugin.api.h
-
-vppapitestplugins_LTLIBRARIES += ioam_export_test_plugin.la
-vppplugins_LTLIBRARIES += ioam_export_plugin.la
-
-########################################
-# iOAM Trace
-########################################
-libioam_trace_plugin_la_SOURCES =		\
-	ioam/lib-trace/trace_util.c		\
-	ioam/encap/ip6_ioam_trace.c		\
-	ioam/lib-trace/trace_util.h		\
-	ioam/lib-trace/trace_api.c
-
-BUILT_SOURCES +=				\
-	ioam/lib-trace/trace.api.h		\
-	ioam/lib-trace/trace.api.json
-
-noinst_HEADERS +=                       \
-  ioam/export/ioam_export_all_api_h.h   \
-  ioam/lib-trace/trace_all_api_h.h	\
-  ioam/lib-trace/trace_msg_enum.h	\
-  ioam/lib-trace/trace.api.h		\
-  ioam/lib-trace/trace_util.h
-
-ioam_trace_test_plugin_la_SOURCES =		\
-	ioam/lib-trace/trace_test.c		\
-	ioam/lib-trace/trace_plugin.api.h
-
-vppapitestplugins_LTLIBRARIES += ioam_trace_test_plugin.la
-vppplugins_LTLIBRARIES += libioam_trace_plugin.la
-
-########################################
-# VxLAN-GPE
-########################################
-libioam_vxlan_gpe_plugin_la_SOURCES =			\
-	ioam/lib-vxlan-gpe/ioam_encap.c			\
-	ioam/lib-vxlan-gpe/ioam_decap.c			\
-	ioam/lib-vxlan-gpe/ioam_transit.c		\
-	ioam/lib-vxlan-gpe/ioam_pop.c			\
-	ioam/lib-vxlan-gpe/vxlan_gpe_api.c		\
-	ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c	\
-	ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c		\
-	ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c	\
-	ioam/export-vxlan-gpe/vxlan_gpe_node.c		\
-	ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.h\
-	ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
-
-BUILT_SOURCES +=				\
-	ioam/lib-vxlan-gpe/vxlan_gpe.api.h		\
-	ioam/lib-vxlan-gpe/vxlan_gpe.api.json		\
-	ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.h		\
-	ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.json
-
-noinst_HEADERS +=                       \
-  ioam/export/ioam_export_all_api_h.h   \
-  ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h			\
-  ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h			\
-  ioam/lib-vxlan-gpe/vxlan_gpe.api.h			\
-  ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h			\
-  ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h                    \
-  ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h		\
-  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h       \
-  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h        \
-  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.h
-
-ioam_vxlan_gpe_test_plugin_la_SOURCES =		\
-	ioam/lib-vxlan-gpe/vxlan_gpe_test.c			\
-	ioam/lib-vxlan-gpe/vxlan_gpe_plugin.api.h
-
-libioam_vxlan_gpe_plugin_la_LIBADD = libioam_trace_plugin.la
-
-vppapitestplugins_LTLIBRARIES += ioam_vxlan_gpe_test_plugin.la
-vppplugins_LTLIBRARIES += libioam_vxlan_gpe_plugin.la
-
-vxlan_gpe_ioam_export_test_plugin_la_SOURCES =          \
-  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c      \
-  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_plugin.api.h
-
-vppapitestplugins_LTLIBRARIES += vxlan_gpe_ioam_export_test_plugin.la
-
-########################################
-# iOAM E2E plugin
-########################################
-
-ioam_e2e_plugin_la_SOURCES =                \
-	ioam/encap/ip6_ioam_e2e.c               \
-	ioam/encap/ip6_ioam_seqno.c             \
-	ioam/encap/ip6_ioam_seqno_analyse.c
-
-noinst_HEADERS +=                    \
-	ioam/encap/ip6_ioam_e2e.h        \
-	ioam/encap/ip6_ioam_seqno.h
-
-vppplugins_LTLIBRARIES += ioam_e2e_plugin.la
-
-# Remove *.la files
-install-data-hook:
-	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
-	@(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
-
-
-#
-# Java code generation
-#
-jvpp_registry_root = ../../vpp-api/java
-jvpp_registry_version = 17.04
-jioam_trace_jarfile = jvpp-ioam-trace-$(PACKAGE_VERSION).jar
-jvpp_trace_package_dir = io/fd/vpp/jvpp/ioamtrace
-jvpp_root = ioam/jvpp
-jvpp_target_dir = target
-jvpp_target = $(jvpp_root)/$(jvpp_target_dir)
-trace_api_file=$(srcdir)/ioam/lib-trace/trace.api
-
-
-lib_LTLIBRARIES = libjvpp_ioamtrace.la
-libjvpp_ioamtrace_la_SOURCES = ioam/lib-trace/trace.api.h ioam/lib-trace/jvpp_ioam_trace.c ioam/jvpp/io_fd_vpp_jvpp_ioam_trace_JVppIoamTraceImpl.h
-libjvpp_ioamtrace_la_LIBADD = -lvlibmemoryclient -lvlibapi -lvppinfra \
-	              -lpthread -lm -lrt -L$(jvpp_registry_root)/.libs -ljvpp_common
-libjvpp_ioamtrace_la_LDFLAGS = -module
-libjvpp_ioamtrace_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I../ -I$(srcdir)/../
-
-BUILT_SOURCES += $(jvpp_root)/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h
-
-$(jvpp_root)/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h: ioam_trace.api.json
-	dir=`pwd`;						\
-	mkdir -p $(jvpp_target); \
-	mkdir -p $(jvpp_root)/$(jvpp_trace_package_dir); 		\
-	cd $(jvpp_root)/$(jvpp_trace_package_dir);			\
-	mkdir -p dto future callfacade callback notification test; 	\
-	@srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/ioam_trace.api.json --plugin_name ioamtrace;		\
-	cd -;							\
-	mv -f $(jvpp_root)/$(jvpp_trace_package_dir)/jvpp_ioamtrace_gen.h $(jvpp_root)/jvpp_ioam_trace_gen.h;							\
-	cp $(srcdir)/$(jvpp_root)/$(jvpp_trace_package_dir)/test/*.java $(jvpp_root)/$(jvpp_trace_package_dir)/test/;				\
-	cd $(jvpp_root);				\
-	$(JAVAC) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d $(jvpp_target_dir) $(jvpp_trace_package_dir)/*.java \
-		$(jvpp_trace_package_dir)/dto/*.java \
-		$(jvpp_trace_package_dir)/callback/*.java \
-		$(jvpp_trace_package_dir)/notification/*.java \
-		$(jvpp_trace_package_dir)/future/*.java 	\
-		$(jvpp_trace_package_dir)/callfacade/*.java 	\
-		$(jvpp_trace_package_dir)/test/*.java \
-		|| (echo "ioam trace jvpp compilation failed: $$?"; exit 1);	\
-	$(JAVAH) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d . io.fd.vpp.jvpp.ioamtrace.JVppIoamtraceImpl ;
-
-$(jioam_trace_jarfile): libjvpp_ioamtrace.la
-	cp .libs/libjvpp_ioamtrace.so.0.0.0 $(jvpp_target);				\
-	cd $(jvpp_target);				\
-	$(JAR) cfv $(JARFLAGS) ../../../$@ libjvpp_ioamtrace.so.0.0.0 $(jvpp_trace_package_dir)/* ; cd ..;
-
-ioam_trace.api.json:
-	@echo "  jIoam_trace API"; \
-        vppapigen --input $(trace_api_file) --json ioam_trace.api.json;
-
-all-local: $(jioam_trace_jarfile)
-
-
-jioam_pot_jarfile = jvpp-ioam-pot-$(PACKAGE_VERSION).jar
-jvpp_pot_package_dir = io/fd/vpp/jvpp/ioampot
-pot_api_file=$(srcdir)/ioam/lib-pot/pot.api
-
-
-lib_LTLIBRARIES += libjvpp_ioampot.la
-libjvpp_ioampot_la_SOURCES = ioam/lib-pot/pot.api.h ioam/lib-pot/jvpp_ioam_pot.c ioam/jvpp/io_fd_vpp_jvpp_ioam_pot_JVppIoamPotImpl.h
-libjvpp_ioampot_la_LIBADD = -lvlibmemoryclient -lvlibapi -lvppinfra \
-	              -lpthread -lm -lrt -L$(jvpp_registry_root)/.libs -ljvpp_common
-libjvpp_ioampot_la_LDFLAGS = -module
-libjvpp_ioampot_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I../ -I$(srcdir)/../
-
-BUILT_SOURCES += $(jvpp_root)/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h
-
-$(jvpp_root)/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h: ioam_pot.api.json
-	dir=`pwd`;						\
-	mkdir -p $(jvpp_target); \
-	mkdir -p $(jvpp_root)/$(jvpp_pot_package_dir); 		\
-	cd $(jvpp_root)/$(jvpp_pot_package_dir);			\
-	mkdir -p dto future callfacade callback notification test; 	\
-	@srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/ioam_pot.api.json --plugin_name ioampot;		\
-	cd -;							\
-	mv -f $(jvpp_root)/$(jvpp_pot_package_dir)/jvpp_ioampot_gen.h $(jvpp_root)/jvpp_ioam_pot_gen.h;							\
-	cp $(srcdir)/$(jvpp_root)/$(jvpp_pot_package_dir)/test/*.java $(jvpp_root)/$(jvpp_pot_package_dir)/test/;				\
-	cd $(jvpp_root);				\
-	$(JAVAC) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d $(jvpp_target_dir) $(jvpp_pot_package_dir)/*.java \
-		$(jvpp_pot_package_dir)/dto/*.java \
-		$(jvpp_pot_package_dir)/callback/*.java \
-		$(jvpp_pot_package_dir)/notification/*.java \
-		$(jvpp_pot_package_dir)/future/*.java 	\
-		$(jvpp_pot_package_dir)/callfacade/*.java 	\
-		$(jvpp_pot_package_dir)/test/*.java \
-		|| (echo "ioam pot jvpp compilation failed: $$?"; exit 1);	\
-	$(JAVAH) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d . io.fd.vpp.jvpp.ioampot.JVppIoampotImpl ;
-
-$(jioam_pot_jarfile): libjvpp_ioampot.la
-	cp .libs/libjvpp_ioampot.so.0.0.0 $(jvpp_target);				\
-	cd $(jvpp_target);				\
-	$(JAR) cfv $(JARFLAGS) ../../../$@ libjvpp_ioampot.so.0.0.0 $(jvpp_pot_package_dir)/* ; cd ..;
-
-ioam_pot.api.json:
-	@echo "  jIoam_pot API"; \
-        vppapigen --input $(pot_api_file) --json ioam_pot.api.json;
-
-all-local: $(jioam_pot_jarfile)
-
-jioam_export_jarfile = jvpp-ioam-export-$(PACKAGE_VERSION).jar
-jvpp_export_package_dir = io/fd/vpp/jvpp/ioamexport
-export_api_file=$(srcdir)/ioam/export/ioam_export.api
-
-
-lib_LTLIBRARIES += libjvpp_ioamexport.la
-libjvpp_ioamexport_la_SOURCES = ioam/export/export.api.h ioam/export/jvpp_ioam_export.c ioam/jvpp/io_fd_vpp_jvpp_ioam_export_JVppIoamexportImpl.h
-libjvpp_ioamexport_la_LIBADD = -lvlibmemoryclient -lvlibapi -lvppinfra \
-	              -lpthread -lm -lrt -L$(jvpp_registry_root)/.libs -ljvpp_common
-libjvpp_ioamexport_la_LDFLAGS = -module
-libjvpp_ioamexport_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I../ -I$(srcdir)/../
-
-BUILT_SOURCES += $(jvpp_root)/io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl.h
-
-$(jvpp_root)/io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl.h: ioam_export.api.json
-	dir=`pwd`;						\
-	mkdir -p $(jvpp_target); \
-	mkdir -p $(jvpp_root)/$(jvpp_export_package_dir); 		\
-	cd $(jvpp_root)/$(jvpp_export_package_dir);			\
-	mkdir -p dto future callfacade callback notification test; 	\
-	@srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/ioam_export.api.json --plugin_name ioamexport;		\
-	cd -;							\
-	mv -f $(jvpp_root)/$(jvpp_export_package_dir)/jvpp_ioamexport_gen.h $(jvpp_root)/jvpp_ioam_export_gen.h;							\
-	cp $(srcdir)/$(jvpp_root)/$(jvpp_export_package_dir)/test/*.java $(jvpp_root)/$(jvpp_export_package_dir)/test/;				\
-	cd $(jvpp_root);				\
-	$(JAVAC) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d $(jvpp_target_dir) $(jvpp_export_package_dir)/*.java \
-		$(jvpp_export_package_dir)/dto/*.java \
-		$(jvpp_export_package_dir)/callback/*.java \
-		$(jvpp_export_package_dir)/notification/*.java \
-		$(jvpp_export_package_dir)/future/*.java 	\
-		$(jvpp_export_package_dir)/callfacade/*.java 	\
-		$(jvpp_export_package_dir)/test/*.java \
-		|| (echo "ioam export jvpp compilation failed: $$?"; exit 1);	\
-	$(JAVAH) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d . io.fd.vpp.jvpp.ioamexport.JVppIoamexportImpl ;
-
-$(jioam_export_jarfile): libjvpp_ioamexport.la
-	cp .libs/libjvpp_ioamexport.so.0.0.0 $(jvpp_target);				\
-	cd $(jvpp_target);				\
-	$(JAR) cfv $(JARFLAGS) ../../../$@ libjvpp_ioamexport.so.0.0.0 $(jvpp_export_package_dir)/* ; cd ..;
-
-ioam_export.api.json:
-	@echo "  jIoam_export API"; \
-        vppapigen --input $(export_api_file) --json ioam_export.api.json;
-
-all-local: $(jioam_export_jarfile)
diff --git a/plugins/ioam-plugin/configure.ac b/plugins/ioam-plugin/configure.ac
deleted file mode 100644
index 287bcaab..00000000
--- a/plugins/ioam-plugin/configure.ac
+++ /dev/null
@@ -1,25 +0,0 @@
-AC_INIT(ioam_plugin, 1.0)
-LT_INIT
-AC_CONFIG_MACRO_DIR([../../vpp-api/java/m4])
-AM_INIT_AUTOMAKE
-AC_PREFIX_DEFAULT([/usr])
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-if test -f /usr/bin/lsb_release  && test `lsb_release -si` == "Ubuntu"  && test `lsb_release -sr` == "14.04"  && test -d /usr/lib/jvm/java-8-openjdk-amd64/ ; then
-    JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
-    JAVAC=${JAVA_HOME}/bin/javac
-    PATH=${JAVA_HOME}/bin/:${PATH}
-    break
-fi
-
-AX_CHECK_JAVA_HOME
-AX_PROG_JAVAC
-AX_PROG_JAVAH
-AX_PROG_JAR
-AX_PROG_JAVADOC
-AX_PROG_JAVA
-
-
-AC_OUTPUT([Makefile])
diff --git a/plugins/ioam-plugin/ioam/dir.dox b/plugins/ioam-plugin/ioam/dir.dox
deleted file mode 100644
index f3389b52..00000000
--- a/plugins/ioam-plugin/ioam/dir.dox
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- @dir
- @brief Inband OAM (iOAM) implementation
-*/
diff --git a/plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.c b/plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.c
deleted file mode 100644
index 0839cdce..00000000
--- a/plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-
-#include <vnet/ip/ip.h>
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-
-#include <vnet/ip/ip6_hop_by_hop.h>
-#include <vnet/plugin/plugin.h>
-
-#include "ip6_ioam_e2e.h"
-
-ioam_e2e_main_t ioam_e2e_main;
-
-static u8 * ioam_e2e_trace_handler (u8 * s,
-                                    ip6_hop_by_hop_option_t *opt)
-{
-  ioam_e2e_option_t * e2e = (ioam_e2e_option_t *)opt;
-  u32 seqno = 0;
-
-  if (e2e)
-    {
-      seqno = clib_net_to_host_u32 (e2e->e2e_data);
-    }
-
-  s = format (s, "SeqNo = 0x%Lx", seqno);
-  return s;
-}
-
-int 
-ioam_e2e_config_handler (void *data, u8 disable)
-{
-  int *analyse = data;
-
-  /* Register hanlders if enabled */
-  if (!disable)
-    {
-      /* If encap node register for encap handler */
-      if (0 == *analyse)
-        {
-          if (ip6_hbh_register_option(HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE,
-                                      ioam_seqno_encap_handler,
-                                      ioam_e2e_trace_handler) < 0)
-            {
-              return (-1);
-            }
-        }
-      /* If analyze node then register for decap handler */
-      else
-        {
-          if (ip6_hbh_pop_register_option(HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE,
-                                          ioam_seqno_decap_handler) < 0)
-            {
-              return (-1);
-            }
-        }
-      return 0;
-    }
-
-  /* UnRegister handlers */
-  (void) ip6_hbh_unregister_option(HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE);
-  (void) ip6_hbh_pop_unregister_option(HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE);
-  return 0;
-}
-
-int
-ioam_e2e_rewrite_handler (u8 *rewrite_string,
-                          u8 *rewrite_size)
-{
-  ioam_e2e_option_t *e2e_option;
-
-  if (rewrite_string && *rewrite_size == sizeof(ioam_e2e_option_t))
-    {
-      e2e_option = (ioam_e2e_option_t *)rewrite_string;
-      e2e_option->hdr.type = HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE
-          | HBH_OPTION_TYPE_SKIP_UNKNOWN;
-      e2e_option->hdr.length = sizeof (ioam_e2e_option_t) -
-          sizeof (ip6_hop_by_hop_option_t);
-      return(0);
-    }
-  return(-1);
-}
-
-u32
-ioam_e2e_flow_handler (u32 ctx, u8 add)
-{
-  ioam_e2e_data_t *data;
-  u16 i;
-
-  if (add)
-    {
-      pool_get(ioam_e2e_main.e2e_data, data);
-      data->flow_ctx =  ctx;
-      ioam_seqno_init_bitmap(&data->seqno_data);
-      return ((u32) (data - ioam_e2e_main.e2e_data));
-    }
-
-  /* Delete case */
-  for (i = 0; i < vec_len(ioam_e2e_main.e2e_data); i++)
-    {
-      if (pool_is_free_index(ioam_e2e_main.e2e_data, i))
-        continue;
-
-      data = pool_elt_at_index(ioam_e2e_main.e2e_data, i);
-      if (data && (data->flow_ctx == ctx))
-        {
-          pool_put_index(ioam_e2e_main.e2e_data, i);
-          return (0);
-        }
-    }
-  return 0;
-}
-
-static clib_error_t *
-ioam_show_e2e_cmd_fn (vlib_main_t * vm,
-                      unformat_input_t * input,
-                      vlib_cli_command_t * cmd)
-{
-  ioam_e2e_data_t *e2e_data;
-  u8 *s = 0;
-  int i;
-
-  vec_reset_length(s);
-
-  s = format(0, "IOAM E2E information: \n");
-  for (i = 0; i < vec_len(ioam_e2e_main.e2e_data); i++)
-    {
-      if (pool_is_free_index(ioam_e2e_main.e2e_data, i))
-        continue;
-
-      e2e_data = pool_elt_at_index(ioam_e2e_main.e2e_data, i);
-      s = format(s, "Flow name: %s\n", get_flow_name_from_flow_ctx(e2e_data->flow_ctx));
-
-      s = show_ioam_seqno_cmd_fn(s,
-                                 &e2e_data->seqno_data,
-                                 !IOAM_DEAP_ENABLED(e2e_data->flow_ctx));
-    }
-
-  vlib_cli_output(vm, "%v", s);
-  return 0;
-}
-
-
-VLIB_CLI_COMMAND (ioam_show_e2e_cmd, static) = {
-    .path = "show ioam e2e ",
-    .short_help = "show ioam e2e information",
-    .function = ioam_show_e2e_cmd_fn,
-};
-
-/*
- * This routine exists to convince the vlib plugin framework that
- * we haven't accidentally copied a random .dll into the plugin directory.
- *
- * Also collects global variable pointers passed from the vpp engine
- */
-clib_error_t *
-vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
-                      int from_early_init)
-{
-  clib_error_t * error = 0;
-
-  ioam_e2e_main.vlib_main = vm;
-  ioam_e2e_main.vnet_main = h->vnet_main;
-  return error;
-}
-
-/*
- * Init handler E2E headet handling.
- * Init hanlder registers encap, decap, trace and Rewrite handlers.
- */
-static clib_error_t *
-ioam_e2e_init (vlib_main_t * vm)
-{
-  clib_error_t * error;
-
-  if ((error = vlib_call_init_function (vm, ip6_hop_by_hop_ioam_init)))
-    {
-      return(error);
-    }
-
-  /*
-   * As of now we have only PPC under E2E header.
-   */
-  if (ip6_hbh_config_handler_register(HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE,
-                                      ioam_e2e_config_handler) < 0)
-    {
-      return (clib_error_create("Registration of "
-          "HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE for rewrite failed"));
-    }
-
-  if (ip6_hbh_add_register_option(HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE,
-                                  sizeof(ioam_e2e_option_t),
-                                  ioam_e2e_rewrite_handler) < 0)
-    {
-      return (clib_error_create("Registration of "
-          "HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE for rewrite failed"));
-    }
-
-  if (ip6_hbh_flow_handler_register(HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE,
-                                    ioam_e2e_flow_handler) < 0)
-    {
-      return (clib_error_create("Registration of "
-          "HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE Flow handler failed"));
-    }
-
-  return (0);
-}
-
-/*
- * Init function for the E2E lib.
- * ip6_hop_by_hop_ioam_e2e_init gets called during init.
- */
-VLIB_INIT_FUNCTION (ioam_e2e_init);
diff --git a/plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.h b/plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.h
deleted file mode 100644
index 18f35f80..00000000
--- a/plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __included_ip6_ioam_e2e_h__
-#define __included_ip6_ioam_e2e_h__
-
-#include "ip6_ioam_seqno.h"
-
-typedef struct ioam_e2e_data_t_ {
-  u32 flow_ctx;
-  u32 pad;
-  ioam_seqno_data seqno_data;
-} ioam_e2e_data_t;
-
-typedef struct {
-  ioam_e2e_data_t *e2e_data;
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} ioam_e2e_main_t;
-
-extern ioam_e2e_main_t ioam_e2e_main;
-
-static inline ioam_seqno_data *
-ioam_e2ec_get_seqno_data_from_flow_ctx (u32 flow_ctx)
-{
-  ioam_e2e_data_t *data = NULL;
-  u32 index;
-
-  index =  get_flow_data_from_flow_ctx(flow_ctx,
-                                       HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE);
-  data = &ioam_e2e_main.e2e_data[index];
-  return &(data->seqno_data);
-}
-
-#endif /* __included_ioam_e2e_h__ */
diff --git a/plugins/ioam-plugin/ioam/encap/ip6_ioam_pot.c b/plugins/ioam-plugin/ioam/encap/ip6_ioam_pot.c
deleted file mode 100644
index 05f42c91..00000000
--- a/plugins/ioam-plugin/ioam/encap/ip6_ioam_pot.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-
-#include <vnet/ip/ip6.h>
-#include <vnet/ip/ip6_hop_by_hop.h>
-#include <vnet/ip/ip6_hop_by_hop_packet.h>
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-
-#include <ioam/lib-pot/pot_util.h>
-
-typedef CLIB_PACKED(struct {
-  ip6_hop_by_hop_option_t hdr;
-  u8 pot_type;
-#define PROFILE_ID_MASK 0xF
-  u8 reserved_profile_id; /* 4 bits reserved, 4 bits to carry profile id */
-  u64 random;
-  u64 cumulative;
-}) ioam_pot_option_t;
-
-#define foreach_ip6_hop_by_hop_ioam_pot_stats				\
-  _(PROCESSED, "Pkts with ip6 hop-by-hop pot options")			\
-  _(PROFILE_MISS, "Pkts with ip6 hop-by-hop pot options but no profile set") \
-  _(PASSED, "Pkts with POT in Policy")					\
-  _(FAILED, "Pkts with POT out of Policy") 
-
-static char * ip6_hop_by_hop_ioam_pot_stats_strings[] = {
-#define _(sym,string) string,
-  foreach_ip6_hop_by_hop_ioam_pot_stats
-#undef _
-};
-
-typedef enum {
-#define _(sym,str) IP6_IOAM_POT_##sym,
-  foreach_ip6_hop_by_hop_ioam_pot_stats
-#undef _
-  IP6_IOAM_POT_N_STATS,
-} ip6_ioam_pot_stats_t;
-
-typedef struct {
-  /* stats */
-  u64 counters[ARRAY_LEN(ip6_hop_by_hop_ioam_pot_stats_strings)];
-  
-  /* convenience */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-} ip6_hop_by_hop_ioam_pot_main_t;
-
-ip6_hop_by_hop_ioam_pot_main_t ip6_hop_by_hop_ioam_pot_main;
-
-always_inline void 
-ip6_ioam_stats_increment_counter (u32 counter_index, u64 increment)
-{
-  ip6_hop_by_hop_ioam_pot_main_t *hm = &ip6_hop_by_hop_ioam_pot_main;
-
-  hm->counters[counter_index] += increment;
-}
-
-
-static u8 * format_ioam_pot (u8 * s, va_list * args)
-{
-  ioam_pot_option_t * pot0 = va_arg (*args, ioam_pot_option_t *);
-  u64 random, cumulative;
-  random = cumulative = 0;
-  if (pot0) 
-    { 
-      random = clib_net_to_host_u64 (pot0->random);
-      cumulative = clib_net_to_host_u64 (pot0->cumulative);
-    }
-
-  s = format (s, "random = 0x%Lx, Cumulative = 0x%Lx, Index = 0x%x", 
-	      random, cumulative, pot0 ? pot0->reserved_profile_id : ~0);
-  return s;
-}
-
-u8 *
-ip6_hbh_ioam_proof_of_transit_trace_handler (u8 *s, ip6_hop_by_hop_option_t *opt)
-{
-  ioam_pot_option_t *pot;
-
-  s = format (s, "    POT opt present\n");
-  pot = (ioam_pot_option_t *) opt;
-  s = format (s, "         %U\n", format_ioam_pot, pot);
-  return (s);
-}
-
-int
-ip6_hbh_ioam_proof_of_transit_handler (vlib_buffer_t *b,
-				       ip6_header_t *ip,
-				       ip6_hop_by_hop_option_t *opt0)
-{
-  ioam_pot_option_t * pot0;
-  u64 random = 0, cumulative = 0;
-  int rv = 0;
-  u8 pot_profile_index;
-  pot_profile *pot_profile = 0, *new_profile = 0;
-  u8 pot_encap = 0;
-
-  pot0 = (ioam_pot_option_t *) opt0;
-  pot_encap = (pot0->random == 0);
-  pot_profile_index = pot_profile_get_active_id();
-  pot_profile = pot_profile_get_active();
-  if (pot_encap && PREDICT_FALSE(!pot_profile))
-    {
-      ip6_ioam_stats_increment_counter (IP6_IOAM_POT_PROFILE_MISS, 1);
-      return(-1);
-    }
-  if (pot_encap)
-    {
-      pot0->reserved_profile_id =
-	pot_profile_index & PROFILE_ID_MASK;
-      pot_profile_incr_usage_stats(pot_profile);
-    } 
-  else 
-    { /* Non encap node */
-      if (PREDICT_FALSE(pot0->reserved_profile_id != 
-			pot_profile_index || pot_profile == 0)) 
-	{
-	  /* New profile announced by encap node. */
-	  new_profile =
-	    pot_profile_find(pot0->reserved_profile_id); 
-	  if (PREDICT_FALSE(new_profile == 0 ||
-			    new_profile->valid == 0)) 
-	    {
-	      ip6_ioam_stats_increment_counter (IP6_IOAM_POT_PROFILE_MISS, 1);
-	      return(-1);
- 	    } 
-	  else 
-	    {
-	      pot_profile_index = pot0->reserved_profile_id;
-	      pot_profile = new_profile;
-	      pot_profile_set_active(pot_profile_index);
-	      pot_profile_reset_usage_stats(pot_profile);
-	    }
-	}
-      pot_profile_incr_usage_stats(pot_profile);
-    }
-
-  if (pot0->random == 0) 
-    {
-      pot0->random = clib_host_to_net_u64(pot_generate_random(pot_profile));
-      pot0->cumulative = 0;
-    }
-  random = clib_net_to_host_u64(pot0->random);
-  cumulative = clib_net_to_host_u64(pot0->cumulative);
-  pot0->cumulative = clib_host_to_net_u64(
-					  pot_update_cumulative(pot_profile,
-								cumulative,
-								random));
-  ip6_ioam_stats_increment_counter (IP6_IOAM_POT_PROCESSED, 1);
-
-  return (rv);
-}
-
-int
-ip6_hbh_ioam_proof_of_transit_pop_handler (vlib_buffer_t *b, ip6_header_t *ip,
-					   ip6_hop_by_hop_option_t *opt0)
-{
-  ioam_pot_option_t * pot0;
-  u64 random = 0;
-  u64 cumulative = 0;
-  int rv = 0;
-  pot_profile *pot_profile = 0;
-  u8 result = 0;
-  
-  pot0 = (ioam_pot_option_t *) opt0;
-  random = clib_net_to_host_u64(pot0->random);
-  cumulative = clib_net_to_host_u64(pot0->cumulative);
-  pot_profile = pot_profile_get_active();
-  result =  pot_validate (pot_profile,
-			  cumulative, random);
-	  
-  if (result == 1) 
-    {
-      ip6_ioam_stats_increment_counter (IP6_IOAM_POT_PASSED, 1);
-    }
-  else 
-    {
-      ip6_ioam_stats_increment_counter (IP6_IOAM_POT_FAILED, 1);
-    }
-  return (rv);
-}
-
-int ip6_hop_by_hop_ioam_pot_rewrite_handler (u8 *rewrite_string, u8 *rewrite_size)
-{
-  ioam_pot_option_t * pot_option;
-  if (rewrite_string && *rewrite_size == sizeof(ioam_pot_option_t))
-    {
-      pot_option = (ioam_pot_option_t *)rewrite_string;
-      pot_option->hdr.type = HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT
-        | HBH_OPTION_TYPE_DATA_CHANGE_ENROUTE;
-      pot_option->hdr.length = sizeof (ioam_pot_option_t) - 
-        sizeof (ip6_hop_by_hop_option_t);
-      return(0);
-    }
-  return(-1);
-}
-
-static clib_error_t *
-ip6_show_ioam_pot_cmd_fn (vlib_main_t * vm,
-			  unformat_input_t * input,
-			  vlib_cli_command_t * cmd)
-{
-  ip6_hop_by_hop_ioam_pot_main_t *hm = &ip6_hop_by_hop_ioam_pot_main;
-  u8 *s = 0;
-  int i = 0;
-
-  for ( i = 0; i < IP6_IOAM_POT_N_STATS; i++)
-    {
-      s = format(s, " %s - %lu\n", ip6_hop_by_hop_ioam_pot_stats_strings[i],
-	       hm->counters[i]);
-    }
-
-  vlib_cli_output(vm, "%v", s);
-  vec_free(s);
-  return 0;
-}
-
-
-VLIB_CLI_COMMAND (ip6_show_ioam_pot_cmd, static) = {
-  .path = "show ioam pot",
-  .short_help = "iOAM pot statistics",
-  .function = ip6_show_ioam_pot_cmd_fn,
-};
-
-
-static clib_error_t *
-ip6_hop_by_hop_ioam_pot_init (vlib_main_t * vm)
-{
-  ip6_hop_by_hop_ioam_pot_main_t * hm = &ip6_hop_by_hop_ioam_pot_main;
-  clib_error_t * error;
-
-  if ((error = vlib_call_init_function (vm, ip6_hop_by_hop_ioam_init)))
-    return(error);
-
-  hm->vlib_main = vm;
-  hm->vnet_main = vnet_get_main();
-  memset(hm->counters, 0, sizeof(hm->counters));
-  
-  if (ip6_hbh_register_option(HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT, ip6_hbh_ioam_proof_of_transit_handler,
-			      ip6_hbh_ioam_proof_of_transit_trace_handler) < 0)
-    return (clib_error_create("registration of HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT failed"));
-
-  if (ip6_hbh_add_register_option(HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT,
-				  sizeof(ioam_pot_option_t),
-				  ip6_hop_by_hop_ioam_pot_rewrite_handler) < 0)
-    return (clib_error_create("registration of HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT for rewrite failed"));
-
-  if (ip6_hbh_pop_register_option(HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT,
-				  ip6_hbh_ioam_proof_of_transit_pop_handler) < 0)
-    return (clib_error_create("registration of HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT POP failed"));
-
-  return (0);
-}
-
-VLIB_INIT_FUNCTION (ip6_hop_by_hop_ioam_pot_init);
-
-
diff --git a/plugins/ioam-plugin/ioam/encap/ip6_ioam_seqno.c b/plugins/ioam-plugin/ioam/encap/ip6_ioam_seqno.c
deleted file mode 100644
index 0b4d4192..00000000
--- a/plugins/ioam-plugin/ioam/encap/ip6_ioam_seqno.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-
-#include <vnet/ip/ip.h>
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-
-#include "ip6_ioam_seqno.h"
-#include "ip6_ioam_e2e.h"
-
-ioam_seqno_data_main_t ioam_seqno_main;
-
-void ioam_seqno_init_bitmap (ioam_seqno_data *data)
-{
-  seqno_bitmap *bitmap = &data->seqno_rx.bitmap;
-  bitmap->window_size = SEQNO_WINDOW_SIZE;
-  bitmap->array_size = SEQNO_WINDOW_ARRAY_SIZE;
-  bitmap->mask = 32 * SEQNO_WINDOW_ARRAY_SIZE - 1;
-  bitmap->array[0] = 0x00000000;/* pretend we haven seen sequence numbers 0*/
-  bitmap->highest = 0;
-
-  data->seq_num = 0;
-  return ;
-}
-
-/*
- * This Routine gets called from IPv6 hop-by-hop option handling.
- * Only if we are encap node, then add PPC data.
- * On a Transit(MID) node we dont do anything with E2E headers.
- * On decap node decap is handled by seperate function.
- */
-int
-ioam_seqno_encap_handler (vlib_buffer_t *b, ip6_header_t *ip,
-                          ip6_hop_by_hop_option_t *opt)
-{
-  u32 opaque_index = vnet_buffer(b)->l2_classify.opaque_index;
-  ioam_e2e_option_t * e2e;
-  int rv = 0;
-  ioam_seqno_data *data;
-
-  data = ioam_e2ec_get_seqno_data_from_flow_ctx(opaque_index);
-  e2e = (ioam_e2e_option_t *) opt;
-  e2e->e2e_data = clib_host_to_net_u32(++data->seq_num);
-
-  return (rv);
-}
-
-/*
- * This Routine gets called on POP/Decap node.
- */
-int
-ioam_seqno_decap_handler (vlib_buffer_t *b, ip6_header_t *ip,
-                          ip6_hop_by_hop_option_t *opt)
-{
-  u32 opaque_index = vnet_buffer(b)->l2_classify.opaque_index;
-  ioam_e2e_option_t * e2e;
-  int rv = 0;
-  ioam_seqno_data *data;
-
-  data = ioam_e2ec_get_seqno_data_from_flow_ctx(opaque_index);
-  e2e = (ioam_e2e_option_t *) opt;
-  ioam_analyze_seqno(&data->seqno_rx, (u64) clib_net_to_host_u32(e2e->e2e_data));
-
-  return (rv);
-}
-
-u8 *
-show_ioam_seqno_cmd_fn (u8 *s, ioam_seqno_data *seqno_data, u8 enc)
-{
-  seqno_rx_info *rx;
-
-  s = format(s, "SeqNo Data:\n");
-  if (enc)
-    {
-      s = format(s, "  Current Seq. Number : %llu\n", seqno_data->seq_num);
-    }
-  else
-    {
-      rx = &seqno_data->seqno_rx;
-      s = format(s, "  Highest Seq. Number : %llu\n", rx->bitmap.highest);
-      s = format(s, "     Packets received : %llu\n", rx->rx_packets);
-      s = format(s, "         Lost packets : %llu\n", rx->lost_packets);
-      s = format(s, "    Reordered packets : %llu\n", rx->reordered_packets);
-      s = format(s, "    Duplicate packets : %llu\n", rx->dup_packets);
-    }
-
-  format(s, "\n");
-  return s;
-}
diff --git a/plugins/ioam-plugin/ioam/encap/ip6_ioam_seqno.h b/plugins/ioam-plugin/ioam/encap/ip6_ioam_seqno.h
deleted file mode 100644
index 13a84db0..00000000
--- a/plugins/ioam-plugin/ioam/encap/ip6_ioam_seqno.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __included_ip6_ioam_seqno_h__
-#define __included_ip6_ioam_seqno_h__
-
-#include <vnet/ip/ip6_packet.h>
-#include <vnet/ip/ip6_hop_by_hop.h>
-
-#define SEQ_CHECK_VALUE 0x80000000 /* for seq number wraparound detection */
-
-#define SEQNO_WINDOW_SIZE 2048
-#define SEQNO_WINDOW_ARRAY_SIZE 64
-
-typedef struct seqno_bitmap_ {
-  u32 window_size;
-  u32 array_size;
-  u32 mask;
-  u32 pad;
-  u64 highest;
-  u64 array[SEQNO_WINDOW_ARRAY_SIZE];    /* Will be alloc to array_size */
-} seqno_bitmap;
-
-typedef struct seqno_rx_info_ {
-  u64 rx_packets;
-  u64 lost_packets;
-  u64 reordered_packets;
-  u64 dup_packets;
-  seqno_bitmap bitmap;
-} seqno_rx_info;
-
-/* This structure is 64-byte aligned */
-typedef struct ioam_seqno_data_ {
-  union {
-    u32 seq_num; /* Useful only for encap node */
-    seqno_rx_info seqno_rx;
-  };
-} ioam_seqno_data;
-
-typedef struct ioam_seqno_data_main_t_ {
-  ioam_seqno_data *seqno_data;
-} ioam_seqno_data_main_t;
-
-void ioam_seqno_init_bitmap(ioam_seqno_data *data);
-
-int ioam_seqno_encap_handler(vlib_buffer_t *b, ip6_header_t *ip,
-                             ip6_hop_by_hop_option_t *opt);
-
-int
-ioam_seqno_decap_handler(vlib_buffer_t *b, ip6_header_t *ip,
-                         ip6_hop_by_hop_option_t *opt);
-
-void ioam_analyze_seqno(seqno_rx_info *ppc_rx, u64 seqno);
-
-u8 *
-show_ioam_seqno_cmd_fn(u8 *s, ioam_seqno_data *seqno_data, u8 enc);
-
-#endif
diff --git a/plugins/ioam-plugin/ioam/encap/ip6_ioam_seqno_analyse.c b/plugins/ioam-plugin/ioam/encap/ip6_ioam_seqno_analyse.c
deleted file mode 100644
index 4638871c..00000000
--- a/plugins/ioam-plugin/ioam/encap/ip6_ioam_seqno_analyse.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include "ip6_ioam_seqno.h"
-
-static inline void BIT_SET (u64 *p, u32 n)
-{
-  p[ n>>5 ] |= (1 << (n&31));
-}
-
-static inline int BIT_TEST (u64 *p, u32 n)
-{
-  return p[ n>>5 ] & (1 << (n&31));
-}
-
-static void BIT_CLEAR (u64 *p, u64 start, int  num_bits, u32 mask)
-{
-  int n, t;
-  int start_index = (start >> 5);
-  int mask_index = (mask >> 5);
-
-  start_index &= mask_index;
-  if (start & 0x1f)
-    {
-      int start_bit = (start & 0x1f);
-
-      n = (1 << start_bit)-1;
-      t = start_bit + num_bits;
-      if (t < 32)
-        {
-          n |= ~((1 << t)-1);
-          p[ start_index ] &= n;
-          return;
-        }
-      p[ start_index ] &= n;
-      start_index = (start_index + 1) & mask_index;
-      num_bits -= (32 - start_bit);
-    }
-  while (num_bits >= 32)
-    {
-      p[ start_index ] = 0;
-      start_index = (start_index + 1) & mask_index;
-      num_bits -= 32;
-    }
-  n = ~((1 << num_bits) - 1);
-  p[ start_index ] &= n;
-}
-
-static inline u8 seqno_check_wraparound(u32 a, u32 b)
-{
-  if ((a != b) && (a > b) && ((a - b) > SEQ_CHECK_VALUE))
-    {
-      return 1;
-    }
-  return 0;
-}
-
-/*
- * Function to analyze the PPC value recevied.
- *     - Updates the bitmap with received sequence number
- *     - counts the received/lost/duplicate/reordered packets
- */
-void ioam_analyze_seqno (seqno_rx_info *seqno_rx, u64 seqno)
-{
-  int diff;
-  static int peer_dead_count;
-  seqno_bitmap *bitmap = &seqno_rx->bitmap;
-
-  seqno_rx->rx_packets++;
-
-  if (seqno > bitmap->highest)
-    {   /* new larger sequence number */
-      peer_dead_count = 0;
-      diff = seqno - bitmap->highest;
-      if (diff < bitmap->window_size)
-        {
-          if (diff > 1)
-            { /* diff==1 is *such* a common case it's a win to optimize it */
-              BIT_CLEAR(bitmap->array, bitmap->highest+1, diff-1, bitmap->mask);
-              seqno_rx->lost_packets += diff -1;
-            }
-        }
-      else
-        {
-          seqno_rx->lost_packets += diff -1;
-          memset( bitmap->array, 0, bitmap->array_size * sizeof(u64) );
-        }
-      BIT_SET(bitmap->array, seqno & bitmap->mask);
-      bitmap->highest = seqno;
-      return;
-    }
-
-  /* we've seen a bigger seq number before */
-  diff = bitmap->highest - seqno;
-  if (diff >= bitmap->window_size)
-    {
-      if (seqno_check_wraparound(bitmap->highest, seqno))
-        {
-          memset( bitmap->array, 0, bitmap->array_size * sizeof(u64));
-          BIT_SET(bitmap->array, seqno & bitmap->mask);
-          bitmap->highest = seqno;
-          return;
-        }
-      else
-        {
-          peer_dead_count++;
-          if (peer_dead_count > 25)
-            {
-              peer_dead_count = 0;
-              memset( bitmap->array, 0, bitmap->array_size * sizeof(u64) );
-              BIT_SET(bitmap->array, seqno & bitmap->mask);
-              bitmap->highest = seqno;
-            }
-          //ppc_rx->reordered_packets++;
-        }
-      return;
-    }
-
-  if (BIT_TEST(bitmap->array, seqno & bitmap->mask))
-    {
-      seqno_rx->dup_packets++;
-      return;    /* Already seen */
-    }
-  seqno_rx->reordered_packets++;
-  seqno_rx->lost_packets--;
-  BIT_SET(bitmap->array, seqno & bitmap->mask);
-  return;
-}
diff --git a/plugins/ioam-plugin/ioam/encap/ip6_ioam_trace.c b/plugins/ioam-plugin/ioam/encap/ip6_ioam_trace.c
deleted file mode 100644
index e63db6e4..00000000
--- a/plugins/ioam-plugin/ioam/encap/ip6_ioam_trace.c
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-
-#include <vnet/ip/ip6.h>
-#include <vnet/ip/ip6_hop_by_hop.h>
-#include <vnet/ip/ip6_hop_by_hop_packet.h>
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-
-#include <ioam/lib-trace/trace_util.h>
-
-/* Timestamp precision multipliers for seconds, milliseconds, microseconds
- * and nanoseconds respectively.
- */
-static f64 trace_tsp_mul[4] = { 1, 1e3, 1e6, 1e9 };
-
-typedef union
-{
-  u64 as_u64;
-  u32 as_u32[2];
-} time_u64_t;
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED(struct {
-  ip6_hop_by_hop_option_t hdr;
-  u8 ioam_trace_type;
-  u8 data_list_elts_left;
-  u32 elts[0]; /* Variable type. So keep it generic */
-}) ioam_trace_option_t;
-/* *INDENT-ON* */
-
-
-extern ip6_hop_by_hop_ioam_main_t ip6_hop_by_hop_ioam_main;
-extern ip6_main_t ip6_main;
-
-#define foreach_ip6_hop_by_hop_ioam_trace_stats                                \
-  _(PROCESSED, "Pkts with ip6 hop-by-hop trace options")                        \
-  _(PROFILE_MISS, "Pkts with ip6 hop-by-hop trace options but no profile set") \
-  _(UPDATED, "Pkts with trace updated")                                        \
-  _(FULL, "Pkts with trace options but no space")
-
-static char *ip6_hop_by_hop_ioam_trace_stats_strings[] = {
-#define _(sym,string) string,
-  foreach_ip6_hop_by_hop_ioam_trace_stats
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) IP6_IOAM_TRACE_##sym,
-  foreach_ip6_hop_by_hop_ioam_trace_stats
-#undef _
-    IP6_IOAM_TRACE_N_STATS,
-} ip6_ioam_trace_stats_t;
-
-
-typedef struct
-{
-  /* stats */
-  u64 counters[ARRAY_LEN (ip6_hop_by_hop_ioam_trace_stats_strings)];
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} ip6_hop_by_hop_ioam_trace_main_t;
-
-ip6_hop_by_hop_ioam_trace_main_t ip6_hop_by_hop_ioam_trace_main;
-
-always_inline void
-ip6_ioam_trace_stats_increment_counter (u32 counter_index, u64 increment)
-{
-  ip6_hop_by_hop_ioam_trace_main_t *hm = &ip6_hop_by_hop_ioam_trace_main;
-
-  hm->counters[counter_index] += increment;
-}
-
-
-static u8 *
-format_ioam_data_list_element (u8 * s, va_list * args)
-{
-  u32 *elt = va_arg (*args, u32 *);
-  u8 *trace_type_p = va_arg (*args, u8 *);
-  u8 trace_type = *trace_type_p;
-
-
-  if (trace_type & BIT_TTL_NODEID)
-    {
-      u32 ttl_node_id_host_byte_order = clib_net_to_host_u32 (*elt);
-      s = format (s, "ttl 0x%x node id 0x%x ",
-		  ttl_node_id_host_byte_order >> 24,
-		  ttl_node_id_host_byte_order & 0x00FFFFFF);
-
-      elt++;
-    }
-
-  if (trace_type & BIT_ING_INTERFACE && trace_type & BIT_ING_INTERFACE)
-    {
-      u32 ingress_host_byte_order = clib_net_to_host_u32 (*elt);
-      s = format (s, "ingress 0x%x egress 0x%x ",
-		  ingress_host_byte_order >> 16,
-		  ingress_host_byte_order & 0xFFFF);
-      elt++;
-    }
-
-  if (trace_type & BIT_TIMESTAMP)
-    {
-      u32 ts_in_host_byte_order = clib_net_to_host_u32 (*elt);
-      s = format (s, "ts 0x%x \n", ts_in_host_byte_order);
-      elt++;
-    }
-
-  if (trace_type & BIT_APPDATA)
-    {
-      u32 appdata_in_host_byte_order = clib_net_to_host_u32 (*elt);
-      s = format (s, "app 0x%x ", appdata_in_host_byte_order);
-      elt++;
-    }
-
-  return s;
-}
-
-
-int
-ip6_ioam_trace_get_sizeof_handler (u32 * result)
-{
-  u16 size = 0;
-  u8 trace_data_size = 0;
-  trace_profile *profile = NULL;
-
-  *result = 0;
-
-  profile = trace_profile_find ();
-
-  if (PREDICT_FALSE (!profile))
-    {
-      ip6_ioam_trace_stats_increment_counter (IP6_IOAM_TRACE_PROFILE_MISS, 1);
-      return (-1);
-    }
-
-  trace_data_size = fetch_trace_data_size (profile->trace_type);
-  if (PREDICT_FALSE (trace_data_size == 0))
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  if (PREDICT_FALSE (profile->num_elts * trace_data_size > 254))
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  size +=
-    sizeof (ioam_trace_option_t) + (profile->num_elts * trace_data_size);
-  *result = size;
-
-  return 0;
-}
-
-
-
-int
-ip6_hop_by_hop_ioam_trace_rewrite_handler (u8 * rewrite_string,
-					   u8 * rewrite_size)
-{
-  ioam_trace_option_t *trace_option = NULL;
-  u8 trace_data_size = 0;
-  u8 trace_option_elts = 0;
-  trace_profile *profile = NULL;
-
-
-  profile = trace_profile_find ();
-
-  if (PREDICT_FALSE (!profile))
-    {
-      ip6_ioam_trace_stats_increment_counter (IP6_IOAM_TRACE_PROFILE_MISS, 1);
-      return (-1);
-    }
-
-  if (PREDICT_FALSE (!rewrite_string))
-    return -1;
-
-  trace_option_elts = profile->num_elts;
-  trace_data_size = fetch_trace_data_size (profile->trace_type);
-  trace_option = (ioam_trace_option_t *) rewrite_string;
-  trace_option->hdr.type = HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST |
-    HBH_OPTION_TYPE_DATA_CHANGE_ENROUTE;
-  trace_option->hdr.length = 2 /*ioam_trace_type,data_list_elts_left */  +
-    trace_option_elts * trace_data_size;
-  trace_option->ioam_trace_type = profile->trace_type & TRACE_TYPE_MASK;
-  trace_option->data_list_elts_left = trace_option_elts;
-  *rewrite_size =
-    sizeof (ioam_trace_option_t) + (trace_option_elts * trace_data_size);
-
-  return 0;
-}
-
-
-int
-ip6_hbh_ioam_trace_data_list_handler (vlib_buffer_t * b, ip6_header_t * ip,
-				      ip6_hop_by_hop_option_t * opt)
-{
-  ip6_main_t *im = &ip6_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-  u8 elt_index = 0;
-  ioam_trace_option_t *trace = (ioam_trace_option_t *) opt;
-  u32 adj_index = vnet_buffer (b)->ip.adj_index[VLIB_TX];
-  ip_adjacency_t *adj = ip_get_adjacency (lm, adj_index);
-  time_u64_t time_u64;
-  u32 *elt;
-  int rv = 0;
-  trace_profile *profile = NULL;
-
-
-  profile = trace_profile_find ();
-
-  if (PREDICT_FALSE (!profile))
-    {
-      ip6_ioam_trace_stats_increment_counter (IP6_IOAM_TRACE_PROFILE_MISS, 1);
-      return (-1);
-    }
-
-
-  time_u64.as_u64 = 0;
-
-  if (PREDICT_TRUE (trace->data_list_elts_left))
-    {
-      trace->data_list_elts_left--;
-      /* fetch_trace_data_size returns in bytes. Convert it to 4-bytes
-       * to skip to this node's location.
-       */
-      elt_index =
-	trace->data_list_elts_left *
-	fetch_trace_data_size (trace->ioam_trace_type) / 4;
-      elt = &trace->elts[elt_index];
-      if (trace->ioam_trace_type & BIT_TTL_NODEID)
-	{
-	  *elt =
-	    clib_host_to_net_u32 ((ip->hop_limit << 24) | profile->node_id);
-	  elt++;
-	}
-
-      if (trace->ioam_trace_type & BIT_ING_INTERFACE)
-	{
-	  *elt =
-	    (vnet_buffer (b)->sw_if_index[VLIB_RX] & 0xFFFF) << 16 |
-	    (adj->rewrite_header.sw_if_index & 0xFFFF);
-	  *elt = clib_host_to_net_u32 (*elt);
-	  elt++;
-	}
-
-      if (trace->ioam_trace_type & BIT_TIMESTAMP)
-	{
-	  /* Send least significant 32 bits */
-	  f64 time_f64 =
-	    (f64) (((f64) hm->unix_time_0) +
-		   (vlib_time_now (hm->vlib_main) - hm->vlib_time_0));
-
-	  time_u64.as_u64 = time_f64 * trace_tsp_mul[profile->trace_tsp];
-	  *elt = clib_host_to_net_u32 (time_u64.as_u32[0]);
-	  elt++;
-	}
-
-      if (trace->ioam_trace_type & BIT_APPDATA)
-	{
-	  /* $$$ set elt0->app_data */
-	  *elt = clib_host_to_net_u32 (profile->app_data);
-	  elt++;
-	}
-      ip6_ioam_trace_stats_increment_counter (IP6_IOAM_TRACE_UPDATED, 1);
-    }
-  else
-    {
-      ip6_ioam_trace_stats_increment_counter (IP6_IOAM_TRACE_FULL, 1);
-    }
-  return (rv);
-}
-
-u8 *
-ip6_hbh_ioam_trace_data_list_trace_handler (u8 * s,
-					    ip6_hop_by_hop_option_t * opt)
-{
-  ioam_trace_option_t *trace;
-  u8 trace_data_size_in_words = 0;
-  u32 *elt;
-  int elt_index = 0;
-
-  trace = (ioam_trace_option_t *) opt;
-  s =
-    format (s, "  Trace Type 0x%x , %d elts left\n", trace->ioam_trace_type,
-	    trace->data_list_elts_left);
-  trace_data_size_in_words =
-    fetch_trace_data_size (trace->ioam_trace_type) / 4;
-  elt = &trace->elts[0];
-  while ((u8 *) elt < ((u8 *) (&trace->elts[0]) + trace->hdr.length - 2
-		       /* -2 accounts for ioam_trace_type,elts_left */ ))
-    {
-      s = format (s, "    [%d] %U\n", elt_index,
-		  format_ioam_data_list_element,
-		  elt, &trace->ioam_trace_type);
-      elt_index++;
-      elt += trace_data_size_in_words;
-    }
-  return (s);
-}
-
-
-static clib_error_t *
-ip6_show_ioam_trace_cmd_fn (vlib_main_t * vm,
-			    unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
-{
-  ip6_hop_by_hop_ioam_trace_main_t *hm = &ip6_hop_by_hop_ioam_trace_main;
-  u8 *s = 0;
-  int i = 0;
-
-  for (i = 0; i < IP6_IOAM_TRACE_N_STATS; i++)
-    {
-      s =
-	format (s, " %s - %lu\n", ip6_hop_by_hop_ioam_trace_stats_strings[i],
-		hm->counters[i]);
-    }
-
-  vlib_cli_output (vm, "%v", s);
-  vec_free (s);
-  return 0;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (ip6_show_ioam_trace_cmd, static) = {
-  .path = "show ioam trace",
-  .short_help = "iOAM trace statistics",
-  .function = ip6_show_ioam_trace_cmd_fn,
-};
-/* *INDENT-ON* */
-
-
-static clib_error_t *
-ip6_hop_by_hop_ioam_trace_init (vlib_main_t * vm)
-{
-  ip6_hop_by_hop_ioam_trace_main_t *hm = &ip6_hop_by_hop_ioam_trace_main;
-  clib_error_t *error;
-
-  if ((error = vlib_call_init_function (vm, ip_main_init)))
-    return (error);
-
-  if ((error = vlib_call_init_function (vm, ip6_lookup_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, ip6_hop_by_hop_ioam_init)))
-    return (error);
-
-  hm->vlib_main = vm;
-  hm->vnet_main = vnet_get_main ();
-  memset (hm->counters, 0, sizeof (hm->counters));
-
-
-  if (ip6_hbh_register_option
-      (HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST,
-       ip6_hbh_ioam_trace_data_list_handler,
-       ip6_hbh_ioam_trace_data_list_trace_handler) < 0)
-    return (clib_error_create
-	    ("registration of HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST failed"));
-
-
-  if (ip6_hbh_add_register_option (HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST,
-				   sizeof (ioam_trace_option_t),
-				   ip6_hop_by_hop_ioam_trace_rewrite_handler)
-      < 0)
-    return (clib_error_create
-	    ("registration of HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST for rewrite failed"));
-
-
-  return (0);
-}
-
-int
-ip6_trace_profile_cleanup (void)
-{
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-
-  hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] = 0;
-
-  return 0;
-
-}
-
-
-int
-ip6_trace_profile_setup (void)
-{
-  u32 trace_size = 0;
-  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-
-  trace_profile *profile = NULL;
-
-
-  profile = trace_profile_find ();
-
-  if (PREDICT_FALSE (!profile))
-    {
-      ip6_ioam_trace_stats_increment_counter (IP6_IOAM_TRACE_PROFILE_MISS, 1);
-      return (-1);
-    }
-
-
-  if (ip6_ioam_trace_get_sizeof_handler (&trace_size) < 0)
-    return (-1);
-
-  hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] = trace_size;
-
-  return (0);
-}
-
-
-VLIB_INIT_FUNCTION (ip6_hop_by_hop_ioam_trace_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/export-common/ioam_export.h b/plugins/ioam-plugin/ioam/export-common/ioam_export.h
deleted file mode 100644
index a9ec8d00..00000000
--- a/plugins/ioam-plugin/ioam/export-common/ioam_export.h
+++ /dev/null
@@ -1,616 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_ioam_export_h__
-#define __included_ioam_export_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ip/ip_packet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vnet/ip/udp.h>
-#include <vnet/flow/ipfix_packet.h>
-
-#include <vppinfra/pool.h>
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-
-#include <vlib/threads.h>
-
-typedef struct ioam_export_buffer
-{
-  /* Allocated buffer */
-  u32 buffer_index;
-  u64 touched_at;
-  u8 records_in_this_buffer;
-} ioam_export_buffer_t;
-
-
-typedef struct
-{
-  /* API message ID base */
-  u16 msg_id_base;
-
-  /* TODO: to support multiple collectors all this has to be grouped and create a vector here */
-  u8 *record_header;
-  u32 sequence_number;
-  u32 domain_id;
-
-  /* ipfix collector, our ip address */
-  ip4_address_t ipfix_collector;
-  ip4_address_t src_address;
-
-  /* Pool of ioam_export_buffer_t */
-  ioam_export_buffer_t *buffer_pool;
-  /* Vector of per thread ioam_export_buffer_t to buffer pool index */
-  u32 *buffer_per_thread;
-  /* Lock per thread to swap buffers between worker and timer process */
-  volatile u32 **lockp;
-
-  /* time scale transform */
-  u32 unix_time_0;
-  f64 vlib_time_0;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-  u32 ip4_lookup_node_index;
-
-  uword my_hbh_slot;
-  u32 export_process_node_index;
-} ioam_export_main_t;
-
-ioam_export_main_t ioam_export_main;
-ioam_export_main_t vxlan_gpe_ioam_export_main;
-
-vlib_node_registration_t export_node;
-
-#define DEFAULT_EXPORT_SIZE (3 * CLIB_CACHE_LINE_BYTES)
-/*
- *  Number of records in a buffer
- * ~(MTU (1500) - [ip hdr(40) + UDP(8) + ipfix (24)]) / DEFAULT_EXPORT_SIZE
- */
-#define DEFAULT_EXPORT_RECORDS 7
-
-always_inline ioam_export_buffer_t *
-ioam_export_get_my_buffer (ioam_export_main_t * em, u32 thread_id)
-{
-
-  if (vec_len (em->buffer_per_thread) > thread_id)
-    return (pool_elt_at_index
-	    (em->buffer_pool, em->buffer_per_thread[thread_id]));
-  return (0);
-}
-
-inline static int
-ioam_export_buffer_add_header (ioam_export_main_t * em, vlib_buffer_t * b0)
-{
-  clib_memcpy (b0->data, em->record_header, vec_len (em->record_header));
-  b0->current_data = 0;
-  b0->current_length = vec_len (em->record_header);
-  b0->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
-  return (1);
-}
-
-inline static int
-ioam_export_init_buffer (ioam_export_main_t * em, vlib_main_t * vm,
-			 ioam_export_buffer_t * eb)
-{
-  vlib_buffer_t *b = 0;
-
-  if (!eb)
-    return (-1);
-  /* TODO: Perhaps buffer init from template here */
-  if (vlib_buffer_alloc (vm, &(eb->buffer_index), 1) != 1)
-    return (-2);
-  eb->records_in_this_buffer = 0;
-  eb->touched_at = vlib_time_now (vm);
-  b = vlib_get_buffer (vm, eb->buffer_index);
-  (void) ioam_export_buffer_add_header (em, b);
-  vnet_buffer (b)->sw_if_index[VLIB_RX] = 0;
-  vnet_buffer (b)->sw_if_index[VLIB_TX] = ~0;
-  return (1);
-}
-
-inline static void
-ioam_export_thread_buffer_free (ioam_export_main_t * em)
-{
-  vlib_main_t *vm = em->vlib_main;
-  ioam_export_buffer_t *eb = 0;
-  int i;
-  for (i = 0; i < vec_len (em->buffer_per_thread); i++)
-    {
-      eb = pool_elt_at_index (em->buffer_pool, em->buffer_per_thread[i]);
-      if (eb)
-	vlib_buffer_free (vm, &(eb->buffer_index), 1);
-    }
-  for (i = 0; i < vec_len (em->lockp); i++)
-    clib_mem_free ((void *) em->lockp[i]);
-  vec_free (em->buffer_per_thread);
-  pool_free (em->buffer_pool);
-  vec_free (em->lockp);
-  em->buffer_per_thread = 0;
-  em->buffer_pool = 0;
-  em->lockp = 0;
-}
-
-inline static int
-ioam_export_thread_buffer_init (ioam_export_main_t * em, vlib_main_t * vm)
-{
-  int no_of_threads = vec_len (vlib_worker_threads);
-  int i;
-  ioam_export_buffer_t *eb = 0;
-  vlib_node_t *ip4_lookup_node;
-
-  pool_alloc_aligned (em->buffer_pool,
-		      no_of_threads - 1, CLIB_CACHE_LINE_BYTES);
-  vec_validate_aligned (em->buffer_per_thread,
-			no_of_threads - 1, CLIB_CACHE_LINE_BYTES);
-  vec_validate_aligned (em->lockp, no_of_threads - 1, CLIB_CACHE_LINE_BYTES);
-  ip4_lookup_node = vlib_get_node_by_name (vm, (u8 *) "ip4-lookup");
-  em->ip4_lookup_node_index = ip4_lookup_node->index;
-  if (!em->buffer_per_thread || !em->buffer_pool || !em->lockp)
-    {
-      return (-1);
-    }
-  for (i = 0; i < no_of_threads; i++)
-    {
-      eb = 0;
-      pool_get_aligned (em->buffer_pool, eb, CLIB_CACHE_LINE_BYTES);
-      memset (eb, 0, sizeof (*eb));
-      em->buffer_per_thread[i] = eb - em->buffer_pool;
-      if (ioam_export_init_buffer (em, vm, eb) != 1)
-	{
-	  ioam_export_thread_buffer_free (em);
-	  return (-2);
-	}
-      em->lockp[i] = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
-					     CLIB_CACHE_LINE_BYTES);
-      memset ((void *) em->lockp[i], 0, CLIB_CACHE_LINE_BYTES);
-    }
-  return (1);
-}
-
-#define IPFIX_IOAM_EXPORT_ID 272
-
-/* Used to build the rewrite */
-/* data set packet */
-typedef struct
-{
-  ipfix_message_header_t h;
-  ipfix_set_header_t s;
-} ipfix_data_packet_t;
-
-typedef struct
-{
-  ip4_header_t ip4;
-  udp_header_t udp;
-  ipfix_data_packet_t ipfix;
-} ip4_ipfix_data_packet_t;
-
-
-inline static void
-ioam_export_header_cleanup (ioam_export_main_t * em,
-			    ip4_address_t * collector_address,
-			    ip4_address_t * src_address)
-{
-  vec_free (em->record_header);
-  em->record_header = 0;
-}
-
-inline static int
-ioam_export_header_create (ioam_export_main_t * em,
-			   ip4_address_t * collector_address,
-			   ip4_address_t * src_address)
-{
-  ip4_header_t *ip;
-  udp_header_t *udp;
-  ipfix_message_header_t *h;
-  ipfix_set_header_t *s;
-  u8 *rewrite = 0;
-  ip4_ipfix_data_packet_t *tp;
-
-
-  /* allocate rewrite space */
-  vec_validate_aligned (rewrite,
-			sizeof (ip4_ipfix_data_packet_t) - 1,
-			CLIB_CACHE_LINE_BYTES);
-
-  tp = (ip4_ipfix_data_packet_t *) rewrite;
-  ip = (ip4_header_t *) & tp->ip4;
-  udp = (udp_header_t *) (ip + 1);
-  h = (ipfix_message_header_t *) (udp + 1);
-  s = (ipfix_set_header_t *) (h + 1);
-
-  ip->ip_version_and_header_length = 0x45;
-  ip->ttl = 254;
-  ip->protocol = IP_PROTOCOL_UDP;
-  ip->src_address.as_u32 = src_address->as_u32;
-  ip->dst_address.as_u32 = collector_address->as_u32;
-  udp->src_port = clib_host_to_net_u16 (4939 /* $$FIXME */ );
-  udp->dst_port = clib_host_to_net_u16 (4939);
-  /* FIXUP: UDP length */
-  udp->length = clib_host_to_net_u16 (vec_len (rewrite) +
-				      (DEFAULT_EXPORT_RECORDS *
-				       DEFAULT_EXPORT_SIZE) - sizeof (*ip));
-
-  /* FIXUP: message header export_time */
-  /* FIXUP: message header sequence_number */
-  h->domain_id = clib_host_to_net_u32 (em->domain_id);
-
-  /*FIXUP: Setid length in octets if records exported are not default */
-  s->set_id_length = ipfix_set_id_length (IPFIX_IOAM_EXPORT_ID,
-					  (sizeof (*s) +
-					   (DEFAULT_EXPORT_RECORDS *
-					    DEFAULT_EXPORT_SIZE)));
-
-  /* FIXUP: h version and length length in octets if records exported are not default */
-  h->version_length = version_length (sizeof (*h) +
-				      (sizeof (*s) +
-				       (DEFAULT_EXPORT_RECORDS *
-					DEFAULT_EXPORT_SIZE)));
-
-  /* FIXUP: ip length if records exported are not default */
-  /* FIXUP: ip checksum if records exported are not default */
-  ip->length = clib_host_to_net_u16 (vec_len (rewrite) +
-				     (DEFAULT_EXPORT_RECORDS *
-				      DEFAULT_EXPORT_SIZE));
-  ip->checksum = ip4_header_checksum (ip);
-  _vec_len (rewrite) = sizeof (ip4_ipfix_data_packet_t);
-  em->record_header = rewrite;
-  return (1);
-}
-
-inline static int
-ioam_export_send_buffer (ioam_export_main_t * em, vlib_main_t * vm,
-			 ioam_export_buffer_t * eb)
-{
-  ip4_header_t *ip;
-  udp_header_t *udp;
-  ipfix_message_header_t *h;
-  ipfix_set_header_t *s;
-  ip4_ipfix_data_packet_t *tp;
-  vlib_buffer_t *b0;
-  u16 new_l0, old_l0;
-  ip_csum_t sum0;
-  vlib_frame_t *nf = 0;
-  u32 *to_next;
-
-  b0 = vlib_get_buffer (vm, eb->buffer_index);
-  tp = vlib_buffer_get_current (b0);
-  ip = (ip4_header_t *) & tp->ip4;
-  udp = (udp_header_t *) (ip + 1);
-  h = (ipfix_message_header_t *) (udp + 1);
-  s = (ipfix_set_header_t *) (h + 1);
-
-  /* FIXUP: message header export_time */
-  h->export_time = clib_host_to_net_u32 ((u32)
-					 (((f64) em->unix_time_0) +
-					  (vlib_time_now (em->vlib_main) -
-					   em->vlib_time_0)));
-
-  /* FIXUP: message header sequence_number */
-  h->sequence_number = clib_host_to_net_u32 (em->sequence_number++);
-
-  /* FIXUP: lengths if different from default */
-  if (PREDICT_FALSE (eb->records_in_this_buffer != DEFAULT_EXPORT_RECORDS))
-    {
-      s->set_id_length =
-	ipfix_set_id_length (IPFIX_IOAM_EXPORT_ID /* set_id */ ,
-			     b0->current_length - (sizeof (*ip) +
-						   sizeof (*udp) +
-						   sizeof (*h)));
-      h->version_length =
-	version_length (b0->current_length - (sizeof (*ip) + sizeof (*udp)));
-      sum0 = ip->checksum;
-      old_l0 = ip->length;
-      new_l0 = clib_host_to_net_u16 ((u16) b0->current_length);
-      sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
-			     length /* changed member */ );
-      ip->checksum = ip_csum_fold (sum0);
-      ip->length = new_l0;
-      udp->length = clib_host_to_net_u16 (b0->current_length - sizeof (*ip));
-    }
-
-  /* Enqueue pkts to ip4-lookup */
-
-  nf = vlib_get_frame_to_node (vm, em->ip4_lookup_node_index);
-  nf->n_vectors = 0;
-  to_next = vlib_frame_vector_args (nf);
-  nf->n_vectors = 1;
-  to_next[0] = eb->buffer_index;
-  vlib_put_frame_to_node (vm, em->ip4_lookup_node_index, nf);
-  return (1);
-
-}
-
-#define EXPORT_TIMEOUT (20.0)
-#define THREAD_PERIOD (30.0)
-inline static uword
-ioam_export_process_common (ioam_export_main_t * em, vlib_main_t * vm,
-			    vlib_node_runtime_t * rt, vlib_frame_t * f,
-			    u32 index)
-{
-  f64 now;
-  f64 timeout = 30.0;
-  uword event_type;
-  uword *event_data = 0;
-  int i;
-  ioam_export_buffer_t *eb = 0, *new_eb = 0;
-  u32 *vec_buffer_indices = 0;
-  u32 *vec_buffer_to_be_sent = 0;
-  u32 *thread_index = 0;
-  u32 new_pool_index = 0;
-
-  em->export_process_node_index = index;
-  /* Wait for Godot... */
-  vlib_process_wait_for_event_or_clock (vm, 1e9);
-  event_type = vlib_process_get_events (vm, &event_data);
-  if (event_type != 1)
-    clib_warning ("bogus kickoff event received, %d", event_type);
-  vec_reset_length (event_data);
-
-  while (1)
-    {
-      vlib_process_wait_for_event_or_clock (vm, timeout);
-      event_type = vlib_process_get_events (vm, &event_data);
-      switch (event_type)
-	{
-	case 2:		/* Stop and Wait for kickoff again */
-	  timeout = 1e9;
-	  break;
-	case 1:		/* kickoff : Check for unsent buffers */
-	  timeout = THREAD_PERIOD;
-	  break;
-	case ~0:		/* timeout */
-	  break;
-	}
-      vec_reset_length (event_data);
-      now = vlib_time_now (vm);
-      /*
-       * Create buffers for threads that are not active enough
-       * to send out the export records
-       */
-      for (i = 0; i < vec_len (em->buffer_per_thread); i++)
-	{
-	  /* If the worker thread is processing export records ignore further checks */
-	  if (*em->lockp[i] == 1)
-	    continue;
-	  eb = pool_elt_at_index (em->buffer_pool, em->buffer_per_thread[i]);
-	  if (eb->records_in_this_buffer > 0
-	      && now > (eb->touched_at + EXPORT_TIMEOUT))
-	    {
-	      pool_get_aligned (em->buffer_pool, new_eb,
-				CLIB_CACHE_LINE_BYTES);
-	      memset (new_eb, 0, sizeof (*new_eb));
-	      if (ioam_export_init_buffer (em, vm, new_eb) == 1)
-		{
-		  new_pool_index = new_eb - em->buffer_pool;
-		  vec_add (vec_buffer_indices, &new_pool_index, 1);
-		  vec_add (vec_buffer_to_be_sent, &em->buffer_per_thread[i],
-			   1);
-		  vec_add (thread_index, &i, 1);
-		}
-	      else
-		{
-		  pool_put (em->buffer_pool, new_eb);
-		  /*Give up */
-		  goto CLEANUP;
-		}
-	    }
-	}
-      if (vec_len (thread_index) != 0)
-	{
-	  /*
-	   * Now swap the buffers out
-	   */
-	  for (i = 0; i < vec_len (thread_index); i++)
-	    {
-	      while (__sync_lock_test_and_set (em->lockp[thread_index[i]], 1))
-		;
-	      em->buffer_per_thread[thread_index[i]] =
-		vec_pop (vec_buffer_indices);
-	      *em->lockp[thread_index[i]] = 0;
-	    }
-
-	  /* Send the buffers */
-	  for (i = 0; i < vec_len (vec_buffer_to_be_sent); i++)
-	    {
-	      eb =
-		pool_elt_at_index (em->buffer_pool, vec_buffer_to_be_sent[i]);
-	      ioam_export_send_buffer (em, vm, eb);
-	      pool_put (em->buffer_pool, eb);
-	    }
-	}
-
-    CLEANUP:
-      /* Free any leftover/unused buffers and everything that was allocated */
-      for (i = 0; i < vec_len (vec_buffer_indices); i++)
-	{
-	  new_eb = pool_elt_at_index (em->buffer_pool, vec_buffer_indices[i]);
-	  vlib_buffer_free (vm, &new_eb->buffer_index, 1);
-	  pool_put (em->buffer_pool, new_eb);
-	}
-      vec_free (vec_buffer_indices);
-      vec_free (vec_buffer_to_be_sent);
-      vec_free (thread_index);
-    }
-  return 0;			/* not so much */
-}
-
-#define ioam_export_node_common(EM, VM, N, F, HTYPE, L, V, NEXT)               \
-do {                                                                           \
-  u32 n_left_from, *from, *to_next;                                            \
-  export_next_t next_index;                                                    \
-  u32 pkts_recorded = 0;                                                       \
-  ioam_export_buffer_t *my_buf = 0;                                            \
-  vlib_buffer_t *eb0 = 0;                                                      \
-  u32 ebi0 = 0;                                                                \
-  from = vlib_frame_vector_args (F);                                           \
-  n_left_from = (F)->n_vectors;                                                \
-  next_index = (N)->cached_next_index;                                         \
-  while (__sync_lock_test_and_set ((EM)->lockp[(VM)->cpu_index], 1));          \
-  my_buf = ioam_export_get_my_buffer (EM, (VM)->cpu_index);                    \
-  my_buf->touched_at = vlib_time_now (VM);                                     \
-  while (n_left_from > 0)                                                      \
-    {                                                                          \
-      u32 n_left_to_next;                                                      \
-      vlib_get_next_frame (VM, N, next_index, to_next, n_left_to_next);        \
-      while (n_left_from >= 4 && n_left_to_next >= 2)                          \
-	{                                                                      \
-	  u32 next0 = NEXT;                                                    \
-	  u32 next1 = NEXT;                                                    \
-	  u32 bi0, bi1;                                                        \
-	  HTYPE *ip0, *ip1;                                                    \
-	  vlib_buffer_t *p0, *p1;                                              \
-	  u32 ip_len0, ip_len1;                                                \
-	  {                                                                    \
-	    vlib_buffer_t *p2, *p3;                                            \
-	    p2 = vlib_get_buffer (VM, from[2]);                                \
-	    p3 = vlib_get_buffer (VM, from[3]);                                \
-	    vlib_prefetch_buffer_header (p2, LOAD);                            \
-	    vlib_prefetch_buffer_header (p3, LOAD);                            \
-	    CLIB_PREFETCH (p2->data, 3 * CLIB_CACHE_LINE_BYTES, LOAD);         \
-	    CLIB_PREFETCH (p3->data, 3 * CLIB_CACHE_LINE_BYTES, LOAD);         \
-	  }                                                                    \
-	  to_next[0] = bi0 = from[0];                                          \
-	  to_next[1] = bi1 = from[1];                                          \
-	  from += 2;                                                           \
-	  to_next += 2;                                                        \
-	  n_left_from -= 2;                                                    \
-	  n_left_to_next -= 2;                                                 \
-	  p0 = vlib_get_buffer (VM, bi0);                                      \
-	  p1 = vlib_get_buffer (VM, bi1);                                      \
-	  ip0 = vlib_buffer_get_current (p0);                                  \
-	  ip1 = vlib_buffer_get_current (p1);                                  \
-	  ip_len0 =                                                            \
-	    clib_net_to_host_u16 (ip0->L) + sizeof (HTYPE);                    \
-	  ip_len1 =                                                            \
-	    clib_net_to_host_u16 (ip1->L) + sizeof (HTYPE);                    \
-	  ebi0 = my_buf->buffer_index;                                         \
-	  eb0 = vlib_get_buffer (VM, ebi0);                                    \
-	  if (PREDICT_FALSE (eb0 == 0))                                        \
-	    goto NO_BUFFER1;                                                   \
-	  ip_len0 =                                                            \
-	    ip_len0 > DEFAULT_EXPORT_SIZE ? DEFAULT_EXPORT_SIZE : ip_len0;     \
-	  ip_len1 =                                                            \
-	    ip_len1 > DEFAULT_EXPORT_SIZE ? DEFAULT_EXPORT_SIZE : ip_len1;     \
-	  copy3cachelines (eb0->data + eb0->current_length, ip0, ip_len0);     \
-	  eb0->current_length += DEFAULT_EXPORT_SIZE;                          \
-	  my_buf->records_in_this_buffer++;                                    \
-	  if (my_buf->records_in_this_buffer >= DEFAULT_EXPORT_RECORDS)        \
-	    {                                                                  \
-	      ioam_export_send_buffer (EM, VM, my_buf);                        \
-	      ioam_export_init_buffer (EM, VM, my_buf);                        \
-	    }                                                                  \
-	  ebi0 = my_buf->buffer_index;                                         \
-	  eb0 = vlib_get_buffer (VM, ebi0);                                    \
-	  if (PREDICT_FALSE (eb0 == 0))                                        \
-	    goto NO_BUFFER1;                                                   \
-	  copy3cachelines (eb0->data + eb0->current_length, ip1, ip_len1);     \
-	  eb0->current_length += DEFAULT_EXPORT_SIZE;                          \
-	  my_buf->records_in_this_buffer++;                                    \
-	  if (my_buf->records_in_this_buffer >= DEFAULT_EXPORT_RECORDS)        \
-	    {                                                                  \
-	      ioam_export_send_buffer (EM, VM, my_buf);                        \
-	      ioam_export_init_buffer (EM, VM, my_buf);                        \
-	    }                                                                  \
-	  pkts_recorded += 2;                                                  \
-	  if (PREDICT_FALSE (((node)->flags & VLIB_NODE_FLAG_TRACE)))          \
-	    {                                                                  \
-	      if (p0->flags & VLIB_BUFFER_IS_TRACED)                           \
-		{                                                              \
-		  export_trace_t *t =                                          \
-		    vlib_add_trace (VM, node, p0, sizeof (*t));                \
-		  t->flow_label =                                              \
-		    clib_net_to_host_u32 (ip0->V);                             \
-		  t->next_index = next0;                                       \
-		}                                                              \
-	      if (p1->flags & VLIB_BUFFER_IS_TRACED)                           \
-		{                                                              \
-		  export_trace_t *t =                                          \
-		    vlib_add_trace (VM, N, p1, sizeof (*t));                   \
-		  t->flow_label =                                              \
-		    clib_net_to_host_u32 (ip1->V);                             \
-		  t->next_index = next1;                                       \
-		}                                                              \
-	    }                                                                  \
-	NO_BUFFER1:                                                            \
-	  vlib_validate_buffer_enqueue_x2 (VM, N, next_index,                  \
-					   to_next, n_left_to_next,            \
-					   bi0, bi1, next0, next1);            \
-	}                                                                      \
-      while (n_left_from > 0 && n_left_to_next > 0)                            \
-	{                                                                      \
-	  u32 bi0;                                                             \
-	  vlib_buffer_t *p0;                                                   \
-	  u32 next0 = NEXT;                                                    \
-	  HTYPE *ip0;                                                          \
-	  u32 ip_len0;                                                         \
-	  bi0 = from[0];                                                       \
-	  to_next[0] = bi0;                                                    \
-	  from += 1;                                                           \
-	  to_next += 1;                                                        \
-	  n_left_from -= 1;                                                    \
-	  n_left_to_next -= 1;                                                 \
-	  p0 = vlib_get_buffer (VM, bi0);                                      \
-	  ip0 = vlib_buffer_get_current (p0);                                  \
-	  ip_len0 =                                                            \
-	    clib_net_to_host_u16 (ip0->L) + sizeof (HTYPE);                    \
-	  ebi0 = my_buf->buffer_index;                                         \
-	  eb0 = vlib_get_buffer (VM, ebi0);                                    \
-	  if (PREDICT_FALSE (eb0 == 0))                                        \
-	    goto NO_BUFFER;                                                    \
-	  ip_len0 =                                                            \
-	    ip_len0 > DEFAULT_EXPORT_SIZE ? DEFAULT_EXPORT_SIZE : ip_len0;     \
-	  copy3cachelines (eb0->data + eb0->current_length, ip0, ip_len0);     \
-	  eb0->current_length += DEFAULT_EXPORT_SIZE;                          \
-	  my_buf->records_in_this_buffer++;                                    \
-	  if (my_buf->records_in_this_buffer >= DEFAULT_EXPORT_RECORDS)        \
-	    {                                                                  \
-	      ioam_export_send_buffer (EM, VM, my_buf);                        \
-	      ioam_export_init_buffer (EM, VM, my_buf);                        \
-	    }                                                                  \
-	  if (PREDICT_FALSE (((N)->flags & VLIB_NODE_FLAG_TRACE)               \
-			     && (p0->flags & VLIB_BUFFER_IS_TRACED)))          \
-	    {                                                                  \
-	      export_trace_t *t = vlib_add_trace (VM, (N), p0, sizeof (*t));   \
-	      t->flow_label =                                                  \
-		clib_net_to_host_u32 (ip0->V);                                 \
-	      t->next_index = next0;                                           \
-	    }                                                                  \
-	  pkts_recorded += 1;                                                  \
-	NO_BUFFER:                                                             \
-	  vlib_validate_buffer_enqueue_x1 (VM, N, next_index,                  \
-					   to_next, n_left_to_next,            \
-					   bi0, next0);                        \
-	}                                                                      \
-      vlib_put_next_frame (VM, N, next_index, n_left_to_next);                 \
-    }                                                                          \
-  vlib_node_increment_counter (VM, export_node.index,                          \
-			       EXPORT_ERROR_RECORDED, pkts_recorded);          \
-  *(EM)->lockp[(VM)->cpu_index] = 0;                                           \
-} while(0)
-
-#endif /* __included_ioam_export_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api b/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
deleted file mode 100644
index 7b17c3f7..00000000
--- a/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Hey Emacs use -*- mode: C -*- */
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* Define a simple binary API to control the feature */
-
-define vxlan_gpe_ioam_export_enable_disable {
-    /* Client identifier, set from api_main.my_client_index */
-    u32 client_index;
-
-    /* Arbitrary context, so client can match reply to request */
-    u32 context;
-
-    /* Enable / disable the feature */
-    u8 is_disable;
-
-    /* Collector ip address */
-    u8 collector_address[4];
-    u8 src_address[4];
-
-    /* Src ip address */
-};
-
-define vxlan_gpe_ioam_export_enable_disable_reply {
-    /* From the request */
-    u32 context;
-
-    /* Return value, zero means all OK */
-    i32 retval;
-};
\ No newline at end of file
diff --git a/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c b/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
deleted file mode 100644
index bab8d977..00000000
--- a/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * vxlan_gpe_ioam_export.c - ioam export API / debug CLI handling
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vnet/plugin/plugin.h>
-#include <ioam/export-common/ioam_export.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
-
-/* define message IDs */
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
-#undef vl_api_version
-
-/*
- * A handy macro to set up a message reply.
- * Assumes that the following variables are available:
- * mp - pointer to request message
- * rmp - pointer to reply message type
- * rv - return value
- */
-
-#define REPLY_MACRO(t)                                          \
-do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
-    vl_api_client_index_to_input_queue (mp->client_index);      \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-                                                                \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-
-/* List of message types that this plugin understands */
-
-
-#define foreach_vxlan_gpe_ioam_export_plugin_api_msg                        \
-_(VXLAN_GPE_IOAM_EXPORT_ENABLE_DISABLE, vxlan_gpe_ioam_export_enable_disable)
-
-extern void vxlan_gpe_set_next_override (uword next);
-/* Action function shared between message handler and debug CLI */
-int
-vxlan_gpe_ioam_export_enable_disable (ioam_export_main_t * em,
-				      u8 is_disable,
-				      ip4_address_t * collector_address,
-				      ip4_address_t * src_address)
-{
-  vlib_main_t *vm = em->vlib_main;
-  u32 node_index = export_node.index;
-  vlib_node_t *vxlan_gpe_decap_ioam_node = NULL;
-
-  if (is_disable == 0)
-    {
-      if (em->my_hbh_slot == ~0)
-	{
-	  /* Hook this export node to vxlan-gpe-decap-ioam-v4 */
-	  vxlan_gpe_decap_ioam_node =
-	    vlib_get_node_by_name (vm, (u8 *) "vxlan-gpe-decap-ioam-v4");
-	  if (!vxlan_gpe_decap_ioam_node)
-	    {
-	      /* node does not exist give up */
-	      return (-1);
-	    }
-	  em->my_hbh_slot =
-	    vlib_node_add_next (vm, vxlan_gpe_decap_ioam_node->index,
-				node_index);
-	}
-      if (1 == ioam_export_header_create (em, collector_address, src_address))
-	{
-	  ioam_export_thread_buffer_init (em, vm);
-	  vxlan_gpe_set_next_override (em->my_hbh_slot);
-	  /* Turn on the export buffer check process */
-	  vlib_process_signal_event (vm, em->export_process_node_index, 1, 0);
-
-	}
-      else
-	{
-	  return (-2);
-	}
-    }
-  else
-    {
-      vxlan_gpe_set_next_override (VXLAN_GPE_DECAP_IOAM_V4_NEXT_POP);
-      ioam_export_header_cleanup (em, collector_address, src_address);
-      ioam_export_thread_buffer_free (em);
-      /* Turn off the export buffer check process */
-      vlib_process_signal_event (vm, em->export_process_node_index, 2, 0);
-
-    }
-
-  return 0;
-}
-
-/* API message handler */
-static void vl_api_vxlan_gpe_ioam_export_enable_disable_t_handler
-  (vl_api_vxlan_gpe_ioam_export_enable_disable_t * mp)
-{
-  vl_api_vxlan_gpe_ioam_export_enable_disable_reply_t *rmp;
-  ioam_export_main_t *sm = &vxlan_gpe_ioam_export_main;
-  int rv;
-
-  rv = vxlan_gpe_ioam_export_enable_disable (sm, (int) (mp->is_disable),
-					     (ip4_address_t *)
-					     mp->collector_address,
-					     (ip4_address_t *)
-					     mp->src_address);
-
-  REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_EXPORT_ENABLE_DISABLE_REPLY);
-}				/* API message handler */
-
-
-
-/* Set up the API message handling tables */
-static clib_error_t *
-vxlan_gpe_ioam_export_plugin_api_hookup (vlib_main_t * vm)
-{
-  ioam_export_main_t *sm = &vxlan_gpe_ioam_export_main;
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,					\
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vxlan_gpe_ioam_export_plugin_api_msg;
-#undef _
-
-  return 0;
-}
-
-
-static clib_error_t *
-set_vxlan_gpe_ioam_export_ipfix_command_fn (vlib_main_t * vm,
-					    unformat_input_t * input,
-					    vlib_cli_command_t * cmd)
-{
-  ioam_export_main_t *em = &vxlan_gpe_ioam_export_main;
-  ip4_address_t collector, src;
-  u8 is_disable = 0;
-
-  collector.as_u32 = 0;
-  src.as_u32 = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "collector %U", unformat_ip4_address, &collector))
-	;
-      else if (unformat (input, "src %U", unformat_ip4_address, &src))
-	;
-      else if (unformat (input, "disable"))
-	is_disable = 1;
-      else
-	break;
-    }
-
-  if (collector.as_u32 == 0)
-    return clib_error_return (0, "collector address required");
-
-  if (src.as_u32 == 0)
-    return clib_error_return (0, "src address required");
-
-  em->ipfix_collector.as_u32 = collector.as_u32;
-  em->src_address.as_u32 = src.as_u32;
-
-  vlib_cli_output (vm, "Collector %U, src address %U",
-		   format_ip4_address, &em->ipfix_collector,
-		   format_ip4_address, &em->src_address);
-
-  /* Turn on the export timer process */
-  // vlib_process_signal_event (vm, flow_report_process_node.index,
-  //1, 0);
-  if (0 !=
-      vxlan_gpe_ioam_export_enable_disable (em, is_disable, &collector, &src))
-    {
-      return clib_error_return (0, "Unable to set ioam vxlan-gpe export");
-    }
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_vxlan_gpe_ioam_ipfix_command, static) =
-{
-.path = "set vxlan-gpe-ioam export ipfix",
-.short_help = "set vxlan-gpe-ioam export ipfix collector <ip4-address> src <ip4-address>",
-.function = set_vxlan_gpe_ioam_export_ipfix_command_fn,
-};
-/* *INDENT-ON* */
-
-
-static clib_error_t *
-vxlan_gpe_ioam_export_init (vlib_main_t * vm)
-{
-  ioam_export_main_t *em = &vxlan_gpe_ioam_export_main;
-  clib_error_t *error = 0;
-  u8 *name;
-
-  name = format (0, "vxlan_gpe_ioam_export_%08x%c", api_version, 0);
-
-  /* Ask for a correctly-sized block of API message decode slots */
-  em->msg_id_base = vl_msg_api_get_msg_ids
-    ((char *) name, VL_MSG_FIRST_AVAILABLE);
-  em->unix_time_0 = (u32) time (0);	/* Store starting time */
-  em->vlib_time_0 = vlib_time_now (vm);
-
-  error = vxlan_gpe_ioam_export_plugin_api_hookup (vm);
-  em->my_hbh_slot = ~0;
-  em->vlib_main = vm;
-  em->vnet_main = vnet_get_main ();
-  vec_free (name);
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (vxlan_gpe_ioam_export_init);
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h b/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h
deleted file mode 100644
index 6d93f093..00000000
--- a/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Include the generated file, see BUILT_SOURCES in Makefile.am */
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.h>
diff --git a/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h b/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h
deleted file mode 100644
index cc5698de..00000000
--- a/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vxlan_gpe_ioam_export_msg_enum_h
-#define included_vxlan_gpe_ioam_export_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
-    /* We'll want to know how many messages IDs we need... */
-    VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* included_vxlan_gpe_ioam_export_msg_enum_h */
diff --git a/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c b/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
deleted file mode 100644
index 494263d9..00000000
--- a/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * vxlan_gpe_ioam_export_test.c - test harness plugin
- *------------------------------------------------------------------
- */
-
-#include <vat/vat.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-#include <vppinfra/error.h>
-
-
-/* Declare message IDs */
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun		/* define message structures */
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number. */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
-#undef vl_api_version
-
-
-typedef struct
-{
-  /* API message ID base */
-  u16 msg_id_base;
-  vat_main_t *vat_main;
-} export_test_main_t;
-
-export_test_main_t export_test_main;
-
-#define foreach_standard_reply_retval_handler   \
-_(vxlan_gpe_ioam_export_enable_disable_reply)
-
-#define _(n)                                            \
-    static void vl_api_##n##_t_handler                  \
-    (vl_api_##n##_t * mp)                               \
-    {                                                   \
-        vat_main_t * vam = export_test_main.vat_main;   \
-        i32 retval = ntohl(mp->retval);                 \
-        if (vam->async_mode) {                          \
-            vam->async_errors += (retval < 0);          \
-        } else {                                        \
-            vam->retval = retval;                       \
-            vam->result_ready = 1;                      \
-        }                                               \
-    }
-foreach_standard_reply_retval_handler;
-#undef _
-
-/*
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg                                       \
-_(VXLAN_GPE_IOAM_EXPORT_ENABLE_DISABLE_REPLY, vxlan_gpe_ioam_export_enable_disable_reply)
-
-
-/* M: construct, but don't yet send a message */
-
-#define M(T,t)                                                  \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp));                         \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-#define M2(T,t,n)                                               \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W                                       \
-do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
-                                                \
-    while (vat_time_now (vam) < timeout) {      \
-        if (vam->result_ready == 1) {           \
-            return (vam->retval);               \
-        }                                       \
-    }                                           \
-    return -99;                                 \
-} while(0);
-
-static int
-api_vxlan_gpe_ioam_export_enable_disable (vat_main_t * vam)
-{
-  export_test_main_t *sm = &export_test_main;
-  unformat_input_t *i = vam->input;
-  f64 timeout;
-  int is_disable = 0;
-  vl_api_vxlan_gpe_ioam_export_enable_disable_t *mp;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "disable"))
-	is_disable = 1;
-      else
-	break;
-    }
-
-  /* Construct the API message */
-  M (VXLAN_GPE_IOAM_EXPORT_ENABLE_DISABLE,
-     vxlan_gpe_ioam_export_enable_disable);
-  mp->is_disable = is_disable;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-}
-
-/*
- * List of messages that the api test plugin sends,
- * and that the data plane plugin processes
- */
-#define foreach_vpe_api_msg \
-_(vxlan_gpe_ioam_export_enable_disable, "<intfc> [disable]")
-
-void
-vat_api_hookup (vat_main_t * vam)
-{
-  export_test_main_t *sm = &export_test_main;
-  /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,                                  \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_reply_msg;
-#undef _
-
-  /* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
-  foreach_vpe_api_msg;
-#undef _
-
-  /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
-  foreach_vpe_api_msg;
-#undef _
-}
-
-clib_error_t *
-vat_plugin_register (vat_main_t * vam)
-{
-  export_test_main_t *sm = &export_test_main;
-  u8 *name;
-
-  sm->vat_main = vam;
-
-  name = format (0, "vxlan_gpe_ioam_export_%08x%c", api_version, 0);
-  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (sm->msg_id_base != (u16) ~ 0)
-    vat_api_hookup (vam);
-
-  vec_free (name);
-
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c b/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
deleted file mode 100644
index 58508ebf..00000000
--- a/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ioam_export_thread.c
- */
-#include <vnet/api_errno.h>
-#include <vppinfra/pool.h>
-#include <ioam/export-common/ioam_export.h>
-
-static vlib_node_registration_t vxlan_gpe_ioam_export_process_node;
-
-static uword
-vxlan_gpe_ioam_export_process (vlib_main_t * vm,
-			       vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  return (ioam_export_process_common (&vxlan_gpe_ioam_export_main,
-				      vm, rt, f,
-				      vxlan_gpe_ioam_export_process_node.index));
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (vxlan_gpe_ioam_export_process_node, static) =
-{
- .function = vxlan_gpe_ioam_export_process,
- .type = VLIB_NODE_TYPE_PROCESS,
- .name = "vxlan-gpe-ioam-export-process",
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_node.c b/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_node.c
deleted file mode 100644
index 722c2b06..00000000
--- a/plugins/ioam-plugin/ioam/export-vxlan-gpe/vxlan_gpe_node.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-#include <vnet/ip/ip.h>
-#include <ioam/export-common/ioam_export.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
-
-typedef struct
-{
-  u32 next_index;
-  u32 flow_label;
-} export_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_export_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  export_trace_t *t = va_arg (*args, export_trace_t *);
-
-  s = format (s, "EXPORT: flow_label %d, next index %d",
-	      t->flow_label, t->next_index);
-  return s;
-}
-
-vlib_node_registration_t export_node;
-
-#define foreach_export_error \
-_(RECORDED, "Packets recorded for export")
-
-typedef enum
-{
-#define _(sym,str) EXPORT_ERROR_##sym,
-  foreach_export_error
-#undef _
-    EXPORT_N_ERROR,
-} export_error_t;
-
-static char *export_error_strings[] = {
-#define _(sym,string) string,
-  foreach_export_error
-#undef _
-};
-
-typedef enum
-{
-  EXPORT_NEXT_VXLAN_GPE_INPUT,
-  EXPORT_N_NEXT,
-} export_next_t;
-
-always_inline void
-copy3cachelines (void *dst, const void *src, size_t n)
-{
-#if 0
-  if (PREDICT_FALSE (n < DEFAULT_EXPORT_SIZE))
-    {
-      /* Copy only the first 1/2 cache lines whatever is available */
-      if (n >= 64)
-	clib_mov64 ((u8 *) dst, (const u8 *) src);
-      if (n >= 128)
-	clib_mov64 ((u8 *) dst + 64, (const u8 *) src + 64);
-      return;
-    }
-  clib_mov64 ((u8 *) dst, (const u8 *) src);
-  clib_mov64 ((u8 *) dst + 64, (const u8 *) src + 64);
-  clib_mov64 ((u8 *) dst + 128, (const u8 *) src + 128);
-#endif
-#if 1
-
-  u64 *copy_dst, *copy_src;
-  int i;
-  copy_dst = (u64 *) dst;
-  copy_src = (u64 *) src;
-  if (PREDICT_FALSE (n < DEFAULT_EXPORT_SIZE))
-    {
-      for (i = 0; i < n / 64; i++)
-	{
-	  copy_dst[0] = copy_src[0];
-	  copy_dst[1] = copy_src[1];
-	  copy_dst[2] = copy_src[2];
-	  copy_dst[3] = copy_src[3];
-	  copy_dst[4] = copy_src[4];
-	  copy_dst[5] = copy_src[5];
-	  copy_dst[6] = copy_src[6];
-	  copy_dst[7] = copy_src[7];
-	  copy_dst += 8;
-	  copy_src += 8;
-	}
-      return;
-    }
-  for (i = 0; i < 3; i++)
-    {
-      copy_dst[0] = copy_src[0];
-      copy_dst[1] = copy_src[1];
-      copy_dst[2] = copy_src[2];
-      copy_dst[3] = copy_src[3];
-      copy_dst[4] = copy_src[4];
-      copy_dst[5] = copy_src[5];
-      copy_dst[6] = copy_src[6];
-      copy_dst[7] = copy_src[7];
-      copy_dst += 8;
-      copy_src += 8;
-    }
-#endif
-}
-
-
-static uword
-vxlan_gpe_export_node_fn (vlib_main_t * vm,
-			  vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  ioam_export_main_t *em = &vxlan_gpe_ioam_export_main;
-  ioam_export_node_common (em, vm, node, frame, ip4_header_t, length,
-			   ip_version_and_header_length,
-			   EXPORT_NEXT_VXLAN_GPE_INPUT);
-  return frame->n_vectors;
-}
-
-/*
- * Node for VXLAN-GPE export
- */
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (export_node) =
-{
-  .function = vxlan_gpe_export_node_fn,
-  .name = "vxlan-gpe-ioam-export",
-  .vector_size = sizeof (u32),
-  .format_trace = format_export_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .n_errors = ARRAY_LEN (export_error_strings),
-  .error_strings = export_error_strings,
-  .n_next_nodes = EXPORT_N_NEXT,
-    /* edit / add dispositions here */
-    .next_nodes =
-  {[EXPORT_NEXT_VXLAN_GPE_INPUT] = "vxlan-gpe-pop-ioam-v4"},
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/export/ioam_export.api b/plugins/ioam-plugin/ioam/export/ioam_export.api
deleted file mode 100644
index f22d9fc8..00000000
--- a/plugins/ioam-plugin/ioam/export/ioam_export.api
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Hey Emacs use -*- mode: C -*- */
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* Define a simple binary API to control the feature */
-
-define ioam_export_ip6_enable_disable {
-    /* Client identifier, set from api_main.my_client_index */
-    u32 client_index;
-
-    /* Arbitrary context, so client can match reply to request */
-    u32 context;
-
-    /* Enable / disable the feature */
-    u8 is_disable;
-
-    /* Collector ip address */
-    u8 collector_address[4];
-    u8 src_address[4];
-
-    /* Src ip address */
-};
-
-define ioam_export_ip6_enable_disable_reply {
-    /* From the request */
-    u32 context;
-
-    /* Return value, zero means all OK */
-    i32 retval;
-};
diff --git a/plugins/ioam-plugin/ioam/export/ioam_export.c b/plugins/ioam-plugin/ioam/export/ioam_export.c
deleted file mode 100644
index b122e445..00000000
--- a/plugins/ioam-plugin/ioam/export/ioam_export.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * ioam_export.c - ioam export API / debug CLI handling
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vnet/plugin/plugin.h>
-#include <ioam/export-common/ioam_export.h>
-
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-#include <vnet/ip/ip6_hop_by_hop.h>
-
-
-/* define message IDs */
-#include <ioam/export/ioam_export_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_api_version
-
-/*
- * A handy macro to set up a message reply.
- * Assumes that the following variables are available:
- * mp - pointer to request message
- * rmp - pointer to reply message type
- * rv - return value
- */
-
-#define REPLY_MACRO(t)                                          \
-do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
-    vl_api_client_index_to_input_queue (mp->client_index);      \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-                                                                \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-
-/* List of message types that this plugin understands */
-
-#define foreach_ioam_export_plugin_api_msg                        \
-_(IOAM_EXPORT_IP6_ENABLE_DISABLE, ioam_export_ip6_enable_disable)
-
-/*
- * This routine exists to convince the vlib plugin framework that
- * we haven't accidentally copied a random .dll into the plugin directory.
- *
- * Also collects global variable pointers passed from the vpp engine
- */
-
-clib_error_t *
-vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
-		      int from_early_init)
-{
-  ioam_export_main_t *em = &ioam_export_main;
-  clib_error_t *error = 0;
-
-  em->vlib_main = vm;
-  em->vnet_main = h->vnet_main;
-
-  return error;
-}
-
-/* Action function shared between message handler and debug CLI */
-
-int
-ioam_export_ip6_enable_disable (ioam_export_main_t * em,
-				u8 is_disable,
-				ip4_address_t * collector_address,
-				ip4_address_t * src_address)
-{
-  vlib_main_t *vm = em->vlib_main;
-
-  if (is_disable == 0)
-    {
-      if (1 == ioam_export_header_create (em, collector_address, src_address))
-	{
-	  ioam_export_thread_buffer_init (em, vm);
-	  ip6_hbh_set_next_override (em->my_hbh_slot);
-	  /* Turn on the export buffer check process */
-	  vlib_process_signal_event (vm, em->export_process_node_index, 1, 0);
-
-	}
-      else
-	{
-	  return (-2);
-	}
-    }
-  else
-    {
-      ip6_hbh_set_next_override (IP6_LOOKUP_NEXT_POP_HOP_BY_HOP);
-      ioam_export_header_cleanup (em, collector_address, src_address);
-      ioam_export_thread_buffer_free (em);
-      /* Turn off the export buffer check process */
-      vlib_process_signal_event (vm, em->export_process_node_index, 2, 0);
-
-    }
-
-  return 0;
-}
-
-/* API message handler */
-static void vl_api_ioam_export_ip6_enable_disable_t_handler
-  (vl_api_ioam_export_ip6_enable_disable_t * mp)
-{
-  vl_api_ioam_export_ip6_enable_disable_reply_t *rmp;
-  ioam_export_main_t *sm = &ioam_export_main;
-  int rv;
-
-  rv = ioam_export_ip6_enable_disable (sm, (int) (mp->is_disable),
-				       (ip4_address_t *)
-				       mp->collector_address,
-				       (ip4_address_t *) mp->src_address);
-
-  REPLY_MACRO (VL_API_IOAM_EXPORT_IP6_ENABLE_DISABLE_REPLY);
-}
-
-/* Set up the API message handling tables */
-static clib_error_t *
-ioam_export_plugin_api_hookup (vlib_main_t * vm)
-{
-  ioam_export_main_t *sm = &ioam_export_main;
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,					\
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_ioam_export_plugin_api_msg;
-#undef _
-
-  return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (ioam_export_main_t * sm, api_main_t * am)
-{
-#define _(id,n,crc) \
-  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
-  foreach_vl_msg_name_crc_ioam_export;
-#undef _
-}
-
-static clib_error_t *
-set_ioam_export_ipfix_command_fn (vlib_main_t * vm,
-				  unformat_input_t * input,
-				  vlib_cli_command_t * cmd)
-{
-  ioam_export_main_t *em = &ioam_export_main;
-  ip4_address_t collector, src;
-  u8 is_disable = 0;
-
-  collector.as_u32 = 0;
-  src.as_u32 = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "collector %U", unformat_ip4_address, &collector))
-	;
-      else if (unformat (input, "src %U", unformat_ip4_address, &src))
-	;
-      else if (unformat (input, "disable"))
-	is_disable = 1;
-      else
-	break;
-    }
-
-  if (collector.as_u32 == 0)
-    return clib_error_return (0, "collector address required");
-
-  if (src.as_u32 == 0)
-    return clib_error_return (0, "src address required");
-
-  em->ipfix_collector.as_u32 = collector.as_u32;
-  em->src_address.as_u32 = src.as_u32;
-
-  vlib_cli_output (vm, "Collector %U, src address %U",
-		   format_ip4_address, &em->ipfix_collector,
-		   format_ip4_address, &em->src_address);
-
-  /* Turn on the export timer process */
-  // vlib_process_signal_event (vm, flow_report_process_node.index,
-  //1, 0);
-  ioam_export_ip6_enable_disable (em, is_disable, &collector, &src);
-
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_ipfix_command, static) =
-{
-.path = "set ioam export ipfix",.short_help =
-    "set ioam export ipfix collector <ip4-address> src <ip4-address>",.
-    function = set_ioam_export_ipfix_command_fn,};
-/* *INDENT-ON* */
-
-
-static clib_error_t *
-ioam_export_init (vlib_main_t * vm)
-{
-  ioam_export_main_t *em = &ioam_export_main;
-  clib_error_t *error = 0;
-  u8 *name;
-  u32 node_index = export_node.index;
-  vlib_node_t *ip6_hbyh_node = NULL;
-
-  name = format (0, "ioam_export_%08x%c", api_version, 0);
-
-  /* Ask for a correctly-sized block of API message decode slots */
-  em->msg_id_base = vl_msg_api_get_msg_ids
-    ((char *) name, VL_MSG_FIRST_AVAILABLE);
-  em->unix_time_0 = (u32) time (0);	/* Store starting time */
-  em->vlib_time_0 = vlib_time_now (vm);
-
-  error = ioam_export_plugin_api_hookup (vm);
-
-  /* Add our API messages to the global name_crc hash table */
-  setup_message_id_table (em, &api_main);
-
-  /* Hook this export node to ip6-hop-by-hop */
-  ip6_hbyh_node = vlib_get_node_by_name (vm, (u8 *) "ip6-hop-by-hop");
-  em->my_hbh_slot = vlib_node_add_next (vm, ip6_hbyh_node->index, node_index);
-  vec_free (name);
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (ioam_export_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/export/ioam_export_all_api_h.h b/plugins/ioam-plugin/ioam/export/ioam_export_all_api_h.h
deleted file mode 100644
index bc4368f2..00000000
--- a/plugins/ioam-plugin/ioam/export/ioam_export_all_api_h.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Include the generated file, see BUILT_SOURCES in Makefile.am */
-#include <ioam/export/ioam_export.api.h>
diff --git a/plugins/ioam-plugin/ioam/export/ioam_export_msg_enum.h b/plugins/ioam-plugin/ioam/export/ioam_export_msg_enum.h
deleted file mode 100644
index c2de7988..00000000
--- a/plugins/ioam-plugin/ioam/export/ioam_export_msg_enum.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_ioam_export_msg_enum_h
-#define included_ioam_export_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <ioam/export/ioam_export_all_api_h.h>
-    /* We'll want to know how many messages IDs we need... */
-    VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* included_ioam_export_msg_enum_h */
diff --git a/plugins/ioam-plugin/ioam/export/ioam_export_test.c b/plugins/ioam-plugin/ioam/export/ioam_export_test.c
deleted file mode 100644
index f991fc0c..00000000
--- a/plugins/ioam-plugin/ioam/export/ioam_export_test.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * ioam_export_test.c - test harness plugin
- *------------------------------------------------------------------
- */
-
-#include <vat/vat.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-#include <vppinfra/error.h>
-
-
-/* Declare message IDs */
-#include <ioam/export/ioam_export_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun		/* define message structures */
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number. */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_api_version
-
-
-typedef struct
-{
-  /* API message ID base */
-  u16 msg_id_base;
-  vat_main_t *vat_main;
-} export_test_main_t;
-
-export_test_main_t export_test_main;
-
-#define foreach_standard_reply_retval_handler   \
-_(ioam_export_ip6_enable_disable_reply)
-
-#define _(n)                                            \
-    static void vl_api_##n##_t_handler                  \
-    (vl_api_##n##_t * mp)                               \
-    {                                                   \
-        vat_main_t * vam = export_test_main.vat_main;   \
-        i32 retval = ntohl(mp->retval);                 \
-        if (vam->async_mode) {                          \
-            vam->async_errors += (retval < 0);          \
-        } else {                                        \
-            vam->retval = retval;                       \
-            vam->result_ready = 1;                      \
-        }                                               \
-    }
-foreach_standard_reply_retval_handler;
-#undef _
-
-/*
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg                                       \
-_(IOAM_EXPORT_IP6_ENABLE_DISABLE_REPLY, ioam_export_ip6_enable_disable_reply)
-
-
-/* M: construct, but don't yet send a message */
-
-#define M(T,t)                                                  \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp));                         \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-#define M2(T,t,n)                                               \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W                                       \
-do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
-                                                \
-    while (vat_time_now (vam) < timeout) {      \
-        if (vam->result_ready == 1) {           \
-            return (vam->retval);               \
-        }                                       \
-    }                                           \
-    return -99;                                 \
-} while(0);
-
-static int
-api_ioam_export_ip6_enable_disable (vat_main_t * vam)
-{
-  export_test_main_t *sm = &export_test_main;
-  unformat_input_t *i = vam->input;
-  f64 timeout;
-  int is_disable = 0;
-  vl_api_ioam_export_ip6_enable_disable_t *mp;
-
-  /* Parse args required to build the message */
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "disable"))
-	is_disable = 1;
-      else
-	break;
-    }
-
-  /* Construct the API message */
-  M (IOAM_EXPORT_IP6_ENABLE_DISABLE, ioam_export_ip6_enable_disable);
-  mp->is_disable = is_disable;
-
-  /* send it... */
-  S;
-
-  /* Wait for a reply... */
-  W;
-}
-
-/*
- * List of messages that the api test plugin sends,
- * and that the data plane plugin processes
- */
-#define foreach_vpe_api_msg \
-_(ioam_export_ip6_enable_disable, "<intfc> [disable]")
-
-void
-vat_api_hookup (vat_main_t * vam)
-{
-  export_test_main_t *sm = &export_test_main;
-  /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,                                  \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_reply_msg;
-#undef _
-
-  /* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
-  foreach_vpe_api_msg;
-#undef _
-
-  /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
-  foreach_vpe_api_msg;
-#undef _
-}
-
-clib_error_t *
-vat_plugin_register (vat_main_t * vam)
-{
-  export_test_main_t *sm = &export_test_main;
-  u8 *name;
-
-  sm->vat_main = vam;
-
-  name = format (0, "ioam_export_%08x%c", api_version, 0);
-  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (sm->msg_id_base != (u16) ~ 0)
-    vat_api_hookup (vam);
-
-  vec_free (name);
-
-  return 0;
-}
diff --git a/plugins/ioam-plugin/ioam/export/ioam_export_thread.c b/plugins/ioam-plugin/ioam/export/ioam_export_thread.c
deleted file mode 100644
index d2eb2009..00000000
--- a/plugins/ioam-plugin/ioam/export/ioam_export_thread.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * ioam_export_thread.c
- */
-#include <vnet/api_errno.h>
-#include <vppinfra/pool.h>
-#include <ioam/export-common/ioam_export.h>
-
-static vlib_node_registration_t ioam_export_process_node;
-
-static uword
-ioam_export_process (vlib_main_t * vm,
-		     vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-   return (ioam_export_process_common(&ioam_export_main,
-                                      vm, rt, f,
-                                      ioam_export_process_node.index));
-}
-
-VLIB_REGISTER_NODE (ioam_export_process_node, static) =
-{
- .function = ioam_export_process,
- .type = VLIB_NODE_TYPE_PROCESS,
- .name = "ioam-export-process",
-};
diff --git a/plugins/ioam-plugin/ioam/export/jvpp_ioam_export.c b/plugins/ioam-plugin/ioam/export/jvpp_ioam_export.c
deleted file mode 100644
index 27d3e214..00000000
--- a/plugins/ioam-plugin/ioam/export/jvpp_ioam_export.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-
-#include <ioam/export/ioam_export_msg_enum.h>
-#define vl_typedefs             /* define message structures */
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_api_version
-
-#include <vnet/api_errno.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-
-#if VPPJNI_DEBUG == 1
-  #define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
-#else
-  #define DEBUG_LOG(...)
-#endif
-
-#include <jvpp-common/jvpp_common.h>
-
-#include "ioam/jvpp/io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl.h"
-#include "jvpp_ioam_export.h"
-#include "ioam/jvpp/jvpp_ioam_export_gen.h"
-
-/*
- * Class:     io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl
- * Method:    init0
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0
-  (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
-  ioamexport_main_t * plugin_main = &ioamexport_main;
-  u8 * name;
-  clib_warning ("Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0");
-
-  plugin_main->my_client_index = my_client_index;
-  plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
-
-  name = format (0, "ioam_export_%08x%c", api_version, 0);
-  plugin_main->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (plugin_main->msg_id_base == (u16) ~0) {
-    jclass exClass = (*env)->FindClass(env, "java/lang/IllegalStateException");
-    (*env)->ThrowNew(env, exClass, "ioam_export plugin is not loaded in VPP");
-  } else {
-    plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
-    plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
-
-    #define _(N,n)                                  \
-        vl_msg_api_set_handlers(VL_API_##N + plugin_main->msg_id_base, #n,     \
-                vl_api_##n##_t_handler,             \
-                vl_noop_handler,                    \
-                vl_api_##n##_t_endian,              \
-                vl_api_##n##_t_print,               \
-                sizeof(vl_api_##n##_t), 1);
-        foreach_api_reply_handler;
-    #undef _
-  }
-}
-
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_close0
-(JNIEnv *env, jclass clazz) {
-  ioamexport_main_t * plugin_main = &ioamexport_main;
-
-    // cleanup:
-    (*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
-    (*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
-
-    plugin_main->callbackClass = NULL;
-    plugin_main->callbackObject = NULL;
-}
-
-/* Attach thread to JVM and cache class references when initiating JVPP iOAM EXPORT */
-jint JNI_OnLoad(JavaVM *vm, void *reserved) {
-    JNIEnv* env;
-
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return JNI_EVERSION;
-    }
-
-    if (cache_class_references(env) != 0) {
-        clib_warning ("Failed to cache class references\n");
-        return JNI_ERR;
-    }
-
-    return JNI_VERSION_1_8;
-}
-
-/* Clean up cached references when disposing JVPP iOAM EXPORT */
-void JNI_OnUnload(JavaVM *vm, void *reserved) {
-    JNIEnv* env;
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return;
-    }
-    delete_class_references(env);
-}
diff --git a/plugins/ioam-plugin/ioam/export/jvpp_ioam_export.h b/plugins/ioam-plugin/ioam/export/jvpp_ioam_export.h
deleted file mode 100644
index b6c0c16e..00000000
--- a/plugins/ioam-plugin/ioam/export/jvpp_ioam_export.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_jvpp_ioam_export_h__
-#define __included_jvpp_ioam_export_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/api_errno.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <jni.h>
-
-/* Global state for JVPP-IOAM-EXPORT */
-typedef struct {
-    /* Base message index for the export plugin */
-    u16 msg_id_base;
-
-    /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
-
-    /* VPP api client index */
-    u32 my_client_index;
-
-    /* Callback object and class references enabling asynchronous Java calls */
-    jobject callbackObject;
-    jclass callbackClass;
-
-} ioamexport_main_t;
-
-ioamexport_main_t ioamexport_main __attribute__((aligned (64)));
-
-
-#endif /* __included_jvpp_ioam_export_h__ */
diff --git a/plugins/ioam-plugin/ioam/export/node.c b/plugins/ioam-plugin/ioam/export/node.c
deleted file mode 100644
index 19f143df..00000000
--- a/plugins/ioam-plugin/ioam/export/node.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-#include <vnet/ip/ip.h>
-#include <ioam/export-common/ioam_export.h>
-
-typedef struct
-{
-  u32 next_index;
-  u32 flow_label;
-} export_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_export_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  export_trace_t *t = va_arg (*args, export_trace_t *);
-
-  s = format (s, "EXPORT: flow_label %d, next index %d",
-	      t->flow_label, t->next_index);
-  return s;
-}
-
-vlib_node_registration_t export_node;
-
-#define foreach_export_error \
-_(RECORDED, "Packets recorded for export")
-
-typedef enum
-{
-#define _(sym,str) EXPORT_ERROR_##sym,
-  foreach_export_error
-#undef _
-    EXPORT_N_ERROR,
-} export_error_t;
-
-static char *export_error_strings[] = {
-#define _(sym,string) string,
-  foreach_export_error
-#undef _
-};
-
-typedef enum
-{
-  EXPORT_NEXT_POP_HBYH,
-  EXPORT_N_NEXT,
-} export_next_t;
-
-always_inline void
-copy3cachelines (void *dst, const void *src, size_t n)
-{
-#if 0
-  if (PREDICT_FALSE (n < DEFAULT_EXPORT_SIZE))
-    {
-      /* Copy only the first 1/2 cache lines whatever is available */
-      if (n >= 64)
-	clib_mov64 ((u8 *) dst, (const u8 *) src);
-      if (n >= 128)
-	clib_mov64 ((u8 *) dst + 64, (const u8 *) src + 64);
-      return;
-    }
-  clib_mov64 ((u8 *) dst, (const u8 *) src);
-  clib_mov64 ((u8 *) dst + 64, (const u8 *) src + 64);
-  clib_mov64 ((u8 *) dst + 128, (const u8 *) src + 128);
-#endif
-#if 1
-
-  u64 *copy_dst, *copy_src;
-  int i;
-  copy_dst = (u64 *) dst;
-  copy_src = (u64 *) src;
-  if (PREDICT_FALSE (n < DEFAULT_EXPORT_SIZE))
-    {
-      for (i = 0; i < n / 64; i++)
-	{
-	  copy_dst[0] = copy_src[0];
-	  copy_dst[1] = copy_src[1];
-	  copy_dst[2] = copy_src[2];
-	  copy_dst[3] = copy_src[3];
-	  copy_dst[4] = copy_src[4];
-	  copy_dst[5] = copy_src[5];
-	  copy_dst[6] = copy_src[6];
-	  copy_dst[7] = copy_src[7];
-	  copy_dst += 8;
-	  copy_src += 8;
-	}
-      return;
-    }
-  for (i = 0; i < 3; i++)
-    {
-      copy_dst[0] = copy_src[0];
-      copy_dst[1] = copy_src[1];
-      copy_dst[2] = copy_src[2];
-      copy_dst[3] = copy_src[3];
-      copy_dst[4] = copy_src[4];
-      copy_dst[5] = copy_src[5];
-      copy_dst[6] = copy_src[6];
-      copy_dst[7] = copy_src[7];
-      copy_dst += 8;
-      copy_src += 8;
-    }
-#endif
-}
-
-static uword
-ip6_export_node_fn (vlib_main_t * vm,
-		    vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  ioam_export_main_t *em = &ioam_export_main;
-  ioam_export_node_common(em, vm, node, frame, ip6_header_t, payload_length,
-                          ip_version_traffic_class_and_flow_label, 
-                          EXPORT_NEXT_POP_HBYH);
-  return frame->n_vectors;
-}
-
-/*
- * Node for IP6 export
- */
-VLIB_REGISTER_NODE (export_node) =
-{
-  .function = ip6_export_node_fn,
-  .name = "ip6-export",
-  .vector_size = sizeof (u32),
-  .format_trace = format_export_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .n_errors = ARRAY_LEN (export_error_strings),
-  .error_strings = export_error_strings,
-  .n_next_nodes = EXPORT_N_NEXT,
-  /* edit / add dispositions here */
-  .next_nodes =
-  {
-    [EXPORT_NEXT_POP_HBYH] = "ip6-pop-hop-by-hop"
-  },
-};
diff --git a/plugins/ioam-plugin/ioam/ioam_plugin_doc.md b/plugins/ioam-plugin/ioam/ioam_plugin_doc.md
deleted file mode 100644
index 343abcf7..00000000
--- a/plugins/ioam-plugin/ioam/ioam_plugin_doc.md
+++ /dev/null
@@ -1,464 +0,0 @@
-## VPP Inband OAM (iOAM)    {#ioam_plugin_doc}
-
-In-band OAM (iOAM) is an implementation study to record operational
-information in the packet while the packet traverses a path between
-two points in the network.
-
-Overview of iOAM can be found in [iOAM-Devnet] page.
-The following IETF drafts detail the motivation and mechanism for
-recording operational information:
- - [iOAM-ietf-requirements] - Describes motivation and usecases for iOAM
- - [iOAM-ietf-data] - Describes data records that can be collected using iOAM
- - [iOAM-ietf-transport] - Lists out the transport protocols
- and mechanism to carry iOAM data records
- - [iOAM-ietf-proof-of-transit] - Describes the idea of Proof of Transit (POT)
- and mechanisms to operationalize the idea
-
-## Terminology
-In-band OAM is expected to be deployed in a specific domain rather
-than on the overall Internet. The part of the network which employs in-band OAM
-is referred to as **"in-band OAM-domain"**.
-
-In-band OAM data is added to a packet on entering the in-band OAM-domain
-and is removed from the packet when exiting the domain.
-Within the in-band OAM-domain, network nodes that the packet traverses
-may update the in-band OAM data records.
-
-- The node which adds in-band OAM data to the packet is called the
-**"in-band OAM encapsulating node"**.
-
-- The node which removes the in-band OAM data is referred to as the
-**"in-band OAM decapsulating node"**.
-
-- Nodes within the domain which are aware of in-band OAM data and read
-and/or write or process the in-band OAM data are called
-**"in-band OAM transit nodes"**.
-
-## Features supported in the current release
-VPP can function as in-band OAM encapsulating, transit and decapsulating node.
-In this version of VPP in-band OAM data is transported as options in an
-IPv6 hop-by-hop extension header. Hence in-band OAM can be enabled
-for IPv6 traffic.
-
-The following iOAM features are supported:
-
-- **In-band OAM Tracing** : In-band OAM supports multiple data records to be
-recorded in the packet as the packet traverses the network.
-These data records offer insights into the operational behavior of the network.
-The following information can be collected in the tracing
-data from the nodes a packet traverses:
-  - Node ID
-  - Ingress interface ID
-  - Egress interface ID
-  - Timestamp
-  - Pre-configured application data
-
-- **In-band OAM Proof of Transit (POT)**: Proof of transit iOAM data is
-added to every packet for verifying that a packet traverses a specific
-set of nodes.
-In-band OAM data is updated at every node that is enabled with iOAM
-proof of transit and is used to verify whether a packet traversed
-all the specified nodes. When the verifier receives each packet,
-it can validate whether the packet traversed the specified nodes.
-
-
-## Configuration
-Configuring iOAM involves:
-- Selecting the packets for which iOAM data must be inserted, updated or removed
-  - Selection of packets for iOAM data insertion on iOAM encapsulating node.
-  Selection of packets is done by 5-tuple based classification
-  - Selection of packets for updating iOAM data is implicitly done on the
-  presence of iOAM options in the packet
-  - Selection of packets for removing the iOAM data is done on 5-tuple
-  based classification
-- The kind of data to be collected
-  - Tracing data
-  - Proof of transit
-- Additional details for processing iOAM data to be collected
-  - For trace data - trace type, number of nodes to be recorded in the trace,
-  time stamp precision, etc.
-  - For POT data - configuration of POT profile required to process the POT data
-
-The CLI for configuring iOAM is explained here followed by detailed steps
-and examples to deploy iOAM on VPP as an encapsulating, transit or
-decapsulating iOAM node in the subsequent sub-sections.
-
-VPP iOAM configuration for enabling trace and POT is as follows:
-
-    set ioam rewrite trace-type <0x1f|0x7|0x9|0x11|0x19>
-    trace-elts <number of trace elements> trace-tsp <0|1|2|3>
-    node-id <node ID in hex> app-data <application data in hex> [pot]
-
-A description of each of the options of the CLI follows:
-- trace-type : An entry in the "Node data List" array of the trace option
-can have different formats, following the needs of the a deployment.
-For example: Some deployments might only be interested
-in recording the node identifiers, whereas others might be interested
-in recording node identifier and timestamp.
-The following types are currently supported:
-    - 0x1f : Node data to include hop limit (8 bits), node ID (24 bits),
-    ingress and egress interface IDs (16 bits each), timestamp (32 bits),
-    application data (32 bits)
-    - 0x7 : Node data to include hop limit (8 bits), node ID (24 bits),
-    ingress and egress interface IDs (16 bits each)
-    - 0x9 : Node data to include hop limit (8 bits), node ID (24 bits),
-    timestamp (32 bits)
-    - 0x11: Node data to include hop limit (8 bits), node ID (24 bits),
-    application data (32 bits)
-    - 0x19: Node data to include hop limit (8 bits), node ID (24 bits),
-    timestamp (32 bits), application data (32 bits)
-- trace-elts : Defines the length of the node data array in the trace option.
-- trace-tsp : Defines the timestamp precision to use with the enumerated value
-              for precision as follows:
-    - 0 : 32bits timestamp in seconds
-    - 1 : 32bits timestamp in milliseconds
-    - 2 : 32bits timestamp in microseconds
-    - 3 : 32bits timestamp in nanoseconds
-- node-id : Unique identifier for the node, included in the node ID
-  field of the node data in trace option.
-- app-data : The value configured here is included as is in
-application data field of node data in trace option.
-- pot : Enables POT option to be included in the iOAM options.
-
-### Trace configuration
-
-#### On in-band OAM encapsulating node
- - **Configure classifier and apply ACL** to select packets for
- iOAM data insertion
-    - Example to enable iOAM data insertion for all the packets
-    towards IPv6 address db06::06:
-
-    vpp# classify table miss-next node ip6-lookup mask l3 ip6 dst
-    
-    vpp# classify session acl-hit-next node ip6-add-hop-by-hop
-    table-index 0 match l3 ip6 dst db06::06
-    
-    vpp# set int input acl intfc GigabitEthernet0/0/0 ip6-table 0
-    
- - **Enable tracing** : Specify node ID, maximum number of nodes for which
- trace data should be recorded, type of data to be included for recording,
- optionally application data to be included
-    - Example to enable tracing with a maximum of 4 nodes recorded
-    and the data to be recorded to include - hop limit, node id,
-    ingress and egress interface IDs, timestamp (millisecond precision),
-    application data (0x1234):
-
-
-    vpp# set ioam rewrite trace-type 0x1f trace-elts 4 trace-tsp 1
-    node-id 0x1 app-data 0x1234
-
-
-
-#### On in-band OAM transit node
-- The transit node requires trace type, timestamp precision, node ID and
-optionally application data to be configured,
-to update its node data in the trace option.
-
-Example:  
-
-    vpp# set ioam rewrite trace-type 0x1f trace-elts 4 trace-tsp 1  
-    node-id 0x2 app-data 0x1234  
-
-#### On the In-band OAM decapsulating node
-- The decapsulating node similar to encapsulating node requires
-**classification** of the packets to remove iOAM data from.
-    - Example to decapsulate iOAM data for packets towards
-    db06::06, configure classifier and enable it as an ACL as follows:
-
-
-    vpp# classify table miss-next node ip6-lookup mask l3 ip6 dst
-
-    vpp# classify session acl-hit-next node ip6-lookup table-index 0
-    match l3 ip6 dst db06::06 opaque-index 100
-
-    vpp# set int input acl intfc GigabitEthernet0/0/0 ip6-table 0
-
-
-- Decapsulating node requires trace type, timestamp precision,
-node ID and optionally application data to be configured,
-to update its node data in the trace option before it is decapsulated.
-
-Example:  
-
-    vpp# set ioam rewrite trace-type 0x1f trace-elts 4  
-    trace-tsp 1 node-id 0x3 app-data 0x1234  
-
-
-### Proof of Transit configuration
-
-For details on proof-of-transit,
-see the IETF draft [iOAM-ietf-proof-of-transit].
-To enable Proof of Transit all the nodes that participate
-and hence are verified for transit need a proof of transit profile.
-A script to generate a proof of transit profile as per the mechanism
-described in [iOAM-ietf-proof-of-transit] will be available at [iOAM-Devnet].
-
-The Proof of transit mechanism implemented here is based on
-Shamir's Secret Sharing algorithm.
-The overall algorithm uses two polynomials 
-POLY-1 and POLY-2. The degree of polynomials depends on number of nodes
-to be verified for transit.
-POLY-1 is secret and constant. Each node gets a point on POLY-1
-at setup-time and keeps it secret.
-POLY-2 is public, random and per packet.
-Each node is assigned a point on POLY-1 and POLY-2 with the same x index.
-Each node derives its point on POLY-2 each time a packet arrives at it.
-A node then contributes its points on POLY-1 and POLY-2 to construct
-POLY-3 (POLY-3 = POLY-1 + POLY-2) using lagrange extrapolation and
-forwards it towards the verifier by updating POT data in the packet.
-The verifier constructs POLY-3 from the accumulated value from all the nodes
-and its own points on POLY-1 and POLY-2 and verifies whether
-POLY-3 = POLY-1 + POLY-2.  Only the verifier knows POLY-1.
-The solution leverages finite field arithmetic in a field of size "prime number"
-for reasons explained in description of Shamir's secret sharing algorithm.
-
-Here is an explanation of POT profile list and profile configuration CLI to
-realize the above mechanism.
-It is best to use the script provided at [iOAM-Devnet] to generate
-this configuration.
-- **Create POT profile** : set pot profile name <string> id [0-1]  
-[validator-key 0xu64] prime-number 0xu64 secret_share 0xu64  
-lpc 0xu64 polynomial2 0xu64 bits-in-random [0-64]  
-    - name : Profile list name.
-    - id : Profile id, it can be 0 or 1.
-    A maximum of two profiles can be configured per profile list.
-    - validator-key : Secret key configured only on the
-    verifier/decapsulating node used to compare and verify proof of transit.
-    - prime-number : Prime number for finite field arithmetic as required by the
-    proof of transit mechanism.
-    - secret_share : Unique point for each node on the secret polynomial POLY-1.
-    - lpc : Lagrange Polynomial Constant(LPC) calculated per node based on
-    its point (x value used for evaluating the points on the polynomial)
-    on the polynomial used in lagrange extrapolation
-    for reconstructing polynomial (POLY-3).
-    - polynomial2 : Is the pre-evaluated value of the point on
-    2nd polynomial(POLY-2). This is unique for each node.
-    It is pre-evaluated for all the coefficients of POLY-2 except
-    for the constant part of the polynomial that changes per packet
-    and is received as part of the POT data in the packet.
-    - bits-in-random : To control the size of the random number to be
-    generated. This number has to match the other numbers generated and used
-    in the profile as per the algorithm.
-
-- **Set a configured profile as active/in-use** :  
-set pot profile-active name <string> ID [0-1]  
-    - name : Name of the profile list to be used for computing
-    POT data per packet.
-    - ID : Identifier of the profile within the list to be used.
-
-#### On In-band OAM encapsulating node
- - Configure the classifier and apply ACL to select packets for iOAM data insertion.
-    - Example to enable iOAM data insertion for all the packet towards
-    IPv6 address db06::06 -
-
-
-    vpp# classify table miss-next node ip6-lookup mask l3 ip6 dst
-
-    vpp# classify session acl-hit-next node
-    ip6-add-hop-by-hop table-index 0 match l3 ip6 dst db06::06
-
-    vpp# set int input acl intfc GigabitEthernet0/0/0 ip6-table 0
-
-
- - Configure the proof of transit profile list with profiles.
-Each profile list referred to by a name can contain 2 profiles,
-only one is in use for updating proof of transit data at any time.
-    - Example profile list example with a profile generated from the
-    script to verify transit through 3 nodes is:
-
-
-    vpp# set pot profile name example id 0 prime-number 0x7fff0000fa884685
-    secret_share 0x6c22eff0f45ec56d lpc 0x7fff0000fa884682
-    polynomial2 0xffb543d4a9c bits-in-random 63
-
- - Enable one of the profiles from the configured profile list as active
- so that is will be used for calculating proof of transit
-
-Example enable profile ID 0 from profile list example configured above:
-
-
-    vpp# set pot profile-active name example ID 0
-
-
- - Enable POT option to be inserted
-
-
-    vpp# set ioam rewrite pot
-
-
-#### On in-band OAM transit node
- - Configure the proof of transit profile list with profiles for transit node.
-Example:
-
-
-    vpp# set pot profile name example id 0 prime-number 0x7fff0000fa884685
-    secret_share 0x564cdbdec4eb625d lpc 0x1
-    polynomial2 0x23f3a227186a bits-in-random 63
-
-#### On in-band OAM decapsulating node / verifier
-- The decapsulating node, similar to the encapsulating node requires
-classification of the packets to remove iOAM data from.
-    - Example to decapsulate iOAM data for packets towards db06::06
-    configure classifier and enable it as an ACL as follows:
-
-
-    vpp# classify table miss-next node ip6-lookup mask l3 ip6 dst
-
-    vpp# classify session acl-hit-next node ip6-lookup table-index 0
-    match l3 ip6 dst db06::06 opaque-index 100
-
-    vpp# set int input acl intfc GigabitEthernet0/0/0 ip6-table 0
-
-- To update and verify the proof of transit, POT profile list should be configured.
-    - Example POT profile list configured as follows:
-
-    vpp# set pot profile name example id 0 validate-key 0x7fff0000fa88465d
-    prime-number 0x7fff0000fa884685 secret_share 0x7a08fbfc5b93116d lpc 0x3
-    polynomial2 0x3ff738597ce bits-in-random 63
-
-## Operational data
-
-Following CLIs are available to check iOAM operation:
-- To check iOAM configuration that are effective use "show ioam summary"  
-
-Example:
-
-    vpp# show ioam summary  
-                  REWRITE FLOW CONFIGS - Not configured  
-     HOP BY HOP OPTIONS - TRACE CONFIG -  
-                            Trace Type : 0x1f (31)  
-             Trace timestamp precision : 1 (Milliseconds)  
-                    Num of trace nodes : 4  
-                               Node-id : 0x2 (2)  
-                              App Data : 0x1234 (4660)  
-                            POT OPTION - 1 (Enabled)  
-    Try 'show ioam pot and show pot profile' for more information  
-
-- To find statistics about packets for which iOAM options were
-added (encapsulating node) and removed (decapsulating node) execute
-*show errors*
-
-Example on encapsulating node:
-
-
-    vpp# show error
-       Count                    Node                  Reason
-    1208804706                ip6-inacl               input ACL hits
-    1208804706           ip6-add-hop-by-hop           Pkts w/ added ip6 hop-by-hop options
-    
-Example on decapsulating node:
-
-    vpp# show error
-       Count                    Node                  Reason
-      69508569                ip6-inacl               input ACL hits
-      69508569           ip6-pop-hop-by-hop           Pkts w/ removed ip6 hop-by-hop options
-
-- To check the POT profiles use "show pot profile"
-
-Example:
-
-    vpp# show pot profile
-    Profile list in use  : example
-    POT Profile at index: 0
-                     ID : 0
-              Validator : False (0)
-           Secret share : 0x564cdbdec4eb625d (6218586935324795485)
-           Prime number : 0x7fff0000fa884685 (9223090566081300101)
-    2nd polynomial(eval) : 0x23f3a227186a (39529304496234)
-                     LPC : 0x1 (1)
-               Bit mask : 0x7fffffffffffffff (9223372036854775807)
-    Profile index in use: 0
-    Pkts passed : 0x36 (54)
-
-- To get statistics  of POT for packets use "show ioam pot"
-
-Example at encapsulating or transit node:
-
-    vpp# show ioam pot
-     Pkts with ip6 hop-by-hop POT options - 54
-     Pkts with ip6 hop-by-hop POT options but no profile set - 0
-     Pkts with POT in Policy - 0
-     Pkts with POT out of Policy - 0
-    
-
-Example at decapsulating/verification node:
-
-
-    vpp# show ioam pot
-     Pkts with ip6 hop-by-hop POT options - 54
-     Pkts with ip6 hop-by-hop POT options but no profile set - 0
-     Pkts with POT in Policy - 54
-     Pkts with POT out of Policy - 0
-    
-- Tracing - enable trace of IPv6 packets to view the data inserted and
-collected.
-
-Example when the nodes are receiving data over a DPDK interface:
-Enable tracing using "trace add dpdk-input 20" and
-execute "show trace" to view the iOAM data collected:
-
-  
-    vpp# trace add dpdk-input 20  
-      
-    vpp# show trace
-    
-    ------------------- Start of thread 0 vpp_main -------------------  
-    
-    Packet 1  
-      
-    00:00:19:294697: dpdk-input  
-      GigabitEthernetb/0/0 rx queue 0  
-      buffer 0x10e6b: current data 0, length 214, free-list 0, totlen-nifb 0, trace 0x0  
-      PKT MBUF: port 0, nb_segs 1, pkt_len 214  
-        buf_len 2176, data_len 214, ol_flags 0x0, data_off 128, phys_addr 0xe9a35a00  
-        packet_type 0x0  
-      IP6: 00:50:56:9c:df:72 -> 00:50:56:9c:be:55  
-      IP6_HOP_BY_HOP_OPTIONS: db05::2 -> db06::6  
-        tos 0x00, flow label 0x0, hop limit 63, payload length 160  
-    00:00:19:294737: ethernet-input  
-      IP6: 00:50:56:9c:df:72 -> 00:50:56:9c:be:55  
-    00:00:19:294753: ip6-input  
-      IP6_HOP_BY_HOP_OPTIONS: db05::2 -> db06::6  
-        tos 0x00, flow label 0x0, hop limit 63, payload length 160  
-    00:00:19:294757: ip6-lookup  
-      fib 0 adj-idx 15 : indirect via db05::2 flow hash: 0x00000000  
-      IP6_HOP_BY_HOP_OPTIONS: db05::2 -> db06::6  
-        tos 0x00, flow label 0x0, hop limit 63, payload length 160  
-    00:00:19:294802: ip6-hop-by-hop  
-      IP6_HOP_BY_HOP: next index 5 len 96 traced 96  Trace Type 0x1f , 1 elts left  
-        [0] ttl 0x0 node ID 0x0 ingress 0x0 egress 0x0 ts 0x0  
-    app 0x0  
-        [1] ttl 0x3e node ID 0x3 ingress 0x1 egress 0x2 ts 0xb68c2213  
-    app 0x1234  
-        [2] ttl 0x3f node ID 0x2 ingress 0x1 egress 0x2 ts 0xb68c2204  
-    app 0x1234  
-        [3] ttl 0x40 node ID 0x1 ingress 0x5 egress 0x6 ts 0xb68c2200  
-    app 0x1234  
-        POT opt present  
-             random = 0x577a916946071950, Cumulative = 0x10b46e78a35a392d, Index = 0x0  
-    00:00:19:294810: ip6-rewrite  
-      tx_sw_if_index 1 adj-idx 14 : GigabitEthernetb/0/0  
-                                    IP6: 00:50:56:9c:be:55 -> 00:50:56:9c:df:72 flow hash: 0x00000000  
-      IP6: 00:50:56:9c:be:55 -> 00:50:56:9c:df:72  
-      IP6_HOP_BY_HOP_OPTIONS: db05::2 -> db06::6  
-        tos 0x00, flow label 0x0, hop limit 62, payload length 160  
-    00:00:19:294814: GigabitEthernetb/0/0-output  
-      GigabitEthernetb/0/0  
-      IP6: 00:50:56:9c:be:55 -> 00:50:56:9c:df:72  
-      IP6_HOP_BY_HOP_OPTIONS: db05::2 -> db06::6  
-        tos 0x00, flow label 0x0, hop limit 62, payload length 160  
-    00:00:19:294820: GigabitEthernetb/0/0-tx    
-      GigabitEthernetb/0/0 tx queue 0    
-      buffer 0x10e6b: current data 0, length 214, free-list 0, totlen-nifb 0, trace 0x0    
-      IP6: 00:50:56:9c:be:55 -> 00:50:56:9c:df:72
-      
-      IP6_HOP_BY_HOP_OPTIONS: db05::2 -> db06::6
-      
-        tos 0x00, flow label 0x0, hop limit 62, payload length 160  
-    
-
-[iOAM-Devnet]: <https://github.com/ciscodevnet/iOAM>
-[iOAM-ietf-requirements]:<https://tools.ietf.org/html/draft-brockners-inband-oam-requirements-01>
-[iOAM-ietf-transport]:<https://tools.ietf.org/html/draft-brockners-inband-oam-transport-01>
-[iOAM-ietf-data]:<https://tools.ietf.org/html/draft-brockners-inband-oam-data-01>
-[iOAM-ietf-proof-of-transit]:<https://tools.ietf.org/html/draft-brockners-proof-of-transit-01>
diff --git a/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamexport/test/IoamExportApiTest.java b/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamexport/test/IoamExportApiTest.java
deleted file mode 100644
index cb85f005..00000000
--- a/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamexport/test/IoamExportApiTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.ioamexport.test;
-
-import java.net.InetAddress;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.ioamexport.JVppIoamexportImpl;
-import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexportFacade;
-import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisable;
-import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply;
-
-public class IoamExportApiTest {
-
-    public static void main(String[] args) throws Exception {
-        ioamExportTestApi();
-    }
-
-    private static void ioamExportTestApi() throws Exception {
-        System.out.println("Testing Java API for ioam export plugin");
-        try (final JVppRegistry registry = new JVppRegistryImpl("ioamExportApiTest");
-             final JVpp jvpp = new JVppIoamexportImpl()) {
-	    FutureJVppIoamexportFacade ioamexportJvpp = new FutureJVppIoamexportFacade(registry,jvpp);
-            System.out.println("Sending ioam export request...");
-	    IoamExportIp6EnableDisable request = new IoamExportIp6EnableDisable();
-            request.isDisable = 0;
-	    InetAddress collectorAddress = InetAddress.getByName("2001:0DB8:AC10:FE01:0000:0000:0000:0000");
-	    InetAddress srcAddress = InetAddress.getByName("2001:0DB8:AC10:FE01:0000:0000:0000:0001");
-	    request.collectorAddress = collectorAddress.getAddress();
-	    request.srcAddress = srcAddress.getAddress();
-	    IoamExportIp6EnableDisableReply reply = ioamexportJvpp.ioamExportIp6EnableDisable(request).toCompletableFuture().get();
-            System.out.printf("IoamExportIp6EnableDisableReply = "+reply.toString()+"%n");
-
-            Thread.sleep(1000);
-
-            System.out.println("Disconnecting...");
-        }
-    }
-}
diff --git a/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamexport/test/Readme.txt b/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamexport/test/Readme.txt
deleted file mode 100644
index 1b38c285..00000000
--- a/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamexport/test/Readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-sudo java -cp build-vpp_debug-native/vpp-api/java/jvpp-registry-17.01.jar:build-vpp_debug-native/plugins/ioam-plugin/jvpp-ioam-export-1.0.jar io.fd.vpp.jvpp.ioamexport.test.IoamExportApiTest
diff --git a/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioampot/test/IoamPotApiTest.java b/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioampot/test/IoamPotApiTest.java
deleted file mode 100644
index 74eb86a1..00000000
--- a/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioampot/test/IoamPotApiTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.ioampot.test;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.ioampot.JVppIoampotImpl;
-import io.fd.vpp.jvpp.ioampot.callback.PotProfileAddCallback;
-import io.fd.vpp.jvpp.ioampot.dto.PotProfileAdd;
-import io.fd.vpp.jvpp.ioampot.dto.PotProfileAddReply;
-
-public class IoamPotApiTest {
-
-    static class IoamPotTestCallback implements PotProfileAddCallback {
-
-        @Override
-        public void onPotProfileAddReply(final PotProfileAddReply reply) {
-            System.out.printf("Received PotProfileAddReply reply: context=%d%n",
-                reply.context);
-        }
-
-        @Override
-        public void onError(VppCallbackException ex) {
-            System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n", ex.getMethodName(),
-                ex.getCtxId(), ex.getErrorCode());
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        ioamPotTestApi();
-    }
-
-    private static void ioamPotTestApi() throws Exception {
-        System.out.println("Testing Java API for ioam pot plugin");
-        try (final JVppRegistry registry = new JVppRegistryImpl("ioamPotApiTest");
-             final JVpp jvpp = new JVppIoampotImpl()) {
-            registry.register(jvpp, new IoamPotTestCallback());
-
-            System.out.println("Sending ioam pot profile add request...");
-            PotProfileAdd request = new PotProfileAdd();
-            request.id = 0;
-            request.validator = 4;
-            request.secretKey = 1;
-            request.secretShare = 2;
-            request.prime = 1234;
-            request.maxBits = 53;
-            request.lpc = 1234;
-            request.polynomialPublic = 1234;
-            request.listNameLen = (byte)"test pot profile".getBytes().length;
-            request.listName = "test pot profile".getBytes();
-            final int result = jvpp.send(request);
-            System.out.printf("PotProfileAdd send result = %d%n", result);
-
-            Thread.sleep(1000);
-
-            System.out.println("Disconnecting...");
-        }
-    }
-}
diff --git a/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioampot/test/Readme.txt b/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioampot/test/Readme.txt
deleted file mode 100644
index 2323494d..00000000
--- a/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioampot/test/Readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-sudo java -cp build-vpp_debug-native/vpp-api/java/jvpp-registry-16.12.jar:build-vpp_debug-native/plugins/ioam-plugin/jvpp-ioam-pot-1.0.jar io.fd.vpp.jvpp.ioampot.test.IoamPotApiTest
diff --git a/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamtrace/test/IoamTraceApiTest.java b/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamtrace/test/IoamTraceApiTest.java
deleted file mode 100644
index bc8c1c3a..00000000
--- a/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamtrace/test/IoamTraceApiTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.ioamtrace.test;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade;
-import io.fd.vpp.jvpp.ioamtrace.JVppIoamtraceImpl;
-import io.fd.vpp.jvpp.ioamtrace.callback.TraceProfileAddCallback;
-import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAdd;
-import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAddReply;
-import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfig;
-import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfigReply;
-
-public class IoamTraceApiTest {
-
-    static class IoamTraceTestCallback implements TraceProfileAddCallback {
-
-        @Override
-        public void onTraceProfileAddReply(final TraceProfileAddReply reply) {
-            System.out.printf("Received TraceProfileAddReply reply: context=%d%n",
-                reply.context);
-        }
-
-        @Override
-        public void onError(VppCallbackException ex) {
-            System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n", ex.getMethodName(),
-                ex.getCtxId(), ex.getErrorCode());
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        ioamTraceTestApi();
-    }
-
-    private static void ioamTraceTestApi() throws Exception {
-        System.out.println("Testing Java API for ioam trace plugin");
-        try (final JVppRegistry registry = new JVppRegistryImpl("ioamTraceApiTest");
-             final JVpp jvpp = new JVppIoamtraceImpl()) {
-	    FutureJVppIoamtraceFacade ioamtraceJvpp = new FutureJVppIoamtraceFacade(registry,jvpp);
-
-            System.out.println("Sending ioam trace profile add request...");
-            TraceProfileAdd request = new TraceProfileAdd();
-            request.traceType = 0x1f;
-            request.numElts = 4;
-            request.nodeId = 1;
-            request.traceTsp = 2;
-            request.appData = 1234;
-            final int result = jvpp.send(request);
-            System.out.printf("TraceProfileAdd send result = %d%n", result);
-
-            Thread.sleep(1000);
-
-	    TraceProfileShowConfig showRequest = new TraceProfileShowConfig();
-	    TraceProfileShowConfigReply reply = ioamtraceJvpp.traceProfileShowConfig(showRequest).toCompletableFuture().get();
-            System.out.printf("TraceProfileShowConfig result = "+ reply.toString());
-
-            System.out.println("Disconnecting...");
-        }
-    }
-}
diff --git a/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt b/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt
deleted file mode 100644
index 17e45a81..00000000
--- a/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-17.01.jar:build-vpp-native/plugins/ioam-plugin/jvpp-ioam-trace-1.0.jar io.fd.vpp.jvpp.ioamtrace.test.IoamTraceApiTest
diff --git a/plugins/ioam-plugin/ioam/lib-pot/jvpp_ioam_pot.c b/plugins/ioam-plugin/ioam/lib-pot/jvpp_ioam_pot.c
deleted file mode 100644
index a60ae60f..00000000
--- a/plugins/ioam-plugin/ioam/lib-pot/jvpp_ioam_pot.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-
-#include <ioam/lib-pot/pot_msg_enum.h>
-#define vl_typedefs             /* define message structures */
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_api_version
-
-#include <vnet/api_errno.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-
-#if VPPJNI_DEBUG == 1
-  #define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
-#else
-  #define DEBUG_LOG(...)
-#endif
-
-#include <jvpp-common/jvpp_common.h>
-
-#include "ioam/jvpp/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h"
-#include "jvpp_ioam_pot.h"
-#include "ioam/jvpp/jvpp_ioam_pot_gen.h"
-
-/*
- * Class:     io_fd_vpp_jvpp_ioampot_JVppIoampotImpl
- * Method:    init0
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_init0
-  (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
-  ioampot_main_t * plugin_main = &ioampot_main;
-  u8 * name;
-  clib_warning ("Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_init0");
-
-  plugin_main->my_client_index = my_client_index;
-  plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
-
-  name = format (0, "ioam_pot_%08x%c", api_version, 0);
-  plugin_main->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (plugin_main->msg_id_base == (u16) ~0) {
-    jclass exClass = (*env)->FindClass(env, "java/lang/IllegalStateException");
-    (*env)->ThrowNew(env, exClass, "ioam_pot plugin is not loaded in VPP");
-  } else {
-    plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
-    plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
-
-    #define _(N,n)                                  \
-        vl_msg_api_set_handlers(VL_API_##N + plugin_main->msg_id_base, #n,     \
-                vl_api_##n##_t_handler,             \
-                vl_noop_handler,                    \
-                vl_api_##n##_t_endian,              \
-                vl_api_##n##_t_print,               \
-                sizeof(vl_api_##n##_t), 1);
-        foreach_api_reply_handler;
-    #undef _
-  }
-}
-
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_close0
-(JNIEnv *env, jclass clazz) {
-  ioampot_main_t * plugin_main = &ioampot_main;
-
-    // cleanup:
-    (*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
-    (*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
-
-    plugin_main->callbackClass = NULL;
-    plugin_main->callbackObject = NULL;
-}
-
-/* Attach thread to JVM and cache class references when initiating JVPP iOAM POT */
-jint JNI_OnLoad(JavaVM *vm, void *reserved) {
-    JNIEnv* env;
-
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return JNI_EVERSION;
-    }
-
-    if (cache_class_references(env) != 0) {
-        clib_warning ("Failed to cache class references\n");
-        return JNI_ERR;
-    }
-
-    return JNI_VERSION_1_8;
-}
-
-/* Clean up cached references when disposing JVPP iOAM POT */
-void JNI_OnUnload(JavaVM *vm, void *reserved) {
-    JNIEnv* env;
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return;
-    }
-    delete_class_references(env);
-}
diff --git a/plugins/ioam-plugin/ioam/lib-pot/jvpp_ioam_pot.h b/plugins/ioam-plugin/ioam/lib-pot/jvpp_ioam_pot.h
deleted file mode 100644
index 00aa51db..00000000
--- a/plugins/ioam-plugin/ioam/lib-pot/jvpp_ioam_pot.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_jvpp_ioam_pot_h__
-#define __included_jvpp_ioam_pot_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/api_errno.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <jni.h>
-
-/* Global state for JVPP-IOAM-POT */
-typedef struct {
-    /* Base message index for the pot plugin */
-    u16 msg_id_base;
-
-    /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
-
-    /* VPP api client index */
-    u32 my_client_index;
-
-    /* Callback object and class references enabling asynchronous Java calls */
-    jobject callbackObject;
-    jclass callbackClass;
-
-} ioampot_main_t;
-
-ioampot_main_t ioampot_main __attribute__((aligned (64)));
-
-
-#endif /* __included_jvpp_ioam_pot_h__ */
diff --git a/plugins/ioam-plugin/ioam/lib-pot/math64.h b/plugins/ioam-plugin/ioam/lib-pot/math64.h
deleted file mode 100644
index 4c608a37..00000000
--- a/plugins/ioam-plugin/ioam/lib-pot/math64.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* 
- * math64.h provides the 64 bit unsigned integer add, multiply followed by  modulo operation
- * The linux/math64.h provides divide and multiply 64 bit integers but:
- * 1. multiply: mul_u64_u64_shr - only returns 64 bits of the result and has to be called
- *                     twice to get the complete 128 bits of the result.
- * 2. Modulo operation of the result of  addition and multiplication of u64 that may result 
- *                        in integers > 64 bits is not supported
- * Hence this header to combine add/multiply followed by modulo of u64 integrers
- * always resulting in u64.
- * 
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef include_vnet_math64_h
-#define include_vnet_math64_h
-#include <stdint.h>
-
-/* 
- * multiplies and returns result in hi and lo 
- */
-static inline void mul64by64(u64 a, u64 b, u64 * hi, u64 * lo)
-{
-    u64 a_lo = (u64) (uint32_t) a;
-    u64 a_hi = a >> 32;
-    u64 b_lo = (u64) (u32) b;
-    u64 b_hi = b >> 32;
-
-    u64 p0 = a_lo * b_lo;
-    u64 p1 = a_lo * b_hi;
-    u64 p2 = a_hi * b_lo;
-    u64 p3 = a_hi * b_hi;
-
-    u32 cy = (u32) (((p0 >> 32) + (u32) p1 + (u32) p2) >> 32);
-
-    *lo = p0 + (p1 << 32) + (p2 << 32);
-    *hi = p3 + (p1 >> 32) + (p2 >> 32) + cy;
-    return;
-}
-
-#define TWO64 18446744073709551616.0
-
-static inline u64 mod128by64(u64 x, u64 y, u64 m, double di)
-{
-    u64 q1, q2, q;
-    u64 p1, p0;
-    double dq;
-
-    /* calculate quotient first pass 53 bits */
-    dq = (TWO64 * (double)x + (double)y) * di;
-
-    if (dq >= TWO64)
-        q1 = 0xfffffffffffff800L;
-    else
-        q1 = dq;
-
-    /* q1 * m to compare the product to the dividend.  */
-    mul64by64(q1, m, &p1, &p0);
-
-    /* Adjust quotient. is it > actual result: */
-    if (x < p1 || (x == p1 && y < p0))
-    {
-        /* q1 > quotient.  calculate abs remainder */
-        x = p1 - (x + (p0 < y));
-        y = p0 - y;
-
-        /* use the remainder as new dividend to adjust quotient */
-        q2 = (u64) ((TWO64 * (double)x + (double)y) * di);
-        mul64by64(q2, m, &p1, &p0);
-
-        q = q1 - q2;
-        if (x < p1 || (x == p1 && y <= p0))
-        {
-            y = p0 - y;
-        }
-        else
-        {
-            y = p0 - y;
-            y += m;
-            q--;
-        }
-    }
-    else
-    {
-        x = x - (p1 + (y < p0));
-        y = y - p0;
-
-        q2 = (u64) ((TWO64 * (double)x + (double)y) * di);
-        mul64by64(q2, m, &p1, &p0);
-
-        q = q1 + q2;
-        if (x < p1 || (x == p1 && y < p0))
-        {
-            y = y - p0;
-            y += m;
-            q--;
-        }
-        else
-        {
-            y = y - p0;
-            if (y >= m)
-            {
-                y -= m;
-                q++;
-            }
-        }
-    }
-
-    return y;
-}
-
-/* 
- * returns a % p
- */
-static inline u64 mod64by64(u64 a, u64 p, u64 primeinv)
-{
-    return (mod128by64(0, a, p, primeinv));
-}
-
-static inline void add64(u64 a, u64 b, u64 * whi, u64 * wlo)
-{
-    *wlo = a + b;
-    if (*wlo < a)
-        *whi = 1;
-
-}
-
-/* 
- * returns (a + b)%p
- */
-static inline u64 add64_mod(u64 a, u64 b, u64 p, double pi)
-{
-    u64 shi = 0, slo = 0;
-
-    add64(a, b, &shi, &slo);
-    return (mod128by64(shi, slo, p, pi));
-}
-
-/* 
- * returns (ab) % p
- */
-static inline u64 mul64_mod(u64 a, u64 b, u64 p, double pi)
-{
-    u64 phi = 0, plo = 0;
-
-    mul64by64(a, b, &phi, &plo);
-    return (mod128by64(phi, plo, p, pi));
-}
-
-#endif
diff --git a/plugins/ioam-plugin/ioam/lib-pot/pot.api b/plugins/ioam-plugin/ioam/lib-pot/pot.api
deleted file mode 100644
index fa2fc126..00000000
--- a/plugins/ioam-plugin/ioam/lib-pot/pot.api
+++ /dev/null
@@ -1,133 +0,0 @@
-/* Hey Emacs use -*- mode: C -*- */
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/** \brief Proof of Transit(POT): Set POT profile
-    @param id - id of the profile 
-    @param validator - True/False to indicate if this is verifier
-    @param secret_key - Verification key
-    @param secret_share - Share of the 1st polynomial
-    @param prime - Prime number used for modulo operation
-    @param max_bits - Max bits to be used for Random number generation
-    @param lpc - Lagrange basis polynomial
-    @param polynomial_public - pre-evaluated public polynomial 
-    @param list_name_len - length of the name of this profile list
-    @param list_name - name of this profile list
-*/
-define pot_profile_add {
-  u32 client_index;
-  u32 context;
-  u8 id;
-  u8 validator;
-  u64 secret_key;
-  u64 secret_share;
-  u64 prime;
-  u8  max_bits;
-  u64 lpc;
-  u64 polynomial_public;
-  u8 list_name_len;
-  u8 list_name[0];
-};
-
-/** \brief Proof of Transit profile add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define pot_profile_add_reply {
-    u32 context;
-    i32 retval;
-};
-
-
-/** \brief Proof of Transit(POT): Activate POT profile in the list
-    @param id - id of the profile 
-    @param list_name_len - length of the name of this profile list
-    @param list_name - name of this profile list
-*/
-define pot_profile_activate {
-  u32 client_index;
-  u32 context;
-  u8 id;
-  u8 list_name_len;
-  u8 list_name[0];
-};
-
-/** \brief Proof of Transit profile activate response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request 
-*/
-define pot_profile_activate_reply {
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Delete POT Profile 
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param list_name_len - length of the name of the profile list
-    @param list_name - name of profile list to delete
-*/
-define pot_profile_del {
-  u32 client_index;
-  u32 context;
-  u8 list_name_len;
-  u8 list_name[0];
-};
-
-/** \brief Proof of Transit profile add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define pot_profile_del_reply {
-    u32 context;
-    i32 retval;
-};
-
-/** \brief Show POT Profiles
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param id - id of the profile
-*/
-define pot_profile_show_config_dump {
-  u32 client_index;
-  u32 context;
-  u8 id;
-};
-
-/** \brief Show POT profile reply
-    @param id - id of the profile
-    @param validator - True/False to indicate if this is verifier
-    @param secret_key - Verification key
-    @param secret_share - Share of the 1st polynomial
-    @param prime - Prime number used for modulo operation
-    @param max_bits - Max bits to be used for Random number generation
-    @param lpc - Lagrange basis polynomial
-    @param polynomial_public - pre-evaluated public polynomial
-    @param list_name_len - length of the name of this profile list
-    @param list_name - name of this profile list
-*/
-define pot_profile_show_config_details {
-  u32 context;
-  i32 retval;
-  u8 id;
-  u8 validator;
-  u64 secret_key;
-  u64 secret_share;
-  u64 prime;
-  u64 bit_mask;
-  u64 lpc;
-  u64 polynomial_public;
-};
diff --git a/plugins/ioam-plugin/ioam/lib-pot/pot_all_api_h.h b/plugins/ioam-plugin/ioam/lib-pot/pot_all_api_h.h
deleted file mode 100644
index 63967c45..00000000
--- a/plugins/ioam-plugin/ioam/lib-pot/pot_all_api_h.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Include the generated file, see BUILT_SOURCES in Makefile.am */
-#include <ioam/lib-pot/pot.api.h>
diff --git a/plugins/ioam-plugin/ioam/lib-pot/pot_api.c b/plugins/ioam-plugin/ioam/lib-pot/pot_api.c
deleted file mode 100644
index d3af7b40..00000000
--- a/plugins/ioam-plugin/ioam/lib-pot/pot_api.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * pot_api.c - Proof of Transit related APIs to create 
- *             and maintain profiles
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vnet/plugin/plugin.h>
-#include <ioam/lib-pot/pot_util.h>
-
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-
-/* define message IDs */
-#include <ioam/lib-pot/pot_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_api_version
-
-/* 
- * A handy macro to set up a message reply.
- * Assumes that the following variables are available:
- * mp - pointer to request message
- * rmp - pointer to reply message type
- * rv - return value
- */
-
-#define REPLY_MACRO(t)                                          \
-do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
-    vl_api_client_index_to_input_queue (mp->client_index);      \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-                                                                \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-#define REPLY_MACRO2(t, body)                                   \
-do {                                                            \
-    unix_shared_memory_queue_t * q;                             \
-    rv = vl_msg_api_pd_handler (mp, rv);                        \
-    q = vl_api_client_index_to_input_queue (mp->client_index);  \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-    do {body;} while (0);                                       \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-/* List of message types that this plugin understands */
-
-#define foreach_pot_plugin_api_msg                                      \
-_(POT_PROFILE_ADD, pot_profile_add)                                     \
-_(POT_PROFILE_ACTIVATE, pot_profile_activate)                           \
-_(POT_PROFILE_DEL, pot_profile_del)                                     \
-_(POT_PROFILE_SHOW_CONFIG_DUMP, pot_profile_show_config_dump)                                     \
-
-static void vl_api_pot_profile_add_t_handler
-(vl_api_pot_profile_add_t *mp)
-{
-    pot_main_t * sm = &pot_main;
-    int rv = 0;
-    vl_api_pot_profile_add_reply_t * rmp;
-    u8 id;
-    pot_profile *profile = NULL;
-    u8 *name = 0;
-
-    if (mp->list_name_len)
-        name = format(0, "%s", mp->list_name);
-
-    pot_profile_list_init(name);
-    id = mp->id;
-    profile = pot_profile_find(id);
-    if (profile) {
-	rv = pot_profile_create(profile,
-				clib_net_to_host_u64(mp->prime),
-				clib_net_to_host_u64(mp->polynomial_public),
-				clib_net_to_host_u64(mp->lpc),
-				clib_net_to_host_u64(mp->secret_share));
-	if (rv != 0)
-            goto ERROROUT;
-	if (1 == mp->validator)
-	  (void)pot_set_validator(profile, clib_net_to_host_u64(mp->secret_key));
-        (void)pot_profile_set_bit_mask(profile, mp->max_bits);
-    } else {
-        rv = -3;
-    }  
- ERROROUT:
-    vec_free(name);
-    REPLY_MACRO(VL_API_POT_PROFILE_ADD_REPLY);
-}
-
-static void send_pot_profile_details(vl_api_pot_profile_show_config_dump_t *mp, u8 id)
-{
-    vl_api_pot_profile_show_config_details_t * rmp;
-    pot_main_t * sm = &pot_main;
-    pot_profile *profile = pot_profile_find(id);
-    int rv = 0;
-    if(profile){
-        REPLY_MACRO2(VL_API_POT_PROFILE_SHOW_CONFIG_DETAILS,
-			rmp->id=id;
-			rmp->validator=profile->validator;
-			rmp->secret_key=clib_host_to_net_u64(profile->secret_key);
-			rmp->secret_share=clib_host_to_net_u64(profile->secret_share);
-			rmp->prime=clib_host_to_net_u64(profile->prime);
-			rmp->bit_mask=clib_host_to_net_u64(profile->bit_mask);
-			rmp->lpc=clib_host_to_net_u64(profile->lpc);
-			rmp->polynomial_public=clib_host_to_net_u64(profile->poly_pre_eval);
-			);
-    }
-    else{
-        REPLY_MACRO2(VL_API_POT_PROFILE_SHOW_CONFIG_DETAILS,
-			rmp->id=id;
-			rmp->validator=0;
-			rmp->secret_key=0;
-			rmp->secret_share=0;
-			rmp->prime=0;
-			rmp->bit_mask=0;
-			rmp->lpc=0;
-			rmp->polynomial_public=0;
-			);
-    }
-}
-
-static void vl_api_pot_profile_show_config_dump_t_handler
-(vl_api_pot_profile_show_config_dump_t *mp)
-{
-    u8 id = mp->id;
-    u8 dump_call_id = ~0;
-    if(dump_call_id==id){
-        for(id=0;id<MAX_POT_PROFILES;id++)
-	    send_pot_profile_details(mp,id);
-    }
-    else
-        send_pot_profile_details(mp,id);
-}
-
-static void vl_api_pot_profile_activate_t_handler
-(vl_api_pot_profile_activate_t *mp)
-{
-    pot_main_t * sm = &pot_main;
-    int rv = 0;
-    vl_api_pot_profile_add_reply_t * rmp;
-    u8 id;
-    u8 *name = NULL;
-
-    if (mp->list_name_len)
-        name = format(0, "%s", mp->list_name);
-    if (!pot_profile_list_is_enabled(name)) {
-        rv = -1;
-    } else {
-        id = mp->id;
-	rv = pot_profile_set_active(id);
-    }
-     
-    vec_free(name);
-    REPLY_MACRO(VL_API_POT_PROFILE_ACTIVATE_REPLY);
-}
-
-
-static void vl_api_pot_profile_del_t_handler
-(vl_api_pot_profile_del_t *mp)
-{
-    pot_main_t * sm = &pot_main;
-    int rv = 0;
-    vl_api_pot_profile_del_reply_t * rmp;
-
-    clear_pot_profiles();
-
-    REPLY_MACRO(VL_API_POT_PROFILE_DEL_REPLY);
-}
-
-
-/* 
- * This routine exists to convince the vlib plugin framework that
- * we haven't accidentally copied a random .dll into the plugin directory.
- *
- * Also collects global variable pointers passed from the vpp engine
- */
-
-clib_error_t * 
-vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
-                      int from_early_init)
-{
-  pot_main_t * sm = &pot_main;
-  clib_error_t * error = 0;
-
-  sm->vlib_main = vm;
-  sm->vnet_main = h->vnet_main;
-  return error;
-}
-
-/* Set up the API message handling tables */
-static clib_error_t *
-pot_plugin_api_hookup (vlib_main_t *vm)
-{
-  pot_main_t * sm = &pot_main;
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,					\
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1); 
-    foreach_pot_plugin_api_msg;
-#undef _
-
-    return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (pot_main_t * sm, api_main_t * am)
-{
-#define _(id,n,crc) \
-  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
-  foreach_vl_msg_name_crc_pot;
-#undef _
-}
-
-static clib_error_t * pot_init (vlib_main_t * vm)
-{
-  pot_main_t * sm = &pot_main;
-  clib_error_t * error = 0;
-  u8 * name;
-
-  bzero(sm, sizeof(pot_main));
-  (void)pot_util_init();
-  name = format (0, "ioam_pot_%08x%c", api_version, 0);
-
-  /* Ask for a correctly-sized block of API message decode slots */
-  sm->msg_id_base = vl_msg_api_get_msg_ids 
-      ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-  error = pot_plugin_api_hookup (vm);
-
-  /* Add our API messages to the global name_crc hash table */
-  setup_message_id_table (sm, &api_main);
-
-  vec_free(name);
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (pot_init);
diff --git a/plugins/ioam-plugin/ioam/lib-pot/pot_msg_enum.h b/plugins/ioam-plugin/ioam/lib-pot/pot_msg_enum.h
deleted file mode 100644
index a4a88bed..00000000
--- a/plugins/ioam-plugin/ioam/lib-pot/pot_msg_enum.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_pot_msg_enum_h
-#define included_pot_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <ioam/lib-pot/pot_all_api_h.h>
-    /* We'll want to know how many messages IDs we need... */
-    VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* included_pot_msg_enum_h */
diff --git a/plugins/ioam-plugin/ioam/lib-pot/pot_test.c b/plugins/ioam-plugin/ioam/lib-pot/pot_test.c
deleted file mode 100644
index 2e870238..00000000
--- a/plugins/ioam-plugin/ioam/lib-pot/pot_test.c
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * pot_test.c - test harness for pot plugin
- *------------------------------------------------------------------
- */
-
-#include <vat/vat.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-#include <vppinfra/error.h>
-
-/* Declare message IDs */
-#include <ioam/lib-pot/pot_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun             /* define message structures */
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number. */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_api_version
-
-
-typedef struct {
-    /* API message ID base */
-    u16 msg_id_base;
-    vat_main_t *vat_main;
-} pot_test_main_t;
-
-pot_test_main_t pot_test_main;
-
-#define foreach_standard_reply_retval_handler     \
-_(pot_profile_add_reply)                          \
-_(pot_profile_activate_reply)                     \
-_(pot_profile_del_reply)
-
-#define foreach_custom_reply_retval_handler     		\
-_(pot_profile_show_config_details,				\
-    errmsg("		ID:%d\n",mp->id);			\
-    errmsg("	 Validator:%d\n",mp->validator);		\
-    errmsg("	secret_key:%Lx\n",clib_net_to_host_u64(mp->secret_key));		\
-    errmsg("  secret_share:%Lx\n",clib_net_to_host_u64(mp->secret_share));		\
-    errmsg("  	     prime:%Lx\n",clib_net_to_host_u64(mp->prime));			\
-    errmsg("  	   bitmask:%Lx\n",clib_net_to_host_u64(mp->bit_mask));		\
-    errmsg("  	       lpc:%Lx\n",clib_net_to_host_u64(mp->lpc));			\
-    errmsg("   public poly:%Lx\n",clib_net_to_host_u64(mp->polynomial_public));	\
-		)
-
-#define _(n)                                            \
-    static void vl_api_##n##_t_handler                  \
-    (vl_api_##n##_t * mp)                               \
-    {                                                   \
-        vat_main_t * vam = pot_test_main.vat_main;   \
-        i32 retval = ntohl(mp->retval);                 \
-        if (vam->async_mode) {                          \
-            vam->async_errors += (retval < 0);          \
-        } else {                                        \
-            vam->retval = retval;                       \
-            vam->result_ready = 1;                      \
-        }                                               \
-    }
-foreach_standard_reply_retval_handler;
-#undef _
-
-#define _(n,body)                                       \
-    static void vl_api_##n##_t_handler                  \
-    (vl_api_##n##_t * mp)                               \
-    {                                                   \
-        vat_main_t * vam = pot_test_main.vat_main;   \
-        i32 retval = ntohl(mp->retval);                 \
-        if (vam->async_mode) {                          \
-            vam->async_errors += (retval < 0);          \
-        } else {                                        \
-            vam->retval = retval;                       \
-            vam->result_ready = 1;                      \
-        }                                               \
-	do{body;}while(0);				\
-    }
-foreach_custom_reply_retval_handler;
-#undef _
-
-/* 
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg                                       \
-_(POT_PROFILE_ADD_REPLY, pot_profile_add_reply)                         \
-_(POT_PROFILE_ACTIVATE_REPLY, pot_profile_activate_reply)               \
-_(POT_PROFILE_DEL_REPLY, pot_profile_del_reply)                         \
-_(POT_PROFILE_SHOW_CONFIG_DETAILS, pot_profile_show_config_details)
-
-
-/* M: construct, but don't yet send a message */
-
-#define M(T,t)                                                  \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp));                         \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-#define M2(T,t,n)                                               \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W                                       \
-do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
-                                                \
-    while (vat_time_now (vam) < timeout) {      \
-        if (vam->result_ready == 1) {           \
-            return (vam->retval);               \
-        }                                       \
-    }                                           \
-    return -99;                                 \
-} while(0);
-
-
-static int api_pot_profile_add (vat_main_t *vam)
-{
-#define MAX_BITS 64
-    pot_test_main_t * sm = &pot_test_main;
-    unformat_input_t *input = vam->input;
-    vl_api_pot_profile_add_t *mp;
-    u8 *name = NULL;
-    u64 prime = 0;
-    u64 secret_share = 0;
-    u64 secret_key = 0;
-    u32  bits = MAX_BITS;
-    u64 lpc = 0, poly2 = 0;
-    f64 timeout;
-    u8 id = 0;
-    int rv = 0;
-
-    while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
-      {
-        if (unformat(input, "name %s", &name))
-	  ;
-	else if(unformat(input, "id %d", &id))
-	  ;
-        else if (unformat(input, "validator-key 0x%Lx", &secret_key))
-          ;
-        else if (unformat(input, "prime-number 0x%Lx", &prime))
-          ;
-        else if (unformat(input, "secret-share 0x%Lx", &secret_share))
-          ;
-        else if (unformat(input, "polynomial-public 0x%Lx", &poly2))
-          ;
-        else if (unformat(input, "lpc 0x%Lx", &lpc))
-          ;
-        else if (unformat(input, "bits-in-random %u", &bits))
-	  {
-	    if (bits > MAX_BITS)
-	      bits = MAX_BITS;
-	  }
-        else
-  	break;
-      }
-
-    if (!name)
-      {
-        errmsg ("name required\n");
-        rv = -99;
-        goto OUT;
-      }
-    
-    M2(POT_PROFILE_ADD, pot_profile_add, vec_len(name));
-
-    mp->list_name_len = vec_len(name);
-    clib_memcpy(mp->list_name, name, mp->list_name_len);
-    mp->secret_share = clib_host_to_net_u64(secret_share);
-    mp->polynomial_public = clib_host_to_net_u64(poly2);
-    mp->lpc = clib_host_to_net_u64(lpc);
-    mp->prime = clib_host_to_net_u64(prime);
-    if (secret_key != 0)
-      {
-        mp->secret_key = clib_host_to_net_u64(secret_key);
-        mp->validator = 1;
-      }
-    else
-      {
-	mp->validator = 0;
-      }
-    mp->id = id;
-    mp->max_bits = bits;
-      
-    S; W;
-  
-OUT:
-    vec_free(name);
-    return(rv);
-}
-
-static int api_pot_profile_activate (vat_main_t *vam)
-{
-#define MAX_BITS 64
-    pot_test_main_t * sm = &pot_test_main;  
-    unformat_input_t *input = vam->input;
-    vl_api_pot_profile_activate_t *mp;
-    u8 *name = NULL;
-    u8 id = 0;
-    int rv = 0;
-    f64 timeout;
-    
-    while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
-      {
-        if (unformat(input, "name %s", &name))
-	  ;
-	else if(unformat(input, "id %d", &id))
-	  ;
-        else
-  	break;
-      }
-
-    if (!name)
-      {
-        errmsg ("name required\n");
-        rv = -99;
-        goto OUT;
-      }
-    
-    M2(POT_PROFILE_ACTIVATE, pot_profile_activate, vec_len(name));
-
-    mp->list_name_len = vec_len(name);
-    clib_memcpy(mp->list_name, name, mp->list_name_len);
-    mp->id = id;
-      
-    S; W;
-  
-OUT:
-    vec_free(name);
-    return(rv);
-}
-
-
-static int api_pot_profile_del (vat_main_t *vam)
-{
-    pot_test_main_t * sm = &pot_test_main;
-    vl_api_pot_profile_del_t *mp;
-    f64 timeout;
-   
-    M(POT_PROFILE_DEL, pot_profile_del);
-    mp->list_name_len = 0;
-    S; W;
-    return 0;
-}
-
-static int api_pot_profile_show_config_dump (vat_main_t *vam)
-{
-    pot_test_main_t * sm = &pot_test_main;
-    unformat_input_t *input = vam->input;
-    vl_api_pot_profile_show_config_dump_t *mp;
-    f64 timeout;
-    u8 id = 0;
-
-    while(unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
-    {
-      if(unformat(input,"id %d",&id));
-      else
-        break;
-    }
-    M(POT_PROFILE_SHOW_CONFIG_DUMP, pot_profile_show_config_dump);
-
-    mp->id = id;
-
-    S; W;
-    return 0;
-}
-
-/* 
- * List of messages that the api test plugin sends,
- * and that the data plane plugin processes
- */
-#define foreach_vpe_api_msg \
-_(pot_profile_add, "name <name> id [0-1] "                              \
-  "prime-number <0xu64> bits-in-random [0-64] "                         \
-  "secret-share <0xu64> lpc <0xu64> polynomial-public <0xu64> "         \
-  "[validator-key <0xu64>] [validity <0xu64>]")                         \
-_(pot_profile_activate, "name <name> id [0-1] ")    			\
-_(pot_profile_del, "[id <nn>]")                                         \
-_(pot_profile_show_config_dump, "id [0-1]")
-
-void vat_api_hookup (vat_main_t *vam)
-{
-    pot_test_main_t * sm = &pot_test_main;
-    /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,                                  \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1); 
-    foreach_vpe_api_reply_msg;
-#undef _
-
-    /* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
-    foreach_vpe_api_msg;
-#undef _    
-    
-    /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
-    foreach_vpe_api_msg;
-#undef _
-}
-
-clib_error_t * vat_plugin_register (vat_main_t *vam)
-{
-  pot_test_main_t * sm = &pot_test_main;
-  u8 * name;
-
-  sm->vat_main = vam;
-
-  name = format (0, "ioam_pot_%08x%c", api_version, 0);
-  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (sm->msg_id_base != (u16) ~0)
-    vat_api_hookup (vam);
-  
-  vec_free(name);
-  
-  return 0;
-}
diff --git a/plugins/ioam-plugin/ioam/lib-pot/pot_util.c b/plugins/ioam-plugin/ioam/lib-pot/pot_util.c
deleted file mode 100644
index a253ad41..00000000
--- a/plugins/ioam-plugin/ioam/lib-pot/pot_util.c
+++ /dev/null
@@ -1,445 +0,0 @@
-/* 
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/vnet.h>
-#include <stdint.h>
-#include <time.h>
-#include <string.h>
-#include <vppinfra/mem.h>
-#include "math64.h"
-#include "pot_util.h"
-
-pot_main_t pot_main;
-
-static void pot_profile_cleanup(pot_profile *profile);
-
-static void pot_main_profiles_reset (void)
-{
-    pot_main_t *sm = &pot_main;
-    int i = 0;
-
-    for (i = 0; i < MAX_POT_PROFILES; i++)
-    {
-      pot_profile_cleanup(&(sm->profile_list[i]));
-    }
-    sm->active_profile_id = 0;
-    if (sm->profile_list_name)
-	vec_free(sm->profile_list_name);
-    sm->profile_list_name = NULL;
-}
-
-int pot_util_init (void)
-{
-    pot_main_profiles_reset();
-    
-    return(0);
-}
-
-static void pot_profile_init(pot_profile * new, u8 id)
-{
-    if (new)
-    {
-        memset(new, 0, sizeof(pot_profile));
-        new->id = id;
-    }
-}
-
-pot_profile *pot_profile_find(u8 id)
-{
-    pot_main_t *sm = &pot_main;
-
-    if (id < MAX_POT_PROFILES)
-    {
-        return (&(sm->profile_list[id]));
-    }
-    return (NULL);
-}
-static int pot_profile_name_equal (u8 *name0, u8 *name1)
-{
-    int len0, len1;
-
-    len0 = vec_len (name0);
-    len1 = vec_len (name1);
-    if (len0 != len1)
-        return(0);
-    return (0==strncmp ((char *) name0, (char *)name1, len0));
-}
-
-int pot_profile_list_is_enabled (u8 *name)
-{
-    pot_main_t *sm = &pot_main;
-    return (pot_profile_name_equal(sm->profile_list_name, name));
-}
-
-void pot_profile_list_init(u8 * profile_list_name)
-{
-    pot_main_t *sm = &pot_main;
-    int i = 0;
-
-    /* If it is the same profile list skip reset */
-    if (pot_profile_name_equal(sm->profile_list_name, profile_list_name))
-    {
-      return;
-    }
-
-    pot_main_profiles_reset();
-    if (vec_len(profile_list_name))
-      sm->profile_list_name = (u8 *)vec_dup(profile_list_name);
-    else
-      sm->profile_list_name = 0;
-    sm->active_profile_id = 0;
-    
-    for (i = 0; i < MAX_POT_PROFILES; i++)
-    {
-      pot_profile_init(&(sm->profile_list[i]), i);
-    }
-}
-
-static void pot_profile_cleanup(pot_profile * profile)
-{
-    u16 id = profile->id;
-
-    memset(profile, 0, sizeof(pot_profile));
-    profile->id = id;           /* Restore id alone */
-}
-
-int pot_profile_create(pot_profile * profile, u64 prime,
-    u64 poly2, u64 lpc, u64 secret_share)
-{
-    if (profile && !profile->in_use)
-    {
-        pot_profile_cleanup(profile);
-        profile->prime = prime;
-        profile->primeinv = 1.0 / prime;
-        profile->lpc = lpc;
-        profile->poly_pre_eval = poly2;
-        profile->secret_share = secret_share;
-	profile->total_pkts_using_this_profile = 0;
-        profile->valid = 1;
-	return(0);
-    }
-    
-    return(-1);
-}
-
-int pot_set_validator(pot_profile * profile, u64 key)
-{
-    if (profile && !profile->in_use)
-    {
-        profile->validator = 1;
-        profile->secret_key = key;
-	return(0);
-    }
-    return(-1);
-}
-
-always_inline u64 pot_update_cumulative_inline(u64 cumulative, u64 random,
-    u64 secret_share, u64 prime, u64 lpc, u64 pre_split, double prime_inv)
-{
-    u64 share_random = 0;
-    u64 cumulative_new = 0;
-
-    /* 
-     * calculate split share for random
-     */
-    share_random = add64_mod(pre_split, random, prime, prime_inv);
-
-    /* 
-     * lpc * (share_secret + share_random)
-     */
-    share_random = add64_mod(share_random, secret_share, prime, prime_inv);
-    share_random = mul64_mod(share_random, lpc, prime, prime_inv);
-
-    cumulative_new = add64_mod(cumulative, share_random, prime, prime_inv);
-
-    return (cumulative_new);
-}
-
-u64 pot_update_cumulative(pot_profile * profile, u64 cumulative, u64 random)
-{
-    if (profile && profile->valid != 0)
-    {
-        return (pot_update_cumulative_inline(cumulative, random, profile->secret_share,
-                profile->prime, profile->lpc, profile->poly_pre_eval,
-                profile->primeinv));
-    }
-    return (0);
-}
-
-always_inline u8 pot_validate_inline(u64 secret, u64 prime, double prime_inv,
-    u64 cumulative, u64 random)
-{
-    if (cumulative == (random + secret))
-    {
-        return (1);
-    }
-    else if (cumulative == add64_mod(random, secret, prime, prime_inv))
-    {
-        return (1);
-    }
-    return (0);
-}
-
-/* 
- * return True if the cumulative matches secret from a profile
- */
-u8 pot_validate(pot_profile * profile, u64 cumulative, u64 random)
-{
-    if (profile && profile->validator)
-    {
-        return (pot_validate_inline(profile->secret_key, profile->prime,
-                profile->primeinv, cumulative, random));
-    }
-    return (0);
-}
-
-/* 
- * Utility function to get random number per pack
- */
-u64 pot_generate_random(pot_profile * profile)
-{
-    u64 random = 0;
-    int32_t second_half;
-    static u32 seed = 0;
-
-    if (PREDICT_FALSE(!seed))
-        seed = random_default_seed();
-
-    /* 
-     * Upper 4 bytes seconds
-     */
-    random = (u64) time(NULL);
-
-    random &= 0xffffffff;
-    random = random << 32;
-    /* 
-     * Lower 4 bytes random number
-     */
-    second_half = random_u32(&seed);
-
-    random |= second_half;
-
-    if (PREDICT_TRUE(profile != NULL))
-    {
-        random &= profile->bit_mask;
-    }
-    return (random);
-}
-
-int pot_profile_set_bit_mask(pot_profile * profile, u16 bits)
-{
-    int sizeInBits;
-
-    if (profile && !profile->in_use)
-    {
-        sizeInBits = sizeof(profile->bit_mask) * 8;
-        profile->bit_mask =
-            (bits >=
-            sizeInBits ? (u64) - 1 : (u64) ((u64) 1 << (u64) bits) - 1);
-	return(0);
-    }
-    return(-1);
-}
-
-clib_error_t *clear_pot_profile_command_fn(vlib_main_t * vm,
-    unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-
-    pot_main_profiles_reset();
-    
-    return 0;
-}
-
-void clear_pot_profiles()
-{
-    clear_pot_profile_command_fn(0, 0, 0);
-}
-
-VLIB_CLI_COMMAND(clear_pot_profile_command) =
-{
-.path = "clear pot profile",
-.short_help = "clear pot profile [<index>|all]",
-.function = clear_pot_profile_command_fn,
-};
-
-static clib_error_t *set_pot_profile_command_fn(vlib_main_t * vm,
-    unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-    u64 prime;
-    u64 secret_share;
-    u64 secret_key;
-    u8 validator = 0;
-    u32 profile_id = ~0;
-    u32 bits;
-    u64 lpc = 0, poly2 = 0;
-    pot_profile *profile = NULL;
-    u8 *profile_list_name = NULL;
-    
-    bits = MAX_BITS;
-
-    while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
-    {
-        if (unformat(input, "name %s",
-		     &profile_list_name));
-        else if (unformat(input, "id %d", &profile_id))
-            ;
-        else if (unformat(input, "validate-key 0x%Lx", &secret_key))
-            validator = 1;
-        else if (unformat(input, "prime-number 0x%Lx", &prime))
-            ;
-        else if (unformat(input, "secret_share 0x%Lx", &secret_share))
-            ;
-        else if (unformat(input, "polynomial2 0x%Lx", &poly2))
-            ;
-        else if (unformat(input, "lpc 0x%Lx", &lpc))
-            ;
-        else if (unformat(input, "bits-in-random %d", &bits))
-        {
-            if (bits > MAX_BITS)
-                bits = MAX_BITS;
-        }
-        else
-	  break;
-    }
-    if (profile_list_name == 0)
-    {
-        return clib_error_return(0, "Name cannot be null");
-    }	
-    pot_profile_list_init(profile_list_name);
-    profile = pot_profile_find(profile_id);
-
-    if (profile)
-    {
-        pot_profile_create(profile, prime, poly2, lpc, secret_share);
-        if (validator)
-            pot_set_validator(profile, secret_key);
-        pot_profile_set_bit_mask(profile, bits);
-    }
-    vec_free(profile_list_name);
-    return 0;
-}
-
-VLIB_CLI_COMMAND(set_pot_profile_command) =
-{
-.path = "set pot profile",
-.short_help = "set pot profile name <string> id [0-1] [validator-key 0xu64] \
-                  prime-number 0xu64 secret_share 0xu64 lpc 0xu64 \
-                  polynomial2 0xu64 bits-in-random [0-64] ",
-.function = set_pot_profile_command_fn,
-};
-
-static clib_error_t *set_pot_profile_activate_command_fn(vlib_main_t * vm,
-    unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-    pot_main_t *sm = &pot_main;
-    u8 *profile_list_name = NULL;
-    u32 id = 0;
-    clib_error_t *result = NULL;
-    
-    while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
-    {
-        if (unformat(input, "name %s",
-		     &profile_list_name));
-        else if (unformat(input, "id %d", &id))
-            ;
-        else
-            return clib_error_return(0, "unknown input `%U'",
-                format_unformat_error, input);
-    }
-    if (profile_list_name == 0)
-    {
-        return clib_error_return(0, "Name cannot be null");
-    }
-
-    if (!pot_profile_list_is_enabled(profile_list_name)) {
-        result = clib_error_return(0, "%s list is not enabled, profile in use %s",
-				 profile_list_name, sm->profile_list_name);
-    } else if (0 != pot_profile_set_active((u8)id)) {
-        result = clib_error_return(0, "Profile %d not defined in %s",
-				 id, sm->profile_list_name);
-    }
-    vec_free(profile_list_name);
-    return result;
-}
-
-VLIB_CLI_COMMAND(set_pot_profile_activate_command) =
-{
-.path = "set pot profile-active",
-.short_help = "set pot profile-active name <string> id [0-1]",
-.function = set_pot_profile_activate_command_fn,
-};
-
-static clib_error_t *show_pot_profile_command_fn(vlib_main_t * vm,
-    unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-    pot_main_t *sm = &pot_main;
-    pot_profile *p = NULL;
-    u16 i;
-    u8 *s = 0;
-
-    if (vec_len(sm->profile_list_name) == 0)
-    {
-        s = format(s, "POT Profiles not configured\n");
-        vlib_cli_output(vm, "%v", s);
-        return 0;
-    }
-    s = format(s, "Profile list in use  : %s\n",sm->profile_list_name);
-    for (i = 0; i < MAX_POT_PROFILES; i++)
-    {
-        p = pot_profile_find(i);
-        if (p->valid == 0)
-            continue;
-        s = format(s, "POT Profile at index: %d\n", i);
-        s = format(s, "                 Id : %d\n", p->id);
-        s = format(s, "          Validator : %s (%d)\n",
-            (p->validator) ? "True" : "False", p->validator);
-        if (p->validator == 1)
-            s = format(s, "         Secret key : 0x%Lx (%Ld)\n",
-                p->secret_key, p->secret_key);
-        s = format(s, "       Secret share : 0x%Lx (%Ld)\n",
-            p->secret_share, p->secret_share);
-        s = format(s, "       Prime number : 0x%Lx (%Ld)\n",
-            p->prime, p->prime);
-        s = format(s, "2nd polynomial(eval) : 0x%Lx (%Ld)\n",
-            p->poly_pre_eval, p->poly_pre_eval);
-        s = format(s, "                 LPC : 0x%Lx (%Ld)\n", p->lpc, p->lpc);
-
-        s = format(s, "           Bit mask : 0x%Lx (%Ld)\n",
-            p->bit_mask, p->bit_mask);
-    }
-
-    p = pot_profile_find(sm->active_profile_id);
-
-    if (p && p->valid && p->in_use) {
-        s = format(s, "\nProfile index in use: %d\n", sm->active_profile_id);
-        s = format(s, "Pkts passed : 0x%Lx (%Ld)\n",
-		   p->total_pkts_using_this_profile,
-		   p->total_pkts_using_this_profile);
-        if (pot_is_decap(p))
-            s = format(s, "  This is Decap node.  \n");
-    } else {
-        s = format(s, "\nProfile index in use: None\n");
-    }
-    vlib_cli_output(vm, "%v", s);
-    vec_free(s);
-
-    return 0;
-}
-
-VLIB_CLI_COMMAND(show_pot_profile_command) =
-{
-.path = "show pot profile",
-.short_help = "show pot profile",
-.function = show_pot_profile_command_fn,
-};
diff --git a/plugins/ioam-plugin/ioam/lib-pot/pot_util.h b/plugins/ioam-plugin/ioam/lib-pot/pot_util.h
deleted file mode 100644
index 9df31fae..00000000
--- a/plugins/ioam-plugin/ioam/lib-pot/pot_util.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/* 
- * pot_util.h -- Proof Of Transit Utility Header
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef include_vnet_pot_util_h
-#define include_vnet_pot_util_h
-
-#include <vnet/ip/ip6_hop_by_hop.h>
-#define debug_ioam debug_ioam_fn
-/* Dont change this size 256. This is there across multiple components */
-#define PATH_NAME_SIZE  256
-
-/* Ring size. this should be same as the one in ODL. Do not change this
-   without change in ODL. */
-#define MAX_POT_PROFILES 2
-
-/**
- * Usage:
- * 
- * On any node that participates in Proof of Transit:
- *
- * Step 1: Initialize this library by calling pot_init()
- * Step 2: Setup a proof of transit  profile that contains all the parameters needed to compute cumulative:
- *         Call these functions:
- *         pot_profile_find
- *         pot_profile_create
- *         pot_profile_set_bit_mask - To setup how large we want the numbers used in the computation and random number <= 64 bits
- * Step 2a: For validator do this:
- *          pot_set_validator
- * Step 2b: On initial node enable the profile to be used:
- *          pot_profile_set_active / pot_profile_get_active will return the profile
- * Step 3a: At the initial node to generate Random number that will be read by all other nodes:
- *          pot_generate_random
- * Step 3b: At all nodes including initial and verifier call this to compute cumulative:
- *          pot_update_cumulative
- * Step 4: At the verifier:
- *         pot_validate
- * 
- */
-
-typedef struct pot_profile_
-{
-    u8 id : 1;
-    u8 valid : 1;
-    u8 in_use : 1;
-    u64 random;
-    u8 validator;
-    u64 secret_key;
-    u64 secret_share;
-    u64 prime;
-    u64 lpc;
-    u64 poly_pre_eval;
-    u64 bit_mask;
-    u64 limit;
-    double primeinv;
-    u64 total_pkts_using_this_profile;
-} pot_profile;
-
-typedef struct {
-    /* Name of the default profile list in use*/
-    u8 *profile_list_name;
-    pot_profile profile_list[MAX_POT_PROFILES];
-    /* number of profiles in the list */
-    u8 active_profile_id : 1;
-
-    /* API message ID base */
-    u16 msg_id_base;
-
-    /* convenience */
-    vlib_main_t * vlib_main;
-    vnet_main_t * vnet_main;
-} pot_main_t;
-
-extern pot_main_t pot_main;
-
-/* 
- * Initialize proof of transit
- */
-int pot_util_init(void);
-void pot_profile_list_init(u8 * name);
-
-
-/* 
- * Find a pot profile by ID
- */
-pot_profile *pot_profile_find(u8 id);
-
-static inline u16 pot_profile_get_id(pot_profile * profile)
-{
-    if (profile)
-    {
-        return (profile->id);
-    }
-    return (0);
-}
-
-/* setup and clean up profile */
-int pot_profile_create(pot_profile * profile, u64 prime,
-    u64 poly2, u64 lpc, u64 secret_share);
-/* 
- * Setup profile as a validator
- */
-int pot_set_validator(pot_profile * profile, u64 key);
-
-/* 
- * Setup max bits to be used for random number generation
- */
-#define MAX_BITS 64
-int pot_profile_set_bit_mask(pot_profile * profile, u16 bits);
-
-/* 
- * Given a random and cumulative compute the new cumulative for a given profile
- */
-u64 pot_update_cumulative(pot_profile * profile, u64 cumulative, u64 random);
-
-/* 
- * return True if the cumulative matches secret from a profile
- */
-u8 pot_validate(pot_profile * profile, u64 cumulative, u64 random);
-
-/* 
- * Utility function to get random number per pack
- */
-u64 pot_generate_random(pot_profile * profile);
-
-
-extern void clear_pot_profiles();
-extern int pot_profile_list_is_enabled(u8 *name);
-
-static inline u8 pot_is_decap(pot_profile * p)
-{
-    return (p->validator == 1);
-}
-
-static inline int pot_profile_set_active (u8 id)
-{
-    pot_main_t *sm = &pot_main;
-    pot_profile *profile = NULL;
-    pot_profile *current_active_prof = NULL;
-
-    current_active_prof = pot_profile_find(sm->active_profile_id);
-    profile = pot_profile_find(id);
-    if (profile && profile->valid) {
-        sm->active_profile_id = id;
-	current_active_prof->in_use = 0;
-	profile->in_use = 1;
-	return(0);
-    }
-    return(-1);
-}
-static inline u8 pot_profile_get_active_id (void)
-{
-    pot_main_t *sm = &pot_main;
-    return (sm->active_profile_id);
-}
-
-static inline pot_profile * pot_profile_get_active (void)
-{
-    pot_main_t *sm = &pot_main;
-    pot_profile *profile = NULL;
-    profile = pot_profile_find(sm->active_profile_id);
-    if (profile && profile->in_use)
-        return(profile);
-    return (NULL);
-}
-
-static inline void pot_profile_reset_usage_stats (pot_profile *pow)
-{
-  if (pow) {
-    pow->total_pkts_using_this_profile = 0;
-  }
-}
-
-static inline void pot_profile_incr_usage_stats (pot_profile *pow)
-{
-  if (pow) {
-    pow->total_pkts_using_this_profile++;
-  }
-}
-
-
-#endif
diff --git a/plugins/ioam-plugin/ioam/lib-trace/jvpp_ioam_trace.c b/plugins/ioam-plugin/ioam/lib-trace/jvpp_ioam_trace.c
deleted file mode 100644
index 1d878ea3..00000000
--- a/plugins/ioam-plugin/ioam/lib-trace/jvpp_ioam_trace.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-
-#include <ioam/lib-trace/trace_msg_enum.h>
-#define vl_typedefs             /* define message structures */
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_api_version
-
-#include <vnet/api_errno.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-
-#if VPPJNI_DEBUG == 1
-  #define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
-#else
-  #define DEBUG_LOG(...)
-#endif
-
-#include <jvpp-common/jvpp_common.h>
-
-#include "ioam/jvpp/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h"
-#include "jvpp_ioam_trace.h"
-#include "ioam/jvpp/jvpp_ioam_trace_gen.h"
-
-/*
- * Class:     io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl
- * Method:    init0
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl_init0
-  (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
-  ioamtrace_main_t * plugin_main = &ioamtrace_main;
-  u8 * name;
-  clib_warning ("Java_io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl_init0");
-
-  plugin_main->my_client_index = my_client_index;
-  plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
-
-  name = format (0, "ioam_trace_%08x%c", api_version, 0);
-  plugin_main->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (plugin_main->msg_id_base == (u16) ~0) {
-    jclass exClass = (*env)->FindClass(env, "java/lang/IllegalStateException");
-    (*env)->ThrowNew(env, exClass, "ioam_trace plugin is not loaded in VPP");
-  } else {
-    plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
-    plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
-
-    #define _(N,n)                                  \
-        vl_msg_api_set_handlers(VL_API_##N + plugin_main->msg_id_base, #n,     \
-                vl_api_##n##_t_handler,             \
-                vl_noop_handler,                    \
-                vl_api_##n##_t_endian,              \
-                vl_api_##n##_t_print,               \
-                sizeof(vl_api_##n##_t), 1);
-        foreach_api_reply_handler;
-    #undef _
-  }
-}
-
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl_close0
-(JNIEnv *env, jclass clazz) {
-  ioamtrace_main_t * plugin_main = &ioamtrace_main;
-
-    // cleanup:
-    (*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
-    (*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
-
-    plugin_main->callbackClass = NULL;
-    plugin_main->callbackObject = NULL;
-}
-
-/* Attach thread to JVM and cache class references when initiating JVPP iOAM Trace */
-jint JNI_OnLoad(JavaVM *vm, void *reserved) {
-    JNIEnv* env;
-
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return JNI_EVERSION;
-    }
-
-    if (cache_class_references(env) != 0) {
-        clib_warning ("Failed to cache class references\n");
-        return JNI_ERR;
-    }
-
-    return JNI_VERSION_1_8;
-}
-
-/* Clean up cached references when disposing JVPP iOAM Trace */
-void JNI_OnUnload(JavaVM *vm, void *reserved) {
-    JNIEnv* env;
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return;
-    }
-    delete_class_references(env);
-}
diff --git a/plugins/ioam-plugin/ioam/lib-trace/jvpp_ioam_trace.h b/plugins/ioam-plugin/ioam/lib-trace/jvpp_ioam_trace.h
deleted file mode 100644
index 9fc16c15..00000000
--- a/plugins/ioam-plugin/ioam/lib-trace/jvpp_ioam_trace.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_jvpp_ioam_trace_h__
-#define __included_jvpp_ioam_trace_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/api_errno.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <jni.h>
-
-/* Global state for JVPP-IOAM-TRACE */
-typedef struct {
-    /* Base message index for the trace plugin */
-    u16 msg_id_base;
-
-    /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
-
-    /* VPP api client index */
-    u32 my_client_index;
-
-    /* Callback object and class references enabling asynchronous Java calls */
-    jobject callbackObject;
-    jclass callbackClass;
-
-} ioamtrace_main_t;
-
-ioamtrace_main_t ioamtrace_main __attribute__((aligned (64)));
-
-
-#endif /* __included_jvpp_ioam_trace_h__ */
diff --git a/plugins/ioam-plugin/ioam/lib-trace/trace.api b/plugins/ioam-plugin/ioam/lib-trace/trace.api
deleted file mode 100644
index cb958325..00000000
--- a/plugins/ioam-plugin/ioam/lib-trace/trace.api
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Hey Emacs use -*- mode: C -*- */
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/** \brief iOAM6 Trace - Set the iOAM6 trace profile
-    @param trace_type - Type of trace requested
-    @param num_elts - Number of trace elements to be inserted
-    @param node_id - Trace Node ID
-    @param trace_tsp- Timestamp resolution
-    @param app_data - Application specific opaque
-*/
-define trace_profile_add {
-  u32 client_index;
-  u32 context;
-  u8 trace_type;
-  u8 num_elts;
-  u8 trace_tsp;
-  u32 node_id;
-  u32 app_data;
-};
-
-/** \brief Trace profile add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define trace_profile_add_reply {
-    u32 context;
-    i32 retval;
-};
-
-
-
-/** \brief Delete trace Profile
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define trace_profile_del {
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Trace profile add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define trace_profile_del_reply {
-    u32 context;
-    i32 retval;
-};
-
-
-
-/** \brief Show trace Profile
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define trace_profile_show_config {
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Show trace config response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-    @param trace_type - Type of trace requested
-    @param num_elts - Number of trace elements to be inserted
-    @param node_id - Trace Node ID
-    @param trace_tsp- Timestamp resolution
-    @param app_data - Application specific opaque
-*/
-define trace_profile_show_config_reply {
-  u32 context;
-  i32 retval;
-  u8 trace_type;
-  u8 num_elts;
-  u8 trace_tsp;
-  u32 node_id;
-  u32 app_data;
-};
diff --git a/plugins/ioam-plugin/ioam/lib-trace/trace_all_api_h.h b/plugins/ioam-plugin/ioam/lib-trace/trace_all_api_h.h
deleted file mode 100644
index 223f9545..00000000
--- a/plugins/ioam-plugin/ioam/lib-trace/trace_all_api_h.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Include the generated file, see BUILT_SOURCES in Makefile.am */
-#include <ioam/lib-trace/trace.api.h>
diff --git a/plugins/ioam-plugin/ioam/lib-trace/trace_api.c b/plugins/ioam-plugin/ioam/lib-trace/trace_api.c
deleted file mode 100644
index 7e0d708e..00000000
--- a/plugins/ioam-plugin/ioam/lib-trace/trace_api.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * trace_api.c - iOAM Trace related APIs to create
- *               and maintain profiles
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vnet/plugin/plugin.h>
-#include <ioam/lib-trace/trace_util.h>
-
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-
-/* define message IDs */
-#include <ioam/lib-trace/trace_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_api_version
-
-/*
- * A handy macro to set up a message reply.
- * Assumes that the following variables are available:
- * mp - pointer to request message
- * rmp - pointer to reply message type
- * rv - return value
- */
-
-#define TRACE_REPLY_MACRO(t)                                          \
-do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
-    vl_api_client_index_to_input_queue (mp->client_index);      \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-                                                                \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-/* *INDENT-OFF* */
-#define TRACE_REPLY_MACRO2(t, body)                                   \
-do {                                                            \
-    unix_shared_memory_queue_t * q;                             \
-    rv = vl_msg_api_pd_handler (mp, rv);                        \
-    q = vl_api_client_index_to_input_queue (mp->client_index);  \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-    do {body;} while (0);                                       \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-/* *INDENT-ON* */
-
-/* List of message types that this plugin understands */
-
-#define foreach_trace_plugin_api_msg                                      \
-_(TRACE_PROFILE_ADD, trace_profile_add)                                     \
-_(TRACE_PROFILE_DEL, trace_profile_del)                                     \
-_(TRACE_PROFILE_SHOW_CONFIG, trace_profile_show_config)
-
-static void vl_api_trace_profile_add_t_handler
-  (vl_api_trace_profile_add_t * mp)
-{
-  trace_main_t *sm = &trace_main;
-  int rv = 0;
-  vl_api_trace_profile_add_reply_t *rmp;
-  trace_profile *profile = NULL;
-
-  profile = trace_profile_find ();
-  if (profile)
-    {
-      rv =
-	trace_profile_create (profile, mp->trace_type, mp->num_elts,
-			      mp->trace_tsp, ntohl (mp->node_id),
-			      ntohl (mp->app_data));
-      if (rv != 0)
-	goto ERROROUT;
-    }
-  else
-    {
-      rv = -3;
-    }
-ERROROUT:
-  TRACE_REPLY_MACRO (VL_API_TRACE_PROFILE_ADD_REPLY);
-}
-
-
-static void vl_api_trace_profile_del_t_handler
-  (vl_api_trace_profile_del_t * mp)
-{
-  trace_main_t *sm = &trace_main;
-  int rv = 0;
-  vl_api_trace_profile_del_reply_t *rmp;
-
-  clear_trace_profiles ();
-
-  TRACE_REPLY_MACRO (VL_API_TRACE_PROFILE_DEL_REPLY);
-}
-
-static void vl_api_trace_profile_show_config_t_handler
-  (vl_api_trace_profile_show_config_t * mp)
-{
-  trace_main_t *sm = &trace_main;
-  vl_api_trace_profile_show_config_reply_t *rmp;
-  int rv = 0;
-  trace_profile *profile = trace_profile_find ();
-  if (profile->valid)
-    {
-      TRACE_REPLY_MACRO2 (VL_API_TRACE_PROFILE_SHOW_CONFIG_REPLY,
-			  rmp->trace_type = profile->trace_type;
-			  rmp->num_elts = profile->num_elts;
-			  rmp->trace_tsp = profile->trace_tsp;
-			  rmp->node_id = htonl (profile->node_id);
-			  rmp->app_data = htonl (profile->app_data);
-	);
-    }
-  else
-    {
-      TRACE_REPLY_MACRO2 (VL_API_TRACE_PROFILE_SHOW_CONFIG_REPLY,
-			  rmp->trace_type = 0;
-			  rmp->num_elts = 0; rmp->trace_tsp = 0;
-			  rmp->node_id = 0; rmp->app_data = 0;
-	);
-    }
-}
-
-/*
- * This routine exists to convince the vlib plugin framework that
- * we haven't accidentally copied a random .dll into the plugin directory.
- *
- * Also collects global variable pointers passed from the vpp engine
- */
-
-clib_error_t *
-vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
-		      int from_early_init)
-{
-  trace_main_t *sm = &trace_main;
-  clib_error_t *error = 0;
-
-  sm->vlib_main = vm;
-  sm->vnet_main = h->vnet_main;
-  return error;
-}
-
-/* Set up the API message handling tables */
-static clib_error_t *
-trace_plugin_api_hookup (vlib_main_t * vm)
-{
-  trace_main_t *sm = &trace_main;
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,					\
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_trace_plugin_api_msg;
-#undef _
-
-  return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (trace_main_t * sm, api_main_t * am)
-{
-#define _(id,n,crc) \
-  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
-  foreach_vl_msg_name_crc_trace;
-#undef _
-}
-
-static clib_error_t *
-trace_init (vlib_main_t * vm)
-{
-  trace_main_t *sm = &trace_main;
-  clib_error_t *error = 0;
-  u8 *name;
-
-  bzero (sm, sizeof (trace_main));
-  (void) trace_util_init ();
-  name = format (0, "ioam_trace_%08x%c", api_version, 0);
-
-  /* Ask for a correctly-sized block of API message decode slots */
-  sm->msg_id_base = vl_msg_api_get_msg_ids
-    ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-  error = trace_plugin_api_hookup (vm);
-
-  /* Add our API messages to the global name_crc hash table */
-  setup_message_id_table (sm, &api_main);
-
-  vec_free (name);
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (trace_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/lib-trace/trace_msg_enum.h b/plugins/ioam-plugin/ioam/lib-trace/trace_msg_enum.h
deleted file mode 100644
index 78c35665..00000000
--- a/plugins/ioam-plugin/ioam/lib-trace/trace_msg_enum.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_trace_msg_enum_h
-#define included_trace_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <ioam/lib-trace/trace_all_api_h.h>
-    /* We'll want to know how many messages IDs we need... */
-    VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* included_trace_msg_enum_h */
diff --git a/plugins/ioam-plugin/ioam/lib-trace/trace_test.c b/plugins/ioam-plugin/ioam/lib-trace/trace_test.c
deleted file mode 100644
index 111dd461..00000000
--- a/plugins/ioam-plugin/ioam/lib-trace/trace_test.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * trace_test.c - test harness for trace plugin
- *------------------------------------------------------------------
- */
-
-#include <vat/vat.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-#include <vppinfra/error.h>
-
-/* Declare message IDs */
-#include <ioam/lib-trace/trace_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun		/* define message structures */
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number. */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_api_version
-
-
-typedef struct
-{
-  /* API message ID base */
-  u16 msg_id_base;
-  vat_main_t *vat_main;
-} trace_test_main_t;
-
-trace_test_main_t trace_test_main;
-
-#define foreach_standard_reply_retval_handler     \
-_(trace_profile_add_reply)                          \
-_(trace_profile_del_reply)
-
-#define foreach_custom_reply_handler     \
-_(trace_profile_show_config_reply,										\
-  if(mp->trace_type)												\
-  {														\
-     errmsg("                        Trace Type : 0x%x (%d)\n",mp->trace_type, mp->trace_type);			\
-     errmsg("         Trace timestamp precision : %d \n",mp->trace_tsp);					\
-     errmsg("                           Node Id : 0x%x (%d)\n",htonl(mp->node_id), htonl(mp->node_id));		\
-     errmsg("                          App Data : 0x%x (%d)\n",htonl(mp->app_data), htonl(mp->app_data));	\
-  }														\
-    else errmsg("No valid trace profile configuration found\n");)
-#define _(n)                                            \
-    static void vl_api_##n##_t_handler                  \
-    (vl_api_##n##_t * mp)                               \
-    {                                                   \
-        vat_main_t * vam = trace_test_main.vat_main;   \
-        i32 retval = ntohl(mp->retval);                 \
-        if (vam->async_mode) {                          \
-            vam->async_errors += (retval < 0);          \
-        } else {                                        \
-            vam->retval = retval;                       \
-            vam->result_ready = 1;                      \
-        }                                               \
-    }
-foreach_standard_reply_retval_handler;
-#undef _
-
-#define _(n,body)                                       \
-    static void vl_api_##n##_t_handler                  \
-    (vl_api_##n##_t * mp)                               \
-    {                                                   \
-        vat_main_t * vam = trace_test_main.vat_main;    \
-        i32 retval = ntohl(mp->retval);                 \
-        if (vam->async_mode) {                          \
-            vam->async_errors += (retval < 0);          \
-        } else {                                        \
-            vam->retval = retval;                       \
-            vam->result_ready = 1;                      \
-        }                                               \
-	if(retval>=0)do{body;} while(0);                 \
-	else errmsg("Error, retval: %d",retval);        \
-    }
-foreach_custom_reply_handler;
-#undef _
-/*
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg                                       \
-_(TRACE_PROFILE_ADD_REPLY, trace_profile_add_reply)                         \
-_(TRACE_PROFILE_DEL_REPLY, trace_profile_del_reply)                         \
-_(TRACE_PROFILE_SHOW_CONFIG_REPLY, trace_profile_show_config_reply)
-
-
-/* M: construct, but don't yet send a message */
-
-#define M(T,t)                                                  \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp));                         \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-#define M2(T,t,n)                                               \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W                                       \
-do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
-                                                \
-    while (vat_time_now (vam) < timeout) {      \
-        if (vam->result_ready == 1) {           \
-            return (vam->retval);               \
-        }                                       \
-    }                                           \
-    return -99;                                 \
-} while(0);
-
-
-static int
-api_trace_profile_add (vat_main_t * vam)
-{
-  trace_test_main_t *sm = &trace_test_main;
-  unformat_input_t *input = vam->input;
-  vl_api_trace_profile_add_t *mp;
-  u8 trace_type = 0;
-  u8 num_elts = 0;
-  int rv = 0;
-  u32 node_id = 0;
-  u32 app_data = 0;
-  u8 trace_tsp = 0;
-  f64 timeout;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "trace-type 0x%x", &trace_type))
-	;
-      else if (unformat (input, "trace-elts %d", &num_elts))
-	;
-      else if (unformat (input, "trace-tsp %d", &trace_tsp))
-	;
-      else if (unformat (input, "node-id 0x%x", &node_id))
-	;
-      else if (unformat (input, "app-data 0x%x", &app_data))
-	;
-
-      else
-	break;
-    }
-
-
-  M (TRACE_PROFILE_ADD, trace_profile_add);
-
-  mp->trace_type = trace_type;
-  mp->trace_tsp = trace_tsp;
-  mp->node_id = htonl (node_id);
-  mp->app_data = htonl (app_data);
-  mp->num_elts = num_elts;
-
-  S;
-  W;
-
-  return (rv);
-}
-
-
-
-static int
-api_trace_profile_del (vat_main_t * vam)
-{
-  trace_test_main_t *sm = &trace_test_main;
-  vl_api_trace_profile_del_t *mp;
-  f64 timeout;
-
-  M (TRACE_PROFILE_DEL, trace_profile_del);
-  S;
-  W;
-  return 0;
-}
-
-static int
-api_trace_profile_show_config (vat_main_t * vam)
-{
-  trace_test_main_t *sm = &trace_test_main;
-  vl_api_trace_profile_show_config_t *mp;
-  f64 timeout;
-  M (TRACE_PROFILE_SHOW_CONFIG, trace_profile_show_config);
-  S;
-  W;
-  return 0;
-}
-
-/*
- * List of messages that the api test plugin sends,
- * and that the data plane plugin processes
- */
-#define foreach_vpe_api_msg \
-_(trace_profile_add, ""\
-  "trace-type <0x1f|0x3|0x9|0x11|0x19> trace-elts <nn> trace-tsp <0|1|2|3> node-id <node id in hex> app-data <app_data in hex>")  \
-_(trace_profile_del, "[id <nn>]")                    \
-_(trace_profile_show_config, "[id <nn>]")
-
-
-void
-vat_api_hookup (vat_main_t * vam)
-{
-  trace_test_main_t *sm = &trace_test_main;
-  /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,                                  \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_reply_msg;
-#undef _
-
-  /* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
-  foreach_vpe_api_msg;
-#undef _
-
-  /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
-  foreach_vpe_api_msg;
-#undef _
-}
-
-clib_error_t *
-vat_plugin_register (vat_main_t * vam)
-{
-  trace_test_main_t *sm = &trace_test_main;
-  u8 *name;
-
-  sm->vat_main = vam;
-
-  name = format (0, "ioam_trace_%08x%c", api_version, 0);
-  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (sm->msg_id_base != (u16) ~ 0)
-    vat_api_hookup (vam);
-
-  vec_free (name);
-
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/lib-trace/trace_util.c b/plugins/ioam-plugin/ioam/lib-trace/trace_util.c
deleted file mode 100644
index 5c7f1eef..00000000
--- a/plugins/ioam-plugin/ioam/lib-trace/trace_util.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/vnet.h>
-#include <stdint.h>
-#include <time.h>
-#include <string.h>
-#include <vppinfra/mem.h>
-#include "trace_util.h"
-
-trace_main_t trace_main;
-
-static int
-trace_profile_cleanup (trace_profile * profile)
-{
-
-  memset (profile, 0, sizeof (trace_profile));
-  profile->trace_tsp = TSP_MICROSECONDS;	/* Micro seconds */
-  ip6_trace_profile_cleanup ();	/* lib-trace_TODO: Remove this once IOAM-IPv6 transport is a plugin */
-  return 0;
-
-}
-
-static int
-trace_main_profiles_reset (void)
-{
-  int rv;
-
-  trace_main_t *sm = &trace_main;
-  rv = trace_profile_cleanup (&(sm->profile));
-  return (rv);
-}
-
-int
-trace_util_init (void)
-{
-  int rv;
-
-  rv = trace_main_profiles_reset ();
-  return (rv);
-}
-
-
-int
-trace_profile_create (trace_profile * profile, u8 trace_type, u8 num_elts,
-		      u32 trace_tsp, u32 node_id, u32 app_data)
-{
-
-  if (!trace_type || !num_elts || !(node_id))
-    {
-      return (-1);
-    }
-  if (profile && !profile->valid)
-    {
-      //rv = trace_profile_cleanup (profile);
-      profile->trace_type = trace_type;
-      profile->num_elts = num_elts;
-      profile->trace_tsp = trace_tsp;
-      profile->node_id = node_id;
-      profile->app_data = app_data;
-      profile->valid = 1;
-
-      /* lib-trace_TODO: Remove this once IOAM-IPv6 transport is a plugin */
-      ip6_trace_profile_setup ();
-      return (0);
-    }
-
-  return (-1);
-}
-
-
-
-clib_error_t *
-clear_trace_profile_command_fn (vlib_main_t * vm,
-				unformat_input_t * input,
-				vlib_cli_command_t * cmd)
-{
-
-  trace_main_profiles_reset ();
-  return 0;
-}
-
-void
-clear_trace_profiles (void)
-{
-  clear_trace_profile_command_fn (0, 0, 0);
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND(clear_trace_profile_command) =
-{
-.path = "clear ioam-trace profile",
-.short_help = "clear ioam-trace profile [<index>|all]",
-.function = clear_trace_profile_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-set_trace_profile_command_fn (vlib_main_t * vm,
-			      unformat_input_t * input,
-			      vlib_cli_command_t * cmd)
-{
-  u8 trace_type = 0;
-  u8 num_elts = 0;
-  u32 node_id = 0;
-  u32 app_data = 0;
-  u32 trace_tsp = 0;
-  trace_profile *profile = NULL;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "trace-type 0x%x", &trace_type));
-      else if (unformat (input, "trace-elts %d", &num_elts));
-      else if (unformat (input, "trace-tsp %d", &trace_tsp));
-      else if (unformat (input, "node-id 0x%x", &node_id));
-      else if (unformat (input, "app-data 0x%x", &app_data));
-      else
-	break;
-    }
-  profile = trace_profile_find ();
-  if (profile)
-    {
-      trace_profile_create (profile, trace_type, num_elts, trace_tsp,
-			    node_id, app_data);
-    }
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_trace_profile_command, static) =
-{
-.path = "set ioam-trace profile",
-.short_help = "set ioam-trace \
-             trace-type <0x1f|0x3|0x9|0x11|0x19> trace-elts <nn> trace-tsp <0|1|2|3> \
-             node-id <node id in hex> app-data <app_data in hex>",
-.function = set_trace_profile_command_fn,
-};
-/* *INDENT-ON* */
-
-static clib_error_t *
-show_trace_profile_command_fn (vlib_main_t * vm,
-			       unformat_input_t * input,
-			       vlib_cli_command_t * cmd)
-{
-  trace_profile *p = NULL;
-  u8 *s = 0;
-  p = trace_profile_find ();
-  if (!(p && p->valid))
-    {
-      s = format (s, "\nTrace configuration not valid\n");
-      vlib_cli_output (vm, "%v", s);
-      vec_free (s);
-      return 0;
-    }
-  s = format (s, " HOP BY HOP OPTIONS - TRACE CONFIG - \n");
-  s = format (s, "                        Trace Type : 0x%x (%d)\n",
-	      p->trace_type, p->trace_type);
-  s =
-    format (s, "         Trace timestamp precision : %d (%s)\n",
-	    p->trace_tsp,
-	    (p->trace_tsp ==
-	     TSP_SECONDS) ? "Seconds" : ((p->trace_tsp ==
-					  TSP_MILLISECONDS) ?
-					 "Milliseconds"
-					 : (((p->trace_tsp ==
-					      TSP_MICROSECONDS) ?
-					     "Microseconds" :
-					     "Nanoseconds"))));
-  s = format (s, "                Num of trace nodes : %d\n", p->num_elts);
-  s =
-    format (s, "                           Node-id : 0x%x (%d)\n",
-	    p->node_id, p->node_id);
-  s =
-    format (s, "                          App Data : 0x%x (%d)\n",
-	    p->app_data, p->app_data);
-  vlib_cli_output (vm, "%v", s);
-  vec_free (s);
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_trace_profile_command, static) =
-{
-.path = "show ioam-trace profile",
-.short_help = "show ioam-trace profile",
-.function = show_trace_profile_command_fn,
-};
-/* *INDENT-ON* */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/lib-trace/trace_util.h b/plugins/ioam-plugin/ioam/lib-trace/trace_util.h
deleted file mode 100644
index 556f07ee..00000000
--- a/plugins/ioam-plugin/ioam/lib-trace/trace_util.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * trace_util.h -- Trace Profile Utility header
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef include_vnet_trace_util_h
-#define include_vnet_trace_util_h
-
-#define debug_ioam debug_ioam_fn
-
-
-/**
- * Usage:
- *
- * On any node that participates in iOAM Trace.
- *
- * Step 1: Initialize this library by calling trace_init()
- * Step 2: Setup a trace  profile that contains all the parameters needed to compute cumulative:
- *         Call these functions:
- *         trace_profile_find
- *         trace_profile_create
- * Step 2a: On initial node enable the profile to be used:
- *          trace_profile_set_active / trace_profile_get_active will return the profile
- * Step 4: TBD
- *         trace_validate
- *
- */
-
-typedef struct trace_profile_
-{
-  u8 valid:1;
-  u8 trace_type;
-  u8 num_elts;
-  /* Configured node-id */
-  u32 node_id;
-  u32 app_data;
-  u32 trace_tsp;
-} trace_profile;
-
-typedef struct
-{
-  /* Name of the default profile list in use */
-  trace_profile profile;
-
-  /* API message ID base */
-  u16 msg_id_base;
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} trace_main_t;
-
-extern trace_main_t trace_main;
-
-/*
- * Initialize Trace profile
- */
-int trace_util_init (void);
-
-
-/*
- * Find a trace profile
- */
-
-always_inline trace_profile *
-trace_profile_find (void)
-{
-  trace_main_t *sm = &trace_main;
-
-  return (&(sm->profile));
-}
-
-
-/* setup and clean up profile */
-int trace_profile_create (trace_profile * profile, u8 trace_type, u8 num_elts,
-			  u32 trace_tsp, u32 node_id, u32 app_data);
-
-void clear_trace_profiles (void);
-
-
-
-#define    BIT_TTL_NODEID       (1<<0)
-#define    BIT_ING_INTERFACE    (1<<1)
-#define    BIT_EGR_INTERFACE    (1<<2)
-#define    BIT_TIMESTAMP        (1<<3)
-#define    BIT_APPDATA          (1<<4)
-#define    TRACE_TYPE_MASK      0x1F	/* Mask of all above bits */
-
-/*
-     0x00011111  iOAM-trace-type is 0x00011111 then the format of node
-        data is:
-
-          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |   Hop_Lim     |              node_id                          |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |     ingress_if_id             |         egress_if_id          |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         +                           timestamp                           +
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |                            app_data                           |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-*/
-#define   TRACE_TYPE_IF_TS_APP   0x1f
-typedef struct
-{
-  u32 ttl_node_id;
-  u16 ingress_if;
-  u16 egress_if;
-  u32 timestamp;
-  u32 app_data;
-} ioam_trace_if_ts_app_t;
-
-/*
-     0x00000111  iOAM-trace-type is 0x00000111 then the format is:
-
-          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |   Hop_Lim     |              node_id                          |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |     ingress_if_id             |         egress_if_id          |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-*/
-
-#define   TRACE_TYPE_IF   0x03
-typedef struct
-{
-  u32 ttl_node_id;
-  u16 ingress_if;
-  u16 egress_if;
-} ioam_trace_if_t;
-
-/*
-     0x00001001  iOAM-trace-type is 0x00001001 then the format is:
-
-          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |   Hop_Lim     |              node_id                          |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         +                           timestamp                           +
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-*/
-
-#define   TRACE_TYPE_TS   0x09
-typedef struct
-{
-  u32 ttl_node_id;
-  u32 timestamp;
-} ioam_trace_ts_t;
-
-/*
-     0x00010001  iOAM-trace-type is 0x00010001 then the format is:
-
-
-          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |   Hop_Lim     |              node_id                          |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |                            app_data                           |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-*/
-
-
-#define   TRACE_TYPE_APP   0x11
-typedef struct
-{
-  u32 ttl_node_id;
-  u32 app_data;
-} ioam_trace_app_t;
-
-/*
-
-     0x00011001  iOAM-trace-type is 0x00011001 then the format is:
-
-          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |   Hop_Lim     |              node_id                          |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         +                           timestamp                           +
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |                            app_data                           |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-*/
-
-#define   TRACE_TYPE_TS_APP   0x19
-typedef struct
-{
-  u32 ttl_node_id;
-  u32 timestamp;
-  u32 app_data;
-} ioam_trace_ts_app_t;
-
-
-
-static inline u8
-fetch_trace_data_size (u8 trace_type)
-{
-  u8 trace_data_size = 0;
-
-  if (trace_type == TRACE_TYPE_IF_TS_APP)
-    trace_data_size = sizeof (ioam_trace_if_ts_app_t);
-  else if (trace_type == TRACE_TYPE_IF)
-    trace_data_size = sizeof (ioam_trace_if_t);
-  else if (trace_type == TRACE_TYPE_TS)
-    trace_data_size = sizeof (ioam_trace_ts_t);
-  else if (trace_type == TRACE_TYPE_APP)
-    trace_data_size = sizeof (ioam_trace_app_t);
-  else if (trace_type == TRACE_TYPE_TS_APP)
-    trace_data_size = sizeof (ioam_trace_ts_app_t);
-
-  return trace_data_size;
-}
-
-int ioam_trace_get_sizeof_handler (u32 * result);
-int ip6_trace_profile_setup (void);
-int ip6_trace_profile_cleanup (void);
-
-#define TSP_SECONDS              0
-#define TSP_MILLISECONDS         1
-#define TSP_MICROSECONDS         2
-#define TSP_NANOSECONDS          3
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_decap.c b/plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_decap.c
deleted file mode 100644
index fd308657..00000000
--- a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_decap.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h>
-
-/* Statistics (not really errors) */
-#define foreach_vxlan_gpe_decap_ioam_v4_error    \
-_(DECAPSULATED, "good packets decapsulated")
-
-static char *vxlan_gpe_decap_ioam_v4_error_strings[] = {
-#define _(sym,string) string,
-  foreach_vxlan_gpe_decap_ioam_v4_error
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) VXLAN_GPE_DECAP_IOAM_V4_ERROR_##sym,
-  foreach_vxlan_gpe_decap_ioam_v4_error
-#undef _
-    VXLAN_GPE_DECAP_IOAM_V4_N_ERROR,
-} vxlan_gpe_decap_ioam_v4_error_t;
-
-
-always_inline void
-vxlan_gpe_decap_ioam_v4_two_inline (vlib_main_t * vm,
-				    vlib_node_runtime_t * node,
-				    vxlan_gpe_main_t * ngm,
-				    vlib_buffer_t * b0, vlib_buffer_t * b1,
-				    u32 * next0, u32 * next1)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-
-  next0[0] = next1[0] = hm->decap_v4_next_override;
-  vxlan_gpe_encap_decap_ioam_v4_one_inline (vm, node, b0, &next0[0],
-					    VXLAN_GPE_DECAP_IOAM_V4_NEXT_DROP,
-					    0 /* use_adj */ );
-  vxlan_gpe_encap_decap_ioam_v4_one_inline (vm, node, b1, &next0[1],
-					    VXLAN_GPE_DECAP_IOAM_V4_NEXT_DROP,
-					    0 /* use_adj */ );
-}
-
-
-
-static uword
-vxlan_gpe_decap_ioam (vlib_main_t * vm,
-		      vlib_node_runtime_t * node,
-		      vlib_frame_t * from_frame, u8 is_ipv6)
-{
-  u32 n_left_from, next_index, *from, *to_next;
-  vxlan_gpe_main_t *ngm = &vxlan_gpe_main;
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-
-	  next0 = next1 = hm->decap_v4_next_override;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
-	    CLIB_PREFETCH (p3->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-
-	  vlib_buffer_advance (b0,
-			       -(word) (sizeof (udp_header_t) +
-					sizeof (ip4_header_t) +
-					sizeof (vxlan_gpe_header_t)));
-	  vlib_buffer_advance (b1,
-			       -(word) (sizeof (udp_header_t) +
-					sizeof (ip4_header_t) +
-					sizeof (vxlan_gpe_header_t)));
-
-	  vxlan_gpe_decap_ioam_v4_two_inline (vm, node, ngm, b0, b1,
-					      &next0, &next1);
-
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, bi1, next0,
-					   next1);
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      vxlan_gpe_ioam_v4_trace_t *tr = vlib_add_trace (vm, node, b0,
-							      sizeof (*tr));
-	    }
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0 = hm->decap_v4_next_override;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-
-	  vlib_buffer_advance (b0,
-			       -(word) (sizeof (udp_header_t) +
-					sizeof (ip4_header_t) +
-					sizeof (vxlan_gpe_header_t)));
-
-	  next0 = hm->decap_v4_next_override;
-	  vxlan_gpe_encap_decap_ioam_v4_one_inline (vm, node, b0,
-						    &next0,
-						    VXLAN_GPE_DECAP_IOAM_V4_NEXT_DROP,
-						    0 /* use_adj */ );
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      vxlan_gpe_ioam_v4_trace_t *tr = vlib_add_trace (vm, node, b0,
-							      sizeof (*tr));
-	    }
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-
-static uword
-vxlan_gpe_decap_ioam_v4 (vlib_main_t * vm,
-			 vlib_node_runtime_t * node,
-			 vlib_frame_t * from_frame)
-{
-  return vxlan_gpe_decap_ioam (vm, node, from_frame, 0);
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (vxlan_gpe_decap_ioam_v4_node) = {
-  .function = vxlan_gpe_decap_ioam_v4,
-  .name = "vxlan-gpe-decap-ioam-v4",
-  .vector_size = sizeof (u32),
-  .format_trace = format_vxlan_gpe_ioam_v4_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(vxlan_gpe_decap_ioam_v4_error_strings),
-  .error_strings = vxlan_gpe_decap_ioam_v4_error_strings,
-
-  .n_next_nodes = VXLAN_GPE_DECAP_IOAM_V4_N_NEXT,
-
-  .next_nodes = {
-    [VXLAN_GPE_DECAP_IOAM_V4_NEXT_POP] = "vxlan-gpe-pop-ioam-v4",
-    [VXLAN_GPE_DECAP_IOAM_V4_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_encap.c b/plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_encap.c
deleted file mode 100644
index 4b18bfea..00000000
--- a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_encap.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h>
-
-/* Statistics (not really errors) */
-#define foreach_vxlan_gpe_encap_ioam_v4_error    \
-_(ENCAPSULATED, "good packets encapsulated")
-
-static char *vxlan_gpe_encap_ioam_v4_error_strings[] = {
-#define _(sym,string) string,
-  foreach_vxlan_gpe_encap_ioam_v4_error
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) VXLAN_GPE_ENCAP_IOAM_V4_ERROR_##sym,
-  foreach_vxlan_gpe_encap_ioam_v4_error
-#undef _
-    VXLAN_GPE_ENCAP_IOAM_V4_N_ERROR,
-} vxlan_gpe_encap_ioam_v4_error_t;
-
-typedef enum
-{
-  VXLAN_GPE_ENCAP_IOAM_V4_NEXT_IP4_LOOKUP,
-  VXLAN_GPE_ENCAP_IOAM_V4_NEXT_DROP,
-  VXLAN_GPE_ENCAP_IOAM_V4_N_NEXT
-} vxlan_gpe_encap_ioam_v4_next_t;
-
-
-always_inline void
-vxlan_gpe_encap_ioam_v4_two_inline (vlib_main_t * vm,
-				    vlib_node_runtime_t * node,
-				    vxlan_gpe_main_t * ngm,
-				    vlib_buffer_t * b0, vlib_buffer_t * b1,
-				    u32 * next0, u32 * next1)
-{
-  next0[0] = next1[0] = VXLAN_GPE_ENCAP_IOAM_V4_NEXT_IP4_LOOKUP;
-  vxlan_gpe_encap_decap_ioam_v4_one_inline (vm, node, b0, next0,
-					    VXLAN_GPE_ENCAP_IOAM_V4_NEXT_DROP,
-					    0 /* use_adj */ );
-  vxlan_gpe_encap_decap_ioam_v4_one_inline (vm, node, b1, next1,
-					    VXLAN_GPE_ENCAP_IOAM_V4_NEXT_DROP,
-					    0 /* use_adj */ );
-}
-
-
-static uword
-vxlan_gpe_encap_ioam_v4 (vlib_main_t * vm,
-			 vlib_node_runtime_t * node,
-			 vlib_frame_t * from_frame)
-{
-  u32 n_left_from, next_index, *from, *to_next;
-  vxlan_gpe_main_t *ngm = &vxlan_gpe_main;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-
-	  next0 = next1 = VXLAN_GPE_ENCAP_IOAM_V4_NEXT_IP4_LOOKUP;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
-	    CLIB_PREFETCH (p3->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  vxlan_gpe_encap_ioam_v4_two_inline (vm, node, ngm, b0, b1,
-					      &next0, &next1);
-
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, bi1, next0,
-					   next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0 = VXLAN_GPE_ENCAP_IOAM_V4_NEXT_IP4_LOOKUP;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  vxlan_gpe_encap_decap_ioam_v4_one_inline (vm, node, b0,
-						    &next0,
-						    VXLAN_GPE_ENCAP_IOAM_V4_NEXT_DROP,
-						    0 /* use_adj */ );
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      vxlan_gpe_ioam_v4_trace_t *tr = vlib_add_trace (vm, node, b0,
-							      sizeof (*tr));
-	    }
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (vxlan_gpe_encap_ioam_v4_node) = {
-  .function = vxlan_gpe_encap_ioam_v4,
-  .name = "vxlan-gpe-encap-ioam-v4",
-  .vector_size = sizeof (u32),
-  .format_trace = format_vxlan_gpe_ioam_v4_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(vxlan_gpe_encap_ioam_v4_error_strings),
-  .error_strings = vxlan_gpe_encap_ioam_v4_error_strings,
-
-  .n_next_nodes = VXLAN_GPE_ENCAP_IOAM_V4_N_NEXT,
-
-  .next_nodes = {
-    [VXLAN_GPE_ENCAP_IOAM_V4_NEXT_IP4_LOOKUP] = "ip4-lookup",
-    [VXLAN_GPE_ENCAP_IOAM_V4_NEXT_DROP] = "error-drop",
-  },
-};
-/* *INDENT-ON* */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_pop.c b/plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_pop.c
deleted file mode 100644
index 55c33b14..00000000
--- a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_pop.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
-
-/* Statistics (not really errors) */
-#define foreach_vxlan_gpe_pop_ioam_v4_error    \
-_(POPPED, "good packets popped")
-
-static char *vxlan_gpe_pop_ioam_v4_error_strings[] = {
-#define _(sym,string) string,
-  foreach_vxlan_gpe_pop_ioam_v4_error
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) VXLAN_GPE_POP_IOAM_V4_ERROR_##sym,
-  foreach_vxlan_gpe_pop_ioam_v4_error
-#undef _
-    VXLAN_GPE_POP_IOAM_V4_N_ERROR,
-} vxlan_gpe_pop_ioam_v4_error_t;
-
-typedef struct
-{
-  ioam_trace_t fmt_trace;
-} vxlan_gpe_pop_ioam_v4_trace_t;
-
-
-u8 *
-format_vxlan_gpe_pop_ioam_v4_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  vxlan_gpe_pop_ioam_v4_trace_t *t1
-    = va_arg (*args, vxlan_gpe_pop_ioam_v4_trace_t *);
-  ioam_trace_t *t = &(t1->fmt_trace);
-  vxlan_gpe_ioam_option_t *fmt_trace0;
-  vxlan_gpe_ioam_option_t *opt0, *limit0;
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-
-  u8 type0;
-
-  fmt_trace0 = (vxlan_gpe_ioam_option_t *) t->option_data;
-
-  s = format (s, "VXLAN_GPE_IOAM_POP: next_index %d len %d traced %d",
-	      t->next_index, fmt_trace0->length, t->trace_len);
-
-  opt0 = (vxlan_gpe_ioam_option_t *) (fmt_trace0 + 1);
-  limit0 = (vxlan_gpe_ioam_option_t *) ((u8 *) fmt_trace0) + t->trace_len;
-
-  while (opt0 < limit0)
-    {
-      type0 = opt0->type;
-      switch (type0)
-	{
-	case 0:		/* Pad, just stop */
-	  opt0 = (vxlan_gpe_ioam_option_t *) ((u8 *) opt0) + 1;
-	  break;
-
-	default:
-	  if (hm->trace[type0])
-	    {
-	      s = (*hm->trace[type0]) (s, opt0);
-	    }
-	  else
-	    {
-	      s =
-		format (s, "\n    unrecognized option %d length %d", type0,
-			opt0->length);
-	    }
-	  opt0 =
-	    (vxlan_gpe_ioam_option_t *) (((u8 *) opt0) + opt0->length +
-					 sizeof (vxlan_gpe_ioam_option_t));
-	  break;
-	}
-    }
-
-  return s;
-}
-
-always_inline void
-vxlan_gpe_ioam_pop_v4 (vlib_main_t * vm, vlib_node_runtime_t * node,
-		       vlib_buffer_t * b0)
-{
-  ip4_header_t *ip0;
-  udp_header_t *udp_hdr0;
-  vxlan_gpe_header_t *gpe_hdr0;
-  vxlan_gpe_ioam_hdr_t *gpe_ioam0;
-
-  ip0 = vlib_buffer_get_current (b0);
-
-  udp_hdr0 = (udp_header_t *) (ip0 + 1);
-  gpe_hdr0 = (vxlan_gpe_header_t *) (udp_hdr0 + 1);
-  gpe_ioam0 = (vxlan_gpe_ioam_hdr_t *) (gpe_hdr0 + 1);
-
-  /* Pop the iOAM data */
-  vlib_buffer_advance (b0,
-		       (word) (sizeof (udp_header_t) +
-			       sizeof (ip4_header_t) +
-			       sizeof (vxlan_gpe_header_t) +
-			       gpe_ioam0->length));
-
-  return;
-}
-
-
-
-always_inline void
-vxlan_gpe_pop_ioam_v4_one_inline (vlib_main_t * vm,
-				  vlib_node_runtime_t * node,
-				  vxlan_gpe_main_t * ngm,
-				  vlib_buffer_t * b0, u32 * next0)
-{
-  CLIB_UNUSED (ip4_header_t * ip0);
-  CLIB_UNUSED (udp_header_t * udp_hdr0);
-  CLIB_UNUSED (vxlan_gpe_header_t * gpe_hdr0);
-  CLIB_UNUSED (vxlan_gpe_ioam_hdr_t * gpe_ioam0);
-  CLIB_UNUSED (vxlan_gpe_ioam_option_t * opt0);
-  CLIB_UNUSED (vxlan_gpe_ioam_option_t * limit0);
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-
-
-  /* Pop the iOAM header */
-  ip0 = vlib_buffer_get_current (b0);
-  udp_hdr0 = (udp_header_t *) (ip0 + 1);
-  gpe_hdr0 = (vxlan_gpe_header_t *) (udp_hdr0 + 1);
-  gpe_ioam0 = (vxlan_gpe_ioam_hdr_t *) (gpe_hdr0 + 1);
-  opt0 = (vxlan_gpe_ioam_option_t *) (gpe_ioam0 + 1);
-  limit0 = (vxlan_gpe_ioam_option_t *) ((u8 *) gpe_ioam0 + gpe_ioam0->length);
-
-  /*
-   * Basic validity checks
-   */
-  if (gpe_ioam0->length > clib_net_to_host_u16 (ip0->length))
-    {
-      next0[0] = VXLAN_GPE_INPUT_NEXT_DROP;
-      goto trace00;
-    }
-
-  /* Scan the set of h-b-h options, process ones that we understand */
-  while (opt0 < limit0)
-    {
-      u8 type0;
-      type0 = opt0->type;
-      switch (type0)
-	{
-	case 0:		/* Pad1 */
-	  opt0 = (vxlan_gpe_ioam_option_t *) ((u8 *) opt0) + 1;
-	  continue;
-	case 1:		/* PadN */
-	  break;
-	default:
-	  if (hm->pop_options[type0])
-	    {
-	      if ((*hm->pop_options[type0]) (ip0, opt0) < 0)
-		{
-		  next0[0] = VXLAN_GPE_INPUT_NEXT_DROP;
-		  goto trace00;
-		}
-	    }
-	  break;
-	}
-      opt0 =
-	(vxlan_gpe_ioam_option_t *) (((u8 *) opt0) + opt0->length +
-				     sizeof (vxlan_gpe_ioam_hdr_t));
-    }
-
-
-  next0[0] =
-    (gpe_ioam0->protocol < VXLAN_GPE_PROTOCOL_MAX) ?
-    ngm->
-    decap_next_node_list[gpe_ioam0->protocol] : VXLAN_GPE_INPUT_NEXT_DROP;
-
-trace00:
-  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-    {
-      vxlan_gpe_pop_ioam_v4_trace_t *t =
-	vlib_add_trace (vm, node, b0, sizeof (*t));
-      u32 trace_len = gpe_ioam0->length;
-      t->fmt_trace.next_index = next0[0];
-      /* Capture the h-b-h option verbatim */
-      trace_len =
-	trace_len <
-	ARRAY_LEN (t->fmt_trace.
-		   option_data) ? trace_len : ARRAY_LEN (t->fmt_trace.
-							 option_data);
-      t->fmt_trace.trace_len = trace_len;
-      clib_memcpy (&(t->fmt_trace.option_data), gpe_ioam0, trace_len);
-    }
-
-  /* Remove the iOAM header inside the VxLAN-GPE header */
-  vxlan_gpe_ioam_pop_v4 (vm, node, b0);
-  return;
-}
-
-always_inline void
-vxlan_gpe_pop_ioam_v4_two_inline (vlib_main_t * vm,
-				  vlib_node_runtime_t * node,
-				  vxlan_gpe_main_t * ngm,
-				  vlib_buffer_t * b0, vlib_buffer_t * b1,
-				  u32 * next0, u32 * next1)
-{
-
-  vxlan_gpe_pop_ioam_v4_one_inline (vm, node, ngm, b0, next0);
-  vxlan_gpe_pop_ioam_v4_one_inline (vm, node, ngm, b1, next1);
-}
-
-
-
-static uword
-vxlan_gpe_pop_ioam (vlib_main_t * vm,
-		    vlib_node_runtime_t * node,
-		    vlib_frame_t * from_frame, u8 is_ipv6)
-{
-  u32 n_left_from, next_index, *from, *to_next;
-  vxlan_gpe_main_t *ngm = &vxlan_gpe_main;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-	  u32 bi0, bi1;
-	  vlib_buffer_t *b0, *b1;
-	  u32 next0, next1;
-
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t *p2, *p3;
-
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
-	    CLIB_PREFETCH (p3->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
-	  }
-
-	  bi0 = from[0];
-	  bi1 = from[1];
-	  to_next[0] = bi0;
-	  to_next[1] = bi1;
-	  from += 2;
-	  to_next += 2;
-	  n_left_to_next -= 2;
-	  n_left_from -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  vxlan_gpe_pop_ioam_v4_two_inline (vm, node, ngm, b0, b1, &next0,
-					    &next1);
-
-
-	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, bi1, next0,
-					   next1);
-	}
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  vxlan_gpe_pop_ioam_v4_one_inline (vm, node, ngm, b0, &next0);
-
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-
-static uword
-vxlan_gpe_pop_ioam_v4 (vlib_main_t * vm,
-		       vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  return vxlan_gpe_pop_ioam (vm, node, from_frame, 0);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (vxlan_gpe_pop_ioam_v4_node) = {
-  .function = vxlan_gpe_pop_ioam_v4,
-  .name = "vxlan-gpe-pop-ioam-v4",
-  .vector_size = sizeof (u32),
-  .format_trace = format_vxlan_gpe_pop_ioam_v4_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(vxlan_gpe_pop_ioam_v4_error_strings),
-  .error_strings = vxlan_gpe_pop_ioam_v4_error_strings,
-
-  .n_next_nodes = VXLAN_GPE_INPUT_N_NEXT,
-
-  .next_nodes = {
-#define _(s,n) [VXLAN_GPE_INPUT_NEXT_##s] = n,
-    foreach_vxlan_gpe_input_next
-#undef _
-  },
-};
-/* *INDENT-ON* */
-
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_transit.c b/plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_transit.c
deleted file mode 100644
index b42c357c..00000000
--- a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/ioam_transit.c
+++ /dev/null
@@ -1,188 +0,0 @@
- /*
-  * Copyright (c) 2015 Cisco and/or its affiliates.
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at:
-  *
-  *     http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-#include <vppinfra/error.h>
-#include <vppinfra/hash.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ip/udp.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/fib_entry.h>
-
-/* Statistics (not really errors) */
-#define foreach_vxlan_gpe_transit_ioam_error    \
-_(ENCAPSULATED, "good packets encapsulated")
-
-static char *vxlan_gpe_transit_ioam_error_strings[] = {
-#define _(sym,string) string,
-  foreach_vxlan_gpe_transit_ioam_error
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) VXLAN_GPE_TRANSIT_IOAM_ERROR_##sym,
-  foreach_vxlan_gpe_transit_ioam_error
-#undef _
-    VXLAN_GPE_TRANSIT_IOAM_N_ERROR,
-} vxlan_gpe_transit_ioam_error_t;
-
-typedef enum
-{
-  VXLAN_GPE_TRANSIT_IOAM_NEXT_OUTPUT,
-  VXLAN_GPE_TRANSIT_IOAM_NEXT_DROP,
-  VXLAN_GPE_TRANSIT_IOAM_N_NEXT
-} vxlan_gpe_transit_ioam_next_t;
-
-
-/* *INDENT-OFF* */
-VNET_FEATURE_INIT (vxlan_gpe_transit_ioam, static) =
-{
-  .arc_name = "ip4-output",
-  .node_name = "vxlan-gpe-transit-ioam",
-  .runs_before = VNET_FEATURES ("interface-output"),
-};
-/* *INDENT-ON* */
-
-static uword
-vxlan_gpe_transit_ioam (vlib_main_t * vm,
-			vlib_node_runtime_t * node, vlib_frame_t * from_frame)
-{
-  u32 n_left_from, next_index, *from, *to_next;
-
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
-
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  u32 bi0;
-	  vlib_buffer_t *b0;
-	  u32 next0 = VXLAN_GPE_TRANSIT_IOAM_NEXT_OUTPUT;
-
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-	  ip4_header_t *ip0;
-	  u32 iph_offset = 0;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  iph_offset = vnet_buffer (b0)->ip.save_rewrite_length;
-	  ip0 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b0)
-				  + iph_offset);
-
-	  /* just forward non ipv4 packets */
-	  if (PREDICT_FALSE
-	      ((ip0->ip_version_and_header_length & 0xF0) == 0x40))
-	    {
-	      /* ipv4 packets */
-	      udp_header_t *udp_hdr0 = (udp_header_t *) (ip0 + 1);
-	      if (PREDICT_FALSE
-		  ((ip0->protocol == IP_PROTOCOL_UDP) &&
-		   (clib_net_to_host_u16 (udp_hdr0->dst_port) ==
-		    UDP_DST_PORT_vxlan_gpe)))
-		{
-
-		  /* Check the iOAM header */
-		  vxlan_gpe_header_t *gpe_hdr0 =
-		    (vxlan_gpe_header_t *) (udp_hdr0 + 1);
-
-		  if (PREDICT_FALSE
-		      (gpe_hdr0->protocol == VXLAN_GPE_PROTOCOL_IOAM))
-		    {
-		      uword *t = NULL;
-		      vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-		      fib_prefix_t key4;
-		      memset (&key4, 0, sizeof (key4));
-		      key4.fp_proto = FIB_PROTOCOL_IP4;
-		      key4.fp_addr.ip4.as_u32 = ip0->dst_address.as_u32;
-		      t = hash_get_mem (hm->dst_by_ip4, &key4);
-		      if (t)
-			{
-
-
-			  vlib_buffer_advance (b0,
-					       (word) (sizeof
-						       (ethernet_header_t)));
-			  vxlan_gpe_encap_decap_ioam_v4_one_inline (vm, node,
-								    b0,
-								    &next0,
-								    VXLAN_GPE_TRANSIT_IOAM_NEXT_DROP,
-								    1
-								    /* use_adj */
-			    );
-			  vlib_buffer_advance (b0,
-					       -(word) (sizeof
-							(ethernet_header_t)));
-			}
-		    }
-		}
-	    }
-
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					   n_left_to_next, bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return from_frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (vxlan_gpe_transit_ioam_node) = {
-  .function = vxlan_gpe_transit_ioam,
-  .name = "vxlan-gpe-transit-ioam",
-  .vector_size = sizeof (u32),
-  .format_trace = format_vxlan_gpe_ioam_v4_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(vxlan_gpe_transit_ioam_error_strings),
-  .error_strings = vxlan_gpe_transit_ioam_error_strings,
-
-  .n_next_nodes = VXLAN_GPE_TRANSIT_IOAM_N_NEXT,
-
-  .next_nodes = {
-        [VXLAN_GPE_TRANSIT_IOAM_NEXT_OUTPUT] = "interface-output",
-        [VXLAN_GPE_TRANSIT_IOAM_NEXT_DROP] = "error-drop",
-  },
-
-};
-/* *INDENT-ON* */
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe.api b/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe.api
deleted file mode 100644
index 056529a4..00000000
--- a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe.api
+++ /dev/null
@@ -1,181 +0,0 @@
-/* Hey Emacs use -*- mode: C -*- */
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/** \brief iOAM Over VxLAN-GPE - Set iOAM transport for VxLAN-GPE
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param id - profile id
-    @param trace_ppc - Trace PPC (none/encap/decap)
-    @param pow_enable - Proof of Work enabled or not flag
-    @param trace_enable - iOAM Trace enabled or not flag
-
-*/
-define vxlan_gpe_ioam_enable {
-  u32 client_index;
-  u32 context;
-  u16 id;
-  u8 trace_ppc;
-  u8 pow_enable;
-  u8 trace_enable;
-};
-
-/** \brief iOAM Over VxLAN-GPE - Set iOAM transport for VXLAN-GPE reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define vxlan_gpe_ioam_enable_reply {
-    u32 context;
-    i32 retval;
-};
-
-
-/** \brief iOAM for VxLAN-GPE disable
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param id - profile id
-*/
-define vxlan_gpe_ioam_disable
-{
-  u32 client_index;
-  u32 context;
-  u16 id;
-};
-
-/** \brief vxlan_gpe_ioam disable response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define vxlan_gpe_ioam_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Enable iOAM for a VNI (VXLAN-GPE)
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param vni - VXLAN-GPE VNI
-    @param local - IPv4/6 Address of the local VTEP
-    @param remote - IPv4/6 Address of the remote VTEP
-
-*/
-define vxlan_gpe_ioam_vni_enable {
-  u32 client_index;
-  u32 context;
-  u32 vni;
-  u8  local[16];
-  u8  remote[16];
-  u8  is_ipv6;
-};
-
-/** \brief Reply to enable iOAM for a VNI (VXLAN-GPE)
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-
-*/
-define vxlan_gpe_ioam_vni_enable_reply {
-  u32 client_index;
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Disable iOAM for a VNI (VXLAN-GPE)
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param vni - VXLAN-GPE VNI
-    @param local - IPv4/6 Address of the local VTEP
-    @param remote - IPv4/6 Address of the remote VTEP
-
-*/
-define vxlan_gpe_ioam_vni_disable {
-  u32 client_index;
-  u32 context;
-  u32 vni;
-  u8  local[16];
-  u8  remote[16];
-  u8  is_ipv6;
-};
-
-/** \brief Reply to disable iOAM for a VNI (VXLAN-GPE)
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-
-*/
-define vxlan_gpe_ioam_vni_disable_reply {
-  u32 client_index;
-  u32 context;
-  i32 retval;
-};
-
-
-/** \brief Enable iOAM for a VXLAN-GPE transit
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param dst_addr - IPv4/6 Address of the local VTEP
-    @param outer_fib_index- FIB index
-
-*/
-define vxlan_gpe_ioam_transit_enable {
-  u32 client_index;
-  u32 context;
-  u32 outer_fib_index;
-  u8  dst_addr[16];
-  u8  is_ipv6;
-};
-
-/** \brief Reply to enable iOAM for VXLAN-GPE transit
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-
-*/
-define vxlan_gpe_ioam_transit_enable_reply {
-  u32 client_index;
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Disable iOAM for VXLAN-GPE transit
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param dst_addr - IPv4/6 Address of the local VTEP
-    @param outer_fib_index- FIB index
-
-*/
-define vxlan_gpe_ioam_transit_disable {
-  u32 client_index;
-  u32 context;
-  u32 outer_fib_index;
-  u8  dst_addr[16];
-  u8  is_ipv6;
-};
-
-/** \brief Reply to disable iOAM for VXLAN-GPE transit
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-
-*/
-define vxlan_gpe_ioam_transit_disable_reply {
-  u32 client_index;
-  u32 context;
-  i32 retval;
-};
-
-
diff --git a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h b/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h
deleted file mode 100644
index bbf2c101..00000000
--- a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Include the generated file, see BUILT_SOURCES in Makefile.am */
-#include <ioam/lib-vxlan-gpe/vxlan_gpe.api.h>
diff --git a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_api.c b/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
deleted file mode 100644
index 68752365..00000000
--- a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * vxlan_gpe_api.c - iOAM VxLAN-GPE related APIs to create
- *               and maintain profiles
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vnet/plugin/plugin.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
-
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-
-/* define message IDs */
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
-#undef vl_api_version
-
-/*
- * A handy macro to set up a message reply.
- * Assumes that the following variables are available:
- * mp - pointer to request message
- * rmp - pointer to reply message type
- * rv - return value
- */
-
-#define VXLAN_GPE_REPLY_MACRO(t)                                \
-do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
-    vl_api_client_index_to_input_queue (mp->client_index);      \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-                                                                \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-/* *INDENT-OFF* */
-#define VXLAN_GPE_REPLY_MACRO2(t, body)                         \
-do {                                                            \
-    unix_shared_memory_queue_t * q;                             \
-    rv = vl_msg_api_pd_handler (mp, rv);                        \
-    q = vl_api_client_index_to_input_queue (mp->client_index);  \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t));                               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-    do {body;} while (0);                                       \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-/* *INDENT-ON* */
-
-/* List of message types that this plugin understands */
-
-#define foreach_vxlan_gpe_plugin_api_msg                               \
-_(VXLAN_GPE_IOAM_ENABLE, vxlan_gpe_ioam_enable)                        \
-_(VXLAN_GPE_IOAM_DISABLE, vxlan_gpe_ioam_disable)                      \
-_(VXLAN_GPE_IOAM_VNI_ENABLE, vxlan_gpe_ioam_vni_enable)                \
-_(VXLAN_GPE_IOAM_VNI_DISABLE, vxlan_gpe_ioam_vni_disable)              \
-_(VXLAN_GPE_IOAM_TRANSIT_ENABLE, vxlan_gpe_ioam_transit_enable)        \
-_(VXLAN_GPE_IOAM_TRANSIT_DISABLE, vxlan_gpe_ioam_transit_disable)      \
-
-
-static void vl_api_vxlan_gpe_ioam_enable_t_handler
-  (vl_api_vxlan_gpe_ioam_enable_t * mp)
-{
-  int rv = 0;
-  vl_api_vxlan_gpe_ioam_enable_reply_t *rmp;
-  clib_error_t *error;
-  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
-
-  /* Ignoring the profile id as currently a single profile
-   * is supported */
-  error =
-    vxlan_gpe_ioam_enable (mp->trace_enable, mp->pow_enable, mp->trace_ppc);
-  if (error)
-    {
-      clib_error_report (error);
-      rv = clib_error_get_code (error);
-    }
-
-  VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_ENABLE_REPLY);
-}
-
-static void vl_api_vxlan_gpe_ioam_disable_t_handler
-  (vl_api_vxlan_gpe_ioam_disable_t * mp)
-{
-  int rv = 0;
-  vl_api_vxlan_gpe_ioam_disable_reply_t *rmp;
-  clib_error_t *error;
-  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
-
-  /* Ignoring the profile id as currently a single profile
-   * is supported */
-  error = vxlan_gpe_ioam_disable (0, 0, 0);
-  if (error)
-    {
-      clib_error_report (error);
-      rv = clib_error_get_code (error);
-    }
-
-  VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_DISABLE_REPLY);
-}
-
-static void vl_api_vxlan_gpe_ioam_vni_enable_t_handler
-  (vl_api_vxlan_gpe_ioam_vni_enable_t * mp)
-{
-  int rv = 0;
-  vl_api_vxlan_gpe_ioam_vni_enable_reply_t *rmp;
-  clib_error_t *error;
-  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
-  vxlan4_gpe_tunnel_key_t key4;
-  uword *p = NULL;
-  vxlan_gpe_main_t *gm = &vxlan_gpe_main;
-  vxlan_gpe_tunnel_t *t = 0;
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-  u32 vni;
-
-
-  if (!mp->is_ipv6)
-    {
-      clib_memcpy (&key4.local, &mp->local, sizeof (key4.local));
-      clib_memcpy (&key4.remote, &mp->remote, sizeof (key4.remote));
-      vni = clib_net_to_host_u32 (mp->vni);
-      key4.vni = clib_host_to_net_u32 (vni << 8);
-      key4.pad = 0;
-
-      p = hash_get_mem (gm->vxlan4_gpe_tunnel_by_key, &key4);
-    }
-  else
-    {
-      return;
-    }
-
-  if (!p)
-    return;
-
-  t = pool_elt_at_index (gm->tunnels, p[0]);
-
-  error = vxlan_gpe_ioam_set (t, hm->has_trace_option,
-			      hm->has_pot_option,
-			      hm->has_ppc_option, mp->is_ipv6);
-
-
-  if (error)
-    {
-      clib_error_report (error);
-      rv = clib_error_get_code (error);
-    }
-
-  VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_VNI_ENABLE_REPLY);
-}
-
-
-static void vl_api_vxlan_gpe_ioam_vni_disable_t_handler
-  (vl_api_vxlan_gpe_ioam_vni_disable_t * mp)
-{
-  int rv = 0;
-  vl_api_vxlan_gpe_ioam_vni_enable_reply_t *rmp;
-  clib_error_t *error;
-  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
-  vxlan4_gpe_tunnel_key_t key4;
-  uword *p = NULL;
-  vxlan_gpe_main_t *gm = &vxlan_gpe_main;
-  vxlan_gpe_tunnel_t *t = 0;
-  u32 vni;
-
-
-  if (!mp->is_ipv6)
-    {
-      clib_memcpy (&key4.local, &mp->local, sizeof (key4.local));
-      clib_memcpy (&key4.remote, &mp->remote, sizeof (key4.remote));
-      vni = clib_net_to_host_u32 (mp->vni);
-      key4.vni = clib_host_to_net_u32 (vni << 8);
-      key4.pad = 0;
-
-      p = hash_get_mem (gm->vxlan4_gpe_tunnel_by_key, &key4);
-    }
-  else
-    {
-      return;
-    }
-
-  if (!p)
-    return;
-
-  t = pool_elt_at_index (gm->tunnels, p[0]);
-
-  error = vxlan_gpe_ioam_clear (t, 0, 0, 0, 0);
-
-
-  if (error)
-    {
-      clib_error_report (error);
-      rv = clib_error_get_code (error);
-    }
-
-
-  VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_VNI_DISABLE_REPLY);
-}
-
-static void vl_api_vxlan_gpe_ioam_transit_enable_t_handler
-  (vl_api_vxlan_gpe_ioam_transit_enable_t * mp)
-{
-  int rv = 0;
-  vl_api_vxlan_gpe_ioam_transit_enable_reply_t *rmp;
-  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
-  ip46_address_t dst_addr;
-
-  memset (&dst_addr.ip4, 0, sizeof (dst_addr.ip4));
-  if (!mp->is_ipv6)
-    {
-      clib_memcpy (&dst_addr.ip4, &mp->dst_addr, sizeof (dst_addr.ip4));
-    }
-  rv = vxlan_gpe_enable_disable_ioam_for_dest (sm->vlib_main,
-					       dst_addr,
-					       ntohl (mp->outer_fib_index),
-					       mp->is_ipv6 ? 0 : 1,
-					       1 /* is_add */ );
-
-  VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_TRANSIT_ENABLE_REPLY);
-}
-
-static void vl_api_vxlan_gpe_ioam_transit_disable_t_handler
-  (vl_api_vxlan_gpe_ioam_transit_disable_t * mp)
-{
-  int rv = 0;
-  vl_api_vxlan_gpe_ioam_transit_disable_reply_t *rmp;
-  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
-  ip46_address_t dst_addr;
-
-  memset (&dst_addr.ip4, 0, sizeof (dst_addr.ip4));
-  if (!mp->is_ipv6)
-    {
-      clib_memcpy (&dst_addr.ip4, &mp->dst_addr, sizeof (dst_addr.ip4));
-    }
-
-  rv = vxlan_gpe_ioam_disable_for_dest (sm->vlib_main,
-					dst_addr,
-					ntohl (mp->outer_fib_index),
-					mp->is_ipv6 ? 0 : 1);
-  VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_TRANSIT_DISABLE_REPLY);
-}
-
-
-/*
- * This routine exists to convince the vlib plugin framework that
- * we haven't accidentally copied a random .dll into the plugin directory.
- *
- * Also collects global variable pointers passed from the vpp engine
- */
-
-clib_error_t *
-vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
-		      int from_early_init)
-{
-  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
-  clib_error_t *error = 0;
-
-  sm->vlib_main = vm;
-  sm->vnet_main = h->vnet_main;
-  sm->unix_time_0 = (u32) time (0);	/* Store starting time */
-  sm->vlib_time_0 = vlib_time_now (vm);
-  return error;
-}
-
-/* Set up the API message handling tables */
-static clib_error_t *
-vxlan_gpe_plugin_api_hookup (vlib_main_t * vm)
-{
-  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,					\
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vxlan_gpe_plugin_api_msg;
-#undef _
-
-  return 0;
-}
-
-static clib_error_t *
-vxlan_gpe_init (vlib_main_t * vm)
-{
-  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
-  clib_error_t *error = 0;
-  u8 *name;
-  u32 encap_node_index = vxlan_gpe_encap_ioam_v4_node.index;
-  u32 decap_node_index = vxlan_gpe_decap_ioam_v4_node.index;
-  vlib_node_t *vxlan_gpe_encap_node = NULL;
-  vlib_node_t *vxlan_gpe_decap_node = NULL;
-  uword next_node = 0;
-
-  name = format (0, "ioam_vxlan_gpe_%08x%c", api_version, 0);
-
-  /* Ask for a correctly-sized block of API message decode slots */
-  sm->msg_id_base = vl_msg_api_get_msg_ids
-    ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-  error = vxlan_gpe_plugin_api_hookup (vm);
-
-  /* Hook the ioam-encap node to vxlan-gpe-encap */
-  vxlan_gpe_encap_node = vlib_get_node_by_name (vm, (u8 *) "vxlan-gpe-encap");
-  sm->encap_v4_next_node =
-    vlib_node_add_next (vm, vxlan_gpe_encap_node->index, encap_node_index);
-
-  vxlan_gpe_decap_node =
-    vlib_get_node_by_name (vm, (u8 *) "vxlan4-gpe-input");
-  next_node =
-    vlib_node_add_next (vm, vxlan_gpe_decap_node->index, decap_node_index);
-  vxlan_gpe_register_decap_protocol (VXLAN_GPE_PROTOCOL_IOAM, next_node);
-
-  vec_new (vxlan_gpe_ioam_sw_interface_t, pool_elts (sm->sw_interfaces));
-  sm->dst_by_ip4 = hash_create_mem (0, sizeof (fib_prefix_t), sizeof (uword));
-
-  sm->dst_by_ip6 = hash_create_mem (0, sizeof (fib_prefix_t), sizeof (uword));
-
-  vxlan_gpe_ioam_interface_init ();
-  vec_free (name);
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (vxlan_gpe_init);
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c b/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
deleted file mode 100644
index 6c04d9af..00000000
--- a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
+++ /dev/null
@@ -1,773 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
-#include <vnet/ip/format.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
-#include <vnet/fib/ip6_fib.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/fib_entry.h>
-
-vxlan_gpe_ioam_main_t vxlan_gpe_ioam_main;
-
-int
-vxlan_gpe_ioam_set_rewrite (vxlan_gpe_tunnel_t * t, int has_trace_option,
-			    int has_pot_option, int has_ppc_option,
-			    u8 ipv6_set)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-  u32 size;
-  vxlan_gpe_ioam_hdr_t *vxlan_gpe_ioam_hdr;
-  u8 *current;
-  u8 trace_data_size = 0;
-  u8 pot_data_size = 0;
-
-  if (has_trace_option == 0 && has_pot_option == 0)
-    return -1;
-
-  /* Work out how much space we need */
-  size = sizeof (vxlan_gpe_ioam_hdr_t);
-
-  if (has_trace_option
-      && hm->add_options[VXLAN_GPE_OPTION_TYPE_IOAM_TRACE] != 0)
-    {
-      size += sizeof (vxlan_gpe_ioam_option_t);
-      size += hm->options_size[VXLAN_GPE_OPTION_TYPE_IOAM_TRACE];
-    }
-  if (has_pot_option
-      && hm->add_options[VXLAN_GPE_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] != 0)
-    {
-      size += sizeof (vxlan_gpe_ioam_option_t);
-      size += hm->options_size[VXLAN_GPE_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT];
-    }
-
-  t->rewrite_size = size;
-
-  if (!ipv6_set)
-    {
-      vxlan4_gpe_rewrite (t, size, VXLAN_GPE_PROTOCOL_IOAM,
-			  hm->encap_v4_next_node);
-      vxlan_gpe_ioam_hdr =
-	(vxlan_gpe_ioam_hdr_t *) (t->rewrite +
-				  sizeof (ip4_vxlan_gpe_header_t));
-    }
-  else
-    {
-      vxlan6_gpe_rewrite (t, size, VXLAN_GPE_PROTOCOL_IOAM,
-			  VXLAN_GPE_ENCAP_NEXT_IP6_LOOKUP);
-      vxlan_gpe_ioam_hdr =
-	(vxlan_gpe_ioam_hdr_t *) (t->rewrite +
-				  sizeof (ip6_vxlan_gpe_header_t));
-    }
-
-
-  vxlan_gpe_ioam_hdr->type = VXLAN_GPE_PROTOCOL_IOAM;
-  /* Length of the header in octets */
-  vxlan_gpe_ioam_hdr->length = size;
-  vxlan_gpe_ioam_hdr->protocol = t->protocol;
-  current = (u8 *) vxlan_gpe_ioam_hdr + sizeof (vxlan_gpe_ioam_hdr_t);
-
-  if (has_trace_option
-      && hm->add_options[VXLAN_GPE_OPTION_TYPE_IOAM_TRACE] != 0)
-    {
-      if (0 != hm->add_options[VXLAN_GPE_OPTION_TYPE_IOAM_TRACE] (current,
-								  &trace_data_size))
-	return -1;
-      current += trace_data_size;
-    }
-  if (has_pot_option
-      && hm->add_options[VXLAN_GPE_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] != 0)
-    {
-      pot_data_size =
-	hm->options_size[VXLAN_GPE_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT];
-      if (0 ==
-	  hm->add_options[VXLAN_GPE_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT]
-	  (current, &pot_data_size))
-	current += pot_data_size;
-    }
-
-  return 0;
-}
-
-int
-vxlan_gpe_ioam_clear_rewrite (vxlan_gpe_tunnel_t * t, int has_trace_option,
-			      int has_pot_option, int has_ppc_option,
-			      u8 ipv6_set)
-{
-
-  t->rewrite_size = 0;
-
-  if (!ipv6_set)
-    {
-      vxlan4_gpe_rewrite (t, 0, 0, VXLAN_GPE_ENCAP_NEXT_IP4_LOOKUP);
-    }
-  else
-    {
-      vxlan6_gpe_rewrite (t, 0, 0, VXLAN_GPE_ENCAP_NEXT_IP6_LOOKUP);
-    }
-
-
-  return 0;
-}
-
-clib_error_t *
-vxlan_gpe_ioam_clear (vxlan_gpe_tunnel_t * t,
-		      int has_trace_option, int has_pot_option,
-		      int has_ppc_option, u8 ipv6_set)
-{
-  int rv;
-  rv = vxlan_gpe_ioam_clear_rewrite (t, 0, 0, 0, 0);
-
-  if (rv == 0)
-    {
-      return (0);
-    }
-  else
-    {
-      return clib_error_return_code (0, rv, 0,
-				     "vxlan_gpe_ioam_clear_rewrite returned %d",
-				     rv);
-    }
-
-}
-
-
-clib_error_t *
-vxlan_gpe_ioam_set (vxlan_gpe_tunnel_t * t,
-		    int has_trace_option, int has_pot_option,
-		    int has_ppc_option, u8 ipv6_set)
-{
-  int rv;
-  rv = vxlan_gpe_ioam_set_rewrite (t, has_trace_option,
-				   has_pot_option, has_ppc_option, ipv6_set);
-
-  if (rv == 0)
-    {
-      return (0);
-    }
-  else
-    {
-      return clib_error_return_code (0, rv, 0,
-				     "vxlan_gpe_ioam_set_rewrite returned %d",
-				     rv);
-    }
-
-}
-
-static void
-vxlan_gpe_set_clear_output_feature_on_intf (vlib_main_t * vm,
-					    u32 sw_if_index0, u8 is_add)
-{
-
-
-
-  vnet_feature_enable_disable ("ip4-output", "vxlan-gpe-transit-ioam",
-			       sw_if_index0, is_add,
-			       0 /* void *feature_config */ ,
-			       0 /* u32 n_feature_config_bytes */ );
-  return;
-}
-
-void
-vxlan_gpe_clear_output_feature_on_all_intfs (vlib_main_t * vm)
-{
-  vnet_sw_interface_t *si = 0;
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_interface_main_t *im = &vnm->interface_main;
-
-  pool_foreach (si, im->sw_interfaces, (
-					 {
-					 vxlan_gpe_set_clear_output_feature_on_intf
-					 (vm, si->sw_if_index, 0);
-					 }));
-  return;
-}
-
-
-extern fib_forward_chain_type_t
-fib_entry_get_default_chain_type (const fib_entry_t * fib_entry);
-
-int
-vxlan_gpe_enable_disable_ioam_for_dest (vlib_main_t * vm,
-					ip46_address_t dst_addr,
-					u32 outer_fib_index,
-					u8 is_ipv4, u8 is_add)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-  u32 fib_index0 = 0;
-  u32 sw_if_index0 = ~0;
-
-  fib_node_index_t fei = ~0;
-  fib_entry_t *fib_entry;
-  u32 adj_index0;
-  ip_adjacency_t *adj0;
-  fib_prefix_t fib_prefix;
-  //fib_forward_chain_type_t fct;
-  load_balance_t *lb_m, *lb_b;
-  const dpo_id_t *dpo0, *dpo1;
-  u32 i, j;
-  //vnet_hw_interface_t *hw;
-
-  if (is_ipv4)
-    {
-      memset (&fib_prefix, 0, sizeof (fib_prefix_t));
-      fib_prefix.fp_len = 32;
-      fib_prefix.fp_proto = FIB_PROTOCOL_IP4;
-      fib_prefix.fp_addr = dst_addr;
-    }
-  else
-    {
-      return 0;
-    }
-
-  fei = fib_table_lookup (fib_index0, &fib_prefix);
-  fib_entry = fib_entry_get (fei);
-
-  //fct = fib_entry_get_default_chain_type (fib_entry);
-
-  if (!dpo_id_is_valid (&fib_entry->fe_lb /*[fct] */ ))
-    {
-      return (-1);
-    }
-
-  lb_m = load_balance_get (fib_entry->fe_lb /*[fct] */ .dpoi_index);
-
-  for (i = 0; i < lb_m->lb_n_buckets; i++)
-    {
-      dpo0 = load_balance_get_bucket_i (lb_m, i);
-
-      if (dpo0->dpoi_type == DPO_LOAD_BALANCE)
-	{
-	  lb_b = load_balance_get (dpo0->dpoi_index);
-
-	  for (j = 0; j < lb_b->lb_n_buckets; j++)
-	    {
-	      dpo1 = load_balance_get_bucket_i (lb_b, j);
-
-	      if (dpo1->dpoi_type == DPO_ADJACENCY)
-		{
-		  adj_index0 = dpo1->dpoi_index;
-
-		  if (ADJ_INDEX_INVALID == adj_index0)
-		    {
-		      continue;
-		    }
-
-		  adj0 =
-		    ip_get_adjacency (&(ip4_main.lookup_main), adj_index0);
-		  sw_if_index0 = adj0->rewrite_header.sw_if_index;
-
-		  if (~0 == sw_if_index0)
-		    {
-		      continue;
-		    }
-
-
-		  if (is_add)
-		    {
-		      vnet_feature_enable_disable ("ip4-output",
-						   "vxlan-gpe-transit-ioam",
-						   sw_if_index0, is_add, 0
-						   /* void *feature_config */
-						   , 0	/* u32 n_feature_config_bytes */
-			);
-
-		      vec_validate_init_empty (hm->bool_ref_by_sw_if_index,
-					       sw_if_index0, ~0);
-		      hm->bool_ref_by_sw_if_index[sw_if_index0] = 1;
-		    }
-		  else
-		    {
-		      hm->bool_ref_by_sw_if_index[sw_if_index0] = ~0;
-		    }
-		}
-	    }
-	}
-    }
-
-  if (is_ipv4)
-    {
-
-      uword *t = NULL;
-      vxlan_gpe_ioam_dest_tunnels_t *t1;
-      fib_prefix_t key4, *key4_copy;
-      hash_pair_t *hp;
-      memset (&key4, 0, sizeof (key4));
-      key4.fp_proto = FIB_PROTOCOL_IP4;
-      key4.fp_addr.ip4.as_u32 = fib_prefix.fp_addr.ip4.as_u32;
-      t = hash_get_mem (hm->dst_by_ip4, &key4);
-      if (is_add)
-	{
-	  if (t)
-	    {
-	      return 0;
-	    }
-	  pool_get_aligned (hm->dst_tunnels, t1, CLIB_CACHE_LINE_BYTES);
-	  memset (t1, 0, sizeof (*t1));
-	  t1->fp_proto = FIB_PROTOCOL_IP4;
-	  t1->dst_addr.ip4.as_u32 = fib_prefix.fp_addr.ip4.as_u32;
-	  key4_copy = clib_mem_alloc (sizeof (*key4_copy));
-	  clib_memcpy (key4_copy, &key4, sizeof (*key4_copy));
-	  hash_set_mem (hm->dst_by_ip4, key4_copy, t1 - hm->dst_tunnels);
-	  /*
-	   * Attach to the FIB entry for the VxLAN-GPE destination
-	   * and become its child. The dest route will invoke a callback
-	   * when the fib entry changes, it can be used to
-	   * re-program the output feature on the egress interface.
-	   */
-
-	  const fib_prefix_t tun_dst_pfx = {
-	    .fp_len = 32,
-	    .fp_proto = FIB_PROTOCOL_IP4,
-	    .fp_addr = {.ip4 = t1->dst_addr.ip4,}
-	  };
-
-	  t1->fib_entry_index =
-	    fib_table_entry_special_add (outer_fib_index,
-					 &tun_dst_pfx,
-					 FIB_SOURCE_RR,
-					 FIB_ENTRY_FLAG_NONE,
-					 ADJ_INDEX_INVALID);
-	  t1->sibling_index =
-	    fib_entry_child_add (t1->fib_entry_index,
-				 hm->fib_entry_type, t1 - hm->dst_tunnels);
-	  t1->outer_fib_index = outer_fib_index;
-
-	}
-      else
-	{
-	  if (!t)
-	    {
-	      return 0;
-	    }
-	  t1 = pool_elt_at_index (hm->dst_tunnels, t[0]);
-	  hp = hash_get_pair (hm->dst_by_ip4, &key4);
-	  key4_copy = (void *) (hp->key);
-	  hash_unset_mem (hm->dst_by_ip4, &key4);
-	  clib_mem_free (key4_copy);
-	  pool_put (hm->dst_tunnels, t1);
-	}
-    }
-  else
-    {
-      // TBD for IPv6
-    }
-
-  return 0;
-}
-
-void
-vxlan_gpe_refresh_output_feature_on_all_dest (void)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-  vxlan_gpe_ioam_dest_tunnels_t *t;
-  u32 i;
-  if (pool_elts (hm->dst_tunnels) == 0)
-    return;
-  vxlan_gpe_clear_output_feature_on_all_intfs (hm->vlib_main);
-  i = vec_len (hm->bool_ref_by_sw_if_index);
-  vec_free (hm->bool_ref_by_sw_if_index);
-  vec_validate_init_empty (hm->bool_ref_by_sw_if_index, i, ~0);
-  pool_foreach (t, hm->dst_tunnels, (
-				      {
-				      vxlan_gpe_enable_disable_ioam_for_dest
-				      (hm->vlib_main,
-				       t->dst_addr,
-				       t->outer_fib_index,
-				       (t->fp_proto == FIB_PROTOCOL_IP4), 1
-				       /* is_add */
-				      );
-				      }
-		));
-  return;
-}
-
-void
-vxlan_gpe_clear_output_feature_on_select_intfs (void)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-  u32 sw_if_index0 = 0;
-  for (sw_if_index0 = 0;
-       sw_if_index0 < vec_len (hm->bool_ref_by_sw_if_index); sw_if_index0++)
-    {
-      if (hm->bool_ref_by_sw_if_index[sw_if_index0] == 0xFF)
-	{
-	  vxlan_gpe_set_clear_output_feature_on_intf
-	    (hm->vlib_main, sw_if_index0, 0);
-	}
-    }
-
-  return;
-}
-
-static clib_error_t *
-vxlan_gpe_set_ioam_rewrite_command_fn (vlib_main_t *
-				       vm,
-				       unformat_input_t
-				       * input, vlib_cli_command_t * cmd)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-  ip46_address_t local, remote;
-  u8 local_set = 0;
-  u8 remote_set = 0;
-  u8 ipv4_set = 0;
-  u8 ipv6_set = 0;
-  u32 vni;
-  u8 vni_set = 0;
-  u8 disable = 0;
-  clib_error_t *rv = 0;
-  vxlan4_gpe_tunnel_key_t key4;
-  vxlan6_gpe_tunnel_key_t key6;
-  uword *p;
-  vxlan_gpe_main_t *gm = &vxlan_gpe_main;
-  vxlan_gpe_tunnel_t *t = 0;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "local %U", unformat_ip4_address, &local.ip4))
-	{
-	  local_set = 1;
-	  ipv4_set = 1;
-	}
-      else
-	if (unformat (input, "remote %U", unformat_ip4_address, &remote.ip4))
-	{
-	  remote_set = 1;
-	  ipv4_set = 1;
-	}
-      else if (unformat (input, "local %U", unformat_ip6_address, &local.ip6))
-	{
-	  local_set = 1;
-	  ipv6_set = 1;
-	}
-      else
-	if (unformat (input, "remote %U", unformat_ip6_address, &remote.ip6))
-	{
-	  remote_set = 1;
-	  ipv6_set = 1;
-	}
-      else if (unformat (input, "vni %d", &vni))
-	vni_set = 1;
-      else if (unformat (input, "disable"))
-	disable = 1;
-      else
-	break;
-    }
-
-  if (local_set == 0)
-    return clib_error_return (0, "tunnel local address not specified");
-  if (remote_set == 0)
-    return clib_error_return (0, "tunnel remote address not specified");
-  if (ipv4_set && ipv6_set)
-    return clib_error_return (0, "both IPv4 and IPv6 addresses specified");
-  if ((ipv4_set
-       && memcmp (&local.ip4, &remote.ip4,
-		  sizeof (local.ip4)) == 0) || (ipv6_set
-						&&
-						memcmp
-						(&local.ip6,
-						 &remote.ip6,
-						 sizeof (local.ip6)) == 0))
-    return clib_error_return (0, "src and dst addresses are identical");
-  if (vni_set == 0)
-    return clib_error_return (0, "vni not specified");
-  if (!ipv6_set)
-    {
-      key4.local = local.ip4.as_u32;
-      key4.remote = remote.ip4.as_u32;
-      key4.vni = clib_host_to_net_u32 (vni << 8);
-      key4.pad = 0;
-      p = hash_get_mem (gm->vxlan4_gpe_tunnel_by_key, &key4);
-    }
-  else
-    {
-      key6.local.as_u64[0] = local.ip6.as_u64[0];
-      key6.local.as_u64[1] = local.ip6.as_u64[1];
-      key6.remote.as_u64[0] = remote.ip6.as_u64[0];
-      key6.remote.as_u64[1] = remote.ip6.as_u64[1];
-      key6.vni = clib_host_to_net_u32 (vni << 8);
-      p = hash_get_mem (gm->vxlan6_gpe_tunnel_by_key, &key6);
-    }
-
-  if (!p)
-    return clib_error_return (0, "VxLAN Tunnel not found");
-  t = pool_elt_at_index (gm->tunnels, p[0]);
-  if (!disable)
-    {
-      rv =
-	vxlan_gpe_ioam_set (t, hm->has_trace_option,
-			    hm->has_pot_option, hm->has_ppc_option, ipv6_set);
-    }
-  else
-    {
-      rv = vxlan_gpe_ioam_clear (t, 0, 0, 0, 0);
-    }
-  return rv;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vxlan_gpe_set_ioam_rewrite_cmd, static) = {
-  .path = "set vxlan-gpe-ioam",
-  .short_help = "set vxlan-gpe-ioam vxlan <src-ip> <dst_ip> <vnid> [disable]",
-  .function = vxlan_gpe_set_ioam_rewrite_command_fn,
-};
-/* *INDENT-ON* */
-
-
-
-clib_error_t *
-vxlan_gpe_ioam_enable (int has_trace_option,
-		       int has_pot_option, int has_ppc_option)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-  hm->has_trace_option = has_trace_option;
-  hm->has_pot_option = has_pot_option;
-  hm->has_ppc_option = has_ppc_option;
-  if (hm->has_trace_option)
-    {
-      vxlan_gpe_trace_profile_setup ();
-    }
-
-  return 0;
-}
-
-clib_error_t *
-vxlan_gpe_ioam_disable (int
-			has_trace_option,
-			int has_pot_option, int has_ppc_option)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-  hm->has_trace_option = has_trace_option;
-  hm->has_pot_option = has_pot_option;
-  hm->has_ppc_option = has_ppc_option;
-  if (!hm->has_trace_option)
-    {
-      vxlan_gpe_trace_profile_cleanup ();
-    }
-
-  return 0;
-}
-
-void
-vxlan_gpe_set_next_override (uword next)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-  hm->decap_v4_next_override = next;
-  return;
-}
-
-static clib_error_t *
-vxlan_gpe_set_ioam_flags_command_fn (vlib_main_t * vm,
-				     unformat_input_t
-				     * input, vlib_cli_command_t * cmd)
-{
-  int has_trace_option = 0;
-  int has_pot_option = 0;
-  int has_ppc_option = 0;
-  clib_error_t *rv = 0;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "trace"))
-	has_trace_option = 1;
-      else if (unformat (input, "pot"))
-	has_pot_option = 1;
-      else if (unformat (input, "ppc encap"))
-	has_ppc_option = PPC_ENCAP;
-      else if (unformat (input, "ppc decap"))
-	has_ppc_option = PPC_DECAP;
-      else if (unformat (input, "ppc none"))
-	has_ppc_option = PPC_NONE;
-      else
-	break;
-    }
-
-
-  rv =
-    vxlan_gpe_ioam_enable (has_trace_option, has_pot_option, has_ppc_option);
-  return rv;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vxlan_gpe_set_ioam_flags_cmd, static) =
-{
-.path = "set vxlan-gpe-ioam rewrite",
-.short_help = "set vxlan-gpe-ioam [trace] [pot] [ppc <encap|decap>]",
-.function = vxlan_gpe_set_ioam_flags_command_fn,};
-/* *INDENT-ON* */
-
-
-int vxlan_gpe_ioam_disable_for_dest
-  (vlib_main_t * vm, ip46_address_t dst_addr, u32 outer_fib_index,
-   u8 ipv4_set)
-{
-  vxlan_gpe_ioam_dest_tunnels_t *t;
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-
-  vxlan_gpe_enable_disable_ioam_for_dest (hm->vlib_main,
-					  dst_addr, outer_fib_index, ipv4_set,
-					  0);
-  if (pool_elts (hm->dst_tunnels) == 0)
-    {
-      vxlan_gpe_clear_output_feature_on_select_intfs ();
-      return 0;
-    }
-
-  pool_foreach (t, hm->dst_tunnels, (
-				      {
-				      vxlan_gpe_enable_disable_ioam_for_dest
-				      (hm->vlib_main,
-				       t->dst_addr,
-				       t->outer_fib_index,
-				       (t->fp_proto ==
-					FIB_PROTOCOL_IP4), 1 /* is_add */ );
-				      }
-		));
-  vxlan_gpe_clear_output_feature_on_select_intfs ();
-  return (0);
-
-}
-
-static clib_error_t *vxlan_gpe_set_ioam_transit_rewrite_command_fn
-  (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-  ip46_address_t dst_addr;
-  u8 dst_addr_set = 0;
-  u8 ipv4_set = 0;
-  u8 ipv6_set = 0;
-  u8 disable = 0;
-  clib_error_t *rv = 0;
-  u32 outer_fib_index = 0;
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "dst-ip %U", unformat_ip4_address, &dst_addr.ip4))
-	{
-	  dst_addr_set = 1;
-	  ipv4_set = 1;
-	}
-      else
-	if (unformat
-	    (input, "dst-ip %U", unformat_ip6_address, &dst_addr.ip6))
-	{
-	  dst_addr_set = 1;
-	  ipv6_set = 1;
-	}
-      else if (unformat (input, "outer-fib-index %d", &outer_fib_index))
-	{
-	}
-
-      else if (unformat (input, "disable"))
-	disable = 1;
-      else
-	break;
-    }
-
-  if (dst_addr_set == 0)
-    return clib_error_return (0, "tunnel destination address not specified");
-  if (ipv4_set && ipv6_set)
-    return clib_error_return (0, "both IPv4 and IPv6 addresses specified");
-  if (!disable)
-    {
-      vxlan_gpe_enable_disable_ioam_for_dest (hm->vlib_main,
-					      dst_addr, outer_fib_index,
-					      ipv4_set, 1);
-    }
-  else
-    {
-      vxlan_gpe_ioam_disable_for_dest
-	(vm, dst_addr, outer_fib_index, ipv4_set);
-    }
-  return rv;
-}
-
-       /* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vxlan_gpe_set_ioam_transit_rewrite_cmd, static) = {
-  .path = "set vxlan-gpe-ioam-transit",
-  .short_help = "set vxlan-gpe-ioam-transit dst-ip <dst_ip> [outer-fib-index <outer_fib_index>] [disable]",
-  .function = vxlan_gpe_set_ioam_transit_rewrite_command_fn,
-};
-/* *INDENT-ON* */
-
-clib_error_t *clear_vxlan_gpe_ioam_rewrite_command_fn
-  (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  return (vxlan_gpe_ioam_disable (0, 0, 0));
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vxlan_gpe_clear_ioam_flags_cmd, static) =
-{
-.path = "clear vxlan-gpe-ioam rewrite",
-.short_help = "clear vxlan-gpe-ioam rewrite",
-.function = clear_vxlan_gpe_ioam_rewrite_command_fn,
-};
-/* *INDENT-ON* */
-
-
-/**
- * Function definition to backwalk a FIB node
- */
-static fib_node_back_walk_rc_t
-vxlan_gpe_ioam_back_walk (fib_node_t * node, fib_node_back_walk_ctx_t * ctx)
-{
-  vxlan_gpe_refresh_output_feature_on_all_dest ();
-  return (FIB_NODE_BACK_WALK_CONTINUE);
-}
-
-/**
- * Function definition to get a FIB node from its index
- */
-static fib_node_t *
-vxlan_gpe_ioam_fib_node_get (fib_node_index_t index)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-  return (&hm->node);
-}
-
-/**
- * Function definition to inform the FIB node that its last lock has gone.
- */
-static void
-vxlan_gpe_ioam_last_lock_gone (fib_node_t * node)
-{
-  ASSERT (0);
-}
-
-
-/*
- * Virtual function table registered by MPLS GRE tunnels
- * for participation in the FIB object graph.
- */
-const static fib_node_vft_t vxlan_gpe_ioam_vft = {
-  .fnv_get = vxlan_gpe_ioam_fib_node_get,
-  .fnv_last_lock = vxlan_gpe_ioam_last_lock_gone,
-  .fnv_back_walk = vxlan_gpe_ioam_back_walk,
-};
-
-void
-vxlan_gpe_ioam_interface_init (void)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-  hm->fib_entry_type = fib_node_register_new_type (&vxlan_gpe_ioam_vft);
-  return;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h b/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h
deleted file mode 100644
index 3b7d72cf..00000000
--- a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_vxlan_gpe_ioam_h__
-#define __included_vxlan_gpe_ioam_h__
-
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h>
-#include <vnet/ip/ip.h>
-
-
-typedef struct vxlan_gpe_sw_interface_
-{
-  u32 sw_if_index;
-} vxlan_gpe_ioam_sw_interface_t;
-
-typedef struct vxlan_gpe_dest_tunnels_
-{
-  ip46_address_t dst_addr;
-  u32 fp_proto;
-  u32 sibling_index;
-  fib_node_index_t fib_entry_index;
-  u32 outer_fib_index;
-} vxlan_gpe_ioam_dest_tunnels_t;
-
-typedef struct vxlan_gpe_ioam_main_
-{
-  /**
-   * Linkage into the FIB object graph
-   */
-  fib_node_t node;
-
-  /* time scale transform. Joy. */
-  u32 unix_time_0;
-  f64 vlib_time_0;
-
-
-  /* Trace option */
-  u8 has_trace_option;
-
-  /* Pot option */
-  u8 has_pot_option;
-
-#define PPC_NONE  0
-#define PPC_ENCAP 1
-#define PPC_DECAP 2
-  u8 has_ppc_option;
-
-#define TSP_SECONDS              0
-#define TSP_MILLISECONDS         1
-#define TSP_MICROSECONDS         2
-#define TSP_NANOSECONDS          3
-
-  /* Array of function pointers to ADD and POP VxLAN-GPE iOAM option handling routines */
-  u8 options_size[256];
-  int (*add_options[256]) (u8 * rewrite_string, u8 * rewrite_size);
-  int (*pop_options[256]) (ip4_header_t * ip, vxlan_gpe_ioam_option_t * opt);
-
-  /* Array of function pointers to iOAM option handling routines */
-  int (*options[256]) (vlib_buffer_t * b, vxlan_gpe_ioam_option_t * opt,
-		       u8 is_ipv4, u8 use_adj);
-  u8 *(*trace[256]) (u8 * s, vxlan_gpe_ioam_option_t * opt);
-
-  /* API message ID base */
-  u16 msg_id_base;
-
-  /* Override to export for iOAM */
-  uword decap_v4_next_override;
-  uword decap_v6_next_override;
-
-  /* sequence of node graph for encap */
-  uword encap_v4_next_node;
-  uword encap_v6_next_node;
-
-  /* Software interfaces. */
-  vxlan_gpe_ioam_sw_interface_t *sw_interfaces;
-
-  /* hash ip4/ip6 -> list of destinations for doing transit iOAM operation */
-  vxlan_gpe_ioam_dest_tunnels_t *dst_tunnels;
-  uword *dst_by_ip4;
-  uword *dst_by_ip6;
-
-  /** per sw_if_index, to maintain bitmap */
-  u8 *bool_ref_by_sw_if_index;
-  fib_node_type_t fib_entry_type;
-
-  /** State convenience vlib_main_t */
-  vlib_main_t *vlib_main;
-  /** State convenience vnet_main_t */
-  vnet_main_t *vnet_main;
-
-
-} vxlan_gpe_ioam_main_t;
-extern vxlan_gpe_ioam_main_t vxlan_gpe_ioam_main;
-
-/*
- * Primary h-b-h handler trace support
- */
-typedef struct
-{
-  u32 next_index;
-  u32 trace_len;
-  u8 option_data[256];
-} ioam_trace_t;
-
-
-vlib_node_registration_t vxlan_gpe_encap_ioam_v4_node;
-vlib_node_registration_t vxlan_gpe_decap_ioam_v4_node;
-vlib_node_registration_t vxlan_gpe_transit_ioam_v4_node;
-
-clib_error_t *vxlan_gpe_ioam_enable (int has_trace_option, int has_pot_option,
-				     int has_ppc_option);
-
-clib_error_t *vxlan_gpe_ioam_disable (int has_trace_option,
-				      int has_pot_option, int has_ppc_option);
-
-clib_error_t *vxlan_gpe_ioam_set (vxlan_gpe_tunnel_t * t,
-				  int has_trace_option,
-				  int has_pot_option,
-				  int has_ppc_option, u8 ipv6_set);
-clib_error_t *vxlan_gpe_ioam_clear (vxlan_gpe_tunnel_t * t,
-				    int has_trace_option, int has_pot_option,
-				    int has_ppc_option, u8 ipv6_set);
-
-int vxlan_gpe_ioam_add_register_option (u8 option,
-					u8 size,
-					int rewrite_options (u8 *
-							     rewrite_string,
-							     u8 *
-							     rewrite_size));
-
-int vxlan_gpe_add_unregister_option (u8 option);
-
-int vxlan_gpe_ioam_register_option (u8 option,
-				    int options (vlib_buffer_t * b,
-						 vxlan_gpe_ioam_option_t *
-						 opt, u8 is_ipv4, u8 use_adj),
-				    u8 * trace (u8 * s,
-						vxlan_gpe_ioam_option_t *
-						opt));
-int vxlan_gpe_ioam_unregister_option (u8 option);
-
-int vxlan_gpe_trace_profile_setup (void);
-
-int vxlan_gpe_trace_profile_cleanup (void);
-extern void vxlan_gpe_ioam_interface_init (void);
-int
-vxlan_gpe_enable_disable_ioam_for_dest (vlib_main_t * vm,
-					ip46_address_t dst_addr,
-					u32 outer_fib_index,
-					u8 is_ipv4, u8 is_add);
-int vxlan_gpe_ioam_disable_for_dest
-  (vlib_main_t * vm, ip46_address_t dst_addr, u32 outer_fib_index,
-   u8 ipv4_set);
-
-typedef enum
-{
-  VXLAN_GPE_DECAP_IOAM_V4_NEXT_POP,
-  VXLAN_GPE_DECAP_IOAM_V4_NEXT_DROP,
-  VXLAN_GPE_DECAP_IOAM_V4_N_NEXT
-} vxlan_gpe_decap_ioam_v4_next_t;
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h b/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h
deleted file mode 100644
index a7ef859e..00000000
--- a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_vxlan_gpe_ioam_packet_h__
-#define __included_vxlan_gpe_ioam_packet_h__
-
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
-#include <vnet/ip/ip.h>
-
-
-
-#define VXLAN_GPE_OPTION_TYPE_IOAM_TRACE   59
-#define VXLAN_GPE_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT 60
-
-/**
- * @brief VXLAN GPE Extension (iOAM) Header definition
- */
-typedef struct
-{
-  u8 type;
-  u8 length;
-  /** Reserved */
-  u8 reserved;
-  /** see vxlan_gpe_protocol_t */
-  u8 protocol;
-} vxlan_gpe_ioam_hdr_t;
-
-/*
- * @brief VxLAN GPE iOAM Option definition
- */
-typedef struct
-{
-  /* Option Type */
-  u8 type;
-  /* Length in octets of the option data field */
-  u8 length;
-} vxlan_gpe_ioam_option_t;
-
-
-#endif
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c b/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c
deleted file mode 100644
index e37b1642..00000000
--- a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c
+++ /dev/null
@@ -1,552 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-
-#include <ioam/lib-trace/trace_util.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
-
-/* Timestamp precision multipliers for seconds, milliseconds, microseconds
- * and nanoseconds respectively.
- */
-static f64 trace_tsp_mul[4] = { 1, 1e3, 1e6, 1e9 };
-
-typedef union
-{
-  u64 as_u64;
-  u32 as_u32[2];
-} time_u64_t;
-
-
-/* *INDENT-OFF* */
-typedef CLIB_PACKED(struct {
-  vxlan_gpe_ioam_option_t hdr;
-  u8 ioam_trace_type;
-  u8 data_list_elts_left;
-  u32 elts[0]; /* Variable type. So keep it generic */
-}) vxlan_gpe_ioam_trace_option_t;
-/* *INDENT-ON* */
-
-
-#define foreach_vxlan_gpe_ioam_trace_stats				\
-  _(SUCCESS, "Pkts updated with TRACE records")					\
-  _(FAILED, "Errors in TRACE due to lack of TRACE records")
-
-static char *vxlan_gpe_ioam_trace_stats_strings[] = {
-#define _(sym,string) string,
-  foreach_vxlan_gpe_ioam_trace_stats
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) VXLAN_GPE_IOAM_TRACE_##sym,
-  foreach_vxlan_gpe_ioam_trace_stats
-#undef _
-    VXLAN_GPE_IOAM_TRACE_N_STATS,
-} vxlan_gpe_ioam_trace_stats_t;
-
-
-typedef struct
-{
-  /* stats */
-  u64 counters[ARRAY_LEN (vxlan_gpe_ioam_trace_stats_strings)];
-
-  /* convenience */
-  vlib_main_t *vlib_main;
-  vnet_main_t *vnet_main;
-} vxlan_gpe_ioam_trace_main_t;
-
-vxlan_gpe_ioam_trace_main_t vxlan_gpe_ioam_trace_main;
-
-int
-vxlan_gpe_ioam_add_register_option (u8 option,
-				    u8 size,
-				    int rewrite_options (u8 * rewrite_string,
-							 u8 * rewrite_size))
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-
-  ASSERT (option < ARRAY_LEN (hm->add_options));
-
-  /* Already registered */
-  if (hm->add_options[option])
-    return (-1);
-
-  hm->add_options[option] = rewrite_options;
-  hm->options_size[option] = size;
-
-  return (0);
-}
-
-int
-vxlan_gpe_add_unregister_option (u8 option)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-
-  ASSERT (option < ARRAY_LEN (hm->add_options));
-
-  /* Not registered */
-  if (!hm->add_options[option])
-    return (-1);
-
-  hm->add_options[option] = NULL;
-  hm->options_size[option] = 0;
-  return (0);
-}
-
-
-int
-vxlan_gpe_ioam_register_option (u8 option,
-				int options (vlib_buffer_t * b,
-					     vxlan_gpe_ioam_option_t * opt,
-					     u8 is_ipv4, u8 use_adj),
-				u8 * trace (u8 * s,
-					    vxlan_gpe_ioam_option_t * opt))
-{
-  vxlan_gpe_ioam_main_t *im = &vxlan_gpe_ioam_main;
-
-  ASSERT (option < ARRAY_LEN (im->options));
-
-  /* Already registered */
-  if (im->options[option])
-    return (-1);
-
-  im->options[option] = options;
-  im->trace[option] = trace;
-
-  return (0);
-}
-
-int
-vxlan_gpe_ioam_unregister_option (u8 option)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-
-  ASSERT (option < ARRAY_LEN (hm->options));
-
-  /* Not registered */
-  if (!hm->options[option])
-    return (-1);
-
-  hm->options[option] = NULL;
-  hm->trace[option] = NULL;
-
-  return (0);
-}
-
-
-always_inline void
-vxlan_gpe_ioam_trace_stats_increment_counter (u32 counter_index,
-					      u64 increment)
-{
-  vxlan_gpe_ioam_trace_main_t *hm = &vxlan_gpe_ioam_trace_main;
-
-  hm->counters[counter_index] += increment;
-}
-
-
-static u8 *
-format_ioam_data_list_element (u8 * s, va_list * args)
-{
-  u32 *elt = va_arg (*args, u32 *);
-  u8 *trace_type_p = va_arg (*args, u8 *);
-  u8 trace_type = *trace_type_p;
-
-
-  if (trace_type & BIT_TTL_NODEID)
-    {
-      u32 ttl_node_id_host_byte_order = clib_net_to_host_u32 (*elt);
-      s = format (s, "ttl 0x%x node id 0x%x ",
-		  ttl_node_id_host_byte_order >> 24,
-		  ttl_node_id_host_byte_order & 0x00FFFFFF);
-
-      elt++;
-    }
-
-  if (trace_type & BIT_ING_INTERFACE && trace_type & BIT_ING_INTERFACE)
-    {
-      u32 ingress_host_byte_order = clib_net_to_host_u32 (*elt);
-      s = format (s, "ingress 0x%x egress 0x%x ",
-		  ingress_host_byte_order >> 16,
-		  ingress_host_byte_order & 0xFFFF);
-      elt++;
-    }
-
-  if (trace_type & BIT_TIMESTAMP)
-    {
-      u32 ts_in_host_byte_order = clib_net_to_host_u32 (*elt);
-      s = format (s, "ts 0x%x \n", ts_in_host_byte_order);
-      elt++;
-    }
-
-  if (trace_type & BIT_APPDATA)
-    {
-      u32 appdata_in_host_byte_order = clib_net_to_host_u32 (*elt);
-      s = format (s, "app 0x%x ", appdata_in_host_byte_order);
-      elt++;
-    }
-
-  return s;
-}
-
-
-
-int
-vxlan_gpe_ioam_trace_rewrite_handler (u8 * rewrite_string, u8 * rewrite_size)
-{
-  vxlan_gpe_ioam_trace_option_t *trace_option = NULL;
-  u8 trace_data_size = 0;
-  u8 trace_option_elts = 0;
-  trace_profile *profile = NULL;
-
-
-  profile = trace_profile_find ();
-
-  if (PREDICT_FALSE (!profile))
-    {
-      return (-1);
-    }
-
-  if (PREDICT_FALSE (!rewrite_string))
-    return -1;
-
-  trace_option_elts = profile->num_elts;
-  trace_data_size = fetch_trace_data_size (profile->trace_type);
-  trace_option = (vxlan_gpe_ioam_trace_option_t *) rewrite_string;
-  trace_option->hdr.type = VXLAN_GPE_OPTION_TYPE_IOAM_TRACE;
-  trace_option->hdr.length = 2 /*ioam_trace_type,data_list_elts_left */  +
-    trace_option_elts * trace_data_size;
-  trace_option->ioam_trace_type = profile->trace_type & TRACE_TYPE_MASK;
-  trace_option->data_list_elts_left = trace_option_elts;
-  *rewrite_size =
-    sizeof (vxlan_gpe_ioam_trace_option_t) +
-    (trace_option_elts * trace_data_size);
-
-  return 0;
-}
-
-
-int
-vxlan_gpe_ioam_trace_data_list_handler (vlib_buffer_t * b,
-					vxlan_gpe_ioam_option_t * opt,
-					u8 is_ipv4, u8 use_adj)
-{
-  u8 elt_index = 0;
-  vxlan_gpe_ioam_trace_option_t *trace =
-    (vxlan_gpe_ioam_trace_option_t *) opt;
-  time_u64_t time_u64;
-  u32 *elt;
-  int rv = 0;
-  trace_profile *profile = NULL;
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-
-
-  profile = trace_profile_find ();
-
-  if (PREDICT_FALSE (!profile))
-    {
-      return (-1);
-    }
-
-
-  time_u64.as_u64 = 0;
-
-  if (PREDICT_TRUE (trace->data_list_elts_left))
-    {
-      trace->data_list_elts_left--;
-      /* fetch_trace_data_size returns in bytes. Convert it to 4-bytes
-       * to skip to this node's location.
-       */
-      elt_index =
-	trace->data_list_elts_left *
-	fetch_trace_data_size (trace->ioam_trace_type) / 4;
-      elt = &trace->elts[elt_index];
-      if (is_ipv4)
-	{
-	  if (trace->ioam_trace_type & BIT_TTL_NODEID)
-	    {
-	      ip4_header_t *ip0 = vlib_buffer_get_current (b);
-	      /* The transit case is the only case where the TTL decrement happens
-	       * before iOAM processing. For now, use the use_adj flag as an overload.
-	       * We can probably use a separate flag instead of overloading the use_adj flag.
-	       */
-	      *elt = clib_host_to_net_u32 (((ip0->ttl - 1 + use_adj) << 24) |
-					   profile->node_id);
-	      elt++;
-	    }
-
-	  if (trace->ioam_trace_type & BIT_ING_INTERFACE)
-	    {
-	      u16 tx_if = 0;
-	      u32 adj_index = vnet_buffer (b)->ip.adj_index[VLIB_TX];
-	      ip4_main_t *im4 = &ip4_main;
-	      ip_lookup_main_t *lm = &im4->lookup_main;
-	      if (use_adj)
-		{
-		  ip_adjacency_t *adj = ip_get_adjacency (lm, adj_index);
-		  tx_if = adj->rewrite_header.sw_if_index & 0xFFFF;
-		}
-
-	      *elt =
-		(vnet_buffer (b)->sw_if_index[VLIB_RX] & 0xFFFF) << 16 |
-		tx_if;
-	      *elt = clib_host_to_net_u32 (*elt);
-	      elt++;
-	    }
-	}
-      else
-	{
-	  if (trace->ioam_trace_type & BIT_TTL_NODEID)
-	    {
-	      ip6_header_t *ip0 = vlib_buffer_get_current (b);
-	      *elt = clib_host_to_net_u32 ((ip0->hop_limit << 24) |
-					   profile->node_id);
-	      elt++;
-	    }
-	  if (trace->ioam_trace_type & BIT_ING_INTERFACE)
-	    {
-	      u16 tx_if = 0;
-	      u32 adj_index = vnet_buffer (b)->ip.adj_index[VLIB_TX];
-	      ip6_main_t *im6 = &ip6_main;
-	      ip_lookup_main_t *lm = &im6->lookup_main;
-	      if (use_adj)
-		{
-		  ip_adjacency_t *adj = ip_get_adjacency (lm, adj_index);
-		  tx_if = adj->rewrite_header.sw_if_index & 0xFFFF;
-		}
-
-	      *elt =
-		(vnet_buffer (b)->sw_if_index[VLIB_RX] & 0xFFFF) << 16 |
-		tx_if;
-	      *elt = clib_host_to_net_u32 (*elt);
-	      elt++;
-	    }
-	}
-
-      if (trace->ioam_trace_type & BIT_TIMESTAMP)
-	{
-	  /* Send least significant 32 bits */
-	  f64 time_f64 =
-	    (f64) (((f64) hm->unix_time_0) +
-		   (vlib_time_now (hm->vlib_main) - hm->vlib_time_0));
-
-	  time_u64.as_u64 = time_f64 * trace_tsp_mul[profile->trace_tsp];
-	  *elt = clib_host_to_net_u32 (time_u64.as_u32[0]);
-	  elt++;
-	}
-
-      if (trace->ioam_trace_type & BIT_APPDATA)
-	{
-	  /* $$$ set elt0->app_data */
-	  *elt = clib_host_to_net_u32 (profile->app_data);
-	  elt++;
-	}
-      vxlan_gpe_ioam_trace_stats_increment_counter
-	(VXLAN_GPE_IOAM_TRACE_SUCCESS, 1);
-    }
-  else
-    {
-      vxlan_gpe_ioam_trace_stats_increment_counter
-	(VXLAN_GPE_IOAM_TRACE_FAILED, 1);
-    }
-  return (rv);
-}
-
-u8 *
-vxlan_gpe_ioam_trace_data_list_trace_handler (u8 * s,
-					      vxlan_gpe_ioam_option_t * opt)
-{
-  vxlan_gpe_ioam_trace_option_t *trace;
-  u8 trace_data_size_in_words = 0;
-  u32 *elt;
-  int elt_index = 0;
-
-  trace = (vxlan_gpe_ioam_trace_option_t *) opt;
-  s =
-    format (s, "  Trace Type 0x%x , %d elts left\n", trace->ioam_trace_type,
-	    trace->data_list_elts_left);
-  trace_data_size_in_words =
-    fetch_trace_data_size (trace->ioam_trace_type) / 4;
-  elt = &trace->elts[0];
-  while ((u8 *) elt < ((u8 *) (&trace->elts[0]) + trace->hdr.length - 2
-		       /* -2 accounts for ioam_trace_type,elts_left */ ))
-    {
-      s = format (s, "    [%d] %U\n", elt_index,
-		  format_ioam_data_list_element,
-		  elt, &trace->ioam_trace_type);
-      elt_index++;
-      elt += trace_data_size_in_words;
-    }
-  return (s);
-}
-
-
-static clib_error_t *
-vxlan_gpe_show_ioam_trace_cmd_fn (vlib_main_t * vm,
-				  unformat_input_t * input,
-				  vlib_cli_command_t * cmd)
-{
-  vxlan_gpe_ioam_trace_main_t *hm = &vxlan_gpe_ioam_trace_main;
-  u8 *s = 0;
-  int i = 0;
-
-  for (i = 0; i < VXLAN_GPE_IOAM_TRACE_N_STATS; i++)
-    {
-      s = format (s, " %s - %lu\n", vxlan_gpe_ioam_trace_stats_strings[i],
-		  hm->counters[i]);
-    }
-
-  vlib_cli_output (vm, "%v", s);
-  vec_free (s);
-  return 0;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (vxlan_gpe_show_ioam_trace_cmd, static) = {
-  .path = "show ioam vxlan-gpe trace",
-  .short_help = "iOAM trace statistics",
-  .function = vxlan_gpe_show_ioam_trace_cmd_fn,
-};
-/* *INDENT-ON* */
-
-
-static clib_error_t *
-vxlan_gpe_ioam_trace_init (vlib_main_t * vm)
-{
-  vxlan_gpe_ioam_trace_main_t *hm = &vxlan_gpe_ioam_trace_main;
-  clib_error_t *error;
-
-  if ((error = vlib_call_init_function (vm, ip_main_init)))
-    return (error);
-
-  if ((error = vlib_call_init_function (vm, ip6_lookup_init)))
-    return error;
-
-  if ((error = vlib_call_init_function (vm, vxlan_gpe_init)))
-    return (error);
-
-  hm->vlib_main = vm;
-  hm->vnet_main = vnet_get_main ();
-  memset (hm->counters, 0, sizeof (hm->counters));
-
-  if (vxlan_gpe_ioam_register_option
-      (VXLAN_GPE_OPTION_TYPE_IOAM_TRACE,
-       vxlan_gpe_ioam_trace_data_list_handler,
-       vxlan_gpe_ioam_trace_data_list_trace_handler) < 0)
-    return (clib_error_create
-	    ("registration of VXLAN_GPE_OPTION_TYPE_IOAM_TRACE failed"));
-
-
-  if (vxlan_gpe_ioam_add_register_option
-      (VXLAN_GPE_OPTION_TYPE_IOAM_TRACE,
-       sizeof (vxlan_gpe_ioam_trace_option_t),
-       vxlan_gpe_ioam_trace_rewrite_handler) < 0)
-    return (clib_error_create
-	    ("registration of VXLAN_GPE_OPTION_TYPE_IOAM_TRACE for rewrite failed"));
-
-
-  return (0);
-}
-
-VLIB_INIT_FUNCTION (vxlan_gpe_ioam_trace_init);
-
-int
-vxlan_gpe_trace_profile_cleanup (void)
-{
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-
-  hm->options_size[VXLAN_GPE_OPTION_TYPE_IOAM_TRACE] = 0;
-
-  return 0;
-
-}
-
-static int
-vxlan_gpe_ioam_trace_get_sizeof_handler (u32 * result)
-{
-  u16 size = 0;
-  u8 trace_data_size = 0;
-  trace_profile *profile = NULL;
-
-  *result = 0;
-
-  profile = trace_profile_find ();
-
-  if (PREDICT_FALSE (!profile))
-    {
-      return (-1);
-    }
-
-  trace_data_size = fetch_trace_data_size (profile->trace_type);
-  if (PREDICT_FALSE (trace_data_size == 0))
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  if (PREDICT_FALSE (profile->num_elts * trace_data_size > 254))
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  size +=
-    sizeof (vxlan_gpe_ioam_trace_option_t) +
-    profile->num_elts * trace_data_size;
-  *result = size;
-
-  return 0;
-}
-
-
-int
-vxlan_gpe_trace_profile_setup (void)
-{
-  u32 trace_size = 0;
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-
-  trace_profile *profile = NULL;
-
-
-  profile = trace_profile_find ();
-
-  if (PREDICT_FALSE (!profile))
-    {
-      return (-1);
-    }
-
-
-  if (vxlan_gpe_ioam_trace_get_sizeof_handler (&trace_size) < 0)
-    return (-1);
-
-  hm->options_size[VXLAN_GPE_OPTION_TYPE_IOAM_TRACE] = trace_size;
-
-  return (0);
-}
-
-
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h b/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h
deleted file mode 100644
index c0ad8d9d..00000000
--- a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_vxlan_gpe_ioam_util_h__
-#define __included_vxlan_gpe_ioam_util_h__
-
-#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
-#include <vnet/ip/ip.h>
-
-
-typedef struct
-{
-  u32 tunnel_index;
-  ioam_trace_t fmt_trace;
-} vxlan_gpe_ioam_v4_trace_t;
-
-
-static u8 *
-format_vxlan_gpe_ioam_v4_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  vxlan_gpe_ioam_v4_trace_t *t1 = va_arg (*args, vxlan_gpe_ioam_v4_trace_t *);
-  ioam_trace_t *t = &(t1->fmt_trace);
-  vxlan_gpe_ioam_option_t *fmt_trace0;
-  vxlan_gpe_ioam_option_t *opt0, *limit0;
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-
-  u8 type0;
-
-  fmt_trace0 = (vxlan_gpe_ioam_option_t *) t->option_data;
-
-  s = format (s, "VXLAN-GPE-IOAM: next_index %d len %d traced %d",
-	      t->next_index, fmt_trace0->length, t->trace_len);
-
-  opt0 = (vxlan_gpe_ioam_option_t *) (fmt_trace0 + 1);
-  limit0 = (vxlan_gpe_ioam_option_t *) ((u8 *) fmt_trace0) + t->trace_len;
-
-  while (opt0 < limit0)
-    {
-      type0 = opt0->type;
-      switch (type0)
-	{
-	case 0:		/* Pad, just stop */
-	  opt0 = (vxlan_gpe_ioam_option_t *) ((u8 *) opt0) + 1;
-	  break;
-
-	default:
-	  if (hm->trace[type0])
-	    {
-	      s = (*hm->trace[type0]) (s, opt0);
-	    }
-	  else
-	    {
-	      s =
-		format (s, "\n    unrecognized option %d length %d", type0,
-			opt0->length);
-	    }
-	  opt0 =
-	    (vxlan_gpe_ioam_option_t *) (((u8 *) opt0) + opt0->length +
-					 sizeof (vxlan_gpe_ioam_option_t));
-	  break;
-	}
-    }
-
-  s = format (s, "VXLAN-GPE-IOAM: tunnel %d", t1->tunnel_index);
-  return s;
-}
-
-
-always_inline void
-vxlan_gpe_encap_decap_ioam_v4_one_inline (vlib_main_t * vm,
-					  vlib_node_runtime_t * node,
-					  vlib_buffer_t * b0,
-					  u32 * next0, u32 drop_node_val,
-					  u8 use_adj)
-{
-  ip4_header_t *ip0;
-  udp_header_t *udp_hdr0;
-  vxlan_gpe_header_t *gpe_hdr0;
-  vxlan_gpe_ioam_hdr_t *gpe_ioam0;
-  vxlan_gpe_ioam_option_t *opt0;
-  vxlan_gpe_ioam_option_t *limit0;
-  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
-
-  /* Populate the iOAM header */
-  ip0 = vlib_buffer_get_current (b0);
-  udp_hdr0 = (udp_header_t *) (ip0 + 1);
-  gpe_hdr0 = (vxlan_gpe_header_t *) (udp_hdr0 + 1);
-  gpe_ioam0 = (vxlan_gpe_ioam_hdr_t *) (gpe_hdr0 + 1);
-  opt0 = (vxlan_gpe_ioam_option_t *) (gpe_ioam0 + 1);
-  limit0 = (vxlan_gpe_ioam_option_t *) ((u8 *) gpe_ioam0 + gpe_ioam0->length);
-
-  /*
-   * Basic validity checks
-   */
-  if (gpe_ioam0->length > clib_net_to_host_u16 (ip0->length))
-    {
-      *next0 = drop_node_val;
-      return;
-    }
-
-  /* Scan the set of h-b-h options, process ones that we understand */
-  while (opt0 < limit0)
-    {
-      u8 type0;
-      type0 = opt0->type;
-      switch (type0)
-	{
-	case 0:		/* Pad1 */
-	  opt0 = (vxlan_gpe_ioam_option_t *) ((u8 *) opt0) + 1;
-	  continue;
-	case 1:		/* PadN */
-	  break;
-	default:
-	  if (hm->options[type0])
-	    {
-	      if ((*hm->options[type0]) (b0, opt0, 1 /* is_ipv4 */ ,
-					 use_adj) < 0)
-		{
-		  *next0 = drop_node_val;
-		  return;
-		}
-	    }
-	  break;
-	}
-      opt0 =
-	(vxlan_gpe_ioam_option_t *) (((u8 *) opt0) + opt0->length +
-				     sizeof (vxlan_gpe_ioam_hdr_t));
-    }
-
-
-  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-    {
-      vxlan_gpe_ioam_v4_trace_t *t =
-	vlib_add_trace (vm, node, b0, sizeof (*t));
-      u32 trace_len = gpe_ioam0->length;
-      t->fmt_trace.next_index = *next0;
-      /* Capture the ioam option verbatim */
-      trace_len =
-	trace_len <
-	ARRAY_LEN (t->fmt_trace.
-		   option_data) ? trace_len : ARRAY_LEN (t->fmt_trace.
-							 option_data);
-      t->fmt_trace.trace_len = trace_len;
-      clib_memcpy (&(t->fmt_trace.option_data), gpe_ioam0, trace_len);
-    }
-  return;
-}
-
-
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h b/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h
deleted file mode 100644
index cc0a10a3..00000000
--- a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_vxlan_gpe_msg_enum_h
-#define included_vxlan_gpe_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
-    /* We'll want to know how many messages IDs we need... */
-    VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* included_vxlan_gpe_msg_enum_h */
diff --git a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_test.c b/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
deleted file mode 100644
index 47253eb6..00000000
--- a/plugins/ioam-plugin/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
+++ /dev/null
@@ -1,600 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * vxlan_gpe_test.c - test harness for vxlan_gpe plugin
- *------------------------------------------------------------------
- */
-
-#include <vat/vat.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-#include <vppinfra/error.h>
-
-/* Declare message IDs */
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun		/* define message structures */
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number. */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
-#undef vl_api_version
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h>
-#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
-
-typedef struct
-{
-  /* API message ID base */
-  u16 msg_id_base;
-  vat_main_t *vat_main;
-} vxlan_gpe_test_main_t;
-
-vxlan_gpe_test_main_t vxlan_gpe_test_main;
-
-#define foreach_standard_reply_retval_handler     \
-_(vxlan_gpe_ioam_enable_reply)                    \
-_(vxlan_gpe_ioam_disable_reply)                   \
-_(vxlan_gpe_ioam_vni_enable_reply)                \
-_(vxlan_gpe_ioam_vni_disable_reply)               \
-_(vxlan_gpe_ioam_transit_enable_reply)            \
-_(vxlan_gpe_ioam_transit_disable_reply)
-
-#define _(n)                                            \
-    static void vl_api_##n##_t_handler                  \
-    (vl_api_##n##_t * mp)                               \
-    {                                                   \
-        vat_main_t * vam = vxlan_gpe_test_main.vat_main;   \
-        i32 retval = ntohl(mp->retval);                 \
-        if (vam->async_mode) {                          \
-            vam->async_errors += (retval < 0);          \
-        } else {                                        \
-            vam->retval = retval;                       \
-            vam->result_ready = 1;                      \
-        }                                               \
-    }
-foreach_standard_reply_retval_handler;
-#undef _
-
-/*
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg                                              \
-_(VXLAN_GPE_IOAM_ENABLE_REPLY, vxlan_gpe_ioam_enable_reply)                    \
-_(VXLAN_GPE_IOAM_DISABLE_REPLY, vxlan_gpe_ioam_disable_reply)                  \
-_(VXLAN_GPE_IOAM_VNI_ENABLE_REPLY, vxlan_gpe_ioam_vni_enable_reply)            \
-_(VXLAN_GPE_IOAM_VNI_DISABLE_REPLY, vxlan_gpe_ioam_vni_disable_reply)          \
-_(VXLAN_GPE_IOAM_TRANSIT_ENABLE_REPLY, vxlan_gpe_ioam_transit_enable_reply)    \
-_(VXLAN_GPE_IOAM_TRANSIT_DISABLE_REPLY, vxlan_gpe_ioam_transit_disable_reply)  \
-
-
-/* M: construct, but don't yet send a message */
-
-#define M(T,t)                                                  \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp));                         \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-#define M2(T,t,n)                                               \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W                                       \
-do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
-                                                \
-    while (vat_time_now (vam) < timeout) {      \
-        if (vam->result_ready == 1) {           \
-            return (vam->retval);               \
-        }                                       \
-    }                                           \
-    return -99;                                 \
-} while(0);
-
-
-static int
-api_vxlan_gpe_ioam_enable (vat_main_t * vam)
-{
-  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
-
-  unformat_input_t *input = vam->input;
-  vl_api_vxlan_gpe_ioam_enable_t *mp;
-  f64 timeout;
-  u32 id = 0;
-  int has_trace_option = 0;
-  int has_pow_option = 0;
-  int has_ppc_option = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "trace"))
-	has_trace_option = 1;
-      else if (unformat (input, "pow"))
-	has_pow_option = 1;
-      else if (unformat (input, "ppc encap"))
-	has_ppc_option = PPC_ENCAP;
-      else if (unformat (input, "ppc decap"))
-	has_ppc_option = PPC_DECAP;
-      else if (unformat (input, "ppc none"))
-	has_ppc_option = PPC_NONE;
-      else
-	break;
-    }
-  M (VXLAN_GPE_IOAM_ENABLE, vxlan_gpe_ioam_enable);
-  mp->id = htons (id);
-  mp->trace_ppc = has_ppc_option;
-  mp->pow_enable = has_pow_option;
-  mp->trace_enable = has_trace_option;
-
-
-  S;
-  W;
-
-  return (0);
-}
-
-
-static int
-api_vxlan_gpe_ioam_disable (vat_main_t * vam)
-{
-  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
-  vl_api_vxlan_gpe_ioam_disable_t *mp;
-  f64 timeout;
-
-  M (VXLAN_GPE_IOAM_DISABLE, vxlan_gpe_ioam_disable);
-  S;
-  W;
-  return 0;
-}
-
-static int
-api_vxlan_gpe_ioam_vni_enable (vat_main_t * vam)
-{
-  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
-
-  unformat_input_t *line_input = vam->input;
-  vl_api_vxlan_gpe_ioam_vni_enable_t *mp;
-  ip4_address_t local4, remote4;
-  ip6_address_t local6, remote6;
-  u8 ipv4_set = 0, ipv6_set = 0;
-  u8 local_set = 0;
-  u8 remote_set = 0;
-  u32 vni;
-  u8 vni_set = 0;
-  f64 timeout;
-
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "local %U", unformat_ip4_address, &local4))
-	{
-	  local_set = 1;
-	  ipv4_set = 1;
-	}
-      else if (unformat (line_input, "remote %U",
-			 unformat_ip4_address, &remote4))
-	{
-	  remote_set = 1;
-	  ipv4_set = 1;
-	}
-      else if (unformat (line_input, "local %U",
-			 unformat_ip6_address, &local6))
-	{
-	  local_set = 1;
-	  ipv6_set = 1;
-	}
-      else if (unformat (line_input, "remote %U",
-			 unformat_ip6_address, &remote6))
-	{
-	  remote_set = 1;
-	  ipv6_set = 1;
-	}
-
-      else if (unformat (line_input, "vni %d", &vni))
-	vni_set = 1;
-      else
-	{
-	  errmsg ("parse error '%U'\n", format_unformat_error, line_input);
-	  return -99;
-	}
-    }
-
-  if (local_set == 0)
-    {
-      errmsg ("tunnel local address not specified\n");
-      return -99;
-    }
-  if (remote_set == 0)
-    {
-      errmsg ("tunnel remote address not specified\n");
-      return -99;
-    }
-  if (ipv4_set && ipv6_set)
-    {
-      errmsg ("both IPv4 and IPv6 addresses specified");
-      return -99;
-    }
-
-  if (vni_set == 0)
-    {
-      errmsg ("vni not specified\n");
-      return -99;
-    }
-
-  M (VXLAN_GPE_IOAM_VNI_ENABLE, vxlan_gpe_ioam_vni_enable);
-
-
-  if (ipv6_set)
-    {
-      clib_memcpy (&mp->local, &local6, sizeof (local6));
-      clib_memcpy (&mp->remote, &remote6, sizeof (remote6));
-    }
-  else
-    {
-      clib_memcpy (&mp->local, &local4, sizeof (local4));
-      clib_memcpy (&mp->remote, &remote4, sizeof (remote4));
-    }
-
-  mp->vni = ntohl (vni);
-  mp->is_ipv6 = ipv6_set;
-
-  S;
-  W;
-
-  return (0);
-}
-
-static int
-api_vxlan_gpe_ioam_vni_disable (vat_main_t * vam)
-{
-  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
-
-  unformat_input_t *line_input = vam->input;
-  vl_api_vxlan_gpe_ioam_vni_disable_t *mp;
-  ip4_address_t local4, remote4;
-  ip6_address_t local6, remote6;
-  u8 ipv4_set = 0, ipv6_set = 0;
-  u8 local_set = 0;
-  u8 remote_set = 0;
-  u32 vni;
-  u8 vni_set = 0;
-  f64 timeout;
-
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "local %U", unformat_ip4_address, &local4))
-	{
-	  local_set = 1;
-	  ipv4_set = 1;
-	}
-      else if (unformat (line_input, "remote %U",
-			 unformat_ip4_address, &remote4))
-	{
-	  remote_set = 1;
-	  ipv4_set = 1;
-	}
-      else if (unformat (line_input, "local %U",
-			 unformat_ip6_address, &local6))
-	{
-	  local_set = 1;
-	  ipv6_set = 1;
-	}
-      else if (unformat (line_input, "remote %U",
-			 unformat_ip6_address, &remote6))
-	{
-	  remote_set = 1;
-	  ipv6_set = 1;
-	}
-
-      else if (unformat (line_input, "vni %d", &vni))
-	vni_set = 1;
-      else
-	{
-	  errmsg ("parse error '%U'\n", format_unformat_error, line_input);
-	  return -99;
-	}
-    }
-
-  if (local_set == 0)
-    {
-      errmsg ("tunnel local address not specified\n");
-      return -99;
-    }
-  if (remote_set == 0)
-    {
-      errmsg ("tunnel remote address not specified\n");
-      return -99;
-    }
-  if (ipv4_set && ipv6_set)
-    {
-      errmsg ("both IPv4 and IPv6 addresses specified");
-      return -99;
-    }
-
-  if (vni_set == 0)
-    {
-      errmsg ("vni not specified\n");
-      return -99;
-    }
-
-  M (VXLAN_GPE_IOAM_VNI_DISABLE, vxlan_gpe_ioam_vni_disable);
-
-
-  if (ipv6_set)
-    {
-      clib_memcpy (&mp->local, &local6, sizeof (local6));
-      clib_memcpy (&mp->remote, &remote6, sizeof (remote6));
-    }
-  else
-    {
-      clib_memcpy (&mp->local, &local4, sizeof (local4));
-      clib_memcpy (&mp->remote, &remote4, sizeof (remote4));
-    }
-
-  mp->vni = ntohl (vni);
-  mp->is_ipv6 = ipv6_set;
-
-  S;
-  W;
-
-  return 0;
-}
-
-static int
-api_vxlan_gpe_ioam_transit_enable (vat_main_t * vam)
-{
-  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
-
-  unformat_input_t *line_input = vam->input;
-  vl_api_vxlan_gpe_ioam_transit_enable_t *mp;
-  ip4_address_t local4;
-  ip6_address_t local6;
-  u8 ipv4_set = 0, ipv6_set = 0;
-  u8 local_set = 0;
-  u32 outer_fib_index = 0;
-  f64 timeout;
-
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "dst-ip %U", unformat_ip4_address, &local4))
-	{
-	  local_set = 1;
-	  ipv4_set = 1;
-	}
-      else if (unformat (line_input, "dst-ip %U",
-			 unformat_ip6_address, &local6))
-	{
-	  local_set = 1;
-	  ipv6_set = 1;
-	}
-
-      else if (unformat (line_input, "outer-fib-index %d", &outer_fib_index))
-	;
-      else
-	{
-	  errmsg ("parse error '%U'\n", format_unformat_error, line_input);
-	  return -99;
-	}
-    }
-
-  if (local_set == 0)
-    {
-      errmsg ("destination address not specified\n");
-      return -99;
-    }
-  if (ipv4_set && ipv6_set)
-    {
-      errmsg ("both IPv4 and IPv6 addresses specified");
-      return -99;
-    }
-
-
-  M (VXLAN_GPE_IOAM_TRANSIT_ENABLE, vxlan_gpe_ioam_transit_enable);
-
-
-  if (ipv6_set)
-    {
-      errmsg ("IPv6 currently unsupported");
-      return -1;
-    }
-  else
-    {
-      clib_memcpy (&mp->dst_addr, &local4, sizeof (local4));
-    }
-
-  mp->outer_fib_index = htonl (outer_fib_index);
-  mp->is_ipv6 = ipv6_set;
-
-  S;
-  W;
-
-  return (0);
-}
-
-static int
-api_vxlan_gpe_ioam_transit_disable (vat_main_t * vam)
-{
-  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
-
-  unformat_input_t *line_input = vam->input;
-  vl_api_vxlan_gpe_ioam_transit_disable_t *mp;
-  ip4_address_t local4;
-  ip6_address_t local6;
-  u8 ipv4_set = 0, ipv6_set = 0;
-  u8 local_set = 0;
-  u32 outer_fib_index;
-  f64 timeout;
-
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "dst-ip %U", unformat_ip4_address, &local4))
-	{
-	  local_set = 1;
-	  ipv4_set = 1;
-	}
-      else if (unformat (line_input, "dst-ip %U",
-			 unformat_ip6_address, &local6))
-	{
-	  local_set = 1;
-	  ipv6_set = 1;
-	}
-
-      else if (unformat (line_input, "outer-fib-index %d", &outer_fib_index))
-	;
-      else
-	{
-	  errmsg ("parse error '%U'\n", format_unformat_error, line_input);
-	  return -99;
-	}
-    }
-
-  if (local_set == 0)
-    {
-      errmsg ("destination address not specified\n");
-      return -99;
-    }
-  if (ipv4_set && ipv6_set)
-    {
-      errmsg ("both IPv4 and IPv6 addresses specified");
-      return -99;
-    }
-
-
-  M (VXLAN_GPE_IOAM_TRANSIT_DISABLE, vxlan_gpe_ioam_transit_disable);
-
-
-  if (ipv6_set)
-    {
-      return -1;
-    }
-  else
-    {
-      clib_memcpy (&mp->dst_addr, &local4, sizeof (local4));
-    }
-
-  mp->outer_fib_index = htonl (outer_fib_index);
-  mp->is_ipv6 = ipv6_set;
-
-  S;
-  W;
-
-
-  return (0);
-}
-
-/*
- * List of messages that the api test plugin sends,
- * and that the data plane plugin processes
- */
-#define foreach_vpe_api_msg \
-_(vxlan_gpe_ioam_enable, ""\
-  "[trace] [pow] [ppc <encap|ppc decap>]") \
-_(vxlan_gpe_ioam_disable, "")                    \
-_(vxlan_gpe_ioam_vni_enable, ""\
-  "local <local_vtep_ip> remote <remote_vtep_ip> vni <vnid>") \
-_(vxlan_gpe_ioam_vni_disable, ""\
-  "local <local_vtep_ip> remote <remote_vtep_ip> vni <vnid>") \
-_(vxlan_gpe_ioam_transit_enable, ""\
-  "dst-ip <dst_ip> [outer-fib-index <outer_fib_index>]") \
-_(vxlan_gpe_ioam_transit_disable, ""\
-  "dst-ip <dst_ip> [outer-fib-index <outer_fib_index>]") \
-
-
-void
-vat_api_hookup (vat_main_t * vam)
-{
-  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
-  /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,                                  \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_reply_msg;
-#undef _
-
-  /* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
-  foreach_vpe_api_msg;
-#undef _
-
-  /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
-  foreach_vpe_api_msg;
-#undef _
-}
-
-clib_error_t *
-vat_plugin_register (vat_main_t * vam)
-{
-  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
-  u8 *name;
-
-  sm->vat_main = vam;
-
-  name = format (0, "ioam_vxlan_gpe_%08x%c", api_version, 0);
-  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (sm->msg_id_base != (u16) ~ 0)
-    vat_api_hookup (vam);
-
-  vec_free (name);
-
-  return 0;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/plugins/lb-plugin/Makefile.am b/plugins/lb-plugin/Makefile.am
deleted file mode 100644
index 8e360279..00000000
--- a/plugins/lb-plugin/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright (c) 2016 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall
-AM_LDFLAGS = -module -shared -avoid-version
-
-vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
-vpppluginsdir = ${libdir}/vpp_plugins
-
-vppapitestplugins_LTLIBRARIES = lb_test_plugin.la
-vppplugins_LTLIBRARIES = lb_plugin.la
-
-lb_plugin_la_SOURCES = lb/lb.c lb/node.c lb/cli.c lb/util.c lb/refcount.c lb/api.c
-
-BUILT_SOURCES =					\
-	lb/lb.api.h		\
-	lb/lb.api.json
-
-SUFFIXES = .api.h .api .api.json
-
-%.api.h: %.api
-	mkdir -p `dirname $@` ; \
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
-	| vppapigen --input - --output $@ --show-name $@
-
-%.api.json: %.api
-	@echo "  JSON APIGEN  " $@ ;				\
-	mkdir -p `dirname $@` ;					\
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
-	| vppapigen --input - --json $@
-
-apidir = $(prefix)/lb/
-api_DATA = lb/lb.api.json
-
-noinst_HEADERS = lb/lb.h lb/util.h lb/refcount.h  lb/lbhash.h lb/lb.api.h
-
-lb_test_plugin_la_SOURCES = \
-  lb/lb_test.c lb/lb_plugin.api.h
-
-# Remove *.la files
-install-data-hook:
-	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
-	@(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
diff --git a/plugins/lb-plugin/configure.ac b/plugins/lb-plugin/configure.ac
deleted file mode 100644
index 1b02e54f..00000000
--- a/plugins/lb-plugin/configure.ac
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(lb_plugin, 1.0)
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-AC_PREFIX_DEFAULT([/usr])
-
-AC_PROG_LIBTOOL
-AC_PROG_CC
-
-AC_OUTPUT([Makefile])
diff --git a/plugins/lb-plugin/lb/api.c b/plugins/lb-plugin/lb/api.c
deleted file mode 100644
index 06c53fa1..00000000
--- a/plugins/lb-plugin/lb/api.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <lb/lb.h>
-
-#include <vppinfra/byte_order.h>
-#include <vlibapi/api.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <lb/lb.api.h>
-    /* We'll want to know how many messages IDs we need... */
-    VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-
-/* define message structures */
-#define vl_typedefs
-#include <lb/lb.api.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <lb/lb.api.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <lb/lb.api.h>
-#undef vl_api_version
-
-#define vl_msg_name_crc_list
-#include <lb/lb.api.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (lb_main_t * lbm, api_main_t * am)
-{
-#define _(id,n,crc) \
-  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + lbm->msg_id_base);
-  foreach_vl_msg_name_crc_lb;
-#undef _
-}
-
-/* Macro to finish up custom dump fns */
-#define FINISH                                  \
-    vec_add1 (s, 0);                            \
-    vl_print (handle, (char *)s);               \
-    vec_free (s);                               \
-    return handle;
-
-/*
- * A handy macro to set up a message reply.
- * Assumes that the following variables are available:
- * mp - pointer to request message
- * rmp - pointer to reply message type
- * rv - return value
- */
-
-#define REPLY_MACRO(t)                                          \
-do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
-    vl_api_client_index_to_input_queue (mp->client_index);      \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+lbm->msg_id_base);               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-                                                                \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-static void
-vl_api_lb_conf_t_handler
-(vl_api_lb_conf_t * mp)
-{
-  lb_main_t *lbm = &lb_main;
-  vl_api_lb_conf_reply_t * rmp;
-  int rv = 0;
-
-  rv = lb_conf((ip4_address_t *)&mp->ip4_src_address,
-               (ip6_address_t *)mp->ip6_src_address,
-               mp->sticky_buckets_per_core,
-               mp->flow_timeout);
-
- REPLY_MACRO (VL_API_LB_CONF_REPLY);
-}
-
-static void *vl_api_lb_conf_t_print
-(vl_api_lb_conf_t *mp, void * handle)
-{
-  u8 * s;
-  s = format (0, "SCRIPT: lb_conf ");
-  s = format (s, "%U ", format_ip4_address, (ip4_address_t *)&mp->ip4_src_address);
-  s = format (s, "%U ", format_ip6_address, (ip6_address_t *)mp->ip6_src_address);
-  s = format (s, "%u ", mp->sticky_buckets_per_core);
-  s = format (s, "%u ", mp->flow_timeout);
-  FINISH;
-}
-
-
-static void
-vl_api_lb_add_del_vip_t_handler
-(vl_api_lb_add_del_vip_t * mp)
-{
-  lb_main_t *lbm = &lb_main;
-  vl_api_lb_conf_reply_t * rmp;
-  int rv = 0;
-  ip46_address_t prefix;
-  memcpy(&prefix.ip6, mp->ip_prefix, sizeof(prefix.ip6));
-
-  if (mp->is_del) {
-    u32 vip_index;
-    if (!(rv = lb_vip_find_index(&prefix, mp->prefix_length, &vip_index)))
-      rv = lb_vip_del(vip_index);
-  } else {
-    u32 vip_index;
-    lb_vip_type_t type;
-    if (ip46_prefix_is_ip4(&prefix, mp->prefix_length)) {
-      type = mp->is_gre4?LB_VIP_TYPE_IP4_GRE4:LB_VIP_TYPE_IP4_GRE6;
-    } else {
-      type = mp->is_gre4?LB_VIP_TYPE_IP6_GRE4:LB_VIP_TYPE_IP6_GRE6;
-    }
-
-    rv = lb_vip_add(&prefix, mp->prefix_length, type,
-                    mp->new_flows_table_length, &vip_index);
-  }
- REPLY_MACRO (VL_API_LB_CONF_REPLY);
-}
-
-static void *vl_api_lb_add_del_vip_t_print
-(vl_api_lb_add_del_vip_t *mp, void * handle)
-{
-  u8 * s;
-  s = format (0, "SCRIPT: lb_add_del_vip ");
-  s = format (s, "%U ", format_ip46_prefix,
-              (ip46_address_t *)mp->ip_prefix, mp->prefix_length, IP46_TYPE_ANY);
-  s = format (s, "%s ", mp->is_gre4?"gre4":"gre6");
-  s = format (s, "%u ", mp->new_flows_table_length);
-  s = format (s, "%s ", mp->is_del?"del":"add");
-  FINISH;
-}
-
-static void
-vl_api_lb_add_del_as_t_handler
-(vl_api_lb_add_del_as_t * mp)
-{
-  lb_main_t *lbm = &lb_main;
-  vl_api_lb_conf_reply_t * rmp;
-  int rv = 0;
-  u32 vip_index;
-  if ((rv = lb_vip_find_index((ip46_address_t *)mp->vip_ip_prefix,
-                              mp->vip_prefix_length, &vip_index)))
-    goto done;
-
-  if (mp->is_del)
-    rv = lb_vip_del_ass(vip_index, (ip46_address_t *)mp->as_address, 1);
-  else
-    rv = lb_vip_add_ass(vip_index, (ip46_address_t *)mp->as_address, 1);
-
-done:
- REPLY_MACRO (VL_API_LB_CONF_REPLY);
-}
-
-static void *vl_api_lb_add_del_as_t_print
-(vl_api_lb_add_del_as_t *mp, void * handle)
-{
-  u8 * s;
-  s = format (0, "SCRIPT: lb_add_del_as ");
-  s = format (s, "%U ", format_ip46_prefix,
-              (ip46_address_t *)mp->vip_ip_prefix, mp->vip_prefix_length, IP46_TYPE_ANY);
-  s = format (s, "%U ", format_ip46_address,
-                (ip46_address_t *)mp->as_address, IP46_TYPE_ANY);
-  s = format (s, "%s ", mp->is_del?"del":"add");
-  FINISH;
-}
-
-/* List of message types that this plugin understands */
-#define foreach_lb_plugin_api_msg            \
-_(LB_CONF, lb_conf)                          \
-_(LB_ADD_DEL_VIP, lb_add_del_vip)            \
-_(LB_ADD_DEL_AS, lb_add_del_as)
-
-static clib_error_t * lb_api_init (vlib_main_t * vm)
-{
-  lb_main_t *lbm = &lb_main;
-  u8 *name = format (0, "lb_%08x%c", api_version, 0);
-  lbm->msg_id_base = vl_msg_api_get_msg_ids
-      ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + lbm->msg_id_base),     \
-                           #n,                  \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_lb_plugin_api_msg;
-#undef _
-
-  /* Add our API messages to the global name_crc hash table */
-  setup_message_id_table (lbm, &api_main);
-
-  return 0;
-}
-
-VLIB_INIT_FUNCTION (lb_api_init);
diff --git a/plugins/lb-plugin/lb/cli.c b/plugins/lb-plugin/lb/cli.c
deleted file mode 100644
index b59c6426..00000000
--- a/plugins/lb-plugin/lb/cli.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <lb/lb.h>
-#include <lb/util.h>
-
-static clib_error_t *
-lb_vip_command_fn (vlib_main_t * vm,
-              unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ip46_address_t prefix;
-  u8 plen;
-  u32 new_len = 1024;
-  u8 del = 0;
-  int ret;
-  u32 gre4 = 0;
-  lb_vip_type_t type;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  if (!unformat(line_input, "%U", unformat_ip46_prefix, &prefix, &plen, IP46_TYPE_ANY, &plen))
-    return clib_error_return (0, "invalid vip prefix: '%U'",
-                                  format_unformat_error, line_input);
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-  {
-    if (unformat(line_input, "new_len %d", &new_len))
-      ;
-    else if (unformat(line_input, "del"))
-      del = 1;
-    else if (unformat(line_input, "encap gre4"))
-      gre4 = 1;
-    else if (unformat(line_input, "encap gre6"))
-      gre4 = 0;
-    else
-      return clib_error_return (0, "parse error: '%U'",
-                              format_unformat_error, line_input);
-  }
-
-  unformat_free (line_input);
-
-
-  if (ip46_prefix_is_ip4(&prefix, plen)) {
-    type = (gre4)?LB_VIP_TYPE_IP4_GRE4:LB_VIP_TYPE_IP4_GRE6;
-  } else {
-    type = (gre4)?LB_VIP_TYPE_IP6_GRE4:LB_VIP_TYPE_IP6_GRE6;
-  }
-
-  lb_garbage_collection();
-
-  u32 index;
-  if (!del) {
-    if ((ret = lb_vip_add(&prefix, plen, type, new_len, &index))) {
-      return clib_error_return (0, "lb_vip_add error %d", ret);
-    } else {
-      vlib_cli_output(vm, "lb_vip_add ok %d", index);
-    }
-  } else {
-    if ((ret = lb_vip_find_index(&prefix, plen, &index)))
-      return clib_error_return (0, "lb_vip_find_index error %d", ret);
-    else if ((ret = lb_vip_del(index)))
-      return clib_error_return (0, "lb_vip_del error %d", ret);
-  }
-  return NULL;
-}
-
-VLIB_CLI_COMMAND (lb_vip_command, static) =
-{
-  .path = "lb vip",
-  .short_help = "lb vip <prefix> [encap (gre6|gre4)] [new_len <n>] [del]",
-  .function = lb_vip_command_fn,
-};
-
-static clib_error_t *
-lb_as_command_fn (vlib_main_t * vm,
-              unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ip46_address_t vip_prefix, as_addr;
-  u8 vip_plen;
-  ip46_address_t *as_array = 0;
-  u32 vip_index;
-  u8 del = 0;
-  int ret;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  if (!unformat(line_input, "%U", unformat_ip46_prefix, &vip_prefix, &vip_plen, IP46_TYPE_ANY))
-    return clib_error_return (0, "invalid as address: '%U'",
-                              format_unformat_error, line_input);
-
-  if ((ret = lb_vip_find_index(&vip_prefix, vip_plen, &vip_index)))
-    return clib_error_return (0, "lb_vip_find_index error %d", ret);
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-  {
-    if (unformat(line_input, "%U", unformat_ip46_address, &as_addr, IP46_TYPE_ANY)) {
-      vec_add1(as_array, as_addr);
-    } else if (unformat(line_input, "del")) {
-      del = 1;
-    } else {
-      vec_free(as_array);
-      return clib_error_return (0, "parse error: '%U'",
-                                format_unformat_error, line_input);
-    }
-  }
-
-  if (!vec_len(as_array)) {
-    vec_free(as_array);
-    return clib_error_return (0, "No AS address provided");
-  }
-
-  lb_garbage_collection();
-  clib_warning("vip index is %d", vip_index);
-
-  if (del) {
-    if ((ret = lb_vip_del_ass(vip_index, as_array, vec_len(as_array)))) {
-      vec_free(as_array);
-      return clib_error_return (0, "lb_vip_del_ass error %d", ret);
-    }
-  } else {
-    if ((ret = lb_vip_add_ass(vip_index, as_array, vec_len(as_array)))) {
-      vec_free(as_array);
-      return clib_error_return (0, "lb_vip_add_ass error %d", ret);
-    }
-  }
-
-  vec_free(as_array);
-  return 0;
-}
-
-VLIB_CLI_COMMAND (lb_as_command, static) =
-{
-  .path = "lb as",
-  .short_help = "lb as <vip-prefix> [<address> [<address> [...]]] [del]",
-  .function = lb_as_command_fn,
-};
-
-static clib_error_t *
-lb_conf_command_fn (vlib_main_t * vm,
-              unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  lb_main_t *lbm = &lb_main;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  ip4_address_t ip4 = lbm->ip4_src_address;
-  ip6_address_t ip6 = lbm->ip6_src_address;
-  u32 per_cpu_sticky_buckets = lbm->per_cpu_sticky_buckets;
-  u32 per_cpu_sticky_buckets_log2 = 0;
-  u32 flow_timeout = lbm->flow_timeout;
-  int ret;
-
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-  {
-    if (unformat(line_input, "ip4-src-address %U", unformat_ip4_address, &ip4))
-      ;
-    else if (unformat(line_input, "ip6-src-address %U", unformat_ip6_address, &ip6))
-      ;
-    else if (unformat(line_input, "buckets %d", &per_cpu_sticky_buckets))
-      ;
-    else if (unformat(line_input, "buckets-log2 %d", &per_cpu_sticky_buckets_log2)) {
-      if (per_cpu_sticky_buckets_log2 >= 32)
-        return clib_error_return (0, "buckets-log2 value is too high");
-      per_cpu_sticky_buckets = 1 << per_cpu_sticky_buckets_log2;
-    } else if (unformat(line_input, "timeout %d", &flow_timeout))
-      ;
-    else
-      return clib_error_return (0, "parse error: '%U'",
-                                format_unformat_error, line_input);
-  }
-
-  unformat_free (line_input);
-
-  lb_garbage_collection();
-
-  if ((ret = lb_conf(&ip4, &ip6, per_cpu_sticky_buckets, flow_timeout)))
-    return clib_error_return (0, "lb_conf error %d", ret);
-
-  return NULL;
-}
-
-VLIB_CLI_COMMAND (lb_conf_command, static) =
-{
-  .path = "lb conf",
-  .short_help = "lb conf [ip4-src-address <addr>] [ip6-src-address <addr>] [buckets <n>] [timeout <s>]",
-  .function = lb_conf_command_fn,
-};
-
-static clib_error_t *
-lb_show_command_fn (vlib_main_t * vm,
-              unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  vlib_cli_output(vm, "%U", format_lb_main);
-  return NULL;
-}
-
-
-VLIB_CLI_COMMAND (lb_show_command, static) =
-{
-  .path = "show lb",
-  .short_help = "show lb",
-  .function = lb_show_command_fn,
-};
-
-static clib_error_t *
-lb_show_vips_command_fn (vlib_main_t * vm,
-              unformat_input_t * input, vlib_cli_command_t * cmd)
-{
-  unformat_input_t line_input;
-  lb_main_t *lbm = &lb_main;
-  lb_vip_t *vip;
-  u8 verbose = 0;
-
-  if (!unformat_user (input, unformat_line_input, &line_input))
-      return 0;
-
-  if (unformat(&line_input, "verbose"))
-    verbose = 1;
-
-  pool_foreach(vip, lbm->vips, {
-      vlib_cli_output(vm, "%U\n", verbose?format_lb_vip_detailed:format_lb_vip, vip);
-  });
-
-  unformat_free (&line_input);
-  return NULL;
-}
-
-VLIB_CLI_COMMAND (lb_show_vips_command, static) =
-{
-  .path = "show lb vips",
-  .short_help = "show lb vips [verbose]",
-  .function = lb_show_vips_command_fn,
-};
diff --git a/plugins/lb-plugin/lb/lb.api b/plugins/lb-plugin/lb/lb.api
deleted file mode 100644
index 39ee3c8f..00000000
--- a/plugins/lb-plugin/lb/lb.api
+++ /dev/null
@@ -1,71 +0,0 @@
-/** \brief Configure Load-Balancer global parameters
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param ip4_src_address - IPv4 address to be used as source for IPv4 GRE traffic.
-    @param ip6_src_address - IPv6 address to be used as source for IPv6 GRE traffic.
-    @param n_sticky_buckets - Number of buckets *per worker thread* in the 
-           established flow table (must be power of 2).
-    @param flow_timeout - Time in seconds after which, if no packet is received
-           for a given flow, the flow is removed from the established flow table.
-*/
-define lb_conf
-{
-  u32 client_index;
-  u32 context;
-  u32 ip4_src_address;
-  u8 ip6_src_address[16];
-  u32 sticky_buckets_per_core;
-  u32 flow_timeout;
-};
-
-define lb_conf_reply {
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Add a virtual address (or prefix)
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param ip_prefix - IP address (IPv4 in lower order 32 bits). 
-    @param prefix_length - IP prefix length (96 + 'IPv4 prefix length' for IPv4).  
-    @param is_gre4 - Encap is ip4 GRE (ip6 GRE otherwise).
-    @param new_flows_table_length - Size of the new connections flow table used
-           for this VIP (must be power of 2).
-    @param is_del - The VIP should be removed.
-*/
-define lb_add_del_vip {
-  u32 client_index;
-  u32 context;
-  u8 ip_prefix[16];
-  u8 prefix_length;
-  u8 is_gre4;
-  u32 new_flows_table_length;
-  u8 is_del;
-};
-
-define lb_add_del_vip_reply {
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Add an application server for a given VIP
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param vip_ip_prefix - VIP IP address (IPv4 in lower order 32 bits). 
-    @param vip_ip_prefix - VIP IP prefix length (96 + 'IPv4 prefix length' for IPv4). 
-    @param as_address - The application server address (IPv4 in lower order 32 bits).
-    @param is_del - The AS should be removed.
-*/
-define lb_add_del_as {
-  u32 client_index;
-  u32 context;
-  u8 vip_ip_prefix[16];
-  u8 vip_prefix_length;
-  u8 as_address[16];
-  u8 is_del;
-};
-
-define lb_add_del_as_reply {
-  u32 context;
-  i32 retval;
-};
diff --git a/plugins/lb-plugin/lb/lb.c b/plugins/lb-plugin/lb/lb.c
deleted file mode 100644
index 1d9b9870..00000000
--- a/plugins/lb-plugin/lb/lb.c
+++ /dev/null
@@ -1,844 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <lb/lb.h>
-#include <vnet/plugin/plugin.h>
-#include <vnet/api_errno.h>
-
-//GC runs at most once every so many seconds
-#define LB_GARBAGE_RUN 60
-
-//After so many seconds. It is assumed that inter-core race condition will not occur.
-#define LB_CONCURRENCY_TIMEOUT 10
-
-lb_main_t lb_main;
-
-#define lb_get_writer_lock() do {} while(__sync_lock_test_and_set (lb_main.writer_lock, 1))
-#define lb_put_writer_lock() lb_main.writer_lock[0] = 0
-
-static void lb_as_stack (lb_as_t *as);
-
-
-const static char * const lb_dpo_gre4_ip4[] = { "lb4-gre4" , NULL };
-const static char * const lb_dpo_gre4_ip6[] = { "lb6-gre4" , NULL };
-const static char* const * const lb_dpo_gre4_nodes[DPO_PROTO_NUM] =
-    {
-	[DPO_PROTO_IP4]  = lb_dpo_gre4_ip4,
-	[DPO_PROTO_IP6]  = lb_dpo_gre4_ip6,
-    };
-
-const static char * const lb_dpo_gre6_ip4[] = { "lb4-gre6" , NULL };
-const static char * const lb_dpo_gre6_ip6[] = { "lb6-gre6" , NULL };
-const static char* const * const lb_dpo_gre6_nodes[DPO_PROTO_NUM] =
-    {
-	[DPO_PROTO_IP4]  = lb_dpo_gre6_ip4,
-	[DPO_PROTO_IP6]  = lb_dpo_gre6_ip6,
-    };
-
-u32 lb_hash_time_now(vlib_main_t * vm)
-{
-  return (u32) (vlib_time_now(vm) + 10000);
-}
-
-u8 *format_lb_main (u8 * s, va_list * args)
-{
-  vlib_thread_main_t *tm = vlib_get_thread_main();
-  lb_main_t *lbm = &lb_main;
-  s = format(s, "lb_main");
-  s = format(s, " ip4-src-address: %U \n", format_ip4_address, &lbm->ip4_src_address);
-  s = format(s, " ip6-src-address: %U \n", format_ip6_address, &lbm->ip6_src_address);
-  s = format(s, " #vips: %u\n", pool_elts(lbm->vips));
-  s = format(s, " #ass: %u\n", pool_elts(lbm->ass) - 1);
-
-  u32 cpu_index;
-  for(cpu_index = 0; cpu_index < tm->n_vlib_mains; cpu_index++ ) {
-    lb_hash_t *h = lbm->per_cpu[cpu_index].sticky_ht;
-    if (h) {
-      s = format(s, "core %d\n", cpu_index);
-      s = format(s, "  timeout: %ds\n", h->timeout);
-      s = format(s, "  usage: %d / %d\n", lb_hash_elts(h, lb_hash_time_now(vlib_get_main())),  lb_hash_size(h));
-    }
-  }
-
-  return s;
-}
-
-static char *lb_vip_type_strings[] = {
-    [LB_VIP_TYPE_IP6_GRE6] = "ip6-gre6",
-    [LB_VIP_TYPE_IP6_GRE4] = "ip6-gre4",
-    [LB_VIP_TYPE_IP4_GRE6] = "ip4-gre6",
-    [LB_VIP_TYPE_IP4_GRE4] = "ip4-gre4",
-};
-
-u8 *format_lb_vip_type (u8 * s, va_list * args)
-{
-  lb_vip_type_t vipt = va_arg (*args, lb_vip_type_t);
-  u32 i;
-  for (i=0; i<LB_VIP_N_TYPES; i++)
-    if (vipt == i)
-      return format(s, lb_vip_type_strings[i]);
-  return format(s, "_WRONG_TYPE_");
-}
-
-uword unformat_lb_vip_type (unformat_input_t * input, va_list * args)
-{
-  lb_vip_type_t *vipt = va_arg (*args, lb_vip_type_t *);
-  u32 i;
-  for (i=0; i<LB_VIP_N_TYPES; i++)
-    if (unformat(input, lb_vip_type_strings[i])) {
-      *vipt = i;
-      return 1;
-    }
-  return 0;
-}
-
-u8 *format_lb_vip (u8 * s, va_list * args)
-{
-  lb_vip_t *vip = va_arg (*args, lb_vip_t *);
-  return format(s, "%U %U new_size:%u #as:%u%s",
-             format_lb_vip_type, vip->type,
-             format_ip46_prefix, &vip->prefix, vip->plen, IP46_TYPE_ANY,
-             vip->new_flow_table_mask + 1,
-             pool_elts(vip->as_indexes),
-             (vip->flags & LB_VIP_FLAGS_USED)?"":" removed");
-}
-
-u8 *format_lb_as (u8 * s, va_list * args)
-{
-  lb_as_t *as = va_arg (*args, lb_as_t *);
-  return format(s, "%U %s", format_ip46_address,
-		&as->address, IP46_TYPE_ANY,
-		(as->flags & LB_AS_FLAGS_USED)?"used":"removed");
-}
-
-u8 *format_lb_vip_detailed (u8 * s, va_list * args)
-{
-  lb_main_t *lbm = &lb_main;
-  lb_vip_t *vip = va_arg (*args, lb_vip_t *);
-  uword indent = format_get_indent (s);
-
-  s = format(s, "%U %U [%u] %U%s\n"
-                   "%U  new_size:%u\n",
-                  format_white_space, indent,
-                  format_lb_vip_type, vip->type,
-                  vip - lbm->vips, format_ip46_prefix, &vip->prefix, vip->plen, IP46_TYPE_ANY,
-                  (vip->flags & LB_VIP_FLAGS_USED)?"":" removed",
-                  format_white_space, indent,
-                  vip->new_flow_table_mask + 1);
-
-  //Print counters
-  s = format(s, "%U  counters:\n",
-             format_white_space, indent);
-  u32 i;
-  for (i=0; i<LB_N_VIP_COUNTERS; i++)
-    s = format(s, "%U    %s: %d\n",
-               format_white_space, indent,
-               lbm->vip_counters[i].name,
-               vlib_get_simple_counter(&lbm->vip_counters[i], vip - lbm->vips));
-
-
-  s = format(s, "%U  #as:%u\n",
-             format_white_space, indent,
-             pool_elts(vip->as_indexes));
-
-  //Let's count the buckets for each AS
-  u32 *count = 0;
-  vec_validate(count, pool_len(lbm->ass)); //Possibly big alloc for not much...
-  lb_new_flow_entry_t *nfe;
-  vec_foreach(nfe, vip->new_flow_table)
-    count[nfe->as_index]++;
-
-  lb_as_t *as;
-  u32 *as_index;
-  pool_foreach(as_index, vip->as_indexes, {
-      as = &lbm->ass[*as_index];
-      s = format(s, "%U    %U %d buckets   %d flows  dpo:%u %s\n",
-                   format_white_space, indent,
-                   format_ip46_address, &as->address, IP46_TYPE_ANY,
-                   count[as - lbm->ass],
-                   vlib_refcount_get(&lbm->as_refcount, as - lbm->ass),
-                   as->dpo.dpoi_index,
-                   (as->flags & LB_AS_FLAGS_USED)?"used":" removed");
-  });
-
-  vec_free(count);
-
-  /*
-  s = format(s, "%U  new flows table:\n", format_white_space, indent);
-  lb_new_flow_entry_t *nfe;
-  vec_foreach(nfe, vip->new_flow_table) {
-    s = format(s, "%U    %d: %d\n", format_white_space, indent, nfe - vip->new_flow_table, nfe->as_index);
-  }
-  */
-  return s;
-}
-
-typedef struct {
-  u32 as_index;
-  u32 last;
-  u32 skip;
-} lb_pseudorand_t;
-
-static int lb_pseudorand_compare(void *a, void *b)
-{
-  lb_as_t *asa, *asb;
-  lb_main_t *lbm = &lb_main;
-  asa = &lbm->ass[((lb_pseudorand_t *)a)->as_index];
-  asb = &lbm->ass[((lb_pseudorand_t *)b)->as_index];
-  return memcmp(&asa->address, &asb->address, sizeof(asb->address));
-}
-
-static void lb_vip_garbage_collection(lb_vip_t *vip)
-{
-  lb_main_t *lbm = &lb_main;
-  ASSERT (lbm->writer_lock[0]);
-
-  u32 now = (u32) vlib_time_now(vlib_get_main());
-  if (!clib_u32_loop_gt(now, vip->last_garbage_collection + LB_GARBAGE_RUN))
-    return;
-
-  vip->last_garbage_collection = now;
-  lb_as_t *as;
-  u32 *as_index;
-  pool_foreach(as_index, vip->as_indexes, {
-      as = &lbm->ass[*as_index];
-      if (!(as->flags & LB_AS_FLAGS_USED) && //Not used
-	  clib_u32_loop_gt(now, as->last_used + LB_CONCURRENCY_TIMEOUT) && //Not recently used
-	  (vlib_refcount_get(&lbm->as_refcount, as - lbm->ass) == 0))
-	{ //Not referenced
-	  fib_entry_child_remove(as->next_hop_fib_entry_index,
-				 as->next_hop_child_index);
-	  fib_table_entry_delete_index(as->next_hop_fib_entry_index,
-				       FIB_SOURCE_RR);
-	  as->next_hop_fib_entry_index = FIB_NODE_INDEX_INVALID;
-
-	  pool_put(vip->as_indexes, as_index);
-	  pool_put(lbm->ass, as);
-	}
-  });
-}
-
-void lb_garbage_collection()
-{
-  lb_main_t *lbm = &lb_main;
-  lb_get_writer_lock();
-  lb_vip_t *vip;
-  u32 *to_be_removed_vips = 0, *i;
-  pool_foreach(vip, lbm->vips, {
-      lb_vip_garbage_collection(vip);
-
-      if (!(vip->flags & LB_VIP_FLAGS_USED) &&
-          (pool_elts(vip->as_indexes) == 0)) {
-        vec_add1(to_be_removed_vips, vip - lbm->vips);
-      }
-  });
-
-  vec_foreach(i, to_be_removed_vips) {
-    vip = &lbm->vips[*i];
-    pool_put(lbm->vips, vip);
-    pool_free(vip->as_indexes);
-  }
-
-  vec_free(to_be_removed_vips);
-  lb_put_writer_lock();
-}
-
-static void lb_vip_update_new_flow_table(lb_vip_t *vip)
-{
-  lb_main_t *lbm = &lb_main;
-  lb_new_flow_entry_t *old_table;
-  u32 i, *as_index;
-  lb_new_flow_entry_t *new_flow_table = 0;
-  lb_as_t *as;
-  lb_pseudorand_t *pr, *sort_arr = 0;
-  u32 count;
-
-  ASSERT (lbm->writer_lock[0]); //We must have the lock
-
-  //Check if some AS is configured or not
-  i = 0;
-  pool_foreach(as_index, vip->as_indexes, {
-      as = &lbm->ass[*as_index];
-      if (as->flags & LB_AS_FLAGS_USED) { //Not used anymore
-        i = 1;
-        goto out; //Not sure 'break' works in this macro-loop
-      }
-  });
-
-out:
-  if (i == 0) {
-    //Only the default. i.e. no AS
-    vec_validate(new_flow_table, vip->new_flow_table_mask);
-    for (i=0; i<vec_len(new_flow_table); i++)
-      new_flow_table[i].as_index = 0;
-
-    goto finished;
-  }
-
-  //First, let's sort the ASs
-  sort_arr = 0;
-  vec_alloc(sort_arr, pool_elts(vip->as_indexes));
-
-  i = 0;
-  pool_foreach(as_index, vip->as_indexes, {
-      as = &lbm->ass[*as_index];
-      if (!(as->flags & LB_AS_FLAGS_USED)) //Not used anymore
-        continue;
-
-      sort_arr[i].as_index = as - lbm->ass;
-      i++;
-  });
-  _vec_len(sort_arr) = i;
-
-  vec_sort_with_function(sort_arr, lb_pseudorand_compare);
-
-  //Now let's pseudo-randomly generate permutations
-  vec_foreach(pr, sort_arr) {
-    lb_as_t *as = &lbm->ass[pr->as_index];
-
-    u64 seed = clib_xxhash(as->address.as_u64[0] ^
-                           as->address.as_u64[1]);
-    /* We have 2^n buckets.
-     * skip must be prime with 2^n.
-     * So skip must be odd.
-     * MagLev actually state that M should be prime,
-     * but this has a big computation cost (% operation).
-     * Using 2^n is more better (& operation).
-     */
-    pr->skip = ((seed & 0xffffffff) | 1) & vip->new_flow_table_mask;
-    pr->last = (seed >> 32) & vip->new_flow_table_mask;
-  }
-
-  //Let's create a new flow table
-  vec_validate(new_flow_table, vip->new_flow_table_mask);
-  for (i=0; i<vec_len(new_flow_table); i++)
-    new_flow_table[i].as_index = ~0;
-
-  u32 done = 0;
-  while (1) {
-    vec_foreach(pr, sort_arr) {
-      while (1) {
-        u32 last = pr->last;
-        pr->last = (pr->last + pr->skip) & vip->new_flow_table_mask;
-        if (new_flow_table[last].as_index == ~0) {
-          new_flow_table[last].as_index = pr->as_index;
-          break;
-        }
-      }
-      done++;
-      if (done == vec_len(new_flow_table))
-        goto finished;
-    }
-  }
-
-  vec_free(sort_arr);
-
-finished:
-
-//Count number of changed entries
-  count = 0;
-  for (i=0; i<vec_len(new_flow_table); i++)
-    if (vip->new_flow_table == 0 ||
-        new_flow_table[i].as_index != vip->new_flow_table[i].as_index)
-      count++;
-
-  old_table = vip->new_flow_table;
-  vip->new_flow_table = new_flow_table;
-  vec_free(old_table);
-}
-
-int lb_conf(ip4_address_t *ip4_address, ip6_address_t *ip6_address,
-           u32 per_cpu_sticky_buckets, u32 flow_timeout)
-{
-  lb_main_t *lbm = &lb_main;
-
-  if (!is_pow2(per_cpu_sticky_buckets))
-    return VNET_API_ERROR_INVALID_MEMORY_SIZE;
-
-  lb_get_writer_lock(); //Not exactly necessary but just a reminder that it exists for my future self
-  lbm->ip4_src_address = *ip4_address;
-  lbm->ip6_src_address = *ip6_address;
-  lbm->per_cpu_sticky_buckets = per_cpu_sticky_buckets;
-  lbm->flow_timeout = flow_timeout;
-  lb_put_writer_lock();
-  return 0;
-}
-
-static
-int lb_vip_find_index_with_lock(ip46_address_t *prefix, u8 plen, u32 *vip_index)
-{
-  lb_main_t *lbm = &lb_main;
-  lb_vip_t *vip;
-  ASSERT (lbm->writer_lock[0]); //This must be called with the lock owned
-  ip46_prefix_normalize(prefix, plen);
-  pool_foreach(vip, lbm->vips, {
-      if ((vip->flags & LB_AS_FLAGS_USED) &&
-          vip->plen == plen &&
-          vip->prefix.as_u64[0] == prefix->as_u64[0] &&
-          vip->prefix.as_u64[1] == prefix->as_u64[1]) {
-        *vip_index = vip - lbm->vips;
-        return 0;
-      }
-  });
-  return VNET_API_ERROR_NO_SUCH_ENTRY;
-}
-
-int lb_vip_find_index(ip46_address_t *prefix, u8 plen, u32 *vip_index)
-{
-  int ret;
-  lb_get_writer_lock();
-  ret = lb_vip_find_index_with_lock(prefix, plen, vip_index);
-  lb_put_writer_lock();
-  return ret;
-}
-
-static int lb_as_find_index_vip(lb_vip_t *vip, ip46_address_t *address, u32 *as_index)
-{
-  lb_main_t *lbm = &lb_main;
-  ASSERT (lbm->writer_lock[0]); //This must be called with the lock owned
-  lb_as_t *as;
-  u32 *asi;
-  pool_foreach(asi, vip->as_indexes, {
-      as = &lbm->ass[*asi];
-      if (as->vip_index == (vip - lbm->vips) &&
-          as->address.as_u64[0] == address->as_u64[0] &&
-          as->address.as_u64[1] == address->as_u64[1]) {
-        *as_index = as - lbm->ass;
-        return 0;
-      }
-  });
-  return -1;
-}
-
-int lb_vip_add_ass(u32 vip_index, ip46_address_t *addresses, u32 n)
-{
-  lb_main_t *lbm = &lb_main;
-  lb_get_writer_lock();
-  lb_vip_t *vip;
-  if (!(vip = lb_vip_get_by_index(vip_index))) {
-    lb_put_writer_lock();
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-  }
-
-  ip46_type_t type = lb_vip_is_gre4(vip)?IP46_TYPE_IP4:IP46_TYPE_IP6;
-  u32 *to_be_added = 0;
-  u32 *to_be_updated = 0;
-  u32 i;
-  u32 *ip;
-
-  //Sanity check
-  while (n--) {
-
-    if (!lb_as_find_index_vip(vip, &addresses[n], &i)) {
-      if (lbm->ass[i].flags & LB_AS_FLAGS_USED) {
-        vec_free(to_be_added);
-        vec_free(to_be_updated);
-        lb_put_writer_lock();
-        return VNET_API_ERROR_VALUE_EXIST;
-      }
-      vec_add1(to_be_updated, i);
-      goto next;
-    }
-
-    if (ip46_address_type(&addresses[n]) != type) {
-      vec_free(to_be_added);
-      vec_free(to_be_updated);
-      lb_put_writer_lock();
-      return VNET_API_ERROR_INVALID_ADDRESS_FAMILY;
-    }
-
-    if (n) {
-      u32 n2 = n;
-      while(n2--) //Check for duplicates
-        if (addresses[n2].as_u64[0] == addresses[n].as_u64[0] &&
-            addresses[n2].as_u64[1] == addresses[n].as_u64[1])
-          goto next;
-    }
-
-    vec_add1(to_be_added, n);
-
-next:
-    continue;
-  }
-
-  //Update reused ASs
-  vec_foreach(ip, to_be_updated) {
-    lbm->ass[*ip].flags = LB_AS_FLAGS_USED;
-  }
-  vec_free(to_be_updated);
-
-  //Create those who have to be created
-  vec_foreach(ip, to_be_added) {
-    lb_as_t *as;
-    u32 *as_index;
-    pool_get(lbm->ass, as);
-    as->address = addresses[*ip];
-    as->flags = LB_AS_FLAGS_USED;
-    as->vip_index = vip_index;
-    pool_get(vip->as_indexes, as_index);
-    *as_index = as - lbm->ass;
-
-    /*
-     * become a child of the FIB entry
-     * so we are informed when its forwarding changes
-     */
-    fib_prefix_t nh = {};
-    if (lb_vip_is_gre4(vip)) {
-	nh.fp_addr.ip4 = as->address.ip4;
-	nh.fp_len = 32;
-	nh.fp_proto = FIB_PROTOCOL_IP4;
-    } else {
-	nh.fp_addr.ip6 = as->address.ip6;
-	nh.fp_len = 128;
-	nh.fp_proto = FIB_PROTOCOL_IP6;
-    }
-
-    as->next_hop_fib_entry_index =
-	fib_table_entry_special_add(0,
-				    &nh,
-				    FIB_SOURCE_RR,
-				    FIB_ENTRY_FLAG_NONE,
-				    ADJ_INDEX_INVALID);
-    as->next_hop_child_index =
-	fib_entry_child_add(as->next_hop_fib_entry_index,
-			    lbm->fib_node_type,
-			    as - lbm->ass);
-
-    lb_as_stack(as);
-  }
-  vec_free(to_be_added);
-
-  //Recompute flows
-  lb_vip_update_new_flow_table(vip);
-
-  //Garbage collection maybe
-  lb_vip_garbage_collection(vip);
-
-  lb_put_writer_lock();
-  return 0;
-}
-
-int lb_vip_del_ass_withlock(u32 vip_index, ip46_address_t *addresses, u32 n)
-{
-  lb_main_t *lbm = &lb_main;
-  u32 now = (u32) vlib_time_now(vlib_get_main());
-  u32 *ip = 0;
-
-  lb_vip_t *vip;
-  if (!(vip = lb_vip_get_by_index(vip_index))) {
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-  }
-
-  u32 *indexes = NULL;
-  while (n--) {
-    u32 i;
-    if (lb_as_find_index_vip(vip, &addresses[n], &i)) {
-      vec_free(indexes);
-      return VNET_API_ERROR_NO_SUCH_ENTRY;
-    }
-
-    if (n) { //Check for duplicates
-      u32 n2 = n - 1;
-      while(n2--) {
-        if (addresses[n2].as_u64[0] == addresses[n].as_u64[0] &&
-            addresses[n2].as_u64[1] == addresses[n].as_u64[1])
-          goto next;
-      }
-    }
-
-    vec_add1(indexes, i);
-next:
-  continue;
-  }
-
-  //Garbage collection maybe
-  lb_vip_garbage_collection(vip);
-
-  if (indexes != NULL) {
-    vec_foreach(ip, indexes) {
-      lbm->ass[*ip].flags &= ~LB_AS_FLAGS_USED;
-      lbm->ass[*ip].last_used = now;
-    }
-
-    //Recompute flows
-    lb_vip_update_new_flow_table(vip);
-  }
-
-  vec_free(indexes);
-  return 0;
-}
-
-int lb_vip_del_ass(u32 vip_index, ip46_address_t *addresses, u32 n)
-{
-  lb_get_writer_lock();
-  int ret = lb_vip_del_ass_withlock(vip_index, addresses, n);
-  lb_put_writer_lock();
-  return ret;
-}
-
-/**
- * Add the VIP adjacency to the ip4 or ip6 fib
- */
-static void lb_vip_add_adjacency(lb_main_t *lbm, lb_vip_t *vip)
-{
-  dpo_proto_t proto = 0;
-  dpo_id_t dpo = DPO_INVALID;
-  fib_prefix_t pfx = {};
-  if (lb_vip_is_ip4(vip)) {
-      pfx.fp_addr.ip4 = vip->prefix.ip4;
-      pfx.fp_len = vip->plen - 96;
-      pfx.fp_proto = FIB_PROTOCOL_IP4;
-      proto = DPO_PROTO_IP4;
-  } else {
-      pfx.fp_addr.ip6 = vip->prefix.ip6;
-      pfx.fp_len = vip->plen;
-      pfx.fp_proto = FIB_PROTOCOL_IP6;
-      proto = DPO_PROTO_IP6;
-  }
-  dpo_set(&dpo, lb_vip_is_gre4(vip)?lbm->dpo_gre4_type:lbm->dpo_gre6_type,
-      proto, vip - lbm->vips);
-  fib_table_entry_special_dpo_add(0,
-				  &pfx,
-				  FIB_SOURCE_PLUGIN_HI,
-				  FIB_ENTRY_FLAG_EXCLUSIVE,
-				  &dpo);
-  dpo_reset(&dpo);
-}
-
-/**
- * Deletes the adjacency associated with the VIP
- */
-static void lb_vip_del_adjacency(lb_main_t *lbm, lb_vip_t *vip)
-{
-  fib_prefix_t pfx = {};
-  if (lb_vip_is_ip4(vip)) {
-      pfx.fp_addr.ip4 = vip->prefix.ip4;
-      pfx.fp_len = vip->plen - 96;
-      pfx.fp_proto = FIB_PROTOCOL_IP4;
-  } else {
-      pfx.fp_addr.ip6 = vip->prefix.ip6;
-      pfx.fp_len = vip->plen;
-      pfx.fp_proto = FIB_PROTOCOL_IP6;
-  }
-  fib_table_entry_special_remove(0, &pfx, FIB_SOURCE_PLUGIN_HI);
-}
-
-int lb_vip_add(ip46_address_t *prefix, u8 plen, lb_vip_type_t type, u32 new_length, u32 *vip_index)
-{
-  lb_main_t *lbm = &lb_main;
-  lb_vip_t *vip;
-  lb_get_writer_lock();
-  ip46_prefix_normalize(prefix, plen);
-
-  if (!lb_vip_find_index_with_lock(prefix, plen, vip_index)) {
-    lb_put_writer_lock();
-    return VNET_API_ERROR_VALUE_EXIST;
-  }
-
-  if (!is_pow2(new_length)) {
-    lb_put_writer_lock();
-    return VNET_API_ERROR_INVALID_MEMORY_SIZE;
-  }
-
-  if (ip46_prefix_is_ip4(prefix, plen) &&
-      (type != LB_VIP_TYPE_IP4_GRE4) &&
-      (type != LB_VIP_TYPE_IP4_GRE6))
-    return VNET_API_ERROR_INVALID_ADDRESS_FAMILY;
-
-
-  //Allocate
-  pool_get(lbm->vips, vip);
-
-  //Init
-  vip->prefix = *prefix;
-  vip->plen = plen;
-  vip->last_garbage_collection = (u32) vlib_time_now(vlib_get_main());
-  vip->type = type;
-  vip->flags = LB_VIP_FLAGS_USED;
-  vip->as_indexes = 0;
-
-  //Validate counters
-  u32 i;
-  for (i = 0; i < LB_N_VIP_COUNTERS; i++) {
-    vlib_validate_simple_counter(&lbm->vip_counters[i], vip - lbm->vips);
-    vlib_zero_simple_counter(&lbm->vip_counters[i], vip - lbm->vips);
-  }
-
-  //Configure new flow table
-  vip->new_flow_table_mask = new_length - 1;
-  vip->new_flow_table = 0;
-
-  //Create a new flow hash table full of the default entry
-  lb_vip_update_new_flow_table(vip);
-
-  //Create adjacency to direct traffic
-  lb_vip_add_adjacency(lbm, vip);
-
-  //Return result
-  *vip_index = vip - lbm->vips;
-
-  lb_put_writer_lock();
-  return 0;
-}
-
-int lb_vip_del(u32 vip_index)
-{
-  lb_main_t *lbm = &lb_main;
-  lb_vip_t *vip;
-  lb_get_writer_lock();
-  if (!(vip = lb_vip_get_by_index(vip_index))) {
-    lb_put_writer_lock();
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-  }
-
-  //FIXME: This operation is actually not working
-  //We will need to remove state before performing this.
-
-  {
-    //Remove all ASs
-    ip46_address_t *ass = 0;
-    lb_as_t *as;
-    u32 *as_index;
-    pool_foreach(as_index, vip->as_indexes, {
-        as = &lbm->ass[*as_index];
-        vec_add1(ass, as->address);
-    });
-    if (vec_len(ass))
-      lb_vip_del_ass_withlock(vip_index, ass, vec_len(ass));
-    vec_free(ass);
-  }
-
-  //Delete adjacency
-  lb_vip_del_adjacency(lbm, vip);
-
-  //Set the VIP as unused
-  vip->flags &= ~LB_VIP_FLAGS_USED;
-
-  lb_put_writer_lock();
-  return 0;
-}
-
-clib_error_t *
-vlib_plugin_register (vlib_main_t * vm,
-                      vnet_plugin_handoff_t * h,
-                      int from_early_init)
-{
-  clib_error_t *error = 0;
-  return error;
-}
-
-
-u8 *format_lb_dpo (u8 * s, va_list * va)
-{
-  index_t index = va_arg (*va, index_t);
-  CLIB_UNUSED(u32 indent) = va_arg (*va, u32);
-  lb_main_t *lbm = &lb_main;
-  lb_vip_t *vip = pool_elt_at_index (lbm->vips, index);
-  return format (s, "%U", format_lb_vip, vip);
-}
-
-static void lb_dpo_lock (dpo_id_t *dpo) {}
-static void lb_dpo_unlock (dpo_id_t *dpo) {}
-
-static fib_node_t *
-lb_fib_node_get_node (fib_node_index_t index)
-{
-  lb_main_t *lbm = &lb_main;
-  lb_as_t *as = pool_elt_at_index (lbm->ass, index);
-  return (&as->fib_node);
-}
-
-static void
-lb_fib_node_last_lock_gone (fib_node_t *node)
-{
-}
-
-static lb_as_t *
-lb_as_from_fib_node (fib_node_t *node)
-{
-  return ((lb_as_t*)(((char*)node) -
-      STRUCT_OFFSET_OF(lb_as_t, fib_node)));
-}
-
-static void
-lb_as_stack (lb_as_t *as)
-{
-  lb_main_t *lbm = &lb_main;
-  lb_vip_t *vip = &lbm->vips[as->vip_index];
-  dpo_stack(lb_vip_is_gre4(vip)?lbm->dpo_gre4_type:lbm->dpo_gre6_type,
-	    lb_vip_is_ip4(vip)?DPO_PROTO_IP4:DPO_PROTO_IP6,
-	    &as->dpo,
-	    fib_entry_contribute_ip_forwarding(
-		as->next_hop_fib_entry_index));
-}
-
-static fib_node_back_walk_rc_t
-lb_fib_node_back_walk_notify (fib_node_t *node,
-			       fib_node_back_walk_ctx_t *ctx)
-{
-    lb_as_stack(lb_as_from_fib_node(node));
-    return (FIB_NODE_BACK_WALK_CONTINUE);
-}
-
-clib_error_t *
-lb_init (vlib_main_t * vm)
-{
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  lb_main_t *lbm = &lb_main;
-  lb_as_t *default_as;
-  fib_node_vft_t lb_fib_node_vft = {
-      .fnv_get = lb_fib_node_get_node,
-      .fnv_last_lock = lb_fib_node_last_lock_gone,
-      .fnv_back_walk = lb_fib_node_back_walk_notify,
-  };
-  dpo_vft_t lb_vft = {
-      .dv_lock = lb_dpo_lock,
-      .dv_unlock = lb_dpo_unlock,
-      .dv_format = format_lb_dpo,
-  };
-
-  lbm->vips = 0;
-  lbm->per_cpu = 0;
-  vec_validate(lbm->per_cpu, tm->n_vlib_mains - 1);
-  lbm->writer_lock = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,  CLIB_CACHE_LINE_BYTES);
-  lbm->writer_lock[0] = 0;
-  lbm->per_cpu_sticky_buckets = LB_DEFAULT_PER_CPU_STICKY_BUCKETS;
-  lbm->flow_timeout = LB_DEFAULT_FLOW_TIMEOUT;
-  lbm->ip4_src_address.as_u32 = 0xffffffff;
-  lbm->ip6_src_address.as_u64[0] = 0xffffffffffffffffL;
-  lbm->ip6_src_address.as_u64[1] = 0xffffffffffffffffL;
-  lbm->dpo_gre4_type = dpo_register_new_type(&lb_vft, lb_dpo_gre4_nodes);
-  lbm->dpo_gre6_type = dpo_register_new_type(&lb_vft, lb_dpo_gre6_nodes);
-  lbm->fib_node_type = fib_node_register_new_type(&lb_fib_node_vft);
-
-  //Init AS reference counters
-  vlib_refcount_init(&lbm->as_refcount);
-
-  //Allocate and init default AS.
-  lbm->ass = 0;
-  pool_get(lbm->ass, default_as);
-  default_as->flags = 0;
-  default_as->dpo.dpoi_next_node = LB_NEXT_DROP;
-  default_as->vip_index = ~0;
-  default_as->address.ip6.as_u64[0] = 0xffffffffffffffffL;
-  default_as->address.ip6.as_u64[1] = 0xffffffffffffffffL;
-
-#define _(a,b,c) lbm->vip_counters[c].name = b;
-  lb_foreach_vip_counter
-#undef _
-  return NULL;
-}
-
-VLIB_INIT_FUNCTION (lb_init);
diff --git a/plugins/lb-plugin/lb/lb.h b/plugins/lb-plugin/lb/lb.h
deleted file mode 100644
index 882b9b30..00000000
--- a/plugins/lb-plugin/lb/lb.h
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * lb-plugin implements a MagLev-like load balancer.
- * http://research.google.com/pubs/pub44824.html
- *
- * It hasn't been tested for interoperability with the original MagLev
- * but intends to provide similar functionality.
- * The load-balancer receives traffic destined to VIP (Virtual IP)
- * addresses from one or multiple(ECMP) routers.
- * The load-balancer tunnels the traffic toward many application servers
- * ensuring session stickyness (i.e. that a single sessions is tunneled
- * towards a single application server).
- *
- */
-
-#ifndef LB_PLUGIN_LB_LB_H_
-#define LB_PLUGIN_LB_LB_H_
-
-#include <lb/util.h>
-#include <lb/refcount.h>
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/dpo/dpo.h>
-#include <vnet/fib/fib_table.h>
-
-#include <lb/lbhash.h>
-
-#define LB_DEFAULT_PER_CPU_STICKY_BUCKETS 1 << 10
-#define LB_DEFAULT_FLOW_TIMEOUT 40
-
-typedef enum {
-  LB_NEXT_DROP,
-  LB_N_NEXT,
-} lb_next_t;
-
-/**
- * Each VIP is configured with a set of
- * application server.
- */
-typedef struct {
-  /**
-   * Registration to FIB event.
-   */
-  fib_node_t fib_node;
-
-  /**
-   * Destination address used to tunnel traffic towards
-   * that application server.
-   * The address is also used as ID and pseudo-random
-   * seed for the load-balancing process.
-   */
-  ip46_address_t address;
-
-  /**
-   * ASs are indexed by address and VIP Index.
-   * Which means there will be duplicated if the same server
-   * address is used for multiple VIPs.
-   */
-  u32 vip_index;
-
-  /**
-   * Some per-AS flags.
-   * For now only LB_AS_FLAGS_USED is defined.
-   */
-  u8 flags;
-
-#define LB_AS_FLAGS_USED 0x1
-
-  /**
-   * Rotating timestamp of when LB_AS_FLAGS_USED flag was last set.
-   *
-   * AS removal is based on garbage collection and reference counting.
-   * When an AS is removed, there is a race between configuration core
-   * and worker cores which may still add a reference while it should not
-   * be used. This timestamp is used to not remove the AS while a race condition
-   * may happen.
-   */
-  u32 last_used;
-
-  /**
-   * The FIB entry index for the next-hop
-   */
-  fib_node_index_t next_hop_fib_entry_index;
-
-  /**
-   * The child index on the FIB entry
-   */
-  u32 next_hop_child_index;
-
-  /**
-   * The next DPO in the graph to follow.
-   */
-  dpo_id_t dpo;
-
-} lb_as_t;
-
-format_function_t format_lb_as;
-
-typedef struct {
-  u32 as_index;
-} lb_new_flow_entry_t;
-
-#define lb_foreach_vip_counter \
- _(NEXT_PACKET, "packet from existing sessions", 0) \
- _(FIRST_PACKET, "first session packet", 1) \
- _(UNTRACKED_PACKET, "untracked packet", 2) \
- _(NO_SERVER, "no server configured", 3)
-
-typedef enum {
-#define _(a,b,c) LB_VIP_COUNTER_##a = c,
-  lb_foreach_vip_counter
-#undef _
-  LB_N_VIP_COUNTERS
-} lb_vip_counter_t;
-
-/**
- * The load balancer supports IPv4 and IPv6 traffic
- * and GRE4 and GRE6 encap.
- */
-typedef enum {
-  LB_VIP_TYPE_IP6_GRE6,
-  LB_VIP_TYPE_IP6_GRE4,
-  LB_VIP_TYPE_IP4_GRE6,
-  LB_VIP_TYPE_IP4_GRE4,
-  LB_VIP_N_TYPES,
-} lb_vip_type_t;
-
-format_function_t format_lb_vip_type;
-unformat_function_t unformat_lb_vip_type;
-
-/**
- * Load balancing service is provided per VIP.
- * In this data model, a VIP can be a whole prefix.
- * But load balancing only
- * occurs on a per-source-address/port basis. Meaning that if a given source
- * reuses the same port for multiple destinations within the same VIP,
- * they will be considered as a single flow.
- */
-typedef struct {
-
-  //Runtime
-
-  /**
-   * Vector mapping (flow-hash & new_connect_table_mask) to AS index.
-   * This is used for new flows.
-   */
-  lb_new_flow_entry_t *new_flow_table;
-
-  /**
-   * New flows table length - 1
-   * (length MUST be a power of 2)
-   */
-  u32 new_flow_table_mask;
-
-  /**
-   * Last time garbage collection was run to free the ASs.
-   */
-  u32 last_garbage_collection;
-
-  //Not runtime
-
-  /**
-   * A Virtual IP represents a given service delivered
-   * by a set of application servers. It can be a single
-   * address or a prefix.
-   * IPv4 prefixes are encoded using IPv4-in-IPv6 embedded address
-   * (i.e. ::/96 prefix).
-   */
-  ip46_address_t prefix;
-
-  /**
-   * The VIP prefix length.
-   * In case of IPv4, plen = 96 + ip4_plen.
-   */
-  u8 plen;
-
-  /**
-   * The type of traffic for this.
-   * LB_TYPE_UNDEFINED if unknown.
-   */
-  lb_vip_type_t type;
-
-  /**
-   * Flags related to this VIP.
-   * LB_VIP_FLAGS_USED means the VIP is active.
-   * When it is not set, the VIP in the process of being removed.
-   * We cannot immediately remove a VIP because the VIP index still may be stored
-   * in the adjacency index.
-   */
-  u8 flags;
-#define LB_VIP_FLAGS_USED 0x1
-
-  /**
-   * Pool of AS indexes used for this VIP.
-   * This also includes ASs that have been removed (but are still referenced).
-   */
-  u32 *as_indexes;
-} lb_vip_t;
-
-#define lb_vip_is_ip4(vip) ((vip)->type == LB_VIP_TYPE_IP4_GRE6 || (vip)->type == LB_VIP_TYPE_IP4_GRE4)
-#define lb_vip_is_gre4(vip) ((vip)->type == LB_VIP_TYPE_IP6_GRE4 || (vip)->type == LB_VIP_TYPE_IP4_GRE4)
-format_function_t format_lb_vip;
-format_function_t format_lb_vip_detailed;
-
-typedef struct {
-  /**
-   * Each CPU has its own sticky flow hash table.
-   * One single table is used for all VIPs.
-   */
-  lb_hash_t *sticky_ht;
-} lb_per_cpu_t;
-
-typedef struct {
-  /**
-   * Pool of all Virtual IPs
-   */
-  lb_vip_t *vips;
-
-  /**
-   * Pool of ASs.
-   * ASs are referenced by address and vip index.
-   * The first element (index 0) is special and used only to fill
-   * new_flow_tables when no AS has been configured.
-   */
-  lb_as_t *ass;
-
-  /**
-   * Each AS has an associated reference counter.
-   * As ass[0] has a special meaning, its associated counter
-   * starts at 0 and is decremented instead. i.e. do not use it.
-   */
-  vlib_refcount_t as_refcount;
-
-  /**
-   * Some global data is per-cpu
-   */
-  lb_per_cpu_t *per_cpu;
-
-  /**
-   * Node next index for IP adjacencies, for each of the traffic types.
-   */
-  u32 ip_lookup_next_index[LB_VIP_N_TYPES];
-
-  /**
-   * Source address used in IPv6 encapsulated traffic
-   */
-  ip6_address_t ip6_src_address;
-
-  /**
-   * Source address used for IPv4 encapsulated traffic
-   */
-  ip4_address_t ip4_src_address;
-
-  /**
-   * Number of buckets in the per-cpu sticky hash table.
-   */
-  u32 per_cpu_sticky_buckets;
-
-  /**
-   * Flow timeout in seconds.
-   */
-  u32 flow_timeout;
-
-  /**
-   * Per VIP counter
-   */
-  vlib_simple_counter_main_t vip_counters[LB_N_VIP_COUNTERS];
-
-  /**
-   * DPO used to send packet from IP4/6 lookup to LB node.
-   */
-  dpo_type_t dpo_gre4_type;
-  dpo_type_t dpo_gre6_type;
-
-  /**
-   * Node type for registering to fib changes.
-   */
-  fib_node_type_t fib_node_type;
-
-  /**
-   * API dynamically registered base ID.
-   */
-  u16 msg_id_base;
-
-  volatile u32 *writer_lock;
-} lb_main_t;
-
-extern lb_main_t lb_main;
-extern vlib_node_registration_t lb6_node;
-extern vlib_node_registration_t lb4_node;
-
-/**
- * Fix global load-balancer parameters.
- * @param ip4_address IPv4 source address used for encapsulated traffic
- * @param ip6_address IPv6 source address used for encapsulated traffic
- * @return 0 on success. VNET_LB_ERR_XXX on error
- */
-int lb_conf(ip4_address_t *ip4_address, ip6_address_t *ip6_address,
-            u32 sticky_buckets, u32 flow_timeout);
-
-int lb_vip_add(ip46_address_t *prefix, u8 plen, lb_vip_type_t type,
-               u32 new_length, u32 *vip_index);
-int lb_vip_del(u32 vip_index);
-
-int lb_vip_find_index(ip46_address_t *prefix, u8 plen, u32 *vip_index);
-
-#define lb_vip_get_by_index(index) (pool_is_free_index(lb_main.vips, index)?NULL:pool_elt_at_index(lb_main.vips, index))
-
-int lb_vip_add_ass(u32 vip_index, ip46_address_t *addresses, u32 n);
-int lb_vip_del_ass(u32 vip_index, ip46_address_t *addresses, u32 n);
-
-u32 lb_hash_time_now(vlib_main_t * vm);
-
-void lb_garbage_collection();
-
-format_function_t format_lb_main;
-
-#endif /* LB_PLUGIN_LB_LB_H_ */
diff --git a/plugins/lb-plugin/lb/lb_test.c b/plugins/lb-plugin/lb/lb_test.c
deleted file mode 100644
index 8c2eaa91..00000000
--- a/plugins/lb-plugin/lb/lb_test.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vat/vat.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-#include <vppinfra/error.h>
-#include <lb/lb.h>
-
-//TODO: Move that to vat/plugin_api.c
-//////////////////////////
-uword unformat_ip46_address (unformat_input_t * input, va_list * args)
-{
-  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
-  ip46_type_t type = va_arg (*args, ip46_type_t);
-  if ((type != IP46_TYPE_IP6) &&
-      unformat(input, "%U", unformat_ip4_address, &ip46->ip4)) {
-    ip46_address_mask_ip4(ip46);
-    return 1;
-  } else if ((type != IP46_TYPE_IP4) &&
-      unformat(input, "%U", unformat_ip6_address, &ip46->ip6)) {
-    return 1;
-  }
-  return 0;
-}
-uword unformat_ip46_prefix (unformat_input_t * input, va_list * args)
-{
-  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
-  u8 *len = va_arg (*args, u8 *);
-  ip46_type_t type = va_arg (*args, ip46_type_t);
-
-  u32 l;
-  if ((type != IP46_TYPE_IP6) && unformat(input, "%U/%u", unformat_ip4_address, &ip46->ip4, &l)) {
-    if (l > 32)
-      return 0;
-    *len = l + 96;
-    ip46->pad[0] = ip46->pad[1] = ip46->pad[2] = 0;
-  } else if ((type != IP46_TYPE_IP4) && unformat(input, "%U/%u", unformat_ip6_address, &ip46->ip6, &l)) {
-    if (l > 128)
-      return 0;
-    *len = l;
-  } else {
-    return 0;
-  }
-  return 1;
-}
-/////////////////////////
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <lb/lb.api.h>
-    /* We'll want to know how many messages IDs we need... */
-    VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-/* define message structures */
-#define vl_typedefs
-#include <lb/lb.api.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun             /* define message structures */
-#include <lb/lb.api.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <lb/lb.api.h>
-#undef vl_printfun
-
-/* Get the API version number. */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <lb/lb.api.h>
-#undef vl_api_version
-
-typedef struct {
-    /* API message ID base */
-    u16 msg_id_base;
-    vat_main_t *vat_main;
-} lb_test_main_t;
-
-lb_test_main_t lb_test_main;
-
-#define foreach_standard_reply_retval_handler   \
-_(lb_conf_reply)                 \
-_(lb_add_del_vip_reply)          \
-_(lb_add_del_as_reply)
-
-#define _(n)                                            \
-    static void vl_api_##n##_t_handler                  \
-    (vl_api_##n##_t * mp)                               \
-    {                                                   \
-        vat_main_t * vam = lb_test_main.vat_main;   \
-        i32 retval = ntohl(mp->retval);                 \
-        if (vam->async_mode) {                          \
-            vam->async_errors += (retval < 0);          \
-        } else {                                        \
-            vam->retval = retval;                       \
-            vam->result_ready = 1;                      \
-        }                                               \
-    }
-foreach_standard_reply_retval_handler;
-#undef _
-
-/*
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg                               \
-  _(LB_CONF_REPLY, lb_conf_reply)                                     \
-  _(LB_ADD_DEL_VIP_REPLY, lb_add_del_vip_reply)                       \
-  _(LB_ADD_DEL_AS_REPLY, lb_add_del_as_reply)
-
-/* M: construct, but don't yet send a message */
-#define M(T,t)                                                  \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp));                         \
-    memcpy (mp, &mps, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + lbtm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W                                       \
-do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
-                                                \
-    while (vat_time_now (vam) < timeout) {      \
-        if (vam->result_ready == 1) {           \
-            return (vam->retval);               \
-        }                                       \
-    }                                           \
-    return -99;                                 \
-} while(0);
-
-static int api_lb_conf (vat_main_t * vam)
-{
-  lb_test_main_t *lbtm = &lb_test_main;
-  unformat_input_t *i = vam->input;
-  f64 timeout;
-  vl_api_lb_conf_t mps, *mp;
-
-  if (!unformat(i, "%U %U %u %u",
-               unformat_ip4_address, &mps.ip4_src_address,
-               unformat_ip6_address, mps.ip6_src_address,
-               &mps.sticky_buckets_per_core,
-               &mps.flow_timeout)) {
-    errmsg ("invalid arguments\n");
-    return -99;
-  }
-
-  M(LB_CONF, lb_conf); S; W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int api_lb_add_del_vip (vat_main_t * vam)
-{
-  lb_test_main_t *lbtm = &lb_test_main;
-  unformat_input_t * i = vam->input;
-  f64 timeout;
-  vl_api_lb_add_del_vip_t mps, *mp;
-  mps.is_del = 0;
-  mps.is_gre4 = 0;
-
-  if (!unformat(i, "%U",
-                unformat_ip46_prefix, mps.ip_prefix, &mps.prefix_length, IP46_TYPE_ANY)) {
-    errmsg ("invalid prefix\n");
-    return -99;
-  }
-
-  if (unformat(i, "gre4")) {
-    mps.is_gre4 = 1;
-  } else if (unformat(i, "gre6")) {
-    mps.is_gre4 = 0;
-  } else {
-    errmsg ("no encap\n");
-    return -99;
-  }
-
-  if (!unformat(i, "%d", &mps.new_flows_table_length)) {
-    errmsg ("no table lentgh\n");
-    return -99;
-  }
-
-  if (unformat(i, "del")) {
-    mps.is_del = 1;
-  }
-
-  M(LB_ADD_DEL_VIP, lb_add_del_vip); S; W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int api_lb_add_del_as (vat_main_t * vam)
-{
-  lb_test_main_t *lbtm = &lb_test_main;
-  unformat_input_t * i = vam->input;
-  f64 timeout;
-  vl_api_lb_add_del_as_t mps, *mp;
-  mps.is_del = 0;
-
-  if (!unformat(i, "%U %U",
-                unformat_ip46_prefix, mps.vip_ip_prefix, &mps.vip_prefix_length, IP46_TYPE_ANY,
-                unformat_ip46_address, mps.as_address)) {
-    errmsg ("invalid prefix or address\n");
-    return -99;
-  }
-
-  if (unformat(i, "del")) {
-    mps.is_del = 1;
-  }
-
-  M(LB_ADD_DEL_AS, lb_add_del_as); S; W;
-  /* NOTREACHED */
-  return 0;
-}
-
-/*
- * List of messages that the api test plugin sends,
- * and that the data plane plugin processes
- */
-#define foreach_vpe_api_msg                             \
-_(lb_conf, "<ip4-src-addr> <ip6-src-address> <sticky_buckets_per_core> <flow_timeout>") \
-_(lb_add_del_vip, "<ip-prefix> [gre4|gre6] <new_table_len> [del]") \
-_(lb_add_del_as, "<vip-ip-prefix> <address> [del]")
-
-void vat_api_hookup (vat_main_t *vam)
-{
-  lb_test_main_t * lbtm = &lb_test_main;
-  /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n)                                                  \
-  vl_msg_api_set_handlers((VL_API_##N + lbtm->msg_id_base),       \
-                          #n,                                   \
-                          vl_api_##n##_t_handler,               \
-                          vl_noop_handler,                      \
-                          vl_api_##n##_t_endian,                \
-                          vl_api_##n##_t_print,                 \
-                          sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_reply_msg;
-#undef _
-
-  /* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
-  foreach_vpe_api_msg;
-#undef _
-
-  /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
-  foreach_vpe_api_msg;
-#undef _
-}
-
-clib_error_t * vat_plugin_register (vat_main_t *vam)
-{
-  lb_test_main_t * lbtm = &lb_test_main;
-
-  u8 * name;
-
-  lbtm->vat_main = vam;
-
-  /* Ask the vpp engine for the first assigned message-id */
-  name = format (0, "lb_%08x%c", api_version, 0);
-  lbtm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (lbtm->msg_id_base != (u16) ~0)
-    vat_api_hookup (vam);
-
-  vec_free(name);
-
-  return 0;
-}
diff --git a/plugins/lb-plugin/lb/lbhash.h b/plugins/lb-plugin/lb/lbhash.h
deleted file mode 100644
index ca3cc143..00000000
--- a/plugins/lb-plugin/lb/lbhash.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2012 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * vppinfra already includes tons of different hash tables.
- * MagLev flow table is a bit different. It has to be very efficient
- * for both writing and reading operations. But it does not need to
- * be 100% reliable (write can fail). It also needs to recycle
- * old entries in a lazy way.
- *
- * This hash table is the most dummy hash table you can do.
- * Fixed total size, fixed bucket size.
- * Advantage is that it could be very efficient (maybe).
- *
- */
-
-#ifndef LB_PLUGIN_LB_LBHASH_H_
-#define LB_PLUGIN_LB_LBHASH_H_
-
-#include <vnet/vnet.h>
-
-#if defined (__SSE4_2__)
-#include <immintrin.h>
-#endif
-
-/*
- * @brief Number of entries per bucket.
- */
-#define LBHASH_ENTRY_PER_BUCKET 4
-
-#define LB_HASH_DO_NOT_USE_SSE_BUCKETS 0
-
-/*
- * @brief One bucket contains 4 entries.
- * Each bucket takes one 64B cache line in memory.
- */
-typedef struct {
-  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
-  u32 hash[LBHASH_ENTRY_PER_BUCKET];
-  u32 timeout[LBHASH_ENTRY_PER_BUCKET];
-  u32 vip[LBHASH_ENTRY_PER_BUCKET];
-  u32 value[LBHASH_ENTRY_PER_BUCKET];
-} lb_hash_bucket_t;
-
-typedef struct {
-  u32 buckets_mask;
-  u32 timeout;
-  lb_hash_bucket_t buckets[];
-} lb_hash_t;
-
-#define lb_hash_nbuckets(h) (((h)->buckets_mask) + 1)
-#define lb_hash_size(h) ((h)->buckets_mask + LBHASH_ENTRY_PER_BUCKET)
-
-#define lb_hash_foreach_bucket(h, bucket) \
-  for (bucket = (h)->buckets; \
-	bucket < (h)->buckets + lb_hash_nbuckets(h); \
-	bucket++)
-
-#define lb_hash_foreach_entry(h, bucket, i) \
-    lb_hash_foreach_bucket(h, bucket) \
-      for (i = 0; i < LBHASH_ENTRY_PER_BUCKET; i++)
-
-#define lb_hash_foreach_valid_entry(h, bucket, i, now) \
-    lb_hash_foreach_entry(h, bucket, i) \
-       if (!clib_u32_loop_gt((now), bucket->timeout[i]))
-
-static_always_inline
-lb_hash_t *lb_hash_alloc(u32 buckets, u32 timeout)
-{
-  if (!is_pow2(buckets))
-    return NULL;
-
-  // Allocate 1 more bucket for prefetch
-  u32 size = ((u64)&((lb_hash_t *)(0))->buckets[0]) +
-      sizeof(lb_hash_bucket_t) * (buckets + 1);
-  u8 *mem = 0;
-  lb_hash_t *h;
-  vec_alloc_aligned(mem, size, CLIB_CACHE_LINE_BYTES);
-  h = (lb_hash_t *)mem;
-  h->buckets_mask = (buckets - 1);
-  h->timeout = timeout;
-  return h;
-}
-
-static_always_inline
-void lb_hash_free(lb_hash_t *h)
-{
-  u8 *mem = (u8 *)h;
-  vec_free(mem);
-}
-
-#if __SSE4_2__
-static_always_inline
-u32 lb_hash_hash(u64 k0, u64 k1, u64 k2, u64 k3, u64 k4)
-{
-  u64 val = 0;
-  val = _mm_crc32_u64(val, k0);
-  val = _mm_crc32_u64(val, k1);
-  val = _mm_crc32_u64(val, k2);
-  val = _mm_crc32_u64(val, k3);
-  val = _mm_crc32_u64(val, k4);
-  return (u32) val;
-}
-#else
-static_always_inline
-u32 lb_hash_hash(u64 k0, u64 k1, u64 k2, u64 k3, u64 k4)
-{
-  u64 tmp = k0 ^ k1 ^ k2 ^ k3 ^ k4;
-  return (u32)clib_xxhash (tmp);
-}
-#endif
-
-static_always_inline
-void lb_hash_prefetch_bucket(lb_hash_t *ht, u32 hash)
-{
-  lb_hash_bucket_t *bucket = &ht->buckets[hash & ht->buckets_mask];
-  CLIB_PREFETCH(bucket, sizeof(*bucket), READ);
-}
-
-static_always_inline
-void lb_hash_get(lb_hash_t *ht, u32 hash, u32 vip, u32 time_now,
-		 u32 *available_index, u32 *found_value)
-{
-  lb_hash_bucket_t *bucket = &ht->buckets[hash & ht->buckets_mask];
-  *found_value = ~0;
-  *available_index = ~0;
-#if __SSE4_2__ && LB_HASH_DO_NOT_USE_SSE_BUCKETS == 0
-  u32 bitmask, found_index;
-  __m128i mask;
-
-  // mask[*] = timeout[*] > now
-  mask = _mm_cmpgt_epi32(_mm_loadu_si128 ((__m128i *) bucket->timeout),
-			 _mm_set1_epi32 (time_now));
-  // bitmask[*] = now <= timeout[*/4]
-  bitmask = (~_mm_movemask_epi8(mask)) & 0xffff;
-  // Get first index with now <= timeout[*], if any.
-  *available_index = (bitmask)?__builtin_ctz(bitmask)/4:*available_index;
-
-  // mask[*] = (timeout[*] > now) && (hash[*] == hash)
-  mask = _mm_and_si128(mask,
-		       _mm_cmpeq_epi32(
-			   _mm_loadu_si128 ((__m128i *) bucket->hash),
-			   _mm_set1_epi32 (hash)));
-
-  // Load the array of vip values
-  // mask[*] = (timeout[*] > now) && (hash[*] == hash) && (vip[*] == vip)
-  mask = _mm_and_si128(mask,
-		       _mm_cmpeq_epi32(
-			   _mm_loadu_si128 ((__m128i *) bucket->vip),
-			   _mm_set1_epi32 (vip)));
-
-  // mask[*] = (timeout[*x4] > now) && (hash[*x4] == hash) && (vip[*x4] == vip)
-  bitmask = _mm_movemask_epi8(mask);
-  // Get first index, if any
-  found_index = (bitmask)?__builtin_ctzll(bitmask)/4:0;
-  ASSERT(found_index < 4);
-  *found_value = (bitmask)?bucket->value[found_index]:*found_value;
-  bucket->timeout[found_index] =
-      (bitmask)?time_now + ht->timeout:bucket->timeout[found_index];
-#else
-  u32 i;
-  for (i = 0; i < LBHASH_ENTRY_PER_BUCKET; i++) {
-      u8 cmp = (bucket->hash[i] == hash && bucket->vip[i] == vip);
-      u8 timeouted = clib_u32_loop_gt(time_now, bucket->timeout[i]);
-      *found_value = (cmp || timeouted)?*found_value:bucket->value[i];
-      bucket->timeout[i] = (cmp || timeouted)?time_now + ht->timeout:bucket->timeout[i];
-      *available_index = (timeouted && (*available_index == ~0))?i:*available_index;
-
-      if (!cmp)
-	return;
-  }
-#endif
-}
-
-static_always_inline
-u32 lb_hash_available_value(lb_hash_t *h, u32 hash, u32 available_index)
-{
-  return h->buckets[hash & h->buckets_mask].value[available_index];
-}
-
-static_always_inline
-void lb_hash_put(lb_hash_t *h, u32 hash, u32 value, u32 vip,
-		 u32 available_index, u32 time_now)
-{
-  lb_hash_bucket_t *bucket = &h->buckets[hash & h->buckets_mask];
-  bucket->hash[available_index] = hash;
-  bucket->value[available_index] = value;
-  bucket->timeout[available_index] = time_now + h->timeout;
-  bucket->vip[available_index] = vip;
-}
-
-static_always_inline
-u32 lb_hash_elts(lb_hash_t *h, u32 time_now)
-{
-  u32 tot = 0;
-  lb_hash_bucket_t *bucket;
-  u32 i;
-  lb_hash_foreach_valid_entry(h, bucket, i, time_now) {
-    tot++;
-  }
-  return tot;
-}
-
-#endif /* LB_PLUGIN_LB_LBHASH_H_ */
diff --git a/plugins/lb-plugin/lb/node.c b/plugins/lb-plugin/lb/node.c
deleted file mode 100644
index 8b763c53..00000000
--- a/plugins/lb-plugin/lb/node.c
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <lb/lb.h>
-
-#include <vnet/gre/packet.h>
-#include <lb/lbhash.h>
-
-#define foreach_lb_error \
- _(NONE, "no error") \
- _(PROTO_NOT_SUPPORTED, "protocol not supported")
-
-typedef enum {
-#define _(sym,str) LB_ERROR_##sym,
-  foreach_lb_error
-#undef _
-    LB_N_ERROR,
-} lb_error_t;
-
-static char *lb_error_strings[] = {
-#define _(sym,string) string,
-    foreach_lb_error
-#undef _
-};
-
-typedef struct {
-  u32 vip_index;
-  u32 as_index;
-} lb_trace_t;
-
-u8 *
-format_lb_trace (u8 * s, va_list * args)
-{
-  lb_main_t *lbm = &lb_main;
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  lb_trace_t *t = va_arg (*args, lb_trace_t *);
-  if (pool_is_free_index(lbm->vips, t->vip_index)) {
-      s = format(s, "lb vip[%d]: This VIP was freed since capture\n");
-  } else {
-      s = format(s, "lb vip[%d]: %U\n", t->vip_index, format_lb_vip, &lbm->vips[t->vip_index]);
-  }
-  if (pool_is_free_index(lbm->ass, t->as_index)) {
-      s = format(s, "lb as[%d]: This AS was freed since capture\n");
-  } else {
-      s = format(s, "lb as[%d]: %U\n", t->as_index, format_lb_as, &lbm->ass[t->as_index]);
-  }
-  return s;
-}
-
-lb_hash_t *lb_get_sticky_table(u32 cpu_index)
-{
-  lb_main_t *lbm = &lb_main;
-  lb_hash_t *sticky_ht = lbm->per_cpu[cpu_index].sticky_ht;
-  //Check if size changed
-  if (PREDICT_FALSE(sticky_ht && (lbm->per_cpu_sticky_buckets != lb_hash_nbuckets(sticky_ht))))
-    {
-      //Dereference everything in there
-      lb_hash_bucket_t *b;
-      u32 i;
-      lb_hash_foreach_entry(sticky_ht, b, i) {
-	vlib_refcount_add(&lbm->as_refcount, cpu_index, b->value[i], -1);
-	vlib_refcount_add(&lbm->as_refcount, cpu_index, 0, 1);
-      }
-
-      lb_hash_free(sticky_ht);
-      sticky_ht = NULL;
-    }
-
-  //Create if necessary
-  if (PREDICT_FALSE(sticky_ht == NULL)) {
-    lbm->per_cpu[cpu_index].sticky_ht = lb_hash_alloc(lbm->per_cpu_sticky_buckets, lbm->flow_timeout);
-    sticky_ht = lbm->per_cpu[cpu_index].sticky_ht;
-    clib_warning("Regenerated sticky table %p", sticky_ht);
-  }
-
-  ASSERT(sticky_ht);
-
-  //Update timeout
-  sticky_ht->timeout = lbm->flow_timeout;
-  return sticky_ht;
-}
-
-u64
-lb_node_get_other_ports4(ip4_header_t *ip40)
-{
-  return 0;
-}
-
-u64
-lb_node_get_other_ports6(ip6_header_t *ip60)
-{
-  return 0;
-}
-
-static_always_inline u32
-lb_node_get_hash(vlib_buffer_t *p, u8 is_input_v4)
-{
-  u32 hash;
-  if (is_input_v4)
-    {
-      ip4_header_t *ip40;
-      u64 ports;
-      ip40 = vlib_buffer_get_current (p);
-      if (PREDICT_TRUE (ip40->protocol == IP_PROTOCOL_TCP ||
-		       ip40->protocol == IP_PROTOCOL_UDP))
-	ports = ((u64)((udp_header_t *)(ip40 + 1))->src_port << 16) |
-	  ((u64)((udp_header_t *)(ip40 + 1))->dst_port);
-      else
-	ports = lb_node_get_other_ports4(ip40);
-
-      hash = lb_hash_hash(*((u64 *)&ip40->address_pair), ports,
-			  0, 0, 0);
-    }
-  else
-    {
-      ip6_header_t *ip60;
-      ip60 = vlib_buffer_get_current (p);
-      u64 ports;
-      if (PREDICT_TRUE (ip60->protocol == IP_PROTOCOL_TCP ||
-			ip60->protocol == IP_PROTOCOL_UDP))
-	ports = ((u64)((udp_header_t *)(ip60 + 1))->src_port << 16) |
-	((u64)((udp_header_t *)(ip60 + 1))->dst_port);
-      else
-	ports = lb_node_get_other_ports6(ip60);
-
-      hash = lb_hash_hash(ip60->src_address.as_u64[0],
-			  ip60->src_address.as_u64[1],
-			  ip60->dst_address.as_u64[0],
-			  ip60->dst_address.as_u64[1],
-			  ports);
-    }
-  return hash;
-}
-
-static_always_inline uword
-lb_node_fn (vlib_main_t * vm,
-         vlib_node_runtime_t * node, vlib_frame_t * frame,
-         u8 is_input_v4, //Compile-time parameter stating that is input is v4 (or v6)
-         u8 is_encap_v4) //Compile-time parameter stating that is GRE encap is v4 (or v6)
-{
-  lb_main_t *lbm = &lb_main;
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  u32 cpu_index = os_get_cpu_number();
-  u32 lb_time = lb_hash_time_now(vm);
-
-  lb_hash_t *sticky_ht = lb_get_sticky_table(cpu_index);
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  u32 nexthash0 = 0;
-  if (PREDICT_TRUE(n_left_from > 0))
-    nexthash0 = lb_node_get_hash(vlib_get_buffer (vm, from[0]), is_input_v4);
-
-  while (n_left_from > 0)
-  {
-    vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-    while (n_left_from > 0 && n_left_to_next > 0)
-    {
-      u32 pi0;
-      vlib_buffer_t *p0;
-      lb_vip_t *vip0;
-      u32 asindex0;
-      u16 len0;
-      u32 available_index0;
-      u8 counter = 0;
-      u32 hash0 = nexthash0;
-
-      if (PREDICT_TRUE(n_left_from > 1))
-	{
-	  vlib_buffer_t *p1 = vlib_get_buffer (vm, from[1]);
-	  //Compute next hash and prefetch bucket
-	  nexthash0 = lb_node_get_hash(p1, is_input_v4);
-	  lb_hash_prefetch_bucket(sticky_ht, nexthash0);
-	  //Prefetch for encap, next
-	  CLIB_PREFETCH (vlib_buffer_get_current(p1) - 64, 64, STORE);
-	}
-
-      if (PREDICT_TRUE(n_left_from > 2))
-	{
-	  vlib_buffer_t *p2;
-	  p2 = vlib_get_buffer(vm, from[2]);
-	  /* prefetch packet header and data */
-	  vlib_prefetch_buffer_header(p2, STORE);
-	  CLIB_PREFETCH (vlib_buffer_get_current(p2), 64, STORE);
-	}
-
-      pi0 = to_next[0] = from[0];
-      from += 1;
-      n_left_from -= 1;
-      to_next += 1;
-      n_left_to_next -= 1;
-
-      p0 = vlib_get_buffer (vm, pi0);
-      vip0 = pool_elt_at_index (lbm->vips,
-				vnet_buffer (p0)->ip.adj_index[VLIB_TX]);
-
-      if (is_input_v4)
-	{
-	  ip4_header_t *ip40;
-	  ip40 = vlib_buffer_get_current (p0);
-	  len0 = clib_net_to_host_u16(ip40->length);
-	}
-      else
-	{
-	  ip6_header_t *ip60;
-	  ip60 = vlib_buffer_get_current (p0);
-	  len0 = clib_net_to_host_u16(ip60->payload_length) + sizeof(ip6_header_t);
-	}
-
-      lb_hash_get(sticky_ht, hash0, vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-		  lb_time, &available_index0, &asindex0);
-
-      if (PREDICT_TRUE(asindex0 != ~0))
-	{
-	  //Found an existing entry
-	  counter = LB_VIP_COUNTER_NEXT_PACKET;
-	}
-      else if (PREDICT_TRUE(available_index0 != ~0))
-	{
-	  //There is an available slot for a new flow
-	  asindex0 = vip0->new_flow_table[hash0 & vip0->new_flow_table_mask].as_index;
-	  counter = LB_VIP_COUNTER_FIRST_PACKET;
-	  counter = (asindex0 == 0)?LB_VIP_COUNTER_NO_SERVER:counter;
-
-	  //TODO: There are race conditions with as0 and vip0 manipulation.
-	  //Configuration may be changed, vectors resized, etc...
-
-	  //Dereference previously used
-	  vlib_refcount_add(&lbm->as_refcount, cpu_index,
-			    lb_hash_available_value(sticky_ht, hash0, available_index0), -1);
-	  vlib_refcount_add(&lbm->as_refcount, cpu_index,
-			    asindex0, 1);
-
-	  //Add sticky entry
-	  //Note that when there is no AS configured, an entry is configured anyway.
-	  //But no configured AS is not something that should happen
-	  lb_hash_put(sticky_ht, hash0, asindex0,
-		      vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-		      available_index0, lb_time);
-	}
-      else
-	{
-	  //Could not store new entry in the table
-	  asindex0 = vip0->new_flow_table[hash0 & vip0->new_flow_table_mask].as_index;
-	  counter = LB_VIP_COUNTER_UNTRACKED_PACKET;
-	}
-
-      vlib_increment_simple_counter(&lbm->vip_counters[counter],
-				    cpu_index,
-				    vnet_buffer (p0)->ip.adj_index[VLIB_TX],
-				    1);
-
-      //Now let's encap
-      {
-	gre_header_t *gre0;
-	if (is_encap_v4)
-	  {
-	    ip4_header_t *ip40;
-	    vlib_buffer_advance(p0, - sizeof(ip4_header_t) - sizeof(gre_header_t));
-	    ip40 = vlib_buffer_get_current(p0);
-	    gre0 = (gre_header_t *)(ip40 + 1);
-	    ip40->src_address = lbm->ip4_src_address;
-	    ip40->dst_address = lbm->ass[asindex0].address.ip4;
-	    ip40->ip_version_and_header_length = 0x45;
-	    ip40->ttl = 128;
-	    ip40->length = clib_host_to_net_u16(len0 + sizeof(gre_header_t) + sizeof(ip4_header_t));
-	    ip40->protocol = IP_PROTOCOL_GRE;
-	    ip40->checksum = ip4_header_checksum (ip40);
-	  }
-	else
-	  {
-	    ip6_header_t *ip60;
-	    vlib_buffer_advance(p0, - sizeof(ip6_header_t) - sizeof(gre_header_t));
-	    ip60 = vlib_buffer_get_current(p0);
-	    gre0 = (gre_header_t *)(ip60 + 1);
-	    ip60->dst_address = lbm->ass[asindex0].address.ip6;
-	    ip60->src_address = lbm->ip6_src_address;
-	    ip60->hop_limit = 128;
-	    ip60->ip_version_traffic_class_and_flow_label = clib_host_to_net_u32 (0x6<<28);
-	    ip60->payload_length = clib_host_to_net_u16(len0 + sizeof(gre_header_t));
-	    ip60->protocol = IP_PROTOCOL_GRE;
-	  }
-
-	gre0->flags_and_version = 0;
-	gre0->protocol = (is_input_v4)?
-	    clib_host_to_net_u16(0x0800):
-	    clib_host_to_net_u16(0x86DD);
-      }
-
-      if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
-	{
-	  lb_trace_t *tr = vlib_add_trace (vm, node, p0, sizeof (*tr));
-	  tr->as_index = asindex0;
-	  tr->vip_index = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
-	}
-
-      //Enqueue to next
-      //Note that this is going to error if asindex0 == 0
-      vnet_buffer (p0)->ip.adj_index[VLIB_TX] = lbm->ass[asindex0].dpo.dpoi_index;
-      vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-				       n_left_to_next, pi0,
-				       lbm->ass[asindex0].dpo.dpoi_next_node);
-    }
-    vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-  }
-
-  return frame->n_vectors;
-}
-
-static uword
-lb6_gre6_node_fn (vlib_main_t * vm,
-         vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return lb_node_fn(vm, node, frame, 0, 0);
-}
-
-static uword
-lb6_gre4_node_fn (vlib_main_t * vm,
-         vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return lb_node_fn(vm, node, frame, 0, 1);
-}
-
-static uword
-lb4_gre6_node_fn (vlib_main_t * vm,
-         vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return lb_node_fn(vm, node, frame, 1, 0);
-}
-
-static uword
-lb4_gre4_node_fn (vlib_main_t * vm,
-         vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  return lb_node_fn(vm, node, frame, 1, 1);
-}
-
-VLIB_REGISTER_NODE (lb6_gre6_node) =
-{
-  .function = lb6_gre6_node_fn,
-  .name = "lb6-gre6",
-  .vector_size = sizeof (u32),
-  .format_trace = format_lb_trace,
-
-  .n_errors = LB_N_ERROR,
-  .error_strings = lb_error_strings,
-
-  .n_next_nodes = LB_N_NEXT,
-  .next_nodes =
-  {
-      [LB_NEXT_DROP] = "error-drop"
-  },
-};
-
-VLIB_REGISTER_NODE (lb6_gre4_node) =
-{
-  .function = lb6_gre4_node_fn,
-  .name = "lb6-gre4",
-  .vector_size = sizeof (u32),
-  .format_trace = format_lb_trace,
-
-  .n_errors = LB_N_ERROR,
-  .error_strings = lb_error_strings,
-
-  .n_next_nodes = LB_N_NEXT,
-  .next_nodes =
-  {
-      [LB_NEXT_DROP] = "error-drop"
-  },
-};
-
-VLIB_REGISTER_NODE (lb4_gre6_node) =
-{
-  .function = lb4_gre6_node_fn,
-  .name = "lb4-gre6",
-  .vector_size = sizeof (u32),
-  .format_trace = format_lb_trace,
-
-  .n_errors = LB_N_ERROR,
-  .error_strings = lb_error_strings,
-
-  .n_next_nodes = LB_N_NEXT,
-  .next_nodes =
-  {
-      [LB_NEXT_DROP] = "error-drop"
-  },
-};
-
-VLIB_REGISTER_NODE (lb4_gre4_node) =
-{
-  .function = lb4_gre4_node_fn,
-  .name = "lb4-gre4",
-  .vector_size = sizeof (u32),
-  .format_trace = format_lb_trace,
-
-  .n_errors = LB_N_ERROR,
-  .error_strings = lb_error_strings,
-
-  .n_next_nodes = LB_N_NEXT,
-  .next_nodes =
-  {
-      [LB_NEXT_DROP] = "error-drop"
-  },
-};
-
diff --git a/plugins/lb-plugin/lb/refcount.c b/plugins/lb-plugin/lb/refcount.c
deleted file mode 100644
index 22415c88..00000000
--- a/plugins/lb-plugin/lb/refcount.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <lb/refcount.h>
-
-void __vlib_refcount_resize(vlib_refcount_per_cpu_t *per_cpu, u32 size)
-{
-  u32 *new_counter = 0, *old_counter;
-  vec_validate(new_counter, size);
-  memcpy(new_counter, per_cpu->counters, per_cpu->length);
-  old_counter = per_cpu->counters;
-  per_cpu->counters = new_counter;
-  CLIB_MEMORY_BARRIER();
-  per_cpu->length = vec_len(new_counter);
-  vec_free(old_counter);
-}
-
-u64 vlib_refcount_get(vlib_refcount_t *r, u32 index)
-{
-  u64 count = 0;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  u32 cpu_index;
-  for (cpu_index = 0; cpu_index < tm->n_vlib_mains; cpu_index++) {
-    if (r->per_cpu[cpu_index].length > index)
-      count += r->per_cpu[cpu_index].counters[index];
-  }
-  return count;
-}
-
diff --git a/plugins/lb-plugin/lb/refcount.h b/plugins/lb-plugin/lb/refcount.h
deleted file mode 100644
index 8c26e7be..00000000
--- a/plugins/lb-plugin/lb/refcount.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * vlib provides lock-free counters but those
- * - Have 16bits per-CPU counter, which may overflow.
- * - Would only increment.
- *
- * This is very similar to vlib counters, but may be used to count reference.
- * Such a counter includes an arbitrary number of counters. Each counter
- * is identified by its index. This is used to aggregate per-cpu memory.
- *
- * Warning:
- *   This reference counter is lock-free but is not race-condition free.
- *   The counting result is approximate and another mechanism needs to be used
- *   in order to ensure that an object may be freed.
- *
- */
-
-#include <vnet/vnet.h>
-
-typedef struct {
-  u32 *counters;
-  u32 length;
-  u32 *reader_lengths;
-  CLIB_CACHE_LINE_ALIGN_MARK(o);
-} vlib_refcount_per_cpu_t;
-
-typedef struct {
-  vlib_refcount_per_cpu_t *per_cpu;
-} vlib_refcount_t;
-
-void __vlib_refcount_resize(vlib_refcount_per_cpu_t *per_cpu, u32 size);
-
-static_always_inline
-void vlib_refcount_add(vlib_refcount_t *r, u32 cpu_index, u32 counter_index, i32 v)
-{
-  vlib_refcount_per_cpu_t *per_cpu = &r->per_cpu[cpu_index];
-  if (PREDICT_FALSE(counter_index >= per_cpu->length))
-    __vlib_refcount_resize(per_cpu, clib_max(counter_index + 16, per_cpu->length * 2));
-
-  per_cpu->counters[counter_index] += v;
-}
-
-u64 vlib_refcount_get(vlib_refcount_t *r, u32 index);
-
-static_always_inline
-void vlib_refcount_init(vlib_refcount_t *r)
-{
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  r->per_cpu = 0;
-  vec_validate (r->per_cpu, tm->n_vlib_mains - 1);
-}
-
-
diff --git a/plugins/lb-plugin/lb/util.c b/plugins/lb-plugin/lb/util.c
deleted file mode 100644
index d969d168..00000000
--- a/plugins/lb-plugin/lb/util.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <lb/util.h>
-
-void ip46_prefix_normalize(ip46_address_t *prefix, u8 plen)
-{
-  if (plen == 0) {
-    prefix->as_u64[0] = 0;
-    prefix->as_u64[1] = 0;
-  } else if (plen <= 64) {
-    prefix->as_u64[0] &= clib_host_to_net_u64(0xffffffffffffffffL << (64 - plen));
-    prefix->as_u64[1] = 0;
-  } else {
-    prefix->as_u64[1] &= clib_host_to_net_u64(0xffffffffffffffffL << (128 - plen));
-  }
-
-}
-
-uword unformat_ip46_prefix (unformat_input_t * input, va_list * args)
-{
-  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
-  u8 *len = va_arg (*args, u8 *);
-  ip46_type_t type = va_arg (*args, ip46_type_t);
-
-  u32 l;
-  if ((type != IP46_TYPE_IP6) && unformat(input, "%U/%u", unformat_ip4_address, &ip46->ip4, &l)) {
-    if (l > 32)
-      return 0;
-    *len = l + 96;
-    ip46->pad[0] = ip46->pad[1] = ip46->pad[2] = 0;
-  } else if ((type != IP46_TYPE_IP4) && unformat(input, "%U/%u", unformat_ip6_address, &ip46->ip6, &l)) {
-    if (l > 128)
-      return 0;
-    *len = l;
-  } else {
-    return 0;
-  }
-  return 1;
-}
-
-u8 *format_ip46_prefix (u8 * s, va_list * args)
-{
-  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
-  u32 len = va_arg (*args, u32); //va_arg cannot use u8 or u16
-  ip46_type_t type = va_arg (*args, ip46_type_t);
-
-  int is_ip4 = 0;
-  if (type == IP46_TYPE_IP4)
-    is_ip4 = 1;
-  else if (type == IP46_TYPE_IP6)
-    is_ip4 = 0;
-  else
-    is_ip4 = (len >= 96) && ip46_address_is_ip4(ip46);
-
-  return is_ip4 ?
-      format(s, "%U/%d", format_ip4_address, &ip46->ip4, len - 96):
-      format(s, "%U/%d", format_ip6_address, &ip46->ip6, len);
-}
-
diff --git a/plugins/lb-plugin/lb/util.h b/plugins/lb-plugin/lb/util.h
deleted file mode 100644
index 3f082310..00000000
--- a/plugins/lb-plugin/lb/util.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Non-LB specific stuff comes here
- */
-
-#ifndef LB_PLUGIN_LB_UTIL_H_
-#define LB_PLUGIN_LB_UTIL_H_
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-
-#define ip46_address_type(ip46) (ip46_address_is_ip4(ip46)?IP46_TYPE_IP4:IP46_TYPE_IP6)
-#define ip46_prefix_is_ip4(ip46, len) ((len) >= 96 && ip46_address_is_ip4(ip46))
-#define ip46_prefix_type(ip46, len) (ip46_prefix_is_ip4(ip46, len)?IP46_TYPE_IP4:IP46_TYPE_IP6)
-
-void ip46_prefix_normalize(ip46_address_t *prefix, u8 plen);
-uword unformat_ip46_prefix (unformat_input_t * input, va_list * args);
-u8 *format_ip46_prefix (u8 * s, va_list * args);
-
-/**
- * 32 bits integer comparison for running values.
- * 1 > 0 is true. But 1 > 0xffffffff also is.
- */
-#define clib_u32_loop_gt(a, b) (((u32)(a)) - ((u32)(b)) < 0x7fffffff)
-
-#endif /* LB_PLUGIN_LB_UTIL_H_ */
diff --git a/plugins/lb-plugin/lb_plugin_doc.md b/plugins/lb-plugin/lb_plugin_doc.md
deleted file mode 100644
index c7885ffb..00000000
--- a/plugins/lb-plugin/lb_plugin_doc.md
+++ /dev/null
@@ -1,141 +0,0 @@
-# Load Balancer plugin for VPP    {#lb_plugin_doc}
-
-## Version
-
-The load balancer plugin is currently in *beta* version.
-Both CLIs and APIs are subject to *heavy* changes.
-Wich also means feedback is really welcome regarding features, apis, etc...
-
-## Overview
-
-This plugin provides load balancing for VPP in a way that is largely inspired 
-from Google's MagLev: http://research.google.com/pubs/pub44824.html
-
-The load balancer is configured with a set of Virtual IPs (VIP, which can be 
-prefixes), and for each VIP, with a set of Application Server addresses (ASs).
-
-Traffic received for a given VIP (or VIP prefix) is tunneled using GRE towards
-the different ASs in a way that (tries to) ensure that a given session will 
-always be tunneled to the same AS.
-
-Both VIPs or ASs can be IPv4 or IPv6, but for a given VIP, all ASs must be using
-the same encap. type (i.e. IPv4+GRE or IPv6+GRE). Meaning that for a given VIP,
-all AS addresses must be of the same family.
-
-## Performances
-
-The load balancer has been tested up to 1 millions flows and still forwards more
-than 3Mpps per core in such circumstances.
-Although 3Mpps seems already good, it is likely that performances will be improved
-in next versions.
-
-## Configuration
-
-### Global LB parameters
-
-The load balancer needs to be configured with some parameters:
-
-	lb conf [ip4-src-address <addr>] [ip6-src-address <addr>] 
-	        [buckets <n>] [timeout <s>]
-	       
-ip4-src-address: the source address used to send encap. packets using IPv4.
-
-ip6-src-address: the source address used to send encap. packets using IPv6.
-
-buckets:         the *per-thread* established-connexions-table number of buckets.
-
-timeout:         the number of seconds a connection will remain in the 
-                 established-connexions-table while no packet for this flow
-                 is received.
-                 
-
-### Configure the VIPs
-
-    lb vip <prefix> [encap (gre6|gre4)] [new_len <n>] [del]
-    
-new_len is the size of the new-connection-table. It should be 1 or 2 orders of
-magnitude bigger than the number of ASs for the VIP in order to ensure a good
-load balancing.
-
-Examples:
-    
-    lb vip 2002::/16 encap gre6 new_len 1024
-    lb vip 2003::/16 encap gre4 new_len 2048
-    lb vip 80.0.0.0/8 encap gre6 new_len 16
-    lb vip 90.0.0.0/8 encap gre4 new_len 1024
-
-### Configure the ASs (for each VIP)
-
-    lb as <vip-prefix> [<address> [<address> [...]]] [del]
-
-You can add (or delete) as many ASs at a time (for a single VIP).
-Note that the AS address family must correspond to the VIP encap. IP family.
-
-Examples:
-
-    lb as 2002::/16 2001::2 2001::3 2001::4
-    lb as 2003::/16 10.0.0.1 10.0.0.2
-    lb as 80.0.0.0/8 2001::2
-    lb as 90.0.0.0/8 10.0.0.1
-    
-    
-
-## Monitoring
-
-The plugin provides quite a bunch of counters and information.
-These are still subject to quite significant changes.
-
-    show lb
-    show lb vip
-    show lb vip verbose
-    
-    show node counters
-
-
-## Design notes
-
-### Multi-Threading
-
-MagLev is a distributed system which pseudo-randomly generates a 
-new-connections-table based on AS names such that each server configured with 
-the same set of ASs ends up with the same table. Connection stickyness is then 
-ensured with an established-connections-table. Using ECMP, it is assumed (but
-not relied on) that servers will mostly receive traffic for different flows.
-
-This implementation pushes the parallelism a little bit further by using
-one established-connections table per thread. This is equivalent to assuming
-that RSS will make a job similar to ECMP, and is pretty useful as threads don't
-need to get a lock in order to write in the table.
-
-### Hash Table
-
-A load balancer requires an efficient read and write hash table. The hash table
-used by ip6-forward is very read-efficient, but not so much for writing. In
-addition, it is not a big deal if writing into the hash table fails (again,
-MagLev uses a flow table but does not heaviliy relies on it).
-
-The plugin therefore uses a very specific (and stupid) hash table.
-	- Fixed (and power of 2) number of buckets (configured at runtime)
-	- Fixed (and power of 2) elements per buckets (configured at compilation time)
-
-### Reference counting
-
-When an AS is removed, there is two possible ways to react.
-	- Keep using the AS for established connections
-	- Change AS for established connections (likely to cause error for TCP)
-
-In the first case, although an AS is removed from the configuration, its 
-associated state needs to stay around as long as it is used by at least one 
-thread.
-
-In order to avoid locks, a specific reference counter is used. The design is quite
-similar to clib counters but:
-	- It is possible to decrease the value
-	- Summing will not zero the per-thread counters
-	- Only the thread can reallocate its own counters vector (to avoid concurrency issues)
-
-This reference counter is lock free, but reading a count of 0 does not mean
-the value can be freed unless it is ensured by *other* means that no other thread
-is concurrently referencing the object. In the case of this plugin, it is assumed
-that no concurrent event will take place after a few seconds.
-
diff --git a/plugins/sample-plugin/Makefile.am b/plugins/sample-plugin/Makefile.am
deleted file mode 100644
index e221f8c1..00000000
--- a/plugins/sample-plugin/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall
-AM_LDFLAGS = -module -shared -avoid-version
-
-vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
-vpppluginsdir = ${libdir}/vpp_plugins
-
-vppapitestplugins_LTLIBRARIES = sample_test_plugin.la
-vppplugins_LTLIBRARIES = sample_plugin.la
-
-sample_plugin_la_SOURCES = sample/sample.c sample/node.c \
-	sample/sample_plugin.api.h
-
-BUILT_SOURCES = sample/sample.api.h sample/sample.api.json
-
-SUFFIXES = .api.h .api
-
-%.api.h: %.api
-	mkdir -p `dirname $@` ; \
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
-	| vppapigen --input - --output $@ --show-name $@
-
-%.api.json: %.api
-	@echo "  JSON APIGEN  " $@ ;				\
-	mkdir -p `dirname $@` ;					\
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
-	| vppapigen --input - --json $@
-
-apidir = $(prefix)/sample/
-api_DATA = sample.api.json
-
-noinst_HEADERS =				\
-  sample/sample_all_api_h.h			\
-  sample/sample_msg_enum.h			\
-  sample/sample.api.h
-
-sample_test_plugin_la_SOURCES = sample/sample_test.c sample/sample_plugin.api.h
-
-# Remove *.la files
-install-data-hook:
-	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
-	@(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
diff --git a/plugins/sample-plugin/configure.ac b/plugins/sample-plugin/configure.ac
deleted file mode 100644
index 43642732..00000000
--- a/plugins/sample-plugin/configure.ac
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(sample_plugin, 1.0)
-LT_INIT
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-AC_PREFIX_DEFAULT([/usr])
-
-AC_PROG_CC
-
-AC_OUTPUT([Makefile])
diff --git a/plugins/sample-plugin/sample/node.c b/plugins/sample-plugin/sample/node.c
deleted file mode 100644
index 94c1706b..00000000
--- a/plugins/sample-plugin/sample/node.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vppinfra/error.h>
-#include <sample/sample.h>
-
-typedef struct {
-  u32 next_index;
-  u32 sw_if_index;
-  u8 new_src_mac[6];
-  u8 new_dst_mac[6];
-} sample_trace_t;
-
-static u8 *
-format_mac_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
-		 a[0], a[1], a[2], a[3], a[4], a[5]);
-}
-
-/* packet trace format function */
-static u8 * format_sample_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  sample_trace_t * t = va_arg (*args, sample_trace_t *);
-  
-  s = format (s, "SAMPLE: sw_if_index %d, next index %d\n",
-              t->sw_if_index, t->next_index);
-  s = format (s, "  new src %U -> new dst %U",
-              format_mac_address, t->new_src_mac, 
-              format_mac_address, t->new_dst_mac);
-
-  return s;
-}
-
-vlib_node_registration_t sample_node;
-
-#define foreach_sample_error \
-_(SWAPPED, "Mac swap packets processed")
-
-typedef enum {
-#define _(sym,str) SAMPLE_ERROR_##sym,
-  foreach_sample_error
-#undef _
-  SAMPLE_N_ERROR,
-} sample_error_t;
-
-static char * sample_error_strings[] = {
-#define _(sym,string) string,
-  foreach_sample_error
-#undef _
-};
-
-typedef enum {
-  SAMPLE_NEXT_INTERFACE_OUTPUT,
-  SAMPLE_N_NEXT,
-} sample_next_t;
-
-#define foreach_mac_address_offset              \
-_(0)                                            \
-_(1)                                            \
-_(2)                                            \
-_(3)                                            \
-_(4)                                            \
-_(5)
-
-static uword
-sample_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * frame)
-{
-  u32 n_left_from, * from, * to_next;
-  sample_next_t next_index;
-  u32 pkts_swapped = 0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-          u32 next0 = SAMPLE_NEXT_INTERFACE_OUTPUT;
-          u32 next1 = SAMPLE_NEXT_INTERFACE_OUTPUT;
-          u32 sw_if_index0, sw_if_index1;
-          u8 tmp0[6], tmp1[6];
-          ethernet_header_t *en0, *en1;
-          u32 bi0, bi1;
-	  vlib_buffer_t * b0, * b1;
-          
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * p2, * p3;
-            
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-            
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-          /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-          ASSERT (b0->current_data == 0);
-          ASSERT (b1->current_data == 0);
-          
-          en0 = vlib_buffer_get_current (b0);
-          en1 = vlib_buffer_get_current (b1);
-
-          /* This is not the fastest way to swap src + dst mac addresses */
-#define _(a) tmp0[a] = en0->src_address[a];
-          foreach_mac_address_offset;
-#undef _
-#define _(a) en0->src_address[a] = en0->dst_address[a];
-          foreach_mac_address_offset;
-#undef _
-#define _(a) en0->dst_address[a] = tmp0[a];
-          foreach_mac_address_offset;
-#undef _
-
-#define _(a) tmp1[a] = en1->src_address[a];
-          foreach_mac_address_offset;
-#undef _
-#define _(a) en1->src_address[a] = en1->dst_address[a];
-          foreach_mac_address_offset;
-#undef _
-#define _(a) en1->dst_address[a] = tmp1[a];
-          foreach_mac_address_offset;
-#undef _
-
-
-
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
-
-          /* Send pkt back out the RX interface */
-          vnet_buffer(b0)->sw_if_index[VLIB_TX] = sw_if_index0;
-          vnet_buffer(b1)->sw_if_index[VLIB_TX] = sw_if_index1;
-
-          pkts_swapped += 2;
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)))
-            {
-              if (b0->flags & VLIB_BUFFER_IS_TRACED) 
-                {
-                    sample_trace_t *t = 
-                      vlib_add_trace (vm, node, b0, sizeof (*t));
-                    t->sw_if_index = sw_if_index0;
-                    t->next_index = next0;
-                    clib_memcpy (t->new_src_mac, en0->src_address,
-                                 sizeof (t->new_src_mac));
-                    clib_memcpy (t->new_dst_mac, en0->dst_address,
-                                 sizeof (t->new_dst_mac));
-                    
-                  }
-                if (b1->flags & VLIB_BUFFER_IS_TRACED) 
-                  {
-                    sample_trace_t *t = 
-                      vlib_add_trace (vm, node, b1, sizeof (*t));
-                    t->sw_if_index = sw_if_index1;
-                    t->next_index = next1;
-                    clib_memcpy (t->new_src_mac, en1->src_address,
-                                 sizeof (t->new_src_mac));
-                    clib_memcpy (t->new_dst_mac, en1->dst_address,
-                                 sizeof (t->new_dst_mac));
-                  }
-              }
-            
-            /* verify speculative enqueues, maybe switch current next frame */
-            vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-                                             to_next, n_left_to_next,
-                                             bi0, bi1, next0, next1);
-        }
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-          u32 bi0;
-	  vlib_buffer_t * b0;
-          u32 next0 = SAMPLE_NEXT_INTERFACE_OUTPUT;
-          u32 sw_if_index0;
-          u8 tmp0[6];
-          ethernet_header_t *en0;
-
-          /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-          /* 
-           * Direct from the driver, we should be at offset 0
-           * aka at &b0->data[0]
-           */
-          ASSERT (b0->current_data == 0);
-          
-          en0 = vlib_buffer_get_current (b0);
-
-          /* This is not the fastest way to swap src + dst mac addresses */
-#define _(a) tmp0[a] = en0->src_address[a];
-          foreach_mac_address_offset;
-#undef _
-#define _(a) en0->src_address[a] = en0->dst_address[a];
-          foreach_mac_address_offset;
-#undef _
-#define _(a) en0->dst_address[a] = tmp0[a];
-          foreach_mac_address_offset;
-#undef _
-
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-
-          /* Send pkt back out the RX interface */
-          vnet_buffer(b0)->sw_if_index[VLIB_TX] = sw_if_index0;
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) {
-            sample_trace_t *t = 
-               vlib_add_trace (vm, node, b0, sizeof (*t));
-            t->sw_if_index = sw_if_index0;
-            t->next_index = next0;
-            clib_memcpy (t->new_src_mac, en0->src_address,
-                         sizeof (t->new_src_mac));
-            clib_memcpy (t->new_dst_mac, en0->dst_address,
-                         sizeof (t->new_dst_mac));
-            }
-            
-          pkts_swapped += 1;
-
-          /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, sample_node.index, 
-                               SAMPLE_ERROR_SWAPPED, pkts_swapped);
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (sample_node) = {
-  .function = sample_node_fn,
-  .name = "sample",
-  .vector_size = sizeof (u32),
-  .format_trace = format_sample_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_errors = ARRAY_LEN(sample_error_strings),
-  .error_strings = sample_error_strings,
-
-  .n_next_nodes = SAMPLE_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-        [SAMPLE_NEXT_INTERFACE_OUTPUT] = "interface-output",
-  },
-};
diff --git a/plugins/sample-plugin/sample/sample.api b/plugins/sample-plugin/sample/sample.api
deleted file mode 100644
index f99cdb38..00000000
--- a/plugins/sample-plugin/sample/sample.api
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Hey Emacs use -*- mode: C -*- */
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* Define a simple binary API to control the feature */
-
-define sample_macswap_enable_disable {
-    /* Client identifier, set from api_main.my_client_index */
-    u32 client_index;
-
-    /* Arbitrary context, so client can match reply to request */
-    u32 context;
-
-    /* Enable / disable the feature */
-    u8 enable_disable;
-
-    /* Interface handle */
-    u32 sw_if_index;
-};
-
-define sample_macswap_enable_disable_reply {
-    /* From the request */
-    u32 context;
-
-    /* Return value, zero means all OK */
-    i32 retval;
-};
diff --git a/plugins/sample-plugin/sample/sample.c b/plugins/sample-plugin/sample/sample.c
deleted file mode 100644
index 603cb2d0..00000000
--- a/plugins/sample-plugin/sample/sample.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * sample.c - simple MAC-swap API / debug CLI handling
- *------------------------------------------------------------------
- */
-
-#include <vnet/vnet.h>
-#include <vnet/plugin/plugin.h>
-#include <sample/sample.h>
-
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-
-/* define message IDs */
-#include <sample/sample_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <sample/sample_all_api_h.h> 
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <sample/sample_all_api_h.h> 
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <sample/sample_all_api_h.h> 
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <sample/sample_all_api_h.h>
-#undef vl_api_version
-
-/* 
- * A handy macro to set up a message reply.
- * Assumes that the following variables are available:
- * mp - pointer to request message
- * rmp - pointer to reply message type
- * rv - return value
- */
-
-#define REPLY_MACRO(t)                                          \
-do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
-    vl_api_client_index_to_input_queue (mp->client_index);      \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-                                                                \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-
-/* List of message types that this plugin understands */
-
-#define foreach_sample_plugin_api_msg                           \
-_(SAMPLE_MACSWAP_ENABLE_DISABLE, sample_macswap_enable_disable)
-
-/* 
- * This routine exists to convince the vlib plugin framework that
- * we haven't accidentally copied a random .dll into the plugin directory.
- *
- * Also collects global variable pointers passed from the vpp engine
- */
-
-clib_error_t * 
-vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
-                      int from_early_init)
-{
-  sample_main_t * sm = &sample_main;
-  clib_error_t * error = 0;
-
-  sm->vlib_main = vm;
-  sm->vnet_main = h->vnet_main;
-  sm->ethernet_main = h->ethernet_main;
-
-  return error;
-}
-
-/* Action function shared between message handler and debug CLI */
-
-int sample_macswap_enable_disable (sample_main_t * sm, u32 sw_if_index,
-                                   int enable_disable)
-{
-  vnet_sw_interface_t * sw;
-  int rv = 0;
-
-  /* Utterly wrong? */
-  if (pool_is_free_index (sm->vnet_main->interface_main.sw_interfaces, 
-                          sw_if_index))
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
-  /* Not a physical port? */
-  sw = vnet_get_sw_interface (sm->vnet_main, sw_if_index);
-  if (sw->type != VNET_SW_INTERFACE_TYPE_HARDWARE)
-    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-  
-  vnet_feature_enable_disable ("device-input", "sample",
-                               sw_if_index, enable_disable, 0, 0);
-
-  return rv;
-}
-
-static clib_error_t *
-macswap_enable_disable_command_fn (vlib_main_t * vm,
-                                   unformat_input_t * input,
-                                   vlib_cli_command_t * cmd)
-{
-  sample_main_t * sm = &sample_main;
-  u32 sw_if_index = ~0;
-  int enable_disable = 1;
-    
-  int rv;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
-    if (unformat (input, "disable"))
-      enable_disable = 0;
-    else if (unformat (input, "%U", unformat_vnet_sw_interface,
-                       sm->vnet_main, &sw_if_index))
-      ;
-    else
-      break;
-  }
-
-  if (sw_if_index == ~0)
-    return clib_error_return (0, "Please specify an interface...");
-    
-  rv = sample_macswap_enable_disable (sm, sw_if_index, enable_disable);
-
-  switch(rv) {
-  case 0:
-    break;
-
-  case VNET_API_ERROR_INVALID_SW_IF_INDEX:
-    return clib_error_return 
-      (0, "Invalid interface, only works on physical ports");
-    break;
-
-  case VNET_API_ERROR_UNIMPLEMENTED:
-    return clib_error_return (0, "Device driver doesn't support redirection");
-    break;
-
-  default:
-    return clib_error_return (0, "sample_macswap_enable_disable returned %d",
-                              rv);
-  }
-  return 0;
-}
-
-VLIB_CLI_COMMAND (sr_content_command, static) = {
-    .path = "sample macswap",
-    .short_help = 
-    "sample macswap <interface-name> [disable]",
-    .function = macswap_enable_disable_command_fn,
-};
-
-/* API message handler */
-static void vl_api_sample_macswap_enable_disable_t_handler
-(vl_api_sample_macswap_enable_disable_t * mp)
-{
-  vl_api_sample_macswap_enable_disable_reply_t * rmp;
-  sample_main_t * sm = &sample_main;
-  int rv;
-
-  rv = sample_macswap_enable_disable (sm, ntohl(mp->sw_if_index), 
-                                      (int) (mp->enable_disable));
-  
-  REPLY_MACRO(VL_API_SAMPLE_MACSWAP_ENABLE_DISABLE_REPLY);
-}
-
-/* Set up the API message handling tables */
-static clib_error_t *
-sample_plugin_api_hookup (vlib_main_t *vm)
-{
-  sample_main_t * sm = &sample_main;
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,					\
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1); 
-    foreach_sample_plugin_api_msg;
-#undef _
-
-    return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <sample/sample_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void 
-setup_message_id_table (sample_main_t * sm, api_main_t *am)
-{
-#define _(id,n,crc) \
-  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
-  foreach_vl_msg_name_crc_sample;
-#undef _
-}
-
-static clib_error_t * sample_init (vlib_main_t * vm)
-{
-  sample_main_t * sm = &sample_main;
-  clib_error_t * error = 0;
-  u8 * name;
-
-  name = format (0, "sample_%08x%c", api_version, 0);
-
-  /* Ask for a correctly-sized block of API message decode slots */
-  sm->msg_id_base = vl_msg_api_get_msg_ids 
-      ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-  error = sample_plugin_api_hookup (vm);
-
-  /* Add our API messages to the global name_crc hash table */
-  setup_message_id_table (sm, &api_main);
-
-  vec_free(name);
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (sample_init);
-
-VNET_FEATURE_INIT (sample, static) = 
-{
-  .arc_name = "device-input",
-  .node_name = "sample",
-  .runs_before = VNET_FEATURES ("ethernet-input"),
-};
diff --git a/plugins/sample-plugin/sample/sample.h b/plugins/sample-plugin/sample/sample.h
deleted file mode 100644
index d268d482..00000000
--- a/plugins/sample-plugin/sample/sample.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_sample_h__
-#define __included_sample_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-
-typedef struct {
-    /* API message ID base */
-    u16 msg_id_base;
-
-    /* convenience */
-    vlib_main_t * vlib_main;
-    vnet_main_t * vnet_main;
-    ethernet_main_t * ethernet_main;
-} sample_main_t;
-
-sample_main_t sample_main;
-
-vlib_node_registration_t sample_node;
-
-#endif /* __included_sample_h__ */
diff --git a/plugins/sample-plugin/sample/sample_all_api_h.h b/plugins/sample-plugin/sample/sample_all_api_h.h
deleted file mode 100644
index 774d782f..00000000
--- a/plugins/sample-plugin/sample/sample_all_api_h.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Include the generated file, see BUILT_SOURCES in Makefile.am */
-#include <sample/sample.api.h>
diff --git a/plugins/sample-plugin/sample/sample_msg_enum.h b/plugins/sample-plugin/sample/sample_msg_enum.h
deleted file mode 100644
index af4172f7..00000000
--- a/plugins/sample-plugin/sample/sample_msg_enum.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_sample_msg_enum_h
-#define included_sample_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <sample/sample_all_api_h.h>
-    /* We'll want to know how many messages IDs we need... */
-    VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* included_sample_msg_enum_h */
diff --git a/plugins/sample-plugin/sample/sample_test.c b/plugins/sample-plugin/sample/sample_test.c
deleted file mode 100644
index dd1b0215..00000000
--- a/plugins/sample-plugin/sample/sample_test.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- *------------------------------------------------------------------
- * sample_test.c - test harness plugin
- *------------------------------------------------------------------
- */
-
-#include <vat/vat.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-#include <vppinfra/error.h>
-
-uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
-
-/* Declare message IDs */
-#include <sample/sample_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <sample/sample_all_api_h.h> 
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun             /* define message structures */
-#include <sample/sample_all_api_h.h> 
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <sample/sample_all_api_h.h> 
-#undef vl_printfun
-
-/* Get the API version number. */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <sample/sample_all_api_h.h>
-#undef vl_api_version
-
-
-typedef struct {
-    /* API message ID base */
-    u16 msg_id_base;
-    vat_main_t *vat_main;
-} sample_test_main_t;
-
-sample_test_main_t sample_test_main;
-
-#define foreach_standard_reply_retval_handler   \
-_(sample_macswap_enable_disable_reply)
-
-#define _(n)                                            \
-    static void vl_api_##n##_t_handler                  \
-    (vl_api_##n##_t * mp)                               \
-    {                                                   \
-        vat_main_t * vam = sample_test_main.vat_main;   \
-        i32 retval = ntohl(mp->retval);                 \
-        if (vam->async_mode) {                          \
-            vam->async_errors += (retval < 0);          \
-        } else {                                        \
-            vam->retval = retval;                       \
-            vam->result_ready = 1;                      \
-        }                                               \
-    }
-foreach_standard_reply_retval_handler;
-#undef _
-
-/* 
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg                                       \
-_(SAMPLE_MACSWAP_ENABLE_DISABLE_REPLY, sample_macswap_enable_disable_reply)
-
-
-/* M: construct, but don't yet send a message */
-
-#define M(T,t)                                                  \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp));                         \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-#define M2(T,t,n)                                               \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W                                       \
-do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
-                                                \
-    while (vat_time_now (vam) < timeout) {      \
-        if (vam->result_ready == 1) {           \
-            return (vam->retval);               \
-        }                                       \
-    }                                           \
-    return -99;                                 \
-} while(0);
-
-static int api_sample_macswap_enable_disable (vat_main_t * vam)
-{
-    sample_test_main_t * sm = &sample_test_main;
-    unformat_input_t * i = vam->input;
-    f64 timeout;
-    int enable_disable = 1;
-    u32 sw_if_index = ~0;
-    vl_api_sample_macswap_enable_disable_t * mp;
-
-    /* Parse args required to build the message */
-    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
-        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
-            ;
-	else if (unformat (i, "sw_if_index %d", &sw_if_index))
-	    ;
-        else if (unformat (i, "disable"))
-            enable_disable = 0;
-        else
-            break;
-    }
-    
-    if (sw_if_index == ~0) {
-        errmsg ("missing interface name / explicit sw_if_index number \n");
-        return -99;
-    }
-    
-    /* Construct the API message */
-    M(SAMPLE_MACSWAP_ENABLE_DISABLE, sample_macswap_enable_disable);
-    mp->sw_if_index = ntohl (sw_if_index);
-    mp->enable_disable = enable_disable;
-
-    /* send it... */
-    S;
-
-    /* Wait for a reply... */
-    W;
-}
-
-/* 
- * List of messages that the api test plugin sends,
- * and that the data plane plugin processes
- */
-#define foreach_vpe_api_msg \
-_(sample_macswap_enable_disable, "<intfc> [disable]")
-
-void vat_api_hookup (vat_main_t *vam)
-{
-    sample_test_main_t * sm = &sample_test_main;
-    /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,                                  \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1); 
-    foreach_vpe_api_reply_msg;
-#undef _
-
-    /* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
-    foreach_vpe_api_msg;
-#undef _    
-    
-    /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
-    foreach_vpe_api_msg;
-#undef _
-}
-
-clib_error_t * vat_plugin_register (vat_main_t *vam)
-{
-  sample_test_main_t * sm = &sample_test_main;
-  u8 * name;
-
-  sm->vat_main = vam;
-
-  name = format (0, "sample_%08x%c", api_version, 0);
-  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (sm->msg_id_base != (u16) ~0)
-    vat_api_hookup (vam);
-  
-  vec_free(name);
-  
-  return 0;
-}
diff --git a/plugins/snat-plugin/Makefile.am b/plugins/snat-plugin/Makefile.am
deleted file mode 100644
index e1922eb0..00000000
--- a/plugins/snat-plugin/Makefile.am
+++ /dev/null
@@ -1,113 +0,0 @@
-
-# Copyright (c) <current-year> <your-organization>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = -Wall @DPDK@
-AM_LDFLAGS = -module -shared -avoid-version
-
-vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
-vpppluginsdir = ${libdir}/vpp_plugins
-
-vppapitestplugins_LTLIBRARIES = snat_test_plugin.la
-vppplugins_LTLIBRARIES = snat_plugin.la
-
-snat_plugin_la_SOURCES = snat/snat.c		\
-        snat/in2out.c				\
-        snat/out2in.c				\
-	snat/snat_plugin.api.h
-
-BUILT_SOURCES = snat/snat.api.h snat/snat.api.json
-
-SUFFIXES = .api.h .api
-
-%.api.h: %.api
-	mkdir -p `dirname $@` ; \
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
-	| vppapigen --input - --output $@ --show-name $@
-
-%.api.json: %.api
-	@echo "  JSON APIGEN  " $@ ;				\
-	mkdir -p `dirname $@` ;					\
-	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
-	| vppapigen --input - --json $@
-
-apidir = $(prefix)/snat/
-api_DATA = snat.api.json
-
-noinst_HEADERS =			\
-  snat/snat_all_api_h.h			\
-  snat/snat_msg_enum.h			\
-  snat/snat.api.h
-
-snat_test_plugin_la_SOURCES = \
-  snat/snat_test.c snat/snat_plugin.api.h
-
-# Remove *.la files
-install-data-hook:
-	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
-	@(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
-
-#
-# Java code generation
-#
-jvpp_registry_root = ../../vpp-api/java
-jvpp_registry_version = 17.04
-jsnat_jarfile = jvpp-snat-$(PACKAGE_VERSION).jar
-jvpp_package_dir = io/fd/vpp/jvpp/snat
-jvpp_root = snat/jvpp
-jvpp_target_dir = target
-jvpp_target = $(jvpp_root)/$(jvpp_target_dir)
-api_file=$(srcdir)/snat/snat.api
-
-lib_LTLIBRARIES = libjvpp_snat.la
-libjvpp_snat_la_SOURCES = snat/snat.api.h snat/jvpp_snat.c snat/jvpp/io_fd_vpp_jvpp_snat_JVppSnatImpl.h
-libjvpp_snat_la_LIBADD = -lvlibmemoryclient -lvlibapi -lvppinfra \
-	              -lpthread -lm -lrt -L$(jvpp_registry_root)/.libs -ljvpp_common
-libjvpp_snat_la_LDFLAGS = -module
-libjvpp_snat_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I../ -I$(srcdir)/../
-
-BUILT_SOURCES += $(jvpp_root)/io_fd_vpp_jvpp_snat_JVppSnatImpl.h
-
-$(jvpp_root)/io_fd_vpp_jvpp_snat_JVppSnatImpl.h: snat.api.json
-	dir=`pwd`;						\
-	mkdir -p $(jvpp_target); \
-	mkdir -p $(jvpp_root)/$(jvpp_package_dir); 		\
-	cd $(jvpp_root)/$(jvpp_package_dir);			\
-	mkdir -p dto future callfacade callback notification test; 	\
-	@srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/snat.api.json --plugin_name snat;		\
-	cd -;							\
-	mv -f $(jvpp_root)/$(jvpp_package_dir)/jvpp_snat_gen.h $(jvpp_root)/jvpp_snat_gen.h;							\
-	cp $(srcdir)/$(jvpp_root)/$(jvpp_package_dir)/test/*.java $(jvpp_root)/$(jvpp_package_dir)/test/;				\
-	cd $(jvpp_root);				\
-	$(JAVAC) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d $(jvpp_target_dir) $(jvpp_package_dir)/*.java \
-		$(jvpp_package_dir)/dto/*.java \
-		$(jvpp_package_dir)/callback/*.java \
-		$(jvpp_package_dir)/notification/*.java \
-		$(jvpp_package_dir)/future/*.java 	\
-		$(jvpp_package_dir)/callfacade/*.java 	\
-		$(jvpp_package_dir)/test/*.java \
-		|| (echo "snat jvpp compilation failed: $$?"; exit 1);	\
-	$(JAVAH) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d . io.fd.vpp.jvpp.snat.JVppSnatImpl ;
-
-$(jsnat_jarfile): libjvpp_snat.la
-	cp .libs/libjvpp_snat.so.0.0.0 $(jvpp_target);				\
-	cd $(jvpp_target);				\
-	$(JAR) cfv $(JARFLAGS) ../../../$@ libjvpp_snat.so.0.0.0 $(jvpp_package_dir)/* ; cd ..;
-
-snat.api.json:
-	@echo "  jSnat_sfc API"; \
-        vppapigen --input $(api_file) --json snat.api.json;
-
-all-local: $(jsnat_jarfile)
diff --git a/plugins/snat-plugin/configure.ac b/plugins/snat-plugin/configure.ac
deleted file mode 100644
index 011246cd..00000000
--- a/plugins/snat-plugin/configure.ac
+++ /dev/null
@@ -1,32 +0,0 @@
-AC_INIT(snat_plugin, 1.0)
-AC_CONFIG_MACRO_DIR([../../vpp-api/java/m4])
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-AC_PREFIX_DEFAULT([/usr])
-
-AC_PROG_LIBTOOL
-AC_PROG_CC
-
-if test -f /usr/bin/lsb_release  && test `lsb_release -si` == "Ubuntu"  && test `lsb_release -sr` == "14.04"  && test -d /usr/lib/jvm/java-8-openjdk-amd64/ ; then
-    JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
-    JAVAC=${JAVA_HOME}/bin/javac
-    PATH=${JAVA_HOME}/bin/:${PATH}
-    break
-fi
-
-AX_CHECK_JAVA_HOME
-AX_PROG_JAVAC
-AX_PROG_JAVAH
-AX_PROG_JAR
-AX_PROG_JAVADOC
-AX_PROG_JAVA
-
-AC_ARG_WITH(dpdk,
-            AC_HELP_STRING([--with-dpdk],[Use DPDK]),
-            [with_dpdk=1],
-            [with_dpdk=0])
-
-AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1")
-AC_SUBST(DPDK,["-DDPDK=${with_dpdk}"])
-
-AC_OUTPUT([Makefile])
diff --git a/plugins/snat-plugin/snat/in2out.c b/plugins/snat-plugin/snat/in2out.c
deleted file mode 100644
index c78fdd76..00000000
--- a/plugins/snat-plugin/snat/in2out.c
+++ /dev/null
@@ -1,1597 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/handoff.h>
-
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/fib/ip4_fib.h>
-#include <snat/snat.h>
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-
-typedef struct {
-  u32 sw_if_index;
-  u32 next_index;
-  u32 session_index;
-  u32 is_slow_path;
-} snat_in2out_trace_t;
-
-typedef struct {
-  u32 next_worker_index;
-  u8 do_handoff;
-} snat_in2out_worker_handoff_trace_t;
-
-/* packet trace format function */
-static u8 * format_snat_in2out_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  snat_in2out_trace_t * t = va_arg (*args, snat_in2out_trace_t *);
-  char * tag;
-
-  tag = t->is_slow_path ? "SNAT_IN2OUT_SLOW_PATH" : "SNAT_IN2OUT_FAST_PATH";
-  
-  s = format (s, "%s: sw_if_index %d, next index %d, session %d", tag,
-              t->sw_if_index, t->next_index, t->session_index);
-
-  return s;
-}
-
-static u8 * format_snat_in2out_fast_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  snat_in2out_trace_t * t = va_arg (*args, snat_in2out_trace_t *);
-
-  s = format (s, "SANT_IN2OUT_FAST: sw_if_index %d, next index %d", 
-              t->sw_if_index, t->next_index);
-
-  return s;
-}
-
-static u8 * format_snat_in2out_worker_handoff_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  snat_in2out_worker_handoff_trace_t * t =
-    va_arg (*args, snat_in2out_worker_handoff_trace_t *);
-  char * m;
-
-  m = t->do_handoff ? "next worker" : "same worker";
-  s = format (s, "SNAT_IN2OUT_WORKER_HANDOFF: %s %d", m, t->next_worker_index);
-
-  return s;
-}
-
-vlib_node_registration_t snat_in2out_node;
-vlib_node_registration_t snat_in2out_slowpath_node;
-vlib_node_registration_t snat_in2out_fast_node;
-vlib_node_registration_t snat_in2out_worker_handoff_node;
-
-#define foreach_snat_in2out_error                       \
-_(UNSUPPORTED_PROTOCOL, "Unsupported protocol")         \
-_(IN2OUT_PACKETS, "Good in2out packets processed")      \
-_(OUT_OF_PORTS, "Out of ports")                         \
-_(BAD_OUTSIDE_FIB, "Outside VRF ID not found")          \
-_(BAD_ICMP_TYPE, "icmp type not echo-request")          \
-_(NO_TRANSLATION, "No translation")
-  
-typedef enum {
-#define _(sym,str) SNAT_IN2OUT_ERROR_##sym,
-  foreach_snat_in2out_error
-#undef _
-  SNAT_IN2OUT_N_ERROR,
-} snat_in2out_error_t;
-
-static char * snat_in2out_error_strings[] = {
-#define _(sym,string) string,
-  foreach_snat_in2out_error
-#undef _
-};
-
-typedef enum {
-  SNAT_IN2OUT_NEXT_LOOKUP,
-  SNAT_IN2OUT_NEXT_DROP,
-  SNAT_IN2OUT_NEXT_SLOW_PATH,
-  SNAT_IN2OUT_N_NEXT,
-} snat_in2out_next_t;
-
-static u32 slow_path (snat_main_t *sm, vlib_buffer_t *b0,
-                      ip4_header_t * ip0,
-                      u32 rx_fib_index0,
-                      snat_session_key_t * key0,
-                      snat_session_t ** sessionp,
-                      vlib_node_runtime_t * node,
-                      u32 next0,
-                      u32 cpu_index)
-{
-  snat_user_t *u;
-  snat_user_key_t user_key;
-  snat_session_t *s;
-  clib_bihash_kv_8_8_t kv0, value0;
-  u32 oldest_per_user_translation_list_index;
-  dlist_elt_t * oldest_per_user_translation_list_elt;
-  dlist_elt_t * per_user_translation_list_elt;
-  dlist_elt_t * per_user_list_head_elt;
-  u32 session_index;
-  snat_session_key_t key1;
-  u32 address_index = ~0;
-  u32 outside_fib_index;
-  uword * p;
-  snat_static_mapping_key_t worker_by_out_key;
-
-  p = hash_get (sm->ip4_main->fib_index_by_table_id, sm->outside_vrf_id);
-  if (! p)
-    {
-      b0->error = node->errors[SNAT_IN2OUT_ERROR_BAD_OUTSIDE_FIB];
-      return SNAT_IN2OUT_NEXT_DROP;
-    }
-  outside_fib_index = p[0];
-
-  user_key.addr = ip0->src_address;
-  user_key.fib_index = rx_fib_index0;
-  kv0.key = user_key.as_u64;
-  
-  /* Ever heard of the "user" = src ip4 address before? */
-  if (clib_bihash_search_8_8 (&sm->user_hash, &kv0, &value0))
-    {
-      /* no, make a new one */
-      pool_get (sm->per_thread_data[cpu_index].users, u);
-      memset (u, 0, sizeof (*u));
-      u->addr = ip0->src_address;
-
-      pool_get (sm->per_thread_data[cpu_index].list_pool, per_user_list_head_elt);
-
-      u->sessions_per_user_list_head_index = per_user_list_head_elt -
-        sm->per_thread_data[cpu_index].list_pool;
-
-      clib_dlist_init (sm->per_thread_data[cpu_index].list_pool,
-                       u->sessions_per_user_list_head_index);
-
-      kv0.value = u - sm->per_thread_data[cpu_index].users;
-
-      /* add user */
-      clib_bihash_add_del_8_8 (&sm->user_hash, &kv0, 1 /* is_add */);
-    }
-  else
-    {
-      u = pool_elt_at_index (sm->per_thread_data[cpu_index].users,
-                             value0.value);
-    }
-
-  /* Over quota? Recycle the least recently used dynamic translation */
-  if (u->nsessions >= sm->max_translations_per_user)
-    {
-      /* Remove the oldest dynamic translation */
-      do {
-          oldest_per_user_translation_list_index =
-            clib_dlist_remove_head (sm->per_thread_data[cpu_index].list_pool,
-                                    u->sessions_per_user_list_head_index);
-
-          ASSERT (oldest_per_user_translation_list_index != ~0);
-
-          /* add it back to the end of the LRU list */
-          clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
-                              u->sessions_per_user_list_head_index,
-                              oldest_per_user_translation_list_index);
-          /* Get the list element */
-          oldest_per_user_translation_list_elt =
-            pool_elt_at_index (sm->per_thread_data[cpu_index].list_pool,
-                               oldest_per_user_translation_list_index);
-
-          /* Get the session index from the list element */
-          session_index = oldest_per_user_translation_list_elt->value;
-
-          /* Get the session */
-          s = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
-                                 session_index);
-      } while (snat_is_session_static (s));
-
-      /* Remove in2out, out2in keys */
-      kv0.key = s->in2out.as_u64;
-      if (clib_bihash_add_del_8_8 (&sm->in2out, &kv0, 0 /* is_add */))
-          clib_warning ("in2out key delete failed");
-      kv0.key = s->out2in.as_u64;
-      if (clib_bihash_add_del_8_8 (&sm->out2in, &kv0, 0 /* is_add */))
-          clib_warning ("out2in key delete failed");
-
-      snat_free_outside_address_and_port 
-        (sm, &s->out2in, s->outside_address_index);
-      s->outside_address_index = ~0;
-
-      if (snat_alloc_outside_address_and_port (sm, &key1, &address_index))
-        {
-          ASSERT(0);
-
-          b0->error = node->errors[SNAT_IN2OUT_ERROR_OUT_OF_PORTS];
-          return SNAT_IN2OUT_NEXT_DROP;
-        }
-      s->outside_address_index = address_index;
-    }
-  else
-    {
-      u8 static_mapping = 1;
-
-      /* First try to match static mapping by local address and port */
-      if (snat_static_mapping_match (sm, *key0, &key1, 0))
-        {
-          static_mapping = 0;
-          /* Try to create dynamic translation */
-          if (snat_alloc_outside_address_and_port (sm, &key1, &address_index))
-            {
-              b0->error = node->errors[SNAT_IN2OUT_ERROR_OUT_OF_PORTS];
-              return SNAT_IN2OUT_NEXT_DROP;
-            }
-        }
-
-      /* Create a new session */
-      pool_get (sm->per_thread_data[cpu_index].sessions, s);
-      memset (s, 0, sizeof (*s));
-      
-      s->outside_address_index = address_index;
-
-      if (static_mapping)
-        {
-          u->nstaticsessions++;
-          s->flags |= SNAT_SESSION_FLAG_STATIC_MAPPING;
-        }
-      else
-        {
-          u->nsessions++;
-        }
-
-      /* Create list elts */
-      pool_get (sm->per_thread_data[cpu_index].list_pool,
-                per_user_translation_list_elt);
-      clib_dlist_init (sm->per_thread_data[cpu_index].list_pool,
-                       per_user_translation_list_elt -
-                       sm->per_thread_data[cpu_index].list_pool);
-
-      per_user_translation_list_elt->value =
-        s - sm->per_thread_data[cpu_index].sessions;
-      s->per_user_index = per_user_translation_list_elt -
-                          sm->per_thread_data[cpu_index].list_pool;
-      s->per_user_list_head_index = u->sessions_per_user_list_head_index;
-
-      clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
-                          s->per_user_list_head_index,
-                          per_user_translation_list_elt -
-                          sm->per_thread_data[cpu_index].list_pool);
-   }
-  
-  s->in2out = *key0;
-  s->out2in = key1;
-  s->out2in.protocol = key0->protocol;
-  s->out2in.fib_index = outside_fib_index;
-  *sessionp = s;
-
-  /* Add to translation hashes */
-  kv0.key = s->in2out.as_u64;
-  kv0.value = s - sm->per_thread_data[cpu_index].sessions;
-  if (clib_bihash_add_del_8_8 (&sm->in2out, &kv0, 1 /* is_add */))
-      clib_warning ("in2out key add failed");
-  
-  kv0.key = s->out2in.as_u64;
-  kv0.value = s - sm->per_thread_data[cpu_index].sessions;
-  
-  if (clib_bihash_add_del_8_8 (&sm->out2in, &kv0, 1 /* is_add */))
-      clib_warning ("out2in key add failed");
-
-  /* Add to translated packets worker lookup */
-  worker_by_out_key.addr = s->out2in.addr;
-  worker_by_out_key.port = s->out2in.port;
-  worker_by_out_key.fib_index = s->out2in.fib_index;
-  kv0.key = worker_by_out_key.as_u64;
-  kv0.value = cpu_index;
-  clib_bihash_add_del_8_8 (&sm->worker_by_out, &kv0, 1);
-  return next0;
-}
-                      
-static inline u32 icmp_in2out_slow_path (snat_main_t *sm,
-                                         vlib_buffer_t * b0,
-                                         ip4_header_t * ip0,
-                                         icmp46_header_t * icmp0,
-                                         u32 sw_if_index0,
-                                         u32 rx_fib_index0,
-                                         vlib_node_runtime_t * node,
-                                         u32 next0,
-                                         f64 now,
-                                         u32 cpu_index)
-{
-  snat_session_key_t key0;
-  icmp_echo_header_t *echo0;
-  clib_bihash_kv_8_8_t kv0, value0;
-  snat_session_t * s0;
-  u32 new_addr0, old_addr0;
-  u16 old_id0, new_id0;
-  ip_csum_t sum0;
-  snat_runtime_t * rt = (snat_runtime_t *)node->runtime_data;
-
-  if (PREDICT_FALSE(icmp0->type != ICMP4_echo_request))
-    {
-      b0->error = node->errors[SNAT_IN2OUT_ERROR_BAD_ICMP_TYPE];
-      return SNAT_IN2OUT_NEXT_DROP;
-    }
-  
-  echo0 = (icmp_echo_header_t *)(icmp0+1);
-
-  key0.addr = ip0->src_address;
-  key0.port = echo0->identifier;
-  key0.protocol = SNAT_PROTOCOL_ICMP;
-  key0.fib_index = rx_fib_index0;
-  
-  kv0.key = key0.as_u64;
-  
-  if (clib_bihash_search_8_8 (&sm->in2out, &kv0, &value0))
-    {
-      ip4_address_t * first_int_addr;
-
-      if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index0))
-        {
-          first_int_addr = 
-            ip4_interface_first_address (sm->ip4_main, sw_if_index0,
-                                         0 /* just want the address */);
-          rt->cached_sw_if_index = sw_if_index0;
-          rt->cached_ip4_address = first_int_addr->as_u32;
-        }
-      
-      /* Don't NAT packet aimed at the intfc address */
-      if (PREDICT_FALSE(ip0->dst_address.as_u32 ==
-                                rt->cached_ip4_address))
-        return next0;
-      
-      next0 = slow_path (sm, b0, ip0, rx_fib_index0, &key0,
-                         &s0, node, next0, cpu_index);
-      
-      if (PREDICT_FALSE (next0 == SNAT_IN2OUT_NEXT_DROP))
-        return next0;
-    }
-  else
-    s0 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
-                            value0.value);
-
-  old_addr0 = ip0->src_address.as_u32;
-  ip0->src_address = s0->out2in.addr;
-  new_addr0 = ip0->src_address.as_u32;
-  vnet_buffer(b0)->sw_if_index[VLIB_TX] = s0->out2in.fib_index;
-  
-  sum0 = ip0->checksum;
-  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                         ip4_header_t,
-                         src_address /* changed member */);
-  ip0->checksum = ip_csum_fold (sum0);
-  
-  old_id0 = echo0->identifier;
-  new_id0 = s0->out2in.port;
-  echo0->identifier = new_id0;
-
-  sum0 = icmp0->checksum;
-  sum0 = ip_csum_update (sum0, old_id0, new_id0, icmp_echo_header_t,
-                         identifier);
-  icmp0->checksum = ip_csum_fold (sum0);
-
-  /* Accounting */
-  s0->last_heard = now;
-  s0->total_pkts++;
-  s0->total_bytes += vlib_buffer_length_in_chain (sm->vlib_main, b0);
-  /* Per-user LRU list maintenance for dynamic translations */
-  if (!snat_is_session_static (s0))
-    {
-      clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
-                         s0->per_user_index);
-      clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
-                          s0->per_user_list_head_index,
-                          s0->per_user_index);
-    }
-
-  return next0;
-}
-
-/**
- * @brief Hairpinning
- *
- * Hairpinning allows two endpoints on the internal side of the NAT to
- * communicate even if they only use each other's external IP addresses
- * and ports.
- *
- * @param sm     SNAT main.
- * @param b0     Vlib buffer.
- * @param ip0    IP header.
- * @param udp0   UDP header.
- * @param tcp0   TCP header.
- * @param proto0 SNAT protocol.
- */
-static inline void
-snat_hairpinning (snat_main_t *sm,
-                  vlib_buffer_t * b0,
-                  ip4_header_t * ip0,
-                  udp_header_t * udp0,
-                  tcp_header_t * tcp0,
-                  u32 proto0)
-{
-  snat_session_key_t key0, sm0;
-  snat_static_mapping_key_t k0;
-  snat_session_t * s0;
-  clib_bihash_kv_8_8_t kv0, value0;
-  ip_csum_t sum0;
-  u32 new_dst_addr0 = 0, old_dst_addr0, ti = 0, si;
-  u16 new_dst_port0, old_dst_port0;
-
-  key0.addr = ip0->dst_address;
-  key0.port = udp0->dst_port;
-  key0.protocol = proto0;
-  key0.fib_index = sm->outside_fib_index;
-  kv0.key = key0.as_u64;
-
-  /* Check if destination is in active sessions */
-  if (clib_bihash_search_8_8 (&sm->out2in, &kv0, &value0))
-    {
-      /* or static mappings */
-      if (!snat_static_mapping_match(sm, key0, &sm0, 1))
-        {
-          new_dst_addr0 = sm0.addr.as_u32;
-          new_dst_port0 = sm0.port;
-          vnet_buffer(b0)->sw_if_index[VLIB_TX] = sm0.fib_index;
-        }
-    }
-  else
-    {
-      si = value0.value;
-      if (sm->num_workers > 1)
-        {
-          k0.addr = ip0->dst_address;
-          k0.port = udp0->dst_port;
-          k0.fib_index = sm->outside_fib_index;
-          kv0.key = k0.as_u64;
-          if (clib_bihash_search_8_8 (&sm->worker_by_out, &kv0, &value0))
-            ASSERT(0);
-          else
-            ti = value0.value;
-        }
-      else
-        ti = sm->num_workers;
-
-      s0 = pool_elt_at_index (sm->per_thread_data[ti].sessions, si);
-      new_dst_addr0 = s0->in2out.addr.as_u32;
-      new_dst_port0 = s0->in2out.port;
-      vnet_buffer(b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
-    }
-
-  /* Destination is behind the same NAT, use internal address and port */
-  if (new_dst_addr0)
-    {
-      old_dst_addr0 = ip0->dst_address.as_u32;
-      ip0->dst_address.as_u32 = new_dst_addr0;
-      sum0 = ip0->checksum;
-      sum0 = ip_csum_update (sum0, old_dst_addr0, new_dst_addr0,
-                             ip4_header_t, dst_address);
-      ip0->checksum = ip_csum_fold (sum0);
-
-      old_dst_port0 = tcp0->ports.dst;
-      if (PREDICT_TRUE(new_dst_port0 != old_dst_port0))
-        {
-          if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
-            {
-              tcp0->ports.dst = new_dst_port0;
-              sum0 = tcp0->checksum;
-              sum0 = ip_csum_update (sum0, old_dst_addr0, new_dst_addr0,
-                                     ip4_header_t, dst_address);
-              sum0 = ip_csum_update (sum0, old_dst_port0, new_dst_port0,
-                                     ip4_header_t /* cheat */, length);
-              tcp0->checksum = ip_csum_fold(sum0);
-            }
-          else
-            {
-              udp0->dst_port = new_dst_port0;
-              udp0->checksum = 0;
-            }
-        }
-    }
-}
-
-static inline uword
-snat_in2out_node_fn_inline (vlib_main_t * vm,
-                            vlib_node_runtime_t * node,
-                            vlib_frame_t * frame, int is_slow_path)
-{
-  u32 n_left_from, * from, * to_next;
-  snat_in2out_next_t next_index;
-  u32 pkts_processed = 0;
-  snat_main_t * sm = &snat_main;
-  snat_runtime_t * rt = (snat_runtime_t *)node->runtime_data;
-  f64 now = vlib_time_now (vm);
-  u32 stats_node_index;
-  u32 cpu_index = os_get_cpu_number ();
-
-  stats_node_index = is_slow_path ? snat_in2out_slowpath_node.index :
-    snat_in2out_node.index;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-          u32 bi0, bi1;
-	  vlib_buffer_t * b0, * b1;
-          u32 next0, next1;
-          u32 sw_if_index0, sw_if_index1;
-          ip4_header_t * ip0, * ip1;
-          ip_csum_t sum0, sum1;
-          u32 new_addr0, old_addr0, new_addr1, old_addr1;
-          u16 old_port0, new_port0, old_port1, new_port1;
-          udp_header_t * udp0, * udp1;
-          tcp_header_t * tcp0, * tcp1;
-          icmp46_header_t * icmp0, * icmp1;
-          snat_session_key_t key0, key1;
-          u32 rx_fib_index0, rx_fib_index1;
-          u32 proto0, proto1;
-          snat_session_t * s0 = 0, * s1 = 0;
-          clib_bihash_kv_8_8_t kv0, value0, kv1, value1;
-          
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * p2, * p3;
-            
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-            
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-          /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-          
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-          ip0 = vlib_buffer_get_current (b0);
-          udp0 = ip4_next_header (ip0);
-          tcp0 = (tcp_header_t *) udp0;
-          icmp0 = (icmp46_header_t *) udp0;
-
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-	  rx_fib_index0 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index, 
-                                   sw_if_index0);
-
-          next0 = next1 = SNAT_IN2OUT_NEXT_LOOKUP;
-
-          proto0 = ~0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_UDP) 
-            ? SNAT_PROTOCOL_UDP : proto0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_TCP) 
-            ? SNAT_PROTOCOL_TCP : proto0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_ICMP) 
-            ? SNAT_PROTOCOL_ICMP : proto0;
-
-          /* Next configured feature, probably ip4-lookup */
-          if (is_slow_path)
-            {
-              if (PREDICT_FALSE (proto0 == ~0))
-                goto trace00;
-              
-              if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
-                {
-                  next0 = icmp_in2out_slow_path 
-                    (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, 
-                     node, next0, now, cpu_index);
-                  goto trace00;
-                }
-            }
-          else
-            {
-              if (PREDICT_FALSE (proto0 == ~0 || proto0 == SNAT_PROTOCOL_ICMP))
-                {
-                  next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
-                  goto trace00;
-                }
-            }
-
-          key0.addr = ip0->src_address;
-          key0.port = udp0->src_port;
-          key0.protocol = proto0;
-          key0.fib_index = rx_fib_index0;
-          
-          kv0.key = key0.as_u64;
-
-          if (PREDICT_FALSE (clib_bihash_search_8_8 (&sm->in2out, &kv0, &value0) != 0))
-            {
-              if (is_slow_path)
-                {
-                  ip4_address_t * first_int_addr;
-                  
-                  if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index0))
-                    {
-                      first_int_addr = 
-                        ip4_interface_first_address (sm->ip4_main, sw_if_index0,
-                                                     0 /* just want the address */);
-                      rt->cached_sw_if_index = sw_if_index0;
-                      rt->cached_ip4_address = first_int_addr->as_u32;
-                    }
-                  
-                  /* Don't NAT packet aimed at the intfc address */
-                  if (PREDICT_FALSE(ip0->dst_address.as_u32 ==
-                                    rt->cached_ip4_address))
-                    goto trace00;
-                  
-                  next0 = slow_path (sm, b0, ip0, rx_fib_index0, &key0,
-                                     &s0, node, next0, cpu_index);
-                  if (PREDICT_FALSE (next0 == SNAT_IN2OUT_NEXT_DROP))
-                    goto trace00;
-                }
-              else
-                {
-                  next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
-                  goto trace00;
-                }
-            }
-          else
-            s0 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
-                                    value0.value);
-
-          old_addr0 = ip0->src_address.as_u32;
-          ip0->src_address = s0->out2in.addr;
-          new_addr0 = ip0->src_address.as_u32;
-          vnet_buffer(b0)->sw_if_index[VLIB_TX] = s0->out2in.fib_index;
-
-          sum0 = ip0->checksum;
-          sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                 ip4_header_t,
-                                 src_address /* changed member */);
-          ip0->checksum = ip_csum_fold (sum0);
-
-          if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
-            {
-              old_port0 = tcp0->ports.src;
-              tcp0->ports.src = s0->out2in.port;
-              new_port0 = tcp0->ports.src;
-
-              sum0 = tcp0->checksum;
-              sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                     ip4_header_t,
-                                     dst_address /* changed member */);
-              sum0 = ip_csum_update (sum0, old_port0, new_port0,
-                                     ip4_header_t /* cheat */,
-                                     length /* changed member */);
-              tcp0->checksum = ip_csum_fold(sum0);
-            }
-          else
-            {
-              old_port0 = udp0->src_port;
-              udp0->src_port = s0->out2in.port;
-              udp0->checksum = 0;
-            }
-
-          /* Hairpinning */
-          snat_hairpinning (sm, b0, ip0, udp0, tcp0, proto0);
-
-          /* Accounting */
-          s0->last_heard = now;
-          s0->total_pkts++;
-          s0->total_bytes += vlib_buffer_length_in_chain (vm, b0);
-          /* Per-user LRU list maintenance for dynamic translation */
-          if (!snat_is_session_static (s0))
-            {
-              clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
-                                 s0->per_user_index);
-              clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
-                                  s0->per_user_list_head_index,
-                                  s0->per_user_index);
-            }
-        trace00:
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              snat_in2out_trace_t *t = 
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->is_slow_path = is_slow_path;
-              t->sw_if_index = sw_if_index0;
-              t->next_index = next0;
-                  t->session_index = ~0;
-              if (s0)
-                t->session_index = s0 - sm->per_thread_data[cpu_index].sessions;
-            }
-
-          pkts_processed += next0 != SNAT_IN2OUT_NEXT_DROP;
-
-          ip1 = vlib_buffer_get_current (b1);
-          udp1 = ip4_next_header (ip1);
-          tcp1 = (tcp_header_t *) udp1;
-          icmp1 = (icmp46_header_t *) udp1;
-
-          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
-	  rx_fib_index1 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index, 
-                                   sw_if_index1);
-
-          proto1 = ~0;
-          proto1 = (ip1->protocol == IP_PROTOCOL_UDP) 
-            ? SNAT_PROTOCOL_UDP : proto1;
-          proto1 = (ip1->protocol == IP_PROTOCOL_TCP) 
-            ? SNAT_PROTOCOL_TCP : proto1;
-          proto1 = (ip1->protocol == IP_PROTOCOL_ICMP) 
-            ? SNAT_PROTOCOL_ICMP : proto1;
-
-          /* Next configured feature, probably ip4-lookup */
-          if (is_slow_path)
-            {
-              if (PREDICT_FALSE (proto1 == ~0))
-                goto trace01;
-              
-              if (PREDICT_FALSE (proto1 == SNAT_PROTOCOL_ICMP))
-                {
-                  next1 = icmp_in2out_slow_path 
-                    (sm, b1, ip1, icmp1, sw_if_index1, rx_fib_index1, node,
-                     next1, now, cpu_index);
-                  goto trace01;
-                }
-            }
-          else
-            {
-              if (PREDICT_FALSE (proto1 == ~0 || proto1 == SNAT_PROTOCOL_ICMP))
-                {
-                  next1 = SNAT_IN2OUT_NEXT_SLOW_PATH;
-                  goto trace01;
-                }
-            }
-
-          key1.addr = ip1->src_address;
-          key1.port = udp1->src_port;
-          key1.protocol = proto1;
-          key1.fib_index = rx_fib_index1;
-          
-          kv1.key = key1.as_u64;
-
-            if (PREDICT_FALSE(clib_bihash_search_8_8 (&sm->in2out, &kv1, &value1) != 0))
-            {
-              if (is_slow_path)
-                {
-                  ip4_address_t * first_int_addr;
-                  
-                  if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index1))
-                    {
-                      first_int_addr = 
-                        ip4_interface_first_address (sm->ip4_main, sw_if_index1,
-                                                     0 /* just want the address */);
-                      rt->cached_sw_if_index = sw_if_index1;
-                      rt->cached_ip4_address = first_int_addr->as_u32;
-                    }
-                  
-                  /* Don't NAT packet aimed at the intfc address */
-                  if (PREDICT_FALSE(ip1->dst_address.as_u32 ==
-                                    rt->cached_ip4_address))
-                    goto trace01;
-                  
-                  next1 = slow_path (sm, b1, ip1, rx_fib_index1, &key1,
-                                     &s1, node, next1, cpu_index);
-                  if (PREDICT_FALSE (next1 == SNAT_IN2OUT_NEXT_DROP))
-                    goto trace01;
-                }
-              else
-                {
-                  next1 = SNAT_IN2OUT_NEXT_SLOW_PATH;
-                  goto trace01;
-                }
-            }
-          else
-            s1 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
-                                    value1.value);
-
-          old_addr1 = ip1->src_address.as_u32;
-          ip1->src_address = s1->out2in.addr;
-          new_addr1 = ip1->src_address.as_u32;
-          vnet_buffer(b1)->sw_if_index[VLIB_TX] = s1->out2in.fib_index;
-
-          sum1 = ip1->checksum;
-          sum1 = ip_csum_update (sum1, old_addr1, new_addr1,
-                                 ip4_header_t,
-                                 src_address /* changed member */);
-          ip1->checksum = ip_csum_fold (sum1);
-
-          if (PREDICT_TRUE(proto1 == SNAT_PROTOCOL_TCP))
-            {
-              old_port1 = tcp1->ports.src;
-              tcp1->ports.src = s1->out2in.port;
-              new_port1 = tcp1->ports.src;
-
-              sum1 = tcp1->checksum;
-              sum1 = ip_csum_update (sum1, old_addr1, new_addr1,
-                                     ip4_header_t,
-                                     dst_address /* changed member */);
-              sum1 = ip_csum_update (sum1, old_port1, new_port1,
-                                     ip4_header_t /* cheat */,
-                                     length /* changed member */);
-              tcp1->checksum = ip_csum_fold(sum1);
-            }
-          else
-            {
-              old_port1 = udp1->src_port;
-              udp1->src_port = s1->out2in.port;
-              udp1->checksum = 0;
-            }
-
-          /* Hairpinning */
-          snat_hairpinning (sm, b1, ip1, udp1, tcp1, proto1);
-
-          /* Accounting */
-          s1->last_heard = now;
-          s1->total_pkts++;
-          s1->total_bytes += vlib_buffer_length_in_chain (vm, b1);
-          /* Per-user LRU list maintenance for dynamic translation */
-          if (!snat_is_session_static (s1))
-            {
-              clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
-                                 s1->per_user_index);
-              clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
-                                  s1->per_user_list_head_index,
-                                  s1->per_user_index);
-            }
-        trace01:
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b1->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              snat_in2out_trace_t *t = 
-                 vlib_add_trace (vm, node, b1, sizeof (*t));
-              t->sw_if_index = sw_if_index1;
-              t->next_index = next1;
-              t->session_index = ~0;
-              if (s1)
-                t->session_index = s1 - sm->per_thread_data[cpu_index].sessions;
-            }
-
-          pkts_processed += next1 != SNAT_IN2OUT_NEXT_DROP;
-
-          /* verify speculative enqueues, maybe switch current next frame */
-          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-                                           to_next, n_left_to_next,
-                                           bi0, bi1, next0, next1);
-        }
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-          u32 bi0;
-	  vlib_buffer_t * b0;
-          u32 next0;
-          u32 sw_if_index0;
-          ip4_header_t * ip0;
-          ip_csum_t sum0;
-          u32 new_addr0, old_addr0;
-          u16 old_port0, new_port0;
-          udp_header_t * udp0;
-          tcp_header_t * tcp0;
-          icmp46_header_t * icmp0;
-          snat_session_key_t key0;
-          u32 rx_fib_index0;
-          u32 proto0;
-          snat_session_t * s0 = 0;
-          clib_bihash_kv_8_8_t kv0, value0;
-          
-          /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-          next0 = SNAT_IN2OUT_NEXT_LOOKUP;
-
-          ip0 = vlib_buffer_get_current (b0);
-          udp0 = ip4_next_header (ip0);
-          tcp0 = (tcp_header_t *) udp0;
-          icmp0 = (icmp46_header_t *) udp0;
-
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-	  rx_fib_index0 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index, 
-                                   sw_if_index0);
-
-          proto0 = ~0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_UDP) 
-            ? SNAT_PROTOCOL_UDP : proto0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_TCP) 
-            ? SNAT_PROTOCOL_TCP : proto0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_ICMP) 
-            ? SNAT_PROTOCOL_ICMP : proto0;
-
-          /* Next configured feature, probably ip4-lookup */
-          if (is_slow_path)
-            {
-              if (PREDICT_FALSE (proto0 == ~0))
-                goto trace0;
-              
-              if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
-                {
-                  next0 = icmp_in2out_slow_path 
-                    (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
-                     next0, now, cpu_index);
-                  goto trace0;
-                }
-            }
-          else
-            {
-              if (PREDICT_FALSE (proto0 == ~0 || proto0 == SNAT_PROTOCOL_ICMP))
-                {
-                  next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
-                  goto trace0;
-                }
-            }
-
-          key0.addr = ip0->src_address;
-          key0.port = udp0->src_port;
-          key0.protocol = proto0;
-          key0.fib_index = rx_fib_index0;
-          
-          kv0.key = key0.as_u64;
-
-          if (clib_bihash_search_8_8 (&sm->in2out, &kv0, &value0))
-            {
-              if (is_slow_path)
-                {
-                  ip4_address_t * first_int_addr;
-                  
-                  if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index0))
-                    {
-                      first_int_addr = 
-                        ip4_interface_first_address (sm->ip4_main, sw_if_index0,
-                                                     0 /* just want the address */);
-                      rt->cached_sw_if_index = sw_if_index0;
-                      rt->cached_ip4_address = first_int_addr->as_u32;
-                    }
-                  
-                  /* Don't NAT packet aimed at the intfc address */
-                  if (PREDICT_FALSE(ip0->dst_address.as_u32 ==
-                                    rt->cached_ip4_address))
-                    goto trace0;
-                  
-                  next0 = slow_path (sm, b0, ip0, rx_fib_index0, &key0,
-                                     &s0, node, next0, cpu_index);
-                  if (PREDICT_FALSE (next0 == SNAT_IN2OUT_NEXT_DROP))
-                    goto trace0;
-                }
-              else
-                {
-                  next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
-                  goto trace0;
-                }
-            }
-          else
-            s0 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
-                                    value0.value);
-
-          old_addr0 = ip0->src_address.as_u32;
-          ip0->src_address = s0->out2in.addr;
-          new_addr0 = ip0->src_address.as_u32;
-          vnet_buffer(b0)->sw_if_index[VLIB_TX] = s0->out2in.fib_index;
-
-          sum0 = ip0->checksum;
-          sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                 ip4_header_t,
-                                 src_address /* changed member */);
-          ip0->checksum = ip_csum_fold (sum0);
-
-          if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
-            {
-              old_port0 = tcp0->ports.src;
-              tcp0->ports.src = s0->out2in.port;
-              new_port0 = tcp0->ports.src;
-
-              sum0 = tcp0->checksum;
-              sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                     ip4_header_t,
-                                     dst_address /* changed member */);
-              sum0 = ip_csum_update (sum0, old_port0, new_port0,
-                                     ip4_header_t /* cheat */,
-                                     length /* changed member */);
-              tcp0->checksum = ip_csum_fold(sum0);
-            }
-          else
-            {
-              old_port0 = udp0->src_port;
-              udp0->src_port = s0->out2in.port;
-              udp0->checksum = 0;
-            }
-
-          /* Hairpinning */
-          snat_hairpinning (sm, b0, ip0, udp0, tcp0, proto0);
-
-          /* Accounting */
-          s0->last_heard = now;
-          s0->total_pkts++;
-          s0->total_bytes += vlib_buffer_length_in_chain (vm, b0);
-          /* Per-user LRU list maintenance for dynamic translation */
-          if (!snat_is_session_static (s0))
-            {
-              clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
-                                 s0->per_user_index);
-              clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
-                                  s0->per_user_list_head_index,
-                                  s0->per_user_index);
-            }
-
-        trace0:
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              snat_in2out_trace_t *t = 
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->is_slow_path = is_slow_path;
-              t->sw_if_index = sw_if_index0;
-              t->next_index = next0;
-                  t->session_index = ~0;
-              if (s0)
-                t->session_index = s0 - sm->per_thread_data[cpu_index].sessions;
-            }
-
-          pkts_processed += next0 != SNAT_IN2OUT_NEXT_DROP;
-
-          /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, stats_node_index, 
-                               SNAT_IN2OUT_ERROR_IN2OUT_PACKETS, 
-                               pkts_processed);
-  return frame->n_vectors;
-}
-
-static uword
-snat_in2out_fast_path_fn (vlib_main_t * vm,
-                          vlib_node_runtime_t * node,
-                          vlib_frame_t * frame)
-{
-  return snat_in2out_node_fn_inline (vm, node, frame, 0 /* is_slow_path */);
-}
-
-VLIB_REGISTER_NODE (snat_in2out_node) = {
-  .function = snat_in2out_fast_path_fn,
-  .name = "snat-in2out",
-  .vector_size = sizeof (u32),
-  .format_trace = format_snat_in2out_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_errors = ARRAY_LEN(snat_in2out_error_strings),
-  .error_strings = snat_in2out_error_strings,
-
-  .runtime_data_bytes = sizeof (snat_runtime_t),
-  
-  .n_next_nodes = SNAT_IN2OUT_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [SNAT_IN2OUT_NEXT_DROP] = "error-drop",
-    [SNAT_IN2OUT_NEXT_LOOKUP] = "ip4-lookup",
-    [SNAT_IN2OUT_NEXT_SLOW_PATH] = "snat-in2out-slowpath",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_node, snat_in2out_fast_path_fn);
-
-static uword
-snat_in2out_slow_path_fn (vlib_main_t * vm,
-                          vlib_node_runtime_t * node,
-                          vlib_frame_t * frame)
-{
-  return snat_in2out_node_fn_inline (vm, node, frame, 1 /* is_slow_path */);
-}
-
-VLIB_REGISTER_NODE (snat_in2out_slowpath_node) = {
-  .function = snat_in2out_slow_path_fn,
-  .name = "snat-in2out-slowpath",
-  .vector_size = sizeof (u32),
-  .format_trace = format_snat_in2out_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_errors = ARRAY_LEN(snat_in2out_error_strings),
-  .error_strings = snat_in2out_error_strings,
-
-  .runtime_data_bytes = sizeof (snat_runtime_t),
-  
-  .n_next_nodes = SNAT_IN2OUT_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [SNAT_IN2OUT_NEXT_DROP] = "error-drop",
-    [SNAT_IN2OUT_NEXT_LOOKUP] = "ip4-lookup",
-    [SNAT_IN2OUT_NEXT_SLOW_PATH] = "snat-in2out-slowpath",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_slowpath_node, snat_in2out_slow_path_fn);
-
-static uword
-snat_in2out_worker_handoff_fn (vlib_main_t * vm,
-                               vlib_node_runtime_t * node,
-                               vlib_frame_t * frame)
-{
-  snat_main_t *sm = &snat_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  u32 n_left_from, *from, *to_next = 0;
-  static __thread vlib_frame_queue_elt_t **handoff_queue_elt_by_worker_index;
-  static __thread vlib_frame_queue_t **congested_handoff_queue_by_worker_index
-    = 0;
-  vlib_frame_queue_elt_t *hf = 0;
-  vlib_frame_t *f = 0;
-  int i;
-  u32 n_left_to_next_worker = 0, *to_next_worker = 0;
-  u32 next_worker_index = 0;
-  u32 current_worker_index = ~0;
-  u32 cpu_index = os_get_cpu_number ();
-
-  ASSERT (vec_len (sm->workers));
-
-  if (PREDICT_FALSE (handoff_queue_elt_by_worker_index == 0))
-    {
-      vec_validate (handoff_queue_elt_by_worker_index, tm->n_vlib_mains - 1);
-
-      vec_validate_init_empty (congested_handoff_queue_by_worker_index,
-			       sm->first_worker_index + sm->num_workers - 1,
-			       (vlib_frame_queue_t *) (~0));
-    }
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      u32 sw_if_index0;
-      u32 rx_fib_index0;
-      ip4_header_t * ip0;
-      snat_user_key_t key0;
-      clib_bihash_kv_8_8_t kv0, value0;
-      u8 do_handoff;
-
-      bi0 = from[0];
-      from += 1;
-      n_left_from -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      rx_fib_index0 = ip4_fib_table_get_index_for_sw_if_index(sw_if_index0);
-
-      ip0 = vlib_buffer_get_current (b0);
-
-      key0.addr = ip0->src_address;
-      key0.fib_index = rx_fib_index0;
-
-      kv0.key = key0.as_u64;
-
-      /* Ever heard of of the "user" before? */
-      if (clib_bihash_search_8_8 (&sm->worker_by_in, &kv0, &value0))
-        {
-          /* No, assign next available worker (RR) */
-          next_worker_index = sm->first_worker_index +
-            sm->workers[sm->next_worker++ % vec_len (sm->workers)];
-
-          /* add non-traslated packets worker lookup */
-          kv0.value = next_worker_index;
-          clib_bihash_add_del_8_8 (&sm->worker_by_in, &kv0, 1);
-        }
-      else
-        next_worker_index = value0.value;
-
-      if (PREDICT_FALSE (next_worker_index != cpu_index))
-        {
-          do_handoff = 1;
-
-          if (next_worker_index != current_worker_index)
-            {
-              if (hf)
-                hf->n_vectors = VLIB_FRAME_SIZE - n_left_to_next_worker;
-
-              hf = vlib_get_worker_handoff_queue_elt (sm->fq_in2out_index,
-                                                      next_worker_index,
-                                                      handoff_queue_elt_by_worker_index);
-
-              n_left_to_next_worker = VLIB_FRAME_SIZE - hf->n_vectors;
-              to_next_worker = &hf->buffer_index[hf->n_vectors];
-              current_worker_index = next_worker_index;
-            }
-
-          /* enqueue to correct worker thread */
-          to_next_worker[0] = bi0;
-          to_next_worker++;
-          n_left_to_next_worker--;
-
-          if (n_left_to_next_worker == 0)
-            {
-              hf->n_vectors = VLIB_FRAME_SIZE;
-              vlib_put_frame_queue_elt (hf);
-              current_worker_index = ~0;
-              handoff_queue_elt_by_worker_index[next_worker_index] = 0;
-              hf = 0;
-            }
-        }
-      else
-        {
-          do_handoff = 0;
-          /* if this is 1st frame */
-          if (!f)
-            {
-              f = vlib_get_frame_to_node (vm, snat_in2out_node.index);
-              to_next = vlib_frame_vector_args (f);
-            }
-
-          to_next[0] = bi0;
-          to_next += 1;
-          f->n_vectors++;
-        }
-
-      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			 && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	{
-          snat_in2out_worker_handoff_trace_t *t =
-            vlib_add_trace (vm, node, b0, sizeof (*t));
-          t->next_worker_index = next_worker_index;
-          t->do_handoff = do_handoff;
-        }
-    }
-
-  if (f)
-    vlib_put_frame_to_node (vm, snat_in2out_node.index, f);
-
-  if (hf)
-    hf->n_vectors = VLIB_FRAME_SIZE - n_left_to_next_worker;
-
-  /* Ship frames to the worker nodes */
-  for (i = 0; i < vec_len (handoff_queue_elt_by_worker_index); i++)
-    {
-      if (handoff_queue_elt_by_worker_index[i])
-	{
-	  hf = handoff_queue_elt_by_worker_index[i];
-	  /*
-	   * It works better to let the handoff node
-	   * rate-adapt, always ship the handoff queue element.
-	   */
-	  if (1 || hf->n_vectors == hf->last_n_vectors)
-	    {
-	      vlib_put_frame_queue_elt (hf);
-	      handoff_queue_elt_by_worker_index[i] = 0;
-	    }
-	  else
-	    hf->last_n_vectors = hf->n_vectors;
-	}
-      congested_handoff_queue_by_worker_index[i] =
-	(vlib_frame_queue_t *) (~0);
-    }
-  hf = 0;
-  current_worker_index = ~0;
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (snat_in2out_worker_handoff_node) = {
-  .function = snat_in2out_worker_handoff_fn,
-  .name = "snat-in2out-worker-handoff",
-  .vector_size = sizeof (u32),
-  .format_trace = format_snat_in2out_worker_handoff_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_next_nodes = 1,
-
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_worker_handoff_node, snat_in2out_worker_handoff_fn);
-
-static inline u32 icmp_in2out_static_map (snat_main_t *sm,
-                                          vlib_buffer_t * b0,
-                                          ip4_header_t * ip0,
-                                          icmp46_header_t * icmp0,
-                                          u32 sw_if_index0,
-                                          vlib_node_runtime_t * node,
-                                          u32 next0,
-                                          u32 rx_fib_index0)
-{
-  snat_session_key_t key0, sm0;
-  icmp_echo_header_t *echo0;
-  u32 new_addr0, old_addr0;
-  u16 old_id0, new_id0;
-  ip_csum_t sum0;
-  snat_runtime_t * rt = (snat_runtime_t *)node->runtime_data;
-
-  echo0 = (icmp_echo_header_t *)(icmp0+1);
-
-  key0.addr = ip0->src_address;
-  key0.port = echo0->identifier;
-  key0.fib_index = rx_fib_index0;
-  
-  if (snat_static_mapping_match(sm, key0, &sm0, 0))
-    {
-      ip4_address_t * first_int_addr;
-
-      if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index0))
-        {
-          first_int_addr =
-            ip4_interface_first_address (sm->ip4_main, sw_if_index0,
-                                         0 /* just want the address */);
-          rt->cached_sw_if_index = sw_if_index0;
-          rt->cached_ip4_address = first_int_addr->as_u32;
-        }
-
-      /* Don't NAT packet aimed at the intfc address */
-      if (PREDICT_FALSE(ip0->dst_address.as_u32 ==
-                                rt->cached_ip4_address))
-        return next0;
-
-      b0->error = node->errors[SNAT_IN2OUT_ERROR_NO_TRANSLATION];
-      return SNAT_IN2OUT_NEXT_DROP;
-    }
-
-  new_addr0 = sm0.addr.as_u32;
-  new_id0 = sm0.port;
-  vnet_buffer(b0)->sw_if_index[VLIB_TX] = sm0.fib_index;
-  old_addr0 = ip0->src_address.as_u32;
-  ip0->src_address.as_u32 = new_addr0;
-  
-  sum0 = ip0->checksum;
-  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                         ip4_header_t,
-                         src_address /* changed member */);
-  ip0->checksum = ip_csum_fold (sum0);
-  
-  if (PREDICT_FALSE(new_id0 != echo0->identifier))
-    {
-      old_id0 = echo0->identifier;
-      echo0->identifier = new_id0;
-
-      sum0 = icmp0->checksum;
-      sum0 = ip_csum_update (sum0, old_id0, new_id0, icmp_echo_header_t,
-                             identifier);
-      icmp0->checksum = ip_csum_fold (sum0);
-    }
-
-  return next0;
-}
-
-static uword
-snat_in2out_fast_static_map_fn (vlib_main_t * vm,
-                                vlib_node_runtime_t * node,
-                                vlib_frame_t * frame)
-{
-  u32 n_left_from, * from, * to_next;
-  snat_in2out_next_t next_index;
-  u32 pkts_processed = 0;
-  snat_main_t * sm = &snat_main;
-  snat_runtime_t * rt = (snat_runtime_t *)node->runtime_data;
-  u32 stats_node_index;
-
-  stats_node_index = snat_in2out_fast_node.index;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-          u32 bi0;
-	  vlib_buffer_t * b0;
-          u32 next0;
-          u32 sw_if_index0;
-          ip4_header_t * ip0;
-          ip_csum_t sum0;
-          u32 new_addr0, old_addr0;
-          u16 old_port0, new_port0;
-          udp_header_t * udp0;
-          tcp_header_t * tcp0;
-          icmp46_header_t * icmp0;
-          snat_session_key_t key0, sm0;
-          u32 proto0;
-          u32 rx_fib_index0;
-
-          /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-          next0 = SNAT_IN2OUT_NEXT_LOOKUP;
-
-          ip0 = vlib_buffer_get_current (b0);
-          udp0 = ip4_next_header (ip0);
-          tcp0 = (tcp_header_t *) udp0;
-          icmp0 = (icmp46_header_t *) udp0;
-
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-	  rx_fib_index0 = ip4_fib_table_get_index_for_sw_if_index(sw_if_index0);
-
-          proto0 = ~0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_UDP)
-            ? SNAT_PROTOCOL_UDP : proto0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_TCP)
-            ? SNAT_PROTOCOL_TCP : proto0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_ICMP)
-            ? SNAT_PROTOCOL_ICMP : proto0;
-
-          if (PREDICT_FALSE (proto0 == ~0))
-              goto trace0;
-
-          if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
-            {
-              ip4_address_t * first_int_addr;
-              
-              if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index0))
-                {
-                  first_int_addr = 
-                    ip4_interface_first_address (sm->ip4_main, sw_if_index0,
-                                                 0 /* just want the address */);
-                  rt->cached_sw_if_index = sw_if_index0;
-                  rt->cached_ip4_address = first_int_addr->as_u32;
-                }
-              
-              /* Don't NAT packet aimed at the intfc address */
-              if (PREDICT_FALSE(ip0->dst_address.as_u32 ==
-                                rt->cached_ip4_address))
-                goto trace0;
-
-              next0 = icmp_in2out_static_map
-                (sm, b0, ip0, icmp0, sw_if_index0, node, next0, rx_fib_index0);
-              goto trace0;
-            }
-
-          key0.addr = ip0->src_address;
-          key0.port = udp0->src_port;
-          key0.fib_index = rx_fib_index0;
-
-          if (snat_static_mapping_match(sm, key0, &sm0, 0))
-            {
-              b0->error = node->errors[SNAT_IN2OUT_ERROR_NO_TRANSLATION];
-              next0= SNAT_IN2OUT_NEXT_DROP;
-              goto trace0;
-            }
-
-          new_addr0 = sm0.addr.as_u32;
-          new_port0 = sm0.port;
-          vnet_buffer(b0)->sw_if_index[VLIB_TX] = sm0.fib_index;
-          old_addr0 = ip0->src_address.as_u32;
-          ip0->src_address.as_u32 = new_addr0;
-
-          sum0 = ip0->checksum;
-          sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                 ip4_header_t,
-                                 src_address /* changed member */);
-          ip0->checksum = ip_csum_fold (sum0);
-
-          if (PREDICT_FALSE(new_port0 != udp0->dst_port))
-            {
-              if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
-                {
-                  old_port0 = tcp0->ports.src;
-                  tcp0->ports.src = new_port0;
-
-                  sum0 = tcp0->checksum;
-                  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                         ip4_header_t,
-                                         dst_address /* changed member */);
-                  sum0 = ip_csum_update (sum0, old_port0, new_port0,
-                                         ip4_header_t /* cheat */,
-                                         length /* changed member */);
-                  tcp0->checksum = ip_csum_fold(sum0);
-                }
-              else
-                {
-                  old_port0 = udp0->src_port;
-                  udp0->src_port = new_port0;
-                  udp0->checksum = 0;
-                }
-            }
-          else
-            {
-              if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
-                {
-                  sum0 = tcp0->checksum;
-                  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                         ip4_header_t,
-                                         dst_address /* changed member */);
-                  tcp0->checksum = ip_csum_fold(sum0);
-                }
-            }
-
-          /* Hairpinning */
-          snat_hairpinning (sm, b0, ip0, udp0, tcp0, proto0);
-
-        trace0:
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-            {
-              snat_in2out_trace_t *t =
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->sw_if_index = sw_if_index0;
-              t->next_index = next0;
-            }
-
-          pkts_processed += next0 != SNAT_IN2OUT_NEXT_DROP;
-
-          /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, stats_node_index,
-                               SNAT_IN2OUT_ERROR_IN2OUT_PACKETS,
-                               pkts_processed);
-  return frame->n_vectors;
-}
-
-
-VLIB_REGISTER_NODE (snat_in2out_fast_node) = {
-  .function = snat_in2out_fast_static_map_fn,
-  .name = "snat-in2out-fast",
-  .vector_size = sizeof (u32),
-  .format_trace = format_snat_in2out_fast_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_errors = ARRAY_LEN(snat_in2out_error_strings),
-  .error_strings = snat_in2out_error_strings,
-
-  .runtime_data_bytes = sizeof (snat_runtime_t),
-  
-  .n_next_nodes = SNAT_IN2OUT_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [SNAT_IN2OUT_NEXT_DROP] = "error-drop",
-    [SNAT_IN2OUT_NEXT_LOOKUP] = "ip4-lookup",
-    [SNAT_IN2OUT_NEXT_SLOW_PATH] = "snat-in2out-slowpath",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_fast_node, snat_in2out_fast_static_map_fn);
diff --git a/plugins/snat-plugin/snat/jvpp/io/fd/vpp/jvpp/snat/test/CallbackApiTest.java b/plugins/snat-plugin/snat/jvpp/io/fd/vpp/jvpp/snat/test/CallbackApiTest.java
deleted file mode 100644
index 32165d96..00000000
--- a/plugins/snat-plugin/snat/jvpp/io/fd/vpp/jvpp/snat/test/CallbackApiTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.snat.test;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.snat.JVppSnatImpl;
-import io.fd.vpp.jvpp.snat.callback.SnatInterfaceAddDelFeatureCallback;
-import io.fd.vpp.jvpp.snat.dto.SnatInterfaceAddDelFeature;
-import io.fd.vpp.jvpp.snat.dto.SnatInterfaceAddDelFeatureReply;
-
-public class CallbackApiTest {
-
-    static class TestCallback implements SnatInterfaceAddDelFeatureCallback {
-
-        @Override
-        public void onSnatInterfaceAddDelFeatureReply(final SnatInterfaceAddDelFeatureReply msg) {
-            System.out.printf("Received SnatInterfaceAddDelFeatureReply: context=%d%n",
-                msg.context);
-        }
-
-        @Override
-        public void onError(VppCallbackException ex) {
-            System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n", ex.getMethodName(),
-                ex.getCtxId(), ex.getErrorCode());
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        testCallbackApi();
-    }
-
-    private static void testCallbackApi() throws Exception {
-        System.out.println("Testing Java callback API for snat plugin");
-        try (final JVppRegistry registry = new JVppRegistryImpl("SnatCallbackApiTest");
-             final JVpp jvpp = new JVppSnatImpl()) {
-            registry.register(jvpp, new TestCallback());
-
-            System.out.println("Sending SnatInterfaceAddDelFeature request...");
-            SnatInterfaceAddDelFeature request = new SnatInterfaceAddDelFeature();
-            request.isAdd = 1;
-            request.isInside = 1;
-            request.swIfIndex = 1;
-            final int result = jvpp.send(request);
-            System.out.printf("SnatInterfaceAddDelFeature send result = %d%n", result);
-
-            Thread.sleep(1000);
-
-            System.out.println("Disconnecting...");
-        }
-    }
-}
diff --git a/plugins/snat-plugin/snat/jvpp/io/fd/vpp/jvpp/snat/test/Readme.txt b/plugins/snat-plugin/snat/jvpp/io/fd/vpp/jvpp/snat/test/Readme.txt
deleted file mode 100644
index a2b0c41f..00000000
--- a/plugins/snat-plugin/snat/jvpp/io/fd/vpp/jvpp/snat/test/Readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-17.01.jar:build-vpp-native/plugins/snat-plugin/jvpp-snat-1.0.jar io.fd.vpp.jvpp.snat.test.CallbackApiTest
diff --git a/plugins/snat-plugin/snat/jvpp_snat.c b/plugins/snat-plugin/snat/jvpp_snat.c
deleted file mode 100644
index fd72ddb1..00000000
--- a/plugins/snat-plugin/snat/jvpp_snat.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-
-#include <snat/snat_msg_enum.h>
-#define vl_typedefs             /* define message structures */
-#include <snat/snat_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun
-#include <snat/snat_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <snat/snat_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <snat/snat_all_api_h.h>
-#undef vl_api_version
-
-#include <vnet/api_errno.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-
-#if VPPJNI_DEBUG == 1
-  #define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
-#else
-  #define DEBUG_LOG(...)
-#endif
-
-#include <jvpp-common/jvpp_common.h>
-
-#include "snat/jvpp/io_fd_vpp_jvpp_snat_JVppSnatImpl.h"
-#include "jvpp_snat.h"
-#include "snat/jvpp/jvpp_snat_gen.h"
-
-/*
- * Class:     io_fd_vpp_jvpp_snat_JVppsnatImpl
- * Method:    init0
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_snat_JVppSnatImpl_init0
-  (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
-  snat_main_t * plugin_main = &snat_main;
-  u8 * name;
-  clib_warning ("Java_io_fd_vpp_jvpp_snat_JVppSnatImpl_init0");
-
-  plugin_main->my_client_index = my_client_index;
-  plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
-
-  name = format (0, "snat_%08x%c", api_version, 0);
-  plugin_main->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (plugin_main->msg_id_base == (u16) ~0) {
-    jclass exClass = (*env)->FindClass(env, "java/lang/IllegalStateException");
-    (*env)->ThrowNew(env, exClass, "snat plugin is not loaded in VPP");
-  } else {
-    plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
-    plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
-
-    #define _(N,n)                                  \
-        vl_msg_api_set_handlers(VL_API_##N + plugin_main->msg_id_base, #n,     \
-                vl_api_##n##_t_handler,             \
-                vl_noop_handler,                    \
-                vl_api_##n##_t_endian,              \
-                vl_api_##n##_t_print,               \
-                sizeof(vl_api_##n##_t), 1);
-        foreach_api_reply_handler;
-    #undef _
-  }
-}
-
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_snat_JVppSnatImpl_close0
-(JNIEnv *env, jclass clazz) {
-  snat_main_t * plugin_main = &snat_main;
-
-    // cleanup:
-    (*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
-    (*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
-
-    plugin_main->callbackClass = NULL;
-    plugin_main->callbackObject = NULL;
-}
-
-/* Attach thread to JVM and cache class references when initiating JVPP SNAT */
-jint JNI_OnLoad(JavaVM *vm, void *reserved) {
-    JNIEnv* env;
-
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return JNI_EVERSION;
-    }
-
-    if (cache_class_references(env) != 0) {
-        clib_warning ("Failed to cache class references\n");
-        return JNI_ERR;
-    }
-
-    return JNI_VERSION_1_8;
-}
-
-/* Clean up cached references when disposing JVPP SNAT */
-void JNI_OnUnload(JavaVM *vm, void *reserved) {
-    JNIEnv* env;
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return;
-    }
-    delete_class_references(env);
-}
diff --git a/plugins/snat-plugin/snat/jvpp_snat.h b/plugins/snat-plugin/snat/jvpp_snat.h
deleted file mode 100644
index 6426bda8..00000000
--- a/plugins/snat-plugin/snat/jvpp_snat.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_jvpp_snat_h__
-#define __included_jvpp_snat_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/api_errno.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <jni.h>
-
-/* Global state for JVPP-SNAT */
-typedef struct {
-    /* Base message index for the nsh plugin */
-    u16 msg_id_base;
-
-    /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
-
-    /* VPP api client index */
-    u32 my_client_index;
-
-    /* Callback object and class references enabling asynchronous Java calls */
-    jobject callbackObject;
-    jclass callbackClass;
-
-} snat_main_t;
-
-snat_main_t snat_main __attribute__((aligned (64)));
-
-
-#endif /* __included_jvpp_snat_h__ */
diff --git a/plugins/snat-plugin/snat/out2in.c b/plugins/snat-plugin/snat/out2in.c
deleted file mode 100644
index f1f4159c..00000000
--- a/plugins/snat-plugin/snat/out2in.c
+++ /dev/null
@@ -1,1261 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlib/vlib.h>
-#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/handoff.h>
-
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/fib/ip4_fib.h>
-#include <snat/snat.h>
-
-#include <vppinfra/hash.h>
-#include <vppinfra/error.h>
-#include <vppinfra/elog.h>
-
-typedef struct {
-  u32 sw_if_index;
-  u32 next_index;
-  u32 session_index;
-} snat_out2in_trace_t;
-
-typedef struct {
-  u32 next_worker_index;
-  u8 do_handoff;
-} snat_out2in_worker_handoff_trace_t;
-
-/* packet trace format function */
-static u8 * format_snat_out2in_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  snat_out2in_trace_t * t = va_arg (*args, snat_out2in_trace_t *);
-  
-  s = format (s, "SNAT_OUT2IN: sw_if_index %d, next index %d, session index %d",
-              t->sw_if_index, t->next_index, t->session_index);
-  return s;
-}
-
-static u8 * format_snat_out2in_fast_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  snat_out2in_trace_t * t = va_arg (*args, snat_out2in_trace_t *);
-  
-  s = format (s, "SNAT_OUT2IN_FAST: sw_if_index %d, next index %d",
-              t->sw_if_index, t->next_index);
-  return s;
-}
-
-static u8 * format_snat_out2in_worker_handoff_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  snat_out2in_worker_handoff_trace_t * t =
-    va_arg (*args, snat_out2in_worker_handoff_trace_t *);
-  char * m;
-
-  m = t->do_handoff ? "next worker" : "same worker";
-  s = format (s, "SNAT_OUT2IN_WORKER_HANDOFF: %s %d", m, t->next_worker_index);
-
-  return s;
-}
-
-vlib_node_registration_t snat_out2in_node;
-vlib_node_registration_t snat_out2in_fast_node;
-vlib_node_registration_t snat_out2in_worker_handoff_node;
-
-#define foreach_snat_out2in_error                       \
-_(UNSUPPORTED_PROTOCOL, "Unsupported protocol")         \
-_(OUT2IN_PACKETS, "Good out2in packets processed")      \
-_(BAD_ICMP_TYPE, "icmp type not echo-reply")            \
-_(NO_TRANSLATION, "No translation")
-  
-typedef enum {
-#define _(sym,str) SNAT_OUT2IN_ERROR_##sym,
-  foreach_snat_out2in_error
-#undef _
-  SNAT_OUT2IN_N_ERROR,
-} snat_out2in_error_t;
-
-static char * snat_out2in_error_strings[] = {
-#define _(sym,string) string,
-  foreach_snat_out2in_error
-#undef _
-};
-
-typedef enum {
-  SNAT_OUT2IN_NEXT_DROP,
-  SNAT_OUT2IN_NEXT_LOOKUP,
-  SNAT_OUT2IN_N_NEXT,
-} snat_out2in_next_t;
-
-/**
- * @brief Create session for static mapping.
- *
- * Create NAT session initiated by host from external network with static
- * mapping.
- *
- * @param sm     SNAT main.
- * @param b0     Vlib buffer.
- * @param in2out In2out SNAT session key.
- * @param out2in Out2in SNAT session key.
- * @param node   Vlib node.
- *
- * @returns SNAT session if successfully created otherwise 0.
- */
-static inline snat_session_t *
-create_session_for_static_mapping (snat_main_t *sm,
-                                   vlib_buffer_t *b0,
-                                   snat_session_key_t in2out,
-                                   snat_session_key_t out2in,
-                                   vlib_node_runtime_t * node,
-                                   u32 cpu_index)
-{
-  snat_user_t *u;
-  snat_user_key_t user_key;
-  snat_session_t *s;
-  clib_bihash_kv_8_8_t kv0, value0;
-  dlist_elt_t * per_user_translation_list_elt;
-  dlist_elt_t * per_user_list_head_elt;
-
-  user_key.addr = in2out.addr;
-  user_key.fib_index = in2out.fib_index;
-  kv0.key = user_key.as_u64;
-
-  /* Ever heard of the "user" = inside ip4 address before? */
-  if (clib_bihash_search_8_8 (&sm->user_hash, &kv0, &value0))
-    {
-      /* no, make a new one */
-      pool_get (sm->per_thread_data[cpu_index].users, u);
-      memset (u, 0, sizeof (*u));
-      u->addr = in2out.addr;
-
-      pool_get (sm->per_thread_data[cpu_index].list_pool,
-                per_user_list_head_elt);
-
-      u->sessions_per_user_list_head_index = per_user_list_head_elt -
-        sm->per_thread_data[cpu_index].list_pool;
-
-      clib_dlist_init (sm->per_thread_data[cpu_index].list_pool,
-                       u->sessions_per_user_list_head_index);
-
-      kv0.value = u - sm->per_thread_data[cpu_index].users;
-
-      /* add user */
-      clib_bihash_add_del_8_8 (&sm->user_hash, &kv0, 1 /* is_add */);
-
-      /* add non-traslated packets worker lookup */
-      kv0.value = cpu_index;
-      clib_bihash_add_del_8_8 (&sm->worker_by_in, &kv0, 1);
-    }
-  else
-    {
-      u = pool_elt_at_index (sm->per_thread_data[cpu_index].users,
-                             value0.value);
-    }
-
-  pool_get (sm->per_thread_data[cpu_index].sessions, s);
-  memset (s, 0, sizeof (*s));
-
-  s->outside_address_index = ~0;
-  s->flags |= SNAT_SESSION_FLAG_STATIC_MAPPING;
-  u->nstaticsessions++;
-
-  /* Create list elts */
-  pool_get (sm->per_thread_data[cpu_index].list_pool,
-            per_user_translation_list_elt);
-  clib_dlist_init (sm->per_thread_data[cpu_index].list_pool,
-                   per_user_translation_list_elt -
-                   sm->per_thread_data[cpu_index].list_pool);
-
-  per_user_translation_list_elt->value =
-    s - sm->per_thread_data[cpu_index].sessions;
-  s->per_user_index =
-    per_user_translation_list_elt - sm->per_thread_data[cpu_index].list_pool;
-  s->per_user_list_head_index = u->sessions_per_user_list_head_index;
-
-  clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
-                      s->per_user_list_head_index,
-                      per_user_translation_list_elt -
-                      sm->per_thread_data[cpu_index].list_pool);
-
-  s->in2out = in2out;
-  s->out2in = out2in;
-  s->in2out.protocol = out2in.protocol;
-
-  /* Add to translation hashes */
-  kv0.key = s->in2out.as_u64;
-  kv0.value = s - sm->per_thread_data[cpu_index].sessions;
-  if (clib_bihash_add_del_8_8 (&sm->in2out, &kv0, 1 /* is_add */))
-      clib_warning ("in2out key add failed");
-
-  kv0.key = s->out2in.as_u64;
-  kv0.value = s - sm->per_thread_data[cpu_index].sessions;
-
-  if (clib_bihash_add_del_8_8 (&sm->out2in, &kv0, 1 /* is_add */))
-      clib_warning ("out2in key add failed");
-
-  return s;
-}
-
-static inline u32 icmp_out2in_slow_path (snat_main_t *sm,
-                                         vlib_buffer_t * b0,
-                                         ip4_header_t * ip0,
-                                         icmp46_header_t * icmp0,
-                                         u32 sw_if_index0,
-                                         u32 rx_fib_index0,
-                                         vlib_node_runtime_t * node,
-                                         u32 next0, f64 now,
-                                         u32 cpu_index)
-{
-  snat_session_key_t key0, sm0;
-  icmp_echo_header_t *echo0;
-  clib_bihash_kv_8_8_t kv0, value0;
-  snat_session_t * s0;
-  u32 new_addr0, old_addr0;
-  u16 old_id0, new_id0;
-  ip_csum_t sum0;
-  snat_runtime_t * rt = (snat_runtime_t *)node->runtime_data;
-
-  echo0 = (icmp_echo_header_t *)(icmp0+1);
-
-  key0.addr = ip0->dst_address;
-  key0.port = echo0->identifier;
-  key0.protocol = SNAT_PROTOCOL_ICMP;
-  key0.fib_index = rx_fib_index0;
-  
-  kv0.key = key0.as_u64;
-  
-  if (clib_bihash_search_8_8 (&sm->out2in, &kv0, &value0))
-    {
-      /* Try to match static mapping by external address and port,
-         destination address and port in packet */
-      if (snat_static_mapping_match(sm, key0, &sm0, 1))
-        {
-           ip4_address_t * first_int_addr;
-
-          if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index0))
-            {
-              first_int_addr = 
-                ip4_interface_first_address (sm->ip4_main, sw_if_index0,
-                                             0 /* just want the address */);
-              rt->cached_sw_if_index = sw_if_index0;
-              rt->cached_ip4_address = first_int_addr->as_u32;
-            }
-          
-          /* Don't NAT packet aimed at the intfc address */
-          if (PREDICT_FALSE(ip0->dst_address.as_u32 ==
-                            rt->cached_ip4_address))
-            return next0;
-
-          b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
-          return SNAT_OUT2IN_NEXT_DROP;
-        }
-
-      /* Create session initiated by host from external network */
-      s0 = create_session_for_static_mapping(sm, b0, sm0, key0,
-                                             node, cpu_index);
-      if (!s0)
-        return SNAT_OUT2IN_NEXT_DROP;
-    }
-  else
-    s0 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
-                            value0.value);
-
-  old_addr0 = ip0->dst_address.as_u32;
-  ip0->dst_address = s0->in2out.addr;
-  new_addr0 = ip0->dst_address.as_u32;
-  vnet_buffer(b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
-  
-  sum0 = ip0->checksum;
-  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                         ip4_header_t,
-                         dst_address /* changed member */);
-  ip0->checksum = ip_csum_fold (sum0);
-  
-  old_id0 = echo0->identifier;
-  new_id0 = s0->in2out.port;
-  echo0->identifier = new_id0;
-
-  sum0 = icmp0->checksum;
-  sum0 = ip_csum_update (sum0, old_id0, new_id0, icmp_echo_header_t,
-                         identifier);
-  icmp0->checksum = ip_csum_fold (sum0);
-
-  /* Accounting */
-  s0->last_heard = now;
-  s0->total_pkts++;
-  s0->total_bytes += vlib_buffer_length_in_chain (sm->vlib_main, b0);
-  /* Per-user LRU list maintenance for dynamic translation */
-  if (!snat_is_session_static (s0))
-    {
-      clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
-                         s0->per_user_index);
-      clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
-                          s0->per_user_list_head_index,
-                          s0->per_user_index);
-    }
-
-  return next0;
-}
-
-static uword
-snat_out2in_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * frame)
-{
-  u32 n_left_from, * from, * to_next;
-  snat_out2in_next_t next_index;
-  u32 pkts_processed = 0;
-  snat_main_t * sm = &snat_main;
-  f64 now = vlib_time_now (vm);
-  u32 cpu_index = os_get_cpu_number ();
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from >= 4 && n_left_to_next >= 2)
-	{
-          u32 bi0, bi1;
-	  vlib_buffer_t * b0, * b1;
-          u32 next0 = SNAT_OUT2IN_NEXT_LOOKUP;
-          u32 next1 = SNAT_OUT2IN_NEXT_LOOKUP;
-          u32 sw_if_index0, sw_if_index1;
-          ip4_header_t * ip0, *ip1;
-          ip_csum_t sum0, sum1;
-          u32 new_addr0, old_addr0;
-          u16 new_port0, old_port0;
-          u32 new_addr1, old_addr1;
-          u16 new_port1, old_port1;
-          udp_header_t * udp0, * udp1;
-          tcp_header_t * tcp0, * tcp1;
-          icmp46_header_t * icmp0, * icmp1;
-          snat_session_key_t key0, key1, sm0, sm1;
-          u32 rx_fib_index0, rx_fib_index1;
-          u32 proto0, proto1;
-          snat_session_t * s0 = 0, * s1 = 0;
-          clib_bihash_kv_8_8_t kv0, kv1, value0, value1;
-          
-	  /* Prefetch next iteration. */
-	  {
-	    vlib_buffer_t * p2, * p3;
-            
-	    p2 = vlib_get_buffer (vm, from[2]);
-	    p3 = vlib_get_buffer (vm, from[3]);
-            
-	    vlib_prefetch_buffer_header (p2, LOAD);
-	    vlib_prefetch_buffer_header (p3, LOAD);
-
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
-	  }
-
-          /* speculatively enqueue b0 and b1 to the current next frame */
-	  to_next[0] = bi0 = from[0];
-	  to_next[1] = bi1 = from[1];
-	  from += 2;
-	  to_next += 2;
-	  n_left_from -= 2;
-	  n_left_to_next -= 2;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-            
-          ip0 = vlib_buffer_get_current (b0);
-          udp0 = ip4_next_header (ip0);
-          tcp0 = (tcp_header_t *) udp0;
-          icmp0 = (icmp46_header_t *) udp0;
-
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-	  rx_fib_index0 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index, 
-                                   sw_if_index0);
-
-          proto0 = ~0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_UDP) 
-            ? SNAT_PROTOCOL_UDP : proto0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_TCP) 
-            ? SNAT_PROTOCOL_TCP : proto0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_ICMP) 
-            ? SNAT_PROTOCOL_ICMP : proto0;
-
-          if (PREDICT_FALSE (proto0 == ~0))
-              goto trace0;
-
-          if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
-            {
-              next0 = icmp_out2in_slow_path 
-                (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node, 
-                 next0, now, cpu_index);
-              goto trace0;
-            }
-
-          key0.addr = ip0->dst_address;
-          key0.port = udp0->dst_port;
-          key0.protocol = proto0;
-          key0.fib_index = rx_fib_index0;
-          
-          kv0.key = key0.as_u64;
-
-          if (clib_bihash_search_8_8 (&sm->out2in, &kv0, &value0))
-            {
-              /* Try to match static mapping by external address and port,
-                 destination address and port in packet */
-              if (snat_static_mapping_match(sm, key0, &sm0, 1))
-                {
-                  b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
-                  goto trace0;
-                }
-
-              /* Create session initiated by host from external network */
-              s0 = create_session_for_static_mapping(sm, b0, sm0, key0, node,
-                                                     cpu_index);
-              if (!s0)
-                goto trace0;
-            }
-          else
-            s0 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
-                                    value0.value);
-
-          old_addr0 = ip0->dst_address.as_u32;
-          ip0->dst_address = s0->in2out.addr;
-          new_addr0 = ip0->dst_address.as_u32;
-          vnet_buffer(b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
-
-          sum0 = ip0->checksum;
-          sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                 ip4_header_t,
-                                 dst_address /* changed member */);
-          ip0->checksum = ip_csum_fold (sum0);
-
-          if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
-            {
-              old_port0 = tcp0->ports.dst;
-              tcp0->ports.dst = s0->in2out.port;
-              new_port0 = tcp0->ports.dst;
-
-              sum0 = tcp0->checksum;
-              sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                     ip4_header_t,
-                                     dst_address /* changed member */);
-
-              sum0 = ip_csum_update (sum0, old_port0, new_port0,
-                                     ip4_header_t /* cheat */,
-                                     length /* changed member */);
-              tcp0->checksum = ip_csum_fold(sum0);
-            }
-          else
-            {
-              old_port0 = udp0->dst_port;
-              udp0->dst_port = s0->in2out.port;
-              udp0->checksum = 0;
-            }
-
-          /* Accounting */
-          s0->last_heard = now;
-          s0->total_pkts++;
-          s0->total_bytes += vlib_buffer_length_in_chain (vm, b0);
-          /* Per-user LRU list maintenance for dynamic translation */
-          if (!snat_is_session_static (s0))
-            {
-              clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
-                                 s0->per_user_index);
-              clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
-                                  s0->per_user_list_head_index,
-                                  s0->per_user_index);
-            }
-        trace0:
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              snat_out2in_trace_t *t = 
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->sw_if_index = sw_if_index0;
-              t->next_index = next0;
-              t->session_index = ~0;
-              if (s0)
-                t->session_index = s0 - sm->per_thread_data[cpu_index].sessions;
-            }
-
-          pkts_processed += next0 != SNAT_OUT2IN_NEXT_DROP;
-
-
-          ip1 = vlib_buffer_get_current (b1);
-          udp1 = ip4_next_header (ip1);
-          tcp1 = (tcp_header_t *) udp1;
-          icmp1 = (icmp46_header_t *) udp1;
-
-          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
-	  rx_fib_index1 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index, 
-                                   sw_if_index1);
-
-          proto1 = ~0;
-          proto1 = (ip1->protocol == IP_PROTOCOL_UDP) 
-            ? SNAT_PROTOCOL_UDP : proto1;
-          proto1 = (ip1->protocol == IP_PROTOCOL_TCP) 
-            ? SNAT_PROTOCOL_TCP : proto1;
-          proto1 = (ip1->protocol == IP_PROTOCOL_ICMP) 
-            ? SNAT_PROTOCOL_ICMP : proto1;
-
-          if (PREDICT_FALSE (proto1 == ~0))
-              goto trace1;
-
-          if (PREDICT_FALSE (proto1 == SNAT_PROTOCOL_ICMP))
-            {
-              next1 = icmp_out2in_slow_path 
-                (sm, b1, ip1, icmp1, sw_if_index1, rx_fib_index1, node, 
-                 next1, now, cpu_index);
-              goto trace1;
-            }
-
-          key1.addr = ip1->dst_address;
-          key1.port = udp1->dst_port;
-          key1.protocol = proto1;
-          key1.fib_index = rx_fib_index1;
-          
-          kv1.key = key1.as_u64;
-
-          if (clib_bihash_search_8_8 (&sm->out2in, &kv1, &value1))
-            {
-              /* Try to match static mapping by external address and port,
-                 destination address and port in packet */
-              if (snat_static_mapping_match(sm, key1, &sm1, 1))
-                {
-                  b1->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
-                  goto trace1;
-                }
-
-              /* Create session initiated by host from external network */
-              s1 = create_session_for_static_mapping(sm, b1, sm1, key1, node,
-                                                     cpu_index);
-              if (!s1)
-                goto trace1;
-            }
-          else
-            s1 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
-                                    value1.value);
-
-          old_addr1 = ip1->dst_address.as_u32;
-          ip1->dst_address = s1->in2out.addr;
-          new_addr1 = ip1->dst_address.as_u32;
-          vnet_buffer(b1)->sw_if_index[VLIB_TX] = s1->in2out.fib_index;
-
-          sum1 = ip1->checksum;
-          sum1 = ip_csum_update (sum1, old_addr1, new_addr1,
-                                 ip4_header_t,
-                                 dst_address /* changed member */);
-          ip1->checksum = ip_csum_fold (sum1);
-
-          if (PREDICT_TRUE(proto1 == SNAT_PROTOCOL_TCP))
-            {
-              old_port1 = tcp1->ports.dst;
-              tcp1->ports.dst = s1->in2out.port;
-              new_port1 = tcp1->ports.dst;
-
-              sum1 = tcp1->checksum;
-              sum1 = ip_csum_update (sum1, old_addr1, new_addr1,
-                                     ip4_header_t,
-                                     dst_address /* changed member */);
-
-              sum1 = ip_csum_update (sum1, old_port1, new_port1,
-                                     ip4_header_t /* cheat */,
-                                     length /* changed member */);
-              tcp1->checksum = ip_csum_fold(sum1);
-            }
-          else
-            {
-              old_port1 = udp1->dst_port;
-              udp1->dst_port = s1->in2out.port;
-              udp1->checksum = 0;
-            }
-
-          /* Accounting */
-          s1->last_heard = now;
-          s1->total_pkts++;
-          s1->total_bytes += vlib_buffer_length_in_chain (vm, b1);
-          /* Per-user LRU list maintenance for dynamic translation */
-          if (!snat_is_session_static (s1))
-            {
-              clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
-                                 s1->per_user_index);
-              clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
-                                  s1->per_user_list_head_index,
-                                  s1->per_user_index);
-            }
-        trace1:
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b1->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              snat_out2in_trace_t *t = 
-                 vlib_add_trace (vm, node, b1, sizeof (*t));
-              t->sw_if_index = sw_if_index1;
-              t->next_index = next1;
-              t->session_index = ~0;
-              if (s1)
-                t->session_index = s1 - sm->per_thread_data[cpu_index].sessions;
-            }
-
-          pkts_processed += next1 != SNAT_OUT2IN_NEXT_DROP;
-
-          /* verify speculative enqueues, maybe switch current next frame */
-          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-                                           to_next, n_left_to_next,
-                                           bi0, bi1, next0, next1);
-        }
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-          u32 bi0;
-	  vlib_buffer_t * b0;
-          u32 next0 = SNAT_OUT2IN_NEXT_LOOKUP;
-          u32 sw_if_index0;
-          ip4_header_t * ip0;
-          ip_csum_t sum0;
-          u32 new_addr0, old_addr0;
-          u16 new_port0, old_port0;
-          udp_header_t * udp0;
-          tcp_header_t * tcp0;
-          icmp46_header_t * icmp0;
-          snat_session_key_t key0, sm0;
-          u32 rx_fib_index0;
-          u32 proto0;
-          snat_session_t * s0 = 0;
-          clib_bihash_kv_8_8_t kv0, value0;
-          
-          /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-          ip0 = vlib_buffer_get_current (b0);
-          udp0 = ip4_next_header (ip0);
-          tcp0 = (tcp_header_t *) udp0;
-          icmp0 = (icmp46_header_t *) udp0;
-
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-	  rx_fib_index0 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index, 
-                                   sw_if_index0);
-
-          proto0 = ~0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_UDP) 
-            ? SNAT_PROTOCOL_UDP : proto0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_TCP) 
-            ? SNAT_PROTOCOL_TCP : proto0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_ICMP) 
-            ? SNAT_PROTOCOL_ICMP : proto0;
-
-          if (PREDICT_FALSE (proto0 == ~0))
-              goto trace00;
-
-          if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
-            {
-              next0 = icmp_out2in_slow_path 
-                (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node, 
-                 next0, now, cpu_index);
-              goto trace00;
-            }
-
-          key0.addr = ip0->dst_address;
-          key0.port = udp0->dst_port;
-          key0.protocol = proto0;
-          key0.fib_index = rx_fib_index0;
-          
-          kv0.key = key0.as_u64;
-
-          if (clib_bihash_search_8_8 (&sm->out2in, &kv0, &value0))
-            {
-              /* Try to match static mapping by external address and port,
-                 destination address and port in packet */
-              if (snat_static_mapping_match(sm, key0, &sm0, 1))
-                {
-                  b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
-                  goto trace00;
-                }
-
-              /* Create session initiated by host from external network */
-              s0 = create_session_for_static_mapping(sm, b0, sm0, key0, node,
-                                                     cpu_index);
-              if (!s0)
-                goto trace00;
-            }
-          else
-            s0 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
-                                    value0.value);
-
-          old_addr0 = ip0->dst_address.as_u32;
-          ip0->dst_address = s0->in2out.addr;
-          new_addr0 = ip0->dst_address.as_u32;
-          vnet_buffer(b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
-
-          sum0 = ip0->checksum;
-          sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                 ip4_header_t,
-                                 dst_address /* changed member */);
-          ip0->checksum = ip_csum_fold (sum0);
-
-          if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
-            {
-              old_port0 = tcp0->ports.dst;
-              tcp0->ports.dst = s0->in2out.port;
-              new_port0 = tcp0->ports.dst;
-
-              sum0 = tcp0->checksum;
-              sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                     ip4_header_t,
-                                     dst_address /* changed member */);
-
-              sum0 = ip_csum_update (sum0, old_port0, new_port0,
-                                     ip4_header_t /* cheat */,
-                                     length /* changed member */);
-              tcp0->checksum = ip_csum_fold(sum0);
-            }
-          else
-            {
-              old_port0 = udp0->dst_port;
-              udp0->dst_port = s0->in2out.port;
-              udp0->checksum = 0;
-            }
-
-          /* Accounting */
-          s0->last_heard = now;
-          s0->total_pkts++;
-          s0->total_bytes += vlib_buffer_length_in_chain (vm, b0);
-          /* Per-user LRU list maintenance for dynamic translation */
-          if (!snat_is_session_static (s0))
-            {
-              clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
-                                 s0->per_user_index);
-              clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
-                                  s0->per_user_list_head_index,
-                                  s0->per_user_index);
-            }
-        trace00:
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              snat_out2in_trace_t *t = 
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->sw_if_index = sw_if_index0;
-              t->next_index = next0;
-              t->session_index = ~0;
-              if (s0)
-                t->session_index = s0 - sm->per_thread_data[cpu_index].sessions;
-            }
-
-          pkts_processed += next0 != SNAT_OUT2IN_NEXT_DROP;
-
-          /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, snat_out2in_node.index, 
-                               SNAT_OUT2IN_ERROR_OUT2IN_PACKETS, 
-                               pkts_processed);
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (snat_out2in_node) = {
-  .function = snat_out2in_node_fn,
-  .name = "snat-out2in",
-  .vector_size = sizeof (u32),
-  .format_trace = format_snat_out2in_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_errors = ARRAY_LEN(snat_out2in_error_strings),
-  .error_strings = snat_out2in_error_strings,
-
-  .runtime_data_bytes = sizeof (snat_runtime_t),
-  
-  .n_next_nodes = SNAT_OUT2IN_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [SNAT_OUT2IN_NEXT_DROP] = "error-drop",
-    [SNAT_OUT2IN_NEXT_LOOKUP] = "ip4-lookup",
-  },
-};
-VLIB_NODE_FUNCTION_MULTIARCH (snat_out2in_node, snat_out2in_node_fn);
-
-static uword
-snat_out2in_worker_handoff_fn (vlib_main_t * vm,
-                               vlib_node_runtime_t * node,
-                               vlib_frame_t * frame)
-{
-  snat_main_t *sm = &snat_main;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  u32 n_left_from, *from, *to_next = 0;
-  static __thread vlib_frame_queue_elt_t **handoff_queue_elt_by_worker_index;
-  static __thread vlib_frame_queue_t **congested_handoff_queue_by_worker_index
-    = 0;
-  vlib_frame_queue_elt_t *hf = 0;
-  vlib_frame_t *f = 0;
-  int i;
-  u32 n_left_to_next_worker = 0, *to_next_worker = 0;
-  u32 next_worker_index = 0;
-  u32 current_worker_index = ~0;
-  u32 cpu_index = os_get_cpu_number ();
-
-  ASSERT (vec_len (sm->workers));
-
-  if (PREDICT_FALSE (handoff_queue_elt_by_worker_index == 0))
-    {
-      vec_validate (handoff_queue_elt_by_worker_index, tm->n_vlib_mains - 1);
-
-      vec_validate_init_empty (congested_handoff_queue_by_worker_index,
-			       sm->first_worker_index + sm->num_workers - 1,
-			       (vlib_frame_queue_t *) (~0));
-    }
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-
-  while (n_left_from > 0)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      u32 sw_if_index0;
-      u32 rx_fib_index0;
-      ip4_header_t * ip0;
-      udp_header_t * udp0;
-      snat_static_mapping_key_t key0;
-      clib_bihash_kv_8_8_t kv0, value0;
-      u8 do_handoff;
-
-      bi0 = from[0];
-      from += 1;
-      n_left_from -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      rx_fib_index0 = ip4_fib_table_get_index_for_sw_if_index(sw_if_index0);
-
-      ip0 = vlib_buffer_get_current (b0);
-      udp0 = ip4_next_header (ip0);
-
-      key0.addr = ip0->dst_address;
-      key0.port = udp0->dst_port;
-      key0.fib_index = rx_fib_index0;
-
-      kv0.key = key0.as_u64;
-
-      /* Ever heard of of the "user" before? */
-      if (clib_bihash_search_8_8 (&sm->worker_by_out, &kv0, &value0))
-        {
-          key0.port = 0;
-          kv0.key = key0.as_u64;
-
-          if (clib_bihash_search_8_8 (&sm->worker_by_out, &kv0, &value0))
-            {
-              /* No, assign next available worker (RR) */
-              next_worker_index = sm->first_worker_index +
-                sm->workers[sm->next_worker++ % vec_len (sm->workers)];
-            }
-          else
-            {
-              /* Static mapping without port */
-              next_worker_index = value0.value;
-            }
-
-          /* Add to translated packets worker lookup */
-          kv0.value = next_worker_index;
-          clib_bihash_add_del_8_8 (&sm->worker_by_out, &kv0, 1);
-        }
-      else
-        next_worker_index = value0.value;
-
-      if (PREDICT_FALSE (next_worker_index != cpu_index))
-        {
-          do_handoff = 1;
-
-          if (next_worker_index != current_worker_index)
-            {
-              if (hf)
-                hf->n_vectors = VLIB_FRAME_SIZE - n_left_to_next_worker;
-
-              hf = vlib_get_worker_handoff_queue_elt (sm->fq_out2in_index,
-                                                      next_worker_index,
-                                                      handoff_queue_elt_by_worker_index);
-
-              n_left_to_next_worker = VLIB_FRAME_SIZE - hf->n_vectors;
-              to_next_worker = &hf->buffer_index[hf->n_vectors];
-              current_worker_index = next_worker_index;
-            }
-
-          /* enqueue to correct worker thread */
-          to_next_worker[0] = bi0;
-          to_next_worker++;
-          n_left_to_next_worker--;
-
-          if (n_left_to_next_worker == 0)
-            {
-              hf->n_vectors = VLIB_FRAME_SIZE;
-              vlib_put_frame_queue_elt (hf);
-              current_worker_index = ~0;
-              handoff_queue_elt_by_worker_index[next_worker_index] = 0;
-              hf = 0;
-            }
-        }
-      else
-        {
-          do_handoff = 0;
-          /* if this is 1st frame */
-          if (!f)
-            {
-              f = vlib_get_frame_to_node (vm, snat_out2in_node.index);
-              to_next = vlib_frame_vector_args (f);
-            }
-
-          to_next[0] = bi0;
-          to_next += 1;
-          f->n_vectors++;
-        }
-
-      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-			 && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	{
-          snat_out2in_worker_handoff_trace_t *t =
-            vlib_add_trace (vm, node, b0, sizeof (*t));
-          t->next_worker_index = next_worker_index;
-          t->do_handoff = do_handoff;
-        }
-    }
-
-  if (f)
-    vlib_put_frame_to_node (vm, snat_out2in_node.index, f);
-
-  if (hf)
-    hf->n_vectors = VLIB_FRAME_SIZE - n_left_to_next_worker;
-
-  /* Ship frames to the worker nodes */
-  for (i = 0; i < vec_len (handoff_queue_elt_by_worker_index); i++)
-    {
-      if (handoff_queue_elt_by_worker_index[i])
-	{
-	  hf = handoff_queue_elt_by_worker_index[i];
-	  /*
-	   * It works better to let the handoff node
-	   * rate-adapt, always ship the handoff queue element.
-	   */
-	  if (1 || hf->n_vectors == hf->last_n_vectors)
-	    {
-	      vlib_put_frame_queue_elt (hf);
-	      handoff_queue_elt_by_worker_index[i] = 0;
-	    }
-	  else
-	    hf->last_n_vectors = hf->n_vectors;
-	}
-      congested_handoff_queue_by_worker_index[i] =
-	(vlib_frame_queue_t *) (~0);
-    }
-  hf = 0;
-  current_worker_index = ~0;
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (snat_out2in_worker_handoff_node) = {
-  .function = snat_out2in_worker_handoff_fn,
-  .name = "snat-out2in-worker-handoff",
-  .vector_size = sizeof (u32),
-  .format_trace = format_snat_out2in_worker_handoff_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_next_nodes = 1,
-
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (snat_out2in_worker_handoff_node, snat_out2in_worker_handoff_fn);
-
-static inline u32 icmp_out2in_fast (snat_main_t *sm,
-                                    vlib_buffer_t * b0,
-                                    ip4_header_t * ip0,
-                                    icmp46_header_t * icmp0,
-                                    u32 sw_if_index0,
-                                    vlib_node_runtime_t * node,
-                                    u32 next0,
-                                    u32 rx_fib_index0)
-{
-  snat_session_key_t key0, sm0;
-  icmp_echo_header_t *echo0;
-  u32 new_addr0, old_addr0;
-  u16 old_id0, new_id0;
-  ip_csum_t sum0;
-  snat_runtime_t * rt = (snat_runtime_t *)node->runtime_data;
-
-  echo0 = (icmp_echo_header_t *)(icmp0+1);
-
-  key0.addr = ip0->dst_address;
-  key0.port = echo0->identifier;
-  key0.fib_index = rx_fib_index0;
-
-  if (snat_static_mapping_match(sm, key0, &sm0, 1))
-    {
-      ip4_address_t * first_int_addr;
-
-      if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index0))
-        {
-          first_int_addr =
-            ip4_interface_first_address (sm->ip4_main, sw_if_index0,
-                                         0 /* just want the address */);
-          rt->cached_sw_if_index = sw_if_index0;
-          rt->cached_ip4_address = first_int_addr->as_u32;
-        }
-
-      /* Don't NAT packet aimed at the intfc address */
-      if (PREDICT_FALSE(ip0->dst_address.as_u32 ==
-                        rt->cached_ip4_address))
-        return next0;
-
-      b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
-      return SNAT_OUT2IN_NEXT_DROP;
-    }
-
-  new_addr0 = sm0.addr.as_u32;
-  new_id0 = sm0.port;
-  vnet_buffer(b0)->sw_if_index[VLIB_TX] = sm0.fib_index;
-
-  old_addr0 = ip0->dst_address.as_u32;
-  ip0->dst_address.as_u32 = new_addr0;
-
-  sum0 = ip0->checksum;
-  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                         ip4_header_t,
-                         dst_address /* changed member */);
-  ip0->checksum = ip_csum_fold (sum0);
-
-  if (PREDICT_FALSE(new_id0 != echo0->identifier))
-    {
-      old_id0 = echo0->identifier;
-      echo0->identifier = new_id0;
-
-      sum0 = icmp0->checksum;
-      sum0 = ip_csum_update (sum0, old_id0, new_id0, icmp_echo_header_t,
-                             identifier);
-      icmp0->checksum = ip_csum_fold (sum0);
-    }
-
-  return next0;
-}
-
-static uword
-snat_out2in_fast_node_fn (vlib_main_t * vm,
-	        	  vlib_node_runtime_t * node,
-		          vlib_frame_t * frame)
-{
-  u32 n_left_from, * from, * to_next;
-  snat_out2in_next_t next_index;
-  u32 pkts_processed = 0;
-  snat_main_t * sm = &snat_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-          u32 bi0;
-	  vlib_buffer_t * b0;
-          u32 next0 = SNAT_OUT2IN_NEXT_DROP;
-          u32 sw_if_index0;
-          ip4_header_t * ip0;
-          ip_csum_t sum0;
-          u32 new_addr0, old_addr0;
-          u16 new_port0, old_port0;
-          udp_header_t * udp0;
-          tcp_header_t * tcp0;
-          icmp46_header_t * icmp0;
-          snat_session_key_t key0, sm0;
-          u32 proto0;
-          u32 rx_fib_index0;
-
-          /* speculatively enqueue b0 to the current next frame */
-	  bi0 = from[0];
-	  to_next[0] = bi0;
-	  from += 1;
-	  to_next += 1;
-	  n_left_from -= 1;
-	  n_left_to_next -= 1;
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-          ip0 = vlib_buffer_get_current (b0);
-          udp0 = ip4_next_header (ip0);
-          tcp0 = (tcp_header_t *) udp0;
-          icmp0 = (icmp46_header_t *) udp0;
-
-          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-	  rx_fib_index0 = ip4_fib_table_get_index_for_sw_if_index(sw_if_index0);
-
-	  vnet_feature_next (sw_if_index0, &next0, b0);
-
-          proto0 = ~0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_UDP)
-            ? SNAT_PROTOCOL_UDP : proto0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_TCP)
-            ? SNAT_PROTOCOL_TCP : proto0;
-          proto0 = (ip0->protocol == IP_PROTOCOL_ICMP)
-            ? SNAT_PROTOCOL_ICMP : proto0;
-
-          if (PREDICT_FALSE (proto0 == ~0))
-              goto trace00;
-
-          if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
-            {
-              next0 = icmp_out2in_fast
-                (sm, b0, ip0, icmp0, sw_if_index0, node, next0, rx_fib_index0);
-              goto trace00;
-            }
-
-          key0.addr = ip0->dst_address;
-          key0.port = udp0->dst_port;
-          key0.fib_index = rx_fib_index0;
-
-          if (snat_static_mapping_match(sm, key0, &sm0, 1))
-            {
-              b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
-              goto trace00;
-            }
-
-          new_addr0 = sm0.addr.as_u32;
-          new_port0 = sm0.port;
-          vnet_buffer(b0)->sw_if_index[VLIB_TX] = sm0.fib_index;
-          old_addr0 = ip0->dst_address.as_u32;
-          ip0->dst_address.as_u32 = new_addr0;
-
-          sum0 = ip0->checksum;
-          sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                 ip4_header_t,
-                                 dst_address /* changed member */);
-          ip0->checksum = ip_csum_fold (sum0);
-
-          if (PREDICT_FALSE(new_port0 != udp0->dst_port))
-            {
-               if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
-                {
-                  old_port0 = tcp0->ports.dst;
-                  tcp0->ports.dst = new_port0;
-
-                  sum0 = tcp0->checksum;
-                  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                         ip4_header_t,
-                                         dst_address /* changed member */);
-
-                  sum0 = ip_csum_update (sum0, old_port0, new_port0,
-                                         ip4_header_t /* cheat */,
-                                         length /* changed member */);
-                  tcp0->checksum = ip_csum_fold(sum0);
-                }
-              else
-                {
-                  old_port0 = udp0->dst_port;
-                  udp0->dst_port = new_port0;
-                  udp0->checksum = 0;
-                }
-            }
-          else
-            {
-              if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
-                {
-                  sum0 = tcp0->checksum;
-                  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                         ip4_header_t,
-                                         dst_address /* changed member */);
-
-                  tcp0->checksum = ip_csum_fold(sum0);
-                }
-            }
-
-        trace00:
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-            {
-              snat_out2in_trace_t *t =
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->sw_if_index = sw_if_index0;
-              t->next_index = next0;
-            }
-
-          pkts_processed += next0 != SNAT_OUT2IN_NEXT_DROP;
-
-          /* verify speculative enqueue, maybe switch current next frame */
-	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-					   to_next, n_left_to_next,
-					   bi0, next0);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, snat_out2in_fast_node.index,
-                               SNAT_OUT2IN_ERROR_OUT2IN_PACKETS,
-                               pkts_processed);
-  return frame->n_vectors;
-}
-
-VLIB_REGISTER_NODE (snat_out2in_fast_node) = {
-  .function = snat_out2in_fast_node_fn,
-  .name = "snat-out2in-fast",
-  .vector_size = sizeof (u32),
-  .format_trace = format_snat_out2in_fast_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_errors = ARRAY_LEN(snat_out2in_error_strings),
-  .error_strings = snat_out2in_error_strings,
-
-  .runtime_data_bytes = sizeof (snat_runtime_t),
-  
-  .n_next_nodes = SNAT_OUT2IN_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [SNAT_OUT2IN_NEXT_LOOKUP] = "ip4-lookup",
-    [SNAT_OUT2IN_NEXT_DROP] = "error-drop",
-  },
-};
-VLIB_NODE_FUNCTION_MULTIARCH (snat_out2in_fast_node, snat_out2in_fast_node_fn);
diff --git a/plugins/snat-plugin/snat/snat.api b/plugins/snat-plugin/snat/snat.api
deleted file mode 100644
index a191eed5..00000000
--- a/plugins/snat-plugin/snat/snat.api
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * @file snat.api
- * @brief VPP control-plane API messages.
- *
- * This file defines VPP control-plane API messages which are generally
- * called through a shared memory interface.
- */
-
-/** \brief Add/del S-NAT address range
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_ip4 - 1 if address type is IPv4
-    @first_ip_address - first IP address
-    @last_ip_address - last IP address
-    @is_add - 1 if add, 0 if delete
-*/
-define snat_add_address_range {
-  u32 client_index;
-  u32 context;
-  u8 is_ip4;
-  u8 first_ip_address[16];
-  u8 last_ip_address[16];
-  u8 is_add;
-};
-
-/** \brief Add S-NAT address range reply
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param retval - return code
-*/
-define snat_add_address_range_reply {
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Dump S-NAT addresses
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define snat_address_dump {
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief S-NAT address details response
-    @param context - sender context, to match reply w/ request
-    @param is_ip4 - 1 if address type is IPv4
-    @param ip_address - IP address
-*/
-define snat_address_details {
-  u32 context;
-  u8 is_ip4;
-  u8 ip_address[16];
-};
-
-/** \brief Enable/disable S-NAT feature on the interface
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - 1 if add, 0 if delete
-    @param is_inside - 1 if inside, 0 if outside
-    @param sw_if_index - software index of the interface
-*/
-define snat_interface_add_del_feature {
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 is_inside;
-  u32 sw_if_index;
-};
-
-/** \brief Enable/disable S-NAT feature on the interface reply
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param retval - return code
-*/
-define snat_interface_add_del_feature_reply {
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Dump interfaces with S-NAT feature
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define snat_interface_dump {
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief S-NAT interface details response
-    @param context - sender context, to match reply w/ request
-    @param is_inside - 1 if inside, 0 if outside
-    @param sw_if_index - software index of the interface
-*/
-define snat_interface_details {
-  u32 context;
-  u8 is_inside;
-  u32 sw_if_index;
-};
-
-/** \brief Add/delete S-NAT static mapping
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param is_add - 1 if add, 0 if delete
-    @param is_ip4 - 1 if address type is IPv4
-    @param addr_only - 1 if address only mapping
-    @param local_ip_address - local IP address
-    @param external_ip_address - external IP address
-    @param local_port - local port number
-    @param external_port - external port number
-    @param vfr_id - VRF ID
-*/
-define snat_add_static_mapping {
-  u32 client_index;
-  u32 context;
-  u8 is_add;
-  u8 is_ip4;
-  u8 addr_only;
-  u8 local_ip_address[16];
-  u8 external_ip_address[16];
-  u16 local_port;
-  u16 external_port;
-  u32 vrf_id;
-};
-
-/** \brief Add/delete S-NAT static mapping reply
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param retval - return code
-*/
-define snat_add_static_mapping_reply {
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Dump S-NAT static mappings
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define snat_static_mapping_dump {
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief S-NAT static mapping details response
-    @param context - sender context, to match reply w/ request
-    @param is_ip4 - 1 if address type is IPv4
-    @param addr_only - 1 if address only mapping
-    @param local_ip_address - local IP address
-    @param external_ip_address - external IP address
-    @param local_port - local port number
-    @param external_port - external port number
-    @param vfr_id - VRF ID
-*/
-define snat_static_mapping_details {
-  u32 context;
-  u8 is_ip4;
-  u8 addr_only;
-  u8 local_ip_address[16];
-  u8 external_ip_address[16];
-  u16 local_port;
-  u16 external_port;
-  u32 vrf_id;
-};
-
-/** \brief Control ping from client to api server request
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define snat_control_ping
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Control ping from the client to the server response
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-    @param vpe_pid - the pid of the vpe, returned by the server
-*/
-define snat_control_ping_reply
-{
-  u32 context;
-  i32 retval;
-  u32 client_index;
-  u32 vpe_pid;
-};
-
-/** \brief Show S-NAT plugin startup config
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define snat_show_config
-{
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief Show S-NAT plugin startup config reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-    @param static_mapping_only - if 1 dynamic translations disabled
-    @param static_mapping_connection_tracking - if 1 create session data
-    @param translation_buckets - number of translation hash buckets
-    @param translation_memory_size - translation hash memory size
-    @param user_buckets - number of user hash buckets
-    @param user_memory_size - user hash memory size
-    @param max_translations_per_user - maximum number of translations per user
-    @param outside_vrf_id - outside VRF id
-    @param inside_vrf_id - default inside VRF id
-*/
-define snat_show_config_reply
-{
-  u32 context;
-  i32 retval;
-  u8 static_mapping_only;
-  u8 static_mapping_connection_tracking;
-  u32 translation_buckets;
-  u32 translation_memory_size;
-  u32 user_buckets;
-  u32 user_memory_size;
-  u32 max_translations_per_user;
-  u32 outside_vrf_id;
-  u32 inside_vrf_id;
-};
-
-/** \brief Set S-NAT workers
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param worker_mask - S-NAT workers mask
-*/
-define snat_set_workers {
-  u32 client_index;
-  u32 context;
-  u64 worker_mask;
-};
-
-/** \brief Set S-NAT workers reply
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-    @param retval - return code
-*/
-define snat_set_workers_reply {
-  u32 context;
-  i32 retval;
-};
-
-/** \brief Dump S-NAT workers
-    @param client_index - opaque cookie to identify the sender
-    @param context - sender context, to match reply w/ request
-*/
-define snat_worker_dump {
-  u32 client_index;
-  u32 context;
-};
-
-/** \brief S-NAT workers details response
-    @param context - sender context, to match reply w/ request
-    @param worker_index - worker index
-    @param lcore_id - lcore ID
-    @param name - worker name
-*/
-define snat_worker_details {
-  u32 context;
-  u32 worker_index;
-  u32 lcore_id;
-  u8 name[64];
-};
diff --git a/plugins/snat-plugin/snat/snat.c b/plugins/snat-plugin/snat/snat.c
deleted file mode 100644
index bc995684..00000000
--- a/plugins/snat-plugin/snat/snat.c
+++ /dev/null
@@ -1,1957 +0,0 @@
-/*
- * snat.c - simple nat plugin
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-#include <vnet/plugin/plugin.h>
-#include <vlibapi/api.h>
-#include <snat/snat.h>
-
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-
-snat_main_t snat_main;
-
-/* define message IDs */
-#include <snat/snat_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <snat/snat_all_api_h.h> 
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <snat/snat_all_api_h.h> 
-#undef vl_endianfun
-
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <snat/snat_all_api_h.h>
-#undef vl_api_version
-
-/* Macro to finish up custom dump fns */
-#define FINISH                                  \
-    vec_add1 (s, 0);                            \
-    vl_print (handle, (char *)s);               \
-    vec_free (s);                               \
-    return handle;
-
-/* 
- * A handy macro to set up a message reply.
- * Assumes that the following variables are available:
- * mp - pointer to request message
- * rmp - pointer to reply message type
- * rv - return value
- */
-
-#define REPLY_MACRO(t)                                          \
-do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
-    vl_api_client_index_to_input_queue (mp->client_index);      \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-                                                                \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-#define REPLY_MACRO2(t, body)                                   \
-do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
-    vl_api_client_index_to_input_queue (mp->client_index);      \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-    do {body;} while (0);                                       \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-
-/* Hook up input features */
-VNET_FEATURE_INIT (ip4_snat_in2out, static) = {
-  .arc_name = "ip4-unicast",
-  .node_name = "snat-in2out",
-  .runs_before = VNET_FEATURES ("snat-out2in"),
-};
-VNET_FEATURE_INIT (ip4_snat_out2in, static) = {
-  .arc_name = "ip4-unicast",
-  .node_name = "snat-out2in",
-  .runs_before = VNET_FEATURES ("ip4-lookup"),
-};
-VNET_FEATURE_INIT (ip4_snat_in2out_worker_handoff, static) = {
-  .arc_name = "ip4-unicast",
-  .node_name = "snat-in2out-worker-handoff",
-  .runs_before = VNET_FEATURES ("snat-out2in-worker-handoff"),
-};
-VNET_FEATURE_INIT (ip4_snat_out2in_worker_handoff, static) = {
-  .arc_name = "ip4-unicast",
-  .node_name = "snat-out2in-worker-handoff",
-  .runs_before = VNET_FEATURES ("ip4-lookup"),
-};
-VNET_FEATURE_INIT (ip4_snat_in2out_fast, static) = {
-  .arc_name = "ip4-unicast",
-  .node_name = "snat-in2out-fast",
-  .runs_before = VNET_FEATURES ("snat-out2in-fast"),
-};
-VNET_FEATURE_INIT (ip4_snat_out2in_fast, static) = {
-  .arc_name = "ip4-unicast",
-  .node_name = "snat-out2in-fast",
-  .runs_before = VNET_FEATURES ("ip4-lookup"),
-};
-
-
-/* 
- * This routine exists to convince the vlib plugin framework that
- * we haven't accidentally copied a random .dll into the plugin directory.
- *
- * Also collects global variable pointers passed from the vpp engine
- */
-
-clib_error_t * 
-vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
-                      int from_early_init)
-{
-  snat_main_t * sm = &snat_main;
-  clib_error_t * error = 0;
-
-  sm->vlib_main = vm;
-  sm->vnet_main = h->vnet_main;
-  sm->ethernet_main = h->ethernet_main;
-
-  return error;
-}
-
-/*$$$$$ move to an installed header file */
-#if (1 || CLIB_DEBUG > 0)       /* "trust, but verify" */
-
-#define VALIDATE_SW_IF_INDEX(mp)				\
- do { u32 __sw_if_index = ntohl(mp->sw_if_index);		\
-    vnet_main_t *__vnm = vnet_get_main();                       \
-    if (pool_is_free_index(__vnm->interface_main.sw_interfaces, \
-                           __sw_if_index)) {                    \
-        rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
-        goto bad_sw_if_index;                                   \
-    }                                                           \
-} while(0);
-
-#define BAD_SW_IF_INDEX_LABEL                   \
-do {                                            \
-bad_sw_if_index:                                \
-    ;                                           \
-} while (0);
-
-#define VALIDATE_RX_SW_IF_INDEX(mp)				\
- do { u32 __rx_sw_if_index = ntohl(mp->rx_sw_if_index);		\
-    vnet_main_t *__vnm = vnet_get_main();                       \
-    if (pool_is_free_index(__vnm->interface_main.sw_interfaces, \
-                           __rx_sw_if_index)) {			\
-        rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
-        goto bad_rx_sw_if_index;				\
-    }                                                           \
-} while(0);
-
-#define BAD_RX_SW_IF_INDEX_LABEL		\
-do {                                            \
-bad_rx_sw_if_index:				\
-    ;                                           \
-} while (0);
-
-#define VALIDATE_TX_SW_IF_INDEX(mp)				\
- do { u32 __tx_sw_if_index = ntohl(mp->tx_sw_if_index);		\
-    vnet_main_t *__vnm = vnet_get_main();                       \
-    if (pool_is_free_index(__vnm->interface_main.sw_interfaces, \
-                           __tx_sw_if_index)) {			\
-        rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
-        goto bad_tx_sw_if_index;				\
-    }                                                           \
-} while(0);
-
-#define BAD_TX_SW_IF_INDEX_LABEL		\
-do {                                            \
-bad_tx_sw_if_index:				\
-    ;                                           \
-} while (0);
-
-#else
-
-#define VALIDATE_SW_IF_INDEX(mp)
-#define BAD_SW_IF_INDEX_LABEL
-#define VALIDATE_RX_SW_IF_INDEX(mp)
-#define BAD_RX_SW_IF_INDEX_LABEL
-#define VALIDATE_TX_SW_IF_INDEX(mp)
-#define BAD_TX_SW_IF_INDEX_LABEL
-
-#endif  /* CLIB_DEBUG > 0 */
-
-void snat_add_address (snat_main_t *sm, ip4_address_t *addr)
-{
-  snat_address_t * ap;
-
-  /* Check if address already exists */
-  vec_foreach (ap, sm->addresses)
-    {
-      if (ap->addr.as_u32 == addr->as_u32)
-        return;
-    }
-
-  vec_add2 (sm->addresses, ap, 1);
-  ap->addr = *addr;
-  clib_bitmap_alloc (ap->busy_port_bitmap, 65535);
-}
-
-static int is_snat_address_used_in_static_mapping (snat_main_t *sm,
-                                                   ip4_address_t addr)
-{
-  snat_static_mapping_t *m;
-  pool_foreach (m, sm->static_mappings,
-  ({
-      if (m->external_addr.as_u32 == addr.as_u32)
-        return 1;
-  }));
-
-  return 0;
-}
-
-int snat_del_address (snat_main_t *sm, ip4_address_t addr)
-{
-  snat_address_t *a = 0;
-  snat_session_t *ses;
-  u32 *ses_to_be_removed = 0, *ses_index;
-  clib_bihash_kv_8_8_t kv, value;
-  snat_user_key_t user_key;
-  snat_user_t *u;
-  snat_main_per_thread_data_t *tsm;
-
-  int i;
-
-  /* Find SNAT address */
-  for (i=0; i < vec_len (sm->addresses); i++)
-    {
-      if (sm->addresses[i].addr.as_u32 == addr.as_u32)
-        {
-          a = sm->addresses + i;
-          break;
-        }
-    }
-  if (!a)
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-  /* Check if address is used in some static mapping */
-  if (is_snat_address_used_in_static_mapping(sm, addr))
-    {
-      clib_warning ("address used in static mapping");
-      return VNET_API_ERROR_UNSPECIFIED;
-    }
-
-  /* Delete sessions using address */
-  if (a->busy_ports)
-    {
-      vec_foreach (tsm, sm->per_thread_data)
-        {
-          pool_foreach (ses, tsm->sessions, ({
-            if (ses->out2in.addr.as_u32 == addr.as_u32)
-              {
-                vec_add1 (ses_to_be_removed, ses - tsm->sessions);
-                kv.key = ses->in2out.as_u64;
-                clib_bihash_add_del_8_8 (&sm->in2out, &kv, 0);
-                kv.key = ses->out2in.as_u64;
-                clib_bihash_add_del_8_8 (&sm->out2in, &kv, 0);
-                clib_dlist_remove (tsm->list_pool, ses->per_user_index);
-                user_key.addr = ses->in2out.addr;
-                user_key.fib_index = ses->in2out.fib_index;
-                kv.key = user_key.as_u64;
-                if (!clib_bihash_search_8_8 (&sm->user_hash, &kv, &value))
-                  {
-                    u = pool_elt_at_index (tsm->users, value.value);
-                    u->nsessions--;
-                  }
-              }
-          }));
-
-          vec_foreach (ses_index, ses_to_be_removed)
-            pool_put_index (tsm->sessions, ses_index[0]);
-
-          vec_free (ses_to_be_removed);
-       }
-    }
-
-  vec_del1 (sm->addresses, i);
-
-  return 0;
-}
-
-static void increment_v4_address (ip4_address_t * a)
-{
-  u32 v;
-  
-  v = clib_net_to_host_u32(a->as_u32) + 1;
-  a->as_u32 = clib_host_to_net_u32(v);
-}
-
-/**
- * @brief Add static mapping.
- *
- * Create static mapping between local addr+port and external addr+port.
- *
- * @param l_addr Local IPv4 address.
- * @param e_addr External IPv4 address.
- * @param l_port Local port number.
- * @param e_port External port number.
- * @param vrf_id VRF ID.
- * @param addr_only If 0 address port and pair mapping, otherwise address only.
- * @param is_add If 0 delete static mapping, otherwise add.
- *
- * @returns
- */
-int snat_add_static_mapping(ip4_address_t l_addr, ip4_address_t e_addr,
-                            u16 l_port, u16 e_port, u32 vrf_id, int addr_only,
-                            int is_add)
-{
-  snat_main_t * sm = &snat_main;
-  snat_static_mapping_t *m;
-  snat_static_mapping_key_t m_key;
-  clib_bihash_kv_8_8_t kv, value;
-  snat_address_t *a = 0;
-  u32 fib_index = ~0;
-  uword * p;
-  int i;
-
-  /* If outside FIB index is not resolved yet */
-  if (sm->outside_fib_index == ~0)
-    {
-      p = hash_get (sm->ip4_main->fib_index_by_table_id, sm->outside_vrf_id);
-      if (!p)
-        return VNET_API_ERROR_NO_SUCH_FIB;
-      sm->outside_fib_index = p[0];
-    }
-
-  m_key.addr = e_addr;
-  m_key.port = addr_only ? 0 : e_port;
-  m_key.fib_index = sm->outside_fib_index;
-  kv.key = m_key.as_u64;
-  if (clib_bihash_search_8_8 (&sm->static_mapping_by_external, &kv, &value))
-    m = 0;
-  else
-    m = pool_elt_at_index (sm->static_mappings, value.value);
-
-  if (is_add)
-    {
-      if (m)
-        return VNET_API_ERROR_VALUE_EXIST;
-
-      /* Convert VRF id to FIB index */
-      if (vrf_id != ~0)
-        {
-          p = hash_get (sm->ip4_main->fib_index_by_table_id, vrf_id);
-          if (!p)
-            return VNET_API_ERROR_NO_SUCH_FIB;
-          fib_index = p[0];
-        }
-      /* If not specified use inside VRF id from SNAT plugin startup config */
-      else
-        {
-          if (sm->inside_fib_index == ~0)
-            {
-              p = hash_get (sm->ip4_main->fib_index_by_table_id, sm->inside_vrf_id);
-              if (!p)
-                return VNET_API_ERROR_NO_SUCH_FIB;
-              fib_index = p[0];
-              sm->inside_fib_index = fib_index;
-            }
-          else
-            fib_index = sm->inside_fib_index;
-
-          vrf_id = sm->inside_vrf_id;
-        }
-
-      /* Find external address in allocated addresses and reserve port for
-         address and port pair mapping when dynamic translations enabled */
-      if (!addr_only && !(sm->static_mapping_only))
-        {
-          for (i = 0; i < vec_len (sm->addresses); i++)
-            {
-              if (sm->addresses[i].addr.as_u32 == e_addr.as_u32)
-                {
-                  a = sm->addresses + i;
-                  /* External port must be unused */
-                  if (clib_bitmap_get_no_check (a->busy_port_bitmap, e_port))
-                    return VNET_API_ERROR_INVALID_VALUE;
-                  clib_bitmap_set_no_check (a->busy_port_bitmap, e_port, 1);
-                  if (e_port > 1024)
-                    a->busy_ports++;
-
-                  break;
-                }
-            }
-          /* External address must be allocated */
-          if (!a)
-            return VNET_API_ERROR_NO_SUCH_ENTRY;
-        }
-
-      pool_get (sm->static_mappings, m);
-      memset (m, 0, sizeof (*m));
-      m->local_addr = l_addr;
-      m->external_addr = e_addr;
-      m->addr_only = addr_only;
-      m->vrf_id = vrf_id;
-      m->fib_index = fib_index;
-      if (!addr_only)
-        {
-          m->local_port = l_port;
-          m->external_port = e_port;
-        }
-
-      m_key.addr = m->local_addr;
-      m_key.port = m->local_port;
-      m_key.fib_index = m->fib_index;
-      kv.key = m_key.as_u64;
-      kv.value = m - sm->static_mappings;
-      clib_bihash_add_del_8_8(&sm->static_mapping_by_local, &kv, 1);
-
-      m_key.addr = m->external_addr;
-      m_key.port = m->external_port;
-      m_key.fib_index = sm->outside_fib_index;
-      kv.key = m_key.as_u64;
-      kv.value = m - sm->static_mappings;
-      clib_bihash_add_del_8_8(&sm->static_mapping_by_external, &kv, 1);
-
-      /* Assign worker */
-      if (sm->workers)
-        {
-          snat_user_key_t w_key0;
-          snat_static_mapping_key_t w_key1;
-
-          w_key0.addr = m->local_addr;
-          w_key0.fib_index = m->fib_index;
-          kv.key = w_key0.as_u64;
-
-          if (clib_bihash_search_8_8 (&sm->worker_by_in, &kv, &value))
-            {
-              kv.value = sm->first_worker_index +
-                sm->workers[sm->next_worker++ % vec_len (sm->workers)];
-
-              clib_bihash_add_del_8_8 (&sm->worker_by_in, &kv, 1);
-            }
-          else
-            {
-              kv.value = value.value;
-            }
-
-          w_key1.addr = m->external_addr;
-          w_key1.port = clib_host_to_net_u16 (m->external_port);
-          w_key1.fib_index = sm->outside_fib_index;
-          kv.key = w_key1.as_u64;
-          clib_bihash_add_del_8_8 (&sm->worker_by_out, &kv, 1);
-        }
-    }
-  else
-    {
-      if (!m)
-        return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-      /* Free external address port */
-      if (!addr_only && !(sm->static_mapping_only))
-        {
-          for (i = 0; i < vec_len (sm->addresses); i++)
-            {
-              if (sm->addresses[i].addr.as_u32 == e_addr.as_u32)
-                {
-                  a = sm->addresses + i;
-                  clib_bitmap_set_no_check (a->busy_port_bitmap, e_port, 0);
-                  a->busy_ports--;
-
-                  break;
-                }
-            }
-        }
-
-      m_key.addr = m->local_addr;
-      m_key.port = m->local_port;
-      m_key.fib_index = m->fib_index;
-      kv.key = m_key.as_u64;
-      clib_bihash_add_del_8_8(&sm->static_mapping_by_local, &kv, 0);
-
-      m_key.addr = m->external_addr;
-      m_key.port = m->external_port;
-      m_key.fib_index = sm->outside_fib_index;
-      kv.key = m_key.as_u64;
-      clib_bihash_add_del_8_8(&sm->static_mapping_by_external, &kv, 0);
-
-      /* Delete session(s) for static mapping if exist */
-      if (!(sm->static_mapping_only) ||
-          (sm->static_mapping_only && sm->static_mapping_connection_tracking))
-        {
-          snat_user_key_t u_key;
-          snat_user_t *u;
-          dlist_elt_t * head, * elt;
-          u32 elt_index, head_index, del_elt_index;
-          u32 ses_index;
-          u64 user_index;
-          snat_session_t * s;
-          snat_main_per_thread_data_t *tsm;
-
-          u_key.addr = m->local_addr;
-          u_key.fib_index = m->fib_index;
-          kv.key = u_key.as_u64;
-          if (!clib_bihash_search_8_8 (&sm->user_hash, &kv, &value))
-            {
-              user_index = value.value;
-              if (!clib_bihash_search_8_8 (&sm->worker_by_in, &kv, &value))
-                tsm = vec_elt_at_index (sm->per_thread_data, value.value);
-              else
-                tsm = vec_elt_at_index (sm->per_thread_data, sm->num_workers);
-              u = pool_elt_at_index (tsm->users, user_index);
-              if (u->nstaticsessions)
-                {
-                  head_index = u->sessions_per_user_list_head_index;
-                  head = pool_elt_at_index (tsm->list_pool, head_index);
-                  elt_index = head->next;
-                  elt = pool_elt_at_index (tsm->list_pool, elt_index);
-                  ses_index = elt->value;
-                  while (ses_index != ~0)
-                    {
-                      s =  pool_elt_at_index (tsm->sessions, ses_index);
-                      del_elt_index = elt_index;
-                      elt_index = elt->next;
-                      elt = pool_elt_at_index (tsm->list_pool, elt_index);
-                      ses_index = elt->value;
-
-                      if (!addr_only)
-                        {
-                          if ((s->out2in.addr.as_u32 != e_addr.as_u32) &&
-                              (clib_net_to_host_u16 (s->out2in.port) != e_port))
-                            continue;
-                        }
-
-                      value.key = s->in2out.as_u64;
-                      clib_bihash_add_del_8_8 (&sm->in2out, &value, 0);
-                      value.key = s->out2in.as_u64;
-                      clib_bihash_add_del_8_8 (&sm->out2in, &value, 0);
-                      pool_put (tsm->sessions, s);
-
-                      clib_dlist_remove (tsm->list_pool, del_elt_index);
-                      pool_put_index (tsm->list_pool, del_elt_index);
-                      u->nstaticsessions--;
-
-                      if (!addr_only)
-                        break;
-                    }
-                  if (addr_only)
-                    {
-                      pool_put (tsm->users, u);
-                      clib_bihash_add_del_8_8 (&sm->user_hash, &kv, 0);
-                    }
-                }
-            }
-        }
-
-      /* Delete static mapping from pool */
-      pool_put (sm->static_mappings, m);
-    }
-
-  return 0;
-}
-
-static int snat_interface_add_del (u32 sw_if_index, u8 is_inside, int is_del)
-{
-  snat_main_t *sm = &snat_main;
-  snat_interface_t *i;
-  const char * feature_name;
-
-  if (sm->static_mapping_only && !(sm->static_mapping_connection_tracking))
-    feature_name = is_inside ?  "snat-in2out-fast" : "snat-out2in-fast";
-  else
-    {
-      if (sm->num_workers > 1)
-        feature_name = is_inside ?  "snat-in2out-worker-handoff" : "snat-out2in-worker-handoff";
-      else
-        feature_name = is_inside ?  "snat-in2out" : "snat-out2in";
-    }
-
-  vnet_feature_enable_disable ("ip4-unicast", feature_name, sw_if_index,
-			       !is_del, 0, 0);
-
-  if (sm->fq_in2out_index == ~0)
-    sm->fq_in2out_index = vlib_frame_queue_main_init (snat_in2out_node.index, 0);
-
-  if (sm->fq_out2in_index == ~0)
-    sm->fq_out2in_index = vlib_frame_queue_main_init (snat_out2in_node.index, 0);
-
-  pool_foreach (i, sm->interfaces,
-  ({
-    if (i->sw_if_index == sw_if_index)
-      {
-        if (is_del)
-          pool_put (sm->interfaces, i);
-        else
-          return VNET_API_ERROR_VALUE_EXIST;
-
-        return 0;
-      }
-  }));
-
-  if (is_del)
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-  pool_get (sm->interfaces, i);
-  i->sw_if_index = sw_if_index;
-  i->is_inside = is_inside;
-
-  return 0;
-}
-
-static int snat_set_workers (uword * bitmap)
-{
-  snat_main_t *sm = &snat_main;
-  int i;
-
-  if (sm->num_workers < 2)
-    return VNET_API_ERROR_FEATURE_DISABLED;
-
-  if (clib_bitmap_last_set (bitmap) >= sm->num_workers)
-    return VNET_API_ERROR_INVALID_WORKER;
-
-  vec_free (sm->workers);
-  clib_bitmap_foreach (i, bitmap,
-    ({
-      vec_add1(sm->workers, i);
-    }));
-
-  return 0;
-}
-
-static void 
-vl_api_snat_add_address_range_t_handler
-(vl_api_snat_add_address_range_t * mp)
-{
-  snat_main_t * sm = &snat_main;
-  vl_api_snat_add_address_range_reply_t * rmp;
-  ip4_address_t this_addr;
-  u32 start_host_order, end_host_order;
-  int i, count;
-  int rv = 0;
-  u32 * tmp;
-
-  if (mp->is_ip4 != 1)
-    {
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto send_reply;
-    }
-
-  if (sm->static_mapping_only)
-    {
-      rv = VNET_API_ERROR_FEATURE_DISABLED;
-      goto send_reply;
-    }
-
-  tmp = (u32 *) mp->first_ip_address;
-  start_host_order = clib_host_to_net_u32 (tmp[0]);
-  tmp = (u32 *) mp->last_ip_address;
-  end_host_order = clib_host_to_net_u32 (tmp[0]);
-
-  count = (end_host_order - start_host_order) + 1;
-
-  if (count > 1024)
-    clib_warning ("%U - %U, %d addresses...",
-                  format_ip4_address, mp->first_ip_address,
-                  format_ip4_address, mp->last_ip_address,
-                  count);
-  
-  memcpy (&this_addr.as_u8, mp->first_ip_address, 4);
-
-  for (i = 0; i < count; i++)
-    {
-      if (mp->is_add)
-        snat_add_address (sm, &this_addr);
-      else
-        rv = snat_del_address (sm, this_addr);
-
-      if (rv)
-        goto send_reply;
-
-      increment_v4_address (&this_addr);
-    }
-
- send_reply:
-  REPLY_MACRO (VL_API_SNAT_ADD_ADDRESS_RANGE_REPLY);
-}
-
-static void *vl_api_snat_add_address_range_t_print
-(vl_api_snat_add_address_range_t *mp, void * handle)
-{
-  u8 * s;
-
-  s = format (0, "SCRIPT: snat_add_address_range ");
-  s = format (s, "%U ", format_ip4_address, mp->first_ip_address);
-  if (memcmp (mp->first_ip_address, mp->last_ip_address, 4))
-    {
-      s = format (s, " - %U ", format_ip4_address, mp->last_ip_address);
-    }
-  FINISH;
-}
-
-static void
-send_snat_address_details
-(snat_address_t * a, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_snat_address_details_t *rmp;
-  snat_main_t * sm = &snat_main;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_SNAT_ADDRESS_DETAILS+sm->msg_id_base);
-  rmp->is_ip4 = 1;
-  clib_memcpy (rmp->ip_address, &(a->addr), 4);
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_snat_address_dump_t_handler
-(vl_api_snat_address_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  snat_main_t * sm = &snat_main;
-  snat_address_t * a;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  vec_foreach (a, sm->addresses)
-    send_snat_address_details (a, q, mp->context);
-}
-
-static void *vl_api_snat_address_dump_t_print
-(vl_api_snat_address_dump_t *mp, void * handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: snat_address_dump ");
-
-  FINISH;
-}
-
-static void
-vl_api_snat_interface_add_del_feature_t_handler
-(vl_api_snat_interface_add_del_feature_t * mp)
-{
-  snat_main_t * sm = &snat_main;
-  vl_api_snat_interface_add_del_feature_reply_t * rmp;
-  u8 is_del = mp->is_add == 0;
-  u32 sw_if_index = ntohl(mp->sw_if_index);
-  int rv = 0;
-
-  VALIDATE_SW_IF_INDEX(mp);
-
-  rv = snat_interface_add_del (sw_if_index, mp->is_inside, is_del);
-  
-  BAD_SW_IF_INDEX_LABEL;
-
-  REPLY_MACRO(VL_API_SNAT_INTERFACE_ADD_DEL_FEATURE_REPLY);
-}
-
-static void *vl_api_snat_interface_add_del_feature_t_print
-(vl_api_snat_interface_add_del_feature_t * mp, void *handle)
-{
-  u8 * s;
-
-  s = format (0, "SCRIPT: snat_interface_add_del_feature ");
-  s = format (s, "sw_if_index %d %s %s",
-              clib_host_to_net_u32(mp->sw_if_index),
-              mp->is_inside ? "in":"out",
-              mp->is_add ? "" : "del");
-
-  FINISH;
-}
-
-static void
-send_snat_interface_details
-(snat_interface_t * i, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_snat_interface_details_t *rmp;
-  snat_main_t * sm = &snat_main;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_SNAT_INTERFACE_DETAILS+sm->msg_id_base);
-  rmp->sw_if_index = ntohl (i->sw_if_index);
-  rmp->is_inside = i->is_inside;
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_snat_interface_dump_t_handler
-(vl_api_snat_interface_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  snat_main_t * sm = &snat_main;
-  snat_interface_t * i;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  pool_foreach (i, sm->interfaces,
-  ({
-    send_snat_interface_details(i, q, mp->context);
-  }));
-}
-
-static void *vl_api_snat_interface_dump_t_print
-(vl_api_snat_interface_dump_t *mp, void * handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: snat_interface_dump ");
-
-  FINISH;
-}static void
-
-vl_api_snat_add_static_mapping_t_handler
-(vl_api_snat_add_static_mapping_t * mp)
-{
-  snat_main_t * sm = &snat_main;
-  vl_api_snat_add_static_mapping_reply_t * rmp;
-  ip4_address_t local_addr, external_addr;
-  u16 local_port = 0, external_port = 0;
-  u32 vrf_id;
-  int rv = 0;
-
-  if (mp->is_ip4 != 1)
-    {
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto send_reply;
-    }
-
-  memcpy (&local_addr.as_u8, mp->local_ip_address, 4);
-  memcpy (&external_addr.as_u8, mp->external_ip_address, 4);
-  if (mp->addr_only == 0)
-    {
-      local_port = clib_net_to_host_u16 (mp->local_port);
-      external_port = clib_net_to_host_u16 (mp->external_port);
-    }
-  vrf_id = clib_net_to_host_u32 (mp->vrf_id);
-
-  rv = snat_add_static_mapping(local_addr, external_addr, local_port,
-                               external_port, vrf_id, mp->addr_only,
-                               mp->is_add);
-
- send_reply:
-  REPLY_MACRO (VL_API_SNAT_ADD_ADDRESS_RANGE_REPLY);
-}
-
-static void *vl_api_snat_add_static_mapping_t_print
-(vl_api_snat_add_static_mapping_t *mp, void * handle)
-{
-  u8 * s;
-
-  s = format (0, "SCRIPT: snat_add_static_mapping ");
-  s = format (s, "local_addr %U external_addr %U ",
-              format_ip4_address, mp->local_ip_address,
-              format_ip4_address, mp->external_ip_address);
-
-  if (mp->addr_only == 0)
-    s = format (s, "local_port %d external_port %d ",
-                clib_net_to_host_u16 (mp->local_port),
-                clib_net_to_host_u16 (mp->external_port));
-
-  if (mp->vrf_id != ~0)
-    s = format (s, "vrf %d", clib_net_to_host_u32 (mp->vrf_id));
-
-  FINISH;
-}
-
-static void
-send_snat_static_mapping_details
-(snat_static_mapping_t * m, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_snat_static_mapping_details_t *rmp;
-  snat_main_t * sm = &snat_main;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_SNAT_STATIC_MAPPING_DETAILS+sm->msg_id_base);
-  rmp->is_ip4 = 1;
-  rmp->addr_only = m->addr_only;
-  clib_memcpy (rmp->local_ip_address, &(m->local_addr), 4);
-  clib_memcpy (rmp->external_ip_address, &(m->external_addr), 4);
-  rmp->local_port = htons (m->local_port);
-  rmp->external_port = htons (m->external_port);
-  rmp->vrf_id = htonl (m->vrf_id);
-  rmp->context = context;
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_snat_static_mapping_dump_t_handler
-(vl_api_snat_static_mapping_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  snat_main_t * sm = &snat_main;
-  snat_static_mapping_t * m;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  pool_foreach (m, sm->static_mappings,
-  ({
-      send_snat_static_mapping_details (m, q, mp->context);
-  }));
-}
-
-static void *vl_api_snat_static_mapping_dump_t_print
-(vl_api_snat_static_mapping_dump_t *mp, void * handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: snat_static_mapping_dump ");
-
-  FINISH;
-}
-
-static void
-vl_api_snat_control_ping_t_handler
-(vl_api_snat_control_ping_t * mp)
-{
-  vl_api_snat_control_ping_reply_t *rmp;
-  snat_main_t * sm = &snat_main;
-  int rv = 0;
-
-  REPLY_MACRO2(VL_API_SNAT_CONTROL_PING_REPLY,
-  ({
-    rmp->vpe_pid = ntohl (getpid());
-  }));
-}
-
-static void *vl_api_snat_control_ping_t_print
-(vl_api_snat_control_ping_t *mp, void * handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: snat_control_ping ");
-
-  FINISH;
-}
-
-static void
-vl_api_snat_show_config_t_handler
-(vl_api_snat_show_config_t * mp)
-{
-  vl_api_snat_show_config_reply_t *rmp;
-  snat_main_t * sm = &snat_main;
-  int rv = 0;
-
-  REPLY_MACRO2(VL_API_SNAT_SHOW_CONFIG_REPLY,
-  ({
-    rmp->translation_buckets = htonl (sm->translation_buckets);
-    rmp->translation_memory_size = htonl (sm->translation_memory_size);
-    rmp->user_buckets = htonl (sm->user_buckets);
-    rmp->user_memory_size = htonl (sm->user_memory_size);
-    rmp->max_translations_per_user = htonl (sm->max_translations_per_user);
-    rmp->outside_vrf_id = htonl (sm->outside_vrf_id);
-    rmp->inside_vrf_id = htonl (sm->inside_vrf_id);
-    rmp->static_mapping_only = sm->static_mapping_only;
-    rmp->static_mapping_connection_tracking =
-      sm->static_mapping_connection_tracking;
-  }));
-}
-
-static void *vl_api_snat_show_config_t_print
-(vl_api_snat_show_config_t *mp, void * handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: snat_show_config ");
-
-  FINISH;
-}
-
-static void 
-vl_api_snat_set_workers_t_handler
-(vl_api_snat_set_workers_t * mp)
-{
-  snat_main_t * sm = &snat_main;
-  vl_api_snat_set_workers_reply_t * rmp;
-  int rv = 0;
-  uword *bitmap = 0;
-  u64 mask = clib_net_to_host_u64 (mp->worker_mask);
-
-  if (sm->num_workers < 2)
-    {
-      rv = VNET_API_ERROR_FEATURE_DISABLED;
-      goto send_reply;
-    }
-
-  bitmap = clib_bitmap_set_multiple (bitmap, 0, mask, BITS (mask)); 
-  rv = snat_set_workers(bitmap);
-  clib_bitmap_free (bitmap);
-
- send_reply:
-  REPLY_MACRO (VL_API_SNAT_SET_WORKERS_REPLY);
-}
-
-static void *vl_api_snat_set_workers_t_print
-(vl_api_snat_set_workers_t *mp, void * handle)
-{
-  u8 * s;
-  uword *bitmap = 0;
-  u8 first = 1;
-  int i;
-  u64 mask = clib_net_to_host_u64 (mp->worker_mask);
-
-  s = format (0, "SCRIPT: snat_set_workers ");
-  bitmap = clib_bitmap_set_multiple (bitmap, 0, mask, BITS (mask)); 
-  clib_bitmap_foreach (i, bitmap,
-    ({
-      if (first)
-        s = format (s, "%d", i);
-      else
-        s = format (s, ",%d", i);
-      first = 0;
-    }));
-  clib_bitmap_free (bitmap);
-  FINISH;
-}
-
-static void
-send_snat_worker_details
-(u32 worker_index, unix_shared_memory_queue_t * q, u32 context)
-{
-  vl_api_snat_worker_details_t *rmp;
-  snat_main_t * sm = &snat_main;
-  vlib_worker_thread_t *w =
-    vlib_worker_threads + worker_index + sm->first_worker_index;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_SNAT_WORKER_DETAILS+sm->msg_id_base);
-  rmp->context = context;
-  rmp->worker_index = htonl (worker_index);
-  rmp->lcore_id = htonl (w->lcore_id);
-  strncpy ((char *) rmp->name, (char *) w->name, ARRAY_LEN (rmp->name) - 1);
-
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
-}
-
-static void
-vl_api_snat_worker_dump_t_handler
-(vl_api_snat_worker_dump_t * mp)
-{
-  unix_shared_memory_queue_t *q;
-  snat_main_t * sm = &snat_main;
-  u32 * worker_index;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  vec_foreach (worker_index, sm->workers)
-    {
-      send_snat_worker_details(*worker_index, q, mp->context);
-    }
-}
-
-static void *vl_api_snat_worker_dump_t_print
-(vl_api_snat_worker_dump_t *mp, void * handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: snat_worker_dump ");
-
-  FINISH;
-}
-
-/* List of message types that this plugin understands */
-#define foreach_snat_plugin_api_msg                                     \
-_(SNAT_ADD_ADDRESS_RANGE, snat_add_address_range)                       \
-_(SNAT_INTERFACE_ADD_DEL_FEATURE, snat_interface_add_del_feature)       \
-_(SNAT_ADD_STATIC_MAPPING, snat_add_static_mapping)                     \
-_(SNAT_CONTROL_PING, snat_control_ping)                                 \
-_(SNAT_STATIC_MAPPING_DUMP, snat_static_mapping_dump)                   \
-_(SNAT_SHOW_CONFIG, snat_show_config)                                   \
-_(SNAT_ADDRESS_DUMP, snat_address_dump)                                 \
-_(SNAT_INTERFACE_DUMP, snat_interface_dump)                             \
-_(SNAT_SET_WORKERS, snat_set_workers)                                   \
-_(SNAT_WORKER_DUMP, snat_worker_dump)
-
-/* Set up the API message handling tables */
-static clib_error_t *
-snat_plugin_api_hookup (vlib_main_t *vm)
-{
-   snat_main_t * sm __attribute__ ((unused)) = &snat_main;
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #n,					\
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1); 
-    foreach_snat_plugin_api_msg;
-#undef _
-
-    return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <snat/snat_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (snat_main_t * sm, api_main_t * am)
-{
-#define _(id,n,crc) \
-  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
-  foreach_vl_msg_name_crc_snat;
-#undef _
-}
-
-static void plugin_custom_dump_configure (snat_main_t * sm) 
-{
-#define _(n,f) sm->api_main->msg_print_handlers \
-  [VL_API_##n + sm->msg_id_base]                \
-    = (void *) vl_api_##f##_t_print;
-  foreach_snat_plugin_api_msg;
-#undef _
-}
-
-static clib_error_t * snat_init (vlib_main_t * vm)
-{
-  snat_main_t * sm = &snat_main;
-  clib_error_t * error = 0;
-  ip4_main_t * im = &ip4_main;
-  ip_lookup_main_t * lm = &im->lookup_main;
-  u8 * name;
-  uword *p;
-  vlib_thread_registration_t *tr;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-  uword *bitmap = 0;
-  u32 i;
-
-  name = format (0, "snat_%08x%c", api_version, 0);
-
-  /* Ask for a correctly-sized block of API message decode slots */
-  sm->msg_id_base = vl_msg_api_get_msg_ids 
-      ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-  sm->vlib_main = vm;
-  sm->vnet_main = vnet_get_main();
-  sm->ip4_main = im;
-  sm->ip4_lookup_main = lm;
-  sm->api_main = &api_main;
-  sm->first_worker_index = 0;
-  sm->next_worker = 0;
-  sm->num_workers = 0;
-  sm->workers = 0;
-  sm->fq_in2out_index = ~0;
-  sm->fq_out2in_index = ~0;
-
-  p = hash_get_mem (tm->thread_registrations_by_name, "workers");
-  if (p)
-    {
-      tr = (vlib_thread_registration_t *) p[0];
-      if (tr)
-        {
-          sm->num_workers = tr->count;
-          sm->first_worker_index = tr->first_index;
-        }
-    }
-
-  /* Use all available workers by default */
-  if (sm->num_workers > 1)
-    {
-      for (i=0; i < sm->num_workers; i++)
-        bitmap = clib_bitmap_set (bitmap, i, 1);
-      snat_set_workers(bitmap);
-      clib_bitmap_free (bitmap);
-    }
-
-  error = snat_plugin_api_hookup (vm);
-
-  /* Add our API messages to the global name_crc hash table */
-  setup_message_id_table (sm, &api_main);
-
-  plugin_custom_dump_configure (sm);
-  vec_free(name);
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (snat_init);
-
-void snat_free_outside_address_and_port (snat_main_t * sm, 
-                                         snat_session_key_t * k, 
-                                         u32 address_index)
-{
-  snat_address_t *a;
-  u16 port_host_byte_order = clib_net_to_host_u16 (k->port);
-  
-  ASSERT (address_index < vec_len (sm->addresses));
-
-  a = sm->addresses + address_index;
-
-  ASSERT (clib_bitmap_get_no_check (a->busy_port_bitmap,
-    port_host_byte_order) == 1);
-
-  clib_bitmap_set_no_check (a->busy_port_bitmap, port_host_byte_order, 0);
-  a->busy_ports--;
-}  
-
-/**
- * @brief Match SNAT static mapping.
- *
- * @param sm          SNAT main.
- * @param match       Address and port to match.
- * @param mapping     External or local address and port of the matched mapping.
- * @param by_external If 0 match by local address otherwise match by external
- *                    address.
- *
- * @returns 0 if match found otherwise 1.
- */
-int snat_static_mapping_match (snat_main_t * sm,
-                               snat_session_key_t match,
-                               snat_session_key_t * mapping,
-                               u8 by_external)
-{
-  clib_bihash_kv_8_8_t kv, value;
-  snat_static_mapping_t *m;
-  snat_static_mapping_key_t m_key;
-  clib_bihash_8_8_t *mapping_hash = &sm->static_mapping_by_local;
-
-  if (by_external)
-    mapping_hash = &sm->static_mapping_by_external;
-
-  m_key.addr = match.addr;
-  m_key.port = clib_net_to_host_u16 (match.port);
-  m_key.fib_index = match.fib_index;
-
-  kv.key = m_key.as_u64;
-
-  if (clib_bihash_search_8_8 (mapping_hash, &kv, &value))
-    {
-      /* Try address only mapping */
-      m_key.port = 0;
-      kv.key = m_key.as_u64;
-      if (clib_bihash_search_8_8 (mapping_hash, &kv, &value))
-        return 1;
-    }
-
-  m = pool_elt_at_index (sm->static_mappings, value.value);
-
-  if (by_external)
-    {
-      mapping->addr = m->local_addr;
-      /* Address only mapping doesn't change port */
-      mapping->port = m->addr_only ? match.port
-        : clib_host_to_net_u16 (m->local_port);
-      mapping->fib_index = m->fib_index;
-    }
-  else
-    {
-      mapping->addr = m->external_addr;
-      /* Address only mapping doesn't change port */
-      mapping->port = m->addr_only ? match.port
-        : clib_host_to_net_u16 (m->external_port);
-      mapping->fib_index = sm->outside_fib_index;
-    }
-
-  return 0;
-}
-
-int snat_alloc_outside_address_and_port (snat_main_t * sm, 
-                                         snat_session_key_t * k,
-                                         u32 * address_indexp)
-{
-  int i;
-  snat_address_t *a;
-  u32 portnum;
-
-  for (i = 0; i < vec_len (sm->addresses); i++)
-    {
-      if (sm->addresses[i].busy_ports < (65535-1024))
-        {
-          a = sm->addresses + i;
-
-          while (1)
-            {
-              portnum = random_u32 (&sm->random_seed);
-              portnum &= 0xFFFF;
-              if (portnum < 1024)
-                continue;
-              if (clib_bitmap_get_no_check (a->busy_port_bitmap, portnum))
-                continue;
-              clib_bitmap_set_no_check (a->busy_port_bitmap, portnum, 1);
-              a->busy_ports++;
-              /* Caller sets protocol and fib index */
-              k->addr = a->addr;
-              k->port = clib_host_to_net_u16(portnum);
-              *address_indexp = i;
-              return 0;
-            }
-        }
-    }
-  /* Totally out of translations to use... */
-  return 1;
-}
-
-
-static clib_error_t *
-add_address_command_fn (vlib_main_t * vm,
-                        unformat_input_t * input,
-                        vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  snat_main_t * sm = &snat_main;
-  ip4_address_t start_addr, end_addr, this_addr;
-  u32 start_host_order, end_host_order;
-  int i, count;
-  int is_add = 1;
-  int rv = 0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "%U - %U",
-                    unformat_ip4_address, &start_addr,
-                    unformat_ip4_address, &end_addr))
-        ;
-      else if (unformat (line_input, "%U", unformat_ip4_address, &start_addr))
-        end_addr = start_addr;
-      else if (unformat (line_input, "del"))
-        is_add = 0;
-      else
-        return clib_error_return (0, "unknown input '%U'",
-          format_unformat_error, input);
-     }
-  unformat_free (line_input);
-
-  if (sm->static_mapping_only)
-    return clib_error_return (0, "static mapping only mode");
-
-  start_host_order = clib_host_to_net_u32 (start_addr.as_u32);
-  end_host_order = clib_host_to_net_u32 (end_addr.as_u32);
-  
-  if (end_host_order < start_host_order)
-    return clib_error_return (0, "end address less than start address");
-
-  count = (end_host_order - start_host_order) + 1;
-
-  if (count > 1024)
-    clib_warning ("%U - %U, %d addresses...",
-                  format_ip4_address, &start_addr,
-                  format_ip4_address, &end_addr,
-                  count);
-  
-  this_addr = start_addr;
-
-  for (i = 0; i < count; i++)
-    {
-      if (is_add)
-        snat_add_address (sm, &this_addr);
-      else
-        rv = snat_del_address (sm, this_addr);
-
-      switch (rv)
-        {
-        case VNET_API_ERROR_NO_SUCH_ENTRY:
-          return clib_error_return (0, "S-NAT address not exist.");
-          break;
-        case VNET_API_ERROR_UNSPECIFIED:
-          return clib_error_return (0, "S-NAT address used in static mapping.");
-          break;
-        default:
-          break;
-        }
-
-      increment_v4_address (&this_addr);
-    }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (add_address_command, static) = {
-  .path = "snat add address",
-  .short_help = "snat add addresses <ip4-range-start> [- <ip4-range-end>] [del]",
-  .function = add_address_command_fn,
-};
-
-static clib_error_t *
-snat_feature_command_fn (vlib_main_t * vm,
-                          unformat_input_t * input,
-                          vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  vnet_main_t * vnm = vnet_get_main();
-  clib_error_t * error = 0;
-  u32 sw_if_index;
-  u32 * inside_sw_if_indices = 0;
-  u32 * outside_sw_if_indices = 0;
-  int is_del = 0;
-  int i;
-
-  sw_if_index = ~0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "in %U", unformat_vnet_sw_interface,
-                    vnm, &sw_if_index))
-        vec_add1 (inside_sw_if_indices, sw_if_index);
-      else if (unformat (line_input, "out %U", unformat_vnet_sw_interface,
-                         vnm, &sw_if_index))
-        vec_add1 (outside_sw_if_indices, sw_if_index);
-      else if (unformat (line_input, "del"))
-        is_del = 1;
-      else
-        return clib_error_return (0, "unknown input '%U'",
-          format_unformat_error, input);
-    }
-  unformat_free (line_input);
-
-  if (vec_len (inside_sw_if_indices))
-    {
-      for (i = 0; i < vec_len(inside_sw_if_indices); i++)
-        {
-          sw_if_index = inside_sw_if_indices[i];
-          snat_interface_add_del (sw_if_index, 1, is_del);
-        }
-    }
-
-  if (vec_len (outside_sw_if_indices))
-    {
-      for (i = 0; i < vec_len(outside_sw_if_indices); i++)
-        {
-          sw_if_index = outside_sw_if_indices[i];
-          snat_interface_add_del (sw_if_index, 0, is_del);
-        }
-    }
-
-  vec_free (inside_sw_if_indices);
-  vec_free (outside_sw_if_indices);
-
-  return error;
-}
-
-VLIB_CLI_COMMAND (set_interface_snat_command, static) = {
-  .path = "set interface snat",
-  .function = snat_feature_command_fn,
-  .short_help = "set interface snat in <intfc> out <intfc> [del]",
-};
-
-static clib_error_t *
-add_static_mapping_command_fn (vlib_main_t * vm,
-                               unformat_input_t * input,
-                               vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  clib_error_t * error = 0;
-  ip4_address_t l_addr, e_addr;
-  u32 l_port = 0, e_port = 0, vrf_id = ~0;
-  int is_add = 1;
-  int addr_only = 1;
-  int rv;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "local %U %u", unformat_ip4_address, &l_addr,
-                    &l_port))
-        addr_only = 0;
-      else if (unformat (line_input, "local %U", unformat_ip4_address, &l_addr))
-        ;
-      else if (unformat (line_input, "external %U %u", unformat_ip4_address,
-                         &e_addr, &e_port))
-        addr_only = 0;
-      else if (unformat (line_input, "external %U", unformat_ip4_address,
-                         &e_addr))
-        ;
-      else if (unformat (line_input, "vrf %u", &vrf_id))
-        ;
-      else if (unformat (line_input, "del"))
-        is_add = 0;
-      else
-        return clib_error_return (0, "unknown input: '%U'",
-          format_unformat_error, line_input);
-    }
-  unformat_free (line_input);
-
-  rv = snat_add_static_mapping(l_addr, e_addr, (u16) l_port, (u16) e_port,
-                               vrf_id, addr_only, is_add);
-
-  switch (rv)
-    {
-    case VNET_API_ERROR_INVALID_VALUE:
-      return clib_error_return (0, "External port already in use.");
-      break;
-    case VNET_API_ERROR_NO_SUCH_ENTRY:
-      if (is_add)
-        return clib_error_return (0, "External addres must be allocated.");
-      else
-        return clib_error_return (0, "Mapping not exist.");
-      break;
-    case VNET_API_ERROR_NO_SUCH_FIB:
-      return clib_error_return (0, "No such VRF id.");
-    case VNET_API_ERROR_VALUE_EXIST:
-      return clib_error_return (0, "Mapping already exist.");
-    default:
-      break;
-    }
-
-  return error;
-}
-
-/*?
- * @cliexpar
- * @cliexstart{snat add static mapping}
- * Static mapping allows hosts on the external network to initiate connection
- * to to the local network host.
- * To create static mapping between local host address 10.0.0.3 port 6303 and
- * external address 4.4.4.4 port 3606 use:
- *  vpp# snat add static mapping local 10.0.0.3 6303 external 4.4.4.4 3606
- * If not runnig "static mapping only" S-NAT plugin mode use before:
- *  vpp# snat add address 4.4.4.4
- * To create static mapping between local and external address use:
- *  vpp# snat add static mapping local 10.0.0.3 external 4.4.4.4
- * @cliexend
-?*/
-VLIB_CLI_COMMAND (add_static_mapping_command, static) = {
-  .path = "snat add static mapping",
-  .function = add_static_mapping_command_fn,
-  .short_help =
-    "snat add static mapping local <addr> [<port>] external <addr> [<port>] [vrf <table-id>] [del]",
-};
-
-static clib_error_t *
-set_workers_command_fn (vlib_main_t * vm,
-                        unformat_input_t * input,
-                        vlib_cli_command_t * cmd)
-{
-  unformat_input_t _line_input, *line_input = &_line_input;
-  uword *bitmap = 0;
-  int rv = 0;
-
-  /* Get a line of input. */
-  if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
-
-  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (line_input, "%U", unformat_bitmap_list, &bitmap))
-        ;
-      else
-        return clib_error_return (0, "unknown input '%U'",
-          format_unformat_error, input);
-     }
-  unformat_free (line_input);
-
-  if (bitmap == 0)
-    return clib_error_return (0, "List of workers must be specified.");
-
-  rv = snat_set_workers(bitmap);
-
-  clib_bitmap_free (bitmap);
-
-  switch (rv)
-    {
-    case VNET_API_ERROR_INVALID_WORKER:
-      return clib_error_return (0, "Invalid worker(s).");
-      break;
-    case VNET_API_ERROR_FEATURE_DISABLED:
-      return clib_error_return (0,
-        "Supported only if 2 or more workes available.");
-      break;
-    default:
-      break;
-    }
-
-  return 0;
-}
-
-/*?
- * @cliexpar
- * @cliexstart{set snat workers}
- * Set SNAT workers if 2 or more workers available, use:
- *  vpp# set snat workers 0-2,5
- * @cliexend
-?*/
-VLIB_CLI_COMMAND (set_workers_command, static) = {
-  .path = "set snat workers",
-  .function = set_workers_command_fn,
-  .short_help =
-    "set snat workers <workers-list>",
-};
-
-static clib_error_t *
-snat_config (vlib_main_t * vm, unformat_input_t * input)
-{
-  snat_main_t * sm = &snat_main;
-  u32 translation_buckets = 1024;
-  u32 translation_memory_size = 128<<20;
-  u32 user_buckets = 128;
-  u32 user_memory_size = 64<<20;
-  u32 max_translations_per_user = 100;
-  u32 outside_vrf_id = 0;
-  u32 inside_vrf_id = 0;
-  u32 static_mapping_buckets = 1024;
-  u32 static_mapping_memory_size = 64<<20;
-  u8 static_mapping_only = 0;
-  u8 static_mapping_connection_tracking = 0;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "translation hash buckets %d", &translation_buckets))
-        ;
-      else if (unformat (input, "translation hash memory %d",
-                         &translation_memory_size));
-      else if (unformat (input, "user hash buckets %d", &user_buckets))
-        ;
-      else if (unformat (input, "user hash memory %d",
-                         &user_memory_size))
-        ;
-      else if (unformat (input, "max translations per user %d",
-                         &max_translations_per_user))
-        ;
-      else if (unformat (input, "outside VRF id %d",
-                         &outside_vrf_id))
-        ;
-      else if (unformat (input, "inside VRF id %d",
-                         &inside_vrf_id))
-        ;
-      else if (unformat (input, "static mapping only"))
-        {
-          static_mapping_only = 1;
-          if (unformat (input, "connection tracking"))
-            static_mapping_connection_tracking = 1;
-        }
-      else 
-	return clib_error_return (0, "unknown input '%U'",
-				  format_unformat_error, input);
-    }
-
-  /* for show commands, etc. */
-  sm->translation_buckets = translation_buckets;
-  sm->translation_memory_size = translation_memory_size;
-  sm->user_buckets = user_buckets;
-  sm->user_memory_size = user_memory_size;
-  sm->max_translations_per_user = max_translations_per_user;
-  sm->outside_vrf_id = outside_vrf_id;
-  sm->outside_fib_index = ~0;
-  sm->inside_vrf_id = inside_vrf_id;
-  sm->inside_fib_index = ~0;
-  sm->static_mapping_only = static_mapping_only;
-  sm->static_mapping_connection_tracking = static_mapping_connection_tracking;
-
-  if (!static_mapping_only ||
-      (static_mapping_only && static_mapping_connection_tracking))
-    {
-      clib_bihash_init_8_8 (&sm->worker_by_in, "worker-by-in", user_buckets,
-                            user_memory_size);
-
-      clib_bihash_init_8_8 (&sm->worker_by_out, "worker-by-out", user_buckets,
-                            user_memory_size);
-
-      vec_validate (sm->per_thread_data, tm->n_vlib_mains - 1);
-
-      clib_bihash_init_8_8 (&sm->in2out, "in2out", translation_buckets,
-                            translation_memory_size);
-
-      clib_bihash_init_8_8 (&sm->out2in, "out2in", translation_buckets,
-                            translation_memory_size);
-
-      clib_bihash_init_8_8 (&sm->user_hash, "users", user_buckets,
-                            user_memory_size);
-    }
-  clib_bihash_init_8_8 (&sm->static_mapping_by_local,
-                        "static_mapping_by_local", static_mapping_buckets,
-                        static_mapping_memory_size);
-
-  clib_bihash_init_8_8 (&sm->static_mapping_by_external,
-                        "static_mapping_by_external", static_mapping_buckets,
-                        static_mapping_memory_size);
-  return 0;
-}
-
-VLIB_CONFIG_FUNCTION (snat_config, "snat");
-
-u8 * format_snat_key (u8 * s, va_list * args)
-{
-  snat_session_key_t * key = va_arg (*args, snat_session_key_t *);
-  char * protocol_string = "unknown";
-  static char *protocol_strings[] = {
-      "UDP",
-      "TCP",
-      "ICMP",
-  };
-
-  if (key->protocol < ARRAY_LEN(protocol_strings))
-      protocol_string = protocol_strings[key->protocol];
-
-  s = format (s, "%U proto %s port %d fib %d",
-              format_ip4_address, &key->addr, protocol_string,
-              clib_net_to_host_u16 (key->port), key->fib_index);
-  return s;
-}
-
-u8 * format_snat_session (u8 * s, va_list * args)
-{
-  snat_main_t * sm __attribute__((unused)) = va_arg (*args, snat_main_t *);
-  snat_session_t * sess = va_arg (*args, snat_session_t *);
-
-  s = format (s, "  i2o %U\n", format_snat_key, &sess->in2out);
-  s = format (s, "    o2i %U\n", format_snat_key, &sess->out2in);
-  s = format (s, "       last heard %.2f\n", sess->last_heard);
-  s = format (s, "       total pkts %d, total bytes %lld\n",
-              sess->total_pkts, sess->total_bytes);
-  if (snat_is_session_static (sess))
-    s = format (s, "       static translation\n");
-  else
-    s = format (s, "       dynamic translation\n");
-
-  return s;
-}
-
-u8 * format_snat_user (u8 * s, va_list * args)
-{
-  snat_main_per_thread_data_t * sm = va_arg (*args, snat_main_per_thread_data_t *);
-  snat_user_t * u = va_arg (*args, snat_user_t *);
-  int verbose = va_arg (*args, int);
-  dlist_elt_t * head, * elt;
-  u32 elt_index, head_index;
-  u32 session_index;
-  snat_session_t * sess;
-
-  s = format (s, "%U: %d dynamic translations, %d static translations\n",
-              format_ip4_address, &u->addr, u->nsessions, u->nstaticsessions);
-
-  if (verbose == 0)
-    return s;
-
-  if (u->nsessions || u->nstaticsessions)
-    {
-      head_index = u->sessions_per_user_list_head_index;
-      head = pool_elt_at_index (sm->list_pool, head_index);
-
-      elt_index = head->next;
-      elt = pool_elt_at_index (sm->list_pool, elt_index);
-      session_index = elt->value;
-
-      while (session_index != ~0)
-        {
-          sess = pool_elt_at_index (sm->sessions, session_index);
-
-          s = format (s, "  %U\n", format_snat_session, sm, sess);
-
-          elt_index = elt->next;
-          elt = pool_elt_at_index (sm->list_pool, elt_index);
-          session_index = elt->value;
-        }
-    }
-
-  return s;
-}
-
-u8 * format_snat_static_mapping (u8 * s, va_list * args)
-{
-  snat_static_mapping_t *m = va_arg (*args, snat_static_mapping_t *);
-
-  if (m->addr_only)
-      s = format (s, "local %U external %U vrf %d",
-                  format_ip4_address, &m->local_addr,
-                  format_ip4_address, &m->external_addr,
-                  m->vrf_id);
-  else
-      s = format (s, "local %U:%d external %U:%d vrf %d",
-                  format_ip4_address, &m->local_addr, m->local_port,
-                  format_ip4_address, &m->external_addr, m->external_port,
-                  m->vrf_id);
-
-  return s;
-}
-
-static clib_error_t *
-show_snat_command_fn (vlib_main_t * vm,
-		 unformat_input_t * input,
-		 vlib_cli_command_t * cmd)
-{
-  int verbose = 0;
-  snat_main_t * sm = &snat_main;
-  snat_user_t * u;
-  snat_static_mapping_t *m;
-  snat_interface_t *i;
-  snat_address_t * ap;
-  vnet_main_t *vnm = vnet_get_main();
-  snat_main_per_thread_data_t *tsm;
-  u32 users_num = 0, sessions_num = 0, *worker;
-  uword j = 0;
-
-  if (unformat (input, "detail"))
-    verbose = 1;
-  else if (unformat (input, "verbose"))
-    verbose = 2;
-
-  if (sm->static_mapping_only)
-    {
-      if (sm->static_mapping_connection_tracking)
-        vlib_cli_output (vm, "SNAT mode: static mapping only connection "
-                         "tracking");
-      else
-        vlib_cli_output (vm, "SNAT mode: static mapping only");
-    }
-  else
-    {
-      vlib_cli_output (vm, "SNAT mode: dynamic translations enabled");
-    }
-
-  if (verbose > 0)
-    {
-      pool_foreach (i, sm->interfaces,
-      ({
-        vlib_cli_output (vm, "%U %s", format_vnet_sw_interface_name, vnm,
-                         vnet_get_sw_interface (vnm, i->sw_if_index),
-                         i->is_inside ? "in" : "out");
-      }));
-
-      vec_foreach (ap, sm->addresses)
-        {
-          u8 * s = format (0, "");
-          vlib_cli_output (vm, "%U", format_ip4_address, &ap->addr);
-          clib_bitmap_foreach (j, ap->busy_port_bitmap,
-            ({
-              s = format (s, " %d", j);
-            }));
-          vlib_cli_output (vm, "  %d busy ports:%v", ap->busy_ports, s);
-        }
-    }
-
-  if (sm->num_workers > 1)
-    {
-      vlib_cli_output (vm, "%d workers", vec_len (sm->workers));
-      if (verbose > 0)
-        {
-          vec_foreach (worker, sm->workers)
-            {
-              vlib_worker_thread_t *w =
-                vlib_worker_threads + *worker + sm->first_worker_index;
-              vlib_cli_output (vm, "  %v", w->name);
-            }
-        }
-    }
-
-  if (sm->static_mapping_only && !(sm->static_mapping_connection_tracking))
-    {
-      vlib_cli_output (vm, "%d static mappings",
-                       pool_elts (sm->static_mappings));
-
-      if (verbose > 0)
-        {
-          pool_foreach (m, sm->static_mappings,
-          ({
-            vlib_cli_output (vm, "%U", format_snat_static_mapping, m);
-          }));
-        }
-    }
-  else
-    {
-      vec_foreach (tsm, sm->per_thread_data)
-        {
-          users_num += pool_elts (tsm->users);
-          sessions_num += pool_elts (tsm->sessions);
-        }
-
-      vlib_cli_output (vm, "%d users, %d outside addresses, %d active sessions,"
-                       " %d static mappings",
-                       users_num,
-                       vec_len (sm->addresses),
-                       sessions_num,
-                       pool_elts (sm->static_mappings));
-
-      if (verbose > 0)
-        {
-          vlib_cli_output (vm, "%U", format_bihash_8_8, &sm->in2out,
-                           verbose - 1);
-          vlib_cli_output (vm, "%U", format_bihash_8_8, &sm->out2in,
-                           verbose - 1);
-          vlib_cli_output (vm, "%U", format_bihash_8_8, &sm->worker_by_in,
-                           verbose - 1);
-          vlib_cli_output (vm, "%U", format_bihash_8_8, &sm->worker_by_out,
-                           verbose - 1);
-          vec_foreach_index (j, sm->per_thread_data)
-            {
-              tsm = vec_elt_at_index (sm->per_thread_data, j);
-
-              if (pool_elts (tsm->users) == 0)
-                continue;
-
-              vlib_worker_thread_t *w = vlib_worker_threads + j;
-              vlib_cli_output (vm, "Thread %d (%v at lcore %u):", j, w->name,
-                               w->lcore_id);
-              vlib_cli_output (vm, "  %d list pool elements",
-                               pool_elts (tsm->list_pool));
-
-              pool_foreach (u, tsm->users,
-              ({
-                vlib_cli_output (vm, "  %U", format_snat_user, tsm, u,
-                                 verbose - 1);
-              }));
-            }
-
-          if (pool_elts (sm->static_mappings))
-            {
-              vlib_cli_output (vm, "static mappings:");
-              pool_foreach (m, sm->static_mappings,
-              ({
-                vlib_cli_output (vm, "%U", format_snat_static_mapping, m);
-              }));
-            }
-        }
-    }
-
-  return 0;
-}
-
-VLIB_CLI_COMMAND (show_snat_command, static) = {
-    .path = "show snat",
-    .short_help = "show snat",
-    .function = show_snat_command_fn,
-};
diff --git a/plugins/snat-plugin/snat/snat.h b/plugins/snat-plugin/snat/snat.h
deleted file mode 100644
index cb31dc51..00000000
--- a/plugins/snat-plugin/snat/snat.h
+++ /dev/null
@@ -1,259 +0,0 @@
-
-/*
- * snat.h - simple nat definitions
- *
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_snat_h__
-#define __included_snat_h__
-
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/icmp46_packet.h>
-#include <vnet/api_errno.h>
-#include <vppinfra/bihash_8_8.h>
-#include <vppinfra/dlist.h>
-#include <vppinfra/error.h>
-#include <vlibapi/api.h>
-
-/* Key */
-typedef struct {
-  union 
-  {
-    struct 
-    {
-      ip4_address_t addr;
-      u16 port;
-      u16 protocol:3,
-        fib_index:13;
-    };
-    u64 as_u64;
-  };
-} snat_session_key_t;
-
-typedef struct {
-  union
-  {
-    struct
-    {
-      ip4_address_t addr;
-      u32 fib_index;
-    };
-    u64 as_u64;
-  };
-} snat_user_key_t;
-
-typedef struct {
-  union
-  {
-    struct
-    {
-      ip4_address_t addr;
-      u16 port;
-      u16 fib_index;
-    };
-    u64 as_u64;
-  };
-} snat_static_mapping_key_t;
-
-
-typedef enum {
-  SNAT_PROTOCOL_UDP = 0,
-  SNAT_PROTOCOL_TCP,
-  SNAT_PROTOCOL_ICMP,
-} snat_protocol_t;
-
-
-#define SNAT_SESSION_FLAG_STATIC_MAPPING 1
-
-typedef CLIB_PACKED(struct {
-  snat_session_key_t out2in;    /* 0-15 */
-
-  snat_session_key_t in2out;    /* 16-31 */
-
-  u32 flags;                    /* 32-35 */
-
-  /* per-user translations */
-  u32 per_user_index;           /* 36-39 */
-
-  u32 per_user_list_head_index; /* 40-43 */
-
-  /* Last heard timer */
-  f64 last_heard;               /* 44-51 */
-
-  u64 total_bytes;              /* 52-59 */
-  
-  u32 total_pkts;               /* 60-63 */
-
-  /* Outside address */
-  u32 outside_address_index;    /* 64-67 */
-
-}) snat_session_t;
-
-
-typedef struct {
-  ip4_address_t addr;
-  u32 sessions_per_user_list_head_index;
-  u32 nsessions;
-  u32 nstaticsessions;
-} snat_user_t;
-
-typedef struct {
-  ip4_address_t addr;
-  u32 busy_ports;
-  uword * busy_port_bitmap;
-} snat_address_t;
-
-typedef struct {
-  ip4_address_t local_addr;
-  ip4_address_t external_addr;
-  u16 local_port;
-  u16 external_port;
-  u8 addr_only;
-  u32 vrf_id;
-  u32 fib_index;
-} snat_static_mapping_t;
-
-typedef struct {
-  u32 sw_if_index;
-  u8 is_inside;
-} snat_interface_t;
-
-typedef struct {
-  /* User pool */
-  snat_user_t * users;
-
-  /* Session pool */
-  snat_session_t * sessions;
-
-  /* Pool of doubly-linked list elements */
-  dlist_elt_t * list_pool;
-} snat_main_per_thread_data_t;
-
-typedef struct {
-  /* Main lookup tables */
-  clib_bihash_8_8_t out2in;
-  clib_bihash_8_8_t in2out;
-
-  /* Find-a-user => src address lookup */
-  clib_bihash_8_8_t user_hash;
-
-  /* Non-translated packets worker lookup => src address + VRF */
-  clib_bihash_8_8_t worker_by_in;
-
-  /* Translated packets worker lookup => IP address + port number */
-  clib_bihash_8_8_t worker_by_out;
-
-  u32 num_workers;
-  u32 first_worker_index;
-  u32 next_worker;
-  u32 * workers;
-
-  /* Per thread data */
-  snat_main_per_thread_data_t * per_thread_data;
-
-  /* Find a static mapping by local */
-  clib_bihash_8_8_t static_mapping_by_local;
-
-  /* Find a static mapping by external */
-  clib_bihash_8_8_t static_mapping_by_external;
-
-  /* Static mapping pool */
-  snat_static_mapping_t * static_mappings;
-
-  /* Interface pool */
-  snat_interface_t * interfaces;
-
-  /* Vector of outside addresses */
-  snat_address_t * addresses;
-
-  /* Randomize port allocation order */
-  u32 random_seed;
-
-  /* Worker handoff index */
-  u32 fq_in2out_index;
-  u32 fq_out2in_index;
-
-  /* Config parameters */
-  u8 static_mapping_only;
-  u8 static_mapping_connection_tracking;
-  u32 translation_buckets;
-  u32 translation_memory_size;
-  u32 user_buckets;
-  u32 user_memory_size;
-  u32 max_translations_per_user;
-  u32 outside_vrf_id;
-  u32 outside_fib_index;
-  u32 inside_vrf_id;
-  u32 inside_fib_index;
-
-  /* API message ID base */
-  u16 msg_id_base;
-
-  /* convenience */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-  ip4_main_t * ip4_main;
-  ip_lookup_main_t * ip4_lookup_main;
-  ethernet_main_t * ethernet_main;  
-  api_main_t * api_main;
-} snat_main_t;
-
-extern snat_main_t snat_main;
-extern vlib_node_registration_t snat_in2out_node;
-extern vlib_node_registration_t snat_out2in_node;
-extern vlib_node_registration_t snat_in2out_fast_node;
-extern vlib_node_registration_t snat_out2in_fast_node;
-extern vlib_node_registration_t snat_in2out_worker_handoff_node;
-extern vlib_node_registration_t snat_out2in_worker_handoff_node;
-
-void snat_free_outside_address_and_port (snat_main_t * sm, 
-                                         snat_session_key_t * k, 
-                                         u32 address_index);
-
-int snat_alloc_outside_address_and_port (snat_main_t * sm, 
-                                         snat_session_key_t * k,
-                                         u32 * address_indexp);
-
-int snat_static_mapping_match (snat_main_t * sm,
-                               snat_session_key_t match,
-                               snat_session_key_t * mapping,
-                               u8 by_external);
-
-format_function_t format_snat_user;
-
-typedef struct {
-  u32 cached_sw_if_index;
-  u32 cached_ip4_address;
-} snat_runtime_t;
-
-/** \brief Check if SNAT session is created from static mapping.
-    @param s SNAT session
-    @return 1 if SNAT session is created from static mapping otherwise 0
-*/
-#define snat_is_session_static(s) s->flags & SNAT_SESSION_FLAG_STATIC_MAPPING
-
-/* 
- * Why is this here? Because we don't need to touch this layer to
- * simply reply to an icmp. We need to change id to a unique
- * value to NAT an echo request/reply.
- */
-   
-typedef struct {
-  u16 identifier;
-  u16 sequence;
-} icmp_echo_header_t;
-
-#endif /* __included_snat_h__ */
diff --git a/plugins/snat-plugin/snat/snat_all_api_h.h b/plugins/snat-plugin/snat/snat_all_api_h.h
deleted file mode 100644
index 49017700..00000000
--- a/plugins/snat-plugin/snat/snat_all_api_h.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/*
- * snat_all_api_h.h - skeleton vpp engine plug-in api #include file
- *
- * Copyright (c) <current-year> <your-organization>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Include the generated file, see BUILT_SOURCES in Makefile.am */
-#include <snat/snat.api.h>
diff --git a/plugins/snat-plugin/snat/snat_msg_enum.h b/plugins/snat-plugin/snat/snat_msg_enum.h
deleted file mode 100644
index 2c76fd51..00000000
--- a/plugins/snat-plugin/snat/snat_msg_enum.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-/*
- * snat_msg_enum.h - skeleton vpp engine plug-in message enumeration
- *
- * Copyright (c) <current-year> <your-organization>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_snat_msg_enum_h
-#define included_snat_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <snat/snat_all_api_h.h>
-    /* We'll want to know how many messages IDs we need... */
-    VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* included_snat_msg_enum_h */
diff --git a/plugins/snat-plugin/snat/snat_test.c b/plugins/snat-plugin/snat/snat_test.c
deleted file mode 100644
index 2a003ba6..00000000
--- a/plugins/snat-plugin/snat/snat_test.c
+++ /dev/null
@@ -1,602 +0,0 @@
-
-/*
- * snat.c - skeleton vpp-api-test plug-in 
- *
- * Copyright (c) <current-year> <your-organization>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <vat/vat.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
-#include <vppinfra/error.h>
-#include <vnet/ip/ip.h>
-
-uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
-
-/* Declare message IDs */
-#include <snat/snat_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <snat/snat_all_api_h.h> 
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun             /* define message structures */
-#include <snat/snat_all_api_h.h> 
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <snat/snat_all_api_h.h> 
-#undef vl_printfun
-
-/* Get the API version number. */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <snat/snat_all_api_h.h>
-#undef vl_api_version
-
-typedef struct {
-    /* API message ID base */
-    u16 msg_id_base;
-    vat_main_t *vat_main;
-} snat_test_main_t;
-
-snat_test_main_t snat_test_main;
-
-#define foreach_standard_reply_retval_handler   \
-_(snat_add_address_range_reply)                 \
-_(snat_interface_add_del_feature_reply)         \
-_(snat_add_static_mapping_reply)                \
-_(snat_set_workers_reply)
-
-#define _(n)                                            \
-    static void vl_api_##n##_t_handler                  \
-    (vl_api_##n##_t * mp)                               \
-    {                                                   \
-        vat_main_t * vam = snat_test_main.vat_main;   \
-        i32 retval = ntohl(mp->retval);                 \
-        if (vam->async_mode) {                          \
-            vam->async_errors += (retval < 0);          \
-        } else {                                        \
-            vam->retval = retval;                       \
-            vam->result_ready = 1;                      \
-        }                                               \
-    }
-foreach_standard_reply_retval_handler;
-#undef _
-
-/* 
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg                               \
-_(SNAT_ADD_ADDRESS_RANGE_REPLY, snat_add_address_range_reply)   \
-_(SNAT_INTERFACE_ADD_DEL_FEATURE_REPLY,                         \
-  snat_interface_add_del_feature_reply)                         \
-_(SNAT_ADD_STATIC_MAPPING_REPLY, snat_add_static_mapping_reply) \
-_(SNAT_CONTROL_PING_REPLY, snat_control_ping_reply)             \
-_(SNAT_STATIC_MAPPING_DETAILS, snat_static_mapping_details)     \
-_(SNAT_SHOW_CONFIG_REPLY, snat_show_config_reply)               \
-_(SNAT_ADDRESS_DETAILS, snat_address_details)                   \
-_(SNAT_INTERFACE_DETAILS, snat_interface_details)               \
-_(SNAT_SET_WORKERS_REPLY, snat_set_workers_reply)               \
-_(SNAT_WORKER_DETAILS, snat_worker_details)
-
-/* M: construct, but don't yet send a message */
-#define M(T,t)                                                  \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp));                         \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-#define M2(T,t,n)                                               \
-do {                                                            \
-    vam->result_ready = 0;                                      \
-    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
-    memset (mp, 0, sizeof (*mp));                               \
-    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
-    mp->client_index = vam->my_client_index;                    \
-} while(0);
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W                                       \
-do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
-                                                \
-    while (vat_time_now (vam) < timeout) {      \
-        if (vam->result_ready == 1) {           \
-            return (vam->retval);               \
-        }                                       \
-    }                                           \
-    return -99;                                 \
-} while(0);
-
-static int api_snat_add_address_range (vat_main_t * vam)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  unformat_input_t * i = vam->input;
-  f64 timeout;
-  ip4_address_t start_addr, end_addr;
-  u32 start_host_order, end_host_order;
-  vl_api_snat_add_address_range_t * mp;
-  u8 is_add = 1;
-  int count;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U - %U",
-                    unformat_ip4_address, &start_addr,
-                    unformat_ip4_address, &end_addr))
-        ;
-      else if (unformat (i, "%U", unformat_ip4_address, &start_addr))
-        end_addr = start_addr;
-      else if (unformat (i, "del"))
-        is_add = 0;
-      else
-        {
-          clib_warning("unknown input '%U'", format_unformat_error, i);
-          return -99;
-        }
-    }
-
-  start_host_order = clib_host_to_net_u32 (start_addr.as_u32);
-  end_host_order = clib_host_to_net_u32 (end_addr.as_u32);
-  
-  if (end_host_order < start_host_order)
-    {
-      errmsg ("end address less than start address\n");
-      return -99;
-    }
-
-  count = (end_host_order - start_host_order) + 1;
-
-  if (count > 1024)
-    {
-    errmsg ("%U - %U, %d addresses...\n",
-           format_ip4_address, &start_addr,
-           format_ip4_address, &end_addr,
-           count);
-    }
-  
-  M(SNAT_ADD_ADDRESS_RANGE, snat_add_address_range);
-
-  memcpy (mp->first_ip_address, &start_addr, 4);
-  memcpy (mp->last_ip_address, &end_addr, 4);
-  mp->is_ip4 = 1;
-  mp->is_add = is_add;
-
-  S; W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static int api_snat_interface_add_del_feature (vat_main_t * vam)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  unformat_input_t * i = vam->input;
-  f64 timeout;
-  vl_api_snat_interface_add_del_feature_t * mp;
-  u32 sw_if_index;
-  u8 sw_if_index_set = 0;
-  u8 is_inside = 1; 
-  u8 is_add = 1;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
-        sw_if_index_set = 1;
-      else if (unformat (i, "sw_if_index %d", &sw_if_index))
-        sw_if_index_set = 1;
-      else if (unformat (i, "out"))
-        is_inside = 0;
-      else if (unformat (i, "in"))
-        is_inside = 1;
-      else if (unformat (i, "del"))
-        is_add = 0;
-      else
-        {
-          clib_warning("unknown input '%U'", format_unformat_error, i);
-          return -99;
-        }
-    }
-
-  if (sw_if_index_set == 0)
-    {
-      errmsg ("interface / sw_if_index required\n");
-      return -99;
-    }
-
-  M(SNAT_INTERFACE_ADD_DEL_FEATURE, snat_interface_add_del_feature);
-  mp->sw_if_index = ntohl(sw_if_index);
-  mp->is_add = is_add;
-  mp->is_inside = is_inside;
-  
-  S; W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int api_snat_add_static_mapping(vat_main_t * vam)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  unformat_input_t * i = vam->input;
-  f64 timeout;
-  vl_api_snat_add_static_mapping_t * mp;
-  u8 addr_set_n = 0;
-  u8 is_add = 1;
-  u8 addr_only = 1;
-  ip4_address_t local_addr, external_addr;
-  u32 local_port = 0, external_port = 0, vrf_id = ~0;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "local_addr %U", unformat_ip4_address, &local_addr))
-        addr_set_n++;
-      else if (unformat (i, "external_addr %U", unformat_ip4_address,
-                         &external_addr))
-        addr_set_n++;
-      else if (unformat (i, "local_port %u", &local_port))
-        addr_only = 0;
-      else if (unformat (i, "external_port %u", &external_port))
-        addr_only = 0;
-      else if (unformat (i, "vrf %u", &vrf_id))
-        ;
-      else if (unformat (i, "del"))
-        is_add = 0;
-      else
-        {
-          clib_warning("unknown input '%U'", format_unformat_error, i);
-          return -99;
-        }
-    }
-
-  if (addr_set_n != 2)
-    {
-      errmsg ("local_addr and remote_addr required\n");
-      return -99;
-    }
-
-  M(SNAT_ADD_STATIC_MAPPING, snat_add_static_mapping);
-  mp->is_add = is_add;
-  mp->is_ip4 = 1;
-  mp->addr_only = addr_only;
-  mp->local_port = ntohs ((u16) local_port);
-  mp->external_port = ntohs ((u16) external_port);
-  mp->vrf_id = ntohl (vrf_id);
-  memcpy (mp->local_ip_address, &local_addr, 4);
-  memcpy (mp->external_ip_address, &external_addr, 4);
-
-  S; W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static void vl_api_snat_control_ping_reply_t_handler
-  (vl_api_snat_control_ping_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-  if (vam->async_mode)
-    {
-      vam->async_errors += (retval < 0);
-    }
-  else
-    {
-      vam->retval = retval;
-      vam->result_ready = 1;
-    }
-}
-
-static void vl_api_snat_static_mapping_details_t_handler
-  (vl_api_snat_static_mapping_details_t *mp)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  vat_main_t *vam = sm->vat_main;
-
-  if (mp->addr_only)
-      fformat (vam->ofp, "%15U%6s%15U%6s%11d\n",
-               format_ip4_address, &mp->local_ip_address, "",
-               format_ip4_address, &mp->external_ip_address, "",
-               ntohl (mp->vrf_id));
-  else
-      fformat (vam->ofp, "%15U%6d%15U%6d%11d\n",
-               format_ip4_address, &mp->local_ip_address,
-               ntohs (mp->local_port),
-               format_ip4_address, &mp->external_ip_address,
-               ntohs (mp->external_port),
-               ntohl (mp->vrf_id));
-
-}
-
-static int api_snat_static_mapping_dump(vat_main_t * vam)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  f64 timeout;
-  vl_api_snat_static_mapping_dump_t * mp;
-
-  if (vam->json_output)
-    {
-      clib_warning ("JSON output not supported for snat_static_mapping_dump");
-      return -99;
-    }
-
-  fformat (vam->ofp, "%21s%21s\n", "local", "external");
-  fformat (vam->ofp, "%15s%6s%15s%6s%11s\n", "address", "port", "address",
-           "port", "vrf");
-
-  M(SNAT_STATIC_MAPPING_DUMP, snat_static_mapping_dump);
-  S;
-  /* Use a control ping for synchronization */
-  {
-    vl_api_snat_control_ping_t *mp;
-    M (SNAT_CONTROL_PING, snat_control_ping);
-    S;
-  }
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static void vl_api_snat_show_config_reply_t_handler
-  (vl_api_snat_show_config_reply_t *mp)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  vat_main_t *vam = sm->vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  if (retval >= 0)
-    {
-      fformat (vam->ofp, "translation hash buckets %d\n",
-               ntohl (mp->translation_buckets));
-      fformat (vam->ofp, "translation hash memory %d\n",
-               ntohl (mp->translation_memory_size));
-      fformat (vam->ofp, "user hash buckets %d\n", ntohl (mp->user_buckets));
-      fformat (vam->ofp, "user hash memory %d\n", ntohl (mp->user_memory_size));
-      fformat (vam->ofp, "max translations per user %d\n",
-               ntohl (mp->max_translations_per_user));
-      fformat (vam->ofp, "outside VRF id %d\n", ntohl (mp->outside_vrf_id));
-      fformat (vam->ofp, "inside VRF id %d\n", ntohl (mp->inside_vrf_id));
-      if (mp->static_mapping_only)
-        {
-          fformat (vam->ofp, "static mapping only");
-          if (mp->static_mapping_connection_tracking)
-            fformat (vam->ofp, " connection tracking");
-          fformat (vam->ofp, "\n");
-        }
-    }
-  vam->retval = retval;
-  vam->result_ready = 1;
-}
-
-static int api_snat_show_config(vat_main_t * vam)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  f64 timeout;
-  vl_api_snat_show_config_t * mp;
-
-  if (vam->json_output)
-    {
-      clib_warning ("JSON output not supported for snat_show_config");
-      return -99;
-    }
-
-  M(SNAT_SHOW_CONFIG, snat_show_config);
-  S; W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static void vl_api_snat_address_details_t_handler
-  (vl_api_snat_address_details_t *mp)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  vat_main_t *vam = sm->vat_main;
-
-  fformat (vam->ofp, "%U\n", format_ip4_address, &mp->ip_address);
-}
-
-static int api_snat_address_dump(vat_main_t * vam)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  f64 timeout;
-  vl_api_snat_address_dump_t * mp;
-
-  if (vam->json_output)
-    {
-      clib_warning ("JSON output not supported for snat_address_dump");
-      return -99;
-    }
-
-  M(SNAT_ADDRESS_DUMP, snat_address_dump);
-  S;
-  /* Use a control ping for synchronization */
-  {
-    vl_api_snat_control_ping_t *mp;
-    M (SNAT_CONTROL_PING, snat_control_ping);
-    S;
-  }
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static void vl_api_snat_interface_details_t_handler
-  (vl_api_snat_interface_details_t *mp)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  vat_main_t *vam = sm->vat_main;
-
-  fformat (vam->ofp, "sw_if_index %d %s\n", ntohl (mp->sw_if_index),
-           mp->is_inside ? "in" : "out");
-}
-
-static int api_snat_interface_dump(vat_main_t * vam)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  f64 timeout;
-  vl_api_snat_interface_dump_t * mp;
-
-  if (vam->json_output)
-    {
-      clib_warning ("JSON output not supported for snat_address_dump");
-      return -99;
-    }
-
-  M(SNAT_INTERFACE_DUMP, snat_interface_dump);
-  S;
-  /* Use a control ping for synchronization */
-  {
-    vl_api_snat_control_ping_t *mp;
-    M (SNAT_CONTROL_PING, snat_control_ping);
-    S;
-  }
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-static int api_snat_set_workers (vat_main_t * vam)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  unformat_input_t * i = vam->input;
-  f64 timeout;
-  vl_api_snat_set_workers_t * mp;
-  uword *bitmap;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "%U", unformat_bitmap_list, &bitmap))
-        ;
-      else
-        {
-          clib_warning("unknown input '%U'", format_unformat_error, i);
-          return -99;
-        }
-    }
-
-  M(SNAT_SET_WORKERS, snat_set_workers);
-  mp->worker_mask = clib_host_to_net_u64 (bitmap[0]);
-
-  S; W;
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static void vl_api_snat_worker_details_t_handler
-  (vl_api_snat_worker_details_t *mp)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  vat_main_t *vam = sm->vat_main;
-
-  fformat (vam->ofp, "worker_index %d (%s at lcore %u)\n",
-           ntohl (mp->worker_index), mp->name, ntohl (mp->lcore_id));
-}
-
-static int api_snat_worker_dump(vat_main_t * vam)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  f64 timeout;
-  vl_api_snat_worker_dump_t * mp;
-
-  if (vam->json_output)
-    {
-      clib_warning ("JSON output not supported for snat_address_dump");
-      return -99;
-    }
-
-  M(SNAT_WORKER_DUMP, snat_worker_dump);
-  S;
-  /* Use a control ping for synchronization */
-  {
-    vl_api_snat_control_ping_t *mp;
-    M (SNAT_CONTROL_PING, snat_control_ping);
-    S;
-  }
-  W;
-  /* NOTREACHED */
-  return 0;
-}
-
-/* 
- * List of messages that the api test plugin sends,
- * and that the data plane plugin processes
- */
-#define foreach_vpe_api_msg                                      \
-_(snat_add_address_range, "<start-addr> [- <end-addr] [del]")    \
-_(snat_interface_add_del_feature,                                \
-  "<intfc> | sw_if_index <id> [in] [out] [del]")                 \
-_(snat_add_static_mapping, "local_addr <ip> external_addr <ip> " \
-  "[local_port <n>] [external_port <n>] [vrf <table-id>] [del]") \
-_(snat_set_workers, "<wokrers_bitmap>")                          \
-_(snat_static_mapping_dump, "")                                  \
-_(snat_show_config, "")                                          \
-_(snat_address_dump, "")                                         \
-_(snat_interface_dump, "")                                       \
-_(snat_worker_dump, "")
-
-void vat_api_hookup (vat_main_t *vam)
-{
-  snat_test_main_t * sm __attribute__((unused)) = &snat_test_main;
-  /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n)                                                  \
-  vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),       \
-                          #n,                                   \
-                          vl_api_##n##_t_handler,               \
-                          vl_noop_handler,                      \
-                          vl_api_##n##_t_endian,                \
-                          vl_api_##n##_t_print,                 \
-                          sizeof(vl_api_##n##_t), 1); 
-  foreach_vpe_api_reply_msg;
-#undef _
-
-  /* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
-  foreach_vpe_api_msg;
-#undef _    
-    
-  /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
-  foreach_vpe_api_msg;
-#undef _
-}
-
-clib_error_t * vat_plugin_register (vat_main_t *vam)
-{
-  snat_test_main_t * sm = &snat_test_main;
-  u8 * name;
-
-  sm->vat_main = vam;
-
-  /* Ask the vpp engine for the first assigned message-id */
-  name = format (0, "snat_%08x%c", api_version, 0);
-  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (sm->msg_id_base != (u16) ~0)
-    vat_api_hookup (vam);
-  
-  vec_free(name);
-  
-  return 0;
-}
diff --git a/src/Makefile.am b/src/Makefile.am
index e691a539..0fc437a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,7 +79,15 @@ include vnet.am
 include vpp.am
 include vpp-api-test.am
 
-SUBDIRS += vpp-api/python plugins
+SUBDIRS += plugins
+
+if ENABLE_PAPI
+SUBDIRS += vpp-api/python
+endif
+
+if ENABLE_JAPI
+SUBDIRS += vpp-api/java
+endif
 
 ###############################################################################
 # API
diff --git a/src/configure.ac b/src/configure.ac
index f8e4d94f..4ed55705 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3,7 +3,8 @@ LT_INIT
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_SILENT_RULES([yes])
-AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile])
+AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile vpp-api/java/Makefile])
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_PROG_CC
 AM_PROG_AS
@@ -89,6 +90,8 @@ ENABLE_ARG(g2,		[Enable g2])
 # --disable-X
 DISABLE_ARG(vlib,	[Disable vlib and dependant libs and binaries])
 DISABLE_ARG(svm,	[Disable svm and dependant libs and binaries])
+DISABLE_ARG(papi,	[Disable Python API bindings])
+DISABLE_ARG(japi,	[Disable Java API bindings])
 
 # --with-X
 WITH_ARG(dpdk,		[Use use DPDK])
@@ -131,6 +134,25 @@ AC_DEFINE_UNQUOTED(DPDK_CRYPTO,		[${n_with_dpdk_crypto}])
 AC_DEFINE_UNQUOTED(IPSEC,		[${n_with_ipsec}])
 AC_DEFINE_UNQUOTED(IPV6SR,		[${n_with_ipv6sr}])
 
+
+# Silence following noise:
+# ar: `u' modifier ignored since `D' is the default (see `U')
+AR_FLAGS=cr
+AC_SUBST(AR_FLAGS)
+
+###############################################################################
+# Plugins
+###############################################################################
+
+# Please keep alphabetical order
+PLUGIN_ENABLED(acl)
+PLUGIN_ENABLED(flowperpkt)
+PLUGIN_ENABLED(ila)
+PLUGIN_ENABLED(ioam)
+PLUGIN_ENABLED(lb)
+PLUGIN_ENABLED(sixrd)
+PLUGIN_ENABLED(snat)
+
 ###############################################################################
 # Dependency checks
 ###############################################################################
@@ -151,12 +173,17 @@ AM_COND_IF([ENABLE_G2],
 ])
 
 ###############################################################################
-# Plugins
+# JAVA
 ###############################################################################
 
-PLUGIN_ENABLED(sixrd)
-PLUGIN_ENABLED(ila)
-PLUGIN_ENABLED(flowperpkt)
+AM_COND_IF([ENABLE_JAPI],
+[
+  AX_VPP_FIND_JDK8
+  AC_SUBST(JAVA_HOME)
+  AC_SUBST(JAVAC)
+  AC_SUBST(JAVAH)
+  AC_SUBST(JAR)
+])
 
 ###############################################################################
 # Output
@@ -172,6 +199,11 @@ PRINT_VAL([includedir], ${includedir})
 PRINT_VAL([CFLAGS], ${CFLAGS})
 PRINT_VAL([CPPFLAGS], ${CPPFLAGS})
 PRINT_VAL([LDFLAGS], ${LDFLAGS})
+AM_COND_IF([ENABLE_JAPI],
+[
+  PRINT_VAL([JAVA_VERSION], ${JAVA_VERSION})
+  PRINT_VAL([JAVA_HOME], ${JAVA_HOME})
+])
 
 AC_MSG_RESULT([])
 AC_MSG_RESULT([with:])
diff --git a/src/examples/sample-plugin/Makefile.am b/src/examples/sample-plugin/Makefile.am
new file mode 100644
index 00000000..e221f8c1
--- /dev/null
+++ b/src/examples/sample-plugin/Makefile.am
@@ -0,0 +1,56 @@
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+AUTOMAKE_OPTIONS = foreign subdir-objects
+
+AM_CFLAGS = -Wall
+AM_LDFLAGS = -module -shared -avoid-version
+
+vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
+vpppluginsdir = ${libdir}/vpp_plugins
+
+vppapitestplugins_LTLIBRARIES = sample_test_plugin.la
+vppplugins_LTLIBRARIES = sample_plugin.la
+
+sample_plugin_la_SOURCES = sample/sample.c sample/node.c \
+	sample/sample_plugin.api.h
+
+BUILT_SOURCES = sample/sample.api.h sample/sample.api.json
+
+SUFFIXES = .api.h .api
+
+%.api.h: %.api
+	mkdir -p `dirname $@` ; \
+	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
+	| vppapigen --input - --output $@ --show-name $@
+
+%.api.json: %.api
+	@echo "  JSON APIGEN  " $@ ;				\
+	mkdir -p `dirname $@` ;					\
+	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
+	| vppapigen --input - --json $@
+
+apidir = $(prefix)/sample/
+api_DATA = sample.api.json
+
+noinst_HEADERS =				\
+  sample/sample_all_api_h.h			\
+  sample/sample_msg_enum.h			\
+  sample/sample.api.h
+
+sample_test_plugin_la_SOURCES = sample/sample_test.c sample/sample_plugin.api.h
+
+# Remove *.la files
+install-data-hook:
+	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
+	@(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
diff --git a/src/examples/sample-plugin/configure.ac b/src/examples/sample-plugin/configure.ac
new file mode 100644
index 00000000..43642732
--- /dev/null
+++ b/src/examples/sample-plugin/configure.ac
@@ -0,0 +1,9 @@
+AC_INIT(sample_plugin, 1.0)
+LT_INIT
+AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
+AC_PREFIX_DEFAULT([/usr])
+
+AC_PROG_CC
+
+AC_OUTPUT([Makefile])
diff --git a/src/examples/sample-plugin/sample/node.c b/src/examples/sample-plugin/sample/node.c
new file mode 100644
index 00000000..94c1706b
--- /dev/null
+++ b/src/examples/sample-plugin/sample/node.c
@@ -0,0 +1,295 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+#include <sample/sample.h>
+
+typedef struct {
+  u32 next_index;
+  u32 sw_if_index;
+  u8 new_src_mac[6];
+  u8 new_dst_mac[6];
+} sample_trace_t;
+
+static u8 *
+format_mac_address (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+		 a[0], a[1], a[2], a[3], a[4], a[5]);
+}
+
+/* packet trace format function */
+static u8 * format_sample_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  sample_trace_t * t = va_arg (*args, sample_trace_t *);
+  
+  s = format (s, "SAMPLE: sw_if_index %d, next index %d\n",
+              t->sw_if_index, t->next_index);
+  s = format (s, "  new src %U -> new dst %U",
+              format_mac_address, t->new_src_mac, 
+              format_mac_address, t->new_dst_mac);
+
+  return s;
+}
+
+vlib_node_registration_t sample_node;
+
+#define foreach_sample_error \
+_(SWAPPED, "Mac swap packets processed")
+
+typedef enum {
+#define _(sym,str) SAMPLE_ERROR_##sym,
+  foreach_sample_error
+#undef _
+  SAMPLE_N_ERROR,
+} sample_error_t;
+
+static char * sample_error_strings[] = {
+#define _(sym,string) string,
+  foreach_sample_error
+#undef _
+};
+
+typedef enum {
+  SAMPLE_NEXT_INTERFACE_OUTPUT,
+  SAMPLE_N_NEXT,
+} sample_next_t;
+
+#define foreach_mac_address_offset              \
+_(0)                                            \
+_(1)                                            \
+_(2)                                            \
+_(3)                                            \
+_(4)                                            \
+_(5)
+
+static uword
+sample_node_fn (vlib_main_t * vm,
+		  vlib_node_runtime_t * node,
+		  vlib_frame_t * frame)
+{
+  u32 n_left_from, * from, * to_next;
+  sample_next_t next_index;
+  u32 pkts_swapped = 0;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+          u32 next0 = SAMPLE_NEXT_INTERFACE_OUTPUT;
+          u32 next1 = SAMPLE_NEXT_INTERFACE_OUTPUT;
+          u32 sw_if_index0, sw_if_index1;
+          u8 tmp0[6], tmp1[6];
+          ethernet_header_t *en0, *en1;
+          u32 bi0, bi1;
+	  vlib_buffer_t * b0, * b1;
+          
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * p2, * p3;
+            
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+            
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+          /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+          ASSERT (b0->current_data == 0);
+          ASSERT (b1->current_data == 0);
+          
+          en0 = vlib_buffer_get_current (b0);
+          en1 = vlib_buffer_get_current (b1);
+
+          /* This is not the fastest way to swap src + dst mac addresses */
+#define _(a) tmp0[a] = en0->src_address[a];
+          foreach_mac_address_offset;
+#undef _
+#define _(a) en0->src_address[a] = en0->dst_address[a];
+          foreach_mac_address_offset;
+#undef _
+#define _(a) en0->dst_address[a] = tmp0[a];
+          foreach_mac_address_offset;
+#undef _
+
+#define _(a) tmp1[a] = en1->src_address[a];
+          foreach_mac_address_offset;
+#undef _
+#define _(a) en1->src_address[a] = en1->dst_address[a];
+          foreach_mac_address_offset;
+#undef _
+#define _(a) en1->dst_address[a] = tmp1[a];
+          foreach_mac_address_offset;
+#undef _
+
+
+
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
+
+          /* Send pkt back out the RX interface */
+          vnet_buffer(b0)->sw_if_index[VLIB_TX] = sw_if_index0;
+          vnet_buffer(b1)->sw_if_index[VLIB_TX] = sw_if_index1;
+
+          pkts_swapped += 2;
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)))
+            {
+              if (b0->flags & VLIB_BUFFER_IS_TRACED) 
+                {
+                    sample_trace_t *t = 
+                      vlib_add_trace (vm, node, b0, sizeof (*t));
+                    t->sw_if_index = sw_if_index0;
+                    t->next_index = next0;
+                    clib_memcpy (t->new_src_mac, en0->src_address,
+                                 sizeof (t->new_src_mac));
+                    clib_memcpy (t->new_dst_mac, en0->dst_address,
+                                 sizeof (t->new_dst_mac));
+                    
+                  }
+                if (b1->flags & VLIB_BUFFER_IS_TRACED) 
+                  {
+                    sample_trace_t *t = 
+                      vlib_add_trace (vm, node, b1, sizeof (*t));
+                    t->sw_if_index = sw_if_index1;
+                    t->next_index = next1;
+                    clib_memcpy (t->new_src_mac, en1->src_address,
+                                 sizeof (t->new_src_mac));
+                    clib_memcpy (t->new_dst_mac, en1->dst_address,
+                                 sizeof (t->new_dst_mac));
+                  }
+              }
+            
+            /* verify speculative enqueues, maybe switch current next frame */
+            vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+                                             to_next, n_left_to_next,
+                                             bi0, bi1, next0, next1);
+        }
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+          u32 bi0;
+	  vlib_buffer_t * b0;
+          u32 next0 = SAMPLE_NEXT_INTERFACE_OUTPUT;
+          u32 sw_if_index0;
+          u8 tmp0[6];
+          ethernet_header_t *en0;
+
+          /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+          /* 
+           * Direct from the driver, we should be at offset 0
+           * aka at &b0->data[0]
+           */
+          ASSERT (b0->current_data == 0);
+          
+          en0 = vlib_buffer_get_current (b0);
+
+          /* This is not the fastest way to swap src + dst mac addresses */
+#define _(a) tmp0[a] = en0->src_address[a];
+          foreach_mac_address_offset;
+#undef _
+#define _(a) en0->src_address[a] = en0->dst_address[a];
+          foreach_mac_address_offset;
+#undef _
+#define _(a) en0->dst_address[a] = tmp0[a];
+          foreach_mac_address_offset;
+#undef _
+
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+
+          /* Send pkt back out the RX interface */
+          vnet_buffer(b0)->sw_if_index[VLIB_TX] = sw_if_index0;
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) {
+            sample_trace_t *t = 
+               vlib_add_trace (vm, node, b0, sizeof (*t));
+            t->sw_if_index = sw_if_index0;
+            t->next_index = next0;
+            clib_memcpy (t->new_src_mac, en0->src_address,
+                         sizeof (t->new_src_mac));
+            clib_memcpy (t->new_dst_mac, en0->dst_address,
+                         sizeof (t->new_dst_mac));
+            }
+            
+          pkts_swapped += 1;
+
+          /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, sample_node.index, 
+                               SAMPLE_ERROR_SWAPPED, pkts_swapped);
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (sample_node) = {
+  .function = sample_node_fn,
+  .name = "sample",
+  .vector_size = sizeof (u32),
+  .format_trace = format_sample_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  
+  .n_errors = ARRAY_LEN(sample_error_strings),
+  .error_strings = sample_error_strings,
+
+  .n_next_nodes = SAMPLE_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+        [SAMPLE_NEXT_INTERFACE_OUTPUT] = "interface-output",
+  },
+};
diff --git a/src/examples/sample-plugin/sample/sample.api b/src/examples/sample-plugin/sample/sample.api
new file mode 100644
index 00000000..f99cdb38
--- /dev/null
+++ b/src/examples/sample-plugin/sample/sample.api
@@ -0,0 +1,39 @@
+/* Hey Emacs use -*- mode: C -*- */
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Define a simple binary API to control the feature */
+
+define sample_macswap_enable_disable {
+    /* Client identifier, set from api_main.my_client_index */
+    u32 client_index;
+
+    /* Arbitrary context, so client can match reply to request */
+    u32 context;
+
+    /* Enable / disable the feature */
+    u8 enable_disable;
+
+    /* Interface handle */
+    u32 sw_if_index;
+};
+
+define sample_macswap_enable_disable_reply {
+    /* From the request */
+    u32 context;
+
+    /* Return value, zero means all OK */
+    i32 retval;
+};
diff --git a/src/examples/sample-plugin/sample/sample.c b/src/examples/sample-plugin/sample/sample.c
new file mode 100644
index 00000000..603cb2d0
--- /dev/null
+++ b/src/examples/sample-plugin/sample/sample.c
@@ -0,0 +1,255 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * sample.c - simple MAC-swap API / debug CLI handling
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/plugin/plugin.h>
+#include <sample/sample.h>
+
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+
+/* define message IDs */
+#include <sample/sample_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <sample/sample_all_api_h.h> 
+#undef vl_typedefs
+
+/* define generated endian-swappers */
+#define vl_endianfun
+#include <sample/sample_all_api_h.h> 
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <sample/sample_all_api_h.h> 
+#undef vl_printfun
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <sample/sample_all_api_h.h>
+#undef vl_api_version
+
+/* 
+ * A handy macro to set up a message reply.
+ * Assumes that the following variables are available:
+ * mp - pointer to request message
+ * rmp - pointer to reply message type
+ * rv - return value
+ */
+
+#define REPLY_MACRO(t)                                          \
+do {                                                            \
+    unix_shared_memory_queue_t * q =                            \
+    vl_api_client_index_to_input_queue (mp->client_index);      \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+                                                                \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+
+/* List of message types that this plugin understands */
+
+#define foreach_sample_plugin_api_msg                           \
+_(SAMPLE_MACSWAP_ENABLE_DISABLE, sample_macswap_enable_disable)
+
+/* 
+ * This routine exists to convince the vlib plugin framework that
+ * we haven't accidentally copied a random .dll into the plugin directory.
+ *
+ * Also collects global variable pointers passed from the vpp engine
+ */
+
+clib_error_t * 
+vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
+                      int from_early_init)
+{
+  sample_main_t * sm = &sample_main;
+  clib_error_t * error = 0;
+
+  sm->vlib_main = vm;
+  sm->vnet_main = h->vnet_main;
+  sm->ethernet_main = h->ethernet_main;
+
+  return error;
+}
+
+/* Action function shared between message handler and debug CLI */
+
+int sample_macswap_enable_disable (sample_main_t * sm, u32 sw_if_index,
+                                   int enable_disable)
+{
+  vnet_sw_interface_t * sw;
+  int rv = 0;
+
+  /* Utterly wrong? */
+  if (pool_is_free_index (sm->vnet_main->interface_main.sw_interfaces, 
+                          sw_if_index))
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+  /* Not a physical port? */
+  sw = vnet_get_sw_interface (sm->vnet_main, sw_if_index);
+  if (sw->type != VNET_SW_INTERFACE_TYPE_HARDWARE)
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+  
+  vnet_feature_enable_disable ("device-input", "sample",
+                               sw_if_index, enable_disable, 0, 0);
+
+  return rv;
+}
+
+static clib_error_t *
+macswap_enable_disable_command_fn (vlib_main_t * vm,
+                                   unformat_input_t * input,
+                                   vlib_cli_command_t * cmd)
+{
+  sample_main_t * sm = &sample_main;
+  u32 sw_if_index = ~0;
+  int enable_disable = 1;
+    
+  int rv;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+    if (unformat (input, "disable"))
+      enable_disable = 0;
+    else if (unformat (input, "%U", unformat_vnet_sw_interface,
+                       sm->vnet_main, &sw_if_index))
+      ;
+    else
+      break;
+  }
+
+  if (sw_if_index == ~0)
+    return clib_error_return (0, "Please specify an interface...");
+    
+  rv = sample_macswap_enable_disable (sm, sw_if_index, enable_disable);
+
+  switch(rv) {
+  case 0:
+    break;
+
+  case VNET_API_ERROR_INVALID_SW_IF_INDEX:
+    return clib_error_return 
+      (0, "Invalid interface, only works on physical ports");
+    break;
+
+  case VNET_API_ERROR_UNIMPLEMENTED:
+    return clib_error_return (0, "Device driver doesn't support redirection");
+    break;
+
+  default:
+    return clib_error_return (0, "sample_macswap_enable_disable returned %d",
+                              rv);
+  }
+  return 0;
+}
+
+VLIB_CLI_COMMAND (sr_content_command, static) = {
+    .path = "sample macswap",
+    .short_help = 
+    "sample macswap <interface-name> [disable]",
+    .function = macswap_enable_disable_command_fn,
+};
+
+/* API message handler */
+static void vl_api_sample_macswap_enable_disable_t_handler
+(vl_api_sample_macswap_enable_disable_t * mp)
+{
+  vl_api_sample_macswap_enable_disable_reply_t * rmp;
+  sample_main_t * sm = &sample_main;
+  int rv;
+
+  rv = sample_macswap_enable_disable (sm, ntohl(mp->sw_if_index), 
+                                      (int) (mp->enable_disable));
+  
+  REPLY_MACRO(VL_API_SAMPLE_MACSWAP_ENABLE_DISABLE_REPLY);
+}
+
+/* Set up the API message handling tables */
+static clib_error_t *
+sample_plugin_api_hookup (vlib_main_t *vm)
+{
+  sample_main_t * sm = &sample_main;
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,					\
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1); 
+    foreach_sample_plugin_api_msg;
+#undef _
+
+    return 0;
+}
+
+#define vl_msg_name_crc_list
+#include <sample/sample_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void 
+setup_message_id_table (sample_main_t * sm, api_main_t *am)
+{
+#define _(id,n,crc) \
+  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
+  foreach_vl_msg_name_crc_sample;
+#undef _
+}
+
+static clib_error_t * sample_init (vlib_main_t * vm)
+{
+  sample_main_t * sm = &sample_main;
+  clib_error_t * error = 0;
+  u8 * name;
+
+  name = format (0, "sample_%08x%c", api_version, 0);
+
+  /* Ask for a correctly-sized block of API message decode slots */
+  sm->msg_id_base = vl_msg_api_get_msg_ids 
+      ((char *) name, VL_MSG_FIRST_AVAILABLE);
+
+  error = sample_plugin_api_hookup (vm);
+
+  /* Add our API messages to the global name_crc hash table */
+  setup_message_id_table (sm, &api_main);
+
+  vec_free(name);
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (sample_init);
+
+VNET_FEATURE_INIT (sample, static) = 
+{
+  .arc_name = "device-input",
+  .node_name = "sample",
+  .runs_before = VNET_FEATURES ("ethernet-input"),
+};
diff --git a/src/examples/sample-plugin/sample/sample.h b/src/examples/sample-plugin/sample/sample.h
new file mode 100644
index 00000000..d268d482
--- /dev/null
+++ b/src/examples/sample-plugin/sample/sample.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_sample_h__
+#define __included_sample_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+
+typedef struct {
+    /* API message ID base */
+    u16 msg_id_base;
+
+    /* convenience */
+    vlib_main_t * vlib_main;
+    vnet_main_t * vnet_main;
+    ethernet_main_t * ethernet_main;
+} sample_main_t;
+
+sample_main_t sample_main;
+
+vlib_node_registration_t sample_node;
+
+#endif /* __included_sample_h__ */
diff --git a/src/examples/sample-plugin/sample/sample_all_api_h.h b/src/examples/sample-plugin/sample/sample_all_api_h.h
new file mode 100644
index 00000000..774d782f
--- /dev/null
+++ b/src/examples/sample-plugin/sample/sample_all_api_h.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Include the generated file, see BUILT_SOURCES in Makefile.am */
+#include <sample/sample.api.h>
diff --git a/src/examples/sample-plugin/sample/sample_msg_enum.h b/src/examples/sample-plugin/sample/sample_msg_enum.h
new file mode 100644
index 00000000..af4172f7
--- /dev/null
+++ b/src/examples/sample-plugin/sample/sample_msg_enum.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_sample_msg_enum_h
+#define included_sample_msg_enum_h
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum {
+#include <sample/sample_all_api_h.h>
+    /* We'll want to know how many messages IDs we need... */
+    VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif /* included_sample_msg_enum_h */
diff --git a/src/examples/sample-plugin/sample/sample_test.c b/src/examples/sample-plugin/sample/sample_test.c
new file mode 100644
index 00000000..dd1b0215
--- /dev/null
+++ b/src/examples/sample-plugin/sample/sample_test.c
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * sample_test.c - test harness plugin
+ *------------------------------------------------------------------
+ */
+
+#include <vat/vat.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vppinfra/error.h>
+
+uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
+
+/* Declare message IDs */
+#include <sample/sample_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <sample/sample_all_api_h.h> 
+#undef vl_typedefs
+
+/* declare message handlers for each api */
+
+#define vl_endianfun             /* define message structures */
+#include <sample/sample_all_api_h.h> 
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <sample/sample_all_api_h.h> 
+#undef vl_printfun
+
+/* Get the API version number. */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <sample/sample_all_api_h.h>
+#undef vl_api_version
+
+
+typedef struct {
+    /* API message ID base */
+    u16 msg_id_base;
+    vat_main_t *vat_main;
+} sample_test_main_t;
+
+sample_test_main_t sample_test_main;
+
+#define foreach_standard_reply_retval_handler   \
+_(sample_macswap_enable_disable_reply)
+
+#define _(n)                                            \
+    static void vl_api_##n##_t_handler                  \
+    (vl_api_##n##_t * mp)                               \
+    {                                                   \
+        vat_main_t * vam = sample_test_main.vat_main;   \
+        i32 retval = ntohl(mp->retval);                 \
+        if (vam->async_mode) {                          \
+            vam->async_errors += (retval < 0);          \
+        } else {                                        \
+            vam->retval = retval;                       \
+            vam->result_ready = 1;                      \
+        }                                               \
+    }
+foreach_standard_reply_retval_handler;
+#undef _
+
+/* 
+ * Table of message reply handlers, must include boilerplate handlers
+ * we just generated
+ */
+#define foreach_vpe_api_reply_msg                                       \
+_(SAMPLE_MACSWAP_ENABLE_DISABLE_REPLY, sample_macswap_enable_disable_reply)
+
+
+/* M: construct, but don't yet send a message */
+
+#define M(T,t)                                                  \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp));                         \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+#define M2(T,t,n)                                               \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+/* S: send a message */
+#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
+
+/* W: wait for results, with timeout */
+#define W                                       \
+do {                                            \
+    timeout = vat_time_now (vam) + 1.0;         \
+                                                \
+    while (vat_time_now (vam) < timeout) {      \
+        if (vam->result_ready == 1) {           \
+            return (vam->retval);               \
+        }                                       \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
+static int api_sample_macswap_enable_disable (vat_main_t * vam)
+{
+    sample_test_main_t * sm = &sample_test_main;
+    unformat_input_t * i = vam->input;
+    f64 timeout;
+    int enable_disable = 1;
+    u32 sw_if_index = ~0;
+    vl_api_sample_macswap_enable_disable_t * mp;
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            ;
+	else if (unformat (i, "sw_if_index %d", &sw_if_index))
+	    ;
+        else if (unformat (i, "disable"))
+            enable_disable = 0;
+        else
+            break;
+    }
+    
+    if (sw_if_index == ~0) {
+        errmsg ("missing interface name / explicit sw_if_index number \n");
+        return -99;
+    }
+    
+    /* Construct the API message */
+    M(SAMPLE_MACSWAP_ENABLE_DISABLE, sample_macswap_enable_disable);
+    mp->sw_if_index = ntohl (sw_if_index);
+    mp->enable_disable = enable_disable;
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+/* 
+ * List of messages that the api test plugin sends,
+ * and that the data plane plugin processes
+ */
+#define foreach_vpe_api_msg \
+_(sample_macswap_enable_disable, "<intfc> [disable]")
+
+void vat_api_hookup (vat_main_t *vam)
+{
+    sample_test_main_t * sm = &sample_test_main;
+    /* Hook up handlers for replies from the data plane plug-in */
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,                                  \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1); 
+    foreach_vpe_api_reply_msg;
+#undef _
+
+    /* API messages we can send */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+    foreach_vpe_api_msg;
+#undef _    
+    
+    /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+    foreach_vpe_api_msg;
+#undef _
+}
+
+clib_error_t * vat_plugin_register (vat_main_t *vam)
+{
+  sample_test_main_t * sm = &sample_test_main;
+  u8 * name;
+
+  sm->vat_main = vam;
+
+  name = format (0, "sample_%08x%c", api_version, 0);
+  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  if (sm->msg_id_base != (u16) ~0)
+    vat_api_hookup (vam);
+  
+  vec_free(name);
+  
+  return 0;
+}
diff --git a/src/m4/ax_vpp_find_jdk8.m4 b/src/m4/ax_vpp_find_jdk8.m4
new file mode 100644
index 00000000..29459822
--- /dev/null
+++ b/src/m4/ax_vpp_find_jdk8.m4
@@ -0,0 +1,29 @@
+
+
+AC_DEFUN([AX_VPP_FIND_JDK8],
+[
+while true
+do
+  test "${JAVA_HOME+set}" = set && break
+
+  for dir in $(find /usr/lib/jvm/* -maxdepth 0 -type d); do
+    AC_MSG_CHECKING([${dir} for Java 8 compiler])
+    JAVA_VERSION=$(${dir}/bin/javac -source 8 -version 2>&1)
+    if test 0 -eq "$?"; then
+      JAVA_VERSION=$(echo "${JAVA_VERSION}" | cut -d\  -f2)
+      JAVA_HOME=${dir}
+      JAVAC=${dir}/bin/javac
+      JAVAH=${dir}/bin/javah
+      JAR=${dir}/bin/jar
+      AC_MSG_RESULT([found version $JAVA_VERSION])
+      break
+    else
+      JAVA_VERSION=""
+      AC_MSG_RESULT([no])
+    fi
+  done
+
+  test "${JAVA_HOME}set" = set && AC_MSG_ERROR([Could not find Java 8 compiler])
+  break
+done
+])
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index ffc4b3ab..987310b7 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -22,10 +22,15 @@ BUILT_SOURCES =
 vppplugins_LTLIBRARIES =
 vppapitestplugins_LTLIBRARIES =
 noinst_HEADERS =
+nobase_apiinclude_HEADERS =
 
 vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
 vpppluginsdir = ${libdir}/vpp_plugins
 
+if ENABLE_ACL_PLUGIN
+include acl.am
+endif
+
 if ENABLE_FLOWPERPKT_PLUGIN
 include flowperpkt.am
 endif
@@ -34,10 +39,22 @@ if ENABLE_ILA_PLUGIN
 include ila.am
 endif
 
+if ENABLE_IOAM_PLUGIN
+include ioam.am
+endif
+
+if ENABLE_LB_PLUGIN
+include lb.am
+endif
+
 if ENABLE_SIXRD_PLUGIN
 include sixrd.am
 endif
 
+if ENABLE_SNAT_PLUGIN
+include snat.am
+endif
+
 include ../suffix-rules.mk
 
 # Remove *.la files
@@ -50,6 +67,7 @@ install-data-hook:
 ###############################################################################
 
 apidir = $(prefix)/share/vpp/api/plugins
+apiincludedir = ${includedir}/vpp_plugins
 
 api_DATA = \
 	$(patsubst %.api,%.api.json,$(API_FILES))
diff --git a/src/plugins/acl.am b/src/plugins/acl.am
new file mode 100644
index 00000000..efed31c2
--- /dev/null
+++ b/src/plugins/acl.am
@@ -0,0 +1,35 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+vppapitestplugins_LTLIBRARIES += acl_test_plugin.la
+vppplugins_LTLIBRARIES += acl_plugin.la
+
+acl_plugin_la_SOURCES =				\
+	acl/acl.c				\
+	acl/node_in.c				\
+	acl/node_out.c				\
+	acl/l2sess.c				\
+	acl/l2sess_node.c			\
+	acl/l2sess.h				\
+	acl/acl_plugin.api.h
+
+API_FILES += acl/acl.api
+
+nobase_apiinclude_HEADERS +=			\
+  acl/acl_all_api_h.h				\
+  acl/acl_msg_enum.h				\
+  acl/acl.api.h
+
+acl_test_plugin_la_SOURCES = acl/acl_test.c acl/acl_plugin.api.h
+
+# vi:syntax=automake
diff --git a/src/plugins/acl/acl.api b/src/plugins/acl/acl.api
new file mode 100644
index 00000000..58a5a171
--- /dev/null
+++ b/src/plugins/acl/acl.api
@@ -0,0 +1,444 @@
+/* Hey Emacs use -*- mode: C -*- */
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \file
+    This file defines the vpp control-plane API messages
+    used to control the ACL plugin
+*/
+
+
+/** \brief Get the plugin version
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+
+define acl_plugin_get_version
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Reply to get the plugin version
+    @param context - returned sender context, to match reply w/ request
+    @param major - Incremented every time a known breaking behavior change is introduced
+    @param minor - Incremented with small changes, may be used to avoid buggy versions
+*/
+
+define acl_plugin_get_version_reply
+{
+  u32 context;
+  u32 major;
+  u32 minor;
+};
+
+/** \brief Access List Rule entry
+    @param is_permit - deny (0), permit (1), or permit+reflect(2) action on this rule.
+    @param is_ipv6   - IP addresses in this rule are IPv6 (1) or IPv4 (0)
+    @param src_ip_addr - Source prefix value
+    @param src_ip_prefix_len - Source prefix length
+    @param dst_ip_addr - Destination prefix value
+    @param dst_ip_prefix_len - Destination prefix length
+    @param proto - L4 protocol (http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml)
+    @param srcport_or_icmptype_first - beginning of source port or ICMP4/6 type range
+    @param srcport_or_icmptype_last - end of source port or ICMP4/6 type range
+    @param dstport_or_icmpcode_first - beginning of destination port or ICMP4/6 code range
+    @param dstport_or_icmpcode_last - end of destination port or ICMP4/6 code range
+    @param tcp_flags_mask - if proto==6, match masked TCP flags with this value
+    @param tcp_flags_value - if proto==6, mask to AND the TCP flags in the packet with
+*/
+
+typeonly manual_print manual_endian define acl_rule
+{
+  u8 is_permit;
+  u8 is_ipv6;
+  u8 src_ip_addr[16];
+  u8 src_ip_prefix_len;
+  u8 dst_ip_addr[16];
+  u8 dst_ip_prefix_len;
+/*
+ * L4 protocol. IANA number. 1 = ICMP, 58 = ICMPv6, 6 = TCP, 17 = UDP.
+ * 0 => ignore L4 and ignore the ports/tcpflags when matching.
+ */
+  u8 proto;
+/*
+ * If the L4 protocol is TCP or UDP, the below
+ * hold ranges of ports, else if the L4 is ICMP/ICMPv6
+ * they hold ranges of ICMP(v6) types/codes.
+ *
+ * Ranges are inclusive, i.e. to match "any" TCP/UDP port,
+ * use first=0,last=65535. For ICMP(v6),
+ * use first=0,last=255.
+ */
+  u16 srcport_or_icmptype_first;
+  u16 srcport_or_icmptype_last;
+  u16 dstport_or_icmpcode_first;
+  u16 dstport_or_icmpcode_last;
+/*
+ * for proto = 6, this matches if the
+ * TCP flags in the packet, ANDed with tcp_flags_mask,
+ * is equal to tcp_flags_value.
+ */
+  u8 tcp_flags_mask;
+  u8 tcp_flags_value;
+};
+
+/** \brief MACIP Access List Rule entry
+    @param is_permit - deny (0), permit (1) action on this rule.
+    @param is_ipv6   - IP addresses in this rule are IPv6 (1) or IPv4 (0)
+    @param src_mac - match masked source MAC address against this value
+    @param src_mac_mask - AND source MAC address with this value before matching
+    @param src_ip_addr - Source prefix value
+    @param src_ip_prefix_len - Source prefix length
+*/
+
+typeonly manual_print manual_endian define macip_acl_rule
+{
+  u8 is_permit;
+  u8 is_ipv6;
+/*
+ * The source mac of the packet ANDed with src_mac_mask.
+ * The source ip[46] address in the packet is matched
+ * against src_ip_addr, with src_ip_prefix_len set to 0.
+ *
+ * For better performance, minimize the number of
+ * (src_mac_mask, src_ip_prefix_len) combinations
+ * in a MACIP ACL.
+ */
+  u8 src_mac[6];
+  u8 src_mac_mask[6];
+  u8 src_ip_addr[16];
+  u8 src_ip_prefix_len;
+};
+
+/** \brief Replace an existing ACL in-place or create a new ACL
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param acl_index - an existing ACL entry (0..0xfffffffe) to replace, or 0xffffffff to make new ACL
+    @param tag - a string value stored along with the ACL, for descriptive purposes
+    @param count - number of ACL rules
+    @r - Rules for this access-list
+*/
+
+manual_print manual_endian define acl_add_replace
+{
+  u32 client_index;
+  u32 context;
+  u32 acl_index; /* ~0 to add, existing ACL# to replace */
+  u8 tag[64]; /* What gets in here gets out in the corresponding tag field when dumping the ACLs. */
+  u32 count;
+  vl_api_acl_rule_t r[count];
+};
+
+/** \brief Reply to add/replace ACL
+    @param context - returned sender context, to match reply w/ request
+    @param acl_index - index of the updated or newly created ACL
+    @param retval 0 - no error
+*/
+
+define acl_add_replace_reply
+{
+  u32 context;
+  u32 acl_index;
+  i32 retval;
+};
+
+/** \brief Delete an ACL
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param acl_index - ACL index to delete
+*/
+
+define acl_del
+{
+  u32 client_index;
+  u32 context;
+  u32 acl_index;
+};
+
+/** \brief Reply to delete the ACL
+    @param context - returned sender context, to match reply w/ request
+    @param retval 0 - no error
+*/
+
+define acl_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/* acl_interface_add_del(_reply) to be deprecated in lieu of acl_interface_set_acl_list */
+/** \brief Use acl_interface_set_acl_list instead
+    Append/remove an ACL index to/from the list of ACLs checked for an interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add or delete the ACL index from the list
+    @param is_input - check the ACL on input (1) or output (0)
+    @param sw_if_index - the interface to alter the list of ACLs on
+    @param acl_index - index of ACL for the operation
+*/
+
+define acl_interface_add_del
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+/*
+ * is_input = 0 => ACL applied on interface egress
+ * is_input = 1 => ACL applied on interface ingress
+ */
+  u8 is_input;
+  u32 sw_if_index;
+  u32 acl_index;
+};
+
+/** \brief Reply to alter the ACL list
+    @param context - returned sender context, to match reply w/ request
+    @param retval 0 - no error
+*/
+
+define acl_interface_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Set the vector of input/output ACLs checked for an interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - the interface to alter the list of ACLs on
+    @param count - total number of ACL indices in the vector
+    @param n_input - this many first elements correspond to input ACLs, the rest - output
+    @param acls - vector of ACL indices
+*/
+
+manual_endian define acl_interface_set_acl_list
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index;
+  u8 count;
+  u8 n_input; /* First n_input ACLs are set as a list of input ACLs, the rest are applied as output */
+  u32 acls[count];
+};
+
+/** \brief Reply to set the ACL list on an interface
+    @param context - returned sender context, to match reply w/ request
+    @param retval 0 - no error
+*/
+
+define acl_interface_set_acl_list_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Dump the specific ACL contents or all of the ACLs' contents
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param acl_index - ACL index to dump, ~0 to dump all ACLs
+*/
+
+define acl_dump
+{
+  u32 client_index;
+  u32 context;
+  u32 acl_index; /* ~0 for all ACLs */
+};
+
+/** \brief Details about a single ACL contents
+    @param context - returned sender context, to match reply w/ request
+    @param acl_index - ACL index whose contents are being sent in this message
+    @param tag - Descriptive tag value which was supplied at ACL creation
+    @param count - Number of rules in this ACL
+    @param r - Array of rules within this ACL
+*/
+
+manual_print manual_endian define acl_details
+{
+  u32 context;
+  u32 acl_index;
+  u8 tag[64]; /* Same blob that was supplied to us when creating the ACL, one hopes. */
+  u32 count;
+  vl_api_acl_rule_t r[count];
+};
+
+/** \brief Dump the list(s) of ACL applied to specific or all interfaces
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param sw_if_index - interface to dump the ACL list for
+*/
+
+define acl_interface_list_dump
+{
+  u32 client_index;
+  u32 context;
+  u32 sw_if_index; /* ~0 for all interfaces */
+};
+
+/** \brief Details about a single ACL contents
+    @param context - returned sender context, to match reply w/ request
+    @param sw_if_index - interface for which the list of ACLs is applied
+    @param count - total length of acl indices vector
+    @param n_input - this many of indices in the beginning are input ACLs, the rest - output
+    @param acls - the vector of ACL indices
+*/
+
+manual_endian define acl_interface_list_details
+{
+  u32 context;
+  u32 sw_if_index;
+  u8 count;
+  u8 n_input;
+  u32 acls[count];
+};
+
+/** \brief Add a MACIP ACL
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param tag - descriptive value for this MACIP ACL
+    @param count - number of rules in this ACL
+    @param r - vector of MACIP ACL rules
+*/
+
+manual_print manual_endian define macip_acl_add
+{
+  u32 client_index;
+  u32 context;
+  u8 tag[64];
+  u32 count;
+  vl_api_macip_acl_rule_t r[count];
+};
+
+/** \brief Reply to add MACIP ACL
+    @param context - returned sender context, to match reply w/ request
+    @param acl_index - index of the newly created ACL
+    @param retval 0 - no error
+*/
+
+define macip_acl_add_reply
+{
+  u32 context;
+  u32 acl_index;
+  i32 retval;
+};
+
+/** \brief Delete a MACIP ACL
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param acl_index - MACIP ACL index to delete
+*/
+
+define macip_acl_del
+{
+  u32 client_index;
+  u32 context;
+  u32 acl_index;
+};
+
+/** \brief Reply to delete the MACIP ACL
+    @param context - returned sender context, to match reply w/ request
+    @param retval 0 - no error
+*/
+
+define macip_acl_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Add or delete a MACIP ACL to/from interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - add (1) or delete (0) ACL from being used on an interface
+    @param sw_if_index - interface to apply the action to
+    @param acl_index - MACIP ACL index
+*/
+
+define macip_acl_interface_add_del
+{
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  /* macip ACLs are always input */
+  u32 sw_if_index;
+  u32 acl_index;
+};
+
+/** \brief Reply to apply/unapply  the MACIP ACL
+    @param context - returned sender context, to match reply w/ request
+    @param retval 0 - no error
+*/
+
+define macip_acl_interface_add_del_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Dump one or all defined MACIP ACLs
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param acl_index - MACIP ACL index or ~0 to dump all ACLs
+*/
+
+define macip_acl_dump
+{
+  u32 client_index;
+  u32 context;
+  u32 acl_index; /* ~0 for all ACLs */
+};
+
+/** \brief Details about one MACIP ACL
+    @param context - returned sender context, to match reply w/ request
+    @param acl_index - index of this MACIP ACL
+    @param tag - descriptive tag which was supplied during the creation
+    @param count - length of the vector of MACIP ACL rules
+    @param r - rules comprising this ACL
+*/
+
+manual_print manual_endian define macip_acl_details
+{
+  u32 context;
+  u32 acl_index;
+  u8 tag[64];
+  u32 count;
+  vl_api_macip_acl_rule_t r[count];
+};
+
+/** \brief Get the vector of MACIP ACL IDs applied to the interfaces
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+
+define macip_acl_interface_get
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Reply with the vector of MACIP ACLs by sw_if_index
+    @param context - returned sender context, to match reply w/ request
+    @param count - total number of elements in the vector
+    @param acls - the vector of active MACACL indices per sw_if_index
+*/
+
+define macip_acl_interface_get_reply
+{
+  u32 context;
+  u32 count;
+  u32 acls[count];
+};
+
diff --git a/src/plugins/acl/acl.c b/src/plugins/acl/acl.c
new file mode 100644
index 00000000..8ff5a6b7
--- /dev/null
+++ b/src/plugins/acl/acl.c
@@ -0,0 +1,1901 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stddef.h>
+
+#include <vnet/vnet.h>
+#include <vnet/plugin/plugin.h>
+#include <acl/acl.h>
+#include <acl/l2sess.h>
+
+#include <vnet/l2/l2_classify.h>
+#include <vnet/classify/input_acl.h>
+
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+
+/* define message IDs */
+#include <acl/acl_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <acl/acl_all_api_h.h>
+#undef vl_typedefs
+
+/* define generated endian-swappers */
+#define vl_endianfun
+#include <acl/acl_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <acl/acl_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <acl/acl_all_api_h.h>
+#undef vl_api_version
+
+#include "node_in.h"
+#include "node_out.h"
+
+acl_main_t acl_main;
+
+/*
+ * A handy macro to set up a message reply.
+ * Assumes that the following variables are available:
+ * mp - pointer to request message
+ * rmp - pointer to reply message type
+ * rv - return value
+ */
+
+#define REPLY_MACRO(t)                                          \
+do {                                                            \
+    unix_shared_memory_queue_t * q =                            \
+    vl_api_client_index_to_input_queue (mp->client_index);      \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+                                                                \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+#define REPLY_MACRO2(t, body)                                   \
+do {                                                            \
+    unix_shared_memory_queue_t * q;                             \
+    rv = vl_msg_api_pd_handler (mp, rv);                        \
+    q = vl_api_client_index_to_input_queue (mp->client_index);  \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t)+am->msg_id_base);                               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+    do {body;} while (0);                                       \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+#define REPLY_MACRO3(t, n, body)                                \
+do {                                                            \
+    unix_shared_memory_queue_t * q;                             \
+    rv = vl_msg_api_pd_handler (mp, rv);                        \
+    q = vl_api_client_index_to_input_queue (mp->client_index);  \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp) + n);                 \
+    rmp->_vl_msg_id = ntohs((t)+am->msg_id_base);                               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+    do {body;} while (0);                                       \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+
+/* List of message types that this plugin understands */
+
+#define foreach_acl_plugin_api_msg		\
+_(ACL_PLUGIN_GET_VERSION, acl_plugin_get_version) \
+_(ACL_ADD_REPLACE, acl_add_replace)				\
+_(ACL_DEL, acl_del)				\
+_(ACL_INTERFACE_ADD_DEL, acl_interface_add_del)	\
+_(ACL_INTERFACE_SET_ACL_LIST, acl_interface_set_acl_list)	\
+_(ACL_DUMP, acl_dump)  \
+_(ACL_INTERFACE_LIST_DUMP, acl_interface_list_dump) \
+_(MACIP_ACL_ADD, macip_acl_add) \
+_(MACIP_ACL_DEL, macip_acl_del) \
+_(MACIP_ACL_INTERFACE_ADD_DEL, macip_acl_interface_add_del) \
+_(MACIP_ACL_DUMP, macip_acl_dump) \
+_(MACIP_ACL_INTERFACE_GET, macip_acl_interface_get)
+
+/*
+ * This routine exists to convince the vlib plugin framework that
+ * we haven't accidentally copied a random .dll into the plugin directory.
+ *
+ * Also collects global variable pointers passed from the vpp engine
+ */
+
+clib_error_t *
+vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
+		      int from_early_init)
+{
+  acl_main_t *am = &acl_main;
+  clib_error_t *error = 0;
+
+  am->vlib_main = vm;
+  am->vnet_main = h->vnet_main;
+  am->ethernet_main = h->ethernet_main;
+
+  l2sess_vlib_plugin_register(vm, h, from_early_init);
+
+  return error;
+}
+
+
+static void
+vl_api_acl_plugin_get_version_t_handler (vl_api_acl_plugin_get_version_t * mp)
+{
+  acl_main_t *am = &acl_main;
+  vl_api_acl_plugin_get_version_reply_t *rmp;
+  int msg_size = sizeof (*rmp);
+  unix_shared_memory_queue_t *q;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  rmp = vl_msg_api_alloc (msg_size);
+  memset (rmp, 0, msg_size);
+  rmp->_vl_msg_id =
+    ntohs (VL_API_ACL_PLUGIN_GET_VERSION_REPLY + am->msg_id_base);
+  rmp->context = mp->context;
+  rmp->major = htonl (ACL_PLUGIN_VERSION_MAJOR);
+  rmp->minor = htonl (ACL_PLUGIN_VERSION_MINOR);
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+
+static int
+acl_add_list (u32 count, vl_api_acl_rule_t rules[],
+	      u32 * acl_list_index, u8 * tag)
+{
+  acl_main_t *am = &acl_main;
+  acl_list_t *a;
+  acl_rule_t *r;
+  acl_rule_t *acl_new_rules;
+  int i;
+
+  if (*acl_list_index != ~0)
+    {
+      /* They supplied some number, let's see if this ACL exists */
+      if (pool_is_free_index (am->acls, *acl_list_index))
+	{
+	  /* tried to replace a non-existent ACL, no point doing anything */
+	  return -1;
+	}
+    }
+
+  /* Create and populate the rules */
+  acl_new_rules = clib_mem_alloc_aligned (sizeof (acl_rule_t) * count,
+					  CLIB_CACHE_LINE_BYTES);
+  if (!acl_new_rules)
+    {
+      /* Could not allocate rules. New or existing ACL - bail out regardless */
+      return -1;
+    }
+
+  for (i = 0; i < count; i++)
+    {
+      r = &acl_new_rules[i];
+      r->is_permit = rules[i].is_permit;
+      r->is_ipv6 = rules[i].is_ipv6;
+      if (r->is_ipv6)
+        {
+          memcpy (&r->src, rules[i].src_ip_addr, sizeof (r->src));
+          memcpy (&r->dst, rules[i].dst_ip_addr, sizeof (r->dst));
+        }
+      else
+        {
+          memcpy (&r->src.ip4, rules[i].src_ip_addr, sizeof (r->src.ip4));
+          memcpy (&r->dst.ip4, rules[i].dst_ip_addr, sizeof (r->dst.ip4));
+        }
+      r->src_prefixlen = rules[i].src_ip_prefix_len;
+      r->dst_prefixlen = rules[i].dst_ip_prefix_len;
+      r->proto = rules[i].proto;
+      r->src_port_or_type_first = rules[i].srcport_or_icmptype_first;
+      r->src_port_or_type_last = rules[i].srcport_or_icmptype_last;
+      r->dst_port_or_code_first = rules[i].dstport_or_icmpcode_first;
+      r->dst_port_or_code_last = rules[i].dstport_or_icmpcode_last;
+      r->tcp_flags_value = rules[i].tcp_flags_value;
+      r->tcp_flags_mask = rules[i].tcp_flags_mask;
+    }
+
+  if (~0 == *acl_list_index)
+    {
+      /* Get ACL index */
+      pool_get_aligned (am->acls, a, CLIB_CACHE_LINE_BYTES);
+      memset (a, 0, sizeof (*a));
+      /* Will return the newly allocated ACL index */
+      *acl_list_index = a - am->acls;
+    }
+  else
+    {
+      a = am->acls + *acl_list_index;
+      /* Get rid of the old rules */
+      clib_mem_free (a->rules);
+    }
+  a->rules = acl_new_rules;
+  a->count = count;
+  memcpy (a->tag, tag, sizeof (a->tag));
+
+  return 0;
+}
+
+static int
+acl_del_list (u32 acl_list_index)
+{
+  acl_main_t *am = &acl_main;
+  acl_list_t *a;
+  int i, ii;
+  if (pool_is_free_index (am->acls, acl_list_index))
+    {
+      return -1;
+    }
+
+  /* delete any references to the ACL */
+  for (i = 0; i < vec_len (am->output_acl_vec_by_sw_if_index); i++)
+    {
+      for (ii = 0; ii < vec_len (am->output_acl_vec_by_sw_if_index[i]);
+	   /* see body */ )
+	{
+	  if (acl_list_index == am->output_acl_vec_by_sw_if_index[i][ii])
+	    {
+	      vec_del1 (am->output_acl_vec_by_sw_if_index[i], ii);
+	    }
+	  else
+	    {
+	      ii++;
+	    }
+	}
+    }
+  for (i = 0; i < vec_len (am->input_acl_vec_by_sw_if_index); i++)
+    {
+      for (ii = 0; ii < vec_len (am->input_acl_vec_by_sw_if_index[i]);
+	   /* see body */ )
+	{
+	  if (acl_list_index == am->input_acl_vec_by_sw_if_index[i][ii])
+	    {
+	      vec_del1 (am->input_acl_vec_by_sw_if_index[i], ii);
+	    }
+	  else
+	    {
+	      ii++;
+	    }
+	}
+    }
+
+  /* now we can delete the ACL itself */
+  a = &am->acls[acl_list_index];
+  if (a->rules)
+    {
+      clib_mem_free (a->rules);
+    }
+  pool_put (am->acls, a);
+  return 0;
+}
+
+/* Some aids in ASCII graphing the content */
+#define XX "\377"
+#define __ "\000"
+#define _(x)
+#define v
+
+u8 ip4_5tuple_mask[] =
+_("             dmac               smac            etype ")
+_(ether) __ __ __ __ __ __ v __ __ __ __ __ __ v __ __ v
+  _("        v ihl totlen   ")
+  _(0x0000)
+  __ __ __ __
+  _("        ident fl+fo    ")
+  _(0x0004)
+  __ __ __ __
+  _("       ttl pr checksum ")
+  _(0x0008)
+  __ XX __ __
+  _("        src address    ")
+  _(0x000C)
+  XX XX XX XX
+  _("        dst address    ")
+  _(0x0010)
+  XX XX XX XX
+  _("L4 T/U  sport dport    ")
+  _(tcpudp)
+  XX XX XX XX
+  _(padpad)
+  __ __ __ __
+  _(padpad)
+  __ __ __ __
+  _(padeth)
+  __ __;
+
+     u8 ip6_5tuple_mask[] =
+       _("             dmac               smac            etype ")
+  _(ether) __ __ __ __ __ __ v __ __ __ __ __ __ v __ __ v
+  _("        v  tc + flow ")
+  _(0x0000) __ __ __ __
+  _("        plen  nh hl  ")
+  _(0x0004) __ __ XX __
+  _("        src address  ")
+  _(0x0008) XX XX XX XX
+  _(0x000C) XX XX XX XX
+  _(0x0010) XX XX XX XX
+  _(0x0014) XX XX XX XX
+  _("        dst address  ")
+  _(0x0018) XX XX XX XX
+  _(0x001C) XX XX XX XX
+  _(0x0020) XX XX XX XX
+  _(0x0024) XX XX XX XX
+  _("L4T/U  sport dport   ")
+  _(tcpudp) XX XX XX XX _(padpad) __ __ __ __ _(padeth) __ __;
+
+#undef XX
+#undef __
+#undef _
+#undef v
+
+     static int count_skip (u8 * p, u32 size)
+{
+  u64 *p64 = (u64 *) p;
+  /* Be tolerant to null pointer */
+  if (0 == p)
+    return 0;
+
+  while ((0ULL == *p64) && ((u8 *) p64 - p) < size)
+    {
+      p64++;
+    }
+  return (p64 - (u64 *) p) / 2;
+}
+
+static int
+acl_classify_add_del_table_big (vnet_classify_main_t * cm, u8 * mask,
+			    u32 mask_len, u32 next_table_index,
+			    u32 miss_next_index, u32 * table_index,
+			    int is_add)
+{
+  u32 nbuckets = 65536;
+  u32 memory_size = 2 << 30;
+  u32 skip = count_skip (mask, mask_len);
+  u32 match = (mask_len / 16) - skip;
+  u8 *skip_mask_ptr = mask + 16 * skip;
+  u32 current_data_flag = 0;
+  int current_data_offset = 0;
+
+  if (0 == match)
+    match = 1;
+
+  return vnet_classify_add_del_table (cm, skip_mask_ptr, nbuckets,
+				      memory_size, skip, match,
+				      next_table_index, miss_next_index,
+				      table_index, current_data_flag,
+				      current_data_offset, is_add,
+				      1 /* delete_chain */);
+}
+
+static int
+acl_classify_add_del_table_small (vnet_classify_main_t * cm, u8 * mask,
+			    u32 mask_len, u32 next_table_index,
+			    u32 miss_next_index, u32 * table_index,
+			    int is_add)
+{
+  u32 nbuckets = 32;
+  u32 memory_size = 2 << 20;
+  u32 skip = count_skip (mask, mask_len);
+  u32 match = (mask_len / 16) - skip;
+  u8 *skip_mask_ptr = mask + 16 * skip;
+  u32 current_data_flag = 0;
+  int current_data_offset = 0;
+
+  if (0 == match)
+    match = 1;
+
+  return vnet_classify_add_del_table (cm, skip_mask_ptr, nbuckets,
+				      memory_size, skip, match,
+				      next_table_index, miss_next_index,
+				      table_index, current_data_flag,
+				      current_data_offset, is_add,
+				      1 /* delete_chain */);
+}
+
+
+static int
+acl_unhook_l2_input_classify (acl_main_t * am, u32 sw_if_index)
+{
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  u32 ip4_table_index = ~0;
+  u32 ip6_table_index = ~0;
+
+  vec_validate_init_empty (am->acl_ip4_input_classify_table_by_sw_if_index,
+			   sw_if_index, ~0);
+  vec_validate_init_empty (am->acl_ip6_input_classify_table_by_sw_if_index,
+			   sw_if_index, ~0);
+
+  vnet_l2_input_classify_enable_disable (sw_if_index, 0);
+
+  if (am->acl_ip4_input_classify_table_by_sw_if_index[sw_if_index] != ~0)
+    {
+      ip4_table_index =
+	am->acl_ip4_input_classify_table_by_sw_if_index[sw_if_index];
+      am->acl_ip4_input_classify_table_by_sw_if_index[sw_if_index] = ~0;
+      acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
+				  sizeof (ip4_5tuple_mask) - 1, ~0,
+				  am->l2_input_classify_next_acl,
+				  &ip4_table_index, 0);
+    }
+  if (am->acl_ip6_input_classify_table_by_sw_if_index[sw_if_index] != ~0)
+    {
+      ip6_table_index =
+	am->acl_ip6_input_classify_table_by_sw_if_index[sw_if_index];
+      am->acl_ip6_input_classify_table_by_sw_if_index[sw_if_index] = ~0;
+      acl_classify_add_del_table_big (cm, ip6_5tuple_mask,
+				  sizeof (ip6_5tuple_mask) - 1, ~0,
+				  am->l2_input_classify_next_acl,
+				  &ip6_table_index, 0);
+    }
+
+  return 0;
+}
+
+static int
+acl_unhook_l2_output_classify (acl_main_t * am, u32 sw_if_index)
+{
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  u32 ip4_table_index = ~0;
+  u32 ip6_table_index = ~0;
+
+  vec_validate_init_empty (am->acl_ip4_output_classify_table_by_sw_if_index,
+			   sw_if_index, ~0);
+  vec_validate_init_empty (am->acl_ip6_output_classify_table_by_sw_if_index,
+			   sw_if_index, ~0);
+
+  vnet_l2_output_classify_enable_disable (sw_if_index, 0);
+
+  if (am->acl_ip4_output_classify_table_by_sw_if_index[sw_if_index] != ~0)
+    {
+      ip4_table_index =
+	am->acl_ip4_output_classify_table_by_sw_if_index[sw_if_index];
+      am->acl_ip4_output_classify_table_by_sw_if_index[sw_if_index] = ~0;
+      acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
+				  sizeof (ip4_5tuple_mask) - 1, ~0,
+				  am->l2_output_classify_next_acl,
+				  &ip4_table_index, 0);
+    }
+  if (am->acl_ip6_output_classify_table_by_sw_if_index[sw_if_index] != ~0)
+    {
+      ip6_table_index =
+	am->acl_ip6_output_classify_table_by_sw_if_index[sw_if_index];
+      am->acl_ip6_output_classify_table_by_sw_if_index[sw_if_index] = ~0;
+      acl_classify_add_del_table_big (cm, ip6_5tuple_mask,
+				  sizeof (ip6_5tuple_mask) - 1, ~0,
+				  am->l2_output_classify_next_acl,
+				  &ip6_table_index, 0);
+    }
+
+  return 0;
+}
+
+static int
+acl_hook_l2_input_classify (acl_main_t * am, u32 sw_if_index)
+{
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  u32 ip4_table_index = ~0;
+  u32 ip6_table_index = ~0;
+  int rv;
+
+  /* in case there were previous tables attached */
+  acl_unhook_l2_input_classify (am, sw_if_index);
+  rv =
+    acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
+				sizeof (ip4_5tuple_mask) - 1, ~0,
+				am->l2_input_classify_next_acl,
+				&ip4_table_index, 1);
+  if (rv)
+    return rv;
+  rv =
+    acl_classify_add_del_table_big (cm, ip6_5tuple_mask,
+				sizeof (ip6_5tuple_mask) - 1, ~0,
+				am->l2_input_classify_next_acl,
+				&ip6_table_index, 1);
+  if (rv)
+    {
+      acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
+				  sizeof (ip4_5tuple_mask) - 1, ~0,
+				  am->l2_input_classify_next_acl,
+				  &ip4_table_index, 0);
+      return rv;
+    }
+  rv =
+    vnet_l2_input_classify_set_tables (sw_if_index, ip4_table_index,
+				       ip6_table_index, ~0);
+  clib_warning
+    ("ACL enabling on interface sw_if_index %d, setting tables to the following: ip4: %d ip6: %d\n",
+     sw_if_index, ip4_table_index, ip6_table_index);
+  if (rv)
+    {
+      acl_classify_add_del_table_big (cm, ip6_5tuple_mask,
+				  sizeof (ip6_5tuple_mask) - 1, ~0,
+				  am->l2_input_classify_next_acl,
+				  &ip6_table_index, 0);
+      acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
+				  sizeof (ip4_5tuple_mask) - 1, ~0,
+				  am->l2_input_classify_next_acl,
+				  &ip4_table_index, 0);
+      return rv;
+    }
+
+  am->acl_ip4_input_classify_table_by_sw_if_index[sw_if_index] =
+    ip4_table_index;
+  am->acl_ip6_input_classify_table_by_sw_if_index[sw_if_index] =
+    ip6_table_index;
+
+  vnet_l2_input_classify_enable_disable (sw_if_index, 1);
+  return rv;
+}
+
+static int
+acl_hook_l2_output_classify (acl_main_t * am, u32 sw_if_index)
+{
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  u32 ip4_table_index = ~0;
+  u32 ip6_table_index = ~0;
+  int rv;
+
+  /* in case there were previous tables attached */
+  acl_unhook_l2_output_classify (am, sw_if_index);
+  rv =
+    acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
+				sizeof (ip4_5tuple_mask) - 1, ~0,
+				am->l2_output_classify_next_acl,
+				&ip4_table_index, 1);
+  if (rv)
+    return rv;
+  rv =
+    acl_classify_add_del_table_big (cm, ip6_5tuple_mask,
+				sizeof (ip6_5tuple_mask) - 1, ~0,
+				am->l2_output_classify_next_acl,
+				&ip6_table_index, 1);
+  if (rv)
+    {
+      acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
+				  sizeof (ip4_5tuple_mask) - 1, ~0,
+				  am->l2_output_classify_next_acl,
+				  &ip4_table_index, 0);
+      return rv;
+    }
+  rv =
+    vnet_l2_output_classify_set_tables (sw_if_index, ip4_table_index,
+					ip6_table_index, ~0);
+  clib_warning
+    ("ACL enabling on interface sw_if_index %d, setting tables to the following: ip4: %d ip6: %d\n",
+     sw_if_index, ip4_table_index, ip6_table_index);
+  if (rv)
+    {
+      acl_classify_add_del_table_big (cm, ip6_5tuple_mask,
+				  sizeof (ip6_5tuple_mask) - 1, ~0,
+				  am->l2_output_classify_next_acl,
+				  &ip6_table_index, 0);
+      acl_classify_add_del_table_big (cm, ip4_5tuple_mask,
+				  sizeof (ip4_5tuple_mask) - 1, ~0,
+				  am->l2_output_classify_next_acl,
+				  &ip4_table_index, 0);
+      return rv;
+    }
+
+  am->acl_ip4_output_classify_table_by_sw_if_index[sw_if_index] =
+    ip4_table_index;
+  am->acl_ip6_output_classify_table_by_sw_if_index[sw_if_index] =
+    ip6_table_index;
+
+  vnet_l2_output_classify_enable_disable (sw_if_index, 1);
+  return rv;
+}
+
+
+int
+acl_interface_in_enable_disable (acl_main_t * am, u32 sw_if_index,
+				 int enable_disable)
+{
+  int rv;
+
+  /* Utterly wrong? */
+  if (pool_is_free_index (am->vnet_main->interface_main.sw_interfaces,
+			  sw_if_index))
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+  if (enable_disable)
+    {
+      rv = acl_hook_l2_input_classify (am, sw_if_index);
+    }
+  else
+    {
+      rv = acl_unhook_l2_input_classify (am, sw_if_index);
+    }
+
+  return rv;
+}
+
+int
+acl_interface_out_enable_disable (acl_main_t * am, u32 sw_if_index,
+				  int enable_disable)
+{
+  int rv;
+
+  /* Utterly wrong? */
+  if (pool_is_free_index (am->vnet_main->interface_main.sw_interfaces,
+			  sw_if_index))
+    return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+  if (enable_disable)
+    {
+      rv = acl_hook_l2_output_classify (am, sw_if_index);
+    }
+  else
+    {
+      rv = acl_unhook_l2_output_classify (am, sw_if_index);
+    }
+
+  return rv;
+}
+
+
+static int
+acl_interface_add_inout_acl (u32 sw_if_index, u8 is_input, u32 acl_list_index)
+{
+  acl_main_t *am = &acl_main;
+  if (is_input)
+    {
+      vec_validate (am->input_acl_vec_by_sw_if_index, sw_if_index);
+      vec_add (am->input_acl_vec_by_sw_if_index[sw_if_index], &acl_list_index,
+	       1);
+      acl_interface_in_enable_disable (am, sw_if_index, 1);
+    }
+  else
+    {
+      vec_validate (am->output_acl_vec_by_sw_if_index, sw_if_index);
+      vec_add (am->output_acl_vec_by_sw_if_index[sw_if_index],
+	       &acl_list_index, 1);
+      acl_interface_out_enable_disable (am, sw_if_index, 1);
+    }
+  return 0;
+}
+
+static int
+acl_interface_del_inout_acl (u32 sw_if_index, u8 is_input, u32 acl_list_index)
+{
+  acl_main_t *am = &acl_main;
+  int i;
+  int rv = -1;
+  if (is_input)
+    {
+      vec_validate (am->input_acl_vec_by_sw_if_index, sw_if_index);
+      for (i = 0; i < vec_len (am->input_acl_vec_by_sw_if_index[sw_if_index]);
+	   i++)
+	{
+	  if (acl_list_index ==
+	      am->input_acl_vec_by_sw_if_index[sw_if_index][i])
+	    {
+	      vec_del1 (am->input_acl_vec_by_sw_if_index[sw_if_index], i);
+	      rv = 0;
+	      break;
+	    }
+	}
+      if (0 == vec_len (am->input_acl_vec_by_sw_if_index[sw_if_index]))
+	{
+	  acl_interface_in_enable_disable (am, sw_if_index, 0);
+	}
+    }
+  else
+    {
+      vec_validate (am->output_acl_vec_by_sw_if_index, sw_if_index);
+      for (i = 0;
+	   i < vec_len (am->output_acl_vec_by_sw_if_index[sw_if_index]); i++)
+	{
+	  if (acl_list_index ==
+	      am->output_acl_vec_by_sw_if_index[sw_if_index][i])
+	    {
+	      vec_del1 (am->output_acl_vec_by_sw_if_index[sw_if_index], i);
+	      rv = 0;
+	      break;
+	    }
+	}
+      if (0 == vec_len (am->output_acl_vec_by_sw_if_index[sw_if_index]))
+	{
+	  acl_interface_out_enable_disable (am, sw_if_index, 0);
+	}
+    }
+  return rv;
+}
+
+static void
+acl_interface_reset_inout_acls (u32 sw_if_index, u8 is_input)
+{
+  acl_main_t *am = &acl_main;
+  if (is_input)
+    {
+      acl_interface_in_enable_disable (am, sw_if_index, 0);
+      vec_validate (am->input_acl_vec_by_sw_if_index, sw_if_index);
+      vec_reset_length (am->input_acl_vec_by_sw_if_index[sw_if_index]);
+    }
+  else
+    {
+      acl_interface_out_enable_disable (am, sw_if_index, 0);
+      vec_validate (am->output_acl_vec_by_sw_if_index, sw_if_index);
+      vec_reset_length (am->output_acl_vec_by_sw_if_index[sw_if_index]);
+    }
+}
+
+static int
+acl_interface_add_del_inout_acl (u32 sw_if_index, u8 is_add, u8 is_input,
+				 u32 acl_list_index)
+{
+  int rv = -1;
+  if (is_add)
+    {
+      rv =
+	acl_interface_add_inout_acl (sw_if_index, is_input, acl_list_index);
+    }
+  else
+    {
+      rv =
+	acl_interface_del_inout_acl (sw_if_index, is_input, acl_list_index);
+    }
+  return rv;
+}
+
+
+static void *
+get_ptr_to_offset (vlib_buffer_t * b0, int offset)
+{
+  u8 *p = vlib_buffer_get_current (b0) + offset;
+  return p;
+}
+
+static u8
+acl_get_l4_proto (vlib_buffer_t * b0, int node_is_ip6)
+{
+  u8 proto;
+  int proto_offset;
+  if (node_is_ip6)
+    {
+      proto_offset = 20;
+    }
+  else
+    {
+      proto_offset = 23;
+    }
+  proto = *((u8 *) vlib_buffer_get_current (b0) + proto_offset);
+  return proto;
+}
+
+static int
+acl_match_addr (ip46_address_t * addr1, ip46_address_t * addr2, int prefixlen,
+		int is_ip6)
+{
+  if (prefixlen == 0)
+    {
+      /* match any always succeeds */
+      return 1;
+    }
+  if (is_ip6)
+    {
+      if (memcmp (addr1, addr2, prefixlen / 8))
+	{
+	  /* If the starting full bytes do not match, no point in bittwidling the thumbs further */
+	  return 0;
+	}
+      if (prefixlen % 8)
+	{
+	  u8 b1 = *((u8 *) addr1 + 1 + prefixlen / 8);
+	  u8 b2 = *((u8 *) addr2 + 1 + prefixlen / 8);
+	  u8 mask0 = (0xff - ((1 << (8 - (prefixlen % 8))) - 1));
+	  return (b1 & mask0) == b2;
+	}
+      else
+	{
+	  /* The prefix fits into integer number of bytes, so nothing left to do */
+	  return 1;
+	}
+    }
+  else
+    {
+      uint32_t a1 = ntohl (addr1->ip4.as_u32);
+      uint32_t a2 = ntohl (addr2->ip4.as_u32);
+      uint32_t mask0 = 0xffffffff - ((1 << (32 - prefixlen)) - 1);
+      return (a1 & mask0) == a2;
+    }
+}
+
+static int
+acl_match_port (u16 port, u16 port_first, u16 port_last, int is_ip6)
+{
+  return ((port >= port_first) && (port <= port_last));
+}
+
+static int
+acl_packet_match (acl_main_t * am, u32 acl_index, vlib_buffer_t * b0,
+		  u8 * r_action, int *r_is_ip6, u32 * r_acl_match_p,
+		  u32 * r_rule_match_p, u32 * trace_bitmap)
+{
+  ethernet_header_t *h0;
+  u16 type0;
+
+  ip46_address_t src, dst;
+  int is_ip6;
+  int is_ip4;
+  u8 proto;
+  u16 src_port;
+  u16 dst_port;
+  u8 tcp_flags = 0;
+  int i;
+  acl_list_t *a;
+  acl_rule_t *r;
+
+  h0 = vlib_buffer_get_current (b0);
+  type0 = clib_net_to_host_u16 (h0->type);
+  is_ip4 = (type0 == ETHERNET_TYPE_IP4);
+  is_ip6 = (type0 == ETHERNET_TYPE_IP6);
+
+  if (!(is_ip4 || is_ip6))
+    {
+      return 0;
+    }
+  /* The bunch of hardcoded offsets here is intentional to get rid of them
+     ASAP, when getting to a faster matching code */
+  if (is_ip4)
+    {
+      clib_memcpy (&src.ip4, get_ptr_to_offset (b0, 26), 4);
+      clib_memcpy (&dst.ip4, get_ptr_to_offset (b0, 30), 4);
+      proto = acl_get_l4_proto (b0, 0);
+      if (1 == proto)
+	{
+	  *trace_bitmap |= 0x00000001;
+	  /* type */
+	  src_port = *(u8 *) get_ptr_to_offset (b0, 34);
+	  /* code */
+	  dst_port = *(u8 *) get_ptr_to_offset (b0, 35);
+	}
+      else
+	{
+	  /* assume TCP/UDP */
+	  src_port = (*(u16 *) get_ptr_to_offset (b0, 34));
+	  dst_port = (*(u16 *) get_ptr_to_offset (b0, 36));
+	  /* UDP gets ability to check on an oddball data byte as a bonus */
+	  tcp_flags = *(u8 *) get_ptr_to_offset (b0, 14 + 20 + 13);
+	}
+    }
+  else /* is_ipv6 implicitly */
+    {
+      clib_memcpy (&src, get_ptr_to_offset (b0, 22), 16);
+      clib_memcpy (&dst, get_ptr_to_offset (b0, 38), 16);
+      proto = acl_get_l4_proto (b0, 1);
+      if (58 == proto)
+	{
+	  *trace_bitmap |= 0x00000002;
+	  /* type */
+	  src_port = *(u8 *) get_ptr_to_offset (b0, 54);
+	  /* code */
+	  dst_port = *(u8 *) get_ptr_to_offset (b0, 55);
+	}
+      else
+	{
+	  /* assume TCP/UDP */
+	  src_port = (*(u16 *) get_ptr_to_offset (b0, 54));
+	  dst_port = (*(u16 *) get_ptr_to_offset (b0, 56));
+	  tcp_flags = *(u8 *) get_ptr_to_offset (b0, 14 + 40 + 13);
+	}
+    }
+  if (pool_is_free_index (am->acls, acl_index))
+    {
+      if (r_acl_match_p)
+	*r_acl_match_p = acl_index;
+      if (r_rule_match_p)
+	*r_rule_match_p = -1;
+      /* the ACL does not exist but is used for policy. Block traffic. */
+      return 0;
+    }
+  a = am->acls + acl_index;
+  for (i = 0; i < a->count; i++)
+    {
+      r = a->rules + i;
+      if (is_ip6 != r->is_ipv6)
+	{
+	  continue;
+	}
+      if (!acl_match_addr (&dst, &r->dst, r->dst_prefixlen, is_ip6))
+	continue;
+      if (!acl_match_addr (&src, &r->src, r->src_prefixlen, is_ip6))
+	continue;
+      if (r->proto)
+	{
+	  if (proto != r->proto)
+	    continue;
+	  if (!acl_match_port
+	      (src_port, r->src_port_or_type_first, r->src_port_or_type_last,
+	       is_ip6))
+	    continue;
+	  if (!acl_match_port
+	      (dst_port, r->dst_port_or_code_first, r->dst_port_or_code_last,
+	       is_ip6))
+	    continue;
+	  /* No need for check of proto == TCP, since in other rules both fields should be zero, so this match will succeed */
+	  if ((tcp_flags & r->tcp_flags_mask) != r->tcp_flags_value)
+	    continue;
+	}
+      /* everything matches! */
+      *r_action = r->is_permit;
+      *r_is_ip6 = is_ip6;
+      if (r_acl_match_p)
+	*r_acl_match_p = acl_index;
+      if (r_rule_match_p)
+	*r_rule_match_p = i;
+      return 1;
+    }
+  return 0;
+}
+
+void
+input_acl_packet_match (u32 sw_if_index, vlib_buffer_t * b0, u32 * nextp,
+			u32 * acl_match_p, u32 * rule_match_p,
+			u32 * trace_bitmap)
+{
+  acl_main_t *am = &acl_main;
+  uint8_t action = 0;
+  int is_ip6 = 0;
+  int i;
+  vec_validate (am->input_acl_vec_by_sw_if_index, sw_if_index);
+  for (i = 0; i < vec_len (am->input_acl_vec_by_sw_if_index[sw_if_index]);
+       i++)
+    {
+      if (acl_packet_match
+	  (am, am->input_acl_vec_by_sw_if_index[sw_if_index][i], b0, &action,
+	   &is_ip6, acl_match_p, rule_match_p, trace_bitmap))
+	{
+	  if (is_ip6)
+	    {
+	      *nextp = am->acl_in_ip6_match_next[action];
+	    }
+	  else
+	    {
+	      *nextp = am->acl_in_ip4_match_next[action];
+	    }
+	  return;
+	}
+    }
+  if (vec_len (am->input_acl_vec_by_sw_if_index[sw_if_index]) > 0)
+    {
+      /* If there are ACLs and none matched, deny by default */
+      *nextp = 0;
+    }
+
+}
+
+void
+output_acl_packet_match (u32 sw_if_index, vlib_buffer_t * b0, u32 * nextp,
+			 u32 * acl_match_p, u32 * rule_match_p,
+			 u32 * trace_bitmap)
+{
+  acl_main_t *am = &acl_main;
+  uint8_t action = 0;
+  int is_ip6 = 0;
+  int i;
+  vec_validate (am->output_acl_vec_by_sw_if_index, sw_if_index);
+  for (i = 0; i < vec_len (am->output_acl_vec_by_sw_if_index[sw_if_index]);
+       i++)
+    {
+      if (acl_packet_match
+	  (am, am->output_acl_vec_by_sw_if_index[sw_if_index][i], b0, &action,
+	   &is_ip6, acl_match_p, rule_match_p, trace_bitmap))
+	{
+	  if (is_ip6)
+	    {
+	      *nextp = am->acl_out_ip6_match_next[action];
+	    }
+	  else
+	    {
+	      *nextp = am->acl_out_ip4_match_next[action];
+	    }
+	  return;
+	}
+    }
+  if (vec_len (am->output_acl_vec_by_sw_if_index[sw_if_index]) > 0)
+    {
+      /* If there are ACLs and none matched, deny by default */
+      *nextp = 0;
+    }
+}
+
+typedef struct
+{
+  u8 is_ipv6;
+  u8 mac_mask[6];
+  u8 prefix_len;
+  u32 count;
+  u32 table_index;
+} macip_match_type_t;
+
+static u32
+macip_find_match_type (macip_match_type_t * mv, u8 * mac_mask, u8 prefix_len,
+		       u8 is_ipv6)
+{
+  u32 i;
+  if (mv)
+    {
+      for (i = 0; i < vec_len (mv); i++)
+	{
+	  if ((mv[i].prefix_len == prefix_len) && (mv[i].is_ipv6 == is_ipv6)
+	      && (0 == memcmp (mv[i].mac_mask, mac_mask, 6)))
+	    {
+	      return i;
+	    }
+	}
+    }
+  return ~0;
+}
+
+
+/* Get metric used to sort match types.
+   The more specific and the more often seen - the bigger the metric */
+static int
+match_type_metric (macip_match_type_t * m)
+{
+  /* FIXME: count the ones in the MAC mask as well, check how well this heuristic works in real life */
+  return m->prefix_len + m->is_ipv6 + 10 * m->count;
+}
+
+static int
+match_type_compare (macip_match_type_t * m1, macip_match_type_t * m2)
+{
+  /* Ascending sort based on the metric values */
+  return match_type_metric (m1) - match_type_metric (m2);
+}
+
+/* Get the offset of L3 source within ethernet packet */
+static int
+get_l3_src_offset(int is6)
+{
+  if(is6)
+    return (sizeof(ethernet_header_t) + offsetof(ip6_header_t, src_address));
+  else
+    return (sizeof(ethernet_header_t) + offsetof(ip4_header_t, src_address));
+}
+
+static int
+macip_create_classify_tables (acl_main_t * am, u32 macip_acl_index)
+{
+  macip_match_type_t *mvec = NULL;
+  macip_match_type_t *mt;
+  macip_acl_list_t *a = &am->macip_acls[macip_acl_index];
+  int i;
+  u32 match_type_index;
+  u32 last_table;
+  u8 mask[5 * 16];
+  vnet_classify_main_t *cm = &vnet_classify_main;
+
+  /* Count the number of different types of rules */
+  for (i = 0; i < a->count; i++)
+    {
+      if (~0 ==
+	  (match_type_index =
+	   macip_find_match_type (mvec, a->rules[i].src_mac_mask,
+				  a->rules[i].src_prefixlen,
+				  a->rules[i].is_ipv6)))
+	{
+	  match_type_index = vec_len (mvec);
+	  vec_validate (mvec, match_type_index);
+	  memcpy (mvec[match_type_index].mac_mask,
+		  a->rules[match_type_index].src_mac_mask, 6);
+	  mvec[match_type_index].prefix_len = a->rules[i].src_prefixlen;
+	  mvec[match_type_index].is_ipv6 = a->rules[i].is_ipv6;
+	  mvec[match_type_index].table_index = ~0;
+	}
+      mvec[match_type_index].count++;
+    }
+  /* Put the most frequently used tables last in the list so we can create classifier tables in reverse order */
+  vec_sort_with_function (mvec, match_type_compare);
+  /* Create the classifier tables */
+  last_table = ~0;
+  vec_foreach (mt, mvec)
+  {
+    int mask_len;
+    int is6 = mt->is_ipv6;
+    int l3_src_offs = get_l3_src_offset(is6);
+    memset (mask, 0, sizeof (mask));
+    memcpy (&mask[6], mt->mac_mask, 6);
+    for (i = 0; i < (mt->prefix_len / 8); i++)
+      {
+	mask[l3_src_offs + i] = 0xff;
+      }
+    if (mt->prefix_len % 8)
+      {
+	mask[l3_src_offs + (mt->prefix_len / 8)] =
+	  0xff - ((1 << (8 - mt->prefix_len % 8)) - 1);
+      }
+    /*
+     * Round-up the number of bytes needed to store the prefix,
+     * and round up the number of vectors too
+     */
+    mask_len = ((l3_src_offs + ((mt->prefix_len+7) / 8) +
+                (sizeof (u32x4)-1))/sizeof(u32x4)) * sizeof (u32x4);
+    acl_classify_add_del_table_small (cm, mask, mask_len, last_table,
+				(~0 == last_table) ? 0 : ~0, &mt->table_index,
+				1);
+    last_table = mt->table_index;
+  }
+  a->ip4_table_index = ~0;
+  a->ip6_table_index = ~0;
+  a->l2_table_index = last_table;
+
+  /* Populate the classifier tables with rules from the MACIP ACL */
+  for (i = 0; i < a->count; i++)
+    {
+      u32 action = 0;
+      u32 metadata = 0;
+      int is6 = a->rules[i].is_ipv6;
+      int l3_src_offs = get_l3_src_offset(is6);
+      memset (mask, 0, sizeof (mask));
+      memcpy (&mask[6], a->rules[i].src_mac, 6);
+      if (is6)
+	{
+	  memcpy (&mask[l3_src_offs], &a->rules[i].src_ip_addr.ip6, 16);
+	}
+      else
+	{
+	  memcpy (&mask[l3_src_offs], &a->rules[i].src_ip_addr.ip4, 4);
+	}
+      match_type_index =
+	macip_find_match_type (mvec, a->rules[i].src_mac_mask,
+			       a->rules[i].src_prefixlen,
+			       a->rules[i].is_ipv6);
+      /* add session to table mvec[match_type_index].table_index; */
+      vnet_classify_add_del_session (cm, mvec[match_type_index].table_index,
+				     mask, a->rules[i].is_permit ? ~0 : 0, i,
+				     0, action, metadata, 1);
+    }
+  return 0;
+}
+
+static void
+macip_destroy_classify_tables (acl_main_t * am, u32 macip_acl_index)
+{
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  macip_acl_list_t *a = &am->macip_acls[macip_acl_index];
+
+  if (a->ip4_table_index != ~0)
+    {
+      acl_classify_add_del_table_small (cm, 0, ~0, ~0, ~0, &a->ip4_table_index, 0);
+      a->ip4_table_index = ~0;
+    }
+  if (a->ip6_table_index != ~0)
+    {
+      acl_classify_add_del_table_small (cm, 0, ~0, ~0, ~0, &a->ip6_table_index, 0);
+      a->ip6_table_index = ~0;
+    }
+  if (a->l2_table_index != ~0)
+    {
+      acl_classify_add_del_table_small (cm, 0, ~0, ~0, ~0, &a->l2_table_index, 0);
+      a->l2_table_index = ~0;
+    }
+}
+
+static int
+macip_acl_add_list (u32 count, vl_api_macip_acl_rule_t rules[],
+		    u32 * acl_list_index, u8 * tag)
+{
+  acl_main_t *am = &acl_main;
+  macip_acl_list_t *a;
+  macip_acl_rule_t *r;
+  macip_acl_rule_t *acl_new_rules;
+  int i;
+
+  /* Create and populate the rules */
+  acl_new_rules = clib_mem_alloc_aligned (sizeof (macip_acl_rule_t) * count,
+					  CLIB_CACHE_LINE_BYTES);
+  if (!acl_new_rules)
+    {
+      /* Could not allocate rules. New or existing ACL - bail out regardless */
+      return -1;
+    }
+
+  for (i = 0; i < count; i++)
+    {
+      r = &acl_new_rules[i];
+      r->is_permit = rules[i].is_permit;
+      r->is_ipv6 = rules[i].is_ipv6;
+      memcpy (&r->src_mac, rules[i].src_mac, 6);
+      memcpy (&r->src_mac_mask, rules[i].src_mac_mask, 6);
+      if(rules[i].is_ipv6)
+        memcpy (&r->src_ip_addr.ip6, rules[i].src_ip_addr, 16);
+      else
+        memcpy (&r->src_ip_addr.ip4, rules[i].src_ip_addr, 4);
+      r->src_prefixlen = rules[i].src_ip_prefix_len;
+    }
+
+  /* Get ACL index */
+  pool_get_aligned (am->macip_acls, a, CLIB_CACHE_LINE_BYTES);
+  memset (a, 0, sizeof (*a));
+  /* Will return the newly allocated ACL index */
+  *acl_list_index = a - am->macip_acls;
+
+  a->rules = acl_new_rules;
+  a->count = count;
+  memcpy (a->tag, tag, sizeof (a->tag));
+
+  /* Create and populate the classifer tables */
+  macip_create_classify_tables (am, *acl_list_index);
+
+  return 0;
+}
+
+
+/* No check for validity of sw_if_index - the callers were supposed to validate */
+
+static int
+macip_acl_interface_del_acl (acl_main_t * am, u32 sw_if_index)
+{
+  int rv;
+  u32 macip_acl_index;
+  macip_acl_list_t *a;
+  vec_validate_init_empty (am->macip_acl_by_sw_if_index, sw_if_index, ~0);
+  macip_acl_index = am->macip_acl_by_sw_if_index[sw_if_index];
+  /* No point in deleting MACIP ACL which is not applied */
+  if (~0 == macip_acl_index)
+    return -1;
+  a = &am->macip_acls[macip_acl_index];
+  /* remove the classifier tables off the interface L2 ACL */
+  rv =
+    vnet_set_input_acl_intfc (am->vlib_main, sw_if_index, a->ip4_table_index,
+			      a->ip6_table_index, a->l2_table_index, 0);
+  /* Unset the MACIP ACL index */
+  am->macip_acl_by_sw_if_index[sw_if_index] = ~0;
+  return rv;
+}
+
+/* No check for validity of sw_if_index - the callers were supposed to validate */
+
+static int
+macip_acl_interface_add_acl (acl_main_t * am, u32 sw_if_index,
+			     u32 macip_acl_index)
+{
+  macip_acl_list_t *a;
+  int rv;
+  if (pool_is_free_index (am->macip_acls, macip_acl_index))
+    {
+      return -1;
+    }
+  a = &am->macip_acls[macip_acl_index];
+  vec_validate_init_empty (am->macip_acl_by_sw_if_index, sw_if_index, ~0);
+  /* If there already a MACIP ACL applied, unapply it */
+  if (~0 != am->macip_acl_by_sw_if_index[sw_if_index])
+    macip_acl_interface_del_acl(am, sw_if_index);
+  am->macip_acl_by_sw_if_index[sw_if_index] = macip_acl_index;
+  /* Apply the classifier tables for L2 ACLs */
+  rv =
+    vnet_set_input_acl_intfc (am->vlib_main, sw_if_index, a->ip4_table_index,
+			      a->ip6_table_index, a->l2_table_index, 1);
+  return rv;
+}
+
+static int
+macip_acl_del_list (u32 acl_list_index)
+{
+  acl_main_t *am = &acl_main;
+  macip_acl_list_t *a;
+  int i;
+  if (pool_is_free_index (am->macip_acls, acl_list_index))
+    {
+      return -1;
+    }
+
+  /* delete any references to the ACL */
+  for (i = 0; i < vec_len (am->macip_acl_by_sw_if_index); i++)
+    {
+      if (am->macip_acl_by_sw_if_index[i] == acl_list_index)
+	{
+	  macip_acl_interface_del_acl (am, i);
+	}
+    }
+
+  /* Now that classifier tables are detached, clean them up */
+  macip_destroy_classify_tables (am, acl_list_index);
+
+  /* now we can delete the ACL itself */
+  a = &am->macip_acls[acl_list_index];
+  if (a->rules)
+    {
+      clib_mem_free (a->rules);
+    }
+  pool_put (am->macip_acls, a);
+  return 0;
+}
+
+
+static int
+macip_acl_interface_add_del_acl (u32 sw_if_index, u8 is_add,
+				 u32 acl_list_index)
+{
+  acl_main_t *am = &acl_main;
+  int rv = -1;
+  if (is_add)
+    {
+      rv = macip_acl_interface_add_acl (am, sw_if_index, acl_list_index);
+    }
+  else
+    {
+      rv = macip_acl_interface_del_acl (am, sw_if_index);
+    }
+  return rv;
+}
+
+/* API message handler */
+static void
+vl_api_acl_add_replace_t_handler (vl_api_acl_add_replace_t * mp)
+{
+  vl_api_acl_add_replace_reply_t *rmp;
+  acl_main_t *am = &acl_main;
+  int rv;
+  u32 acl_list_index = ntohl (mp->acl_index);
+
+  rv = acl_add_list (ntohl (mp->count), mp->r, &acl_list_index, mp->tag);
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_ACL_ADD_REPLACE_REPLY,
+  ({
+    rmp->acl_index = htonl(acl_list_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_acl_del_t_handler (vl_api_acl_del_t * mp)
+{
+  acl_main_t *sm = &acl_main;
+  vl_api_acl_del_reply_t *rmp;
+  int rv;
+
+  rv = acl_del_list (ntohl (mp->acl_index));
+
+  REPLY_MACRO (VL_API_ACL_DEL_REPLY);
+}
+
+static void
+vl_api_acl_interface_add_del_t_handler (vl_api_acl_interface_add_del_t * mp)
+{
+  acl_main_t *sm = &acl_main;
+  vnet_interface_main_t *im = &sm->vnet_main->interface_main;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  vl_api_acl_interface_add_del_reply_t *rmp;
+  int rv = -1;
+
+  if (pool_is_free_index(im->sw_interfaces, sw_if_index))
+    rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
+  else
+    rv =
+      acl_interface_add_del_inout_acl (sw_if_index, mp->is_add,
+				     mp->is_input, ntohl (mp->acl_index));
+
+  REPLY_MACRO (VL_API_ACL_INTERFACE_ADD_DEL_REPLY);
+}
+
+static void
+vl_api_acl_interface_set_acl_list_t_handler
+  (vl_api_acl_interface_set_acl_list_t * mp)
+{
+  acl_main_t *sm = &acl_main;
+  vl_api_acl_interface_set_acl_list_reply_t *rmp;
+  int rv = 0;
+  int i;
+  vnet_interface_main_t *im = &sm->vnet_main->interface_main;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+
+  if (pool_is_free_index(im->sw_interfaces, sw_if_index))
+    rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
+  else
+    {
+      acl_interface_reset_inout_acls (sw_if_index, 0);
+      acl_interface_reset_inout_acls (sw_if_index, 1);
+
+      for (i = 0; i < mp->count; i++)
+        {
+          acl_interface_add_del_inout_acl (sw_if_index, 1, (i < mp->n_input),
+				       ntohl (mp->acls[i]));
+        }
+    }
+
+  REPLY_MACRO (VL_API_ACL_INTERFACE_SET_ACL_LIST_REPLY);
+}
+
+static void
+copy_acl_rule_to_api_rule (vl_api_acl_rule_t * api_rule, acl_rule_t * r)
+{
+  api_rule->is_permit = r->is_permit;
+  api_rule->is_ipv6 = r->is_ipv6;
+  if(r->is_ipv6)
+    {
+      memcpy (api_rule->src_ip_addr, &r->src, sizeof (r->src));
+      memcpy (api_rule->dst_ip_addr, &r->dst, sizeof (r->dst));
+    }
+  else
+    {
+      memcpy (api_rule->src_ip_addr, &r->src.ip4, sizeof (r->src.ip4));
+      memcpy (api_rule->dst_ip_addr, &r->dst.ip4, sizeof (r->dst.ip4));
+    }
+  api_rule->src_ip_prefix_len = r->src_prefixlen;
+  api_rule->dst_ip_prefix_len = r->dst_prefixlen;
+  api_rule->proto = r->proto;
+  api_rule->srcport_or_icmptype_first = r->src_port_or_type_first;
+  api_rule->srcport_or_icmptype_last = r->src_port_or_type_last;
+  api_rule->dstport_or_icmpcode_first = r->dst_port_or_code_first;
+  api_rule->dstport_or_icmpcode_last = r->dst_port_or_code_last;
+  api_rule->tcp_flags_mask = r->tcp_flags_mask;
+  api_rule->tcp_flags_value = r->tcp_flags_value;
+}
+
+static void
+send_acl_details (acl_main_t * am, unix_shared_memory_queue_t * q,
+		  acl_list_t * acl, u32 context)
+{
+  vl_api_acl_details_t *mp;
+  vl_api_acl_rule_t *rules;
+  int i;
+  int msg_size = sizeof (*mp) + sizeof (mp->r[0]) * acl->count;
+
+  mp = vl_msg_api_alloc (msg_size);
+  memset (mp, 0, msg_size);
+  mp->_vl_msg_id = ntohs (VL_API_ACL_DETAILS + am->msg_id_base);
+
+  /* fill in the message */
+  mp->context = context;
+  mp->count = htonl (acl->count);
+  mp->acl_index = htonl (acl - am->acls);
+  memcpy (mp->tag, acl->tag, sizeof (mp->tag));
+  // clib_memcpy (mp->r, acl->rules, acl->count * sizeof(acl->rules[0]));
+  rules = mp->r;
+  for (i = 0; i < acl->count; i++)
+    {
+      copy_acl_rule_to_api_rule (&rules[i], &acl->rules[i]);
+    }
+
+  clib_warning("Sending acl details for ACL index %d", ntohl(mp->acl_index));
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+
+static void
+vl_api_acl_dump_t_handler (vl_api_acl_dump_t * mp)
+{
+  acl_main_t *am = &acl_main;
+  u32 acl_index;
+  acl_list_t *acl;
+
+  int rv = -1;
+  unix_shared_memory_queue_t *q;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  if (mp->acl_index == ~0)
+    {
+    /* *INDENT-OFF* */
+    /* Just dump all ACLs */
+    pool_foreach (acl, am->acls,
+    ({
+      send_acl_details(am, q, acl, mp->context);
+    }));
+    /* *INDENT-ON* */
+    }
+  else
+    {
+      acl_index = ntohl (mp->acl_index);
+      if (!pool_is_free_index (am->acls, acl_index))
+	{
+	  acl = &am->acls[acl_index];
+	  send_acl_details (am, q, acl, mp->context);
+	}
+    }
+
+  if (rv == -1)
+    {
+      /* FIXME API: should we signal an error here at all ? */
+      return;
+    }
+}
+
+static void
+send_acl_interface_list_details (acl_main_t * am,
+				 unix_shared_memory_queue_t * q,
+				 u32 sw_if_index, u32 context)
+{
+  vl_api_acl_interface_list_details_t *mp;
+  int msg_size;
+  int n_input;
+  int n_output;
+  int count;
+  int i = 0;
+
+  vec_validate (am->input_acl_vec_by_sw_if_index, sw_if_index);
+  vec_validate (am->output_acl_vec_by_sw_if_index, sw_if_index);
+
+  n_input = vec_len (am->input_acl_vec_by_sw_if_index[sw_if_index]);
+  n_output = vec_len (am->output_acl_vec_by_sw_if_index[sw_if_index]);
+  count = n_input + n_output;
+
+  msg_size = sizeof (*mp);
+  msg_size += sizeof (mp->acls[0]) * count;
+
+  mp = vl_msg_api_alloc (msg_size);
+  memset (mp, 0, msg_size);
+  mp->_vl_msg_id =
+    ntohs (VL_API_ACL_INTERFACE_LIST_DETAILS + am->msg_id_base);
+
+  /* fill in the message */
+  mp->context = context;
+  mp->sw_if_index = htonl (sw_if_index);
+  mp->count = count;
+  mp->n_input = n_input;
+  for (i = 0; i < n_input; i++)
+    {
+      mp->acls[i] = htonl (am->input_acl_vec_by_sw_if_index[sw_if_index][i]);
+    }
+  for (i = 0; i < n_output; i++)
+    {
+      mp->acls[n_input + i] =
+	htonl (am->output_acl_vec_by_sw_if_index[sw_if_index][i]);
+    }
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+static void
+vl_api_acl_interface_list_dump_t_handler (vl_api_acl_interface_list_dump_t *
+					  mp)
+{
+  acl_main_t *am = &acl_main;
+  vnet_sw_interface_t *swif;
+  vnet_interface_main_t *im = &am->vnet_main->interface_main;
+
+  u32 sw_if_index;
+  unix_shared_memory_queue_t *q;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  if (mp->sw_if_index == ~0)
+    {
+    /* *INDENT-OFF* */
+    pool_foreach (swif, im->sw_interfaces,
+    ({
+      send_acl_interface_list_details(am, q, swif->sw_if_index, mp->context);
+    }));
+    /* *INDENT-ON* */
+    }
+  else
+    {
+      sw_if_index = ntohl (mp->sw_if_index);
+      if (!pool_is_free_index(im->sw_interfaces, sw_if_index))
+        send_acl_interface_list_details (am, q, sw_if_index, mp->context);
+    }
+}
+
+/* MACIP ACL API handlers */
+
+static void
+vl_api_macip_acl_add_t_handler (vl_api_macip_acl_add_t * mp)
+{
+  vl_api_macip_acl_add_reply_t *rmp;
+  acl_main_t *am = &acl_main;
+  int rv;
+  u32 acl_list_index = ~0;
+
+  rv =
+    macip_acl_add_list (ntohl (mp->count), mp->r, &acl_list_index, mp->tag);
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2(VL_API_MACIP_ACL_ADD_REPLY,
+  ({
+    rmp->acl_index = htonl(acl_list_index);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void
+vl_api_macip_acl_del_t_handler (vl_api_macip_acl_del_t * mp)
+{
+  acl_main_t *sm = &acl_main;
+  vl_api_macip_acl_del_reply_t *rmp;
+  int rv;
+
+  rv = macip_acl_del_list (ntohl (mp->acl_index));
+
+  REPLY_MACRO (VL_API_MACIP_ACL_DEL_REPLY);
+}
+
+static void
+vl_api_macip_acl_interface_add_del_t_handler
+  (vl_api_macip_acl_interface_add_del_t * mp)
+{
+  acl_main_t *sm = &acl_main;
+  vl_api_macip_acl_interface_add_del_reply_t *rmp;
+  int rv = -1;
+  vnet_interface_main_t *im = &sm->vnet_main->interface_main;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+
+  if (pool_is_free_index(im->sw_interfaces, sw_if_index))
+    rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
+  else
+    rv =
+      macip_acl_interface_add_del_acl (ntohl (mp->sw_if_index), mp->is_add,
+				     ntohl (mp->acl_index));
+
+  REPLY_MACRO (VL_API_MACIP_ACL_INTERFACE_ADD_DEL_REPLY);
+}
+
+static void
+send_macip_acl_details (acl_main_t * am, unix_shared_memory_queue_t * q,
+			macip_acl_list_t * acl, u32 context)
+{
+  vl_api_macip_acl_details_t *mp;
+  vl_api_macip_acl_rule_t *rules;
+  macip_acl_rule_t *r;
+  int i;
+  int msg_size = sizeof (*mp) + (acl ? sizeof (mp->r[0]) * acl->count : 0);
+
+  mp = vl_msg_api_alloc (msg_size);
+  memset (mp, 0, msg_size);
+  mp->_vl_msg_id = ntohs (VL_API_MACIP_ACL_DETAILS + am->msg_id_base);
+
+  /* fill in the message */
+  mp->context = context;
+  if (acl)
+    {
+      memcpy (mp->tag, acl->tag, sizeof (mp->tag));
+      mp->count = htonl (acl->count);
+      mp->acl_index = htonl (acl - am->macip_acls);
+      rules = mp->r;
+      for (i = 0; i < acl->count; i++)
+	{
+	  r = &acl->rules[i];
+	  rules[i].is_permit = r->is_permit;
+	  rules[i].is_ipv6 = r->is_ipv6;
+	  memcpy (rules[i].src_mac, &r->src_mac, sizeof (r->src_mac));
+	  memcpy (rules[i].src_mac_mask, &r->src_mac_mask,
+		  sizeof (r->src_mac_mask));
+          if (r->is_ipv6)
+            memcpy (rules[i].src_ip_addr, &r->src_ip_addr.ip6,
+		  sizeof (r->src_ip_addr.ip6));
+          else
+            memcpy (rules[i].src_ip_addr, &r->src_ip_addr.ip4,
+		  sizeof (r->src_ip_addr.ip4));
+	  rules[i].src_ip_prefix_len = r->src_prefixlen;
+	}
+    }
+  else
+    {
+      /* No martini, no party - no ACL applied to this interface. */
+      mp->acl_index = ~0;
+      mp->count = 0;
+    }
+
+  vl_msg_api_send_shmem (q, (u8 *) & mp);
+}
+
+
+static void
+vl_api_macip_acl_dump_t_handler (vl_api_macip_acl_dump_t * mp)
+{
+  acl_main_t *am = &acl_main;
+  macip_acl_list_t *acl;
+
+  unix_shared_memory_queue_t *q;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  if (mp->acl_index == ~0)
+    {
+      /* Just dump all ACLs for now, with sw_if_index = ~0 */
+      pool_foreach (acl, am->macip_acls, (
+					   {
+					   send_macip_acl_details (am, q, acl,
+								   mp->
+								   context);}
+		    ));
+      /* *INDENT-ON* */
+    }
+  else
+    {
+      u32 acl_index = ntohl (mp->acl_index);
+      if (!pool_is_free_index (am->macip_acls, acl_index))
+	{
+	  acl = &am->macip_acls[acl_index];
+	  send_macip_acl_details (am, q, acl, mp->context);
+	}
+    }
+}
+
+static void
+vl_api_macip_acl_interface_get_t_handler (vl_api_macip_acl_interface_get_t *
+					  mp)
+{
+  acl_main_t *am = &acl_main;
+  vl_api_macip_acl_interface_get_reply_t *rmp;
+  u32 count = vec_len (am->macip_acl_by_sw_if_index);
+  int msg_size = sizeof (*rmp) + sizeof (rmp->acls[0]) * count;
+  unix_shared_memory_queue_t *q;
+  int i;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    {
+      return;
+    }
+
+  rmp = vl_msg_api_alloc (msg_size);
+  memset (rmp, 0, msg_size);
+  rmp->_vl_msg_id =
+    ntohs (VL_API_MACIP_ACL_INTERFACE_GET_REPLY + am->msg_id_base);
+  rmp->context = mp->context;
+  rmp->count = htonl (count);
+  for (i = 0; i < count; i++)
+    {
+      rmp->acls[i] = htonl (am->macip_acl_by_sw_if_index[i]);
+    }
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+
+
+/* Set up the API message handling tables */
+static clib_error_t *
+acl_plugin_api_hookup (vlib_main_t * vm)
+{
+  acl_main_t *sm = &acl_main;
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,					\
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_acl_plugin_api_msg;
+#undef _
+
+  return 0;
+}
+
+#define vl_msg_name_crc_list
+#include <acl/acl_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (acl_main_t * sm, api_main_t * am)
+{
+#define _(id,n,crc) \
+  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
+  foreach_vl_msg_name_crc_acl;
+#undef _
+}
+
+u32
+register_match_action_nexts (u32 next_in_ip4, u32 next_in_ip6,
+			     u32 next_out_ip4, u32 next_out_ip6)
+{
+  acl_main_t *am = &acl_main;
+  u32 act = am->n_match_actions;
+  if (am->n_match_actions == 255)
+    {
+      return ~0;
+    }
+  am->n_match_actions++;
+  am->acl_in_ip4_match_next[act] = next_in_ip4;
+  am->acl_in_ip6_match_next[act] = next_in_ip6;
+  am->acl_out_ip4_match_next[act] = next_out_ip4;
+  am->acl_out_ip6_match_next[act] = next_out_ip6;
+  return act;
+}
+
+void
+acl_setup_nodes (void)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  acl_main_t *am = &acl_main;
+  vlib_node_t *n;
+
+  n = vlib_get_node_by_name (vm, (u8 *) "l2-input-classify");
+  am->l2_input_classify_next_acl =
+    vlib_node_add_next_with_slot (vm, n->index, acl_in_node.index, ~0);
+  n = vlib_get_node_by_name (vm, (u8 *) "l2-output-classify");
+  am->l2_output_classify_next_acl =
+    vlib_node_add_next_with_slot (vm, n->index, acl_out_node.index, ~0);
+
+  feat_bitmap_init_next_nodes (vm, acl_in_node.index, L2INPUT_N_FEAT,
+			       l2input_get_feat_names (),
+			       am->acl_in_node_input_next_node_index);
+
+  memset (&am->acl_in_ip4_match_next[0], 0,
+	  sizeof (am->acl_in_ip4_match_next));
+  memset (&am->acl_in_ip6_match_next[0], 0,
+	  sizeof (am->acl_in_ip6_match_next));
+  memset (&am->acl_out_ip4_match_next[0], 0,
+	  sizeof (am->acl_out_ip4_match_next));
+  memset (&am->acl_out_ip6_match_next[0], 0,
+	  sizeof (am->acl_out_ip6_match_next));
+  am->n_match_actions = 0;
+
+  register_match_action_nexts (0, 0, 0, 0);	/* drop */
+  register_match_action_nexts (~0, ~0, ~0, ~0);	/* permit */
+  register_match_action_nexts (ACL_IN_L2S_INPUT_IP4_ADD, ACL_IN_L2S_INPUT_IP6_ADD, ACL_OUT_L2S_OUTPUT_IP4_ADD, ACL_OUT_L2S_OUTPUT_IP6_ADD);	/* permit + create session */
+}
+
+
+
+static clib_error_t *
+acl_init (vlib_main_t * vm)
+{
+  acl_main_t *am = &acl_main;
+  clib_error_t *error = 0;
+  memset (am, 0, sizeof (*am));
+  am->vlib_main = vm;
+  am->vnet_main = vnet_get_main ();
+
+  u8 *name = format (0, "acl_%08x%c", api_version, 0);
+
+  /* Ask for a correctly-sized block of API message decode slots */
+  am->msg_id_base = vl_msg_api_get_msg_ids ((char *) name,
+					    VL_MSG_FIRST_AVAILABLE);
+
+  error = acl_plugin_api_hookup (vm);
+  acl_setup_nodes ();
+
+ /* Add our API messages to the global name_crc hash table */
+  setup_message_id_table (am, &api_main);
+
+  vec_free (name);
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (acl_init);
diff --git a/src/plugins/acl/acl.h b/src/plugins/acl/acl.h
new file mode 100644
index 00000000..afc9b289
--- /dev/null
+++ b/src/plugins/acl/acl.h
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_acl_h
+#define included_acl_h
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/l2/l2_output.h>
+
+
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+
+#define  ACL_PLUGIN_VERSION_MAJOR 1
+#define  ACL_PLUGIN_VERSION_MINOR 1
+
+extern vlib_node_registration_t acl_in_node;
+extern vlib_node_registration_t acl_out_node;
+
+void input_acl_packet_match(u32 sw_if_index, vlib_buffer_t * b0, u32 *nextp, u32 *acl_match_p, u32 *rule_match_p, u32 *trace_bitmap);
+void output_acl_packet_match(u32 sw_if_index, vlib_buffer_t * b0, u32 *nextp, u32 *acl_match_p, u32 *rule_match_p, u32 *trace_bitmap);
+
+enum address_e { IP4, IP6 };
+typedef struct
+{
+  enum address_e type;
+  union {
+    ip6_address_t ip6;
+    ip4_address_t ip4;
+  } addr;
+} address_t;
+
+/*
+ * ACL rules
+ */
+typedef struct
+{
+  u8 is_permit;
+  u8 is_ipv6;
+  ip46_address_t src;
+  u8 src_prefixlen;
+  ip46_address_t dst;
+  u8 dst_prefixlen;
+  u8 proto;
+  u16 src_port_or_type_first;
+  u16 src_port_or_type_last;
+  u16 dst_port_or_code_first;
+  u16 dst_port_or_code_last;
+  u8 tcp_flags_value;
+  u8 tcp_flags_mask;
+} acl_rule_t;
+
+typedef struct
+{
+  u8 is_permit;
+  u8 is_ipv6;
+  u8 src_mac[6];
+  u8 src_mac_mask[6];
+  ip46_address_t src_ip_addr;
+  u8 src_prefixlen;
+} macip_acl_rule_t;
+
+/*
+ * ACL
+ */
+typedef struct
+{
+  u8 tag[64];
+  u32 count;
+  acl_rule_t *rules;
+} acl_list_t;
+
+typedef struct
+{
+  u8 tag[64];
+  u32 count;
+  macip_acl_rule_t *rules;
+  /* References to the classifier tables that will enforce the rules */
+  u32 ip4_table_index;
+  u32 ip6_table_index;
+  u32 l2_table_index;
+} macip_acl_list_t;
+
+typedef struct {
+  /* API message ID base */
+  u16 msg_id_base;
+
+  acl_list_t *acls;	/* Pool of ACLs */
+  macip_acl_list_t *macip_acls;	/* Pool of MAC-IP ACLs */
+
+  /* ACLs associated with interfaces */
+  u32 **input_acl_vec_by_sw_if_index;
+  u32 **output_acl_vec_by_sw_if_index;
+
+  /*
+   * Classify tables used to grab the packets for the ACL check,
+   * and serving as the 5-tuple session tables at the same time
+   */
+  u32 *acl_ip4_input_classify_table_by_sw_if_index;
+  u32 *acl_ip6_input_classify_table_by_sw_if_index;
+  u32 *acl_ip4_output_classify_table_by_sw_if_index;
+  u32 *acl_ip6_output_classify_table_by_sw_if_index;
+
+  /* MACIP (input) ACLs associated with the interfaces */
+  u32 *macip_acl_by_sw_if_index;
+
+  /* next indices for our nodes in the l2-classify tables */
+  u32 l2_input_classify_next_acl;
+  u32 l2_output_classify_next_acl;
+
+  /* next node indices for feature bitmap */
+  u32 acl_in_node_input_next_node_index[32];
+  /* the respective thing for the output feature */
+  l2_output_next_nodes_st acl_out_output_next_nodes;
+
+  /* ACL match actions (must be coherent across in/out ACLs to next indices (can differ) */
+
+  u32 acl_in_ip4_match_next[256];
+  u32 acl_in_ip6_match_next[256];
+  u32 acl_out_ip4_match_next[256];
+  u32 acl_out_ip6_match_next[256];
+  u32 n_match_actions;
+
+
+  /* convenience */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+  ethernet_main_t * ethernet_main;
+} acl_main_t;
+
+extern acl_main_t acl_main;
+
+
+#endif
diff --git a/src/plugins/acl/acl_all_api_h.h b/src/plugins/acl/acl_all_api_h.h
new file mode 100644
index 00000000..96eca56d
--- /dev/null
+++ b/src/plugins/acl/acl_all_api_h.h
@@ -0,0 +1,321 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Include the generated file, see BUILT_SOURCES in Makefile.am */
+#include <acl/acl.api.h>
+
+#ifdef vl_printfun
+
+#ifdef LP64
+#define _uword_fmt "%lld"
+#define _uword_cast (long long)
+#else
+#define _uword_fmt "%ld"
+#define _uword_cast long
+#endif
+
+static inline void *
+vl_api_acl_rule_t_print (vl_api_acl_rule_t * a, void *handle)
+{
+  vl_print (handle, "vl_api_acl_rule_t:\n");
+  vl_print (handle, "is_permit: %u\n", (unsigned) a->is_permit);
+  vl_print (handle, "is_ipv6: %u\n", (unsigned) a->is_ipv6);
+  {
+    int _i;
+    for (_i = 0; _i < 16; _i++)
+      {
+        vl_print (handle, "src_ip_addr[%d]: %u\n", _i, a->src_ip_addr[_i]);
+      }
+  }
+  vl_print (handle, "src_ip_prefix_len: %u\n",
+            (unsigned) a->src_ip_prefix_len);
+  {
+    int _i;
+    for (_i = 0; _i < 16; _i++)
+      {
+        vl_print (handle, "dst_ip_addr[%d]: %u\n", _i, a->dst_ip_addr[_i]);
+      }
+  }
+  vl_print (handle, "dst_ip_prefix_len: %u\n",
+            (unsigned) a->dst_ip_prefix_len);
+  vl_print (handle, "proto: %u\n", (unsigned) a->proto);
+  vl_print (handle, "srcport_or_icmptype_first: %u\n",
+            (unsigned) a->srcport_or_icmptype_first);
+  vl_print (handle, "srcport_or_icmptype_last: %u\n",
+            (unsigned) a->srcport_or_icmptype_last);
+  vl_print (handle, "dstport_or_icmpcode_first: %u\n",
+            (unsigned) a->dstport_or_icmpcode_first);
+  vl_print (handle, "dstport_or_icmpcode_last: %u\n",
+            (unsigned) a->dstport_or_icmpcode_last);
+  vl_print (handle, "tcp_flags_mask: %u\n", (unsigned) a->tcp_flags_mask);
+  vl_print (handle, "tcp_flags_value: %u\n", (unsigned) a->tcp_flags_value);
+  return handle;
+}
+
+static inline void *
+vl_api_acl_add_replace_t_print (vl_api_acl_add_replace_t * a, void *handle)
+{
+  int i;
+  vl_print (handle, "vl_api_acl_add_replace_t:\n");
+  vl_print (handle, "_vl_msg_id: %u\n", (unsigned) a->_vl_msg_id);
+  vl_print (handle, "client_index: %u\n", (unsigned) a->client_index);
+  vl_print (handle, "context: %u\n", (unsigned) a->context);
+  vl_print (handle, "acl_index: %u\n", (unsigned) a->acl_index);
+  vl_print (handle, "count: %u\n", (unsigned) a->count);
+  vl_print (handle, "r ----- \n");
+  for (i = 0; i < a->count; i++)
+    {
+      vl_print (handle, "  r[%d]:\n", i);
+      vl_api_acl_rule_t_print (&a->r[i], handle);
+    }
+  vl_print (handle, "r ----- END \n");
+  return handle;
+}
+
+
+static inline void *vl_api_acl_details_t_print (vl_api_acl_details_t *a,void *handle)
+{
+    vl_print(handle, "vl_api_acl_details_t:\n");
+    vl_print(handle, "_vl_msg_id: %u\n", (unsigned) a->_vl_msg_id);
+    vl_print(handle, "context: %u\n", (unsigned) a->context);
+    vl_print(handle, "acl_index: %u\n", (unsigned) a->acl_index);
+    {
+        int _i;
+        for (_i = 0; _i < 64; _i++) {
+            vl_print(handle, "tag[%d]: %u\n", _i, a->tag[_i]);
+        }
+    }
+    vl_print(handle, "count: %u\n", (unsigned) a->count);
+    vl_print(handle, "r ----- \n");
+    // FIXME vl_api_acl_rule_t_print(&a->r, handle);
+    vl_print(handle, "r ----- END \n");
+    return handle;
+}
+
+static inline void *
+vl_api_macip_acl_rule_t_print (vl_api_macip_acl_rule_t * a, void *handle)
+{
+  vl_print (handle, "vl_api_macip_acl_rule_t:\n");
+  vl_print (handle, "is_permit: %u\n", (unsigned) a->is_permit);
+  vl_print (handle, "is_ipv6: %u\n", (unsigned) a->is_ipv6);
+  {
+    int _i;
+    for (_i = 0; _i < 6; _i++)
+      {
+        vl_print (handle, "src_mac[%d]: %u\n", _i, a->src_mac[_i]);
+      }
+  }
+  {
+    int _i;
+    for (_i = 0; _i < 6; _i++)
+      {
+        vl_print (handle, "src_mac_mask[%d]: %u\n", _i, a->src_mac_mask[_i]);
+      }
+  }
+  {
+    int _i;
+    for (_i = 0; _i < 16; _i++)
+      {
+        vl_print (handle, "src_ip_addr[%d]: %u\n", _i, a->src_ip_addr[_i]);
+      }
+  }
+  vl_print (handle, "src_ip_prefix_len: %u\n",
+            (unsigned) a->src_ip_prefix_len);
+  return handle;
+}
+
+static inline void *
+vl_api_macip_acl_add_t_print (vl_api_macip_acl_add_t * a, void *handle)
+{
+  int i;
+  vl_print (handle, "vl_api_macip_acl_add_t:\n");
+  vl_print (handle, "_vl_msg_id: %u\n", (unsigned) a->_vl_msg_id);
+  vl_print (handle, "client_index: %u\n", (unsigned) a->client_index);
+  vl_print (handle, "context: %u\n", (unsigned) a->context);
+  vl_print (handle, "count: %u\n", (unsigned) a->count);
+  vl_print (handle, "r ----- \n");
+  for (i = 0; i < a->count; i++)
+    {
+      vl_print (handle, "  r[%d]:\n", i);
+      vl_api_macip_acl_rule_t_print (&a->r[i], handle);
+    }
+  vl_print (handle, "r ----- END \n");
+  return handle;
+}
+
+static inline void *vl_api_macip_acl_details_t_print (vl_api_macip_acl_details_t *a,void *handle)
+{
+    int i;
+    vl_print(handle, "vl_api_macip_acl_details_t:\n");
+    vl_print(handle, "_vl_msg_id: %u\n", (unsigned) a->_vl_msg_id);
+    vl_print(handle, "context: %u\n", (unsigned) a->context);
+    vl_print(handle, "acl_index: %u\n", (unsigned) a->acl_index);
+    {
+        int _i;
+        for (_i = 0; _i < 64; _i++) {
+            vl_print(handle, "tag[%d]: %u\n", _i, a->tag[_i]);
+        }
+    }
+    vl_print(handle, "count: %u\n", (unsigned) a->count);
+    vl_print(handle, "r ----- \n");
+    for (i = 0; i < a->count; i++)
+      {
+        vl_print (handle, "  r[%d]:\n", i);
+        vl_api_macip_acl_rule_t_print (&a->r[i], handle);
+      }
+    vl_print(handle, "r ----- END \n");
+    return handle;
+}
+
+#endif /* vl_printfun */
+
+
+#ifdef vl_endianfun
+
+#undef clib_net_to_host_uword
+#ifdef LP64
+#define clib_net_to_host_uword clib_net_to_host_u64
+#else
+#define clib_net_to_host_uword clib_net_to_host_u32
+#endif
+
+/*
+ * Manual endian/print functions created by copypasting the automatically
+ * generated ones with small required adjustments. Appears the codegen
+ * can't make code to print the contents of custom-type array.
+ */
+
+static inline void
+vl_api_acl_rule_t_endian (vl_api_acl_rule_t * a)
+{
+  /* a->is_permit = a->is_permit (no-op) */
+  /* a->is_ipv6 = a->is_ipv6 (no-op) */
+  /* a->src_ip_addr[0..15] = a->src_ip_addr[0..15] (no-op) */
+  /* a->src_ip_prefix_len = a->src_ip_prefix_len (no-op) */
+  /* a->dst_ip_addr[0..15] = a->dst_ip_addr[0..15] (no-op) */
+  /* a->dst_ip_prefix_len = a->dst_ip_prefix_len (no-op) */
+  /* a->proto = a->proto (no-op) */
+  a->srcport_or_icmptype_first =
+    clib_net_to_host_u16 (a->srcport_or_icmptype_first);
+  a->srcport_or_icmptype_last =
+    clib_net_to_host_u16 (a->srcport_or_icmptype_last);
+  a->dstport_or_icmpcode_first =
+    clib_net_to_host_u16 (a->dstport_or_icmpcode_first);
+  a->dstport_or_icmpcode_last =
+    clib_net_to_host_u16 (a->dstport_or_icmpcode_last);
+  /* a->tcp_flags_mask = a->tcp_flags_mask (no-op) */
+  /* a->tcp_flags_value = a->tcp_flags_value (no-op) */
+}
+
+static inline void
+vl_api_acl_add_replace_t_endian (vl_api_acl_add_replace_t * a)
+{
+  int i;
+  a->_vl_msg_id = clib_net_to_host_u16 (a->_vl_msg_id);
+  a->client_index = clib_net_to_host_u32 (a->client_index);
+  a->context = clib_net_to_host_u32 (a->context);
+  a->acl_index = clib_net_to_host_u32 (a->acl_index);
+  a->count = clib_net_to_host_u32 (a->count);
+  for (i = 0; i < a->count; i++)
+    {
+      vl_api_acl_rule_t_endian (&a->r[i]);
+    }
+}
+
+static inline void vl_api_acl_details_t_endian (vl_api_acl_details_t *a)
+{
+    int i;
+    a->_vl_msg_id = clib_net_to_host_u16(a->_vl_msg_id);
+    a->context = clib_net_to_host_u32(a->context);
+    a->acl_index = clib_net_to_host_u32(a->acl_index);
+    /* a->tag[0..63] = a->tag[0..63] (no-op) */
+    a->count = clib_net_to_host_u32(a->count);
+    for (i = 0; i < a->count; i++)
+    {
+      vl_api_acl_rule_t_endian (&a->r[i]);
+    }
+}
+
+static inline void vl_api_acl_interface_list_details_t_endian (vl_api_acl_interface_list_details_t *a)
+{
+    int i;
+    a->_vl_msg_id = clib_net_to_host_u16(a->_vl_msg_id);
+    a->context = clib_net_to_host_u32(a->context);
+    a->sw_if_index = clib_net_to_host_u32(a->sw_if_index);
+    /* a->count = a->count (no-op) */
+    /* a->n_input = a->n_input (no-op) */
+    for(i=0; i<a->count; i++) {
+      a->acls[i] = clib_net_to_host_u32(a->acls[i]);
+    }
+}
+
+static inline void vl_api_acl_interface_set_acl_list_t_endian (vl_api_acl_interface_set_acl_list_t *a)
+{
+    int i;
+    a->_vl_msg_id = clib_net_to_host_u16(a->_vl_msg_id);
+    a->client_index = clib_net_to_host_u32(a->client_index);
+    a->context = clib_net_to_host_u32(a->context);
+    a->sw_if_index = clib_net_to_host_u32(a->sw_if_index);
+    /* a->count = a->count (no-op) */
+    /* a->n_input = a->n_input (no-op) */
+    for(i=0; i<a->count; i++) {
+      a->acls[i] = clib_net_to_host_u32(a->acls[i]);
+    }
+}
+
+static inline void
+vl_api_macip_acl_rule_t_endian (vl_api_macip_acl_rule_t * a)
+{
+  /* a->is_permit = a->is_permit (no-op) */
+  /* a->is_ipv6 = a->is_ipv6 (no-op) */
+  /* a->src_mac[0..5] = a->src_mac[0..5] (no-op) */
+  /* a->src_mac_mask[0..5] = a->src_mac_mask[0..5] (no-op) */
+  /* a->src_ip_addr[0..15] = a->src_ip_addr[0..15] (no-op) */
+  /* a->src_ip_prefix_len = a->src_ip_prefix_len (no-op) */
+}
+
+static inline void
+vl_api_macip_acl_add_t_endian (vl_api_macip_acl_add_t * a)
+{
+  int i;
+  a->_vl_msg_id = clib_net_to_host_u16 (a->_vl_msg_id);
+  a->client_index = clib_net_to_host_u32 (a->client_index);
+  a->context = clib_net_to_host_u32 (a->context);
+  a->count = clib_net_to_host_u32 (a->count);
+  for (i = 0; i < a->count; i++)
+    {
+      vl_api_macip_acl_rule_t_endian (&a->r[i]);
+    }
+}
+
+static inline void vl_api_macip_acl_details_t_endian (vl_api_macip_acl_details_t *a)
+{
+    int i;
+    a->_vl_msg_id = clib_net_to_host_u16(a->_vl_msg_id);
+    a->context = clib_net_to_host_u32(a->context);
+    a->acl_index = clib_net_to_host_u32(a->acl_index);
+    /* a->tag[0..63] = a->tag[0..63] (no-op) */
+    a->count = clib_net_to_host_u32(a->count);
+    for (i = 0; i < a->count; i++)
+      {
+        vl_api_macip_acl_rule_t_endian (&a->r[i]);
+      }
+}
+
+
+
+
+#endif /* vl_printfun */
+
+
diff --git a/src/plugins/acl/acl_msg_enum.h b/src/plugins/acl/acl_msg_enum.h
new file mode 100644
index 00000000..14d8b48c
--- /dev/null
+++ b/src/plugins/acl/acl_msg_enum.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_acl_msg_enum_h
+#define included_acl_msg_enum_h
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum {
+#include <acl/acl_all_api_h.h>
+    /* We'll want to know how many messages IDs we need... */
+    VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif
diff --git a/src/plugins/acl/acl_test.c b/src/plugins/acl/acl_test.c
new file mode 100644
index 00000000..a0e413e1
--- /dev/null
+++ b/src/plugins/acl/acl_test.c
@@ -0,0 +1,1024 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * acl_test.c - test harness plugin
+ *------------------------------------------------------------------
+ */
+
+#include <vat/vat.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vppinfra/error.h>
+#include <vnet/ip/ip.h>
+#include <arpa/inet.h>
+
+uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
+
+/* Declare message IDs */
+#include <acl/acl_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <acl/acl_all_api_h.h>
+#undef vl_typedefs
+
+/* define message structures */
+#define vl_endianfun
+#include <acl/acl_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <acl/acl_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number. */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <acl/acl_all_api_h.h>
+#undef vl_api_version
+
+typedef struct {
+    /* API message ID base */
+    u16 msg_id_base;
+    vat_main_t *vat_main;
+} acl_test_main_t;
+
+acl_test_main_t acl_test_main;
+
+#define foreach_standard_reply_retval_handler   \
+_(acl_del_reply) \
+_(acl_interface_add_del_reply) \
+_(macip_acl_interface_add_del_reply) \
+_(acl_interface_set_acl_list_reply) \
+_(macip_acl_del_reply)
+
+#define foreach_reply_retval_aclindex_handler  \
+_(acl_add_replace_reply) \
+_(macip_acl_add_reply)
+
+#define _(n)                                            \
+    static void vl_api_##n##_t_handler                  \
+    (vl_api_##n##_t * mp)                               \
+    {                                                   \
+        vat_main_t * vam = acl_test_main.vat_main;   \
+        i32 retval = ntohl(mp->retval);                 \
+        if (vam->async_mode) {                          \
+            vam->async_errors += (retval < 0);          \
+        } else {                                        \
+            vam->retval = retval;                       \
+            vam->result_ready = 1;                      \
+        }                                               \
+    }
+foreach_standard_reply_retval_handler;
+#undef _
+
+#define _(n)                                            \
+    static void vl_api_##n##_t_handler                  \
+    (vl_api_##n##_t * mp)                               \
+    {                                                   \
+        vat_main_t * vam = acl_test_main.vat_main;   \
+        i32 retval = ntohl(mp->retval);                 \
+        if (vam->async_mode) {                          \
+            vam->async_errors += (retval < 0);          \
+        } else {                                        \
+            clib_warning("ACL index: %d", ntohl(mp->acl_index)); \
+            vam->retval = retval;                       \
+            vam->result_ready = 1;                      \
+        }                                               \
+    }
+foreach_reply_retval_aclindex_handler;
+#undef _
+
+/* These two ought to be in a library somewhere but they aren't */
+static uword
+my_unformat_mac_address (unformat_input_t * input, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  return unformat (input, "%x:%x:%x:%x:%x:%x", &a[0], &a[1], &a[2], &a[3],
+                   &a[4], &a[5]);
+}
+
+static u8 *
+my_format_mac_address (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+                 a[0], a[1], a[2], a[3], a[4], a[5]);
+}
+
+
+
+static void vl_api_acl_plugin_get_version_reply_t_handler
+    (vl_api_acl_plugin_get_version_reply_t * mp)
+    {
+        vat_main_t * vam = acl_test_main.vat_main;
+        clib_warning("ACL plugin version: %d.%d", ntohl(mp->major), ntohl(mp->minor));
+        vam->result_ready = 1;
+    }
+
+static void vl_api_acl_interface_list_details_t_handler
+    (vl_api_acl_interface_list_details_t * mp)
+    {
+        int i;
+        vat_main_t * vam = acl_test_main.vat_main;
+        u8 *out = 0;
+        vl_api_acl_interface_list_details_t_endian(mp);
+	out = format(out, "sw_if_index: %d, count: %d, n_input: %d\n", mp->sw_if_index, mp->count, mp->n_input);
+        out = format(out, "   input ");
+	for(i=0; i<mp->count; i++) {
+          out = format(out, "%d ", mp->acls[i]);
+          if (i == mp->n_input-1)
+            out = format(out, "\n  output ");
+	}
+        out = format(out, "\n");
+        clib_warning("%s", out);
+        vec_free(out);
+        vam->result_ready = 1;
+    }
+
+
+static inline u8 *
+vl_api_acl_rule_t_pretty_format (u8 *out, vl_api_acl_rule_t * a)
+{
+  int af = a->is_ipv6 ? AF_INET6 : AF_INET;
+  u8 src[INET6_ADDRSTRLEN];
+  u8 dst[INET6_ADDRSTRLEN];
+  inet_ntop(af, a->src_ip_addr, (void *)src, sizeof(src));
+  inet_ntop(af, a->dst_ip_addr, (void *)dst, sizeof(dst));
+
+  out = format(out, "%s action %d src %s/%d dst %s/%d proto %d sport %d-%d dport %d-%d tcpflags %d %d",
+                     a->is_ipv6 ? "ipv6" : "ipv4", a->is_permit,
+                     src, a->src_ip_prefix_len,
+                     dst, a->dst_ip_prefix_len,
+                     a->proto,
+                     a->srcport_or_icmptype_first, a->srcport_or_icmptype_last,
+	             a->dstport_or_icmpcode_first, a->dstport_or_icmpcode_last,
+                     a->tcp_flags_mask, a->tcp_flags_value);
+  return(out);
+}
+
+
+
+static void vl_api_acl_details_t_handler
+    (vl_api_acl_details_t * mp)
+    {
+        int i;
+        vat_main_t * vam = acl_test_main.vat_main;
+        vl_api_acl_details_t_endian(mp);
+        u8 *out = 0;
+        out = format(0, "acl_index: %d, count: %d\n   tag {%s}\n", mp->acl_index, mp->count, mp->tag);
+	for(i=0; i<mp->count; i++) {
+          out = format(out, "   ");
+          out = vl_api_acl_rule_t_pretty_format(out, &mp->r[i]);
+          out = format(out, "%s\n", i<mp->count-1 ? "," : "");
+	}
+        clib_warning("%s", out);
+        vec_free(out);
+        vam->result_ready = 1;
+    }
+
+static inline u8 *
+vl_api_macip_acl_rule_t_pretty_format (u8 *out, vl_api_macip_acl_rule_t * a)
+{
+  int af = a->is_ipv6 ? AF_INET6 : AF_INET;
+  u8 src[INET6_ADDRSTRLEN];
+  inet_ntop(af, a->src_ip_addr, (void *)src, sizeof(src));
+
+  out = format(out, "%s action %d ip %s/%d mac %U mask %U",
+                     a->is_ipv6 ? "ipv6" : "ipv4", a->is_permit,
+                     src, a->src_ip_prefix_len,
+                     my_format_mac_address, a->src_mac,
+                     my_format_mac_address, a->src_mac_mask);
+  return(out);
+}
+
+
+static void vl_api_macip_acl_details_t_handler
+    (vl_api_macip_acl_details_t * mp)
+    {
+        int i;
+        vat_main_t * vam = acl_test_main.vat_main;
+        vl_api_macip_acl_details_t_endian(mp);
+        u8 *out = format(0,"MACIP acl_index: %d, count: %d\n   tag {%s}\n", mp->acl_index, mp->count, mp->tag);
+	for(i=0; i<mp->count; i++) {
+          out = format(out, "   ");
+          out = vl_api_macip_acl_rule_t_pretty_format(out, &mp->r[i]);
+          out = format(out, "%s\n", i<mp->count-1 ? "," : "");
+	}
+        clib_warning("%s", out);
+        vec_free(out);
+        vam->result_ready = 1;
+    }
+
+static void vl_api_macip_acl_interface_get_reply_t_handler
+    (vl_api_macip_acl_interface_get_reply_t * mp)
+    {
+        int i;
+        vat_main_t * vam = acl_test_main.vat_main;
+        u8 *out = format(0, "sw_if_index with MACIP ACL count: %d\n", ntohl(mp->count));
+	for(i=0; i<ntohl(mp->count); i++) {
+          out = format(out, "  macip_acl_interface_add_del sw_if_index %d add acl %d\n", i, ntohl(mp->acls[i]));
+	}
+        out = format(out, "\n");
+        clib_warning("%s", out);
+        vec_free(out);
+        vam->result_ready = 1;
+    }
+
+
+/*
+ * Table of message reply handlers, must include boilerplate handlers
+ * we just generated
+ */
+#define foreach_vpe_api_reply_msg                                       \
+_(ACL_ADD_REPLACE_REPLY, acl_add_replace_reply) \
+_(ACL_DEL_REPLY, acl_del_reply) \
+_(ACL_INTERFACE_ADD_DEL_REPLY, acl_interface_add_del_reply)  \
+_(ACL_INTERFACE_SET_ACL_LIST_REPLY, acl_interface_set_acl_list_reply) \
+_(ACL_INTERFACE_LIST_DETAILS, acl_interface_list_details)  \
+_(ACL_DETAILS, acl_details)  \
+_(MACIP_ACL_ADD_REPLY, macip_acl_add_reply) \
+_(MACIP_ACL_DEL_REPLY, macip_acl_del_reply) \
+_(MACIP_ACL_DETAILS, macip_acl_details)  \
+_(MACIP_ACL_INTERFACE_ADD_DEL_REPLY, macip_acl_interface_add_del_reply)  \
+_(MACIP_ACL_INTERFACE_GET_REPLY, macip_acl_interface_get_reply)  \
+_(ACL_PLUGIN_GET_VERSION_REPLY, acl_plugin_get_version_reply)
+
+/* M: construct, but don't yet send a message */
+
+#define M(T,t)                                                  \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp));                         \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+#define M2(T,t,n)                                               \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+/* S: send a message */
+#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
+
+/* W: wait for results, with timeout */
+#define W                                       \
+do {                                            \
+    timeout = vat_time_now (vam) + 1.0;         \
+                                                \
+    while (vat_time_now (vam) < timeout) {      \
+        if (vam->result_ready == 1) {           \
+            return (vam->retval);               \
+        }                                       \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
+static int api_acl_plugin_get_version (vat_main_t * vam)
+{
+    acl_test_main_t * sm = &acl_test_main;
+    vl_api_acl_plugin_get_version_t * mp;
+    u32 msg_size = sizeof(*mp);
+    f64 timeout;
+
+    vam->result_ready = 0;
+    mp = vl_msg_api_alloc_as_if_client(msg_size);
+    memset (mp, 0, msg_size);
+    mp->_vl_msg_id = ntohs (VL_API_ACL_PLUGIN_GET_VERSION + sm->msg_id_base);
+    mp->client_index = vam->my_client_index;
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+
+    return 0;
+}
+
+static int api_macip_acl_interface_get (vat_main_t * vam)
+{
+    acl_test_main_t * sm = &acl_test_main;
+    vl_api_acl_plugin_get_version_t * mp;
+    u32 msg_size = sizeof(*mp);
+    f64 timeout;
+
+    vam->result_ready = 0;
+    mp = vl_msg_api_alloc_as_if_client(msg_size);
+    memset (mp, 0, msg_size);
+    mp->_vl_msg_id = ntohs (VL_API_MACIP_ACL_INTERFACE_GET + sm->msg_id_base);
+    mp->client_index = vam->my_client_index;
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+
+    return 0;
+}
+
+#define vec_validate_acl_rules(v, idx) \
+  do {                                 \
+    if (vec_len(v) < idx+1) {  \
+      vec_validate(v, idx); \
+      v[idx].is_permit = 0x1; \
+      v[idx].srcport_or_icmptype_last = 0xffff; \
+      v[idx].dstport_or_icmpcode_last = 0xffff; \
+    } \
+  } while (0)
+
+
+static int api_acl_add_replace (vat_main_t * vam)
+{
+    acl_test_main_t * sm = &acl_test_main;
+    unformat_input_t * i = vam->input;
+    f64 timeout;
+    vl_api_acl_add_replace_t * mp;
+    u32 acl_index = ~0;
+    u32 msg_size = sizeof (*mp); /* without the rules */
+
+    vl_api_acl_rule_t *rules = 0;
+    int rule_idx = 0;
+    int n_rules = 0;
+    u32 proto = 0;
+    u32 port1 = 0;
+    u32 port2 = 0;
+    u32 action = 0;
+    u32 tcpflags, tcpmask;
+    u32 src_prefix_length = 0, dst_prefix_length = 0;
+    ip4_address_t src_v4address, dst_v4address;
+    ip6_address_t src_v6address, dst_v6address;
+    u8 *tag = 0;
+
+    if (!unformat (i, "%d", &acl_index)) {
+	/* Just assume -1 */
+    }
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+        if (unformat (i, "ipv6"))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            rules[rule_idx].is_ipv6 = 1;
+          }
+        else if (unformat (i, "ipv4"))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            rules[rule_idx].is_ipv6 = 0;
+          }
+        else if (unformat (i, "permit+reflect"))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            rules[rule_idx].is_permit = 2;
+          }
+        else if (unformat (i, "permit"))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            rules[rule_idx].is_permit = 1;
+          }
+        else if (unformat (i, "action %d", &action))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            rules[rule_idx].is_permit = action;
+          }
+        else if (unformat (i, "src %U/%d",
+         unformat_ip4_address, &src_v4address, &src_prefix_length))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            memcpy (rules[rule_idx].src_ip_addr, &src_v4address, 4);
+            rules[rule_idx].src_ip_prefix_len = src_prefix_length;
+            rules[rule_idx].is_ipv6 = 0;
+          }
+        else if (unformat (i, "src %U/%d",
+         unformat_ip6_address, &src_v6address, &src_prefix_length))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            memcpy (rules[rule_idx].src_ip_addr, &src_v6address, 16);
+            rules[rule_idx].src_ip_prefix_len = src_prefix_length;
+            rules[rule_idx].is_ipv6 = 1;
+          }
+        else if (unformat (i, "dst %U/%d",
+         unformat_ip4_address, &dst_v4address, &dst_prefix_length))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            memcpy (rules[rule_idx].dst_ip_addr, &dst_v4address, 4);
+            rules[rule_idx].dst_ip_prefix_len = dst_prefix_length;
+            rules[rule_idx].is_ipv6 = 0;
+          }
+        else if (unformat (i, "dst %U/%d",
+         unformat_ip6_address, &dst_v6address, &dst_prefix_length))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            memcpy (rules[rule_idx].dst_ip_addr, &dst_v6address, 16);
+            rules[rule_idx].dst_ip_prefix_len = dst_prefix_length;
+            rules[rule_idx].is_ipv6 = 1;
+          }
+        else if (unformat (i, "sport %d-%d", &port1, &port2))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            rules[rule_idx].srcport_or_icmptype_first = htons(port1);
+            rules[rule_idx].srcport_or_icmptype_last = htons(port2);
+          }
+        else if (unformat (i, "sport %d", &port1))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            rules[rule_idx].srcport_or_icmptype_first = htons(port1);
+            rules[rule_idx].srcport_or_icmptype_last = htons(port1);
+          }
+        else if (unformat (i, "dport %d-%d", &port1, &port2))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            rules[rule_idx].dstport_or_icmpcode_first = htons(port1);
+            rules[rule_idx].dstport_or_icmpcode_last = htons(port2);
+          }
+        else if (unformat (i, "dport %d", &port1))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            rules[rule_idx].dstport_or_icmpcode_first = htons(port1);
+            rules[rule_idx].dstport_or_icmpcode_last = htons(port1);
+          }
+        else if (unformat (i, "tcpflags %d %d", &tcpflags, &tcpmask))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            rules[rule_idx].tcp_flags_value = tcpflags;
+            rules[rule_idx].tcp_flags_mask = tcpmask;
+          }
+        else if (unformat (i, "proto %d", &proto))
+          {
+            vec_validate_acl_rules(rules, rule_idx);
+            rules[rule_idx].proto = proto;
+          }
+        else if (unformat (i, "tag %s", &tag))
+          {
+          }
+        else if (unformat (i, ","))
+          {
+            rule_idx++;
+            vec_validate_acl_rules(rules, rule_idx);
+          }
+        else
+    break;
+    }
+
+    /* Construct the API message */
+    vam->result_ready = 0;
+
+    if(rules)
+      n_rules = vec_len(rules);
+    else
+      n_rules = 0;
+
+    msg_size += n_rules*sizeof(rules[0]);
+
+    mp = vl_msg_api_alloc_as_if_client(msg_size);
+    memset (mp, 0, msg_size);
+    mp->_vl_msg_id = ntohs (VL_API_ACL_ADD_REPLACE + sm->msg_id_base);
+    mp->client_index = vam->my_client_index;
+    if (n_rules > 0)
+      clib_memcpy(mp->r, rules, n_rules*sizeof (vl_api_acl_rule_t));
+    if (tag)
+      {
+        if (vec_len(tag) >= sizeof(mp->tag))
+          {
+            tag[sizeof(mp->tag)-1] = 0;
+            _vec_len(tag) = sizeof(mp->tag);
+          }
+        clib_memcpy(mp->tag, tag, vec_len(tag));
+        vec_free(tag);
+      }
+    mp->acl_index = ntohl(acl_index);
+    mp->count = htonl(n_rules);
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+static int api_acl_del (vat_main_t * vam)
+{
+    acl_test_main_t * sm = &acl_test_main;
+    unformat_input_t * i = vam->input;
+    f64 timeout;
+    vl_api_acl_del_t * mp;
+    u32 acl_index = ~0;
+
+    if (!unformat (i, "%d", &acl_index)) {
+      errmsg ("missing acl index\n");
+      return -99;
+    }
+
+    /* Construct the API message */
+    M(ACL_DEL, acl_del);
+    mp->acl_index = ntohl(acl_index);
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+static int api_macip_acl_del (vat_main_t * vam)
+{
+    acl_test_main_t * sm = &acl_test_main;
+    unformat_input_t * i = vam->input;
+    f64 timeout;
+    vl_api_acl_del_t * mp;
+    u32 acl_index = ~0;
+
+    if (!unformat (i, "%d", &acl_index)) {
+      errmsg ("missing acl index\n");
+      return -99;
+    }
+
+    /* Construct the API message */
+    M(MACIP_ACL_DEL, acl_del);
+    mp->acl_index = ntohl(acl_index);
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+static int api_acl_interface_add_del (vat_main_t * vam)
+{
+    acl_test_main_t * sm = &acl_test_main;
+    unformat_input_t * i = vam->input;
+    f64 timeout;
+    vl_api_acl_interface_add_del_t * mp;
+    u32 sw_if_index = ~0;
+    u32 acl_index = ~0;
+    u8 is_input = 0;
+    u8 is_add = 0;
+
+//    acl_interface_add_del <intfc> | sw_if_index <if-idx> acl_index <acl-idx> [out] [del]
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+        if (unformat (i, "%d", &acl_index))
+    ;
+        else
+    break;
+    }
+
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            ;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            ;
+        else if (unformat (i, "add"))
+            is_add = 1;
+        else if (unformat (i, "del"))
+            is_add = 0;
+        else if (unformat (i, "acl %d", &acl_index))
+            ;
+        else if (unformat (i, "input"))
+            is_input = 1;
+        else if (unformat (i, "output"))
+            is_input = 0;
+        else
+            break;
+    }
+
+    if (sw_if_index == ~0) {
+        errmsg ("missing interface name / explicit sw_if_index number \n");
+        return -99;
+    }
+
+    if (acl_index == ~0) {
+        errmsg ("missing ACL index\n");
+        return -99;
+    }
+
+
+
+    /* Construct the API message */
+    M(ACL_INTERFACE_ADD_DEL, acl_interface_add_del);
+    mp->acl_index = ntohl(acl_index);
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->is_add = is_add;
+    mp->is_input = is_input;
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+static int api_macip_acl_interface_add_del (vat_main_t * vam)
+{
+    acl_test_main_t * sm = &acl_test_main;
+    unformat_input_t * i = vam->input;
+    f64 timeout;
+    vl_api_macip_acl_interface_add_del_t * mp;
+    u32 sw_if_index = ~0;
+    u32 acl_index = ~0;
+    u8 is_add = 0;
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            ;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            ;
+        else if (unformat (i, "add"))
+            is_add = 1;
+        else if (unformat (i, "del"))
+            is_add = 0;
+        else if (unformat (i, "acl %d", &acl_index))
+            ;
+        else
+            break;
+    }
+
+    if (sw_if_index == ~0) {
+        errmsg ("missing interface name / explicit sw_if_index number \n");
+        return -99;
+    }
+
+    if (acl_index == ~0) {
+        errmsg ("missing ACL index\n");
+        return -99;
+    }
+
+
+
+    /* Construct the API message */
+    M(MACIP_ACL_INTERFACE_ADD_DEL, macip_acl_interface_add_del);
+    mp->acl_index = ntohl(acl_index);
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->is_add = is_add;
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+static int api_acl_interface_set_acl_list (vat_main_t * vam)
+{
+    acl_test_main_t * sm = &acl_test_main;
+    unformat_input_t * i = vam->input;
+    f64 timeout;
+    vl_api_acl_interface_set_acl_list_t * mp;
+    u32 sw_if_index = ~0;
+    u32 acl_index = ~0;
+    u32 *inacls = 0;
+    u32 *outacls = 0;
+    u8 is_input = 0;
+
+//  acl_interface_set_acl_list <intfc> | sw_if_index <if-idx> input [acl-idx list] output [acl-idx list]
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            ;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            ;
+        else if (unformat (i, "%d", &acl_index))
+          {
+            if(is_input)
+              vec_add1(inacls, htonl(acl_index));
+            else
+              vec_add1(outacls, htonl(acl_index));
+          }
+        else if (unformat (i, "acl %d", &acl_index))
+            ;
+        else if (unformat (i, "input"))
+            is_input = 1;
+        else if (unformat (i, "output"))
+            is_input = 0;
+        else
+            break;
+    }
+
+    if (sw_if_index == ~0) {
+        errmsg ("missing interface name / explicit sw_if_index number \n");
+        return -99;
+    }
+
+    /* Construct the API message */
+    M2(ACL_INTERFACE_SET_ACL_LIST, acl_interface_set_acl_list, sizeof(u32) * (vec_len(inacls) + vec_len(outacls)));
+    mp->sw_if_index = ntohl(sw_if_index);
+    mp->n_input = vec_len(inacls);
+    mp->count = vec_len(inacls) + vec_len(outacls);
+    vec_append(inacls, outacls);
+    if (vec_len(inacls) > 0)
+      clib_memcpy(mp->acls, inacls, vec_len(inacls)*sizeof(u32));
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+
+static int api_acl_interface_list_dump (vat_main_t * vam)
+{
+    acl_test_main_t * sm = &acl_test_main;
+    unformat_input_t * i = vam->input;
+    f64 timeout;
+    u32 sw_if_index = ~0;
+    vl_api_acl_interface_list_dump_t * mp;
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+            ;
+        else if (unformat (i, "sw_if_index %d", &sw_if_index))
+            ;
+        else
+            break;
+    }
+
+    /* Construct the API message */
+    M(ACL_INTERFACE_LIST_DUMP, acl_interface_list_dump);
+    mp->sw_if_index = ntohl (sw_if_index);
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+static int api_acl_dump (vat_main_t * vam)
+{
+    acl_test_main_t * sm = &acl_test_main;
+    unformat_input_t * i = vam->input;
+    f64 timeout;
+    u32 acl_index = ~0;
+    vl_api_acl_dump_t * mp;
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%d", &acl_index))
+            ;
+        else
+            break;
+    }
+
+    /* Construct the API message */
+    M(ACL_DUMP, acl_dump);
+    mp->acl_index = ntohl (acl_index);
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+static int api_macip_acl_dump (vat_main_t * vam)
+{
+    acl_test_main_t * sm = &acl_test_main;
+    unformat_input_t * i = vam->input;
+    f64 timeout;
+    u32 acl_index = ~0;
+    vl_api_acl_dump_t * mp;
+
+    /* Parse args required to build the message */
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+        if (unformat (i, "%d", &acl_index))
+            ;
+        else
+            break;
+    }
+
+    /* Construct the API message */
+    M(MACIP_ACL_DUMP, macip_acl_dump);
+    mp->acl_index = ntohl (acl_index);
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+#define vec_validate_macip_acl_rules(v, idx) \
+  do {                                 \
+    if (vec_len(v) < idx+1) {  \
+      vec_validate(v, idx); \
+      v[idx].is_permit = 0x1; \
+    } \
+  } while (0)
+
+
+static int api_macip_acl_add (vat_main_t * vam)
+{
+    acl_test_main_t * sm = &acl_test_main;
+    unformat_input_t * i = vam->input;
+    f64 timeout;
+    vl_api_macip_acl_add_t * mp;
+    u32 msg_size = sizeof (*mp); /* without the rules */
+
+    vl_api_macip_acl_rule_t *rules = 0;
+    int rule_idx = 0;
+    int n_rules = 0;
+    u32 src_prefix_length = 0;
+    u32 action = 0;
+    ip4_address_t src_v4address;
+    ip6_address_t src_v6address;
+    u8 src_mac[6];
+    u8 *tag = 0;
+    u8 mac_mask_all_1[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+
+    while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+        if (unformat (i, "ipv6"))
+          {
+            vec_validate_macip_acl_rules(rules, rule_idx);
+            rules[rule_idx].is_ipv6 = 1;
+          }
+        else if (unformat (i, "ipv4"))
+          {
+            vec_validate_macip_acl_rules(rules, rule_idx);
+            rules[rule_idx].is_ipv6 = 1;
+          }
+        else if (unformat (i, "permit"))
+          {
+            vec_validate_macip_acl_rules(rules, rule_idx);
+            rules[rule_idx].is_permit = 1;
+          }
+        else if (unformat (i, "deny"))
+          {
+            vec_validate_macip_acl_rules(rules, rule_idx);
+            rules[rule_idx].is_permit = 0;
+          }
+        else if (unformat (i, "action %d", &action))
+          {
+            vec_validate_macip_acl_rules(rules, rule_idx);
+            rules[rule_idx].is_permit = action;
+          }
+        else if (unformat (i, "ip %U/%d",
+         unformat_ip4_address, &src_v4address, &src_prefix_length))
+          {
+            vec_validate_macip_acl_rules(rules, rule_idx);
+            memcpy (rules[rule_idx].src_ip_addr, &src_v4address, 4);
+            rules[rule_idx].src_ip_prefix_len = src_prefix_length;
+            rules[rule_idx].is_ipv6 = 0;
+          }
+        else if (unformat (i, "ip %U/%d",
+         unformat_ip6_address, &src_v6address, &src_prefix_length))
+          {
+            vec_validate_macip_acl_rules(rules, rule_idx);
+            memcpy (rules[rule_idx].src_ip_addr, &src_v6address, 16);
+            rules[rule_idx].src_ip_prefix_len = src_prefix_length;
+            rules[rule_idx].is_ipv6 = 1;
+          }
+        else if (unformat (i, "mac %U",
+         my_unformat_mac_address, &src_mac))
+          {
+            vec_validate_macip_acl_rules(rules, rule_idx);
+            memcpy (rules[rule_idx].src_mac, &src_mac, 6);
+            memcpy (rules[rule_idx].src_mac_mask, &mac_mask_all_1, 6);
+          }
+        else if (unformat (i, "mask %U",
+         my_unformat_mac_address, &src_mac))
+          {
+            vec_validate_macip_acl_rules(rules, rule_idx);
+            memcpy (rules[rule_idx].src_mac_mask, &src_mac, 6);
+          }
+        else if (unformat (i, "tag %s", &tag))
+          {
+          }
+        else if (unformat (i, ","))
+          {
+            rule_idx++;
+            vec_validate_macip_acl_rules(rules, rule_idx);
+          }
+        else
+    break;
+    }
+
+    /* Construct the API message */
+    vam->result_ready = 0;
+
+    if(rules)
+      n_rules = vec_len(rules);
+    else
+      n_rules = 0;
+
+    msg_size += n_rules*sizeof(rules[0]);
+
+    mp = vl_msg_api_alloc_as_if_client(msg_size);
+    memset (mp, 0, msg_size);
+    mp->_vl_msg_id = ntohs (VL_API_MACIP_ACL_ADD + sm->msg_id_base);
+    mp->client_index = vam->my_client_index;
+    if (n_rules > 0)
+      clib_memcpy(mp->r, rules, n_rules*sizeof (mp->r[0]));
+    if (tag)
+      {
+        if (vec_len(tag) >= sizeof(mp->tag))
+          {
+            tag[sizeof(mp->tag)-1] = 0;
+            _vec_len(tag) = sizeof(mp->tag);
+          }
+        clib_memcpy(mp->tag, tag, vec_len(tag));
+        vec_free(tag);
+      }
+
+    mp->count = htonl(n_rules);
+
+    /* send it... */
+    S;
+
+    /* Wait for a reply... */
+    W;
+}
+
+/*
+ * List of messages that the api test plugin sends,
+ * and that the data plane plugin processes
+ */
+#define foreach_vpe_api_msg \
+_(acl_plugin_get_version, "") \
+_(acl_add_replace, "<acl-idx> [<ipv4|ipv6> <permit|permit+reflect|deny|action N> [src IP/plen] [dst IP/plen] [sport X-Y] [dport X-Y] [proto P] [tcpflags FL MASK], ... , ...") \
+_(acl_del, "<acl-idx>") \
+_(acl_dump, "[<acl-idx>]") \
+_(acl_interface_add_del, "<intfc> | sw_if_index <if-idx> [add|del] [input|output] acl <acl-idx>") \
+_(acl_interface_set_acl_list, "<intfc> | sw_if_index <if-idx> input [acl-idx list] output [acl-idx list]") \
+_(acl_interface_list_dump, "[<intfc> | sw_if_index <if-idx>]") \
+_(macip_acl_add, "...") \
+_(macip_acl_del, "<acl-idx>")\
+_(macip_acl_dump, "[<acl-idx>]") \
+_(macip_acl_interface_add_del, "<intfc> | sw_if_index <if-idx> [add|del] acl <acl-idx>") \
+_(macip_acl_interface_get, "")
+
+
+
+void vat_api_hookup (vat_main_t *vam)
+{
+    acl_test_main_t * sm = &acl_test_main;
+    /* Hook up handlers for replies from the data plane plug-in */
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,                                  \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+    foreach_vpe_api_reply_msg;
+#undef _
+
+    /* API messages we can send */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+    foreach_vpe_api_msg;
+#undef _
+
+    /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+    foreach_vpe_api_msg;
+#undef _
+}
+
+clib_error_t * vat_plugin_register (vat_main_t *vam)
+{
+  acl_test_main_t * sm = &acl_test_main;
+  u8 * name;
+
+  sm->vat_main = vam;
+
+  name = format (0, "acl_%08x%c", api_version, 0);
+  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  if (sm->msg_id_base != (u16) ~0)
+    vat_api_hookup (vam);
+
+  vec_free(name);
+
+  return 0;
+}
diff --git a/src/plugins/acl/l2sess.c b/src/plugins/acl/l2sess.c
new file mode 100644
index 00000000..cc9bde44
--- /dev/null
+++ b/src/plugins/acl/l2sess.c
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * l2sess.c - simple MAC-swap API / debug CLI handling
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/plugin/plugin.h>
+#include <acl/l2sess.h>
+
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vppinfra/timing_wheel.h>
+
+#include <vnet/l2/l2_output.h>
+#include <vnet/l2/l2_input.h>
+
+void
+l2sess_vlib_plugin_register (vlib_main_t * vm, void* hh,
+		      int from_early_init)
+{
+  l2sess_main_t *sm = &l2sess_main;
+  vnet_plugin_handoff_t * h = hh;
+  memset (sm, 0, sizeof (*sm));
+
+  sm->vlib_main = vm;
+  sm->vnet_main = h->vnet_main;
+  sm->ethernet_main = h->ethernet_main;
+}
+
+void
+l2sess_init_next_features_input (vlib_main_t * vm, l2sess_main_t * sm)
+{
+#define _(node_name, node_var, is_out, is_ip6, is_track) \
+  if (!is_out) feat_bitmap_init_next_nodes(vm, node_var.index, L2INPUT_N_FEAT,  l2input_get_feat_names (), sm->node_var ## _input_next_node_index);
+  foreach_l2sess_node
+#undef _
+}
+
+void
+l2sess_add_our_next_nodes (vlib_main_t * vm, l2sess_main_t * sm,
+			   u8 * prev_node_name, int add_output_nodes)
+{
+  vlib_node_t *n;
+  n = vlib_get_node_by_name (vm, prev_node_name);
+#define _(node_name, node_var, is_out, is_ip6, is_track) \
+  if (is_out == add_output_nodes) { \
+    u32 idx = vlib_node_add_next_with_slot(vm, n->index, node_var.index, ~0); \
+    if (is_track) { \
+      sm->next_slot_track_node_by_is_ip6_is_out[is_ip6][is_out] = idx; \
+    } \
+  }
+  foreach_l2sess_node
+#undef _
+}
+
+void
+l2sess_setup_nodes (void)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  l2sess_main_t *sm = &l2sess_main;
+
+  l2sess_init_next_features_input (vm, sm);
+
+  l2sess_add_our_next_nodes (vm, sm, (u8 *) "l2-input-classify", 0);
+  l2sess_add_our_next_nodes (vm, sm, (u8 *) "l2-output-classify", 1);
+
+}
+
+static char *
+get_l4_proto_str (int is_ip6, uint8_t l4_proto)
+{
+  switch (l4_proto)
+    {
+    case 6:
+      return "tcp";
+    case 17:
+      return "udp";
+    case 1:
+      return "icmp";
+    case 58:
+      return "icmp6";
+    default:
+      return "<?l4-unknown?>";
+    }
+}
+
+static clib_error_t *
+l2sess_show_command_fn (vlib_main_t * vm,
+			unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  l2sess_main_t *sm = &l2sess_main;
+  clib_time_t *ct = &vm->clib_time;
+  l2s_session_t *s;
+  u64 now = clib_cpu_time_now ();
+
+  vlib_cli_output (vm, "Timing wheel info: \n%U", format_timing_wheel,
+		   &sm->timing_wheel, 255);
+
+  pool_foreach (s, sm->sessions, (
+				   {
+				   f64 ctime =
+				   (now -
+				    s->create_time) * ct->seconds_per_clock;
+				   f64 atime0 =
+				   (now -
+				    s->side[0].active_time) *
+				   ct->seconds_per_clock;
+				   f64 atime1 =
+				   (now -
+				    s->side[1].active_time) *
+				   ct->seconds_per_clock;
+/*
+    f64 ctime = (s->create_time - vm->cpu_time_main_loop_start) * ct->seconds_per_clock;
+    f64 atime0 = (s->side[0].active_time - vm->cpu_time_main_loop_start) * ct->seconds_per_clock;
+    f64 atime1 = (s->side[1].active_time - vm->cpu_time_main_loop_start) * ct->seconds_per_clock;
+*/
+				   u8 * out0 =
+				   format (0,
+					   "%5d: create time: %U pkts/bytes/active time: [ %ld %ld %U : %ld %ld %U ]\n",
+					   (s - sm->sessions),
+					   format_time_interval, "h:m:s:u",
+					   ctime, s->side[0].n_packets,
+					   s->side[0].n_bytes,
+					   format_time_interval, "h:m:s:u",
+					   atime0, s->side[1].n_packets,
+					   s->side[1].n_bytes,
+					   format_time_interval, "h:m:s:u",
+					   atime1); u8 * out1 = 0;
+				   if (s->is_ip6)
+				   {
+				   out1 =
+				   format (0, "%s %U :%u <-> %U :%u",
+					   get_l4_proto_str (s->is_ip6,
+							     s->l4_proto),
+					   format_ip6_address,
+					   &s->side[0].addr.ip6,
+					   s->side[0].port,
+					   format_ip6_address,
+					   &s->side[1].addr.ip6,
+					   s->side[1].port);}
+				   else
+				   {
+				   out1 =
+				   format (0, "%s %U :%u <-> %U :%u",
+					   get_l4_proto_str (s->is_ip6,
+							     s->l4_proto),
+					   format_ip4_address,
+					   &s->side[0].addr.ip4,
+					   s->side[0].port,
+					   format_ip4_address,
+					   &s->side[1].addr.ip4,
+					   s->side[1].port);}
+				   vlib_cli_output (vm, "%s       %s", out0,
+						    out1); vec_free (out0);
+				   vec_free (out1);}
+		));
+  return 0;
+}
+
+static clib_error_t *
+l2sess_show_count_command_fn (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
+{
+  l2sess_main_t *sm = &l2sess_main;
+
+  vlib_cli_output (vm, "Timing wheel info: \n%U", format_timing_wheel,
+		   &sm->timing_wheel, 255);
+  vlib_cli_output (vm, "session pool len: %d, pool elts: %d",
+		   pool_len (sm->sessions), pool_elts (sm->sessions));
+  vlib_cli_output (vm,
+		   "attempted to delete sessions which were already free: %d",
+		   sm->counter_attempted_delete_free_session);
+  return 0;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (l2sess_show_command, static) = {
+    .path = "show l2sess",
+    .short_help = "show l2sess",
+    .function = l2sess_show_command_fn,
+};
+
+VLIB_CLI_COMMAND (l2sess_show_count_command, static) = {
+    .path = "show l2sess count",
+    .short_help = "show l2sess count",
+    .function = l2sess_show_count_command_fn,
+};
+/* *INDENT-OFF* */
+
+static inline u64
+time_sec_to_clock( clib_time_t *ct, f64 sec)
+{
+  return (u64)(((f64)sec)/ct->seconds_per_clock);
+}
+
+static clib_error_t * l2sess_init (vlib_main_t * vm)
+{
+  l2sess_main_t * sm = &l2sess_main;
+  clib_error_t * error = 0;
+  u64 cpu_time_now = clib_cpu_time_now();
+
+
+  clib_time_t *ct = &vm->clib_time;
+  sm->udp_session_idle_timeout = time_sec_to_clock(ct, UDP_SESSION_IDLE_TIMEOUT_SEC);
+  sm->tcp_session_idle_timeout = time_sec_to_clock(ct, TCP_SESSION_IDLE_TIMEOUT_SEC);
+  sm->tcp_session_transient_timeout = time_sec_to_clock(ct, TCP_SESSION_TRANSIENT_TIMEOUT_SEC);
+
+  /* The min sched time of 10e-1 causes erroneous behavior... */
+  sm->timing_wheel.min_sched_time = 10e-2;
+  sm->timing_wheel.max_sched_time = 3600.0*48.0;
+  timing_wheel_init (&sm->timing_wheel, cpu_time_now, vm->clib_time.clocks_per_second);
+  sm->timer_wheel_next_expiring_time = 0;
+  sm->timer_wheel_tick = time_sec_to_clock(ct, sm->timing_wheel.min_sched_time);
+  /* Pre-allocate expired nodes. */
+  vec_alloc (sm->data_from_advancing_timing_wheel, 32);
+
+  l2sess_setup_nodes();
+  l2output_init_output_node_vec (&sm->output_next_nodes.output_node_index_vec);
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (l2sess_init);
+
+
diff --git a/src/plugins/acl/l2sess.h b/src/plugins/acl/l2sess.h
new file mode 100644
index 00000000..db899917
--- /dev/null
+++ b/src/plugins/acl/l2sess.h
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_l2sess_h__
+#define __included_l2sess_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+#include <vppinfra/timing_wheel.h>
+
+#include <vnet/l2/l2_output.h>
+#include <vnet/l2/l2_input.h>
+
+#define _(node_name, node_var, is_out, is_ip6, is_track)
+#undef _
+#define foreach_l2sess_node \
+  _("aclp-l2s-input-ip4-add", l2sess_in_ip4_add, 0, 0, 0)  \
+  _("aclp-l2s-input-ip6-add", l2sess_in_ip6_add, 0, 1, 0)  \
+  _("aclp-l2s-output-ip4-add", l2sess_out_ip4_add, 1, 0, 0) \
+  _("aclp-l2s-output-ip6-add", l2sess_out_ip6_add, 1, 1, 0) \
+  _("aclp-l2s-input-ip4-track", l2sess_in_ip4_track, 0, 0, 1) \
+  _("aclp-l2s-input-ip6-track", l2sess_in_ip6_track, 0, 1, 1) \
+  _("aclp-l2s-output-ip4-track",l2sess_out_ip4_track, 1, 0, 1) \
+  _("aclp-l2s-output-ip6-track", l2sess_out_ip6_track, 1, 1, 1)
+
+#define _(node_name, node_var, is_out, is_ip6, is_track)  \
+  extern vlib_node_registration_t node_var;
+foreach_l2sess_node
+#undef _
+
+#define TCP_FLAG_FIN    0x01
+#define TCP_FLAG_SYN    0x02
+#define TCP_FLAG_RST    0x04
+#define TCP_FLAG_PUSH   0x08
+#define TCP_FLAG_ACK    0x10
+#define TCP_FLAG_URG    0x20
+#define TCP_FLAG_ECE    0x40
+#define TCP_FLAG_CWR    0x80
+#define TCP_FLAGS_RSTFINACKSYN (TCP_FLAG_RST + TCP_FLAG_FIN + TCP_FLAG_SYN + TCP_FLAG_ACK)
+#define TCP_FLAGS_ACKSYN (TCP_FLAG_SYN + TCP_FLAG_ACK)
+
+typedef struct {
+  ip46_address_t addr;
+  u64 active_time;
+  u64 n_packets;
+  u64 n_bytes;
+  u16 port;
+} l2s_session_side_t;
+
+enum {
+  L2S_SESSION_SIDE_IN = 0,
+  L2S_SESSION_SIDE_OUT,
+  L2S_N_SESSION_SIDES
+};
+
+typedef struct {
+  u64 create_time;
+  l2s_session_side_t side[L2S_N_SESSION_SIDES];
+  u8 l4_proto;
+  u8 is_ip6;
+  u16 tcp_flags_seen; /* u16 because of two sides */
+} l2s_session_t;
+
+#define PROD
+#ifdef PROD
+#define UDP_SESSION_IDLE_TIMEOUT_SEC 600
+#define TCP_SESSION_IDLE_TIMEOUT_SEC (3600*24)
+#define TCP_SESSION_TRANSIENT_TIMEOUT_SEC 120
+#else
+#define UDP_SESSION_IDLE_TIMEOUT_SEC 15
+#define TCP_SESSION_IDLE_TIMEOUT_SEC 15
+#define TCP_SESSION_TRANSIENT_TIMEOUT_SEC 5
+#endif
+
+typedef struct {
+    /*
+     * the next two fields are present for all nodes, but
+     *  only one of them is used per node - depending
+     * on whether the node is an input or output one.
+     */
+#define _(node_name, node_var, is_out, is_ip6, is_track) \
+    u32 node_var ## _input_next_node_index[32]; \
+    l2_output_next_nodes_st node_var ## _next_nodes;
+foreach_l2sess_node
+#undef _
+    l2_output_next_nodes_st output_next_nodes;
+
+    /* Next indices of the tracker nodes */
+    u32 next_slot_track_node_by_is_ip6_is_out[2][2];
+
+    /* 
+     * Pairing of "forward" and "reverse" tables by table index.
+     * Each relationship has two entries - for one and the other table,
+     * so it is bidirectional.
+     */
+     
+    u32 *fwd_to_rev_by_table_index;
+
+    /*
+     * The vector of per-interface session pools
+     */
+
+    l2s_session_t *sessions;
+
+    /* The session timeouts */
+    u64 tcp_session_transient_timeout;
+    u64 tcp_session_idle_timeout;
+    u64 udp_session_idle_timeout;
+
+    /* Timing wheel to time out the idle sessions */
+    timing_wheel_t timing_wheel;
+    u32 *data_from_advancing_timing_wheel;
+    u64 timer_wheel_next_expiring_time;
+    u64 timer_wheel_tick;
+
+    /* convenience */
+    vlib_main_t * vlib_main;
+    vnet_main_t * vnet_main;
+    ethernet_main_t * ethernet_main;
+
+    /* Counter(s) */
+    u64 counter_attempted_delete_free_session;
+} l2sess_main_t;
+
+l2sess_main_t l2sess_main;
+
+/* Just exposed for acl.c */
+
+void
+l2sess_vlib_plugin_register (vlib_main_t * vm, void * hh,
+                      int from_early_init);
+
+
+#endif /* __included_l2sess_h__ */
diff --git a/src/plugins/acl/l2sess_node.c b/src/plugins/acl/l2sess_node.c
new file mode 100644
index 00000000..520e5929
--- /dev/null
+++ b/src/plugins/acl/l2sess_node.c
@@ -0,0 +1,816 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <netinet/in.h>
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+#include <acl/l2sess.h>
+#include <vnet/l2/l2_classify.h>
+
+
+typedef struct
+{
+  u32 next_index;
+  u32 sw_if_index;
+  u32 trace_flags;
+  u32 session_tables[2];
+  u32 session_nexts[2];
+  u8 l4_proto;
+} l2sess_trace_t;
+
+/* packet trace format function */
+
+#define _(node_name, node_var, is_out, is_ip6, is_track) \
+static u8 * format_## node_var ##_trace (u8 * s, va_list * args)      \
+{  \
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); \
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); \
+  l2sess_trace_t * t = va_arg (*args, l2sess_trace_t *); \
+ \
+  s = format (s, node_name ": sw_if_index %d, next index %d trace_flags %08x L4 proto %d\n" \
+                           "                 tables [ %d, %d ] nexts [ %d, %d ]", \
+              t->sw_if_index, t->next_index, t->trace_flags, t->l4_proto, \
+              t->session_tables[0], t->session_tables[1], \
+              t->session_nexts[0], t->session_nexts[1]); \
+  return s; \
+}
+foreach_l2sess_node
+#undef _
+#define foreach_l2sess_error \
+_(SWAPPED, "Mac swap packets processed")
+  typedef enum
+{
+#define _(sym,str) L2SESS_ERROR_##sym,
+  foreach_l2sess_error
+#undef _
+    L2SESS_N_ERROR,
+} l2sess_error_t;
+
+static char *l2sess_error_strings[] = {
+#define _(sym,string) string,
+  foreach_l2sess_error
+#undef _
+};
+
+typedef enum
+{
+  L2SESS_NEXT_DROP,
+  L2SESS_N_NEXT,
+} l2sess_next_t;
+
+u8
+l2sess_get_l4_proto (vlib_buffer_t * b0, int node_is_ip6)
+{
+  u8 proto;
+  int proto_offset;
+  if (node_is_ip6)
+    {
+      proto_offset = 20;
+    }
+  else
+    {
+      proto_offset = 23;
+    }
+  proto = *((u8 *) vlib_buffer_get_current (b0) + proto_offset);
+  return proto;
+}
+
+
+u8
+l2sess_get_tcp_flags (vlib_buffer_t * b0, int node_is_ip6)
+{
+  u8 flags;
+  int flags_offset;
+  if (node_is_ip6)
+    {
+      flags_offset = 14 + 40 + 13;	/* FIXME: no extension headers assumed */
+    }
+  else
+    {
+      flags_offset = 14 + 20 + 13;
+    }
+  flags = *((u8 *) vlib_buffer_get_current (b0) + flags_offset);
+  return flags;
+}
+
+static inline int
+l4_tcp_or_udp (u8 proto)
+{
+  return ((proto == 6) || (proto == 17));
+}
+
+void
+l2sess_get_session_tables (l2sess_main_t * sm, u32 sw_if_index,
+			   int node_is_out, int node_is_ip6, u8 l4_proto,
+			   u32 * session_tables)
+{
+/*
+ * Based on the direction, l3 and l4 protocol, fill a u32[2] array:
+ * [0] is index for the "direct match" path, [1] is for "mirrored match".
+ * Store the indices of the tables to add the session to in session_tables[]
+ */
+  l2_output_classify_main_t *l2om = &l2_output_classify_main;
+  l2_input_classify_main_t *l2im = &l2_input_classify_main;
+
+  u32 output_table_index;
+  u32 input_table_index;
+
+  if (!l4_tcp_or_udp (l4_proto))
+    {
+      return;
+    }
+
+  if (node_is_ip6)
+    {
+      vec_validate_init_empty (l2im->
+			       classify_table_index_by_sw_if_index
+			       [L2_INPUT_CLASSIFY_TABLE_IP6], sw_if_index,
+			       ~0);
+      input_table_index =
+	l2im->
+	classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP6]
+	[sw_if_index];
+      vec_validate_init_empty (l2om->
+			       classify_table_index_by_sw_if_index
+			       [L2_OUTPUT_CLASSIFY_TABLE_IP6], sw_if_index,
+			       ~0);
+      output_table_index =
+	l2om->
+	classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_IP6]
+	[sw_if_index];
+    }
+  else
+    {
+      vec_validate_init_empty (l2im->
+			       classify_table_index_by_sw_if_index
+			       [L2_INPUT_CLASSIFY_TABLE_IP4], sw_if_index,
+			       ~0);
+      input_table_index =
+	l2im->
+	classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_TABLE_IP4]
+	[sw_if_index];
+      vec_validate_init_empty (l2om->
+			       classify_table_index_by_sw_if_index
+			       [L2_OUTPUT_CLASSIFY_TABLE_IP4], sw_if_index,
+			       ~0);
+      output_table_index =
+	l2om->
+	classify_table_index_by_sw_if_index[L2_OUTPUT_CLASSIFY_TABLE_IP4]
+	[sw_if_index];
+    }
+
+  if (node_is_out)
+    {
+      session_tables[0] = output_table_index;
+      session_tables[1] = input_table_index;
+    }
+  else
+    {
+      session_tables[0] = input_table_index;
+      session_tables[1] = output_table_index;
+    }
+}
+
+void
+l2sess_get_session_nexts (l2sess_main_t * sm, u32 sw_if_index,
+			  int node_is_out, int node_is_ip6, u8 l4_proto,
+			  u32 * session_nexts)
+{
+/*
+ * Based on the direction, l3 and l4 protocol, fill a u32[2] array:
+ * [0] is the index for the "direct match" path, [1] is for "mirrored match".
+ * Store the match_next_index in session_nexts[] for a new session entry which is being added to session tables.
+ */
+  u32 input_node_index;
+  u32 output_node_index;
+
+  if (!l4_tcp_or_udp (l4_proto))
+    {
+      return;
+    }
+
+  input_node_index =
+    sm->next_slot_track_node_by_is_ip6_is_out[node_is_ip6][0];
+  output_node_index =
+    sm->next_slot_track_node_by_is_ip6_is_out[node_is_ip6][1];
+
+  if (node_is_out)
+    {
+      session_nexts[0] = output_node_index;
+      session_nexts[1] = input_node_index;
+    }
+  else
+    {
+      session_nexts[0] = input_node_index;
+      session_nexts[1] = output_node_index;
+    }
+}
+
+
+static inline void
+swap_bytes (vlib_buffer_t * b0, int off_a, int off_b, int nbytes)
+{
+  u8 tmp;
+  u8 *pa = vlib_buffer_get_current (b0) + off_a;
+  u8 *pb = vlib_buffer_get_current (b0) + off_b;
+  while (nbytes--)
+    {
+      tmp = *pa;
+      *pa++ = *pb;
+      *pb++ = tmp;
+    }
+}
+
+/*
+ * This quite pro[bv]ably is a terrible idea performance wise. Moreso doing it twice.
+ * Would having a long (ish) chunk of memory work better for this ?
+ * We will see when we get to the performance of this.
+ */
+void
+l2sess_flip_l3l4_fields (vlib_buffer_t * b0, int node_is_ip6, u8 l4_proto)
+{
+  if (!l4_tcp_or_udp (l4_proto))
+    {
+      return;
+    }
+  if (node_is_ip6)
+    {
+      swap_bytes (b0, 22, 38, 16);	/* L3 */
+      swap_bytes (b0, 54, 56, 2);	/* L4 (when no EH!) */
+    }
+  else
+    {
+      swap_bytes (b0, 26, 30, 4);	/* L3 */
+      swap_bytes (b0, 34, 36, 2);	/* L4 */
+    }
+}
+
+void
+l2sess_add_session (vlib_buffer_t * b0, int node_is_out, int node_is_ip6,
+		    u32 session_table, u32 session_match_next,
+		    u32 opaque_index)
+{
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  u32 action = 0;
+  u32 metadata = 0;
+
+#ifdef DEBUG_SESSIONS
+  printf ("Adding session to table %d with next %d\n", session_table,
+	  session_match_next);
+#endif
+  vnet_classify_add_del_session (cm, session_table,
+				 vlib_buffer_get_current (b0),
+				 session_match_next, opaque_index, 0, action,
+				 metadata, 1);
+}
+
+
+
+static void *
+get_ptr_to_offset (vlib_buffer_t * b0, int offset)
+{
+  u8 *p = vlib_buffer_get_current (b0) + offset;
+  return p;
+}
+
+
+/*
+ * FIXME: Hardcoded offsets are ugly, although if casting to structs one
+ * would need to take care about alignment.. So let's for now be naive and simple.
+ */
+
+void
+session_store_ip4_l3l4_info (vlib_buffer_t * b0, l2s_session_t * sess,
+			     int node_is_out)
+{
+  clib_memcpy (&sess->side[1 - node_is_out].addr.ip4,
+	       get_ptr_to_offset (b0, 26), 4);
+  clib_memcpy (&sess->side[node_is_out].addr.ip4, get_ptr_to_offset (b0, 30),
+	       4);
+  sess->side[1 - node_is_out].port =
+    ntohs (*(u16 *) get_ptr_to_offset (b0, 34));
+  sess->side[node_is_out].port = ntohs (*(u16 *) get_ptr_to_offset (b0, 36));
+}
+
+void
+session_store_ip6_l3l4_info (vlib_buffer_t * b0, l2s_session_t * sess,
+			     int node_is_out)
+{
+  clib_memcpy (&sess->side[1 - node_is_out].addr.ip6,
+	       get_ptr_to_offset (b0, 22), 16);
+  clib_memcpy (&sess->side[node_is_out].addr.ip4, get_ptr_to_offset (b0, 38),
+	       16);
+  sess->side[1 - node_is_out].port =
+    ntohs (*(u16 *) get_ptr_to_offset (b0, 54));
+  sess->side[node_is_out].port = ntohs (*(u16 *) get_ptr_to_offset (b0, 56));
+}
+
+static void
+build_match_from_session (l2sess_main_t * sm, u8 * match,
+			  l2s_session_t * sess, int is_out)
+{
+  if (sess->is_ip6)
+    {
+      match[20] = sess->l4_proto;
+      clib_memcpy (&match[22], &sess->side[1 - is_out].addr.ip6, 16);
+      clib_memcpy (&match[38], &sess->side[is_out].addr.ip4, 16);
+      *(u16 *) & match[54] = htons (sess->side[1 - is_out].port);
+      *(u16 *) & match[56] = htons (sess->side[is_out].port);
+    }
+  else
+    {
+      match[23] = sess->l4_proto;
+      clib_memcpy (&match[26], &sess->side[1 - is_out].addr.ip6, 4);
+      clib_memcpy (&match[30], &sess->side[is_out].addr.ip4, 4);
+      *(u16 *) & match[34] = htons (sess->side[1 - is_out].port);
+      *(u16 *) & match[36] = htons (sess->side[is_out].port);
+    }
+}
+
+static void
+delete_session (l2sess_main_t * sm, u32 sw_if_index, u32 session_index)
+{
+  vnet_classify_main_t *cm = &vnet_classify_main;
+  u8 match[5 * 16];		/* For building the mock of the packet to delete the classifier session */
+  u32 session_tables[2] = { ~0, ~0 };
+  l2s_session_t *sess = sm->sessions + session_index;
+  if (pool_is_free (sm->sessions, sess))
+    {
+      sm->counter_attempted_delete_free_session++;
+      return;
+    }
+  l2sess_get_session_tables (sm, sw_if_index, 0, sess->is_ip6, sess->l4_proto,
+			     session_tables);
+  if (session_tables[1] != ~0)
+    {
+      build_match_from_session (sm, match, sess, 1);
+      vnet_classify_add_del_session (cm, session_tables[1], match, 0, 0, 0, 0,
+				     0, 0);
+    }
+  if (session_tables[1] != ~0)
+    {
+      build_match_from_session (sm, match, sess, 1);
+      vnet_classify_add_del_session (cm, session_tables[1], match, 0, 0, 0, 0,
+				     0, 0);
+    }
+  pool_put (sm->sessions, sess);
+}
+
+static void
+udp_session_account_buffer (vlib_buffer_t * b0, l2s_session_t * s,
+			    int which_side, u64 now)
+{
+  l2s_session_side_t *ss = &s->side[which_side];
+  ss->active_time = now;
+  ss->n_packets++;
+  ss->n_bytes += b0->current_data + b0->current_length;
+}
+
+static inline u64
+udp_session_get_timeout (l2sess_main_t * sm, l2s_session_t * sess, u64 now)
+{
+  return (sm->udp_session_idle_timeout);
+}
+
+static void
+tcp_session_account_buffer (vlib_buffer_t * b0, l2s_session_t * s,
+			    int which_side, u64 now)
+{
+  l2s_session_side_t *ss = &s->side[which_side];
+  ss->active_time = now;
+  ss->n_packets++;
+  ss->n_bytes += b0->current_data + b0->current_length;
+  /* Very very lightweight TCP state tracking: just record which flags were seen */
+  s->tcp_flags_seen |=
+    l2sess_get_tcp_flags (b0, s->is_ip6) << (8 * which_side);
+}
+
+/*
+ * Since we are tracking for the purposes of timing the sessions out,
+ * we mostly care about two states: established (maximize the idle timeouts)
+ * and transient (halfopen/halfclosed/reset) - we need to have a reasonably short timeout to
+ * quickly get rid of sessions but not short enough to violate the TCP specs.
+ */
+
+static inline u64
+tcp_session_get_timeout (l2sess_main_t * sm, l2s_session_t * sess, u64 now)
+{
+  /* seen both SYNs and ACKs but not FINs means we are in establshed state */
+  u16 masked_flags =
+    sess->tcp_flags_seen & ((TCP_FLAGS_RSTFINACKSYN << 8) +
+			    TCP_FLAGS_RSTFINACKSYN);
+  if (((TCP_FLAGS_ACKSYN << 8) + TCP_FLAGS_ACKSYN) == masked_flags)
+    {
+      return (sm->tcp_session_idle_timeout);
+    }
+  else
+    {
+      return (sm->tcp_session_transient_timeout);
+    }
+}
+
+static inline u64
+session_get_timeout (l2sess_main_t * sm, l2s_session_t * sess, u64 now)
+{
+  u64 timeout;
+
+  switch (sess->l4_proto)
+    {
+    case 6:
+      timeout = tcp_session_get_timeout (sm, sess, now);
+      break;
+    case 17:
+      timeout = udp_session_get_timeout (sm, sess, now);
+      break;
+    default:
+      timeout = 0;
+    }
+
+  return timeout;
+}
+
+static inline u64
+get_session_last_active_time(l2s_session_t * sess)
+{
+  u64 last_active =
+    sess->side[0].active_time >
+    sess->side[1].active_time ? sess->side[0].active_time : sess->side[1].
+    active_time;
+  return last_active;
+}
+
+static int
+session_is_alive (l2sess_main_t * sm, l2s_session_t * sess, u64 now, u64 *last_active_cache)
+{
+  u64 last_active = get_session_last_active_time(sess);
+  u64 timeout = session_get_timeout (sm, sess, now);
+  int is_alive = ((now - last_active) < timeout);
+  if (last_active_cache)
+    *last_active_cache = last_active;
+  return is_alive;
+}
+
+static void
+check_idle_sessions (l2sess_main_t * sm, u32 sw_if_index, u64 now)
+{
+  sm->timer_wheel_next_expiring_time = 0;
+  sm->data_from_advancing_timing_wheel
+    =
+    timing_wheel_advance (&sm->timing_wheel, now,
+			  sm->data_from_advancing_timing_wheel,
+			  &sm->timer_wheel_next_expiring_time);
+#ifdef DEBUG_SESSIONS_VERBOSE
+  {
+    clib_time_t *ct = &sm->vlib_main->clib_time;
+    f64 ctime;
+    ctime = now * ct->seconds_per_clock;
+    clib_warning ("Now        : %U", format_time_interval, "h:m:s:u", ctime);
+    ctime = sm->timer_wheel_next_expiring_time * ct->seconds_per_clock;
+    clib_warning ("Next expire: %U", format_time_interval, "h:m:s:u", ctime);
+    clib_warning ("Expired items: %d",
+		  (int) vec_len (sm->data_from_advancing_timing_wheel));
+  }
+#endif
+
+  sm->timer_wheel_next_expiring_time = now + sm->timer_wheel_tick;
+  if (PREDICT_FALSE ( 0 == sm->data_from_advancing_timing_wheel )) {
+    return;
+  }
+
+  if (PREDICT_FALSE (_vec_len (sm->data_from_advancing_timing_wheel) > 0))
+    {
+      uword i;
+      for (i = 0; i < _vec_len (sm->data_from_advancing_timing_wheel); i++)
+	{
+	  u32 session_index = sm->data_from_advancing_timing_wheel[i];
+	  if (!pool_is_free_index (sm->sessions, session_index))
+	    {
+	      l2s_session_t *sess = sm->sessions + session_index;
+              u64 last_active;
+              if (session_is_alive (sm, sess, now, &last_active))
+                {
+#ifdef DEBUG_SESSIONS
+	      clib_warning ("Restarting timer for session %d", (int) session_index);
+#endif
+                    /* Pretend we did this in the past, at last_active moment */
+                    timing_wheel_insert (&sm->timing_wheel,
+                                         last_active + session_get_timeout (sm, sess,
+                                                                    last_active),
+                                         session_index);
+                }
+              else
+                {
+#ifdef DEBUG_SESSIONS
+	      clib_warning ("Deleting session %d", (int) session_index);
+#endif
+	      delete_session (sm, sw_if_index, session_index);
+                }
+	    }
+	}
+      _vec_len (sm->data_from_advancing_timing_wheel) = 0;
+    }
+}
+
+static uword
+l2sess_node_fn (vlib_main_t * vm,
+		vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  l2sess_next_t next_index;
+  u32 pkts_swapped = 0;
+  u32 cached_sw_if_index = (u32) ~ 0;
+  u32 cached_next_index = (u32) ~ 0;
+  u32 feature_bitmap0;
+  u32 trace_flags0;
+
+  l2sess_main_t *sm = &l2sess_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      /* Only a single loop for now for simplicity */
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0 = L2SESS_NEXT_DROP;
+	  u32 sw_if_index0;
+	  //ethernet_header_t *en0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  //en0 = vlib_buffer_get_current (b0);
+
+/*
+ * The non-boilerplate is in the block below.
+ * Note first a magic macro block that sets up the behavior qualifiers:
+ *     node_is_out : 1 = is output, 0 = is input
+ *     node_is_ip6 : 1 = is ip6, 0 = is ip4
+ *     node_is_track : 1 = is a state tracking node, 0 - is a session addition node
+ *
+ * Subsequently the code adjusts its behavior depending on these variables.
+ * It's most probably not great performance wise but much easier to work with.
+ *
+ */
+	  {
+	    int node_is_out = -1;
+	    CLIB_UNUSED (int node_is_ip6) = -1;
+	    CLIB_UNUSED (int node_is_track) = -1;
+	    u32 node_index = 0;
+	    u32 session_tables[2] = { ~0, ~0 };
+	    u32 session_nexts[2] = { ~0, ~0 };
+	    l2_output_next_nodes_st *next_nodes = 0;
+	    u32 *input_feat_next_node_index;
+	    u8 l4_proto;
+	    u64 now = clib_cpu_time_now ();
+
+/* 
+ * Set the variables according to which of the 8 nodes we are.
+ * Hopefully the compiler is smart enough to eliminate the extraneous.
+ */
+#define _(node_name, node_var, is_out, is_ip6, is_track)                 \
+if(node_var.index == node->node_index)                                   \
+  {                                                                      \
+    node_is_out = is_out;                                                \
+    node_is_ip6 = is_ip6;                                                \
+    node_is_track = is_track;                                            \
+    node_index = node_var.index;                                         \
+    next_nodes = &sm->node_var ## _next_nodes;                           \
+    input_feat_next_node_index = sm->node_var ## _input_next_node_index; \
+  }
+	    foreach_l2sess_node
+#undef _
+	      trace_flags0 = 0;
+	    if (node_is_out)
+	      {
+		sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	      }
+	    else
+	      {
+		sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	      }
+	    /* potentially also remove the nodes here */
+	    feature_bitmap0 = vnet_buffer (b0)->l2.feature_bitmap;
+
+	    if (node_is_track)
+	      {
+		u32 sess_index = vnet_buffer (b0)->l2_classify.opaque_index;
+		l2s_session_t *sess = sm->sessions + sess_index;
+		l4_proto = sess->l4_proto;
+
+		if (session_is_alive (sm, sess, now, 0))
+		  {
+		    if (6 == l4_proto)
+		      {
+			tcp_session_account_buffer (b0, sess, node_is_out,
+						    now);
+		      }
+		    else
+		      {
+			udp_session_account_buffer (b0, sess, node_is_out,
+						    now);
+		      }
+		  }
+		else
+		  {
+		    timing_wheel_delete (&sm->timing_wheel, sess_index);
+		    delete_session (sm, sw_if_index0, sess_index);
+		    /* FIXME: drop the packet that hit the obsolete node, for now. We really ought to recycle it. */
+		    next0 = 0;
+		  }
+	      }
+	    else
+	      {
+		/*
+		 * "-add" node: take l2opaque which arrived to us, and deduce
+		 * the tables out of that. ~0 means the topmost classifier table
+		 * applied for this AF on the RX(for input)/TX(for output)) sw_if_index.
+		 * Also add the mirrored session to the paired table.
+		 */
+		l2s_session_t *sess;
+		u32 sess_index;
+
+		l4_proto = l2sess_get_l4_proto (b0, node_is_ip6);
+
+		pool_get (sm->sessions, sess);
+		sess_index = sess - sm->sessions;
+		sess->create_time = now;
+		sess->side[node_is_out].active_time = now;
+		sess->side[1 - node_is_out].active_time = now;
+		sess->l4_proto = l4_proto;
+		sess->is_ip6 = node_is_ip6;
+		if (node_is_ip6)
+		  {
+		    session_store_ip6_l3l4_info (b0, sess, node_is_out);
+		  }
+		else
+		  {
+		    session_store_ip4_l3l4_info (b0, sess, node_is_out);
+		  }
+
+		l2sess_get_session_tables (sm, sw_if_index0, node_is_out,
+					   node_is_ip6, l4_proto,
+					   session_tables);
+		l2sess_get_session_nexts (sm, sw_if_index0, node_is_out,
+					  node_is_ip6, l4_proto,
+					  session_nexts);
+		l2sess_flip_l3l4_fields (b0, node_is_ip6, l4_proto);
+		if (session_tables[1] != ~0)
+		  {
+		    l2sess_add_session (b0, node_is_out, node_is_ip6,
+					session_tables[1], session_nexts[1],
+					sess_index);
+		  }
+		l2sess_flip_l3l4_fields (b0, node_is_ip6, l4_proto);
+		if (session_tables[0] != ~0)
+		  {
+		    l2sess_add_session (b0, node_is_out, node_is_ip6,
+					session_tables[0], session_nexts[0],
+					sess_index);
+		  }
+		if (6 == sess->l4_proto)
+		  {
+		    tcp_session_account_buffer (b0, sess, node_is_out, now);
+		  }
+		else
+		  {
+		    udp_session_account_buffer (b0, sess, node_is_out, now);
+		  }
+		timing_wheel_insert (&sm->timing_wheel,
+				     now + session_get_timeout (sm, sess,
+								now),
+				     sess_index);
+	      }
+
+	    if (now >= sm->timer_wheel_next_expiring_time)
+	      {
+		check_idle_sessions (sm, sw_if_index0, now);
+	      }
+
+	    if (node_is_out)
+	      {
+		if (feature_bitmap0)
+		  {
+		    trace_flags0 |= 0x10;
+		  }
+		if (sw_if_index0 == cached_sw_if_index)
+		  {
+		    trace_flags0 |= 0x20;
+		  }
+		l2_output_dispatch (sm->vlib_main,
+				    sm->vnet_main,
+				    node,
+				    node_index,
+				    &cached_sw_if_index,
+				    &cached_next_index,
+				    next_nodes,
+				    b0, sw_if_index0, feature_bitmap0,
+				    &next0);
+		trace_flags0 |= 2;
+
+	      }
+	    else
+	      {
+		next0 =
+		  feat_bitmap_get_next_node_index (input_feat_next_node_index,
+						   feature_bitmap0);
+		trace_flags0 |= 4;
+
+	      }
+
+
+
+	    if (next0 >= node->n_next_nodes)
+	      {
+		trace_flags0 |= 1;
+	      }
+
+	    if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			       && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	      {
+		l2sess_trace_t *t =
+		  vlib_add_trace (vm, node, b0, sizeof (*t));
+		t->sw_if_index = sw_if_index0;
+		t->next_index = next0;
+		t->trace_flags = trace_flags0;
+		t->l4_proto = l4_proto;
+		t->session_tables[0] = session_tables[0];
+		t->session_tables[1] = session_tables[1];
+		t->session_nexts[0] = session_nexts[0];
+		t->session_nexts[1] = session_nexts[1];
+	      }
+
+	  }
+	  pkts_swapped += 1;
+	  if (next0 >= node->n_next_nodes)
+	    {
+	      next0 = 0;
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+  vlib_node_increment_counter (vm, node->node_index,
+			       L2SESS_ERROR_SWAPPED, pkts_swapped);
+  return frame->n_vectors;
+}
+
+
+#define _(node_name, node_var, is_out, is_ip6, is_track) \
+static uword                                             \
+node_var ## node_fn (vlib_main_t * vm,                   \
+                  vlib_node_runtime_t * node,            \
+                  vlib_frame_t * frame)                  \
+{                                                        \
+  return l2sess_node_fn(vm, node, frame);                \
+}                                                        \
+VLIB_REGISTER_NODE (node_var) = {                        \
+  .function = node_var ## node_fn,                       \
+  .name = node_name,                                     \
+  .vector_size = sizeof (u32),                           \
+  .format_trace = format_ ## node_var ## _trace,         \
+  .type = VLIB_NODE_TYPE_INTERNAL,                       \
+                                                         \
+  .n_errors = ARRAY_LEN(l2sess_error_strings),           \
+  .error_strings = l2sess_error_strings,                 \
+                                                         \
+  .n_next_nodes = L2SESS_N_NEXT,                         \
+  .next_nodes = {                                        \
+        [L2SESS_NEXT_DROP] = "error-drop",               \
+  },                                                     \
+};
+foreach_l2sess_node
+#undef _
diff --git a/src/plugins/acl/node_in.c b/src/plugins/acl/node_in.c
new file mode 100644
index 00000000..2a5199a9
--- /dev/null
+++ b/src/plugins/acl/node_in.c
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+#include <acl/acl.h>
+#include "node_in.h"
+
+typedef struct
+{
+  u32 next_index;
+  u32 sw_if_index;
+  u32 match_acl_index;
+  u32 match_rule_index;
+  u32 trace_bitmap;
+} acl_in_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_acl_in_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  acl_in_trace_t *t = va_arg (*args, acl_in_trace_t *);
+
+  s =
+    format (s,
+	    "ACL_IN: sw_if_index %d, next index %d, match: inacl %d rule %d trace_bits %08x",
+	    t->sw_if_index, t->next_index, t->match_acl_index,
+	    t->match_rule_index, t->trace_bitmap);
+  return s;
+}
+
+vlib_node_registration_t acl_in_node;
+
+#define foreach_acl_in_error \
+_(ACL_CHECK, "InACL check packets processed")
+
+typedef enum
+{
+#define _(sym,str) ACL_IN_ERROR_##sym,
+  foreach_acl_in_error
+#undef _
+    ACL_IN_N_ERROR,
+} acl_in_error_t;
+
+static char *acl_in_error_strings[] = {
+#define _(sym,string) string,
+  foreach_acl_in_error
+#undef _
+};
+
+static uword
+acl_in_node_fn (vlib_main_t * vm,
+		vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u32 n_left_from, *from, *to_next;
+  acl_in_next_t next_index;
+  u32 pkts_acl_checked = 0;
+  u32 feature_bitmap0;
+  u32 trace_bitmap = 0;
+  u32 *input_feat_next_node_index =
+    acl_main.acl_in_node_input_next_node_index;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0 = ~0;
+	  u32 sw_if_index0;
+	  u32 next = ~0;
+	  u32 match_acl_index = ~0;
+	  u32 match_rule_index = ~0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+	  feature_bitmap0 = vnet_buffer (b0)->l2.feature_bitmap;
+
+	  input_acl_packet_match (sw_if_index0, b0, &next, &match_acl_index,
+				  &match_rule_index, &trace_bitmap);
+	  if (next != ~0)
+	    {
+	      next0 = next;
+	    }
+	  if (next0 == ~0)
+	    {
+	      next0 =
+		feat_bitmap_get_next_node_index (input_feat_next_node_index,
+						 feature_bitmap0);
+	    }
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      acl_in_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = sw_if_index0;
+	      t->next_index = next0;
+	      t->match_acl_index = match_acl_index;
+	      t->match_rule_index = match_rule_index;
+	      t->trace_bitmap = trace_bitmap;
+	    }
+
+	  next0 = next0 < node->n_next_nodes ? next0 : 0;
+
+	  pkts_acl_checked += 1;
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, acl_in_node.index,
+			       ACL_IN_ERROR_ACL_CHECK, pkts_acl_checked);
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (acl_in_node) =
+{
+  .function = acl_in_node_fn,.name = "acl-plugin-in",.vector_size =
+    sizeof (u32),.format_trace = format_acl_in_trace,.type =
+    VLIB_NODE_TYPE_INTERNAL,.n_errors =
+    ARRAY_LEN (acl_in_error_strings),.error_strings =
+    acl_in_error_strings,.n_next_nodes = ACL_IN_N_NEXT,
+    /* edit / add dispositions here */
+    .next_nodes =
+  {
+  [ACL_IN_ERROR_DROP] = "error-drop",
+      [ACL_IN_ETHERNET_INPUT] = "ethernet-input",
+      [ACL_IN_L2S_INPUT_IP4_ADD] = "aclp-l2s-input-ip4-add",
+      [ACL_IN_L2S_INPUT_IP6_ADD] = "aclp-l2s-input-ip6-add",}
+,};
diff --git a/src/plugins/acl/node_in.h b/src/plugins/acl/node_in.h
new file mode 100644
index 00000000..502bbf8d
--- /dev/null
+++ b/src/plugins/acl/node_in.h
@@ -0,0 +1,12 @@
+#ifndef _NODE_IN_H_
+#define _NODE_IN_H_
+
+typedef enum {
+  ACL_IN_ERROR_DROP,
+  ACL_IN_ETHERNET_INPUT,
+  ACL_IN_L2S_INPUT_IP4_ADD,
+  ACL_IN_L2S_INPUT_IP6_ADD,
+  ACL_IN_N_NEXT,
+} acl_in_next_t;
+
+#endif
diff --git a/src/plugins/acl/node_out.c b/src/plugins/acl/node_out.c
new file mode 100644
index 00000000..50af3679
--- /dev/null
+++ b/src/plugins/acl/node_out.c
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+#include <acl/acl.h>
+
+#include "node_out.h"
+
+typedef struct
+{
+  u32 next_index;
+  u32 sw_if_index;
+  u32 match_acl_index;
+  u32 match_rule_index;
+  u32 trace_bitmap;
+} acl_out_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_acl_out_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  acl_out_trace_t *t = va_arg (*args, acl_out_trace_t *);
+  s =
+    format (s,
+	    "ACL_OUT: sw_if_index %d, next index %d, match: outacl %d rule %d trace_bits %08x",
+	    t->sw_if_index, t->next_index, t->match_acl_index,
+	    t->match_rule_index, t->trace_bitmap);
+  return s;
+}
+
+vlib_node_registration_t acl_out_node;
+
+#define foreach_acl_out_error \
+_(ACL_CHECK, "OutACL check packets processed")
+
+typedef enum
+{
+#define _(sym,str) ACL_OUT_ERROR_##sym,
+  foreach_acl_out_error
+#undef _
+    ACL_OUT_N_ERROR,
+} acl_out_error_t;
+
+static char *acl_out_error_strings[] = {
+#define _(sym,string) string,
+  foreach_acl_out_error
+#undef _
+};
+
+static uword
+acl_out_node_fn (vlib_main_t * vm,
+		 vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  acl_main_t *am = &acl_main;
+  l2_output_next_nodes_st *next_nodes = &am->acl_out_output_next_nodes;
+  u32 n_left_from, *from, *to_next;
+  acl_out_next_t next_index;
+  u32 pkts_acl_checked = 0;
+  u32 feature_bitmap0;
+  u32 cached_sw_if_index = (u32) ~ 0;
+  u32 cached_next_index = (u32) ~ 0;
+  u32 match_acl_index = ~0;
+  u32 match_rule_index = ~0;
+  u32 trace_bitmap = 0;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0 = ~0;
+	  u32 next = 0;
+	  u32 sw_if_index0;
+
+	  /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	  feature_bitmap0 = vnet_buffer (b0)->l2.feature_bitmap;
+
+	  output_acl_packet_match (sw_if_index0, b0, &next, &match_acl_index,
+				   &match_rule_index, &trace_bitmap);
+	  if (next != ~0)
+	    {
+	      next0 = next;
+	    }
+	  if (next0 == ~0)
+	    {
+	      l2_output_dispatch (vm,
+				  am->vnet_main,
+				  node,
+				  acl_out_node.index,
+				  &cached_sw_if_index,
+				  &cached_next_index,
+				  next_nodes,
+				  b0, sw_if_index0, feature_bitmap0, &next0);
+	    }
+
+
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      acl_out_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->sw_if_index = sw_if_index0;
+	      t->next_index = next0;
+	      t->match_acl_index = match_acl_index;
+	      t->match_rule_index = match_rule_index;
+	      t->trace_bitmap = trace_bitmap;
+	    }
+
+	  pkts_acl_checked += 1;
+
+	  /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, acl_out_node.index,
+			       ACL_OUT_ERROR_ACL_CHECK, pkts_acl_checked);
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (acl_out_node) =
+{
+  .function = acl_out_node_fn,.name = "acl-plugin-out",.vector_size =
+    sizeof (u32),.format_trace = format_acl_out_trace,.type =
+    VLIB_NODE_TYPE_INTERNAL,.n_errors =
+    ARRAY_LEN (acl_out_error_strings),.error_strings =
+    acl_out_error_strings,.n_next_nodes = ACL_OUT_N_NEXT,
+    /* edit / add dispositions here */
+    .next_nodes =
+  {
+  [ACL_OUT_ERROR_DROP] = "error-drop",
+      [ACL_OUT_INTERFACE_OUTPUT] = "interface-output",
+      [ACL_OUT_L2S_OUTPUT_IP4_ADD] = "aclp-l2s-output-ip4-add",
+      [ACL_OUT_L2S_OUTPUT_IP6_ADD] = "aclp-l2s-output-ip6-add",}
+,};
diff --git a/src/plugins/acl/node_out.h b/src/plugins/acl/node_out.h
new file mode 100644
index 00000000..c919f3b7
--- /dev/null
+++ b/src/plugins/acl/node_out.h
@@ -0,0 +1,12 @@
+#ifndef _NODE_OUT_H_
+#define _NODE_OUT_H_
+
+typedef enum {
+  ACL_OUT_ERROR_DROP,
+  ACL_OUT_INTERFACE_OUTPUT,
+  ACL_OUT_L2S_OUTPUT_IP4_ADD,
+  ACL_OUT_L2S_OUTPUT_IP6_ADD,
+  ACL_OUT_N_NEXT,
+} acl_out_next_t;
+
+#endif
diff --git a/src/plugins/acl/test/run-python b/src/plugins/acl/test/run-python
new file mode 100755
index 00000000..215eb17a
--- /dev/null
+++ b/src/plugins/acl/test/run-python
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# Do all the legwork to run a scapy shell with APIs available for load
+#
+CURR_DIR=`pwd`
+ROOT_DIR=`git rev-parse --show-toplevel`
+cd $ROOT_DIR
+sudo apt-get install -y python-virtualenv
+# uncomment the line below to enable build of plugins and api each time
+# make plugins && make build-vpp-api || exit
+virtualenv virtualenv
+virtualenv/bin/pip install ipaddress
+virtualenv/bin/pip install scapy
+# install the python API into the virtualenv
+cd $ROOT_DIR/vpp-api/python/
+$ROOT_DIR/virtualenv/bin/python setup.py install
+# install the python ACL plugin API into the virtualenv
+ACL_PLUGIN_SETUP_DIR=`find $ROOT_DIR/build-root -name acl-plugin`
+cd $ACL_PLUGIN_SETUP_DIR; 
+$ROOT_DIR/virtualenv/bin/python setup.py install
+cd $ROOT_DIR
+# figure out the shared library path and start scapy
+export LD_LIBRARY_PATH=`pwd`/`find . -name "libpneum.so" -exec dirname {} \; | grep lib64 | head -n 1`
+cd $CURR_DIR
+sudo LD_LIBRARY_PATH=$LD_LIBRARY_PATH $ROOT_DIR/virtualenv/bin/python $1 $2 $3 $4 $5 $6 $7 $8 $9
+
+
+
diff --git a/src/plugins/acl/test/run-scapy b/src/plugins/acl/test/run-scapy
new file mode 100755
index 00000000..266f07d1
--- /dev/null
+++ b/src/plugins/acl/test/run-scapy
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Do all the legwork to run a scapy shell with APIs available for load
+#
+ROOT_DIR=`git rev-parse --show-toplevel`
+cd $ROOT_DIR
+sudo apt-get install -y python-virtualenv
+# uncomment the line below to enable the build of plugins and API each time..
+# make plugins && make build-vpp-api || exit
+virtualenv virtualenv
+virtualenv/bin/pip install ipaddress
+virtualenv/bin/pip install scapy
+# install the python API into the virtualenv
+cd $ROOT_DIR/vpp-api/python/
+$ROOT_DIR/virtualenv/bin/python setup.py install
+# install the python ACL plugin API into the virtualenv
+ACL_PLUGIN_SETUP_DIR=`find $ROOT_DIR/build-root -name acl-plugin`
+cd $ACL_PLUGIN_SETUP_DIR; 
+$ROOT_DIR/virtualenv/bin/python setup.py install
+cd $ROOT_DIR
+# figure out the shared library path and start scapy
+export LD_LIBRARY_PATH=`pwd`/`find . -name "libpneum.so" -exec dirname {} \; | grep lib64 | head -n 1`
+sudo LD_LIBRARY_PATH=$LD_LIBRARY_PATH virtualenv/bin/scapy
+
+
+
diff --git a/src/plugins/acl/test/test_acl_plugin.py b/src/plugins/acl/test/test_acl_plugin.py
new file mode 100644
index 00000000..7fc72d67
--- /dev/null
+++ b/src/plugins/acl/test/test_acl_plugin.py
@@ -0,0 +1,118 @@
+from __future__ import print_function
+import unittest, sys, time, threading, struct, logging, os
+import vpp_papi
+# import vpp_papi_plugins.acl
+from ipaddress import *
+papi_event = threading.Event()
+print(vpp_papi.vpe.VL_API_SW_INTERFACE_SET_FLAGS)
+def papi_event_handler(result):
+    if result.vl_msg_id == vpp_papi.vpe.VL_API_SW_INTERFACE_SET_FLAGS:
+        return
+    if result.vl_msg_id == vpp_papi.vpe.VL_API_VNET_INTERFACE_COUNTERS:
+        print('Interface counters', result)
+        return
+    if result.vl_msg_id == vpp_papi.vpe.VL_API_VNET_IP6_FIB_COUNTERS:
+        print('IPv6 FIB counters', result)
+        papi_event.set()
+        return
+
+    print('Unknown message id:', result.vl_msg_id)
+
+import glob, subprocess
+class TestAclPlugin(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        print("Setup")
+    @classmethod
+    def tearDownClass(cls):
+        print("Teardown")
+
+    def setUp(self):
+        print("Connecting API")
+        r = vpp_papi.connect("test_papi")
+        self.assertEqual(r, 0)
+
+    def tearDown(self):
+        r = vpp_papi.disconnect()
+        self.assertEqual(r, 0)
+
+    #
+    # The tests themselves
+    #
+
+    #
+    # Basic request / reply
+    #
+    def test_show_version(self):
+        t = vpp_papi.show_version()
+        print('T', t);
+        program = t.program.decode().rstrip('\x00')
+        self.assertEqual('vpe', program)
+
+    def x_test_acl_add(self):
+        print("Test ACL add")
+        self.assertEqual(1, 1)
+    
+    #
+    # Details / Dump
+    #
+    def x_test_details_dump(self):
+        t = vpp_papi.sw_interface_dump(0, b'')
+        print('Dump/details T', t)
+
+    #
+    # Arrays
+    #
+    def x_test_arrays(self):
+        t = vpp_papi.vnet_get_summary_stats()
+        print('Summary stats', t)
+        print('Packets:', t.total_pkts[0])
+        print('Packets:', t.total_pkts[1])
+    #
+    # Variable sized arrays and counters
+    #
+    #@unittest.skip("stats")
+    def x_test_want_stats(self):
+        pid = 123
+        vpp_papi.register_event_callback(papi_event_handler)
+        papi_event.clear()
+
+        # Need to configure IPv6 to get som IPv6 FIB stats
+        t = vpp_papi.create_loopback('')
+        print(t)
+        self.assertEqual(t.retval, 0)
+
+        ifindex = t.sw_if_index
+        addr = str(IPv6Address(u'1::1').packed)
+        t = vpp_papi.sw_interface_add_del_address(ifindex, 1, 1, 0, 16, addr)
+        print(t)
+        self.assertEqual(t.retval, 0)
+
+        # Check if interface is up
+        # XXX: Add new API to query interface state based on ifindex, instead of dump all.
+        t = vpp_papi.sw_interface_set_flags(ifindex, 1, 1, 0)
+        self.assertEqual(t.retval, 0)
+
+        t = vpp_papi.want_stats(True, pid)
+
+        print (t)
+
+        #
+        # Wait for some stats
+        #
+        self.assertEqual(papi_event.wait(15), True)
+        t = vpp_papi.want_stats(False, pid)
+        print (t)
+
+
+    #
+    # Plugins?
+    #
+
+if __name__ == '__main__' or __name__ == '__builtin__':
+    print("This is main")
+    suite = unittest.TestLoader().loadTestsFromTestCase(TestAclPlugin)
+    unittest.TextTestRunner(verbosity=2).run(suite)
+    #logging.basicConfig(level=logging.DEBUG)
+    # unittest.main()
+
diff --git a/src/plugins/ioam.am b/src/plugins/ioam.am
new file mode 100644
index 00000000..a4984b18
--- /dev/null
+++ b/src/plugins/ioam.am
@@ -0,0 +1,150 @@
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+########################################
+# iOAM Proof of Transit
+########################################
+
+ioam_pot_plugin_la_SOURCES =			\
+	ioam/lib-pot/pot_util.c			\
+	ioam/encap/ip6_ioam_pot.c		\
+	ioam/lib-pot/pot_util.h			\
+	ioam/lib-pot/math64.h			\
+	ioam/lib-pot/pot_api.c
+
+noinst_HEADERS +=				\
+  ioam/lib-pot/pot_all_api_h.h			\
+  ioam/lib-pot/pot_msg_enum.h			\
+  ioam/lib-pot/pot.api.h			\
+  ioam/lib-pot/pot_util.h			\
+  ioam/lib-pot/math64.h
+
+API_FILES += ioam/lib-pot/pot.api
+
+ioam_pot_test_plugin_la_SOURCES =		\
+	ioam/lib-pot/pot_test.c			\
+	ioam/lib-pot/pot_plugin.api.h
+
+vppapitestplugins_LTLIBRARIES += ioam_pot_test_plugin.la
+vppplugins_LTLIBRARIES += ioam_pot_plugin.la
+
+########################################
+# iOAM trace export for IPv6
+########################################
+
+ioam_export_plugin_la_SOURCES =   \
+ioam/export/ioam_export.c         \
+ioam/export/node.c                \
+ioam/export/ioam_export.api.h     \
+ioam/export/ioam_export_thread.c
+
+noinst_HEADERS +=                       \
+  ioam/export/ioam_export_all_api_h.h   \
+  ioam/export/ioam_export_msg_enum.h    \
+  ioam/export/ioam_export.api.h
+
+API_FILES += ioam/export/ioam_export.api
+
+ioam_export_test_plugin_la_SOURCES =  \
+  ioam/export/ioam_export_test.c      \
+  ioam/export/ioam_export_plugin.api.h
+
+vppapitestplugins_LTLIBRARIES += ioam_export_test_plugin.la
+vppplugins_LTLIBRARIES += ioam_export_plugin.la
+
+########################################
+# iOAM Trace
+########################################
+libioam_trace_plugin_la_SOURCES =		\
+	ioam/lib-trace/trace_util.c		\
+	ioam/encap/ip6_ioam_trace.c		\
+	ioam/lib-trace/trace_util.h		\
+	ioam/lib-trace/trace_api.c
+
+noinst_HEADERS +=                       \
+  ioam/export/ioam_export_all_api_h.h   \
+  ioam/lib-trace/trace_all_api_h.h	\
+  ioam/lib-trace/trace_msg_enum.h	\
+  ioam/lib-trace/trace.api.h		\
+  ioam/lib-trace/trace_util.h
+
+API_FILES += ioam/lib-trace/trace.api
+
+ioam_trace_test_plugin_la_SOURCES =		\
+	ioam/lib-trace/trace_test.c		\
+	ioam/lib-trace/trace_plugin.api.h
+
+vppapitestplugins_LTLIBRARIES += ioam_trace_test_plugin.la
+vppplugins_LTLIBRARIES += libioam_trace_plugin.la
+
+########################################
+# VxLAN-GPE
+########################################
+libioam_vxlan_gpe_plugin_la_SOURCES =			\
+	ioam/lib-vxlan-gpe/ioam_encap.c			\
+	ioam/lib-vxlan-gpe/ioam_decap.c			\
+	ioam/lib-vxlan-gpe/ioam_transit.c		\
+	ioam/lib-vxlan-gpe/ioam_pop.c			\
+	ioam/lib-vxlan-gpe/vxlan_gpe_api.c		\
+	ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c	\
+	ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c		\
+	ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c	\
+	ioam/export-vxlan-gpe/vxlan_gpe_node.c		\
+	ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.h\
+	ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
+
+noinst_HEADERS +=                       \
+  ioam/export/ioam_export_all_api_h.h   \
+  ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h			\
+  ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h			\
+  ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api.h			\
+  ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h			\
+  ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h                    \
+  ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h		\
+  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h       \
+  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h        \
+  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.h
+
+API_FILES += ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api
+API_FILES += ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
+
+ioam_vxlan_gpe_test_plugin_la_SOURCES =		\
+	ioam/lib-vxlan-gpe/vxlan_gpe_test.c			\
+	ioam/lib-vxlan-gpe/vxlan_gpe_plugin.api.h
+
+vppapitestplugins_LTLIBRARIES += ioam_vxlan_gpe_test_plugin.la
+vppplugins_LTLIBRARIES += libioam_vxlan_gpe_plugin.la
+
+vxlan_gpe_ioam_export_test_plugin_la_SOURCES =          \
+  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c      \
+  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_plugin.api.h
+
+vppapitestplugins_LTLIBRARIES += vxlan_gpe_ioam_export_test_plugin.la
+
+########################################
+# iOAM E2E plugin
+########################################
+
+ioam_e2e_plugin_la_SOURCES =                \
+	ioam/encap/ip6_ioam_e2e.c               \
+	ioam/encap/ip6_ioam_seqno.c             \
+	ioam/encap/ip6_ioam_seqno_analyse.c
+
+noinst_HEADERS +=                    \
+	ioam/encap/ip6_ioam_e2e.h        \
+	ioam/encap/ip6_ioam_seqno.h
+
+vppplugins_LTLIBRARIES += ioam_e2e_plugin.la
+
+# vi:syntax=automake
diff --git a/src/plugins/ioam/dir.dox b/src/plugins/ioam/dir.dox
new file mode 100644
index 00000000..f3389b52
--- /dev/null
+++ b/src/plugins/ioam/dir.dox
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ @dir
+ @brief Inband OAM (iOAM) implementation
+*/
diff --git a/src/plugins/ioam/encap/ip6_ioam_e2e.c b/src/plugins/ioam/encap/ip6_ioam_e2e.c
new file mode 100644
index 00000000..0839cdce
--- /dev/null
+++ b/src/plugins/ioam/encap/ip6_ioam_e2e.c
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+
+#include <vnet/ip/ip.h>
+
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+
+#include <vnet/ip/ip6_hop_by_hop.h>
+#include <vnet/plugin/plugin.h>
+
+#include "ip6_ioam_e2e.h"
+
+ioam_e2e_main_t ioam_e2e_main;
+
+static u8 * ioam_e2e_trace_handler (u8 * s,
+                                    ip6_hop_by_hop_option_t *opt)
+{
+  ioam_e2e_option_t * e2e = (ioam_e2e_option_t *)opt;
+  u32 seqno = 0;
+
+  if (e2e)
+    {
+      seqno = clib_net_to_host_u32 (e2e->e2e_data);
+    }
+
+  s = format (s, "SeqNo = 0x%Lx", seqno);
+  return s;
+}
+
+int 
+ioam_e2e_config_handler (void *data, u8 disable)
+{
+  int *analyse = data;
+
+  /* Register hanlders if enabled */
+  if (!disable)
+    {
+      /* If encap node register for encap handler */
+      if (0 == *analyse)
+        {
+          if (ip6_hbh_register_option(HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE,
+                                      ioam_seqno_encap_handler,
+                                      ioam_e2e_trace_handler) < 0)
+            {
+              return (-1);
+            }
+        }
+      /* If analyze node then register for decap handler */
+      else
+        {
+          if (ip6_hbh_pop_register_option(HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE,
+                                          ioam_seqno_decap_handler) < 0)
+            {
+              return (-1);
+            }
+        }
+      return 0;
+    }
+
+  /* UnRegister handlers */
+  (void) ip6_hbh_unregister_option(HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE);
+  (void) ip6_hbh_pop_unregister_option(HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE);
+  return 0;
+}
+
+int
+ioam_e2e_rewrite_handler (u8 *rewrite_string,
+                          u8 *rewrite_size)
+{
+  ioam_e2e_option_t *e2e_option;
+
+  if (rewrite_string && *rewrite_size == sizeof(ioam_e2e_option_t))
+    {
+      e2e_option = (ioam_e2e_option_t *)rewrite_string;
+      e2e_option->hdr.type = HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE
+          | HBH_OPTION_TYPE_SKIP_UNKNOWN;
+      e2e_option->hdr.length = sizeof (ioam_e2e_option_t) -
+          sizeof (ip6_hop_by_hop_option_t);
+      return(0);
+    }
+  return(-1);
+}
+
+u32
+ioam_e2e_flow_handler (u32 ctx, u8 add)
+{
+  ioam_e2e_data_t *data;
+  u16 i;
+
+  if (add)
+    {
+      pool_get(ioam_e2e_main.e2e_data, data);
+      data->flow_ctx =  ctx;
+      ioam_seqno_init_bitmap(&data->seqno_data);
+      return ((u32) (data - ioam_e2e_main.e2e_data));
+    }
+
+  /* Delete case */
+  for (i = 0; i < vec_len(ioam_e2e_main.e2e_data); i++)
+    {
+      if (pool_is_free_index(ioam_e2e_main.e2e_data, i))
+        continue;
+
+      data = pool_elt_at_index(ioam_e2e_main.e2e_data, i);
+      if (data && (data->flow_ctx == ctx))
+        {
+          pool_put_index(ioam_e2e_main.e2e_data, i);
+          return (0);
+        }
+    }
+  return 0;
+}
+
+static clib_error_t *
+ioam_show_e2e_cmd_fn (vlib_main_t * vm,
+                      unformat_input_t * input,
+                      vlib_cli_command_t * cmd)
+{
+  ioam_e2e_data_t *e2e_data;
+  u8 *s = 0;
+  int i;
+
+  vec_reset_length(s);
+
+  s = format(0, "IOAM E2E information: \n");
+  for (i = 0; i < vec_len(ioam_e2e_main.e2e_data); i++)
+    {
+      if (pool_is_free_index(ioam_e2e_main.e2e_data, i))
+        continue;
+
+      e2e_data = pool_elt_at_index(ioam_e2e_main.e2e_data, i);
+      s = format(s, "Flow name: %s\n", get_flow_name_from_flow_ctx(e2e_data->flow_ctx));
+
+      s = show_ioam_seqno_cmd_fn(s,
+                                 &e2e_data->seqno_data,
+                                 !IOAM_DEAP_ENABLED(e2e_data->flow_ctx));
+    }
+
+  vlib_cli_output(vm, "%v", s);
+  return 0;
+}
+
+
+VLIB_CLI_COMMAND (ioam_show_e2e_cmd, static) = {
+    .path = "show ioam e2e ",
+    .short_help = "show ioam e2e information",
+    .function = ioam_show_e2e_cmd_fn,
+};
+
+/*
+ * This routine exists to convince the vlib plugin framework that
+ * we haven't accidentally copied a random .dll into the plugin directory.
+ *
+ * Also collects global variable pointers passed from the vpp engine
+ */
+clib_error_t *
+vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
+                      int from_early_init)
+{
+  clib_error_t * error = 0;
+
+  ioam_e2e_main.vlib_main = vm;
+  ioam_e2e_main.vnet_main = h->vnet_main;
+  return error;
+}
+
+/*
+ * Init handler E2E headet handling.
+ * Init hanlder registers encap, decap, trace and Rewrite handlers.
+ */
+static clib_error_t *
+ioam_e2e_init (vlib_main_t * vm)
+{
+  clib_error_t * error;
+
+  if ((error = vlib_call_init_function (vm, ip6_hop_by_hop_ioam_init)))
+    {
+      return(error);
+    }
+
+  /*
+   * As of now we have only PPC under E2E header.
+   */
+  if (ip6_hbh_config_handler_register(HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE,
+                                      ioam_e2e_config_handler) < 0)
+    {
+      return (clib_error_create("Registration of "
+          "HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE for rewrite failed"));
+    }
+
+  if (ip6_hbh_add_register_option(HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE,
+                                  sizeof(ioam_e2e_option_t),
+                                  ioam_e2e_rewrite_handler) < 0)
+    {
+      return (clib_error_create("Registration of "
+          "HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE for rewrite failed"));
+    }
+
+  if (ip6_hbh_flow_handler_register(HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE,
+                                    ioam_e2e_flow_handler) < 0)
+    {
+      return (clib_error_create("Registration of "
+          "HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE Flow handler failed"));
+    }
+
+  return (0);
+}
+
+/*
+ * Init function for the E2E lib.
+ * ip6_hop_by_hop_ioam_e2e_init gets called during init.
+ */
+VLIB_INIT_FUNCTION (ioam_e2e_init);
diff --git a/src/plugins/ioam/encap/ip6_ioam_e2e.h b/src/plugins/ioam/encap/ip6_ioam_e2e.h
new file mode 100644
index 00000000..18f35f80
--- /dev/null
+++ b/src/plugins/ioam/encap/ip6_ioam_e2e.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __included_ip6_ioam_e2e_h__
+#define __included_ip6_ioam_e2e_h__
+
+#include "ip6_ioam_seqno.h"
+
+typedef struct ioam_e2e_data_t_ {
+  u32 flow_ctx;
+  u32 pad;
+  ioam_seqno_data seqno_data;
+} ioam_e2e_data_t;
+
+typedef struct {
+  ioam_e2e_data_t *e2e_data;
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} ioam_e2e_main_t;
+
+extern ioam_e2e_main_t ioam_e2e_main;
+
+static inline ioam_seqno_data *
+ioam_e2ec_get_seqno_data_from_flow_ctx (u32 flow_ctx)
+{
+  ioam_e2e_data_t *data = NULL;
+  u32 index;
+
+  index =  get_flow_data_from_flow_ctx(flow_ctx,
+                                       HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE);
+  data = &ioam_e2e_main.e2e_data[index];
+  return &(data->seqno_data);
+}
+
+#endif /* __included_ioam_e2e_h__ */
diff --git a/src/plugins/ioam/encap/ip6_ioam_pot.c b/src/plugins/ioam/encap/ip6_ioam_pot.c
new file mode 100644
index 00000000..05f42c91
--- /dev/null
+++ b/src/plugins/ioam/encap/ip6_ioam_pot.c
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+
+#include <vnet/ip/ip6.h>
+#include <vnet/ip/ip6_hop_by_hop.h>
+#include <vnet/ip/ip6_hop_by_hop_packet.h>
+
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+
+#include <ioam/lib-pot/pot_util.h>
+
+typedef CLIB_PACKED(struct {
+  ip6_hop_by_hop_option_t hdr;
+  u8 pot_type;
+#define PROFILE_ID_MASK 0xF
+  u8 reserved_profile_id; /* 4 bits reserved, 4 bits to carry profile id */
+  u64 random;
+  u64 cumulative;
+}) ioam_pot_option_t;
+
+#define foreach_ip6_hop_by_hop_ioam_pot_stats				\
+  _(PROCESSED, "Pkts with ip6 hop-by-hop pot options")			\
+  _(PROFILE_MISS, "Pkts with ip6 hop-by-hop pot options but no profile set") \
+  _(PASSED, "Pkts with POT in Policy")					\
+  _(FAILED, "Pkts with POT out of Policy") 
+
+static char * ip6_hop_by_hop_ioam_pot_stats_strings[] = {
+#define _(sym,string) string,
+  foreach_ip6_hop_by_hop_ioam_pot_stats
+#undef _
+};
+
+typedef enum {
+#define _(sym,str) IP6_IOAM_POT_##sym,
+  foreach_ip6_hop_by_hop_ioam_pot_stats
+#undef _
+  IP6_IOAM_POT_N_STATS,
+} ip6_ioam_pot_stats_t;
+
+typedef struct {
+  /* stats */
+  u64 counters[ARRAY_LEN(ip6_hop_by_hop_ioam_pot_stats_strings)];
+  
+  /* convenience */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+} ip6_hop_by_hop_ioam_pot_main_t;
+
+ip6_hop_by_hop_ioam_pot_main_t ip6_hop_by_hop_ioam_pot_main;
+
+always_inline void 
+ip6_ioam_stats_increment_counter (u32 counter_index, u64 increment)
+{
+  ip6_hop_by_hop_ioam_pot_main_t *hm = &ip6_hop_by_hop_ioam_pot_main;
+
+  hm->counters[counter_index] += increment;
+}
+
+
+static u8 * format_ioam_pot (u8 * s, va_list * args)
+{
+  ioam_pot_option_t * pot0 = va_arg (*args, ioam_pot_option_t *);
+  u64 random, cumulative;
+  random = cumulative = 0;
+  if (pot0) 
+    { 
+      random = clib_net_to_host_u64 (pot0->random);
+      cumulative = clib_net_to_host_u64 (pot0->cumulative);
+    }
+
+  s = format (s, "random = 0x%Lx, Cumulative = 0x%Lx, Index = 0x%x", 
+	      random, cumulative, pot0 ? pot0->reserved_profile_id : ~0);
+  return s;
+}
+
+u8 *
+ip6_hbh_ioam_proof_of_transit_trace_handler (u8 *s, ip6_hop_by_hop_option_t *opt)
+{
+  ioam_pot_option_t *pot;
+
+  s = format (s, "    POT opt present\n");
+  pot = (ioam_pot_option_t *) opt;
+  s = format (s, "         %U\n", format_ioam_pot, pot);
+  return (s);
+}
+
+int
+ip6_hbh_ioam_proof_of_transit_handler (vlib_buffer_t *b,
+				       ip6_header_t *ip,
+				       ip6_hop_by_hop_option_t *opt0)
+{
+  ioam_pot_option_t * pot0;
+  u64 random = 0, cumulative = 0;
+  int rv = 0;
+  u8 pot_profile_index;
+  pot_profile *pot_profile = 0, *new_profile = 0;
+  u8 pot_encap = 0;
+
+  pot0 = (ioam_pot_option_t *) opt0;
+  pot_encap = (pot0->random == 0);
+  pot_profile_index = pot_profile_get_active_id();
+  pot_profile = pot_profile_get_active();
+  if (pot_encap && PREDICT_FALSE(!pot_profile))
+    {
+      ip6_ioam_stats_increment_counter (IP6_IOAM_POT_PROFILE_MISS, 1);
+      return(-1);
+    }
+  if (pot_encap)
+    {
+      pot0->reserved_profile_id =
+	pot_profile_index & PROFILE_ID_MASK;
+      pot_profile_incr_usage_stats(pot_profile);
+    } 
+  else 
+    { /* Non encap node */
+      if (PREDICT_FALSE(pot0->reserved_profile_id != 
+			pot_profile_index || pot_profile == 0)) 
+	{
+	  /* New profile announced by encap node. */
+	  new_profile =
+	    pot_profile_find(pot0->reserved_profile_id); 
+	  if (PREDICT_FALSE(new_profile == 0 ||
+			    new_profile->valid == 0)) 
+	    {
+	      ip6_ioam_stats_increment_counter (IP6_IOAM_POT_PROFILE_MISS, 1);
+	      return(-1);
+ 	    } 
+	  else 
+	    {
+	      pot_profile_index = pot0->reserved_profile_id;
+	      pot_profile = new_profile;
+	      pot_profile_set_active(pot_profile_index);
+	      pot_profile_reset_usage_stats(pot_profile);
+	    }
+	}
+      pot_profile_incr_usage_stats(pot_profile);
+    }
+
+  if (pot0->random == 0) 
+    {
+      pot0->random = clib_host_to_net_u64(pot_generate_random(pot_profile));
+      pot0->cumulative = 0;
+    }
+  random = clib_net_to_host_u64(pot0->random);
+  cumulative = clib_net_to_host_u64(pot0->cumulative);
+  pot0->cumulative = clib_host_to_net_u64(
+					  pot_update_cumulative(pot_profile,
+								cumulative,
+								random));
+  ip6_ioam_stats_increment_counter (IP6_IOAM_POT_PROCESSED, 1);
+
+  return (rv);
+}
+
+int
+ip6_hbh_ioam_proof_of_transit_pop_handler (vlib_buffer_t *b, ip6_header_t *ip,
+					   ip6_hop_by_hop_option_t *opt0)
+{
+  ioam_pot_option_t * pot0;
+  u64 random = 0;
+  u64 cumulative = 0;
+  int rv = 0;
+  pot_profile *pot_profile = 0;
+  u8 result = 0;
+  
+  pot0 = (ioam_pot_option_t *) opt0;
+  random = clib_net_to_host_u64(pot0->random);
+  cumulative = clib_net_to_host_u64(pot0->cumulative);
+  pot_profile = pot_profile_get_active();
+  result =  pot_validate (pot_profile,
+			  cumulative, random);
+	  
+  if (result == 1) 
+    {
+      ip6_ioam_stats_increment_counter (IP6_IOAM_POT_PASSED, 1);
+    }
+  else 
+    {
+      ip6_ioam_stats_increment_counter (IP6_IOAM_POT_FAILED, 1);
+    }
+  return (rv);
+}
+
+int ip6_hop_by_hop_ioam_pot_rewrite_handler (u8 *rewrite_string, u8 *rewrite_size)
+{
+  ioam_pot_option_t * pot_option;
+  if (rewrite_string && *rewrite_size == sizeof(ioam_pot_option_t))
+    {
+      pot_option = (ioam_pot_option_t *)rewrite_string;
+      pot_option->hdr.type = HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT
+        | HBH_OPTION_TYPE_DATA_CHANGE_ENROUTE;
+      pot_option->hdr.length = sizeof (ioam_pot_option_t) - 
+        sizeof (ip6_hop_by_hop_option_t);
+      return(0);
+    }
+  return(-1);
+}
+
+static clib_error_t *
+ip6_show_ioam_pot_cmd_fn (vlib_main_t * vm,
+			  unformat_input_t * input,
+			  vlib_cli_command_t * cmd)
+{
+  ip6_hop_by_hop_ioam_pot_main_t *hm = &ip6_hop_by_hop_ioam_pot_main;
+  u8 *s = 0;
+  int i = 0;
+
+  for ( i = 0; i < IP6_IOAM_POT_N_STATS; i++)
+    {
+      s = format(s, " %s - %lu\n", ip6_hop_by_hop_ioam_pot_stats_strings[i],
+	       hm->counters[i]);
+    }
+
+  vlib_cli_output(vm, "%v", s);
+  vec_free(s);
+  return 0;
+}
+
+
+VLIB_CLI_COMMAND (ip6_show_ioam_pot_cmd, static) = {
+  .path = "show ioam pot",
+  .short_help = "iOAM pot statistics",
+  .function = ip6_show_ioam_pot_cmd_fn,
+};
+
+
+static clib_error_t *
+ip6_hop_by_hop_ioam_pot_init (vlib_main_t * vm)
+{
+  ip6_hop_by_hop_ioam_pot_main_t * hm = &ip6_hop_by_hop_ioam_pot_main;
+  clib_error_t * error;
+
+  if ((error = vlib_call_init_function (vm, ip6_hop_by_hop_ioam_init)))
+    return(error);
+
+  hm->vlib_main = vm;
+  hm->vnet_main = vnet_get_main();
+  memset(hm->counters, 0, sizeof(hm->counters));
+  
+  if (ip6_hbh_register_option(HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT, ip6_hbh_ioam_proof_of_transit_handler,
+			      ip6_hbh_ioam_proof_of_transit_trace_handler) < 0)
+    return (clib_error_create("registration of HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT failed"));
+
+  if (ip6_hbh_add_register_option(HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT,
+				  sizeof(ioam_pot_option_t),
+				  ip6_hop_by_hop_ioam_pot_rewrite_handler) < 0)
+    return (clib_error_create("registration of HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT for rewrite failed"));
+
+  if (ip6_hbh_pop_register_option(HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT,
+				  ip6_hbh_ioam_proof_of_transit_pop_handler) < 0)
+    return (clib_error_create("registration of HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT POP failed"));
+
+  return (0);
+}
+
+VLIB_INIT_FUNCTION (ip6_hop_by_hop_ioam_pot_init);
+
+
diff --git a/src/plugins/ioam/encap/ip6_ioam_seqno.c b/src/plugins/ioam/encap/ip6_ioam_seqno.c
new file mode 100644
index 00000000..0b4d4192
--- /dev/null
+++ b/src/plugins/ioam/encap/ip6_ioam_seqno.c
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+
+#include <vnet/ip/ip.h>
+
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+
+#include "ip6_ioam_seqno.h"
+#include "ip6_ioam_e2e.h"
+
+ioam_seqno_data_main_t ioam_seqno_main;
+
+void ioam_seqno_init_bitmap (ioam_seqno_data *data)
+{
+  seqno_bitmap *bitmap = &data->seqno_rx.bitmap;
+  bitmap->window_size = SEQNO_WINDOW_SIZE;
+  bitmap->array_size = SEQNO_WINDOW_ARRAY_SIZE;
+  bitmap->mask = 32 * SEQNO_WINDOW_ARRAY_SIZE - 1;
+  bitmap->array[0] = 0x00000000;/* pretend we haven seen sequence numbers 0*/
+  bitmap->highest = 0;
+
+  data->seq_num = 0;
+  return ;
+}
+
+/*
+ * This Routine gets called from IPv6 hop-by-hop option handling.
+ * Only if we are encap node, then add PPC data.
+ * On a Transit(MID) node we dont do anything with E2E headers.
+ * On decap node decap is handled by seperate function.
+ */
+int
+ioam_seqno_encap_handler (vlib_buffer_t *b, ip6_header_t *ip,
+                          ip6_hop_by_hop_option_t *opt)
+{
+  u32 opaque_index = vnet_buffer(b)->l2_classify.opaque_index;
+  ioam_e2e_option_t * e2e;
+  int rv = 0;
+  ioam_seqno_data *data;
+
+  data = ioam_e2ec_get_seqno_data_from_flow_ctx(opaque_index);
+  e2e = (ioam_e2e_option_t *) opt;
+  e2e->e2e_data = clib_host_to_net_u32(++data->seq_num);
+
+  return (rv);
+}
+
+/*
+ * This Routine gets called on POP/Decap node.
+ */
+int
+ioam_seqno_decap_handler (vlib_buffer_t *b, ip6_header_t *ip,
+                          ip6_hop_by_hop_option_t *opt)
+{
+  u32 opaque_index = vnet_buffer(b)->l2_classify.opaque_index;
+  ioam_e2e_option_t * e2e;
+  int rv = 0;
+  ioam_seqno_data *data;
+
+  data = ioam_e2ec_get_seqno_data_from_flow_ctx(opaque_index);
+  e2e = (ioam_e2e_option_t *) opt;
+  ioam_analyze_seqno(&data->seqno_rx, (u64) clib_net_to_host_u32(e2e->e2e_data));
+
+  return (rv);
+}
+
+u8 *
+show_ioam_seqno_cmd_fn (u8 *s, ioam_seqno_data *seqno_data, u8 enc)
+{
+  seqno_rx_info *rx;
+
+  s = format(s, "SeqNo Data:\n");
+  if (enc)
+    {
+      s = format(s, "  Current Seq. Number : %llu\n", seqno_data->seq_num);
+    }
+  else
+    {
+      rx = &seqno_data->seqno_rx;
+      s = format(s, "  Highest Seq. Number : %llu\n", rx->bitmap.highest);
+      s = format(s, "     Packets received : %llu\n", rx->rx_packets);
+      s = format(s, "         Lost packets : %llu\n", rx->lost_packets);
+      s = format(s, "    Reordered packets : %llu\n", rx->reordered_packets);
+      s = format(s, "    Duplicate packets : %llu\n", rx->dup_packets);
+    }
+
+  format(s, "\n");
+  return s;
+}
diff --git a/src/plugins/ioam/encap/ip6_ioam_seqno.h b/src/plugins/ioam/encap/ip6_ioam_seqno.h
new file mode 100644
index 00000000..13a84db0
--- /dev/null
+++ b/src/plugins/ioam/encap/ip6_ioam_seqno.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __included_ip6_ioam_seqno_h__
+#define __included_ip6_ioam_seqno_h__
+
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/ip/ip6_hop_by_hop.h>
+
+#define SEQ_CHECK_VALUE 0x80000000 /* for seq number wraparound detection */
+
+#define SEQNO_WINDOW_SIZE 2048
+#define SEQNO_WINDOW_ARRAY_SIZE 64
+
+typedef struct seqno_bitmap_ {
+  u32 window_size;
+  u32 array_size;
+  u32 mask;
+  u32 pad;
+  u64 highest;
+  u64 array[SEQNO_WINDOW_ARRAY_SIZE];    /* Will be alloc to array_size */
+} seqno_bitmap;
+
+typedef struct seqno_rx_info_ {
+  u64 rx_packets;
+  u64 lost_packets;
+  u64 reordered_packets;
+  u64 dup_packets;
+  seqno_bitmap bitmap;
+} seqno_rx_info;
+
+/* This structure is 64-byte aligned */
+typedef struct ioam_seqno_data_ {
+  union {
+    u32 seq_num; /* Useful only for encap node */
+    seqno_rx_info seqno_rx;
+  };
+} ioam_seqno_data;
+
+typedef struct ioam_seqno_data_main_t_ {
+  ioam_seqno_data *seqno_data;
+} ioam_seqno_data_main_t;
+
+void ioam_seqno_init_bitmap(ioam_seqno_data *data);
+
+int ioam_seqno_encap_handler(vlib_buffer_t *b, ip6_header_t *ip,
+                             ip6_hop_by_hop_option_t *opt);
+
+int
+ioam_seqno_decap_handler(vlib_buffer_t *b, ip6_header_t *ip,
+                         ip6_hop_by_hop_option_t *opt);
+
+void ioam_analyze_seqno(seqno_rx_info *ppc_rx, u64 seqno);
+
+u8 *
+show_ioam_seqno_cmd_fn(u8 *s, ioam_seqno_data *seqno_data, u8 enc);
+
+#endif
diff --git a/src/plugins/ioam/encap/ip6_ioam_seqno_analyse.c b/src/plugins/ioam/encap/ip6_ioam_seqno_analyse.c
new file mode 100644
index 00000000..4638871c
--- /dev/null
+++ b/src/plugins/ioam/encap/ip6_ioam_seqno_analyse.c
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include "ip6_ioam_seqno.h"
+
+static inline void BIT_SET (u64 *p, u32 n)
+{
+  p[ n>>5 ] |= (1 << (n&31));
+}
+
+static inline int BIT_TEST (u64 *p, u32 n)
+{
+  return p[ n>>5 ] & (1 << (n&31));
+}
+
+static void BIT_CLEAR (u64 *p, u64 start, int  num_bits, u32 mask)
+{
+  int n, t;
+  int start_index = (start >> 5);
+  int mask_index = (mask >> 5);
+
+  start_index &= mask_index;
+  if (start & 0x1f)
+    {
+      int start_bit = (start & 0x1f);
+
+      n = (1 << start_bit)-1;
+      t = start_bit + num_bits;
+      if (t < 32)
+        {
+          n |= ~((1 << t)-1);
+          p[ start_index ] &= n;
+          return;
+        }
+      p[ start_index ] &= n;
+      start_index = (start_index + 1) & mask_index;
+      num_bits -= (32 - start_bit);
+    }
+  while (num_bits >= 32)
+    {
+      p[ start_index ] = 0;
+      start_index = (start_index + 1) & mask_index;
+      num_bits -= 32;
+    }
+  n = ~((1 << num_bits) - 1);
+  p[ start_index ] &= n;
+}
+
+static inline u8 seqno_check_wraparound(u32 a, u32 b)
+{
+  if ((a != b) && (a > b) && ((a - b) > SEQ_CHECK_VALUE))
+    {
+      return 1;
+    }
+  return 0;
+}
+
+/*
+ * Function to analyze the PPC value recevied.
+ *     - Updates the bitmap with received sequence number
+ *     - counts the received/lost/duplicate/reordered packets
+ */
+void ioam_analyze_seqno (seqno_rx_info *seqno_rx, u64 seqno)
+{
+  int diff;
+  static int peer_dead_count;
+  seqno_bitmap *bitmap = &seqno_rx->bitmap;
+
+  seqno_rx->rx_packets++;
+
+  if (seqno > bitmap->highest)
+    {   /* new larger sequence number */
+      peer_dead_count = 0;
+      diff = seqno - bitmap->highest;
+      if (diff < bitmap->window_size)
+        {
+          if (diff > 1)
+            { /* diff==1 is *such* a common case it's a win to optimize it */
+              BIT_CLEAR(bitmap->array, bitmap->highest+1, diff-1, bitmap->mask);
+              seqno_rx->lost_packets += diff -1;
+            }
+        }
+      else
+        {
+          seqno_rx->lost_packets += diff -1;
+          memset( bitmap->array, 0, bitmap->array_size * sizeof(u64) );
+        }
+      BIT_SET(bitmap->array, seqno & bitmap->mask);
+      bitmap->highest = seqno;
+      return;
+    }
+
+  /* we've seen a bigger seq number before */
+  diff = bitmap->highest - seqno;
+  if (diff >= bitmap->window_size)
+    {
+      if (seqno_check_wraparound(bitmap->highest, seqno))
+        {
+          memset( bitmap->array, 0, bitmap->array_size * sizeof(u64));
+          BIT_SET(bitmap->array, seqno & bitmap->mask);
+          bitmap->highest = seqno;
+          return;
+        }
+      else
+        {
+          peer_dead_count++;
+          if (peer_dead_count > 25)
+            {
+              peer_dead_count = 0;
+              memset( bitmap->array, 0, bitmap->array_size * sizeof(u64) );
+              BIT_SET(bitmap->array, seqno & bitmap->mask);
+              bitmap->highest = seqno;
+            }
+          //ppc_rx->reordered_packets++;
+        }
+      return;
+    }
+
+  if (BIT_TEST(bitmap->array, seqno & bitmap->mask))
+    {
+      seqno_rx->dup_packets++;
+      return;    /* Already seen */
+    }
+  seqno_rx->reordered_packets++;
+  seqno_rx->lost_packets--;
+  BIT_SET(bitmap->array, seqno & bitmap->mask);
+  return;
+}
diff --git a/src/plugins/ioam/encap/ip6_ioam_trace.c b/src/plugins/ioam/encap/ip6_ioam_trace.c
new file mode 100644
index 00000000..e63db6e4
--- /dev/null
+++ b/src/plugins/ioam/encap/ip6_ioam_trace.c
@@ -0,0 +1,438 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+
+#include <vnet/ip/ip6.h>
+#include <vnet/ip/ip6_hop_by_hop.h>
+#include <vnet/ip/ip6_hop_by_hop_packet.h>
+
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+
+#include <ioam/lib-trace/trace_util.h>
+
+/* Timestamp precision multipliers for seconds, milliseconds, microseconds
+ * and nanoseconds respectively.
+ */
+static f64 trace_tsp_mul[4] = { 1, 1e3, 1e6, 1e9 };
+
+typedef union
+{
+  u64 as_u64;
+  u32 as_u32[2];
+} time_u64_t;
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED(struct {
+  ip6_hop_by_hop_option_t hdr;
+  u8 ioam_trace_type;
+  u8 data_list_elts_left;
+  u32 elts[0]; /* Variable type. So keep it generic */
+}) ioam_trace_option_t;
+/* *INDENT-ON* */
+
+
+extern ip6_hop_by_hop_ioam_main_t ip6_hop_by_hop_ioam_main;
+extern ip6_main_t ip6_main;
+
+#define foreach_ip6_hop_by_hop_ioam_trace_stats                                \
+  _(PROCESSED, "Pkts with ip6 hop-by-hop trace options")                        \
+  _(PROFILE_MISS, "Pkts with ip6 hop-by-hop trace options but no profile set") \
+  _(UPDATED, "Pkts with trace updated")                                        \
+  _(FULL, "Pkts with trace options but no space")
+
+static char *ip6_hop_by_hop_ioam_trace_stats_strings[] = {
+#define _(sym,string) string,
+  foreach_ip6_hop_by_hop_ioam_trace_stats
+#undef _
+};
+
+typedef enum
+{
+#define _(sym,str) IP6_IOAM_TRACE_##sym,
+  foreach_ip6_hop_by_hop_ioam_trace_stats
+#undef _
+    IP6_IOAM_TRACE_N_STATS,
+} ip6_ioam_trace_stats_t;
+
+
+typedef struct
+{
+  /* stats */
+  u64 counters[ARRAY_LEN (ip6_hop_by_hop_ioam_trace_stats_strings)];
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} ip6_hop_by_hop_ioam_trace_main_t;
+
+ip6_hop_by_hop_ioam_trace_main_t ip6_hop_by_hop_ioam_trace_main;
+
+always_inline void
+ip6_ioam_trace_stats_increment_counter (u32 counter_index, u64 increment)
+{
+  ip6_hop_by_hop_ioam_trace_main_t *hm = &ip6_hop_by_hop_ioam_trace_main;
+
+  hm->counters[counter_index] += increment;
+}
+
+
+static u8 *
+format_ioam_data_list_element (u8 * s, va_list * args)
+{
+  u32 *elt = va_arg (*args, u32 *);
+  u8 *trace_type_p = va_arg (*args, u8 *);
+  u8 trace_type = *trace_type_p;
+
+
+  if (trace_type & BIT_TTL_NODEID)
+    {
+      u32 ttl_node_id_host_byte_order = clib_net_to_host_u32 (*elt);
+      s = format (s, "ttl 0x%x node id 0x%x ",
+		  ttl_node_id_host_byte_order >> 24,
+		  ttl_node_id_host_byte_order & 0x00FFFFFF);
+
+      elt++;
+    }
+
+  if (trace_type & BIT_ING_INTERFACE && trace_type & BIT_ING_INTERFACE)
+    {
+      u32 ingress_host_byte_order = clib_net_to_host_u32 (*elt);
+      s = format (s, "ingress 0x%x egress 0x%x ",
+		  ingress_host_byte_order >> 16,
+		  ingress_host_byte_order & 0xFFFF);
+      elt++;
+    }
+
+  if (trace_type & BIT_TIMESTAMP)
+    {
+      u32 ts_in_host_byte_order = clib_net_to_host_u32 (*elt);
+      s = format (s, "ts 0x%x \n", ts_in_host_byte_order);
+      elt++;
+    }
+
+  if (trace_type & BIT_APPDATA)
+    {
+      u32 appdata_in_host_byte_order = clib_net_to_host_u32 (*elt);
+      s = format (s, "app 0x%x ", appdata_in_host_byte_order);
+      elt++;
+    }
+
+  return s;
+}
+
+
+int
+ip6_ioam_trace_get_sizeof_handler (u32 * result)
+{
+  u16 size = 0;
+  u8 trace_data_size = 0;
+  trace_profile *profile = NULL;
+
+  *result = 0;
+
+  profile = trace_profile_find ();
+
+  if (PREDICT_FALSE (!profile))
+    {
+      ip6_ioam_trace_stats_increment_counter (IP6_IOAM_TRACE_PROFILE_MISS, 1);
+      return (-1);
+    }
+
+  trace_data_size = fetch_trace_data_size (profile->trace_type);
+  if (PREDICT_FALSE (trace_data_size == 0))
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  if (PREDICT_FALSE (profile->num_elts * trace_data_size > 254))
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  size +=
+    sizeof (ioam_trace_option_t) + (profile->num_elts * trace_data_size);
+  *result = size;
+
+  return 0;
+}
+
+
+
+int
+ip6_hop_by_hop_ioam_trace_rewrite_handler (u8 * rewrite_string,
+					   u8 * rewrite_size)
+{
+  ioam_trace_option_t *trace_option = NULL;
+  u8 trace_data_size = 0;
+  u8 trace_option_elts = 0;
+  trace_profile *profile = NULL;
+
+
+  profile = trace_profile_find ();
+
+  if (PREDICT_FALSE (!profile))
+    {
+      ip6_ioam_trace_stats_increment_counter (IP6_IOAM_TRACE_PROFILE_MISS, 1);
+      return (-1);
+    }
+
+  if (PREDICT_FALSE (!rewrite_string))
+    return -1;
+
+  trace_option_elts = profile->num_elts;
+  trace_data_size = fetch_trace_data_size (profile->trace_type);
+  trace_option = (ioam_trace_option_t *) rewrite_string;
+  trace_option->hdr.type = HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST |
+    HBH_OPTION_TYPE_DATA_CHANGE_ENROUTE;
+  trace_option->hdr.length = 2 /*ioam_trace_type,data_list_elts_left */  +
+    trace_option_elts * trace_data_size;
+  trace_option->ioam_trace_type = profile->trace_type & TRACE_TYPE_MASK;
+  trace_option->data_list_elts_left = trace_option_elts;
+  *rewrite_size =
+    sizeof (ioam_trace_option_t) + (trace_option_elts * trace_data_size);
+
+  return 0;
+}
+
+
+int
+ip6_hbh_ioam_trace_data_list_handler (vlib_buffer_t * b, ip6_header_t * ip,
+				      ip6_hop_by_hop_option_t * opt)
+{
+  ip6_main_t *im = &ip6_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+  u8 elt_index = 0;
+  ioam_trace_option_t *trace = (ioam_trace_option_t *) opt;
+  u32 adj_index = vnet_buffer (b)->ip.adj_index[VLIB_TX];
+  ip_adjacency_t *adj = ip_get_adjacency (lm, adj_index);
+  time_u64_t time_u64;
+  u32 *elt;
+  int rv = 0;
+  trace_profile *profile = NULL;
+
+
+  profile = trace_profile_find ();
+
+  if (PREDICT_FALSE (!profile))
+    {
+      ip6_ioam_trace_stats_increment_counter (IP6_IOAM_TRACE_PROFILE_MISS, 1);
+      return (-1);
+    }
+
+
+  time_u64.as_u64 = 0;
+
+  if (PREDICT_TRUE (trace->data_list_elts_left))
+    {
+      trace->data_list_elts_left--;
+      /* fetch_trace_data_size returns in bytes. Convert it to 4-bytes
+       * to skip to this node's location.
+       */
+      elt_index =
+	trace->data_list_elts_left *
+	fetch_trace_data_size (trace->ioam_trace_type) / 4;
+      elt = &trace->elts[elt_index];
+      if (trace->ioam_trace_type & BIT_TTL_NODEID)
+	{
+	  *elt =
+	    clib_host_to_net_u32 ((ip->hop_limit << 24) | profile->node_id);
+	  elt++;
+	}
+
+      if (trace->ioam_trace_type & BIT_ING_INTERFACE)
+	{
+	  *elt =
+	    (vnet_buffer (b)->sw_if_index[VLIB_RX] & 0xFFFF) << 16 |
+	    (adj->rewrite_header.sw_if_index & 0xFFFF);
+	  *elt = clib_host_to_net_u32 (*elt);
+	  elt++;
+	}
+
+      if (trace->ioam_trace_type & BIT_TIMESTAMP)
+	{
+	  /* Send least significant 32 bits */
+	  f64 time_f64 =
+	    (f64) (((f64) hm->unix_time_0) +
+		   (vlib_time_now (hm->vlib_main) - hm->vlib_time_0));
+
+	  time_u64.as_u64 = time_f64 * trace_tsp_mul[profile->trace_tsp];
+	  *elt = clib_host_to_net_u32 (time_u64.as_u32[0]);
+	  elt++;
+	}
+
+      if (trace->ioam_trace_type & BIT_APPDATA)
+	{
+	  /* $$$ set elt0->app_data */
+	  *elt = clib_host_to_net_u32 (profile->app_data);
+	  elt++;
+	}
+      ip6_ioam_trace_stats_increment_counter (IP6_IOAM_TRACE_UPDATED, 1);
+    }
+  else
+    {
+      ip6_ioam_trace_stats_increment_counter (IP6_IOAM_TRACE_FULL, 1);
+    }
+  return (rv);
+}
+
+u8 *
+ip6_hbh_ioam_trace_data_list_trace_handler (u8 * s,
+					    ip6_hop_by_hop_option_t * opt)
+{
+  ioam_trace_option_t *trace;
+  u8 trace_data_size_in_words = 0;
+  u32 *elt;
+  int elt_index = 0;
+
+  trace = (ioam_trace_option_t *) opt;
+  s =
+    format (s, "  Trace Type 0x%x , %d elts left\n", trace->ioam_trace_type,
+	    trace->data_list_elts_left);
+  trace_data_size_in_words =
+    fetch_trace_data_size (trace->ioam_trace_type) / 4;
+  elt = &trace->elts[0];
+  while ((u8 *) elt < ((u8 *) (&trace->elts[0]) + trace->hdr.length - 2
+		       /* -2 accounts for ioam_trace_type,elts_left */ ))
+    {
+      s = format (s, "    [%d] %U\n", elt_index,
+		  format_ioam_data_list_element,
+		  elt, &trace->ioam_trace_type);
+      elt_index++;
+      elt += trace_data_size_in_words;
+    }
+  return (s);
+}
+
+
+static clib_error_t *
+ip6_show_ioam_trace_cmd_fn (vlib_main_t * vm,
+			    unformat_input_t * input,
+			    vlib_cli_command_t * cmd)
+{
+  ip6_hop_by_hop_ioam_trace_main_t *hm = &ip6_hop_by_hop_ioam_trace_main;
+  u8 *s = 0;
+  int i = 0;
+
+  for (i = 0; i < IP6_IOAM_TRACE_N_STATS; i++)
+    {
+      s =
+	format (s, " %s - %lu\n", ip6_hop_by_hop_ioam_trace_stats_strings[i],
+		hm->counters[i]);
+    }
+
+  vlib_cli_output (vm, "%v", s);
+  vec_free (s);
+  return 0;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip6_show_ioam_trace_cmd, static) = {
+  .path = "show ioam trace",
+  .short_help = "iOAM trace statistics",
+  .function = ip6_show_ioam_trace_cmd_fn,
+};
+/* *INDENT-ON* */
+
+
+static clib_error_t *
+ip6_hop_by_hop_ioam_trace_init (vlib_main_t * vm)
+{
+  ip6_hop_by_hop_ioam_trace_main_t *hm = &ip6_hop_by_hop_ioam_trace_main;
+  clib_error_t *error;
+
+  if ((error = vlib_call_init_function (vm, ip_main_init)))
+    return (error);
+
+  if ((error = vlib_call_init_function (vm, ip6_lookup_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, ip6_hop_by_hop_ioam_init)))
+    return (error);
+
+  hm->vlib_main = vm;
+  hm->vnet_main = vnet_get_main ();
+  memset (hm->counters, 0, sizeof (hm->counters));
+
+
+  if (ip6_hbh_register_option
+      (HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST,
+       ip6_hbh_ioam_trace_data_list_handler,
+       ip6_hbh_ioam_trace_data_list_trace_handler) < 0)
+    return (clib_error_create
+	    ("registration of HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST failed"));
+
+
+  if (ip6_hbh_add_register_option (HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST,
+				   sizeof (ioam_trace_option_t),
+				   ip6_hop_by_hop_ioam_trace_rewrite_handler)
+      < 0)
+    return (clib_error_create
+	    ("registration of HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST for rewrite failed"));
+
+
+  return (0);
+}
+
+int
+ip6_trace_profile_cleanup (void)
+{
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+
+  hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] = 0;
+
+  return 0;
+
+}
+
+
+int
+ip6_trace_profile_setup (void)
+{
+  u32 trace_size = 0;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+
+  trace_profile *profile = NULL;
+
+
+  profile = trace_profile_find ();
+
+  if (PREDICT_FALSE (!profile))
+    {
+      ip6_ioam_trace_stats_increment_counter (IP6_IOAM_TRACE_PROFILE_MISS, 1);
+      return (-1);
+    }
+
+
+  if (ip6_ioam_trace_get_sizeof_handler (&trace_size) < 0)
+    return (-1);
+
+  hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] = trace_size;
+
+  return (0);
+}
+
+
+VLIB_INIT_FUNCTION (ip6_hop_by_hop_ioam_trace_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/export-common/ioam_export.h b/src/plugins/ioam/export-common/ioam_export.h
new file mode 100644
index 00000000..fbd86180
--- /dev/null
+++ b/src/plugins/ioam/export-common/ioam_export.h
@@ -0,0 +1,616 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_ioam_export_h__
+#define __included_ioam_export_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ip/ip_packet.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/ip/udp.h>
+#include <vnet/flow/ipfix_packet.h>
+
+#include <vppinfra/pool.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+
+#include <vlib/threads.h>
+
+typedef struct ioam_export_buffer
+{
+  /* Allocated buffer */
+  u32 buffer_index;
+  u64 touched_at;
+  u8 records_in_this_buffer;
+} ioam_export_buffer_t;
+
+
+typedef struct
+{
+  /* API message ID base */
+  u16 msg_id_base;
+
+  /* TODO: to support multiple collectors all this has to be grouped and create a vector here */
+  u8 *record_header;
+  u32 sequence_number;
+  u32 domain_id;
+
+  /* ipfix collector, our ip address */
+  ip4_address_t ipfix_collector;
+  ip4_address_t src_address;
+
+  /* Pool of ioam_export_buffer_t */
+  ioam_export_buffer_t *buffer_pool;
+  /* Vector of per thread ioam_export_buffer_t to buffer pool index */
+  u32 *buffer_per_thread;
+  /* Lock per thread to swap buffers between worker and timer process */
+  volatile u32 **lockp;
+
+  /* time scale transform */
+  u32 unix_time_0;
+  f64 vlib_time_0;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+  u32 ip4_lookup_node_index;
+
+  uword my_hbh_slot;
+  u32 export_process_node_index;
+} ioam_export_main_t;
+
+ioam_export_main_t ioam_export_main;
+ioam_export_main_t vxlan_gpe_ioam_export_main;
+
+extern vlib_node_registration_t export_node;
+
+#define DEFAULT_EXPORT_SIZE (3 * CLIB_CACHE_LINE_BYTES)
+/*
+ *  Number of records in a buffer
+ * ~(MTU (1500) - [ip hdr(40) + UDP(8) + ipfix (24)]) / DEFAULT_EXPORT_SIZE
+ */
+#define DEFAULT_EXPORT_RECORDS 7
+
+always_inline ioam_export_buffer_t *
+ioam_export_get_my_buffer (ioam_export_main_t * em, u32 thread_id)
+{
+
+  if (vec_len (em->buffer_per_thread) > thread_id)
+    return (pool_elt_at_index
+	    (em->buffer_pool, em->buffer_per_thread[thread_id]));
+  return (0);
+}
+
+inline static int
+ioam_export_buffer_add_header (ioam_export_main_t * em, vlib_buffer_t * b0)
+{
+  clib_memcpy (b0->data, em->record_header, vec_len (em->record_header));
+  b0->current_data = 0;
+  b0->current_length = vec_len (em->record_header);
+  b0->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
+  return (1);
+}
+
+inline static int
+ioam_export_init_buffer (ioam_export_main_t * em, vlib_main_t * vm,
+			 ioam_export_buffer_t * eb)
+{
+  vlib_buffer_t *b = 0;
+
+  if (!eb)
+    return (-1);
+  /* TODO: Perhaps buffer init from template here */
+  if (vlib_buffer_alloc (vm, &(eb->buffer_index), 1) != 1)
+    return (-2);
+  eb->records_in_this_buffer = 0;
+  eb->touched_at = vlib_time_now (vm);
+  b = vlib_get_buffer (vm, eb->buffer_index);
+  (void) ioam_export_buffer_add_header (em, b);
+  vnet_buffer (b)->sw_if_index[VLIB_RX] = 0;
+  vnet_buffer (b)->sw_if_index[VLIB_TX] = ~0;
+  return (1);
+}
+
+inline static void
+ioam_export_thread_buffer_free (ioam_export_main_t * em)
+{
+  vlib_main_t *vm = em->vlib_main;
+  ioam_export_buffer_t *eb = 0;
+  int i;
+  for (i = 0; i < vec_len (em->buffer_per_thread); i++)
+    {
+      eb = pool_elt_at_index (em->buffer_pool, em->buffer_per_thread[i]);
+      if (eb)
+	vlib_buffer_free (vm, &(eb->buffer_index), 1);
+    }
+  for (i = 0; i < vec_len (em->lockp); i++)
+    clib_mem_free ((void *) em->lockp[i]);
+  vec_free (em->buffer_per_thread);
+  pool_free (em->buffer_pool);
+  vec_free (em->lockp);
+  em->buffer_per_thread = 0;
+  em->buffer_pool = 0;
+  em->lockp = 0;
+}
+
+inline static int
+ioam_export_thread_buffer_init (ioam_export_main_t * em, vlib_main_t * vm)
+{
+  int no_of_threads = vec_len (vlib_worker_threads);
+  int i;
+  ioam_export_buffer_t *eb = 0;
+  vlib_node_t *ip4_lookup_node;
+
+  pool_alloc_aligned (em->buffer_pool,
+		      no_of_threads - 1, CLIB_CACHE_LINE_BYTES);
+  vec_validate_aligned (em->buffer_per_thread,
+			no_of_threads - 1, CLIB_CACHE_LINE_BYTES);
+  vec_validate_aligned (em->lockp, no_of_threads - 1, CLIB_CACHE_LINE_BYTES);
+  ip4_lookup_node = vlib_get_node_by_name (vm, (u8 *) "ip4-lookup");
+  em->ip4_lookup_node_index = ip4_lookup_node->index;
+  if (!em->buffer_per_thread || !em->buffer_pool || !em->lockp)
+    {
+      return (-1);
+    }
+  for (i = 0; i < no_of_threads; i++)
+    {
+      eb = 0;
+      pool_get_aligned (em->buffer_pool, eb, CLIB_CACHE_LINE_BYTES);
+      memset (eb, 0, sizeof (*eb));
+      em->buffer_per_thread[i] = eb - em->buffer_pool;
+      if (ioam_export_init_buffer (em, vm, eb) != 1)
+	{
+	  ioam_export_thread_buffer_free (em);
+	  return (-2);
+	}
+      em->lockp[i] = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
+					     CLIB_CACHE_LINE_BYTES);
+      memset ((void *) em->lockp[i], 0, CLIB_CACHE_LINE_BYTES);
+    }
+  return (1);
+}
+
+#define IPFIX_IOAM_EXPORT_ID 272
+
+/* Used to build the rewrite */
+/* data set packet */
+typedef struct
+{
+  ipfix_message_header_t h;
+  ipfix_set_header_t s;
+} ipfix_data_packet_t;
+
+typedef struct
+{
+  ip4_header_t ip4;
+  udp_header_t udp;
+  ipfix_data_packet_t ipfix;
+} ip4_ipfix_data_packet_t;
+
+
+inline static void
+ioam_export_header_cleanup (ioam_export_main_t * em,
+			    ip4_address_t * collector_address,
+			    ip4_address_t * src_address)
+{
+  vec_free (em->record_header);
+  em->record_header = 0;
+}
+
+inline static int
+ioam_export_header_create (ioam_export_main_t * em,
+			   ip4_address_t * collector_address,
+			   ip4_address_t * src_address)
+{
+  ip4_header_t *ip;
+  udp_header_t *udp;
+  ipfix_message_header_t *h;
+  ipfix_set_header_t *s;
+  u8 *rewrite = 0;
+  ip4_ipfix_data_packet_t *tp;
+
+
+  /* allocate rewrite space */
+  vec_validate_aligned (rewrite,
+			sizeof (ip4_ipfix_data_packet_t) - 1,
+			CLIB_CACHE_LINE_BYTES);
+
+  tp = (ip4_ipfix_data_packet_t *) rewrite;
+  ip = (ip4_header_t *) & tp->ip4;
+  udp = (udp_header_t *) (ip + 1);
+  h = (ipfix_message_header_t *) (udp + 1);
+  s = (ipfix_set_header_t *) (h + 1);
+
+  ip->ip_version_and_header_length = 0x45;
+  ip->ttl = 254;
+  ip->protocol = IP_PROTOCOL_UDP;
+  ip->src_address.as_u32 = src_address->as_u32;
+  ip->dst_address.as_u32 = collector_address->as_u32;
+  udp->src_port = clib_host_to_net_u16 (4939 /* $$FIXME */ );
+  udp->dst_port = clib_host_to_net_u16 (4939);
+  /* FIXUP: UDP length */
+  udp->length = clib_host_to_net_u16 (vec_len (rewrite) +
+				      (DEFAULT_EXPORT_RECORDS *
+				       DEFAULT_EXPORT_SIZE) - sizeof (*ip));
+
+  /* FIXUP: message header export_time */
+  /* FIXUP: message header sequence_number */
+  h->domain_id = clib_host_to_net_u32 (em->domain_id);
+
+  /*FIXUP: Setid length in octets if records exported are not default */
+  s->set_id_length = ipfix_set_id_length (IPFIX_IOAM_EXPORT_ID,
+					  (sizeof (*s) +
+					   (DEFAULT_EXPORT_RECORDS *
+					    DEFAULT_EXPORT_SIZE)));
+
+  /* FIXUP: h version and length length in octets if records exported are not default */
+  h->version_length = version_length (sizeof (*h) +
+				      (sizeof (*s) +
+				       (DEFAULT_EXPORT_RECORDS *
+					DEFAULT_EXPORT_SIZE)));
+
+  /* FIXUP: ip length if records exported are not default */
+  /* FIXUP: ip checksum if records exported are not default */
+  ip->length = clib_host_to_net_u16 (vec_len (rewrite) +
+				     (DEFAULT_EXPORT_RECORDS *
+				      DEFAULT_EXPORT_SIZE));
+  ip->checksum = ip4_header_checksum (ip);
+  _vec_len (rewrite) = sizeof (ip4_ipfix_data_packet_t);
+  em->record_header = rewrite;
+  return (1);
+}
+
+inline static int
+ioam_export_send_buffer (ioam_export_main_t * em, vlib_main_t * vm,
+			 ioam_export_buffer_t * eb)
+{
+  ip4_header_t *ip;
+  udp_header_t *udp;
+  ipfix_message_header_t *h;
+  ipfix_set_header_t *s;
+  ip4_ipfix_data_packet_t *tp;
+  vlib_buffer_t *b0;
+  u16 new_l0, old_l0;
+  ip_csum_t sum0;
+  vlib_frame_t *nf = 0;
+  u32 *to_next;
+
+  b0 = vlib_get_buffer (vm, eb->buffer_index);
+  tp = vlib_buffer_get_current (b0);
+  ip = (ip4_header_t *) & tp->ip4;
+  udp = (udp_header_t *) (ip + 1);
+  h = (ipfix_message_header_t *) (udp + 1);
+  s = (ipfix_set_header_t *) (h + 1);
+
+  /* FIXUP: message header export_time */
+  h->export_time = clib_host_to_net_u32 ((u32)
+					 (((f64) em->unix_time_0) +
+					  (vlib_time_now (em->vlib_main) -
+					   em->vlib_time_0)));
+
+  /* FIXUP: message header sequence_number */
+  h->sequence_number = clib_host_to_net_u32 (em->sequence_number++);
+
+  /* FIXUP: lengths if different from default */
+  if (PREDICT_FALSE (eb->records_in_this_buffer != DEFAULT_EXPORT_RECORDS))
+    {
+      s->set_id_length =
+	ipfix_set_id_length (IPFIX_IOAM_EXPORT_ID /* set_id */ ,
+			     b0->current_length - (sizeof (*ip) +
+						   sizeof (*udp) +
+						   sizeof (*h)));
+      h->version_length =
+	version_length (b0->current_length - (sizeof (*ip) + sizeof (*udp)));
+      sum0 = ip->checksum;
+      old_l0 = ip->length;
+      new_l0 = clib_host_to_net_u16 ((u16) b0->current_length);
+      sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
+			     length /* changed member */ );
+      ip->checksum = ip_csum_fold (sum0);
+      ip->length = new_l0;
+      udp->length = clib_host_to_net_u16 (b0->current_length - sizeof (*ip));
+    }
+
+  /* Enqueue pkts to ip4-lookup */
+
+  nf = vlib_get_frame_to_node (vm, em->ip4_lookup_node_index);
+  nf->n_vectors = 0;
+  to_next = vlib_frame_vector_args (nf);
+  nf->n_vectors = 1;
+  to_next[0] = eb->buffer_index;
+  vlib_put_frame_to_node (vm, em->ip4_lookup_node_index, nf);
+  return (1);
+
+}
+
+#define EXPORT_TIMEOUT (20.0)
+#define THREAD_PERIOD (30.0)
+inline static uword
+ioam_export_process_common (ioam_export_main_t * em, vlib_main_t * vm,
+			    vlib_node_runtime_t * rt, vlib_frame_t * f,
+			    u32 index)
+{
+  f64 now;
+  f64 timeout = 30.0;
+  uword event_type;
+  uword *event_data = 0;
+  int i;
+  ioam_export_buffer_t *eb = 0, *new_eb = 0;
+  u32 *vec_buffer_indices = 0;
+  u32 *vec_buffer_to_be_sent = 0;
+  u32 *thread_index = 0;
+  u32 new_pool_index = 0;
+
+  em->export_process_node_index = index;
+  /* Wait for Godot... */
+  vlib_process_wait_for_event_or_clock (vm, 1e9);
+  event_type = vlib_process_get_events (vm, &event_data);
+  if (event_type != 1)
+    clib_warning ("bogus kickoff event received, %d", event_type);
+  vec_reset_length (event_data);
+
+  while (1)
+    {
+      vlib_process_wait_for_event_or_clock (vm, timeout);
+      event_type = vlib_process_get_events (vm, &event_data);
+      switch (event_type)
+	{
+	case 2:		/* Stop and Wait for kickoff again */
+	  timeout = 1e9;
+	  break;
+	case 1:		/* kickoff : Check for unsent buffers */
+	  timeout = THREAD_PERIOD;
+	  break;
+	case ~0:		/* timeout */
+	  break;
+	}
+      vec_reset_length (event_data);
+      now = vlib_time_now (vm);
+      /*
+       * Create buffers for threads that are not active enough
+       * to send out the export records
+       */
+      for (i = 0; i < vec_len (em->buffer_per_thread); i++)
+	{
+	  /* If the worker thread is processing export records ignore further checks */
+	  if (*em->lockp[i] == 1)
+	    continue;
+	  eb = pool_elt_at_index (em->buffer_pool, em->buffer_per_thread[i]);
+	  if (eb->records_in_this_buffer > 0
+	      && now > (eb->touched_at + EXPORT_TIMEOUT))
+	    {
+	      pool_get_aligned (em->buffer_pool, new_eb,
+				CLIB_CACHE_LINE_BYTES);
+	      memset (new_eb, 0, sizeof (*new_eb));
+	      if (ioam_export_init_buffer (em, vm, new_eb) == 1)
+		{
+		  new_pool_index = new_eb - em->buffer_pool;
+		  vec_add (vec_buffer_indices, &new_pool_index, 1);
+		  vec_add (vec_buffer_to_be_sent, &em->buffer_per_thread[i],
+			   1);
+		  vec_add (thread_index, &i, 1);
+		}
+	      else
+		{
+		  pool_put (em->buffer_pool, new_eb);
+		  /*Give up */
+		  goto CLEANUP;
+		}
+	    }
+	}
+      if (vec_len (thread_index) != 0)
+	{
+	  /*
+	   * Now swap the buffers out
+	   */
+	  for (i = 0; i < vec_len (thread_index); i++)
+	    {
+	      while (__sync_lock_test_and_set (em->lockp[thread_index[i]], 1))
+		;
+	      em->buffer_per_thread[thread_index[i]] =
+		vec_pop (vec_buffer_indices);
+	      *em->lockp[thread_index[i]] = 0;
+	    }
+
+	  /* Send the buffers */
+	  for (i = 0; i < vec_len (vec_buffer_to_be_sent); i++)
+	    {
+	      eb =
+		pool_elt_at_index (em->buffer_pool, vec_buffer_to_be_sent[i]);
+	      ioam_export_send_buffer (em, vm, eb);
+	      pool_put (em->buffer_pool, eb);
+	    }
+	}
+
+    CLEANUP:
+      /* Free any leftover/unused buffers and everything that was allocated */
+      for (i = 0; i < vec_len (vec_buffer_indices); i++)
+	{
+	  new_eb = pool_elt_at_index (em->buffer_pool, vec_buffer_indices[i]);
+	  vlib_buffer_free (vm, &new_eb->buffer_index, 1);
+	  pool_put (em->buffer_pool, new_eb);
+	}
+      vec_free (vec_buffer_indices);
+      vec_free (vec_buffer_to_be_sent);
+      vec_free (thread_index);
+    }
+  return 0;			/* not so much */
+}
+
+#define ioam_export_node_common(EM, VM, N, F, HTYPE, L, V, NEXT)               \
+do {                                                                           \
+  u32 n_left_from, *from, *to_next;                                            \
+  export_next_t next_index;                                                    \
+  u32 pkts_recorded = 0;                                                       \
+  ioam_export_buffer_t *my_buf = 0;                                            \
+  vlib_buffer_t *eb0 = 0;                                                      \
+  u32 ebi0 = 0;                                                                \
+  from = vlib_frame_vector_args (F);                                           \
+  n_left_from = (F)->n_vectors;                                                \
+  next_index = (N)->cached_next_index;                                         \
+  while (__sync_lock_test_and_set ((EM)->lockp[(VM)->cpu_index], 1));          \
+  my_buf = ioam_export_get_my_buffer (EM, (VM)->cpu_index);                    \
+  my_buf->touched_at = vlib_time_now (VM);                                     \
+  while (n_left_from > 0)                                                      \
+    {                                                                          \
+      u32 n_left_to_next;                                                      \
+      vlib_get_next_frame (VM, N, next_index, to_next, n_left_to_next);        \
+      while (n_left_from >= 4 && n_left_to_next >= 2)                          \
+	{                                                                      \
+	  u32 next0 = NEXT;                                                    \
+	  u32 next1 = NEXT;                                                    \
+	  u32 bi0, bi1;                                                        \
+	  HTYPE *ip0, *ip1;                                                    \
+	  vlib_buffer_t *p0, *p1;                                              \
+	  u32 ip_len0, ip_len1;                                                \
+	  {                                                                    \
+	    vlib_buffer_t *p2, *p3;                                            \
+	    p2 = vlib_get_buffer (VM, from[2]);                                \
+	    p3 = vlib_get_buffer (VM, from[3]);                                \
+	    vlib_prefetch_buffer_header (p2, LOAD);                            \
+	    vlib_prefetch_buffer_header (p3, LOAD);                            \
+	    CLIB_PREFETCH (p2->data, 3 * CLIB_CACHE_LINE_BYTES, LOAD);         \
+	    CLIB_PREFETCH (p3->data, 3 * CLIB_CACHE_LINE_BYTES, LOAD);         \
+	  }                                                                    \
+	  to_next[0] = bi0 = from[0];                                          \
+	  to_next[1] = bi1 = from[1];                                          \
+	  from += 2;                                                           \
+	  to_next += 2;                                                        \
+	  n_left_from -= 2;                                                    \
+	  n_left_to_next -= 2;                                                 \
+	  p0 = vlib_get_buffer (VM, bi0);                                      \
+	  p1 = vlib_get_buffer (VM, bi1);                                      \
+	  ip0 = vlib_buffer_get_current (p0);                                  \
+	  ip1 = vlib_buffer_get_current (p1);                                  \
+	  ip_len0 =                                                            \
+	    clib_net_to_host_u16 (ip0->L) + sizeof (HTYPE);                    \
+	  ip_len1 =                                                            \
+	    clib_net_to_host_u16 (ip1->L) + sizeof (HTYPE);                    \
+	  ebi0 = my_buf->buffer_index;                                         \
+	  eb0 = vlib_get_buffer (VM, ebi0);                                    \
+	  if (PREDICT_FALSE (eb0 == 0))                                        \
+	    goto NO_BUFFER1;                                                   \
+	  ip_len0 =                                                            \
+	    ip_len0 > DEFAULT_EXPORT_SIZE ? DEFAULT_EXPORT_SIZE : ip_len0;     \
+	  ip_len1 =                                                            \
+	    ip_len1 > DEFAULT_EXPORT_SIZE ? DEFAULT_EXPORT_SIZE : ip_len1;     \
+	  copy3cachelines (eb0->data + eb0->current_length, ip0, ip_len0);     \
+	  eb0->current_length += DEFAULT_EXPORT_SIZE;                          \
+	  my_buf->records_in_this_buffer++;                                    \
+	  if (my_buf->records_in_this_buffer >= DEFAULT_EXPORT_RECORDS)        \
+	    {                                                                  \
+	      ioam_export_send_buffer (EM, VM, my_buf);                        \
+	      ioam_export_init_buffer (EM, VM, my_buf);                        \
+	    }                                                                  \
+	  ebi0 = my_buf->buffer_index;                                         \
+	  eb0 = vlib_get_buffer (VM, ebi0);                                    \
+	  if (PREDICT_FALSE (eb0 == 0))                                        \
+	    goto NO_BUFFER1;                                                   \
+	  copy3cachelines (eb0->data + eb0->current_length, ip1, ip_len1);     \
+	  eb0->current_length += DEFAULT_EXPORT_SIZE;                          \
+	  my_buf->records_in_this_buffer++;                                    \
+	  if (my_buf->records_in_this_buffer >= DEFAULT_EXPORT_RECORDS)        \
+	    {                                                                  \
+	      ioam_export_send_buffer (EM, VM, my_buf);                        \
+	      ioam_export_init_buffer (EM, VM, my_buf);                        \
+	    }                                                                  \
+	  pkts_recorded += 2;                                                  \
+	  if (PREDICT_FALSE (((node)->flags & VLIB_NODE_FLAG_TRACE)))          \
+	    {                                                                  \
+	      if (p0->flags & VLIB_BUFFER_IS_TRACED)                           \
+		{                                                              \
+		  export_trace_t *t =                                          \
+		    vlib_add_trace (VM, node, p0, sizeof (*t));                \
+		  t->flow_label =                                              \
+		    clib_net_to_host_u32 (ip0->V);                             \
+		  t->next_index = next0;                                       \
+		}                                                              \
+	      if (p1->flags & VLIB_BUFFER_IS_TRACED)                           \
+		{                                                              \
+		  export_trace_t *t =                                          \
+		    vlib_add_trace (VM, N, p1, sizeof (*t));                   \
+		  t->flow_label =                                              \
+		    clib_net_to_host_u32 (ip1->V);                             \
+		  t->next_index = next1;                                       \
+		}                                                              \
+	    }                                                                  \
+	NO_BUFFER1:                                                            \
+	  vlib_validate_buffer_enqueue_x2 (VM, N, next_index,                  \
+					   to_next, n_left_to_next,            \
+					   bi0, bi1, next0, next1);            \
+	}                                                                      \
+      while (n_left_from > 0 && n_left_to_next > 0)                            \
+	{                                                                      \
+	  u32 bi0;                                                             \
+	  vlib_buffer_t *p0;                                                   \
+	  u32 next0 = NEXT;                                                    \
+	  HTYPE *ip0;                                                          \
+	  u32 ip_len0;                                                         \
+	  bi0 = from[0];                                                       \
+	  to_next[0] = bi0;                                                    \
+	  from += 1;                                                           \
+	  to_next += 1;                                                        \
+	  n_left_from -= 1;                                                    \
+	  n_left_to_next -= 1;                                                 \
+	  p0 = vlib_get_buffer (VM, bi0);                                      \
+	  ip0 = vlib_buffer_get_current (p0);                                  \
+	  ip_len0 =                                                            \
+	    clib_net_to_host_u16 (ip0->L) + sizeof (HTYPE);                    \
+	  ebi0 = my_buf->buffer_index;                                         \
+	  eb0 = vlib_get_buffer (VM, ebi0);                                    \
+	  if (PREDICT_FALSE (eb0 == 0))                                        \
+	    goto NO_BUFFER;                                                    \
+	  ip_len0 =                                                            \
+	    ip_len0 > DEFAULT_EXPORT_SIZE ? DEFAULT_EXPORT_SIZE : ip_len0;     \
+	  copy3cachelines (eb0->data + eb0->current_length, ip0, ip_len0);     \
+	  eb0->current_length += DEFAULT_EXPORT_SIZE;                          \
+	  my_buf->records_in_this_buffer++;                                    \
+	  if (my_buf->records_in_this_buffer >= DEFAULT_EXPORT_RECORDS)        \
+	    {                                                                  \
+	      ioam_export_send_buffer (EM, VM, my_buf);                        \
+	      ioam_export_init_buffer (EM, VM, my_buf);                        \
+	    }                                                                  \
+	  if (PREDICT_FALSE (((N)->flags & VLIB_NODE_FLAG_TRACE)               \
+			     && (p0->flags & VLIB_BUFFER_IS_TRACED)))          \
+	    {                                                                  \
+	      export_trace_t *t = vlib_add_trace (VM, (N), p0, sizeof (*t));   \
+	      t->flow_label =                                                  \
+		clib_net_to_host_u32 (ip0->V);                                 \
+	      t->next_index = next0;                                           \
+	    }                                                                  \
+	  pkts_recorded += 1;                                                  \
+	NO_BUFFER:                                                             \
+	  vlib_validate_buffer_enqueue_x1 (VM, N, next_index,                  \
+					   to_next, n_left_to_next,            \
+					   bi0, next0);                        \
+	}                                                                      \
+      vlib_put_next_frame (VM, N, next_index, n_left_to_next);                 \
+    }                                                                          \
+  vlib_node_increment_counter (VM, export_node.index,                          \
+			       EXPORT_ERROR_RECORDED, pkts_recorded);          \
+  *(EM)->lockp[(VM)->cpu_index] = 0;                                           \
+} while(0)
+
+#endif /* __included_ioam_export_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
new file mode 100644
index 00000000..7b17c3f7
--- /dev/null
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
@@ -0,0 +1,42 @@
+/* Hey Emacs use -*- mode: C -*- */
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Define a simple binary API to control the feature */
+
+define vxlan_gpe_ioam_export_enable_disable {
+    /* Client identifier, set from api_main.my_client_index */
+    u32 client_index;
+
+    /* Arbitrary context, so client can match reply to request */
+    u32 context;
+
+    /* Enable / disable the feature */
+    u8 is_disable;
+
+    /* Collector ip address */
+    u8 collector_address[4];
+    u8 src_address[4];
+
+    /* Src ip address */
+};
+
+define vxlan_gpe_ioam_export_enable_disable_reply {
+    /* From the request */
+    u32 context;
+
+    /* Return value, zero means all OK */
+    i32 retval;
+};
\ No newline at end of file
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
new file mode 100644
index 00000000..bab8d977
--- /dev/null
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
@@ -0,0 +1,271 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * vxlan_gpe_ioam_export.c - ioam export API / debug CLI handling
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/plugin/plugin.h>
+#include <ioam/export-common/ioam_export.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
+
+/* define message IDs */
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
+#undef vl_typedefs
+
+/* define generated endian-swappers */
+#define vl_endianfun
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
+#undef vl_api_version
+
+/*
+ * A handy macro to set up a message reply.
+ * Assumes that the following variables are available:
+ * mp - pointer to request message
+ * rmp - pointer to reply message type
+ * rv - return value
+ */
+
+#define REPLY_MACRO(t)                                          \
+do {                                                            \
+    unix_shared_memory_queue_t * q =                            \
+    vl_api_client_index_to_input_queue (mp->client_index);      \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+                                                                \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+
+/* List of message types that this plugin understands */
+
+
+#define foreach_vxlan_gpe_ioam_export_plugin_api_msg                        \
+_(VXLAN_GPE_IOAM_EXPORT_ENABLE_DISABLE, vxlan_gpe_ioam_export_enable_disable)
+
+extern void vxlan_gpe_set_next_override (uword next);
+/* Action function shared between message handler and debug CLI */
+int
+vxlan_gpe_ioam_export_enable_disable (ioam_export_main_t * em,
+				      u8 is_disable,
+				      ip4_address_t * collector_address,
+				      ip4_address_t * src_address)
+{
+  vlib_main_t *vm = em->vlib_main;
+  u32 node_index = export_node.index;
+  vlib_node_t *vxlan_gpe_decap_ioam_node = NULL;
+
+  if (is_disable == 0)
+    {
+      if (em->my_hbh_slot == ~0)
+	{
+	  /* Hook this export node to vxlan-gpe-decap-ioam-v4 */
+	  vxlan_gpe_decap_ioam_node =
+	    vlib_get_node_by_name (vm, (u8 *) "vxlan-gpe-decap-ioam-v4");
+	  if (!vxlan_gpe_decap_ioam_node)
+	    {
+	      /* node does not exist give up */
+	      return (-1);
+	    }
+	  em->my_hbh_slot =
+	    vlib_node_add_next (vm, vxlan_gpe_decap_ioam_node->index,
+				node_index);
+	}
+      if (1 == ioam_export_header_create (em, collector_address, src_address))
+	{
+	  ioam_export_thread_buffer_init (em, vm);
+	  vxlan_gpe_set_next_override (em->my_hbh_slot);
+	  /* Turn on the export buffer check process */
+	  vlib_process_signal_event (vm, em->export_process_node_index, 1, 0);
+
+	}
+      else
+	{
+	  return (-2);
+	}
+    }
+  else
+    {
+      vxlan_gpe_set_next_override (VXLAN_GPE_DECAP_IOAM_V4_NEXT_POP);
+      ioam_export_header_cleanup (em, collector_address, src_address);
+      ioam_export_thread_buffer_free (em);
+      /* Turn off the export buffer check process */
+      vlib_process_signal_event (vm, em->export_process_node_index, 2, 0);
+
+    }
+
+  return 0;
+}
+
+/* API message handler */
+static void vl_api_vxlan_gpe_ioam_export_enable_disable_t_handler
+  (vl_api_vxlan_gpe_ioam_export_enable_disable_t * mp)
+{
+  vl_api_vxlan_gpe_ioam_export_enable_disable_reply_t *rmp;
+  ioam_export_main_t *sm = &vxlan_gpe_ioam_export_main;
+  int rv;
+
+  rv = vxlan_gpe_ioam_export_enable_disable (sm, (int) (mp->is_disable),
+					     (ip4_address_t *)
+					     mp->collector_address,
+					     (ip4_address_t *)
+					     mp->src_address);
+
+  REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_EXPORT_ENABLE_DISABLE_REPLY);
+}				/* API message handler */
+
+
+
+/* Set up the API message handling tables */
+static clib_error_t *
+vxlan_gpe_ioam_export_plugin_api_hookup (vlib_main_t * vm)
+{
+  ioam_export_main_t *sm = &vxlan_gpe_ioam_export_main;
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,					\
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vxlan_gpe_ioam_export_plugin_api_msg;
+#undef _
+
+  return 0;
+}
+
+
+static clib_error_t *
+set_vxlan_gpe_ioam_export_ipfix_command_fn (vlib_main_t * vm,
+					    unformat_input_t * input,
+					    vlib_cli_command_t * cmd)
+{
+  ioam_export_main_t *em = &vxlan_gpe_ioam_export_main;
+  ip4_address_t collector, src;
+  u8 is_disable = 0;
+
+  collector.as_u32 = 0;
+  src.as_u32 = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "collector %U", unformat_ip4_address, &collector))
+	;
+      else if (unformat (input, "src %U", unformat_ip4_address, &src))
+	;
+      else if (unformat (input, "disable"))
+	is_disable = 1;
+      else
+	break;
+    }
+
+  if (collector.as_u32 == 0)
+    return clib_error_return (0, "collector address required");
+
+  if (src.as_u32 == 0)
+    return clib_error_return (0, "src address required");
+
+  em->ipfix_collector.as_u32 = collector.as_u32;
+  em->src_address.as_u32 = src.as_u32;
+
+  vlib_cli_output (vm, "Collector %U, src address %U",
+		   format_ip4_address, &em->ipfix_collector,
+		   format_ip4_address, &em->src_address);
+
+  /* Turn on the export timer process */
+  // vlib_process_signal_event (vm, flow_report_process_node.index,
+  //1, 0);
+  if (0 !=
+      vxlan_gpe_ioam_export_enable_disable (em, is_disable, &collector, &src))
+    {
+      return clib_error_return (0, "Unable to set ioam vxlan-gpe export");
+    }
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_vxlan_gpe_ioam_ipfix_command, static) =
+{
+.path = "set vxlan-gpe-ioam export ipfix",
+.short_help = "set vxlan-gpe-ioam export ipfix collector <ip4-address> src <ip4-address>",
+.function = set_vxlan_gpe_ioam_export_ipfix_command_fn,
+};
+/* *INDENT-ON* */
+
+
+static clib_error_t *
+vxlan_gpe_ioam_export_init (vlib_main_t * vm)
+{
+  ioam_export_main_t *em = &vxlan_gpe_ioam_export_main;
+  clib_error_t *error = 0;
+  u8 *name;
+
+  name = format (0, "vxlan_gpe_ioam_export_%08x%c", api_version, 0);
+
+  /* Ask for a correctly-sized block of API message decode slots */
+  em->msg_id_base = vl_msg_api_get_msg_ids
+    ((char *) name, VL_MSG_FIRST_AVAILABLE);
+  em->unix_time_0 = (u32) time (0);	/* Store starting time */
+  em->vlib_time_0 = vlib_time_now (vm);
+
+  error = vxlan_gpe_ioam_export_plugin_api_hookup (vm);
+  em->my_hbh_slot = ~0;
+  em->vlib_main = vm;
+  em->vnet_main = vnet_get_main ();
+  vec_free (name);
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (vxlan_gpe_ioam_export_init);
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h
new file mode 100644
index 00000000..6d93f093
--- /dev/null
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Include the generated file, see BUILT_SOURCES in Makefile.am */
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.h>
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h
new file mode 100644
index 00000000..cc5698de
--- /dev/null
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vxlan_gpe_ioam_export_msg_enum_h
+#define included_vxlan_gpe_ioam_export_msg_enum_h
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum {
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
+    /* We'll want to know how many messages IDs we need... */
+    VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif /* included_vxlan_gpe_ioam_export_msg_enum_h */
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
new file mode 100644
index 00000000..494263d9
--- /dev/null
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * vxlan_gpe_ioam_export_test.c - test harness plugin
+ *------------------------------------------------------------------
+ */
+
+#include <vat/vat.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vppinfra/error.h>
+
+
+/* Declare message IDs */
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
+#undef vl_typedefs
+
+/* declare message handlers for each api */
+
+#define vl_endianfun		/* define message structures */
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number. */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
+#undef vl_api_version
+
+
+typedef struct
+{
+  /* API message ID base */
+  u16 msg_id_base;
+  vat_main_t *vat_main;
+} export_test_main_t;
+
+export_test_main_t export_test_main;
+
+#define foreach_standard_reply_retval_handler   \
+_(vxlan_gpe_ioam_export_enable_disable_reply)
+
+#define _(n)                                            \
+    static void vl_api_##n##_t_handler                  \
+    (vl_api_##n##_t * mp)                               \
+    {                                                   \
+        vat_main_t * vam = export_test_main.vat_main;   \
+        i32 retval = ntohl(mp->retval);                 \
+        if (vam->async_mode) {                          \
+            vam->async_errors += (retval < 0);          \
+        } else {                                        \
+            vam->retval = retval;                       \
+            vam->result_ready = 1;                      \
+        }                                               \
+    }
+foreach_standard_reply_retval_handler;
+#undef _
+
+/*
+ * Table of message reply handlers, must include boilerplate handlers
+ * we just generated
+ */
+#define foreach_vpe_api_reply_msg                                       \
+_(VXLAN_GPE_IOAM_EXPORT_ENABLE_DISABLE_REPLY, vxlan_gpe_ioam_export_enable_disable_reply)
+
+
+/* M: construct, but don't yet send a message */
+
+#define M(T,t)                                                  \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp));                         \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+#define M2(T,t,n)                                               \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+/* S: send a message */
+#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
+
+/* W: wait for results, with timeout */
+#define W                                       \
+do {                                            \
+    timeout = vat_time_now (vam) + 1.0;         \
+                                                \
+    while (vat_time_now (vam) < timeout) {      \
+        if (vam->result_ready == 1) {           \
+            return (vam->retval);               \
+        }                                       \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
+static int
+api_vxlan_gpe_ioam_export_enable_disable (vat_main_t * vam)
+{
+  export_test_main_t *sm = &export_test_main;
+  unformat_input_t *i = vam->input;
+  f64 timeout;
+  int is_disable = 0;
+  vl_api_vxlan_gpe_ioam_export_enable_disable_t *mp;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "disable"))
+	is_disable = 1;
+      else
+	break;
+    }
+
+  /* Construct the API message */
+  M (VXLAN_GPE_IOAM_EXPORT_ENABLE_DISABLE,
+     vxlan_gpe_ioam_export_enable_disable);
+  mp->is_disable = is_disable;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+}
+
+/*
+ * List of messages that the api test plugin sends,
+ * and that the data plane plugin processes
+ */
+#define foreach_vpe_api_msg \
+_(vxlan_gpe_ioam_export_enable_disable, "<intfc> [disable]")
+
+void
+vat_api_hookup (vat_main_t * vam)
+{
+  export_test_main_t *sm = &export_test_main;
+  /* Hook up handlers for replies from the data plane plug-in */
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,                                  \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_reply_msg;
+#undef _
+
+  /* API messages we can send */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+  foreach_vpe_api_msg;
+#undef _
+
+  /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+  foreach_vpe_api_msg;
+#undef _
+}
+
+clib_error_t *
+vat_plugin_register (vat_main_t * vam)
+{
+  export_test_main_t *sm = &export_test_main;
+  u8 *name;
+
+  sm->vat_main = vam;
+
+  name = format (0, "vxlan_gpe_ioam_export_%08x%c", api_version, 0);
+  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  if (sm->msg_id_base != (u16) ~ 0)
+    vat_api_hookup (vam);
+
+  vec_free (name);
+
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
new file mode 100644
index 00000000..58508ebf
--- /dev/null
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ioam_export_thread.c
+ */
+#include <vnet/api_errno.h>
+#include <vppinfra/pool.h>
+#include <ioam/export-common/ioam_export.h>
+
+static vlib_node_registration_t vxlan_gpe_ioam_export_process_node;
+
+static uword
+vxlan_gpe_ioam_export_process (vlib_main_t * vm,
+			       vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  return (ioam_export_process_common (&vxlan_gpe_ioam_export_main,
+				      vm, rt, f,
+				      vxlan_gpe_ioam_export_process_node.index));
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (vxlan_gpe_ioam_export_process_node, static) =
+{
+ .function = vxlan_gpe_ioam_export_process,
+ .type = VLIB_NODE_TYPE_PROCESS,
+ .name = "vxlan-gpe-ioam-export-process",
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c
new file mode 100644
index 00000000..722c2b06
--- /dev/null
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+#include <vnet/ip/ip.h>
+#include <ioam/export-common/ioam_export.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
+
+typedef struct
+{
+  u32 next_index;
+  u32 flow_label;
+} export_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_export_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  export_trace_t *t = va_arg (*args, export_trace_t *);
+
+  s = format (s, "EXPORT: flow_label %d, next index %d",
+	      t->flow_label, t->next_index);
+  return s;
+}
+
+vlib_node_registration_t export_node;
+
+#define foreach_export_error \
+_(RECORDED, "Packets recorded for export")
+
+typedef enum
+{
+#define _(sym,str) EXPORT_ERROR_##sym,
+  foreach_export_error
+#undef _
+    EXPORT_N_ERROR,
+} export_error_t;
+
+static char *export_error_strings[] = {
+#define _(sym,string) string,
+  foreach_export_error
+#undef _
+};
+
+typedef enum
+{
+  EXPORT_NEXT_VXLAN_GPE_INPUT,
+  EXPORT_N_NEXT,
+} export_next_t;
+
+always_inline void
+copy3cachelines (void *dst, const void *src, size_t n)
+{
+#if 0
+  if (PREDICT_FALSE (n < DEFAULT_EXPORT_SIZE))
+    {
+      /* Copy only the first 1/2 cache lines whatever is available */
+      if (n >= 64)
+	clib_mov64 ((u8 *) dst, (const u8 *) src);
+      if (n >= 128)
+	clib_mov64 ((u8 *) dst + 64, (const u8 *) src + 64);
+      return;
+    }
+  clib_mov64 ((u8 *) dst, (const u8 *) src);
+  clib_mov64 ((u8 *) dst + 64, (const u8 *) src + 64);
+  clib_mov64 ((u8 *) dst + 128, (const u8 *) src + 128);
+#endif
+#if 1
+
+  u64 *copy_dst, *copy_src;
+  int i;
+  copy_dst = (u64 *) dst;
+  copy_src = (u64 *) src;
+  if (PREDICT_FALSE (n < DEFAULT_EXPORT_SIZE))
+    {
+      for (i = 0; i < n / 64; i++)
+	{
+	  copy_dst[0] = copy_src[0];
+	  copy_dst[1] = copy_src[1];
+	  copy_dst[2] = copy_src[2];
+	  copy_dst[3] = copy_src[3];
+	  copy_dst[4] = copy_src[4];
+	  copy_dst[5] = copy_src[5];
+	  copy_dst[6] = copy_src[6];
+	  copy_dst[7] = copy_src[7];
+	  copy_dst += 8;
+	  copy_src += 8;
+	}
+      return;
+    }
+  for (i = 0; i < 3; i++)
+    {
+      copy_dst[0] = copy_src[0];
+      copy_dst[1] = copy_src[1];
+      copy_dst[2] = copy_src[2];
+      copy_dst[3] = copy_src[3];
+      copy_dst[4] = copy_src[4];
+      copy_dst[5] = copy_src[5];
+      copy_dst[6] = copy_src[6];
+      copy_dst[7] = copy_src[7];
+      copy_dst += 8;
+      copy_src += 8;
+    }
+#endif
+}
+
+
+static uword
+vxlan_gpe_export_node_fn (vlib_main_t * vm,
+			  vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  ioam_export_main_t *em = &vxlan_gpe_ioam_export_main;
+  ioam_export_node_common (em, vm, node, frame, ip4_header_t, length,
+			   ip_version_and_header_length,
+			   EXPORT_NEXT_VXLAN_GPE_INPUT);
+  return frame->n_vectors;
+}
+
+/*
+ * Node for VXLAN-GPE export
+ */
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (export_node) =
+{
+  .function = vxlan_gpe_export_node_fn,
+  .name = "vxlan-gpe-ioam-export",
+  .vector_size = sizeof (u32),
+  .format_trace = format_export_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN (export_error_strings),
+  .error_strings = export_error_strings,
+  .n_next_nodes = EXPORT_N_NEXT,
+    /* edit / add dispositions here */
+    .next_nodes =
+  {[EXPORT_NEXT_VXLAN_GPE_INPUT] = "vxlan-gpe-pop-ioam-v4"},
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/export/ioam_export.api b/src/plugins/ioam/export/ioam_export.api
new file mode 100644
index 00000000..f22d9fc8
--- /dev/null
+++ b/src/plugins/ioam/export/ioam_export.api
@@ -0,0 +1,42 @@
+/* Hey Emacs use -*- mode: C -*- */
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Define a simple binary API to control the feature */
+
+define ioam_export_ip6_enable_disable {
+    /* Client identifier, set from api_main.my_client_index */
+    u32 client_index;
+
+    /* Arbitrary context, so client can match reply to request */
+    u32 context;
+
+    /* Enable / disable the feature */
+    u8 is_disable;
+
+    /* Collector ip address */
+    u8 collector_address[4];
+    u8 src_address[4];
+
+    /* Src ip address */
+};
+
+define ioam_export_ip6_enable_disable_reply {
+    /* From the request */
+    u32 context;
+
+    /* Return value, zero means all OK */
+    i32 retval;
+};
diff --git a/src/plugins/ioam/export/ioam_export.c b/src/plugins/ioam/export/ioam_export.c
new file mode 100644
index 00000000..b122e445
--- /dev/null
+++ b/src/plugins/ioam/export/ioam_export.c
@@ -0,0 +1,282 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * ioam_export.c - ioam export API / debug CLI handling
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/plugin/plugin.h>
+#include <ioam/export-common/ioam_export.h>
+
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vnet/ip/ip6_hop_by_hop.h>
+
+
+/* define message IDs */
+#include <ioam/export/ioam_export_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <ioam/export/ioam_export_all_api_h.h>
+#undef vl_typedefs
+
+/* define generated endian-swappers */
+#define vl_endianfun
+#include <ioam/export/ioam_export_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <ioam/export/ioam_export_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <ioam/export/ioam_export_all_api_h.h>
+#undef vl_api_version
+
+/*
+ * A handy macro to set up a message reply.
+ * Assumes that the following variables are available:
+ * mp - pointer to request message
+ * rmp - pointer to reply message type
+ * rv - return value
+ */
+
+#define REPLY_MACRO(t)                                          \
+do {                                                            \
+    unix_shared_memory_queue_t * q =                            \
+    vl_api_client_index_to_input_queue (mp->client_index);      \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+                                                                \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+
+/* List of message types that this plugin understands */
+
+#define foreach_ioam_export_plugin_api_msg                        \
+_(IOAM_EXPORT_IP6_ENABLE_DISABLE, ioam_export_ip6_enable_disable)
+
+/*
+ * This routine exists to convince the vlib plugin framework that
+ * we haven't accidentally copied a random .dll into the plugin directory.
+ *
+ * Also collects global variable pointers passed from the vpp engine
+ */
+
+clib_error_t *
+vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
+		      int from_early_init)
+{
+  ioam_export_main_t *em = &ioam_export_main;
+  clib_error_t *error = 0;
+
+  em->vlib_main = vm;
+  em->vnet_main = h->vnet_main;
+
+  return error;
+}
+
+/* Action function shared between message handler and debug CLI */
+
+int
+ioam_export_ip6_enable_disable (ioam_export_main_t * em,
+				u8 is_disable,
+				ip4_address_t * collector_address,
+				ip4_address_t * src_address)
+{
+  vlib_main_t *vm = em->vlib_main;
+
+  if (is_disable == 0)
+    {
+      if (1 == ioam_export_header_create (em, collector_address, src_address))
+	{
+	  ioam_export_thread_buffer_init (em, vm);
+	  ip6_hbh_set_next_override (em->my_hbh_slot);
+	  /* Turn on the export buffer check process */
+	  vlib_process_signal_event (vm, em->export_process_node_index, 1, 0);
+
+	}
+      else
+	{
+	  return (-2);
+	}
+    }
+  else
+    {
+      ip6_hbh_set_next_override (IP6_LOOKUP_NEXT_POP_HOP_BY_HOP);
+      ioam_export_header_cleanup (em, collector_address, src_address);
+      ioam_export_thread_buffer_free (em);
+      /* Turn off the export buffer check process */
+      vlib_process_signal_event (vm, em->export_process_node_index, 2, 0);
+
+    }
+
+  return 0;
+}
+
+/* API message handler */
+static void vl_api_ioam_export_ip6_enable_disable_t_handler
+  (vl_api_ioam_export_ip6_enable_disable_t * mp)
+{
+  vl_api_ioam_export_ip6_enable_disable_reply_t *rmp;
+  ioam_export_main_t *sm = &ioam_export_main;
+  int rv;
+
+  rv = ioam_export_ip6_enable_disable (sm, (int) (mp->is_disable),
+				       (ip4_address_t *)
+				       mp->collector_address,
+				       (ip4_address_t *) mp->src_address);
+
+  REPLY_MACRO (VL_API_IOAM_EXPORT_IP6_ENABLE_DISABLE_REPLY);
+}
+
+/* Set up the API message handling tables */
+static clib_error_t *
+ioam_export_plugin_api_hookup (vlib_main_t * vm)
+{
+  ioam_export_main_t *sm = &ioam_export_main;
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,					\
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_ioam_export_plugin_api_msg;
+#undef _
+
+  return 0;
+}
+
+#define vl_msg_name_crc_list
+#include <ioam/export/ioam_export_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (ioam_export_main_t * sm, api_main_t * am)
+{
+#define _(id,n,crc) \
+  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
+  foreach_vl_msg_name_crc_ioam_export;
+#undef _
+}
+
+static clib_error_t *
+set_ioam_export_ipfix_command_fn (vlib_main_t * vm,
+				  unformat_input_t * input,
+				  vlib_cli_command_t * cmd)
+{
+  ioam_export_main_t *em = &ioam_export_main;
+  ip4_address_t collector, src;
+  u8 is_disable = 0;
+
+  collector.as_u32 = 0;
+  src.as_u32 = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "collector %U", unformat_ip4_address, &collector))
+	;
+      else if (unformat (input, "src %U", unformat_ip4_address, &src))
+	;
+      else if (unformat (input, "disable"))
+	is_disable = 1;
+      else
+	break;
+    }
+
+  if (collector.as_u32 == 0)
+    return clib_error_return (0, "collector address required");
+
+  if (src.as_u32 == 0)
+    return clib_error_return (0, "src address required");
+
+  em->ipfix_collector.as_u32 = collector.as_u32;
+  em->src_address.as_u32 = src.as_u32;
+
+  vlib_cli_output (vm, "Collector %U, src address %U",
+		   format_ip4_address, &em->ipfix_collector,
+		   format_ip4_address, &em->src_address);
+
+  /* Turn on the export timer process */
+  // vlib_process_signal_event (vm, flow_report_process_node.index,
+  //1, 0);
+  ioam_export_ip6_enable_disable (em, is_disable, &collector, &src);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_ipfix_command, static) =
+{
+.path = "set ioam export ipfix",.short_help =
+    "set ioam export ipfix collector <ip4-address> src <ip4-address>",.
+    function = set_ioam_export_ipfix_command_fn,};
+/* *INDENT-ON* */
+
+
+static clib_error_t *
+ioam_export_init (vlib_main_t * vm)
+{
+  ioam_export_main_t *em = &ioam_export_main;
+  clib_error_t *error = 0;
+  u8 *name;
+  u32 node_index = export_node.index;
+  vlib_node_t *ip6_hbyh_node = NULL;
+
+  name = format (0, "ioam_export_%08x%c", api_version, 0);
+
+  /* Ask for a correctly-sized block of API message decode slots */
+  em->msg_id_base = vl_msg_api_get_msg_ids
+    ((char *) name, VL_MSG_FIRST_AVAILABLE);
+  em->unix_time_0 = (u32) time (0);	/* Store starting time */
+  em->vlib_time_0 = vlib_time_now (vm);
+
+  error = ioam_export_plugin_api_hookup (vm);
+
+  /* Add our API messages to the global name_crc hash table */
+  setup_message_id_table (em, &api_main);
+
+  /* Hook this export node to ip6-hop-by-hop */
+  ip6_hbyh_node = vlib_get_node_by_name (vm, (u8 *) "ip6-hop-by-hop");
+  em->my_hbh_slot = vlib_node_add_next (vm, ip6_hbyh_node->index, node_index);
+  vec_free (name);
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (ioam_export_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/export/ioam_export_all_api_h.h b/src/plugins/ioam/export/ioam_export_all_api_h.h
new file mode 100644
index 00000000..bc4368f2
--- /dev/null
+++ b/src/plugins/ioam/export/ioam_export_all_api_h.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Include the generated file, see BUILT_SOURCES in Makefile.am */
+#include <ioam/export/ioam_export.api.h>
diff --git a/src/plugins/ioam/export/ioam_export_msg_enum.h b/src/plugins/ioam/export/ioam_export_msg_enum.h
new file mode 100644
index 00000000..c2de7988
--- /dev/null
+++ b/src/plugins/ioam/export/ioam_export_msg_enum.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_ioam_export_msg_enum_h
+#define included_ioam_export_msg_enum_h
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum {
+#include <ioam/export/ioam_export_all_api_h.h>
+    /* We'll want to know how many messages IDs we need... */
+    VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif /* included_ioam_export_msg_enum_h */
diff --git a/src/plugins/ioam/export/ioam_export_test.c b/src/plugins/ioam/export/ioam_export_test.c
new file mode 100644
index 00000000..f991fc0c
--- /dev/null
+++ b/src/plugins/ioam/export/ioam_export_test.c
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * ioam_export_test.c - test harness plugin
+ *------------------------------------------------------------------
+ */
+
+#include <vat/vat.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vppinfra/error.h>
+
+
+/* Declare message IDs */
+#include <ioam/export/ioam_export_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <ioam/export/ioam_export_all_api_h.h>
+#undef vl_typedefs
+
+/* declare message handlers for each api */
+
+#define vl_endianfun		/* define message structures */
+#include <ioam/export/ioam_export_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <ioam/export/ioam_export_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number. */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <ioam/export/ioam_export_all_api_h.h>
+#undef vl_api_version
+
+
+typedef struct
+{
+  /* API message ID base */
+  u16 msg_id_base;
+  vat_main_t *vat_main;
+} export_test_main_t;
+
+export_test_main_t export_test_main;
+
+#define foreach_standard_reply_retval_handler   \
+_(ioam_export_ip6_enable_disable_reply)
+
+#define _(n)                                            \
+    static void vl_api_##n##_t_handler                  \
+    (vl_api_##n##_t * mp)                               \
+    {                                                   \
+        vat_main_t * vam = export_test_main.vat_main;   \
+        i32 retval = ntohl(mp->retval);                 \
+        if (vam->async_mode) {                          \
+            vam->async_errors += (retval < 0);          \
+        } else {                                        \
+            vam->retval = retval;                       \
+            vam->result_ready = 1;                      \
+        }                                               \
+    }
+foreach_standard_reply_retval_handler;
+#undef _
+
+/*
+ * Table of message reply handlers, must include boilerplate handlers
+ * we just generated
+ */
+#define foreach_vpe_api_reply_msg                                       \
+_(IOAM_EXPORT_IP6_ENABLE_DISABLE_REPLY, ioam_export_ip6_enable_disable_reply)
+
+
+/* M: construct, but don't yet send a message */
+
+#define M(T,t)                                                  \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp));                         \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+#define M2(T,t,n)                                               \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+/* S: send a message */
+#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
+
+/* W: wait for results, with timeout */
+#define W                                       \
+do {                                            \
+    timeout = vat_time_now (vam) + 1.0;         \
+                                                \
+    while (vat_time_now (vam) < timeout) {      \
+        if (vam->result_ready == 1) {           \
+            return (vam->retval);               \
+        }                                       \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
+static int
+api_ioam_export_ip6_enable_disable (vat_main_t * vam)
+{
+  export_test_main_t *sm = &export_test_main;
+  unformat_input_t *i = vam->input;
+  f64 timeout;
+  int is_disable = 0;
+  vl_api_ioam_export_ip6_enable_disable_t *mp;
+
+  /* Parse args required to build the message */
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "disable"))
+	is_disable = 1;
+      else
+	break;
+    }
+
+  /* Construct the API message */
+  M (IOAM_EXPORT_IP6_ENABLE_DISABLE, ioam_export_ip6_enable_disable);
+  mp->is_disable = is_disable;
+
+  /* send it... */
+  S;
+
+  /* Wait for a reply... */
+  W;
+}
+
+/*
+ * List of messages that the api test plugin sends,
+ * and that the data plane plugin processes
+ */
+#define foreach_vpe_api_msg \
+_(ioam_export_ip6_enable_disable, "<intfc> [disable]")
+
+void
+vat_api_hookup (vat_main_t * vam)
+{
+  export_test_main_t *sm = &export_test_main;
+  /* Hook up handlers for replies from the data plane plug-in */
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,                                  \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_reply_msg;
+#undef _
+
+  /* API messages we can send */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+  foreach_vpe_api_msg;
+#undef _
+
+  /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+  foreach_vpe_api_msg;
+#undef _
+}
+
+clib_error_t *
+vat_plugin_register (vat_main_t * vam)
+{
+  export_test_main_t *sm = &export_test_main;
+  u8 *name;
+
+  sm->vat_main = vam;
+
+  name = format (0, "ioam_export_%08x%c", api_version, 0);
+  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  if (sm->msg_id_base != (u16) ~ 0)
+    vat_api_hookup (vam);
+
+  vec_free (name);
+
+  return 0;
+}
diff --git a/src/plugins/ioam/export/ioam_export_thread.c b/src/plugins/ioam/export/ioam_export_thread.c
new file mode 100644
index 00000000..d2eb2009
--- /dev/null
+++ b/src/plugins/ioam/export/ioam_export_thread.c
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * ioam_export_thread.c
+ */
+#include <vnet/api_errno.h>
+#include <vppinfra/pool.h>
+#include <ioam/export-common/ioam_export.h>
+
+static vlib_node_registration_t ioam_export_process_node;
+
+static uword
+ioam_export_process (vlib_main_t * vm,
+		     vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+   return (ioam_export_process_common(&ioam_export_main,
+                                      vm, rt, f,
+                                      ioam_export_process_node.index));
+}
+
+VLIB_REGISTER_NODE (ioam_export_process_node, static) =
+{
+ .function = ioam_export_process,
+ .type = VLIB_NODE_TYPE_PROCESS,
+ .name = "ioam-export-process",
+};
diff --git a/src/plugins/ioam/export/node.c b/src/plugins/ioam/export/node.c
new file mode 100644
index 00000000..19f143df
--- /dev/null
+++ b/src/plugins/ioam/export/node.c
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+#include <vnet/ip/ip.h>
+#include <ioam/export-common/ioam_export.h>
+
+typedef struct
+{
+  u32 next_index;
+  u32 flow_label;
+} export_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_export_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  export_trace_t *t = va_arg (*args, export_trace_t *);
+
+  s = format (s, "EXPORT: flow_label %d, next index %d",
+	      t->flow_label, t->next_index);
+  return s;
+}
+
+vlib_node_registration_t export_node;
+
+#define foreach_export_error \
+_(RECORDED, "Packets recorded for export")
+
+typedef enum
+{
+#define _(sym,str) EXPORT_ERROR_##sym,
+  foreach_export_error
+#undef _
+    EXPORT_N_ERROR,
+} export_error_t;
+
+static char *export_error_strings[] = {
+#define _(sym,string) string,
+  foreach_export_error
+#undef _
+};
+
+typedef enum
+{
+  EXPORT_NEXT_POP_HBYH,
+  EXPORT_N_NEXT,
+} export_next_t;
+
+always_inline void
+copy3cachelines (void *dst, const void *src, size_t n)
+{
+#if 0
+  if (PREDICT_FALSE (n < DEFAULT_EXPORT_SIZE))
+    {
+      /* Copy only the first 1/2 cache lines whatever is available */
+      if (n >= 64)
+	clib_mov64 ((u8 *) dst, (const u8 *) src);
+      if (n >= 128)
+	clib_mov64 ((u8 *) dst + 64, (const u8 *) src + 64);
+      return;
+    }
+  clib_mov64 ((u8 *) dst, (const u8 *) src);
+  clib_mov64 ((u8 *) dst + 64, (const u8 *) src + 64);
+  clib_mov64 ((u8 *) dst + 128, (const u8 *) src + 128);
+#endif
+#if 1
+
+  u64 *copy_dst, *copy_src;
+  int i;
+  copy_dst = (u64 *) dst;
+  copy_src = (u64 *) src;
+  if (PREDICT_FALSE (n < DEFAULT_EXPORT_SIZE))
+    {
+      for (i = 0; i < n / 64; i++)
+	{
+	  copy_dst[0] = copy_src[0];
+	  copy_dst[1] = copy_src[1];
+	  copy_dst[2] = copy_src[2];
+	  copy_dst[3] = copy_src[3];
+	  copy_dst[4] = copy_src[4];
+	  copy_dst[5] = copy_src[5];
+	  copy_dst[6] = copy_src[6];
+	  copy_dst[7] = copy_src[7];
+	  copy_dst += 8;
+	  copy_src += 8;
+	}
+      return;
+    }
+  for (i = 0; i < 3; i++)
+    {
+      copy_dst[0] = copy_src[0];
+      copy_dst[1] = copy_src[1];
+      copy_dst[2] = copy_src[2];
+      copy_dst[3] = copy_src[3];
+      copy_dst[4] = copy_src[4];
+      copy_dst[5] = copy_src[5];
+      copy_dst[6] = copy_src[6];
+      copy_dst[7] = copy_src[7];
+      copy_dst += 8;
+      copy_src += 8;
+    }
+#endif
+}
+
+static uword
+ip6_export_node_fn (vlib_main_t * vm,
+		    vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  ioam_export_main_t *em = &ioam_export_main;
+  ioam_export_node_common(em, vm, node, frame, ip6_header_t, payload_length,
+                          ip_version_traffic_class_and_flow_label, 
+                          EXPORT_NEXT_POP_HBYH);
+  return frame->n_vectors;
+}
+
+/*
+ * Node for IP6 export
+ */
+VLIB_REGISTER_NODE (export_node) =
+{
+  .function = ip6_export_node_fn,
+  .name = "ip6-export",
+  .vector_size = sizeof (u32),
+  .format_trace = format_export_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN (export_error_strings),
+  .error_strings = export_error_strings,
+  .n_next_nodes = EXPORT_N_NEXT,
+  /* edit / add dispositions here */
+  .next_nodes =
+  {
+    [EXPORT_NEXT_POP_HBYH] = "ip6-pop-hop-by-hop"
+  },
+};
diff --git a/src/plugins/ioam/ioam_plugin_doc.md b/src/plugins/ioam/ioam_plugin_doc.md
new file mode 100644
index 00000000..343abcf7
--- /dev/null
+++ b/src/plugins/ioam/ioam_plugin_doc.md
@@ -0,0 +1,464 @@
+## VPP Inband OAM (iOAM)    {#ioam_plugin_doc}
+
+In-band OAM (iOAM) is an implementation study to record operational
+information in the packet while the packet traverses a path between
+two points in the network.
+
+Overview of iOAM can be found in [iOAM-Devnet] page.
+The following IETF drafts detail the motivation and mechanism for
+recording operational information:
+ - [iOAM-ietf-requirements] - Describes motivation and usecases for iOAM
+ - [iOAM-ietf-data] - Describes data records that can be collected using iOAM
+ - [iOAM-ietf-transport] - Lists out the transport protocols
+ and mechanism to carry iOAM data records
+ - [iOAM-ietf-proof-of-transit] - Describes the idea of Proof of Transit (POT)
+ and mechanisms to operationalize the idea
+
+## Terminology
+In-band OAM is expected to be deployed in a specific domain rather
+than on the overall Internet. The part of the network which employs in-band OAM
+is referred to as **"in-band OAM-domain"**.
+
+In-band OAM data is added to a packet on entering the in-band OAM-domain
+and is removed from the packet when exiting the domain.
+Within the in-band OAM-domain, network nodes that the packet traverses
+may update the in-band OAM data records.
+
+- The node which adds in-band OAM data to the packet is called the
+**"in-band OAM encapsulating node"**.
+
+- The node which removes the in-band OAM data is referred to as the
+**"in-band OAM decapsulating node"**.
+
+- Nodes within the domain which are aware of in-band OAM data and read
+and/or write or process the in-band OAM data are called
+**"in-band OAM transit nodes"**.
+
+## Features supported in the current release
+VPP can function as in-band OAM encapsulating, transit and decapsulating node.
+In this version of VPP in-band OAM data is transported as options in an
+IPv6 hop-by-hop extension header. Hence in-band OAM can be enabled
+for IPv6 traffic.
+
+The following iOAM features are supported:
+
+- **In-band OAM Tracing** : In-band OAM supports multiple data records to be
+recorded in the packet as the packet traverses the network.
+These data records offer insights into the operational behavior of the network.
+The following information can be collected in the tracing
+data from the nodes a packet traverses:
+  - Node ID
+  - Ingress interface ID
+  - Egress interface ID
+  - Timestamp
+  - Pre-configured application data
+
+- **In-band OAM Proof of Transit (POT)**: Proof of transit iOAM data is
+added to every packet for verifying that a packet traverses a specific
+set of nodes.
+In-band OAM data is updated at every node that is enabled with iOAM
+proof of transit and is used to verify whether a packet traversed
+all the specified nodes. When the verifier receives each packet,
+it can validate whether the packet traversed the specified nodes.
+
+
+## Configuration
+Configuring iOAM involves:
+- Selecting the packets for which iOAM data must be inserted, updated or removed
+  - Selection of packets for iOAM data insertion on iOAM encapsulating node.
+  Selection of packets is done by 5-tuple based classification
+  - Selection of packets for updating iOAM data is implicitly done on the
+  presence of iOAM options in the packet
+  - Selection of packets for removing the iOAM data is done on 5-tuple
+  based classification
+- The kind of data to be collected
+  - Tracing data
+  - Proof of transit
+- Additional details for processing iOAM data to be collected
+  - For trace data - trace type, number of nodes to be recorded in the trace,
+  time stamp precision, etc.
+  - For POT data - configuration of POT profile required to process the POT data
+
+The CLI for configuring iOAM is explained here followed by detailed steps
+and examples to deploy iOAM on VPP as an encapsulating, transit or
+decapsulating iOAM node in the subsequent sub-sections.
+
+VPP iOAM configuration for enabling trace and POT is as follows:
+
+    set ioam rewrite trace-type <0x1f|0x7|0x9|0x11|0x19>
+    trace-elts <number of trace elements> trace-tsp <0|1|2|3>
+    node-id <node ID in hex> app-data <application data in hex> [pot]
+
+A description of each of the options of the CLI follows:
+- trace-type : An entry in the "Node data List" array of the trace option
+can have different formats, following the needs of the a deployment.
+For example: Some deployments might only be interested
+in recording the node identifiers, whereas others might be interested
+in recording node identifier and timestamp.
+The following types are currently supported:
+    - 0x1f : Node data to include hop limit (8 bits), node ID (24 bits),
+    ingress and egress interface IDs (16 bits each), timestamp (32 bits),
+    application data (32 bits)
+    - 0x7 : Node data to include hop limit (8 bits), node ID (24 bits),
+    ingress and egress interface IDs (16 bits each)
+    - 0x9 : Node data to include hop limit (8 bits), node ID (24 bits),
+    timestamp (32 bits)
+    - 0x11: Node data to include hop limit (8 bits), node ID (24 bits),
+    application data (32 bits)
+    - 0x19: Node data to include hop limit (8 bits), node ID (24 bits),
+    timestamp (32 bits), application data (32 bits)
+- trace-elts : Defines the length of the node data array in the trace option.
+- trace-tsp : Defines the timestamp precision to use with the enumerated value
+              for precision as follows:
+    - 0 : 32bits timestamp in seconds
+    - 1 : 32bits timestamp in milliseconds
+    - 2 : 32bits timestamp in microseconds
+    - 3 : 32bits timestamp in nanoseconds
+- node-id : Unique identifier for the node, included in the node ID
+  field of the node data in trace option.
+- app-data : The value configured here is included as is in
+application data field of node data in trace option.
+- pot : Enables POT option to be included in the iOAM options.
+
+### Trace configuration
+
+#### On in-band OAM encapsulating node
+ - **Configure classifier and apply ACL** to select packets for
+ iOAM data insertion
+    - Example to enable iOAM data insertion for all the packets
+    towards IPv6 address db06::06:
+
+    vpp# classify table miss-next node ip6-lookup mask l3 ip6 dst
+    
+    vpp# classify session acl-hit-next node ip6-add-hop-by-hop
+    table-index 0 match l3 ip6 dst db06::06
+    
+    vpp# set int input acl intfc GigabitEthernet0/0/0 ip6-table 0
+    
+ - **Enable tracing** : Specify node ID, maximum number of nodes for which
+ trace data should be recorded, type of data to be included for recording,
+ optionally application data to be included
+    - Example to enable tracing with a maximum of 4 nodes recorded
+    and the data to be recorded to include - hop limit, node id,
+    ingress and egress interface IDs, timestamp (millisecond precision),
+    application data (0x1234):
+
+
+    vpp# set ioam rewrite trace-type 0x1f trace-elts 4 trace-tsp 1
+    node-id 0x1 app-data 0x1234
+
+
+
+#### On in-band OAM transit node
+- The transit node requires trace type, timestamp precision, node ID and
+optionally application data to be configured,
+to update its node data in the trace option.
+
+Example:  
+
+    vpp# set ioam rewrite trace-type 0x1f trace-elts 4 trace-tsp 1  
+    node-id 0x2 app-data 0x1234  
+
+#### On the In-band OAM decapsulating node
+- The decapsulating node similar to encapsulating node requires
+**classification** of the packets to remove iOAM data from.
+    - Example to decapsulate iOAM data for packets towards
+    db06::06, configure classifier and enable it as an ACL as follows:
+
+
+    vpp# classify table miss-next node ip6-lookup mask l3 ip6 dst
+
+    vpp# classify session acl-hit-next node ip6-lookup table-index 0
+    match l3 ip6 dst db06::06 opaque-index 100
+
+    vpp# set int input acl intfc GigabitEthernet0/0/0 ip6-table 0
+
+
+- Decapsulating node requires trace type, timestamp precision,
+node ID and optionally application data to be configured,
+to update its node data in the trace option before it is decapsulated.
+
+Example:  
+
+    vpp# set ioam rewrite trace-type 0x1f trace-elts 4  
+    trace-tsp 1 node-id 0x3 app-data 0x1234  
+
+
+### Proof of Transit configuration
+
+For details on proof-of-transit,
+see the IETF draft [iOAM-ietf-proof-of-transit].
+To enable Proof of Transit all the nodes that participate
+and hence are verified for transit need a proof of transit profile.
+A script to generate a proof of transit profile as per the mechanism
+described in [iOAM-ietf-proof-of-transit] will be available at [iOAM-Devnet].
+
+The Proof of transit mechanism implemented here is based on
+Shamir's Secret Sharing algorithm.
+The overall algorithm uses two polynomials 
+POLY-1 and POLY-2. The degree of polynomials depends on number of nodes
+to be verified for transit.
+POLY-1 is secret and constant. Each node gets a point on POLY-1
+at setup-time and keeps it secret.
+POLY-2 is public, random and per packet.
+Each node is assigned a point on POLY-1 and POLY-2 with the same x index.
+Each node derives its point on POLY-2 each time a packet arrives at it.
+A node then contributes its points on POLY-1 and POLY-2 to construct
+POLY-3 (POLY-3 = POLY-1 + POLY-2) using lagrange extrapolation and
+forwards it towards the verifier by updating POT data in the packet.
+The verifier constructs POLY-3 from the accumulated value from all the nodes
+and its own points on POLY-1 and POLY-2 and verifies whether
+POLY-3 = POLY-1 + POLY-2.  Only the verifier knows POLY-1.
+The solution leverages finite field arithmetic in a field of size "prime number"
+for reasons explained in description of Shamir's secret sharing algorithm.
+
+Here is an explanation of POT profile list and profile configuration CLI to
+realize the above mechanism.
+It is best to use the script provided at [iOAM-Devnet] to generate
+this configuration.
+- **Create POT profile** : set pot profile name <string> id [0-1]  
+[validator-key 0xu64] prime-number 0xu64 secret_share 0xu64  
+lpc 0xu64 polynomial2 0xu64 bits-in-random [0-64]  
+    - name : Profile list name.
+    - id : Profile id, it can be 0 or 1.
+    A maximum of two profiles can be configured per profile list.
+    - validator-key : Secret key configured only on the
+    verifier/decapsulating node used to compare and verify proof of transit.
+    - prime-number : Prime number for finite field arithmetic as required by the
+    proof of transit mechanism.
+    - secret_share : Unique point for each node on the secret polynomial POLY-1.
+    - lpc : Lagrange Polynomial Constant(LPC) calculated per node based on
+    its point (x value used for evaluating the points on the polynomial)
+    on the polynomial used in lagrange extrapolation
+    for reconstructing polynomial (POLY-3).
+    - polynomial2 : Is the pre-evaluated value of the point on
+    2nd polynomial(POLY-2). This is unique for each node.
+    It is pre-evaluated for all the coefficients of POLY-2 except
+    for the constant part of the polynomial that changes per packet
+    and is received as part of the POT data in the packet.
+    - bits-in-random : To control the size of the random number to be
+    generated. This number has to match the other numbers generated and used
+    in the profile as per the algorithm.
+
+- **Set a configured profile as active/in-use** :  
+set pot profile-active name <string> ID [0-1]  
+    - name : Name of the profile list to be used for computing
+    POT data per packet.
+    - ID : Identifier of the profile within the list to be used.
+
+#### On In-band OAM encapsulating node
+ - Configure the classifier and apply ACL to select packets for iOAM data insertion.
+    - Example to enable iOAM data insertion for all the packet towards
+    IPv6 address db06::06 -
+
+
+    vpp# classify table miss-next node ip6-lookup mask l3 ip6 dst
+
+    vpp# classify session acl-hit-next node
+    ip6-add-hop-by-hop table-index 0 match l3 ip6 dst db06::06
+
+    vpp# set int input acl intfc GigabitEthernet0/0/0 ip6-table 0
+
+
+ - Configure the proof of transit profile list with profiles.
+Each profile list referred to by a name can contain 2 profiles,
+only one is in use for updating proof of transit data at any time.
+    - Example profile list example with a profile generated from the
+    script to verify transit through 3 nodes is:
+
+
+    vpp# set pot profile name example id 0 prime-number 0x7fff0000fa884685
+    secret_share 0x6c22eff0f45ec56d lpc 0x7fff0000fa884682
+    polynomial2 0xffb543d4a9c bits-in-random 63
+
+ - Enable one of the profiles from the configured profile list as active
+ so that is will be used for calculating proof of transit
+
+Example enable profile ID 0 from profile list example configured above:
+
+
+    vpp# set pot profile-active name example ID 0
+
+
+ - Enable POT option to be inserted
+
+
+    vpp# set ioam rewrite pot
+
+
+#### On in-band OAM transit node
+ - Configure the proof of transit profile list with profiles for transit node.
+Example:
+
+
+    vpp# set pot profile name example id 0 prime-number 0x7fff0000fa884685
+    secret_share 0x564cdbdec4eb625d lpc 0x1
+    polynomial2 0x23f3a227186a bits-in-random 63
+
+#### On in-band OAM decapsulating node / verifier
+- The decapsulating node, similar to the encapsulating node requires
+classification of the packets to remove iOAM data from.
+    - Example to decapsulate iOAM data for packets towards db06::06
+    configure classifier and enable it as an ACL as follows:
+
+
+    vpp# classify table miss-next node ip6-lookup mask l3 ip6 dst
+
+    vpp# classify session acl-hit-next node ip6-lookup table-index 0
+    match l3 ip6 dst db06::06 opaque-index 100
+
+    vpp# set int input acl intfc GigabitEthernet0/0/0 ip6-table 0
+
+- To update and verify the proof of transit, POT profile list should be configured.
+    - Example POT profile list configured as follows:
+
+    vpp# set pot profile name example id 0 validate-key 0x7fff0000fa88465d
+    prime-number 0x7fff0000fa884685 secret_share 0x7a08fbfc5b93116d lpc 0x3
+    polynomial2 0x3ff738597ce bits-in-random 63
+
+## Operational data
+
+Following CLIs are available to check iOAM operation:
+- To check iOAM configuration that are effective use "show ioam summary"  
+
+Example:
+
+    vpp# show ioam summary  
+                  REWRITE FLOW CONFIGS - Not configured  
+     HOP BY HOP OPTIONS - TRACE CONFIG -  
+                            Trace Type : 0x1f (31)  
+             Trace timestamp precision : 1 (Milliseconds)  
+                    Num of trace nodes : 4  
+                               Node-id : 0x2 (2)  
+                              App Data : 0x1234 (4660)  
+                            POT OPTION - 1 (Enabled)  
+    Try 'show ioam pot and show pot profile' for more information  
+
+- To find statistics about packets for which iOAM options were
+added (encapsulating node) and removed (decapsulating node) execute
+*show errors*
+
+Example on encapsulating node:
+
+
+    vpp# show error
+       Count                    Node                  Reason
+    1208804706                ip6-inacl               input ACL hits
+    1208804706           ip6-add-hop-by-hop           Pkts w/ added ip6 hop-by-hop options
+    
+Example on decapsulating node:
+
+    vpp# show error
+       Count                    Node                  Reason
+      69508569                ip6-inacl               input ACL hits
+      69508569           ip6-pop-hop-by-hop           Pkts w/ removed ip6 hop-by-hop options
+
+- To check the POT profiles use "show pot profile"
+
+Example:
+
+    vpp# show pot profile
+    Profile list in use  : example
+    POT Profile at index: 0
+                     ID : 0
+              Validator : False (0)
+           Secret share : 0x564cdbdec4eb625d (6218586935324795485)
+           Prime number : 0x7fff0000fa884685 (9223090566081300101)
+    2nd polynomial(eval) : 0x23f3a227186a (39529304496234)
+                     LPC : 0x1 (1)
+               Bit mask : 0x7fffffffffffffff (9223372036854775807)
+    Profile index in use: 0
+    Pkts passed : 0x36 (54)
+
+- To get statistics  of POT for packets use "show ioam pot"
+
+Example at encapsulating or transit node:
+
+    vpp# show ioam pot
+     Pkts with ip6 hop-by-hop POT options - 54
+     Pkts with ip6 hop-by-hop POT options but no profile set - 0
+     Pkts with POT in Policy - 0
+     Pkts with POT out of Policy - 0
+    
+
+Example at decapsulating/verification node:
+
+
+    vpp# show ioam pot
+     Pkts with ip6 hop-by-hop POT options - 54
+     Pkts with ip6 hop-by-hop POT options but no profile set - 0
+     Pkts with POT in Policy - 54
+     Pkts with POT out of Policy - 0
+    
+- Tracing - enable trace of IPv6 packets to view the data inserted and
+collected.
+
+Example when the nodes are receiving data over a DPDK interface:
+Enable tracing using "trace add dpdk-input 20" and
+execute "show trace" to view the iOAM data collected:
+
+  
+    vpp# trace add dpdk-input 20  
+      
+    vpp# show trace
+    
+    ------------------- Start of thread 0 vpp_main -------------------  
+    
+    Packet 1  
+      
+    00:00:19:294697: dpdk-input  
+      GigabitEthernetb/0/0 rx queue 0  
+      buffer 0x10e6b: current data 0, length 214, free-list 0, totlen-nifb 0, trace 0x0  
+      PKT MBUF: port 0, nb_segs 1, pkt_len 214  
+        buf_len 2176, data_len 214, ol_flags 0x0, data_off 128, phys_addr 0xe9a35a00  
+        packet_type 0x0  
+      IP6: 00:50:56:9c:df:72 -> 00:50:56:9c:be:55  
+      IP6_HOP_BY_HOP_OPTIONS: db05::2 -> db06::6  
+        tos 0x00, flow label 0x0, hop limit 63, payload length 160  
+    00:00:19:294737: ethernet-input  
+      IP6: 00:50:56:9c:df:72 -> 00:50:56:9c:be:55  
+    00:00:19:294753: ip6-input  
+      IP6_HOP_BY_HOP_OPTIONS: db05::2 -> db06::6  
+        tos 0x00, flow label 0x0, hop limit 63, payload length 160  
+    00:00:19:294757: ip6-lookup  
+      fib 0 adj-idx 15 : indirect via db05::2 flow hash: 0x00000000  
+      IP6_HOP_BY_HOP_OPTIONS: db05::2 -> db06::6  
+        tos 0x00, flow label 0x0, hop limit 63, payload length 160  
+    00:00:19:294802: ip6-hop-by-hop  
+      IP6_HOP_BY_HOP: next index 5 len 96 traced 96  Trace Type 0x1f , 1 elts left  
+        [0] ttl 0x0 node ID 0x0 ingress 0x0 egress 0x0 ts 0x0  
+    app 0x0  
+        [1] ttl 0x3e node ID 0x3 ingress 0x1 egress 0x2 ts 0xb68c2213  
+    app 0x1234  
+        [2] ttl 0x3f node ID 0x2 ingress 0x1 egress 0x2 ts 0xb68c2204  
+    app 0x1234  
+        [3] ttl 0x40 node ID 0x1 ingress 0x5 egress 0x6 ts 0xb68c2200  
+    app 0x1234  
+        POT opt present  
+             random = 0x577a916946071950, Cumulative = 0x10b46e78a35a392d, Index = 0x0  
+    00:00:19:294810: ip6-rewrite  
+      tx_sw_if_index 1 adj-idx 14 : GigabitEthernetb/0/0  
+                                    IP6: 00:50:56:9c:be:55 -> 00:50:56:9c:df:72 flow hash: 0x00000000  
+      IP6: 00:50:56:9c:be:55 -> 00:50:56:9c:df:72  
+      IP6_HOP_BY_HOP_OPTIONS: db05::2 -> db06::6  
+        tos 0x00, flow label 0x0, hop limit 62, payload length 160  
+    00:00:19:294814: GigabitEthernetb/0/0-output  
+      GigabitEthernetb/0/0  
+      IP6: 00:50:56:9c:be:55 -> 00:50:56:9c:df:72  
+      IP6_HOP_BY_HOP_OPTIONS: db05::2 -> db06::6  
+        tos 0x00, flow label 0x0, hop limit 62, payload length 160  
+    00:00:19:294820: GigabitEthernetb/0/0-tx    
+      GigabitEthernetb/0/0 tx queue 0    
+      buffer 0x10e6b: current data 0, length 214, free-list 0, totlen-nifb 0, trace 0x0    
+      IP6: 00:50:56:9c:be:55 -> 00:50:56:9c:df:72
+      
+      IP6_HOP_BY_HOP_OPTIONS: db05::2 -> db06::6
+      
+        tos 0x00, flow label 0x0, hop limit 62, payload length 160  
+    
+
+[iOAM-Devnet]: <https://github.com/ciscodevnet/iOAM>
+[iOAM-ietf-requirements]:<https://tools.ietf.org/html/draft-brockners-inband-oam-requirements-01>
+[iOAM-ietf-transport]:<https://tools.ietf.org/html/draft-brockners-inband-oam-transport-01>
+[iOAM-ietf-data]:<https://tools.ietf.org/html/draft-brockners-inband-oam-data-01>
+[iOAM-ietf-proof-of-transit]:<https://tools.ietf.org/html/draft-brockners-proof-of-transit-01>
diff --git a/src/plugins/ioam/lib-pot/math64.h b/src/plugins/ioam/lib-pot/math64.h
new file mode 100644
index 00000000..4c608a37
--- /dev/null
+++ b/src/plugins/ioam/lib-pot/math64.h
@@ -0,0 +1,159 @@
+/* 
+ * math64.h provides the 64 bit unsigned integer add, multiply followed by  modulo operation
+ * The linux/math64.h provides divide and multiply 64 bit integers but:
+ * 1. multiply: mul_u64_u64_shr - only returns 64 bits of the result and has to be called
+ *                     twice to get the complete 128 bits of the result.
+ * 2. Modulo operation of the result of  addition and multiplication of u64 that may result 
+ *                        in integers > 64 bits is not supported
+ * Hence this header to combine add/multiply followed by modulo of u64 integrers
+ * always resulting in u64.
+ * 
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef include_vnet_math64_h
+#define include_vnet_math64_h
+#include <stdint.h>
+
+/* 
+ * multiplies and returns result in hi and lo 
+ */
+static inline void mul64by64(u64 a, u64 b, u64 * hi, u64 * lo)
+{
+    u64 a_lo = (u64) (uint32_t) a;
+    u64 a_hi = a >> 32;
+    u64 b_lo = (u64) (u32) b;
+    u64 b_hi = b >> 32;
+
+    u64 p0 = a_lo * b_lo;
+    u64 p1 = a_lo * b_hi;
+    u64 p2 = a_hi * b_lo;
+    u64 p3 = a_hi * b_hi;
+
+    u32 cy = (u32) (((p0 >> 32) + (u32) p1 + (u32) p2) >> 32);
+
+    *lo = p0 + (p1 << 32) + (p2 << 32);
+    *hi = p3 + (p1 >> 32) + (p2 >> 32) + cy;
+    return;
+}
+
+#define TWO64 18446744073709551616.0
+
+static inline u64 mod128by64(u64 x, u64 y, u64 m, double di)
+{
+    u64 q1, q2, q;
+    u64 p1, p0;
+    double dq;
+
+    /* calculate quotient first pass 53 bits */
+    dq = (TWO64 * (double)x + (double)y) * di;
+
+    if (dq >= TWO64)
+        q1 = 0xfffffffffffff800L;
+    else
+        q1 = dq;
+
+    /* q1 * m to compare the product to the dividend.  */
+    mul64by64(q1, m, &p1, &p0);
+
+    /* Adjust quotient. is it > actual result: */
+    if (x < p1 || (x == p1 && y < p0))
+    {
+        /* q1 > quotient.  calculate abs remainder */
+        x = p1 - (x + (p0 < y));
+        y = p0 - y;
+
+        /* use the remainder as new dividend to adjust quotient */
+        q2 = (u64) ((TWO64 * (double)x + (double)y) * di);
+        mul64by64(q2, m, &p1, &p0);
+
+        q = q1 - q2;
+        if (x < p1 || (x == p1 && y <= p0))
+        {
+            y = p0 - y;
+        }
+        else
+        {
+            y = p0 - y;
+            y += m;
+            q--;
+        }
+    }
+    else
+    {
+        x = x - (p1 + (y < p0));
+        y = y - p0;
+
+        q2 = (u64) ((TWO64 * (double)x + (double)y) * di);
+        mul64by64(q2, m, &p1, &p0);
+
+        q = q1 + q2;
+        if (x < p1 || (x == p1 && y < p0))
+        {
+            y = y - p0;
+            y += m;
+            q--;
+        }
+        else
+        {
+            y = y - p0;
+            if (y >= m)
+            {
+                y -= m;
+                q++;
+            }
+        }
+    }
+
+    return y;
+}
+
+/* 
+ * returns a % p
+ */
+static inline u64 mod64by64(u64 a, u64 p, u64 primeinv)
+{
+    return (mod128by64(0, a, p, primeinv));
+}
+
+static inline void add64(u64 a, u64 b, u64 * whi, u64 * wlo)
+{
+    *wlo = a + b;
+    if (*wlo < a)
+        *whi = 1;
+
+}
+
+/* 
+ * returns (a + b)%p
+ */
+static inline u64 add64_mod(u64 a, u64 b, u64 p, double pi)
+{
+    u64 shi = 0, slo = 0;
+
+    add64(a, b, &shi, &slo);
+    return (mod128by64(shi, slo, p, pi));
+}
+
+/* 
+ * returns (ab) % p
+ */
+static inline u64 mul64_mod(u64 a, u64 b, u64 p, double pi)
+{
+    u64 phi = 0, plo = 0;
+
+    mul64by64(a, b, &phi, &plo);
+    return (mod128by64(phi, plo, p, pi));
+}
+
+#endif
diff --git a/src/plugins/ioam/lib-pot/pot.api b/src/plugins/ioam/lib-pot/pot.api
new file mode 100644
index 00000000..fa2fc126
--- /dev/null
+++ b/src/plugins/ioam/lib-pot/pot.api
@@ -0,0 +1,133 @@
+/* Hey Emacs use -*- mode: C -*- */
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/** \brief Proof of Transit(POT): Set POT profile
+    @param id - id of the profile 
+    @param validator - True/False to indicate if this is verifier
+    @param secret_key - Verification key
+    @param secret_share - Share of the 1st polynomial
+    @param prime - Prime number used for modulo operation
+    @param max_bits - Max bits to be used for Random number generation
+    @param lpc - Lagrange basis polynomial
+    @param polynomial_public - pre-evaluated public polynomial 
+    @param list_name_len - length of the name of this profile list
+    @param list_name - name of this profile list
+*/
+define pot_profile_add {
+  u32 client_index;
+  u32 context;
+  u8 id;
+  u8 validator;
+  u64 secret_key;
+  u64 secret_share;
+  u64 prime;
+  u8  max_bits;
+  u64 lpc;
+  u64 polynomial_public;
+  u8 list_name_len;
+  u8 list_name[0];
+};
+
+/** \brief Proof of Transit profile add / del response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define pot_profile_add_reply {
+    u32 context;
+    i32 retval;
+};
+
+
+/** \brief Proof of Transit(POT): Activate POT profile in the list
+    @param id - id of the profile 
+    @param list_name_len - length of the name of this profile list
+    @param list_name - name of this profile list
+*/
+define pot_profile_activate {
+  u32 client_index;
+  u32 context;
+  u8 id;
+  u8 list_name_len;
+  u8 list_name[0];
+};
+
+/** \brief Proof of Transit profile activate response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request 
+*/
+define pot_profile_activate_reply {
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Delete POT Profile 
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param list_name_len - length of the name of the profile list
+    @param list_name - name of profile list to delete
+*/
+define pot_profile_del {
+  u32 client_index;
+  u32 context;
+  u8 list_name_len;
+  u8 list_name[0];
+};
+
+/** \brief Proof of Transit profile add / del response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define pot_profile_del_reply {
+    u32 context;
+    i32 retval;
+};
+
+/** \brief Show POT Profiles
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param id - id of the profile
+*/
+define pot_profile_show_config_dump {
+  u32 client_index;
+  u32 context;
+  u8 id;
+};
+
+/** \brief Show POT profile reply
+    @param id - id of the profile
+    @param validator - True/False to indicate if this is verifier
+    @param secret_key - Verification key
+    @param secret_share - Share of the 1st polynomial
+    @param prime - Prime number used for modulo operation
+    @param max_bits - Max bits to be used for Random number generation
+    @param lpc - Lagrange basis polynomial
+    @param polynomial_public - pre-evaluated public polynomial
+    @param list_name_len - length of the name of this profile list
+    @param list_name - name of this profile list
+*/
+define pot_profile_show_config_details {
+  u32 context;
+  i32 retval;
+  u8 id;
+  u8 validator;
+  u64 secret_key;
+  u64 secret_share;
+  u64 prime;
+  u64 bit_mask;
+  u64 lpc;
+  u64 polynomial_public;
+};
diff --git a/src/plugins/ioam/lib-pot/pot_all_api_h.h b/src/plugins/ioam/lib-pot/pot_all_api_h.h
new file mode 100644
index 00000000..63967c45
--- /dev/null
+++ b/src/plugins/ioam/lib-pot/pot_all_api_h.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Include the generated file, see BUILT_SOURCES in Makefile.am */
+#include <ioam/lib-pot/pot.api.h>
diff --git a/src/plugins/ioam/lib-pot/pot_api.c b/src/plugins/ioam/lib-pot/pot_api.c
new file mode 100644
index 00000000..d3af7b40
--- /dev/null
+++ b/src/plugins/ioam/lib-pot/pot_api.c
@@ -0,0 +1,292 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * pot_api.c - Proof of Transit related APIs to create 
+ *             and maintain profiles
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/plugin/plugin.h>
+#include <ioam/lib-pot/pot_util.h>
+
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+
+/* define message IDs */
+#include <ioam/lib-pot/pot_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <ioam/lib-pot/pot_all_api_h.h>
+#undef vl_typedefs
+
+/* define generated endian-swappers */
+#define vl_endianfun
+#include <ioam/lib-pot/pot_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <ioam/lib-pot/pot_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <ioam/lib-pot/pot_all_api_h.h>
+#undef vl_api_version
+
+/* 
+ * A handy macro to set up a message reply.
+ * Assumes that the following variables are available:
+ * mp - pointer to request message
+ * rmp - pointer to reply message type
+ * rv - return value
+ */
+
+#define REPLY_MACRO(t)                                          \
+do {                                                            \
+    unix_shared_memory_queue_t * q =                            \
+    vl_api_client_index_to_input_queue (mp->client_index);      \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+                                                                \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+#define REPLY_MACRO2(t, body)                                   \
+do {                                                            \
+    unix_shared_memory_queue_t * q;                             \
+    rv = vl_msg_api_pd_handler (mp, rv);                        \
+    q = vl_api_client_index_to_input_queue (mp->client_index);  \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+    do {body;} while (0);                                       \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+/* List of message types that this plugin understands */
+
+#define foreach_pot_plugin_api_msg                                      \
+_(POT_PROFILE_ADD, pot_profile_add)                                     \
+_(POT_PROFILE_ACTIVATE, pot_profile_activate)                           \
+_(POT_PROFILE_DEL, pot_profile_del)                                     \
+_(POT_PROFILE_SHOW_CONFIG_DUMP, pot_profile_show_config_dump)                                     \
+
+static void vl_api_pot_profile_add_t_handler
+(vl_api_pot_profile_add_t *mp)
+{
+    pot_main_t * sm = &pot_main;
+    int rv = 0;
+    vl_api_pot_profile_add_reply_t * rmp;
+    u8 id;
+    pot_profile *profile = NULL;
+    u8 *name = 0;
+
+    if (mp->list_name_len)
+        name = format(0, "%s", mp->list_name);
+
+    pot_profile_list_init(name);
+    id = mp->id;
+    profile = pot_profile_find(id);
+    if (profile) {
+	rv = pot_profile_create(profile,
+				clib_net_to_host_u64(mp->prime),
+				clib_net_to_host_u64(mp->polynomial_public),
+				clib_net_to_host_u64(mp->lpc),
+				clib_net_to_host_u64(mp->secret_share));
+	if (rv != 0)
+            goto ERROROUT;
+	if (1 == mp->validator)
+	  (void)pot_set_validator(profile, clib_net_to_host_u64(mp->secret_key));
+        (void)pot_profile_set_bit_mask(profile, mp->max_bits);
+    } else {
+        rv = -3;
+    }  
+ ERROROUT:
+    vec_free(name);
+    REPLY_MACRO(VL_API_POT_PROFILE_ADD_REPLY);
+}
+
+static void send_pot_profile_details(vl_api_pot_profile_show_config_dump_t *mp, u8 id)
+{
+    vl_api_pot_profile_show_config_details_t * rmp;
+    pot_main_t * sm = &pot_main;
+    pot_profile *profile = pot_profile_find(id);
+    int rv = 0;
+    if(profile){
+        REPLY_MACRO2(VL_API_POT_PROFILE_SHOW_CONFIG_DETAILS,
+			rmp->id=id;
+			rmp->validator=profile->validator;
+			rmp->secret_key=clib_host_to_net_u64(profile->secret_key);
+			rmp->secret_share=clib_host_to_net_u64(profile->secret_share);
+			rmp->prime=clib_host_to_net_u64(profile->prime);
+			rmp->bit_mask=clib_host_to_net_u64(profile->bit_mask);
+			rmp->lpc=clib_host_to_net_u64(profile->lpc);
+			rmp->polynomial_public=clib_host_to_net_u64(profile->poly_pre_eval);
+			);
+    }
+    else{
+        REPLY_MACRO2(VL_API_POT_PROFILE_SHOW_CONFIG_DETAILS,
+			rmp->id=id;
+			rmp->validator=0;
+			rmp->secret_key=0;
+			rmp->secret_share=0;
+			rmp->prime=0;
+			rmp->bit_mask=0;
+			rmp->lpc=0;
+			rmp->polynomial_public=0;
+			);
+    }
+}
+
+static void vl_api_pot_profile_show_config_dump_t_handler
+(vl_api_pot_profile_show_config_dump_t *mp)
+{
+    u8 id = mp->id;
+    u8 dump_call_id = ~0;
+    if(dump_call_id==id){
+        for(id=0;id<MAX_POT_PROFILES;id++)
+	    send_pot_profile_details(mp,id);
+    }
+    else
+        send_pot_profile_details(mp,id);
+}
+
+static void vl_api_pot_profile_activate_t_handler
+(vl_api_pot_profile_activate_t *mp)
+{
+    pot_main_t * sm = &pot_main;
+    int rv = 0;
+    vl_api_pot_profile_add_reply_t * rmp;
+    u8 id;
+    u8 *name = NULL;
+
+    if (mp->list_name_len)
+        name = format(0, "%s", mp->list_name);
+    if (!pot_profile_list_is_enabled(name)) {
+        rv = -1;
+    } else {
+        id = mp->id;
+	rv = pot_profile_set_active(id);
+    }
+     
+    vec_free(name);
+    REPLY_MACRO(VL_API_POT_PROFILE_ACTIVATE_REPLY);
+}
+
+
+static void vl_api_pot_profile_del_t_handler
+(vl_api_pot_profile_del_t *mp)
+{
+    pot_main_t * sm = &pot_main;
+    int rv = 0;
+    vl_api_pot_profile_del_reply_t * rmp;
+
+    clear_pot_profiles();
+
+    REPLY_MACRO(VL_API_POT_PROFILE_DEL_REPLY);
+}
+
+
+/* 
+ * This routine exists to convince the vlib plugin framework that
+ * we haven't accidentally copied a random .dll into the plugin directory.
+ *
+ * Also collects global variable pointers passed from the vpp engine
+ */
+
+clib_error_t * 
+vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
+                      int from_early_init)
+{
+  pot_main_t * sm = &pot_main;
+  clib_error_t * error = 0;
+
+  sm->vlib_main = vm;
+  sm->vnet_main = h->vnet_main;
+  return error;
+}
+
+/* Set up the API message handling tables */
+static clib_error_t *
+pot_plugin_api_hookup (vlib_main_t *vm)
+{
+  pot_main_t * sm = &pot_main;
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,					\
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1); 
+    foreach_pot_plugin_api_msg;
+#undef _
+
+    return 0;
+}
+
+#define vl_msg_name_crc_list
+#include <ioam/lib-pot/pot_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (pot_main_t * sm, api_main_t * am)
+{
+#define _(id,n,crc) \
+  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
+  foreach_vl_msg_name_crc_pot;
+#undef _
+}
+
+static clib_error_t * pot_init (vlib_main_t * vm)
+{
+  pot_main_t * sm = &pot_main;
+  clib_error_t * error = 0;
+  u8 * name;
+
+  bzero(sm, sizeof(pot_main));
+  (void)pot_util_init();
+  name = format (0, "ioam_pot_%08x%c", api_version, 0);
+
+  /* Ask for a correctly-sized block of API message decode slots */
+  sm->msg_id_base = vl_msg_api_get_msg_ids 
+      ((char *) name, VL_MSG_FIRST_AVAILABLE);
+
+  error = pot_plugin_api_hookup (vm);
+
+  /* Add our API messages to the global name_crc hash table */
+  setup_message_id_table (sm, &api_main);
+
+  vec_free(name);
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (pot_init);
diff --git a/src/plugins/ioam/lib-pot/pot_msg_enum.h b/src/plugins/ioam/lib-pot/pot_msg_enum.h
new file mode 100644
index 00000000..a4a88bed
--- /dev/null
+++ b/src/plugins/ioam/lib-pot/pot_msg_enum.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_pot_msg_enum_h
+#define included_pot_msg_enum_h
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum {
+#include <ioam/lib-pot/pot_all_api_h.h>
+    /* We'll want to know how many messages IDs we need... */
+    VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif /* included_pot_msg_enum_h */
diff --git a/src/plugins/ioam/lib-pot/pot_test.c b/src/plugins/ioam/lib-pot/pot_test.c
new file mode 100644
index 00000000..2e870238
--- /dev/null
+++ b/src/plugins/ioam/lib-pot/pot_test.c
@@ -0,0 +1,365 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * pot_test.c - test harness for pot plugin
+ *------------------------------------------------------------------
+ */
+
+#include <vat/vat.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vppinfra/error.h>
+
+/* Declare message IDs */
+#include <ioam/lib-pot/pot_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <ioam/lib-pot/pot_all_api_h.h>
+#undef vl_typedefs
+
+/* declare message handlers for each api */
+
+#define vl_endianfun             /* define message structures */
+#include <ioam/lib-pot/pot_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <ioam/lib-pot/pot_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number. */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <ioam/lib-pot/pot_all_api_h.h>
+#undef vl_api_version
+
+
+typedef struct {
+    /* API message ID base */
+    u16 msg_id_base;
+    vat_main_t *vat_main;
+} pot_test_main_t;
+
+pot_test_main_t pot_test_main;
+
+#define foreach_standard_reply_retval_handler     \
+_(pot_profile_add_reply)                          \
+_(pot_profile_activate_reply)                     \
+_(pot_profile_del_reply)
+
+#define foreach_custom_reply_retval_handler     		\
+_(pot_profile_show_config_details,				\
+    errmsg("		ID:%d\n",mp->id);			\
+    errmsg("	 Validator:%d\n",mp->validator);		\
+    errmsg("	secret_key:%Lx\n",clib_net_to_host_u64(mp->secret_key));		\
+    errmsg("  secret_share:%Lx\n",clib_net_to_host_u64(mp->secret_share));		\
+    errmsg("  	     prime:%Lx\n",clib_net_to_host_u64(mp->prime));			\
+    errmsg("  	   bitmask:%Lx\n",clib_net_to_host_u64(mp->bit_mask));		\
+    errmsg("  	       lpc:%Lx\n",clib_net_to_host_u64(mp->lpc));			\
+    errmsg("   public poly:%Lx\n",clib_net_to_host_u64(mp->polynomial_public));	\
+		)
+
+#define _(n)                                            \
+    static void vl_api_##n##_t_handler                  \
+    (vl_api_##n##_t * mp)                               \
+    {                                                   \
+        vat_main_t * vam = pot_test_main.vat_main;   \
+        i32 retval = ntohl(mp->retval);                 \
+        if (vam->async_mode) {                          \
+            vam->async_errors += (retval < 0);          \
+        } else {                                        \
+            vam->retval = retval;                       \
+            vam->result_ready = 1;                      \
+        }                                               \
+    }
+foreach_standard_reply_retval_handler;
+#undef _
+
+#define _(n,body)                                       \
+    static void vl_api_##n##_t_handler                  \
+    (vl_api_##n##_t * mp)                               \
+    {                                                   \
+        vat_main_t * vam = pot_test_main.vat_main;   \
+        i32 retval = ntohl(mp->retval);                 \
+        if (vam->async_mode) {                          \
+            vam->async_errors += (retval < 0);          \
+        } else {                                        \
+            vam->retval = retval;                       \
+            vam->result_ready = 1;                      \
+        }                                               \
+	do{body;}while(0);				\
+    }
+foreach_custom_reply_retval_handler;
+#undef _
+
+/* 
+ * Table of message reply handlers, must include boilerplate handlers
+ * we just generated
+ */
+#define foreach_vpe_api_reply_msg                                       \
+_(POT_PROFILE_ADD_REPLY, pot_profile_add_reply)                         \
+_(POT_PROFILE_ACTIVATE_REPLY, pot_profile_activate_reply)               \
+_(POT_PROFILE_DEL_REPLY, pot_profile_del_reply)                         \
+_(POT_PROFILE_SHOW_CONFIG_DETAILS, pot_profile_show_config_details)
+
+
+/* M: construct, but don't yet send a message */
+
+#define M(T,t)                                                  \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp));                         \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+#define M2(T,t,n)                                               \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+/* S: send a message */
+#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
+
+/* W: wait for results, with timeout */
+#define W                                       \
+do {                                            \
+    timeout = vat_time_now (vam) + 1.0;         \
+                                                \
+    while (vat_time_now (vam) < timeout) {      \
+        if (vam->result_ready == 1) {           \
+            return (vam->retval);               \
+        }                                       \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
+
+static int api_pot_profile_add (vat_main_t *vam)
+{
+#define MAX_BITS 64
+    pot_test_main_t * sm = &pot_test_main;
+    unformat_input_t *input = vam->input;
+    vl_api_pot_profile_add_t *mp;
+    u8 *name = NULL;
+    u64 prime = 0;
+    u64 secret_share = 0;
+    u64 secret_key = 0;
+    u32  bits = MAX_BITS;
+    u64 lpc = 0, poly2 = 0;
+    f64 timeout;
+    u8 id = 0;
+    int rv = 0;
+
+    while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
+      {
+        if (unformat(input, "name %s", &name))
+	  ;
+	else if(unformat(input, "id %d", &id))
+	  ;
+        else if (unformat(input, "validator-key 0x%Lx", &secret_key))
+          ;
+        else if (unformat(input, "prime-number 0x%Lx", &prime))
+          ;
+        else if (unformat(input, "secret-share 0x%Lx", &secret_share))
+          ;
+        else if (unformat(input, "polynomial-public 0x%Lx", &poly2))
+          ;
+        else if (unformat(input, "lpc 0x%Lx", &lpc))
+          ;
+        else if (unformat(input, "bits-in-random %u", &bits))
+	  {
+	    if (bits > MAX_BITS)
+	      bits = MAX_BITS;
+	  }
+        else
+  	break;
+      }
+
+    if (!name)
+      {
+        errmsg ("name required\n");
+        rv = -99;
+        goto OUT;
+      }
+    
+    M2(POT_PROFILE_ADD, pot_profile_add, vec_len(name));
+
+    mp->list_name_len = vec_len(name);
+    clib_memcpy(mp->list_name, name, mp->list_name_len);
+    mp->secret_share = clib_host_to_net_u64(secret_share);
+    mp->polynomial_public = clib_host_to_net_u64(poly2);
+    mp->lpc = clib_host_to_net_u64(lpc);
+    mp->prime = clib_host_to_net_u64(prime);
+    if (secret_key != 0)
+      {
+        mp->secret_key = clib_host_to_net_u64(secret_key);
+        mp->validator = 1;
+      }
+    else
+      {
+	mp->validator = 0;
+      }
+    mp->id = id;
+    mp->max_bits = bits;
+      
+    S; W;
+  
+OUT:
+    vec_free(name);
+    return(rv);
+}
+
+static int api_pot_profile_activate (vat_main_t *vam)
+{
+#define MAX_BITS 64
+    pot_test_main_t * sm = &pot_test_main;  
+    unformat_input_t *input = vam->input;
+    vl_api_pot_profile_activate_t *mp;
+    u8 *name = NULL;
+    u8 id = 0;
+    int rv = 0;
+    f64 timeout;
+    
+    while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
+      {
+        if (unformat(input, "name %s", &name))
+	  ;
+	else if(unformat(input, "id %d", &id))
+	  ;
+        else
+  	break;
+      }
+
+    if (!name)
+      {
+        errmsg ("name required\n");
+        rv = -99;
+        goto OUT;
+      }
+    
+    M2(POT_PROFILE_ACTIVATE, pot_profile_activate, vec_len(name));
+
+    mp->list_name_len = vec_len(name);
+    clib_memcpy(mp->list_name, name, mp->list_name_len);
+    mp->id = id;
+      
+    S; W;
+  
+OUT:
+    vec_free(name);
+    return(rv);
+}
+
+
+static int api_pot_profile_del (vat_main_t *vam)
+{
+    pot_test_main_t * sm = &pot_test_main;
+    vl_api_pot_profile_del_t *mp;
+    f64 timeout;
+   
+    M(POT_PROFILE_DEL, pot_profile_del);
+    mp->list_name_len = 0;
+    S; W;
+    return 0;
+}
+
+static int api_pot_profile_show_config_dump (vat_main_t *vam)
+{
+    pot_test_main_t * sm = &pot_test_main;
+    unformat_input_t *input = vam->input;
+    vl_api_pot_profile_show_config_dump_t *mp;
+    f64 timeout;
+    u8 id = 0;
+
+    while(unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
+    {
+      if(unformat(input,"id %d",&id));
+      else
+        break;
+    }
+    M(POT_PROFILE_SHOW_CONFIG_DUMP, pot_profile_show_config_dump);
+
+    mp->id = id;
+
+    S; W;
+    return 0;
+}
+
+/* 
+ * List of messages that the api test plugin sends,
+ * and that the data plane plugin processes
+ */
+#define foreach_vpe_api_msg \
+_(pot_profile_add, "name <name> id [0-1] "                              \
+  "prime-number <0xu64> bits-in-random [0-64] "                         \
+  "secret-share <0xu64> lpc <0xu64> polynomial-public <0xu64> "         \
+  "[validator-key <0xu64>] [validity <0xu64>]")                         \
+_(pot_profile_activate, "name <name> id [0-1] ")    			\
+_(pot_profile_del, "[id <nn>]")                                         \
+_(pot_profile_show_config_dump, "id [0-1]")
+
+void vat_api_hookup (vat_main_t *vam)
+{
+    pot_test_main_t * sm = &pot_test_main;
+    /* Hook up handlers for replies from the data plane plug-in */
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,                                  \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1); 
+    foreach_vpe_api_reply_msg;
+#undef _
+
+    /* API messages we can send */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+    foreach_vpe_api_msg;
+#undef _    
+    
+    /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+    foreach_vpe_api_msg;
+#undef _
+}
+
+clib_error_t * vat_plugin_register (vat_main_t *vam)
+{
+  pot_test_main_t * sm = &pot_test_main;
+  u8 * name;
+
+  sm->vat_main = vam;
+
+  name = format (0, "ioam_pot_%08x%c", api_version, 0);
+  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  if (sm->msg_id_base != (u16) ~0)
+    vat_api_hookup (vam);
+  
+  vec_free(name);
+  
+  return 0;
+}
diff --git a/src/plugins/ioam/lib-pot/pot_util.c b/src/plugins/ioam/lib-pot/pot_util.c
new file mode 100644
index 00000000..a253ad41
--- /dev/null
+++ b/src/plugins/ioam/lib-pot/pot_util.c
@@ -0,0 +1,445 @@
+/* 
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/vnet.h>
+#include <stdint.h>
+#include <time.h>
+#include <string.h>
+#include <vppinfra/mem.h>
+#include "math64.h"
+#include "pot_util.h"
+
+pot_main_t pot_main;
+
+static void pot_profile_cleanup(pot_profile *profile);
+
+static void pot_main_profiles_reset (void)
+{
+    pot_main_t *sm = &pot_main;
+    int i = 0;
+
+    for (i = 0; i < MAX_POT_PROFILES; i++)
+    {
+      pot_profile_cleanup(&(sm->profile_list[i]));
+    }
+    sm->active_profile_id = 0;
+    if (sm->profile_list_name)
+	vec_free(sm->profile_list_name);
+    sm->profile_list_name = NULL;
+}
+
+int pot_util_init (void)
+{
+    pot_main_profiles_reset();
+    
+    return(0);
+}
+
+static void pot_profile_init(pot_profile * new, u8 id)
+{
+    if (new)
+    {
+        memset(new, 0, sizeof(pot_profile));
+        new->id = id;
+    }
+}
+
+pot_profile *pot_profile_find(u8 id)
+{
+    pot_main_t *sm = &pot_main;
+
+    if (id < MAX_POT_PROFILES)
+    {
+        return (&(sm->profile_list[id]));
+    }
+    return (NULL);
+}
+static int pot_profile_name_equal (u8 *name0, u8 *name1)
+{
+    int len0, len1;
+
+    len0 = vec_len (name0);
+    len1 = vec_len (name1);
+    if (len0 != len1)
+        return(0);
+    return (0==strncmp ((char *) name0, (char *)name1, len0));
+}
+
+int pot_profile_list_is_enabled (u8 *name)
+{
+    pot_main_t *sm = &pot_main;
+    return (pot_profile_name_equal(sm->profile_list_name, name));
+}
+
+void pot_profile_list_init(u8 * profile_list_name)
+{
+    pot_main_t *sm = &pot_main;
+    int i = 0;
+
+    /* If it is the same profile list skip reset */
+    if (pot_profile_name_equal(sm->profile_list_name, profile_list_name))
+    {
+      return;
+    }
+
+    pot_main_profiles_reset();
+    if (vec_len(profile_list_name))
+      sm->profile_list_name = (u8 *)vec_dup(profile_list_name);
+    else
+      sm->profile_list_name = 0;
+    sm->active_profile_id = 0;
+    
+    for (i = 0; i < MAX_POT_PROFILES; i++)
+    {
+      pot_profile_init(&(sm->profile_list[i]), i);
+    }
+}
+
+static void pot_profile_cleanup(pot_profile * profile)
+{
+    u16 id = profile->id;
+
+    memset(profile, 0, sizeof(pot_profile));
+    profile->id = id;           /* Restore id alone */
+}
+
+int pot_profile_create(pot_profile * profile, u64 prime,
+    u64 poly2, u64 lpc, u64 secret_share)
+{
+    if (profile && !profile->in_use)
+    {
+        pot_profile_cleanup(profile);
+        profile->prime = prime;
+        profile->primeinv = 1.0 / prime;
+        profile->lpc = lpc;
+        profile->poly_pre_eval = poly2;
+        profile->secret_share = secret_share;
+	profile->total_pkts_using_this_profile = 0;
+        profile->valid = 1;
+	return(0);
+    }
+    
+    return(-1);
+}
+
+int pot_set_validator(pot_profile * profile, u64 key)
+{
+    if (profile && !profile->in_use)
+    {
+        profile->validator = 1;
+        profile->secret_key = key;
+	return(0);
+    }
+    return(-1);
+}
+
+always_inline u64 pot_update_cumulative_inline(u64 cumulative, u64 random,
+    u64 secret_share, u64 prime, u64 lpc, u64 pre_split, double prime_inv)
+{
+    u64 share_random = 0;
+    u64 cumulative_new = 0;
+
+    /* 
+     * calculate split share for random
+     */
+    share_random = add64_mod(pre_split, random, prime, prime_inv);
+
+    /* 
+     * lpc * (share_secret + share_random)
+     */
+    share_random = add64_mod(share_random, secret_share, prime, prime_inv);
+    share_random = mul64_mod(share_random, lpc, prime, prime_inv);
+
+    cumulative_new = add64_mod(cumulative, share_random, prime, prime_inv);
+
+    return (cumulative_new);
+}
+
+u64 pot_update_cumulative(pot_profile * profile, u64 cumulative, u64 random)
+{
+    if (profile && profile->valid != 0)
+    {
+        return (pot_update_cumulative_inline(cumulative, random, profile->secret_share,
+                profile->prime, profile->lpc, profile->poly_pre_eval,
+                profile->primeinv));
+    }
+    return (0);
+}
+
+always_inline u8 pot_validate_inline(u64 secret, u64 prime, double prime_inv,
+    u64 cumulative, u64 random)
+{
+    if (cumulative == (random + secret))
+    {
+        return (1);
+    }
+    else if (cumulative == add64_mod(random, secret, prime, prime_inv))
+    {
+        return (1);
+    }
+    return (0);
+}
+
+/* 
+ * return True if the cumulative matches secret from a profile
+ */
+u8 pot_validate(pot_profile * profile, u64 cumulative, u64 random)
+{
+    if (profile && profile->validator)
+    {
+        return (pot_validate_inline(profile->secret_key, profile->prime,
+                profile->primeinv, cumulative, random));
+    }
+    return (0);
+}
+
+/* 
+ * Utility function to get random number per pack
+ */
+u64 pot_generate_random(pot_profile * profile)
+{
+    u64 random = 0;
+    int32_t second_half;
+    static u32 seed = 0;
+
+    if (PREDICT_FALSE(!seed))
+        seed = random_default_seed();
+
+    /* 
+     * Upper 4 bytes seconds
+     */
+    random = (u64) time(NULL);
+
+    random &= 0xffffffff;
+    random = random << 32;
+    /* 
+     * Lower 4 bytes random number
+     */
+    second_half = random_u32(&seed);
+
+    random |= second_half;
+
+    if (PREDICT_TRUE(profile != NULL))
+    {
+        random &= profile->bit_mask;
+    }
+    return (random);
+}
+
+int pot_profile_set_bit_mask(pot_profile * profile, u16 bits)
+{
+    int sizeInBits;
+
+    if (profile && !profile->in_use)
+    {
+        sizeInBits = sizeof(profile->bit_mask) * 8;
+        profile->bit_mask =
+            (bits >=
+            sizeInBits ? (u64) - 1 : (u64) ((u64) 1 << (u64) bits) - 1);
+	return(0);
+    }
+    return(-1);
+}
+
+clib_error_t *clear_pot_profile_command_fn(vlib_main_t * vm,
+    unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+
+    pot_main_profiles_reset();
+    
+    return 0;
+}
+
+void clear_pot_profiles()
+{
+    clear_pot_profile_command_fn(0, 0, 0);
+}
+
+VLIB_CLI_COMMAND(clear_pot_profile_command) =
+{
+.path = "clear pot profile",
+.short_help = "clear pot profile [<index>|all]",
+.function = clear_pot_profile_command_fn,
+};
+
+static clib_error_t *set_pot_profile_command_fn(vlib_main_t * vm,
+    unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+    u64 prime;
+    u64 secret_share;
+    u64 secret_key;
+    u8 validator = 0;
+    u32 profile_id = ~0;
+    u32 bits;
+    u64 lpc = 0, poly2 = 0;
+    pot_profile *profile = NULL;
+    u8 *profile_list_name = NULL;
+    
+    bits = MAX_BITS;
+
+    while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
+    {
+        if (unformat(input, "name %s",
+		     &profile_list_name));
+        else if (unformat(input, "id %d", &profile_id))
+            ;
+        else if (unformat(input, "validate-key 0x%Lx", &secret_key))
+            validator = 1;
+        else if (unformat(input, "prime-number 0x%Lx", &prime))
+            ;
+        else if (unformat(input, "secret_share 0x%Lx", &secret_share))
+            ;
+        else if (unformat(input, "polynomial2 0x%Lx", &poly2))
+            ;
+        else if (unformat(input, "lpc 0x%Lx", &lpc))
+            ;
+        else if (unformat(input, "bits-in-random %d", &bits))
+        {
+            if (bits > MAX_BITS)
+                bits = MAX_BITS;
+        }
+        else
+	  break;
+    }
+    if (profile_list_name == 0)
+    {
+        return clib_error_return(0, "Name cannot be null");
+    }	
+    pot_profile_list_init(profile_list_name);
+    profile = pot_profile_find(profile_id);
+
+    if (profile)
+    {
+        pot_profile_create(profile, prime, poly2, lpc, secret_share);
+        if (validator)
+            pot_set_validator(profile, secret_key);
+        pot_profile_set_bit_mask(profile, bits);
+    }
+    vec_free(profile_list_name);
+    return 0;
+}
+
+VLIB_CLI_COMMAND(set_pot_profile_command) =
+{
+.path = "set pot profile",
+.short_help = "set pot profile name <string> id [0-1] [validator-key 0xu64] \
+                  prime-number 0xu64 secret_share 0xu64 lpc 0xu64 \
+                  polynomial2 0xu64 bits-in-random [0-64] ",
+.function = set_pot_profile_command_fn,
+};
+
+static clib_error_t *set_pot_profile_activate_command_fn(vlib_main_t * vm,
+    unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+    pot_main_t *sm = &pot_main;
+    u8 *profile_list_name = NULL;
+    u32 id = 0;
+    clib_error_t *result = NULL;
+    
+    while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
+    {
+        if (unformat(input, "name %s",
+		     &profile_list_name));
+        else if (unformat(input, "id %d", &id))
+            ;
+        else
+            return clib_error_return(0, "unknown input `%U'",
+                format_unformat_error, input);
+    }
+    if (profile_list_name == 0)
+    {
+        return clib_error_return(0, "Name cannot be null");
+    }
+
+    if (!pot_profile_list_is_enabled(profile_list_name)) {
+        result = clib_error_return(0, "%s list is not enabled, profile in use %s",
+				 profile_list_name, sm->profile_list_name);
+    } else if (0 != pot_profile_set_active((u8)id)) {
+        result = clib_error_return(0, "Profile %d not defined in %s",
+				 id, sm->profile_list_name);
+    }
+    vec_free(profile_list_name);
+    return result;
+}
+
+VLIB_CLI_COMMAND(set_pot_profile_activate_command) =
+{
+.path = "set pot profile-active",
+.short_help = "set pot profile-active name <string> id [0-1]",
+.function = set_pot_profile_activate_command_fn,
+};
+
+static clib_error_t *show_pot_profile_command_fn(vlib_main_t * vm,
+    unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+    pot_main_t *sm = &pot_main;
+    pot_profile *p = NULL;
+    u16 i;
+    u8 *s = 0;
+
+    if (vec_len(sm->profile_list_name) == 0)
+    {
+        s = format(s, "POT Profiles not configured\n");
+        vlib_cli_output(vm, "%v", s);
+        return 0;
+    }
+    s = format(s, "Profile list in use  : %s\n",sm->profile_list_name);
+    for (i = 0; i < MAX_POT_PROFILES; i++)
+    {
+        p = pot_profile_find(i);
+        if (p->valid == 0)
+            continue;
+        s = format(s, "POT Profile at index: %d\n", i);
+        s = format(s, "                 Id : %d\n", p->id);
+        s = format(s, "          Validator : %s (%d)\n",
+            (p->validator) ? "True" : "False", p->validator);
+        if (p->validator == 1)
+            s = format(s, "         Secret key : 0x%Lx (%Ld)\n",
+                p->secret_key, p->secret_key);
+        s = format(s, "       Secret share : 0x%Lx (%Ld)\n",
+            p->secret_share, p->secret_share);
+        s = format(s, "       Prime number : 0x%Lx (%Ld)\n",
+            p->prime, p->prime);
+        s = format(s, "2nd polynomial(eval) : 0x%Lx (%Ld)\n",
+            p->poly_pre_eval, p->poly_pre_eval);
+        s = format(s, "                 LPC : 0x%Lx (%Ld)\n", p->lpc, p->lpc);
+
+        s = format(s, "           Bit mask : 0x%Lx (%Ld)\n",
+            p->bit_mask, p->bit_mask);
+    }
+
+    p = pot_profile_find(sm->active_profile_id);
+
+    if (p && p->valid && p->in_use) {
+        s = format(s, "\nProfile index in use: %d\n", sm->active_profile_id);
+        s = format(s, "Pkts passed : 0x%Lx (%Ld)\n",
+		   p->total_pkts_using_this_profile,
+		   p->total_pkts_using_this_profile);
+        if (pot_is_decap(p))
+            s = format(s, "  This is Decap node.  \n");
+    } else {
+        s = format(s, "\nProfile index in use: None\n");
+    }
+    vlib_cli_output(vm, "%v", s);
+    vec_free(s);
+
+    return 0;
+}
+
+VLIB_CLI_COMMAND(show_pot_profile_command) =
+{
+.path = "show pot profile",
+.short_help = "show pot profile",
+.function = show_pot_profile_command_fn,
+};
diff --git a/src/plugins/ioam/lib-pot/pot_util.h b/src/plugins/ioam/lib-pot/pot_util.h
new file mode 100644
index 00000000..9df31fae
--- /dev/null
+++ b/src/plugins/ioam/lib-pot/pot_util.h
@@ -0,0 +1,195 @@
+/* 
+ * pot_util.h -- Proof Of Transit Utility Header
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef include_vnet_pot_util_h
+#define include_vnet_pot_util_h
+
+#include <vnet/ip/ip6_hop_by_hop.h>
+#define debug_ioam debug_ioam_fn
+/* Dont change this size 256. This is there across multiple components */
+#define PATH_NAME_SIZE  256
+
+/* Ring size. this should be same as the one in ODL. Do not change this
+   without change in ODL. */
+#define MAX_POT_PROFILES 2
+
+/**
+ * Usage:
+ * 
+ * On any node that participates in Proof of Transit:
+ *
+ * Step 1: Initialize this library by calling pot_init()
+ * Step 2: Setup a proof of transit  profile that contains all the parameters needed to compute cumulative:
+ *         Call these functions:
+ *         pot_profile_find
+ *         pot_profile_create
+ *         pot_profile_set_bit_mask - To setup how large we want the numbers used in the computation and random number <= 64 bits
+ * Step 2a: For validator do this:
+ *          pot_set_validator
+ * Step 2b: On initial node enable the profile to be used:
+ *          pot_profile_set_active / pot_profile_get_active will return the profile
+ * Step 3a: At the initial node to generate Random number that will be read by all other nodes:
+ *          pot_generate_random
+ * Step 3b: At all nodes including initial and verifier call this to compute cumulative:
+ *          pot_update_cumulative
+ * Step 4: At the verifier:
+ *         pot_validate
+ * 
+ */
+
+typedef struct pot_profile_
+{
+    u8 id : 1;
+    u8 valid : 1;
+    u8 in_use : 1;
+    u64 random;
+    u8 validator;
+    u64 secret_key;
+    u64 secret_share;
+    u64 prime;
+    u64 lpc;
+    u64 poly_pre_eval;
+    u64 bit_mask;
+    u64 limit;
+    double primeinv;
+    u64 total_pkts_using_this_profile;
+} pot_profile;
+
+typedef struct {
+    /* Name of the default profile list in use*/
+    u8 *profile_list_name;
+    pot_profile profile_list[MAX_POT_PROFILES];
+    /* number of profiles in the list */
+    u8 active_profile_id : 1;
+
+    /* API message ID base */
+    u16 msg_id_base;
+
+    /* convenience */
+    vlib_main_t * vlib_main;
+    vnet_main_t * vnet_main;
+} pot_main_t;
+
+extern pot_main_t pot_main;
+
+/* 
+ * Initialize proof of transit
+ */
+int pot_util_init(void);
+void pot_profile_list_init(u8 * name);
+
+
+/* 
+ * Find a pot profile by ID
+ */
+pot_profile *pot_profile_find(u8 id);
+
+static inline u16 pot_profile_get_id(pot_profile * profile)
+{
+    if (profile)
+    {
+        return (profile->id);
+    }
+    return (0);
+}
+
+/* setup and clean up profile */
+int pot_profile_create(pot_profile * profile, u64 prime,
+    u64 poly2, u64 lpc, u64 secret_share);
+/* 
+ * Setup profile as a validator
+ */
+int pot_set_validator(pot_profile * profile, u64 key);
+
+/* 
+ * Setup max bits to be used for random number generation
+ */
+#define MAX_BITS 64
+int pot_profile_set_bit_mask(pot_profile * profile, u16 bits);
+
+/* 
+ * Given a random and cumulative compute the new cumulative for a given profile
+ */
+u64 pot_update_cumulative(pot_profile * profile, u64 cumulative, u64 random);
+
+/* 
+ * return True if the cumulative matches secret from a profile
+ */
+u8 pot_validate(pot_profile * profile, u64 cumulative, u64 random);
+
+/* 
+ * Utility function to get random number per pack
+ */
+u64 pot_generate_random(pot_profile * profile);
+
+
+extern void clear_pot_profiles();
+extern int pot_profile_list_is_enabled(u8 *name);
+
+static inline u8 pot_is_decap(pot_profile * p)
+{
+    return (p->validator == 1);
+}
+
+static inline int pot_profile_set_active (u8 id)
+{
+    pot_main_t *sm = &pot_main;
+    pot_profile *profile = NULL;
+    pot_profile *current_active_prof = NULL;
+
+    current_active_prof = pot_profile_find(sm->active_profile_id);
+    profile = pot_profile_find(id);
+    if (profile && profile->valid) {
+        sm->active_profile_id = id;
+	current_active_prof->in_use = 0;
+	profile->in_use = 1;
+	return(0);
+    }
+    return(-1);
+}
+static inline u8 pot_profile_get_active_id (void)
+{
+    pot_main_t *sm = &pot_main;
+    return (sm->active_profile_id);
+}
+
+static inline pot_profile * pot_profile_get_active (void)
+{
+    pot_main_t *sm = &pot_main;
+    pot_profile *profile = NULL;
+    profile = pot_profile_find(sm->active_profile_id);
+    if (profile && profile->in_use)
+        return(profile);
+    return (NULL);
+}
+
+static inline void pot_profile_reset_usage_stats (pot_profile *pow)
+{
+  if (pow) {
+    pow->total_pkts_using_this_profile = 0;
+  }
+}
+
+static inline void pot_profile_incr_usage_stats (pot_profile *pow)
+{
+  if (pow) {
+    pow->total_pkts_using_this_profile++;
+  }
+}
+
+
+#endif
diff --git a/src/plugins/ioam/lib-trace/trace.api b/src/plugins/ioam/lib-trace/trace.api
new file mode 100644
index 00000000..cb958325
--- /dev/null
+++ b/src/plugins/ioam/lib-trace/trace.api
@@ -0,0 +1,92 @@
+/* Hey Emacs use -*- mode: C -*- */
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/** \brief iOAM6 Trace - Set the iOAM6 trace profile
+    @param trace_type - Type of trace requested
+    @param num_elts - Number of trace elements to be inserted
+    @param node_id - Trace Node ID
+    @param trace_tsp- Timestamp resolution
+    @param app_data - Application specific opaque
+*/
+define trace_profile_add {
+  u32 client_index;
+  u32 context;
+  u8 trace_type;
+  u8 num_elts;
+  u8 trace_tsp;
+  u32 node_id;
+  u32 app_data;
+};
+
+/** \brief Trace profile add / del response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define trace_profile_add_reply {
+    u32 context;
+    i32 retval;
+};
+
+
+
+/** \brief Delete trace Profile
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define trace_profile_del {
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Trace profile add / del response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define trace_profile_del_reply {
+    u32 context;
+    i32 retval;
+};
+
+
+
+/** \brief Show trace Profile
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define trace_profile_show_config {
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Show trace config response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+    @param trace_type - Type of trace requested
+    @param num_elts - Number of trace elements to be inserted
+    @param node_id - Trace Node ID
+    @param trace_tsp- Timestamp resolution
+    @param app_data - Application specific opaque
+*/
+define trace_profile_show_config_reply {
+  u32 context;
+  i32 retval;
+  u8 trace_type;
+  u8 num_elts;
+  u8 trace_tsp;
+  u32 node_id;
+  u32 app_data;
+};
diff --git a/src/plugins/ioam/lib-trace/trace_all_api_h.h b/src/plugins/ioam/lib-trace/trace_all_api_h.h
new file mode 100644
index 00000000..223f9545
--- /dev/null
+++ b/src/plugins/ioam/lib-trace/trace_all_api_h.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Include the generated file, see BUILT_SOURCES in Makefile.am */
+#include <ioam/lib-trace/trace.api.h>
diff --git a/src/plugins/ioam/lib-trace/trace_api.c b/src/plugins/ioam/lib-trace/trace_api.c
new file mode 100644
index 00000000..7e0d708e
--- /dev/null
+++ b/src/plugins/ioam/lib-trace/trace_api.c
@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * trace_api.c - iOAM Trace related APIs to create
+ *               and maintain profiles
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/plugin/plugin.h>
+#include <ioam/lib-trace/trace_util.h>
+
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+
+/* define message IDs */
+#include <ioam/lib-trace/trace_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <ioam/lib-trace/trace_all_api_h.h>
+#undef vl_typedefs
+
+/* define generated endian-swappers */
+#define vl_endianfun
+#include <ioam/lib-trace/trace_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <ioam/lib-trace/trace_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <ioam/lib-trace/trace_all_api_h.h>
+#undef vl_api_version
+
+/*
+ * A handy macro to set up a message reply.
+ * Assumes that the following variables are available:
+ * mp - pointer to request message
+ * rmp - pointer to reply message type
+ * rv - return value
+ */
+
+#define TRACE_REPLY_MACRO(t)                                          \
+do {                                                            \
+    unix_shared_memory_queue_t * q =                            \
+    vl_api_client_index_to_input_queue (mp->client_index);      \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+                                                                \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+/* *INDENT-OFF* */
+#define TRACE_REPLY_MACRO2(t, body)                                   \
+do {                                                            \
+    unix_shared_memory_queue_t * q;                             \
+    rv = vl_msg_api_pd_handler (mp, rv);                        \
+    q = vl_api_client_index_to_input_queue (mp->client_index);  \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+    do {body;} while (0);                                       \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+/* *INDENT-ON* */
+
+/* List of message types that this plugin understands */
+
+#define foreach_trace_plugin_api_msg                                      \
+_(TRACE_PROFILE_ADD, trace_profile_add)                                     \
+_(TRACE_PROFILE_DEL, trace_profile_del)                                     \
+_(TRACE_PROFILE_SHOW_CONFIG, trace_profile_show_config)
+
+static void vl_api_trace_profile_add_t_handler
+  (vl_api_trace_profile_add_t * mp)
+{
+  trace_main_t *sm = &trace_main;
+  int rv = 0;
+  vl_api_trace_profile_add_reply_t *rmp;
+  trace_profile *profile = NULL;
+
+  profile = trace_profile_find ();
+  if (profile)
+    {
+      rv =
+	trace_profile_create (profile, mp->trace_type, mp->num_elts,
+			      mp->trace_tsp, ntohl (mp->node_id),
+			      ntohl (mp->app_data));
+      if (rv != 0)
+	goto ERROROUT;
+    }
+  else
+    {
+      rv = -3;
+    }
+ERROROUT:
+  TRACE_REPLY_MACRO (VL_API_TRACE_PROFILE_ADD_REPLY);
+}
+
+
+static void vl_api_trace_profile_del_t_handler
+  (vl_api_trace_profile_del_t * mp)
+{
+  trace_main_t *sm = &trace_main;
+  int rv = 0;
+  vl_api_trace_profile_del_reply_t *rmp;
+
+  clear_trace_profiles ();
+
+  TRACE_REPLY_MACRO (VL_API_TRACE_PROFILE_DEL_REPLY);
+}
+
+static void vl_api_trace_profile_show_config_t_handler
+  (vl_api_trace_profile_show_config_t * mp)
+{
+  trace_main_t *sm = &trace_main;
+  vl_api_trace_profile_show_config_reply_t *rmp;
+  int rv = 0;
+  trace_profile *profile = trace_profile_find ();
+  if (profile->valid)
+    {
+      TRACE_REPLY_MACRO2 (VL_API_TRACE_PROFILE_SHOW_CONFIG_REPLY,
+			  rmp->trace_type = profile->trace_type;
+			  rmp->num_elts = profile->num_elts;
+			  rmp->trace_tsp = profile->trace_tsp;
+			  rmp->node_id = htonl (profile->node_id);
+			  rmp->app_data = htonl (profile->app_data);
+	);
+    }
+  else
+    {
+      TRACE_REPLY_MACRO2 (VL_API_TRACE_PROFILE_SHOW_CONFIG_REPLY,
+			  rmp->trace_type = 0;
+			  rmp->num_elts = 0; rmp->trace_tsp = 0;
+			  rmp->node_id = 0; rmp->app_data = 0;
+	);
+    }
+}
+
+/*
+ * This routine exists to convince the vlib plugin framework that
+ * we haven't accidentally copied a random .dll into the plugin directory.
+ *
+ * Also collects global variable pointers passed from the vpp engine
+ */
+
+clib_error_t *
+vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
+		      int from_early_init)
+{
+  trace_main_t *sm = &trace_main;
+  clib_error_t *error = 0;
+
+  sm->vlib_main = vm;
+  sm->vnet_main = h->vnet_main;
+  return error;
+}
+
+/* Set up the API message handling tables */
+static clib_error_t *
+trace_plugin_api_hookup (vlib_main_t * vm)
+{
+  trace_main_t *sm = &trace_main;
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,					\
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_trace_plugin_api_msg;
+#undef _
+
+  return 0;
+}
+
+#define vl_msg_name_crc_list
+#include <ioam/lib-trace/trace_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (trace_main_t * sm, api_main_t * am)
+{
+#define _(id,n,crc) \
+  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
+  foreach_vl_msg_name_crc_trace;
+#undef _
+}
+
+static clib_error_t *
+trace_init (vlib_main_t * vm)
+{
+  trace_main_t *sm = &trace_main;
+  clib_error_t *error = 0;
+  u8 *name;
+
+  bzero (sm, sizeof (trace_main));
+  (void) trace_util_init ();
+  name = format (0, "ioam_trace_%08x%c", api_version, 0);
+
+  /* Ask for a correctly-sized block of API message decode slots */
+  sm->msg_id_base = vl_msg_api_get_msg_ids
+    ((char *) name, VL_MSG_FIRST_AVAILABLE);
+
+  error = trace_plugin_api_hookup (vm);
+
+  /* Add our API messages to the global name_crc hash table */
+  setup_message_id_table (sm, &api_main);
+
+  vec_free (name);
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (trace_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/lib-trace/trace_msg_enum.h b/src/plugins/ioam/lib-trace/trace_msg_enum.h
new file mode 100644
index 00000000..78c35665
--- /dev/null
+++ b/src/plugins/ioam/lib-trace/trace_msg_enum.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_trace_msg_enum_h
+#define included_trace_msg_enum_h
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum {
+#include <ioam/lib-trace/trace_all_api_h.h>
+    /* We'll want to know how many messages IDs we need... */
+    VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif /* included_trace_msg_enum_h */
diff --git a/src/plugins/ioam/lib-trace/trace_test.c b/src/plugins/ioam/lib-trace/trace_test.c
new file mode 100644
index 00000000..111dd461
--- /dev/null
+++ b/src/plugins/ioam/lib-trace/trace_test.c
@@ -0,0 +1,292 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * trace_test.c - test harness for trace plugin
+ *------------------------------------------------------------------
+ */
+
+#include <vat/vat.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vppinfra/error.h>
+
+/* Declare message IDs */
+#include <ioam/lib-trace/trace_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <ioam/lib-trace/trace_all_api_h.h>
+#undef vl_typedefs
+
+/* declare message handlers for each api */
+
+#define vl_endianfun		/* define message structures */
+#include <ioam/lib-trace/trace_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <ioam/lib-trace/trace_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number. */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <ioam/lib-trace/trace_all_api_h.h>
+#undef vl_api_version
+
+
+typedef struct
+{
+  /* API message ID base */
+  u16 msg_id_base;
+  vat_main_t *vat_main;
+} trace_test_main_t;
+
+trace_test_main_t trace_test_main;
+
+#define foreach_standard_reply_retval_handler     \
+_(trace_profile_add_reply)                          \
+_(trace_profile_del_reply)
+
+#define foreach_custom_reply_handler     \
+_(trace_profile_show_config_reply,										\
+  if(mp->trace_type)												\
+  {														\
+     errmsg("                        Trace Type : 0x%x (%d)\n",mp->trace_type, mp->trace_type);			\
+     errmsg("         Trace timestamp precision : %d \n",mp->trace_tsp);					\
+     errmsg("                           Node Id : 0x%x (%d)\n",htonl(mp->node_id), htonl(mp->node_id));		\
+     errmsg("                          App Data : 0x%x (%d)\n",htonl(mp->app_data), htonl(mp->app_data));	\
+  }														\
+    else errmsg("No valid trace profile configuration found\n");)
+#define _(n)                                            \
+    static void vl_api_##n##_t_handler                  \
+    (vl_api_##n##_t * mp)                               \
+    {                                                   \
+        vat_main_t * vam = trace_test_main.vat_main;   \
+        i32 retval = ntohl(mp->retval);                 \
+        if (vam->async_mode) {                          \
+            vam->async_errors += (retval < 0);          \
+        } else {                                        \
+            vam->retval = retval;                       \
+            vam->result_ready = 1;                      \
+        }                                               \
+    }
+foreach_standard_reply_retval_handler;
+#undef _
+
+#define _(n,body)                                       \
+    static void vl_api_##n##_t_handler                  \
+    (vl_api_##n##_t * mp)                               \
+    {                                                   \
+        vat_main_t * vam = trace_test_main.vat_main;    \
+        i32 retval = ntohl(mp->retval);                 \
+        if (vam->async_mode) {                          \
+            vam->async_errors += (retval < 0);          \
+        } else {                                        \
+            vam->retval = retval;                       \
+            vam->result_ready = 1;                      \
+        }                                               \
+	if(retval>=0)do{body;} while(0);                 \
+	else errmsg("Error, retval: %d",retval);        \
+    }
+foreach_custom_reply_handler;
+#undef _
+/*
+ * Table of message reply handlers, must include boilerplate handlers
+ * we just generated
+ */
+#define foreach_vpe_api_reply_msg                                       \
+_(TRACE_PROFILE_ADD_REPLY, trace_profile_add_reply)                         \
+_(TRACE_PROFILE_DEL_REPLY, trace_profile_del_reply)                         \
+_(TRACE_PROFILE_SHOW_CONFIG_REPLY, trace_profile_show_config_reply)
+
+
+/* M: construct, but don't yet send a message */
+
+#define M(T,t)                                                  \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp));                         \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+#define M2(T,t,n)                                               \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+/* S: send a message */
+#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
+
+/* W: wait for results, with timeout */
+#define W                                       \
+do {                                            \
+    timeout = vat_time_now (vam) + 1.0;         \
+                                                \
+    while (vat_time_now (vam) < timeout) {      \
+        if (vam->result_ready == 1) {           \
+            return (vam->retval);               \
+        }                                       \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
+
+static int
+api_trace_profile_add (vat_main_t * vam)
+{
+  trace_test_main_t *sm = &trace_test_main;
+  unformat_input_t *input = vam->input;
+  vl_api_trace_profile_add_t *mp;
+  u8 trace_type = 0;
+  u8 num_elts = 0;
+  int rv = 0;
+  u32 node_id = 0;
+  u32 app_data = 0;
+  u8 trace_tsp = 0;
+  f64 timeout;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "trace-type 0x%x", &trace_type))
+	;
+      else if (unformat (input, "trace-elts %d", &num_elts))
+	;
+      else if (unformat (input, "trace-tsp %d", &trace_tsp))
+	;
+      else if (unformat (input, "node-id 0x%x", &node_id))
+	;
+      else if (unformat (input, "app-data 0x%x", &app_data))
+	;
+
+      else
+	break;
+    }
+
+
+  M (TRACE_PROFILE_ADD, trace_profile_add);
+
+  mp->trace_type = trace_type;
+  mp->trace_tsp = trace_tsp;
+  mp->node_id = htonl (node_id);
+  mp->app_data = htonl (app_data);
+  mp->num_elts = num_elts;
+
+  S;
+  W;
+
+  return (rv);
+}
+
+
+
+static int
+api_trace_profile_del (vat_main_t * vam)
+{
+  trace_test_main_t *sm = &trace_test_main;
+  vl_api_trace_profile_del_t *mp;
+  f64 timeout;
+
+  M (TRACE_PROFILE_DEL, trace_profile_del);
+  S;
+  W;
+  return 0;
+}
+
+static int
+api_trace_profile_show_config (vat_main_t * vam)
+{
+  trace_test_main_t *sm = &trace_test_main;
+  vl_api_trace_profile_show_config_t *mp;
+  f64 timeout;
+  M (TRACE_PROFILE_SHOW_CONFIG, trace_profile_show_config);
+  S;
+  W;
+  return 0;
+}
+
+/*
+ * List of messages that the api test plugin sends,
+ * and that the data plane plugin processes
+ */
+#define foreach_vpe_api_msg \
+_(trace_profile_add, ""\
+  "trace-type <0x1f|0x3|0x9|0x11|0x19> trace-elts <nn> trace-tsp <0|1|2|3> node-id <node id in hex> app-data <app_data in hex>")  \
+_(trace_profile_del, "[id <nn>]")                    \
+_(trace_profile_show_config, "[id <nn>]")
+
+
+void
+vat_api_hookup (vat_main_t * vam)
+{
+  trace_test_main_t *sm = &trace_test_main;
+  /* Hook up handlers for replies from the data plane plug-in */
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,                                  \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_reply_msg;
+#undef _
+
+  /* API messages we can send */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+  foreach_vpe_api_msg;
+#undef _
+
+  /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+  foreach_vpe_api_msg;
+#undef _
+}
+
+clib_error_t *
+vat_plugin_register (vat_main_t * vam)
+{
+  trace_test_main_t *sm = &trace_test_main;
+  u8 *name;
+
+  sm->vat_main = vam;
+
+  name = format (0, "ioam_trace_%08x%c", api_version, 0);
+  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  if (sm->msg_id_base != (u16) ~ 0)
+    vat_api_hookup (vam);
+
+  vec_free (name);
+
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/lib-trace/trace_util.c b/src/plugins/ioam/lib-trace/trace_util.c
new file mode 100644
index 00000000..5c7f1eef
--- /dev/null
+++ b/src/plugins/ioam/lib-trace/trace_util.c
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/vnet.h>
+#include <stdint.h>
+#include <time.h>
+#include <string.h>
+#include <vppinfra/mem.h>
+#include "trace_util.h"
+
+trace_main_t trace_main;
+
+static int
+trace_profile_cleanup (trace_profile * profile)
+{
+
+  memset (profile, 0, sizeof (trace_profile));
+  profile->trace_tsp = TSP_MICROSECONDS;	/* Micro seconds */
+  ip6_trace_profile_cleanup ();	/* lib-trace_TODO: Remove this once IOAM-IPv6 transport is a plugin */
+  return 0;
+
+}
+
+static int
+trace_main_profiles_reset (void)
+{
+  int rv;
+
+  trace_main_t *sm = &trace_main;
+  rv = trace_profile_cleanup (&(sm->profile));
+  return (rv);
+}
+
+int
+trace_util_init (void)
+{
+  int rv;
+
+  rv = trace_main_profiles_reset ();
+  return (rv);
+}
+
+
+int
+trace_profile_create (trace_profile * profile, u8 trace_type, u8 num_elts,
+		      u32 trace_tsp, u32 node_id, u32 app_data)
+{
+
+  if (!trace_type || !num_elts || !(node_id))
+    {
+      return (-1);
+    }
+  if (profile && !profile->valid)
+    {
+      //rv = trace_profile_cleanup (profile);
+      profile->trace_type = trace_type;
+      profile->num_elts = num_elts;
+      profile->trace_tsp = trace_tsp;
+      profile->node_id = node_id;
+      profile->app_data = app_data;
+      profile->valid = 1;
+
+      /* lib-trace_TODO: Remove this once IOAM-IPv6 transport is a plugin */
+      ip6_trace_profile_setup ();
+      return (0);
+    }
+
+  return (-1);
+}
+
+
+
+clib_error_t *
+clear_trace_profile_command_fn (vlib_main_t * vm,
+				unformat_input_t * input,
+				vlib_cli_command_t * cmd)
+{
+
+  trace_main_profiles_reset ();
+  return 0;
+}
+
+void
+clear_trace_profiles (void)
+{
+  clear_trace_profile_command_fn (0, 0, 0);
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND(clear_trace_profile_command) =
+{
+.path = "clear ioam-trace profile",
+.short_help = "clear ioam-trace profile [<index>|all]",
+.function = clear_trace_profile_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+set_trace_profile_command_fn (vlib_main_t * vm,
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
+{
+  u8 trace_type = 0;
+  u8 num_elts = 0;
+  u32 node_id = 0;
+  u32 app_data = 0;
+  u32 trace_tsp = 0;
+  trace_profile *profile = NULL;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "trace-type 0x%x", &trace_type));
+      else if (unformat (input, "trace-elts %d", &num_elts));
+      else if (unformat (input, "trace-tsp %d", &trace_tsp));
+      else if (unformat (input, "node-id 0x%x", &node_id));
+      else if (unformat (input, "app-data 0x%x", &app_data));
+      else
+	break;
+    }
+  profile = trace_profile_find ();
+  if (profile)
+    {
+      trace_profile_create (profile, trace_type, num_elts, trace_tsp,
+			    node_id, app_data);
+    }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_trace_profile_command, static) =
+{
+.path = "set ioam-trace profile",
+.short_help = "set ioam-trace \
+             trace-type <0x1f|0x3|0x9|0x11|0x19> trace-elts <nn> trace-tsp <0|1|2|3> \
+             node-id <node id in hex> app-data <app_data in hex>",
+.function = set_trace_profile_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+show_trace_profile_command_fn (vlib_main_t * vm,
+			       unformat_input_t * input,
+			       vlib_cli_command_t * cmd)
+{
+  trace_profile *p = NULL;
+  u8 *s = 0;
+  p = trace_profile_find ();
+  if (!(p && p->valid))
+    {
+      s = format (s, "\nTrace configuration not valid\n");
+      vlib_cli_output (vm, "%v", s);
+      vec_free (s);
+      return 0;
+    }
+  s = format (s, " HOP BY HOP OPTIONS - TRACE CONFIG - \n");
+  s = format (s, "                        Trace Type : 0x%x (%d)\n",
+	      p->trace_type, p->trace_type);
+  s =
+    format (s, "         Trace timestamp precision : %d (%s)\n",
+	    p->trace_tsp,
+	    (p->trace_tsp ==
+	     TSP_SECONDS) ? "Seconds" : ((p->trace_tsp ==
+					  TSP_MILLISECONDS) ?
+					 "Milliseconds"
+					 : (((p->trace_tsp ==
+					      TSP_MICROSECONDS) ?
+					     "Microseconds" :
+					     "Nanoseconds"))));
+  s = format (s, "                Num of trace nodes : %d\n", p->num_elts);
+  s =
+    format (s, "                           Node-id : 0x%x (%d)\n",
+	    p->node_id, p->node_id);
+  s =
+    format (s, "                          App Data : 0x%x (%d)\n",
+	    p->app_data, p->app_data);
+  vlib_cli_output (vm, "%v", s);
+  vec_free (s);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_trace_profile_command, static) =
+{
+.path = "show ioam-trace profile",
+.short_help = "show ioam-trace profile",
+.function = show_trace_profile_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/lib-trace/trace_util.h b/src/plugins/ioam/lib-trace/trace_util.h
new file mode 100644
index 00000000..556f07ee
--- /dev/null
+++ b/src/plugins/ioam/lib-trace/trace_util.h
@@ -0,0 +1,247 @@
+/*
+ * trace_util.h -- Trace Profile Utility header
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef include_vnet_trace_util_h
+#define include_vnet_trace_util_h
+
+#define debug_ioam debug_ioam_fn
+
+
+/**
+ * Usage:
+ *
+ * On any node that participates in iOAM Trace.
+ *
+ * Step 1: Initialize this library by calling trace_init()
+ * Step 2: Setup a trace  profile that contains all the parameters needed to compute cumulative:
+ *         Call these functions:
+ *         trace_profile_find
+ *         trace_profile_create
+ * Step 2a: On initial node enable the profile to be used:
+ *          trace_profile_set_active / trace_profile_get_active will return the profile
+ * Step 4: TBD
+ *         trace_validate
+ *
+ */
+
+typedef struct trace_profile_
+{
+  u8 valid:1;
+  u8 trace_type;
+  u8 num_elts;
+  /* Configured node-id */
+  u32 node_id;
+  u32 app_data;
+  u32 trace_tsp;
+} trace_profile;
+
+typedef struct
+{
+  /* Name of the default profile list in use */
+  trace_profile profile;
+
+  /* API message ID base */
+  u16 msg_id_base;
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} trace_main_t;
+
+extern trace_main_t trace_main;
+
+/*
+ * Initialize Trace profile
+ */
+int trace_util_init (void);
+
+
+/*
+ * Find a trace profile
+ */
+
+always_inline trace_profile *
+trace_profile_find (void)
+{
+  trace_main_t *sm = &trace_main;
+
+  return (&(sm->profile));
+}
+
+
+/* setup and clean up profile */
+int trace_profile_create (trace_profile * profile, u8 trace_type, u8 num_elts,
+			  u32 trace_tsp, u32 node_id, u32 app_data);
+
+void clear_trace_profiles (void);
+
+
+
+#define    BIT_TTL_NODEID       (1<<0)
+#define    BIT_ING_INTERFACE    (1<<1)
+#define    BIT_EGR_INTERFACE    (1<<2)
+#define    BIT_TIMESTAMP        (1<<3)
+#define    BIT_APPDATA          (1<<4)
+#define    TRACE_TYPE_MASK      0x1F	/* Mask of all above bits */
+
+/*
+     0x00011111  iOAM-trace-type is 0x00011111 then the format of node
+        data is:
+
+          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |   Hop_Lim     |              node_id                          |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |     ingress_if_id             |         egress_if_id          |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         +                           timestamp                           +
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |                            app_data                           |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+*/
+#define   TRACE_TYPE_IF_TS_APP   0x1f
+typedef struct
+{
+  u32 ttl_node_id;
+  u16 ingress_if;
+  u16 egress_if;
+  u32 timestamp;
+  u32 app_data;
+} ioam_trace_if_ts_app_t;
+
+/*
+     0x00000111  iOAM-trace-type is 0x00000111 then the format is:
+
+          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |   Hop_Lim     |              node_id                          |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |     ingress_if_id             |         egress_if_id          |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+*/
+
+#define   TRACE_TYPE_IF   0x03
+typedef struct
+{
+  u32 ttl_node_id;
+  u16 ingress_if;
+  u16 egress_if;
+} ioam_trace_if_t;
+
+/*
+     0x00001001  iOAM-trace-type is 0x00001001 then the format is:
+
+          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |   Hop_Lim     |              node_id                          |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         +                           timestamp                           +
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+*/
+
+#define   TRACE_TYPE_TS   0x09
+typedef struct
+{
+  u32 ttl_node_id;
+  u32 timestamp;
+} ioam_trace_ts_t;
+
+/*
+     0x00010001  iOAM-trace-type is 0x00010001 then the format is:
+
+
+          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |   Hop_Lim     |              node_id                          |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |                            app_data                           |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+*/
+
+
+#define   TRACE_TYPE_APP   0x11
+typedef struct
+{
+  u32 ttl_node_id;
+  u32 app_data;
+} ioam_trace_app_t;
+
+/*
+
+     0x00011001  iOAM-trace-type is 0x00011001 then the format is:
+
+          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |   Hop_Lim     |              node_id                          |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         +                           timestamp                           +
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |                            app_data                           |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+*/
+
+#define   TRACE_TYPE_TS_APP   0x19
+typedef struct
+{
+  u32 ttl_node_id;
+  u32 timestamp;
+  u32 app_data;
+} ioam_trace_ts_app_t;
+
+
+
+static inline u8
+fetch_trace_data_size (u8 trace_type)
+{
+  u8 trace_data_size = 0;
+
+  if (trace_type == TRACE_TYPE_IF_TS_APP)
+    trace_data_size = sizeof (ioam_trace_if_ts_app_t);
+  else if (trace_type == TRACE_TYPE_IF)
+    trace_data_size = sizeof (ioam_trace_if_t);
+  else if (trace_type == TRACE_TYPE_TS)
+    trace_data_size = sizeof (ioam_trace_ts_t);
+  else if (trace_type == TRACE_TYPE_APP)
+    trace_data_size = sizeof (ioam_trace_app_t);
+  else if (trace_type == TRACE_TYPE_TS_APP)
+    trace_data_size = sizeof (ioam_trace_ts_app_t);
+
+  return trace_data_size;
+}
+
+int ioam_trace_get_sizeof_handler (u32 * result);
+int ip6_trace_profile_setup (void);
+int ip6_trace_profile_cleanup (void);
+
+#define TSP_SECONDS              0
+#define TSP_MILLISECONDS         1
+#define TSP_MICROSECONDS         2
+#define TSP_NANOSECONDS          3
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/lib-vxlan-gpe/ioam_decap.c b/src/plugins/ioam/lib-vxlan-gpe/ioam_decap.c
new file mode 100644
index 00000000..fd308657
--- /dev/null
+++ b/src/plugins/ioam/lib-vxlan-gpe/ioam_decap.c
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h>
+
+/* Statistics (not really errors) */
+#define foreach_vxlan_gpe_decap_ioam_v4_error    \
+_(DECAPSULATED, "good packets decapsulated")
+
+static char *vxlan_gpe_decap_ioam_v4_error_strings[] = {
+#define _(sym,string) string,
+  foreach_vxlan_gpe_decap_ioam_v4_error
+#undef _
+};
+
+typedef enum
+{
+#define _(sym,str) VXLAN_GPE_DECAP_IOAM_V4_ERROR_##sym,
+  foreach_vxlan_gpe_decap_ioam_v4_error
+#undef _
+    VXLAN_GPE_DECAP_IOAM_V4_N_ERROR,
+} vxlan_gpe_decap_ioam_v4_error_t;
+
+
+always_inline void
+vxlan_gpe_decap_ioam_v4_two_inline (vlib_main_t * vm,
+				    vlib_node_runtime_t * node,
+				    vxlan_gpe_main_t * ngm,
+				    vlib_buffer_t * b0, vlib_buffer_t * b1,
+				    u32 * next0, u32 * next1)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+
+  next0[0] = next1[0] = hm->decap_v4_next_override;
+  vxlan_gpe_encap_decap_ioam_v4_one_inline (vm, node, b0, &next0[0],
+					    VXLAN_GPE_DECAP_IOAM_V4_NEXT_DROP,
+					    0 /* use_adj */ );
+  vxlan_gpe_encap_decap_ioam_v4_one_inline (vm, node, b1, &next0[1],
+					    VXLAN_GPE_DECAP_IOAM_V4_NEXT_DROP,
+					    0 /* use_adj */ );
+}
+
+
+
+static uword
+vxlan_gpe_decap_ioam (vlib_main_t * vm,
+		      vlib_node_runtime_t * node,
+		      vlib_frame_t * from_frame, u8 is_ipv6)
+{
+  u32 n_left_from, next_index, *from, *to_next;
+  vxlan_gpe_main_t *ngm = &vxlan_gpe_main;
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+
+	  next0 = next1 = hm->decap_v4_next_override;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
+	    CLIB_PREFETCH (p3->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+
+	  vlib_buffer_advance (b0,
+			       -(word) (sizeof (udp_header_t) +
+					sizeof (ip4_header_t) +
+					sizeof (vxlan_gpe_header_t)));
+	  vlib_buffer_advance (b1,
+			       -(word) (sizeof (udp_header_t) +
+					sizeof (ip4_header_t) +
+					sizeof (vxlan_gpe_header_t)));
+
+	  vxlan_gpe_decap_ioam_v4_two_inline (vm, node, ngm, b0, b1,
+					      &next0, &next1);
+
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, bi1, next0,
+					   next1);
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      vxlan_gpe_ioam_v4_trace_t *tr = vlib_add_trace (vm, node, b0,
+							      sizeof (*tr));
+	    }
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0 = hm->decap_v4_next_override;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+
+	  vlib_buffer_advance (b0,
+			       -(word) (sizeof (udp_header_t) +
+					sizeof (ip4_header_t) +
+					sizeof (vxlan_gpe_header_t)));
+
+	  next0 = hm->decap_v4_next_override;
+	  vxlan_gpe_encap_decap_ioam_v4_one_inline (vm, node, b0,
+						    &next0,
+						    VXLAN_GPE_DECAP_IOAM_V4_NEXT_DROP,
+						    0 /* use_adj */ );
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      vxlan_gpe_ioam_v4_trace_t *tr = vlib_add_trace (vm, node, b0,
+							      sizeof (*tr));
+	    }
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+
+static uword
+vxlan_gpe_decap_ioam_v4 (vlib_main_t * vm,
+			 vlib_node_runtime_t * node,
+			 vlib_frame_t * from_frame)
+{
+  return vxlan_gpe_decap_ioam (vm, node, from_frame, 0);
+}
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (vxlan_gpe_decap_ioam_v4_node) = {
+  .function = vxlan_gpe_decap_ioam_v4,
+  .name = "vxlan-gpe-decap-ioam-v4",
+  .vector_size = sizeof (u32),
+  .format_trace = format_vxlan_gpe_ioam_v4_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(vxlan_gpe_decap_ioam_v4_error_strings),
+  .error_strings = vxlan_gpe_decap_ioam_v4_error_strings,
+
+  .n_next_nodes = VXLAN_GPE_DECAP_IOAM_V4_N_NEXT,
+
+  .next_nodes = {
+    [VXLAN_GPE_DECAP_IOAM_V4_NEXT_POP] = "vxlan-gpe-pop-ioam-v4",
+    [VXLAN_GPE_DECAP_IOAM_V4_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/lib-vxlan-gpe/ioam_encap.c b/src/plugins/ioam/lib-vxlan-gpe/ioam_encap.c
new file mode 100644
index 00000000..4b18bfea
--- /dev/null
+++ b/src/plugins/ioam/lib-vxlan-gpe/ioam_encap.c
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h>
+
+/* Statistics (not really errors) */
+#define foreach_vxlan_gpe_encap_ioam_v4_error    \
+_(ENCAPSULATED, "good packets encapsulated")
+
+static char *vxlan_gpe_encap_ioam_v4_error_strings[] = {
+#define _(sym,string) string,
+  foreach_vxlan_gpe_encap_ioam_v4_error
+#undef _
+};
+
+typedef enum
+{
+#define _(sym,str) VXLAN_GPE_ENCAP_IOAM_V4_ERROR_##sym,
+  foreach_vxlan_gpe_encap_ioam_v4_error
+#undef _
+    VXLAN_GPE_ENCAP_IOAM_V4_N_ERROR,
+} vxlan_gpe_encap_ioam_v4_error_t;
+
+typedef enum
+{
+  VXLAN_GPE_ENCAP_IOAM_V4_NEXT_IP4_LOOKUP,
+  VXLAN_GPE_ENCAP_IOAM_V4_NEXT_DROP,
+  VXLAN_GPE_ENCAP_IOAM_V4_N_NEXT
+} vxlan_gpe_encap_ioam_v4_next_t;
+
+
+always_inline void
+vxlan_gpe_encap_ioam_v4_two_inline (vlib_main_t * vm,
+				    vlib_node_runtime_t * node,
+				    vxlan_gpe_main_t * ngm,
+				    vlib_buffer_t * b0, vlib_buffer_t * b1,
+				    u32 * next0, u32 * next1)
+{
+  next0[0] = next1[0] = VXLAN_GPE_ENCAP_IOAM_V4_NEXT_IP4_LOOKUP;
+  vxlan_gpe_encap_decap_ioam_v4_one_inline (vm, node, b0, next0,
+					    VXLAN_GPE_ENCAP_IOAM_V4_NEXT_DROP,
+					    0 /* use_adj */ );
+  vxlan_gpe_encap_decap_ioam_v4_one_inline (vm, node, b1, next1,
+					    VXLAN_GPE_ENCAP_IOAM_V4_NEXT_DROP,
+					    0 /* use_adj */ );
+}
+
+
+static uword
+vxlan_gpe_encap_ioam_v4 (vlib_main_t * vm,
+			 vlib_node_runtime_t * node,
+			 vlib_frame_t * from_frame)
+{
+  u32 n_left_from, next_index, *from, *to_next;
+  vxlan_gpe_main_t *ngm = &vxlan_gpe_main;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+
+	  next0 = next1 = VXLAN_GPE_ENCAP_IOAM_V4_NEXT_IP4_LOOKUP;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
+	    CLIB_PREFETCH (p3->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  vxlan_gpe_encap_ioam_v4_two_inline (vm, node, ngm, b0, b1,
+					      &next0, &next1);
+
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, bi1, next0,
+					   next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0 = VXLAN_GPE_ENCAP_IOAM_V4_NEXT_IP4_LOOKUP;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  vxlan_gpe_encap_decap_ioam_v4_one_inline (vm, node, b0,
+						    &next0,
+						    VXLAN_GPE_ENCAP_IOAM_V4_NEXT_DROP,
+						    0 /* use_adj */ );
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      vxlan_gpe_ioam_v4_trace_t *tr = vlib_add_trace (vm, node, b0,
+							      sizeof (*tr));
+	    }
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (vxlan_gpe_encap_ioam_v4_node) = {
+  .function = vxlan_gpe_encap_ioam_v4,
+  .name = "vxlan-gpe-encap-ioam-v4",
+  .vector_size = sizeof (u32),
+  .format_trace = format_vxlan_gpe_ioam_v4_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(vxlan_gpe_encap_ioam_v4_error_strings),
+  .error_strings = vxlan_gpe_encap_ioam_v4_error_strings,
+
+  .n_next_nodes = VXLAN_GPE_ENCAP_IOAM_V4_N_NEXT,
+
+  .next_nodes = {
+    [VXLAN_GPE_ENCAP_IOAM_V4_NEXT_IP4_LOOKUP] = "ip4-lookup",
+    [VXLAN_GPE_ENCAP_IOAM_V4_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/lib-vxlan-gpe/ioam_pop.c b/src/plugins/ioam/lib-vxlan-gpe/ioam_pop.c
new file mode 100644
index 00000000..55c33b14
--- /dev/null
+++ b/src/plugins/ioam/lib-vxlan-gpe/ioam_pop.c
@@ -0,0 +1,353 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
+
+/* Statistics (not really errors) */
+#define foreach_vxlan_gpe_pop_ioam_v4_error    \
+_(POPPED, "good packets popped")
+
+static char *vxlan_gpe_pop_ioam_v4_error_strings[] = {
+#define _(sym,string) string,
+  foreach_vxlan_gpe_pop_ioam_v4_error
+#undef _
+};
+
+typedef enum
+{
+#define _(sym,str) VXLAN_GPE_POP_IOAM_V4_ERROR_##sym,
+  foreach_vxlan_gpe_pop_ioam_v4_error
+#undef _
+    VXLAN_GPE_POP_IOAM_V4_N_ERROR,
+} vxlan_gpe_pop_ioam_v4_error_t;
+
+typedef struct
+{
+  ioam_trace_t fmt_trace;
+} vxlan_gpe_pop_ioam_v4_trace_t;
+
+
+u8 *
+format_vxlan_gpe_pop_ioam_v4_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  vxlan_gpe_pop_ioam_v4_trace_t *t1
+    = va_arg (*args, vxlan_gpe_pop_ioam_v4_trace_t *);
+  ioam_trace_t *t = &(t1->fmt_trace);
+  vxlan_gpe_ioam_option_t *fmt_trace0;
+  vxlan_gpe_ioam_option_t *opt0, *limit0;
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+
+  u8 type0;
+
+  fmt_trace0 = (vxlan_gpe_ioam_option_t *) t->option_data;
+
+  s = format (s, "VXLAN_GPE_IOAM_POP: next_index %d len %d traced %d",
+	      t->next_index, fmt_trace0->length, t->trace_len);
+
+  opt0 = (vxlan_gpe_ioam_option_t *) (fmt_trace0 + 1);
+  limit0 = (vxlan_gpe_ioam_option_t *) ((u8 *) fmt_trace0) + t->trace_len;
+
+  while (opt0 < limit0)
+    {
+      type0 = opt0->type;
+      switch (type0)
+	{
+	case 0:		/* Pad, just stop */
+	  opt0 = (vxlan_gpe_ioam_option_t *) ((u8 *) opt0) + 1;
+	  break;
+
+	default:
+	  if (hm->trace[type0])
+	    {
+	      s = (*hm->trace[type0]) (s, opt0);
+	    }
+	  else
+	    {
+	      s =
+		format (s, "\n    unrecognized option %d length %d", type0,
+			opt0->length);
+	    }
+	  opt0 =
+	    (vxlan_gpe_ioam_option_t *) (((u8 *) opt0) + opt0->length +
+					 sizeof (vxlan_gpe_ioam_option_t));
+	  break;
+	}
+    }
+
+  return s;
+}
+
+always_inline void
+vxlan_gpe_ioam_pop_v4 (vlib_main_t * vm, vlib_node_runtime_t * node,
+		       vlib_buffer_t * b0)
+{
+  ip4_header_t *ip0;
+  udp_header_t *udp_hdr0;
+  vxlan_gpe_header_t *gpe_hdr0;
+  vxlan_gpe_ioam_hdr_t *gpe_ioam0;
+
+  ip0 = vlib_buffer_get_current (b0);
+
+  udp_hdr0 = (udp_header_t *) (ip0 + 1);
+  gpe_hdr0 = (vxlan_gpe_header_t *) (udp_hdr0 + 1);
+  gpe_ioam0 = (vxlan_gpe_ioam_hdr_t *) (gpe_hdr0 + 1);
+
+  /* Pop the iOAM data */
+  vlib_buffer_advance (b0,
+		       (word) (sizeof (udp_header_t) +
+			       sizeof (ip4_header_t) +
+			       sizeof (vxlan_gpe_header_t) +
+			       gpe_ioam0->length));
+
+  return;
+}
+
+
+
+always_inline void
+vxlan_gpe_pop_ioam_v4_one_inline (vlib_main_t * vm,
+				  vlib_node_runtime_t * node,
+				  vxlan_gpe_main_t * ngm,
+				  vlib_buffer_t * b0, u32 * next0)
+{
+  CLIB_UNUSED (ip4_header_t * ip0);
+  CLIB_UNUSED (udp_header_t * udp_hdr0);
+  CLIB_UNUSED (vxlan_gpe_header_t * gpe_hdr0);
+  CLIB_UNUSED (vxlan_gpe_ioam_hdr_t * gpe_ioam0);
+  CLIB_UNUSED (vxlan_gpe_ioam_option_t * opt0);
+  CLIB_UNUSED (vxlan_gpe_ioam_option_t * limit0);
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+
+
+  /* Pop the iOAM header */
+  ip0 = vlib_buffer_get_current (b0);
+  udp_hdr0 = (udp_header_t *) (ip0 + 1);
+  gpe_hdr0 = (vxlan_gpe_header_t *) (udp_hdr0 + 1);
+  gpe_ioam0 = (vxlan_gpe_ioam_hdr_t *) (gpe_hdr0 + 1);
+  opt0 = (vxlan_gpe_ioam_option_t *) (gpe_ioam0 + 1);
+  limit0 = (vxlan_gpe_ioam_option_t *) ((u8 *) gpe_ioam0 + gpe_ioam0->length);
+
+  /*
+   * Basic validity checks
+   */
+  if (gpe_ioam0->length > clib_net_to_host_u16 (ip0->length))
+    {
+      next0[0] = VXLAN_GPE_INPUT_NEXT_DROP;
+      goto trace00;
+    }
+
+  /* Scan the set of h-b-h options, process ones that we understand */
+  while (opt0 < limit0)
+    {
+      u8 type0;
+      type0 = opt0->type;
+      switch (type0)
+	{
+	case 0:		/* Pad1 */
+	  opt0 = (vxlan_gpe_ioam_option_t *) ((u8 *) opt0) + 1;
+	  continue;
+	case 1:		/* PadN */
+	  break;
+	default:
+	  if (hm->pop_options[type0])
+	    {
+	      if ((*hm->pop_options[type0]) (ip0, opt0) < 0)
+		{
+		  next0[0] = VXLAN_GPE_INPUT_NEXT_DROP;
+		  goto trace00;
+		}
+	    }
+	  break;
+	}
+      opt0 =
+	(vxlan_gpe_ioam_option_t *) (((u8 *) opt0) + opt0->length +
+				     sizeof (vxlan_gpe_ioam_hdr_t));
+    }
+
+
+  next0[0] =
+    (gpe_ioam0->protocol < VXLAN_GPE_PROTOCOL_MAX) ?
+    ngm->
+    decap_next_node_list[gpe_ioam0->protocol] : VXLAN_GPE_INPUT_NEXT_DROP;
+
+trace00:
+  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+    {
+      vxlan_gpe_pop_ioam_v4_trace_t *t =
+	vlib_add_trace (vm, node, b0, sizeof (*t));
+      u32 trace_len = gpe_ioam0->length;
+      t->fmt_trace.next_index = next0[0];
+      /* Capture the h-b-h option verbatim */
+      trace_len =
+	trace_len <
+	ARRAY_LEN (t->fmt_trace.
+		   option_data) ? trace_len : ARRAY_LEN (t->fmt_trace.
+							 option_data);
+      t->fmt_trace.trace_len = trace_len;
+      clib_memcpy (&(t->fmt_trace.option_data), gpe_ioam0, trace_len);
+    }
+
+  /* Remove the iOAM header inside the VxLAN-GPE header */
+  vxlan_gpe_ioam_pop_v4 (vm, node, b0);
+  return;
+}
+
+always_inline void
+vxlan_gpe_pop_ioam_v4_two_inline (vlib_main_t * vm,
+				  vlib_node_runtime_t * node,
+				  vxlan_gpe_main_t * ngm,
+				  vlib_buffer_t * b0, vlib_buffer_t * b1,
+				  u32 * next0, u32 * next1)
+{
+
+  vxlan_gpe_pop_ioam_v4_one_inline (vm, node, ngm, b0, next0);
+  vxlan_gpe_pop_ioam_v4_one_inline (vm, node, ngm, b1, next1);
+}
+
+
+
+static uword
+vxlan_gpe_pop_ioam (vlib_main_t * vm,
+		    vlib_node_runtime_t * node,
+		    vlib_frame_t * from_frame, u8 is_ipv6)
+{
+  u32 n_left_from, next_index, *from, *to_next;
+  vxlan_gpe_main_t *ngm = &vxlan_gpe_main;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
+	    CLIB_PREFETCH (p3->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
+	  }
+
+	  bi0 = from[0];
+	  bi1 = from[1];
+	  to_next[0] = bi0;
+	  to_next[1] = bi1;
+	  from += 2;
+	  to_next += 2;
+	  n_left_to_next -= 2;
+	  n_left_from -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  vxlan_gpe_pop_ioam_v4_two_inline (vm, node, ngm, b0, b1, &next0,
+					    &next1);
+
+
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, bi1, next0,
+					   next1);
+	}
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  vxlan_gpe_pop_ioam_v4_one_inline (vm, node, ngm, b0, &next0);
+
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+
+static uword
+vxlan_gpe_pop_ioam_v4 (vlib_main_t * vm,
+		       vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  return vxlan_gpe_pop_ioam (vm, node, from_frame, 0);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (vxlan_gpe_pop_ioam_v4_node) = {
+  .function = vxlan_gpe_pop_ioam_v4,
+  .name = "vxlan-gpe-pop-ioam-v4",
+  .vector_size = sizeof (u32),
+  .format_trace = format_vxlan_gpe_pop_ioam_v4_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(vxlan_gpe_pop_ioam_v4_error_strings),
+  .error_strings = vxlan_gpe_pop_ioam_v4_error_strings,
+
+  .n_next_nodes = VXLAN_GPE_INPUT_N_NEXT,
+
+  .next_nodes = {
+#define _(s,n) [VXLAN_GPE_INPUT_NEXT_##s] = n,
+    foreach_vxlan_gpe_input_next
+#undef _
+  },
+};
+/* *INDENT-ON* */
+
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c b/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c
new file mode 100644
index 00000000..b42c357c
--- /dev/null
+++ b/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c
@@ -0,0 +1,188 @@
+ /*
+  * Copyright (c) 2015 Cisco and/or its affiliates.
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at:
+  *
+  *     http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ip/udp.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/fib_entry.h>
+
+/* Statistics (not really errors) */
+#define foreach_vxlan_gpe_transit_ioam_error    \
+_(ENCAPSULATED, "good packets encapsulated")
+
+static char *vxlan_gpe_transit_ioam_error_strings[] = {
+#define _(sym,string) string,
+  foreach_vxlan_gpe_transit_ioam_error
+#undef _
+};
+
+typedef enum
+{
+#define _(sym,str) VXLAN_GPE_TRANSIT_IOAM_ERROR_##sym,
+  foreach_vxlan_gpe_transit_ioam_error
+#undef _
+    VXLAN_GPE_TRANSIT_IOAM_N_ERROR,
+} vxlan_gpe_transit_ioam_error_t;
+
+typedef enum
+{
+  VXLAN_GPE_TRANSIT_IOAM_NEXT_OUTPUT,
+  VXLAN_GPE_TRANSIT_IOAM_NEXT_DROP,
+  VXLAN_GPE_TRANSIT_IOAM_N_NEXT
+} vxlan_gpe_transit_ioam_next_t;
+
+
+/* *INDENT-OFF* */
+VNET_FEATURE_INIT (vxlan_gpe_transit_ioam, static) =
+{
+  .arc_name = "ip4-output",
+  .node_name = "vxlan-gpe-transit-ioam",
+  .runs_before = VNET_FEATURES ("interface-output"),
+};
+/* *INDENT-ON* */
+
+static uword
+vxlan_gpe_transit_ioam (vlib_main_t * vm,
+			vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  u32 n_left_from, next_index, *from, *to_next;
+
+  from = vlib_frame_vector_args (from_frame);
+  n_left_from = from_frame->n_vectors;
+
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0 = VXLAN_GPE_TRANSIT_IOAM_NEXT_OUTPUT;
+
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+	  ip4_header_t *ip0;
+	  u32 iph_offset = 0;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  iph_offset = vnet_buffer (b0)->ip.save_rewrite_length;
+	  ip0 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b0)
+				  + iph_offset);
+
+	  /* just forward non ipv4 packets */
+	  if (PREDICT_FALSE
+	      ((ip0->ip_version_and_header_length & 0xF0) == 0x40))
+	    {
+	      /* ipv4 packets */
+	      udp_header_t *udp_hdr0 = (udp_header_t *) (ip0 + 1);
+	      if (PREDICT_FALSE
+		  ((ip0->protocol == IP_PROTOCOL_UDP) &&
+		   (clib_net_to_host_u16 (udp_hdr0->dst_port) ==
+		    UDP_DST_PORT_vxlan_gpe)))
+		{
+
+		  /* Check the iOAM header */
+		  vxlan_gpe_header_t *gpe_hdr0 =
+		    (vxlan_gpe_header_t *) (udp_hdr0 + 1);
+
+		  if (PREDICT_FALSE
+		      (gpe_hdr0->protocol == VXLAN_GPE_PROTOCOL_IOAM))
+		    {
+		      uword *t = NULL;
+		      vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+		      fib_prefix_t key4;
+		      memset (&key4, 0, sizeof (key4));
+		      key4.fp_proto = FIB_PROTOCOL_IP4;
+		      key4.fp_addr.ip4.as_u32 = ip0->dst_address.as_u32;
+		      t = hash_get_mem (hm->dst_by_ip4, &key4);
+		      if (t)
+			{
+
+
+			  vlib_buffer_advance (b0,
+					       (word) (sizeof
+						       (ethernet_header_t)));
+			  vxlan_gpe_encap_decap_ioam_v4_one_inline (vm, node,
+								    b0,
+								    &next0,
+								    VXLAN_GPE_TRANSIT_IOAM_NEXT_DROP,
+								    1
+								    /* use_adj */
+			    );
+			  vlib_buffer_advance (b0,
+					       -(word) (sizeof
+							(ethernet_header_t)));
+			}
+		    }
+		}
+	    }
+
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+					   n_left_to_next, bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return from_frame->n_vectors;
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (vxlan_gpe_transit_ioam_node) = {
+  .function = vxlan_gpe_transit_ioam,
+  .name = "vxlan-gpe-transit-ioam",
+  .vector_size = sizeof (u32),
+  .format_trace = format_vxlan_gpe_ioam_v4_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(vxlan_gpe_transit_ioam_error_strings),
+  .error_strings = vxlan_gpe_transit_ioam_error_strings,
+
+  .n_next_nodes = VXLAN_GPE_TRANSIT_IOAM_N_NEXT,
+
+  .next_nodes = {
+        [VXLAN_GPE_TRANSIT_IOAM_NEXT_OUTPUT] = "interface-output",
+        [VXLAN_GPE_TRANSIT_IOAM_NEXT_DROP] = "error-drop",
+  },
+
+};
+/* *INDENT-ON* */
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api b/src/plugins/ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api
new file mode 100644
index 00000000..056529a4
--- /dev/null
+++ b/src/plugins/ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api
@@ -0,0 +1,181 @@
+/* Hey Emacs use -*- mode: C -*- */
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/** \brief iOAM Over VxLAN-GPE - Set iOAM transport for VxLAN-GPE
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param id - profile id
+    @param trace_ppc - Trace PPC (none/encap/decap)
+    @param pow_enable - Proof of Work enabled or not flag
+    @param trace_enable - iOAM Trace enabled or not flag
+
+*/
+define vxlan_gpe_ioam_enable {
+  u32 client_index;
+  u32 context;
+  u16 id;
+  u8 trace_ppc;
+  u8 pow_enable;
+  u8 trace_enable;
+};
+
+/** \brief iOAM Over VxLAN-GPE - Set iOAM transport for VXLAN-GPE reply
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define vxlan_gpe_ioam_enable_reply {
+    u32 context;
+    i32 retval;
+};
+
+
+/** \brief iOAM for VxLAN-GPE disable
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param id - profile id
+*/
+define vxlan_gpe_ioam_disable
+{
+  u32 client_index;
+  u32 context;
+  u16 id;
+};
+
+/** \brief vxlan_gpe_ioam disable response
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+*/
+define vxlan_gpe_ioam_disable_reply
+{
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Enable iOAM for a VNI (VXLAN-GPE)
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param vni - VXLAN-GPE VNI
+    @param local - IPv4/6 Address of the local VTEP
+    @param remote - IPv4/6 Address of the remote VTEP
+
+*/
+define vxlan_gpe_ioam_vni_enable {
+  u32 client_index;
+  u32 context;
+  u32 vni;
+  u8  local[16];
+  u8  remote[16];
+  u8  is_ipv6;
+};
+
+/** \brief Reply to enable iOAM for a VNI (VXLAN-GPE)
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+
+*/
+define vxlan_gpe_ioam_vni_enable_reply {
+  u32 client_index;
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Disable iOAM for a VNI (VXLAN-GPE)
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param vni - VXLAN-GPE VNI
+    @param local - IPv4/6 Address of the local VTEP
+    @param remote - IPv4/6 Address of the remote VTEP
+
+*/
+define vxlan_gpe_ioam_vni_disable {
+  u32 client_index;
+  u32 context;
+  u32 vni;
+  u8  local[16];
+  u8  remote[16];
+  u8  is_ipv6;
+};
+
+/** \brief Reply to disable iOAM for a VNI (VXLAN-GPE)
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+
+*/
+define vxlan_gpe_ioam_vni_disable_reply {
+  u32 client_index;
+  u32 context;
+  i32 retval;
+};
+
+
+/** \brief Enable iOAM for a VXLAN-GPE transit
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param dst_addr - IPv4/6 Address of the local VTEP
+    @param outer_fib_index- FIB index
+
+*/
+define vxlan_gpe_ioam_transit_enable {
+  u32 client_index;
+  u32 context;
+  u32 outer_fib_index;
+  u8  dst_addr[16];
+  u8  is_ipv6;
+};
+
+/** \brief Reply to enable iOAM for VXLAN-GPE transit
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+
+*/
+define vxlan_gpe_ioam_transit_enable_reply {
+  u32 client_index;
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Disable iOAM for VXLAN-GPE transit
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param dst_addr - IPv4/6 Address of the local VTEP
+    @param outer_fib_index- FIB index
+
+*/
+define vxlan_gpe_ioam_transit_disable {
+  u32 client_index;
+  u32 context;
+  u32 outer_fib_index;
+  u8  dst_addr[16];
+  u8  is_ipv6;
+};
+
+/** \brief Reply to disable iOAM for VXLAN-GPE transit
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param retval - return value for request
+
+*/
+define vxlan_gpe_ioam_transit_disable_reply {
+  u32 client_index;
+  u32 context;
+  i32 retval;
+};
+
+
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h
new file mode 100644
index 00000000..06fa0d2c
--- /dev/null
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Include the generated file, see BUILT_SOURCES in Makefile.am */
+#include <ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api.h>
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
new file mode 100644
index 00000000..68752365
--- /dev/null
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
@@ -0,0 +1,378 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * vxlan_gpe_api.c - iOAM VxLAN-GPE related APIs to create
+ *               and maintain profiles
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/plugin/plugin.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
+
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+
+/* define message IDs */
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
+#undef vl_typedefs
+
+/* define generated endian-swappers */
+#define vl_endianfun
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
+#undef vl_api_version
+
+/*
+ * A handy macro to set up a message reply.
+ * Assumes that the following variables are available:
+ * mp - pointer to request message
+ * rmp - pointer to reply message type
+ * rv - return value
+ */
+
+#define VXLAN_GPE_REPLY_MACRO(t)                                \
+do {                                                            \
+    unix_shared_memory_queue_t * q =                            \
+    vl_api_client_index_to_input_queue (mp->client_index);      \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+                                                                \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+/* *INDENT-OFF* */
+#define VXLAN_GPE_REPLY_MACRO2(t, body)                         \
+do {                                                            \
+    unix_shared_memory_queue_t * q;                             \
+    rv = vl_msg_api_pd_handler (mp, rv);                        \
+    q = vl_api_client_index_to_input_queue (mp->client_index);  \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t));                               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+    do {body;} while (0);                                       \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+/* *INDENT-ON* */
+
+/* List of message types that this plugin understands */
+
+#define foreach_vxlan_gpe_plugin_api_msg                               \
+_(VXLAN_GPE_IOAM_ENABLE, vxlan_gpe_ioam_enable)                        \
+_(VXLAN_GPE_IOAM_DISABLE, vxlan_gpe_ioam_disable)                      \
+_(VXLAN_GPE_IOAM_VNI_ENABLE, vxlan_gpe_ioam_vni_enable)                \
+_(VXLAN_GPE_IOAM_VNI_DISABLE, vxlan_gpe_ioam_vni_disable)              \
+_(VXLAN_GPE_IOAM_TRANSIT_ENABLE, vxlan_gpe_ioam_transit_enable)        \
+_(VXLAN_GPE_IOAM_TRANSIT_DISABLE, vxlan_gpe_ioam_transit_disable)      \
+
+
+static void vl_api_vxlan_gpe_ioam_enable_t_handler
+  (vl_api_vxlan_gpe_ioam_enable_t * mp)
+{
+  int rv = 0;
+  vl_api_vxlan_gpe_ioam_enable_reply_t *rmp;
+  clib_error_t *error;
+  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
+
+  /* Ignoring the profile id as currently a single profile
+   * is supported */
+  error =
+    vxlan_gpe_ioam_enable (mp->trace_enable, mp->pow_enable, mp->trace_ppc);
+  if (error)
+    {
+      clib_error_report (error);
+      rv = clib_error_get_code (error);
+    }
+
+  VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_ENABLE_REPLY);
+}
+
+static void vl_api_vxlan_gpe_ioam_disable_t_handler
+  (vl_api_vxlan_gpe_ioam_disable_t * mp)
+{
+  int rv = 0;
+  vl_api_vxlan_gpe_ioam_disable_reply_t *rmp;
+  clib_error_t *error;
+  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
+
+  /* Ignoring the profile id as currently a single profile
+   * is supported */
+  error = vxlan_gpe_ioam_disable (0, 0, 0);
+  if (error)
+    {
+      clib_error_report (error);
+      rv = clib_error_get_code (error);
+    }
+
+  VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_DISABLE_REPLY);
+}
+
+static void vl_api_vxlan_gpe_ioam_vni_enable_t_handler
+  (vl_api_vxlan_gpe_ioam_vni_enable_t * mp)
+{
+  int rv = 0;
+  vl_api_vxlan_gpe_ioam_vni_enable_reply_t *rmp;
+  clib_error_t *error;
+  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
+  vxlan4_gpe_tunnel_key_t key4;
+  uword *p = NULL;
+  vxlan_gpe_main_t *gm = &vxlan_gpe_main;
+  vxlan_gpe_tunnel_t *t = 0;
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+  u32 vni;
+
+
+  if (!mp->is_ipv6)
+    {
+      clib_memcpy (&key4.local, &mp->local, sizeof (key4.local));
+      clib_memcpy (&key4.remote, &mp->remote, sizeof (key4.remote));
+      vni = clib_net_to_host_u32 (mp->vni);
+      key4.vni = clib_host_to_net_u32 (vni << 8);
+      key4.pad = 0;
+
+      p = hash_get_mem (gm->vxlan4_gpe_tunnel_by_key, &key4);
+    }
+  else
+    {
+      return;
+    }
+
+  if (!p)
+    return;
+
+  t = pool_elt_at_index (gm->tunnels, p[0]);
+
+  error = vxlan_gpe_ioam_set (t, hm->has_trace_option,
+			      hm->has_pot_option,
+			      hm->has_ppc_option, mp->is_ipv6);
+
+
+  if (error)
+    {
+      clib_error_report (error);
+      rv = clib_error_get_code (error);
+    }
+
+  VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_VNI_ENABLE_REPLY);
+}
+
+
+static void vl_api_vxlan_gpe_ioam_vni_disable_t_handler
+  (vl_api_vxlan_gpe_ioam_vni_disable_t * mp)
+{
+  int rv = 0;
+  vl_api_vxlan_gpe_ioam_vni_enable_reply_t *rmp;
+  clib_error_t *error;
+  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
+  vxlan4_gpe_tunnel_key_t key4;
+  uword *p = NULL;
+  vxlan_gpe_main_t *gm = &vxlan_gpe_main;
+  vxlan_gpe_tunnel_t *t = 0;
+  u32 vni;
+
+
+  if (!mp->is_ipv6)
+    {
+      clib_memcpy (&key4.local, &mp->local, sizeof (key4.local));
+      clib_memcpy (&key4.remote, &mp->remote, sizeof (key4.remote));
+      vni = clib_net_to_host_u32 (mp->vni);
+      key4.vni = clib_host_to_net_u32 (vni << 8);
+      key4.pad = 0;
+
+      p = hash_get_mem (gm->vxlan4_gpe_tunnel_by_key, &key4);
+    }
+  else
+    {
+      return;
+    }
+
+  if (!p)
+    return;
+
+  t = pool_elt_at_index (gm->tunnels, p[0]);
+
+  error = vxlan_gpe_ioam_clear (t, 0, 0, 0, 0);
+
+
+  if (error)
+    {
+      clib_error_report (error);
+      rv = clib_error_get_code (error);
+    }
+
+
+  VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_VNI_DISABLE_REPLY);
+}
+
+static void vl_api_vxlan_gpe_ioam_transit_enable_t_handler
+  (vl_api_vxlan_gpe_ioam_transit_enable_t * mp)
+{
+  int rv = 0;
+  vl_api_vxlan_gpe_ioam_transit_enable_reply_t *rmp;
+  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
+  ip46_address_t dst_addr;
+
+  memset (&dst_addr.ip4, 0, sizeof (dst_addr.ip4));
+  if (!mp->is_ipv6)
+    {
+      clib_memcpy (&dst_addr.ip4, &mp->dst_addr, sizeof (dst_addr.ip4));
+    }
+  rv = vxlan_gpe_enable_disable_ioam_for_dest (sm->vlib_main,
+					       dst_addr,
+					       ntohl (mp->outer_fib_index),
+					       mp->is_ipv6 ? 0 : 1,
+					       1 /* is_add */ );
+
+  VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_TRANSIT_ENABLE_REPLY);
+}
+
+static void vl_api_vxlan_gpe_ioam_transit_disable_t_handler
+  (vl_api_vxlan_gpe_ioam_transit_disable_t * mp)
+{
+  int rv = 0;
+  vl_api_vxlan_gpe_ioam_transit_disable_reply_t *rmp;
+  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
+  ip46_address_t dst_addr;
+
+  memset (&dst_addr.ip4, 0, sizeof (dst_addr.ip4));
+  if (!mp->is_ipv6)
+    {
+      clib_memcpy (&dst_addr.ip4, &mp->dst_addr, sizeof (dst_addr.ip4));
+    }
+
+  rv = vxlan_gpe_ioam_disable_for_dest (sm->vlib_main,
+					dst_addr,
+					ntohl (mp->outer_fib_index),
+					mp->is_ipv6 ? 0 : 1);
+  VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_TRANSIT_DISABLE_REPLY);
+}
+
+
+/*
+ * This routine exists to convince the vlib plugin framework that
+ * we haven't accidentally copied a random .dll into the plugin directory.
+ *
+ * Also collects global variable pointers passed from the vpp engine
+ */
+
+clib_error_t *
+vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
+		      int from_early_init)
+{
+  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
+  clib_error_t *error = 0;
+
+  sm->vlib_main = vm;
+  sm->vnet_main = h->vnet_main;
+  sm->unix_time_0 = (u32) time (0);	/* Store starting time */
+  sm->vlib_time_0 = vlib_time_now (vm);
+  return error;
+}
+
+/* Set up the API message handling tables */
+static clib_error_t *
+vxlan_gpe_plugin_api_hookup (vlib_main_t * vm)
+{
+  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,					\
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vxlan_gpe_plugin_api_msg;
+#undef _
+
+  return 0;
+}
+
+static clib_error_t *
+vxlan_gpe_init (vlib_main_t * vm)
+{
+  vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
+  clib_error_t *error = 0;
+  u8 *name;
+  u32 encap_node_index = vxlan_gpe_encap_ioam_v4_node.index;
+  u32 decap_node_index = vxlan_gpe_decap_ioam_v4_node.index;
+  vlib_node_t *vxlan_gpe_encap_node = NULL;
+  vlib_node_t *vxlan_gpe_decap_node = NULL;
+  uword next_node = 0;
+
+  name = format (0, "ioam_vxlan_gpe_%08x%c", api_version, 0);
+
+  /* Ask for a correctly-sized block of API message decode slots */
+  sm->msg_id_base = vl_msg_api_get_msg_ids
+    ((char *) name, VL_MSG_FIRST_AVAILABLE);
+
+  error = vxlan_gpe_plugin_api_hookup (vm);
+
+  /* Hook the ioam-encap node to vxlan-gpe-encap */
+  vxlan_gpe_encap_node = vlib_get_node_by_name (vm, (u8 *) "vxlan-gpe-encap");
+  sm->encap_v4_next_node =
+    vlib_node_add_next (vm, vxlan_gpe_encap_node->index, encap_node_index);
+
+  vxlan_gpe_decap_node =
+    vlib_get_node_by_name (vm, (u8 *) "vxlan4-gpe-input");
+  next_node =
+    vlib_node_add_next (vm, vxlan_gpe_decap_node->index, decap_node_index);
+  vxlan_gpe_register_decap_protocol (VXLAN_GPE_PROTOCOL_IOAM, next_node);
+
+  vec_new (vxlan_gpe_ioam_sw_interface_t, pool_elts (sm->sw_interfaces));
+  sm->dst_by_ip4 = hash_create_mem (0, sizeof (fib_prefix_t), sizeof (uword));
+
+  sm->dst_by_ip6 = hash_create_mem (0, sizeof (fib_prefix_t), sizeof (uword));
+
+  vxlan_gpe_ioam_interface_init ();
+  vec_free (name);
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (vxlan_gpe_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
new file mode 100644
index 00000000..6c04d9af
--- /dev/null
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
@@ -0,0 +1,773 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
+#include <vnet/ip/format.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
+#include <vnet/fib/ip6_fib.h>
+#include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/fib_entry.h>
+
+vxlan_gpe_ioam_main_t vxlan_gpe_ioam_main;
+
+int
+vxlan_gpe_ioam_set_rewrite (vxlan_gpe_tunnel_t * t, int has_trace_option,
+			    int has_pot_option, int has_ppc_option,
+			    u8 ipv6_set)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+  u32 size;
+  vxlan_gpe_ioam_hdr_t *vxlan_gpe_ioam_hdr;
+  u8 *current;
+  u8 trace_data_size = 0;
+  u8 pot_data_size = 0;
+
+  if (has_trace_option == 0 && has_pot_option == 0)
+    return -1;
+
+  /* Work out how much space we need */
+  size = sizeof (vxlan_gpe_ioam_hdr_t);
+
+  if (has_trace_option
+      && hm->add_options[VXLAN_GPE_OPTION_TYPE_IOAM_TRACE] != 0)
+    {
+      size += sizeof (vxlan_gpe_ioam_option_t);
+      size += hm->options_size[VXLAN_GPE_OPTION_TYPE_IOAM_TRACE];
+    }
+  if (has_pot_option
+      && hm->add_options[VXLAN_GPE_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] != 0)
+    {
+      size += sizeof (vxlan_gpe_ioam_option_t);
+      size += hm->options_size[VXLAN_GPE_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT];
+    }
+
+  t->rewrite_size = size;
+
+  if (!ipv6_set)
+    {
+      vxlan4_gpe_rewrite (t, size, VXLAN_GPE_PROTOCOL_IOAM,
+			  hm->encap_v4_next_node);
+      vxlan_gpe_ioam_hdr =
+	(vxlan_gpe_ioam_hdr_t *) (t->rewrite +
+				  sizeof (ip4_vxlan_gpe_header_t));
+    }
+  else
+    {
+      vxlan6_gpe_rewrite (t, size, VXLAN_GPE_PROTOCOL_IOAM,
+			  VXLAN_GPE_ENCAP_NEXT_IP6_LOOKUP);
+      vxlan_gpe_ioam_hdr =
+	(vxlan_gpe_ioam_hdr_t *) (t->rewrite +
+				  sizeof (ip6_vxlan_gpe_header_t));
+    }
+
+
+  vxlan_gpe_ioam_hdr->type = VXLAN_GPE_PROTOCOL_IOAM;
+  /* Length of the header in octets */
+  vxlan_gpe_ioam_hdr->length = size;
+  vxlan_gpe_ioam_hdr->protocol = t->protocol;
+  current = (u8 *) vxlan_gpe_ioam_hdr + sizeof (vxlan_gpe_ioam_hdr_t);
+
+  if (has_trace_option
+      && hm->add_options[VXLAN_GPE_OPTION_TYPE_IOAM_TRACE] != 0)
+    {
+      if (0 != hm->add_options[VXLAN_GPE_OPTION_TYPE_IOAM_TRACE] (current,
+								  &trace_data_size))
+	return -1;
+      current += trace_data_size;
+    }
+  if (has_pot_option
+      && hm->add_options[VXLAN_GPE_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] != 0)
+    {
+      pot_data_size =
+	hm->options_size[VXLAN_GPE_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT];
+      if (0 ==
+	  hm->add_options[VXLAN_GPE_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT]
+	  (current, &pot_data_size))
+	current += pot_data_size;
+    }
+
+  return 0;
+}
+
+int
+vxlan_gpe_ioam_clear_rewrite (vxlan_gpe_tunnel_t * t, int has_trace_option,
+			      int has_pot_option, int has_ppc_option,
+			      u8 ipv6_set)
+{
+
+  t->rewrite_size = 0;
+
+  if (!ipv6_set)
+    {
+      vxlan4_gpe_rewrite (t, 0, 0, VXLAN_GPE_ENCAP_NEXT_IP4_LOOKUP);
+    }
+  else
+    {
+      vxlan6_gpe_rewrite (t, 0, 0, VXLAN_GPE_ENCAP_NEXT_IP6_LOOKUP);
+    }
+
+
+  return 0;
+}
+
+clib_error_t *
+vxlan_gpe_ioam_clear (vxlan_gpe_tunnel_t * t,
+		      int has_trace_option, int has_pot_option,
+		      int has_ppc_option, u8 ipv6_set)
+{
+  int rv;
+  rv = vxlan_gpe_ioam_clear_rewrite (t, 0, 0, 0, 0);
+
+  if (rv == 0)
+    {
+      return (0);
+    }
+  else
+    {
+      return clib_error_return_code (0, rv, 0,
+				     "vxlan_gpe_ioam_clear_rewrite returned %d",
+				     rv);
+    }
+
+}
+
+
+clib_error_t *
+vxlan_gpe_ioam_set (vxlan_gpe_tunnel_t * t,
+		    int has_trace_option, int has_pot_option,
+		    int has_ppc_option, u8 ipv6_set)
+{
+  int rv;
+  rv = vxlan_gpe_ioam_set_rewrite (t, has_trace_option,
+				   has_pot_option, has_ppc_option, ipv6_set);
+
+  if (rv == 0)
+    {
+      return (0);
+    }
+  else
+    {
+      return clib_error_return_code (0, rv, 0,
+				     "vxlan_gpe_ioam_set_rewrite returned %d",
+				     rv);
+    }
+
+}
+
+static void
+vxlan_gpe_set_clear_output_feature_on_intf (vlib_main_t * vm,
+					    u32 sw_if_index0, u8 is_add)
+{
+
+
+
+  vnet_feature_enable_disable ("ip4-output", "vxlan-gpe-transit-ioam",
+			       sw_if_index0, is_add,
+			       0 /* void *feature_config */ ,
+			       0 /* u32 n_feature_config_bytes */ );
+  return;
+}
+
+void
+vxlan_gpe_clear_output_feature_on_all_intfs (vlib_main_t * vm)
+{
+  vnet_sw_interface_t *si = 0;
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+
+  pool_foreach (si, im->sw_interfaces, (
+					 {
+					 vxlan_gpe_set_clear_output_feature_on_intf
+					 (vm, si->sw_if_index, 0);
+					 }));
+  return;
+}
+
+
+extern fib_forward_chain_type_t
+fib_entry_get_default_chain_type (const fib_entry_t * fib_entry);
+
+int
+vxlan_gpe_enable_disable_ioam_for_dest (vlib_main_t * vm,
+					ip46_address_t dst_addr,
+					u32 outer_fib_index,
+					u8 is_ipv4, u8 is_add)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+  u32 fib_index0 = 0;
+  u32 sw_if_index0 = ~0;
+
+  fib_node_index_t fei = ~0;
+  fib_entry_t *fib_entry;
+  u32 adj_index0;
+  ip_adjacency_t *adj0;
+  fib_prefix_t fib_prefix;
+  //fib_forward_chain_type_t fct;
+  load_balance_t *lb_m, *lb_b;
+  const dpo_id_t *dpo0, *dpo1;
+  u32 i, j;
+  //vnet_hw_interface_t *hw;
+
+  if (is_ipv4)
+    {
+      memset (&fib_prefix, 0, sizeof (fib_prefix_t));
+      fib_prefix.fp_len = 32;
+      fib_prefix.fp_proto = FIB_PROTOCOL_IP4;
+      fib_prefix.fp_addr = dst_addr;
+    }
+  else
+    {
+      return 0;
+    }
+
+  fei = fib_table_lookup (fib_index0, &fib_prefix);
+  fib_entry = fib_entry_get (fei);
+
+  //fct = fib_entry_get_default_chain_type (fib_entry);
+
+  if (!dpo_id_is_valid (&fib_entry->fe_lb /*[fct] */ ))
+    {
+      return (-1);
+    }
+
+  lb_m = load_balance_get (fib_entry->fe_lb /*[fct] */ .dpoi_index);
+
+  for (i = 0; i < lb_m->lb_n_buckets; i++)
+    {
+      dpo0 = load_balance_get_bucket_i (lb_m, i);
+
+      if (dpo0->dpoi_type == DPO_LOAD_BALANCE)
+	{
+	  lb_b = load_balance_get (dpo0->dpoi_index);
+
+	  for (j = 0; j < lb_b->lb_n_buckets; j++)
+	    {
+	      dpo1 = load_balance_get_bucket_i (lb_b, j);
+
+	      if (dpo1->dpoi_type == DPO_ADJACENCY)
+		{
+		  adj_index0 = dpo1->dpoi_index;
+
+		  if (ADJ_INDEX_INVALID == adj_index0)
+		    {
+		      continue;
+		    }
+
+		  adj0 =
+		    ip_get_adjacency (&(ip4_main.lookup_main), adj_index0);
+		  sw_if_index0 = adj0->rewrite_header.sw_if_index;
+
+		  if (~0 == sw_if_index0)
+		    {
+		      continue;
+		    }
+
+
+		  if (is_add)
+		    {
+		      vnet_feature_enable_disable ("ip4-output",
+						   "vxlan-gpe-transit-ioam",
+						   sw_if_index0, is_add, 0
+						   /* void *feature_config */
+						   , 0	/* u32 n_feature_config_bytes */
+			);
+
+		      vec_validate_init_empty (hm->bool_ref_by_sw_if_index,
+					       sw_if_index0, ~0);
+		      hm->bool_ref_by_sw_if_index[sw_if_index0] = 1;
+		    }
+		  else
+		    {
+		      hm->bool_ref_by_sw_if_index[sw_if_index0] = ~0;
+		    }
+		}
+	    }
+	}
+    }
+
+  if (is_ipv4)
+    {
+
+      uword *t = NULL;
+      vxlan_gpe_ioam_dest_tunnels_t *t1;
+      fib_prefix_t key4, *key4_copy;
+      hash_pair_t *hp;
+      memset (&key4, 0, sizeof (key4));
+      key4.fp_proto = FIB_PROTOCOL_IP4;
+      key4.fp_addr.ip4.as_u32 = fib_prefix.fp_addr.ip4.as_u32;
+      t = hash_get_mem (hm->dst_by_ip4, &key4);
+      if (is_add)
+	{
+	  if (t)
+	    {
+	      return 0;
+	    }
+	  pool_get_aligned (hm->dst_tunnels, t1, CLIB_CACHE_LINE_BYTES);
+	  memset (t1, 0, sizeof (*t1));
+	  t1->fp_proto = FIB_PROTOCOL_IP4;
+	  t1->dst_addr.ip4.as_u32 = fib_prefix.fp_addr.ip4.as_u32;
+	  key4_copy = clib_mem_alloc (sizeof (*key4_copy));
+	  clib_memcpy (key4_copy, &key4, sizeof (*key4_copy));
+	  hash_set_mem (hm->dst_by_ip4, key4_copy, t1 - hm->dst_tunnels);
+	  /*
+	   * Attach to the FIB entry for the VxLAN-GPE destination
+	   * and become its child. The dest route will invoke a callback
+	   * when the fib entry changes, it can be used to
+	   * re-program the output feature on the egress interface.
+	   */
+
+	  const fib_prefix_t tun_dst_pfx = {
+	    .fp_len = 32,
+	    .fp_proto = FIB_PROTOCOL_IP4,
+	    .fp_addr = {.ip4 = t1->dst_addr.ip4,}
+	  };
+
+	  t1->fib_entry_index =
+	    fib_table_entry_special_add (outer_fib_index,
+					 &tun_dst_pfx,
+					 FIB_SOURCE_RR,
+					 FIB_ENTRY_FLAG_NONE,
+					 ADJ_INDEX_INVALID);
+	  t1->sibling_index =
+	    fib_entry_child_add (t1->fib_entry_index,
+				 hm->fib_entry_type, t1 - hm->dst_tunnels);
+	  t1->outer_fib_index = outer_fib_index;
+
+	}
+      else
+	{
+	  if (!t)
+	    {
+	      return 0;
+	    }
+	  t1 = pool_elt_at_index (hm->dst_tunnels, t[0]);
+	  hp = hash_get_pair (hm->dst_by_ip4, &key4);
+	  key4_copy = (void *) (hp->key);
+	  hash_unset_mem (hm->dst_by_ip4, &key4);
+	  clib_mem_free (key4_copy);
+	  pool_put (hm->dst_tunnels, t1);
+	}
+    }
+  else
+    {
+      // TBD for IPv6
+    }
+
+  return 0;
+}
+
+void
+vxlan_gpe_refresh_output_feature_on_all_dest (void)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+  vxlan_gpe_ioam_dest_tunnels_t *t;
+  u32 i;
+  if (pool_elts (hm->dst_tunnels) == 0)
+    return;
+  vxlan_gpe_clear_output_feature_on_all_intfs (hm->vlib_main);
+  i = vec_len (hm->bool_ref_by_sw_if_index);
+  vec_free (hm->bool_ref_by_sw_if_index);
+  vec_validate_init_empty (hm->bool_ref_by_sw_if_index, i, ~0);
+  pool_foreach (t, hm->dst_tunnels, (
+				      {
+				      vxlan_gpe_enable_disable_ioam_for_dest
+				      (hm->vlib_main,
+				       t->dst_addr,
+				       t->outer_fib_index,
+				       (t->fp_proto == FIB_PROTOCOL_IP4), 1
+				       /* is_add */
+				      );
+				      }
+		));
+  return;
+}
+
+void
+vxlan_gpe_clear_output_feature_on_select_intfs (void)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+  u32 sw_if_index0 = 0;
+  for (sw_if_index0 = 0;
+       sw_if_index0 < vec_len (hm->bool_ref_by_sw_if_index); sw_if_index0++)
+    {
+      if (hm->bool_ref_by_sw_if_index[sw_if_index0] == 0xFF)
+	{
+	  vxlan_gpe_set_clear_output_feature_on_intf
+	    (hm->vlib_main, sw_if_index0, 0);
+	}
+    }
+
+  return;
+}
+
+static clib_error_t *
+vxlan_gpe_set_ioam_rewrite_command_fn (vlib_main_t *
+				       vm,
+				       unformat_input_t
+				       * input, vlib_cli_command_t * cmd)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+  ip46_address_t local, remote;
+  u8 local_set = 0;
+  u8 remote_set = 0;
+  u8 ipv4_set = 0;
+  u8 ipv6_set = 0;
+  u32 vni;
+  u8 vni_set = 0;
+  u8 disable = 0;
+  clib_error_t *rv = 0;
+  vxlan4_gpe_tunnel_key_t key4;
+  vxlan6_gpe_tunnel_key_t key6;
+  uword *p;
+  vxlan_gpe_main_t *gm = &vxlan_gpe_main;
+  vxlan_gpe_tunnel_t *t = 0;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "local %U", unformat_ip4_address, &local.ip4))
+	{
+	  local_set = 1;
+	  ipv4_set = 1;
+	}
+      else
+	if (unformat (input, "remote %U", unformat_ip4_address, &remote.ip4))
+	{
+	  remote_set = 1;
+	  ipv4_set = 1;
+	}
+      else if (unformat (input, "local %U", unformat_ip6_address, &local.ip6))
+	{
+	  local_set = 1;
+	  ipv6_set = 1;
+	}
+      else
+	if (unformat (input, "remote %U", unformat_ip6_address, &remote.ip6))
+	{
+	  remote_set = 1;
+	  ipv6_set = 1;
+	}
+      else if (unformat (input, "vni %d", &vni))
+	vni_set = 1;
+      else if (unformat (input, "disable"))
+	disable = 1;
+      else
+	break;
+    }
+
+  if (local_set == 0)
+    return clib_error_return (0, "tunnel local address not specified");
+  if (remote_set == 0)
+    return clib_error_return (0, "tunnel remote address not specified");
+  if (ipv4_set && ipv6_set)
+    return clib_error_return (0, "both IPv4 and IPv6 addresses specified");
+  if ((ipv4_set
+       && memcmp (&local.ip4, &remote.ip4,
+		  sizeof (local.ip4)) == 0) || (ipv6_set
+						&&
+						memcmp
+						(&local.ip6,
+						 &remote.ip6,
+						 sizeof (local.ip6)) == 0))
+    return clib_error_return (0, "src and dst addresses are identical");
+  if (vni_set == 0)
+    return clib_error_return (0, "vni not specified");
+  if (!ipv6_set)
+    {
+      key4.local = local.ip4.as_u32;
+      key4.remote = remote.ip4.as_u32;
+      key4.vni = clib_host_to_net_u32 (vni << 8);
+      key4.pad = 0;
+      p = hash_get_mem (gm->vxlan4_gpe_tunnel_by_key, &key4);
+    }
+  else
+    {
+      key6.local.as_u64[0] = local.ip6.as_u64[0];
+      key6.local.as_u64[1] = local.ip6.as_u64[1];
+      key6.remote.as_u64[0] = remote.ip6.as_u64[0];
+      key6.remote.as_u64[1] = remote.ip6.as_u64[1];
+      key6.vni = clib_host_to_net_u32 (vni << 8);
+      p = hash_get_mem (gm->vxlan6_gpe_tunnel_by_key, &key6);
+    }
+
+  if (!p)
+    return clib_error_return (0, "VxLAN Tunnel not found");
+  t = pool_elt_at_index (gm->tunnels, p[0]);
+  if (!disable)
+    {
+      rv =
+	vxlan_gpe_ioam_set (t, hm->has_trace_option,
+			    hm->has_pot_option, hm->has_ppc_option, ipv6_set);
+    }
+  else
+    {
+      rv = vxlan_gpe_ioam_clear (t, 0, 0, 0, 0);
+    }
+  return rv;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vxlan_gpe_set_ioam_rewrite_cmd, static) = {
+  .path = "set vxlan-gpe-ioam",
+  .short_help = "set vxlan-gpe-ioam vxlan <src-ip> <dst_ip> <vnid> [disable]",
+  .function = vxlan_gpe_set_ioam_rewrite_command_fn,
+};
+/* *INDENT-ON* */
+
+
+
+clib_error_t *
+vxlan_gpe_ioam_enable (int has_trace_option,
+		       int has_pot_option, int has_ppc_option)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+  hm->has_trace_option = has_trace_option;
+  hm->has_pot_option = has_pot_option;
+  hm->has_ppc_option = has_ppc_option;
+  if (hm->has_trace_option)
+    {
+      vxlan_gpe_trace_profile_setup ();
+    }
+
+  return 0;
+}
+
+clib_error_t *
+vxlan_gpe_ioam_disable (int
+			has_trace_option,
+			int has_pot_option, int has_ppc_option)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+  hm->has_trace_option = has_trace_option;
+  hm->has_pot_option = has_pot_option;
+  hm->has_ppc_option = has_ppc_option;
+  if (!hm->has_trace_option)
+    {
+      vxlan_gpe_trace_profile_cleanup ();
+    }
+
+  return 0;
+}
+
+void
+vxlan_gpe_set_next_override (uword next)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+  hm->decap_v4_next_override = next;
+  return;
+}
+
+static clib_error_t *
+vxlan_gpe_set_ioam_flags_command_fn (vlib_main_t * vm,
+				     unformat_input_t
+				     * input, vlib_cli_command_t * cmd)
+{
+  int has_trace_option = 0;
+  int has_pot_option = 0;
+  int has_ppc_option = 0;
+  clib_error_t *rv = 0;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "trace"))
+	has_trace_option = 1;
+      else if (unformat (input, "pot"))
+	has_pot_option = 1;
+      else if (unformat (input, "ppc encap"))
+	has_ppc_option = PPC_ENCAP;
+      else if (unformat (input, "ppc decap"))
+	has_ppc_option = PPC_DECAP;
+      else if (unformat (input, "ppc none"))
+	has_ppc_option = PPC_NONE;
+      else
+	break;
+    }
+
+
+  rv =
+    vxlan_gpe_ioam_enable (has_trace_option, has_pot_option, has_ppc_option);
+  return rv;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vxlan_gpe_set_ioam_flags_cmd, static) =
+{
+.path = "set vxlan-gpe-ioam rewrite",
+.short_help = "set vxlan-gpe-ioam [trace] [pot] [ppc <encap|decap>]",
+.function = vxlan_gpe_set_ioam_flags_command_fn,};
+/* *INDENT-ON* */
+
+
+int vxlan_gpe_ioam_disable_for_dest
+  (vlib_main_t * vm, ip46_address_t dst_addr, u32 outer_fib_index,
+   u8 ipv4_set)
+{
+  vxlan_gpe_ioam_dest_tunnels_t *t;
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+
+  vxlan_gpe_enable_disable_ioam_for_dest (hm->vlib_main,
+					  dst_addr, outer_fib_index, ipv4_set,
+					  0);
+  if (pool_elts (hm->dst_tunnels) == 0)
+    {
+      vxlan_gpe_clear_output_feature_on_select_intfs ();
+      return 0;
+    }
+
+  pool_foreach (t, hm->dst_tunnels, (
+				      {
+				      vxlan_gpe_enable_disable_ioam_for_dest
+				      (hm->vlib_main,
+				       t->dst_addr,
+				       t->outer_fib_index,
+				       (t->fp_proto ==
+					FIB_PROTOCOL_IP4), 1 /* is_add */ );
+				      }
+		));
+  vxlan_gpe_clear_output_feature_on_select_intfs ();
+  return (0);
+
+}
+
+static clib_error_t *vxlan_gpe_set_ioam_transit_rewrite_command_fn
+  (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+  ip46_address_t dst_addr;
+  u8 dst_addr_set = 0;
+  u8 ipv4_set = 0;
+  u8 ipv6_set = 0;
+  u8 disable = 0;
+  clib_error_t *rv = 0;
+  u32 outer_fib_index = 0;
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "dst-ip %U", unformat_ip4_address, &dst_addr.ip4))
+	{
+	  dst_addr_set = 1;
+	  ipv4_set = 1;
+	}
+      else
+	if (unformat
+	    (input, "dst-ip %U", unformat_ip6_address, &dst_addr.ip6))
+	{
+	  dst_addr_set = 1;
+	  ipv6_set = 1;
+	}
+      else if (unformat (input, "outer-fib-index %d", &outer_fib_index))
+	{
+	}
+
+      else if (unformat (input, "disable"))
+	disable = 1;
+      else
+	break;
+    }
+
+  if (dst_addr_set == 0)
+    return clib_error_return (0, "tunnel destination address not specified");
+  if (ipv4_set && ipv6_set)
+    return clib_error_return (0, "both IPv4 and IPv6 addresses specified");
+  if (!disable)
+    {
+      vxlan_gpe_enable_disable_ioam_for_dest (hm->vlib_main,
+					      dst_addr, outer_fib_index,
+					      ipv4_set, 1);
+    }
+  else
+    {
+      vxlan_gpe_ioam_disable_for_dest
+	(vm, dst_addr, outer_fib_index, ipv4_set);
+    }
+  return rv;
+}
+
+       /* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vxlan_gpe_set_ioam_transit_rewrite_cmd, static) = {
+  .path = "set vxlan-gpe-ioam-transit",
+  .short_help = "set vxlan-gpe-ioam-transit dst-ip <dst_ip> [outer-fib-index <outer_fib_index>] [disable]",
+  .function = vxlan_gpe_set_ioam_transit_rewrite_command_fn,
+};
+/* *INDENT-ON* */
+
+clib_error_t *clear_vxlan_gpe_ioam_rewrite_command_fn
+  (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  return (vxlan_gpe_ioam_disable (0, 0, 0));
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vxlan_gpe_clear_ioam_flags_cmd, static) =
+{
+.path = "clear vxlan-gpe-ioam rewrite",
+.short_help = "clear vxlan-gpe-ioam rewrite",
+.function = clear_vxlan_gpe_ioam_rewrite_command_fn,
+};
+/* *INDENT-ON* */
+
+
+/**
+ * Function definition to backwalk a FIB node
+ */
+static fib_node_back_walk_rc_t
+vxlan_gpe_ioam_back_walk (fib_node_t * node, fib_node_back_walk_ctx_t * ctx)
+{
+  vxlan_gpe_refresh_output_feature_on_all_dest ();
+  return (FIB_NODE_BACK_WALK_CONTINUE);
+}
+
+/**
+ * Function definition to get a FIB node from its index
+ */
+static fib_node_t *
+vxlan_gpe_ioam_fib_node_get (fib_node_index_t index)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+  return (&hm->node);
+}
+
+/**
+ * Function definition to inform the FIB node that its last lock has gone.
+ */
+static void
+vxlan_gpe_ioam_last_lock_gone (fib_node_t * node)
+{
+  ASSERT (0);
+}
+
+
+/*
+ * Virtual function table registered by MPLS GRE tunnels
+ * for participation in the FIB object graph.
+ */
+const static fib_node_vft_t vxlan_gpe_ioam_vft = {
+  .fnv_get = vxlan_gpe_ioam_fib_node_get,
+  .fnv_last_lock = vxlan_gpe_ioam_last_lock_gone,
+  .fnv_back_walk = vxlan_gpe_ioam_back_walk,
+};
+
+void
+vxlan_gpe_ioam_interface_init (void)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+  hm->fib_entry_type = fib_node_register_new_type (&vxlan_gpe_ioam_vft);
+  return;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h
new file mode 100644
index 00000000..0711b87a
--- /dev/null
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_vxlan_gpe_ioam_h__
+#define __included_vxlan_gpe_ioam_h__
+
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h>
+#include <vnet/ip/ip.h>
+
+
+typedef struct vxlan_gpe_sw_interface_
+{
+  u32 sw_if_index;
+} vxlan_gpe_ioam_sw_interface_t;
+
+typedef struct vxlan_gpe_dest_tunnels_
+{
+  ip46_address_t dst_addr;
+  u32 fp_proto;
+  u32 sibling_index;
+  fib_node_index_t fib_entry_index;
+  u32 outer_fib_index;
+} vxlan_gpe_ioam_dest_tunnels_t;
+
+typedef struct vxlan_gpe_ioam_main_
+{
+  /**
+   * Linkage into the FIB object graph
+   */
+  fib_node_t node;
+
+  /* time scale transform. Joy. */
+  u32 unix_time_0;
+  f64 vlib_time_0;
+
+
+  /* Trace option */
+  u8 has_trace_option;
+
+  /* Pot option */
+  u8 has_pot_option;
+
+#define PPC_NONE  0
+#define PPC_ENCAP 1
+#define PPC_DECAP 2
+  u8 has_ppc_option;
+
+#define TSP_SECONDS              0
+#define TSP_MILLISECONDS         1
+#define TSP_MICROSECONDS         2
+#define TSP_NANOSECONDS          3
+
+  /* Array of function pointers to ADD and POP VxLAN-GPE iOAM option handling routines */
+  u8 options_size[256];
+  int (*add_options[256]) (u8 * rewrite_string, u8 * rewrite_size);
+  int (*pop_options[256]) (ip4_header_t * ip, vxlan_gpe_ioam_option_t * opt);
+
+  /* Array of function pointers to iOAM option handling routines */
+  int (*options[256]) (vlib_buffer_t * b, vxlan_gpe_ioam_option_t * opt,
+		       u8 is_ipv4, u8 use_adj);
+  u8 *(*trace[256]) (u8 * s, vxlan_gpe_ioam_option_t * opt);
+
+  /* API message ID base */
+  u16 msg_id_base;
+
+  /* Override to export for iOAM */
+  uword decap_v4_next_override;
+  uword decap_v6_next_override;
+
+  /* sequence of node graph for encap */
+  uword encap_v4_next_node;
+  uword encap_v6_next_node;
+
+  /* Software interfaces. */
+  vxlan_gpe_ioam_sw_interface_t *sw_interfaces;
+
+  /* hash ip4/ip6 -> list of destinations for doing transit iOAM operation */
+  vxlan_gpe_ioam_dest_tunnels_t *dst_tunnels;
+  uword *dst_by_ip4;
+  uword *dst_by_ip6;
+
+  /** per sw_if_index, to maintain bitmap */
+  u8 *bool_ref_by_sw_if_index;
+  fib_node_type_t fib_entry_type;
+
+  /** State convenience vlib_main_t */
+  vlib_main_t *vlib_main;
+  /** State convenience vnet_main_t */
+  vnet_main_t *vnet_main;
+
+
+} vxlan_gpe_ioam_main_t;
+extern vxlan_gpe_ioam_main_t vxlan_gpe_ioam_main;
+
+/*
+ * Primary h-b-h handler trace support
+ */
+typedef struct
+{
+  u32 next_index;
+  u32 trace_len;
+  u8 option_data[256];
+} ioam_trace_t;
+
+
+extern vlib_node_registration_t vxlan_gpe_encap_ioam_v4_node;
+extern vlib_node_registration_t vxlan_gpe_decap_ioam_v4_node;
+extern vlib_node_registration_t vxlan_gpe_transit_ioam_v4_node;
+
+clib_error_t *vxlan_gpe_ioam_enable (int has_trace_option, int has_pot_option,
+				     int has_ppc_option);
+
+clib_error_t *vxlan_gpe_ioam_disable (int has_trace_option,
+				      int has_pot_option, int has_ppc_option);
+
+clib_error_t *vxlan_gpe_ioam_set (vxlan_gpe_tunnel_t * t,
+				  int has_trace_option,
+				  int has_pot_option,
+				  int has_ppc_option, u8 ipv6_set);
+clib_error_t *vxlan_gpe_ioam_clear (vxlan_gpe_tunnel_t * t,
+				    int has_trace_option, int has_pot_option,
+				    int has_ppc_option, u8 ipv6_set);
+
+int vxlan_gpe_ioam_add_register_option (u8 option,
+					u8 size,
+					int rewrite_options (u8 *
+							     rewrite_string,
+							     u8 *
+							     rewrite_size));
+
+int vxlan_gpe_add_unregister_option (u8 option);
+
+int vxlan_gpe_ioam_register_option (u8 option,
+				    int options (vlib_buffer_t * b,
+						 vxlan_gpe_ioam_option_t *
+						 opt, u8 is_ipv4, u8 use_adj),
+				    u8 * trace (u8 * s,
+						vxlan_gpe_ioam_option_t *
+						opt));
+int vxlan_gpe_ioam_unregister_option (u8 option);
+
+int vxlan_gpe_trace_profile_setup (void);
+
+int vxlan_gpe_trace_profile_cleanup (void);
+extern void vxlan_gpe_ioam_interface_init (void);
+int
+vxlan_gpe_enable_disable_ioam_for_dest (vlib_main_t * vm,
+					ip46_address_t dst_addr,
+					u32 outer_fib_index,
+					u8 is_ipv4, u8 is_add);
+int vxlan_gpe_ioam_disable_for_dest
+  (vlib_main_t * vm, ip46_address_t dst_addr, u32 outer_fib_index,
+   u8 ipv4_set);
+
+typedef enum
+{
+  VXLAN_GPE_DECAP_IOAM_V4_NEXT_POP,
+  VXLAN_GPE_DECAP_IOAM_V4_NEXT_DROP,
+  VXLAN_GPE_DECAP_IOAM_V4_N_NEXT
+} vxlan_gpe_decap_ioam_v4_next_t;
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h
new file mode 100644
index 00000000..a7ef859e
--- /dev/null
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_vxlan_gpe_ioam_packet_h__
+#define __included_vxlan_gpe_ioam_packet_h__
+
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
+#include <vnet/ip/ip.h>
+
+
+
+#define VXLAN_GPE_OPTION_TYPE_IOAM_TRACE   59
+#define VXLAN_GPE_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT 60
+
+/**
+ * @brief VXLAN GPE Extension (iOAM) Header definition
+ */
+typedef struct
+{
+  u8 type;
+  u8 length;
+  /** Reserved */
+  u8 reserved;
+  /** see vxlan_gpe_protocol_t */
+  u8 protocol;
+} vxlan_gpe_ioam_hdr_t;
+
+/*
+ * @brief VxLAN GPE iOAM Option definition
+ */
+typedef struct
+{
+  /* Option Type */
+  u8 type;
+  /* Length in octets of the option data field */
+  u8 length;
+} vxlan_gpe_ioam_option_t;
+
+
+#endif
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c
new file mode 100644
index 00000000..e37b1642
--- /dev/null
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c
@@ -0,0 +1,552 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vppinfra/error.h>
+
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
+
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+
+#include <ioam/lib-trace/trace_util.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
+
+/* Timestamp precision multipliers for seconds, milliseconds, microseconds
+ * and nanoseconds respectively.
+ */
+static f64 trace_tsp_mul[4] = { 1, 1e3, 1e6, 1e9 };
+
+typedef union
+{
+  u64 as_u64;
+  u32 as_u32[2];
+} time_u64_t;
+
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED(struct {
+  vxlan_gpe_ioam_option_t hdr;
+  u8 ioam_trace_type;
+  u8 data_list_elts_left;
+  u32 elts[0]; /* Variable type. So keep it generic */
+}) vxlan_gpe_ioam_trace_option_t;
+/* *INDENT-ON* */
+
+
+#define foreach_vxlan_gpe_ioam_trace_stats				\
+  _(SUCCESS, "Pkts updated with TRACE records")					\
+  _(FAILED, "Errors in TRACE due to lack of TRACE records")
+
+static char *vxlan_gpe_ioam_trace_stats_strings[] = {
+#define _(sym,string) string,
+  foreach_vxlan_gpe_ioam_trace_stats
+#undef _
+};
+
+typedef enum
+{
+#define _(sym,str) VXLAN_GPE_IOAM_TRACE_##sym,
+  foreach_vxlan_gpe_ioam_trace_stats
+#undef _
+    VXLAN_GPE_IOAM_TRACE_N_STATS,
+} vxlan_gpe_ioam_trace_stats_t;
+
+
+typedef struct
+{
+  /* stats */
+  u64 counters[ARRAY_LEN (vxlan_gpe_ioam_trace_stats_strings)];
+
+  /* convenience */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} vxlan_gpe_ioam_trace_main_t;
+
+vxlan_gpe_ioam_trace_main_t vxlan_gpe_ioam_trace_main;
+
+int
+vxlan_gpe_ioam_add_register_option (u8 option,
+				    u8 size,
+				    int rewrite_options (u8 * rewrite_string,
+							 u8 * rewrite_size))
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+
+  ASSERT (option < ARRAY_LEN (hm->add_options));
+
+  /* Already registered */
+  if (hm->add_options[option])
+    return (-1);
+
+  hm->add_options[option] = rewrite_options;
+  hm->options_size[option] = size;
+
+  return (0);
+}
+
+int
+vxlan_gpe_add_unregister_option (u8 option)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+
+  ASSERT (option < ARRAY_LEN (hm->add_options));
+
+  /* Not registered */
+  if (!hm->add_options[option])
+    return (-1);
+
+  hm->add_options[option] = NULL;
+  hm->options_size[option] = 0;
+  return (0);
+}
+
+
+int
+vxlan_gpe_ioam_register_option (u8 option,
+				int options (vlib_buffer_t * b,
+					     vxlan_gpe_ioam_option_t * opt,
+					     u8 is_ipv4, u8 use_adj),
+				u8 * trace (u8 * s,
+					    vxlan_gpe_ioam_option_t * opt))
+{
+  vxlan_gpe_ioam_main_t *im = &vxlan_gpe_ioam_main;
+
+  ASSERT (option < ARRAY_LEN (im->options));
+
+  /* Already registered */
+  if (im->options[option])
+    return (-1);
+
+  im->options[option] = options;
+  im->trace[option] = trace;
+
+  return (0);
+}
+
+int
+vxlan_gpe_ioam_unregister_option (u8 option)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+
+  ASSERT (option < ARRAY_LEN (hm->options));
+
+  /* Not registered */
+  if (!hm->options[option])
+    return (-1);
+
+  hm->options[option] = NULL;
+  hm->trace[option] = NULL;
+
+  return (0);
+}
+
+
+always_inline void
+vxlan_gpe_ioam_trace_stats_increment_counter (u32 counter_index,
+					      u64 increment)
+{
+  vxlan_gpe_ioam_trace_main_t *hm = &vxlan_gpe_ioam_trace_main;
+
+  hm->counters[counter_index] += increment;
+}
+
+
+static u8 *
+format_ioam_data_list_element (u8 * s, va_list * args)
+{
+  u32 *elt = va_arg (*args, u32 *);
+  u8 *trace_type_p = va_arg (*args, u8 *);
+  u8 trace_type = *trace_type_p;
+
+
+  if (trace_type & BIT_TTL_NODEID)
+    {
+      u32 ttl_node_id_host_byte_order = clib_net_to_host_u32 (*elt);
+      s = format (s, "ttl 0x%x node id 0x%x ",
+		  ttl_node_id_host_byte_order >> 24,
+		  ttl_node_id_host_byte_order & 0x00FFFFFF);
+
+      elt++;
+    }
+
+  if (trace_type & BIT_ING_INTERFACE && trace_type & BIT_ING_INTERFACE)
+    {
+      u32 ingress_host_byte_order = clib_net_to_host_u32 (*elt);
+      s = format (s, "ingress 0x%x egress 0x%x ",
+		  ingress_host_byte_order >> 16,
+		  ingress_host_byte_order & 0xFFFF);
+      elt++;
+    }
+
+  if (trace_type & BIT_TIMESTAMP)
+    {
+      u32 ts_in_host_byte_order = clib_net_to_host_u32 (*elt);
+      s = format (s, "ts 0x%x \n", ts_in_host_byte_order);
+      elt++;
+    }
+
+  if (trace_type & BIT_APPDATA)
+    {
+      u32 appdata_in_host_byte_order = clib_net_to_host_u32 (*elt);
+      s = format (s, "app 0x%x ", appdata_in_host_byte_order);
+      elt++;
+    }
+
+  return s;
+}
+
+
+
+int
+vxlan_gpe_ioam_trace_rewrite_handler (u8 * rewrite_string, u8 * rewrite_size)
+{
+  vxlan_gpe_ioam_trace_option_t *trace_option = NULL;
+  u8 trace_data_size = 0;
+  u8 trace_option_elts = 0;
+  trace_profile *profile = NULL;
+
+
+  profile = trace_profile_find ();
+
+  if (PREDICT_FALSE (!profile))
+    {
+      return (-1);
+    }
+
+  if (PREDICT_FALSE (!rewrite_string))
+    return -1;
+
+  trace_option_elts = profile->num_elts;
+  trace_data_size = fetch_trace_data_size (profile->trace_type);
+  trace_option = (vxlan_gpe_ioam_trace_option_t *) rewrite_string;
+  trace_option->hdr.type = VXLAN_GPE_OPTION_TYPE_IOAM_TRACE;
+  trace_option->hdr.length = 2 /*ioam_trace_type,data_list_elts_left */  +
+    trace_option_elts * trace_data_size;
+  trace_option->ioam_trace_type = profile->trace_type & TRACE_TYPE_MASK;
+  trace_option->data_list_elts_left = trace_option_elts;
+  *rewrite_size =
+    sizeof (vxlan_gpe_ioam_trace_option_t) +
+    (trace_option_elts * trace_data_size);
+
+  return 0;
+}
+
+
+int
+vxlan_gpe_ioam_trace_data_list_handler (vlib_buffer_t * b,
+					vxlan_gpe_ioam_option_t * opt,
+					u8 is_ipv4, u8 use_adj)
+{
+  u8 elt_index = 0;
+  vxlan_gpe_ioam_trace_option_t *trace =
+    (vxlan_gpe_ioam_trace_option_t *) opt;
+  time_u64_t time_u64;
+  u32 *elt;
+  int rv = 0;
+  trace_profile *profile = NULL;
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+
+
+  profile = trace_profile_find ();
+
+  if (PREDICT_FALSE (!profile))
+    {
+      return (-1);
+    }
+
+
+  time_u64.as_u64 = 0;
+
+  if (PREDICT_TRUE (trace->data_list_elts_left))
+    {
+      trace->data_list_elts_left--;
+      /* fetch_trace_data_size returns in bytes. Convert it to 4-bytes
+       * to skip to this node's location.
+       */
+      elt_index =
+	trace->data_list_elts_left *
+	fetch_trace_data_size (trace->ioam_trace_type) / 4;
+      elt = &trace->elts[elt_index];
+      if (is_ipv4)
+	{
+	  if (trace->ioam_trace_type & BIT_TTL_NODEID)
+	    {
+	      ip4_header_t *ip0 = vlib_buffer_get_current (b);
+	      /* The transit case is the only case where the TTL decrement happens
+	       * before iOAM processing. For now, use the use_adj flag as an overload.
+	       * We can probably use a separate flag instead of overloading the use_adj flag.
+	       */
+	      *elt = clib_host_to_net_u32 (((ip0->ttl - 1 + use_adj) << 24) |
+					   profile->node_id);
+	      elt++;
+	    }
+
+	  if (trace->ioam_trace_type & BIT_ING_INTERFACE)
+	    {
+	      u16 tx_if = 0;
+	      u32 adj_index = vnet_buffer (b)->ip.adj_index[VLIB_TX];
+	      ip4_main_t *im4 = &ip4_main;
+	      ip_lookup_main_t *lm = &im4->lookup_main;
+	      if (use_adj)
+		{
+		  ip_adjacency_t *adj = ip_get_adjacency (lm, adj_index);
+		  tx_if = adj->rewrite_header.sw_if_index & 0xFFFF;
+		}
+
+	      *elt =
+		(vnet_buffer (b)->sw_if_index[VLIB_RX] & 0xFFFF) << 16 |
+		tx_if;
+	      *elt = clib_host_to_net_u32 (*elt);
+	      elt++;
+	    }
+	}
+      else
+	{
+	  if (trace->ioam_trace_type & BIT_TTL_NODEID)
+	    {
+	      ip6_header_t *ip0 = vlib_buffer_get_current (b);
+	      *elt = clib_host_to_net_u32 ((ip0->hop_limit << 24) |
+					   profile->node_id);
+	      elt++;
+	    }
+	  if (trace->ioam_trace_type & BIT_ING_INTERFACE)
+	    {
+	      u16 tx_if = 0;
+	      u32 adj_index = vnet_buffer (b)->ip.adj_index[VLIB_TX];
+	      ip6_main_t *im6 = &ip6_main;
+	      ip_lookup_main_t *lm = &im6->lookup_main;
+	      if (use_adj)
+		{
+		  ip_adjacency_t *adj = ip_get_adjacency (lm, adj_index);
+		  tx_if = adj->rewrite_header.sw_if_index & 0xFFFF;
+		}
+
+	      *elt =
+		(vnet_buffer (b)->sw_if_index[VLIB_RX] & 0xFFFF) << 16 |
+		tx_if;
+	      *elt = clib_host_to_net_u32 (*elt);
+	      elt++;
+	    }
+	}
+
+      if (trace->ioam_trace_type & BIT_TIMESTAMP)
+	{
+	  /* Send least significant 32 bits */
+	  f64 time_f64 =
+	    (f64) (((f64) hm->unix_time_0) +
+		   (vlib_time_now (hm->vlib_main) - hm->vlib_time_0));
+
+	  time_u64.as_u64 = time_f64 * trace_tsp_mul[profile->trace_tsp];
+	  *elt = clib_host_to_net_u32 (time_u64.as_u32[0]);
+	  elt++;
+	}
+
+      if (trace->ioam_trace_type & BIT_APPDATA)
+	{
+	  /* $$$ set elt0->app_data */
+	  *elt = clib_host_to_net_u32 (profile->app_data);
+	  elt++;
+	}
+      vxlan_gpe_ioam_trace_stats_increment_counter
+	(VXLAN_GPE_IOAM_TRACE_SUCCESS, 1);
+    }
+  else
+    {
+      vxlan_gpe_ioam_trace_stats_increment_counter
+	(VXLAN_GPE_IOAM_TRACE_FAILED, 1);
+    }
+  return (rv);
+}
+
+u8 *
+vxlan_gpe_ioam_trace_data_list_trace_handler (u8 * s,
+					      vxlan_gpe_ioam_option_t * opt)
+{
+  vxlan_gpe_ioam_trace_option_t *trace;
+  u8 trace_data_size_in_words = 0;
+  u32 *elt;
+  int elt_index = 0;
+
+  trace = (vxlan_gpe_ioam_trace_option_t *) opt;
+  s =
+    format (s, "  Trace Type 0x%x , %d elts left\n", trace->ioam_trace_type,
+	    trace->data_list_elts_left);
+  trace_data_size_in_words =
+    fetch_trace_data_size (trace->ioam_trace_type) / 4;
+  elt = &trace->elts[0];
+  while ((u8 *) elt < ((u8 *) (&trace->elts[0]) + trace->hdr.length - 2
+		       /* -2 accounts for ioam_trace_type,elts_left */ ))
+    {
+      s = format (s, "    [%d] %U\n", elt_index,
+		  format_ioam_data_list_element,
+		  elt, &trace->ioam_trace_type);
+      elt_index++;
+      elt += trace_data_size_in_words;
+    }
+  return (s);
+}
+
+
+static clib_error_t *
+vxlan_gpe_show_ioam_trace_cmd_fn (vlib_main_t * vm,
+				  unformat_input_t * input,
+				  vlib_cli_command_t * cmd)
+{
+  vxlan_gpe_ioam_trace_main_t *hm = &vxlan_gpe_ioam_trace_main;
+  u8 *s = 0;
+  int i = 0;
+
+  for (i = 0; i < VXLAN_GPE_IOAM_TRACE_N_STATS; i++)
+    {
+      s = format (s, " %s - %lu\n", vxlan_gpe_ioam_trace_stats_strings[i],
+		  hm->counters[i]);
+    }
+
+  vlib_cli_output (vm, "%v", s);
+  vec_free (s);
+  return 0;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vxlan_gpe_show_ioam_trace_cmd, static) = {
+  .path = "show ioam vxlan-gpe trace",
+  .short_help = "iOAM trace statistics",
+  .function = vxlan_gpe_show_ioam_trace_cmd_fn,
+};
+/* *INDENT-ON* */
+
+
+static clib_error_t *
+vxlan_gpe_ioam_trace_init (vlib_main_t * vm)
+{
+  vxlan_gpe_ioam_trace_main_t *hm = &vxlan_gpe_ioam_trace_main;
+  clib_error_t *error;
+
+  if ((error = vlib_call_init_function (vm, ip_main_init)))
+    return (error);
+
+  if ((error = vlib_call_init_function (vm, ip6_lookup_init)))
+    return error;
+
+  if ((error = vlib_call_init_function (vm, vxlan_gpe_init)))
+    return (error);
+
+  hm->vlib_main = vm;
+  hm->vnet_main = vnet_get_main ();
+  memset (hm->counters, 0, sizeof (hm->counters));
+
+  if (vxlan_gpe_ioam_register_option
+      (VXLAN_GPE_OPTION_TYPE_IOAM_TRACE,
+       vxlan_gpe_ioam_trace_data_list_handler,
+       vxlan_gpe_ioam_trace_data_list_trace_handler) < 0)
+    return (clib_error_create
+	    ("registration of VXLAN_GPE_OPTION_TYPE_IOAM_TRACE failed"));
+
+
+  if (vxlan_gpe_ioam_add_register_option
+      (VXLAN_GPE_OPTION_TYPE_IOAM_TRACE,
+       sizeof (vxlan_gpe_ioam_trace_option_t),
+       vxlan_gpe_ioam_trace_rewrite_handler) < 0)
+    return (clib_error_create
+	    ("registration of VXLAN_GPE_OPTION_TYPE_IOAM_TRACE for rewrite failed"));
+
+
+  return (0);
+}
+
+VLIB_INIT_FUNCTION (vxlan_gpe_ioam_trace_init);
+
+int
+vxlan_gpe_trace_profile_cleanup (void)
+{
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+
+  hm->options_size[VXLAN_GPE_OPTION_TYPE_IOAM_TRACE] = 0;
+
+  return 0;
+
+}
+
+static int
+vxlan_gpe_ioam_trace_get_sizeof_handler (u32 * result)
+{
+  u16 size = 0;
+  u8 trace_data_size = 0;
+  trace_profile *profile = NULL;
+
+  *result = 0;
+
+  profile = trace_profile_find ();
+
+  if (PREDICT_FALSE (!profile))
+    {
+      return (-1);
+    }
+
+  trace_data_size = fetch_trace_data_size (profile->trace_type);
+  if (PREDICT_FALSE (trace_data_size == 0))
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  if (PREDICT_FALSE (profile->num_elts * trace_data_size > 254))
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  size +=
+    sizeof (vxlan_gpe_ioam_trace_option_t) +
+    profile->num_elts * trace_data_size;
+  *result = size;
+
+  return 0;
+}
+
+
+int
+vxlan_gpe_trace_profile_setup (void)
+{
+  u32 trace_size = 0;
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+
+  trace_profile *profile = NULL;
+
+
+  profile = trace_profile_find ();
+
+  if (PREDICT_FALSE (!profile))
+    {
+      return (-1);
+    }
+
+
+  if (vxlan_gpe_ioam_trace_get_sizeof_handler (&trace_size) < 0)
+    return (-1);
+
+  hm->options_size[VXLAN_GPE_OPTION_TYPE_IOAM_TRACE] = trace_size;
+
+  return (0);
+}
+
+
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h
new file mode 100644
index 00000000..c0ad8d9d
--- /dev/null
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_vxlan_gpe_ioam_util_h__
+#define __included_vxlan_gpe_ioam_util_h__
+
+#include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
+#include <vnet/ip/ip.h>
+
+
+typedef struct
+{
+  u32 tunnel_index;
+  ioam_trace_t fmt_trace;
+} vxlan_gpe_ioam_v4_trace_t;
+
+
+static u8 *
+format_vxlan_gpe_ioam_v4_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  vxlan_gpe_ioam_v4_trace_t *t1 = va_arg (*args, vxlan_gpe_ioam_v4_trace_t *);
+  ioam_trace_t *t = &(t1->fmt_trace);
+  vxlan_gpe_ioam_option_t *fmt_trace0;
+  vxlan_gpe_ioam_option_t *opt0, *limit0;
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+
+  u8 type0;
+
+  fmt_trace0 = (vxlan_gpe_ioam_option_t *) t->option_data;
+
+  s = format (s, "VXLAN-GPE-IOAM: next_index %d len %d traced %d",
+	      t->next_index, fmt_trace0->length, t->trace_len);
+
+  opt0 = (vxlan_gpe_ioam_option_t *) (fmt_trace0 + 1);
+  limit0 = (vxlan_gpe_ioam_option_t *) ((u8 *) fmt_trace0) + t->trace_len;
+
+  while (opt0 < limit0)
+    {
+      type0 = opt0->type;
+      switch (type0)
+	{
+	case 0:		/* Pad, just stop */
+	  opt0 = (vxlan_gpe_ioam_option_t *) ((u8 *) opt0) + 1;
+	  break;
+
+	default:
+	  if (hm->trace[type0])
+	    {
+	      s = (*hm->trace[type0]) (s, opt0);
+	    }
+	  else
+	    {
+	      s =
+		format (s, "\n    unrecognized option %d length %d", type0,
+			opt0->length);
+	    }
+	  opt0 =
+	    (vxlan_gpe_ioam_option_t *) (((u8 *) opt0) + opt0->length +
+					 sizeof (vxlan_gpe_ioam_option_t));
+	  break;
+	}
+    }
+
+  s = format (s, "VXLAN-GPE-IOAM: tunnel %d", t1->tunnel_index);
+  return s;
+}
+
+
+always_inline void
+vxlan_gpe_encap_decap_ioam_v4_one_inline (vlib_main_t * vm,
+					  vlib_node_runtime_t * node,
+					  vlib_buffer_t * b0,
+					  u32 * next0, u32 drop_node_val,
+					  u8 use_adj)
+{
+  ip4_header_t *ip0;
+  udp_header_t *udp_hdr0;
+  vxlan_gpe_header_t *gpe_hdr0;
+  vxlan_gpe_ioam_hdr_t *gpe_ioam0;
+  vxlan_gpe_ioam_option_t *opt0;
+  vxlan_gpe_ioam_option_t *limit0;
+  vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
+
+  /* Populate the iOAM header */
+  ip0 = vlib_buffer_get_current (b0);
+  udp_hdr0 = (udp_header_t *) (ip0 + 1);
+  gpe_hdr0 = (vxlan_gpe_header_t *) (udp_hdr0 + 1);
+  gpe_ioam0 = (vxlan_gpe_ioam_hdr_t *) (gpe_hdr0 + 1);
+  opt0 = (vxlan_gpe_ioam_option_t *) (gpe_ioam0 + 1);
+  limit0 = (vxlan_gpe_ioam_option_t *) ((u8 *) gpe_ioam0 + gpe_ioam0->length);
+
+  /*
+   * Basic validity checks
+   */
+  if (gpe_ioam0->length > clib_net_to_host_u16 (ip0->length))
+    {
+      *next0 = drop_node_val;
+      return;
+    }
+
+  /* Scan the set of h-b-h options, process ones that we understand */
+  while (opt0 < limit0)
+    {
+      u8 type0;
+      type0 = opt0->type;
+      switch (type0)
+	{
+	case 0:		/* Pad1 */
+	  opt0 = (vxlan_gpe_ioam_option_t *) ((u8 *) opt0) + 1;
+	  continue;
+	case 1:		/* PadN */
+	  break;
+	default:
+	  if (hm->options[type0])
+	    {
+	      if ((*hm->options[type0]) (b0, opt0, 1 /* is_ipv4 */ ,
+					 use_adj) < 0)
+		{
+		  *next0 = drop_node_val;
+		  return;
+		}
+	    }
+	  break;
+	}
+      opt0 =
+	(vxlan_gpe_ioam_option_t *) (((u8 *) opt0) + opt0->length +
+				     sizeof (vxlan_gpe_ioam_hdr_t));
+    }
+
+
+  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+    {
+      vxlan_gpe_ioam_v4_trace_t *t =
+	vlib_add_trace (vm, node, b0, sizeof (*t));
+      u32 trace_len = gpe_ioam0->length;
+      t->fmt_trace.next_index = *next0;
+      /* Capture the ioam option verbatim */
+      trace_len =
+	trace_len <
+	ARRAY_LEN (t->fmt_trace.
+		   option_data) ? trace_len : ARRAY_LEN (t->fmt_trace.
+							 option_data);
+      t->fmt_trace.trace_len = trace_len;
+      clib_memcpy (&(t->fmt_trace.option_data), gpe_ioam0, trace_len);
+    }
+  return;
+}
+
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h
new file mode 100644
index 00000000..cc0a10a3
--- /dev/null
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_vxlan_gpe_msg_enum_h
+#define included_vxlan_gpe_msg_enum_h
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum {
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
+    /* We'll want to know how many messages IDs we need... */
+    VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif /* included_vxlan_gpe_msg_enum_h */
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
new file mode 100644
index 00000000..47253eb6
--- /dev/null
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
@@ -0,0 +1,600 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ *------------------------------------------------------------------
+ * vxlan_gpe_test.c - test harness for vxlan_gpe plugin
+ *------------------------------------------------------------------
+ */
+
+#include <vat/vat.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vppinfra/error.h>
+
+/* Declare message IDs */
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
+#undef vl_typedefs
+
+/* declare message handlers for each api */
+
+#define vl_endianfun		/* define message structures */
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number. */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h>
+#undef vl_api_version
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h>
+#include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
+
+typedef struct
+{
+  /* API message ID base */
+  u16 msg_id_base;
+  vat_main_t *vat_main;
+} vxlan_gpe_test_main_t;
+
+vxlan_gpe_test_main_t vxlan_gpe_test_main;
+
+#define foreach_standard_reply_retval_handler     \
+_(vxlan_gpe_ioam_enable_reply)                    \
+_(vxlan_gpe_ioam_disable_reply)                   \
+_(vxlan_gpe_ioam_vni_enable_reply)                \
+_(vxlan_gpe_ioam_vni_disable_reply)               \
+_(vxlan_gpe_ioam_transit_enable_reply)            \
+_(vxlan_gpe_ioam_transit_disable_reply)
+
+#define _(n)                                            \
+    static void vl_api_##n##_t_handler                  \
+    (vl_api_##n##_t * mp)                               \
+    {                                                   \
+        vat_main_t * vam = vxlan_gpe_test_main.vat_main;   \
+        i32 retval = ntohl(mp->retval);                 \
+        if (vam->async_mode) {                          \
+            vam->async_errors += (retval < 0);          \
+        } else {                                        \
+            vam->retval = retval;                       \
+            vam->result_ready = 1;                      \
+        }                                               \
+    }
+foreach_standard_reply_retval_handler;
+#undef _
+
+/*
+ * Table of message reply handlers, must include boilerplate handlers
+ * we just generated
+ */
+#define foreach_vpe_api_reply_msg                                              \
+_(VXLAN_GPE_IOAM_ENABLE_REPLY, vxlan_gpe_ioam_enable_reply)                    \
+_(VXLAN_GPE_IOAM_DISABLE_REPLY, vxlan_gpe_ioam_disable_reply)                  \
+_(VXLAN_GPE_IOAM_VNI_ENABLE_REPLY, vxlan_gpe_ioam_vni_enable_reply)            \
+_(VXLAN_GPE_IOAM_VNI_DISABLE_REPLY, vxlan_gpe_ioam_vni_disable_reply)          \
+_(VXLAN_GPE_IOAM_TRANSIT_ENABLE_REPLY, vxlan_gpe_ioam_transit_enable_reply)    \
+_(VXLAN_GPE_IOAM_TRANSIT_DISABLE_REPLY, vxlan_gpe_ioam_transit_disable_reply)  \
+
+
+/* M: construct, but don't yet send a message */
+
+#define M(T,t)                                                  \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp));                         \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+#define M2(T,t,n)                                               \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+/* S: send a message */
+#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
+
+/* W: wait for results, with timeout */
+#define W                                       \
+do {                                            \
+    timeout = vat_time_now (vam) + 1.0;         \
+                                                \
+    while (vat_time_now (vam) < timeout) {      \
+        if (vam->result_ready == 1) {           \
+            return (vam->retval);               \
+        }                                       \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
+
+static int
+api_vxlan_gpe_ioam_enable (vat_main_t * vam)
+{
+  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
+
+  unformat_input_t *input = vam->input;
+  vl_api_vxlan_gpe_ioam_enable_t *mp;
+  f64 timeout;
+  u32 id = 0;
+  int has_trace_option = 0;
+  int has_pow_option = 0;
+  int has_ppc_option = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "trace"))
+	has_trace_option = 1;
+      else if (unformat (input, "pow"))
+	has_pow_option = 1;
+      else if (unformat (input, "ppc encap"))
+	has_ppc_option = PPC_ENCAP;
+      else if (unformat (input, "ppc decap"))
+	has_ppc_option = PPC_DECAP;
+      else if (unformat (input, "ppc none"))
+	has_ppc_option = PPC_NONE;
+      else
+	break;
+    }
+  M (VXLAN_GPE_IOAM_ENABLE, vxlan_gpe_ioam_enable);
+  mp->id = htons (id);
+  mp->trace_ppc = has_ppc_option;
+  mp->pow_enable = has_pow_option;
+  mp->trace_enable = has_trace_option;
+
+
+  S;
+  W;
+
+  return (0);
+}
+
+
+static int
+api_vxlan_gpe_ioam_disable (vat_main_t * vam)
+{
+  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
+  vl_api_vxlan_gpe_ioam_disable_t *mp;
+  f64 timeout;
+
+  M (VXLAN_GPE_IOAM_DISABLE, vxlan_gpe_ioam_disable);
+  S;
+  W;
+  return 0;
+}
+
+static int
+api_vxlan_gpe_ioam_vni_enable (vat_main_t * vam)
+{
+  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
+
+  unformat_input_t *line_input = vam->input;
+  vl_api_vxlan_gpe_ioam_vni_enable_t *mp;
+  ip4_address_t local4, remote4;
+  ip6_address_t local6, remote6;
+  u8 ipv4_set = 0, ipv6_set = 0;
+  u8 local_set = 0;
+  u8 remote_set = 0;
+  u32 vni;
+  u8 vni_set = 0;
+  f64 timeout;
+
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "local %U", unformat_ip4_address, &local4))
+	{
+	  local_set = 1;
+	  ipv4_set = 1;
+	}
+      else if (unformat (line_input, "remote %U",
+			 unformat_ip4_address, &remote4))
+	{
+	  remote_set = 1;
+	  ipv4_set = 1;
+	}
+      else if (unformat (line_input, "local %U",
+			 unformat_ip6_address, &local6))
+	{
+	  local_set = 1;
+	  ipv6_set = 1;
+	}
+      else if (unformat (line_input, "remote %U",
+			 unformat_ip6_address, &remote6))
+	{
+	  remote_set = 1;
+	  ipv6_set = 1;
+	}
+
+      else if (unformat (line_input, "vni %d", &vni))
+	vni_set = 1;
+      else
+	{
+	  errmsg ("parse error '%U'\n", format_unformat_error, line_input);
+	  return -99;
+	}
+    }
+
+  if (local_set == 0)
+    {
+      errmsg ("tunnel local address not specified\n");
+      return -99;
+    }
+  if (remote_set == 0)
+    {
+      errmsg ("tunnel remote address not specified\n");
+      return -99;
+    }
+  if (ipv4_set && ipv6_set)
+    {
+      errmsg ("both IPv4 and IPv6 addresses specified");
+      return -99;
+    }
+
+  if (vni_set == 0)
+    {
+      errmsg ("vni not specified\n");
+      return -99;
+    }
+
+  M (VXLAN_GPE_IOAM_VNI_ENABLE, vxlan_gpe_ioam_vni_enable);
+
+
+  if (ipv6_set)
+    {
+      clib_memcpy (&mp->local, &local6, sizeof (local6));
+      clib_memcpy (&mp->remote, &remote6, sizeof (remote6));
+    }
+  else
+    {
+      clib_memcpy (&mp->local, &local4, sizeof (local4));
+      clib_memcpy (&mp->remote, &remote4, sizeof (remote4));
+    }
+
+  mp->vni = ntohl (vni);
+  mp->is_ipv6 = ipv6_set;
+
+  S;
+  W;
+
+  return (0);
+}
+
+static int
+api_vxlan_gpe_ioam_vni_disable (vat_main_t * vam)
+{
+  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
+
+  unformat_input_t *line_input = vam->input;
+  vl_api_vxlan_gpe_ioam_vni_disable_t *mp;
+  ip4_address_t local4, remote4;
+  ip6_address_t local6, remote6;
+  u8 ipv4_set = 0, ipv6_set = 0;
+  u8 local_set = 0;
+  u8 remote_set = 0;
+  u32 vni;
+  u8 vni_set = 0;
+  f64 timeout;
+
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "local %U", unformat_ip4_address, &local4))
+	{
+	  local_set = 1;
+	  ipv4_set = 1;
+	}
+      else if (unformat (line_input, "remote %U",
+			 unformat_ip4_address, &remote4))
+	{
+	  remote_set = 1;
+	  ipv4_set = 1;
+	}
+      else if (unformat (line_input, "local %U",
+			 unformat_ip6_address, &local6))
+	{
+	  local_set = 1;
+	  ipv6_set = 1;
+	}
+      else if (unformat (line_input, "remote %U",
+			 unformat_ip6_address, &remote6))
+	{
+	  remote_set = 1;
+	  ipv6_set = 1;
+	}
+
+      else if (unformat (line_input, "vni %d", &vni))
+	vni_set = 1;
+      else
+	{
+	  errmsg ("parse error '%U'\n", format_unformat_error, line_input);
+	  return -99;
+	}
+    }
+
+  if (local_set == 0)
+    {
+      errmsg ("tunnel local address not specified\n");
+      return -99;
+    }
+  if (remote_set == 0)
+    {
+      errmsg ("tunnel remote address not specified\n");
+      return -99;
+    }
+  if (ipv4_set && ipv6_set)
+    {
+      errmsg ("both IPv4 and IPv6 addresses specified");
+      return -99;
+    }
+
+  if (vni_set == 0)
+    {
+      errmsg ("vni not specified\n");
+      return -99;
+    }
+
+  M (VXLAN_GPE_IOAM_VNI_DISABLE, vxlan_gpe_ioam_vni_disable);
+
+
+  if (ipv6_set)
+    {
+      clib_memcpy (&mp->local, &local6, sizeof (local6));
+      clib_memcpy (&mp->remote, &remote6, sizeof (remote6));
+    }
+  else
+    {
+      clib_memcpy (&mp->local, &local4, sizeof (local4));
+      clib_memcpy (&mp->remote, &remote4, sizeof (remote4));
+    }
+
+  mp->vni = ntohl (vni);
+  mp->is_ipv6 = ipv6_set;
+
+  S;
+  W;
+
+  return 0;
+}
+
+static int
+api_vxlan_gpe_ioam_transit_enable (vat_main_t * vam)
+{
+  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
+
+  unformat_input_t *line_input = vam->input;
+  vl_api_vxlan_gpe_ioam_transit_enable_t *mp;
+  ip4_address_t local4;
+  ip6_address_t local6;
+  u8 ipv4_set = 0, ipv6_set = 0;
+  u8 local_set = 0;
+  u32 outer_fib_index = 0;
+  f64 timeout;
+
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "dst-ip %U", unformat_ip4_address, &local4))
+	{
+	  local_set = 1;
+	  ipv4_set = 1;
+	}
+      else if (unformat (line_input, "dst-ip %U",
+			 unformat_ip6_address, &local6))
+	{
+	  local_set = 1;
+	  ipv6_set = 1;
+	}
+
+      else if (unformat (line_input, "outer-fib-index %d", &outer_fib_index))
+	;
+      else
+	{
+	  errmsg ("parse error '%U'\n", format_unformat_error, line_input);
+	  return -99;
+	}
+    }
+
+  if (local_set == 0)
+    {
+      errmsg ("destination address not specified\n");
+      return -99;
+    }
+  if (ipv4_set && ipv6_set)
+    {
+      errmsg ("both IPv4 and IPv6 addresses specified");
+      return -99;
+    }
+
+
+  M (VXLAN_GPE_IOAM_TRANSIT_ENABLE, vxlan_gpe_ioam_transit_enable);
+
+
+  if (ipv6_set)
+    {
+      errmsg ("IPv6 currently unsupported");
+      return -1;
+    }
+  else
+    {
+      clib_memcpy (&mp->dst_addr, &local4, sizeof (local4));
+    }
+
+  mp->outer_fib_index = htonl (outer_fib_index);
+  mp->is_ipv6 = ipv6_set;
+
+  S;
+  W;
+
+  return (0);
+}
+
+static int
+api_vxlan_gpe_ioam_transit_disable (vat_main_t * vam)
+{
+  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
+
+  unformat_input_t *line_input = vam->input;
+  vl_api_vxlan_gpe_ioam_transit_disable_t *mp;
+  ip4_address_t local4;
+  ip6_address_t local6;
+  u8 ipv4_set = 0, ipv6_set = 0;
+  u8 local_set = 0;
+  u32 outer_fib_index;
+  f64 timeout;
+
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "dst-ip %U", unformat_ip4_address, &local4))
+	{
+	  local_set = 1;
+	  ipv4_set = 1;
+	}
+      else if (unformat (line_input, "dst-ip %U",
+			 unformat_ip6_address, &local6))
+	{
+	  local_set = 1;
+	  ipv6_set = 1;
+	}
+
+      else if (unformat (line_input, "outer-fib-index %d", &outer_fib_index))
+	;
+      else
+	{
+	  errmsg ("parse error '%U'\n", format_unformat_error, line_input);
+	  return -99;
+	}
+    }
+
+  if (local_set == 0)
+    {
+      errmsg ("destination address not specified\n");
+      return -99;
+    }
+  if (ipv4_set && ipv6_set)
+    {
+      errmsg ("both IPv4 and IPv6 addresses specified");
+      return -99;
+    }
+
+
+  M (VXLAN_GPE_IOAM_TRANSIT_DISABLE, vxlan_gpe_ioam_transit_disable);
+
+
+  if (ipv6_set)
+    {
+      return -1;
+    }
+  else
+    {
+      clib_memcpy (&mp->dst_addr, &local4, sizeof (local4));
+    }
+
+  mp->outer_fib_index = htonl (outer_fib_index);
+  mp->is_ipv6 = ipv6_set;
+
+  S;
+  W;
+
+
+  return (0);
+}
+
+/*
+ * List of messages that the api test plugin sends,
+ * and that the data plane plugin processes
+ */
+#define foreach_vpe_api_msg \
+_(vxlan_gpe_ioam_enable, ""\
+  "[trace] [pow] [ppc <encap|ppc decap>]") \
+_(vxlan_gpe_ioam_disable, "")                    \
+_(vxlan_gpe_ioam_vni_enable, ""\
+  "local <local_vtep_ip> remote <remote_vtep_ip> vni <vnid>") \
+_(vxlan_gpe_ioam_vni_disable, ""\
+  "local <local_vtep_ip> remote <remote_vtep_ip> vni <vnid>") \
+_(vxlan_gpe_ioam_transit_enable, ""\
+  "dst-ip <dst_ip> [outer-fib-index <outer_fib_index>]") \
+_(vxlan_gpe_ioam_transit_disable, ""\
+  "dst-ip <dst_ip> [outer-fib-index <outer_fib_index>]") \
+
+
+void
+vat_api_hookup (vat_main_t * vam)
+{
+  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
+  /* Hook up handlers for replies from the data plane plug-in */
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,                                  \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_reply_msg;
+#undef _
+
+  /* API messages we can send */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+  foreach_vpe_api_msg;
+#undef _
+
+  /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+  foreach_vpe_api_msg;
+#undef _
+}
+
+clib_error_t *
+vat_plugin_register (vat_main_t * vam)
+{
+  vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main;
+  u8 *name;
+
+  sm->vat_main = vam;
+
+  name = format (0, "ioam_vxlan_gpe_%08x%c", api_version, 0);
+  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  if (sm->msg_id_base != (u16) ~ 0)
+    vat_api_hookup (vam);
+
+  vec_free (name);
+
+  return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/lb.am b/src/plugins/lb.am
new file mode 100644
index 00000000..352358fa
--- /dev/null
+++ b/src/plugins/lb.am
@@ -0,0 +1,42 @@
+# Copyright (c) 2016 Cisco Systems, Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+vppapitestplugins_LTLIBRARIES += lb_test_plugin.la
+vppplugins_LTLIBRARIES += lb_plugin.la
+
+lb_plugin_la_SOURCES =			\
+	lb/lb.c				\
+	lb/node.c			\
+	lb/cli.c			\
+	lb/util.c			\
+	lb/refcount.c			\
+	lb/api.c
+
+BUILT_SOURCES +=			\
+	lb/lb.api.h			\
+	lb/lb.api.json
+
+API_FILES += lb/lb.api
+
+noinst_HEADERS +=			\
+	lb/lb.h				\
+	lb/util.h			\
+	lb/refcount.h			\
+	lb/lbhash.h			\
+	lb/lb.api.h
+
+lb_test_plugin_la_SOURCES =		\
+	lb/lb_test.c			\
+	lb/lb_plugin.api.h
+
+# vi:syntax=automake
diff --git a/src/plugins/lb/api.c b/src/plugins/lb/api.c
new file mode 100644
index 00000000..06c53fa1
--- /dev/null
+++ b/src/plugins/lb/api.c
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <lb/lb.h>
+
+#include <vppinfra/byte_order.h>
+#include <vlibapi/api.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum {
+#include <lb/lb.api.h>
+    /* We'll want to know how many messages IDs we need... */
+    VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+
+/* define message structures */
+#define vl_typedefs
+#include <lb/lb.api.h>
+#undef vl_typedefs
+
+/* define generated endian-swappers */
+#define vl_endianfun
+#include <lb/lb.api.h>
+#undef vl_endianfun
+
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <lb/lb.api.h>
+#undef vl_api_version
+
+#define vl_msg_name_crc_list
+#include <lb/lb.api.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (lb_main_t * lbm, api_main_t * am)
+{
+#define _(id,n,crc) \
+  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + lbm->msg_id_base);
+  foreach_vl_msg_name_crc_lb;
+#undef _
+}
+
+/* Macro to finish up custom dump fns */
+#define FINISH                                  \
+    vec_add1 (s, 0);                            \
+    vl_print (handle, (char *)s);               \
+    vec_free (s);                               \
+    return handle;
+
+/*
+ * A handy macro to set up a message reply.
+ * Assumes that the following variables are available:
+ * mp - pointer to request message
+ * rmp - pointer to reply message type
+ * rv - return value
+ */
+
+#define REPLY_MACRO(t)                                          \
+do {                                                            \
+    unix_shared_memory_queue_t * q =                            \
+    vl_api_client_index_to_input_queue (mp->client_index);      \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t)+lbm->msg_id_base);               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+                                                                \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+static void
+vl_api_lb_conf_t_handler
+(vl_api_lb_conf_t * mp)
+{
+  lb_main_t *lbm = &lb_main;
+  vl_api_lb_conf_reply_t * rmp;
+  int rv = 0;
+
+  rv = lb_conf((ip4_address_t *)&mp->ip4_src_address,
+               (ip6_address_t *)mp->ip6_src_address,
+               mp->sticky_buckets_per_core,
+               mp->flow_timeout);
+
+ REPLY_MACRO (VL_API_LB_CONF_REPLY);
+}
+
+static void *vl_api_lb_conf_t_print
+(vl_api_lb_conf_t *mp, void * handle)
+{
+  u8 * s;
+  s = format (0, "SCRIPT: lb_conf ");
+  s = format (s, "%U ", format_ip4_address, (ip4_address_t *)&mp->ip4_src_address);
+  s = format (s, "%U ", format_ip6_address, (ip6_address_t *)mp->ip6_src_address);
+  s = format (s, "%u ", mp->sticky_buckets_per_core);
+  s = format (s, "%u ", mp->flow_timeout);
+  FINISH;
+}
+
+
+static void
+vl_api_lb_add_del_vip_t_handler
+(vl_api_lb_add_del_vip_t * mp)
+{
+  lb_main_t *lbm = &lb_main;
+  vl_api_lb_conf_reply_t * rmp;
+  int rv = 0;
+  ip46_address_t prefix;
+  memcpy(&prefix.ip6, mp->ip_prefix, sizeof(prefix.ip6));
+
+  if (mp->is_del) {
+    u32 vip_index;
+    if (!(rv = lb_vip_find_index(&prefix, mp->prefix_length, &vip_index)))
+      rv = lb_vip_del(vip_index);
+  } else {
+    u32 vip_index;
+    lb_vip_type_t type;
+    if (ip46_prefix_is_ip4(&prefix, mp->prefix_length)) {
+      type = mp->is_gre4?LB_VIP_TYPE_IP4_GRE4:LB_VIP_TYPE_IP4_GRE6;
+    } else {
+      type = mp->is_gre4?LB_VIP_TYPE_IP6_GRE4:LB_VIP_TYPE_IP6_GRE6;
+    }
+
+    rv = lb_vip_add(&prefix, mp->prefix_length, type,
+                    mp->new_flows_table_length, &vip_index);
+  }
+ REPLY_MACRO (VL_API_LB_CONF_REPLY);
+}
+
+static void *vl_api_lb_add_del_vip_t_print
+(vl_api_lb_add_del_vip_t *mp, void * handle)
+{
+  u8 * s;
+  s = format (0, "SCRIPT: lb_add_del_vip ");
+  s = format (s, "%U ", format_ip46_prefix,
+              (ip46_address_t *)mp->ip_prefix, mp->prefix_length, IP46_TYPE_ANY);
+  s = format (s, "%s ", mp->is_gre4?"gre4":"gre6");
+  s = format (s, "%u ", mp->new_flows_table_length);
+  s = format (s, "%s ", mp->is_del?"del":"add");
+  FINISH;
+}
+
+static void
+vl_api_lb_add_del_as_t_handler
+(vl_api_lb_add_del_as_t * mp)
+{
+  lb_main_t *lbm = &lb_main;
+  vl_api_lb_conf_reply_t * rmp;
+  int rv = 0;
+  u32 vip_index;
+  if ((rv = lb_vip_find_index((ip46_address_t *)mp->vip_ip_prefix,
+                              mp->vip_prefix_length, &vip_index)))
+    goto done;
+
+  if (mp->is_del)
+    rv = lb_vip_del_ass(vip_index, (ip46_address_t *)mp->as_address, 1);
+  else
+    rv = lb_vip_add_ass(vip_index, (ip46_address_t *)mp->as_address, 1);
+
+done:
+ REPLY_MACRO (VL_API_LB_CONF_REPLY);
+}
+
+static void *vl_api_lb_add_del_as_t_print
+(vl_api_lb_add_del_as_t *mp, void * handle)
+{
+  u8 * s;
+  s = format (0, "SCRIPT: lb_add_del_as ");
+  s = format (s, "%U ", format_ip46_prefix,
+              (ip46_address_t *)mp->vip_ip_prefix, mp->vip_prefix_length, IP46_TYPE_ANY);
+  s = format (s, "%U ", format_ip46_address,
+                (ip46_address_t *)mp->as_address, IP46_TYPE_ANY);
+  s = format (s, "%s ", mp->is_del?"del":"add");
+  FINISH;
+}
+
+/* List of message types that this plugin understands */
+#define foreach_lb_plugin_api_msg            \
+_(LB_CONF, lb_conf)                          \
+_(LB_ADD_DEL_VIP, lb_add_del_vip)            \
+_(LB_ADD_DEL_AS, lb_add_del_as)
+
+static clib_error_t * lb_api_init (vlib_main_t * vm)
+{
+  lb_main_t *lbm = &lb_main;
+  u8 *name = format (0, "lb_%08x%c", api_version, 0);
+  lbm->msg_id_base = vl_msg_api_get_msg_ids
+      ((char *) name, VL_MSG_FIRST_AVAILABLE);
+
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + lbm->msg_id_base),     \
+                           #n,                  \
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1);
+  foreach_lb_plugin_api_msg;
+#undef _
+
+  /* Add our API messages to the global name_crc hash table */
+  setup_message_id_table (lbm, &api_main);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (lb_api_init);
diff --git a/src/plugins/lb/cli.c b/src/plugins/lb/cli.c
new file mode 100644
index 00000000..b59c6426
--- /dev/null
+++ b/src/plugins/lb/cli.c
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <lb/lb.h>
+#include <lb/util.h>
+
+static clib_error_t *
+lb_vip_command_fn (vlib_main_t * vm,
+              unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ip46_address_t prefix;
+  u8 plen;
+  u32 new_len = 1024;
+  u8 del = 0;
+  int ret;
+  u32 gre4 = 0;
+  lb_vip_type_t type;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  if (!unformat(line_input, "%U", unformat_ip46_prefix, &prefix, &plen, IP46_TYPE_ANY, &plen))
+    return clib_error_return (0, "invalid vip prefix: '%U'",
+                                  format_unformat_error, line_input);
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+  {
+    if (unformat(line_input, "new_len %d", &new_len))
+      ;
+    else if (unformat(line_input, "del"))
+      del = 1;
+    else if (unformat(line_input, "encap gre4"))
+      gre4 = 1;
+    else if (unformat(line_input, "encap gre6"))
+      gre4 = 0;
+    else
+      return clib_error_return (0, "parse error: '%U'",
+                              format_unformat_error, line_input);
+  }
+
+  unformat_free (line_input);
+
+
+  if (ip46_prefix_is_ip4(&prefix, plen)) {
+    type = (gre4)?LB_VIP_TYPE_IP4_GRE4:LB_VIP_TYPE_IP4_GRE6;
+  } else {
+    type = (gre4)?LB_VIP_TYPE_IP6_GRE4:LB_VIP_TYPE_IP6_GRE6;
+  }
+
+  lb_garbage_collection();
+
+  u32 index;
+  if (!del) {
+    if ((ret = lb_vip_add(&prefix, plen, type, new_len, &index))) {
+      return clib_error_return (0, "lb_vip_add error %d", ret);
+    } else {
+      vlib_cli_output(vm, "lb_vip_add ok %d", index);
+    }
+  } else {
+    if ((ret = lb_vip_find_index(&prefix, plen, &index)))
+      return clib_error_return (0, "lb_vip_find_index error %d", ret);
+    else if ((ret = lb_vip_del(index)))
+      return clib_error_return (0, "lb_vip_del error %d", ret);
+  }
+  return NULL;
+}
+
+VLIB_CLI_COMMAND (lb_vip_command, static) =
+{
+  .path = "lb vip",
+  .short_help = "lb vip <prefix> [encap (gre6|gre4)] [new_len <n>] [del]",
+  .function = lb_vip_command_fn,
+};
+
+static clib_error_t *
+lb_as_command_fn (vlib_main_t * vm,
+              unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ip46_address_t vip_prefix, as_addr;
+  u8 vip_plen;
+  ip46_address_t *as_array = 0;
+  u32 vip_index;
+  u8 del = 0;
+  int ret;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  if (!unformat(line_input, "%U", unformat_ip46_prefix, &vip_prefix, &vip_plen, IP46_TYPE_ANY))
+    return clib_error_return (0, "invalid as address: '%U'",
+                              format_unformat_error, line_input);
+
+  if ((ret = lb_vip_find_index(&vip_prefix, vip_plen, &vip_index)))
+    return clib_error_return (0, "lb_vip_find_index error %d", ret);
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+  {
+    if (unformat(line_input, "%U", unformat_ip46_address, &as_addr, IP46_TYPE_ANY)) {
+      vec_add1(as_array, as_addr);
+    } else if (unformat(line_input, "del")) {
+      del = 1;
+    } else {
+      vec_free(as_array);
+      return clib_error_return (0, "parse error: '%U'",
+                                format_unformat_error, line_input);
+    }
+  }
+
+  if (!vec_len(as_array)) {
+    vec_free(as_array);
+    return clib_error_return (0, "No AS address provided");
+  }
+
+  lb_garbage_collection();
+  clib_warning("vip index is %d", vip_index);
+
+  if (del) {
+    if ((ret = lb_vip_del_ass(vip_index, as_array, vec_len(as_array)))) {
+      vec_free(as_array);
+      return clib_error_return (0, "lb_vip_del_ass error %d", ret);
+    }
+  } else {
+    if ((ret = lb_vip_add_ass(vip_index, as_array, vec_len(as_array)))) {
+      vec_free(as_array);
+      return clib_error_return (0, "lb_vip_add_ass error %d", ret);
+    }
+  }
+
+  vec_free(as_array);
+  return 0;
+}
+
+VLIB_CLI_COMMAND (lb_as_command, static) =
+{
+  .path = "lb as",
+  .short_help = "lb as <vip-prefix> [<address> [<address> [...]]] [del]",
+  .function = lb_as_command_fn,
+};
+
+static clib_error_t *
+lb_conf_command_fn (vlib_main_t * vm,
+              unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  lb_main_t *lbm = &lb_main;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  ip4_address_t ip4 = lbm->ip4_src_address;
+  ip6_address_t ip6 = lbm->ip6_src_address;
+  u32 per_cpu_sticky_buckets = lbm->per_cpu_sticky_buckets;
+  u32 per_cpu_sticky_buckets_log2 = 0;
+  u32 flow_timeout = lbm->flow_timeout;
+  int ret;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+  {
+    if (unformat(line_input, "ip4-src-address %U", unformat_ip4_address, &ip4))
+      ;
+    else if (unformat(line_input, "ip6-src-address %U", unformat_ip6_address, &ip6))
+      ;
+    else if (unformat(line_input, "buckets %d", &per_cpu_sticky_buckets))
+      ;
+    else if (unformat(line_input, "buckets-log2 %d", &per_cpu_sticky_buckets_log2)) {
+      if (per_cpu_sticky_buckets_log2 >= 32)
+        return clib_error_return (0, "buckets-log2 value is too high");
+      per_cpu_sticky_buckets = 1 << per_cpu_sticky_buckets_log2;
+    } else if (unformat(line_input, "timeout %d", &flow_timeout))
+      ;
+    else
+      return clib_error_return (0, "parse error: '%U'",
+                                format_unformat_error, line_input);
+  }
+
+  unformat_free (line_input);
+
+  lb_garbage_collection();
+
+  if ((ret = lb_conf(&ip4, &ip6, per_cpu_sticky_buckets, flow_timeout)))
+    return clib_error_return (0, "lb_conf error %d", ret);
+
+  return NULL;
+}
+
+VLIB_CLI_COMMAND (lb_conf_command, static) =
+{
+  .path = "lb conf",
+  .short_help = "lb conf [ip4-src-address <addr>] [ip6-src-address <addr>] [buckets <n>] [timeout <s>]",
+  .function = lb_conf_command_fn,
+};
+
+static clib_error_t *
+lb_show_command_fn (vlib_main_t * vm,
+              unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vlib_cli_output(vm, "%U", format_lb_main);
+  return NULL;
+}
+
+
+VLIB_CLI_COMMAND (lb_show_command, static) =
+{
+  .path = "show lb",
+  .short_help = "show lb",
+  .function = lb_show_command_fn,
+};
+
+static clib_error_t *
+lb_show_vips_command_fn (vlib_main_t * vm,
+              unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t line_input;
+  lb_main_t *lbm = &lb_main;
+  lb_vip_t *vip;
+  u8 verbose = 0;
+
+  if (!unformat_user (input, unformat_line_input, &line_input))
+      return 0;
+
+  if (unformat(&line_input, "verbose"))
+    verbose = 1;
+
+  pool_foreach(vip, lbm->vips, {
+      vlib_cli_output(vm, "%U\n", verbose?format_lb_vip_detailed:format_lb_vip, vip);
+  });
+
+  unformat_free (&line_input);
+  return NULL;
+}
+
+VLIB_CLI_COMMAND (lb_show_vips_command, static) =
+{
+  .path = "show lb vips",
+  .short_help = "show lb vips [verbose]",
+  .function = lb_show_vips_command_fn,
+};
diff --git a/src/plugins/lb/lb.api b/src/plugins/lb/lb.api
new file mode 100644
index 00000000..39ee3c8f
--- /dev/null
+++ b/src/plugins/lb/lb.api
@@ -0,0 +1,71 @@
+/** \brief Configure Load-Balancer global parameters
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param ip4_src_address - IPv4 address to be used as source for IPv4 GRE traffic.
+    @param ip6_src_address - IPv6 address to be used as source for IPv6 GRE traffic.
+    @param n_sticky_buckets - Number of buckets *per worker thread* in the 
+           established flow table (must be power of 2).
+    @param flow_timeout - Time in seconds after which, if no packet is received
+           for a given flow, the flow is removed from the established flow table.
+*/
+define lb_conf
+{
+  u32 client_index;
+  u32 context;
+  u32 ip4_src_address;
+  u8 ip6_src_address[16];
+  u32 sticky_buckets_per_core;
+  u32 flow_timeout;
+};
+
+define lb_conf_reply {
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Add a virtual address (or prefix)
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param ip_prefix - IP address (IPv4 in lower order 32 bits). 
+    @param prefix_length - IP prefix length (96 + 'IPv4 prefix length' for IPv4).  
+    @param is_gre4 - Encap is ip4 GRE (ip6 GRE otherwise).
+    @param new_flows_table_length - Size of the new connections flow table used
+           for this VIP (must be power of 2).
+    @param is_del - The VIP should be removed.
+*/
+define lb_add_del_vip {
+  u32 client_index;
+  u32 context;
+  u8 ip_prefix[16];
+  u8 prefix_length;
+  u8 is_gre4;
+  u32 new_flows_table_length;
+  u8 is_del;
+};
+
+define lb_add_del_vip_reply {
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Add an application server for a given VIP
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param vip_ip_prefix - VIP IP address (IPv4 in lower order 32 bits). 
+    @param vip_ip_prefix - VIP IP prefix length (96 + 'IPv4 prefix length' for IPv4). 
+    @param as_address - The application server address (IPv4 in lower order 32 bits).
+    @param is_del - The AS should be removed.
+*/
+define lb_add_del_as {
+  u32 client_index;
+  u32 context;
+  u8 vip_ip_prefix[16];
+  u8 vip_prefix_length;
+  u8 as_address[16];
+  u8 is_del;
+};
+
+define lb_add_del_as_reply {
+  u32 context;
+  i32 retval;
+};
diff --git a/src/plugins/lb/lb.c b/src/plugins/lb/lb.c
new file mode 100644
index 00000000..1d9b9870
--- /dev/null
+++ b/src/plugins/lb/lb.c
@@ -0,0 +1,844 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <lb/lb.h>
+#include <vnet/plugin/plugin.h>
+#include <vnet/api_errno.h>
+
+//GC runs at most once every so many seconds
+#define LB_GARBAGE_RUN 60
+
+//After so many seconds. It is assumed that inter-core race condition will not occur.
+#define LB_CONCURRENCY_TIMEOUT 10
+
+lb_main_t lb_main;
+
+#define lb_get_writer_lock() do {} while(__sync_lock_test_and_set (lb_main.writer_lock, 1))
+#define lb_put_writer_lock() lb_main.writer_lock[0] = 0
+
+static void lb_as_stack (lb_as_t *as);
+
+
+const static char * const lb_dpo_gre4_ip4[] = { "lb4-gre4" , NULL };
+const static char * const lb_dpo_gre4_ip6[] = { "lb6-gre4" , NULL };
+const static char* const * const lb_dpo_gre4_nodes[DPO_PROTO_NUM] =
+    {
+	[DPO_PROTO_IP4]  = lb_dpo_gre4_ip4,
+	[DPO_PROTO_IP6]  = lb_dpo_gre4_ip6,
+    };
+
+const static char * const lb_dpo_gre6_ip4[] = { "lb4-gre6" , NULL };
+const static char * const lb_dpo_gre6_ip6[] = { "lb6-gre6" , NULL };
+const static char* const * const lb_dpo_gre6_nodes[DPO_PROTO_NUM] =
+    {
+	[DPO_PROTO_IP4]  = lb_dpo_gre6_ip4,
+	[DPO_PROTO_IP6]  = lb_dpo_gre6_ip6,
+    };
+
+u32 lb_hash_time_now(vlib_main_t * vm)
+{
+  return (u32) (vlib_time_now(vm) + 10000);
+}
+
+u8 *format_lb_main (u8 * s, va_list * args)
+{
+  vlib_thread_main_t *tm = vlib_get_thread_main();
+  lb_main_t *lbm = &lb_main;
+  s = format(s, "lb_main");
+  s = format(s, " ip4-src-address: %U \n", format_ip4_address, &lbm->ip4_src_address);
+  s = format(s, " ip6-src-address: %U \n", format_ip6_address, &lbm->ip6_src_address);
+  s = format(s, " #vips: %u\n", pool_elts(lbm->vips));
+  s = format(s, " #ass: %u\n", pool_elts(lbm->ass) - 1);
+
+  u32 cpu_index;
+  for(cpu_index = 0; cpu_index < tm->n_vlib_mains; cpu_index++ ) {
+    lb_hash_t *h = lbm->per_cpu[cpu_index].sticky_ht;
+    if (h) {
+      s = format(s, "core %d\n", cpu_index);
+      s = format(s, "  timeout: %ds\n", h->timeout);
+      s = format(s, "  usage: %d / %d\n", lb_hash_elts(h, lb_hash_time_now(vlib_get_main())),  lb_hash_size(h));
+    }
+  }
+
+  return s;
+}
+
+static char *lb_vip_type_strings[] = {
+    [LB_VIP_TYPE_IP6_GRE6] = "ip6-gre6",
+    [LB_VIP_TYPE_IP6_GRE4] = "ip6-gre4",
+    [LB_VIP_TYPE_IP4_GRE6] = "ip4-gre6",
+    [LB_VIP_TYPE_IP4_GRE4] = "ip4-gre4",
+};
+
+u8 *format_lb_vip_type (u8 * s, va_list * args)
+{
+  lb_vip_type_t vipt = va_arg (*args, lb_vip_type_t);
+  u32 i;
+  for (i=0; i<LB_VIP_N_TYPES; i++)
+    if (vipt == i)
+      return format(s, lb_vip_type_strings[i]);
+  return format(s, "_WRONG_TYPE_");
+}
+
+uword unformat_lb_vip_type (unformat_input_t * input, va_list * args)
+{
+  lb_vip_type_t *vipt = va_arg (*args, lb_vip_type_t *);
+  u32 i;
+  for (i=0; i<LB_VIP_N_TYPES; i++)
+    if (unformat(input, lb_vip_type_strings[i])) {
+      *vipt = i;
+      return 1;
+    }
+  return 0;
+}
+
+u8 *format_lb_vip (u8 * s, va_list * args)
+{
+  lb_vip_t *vip = va_arg (*args, lb_vip_t *);
+  return format(s, "%U %U new_size:%u #as:%u%s",
+             format_lb_vip_type, vip->type,
+             format_ip46_prefix, &vip->prefix, vip->plen, IP46_TYPE_ANY,
+             vip->new_flow_table_mask + 1,
+             pool_elts(vip->as_indexes),
+             (vip->flags & LB_VIP_FLAGS_USED)?"":" removed");
+}
+
+u8 *format_lb_as (u8 * s, va_list * args)
+{
+  lb_as_t *as = va_arg (*args, lb_as_t *);
+  return format(s, "%U %s", format_ip46_address,
+		&as->address, IP46_TYPE_ANY,
+		(as->flags & LB_AS_FLAGS_USED)?"used":"removed");
+}
+
+u8 *format_lb_vip_detailed (u8 * s, va_list * args)
+{
+  lb_main_t *lbm = &lb_main;
+  lb_vip_t *vip = va_arg (*args, lb_vip_t *);
+  uword indent = format_get_indent (s);
+
+  s = format(s, "%U %U [%u] %U%s\n"
+                   "%U  new_size:%u\n",
+                  format_white_space, indent,
+                  format_lb_vip_type, vip->type,
+                  vip - lbm->vips, format_ip46_prefix, &vip->prefix, vip->plen, IP46_TYPE_ANY,
+                  (vip->flags & LB_VIP_FLAGS_USED)?"":" removed",
+                  format_white_space, indent,
+                  vip->new_flow_table_mask + 1);
+
+  //Print counters
+  s = format(s, "%U  counters:\n",
+             format_white_space, indent);
+  u32 i;
+  for (i=0; i<LB_N_VIP_COUNTERS; i++)
+    s = format(s, "%U    %s: %d\n",
+               format_white_space, indent,
+               lbm->vip_counters[i].name,
+               vlib_get_simple_counter(&lbm->vip_counters[i], vip - lbm->vips));
+
+
+  s = format(s, "%U  #as:%u\n",
+             format_white_space, indent,
+             pool_elts(vip->as_indexes));
+
+  //Let's count the buckets for each AS
+  u32 *count = 0;
+  vec_validate(count, pool_len(lbm->ass)); //Possibly big alloc for not much...
+  lb_new_flow_entry_t *nfe;
+  vec_foreach(nfe, vip->new_flow_table)
+    count[nfe->as_index]++;
+
+  lb_as_t *as;
+  u32 *as_index;
+  pool_foreach(as_index, vip->as_indexes, {
+      as = &lbm->ass[*as_index];
+      s = format(s, "%U    %U %d buckets   %d flows  dpo:%u %s\n",
+                   format_white_space, indent,
+                   format_ip46_address, &as->address, IP46_TYPE_ANY,
+                   count[as - lbm->ass],
+                   vlib_refcount_get(&lbm->as_refcount, as - lbm->ass),
+                   as->dpo.dpoi_index,
+                   (as->flags & LB_AS_FLAGS_USED)?"used":" removed");
+  });
+
+  vec_free(count);
+
+  /*
+  s = format(s, "%U  new flows table:\n", format_white_space, indent);
+  lb_new_flow_entry_t *nfe;
+  vec_foreach(nfe, vip->new_flow_table) {
+    s = format(s, "%U    %d: %d\n", format_white_space, indent, nfe - vip->new_flow_table, nfe->as_index);
+  }
+  */
+  return s;
+}
+
+typedef struct {
+  u32 as_index;
+  u32 last;
+  u32 skip;
+} lb_pseudorand_t;
+
+static int lb_pseudorand_compare(void *a, void *b)
+{
+  lb_as_t *asa, *asb;
+  lb_main_t *lbm = &lb_main;
+  asa = &lbm->ass[((lb_pseudorand_t *)a)->as_index];
+  asb = &lbm->ass[((lb_pseudorand_t *)b)->as_index];
+  return memcmp(&asa->address, &asb->address, sizeof(asb->address));
+}
+
+static void lb_vip_garbage_collection(lb_vip_t *vip)
+{
+  lb_main_t *lbm = &lb_main;
+  ASSERT (lbm->writer_lock[0]);
+
+  u32 now = (u32) vlib_time_now(vlib_get_main());
+  if (!clib_u32_loop_gt(now, vip->last_garbage_collection + LB_GARBAGE_RUN))
+    return;
+
+  vip->last_garbage_collection = now;
+  lb_as_t *as;
+  u32 *as_index;
+  pool_foreach(as_index, vip->as_indexes, {
+      as = &lbm->ass[*as_index];
+      if (!(as->flags & LB_AS_FLAGS_USED) && //Not used
+	  clib_u32_loop_gt(now, as->last_used + LB_CONCURRENCY_TIMEOUT) && //Not recently used
+	  (vlib_refcount_get(&lbm->as_refcount, as - lbm->ass) == 0))
+	{ //Not referenced
+	  fib_entry_child_remove(as->next_hop_fib_entry_index,
+				 as->next_hop_child_index);
+	  fib_table_entry_delete_index(as->next_hop_fib_entry_index,
+				       FIB_SOURCE_RR);
+	  as->next_hop_fib_entry_index = FIB_NODE_INDEX_INVALID;
+
+	  pool_put(vip->as_indexes, as_index);
+	  pool_put(lbm->ass, as);
+	}
+  });
+}
+
+void lb_garbage_collection()
+{
+  lb_main_t *lbm = &lb_main;
+  lb_get_writer_lock();
+  lb_vip_t *vip;
+  u32 *to_be_removed_vips = 0, *i;
+  pool_foreach(vip, lbm->vips, {
+      lb_vip_garbage_collection(vip);
+
+      if (!(vip->flags & LB_VIP_FLAGS_USED) &&
+          (pool_elts(vip->as_indexes) == 0)) {
+        vec_add1(to_be_removed_vips, vip - lbm->vips);
+      }
+  });
+
+  vec_foreach(i, to_be_removed_vips) {
+    vip = &lbm->vips[*i];
+    pool_put(lbm->vips, vip);
+    pool_free(vip->as_indexes);
+  }
+
+  vec_free(to_be_removed_vips);
+  lb_put_writer_lock();
+}
+
+static void lb_vip_update_new_flow_table(lb_vip_t *vip)
+{
+  lb_main_t *lbm = &lb_main;
+  lb_new_flow_entry_t *old_table;
+  u32 i, *as_index;
+  lb_new_flow_entry_t *new_flow_table = 0;
+  lb_as_t *as;
+  lb_pseudorand_t *pr, *sort_arr = 0;
+  u32 count;
+
+  ASSERT (lbm->writer_lock[0]); //We must have the lock
+
+  //Check if some AS is configured or not
+  i = 0;
+  pool_foreach(as_index, vip->as_indexes, {
+      as = &lbm->ass[*as_index];
+      if (as->flags & LB_AS_FLAGS_USED) { //Not used anymore
+        i = 1;
+        goto out; //Not sure 'break' works in this macro-loop
+      }
+  });
+
+out:
+  if (i == 0) {
+    //Only the default. i.e. no AS
+    vec_validate(new_flow_table, vip->new_flow_table_mask);
+    for (i=0; i<vec_len(new_flow_table); i++)
+      new_flow_table[i].as_index = 0;
+
+    goto finished;
+  }
+
+  //First, let's sort the ASs
+  sort_arr = 0;
+  vec_alloc(sort_arr, pool_elts(vip->as_indexes));
+
+  i = 0;
+  pool_foreach(as_index, vip->as_indexes, {
+      as = &lbm->ass[*as_index];
+      if (!(as->flags & LB_AS_FLAGS_USED)) //Not used anymore
+        continue;
+
+      sort_arr[i].as_index = as - lbm->ass;
+      i++;
+  });
+  _vec_len(sort_arr) = i;
+
+  vec_sort_with_function(sort_arr, lb_pseudorand_compare);
+
+  //Now let's pseudo-randomly generate permutations
+  vec_foreach(pr, sort_arr) {
+    lb_as_t *as = &lbm->ass[pr->as_index];
+
+    u64 seed = clib_xxhash(as->address.as_u64[0] ^
+                           as->address.as_u64[1]);
+    /* We have 2^n buckets.
+     * skip must be prime with 2^n.
+     * So skip must be odd.
+     * MagLev actually state that M should be prime,
+     * but this has a big computation cost (% operation).
+     * Using 2^n is more better (& operation).
+     */
+    pr->skip = ((seed & 0xffffffff) | 1) & vip->new_flow_table_mask;
+    pr->last = (seed >> 32) & vip->new_flow_table_mask;
+  }
+
+  //Let's create a new flow table
+  vec_validate(new_flow_table, vip->new_flow_table_mask);
+  for (i=0; i<vec_len(new_flow_table); i++)
+    new_flow_table[i].as_index = ~0;
+
+  u32 done = 0;
+  while (1) {
+    vec_foreach(pr, sort_arr) {
+      while (1) {
+        u32 last = pr->last;
+        pr->last = (pr->last + pr->skip) & vip->new_flow_table_mask;
+        if (new_flow_table[last].as_index == ~0) {
+          new_flow_table[last].as_index = pr->as_index;
+          break;
+        }
+      }
+      done++;
+      if (done == vec_len(new_flow_table))
+        goto finished;
+    }
+  }
+
+  vec_free(sort_arr);
+
+finished:
+
+//Count number of changed entries
+  count = 0;
+  for (i=0; i<vec_len(new_flow_table); i++)
+    if (vip->new_flow_table == 0 ||
+        new_flow_table[i].as_index != vip->new_flow_table[i].as_index)
+      count++;
+
+  old_table = vip->new_flow_table;
+  vip->new_flow_table = new_flow_table;
+  vec_free(old_table);
+}
+
+int lb_conf(ip4_address_t *ip4_address, ip6_address_t *ip6_address,
+           u32 per_cpu_sticky_buckets, u32 flow_timeout)
+{
+  lb_main_t *lbm = &lb_main;
+
+  if (!is_pow2(per_cpu_sticky_buckets))
+    return VNET_API_ERROR_INVALID_MEMORY_SIZE;
+
+  lb_get_writer_lock(); //Not exactly necessary but just a reminder that it exists for my future self
+  lbm->ip4_src_address = *ip4_address;
+  lbm->ip6_src_address = *ip6_address;
+  lbm->per_cpu_sticky_buckets = per_cpu_sticky_buckets;
+  lbm->flow_timeout = flow_timeout;
+  lb_put_writer_lock();
+  return 0;
+}
+
+static
+int lb_vip_find_index_with_lock(ip46_address_t *prefix, u8 plen, u32 *vip_index)
+{
+  lb_main_t *lbm = &lb_main;
+  lb_vip_t *vip;
+  ASSERT (lbm->writer_lock[0]); //This must be called with the lock owned
+  ip46_prefix_normalize(prefix, plen);
+  pool_foreach(vip, lbm->vips, {
+      if ((vip->flags & LB_AS_FLAGS_USED) &&
+          vip->plen == plen &&
+          vip->prefix.as_u64[0] == prefix->as_u64[0] &&
+          vip->prefix.as_u64[1] == prefix->as_u64[1]) {
+        *vip_index = vip - lbm->vips;
+        return 0;
+      }
+  });
+  return VNET_API_ERROR_NO_SUCH_ENTRY;
+}
+
+int lb_vip_find_index(ip46_address_t *prefix, u8 plen, u32 *vip_index)
+{
+  int ret;
+  lb_get_writer_lock();
+  ret = lb_vip_find_index_with_lock(prefix, plen, vip_index);
+  lb_put_writer_lock();
+  return ret;
+}
+
+static int lb_as_find_index_vip(lb_vip_t *vip, ip46_address_t *address, u32 *as_index)
+{
+  lb_main_t *lbm = &lb_main;
+  ASSERT (lbm->writer_lock[0]); //This must be called with the lock owned
+  lb_as_t *as;
+  u32 *asi;
+  pool_foreach(asi, vip->as_indexes, {
+      as = &lbm->ass[*asi];
+      if (as->vip_index == (vip - lbm->vips) &&
+          as->address.as_u64[0] == address->as_u64[0] &&
+          as->address.as_u64[1] == address->as_u64[1]) {
+        *as_index = as - lbm->ass;
+        return 0;
+      }
+  });
+  return -1;
+}
+
+int lb_vip_add_ass(u32 vip_index, ip46_address_t *addresses, u32 n)
+{
+  lb_main_t *lbm = &lb_main;
+  lb_get_writer_lock();
+  lb_vip_t *vip;
+  if (!(vip = lb_vip_get_by_index(vip_index))) {
+    lb_put_writer_lock();
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+  }
+
+  ip46_type_t type = lb_vip_is_gre4(vip)?IP46_TYPE_IP4:IP46_TYPE_IP6;
+  u32 *to_be_added = 0;
+  u32 *to_be_updated = 0;
+  u32 i;
+  u32 *ip;
+
+  //Sanity check
+  while (n--) {
+
+    if (!lb_as_find_index_vip(vip, &addresses[n], &i)) {
+      if (lbm->ass[i].flags & LB_AS_FLAGS_USED) {
+        vec_free(to_be_added);
+        vec_free(to_be_updated);
+        lb_put_writer_lock();
+        return VNET_API_ERROR_VALUE_EXIST;
+      }
+      vec_add1(to_be_updated, i);
+      goto next;
+    }
+
+    if (ip46_address_type(&addresses[n]) != type) {
+      vec_free(to_be_added);
+      vec_free(to_be_updated);
+      lb_put_writer_lock();
+      return VNET_API_ERROR_INVALID_ADDRESS_FAMILY;
+    }
+
+    if (n) {
+      u32 n2 = n;
+      while(n2--) //Check for duplicates
+        if (addresses[n2].as_u64[0] == addresses[n].as_u64[0] &&
+            addresses[n2].as_u64[1] == addresses[n].as_u64[1])
+          goto next;
+    }
+
+    vec_add1(to_be_added, n);
+
+next:
+    continue;
+  }
+
+  //Update reused ASs
+  vec_foreach(ip, to_be_updated) {
+    lbm->ass[*ip].flags = LB_AS_FLAGS_USED;
+  }
+  vec_free(to_be_updated);
+
+  //Create those who have to be created
+  vec_foreach(ip, to_be_added) {
+    lb_as_t *as;
+    u32 *as_index;
+    pool_get(lbm->ass, as);
+    as->address = addresses[*ip];
+    as->flags = LB_AS_FLAGS_USED;
+    as->vip_index = vip_index;
+    pool_get(vip->as_indexes, as_index);
+    *as_index = as - lbm->ass;
+
+    /*
+     * become a child of the FIB entry
+     * so we are informed when its forwarding changes
+     */
+    fib_prefix_t nh = {};
+    if (lb_vip_is_gre4(vip)) {
+	nh.fp_addr.ip4 = as->address.ip4;
+	nh.fp_len = 32;
+	nh.fp_proto = FIB_PROTOCOL_IP4;
+    } else {
+	nh.fp_addr.ip6 = as->address.ip6;
+	nh.fp_len = 128;
+	nh.fp_proto = FIB_PROTOCOL_IP6;
+    }
+
+    as->next_hop_fib_entry_index =
+	fib_table_entry_special_add(0,
+				    &nh,
+				    FIB_SOURCE_RR,
+				    FIB_ENTRY_FLAG_NONE,
+				    ADJ_INDEX_INVALID);
+    as->next_hop_child_index =
+	fib_entry_child_add(as->next_hop_fib_entry_index,
+			    lbm->fib_node_type,
+			    as - lbm->ass);
+
+    lb_as_stack(as);
+  }
+  vec_free(to_be_added);
+
+  //Recompute flows
+  lb_vip_update_new_flow_table(vip);
+
+  //Garbage collection maybe
+  lb_vip_garbage_collection(vip);
+
+  lb_put_writer_lock();
+  return 0;
+}
+
+int lb_vip_del_ass_withlock(u32 vip_index, ip46_address_t *addresses, u32 n)
+{
+  lb_main_t *lbm = &lb_main;
+  u32 now = (u32) vlib_time_now(vlib_get_main());
+  u32 *ip = 0;
+
+  lb_vip_t *vip;
+  if (!(vip = lb_vip_get_by_index(vip_index))) {
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+  }
+
+  u32 *indexes = NULL;
+  while (n--) {
+    u32 i;
+    if (lb_as_find_index_vip(vip, &addresses[n], &i)) {
+      vec_free(indexes);
+      return VNET_API_ERROR_NO_SUCH_ENTRY;
+    }
+
+    if (n) { //Check for duplicates
+      u32 n2 = n - 1;
+      while(n2--) {
+        if (addresses[n2].as_u64[0] == addresses[n].as_u64[0] &&
+            addresses[n2].as_u64[1] == addresses[n].as_u64[1])
+          goto next;
+      }
+    }
+
+    vec_add1(indexes, i);
+next:
+  continue;
+  }
+
+  //Garbage collection maybe
+  lb_vip_garbage_collection(vip);
+
+  if (indexes != NULL) {
+    vec_foreach(ip, indexes) {
+      lbm->ass[*ip].flags &= ~LB_AS_FLAGS_USED;
+      lbm->ass[*ip].last_used = now;
+    }
+
+    //Recompute flows
+    lb_vip_update_new_flow_table(vip);
+  }
+
+  vec_free(indexes);
+  return 0;
+}
+
+int lb_vip_del_ass(u32 vip_index, ip46_address_t *addresses, u32 n)
+{
+  lb_get_writer_lock();
+  int ret = lb_vip_del_ass_withlock(vip_index, addresses, n);
+  lb_put_writer_lock();
+  return ret;
+}
+
+/**
+ * Add the VIP adjacency to the ip4 or ip6 fib
+ */
+static void lb_vip_add_adjacency(lb_main_t *lbm, lb_vip_t *vip)
+{
+  dpo_proto_t proto = 0;
+  dpo_id_t dpo = DPO_INVALID;
+  fib_prefix_t pfx = {};
+  if (lb_vip_is_ip4(vip)) {
+      pfx.fp_addr.ip4 = vip->prefix.ip4;
+      pfx.fp_len = vip->plen - 96;
+      pfx.fp_proto = FIB_PROTOCOL_IP4;
+      proto = DPO_PROTO_IP4;
+  } else {
+      pfx.fp_addr.ip6 = vip->prefix.ip6;
+      pfx.fp_len = vip->plen;
+      pfx.fp_proto = FIB_PROTOCOL_IP6;
+      proto = DPO_PROTO_IP6;
+  }
+  dpo_set(&dpo, lb_vip_is_gre4(vip)?lbm->dpo_gre4_type:lbm->dpo_gre6_type,
+      proto, vip - lbm->vips);
+  fib_table_entry_special_dpo_add(0,
+				  &pfx,
+				  FIB_SOURCE_PLUGIN_HI,
+				  FIB_ENTRY_FLAG_EXCLUSIVE,
+				  &dpo);
+  dpo_reset(&dpo);
+}
+
+/**
+ * Deletes the adjacency associated with the VIP
+ */
+static void lb_vip_del_adjacency(lb_main_t *lbm, lb_vip_t *vip)
+{
+  fib_prefix_t pfx = {};
+  if (lb_vip_is_ip4(vip)) {
+      pfx.fp_addr.ip4 = vip->prefix.ip4;
+      pfx.fp_len = vip->plen - 96;
+      pfx.fp_proto = FIB_PROTOCOL_IP4;
+  } else {
+      pfx.fp_addr.ip6 = vip->prefix.ip6;
+      pfx.fp_len = vip->plen;
+      pfx.fp_proto = FIB_PROTOCOL_IP6;
+  }
+  fib_table_entry_special_remove(0, &pfx, FIB_SOURCE_PLUGIN_HI);
+}
+
+int lb_vip_add(ip46_address_t *prefix, u8 plen, lb_vip_type_t type, u32 new_length, u32 *vip_index)
+{
+  lb_main_t *lbm = &lb_main;
+  lb_vip_t *vip;
+  lb_get_writer_lock();
+  ip46_prefix_normalize(prefix, plen);
+
+  if (!lb_vip_find_index_with_lock(prefix, plen, vip_index)) {
+    lb_put_writer_lock();
+    return VNET_API_ERROR_VALUE_EXIST;
+  }
+
+  if (!is_pow2(new_length)) {
+    lb_put_writer_lock();
+    return VNET_API_ERROR_INVALID_MEMORY_SIZE;
+  }
+
+  if (ip46_prefix_is_ip4(prefix, plen) &&
+      (type != LB_VIP_TYPE_IP4_GRE4) &&
+      (type != LB_VIP_TYPE_IP4_GRE6))
+    return VNET_API_ERROR_INVALID_ADDRESS_FAMILY;
+
+
+  //Allocate
+  pool_get(lbm->vips, vip);
+
+  //Init
+  vip->prefix = *prefix;
+  vip->plen = plen;
+  vip->last_garbage_collection = (u32) vlib_time_now(vlib_get_main());
+  vip->type = type;
+  vip->flags = LB_VIP_FLAGS_USED;
+  vip->as_indexes = 0;
+
+  //Validate counters
+  u32 i;
+  for (i = 0; i < LB_N_VIP_COUNTERS; i++) {
+    vlib_validate_simple_counter(&lbm->vip_counters[i], vip - lbm->vips);
+    vlib_zero_simple_counter(&lbm->vip_counters[i], vip - lbm->vips);
+  }
+
+  //Configure new flow table
+  vip->new_flow_table_mask = new_length - 1;
+  vip->new_flow_table = 0;
+
+  //Create a new flow hash table full of the default entry
+  lb_vip_update_new_flow_table(vip);
+
+  //Create adjacency to direct traffic
+  lb_vip_add_adjacency(lbm, vip);
+
+  //Return result
+  *vip_index = vip - lbm->vips;
+
+  lb_put_writer_lock();
+  return 0;
+}
+
+int lb_vip_del(u32 vip_index)
+{
+  lb_main_t *lbm = &lb_main;
+  lb_vip_t *vip;
+  lb_get_writer_lock();
+  if (!(vip = lb_vip_get_by_index(vip_index))) {
+    lb_put_writer_lock();
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+  }
+
+  //FIXME: This operation is actually not working
+  //We will need to remove state before performing this.
+
+  {
+    //Remove all ASs
+    ip46_address_t *ass = 0;
+    lb_as_t *as;
+    u32 *as_index;
+    pool_foreach(as_index, vip->as_indexes, {
+        as = &lbm->ass[*as_index];
+        vec_add1(ass, as->address);
+    });
+    if (vec_len(ass))
+      lb_vip_del_ass_withlock(vip_index, ass, vec_len(ass));
+    vec_free(ass);
+  }
+
+  //Delete adjacency
+  lb_vip_del_adjacency(lbm, vip);
+
+  //Set the VIP as unused
+  vip->flags &= ~LB_VIP_FLAGS_USED;
+
+  lb_put_writer_lock();
+  return 0;
+}
+
+clib_error_t *
+vlib_plugin_register (vlib_main_t * vm,
+                      vnet_plugin_handoff_t * h,
+                      int from_early_init)
+{
+  clib_error_t *error = 0;
+  return error;
+}
+
+
+u8 *format_lb_dpo (u8 * s, va_list * va)
+{
+  index_t index = va_arg (*va, index_t);
+  CLIB_UNUSED(u32 indent) = va_arg (*va, u32);
+  lb_main_t *lbm = &lb_main;
+  lb_vip_t *vip = pool_elt_at_index (lbm->vips, index);
+  return format (s, "%U", format_lb_vip, vip);
+}
+
+static void lb_dpo_lock (dpo_id_t *dpo) {}
+static void lb_dpo_unlock (dpo_id_t *dpo) {}
+
+static fib_node_t *
+lb_fib_node_get_node (fib_node_index_t index)
+{
+  lb_main_t *lbm = &lb_main;
+  lb_as_t *as = pool_elt_at_index (lbm->ass, index);
+  return (&as->fib_node);
+}
+
+static void
+lb_fib_node_last_lock_gone (fib_node_t *node)
+{
+}
+
+static lb_as_t *
+lb_as_from_fib_node (fib_node_t *node)
+{
+  return ((lb_as_t*)(((char*)node) -
+      STRUCT_OFFSET_OF(lb_as_t, fib_node)));
+}
+
+static void
+lb_as_stack (lb_as_t *as)
+{
+  lb_main_t *lbm = &lb_main;
+  lb_vip_t *vip = &lbm->vips[as->vip_index];
+  dpo_stack(lb_vip_is_gre4(vip)?lbm->dpo_gre4_type:lbm->dpo_gre6_type,
+	    lb_vip_is_ip4(vip)?DPO_PROTO_IP4:DPO_PROTO_IP6,
+	    &as->dpo,
+	    fib_entry_contribute_ip_forwarding(
+		as->next_hop_fib_entry_index));
+}
+
+static fib_node_back_walk_rc_t
+lb_fib_node_back_walk_notify (fib_node_t *node,
+			       fib_node_back_walk_ctx_t *ctx)
+{
+    lb_as_stack(lb_as_from_fib_node(node));
+    return (FIB_NODE_BACK_WALK_CONTINUE);
+}
+
+clib_error_t *
+lb_init (vlib_main_t * vm)
+{
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  lb_main_t *lbm = &lb_main;
+  lb_as_t *default_as;
+  fib_node_vft_t lb_fib_node_vft = {
+      .fnv_get = lb_fib_node_get_node,
+      .fnv_last_lock = lb_fib_node_last_lock_gone,
+      .fnv_back_walk = lb_fib_node_back_walk_notify,
+  };
+  dpo_vft_t lb_vft = {
+      .dv_lock = lb_dpo_lock,
+      .dv_unlock = lb_dpo_unlock,
+      .dv_format = format_lb_dpo,
+  };
+
+  lbm->vips = 0;
+  lbm->per_cpu = 0;
+  vec_validate(lbm->per_cpu, tm->n_vlib_mains - 1);
+  lbm->writer_lock = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,  CLIB_CACHE_LINE_BYTES);
+  lbm->writer_lock[0] = 0;
+  lbm->per_cpu_sticky_buckets = LB_DEFAULT_PER_CPU_STICKY_BUCKETS;
+  lbm->flow_timeout = LB_DEFAULT_FLOW_TIMEOUT;
+  lbm->ip4_src_address.as_u32 = 0xffffffff;
+  lbm->ip6_src_address.as_u64[0] = 0xffffffffffffffffL;
+  lbm->ip6_src_address.as_u64[1] = 0xffffffffffffffffL;
+  lbm->dpo_gre4_type = dpo_register_new_type(&lb_vft, lb_dpo_gre4_nodes);
+  lbm->dpo_gre6_type = dpo_register_new_type(&lb_vft, lb_dpo_gre6_nodes);
+  lbm->fib_node_type = fib_node_register_new_type(&lb_fib_node_vft);
+
+  //Init AS reference counters
+  vlib_refcount_init(&lbm->as_refcount);
+
+  //Allocate and init default AS.
+  lbm->ass = 0;
+  pool_get(lbm->ass, default_as);
+  default_as->flags = 0;
+  default_as->dpo.dpoi_next_node = LB_NEXT_DROP;
+  default_as->vip_index = ~0;
+  default_as->address.ip6.as_u64[0] = 0xffffffffffffffffL;
+  default_as->address.ip6.as_u64[1] = 0xffffffffffffffffL;
+
+#define _(a,b,c) lbm->vip_counters[c].name = b;
+  lb_foreach_vip_counter
+#undef _
+  return NULL;
+}
+
+VLIB_INIT_FUNCTION (lb_init);
diff --git a/src/plugins/lb/lb.h b/src/plugins/lb/lb.h
new file mode 100644
index 00000000..882b9b30
--- /dev/null
+++ b/src/plugins/lb/lb.h
@@ -0,0 +1,333 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * lb-plugin implements a MagLev-like load balancer.
+ * http://research.google.com/pubs/pub44824.html
+ *
+ * It hasn't been tested for interoperability with the original MagLev
+ * but intends to provide similar functionality.
+ * The load-balancer receives traffic destined to VIP (Virtual IP)
+ * addresses from one or multiple(ECMP) routers.
+ * The load-balancer tunnels the traffic toward many application servers
+ * ensuring session stickyness (i.e. that a single sessions is tunneled
+ * towards a single application server).
+ *
+ */
+
+#ifndef LB_PLUGIN_LB_LB_H_
+#define LB_PLUGIN_LB_LB_H_
+
+#include <lb/util.h>
+#include <lb/refcount.h>
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/dpo/dpo.h>
+#include <vnet/fib/fib_table.h>
+
+#include <lb/lbhash.h>
+
+#define LB_DEFAULT_PER_CPU_STICKY_BUCKETS 1 << 10
+#define LB_DEFAULT_FLOW_TIMEOUT 40
+
+typedef enum {
+  LB_NEXT_DROP,
+  LB_N_NEXT,
+} lb_next_t;
+
+/**
+ * Each VIP is configured with a set of
+ * application server.
+ */
+typedef struct {
+  /**
+   * Registration to FIB event.
+   */
+  fib_node_t fib_node;
+
+  /**
+   * Destination address used to tunnel traffic towards
+   * that application server.
+   * The address is also used as ID and pseudo-random
+   * seed for the load-balancing process.
+   */
+  ip46_address_t address;
+
+  /**
+   * ASs are indexed by address and VIP Index.
+   * Which means there will be duplicated if the same server
+   * address is used for multiple VIPs.
+   */
+  u32 vip_index;
+
+  /**
+   * Some per-AS flags.
+   * For now only LB_AS_FLAGS_USED is defined.
+   */
+  u8 flags;
+
+#define LB_AS_FLAGS_USED 0x1
+
+  /**
+   * Rotating timestamp of when LB_AS_FLAGS_USED flag was last set.
+   *
+   * AS removal is based on garbage collection and reference counting.
+   * When an AS is removed, there is a race between configuration core
+   * and worker cores which may still add a reference while it should not
+   * be used. This timestamp is used to not remove the AS while a race condition
+   * may happen.
+   */
+  u32 last_used;
+
+  /**
+   * The FIB entry index for the next-hop
+   */
+  fib_node_index_t next_hop_fib_entry_index;
+
+  /**
+   * The child index on the FIB entry
+   */
+  u32 next_hop_child_index;
+
+  /**
+   * The next DPO in the graph to follow.
+   */
+  dpo_id_t dpo;
+
+} lb_as_t;
+
+format_function_t format_lb_as;
+
+typedef struct {
+  u32 as_index;
+} lb_new_flow_entry_t;
+
+#define lb_foreach_vip_counter \
+ _(NEXT_PACKET, "packet from existing sessions", 0) \
+ _(FIRST_PACKET, "first session packet", 1) \
+ _(UNTRACKED_PACKET, "untracked packet", 2) \
+ _(NO_SERVER, "no server configured", 3)
+
+typedef enum {
+#define _(a,b,c) LB_VIP_COUNTER_##a = c,
+  lb_foreach_vip_counter
+#undef _
+  LB_N_VIP_COUNTERS
+} lb_vip_counter_t;
+
+/**
+ * The load balancer supports IPv4 and IPv6 traffic
+ * and GRE4 and GRE6 encap.
+ */
+typedef enum {
+  LB_VIP_TYPE_IP6_GRE6,
+  LB_VIP_TYPE_IP6_GRE4,
+  LB_VIP_TYPE_IP4_GRE6,
+  LB_VIP_TYPE_IP4_GRE4,
+  LB_VIP_N_TYPES,
+} lb_vip_type_t;
+
+format_function_t format_lb_vip_type;
+unformat_function_t unformat_lb_vip_type;
+
+/**
+ * Load balancing service is provided per VIP.
+ * In this data model, a VIP can be a whole prefix.
+ * But load balancing only
+ * occurs on a per-source-address/port basis. Meaning that if a given source
+ * reuses the same port for multiple destinations within the same VIP,
+ * they will be considered as a single flow.
+ */
+typedef struct {
+
+  //Runtime
+
+  /**
+   * Vector mapping (flow-hash & new_connect_table_mask) to AS index.
+   * This is used for new flows.
+   */
+  lb_new_flow_entry_t *new_flow_table;
+
+  /**
+   * New flows table length - 1
+   * (length MUST be a power of 2)
+   */
+  u32 new_flow_table_mask;
+
+  /**
+   * Last time garbage collection was run to free the ASs.
+   */
+  u32 last_garbage_collection;
+
+  //Not runtime
+
+  /**
+   * A Virtual IP represents a given service delivered
+   * by a set of application servers. It can be a single
+   * address or a prefix.
+   * IPv4 prefixes are encoded using IPv4-in-IPv6 embedded address
+   * (i.e. ::/96 prefix).
+   */
+  ip46_address_t prefix;
+
+  /**
+   * The VIP prefix length.
+   * In case of IPv4, plen = 96 + ip4_plen.
+   */
+  u8 plen;
+
+  /**
+   * The type of traffic for this.
+   * LB_TYPE_UNDEFINED if unknown.
+   */
+  lb_vip_type_t type;
+
+  /**
+   * Flags related to this VIP.
+   * LB_VIP_FLAGS_USED means the VIP is active.
+   * When it is not set, the VIP in the process of being removed.
+   * We cannot immediately remove a VIP because the VIP index still may be stored
+   * in the adjacency index.
+   */
+  u8 flags;
+#define LB_VIP_FLAGS_USED 0x1
+
+  /**
+   * Pool of AS indexes used for this VIP.
+   * This also includes ASs that have been removed (but are still referenced).
+   */
+  u32 *as_indexes;
+} lb_vip_t;
+
+#define lb_vip_is_ip4(vip) ((vip)->type == LB_VIP_TYPE_IP4_GRE6 || (vip)->type == LB_VIP_TYPE_IP4_GRE4)
+#define lb_vip_is_gre4(vip) ((vip)->type == LB_VIP_TYPE_IP6_GRE4 || (vip)->type == LB_VIP_TYPE_IP4_GRE4)
+format_function_t format_lb_vip;
+format_function_t format_lb_vip_detailed;
+
+typedef struct {
+  /**
+   * Each CPU has its own sticky flow hash table.
+   * One single table is used for all VIPs.
+   */
+  lb_hash_t *sticky_ht;
+} lb_per_cpu_t;
+
+typedef struct {
+  /**
+   * Pool of all Virtual IPs
+   */
+  lb_vip_t *vips;
+
+  /**
+   * Pool of ASs.
+   * ASs are referenced by address and vip index.
+   * The first element (index 0) is special and used only to fill
+   * new_flow_tables when no AS has been configured.
+   */
+  lb_as_t *ass;
+
+  /**
+   * Each AS has an associated reference counter.
+   * As ass[0] has a special meaning, its associated counter
+   * starts at 0 and is decremented instead. i.e. do not use it.
+   */
+  vlib_refcount_t as_refcount;
+
+  /**
+   * Some global data is per-cpu
+   */
+  lb_per_cpu_t *per_cpu;
+
+  /**
+   * Node next index for IP adjacencies, for each of the traffic types.
+   */
+  u32 ip_lookup_next_index[LB_VIP_N_TYPES];
+
+  /**
+   * Source address used in IPv6 encapsulated traffic
+   */
+  ip6_address_t ip6_src_address;
+
+  /**
+   * Source address used for IPv4 encapsulated traffic
+   */
+  ip4_address_t ip4_src_address;
+
+  /**
+   * Number of buckets in the per-cpu sticky hash table.
+   */
+  u32 per_cpu_sticky_buckets;
+
+  /**
+   * Flow timeout in seconds.
+   */
+  u32 flow_timeout;
+
+  /**
+   * Per VIP counter
+   */
+  vlib_simple_counter_main_t vip_counters[LB_N_VIP_COUNTERS];
+
+  /**
+   * DPO used to send packet from IP4/6 lookup to LB node.
+   */
+  dpo_type_t dpo_gre4_type;
+  dpo_type_t dpo_gre6_type;
+
+  /**
+   * Node type for registering to fib changes.
+   */
+  fib_node_type_t fib_node_type;
+
+  /**
+   * API dynamically registered base ID.
+   */
+  u16 msg_id_base;
+
+  volatile u32 *writer_lock;
+} lb_main_t;
+
+extern lb_main_t lb_main;
+extern vlib_node_registration_t lb6_node;
+extern vlib_node_registration_t lb4_node;
+
+/**
+ * Fix global load-balancer parameters.
+ * @param ip4_address IPv4 source address used for encapsulated traffic
+ * @param ip6_address IPv6 source address used for encapsulated traffic
+ * @return 0 on success. VNET_LB_ERR_XXX on error
+ */
+int lb_conf(ip4_address_t *ip4_address, ip6_address_t *ip6_address,
+            u32 sticky_buckets, u32 flow_timeout);
+
+int lb_vip_add(ip46_address_t *prefix, u8 plen, lb_vip_type_t type,
+               u32 new_length, u32 *vip_index);
+int lb_vip_del(u32 vip_index);
+
+int lb_vip_find_index(ip46_address_t *prefix, u8 plen, u32 *vip_index);
+
+#define lb_vip_get_by_index(index) (pool_is_free_index(lb_main.vips, index)?NULL:pool_elt_at_index(lb_main.vips, index))
+
+int lb_vip_add_ass(u32 vip_index, ip46_address_t *addresses, u32 n);
+int lb_vip_del_ass(u32 vip_index, ip46_address_t *addresses, u32 n);
+
+u32 lb_hash_time_now(vlib_main_t * vm);
+
+void lb_garbage_collection();
+
+format_function_t format_lb_main;
+
+#endif /* LB_PLUGIN_LB_LB_H_ */
diff --git a/src/plugins/lb/lb_plugin_doc.md b/src/plugins/lb/lb_plugin_doc.md
new file mode 100644
index 00000000..c7885ffb
--- /dev/null
+++ b/src/plugins/lb/lb_plugin_doc.md
@@ -0,0 +1,141 @@
+# Load Balancer plugin for VPP    {#lb_plugin_doc}
+
+## Version
+
+The load balancer plugin is currently in *beta* version.
+Both CLIs and APIs are subject to *heavy* changes.
+Wich also means feedback is really welcome regarding features, apis, etc...
+
+## Overview
+
+This plugin provides load balancing for VPP in a way that is largely inspired 
+from Google's MagLev: http://research.google.com/pubs/pub44824.html
+
+The load balancer is configured with a set of Virtual IPs (VIP, which can be 
+prefixes), and for each VIP, with a set of Application Server addresses (ASs).
+
+Traffic received for a given VIP (or VIP prefix) is tunneled using GRE towards
+the different ASs in a way that (tries to) ensure that a given session will 
+always be tunneled to the same AS.
+
+Both VIPs or ASs can be IPv4 or IPv6, but for a given VIP, all ASs must be using
+the same encap. type (i.e. IPv4+GRE or IPv6+GRE). Meaning that for a given VIP,
+all AS addresses must be of the same family.
+
+## Performances
+
+The load balancer has been tested up to 1 millions flows and still forwards more
+than 3Mpps per core in such circumstances.
+Although 3Mpps seems already good, it is likely that performances will be improved
+in next versions.
+
+## Configuration
+
+### Global LB parameters
+
+The load balancer needs to be configured with some parameters:
+
+	lb conf [ip4-src-address <addr>] [ip6-src-address <addr>] 
+	        [buckets <n>] [timeout <s>]
+	       
+ip4-src-address: the source address used to send encap. packets using IPv4.
+
+ip6-src-address: the source address used to send encap. packets using IPv6.
+
+buckets:         the *per-thread* established-connexions-table number of buckets.
+
+timeout:         the number of seconds a connection will remain in the 
+                 established-connexions-table while no packet for this flow
+                 is received.
+                 
+
+### Configure the VIPs
+
+    lb vip <prefix> [encap (gre6|gre4)] [new_len <n>] [del]
+    
+new_len is the size of the new-connection-table. It should be 1 or 2 orders of
+magnitude bigger than the number of ASs for the VIP in order to ensure a good
+load balancing.
+
+Examples:
+    
+    lb vip 2002::/16 encap gre6 new_len 1024
+    lb vip 2003::/16 encap gre4 new_len 2048
+    lb vip 80.0.0.0/8 encap gre6 new_len 16
+    lb vip 90.0.0.0/8 encap gre4 new_len 1024
+
+### Configure the ASs (for each VIP)
+
+    lb as <vip-prefix> [<address> [<address> [...]]] [del]
+
+You can add (or delete) as many ASs at a time (for a single VIP).
+Note that the AS address family must correspond to the VIP encap. IP family.
+
+Examples:
+
+    lb as 2002::/16 2001::2 2001::3 2001::4
+    lb as 2003::/16 10.0.0.1 10.0.0.2
+    lb as 80.0.0.0/8 2001::2
+    lb as 90.0.0.0/8 10.0.0.1
+    
+    
+
+## Monitoring
+
+The plugin provides quite a bunch of counters and information.
+These are still subject to quite significant changes.
+
+    show lb
+    show lb vip
+    show lb vip verbose
+    
+    show node counters
+
+
+## Design notes
+
+### Multi-Threading
+
+MagLev is a distributed system which pseudo-randomly generates a 
+new-connections-table based on AS names such that each server configured with 
+the same set of ASs ends up with the same table. Connection stickyness is then 
+ensured with an established-connections-table. Using ECMP, it is assumed (but
+not relied on) that servers will mostly receive traffic for different flows.
+
+This implementation pushes the parallelism a little bit further by using
+one established-connections table per thread. This is equivalent to assuming
+that RSS will make a job similar to ECMP, and is pretty useful as threads don't
+need to get a lock in order to write in the table.
+
+### Hash Table
+
+A load balancer requires an efficient read and write hash table. The hash table
+used by ip6-forward is very read-efficient, but not so much for writing. In
+addition, it is not a big deal if writing into the hash table fails (again,
+MagLev uses a flow table but does not heaviliy relies on it).
+
+The plugin therefore uses a very specific (and stupid) hash table.
+	- Fixed (and power of 2) number of buckets (configured at runtime)
+	- Fixed (and power of 2) elements per buckets (configured at compilation time)
+
+### Reference counting
+
+When an AS is removed, there is two possible ways to react.
+	- Keep using the AS for established connections
+	- Change AS for established connections (likely to cause error for TCP)
+
+In the first case, although an AS is removed from the configuration, its 
+associated state needs to stay around as long as it is used by at least one 
+thread.
+
+In order to avoid locks, a specific reference counter is used. The design is quite
+similar to clib counters but:
+	- It is possible to decrease the value
+	- Summing will not zero the per-thread counters
+	- Only the thread can reallocate its own counters vector (to avoid concurrency issues)
+
+This reference counter is lock free, but reading a count of 0 does not mean
+the value can be freed unless it is ensured by *other* means that no other thread
+is concurrently referencing the object. In the case of this plugin, it is assumed
+that no concurrent event will take place after a few seconds.
+
diff --git a/src/plugins/lb/lb_test.c b/src/plugins/lb/lb_test.c
new file mode 100644
index 00000000..8c2eaa91
--- /dev/null
+++ b/src/plugins/lb/lb_test.c
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vat/vat.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vppinfra/error.h>
+#include <lb/lb.h>
+
+//TODO: Move that to vat/plugin_api.c
+//////////////////////////
+uword unformat_ip46_address (unformat_input_t * input, va_list * args)
+{
+  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
+  ip46_type_t type = va_arg (*args, ip46_type_t);
+  if ((type != IP46_TYPE_IP6) &&
+      unformat(input, "%U", unformat_ip4_address, &ip46->ip4)) {
+    ip46_address_mask_ip4(ip46);
+    return 1;
+  } else if ((type != IP46_TYPE_IP4) &&
+      unformat(input, "%U", unformat_ip6_address, &ip46->ip6)) {
+    return 1;
+  }
+  return 0;
+}
+uword unformat_ip46_prefix (unformat_input_t * input, va_list * args)
+{
+  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
+  u8 *len = va_arg (*args, u8 *);
+  ip46_type_t type = va_arg (*args, ip46_type_t);
+
+  u32 l;
+  if ((type != IP46_TYPE_IP6) && unformat(input, "%U/%u", unformat_ip4_address, &ip46->ip4, &l)) {
+    if (l > 32)
+      return 0;
+    *len = l + 96;
+    ip46->pad[0] = ip46->pad[1] = ip46->pad[2] = 0;
+  } else if ((type != IP46_TYPE_IP4) && unformat(input, "%U/%u", unformat_ip6_address, &ip46->ip6, &l)) {
+    if (l > 128)
+      return 0;
+    *len = l;
+  } else {
+    return 0;
+  }
+  return 1;
+}
+/////////////////////////
+
+#define vl_msg_id(n,h) n,
+typedef enum {
+#include <lb/lb.api.h>
+    /* We'll want to know how many messages IDs we need... */
+    VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+/* define message structures */
+#define vl_typedefs
+#include <lb/lb.api.h>
+#undef vl_typedefs
+
+/* declare message handlers for each api */
+
+#define vl_endianfun             /* define message structures */
+#include <lb/lb.api.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <lb/lb.api.h>
+#undef vl_printfun
+
+/* Get the API version number. */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <lb/lb.api.h>
+#undef vl_api_version
+
+typedef struct {
+    /* API message ID base */
+    u16 msg_id_base;
+    vat_main_t *vat_main;
+} lb_test_main_t;
+
+lb_test_main_t lb_test_main;
+
+#define foreach_standard_reply_retval_handler   \
+_(lb_conf_reply)                 \
+_(lb_add_del_vip_reply)          \
+_(lb_add_del_as_reply)
+
+#define _(n)                                            \
+    static void vl_api_##n##_t_handler                  \
+    (vl_api_##n##_t * mp)                               \
+    {                                                   \
+        vat_main_t * vam = lb_test_main.vat_main;   \
+        i32 retval = ntohl(mp->retval);                 \
+        if (vam->async_mode) {                          \
+            vam->async_errors += (retval < 0);          \
+        } else {                                        \
+            vam->retval = retval;                       \
+            vam->result_ready = 1;                      \
+        }                                               \
+    }
+foreach_standard_reply_retval_handler;
+#undef _
+
+/*
+ * Table of message reply handlers, must include boilerplate handlers
+ * we just generated
+ */
+#define foreach_vpe_api_reply_msg                               \
+  _(LB_CONF_REPLY, lb_conf_reply)                                     \
+  _(LB_ADD_DEL_VIP_REPLY, lb_add_del_vip_reply)                       \
+  _(LB_ADD_DEL_AS_REPLY, lb_add_del_as_reply)
+
+/* M: construct, but don't yet send a message */
+#define M(T,t)                                                  \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp));                         \
+    memcpy (mp, &mps, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + lbtm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+/* S: send a message */
+#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
+
+/* W: wait for results, with timeout */
+#define W                                       \
+do {                                            \
+    timeout = vat_time_now (vam) + 1.0;         \
+                                                \
+    while (vat_time_now (vam) < timeout) {      \
+        if (vam->result_ready == 1) {           \
+            return (vam->retval);               \
+        }                                       \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
+static int api_lb_conf (vat_main_t * vam)
+{
+  lb_test_main_t *lbtm = &lb_test_main;
+  unformat_input_t *i = vam->input;
+  f64 timeout;
+  vl_api_lb_conf_t mps, *mp;
+
+  if (!unformat(i, "%U %U %u %u",
+               unformat_ip4_address, &mps.ip4_src_address,
+               unformat_ip6_address, mps.ip6_src_address,
+               &mps.sticky_buckets_per_core,
+               &mps.flow_timeout)) {
+    errmsg ("invalid arguments\n");
+    return -99;
+  }
+
+  M(LB_CONF, lb_conf); S; W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int api_lb_add_del_vip (vat_main_t * vam)
+{
+  lb_test_main_t *lbtm = &lb_test_main;
+  unformat_input_t * i = vam->input;
+  f64 timeout;
+  vl_api_lb_add_del_vip_t mps, *mp;
+  mps.is_del = 0;
+  mps.is_gre4 = 0;
+
+  if (!unformat(i, "%U",
+                unformat_ip46_prefix, mps.ip_prefix, &mps.prefix_length, IP46_TYPE_ANY)) {
+    errmsg ("invalid prefix\n");
+    return -99;
+  }
+
+  if (unformat(i, "gre4")) {
+    mps.is_gre4 = 1;
+  } else if (unformat(i, "gre6")) {
+    mps.is_gre4 = 0;
+  } else {
+    errmsg ("no encap\n");
+    return -99;
+  }
+
+  if (!unformat(i, "%d", &mps.new_flows_table_length)) {
+    errmsg ("no table lentgh\n");
+    return -99;
+  }
+
+  if (unformat(i, "del")) {
+    mps.is_del = 1;
+  }
+
+  M(LB_ADD_DEL_VIP, lb_add_del_vip); S; W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int api_lb_add_del_as (vat_main_t * vam)
+{
+  lb_test_main_t *lbtm = &lb_test_main;
+  unformat_input_t * i = vam->input;
+  f64 timeout;
+  vl_api_lb_add_del_as_t mps, *mp;
+  mps.is_del = 0;
+
+  if (!unformat(i, "%U %U",
+                unformat_ip46_prefix, mps.vip_ip_prefix, &mps.vip_prefix_length, IP46_TYPE_ANY,
+                unformat_ip46_address, mps.as_address)) {
+    errmsg ("invalid prefix or address\n");
+    return -99;
+  }
+
+  if (unformat(i, "del")) {
+    mps.is_del = 1;
+  }
+
+  M(LB_ADD_DEL_AS, lb_add_del_as); S; W;
+  /* NOTREACHED */
+  return 0;
+}
+
+/*
+ * List of messages that the api test plugin sends,
+ * and that the data plane plugin processes
+ */
+#define foreach_vpe_api_msg                             \
+_(lb_conf, "<ip4-src-addr> <ip6-src-address> <sticky_buckets_per_core> <flow_timeout>") \
+_(lb_add_del_vip, "<ip-prefix> [gre4|gre6] <new_table_len> [del]") \
+_(lb_add_del_as, "<vip-ip-prefix> <address> [del]")
+
+void vat_api_hookup (vat_main_t *vam)
+{
+  lb_test_main_t * lbtm = &lb_test_main;
+  /* Hook up handlers for replies from the data plane plug-in */
+#define _(N,n)                                                  \
+  vl_msg_api_set_handlers((VL_API_##N + lbtm->msg_id_base),       \
+                          #n,                                   \
+                          vl_api_##n##_t_handler,               \
+                          vl_noop_handler,                      \
+                          vl_api_##n##_t_endian,                \
+                          vl_api_##n##_t_print,                 \
+                          sizeof(vl_api_##n##_t), 1);
+  foreach_vpe_api_reply_msg;
+#undef _
+
+  /* API messages we can send */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+  foreach_vpe_api_msg;
+#undef _
+
+  /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+  foreach_vpe_api_msg;
+#undef _
+}
+
+clib_error_t * vat_plugin_register (vat_main_t *vam)
+{
+  lb_test_main_t * lbtm = &lb_test_main;
+
+  u8 * name;
+
+  lbtm->vat_main = vam;
+
+  /* Ask the vpp engine for the first assigned message-id */
+  name = format (0, "lb_%08x%c", api_version, 0);
+  lbtm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  if (lbtm->msg_id_base != (u16) ~0)
+    vat_api_hookup (vam);
+
+  vec_free(name);
+
+  return 0;
+}
diff --git a/src/plugins/lb/lbhash.h b/src/plugins/lb/lbhash.h
new file mode 100644
index 00000000..ca3cc143
--- /dev/null
+++ b/src/plugins/lb/lbhash.h
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2012 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * vppinfra already includes tons of different hash tables.
+ * MagLev flow table is a bit different. It has to be very efficient
+ * for both writing and reading operations. But it does not need to
+ * be 100% reliable (write can fail). It also needs to recycle
+ * old entries in a lazy way.
+ *
+ * This hash table is the most dummy hash table you can do.
+ * Fixed total size, fixed bucket size.
+ * Advantage is that it could be very efficient (maybe).
+ *
+ */
+
+#ifndef LB_PLUGIN_LB_LBHASH_H_
+#define LB_PLUGIN_LB_LBHASH_H_
+
+#include <vnet/vnet.h>
+
+#if defined (__SSE4_2__)
+#include <immintrin.h>
+#endif
+
+/*
+ * @brief Number of entries per bucket.
+ */
+#define LBHASH_ENTRY_PER_BUCKET 4
+
+#define LB_HASH_DO_NOT_USE_SSE_BUCKETS 0
+
+/*
+ * @brief One bucket contains 4 entries.
+ * Each bucket takes one 64B cache line in memory.
+ */
+typedef struct {
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  u32 hash[LBHASH_ENTRY_PER_BUCKET];
+  u32 timeout[LBHASH_ENTRY_PER_BUCKET];
+  u32 vip[LBHASH_ENTRY_PER_BUCKET];
+  u32 value[LBHASH_ENTRY_PER_BUCKET];
+} lb_hash_bucket_t;
+
+typedef struct {
+  u32 buckets_mask;
+  u32 timeout;
+  lb_hash_bucket_t buckets[];
+} lb_hash_t;
+
+#define lb_hash_nbuckets(h) (((h)->buckets_mask) + 1)
+#define lb_hash_size(h) ((h)->buckets_mask + LBHASH_ENTRY_PER_BUCKET)
+
+#define lb_hash_foreach_bucket(h, bucket) \
+  for (bucket = (h)->buckets; \
+	bucket < (h)->buckets + lb_hash_nbuckets(h); \
+	bucket++)
+
+#define lb_hash_foreach_entry(h, bucket, i) \
+    lb_hash_foreach_bucket(h, bucket) \
+      for (i = 0; i < LBHASH_ENTRY_PER_BUCKET; i++)
+
+#define lb_hash_foreach_valid_entry(h, bucket, i, now) \
+    lb_hash_foreach_entry(h, bucket, i) \
+       if (!clib_u32_loop_gt((now), bucket->timeout[i]))
+
+static_always_inline
+lb_hash_t *lb_hash_alloc(u32 buckets, u32 timeout)
+{
+  if (!is_pow2(buckets))
+    return NULL;
+
+  // Allocate 1 more bucket for prefetch
+  u32 size = ((u64)&((lb_hash_t *)(0))->buckets[0]) +
+      sizeof(lb_hash_bucket_t) * (buckets + 1);
+  u8 *mem = 0;
+  lb_hash_t *h;
+  vec_alloc_aligned(mem, size, CLIB_CACHE_LINE_BYTES);
+  h = (lb_hash_t *)mem;
+  h->buckets_mask = (buckets - 1);
+  h->timeout = timeout;
+  return h;
+}
+
+static_always_inline
+void lb_hash_free(lb_hash_t *h)
+{
+  u8 *mem = (u8 *)h;
+  vec_free(mem);
+}
+
+#if __SSE4_2__
+static_always_inline
+u32 lb_hash_hash(u64 k0, u64 k1, u64 k2, u64 k3, u64 k4)
+{
+  u64 val = 0;
+  val = _mm_crc32_u64(val, k0);
+  val = _mm_crc32_u64(val, k1);
+  val = _mm_crc32_u64(val, k2);
+  val = _mm_crc32_u64(val, k3);
+  val = _mm_crc32_u64(val, k4);
+  return (u32) val;
+}
+#else
+static_always_inline
+u32 lb_hash_hash(u64 k0, u64 k1, u64 k2, u64 k3, u64 k4)
+{
+  u64 tmp = k0 ^ k1 ^ k2 ^ k3 ^ k4;
+  return (u32)clib_xxhash (tmp);
+}
+#endif
+
+static_always_inline
+void lb_hash_prefetch_bucket(lb_hash_t *ht, u32 hash)
+{
+  lb_hash_bucket_t *bucket = &ht->buckets[hash & ht->buckets_mask];
+  CLIB_PREFETCH(bucket, sizeof(*bucket), READ);
+}
+
+static_always_inline
+void lb_hash_get(lb_hash_t *ht, u32 hash, u32 vip, u32 time_now,
+		 u32 *available_index, u32 *found_value)
+{
+  lb_hash_bucket_t *bucket = &ht->buckets[hash & ht->buckets_mask];
+  *found_value = ~0;
+  *available_index = ~0;
+#if __SSE4_2__ && LB_HASH_DO_NOT_USE_SSE_BUCKETS == 0
+  u32 bitmask, found_index;
+  __m128i mask;
+
+  // mask[*] = timeout[*] > now
+  mask = _mm_cmpgt_epi32(_mm_loadu_si128 ((__m128i *) bucket->timeout),
+			 _mm_set1_epi32 (time_now));
+  // bitmask[*] = now <= timeout[*/4]
+  bitmask = (~_mm_movemask_epi8(mask)) & 0xffff;
+  // Get first index with now <= timeout[*], if any.
+  *available_index = (bitmask)?__builtin_ctz(bitmask)/4:*available_index;
+
+  // mask[*] = (timeout[*] > now) && (hash[*] == hash)
+  mask = _mm_and_si128(mask,
+		       _mm_cmpeq_epi32(
+			   _mm_loadu_si128 ((__m128i *) bucket->hash),
+			   _mm_set1_epi32 (hash)));
+
+  // Load the array of vip values
+  // mask[*] = (timeout[*] > now) && (hash[*] == hash) && (vip[*] == vip)
+  mask = _mm_and_si128(mask,
+		       _mm_cmpeq_epi32(
+			   _mm_loadu_si128 ((__m128i *) bucket->vip),
+			   _mm_set1_epi32 (vip)));
+
+  // mask[*] = (timeout[*x4] > now) && (hash[*x4] == hash) && (vip[*x4] == vip)
+  bitmask = _mm_movemask_epi8(mask);
+  // Get first index, if any
+  found_index = (bitmask)?__builtin_ctzll(bitmask)/4:0;
+  ASSERT(found_index < 4);
+  *found_value = (bitmask)?bucket->value[found_index]:*found_value;
+  bucket->timeout[found_index] =
+      (bitmask)?time_now + ht->timeout:bucket->timeout[found_index];
+#else
+  u32 i;
+  for (i = 0; i < LBHASH_ENTRY_PER_BUCKET; i++) {
+      u8 cmp = (bucket->hash[i] == hash && bucket->vip[i] == vip);
+      u8 timeouted = clib_u32_loop_gt(time_now, bucket->timeout[i]);
+      *found_value = (cmp || timeouted)?*found_value:bucket->value[i];
+      bucket->timeout[i] = (cmp || timeouted)?time_now + ht->timeout:bucket->timeout[i];
+      *available_index = (timeouted && (*available_index == ~0))?i:*available_index;
+
+      if (!cmp)
+	return;
+  }
+#endif
+}
+
+static_always_inline
+u32 lb_hash_available_value(lb_hash_t *h, u32 hash, u32 available_index)
+{
+  return h->buckets[hash & h->buckets_mask].value[available_index];
+}
+
+static_always_inline
+void lb_hash_put(lb_hash_t *h, u32 hash, u32 value, u32 vip,
+		 u32 available_index, u32 time_now)
+{
+  lb_hash_bucket_t *bucket = &h->buckets[hash & h->buckets_mask];
+  bucket->hash[available_index] = hash;
+  bucket->value[available_index] = value;
+  bucket->timeout[available_index] = time_now + h->timeout;
+  bucket->vip[available_index] = vip;
+}
+
+static_always_inline
+u32 lb_hash_elts(lb_hash_t *h, u32 time_now)
+{
+  u32 tot = 0;
+  lb_hash_bucket_t *bucket;
+  u32 i;
+  lb_hash_foreach_valid_entry(h, bucket, i, time_now) {
+    tot++;
+  }
+  return tot;
+}
+
+#endif /* LB_PLUGIN_LB_LBHASH_H_ */
diff --git a/src/plugins/lb/node.c b/src/plugins/lb/node.c
new file mode 100644
index 00000000..8b763c53
--- /dev/null
+++ b/src/plugins/lb/node.c
@@ -0,0 +1,419 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <lb/lb.h>
+
+#include <vnet/gre/packet.h>
+#include <lb/lbhash.h>
+
+#define foreach_lb_error \
+ _(NONE, "no error") \
+ _(PROTO_NOT_SUPPORTED, "protocol not supported")
+
+typedef enum {
+#define _(sym,str) LB_ERROR_##sym,
+  foreach_lb_error
+#undef _
+    LB_N_ERROR,
+} lb_error_t;
+
+static char *lb_error_strings[] = {
+#define _(sym,string) string,
+    foreach_lb_error
+#undef _
+};
+
+typedef struct {
+  u32 vip_index;
+  u32 as_index;
+} lb_trace_t;
+
+u8 *
+format_lb_trace (u8 * s, va_list * args)
+{
+  lb_main_t *lbm = &lb_main;
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  lb_trace_t *t = va_arg (*args, lb_trace_t *);
+  if (pool_is_free_index(lbm->vips, t->vip_index)) {
+      s = format(s, "lb vip[%d]: This VIP was freed since capture\n");
+  } else {
+      s = format(s, "lb vip[%d]: %U\n", t->vip_index, format_lb_vip, &lbm->vips[t->vip_index]);
+  }
+  if (pool_is_free_index(lbm->ass, t->as_index)) {
+      s = format(s, "lb as[%d]: This AS was freed since capture\n");
+  } else {
+      s = format(s, "lb as[%d]: %U\n", t->as_index, format_lb_as, &lbm->ass[t->as_index]);
+  }
+  return s;
+}
+
+lb_hash_t *lb_get_sticky_table(u32 cpu_index)
+{
+  lb_main_t *lbm = &lb_main;
+  lb_hash_t *sticky_ht = lbm->per_cpu[cpu_index].sticky_ht;
+  //Check if size changed
+  if (PREDICT_FALSE(sticky_ht && (lbm->per_cpu_sticky_buckets != lb_hash_nbuckets(sticky_ht))))
+    {
+      //Dereference everything in there
+      lb_hash_bucket_t *b;
+      u32 i;
+      lb_hash_foreach_entry(sticky_ht, b, i) {
+	vlib_refcount_add(&lbm->as_refcount, cpu_index, b->value[i], -1);
+	vlib_refcount_add(&lbm->as_refcount, cpu_index, 0, 1);
+      }
+
+      lb_hash_free(sticky_ht);
+      sticky_ht = NULL;
+    }
+
+  //Create if necessary
+  if (PREDICT_FALSE(sticky_ht == NULL)) {
+    lbm->per_cpu[cpu_index].sticky_ht = lb_hash_alloc(lbm->per_cpu_sticky_buckets, lbm->flow_timeout);
+    sticky_ht = lbm->per_cpu[cpu_index].sticky_ht;
+    clib_warning("Regenerated sticky table %p", sticky_ht);
+  }
+
+  ASSERT(sticky_ht);
+
+  //Update timeout
+  sticky_ht->timeout = lbm->flow_timeout;
+  return sticky_ht;
+}
+
+u64
+lb_node_get_other_ports4(ip4_header_t *ip40)
+{
+  return 0;
+}
+
+u64
+lb_node_get_other_ports6(ip6_header_t *ip60)
+{
+  return 0;
+}
+
+static_always_inline u32
+lb_node_get_hash(vlib_buffer_t *p, u8 is_input_v4)
+{
+  u32 hash;
+  if (is_input_v4)
+    {
+      ip4_header_t *ip40;
+      u64 ports;
+      ip40 = vlib_buffer_get_current (p);
+      if (PREDICT_TRUE (ip40->protocol == IP_PROTOCOL_TCP ||
+		       ip40->protocol == IP_PROTOCOL_UDP))
+	ports = ((u64)((udp_header_t *)(ip40 + 1))->src_port << 16) |
+	  ((u64)((udp_header_t *)(ip40 + 1))->dst_port);
+      else
+	ports = lb_node_get_other_ports4(ip40);
+
+      hash = lb_hash_hash(*((u64 *)&ip40->address_pair), ports,
+			  0, 0, 0);
+    }
+  else
+    {
+      ip6_header_t *ip60;
+      ip60 = vlib_buffer_get_current (p);
+      u64 ports;
+      if (PREDICT_TRUE (ip60->protocol == IP_PROTOCOL_TCP ||
+			ip60->protocol == IP_PROTOCOL_UDP))
+	ports = ((u64)((udp_header_t *)(ip60 + 1))->src_port << 16) |
+	((u64)((udp_header_t *)(ip60 + 1))->dst_port);
+      else
+	ports = lb_node_get_other_ports6(ip60);
+
+      hash = lb_hash_hash(ip60->src_address.as_u64[0],
+			  ip60->src_address.as_u64[1],
+			  ip60->dst_address.as_u64[0],
+			  ip60->dst_address.as_u64[1],
+			  ports);
+    }
+  return hash;
+}
+
+static_always_inline uword
+lb_node_fn (vlib_main_t * vm,
+         vlib_node_runtime_t * node, vlib_frame_t * frame,
+         u8 is_input_v4, //Compile-time parameter stating that is input is v4 (or v6)
+         u8 is_encap_v4) //Compile-time parameter stating that is GRE encap is v4 (or v6)
+{
+  lb_main_t *lbm = &lb_main;
+  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
+  u32 cpu_index = os_get_cpu_number();
+  u32 lb_time = lb_hash_time_now(vm);
+
+  lb_hash_t *sticky_ht = lb_get_sticky_table(cpu_index);
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  u32 nexthash0 = 0;
+  if (PREDICT_TRUE(n_left_from > 0))
+    nexthash0 = lb_node_get_hash(vlib_get_buffer (vm, from[0]), is_input_v4);
+
+  while (n_left_from > 0)
+  {
+    vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+    while (n_left_from > 0 && n_left_to_next > 0)
+    {
+      u32 pi0;
+      vlib_buffer_t *p0;
+      lb_vip_t *vip0;
+      u32 asindex0;
+      u16 len0;
+      u32 available_index0;
+      u8 counter = 0;
+      u32 hash0 = nexthash0;
+
+      if (PREDICT_TRUE(n_left_from > 1))
+	{
+	  vlib_buffer_t *p1 = vlib_get_buffer (vm, from[1]);
+	  //Compute next hash and prefetch bucket
+	  nexthash0 = lb_node_get_hash(p1, is_input_v4);
+	  lb_hash_prefetch_bucket(sticky_ht, nexthash0);
+	  //Prefetch for encap, next
+	  CLIB_PREFETCH (vlib_buffer_get_current(p1) - 64, 64, STORE);
+	}
+
+      if (PREDICT_TRUE(n_left_from > 2))
+	{
+	  vlib_buffer_t *p2;
+	  p2 = vlib_get_buffer(vm, from[2]);
+	  /* prefetch packet header and data */
+	  vlib_prefetch_buffer_header(p2, STORE);
+	  CLIB_PREFETCH (vlib_buffer_get_current(p2), 64, STORE);
+	}
+
+      pi0 = to_next[0] = from[0];
+      from += 1;
+      n_left_from -= 1;
+      to_next += 1;
+      n_left_to_next -= 1;
+
+      p0 = vlib_get_buffer (vm, pi0);
+      vip0 = pool_elt_at_index (lbm->vips,
+				vnet_buffer (p0)->ip.adj_index[VLIB_TX]);
+
+      if (is_input_v4)
+	{
+	  ip4_header_t *ip40;
+	  ip40 = vlib_buffer_get_current (p0);
+	  len0 = clib_net_to_host_u16(ip40->length);
+	}
+      else
+	{
+	  ip6_header_t *ip60;
+	  ip60 = vlib_buffer_get_current (p0);
+	  len0 = clib_net_to_host_u16(ip60->payload_length) + sizeof(ip6_header_t);
+	}
+
+      lb_hash_get(sticky_ht, hash0, vnet_buffer (p0)->ip.adj_index[VLIB_TX],
+		  lb_time, &available_index0, &asindex0);
+
+      if (PREDICT_TRUE(asindex0 != ~0))
+	{
+	  //Found an existing entry
+	  counter = LB_VIP_COUNTER_NEXT_PACKET;
+	}
+      else if (PREDICT_TRUE(available_index0 != ~0))
+	{
+	  //There is an available slot for a new flow
+	  asindex0 = vip0->new_flow_table[hash0 & vip0->new_flow_table_mask].as_index;
+	  counter = LB_VIP_COUNTER_FIRST_PACKET;
+	  counter = (asindex0 == 0)?LB_VIP_COUNTER_NO_SERVER:counter;
+
+	  //TODO: There are race conditions with as0 and vip0 manipulation.
+	  //Configuration may be changed, vectors resized, etc...
+
+	  //Dereference previously used
+	  vlib_refcount_add(&lbm->as_refcount, cpu_index,
+			    lb_hash_available_value(sticky_ht, hash0, available_index0), -1);
+	  vlib_refcount_add(&lbm->as_refcount, cpu_index,
+			    asindex0, 1);
+
+	  //Add sticky entry
+	  //Note that when there is no AS configured, an entry is configured anyway.
+	  //But no configured AS is not something that should happen
+	  lb_hash_put(sticky_ht, hash0, asindex0,
+		      vnet_buffer (p0)->ip.adj_index[VLIB_TX],
+		      available_index0, lb_time);
+	}
+      else
+	{
+	  //Could not store new entry in the table
+	  asindex0 = vip0->new_flow_table[hash0 & vip0->new_flow_table_mask].as_index;
+	  counter = LB_VIP_COUNTER_UNTRACKED_PACKET;
+	}
+
+      vlib_increment_simple_counter(&lbm->vip_counters[counter],
+				    cpu_index,
+				    vnet_buffer (p0)->ip.adj_index[VLIB_TX],
+				    1);
+
+      //Now let's encap
+      {
+	gre_header_t *gre0;
+	if (is_encap_v4)
+	  {
+	    ip4_header_t *ip40;
+	    vlib_buffer_advance(p0, - sizeof(ip4_header_t) - sizeof(gre_header_t));
+	    ip40 = vlib_buffer_get_current(p0);
+	    gre0 = (gre_header_t *)(ip40 + 1);
+	    ip40->src_address = lbm->ip4_src_address;
+	    ip40->dst_address = lbm->ass[asindex0].address.ip4;
+	    ip40->ip_version_and_header_length = 0x45;
+	    ip40->ttl = 128;
+	    ip40->length = clib_host_to_net_u16(len0 + sizeof(gre_header_t) + sizeof(ip4_header_t));
+	    ip40->protocol = IP_PROTOCOL_GRE;
+	    ip40->checksum = ip4_header_checksum (ip40);
+	  }
+	else
+	  {
+	    ip6_header_t *ip60;
+	    vlib_buffer_advance(p0, - sizeof(ip6_header_t) - sizeof(gre_header_t));
+	    ip60 = vlib_buffer_get_current(p0);
+	    gre0 = (gre_header_t *)(ip60 + 1);
+	    ip60->dst_address = lbm->ass[asindex0].address.ip6;
+	    ip60->src_address = lbm->ip6_src_address;
+	    ip60->hop_limit = 128;
+	    ip60->ip_version_traffic_class_and_flow_label = clib_host_to_net_u32 (0x6<<28);
+	    ip60->payload_length = clib_host_to_net_u16(len0 + sizeof(gre_header_t));
+	    ip60->protocol = IP_PROTOCOL_GRE;
+	  }
+
+	gre0->flags_and_version = 0;
+	gre0->protocol = (is_input_v4)?
+	    clib_host_to_net_u16(0x0800):
+	    clib_host_to_net_u16(0x86DD);
+      }
+
+      if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
+	{
+	  lb_trace_t *tr = vlib_add_trace (vm, node, p0, sizeof (*tr));
+	  tr->as_index = asindex0;
+	  tr->vip_index = vnet_buffer (p0)->ip.adj_index[VLIB_TX];
+	}
+
+      //Enqueue to next
+      //Note that this is going to error if asindex0 == 0
+      vnet_buffer (p0)->ip.adj_index[VLIB_TX] = lbm->ass[asindex0].dpo.dpoi_index;
+      vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+				       n_left_to_next, pi0,
+				       lbm->ass[asindex0].dpo.dpoi_next_node);
+    }
+    vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+  }
+
+  return frame->n_vectors;
+}
+
+static uword
+lb6_gre6_node_fn (vlib_main_t * vm,
+         vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return lb_node_fn(vm, node, frame, 0, 0);
+}
+
+static uword
+lb6_gre4_node_fn (vlib_main_t * vm,
+         vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return lb_node_fn(vm, node, frame, 0, 1);
+}
+
+static uword
+lb4_gre6_node_fn (vlib_main_t * vm,
+         vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return lb_node_fn(vm, node, frame, 1, 0);
+}
+
+static uword
+lb4_gre4_node_fn (vlib_main_t * vm,
+         vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  return lb_node_fn(vm, node, frame, 1, 1);
+}
+
+VLIB_REGISTER_NODE (lb6_gre6_node) =
+{
+  .function = lb6_gre6_node_fn,
+  .name = "lb6-gre6",
+  .vector_size = sizeof (u32),
+  .format_trace = format_lb_trace,
+
+  .n_errors = LB_N_ERROR,
+  .error_strings = lb_error_strings,
+
+  .n_next_nodes = LB_N_NEXT,
+  .next_nodes =
+  {
+      [LB_NEXT_DROP] = "error-drop"
+  },
+};
+
+VLIB_REGISTER_NODE (lb6_gre4_node) =
+{
+  .function = lb6_gre4_node_fn,
+  .name = "lb6-gre4",
+  .vector_size = sizeof (u32),
+  .format_trace = format_lb_trace,
+
+  .n_errors = LB_N_ERROR,
+  .error_strings = lb_error_strings,
+
+  .n_next_nodes = LB_N_NEXT,
+  .next_nodes =
+  {
+      [LB_NEXT_DROP] = "error-drop"
+  },
+};
+
+VLIB_REGISTER_NODE (lb4_gre6_node) =
+{
+  .function = lb4_gre6_node_fn,
+  .name = "lb4-gre6",
+  .vector_size = sizeof (u32),
+  .format_trace = format_lb_trace,
+
+  .n_errors = LB_N_ERROR,
+  .error_strings = lb_error_strings,
+
+  .n_next_nodes = LB_N_NEXT,
+  .next_nodes =
+  {
+      [LB_NEXT_DROP] = "error-drop"
+  },
+};
+
+VLIB_REGISTER_NODE (lb4_gre4_node) =
+{
+  .function = lb4_gre4_node_fn,
+  .name = "lb4-gre4",
+  .vector_size = sizeof (u32),
+  .format_trace = format_lb_trace,
+
+  .n_errors = LB_N_ERROR,
+  .error_strings = lb_error_strings,
+
+  .n_next_nodes = LB_N_NEXT,
+  .next_nodes =
+  {
+      [LB_NEXT_DROP] = "error-drop"
+  },
+};
+
diff --git a/src/plugins/lb/refcount.c b/src/plugins/lb/refcount.c
new file mode 100644
index 00000000..22415c88
--- /dev/null
+++ b/src/plugins/lb/refcount.c
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <lb/refcount.h>
+
+void __vlib_refcount_resize(vlib_refcount_per_cpu_t *per_cpu, u32 size)
+{
+  u32 *new_counter = 0, *old_counter;
+  vec_validate(new_counter, size);
+  memcpy(new_counter, per_cpu->counters, per_cpu->length);
+  old_counter = per_cpu->counters;
+  per_cpu->counters = new_counter;
+  CLIB_MEMORY_BARRIER();
+  per_cpu->length = vec_len(new_counter);
+  vec_free(old_counter);
+}
+
+u64 vlib_refcount_get(vlib_refcount_t *r, u32 index)
+{
+  u64 count = 0;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  u32 cpu_index;
+  for (cpu_index = 0; cpu_index < tm->n_vlib_mains; cpu_index++) {
+    if (r->per_cpu[cpu_index].length > index)
+      count += r->per_cpu[cpu_index].counters[index];
+  }
+  return count;
+}
+
diff --git a/src/plugins/lb/refcount.h b/src/plugins/lb/refcount.h
new file mode 100644
index 00000000..8c26e7be
--- /dev/null
+++ b/src/plugins/lb/refcount.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * vlib provides lock-free counters but those
+ * - Have 16bits per-CPU counter, which may overflow.
+ * - Would only increment.
+ *
+ * This is very similar to vlib counters, but may be used to count reference.
+ * Such a counter includes an arbitrary number of counters. Each counter
+ * is identified by its index. This is used to aggregate per-cpu memory.
+ *
+ * Warning:
+ *   This reference counter is lock-free but is not race-condition free.
+ *   The counting result is approximate and another mechanism needs to be used
+ *   in order to ensure that an object may be freed.
+ *
+ */
+
+#include <vnet/vnet.h>
+
+typedef struct {
+  u32 *counters;
+  u32 length;
+  u32 *reader_lengths;
+  CLIB_CACHE_LINE_ALIGN_MARK(o);
+} vlib_refcount_per_cpu_t;
+
+typedef struct {
+  vlib_refcount_per_cpu_t *per_cpu;
+} vlib_refcount_t;
+
+void __vlib_refcount_resize(vlib_refcount_per_cpu_t *per_cpu, u32 size);
+
+static_always_inline
+void vlib_refcount_add(vlib_refcount_t *r, u32 cpu_index, u32 counter_index, i32 v)
+{
+  vlib_refcount_per_cpu_t *per_cpu = &r->per_cpu[cpu_index];
+  if (PREDICT_FALSE(counter_index >= per_cpu->length))
+    __vlib_refcount_resize(per_cpu, clib_max(counter_index + 16, per_cpu->length * 2));
+
+  per_cpu->counters[counter_index] += v;
+}
+
+u64 vlib_refcount_get(vlib_refcount_t *r, u32 index);
+
+static_always_inline
+void vlib_refcount_init(vlib_refcount_t *r)
+{
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  r->per_cpu = 0;
+  vec_validate (r->per_cpu, tm->n_vlib_mains - 1);
+}
+
+
diff --git a/src/plugins/lb/util.c b/src/plugins/lb/util.c
new file mode 100644
index 00000000..d969d168
--- /dev/null
+++ b/src/plugins/lb/util.c
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <lb/util.h>
+
+void ip46_prefix_normalize(ip46_address_t *prefix, u8 plen)
+{
+  if (plen == 0) {
+    prefix->as_u64[0] = 0;
+    prefix->as_u64[1] = 0;
+  } else if (plen <= 64) {
+    prefix->as_u64[0] &= clib_host_to_net_u64(0xffffffffffffffffL << (64 - plen));
+    prefix->as_u64[1] = 0;
+  } else {
+    prefix->as_u64[1] &= clib_host_to_net_u64(0xffffffffffffffffL << (128 - plen));
+  }
+
+}
+
+uword unformat_ip46_prefix (unformat_input_t * input, va_list * args)
+{
+  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
+  u8 *len = va_arg (*args, u8 *);
+  ip46_type_t type = va_arg (*args, ip46_type_t);
+
+  u32 l;
+  if ((type != IP46_TYPE_IP6) && unformat(input, "%U/%u", unformat_ip4_address, &ip46->ip4, &l)) {
+    if (l > 32)
+      return 0;
+    *len = l + 96;
+    ip46->pad[0] = ip46->pad[1] = ip46->pad[2] = 0;
+  } else if ((type != IP46_TYPE_IP4) && unformat(input, "%U/%u", unformat_ip6_address, &ip46->ip6, &l)) {
+    if (l > 128)
+      return 0;
+    *len = l;
+  } else {
+    return 0;
+  }
+  return 1;
+}
+
+u8 *format_ip46_prefix (u8 * s, va_list * args)
+{
+  ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
+  u32 len = va_arg (*args, u32); //va_arg cannot use u8 or u16
+  ip46_type_t type = va_arg (*args, ip46_type_t);
+
+  int is_ip4 = 0;
+  if (type == IP46_TYPE_IP4)
+    is_ip4 = 1;
+  else if (type == IP46_TYPE_IP6)
+    is_ip4 = 0;
+  else
+    is_ip4 = (len >= 96) && ip46_address_is_ip4(ip46);
+
+  return is_ip4 ?
+      format(s, "%U/%d", format_ip4_address, &ip46->ip4, len - 96):
+      format(s, "%U/%d", format_ip6_address, &ip46->ip6, len);
+}
+
diff --git a/src/plugins/lb/util.h b/src/plugins/lb/util.h
new file mode 100644
index 00000000..3f082310
--- /dev/null
+++ b/src/plugins/lb/util.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Non-LB specific stuff comes here
+ */
+
+#ifndef LB_PLUGIN_LB_UTIL_H_
+#define LB_PLUGIN_LB_UTIL_H_
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+
+#define ip46_address_type(ip46) (ip46_address_is_ip4(ip46)?IP46_TYPE_IP4:IP46_TYPE_IP6)
+#define ip46_prefix_is_ip4(ip46, len) ((len) >= 96 && ip46_address_is_ip4(ip46))
+#define ip46_prefix_type(ip46, len) (ip46_prefix_is_ip4(ip46, len)?IP46_TYPE_IP4:IP46_TYPE_IP6)
+
+void ip46_prefix_normalize(ip46_address_t *prefix, u8 plen);
+uword unformat_ip46_prefix (unformat_input_t * input, va_list * args);
+u8 *format_ip46_prefix (u8 * s, va_list * args);
+
+/**
+ * 32 bits integer comparison for running values.
+ * 1 > 0 is true. But 1 > 0xffffffff also is.
+ */
+#define clib_u32_loop_gt(a, b) (((u32)(a)) - ((u32)(b)) < 0x7fffffff)
+
+#endif /* LB_PLUGIN_LB_UTIL_H_ */
diff --git a/src/plugins/snat.am b/src/plugins/snat.am
new file mode 100644
index 00000000..7ff2386e
--- /dev/null
+++ b/src/plugins/snat.am
@@ -0,0 +1,33 @@
+
+# Copyright (c) <current-year> <your-organization>
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+vppapitestplugins_LTLIBRARIES += snat_test_plugin.la
+vppplugins_LTLIBRARIES += snat_plugin.la
+
+snat_plugin_la_SOURCES = snat/snat.c		\
+        snat/in2out.c				\
+        snat/out2in.c				\
+	snat/snat_plugin.api.h
+
+API_FILES += snat/snat.api
+
+nobase_apiinclude_HEADERS +=		\
+  snat/snat_all_api_h.h			\
+  snat/snat_msg_enum.h			\
+  snat/snat.api.h
+
+snat_test_plugin_la_SOURCES = \
+  snat/snat_test.c snat/snat_plugin.api.h
+
+# vi:syntax=automake
diff --git a/src/plugins/snat/in2out.c b/src/plugins/snat/in2out.c
new file mode 100644
index 00000000..c78fdd76
--- /dev/null
+++ b/src/plugins/snat/in2out.c
@@ -0,0 +1,1597 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/handoff.h>
+
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/fib/ip4_fib.h>
+#include <snat/snat.h>
+
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+
+typedef struct {
+  u32 sw_if_index;
+  u32 next_index;
+  u32 session_index;
+  u32 is_slow_path;
+} snat_in2out_trace_t;
+
+typedef struct {
+  u32 next_worker_index;
+  u8 do_handoff;
+} snat_in2out_worker_handoff_trace_t;
+
+/* packet trace format function */
+static u8 * format_snat_in2out_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  snat_in2out_trace_t * t = va_arg (*args, snat_in2out_trace_t *);
+  char * tag;
+
+  tag = t->is_slow_path ? "SNAT_IN2OUT_SLOW_PATH" : "SNAT_IN2OUT_FAST_PATH";
+  
+  s = format (s, "%s: sw_if_index %d, next index %d, session %d", tag,
+              t->sw_if_index, t->next_index, t->session_index);
+
+  return s;
+}
+
+static u8 * format_snat_in2out_fast_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  snat_in2out_trace_t * t = va_arg (*args, snat_in2out_trace_t *);
+
+  s = format (s, "SANT_IN2OUT_FAST: sw_if_index %d, next index %d", 
+              t->sw_if_index, t->next_index);
+
+  return s;
+}
+
+static u8 * format_snat_in2out_worker_handoff_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  snat_in2out_worker_handoff_trace_t * t =
+    va_arg (*args, snat_in2out_worker_handoff_trace_t *);
+  char * m;
+
+  m = t->do_handoff ? "next worker" : "same worker";
+  s = format (s, "SNAT_IN2OUT_WORKER_HANDOFF: %s %d", m, t->next_worker_index);
+
+  return s;
+}
+
+vlib_node_registration_t snat_in2out_node;
+vlib_node_registration_t snat_in2out_slowpath_node;
+vlib_node_registration_t snat_in2out_fast_node;
+vlib_node_registration_t snat_in2out_worker_handoff_node;
+
+#define foreach_snat_in2out_error                       \
+_(UNSUPPORTED_PROTOCOL, "Unsupported protocol")         \
+_(IN2OUT_PACKETS, "Good in2out packets processed")      \
+_(OUT_OF_PORTS, "Out of ports")                         \
+_(BAD_OUTSIDE_FIB, "Outside VRF ID not found")          \
+_(BAD_ICMP_TYPE, "icmp type not echo-request")          \
+_(NO_TRANSLATION, "No translation")
+  
+typedef enum {
+#define _(sym,str) SNAT_IN2OUT_ERROR_##sym,
+  foreach_snat_in2out_error
+#undef _
+  SNAT_IN2OUT_N_ERROR,
+} snat_in2out_error_t;
+
+static char * snat_in2out_error_strings[] = {
+#define _(sym,string) string,
+  foreach_snat_in2out_error
+#undef _
+};
+
+typedef enum {
+  SNAT_IN2OUT_NEXT_LOOKUP,
+  SNAT_IN2OUT_NEXT_DROP,
+  SNAT_IN2OUT_NEXT_SLOW_PATH,
+  SNAT_IN2OUT_N_NEXT,
+} snat_in2out_next_t;
+
+static u32 slow_path (snat_main_t *sm, vlib_buffer_t *b0,
+                      ip4_header_t * ip0,
+                      u32 rx_fib_index0,
+                      snat_session_key_t * key0,
+                      snat_session_t ** sessionp,
+                      vlib_node_runtime_t * node,
+                      u32 next0,
+                      u32 cpu_index)
+{
+  snat_user_t *u;
+  snat_user_key_t user_key;
+  snat_session_t *s;
+  clib_bihash_kv_8_8_t kv0, value0;
+  u32 oldest_per_user_translation_list_index;
+  dlist_elt_t * oldest_per_user_translation_list_elt;
+  dlist_elt_t * per_user_translation_list_elt;
+  dlist_elt_t * per_user_list_head_elt;
+  u32 session_index;
+  snat_session_key_t key1;
+  u32 address_index = ~0;
+  u32 outside_fib_index;
+  uword * p;
+  snat_static_mapping_key_t worker_by_out_key;
+
+  p = hash_get (sm->ip4_main->fib_index_by_table_id, sm->outside_vrf_id);
+  if (! p)
+    {
+      b0->error = node->errors[SNAT_IN2OUT_ERROR_BAD_OUTSIDE_FIB];
+      return SNAT_IN2OUT_NEXT_DROP;
+    }
+  outside_fib_index = p[0];
+
+  user_key.addr = ip0->src_address;
+  user_key.fib_index = rx_fib_index0;
+  kv0.key = user_key.as_u64;
+  
+  /* Ever heard of the "user" = src ip4 address before? */
+  if (clib_bihash_search_8_8 (&sm->user_hash, &kv0, &value0))
+    {
+      /* no, make a new one */
+      pool_get (sm->per_thread_data[cpu_index].users, u);
+      memset (u, 0, sizeof (*u));
+      u->addr = ip0->src_address;
+
+      pool_get (sm->per_thread_data[cpu_index].list_pool, per_user_list_head_elt);
+
+      u->sessions_per_user_list_head_index = per_user_list_head_elt -
+        sm->per_thread_data[cpu_index].list_pool;
+
+      clib_dlist_init (sm->per_thread_data[cpu_index].list_pool,
+                       u->sessions_per_user_list_head_index);
+
+      kv0.value = u - sm->per_thread_data[cpu_index].users;
+
+      /* add user */
+      clib_bihash_add_del_8_8 (&sm->user_hash, &kv0, 1 /* is_add */);
+    }
+  else
+    {
+      u = pool_elt_at_index (sm->per_thread_data[cpu_index].users,
+                             value0.value);
+    }
+
+  /* Over quota? Recycle the least recently used dynamic translation */
+  if (u->nsessions >= sm->max_translations_per_user)
+    {
+      /* Remove the oldest dynamic translation */
+      do {
+          oldest_per_user_translation_list_index =
+            clib_dlist_remove_head (sm->per_thread_data[cpu_index].list_pool,
+                                    u->sessions_per_user_list_head_index);
+
+          ASSERT (oldest_per_user_translation_list_index != ~0);
+
+          /* add it back to the end of the LRU list */
+          clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
+                              u->sessions_per_user_list_head_index,
+                              oldest_per_user_translation_list_index);
+          /* Get the list element */
+          oldest_per_user_translation_list_elt =
+            pool_elt_at_index (sm->per_thread_data[cpu_index].list_pool,
+                               oldest_per_user_translation_list_index);
+
+          /* Get the session index from the list element */
+          session_index = oldest_per_user_translation_list_elt->value;
+
+          /* Get the session */
+          s = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
+                                 session_index);
+      } while (snat_is_session_static (s));
+
+      /* Remove in2out, out2in keys */
+      kv0.key = s->in2out.as_u64;
+      if (clib_bihash_add_del_8_8 (&sm->in2out, &kv0, 0 /* is_add */))
+          clib_warning ("in2out key delete failed");
+      kv0.key = s->out2in.as_u64;
+      if (clib_bihash_add_del_8_8 (&sm->out2in, &kv0, 0 /* is_add */))
+          clib_warning ("out2in key delete failed");
+
+      snat_free_outside_address_and_port 
+        (sm, &s->out2in, s->outside_address_index);
+      s->outside_address_index = ~0;
+
+      if (snat_alloc_outside_address_and_port (sm, &key1, &address_index))
+        {
+          ASSERT(0);
+
+          b0->error = node->errors[SNAT_IN2OUT_ERROR_OUT_OF_PORTS];
+          return SNAT_IN2OUT_NEXT_DROP;
+        }
+      s->outside_address_index = address_index;
+    }
+  else
+    {
+      u8 static_mapping = 1;
+
+      /* First try to match static mapping by local address and port */
+      if (snat_static_mapping_match (sm, *key0, &key1, 0))
+        {
+          static_mapping = 0;
+          /* Try to create dynamic translation */
+          if (snat_alloc_outside_address_and_port (sm, &key1, &address_index))
+            {
+              b0->error = node->errors[SNAT_IN2OUT_ERROR_OUT_OF_PORTS];
+              return SNAT_IN2OUT_NEXT_DROP;
+            }
+        }
+
+      /* Create a new session */
+      pool_get (sm->per_thread_data[cpu_index].sessions, s);
+      memset (s, 0, sizeof (*s));
+      
+      s->outside_address_index = address_index;
+
+      if (static_mapping)
+        {
+          u->nstaticsessions++;
+          s->flags |= SNAT_SESSION_FLAG_STATIC_MAPPING;
+        }
+      else
+        {
+          u->nsessions++;
+        }
+
+      /* Create list elts */
+      pool_get (sm->per_thread_data[cpu_index].list_pool,
+                per_user_translation_list_elt);
+      clib_dlist_init (sm->per_thread_data[cpu_index].list_pool,
+                       per_user_translation_list_elt -
+                       sm->per_thread_data[cpu_index].list_pool);
+
+      per_user_translation_list_elt->value =
+        s - sm->per_thread_data[cpu_index].sessions;
+      s->per_user_index = per_user_translation_list_elt -
+                          sm->per_thread_data[cpu_index].list_pool;
+      s->per_user_list_head_index = u->sessions_per_user_list_head_index;
+
+      clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
+                          s->per_user_list_head_index,
+                          per_user_translation_list_elt -
+                          sm->per_thread_data[cpu_index].list_pool);
+   }
+  
+  s->in2out = *key0;
+  s->out2in = key1;
+  s->out2in.protocol = key0->protocol;
+  s->out2in.fib_index = outside_fib_index;
+  *sessionp = s;
+
+  /* Add to translation hashes */
+  kv0.key = s->in2out.as_u64;
+  kv0.value = s - sm->per_thread_data[cpu_index].sessions;
+  if (clib_bihash_add_del_8_8 (&sm->in2out, &kv0, 1 /* is_add */))
+      clib_warning ("in2out key add failed");
+  
+  kv0.key = s->out2in.as_u64;
+  kv0.value = s - sm->per_thread_data[cpu_index].sessions;
+  
+  if (clib_bihash_add_del_8_8 (&sm->out2in, &kv0, 1 /* is_add */))
+      clib_warning ("out2in key add failed");
+
+  /* Add to translated packets worker lookup */
+  worker_by_out_key.addr = s->out2in.addr;
+  worker_by_out_key.port = s->out2in.port;
+  worker_by_out_key.fib_index = s->out2in.fib_index;
+  kv0.key = worker_by_out_key.as_u64;
+  kv0.value = cpu_index;
+  clib_bihash_add_del_8_8 (&sm->worker_by_out, &kv0, 1);
+  return next0;
+}
+                      
+static inline u32 icmp_in2out_slow_path (snat_main_t *sm,
+                                         vlib_buffer_t * b0,
+                                         ip4_header_t * ip0,
+                                         icmp46_header_t * icmp0,
+                                         u32 sw_if_index0,
+                                         u32 rx_fib_index0,
+                                         vlib_node_runtime_t * node,
+                                         u32 next0,
+                                         f64 now,
+                                         u32 cpu_index)
+{
+  snat_session_key_t key0;
+  icmp_echo_header_t *echo0;
+  clib_bihash_kv_8_8_t kv0, value0;
+  snat_session_t * s0;
+  u32 new_addr0, old_addr0;
+  u16 old_id0, new_id0;
+  ip_csum_t sum0;
+  snat_runtime_t * rt = (snat_runtime_t *)node->runtime_data;
+
+  if (PREDICT_FALSE(icmp0->type != ICMP4_echo_request))
+    {
+      b0->error = node->errors[SNAT_IN2OUT_ERROR_BAD_ICMP_TYPE];
+      return SNAT_IN2OUT_NEXT_DROP;
+    }
+  
+  echo0 = (icmp_echo_header_t *)(icmp0+1);
+
+  key0.addr = ip0->src_address;
+  key0.port = echo0->identifier;
+  key0.protocol = SNAT_PROTOCOL_ICMP;
+  key0.fib_index = rx_fib_index0;
+  
+  kv0.key = key0.as_u64;
+  
+  if (clib_bihash_search_8_8 (&sm->in2out, &kv0, &value0))
+    {
+      ip4_address_t * first_int_addr;
+
+      if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index0))
+        {
+          first_int_addr = 
+            ip4_interface_first_address (sm->ip4_main, sw_if_index0,
+                                         0 /* just want the address */);
+          rt->cached_sw_if_index = sw_if_index0;
+          rt->cached_ip4_address = first_int_addr->as_u32;
+        }
+      
+      /* Don't NAT packet aimed at the intfc address */
+      if (PREDICT_FALSE(ip0->dst_address.as_u32 ==
+                                rt->cached_ip4_address))
+        return next0;
+      
+      next0 = slow_path (sm, b0, ip0, rx_fib_index0, &key0,
+                         &s0, node, next0, cpu_index);
+      
+      if (PREDICT_FALSE (next0 == SNAT_IN2OUT_NEXT_DROP))
+        return next0;
+    }
+  else
+    s0 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
+                            value0.value);
+
+  old_addr0 = ip0->src_address.as_u32;
+  ip0->src_address = s0->out2in.addr;
+  new_addr0 = ip0->src_address.as_u32;
+  vnet_buffer(b0)->sw_if_index[VLIB_TX] = s0->out2in.fib_index;
+  
+  sum0 = ip0->checksum;
+  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                         ip4_header_t,
+                         src_address /* changed member */);
+  ip0->checksum = ip_csum_fold (sum0);
+  
+  old_id0 = echo0->identifier;
+  new_id0 = s0->out2in.port;
+  echo0->identifier = new_id0;
+
+  sum0 = icmp0->checksum;
+  sum0 = ip_csum_update (sum0, old_id0, new_id0, icmp_echo_header_t,
+                         identifier);
+  icmp0->checksum = ip_csum_fold (sum0);
+
+  /* Accounting */
+  s0->last_heard = now;
+  s0->total_pkts++;
+  s0->total_bytes += vlib_buffer_length_in_chain (sm->vlib_main, b0);
+  /* Per-user LRU list maintenance for dynamic translations */
+  if (!snat_is_session_static (s0))
+    {
+      clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
+                         s0->per_user_index);
+      clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
+                          s0->per_user_list_head_index,
+                          s0->per_user_index);
+    }
+
+  return next0;
+}
+
+/**
+ * @brief Hairpinning
+ *
+ * Hairpinning allows two endpoints on the internal side of the NAT to
+ * communicate even if they only use each other's external IP addresses
+ * and ports.
+ *
+ * @param sm     SNAT main.
+ * @param b0     Vlib buffer.
+ * @param ip0    IP header.
+ * @param udp0   UDP header.
+ * @param tcp0   TCP header.
+ * @param proto0 SNAT protocol.
+ */
+static inline void
+snat_hairpinning (snat_main_t *sm,
+                  vlib_buffer_t * b0,
+                  ip4_header_t * ip0,
+                  udp_header_t * udp0,
+                  tcp_header_t * tcp0,
+                  u32 proto0)
+{
+  snat_session_key_t key0, sm0;
+  snat_static_mapping_key_t k0;
+  snat_session_t * s0;
+  clib_bihash_kv_8_8_t kv0, value0;
+  ip_csum_t sum0;
+  u32 new_dst_addr0 = 0, old_dst_addr0, ti = 0, si;
+  u16 new_dst_port0, old_dst_port0;
+
+  key0.addr = ip0->dst_address;
+  key0.port = udp0->dst_port;
+  key0.protocol = proto0;
+  key0.fib_index = sm->outside_fib_index;
+  kv0.key = key0.as_u64;
+
+  /* Check if destination is in active sessions */
+  if (clib_bihash_search_8_8 (&sm->out2in, &kv0, &value0))
+    {
+      /* or static mappings */
+      if (!snat_static_mapping_match(sm, key0, &sm0, 1))
+        {
+          new_dst_addr0 = sm0.addr.as_u32;
+          new_dst_port0 = sm0.port;
+          vnet_buffer(b0)->sw_if_index[VLIB_TX] = sm0.fib_index;
+        }
+    }
+  else
+    {
+      si = value0.value;
+      if (sm->num_workers > 1)
+        {
+          k0.addr = ip0->dst_address;
+          k0.port = udp0->dst_port;
+          k0.fib_index = sm->outside_fib_index;
+          kv0.key = k0.as_u64;
+          if (clib_bihash_search_8_8 (&sm->worker_by_out, &kv0, &value0))
+            ASSERT(0);
+          else
+            ti = value0.value;
+        }
+      else
+        ti = sm->num_workers;
+
+      s0 = pool_elt_at_index (sm->per_thread_data[ti].sessions, si);
+      new_dst_addr0 = s0->in2out.addr.as_u32;
+      new_dst_port0 = s0->in2out.port;
+      vnet_buffer(b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
+    }
+
+  /* Destination is behind the same NAT, use internal address and port */
+  if (new_dst_addr0)
+    {
+      old_dst_addr0 = ip0->dst_address.as_u32;
+      ip0->dst_address.as_u32 = new_dst_addr0;
+      sum0 = ip0->checksum;
+      sum0 = ip_csum_update (sum0, old_dst_addr0, new_dst_addr0,
+                             ip4_header_t, dst_address);
+      ip0->checksum = ip_csum_fold (sum0);
+
+      old_dst_port0 = tcp0->ports.dst;
+      if (PREDICT_TRUE(new_dst_port0 != old_dst_port0))
+        {
+          if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
+            {
+              tcp0->ports.dst = new_dst_port0;
+              sum0 = tcp0->checksum;
+              sum0 = ip_csum_update (sum0, old_dst_addr0, new_dst_addr0,
+                                     ip4_header_t, dst_address);
+              sum0 = ip_csum_update (sum0, old_dst_port0, new_dst_port0,
+                                     ip4_header_t /* cheat */, length);
+              tcp0->checksum = ip_csum_fold(sum0);
+            }
+          else
+            {
+              udp0->dst_port = new_dst_port0;
+              udp0->checksum = 0;
+            }
+        }
+    }
+}
+
+static inline uword
+snat_in2out_node_fn_inline (vlib_main_t * vm,
+                            vlib_node_runtime_t * node,
+                            vlib_frame_t * frame, int is_slow_path)
+{
+  u32 n_left_from, * from, * to_next;
+  snat_in2out_next_t next_index;
+  u32 pkts_processed = 0;
+  snat_main_t * sm = &snat_main;
+  snat_runtime_t * rt = (snat_runtime_t *)node->runtime_data;
+  f64 now = vlib_time_now (vm);
+  u32 stats_node_index;
+  u32 cpu_index = os_get_cpu_number ();
+
+  stats_node_index = is_slow_path ? snat_in2out_slowpath_node.index :
+    snat_in2out_node.index;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+          u32 bi0, bi1;
+	  vlib_buffer_t * b0, * b1;
+          u32 next0, next1;
+          u32 sw_if_index0, sw_if_index1;
+          ip4_header_t * ip0, * ip1;
+          ip_csum_t sum0, sum1;
+          u32 new_addr0, old_addr0, new_addr1, old_addr1;
+          u16 old_port0, new_port0, old_port1, new_port1;
+          udp_header_t * udp0, * udp1;
+          tcp_header_t * tcp0, * tcp1;
+          icmp46_header_t * icmp0, * icmp1;
+          snat_session_key_t key0, key1;
+          u32 rx_fib_index0, rx_fib_index1;
+          u32 proto0, proto1;
+          snat_session_t * s0 = 0, * s1 = 0;
+          clib_bihash_kv_8_8_t kv0, value0, kv1, value1;
+          
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * p2, * p3;
+            
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+            
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+          /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+          
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+          ip0 = vlib_buffer_get_current (b0);
+          udp0 = ip4_next_header (ip0);
+          tcp0 = (tcp_header_t *) udp0;
+          icmp0 = (icmp46_header_t *) udp0;
+
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+	  rx_fib_index0 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index, 
+                                   sw_if_index0);
+
+          next0 = next1 = SNAT_IN2OUT_NEXT_LOOKUP;
+
+          proto0 = ~0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_UDP) 
+            ? SNAT_PROTOCOL_UDP : proto0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_TCP) 
+            ? SNAT_PROTOCOL_TCP : proto0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_ICMP) 
+            ? SNAT_PROTOCOL_ICMP : proto0;
+
+          /* Next configured feature, probably ip4-lookup */
+          if (is_slow_path)
+            {
+              if (PREDICT_FALSE (proto0 == ~0))
+                goto trace00;
+              
+              if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
+                {
+                  next0 = icmp_in2out_slow_path 
+                    (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, 
+                     node, next0, now, cpu_index);
+                  goto trace00;
+                }
+            }
+          else
+            {
+              if (PREDICT_FALSE (proto0 == ~0 || proto0 == SNAT_PROTOCOL_ICMP))
+                {
+                  next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+                  goto trace00;
+                }
+            }
+
+          key0.addr = ip0->src_address;
+          key0.port = udp0->src_port;
+          key0.protocol = proto0;
+          key0.fib_index = rx_fib_index0;
+          
+          kv0.key = key0.as_u64;
+
+          if (PREDICT_FALSE (clib_bihash_search_8_8 (&sm->in2out, &kv0, &value0) != 0))
+            {
+              if (is_slow_path)
+                {
+                  ip4_address_t * first_int_addr;
+                  
+                  if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index0))
+                    {
+                      first_int_addr = 
+                        ip4_interface_first_address (sm->ip4_main, sw_if_index0,
+                                                     0 /* just want the address */);
+                      rt->cached_sw_if_index = sw_if_index0;
+                      rt->cached_ip4_address = first_int_addr->as_u32;
+                    }
+                  
+                  /* Don't NAT packet aimed at the intfc address */
+                  if (PREDICT_FALSE(ip0->dst_address.as_u32 ==
+                                    rt->cached_ip4_address))
+                    goto trace00;
+                  
+                  next0 = slow_path (sm, b0, ip0, rx_fib_index0, &key0,
+                                     &s0, node, next0, cpu_index);
+                  if (PREDICT_FALSE (next0 == SNAT_IN2OUT_NEXT_DROP))
+                    goto trace00;
+                }
+              else
+                {
+                  next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+                  goto trace00;
+                }
+            }
+          else
+            s0 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
+                                    value0.value);
+
+          old_addr0 = ip0->src_address.as_u32;
+          ip0->src_address = s0->out2in.addr;
+          new_addr0 = ip0->src_address.as_u32;
+          vnet_buffer(b0)->sw_if_index[VLIB_TX] = s0->out2in.fib_index;
+
+          sum0 = ip0->checksum;
+          sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                 ip4_header_t,
+                                 src_address /* changed member */);
+          ip0->checksum = ip_csum_fold (sum0);
+
+          if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
+            {
+              old_port0 = tcp0->ports.src;
+              tcp0->ports.src = s0->out2in.port;
+              new_port0 = tcp0->ports.src;
+
+              sum0 = tcp0->checksum;
+              sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                     ip4_header_t,
+                                     dst_address /* changed member */);
+              sum0 = ip_csum_update (sum0, old_port0, new_port0,
+                                     ip4_header_t /* cheat */,
+                                     length /* changed member */);
+              tcp0->checksum = ip_csum_fold(sum0);
+            }
+          else
+            {
+              old_port0 = udp0->src_port;
+              udp0->src_port = s0->out2in.port;
+              udp0->checksum = 0;
+            }
+
+          /* Hairpinning */
+          snat_hairpinning (sm, b0, ip0, udp0, tcp0, proto0);
+
+          /* Accounting */
+          s0->last_heard = now;
+          s0->total_pkts++;
+          s0->total_bytes += vlib_buffer_length_in_chain (vm, b0);
+          /* Per-user LRU list maintenance for dynamic translation */
+          if (!snat_is_session_static (s0))
+            {
+              clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
+                                 s0->per_user_index);
+              clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
+                                  s0->per_user_list_head_index,
+                                  s0->per_user_index);
+            }
+        trace00:
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              snat_in2out_trace_t *t = 
+                 vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->is_slow_path = is_slow_path;
+              t->sw_if_index = sw_if_index0;
+              t->next_index = next0;
+                  t->session_index = ~0;
+              if (s0)
+                t->session_index = s0 - sm->per_thread_data[cpu_index].sessions;
+            }
+
+          pkts_processed += next0 != SNAT_IN2OUT_NEXT_DROP;
+
+          ip1 = vlib_buffer_get_current (b1);
+          udp1 = ip4_next_header (ip1);
+          tcp1 = (tcp_header_t *) udp1;
+          icmp1 = (icmp46_header_t *) udp1;
+
+          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
+	  rx_fib_index1 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index, 
+                                   sw_if_index1);
+
+          proto1 = ~0;
+          proto1 = (ip1->protocol == IP_PROTOCOL_UDP) 
+            ? SNAT_PROTOCOL_UDP : proto1;
+          proto1 = (ip1->protocol == IP_PROTOCOL_TCP) 
+            ? SNAT_PROTOCOL_TCP : proto1;
+          proto1 = (ip1->protocol == IP_PROTOCOL_ICMP) 
+            ? SNAT_PROTOCOL_ICMP : proto1;
+
+          /* Next configured feature, probably ip4-lookup */
+          if (is_slow_path)
+            {
+              if (PREDICT_FALSE (proto1 == ~0))
+                goto trace01;
+              
+              if (PREDICT_FALSE (proto1 == SNAT_PROTOCOL_ICMP))
+                {
+                  next1 = icmp_in2out_slow_path 
+                    (sm, b1, ip1, icmp1, sw_if_index1, rx_fib_index1, node,
+                     next1, now, cpu_index);
+                  goto trace01;
+                }
+            }
+          else
+            {
+              if (PREDICT_FALSE (proto1 == ~0 || proto1 == SNAT_PROTOCOL_ICMP))
+                {
+                  next1 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+                  goto trace01;
+                }
+            }
+
+          key1.addr = ip1->src_address;
+          key1.port = udp1->src_port;
+          key1.protocol = proto1;
+          key1.fib_index = rx_fib_index1;
+          
+          kv1.key = key1.as_u64;
+
+            if (PREDICT_FALSE(clib_bihash_search_8_8 (&sm->in2out, &kv1, &value1) != 0))
+            {
+              if (is_slow_path)
+                {
+                  ip4_address_t * first_int_addr;
+                  
+                  if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index1))
+                    {
+                      first_int_addr = 
+                        ip4_interface_first_address (sm->ip4_main, sw_if_index1,
+                                                     0 /* just want the address */);
+                      rt->cached_sw_if_index = sw_if_index1;
+                      rt->cached_ip4_address = first_int_addr->as_u32;
+                    }
+                  
+                  /* Don't NAT packet aimed at the intfc address */
+                  if (PREDICT_FALSE(ip1->dst_address.as_u32 ==
+                                    rt->cached_ip4_address))
+                    goto trace01;
+                  
+                  next1 = slow_path (sm, b1, ip1, rx_fib_index1, &key1,
+                                     &s1, node, next1, cpu_index);
+                  if (PREDICT_FALSE (next1 == SNAT_IN2OUT_NEXT_DROP))
+                    goto trace01;
+                }
+              else
+                {
+                  next1 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+                  goto trace01;
+                }
+            }
+          else
+            s1 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
+                                    value1.value);
+
+          old_addr1 = ip1->src_address.as_u32;
+          ip1->src_address = s1->out2in.addr;
+          new_addr1 = ip1->src_address.as_u32;
+          vnet_buffer(b1)->sw_if_index[VLIB_TX] = s1->out2in.fib_index;
+
+          sum1 = ip1->checksum;
+          sum1 = ip_csum_update (sum1, old_addr1, new_addr1,
+                                 ip4_header_t,
+                                 src_address /* changed member */);
+          ip1->checksum = ip_csum_fold (sum1);
+
+          if (PREDICT_TRUE(proto1 == SNAT_PROTOCOL_TCP))
+            {
+              old_port1 = tcp1->ports.src;
+              tcp1->ports.src = s1->out2in.port;
+              new_port1 = tcp1->ports.src;
+
+              sum1 = tcp1->checksum;
+              sum1 = ip_csum_update (sum1, old_addr1, new_addr1,
+                                     ip4_header_t,
+                                     dst_address /* changed member */);
+              sum1 = ip_csum_update (sum1, old_port1, new_port1,
+                                     ip4_header_t /* cheat */,
+                                     length /* changed member */);
+              tcp1->checksum = ip_csum_fold(sum1);
+            }
+          else
+            {
+              old_port1 = udp1->src_port;
+              udp1->src_port = s1->out2in.port;
+              udp1->checksum = 0;
+            }
+
+          /* Hairpinning */
+          snat_hairpinning (sm, b1, ip1, udp1, tcp1, proto1);
+
+          /* Accounting */
+          s1->last_heard = now;
+          s1->total_pkts++;
+          s1->total_bytes += vlib_buffer_length_in_chain (vm, b1);
+          /* Per-user LRU list maintenance for dynamic translation */
+          if (!snat_is_session_static (s1))
+            {
+              clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
+                                 s1->per_user_index);
+              clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
+                                  s1->per_user_list_head_index,
+                                  s1->per_user_index);
+            }
+        trace01:
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b1->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              snat_in2out_trace_t *t = 
+                 vlib_add_trace (vm, node, b1, sizeof (*t));
+              t->sw_if_index = sw_if_index1;
+              t->next_index = next1;
+              t->session_index = ~0;
+              if (s1)
+                t->session_index = s1 - sm->per_thread_data[cpu_index].sessions;
+            }
+
+          pkts_processed += next1 != SNAT_IN2OUT_NEXT_DROP;
+
+          /* verify speculative enqueues, maybe switch current next frame */
+          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+                                           to_next, n_left_to_next,
+                                           bi0, bi1, next0, next1);
+        }
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+          u32 bi0;
+	  vlib_buffer_t * b0;
+          u32 next0;
+          u32 sw_if_index0;
+          ip4_header_t * ip0;
+          ip_csum_t sum0;
+          u32 new_addr0, old_addr0;
+          u16 old_port0, new_port0;
+          udp_header_t * udp0;
+          tcp_header_t * tcp0;
+          icmp46_header_t * icmp0;
+          snat_session_key_t key0;
+          u32 rx_fib_index0;
+          u32 proto0;
+          snat_session_t * s0 = 0;
+          clib_bihash_kv_8_8_t kv0, value0;
+          
+          /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+          next0 = SNAT_IN2OUT_NEXT_LOOKUP;
+
+          ip0 = vlib_buffer_get_current (b0);
+          udp0 = ip4_next_header (ip0);
+          tcp0 = (tcp_header_t *) udp0;
+          icmp0 = (icmp46_header_t *) udp0;
+
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+	  rx_fib_index0 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index, 
+                                   sw_if_index0);
+
+          proto0 = ~0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_UDP) 
+            ? SNAT_PROTOCOL_UDP : proto0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_TCP) 
+            ? SNAT_PROTOCOL_TCP : proto0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_ICMP) 
+            ? SNAT_PROTOCOL_ICMP : proto0;
+
+          /* Next configured feature, probably ip4-lookup */
+          if (is_slow_path)
+            {
+              if (PREDICT_FALSE (proto0 == ~0))
+                goto trace0;
+              
+              if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
+                {
+                  next0 = icmp_in2out_slow_path 
+                    (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
+                     next0, now, cpu_index);
+                  goto trace0;
+                }
+            }
+          else
+            {
+              if (PREDICT_FALSE (proto0 == ~0 || proto0 == SNAT_PROTOCOL_ICMP))
+                {
+                  next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+                  goto trace0;
+                }
+            }
+
+          key0.addr = ip0->src_address;
+          key0.port = udp0->src_port;
+          key0.protocol = proto0;
+          key0.fib_index = rx_fib_index0;
+          
+          kv0.key = key0.as_u64;
+
+          if (clib_bihash_search_8_8 (&sm->in2out, &kv0, &value0))
+            {
+              if (is_slow_path)
+                {
+                  ip4_address_t * first_int_addr;
+                  
+                  if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index0))
+                    {
+                      first_int_addr = 
+                        ip4_interface_first_address (sm->ip4_main, sw_if_index0,
+                                                     0 /* just want the address */);
+                      rt->cached_sw_if_index = sw_if_index0;
+                      rt->cached_ip4_address = first_int_addr->as_u32;
+                    }
+                  
+                  /* Don't NAT packet aimed at the intfc address */
+                  if (PREDICT_FALSE(ip0->dst_address.as_u32 ==
+                                    rt->cached_ip4_address))
+                    goto trace0;
+                  
+                  next0 = slow_path (sm, b0, ip0, rx_fib_index0, &key0,
+                                     &s0, node, next0, cpu_index);
+                  if (PREDICT_FALSE (next0 == SNAT_IN2OUT_NEXT_DROP))
+                    goto trace0;
+                }
+              else
+                {
+                  next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+                  goto trace0;
+                }
+            }
+          else
+            s0 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
+                                    value0.value);
+
+          old_addr0 = ip0->src_address.as_u32;
+          ip0->src_address = s0->out2in.addr;
+          new_addr0 = ip0->src_address.as_u32;
+          vnet_buffer(b0)->sw_if_index[VLIB_TX] = s0->out2in.fib_index;
+
+          sum0 = ip0->checksum;
+          sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                 ip4_header_t,
+                                 src_address /* changed member */);
+          ip0->checksum = ip_csum_fold (sum0);
+
+          if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
+            {
+              old_port0 = tcp0->ports.src;
+              tcp0->ports.src = s0->out2in.port;
+              new_port0 = tcp0->ports.src;
+
+              sum0 = tcp0->checksum;
+              sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                     ip4_header_t,
+                                     dst_address /* changed member */);
+              sum0 = ip_csum_update (sum0, old_port0, new_port0,
+                                     ip4_header_t /* cheat */,
+                                     length /* changed member */);
+              tcp0->checksum = ip_csum_fold(sum0);
+            }
+          else
+            {
+              old_port0 = udp0->src_port;
+              udp0->src_port = s0->out2in.port;
+              udp0->checksum = 0;
+            }
+
+          /* Hairpinning */
+          snat_hairpinning (sm, b0, ip0, udp0, tcp0, proto0);
+
+          /* Accounting */
+          s0->last_heard = now;
+          s0->total_pkts++;
+          s0->total_bytes += vlib_buffer_length_in_chain (vm, b0);
+          /* Per-user LRU list maintenance for dynamic translation */
+          if (!snat_is_session_static (s0))
+            {
+              clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
+                                 s0->per_user_index);
+              clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
+                                  s0->per_user_list_head_index,
+                                  s0->per_user_index);
+            }
+
+        trace0:
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              snat_in2out_trace_t *t = 
+                 vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->is_slow_path = is_slow_path;
+              t->sw_if_index = sw_if_index0;
+              t->next_index = next0;
+                  t->session_index = ~0;
+              if (s0)
+                t->session_index = s0 - sm->per_thread_data[cpu_index].sessions;
+            }
+
+          pkts_processed += next0 != SNAT_IN2OUT_NEXT_DROP;
+
+          /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, stats_node_index, 
+                               SNAT_IN2OUT_ERROR_IN2OUT_PACKETS, 
+                               pkts_processed);
+  return frame->n_vectors;
+}
+
+static uword
+snat_in2out_fast_path_fn (vlib_main_t * vm,
+                          vlib_node_runtime_t * node,
+                          vlib_frame_t * frame)
+{
+  return snat_in2out_node_fn_inline (vm, node, frame, 0 /* is_slow_path */);
+}
+
+VLIB_REGISTER_NODE (snat_in2out_node) = {
+  .function = snat_in2out_fast_path_fn,
+  .name = "snat-in2out",
+  .vector_size = sizeof (u32),
+  .format_trace = format_snat_in2out_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  
+  .n_errors = ARRAY_LEN(snat_in2out_error_strings),
+  .error_strings = snat_in2out_error_strings,
+
+  .runtime_data_bytes = sizeof (snat_runtime_t),
+  
+  .n_next_nodes = SNAT_IN2OUT_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [SNAT_IN2OUT_NEXT_DROP] = "error-drop",
+    [SNAT_IN2OUT_NEXT_LOOKUP] = "ip4-lookup",
+    [SNAT_IN2OUT_NEXT_SLOW_PATH] = "snat-in2out-slowpath",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_node, snat_in2out_fast_path_fn);
+
+static uword
+snat_in2out_slow_path_fn (vlib_main_t * vm,
+                          vlib_node_runtime_t * node,
+                          vlib_frame_t * frame)
+{
+  return snat_in2out_node_fn_inline (vm, node, frame, 1 /* is_slow_path */);
+}
+
+VLIB_REGISTER_NODE (snat_in2out_slowpath_node) = {
+  .function = snat_in2out_slow_path_fn,
+  .name = "snat-in2out-slowpath",
+  .vector_size = sizeof (u32),
+  .format_trace = format_snat_in2out_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  
+  .n_errors = ARRAY_LEN(snat_in2out_error_strings),
+  .error_strings = snat_in2out_error_strings,
+
+  .runtime_data_bytes = sizeof (snat_runtime_t),
+  
+  .n_next_nodes = SNAT_IN2OUT_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [SNAT_IN2OUT_NEXT_DROP] = "error-drop",
+    [SNAT_IN2OUT_NEXT_LOOKUP] = "ip4-lookup",
+    [SNAT_IN2OUT_NEXT_SLOW_PATH] = "snat-in2out-slowpath",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_slowpath_node, snat_in2out_slow_path_fn);
+
+static uword
+snat_in2out_worker_handoff_fn (vlib_main_t * vm,
+                               vlib_node_runtime_t * node,
+                               vlib_frame_t * frame)
+{
+  snat_main_t *sm = &snat_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  u32 n_left_from, *from, *to_next = 0;
+  static __thread vlib_frame_queue_elt_t **handoff_queue_elt_by_worker_index;
+  static __thread vlib_frame_queue_t **congested_handoff_queue_by_worker_index
+    = 0;
+  vlib_frame_queue_elt_t *hf = 0;
+  vlib_frame_t *f = 0;
+  int i;
+  u32 n_left_to_next_worker = 0, *to_next_worker = 0;
+  u32 next_worker_index = 0;
+  u32 current_worker_index = ~0;
+  u32 cpu_index = os_get_cpu_number ();
+
+  ASSERT (vec_len (sm->workers));
+
+  if (PREDICT_FALSE (handoff_queue_elt_by_worker_index == 0))
+    {
+      vec_validate (handoff_queue_elt_by_worker_index, tm->n_vlib_mains - 1);
+
+      vec_validate_init_empty (congested_handoff_queue_by_worker_index,
+			       sm->first_worker_index + sm->num_workers - 1,
+			       (vlib_frame_queue_t *) (~0));
+    }
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      u32 sw_if_index0;
+      u32 rx_fib_index0;
+      ip4_header_t * ip0;
+      snat_user_key_t key0;
+      clib_bihash_kv_8_8_t kv0, value0;
+      u8 do_handoff;
+
+      bi0 = from[0];
+      from += 1;
+      n_left_from -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      rx_fib_index0 = ip4_fib_table_get_index_for_sw_if_index(sw_if_index0);
+
+      ip0 = vlib_buffer_get_current (b0);
+
+      key0.addr = ip0->src_address;
+      key0.fib_index = rx_fib_index0;
+
+      kv0.key = key0.as_u64;
+
+      /* Ever heard of of the "user" before? */
+      if (clib_bihash_search_8_8 (&sm->worker_by_in, &kv0, &value0))
+        {
+          /* No, assign next available worker (RR) */
+          next_worker_index = sm->first_worker_index +
+            sm->workers[sm->next_worker++ % vec_len (sm->workers)];
+
+          /* add non-traslated packets worker lookup */
+          kv0.value = next_worker_index;
+          clib_bihash_add_del_8_8 (&sm->worker_by_in, &kv0, 1);
+        }
+      else
+        next_worker_index = value0.value;
+
+      if (PREDICT_FALSE (next_worker_index != cpu_index))
+        {
+          do_handoff = 1;
+
+          if (next_worker_index != current_worker_index)
+            {
+              if (hf)
+                hf->n_vectors = VLIB_FRAME_SIZE - n_left_to_next_worker;
+
+              hf = vlib_get_worker_handoff_queue_elt (sm->fq_in2out_index,
+                                                      next_worker_index,
+                                                      handoff_queue_elt_by_worker_index);
+
+              n_left_to_next_worker = VLIB_FRAME_SIZE - hf->n_vectors;
+              to_next_worker = &hf->buffer_index[hf->n_vectors];
+              current_worker_index = next_worker_index;
+            }
+
+          /* enqueue to correct worker thread */
+          to_next_worker[0] = bi0;
+          to_next_worker++;
+          n_left_to_next_worker--;
+
+          if (n_left_to_next_worker == 0)
+            {
+              hf->n_vectors = VLIB_FRAME_SIZE;
+              vlib_put_frame_queue_elt (hf);
+              current_worker_index = ~0;
+              handoff_queue_elt_by_worker_index[next_worker_index] = 0;
+              hf = 0;
+            }
+        }
+      else
+        {
+          do_handoff = 0;
+          /* if this is 1st frame */
+          if (!f)
+            {
+              f = vlib_get_frame_to_node (vm, snat_in2out_node.index);
+              to_next = vlib_frame_vector_args (f);
+            }
+
+          to_next[0] = bi0;
+          to_next += 1;
+          f->n_vectors++;
+        }
+
+      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			 && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	{
+          snat_in2out_worker_handoff_trace_t *t =
+            vlib_add_trace (vm, node, b0, sizeof (*t));
+          t->next_worker_index = next_worker_index;
+          t->do_handoff = do_handoff;
+        }
+    }
+
+  if (f)
+    vlib_put_frame_to_node (vm, snat_in2out_node.index, f);
+
+  if (hf)
+    hf->n_vectors = VLIB_FRAME_SIZE - n_left_to_next_worker;
+
+  /* Ship frames to the worker nodes */
+  for (i = 0; i < vec_len (handoff_queue_elt_by_worker_index); i++)
+    {
+      if (handoff_queue_elt_by_worker_index[i])
+	{
+	  hf = handoff_queue_elt_by_worker_index[i];
+	  /*
+	   * It works better to let the handoff node
+	   * rate-adapt, always ship the handoff queue element.
+	   */
+	  if (1 || hf->n_vectors == hf->last_n_vectors)
+	    {
+	      vlib_put_frame_queue_elt (hf);
+	      handoff_queue_elt_by_worker_index[i] = 0;
+	    }
+	  else
+	    hf->last_n_vectors = hf->n_vectors;
+	}
+      congested_handoff_queue_by_worker_index[i] =
+	(vlib_frame_queue_t *) (~0);
+    }
+  hf = 0;
+  current_worker_index = ~0;
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (snat_in2out_worker_handoff_node) = {
+  .function = snat_in2out_worker_handoff_fn,
+  .name = "snat-in2out-worker-handoff",
+  .vector_size = sizeof (u32),
+  .format_trace = format_snat_in2out_worker_handoff_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_worker_handoff_node, snat_in2out_worker_handoff_fn);
+
+static inline u32 icmp_in2out_static_map (snat_main_t *sm,
+                                          vlib_buffer_t * b0,
+                                          ip4_header_t * ip0,
+                                          icmp46_header_t * icmp0,
+                                          u32 sw_if_index0,
+                                          vlib_node_runtime_t * node,
+                                          u32 next0,
+                                          u32 rx_fib_index0)
+{
+  snat_session_key_t key0, sm0;
+  icmp_echo_header_t *echo0;
+  u32 new_addr0, old_addr0;
+  u16 old_id0, new_id0;
+  ip_csum_t sum0;
+  snat_runtime_t * rt = (snat_runtime_t *)node->runtime_data;
+
+  echo0 = (icmp_echo_header_t *)(icmp0+1);
+
+  key0.addr = ip0->src_address;
+  key0.port = echo0->identifier;
+  key0.fib_index = rx_fib_index0;
+  
+  if (snat_static_mapping_match(sm, key0, &sm0, 0))
+    {
+      ip4_address_t * first_int_addr;
+
+      if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index0))
+        {
+          first_int_addr =
+            ip4_interface_first_address (sm->ip4_main, sw_if_index0,
+                                         0 /* just want the address */);
+          rt->cached_sw_if_index = sw_if_index0;
+          rt->cached_ip4_address = first_int_addr->as_u32;
+        }
+
+      /* Don't NAT packet aimed at the intfc address */
+      if (PREDICT_FALSE(ip0->dst_address.as_u32 ==
+                                rt->cached_ip4_address))
+        return next0;
+
+      b0->error = node->errors[SNAT_IN2OUT_ERROR_NO_TRANSLATION];
+      return SNAT_IN2OUT_NEXT_DROP;
+    }
+
+  new_addr0 = sm0.addr.as_u32;
+  new_id0 = sm0.port;
+  vnet_buffer(b0)->sw_if_index[VLIB_TX] = sm0.fib_index;
+  old_addr0 = ip0->src_address.as_u32;
+  ip0->src_address.as_u32 = new_addr0;
+  
+  sum0 = ip0->checksum;
+  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                         ip4_header_t,
+                         src_address /* changed member */);
+  ip0->checksum = ip_csum_fold (sum0);
+  
+  if (PREDICT_FALSE(new_id0 != echo0->identifier))
+    {
+      old_id0 = echo0->identifier;
+      echo0->identifier = new_id0;
+
+      sum0 = icmp0->checksum;
+      sum0 = ip_csum_update (sum0, old_id0, new_id0, icmp_echo_header_t,
+                             identifier);
+      icmp0->checksum = ip_csum_fold (sum0);
+    }
+
+  return next0;
+}
+
+static uword
+snat_in2out_fast_static_map_fn (vlib_main_t * vm,
+                                vlib_node_runtime_t * node,
+                                vlib_frame_t * frame)
+{
+  u32 n_left_from, * from, * to_next;
+  snat_in2out_next_t next_index;
+  u32 pkts_processed = 0;
+  snat_main_t * sm = &snat_main;
+  snat_runtime_t * rt = (snat_runtime_t *)node->runtime_data;
+  u32 stats_node_index;
+
+  stats_node_index = snat_in2out_fast_node.index;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+          u32 bi0;
+	  vlib_buffer_t * b0;
+          u32 next0;
+          u32 sw_if_index0;
+          ip4_header_t * ip0;
+          ip_csum_t sum0;
+          u32 new_addr0, old_addr0;
+          u16 old_port0, new_port0;
+          udp_header_t * udp0;
+          tcp_header_t * tcp0;
+          icmp46_header_t * icmp0;
+          snat_session_key_t key0, sm0;
+          u32 proto0;
+          u32 rx_fib_index0;
+
+          /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+          next0 = SNAT_IN2OUT_NEXT_LOOKUP;
+
+          ip0 = vlib_buffer_get_current (b0);
+          udp0 = ip4_next_header (ip0);
+          tcp0 = (tcp_header_t *) udp0;
+          icmp0 = (icmp46_header_t *) udp0;
+
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+	  rx_fib_index0 = ip4_fib_table_get_index_for_sw_if_index(sw_if_index0);
+
+          proto0 = ~0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_UDP)
+            ? SNAT_PROTOCOL_UDP : proto0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_TCP)
+            ? SNAT_PROTOCOL_TCP : proto0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_ICMP)
+            ? SNAT_PROTOCOL_ICMP : proto0;
+
+          if (PREDICT_FALSE (proto0 == ~0))
+              goto trace0;
+
+          if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
+            {
+              ip4_address_t * first_int_addr;
+              
+              if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index0))
+                {
+                  first_int_addr = 
+                    ip4_interface_first_address (sm->ip4_main, sw_if_index0,
+                                                 0 /* just want the address */);
+                  rt->cached_sw_if_index = sw_if_index0;
+                  rt->cached_ip4_address = first_int_addr->as_u32;
+                }
+              
+              /* Don't NAT packet aimed at the intfc address */
+              if (PREDICT_FALSE(ip0->dst_address.as_u32 ==
+                                rt->cached_ip4_address))
+                goto trace0;
+
+              next0 = icmp_in2out_static_map
+                (sm, b0, ip0, icmp0, sw_if_index0, node, next0, rx_fib_index0);
+              goto trace0;
+            }
+
+          key0.addr = ip0->src_address;
+          key0.port = udp0->src_port;
+          key0.fib_index = rx_fib_index0;
+
+          if (snat_static_mapping_match(sm, key0, &sm0, 0))
+            {
+              b0->error = node->errors[SNAT_IN2OUT_ERROR_NO_TRANSLATION];
+              next0= SNAT_IN2OUT_NEXT_DROP;
+              goto trace0;
+            }
+
+          new_addr0 = sm0.addr.as_u32;
+          new_port0 = sm0.port;
+          vnet_buffer(b0)->sw_if_index[VLIB_TX] = sm0.fib_index;
+          old_addr0 = ip0->src_address.as_u32;
+          ip0->src_address.as_u32 = new_addr0;
+
+          sum0 = ip0->checksum;
+          sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                 ip4_header_t,
+                                 src_address /* changed member */);
+          ip0->checksum = ip_csum_fold (sum0);
+
+          if (PREDICT_FALSE(new_port0 != udp0->dst_port))
+            {
+              if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
+                {
+                  old_port0 = tcp0->ports.src;
+                  tcp0->ports.src = new_port0;
+
+                  sum0 = tcp0->checksum;
+                  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                         ip4_header_t,
+                                         dst_address /* changed member */);
+                  sum0 = ip_csum_update (sum0, old_port0, new_port0,
+                                         ip4_header_t /* cheat */,
+                                         length /* changed member */);
+                  tcp0->checksum = ip_csum_fold(sum0);
+                }
+              else
+                {
+                  old_port0 = udp0->src_port;
+                  udp0->src_port = new_port0;
+                  udp0->checksum = 0;
+                }
+            }
+          else
+            {
+              if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
+                {
+                  sum0 = tcp0->checksum;
+                  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                         ip4_header_t,
+                                         dst_address /* changed member */);
+                  tcp0->checksum = ip_csum_fold(sum0);
+                }
+            }
+
+          /* Hairpinning */
+          snat_hairpinning (sm, b0, ip0, udp0, tcp0, proto0);
+
+        trace0:
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+            {
+              snat_in2out_trace_t *t =
+                 vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->sw_if_index = sw_if_index0;
+              t->next_index = next0;
+            }
+
+          pkts_processed += next0 != SNAT_IN2OUT_NEXT_DROP;
+
+          /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, stats_node_index,
+                               SNAT_IN2OUT_ERROR_IN2OUT_PACKETS,
+                               pkts_processed);
+  return frame->n_vectors;
+}
+
+
+VLIB_REGISTER_NODE (snat_in2out_fast_node) = {
+  .function = snat_in2out_fast_static_map_fn,
+  .name = "snat-in2out-fast",
+  .vector_size = sizeof (u32),
+  .format_trace = format_snat_in2out_fast_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  
+  .n_errors = ARRAY_LEN(snat_in2out_error_strings),
+  .error_strings = snat_in2out_error_strings,
+
+  .runtime_data_bytes = sizeof (snat_runtime_t),
+  
+  .n_next_nodes = SNAT_IN2OUT_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [SNAT_IN2OUT_NEXT_DROP] = "error-drop",
+    [SNAT_IN2OUT_NEXT_LOOKUP] = "ip4-lookup",
+    [SNAT_IN2OUT_NEXT_SLOW_PATH] = "snat-in2out-slowpath",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_fast_node, snat_in2out_fast_static_map_fn);
diff --git a/src/plugins/snat/out2in.c b/src/plugins/snat/out2in.c
new file mode 100644
index 00000000..f1f4159c
--- /dev/null
+++ b/src/plugins/snat/out2in.c
@@ -0,0 +1,1261 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/vnet.h>
+#include <vnet/pg/pg.h>
+#include <vnet/handoff.h>
+
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/fib/ip4_fib.h>
+#include <snat/snat.h>
+
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
+
+typedef struct {
+  u32 sw_if_index;
+  u32 next_index;
+  u32 session_index;
+} snat_out2in_trace_t;
+
+typedef struct {
+  u32 next_worker_index;
+  u8 do_handoff;
+} snat_out2in_worker_handoff_trace_t;
+
+/* packet trace format function */
+static u8 * format_snat_out2in_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  snat_out2in_trace_t * t = va_arg (*args, snat_out2in_trace_t *);
+  
+  s = format (s, "SNAT_OUT2IN: sw_if_index %d, next index %d, session index %d",
+              t->sw_if_index, t->next_index, t->session_index);
+  return s;
+}
+
+static u8 * format_snat_out2in_fast_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  snat_out2in_trace_t * t = va_arg (*args, snat_out2in_trace_t *);
+  
+  s = format (s, "SNAT_OUT2IN_FAST: sw_if_index %d, next index %d",
+              t->sw_if_index, t->next_index);
+  return s;
+}
+
+static u8 * format_snat_out2in_worker_handoff_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  snat_out2in_worker_handoff_trace_t * t =
+    va_arg (*args, snat_out2in_worker_handoff_trace_t *);
+  char * m;
+
+  m = t->do_handoff ? "next worker" : "same worker";
+  s = format (s, "SNAT_OUT2IN_WORKER_HANDOFF: %s %d", m, t->next_worker_index);
+
+  return s;
+}
+
+vlib_node_registration_t snat_out2in_node;
+vlib_node_registration_t snat_out2in_fast_node;
+vlib_node_registration_t snat_out2in_worker_handoff_node;
+
+#define foreach_snat_out2in_error                       \
+_(UNSUPPORTED_PROTOCOL, "Unsupported protocol")         \
+_(OUT2IN_PACKETS, "Good out2in packets processed")      \
+_(BAD_ICMP_TYPE, "icmp type not echo-reply")            \
+_(NO_TRANSLATION, "No translation")
+  
+typedef enum {
+#define _(sym,str) SNAT_OUT2IN_ERROR_##sym,
+  foreach_snat_out2in_error
+#undef _
+  SNAT_OUT2IN_N_ERROR,
+} snat_out2in_error_t;
+
+static char * snat_out2in_error_strings[] = {
+#define _(sym,string) string,
+  foreach_snat_out2in_error
+#undef _
+};
+
+typedef enum {
+  SNAT_OUT2IN_NEXT_DROP,
+  SNAT_OUT2IN_NEXT_LOOKUP,
+  SNAT_OUT2IN_N_NEXT,
+} snat_out2in_next_t;
+
+/**
+ * @brief Create session for static mapping.
+ *
+ * Create NAT session initiated by host from external network with static
+ * mapping.
+ *
+ * @param sm     SNAT main.
+ * @param b0     Vlib buffer.
+ * @param in2out In2out SNAT session key.
+ * @param out2in Out2in SNAT session key.
+ * @param node   Vlib node.
+ *
+ * @returns SNAT session if successfully created otherwise 0.
+ */
+static inline snat_session_t *
+create_session_for_static_mapping (snat_main_t *sm,
+                                   vlib_buffer_t *b0,
+                                   snat_session_key_t in2out,
+                                   snat_session_key_t out2in,
+                                   vlib_node_runtime_t * node,
+                                   u32 cpu_index)
+{
+  snat_user_t *u;
+  snat_user_key_t user_key;
+  snat_session_t *s;
+  clib_bihash_kv_8_8_t kv0, value0;
+  dlist_elt_t * per_user_translation_list_elt;
+  dlist_elt_t * per_user_list_head_elt;
+
+  user_key.addr = in2out.addr;
+  user_key.fib_index = in2out.fib_index;
+  kv0.key = user_key.as_u64;
+
+  /* Ever heard of the "user" = inside ip4 address before? */
+  if (clib_bihash_search_8_8 (&sm->user_hash, &kv0, &value0))
+    {
+      /* no, make a new one */
+      pool_get (sm->per_thread_data[cpu_index].users, u);
+      memset (u, 0, sizeof (*u));
+      u->addr = in2out.addr;
+
+      pool_get (sm->per_thread_data[cpu_index].list_pool,
+                per_user_list_head_elt);
+
+      u->sessions_per_user_list_head_index = per_user_list_head_elt -
+        sm->per_thread_data[cpu_index].list_pool;
+
+      clib_dlist_init (sm->per_thread_data[cpu_index].list_pool,
+                       u->sessions_per_user_list_head_index);
+
+      kv0.value = u - sm->per_thread_data[cpu_index].users;
+
+      /* add user */
+      clib_bihash_add_del_8_8 (&sm->user_hash, &kv0, 1 /* is_add */);
+
+      /* add non-traslated packets worker lookup */
+      kv0.value = cpu_index;
+      clib_bihash_add_del_8_8 (&sm->worker_by_in, &kv0, 1);
+    }
+  else
+    {
+      u = pool_elt_at_index (sm->per_thread_data[cpu_index].users,
+                             value0.value);
+    }
+
+  pool_get (sm->per_thread_data[cpu_index].sessions, s);
+  memset (s, 0, sizeof (*s));
+
+  s->outside_address_index = ~0;
+  s->flags |= SNAT_SESSION_FLAG_STATIC_MAPPING;
+  u->nstaticsessions++;
+
+  /* Create list elts */
+  pool_get (sm->per_thread_data[cpu_index].list_pool,
+            per_user_translation_list_elt);
+  clib_dlist_init (sm->per_thread_data[cpu_index].list_pool,
+                   per_user_translation_list_elt -
+                   sm->per_thread_data[cpu_index].list_pool);
+
+  per_user_translation_list_elt->value =
+    s - sm->per_thread_data[cpu_index].sessions;
+  s->per_user_index =
+    per_user_translation_list_elt - sm->per_thread_data[cpu_index].list_pool;
+  s->per_user_list_head_index = u->sessions_per_user_list_head_index;
+
+  clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
+                      s->per_user_list_head_index,
+                      per_user_translation_list_elt -
+                      sm->per_thread_data[cpu_index].list_pool);
+
+  s->in2out = in2out;
+  s->out2in = out2in;
+  s->in2out.protocol = out2in.protocol;
+
+  /* Add to translation hashes */
+  kv0.key = s->in2out.as_u64;
+  kv0.value = s - sm->per_thread_data[cpu_index].sessions;
+  if (clib_bihash_add_del_8_8 (&sm->in2out, &kv0, 1 /* is_add */))
+      clib_warning ("in2out key add failed");
+
+  kv0.key = s->out2in.as_u64;
+  kv0.value = s - sm->per_thread_data[cpu_index].sessions;
+
+  if (clib_bihash_add_del_8_8 (&sm->out2in, &kv0, 1 /* is_add */))
+      clib_warning ("out2in key add failed");
+
+  return s;
+}
+
+static inline u32 icmp_out2in_slow_path (snat_main_t *sm,
+                                         vlib_buffer_t * b0,
+                                         ip4_header_t * ip0,
+                                         icmp46_header_t * icmp0,
+                                         u32 sw_if_index0,
+                                         u32 rx_fib_index0,
+                                         vlib_node_runtime_t * node,
+                                         u32 next0, f64 now,
+                                         u32 cpu_index)
+{
+  snat_session_key_t key0, sm0;
+  icmp_echo_header_t *echo0;
+  clib_bihash_kv_8_8_t kv0, value0;
+  snat_session_t * s0;
+  u32 new_addr0, old_addr0;
+  u16 old_id0, new_id0;
+  ip_csum_t sum0;
+  snat_runtime_t * rt = (snat_runtime_t *)node->runtime_data;
+
+  echo0 = (icmp_echo_header_t *)(icmp0+1);
+
+  key0.addr = ip0->dst_address;
+  key0.port = echo0->identifier;
+  key0.protocol = SNAT_PROTOCOL_ICMP;
+  key0.fib_index = rx_fib_index0;
+  
+  kv0.key = key0.as_u64;
+  
+  if (clib_bihash_search_8_8 (&sm->out2in, &kv0, &value0))
+    {
+      /* Try to match static mapping by external address and port,
+         destination address and port in packet */
+      if (snat_static_mapping_match(sm, key0, &sm0, 1))
+        {
+           ip4_address_t * first_int_addr;
+
+          if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index0))
+            {
+              first_int_addr = 
+                ip4_interface_first_address (sm->ip4_main, sw_if_index0,
+                                             0 /* just want the address */);
+              rt->cached_sw_if_index = sw_if_index0;
+              rt->cached_ip4_address = first_int_addr->as_u32;
+            }
+          
+          /* Don't NAT packet aimed at the intfc address */
+          if (PREDICT_FALSE(ip0->dst_address.as_u32 ==
+                            rt->cached_ip4_address))
+            return next0;
+
+          b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
+          return SNAT_OUT2IN_NEXT_DROP;
+        }
+
+      /* Create session initiated by host from external network */
+      s0 = create_session_for_static_mapping(sm, b0, sm0, key0,
+                                             node, cpu_index);
+      if (!s0)
+        return SNAT_OUT2IN_NEXT_DROP;
+    }
+  else
+    s0 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
+                            value0.value);
+
+  old_addr0 = ip0->dst_address.as_u32;
+  ip0->dst_address = s0->in2out.addr;
+  new_addr0 = ip0->dst_address.as_u32;
+  vnet_buffer(b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
+  
+  sum0 = ip0->checksum;
+  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                         ip4_header_t,
+                         dst_address /* changed member */);
+  ip0->checksum = ip_csum_fold (sum0);
+  
+  old_id0 = echo0->identifier;
+  new_id0 = s0->in2out.port;
+  echo0->identifier = new_id0;
+
+  sum0 = icmp0->checksum;
+  sum0 = ip_csum_update (sum0, old_id0, new_id0, icmp_echo_header_t,
+                         identifier);
+  icmp0->checksum = ip_csum_fold (sum0);
+
+  /* Accounting */
+  s0->last_heard = now;
+  s0->total_pkts++;
+  s0->total_bytes += vlib_buffer_length_in_chain (sm->vlib_main, b0);
+  /* Per-user LRU list maintenance for dynamic translation */
+  if (!snat_is_session_static (s0))
+    {
+      clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
+                         s0->per_user_index);
+      clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
+                          s0->per_user_list_head_index,
+                          s0->per_user_index);
+    }
+
+  return next0;
+}
+
+static uword
+snat_out2in_node_fn (vlib_main_t * vm,
+		  vlib_node_runtime_t * node,
+		  vlib_frame_t * frame)
+{
+  u32 n_left_from, * from, * to_next;
+  snat_out2in_next_t next_index;
+  u32 pkts_processed = 0;
+  snat_main_t * sm = &snat_main;
+  f64 now = vlib_time_now (vm);
+  u32 cpu_index = os_get_cpu_number ();
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from >= 4 && n_left_to_next >= 2)
+	{
+          u32 bi0, bi1;
+	  vlib_buffer_t * b0, * b1;
+          u32 next0 = SNAT_OUT2IN_NEXT_LOOKUP;
+          u32 next1 = SNAT_OUT2IN_NEXT_LOOKUP;
+          u32 sw_if_index0, sw_if_index1;
+          ip4_header_t * ip0, *ip1;
+          ip_csum_t sum0, sum1;
+          u32 new_addr0, old_addr0;
+          u16 new_port0, old_port0;
+          u32 new_addr1, old_addr1;
+          u16 new_port1, old_port1;
+          udp_header_t * udp0, * udp1;
+          tcp_header_t * tcp0, * tcp1;
+          icmp46_header_t * icmp0, * icmp1;
+          snat_session_key_t key0, key1, sm0, sm1;
+          u32 rx_fib_index0, rx_fib_index1;
+          u32 proto0, proto1;
+          snat_session_t * s0 = 0, * s1 = 0;
+          clib_bihash_kv_8_8_t kv0, kv1, value0, value1;
+          
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t * p2, * p3;
+            
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+            
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+          /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+            
+          ip0 = vlib_buffer_get_current (b0);
+          udp0 = ip4_next_header (ip0);
+          tcp0 = (tcp_header_t *) udp0;
+          icmp0 = (icmp46_header_t *) udp0;
+
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+	  rx_fib_index0 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index, 
+                                   sw_if_index0);
+
+          proto0 = ~0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_UDP) 
+            ? SNAT_PROTOCOL_UDP : proto0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_TCP) 
+            ? SNAT_PROTOCOL_TCP : proto0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_ICMP) 
+            ? SNAT_PROTOCOL_ICMP : proto0;
+
+          if (PREDICT_FALSE (proto0 == ~0))
+              goto trace0;
+
+          if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
+            {
+              next0 = icmp_out2in_slow_path 
+                (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node, 
+                 next0, now, cpu_index);
+              goto trace0;
+            }
+
+          key0.addr = ip0->dst_address;
+          key0.port = udp0->dst_port;
+          key0.protocol = proto0;
+          key0.fib_index = rx_fib_index0;
+          
+          kv0.key = key0.as_u64;
+
+          if (clib_bihash_search_8_8 (&sm->out2in, &kv0, &value0))
+            {
+              /* Try to match static mapping by external address and port,
+                 destination address and port in packet */
+              if (snat_static_mapping_match(sm, key0, &sm0, 1))
+                {
+                  b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
+                  goto trace0;
+                }
+
+              /* Create session initiated by host from external network */
+              s0 = create_session_for_static_mapping(sm, b0, sm0, key0, node,
+                                                     cpu_index);
+              if (!s0)
+                goto trace0;
+            }
+          else
+            s0 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
+                                    value0.value);
+
+          old_addr0 = ip0->dst_address.as_u32;
+          ip0->dst_address = s0->in2out.addr;
+          new_addr0 = ip0->dst_address.as_u32;
+          vnet_buffer(b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
+
+          sum0 = ip0->checksum;
+          sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                 ip4_header_t,
+                                 dst_address /* changed member */);
+          ip0->checksum = ip_csum_fold (sum0);
+
+          if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
+            {
+              old_port0 = tcp0->ports.dst;
+              tcp0->ports.dst = s0->in2out.port;
+              new_port0 = tcp0->ports.dst;
+
+              sum0 = tcp0->checksum;
+              sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                     ip4_header_t,
+                                     dst_address /* changed member */);
+
+              sum0 = ip_csum_update (sum0, old_port0, new_port0,
+                                     ip4_header_t /* cheat */,
+                                     length /* changed member */);
+              tcp0->checksum = ip_csum_fold(sum0);
+            }
+          else
+            {
+              old_port0 = udp0->dst_port;
+              udp0->dst_port = s0->in2out.port;
+              udp0->checksum = 0;
+            }
+
+          /* Accounting */
+          s0->last_heard = now;
+          s0->total_pkts++;
+          s0->total_bytes += vlib_buffer_length_in_chain (vm, b0);
+          /* Per-user LRU list maintenance for dynamic translation */
+          if (!snat_is_session_static (s0))
+            {
+              clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
+                                 s0->per_user_index);
+              clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
+                                  s0->per_user_list_head_index,
+                                  s0->per_user_index);
+            }
+        trace0:
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              snat_out2in_trace_t *t = 
+                 vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->sw_if_index = sw_if_index0;
+              t->next_index = next0;
+              t->session_index = ~0;
+              if (s0)
+                t->session_index = s0 - sm->per_thread_data[cpu_index].sessions;
+            }
+
+          pkts_processed += next0 != SNAT_OUT2IN_NEXT_DROP;
+
+
+          ip1 = vlib_buffer_get_current (b1);
+          udp1 = ip4_next_header (ip1);
+          tcp1 = (tcp_header_t *) udp1;
+          icmp1 = (icmp46_header_t *) udp1;
+
+          sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_RX];
+	  rx_fib_index1 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index, 
+                                   sw_if_index1);
+
+          proto1 = ~0;
+          proto1 = (ip1->protocol == IP_PROTOCOL_UDP) 
+            ? SNAT_PROTOCOL_UDP : proto1;
+          proto1 = (ip1->protocol == IP_PROTOCOL_TCP) 
+            ? SNAT_PROTOCOL_TCP : proto1;
+          proto1 = (ip1->protocol == IP_PROTOCOL_ICMP) 
+            ? SNAT_PROTOCOL_ICMP : proto1;
+
+          if (PREDICT_FALSE (proto1 == ~0))
+              goto trace1;
+
+          if (PREDICT_FALSE (proto1 == SNAT_PROTOCOL_ICMP))
+            {
+              next1 = icmp_out2in_slow_path 
+                (sm, b1, ip1, icmp1, sw_if_index1, rx_fib_index1, node, 
+                 next1, now, cpu_index);
+              goto trace1;
+            }
+
+          key1.addr = ip1->dst_address;
+          key1.port = udp1->dst_port;
+          key1.protocol = proto1;
+          key1.fib_index = rx_fib_index1;
+          
+          kv1.key = key1.as_u64;
+
+          if (clib_bihash_search_8_8 (&sm->out2in, &kv1, &value1))
+            {
+              /* Try to match static mapping by external address and port,
+                 destination address and port in packet */
+              if (snat_static_mapping_match(sm, key1, &sm1, 1))
+                {
+                  b1->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
+                  goto trace1;
+                }
+
+              /* Create session initiated by host from external network */
+              s1 = create_session_for_static_mapping(sm, b1, sm1, key1, node,
+                                                     cpu_index);
+              if (!s1)
+                goto trace1;
+            }
+          else
+            s1 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
+                                    value1.value);
+
+          old_addr1 = ip1->dst_address.as_u32;
+          ip1->dst_address = s1->in2out.addr;
+          new_addr1 = ip1->dst_address.as_u32;
+          vnet_buffer(b1)->sw_if_index[VLIB_TX] = s1->in2out.fib_index;
+
+          sum1 = ip1->checksum;
+          sum1 = ip_csum_update (sum1, old_addr1, new_addr1,
+                                 ip4_header_t,
+                                 dst_address /* changed member */);
+          ip1->checksum = ip_csum_fold (sum1);
+
+          if (PREDICT_TRUE(proto1 == SNAT_PROTOCOL_TCP))
+            {
+              old_port1 = tcp1->ports.dst;
+              tcp1->ports.dst = s1->in2out.port;
+              new_port1 = tcp1->ports.dst;
+
+              sum1 = tcp1->checksum;
+              sum1 = ip_csum_update (sum1, old_addr1, new_addr1,
+                                     ip4_header_t,
+                                     dst_address /* changed member */);
+
+              sum1 = ip_csum_update (sum1, old_port1, new_port1,
+                                     ip4_header_t /* cheat */,
+                                     length /* changed member */);
+              tcp1->checksum = ip_csum_fold(sum1);
+            }
+          else
+            {
+              old_port1 = udp1->dst_port;
+              udp1->dst_port = s1->in2out.port;
+              udp1->checksum = 0;
+            }
+
+          /* Accounting */
+          s1->last_heard = now;
+          s1->total_pkts++;
+          s1->total_bytes += vlib_buffer_length_in_chain (vm, b1);
+          /* Per-user LRU list maintenance for dynamic translation */
+          if (!snat_is_session_static (s1))
+            {
+              clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
+                                 s1->per_user_index);
+              clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
+                                  s1->per_user_list_head_index,
+                                  s1->per_user_index);
+            }
+        trace1:
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b1->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              snat_out2in_trace_t *t = 
+                 vlib_add_trace (vm, node, b1, sizeof (*t));
+              t->sw_if_index = sw_if_index1;
+              t->next_index = next1;
+              t->session_index = ~0;
+              if (s1)
+                t->session_index = s1 - sm->per_thread_data[cpu_index].sessions;
+            }
+
+          pkts_processed += next1 != SNAT_OUT2IN_NEXT_DROP;
+
+          /* verify speculative enqueues, maybe switch current next frame */
+          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+                                           to_next, n_left_to_next,
+                                           bi0, bi1, next0, next1);
+        }
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+          u32 bi0;
+	  vlib_buffer_t * b0;
+          u32 next0 = SNAT_OUT2IN_NEXT_LOOKUP;
+          u32 sw_if_index0;
+          ip4_header_t * ip0;
+          ip_csum_t sum0;
+          u32 new_addr0, old_addr0;
+          u16 new_port0, old_port0;
+          udp_header_t * udp0;
+          tcp_header_t * tcp0;
+          icmp46_header_t * icmp0;
+          snat_session_key_t key0, sm0;
+          u32 rx_fib_index0;
+          u32 proto0;
+          snat_session_t * s0 = 0;
+          clib_bihash_kv_8_8_t kv0, value0;
+          
+          /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+          ip0 = vlib_buffer_get_current (b0);
+          udp0 = ip4_next_header (ip0);
+          tcp0 = (tcp_header_t *) udp0;
+          icmp0 = (icmp46_header_t *) udp0;
+
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+	  rx_fib_index0 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index, 
+                                   sw_if_index0);
+
+          proto0 = ~0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_UDP) 
+            ? SNAT_PROTOCOL_UDP : proto0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_TCP) 
+            ? SNAT_PROTOCOL_TCP : proto0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_ICMP) 
+            ? SNAT_PROTOCOL_ICMP : proto0;
+
+          if (PREDICT_FALSE (proto0 == ~0))
+              goto trace00;
+
+          if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
+            {
+              next0 = icmp_out2in_slow_path 
+                (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node, 
+                 next0, now, cpu_index);
+              goto trace00;
+            }
+
+          key0.addr = ip0->dst_address;
+          key0.port = udp0->dst_port;
+          key0.protocol = proto0;
+          key0.fib_index = rx_fib_index0;
+          
+          kv0.key = key0.as_u64;
+
+          if (clib_bihash_search_8_8 (&sm->out2in, &kv0, &value0))
+            {
+              /* Try to match static mapping by external address and port,
+                 destination address and port in packet */
+              if (snat_static_mapping_match(sm, key0, &sm0, 1))
+                {
+                  b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
+                  goto trace00;
+                }
+
+              /* Create session initiated by host from external network */
+              s0 = create_session_for_static_mapping(sm, b0, sm0, key0, node,
+                                                     cpu_index);
+              if (!s0)
+                goto trace00;
+            }
+          else
+            s0 = pool_elt_at_index (sm->per_thread_data[cpu_index].sessions,
+                                    value0.value);
+
+          old_addr0 = ip0->dst_address.as_u32;
+          ip0->dst_address = s0->in2out.addr;
+          new_addr0 = ip0->dst_address.as_u32;
+          vnet_buffer(b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
+
+          sum0 = ip0->checksum;
+          sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                 ip4_header_t,
+                                 dst_address /* changed member */);
+          ip0->checksum = ip_csum_fold (sum0);
+
+          if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
+            {
+              old_port0 = tcp0->ports.dst;
+              tcp0->ports.dst = s0->in2out.port;
+              new_port0 = tcp0->ports.dst;
+
+              sum0 = tcp0->checksum;
+              sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                     ip4_header_t,
+                                     dst_address /* changed member */);
+
+              sum0 = ip_csum_update (sum0, old_port0, new_port0,
+                                     ip4_header_t /* cheat */,
+                                     length /* changed member */);
+              tcp0->checksum = ip_csum_fold(sum0);
+            }
+          else
+            {
+              old_port0 = udp0->dst_port;
+              udp0->dst_port = s0->in2out.port;
+              udp0->checksum = 0;
+            }
+
+          /* Accounting */
+          s0->last_heard = now;
+          s0->total_pkts++;
+          s0->total_bytes += vlib_buffer_length_in_chain (vm, b0);
+          /* Per-user LRU list maintenance for dynamic translation */
+          if (!snat_is_session_static (s0))
+            {
+              clib_dlist_remove (sm->per_thread_data[cpu_index].list_pool,
+                                 s0->per_user_index);
+              clib_dlist_addtail (sm->per_thread_data[cpu_index].list_pool,
+                                  s0->per_user_list_head_index,
+                                  s0->per_user_index);
+            }
+        trace00:
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
+            {
+              snat_out2in_trace_t *t = 
+                 vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->sw_if_index = sw_if_index0;
+              t->next_index = next0;
+              t->session_index = ~0;
+              if (s0)
+                t->session_index = s0 - sm->per_thread_data[cpu_index].sessions;
+            }
+
+          pkts_processed += next0 != SNAT_OUT2IN_NEXT_DROP;
+
+          /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, snat_out2in_node.index, 
+                               SNAT_OUT2IN_ERROR_OUT2IN_PACKETS, 
+                               pkts_processed);
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (snat_out2in_node) = {
+  .function = snat_out2in_node_fn,
+  .name = "snat-out2in",
+  .vector_size = sizeof (u32),
+  .format_trace = format_snat_out2in_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  
+  .n_errors = ARRAY_LEN(snat_out2in_error_strings),
+  .error_strings = snat_out2in_error_strings,
+
+  .runtime_data_bytes = sizeof (snat_runtime_t),
+  
+  .n_next_nodes = SNAT_OUT2IN_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [SNAT_OUT2IN_NEXT_DROP] = "error-drop",
+    [SNAT_OUT2IN_NEXT_LOOKUP] = "ip4-lookup",
+  },
+};
+VLIB_NODE_FUNCTION_MULTIARCH (snat_out2in_node, snat_out2in_node_fn);
+
+static uword
+snat_out2in_worker_handoff_fn (vlib_main_t * vm,
+                               vlib_node_runtime_t * node,
+                               vlib_frame_t * frame)
+{
+  snat_main_t *sm = &snat_main;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  u32 n_left_from, *from, *to_next = 0;
+  static __thread vlib_frame_queue_elt_t **handoff_queue_elt_by_worker_index;
+  static __thread vlib_frame_queue_t **congested_handoff_queue_by_worker_index
+    = 0;
+  vlib_frame_queue_elt_t *hf = 0;
+  vlib_frame_t *f = 0;
+  int i;
+  u32 n_left_to_next_worker = 0, *to_next_worker = 0;
+  u32 next_worker_index = 0;
+  u32 current_worker_index = ~0;
+  u32 cpu_index = os_get_cpu_number ();
+
+  ASSERT (vec_len (sm->workers));
+
+  if (PREDICT_FALSE (handoff_queue_elt_by_worker_index == 0))
+    {
+      vec_validate (handoff_queue_elt_by_worker_index, tm->n_vlib_mains - 1);
+
+      vec_validate_init_empty (congested_handoff_queue_by_worker_index,
+			       sm->first_worker_index + sm->num_workers - 1,
+			       (vlib_frame_queue_t *) (~0));
+    }
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+
+  while (n_left_from > 0)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      u32 sw_if_index0;
+      u32 rx_fib_index0;
+      ip4_header_t * ip0;
+      udp_header_t * udp0;
+      snat_static_mapping_key_t key0;
+      clib_bihash_kv_8_8_t kv0, value0;
+      u8 do_handoff;
+
+      bi0 = from[0];
+      from += 1;
+      n_left_from -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      rx_fib_index0 = ip4_fib_table_get_index_for_sw_if_index(sw_if_index0);
+
+      ip0 = vlib_buffer_get_current (b0);
+      udp0 = ip4_next_header (ip0);
+
+      key0.addr = ip0->dst_address;
+      key0.port = udp0->dst_port;
+      key0.fib_index = rx_fib_index0;
+
+      kv0.key = key0.as_u64;
+
+      /* Ever heard of of the "user" before? */
+      if (clib_bihash_search_8_8 (&sm->worker_by_out, &kv0, &value0))
+        {
+          key0.port = 0;
+          kv0.key = key0.as_u64;
+
+          if (clib_bihash_search_8_8 (&sm->worker_by_out, &kv0, &value0))
+            {
+              /* No, assign next available worker (RR) */
+              next_worker_index = sm->first_worker_index +
+                sm->workers[sm->next_worker++ % vec_len (sm->workers)];
+            }
+          else
+            {
+              /* Static mapping without port */
+              next_worker_index = value0.value;
+            }
+
+          /* Add to translated packets worker lookup */
+          kv0.value = next_worker_index;
+          clib_bihash_add_del_8_8 (&sm->worker_by_out, &kv0, 1);
+        }
+      else
+        next_worker_index = value0.value;
+
+      if (PREDICT_FALSE (next_worker_index != cpu_index))
+        {
+          do_handoff = 1;
+
+          if (next_worker_index != current_worker_index)
+            {
+              if (hf)
+                hf->n_vectors = VLIB_FRAME_SIZE - n_left_to_next_worker;
+
+              hf = vlib_get_worker_handoff_queue_elt (sm->fq_out2in_index,
+                                                      next_worker_index,
+                                                      handoff_queue_elt_by_worker_index);
+
+              n_left_to_next_worker = VLIB_FRAME_SIZE - hf->n_vectors;
+              to_next_worker = &hf->buffer_index[hf->n_vectors];
+              current_worker_index = next_worker_index;
+            }
+
+          /* enqueue to correct worker thread */
+          to_next_worker[0] = bi0;
+          to_next_worker++;
+          n_left_to_next_worker--;
+
+          if (n_left_to_next_worker == 0)
+            {
+              hf->n_vectors = VLIB_FRAME_SIZE;
+              vlib_put_frame_queue_elt (hf);
+              current_worker_index = ~0;
+              handoff_queue_elt_by_worker_index[next_worker_index] = 0;
+              hf = 0;
+            }
+        }
+      else
+        {
+          do_handoff = 0;
+          /* if this is 1st frame */
+          if (!f)
+            {
+              f = vlib_get_frame_to_node (vm, snat_out2in_node.index);
+              to_next = vlib_frame_vector_args (f);
+            }
+
+          to_next[0] = bi0;
+          to_next += 1;
+          f->n_vectors++;
+        }
+
+      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			 && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	{
+          snat_out2in_worker_handoff_trace_t *t =
+            vlib_add_trace (vm, node, b0, sizeof (*t));
+          t->next_worker_index = next_worker_index;
+          t->do_handoff = do_handoff;
+        }
+    }
+
+  if (f)
+    vlib_put_frame_to_node (vm, snat_out2in_node.index, f);
+
+  if (hf)
+    hf->n_vectors = VLIB_FRAME_SIZE - n_left_to_next_worker;
+
+  /* Ship frames to the worker nodes */
+  for (i = 0; i < vec_len (handoff_queue_elt_by_worker_index); i++)
+    {
+      if (handoff_queue_elt_by_worker_index[i])
+	{
+	  hf = handoff_queue_elt_by_worker_index[i];
+	  /*
+	   * It works better to let the handoff node
+	   * rate-adapt, always ship the handoff queue element.
+	   */
+	  if (1 || hf->n_vectors == hf->last_n_vectors)
+	    {
+	      vlib_put_frame_queue_elt (hf);
+	      handoff_queue_elt_by_worker_index[i] = 0;
+	    }
+	  else
+	    hf->last_n_vectors = hf->n_vectors;
+	}
+      congested_handoff_queue_by_worker_index[i] =
+	(vlib_frame_queue_t *) (~0);
+    }
+  hf = 0;
+  current_worker_index = ~0;
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (snat_out2in_worker_handoff_node) = {
+  .function = snat_out2in_worker_handoff_fn,
+  .name = "snat-out2in-worker-handoff",
+  .vector_size = sizeof (u32),
+  .format_trace = format_snat_out2in_worker_handoff_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (snat_out2in_worker_handoff_node, snat_out2in_worker_handoff_fn);
+
+static inline u32 icmp_out2in_fast (snat_main_t *sm,
+                                    vlib_buffer_t * b0,
+                                    ip4_header_t * ip0,
+                                    icmp46_header_t * icmp0,
+                                    u32 sw_if_index0,
+                                    vlib_node_runtime_t * node,
+                                    u32 next0,
+                                    u32 rx_fib_index0)
+{
+  snat_session_key_t key0, sm0;
+  icmp_echo_header_t *echo0;
+  u32 new_addr0, old_addr0;
+  u16 old_id0, new_id0;
+  ip_csum_t sum0;
+  snat_runtime_t * rt = (snat_runtime_t *)node->runtime_data;
+
+  echo0 = (icmp_echo_header_t *)(icmp0+1);
+
+  key0.addr = ip0->dst_address;
+  key0.port = echo0->identifier;
+  key0.fib_index = rx_fib_index0;
+
+  if (snat_static_mapping_match(sm, key0, &sm0, 1))
+    {
+      ip4_address_t * first_int_addr;
+
+      if (PREDICT_FALSE(rt->cached_sw_if_index != sw_if_index0))
+        {
+          first_int_addr =
+            ip4_interface_first_address (sm->ip4_main, sw_if_index0,
+                                         0 /* just want the address */);
+          rt->cached_sw_if_index = sw_if_index0;
+          rt->cached_ip4_address = first_int_addr->as_u32;
+        }
+
+      /* Don't NAT packet aimed at the intfc address */
+      if (PREDICT_FALSE(ip0->dst_address.as_u32 ==
+                        rt->cached_ip4_address))
+        return next0;
+
+      b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
+      return SNAT_OUT2IN_NEXT_DROP;
+    }
+
+  new_addr0 = sm0.addr.as_u32;
+  new_id0 = sm0.port;
+  vnet_buffer(b0)->sw_if_index[VLIB_TX] = sm0.fib_index;
+
+  old_addr0 = ip0->dst_address.as_u32;
+  ip0->dst_address.as_u32 = new_addr0;
+
+  sum0 = ip0->checksum;
+  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                         ip4_header_t,
+                         dst_address /* changed member */);
+  ip0->checksum = ip_csum_fold (sum0);
+
+  if (PREDICT_FALSE(new_id0 != echo0->identifier))
+    {
+      old_id0 = echo0->identifier;
+      echo0->identifier = new_id0;
+
+      sum0 = icmp0->checksum;
+      sum0 = ip_csum_update (sum0, old_id0, new_id0, icmp_echo_header_t,
+                             identifier);
+      icmp0->checksum = ip_csum_fold (sum0);
+    }
+
+  return next0;
+}
+
+static uword
+snat_out2in_fast_node_fn (vlib_main_t * vm,
+	        	  vlib_node_runtime_t * node,
+		          vlib_frame_t * frame)
+{
+  u32 n_left_from, * from, * to_next;
+  snat_out2in_next_t next_index;
+  u32 pkts_processed = 0;
+  snat_main_t * sm = &snat_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index,
+			   to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+          u32 bi0;
+	  vlib_buffer_t * b0;
+          u32 next0 = SNAT_OUT2IN_NEXT_DROP;
+          u32 sw_if_index0;
+          ip4_header_t * ip0;
+          ip_csum_t sum0;
+          u32 new_addr0, old_addr0;
+          u16 new_port0, old_port0;
+          udp_header_t * udp0;
+          tcp_header_t * tcp0;
+          icmp46_header_t * icmp0;
+          snat_session_key_t key0, sm0;
+          u32 proto0;
+          u32 rx_fib_index0;
+
+          /* speculatively enqueue b0 to the current next frame */
+	  bi0 = from[0];
+	  to_next[0] = bi0;
+	  from += 1;
+	  to_next += 1;
+	  n_left_from -= 1;
+	  n_left_to_next -= 1;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+          ip0 = vlib_buffer_get_current (b0);
+          udp0 = ip4_next_header (ip0);
+          tcp0 = (tcp_header_t *) udp0;
+          icmp0 = (icmp46_header_t *) udp0;
+
+          sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+	  rx_fib_index0 = ip4_fib_table_get_index_for_sw_if_index(sw_if_index0);
+
+	  vnet_feature_next (sw_if_index0, &next0, b0);
+
+          proto0 = ~0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_UDP)
+            ? SNAT_PROTOCOL_UDP : proto0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_TCP)
+            ? SNAT_PROTOCOL_TCP : proto0;
+          proto0 = (ip0->protocol == IP_PROTOCOL_ICMP)
+            ? SNAT_PROTOCOL_ICMP : proto0;
+
+          if (PREDICT_FALSE (proto0 == ~0))
+              goto trace00;
+
+          if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
+            {
+              next0 = icmp_out2in_fast
+                (sm, b0, ip0, icmp0, sw_if_index0, node, next0, rx_fib_index0);
+              goto trace00;
+            }
+
+          key0.addr = ip0->dst_address;
+          key0.port = udp0->dst_port;
+          key0.fib_index = rx_fib_index0;
+
+          if (snat_static_mapping_match(sm, key0, &sm0, 1))
+            {
+              b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
+              goto trace00;
+            }
+
+          new_addr0 = sm0.addr.as_u32;
+          new_port0 = sm0.port;
+          vnet_buffer(b0)->sw_if_index[VLIB_TX] = sm0.fib_index;
+          old_addr0 = ip0->dst_address.as_u32;
+          ip0->dst_address.as_u32 = new_addr0;
+
+          sum0 = ip0->checksum;
+          sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                 ip4_header_t,
+                                 dst_address /* changed member */);
+          ip0->checksum = ip_csum_fold (sum0);
+
+          if (PREDICT_FALSE(new_port0 != udp0->dst_port))
+            {
+               if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
+                {
+                  old_port0 = tcp0->ports.dst;
+                  tcp0->ports.dst = new_port0;
+
+                  sum0 = tcp0->checksum;
+                  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                         ip4_header_t,
+                                         dst_address /* changed member */);
+
+                  sum0 = ip_csum_update (sum0, old_port0, new_port0,
+                                         ip4_header_t /* cheat */,
+                                         length /* changed member */);
+                  tcp0->checksum = ip_csum_fold(sum0);
+                }
+              else
+                {
+                  old_port0 = udp0->dst_port;
+                  udp0->dst_port = new_port0;
+                  udp0->checksum = 0;
+                }
+            }
+          else
+            {
+              if (PREDICT_TRUE(proto0 == SNAT_PROTOCOL_TCP))
+                {
+                  sum0 = tcp0->checksum;
+                  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                         ip4_header_t,
+                                         dst_address /* changed member */);
+
+                  tcp0->checksum = ip_csum_fold(sum0);
+                }
+            }
+
+        trace00:
+
+          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)
+                            && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+            {
+              snat_out2in_trace_t *t =
+                 vlib_add_trace (vm, node, b0, sizeof (*t));
+              t->sw_if_index = sw_if_index0;
+              t->next_index = next0;
+            }
+
+          pkts_processed += next0 != SNAT_OUT2IN_NEXT_DROP;
+
+          /* verify speculative enqueue, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, next0);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_node_increment_counter (vm, snat_out2in_fast_node.index,
+                               SNAT_OUT2IN_ERROR_OUT2IN_PACKETS,
+                               pkts_processed);
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (snat_out2in_fast_node) = {
+  .function = snat_out2in_fast_node_fn,
+  .name = "snat-out2in-fast",
+  .vector_size = sizeof (u32),
+  .format_trace = format_snat_out2in_fast_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  
+  .n_errors = ARRAY_LEN(snat_out2in_error_strings),
+  .error_strings = snat_out2in_error_strings,
+
+  .runtime_data_bytes = sizeof (snat_runtime_t),
+  
+  .n_next_nodes = SNAT_OUT2IN_N_NEXT,
+
+  /* edit / add dispositions here */
+  .next_nodes = {
+    [SNAT_OUT2IN_NEXT_LOOKUP] = "ip4-lookup",
+    [SNAT_OUT2IN_NEXT_DROP] = "error-drop",
+  },
+};
+VLIB_NODE_FUNCTION_MULTIARCH (snat_out2in_fast_node, snat_out2in_fast_node_fn);
diff --git a/src/plugins/snat/snat.api b/src/plugins/snat/snat.api
new file mode 100644
index 00000000..a191eed5
--- /dev/null
+++ b/src/plugins/snat/snat.api
@@ -0,0 +1,283 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * @file snat.api
+ * @brief VPP control-plane API messages.
+ *
+ * This file defines VPP control-plane API messages which are generally
+ * called through a shared memory interface.
+ */
+
+/** \brief Add/del S-NAT address range
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_ip4 - 1 if address type is IPv4
+    @first_ip_address - first IP address
+    @last_ip_address - last IP address
+    @is_add - 1 if add, 0 if delete
+*/
+define snat_add_address_range {
+  u32 client_index;
+  u32 context;
+  u8 is_ip4;
+  u8 first_ip_address[16];
+  u8 last_ip_address[16];
+  u8 is_add;
+};
+
+/** \brief Add S-NAT address range reply
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param retval - return code
+*/
+define snat_add_address_range_reply {
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Dump S-NAT addresses
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define snat_address_dump {
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief S-NAT address details response
+    @param context - sender context, to match reply w/ request
+    @param is_ip4 - 1 if address type is IPv4
+    @param ip_address - IP address
+*/
+define snat_address_details {
+  u32 context;
+  u8 is_ip4;
+  u8 ip_address[16];
+};
+
+/** \brief Enable/disable S-NAT feature on the interface
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - 1 if add, 0 if delete
+    @param is_inside - 1 if inside, 0 if outside
+    @param sw_if_index - software index of the interface
+*/
+define snat_interface_add_del_feature {
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 is_inside;
+  u32 sw_if_index;
+};
+
+/** \brief Enable/disable S-NAT feature on the interface reply
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param retval - return code
+*/
+define snat_interface_add_del_feature_reply {
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Dump interfaces with S-NAT feature
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define snat_interface_dump {
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief S-NAT interface details response
+    @param context - sender context, to match reply w/ request
+    @param is_inside - 1 if inside, 0 if outside
+    @param sw_if_index - software index of the interface
+*/
+define snat_interface_details {
+  u32 context;
+  u8 is_inside;
+  u32 sw_if_index;
+};
+
+/** \brief Add/delete S-NAT static mapping
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param is_add - 1 if add, 0 if delete
+    @param is_ip4 - 1 if address type is IPv4
+    @param addr_only - 1 if address only mapping
+    @param local_ip_address - local IP address
+    @param external_ip_address - external IP address
+    @param local_port - local port number
+    @param external_port - external port number
+    @param vfr_id - VRF ID
+*/
+define snat_add_static_mapping {
+  u32 client_index;
+  u32 context;
+  u8 is_add;
+  u8 is_ip4;
+  u8 addr_only;
+  u8 local_ip_address[16];
+  u8 external_ip_address[16];
+  u16 local_port;
+  u16 external_port;
+  u32 vrf_id;
+};
+
+/** \brief Add/delete S-NAT static mapping reply
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param retval - return code
+*/
+define snat_add_static_mapping_reply {
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Dump S-NAT static mappings
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define snat_static_mapping_dump {
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief S-NAT static mapping details response
+    @param context - sender context, to match reply w/ request
+    @param is_ip4 - 1 if address type is IPv4
+    @param addr_only - 1 if address only mapping
+    @param local_ip_address - local IP address
+    @param external_ip_address - external IP address
+    @param local_port - local port number
+    @param external_port - external port number
+    @param vfr_id - VRF ID
+*/
+define snat_static_mapping_details {
+  u32 context;
+  u8 is_ip4;
+  u8 addr_only;
+  u8 local_ip_address[16];
+  u8 external_ip_address[16];
+  u16 local_port;
+  u16 external_port;
+  u32 vrf_id;
+};
+
+/** \brief Control ping from client to api server request
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define snat_control_ping
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Control ping from the client to the server response
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+    @param vpe_pid - the pid of the vpe, returned by the server
+*/
+define snat_control_ping_reply
+{
+  u32 context;
+  i32 retval;
+  u32 client_index;
+  u32 vpe_pid;
+};
+
+/** \brief Show S-NAT plugin startup config
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define snat_show_config
+{
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief Show S-NAT plugin startup config reply
+    @param context - sender context, to match reply w/ request
+    @param retval - return code for the request
+    @param static_mapping_only - if 1 dynamic translations disabled
+    @param static_mapping_connection_tracking - if 1 create session data
+    @param translation_buckets - number of translation hash buckets
+    @param translation_memory_size - translation hash memory size
+    @param user_buckets - number of user hash buckets
+    @param user_memory_size - user hash memory size
+    @param max_translations_per_user - maximum number of translations per user
+    @param outside_vrf_id - outside VRF id
+    @param inside_vrf_id - default inside VRF id
+*/
+define snat_show_config_reply
+{
+  u32 context;
+  i32 retval;
+  u8 static_mapping_only;
+  u8 static_mapping_connection_tracking;
+  u32 translation_buckets;
+  u32 translation_memory_size;
+  u32 user_buckets;
+  u32 user_memory_size;
+  u32 max_translations_per_user;
+  u32 outside_vrf_id;
+  u32 inside_vrf_id;
+};
+
+/** \brief Set S-NAT workers
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param worker_mask - S-NAT workers mask
+*/
+define snat_set_workers {
+  u32 client_index;
+  u32 context;
+  u64 worker_mask;
+};
+
+/** \brief Set S-NAT workers reply
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param retval - return code
+*/
+define snat_set_workers_reply {
+  u32 context;
+  i32 retval;
+};
+
+/** \brief Dump S-NAT workers
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define snat_worker_dump {
+  u32 client_index;
+  u32 context;
+};
+
+/** \brief S-NAT workers details response
+    @param context - sender context, to match reply w/ request
+    @param worker_index - worker index
+    @param lcore_id - lcore ID
+    @param name - worker name
+*/
+define snat_worker_details {
+  u32 context;
+  u32 worker_index;
+  u32 lcore_id;
+  u8 name[64];
+};
diff --git a/src/plugins/snat/snat.c b/src/plugins/snat/snat.c
new file mode 100644
index 00000000..bc995684
--- /dev/null
+++ b/src/plugins/snat/snat.c
@@ -0,0 +1,1957 @@
+/*
+ * snat.c - simple nat plugin
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+#include <vnet/plugin/plugin.h>
+#include <vlibapi/api.h>
+#include <snat/snat.h>
+
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+
+snat_main_t snat_main;
+
+/* define message IDs */
+#include <snat/snat_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <snat/snat_all_api_h.h> 
+#undef vl_typedefs
+
+/* define generated endian-swappers */
+#define vl_endianfun
+#include <snat/snat_all_api_h.h> 
+#undef vl_endianfun
+
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <snat/snat_all_api_h.h>
+#undef vl_api_version
+
+/* Macro to finish up custom dump fns */
+#define FINISH                                  \
+    vec_add1 (s, 0);                            \
+    vl_print (handle, (char *)s);               \
+    vec_free (s);                               \
+    return handle;
+
+/* 
+ * A handy macro to set up a message reply.
+ * Assumes that the following variables are available:
+ * mp - pointer to request message
+ * rmp - pointer to reply message type
+ * rv - return value
+ */
+
+#define REPLY_MACRO(t)                                          \
+do {                                                            \
+    unix_shared_memory_queue_t * q =                            \
+    vl_api_client_index_to_input_queue (mp->client_index);      \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+                                                                \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+#define REPLY_MACRO2(t, body)                                   \
+do {                                                            \
+    unix_shared_memory_queue_t * q =                            \
+    vl_api_client_index_to_input_queue (mp->client_index);      \
+    if (!q)                                                     \
+        return;                                                 \
+                                                                \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
+    rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base);               \
+    rmp->context = mp->context;                                 \
+    rmp->retval = ntohl(rv);                                    \
+    do {body;} while (0);                                       \
+    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
+} while(0);
+
+
+/* Hook up input features */
+VNET_FEATURE_INIT (ip4_snat_in2out, static) = {
+  .arc_name = "ip4-unicast",
+  .node_name = "snat-in2out",
+  .runs_before = VNET_FEATURES ("snat-out2in"),
+};
+VNET_FEATURE_INIT (ip4_snat_out2in, static) = {
+  .arc_name = "ip4-unicast",
+  .node_name = "snat-out2in",
+  .runs_before = VNET_FEATURES ("ip4-lookup"),
+};
+VNET_FEATURE_INIT (ip4_snat_in2out_worker_handoff, static) = {
+  .arc_name = "ip4-unicast",
+  .node_name = "snat-in2out-worker-handoff",
+  .runs_before = VNET_FEATURES ("snat-out2in-worker-handoff"),
+};
+VNET_FEATURE_INIT (ip4_snat_out2in_worker_handoff, static) = {
+  .arc_name = "ip4-unicast",
+  .node_name = "snat-out2in-worker-handoff",
+  .runs_before = VNET_FEATURES ("ip4-lookup"),
+};
+VNET_FEATURE_INIT (ip4_snat_in2out_fast, static) = {
+  .arc_name = "ip4-unicast",
+  .node_name = "snat-in2out-fast",
+  .runs_before = VNET_FEATURES ("snat-out2in-fast"),
+};
+VNET_FEATURE_INIT (ip4_snat_out2in_fast, static) = {
+  .arc_name = "ip4-unicast",
+  .node_name = "snat-out2in-fast",
+  .runs_before = VNET_FEATURES ("ip4-lookup"),
+};
+
+
+/* 
+ * This routine exists to convince the vlib plugin framework that
+ * we haven't accidentally copied a random .dll into the plugin directory.
+ *
+ * Also collects global variable pointers passed from the vpp engine
+ */
+
+clib_error_t * 
+vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
+                      int from_early_init)
+{
+  snat_main_t * sm = &snat_main;
+  clib_error_t * error = 0;
+
+  sm->vlib_main = vm;
+  sm->vnet_main = h->vnet_main;
+  sm->ethernet_main = h->ethernet_main;
+
+  return error;
+}
+
+/*$$$$$ move to an installed header file */
+#if (1 || CLIB_DEBUG > 0)       /* "trust, but verify" */
+
+#define VALIDATE_SW_IF_INDEX(mp)				\
+ do { u32 __sw_if_index = ntohl(mp->sw_if_index);		\
+    vnet_main_t *__vnm = vnet_get_main();                       \
+    if (pool_is_free_index(__vnm->interface_main.sw_interfaces, \
+                           __sw_if_index)) {                    \
+        rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
+        goto bad_sw_if_index;                                   \
+    }                                                           \
+} while(0);
+
+#define BAD_SW_IF_INDEX_LABEL                   \
+do {                                            \
+bad_sw_if_index:                                \
+    ;                                           \
+} while (0);
+
+#define VALIDATE_RX_SW_IF_INDEX(mp)				\
+ do { u32 __rx_sw_if_index = ntohl(mp->rx_sw_if_index);		\
+    vnet_main_t *__vnm = vnet_get_main();                       \
+    if (pool_is_free_index(__vnm->interface_main.sw_interfaces, \
+                           __rx_sw_if_index)) {			\
+        rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
+        goto bad_rx_sw_if_index;				\
+    }                                                           \
+} while(0);
+
+#define BAD_RX_SW_IF_INDEX_LABEL		\
+do {                                            \
+bad_rx_sw_if_index:				\
+    ;                                           \
+} while (0);
+
+#define VALIDATE_TX_SW_IF_INDEX(mp)				\
+ do { u32 __tx_sw_if_index = ntohl(mp->tx_sw_if_index);		\
+    vnet_main_t *__vnm = vnet_get_main();                       \
+    if (pool_is_free_index(__vnm->interface_main.sw_interfaces, \
+                           __tx_sw_if_index)) {			\
+        rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
+        goto bad_tx_sw_if_index;				\
+    }                                                           \
+} while(0);
+
+#define BAD_TX_SW_IF_INDEX_LABEL		\
+do {                                            \
+bad_tx_sw_if_index:				\
+    ;                                           \
+} while (0);
+
+#else
+
+#define VALIDATE_SW_IF_INDEX(mp)
+#define BAD_SW_IF_INDEX_LABEL
+#define VALIDATE_RX_SW_IF_INDEX(mp)
+#define BAD_RX_SW_IF_INDEX_LABEL
+#define VALIDATE_TX_SW_IF_INDEX(mp)
+#define BAD_TX_SW_IF_INDEX_LABEL
+
+#endif  /* CLIB_DEBUG > 0 */
+
+void snat_add_address (snat_main_t *sm, ip4_address_t *addr)
+{
+  snat_address_t * ap;
+
+  /* Check if address already exists */
+  vec_foreach (ap, sm->addresses)
+    {
+      if (ap->addr.as_u32 == addr->as_u32)
+        return;
+    }
+
+  vec_add2 (sm->addresses, ap, 1);
+  ap->addr = *addr;
+  clib_bitmap_alloc (ap->busy_port_bitmap, 65535);
+}
+
+static int is_snat_address_used_in_static_mapping (snat_main_t *sm,
+                                                   ip4_address_t addr)
+{
+  snat_static_mapping_t *m;
+  pool_foreach (m, sm->static_mappings,
+  ({
+      if (m->external_addr.as_u32 == addr.as_u32)
+        return 1;
+  }));
+
+  return 0;
+}
+
+int snat_del_address (snat_main_t *sm, ip4_address_t addr)
+{
+  snat_address_t *a = 0;
+  snat_session_t *ses;
+  u32 *ses_to_be_removed = 0, *ses_index;
+  clib_bihash_kv_8_8_t kv, value;
+  snat_user_key_t user_key;
+  snat_user_t *u;
+  snat_main_per_thread_data_t *tsm;
+
+  int i;
+
+  /* Find SNAT address */
+  for (i=0; i < vec_len (sm->addresses); i++)
+    {
+      if (sm->addresses[i].addr.as_u32 == addr.as_u32)
+        {
+          a = sm->addresses + i;
+          break;
+        }
+    }
+  if (!a)
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+  /* Check if address is used in some static mapping */
+  if (is_snat_address_used_in_static_mapping(sm, addr))
+    {
+      clib_warning ("address used in static mapping");
+      return VNET_API_ERROR_UNSPECIFIED;
+    }
+
+  /* Delete sessions using address */
+  if (a->busy_ports)
+    {
+      vec_foreach (tsm, sm->per_thread_data)
+        {
+          pool_foreach (ses, tsm->sessions, ({
+            if (ses->out2in.addr.as_u32 == addr.as_u32)
+              {
+                vec_add1 (ses_to_be_removed, ses - tsm->sessions);
+                kv.key = ses->in2out.as_u64;
+                clib_bihash_add_del_8_8 (&sm->in2out, &kv, 0);
+                kv.key = ses->out2in.as_u64;
+                clib_bihash_add_del_8_8 (&sm->out2in, &kv, 0);
+                clib_dlist_remove (tsm->list_pool, ses->per_user_index);
+                user_key.addr = ses->in2out.addr;
+                user_key.fib_index = ses->in2out.fib_index;
+                kv.key = user_key.as_u64;
+                if (!clib_bihash_search_8_8 (&sm->user_hash, &kv, &value))
+                  {
+                    u = pool_elt_at_index (tsm->users, value.value);
+                    u->nsessions--;
+                  }
+              }
+          }));
+
+          vec_foreach (ses_index, ses_to_be_removed)
+            pool_put_index (tsm->sessions, ses_index[0]);
+
+          vec_free (ses_to_be_removed);
+       }
+    }
+
+  vec_del1 (sm->addresses, i);
+
+  return 0;
+}
+
+static void increment_v4_address (ip4_address_t * a)
+{
+  u32 v;
+  
+  v = clib_net_to_host_u32(a->as_u32) + 1;
+  a->as_u32 = clib_host_to_net_u32(v);
+}
+
+/**
+ * @brief Add static mapping.
+ *
+ * Create static mapping between local addr+port and external addr+port.
+ *
+ * @param l_addr Local IPv4 address.
+ * @param e_addr External IPv4 address.
+ * @param l_port Local port number.
+ * @param e_port External port number.
+ * @param vrf_id VRF ID.
+ * @param addr_only If 0 address port and pair mapping, otherwise address only.
+ * @param is_add If 0 delete static mapping, otherwise add.
+ *
+ * @returns
+ */
+int snat_add_static_mapping(ip4_address_t l_addr, ip4_address_t e_addr,
+                            u16 l_port, u16 e_port, u32 vrf_id, int addr_only,
+                            int is_add)
+{
+  snat_main_t * sm = &snat_main;
+  snat_static_mapping_t *m;
+  snat_static_mapping_key_t m_key;
+  clib_bihash_kv_8_8_t kv, value;
+  snat_address_t *a = 0;
+  u32 fib_index = ~0;
+  uword * p;
+  int i;
+
+  /* If outside FIB index is not resolved yet */
+  if (sm->outside_fib_index == ~0)
+    {
+      p = hash_get (sm->ip4_main->fib_index_by_table_id, sm->outside_vrf_id);
+      if (!p)
+        return VNET_API_ERROR_NO_SUCH_FIB;
+      sm->outside_fib_index = p[0];
+    }
+
+  m_key.addr = e_addr;
+  m_key.port = addr_only ? 0 : e_port;
+  m_key.fib_index = sm->outside_fib_index;
+  kv.key = m_key.as_u64;
+  if (clib_bihash_search_8_8 (&sm->static_mapping_by_external, &kv, &value))
+    m = 0;
+  else
+    m = pool_elt_at_index (sm->static_mappings, value.value);
+
+  if (is_add)
+    {
+      if (m)
+        return VNET_API_ERROR_VALUE_EXIST;
+
+      /* Convert VRF id to FIB index */
+      if (vrf_id != ~0)
+        {
+          p = hash_get (sm->ip4_main->fib_index_by_table_id, vrf_id);
+          if (!p)
+            return VNET_API_ERROR_NO_SUCH_FIB;
+          fib_index = p[0];
+        }
+      /* If not specified use inside VRF id from SNAT plugin startup config */
+      else
+        {
+          if (sm->inside_fib_index == ~0)
+            {
+              p = hash_get (sm->ip4_main->fib_index_by_table_id, sm->inside_vrf_id);
+              if (!p)
+                return VNET_API_ERROR_NO_SUCH_FIB;
+              fib_index = p[0];
+              sm->inside_fib_index = fib_index;
+            }
+          else
+            fib_index = sm->inside_fib_index;
+
+          vrf_id = sm->inside_vrf_id;
+        }
+
+      /* Find external address in allocated addresses and reserve port for
+         address and port pair mapping when dynamic translations enabled */
+      if (!addr_only && !(sm->static_mapping_only))
+        {
+          for (i = 0; i < vec_len (sm->addresses); i++)
+            {
+              if (sm->addresses[i].addr.as_u32 == e_addr.as_u32)
+                {
+                  a = sm->addresses + i;
+                  /* External port must be unused */
+                  if (clib_bitmap_get_no_check (a->busy_port_bitmap, e_port))
+                    return VNET_API_ERROR_INVALID_VALUE;
+                  clib_bitmap_set_no_check (a->busy_port_bitmap, e_port, 1);
+                  if (e_port > 1024)
+                    a->busy_ports++;
+
+                  break;
+                }
+            }
+          /* External address must be allocated */
+          if (!a)
+            return VNET_API_ERROR_NO_SUCH_ENTRY;
+        }
+
+      pool_get (sm->static_mappings, m);
+      memset (m, 0, sizeof (*m));
+      m->local_addr = l_addr;
+      m->external_addr = e_addr;
+      m->addr_only = addr_only;
+      m->vrf_id = vrf_id;
+      m->fib_index = fib_index;
+      if (!addr_only)
+        {
+          m->local_port = l_port;
+          m->external_port = e_port;
+        }
+
+      m_key.addr = m->local_addr;
+      m_key.port = m->local_port;
+      m_key.fib_index = m->fib_index;
+      kv.key = m_key.as_u64;
+      kv.value = m - sm->static_mappings;
+      clib_bihash_add_del_8_8(&sm->static_mapping_by_local, &kv, 1);
+
+      m_key.addr = m->external_addr;
+      m_key.port = m->external_port;
+      m_key.fib_index = sm->outside_fib_index;
+      kv.key = m_key.as_u64;
+      kv.value = m - sm->static_mappings;
+      clib_bihash_add_del_8_8(&sm->static_mapping_by_external, &kv, 1);
+
+      /* Assign worker */
+      if (sm->workers)
+        {
+          snat_user_key_t w_key0;
+          snat_static_mapping_key_t w_key1;
+
+          w_key0.addr = m->local_addr;
+          w_key0.fib_index = m->fib_index;
+          kv.key = w_key0.as_u64;
+
+          if (clib_bihash_search_8_8 (&sm->worker_by_in, &kv, &value))
+            {
+              kv.value = sm->first_worker_index +
+                sm->workers[sm->next_worker++ % vec_len (sm->workers)];
+
+              clib_bihash_add_del_8_8 (&sm->worker_by_in, &kv, 1);
+            }
+          else
+            {
+              kv.value = value.value;
+            }
+
+          w_key1.addr = m->external_addr;
+          w_key1.port = clib_host_to_net_u16 (m->external_port);
+          w_key1.fib_index = sm->outside_fib_index;
+          kv.key = w_key1.as_u64;
+          clib_bihash_add_del_8_8 (&sm->worker_by_out, &kv, 1);
+        }
+    }
+  else
+    {
+      if (!m)
+        return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+      /* Free external address port */
+      if (!addr_only && !(sm->static_mapping_only))
+        {
+          for (i = 0; i < vec_len (sm->addresses); i++)
+            {
+              if (sm->addresses[i].addr.as_u32 == e_addr.as_u32)
+                {
+                  a = sm->addresses + i;
+                  clib_bitmap_set_no_check (a->busy_port_bitmap, e_port, 0);
+                  a->busy_ports--;
+
+                  break;
+                }
+            }
+        }
+
+      m_key.addr = m->local_addr;
+      m_key.port = m->local_port;
+      m_key.fib_index = m->fib_index;
+      kv.key = m_key.as_u64;
+      clib_bihash_add_del_8_8(&sm->static_mapping_by_local, &kv, 0);
+
+      m_key.addr = m->external_addr;
+      m_key.port = m->external_port;
+      m_key.fib_index = sm->outside_fib_index;
+      kv.key = m_key.as_u64;
+      clib_bihash_add_del_8_8(&sm->static_mapping_by_external, &kv, 0);
+
+      /* Delete session(s) for static mapping if exist */
+      if (!(sm->static_mapping_only) ||
+          (sm->static_mapping_only && sm->static_mapping_connection_tracking))
+        {
+          snat_user_key_t u_key;
+          snat_user_t *u;
+          dlist_elt_t * head, * elt;
+          u32 elt_index, head_index, del_elt_index;
+          u32 ses_index;
+          u64 user_index;
+          snat_session_t * s;
+          snat_main_per_thread_data_t *tsm;
+
+          u_key.addr = m->local_addr;
+          u_key.fib_index = m->fib_index;
+          kv.key = u_key.as_u64;
+          if (!clib_bihash_search_8_8 (&sm->user_hash, &kv, &value))
+            {
+              user_index = value.value;
+              if (!clib_bihash_search_8_8 (&sm->worker_by_in, &kv, &value))
+                tsm = vec_elt_at_index (sm->per_thread_data, value.value);
+              else
+                tsm = vec_elt_at_index (sm->per_thread_data, sm->num_workers);
+              u = pool_elt_at_index (tsm->users, user_index);
+              if (u->nstaticsessions)
+                {
+                  head_index = u->sessions_per_user_list_head_index;
+                  head = pool_elt_at_index (tsm->list_pool, head_index);
+                  elt_index = head->next;
+                  elt = pool_elt_at_index (tsm->list_pool, elt_index);
+                  ses_index = elt->value;
+                  while (ses_index != ~0)
+                    {
+                      s =  pool_elt_at_index (tsm->sessions, ses_index);
+                      del_elt_index = elt_index;
+                      elt_index = elt->next;
+                      elt = pool_elt_at_index (tsm->list_pool, elt_index);
+                      ses_index = elt->value;
+
+                      if (!addr_only)
+                        {
+                          if ((s->out2in.addr.as_u32 != e_addr.as_u32) &&
+                              (clib_net_to_host_u16 (s->out2in.port) != e_port))
+                            continue;
+                        }
+
+                      value.key = s->in2out.as_u64;
+                      clib_bihash_add_del_8_8 (&sm->in2out, &value, 0);
+                      value.key = s->out2in.as_u64;
+                      clib_bihash_add_del_8_8 (&sm->out2in, &value, 0);
+                      pool_put (tsm->sessions, s);
+
+                      clib_dlist_remove (tsm->list_pool, del_elt_index);
+                      pool_put_index (tsm->list_pool, del_elt_index);
+                      u->nstaticsessions--;
+
+                      if (!addr_only)
+                        break;
+                    }
+                  if (addr_only)
+                    {
+                      pool_put (tsm->users, u);
+                      clib_bihash_add_del_8_8 (&sm->user_hash, &kv, 0);
+                    }
+                }
+            }
+        }
+
+      /* Delete static mapping from pool */
+      pool_put (sm->static_mappings, m);
+    }
+
+  return 0;
+}
+
+static int snat_interface_add_del (u32 sw_if_index, u8 is_inside, int is_del)
+{
+  snat_main_t *sm = &snat_main;
+  snat_interface_t *i;
+  const char * feature_name;
+
+  if (sm->static_mapping_only && !(sm->static_mapping_connection_tracking))
+    feature_name = is_inside ?  "snat-in2out-fast" : "snat-out2in-fast";
+  else
+    {
+      if (sm->num_workers > 1)
+        feature_name = is_inside ?  "snat-in2out-worker-handoff" : "snat-out2in-worker-handoff";
+      else
+        feature_name = is_inside ?  "snat-in2out" : "snat-out2in";
+    }
+
+  vnet_feature_enable_disable ("ip4-unicast", feature_name, sw_if_index,
+			       !is_del, 0, 0);
+
+  if (sm->fq_in2out_index == ~0)
+    sm->fq_in2out_index = vlib_frame_queue_main_init (snat_in2out_node.index, 0);
+
+  if (sm->fq_out2in_index == ~0)
+    sm->fq_out2in_index = vlib_frame_queue_main_init (snat_out2in_node.index, 0);
+
+  pool_foreach (i, sm->interfaces,
+  ({
+    if (i->sw_if_index == sw_if_index)
+      {
+        if (is_del)
+          pool_put (sm->interfaces, i);
+        else
+          return VNET_API_ERROR_VALUE_EXIST;
+
+        return 0;
+      }
+  }));
+
+  if (is_del)
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+  pool_get (sm->interfaces, i);
+  i->sw_if_index = sw_if_index;
+  i->is_inside = is_inside;
+
+  return 0;
+}
+
+static int snat_set_workers (uword * bitmap)
+{
+  snat_main_t *sm = &snat_main;
+  int i;
+
+  if (sm->num_workers < 2)
+    return VNET_API_ERROR_FEATURE_DISABLED;
+
+  if (clib_bitmap_last_set (bitmap) >= sm->num_workers)
+    return VNET_API_ERROR_INVALID_WORKER;
+
+  vec_free (sm->workers);
+  clib_bitmap_foreach (i, bitmap,
+    ({
+      vec_add1(sm->workers, i);
+    }));
+
+  return 0;
+}
+
+static void 
+vl_api_snat_add_address_range_t_handler
+(vl_api_snat_add_address_range_t * mp)
+{
+  snat_main_t * sm = &snat_main;
+  vl_api_snat_add_address_range_reply_t * rmp;
+  ip4_address_t this_addr;
+  u32 start_host_order, end_host_order;
+  int i, count;
+  int rv = 0;
+  u32 * tmp;
+
+  if (mp->is_ip4 != 1)
+    {
+      rv = VNET_API_ERROR_UNIMPLEMENTED;
+      goto send_reply;
+    }
+
+  if (sm->static_mapping_only)
+    {
+      rv = VNET_API_ERROR_FEATURE_DISABLED;
+      goto send_reply;
+    }
+
+  tmp = (u32 *) mp->first_ip_address;
+  start_host_order = clib_host_to_net_u32 (tmp[0]);
+  tmp = (u32 *) mp->last_ip_address;
+  end_host_order = clib_host_to_net_u32 (tmp[0]);
+
+  count = (end_host_order - start_host_order) + 1;
+
+  if (count > 1024)
+    clib_warning ("%U - %U, %d addresses...",
+                  format_ip4_address, mp->first_ip_address,
+                  format_ip4_address, mp->last_ip_address,
+                  count);
+  
+  memcpy (&this_addr.as_u8, mp->first_ip_address, 4);
+
+  for (i = 0; i < count; i++)
+    {
+      if (mp->is_add)
+        snat_add_address (sm, &this_addr);
+      else
+        rv = snat_del_address (sm, this_addr);
+
+      if (rv)
+        goto send_reply;
+
+      increment_v4_address (&this_addr);
+    }
+
+ send_reply:
+  REPLY_MACRO (VL_API_SNAT_ADD_ADDRESS_RANGE_REPLY);
+}
+
+static void *vl_api_snat_add_address_range_t_print
+(vl_api_snat_add_address_range_t *mp, void * handle)
+{
+  u8 * s;
+
+  s = format (0, "SCRIPT: snat_add_address_range ");
+  s = format (s, "%U ", format_ip4_address, mp->first_ip_address);
+  if (memcmp (mp->first_ip_address, mp->last_ip_address, 4))
+    {
+      s = format (s, " - %U ", format_ip4_address, mp->last_ip_address);
+    }
+  FINISH;
+}
+
+static void
+send_snat_address_details
+(snat_address_t * a, unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_snat_address_details_t *rmp;
+  snat_main_t * sm = &snat_main;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_SNAT_ADDRESS_DETAILS+sm->msg_id_base);
+  rmp->is_ip4 = 1;
+  clib_memcpy (rmp->ip_address, &(a->addr), 4);
+  rmp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_snat_address_dump_t_handler
+(vl_api_snat_address_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  snat_main_t * sm = &snat_main;
+  snat_address_t * a;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  vec_foreach (a, sm->addresses)
+    send_snat_address_details (a, q, mp->context);
+}
+
+static void *vl_api_snat_address_dump_t_print
+(vl_api_snat_address_dump_t *mp, void * handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: snat_address_dump ");
+
+  FINISH;
+}
+
+static void
+vl_api_snat_interface_add_del_feature_t_handler
+(vl_api_snat_interface_add_del_feature_t * mp)
+{
+  snat_main_t * sm = &snat_main;
+  vl_api_snat_interface_add_del_feature_reply_t * rmp;
+  u8 is_del = mp->is_add == 0;
+  u32 sw_if_index = ntohl(mp->sw_if_index);
+  int rv = 0;
+
+  VALIDATE_SW_IF_INDEX(mp);
+
+  rv = snat_interface_add_del (sw_if_index, mp->is_inside, is_del);
+  
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO(VL_API_SNAT_INTERFACE_ADD_DEL_FEATURE_REPLY);
+}
+
+static void *vl_api_snat_interface_add_del_feature_t_print
+(vl_api_snat_interface_add_del_feature_t * mp, void *handle)
+{
+  u8 * s;
+
+  s = format (0, "SCRIPT: snat_interface_add_del_feature ");
+  s = format (s, "sw_if_index %d %s %s",
+              clib_host_to_net_u32(mp->sw_if_index),
+              mp->is_inside ? "in":"out",
+              mp->is_add ? "" : "del");
+
+  FINISH;
+}
+
+static void
+send_snat_interface_details
+(snat_interface_t * i, unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_snat_interface_details_t *rmp;
+  snat_main_t * sm = &snat_main;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_SNAT_INTERFACE_DETAILS+sm->msg_id_base);
+  rmp->sw_if_index = ntohl (i->sw_if_index);
+  rmp->is_inside = i->is_inside;
+  rmp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_snat_interface_dump_t_handler
+(vl_api_snat_interface_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  snat_main_t * sm = &snat_main;
+  snat_interface_t * i;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  pool_foreach (i, sm->interfaces,
+  ({
+    send_snat_interface_details(i, q, mp->context);
+  }));
+}
+
+static void *vl_api_snat_interface_dump_t_print
+(vl_api_snat_interface_dump_t *mp, void * handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: snat_interface_dump ");
+
+  FINISH;
+}static void
+
+vl_api_snat_add_static_mapping_t_handler
+(vl_api_snat_add_static_mapping_t * mp)
+{
+  snat_main_t * sm = &snat_main;
+  vl_api_snat_add_static_mapping_reply_t * rmp;
+  ip4_address_t local_addr, external_addr;
+  u16 local_port = 0, external_port = 0;
+  u32 vrf_id;
+  int rv = 0;
+
+  if (mp->is_ip4 != 1)
+    {
+      rv = VNET_API_ERROR_UNIMPLEMENTED;
+      goto send_reply;
+    }
+
+  memcpy (&local_addr.as_u8, mp->local_ip_address, 4);
+  memcpy (&external_addr.as_u8, mp->external_ip_address, 4);
+  if (mp->addr_only == 0)
+    {
+      local_port = clib_net_to_host_u16 (mp->local_port);
+      external_port = clib_net_to_host_u16 (mp->external_port);
+    }
+  vrf_id = clib_net_to_host_u32 (mp->vrf_id);
+
+  rv = snat_add_static_mapping(local_addr, external_addr, local_port,
+                               external_port, vrf_id, mp->addr_only,
+                               mp->is_add);
+
+ send_reply:
+  REPLY_MACRO (VL_API_SNAT_ADD_ADDRESS_RANGE_REPLY);
+}
+
+static void *vl_api_snat_add_static_mapping_t_print
+(vl_api_snat_add_static_mapping_t *mp, void * handle)
+{
+  u8 * s;
+
+  s = format (0, "SCRIPT: snat_add_static_mapping ");
+  s = format (s, "local_addr %U external_addr %U ",
+              format_ip4_address, mp->local_ip_address,
+              format_ip4_address, mp->external_ip_address);
+
+  if (mp->addr_only == 0)
+    s = format (s, "local_port %d external_port %d ",
+                clib_net_to_host_u16 (mp->local_port),
+                clib_net_to_host_u16 (mp->external_port));
+
+  if (mp->vrf_id != ~0)
+    s = format (s, "vrf %d", clib_net_to_host_u32 (mp->vrf_id));
+
+  FINISH;
+}
+
+static void
+send_snat_static_mapping_details
+(snat_static_mapping_t * m, unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_snat_static_mapping_details_t *rmp;
+  snat_main_t * sm = &snat_main;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_SNAT_STATIC_MAPPING_DETAILS+sm->msg_id_base);
+  rmp->is_ip4 = 1;
+  rmp->addr_only = m->addr_only;
+  clib_memcpy (rmp->local_ip_address, &(m->local_addr), 4);
+  clib_memcpy (rmp->external_ip_address, &(m->external_addr), 4);
+  rmp->local_port = htons (m->local_port);
+  rmp->external_port = htons (m->external_port);
+  rmp->vrf_id = htonl (m->vrf_id);
+  rmp->context = context;
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_snat_static_mapping_dump_t_handler
+(vl_api_snat_static_mapping_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  snat_main_t * sm = &snat_main;
+  snat_static_mapping_t * m;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  pool_foreach (m, sm->static_mappings,
+  ({
+      send_snat_static_mapping_details (m, q, mp->context);
+  }));
+}
+
+static void *vl_api_snat_static_mapping_dump_t_print
+(vl_api_snat_static_mapping_dump_t *mp, void * handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: snat_static_mapping_dump ");
+
+  FINISH;
+}
+
+static void
+vl_api_snat_control_ping_t_handler
+(vl_api_snat_control_ping_t * mp)
+{
+  vl_api_snat_control_ping_reply_t *rmp;
+  snat_main_t * sm = &snat_main;
+  int rv = 0;
+
+  REPLY_MACRO2(VL_API_SNAT_CONTROL_PING_REPLY,
+  ({
+    rmp->vpe_pid = ntohl (getpid());
+  }));
+}
+
+static void *vl_api_snat_control_ping_t_print
+(vl_api_snat_control_ping_t *mp, void * handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: snat_control_ping ");
+
+  FINISH;
+}
+
+static void
+vl_api_snat_show_config_t_handler
+(vl_api_snat_show_config_t * mp)
+{
+  vl_api_snat_show_config_reply_t *rmp;
+  snat_main_t * sm = &snat_main;
+  int rv = 0;
+
+  REPLY_MACRO2(VL_API_SNAT_SHOW_CONFIG_REPLY,
+  ({
+    rmp->translation_buckets = htonl (sm->translation_buckets);
+    rmp->translation_memory_size = htonl (sm->translation_memory_size);
+    rmp->user_buckets = htonl (sm->user_buckets);
+    rmp->user_memory_size = htonl (sm->user_memory_size);
+    rmp->max_translations_per_user = htonl (sm->max_translations_per_user);
+    rmp->outside_vrf_id = htonl (sm->outside_vrf_id);
+    rmp->inside_vrf_id = htonl (sm->inside_vrf_id);
+    rmp->static_mapping_only = sm->static_mapping_only;
+    rmp->static_mapping_connection_tracking =
+      sm->static_mapping_connection_tracking;
+  }));
+}
+
+static void *vl_api_snat_show_config_t_print
+(vl_api_snat_show_config_t *mp, void * handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: snat_show_config ");
+
+  FINISH;
+}
+
+static void 
+vl_api_snat_set_workers_t_handler
+(vl_api_snat_set_workers_t * mp)
+{
+  snat_main_t * sm = &snat_main;
+  vl_api_snat_set_workers_reply_t * rmp;
+  int rv = 0;
+  uword *bitmap = 0;
+  u64 mask = clib_net_to_host_u64 (mp->worker_mask);
+
+  if (sm->num_workers < 2)
+    {
+      rv = VNET_API_ERROR_FEATURE_DISABLED;
+      goto send_reply;
+    }
+
+  bitmap = clib_bitmap_set_multiple (bitmap, 0, mask, BITS (mask)); 
+  rv = snat_set_workers(bitmap);
+  clib_bitmap_free (bitmap);
+
+ send_reply:
+  REPLY_MACRO (VL_API_SNAT_SET_WORKERS_REPLY);
+}
+
+static void *vl_api_snat_set_workers_t_print
+(vl_api_snat_set_workers_t *mp, void * handle)
+{
+  u8 * s;
+  uword *bitmap = 0;
+  u8 first = 1;
+  int i;
+  u64 mask = clib_net_to_host_u64 (mp->worker_mask);
+
+  s = format (0, "SCRIPT: snat_set_workers ");
+  bitmap = clib_bitmap_set_multiple (bitmap, 0, mask, BITS (mask)); 
+  clib_bitmap_foreach (i, bitmap,
+    ({
+      if (first)
+        s = format (s, "%d", i);
+      else
+        s = format (s, ",%d", i);
+      first = 0;
+    }));
+  clib_bitmap_free (bitmap);
+  FINISH;
+}
+
+static void
+send_snat_worker_details
+(u32 worker_index, unix_shared_memory_queue_t * q, u32 context)
+{
+  vl_api_snat_worker_details_t *rmp;
+  snat_main_t * sm = &snat_main;
+  vlib_worker_thread_t *w =
+    vlib_worker_threads + worker_index + sm->first_worker_index;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_SNAT_WORKER_DETAILS+sm->msg_id_base);
+  rmp->context = context;
+  rmp->worker_index = htonl (worker_index);
+  rmp->lcore_id = htonl (w->lcore_id);
+  strncpy ((char *) rmp->name, (char *) w->name, ARRAY_LEN (rmp->name) - 1);
+
+  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_snat_worker_dump_t_handler
+(vl_api_snat_worker_dump_t * mp)
+{
+  unix_shared_memory_queue_t *q;
+  snat_main_t * sm = &snat_main;
+  u32 * worker_index;
+
+  q = vl_api_client_index_to_input_queue (mp->client_index);
+  if (q == 0)
+    return;
+
+  vec_foreach (worker_index, sm->workers)
+    {
+      send_snat_worker_details(*worker_index, q, mp->context);
+    }
+}
+
+static void *vl_api_snat_worker_dump_t_print
+(vl_api_snat_worker_dump_t *mp, void * handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: snat_worker_dump ");
+
+  FINISH;
+}
+
+/* List of message types that this plugin understands */
+#define foreach_snat_plugin_api_msg                                     \
+_(SNAT_ADD_ADDRESS_RANGE, snat_add_address_range)                       \
+_(SNAT_INTERFACE_ADD_DEL_FEATURE, snat_interface_add_del_feature)       \
+_(SNAT_ADD_STATIC_MAPPING, snat_add_static_mapping)                     \
+_(SNAT_CONTROL_PING, snat_control_ping)                                 \
+_(SNAT_STATIC_MAPPING_DUMP, snat_static_mapping_dump)                   \
+_(SNAT_SHOW_CONFIG, snat_show_config)                                   \
+_(SNAT_ADDRESS_DUMP, snat_address_dump)                                 \
+_(SNAT_INTERFACE_DUMP, snat_interface_dump)                             \
+_(SNAT_SET_WORKERS, snat_set_workers)                                   \
+_(SNAT_WORKER_DUMP, snat_worker_dump)
+
+/* Set up the API message handling tables */
+static clib_error_t *
+snat_plugin_api_hookup (vlib_main_t *vm)
+{
+   snat_main_t * sm __attribute__ ((unused)) = &snat_main;
+#define _(N,n)                                                  \
+    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
+                           #n,					\
+                           vl_api_##n##_t_handler,              \
+                           vl_noop_handler,                     \
+                           vl_api_##n##_t_endian,               \
+                           vl_api_##n##_t_print,                \
+                           sizeof(vl_api_##n##_t), 1); 
+    foreach_snat_plugin_api_msg;
+#undef _
+
+    return 0;
+}
+
+#define vl_msg_name_crc_list
+#include <snat/snat_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+static void
+setup_message_id_table (snat_main_t * sm, api_main_t * am)
+{
+#define _(id,n,crc) \
+  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
+  foreach_vl_msg_name_crc_snat;
+#undef _
+}
+
+static void plugin_custom_dump_configure (snat_main_t * sm) 
+{
+#define _(n,f) sm->api_main->msg_print_handlers \
+  [VL_API_##n + sm->msg_id_base]                \
+    = (void *) vl_api_##f##_t_print;
+  foreach_snat_plugin_api_msg;
+#undef _
+}
+
+static clib_error_t * snat_init (vlib_main_t * vm)
+{
+  snat_main_t * sm = &snat_main;
+  clib_error_t * error = 0;
+  ip4_main_t * im = &ip4_main;
+  ip_lookup_main_t * lm = &im->lookup_main;
+  u8 * name;
+  uword *p;
+  vlib_thread_registration_t *tr;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  uword *bitmap = 0;
+  u32 i;
+
+  name = format (0, "snat_%08x%c", api_version, 0);
+
+  /* Ask for a correctly-sized block of API message decode slots */
+  sm->msg_id_base = vl_msg_api_get_msg_ids 
+      ((char *) name, VL_MSG_FIRST_AVAILABLE);
+
+  sm->vlib_main = vm;
+  sm->vnet_main = vnet_get_main();
+  sm->ip4_main = im;
+  sm->ip4_lookup_main = lm;
+  sm->api_main = &api_main;
+  sm->first_worker_index = 0;
+  sm->next_worker = 0;
+  sm->num_workers = 0;
+  sm->workers = 0;
+  sm->fq_in2out_index = ~0;
+  sm->fq_out2in_index = ~0;
+
+  p = hash_get_mem (tm->thread_registrations_by_name, "workers");
+  if (p)
+    {
+      tr = (vlib_thread_registration_t *) p[0];
+      if (tr)
+        {
+          sm->num_workers = tr->count;
+          sm->first_worker_index = tr->first_index;
+        }
+    }
+
+  /* Use all available workers by default */
+  if (sm->num_workers > 1)
+    {
+      for (i=0; i < sm->num_workers; i++)
+        bitmap = clib_bitmap_set (bitmap, i, 1);
+      snat_set_workers(bitmap);
+      clib_bitmap_free (bitmap);
+    }
+
+  error = snat_plugin_api_hookup (vm);
+
+  /* Add our API messages to the global name_crc hash table */
+  setup_message_id_table (sm, &api_main);
+
+  plugin_custom_dump_configure (sm);
+  vec_free(name);
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (snat_init);
+
+void snat_free_outside_address_and_port (snat_main_t * sm, 
+                                         snat_session_key_t * k, 
+                                         u32 address_index)
+{
+  snat_address_t *a;
+  u16 port_host_byte_order = clib_net_to_host_u16 (k->port);
+  
+  ASSERT (address_index < vec_len (sm->addresses));
+
+  a = sm->addresses + address_index;
+
+  ASSERT (clib_bitmap_get_no_check (a->busy_port_bitmap,
+    port_host_byte_order) == 1);
+
+  clib_bitmap_set_no_check (a->busy_port_bitmap, port_host_byte_order, 0);
+  a->busy_ports--;
+}  
+
+/**
+ * @brief Match SNAT static mapping.
+ *
+ * @param sm          SNAT main.
+ * @param match       Address and port to match.
+ * @param mapping     External or local address and port of the matched mapping.
+ * @param by_external If 0 match by local address otherwise match by external
+ *                    address.
+ *
+ * @returns 0 if match found otherwise 1.
+ */
+int snat_static_mapping_match (snat_main_t * sm,
+                               snat_session_key_t match,
+                               snat_session_key_t * mapping,
+                               u8 by_external)
+{
+  clib_bihash_kv_8_8_t kv, value;
+  snat_static_mapping_t *m;
+  snat_static_mapping_key_t m_key;
+  clib_bihash_8_8_t *mapping_hash = &sm->static_mapping_by_local;
+
+  if (by_external)
+    mapping_hash = &sm->static_mapping_by_external;
+
+  m_key.addr = match.addr;
+  m_key.port = clib_net_to_host_u16 (match.port);
+  m_key.fib_index = match.fib_index;
+
+  kv.key = m_key.as_u64;
+
+  if (clib_bihash_search_8_8 (mapping_hash, &kv, &value))
+    {
+      /* Try address only mapping */
+      m_key.port = 0;
+      kv.key = m_key.as_u64;
+      if (clib_bihash_search_8_8 (mapping_hash, &kv, &value))
+        return 1;
+    }
+
+  m = pool_elt_at_index (sm->static_mappings, value.value);
+
+  if (by_external)
+    {
+      mapping->addr = m->local_addr;
+      /* Address only mapping doesn't change port */
+      mapping->port = m->addr_only ? match.port
+        : clib_host_to_net_u16 (m->local_port);
+      mapping->fib_index = m->fib_index;
+    }
+  else
+    {
+      mapping->addr = m->external_addr;
+      /* Address only mapping doesn't change port */
+      mapping->port = m->addr_only ? match.port
+        : clib_host_to_net_u16 (m->external_port);
+      mapping->fib_index = sm->outside_fib_index;
+    }
+
+  return 0;
+}
+
+int snat_alloc_outside_address_and_port (snat_main_t * sm, 
+                                         snat_session_key_t * k,
+                                         u32 * address_indexp)
+{
+  int i;
+  snat_address_t *a;
+  u32 portnum;
+
+  for (i = 0; i < vec_len (sm->addresses); i++)
+    {
+      if (sm->addresses[i].busy_ports < (65535-1024))
+        {
+          a = sm->addresses + i;
+
+          while (1)
+            {
+              portnum = random_u32 (&sm->random_seed);
+              portnum &= 0xFFFF;
+              if (portnum < 1024)
+                continue;
+              if (clib_bitmap_get_no_check (a->busy_port_bitmap, portnum))
+                continue;
+              clib_bitmap_set_no_check (a->busy_port_bitmap, portnum, 1);
+              a->busy_ports++;
+              /* Caller sets protocol and fib index */
+              k->addr = a->addr;
+              k->port = clib_host_to_net_u16(portnum);
+              *address_indexp = i;
+              return 0;
+            }
+        }
+    }
+  /* Totally out of translations to use... */
+  return 1;
+}
+
+
+static clib_error_t *
+add_address_command_fn (vlib_main_t * vm,
+                        unformat_input_t * input,
+                        vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  snat_main_t * sm = &snat_main;
+  ip4_address_t start_addr, end_addr, this_addr;
+  u32 start_host_order, end_host_order;
+  int i, count;
+  int is_add = 1;
+  int rv = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "%U - %U",
+                    unformat_ip4_address, &start_addr,
+                    unformat_ip4_address, &end_addr))
+        ;
+      else if (unformat (line_input, "%U", unformat_ip4_address, &start_addr))
+        end_addr = start_addr;
+      else if (unformat (line_input, "del"))
+        is_add = 0;
+      else
+        return clib_error_return (0, "unknown input '%U'",
+          format_unformat_error, input);
+     }
+  unformat_free (line_input);
+
+  if (sm->static_mapping_only)
+    return clib_error_return (0, "static mapping only mode");
+
+  start_host_order = clib_host_to_net_u32 (start_addr.as_u32);
+  end_host_order = clib_host_to_net_u32 (end_addr.as_u32);
+  
+  if (end_host_order < start_host_order)
+    return clib_error_return (0, "end address less than start address");
+
+  count = (end_host_order - start_host_order) + 1;
+
+  if (count > 1024)
+    clib_warning ("%U - %U, %d addresses...",
+                  format_ip4_address, &start_addr,
+                  format_ip4_address, &end_addr,
+                  count);
+  
+  this_addr = start_addr;
+
+  for (i = 0; i < count; i++)
+    {
+      if (is_add)
+        snat_add_address (sm, &this_addr);
+      else
+        rv = snat_del_address (sm, this_addr);
+
+      switch (rv)
+        {
+        case VNET_API_ERROR_NO_SUCH_ENTRY:
+          return clib_error_return (0, "S-NAT address not exist.");
+          break;
+        case VNET_API_ERROR_UNSPECIFIED:
+          return clib_error_return (0, "S-NAT address used in static mapping.");
+          break;
+        default:
+          break;
+        }
+
+      increment_v4_address (&this_addr);
+    }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (add_address_command, static) = {
+  .path = "snat add address",
+  .short_help = "snat add addresses <ip4-range-start> [- <ip4-range-end>] [del]",
+  .function = add_address_command_fn,
+};
+
+static clib_error_t *
+snat_feature_command_fn (vlib_main_t * vm,
+                          unformat_input_t * input,
+                          vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  vnet_main_t * vnm = vnet_get_main();
+  clib_error_t * error = 0;
+  u32 sw_if_index;
+  u32 * inside_sw_if_indices = 0;
+  u32 * outside_sw_if_indices = 0;
+  int is_del = 0;
+  int i;
+
+  sw_if_index = ~0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "in %U", unformat_vnet_sw_interface,
+                    vnm, &sw_if_index))
+        vec_add1 (inside_sw_if_indices, sw_if_index);
+      else if (unformat (line_input, "out %U", unformat_vnet_sw_interface,
+                         vnm, &sw_if_index))
+        vec_add1 (outside_sw_if_indices, sw_if_index);
+      else if (unformat (line_input, "del"))
+        is_del = 1;
+      else
+        return clib_error_return (0, "unknown input '%U'",
+          format_unformat_error, input);
+    }
+  unformat_free (line_input);
+
+  if (vec_len (inside_sw_if_indices))
+    {
+      for (i = 0; i < vec_len(inside_sw_if_indices); i++)
+        {
+          sw_if_index = inside_sw_if_indices[i];
+          snat_interface_add_del (sw_if_index, 1, is_del);
+        }
+    }
+
+  if (vec_len (outside_sw_if_indices))
+    {
+      for (i = 0; i < vec_len(outside_sw_if_indices); i++)
+        {
+          sw_if_index = outside_sw_if_indices[i];
+          snat_interface_add_del (sw_if_index, 0, is_del);
+        }
+    }
+
+  vec_free (inside_sw_if_indices);
+  vec_free (outside_sw_if_indices);
+
+  return error;
+}
+
+VLIB_CLI_COMMAND (set_interface_snat_command, static) = {
+  .path = "set interface snat",
+  .function = snat_feature_command_fn,
+  .short_help = "set interface snat in <intfc> out <intfc> [del]",
+};
+
+static clib_error_t *
+add_static_mapping_command_fn (vlib_main_t * vm,
+                               unformat_input_t * input,
+                               vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  clib_error_t * error = 0;
+  ip4_address_t l_addr, e_addr;
+  u32 l_port = 0, e_port = 0, vrf_id = ~0;
+  int is_add = 1;
+  int addr_only = 1;
+  int rv;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "local %U %u", unformat_ip4_address, &l_addr,
+                    &l_port))
+        addr_only = 0;
+      else if (unformat (line_input, "local %U", unformat_ip4_address, &l_addr))
+        ;
+      else if (unformat (line_input, "external %U %u", unformat_ip4_address,
+                         &e_addr, &e_port))
+        addr_only = 0;
+      else if (unformat (line_input, "external %U", unformat_ip4_address,
+                         &e_addr))
+        ;
+      else if (unformat (line_input, "vrf %u", &vrf_id))
+        ;
+      else if (unformat (line_input, "del"))
+        is_add = 0;
+      else
+        return clib_error_return (0, "unknown input: '%U'",
+          format_unformat_error, line_input);
+    }
+  unformat_free (line_input);
+
+  rv = snat_add_static_mapping(l_addr, e_addr, (u16) l_port, (u16) e_port,
+                               vrf_id, addr_only, is_add);
+
+  switch (rv)
+    {
+    case VNET_API_ERROR_INVALID_VALUE:
+      return clib_error_return (0, "External port already in use.");
+      break;
+    case VNET_API_ERROR_NO_SUCH_ENTRY:
+      if (is_add)
+        return clib_error_return (0, "External addres must be allocated.");
+      else
+        return clib_error_return (0, "Mapping not exist.");
+      break;
+    case VNET_API_ERROR_NO_SUCH_FIB:
+      return clib_error_return (0, "No such VRF id.");
+    case VNET_API_ERROR_VALUE_EXIST:
+      return clib_error_return (0, "Mapping already exist.");
+    default:
+      break;
+    }
+
+  return error;
+}
+
+/*?
+ * @cliexpar
+ * @cliexstart{snat add static mapping}
+ * Static mapping allows hosts on the external network to initiate connection
+ * to to the local network host.
+ * To create static mapping between local host address 10.0.0.3 port 6303 and
+ * external address 4.4.4.4 port 3606 use:
+ *  vpp# snat add static mapping local 10.0.0.3 6303 external 4.4.4.4 3606
+ * If not runnig "static mapping only" S-NAT plugin mode use before:
+ *  vpp# snat add address 4.4.4.4
+ * To create static mapping between local and external address use:
+ *  vpp# snat add static mapping local 10.0.0.3 external 4.4.4.4
+ * @cliexend
+?*/
+VLIB_CLI_COMMAND (add_static_mapping_command, static) = {
+  .path = "snat add static mapping",
+  .function = add_static_mapping_command_fn,
+  .short_help =
+    "snat add static mapping local <addr> [<port>] external <addr> [<port>] [vrf <table-id>] [del]",
+};
+
+static clib_error_t *
+set_workers_command_fn (vlib_main_t * vm,
+                        unformat_input_t * input,
+                        vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  uword *bitmap = 0;
+  int rv = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "%U", unformat_bitmap_list, &bitmap))
+        ;
+      else
+        return clib_error_return (0, "unknown input '%U'",
+          format_unformat_error, input);
+     }
+  unformat_free (line_input);
+
+  if (bitmap == 0)
+    return clib_error_return (0, "List of workers must be specified.");
+
+  rv = snat_set_workers(bitmap);
+
+  clib_bitmap_free (bitmap);
+
+  switch (rv)
+    {
+    case VNET_API_ERROR_INVALID_WORKER:
+      return clib_error_return (0, "Invalid worker(s).");
+      break;
+    case VNET_API_ERROR_FEATURE_DISABLED:
+      return clib_error_return (0,
+        "Supported only if 2 or more workes available.");
+      break;
+    default:
+      break;
+    }
+
+  return 0;
+}
+
+/*?
+ * @cliexpar
+ * @cliexstart{set snat workers}
+ * Set SNAT workers if 2 or more workers available, use:
+ *  vpp# set snat workers 0-2,5
+ * @cliexend
+?*/
+VLIB_CLI_COMMAND (set_workers_command, static) = {
+  .path = "set snat workers",
+  .function = set_workers_command_fn,
+  .short_help =
+    "set snat workers <workers-list>",
+};
+
+static clib_error_t *
+snat_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  snat_main_t * sm = &snat_main;
+  u32 translation_buckets = 1024;
+  u32 translation_memory_size = 128<<20;
+  u32 user_buckets = 128;
+  u32 user_memory_size = 64<<20;
+  u32 max_translations_per_user = 100;
+  u32 outside_vrf_id = 0;
+  u32 inside_vrf_id = 0;
+  u32 static_mapping_buckets = 1024;
+  u32 static_mapping_memory_size = 64<<20;
+  u8 static_mapping_only = 0;
+  u8 static_mapping_connection_tracking = 0;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "translation hash buckets %d", &translation_buckets))
+        ;
+      else if (unformat (input, "translation hash memory %d",
+                         &translation_memory_size));
+      else if (unformat (input, "user hash buckets %d", &user_buckets))
+        ;
+      else if (unformat (input, "user hash memory %d",
+                         &user_memory_size))
+        ;
+      else if (unformat (input, "max translations per user %d",
+                         &max_translations_per_user))
+        ;
+      else if (unformat (input, "outside VRF id %d",
+                         &outside_vrf_id))
+        ;
+      else if (unformat (input, "inside VRF id %d",
+                         &inside_vrf_id))
+        ;
+      else if (unformat (input, "static mapping only"))
+        {
+          static_mapping_only = 1;
+          if (unformat (input, "connection tracking"))
+            static_mapping_connection_tracking = 1;
+        }
+      else 
+	return clib_error_return (0, "unknown input '%U'",
+				  format_unformat_error, input);
+    }
+
+  /* for show commands, etc. */
+  sm->translation_buckets = translation_buckets;
+  sm->translation_memory_size = translation_memory_size;
+  sm->user_buckets = user_buckets;
+  sm->user_memory_size = user_memory_size;
+  sm->max_translations_per_user = max_translations_per_user;
+  sm->outside_vrf_id = outside_vrf_id;
+  sm->outside_fib_index = ~0;
+  sm->inside_vrf_id = inside_vrf_id;
+  sm->inside_fib_index = ~0;
+  sm->static_mapping_only = static_mapping_only;
+  sm->static_mapping_connection_tracking = static_mapping_connection_tracking;
+
+  if (!static_mapping_only ||
+      (static_mapping_only && static_mapping_connection_tracking))
+    {
+      clib_bihash_init_8_8 (&sm->worker_by_in, "worker-by-in", user_buckets,
+                            user_memory_size);
+
+      clib_bihash_init_8_8 (&sm->worker_by_out, "worker-by-out", user_buckets,
+                            user_memory_size);
+
+      vec_validate (sm->per_thread_data, tm->n_vlib_mains - 1);
+
+      clib_bihash_init_8_8 (&sm->in2out, "in2out", translation_buckets,
+                            translation_memory_size);
+
+      clib_bihash_init_8_8 (&sm->out2in, "out2in", translation_buckets,
+                            translation_memory_size);
+
+      clib_bihash_init_8_8 (&sm->user_hash, "users", user_buckets,
+                            user_memory_size);
+    }
+  clib_bihash_init_8_8 (&sm->static_mapping_by_local,
+                        "static_mapping_by_local", static_mapping_buckets,
+                        static_mapping_memory_size);
+
+  clib_bihash_init_8_8 (&sm->static_mapping_by_external,
+                        "static_mapping_by_external", static_mapping_buckets,
+                        static_mapping_memory_size);
+  return 0;
+}
+
+VLIB_CONFIG_FUNCTION (snat_config, "snat");
+
+u8 * format_snat_key (u8 * s, va_list * args)
+{
+  snat_session_key_t * key = va_arg (*args, snat_session_key_t *);
+  char * protocol_string = "unknown";
+  static char *protocol_strings[] = {
+      "UDP",
+      "TCP",
+      "ICMP",
+  };
+
+  if (key->protocol < ARRAY_LEN(protocol_strings))
+      protocol_string = protocol_strings[key->protocol];
+
+  s = format (s, "%U proto %s port %d fib %d",
+              format_ip4_address, &key->addr, protocol_string,
+              clib_net_to_host_u16 (key->port), key->fib_index);
+  return s;
+}
+
+u8 * format_snat_session (u8 * s, va_list * args)
+{
+  snat_main_t * sm __attribute__((unused)) = va_arg (*args, snat_main_t *);
+  snat_session_t * sess = va_arg (*args, snat_session_t *);
+
+  s = format (s, "  i2o %U\n", format_snat_key, &sess->in2out);
+  s = format (s, "    o2i %U\n", format_snat_key, &sess->out2in);
+  s = format (s, "       last heard %.2f\n", sess->last_heard);
+  s = format (s, "       total pkts %d, total bytes %lld\n",
+              sess->total_pkts, sess->total_bytes);
+  if (snat_is_session_static (sess))
+    s = format (s, "       static translation\n");
+  else
+    s = format (s, "       dynamic translation\n");
+
+  return s;
+}
+
+u8 * format_snat_user (u8 * s, va_list * args)
+{
+  snat_main_per_thread_data_t * sm = va_arg (*args, snat_main_per_thread_data_t *);
+  snat_user_t * u = va_arg (*args, snat_user_t *);
+  int verbose = va_arg (*args, int);
+  dlist_elt_t * head, * elt;
+  u32 elt_index, head_index;
+  u32 session_index;
+  snat_session_t * sess;
+
+  s = format (s, "%U: %d dynamic translations, %d static translations\n",
+              format_ip4_address, &u->addr, u->nsessions, u->nstaticsessions);
+
+  if (verbose == 0)
+    return s;
+
+  if (u->nsessions || u->nstaticsessions)
+    {
+      head_index = u->sessions_per_user_list_head_index;
+      head = pool_elt_at_index (sm->list_pool, head_index);
+
+      elt_index = head->next;
+      elt = pool_elt_at_index (sm->list_pool, elt_index);
+      session_index = elt->value;
+
+      while (session_index != ~0)
+        {
+          sess = pool_elt_at_index (sm->sessions, session_index);
+
+          s = format (s, "  %U\n", format_snat_session, sm, sess);
+
+          elt_index = elt->next;
+          elt = pool_elt_at_index (sm->list_pool, elt_index);
+          session_index = elt->value;
+        }
+    }
+
+  return s;
+}
+
+u8 * format_snat_static_mapping (u8 * s, va_list * args)
+{
+  snat_static_mapping_t *m = va_arg (*args, snat_static_mapping_t *);
+
+  if (m->addr_only)
+      s = format (s, "local %U external %U vrf %d",
+                  format_ip4_address, &m->local_addr,
+                  format_ip4_address, &m->external_addr,
+                  m->vrf_id);
+  else
+      s = format (s, "local %U:%d external %U:%d vrf %d",
+                  format_ip4_address, &m->local_addr, m->local_port,
+                  format_ip4_address, &m->external_addr, m->external_port,
+                  m->vrf_id);
+
+  return s;
+}
+
+static clib_error_t *
+show_snat_command_fn (vlib_main_t * vm,
+		 unformat_input_t * input,
+		 vlib_cli_command_t * cmd)
+{
+  int verbose = 0;
+  snat_main_t * sm = &snat_main;
+  snat_user_t * u;
+  snat_static_mapping_t *m;
+  snat_interface_t *i;
+  snat_address_t * ap;
+  vnet_main_t *vnm = vnet_get_main();
+  snat_main_per_thread_data_t *tsm;
+  u32 users_num = 0, sessions_num = 0, *worker;
+  uword j = 0;
+
+  if (unformat (input, "detail"))
+    verbose = 1;
+  else if (unformat (input, "verbose"))
+    verbose = 2;
+
+  if (sm->static_mapping_only)
+    {
+      if (sm->static_mapping_connection_tracking)
+        vlib_cli_output (vm, "SNAT mode: static mapping only connection "
+                         "tracking");
+      else
+        vlib_cli_output (vm, "SNAT mode: static mapping only");
+    }
+  else
+    {
+      vlib_cli_output (vm, "SNAT mode: dynamic translations enabled");
+    }
+
+  if (verbose > 0)
+    {
+      pool_foreach (i, sm->interfaces,
+      ({
+        vlib_cli_output (vm, "%U %s", format_vnet_sw_interface_name, vnm,
+                         vnet_get_sw_interface (vnm, i->sw_if_index),
+                         i->is_inside ? "in" : "out");
+      }));
+
+      vec_foreach (ap, sm->addresses)
+        {
+          u8 * s = format (0, "");
+          vlib_cli_output (vm, "%U", format_ip4_address, &ap->addr);
+          clib_bitmap_foreach (j, ap->busy_port_bitmap,
+            ({
+              s = format (s, " %d", j);
+            }));
+          vlib_cli_output (vm, "  %d busy ports:%v", ap->busy_ports, s);
+        }
+    }
+
+  if (sm->num_workers > 1)
+    {
+      vlib_cli_output (vm, "%d workers", vec_len (sm->workers));
+      if (verbose > 0)
+        {
+          vec_foreach (worker, sm->workers)
+            {
+              vlib_worker_thread_t *w =
+                vlib_worker_threads + *worker + sm->first_worker_index;
+              vlib_cli_output (vm, "  %v", w->name);
+            }
+        }
+    }
+
+  if (sm->static_mapping_only && !(sm->static_mapping_connection_tracking))
+    {
+      vlib_cli_output (vm, "%d static mappings",
+                       pool_elts (sm->static_mappings));
+
+      if (verbose > 0)
+        {
+          pool_foreach (m, sm->static_mappings,
+          ({
+            vlib_cli_output (vm, "%U", format_snat_static_mapping, m);
+          }));
+        }
+    }
+  else
+    {
+      vec_foreach (tsm, sm->per_thread_data)
+        {
+          users_num += pool_elts (tsm->users);
+          sessions_num += pool_elts (tsm->sessions);
+        }
+
+      vlib_cli_output (vm, "%d users, %d outside addresses, %d active sessions,"
+                       " %d static mappings",
+                       users_num,
+                       vec_len (sm->addresses),
+                       sessions_num,
+                       pool_elts (sm->static_mappings));
+
+      if (verbose > 0)
+        {
+          vlib_cli_output (vm, "%U", format_bihash_8_8, &sm->in2out,
+                           verbose - 1);
+          vlib_cli_output (vm, "%U", format_bihash_8_8, &sm->out2in,
+                           verbose - 1);
+          vlib_cli_output (vm, "%U", format_bihash_8_8, &sm->worker_by_in,
+                           verbose - 1);
+          vlib_cli_output (vm, "%U", format_bihash_8_8, &sm->worker_by_out,
+                           verbose - 1);
+          vec_foreach_index (j, sm->per_thread_data)
+            {
+              tsm = vec_elt_at_index (sm->per_thread_data, j);
+
+              if (pool_elts (tsm->users) == 0)
+                continue;
+
+              vlib_worker_thread_t *w = vlib_worker_threads + j;
+              vlib_cli_output (vm, "Thread %d (%v at lcore %u):", j, w->name,
+                               w->lcore_id);
+              vlib_cli_output (vm, "  %d list pool elements",
+                               pool_elts (tsm->list_pool));
+
+              pool_foreach (u, tsm->users,
+              ({
+                vlib_cli_output (vm, "  %U", format_snat_user, tsm, u,
+                                 verbose - 1);
+              }));
+            }
+
+          if (pool_elts (sm->static_mappings))
+            {
+              vlib_cli_output (vm, "static mappings:");
+              pool_foreach (m, sm->static_mappings,
+              ({
+                vlib_cli_output (vm, "%U", format_snat_static_mapping, m);
+              }));
+            }
+        }
+    }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (show_snat_command, static) = {
+    .path = "show snat",
+    .short_help = "show snat",
+    .function = show_snat_command_fn,
+};
diff --git a/src/plugins/snat/snat.h b/src/plugins/snat/snat.h
new file mode 100644
index 00000000..cb31dc51
--- /dev/null
+++ b/src/plugins/snat/snat.h
@@ -0,0 +1,259 @@
+
+/*
+ * snat.h - simple nat definitions
+ *
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_snat_h__
+#define __included_snat_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/icmp46_packet.h>
+#include <vnet/api_errno.h>
+#include <vppinfra/bihash_8_8.h>
+#include <vppinfra/dlist.h>
+#include <vppinfra/error.h>
+#include <vlibapi/api.h>
+
+/* Key */
+typedef struct {
+  union 
+  {
+    struct 
+    {
+      ip4_address_t addr;
+      u16 port;
+      u16 protocol:3,
+        fib_index:13;
+    };
+    u64 as_u64;
+  };
+} snat_session_key_t;
+
+typedef struct {
+  union
+  {
+    struct
+    {
+      ip4_address_t addr;
+      u32 fib_index;
+    };
+    u64 as_u64;
+  };
+} snat_user_key_t;
+
+typedef struct {
+  union
+  {
+    struct
+    {
+      ip4_address_t addr;
+      u16 port;
+      u16 fib_index;
+    };
+    u64 as_u64;
+  };
+} snat_static_mapping_key_t;
+
+
+typedef enum {
+  SNAT_PROTOCOL_UDP = 0,
+  SNAT_PROTOCOL_TCP,
+  SNAT_PROTOCOL_ICMP,
+} snat_protocol_t;
+
+
+#define SNAT_SESSION_FLAG_STATIC_MAPPING 1
+
+typedef CLIB_PACKED(struct {
+  snat_session_key_t out2in;    /* 0-15 */
+
+  snat_session_key_t in2out;    /* 16-31 */
+
+  u32 flags;                    /* 32-35 */
+
+  /* per-user translations */
+  u32 per_user_index;           /* 36-39 */
+
+  u32 per_user_list_head_index; /* 40-43 */
+
+  /* Last heard timer */
+  f64 last_heard;               /* 44-51 */
+
+  u64 total_bytes;              /* 52-59 */
+  
+  u32 total_pkts;               /* 60-63 */
+
+  /* Outside address */
+  u32 outside_address_index;    /* 64-67 */
+
+}) snat_session_t;
+
+
+typedef struct {
+  ip4_address_t addr;
+  u32 sessions_per_user_list_head_index;
+  u32 nsessions;
+  u32 nstaticsessions;
+} snat_user_t;
+
+typedef struct {
+  ip4_address_t addr;
+  u32 busy_ports;
+  uword * busy_port_bitmap;
+} snat_address_t;
+
+typedef struct {
+  ip4_address_t local_addr;
+  ip4_address_t external_addr;
+  u16 local_port;
+  u16 external_port;
+  u8 addr_only;
+  u32 vrf_id;
+  u32 fib_index;
+} snat_static_mapping_t;
+
+typedef struct {
+  u32 sw_if_index;
+  u8 is_inside;
+} snat_interface_t;
+
+typedef struct {
+  /* User pool */
+  snat_user_t * users;
+
+  /* Session pool */
+  snat_session_t * sessions;
+
+  /* Pool of doubly-linked list elements */
+  dlist_elt_t * list_pool;
+} snat_main_per_thread_data_t;
+
+typedef struct {
+  /* Main lookup tables */
+  clib_bihash_8_8_t out2in;
+  clib_bihash_8_8_t in2out;
+
+  /* Find-a-user => src address lookup */
+  clib_bihash_8_8_t user_hash;
+
+  /* Non-translated packets worker lookup => src address + VRF */
+  clib_bihash_8_8_t worker_by_in;
+
+  /* Translated packets worker lookup => IP address + port number */
+  clib_bihash_8_8_t worker_by_out;
+
+  u32 num_workers;
+  u32 first_worker_index;
+  u32 next_worker;
+  u32 * workers;
+
+  /* Per thread data */
+  snat_main_per_thread_data_t * per_thread_data;
+
+  /* Find a static mapping by local */
+  clib_bihash_8_8_t static_mapping_by_local;
+
+  /* Find a static mapping by external */
+  clib_bihash_8_8_t static_mapping_by_external;
+
+  /* Static mapping pool */
+  snat_static_mapping_t * static_mappings;
+
+  /* Interface pool */
+  snat_interface_t * interfaces;
+
+  /* Vector of outside addresses */
+  snat_address_t * addresses;
+
+  /* Randomize port allocation order */
+  u32 random_seed;
+
+  /* Worker handoff index */
+  u32 fq_in2out_index;
+  u32 fq_out2in_index;
+
+  /* Config parameters */
+  u8 static_mapping_only;
+  u8 static_mapping_connection_tracking;
+  u32 translation_buckets;
+  u32 translation_memory_size;
+  u32 user_buckets;
+  u32 user_memory_size;
+  u32 max_translations_per_user;
+  u32 outside_vrf_id;
+  u32 outside_fib_index;
+  u32 inside_vrf_id;
+  u32 inside_fib_index;
+
+  /* API message ID base */
+  u16 msg_id_base;
+
+  /* convenience */
+  vlib_main_t * vlib_main;
+  vnet_main_t * vnet_main;
+  ip4_main_t * ip4_main;
+  ip_lookup_main_t * ip4_lookup_main;
+  ethernet_main_t * ethernet_main;  
+  api_main_t * api_main;
+} snat_main_t;
+
+extern snat_main_t snat_main;
+extern vlib_node_registration_t snat_in2out_node;
+extern vlib_node_registration_t snat_out2in_node;
+extern vlib_node_registration_t snat_in2out_fast_node;
+extern vlib_node_registration_t snat_out2in_fast_node;
+extern vlib_node_registration_t snat_in2out_worker_handoff_node;
+extern vlib_node_registration_t snat_out2in_worker_handoff_node;
+
+void snat_free_outside_address_and_port (snat_main_t * sm, 
+                                         snat_session_key_t * k, 
+                                         u32 address_index);
+
+int snat_alloc_outside_address_and_port (snat_main_t * sm, 
+                                         snat_session_key_t * k,
+                                         u32 * address_indexp);
+
+int snat_static_mapping_match (snat_main_t * sm,
+                               snat_session_key_t match,
+                               snat_session_key_t * mapping,
+                               u8 by_external);
+
+format_function_t format_snat_user;
+
+typedef struct {
+  u32 cached_sw_if_index;
+  u32 cached_ip4_address;
+} snat_runtime_t;
+
+/** \brief Check if SNAT session is created from static mapping.
+    @param s SNAT session
+    @return 1 if SNAT session is created from static mapping otherwise 0
+*/
+#define snat_is_session_static(s) s->flags & SNAT_SESSION_FLAG_STATIC_MAPPING
+
+/* 
+ * Why is this here? Because we don't need to touch this layer to
+ * simply reply to an icmp. We need to change id to a unique
+ * value to NAT an echo request/reply.
+ */
+   
+typedef struct {
+  u16 identifier;
+  u16 sequence;
+} icmp_echo_header_t;
+
+#endif /* __included_snat_h__ */
diff --git a/src/plugins/snat/snat_all_api_h.h b/src/plugins/snat/snat_all_api_h.h
new file mode 100644
index 00000000..49017700
--- /dev/null
+++ b/src/plugins/snat/snat_all_api_h.h
@@ -0,0 +1,19 @@
+
+/*
+ * snat_all_api_h.h - skeleton vpp engine plug-in api #include file
+ *
+ * Copyright (c) <current-year> <your-organization>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Include the generated file, see BUILT_SOURCES in Makefile.am */
+#include <snat/snat.api.h>
diff --git a/src/plugins/snat/snat_msg_enum.h b/src/plugins/snat/snat_msg_enum.h
new file mode 100644
index 00000000..2c76fd51
--- /dev/null
+++ b/src/plugins/snat/snat_msg_enum.h
@@ -0,0 +1,31 @@
+
+/*
+ * snat_msg_enum.h - skeleton vpp engine plug-in message enumeration
+ *
+ * Copyright (c) <current-year> <your-organization>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_snat_msg_enum_h
+#define included_snat_msg_enum_h
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum {
+#include <snat/snat_all_api_h.h>
+    /* We'll want to know how many messages IDs we need... */
+    VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif /* included_snat_msg_enum_h */
diff --git a/src/plugins/snat/snat_test.c b/src/plugins/snat/snat_test.c
new file mode 100644
index 00000000..2a003ba6
--- /dev/null
+++ b/src/plugins/snat/snat_test.c
@@ -0,0 +1,602 @@
+
+/*
+ * snat.c - skeleton vpp-api-test plug-in 
+ *
+ * Copyright (c) <current-year> <your-organization>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vat/vat.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vppinfra/error.h>
+#include <vnet/ip/ip.h>
+
+uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
+
+/* Declare message IDs */
+#include <snat/snat_msg_enum.h>
+
+/* define message structures */
+#define vl_typedefs
+#include <snat/snat_all_api_h.h> 
+#undef vl_typedefs
+
+/* declare message handlers for each api */
+
+#define vl_endianfun             /* define message structures */
+#include <snat/snat_all_api_h.h> 
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <snat/snat_all_api_h.h> 
+#undef vl_printfun
+
+/* Get the API version number. */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <snat/snat_all_api_h.h>
+#undef vl_api_version
+
+typedef struct {
+    /* API message ID base */
+    u16 msg_id_base;
+    vat_main_t *vat_main;
+} snat_test_main_t;
+
+snat_test_main_t snat_test_main;
+
+#define foreach_standard_reply_retval_handler   \
+_(snat_add_address_range_reply)                 \
+_(snat_interface_add_del_feature_reply)         \
+_(snat_add_static_mapping_reply)                \
+_(snat_set_workers_reply)
+
+#define _(n)                                            \
+    static void vl_api_##n##_t_handler                  \
+    (vl_api_##n##_t * mp)                               \
+    {                                                   \
+        vat_main_t * vam = snat_test_main.vat_main;   \
+        i32 retval = ntohl(mp->retval);                 \
+        if (vam->async_mode) {                          \
+            vam->async_errors += (retval < 0);          \
+        } else {                                        \
+            vam->retval = retval;                       \
+            vam->result_ready = 1;                      \
+        }                                               \
+    }
+foreach_standard_reply_retval_handler;
+#undef _
+
+/* 
+ * Table of message reply handlers, must include boilerplate handlers
+ * we just generated
+ */
+#define foreach_vpe_api_reply_msg                               \
+_(SNAT_ADD_ADDRESS_RANGE_REPLY, snat_add_address_range_reply)   \
+_(SNAT_INTERFACE_ADD_DEL_FEATURE_REPLY,                         \
+  snat_interface_add_del_feature_reply)                         \
+_(SNAT_ADD_STATIC_MAPPING_REPLY, snat_add_static_mapping_reply) \
+_(SNAT_CONTROL_PING_REPLY, snat_control_ping_reply)             \
+_(SNAT_STATIC_MAPPING_DETAILS, snat_static_mapping_details)     \
+_(SNAT_SHOW_CONFIG_REPLY, snat_show_config_reply)               \
+_(SNAT_ADDRESS_DETAILS, snat_address_details)                   \
+_(SNAT_INTERFACE_DETAILS, snat_interface_details)               \
+_(SNAT_SET_WORKERS_REPLY, snat_set_workers_reply)               \
+_(SNAT_WORKER_DETAILS, snat_worker_details)
+
+/* M: construct, but don't yet send a message */
+#define M(T,t)                                                  \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp));                         \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+#define M2(T,t,n)                                               \
+do {                                                            \
+    vam->result_ready = 0;                                      \
+    mp = vl_msg_api_alloc(sizeof(*mp)+(n));                     \
+    memset (mp, 0, sizeof (*mp));                               \
+    mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
+    mp->client_index = vam->my_client_index;                    \
+} while(0);
+
+/* S: send a message */
+#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
+
+/* W: wait for results, with timeout */
+#define W                                       \
+do {                                            \
+    timeout = vat_time_now (vam) + 1.0;         \
+                                                \
+    while (vat_time_now (vam) < timeout) {      \
+        if (vam->result_ready == 1) {           \
+            return (vam->retval);               \
+        }                                       \
+    }                                           \
+    return -99;                                 \
+} while(0);
+
+static int api_snat_add_address_range (vat_main_t * vam)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  unformat_input_t * i = vam->input;
+  f64 timeout;
+  ip4_address_t start_addr, end_addr;
+  u32 start_host_order, end_host_order;
+  vl_api_snat_add_address_range_t * mp;
+  u8 is_add = 1;
+  int count;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U - %U",
+                    unformat_ip4_address, &start_addr,
+                    unformat_ip4_address, &end_addr))
+        ;
+      else if (unformat (i, "%U", unformat_ip4_address, &start_addr))
+        end_addr = start_addr;
+      else if (unformat (i, "del"))
+        is_add = 0;
+      else
+        {
+          clib_warning("unknown input '%U'", format_unformat_error, i);
+          return -99;
+        }
+    }
+
+  start_host_order = clib_host_to_net_u32 (start_addr.as_u32);
+  end_host_order = clib_host_to_net_u32 (end_addr.as_u32);
+  
+  if (end_host_order < start_host_order)
+    {
+      errmsg ("end address less than start address\n");
+      return -99;
+    }
+
+  count = (end_host_order - start_host_order) + 1;
+
+  if (count > 1024)
+    {
+    errmsg ("%U - %U, %d addresses...\n",
+           format_ip4_address, &start_addr,
+           format_ip4_address, &end_addr,
+           count);
+    }
+  
+  M(SNAT_ADD_ADDRESS_RANGE, snat_add_address_range);
+
+  memcpy (mp->first_ip_address, &start_addr, 4);
+  memcpy (mp->last_ip_address, &end_addr, 4);
+  mp->is_ip4 = 1;
+  mp->is_add = is_add;
+
+  S; W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static int api_snat_interface_add_del_feature (vat_main_t * vam)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  unformat_input_t * i = vam->input;
+  f64 timeout;
+  vl_api_snat_interface_add_del_feature_t * mp;
+  u32 sw_if_index;
+  u8 sw_if_index_set = 0;
+  u8 is_inside = 1; 
+  u8 is_add = 1;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+        sw_if_index_set = 1;
+      else if (unformat (i, "sw_if_index %d", &sw_if_index))
+        sw_if_index_set = 1;
+      else if (unformat (i, "out"))
+        is_inside = 0;
+      else if (unformat (i, "in"))
+        is_inside = 1;
+      else if (unformat (i, "del"))
+        is_add = 0;
+      else
+        {
+          clib_warning("unknown input '%U'", format_unformat_error, i);
+          return -99;
+        }
+    }
+
+  if (sw_if_index_set == 0)
+    {
+      errmsg ("interface / sw_if_index required\n");
+      return -99;
+    }
+
+  M(SNAT_INTERFACE_ADD_DEL_FEATURE, snat_interface_add_del_feature);
+  mp->sw_if_index = ntohl(sw_if_index);
+  mp->is_add = is_add;
+  mp->is_inside = is_inside;
+  
+  S; W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int api_snat_add_static_mapping(vat_main_t * vam)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  unformat_input_t * i = vam->input;
+  f64 timeout;
+  vl_api_snat_add_static_mapping_t * mp;
+  u8 addr_set_n = 0;
+  u8 is_add = 1;
+  u8 addr_only = 1;
+  ip4_address_t local_addr, external_addr;
+  u32 local_port = 0, external_port = 0, vrf_id = ~0;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "local_addr %U", unformat_ip4_address, &local_addr))
+        addr_set_n++;
+      else if (unformat (i, "external_addr %U", unformat_ip4_address,
+                         &external_addr))
+        addr_set_n++;
+      else if (unformat (i, "local_port %u", &local_port))
+        addr_only = 0;
+      else if (unformat (i, "external_port %u", &external_port))
+        addr_only = 0;
+      else if (unformat (i, "vrf %u", &vrf_id))
+        ;
+      else if (unformat (i, "del"))
+        is_add = 0;
+      else
+        {
+          clib_warning("unknown input '%U'", format_unformat_error, i);
+          return -99;
+        }
+    }
+
+  if (addr_set_n != 2)
+    {
+      errmsg ("local_addr and remote_addr required\n");
+      return -99;
+    }
+
+  M(SNAT_ADD_STATIC_MAPPING, snat_add_static_mapping);
+  mp->is_add = is_add;
+  mp->is_ip4 = 1;
+  mp->addr_only = addr_only;
+  mp->local_port = ntohs ((u16) local_port);
+  mp->external_port = ntohs ((u16) external_port);
+  mp->vrf_id = ntohl (vrf_id);
+  memcpy (mp->local_ip_address, &local_addr, 4);
+  memcpy (mp->external_ip_address, &external_addr, 4);
+
+  S; W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static void vl_api_snat_control_ping_reply_t_handler
+  (vl_api_snat_control_ping_reply_t * mp)
+{
+  vat_main_t *vam = &vat_main;
+  i32 retval = ntohl (mp->retval);
+  if (vam->async_mode)
+    {
+      vam->async_errors += (retval < 0);
+    }
+  else
+    {
+      vam->retval = retval;
+      vam->result_ready = 1;
+    }
+}
+
+static void vl_api_snat_static_mapping_details_t_handler
+  (vl_api_snat_static_mapping_details_t *mp)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  vat_main_t *vam = sm->vat_main;
+
+  if (mp->addr_only)
+      fformat (vam->ofp, "%15U%6s%15U%6s%11d\n",
+               format_ip4_address, &mp->local_ip_address, "",
+               format_ip4_address, &mp->external_ip_address, "",
+               ntohl (mp->vrf_id));
+  else
+      fformat (vam->ofp, "%15U%6d%15U%6d%11d\n",
+               format_ip4_address, &mp->local_ip_address,
+               ntohs (mp->local_port),
+               format_ip4_address, &mp->external_ip_address,
+               ntohs (mp->external_port),
+               ntohl (mp->vrf_id));
+
+}
+
+static int api_snat_static_mapping_dump(vat_main_t * vam)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  f64 timeout;
+  vl_api_snat_static_mapping_dump_t * mp;
+
+  if (vam->json_output)
+    {
+      clib_warning ("JSON output not supported for snat_static_mapping_dump");
+      return -99;
+    }
+
+  fformat (vam->ofp, "%21s%21s\n", "local", "external");
+  fformat (vam->ofp, "%15s%6s%15s%6s%11s\n", "address", "port", "address",
+           "port", "vrf");
+
+  M(SNAT_STATIC_MAPPING_DUMP, snat_static_mapping_dump);
+  S;
+  /* Use a control ping for synchronization */
+  {
+    vl_api_snat_control_ping_t *mp;
+    M (SNAT_CONTROL_PING, snat_control_ping);
+    S;
+  }
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static void vl_api_snat_show_config_reply_t_handler
+  (vl_api_snat_show_config_reply_t *mp)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  vat_main_t *vam = sm->vat_main;
+  i32 retval = ntohl (mp->retval);
+
+  if (retval >= 0)
+    {
+      fformat (vam->ofp, "translation hash buckets %d\n",
+               ntohl (mp->translation_buckets));
+      fformat (vam->ofp, "translation hash memory %d\n",
+               ntohl (mp->translation_memory_size));
+      fformat (vam->ofp, "user hash buckets %d\n", ntohl (mp->user_buckets));
+      fformat (vam->ofp, "user hash memory %d\n", ntohl (mp->user_memory_size));
+      fformat (vam->ofp, "max translations per user %d\n",
+               ntohl (mp->max_translations_per_user));
+      fformat (vam->ofp, "outside VRF id %d\n", ntohl (mp->outside_vrf_id));
+      fformat (vam->ofp, "inside VRF id %d\n", ntohl (mp->inside_vrf_id));
+      if (mp->static_mapping_only)
+        {
+          fformat (vam->ofp, "static mapping only");
+          if (mp->static_mapping_connection_tracking)
+            fformat (vam->ofp, " connection tracking");
+          fformat (vam->ofp, "\n");
+        }
+    }
+  vam->retval = retval;
+  vam->result_ready = 1;
+}
+
+static int api_snat_show_config(vat_main_t * vam)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  f64 timeout;
+  vl_api_snat_show_config_t * mp;
+
+  if (vam->json_output)
+    {
+      clib_warning ("JSON output not supported for snat_show_config");
+      return -99;
+    }
+
+  M(SNAT_SHOW_CONFIG, snat_show_config);
+  S; W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static void vl_api_snat_address_details_t_handler
+  (vl_api_snat_address_details_t *mp)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  vat_main_t *vam = sm->vat_main;
+
+  fformat (vam->ofp, "%U\n", format_ip4_address, &mp->ip_address);
+}
+
+static int api_snat_address_dump(vat_main_t * vam)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  f64 timeout;
+  vl_api_snat_address_dump_t * mp;
+
+  if (vam->json_output)
+    {
+      clib_warning ("JSON output not supported for snat_address_dump");
+      return -99;
+    }
+
+  M(SNAT_ADDRESS_DUMP, snat_address_dump);
+  S;
+  /* Use a control ping for synchronization */
+  {
+    vl_api_snat_control_ping_t *mp;
+    M (SNAT_CONTROL_PING, snat_control_ping);
+    S;
+  }
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static void vl_api_snat_interface_details_t_handler
+  (vl_api_snat_interface_details_t *mp)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  vat_main_t *vam = sm->vat_main;
+
+  fformat (vam->ofp, "sw_if_index %d %s\n", ntohl (mp->sw_if_index),
+           mp->is_inside ? "in" : "out");
+}
+
+static int api_snat_interface_dump(vat_main_t * vam)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  f64 timeout;
+  vl_api_snat_interface_dump_t * mp;
+
+  if (vam->json_output)
+    {
+      clib_warning ("JSON output not supported for snat_address_dump");
+      return -99;
+    }
+
+  M(SNAT_INTERFACE_DUMP, snat_interface_dump);
+  S;
+  /* Use a control ping for synchronization */
+  {
+    vl_api_snat_control_ping_t *mp;
+    M (SNAT_CONTROL_PING, snat_control_ping);
+    S;
+  }
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+static int api_snat_set_workers (vat_main_t * vam)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  unformat_input_t * i = vam->input;
+  f64 timeout;
+  vl_api_snat_set_workers_t * mp;
+  uword *bitmap;
+
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "%U", unformat_bitmap_list, &bitmap))
+        ;
+      else
+        {
+          clib_warning("unknown input '%U'", format_unformat_error, i);
+          return -99;
+        }
+    }
+
+  M(SNAT_SET_WORKERS, snat_set_workers);
+  mp->worker_mask = clib_host_to_net_u64 (bitmap[0]);
+
+  S; W;
+
+  /* NOTREACHED */
+  return 0;
+}
+
+static void vl_api_snat_worker_details_t_handler
+  (vl_api_snat_worker_details_t *mp)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  vat_main_t *vam = sm->vat_main;
+
+  fformat (vam->ofp, "worker_index %d (%s at lcore %u)\n",
+           ntohl (mp->worker_index), mp->name, ntohl (mp->lcore_id));
+}
+
+static int api_snat_worker_dump(vat_main_t * vam)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  f64 timeout;
+  vl_api_snat_worker_dump_t * mp;
+
+  if (vam->json_output)
+    {
+      clib_warning ("JSON output not supported for snat_address_dump");
+      return -99;
+    }
+
+  M(SNAT_WORKER_DUMP, snat_worker_dump);
+  S;
+  /* Use a control ping for synchronization */
+  {
+    vl_api_snat_control_ping_t *mp;
+    M (SNAT_CONTROL_PING, snat_control_ping);
+    S;
+  }
+  W;
+  /* NOTREACHED */
+  return 0;
+}
+
+/* 
+ * List of messages that the api test plugin sends,
+ * and that the data plane plugin processes
+ */
+#define foreach_vpe_api_msg                                      \
+_(snat_add_address_range, "<start-addr> [- <end-addr] [del]")    \
+_(snat_interface_add_del_feature,                                \
+  "<intfc> | sw_if_index <id> [in] [out] [del]")                 \
+_(snat_add_static_mapping, "local_addr <ip> external_addr <ip> " \
+  "[local_port <n>] [external_port <n>] [vrf <table-id>] [del]") \
+_(snat_set_workers, "<wokrers_bitmap>")                          \
+_(snat_static_mapping_dump, "")                                  \
+_(snat_show_config, "")                                          \
+_(snat_address_dump, "")                                         \
+_(snat_interface_dump, "")                                       \
+_(snat_worker_dump, "")
+
+void vat_api_hookup (vat_main_t *vam)
+{
+  snat_test_main_t * sm __attribute__((unused)) = &snat_test_main;
+  /* Hook up handlers for replies from the data plane plug-in */
+#define _(N,n)                                                  \
+  vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),       \
+                          #n,                                   \
+                          vl_api_##n##_t_handler,               \
+                          vl_noop_handler,                      \
+                          vl_api_##n##_t_endian,                \
+                          vl_api_##n##_t_print,                 \
+                          sizeof(vl_api_##n##_t), 1); 
+  foreach_vpe_api_reply_msg;
+#undef _
+
+  /* API messages we can send */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+  foreach_vpe_api_msg;
+#undef _    
+    
+  /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+  foreach_vpe_api_msg;
+#undef _
+}
+
+clib_error_t * vat_plugin_register (vat_main_t *vam)
+{
+  snat_test_main_t * sm = &snat_test_main;
+  u8 * name;
+
+  sm->vat_main = vam;
+
+  /* Ask the vpp engine for the first assigned message-id */
+  name = format (0, "snat_%08x%c", api_version, 0);
+  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  if (sm->msg_id_base != (u16) ~0)
+    vat_api_hookup (vam);
+  
+  vec_free(name);
+  
+  return 0;
+}
diff --git a/src/suffix-rules.mk b/src/suffix-rules.mk
index e3eeb922..f97b2276 100644
--- a/src/suffix-rules.mk
+++ b/src/suffix-rules.mk
@@ -18,10 +18,10 @@
 	@echo "  APIGEN  " $@ ;					\
 	mkdir -p `dirname $@` ;					\
 	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
-	| vppapigen --input - --output $@ --show-name $@
+	| vppapigen --input - --output $@ --show-name $@ > /dev/null
 
 %.api.json: %.api
-	@echo "  JSON APIGEN  " $@ ;				\
+	@echo "  JSON API" $@ ;					\
 	mkdir -p `dirname $@` ;					\
 	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
-	| vppapigen --input - --json $@
+	| vppapigen --input - --json $@ > /dev/null
diff --git a/src/tools/g2/configure.ac b/src/tools/g2/configure.ac
deleted file mode 100644
index c8af7747..00000000
--- a/src/tools/g2/configure.ac
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_INIT(g2, 3.0)
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_CHECK_LIB([vppinfra], [clib_mem_get_page_size],,
-        AC_MSG_ERROR([Please install the vpp-lib package]))
-AC_CHECK_HEADER([vppinfra/clib.h],,
-        AC_MSG_ERROR([Please install the vpp-dev package]))
-
-PKG_CHECK_MODULES(g2, gtk+-2.0)
-
-AC_OUTPUT([Makefile])
diff --git a/src/tools/perftool/configure.ac b/src/tools/perftool/configure.ac
deleted file mode 100644
index f4a98697..00000000
--- a/src/tools/perftool/configure.ac
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_INIT(perftool, 2.0)
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_CHECK_LIB([vppinfra], [clib_mem_get_page_size],,
-        AC_MSG_ERROR([Please install the vpp-lib package]))
-AC_CHECK_HEADER([vppinfra/clib.h],,
-        AC_MSG_ERROR([Please install the vpp-dev package]))
-
-AM_PROG_LIBTOOL
-
-AC_OUTPUT([Makefile])
diff --git a/src/tools/vppapigen/configure.ac b/src/tools/vppapigen/configure.ac
deleted file mode 100644
index 16ad59d2..00000000
--- a/src/tools/vppapigen/configure.ac
+++ /dev/null
@@ -1,14 +0,0 @@
-#                                               -*- Autoconf -*-
-# Copyright (c) 2008 by cisco Systems, Inc.
-# All rights reserved.
-# Process this file with autoconf to produce a configure script.
-
-AC_INIT(vppapigen, 1.0)
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_YACC
-
-AC_OUTPUT([Makefile])
diff --git a/src/vpp-api/java/Makefile.am b/src/vpp-api/java/Makefile.am
new file mode 100644
index 00000000..c7051ec1
--- /dev/null
+++ b/src/vpp-api/java/Makefile.am
@@ -0,0 +1,199 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
+
+AM_CFLAGS = -Wall -I${top_srcdir} -I${top_builddir} \
+  -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
+  -I@top_srcdir@/plugins -I@top_builddir@/plugins
+
+AM_LDFLAGS = -module -shared -avoid-version -rpath /none -no-undefined
+
+BUILT_SOURCES =
+bin_PROGRAMS =
+noinst_LTLIBRARIES =
+JAR_FILES =
+CLEANDIRS =
+
+#
+# jvpp-common
+#
+
+noinst_LTLIBRARIES += libjvpp_common.la
+libjvpp_common_la_SOURCES = jvpp-common/jvpp_common.c
+libjvpp_common_la_LDFLAGS =
+
+#
+# jvpp-registry (connection management + plugin registry)
+#
+
+noinst_LTLIBRARIES += libjvpp_registry.la
+
+libjvpp_registry_la_SOURCES = jvpp-registry/jvpp_registry.c
+libjvpp_registry_la_CPPFLAGS = -Ijvpp-registry
+libjvpp_registry_la_LIBAD = libjvpp_common.la
+
+packagedir_jvpp_registry = io/fd/vpp/jvpp
+jvpp_registry_src_files := \
+  $(wildcard @srcdir@/jvpp-registry/$(packagedir_jvpp_registry)/*.java) \
+  $(wildcard @srcdir@/jvpp-registry/$(packagedir_jvpp_registry)/**/*.java)
+
+BUILT_SOURCES += jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h
+CLEANDIRS += jvpp-registry/target
+JAR_FILES += jvpp-registry-$(PACKAGE_VERSION).jar
+
+jvpp_registry_ok = jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h
+
+jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h: $(jvpp_registry_src_files)
+	@echo "  JAPIGEN  $@"
+	@rm -rf jvpp-registry/target
+	@mkdir -p jvpp-registry/target
+	@$(JAVAC) -d jvpp-registry/target $^
+	@$(JAVAH) -force -classpath jvpp-registry/target -d jvpp-registry io.fd.vpp.jvpp.VppJNIConnection
+	@$(JAVAH) -force -classpath jvpp-registry/target -d jvpp-registry io.fd.vpp.jvpp.JVppRegistryImpl
+	@touch jvpp-registry.ok
+
+define japigen
+	@echo "  JAPIGEN  $@"
+	@rm -rf jvpp-$(1)/target
+	@ @srcdir@/jvpp/gen/jvpp_gen.py --plugin_name $(1) --root_dir jvpp-$(1) \
+	  -i $(jvpp_$(1)_json_files) > /dev/null
+	@find jvpp-$(1)/target -name \*.java > jvpp-$(1).files
+	@$(JAVAC) -classpath jvpp-registry/target \
+	  -d jvpp-$(1)/target @jvpp-$(1).files
+	@$(JAVAH) -force \
+	  -classpath jvpp-registry/target:jvpp-$(1)/target \
+	  -d jvpp-$(1) io.fd.vpp.jvpp.$(1).$(2)
+endef
+
+#
+# jvpp-core (Java wrapper for vpe.api)
+#
+noinst_LTLIBRARIES += libjvpp_core.la
+libjvpp_core_la_SOURCES = jvpp-core/jvpp_core.c jvpp-core/jvpp_core_gen.h
+libjvpp_core_la_CPPFLAGS = -Ijvpp-registry -Ijvpp-core
+BUILT_SOURCES += jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h
+
+JAR_FILES += jvpp-core-$(PACKAGE_VERSION).jar
+CLEANDIRS += jvpp-core/target
+jvpp_core_json_files = $(shell find @top_builddir@/vnet/ -type f -name '*.api.json')
+
+jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h: $(jvpp_registry_ok) $(jvpp_core_json_files)
+	$(call japigen,core,JVppCoreImpl)
+
+#
+# ACL Plugin
+#
+if ENABLE_ACL_PLUGIN
+noinst_LTLIBRARIES += libjvpp_acl.la
+libjvpp_acl_la_SOURCES = jvpp-acl/jvpp_acl.c
+libjvpp_acl_la_CPPFLAGS = -Ijvpp-acl
+
+BUILT_SOURCES += jvpp-acl/io_fd_vpp_jvpp_acl_JVppAclImpl.h
+
+JAR_FILES += jvpp-acl-$(PACKAGE_VERSION).jar
+CLEANDIRS += jvpp-acl/target
+
+jvpp_acl_json_files = @top_builddir@/plugins/acl/acl.api.json
+
+jvpp-acl/io_fd_vpp_jvpp_acl_JVppAclImpl.h: $(jvpp_registry_ok) $(jvpp_acl_json_files)
+	$(call japigen,acl,JVppAclImpl)
+endif
+
+#
+# SNAT Plugin
+#
+if ENABLE_SNAT_PLUGIN
+noinst_LTLIBRARIES += libjvpp_snat.la
+libjvpp_snat_la_SOURCES = jvpp-snat/jvpp_snat.c
+libjvpp_snat_la_CPPFLAGS = -Ijvpp-snat
+
+BUILT_SOURCES += jvpp-snat/io_fd_vpp_jvpp_snat_JVppSnatImpl.h
+
+JAR_FILES += jvpp-snat-$(PACKAGE_VERSION).jar
+CLEANDIRS += jvpp-snat/target
+
+jvpp_snat_json_files = @top_builddir@/plugins/snat/snat.api.json
+
+jvpp-snat/io_fd_vpp_jvpp_snat_JVppSnatImpl.h: $(jvpp_registry_ok) $(jvpp_snat_json_files)
+	$(call japigen,snat,JVppSnatImpl)
+endif
+
+#
+# iOAM Trace Plugin
+#
+if ENABLE_IOAM_PLUGIN
+noinst_LTLIBRARIES += libjvpp_ioamtrace.la
+libjvpp_ioamtrace_la_SOURCES = jvpp-ioamtrace/jvpp_ioam_trace.c
+
+BUILT_SOURCES += jvpp-ioamtrace/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h
+JAR_FILES += jvpp-ioamtrace-$(PACKAGE_VERSION).jar
+CLEANDIRS += jvpp-ioamtrace/target
+
+jvpp_ioamtrace_json_files = @top_builddir@/plugins/ioam/lib-trace/trace.api.json
+
+jvpp-ioamtrace/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h: $(jvpp_registry_ok) $(jvpp_ioamtrace_json_files)
+	$(call japigen,ioamtrace,JVppIoamtraceImpl)
+
+#
+# iOAM POT Plugin
+#
+noinst_LTLIBRARIES += libjvpp_ioampot.la
+libjvpp_ioampot_la_SOURCES = jvpp-ioampot/jvpp_ioam_pot.c
+
+BUILT_SOURCES += jvpp-ioampot/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h
+JAR_FILES += jvpp-ioampot-$(PACKAGE_VERSION).jar
+CLEANDIRS += jvpp-ioampot/target
+
+jvpp_ioampot_json_files = @top_builddir@/plugins/ioam/lib-pot/pot.api.json
+
+jvpp-ioampot/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h: $(jvpp_registry_ok) $(jvpp_ioampot_json_files)
+	$(call japigen,ioampot,JVppIoampotImpl)
+
+#
+# iOAM Export Plugin
+#
+noinst_LTLIBRARIES += libjvpp_ioamexport.la
+libjvpp_ioamexport_la_SOURCES = jvpp-ioamexport/jvpp_ioam_export.c
+
+BUILT_SOURCES += jvpp-ioamexport/io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl.h
+JAR_FILES += jvpp-ioamexport-$(PACKAGE_VERSION).jar
+CLEANDIRS += jvpp-ioamexport/target
+
+jvpp_ioamexport_json_files = @top_builddir@/plugins/ioam/export/ioam_export.api.json
+
+jvpp-ioamexport/io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl.h: $(jvpp_registry_ok) $(jvpp_ioamexport_json_files)
+	$(call japigen,ioamexport,JVppIoamexportImpl)
+endif
+
+#
+# JAR creation
+#
+jvpp-%-$(PACKAGE_VERSION).jar: libjvpp_%.la
+	@echo "  JAR      $@"
+	@cp .libs/libjvpp_$*.so jvpp-$*/target
+	@$(JAR) cf $(JARFLAGS) $@ -C jvpp-$*/target .
+
+jardir = $(prefix)/share/java
+jar_DATA = $(JAR_FILES)
+
+all-local: $(JAR_FILES)
+
+#
+# Cleanup
+#
+CLEANFILES = jvpp-registry.ok $(JAR_FILES) $(BUILT_SOURCES)
+
+clean-local:
+	rm -rf $(CLEANDIRS)
diff --git a/src/vpp-api/java/Readme.txt b/src/vpp-api/java/Readme.txt
new file mode 100644
index 00000000..689b9b37
--- /dev/null
+++ b/src/vpp-api/java/Readme.txt
@@ -0,0 +1,236 @@
+= JVpp
+
+JVpp is JNI based Java API for VPP.
+
+== Features
+It is:
+
+* Asynchronous
+* Fully generated
+* Lightweight
+
+== Architecture
+
+=== Plugin support
+
+  /-------------\        /--------------\          /---------------\
+  | JvppPlugin1 +<-------+ JVppRegistry +--------->+ VppConnection |
+  \-------------/  inits \--+-----------/   uses   \---------------/
+                            |
+  /-------------\           |
+  | JvppPlugin2 +<----------+ inits
+  \-------------/           |
+                            |
+  ...                       |
+                            |
+  /----------\              |
+  | JVppCore +<-------------+
+  \----------/
+
+
+VppRegistry opens connection to vpp (VppConnection) and manages jvpp plugins.
+Each plugin needs to be registered in the VppRegistry. Registration involves
+plugin initialization (providing JNI implementation with JVppCallback reference,
+vpp client identifier and vpp shared memory queue address).
+
+API user sends message by calling a method of appropriate plugin interface.
+The call is delegated to JNI implementation provided by the particular plugin.
+When JNI code receives reply, it invokes callback method of JVppCallback
+that corresponds to the received message reply.
+
+=== JVppCore as an example of JVpp plugin architecture
+
+ JVpp Java
+
+  /--------------\             /----------\          /------------\    /------\
+  | JVppRegistry |             | JVppCore |          |  Callbacks |    | DTOs |
+  \----+---------/             \----+-----/          \------+-----/    \------/
+       ^                            ^                       ^
+       | implements                 | implements            | implements
+  /----+--------------\         /---+----------\      /-----+---------\
+  | JVppRegistryImpl* +-------->+ JVppCoreImpl |      |  JVppCallback |
+  \-------+-----------/  inits  \---+----------/      \-------+-------/
+          |                          |                       ^
+          |                          | uses                  | calls back
+          |                          |                       |
+----------|--------------------------|-----------------------|---------------------
+          |                          |                       |
+ C JNI    |                          +-------------------+   |       /-----------------\
+          v                                              |   |   +-->+ jvpp_core_gen.h |
+  /--------+--------\                                    |   |   |   \-----------------/
+  | jpp_registry.c* +---+   /--------+----+----\         |   |   |
+  \-----------------/   |   | << shared lib >> |        /-+--+---+------\
+                        + ->+   jvpp_common*   <--------+  jvpp_core.c* |
+                      uses  \------------------/  uses  \---------------/
+
+
+* Components marked with an asterisk contain manually crafted code, which in addition
+to generated classes form jvpp. Exception applies to Callbacks and DTOs, since there are
+manually crafted marker interfaces in callback and dto package (dto/JVppRequest, dto/JVppReply,
+dto/JVppDump, dto/JVppReplyDump, callback/JVppCallback)
+
+Note: jvpp_core.c calls back the JVppCallback instance with every response. An instance of the
+JVppCallback is provided to jvpp_core.c by JVppRegistryImpl on JVppCoreImpl initialization.
+
+Part of the JVpp is also Future facade. It is asynchronous API returning Future objects
+on top of low level JVpp. It wraps dump reply messages in one DTO using control_ping message
+(provided by JVppRegistry).
+
+
+Future facade
+
+        /----------------\          /---------------\
+        | FutureJVppCore |      +-->+ JVppRegistry* |
+        \-----+----------/      |   \---------------/
+              ^                 |
+              | implements      | uses
+              |                 |
+     /--------+-------------\   |    /------------------------------\
+     | FutureJVppCoreFacade +---+--->+ FutureJVppCoreFacadeCallback |
+     \---------+------------/  uses  \-------+----------------------/
+               |                             |
+---------------|-----------------------------|-------------------------------
+               | uses                        | implements
+JVpp Java      |                             |
+               |                             |
+ /----------\  |                             |
+ | JVppCore +<-+                             |
+ \----+-----/                                |
+      ^                                      |
+      | implements                           v
+ /----+---------\                   /--------+---------------\
+ | JVppCoreImpl |                   | JVppCoreGlobalCallback |
+ \--------------/                   \------------------------/
+
+
+
+Another useful utility of the JVpp is Callback facade. It is asynchronous API
+capable of calling specific callback instance (provided when performing a call)
+per call.
+
+
+Callback facade
+
+        /------------------\          /---------------\
+        | CallbackJVppCore |      +-->+ JVppRegistry* |
+        \-----+------------/      |   \---------------/
+              ^                   |
+              | implements        | uses
+              |                   |
+     /--------+---------------\   |    /--------------------------\
+     | CallbackJVppCoreFacade +---+--->+ CallbackJVppCoreCallback |
+     \---------+--------------/  uses  \-----+--------------------/
+               |                             |
+---------------|-----------------------------|-------------------------------
+               | uses                        | implements
+JVpp Java      |                             |
+               |                             |
+ /----------\  |                             |
+ | JVppCore +<-+                             |
+ \----+-----/                                |
+      ^                                      |
+      | implements                           v
+ /----+---------\                   /----------+-------------\
+ | JVppCoreImpl |                   | JVppCoreGlobalCallback |
+ \--------------/                   \------------------------/
+
+
+== Package structure
+
+* *io.fd.vpp.jvpp* - top level package for generated JVpp interface+ implementation and hand-crafted
+VppConnection interface + implementation - packaged as jvpp-registry-version.jar
+
+* *io.fd.vpp.jvpp.[plugin]* - top level package for generated JVpp interface + implementation
++ plugin's API tests - packaged as jvpp-[plugin]-version.jar
+
+** *dto* - package for DTOs generated from VPP API structures + base/marker hand-crafted interfaces
+(in case of jvpp-registry)
+** *callback* - package for low-level JVpp callbacks and a global callback interface implementing each of
+the low-level JVppcallbacks
+** *future* - package for future based facade on top of JVpp and callbacks
+** *callfacade* - package for callback based facade on top of JVpp and callbacks. Allowing
+users to provide callback per request
+** *test* - package for JVpp standalone tests. Can also serve as samples for JVpp.
+
+C code is structured into modules:
+
+* *jvpp_common* - shared library that provides jvpp_main_t reference used by jvpp_registry and plugins.
+
+* *jvpp_registry* - native library used by JVppRegistryImpl, responsible for:
+
+** VPP connection open/close
+** Rx thread to java thread attach
+** control ping message handling
+
+* *jvpp_core* - native library used by jvpp core plugin:
+** *jvpp_core.c* - contains hand crafted code for core plugin initialization
+** *jvpp_core_gen.h* - contains generated JNI compatible handlers for all requests and replies defined in vpe.api
+
+== Code generators
+All of the required code except the base/marker interfaces is generated using
+simple python2 code generators. The generators use __defs_vpp_papi.py__ input
+file produced by __vppapigen__ from vpe.api file.
+
+=== JNI compatible C code
+Produces __jvpp_[plugin]_gen.h__ file containing JNI compatible handlers for each VPP
+request and reply.
+
+[NOTE]
+====
+Source: jvpp_c_gen.py
+====
+
+=== Request/Reply DTOs
+For all the structures in __defs_vpp_papi.py__ a POJO DTO is produced. Logically,
+there are 4 types of DTOs:
+
+* Request - requests that can be sent to VPP and only a single response is expected
+* DumpRequest - requests that can be sent to VPP and a stream of responses is expected
+* Reply - reply to a simple request or a single response from dump triggered response stream
+* ReplyDump - collection of replies from a single dump request
+* Notifications/Events - Not implemented yet
+
+[NOTE]
+====
+Source: dto_gen.py
+====
+
+=== JVpp
+Produces __JVpp.java__ and __JVppImpl.java__. This is the layer right above JNI compatible C
+code.
+
+[NOTE]
+====
+Source: jvpp_impl_gen.py
+====
+
+=== Callbacks
+Produces callback interface for each VPP reply + a global callback interface called
+__JVpp[plugin]GlobalCallback.java__ aggregating all of the callback interfaces. The JNI
+compatible C code expects only a single instance of this global callback and calls
+it with every reply.
+
+[NOTE]
+====
+Source: callback_gen.py
+====
+
+=== Future facade
+Produces an asynchronous facade on top of JVpp and callbacks, which returns a Future that provides
+matching reply once VPP invocation finishes. Sources produced:
+__FutureJVpp[plugin].java, FutureJVpp[plugin]Facade.java and FutureJVpp[plugin]Callback.java__
+
+[NOTE]
+====
+Source: jvpp_future_facade_gen.py
+====
+
+=== Callback facade
+Similar to future facade, only this facade takes callback objects as part of the invocation
+and the callback is called with result once VPP invocation finishes. Sources produced:
+__CallbackJVpp[plugin].java, CallbackJVpp[plugin]Facade.java and CallbackJVpp[plugin]Callback.java__
+
+[NOTE]
+====
+Source: jvpp_callback_facade_gen.py
+====
diff --git a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/AclExpectedDumpData.java b/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/AclExpectedDumpData.java
new file mode 100644
index 00000000..979edbc4
--- /dev/null
+++ b/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/AclExpectedDumpData.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.acl.test;
+
+
+import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_ADDRESS_2_AS_ARRAY;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_ADDRESS_AS_ARRAY;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_DST_ICMP_TYPE_END;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_DST_ICMP_TYPE_START;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_MAC;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_MAC_MASK;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_PREFIX;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_PREFIX_2;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_SRC_ICMP_TYPE_END;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.FIRST_RULE_SRC_ICMP_TYPE_START;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.ICMP_PROTOCOL;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_ADDRESS_2_AS_ARRAY;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_ADDRESS_AS_ARRAY;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_DST_PORT_RANGE_END;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_DST_PORT_RANGE_START;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_MAC;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_MAC_MASK;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_PREFIX;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_PREFIX_2;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_SRC_PORT_RANGE_END;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.SECOND_RULE_SRC_PORT_RANGE_START;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.UDP_PROTOCOL;
+
+import io.fd.vpp.jvpp.acl.dto.AclDetails;
+import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetails;
+import io.fd.vpp.jvpp.acl.dto.MacipAclDetails;
+import io.fd.vpp.jvpp.acl.types.AclRule;
+import io.fd.vpp.jvpp.acl.types.MacipAclRule;
+import java.util.Arrays;
+
+class AclExpectedDumpData {
+
+    static void verifyMacIpDump(final MacipAclDetails macipAclDetails) {
+        // asserting data create by previous call
+        assertEquals(0, macipAclDetails.aclIndex);
+        assertEquals(2, macipAclDetails.count);
+
+        final MacipAclRule currentIpv4Rule = macipAclDetails.r[0];
+        final MacipAclRule currentIpv6Rule = macipAclDetails.r[1];
+
+        // Comparing one property at the time to better pointer if something is wrong
+        //Ipv4 rule
+        assertEquals(0, currentIpv4Rule.isIpv6);
+        assertEquals(1, currentIpv4Rule.isPermit);
+
+        // cutting expected ipv4 to 4 bytes,vpp sends it as 16 always
+        assertArrays(FIRST_RULE_ADDRESS_AS_ARRAY, Arrays.copyOfRange(currentIpv4Rule.srcIpAddr, 0, 4));
+        assertEquals(FIRST_RULE_PREFIX, currentIpv4Rule.srcIpPrefixLen);
+        assertArrays(FIRST_RULE_MAC, currentIpv4Rule.srcMac);
+        assertArrays(FIRST_RULE_MAC_MASK, currentIpv4Rule.srcMacMask);
+
+        //Ipv6 rule
+        assertEquals(1, currentIpv6Rule.isIpv6);
+        assertEquals(0, currentIpv6Rule.isPermit);
+        assertArrays(SECOND_RULE_ADDRESS_AS_ARRAY, currentIpv6Rule.srcIpAddr);
+        assertEquals(SECOND_RULE_PREFIX, currentIpv6Rule.srcIpPrefixLen);
+        assertArrays(SECOND_RULE_MAC, currentIpv6Rule.srcMac);
+        assertArrays(SECOND_RULE_MAC_MASK, currentIpv6Rule.srcMacMask);
+    }
+
+    static void verifyAclDump(final AclDetails aclDetails) {
+        assertEquals(0, aclDetails.aclIndex);
+        assertEquals(2, aclDetails.count);
+
+        final AclRule currentIpv4Rule = aclDetails.r[0];
+        final AclRule currentIpv6Rule = aclDetails.r[1];
+
+        // Comparing one property at the time to better pointer if something is wrong
+        //Ipv4 rule
+        assertEquals(0, currentIpv4Rule.isIpv6);
+        assertEquals(1, currentIpv4Rule.isPermit);
+
+        // cutting expected ipv4 to 4 bytes,vpp sends it as 16 always
+        assertArrays(FIRST_RULE_ADDRESS_AS_ARRAY, Arrays.copyOfRange(currentIpv4Rule.srcIpAddr, 0, 4));
+        assertEquals(FIRST_RULE_PREFIX, currentIpv4Rule.srcIpPrefixLen);
+        assertArrays(FIRST_RULE_ADDRESS_2_AS_ARRAY, Arrays.copyOfRange(currentIpv4Rule.dstIpAddr, 0, 4));
+        assertEquals(FIRST_RULE_PREFIX_2, currentIpv4Rule.dstIpPrefixLen);
+
+        assertEquals(ICMP_PROTOCOL, currentIpv4Rule.proto);
+        assertEquals(FIRST_RULE_SRC_ICMP_TYPE_START, currentIpv4Rule.srcportOrIcmptypeFirst);
+        assertEquals(FIRST_RULE_SRC_ICMP_TYPE_END, currentIpv4Rule.srcportOrIcmptypeLast);
+        assertEquals(FIRST_RULE_DST_ICMP_TYPE_START, currentIpv4Rule.dstportOrIcmpcodeFirst);
+        assertEquals(FIRST_RULE_DST_ICMP_TYPE_END, currentIpv4Rule.dstportOrIcmpcodeLast);
+
+        assertArrays(SECOND_RULE_ADDRESS_AS_ARRAY, currentIpv6Rule.srcIpAddr);
+        assertEquals(SECOND_RULE_PREFIX, currentIpv6Rule.srcIpPrefixLen);
+        assertArrays(SECOND_RULE_ADDRESS_2_AS_ARRAY, currentIpv6Rule.dstIpAddr);
+        assertEquals(SECOND_RULE_PREFIX_2, currentIpv6Rule.dstIpPrefixLen);
+
+        assertEquals(UDP_PROTOCOL, currentIpv6Rule.proto);
+        assertEquals(SECOND_RULE_SRC_PORT_RANGE_START, currentIpv6Rule.srcportOrIcmptypeFirst);
+        assertEquals(SECOND_RULE_SRC_PORT_RANGE_END, currentIpv6Rule.srcportOrIcmptypeLast);
+        assertEquals(SECOND_RULE_DST_PORT_RANGE_START, currentIpv6Rule.dstportOrIcmpcodeFirst);
+        assertEquals(SECOND_RULE_DST_PORT_RANGE_END, currentIpv6Rule.dstportOrIcmpcodeLast);
+    }
+
+    static void verifyAclInterfaceList(final AclInterfaceListDetails aclInterfaceListDetails) {
+        assertEquals(1, aclInterfaceListDetails.count);
+        assertEquals(1, aclInterfaceListDetails.acls[0]);
+        assertEquals(0, aclInterfaceListDetails.nInput);
+        assertEquals(0, aclInterfaceListDetails.swIfIndex);
+    }
+
+    private static void assertArrays(final byte[] expected, final byte[] actual) {
+        if (!Arrays.equals(expected, actual)) {
+            throw new IllegalArgumentException(
+                    String.format("Expected[%s]/Actual[%s]", Arrays.toString(expected), Arrays.toString(actual)));
+        }
+    }
+
+    private static void assertEquals(final int expected, final int actual) {
+        if (expected != actual) {
+            throw new IllegalArgumentException(String.format("Expected[%s]/Actual[%s]", expected, actual));
+        }
+    }
+}
diff --git a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/AclTestData.java b/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/AclTestData.java
new file mode 100644
index 00000000..5d228eea
--- /dev/null
+++ b/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/AclTestData.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.acl.test;
+
+
+import io.fd.vpp.jvpp.acl.types.AclRule;
+import io.fd.vpp.jvpp.acl.types.MacipAclRule;
+
+class AclTestData {
+
+    static final byte[] FIRST_RULE_ADDRESS_AS_ARRAY = {-64, -88, 2, 1};
+    static final byte[] FIRST_RULE_ADDRESS_2_AS_ARRAY = {-64, -88, 2, 3};
+    static final byte[] SECOND_RULE_ADDRESS_AS_ARRAY =
+            {32, 1, 13, -72, 10, 11, 18, -16, 0, 0, 0, 0, 0, 0, 0, 1};
+    static final byte[] SECOND_RULE_ADDRESS_2_AS_ARRAY =
+            {32, 1, 13, -72, 10, 11, 18, -16, 0, 0, 0, 0, 0, 0, 0, 1};
+    static final byte[] FIRST_RULE_MAC = {11, 11, 11, 11, 11, 11};
+    static final byte[] FIRST_RULE_MAC_MASK = {0, 0, 0, 0, 0, 0};
+    static final byte[] SECOND_RULE_MAC = {11, 12, 11, 11, 12, 11};
+    static final byte[] SECOND_RULE_MAC_MASK = {(byte) 170, 0, 0, 0, 0, 0};
+    static final int FIRST_RULE_PREFIX = 32;
+    static final int FIRST_RULE_PREFIX_2 = 24;
+    static final int SECOND_RULE_PREFIX = 64;
+    static final int SECOND_RULE_PREFIX_2 = 62;
+    static final int FIRST_RULE_DST_ICMP_TYPE_START = 0;
+    static final int FIRST_RULE_DST_ICMP_TYPE_END = 8;
+    static final int FIRST_RULE_SRC_ICMP_TYPE_START = 1;
+    static final int FIRST_RULE_SRC_ICMP_TYPE_END = 7;
+    static final int ICMP_PROTOCOL = 1;
+    static final int SECOND_RULE_DST_PORT_RANGE_START = 2000;
+    static final int SECOND_RULE_DST_PORT_RANGE_END = 6000;
+    static final int SECOND_RULE_SRC_PORT_RANGE_START = 400;
+    static final int SECOND_RULE_SRC_PORT_RANGE_END = 2047;
+    static final int UDP_PROTOCOL = 17;
+
+
+    static MacipAclRule[] createMacipRules() {
+        MacipAclRule ruleOne = new MacipAclRule();
+        ruleOne.isIpv6 = 0;
+        ruleOne.isPermit = 1;
+        ruleOne.srcIpAddr = FIRST_RULE_ADDRESS_AS_ARRAY;
+        ruleOne.srcIpPrefixLen = FIRST_RULE_PREFIX;
+        ruleOne.srcMac = FIRST_RULE_MAC;
+        ruleOne.srcMacMask = FIRST_RULE_MAC_MASK;// no mask
+
+        MacipAclRule ruleTwo = new MacipAclRule();
+        ruleTwo.isIpv6 = 1;
+        ruleTwo.isPermit = 0;
+        ruleTwo.srcIpAddr = SECOND_RULE_ADDRESS_AS_ARRAY;
+        ruleTwo.srcIpPrefixLen = SECOND_RULE_PREFIX;
+        ruleTwo.srcMac = SECOND_RULE_MAC;
+        ruleTwo.srcMacMask = SECOND_RULE_MAC_MASK;
+
+        return new MacipAclRule[]{ruleOne, ruleTwo};
+    }
+
+    static AclRule[] createAclRules() {
+        AclRule ruleOne = new AclRule();
+
+        ruleOne.isIpv6 = 0;
+        ruleOne.isPermit = 1;
+        ruleOne.srcIpAddr = FIRST_RULE_ADDRESS_AS_ARRAY;
+        ruleOne.srcIpPrefixLen = FIRST_RULE_PREFIX;
+        ruleOne.dstIpAddr = FIRST_RULE_ADDRESS_2_AS_ARRAY;
+        ruleOne.dstIpPrefixLen = FIRST_RULE_PREFIX_2;
+        ruleOne.dstportOrIcmpcodeFirst = FIRST_RULE_DST_ICMP_TYPE_START;
+        ruleOne.dstportOrIcmpcodeLast = FIRST_RULE_DST_ICMP_TYPE_END;
+        ruleOne.srcportOrIcmptypeFirst = FIRST_RULE_SRC_ICMP_TYPE_START;
+        ruleOne.srcportOrIcmptypeLast = FIRST_RULE_SRC_ICMP_TYPE_END;
+        ruleOne.proto = ICMP_PROTOCOL; //ICMP
+
+        AclRule ruleTwo = new AclRule();
+        ruleTwo.isIpv6 = 1;
+        ruleTwo.isPermit = 0;
+        ruleTwo.srcIpAddr = SECOND_RULE_ADDRESS_AS_ARRAY;
+        ruleTwo.srcIpPrefixLen = SECOND_RULE_PREFIX;
+        ruleTwo.dstIpAddr = SECOND_RULE_ADDRESS_2_AS_ARRAY;
+        ruleTwo.dstIpPrefixLen = SECOND_RULE_PREFIX_2;
+        ruleTwo.dstportOrIcmpcodeFirst = SECOND_RULE_DST_PORT_RANGE_START;
+        ruleTwo.dstportOrIcmpcodeLast = SECOND_RULE_DST_PORT_RANGE_END;
+        ruleTwo.srcportOrIcmptypeFirst = SECOND_RULE_SRC_PORT_RANGE_START;
+        ruleTwo.srcportOrIcmptypeLast = SECOND_RULE_SRC_PORT_RANGE_END;
+        ruleTwo.proto = UDP_PROTOCOL; //UDP
+
+        return new AclRule[]{ruleOne, ruleTwo};
+    }
+}
diff --git a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/AclTestRequests.java b/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/AclTestRequests.java
new file mode 100644
index 00000000..b580ee8c
--- /dev/null
+++ b/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/AclTestRequests.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.acl.test;
+
+import static io.fd.vpp.jvpp.acl.test.AclTestData.createAclRules;
+import static io.fd.vpp.jvpp.acl.test.AclTestData.createMacipRules;
+
+import io.fd.vpp.jvpp.VppInvocationException;
+import io.fd.vpp.jvpp.acl.dto.AclAddReplace;
+import io.fd.vpp.jvpp.acl.dto.AclAddReplaceReply;
+import io.fd.vpp.jvpp.acl.dto.AclDel;
+import io.fd.vpp.jvpp.acl.dto.AclDelReply;
+import io.fd.vpp.jvpp.acl.dto.AclDetailsReplyDump;
+import io.fd.vpp.jvpp.acl.dto.AclDump;
+import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump;
+import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDump;
+import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclList;
+import io.fd.vpp.jvpp.acl.dto.AclInterfaceSetAclListReply;
+import io.fd.vpp.jvpp.acl.dto.MacipAclAdd;
+import io.fd.vpp.jvpp.acl.dto.MacipAclAddReply;
+import io.fd.vpp.jvpp.acl.dto.MacipAclDel;
+import io.fd.vpp.jvpp.acl.dto.MacipAclDelReply;
+import io.fd.vpp.jvpp.acl.dto.MacipAclDetailsReplyDump;
+import io.fd.vpp.jvpp.acl.dto.MacipAclDump;
+import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
+import java.util.concurrent.ExecutionException;
+
+class AclTestRequests {
+
+    static MacipAclDetailsReplyDump sendMacIpDumpRequest(final FutureJVppAclFacade jvpp)
+            throws ExecutionException, InterruptedException {
+        System.out.println("Sending MacipAclDump request...");
+        MacipAclDetailsReplyDump dump = jvpp.macipAclDump(new MacipAclDump()).toCompletableFuture().get();
+        System.out.println("MacipAclDump returned");
+        return dump;
+    }
+
+    static void sendMacIpAddRequest(final FutureJVppAclFacade jvpp) throws InterruptedException, ExecutionException {
+        final MacipAclAdd request = createMacIpAddRequest();
+        System.out.printf("Sending MacipAclAdd request %s%n", request.toString());
+        final MacipAclAddReply reply = jvpp.macipAclAdd(createMacIpAddRequest()).toCompletableFuture().get();
+        System.out.printf("MacipAclAdd send result = %s%n", reply);
+    }
+
+    static void sendMacIpDelRequest(final FutureJVppAclFacade jvpp) throws InterruptedException, ExecutionException {
+        final MacipAclDel request = new MacipAclDel();
+        request.aclIndex = 0;
+        System.out.printf("Sending MacipAclDel request %s%n", request.toString());
+        final MacipAclDelReply reply = jvpp.macipAclDel(request).toCompletableFuture().get();
+        System.out.printf("MacipAclDel send result = %s%n", reply);
+    }
+
+    static void sendAclAddRequest(final FutureJVppAclFacade jvpp) throws InterruptedException, ExecutionException {
+        final AclAddReplace request = createAclAddRequest();
+        System.out.printf("Sending AclAddReplace request %s%n", request.toString());
+        final AclAddReplaceReply reply = jvpp.aclAddReplace(request).toCompletableFuture().get();
+        System.out.printf("AclAddReplace send result = %s%n", reply);
+    }
+
+    static AclDetailsReplyDump sendAclDumpRequest(final FutureJVppAclFacade jvpp)
+            throws InterruptedException, VppInvocationException, ExecutionException {
+        System.out.println("Sending AclDump request...");
+        final AclDetailsReplyDump dump = jvpp.aclDump(new AclDump()).toCompletableFuture().get();
+        System.out.printf("AclDump send result = %s%n", dump);
+        return dump;
+    }
+
+    static void sendAclDelRequest(final FutureJVppAclFacade jvpp) throws InterruptedException, ExecutionException {
+        final AclDel request = new AclDel();
+        request.aclIndex = 0;
+        System.out.printf("Sending AclDel request %s%n", request.toString());
+        final AclDelReply reply = jvpp.aclDel(request).toCompletableFuture().get();
+        System.out.printf("AclDel send result = %s%n", reply);
+    }
+
+    static AclInterfaceListDetailsReplyDump sendAclInterfaceListDumpRequest(final FutureJVppAclFacade jvpp)
+            throws InterruptedException, ExecutionException {
+        final AclInterfaceListDump request = new AclInterfaceListDump();
+        request.swIfIndex = 0;
+        System.out.printf("Sending AclInterfaceListDump request %s%n", request.toString());
+        final AclInterfaceListDetailsReplyDump dump = jvpp.aclInterfaceListDump(request).toCompletableFuture().get();
+        System.out.printf("AclInterfaceListDump send result = %s%n", dump);
+        return dump;
+    }
+
+    static void sendAclInterfaceSetAclList(final FutureJVppAclFacade jvpp)
+            throws InterruptedException, ExecutionException {
+        final AclInterfaceSetAclList request = new AclInterfaceSetAclList();
+        request.count = 1;
+        request.acls = new int[]{1};
+        request.swIfIndex = 0;
+        request.nInput = 0;
+        System.out.printf("Sending AclInterfaceSetAclList request %s%n", request.toString());
+        final AclInterfaceSetAclListReply reply = jvpp.aclInterfaceSetAclList(request).toCompletableFuture().get();
+        System.out.printf("AclInterfaceSetAclList send result = %s%n", reply);
+    }
+
+    static void sendAclInterfaceDeleteList(final FutureJVppAclFacade jvpp)
+            throws InterruptedException, ExecutionException {
+        // uses same api but sets list to empty
+        final AclInterfaceSetAclList request = new AclInterfaceSetAclList();
+        request.count = 0;
+        request.acls = new int[]{};
+        request.swIfIndex = 0;
+        request.nInput = 0;
+        System.out.printf("Sending AclInterfaceSetAclList(Delete) request %s%n", request.toString());
+        final AclInterfaceSetAclListReply reply = jvpp.aclInterfaceSetAclList(request).toCompletableFuture().get();
+        System.out.printf("AclInterfaceSetAclList(Delete) send result = %s%n", reply);
+    }
+
+    private static MacipAclAdd createMacIpAddRequest() {
+        MacipAclAdd request = new MacipAclAdd();
+
+        request.count = 2;
+        request.r = createMacipRules();
+        return request;
+    }
+
+    private static AclAddReplace createAclAddRequest() {
+        AclAddReplace request = new AclAddReplace();
+
+        request.aclIndex = -1;// to define new one
+        request.count = 2;
+        request.r = createAclRules();
+        return request;
+    }
+}
diff --git a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/FutureApiTest.java b/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/FutureApiTest.java
new file mode 100644
index 00000000..94490193
--- /dev/null
+++ b/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/FutureApiTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.acl.test;
+
+import static io.fd.vpp.jvpp.acl.test.AclExpectedDumpData.verifyAclDump;
+import static io.fd.vpp.jvpp.acl.test.AclExpectedDumpData.verifyAclInterfaceList;
+import static io.fd.vpp.jvpp.acl.test.AclExpectedDumpData.verifyMacIpDump;
+import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendAclAddRequest;
+import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendAclDelRequest;
+import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendAclDumpRequest;
+import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendAclInterfaceDeleteList;
+import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendAclInterfaceListDumpRequest;
+import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendAclInterfaceSetAclList;
+import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendMacIpAddRequest;
+import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendMacIpDelRequest;
+import static io.fd.vpp.jvpp.acl.test.AclTestRequests.sendMacIpDumpRequest;
+
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.acl.JVppAclImpl;
+import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
+
+public class FutureApiTest {
+
+    public static void main(String[] args) throws Exception {
+        testCallbackApi();
+    }
+
+    private static void testCallbackApi() throws Exception {
+        System.out.println("Testing Java callback API for acl plugin");
+        try (final JVppRegistry registry = new JVppRegistryImpl("macipAclAddTest");
+             final FutureJVppAclFacade jvpp = new FutureJVppAclFacade(registry, new JVppAclImpl())) {
+
+            // adds,dump and verifies  Mac-Ip acl
+            sendMacIpAddRequest(jvpp);
+            verifyMacIpDump(sendMacIpDumpRequest(jvpp).macipAclDetails.get(0));
+
+            // adds,dumps and verifies Acl acl
+            sendAclAddRequest(jvpp);
+            verifyAclDump(sendAclDumpRequest(jvpp).aclDetails.get(0));
+
+            // adds,dumps and verifies Interface for acl
+            sendAclInterfaceSetAclList(jvpp);
+            verifyAclInterfaceList(sendAclInterfaceListDumpRequest(jvpp).aclInterfaceListDetails.get(0));
+
+            // deletes all created data
+            sendAclInterfaceDeleteList(jvpp);
+            sendAclDelRequest(jvpp);
+            sendMacIpDelRequest(jvpp);
+
+            System.out.println("Disconnecting...");
+        }
+    }
+}
diff --git a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/Readme.txt b/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/Readme.txt
new file mode 100644
index 00000000..f68e7aba
--- /dev/null
+++ b/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/Readme.txt
@@ -0,0 +1 @@
+sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-17.01.jar:build-vpp-native/plugins/acl-plugin/jvpp-acl-1.0.jar io.fd.vpp.jvpp.acl.test.FutureApiTest
diff --git a/src/vpp-api/java/jvpp-acl/jvpp_acl.c b/src/vpp-api/java/jvpp-acl/jvpp_acl.c
new file mode 100644
index 00000000..d56abe3d
--- /dev/null
+++ b/src/vpp-api/java/jvpp-acl/jvpp_acl.c
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+
+#include <acl/acl_msg_enum.h>
+#define vl_typedefs             /* define message structures */
+#include <acl/acl_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun
+#include <acl/acl_all_api_h.h>
+#undef vl_endianfun
+
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <acl/acl_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <acl/acl_all_api_h.h>
+#undef vl_api_version
+
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#if VPPJNI_DEBUG == 1
+  #define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
+#else
+  #define DEBUG_LOG(...)
+#endif
+
+#include <jvpp-common/jvpp_common.h>
+
+#include "jvpp-acl/io_fd_vpp_jvpp_acl_JVppAclImpl.h"
+#include "jvpp_acl.h"
+#include "jvpp-acl/jvpp_acl_gen.h"
+
+/*
+ * Class:     io_fd_vpp_jvpp_acl_JVppaclImpl
+ * Method:    init0
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_acl_JVppAclImpl_init0
+  (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
+  acl_main_t * plugin_main = &acl_main;
+  u8 * name;
+  clib_warning ("Java_io_fd_vpp_jvpp_acl_JVppAclImpl_init0");
+
+  plugin_main->my_client_index = my_client_index;
+  plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
+
+  name = format (0, "acl_%08x%c", api_version, 0);
+  plugin_main->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  if (plugin_main->msg_id_base == (u16) ~0) {
+    jclass exClass = (*env)->FindClass(env, "java/lang/IllegalStateException");
+    (*env)->ThrowNew(env, exClass, "acl plugin is not loaded in VPP");
+  } else {
+    plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
+    plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
+
+    #define _(N,n)                                  \
+        vl_msg_api_set_handlers(VL_API_##N + plugin_main->msg_id_base, #n,     \
+                vl_api_##n##_t_handler,             \
+                vl_noop_handler,                    \
+                vl_api_##n##_t_endian,              \
+                vl_api_##n##_t_print,               \
+                sizeof(vl_api_##n##_t), 1);
+        foreach_api_reply_handler;
+    #undef _
+  }
+}
+
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_acl_JVppAclImpl_close0
+(JNIEnv *env, jclass clazz) {
+  acl_main_t * plugin_main = &acl_main;
+
+    // cleanup:
+    (*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
+    (*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
+
+    plugin_main->callbackClass = NULL;
+    plugin_main->callbackObject = NULL;
+}
+
+/* Attach thread to JVM and cache class references when initiating JVPP ACL */
+jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+    JNIEnv* env;
+
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+        return JNI_EVERSION;
+    }
+
+    if (cache_class_references(env) != 0) {
+        clib_warning ("Failed to cache class references\n");
+        return JNI_ERR;
+    }
+
+    return JNI_VERSION_1_8;
+}
+
+/* Clean up cached references when disposing JVPP ACL */
+void JNI_OnUnload(JavaVM *vm, void *reserved) {
+    JNIEnv* env;
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+        return;
+    }
+    delete_class_references(env);
+}
diff --git a/src/vpp-api/java/jvpp-acl/jvpp_acl.h b/src/vpp-api/java/jvpp-acl/jvpp_acl.h
new file mode 100644
index 00000000..2b73d672
--- /dev/null
+++ b/src/vpp-api/java/jvpp-acl/jvpp_acl.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_jvpp_acl_h__
+#define __included_jvpp_acl_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <jni.h>
+
+/* Global state for JVPP-acl */
+typedef struct {
+    /* Base message index for the acl plugin */
+    u16 msg_id_base;
+
+    /* Pointer to shared memory queue */
+    unix_shared_memory_queue_t * vl_input_queue;
+
+    /* VPP api client index */
+    u32 my_client_index;
+
+    /* Callback object and class references enabling asynchronous Java calls */
+    jobject callbackObject;
+    jclass callbackClass;
+
+} acl_main_t;
+
+acl_main_t acl_main __attribute__((aligned (64)));
+
+
+#endif /* __included_jvpp_acl_h__ */
diff --git a/src/vpp-api/java/jvpp-common/jvpp_common.c b/src/vpp-api/java/jvpp-common/jvpp_common.c
new file mode 100644
index 00000000..a161c09c
--- /dev/null
+++ b/src/vpp-api/java/jvpp-common/jvpp_common.c
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define _GNU_SOURCE /* for strcasestr(3) */
+
+#include "jvpp_common.h"
+
+#ifndef JVPP_DEBUG
+#define JVPP_DEBUG 0
+#endif
+
+#if JVPP_DEBUG == 1
+#define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
+#else
+#define DEBUG_LOG(...)
+#endif
+
+/* shared jvpp main structure */
+jvpp_main_t jvpp_main __attribute__((aligned (64)));
+
+void call_on_error(const char* callName, int contextId, int retval,
+        jclass callbackClass, jobject callbackObject,
+        jclass callbackExceptionClass) {
+    DEBUG_LOG("\nCallOnError : callback=%s, retval=%d, context=%d\n", callName,
+            clib_net_to_host_u32(retval), clib_net_to_host_u32(context));
+    JNIEnv *env = jvpp_main.jenv;
+    if (!callbackClass) {
+        DEBUG_LOG("CallOnError : jm->callbackClass is null!\n");
+        return;
+    }
+    jmethodID excConstructor = (*env)->GetMethodID(env, callbackExceptionClass,
+            "<init>", "(Ljava/lang/String;II)V");
+    if (!excConstructor) {
+        DEBUG_LOG("CallOnError : excConstructor is null!\n");
+        return;
+    }
+    jmethodID callbackExcMethod = (*env)->GetMethodID(env, callbackClass,
+            "onError", "(Lio/fd/vpp/jvpp/VppCallbackException;)V");
+    if (!callbackExcMethod) {
+        DEBUG_LOG("CallOnError : callbackExcMethod is null!\n");
+        return;
+    }
+
+    jobject excObject = (*env)->NewObject(env, callbackExceptionClass,
+            excConstructor, (*env)->NewStringUTF(env, callName),
+            clib_net_to_host_u32(contextId), clib_net_to_host_u32(retval));
+    if (!excObject) {
+        DEBUG_LOG("CallOnError : excObject is null!\n");
+        return;
+    }
+
+    (*env)->CallVoidMethod(env, callbackObject, callbackExcMethod, excObject);
+    DEBUG_LOG("CallOnError : Response sent\n");
+}
diff --git a/src/vpp-api/java/jvpp-common/jvpp_common.h b/src/vpp-api/java/jvpp-common/jvpp_common.h
new file mode 100644
index 00000000..bbb203ed
--- /dev/null
+++ b/src/vpp-api/java/jvpp-common/jvpp_common.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_jvpp_common_h__
+#define __included_jvpp_common_h__
+//
+#include <vppinfra/types.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <jni.h>
+
+typedef struct {
+    /* Unique identifier used for matching replays with requests  */
+    volatile u32 context_id;
+
+    /* Spinlock */
+    volatile u32 lock;
+    u32 tag;
+
+    /* JNI Native Method Interface pointer for message handlers */
+    JNIEnv *jenv;
+
+    /* JNI Invoke Interface pointer for attachment of rx thread to java thread */
+    JavaVM *jvm;
+
+    /* Convenience */
+    unix_shared_memory_queue_t * vl_input_queue;
+    u32 my_client_index;
+} jvpp_main_t;
+
+extern jvpp_main_t jvpp_main __attribute__((aligned (64)));
+
+static_always_inline u32 vppjni_get_context_id(jvpp_main_t * jm) {
+    return __sync_add_and_fetch(&jm->context_id, 1);
+}
+
+static_always_inline void vppjni_lock(jvpp_main_t * jm, u32 tag) {
+    while (__sync_lock_test_and_set(&jm->lock, 1))
+        ;
+    jm->tag = tag;
+}
+
+static_always_inline void vppjni_unlock(jvpp_main_t * jm) {
+    jm->tag = 0;
+    CLIB_MEMORY_BARRIER();
+    jm->lock = 0;
+}
+
+/**
+ * Calls onError callback on callbackObject reference. Passes instance of callbackExceptionClass as parameter.
+ */
+void call_on_error(const char* callName, int contextId, int retval,
+        jclass callbackClass, jobject callbackObject,
+        jclass callbackExceptionClass);
+
+#endif /* __included_jvpp_common_h__ */
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java
new file mode 100644
index 00000000..986993b8
--- /dev/null
+++ b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.core.test;
+
+import io.fd.vpp.jvpp.JVpp;
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.VppCallbackException;
+import io.fd.vpp.jvpp.core.JVppCoreImpl;
+import io.fd.vpp.jvpp.core.callback.GetNodeIndexCallback;
+import io.fd.vpp.jvpp.core.callback.ShowVersionCallback;
+import io.fd.vpp.jvpp.core.callback.SwInterfaceCallback;
+import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
+import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
+import io.fd.vpp.jvpp.core.dto.ShowVersion;
+import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
+import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
+import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
+
+public class CallbackApiTest {
+
+    public static void main(String[] args) throws Exception {
+        testCallbackApi();
+    }
+
+    private static void testCallbackApi() throws Exception {
+        System.out.println("Testing Java callback API with JVppRegistry");
+        try (final JVppRegistry registry = new JVppRegistryImpl("CallbackApiTest");
+             final JVpp jvpp = new JVppCoreImpl()) {
+            registry.register(jvpp, new TestCallback());
+
+            System.out.println("Sending ShowVersion request...");
+            final int result = jvpp.send(new ShowVersion());
+            System.out.printf("ShowVersion send result = %d%n", result);
+
+            System.out.println("Sending GetNodeIndex request...");
+            GetNodeIndex getNodeIndexRequest = new GetNodeIndex();
+            getNodeIndexRequest.nodeName = "non-existing-node".getBytes();
+            jvpp.send(getNodeIndexRequest);
+
+            System.out.println("Sending SwInterfaceDump request...");
+            SwInterfaceDump swInterfaceDumpRequest = new SwInterfaceDump();
+            swInterfaceDumpRequest.nameFilterValid = 0;
+            swInterfaceDumpRequest.nameFilter = "".getBytes();
+            jvpp.send(swInterfaceDumpRequest);
+
+            Thread.sleep(1000);
+            System.out.println("Disconnecting...");
+        }
+        Thread.sleep(1000);
+    }
+
+    static class TestCallback implements GetNodeIndexCallback, ShowVersionCallback, SwInterfaceCallback {
+
+        @Override
+        public void onGetNodeIndexReply(final GetNodeIndexReply msg) {
+            System.out.printf("Received GetNodeIndexReply: %s%n", msg);
+        }
+
+        @Override
+        public void onShowVersionReply(final ShowVersionReply msg) {
+            System.out.printf("Received ShowVersionReply: context=%d, program=%s, version=%s, "
+                    + "buildDate=%s, buildDirectory=%s%n",
+                msg.context, new String(msg.program), new String(msg.version),
+                new String(msg.buildDate), new String(msg.buildDirectory));
+        }
+
+        @Override
+        public void onSwInterfaceDetails(final SwInterfaceDetails msg) {
+            System.out.printf("Received SwInterfaceDetails: interfaceName=%s, l2AddressLength=%d, adminUpDown=%d, "
+                    + "linkUpDown=%d, linkSpeed=%d, linkMtu=%d%n",
+                new String(msg.interfaceName), msg.l2AddressLength, msg.adminUpDown,
+                msg.linkUpDown, msg.linkSpeed, (int) msg.linkMtu);
+        }
+
+        @Override
+        public void onError(VppCallbackException ex) {
+            System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n", ex.getMethodName(),
+                ex.getCtxId(), ex.getErrorCode());
+        }
+    }
+}
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeNotificationTest.java b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeNotificationTest.java
new file mode 100644
index 00000000..d84cb034
--- /dev/null
+++ b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeNotificationTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.core.test;
+
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.VppCallbackException;
+import io.fd.vpp.jvpp.core.JVppCore;
+import io.fd.vpp.jvpp.core.JVppCoreImpl;
+import io.fd.vpp.jvpp.core.callback.WantInterfaceEventsCallback;
+import io.fd.vpp.jvpp.core.callfacade.CallbackJVppCoreFacade;
+import io.fd.vpp.jvpp.core.dto.WantInterfaceEventsReply;
+
+public class CallbackJVppFacadeNotificationTest {
+
+    private static void testCallbackFacade() throws Exception {
+        System.out.println("Testing CallbackJVppFacade for notifications");
+
+        try (final JVppRegistry registry = new JVppRegistryImpl("CallbackFacadeTest");
+             final JVppCore jvpp = new JVppCoreImpl()) {
+            final CallbackJVppCoreFacade jvppCallbackFacade = new CallbackJVppCoreFacade(registry, jvpp);
+            System.out.println("Successfully connected to VPP");
+
+            final AutoCloseable notificationListenerReg =
+                jvppCallbackFacade.getNotificationRegistry().registerSwInterfaceSetFlagsNotificationCallback(
+                    NotificationUtils::printNotification
+                );
+
+            jvppCallbackFacade.wantInterfaceEvents(NotificationUtils.getEnableInterfaceNotificationsReq(),
+                new WantInterfaceEventsCallback() {
+                    @Override
+                    public void onWantInterfaceEventsReply(final WantInterfaceEventsReply reply) {
+                        System.out.println("Interface events started");
+                    }
+
+                    @Override
+                    public void onError(final VppCallbackException ex) {
+                        System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n",
+                            ex.getMethodName(), ex.getCtxId(), ex.getErrorCode());
+                    }
+                });
+
+            System.out.println("Changing interface configuration");
+            NotificationUtils.getChangeInterfaceState().send(jvpp);
+
+            Thread.sleep(1000);
+
+            jvppCallbackFacade.wantInterfaceEvents(NotificationUtils.getDisableInterfaceNotificationsReq(),
+                new WantInterfaceEventsCallback() {
+                    @Override
+                    public void onWantInterfaceEventsReply(final WantInterfaceEventsReply reply) {
+                        System.out.println("Interface events stopped");
+                    }
+
+                    @Override
+                    public void onError(final VppCallbackException ex) {
+                        System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n",
+                            ex.getMethodName(), ex.getCtxId(), ex.getErrorCode());
+                    }
+                });
+
+            notificationListenerReg.close();
+
+            Thread.sleep(2000);
+            System.out.println("Disconnecting...");
+        }
+        Thread.sleep(1000);
+    }
+
+    public static void main(String[] args) throws Exception {
+        testCallbackFacade();
+    }
+}
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeTest.java b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeTest.java
new file mode 100644
index 00000000..9f7cb8de
--- /dev/null
+++ b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.core.test;
+
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.VppCallbackException;
+import io.fd.vpp.jvpp.core.JVppCoreImpl;
+import io.fd.vpp.jvpp.core.callback.GetNodeIndexCallback;
+import io.fd.vpp.jvpp.core.callback.ShowVersionCallback;
+import io.fd.vpp.jvpp.core.callfacade.CallbackJVppCoreFacade;
+import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
+import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
+import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
+
+/**
+ * CallbackJVppFacade together with CallbackJVppFacadeCallback allow for setting different callback for each request.
+ * This is more convenient than the approach shown in CallbackApiTest.
+ */
+public class CallbackJVppFacadeTest {
+
+    private static ShowVersionCallback showVersionCallback1 = new ShowVersionCallback() {
+        @Override
+        public void onShowVersionReply(final ShowVersionReply msg) {
+            System.out.printf("ShowVersionCallback1 received ShowVersionReply: context=%d, program=%s,"
+                    + "version=%s, buildDate=%s, buildDirectory=%s%n", msg.context, new String(msg.program),
+                new String(msg.version), new String(msg.buildDate), new String(msg.buildDirectory));
+        }
+
+        @Override
+        public void onError(VppCallbackException ex) {
+            System.out.printf("Received onError exception in showVersionCallback1: call=%s, reply=%d, context=%d%n",
+                ex.getMethodName(), ex.getErrorCode(), ex.getCtxId());
+        }
+    };
+
+    private static ShowVersionCallback showVersionCallback2 = new ShowVersionCallback() {
+        @Override
+        public void onShowVersionReply(final ShowVersionReply msg) {
+            System.out.printf("ShowVersionCallback2 received ShowVersionReply: context=%d, program=%s,"
+                    + "version=%s, buildDate=%s, buildDirectory=%s%n", msg.context, new String(msg.program),
+                new String(msg.version), new String(msg.buildDate), new String(msg.buildDirectory));
+        }
+
+        @Override
+        public void onError(VppCallbackException ex) {
+            System.out.printf("Received onError exception in showVersionCallback2: call=%s, reply=%d, context=%d%n",
+                ex.getMethodName(), ex.getErrorCode(), ex.getCtxId());
+        }
+
+    };
+
+    private static GetNodeIndexCallback getNodeIndexCallback = new GetNodeIndexCallback() {
+        @Override
+        public void onGetNodeIndexReply(final GetNodeIndexReply msg) {
+            System.out.printf("Received GetNodeIndexReply: %s%n", msg);
+        }
+
+        @Override
+        public void onError(VppCallbackException ex) {
+            System.out.printf("Received onError exception in getNodeIndexCallback: call=%s, reply=%d, context=%d%n",
+                ex.getMethodName(), ex.getErrorCode(), ex.getCtxId());
+        }
+    };
+
+    private static void testCallbackFacade() throws Exception {
+        System.out.println("Testing CallbackJVppFacade");
+
+        try (final JVppRegistry registry = new JVppRegistryImpl("CallbackFacadeTest");
+             final CallbackJVppCoreFacade callbackFacade = new CallbackJVppCoreFacade(registry, new JVppCoreImpl())) {
+            System.out.println("Successfully connected to VPP");
+
+            callbackFacade.showVersion(showVersionCallback1);
+            callbackFacade.showVersion(showVersionCallback2);
+
+            GetNodeIndex getNodeIndexRequest = new GetNodeIndex();
+            getNodeIndexRequest.nodeName = "dummyNode".getBytes();
+            callbackFacade.getNodeIndex(getNodeIndexRequest, getNodeIndexCallback);
+
+            Thread.sleep(2000);
+            System.out.println("Disconnecting...");
+        }
+        Thread.sleep(1000);
+    }
+
+    public static void main(String[] args) throws Exception {
+        testCallbackFacade();
+    }
+}
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackNotificationApiTest.java b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackNotificationApiTest.java
new file mode 100644
index 00000000..a9f71f11
--- /dev/null
+++ b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackNotificationApiTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.core.test;
+
+import static io.fd.vpp.jvpp.core.test.NotificationUtils.getChangeInterfaceState;
+import static io.fd.vpp.jvpp.core.test.NotificationUtils.getDisableInterfaceNotificationsReq;
+import static io.fd.vpp.jvpp.core.test.NotificationUtils.getEnableInterfaceNotificationsReq;
+import static io.fd.vpp.jvpp.core.test.NotificationUtils.printNotification;
+
+import io.fd.vpp.jvpp.JVpp;
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.VppCallbackException;
+import io.fd.vpp.jvpp.core.JVppCoreImpl;
+import io.fd.vpp.jvpp.core.callback.SwInterfaceSetFlagsCallback;
+import io.fd.vpp.jvpp.core.callback.SwInterfaceSetFlagsNotificationCallback;
+import io.fd.vpp.jvpp.core.callback.WantInterfaceEventsCallback;
+import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsNotification;
+import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsReply;
+import io.fd.vpp.jvpp.core.dto.WantInterfaceEventsReply;
+
+public class CallbackNotificationApiTest {
+
+    private static void testCallbackApi() throws Exception {
+        System.out.println("Testing Java callback API for notifications");
+        try (final JVppRegistry registry = new JVppRegistryImpl("CallbackNotificationTest");
+             final JVpp jvpp = new JVppCoreImpl()) {
+            registry.register(jvpp, new TestCallback());
+            System.out.println("Successfully connected to VPP");
+
+            getEnableInterfaceNotificationsReq().send(jvpp);
+            System.out.println("Interface notifications started");
+            // TODO test ifc dump which also triggers interface flags send
+
+            System.out.println("Changing interface configuration");
+            getChangeInterfaceState().send(jvpp);
+
+            // Notifications are received
+            Thread.sleep(500);
+
+            getDisableInterfaceNotificationsReq().send(jvpp);
+            System.out.println("Interface events stopped");
+
+            Thread.sleep(2000);
+            System.out.println("Disconnecting...");
+        }
+        Thread.sleep(1000);
+    }
+
+    public static void main(String[] args) throws Exception {
+        testCallbackApi();
+    }
+
+    private static class TestCallback implements SwInterfaceSetFlagsNotificationCallback,
+        WantInterfaceEventsCallback, SwInterfaceSetFlagsCallback {
+
+        @Override
+        public void onSwInterfaceSetFlagsNotification(
+            final SwInterfaceSetFlagsNotification msg) {
+            printNotification(msg);
+        }
+
+        @Override
+        public void onWantInterfaceEventsReply(final WantInterfaceEventsReply wantInterfaceEventsReply) {
+            System.out.println("Interface notification stream updated");
+        }
+
+        @Override
+        public void onSwInterfaceSetFlagsReply(final SwInterfaceSetFlagsReply swInterfaceSetFlagsReply) {
+            System.out.println("Interface flags set successfully");
+        }
+
+        @Override
+        public void onError(VppCallbackException ex) {
+            System.out.printf("Received onError exception in getNodeIndexCallback: call=%s, reply=%d, context=%d%n",
+                ex.getMethodName(), ex.getErrorCode(), ex.getCtxId());
+
+        }
+    }
+}
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/ControlPingTest.java b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/ControlPingTest.java
new file mode 100644
index 00000000..e97f4e3a
--- /dev/null
+++ b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/ControlPingTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.core.test;
+
+import io.fd.vpp.jvpp.JVpp;
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.VppCallbackException;
+import io.fd.vpp.jvpp.callback.ControlPingCallback;
+import io.fd.vpp.jvpp.core.JVppCoreImpl;
+import io.fd.vpp.jvpp.dto.ControlPing;
+import io.fd.vpp.jvpp.dto.ControlPingReply;
+
+public class ControlPingTest {
+
+    private static void testControlPing() throws Exception {
+        System.out.println("Testing ControlPing using Java callback API");
+        try (JVppRegistry registry = new JVppRegistryImpl("ControlPingTest");
+             JVpp jvpp = new JVppCoreImpl()) {
+
+            registry.register(jvpp, new ControlPingCallback() {
+                @Override
+                public void onControlPingReply(final ControlPingReply reply) {
+                    System.out.printf("Received ControlPingReply: %s%n", reply);
+                }
+
+                @Override
+                public void onError(VppCallbackException ex) {
+                    System.out.printf("Received onError exception: call=%s, reply=%d, context=%d ", ex.getMethodName(),
+                        ex.getErrorCode(), ex.getCtxId());
+                }
+
+            });
+            System.out.println("Successfully connected to VPP");
+            Thread.sleep(1000);
+
+            System.out.println("Sending control ping using JVppRegistry");
+            registry.controlPing(jvpp.getClass());
+
+            Thread.sleep(2000);
+
+            System.out.println("Sending control ping using JVpp plugin");
+            jvpp.send(new ControlPing());
+
+            Thread.sleep(2000);
+            System.out.println("Disconnecting...");
+        }
+        Thread.sleep(1000);
+    }
+
+    public static void main(String[] args) throws Exception {
+        testControlPing();
+    }
+}
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CreateSubInterfaceTest.java b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CreateSubInterfaceTest.java
new file mode 100644
index 00000000..a96258f4
--- /dev/null
+++ b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CreateSubInterfaceTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.core.test;
+
+import static java.util.Objects.requireNonNull;
+
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.core.JVppCoreImpl;
+import io.fd.vpp.jvpp.core.dto.CreateSubif;
+import io.fd.vpp.jvpp.core.dto.CreateSubifReply;
+import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
+import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
+import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+
+/**
+ * <p>Tests sub-interface creation.<br> Equivalent to:<br>
+ *
+ * <pre>{@code
+ * vppctl create sub GigabitEthernet0/9/0 1 dot1q 100 inner-dot1q any
+ * }
+ * </pre>
+ *
+ * To verify invoke:<br>
+ * <pre>{@code
+ * vpp_api_test json
+ * vat# sw_interface_dump
+ * }
+ */
+public class CreateSubInterfaceTest {
+
+    private static SwInterfaceDump createSwInterfaceDumpRequest(final String ifaceName) {
+        SwInterfaceDump request = new SwInterfaceDump();
+        request.nameFilter = ifaceName.getBytes();
+        request.nameFilterValid = 1;
+        return request;
+    }
+
+    private static void requireSingleIface(final SwInterfaceDetailsReplyDump response, final String ifaceName) {
+        if (response.swInterfaceDetails.size() != 1) {
+            throw new IllegalStateException(
+                String.format("Expected one interface matching filter %s but was %d", ifaceName,
+                    response.swInterfaceDetails.size()));
+        }
+    }
+
+    private static CreateSubif createSubifRequest(final int swIfIndex, final int subId) {
+        CreateSubif request = new CreateSubif();
+        request.swIfIndex = swIfIndex; // super interface id
+        request.subId = subId;
+        request.noTags = 0;
+        request.oneTag = 0;
+        request.twoTags = 1;
+        request.dot1Ad = 0;
+        request.exactMatch = 1;
+        request.defaultSub = 0;
+        request.outerVlanIdAny = 0;
+        request.innerVlanIdAny = 1;
+        request.outerVlanId = 100;
+        request.innerVlanId = 0;
+        return request;
+    }
+
+    private static void print(CreateSubifReply reply) {
+        System.out.printf("CreateSubifReply: %s%n", reply);
+    }
+
+    private static void testCreateSubInterface() throws Exception {
+        System.out.println("Testing sub-interface creation using Java callback API");
+        try (final JVppRegistry registry = new JVppRegistryImpl("CreateSubInterface");
+             final FutureJVppCoreFacade jvppFacade = new FutureJVppCoreFacade(registry, new JVppCoreImpl())) {
+            System.out.println("Successfully connected to VPP");
+            Thread.sleep(1000);
+
+            final String ifaceName = "GigabitEthernet0/8/0";
+
+            final SwInterfaceDetailsReplyDump swInterfaceDetails =
+                jvppFacade.swInterfaceDump(createSwInterfaceDumpRequest(ifaceName)).toCompletableFuture().get();
+
+            requireNonNull(swInterfaceDetails, "swInterfaceDump returned null");
+            requireNonNull(swInterfaceDetails.swInterfaceDetails, "swInterfaceDetails is null");
+            requireSingleIface(swInterfaceDetails, ifaceName);
+
+            final int swIfIndex = swInterfaceDetails.swInterfaceDetails.get(0).swIfIndex;
+            final int subId = 1;
+
+            final CreateSubifReply createSubifReply =
+                jvppFacade.createSubif(createSubifRequest(swIfIndex, subId)).toCompletableFuture().get();
+            print(createSubifReply);
+
+            final String subIfaceName = "GigabitEthernet0/8/0." + subId;
+            final SwInterfaceDetailsReplyDump subIface =
+                jvppFacade.swInterfaceDump(createSwInterfaceDumpRequest(subIfaceName)).toCompletableFuture().get();
+            requireNonNull(swInterfaceDetails, "swInterfaceDump returned null");
+            requireNonNull(subIface.swInterfaceDetails, "swInterfaceDump returned null");
+            requireSingleIface(swInterfaceDetails, ifaceName);
+
+            System.out.println("Disconnecting...");
+        }
+        Thread.sleep(1000);
+    }
+
+    public static void main(String[] args) throws Exception {
+        testCreateSubInterface();
+    }
+}
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiNotificationTest.java b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiNotificationTest.java
new file mode 100644
index 00000000..9efeae19
--- /dev/null
+++ b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiNotificationTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.core.test;
+
+import static io.fd.vpp.jvpp.core.test.NotificationUtils.getChangeInterfaceState;
+import static io.fd.vpp.jvpp.core.test.NotificationUtils.getDisableInterfaceNotificationsReq;
+import static io.fd.vpp.jvpp.core.test.NotificationUtils.getEnableInterfaceNotificationsReq;
+
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.core.JVppCoreImpl;
+import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+
+public class FutureApiNotificationTest {
+
+    private static void testFutureApi() throws Exception {
+        System.out.println("Testing Java future API for notifications");
+        try (final JVppRegistry registry = new JVppRegistryImpl("FutureApiNotificationTest");
+             final FutureJVppCoreFacade jvppFacade = new FutureJVppCoreFacade(registry, new JVppCoreImpl());
+             final AutoCloseable notificationListenerReg =
+                 jvppFacade.getNotificationRegistry()
+                     .registerSwInterfaceSetFlagsNotificationCallback(NotificationUtils::printNotification)) {
+            System.out.println("Successfully connected to VPP");
+            jvppFacade.wantInterfaceEvents(getEnableInterfaceNotificationsReq()).toCompletableFuture().get();
+            System.out.println("Interface events started");
+
+            System.out.println("Changing interface configuration");
+            jvppFacade.swInterfaceSetFlags(getChangeInterfaceState()).toCompletableFuture().get();
+
+            Thread.sleep(1000);
+
+            jvppFacade.wantInterfaceEvents(getDisableInterfaceNotificationsReq()).toCompletableFuture().get();
+            System.out.println("Interface events stopped");
+            System.out.println("Disconnecting...");
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        testFutureApi();
+    }
+}
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java
new file mode 100644
index 00000000..f478bab4
--- /dev/null
+++ b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.core.test;
+
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.core.JVppCoreImpl;
+import io.fd.vpp.jvpp.core.dto.BridgeDomainDetailsReplyDump;
+import io.fd.vpp.jvpp.core.dto.BridgeDomainDump;
+import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
+import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
+import io.fd.vpp.jvpp.core.dto.ShowVersion;
+import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
+import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
+import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
+import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
+import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class FutureApiTest {
+
+    private static final Logger LOG = Logger.getLogger(FutureApiTest.class.getName());
+
+    private static void testShowVersion(final FutureJVppCoreFacade jvpp) throws Exception {
+        LOG.info("Sending ShowVersion request...");
+        final Future<ShowVersionReply> replyFuture = jvpp.showVersion(new ShowVersion()).toCompletableFuture();
+        final ShowVersionReply reply = replyFuture.get();
+        LOG.info(
+            String.format(
+                "Received ShowVersionReply: context=%d, program=%s, version=%s, buildDate=%s, buildDirectory=%s%n",
+                reply.context, new String(reply.program), new String(reply.version), new String(reply.buildDate),
+                new String(reply.buildDirectory)));
+    }
+
+    private static void testEmptyBridgeDomainDump(final FutureJVppCoreFacade jvpp) throws Exception {
+        LOG.info("Sending ShowVersion request...");
+        final BridgeDomainDump request = new BridgeDomainDump();
+        request.bdId = -1; // dump call
+
+        final CompletableFuture<BridgeDomainDetailsReplyDump>
+            replyFuture = jvpp.bridgeDomainDump(request).toCompletableFuture();
+        final BridgeDomainDetailsReplyDump reply = replyFuture.get();
+
+        if (reply == null || reply.bridgeDomainDetails == null) {
+            LOG.severe("Received null response for empty dump: " + reply);
+        } else {
+            LOG.info(
+                String.format(
+                    "Received empty bridge-domain dump reply with list of bridge-domains: %s, %s",
+                    reply.bridgeDomainDetails, reply.bridgeDomainSwIfDetails));
+        }
+    }
+
+    private static void testGetNodeIndex(final FutureJVppCoreFacade jvpp) {
+        LOG.info("Sending GetNodeIndex request...");
+        final GetNodeIndex request = new GetNodeIndex();
+        request.nodeName = "non-existing-node".getBytes();
+        final Future<GetNodeIndexReply> replyFuture = jvpp.getNodeIndex(request).toCompletableFuture();
+        try {
+            final GetNodeIndexReply reply = replyFuture.get();
+            LOG.info(
+                String.format(
+                    "Received GetNodeIndexReply: context=%d, nodeIndex=%d%n", reply.context, reply.nodeIndex));
+        } catch (Exception e) {
+            LOG.log(Level.SEVERE, "GetNodeIndex request failed", e);
+        }
+    }
+
+    private static void testSwInterfaceDump(final FutureJVppCoreFacade jvpp) throws Exception {
+        LOG.info("Sending SwInterfaceDump request...");
+        final SwInterfaceDump request = new SwInterfaceDump();
+        request.nameFilterValid = 0;
+        request.nameFilter = "".getBytes();
+
+        final Future<SwInterfaceDetailsReplyDump> replyFuture = jvpp.swInterfaceDump(request).toCompletableFuture();
+        final SwInterfaceDetailsReplyDump reply = replyFuture.get();
+        for (SwInterfaceDetails details : reply.swInterfaceDetails) {
+            Objects.requireNonNull(details, "reply.swInterfaceDetails contains null element!");
+            LOG.info(
+                String.format("Received SwInterfaceDetails: interfaceName=%s, l2AddressLength=%d, adminUpDown=%d, "
+                        + "linkUpDown=%d, linkSpeed=%d, linkMtu=%d%n",
+                    new String(details.interfaceName), details.l2AddressLength, details.adminUpDown,
+                    details.linkUpDown, details.linkSpeed, (int) details.linkMtu));
+        }
+    }
+
+    private static void testFutureApi() throws Exception {
+        LOG.info("Testing Java future API");
+        try (final JVppRegistry registry = new JVppRegistryImpl("FutureApiTest");
+             final FutureJVppCoreFacade jvppFacade = new FutureJVppCoreFacade(registry, new JVppCoreImpl())) {
+            LOG.info("Successfully connected to VPP");
+
+            testEmptyBridgeDomainDump(jvppFacade);
+            testShowVersion(jvppFacade);
+            testGetNodeIndex(jvppFacade);
+            testSwInterfaceDump(jvppFacade);
+
+            LOG.info("Disconnecting...");
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        testFutureApi();
+    }
+}
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/L2AclTest.java b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/L2AclTest.java
new file mode 100644
index 00000000..6b3fa993
--- /dev/null
+++ b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/L2AclTest.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.core.test;
+
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.core.JVppCoreImpl;
+import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
+import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
+import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
+import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
+import io.fd.vpp.jvpp.core.dto.ClassifySessionDetailsReplyDump;
+import io.fd.vpp.jvpp.core.dto.ClassifySessionDump;
+import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
+import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
+import io.fd.vpp.jvpp.core.dto.ClassifyTableIds;
+import io.fd.vpp.jvpp.core.dto.ClassifyTableIdsReply;
+import io.fd.vpp.jvpp.core.dto.ClassifyTableInfo;
+import io.fd.vpp.jvpp.core.dto.ClassifyTableInfoReply;
+import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
+import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
+import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import javax.xml.bind.DatatypeConverter;
+
+/**
+ * <p>Tests L2 ACL creation and read.<br> Equivalent to the following vppctl commands:<br>
+ *
+ * <pre>{@code
+ * vppctl classify table mask l2 src
+ * vppctl classify session acl-hit-next deny opaque-index 0 table-index 0 match l2 src 01:02:03:04:05:06
+ * vppctl set int input acl intfc local0 l2-table 0
+ * vppctl sh class table verbose
+ * }
+ * </pre>
+ */
+public class L2AclTest {
+
+    private static final int LOCAL0_IFACE_ID = 0;
+
+    private static ClassifyAddDelTable createClassifyTable() {
+        ClassifyAddDelTable request = new ClassifyAddDelTable();
+        request.isAdd = 1;
+        request.tableIndex = ~0; // default
+        request.nbuckets = 2;
+        request.memorySize = 2 << 20;
+        request.nextTableIndex = ~0; // default
+        request.missNextIndex = ~0; // default
+        request.skipNVectors = 0;
+        request.matchNVectors = 1;
+        request.mask =
+            new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
+                (byte) 0xff, (byte) 0xff, 0x00, 0x00, 0x00, 0x00};
+        return request;
+    }
+
+    private static ClassifyTableInfo createClassifyTableInfoRequest(final int tableId) {
+        ClassifyTableInfo request = new ClassifyTableInfo();
+        request.tableId = tableId;
+        return request;
+    }
+
+    private static ClassifyAddDelSession createClassifySession(final int tableIndex) {
+        ClassifyAddDelSession request = new ClassifyAddDelSession();
+        request.isAdd = 1;
+        request.tableIndex = tableIndex;
+        request.hitNextIndex = 0; // deny
+        request.opaqueIndex = 0;
+        request.advance = 0; // default
+        // match 01:02:03:04:05:06 mac address
+        request.match =
+            new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04,
+                (byte) 0x05, (byte) 0x06, 0x00, 0x00, 0x00, 0x00};
+        return request;
+    }
+
+    private static ClassifySessionDump createClassifySessionDumpRequest(final int newTableIndex) {
+        ClassifySessionDump request = new ClassifySessionDump();
+        request.tableId = newTableIndex;
+        return request;
+    }
+
+    private static InputAclSetInterface aclSetInterface() {
+        InputAclSetInterface request = new InputAclSetInterface();
+        request.isAdd = 1;
+        request.swIfIndex = LOCAL0_IFACE_ID;
+        request.ip4TableIndex = ~0; // skip
+        request.ip6TableIndex = ~0; // skip
+        request.l2TableIndex = 0;
+        return request;
+    }
+
+    private static ClassifyTableByInterface createClassifyTableByInterfaceRequest() {
+        ClassifyTableByInterface request = new ClassifyTableByInterface();
+        request.swIfIndex = LOCAL0_IFACE_ID;
+        return request;
+    }
+
+    private static void print(ClassifyAddDelTableReply reply) {
+        System.out.printf("ClassifyAddDelTableReply: %s%n", reply);
+    }
+
+    private static void print(ClassifyTableIdsReply reply) {
+        System.out.printf("ClassifyTableIdsReply: %s%n", reply);
+    }
+
+    private static void print(final ClassifyTableInfoReply reply) {
+        System.out.println(reply);
+        if (reply != null) {
+            System.out.println("Mask hex: " + DatatypeConverter.printHexBinary(reply.mask));
+        }
+    }
+
+    private static void print(ClassifyAddDelSessionReply reply) {
+        System.out.printf("ClassifyAddDelSessionReply: context=%s%n", reply);
+    }
+
+    private static void print(final ClassifySessionDetailsReplyDump reply) {
+        System.out.println(reply);
+        reply.classifySessionDetails.forEach(detail -> {
+            System.out.println(detail);
+            System.out.println("Match hex: " + DatatypeConverter.printHexBinary(detail.match));
+        });
+    }
+
+    private static void print(final InputAclSetInterfaceReply reply) {
+        System.out.printf("InputAclSetInterfaceReply: context=%s%n", reply);
+    }
+
+    private static void print(final ClassifyTableByInterfaceReply reply) {
+        System.out.printf("ClassifyAddDelTableReply: %s%n", reply);
+    }
+
+    private static void testL2Acl() throws Exception {
+        System.out.println("Testing L2 ACLs using Java callback API");
+        try (final JVppRegistry registry = new JVppRegistryImpl("L2AclTest");
+             final FutureJVppCoreFacade jvppFacade = new FutureJVppCoreFacade(registry, new JVppCoreImpl())) {
+
+            System.out.println("Successfully connected to VPP");
+            Thread.sleep(1000);
+
+            final ClassifyAddDelTableReply classifyAddDelTableReply =
+                jvppFacade.classifyAddDelTable(createClassifyTable()).toCompletableFuture().get();
+            print(classifyAddDelTableReply);
+
+            final ClassifyTableIdsReply classifyTableIdsReply =
+                jvppFacade.classifyTableIds(new ClassifyTableIds()).toCompletableFuture().get();
+            print(classifyTableIdsReply);
+
+            final ClassifyTableInfoReply classifyTableInfoReply =
+                jvppFacade.classifyTableInfo(createClassifyTableInfoRequest(classifyAddDelTableReply.newTableIndex))
+                    .toCompletableFuture().get();
+            print(classifyTableInfoReply);
+
+            final ClassifyAddDelSessionReply classifyAddDelSessionReply =
+                jvppFacade.classifyAddDelSession(createClassifySession(classifyAddDelTableReply.newTableIndex))
+                    .toCompletableFuture().get();
+            print(classifyAddDelSessionReply);
+
+            final ClassifySessionDetailsReplyDump classifySessionDetailsReplyDump =
+                jvppFacade.classifySessionDump(createClassifySessionDumpRequest(classifyAddDelTableReply.newTableIndex))
+                    .toCompletableFuture().get();
+            print(classifySessionDetailsReplyDump);
+
+            final InputAclSetInterfaceReply inputAclSetInterfaceReply =
+                jvppFacade.inputAclSetInterface(aclSetInterface()).toCompletableFuture().get();
+            print(inputAclSetInterfaceReply);
+
+            final ClassifyTableByInterfaceReply classifyTableByInterfaceReply =
+                jvppFacade.classifyTableByInterface(createClassifyTableByInterfaceRequest()).toCompletableFuture()
+                    .get();
+            print(classifyTableByInterfaceReply);
+
+            System.out.println("Disconnecting...");
+        }
+        Thread.sleep(1000);
+    }
+
+    public static void main(String[] args) throws Exception {
+        testL2Acl();
+    }
+}
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/LispAdjacencyTest.java b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/LispAdjacencyTest.java
new file mode 100644
index 00000000..d7f5039b
--- /dev/null
+++ b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/LispAdjacencyTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.core.test;
+
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.core.JVppCoreImpl;
+import io.fd.vpp.jvpp.core.dto.LispAddDelAdjacency;
+import io.fd.vpp.jvpp.core.dto.LispAddDelLocalEid;
+import io.fd.vpp.jvpp.core.dto.LispAddDelLocatorSet;
+import io.fd.vpp.jvpp.core.dto.LispAddDelRemoteMapping;
+import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGet;
+import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGetReply;
+import io.fd.vpp.jvpp.core.dto.LispEnableDisable;
+import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.ExecutionException;
+import java.util.logging.Logger;
+
+/**
+ * Tests lisp adjacency creation and read (custom vpe.api type support showcase).
+ */
+public class LispAdjacencyTest {
+
+    private static final Logger LOG = Logger.getLogger(LispAdjacencyTest.class.getName());
+
+    private static void enableLisp(final FutureJVppCoreFacade jvpp) throws ExecutionException, InterruptedException {
+        final LispEnableDisable request = new LispEnableDisable();
+        request.isEn = 1;
+        jvpp.lispEnableDisable(request).toCompletableFuture().get();
+        LOG.info("Lisp enabled successfully");
+    }
+
+    private static void addLocatorSet(final FutureJVppCoreFacade jvpp) throws ExecutionException, InterruptedException {
+        final LispAddDelLocatorSet request = new LispAddDelLocatorSet();
+        request.isAdd = 1;
+        request.locatorSetName = "ls1".getBytes(StandardCharsets.UTF_8);
+        jvpp.lispAddDelLocatorSet(request).toCompletableFuture().get();
+        LOG.info("Locator set created successfully:" + request.toString());
+    }
+
+    private static void addLocalEid(final FutureJVppCoreFacade jvpp) throws ExecutionException, InterruptedException {
+        final LispAddDelLocalEid request = new LispAddDelLocalEid();
+        request.isAdd = 1;
+        request.locatorSetName = "ls1".getBytes(StandardCharsets.UTF_8);
+        request.eid = new byte[] {1, 2, 1, 10};
+        request.eidType = 0; // ip4
+        request.vni = 0;
+        request.prefixLen = 32;
+        jvpp.lispAddDelLocalEid(request).toCompletableFuture().get();
+        LOG.info("Local EID created successfully:" + request.toString());
+    }
+
+    private static void addRemoteMapping(final FutureJVppCoreFacade jvpp)
+        throws ExecutionException, InterruptedException {
+        final LispAddDelRemoteMapping request = new LispAddDelRemoteMapping();
+        request.isAdd = 1;
+        request.vni = 0;
+        request.eid = new byte[] {1, 2, 1, 20};
+        request.eidLen = 32;
+        request.rlocNum = 1;
+        request.rlocs = new byte[] {1, 1, 1, 1, 2, 1, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+        jvpp.lispAddDelRemoteMapping(request).toCompletableFuture().get();
+        LOG.info("Remote mapping created successfully:" + request.toString());
+    }
+
+    private static void addAdjacency(final FutureJVppCoreFacade jvpp) throws ExecutionException, InterruptedException {
+        final LispAddDelAdjacency request = new LispAddDelAdjacency();
+        request.isAdd = 1;
+        request.leid = new byte[] {1, 2, 1, 10};
+        request.leidLen = 32;
+        request.reid = new byte[] {1, 2, 1, 20};
+        request.reidLen = 32;
+        request.eidType = 0; // ip4
+        request.vni = 0;
+        jvpp.lispAddDelAdjacency(request).toCompletableFuture().get();
+        LOG.info("Lisp adjacency created successfully:" + request.toString());
+    }
+
+    private static void showAdjacencies(final FutureJVppCoreFacade jvpp)
+        throws ExecutionException, InterruptedException {
+        final LispAdjacenciesGetReply reply =
+            jvpp.lispAdjacenciesGet(new LispAdjacenciesGet()).toCompletableFuture().get();
+        LOG.info("Lisp adjacency received successfully:" + reply.toString());
+    }
+
+    private static void testAdjacency(final FutureJVppCoreFacade jvpp) throws Exception {
+        enableLisp(jvpp);
+        addLocatorSet(jvpp);
+        addLocalEid(jvpp);
+        addRemoteMapping(jvpp);
+        addAdjacency(jvpp);
+        showAdjacencies(jvpp);
+    }
+
+    private static void testFutureApi() throws Exception {
+        LOG.info("Create lisp adjacency test");
+        try (final JVppRegistry registry = new JVppRegistryImpl("LispAdjacencyTest");
+             final FutureJVppCoreFacade jvppFacade = new FutureJVppCoreFacade(registry, new JVppCoreImpl())) {
+            LOG.info("Successfully connected to VPP");
+
+            testAdjacency(jvppFacade);
+            LOG.info("Disconnecting...");
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        testFutureApi();
+    }
+}
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/NotificationUtils.java b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/NotificationUtils.java
new file mode 100644
index 00000000..f82946c3
--- /dev/null
+++ b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/NotificationUtils.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.core.test;
+
+import java.io.PrintStream;
+import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlags;
+import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsNotification;
+import io.fd.vpp.jvpp.core.dto.WantInterfaceEvents;
+
+final class NotificationUtils {
+
+    private NotificationUtils() {}
+
+    static PrintStream printNotification(final SwInterfaceSetFlagsNotification msg) {
+        return System.out.printf("Received interface notification: ifc: %s%n", msg);
+    }
+
+    static SwInterfaceSetFlags getChangeInterfaceState() {
+        final SwInterfaceSetFlags swInterfaceSetFlags = new SwInterfaceSetFlags();
+        swInterfaceSetFlags.swIfIndex = 0;
+        swInterfaceSetFlags.adminUpDown = 1;
+        swInterfaceSetFlags.deleted = 0;
+        return swInterfaceSetFlags;
+    }
+
+    static WantInterfaceEvents getEnableInterfaceNotificationsReq() {
+        WantInterfaceEvents wantInterfaceEvents = new WantInterfaceEvents();
+        wantInterfaceEvents.pid = 1;
+        wantInterfaceEvents.enableDisable = 1;
+        return wantInterfaceEvents;
+    }
+
+    static WantInterfaceEvents getDisableInterfaceNotificationsReq() {
+        WantInterfaceEvents wantInterfaceEvents = new WantInterfaceEvents();
+        wantInterfaceEvents.pid = 1;
+        wantInterfaceEvents.enableDisable = 0;
+        return wantInterfaceEvents;
+    }
+}
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt
new file mode 100644
index 00000000..1344dc9e
--- /dev/null
+++ b/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt
@@ -0,0 +1,17 @@
+This package contains basic tests for jvpp. To run the tests:
+
+- Make sure VPP is running
+- From VPP's build-root/ folder execute:
+  - sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-17.01.jar:build-vpp-native/vpp-api/java/jvpp-core-17.01.jar io.fd.vpp.jvpp.core.test.[test name]
+
+Available tests:
+CallbackApiTest - Similar to ControlPingTest, invokes more complex calls (e.g. interface dump) using low level JVpp APIs
+CallbackJVppFacadeNotificationTest - Tests interface notifications using Callback based JVpp facade
+CallbackJVppFacadeTest - Execution of more complex calls using Callback based JVpp facade
+CallbackNotificationApiTest - Tests interface notifications using low level JVpp APIs
+ControlPingTest - Simple test executing a single control ping using low level JVpp APIs
+CreateSubInterfaceTest - Tests sub-interface creation
+FutureApiNotificationTest - Tests interface notifications using Future based JVpp facade
+FutureApiTest - Execution of more complex calls using Future based JVpp facade
+L2AclTest - Tests L2 ACL creation
+LispAdjacencyTest - Tests lisp adjacency creation and read (custom vpe.api type support showcase)
diff --git a/src/vpp-api/java/jvpp-core/jvpp_core.c b/src/vpp-api/java/jvpp-core/jvpp_core.c
new file mode 100644
index 00000000..ef4cb8e3
--- /dev/null
+++ b/src/vpp-api/java/jvpp-core/jvpp_core.c
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+
+#include <vpp/api/vpe_msg_enum.h>
+#define vl_typedefs             /* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_endianfun
+
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_printfun
+
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <jni.h>
+
+#include <jvpp-common/jvpp_common.h>
+
+// TODO: generate jvpp_plugin_name.c files (or at least reuse plugin's main structure)
+typedef struct {
+    /* Base message index for the jvpp-core plugin */
+    u16 msg_id_base;
+
+    /* Pointer to shared memory queue */
+    unix_shared_memory_queue_t * vl_input_queue;
+
+    /* VPP api client index */
+    u32 my_client_index;
+
+    /* Callback object and class references enabling asynchronous Java calls */
+    jobject callbackObject;
+    jclass callbackClass;
+
+} core_main_t;
+
+core_main_t core_main __attribute__((aligned (64)));
+
+#include "io_fd_vpp_jvpp_core_JVppCoreImpl.h"
+#include "jvpp_core_gen.h"
+
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_core_JVppCoreImpl_init0
+(JNIEnv * env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
+    core_main_t * plugin_main = &core_main;
+    plugin_main->my_client_index = my_client_index;
+    plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
+
+    plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
+    plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
+
+    #define _(N,n)                                  \
+        vl_msg_api_set_handlers(VL_API_##N, #n,     \
+                vl_api_##n##_t_handler,             \
+                vl_noop_handler,                    \
+                vl_noop_handler,              \
+                vl_noop_handler,               \
+                sizeof(vl_api_##n##_t), 1);
+        foreach_api_reply_handler;
+    #undef _
+}
+
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_core_JVppCoreImpl_close0
+(JNIEnv *env, jclass clazz) {
+    core_main_t * plugin_main = &core_main;
+
+    // cleanup:
+    (*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
+    (*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
+
+    plugin_main->callbackClass = NULL;
+    plugin_main->callbackObject = NULL;
+}
+
+jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+    JNIEnv* env;
+
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+        return JNI_EVERSION;
+    }
+
+    if (cache_class_references(env) != 0) {
+        clib_warning ("Failed to cache class references\n");
+        return JNI_ERR;
+    }
+
+    return JNI_VERSION_1_8;
+}
+
+void JNI_OnUnload(JavaVM *vm, void *reserved) {
+    JNIEnv* env;
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+        return;
+    }
+    delete_class_references(env);
+}
+
+
+
diff --git a/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/IoamExportApiTest.java b/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/IoamExportApiTest.java
new file mode 100644
index 00000000..cb85f005
--- /dev/null
+++ b/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/IoamExportApiTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.ioamexport.test;
+
+import java.net.InetAddress;
+
+import io.fd.vpp.jvpp.JVpp;
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.VppCallbackException;
+import io.fd.vpp.jvpp.ioamexport.JVppIoamexportImpl;
+import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexportFacade;
+import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisable;
+import io.fd.vpp.jvpp.ioamexport.dto.IoamExportIp6EnableDisableReply;
+
+public class IoamExportApiTest {
+
+    public static void main(String[] args) throws Exception {
+        ioamExportTestApi();
+    }
+
+    private static void ioamExportTestApi() throws Exception {
+        System.out.println("Testing Java API for ioam export plugin");
+        try (final JVppRegistry registry = new JVppRegistryImpl("ioamExportApiTest");
+             final JVpp jvpp = new JVppIoamexportImpl()) {
+	    FutureJVppIoamexportFacade ioamexportJvpp = new FutureJVppIoamexportFacade(registry,jvpp);
+            System.out.println("Sending ioam export request...");
+	    IoamExportIp6EnableDisable request = new IoamExportIp6EnableDisable();
+            request.isDisable = 0;
+	    InetAddress collectorAddress = InetAddress.getByName("2001:0DB8:AC10:FE01:0000:0000:0000:0000");
+	    InetAddress srcAddress = InetAddress.getByName("2001:0DB8:AC10:FE01:0000:0000:0000:0001");
+	    request.collectorAddress = collectorAddress.getAddress();
+	    request.srcAddress = srcAddress.getAddress();
+	    IoamExportIp6EnableDisableReply reply = ioamexportJvpp.ioamExportIp6EnableDisable(request).toCompletableFuture().get();
+            System.out.printf("IoamExportIp6EnableDisableReply = "+reply.toString()+"%n");
+
+            Thread.sleep(1000);
+
+            System.out.println("Disconnecting...");
+        }
+    }
+}
diff --git a/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/Readme.txt b/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/Readme.txt
new file mode 100644
index 00000000..1b38c285
--- /dev/null
+++ b/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/Readme.txt
@@ -0,0 +1 @@
+sudo java -cp build-vpp_debug-native/vpp-api/java/jvpp-registry-17.01.jar:build-vpp_debug-native/plugins/ioam-plugin/jvpp-ioam-export-1.0.jar io.fd.vpp.jvpp.ioamexport.test.IoamExportApiTest
diff --git a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c b/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c
new file mode 100644
index 00000000..5cda89d1
--- /dev/null
+++ b/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+
+#include <ioam/export/ioam_export_msg_enum.h>
+#define vl_typedefs             /* define message structures */
+#include <ioam/export/ioam_export_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun
+#include <ioam/export/ioam_export_all_api_h.h>
+#undef vl_endianfun
+
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <ioam/export/ioam_export_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <ioam/export/ioam_export_all_api_h.h>
+#undef vl_api_version
+
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#if VPPJNI_DEBUG == 1
+  #define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
+#else
+  #define DEBUG_LOG(...)
+#endif
+
+#include <jvpp-common/jvpp_common.h>
+
+#include "jvpp-ioamexport/io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl.h"
+#include "jvpp_ioam_export.h"
+#include "jvpp-ioamexport/jvpp_ioamexport_gen.h"
+
+/*
+ * Class:     io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl
+ * Method:    init0
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0
+  (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
+  ioamexport_main_t * plugin_main = &ioamexport_main;
+  u8 * name;
+  clib_warning ("Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0");
+
+  plugin_main->my_client_index = my_client_index;
+  plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
+
+  name = format (0, "ioam_export_%08x%c", api_version, 0);
+  plugin_main->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  if (plugin_main->msg_id_base == (u16) ~0) {
+    jclass exClass = (*env)->FindClass(env, "java/lang/IllegalStateException");
+    (*env)->ThrowNew(env, exClass, "ioam_export plugin is not loaded in VPP");
+  } else {
+    plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
+    plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
+
+    #define _(N,n)                                  \
+        vl_msg_api_set_handlers(VL_API_##N + plugin_main->msg_id_base, #n,     \
+                vl_api_##n##_t_handler,             \
+                vl_noop_handler,                    \
+                vl_api_##n##_t_endian,              \
+                vl_api_##n##_t_print,               \
+                sizeof(vl_api_##n##_t), 1);
+        foreach_api_reply_handler;
+    #undef _
+  }
+}
+
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_close0
+(JNIEnv *env, jclass clazz) {
+  ioamexport_main_t * plugin_main = &ioamexport_main;
+
+    // cleanup:
+    (*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
+    (*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
+
+    plugin_main->callbackClass = NULL;
+    plugin_main->callbackObject = NULL;
+}
+
+/* Attach thread to JVM and cache class references when initiating JVPP iOAM EXPORT */
+jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+    JNIEnv* env;
+
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+        return JNI_EVERSION;
+    }
+
+    if (cache_class_references(env) != 0) {
+        clib_warning ("Failed to cache class references\n");
+        return JNI_ERR;
+    }
+
+    return JNI_VERSION_1_8;
+}
+
+/* Clean up cached references when disposing JVPP iOAM EXPORT */
+void JNI_OnUnload(JavaVM *vm, void *reserved) {
+    JNIEnv* env;
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+        return;
+    }
+    delete_class_references(env);
+}
diff --git a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.h b/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.h
new file mode 100644
index 00000000..b6c0c16e
--- /dev/null
+++ b/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_jvpp_ioam_export_h__
+#define __included_jvpp_ioam_export_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <jni.h>
+
+/* Global state for JVPP-IOAM-EXPORT */
+typedef struct {
+    /* Base message index for the export plugin */
+    u16 msg_id_base;
+
+    /* Pointer to shared memory queue */
+    unix_shared_memory_queue_t * vl_input_queue;
+
+    /* VPP api client index */
+    u32 my_client_index;
+
+    /* Callback object and class references enabling asynchronous Java calls */
+    jobject callbackObject;
+    jclass callbackClass;
+
+} ioamexport_main_t;
+
+ioamexport_main_t ioamexport_main __attribute__((aligned (64)));
+
+
+#endif /* __included_jvpp_ioam_export_h__ */
diff --git a/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/IoamPotApiTest.java b/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/IoamPotApiTest.java
new file mode 100644
index 00000000..74eb86a1
--- /dev/null
+++ b/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/IoamPotApiTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.ioampot.test;
+
+import io.fd.vpp.jvpp.JVpp;
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.VppCallbackException;
+import io.fd.vpp.jvpp.ioampot.JVppIoampotImpl;
+import io.fd.vpp.jvpp.ioampot.callback.PotProfileAddCallback;
+import io.fd.vpp.jvpp.ioampot.dto.PotProfileAdd;
+import io.fd.vpp.jvpp.ioampot.dto.PotProfileAddReply;
+
+public class IoamPotApiTest {
+
+    static class IoamPotTestCallback implements PotProfileAddCallback {
+
+        @Override
+        public void onPotProfileAddReply(final PotProfileAddReply reply) {
+            System.out.printf("Received PotProfileAddReply reply: context=%d%n",
+                reply.context);
+        }
+
+        @Override
+        public void onError(VppCallbackException ex) {
+            System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n", ex.getMethodName(),
+                ex.getCtxId(), ex.getErrorCode());
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        ioamPotTestApi();
+    }
+
+    private static void ioamPotTestApi() throws Exception {
+        System.out.println("Testing Java API for ioam pot plugin");
+        try (final JVppRegistry registry = new JVppRegistryImpl("ioamPotApiTest");
+             final JVpp jvpp = new JVppIoampotImpl()) {
+            registry.register(jvpp, new IoamPotTestCallback());
+
+            System.out.println("Sending ioam pot profile add request...");
+            PotProfileAdd request = new PotProfileAdd();
+            request.id = 0;
+            request.validator = 4;
+            request.secretKey = 1;
+            request.secretShare = 2;
+            request.prime = 1234;
+            request.maxBits = 53;
+            request.lpc = 1234;
+            request.polynomialPublic = 1234;
+            request.listNameLen = (byte)"test pot profile".getBytes().length;
+            request.listName = "test pot profile".getBytes();
+            final int result = jvpp.send(request);
+            System.out.printf("PotProfileAdd send result = %d%n", result);
+
+            Thread.sleep(1000);
+
+            System.out.println("Disconnecting...");
+        }
+    }
+}
diff --git a/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/Readme.txt b/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/Readme.txt
new file mode 100644
index 00000000..2323494d
--- /dev/null
+++ b/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/Readme.txt
@@ -0,0 +1 @@
+sudo java -cp build-vpp_debug-native/vpp-api/java/jvpp-registry-16.12.jar:build-vpp_debug-native/plugins/ioam-plugin/jvpp-ioam-pot-1.0.jar io.fd.vpp.jvpp.ioampot.test.IoamPotApiTest
diff --git a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
new file mode 100644
index 00000000..9291dbba
--- /dev/null
+++ b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+
+#include <ioam/lib-pot/pot_msg_enum.h>
+#define vl_typedefs             /* define message structures */
+#include <ioam/lib-pot/pot_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun
+#include <ioam/lib-pot/pot_all_api_h.h>
+#undef vl_endianfun
+
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <ioam/lib-pot/pot_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <ioam/lib-pot/pot_all_api_h.h>
+#undef vl_api_version
+
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#if VPPJNI_DEBUG == 1
+  #define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
+#else
+  #define DEBUG_LOG(...)
+#endif
+
+#include <jvpp-common/jvpp_common.h>
+
+#include "jvpp-ioampot/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h"
+#include "jvpp_ioam_pot.h"
+#include "jvpp-ioampot/jvpp_ioampot_gen.h"
+
+/*
+ * Class:     io_fd_vpp_jvpp_ioampot_JVppIoampotImpl
+ * Method:    init0
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_init0
+  (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
+  ioampot_main_t * plugin_main = &ioampot_main;
+  u8 * name;
+  clib_warning ("Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_init0");
+
+  plugin_main->my_client_index = my_client_index;
+  plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
+
+  name = format (0, "ioam_pot_%08x%c", api_version, 0);
+  plugin_main->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  if (plugin_main->msg_id_base == (u16) ~0) {
+    jclass exClass = (*env)->FindClass(env, "java/lang/IllegalStateException");
+    (*env)->ThrowNew(env, exClass, "ioam_pot plugin is not loaded in VPP");
+  } else {
+    plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
+    plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
+
+    #define _(N,n)                                  \
+        vl_msg_api_set_handlers(VL_API_##N + plugin_main->msg_id_base, #n,     \
+                vl_api_##n##_t_handler,             \
+                vl_noop_handler,                    \
+                vl_api_##n##_t_endian,              \
+                vl_api_##n##_t_print,               \
+                sizeof(vl_api_##n##_t), 1);
+        foreach_api_reply_handler;
+    #undef _
+  }
+}
+
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_close0
+(JNIEnv *env, jclass clazz) {
+  ioampot_main_t * plugin_main = &ioampot_main;
+
+    // cleanup:
+    (*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
+    (*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
+
+    plugin_main->callbackClass = NULL;
+    plugin_main->callbackObject = NULL;
+}
+
+/* Attach thread to JVM and cache class references when initiating JVPP iOAM POT */
+jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+    JNIEnv* env;
+
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+        return JNI_EVERSION;
+    }
+
+    if (cache_class_references(env) != 0) {
+        clib_warning ("Failed to cache class references\n");
+        return JNI_ERR;
+    }
+
+    return JNI_VERSION_1_8;
+}
+
+/* Clean up cached references when disposing JVPP iOAM POT */
+void JNI_OnUnload(JavaVM *vm, void *reserved) {
+    JNIEnv* env;
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+        return;
+    }
+    delete_class_references(env);
+}
diff --git a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h
new file mode 100644
index 00000000..00aa51db
--- /dev/null
+++ b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_jvpp_ioam_pot_h__
+#define __included_jvpp_ioam_pot_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <jni.h>
+
+/* Global state for JVPP-IOAM-POT */
+typedef struct {
+    /* Base message index for the pot plugin */
+    u16 msg_id_base;
+
+    /* Pointer to shared memory queue */
+    unix_shared_memory_queue_t * vl_input_queue;
+
+    /* VPP api client index */
+    u32 my_client_index;
+
+    /* Callback object and class references enabling asynchronous Java calls */
+    jobject callbackObject;
+    jclass callbackClass;
+
+} ioampot_main_t;
+
+ioampot_main_t ioampot_main __attribute__((aligned (64)));
+
+
+#endif /* __included_jvpp_ioam_pot_h__ */
diff --git a/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/IoamTraceApiTest.java b/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/IoamTraceApiTest.java
new file mode 100644
index 00000000..bc8c1c3a
--- /dev/null
+++ b/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/IoamTraceApiTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.ioamtrace.test;
+
+import io.fd.vpp.jvpp.JVpp;
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.VppCallbackException;
+import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtraceFacade;
+import io.fd.vpp.jvpp.ioamtrace.JVppIoamtraceImpl;
+import io.fd.vpp.jvpp.ioamtrace.callback.TraceProfileAddCallback;
+import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAdd;
+import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileAddReply;
+import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfig;
+import io.fd.vpp.jvpp.ioamtrace.dto.TraceProfileShowConfigReply;
+
+public class IoamTraceApiTest {
+
+    static class IoamTraceTestCallback implements TraceProfileAddCallback {
+
+        @Override
+        public void onTraceProfileAddReply(final TraceProfileAddReply reply) {
+            System.out.printf("Received TraceProfileAddReply reply: context=%d%n",
+                reply.context);
+        }
+
+        @Override
+        public void onError(VppCallbackException ex) {
+            System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n", ex.getMethodName(),
+                ex.getCtxId(), ex.getErrorCode());
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        ioamTraceTestApi();
+    }
+
+    private static void ioamTraceTestApi() throws Exception {
+        System.out.println("Testing Java API for ioam trace plugin");
+        try (final JVppRegistry registry = new JVppRegistryImpl("ioamTraceApiTest");
+             final JVpp jvpp = new JVppIoamtraceImpl()) {
+	    FutureJVppIoamtraceFacade ioamtraceJvpp = new FutureJVppIoamtraceFacade(registry,jvpp);
+
+            System.out.println("Sending ioam trace profile add request...");
+            TraceProfileAdd request = new TraceProfileAdd();
+            request.traceType = 0x1f;
+            request.numElts = 4;
+            request.nodeId = 1;
+            request.traceTsp = 2;
+            request.appData = 1234;
+            final int result = jvpp.send(request);
+            System.out.printf("TraceProfileAdd send result = %d%n", result);
+
+            Thread.sleep(1000);
+
+	    TraceProfileShowConfig showRequest = new TraceProfileShowConfig();
+	    TraceProfileShowConfigReply reply = ioamtraceJvpp.traceProfileShowConfig(showRequest).toCompletableFuture().get();
+            System.out.printf("TraceProfileShowConfig result = "+ reply.toString());
+
+            System.out.println("Disconnecting...");
+        }
+    }
+}
diff --git a/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt b/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt
new file mode 100644
index 00000000..17e45a81
--- /dev/null
+++ b/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt
@@ -0,0 +1 @@
+sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-17.01.jar:build-vpp-native/plugins/ioam-plugin/jvpp-ioam-trace-1.0.jar io.fd.vpp.jvpp.ioamtrace.test.IoamTraceApiTest
diff --git a/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c b/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c
new file mode 100644
index 00000000..0bf17889
--- /dev/null
+++ b/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+
+#include <ioam/lib-trace/trace_msg_enum.h>
+#define vl_typedefs             /* define message structures */
+#include <ioam/lib-trace/trace_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun
+#include <ioam/lib-trace/trace_all_api_h.h>
+#undef vl_endianfun
+
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <ioam/lib-trace/trace_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <ioam/lib-trace/trace_all_api_h.h>
+#undef vl_api_version
+
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#if VPPJNI_DEBUG == 1
+  #define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
+#else
+  #define DEBUG_LOG(...)
+#endif
+
+#include <jvpp-common/jvpp_common.h>
+
+#include "jvpp-ioamtrace/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h"
+#include "jvpp_ioam_trace.h"
+#include "jvpp-ioamtrace/jvpp_ioamtrace_gen.h"
+
+/*
+ * Class:     io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl
+ * Method:    init0
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl_init0
+  (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
+  ioamtrace_main_t * plugin_main = &ioamtrace_main;
+  u8 * name;
+  clib_warning ("Java_io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl_init0");
+
+  plugin_main->my_client_index = my_client_index;
+  plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
+
+  name = format (0, "ioam_trace_%08x%c", api_version, 0);
+  plugin_main->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  if (plugin_main->msg_id_base == (u16) ~0) {
+    jclass exClass = (*env)->FindClass(env, "java/lang/IllegalStateException");
+    (*env)->ThrowNew(env, exClass, "ioam_trace plugin is not loaded in VPP");
+  } else {
+    plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
+    plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
+
+    #define _(N,n)                                  \
+        vl_msg_api_set_handlers(VL_API_##N + plugin_main->msg_id_base, #n,     \
+                vl_api_##n##_t_handler,             \
+                vl_noop_handler,                    \
+                vl_api_##n##_t_endian,              \
+                vl_api_##n##_t_print,               \
+                sizeof(vl_api_##n##_t), 1);
+        foreach_api_reply_handler;
+    #undef _
+  }
+}
+
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl_close0
+(JNIEnv *env, jclass clazz) {
+  ioamtrace_main_t * plugin_main = &ioamtrace_main;
+
+    // cleanup:
+    (*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
+    (*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
+
+    plugin_main->callbackClass = NULL;
+    plugin_main->callbackObject = NULL;
+}
+
+/* Attach thread to JVM and cache class references when initiating JVPP iOAM Trace */
+jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+    JNIEnv* env;
+
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+        return JNI_EVERSION;
+    }
+
+    if (cache_class_references(env) != 0) {
+        clib_warning ("Failed to cache class references\n");
+        return JNI_ERR;
+    }
+
+    return JNI_VERSION_1_8;
+}
+
+/* Clean up cached references when disposing JVPP iOAM Trace */
+void JNI_OnUnload(JavaVM *vm, void *reserved) {
+    JNIEnv* env;
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+        return;
+    }
+    delete_class_references(env);
+}
diff --git a/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.h b/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.h
new file mode 100644
index 00000000..9fc16c15
--- /dev/null
+++ b/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_jvpp_ioam_trace_h__
+#define __included_jvpp_ioam_trace_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <jni.h>
+
+/* Global state for JVPP-IOAM-TRACE */
+typedef struct {
+    /* Base message index for the trace plugin */
+    u16 msg_id_base;
+
+    /* Pointer to shared memory queue */
+    unix_shared_memory_queue_t * vl_input_queue;
+
+    /* VPP api client index */
+    u32 my_client_index;
+
+    /* Callback object and class references enabling asynchronous Java calls */
+    jobject callbackObject;
+    jclass callbackClass;
+
+} ioamtrace_main_t;
+
+ioamtrace_main_t ioamtrace_main __attribute__((aligned (64)));
+
+
+#endif /* __included_jvpp_ioam_trace_h__ */
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java
new file mode 100644
index 00000000..55f25a7b
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp;
+
+import io.fd.vpp.jvpp.callback.JVppCallback;
+import io.fd.vpp.jvpp.dto.ControlPing;
+import io.fd.vpp.jvpp.dto.JVppRequest;
+
+/**
+ * Base interface for plugin's Java API.
+ */
+public interface JVpp extends AutoCloseable {
+
+    /**
+     * Sends request to vpp.
+     *
+     * @param request request to be sent
+     * @return unique identifer of message in message queue
+     * @throws VppInvocationException when message could not be sent
+     */
+    int send(final JVppRequest request) throws VppInvocationException;
+
+    /**
+     * Initializes plugin's Java API.
+     *
+     * @param registry     plugin registry
+     * @param callback     called by vpe.api message handlers
+     * @param queueAddress address of vpp shared memory queue
+     * @param clientIndex  vpp client identifier
+     */
+    void init(final JVppRegistry registry, final JVppCallback callback, final long queueAddress,
+              final int clientIndex);
+
+    /**
+     * Sends control_ping message.
+     *
+     * @param controlPing request DTO
+     * @return unique identifer of message in message queue
+     * @throws VppInvocationException when message could not be sent
+     */
+    int controlPing(final ControlPing controlPing) throws VppInvocationException;
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java
new file mode 100644
index 00000000..6535db02
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp;
+
+import io.fd.vpp.jvpp.callback.JVppCallback;
+
+/**
+ * Manages VPP connection and stores plugin callbacks.
+ */
+public interface JVppRegistry extends AutoCloseable {
+
+    /**
+     * Vpp connection managed by the registry.
+     *
+     * @return representation of vpp connection
+     */
+    VppConnection getConnection();
+
+    /**
+     * Registers callback and initializes Java API for given plugin.
+     *
+     * @param jvpp     plugin name
+     * @param callback callback provided by the plugin
+     * @throws NullPointerException     if name or callback is null
+     * @throws IllegalArgumentException if plugin was already registered
+     */
+    void register(final JVpp jvpp, final JVppCallback callback);
+
+    /**
+     * Unregisters callback for the given plugin.
+     *
+     * @param name plugin name
+     * @throws NullPointerException     if name is null
+     * @throws IllegalArgumentException if plugin was not registered
+     */
+    void unregister(final String name);
+
+    /**
+     * Returns callback registered for the plugin.
+     *
+     * @param name plugin name
+     * @return callback provided by the plugin
+     * @throws NullPointerException     if name is null
+     * @throws IllegalArgumentException if plugin was not registered
+     */
+    JVppCallback get(final String name);
+
+    /**
+     * Sends control ping. Reply handler calls callback registered for give plugin.
+     *
+     * Control ping is used for initial RX thread to Java thread attachment
+     * that takes place in the plugin's JNI lib
+     * and to wrap dump message replies in one list.
+     *
+     * VPP plugins don't have to provide special control ping, therefore
+     * it is necessary to providing control ping support in JVppRegistry.
+
+     * @param clazz identifies plugin that should receive ping callback
+     * @return unique identifier of message in message queue
+     */
+    int controlPing(final Class<? extends JVpp> clazz) throws VppInvocationException;
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java
new file mode 100644
index 00000000..98ef1c15
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp;
+
+import static java.util.Objects.requireNonNull;
+
+import io.fd.vpp.jvpp.callback.ControlPingCallback;
+import io.fd.vpp.jvpp.callback.JVppCallback;
+import io.fd.vpp.jvpp.dto.ControlPingReply;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Default implementation of JVppRegistry.
+ */
+public final class JVppRegistryImpl implements JVppRegistry, ControlPingCallback {
+
+    private static final Logger LOG = Logger.getLogger(JVppRegistryImpl.class.getName());
+
+    private final VppJNIConnection connection;
+    // Unguarded concurrent map, no race conditions expected on top of that
+    private final Map<String, JVppCallback> pluginRegistry;
+    // Guarded by self
+    private final Map<Integer, ControlPingCallback> pingCalls;
+
+    public JVppRegistryImpl(final String clientName) throws IOException {
+        connection = new VppJNIConnection(clientName);
+        connection.connect();
+        pluginRegistry = new ConcurrentHashMap<>();
+        pingCalls = new HashMap<>();
+    }
+
+    @Override
+    public VppConnection getConnection() {
+        return connection;
+    }
+
+    @Override
+    public void register(final JVpp jvpp, final JVppCallback callback) {
+        requireNonNull(jvpp, "jvpp should not be null");
+        requireNonNull(callback, "Callback should not be null");
+        final String name = jvpp.getClass().getName();
+        if (pluginRegistry.containsKey(name)) {
+            throw new IllegalArgumentException(
+                String.format("Callback for plugin %s was already registered", name));
+        }
+        jvpp.init(this, callback, connection.getConnectionInfo().queueAddress,
+            connection.getConnectionInfo().clientIndex);
+        pluginRegistry.put(name, callback);
+    }
+
+    @Override
+    public void unregister(final String name) {
+        requireNonNull(name, "Plugin name should not be null");
+        final JVppCallback previous = pluginRegistry.remove(name);
+        assertPluginWasRegistered(name, previous);
+    }
+
+    @Override
+    public JVppCallback get(final String name) {
+        requireNonNull(name, "Plugin name should not be null");
+        JVppCallback value = pluginRegistry.get(name);
+        assertPluginWasRegistered(name, value);
+        return value;
+    }
+
+    private native int controlPing0() throws VppInvocationException;
+
+    @Override
+    public int controlPing(final Class<? extends JVpp> clazz) throws VppInvocationException {
+        connection.checkActive();
+        final String name = clazz.getName();
+
+        final ControlPingCallback callback = (ControlPingCallback) pluginRegistry.get(clazz.getName());
+        assertPluginWasRegistered(name, callback);
+
+        synchronized (pingCalls) {
+            int context = controlPing0();
+            if (context < 0) {
+                throw new VppInvocationException("controlPing", context);
+            }
+
+            pingCalls.put(context, callback);
+            return context;
+        }
+    }
+
+    @Override
+    public void onControlPingReply(final ControlPingReply reply) {
+        final ControlPingCallback callback;
+        synchronized (pingCalls) {
+            callback = pingCalls.remove(reply.context);
+            if (callback == null) {
+                LOG.log(Level.WARNING, "No callback was registered for reply context=" + reply.context + " Contexts waiting="
+                    + pingCalls.keySet());
+                return;
+            }
+        }
+        // pass the reply to the callback registered by the ping caller
+        callback.onControlPingReply(reply);
+    }
+
+    @Override
+    public void onError(final VppCallbackException ex) {
+        final int ctxId = ex.getCtxId();
+        final ControlPingCallback callback;
+
+        synchronized (pingCalls) {
+            callback = pingCalls.get(ctxId);
+        }
+        if (callback == null) {
+            LOG.log(Level.WARNING, "No callback was registered for reply id={0} ", ctxId);
+            return;
+        }
+        // pass the error to the callback registered by the ping caller
+        callback.onError(ex);
+    }
+
+    private static void assertPluginWasRegistered(final String name, final JVppCallback value) {
+        if (value == null) {
+            throw new IllegalArgumentException(String.format("Callback for plugin %s is not registered", name));
+        }
+    }
+
+    @Override
+    public void close() throws Exception {
+        connection.close();
+    }
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java
new file mode 100644
index 00000000..ce6d1bfc
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utility class for loading JNI libraries.
+ */
+public final class NativeLibraryLoader {
+
+    private static final Logger LOG = Logger.getLogger(NativeLibraryLoader.class.getName());
+
+    private NativeLibraryLoader() {
+        throw new UnsupportedOperationException("This utility class cannot be instantiated.");
+    }
+
+    /**
+     * Loads JNI library using class loader of the given class.
+     *
+     * @param libName name of the library to be loaded
+     */
+    public static void loadLibrary(final String libName, final Class clazz) throws IOException {
+        java.util.Objects.requireNonNull(libName, "libName should not be null");
+        java.util.Objects.requireNonNull(clazz, "clazz should not be null");
+        try (final InputStream is = clazz.getResourceAsStream('/' + libName)) {
+            if (is == null) {
+                throw new IOException("Failed to open library resource " + libName);
+            }
+            loadStream(libName, is);
+        }
+    }
+
+    private static void loadStream(final String libName, final InputStream is) throws IOException {
+        final Set<PosixFilePermission> perms = PosixFilePermissions.fromString("rwxr-x---");
+        final Path p = Files.createTempFile(libName, null, PosixFilePermissions.asFileAttribute(perms));
+        try {
+            Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
+            Runtime.getRuntime().load(p.toString());
+        } catch (Exception e) {
+            throw new IOException("Failed to load library " + p, e);
+        } finally {
+            try {
+                Files.deleteIfExists(p);
+            } catch (IOException e) {
+                LOG.log(Level.WARNING, String.format("Failed to delete temporary file %s.", p), e);
+            }
+        }
+    }
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java
new file mode 100644
index 00000000..d71e3055
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp;
+
+/**
+ * Base exception representing failed operation of JVpp request call
+ */
+public abstract class VppBaseCallException extends Exception {
+    private final String methodName;
+    private final int errorCode;
+
+    /**
+     * Constructs an VppCallbackException with the specified api method name and error code.
+     *
+     * @param methodName name of a method, which invocation or execution failed
+     * @param errorCode  negative error code value associated with this failure
+     * @throws NullPointerException     if apiMethodName is null
+     */
+    public VppBaseCallException(final String methodName, final int errorCode) {
+        super(String.format("vppApi.%s failed with error code: %d", methodName, errorCode));
+        this.methodName = java.util.Objects.requireNonNull(methodName, "apiMethodName is null!");
+        this.errorCode = errorCode;
+        if(errorCode >= 0) {
+            throw new IllegalArgumentException("Error code must be < 0. Was " + errorCode +
+                    " for " + methodName );
+        }
+    }
+
+    /**
+     * Returns  name of a method, which invocation failed.
+     *
+     * @return method name
+     */
+    public String getMethodName() {
+        return methodName;
+    }
+
+    /**
+     * Returns the error code associated with this failure.
+     *
+     * @return a negative integer error code
+     */
+    public int getErrorCode() {
+        return errorCode;
+    }
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java
new file mode 100644
index 00000000..ccfcbd3c
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp;
+
+/**
+ * Callback Exception representing failed operation of JVpp request call
+ */
+public class VppCallbackException extends VppBaseCallException {
+    private final int ctxId;
+
+    /**
+     * Constructs an VppCallbackException with the specified api method name and error code.
+     *
+     * @param methodName  name of a method, which invocation failed.
+     * @param ctxId      api request context identifier
+     * @param errorCode  negative error code value associated with this failure
+     * @throws NullPointerException     if apiMethodName is null
+     */
+    public VppCallbackException(final String methodName, final int ctxId, final int errorCode ){
+        super(methodName, errorCode);
+        this.ctxId = ctxId;
+    }
+
+    /**
+     * Returns api request context identifier.
+     *
+     * @return value of context identifier
+     */
+    public int getCtxId() {
+        return ctxId;
+    }
+
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java
new file mode 100644
index 00000000..e6fd3bdb
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp;
+
+import java.io.IOException;
+
+/**
+ * Representation of a management connection to VPP.
+ */
+public interface VppConnection extends AutoCloseable {
+
+    /**
+     * Opens VppConnection for communication with VPP.
+     *
+     * @throws IOException if connection is not established
+     */
+    void connect() throws IOException;
+
+    /**
+     * Checks if this instance connection is active.
+     *
+     * @throws IllegalStateException if this instance was disconnected.
+     */
+    void checkActive();
+
+    /**
+     * Closes Vpp connection.
+     */
+    @Override
+    void close();
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java
new file mode 100644
index 00000000..a7ccb197
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp;
+
+/**
+ * Exception thrown when Vpp jAPI method invocation failed.
+ */
+public class VppInvocationException extends VppBaseCallException {
+    /**
+     * Constructs an VppApiInvocationFailedException with the specified api method name and error code.
+     *
+     * @param methodName  name of a method, which invocation failed.
+     * @param errorCode  negative error code value associated with this failure
+     * @throws NullPointerException     if apiMethodName is null
+     */
+    public VppInvocationException(final String methodName, final int errorCode) {
+        super(methodName, errorCode);
+    }
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java
new file mode 100644
index 00000000..320c1283
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp;
+
+import static io.fd.vpp.jvpp.NativeLibraryLoader.loadLibrary;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * JNI based representation of a management connection to VPP.
+ */
+public final class VppJNIConnection implements VppConnection {
+    private static final Logger LOG = Logger.getLogger(VppJNIConnection.class.getName());
+
+    static {
+        final String libName = "libjvpp_registry.so";
+        try {
+            loadLibrary(libName, VppJNIConnection.class);
+        } catch (IOException e) {
+            LOG.log(Level.SEVERE, String.format("Can't find vpp jni library: %s", libName), e);
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
+    private ConnectionInfo connectionInfo;
+
+    private final String clientName;
+    private volatile boolean disconnected = false;
+
+    /**
+     * Create VPPJNIConnection instance for client connecting to VPP.
+     *
+     * @param clientName client name instance to be used for communication. Single connection per clientName is
+     *                   allowed.
+     */
+    public VppJNIConnection(final String clientName) {
+        this.clientName = Objects.requireNonNull(clientName, "Null clientName");
+    }
+
+    /**
+     * Guarded by VppJNIConnection.class
+     */
+    private static final Map<String, VppJNIConnection> connections = new HashMap<>();
+
+    /**
+     * Initiate VPP connection for current instance
+     *
+     * Multiple instances are allowed since this class is not a singleton (VPP allows multiple management connections).
+     *
+     * However only a single connection per clientName is allowed.
+     *
+     * @throws IOException in case the connection could not be established
+     */
+
+    @Override
+    public void connect() throws IOException {
+        _connect();
+    }
+
+    private void _connect() throws IOException {
+        synchronized (VppJNIConnection.class) {
+            if (connections.containsKey(clientName)) {
+                throw new IOException("Client " + clientName + " already connected");
+            }
+
+            connectionInfo = clientConnect(clientName);
+            if (connectionInfo.status != 0) {
+                throw new IOException("Connection returned error " + connectionInfo.status);
+            }
+            connections.put(clientName, this);
+        }
+    }
+
+    @Override
+    public final void checkActive() {
+        if (disconnected) {
+            throw new IllegalStateException("Disconnected client " + clientName);
+        }
+    }
+
+    @Override
+    public final synchronized void close() {
+        if (!disconnected) {
+            disconnected = true;
+            try {
+                clientDisconnect();
+            } finally {
+                synchronized (VppJNIConnection.class) {
+                    connections.remove(clientName);
+                }
+            }
+        }
+    }
+
+    public ConnectionInfo getConnectionInfo() {
+        return connectionInfo;
+    }
+
+    /**
+     * VPP connection information used by plugins to reuse the connection.
+     */
+    public static final class ConnectionInfo {
+        public final long queueAddress;
+        public final int clientIndex;
+        public final int status; // FIXME throw exception instead
+
+        public ConnectionInfo(long queueAddress, int clientIndex, int status) {
+            this.queueAddress = queueAddress;
+            this.clientIndex = clientIndex;
+            this.status = status;
+        }
+    }
+
+    private static native ConnectionInfo clientConnect(String clientName);
+
+    private static native void clientDisconnect();
+
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java
new file mode 100644
index 00000000..efddfdbb
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.callback;
+
+import io.fd.vpp.jvpp.dto.ControlPingReply;
+
+/**
+ * Represents callback for control_ping message.
+ */
+public interface ControlPingCallback extends JVppCallback {
+
+    void onControlPingReply(ControlPingReply reply);
+
+}
+
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java
new file mode 100644
index 00000000..ae02063b
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.callback;
+import io.fd.vpp.jvpp.VppCallbackException;
+
+/**
+ * Base JVppCallback interface
+ */
+public interface JVppCallback {
+    /**
+     * onError callback handler used to report failing operation
+     * @param ex VppCallbackException object containing details about failing operation
+     */
+    void onError(VppCallbackException ex);
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java
new file mode 100644
index 00000000..8ab0cb21
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.callback;
+
+/**
+* Notification callback
+*/
+public interface JVppNotificationCallback {
+
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java
new file mode 100644
index 00000000..984e1674
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.dto;
+
+import io.fd.vpp.jvpp.JVpp;
+import io.fd.vpp.jvpp.VppInvocationException;
+
+/**
+ * Represents request DTO for control_ping message.
+ */
+public final class ControlPing implements JVppRequest {
+
+    @Override
+    public int send(final JVpp jvpp) throws VppInvocationException {
+        return jvpp.controlPing(this);
+    }
+
+}
+
+
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java
new file mode 100644
index 00000000..61e4d0e4
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.dto;
+
+import java.util.Objects;
+
+/**
+ * Represents reply DTO for control_ping message.
+ */
+public final class ControlPingReply implements JVppReply<ControlPing> {
+
+    public int context;
+    public int clientIndex;
+    public int vpePid;
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final ControlPingReply that = (ControlPingReply) o;
+        return context == that.context &&
+                clientIndex == that.clientIndex &&
+                vpePid == that.vpePid;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(context, clientIndex, vpePid);
+    }
+
+    @Override
+    public String toString() {
+        return "ControlPingReply{" +
+                "context=" + context +
+                ", clientIndex=" + clientIndex +
+                ", vpePid=" + vpePid +
+                '}';
+    }
+}
+
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java
new file mode 100644
index 00000000..60b98984
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.dto;
+
+/**
+* Base interface for all dump requests
+*/
+public interface JVppDump extends JVppRequest {
+
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppNotification.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppNotification.java
new file mode 100644
index 00000000..5554f501
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppNotification.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.dto;
+
+/**
+* Base interface for all notification DTOs
+*/
+public interface JVppNotification {
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java
new file mode 100644
index 00000000..73f512d4
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.dto;
+
+/**
+* Base interface for all reply DTOs
+*/
+public interface JVppReply<REQ extends JVppRequest> {
+
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java
new file mode 100644
index 00000000..15111395
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.dto;
+
+/**
+* Base interface for all dump replies
+*/
+public interface JVppReplyDump<REQ extends JVppRequest, RESP extends JVppReply<REQ>>
+    extends JVppReply<REQ> {
+
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java
new file mode 100644
index 00000000..9b301da2
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.dto;
+
+import io.fd.vpp.jvpp.JVpp;
+import io.fd.vpp.jvpp.VppInvocationException;
+
+/**
+* Base interface for all request DTOs
+*/
+public interface JVppRequest {
+
+    /**
+     * Invoke current operation asynchronously on VPP
+     *
+     * @return context id of this request. Can be used to track incoming response
+     */
+    int send(JVpp jvpp) throws VppInvocationException;
+
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java
new file mode 100644
index 00000000..e7df528a
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.future;
+
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import io.fd.vpp.jvpp.JVpp;
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.VppInvocationException;
+import io.fd.vpp.jvpp.dto.JVppDump;
+import io.fd.vpp.jvpp.dto.JVppReply;
+import io.fd.vpp.jvpp.dto.JVppReplyDump;
+import io.fd.vpp.jvpp.dto.JVppRequest;
+
+/**
+ * Future facade on top of JVpp
+ */
+public abstract class AbstractFutureJVppInvoker implements FutureJVppInvoker {
+
+    private final JVpp jvpp;
+    private final JVppRegistry registry;
+
+    /**
+     * Guarded by self
+     */
+    private final Map<Integer, CompletableFuture<? extends JVppReply<?>>> requests;
+
+    protected AbstractFutureJVppInvoker(final JVpp jvpp, final JVppRegistry registry,
+                                        final Map<Integer, CompletableFuture<? extends JVppReply<?>>> requestMap) {
+        this.jvpp =  Objects.requireNonNull(jvpp, "jvpp should not be null");
+        this.registry =  Objects.requireNonNull(registry, "registry should not be null");
+        // Request map represents the shared state between this facade and it's callback
+        // where facade puts futures in and callback completes + removes them
+        this.requests = Objects.requireNonNull(requestMap, "Null requestMap");
+    }
+
+    protected final Map<Integer, CompletableFuture<? extends JVppReply<?>>> getRequests() {
+        synchronized (requests) {
+            return requests;
+        }
+    }
+
+    // TODO use Optional in Future, java8
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <REQ extends JVppRequest, REPLY extends JVppReply<REQ>> CompletionStage<REPLY> send(REQ req) {
+        synchronized(requests) {
+            try {
+                final CompletableFuture<REPLY> replyCompletableFuture;
+                final int contextId = jvpp.send(req);
+
+                if(req instanceof JVppDump) {
+                    throw new IllegalArgumentException("Send with empty reply dump has to be used in case of dump calls");
+                }
+                replyCompletableFuture = new CompletableFuture<>();
+                requests.put(contextId, replyCompletableFuture);
+
+                // TODO in case of timeouts/missing replies, requests from the map are not removed
+                // consider adding cancel method, that would remove requests from the map and cancel
+                // associated replyCompletableFuture
+
+                return replyCompletableFuture;
+            } catch (VppInvocationException ex) {
+                final CompletableFuture<REPLY> replyCompletableFuture = new CompletableFuture<>();
+                replyCompletableFuture.completeExceptionally(ex);
+                return replyCompletableFuture;
+            }
+        }
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <REQ extends JVppRequest, REPLY extends JVppReply<REQ>, DUMP extends JVppReplyDump<REQ, REPLY>> CompletionStage<DUMP> send(
+            REQ req, DUMP emptyReplyDump) {
+        synchronized(requests) {
+            try {
+                final CompletableDumpFuture<DUMP> replyCompletableFuture;
+                final int contextId = jvpp.send(req);
+
+                if(!(req instanceof JVppDump)) {
+                    throw new IllegalArgumentException("Send without empty reply dump has to be used in case of regular calls");
+                }
+                replyCompletableFuture = new CompletableDumpFuture<>(contextId, emptyReplyDump);
+
+                requests.put(contextId, replyCompletableFuture);
+                requests.put(registry.controlPing(jvpp.getClass()), replyCompletableFuture);
+
+                // TODO in case of timeouts/missing replies, requests from the map are not removed
+                // consider adding cancel method, that would remove requests from the map and cancel
+                // associated replyCompletableFuture
+
+                return replyCompletableFuture;
+            } catch (VppInvocationException ex) {
+                final CompletableFuture<DUMP> replyCompletableFuture = new CompletableFuture<>();
+                replyCompletableFuture.completeExceptionally(ex);
+                return replyCompletableFuture;
+            }
+        }
+    }
+
+    public static final class CompletableDumpFuture<T extends JVppReplyDump<?, ?>> extends CompletableFuture<T> {
+        private final T replyDump;
+        private final int contextId;
+
+        public CompletableDumpFuture(final int contextId, final T emptyDump) {
+            this.contextId = contextId;
+            this.replyDump = emptyDump;
+        }
+
+        public int getContextId() {
+            return contextId;
+        }
+
+        public T getReplyDump() {
+            return replyDump;
+        }
+    }
+
+    @Override
+    public void close() throws Exception {
+        jvpp.close();
+    }
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java
new file mode 100644
index 00000000..7a48e418
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.future;
+
+
+import io.fd.vpp.jvpp.dto.JVppReply;
+import io.fd.vpp.jvpp.dto.JVppReplyDump;
+import io.fd.vpp.jvpp.dto.JVppRequest;
+
+import java.util.concurrent.CompletionStage;
+import io.fd.vpp.jvpp.notification.NotificationRegistryProvider;
+
+/**
+* Future facade on top of JVpp
+*/
+public interface FutureJVppInvoker extends NotificationRegistryProvider, AutoCloseable {
+
+    /**
+     * Invoke asynchronous operation on VPP
+     *
+     * @return CompletionStage with future result of an async VPP call
+     * @throws io.fd.vpp.jvpp.VppInvocationException when send request failed with details
+     */
+    <REQ extends JVppRequest, REPLY extends JVppReply<REQ>> CompletionStage<REPLY> send(REQ req);
+
+
+    /**
+     * Invoke asynchronous dump operation on VPP
+     *
+     * @return CompletionStage with aggregated future result of an async VPP dump call
+     * @throws io.fd.vpp.jvpp.VppInvocationException when send request failed with details
+     */
+    <REQ extends JVppRequest, REPLY extends JVppReply<REQ>, DUMP extends JVppReplyDump<REQ, REPLY>> CompletionStage<DUMP> send(
+            REQ req, DUMP emptyReplyDump);
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistry.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistry.java
new file mode 100644
index 00000000..3c72ff79
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistry.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.notification;
+
+/**
+ * Base registry for notification callbacks.
+ */
+public interface NotificationRegistry extends AutoCloseable {
+
+    void close();
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistryProvider.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistryProvider.java
new file mode 100644
index 00000000..4a6e06b7
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistryProvider.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.notification;
+
+/**
+ * Provides notification registry
+ */
+public interface NotificationRegistryProvider {
+
+    /**
+     * Get current notification registry instance
+     */
+    NotificationRegistry getNotificationRegistry();
+}
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java
new file mode 100644
index 00000000..27b4d29f
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.test;
+
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+
+/**
+ * Run using:
+ * sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-16.09.jar io.fd.vpp.jvpp.test.ConnectionTest
+ */
+public class ConnectionTest {
+
+    private static void testConnect() throws Exception {
+        System.out.println("Testing JNI connection with JVppRegistry");
+        final JVppRegistry registry = new JVppRegistryImpl("ConnectionTest");
+        try {
+            System.out.println("Successfully connected to vpp");
+            Thread.sleep(5000);
+            System.out.println("Disconnecting...");
+            Thread.sleep(1000);
+        } finally {
+            registry.close();
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        testConnect();
+    }
+}
diff --git a/src/vpp-api/java/jvpp-registry/jvpp_registry.c b/src/vpp-api/java/jvpp-registry/jvpp_registry.c
new file mode 100644
index 00000000..cbd5e0ab
--- /dev/null
+++ b/src/vpp-api/java/jvpp-registry/jvpp_registry.c
@@ -0,0 +1,352 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define _GNU_SOURCE /* for strcasestr(3) */
+#include <vnet/vnet.h>
+
+#define vl_api_version(n,v) static u32 vpe_api_version = (v);
+#include <vpp/api/vpe.api.h>
+#undef vl_api_version
+
+
+#include <jni.h>
+#include <jvpp-common/jvpp_common.h>
+#include "io_fd_vpp_jvpp_VppJNIConnection.h"
+#include "io_fd_vpp_jvpp_JVppRegistryImpl.h"
+
+#include <vpp/api/vpe_msg_enum.h>
+#define vl_typedefs             /* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_printfun
+
+vlib_main_t vlib_global_main;
+vlib_main_t **vlib_mains;
+
+/*
+ * The Java runtime isn't compile w/ -fstack-protector,
+ * so we have to supply missing external references for the
+ * regular vpp libraries.
+ */
+void __stack_chk_guard(void) __attribute__((weak));
+void __stack_chk_guard(void) {
+}
+
+typedef struct {
+    /* UThread attachment */
+    volatile u32 control_ping_result_ready;
+    volatile i32 control_ping_retval;
+
+    /* Control poing callback */
+    jobject registryObject;
+    jclass registryClass;
+    jclass controlPingReplyClass;
+    jclass callbackExceptionClass;
+
+    /* Thread cleanup */
+    pthread_key_t cleanup_rx_thread_key;
+
+    /* Connected indication */
+    volatile u8 is_connected;
+} jvpp_registry_main_t;
+
+jvpp_registry_main_t jvpp_registry_main __attribute__((aligned (64)));
+
+void vl_client_add_api_signatures(vl_api_memclnt_create_t *mp) {
+    /*
+     * Send the main API signature in slot 0. This bit of code must
+     * match the checks in ../vpe/api/api.c: vl_msg_api_version_check().
+     */
+    mp->api_versions[0] = clib_host_to_net_u32(vpe_api_version);
+}
+
+/* cleanup handler for RX thread */
+static_always_inline void cleanup_rx_thread(void *arg) {
+    jvpp_main_t * jm = &jvpp_main;
+    jvpp_registry_main_t * rm = &jvpp_registry_main;
+
+    vppjni_lock(jm, 99);
+
+    int getEnvStat = (*jm->jvm)->GetEnv(jm->jvm, (void **) &(jm->jenv),
+    JNI_VERSION_1_8);
+    if (getEnvStat == JNI_EVERSION) {
+        clib_warning("Unsupported JNI version\n");
+        rm->control_ping_retval = VNET_API_ERROR_UNSUPPORTED_JNI_VERSION;
+        goto out;
+    } else if (getEnvStat != JNI_EDETACHED) {
+        (*jm->jvm)->DetachCurrentThread(jm->jvm);
+    }
+    out: vppjni_unlock(jm);
+}
+
+static void vl_api_control_ping_reply_t_handler(
+        vl_api_control_ping_reply_t * mp) {
+    jvpp_main_t * jm = &jvpp_main;
+    jvpp_registry_main_t * rm = &jvpp_registry_main;
+    char was_thread_connected = 0;
+
+    // attach to java thread if not attached
+    int getEnvStat = (*jm->jvm)->GetEnv(jm->jvm, (void **) &(jm->jenv),
+            JNI_VERSION_1_8);
+    if (getEnvStat == JNI_EDETACHED) {
+        if ((*jm->jvm)->AttachCurrentThread(jm->jvm, (void **) &(jm->jenv),
+                NULL) != 0) {
+            clib_warning("Failed to attach thread\n");
+            rm->control_ping_retval =
+                    VNET_API_ERROR_FAILED_TO_ATTACH_TO_JAVA_THREAD;
+            goto out;
+        }
+
+        // workaround as we can't use pthread_cleanup_push
+        pthread_key_create(&rm->cleanup_rx_thread_key, cleanup_rx_thread);
+        // destructor is only called if the value of key is non null
+        pthread_setspecific(rm->cleanup_rx_thread_key, (void *) 1);
+        was_thread_connected = 1;
+    } else if (getEnvStat == JNI_EVERSION) {
+        clib_warning("Unsupported JNI version\n");
+        rm->control_ping_retval = VNET_API_ERROR_UNSUPPORTED_JNI_VERSION;
+        goto out;
+    }
+
+    if (was_thread_connected == 0) {
+        JNIEnv *env = jm->jenv;
+        if (mp->retval < 0) {
+            call_on_error("controlPing", mp->context, mp->retval,
+                    rm->registryClass, rm->registryObject,
+                    rm->callbackExceptionClass);
+        } else {
+            jmethodID constructor = (*env)->GetMethodID(env,
+                    rm->controlPingReplyClass, "<init>", "()V");
+            jmethodID callbackMethod = (*env)->GetMethodID(env,
+                    rm->registryClass, "onControlPingReply",
+                    "(Lio/fd/vpp/jvpp/dto/ControlPingReply;)V");
+
+            jobject dto = (*env)->NewObject(env, rm->controlPingReplyClass,
+                    constructor);
+
+            jfieldID contextFieldId = (*env)->GetFieldID(env,
+                    rm->controlPingReplyClass, "context", "I");
+            (*env)->SetIntField(env, dto, contextFieldId,
+                    clib_net_to_host_u32(mp->context));
+
+            jfieldID clientIndexFieldId = (*env)->GetFieldID(env,
+                    rm->controlPingReplyClass, "clientIndex", "I");
+            (*env)->SetIntField(env, dto, clientIndexFieldId,
+                    clib_net_to_host_u32(mp->client_index));
+
+            jfieldID vpePidFieldId = (*env)->GetFieldID(env,
+                    rm->controlPingReplyClass, "vpePid", "I");
+            (*env)->SetIntField(env, dto, vpePidFieldId,
+                    clib_net_to_host_u32(mp->vpe_pid));
+
+            (*env)->CallVoidMethod(env, rm->registryObject, callbackMethod,
+                    dto);
+            (*env)->DeleteLocalRef(env, dto);
+        }
+    }
+
+    out: rm->control_ping_result_ready = 1;
+}
+
+static int send_initial_control_ping() {
+    f64 timeout;
+    clib_time_t clib_time;
+    vl_api_control_ping_t * mp;
+    jvpp_main_t * jm = &jvpp_main;
+    jvpp_registry_main_t * rm = &jvpp_registry_main;
+
+    clib_time_init(&clib_time);
+
+    rm->control_ping_result_ready = 0;
+    mp = vl_msg_api_alloc(sizeof(*mp));
+    memset(mp, 0, sizeof(*mp));
+    mp->_vl_msg_id = ntohs(VL_API_CONTROL_PING);
+    mp->client_index = jm->my_client_index;
+
+    // send message:
+    vl_msg_api_send_shmem(jm->vl_input_queue, (u8 *) &mp);
+
+    // wait for results: Current time + 10 seconds is the timeout
+    timeout = clib_time_now(&clib_time) + 10.0;
+    int rv = VNET_API_ERROR_RESPONSE_NOT_READY;
+    while (clib_time_now(&clib_time) < timeout) {
+        if (rm->control_ping_result_ready == 1) {
+            rv = rm->control_ping_retval;
+            break;
+        }
+    }
+
+    if (rv != 0) {
+        clib_warning("common: first control ping failed: %d", rv);
+    }
+
+    return rv;
+}
+
+static int connect_to_vpe(char *name) {
+    jvpp_main_t * jm = &jvpp_main;
+    api_main_t * am = &api_main;
+
+    if (vl_client_connect_to_vlib("/vpe-api", name, 32) < 0)
+        return -1;
+
+    jm->my_client_index = am->my_client_index;
+
+    jm->vl_input_queue = am->shmem_hdr->vl_input_queue;
+
+    vl_msg_api_set_handlers(VL_API_CONTROL_PING_REPLY, "control_ping_reply",
+            vl_api_control_ping_reply_t_handler, vl_noop_handler,
+            vl_api_control_ping_reply_t_endian,
+            vl_api_control_ping_reply_t_print,
+            sizeof(vl_api_control_ping_reply_t), 1);
+
+    return send_initial_control_ping();
+}
+
+JNIEXPORT jobject JNICALL Java_io_fd_vpp_jvpp_VppJNIConnection_clientConnect(
+        JNIEnv *env, jclass obj, jstring clientName) {
+    int rv;
+    const char *client_name;
+    void vl_msg_reply_handler_hookup(void);
+    jvpp_main_t * jm = &jvpp_main;
+    jvpp_registry_main_t * rm = &jvpp_registry_main;
+
+    jclass connectionInfoClass = (*env)->FindClass(env,
+            "io/fd/vpp/jvpp/VppJNIConnection$ConnectionInfo");
+    jmethodID connectionInfoConstructor = (*env)->GetMethodID(env,
+            connectionInfoClass, "<init>", "(JII)V");
+
+    /*
+     * Bail out now if we're not running as root
+     */
+    if (geteuid() != 0) {
+        return (*env)->NewObject(env, connectionInfoClass,
+                connectionInfoConstructor, 0, 0,
+                VNET_API_ERROR_NOT_RUNNING_AS_ROOT);
+    }
+
+    if (rm->is_connected) {
+        return (*env)->NewObject(env, connectionInfoClass,
+                connectionInfoConstructor, 0, 0,
+                VNET_API_ERROR_ALREADY_CONNECTED);
+    }
+
+    client_name = (*env)->GetStringUTFChars(env, clientName, 0);
+    if (!client_name) {
+        return (*env)->NewObject(env, connectionInfoClass,
+                connectionInfoConstructor, 0, 0, VNET_API_ERROR_INVALID_VALUE);
+    }
+
+    rv = connect_to_vpe((char *) client_name);
+
+    if (rv < 0)
+        clib_warning("connection failed, rv %d", rv);
+
+    (*env)->ReleaseStringUTFChars(env, clientName, client_name);
+
+    return (*env)->NewObject(env, connectionInfoClass,
+            connectionInfoConstructor, (jlong) jm->vl_input_queue,
+            (jint) jm->my_client_index, (jint) rv);
+}
+
+JNIEXPORT jint JNICALL Java_io_fd_vpp_jvpp_JVppRegistryImpl_controlPing0(
+        JNIEnv *env, jobject regstryObject) {
+    jvpp_main_t * jm = &jvpp_main;
+    vl_api_control_ping_t * mp;
+    u32 my_context_id = vppjni_get_context_id(&jvpp_main);
+    jvpp_registry_main_t * rm = &jvpp_registry_main;
+
+    if (rm->registryObject == 0) {
+        rm->registryObject = (*env)->NewGlobalRef(env, regstryObject);
+    }
+    if (rm->registryClass == 0) {
+        rm->registryClass = (jclass) (*env)->NewGlobalRef(env,
+                (*env)->GetObjectClass(env, regstryObject));
+    }
+
+    mp = vl_msg_api_alloc(sizeof(*mp));
+    memset(mp, 0, sizeof(*mp));
+    mp->_vl_msg_id = ntohs(VL_API_CONTROL_PING);
+    mp->client_index = jm->my_client_index;
+    mp->context = clib_host_to_net_u32(my_context_id);
+
+    // send message:
+    vl_msg_api_send_shmem(jm->vl_input_queue, (u8 *) &mp);
+    return my_context_id;
+}
+
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_VppJNIConnection_clientDisconnect(
+        JNIEnv *env, jclass clazz) {
+    jvpp_registry_main_t * rm = &jvpp_registry_main;
+    rm->is_connected = 0; // TODO make thread safe
+    vl_client_disconnect_from_vlib();
+
+    // cleanup:
+    if (rm->registryObject) {
+        (*env)->DeleteGlobalRef(env, rm->registryObject);
+        rm->registryObject = 0;
+    }
+    if (rm->registryClass) {
+        (*env)->DeleteGlobalRef(env, rm->registryClass);
+        rm->registryClass = 0;
+    }
+}
+
+jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+    jvpp_main_t * jm = &jvpp_main;
+    jvpp_registry_main_t * rm = &jvpp_registry_main;
+    JNIEnv* env;
+
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+        return JNI_EVERSION;
+    }
+
+    rm->controlPingReplyClass = (jclass) (*env)->NewGlobalRef(env,
+            (*env)->FindClass(env, "io/fd/vpp/jvpp/dto/ControlPingReply"));
+    if ((*env)->ExceptionCheck(env)) {
+        (*env)->ExceptionDescribe(env);
+        clib_warning("Failed to cache class references\n");
+        return JNI_ERR;
+    }
+
+    rm->callbackExceptionClass = (jclass) (*env)->NewGlobalRef(env,
+            (*env)->FindClass(env, "io/fd/vpp/jvpp/VppCallbackException"));
+    if ((*env)->ExceptionCheck(env)) {
+        (*env)->ExceptionDescribe(env);
+        return JNI_ERR;
+    }
+
+    jm->jvm = vm;
+    return JNI_VERSION_1_8;
+}
+
+void JNI_OnUnload(JavaVM *vm, void *reserved) {
+    jvpp_main_t * jm = &jvpp_main;
+    JNIEnv* env;
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+        return;
+    }
+
+    jm->jenv = NULL;
+    jm->jvm = NULL;
+}
diff --git a/src/vpp-api/java/jvpp-snat/io/fd/vpp/jvpp/snat/test/CallbackApiTest.java b/src/vpp-api/java/jvpp-snat/io/fd/vpp/jvpp/snat/test/CallbackApiTest.java
new file mode 100644
index 00000000..32165d96
--- /dev/null
+++ b/src/vpp-api/java/jvpp-snat/io/fd/vpp/jvpp/snat/test/CallbackApiTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.vpp.jvpp.snat.test;
+
+import io.fd.vpp.jvpp.JVpp;
+import io.fd.vpp.jvpp.JVppRegistry;
+import io.fd.vpp.jvpp.JVppRegistryImpl;
+import io.fd.vpp.jvpp.VppCallbackException;
+import io.fd.vpp.jvpp.snat.JVppSnatImpl;
+import io.fd.vpp.jvpp.snat.callback.SnatInterfaceAddDelFeatureCallback;
+import io.fd.vpp.jvpp.snat.dto.SnatInterfaceAddDelFeature;
+import io.fd.vpp.jvpp.snat.dto.SnatInterfaceAddDelFeatureReply;
+
+public class CallbackApiTest {
+
+    static class TestCallback implements SnatInterfaceAddDelFeatureCallback {
+
+        @Override
+        public void onSnatInterfaceAddDelFeatureReply(final SnatInterfaceAddDelFeatureReply msg) {
+            System.out.printf("Received SnatInterfaceAddDelFeatureReply: context=%d%n",
+                msg.context);
+        }
+
+        @Override
+        public void onError(VppCallbackException ex) {
+            System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n", ex.getMethodName(),
+                ex.getCtxId(), ex.getErrorCode());
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        testCallbackApi();
+    }
+
+    private static void testCallbackApi() throws Exception {
+        System.out.println("Testing Java callback API for snat plugin");
+        try (final JVppRegistry registry = new JVppRegistryImpl("SnatCallbackApiTest");
+             final JVpp jvpp = new JVppSnatImpl()) {
+            registry.register(jvpp, new TestCallback());
+
+            System.out.println("Sending SnatInterfaceAddDelFeature request...");
+            SnatInterfaceAddDelFeature request = new SnatInterfaceAddDelFeature();
+            request.isAdd = 1;
+            request.isInside = 1;
+            request.swIfIndex = 1;
+            final int result = jvpp.send(request);
+            System.out.printf("SnatInterfaceAddDelFeature send result = %d%n", result);
+
+            Thread.sleep(1000);
+
+            System.out.println("Disconnecting...");
+        }
+    }
+}
diff --git a/src/vpp-api/java/jvpp-snat/io/fd/vpp/jvpp/snat/test/Readme.txt b/src/vpp-api/java/jvpp-snat/io/fd/vpp/jvpp/snat/test/Readme.txt
new file mode 100644
index 00000000..a2b0c41f
--- /dev/null
+++ b/src/vpp-api/java/jvpp-snat/io/fd/vpp/jvpp/snat/test/Readme.txt
@@ -0,0 +1 @@
+sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-17.01.jar:build-vpp-native/plugins/snat-plugin/jvpp-snat-1.0.jar io.fd.vpp.jvpp.snat.test.CallbackApiTest
diff --git a/src/vpp-api/java/jvpp-snat/jvpp_snat.c b/src/vpp-api/java/jvpp-snat/jvpp_snat.c
new file mode 100644
index 00000000..1095b6eb
--- /dev/null
+++ b/src/vpp-api/java/jvpp-snat/jvpp_snat.c
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+
+#include <snat/snat_msg_enum.h>
+#define vl_typedefs             /* define message structures */
+#include <snat/snat_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun
+#include <snat/snat_all_api_h.h>
+#undef vl_endianfun
+
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <snat/snat_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <snat/snat_all_api_h.h>
+#undef vl_api_version
+
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#if VPPJNI_DEBUG == 1
+  #define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
+#else
+  #define DEBUG_LOG(...)
+#endif
+
+#include <jvpp-common/jvpp_common.h>
+
+#include "jvpp-snat/io_fd_vpp_jvpp_snat_JVppSnatImpl.h"
+#include "jvpp_snat.h"
+#include "jvpp-snat/jvpp_snat_gen.h"
+
+/*
+ * Class:     io_fd_vpp_jvpp_snat_JVppsnatImpl
+ * Method:    init0
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_snat_JVppSnatImpl_init0
+  (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
+  snat_main_t * plugin_main = &snat_main;
+  u8 * name;
+  clib_warning ("Java_io_fd_vpp_jvpp_snat_JVppSnatImpl_init0");
+
+  plugin_main->my_client_index = my_client_index;
+  plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
+
+  name = format (0, "snat_%08x%c", api_version, 0);
+  plugin_main->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+  if (plugin_main->msg_id_base == (u16) ~0) {
+    jclass exClass = (*env)->FindClass(env, "java/lang/IllegalStateException");
+    (*env)->ThrowNew(env, exClass, "snat plugin is not loaded in VPP");
+  } else {
+    plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
+    plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
+
+    #define _(N,n)                                  \
+        vl_msg_api_set_handlers(VL_API_##N + plugin_main->msg_id_base, #n,     \
+                vl_api_##n##_t_handler,             \
+                vl_noop_handler,                    \
+                vl_api_##n##_t_endian,              \
+                vl_api_##n##_t_print,               \
+                sizeof(vl_api_##n##_t), 1);
+        foreach_api_reply_handler;
+    #undef _
+  }
+}
+
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_snat_JVppSnatImpl_close0
+(JNIEnv *env, jclass clazz) {
+  snat_main_t * plugin_main = &snat_main;
+
+    // cleanup:
+    (*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
+    (*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
+
+    plugin_main->callbackClass = NULL;
+    plugin_main->callbackObject = NULL;
+}
+
+/* Attach thread to JVM and cache class references when initiating JVPP SNAT */
+jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+    JNIEnv* env;
+
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+        return JNI_EVERSION;
+    }
+
+    if (cache_class_references(env) != 0) {
+        clib_warning ("Failed to cache class references\n");
+        return JNI_ERR;
+    }
+
+    return JNI_VERSION_1_8;
+}
+
+/* Clean up cached references when disposing JVPP SNAT */
+void JNI_OnUnload(JavaVM *vm, void *reserved) {
+    JNIEnv* env;
+    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+        return;
+    }
+    delete_class_references(env);
+}
diff --git a/src/vpp-api/java/jvpp-snat/jvpp_snat.h b/src/vpp-api/java/jvpp-snat/jvpp_snat.h
new file mode 100644
index 00000000..6426bda8
--- /dev/null
+++ b/src/vpp-api/java/jvpp-snat/jvpp_snat.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_jvpp_snat_h__
+#define __included_jvpp_snat_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <jni.h>
+
+/* Global state for JVPP-SNAT */
+typedef struct {
+    /* Base message index for the nsh plugin */
+    u16 msg_id_base;
+
+    /* Pointer to shared memory queue */
+    unix_shared_memory_queue_t * vl_input_queue;
+
+    /* VPP api client index */
+    u32 my_client_index;
+
+    /* Callback object and class references enabling asynchronous Java calls */
+    jobject callbackObject;
+    jclass callbackClass;
+
+} snat_main_t;
+
+snat_main_t snat_main __attribute__((aligned (64)));
+
+
+#endif /* __included_jvpp_snat_h__ */
diff --git a/src/vpp-api/java/jvpp/gen/jvpp_gen.py b/src/vpp-api/java/jvpp/gen/jvpp_gen.py
new file mode 100755
index 00000000..f51b11d0
--- /dev/null
+++ b/src/vpp-api/java/jvpp/gen/jvpp_gen.py
@@ -0,0 +1,185 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+# l
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import argparse
+import importlib
+import sys
+import os
+import json
+
+from jvppgen import types_gen
+from jvppgen import callback_gen
+from jvppgen import notification_gen
+from jvppgen import dto_gen
+from jvppgen import jvpp_callback_facade_gen
+from jvppgen import jvpp_future_facade_gen
+from jvppgen import jvpp_impl_gen
+from jvppgen import jvpp_c_gen
+from jvppgen import util
+
+blacklist = [ "memclnt.api", "flowperpkt.api" ]
+
+# Invocation:
+# ~/Projects/vpp/vpp-api/jvpp/gen$ mkdir -p java/io/fd/vpp/jvpp && cd java/io/fd/vpp/jvpp
+# ~/Projects/vpp/vpp-api/jvpp/gen/java/io/fd/vpp/jvpp$ ../../../../jvpp_gen.py -idefs_api_vpp_papi.py
+#
+# Compilation:
+# ~/Projects/vpp/vpp-api/jvpp/gen/java/io/fd/vpp/jvpp$ javac *.java dto/*.java callback/*.java
+#
+# where
+# defs_api_vpp_papi.py - vpe.api in python format (generated by vppapigen)
+
+parser = argparse.ArgumentParser(description='VPP Java API generator')
+parser.add_argument('-i', action="store", dest="inputfiles", nargs='+')
+parser.add_argument('--plugin_name', action="store", dest="plugin_name")
+parser.add_argument('--root_dir', action="store", dest="root_dir")
+args = parser.parse_args()
+
+sys.path.append(".")
+cwd = os.getcwd()
+
+print "Generating Java API for %s" % args.inputfiles
+print "inputfiles %s" % args.inputfiles
+plugin_name = args.plugin_name
+print "plugin_name %s" % plugin_name
+
+cfg = {}
+
+base_package = 'io.fd.vpp.jvpp'
+plugin_package = base_package + '.' + plugin_name
+root_dir = os.path.abspath(args.root_dir)
+print "root_dir %s" % root_dir
+work_dir = root_dir + "/target/" + plugin_package.replace(".","/")
+
+try:
+    os.makedirs(work_dir)
+except OSError:
+    if not os.path.isdir(work_dir):
+        raise
+
+os.chdir(work_dir)
+
+for inputfile in args.inputfiles:
+    if any(substring in inputfile for substring in blacklist):
+        print "WARNING: Imput file %s blacklisted" % inputfile
+        continue
+    _cfg = json.load(open(cwd + "/" + inputfile, 'r'))
+    if 'types' in cfg:
+        cfg['types'].extend(_cfg['types'])
+    else:
+        cfg['types'] = _cfg['types']
+    if 'messages' in cfg:
+        cfg['messages'].extend(_cfg['messages'])
+    else:
+        cfg['messages'] = _cfg['messages']
+
+
+def is_request_field(field_name):
+    return field_name not in {'_vl_msg_id', 'client_index', 'context'}
+
+
+def is_response_field(field_name):
+    return field_name not in {'_vl_msg_id'}
+
+
+def get_args(t, filter):
+    arg_list = []
+    for i in t:
+        if is_crc(i):
+            continue
+        if not filter(i[1]):
+            continue
+        arg_list.append(i[1])
+    return arg_list
+
+
+def get_types(t, filter):
+    types_list = []
+    lengths_list = []
+    crc = None
+    for i in t:
+        if is_crc(i):
+            crc = ('crc', i['crc'][2:])
+            continue
+        if not filter(i[1]):
+            continue
+        if len(i) is 3:  # array type
+            types_list.append(i[0] + '[]')
+            lengths_list.append((i[2], False))
+        elif len(i) is 4:  # variable length array type
+            types_list.append(i[0] + '[]')
+            lengths_list.append((i[3], True))
+        else:  # primitive type
+            types_list.append(i[0])
+            lengths_list.append((0, False))
+    return types_list, lengths_list, crc
+
+
+def is_crc(arg):
+    """ Check whether the argument inside message definition is just crc """
+    return 'crc' in arg
+
+
+def get_definitions(defs):
+    # Pass 1
+    func_list = []
+    func_name = {}
+    for a in defs:
+        java_name = util.underscore_to_camelcase(a[0])
+
+        # For replies include all the arguments except message_id
+        if util.is_reply(java_name):
+            types, lengths, crc = get_types(a[1:], is_response_field)
+            func_name[a[0]] = dict(
+                [('name', a[0]), ('java_name', java_name),
+                 ('args', get_args(a[1:], is_response_field)), ('full_args', get_args(a[1:], lambda x: True)),
+                 ('types', types), ('lengths', lengths), crc])
+        # For requests skip message_id, client_id and context
+        else:
+            types, lengths, crc = get_types(a[1:], is_request_field)
+            func_name[a[0]] = dict(
+                [('name', a[0]), ('java_name', java_name),
+                 ('args', get_args(a[1:], is_request_field)), ('full_args', get_args(a[1:], lambda x: True)),
+                 ('types', types), ('lengths', lengths), crc])
+
+        # Indexed by name
+        func_list.append(func_name[a[0]])
+    return func_list, func_name
+
+
+types_package = 'types'
+dto_package = 'dto'
+callback_package = 'callback'
+notification_package = 'notification'
+future_package = 'future'
+# TODO find better package name
+callback_facade_package = 'callfacade'
+
+types_list, types_name = get_definitions(cfg['types'])
+
+types_gen.generate_types(types_list, plugin_package, types_package, args.inputfiles)
+
+func_list, func_name = get_definitions(cfg['messages'])
+
+dto_gen.generate_dtos(func_list, base_package, plugin_package, plugin_name.title(), dto_package, args.inputfiles)
+jvpp_impl_gen.generate_jvpp(func_list, base_package, plugin_package, plugin_name, dto_package, args.inputfiles)
+callback_gen.generate_callbacks(func_list, base_package, plugin_package, plugin_name.title(), callback_package, dto_package, args.inputfiles)
+notification_gen.generate_notification_registry(func_list, base_package, plugin_package, plugin_name.title(), notification_package, callback_package, dto_package, args.inputfiles)
+jvpp_c_gen.generate_jvpp(func_list, plugin_name, args.inputfiles, root_dir)
+jvpp_future_facade_gen.generate_jvpp(func_list, base_package, plugin_package, plugin_name.title(), dto_package, callback_package, notification_package, future_package, args.inputfiles)
+jvpp_callback_facade_gen.generate_jvpp(func_list, base_package, plugin_package, plugin_name.title(), dto_package, callback_package, notification_package, callback_facade_package, args.inputfiles)
+
+print "Java API for %s generated successfully" % args.inputfiles
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/__init__.py b/src/vpp-api/java/jvpp/gen/jvppgen/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/callback_gen.py b/src/vpp-api/java/jvpp/gen/jvppgen/callback_gen.py
new file mode 100644
index 00000000..b3024b9c
--- /dev/null
+++ b/src/vpp-api/java/jvpp/gen/jvppgen/callback_gen.py
@@ -0,0 +1,105 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import util
+from string import Template
+
+from util import remove_suffix
+
+callback_suffix = "Callback"
+
+callback_template = Template("""
+package $plugin_package.$callback_package;
+
+/**
+ * <p>Represents callback for plugin's api file message.
+ * <br>It was generated by callback_gen.py based on $inputfile preparsed data:
+ * <pre>
+$docs
+ * </pre>
+ */
+public interface $cls_name extends $base_package.$callback_package.$callback_type {
+
+    $callback_method
+
+}
+""")
+
+global_callback_template = Template("""
+package $plugin_package.$callback_package;
+
+/**
+ * <p>Global aggregated callback interface.
+ * <br>It was generated by callback_gen.py based on $inputfile
+ * <br>(python representation of api file generated by vppapigen).
+ */
+public interface JVpp${plugin_name}GlobalCallback extends $base_package.$callback_package.ControlPingCallback, $callbacks {
+}
+""")
+
+
+def generate_callbacks(func_list, base_package, plugin_package, plugin_name, callback_package, dto_package, inputfile):
+    """ Generates callback interfaces """
+    print "Generating Callback interfaces"
+
+    if not os.path.exists(callback_package):
+        os.mkdir(callback_package)
+
+    callbacks = []
+    for func in func_list:
+
+        camel_case_name_with_suffix = util.underscore_to_camelcase_upper(func['name'])
+
+        if util.is_ignored(func['name']) or util.is_control_ping(camel_case_name_with_suffix):
+            continue
+        if not util.is_reply(camel_case_name_with_suffix) and not util.is_notification(func['name']):
+            continue
+
+        if util.is_reply(camel_case_name_with_suffix):
+            camel_case_name = util.remove_reply_suffix(camel_case_name_with_suffix)
+            callback_type = "JVppCallback"
+        else:
+            camel_case_name_with_suffix = util.add_notification_suffix(camel_case_name_with_suffix)
+            camel_case_name = camel_case_name_with_suffix
+            callback_type = "JVppNotificationCallback"
+
+        callbacks.append("{0}.{1}.{2}".format(plugin_package, callback_package, camel_case_name + callback_suffix))
+        callback_path = os.path.join(callback_package, camel_case_name + callback_suffix + ".java")
+        callback_file = open(callback_path, 'w')
+
+        reply_type = "%s.%s.%s" % (plugin_package, dto_package, camel_case_name_with_suffix)
+        method = "void on{0}({1} reply);".format(camel_case_name_with_suffix, reply_type)
+        callback_file.write(
+            callback_template.substitute(inputfile=inputfile,
+                                         docs=util.api_message_to_javadoc(func),
+                                         cls_name=camel_case_name + callback_suffix,
+                                         callback_method=method,
+                                         base_package=base_package,
+                                         plugin_package=plugin_package,
+                                         callback_package=callback_package,
+                                         callback_type=callback_type))
+        callback_file.flush()
+        callback_file.close()
+
+    callback_file = open(os.path.join(callback_package, "JVpp%sGlobalCallback.java" % plugin_name), 'w')
+    callback_file.write(global_callback_template.substitute(inputfile=inputfile,
+                                                            callbacks=", ".join(callbacks),
+                                                            base_package=base_package,
+                                                            plugin_package=plugin_package,
+                                                            plugin_name=plugin_name,
+                                                            callback_package=callback_package))
+    callback_file.flush()
+    callback_file.close()
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py b/src/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py
new file mode 100644
index 00000000..cfddb9ef
--- /dev/null
+++ b/src/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py
@@ -0,0 +1,308 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+from string import Template
+
+import util
+
+dto_template = Template("""
+package $plugin_package.$dto_package;
+
+/**
+ * <p>This class represents $description.
+ * <br>It was generated by dto_gen.py based on $inputfile preparsed data:
+ * <pre>
+$docs
+ * </pre>
+ */
+public final class $cls_name implements $base_package.$dto_package.$base_type {
+
+$fields
+$methods
+}
+""")
+
+field_template = Template("""    public $type $name;\n""")
+
+send_template = Template("""    @Override
+    public int send(final $base_package.JVpp jvpp) throws io.fd.vpp.jvpp.VppInvocationException {
+        return (($plugin_package.JVpp${plugin_name})jvpp).$method_name($args);
+    }""")
+
+
+def generate_dtos(func_list, base_package, plugin_package, plugin_name, dto_package, inputfile):
+    """ Generates dto objects in a dedicated package """
+    print "Generating DTOs"
+
+    if not os.path.exists(dto_package):
+        os.mkdir(dto_package)
+
+    for func in func_list:
+        camel_case_dto_name = util.underscore_to_camelcase_upper(func['name'])
+        camel_case_method_name = util.underscore_to_camelcase(func['name'])
+        dto_path = os.path.join(dto_package, camel_case_dto_name + ".java")
+
+        if util.is_ignored(func['name']) or util.is_control_ping(camel_case_dto_name):
+            continue
+
+        fields = generate_dto_fields(camel_case_dto_name, func)
+        methods = generate_dto_base_methods(camel_case_dto_name, func)
+        base_type = ""
+
+        # Generate request/reply or dump/dumpReply even if structure can be used as notification
+        if not util.is_just_notification(func["name"]):
+            if util.is_reply(camel_case_dto_name):
+                description = "reply DTO"
+                request_dto_name = get_request_name(camel_case_dto_name, func['name'])
+                if util.is_details(camel_case_dto_name):
+                    # FIXME assumption that dump calls end with "Dump" suffix. Not enforced in vpe.api
+                    base_type += "JVppReply<%s.%s.%s>" % (plugin_package, dto_package, request_dto_name + "Dump")
+                    generate_dump_reply_dto(request_dto_name, base_package, plugin_package, dto_package,
+                                            camel_case_dto_name, camel_case_method_name, func)
+                else:
+                    base_type += "JVppReply<%s.%s.%s>" % (plugin_package, dto_package, request_dto_name)
+            else:
+                args = "" if fields is "" else "this"
+                methods += send_template.substitute(method_name=camel_case_method_name,
+                                                    base_package=base_package,
+                                                    plugin_package=plugin_package,
+                                                    plugin_name=plugin_name,
+                                                    args=args)
+                if util.is_dump(camel_case_dto_name):
+                    base_type += "JVppDump"
+                    description = "dump request DTO"
+                else:
+                    base_type += "JVppRequest"
+                    description = "request DTO"
+
+            write_dto_file(base_package, plugin_package, base_type, camel_case_dto_name, description, dto_package,
+                           dto_path, fields, func, inputfile, methods)
+
+        # for structures that are also used as notifications, generate dedicated notification DTO
+        if util.is_notification(func["name"]):
+            base_type = "JVppNotification"
+            description = "notification DTO"
+            camel_case_dto_name = util.add_notification_suffix(camel_case_dto_name)
+            dto_path = os.path.join(dto_package, camel_case_dto_name + ".java")
+            methods = generate_dto_base_methods(camel_case_dto_name, func)
+            write_dto_file(base_package, plugin_package, base_type, camel_case_dto_name, description, dto_package,
+                           dto_path, fields, func, inputfile, methods)
+
+    flush_dump_reply_dtos(inputfile)
+
+
+def generate_dto_base_methods(camel_case_dto_name, func):
+    methods = generate_dto_hash(func)
+    methods += generate_dto_equals(camel_case_dto_name, func)
+    methods += generate_dto_tostring(camel_case_dto_name, func)
+    return methods
+
+
+def generate_dto_fields(camel_case_dto_name, func):
+    fields = ""
+    for t in zip(func['types'], func['args']):
+        # for retval don't generate dto field in Reply
+        field_name = util.underscore_to_camelcase(t[1])
+        if util.is_reply(camel_case_dto_name) and util.is_retval_field(field_name):
+            continue
+        fields += field_template.substitute(type=util.jni_2_java_type_mapping[t[0]],
+                                            name=field_name)
+    return fields
+
+
+tostring_field_template = Template("""                \"$field_name=\" + $field_name + ", " +\n""")
+tostring_array_field_template = Template("""                \"$field_name=\" + java.util.Arrays.toString($field_name) + ", " +\n""")
+tostring_template = Template("""    @Override
+    public String toString() {
+        return "$cls_name{" +
+$fields_tostring "}";
+    }\n\n""")
+
+
+def generate_dto_tostring(camel_case_dto_name, func):
+    tostring_fields = ""
+    for t in zip(func['types'], func['args']):
+
+        field_name = util.underscore_to_camelcase(t[1])
+        # for retval don't generate dto field in Reply
+        if util.is_retval_field(field_name):
+            continue
+
+        # handle array types
+        if util.is_array(util.jni_2_java_type_mapping[t[0]]):
+            tostring_fields += tostring_array_field_template.substitute(field_name=field_name)
+        else:
+            tostring_fields += tostring_field_template.substitute(field_name=field_name)
+
+    return tostring_template.substitute(cls_name=camel_case_dto_name,
+                                        fields_tostring=tostring_fields[:-8])
+
+equals_other_template = Template("""
+        final $cls_name other = ($cls_name) o;
+\n""")
+equals_field_template = Template("""        if (!java.util.Objects.equals(this.$field_name, other.$field_name)) {
+            return false;
+        }\n""")
+equals_array_field_template = Template("""        if (!java.util.Arrays.equals(this.$field_name, other.$field_name)) {
+            return false;
+        }\n""")
+equals_template = Template("""    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+$comparisons
+        return true;
+    }\n\n""")
+
+
+def generate_dto_equals(camel_case_dto_name, func):
+    equals_fields = ""
+    for t in zip(func['types'], func['args']):
+        field_name = util.underscore_to_camelcase(t[1])
+        # for retval don't generate dto field in Reply
+        if util.is_retval_field(field_name):
+            continue
+
+        # handle array types
+        if util.is_array(util.jni_2_java_type_mapping[t[0]]):
+            equals_fields += equals_array_field_template.substitute(field_name=field_name)
+        else:
+            equals_fields += equals_field_template.substitute(field_name=field_name)
+
+    if equals_fields != "":
+        equals_fields = equals_other_template.substitute(cls_name=camel_case_dto_name) + equals_fields
+
+    return equals_template.substitute(comparisons=equals_fields)
+
+
+hash_template = Template("""    @Override
+    public int hashCode() {
+        return java.util.Objects.hash($fields);
+    }\n\n""")
+hash_single_array_type_template = Template("""    @Override
+    public int hashCode() {
+        return java.util.Arrays.hashCode($fields);
+    }\n\n""")
+
+
+def generate_dto_hash(func):
+    hash_fields = ""
+
+    # Special handling for hashCode in case just a single array field is present. Cannot use Objects.equals since the
+    # array is mistaken for a varargs parameter. Instead use Arrays.hashCode in such case.
+    if len(func['args']) == 1:
+        single_type = func['types'][0]
+        single_type_name = func['args'][0]
+        if util.is_array(util.jni_2_java_type_mapping[single_type]):
+            return hash_single_array_type_template.substitute(fields=util.underscore_to_camelcase(single_type_name))
+
+    for t in zip(func['types'], func['args']):
+        field_name = util.underscore_to_camelcase(t[1])
+        # for retval don't generate dto field in Reply
+        if util.is_retval_field(field_name):
+            continue
+
+        hash_fields += field_name + ", "
+
+    return hash_template.substitute(fields=hash_fields[:-2])
+
+
+def write_dto_file(base_package, plugin_package, base_type, camel_case_dto_name, description, dto_package, dto_path,
+                   fields, func, inputfile, methods):
+    dto_file = open(dto_path, 'w')
+    dto_file.write(dto_template.substitute(inputfile=inputfile,
+                                           description=description,
+                                           docs=util.api_message_to_javadoc(func),
+                                           cls_name=camel_case_dto_name,
+                                           fields=fields,
+                                           methods=methods,
+                                           base_package=base_package,
+                                           plugin_package=plugin_package,
+                                           base_type=base_type,
+                                           dto_package=dto_package))
+    dto_file.flush()
+    dto_file.close()
+
+
+dump_dto_suffix = "ReplyDump"
+dump_reply_artificial_dtos = {}
+
+
+# Returns request name or special one from unconventional_naming_rep_req map
+def get_request_name(camel_case_dto_name, func_name):
+    return util.underscore_to_camelcase_upper(
+        util.unconventional_naming_rep_req[func_name]) if func_name in util.unconventional_naming_rep_req \
+        else util.remove_reply_suffix(camel_case_dto_name)
+
+
+def flush_dump_reply_dtos(inputfile):
+    for dump_reply_artificial_dto in dump_reply_artificial_dtos.values():
+        dto_path = os.path.join(dump_reply_artificial_dto['dto_package'],
+                                dump_reply_artificial_dto['cls_name'] + ".java")
+        dto_file = open(dto_path, 'w')
+        dto_file.write(dto_template.substitute(inputfile=inputfile,
+                                               description="dump reply wrapper",
+                                               docs=dump_reply_artificial_dto['docs'],
+                                               cls_name=dump_reply_artificial_dto['cls_name'],
+                                               fields=dump_reply_artificial_dto['fields'],
+                                               methods=dump_reply_artificial_dto['methods'],
+                                               plugin_package=dump_reply_artificial_dto['plugin_package'],
+                                               base_package=dump_reply_artificial_dto['base_package'],
+                                               base_type=dump_reply_artificial_dto['base_type'],
+                                               dto_package=dump_reply_artificial_dto['dto_package']))
+        dto_file.flush()
+        dto_file.close()
+
+
+def generate_dump_reply_dto(request_dto_name, base_package, plugin_package, dto_package, camel_case_dto_name,
+                            camel_case_method_name, func):
+    base_type = "JVppReplyDump<%s.%s.%s, %s.%s.%s>" % (
+        plugin_package, dto_package, util.remove_reply_suffix(camel_case_dto_name) + "Dump",
+        plugin_package, dto_package, camel_case_dto_name)
+    fields = "    public java.util.List<%s> %s = new java.util.ArrayList<>();" % (camel_case_dto_name, camel_case_method_name)
+    cls_name = camel_case_dto_name + dump_dto_suffix
+    # using artificial type for fields, just to bypass the is_array check in base methods generators
+    # the type is not really used
+    artificial_type = 'u8'
+
+    # In case of already existing artificial reply dump DTO, just update it
+    # Used for sub-dump dtos
+    if request_dto_name in dump_reply_artificial_dtos.keys():
+        dump_reply_artificial_dtos[request_dto_name]['fields'] += '\n' + fields
+        dump_reply_artificial_dtos[request_dto_name]['field_names'].append(func['name'])
+        dump_reply_artificial_dtos[request_dto_name]['field_types'].append(artificial_type)
+        methods = '\n' + generate_dto_base_methods(dump_reply_artificial_dtos[request_dto_name]['cls_name'],
+                                            {'args': dump_reply_artificial_dtos[request_dto_name]['field_names'],
+                                             'types': dump_reply_artificial_dtos[request_dto_name]['field_types']})
+        dump_reply_artificial_dtos[request_dto_name]['methods'] = methods
+    else:
+        methods = '\n' + generate_dto_base_methods(cls_name, {'args': [func['name']],
+                                                              'types': [artificial_type]})
+        dump_reply_artificial_dtos[request_dto_name] = ({'docs': util.api_message_to_javadoc(func),
+                                                         'cls_name': cls_name,
+                                                         'fields': fields,
+                                                         'field_names': [func['name']],
+                                                         'field_types': [artificial_type],
+                                                         # strip too many newlines at the end of base method block
+                                                         'methods': methods,
+                                                         'plugin_package': plugin_package,
+                                                         'base_package': base_package,
+                                                         'base_type': base_type,
+                                                         'dto_package': dto_package})
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jni_gen.py b/src/vpp-api/java/jvpp/gen/jvppgen/jni_gen.py
new file mode 100644
index 00000000..328cc8d3
--- /dev/null
+++ b/src/vpp-api/java/jvpp/gen/jvppgen/jni_gen.py
@@ -0,0 +1,295 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from string import Template
+
+import util
+
+variable_length_array_value_template = Template("""mp->${length_var_name}""")
+variable_length_array_template = Template("""clib_net_to_host_${length_field_type}(${value})""")
+
+dto_field_id_template = Template("""
+    jfieldID ${field_reference_name}FieldId = (*env)->GetFieldID(env, ${class_ref_name}Class, "${field_name}", "${jni_signature}");""")
+
+default_dto_field_setter_template = Template("""
+    (*env)->Set${jni_setter}(env, ${object_name}, ${field_reference_name}FieldId, mp->${c_name});
+""")
+
+variable_length_array_value_template = Template("""mp->${length_var_name}""")
+variable_length_array_template = Template("""clib_net_to_host_${length_field_type}(${value})""")
+
+u16_dto_field_setter_template = Template("""
+    (*env)->Set${jni_setter}(env, ${object_name}, ${field_reference_name}FieldId, clib_net_to_host_u16(mp->${c_name}));
+""")
+
+u32_dto_field_setter_template = Template("""
+    (*env)->Set${jni_setter}(env, ${object_name}, ${field_reference_name}FieldId, clib_net_to_host_u32(mp->${c_name}));
+""")
+
+u64_dto_field_setter_template = Template("""
+    (*env)->Set${jni_setter}(env, ${object_name}, ${field_reference_name}FieldId, clib_net_to_host_u64(mp->${c_name}));
+""")
+
+u8_array_dto_field_setter_template = Template("""
+    jbyteArray ${field_reference_name} = (*env)->NewByteArray(env, ${field_length});
+    (*env)->SetByteArrayRegion(env, ${field_reference_name}, 0, ${field_length}, (const jbyte*)mp->${c_name});
+    (*env)->SetObjectField(env, ${object_name}, ${field_reference_name}FieldId, ${field_reference_name});
+    (*env)->DeleteLocalRef(env, ${field_reference_name});
+""")
+
+u16_array_dto_field_setter_template = Template("""
+    {
+        jshortArray ${field_reference_name} = (*env)->NewShortArray(env, ${field_length});
+        jshort * ${field_reference_name}ArrayElements = (*env)->GetShortArrayElements(env, ${field_reference_name}, NULL);
+        unsigned int _i;
+        for (_i = 0; _i < ${field_length}; _i++) {
+            ${field_reference_name}ArrayElements[_i] = clib_net_to_host_u16(mp->${c_name}[_i]);
+        }
+
+        (*env)->ReleaseShortArrayElements(env,  ${field_reference_name}, ${field_reference_name}ArrayElements, 0);
+        (*env)->SetObjectField(env, ${object_name}, ${field_reference_name}FieldId, ${field_reference_name});
+        (*env)->DeleteLocalRef(env, ${field_reference_name});
+    }
+""")
+
+u32_array_dto_field_setter_template = Template("""
+    {
+        jintArray ${field_reference_name} = (*env)->NewIntArray(env, ${field_length});
+        jint * ${field_reference_name}ArrayElements = (*env)->GetIntArrayElements(env, ${field_reference_name}, NULL);
+        unsigned int _i;
+        for (_i = 0; _i < ${field_length}; _i++) {
+            ${field_reference_name}ArrayElements[_i] = clib_net_to_host_u32(mp->${c_name}[_i]);
+        }
+
+        (*env)->ReleaseIntArrayElements(env,  ${field_reference_name}, ${field_reference_name}ArrayElements, 0);
+        (*env)->SetObjectField(env, ${object_name}, ${field_reference_name}FieldId, ${field_reference_name});
+        (*env)->DeleteLocalRef(env, ${field_reference_name});
+    }
+""")
+
+# For each u64 array we get its elements. Then we convert values to host byte order.
+# All changes to  jlong* buffer are written to jlongArray (isCopy is set to NULL)
+u64_array_dto_field_setter_template = Template("""
+    {
+        jlongArray ${field_reference_name} = (*env)->NewLongArray(env, ${field_length});
+        jlong * ${field_reference_name}ArrayElements = (*env)->GetLongArrayElements(env, ${field_reference_name}, NULL);
+        unsigned int _i;
+        for (_i = 0; _i < ${field_length}; _i++) {
+            ${field_reference_name}ArrayElements[_i] = clib_net_to_host_u64(mp->${c_name}[_i]);
+        }
+
+        (*env)->ReleaseLongArrayElements(env,  ${field_reference_name}, ${field_reference_name}ArrayElements, 0);
+        (*env)->SetObjectField(env, ${object_name}, ${field_reference_name}FieldId, ${field_reference_name});
+        (*env)->DeleteLocalRef(env, ${field_reference_name});
+    }
+""")
+
+dto_field_setter_templates = {'u8': default_dto_field_setter_template,
+                              'u16': u16_dto_field_setter_template,
+                              'u32': u32_dto_field_setter_template,
+                              'i32': u32_dto_field_setter_template,
+                              'u64': u64_dto_field_setter_template,
+                              'f64': default_dto_field_setter_template,  # fixme
+                              'u8[]': u8_array_dto_field_setter_template,
+                              'u16[]': u16_array_dto_field_setter_template,
+                              'u32[]': u32_array_dto_field_setter_template,
+                              'u64[]': u64_array_dto_field_setter_template
+                              }
+
+
+def jni_reply_handler_for_type(handler_name, ref_name, field_type, c_name, field_reference_name,
+                               field_name, field_length, is_variable_len_array, length_field_type,
+                               object_name="dto"):
+    """
+    Generates jni code that initializes a field of java object (dto or custom type).
+    To be used in reply message handlers.
+    :param field_type: type of the field to be initialized (as defined in vpe.api)
+    :param c_name: name of the message struct member that stores initialization value
+    :param field_reference_name: name of the field reference in generated code
+    :param field_name: name of the field (camelcase)
+    :param field_length: integer or name of variable that stores field length
+    :param object_name: name of the object to be initialized
+    """
+
+    # todo move validation to vppapigen
+    if field_type.endswith('[]') and field_length == '0':
+        raise Exception('Variable array \'%s\' defined in \'%s\' '
+                        'should have defined length (e.g. \'%s[%s_length]\''
+                        % (c_name, handler_name, c_name, c_name))
+
+    if is_variable_len_array:
+        length_var_name = field_length
+        field_length = variable_length_array_value_template.substitute(length_var_name=length_var_name)
+        if length_field_type != 'u8':  # we need net to host conversion:
+            field_length = variable_length_array_template.substitute(
+                    length_field_type=length_field_type, value=field_length)
+
+    # for retval don't generate setters
+    if util.is_retval_field(c_name):
+        return ""
+
+    jni_signature = util.jni_2_signature_mapping[field_type]
+    jni_setter = util.jni_field_accessors[field_type]
+
+    result = dto_field_id_template.substitute(
+            field_reference_name=field_reference_name,
+            field_name=field_name,
+            class_ref_name=ref_name,
+            jni_signature=jni_signature)
+
+    dto_setter_template = dto_field_setter_templates[field_type]
+
+    result += dto_setter_template.substitute(
+            jni_signature=jni_signature,
+            object_name=object_name,
+            field_reference_name=field_reference_name,
+            c_name=c_name,
+            jni_setter=jni_setter,
+            field_length=field_length)
+    return result
+
+
+request_field_identifier_template = Template("""
+    jfieldID ${field_reference_name}FieldId = (*env)->GetFieldID(env, ${object_name}Class, "${field_name}", "${jni_signature}");
+    ${jni_type} ${field_reference_name} = (*env)->Get${jni_getter}(env, ${object_name}, ${field_reference_name}FieldId);
+    """)
+
+array_length_enforcement_template = Template("""
+        size_t max_size = ${field_length};
+        if (cnt > max_size) cnt = max_size;""")
+
+u8_struct_setter_template = Template("""
+    mp->${c_name} = ${field_reference_name};""")
+
+u16_struct_setter_template = Template("""
+    mp->${c_name} = clib_host_to_net_u16(${field_reference_name});""")
+
+u32_struct_setter_template = Template("""
+    mp->${c_name} = clib_host_to_net_u32(${field_reference_name});""")
+
+i32_struct_setter_template = Template("""
+    mp->${c_name} = clib_host_to_net_i32(${field_reference_name});!""")
+
+u64_struct_setter_template = Template("""
+    mp->${c_name} = clib_host_to_net_u64(${field_reference_name});""")
+
+array_length_enforcement_template = Template("""
+        size_t max_size = ${field_length};
+        if (cnt > max_size) cnt = max_size;""")
+
+u8_array_struct_setter_template = Template("""
+    if (${field_reference_name}) {
+        jsize cnt = (*env)->GetArrayLength (env, ${field_reference_name});
+        ${field_length_check}
+        (*env)->GetByteArrayRegion(env, ${field_reference_name}, 0, cnt, (jbyte *)mp->${c_name});
+    }
+""")
+
+u16_array_struct_setter_template = Template("""
+    if (${field_reference_name}) {
+        jshort * ${field_reference_name}ArrayElements = (*env)->GetShortArrayElements(env, ${field_reference_name}, NULL);
+        size_t _i;
+        jsize cnt = (*env)->GetArrayLength (env, ${field_reference_name});
+        ${field_length_check}
+        for (_i = 0; _i < cnt; _i++) {
+            mp->${c_name}[_i] = clib_host_to_net_u16(${field_reference_name}ArrayElements[_i]);
+        }
+        (*env)->ReleaseShortArrayElements (env, ${field_reference_name}, ${field_reference_name}ArrayElements, 0);
+    }
+    """)
+
+u32_array_struct_setter_template = Template("""
+    if (${field_reference_name}) {
+        jint * ${field_reference_name}ArrayElements = (*env)->GetIntArrayElements(env, ${field_reference_name}, NULL);
+        size_t _i;
+        jsize cnt = (*env)->GetArrayLength (env, ${field_reference_name});
+        ${field_length_check}
+        for (_i = 0; _i < cnt; _i++) {
+            mp->${c_name}[_i] = clib_host_to_net_u32(${field_reference_name}ArrayElements[_i]);
+        }
+        (*env)->ReleaseIntArrayElements (env, ${field_reference_name}, ${field_reference_name}ArrayElements, 0);
+    }
+    """)
+
+u64_array_struct_setter_template = Template("""
+    if (${field_reference_name}) {
+        jlong * ${field_reference_name}ArrayElements = (*env)->GetLongArrayElements(env, ${field_reference_name}, NULL);
+        size_t _i;
+        jsize cnt = (*env)->GetArrayLength (env, ${field_reference_name});
+        ${field_length_check}
+        for (_i = 0; _i < cnt; _i++) {
+            mp->${c_name}[_i] = clib_host_to_net_u64(${field_reference_name}ArrayElements[_i]);
+        }
+        (*env)->ReleaseLongArrayElements (env, ${field_reference_name}, ${field_reference_name}ArrayElements, 0);
+    }
+    """)
+
+struct_setter_templates = {'u8': u8_struct_setter_template,
+                           'u16': u16_struct_setter_template,
+                           'u32': u32_struct_setter_template,
+                           'i32': u32_struct_setter_template,
+                           'u64': u64_struct_setter_template,
+                           'u8[]': u8_array_struct_setter_template,
+                           'u16[]': u16_array_struct_setter_template,
+                           'u32[]': u32_array_struct_setter_template,
+                           'u64[]': u64_array_struct_setter_template
+                           }
+
+
+def jni_request_binding_for_type(field_type, c_name, field_reference_name, field_name, field_length,
+                                 is_variable_len_array, object_name="request"):
+    """
+    Generates jni code that initializes C structure that corresponds to a field of java object
+    (dto or custom type). To be used in request message handlers.
+    :param field_type: type of the field to be initialized (as defined in vpe.api)
+    :param c_name: name of the message struct member to be initialized
+    :param field_reference_name: name of the field reference in generated code
+    :param field_name: name of the field (camelcase)
+    :param field_length: integer or name of variable that stores field length
+    :param object_name: name of the object to be initialized
+    """
+    # field identifiers
+    jni_type = util.vpp_2_jni_type_mapping[field_type]
+    jni_signature = util.jni_2_signature_mapping[field_type]
+    jni_getter = util.jni_field_accessors[field_type]
+
+    # field identifier
+    msg_initialization = request_field_identifier_template.substitute(
+            jni_type=jni_type,
+            field_reference_name=field_reference_name,
+            field_name=field_name,
+            jni_signature=jni_signature,
+            jni_getter=jni_getter,
+            object_name=object_name)
+
+    # field setter
+    field_length_check = ""
+
+    # check if we are processing variable length array:
+    if is_variable_len_array:
+        field_length = util.underscore_to_camelcase(field_length)
+
+    # enforce max length if array has fixed length or uses variable length syntax
+    if str(field_length) != "0":
+        field_length_check = array_length_enforcement_template.substitute(field_length=field_length)
+
+    struct_setter_template = struct_setter_templates[field_type]
+
+    msg_initialization += struct_setter_template.substitute(
+            c_name=c_name,
+            field_reference_name=field_reference_name,
+            field_length_check=field_length_check)
+
+    return msg_initialization
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_c_gen.py b/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_c_gen.py
new file mode 100644
index 00000000..611171c4
--- /dev/null
+++ b/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_c_gen.py
@@ -0,0 +1,343 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+# l
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import os, util
+from string import Template
+
+import jni_gen
+
+
+def is_manually_generated(f_name, plugin_name):
+    return f_name in {'control_ping_reply'}
+
+
+class_reference_template = Template("""jclass ${ref_name}Class;
+""")
+
+find_class_invocation_template = Template("""
+    ${ref_name}Class = (jclass)(*env)->NewGlobalRef(env, (*env)->FindClass(env, "io/fd/vpp/jvpp/${plugin_name}/dto/${class_name}"));
+    if ((*env)->ExceptionCheck(env)) {
+        (*env)->ExceptionDescribe(env);
+        return JNI_ERR;
+    }""")
+
+find_class_template = Template("""
+    ${ref_name}Class = (jclass)(*env)->NewGlobalRef(env, (*env)->FindClass(env, "${class_name}"));
+    if ((*env)->ExceptionCheck(env)) {
+        (*env)->ExceptionDescribe(env);
+        return JNI_ERR;
+    }""")
+
+delete_class_invocation_template = Template("""
+    if (${ref_name}Class) {
+        (*env)->DeleteGlobalRef(env, ${ref_name}Class);
+    }""")
+
+class_cache_template = Template("""
+$class_references
+static int cache_class_references(JNIEnv* env) {
+    $find_class_invocations
+    return 0;
+}
+
+static void delete_class_references(JNIEnv* env) {
+    $delete_class_invocations
+}""")
+
+
+def generate_class_cache(func_list, plugin_name):
+    class_references = []
+    find_class_invocations = []
+    delete_class_invocations = []
+    for f in func_list:
+        c_name = f['name']
+        class_name = util.underscore_to_camelcase_upper(c_name)
+        ref_name = util.underscore_to_camelcase(c_name)
+
+        if util.is_ignored(c_name) or util.is_control_ping(class_name):
+            continue
+
+        if util.is_reply(class_name):
+            class_references.append(class_reference_template.substitute(
+                ref_name=ref_name))
+            find_class_invocations.append(find_class_invocation_template.substitute(
+                plugin_name=plugin_name,
+                ref_name=ref_name,
+                class_name=class_name))
+            delete_class_invocations.append(delete_class_invocation_template.substitute(ref_name=ref_name))
+        elif util.is_notification(c_name):
+            class_references.append(class_reference_template.substitute(
+                ref_name=util.add_notification_suffix(ref_name)))
+            find_class_invocations.append(find_class_invocation_template.substitute(
+                plugin_name=plugin_name,
+                ref_name=util.add_notification_suffix(ref_name),
+                class_name=util.add_notification_suffix(class_name)))
+            delete_class_invocations.append(delete_class_invocation_template.substitute(
+                ref_name=util.add_notification_suffix(ref_name)))
+
+    # add exception class to class cache
+    ref_name = 'callbackException'
+    class_name = 'io/fd/vpp/jvpp/VppCallbackException'
+    class_references.append(class_reference_template.substitute(
+            ref_name=ref_name))
+    find_class_invocations.append(find_class_template.substitute(
+            ref_name=ref_name,
+            class_name=class_name))
+    delete_class_invocations.append(delete_class_invocation_template.substitute(ref_name=ref_name))
+
+    return class_cache_template.substitute(
+        class_references="".join(class_references), find_class_invocations="".join(find_class_invocations),
+        delete_class_invocations="".join(delete_class_invocations))
+
+
+# TODO: cache method and field identifiers to achieve better performance
+# https://jira.fd.io/browse/HONEYCOMB-42
+request_class_template = Template("""
+    jclass requestClass = (*env)->FindClass(env, "io/fd/vpp/jvpp/${plugin_name}/dto/${java_name_upper}");""")
+
+request_field_identifier_template = Template("""
+    jfieldID ${field_reference_name}FieldId = (*env)->GetFieldID(env, ${object_name}Class, "${field_name}", "${jni_signature}");
+    ${jni_type} ${field_reference_name} = (*env)->Get${jni_getter}(env, ${object_name}, ${field_reference_name}FieldId);
+    """)
+
+
+jni_impl_template = Template("""
+/**
+ * JNI binding for sending ${c_name} message.
+ * Generated based on $inputfile preparsed data:
+$api_data
+ */
+JNIEXPORT jint JNICALL Java_io_fd_vpp_jvpp_${plugin_name}_JVpp${java_plugin_name}Impl_${field_name}0
+(JNIEnv * env, jclass clazz$args) {
+    ${plugin_name}_main_t *plugin_main = &${plugin_name}_main;
+    vl_api_${c_name}_t * mp;
+    u32 my_context_id = vppjni_get_context_id (&jvpp_main);
+    $request_class
+
+    // create message:
+    mp = vl_msg_api_alloc(sizeof(*mp));
+    memset (mp, 0, sizeof (*mp));
+    mp->_vl_msg_id = ntohs (VL_API_${c_name_uppercase} + plugin_main->msg_id_base);
+    mp->client_index = plugin_main->my_client_index;
+    mp->context = clib_host_to_net_u32 (my_context_id);
+
+    $msg_initialization
+
+    // send message:
+    vl_msg_api_send_shmem (plugin_main->vl_input_queue, (u8 *)&mp);
+    if ((*env)->ExceptionCheck(env)) {
+        return JNI_ERR;
+    }
+    return my_context_id;
+}""")
+
+def generate_jni_impl(func_list, plugin_name, inputfile):
+    jni_impl = []
+    for f in func_list:
+        f_name = f['name']
+        camel_case_function_name = util.underscore_to_camelcase(f_name)
+        if is_manually_generated(f_name, plugin_name) or util.is_reply(camel_case_function_name) \
+                or util.is_ignored(f_name) or util.is_just_notification(f_name):
+            continue
+
+        arguments = ''
+        request_class = ''
+        msg_initialization = ''
+        f_name_uppercase = f_name.upper()
+
+        if f['args']:
+            arguments = ', jobject request'
+            camel_case_function_name_upper = util.underscore_to_camelcase_upper(f_name)
+
+            request_class = request_class_template.substitute(
+                    java_name_upper=camel_case_function_name_upper,
+                    plugin_name=plugin_name)
+
+            for t in zip(f['types'], f['args'], f['lengths']):
+                field_name = util.underscore_to_camelcase(t[1])
+                msg_initialization += jni_gen.jni_request_binding_for_type(field_type=t[0], c_name=t[1],
+                                                                           field_reference_name=field_name,
+                                                                           field_name=field_name,
+                                                                           field_length=t[2][0],
+                                                                           is_variable_len_array=t[2][1])
+
+        jni_impl.append(jni_impl_template.substitute(
+                inputfile=inputfile,
+                api_data=util.api_message_to_javadoc(f),
+                field_reference_name=camel_case_function_name,
+                field_name=camel_case_function_name,
+                c_name_uppercase=f_name_uppercase,
+                c_name=f_name,
+                plugin_name=plugin_name,
+                java_plugin_name=plugin_name.title(),
+                request_class=request_class,
+                msg_initialization=msg_initialization,
+                args=arguments))
+
+    return "\n".join(jni_impl)
+
+# code fragment for checking result of the operation before sending request reply
+callback_err_handler_template = Template("""
+    // for negative result don't send callback message but send error callback
+    if (mp->retval<0) {
+        call_on_error("${handler_name}", mp->context, mp->retval, plugin_main->callbackClass, plugin_main->callbackObject, callbackExceptionClass);
+        return;
+    }
+    if (mp->retval == VNET_API_ERROR_IN_PROGRESS) {
+        clib_warning("Result in progress");
+        return;
+    }
+""")
+
+msg_handler_template = Template("""
+/**
+ * Handler for ${handler_name} message.
+ * Generated based on $inputfile preparsed data:
+$api_data
+ */
+static void vl_api_${handler_name}_t_handler (vl_api_${handler_name}_t * mp)
+{
+    ${plugin_name}_main_t *plugin_main = &${plugin_name}_main;
+    JNIEnv *env = jvpp_main.jenv;
+
+    $err_handler
+
+    jmethodID constructor = (*env)->GetMethodID(env, ${class_ref_name}Class, "<init>", "()V");
+    jmethodID callbackMethod = (*env)->GetMethodID(env, plugin_main->callbackClass, "on${dto_name}", "(Lio/fd/vpp/jvpp/${plugin_name}/dto/${dto_name};)V");
+
+    jobject dto = (*env)->NewObject(env, ${class_ref_name}Class, constructor);
+    $dto_setters
+
+    (*env)->CallVoidMethod(env, plugin_main->callbackObject, callbackMethod, dto);
+    // free DTO as per http://stackoverflow.com/questions/1340938/memory-leak-when-calling-java-code-from-c-using-jni
+    (*env)->DeleteLocalRef(env, dto);
+}""")
+
+
+def generate_msg_handlers(func_list, plugin_name, inputfile):
+    handlers = []
+    for f in func_list:
+        handler_name = f['name']
+        dto_name = util.underscore_to_camelcase_upper(handler_name)
+        ref_name = util.underscore_to_camelcase(handler_name)
+
+        if is_manually_generated(handler_name, plugin_name) or util.is_ignored(handler_name):
+            continue
+
+        if not util.is_reply(dto_name) and not util.is_notification(handler_name):
+            continue
+
+        if util.is_notification(handler_name):
+            dto_name = util.add_notification_suffix(dto_name)
+            ref_name = util.add_notification_suffix(ref_name)
+
+        dto_setters = ''
+        err_handler = ''
+        # dto setters
+        for t in zip(f['types'], f['args'], f['lengths']):
+            c_name = t[1]
+            java_name = util.underscore_to_camelcase(c_name)
+            field_length = t[2][0]
+            is_variable_len_array = t[2][1]
+            length_field_type = None
+            if is_variable_len_array:
+                length_field_type = f['types'][f['args'].index(field_length)]
+            dto_setters += jni_gen.jni_reply_handler_for_type(handler_name=handler_name, ref_name=ref_name,
+                                                              field_type=t[0], c_name=t[1],
+                                                              field_reference_name=java_name,
+                                                              field_name=java_name, field_length=field_length,
+                                                              is_variable_len_array=is_variable_len_array,
+                                                              length_field_type=length_field_type)
+
+            # for retval don't generate setters and generate retval check
+            if util.is_retval_field(c_name):
+                err_handler = callback_err_handler_template.substitute(
+                    handler_name=handler_name
+                )
+                continue
+
+        handlers.append(msg_handler_template.substitute(
+            inputfile=inputfile,
+            api_data=util.api_message_to_javadoc(f),
+            handler_name=handler_name,
+            plugin_name=plugin_name,
+            dto_name=dto_name,
+            class_ref_name=ref_name,
+            dto_setters=dto_setters,
+            err_handler=err_handler))
+
+    return "\n".join(handlers)
+
+
+handler_registration_template = Template("""_(${upercase_name}, ${name}) \\
+""")
+
+
+def generate_handler_registration(func_list):
+    handler_registration = ["#define foreach_api_reply_handler \\\n"]
+    for f in func_list:
+        name = f['name']
+        camelcase_name = util.underscore_to_camelcase(f['name'])
+
+        if (not util.is_reply(camelcase_name) and not util.is_notification(name)) or util.is_ignored(name) \
+                or util.is_control_ping(camelcase_name):
+            continue
+
+        handler_registration.append(handler_registration_template.substitute(
+            name=name,
+            upercase_name=name.upper()))
+
+    return "".join(handler_registration)
+
+
+jvpp_c_template = Template("""/**
+ * This file contains JNI bindings for jvpp Java API.
+ * It was generated by jvpp_c_gen.py based on $inputfile
+ * (python representation of api file generated by vppapigen).
+ */
+
+// JAVA class reference cache
+$class_cache
+
+// JNI bindings
+$jni_implementations
+
+// Message handlers
+$msg_handlers
+
+// Registration of message handlers in vlib
+$handler_registration
+""")
+
+def generate_jvpp(func_list, plugin_name, inputfile, path):
+    """ Generates jvpp C file """
+    print "Generating jvpp C"
+
+    class_cache = generate_class_cache(func_list, plugin_name)
+    jni_impl = generate_jni_impl(func_list, plugin_name, inputfile)
+    msg_handlers = generate_msg_handlers(func_list, plugin_name, inputfile)
+    handler_registration = generate_handler_registration(func_list)
+
+    jvpp_c_file = open("%s/jvpp_%s_gen.h" % (path, plugin_name), 'w')
+    jvpp_c_file.write(jvpp_c_template.substitute(
+            inputfile=inputfile,
+            class_cache=class_cache,
+            jni_implementations=jni_impl,
+            msg_handlers=msg_handlers,
+            handler_registration=handler_registration))
+    jvpp_c_file.flush()
+    jvpp_c_file.close()
+
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py b/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py
new file mode 100644
index 00000000..ac096a71
--- /dev/null
+++ b/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py
@@ -0,0 +1,324 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os, util
+from string import Template
+
+import callback_gen
+import dto_gen
+
+jvpp_ifc_template = Template("""
+package $plugin_package.$callback_facade_package;
+
+/**
+ * <p>Callback Java API representation of $plugin_package plugin.
+ * <br>It was generated by jvpp_callback_facade_gen.py based on $inputfile
+ * <br>(python representation of api file generated by vppapigen).
+ */
+public interface CallbackJVpp${plugin_name} extends $base_package.$notification_package.NotificationRegistryProvider, java.lang.AutoCloseable {
+
+    // TODO add send
+
+$methods
+}
+""")
+
+jvpp_impl_template = Template("""
+package $plugin_package.$callback_facade_package;
+
+/**
+ * <p>Default implementation of Callback${plugin_name}JVpp interface.
+ * <br>It was generated by jvpp_callback_facade_gen.py based on $inputfile
+ * <br>(python representation of api file generated by vppapigen).
+ */
+public final class CallbackJVpp${plugin_name}Facade implements CallbackJVpp${plugin_name} {
+
+    private final $plugin_package.JVpp${plugin_name} jvpp;
+    private final java.util.Map<Integer, $base_package.$callback_package.JVppCallback> callbacks;
+    private final $plugin_package.$notification_package.${plugin_name}NotificationRegistryImpl notificationRegistry = new $plugin_package.$notification_package.${plugin_name}NotificationRegistryImpl();
+    /**
+     * <p>Create CallbackJVpp${plugin_name}Facade object for provided JVpp instance.
+     * Constructor internally creates CallbackJVppFacadeCallback class for processing callbacks
+     * and then connects to provided JVpp instance
+     *
+     * @param jvpp provided $base_package.JVpp instance
+     *
+     * @throws java.io.IOException in case instance cannot connect to JVPP
+     */
+    public CallbackJVpp${plugin_name}Facade(final $base_package.JVppRegistry registry, final $plugin_package.JVpp${plugin_name} jvpp) throws java.io.IOException {
+        this.jvpp = java.util.Objects.requireNonNull(jvpp,"jvpp is null");
+        this.callbacks = new java.util.HashMap<>();
+        java.util.Objects.requireNonNull(registry, "JVppRegistry should not be null");
+        registry.register(jvpp, new CallbackJVpp${plugin_name}FacadeCallback(this.callbacks, notificationRegistry));
+    }
+
+    @Override
+    public $plugin_package.$notification_package.${plugin_name}NotificationRegistry getNotificationRegistry() {
+        return notificationRegistry;
+    }
+
+    @Override
+    public void close() throws Exception {
+        jvpp.close();
+    }
+
+    // TODO add send()
+
+$methods
+}
+""")
+
+method_template = Template(
+    """    void $name($plugin_package.$dto_package.$request request, $plugin_package.$callback_package.$callback callback) throws $base_package.VppInvocationException;""")
+
+method_impl_template = Template("""    public final void $name($plugin_package.$dto_package.$request request, $plugin_package.$callback_package.$callback callback) throws $base_package.VppInvocationException {
+        synchronized (callbacks) {
+            callbacks.put(jvpp.$name(request), callback);
+        }
+    }
+""")
+
+no_arg_method_template = Template("""    void $name($plugin_package.$callback_package.$callback callback) throws $base_package.VppInvocationException;""")
+no_arg_method_impl_template = Template("""    public final void $name($plugin_package.$callback_package.$callback callback) throws $base_package.VppInvocationException {
+        synchronized (callbacks) {
+            callbacks.put(jvpp.$name(), callback);
+        }
+    }
+""")
+
+
+def generate_jvpp(func_list, base_package, plugin_package, plugin_name, dto_package, callback_package, notification_package, callback_facade_package, inputfile):
+    """ Generates callback facade """
+    print "Generating JVpp callback facade"
+
+    if os.path.exists(callback_facade_package):
+        util.remove_folder(callback_facade_package)
+
+    os.mkdir(callback_facade_package)
+
+    methods = []
+    methods_impl = []
+    for func in func_list:
+
+        if util.is_notification(func['name']) or util.is_ignored(func['name']):
+            continue
+
+        camel_case_name = util.underscore_to_camelcase(func['name'])
+        camel_case_name_upper = util.underscore_to_camelcase_upper(func['name'])
+        if util.is_reply(camel_case_name) or util.is_control_ping(camel_case_name):
+            continue
+
+        # Strip suffix for dump calls
+        callback_type = get_request_name(camel_case_name_upper, func['name']) + callback_gen.callback_suffix
+
+        if len(func['args']) == 0:
+            methods.append(no_arg_method_template.substitute(name=camel_case_name,
+                                                             base_package=base_package,
+                                                             plugin_package=plugin_package,
+                                                             dto_package=dto_package,
+                                                             callback_package=callback_package,
+                                                             callback=callback_type))
+            methods_impl.append(no_arg_method_impl_template.substitute(name=camel_case_name,
+                                                                       base_package=base_package,
+                                                                       plugin_package=plugin_package,
+                                                                       dto_package=dto_package,
+                                                                       callback_package=callback_package,
+                                                                       callback=callback_type))
+        else:
+            methods.append(method_template.substitute(name=camel_case_name,
+                                                      request=camel_case_name_upper,
+                                                      base_package=base_package,
+                                                      plugin_package=plugin_package,
+                                                      dto_package=dto_package,
+                                                      callback_package=callback_package,
+                                                      callback=callback_type))
+            methods_impl.append(method_impl_template.substitute(name=camel_case_name,
+                                                                request=camel_case_name_upper,
+                                                                base_package=base_package,
+                                                                plugin_package=plugin_package,
+                                                                dto_package=dto_package,
+                                                                callback_package=callback_package,
+                                                                callback=callback_type))
+
+    join = os.path.join(callback_facade_package, "CallbackJVpp%s.java" % plugin_name)
+    jvpp_file = open(join, 'w')
+    jvpp_file.write(
+        jvpp_ifc_template.substitute(inputfile=inputfile,
+                                     methods="\n".join(methods),
+                                     base_package=base_package,
+                                     plugin_package=plugin_package,
+                                     plugin_name=plugin_name,
+                                     dto_package=dto_package,
+                                     notification_package=notification_package,
+                                     callback_facade_package=callback_facade_package))
+    jvpp_file.flush()
+    jvpp_file.close()
+
+    jvpp_file = open(os.path.join(callback_facade_package, "CallbackJVpp%sFacade.java" % plugin_name), 'w')
+    jvpp_file.write(jvpp_impl_template.substitute(inputfile=inputfile,
+                                                  methods="\n".join(methods_impl),
+                                                  base_package=base_package,
+                                                  plugin_package=plugin_package,
+                                                  plugin_name=plugin_name,
+                                                  dto_package=dto_package,
+                                                  notification_package=notification_package,
+                                                  callback_package=callback_package,
+                                                  callback_facade_package=callback_facade_package))
+    jvpp_file.flush()
+    jvpp_file.close()
+
+    generate_callback(func_list, base_package, plugin_package, plugin_name, dto_package, callback_package, notification_package, callback_facade_package, inputfile)
+
+
+jvpp_facade_callback_template = Template("""
+package $plugin_package.$callback_facade_package;
+
+/**
+ * <p>Implementation of JVppGlobalCallback interface for Java Callback API.
+ * <br>It was generated by jvpp_callback_facade_gen.py based on $inputfile
+ * <br>(python representation of api file generated by vppapigen).
+ */
+public final class CallbackJVpp${plugin_name}FacadeCallback implements $plugin_package.$callback_package.JVpp${plugin_name}GlobalCallback {
+
+    private final java.util.Map<Integer, $base_package.$callback_package.JVppCallback> requests;
+    private final $plugin_package.$notification_package.Global${plugin_name}NotificationCallback notificationCallback;
+    private static final java.util.logging.Logger LOG = java.util.logging.Logger.getLogger(CallbackJVpp${plugin_name}FacadeCallback.class.getName());
+
+    public CallbackJVpp${plugin_name}FacadeCallback(final java.util.Map<Integer, $base_package.$callback_package.JVppCallback> requestMap,
+                                      final $plugin_package.$notification_package.Global${plugin_name}NotificationCallback notificationCallback) {
+        this.requests = requestMap;
+        this.notificationCallback = notificationCallback;
+    }
+
+    @Override
+    public void onError($base_package.VppCallbackException reply) {
+
+        $base_package.$callback_package.JVppCallback failedCall;
+        synchronized(requests) {
+            failedCall = requests.remove(reply.getCtxId());
+        }
+
+        if(failedCall != null) {
+            try {
+                failedCall.onError(reply);
+            } catch(RuntimeException ex) {
+                ex.addSuppressed(reply);
+                LOG.log(java.util.logging.Level.WARNING, String.format("Callback: %s failed while handling exception: %s", failedCall, reply), ex);
+            }
+        }
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void onControlPingReply($base_package.$dto_package.ControlPingReply reply) {
+
+        $base_package.$callback_package.ControlPingCallback callback;
+        synchronized(requests) {
+            callback = ($base_package.$callback_package.ControlPingCallback) requests.remove(reply.context);
+        }
+
+        if(callback != null) {
+            callback.onControlPingReply(reply);
+        }
+    }
+
+$methods
+}
+""")
+
+jvpp_facade_callback_method_template = Template("""
+    @Override
+    @SuppressWarnings("unchecked")
+    public void on$callback_dto($plugin_package.$dto_package.$callback_dto reply) {
+
+        $plugin_package.$callback_package.$callback callback;
+        synchronized(requests) {
+            callback = ($plugin_package.$callback_package.$callback) requests.remove(reply.context);
+        }
+
+        if(callback != null) {
+            callback.on$callback_dto(reply);
+        }
+    }
+""")
+
+jvpp_facade_callback_notification_method_template = Template("""
+    @Override
+    @SuppressWarnings("unchecked")
+    public void on$callback_dto($plugin_package.$dto_package.$callback_dto notification) {
+        notificationCallback.on$callback_dto(notification);
+    }
+""")
+
+
+def generate_callback(func_list, base_package, plugin_package, plugin_name, dto_package, callback_package, notification_package, callback_facade_package, inputfile):
+    callbacks = []
+    for func in func_list:
+
+        camel_case_name_with_suffix = util.underscore_to_camelcase_upper(func['name'])
+
+        if util.is_ignored(func['name']) or util.is_control_ping(camel_case_name_with_suffix):
+            continue
+
+        if util.is_reply(camel_case_name_with_suffix):
+            callbacks.append(jvpp_facade_callback_method_template.substitute(plugin_package=plugin_package,
+                                                                             dto_package=dto_package,
+                                                                             callback_package=callback_package,
+                                                                             callback=util.remove_reply_suffix(camel_case_name_with_suffix) + callback_gen.callback_suffix,
+                                                                             callback_dto=camel_case_name_with_suffix))
+
+        if util.is_notification(func["name"]):
+            with_notification_suffix = util.add_notification_suffix(camel_case_name_with_suffix)
+            callbacks.append(jvpp_facade_callback_notification_method_template.substitute(plugin_package=plugin_package,
+                                                                             dto_package=dto_package,
+                                                                             callback_package=callback_package,
+                                                                             callback=with_notification_suffix + callback_gen.callback_suffix,
+                                                                             callback_dto=with_notification_suffix))
+
+    jvpp_file = open(os.path.join(callback_facade_package, "CallbackJVpp%sFacadeCallback.java" % plugin_name), 'w')
+    jvpp_file.write(jvpp_facade_callback_template.substitute(inputfile=inputfile,
+                                                             base_package=base_package,
+                                                             plugin_package=plugin_package,
+                                                             plugin_name=plugin_name,
+                                                             dto_package=dto_package,
+                                                             notification_package=notification_package,
+                                                             callback_package=callback_package,
+                                                             methods="".join(callbacks),
+                                                             callback_facade_package=callback_facade_package))
+    jvpp_file.flush()
+    jvpp_file.close()
+
+
+# Returns request name or special one from unconventional_naming_rep_req map
+def get_request_name(camel_case_dto_name, func_name):
+    if func_name in reverse_dict(util.unconventional_naming_rep_req):
+        request_name = util.underscore_to_camelcase_upper(reverse_dict(util.unconventional_naming_rep_req)[func_name])
+    else:
+        request_name = camel_case_dto_name
+    return remove_suffix(request_name)
+
+
+def reverse_dict(map):
+    return dict((v, k) for k, v in map.iteritems())
+
+
+def remove_suffix(name):
+    if util.is_reply(name):
+        return util.remove_reply_suffix(name)
+    else:
+        if util.is_dump(name):
+            return util.remove_suffix(name, util.dump_suffix)
+        else:
+            return name
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py b/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py
new file mode 100644
index 00000000..26b31e22
--- /dev/null
+++ b/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py
@@ -0,0 +1,331 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+from string import Template
+
+import dto_gen
+import util
+
+jvpp_facade_callback_template = Template("""
+package $plugin_package.$future_package;
+
+/**
+ * <p>Async facade callback setting values to future objects
+ * <br>It was generated by jvpp_future_facade_gen.py based on $inputfile
+ * <br>(python representation of api file generated by vppapigen).
+ */
+public final class FutureJVpp${plugin_name}FacadeCallback implements $plugin_package.$callback_package.JVpp${plugin_name}GlobalCallback {
+
+    private final java.util.Map<java.lang.Integer, java.util.concurrent.CompletableFuture<? extends $base_package.$dto_package.JVppReply<?>>> requests;
+    private final $plugin_package.$notification_package.Global${plugin_name}NotificationCallback notificationCallback;
+
+    public FutureJVpp${plugin_name}FacadeCallback(
+        final java.util.Map<java.lang.Integer, java.util.concurrent.CompletableFuture<? extends $base_package.$dto_package.JVppReply<?>>> requestMap,
+        final $plugin_package.$notification_package.Global${plugin_name}NotificationCallback notificationCallback) {
+        this.requests = requestMap;
+        this.notificationCallback = notificationCallback;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void onError($base_package.VppCallbackException reply) {
+        final java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>> completableFuture;
+
+        synchronized(requests) {
+            completableFuture = (java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>>) requests.get(reply.getCtxId());
+        }
+
+        if(completableFuture != null) {
+            completableFuture.completeExceptionally(reply);
+
+            synchronized(requests) {
+                requests.remove(reply.getCtxId());
+            }
+        }
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void onControlPingReply($base_package.$dto_package.ControlPingReply reply) {
+        final java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>> completableFuture;
+
+        synchronized(requests) {
+            completableFuture = (java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>>) requests.get(reply.context);
+        }
+
+        if(completableFuture != null) {
+            // Finish dump call
+            if (completableFuture instanceof $base_package.$future_package.AbstractFutureJVppInvoker.CompletableDumpFuture) {
+                completableFuture.complete((($base_package.$future_package.AbstractFutureJVppInvoker.CompletableDumpFuture) completableFuture).getReplyDump());
+                // Remove future mapped to dump call context id
+                synchronized(requests) {
+                    requests.remove((($base_package.$future_package.AbstractFutureJVppInvoker.CompletableDumpFuture) completableFuture).getContextId());
+                }
+            } else {
+                completableFuture.complete(reply);
+            }
+
+            synchronized(requests) {
+                requests.remove(reply.context);
+            }
+        }
+    }
+
+$methods
+}
+""")
+
+jvpp_facade_callback_method_template = Template("""
+    @Override
+    @SuppressWarnings("unchecked")
+    public void on$callback_dto($plugin_package.$dto_package.$callback_dto reply) {
+        final java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>> completableFuture;
+
+        synchronized(requests) {
+            completableFuture = (java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>>) requests.get(reply.context);
+        }
+
+        if(completableFuture != null) {
+            completableFuture.complete(reply);
+
+            synchronized(requests) {
+                requests.remove(reply.context);
+            }
+        }
+    }
+""")
+
+jvpp_facade_callback_notification_method_template = Template("""
+    @Override
+    public void on$callback_dto($plugin_package.$dto_package.$callback_dto notification) {
+        notificationCallback.on$callback_dto(notification);
+    }
+""")
+
+jvpp_facade_details_callback_method_template = Template("""
+    @Override
+    @SuppressWarnings("unchecked")
+    public void on$callback_dto($plugin_package.$dto_package.$callback_dto reply) {
+        final $base_package.$future_package.AbstractFutureJVppInvoker.CompletableDumpFuture<$plugin_package.$dto_package.$callback_dto_reply_dump> completableFuture;
+
+        synchronized(requests) {
+            completableFuture = ($base_package.$future_package.AbstractFutureJVppInvoker.CompletableDumpFuture<$plugin_package.$dto_package.$callback_dto_reply_dump>) requests.get(reply.context);
+        }
+
+        if(completableFuture != null) {
+            completableFuture.getReplyDump().$callback_dto_field.add(reply);
+        }
+    }
+""")
+
+
+def generate_jvpp(func_list, base_package, plugin_package, plugin_name, dto_package, callback_package, notification_package, future_facade_package, inputfile):
+    """ Generates JVpp interface and JNI implementation """
+    print "Generating JVpp future facade"
+
+    if not os.path.exists(future_facade_package):
+        os.mkdir(future_facade_package)
+
+    methods = []
+    methods_impl = []
+    callbacks = []
+    for func in func_list:
+        camel_case_name_with_suffix = util.underscore_to_camelcase_upper(func['name'])
+
+        if util.is_ignored(func['name']) or util.is_control_ping(camel_case_name_with_suffix):
+            continue
+
+        if not util.is_reply(camel_case_name_with_suffix) and not util.is_notification(func['name']):
+            continue
+
+        camel_case_method_name = util.underscore_to_camelcase(func['name'])
+
+        if not util.is_notification(func["name"]):
+            camel_case_request_method_name = util.remove_reply_suffix(util.underscore_to_camelcase(func['name']))
+            if util.is_details(camel_case_name_with_suffix):
+                camel_case_reply_name = get_standard_dump_reply_name(util.underscore_to_camelcase_upper(func['name']),
+                                                                     func['name'])
+                callbacks.append(jvpp_facade_details_callback_method_template.substitute(base_package=base_package,
+                                                                                         plugin_package=plugin_package,
+                                                                                         dto_package=dto_package,
+                                                                                         callback_dto=camel_case_name_with_suffix,
+                                                                                         callback_dto_field=camel_case_method_name,
+                                                                                         callback_dto_reply_dump=camel_case_reply_name + dto_gen.dump_dto_suffix,
+                                                                                         future_package=future_facade_package))
+
+                methods.append(future_jvpp_method_template.substitute(plugin_package=plugin_package,
+                                                                      dto_package=dto_package,
+                                                                      method_name=camel_case_request_method_name +
+                                                                                  util.underscore_to_camelcase_upper(util.dump_suffix),
+                                                                      reply_name=camel_case_reply_name + dto_gen.dump_dto_suffix,
+                                                                      request_name=util.remove_reply_suffix(camel_case_reply_name) +
+                                                                                   util.underscore_to_camelcase_upper(util.dump_suffix)))
+                methods_impl.append(future_jvpp_dump_method_impl_template.substitute(plugin_package=plugin_package,
+                                                                                     dto_package=dto_package,
+                                                                                     method_name=camel_case_request_method_name +
+                                                                                                 util.underscore_to_camelcase_upper(util.dump_suffix),
+                                                                                     reply_name=camel_case_reply_name + dto_gen.dump_dto_suffix,
+                                                                                     request_name=util.remove_reply_suffix(camel_case_reply_name) +
+                                                                                                  util.underscore_to_camelcase_upper(util.dump_suffix)))
+            else:
+                request_name = util.underscore_to_camelcase_upper(util.unconventional_naming_rep_req[func['name']]) \
+                    if func['name'] in util.unconventional_naming_rep_req else util.remove_reply_suffix(camel_case_name_with_suffix)
+
+                methods.append(future_jvpp_method_template.substitute(plugin_package=plugin_package,
+                                                                      dto_package=dto_package,
+                                                                      method_name=camel_case_request_method_name,
+                                                                      reply_name=camel_case_name_with_suffix,
+                                                                      request_name=request_name))
+                methods_impl.append(future_jvpp_method_impl_template.substitute(plugin_package=plugin_package,
+                                                                                dto_package=dto_package,
+                                                                                method_name=camel_case_request_method_name,
+                                                                                reply_name=camel_case_name_with_suffix,
+                                                                                request_name=request_name))
+
+                callbacks.append(jvpp_facade_callback_method_template.substitute(base_package=base_package,
+                                                                                 plugin_package=plugin_package,
+                                                                                 dto_package=dto_package,
+                                                                                 callback_dto=camel_case_name_with_suffix))
+
+        if util.is_notification(func["name"]):
+            callbacks.append(jvpp_facade_callback_notification_method_template.substitute(plugin_package=plugin_package,
+                                                                                          dto_package=dto_package,
+                                                                                          callback_dto=util.add_notification_suffix(camel_case_name_with_suffix)))
+
+    jvpp_file = open(os.path.join(future_facade_package, "FutureJVpp%sFacadeCallback.java" % plugin_name), 'w')
+    jvpp_file.write(jvpp_facade_callback_template.substitute(inputfile=inputfile,
+                                                             base_package=base_package,
+                                                             plugin_package=plugin_package,
+                                                             plugin_name=plugin_name,
+                                                             dto_package=dto_package,
+                                                             notification_package=notification_package,
+                                                             callback_package=callback_package,
+                                                             methods="".join(callbacks),
+                                                             future_package=future_facade_package))
+    jvpp_file.flush()
+    jvpp_file.close()
+
+    jvpp_file = open(os.path.join(future_facade_package, "FutureJVpp%s.java" % plugin_name), 'w')
+    jvpp_file.write(future_jvpp_template.substitute(inputfile=inputfile,
+                                                    base_package=base_package,
+                                                    plugin_package=plugin_package,
+                                                    plugin_name=plugin_name,
+                                                    notification_package=notification_package,
+                                                    methods="".join(methods),
+                                                    future_package=future_facade_package))
+    jvpp_file.flush()
+    jvpp_file.close()
+
+    jvpp_file = open(os.path.join(future_facade_package, "FutureJVpp%sFacade.java" % plugin_name), 'w')
+    jvpp_file.write(future_jvpp_facade_template.substitute(inputfile=inputfile,
+                                                           base_package=base_package,
+                                                           plugin_package=plugin_package,
+                                                           plugin_name=plugin_name,
+                                                           dto_package=dto_package,
+                                                           notification_package=notification_package,
+                                                           methods="".join(methods_impl),
+                                                           future_package=future_facade_package))
+    jvpp_file.flush()
+    jvpp_file.close()
+
+
+future_jvpp_template = Template('''
+package $plugin_package.$future_package;
+
+/**
+ * <p>Async facade extension adding specific methods for each request invocation
+ * <br>It was generated by jvpp_future_facade_gen.py based on $inputfile
+ * <br>(python representation of api file generated by vppapigen).
+ */
+public interface FutureJVpp${plugin_name} extends $base_package.$future_package.FutureJVppInvoker {
+$methods
+
+    @Override
+    public $plugin_package.$notification_package.${plugin_name}NotificationRegistry getNotificationRegistry();
+
+}
+''')
+
+future_jvpp_method_template = Template('''
+    java.util.concurrent.CompletionStage<$plugin_package.$dto_package.$reply_name> $method_name($plugin_package.$dto_package.$request_name request);
+''')
+
+
+future_jvpp_facade_template = Template('''
+package $plugin_package.$future_package;
+
+/**
+ * <p>Implementation of FutureJVpp based on AbstractFutureJVppInvoker
+ * <br>It was generated by jvpp_future_facade_gen.py based on $inputfile
+ * <br>(python representation of api file generated by vppapigen).
+ */
+public class FutureJVpp${plugin_name}Facade extends $base_package.$future_package.AbstractFutureJVppInvoker implements FutureJVpp${plugin_name} {
+
+    private final $plugin_package.$notification_package.${plugin_name}NotificationRegistryImpl notificationRegistry = new $plugin_package.$notification_package.${plugin_name}NotificationRegistryImpl();
+
+    /**
+     * <p>Create FutureJVpp${plugin_name}Facade object for provided JVpp instance.
+     * Constructor internally creates FutureJVppFacadeCallback class for processing callbacks
+     * and then connects to provided JVpp instance
+     *
+     * @param jvpp provided $base_package.JVpp instance
+     *
+     * @throws java.io.IOException in case instance cannot connect to JVPP
+     */
+    public FutureJVpp${plugin_name}Facade(final $base_package.JVppRegistry registry, final $base_package.JVpp jvpp) throws java.io.IOException {
+        super(jvpp, registry, new java.util.HashMap<>());
+        java.util.Objects.requireNonNull(registry, "JVppRegistry should not be null");
+        registry.register(jvpp, new FutureJVpp${plugin_name}FacadeCallback(getRequests(), notificationRegistry));
+    }
+
+    @Override
+    public $plugin_package.$notification_package.${plugin_name}NotificationRegistry getNotificationRegistry() {
+        return notificationRegistry;
+    }
+
+$methods
+}
+''')
+
+future_jvpp_method_impl_template = Template('''
+    @Override
+    public java.util.concurrent.CompletionStage<$plugin_package.$dto_package.$reply_name> $method_name($plugin_package.$dto_package.$request_name request) {
+        return send(request);
+    }
+''')
+
+future_jvpp_dump_method_impl_template = Template('''
+    @Override
+    public java.util.concurrent.CompletionStage<$plugin_package.$dto_package.$reply_name> $method_name($plugin_package.$dto_package.$request_name request) {
+        return send(request, new $plugin_package.$dto_package.$reply_name());
+    }
+''')
+
+
+# Returns request name or special one from unconventional_naming_rep_req map
+def get_standard_dump_reply_name(camel_case_dto_name, func_name):
+    # FIXME this is a hotfix for sub-details callbacks
+    # FIXME also for L2FibTableEntry
+    # It's all because unclear mapping between
+    #  request -> reply,
+    #  dump -> reply, details,
+    #  notification_start -> reply, notifications
+
+    # vpe.api needs to be "standardized" so we can parse the information and create maps before generating java code
+    suffix = func_name.split("_")[-1]
+    return util.underscore_to_camelcase_upper(
+        util.unconventional_naming_rep_req[func_name]) + util.underscore_to_camelcase_upper(suffix) if func_name in util.unconventional_naming_rep_req \
+        else camel_case_dto_name
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py b/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py
new file mode 100644
index 00000000..7bf91138
--- /dev/null
+++ b/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py
@@ -0,0 +1,219 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os, util
+from string import Template
+
+jvpp_ifc_template = Template("""
+package $plugin_package;
+
+/**
+ * <p>Java representation of plugin's api file.
+ * <br>It was generated by jvpp_impl_gen.py based on $inputfile
+ * <br>(python representation of api file generated by vppapigen).
+ */
+public interface JVpp${plugin_name} extends $base_package.JVpp {
+
+    /**
+     * Generic dispatch method for sending requests to VPP
+     *
+     * @throws io.fd.vpp.jvpp.VppInvocationException if send request had failed
+     */
+    int send($base_package.$dto_package.JVppRequest request) throws io.fd.vpp.jvpp.VppInvocationException;
+
+$methods
+}
+""")
+
+jvpp_impl_template = Template("""
+package $plugin_package;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.Set;
+import java.util.logging.Logger;
+import $base_package.callback.JVppCallback;
+import $base_package.VppConnection;
+import $base_package.JVppRegistry;
+
+/**
+ * <p>Default implementation of JVpp interface.
+ * <br>It was generated by jvpp_impl_gen.py based on $inputfile
+ * <br>(python representation of api file generated by vppapigen).
+ */
+public final class JVpp${plugin_name}Impl implements $plugin_package.JVpp${plugin_name} {
+
+    private final static Logger LOG = Logger.getLogger(JVpp${plugin_name}Impl.class.getName());
+    private static final String LIBNAME = "libjvpp_${plugin_name_underscore}.so";
+
+    // FIXME using NativeLibraryLoader makes load fail could not find (WantInterfaceEventsReply).
+    static {
+        try {
+            loadLibrary();
+        } catch (Exception e) {
+            LOG.severe("Can't find jvpp jni library: " + LIBNAME);
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
+    private static void loadStream(final InputStream is) throws IOException {
+        final Set<PosixFilePermission> perms = PosixFilePermissions.fromString("rwxr-x---");
+        final Path p = Files.createTempFile(LIBNAME, null, PosixFilePermissions.asFileAttribute(perms));
+        try {
+            Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
+
+            try {
+                Runtime.getRuntime().load(p.toString());
+            } catch (UnsatisfiedLinkError e) {
+                throw new IOException("Failed to load library " + p, e);
+            }
+        } finally {
+            try {
+                Files.deleteIfExists(p);
+            } catch (IOException e) {
+            }
+        }
+    }
+
+    private static void loadLibrary() throws IOException {
+        try (final InputStream is = JVpp${plugin_name}Impl.class.getResourceAsStream('/' + LIBNAME)) {
+            if (is == null) {
+                throw new IOException("Failed to open library resource " + LIBNAME);
+            }
+            loadStream(is);
+        }
+    }
+
+    private VppConnection connection;
+    private JVppRegistry registry;
+
+    private static native void init0(final JVppCallback callback, final long queueAddress, final int clientIndex);
+    @Override
+    public void init(final JVppRegistry registry, final JVppCallback callback, final long queueAddress, final int clientIndex) {
+        this.registry = java.util.Objects.requireNonNull(registry, "registry should not be null");
+        this.connection = java.util.Objects.requireNonNull(registry.getConnection(), "connection should not be null");
+        connection.checkActive();
+        init0(callback, queueAddress, clientIndex);
+    }
+
+    private static native void close0();
+    @Override
+    public void close() {
+        close0();
+    }
+
+    @Override
+    public int send($base_package.$dto_package.JVppRequest request) throws io.fd.vpp.jvpp.VppInvocationException {
+        return request.send(this);
+    }
+
+    @Override
+    public final int controlPing(final io.fd.vpp.jvpp.dto.ControlPing controlPing) throws io.fd.vpp.jvpp.VppInvocationException {
+        return registry.controlPing(JVpp${plugin_name}Impl.class);
+    }
+
+$methods
+}
+""")
+
+method_template = Template("""    int $name($plugin_package.$dto_package.$request request) throws io.fd.vpp.jvpp.VppInvocationException;""")
+method_native_template = Template(
+    """    private static native int ${name}0($plugin_package.$dto_package.$request request);""")
+method_impl_template = Template("""    public final int $name($plugin_package.$dto_package.$request request) throws io.fd.vpp.jvpp.VppInvocationException {
+        java.util.Objects.requireNonNull(request,"Null request object");
+        connection.checkActive();
+        int result=${name}0(request);
+        if(result<0){
+            throw new io.fd.vpp.jvpp.VppInvocationException("${name}",result);
+        }
+        return result;
+    }
+""")
+
+no_arg_method_template = Template("""    int $name() throws io.fd.vpp.jvpp.VppInvocationException;""")
+no_arg_method_native_template = Template("""    private static native int ${name}0() throws io.fd.vpp.jvpp.VppInvocationException;""")
+no_arg_method_impl_template = Template("""    public final int $name() throws io.fd.vpp.jvpp.VppInvocationException {
+        connection.checkActive();
+        int result=${name}0();
+        if(result<0){
+            throw new io.fd.vpp.jvpp.VppInvocationException("${name}",result);
+        }
+        return result;
+    }
+""")
+
+
+def generate_jvpp(func_list, base_package, plugin_package, plugin_name_underscore, dto_package, inputfile):
+    """ Generates JVpp interface and JNI implementation """
+    print "Generating JVpp"
+    plugin_name = util.underscore_to_camelcase_upper(plugin_name_underscore)
+
+    methods = []
+    methods_impl = []
+    for func in func_list:
+
+        # Skip structures that are used only as notifications
+        if util.is_just_notification(func['name']) or util.is_ignored(func['name']):
+            continue
+
+        camel_case_name = util.underscore_to_camelcase(func['name'])
+        camel_case_name_upper = util.underscore_to_camelcase_upper(func['name'])
+        if util.is_reply(camel_case_name):
+            continue
+
+        if len(func['args']) == 0:
+            methods.append(no_arg_method_template.substitute(name=camel_case_name))
+            methods_impl.append(no_arg_method_native_template.substitute(name=camel_case_name))
+            methods_impl.append(no_arg_method_impl_template.substitute(name=camel_case_name))
+        else:
+            methods.append(method_template.substitute(name=camel_case_name,
+                                                      request=camel_case_name_upper,
+                                                      plugin_package=plugin_package,
+                                                      dto_package=dto_package))
+            methods_impl.append(method_native_template.substitute(name=camel_case_name,
+                                                                  request=camel_case_name_upper,
+                                                                  plugin_package=plugin_package,
+                                                                  dto_package=dto_package))
+            methods_impl.append(method_impl_template.substitute(name=camel_case_name,
+                                                                request=camel_case_name_upper,
+                                                                plugin_package=plugin_package,
+                                                                dto_package=dto_package))
+
+    jvpp_file = open("JVpp%s.java" % plugin_name, 'w')
+    jvpp_file.write(
+        jvpp_ifc_template.substitute(inputfile=inputfile,
+                                     methods="\n".join(methods),
+                                     base_package=base_package,
+                                     plugin_package=plugin_package,
+                                     plugin_name=plugin_name,
+                                     dto_package=dto_package))
+    jvpp_file.flush()
+    jvpp_file.close()
+
+    jvpp_file = open("JVpp%sImpl.java" % plugin_name, 'w')
+    jvpp_file.write(jvpp_impl_template.substitute(inputfile=inputfile,
+                                                  methods="\n".join(methods_impl),
+                                                  base_package=base_package,
+                                                  plugin_package=plugin_package,
+                                                  plugin_name=plugin_name,
+                                                  plugin_name_underscore=plugin_name_underscore,
+                                                  dto_package=dto_package))
+    jvpp_file.flush()
+    jvpp_file.close()
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/notification_gen.py b/src/vpp-api/java/jvpp/gen/jvppgen/notification_gen.py
new file mode 100644
index 00000000..94302d56
--- /dev/null
+++ b/src/vpp-api/java/jvpp/gen/jvppgen/notification_gen.py
@@ -0,0 +1,199 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+
+import callback_gen
+import util
+from string import Template
+
+notification_registry_template = Template("""
+package $plugin_package.$notification_package;
+
+/**
+ * <p>Registry for notification callbacks defined in ${plugin_name}.
+ * <br>It was generated by notification_gen.py based on $inputfile
+ * <br>(python representation of api file generated by vppapigen).
+ */
+public interface ${plugin_name}NotificationRegistry extends $base_package.$notification_package.NotificationRegistry {
+
+    $register_callback_methods
+
+    @Override
+    void close();
+}
+""")
+
+global_notification_callback_template = Template("""
+package $plugin_package.$notification_package;
+
+/**
+ * <p>Aggregated callback interface for notifications only.
+ * <br>It was generated by notification_gen.py based on $inputfile
+ * <br>(python representation of api file generated by vppapigen).
+ */
+public interface Global${plugin_name}NotificationCallback$callbacks {
+
+}
+""")
+
+notification_registry_impl_template = Template("""
+package $plugin_package.$notification_package;
+
+/**
+ * <p>Notification registry delegating notification processing to registered callbacks.
+ * <br>It was generated by notification_gen.py based on $inputfile
+ * <br>(python representation of api file generated by vppapigen).
+ */
+public final class ${plugin_name}NotificationRegistryImpl implements ${plugin_name}NotificationRegistry, Global${plugin_name}NotificationCallback {
+
+    // TODO add a special NotificationCallback interface and only allow those to be registered
+    private final java.util.concurrent.ConcurrentMap<Class<? extends $base_package.$dto_package.JVppNotification>, $base_package.$callback_package.JVppNotificationCallback> registeredCallbacks =
+        new java.util.concurrent.ConcurrentHashMap<>();
+
+    $register_callback_methods
+    $handler_methods
+
+    @Override
+    public void close() {
+        registeredCallbacks.clear();
+    }
+}
+""")
+
+register_callback_impl_template = Template("""
+    public java.lang.AutoCloseable register$callback(final $plugin_package.$callback_package.$callback callback){
+        if(null != registeredCallbacks.putIfAbsent($plugin_package.$dto_package.$notification.class, callback)){
+            throw new IllegalArgumentException("Callback for " + $plugin_package.$dto_package.$notification.class +
+                "notification already registered");
+        }
+        return () -> registeredCallbacks.remove($plugin_package.$dto_package.$notification.class);
+    }
+""")
+
+handler_impl_template = Template("""
+    @Override
+    public void on$notification(
+        final $plugin_package.$dto_package.$notification notification) {
+        final $base_package.$callback_package.JVppNotificationCallback jVppNotificationCallback = registeredCallbacks.get($plugin_package.$dto_package.$notification.class);
+        if (null != jVppNotificationCallback) {
+            (($plugin_package.$callback_package.$callback) registeredCallbacks
+                .get($plugin_package.$dto_package.$notification.class))
+                .on$notification(notification);
+        }
+    }
+""")
+
+notification_provider_template = Template("""
+package $plugin_package.$notification_package;
+
+ /**
+ * Provides ${plugin_name}NotificationRegistry.
+ * <br>The file was generated by notification_gen.py based on $inputfile
+ * <br>(python representation of api file generated by vppapigen).
+ */
+public interface ${plugin_name}NotificationRegistryProvider extends $base_package.$notification_package.NotificationRegistryProvider {
+
+    @Override
+    public ${plugin_name}NotificationRegistry getNotificationRegistry();
+}
+""")
+
+
+def generate_notification_registry(func_list, base_package, plugin_package, plugin_name, notification_package, callback_package, dto_package, inputfile):
+    """ Generates notification registry interface and implementation """
+    print "Generating Notification interfaces and implementation"
+
+    if not os.path.exists(notification_package):
+        os.mkdir(notification_package)
+
+    callbacks = []
+    register_callback_methods = []
+    register_callback_methods_impl = []
+    handler_methods = []
+    for func in func_list:
+
+        if not util.is_notification(func['name']):
+            continue
+
+        camel_case_name_with_suffix = util.underscore_to_camelcase_upper(func['name'])
+        notification_dto = util.add_notification_suffix(camel_case_name_with_suffix)
+        callback_ifc = notification_dto + callback_gen.callback_suffix
+        fully_qualified_callback_ifc = "{0}.{1}.{2}".format(plugin_package, callback_package, callback_ifc)
+        callbacks.append(fully_qualified_callback_ifc)
+
+        # TODO create NotificationListenerRegistration and return that instead of AutoCloseable to better indicate
+        # that the registration should be closed
+        register_callback_methods.append("java.lang.AutoCloseable register{0}({1} callback);"
+                                         .format(callback_ifc, fully_qualified_callback_ifc))
+        register_callback_methods_impl.append(register_callback_impl_template.substitute(plugin_package=plugin_package,
+                                                                                         callback_package=callback_package,
+                                                                                         dto_package=dto_package,
+                                                                                         notification=notification_dto,
+                                                                                         callback=callback_ifc))
+        handler_methods.append(handler_impl_template.substitute(base_package=base_package,
+                                                                plugin_package=plugin_package,
+                                                                callback_package=callback_package,
+                                                                dto_package=dto_package,
+                                                                notification=notification_dto,
+                                                                callback=callback_ifc))
+
+
+    callback_file = open(os.path.join(notification_package, "%sNotificationRegistry.java" % plugin_name), 'w')
+    callback_file.write(notification_registry_template.substitute(inputfile=inputfile,
+                                                                register_callback_methods="\n    ".join(register_callback_methods),
+                                                                base_package=base_package,
+                                                                plugin_package=plugin_package,
+                                                                plugin_name=plugin_name,
+                                                                notification_package=notification_package))
+    callback_file.flush()
+    callback_file.close()
+
+    callback_file = open(os.path.join(notification_package, "Global%sNotificationCallback.java" % plugin_name), 'w')
+
+    global_notification_callback_callbacks = ""
+    if (callbacks):
+        global_notification_callback_callbacks = " extends " + ", ".join(callbacks)
+
+    callback_file.write(global_notification_callback_template.substitute(inputfile=inputfile,
+                                                                       callbacks=global_notification_callback_callbacks,
+                                                                       plugin_package=plugin_package,
+                                                                       plugin_name=plugin_name,
+                                                                       notification_package=notification_package))
+    callback_file.flush()
+    callback_file.close()
+
+    callback_file = open(os.path.join(notification_package, "%sNotificationRegistryImpl.java" % plugin_name), 'w')
+    callback_file.write(notification_registry_impl_template.substitute(inputfile=inputfile,
+                                                                     callback_package=callback_package,
+                                                                     dto_package=dto_package,
+                                                                     register_callback_methods="".join(register_callback_methods_impl),
+                                                                     handler_methods="".join(handler_methods),
+                                                                     base_package=base_package,
+                                                                     plugin_package=plugin_package,
+                                                                     plugin_name=plugin_name,
+                                                                     notification_package=notification_package))
+    callback_file.flush()
+    callback_file.close()
+
+    callback_file = open(os.path.join(notification_package, "%sNotificationRegistryProvider.java" % plugin_name), 'w')
+    callback_file.write(notification_provider_template.substitute(inputfile=inputfile,
+                                                                     base_package=base_package,
+                                                                     plugin_package=plugin_package,
+                                                                     plugin_name=plugin_name,
+                                                                     notification_package=notification_package))
+    callback_file.flush()
+    callback_file.close()
+
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/types_gen.py b/src/vpp-api/java/jvpp/gen/jvppgen/types_gen.py
new file mode 100644
index 00000000..7a5eec37
--- /dev/null
+++ b/src/vpp-api/java/jvpp/gen/jvppgen/types_gen.py
@@ -0,0 +1,227 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+from string import Template
+
+import util
+import jni_gen
+import dto_gen
+
+type_template = Template("""
+package $plugin_package.$type_package;
+
+/**
+ * <p>This class represents $c_type_name type definition.
+ * <br>It was generated by types_gen.py based on $inputfile preparsed data:
+ * <pre>
+$docs
+ * </pre>
+ */
+public final class $java_type_name {
+$fields
+$methods
+}
+""")
+
+field_template = Template("""    public $type $name;\n""")
+
+
+def generate_type_fields(type_definition):
+    """
+    Generates fields for class representing typeonly definition
+    :param type_definition: python representation of typeonly definition
+    :return: string representing class fields
+    """
+    fields = ""
+    for t in zip(type_definition['types'], type_definition['args']):
+        field_name = util.underscore_to_camelcase(t[1])
+        fields += field_template.substitute(type=util.jni_2_java_type_mapping[t[0]],
+                                            name=field_name)
+    return fields
+
+object_struct_setter_template = Template("""
+    {
+        jclass ${field_reference_name}Class = (*env)->FindClass(env, "${class_FQN}");
+        memset (&(mp->${c_name}), 0, sizeof (mp->${c_name}));
+        ${struct_initialization}
+    }
+""")
+
+object_array_struct_setter_template = Template("""
+    {
+        jclass ${field_reference_name}ArrayElementClass = (*env)->FindClass(env, "${class_FQN}");
+        if (${field_reference_name}) {
+            size_t _i;
+            jsize cnt = (*env)->GetArrayLength (env, ${field_reference_name});
+            ${field_length_check}
+            for (_i = 0; _i < cnt; _i++) {
+                jobject ${field_reference_name}ArrayElement = (*env)->GetObjectArrayElement(env, ${field_reference_name}, _i);
+                memset (&(mp->${c_name}[_i]), 0, sizeof (mp->${c_name}[_i]));
+                ${struct_initialization}
+            }
+        }
+    }
+""")
+
+object_dto_field_setter_template = Template("""
+    {
+        jclass ${field_reference_name}Class = (*env)->FindClass(env, "${class_FQN}");
+        jmethodID ${field_reference_name}Constructor = (*env)->GetMethodID(env, ${field_reference_name}Class, "<init>", "()V");
+        jobject ${field_reference_name} = (*env)->NewObject(env, ${field_reference_name}Class,  ${field_reference_name}Constructor);
+        ${type_initialization}
+        (*env)->SetObjectField(env, dto, ${field_reference_name}FieldId, ${field_reference_name});
+    }
+""")
+
+object_array_dto_field_setter_template = Template("""
+    {
+        jclass ${field_reference_name}Class = (*env)->FindClass(env, "${class_FQN}");
+        jobjectArray ${field_reference_name} = (*env)->NewObjectArray(env, ${field_length}, ${field_reference_name}Class, 0);
+        unsigned int _i;
+        for (_i = 0; _i < ${field_length}; _i++) {
+            jmethodID ${field_reference_name}Constructor = (*env)->GetMethodID(env, ${field_reference_name}Class, "<init>", "()V");
+            jobject ${field_reference_name}ArrayElement = (*env)->NewObject(env, ${field_reference_name}Class,  ${field_reference_name}Constructor);
+            ${type_initialization}
+            (*env)->SetObjectArrayElement(env, ${field_reference_name}, _i, ${field_reference_name}ArrayElement);
+        }
+        (*env)->SetObjectField(env, dto, ${field_reference_name}FieldId, ${field_reference_name});
+    }
+""")
+
+
+def generate_struct_initialization(type_def, c_name_prefix, object_name, indent):
+    struct_initialization = ""
+    # field identifiers
+    for t in zip(type_def['types'], type_def['args'], type_def['lengths']):
+        field_reference_name = "${c_name}" + util.underscore_to_camelcase_upper(t[1])
+        field_name = util.underscore_to_camelcase(t[1])
+        struct_initialization += jni_gen.jni_request_binding_for_type(field_type=t[0], c_name=c_name_prefix + t[1],
+                                                                     field_reference_name=field_reference_name,
+                                                                     field_name=field_name,
+                                                                     field_length=t[2][0],
+                                                                     is_variable_len_array=t[2][1],
+                                                                     object_name=object_name)
+    return indent + struct_initialization.replace('\n', '\n' + indent)
+
+
+def generate_type_setter(handler_name, type_def, c_name_prefix, object_name, indent):
+    type_initialization = ""
+    for t in zip(type_def['types'], type_def['args'], type_def['lengths']):
+        field_length = t[2][0]
+        is_variable_len_array = t[2][1]
+        length_field_type = None
+        if is_variable_len_array:
+            length_field_type = type_def['types'][type_def['args'].index(field_length)]
+        type_initialization += jni_gen.jni_reply_handler_for_type(handler_name=handler_name,
+                                                                  ref_name="${field_reference_name}",
+                                                                  field_type=t[0], c_name=c_name_prefix + t[1],
+                                                                  field_reference_name="${c_name}" + util.underscore_to_camelcase_upper(t[1]),
+                                                                  field_name=util.underscore_to_camelcase(t[1]),
+                                                                  field_length=field_length,
+                                                                  is_variable_len_array=is_variable_len_array,
+                                                                  length_field_type=length_field_type,
+                                                                  object_name=object_name)
+    return indent + type_initialization.replace('\n', '\n' + indent)
+
+
+def generate_types(types_list, plugin_package, types_package, inputfile):
+    """
+    Generates Java representation of custom types defined in api file.
+    """
+
+    #
+    if not types_list:
+        print "Skipping custom types generation (%s does not define custom types)." % inputfile
+        return
+
+    print "Generating custom types"
+
+    if not os.path.exists(types_package):
+        os.mkdir(types_package)
+
+    for type in types_list:
+        c_type_name = type['name']
+        java_type_name = util.underscore_to_camelcase_upper(type['name'])
+        dto_path = os.path.join(types_package, java_type_name + ".java")
+
+        fields = generate_type_fields(type)
+
+        dto_file = open(dto_path, 'w')
+        dto_file.write(type_template.substitute(plugin_package=plugin_package,
+                                                type_package=types_package,
+                                                c_type_name=c_type_name,
+                                                inputfile=inputfile,
+                                                docs=util.api_message_to_javadoc(type),
+                                                java_type_name=java_type_name,
+                                                fields=fields,
+                                                methods=dto_gen.generate_dto_base_methods(java_type_name, type)
+                                                ))
+
+        # update type mappings:
+        # todo fix vpe.api to use type_name instead of vl_api_type_name_t
+        type_name = "vl_api_" + c_type_name + "_t"
+        java_fqn = "%s.%s.%s" % (plugin_package, types_package, java_type_name)
+        util.vpp_2_jni_type_mapping[type_name] = "jobject"
+        util.vpp_2_jni_type_mapping[type_name + "[]"] = "jobjectArray"
+        util.jni_2_java_type_mapping[type_name] = java_fqn
+        util.jni_2_java_type_mapping[type_name + "[]"] = java_fqn + "[]"
+        jni_name = java_fqn.replace('.', "/")
+        jni_signature = "L" + jni_name + ";"
+        util.jni_2_signature_mapping[type_name] = "L" + jni_name + ";"
+        util.jni_2_signature_mapping[type_name + "[]"] = "[" + jni_signature
+        util.jni_field_accessors[type_name] = "ObjectField"
+        util.jni_field_accessors[type_name + "[]"] = "ObjectField"
+
+        jni_gen.struct_setter_templates[type_name] = Template(
+                object_struct_setter_template.substitute(
+                        c_name="${c_name}",
+                        field_reference_name="${field_reference_name}",
+                        class_FQN=jni_name,
+                        struct_initialization=generate_struct_initialization(type, "${c_name}.",
+                                                                           "${field_reference_name}", ' ' * 4))
+        )
+
+        jni_gen.struct_setter_templates[type_name+ "[]"] = Template(
+                object_array_struct_setter_template.substitute(
+                        c_name="${c_name}",
+                        field_reference_name="${field_reference_name}",
+                        field_length_check="${field_length_check}",
+                        class_FQN=jni_name,
+                        struct_initialization=generate_struct_initialization(type, "${c_name}[_i].",
+                                                                           "${field_reference_name}ArrayElement", ' ' * 8))
+        )
+
+        jni_gen.dto_field_setter_templates[type_name] = Template(
+                object_dto_field_setter_template.substitute(
+                        field_reference_name="${field_reference_name}",
+                        field_length="${field_length}",
+                        class_FQN=jni_name,
+                        type_initialization=generate_type_setter(c_type_name, type, "${c_name}.",
+                                                                 "${field_reference_name}", ' ' * 4))
+        )
+
+        jni_gen.dto_field_setter_templates[type_name + "[]"] = Template(
+                object_array_dto_field_setter_template.substitute(
+                        field_reference_name="${field_reference_name}",
+                        field_length="${field_length}",
+                        class_FQN=jni_name,
+                        type_initialization=generate_type_setter(c_type_name, type, "${c_name}[_i].",
+                                                                 "${field_reference_name}ArrayElement", ' ' * 8))
+        )
+
+        dto_file.flush()
+        dto_file.close()
+
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/util.py b/src/vpp-api/java/jvpp/gen/jvppgen/util.py
new file mode 100644
index 00000000..fc971c17
--- /dev/null
+++ b/src/vpp-api/java/jvpp/gen/jvppgen/util.py
@@ -0,0 +1,220 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os, pprint
+from os import removedirs
+
+
+def underscore_to_camelcase(name):
+    name = name.title().replace("_", "")
+    return name[0].lower() + name[1:]
+
+
+def underscore_to_camelcase_upper(name):
+    name = name.title().replace("_", "")
+    return name[0].upper() + name[1:]
+
+
+def remove_folder(folder):
+    """ Remove folder with all its files """
+    for root, dirs, files in os.walk(folder, topdown=False):
+        for name in files:
+            os.remove(os.path.join(root, name))
+        removedirs(folder)
+
+
+reply_suffixes = ("reply", "details", "l2fibtableentry")
+
+
+def is_reply(name):
+    return name.lower().endswith(reply_suffixes)
+
+
+def is_details(name):
+    return name.lower().endswith(reply_suffixes[1]) or name.lower().endswith(reply_suffixes[2])
+
+
+def is_retval_field(name):
+    return name == 'retval'
+
+dump_suffix = "dump"
+
+
+def is_dump(name):
+    return name.lower().endswith(dump_suffix)
+
+
+def get_reply_suffix(name):
+    for reply_suffix in reply_suffixes:
+        if name.lower().endswith(reply_suffix):
+            if reply_suffix == reply_suffixes[2]:
+                # FIXME workaround for l2_fib_table_entry
+                return 'entry'
+            else:
+                return reply_suffix
+
+# Mapping according to:
+# http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/types.html
+#
+# Unsigned types are converted to signed java types that have the same size.
+# It is the API user responsibility to interpret them correctly.
+jni_2_java_type_mapping = {'u8': 'byte',
+                           'u8[]': 'byte[]',
+                           'i8': 'byte',
+                           'i8[]': 'byte[]',
+                           'u16': 'short',
+                           'u16[]': 'short[]',
+                           'i16': 'short',
+                           'i16[]': 'short[]',
+                           'u32': 'int',
+                           'u32[]': 'int[]',
+                           'i32': 'int',
+                           'i32[]': 'int[]',
+                           'u64': 'long',
+                           'u64[]': 'long[]',
+                           'i64': 'long',
+                           'i64[]': 'long[]',
+                           'f64': 'double',
+                           'f64[]': 'double[]'
+                           }
+
+vpp_2_jni_type_mapping = {'u8': 'jbyte',
+                          'u8[]': 'jbyteArray',
+                          'i8': 'jbyte',
+                          'u8[]': 'jbyteArray',
+                          'u16': 'jshort',
+                          'u16[]': 'jshortArray',
+                          'i16': 'jshort',
+                          'i16[]': 'jshortArray',
+                          'u32': 'jint',
+                          'u32[]': 'jintArray',
+                          'i32': 'jint',
+                          'i32[]': 'jintArray',
+                          'u64': 'jlong',
+                          'u64[]': 'jlongArray',
+                          'i64': 'jlong',
+                          'i64[]': 'jlongArray',
+                          'f64': 'jdouble',
+                          'f64[]': 'jdoubleArray'
+                          }
+
+# https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/types.html#type_signatures
+jni_2_signature_mapping = {'u8': 'B',
+                           'u8[]': '[B',
+                           'i8': 'B',
+                           'i8[]': '[B',
+                           'u16': 'S',
+                           'u16[]': '[S',
+                           'i16': 'S',
+                           'i16[]': '[S',
+                           'u32': 'I',
+                           'u32[]': '[I',
+                           'i32': 'I',
+                           'i32[]': '[I',
+                           'u64': 'J',
+                           'u64[]': '[J',
+                           'i64': 'J',
+                           'i64[]': '[J',
+                           'f64': 'D',
+                           'f64[]': '[D'
+                           }
+
+# https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#Get_type_Field_routines
+jni_field_accessors =  {'u8': 'ByteField',
+                        'u8[]': 'ObjectField',
+                        'i8': 'ByteField',
+                        'i8[]': 'ObjectField',
+                        'u16': 'ShortField',
+                        'u16[]': 'ObjectField',
+                        'i16': 'ShortField',
+                        'i16[]': 'ObjectField',
+                        'u32': 'IntField',
+                        'u32[]': 'ObjectField',
+                        'i32': 'IntField',
+                        'i32[]': 'ObjectField',
+                        'u64': 'LongField',
+                        'u64[]': 'ObjectField',
+                        'i64': 'LongField',
+                        'i64[]': 'ObjectField',
+                        'f64': 'DoubleField',
+                        'f64[]': 'ObjectField'
+                        }
+
+
+# vpe.api calls that do not follow naming conventions and have to be handled exceptionally when finding reply -> request mapping
+# FIXME in vpe.api
+unconventional_naming_rep_req = {
+                                 'cli_reply': 'cli_request',
+                                 'vnet_summary_stats_reply': 'vnet_get_summary_stats',
+                                 # This below is actually a sub-details callback. We cannot derive the mapping of dump request
+                                 # belonging to this sub-details from naming conventions. We need special mapping
+                                 'bridge_domain_sw_if_details': 'bridge_domain',
+                                 # This is standard dump call + details reply. However it's not called details but entry
+                                 'l2_fib_table_entry': 'l2_fib_table'
+                                 }
+
+#
+# FIXME no convention in the naming of events (notifications) in vpe.api
+notifications_message_suffixes = ("event", "counters")
+notification_messages_reused = ["sw_interface_set_flags"]
+
+# messages that must be ignored. These messages are INSUFFICIENTLY marked as disabled in vpe.api
+# FIXME
+ignored_messages = ["is_address_reachable"]
+
+
+def is_notification(name):
+    """ Returns true if the structure is a notification regardless of its no other use """
+    return is_just_notification(name) or name.lower() in notification_messages_reused
+
+
+def is_just_notification(name):
+    """ Returns true if the structure is just a notification and has no other use """
+    return name.lower().endswith(notifications_message_suffixes)
+
+
+def is_ignored(param):
+    return param.lower() in ignored_messages
+
+
+def remove_reply_suffix(camel_case_name_with_suffix):
+    return remove_suffix(camel_case_name_with_suffix, get_reply_suffix(camel_case_name_with_suffix))
+
+
+def remove_suffix(camel_case_name_with_suffix, suffix):
+    suffix_length = len(suffix)
+    return camel_case_name_with_suffix[:-suffix_length] if suffix_length != 0 else camel_case_name_with_suffix
+
+
+def is_control_ping(camel_case_name_with_suffix):
+    return camel_case_name_with_suffix.lower().startswith("controlping");
+
+
+def api_message_to_javadoc(api_message):
+    """ Converts vpe.api message description to javadoc """
+    str = pprint.pformat(api_message, indent=4, width=120, depth=None)
+    return " * " + str.replace("\n", "\n * ")
+
+
+notification_dto_suffix = "Notification"
+
+
+def add_notification_suffix(camel_case_dto_name):
+    camel_case_dto_name += notification_dto_suffix
+    return camel_case_dto_name
+
+
+def is_array(java_type_as_string):
+    return java_type_as_string.endswith("[]")
diff --git a/src/vpp-api/lua/README.md b/src/vpp-api/lua/README.md
new file mode 100644
index 00000000..4ecdb34d
--- /dev/null
+++ b/src/vpp-api/lua/README.md
@@ -0,0 +1,50 @@
+This is the experimental version of Lua API, aimed for the luajit use.
+
+Please take a look and send the feedback to ayourtch@gmail.com.
+
+To run the examples here:
+
+1) install luajit - "sudo apt-get install luajit" on ubuntu
+
+2) "make build-vpp-api" in the top VPP directory
+
+3) "make run" in a separate terminal window
+   This ensures you have an instance of VPP running
+
+4) sudo luajit examples/example-cli.lua
+
+This will result in something like this:
+
+Version:
+00000000  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  ................
+00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  ................
+
+{ [1] = { ["luaapi_message_name"] = show_version_reply,["program"] = vpe,["version"] = ,["build_date"] = Fri Nov 25 10:58:48 UTC 2016,["retval"] = 0,["build_directory"] = /home/ubuntu/vpp,["_vl_msg_id"] = 170,["context"] = 0,} ,}
+---
+{ [1] = { ["luaapi_message_name"] = cli_inband_reply,["_vl_msg_id"] = 94,["length"] = 66,["reply"] = vpp v built by ubuntu on vpp-toys at Fri Nov 25 10:58:48 UTC 2016
+,["retval"] = 0,["context"] = 0,} ,}
+---
+
+5) You can also run the performance test bench:
+
+$ sudo luajit bench.lua
+10001 iterations, average speed 5624LL per second
+10001 iterations, average speed 6650LL per second
+10001 iterations, average speed 6053LL per second
+10001 iterations, average speed 7056LL per second
+10001 iterations, average speed 6388LL per second
+10001 iterations, average speed 5849LL per second
+10001 iterations, average speed 6321LL per second
+10001 iterations, average speed 6368LL per second
+10001 iterations, average speed 5958LL per second
+10001 iterations, average speed 6482LL per second
+Average tps across the tests: 6274LL
+
+Note: the above is run in an lxd container running inside 2-core
+xhyve VM on a Macbook Pro, so I would not take the performance numbers for granted :)
+
+The "examples" directory contains a few naive examples, as well as a couple of more 
+advanced ones - a tab-completing CLI for VPP that can call both the APIs and CLI,
+and also a small test utility which I use for automating some small tests using
+VPP.
+
diff --git a/src/vpp-api/lua/bench.lua b/src/vpp-api/lua/bench.lua
new file mode 100644
index 00000000..8e5a0b4b
--- /dev/null
+++ b/src/vpp-api/lua/bench.lua
@@ -0,0 +1,70 @@
+--[[
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+]]
+
+local vpp = require "vpp-lapi"
+
+local ffi = require "ffi"
+
+ffi.cdef([[
+   struct timespec {
+               long tv_sec;        /* seconds */
+               long tv_nsec;       /* nanoseconds */
+           };
+
+   int clock_gettime(int clk_id, struct timespec *tp);
+]])
+
+
+local time_cache = ffi.new("struct timespec[1]")
+local time_cache_1 = time_cache[0]
+function get_ns()
+  ffi.C.clock_gettime(0, time_cache)
+  return time_cache_1.tv_nsec + 1000000000 * time_cache_1.tv_sec
+end
+
+function do_bench()
+  local cycle_start = get_ns()
+  local n_iterations =  10000
+  local count = 1
+  for i = 1,n_iterations do
+    -- print(i)
+    vpp:api_call("show_version")
+    count = count + 1
+    -- print(i, "done")
+  end
+  cycle_end = get_ns()
+  local tps = n_iterations*1000000000LL/(cycle_end - cycle_start)
+  print (tostring(count) .. " iterations, average speed " .. tostring(tps) .. " per second")
+  return tps
+end
+
+root_dir = "/home/ubuntu/vpp"
+pneum_path = root_dir .. "/build-root/install-vpp_lite_debug-native/vpp-api/lib64/libpneum.so"
+vpp:init({ pneum_path = pneum_path })
+vpp:json_api(root_dir .. "/build-root/install-vpp_lite_debug-native/vpp/vpp-api/vpe.api.json")
+
+vpp:connect("lua-bench")
+local n_tests = 10
+local tps_acc = 0LL
+for i=1,n_tests do
+  tps_acc = tps_acc + do_bench()
+end
+print("Average tps across the tests: " .. tostring(tps_acc/n_tests))
+
+vpp:disconnect()
+
+
diff --git a/src/vpp-api/lua/examples/cli/README.md b/src/vpp-api/lua/examples/cli/README.md
new file mode 100644
index 00000000..3a5f8ee9
--- /dev/null
+++ b/src/vpp-api/lua/examples/cli/README.md
@@ -0,0 +1,5 @@
+This is a small experiment to have a wrapper CLI which can call both API functions as well as debug CLI.
+
+To facilitate tab completion and help, the API call names are broken up with spaces replacing the underscores.
+
+
diff --git a/src/vpp-api/lua/examples/cli/lua-cli.lua b/src/vpp-api/lua/examples/cli/lua-cli.lua
new file mode 100644
index 00000000..b3a24d7d
--- /dev/null
+++ b/src/vpp-api/lua/examples/cli/lua-cli.lua
@@ -0,0 +1,747 @@
+--[[
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+]]
+
+-- Experimental prototype CLI using API to VPP, with tab completion
+--
+-- Written by Andrew Yourtchenko (ayourtch@cisco.com) 2010,2016
+--
+
+vpp = require "vpp-lapi"
+
+
+local dotdotdot = "..."
+
+-- First the "readline" routine
+
+readln = {
+split = function(str, pat)
+  local t = {}  -- NOTE: use {n = 0} in Lua-5.0
+  local fpat = "(.-)" .. pat
+  local last_end = 1
+  if str then
+    local s, e, cap = str:find(fpat, 1)
+    while s do
+      if s ~= 1 or cap ~= "" then
+        table.insert(t,cap)
+      end
+      last_end = e+1
+      s, e, cap = str:find(fpat, last_end)
+    end
+    if last_end <= #str then
+      cap = str:sub(last_end)
+      table.insert(t, cap)
+    end
+  end
+  return t
+end,
+
+reader = function()
+  local rl = {}
+
+  rl.init = function()
+    os.execute("stty -icanon min 1 -echo")
+    rl.rawmode = true
+  end
+
+  rl.done = function()
+    os.execute("stty icanon echo")
+    rl.rawmode = false
+  end
+
+  rl.prompt = ">"
+  rl.history = { "" }
+  rl.history_index = 1
+  rl.history_length = 1
+
+  rl.hide_cmd = function()
+    local bs = string.char(8) .. " " .. string.char(8)
+    for i = 1, #rl.command do
+      io.stdout:write(bs)
+    end
+  end
+
+  rl.show_cmd = function()
+    if rl.command then
+      io.stdout:write(rl.command)
+    end
+  end
+
+  rl.store_history = function(cmd)
+    if cmd == "" then
+      return
+    end
+    rl.history[rl.history_length] = cmd
+    rl.history_length = rl.history_length + 1
+    rl.history_index = rl.history_length
+    rl.history[rl.history_length] = ""
+  end
+
+  rl.readln = function()
+    local done = false
+    local need_prompt = true
+    rl.command = ""
+
+    if not rl.rawmode then
+      rl.init()
+    end
+
+    while not done do
+      if need_prompt then
+        io.stdout:write(rl.prompt)
+	io.stdout:write(rl.command)
+        need_prompt = false
+      end
+
+      local ch = io.stdin:read(1)
+      if ch:byte(1) == 27 then
+        -- CONTROL
+        local ch2 = io.stdin:read(1)
+        -- arrows
+        if ch2:byte(1) == 91 then
+          local ch3 = io.stdin:read(1)
+          local b = ch3:byte(1)
+          if b == 65 then
+            ch = "UP"
+          elseif b == 66 then
+            ch = "DOWN"
+          elseif b == 67 then
+            ch = "RIGHT"
+          elseif b == 68 then
+            ch = "LEFT"
+          end
+          -- print("Byte: " .. ch3:byte(1))
+          -- if ch3:byte(1)
+        end
+      end
+
+      if ch == "?" then
+        io.stdout:write(ch)
+        io.stdout:write("\n")
+        if rl.help then
+          rl.help(rl)
+        end
+        need_prompt = true
+      elseif ch == "\t" then
+        if rl.tab_complete then
+          rl.tab_complete(rl)
+        end
+        io.stdout:write("\n")
+        need_prompt = true
+      elseif ch == "\n" then
+        io.stdout:write(ch)
+        done = true
+      elseif ch == "\004" then
+        io.stdout:write("\n")
+        rl.command = nil
+	done = true
+      elseif ch == string.char(127) then
+        if rl.command ~= "" then
+          io.stdout:write(string.char(8) .. " " .. string.char(8))
+          rl.command = string.sub(rl.command, 1, -2)
+        end
+      elseif #ch > 1 then
+        -- control char
+        if ch == "UP" then
+          rl.hide_cmd()
+          if rl.history_index == #rl.history then
+            rl.history[rl.history_index] = rl.command
+          end
+          if rl.history_index > 1 then
+            rl.history_index = rl.history_index - 1
+            rl.command = rl.history[rl.history_index]
+          end
+          rl.show_cmd()
+        elseif ch == "DOWN" then
+          rl.hide_cmd()
+          if rl.history_index < rl.history_length then
+            rl.history_index = rl.history_index + 1
+            rl.command = rl.history[rl.history_index]
+          end
+          rl.show_cmd()
+        end
+      else
+        io.stdout:write(ch)
+        rl.command = rl.command .. ch
+      end
+    end
+    if rl.command then
+      rl.store_history(rl.command)
+    end
+    return rl.command
+  end
+  return rl
+end
+
+}
+
+--[[
+
+r = reader()
+
+local done = false
+
+while not done do
+  local cmd = r.readln()
+  print("Command: " .. tostring(cmd))
+  if not cmd or cmd == "quit" then
+    done = true
+  end
+end
+
+r.done()
+
+]]
+
+--------- MDS show tech parser
+
+local print_section = nil
+local list_sections = false
+
+local curr_section = "---"
+local curr_parser = nil
+
+-- by default operate in batch mode
+local batch_mode = true
+
+local db = {}
+local device = {}
+device.output = {}
+local seen_section = {}
+
+function start_collection(name)
+  device = {}
+  seen_section = {}
+end
+
+function print_error(errmsg)
+  print("@#$:" .. errmsg)
+end
+
+function keys(tbl)
+  local t = {}
+  for k, v in pairs(tbl) do
+    table.insert(t, k)
+  end
+  return t
+end
+
+function tset (parent, ...)
+
+  -- print ('set', ...)
+
+  local len = select ('#', ...)
+  local key, value = select (len-1, ...)
+  local cutpoint, cutkey
+
+  for i=1,len-2 do
+
+    local key = select (i, ...)
+    local child = parent[key]
+
+    if value == nil then
+      if child == nil then  return
+      elseif next (child, next (child)) then  cutpoint = nil  cutkey = nil
+      elseif cutpoint == nil then  cutpoint = parent  cutkey = key  end
+
+    elseif child == nil then  child = {}  parent[key] = child  end
+
+    parent = child
+    end
+
+  if value == nil and cutpoint then  cutpoint[cutkey] = nil
+  else  parent[key] = value  return value  end
+  end
+
+
+function tget (parent, ...)
+  local len = select ('#', ...)
+  for i=1,len do
+    parent = parent[select (i, ...)]
+    if parent == nil then  break  end
+    end
+  return parent
+  end
+
+
+local pager_lines = 23
+local pager_printed = 0
+local pager_skipping = false
+local pager_filter_pipe = nil
+
+function pager_reset()
+  pager_printed = 0
+  pager_skipping = false
+  if pager_filter_pipe then
+    pager_filter_pipe:close()
+    pager_filter_pipe = nil
+  end
+end
+
+
+function print_more()
+  io.stdout:write(" --More-- ")
+end
+
+function print_nomore()
+  local bs = string.char(8)
+  local bs10 = bs ..  bs ..  bs ..  bs ..  bs ..  bs ..  bs ..  bs ..  bs ..  bs
+  io.stdout:write(bs10 .. "          " .. bs10)
+end
+
+function print_line(txt)
+  if pager_filter_pipe then
+    pager_filter_pipe:write(txt .. "\n")
+    return
+  end
+  if pager_printed >= pager_lines then
+    print_more()
+    local ch = io.stdin:read(1)
+    if ch == " " then
+      pager_printed = 0
+    elseif ch == "\n" then
+      pager_printed = pager_printed - 1
+    elseif ch == "q" then
+      pager_printed = 0
+      pager_skipping = true
+    end
+    print_nomore()
+  end
+  if not pager_skipping then
+    print(txt)
+    pager_printed = pager_printed + 1
+  else
+    -- skip printing
+  end
+end
+
+function paged_write(text)
+  local t = readln.split(text, "[\n]")
+  if string.sub(text, -1) == "\n" then
+    table.insert(t, "")
+  end
+  for i, v in ipairs(t) do
+    if i < #t then
+      print_line(v)
+    else
+      if pager_filter_pipe then
+        pager_filter_pipe:write(v)
+      else
+        io.stdout:write(v)
+      end
+    end
+  end
+end
+
+
+
+
+
+function get_choices(tbl, key)
+  local res = {}
+  for k, v in pairs(tbl) do
+    if string.sub(k, 1, #key) == key then
+      table.insert(res, k)
+    elseif 0 < #key and dotdotdot == k then
+      table.insert(res, k)
+    end
+  end
+  return res
+end
+
+function get_exact_choice(choices, val)
+  local exact_idx = nil
+  local substr_idx = nil
+  local substr_seen = false
+
+  if #choices == 1 then
+    if choices[1] == dotdotdot then
+      return 1
+    elseif string.sub(choices[1], 1, #val) == val then
+      return 1
+    else
+      return nil
+    end
+  else
+    for i, v in ipairs(choices) do
+      if v == val then
+        exact_idx = i
+        substr_seen = true
+      elseif choices[i] ~= dotdotdot and string.sub(choices[i], 1, #val) == val then
+        if substr_seen then
+          substr_idx = nil
+        else
+          substr_idx = i
+          substr_seen = true
+        end
+      elseif choices[i] == dotdotdot then
+        if substr_seen then
+          substr_idx = nil
+        else
+          substr_idx = i
+          substr_seen = true
+        end
+      end
+    end
+  end
+  return exact_idx or substr_idx
+end
+
+function device_cli_help(rl)
+  local key = readln.split(rl.command, "[ ]+")
+  local tree = rl.tree
+  local keylen = #key
+  local fullcmd = ""
+  local error = false
+  local terse = true
+
+  if ((#rl.command >= 1) and (string.sub(rl.command, -1) == " ")) or (#rl.command == 0) then
+    table.insert(key, "")
+    terse = false
+  end
+
+  for i, v in ipairs(key) do
+    local choices = get_choices(tree, v)
+    local idx = get_exact_choice(choices, v)
+    if idx then
+      local choice = choices[idx]
+      tree = tree[choice]
+      fullcmd = fullcmd .. choice .. " "
+    else
+      if i < #key then
+        error = true
+      end
+    end
+
+    if i == #key and not error then
+      for j, w in ipairs(choices) do
+        if terse then
+          paged_write(w .. "\t")
+        else
+          paged_write("  " .. w .. "\n")
+        end
+      end
+      paged_write("\n")
+      if terse then
+        paged_write(" \n")
+      end
+    end
+  end
+  pager_reset()
+end
+
+function device_cli_tab_complete(rl)
+  local key = readln.split(rl.command, "[ ]+")
+  local tree = rl.tree
+  local keylen = #key
+  local fullcmd = ""
+  local error = false
+
+  for i, v in ipairs(key) do
+    local choices = get_choices(tree, v)
+    local idx = get_exact_choice(choices, v)
+    if idx and choices[idx] ~= dotdotdot then
+      local choice = choices[idx]
+      tree = tree[choice]
+      -- print("level " .. i .. " '" .. choice .. "'")
+      fullcmd = fullcmd .. choice .. " "
+    else
+      -- print("level " .. i .. " : " .. table.concat(choices, " ") .. " ")
+      error = true
+    end
+  end
+  if not error then
+    rl.command = fullcmd
+  else
+    -- print("\n\nerror\n")
+  end
+  pager_reset()
+end
+
+function device_cli_exec(rl)
+
+  local cmd_nopipe = rl.command
+  local cmd_pipe = nil
+
+  local pipe1, pipe2 = string.find(rl.command, "[|]")
+  if pipe1 then
+    cmd_nopipe = string.sub(rl.command, 1, pipe1-1)
+    cmd_pipe = string.sub(rl.command, pipe2+1, -1)
+  end
+
+  local key = readln.split(cmd_nopipe .. " <cr>", "[ ]+")
+  local tree = rl.tree
+  local keylen = #key
+  local fullcmd = ""
+  local error = false
+  local func = nil
+
+  if cmd_pipe then
+    pager_filter_pipe = io.popen(cmd_pipe, "w")
+  end
+
+
+  rl.choices = {}
+
+  for i, v in ipairs(key) do
+    local choices = get_choices(tree, v)
+    local idx = get_exact_choice(choices, v)
+    if idx then
+      local choice = choices[idx]
+      if i == #key then
+        func = tree[choice]
+      else
+        if choice == dotdotdot then
+          -- keep the tree the same, update the choice value to match the input string
+          choices[idx] = v
+          choice = v
+        else
+          tree = tree[choice]
+        end
+      end
+      -- print("level " .. i .. " '" .. choice .. "'")
+      table.insert(rl.choices, choice)
+    else
+      -- print("level " .. i .. " : " .. table.concat(choices, " ") .. " ")
+      error = true
+      return nil
+    end
+  end
+  return func
+end
+
+function populate_tree(commands)
+  local tree = {}
+
+  for k, v in pairs(commands) do
+    local key = readln.split(k .. " <cr>", "[ ]+")
+    local xtree = tree
+    for i, kk in ipairs(key) do
+      if i == 1 and kk == "sh" then
+        kk = "show"
+      end
+      if i == #key then
+        if type(v) == "function" then
+          xtree[kk] = v
+        else
+          xtree[kk] = function(rl) paged_write(table.concat(v, "\n") .. "\n") end
+        end
+      else
+        if not xtree[kk] then
+          xtree[kk] = {}
+        end
+        xtree = xtree[kk]
+      end
+    end
+  end
+  return tree
+end
+
+function trim (s)
+  return (string.gsub(s, "^%s*(.-)%s*$", "%1"))
+end
+
+
+function init_vpp(vpp)
+  local root_dir = "/home/ubuntu/vpp"
+  local pneum_path = root_dir .. "/build-root/install-vpp_lite_debug-native/vpp-api/lib64/libpneum.so"
+
+  vpp:init({ pneum_path = pneum_path })
+
+  vpp:init({ pneum_path = pneum_path })
+  vpp:json_api(root_dir .. "/build-root/install-vpp_lite_debug-native/vpp/vpp-api/vpe.api.json")
+
+
+
+  vpp:connect("lua_cli")
+end
+
+function run_cli(vpp, cli)
+  local reply = vpp:api_call("cli_inband", { cmd = cli })
+  if reply and #reply == 1 then
+    local rep = reply[1]
+    if 0 == rep.retval then
+      return rep.reply
+    else
+      return "XXXXXLUACLI: API RETVAL ERROR : " .. tostring(rep.retval)
+    end
+  else
+    return "XXXXXLUACLI ERROR, RAW REPLY: " .. vpp.dump(reply)
+  end
+end
+
+
+function toprintablestring(s)
+  if type(s) == "string" then
+    return "\n"..vpp.hex_dump(s)
+  else
+    return tostring(s)
+  end
+end
+
+function interactive_cli(r)
+  while not done do
+    pager_reset()
+    local cmd = r.readln()
+    if not cmd then
+      done = true
+    elseif cmd == "quit" or cmd == "exit" then
+      done = true
+    else
+      local func = device_cli_exec(r)
+      if func then
+	func(r)
+      else
+	if trim(cmd) == "" then
+	else
+	  for i = 1, #r.prompt do
+	    paged_write(" ")
+	  end
+	  paged_write("^\n% Invalid input detected at '^' marker.\n\n")
+	end
+      end
+    end
+  end
+end
+
+device = {}
+device.output = {}
+
+init_vpp(vpp)
+cmds_str = run_cli(vpp, "?")
+vpp_cmds = readln.split(cmds_str, "\n")
+vpp_clis = {}
+
+for linenum, line in ipairs(vpp_cmds) do
+  local m,h = string.match(line, "^  (.-)  (.*)$")
+  if m and #m > 0 then
+    table.insert(vpp_clis, m)
+    device.output["vpp debug cli " .. m] = function(rl)
+      -- print("ARBITRARY CLI" .. vpp.dump(rl.choices))
+      print("LUACLI command: " .. table.concat(rl.choices, " "))
+      local sub = {}
+      --
+      for i=4, #rl.choices -1 do
+        table.insert(sub, rl.choices[i])
+      end
+      local cli = table.concat(sub, " ")
+      print("Running CLI: " .. tostring(cli))
+      paged_write(run_cli(vpp, cli))
+    end
+    device.output["vpp debug cli " .. m .. " " .. dotdotdot] = function(rl)
+      print("ARGH")
+    end
+
+    local ret = run_cli(vpp, "help " .. m)
+    device.output["help vpp debug cli " .. m] = { ret }
+  end
+end
+
+for linenum, line in ipairs(vpp_clis) do
+  -- print(line, ret)
+end
+
+for msgnum, msgname in pairs(vpp.msg_number_to_name) do
+  local cli, numspaces = string.gsub(msgname, "_", " ")
+  device.output["call " .. cli .. " " .. dotdotdot] = function(rl)
+    print("ARGH")
+  end
+  device.output["call " .. cli] = function(rl)
+    print("LUACLI command: " .. table.concat(rl.choices, " "))
+    print("Running API: " .. msgname) -- vpp.dump(rl.choices))
+    local out = {}
+    local args = {}
+    local ntaken = 0
+    local argname = ""
+    for i=(1+1+numspaces+1), #rl.choices-1 do
+      -- print(i, rl.choices[i])
+      if ntaken > 0 then
+        ntaken = ntaken -1
+      else
+        local fieldname = rl.choices[i]
+        local field = vpp.msg_name_to_fields[msgname][fieldname]
+        if field then
+          local s = rl.choices[i+1]
+          s=s:gsub("\\x(%x%x)",function (x) return string.char(tonumber(x,16)) end)
+          args[fieldname] = s
+          ntaken = 1
+        end
+      end
+    end
+    -- print("ARGS: ", vpp.dump(args))
+    local ret = vpp:api_call(msgname, args)
+    for i, reply in ipairs(ret) do
+      table.insert(out, "=================== Entry #" .. tostring(i))
+      for k, v in pairs(reply) do
+        table.insert(out, "   " .. tostring(k) .. " : " .. toprintablestring(v))
+      end
+    end
+    -- paged_write(vpp.dump(ret) .. "\n\n")
+    paged_write(table.concat(out, "\n").."\n\n")
+  end
+  device.output["call " .. cli .. " help"] = function(rl)
+    local out = {}
+    for k, v in pairs(vpp.msg_name_to_fields[msgname]) do
+      table.insert(out, tostring(k) .. " : " .. v["ctype"] .. " ; " .. tostring(vpp.dump(v)) )
+    end
+    -- paged_write(vpp.dump(vpp.msg_name_to_fields[msgname]) .. "\n\n")
+    paged_write(table.concat(out, "\n").."\n\n")
+  end
+-- vpp.msg_name_to_number = {}
+end
+
+
+
+local r = readln.reader()
+local done = false
+
+r.prompt = "VPP(luaCLI)#"
+
+r.help = device_cli_help
+r.tab_complete = device_cli_tab_complete
+print("===== CLI view, use ^D to end =====")
+
+r.tree = populate_tree(device.output)
+-- readln.pretty("xxxx", r.tree)
+
+
+for idx, an_arg in ipairs(arg) do
+  local fname = an_arg
+  if fname == "-i" then
+    pager_lines = 23
+    interactive_cli(r)
+  else
+    pager_lines = 100000000
+    for line in io.lines(fname) do
+      r.command = line
+      local func = device_cli_exec(r)
+      if func then
+	func(r)
+      end
+    end
+  end
+end
+
+if #arg == 0 then
+  print("You should specify '-i' as an argument for the interactive session,")
+  print("but with no other sources of commands, we start interactive session now anyway")
+   interactive_cli(r)
+end
+
+vpp:disconnect()
+r.done()
+
+
diff --git a/src/vpp-api/lua/examples/example-acl-plugin.lua b/src/vpp-api/lua/examples/example-acl-plugin.lua
new file mode 100644
index 00000000..ca01f18d
--- /dev/null
+++ b/src/vpp-api/lua/examples/example-acl-plugin.lua
@@ -0,0 +1,110 @@
+--[[
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+]]
+
+
+vpp = require "vpp-lapi"
+
+root_dir = "/home/ubuntu/vpp"
+pneum_path = root_dir .. "/build-root/install-vpp_debug-native/vpp-api/lib64/libpneum.so"
+
+vpp:init({ pneum_path = pneum_path })
+
+vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vlib-api/vlibmemory/memclnt.api")
+vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vpp/vpp-api/vpe.api")
+vpp:connect("aytest")
+vpp:consume_api(root_dir .. "/plugins/acl-plugin/acl/acl.api", "acl")
+
+-- api calls
+reply = vpp:api_call("show_version")
+print("Version: ", reply[1].version)
+print(vpp.hex_dump(reply[1].version))
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 230 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 8 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 15 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_add", { context = 42, count = 2, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 } } })
+print(vpp.dump(reply))
+print("---")
+interface_acl_in = reply[1].acl_index
+
+reply = vpp:api_call("acl_add", { context = 42, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
+print(vpp.dump(reply))
+print("---")
+interface_acl_out = reply[1].acl_index
+
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_add", { context = 42, count = 0 })
+print(vpp.dump(reply))
+print("---")
+
+acl_index_to_delete = reply[1].acl_index
+print("Deleting " .. tostring(acl_index_to_delete))
+reply = vpp:api_call("acl_del", { context = 42, acl_index = acl_index_to_delete })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
+for ri, rv in ipairs(reply) do 
+  print("Reply message #" .. tostring(ri))
+  print(vpp.dump(rv))
+  for ai, av in ipairs(rv.r) do
+    print("ACL rule #" .. tostring(ai) .. " : " .. vpp.dump(av))
+  end
+   
+end
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
+print(vpp.dump(reply))
+print("---")
+
+
+vpp:disconnect()
+
+
diff --git a/src/vpp-api/lua/examples/example-classifier.lua b/src/vpp-api/lua/examples/example-classifier.lua
new file mode 100644
index 00000000..ec9c3d3e
--- /dev/null
+++ b/src/vpp-api/lua/examples/example-classifier.lua
@@ -0,0 +1,51 @@
+--[[
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+]]
+
+
+local vpp = require "vpp-lapi"
+local bit = require("bit")
+
+root_dir = "/home/ubuntu/vpp"
+pneum_path = root_dir .. "/build-root/install-vpp_lite_debug-native/vpp-api/lib64/libpneum.so"
+
+
+vpp:init({ pneum_path = pneum_path })
+
+vpp:json_api(root_dir .. "/build-root/install-vpp_lite_debug-native/vpp/vpp-api/vpe.api.json")
+
+vpp:connect("aytest")
+
+-- api calls
+
+print("Calling API to add a new classifier table")
+reply = vpp:api_call("classify_add_del_table", {
+  context = 43,
+  memory_size = bit.lshift(2, 20),
+  client_index = 42,
+  is_add = 1,
+  nbuckets = 32,
+  skip_n_vectors = 0,
+  match_n_vectors = 1,
+  mask = "\255\255\255\255\255\255\255\255" .. "\255\255\255\255\255\255\255\255"
+})
+print(vpp.dump(reply))
+print("---")
+
+
+vpp:disconnect()
+
+
diff --git a/src/vpp-api/lua/examples/example-cli.lua b/src/vpp-api/lua/examples/example-cli.lua
new file mode 100644
index 00000000..8b84989f
--- /dev/null
+++ b/src/vpp-api/lua/examples/example-cli.lua
@@ -0,0 +1,44 @@
+--[[
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+]]
+
+vpp = require "vpp-lapi"
+
+root_dir = "/home/ubuntu/vpp"
+pneum_path = root_dir .. "/build-root/install-vpp_lite_debug-native/vpp-api/lib64/libpneum.so"
+
+vpp:init({ pneum_path = pneum_path })
+
+vpp:json_api(root_dir .. "/build-root/install-vpp_lite_debug-native/vpp/vpp-api/vpe.api.json")
+
+vpp:connect("aytest")
+
+-- api calls
+reply = vpp:api_call("show_version")
+print("Version: ", reply[1].version)
+print(vpp.hex_dump(reply[1].version))
+print(vpp.dump(reply))
+print("---")
+
+
+reply = vpp:api_call("cli_inband", { cmd = "show vers" }) 
+print(vpp.dump(reply))
+print("---")
+
+
+vpp:disconnect()
+
+
diff --git a/src/vpp-api/lua/examples/lute/README.md b/src/vpp-api/lua/examples/lute/README.md
new file mode 100644
index 00000000..8d37250a
--- /dev/null
+++ b/src/vpp-api/lua/examples/lute/README.md
@@ -0,0 +1,66 @@
+LUTE: Lua Unit Test Environment
+
+This is a small helper utility to automate some simple tests
+that one might need to do.
+
+Think of it as a hybrid of a screen and expect who
+also took some habits from HTML inline code.
+
+It is quite probably useless for building anything serious,
+but practice shows it is quite efficient at allowing
+convenient temporary quick tests, and for something
+that was written over a course of a couple of evenings it
+is quite a nice little helper tool.
+
+It allows do launch and drive multiple shell sessions,
+and by virtue of having been written in Lua, it of course
+also allows to add the business logic using the Lua code.
+
+If you launch the lute without parameters, it gives you
+the interactive shell to execute the commands in.
+
+If you launch it with an argument, it will attempt to
+read and execute the commands from the file.
+
+Commands:
+
+shell FOO
+
+  spawn a shell in a new PTY under the label FOO.
+
+run FOO bar
+
+  Send "bar" keystrokes followed by "ENTER" to the session FOO
+
+  Special case: "break" word on its own gets translated into ^C being sent.
+
+cd FOO
+
+  "change domain" into session FOO. All subsequent inputs will go,
+  line-buffered, into the session FOO. To jump back up, use ^D (Control-D),
+  or within the file, use ^D^D^D (caret D caret D caret D on its own line)
+
+expect FOO blablabla
+
+  Pause further interpretation of the batch mode until you see "blablabla"
+  in the output of session FOO, or until timeout happens.
+
+sleep N
+
+  Sleep an integer N seconds, if you are in batch mode.
+
+echo blabla
+
+  Echo the remainder of the line to standard output.
+
+For Lua code, there is a pre-existing pseudo-session called "lua",
+which accepts "run lua" command which does what you would expect
+(evaluate the rest of the string in Lua context - being the same
+as lute itself). Also you can do "cd lua" and get into a
+multiline-enabled interpreter shell.
+
+This way for the VPP case you can automate some of the things in your routine
+that you would have to have done manually, and test drive API as well
+as use the realistic native OS components to create the environment around it.
+
+
diff --git a/src/vpp-api/lua/examples/lute/lute.lua b/src/vpp-api/lua/examples/lute/lute.lua
new file mode 100644
index 00000000..89b9924b
--- /dev/null
+++ b/src/vpp-api/lua/examples/lute/lute.lua
@@ -0,0 +1,777 @@
+--[[
+version = 1
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+]]
+
+-- LUTE: Lua Unit Test Environment
+-- AKA what happens when screen tries to marry with lua and expect,
+-- but escapes mid-ceremony.
+--
+-- comments: @ayourtch
+
+ffi = require("ffi")
+
+vpp = {}
+function vpp.dump(o)
+   if type(o) == 'table' then
+      local s = '{ '
+      for k,v in pairs(o) do
+         if type(k) ~= 'number' then k = '"'..k..'"' end
+         s = s .. '['..k..'] = ' .. vpp.dump(v) .. ','
+      end
+      return s .. '} '
+   else
+      return tostring(o)
+   end
+end
+
+
+ffi.cdef([[
+
+int posix_openpt(int flags);
+int grantpt(int fd);
+int unlockpt(int fd);
+char *ptsname(int fd);
+
+typedef long pid_t;
+typedef long ssize_t;
+typedef long size_t;
+typedef int nfds_t;
+typedef long time_t;
+typedef long suseconds_t;
+
+pid_t fork(void);
+pid_t setsid(void);
+
+int close(int fd);
+int open(char *pathname, int flags);
+
+int dup2(int oldfd, int newfd);
+
+ssize_t read(int fd, void *buf, size_t count);
+ssize_t write(int fd, const void *buf, size_t count);
+
+struct pollfd {
+               int   fd;         /* file descriptor */
+               short events;     /* requested events */
+               short revents;    /* returned events */
+           };
+
+int poll(struct pollfd *fds, nfds_t nfds, int timeout);
+
+struct timeval {
+               time_t      tv_sec;     /* seconds */
+               suseconds_t tv_usec;    /* microseconds */
+           };
+
+int gettimeofday(struct timeval *tv, struct timezone *tz);
+
+int inet_pton(int af, const char *src, void *dst);
+
+]])
+
+ffi.cdef([[
+void *memset(void *s, int c, size_t n);
+void *memcpy(void *dest, void *src, size_t n);
+void *memmove(void *dest, const void *src, size_t n);
+void *memmem(const void *haystack, size_t haystacklen,
+        const void *needle, size_t needlelen);
+]])
+
+
+
+local O_RDWR = 2
+
+
+function os_time()
+  local tv = ffi.new("struct timeval[1]")
+  local ret = ffi.C.gettimeofday(tv, nil)
+  return tonumber(tv[0].tv_sec) + (tonumber(tv[0].tv_usec)/1000000.0)
+end
+
+function sleep(n)
+  local when_wakeup = os_time() + n
+  while os_time() <= when_wakeup do
+    ffi.C.poll(nil, 0, 10)
+  end
+end
+
+
+function c_str(text_in)
+  local text = text_in 
+  local c_str = ffi.new("char[?]", #text+1)
+  ffi.copy(c_str, text)
+  return c_str
+end
+
+function ip46(addr_text)
+  local out = ffi.new("char [200]")
+  local AF_INET6 = 10
+  local AF_INET = 2
+  local is_ip6 = ffi.C.inet_pton(AF_INET6, c_str(addr_text), out)
+  if is_ip6 == 1 then
+    return ffi.string(out, 16), true
+  end
+  local is_ip4 = ffi.C.inet_pton(AF_INET, c_str(addr_text), out)
+  if is_ip4 then
+    return (string.rep("4", 12).. ffi.string(out, 4)), false
+  end
+end
+
+function pty_master_open()
+  local fd = ffi.C.posix_openpt(O_RDWR)
+  ffi.C.grantpt(fd)
+  ffi.C.unlockpt(fd)
+  local p = ffi.C.ptsname(fd)
+  print("PTS:" .. ffi.string(p))
+  return fd, ffi.string(p)
+end
+
+function pty_run(cmd)
+  local master_fd, pts_name = pty_master_open()
+  local child_pid = ffi.C.fork()
+  if (child_pid == -1) then
+    print("Error fork()ing")
+    return -1
+  end 
+ 
+  if child_pid ~= 0 then
+    -- print("Parent")
+    return master_fd, child_pid
+  end
+
+  -- print("Child")
+  if (ffi.C.setsid() == -1) then
+    print("Child error setsid")
+    os.exit(-1)
+  end
+
+  ffi.C.close(master_fd)
+
+  local slave_fd = ffi.C.open(c_str(pts_name), O_RDWR)
+  if slave_fd == -1 then
+    print("Child can not open slave fd")
+    os.exit(-2)
+  end
+
+  ffi.C.dup2(slave_fd, 0)
+  ffi.C.dup2(slave_fd, 1)
+  ffi.C.dup2(slave_fd, 2)
+  os.execute(cmd)
+end
+
+function readch()
+  local buf = ffi.new("char[1]")
+  local nread= ffi.C.read(0, buf, 1)
+  -- print("\nREADCH : " .. string.char(buf[0]))
+  return string.char(buf[0])
+end
+
+function stdout_write(str)
+  ffi.C.write(1, c_str(str), #str)
+end
+
+
+readln = {
+split = function(str, pat)
+  local t = {}  -- NOTE: use {n = 0} in Lua-5.0
+  local fpat = "(.-)" .. pat
+  local last_end = 1
+  if str then
+    local s, e, cap = str:find(fpat, 1)
+    while s do
+      if s ~= 1 or cap ~= "" then
+        table.insert(t,cap)
+      end
+      last_end = e+1
+      s, e, cap = str:find(fpat, last_end)
+    end
+    if last_end <= #str then
+      cap = str:sub(last_end)
+      table.insert(t, cap)
+    end
+  end
+  return t
+end,
+
+reader = function()
+  local rl = {}
+
+  rl.init = function()
+    os.execute("stty -icanon min 1 -echo")
+    rl.rawmode = true
+  end
+
+  rl.done = function()
+    os.execute("stty icanon echo")
+    rl.rawmode = false
+  end
+
+  rl.prompt = ">"
+  rl.history = { "" }
+  rl.history_index = 1
+  rl.history_length = 1
+
+  rl.hide_cmd = function()
+    local bs = string.char(8) .. " " .. string.char(8)
+    for i = 1, #rl.command do
+      stdout_write(bs)
+    end
+  end
+
+  rl.show_cmd = function()
+    if rl.command then
+      stdout_write(rl.command)
+    end
+  end
+
+  rl.store_history = function(cmd)
+    if cmd == "" then
+      return
+    end
+    rl.history[rl.history_length] = cmd
+    rl.history_length = rl.history_length + 1
+    rl.history_index = rl.history_length
+    rl.history[rl.history_length] = ""
+  end
+
+  rl.readln = function(stdin_select_fn, batch_cmd, batch_when, batch_expect)
+    local done = false
+    local need_prompt = true
+    rl.command = ""
+
+    if not rl.rawmode then
+      rl.init()
+    end
+
+    while not done do
+      local indent_value = #rl.prompt + #rl.command
+      if need_prompt then
+        stdout_write(rl.prompt)
+        stdout_write(rl.command)
+        need_prompt = false
+      end
+      if type(stdin_select_fn) == "function" then
+        while not stdin_select_fn(indent_value, batch_cmd, batch_when, batch_expect) do
+          stdout_write(rl.prompt)
+          stdout_write(rl.command)
+          indent_value = #rl.prompt + #rl.command
+        end
+        if batch_cmd and ((os_time() > batch_when) or (batch_expect and expect_success(batch_expect, buf, 0))) then
+          stdout_write("\n" .. rl.prompt .. batch_cmd .. "\n")
+          if batch_expect then
+            expect_done(batch_expect)
+          end
+          return batch_cmd, batch_expect
+        end
+      end
+      local ch = readch()
+      if ch:byte(1) == 27 then
+        -- CONTROL
+        local ch2 = readch()
+        -- arrows
+        if ch2:byte(1) == 91 then
+          local ch3 = readch()
+          local b = ch3:byte(1)
+          if b == 65 then
+            ch = "UP"
+          elseif b == 66 then
+            ch = "DOWN"
+          elseif b == 67 then
+            ch = "RIGHT"
+          elseif b == 68 then
+            ch = "LEFT"
+          end
+          -- print("Byte: " .. ch3:byte(1))
+          -- if ch3:byte(1)
+        end
+      end
+
+      if ch == "?" then
+        stdout_write(ch)
+        stdout_write("\n")
+        if rl.help then
+          rl.help(rl)
+        end
+        need_prompt = true
+      elseif ch == "\t" then
+        if rl.tab_complete then
+          rl.tab_complete(rl)
+        end
+        stdout_write("\n")
+        need_prompt = true
+      elseif ch == "\n" then
+        stdout_write(ch)
+        done = true
+      elseif ch == "\004" then
+        stdout_write("\n")
+        rl.command = nil
+        done = true
+      elseif ch == string.char(127) then
+        if rl.command ~= "" then
+          stdout_write(string.char(8) .. " " .. string.char(8))
+          rl.command = string.sub(rl.command, 1, -2)
+        end
+      elseif #ch > 1 then
+        -- control char
+        if ch == "UP" then
+          rl.hide_cmd()
+          if rl.history_index == #rl.history then
+            rl.history[rl.history_index] = rl.command
+          end
+          if rl.history_index > 1 then
+            rl.history_index = rl.history_index - 1
+            rl.command = rl.history[rl.history_index]
+          end
+          rl.show_cmd()
+        elseif ch == "DOWN" then
+          rl.hide_cmd()
+          if rl.history_index < rl.history_length then
+            rl.history_index = rl.history_index + 1
+            rl.command = rl.history[rl.history_index]
+          end
+          rl.show_cmd()
+        end
+      else
+        stdout_write(ch)
+        rl.command = rl.command .. ch
+      end
+    end
+    if rl.command then
+      rl.store_history(rl.command)
+    end
+    return rl.command
+  end
+  return rl
+end
+
+}
+
+local select_fds = {}
+local sessions = {}
+
+local line_erased = false
+
+function erase_line(indent)
+  if not line_erased then
+    line_erased = true
+    stdout_write(string.rep(string.char(8), indent)..string.rep(" ", indent)..string.rep(string.char(8), indent))
+  end
+end
+
+function do_select_stdin(indent, batch_cmd, batch_when, batch_expect)
+  while true do
+    local nfds = 1+#select_fds
+    local pfds = ffi.new("struct pollfd[?]", nfds)
+    pfds[0].fd = 0;
+    pfds[0].events = 1;
+    pfds[0].revents = 0;
+    for i = 1,#select_fds do
+      pfds[i].fd = select_fds[i].fd
+      pfds[i].events = 1
+      pfds[i].revents = 0
+    end
+    if batch_cmd and ((os_time() > batch_when) or (batch_expect and expect_success(batch_expect, buf, 0))) then
+      return true
+    end
+    while ffi.C.poll(pfds, nfds, 10) == 0 do
+      if batch_cmd and ((os_time() > batch_when) or (batch_expect and expect_success(batch_expect, buf, 0))) then
+        return true
+      end
+      if line_erased then
+        line_erased = false
+        return false
+      end
+    end
+    if pfds[0].revents == 1 then
+      return true
+    end
+    for i = 1,#select_fds do
+      if(pfds[i].revents > 0) then
+        if pfds[i].fd ~= select_fds[i].fd then
+          print("File descriptors unequal", pfds[i].fd, select_fds[i].fd)
+        end
+        select_fds[i].cb(select_fds[i], pfds[i].revents, indent)
+      end
+    end
+  end
+end
+
+local buf = ffi.new("char [32768]")
+
+function session_stdout_write(prefix, data)
+  data = prefix .. data:gsub("\n", "\n"..prefix):gsub("\n"..prefix.."$", "\n")
+  
+  stdout_write(data)
+end
+
+function expect_success(sok, buf, nread)
+  local expect_buf_sz = ffi.sizeof(sok.expect_buf) - 128
+  local expect_buf_avail = expect_buf_sz - sok.expect_buf_idx
+  -- print("EXPECT_SUCCESS: nread ".. tostring(nread).. " expect_buf_idx: " .. tostring(sok.expect_buf_idx) .. " expect_buf_avail: " .. tostring(expect_buf_avail) )
+  if expect_buf_avail < 0 then
+    print "EXPECT BUFFER OVERRUN ALREADY"
+    os.exit(1)
+  end
+  if expect_buf_avail < nread then
+    if (nread >= ffi.sizeof(sok.expect_buf)) then
+      print("Read too large of a chunk to fit into expect buffer")
+      return nil
+    end
+    local delta = nread - expect_buf_avail
+
+    ffi.C.memmove(sok.expect_buf, sok.expect_buf + delta, expect_buf_sz - delta)
+    sok.expect_buf_idx = sok.expect_buf_idx - delta
+    expect_buf_avail = nread 
+  end
+  if sok.expect_buf_idx + nread > expect_buf_sz then
+    print("ERROR, I have just overrun the buffer !")
+    os.exit(1)
+  end
+  ffi.C.memcpy(sok.expect_buf + sok.expect_buf_idx, buf, nread)
+  sok.expect_buf_idx = sok.expect_buf_idx + nread
+  if sok.expect_str == nil then
+    return true
+  end
+  local match_p = ffi.C.memmem(sok.expect_buf, sok.expect_buf_idx, sok.expect_str, sok.expect_str_len)
+  if match_p ~= nil then
+    return true
+  end
+  return false
+end
+
+function expect_done(sok)
+  local expect_buf_sz = ffi.sizeof(sok.expect_buf) - 128
+  if not sok.expect_str then 
+    return false
+  end
+  local match_p = ffi.C.memmem(sok.expect_buf, sok.expect_buf_idx, sok.expect_str, sok.expect_str_len)
+  if match_p ~= nil then
+    if sok.expect_cb then
+      sok.expect_cb(sok)
+    end
+    local match_idx = ffi.cast("char *", match_p) - ffi.cast("char *", sok.expect_buf)
+    ffi.C.memmove(sok.expect_buf, ffi.cast("char *", match_p) + sok.expect_str_len, expect_buf_sz - match_idx - sok.expect_str_len)
+    sok.expect_buf_idx = match_idx + sok.expect_str_len
+    sok.expect_success = true
+
+    sok.expect_str = nil
+    sok.expect_str_len = 0
+    return true
+  end
+end
+
+function slave_events(sok, revents, indent)
+  local fd = sok.fd
+  local nread = ffi.C.read(fd, buf, ffi.sizeof(buf)-128)
+  local idx = nread - 1
+  while idx >= 0 and buf[idx] ~= 10 do
+    idx = idx - 1
+  end
+  if idx >= 0 then
+    erase_line(indent)
+    session_stdout_write(sok.prefix, sok.buf .. ffi.string(buf, idx+1))
+    sok.buf = ""
+  end
+  sok.buf = sok.buf .. ffi.string(buf+idx+1, nread-idx-1)
+  -- print("\nRead: " .. tostring(nread))
+  -- stdout_write(ffi.string(buf, nread))
+  if expect_success(sok, buf, nread) then
+    return true
+  end
+  return false
+end
+
+
+function start_session(name)
+  local mfd, cpid = pty_run("/bin/bash")
+  local sok =  { ["fd"] = mfd, ["cb"] = slave_events, ["buf"] = "", ["prefix"] = name .. ":", ["expect_buf"] = ffi.new("char [165536]"), ["expect_buf_idx"] = 0, ["expect_str"] = nil }
+  table.insert(select_fds, sok)
+  sessions[name] = sok
+end
+
+function command_transform(exe)
+  if exe == "break" then
+    exe = string.char(3)
+  end
+  return exe
+end
+
+function session_write(a_session, a_str)
+  if has_session(a_session) then
+    return tonumber(ffi.C.write(sessions[a_session].fd, c_str(a_str), #a_str))
+  else
+    return 0
+  end
+end
+
+function session_exec(a_session, a_cmd)
+  local exe = command_transform(a_cmd) .. "\n"
+  session_write(a_session, exe)
+end
+
+function session_cmd(ui, a_session, a_cmd)
+  if not has_session(a_session) then
+    stdout_write("ERR: No such session '" .. tostring(a_session) .. "'\n")
+    return nil
+  end
+  if a_session == "lua" then
+    local func, msg = loadstring(ui.lua_acc .. a_cmd)
+    -- stdout_write("LOADSTR: " .. vpp.dump({ ret, msg }) .. "\n")
+    if not func and string.match(msg, "<eof>") then
+      if a_session ~= ui.in_session then
+         stdout_write("ERR LOADSTR: " .. tostring(msg) .. "\n")
+         return nil
+      end
+      ui.lua_acc = ui.lua_acc .. a_cmd  .. "\n"
+      return true
+    end
+    ui.lua_acc = ""
+    local ret, msg = pcall(func)
+    if ret then
+      return true
+    else
+      stdout_write("ERR: " .. msg .. "\n") 
+      return nil
+    end
+  else
+    session_exec(a_session, a_cmd)
+    if ui.session_cmd_delay then
+      return { "delay", ui.session_cmd_delay }
+    end
+    return true
+  end
+end
+
+function has_session(a_session)
+  if a_session == "lua" then
+    return true
+  end
+  return (sessions[a_session] ~= nil)
+end
+
+function command_match(list, input, output)
+  for i, v in ipairs(list) do
+    local m = {}
+    m[1], m[2], m[3], m[4], m[5], m[6], m[7], m[8], m[9] = string.match(input, v[1])
+    -- print("MATCH: ", vpp.dump(m))
+    if m[1] then
+       output["result"] = m
+       output["result_index"] = i
+       return m
+    end 
+  end
+  return nil
+end
+
+function cmd_spawn_shell(ui, a_arg)
+  start_session(a_arg[1])
+  return true
+end
+
+function cmd_run_cmd(ui, a_arg)
+  local a_sess = a_arg[1]
+  local a_cmd = a_arg[2]
+  return session_cmd(ui, a_sess, a_cmd)
+end
+
+function cmd_cd(ui, a_arg)
+  local a_sess = a_arg[1]
+  if has_session(a_sess) then
+    ui.in_session = a_sess
+    return true
+  else
+    stdout_write("ERR: Unknown session '".. tostring(a_sess) .. "'\n")
+    return nil
+  end
+end
+
+function cmd_sleep(ui, a_arg)
+  return { "delay", tonumber(a_arg[1]) }
+end
+
+function cmd_expect(ui, a_arg)
+  local a_sess = a_arg[1]
+  local a_expect = a_arg[2]
+  local sok = sessions[a_sess]
+  if not sok then
+    stdout_write("ERR: unknown session '" .. tostring(a_sess) .. "'\n")
+    return nil
+  end
+  sok.expect_str = c_str(a_expect)
+  sok.expect_str_len = #a_expect
+  return { "expect", a_sess }
+end
+
+function cmd_info(ui, a_arg)
+  local a_sess = a_arg[1]
+  local sok = sessions[a_sess]
+  if not sok then
+    stdout_write("ERR: unknown session '" .. tostring(a_sess) .. "'\n")
+    return nil
+  end
+  print("Info for session " .. tostring(a_sess) .. "\n")
+  print("Expect buffer index: " .. tostring(sok.expect_buf_idx))
+  print("Expect buffer: '" .. tostring(ffi.string(sok.expect_buf, sok.expect_buf_idx)) .. "'\n")
+  if sok.expect_str then
+    print("Expect string: '" .. tostring(ffi.string(sok.expect_str, sok.expect_str_len)) .. "'\n")
+  else
+    print("Expect string not set\n")
+  end
+end
+
+function cmd_echo(ui, a_arg)
+  local a_data = a_arg[1]
+  print("ECHO: " .. tostring(a_data))
+end
+
+main_command_table = {
+  { "^shell ([a-zA-Z0-9_]+)$", cmd_spawn_shell },
+  { "^run ([a-zA-Z0-9_]+) (.+)$", cmd_run_cmd },
+  { "^cd ([a-zA-Z0-9_]+)$", cmd_cd  },
+  { "^sleep ([0-9]+)$", cmd_sleep },
+  { "^expect ([a-zA-Z0-9_]+) (.-)$", cmd_expect },
+  { "^info ([a-zA-Z0-9_]+)$", cmd_info },
+  { "^echo (.-)$", cmd_echo }
+}
+
+
+
+function ui_set_prompt(ui)
+  if ui.in_session then 
+    if ui.in_session == "lua" then
+      if #ui.lua_acc > 0 then
+        ui.r.prompt = ui.in_session .. ">>"
+      else
+        ui.r.prompt = ui.in_session .. ">"
+      end 
+    else
+      ui.r.prompt = ui.in_session .. "> "
+    end
+  else
+    ui.r.prompt = "> "
+  end
+  return ui.r.prompt
+end
+
+function ui_run_command(ui, cmd)
+  -- stdout_write("Command: " .. tostring(cmd) .. "\n")
+  local ret = false
+  if ui.in_session then
+    if cmd then
+      if cmd == "^D^D^D" then
+        ui.in_session = nil
+        ret = true
+      else
+        ret = session_cmd(ui, ui.in_session, cmd)
+      end
+    else
+      ui.in_session = nil
+      ret = true
+    end
+  else  
+    if cmd then
+      local out = {}
+      if cmd == "" then
+        ret = true
+      end
+      if command_match(main_command_table, cmd, out) then
+        local i = out.result_index
+        local m = out.result
+        if main_command_table[i][2] then
+          ret = main_command_table[i][2](ui, m)
+        end
+      end
+    end
+    if not cmd or cmd == "quit" then
+      return "quit"
+    end
+  end
+  return ret
+end
+
+local ui = {}
+ui.in_session = nil
+ui.r = readln.reader() 
+ui.lua_acc = ""
+ui.session_cmd_delay = 0.3
+
+local lines = ""
+
+local done = false
+-- a helper function which always returns nil
+local no_next_line = function() return nil end
+
+-- a function which returns the next batch line
+local next_line = no_next_line
+
+local batchfile = arg[1]
+
+if batchfile then
+  local f = io.lines(batchfile)
+  next_line = function() 
+    local line = f()
+    if line then 
+      return line
+    else 
+      next_line = no_next_line
+      session_stdout_write(batchfile .. ":", "End of batch\n")
+      return nil
+    end
+  end
+end
+
+
+local batch_when = 0
+local batch_expect = nil
+while not done do
+  local prompt = ui_set_prompt(ui)
+  local batch_cmd = next_line() 
+  local cmd, expect_sok = ui.r.readln(do_select_stdin, batch_cmd, batch_when, batch_expect)
+  if expect_sok and not expect_success(expect_sok, buf, 0) then
+    if not cmd_ret and next_line ~= no_next_line then
+      print("ERR: expect timeout\n")
+      next_line = no_next_line
+    end
+  else 
+    local cmd_ret = ui_run_command(ui, cmd)
+    if not cmd_ret and next_line ~= no_next_line then
+      print("ERR: Error during batch execution\n")
+      next_line = no_next_line
+    end
+
+    if cmd_ret  == "quit" then
+      done = true
+    end
+    batch_expect = nil
+    batch_when = 0
+    if type(cmd_ret) == "table" then
+      if cmd_ret[1] == "delay" then
+	batch_when = os_time() + tonumber(cmd_ret[2])
+      end
+      if cmd_ret[1] == "expect" then
+	batch_expect = sessions[cmd_ret[2]]
+	batch_when = os_time() + 15
+      end
+    end
+  end
+end
+ui.r.done()
+
+os.exit(1)
+
+
+
diff --git a/src/vpp-api/lua/examples/lute/script-inout-acl-noacl.lute b/src/vpp-api/lua/examples/lute/script-inout-acl-noacl.lute
new file mode 100644
index 00000000..a24d04bf
--- /dev/null
+++ b/src/vpp-api/lua/examples/lute/script-inout-acl-noacl.lute
@@ -0,0 +1,329 @@
+shell vppbuild
+run vppbuild stty -echo
+run vppbuild sudo -u ubuntu -i bash -c "(cd vpp && make plugins && echo ALLGOOD)"
+expect vppbuild ALLGOOD
+
+shell s0
+shell s1
+shell s2
+
+
+cd s1
+unshare -n /bin/bash
+/sbin/ifconfig -a
+^D^D^D
+
+cd s2
+unshare -n /bin/bash
+/sbin/ifconfig -a
+^D^D^D
+
+
+cd lua
+
+function session_get_bash_pid(s)
+  if not has_session(s) then
+    return nil
+  end
+  local fname = "/tmp/lute-"..s.."-pid.txt"
+
+  session_exec(s, "echo $$ >" .. fname)
+  -- it's a dirty hack but it's quick
+  sleep(0.5)
+  local pid = io.lines(fname)()
+  print("Got pid for " .. s .. " : " .. tostring(pid))
+  return(tonumber(pid))
+end
+
+function session_connect_with(s0, s1)
+  -- local pid0 = tostring(session_get_bash_pid(s0))
+  local pid1 = tostring(session_get_bash_pid(s1))
+  local eth_options = { "rx", "tx",  "sg", "tso", "ufo", "gso", "gro", "lro", "rxvlan", "txvlan", "rxhash" }
+  local this_end = s0 .. "_" .. s1
+  local other_end = s1 .. "_" .. s0
+  session_exec(s0, "ip link add name " .. this_end .. " type veth peer name " .. other_end)
+  session_exec(s0, "ip link set dev " .. this_end .. " up promisc on")
+  for i, option in ipairs(eth_options) do
+    session_exec(s0, "/sbin/ethtool --offload " .. this_end .. " " .. option .. " off")
+    session_exec(s0, "/sbin/ethtool --offload " .. other_end .. " " .. option .. " off")
+  end
+  session_exec(s0, "ip link set dev " .. other_end .. " up promisc on netns /proc/" .. pid1 .. "/ns/net")
+  sleep(0.5)
+end
+
+^D^D^D
+run lua session_connect_with("s0", "s1")
+run lua session_connect_with("s0", "s2")
+
+cd s1
+ip -6 addr add dev s1_s0 2001:db8:1::1/64
+ip -4 addr add dev s1_s0 192.0.2.1/24
+ip link set dev s1_s0 up promisc on
+^D^D^D
+
+cd s2
+ip -6 addr add dev s2_s0 2001:db8:1::2/64
+ip -6 addr add dev s2_s0 2001:db8:1::3/64
+ip -6 addr add dev s2_s0 2001:db8:1::4/64
+ip -4 addr add dev s2_s0 192.0.2.2/24
+ip -4 addr add dev s2_s0:1 192.0.2.3/24
+ip -4 addr add dev s2_s0:2 192.0.2.4/24
+ip link set dev s2_s0 up promisc on
+^D^D^D
+
+run s1 ip addr
+run s2 ip addr
+shell VPP
+cd VPP
+cd /home/ubuntu/vpp
+make debug 
+r
+^D^D^D
+expect VPP DBGvpp#
+
+cd lua
+-- Initialization of the Lua environment for talking to VPP
+vpp = require("vpp-lapi")
+root_dir = "/home/ubuntu/vpp"
+pneum_path = root_dir .. "/build-root/install-vpp_debug-native/vpp-api/lib64/libpneum.so"
+vpp:init({ pneum_path = pneum_path })
+vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vlib-api/vlibmemory/memclnt.api")
+vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vpp/vpp-api/vpe.api")
+vpp:connect("aytest")
+vpp:consume_api(root_dir .. "/plugins/acl-plugin/acl/acl.api", "acl")
+
+^D^D^D
+
+cd lua
+
+reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s1", hw_addr = "AAAAAA" })
+vpp_if_to_s1 = reply[1].sw_if_index
+
+reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s2", hw_addr = "AAAAAA" })
+vpp_if_to_s2 = reply[1].sw_if_index
+
+ifaces = { vpp_if_to_s1, vpp_if_to_s2 }
+
+reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s1, admin_up_down = 1, link_up_down = 1 })
+print(vpp.dump(reply))
+reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s2, admin_up_down = 1, link_up_down = 1 })
+print(vpp.dump(reply))
+
+bd_id = 42
+
+reply = vpp:api_call("bridge_domain_add_del", { bd_id = bd_id, flood = 1, uu_flood = 1, forward = 1, learn = 1, arp_term = 0, is_add = 1 })
+print(vpp.dump(reply))
+
+for i, v in ipairs(ifaces) do
+  reply = vpp:api_call("sw_interface_set_l2_bridge", { rx_sw_if_index = v, bd_id = bd_id, shg = 0, bvi = 0, enable = 1 } )
+  print(vpp.dump(reply))
+end
+
+^D^D^D
+
+run s1 ping -c 3 192.0.2.2
+expect s1 packet loss
+run s1 ping -c 3 192.0.2.3
+expect s1 packet loss
+run s1 ping -c 3 192.0.2.4
+expect s1 packet loss
+run s1 ping6 -c 3 2001:db8:1::2
+expect s1 packet loss
+run s1 ping6 -c 3 2001:db8:1::3
+expect s1 packet loss
+run s1 ping6 -c 3 2001:db8:1::4
+expect s1 packet loss
+
+
+cd lua
+--- ACL testing
+
+--[[ temporary comment out
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 230 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 8 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 15 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_add_replace", { context = 42, count = 2, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 } } })
+print(vpp.dump(reply))
+print("---")
+interface_acl_in = reply[1].acl_index
+
+reply = vpp:api_call("acl_add_replace", { context = 42, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
+print(vpp.dump(reply))
+print("---")
+interface_acl_out = reply[1].acl_index
+
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_add_replace", { context = 42, count = 0 })
+print(vpp.dump(reply))
+print("---")
+
+acl_index_to_delete = reply[1].acl_index
+print("Deleting " .. tostring(acl_index_to_delete))
+reply = vpp:api_call("acl_del", { context = 42, acl_index = acl_index_to_delete })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
+for ri, rv in ipairs(reply) do
+  print("Reply message #" .. tostring(ri))
+  print(vpp.dump(rv))
+  for ai, av in ipairs(rv.r) do
+    print("ACL rule #" .. tostring(ai) .. " : " .. vpp.dump(av))
+  end
+
+end
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 4294967295 })
+print(vpp.dump(reply))
+print("---")
+
+
+]] -- end of comment out
+
+---- Should be nothing ^^
+r = {
+  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
+  { is_permit = 0, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::3"), dst_ip_prefix_len = 128 },
+  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8::"), dst_ip_prefix_len = 32  },
+  { is_permit = 1, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.2"), dst_ip_prefix_len = 32},
+  { is_permit = 0, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.3"), dst_ip_prefix_len = 32 },
+}
+
+reply = vpp:api_call("acl_add_replace", { context = 42, count = 5, r = r })
+print(vpp.dump(reply))
+print("---")
+interface_acl_in = reply[1].acl_index
+
+reply = vpp:api_call("acl_add_replace", { context = 42, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
+print(vpp.dump(reply))
+print("---")
+interface_acl_out = reply[1].acl_in
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s1, is_add = 1, is_input = 1, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+--reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+-- print(vpp.dump(reply))
+--print("---")
+
+^D^D^D
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::2
+expect s1 packet loss
+run VPP show trace
+expect VPP match: inacl 0 rule 0
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::3
+expect s1 packet loss
+run VPP show trace 
+expect VPP match: inacl 0 rule 1
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::4
+expect s1 packet loss
+run VPP show trace
+expect VPP match: inacl 0 rule 2
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping -c 3 192.0.2.2
+expect s1 packet loss
+run VPP show trace
+expect VPP match: inacl 0 rule 3
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping -c 3 192.0.2.3
+expect s1 packet loss
+run VPP show trace
+expect VPP match: inacl 0 rule 4
+
+
+cd lua
+
+--- TEST OUTBOUND ACL
+
+r1 = {
+  { is_permit = 1, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
+  { is_permit = 0, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::4"), dst_ip_prefix_len = 128 }
+}
+
+reply = vpp:api_call("acl_add_replace", { context = 42, count = 3, r = r1 })
+print(vpp.dump(reply))
+print("---")
+interface_acl_out = reply[1].acl_index
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+
+
+^D^D^D
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::2
+expect s1 packet loss
+run VPP show trace
+expect VPP match: outacl 2 rule 0
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::3
+expect s1 packet loss
+run VPP show trace 
+expect VPP match: inacl 0 rule 1
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::4
+expect s1 packet loss
+run VPP show trace
+expect VPP match: outacl 2 rule 1
+
+run lua print("ALL GOOD!")
+
diff --git a/src/vpp-api/lua/examples/lute/script-inout-acl-old.lute b/src/vpp-api/lua/examples/lute/script-inout-acl-old.lute
new file mode 100644
index 00000000..9edebf02
--- /dev/null
+++ b/src/vpp-api/lua/examples/lute/script-inout-acl-old.lute
@@ -0,0 +1,329 @@
+shell vppbuild
+run vppbuild stty -echo
+run vppbuild sudo -u ubuntu -i bash -c "(cd vpp && make plugins && echo ALLGOOD)"
+expect vppbuild ALLGOOD
+
+shell s0
+shell s1
+shell s2
+
+
+cd s1
+unshare -n /bin/bash
+/sbin/ifconfig -a
+^D^D^D
+
+cd s2
+unshare -n /bin/bash
+/sbin/ifconfig -a
+^D^D^D
+
+
+cd lua
+
+function session_get_bash_pid(s)
+  if not has_session(s) then
+    return nil
+  end
+  local fname = "/tmp/lute-"..s.."-pid.txt"
+
+  session_exec(s, "echo $$ >" .. fname)
+  -- it's a dirty hack but it's quick
+  sleep(0.5)
+  local pid = io.lines(fname)()
+  print("Got pid for " .. s .. " : " .. tostring(pid))
+  return(tonumber(pid))
+end
+
+function session_connect_with(s0, s1)
+  -- local pid0 = tostring(session_get_bash_pid(s0))
+  local pid1 = tostring(session_get_bash_pid(s1))
+  local eth_options = { "rx", "tx",  "sg", "tso", "ufo", "gso", "gro", "lro", "rxvlan", "txvlan", "rxhash" }
+  local this_end = s0 .. "_" .. s1
+  local other_end = s1 .. "_" .. s0
+  session_exec(s0, "ip link add name " .. this_end .. " type veth peer name " .. other_end)
+  session_exec(s0, "ip link set dev " .. this_end .. " up promisc on")
+  for i, option in ipairs(eth_options) do
+    session_exec(s0, "/sbin/ethtool --offload " .. this_end .. " " .. option .. " off")
+    session_exec(s0, "/sbin/ethtool --offload " .. other_end .. " " .. option .. " off")
+  end
+  session_exec(s0, "ip link set dev " .. other_end .. " up promisc on netns /proc/" .. pid1 .. "/ns/net")
+  sleep(0.5)
+end
+
+^D^D^D
+run lua session_connect_with("s0", "s1")
+run lua session_connect_with("s0", "s2")
+
+cd s1
+ip -6 addr add dev s1_s0 2001:db8:1::1/64
+ip -4 addr add dev s1_s0 192.0.2.1/24
+ip link set dev s1_s0 up promisc on
+^D^D^D
+
+cd s2
+ip -6 addr add dev s2_s0 2001:db8:1::2/64
+ip -6 addr add dev s2_s0 2001:db8:1::3/64
+ip -6 addr add dev s2_s0 2001:db8:1::4/64
+ip -4 addr add dev s2_s0 192.0.2.2/24
+ip -4 addr add dev s2_s0:1 192.0.2.3/24
+ip -4 addr add dev s2_s0:2 192.0.2.4/24
+ip link set dev s2_s0 up promisc on
+^D^D^D
+
+run s1 ip addr
+run s2 ip addr
+shell VPP
+cd VPP
+cd /home/ubuntu/vpp
+make debug 
+r
+^D^D^D
+expect VPP DBGvpp#
+
+cd lua
+-- Initialization of the Lua environment for talking to VPP
+vpp = require("vpp-lapi")
+root_dir = "/home/ubuntu/vpp"
+pneum_path = root_dir .. "/build-root/install-vpp_debug-native/vpp-api/lib64/libpneum.so"
+vpp:init({ pneum_path = pneum_path })
+vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vlib-api/vlibmemory/memclnt.api")
+vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vpp/vpp-api/vpe.api")
+vpp:connect("aytest")
+vpp:consume_api(root_dir .. "/plugins/acl-plugin/acl/acl.api", "acl")
+
+^D^D^D
+
+cd lua
+
+reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s1", hw_addr = "AAAAAA" })
+vpp_if_to_s1 = reply[1].sw_if_index
+
+reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s2", hw_addr = "AAAAAA" })
+vpp_if_to_s2 = reply[1].sw_if_index
+
+ifaces = { vpp_if_to_s1, vpp_if_to_s2 }
+
+reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s1, admin_up_down = 1, link_up_down = 1 })
+print(vpp.dump(reply))
+reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s2, admin_up_down = 1, link_up_down = 1 })
+print(vpp.dump(reply))
+
+bd_id = 42
+
+reply = vpp:api_call("bridge_domain_add_del", { bd_id = bd_id, flood = 1, uu_flood = 1, forward = 1, learn = 1, arp_term = 0, is_add = 1 })
+print(vpp.dump(reply))
+
+for i, v in ipairs(ifaces) do
+  reply = vpp:api_call("sw_interface_set_l2_bridge", { rx_sw_if_index = v, bd_id = bd_id, shg = 0, bvi = 0, enable = 1 } )
+  print(vpp.dump(reply))
+end
+
+^D^D^D
+
+run s1 ping -c 3 192.0.2.2
+expect s1 packet loss
+run s1 ping -c 3 192.0.2.3
+expect s1 packet loss
+run s1 ping -c 3 192.0.2.4
+expect s1 packet loss
+run s1 ping6 -c 3 2001:db8:1::2
+expect s1 packet loss
+run s1 ping6 -c 3 2001:db8:1::3
+expect s1 packet loss
+run s1 ping6 -c 3 2001:db8:1::4
+expect s1 packet loss
+
+
+cd lua
+--- ACL testing
+
+--[[ temporary comment out
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 230 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 8 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 15 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_add", { context = 42, count = 2, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 } } })
+print(vpp.dump(reply))
+print("---")
+interface_acl_in = reply[1].acl_index
+
+reply = vpp:api_call("acl_add", { context = 42, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
+print(vpp.dump(reply))
+print("---")
+interface_acl_out = reply[1].acl_index
+
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_add", { context = 42, count = 0 })
+print(vpp.dump(reply))
+print("---")
+
+acl_index_to_delete = reply[1].acl_index
+print("Deleting " .. tostring(acl_index_to_delete))
+reply = vpp:api_call("acl_del", { context = 42, acl_index = acl_index_to_delete })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
+for ri, rv in ipairs(reply) do
+  print("Reply message #" .. tostring(ri))
+  print(vpp.dump(rv))
+  for ai, av in ipairs(rv.r) do
+    print("ACL rule #" .. tostring(ai) .. " : " .. vpp.dump(av))
+  end
+
+end
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 4294967295 })
+print(vpp.dump(reply))
+print("---")
+
+
+]] -- end of comment out
+
+---- Should be nothing ^^
+r = {
+  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
+  { is_permit = 0, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::3"), dst_ip_prefix_len = 128 },
+  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8::"), dst_ip_prefix_len = 32  },
+  { is_permit = 1, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.2"), dst_ip_prefix_len = 32},
+  { is_permit = 0, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.3"), dst_ip_prefix_len = 32 },
+}
+
+reply = vpp:api_call("acl_add", { context = 42, count = 5, r = r })
+print(vpp.dump(reply))
+print("---")
+interface_acl_in = reply[1].acl_index
+
+reply = vpp:api_call("acl_add", { context = 42, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
+print(vpp.dump(reply))
+print("---")
+interface_acl_out = reply[1].acl_in
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s1, is_add = 1, is_input = 1, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+--reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+-- print(vpp.dump(reply))
+--print("---")
+
+^D^D^D
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::2
+expect s1 packet loss
+run VPP show trace
+expect VPP match: inacl 0 rule 0
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::3
+expect s1 packet loss
+run VPP show trace 
+expect VPP match: inacl 0 rule 1
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::4
+expect s1 packet loss
+run VPP show trace
+expect VPP match: inacl 0 rule 2
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping -c 3 192.0.2.2
+expect s1 packet loss
+run VPP show trace
+expect VPP match: inacl 0 rule 3
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping -c 3 192.0.2.3
+expect s1 packet loss
+run VPP show trace
+expect VPP match: inacl 0 rule 4
+
+
+cd lua
+
+--- TEST OUTBOUND ACL
+
+r1 = {
+  { is_permit = 1, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
+  { is_permit = 0, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::4"), dst_ip_prefix_len = 128 }
+}
+
+reply = vpp:api_call("acl_add", { context = 42, count = 3, r = r1 })
+print(vpp.dump(reply))
+print("---")
+interface_acl_out = reply[1].acl_index
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+
+
+^D^D^D
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::2
+expect s1 packet loss
+run VPP show trace
+expect VPP match: outacl 2 rule 0
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::3
+expect s1 packet loss
+run VPP show trace 
+expect VPP match: inacl 0 rule 1
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::4
+expect s1 packet loss
+run VPP show trace
+expect VPP match: outacl 2 rule 1
+
+run lua print("ALL GOOD!")
+
diff --git a/src/vpp-api/lua/examples/lute/script-inout-acl.lute b/src/vpp-api/lua/examples/lute/script-inout-acl.lute
new file mode 100644
index 00000000..d7e7423c
--- /dev/null
+++ b/src/vpp-api/lua/examples/lute/script-inout-acl.lute
@@ -0,0 +1,329 @@
+shell vppbuild
+run vppbuild stty -echo
+run vppbuild sudo -u ubuntu -i bash -c "(cd vpp && make plugins && echo ALLGOOD)"
+expect vppbuild ALLGOOD
+
+shell s0
+shell s1
+shell s2
+
+
+cd s1
+unshare -n /bin/bash
+/sbin/ifconfig -a
+^D^D^D
+
+cd s2
+unshare -n /bin/bash
+/sbin/ifconfig -a
+^D^D^D
+
+
+cd lua
+
+function session_get_bash_pid(s)
+  if not has_session(s) then
+    return nil
+  end
+  local fname = "/tmp/lute-"..s.."-pid.txt"
+
+  session_exec(s, "echo $$ >" .. fname)
+  -- it's a dirty hack but it's quick
+  sleep(0.5)
+  local pid = io.lines(fname)()
+  print("Got pid for " .. s .. " : " .. tostring(pid))
+  return(tonumber(pid))
+end
+
+function session_connect_with(s0, s1)
+  -- local pid0 = tostring(session_get_bash_pid(s0))
+  local pid1 = tostring(session_get_bash_pid(s1))
+  local eth_options = { "rx", "tx",  "sg", "tso", "ufo", "gso", "gro", "lro", "rxvlan", "txvlan", "rxhash" }
+  local this_end = s0 .. "_" .. s1
+  local other_end = s1 .. "_" .. s0
+  session_exec(s0, "ip link add name " .. this_end .. " type veth peer name " .. other_end)
+  session_exec(s0, "ip link set dev " .. this_end .. " up promisc on")
+  for i, option in ipairs(eth_options) do
+    session_exec(s0, "/sbin/ethtool --offload " .. this_end .. " " .. option .. " off")
+    session_exec(s0, "/sbin/ethtool --offload " .. other_end .. " " .. option .. " off")
+  end
+  session_exec(s0, "ip link set dev " .. other_end .. " up promisc on netns /proc/" .. pid1 .. "/ns/net")
+  sleep(0.5)
+end
+
+^D^D^D
+run lua session_connect_with("s0", "s1")
+run lua session_connect_with("s0", "s2")
+
+cd s1
+ip -6 addr add dev s1_s0 2001:db8:1::1/64
+ip -4 addr add dev s1_s0 192.0.2.1/24
+ip link set dev s1_s0 up promisc on
+^D^D^D
+
+cd s2
+ip -6 addr add dev s2_s0 2001:db8:1::2/64
+ip -6 addr add dev s2_s0 2001:db8:1::3/64
+ip -6 addr add dev s2_s0 2001:db8:1::4/64
+ip -4 addr add dev s2_s0 192.0.2.2/24
+ip -4 addr add dev s2_s0:1 192.0.2.3/24
+ip -4 addr add dev s2_s0:2 192.0.2.4/24
+ip link set dev s2_s0 up promisc on
+^D^D^D
+
+run s1 ip addr
+run s2 ip addr
+shell VPP
+cd VPP
+cd /home/ubuntu/vpp
+make debug 
+r
+^D^D^D
+expect VPP DBGvpp#
+
+cd lua
+-- Initialization of the Lua environment for talking to VPP
+vpp = require("vpp-lapi")
+root_dir = "/home/ubuntu/vpp"
+pneum_path = root_dir .. "/build-root/install-vpp_debug-native/vpp-api/lib64/libpneum.so"
+vpp:init({ pneum_path = pneum_path })
+vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vlib-api/vlibmemory/memclnt.api")
+vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vpp/vpp-api/vpe.api")
+vpp:connect("aytest")
+vpp:consume_api(root_dir .. "/plugins/acl-plugin/acl/acl.api", "acl")
+
+^D^D^D
+
+cd lua
+
+reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s1", hw_addr = "AAAAAA" })
+vpp_if_to_s1 = reply[1].sw_if_index
+
+reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s2", hw_addr = "AAAAAA" })
+vpp_if_to_s2 = reply[1].sw_if_index
+
+ifaces = { vpp_if_to_s1, vpp_if_to_s2 }
+
+reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s1, admin_up_down = 1, link_up_down = 1 })
+print(vpp.dump(reply))
+reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s2, admin_up_down = 1, link_up_down = 1 })
+print(vpp.dump(reply))
+
+bd_id = 42
+
+reply = vpp:api_call("bridge_domain_add_del", { bd_id = bd_id, flood = 1, uu_flood = 1, forward = 1, learn = 1, arp_term = 0, is_add = 1 })
+print(vpp.dump(reply))
+
+for i, v in ipairs(ifaces) do
+  reply = vpp:api_call("sw_interface_set_l2_bridge", { rx_sw_if_index = v, bd_id = bd_id, shg = 0, bvi = 0, enable = 1 } )
+  print(vpp.dump(reply))
+end
+
+^D^D^D
+
+run s1 ping -c 3 192.0.2.2
+expect s1 packet loss
+run s1 ping -c 3 192.0.2.3
+expect s1 packet loss
+run s1 ping -c 3 192.0.2.4
+expect s1 packet loss
+run s1 ping6 -c 3 2001:db8:1::2
+expect s1 packet loss
+run s1 ping6 -c 3 2001:db8:1::3
+expect s1 packet loss
+run s1 ping6 -c 3 2001:db8:1::4
+expect s1 packet loss
+
+
+cd lua
+--- ACL testing
+
+--[[ temporary comment out
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 230 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 8 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 15 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_add_replace", { context = 42, acl_index = -1, count = 2, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 } } })
+print(vpp.dump(reply))
+print("---")
+interface_acl_in = reply[1].acl_index
+
+reply = vpp:api_call("acl_add_replace", { context = 42, acl_index = -1, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
+print(vpp.dump(reply))
+print("---")
+interface_acl_out = reply[1].acl_index
+
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_add_replace", { context = 42, acl_index = -1, count = 0 })
+print(vpp.dump(reply))
+print("---")
+
+acl_index_to_delete = reply[1].acl_index
+print("Deleting " .. tostring(acl_index_to_delete))
+reply = vpp:api_call("acl_del", { context = 42, acl_index = acl_index_to_delete })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
+for ri, rv in ipairs(reply) do
+  print("Reply message #" .. tostring(ri))
+  print(vpp.dump(rv))
+  for ai, av in ipairs(rv.r) do
+    print("ACL rule #" .. tostring(ai) .. " : " .. vpp.dump(av))
+  end
+
+end
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 4294967295 })
+print(vpp.dump(reply))
+print("---")
+
+
+]] -- end of comment out
+
+---- Should be nothing ^^
+r = {
+  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
+  { is_permit = 0, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::3"), dst_ip_prefix_len = 128 },
+  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8::"), dst_ip_prefix_len = 32  },
+  { is_permit = 1, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.2"), dst_ip_prefix_len = 32},
+  { is_permit = 0, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.3"), dst_ip_prefix_len = 32 },
+}
+
+reply = vpp:api_call("acl_add_replace", { context = 42, acl_index = -1, count = 5, r = r })
+print(vpp.dump(reply))
+print("---")
+interface_acl_in = reply[1].acl_index
+
+reply = vpp:api_call("acl_add_replace", { context = 42, acl_index = -1, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
+print(vpp.dump(reply))
+print("---")
+interface_acl_out = reply[1].acl_in
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s1, is_add = 1, is_input = 1, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+--reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+-- print(vpp.dump(reply))
+--print("---")
+
+^D^D^D
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::2
+expect s1 packet loss
+run VPP show trace
+expect VPP match: inacl 0 rule 0
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::3
+expect s1 packet loss
+run VPP show trace 
+expect VPP match: inacl 0 rule 1
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::4
+expect s1 packet loss
+run VPP show trace
+expect VPP match: inacl 0 rule 2
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping -c 3 192.0.2.2
+expect s1 packet loss
+run VPP show trace
+expect VPP match: inacl 0 rule 3
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping -c 3 192.0.2.3
+expect s1 packet loss
+run VPP show trace
+expect VPP match: inacl 0 rule 4
+
+
+cd lua
+
+--- TEST OUTBOUND ACL
+
+r1 = {
+  { is_permit = 1, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
+  { is_permit = 0, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::4"), dst_ip_prefix_len = 128 }
+}
+
+reply = vpp:api_call("acl_add_replace", { context = 42, acl_index = -1, count = 3, r = r1 })
+print(vpp.dump(reply))
+print("---")
+interface_acl_out = reply[1].acl_index
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+
+
+^D^D^D
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::2
+expect s1 packet loss
+run VPP show trace
+expect VPP match: outacl 2 rule 0
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::3
+expect s1 packet loss
+run VPP show trace 
+expect VPP match: inacl 0 rule 1
+
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s1 ping6 -c 3 2001:db8:1::4
+expect s1 packet loss
+run VPP show trace
+expect VPP match: outacl 2 rule 1
+
+run lua print("ALL GOOD!")
+
diff --git a/src/vpp-api/lua/examples/lute/script.lute b/src/vpp-api/lua/examples/lute/script.lute
new file mode 100644
index 00000000..c3dd90f2
--- /dev/null
+++ b/src/vpp-api/lua/examples/lute/script.lute
@@ -0,0 +1,7 @@
+shell s1
+expect s1 $
+run s1 echo testing123
+expect s1 $
+run s1 echo done
+quit
+
diff --git a/src/vpp-api/lua/examples/lute/sessions-acl.lute b/src/vpp-api/lua/examples/lute/sessions-acl.lute
new file mode 100644
index 00000000..ac237ef9
--- /dev/null
+++ b/src/vpp-api/lua/examples/lute/sessions-acl.lute
@@ -0,0 +1,308 @@
+run lua -- collectgarbage("stop")
+
+shell vppbuild
+run vppbuild stty -echo
+run vppbuild sudo -u ubuntu -i bash -c "(cd vpp && make plugins && echo ALLGOOD)"
+expect vppbuild ALLGOOD
+
+shell s0
+shell s1
+shell s2
+
+
+cd s1
+unshare -n /bin/bash
+/sbin/ifconfig -a
+^D^D^D
+
+cd s2
+unshare -n /bin/bash
+/sbin/ifconfig -a
+^D^D^D
+
+
+cd lua
+
+function session_get_bash_pid(s)
+  if not has_session(s) then
+    return nil
+  end
+  local fname = "/tmp/lute-"..s.."-pid.txt"
+
+  session_exec(s, "echo $$ >" .. fname)
+  -- it's a dirty hack but it's quick
+  sleep(0.5)
+  local pid = io.lines(fname)()
+  print("Got pid for " .. s .. " : " .. tostring(pid))
+  return(tonumber(pid))
+end
+
+function session_connect_with(s0, s1)
+  -- local pid0 = tostring(session_get_bash_pid(s0))
+  local pid1 = tostring(session_get_bash_pid(s1))
+  local eth_options = { "rx", "tx",  "sg", "tso", "ufo", "gso", "gro", "lro", "rxvlan", "txvlan", "rxhash" }
+  local this_end = s0 .. "_" .. s1
+  local other_end = s1 .. "_" .. s0
+  session_exec(s0, "ip link add name " .. this_end .. " type veth peer name " .. other_end)
+  session_exec(s0, "ip link set dev " .. this_end .. " up promisc on")
+  for i, option in ipairs(eth_options) do
+    session_exec(s0, "/sbin/ethtool --offload " .. this_end .. " " .. option .. " off")
+    session_exec(s0, "/sbin/ethtool --offload " .. other_end .. " " .. option .. " off")
+  end
+  session_exec(s0, "ip link set dev " .. other_end .. " up promisc on netns /proc/" .. pid1 .. "/ns/net")
+  sleep(0.5)
+end
+
+^D^D^D
+run lua session_connect_with("s0", "s1")
+run lua session_connect_with("s0", "s2")
+
+cd s1
+ip -6 addr add dev s1_s0 2001:db8:1::1/64
+ip -4 addr add dev s1_s0 192.0.2.1/24
+ip link set dev s1_s0 up promisc on
+^D^D^D
+
+cd s2
+ip -6 addr add dev s2_s0 2001:db8:1::2/64
+ip -6 addr add dev s2_s0 2001:db8:1::3/64
+ip -6 addr add dev s2_s0 2001:db8:1::4/64
+ip -4 addr add dev s2_s0 192.0.2.2/24
+ip -4 addr add dev s2_s0:1 192.0.2.3/24
+ip -4 addr add dev s2_s0:2 192.0.2.4/24
+ip link set dev s2_s0 up promisc on
+^D^D^D
+
+run s1 ip addr
+run s2 ip addr
+shell VPP
+cd VPP
+cd /home/ubuntu/vpp
+make debug 
+r
+^D^D^D
+expect VPP DBGvpp#
+
+cd lua
+-- Initialization of the Lua environment for talking to VPP
+vpp = require("vpp-lapi")
+root_dir = "/home/ubuntu/vpp"
+pneum_path = root_dir .. "/build-root/install-vpp_debug-native/vpp-api/lib64/libpneum.so"
+vpp:init({ pneum_path = pneum_path })
+vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vlib-api/vlibmemory/memclnt.api")
+vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vpp/vpp-api/vpe.api")
+vpp:connect("aytest")
+vpp:consume_api(root_dir .. "/plugins/acl-plugin/acl/acl.api", "acl")
+
+^D^D^D
+
+cd lua
+
+reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s1", hw_addr = "AAAAAA" })
+vpp_if_to_s1 = reply[1].sw_if_index
+
+reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s2", hw_addr = "AAAAAA" })
+vpp_if_to_s2 = reply[1].sw_if_index
+
+ifaces = { vpp_if_to_s1, vpp_if_to_s2 }
+
+reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s1, admin_up_down = 1, link_up_down = 1 })
+print(vpp.dump(reply))
+reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s2, admin_up_down = 1, link_up_down = 1 })
+print(vpp.dump(reply))
+
+bd_id = 42
+
+reply = vpp:api_call("bridge_domain_add_del", { bd_id = bd_id, flood = 1, uu_flood = 1, forward = 1, learn = 1, arp_term = 0, is_add = 1 })
+print(vpp.dump(reply))
+
+for i, v in ipairs(ifaces) do
+  reply = vpp:api_call("sw_interface_set_l2_bridge", { rx_sw_if_index = v, bd_id = bd_id, shg = 0, bvi = 0, enable = 1 } )
+  print(vpp.dump(reply))
+end
+
+^D^D^D
+
+run s1 ping -c 3 192.0.2.2
+expect s1 packet loss
+run s1 ping -c 3 192.0.2.3
+expect s1 packet loss
+run s1 ping -c 3 192.0.2.4
+expect s1 packet loss
+run s1 ping6 -c 3 2001:db8:1::2
+expect s1 packet loss
+run s1 ping6 -c 3 2001:db8:1::3
+expect s1 packet loss
+run s1 ping6 -c 3 2001:db8:1::4
+expect s1 packet loss
+
+
+cd lua
+--- ACL testing
+
+--[[ temporary comment out
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 230 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 8 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = 15 })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_add", { context = 42, count = 2, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 } } })
+print(vpp.dump(reply))
+print("---")
+interface_acl_in = reply[1].acl_index
+
+reply = vpp:api_call("acl_add", { context = 42, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
+print(vpp.dump(reply))
+print("---")
+interface_acl_out = reply[1].acl_index
+
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_add", { context = 42, count = 0 })
+print(vpp.dump(reply))
+print("---")
+
+acl_index_to_delete = reply[1].acl_index
+print("Deleting " .. tostring(acl_index_to_delete))
+reply = vpp:api_call("acl_del", { context = 42, acl_index = acl_index_to_delete })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
+for ri, rv in ipairs(reply) do
+  print("Reply message #" .. tostring(ri))
+  print(vpp.dump(rv))
+  for ai, av in ipairs(rv.r) do
+    print("ACL rule #" .. tostring(ai) .. " : " .. vpp.dump(av))
+  end
+
+end
+print("---")
+
+reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
+print(vpp.dump(reply))
+print("---")
+
+reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 4294967295 })
+print(vpp.dump(reply))
+print("---")
+
+
+]] -- end of comment out
+
+---- Should be nothing ^^
+r = {
+  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
+  { is_permit = 0, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::3"), dst_ip_prefix_len = 128 },
+  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8::"), dst_ip_prefix_len = 32  },
+  { is_permit = 1, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.2"), dst_ip_prefix_len = 32},
+  { is_permit = 0, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.3"), dst_ip_prefix_len = 32 },
+}
+
+reply = vpp:api_call("acl_add", { context = 42, count = 5, r = r })
+print(vpp.dump(reply))
+print("---")
+interface_acl_in = reply[1].acl_index
+
+reply = vpp:api_call("acl_add", { context = 42, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
+print(vpp.dump(reply))
+print("---")
+interface_acl_out = reply[1].acl_in
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s1, is_add = 1, is_input = 1, acl_index = interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+--- TEST OUTBOUND ACL
+
+r1 = {
+  { is_permit = 1, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
+  { is_permit = 0, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::4"), dst_ip_prefix_len = 128 },
+  { is_permit = 2, is_ipv6 = 0 }
+}
+
+reply = vpp:api_call("acl_add", { context = 42, count = 3, r = r1 })
+print(vpp.dump(reply))
+print("---")
+interface_acl_out = reply[1].acl_index
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 0, acl_index = interface_acl_out })
+print(vpp.dump(reply))
+print("---")
+
+r2 = {
+  { is_permit = 1, is_ipv6 = 1 },
+  { is_permit = 0, is_ipv6 = 0 }
+}
+
+reply = vpp:api_call("acl_add", { context = 42, count = 2, r = r2 })
+print(vpp.dump(reply))
+print("---")
+second_interface_acl_in = reply[1].acl_index
+
+reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 1, acl_index = second_interface_acl_in })
+print(vpp.dump(reply))
+print("---")
+
+^D^D^D
+
+run VPP show classify tables
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s2 nc -v -l -p 22
+run s1 nc 192.0.2.2 22
+run s1 echo
+sleep 1
+run s1 break
+sleep 1
+run VPP show trace
+expect VPP match: outacl 2 rule 2
+run VPP show classify tables
+
+
+run VPP show classify tables
+run VPP clear trace
+run VPP trace add af-packet-input 100
+run s2 nc -v -l -p 22
+run s1 nc 192.0.2.2 22
+run s1 echo
+sleep 1
+run s1 break
+sleep 1
+run VPP show trace
+expect VPP match: outacl 2 rule 2
+run VPP show classify tables
+
+
+run lua print("ALL GOOD!")
+
diff --git a/src/vpp-api/lua/vpp-lapi.lua b/src/vpp-api/lua/vpp-lapi.lua
new file mode 100644
index 00000000..ebfd032b
--- /dev/null
+++ b/src/vpp-api/lua/vpp-lapi.lua
@@ -0,0 +1,989 @@
+--[[
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+]]
+
+-- json decode/encode from https://gist.github.com/tylerneylon/59f4bcf316be525b30ab
+-- licensed by the author tylerneylon into public domain. Thanks!
+
+local json = {}
+
+-- Internal functions.
+
+local function kind_of(obj)
+  if type(obj) ~= 'table' then return type(obj) end
+  local i = 1
+  for _ in pairs(obj) do
+    if obj[i] ~= nil then i = i + 1 else return 'table' end
+  end
+  if i == 1 then return 'table' else return 'array' end
+end
+
+local function escape_str(s)
+  local in_char  = {'\\', '"', '/', '\b', '\f', '\n', '\r', '\t'}
+  local out_char = {'\\', '"', '/',  'b',  'f',  'n',  'r',  't'}
+  for i, c in ipairs(in_char) do
+    s = s:gsub(c, '\\' .. out_char[i])
+  end
+  return s
+end
+
+-- Returns pos, did_find; there are two cases:
+-- 1. Delimiter found: pos = pos after leading space + delim; did_find = true.
+-- 2. Delimiter not found: pos = pos after leading space;     did_find = false.
+-- This throws an error if err_if_missing is true and the delim is not found.
+local function skip_delim(str, pos, delim, err_if_missing)
+  pos = pos + #str:match('^%s*', pos)
+  if str:sub(pos, pos) ~= delim then
+    if err_if_missing then
+      error('Expected ' .. delim .. ' near position ' .. pos)
+    end
+    return pos, false
+  end
+  return pos + 1, true
+end
+
+-- Expects the given pos to be the first character after the opening quote.
+-- Returns val, pos; the returned pos is after the closing quote character.
+local function parse_str_val(str, pos, val)
+  val = val or ''
+  local early_end_error = 'End of input found while parsing string.'
+  if pos > #str then error(early_end_error) end
+  local c = str:sub(pos, pos)
+  if c == '"'  then return val, pos + 1 end
+  if c ~= '\\' then return parse_str_val(str, pos + 1, val .. c) end
+  -- We must have a \ character.
+  local esc_map = {b = '\b', f = '\f', n = '\n', r = '\r', t = '\t'}
+  local nextc = str:sub(pos + 1, pos + 1)
+  if not nextc then error(early_end_error) end
+  return parse_str_val(str, pos + 2, val .. (esc_map[nextc] or nextc))
+end
+
+-- Returns val, pos; the returned pos is after the number's final character.
+local function parse_num_val(str, pos)
+  local num_str = str:match('^-?%d+%.?%d*[eE]?[+-]?%d*', pos)
+  local val = tonumber(num_str)
+  if not val then error('Error parsing number at position ' .. pos .. '.') end
+  return val, pos + #num_str
+end
+
+
+-- Public values and functions.
+
+function json.stringify(obj, as_key)
+  local s = {}  -- We'll build the string as an array of strings to be concatenated.
+  local kind = kind_of(obj)  -- This is 'array' if it's an array or type(obj) otherwise.
+  if kind == 'array' then
+    if as_key then error('Can\'t encode array as key.') end
+    s[#s + 1] = '['
+    for i, val in ipairs(obj) do
+      if i > 1 then s[#s + 1] = ', ' end
+      s[#s + 1] = json.stringify(val)
+    end
+    s[#s + 1] = ']'
+  elseif kind == 'table' then
+    if as_key then error('Can\'t encode table as key.') end
+    s[#s + 1] = '{'
+    for k, v in pairs(obj) do
+      if #s > 1 then s[#s + 1] = ', ' end
+      s[#s + 1] = json.stringify(k, true)
+      s[#s + 1] = ':'
+      s[#s + 1] = json.stringify(v)
+    end
+    s[#s + 1] = '}'
+  elseif kind == 'string' then
+    return '"' .. escape_str(obj) .. '"'
+  elseif kind == 'number' then
+    if as_key then return '"' .. tostring(obj) .. '"' end
+    return tostring(obj)
+  elseif kind == 'boolean' then
+    return tostring(obj)
+  elseif kind == 'nil' then
+    return 'null'
+  else
+    error('Unjsonifiable type: ' .. kind .. '.')
+  end
+  return table.concat(s)
+end
+
+json.null = {}  -- This is a one-off table to represent the null value.
+
+function json.parse(str, pos, end_delim)
+  pos = pos or 1
+  if pos > #str then error('Reached unexpected end of input.') end
+  local pos = pos + #str:match('^%s*', pos)  -- Skip whitespace.
+  local first = str:sub(pos, pos)
+  if first == '{' then  -- Parse an object.
+    local obj, key, delim_found = {}, true, true
+    pos = pos + 1
+    while true do
+      key, pos = json.parse(str, pos, '}')
+      if key == nil then return obj, pos end
+      if not delim_found then error('Comma missing between object items.') end
+      pos = skip_delim(str, pos, ':', true)  -- true -> error if missing.
+      obj[key], pos = json.parse(str, pos)
+      pos, delim_found = skip_delim(str, pos, ',')
+    end
+  elseif first == '[' then  -- Parse an array.
+    local arr, val, delim_found = {}, true, true
+    pos = pos + 1
+    while true do
+      val, pos = json.parse(str, pos, ']')
+      if val == nil then return arr, pos end
+      if not delim_found then error('Comma missing between array items.') end
+      arr[#arr + 1] = val
+      pos, delim_found = skip_delim(str, pos, ',')
+    end
+  elseif first == '"' then  -- Parse a string.
+    return parse_str_val(str, pos + 1)
+  elseif first == '-' or first:match('%d') then  -- Parse a number.
+    return parse_num_val(str, pos)
+  elseif first == end_delim then  -- End of an object or array.
+    return nil, pos + 1
+  else  -- Parse true, false, or null.
+    local literals = {['true'] = true, ['false'] = false, ['null'] = json.null}
+    for lit_str, lit_val in pairs(literals) do
+      local lit_end = pos + #lit_str - 1
+      if str:sub(pos, lit_end) == lit_str then return lit_val, lit_end + 1 end
+    end
+    local pos_info_str = 'position ' .. pos .. ': ' .. str:sub(pos, pos + 10)
+    error('Invalid json syntax starting at ' .. pos_info_str)
+  end
+end
+
+
+local vpp = {}
+
+local ffi = require("ffi")
+
+--[[
+
+The basic type definitions. A bit of weird gymnastic with
+unionization of the hton* and ntoh* functions results
+is to make handling of signed and unsigned types a bit cleaner,
+essentially building typecasting into a C union.
+
+The vl_api_opaque_message_t is a synthetic type assumed to have
+enough storage to hold the entire API message regardless of the type.
+During the operation it is casted to the specific message struct types.
+
+]]
+
+
+ffi.cdef([[
+
+typedef uint8_t u8;
+typedef int8_t i8;
+typedef uint16_t u16;
+typedef int16_t i16;
+typedef uint32_t u32;
+typedef int32_t i32;
+typedef uint64_t u64;
+typedef int64_t i64;
+typedef double f64;
+typedef float f32;
+
+#pragma pack(1)
+typedef union {
+  u16 u16;
+  i16 i16;
+} lua_ui16t;
+
+#pragma pack(1)
+typedef union {
+  u32 u32;
+  i32 i32;
+} lua_ui32t;
+
+u16 ntohs(uint16_t hostshort);
+u16 htons(uint16_t hostshort);
+u32 htonl(uint32_t along);
+u32 ntohl(uint32_t along);
+void *memset(void *s, int c, size_t n);
+void *memcpy(void *dest, void *src, size_t n);
+
+#pragma pack(1)
+typedef struct _vl_api_opaque_message {
+  u16 _vl_msg_id;
+  u8  data[65536];
+} vl_api_opaque_message_t;
+]])
+
+
+-- CRC-based version stuff
+
+local crc32c_table = ffi.new('const uint32_t[256]',
+  { 0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4,
+  0xC79A971F, 0x35F1141C, 0x26A1E7E8, 0xD4CA64EB,
+  0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B,
+  0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24,
+  0x105EC76F, 0xE235446C, 0xF165B798, 0x030E349B,
+  0xD7C45070, 0x25AFD373, 0x36FF2087, 0xC494A384,
+  0x9A879FA0, 0x68EC1CA3, 0x7BBCEF57, 0x89D76C54,
+  0x5D1D08BF, 0xAF768BBC, 0xBC267848, 0x4E4DFB4B,
+  0x20BD8EDE, 0xD2D60DDD, 0xC186FE29, 0x33ED7D2A,
+  0xE72719C1, 0x154C9AC2, 0x061C6936, 0xF477EA35,
+  0xAA64D611, 0x580F5512, 0x4B5FA6E6, 0xB93425E5,
+  0x6DFE410E, 0x9F95C20D, 0x8CC531F9, 0x7EAEB2FA,
+  0x30E349B1, 0xC288CAB2, 0xD1D83946, 0x23B3BA45,
+  0xF779DEAE, 0x05125DAD, 0x1642AE59, 0xE4292D5A,
+  0xBA3A117E, 0x4851927D, 0x5B016189, 0xA96AE28A,
+  0x7DA08661, 0x8FCB0562, 0x9C9BF696, 0x6EF07595,
+  0x417B1DBC, 0xB3109EBF, 0xA0406D4B, 0x522BEE48,
+  0x86E18AA3, 0x748A09A0, 0x67DAFA54, 0x95B17957,
+  0xCBA24573, 0x39C9C670, 0x2A993584, 0xD8F2B687,
+  0x0C38D26C, 0xFE53516F, 0xED03A29B, 0x1F682198,
+  0x5125DAD3, 0xA34E59D0, 0xB01EAA24, 0x42752927,
+  0x96BF4DCC, 0x64D4CECF, 0x77843D3B, 0x85EFBE38,
+  0xDBFC821C, 0x2997011F, 0x3AC7F2EB, 0xC8AC71E8,
+  0x1C661503, 0xEE0D9600, 0xFD5D65F4, 0x0F36E6F7,
+  0x61C69362, 0x93AD1061, 0x80FDE395, 0x72966096,
+  0xA65C047D, 0x5437877E, 0x4767748A, 0xB50CF789,
+  0xEB1FCBAD, 0x197448AE, 0x0A24BB5A, 0xF84F3859,
+  0x2C855CB2, 0xDEEEDFB1, 0xCDBE2C45, 0x3FD5AF46,
+  0x7198540D, 0x83F3D70E, 0x90A324FA, 0x62C8A7F9,
+  0xB602C312, 0x44694011, 0x5739B3E5, 0xA55230E6,
+  0xFB410CC2, 0x092A8FC1, 0x1A7A7C35, 0xE811FF36,
+  0x3CDB9BDD, 0xCEB018DE, 0xDDE0EB2A, 0x2F8B6829,
+  0x82F63B78, 0x709DB87B, 0x63CD4B8F, 0x91A6C88C,
+  0x456CAC67, 0xB7072F64, 0xA457DC90, 0x563C5F93,
+  0x082F63B7, 0xFA44E0B4, 0xE9141340, 0x1B7F9043,
+  0xCFB5F4A8, 0x3DDE77AB, 0x2E8E845F, 0xDCE5075C,
+  0x92A8FC17, 0x60C37F14, 0x73938CE0, 0x81F80FE3,
+  0x55326B08, 0xA759E80B, 0xB4091BFF, 0x466298FC,
+  0x1871A4D8, 0xEA1A27DB, 0xF94AD42F, 0x0B21572C,
+  0xDFEB33C7, 0x2D80B0C4, 0x3ED04330, 0xCCBBC033,
+  0xA24BB5A6, 0x502036A5, 0x4370C551, 0xB11B4652,
+  0x65D122B9, 0x97BAA1BA, 0x84EA524E, 0x7681D14D,
+  0x2892ED69, 0xDAF96E6A, 0xC9A99D9E, 0x3BC21E9D,
+  0xEF087A76, 0x1D63F975, 0x0E330A81, 0xFC588982,
+  0xB21572C9, 0x407EF1CA, 0x532E023E, 0xA145813D,
+  0x758FE5D6, 0x87E466D5, 0x94B49521, 0x66DF1622,
+  0x38CC2A06, 0xCAA7A905, 0xD9F75AF1, 0x2B9CD9F2,
+  0xFF56BD19, 0x0D3D3E1A, 0x1E6DCDEE, 0xEC064EED,
+  0xC38D26C4, 0x31E6A5C7, 0x22B65633, 0xD0DDD530,
+  0x0417B1DB, 0xF67C32D8, 0xE52CC12C, 0x1747422F,
+  0x49547E0B, 0xBB3FFD08, 0xA86F0EFC, 0x5A048DFF,
+  0x8ECEE914, 0x7CA56A17, 0x6FF599E3, 0x9D9E1AE0,
+  0xD3D3E1AB, 0x21B862A8, 0x32E8915C, 0xC083125F,
+  0x144976B4, 0xE622F5B7, 0xF5720643, 0x07198540,
+  0x590AB964, 0xAB613A67, 0xB831C993, 0x4A5A4A90,
+  0x9E902E7B, 0x6CFBAD78, 0x7FAB5E8C, 0x8DC0DD8F,
+  0xE330A81A, 0x115B2B19, 0x020BD8ED, 0xF0605BEE,
+  0x24AA3F05, 0xD6C1BC06, 0xC5914FF2, 0x37FACCF1,
+  0x69E9F0D5, 0x9B8273D6, 0x88D28022, 0x7AB90321,
+  0xAE7367CA, 0x5C18E4C9, 0x4F48173D, 0xBD23943E,
+  0xF36E6F75, 0x0105EC76, 0x12551F82, 0xE03E9C81,
+  0x34F4F86A, 0xC69F7B69, 0xD5CF889D, 0x27A40B9E,
+  0x79B737BA, 0x8BDCB4B9, 0x988C474D, 0x6AE7C44E,
+  0xBE2DA0A5, 0x4C4623A6, 0x5F16D052, 0xAD7D5351 }
+);
+
+local function CRC8(crc, d)
+  return bit.bxor(bit.rshift(crc, 8), crc32c_table[bit.band(0xff, bit.bxor(crc, d))])
+end
+
+local function CRC16(crc, d)
+  crc = CRC8(crc, bit.band(d, 0xFF))
+  d = bit.rshift(d, 8)
+  crc = CRC8(crc, bit.band(d, 0xFF))
+  return crc
+end
+
+local function string_crc(str, crc)
+  for i=1,#str do
+    -- print("S", i, string.byte(str, i), string.char(string.byte(str, i)))
+    crc = CRC8(crc, string.byte(str, i))
+  end
+  return crc
+end
+
+local tokens = {
+  { ["match"] =' ', ["act"]             = { }  },
+  { ["match"] ='\n', ["act"]             = { }  },
+  { ["match"] ="manual_endian", ["act"]  = { "NODE_MANUAL_ENDIAN", "MANUAL_ENDIAN",    276 } },
+  { ["match"] ="define", ["act"]         = { "NODE_DEFINE",        "DEFINE",           267 } },
+  { ["match"] ="dont_trace", ["act"]     = { "NODE_DONT_TRACE",    "DONT_TRACE",       279 } },
+  { ["match"] ="f64", ["act"]            = { "NODE_F64",           "PRIMTYPE",         string_crc } },
+  { ["match"] ="i16", ["act"]            = { "NODE_I16",           "PRIMTYPE",         string_crc } },
+  { ["match"] ="i32", ["act"]            = { "NODE_I32",           "PRIMTYPE",         string_crc } },
+  { ["match"] ="i64", ["act"]            = { "NODE_I64",           "PRIMTYPE",         string_crc } },
+  { ["match"] ="i8", ["act"]             = { "NODE_I8",            "PRIMTYPE",         string_crc } },
+  { ["match"] ="manual_print", ["act"]   = { "NODE_MANUAL_PRINT",  "MANUAL_PRINT",     275 } },
+  { ["match"] ="noversion", ["act"]      = { "NODE_NOVERSION",     "NOVERSION",        274 } },
+  { ["match"] ="packed", ["act"]         = { "NODE_PACKED",        "TPACKED",          266 } },
+  { ["match"] ="typeonly", ["act"]       = { "NODE_TYPEONLY",      "TYPEONLY",         278 } },
+  { ["match"] ="u16", ["act"]            = { "NODE_U16",           "PRIMTYPE",         string_crc } },
+  { ["match"] ="u32", ["act"]            = { "NODE_U32",           "PRIMTYPE",         string_crc } },
+  { ["match"] ="u64", ["act"]            = { "NODE_U64",           "PRIMTYPE",         string_crc } },
+  { ["match"] ="u8", ["act"]             = { "NODE_U8",            "PRIMTYPE",         string_crc } },
+  { ["match"] ="union", ["act"]          = { "NODE_UNION",         "UNION",            271 } },
+  { ["match"] ="uword", ["act"]          = { "NODE_UWORD",         "PRIMTYPE",         string_crc } },
+  { ["match"] ="%(", ["act"]             = { "NODE_LPAR",          "LPAR",             259 } },
+  { ["match"] ="%)", ["act"]             = { "NODE_RPAR",          "RPAR",             258 } },
+  { ["match"] =";", ["act"]              = { "NODE_SEMI",          "SEMI",             260 } },
+  { ["match"] ="%[", ["act"]             = { "NODE_LBRACK",        "LBRACK",           261 } },
+  { ["match"] ="%]", ["act"]             = { "NODE_RBRACK",        "RBRACK",           262 } },
+  { ["match"] ="%{", ["act"]             = { "NODE_LCURLY",        "LCURLY",           268 } },
+  { ["match"] ="%}", ["act"]             = { "NODE_RCURLY",        "RCURLY",           269 } },
+  { ["match"] ='%b""', ["act"]           = { "NODE_STRING",        "STRING",           string_crc } },
+  { ["match"] ='%b@@', ["act"]           = { "NODE_HELPER",        "HELPER_STRING",    string_crc } },
+  -- TODO: \ must be consumed
+  { ["match"] ='[_a-zA-Z][_a-zA-Z0-9]*',
+                       ["act"]           = { "NODE_NAME",          "NAME",             string_crc } },
+  { ["match"] ='[0-9]+', ["act"]         = { "NODE_NUMBER",        "NUMBER",           string_crc } },
+  { ["match"] ='#[^\n]+', ["act"]            = { "NODE_PRAGMA",        "PRAGMA",           nil } },
+}
+
+
+function vpp.crc_version_string(data)
+  local input_crc = 0
+  -- Get rid of comments
+  data = data:gsub("/%*.-%*/", "")
+  data = data:gsub("//[^\n]+", "")
+  -- print(data)
+  idx = 1
+  while (true) do
+    local matched = nil
+    for k, v in ipairs(tokens) do
+      if not matched then
+        local x, y, cap = string.find(data, v["match"], idx)
+        if x == idx then
+          matched = { ["node"] = v["act"], ["x"] = x, ["y"] = y, ["cap"] = cap, ["chars"] = string.sub(data, x, y)  }
+          -- print(k, v, x, y, cap, matched.chars, matched.node[0] )
+        end
+      end
+    end
+    if matched then
+      idx = idx + (matched.y - matched.x + 1)
+      if matched.node[1] then
+        local act = matched.node[3]
+        if type(act) == "function" then
+          input_crc = act(matched.chars, input_crc)
+        elseif type(act) == "number" then
+          input_crc = CRC16(input_crc, act)
+        end
+        -- print(vpp.dump(matched))
+      end
+    else
+      -- print("NOT MATCHED!")
+      local crc = CRC16(input_crc, 0xFFFFFFFF)
+      return string.sub(string.format("%x", crc), -8)
+    end
+  end
+end
+
+
+function vpp.dump(o)
+   if type(o) == 'table' then
+      local s = '{ '
+      for k,v in pairs(o) do
+         if type(k) ~= 'number' then k = '"'..k..'"' end
+         s = s .. '['..k..'] = ' .. vpp.dump(v) .. ','
+      end
+      return s .. '} '
+   else
+      return tostring(o)
+   end
+end
+
+function vpp.hex_dump(buf)
+  local ret = {}
+  for i=1,math.ceil(#buf/16) * 16 do
+    if (i-1) % 16 == 0 then table.insert(ret, string.format('%08X  ', i-1)) end
+    table.insert(ret, ( i > #buf and '   ' or string.format('%02X ', buf:byte(i)) ))
+    if i %  8 == 0 then table.insert(ret, ' ') end
+    if i % 16 == 0 then table.insert(ret, buf:sub(i-16+1, i):gsub('%c','.')..'\n' ) end
+  end
+  return table.concat(ret)
+end
+
+
+function vpp.c_str(text_in)
+  local text = text_in -- \000 will be helpfully added by ffi.copy
+  local c_str = ffi.new("char[?]", #text+1)
+  ffi.copy(c_str, text)
+  return c_str
+end
+
+
+function vpp.init(vpp, args)
+  local pneum_api = args.pneum_api or [[
+ int cough_pneum_attach(char *pneum_path, char *cough_path);
+ int pneum_connect(char *name, char *chroot_prefix, void *cb);
+ int pneum_disconnect(void);
+ int pneum_read(char **data, int *l);
+ int pneum_write(char *data, int len);
+ void pneum_free(char *data);
+ uint32_t pneum_get_msg_index(unsigned char * name);
+]]
+
+  vpp.pneum_path = args.pneum_path
+  ffi.cdef(pneum_api)
+  local init_res = 0
+  vpp.pneum = ffi.load(vpp.pneum_path)
+  if (init_res < 0) then
+    return nil
+  end
+
+  vpp.next_msg_num = 1
+  vpp.msg_name_to_number = {}
+  vpp.msg_name_to_fields = {}
+  vpp.msg_number_to_name = {}
+  vpp.msg_number_to_type = {}
+  vpp.msg_number_to_pointer_type = {}
+  vpp.msg_name_to_crc = {}
+  vpp.c_type_to_fields = {}
+  vpp.events = {}
+  vpp.plugin_version = {}
+  vpp.is_connected = false
+
+
+  vpp.t_lua2c = {}
+  vpp.t_c2lua = {}
+  vpp.t_lua2c["u8"] = function(c_type, src, dst_c_ptr)
+    if type(src) == "string" then
+      -- ffi.copy adds a zero byte at the end. Grrr.
+      -- ffi.copy(dst_c_ptr, src)
+      ffi.C.memcpy(dst_c_ptr, vpp.c_str(src), #src)
+      return(#src)
+    elseif type(src) == "table" then
+      for i,v in ipairs(src) do
+        ffi.cast("u8 *", dst_c_ptr)[i-1] = v
+      end
+      return(#src)
+    else
+      return 1, src -- ffi.cast("u8", src)
+    end
+  end
+  vpp.t_c2lua["u8"] = function(c_type, src_ptr, src_len)
+    if src_len then
+      return ffi.string(src_ptr, src_len)
+    else
+      return (tonumber(src_ptr))
+    end
+  end
+
+  vpp.t_lua2c["u16"] = function(c_type, src, dst_c_ptr)
+    if type(src) == "table" then
+      for i,v in ipairs(src) do
+        ffi.cast("u16 *", dst_c_ptr)[i-1] = ffi.C.htons(v)
+      end
+      return(2 * #src)
+    else
+      return 2, (ffi.C.htons(src))
+    end
+  end
+  vpp.t_c2lua["u16"] = function(c_type, src_ptr, src_len)
+    if src_len then
+      local out = {}
+      for i = 0,src_len-1 do
+        out[i+1] = tonumber(ffi.C.ntohs(src_ptr[i]))
+      end
+      return out
+    else
+      return (tonumber(ffi.C.ntohs(src_ptr)))
+    end
+  end
+
+  vpp.t_lua2c["u32"] = function(c_type, src, dst_c_ptr)
+    if type(src) == "table" then
+      for i,v in ipairs(src) do
+        ffi.cast("u32 *", dst_c_ptr)[i-1] = ffi.C.htonl(v)
+      end
+      return(4 * #src)
+    else
+      return 4, (ffi.C.htonl(src))
+    end
+  end
+  vpp.t_c2lua["u32"] = function(c_type, src_ptr, src_len)
+    if src_len then
+      local out = {}
+      for i = 0,src_len-1 do
+        out[i+1] = tonumber(ffi.C.ntohl(src_ptr[i]))
+      end
+      return out
+    else
+      return (tonumber(ffi.C.ntohl(src_ptr)))
+    end
+  end
+  vpp.t_lua2c["i32"] = function(c_type, src, dst_c_ptr)
+    if type(src) == "table" then
+      for i,v in ipairs(src) do
+        ffi.cast("i32 *", dst_c_ptr)[i-1] = ffi.C.htonl(v)
+      end
+      return(4 * #src)
+    else
+      return 4, (ffi.C.htonl(src))
+    end
+  end
+  vpp.t_c2lua["i32"] = function(c_type, src_ptr, src_len)
+    local ntohl = function(src)
+      local u32val = ffi.cast("u32", src)
+      local ntohlval = (ffi.C.ntohl(u32val))
+      local out = tonumber(ffi.cast("i32", ntohlval + 0LL))
+      return out
+    end
+    if src_len then
+      local out = {}
+      for i = 0,src_len-1 do
+        out[i+1] = tonumber(ntohl(src_ptr[i]))
+      end
+    else
+      return (tonumber(ntohl(src_ptr)))
+    end
+  end
+
+  vpp.t_lua2c["u64"] = function(c_type, src, dst_c_ptr)
+    if type(src) == "table" then
+      for i,v in ipairs(src) do
+        ffi.cast("u64 *", dst_c_ptr)[i-1] = v --- FIXME ENDIAN
+      end
+      return(8 * #src)
+    else
+      return 8, ffi.cast("u64", src) --- FIXME ENDIAN
+    end
+  end
+  vpp.t_c2lua["u64"] = function(c_type, src_ptr, src_len)
+    if src_len then
+      local out = {}
+      for i = 0,src_len-1 do
+        out[i+1] = tonumber(src_ptr[i]) -- FIXME ENDIAN
+      end
+      return out
+    else
+      return (tonumber(src_ptr)) --FIXME ENDIAN
+    end
+  end
+
+
+
+
+  vpp.t_lua2c["__MSG__"] = function(c_type, src, dst_c_ptr)
+    local dst = ffi.cast(c_type .. " *", dst_c_ptr)
+    local additional_len = 0
+    local fields_info = vpp.c_type_to_fields[c_type]
+    -- print("__MSG__ type: " .. tostring(c_type))
+    ffi.C.memset(dst_c_ptr, 0, ffi.sizeof(dst[0]))
+    -- print(vpp.dump(fields_info))
+    -- print(vpp.dump(src))
+    for k,v in pairs(src) do
+      local field = fields_info[k]
+      if not field then
+        print("ERROR: field " .. tostring(k) .. " in message " .. tostring(c_type) .. " is unknown")
+      end
+      local lua2c = vpp.t_lua2c[field.c_type]
+      -- print("__MSG__ field " .. tostring(k) .. " : " .. vpp.dump(field))
+      -- if the field is not an array type, try to coerce the argument to a number
+      if not field.array and type(v) == "string" then
+        v = tonumber(v)
+      end
+      if not lua2c then
+        print("__MSG__ " .. tostring(c_type) .. " t_lua2c: can not store field " .. field.name ..
+              " type " .. field.c_type .. " dst " .. tostring(dst[k]))
+        return 0
+      end
+      local len = 0
+      local val = nil
+      if field.array and (type(v) == "table") then
+        -- print("NTFY: field " .. tostring(k) .. " in message " .. tostring(c_type) .. " is an array")
+        for field_i, field_v in ipairs(v) do
+          -- print("NTFY: setting member#" .. tostring(field_i) .. " to value " .. vpp.dump(field_v))
+          local field_len, field_val = lua2c(field.c_type, field_v, dst[k][field_i-1])
+          len = len + field_len
+        end
+      else
+        len, val = lua2c(field.c_type, v, dst[k])
+      end
+      if not field.array then
+        dst[k] = val
+      else
+        if 0 == field.array then
+          additional_len = additional_len + len
+          -- print("Adding " .. tostring(len) .. " bytes due to field " .. tostring(field.name))
+          -- If there is a variable storing the length
+          -- and the input table does not set it, do magic
+          if field.array_size and not src[field.array_size] then
+            local size_field = fields_info[field.array_size]
+            if size_field then
+              dst[field.array_size] = vpp.t_c2lua[size_field.c_type](size_field.c_type, len)
+            end
+          end
+        end
+      end
+      -- print("Full message:\n" .. vpp.hex_dump(ffi.string(ffi.cast('void *', req_store_cache), 64)))
+    end
+    return (ffi.sizeof(dst[0])+additional_len)
+  end
+
+  vpp.t_c2lua["__MSG__"] = function(c_type, src_ptr, src_len)
+    local out = {}
+    local reply_typed_ptr = ffi.cast(c_type .. " *", src_ptr)
+    local field_desc = vpp.c_type_to_fields[c_type]
+    if src_len then
+      for i = 0,src_len-1 do
+        out[i+1] = vpp.t_c2lua[c_type](c_type, src_ptr[i])
+      end
+      return out
+    end
+
+    for k, v in pairs(field_desc) do
+      local v_c2lua = vpp.t_c2lua[v.c_type]
+      if v_c2lua then
+        local len = v.array
+        -- print(dump(v))
+        if len then
+          local len_field_name = k .. "_length"
+          local len_field = field_desc[len_field_name]
+          if (len_field) then
+            local real_len = vpp.t_c2lua[len_field.c_type](len_field.c_type, reply_typed_ptr[len_field_name])
+            out[k] =  v_c2lua(v.c_type, reply_typed_ptr[k], real_len)
+          elseif len == 0 then
+            -- check if len = 0, then must be a field which contains the size
+            len_field =  field_desc[v.array_size]
+            local real_len = vpp.t_c2lua[len_field.c_type](len_field.c_type, reply_typed_ptr[v.array_size])
+            -- print("REAL length: " .. vpp.dump(v) .. " : " .. tostring(real_len))
+            out[k] = v_c2lua(v.c_type, reply_typed_ptr[k], real_len)
+          else
+            -- alas, just stuff the entire array
+            out[k] = v_c2lua(v.c_type, reply_typed_ptr[k], len)
+          end
+        else
+          out[k] =  v_c2lua(v.c_type, reply_typed_ptr[k])
+        end
+      else
+        out[k] = "<no accessor function for type " .. tostring(v.c_type) .. ">"
+      end
+      -- print(k, out[k])
+    end
+    return out
+  end
+
+  return vpp
+end
+
+function vpp.resolve_message_number(msgname)
+  local name = msgname .. "_" .. vpp.msg_name_to_crc[msgname]
+  local idx = vpp.pneum.pneum_get_msg_index(vpp.c_str(name))
+  if vpp.debug_dump then
+    print("Index for " .. tostring(name) .. " is " .. tostring(idx))
+  end
+  vpp.msg_name_to_number[msgname] = idx
+  vpp.msg_number_to_name[idx] = msgname
+  vpp.msg_number_to_type[idx] = "vl_api_" .. msgname .. "_t"
+  vpp.msg_number_to_pointer_type[idx] = vpp.msg_number_to_type[idx] .. " *"
+  ffi.cdef("\n\n enum { vl_msg_" .. msgname .. " = " .. idx .. " };\n\n")
+end
+
+function vpp.connect(vpp, client_name)
+    local name = "lua_client"
+    if client_name then
+      name = client_name
+    end
+    local ret = vpp.pneum.pneum_connect(vpp.c_str(client_name), nil, nil)
+    if tonumber(ret) == 0 then
+      vpp.is_connected = true
+    end
+    for k, v in pairs(vpp.msg_name_to_number) do
+      vpp.resolve_message_number(k)
+    end
+  end
+
+function vpp.disconnect(vpp)
+    vpp.pneum.pneum_disconnect()
+  end
+
+function vpp.json_api(vpp, path, plugin_name)
+    -- print("Consuming the VPP api from "..path)
+    local ffii = {}
+    local f = io.open(path, "r")
+    if not f then
+      print("Could not open " .. path)
+      return nil
+    end
+    local data = f:read("*all")
+    local json = json.parse(data)
+    if not (json.types or json.messages) then
+      print("Can not parse " .. path)
+      return nil
+    end
+
+    local all_types = {}
+
+    for i, v in ipairs(json.types) do
+      table.insert(all_types, { typeonly = 1, desc = v })
+    end
+    for i, v in ipairs(json.messages) do
+      table.insert(all_types, { typeonly = 0, desc = v })
+    end
+    for i, v in ipairs(all_types) do
+      local typeonly = v.typeonly
+      local name = v.desc[1]
+      local c_type = "vl_api_" .. name .. "_t"
+
+      local fields = {}
+      -- vpp.msg_name_to_fields[name] = fields
+      -- print("CTYPE " .. c_type)
+      vpp.c_type_to_fields[c_type] = fields
+      vpp.t_lua2c[c_type] = vpp.t_lua2c["__MSG__"]
+      vpp.t_c2lua[c_type] = vpp.t_c2lua["__MSG__"]
+
+      local cdef = { "\n\n#pragma pack(1)\ntypedef struct _vl_api_", name, " {\n" }
+      for ii, vv in ipairs(v.desc) do
+        if type(vv) == "table" then
+          if vv.crc then
+            vpp.msg_name_to_crc[name] = string.sub(vv.crc, 3) -- strip the leading 0x
+          else
+            local fieldtype = vv[1]
+            local fieldname = vv[2]
+            local fieldcount = vv[3]
+            local fieldcountvar = vv[4]
+            local fieldrec = { name = fieldname, c_type = fieldtype, array = fieldcount, array_size = fieldcountvar }
+            if fieldcount then
+              table.insert(cdef, "  " .. fieldtype .. " " .. fieldname .. "[" .. fieldcount .. "];\n")
+              if fieldtype == "u8" then
+                -- any array of bytes is treated as a string
+              elseif vpp.t_lua2c[fieldtype] then
+                -- print("Array of " .. fieldtype .. " is ok!")
+              else
+                print("Unknown array type: ", name,  " : " , fieldname, " : ", fieldtype, ":", fieldcount, ":", fieldcountvar)
+              end
+            else
+              table.insert(cdef, "  " .. fieldtype .. " " .. fieldname .. ";\n")
+            end
+            fields[fieldname] = fieldrec
+          end
+        end
+      end
+
+      table.insert(cdef, "} vl_api_" .. name .. "_t;")
+      table.insert(ffii, table.concat(cdef))
+
+      if typeonly == 0 then
+        -- we will want to resolve this later
+        if vpp.debug_dump then
+          print("Remember to resolve " .. name)
+        end
+        vpp.msg_name_to_number[name] = -1
+        if vpp.is_connected then
+          vpp.resolve_message_number(name)
+        end
+      end
+
+    end
+    local cdef_full = table.concat(ffii)
+    ffi.cdef(cdef_full)
+end
+
+function vpp.consume_api(vpp, path, plugin_name)
+    -- print("Consuming the VPP api from "..path)
+    local ffii = {}
+    local f = io.open(path, "r")
+    if not f then
+      print("Could not open " .. path)
+      return nil
+    end
+    local data = f:read("*all")
+    -- Remove all C comments
+    data = data:gsub("/%*.-%*/", "")
+    if vpp.is_connected and not plugin_name then
+      print(path .. ": must specify plugin name!")
+      return
+    end
+    if plugin_name then
+      vpp.plugin_version[plugin_name] = vpp.crc_version_string(data)
+      local full_plugin_name = plugin_name .. "_" .. vpp.plugin_version[plugin_name]
+      local reply = vpp:api_call("get_first_msg_id", { name = full_plugin_name } )
+      vpp.next_msg_num = tonumber(reply[1].first_msg_id)
+      print("Plugin " .. full_plugin_name .. " first message is " .. tostring(vpp.next_msg_num))
+    end
+    -- print ("data len: ", #data)
+    data = data:gsub("\n(.-)(%S+)%s*{([^}]*)}", function (preamble, name, members)
+      local _, typeonly = preamble:gsub("typeonly", "")
+      local maybe_msg_id_field = { [0] = "u16 _vl_msg_id;", "" }
+      local onedef = "\n\n#pragma pack(1)\ntypedef struct _vl_api_"..name.. " {\n" ..
+	   -- "   u16 _vl_msg_id;" ..
+           maybe_msg_id_field[typeonly] ..
+	   members:gsub("%[[a-zA-Z_]+]", "[0]") ..
+	   "} vl_api_" .. name .. "_t;"
+
+      local c_type = "vl_api_" .. name .. "_t"
+
+      local fields = {}
+      -- vpp.msg_name_to_fields[name] = fields
+      -- print("CTYPE " .. c_type)
+      vpp.c_type_to_fields[c_type] = fields
+      vpp.t_lua2c[c_type] = vpp.t_lua2c["__MSG__"]
+      vpp.t_c2lua[c_type] = vpp.t_c2lua["__MSG__"]
+      local mirec = { name = "_vl_msg_id", c_type = "u16", array = nil, array_size = nil }
+      if typeonly == 0 then
+        fields[mirec.name] = mirec
+      end
+
+      -- populate the field reflection table for the message
+      -- sets the various type information as well as the accessors for lua<->C conversion
+      members:gsub("(%S+)%s+(%S+);", function (fieldtype, fieldname)
+          local fieldcount = nil
+          local fieldcountvar = nil
+          -- data = data:gsub("%[[a-zA-Z_]+]", "[0]")
+          fieldname = fieldname:gsub("(%b[])", function(cnt)
+              fieldcount = tonumber(cnt:sub(2, -2));
+              if not fieldcount then
+                fieldcount = 0
+                fieldcountvar = cnt:sub(2, -2)
+              end
+              return ""
+            end)
+	  local fieldrec = { name = fieldname, c_type = fieldtype, array = fieldcount, array_size = fieldcountvar }
+          if fieldcount then
+            if fieldtype == "u8" then
+              -- any array of bytes is treated as a string
+            elseif vpp.t_lua2c[fieldtype] then
+              -- print("Array of " .. fieldtype .. " is ok!")
+            else
+              print("Unknown array type: ", name,  " : " , fieldname, " : ", fieldtype, ":", fieldcount, ":", fieldcountvar)
+            end
+          end
+	  fields[fieldname] = fieldrec
+	end)
+
+      -- print(dump(fields))
+
+      if typeonly == 0 then
+	local this_message_number = vpp.next_msg_num
+	vpp.next_msg_num = vpp.next_msg_num + 1
+	vpp.msg_name_to_number[name] = this_message_number
+	vpp.msg_number_to_name[this_message_number] = name
+	vpp.msg_number_to_type[this_message_number] = "vl_api_" .. name .. "_t"
+	vpp.msg_number_to_pointer_type[this_message_number] = vpp.msg_number_to_type[this_message_number] .. " *"
+	onedef = onedef .. "\n\n enum { vl_msg_" .. name .. " = " .. this_message_number .. " };\n\n"
+      end
+      table.insert(ffii, onedef);
+      return "";
+      end)
+    local cdef = table.concat(ffii)
+    -- print(cdef)
+    ffi.cdef(cdef)
+  end
+
+
+function vpp.lua2c(vpp, c_type, src, dst_c_ptr)
+  -- returns the number of bytes written to memory pointed by dst
+  local lua2c = vpp.t_lua2c[c_type]
+  if lua2c then
+    return(lua2c(c_type, src, dst_c_ptr))
+  else
+    print("vpp.lua2c: do not know how to store type " .. tostring(c_type))
+    local x = "a" .. nil
+    return 0
+  end
+end
+
+function vpp.c2lua(vpp, c_type, src_ptr, src_len)
+  -- returns the lua data structure
+  local c2lua = vpp.t_c2lua[c_type]
+  if c2lua then
+    return(c2lua(c_type, src_ptr, src_len))
+  else
+    print("vpp.c2lua: do not know how to load type " .. c_type)
+    return nil
+  end
+end
+
+local req_store_cache = ffi.new("vl_api_opaque_message_t[1]")
+
+function vpp.api_write(vpp, api_name, req_table)
+    local msg_num = vpp.msg_name_to_number[api_name]
+    if not msg_num then
+      print ("API call "..api_name.." is not known")
+      return nil
+    end
+
+    if not req_table then
+      req_table = {}
+    end
+    req_table._vl_msg_id = msg_num
+
+    local packed_len = vpp:lua2c(vpp.msg_number_to_type[msg_num], req_table, req_store_cache)
+    if vpp.debug_dump then
+      print("Write Message length: " .. tostring(packed_len) .. "\n" .. vpp.hex_dump(ffi.string(ffi.cast('void *', req_store_cache), packed_len)))
+    end
+
+    res = vpp.pneum.pneum_write(ffi.cast('void *', req_store_cache), packed_len)
+    return res
+  end
+
+local rep_store_cache = ffi.new("vl_api_opaque_message_t *[1]")
+local rep_len_cache = ffi.new("int[1]")
+
+function vpp.api_read(vpp)
+    local rep_type = "vl_api_opaque_message_t"
+    local rep = rep_store_cache
+    local replen = rep_len_cache
+    res = vpp.pneum.pneum_read(ffi.cast("void *", rep), replen)
+    if vpp.debug_dump then
+      print("Read Message length: " .. tostring(replen[0]) .. "\n" .. vpp.hex_dump(ffi.string(ffi.cast('void *', rep[0]), replen[0])))
+    end
+
+    local reply_msg_num = ffi.C.ntohs(rep[0]._vl_msg_id)
+    local reply_msg_name = vpp.msg_number_to_name[reply_msg_num]
+
+    local reply_typed_ptr = ffi.cast(vpp.msg_number_to_pointer_type[reply_msg_num], rep[0])
+    local out = vpp:c2lua(vpp.msg_number_to_type[reply_msg_num], rep[0], nil, replen[0])
+    if type(out) == "table" then
+      out["luaapi_message_name"] = reply_msg_name
+    end
+
+    vpp.pneum.pneum_free(ffi.cast('void *',rep[0]))
+
+    return reply_msg_name, out
+  end
+
+function vpp.api_call(vpp, api_name, req_table, options_in)
+    local msg_num = vpp.msg_name_to_number[api_name]
+    local end_message_name = api_name .."_reply"
+    local replies = {}
+    local cstruct = ""
+    local options = options_in or {}
+    if msg_num then
+      if vpp.debug_dump then
+        print("Message #" .. tostring(msg_num) .. " for name " .. tostring(api_name))
+      end
+      vpp:api_write(api_name, req_table)
+      if not vpp.msg_name_to_number[end_message_name] or options.force_ping then
+        end_message_name = "control_ping_reply"
+        vpp:api_write("control_ping")
+      end
+      repeat
+        reply_message_name, reply = vpp:api_read()
+        if reply and not reply.context then
+          -- there may be async events inbetween
+          table.insert(vpp.events, reply)
+        else
+          if reply_message_name ~= "control_ping_reply" then
+            -- do not insert the control ping encapsulation
+            table.insert(replies, reply)
+          end
+        end
+        -- print(reply)
+      until reply_message_name == end_message_name
+    else
+      print(api_name .. " is an unknown API call")
+      return nil
+    end
+    return replies
+  end
+
+return vpp
diff --git a/src/vpp.am b/src/vpp.am
index a02206f8..1d07b90a 100644
--- a/src/vpp.am
+++ b/src/vpp.am
@@ -74,7 +74,7 @@ PLUGIN_DPDK_ARG=""
 endif
 
 vpp_plugin_configure:
-	@echo "PLUGIN CONFIGURE " $@ 
+	@echo "PLUGIN CFG" $@
 	@echo "#!/bin/bash" > $@
 	@echo " " >> $@
 	@echo "set +eu" >> $@
diff --git a/src/vppapigen.am b/src/vppapigen.am
index 083ee537..edde339d 100644
--- a/src/vppapigen.am
+++ b/src/vppapigen.am
@@ -16,9 +16,9 @@ bin_PROGRAMS += vppapigen
 BUILT_SOURCES += tools/vppapigen/gram.h
 
 tools/vppapigen/gram.h: tools/vppapigen/gram.y
-	$(YACC) -d @srcdir@/tools/vppapigen/gram.y
-	mv y.tab.h tools/vppapigen/gram.h
-	rm y.tab.c
+	@$(YACC) -d @srcdir@/tools/vppapigen/gram.y
+	@mv y.tab.h tools/vppapigen/gram.h
+	@rm y.tab.c
 
 vppapigen_SOURCES = tools/vppapigen/gram.y tools/vppapigen/lex.c tools/vppapigen/node.c
 vppapigen_LDADD = libvppinfra.la
diff --git a/vpp-api/Makefile.am b/vpp-api/Makefile.am
deleted file mode 100644
index b50522ef..00000000
--- a/vpp-api/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-SUBDIRS = java
-
-# vi:syntax=automake
diff --git a/vpp-api/configure.ac b/vpp-api/configure.ac
deleted file mode 100644
index 278041c7..00000000
--- a/vpp-api/configure.ac
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_INIT(vpp-api, 1.1.0)
-LT_INIT
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SUBDIRS([java])
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-
diff --git a/vpp-api/java/Makefile.am b/vpp-api/java/Makefile.am
deleted file mode 100644
index b0551965..00000000
--- a/vpp-api/java/Makefile.am
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-ACLOCAL_AMFLAGS = -I m4
-AM_CFLAGS = -Wall
-
-noinst_PROGRAMS =
-BUILT_SOURCES =
-bin_PROGRAMS =
-CLEANFILES =
-lib_LTLIBRARIES =
-
-#
-# jvpp-common
-#
-
-nobase_include_HEADERS =		\
-  jvpp-common/jvpp_common.h
-
-lib_LTLIBRARIES += libjvpp_common.la
-
-libjvpp_common_la_SOURCES = jvpp-common/jvpp_common.c
-libjvpp_common_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
-	              -lpthread -lm -lrt
-libjvpp_common_la_LDFLAGS = -module
-libjvpp_common_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-
-
-#
-# jvpp-registry (connection management + plugin registry)
-#
-lib_LTLIBRARIES += libjvpp_registry.la
-
-libjvpp_registry_la_SOURCES = jvpp-registry/jvpp_registry.c
-libjvpp_registry_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
-	              -lpthread -lm -lrt -ljvpp_common
-libjvpp_registry_la_LDFLAGS = -module
-libjvpp_registry_la_CPPFLAGS = -Ijvpp-registry -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-EXTRA_libjvpp_registry_la_DEPENDENCIES=libjvpp_common.la
-
-jarfile_jvpp_registry = jvpp-registry-$(PACKAGE_VERSION).jar
-packagedir_jvpp_registry = io/fd/vpp/jvpp
-
-BUILT_SOURCES += jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h
-
-jvpp_registry_src_files := $(wildcard @srcdir@/jvpp-registry/$(packagedir_jvpp_registry)/*.java) $(wildcard @srcdir@/jvpp-registry/$(packagedir_jvpp_registry)/**/*.java)
-
-jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h: $(jvpp_registry_src_files)
-	@echo " jvpp-registry.jar generation"
-	mkdir -p jvpp-registry/target
-	$(JAVAC) -d jvpp-registry/target $(jvpp_registry_src_files)
-	$(JAVAH) -force -classpath jvpp-registry/target -d jvpp-registry io.fd.vpp.jvpp.VppJNIConnection
-	$(JAVAH) -force -classpath jvpp-registry/target -d jvpp-registry io.fd.vpp.jvpp.JVppRegistryImpl
-
-$(jarfile_jvpp_registry): libjvpp_registry.la
-	cp .libs/libjvpp_registry.so.0.0.0 jvpp-registry/target;	\
-	$(JAR) cf $(JARFLAGS) $@ -C jvpp-registry/target .;
-
-#
-# jvpp-core (Java wrapper for vpe.api)
-#
-lib_LTLIBRARIES += libjvpp_core.la
-
-libjvpp_core_la_SOURCES = jvpp-core/jvpp_core.c jvpp-core/jvpp_core_gen.h
-libjvpp_core_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
-	              -lpthread -lm -lrt -ljvpp_common
-libjvpp_core_la_LDFLAGS = -module
-libjvpp_core_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-
-jarfile_jvpp_core = jvpp-core-$(PACKAGE_VERSION).jar
-packagedir_jvpp_core = io/fd/vpp/jvpp/core
-
-BUILT_SOURCES += jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h
-
-JSON_FILES = \
-	$(wildcard $(prefix)/../vpp/share/vpp/api/core/*.api.json)
-
-jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h:		\
-    jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h	\
-    $(JSON_FILES)
-	cp -rf @srcdir@/jvpp-core/* -t jvpp-core/
-	mkdir -p jvpp-core/target
-	cd jvpp-core \
-		&& mkdir -p types dto future callfacade callback notification \
-		&& @srcdir@/jvpp/gen/jvpp_gen.py  --plugin_name core \
-		    -i $(JSON_FILES) \
-		&& cp -rf types dto future callfacade callback notification *.java -t $(packagedir_jvpp_core) \
-		&& rm -rf types dto future callfacade callback notification *.java
-
-	$(JAVAC) -classpath jvpp-registry/target -d jvpp-core/target jvpp-core/$(packagedir_jvpp_core)/*.java \
-		jvpp-core/$(packagedir_jvpp_core)/types/*.java \
-		jvpp-core/$(packagedir_jvpp_core)/dto/*.java \
-		jvpp-core/$(packagedir_jvpp_core)/callback/*.java \
-		jvpp-core/$(packagedir_jvpp_core)/notification/*.java \
-		jvpp-core/$(packagedir_jvpp_core)/future/*.java 	\
-		jvpp-core/$(packagedir_jvpp_core)/callfacade/*.java 	\
-		jvpp-core/$(packagedir_jvpp_core)/test/*.java 	\
-		|| (echo "jvpp-core compilation failed: $$?"; exit 1)
-	$(JAVAH) -force -classpath jvpp-registry/target:jvpp-core/target -d jvpp-core io.fd.vpp.jvpp.core.JVppCoreImpl
-
-$(jarfile_jvpp_core): libjvpp_core.la
-	cp .libs/libjvpp_core.so.0.0.0 jvpp-core/target
-	$(JAR) cf $(JARFLAGS) $@ -C jvpp-core/target .
-
-all-local: $(jarfile_jvpp_registry) $(jarfile_jvpp_core)
diff --git a/vpp-api/java/Readme.txt b/vpp-api/java/Readme.txt
deleted file mode 100644
index 689b9b37..00000000
--- a/vpp-api/java/Readme.txt
+++ /dev/null
@@ -1,236 +0,0 @@
-= JVpp
-
-JVpp is JNI based Java API for VPP.
-
-== Features
-It is:
-
-* Asynchronous
-* Fully generated
-* Lightweight
-
-== Architecture
-
-=== Plugin support
-
-  /-------------\        /--------------\          /---------------\
-  | JvppPlugin1 +<-------+ JVppRegistry +--------->+ VppConnection |
-  \-------------/  inits \--+-----------/   uses   \---------------/
-                            |
-  /-------------\           |
-  | JvppPlugin2 +<----------+ inits
-  \-------------/           |
-                            |
-  ...                       |
-                            |
-  /----------\              |
-  | JVppCore +<-------------+
-  \----------/
-
-
-VppRegistry opens connection to vpp (VppConnection) and manages jvpp plugins.
-Each plugin needs to be registered in the VppRegistry. Registration involves
-plugin initialization (providing JNI implementation with JVppCallback reference,
-vpp client identifier and vpp shared memory queue address).
-
-API user sends message by calling a method of appropriate plugin interface.
-The call is delegated to JNI implementation provided by the particular plugin.
-When JNI code receives reply, it invokes callback method of JVppCallback
-that corresponds to the received message reply.
-
-=== JVppCore as an example of JVpp plugin architecture
-
- JVpp Java
-
-  /--------------\             /----------\          /------------\    /------\
-  | JVppRegistry |             | JVppCore |          |  Callbacks |    | DTOs |
-  \----+---------/             \----+-----/          \------+-----/    \------/
-       ^                            ^                       ^
-       | implements                 | implements            | implements
-  /----+--------------\         /---+----------\      /-----+---------\
-  | JVppRegistryImpl* +-------->+ JVppCoreImpl |      |  JVppCallback |
-  \-------+-----------/  inits  \---+----------/      \-------+-------/
-          |                          |                       ^
-          |                          | uses                  | calls back
-          |                          |                       |
-----------|--------------------------|-----------------------|---------------------
-          |                          |                       |
- C JNI    |                          +-------------------+   |       /-----------------\
-          v                                              |   |   +-->+ jvpp_core_gen.h |
-  /--------+--------\                                    |   |   |   \-----------------/
-  | jpp_registry.c* +---+   /--------+----+----\         |   |   |
-  \-----------------/   |   | << shared lib >> |        /-+--+---+------\
-                        + ->+   jvpp_common*   <--------+  jvpp_core.c* |
-                      uses  \------------------/  uses  \---------------/
-
-
-* Components marked with an asterisk contain manually crafted code, which in addition
-to generated classes form jvpp. Exception applies to Callbacks and DTOs, since there are
-manually crafted marker interfaces in callback and dto package (dto/JVppRequest, dto/JVppReply,
-dto/JVppDump, dto/JVppReplyDump, callback/JVppCallback)
-
-Note: jvpp_core.c calls back the JVppCallback instance with every response. An instance of the
-JVppCallback is provided to jvpp_core.c by JVppRegistryImpl on JVppCoreImpl initialization.
-
-Part of the JVpp is also Future facade. It is asynchronous API returning Future objects
-on top of low level JVpp. It wraps dump reply messages in one DTO using control_ping message
-(provided by JVppRegistry).
-
-
-Future facade
-
-        /----------------\          /---------------\
-        | FutureJVppCore |      +-->+ JVppRegistry* |
-        \-----+----------/      |   \---------------/
-              ^                 |
-              | implements      | uses
-              |                 |
-     /--------+-------------\   |    /------------------------------\
-     | FutureJVppCoreFacade +---+--->+ FutureJVppCoreFacadeCallback |
-     \---------+------------/  uses  \-------+----------------------/
-               |                             |
----------------|-----------------------------|-------------------------------
-               | uses                        | implements
-JVpp Java      |                             |
-               |                             |
- /----------\  |                             |
- | JVppCore +<-+                             |
- \----+-----/                                |
-      ^                                      |
-      | implements                           v
- /----+---------\                   /--------+---------------\
- | JVppCoreImpl |                   | JVppCoreGlobalCallback |
- \--------------/                   \------------------------/
-
-
-
-Another useful utility of the JVpp is Callback facade. It is asynchronous API
-capable of calling specific callback instance (provided when performing a call)
-per call.
-
-
-Callback facade
-
-        /------------------\          /---------------\
-        | CallbackJVppCore |      +-->+ JVppRegistry* |
-        \-----+------------/      |   \---------------/
-              ^                   |
-              | implements        | uses
-              |                   |
-     /--------+---------------\   |    /--------------------------\
-     | CallbackJVppCoreFacade +---+--->+ CallbackJVppCoreCallback |
-     \---------+--------------/  uses  \-----+--------------------/
-               |                             |
----------------|-----------------------------|-------------------------------
-               | uses                        | implements
-JVpp Java      |                             |
-               |                             |
- /----------\  |                             |
- | JVppCore +<-+                             |
- \----+-----/                                |
-      ^                                      |
-      | implements                           v
- /----+---------\                   /----------+-------------\
- | JVppCoreImpl |                   | JVppCoreGlobalCallback |
- \--------------/                   \------------------------/
-
-
-== Package structure
-
-* *io.fd.vpp.jvpp* - top level package for generated JVpp interface+ implementation and hand-crafted
-VppConnection interface + implementation - packaged as jvpp-registry-version.jar
-
-* *io.fd.vpp.jvpp.[plugin]* - top level package for generated JVpp interface + implementation
-+ plugin's API tests - packaged as jvpp-[plugin]-version.jar
-
-** *dto* - package for DTOs generated from VPP API structures + base/marker hand-crafted interfaces
-(in case of jvpp-registry)
-** *callback* - package for low-level JVpp callbacks and a global callback interface implementing each of
-the low-level JVppcallbacks
-** *future* - package for future based facade on top of JVpp and callbacks
-** *callfacade* - package for callback based facade on top of JVpp and callbacks. Allowing
-users to provide callback per request
-** *test* - package for JVpp standalone tests. Can also serve as samples for JVpp.
-
-C code is structured into modules:
-
-* *jvpp_common* - shared library that provides jvpp_main_t reference used by jvpp_registry and plugins.
-
-* *jvpp_registry* - native library used by JVppRegistryImpl, responsible for:
-
-** VPP connection open/close
-** Rx thread to java thread attach
-** control ping message handling
-
-* *jvpp_core* - native library used by jvpp core plugin:
-** *jvpp_core.c* - contains hand crafted code for core plugin initialization
-** *jvpp_core_gen.h* - contains generated JNI compatible handlers for all requests and replies defined in vpe.api
-
-== Code generators
-All of the required code except the base/marker interfaces is generated using
-simple python2 code generators. The generators use __defs_vpp_papi.py__ input
-file produced by __vppapigen__ from vpe.api file.
-
-=== JNI compatible C code
-Produces __jvpp_[plugin]_gen.h__ file containing JNI compatible handlers for each VPP
-request and reply.
-
-[NOTE]
-====
-Source: jvpp_c_gen.py
-====
-
-=== Request/Reply DTOs
-For all the structures in __defs_vpp_papi.py__ a POJO DTO is produced. Logically,
-there are 4 types of DTOs:
-
-* Request - requests that can be sent to VPP and only a single response is expected
-* DumpRequest - requests that can be sent to VPP and a stream of responses is expected
-* Reply - reply to a simple request or a single response from dump triggered response stream
-* ReplyDump - collection of replies from a single dump request
-* Notifications/Events - Not implemented yet
-
-[NOTE]
-====
-Source: dto_gen.py
-====
-
-=== JVpp
-Produces __JVpp.java__ and __JVppImpl.java__. This is the layer right above JNI compatible C
-code.
-
-[NOTE]
-====
-Source: jvpp_impl_gen.py
-====
-
-=== Callbacks
-Produces callback interface for each VPP reply + a global callback interface called
-__JVpp[plugin]GlobalCallback.java__ aggregating all of the callback interfaces. The JNI
-compatible C code expects only a single instance of this global callback and calls
-it with every reply.
-
-[NOTE]
-====
-Source: callback_gen.py
-====
-
-=== Future facade
-Produces an asynchronous facade on top of JVpp and callbacks, which returns a Future that provides
-matching reply once VPP invocation finishes. Sources produced:
-__FutureJVpp[plugin].java, FutureJVpp[plugin]Facade.java and FutureJVpp[plugin]Callback.java__
-
-[NOTE]
-====
-Source: jvpp_future_facade_gen.py
-====
-
-=== Callback facade
-Similar to future facade, only this facade takes callback objects as part of the invocation
-and the callback is called with result once VPP invocation finishes. Sources produced:
-__CallbackJVpp[plugin].java, CallbackJVpp[plugin]Facade.java and CallbackJVpp[plugin]Callback.java__
-
-[NOTE]
-====
-Source: jvpp_callback_facade_gen.py
-====
diff --git a/vpp-api/java/configure.ac b/vpp-api/java/configure.ac
deleted file mode 100644
index 3082781e..00000000
--- a/vpp-api/java/configure.ac
+++ /dev/null
@@ -1,24 +0,0 @@
-AC_INIT(jvpp, 17.04)
-LT_INIT
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-
-if test -f /usr/bin/lsb_release  && test `lsb_release -si` == "Ubuntu"  && test `lsb_release -sr` == "14.04"  && test -d /usr/lib/jvm/java-8-openjdk-amd64/ ; then
-    JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
-    JAVAC=${JAVA_HOME}/bin/javac
-    PATH=${JAVA_HOME}/bin/:${PATH}
-    break
-fi
-
-AX_CHECK_JAVA_HOME
-AX_PROG_JAVAC
-AX_PROG_JAVAH
-AX_PROG_JAR
-AX_PROG_JAVADOC
-AX_PROG_JAVA
-
-AC_OUTPUT([Makefile])
-
diff --git a/vpp-api/java/jvpp-common/jvpp_common.c b/vpp-api/java/jvpp-common/jvpp_common.c
deleted file mode 100644
index a161c09c..00000000
--- a/vpp-api/java/jvpp-common/jvpp_common.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#define _GNU_SOURCE /* for strcasestr(3) */
-
-#include "jvpp_common.h"
-
-#ifndef JVPP_DEBUG
-#define JVPP_DEBUG 0
-#endif
-
-#if JVPP_DEBUG == 1
-#define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
-#else
-#define DEBUG_LOG(...)
-#endif
-
-/* shared jvpp main structure */
-jvpp_main_t jvpp_main __attribute__((aligned (64)));
-
-void call_on_error(const char* callName, int contextId, int retval,
-        jclass callbackClass, jobject callbackObject,
-        jclass callbackExceptionClass) {
-    DEBUG_LOG("\nCallOnError : callback=%s, retval=%d, context=%d\n", callName,
-            clib_net_to_host_u32(retval), clib_net_to_host_u32(context));
-    JNIEnv *env = jvpp_main.jenv;
-    if (!callbackClass) {
-        DEBUG_LOG("CallOnError : jm->callbackClass is null!\n");
-        return;
-    }
-    jmethodID excConstructor = (*env)->GetMethodID(env, callbackExceptionClass,
-            "<init>", "(Ljava/lang/String;II)V");
-    if (!excConstructor) {
-        DEBUG_LOG("CallOnError : excConstructor is null!\n");
-        return;
-    }
-    jmethodID callbackExcMethod = (*env)->GetMethodID(env, callbackClass,
-            "onError", "(Lio/fd/vpp/jvpp/VppCallbackException;)V");
-    if (!callbackExcMethod) {
-        DEBUG_LOG("CallOnError : callbackExcMethod is null!\n");
-        return;
-    }
-
-    jobject excObject = (*env)->NewObject(env, callbackExceptionClass,
-            excConstructor, (*env)->NewStringUTF(env, callName),
-            clib_net_to_host_u32(contextId), clib_net_to_host_u32(retval));
-    if (!excObject) {
-        DEBUG_LOG("CallOnError : excObject is null!\n");
-        return;
-    }
-
-    (*env)->CallVoidMethod(env, callbackObject, callbackExcMethod, excObject);
-    DEBUG_LOG("CallOnError : Response sent\n");
-}
diff --git a/vpp-api/java/jvpp-common/jvpp_common.h b/vpp-api/java/jvpp-common/jvpp_common.h
deleted file mode 100644
index bbb203ed..00000000
--- a/vpp-api/java/jvpp-common/jvpp_common.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef __included_jvpp_common_h__
-#define __included_jvpp_common_h__
-//
-#include <vppinfra/types.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <jni.h>
-
-typedef struct {
-    /* Unique identifier used for matching replays with requests  */
-    volatile u32 context_id;
-
-    /* Spinlock */
-    volatile u32 lock;
-    u32 tag;
-
-    /* JNI Native Method Interface pointer for message handlers */
-    JNIEnv *jenv;
-
-    /* JNI Invoke Interface pointer for attachment of rx thread to java thread */
-    JavaVM *jvm;
-
-    /* Convenience */
-    unix_shared_memory_queue_t * vl_input_queue;
-    u32 my_client_index;
-} jvpp_main_t;
-
-extern jvpp_main_t jvpp_main __attribute__((aligned (64)));
-
-static_always_inline u32 vppjni_get_context_id(jvpp_main_t * jm) {
-    return __sync_add_and_fetch(&jm->context_id, 1);
-}
-
-static_always_inline void vppjni_lock(jvpp_main_t * jm, u32 tag) {
-    while (__sync_lock_test_and_set(&jm->lock, 1))
-        ;
-    jm->tag = tag;
-}
-
-static_always_inline void vppjni_unlock(jvpp_main_t * jm) {
-    jm->tag = 0;
-    CLIB_MEMORY_BARRIER();
-    jm->lock = 0;
-}
-
-/**
- * Calls onError callback on callbackObject reference. Passes instance of callbackExceptionClass as parameter.
- */
-void call_on_error(const char* callName, int contextId, int retval,
-        jclass callbackClass, jobject callbackObject,
-        jclass callbackExceptionClass);
-
-#endif /* __included_jvpp_common_h__ */
diff --git a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java
deleted file mode 100644
index 986993b8..00000000
--- a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.core.test;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.GetNodeIndexCallback;
-import io.fd.vpp.jvpp.core.callback.ShowVersionCallback;
-import io.fd.vpp.jvpp.core.callback.SwInterfaceCallback;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
-import io.fd.vpp.jvpp.core.dto.ShowVersion;
-import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
-
-public class CallbackApiTest {
-
-    public static void main(String[] args) throws Exception {
-        testCallbackApi();
-    }
-
-    private static void testCallbackApi() throws Exception {
-        System.out.println("Testing Java callback API with JVppRegistry");
-        try (final JVppRegistry registry = new JVppRegistryImpl("CallbackApiTest");
-             final JVpp jvpp = new JVppCoreImpl()) {
-            registry.register(jvpp, new TestCallback());
-
-            System.out.println("Sending ShowVersion request...");
-            final int result = jvpp.send(new ShowVersion());
-            System.out.printf("ShowVersion send result = %d%n", result);
-
-            System.out.println("Sending GetNodeIndex request...");
-            GetNodeIndex getNodeIndexRequest = new GetNodeIndex();
-            getNodeIndexRequest.nodeName = "non-existing-node".getBytes();
-            jvpp.send(getNodeIndexRequest);
-
-            System.out.println("Sending SwInterfaceDump request...");
-            SwInterfaceDump swInterfaceDumpRequest = new SwInterfaceDump();
-            swInterfaceDumpRequest.nameFilterValid = 0;
-            swInterfaceDumpRequest.nameFilter = "".getBytes();
-            jvpp.send(swInterfaceDumpRequest);
-
-            Thread.sleep(1000);
-            System.out.println("Disconnecting...");
-        }
-        Thread.sleep(1000);
-    }
-
-    static class TestCallback implements GetNodeIndexCallback, ShowVersionCallback, SwInterfaceCallback {
-
-        @Override
-        public void onGetNodeIndexReply(final GetNodeIndexReply msg) {
-            System.out.printf("Received GetNodeIndexReply: %s%n", msg);
-        }
-
-        @Override
-        public void onShowVersionReply(final ShowVersionReply msg) {
-            System.out.printf("Received ShowVersionReply: context=%d, program=%s, version=%s, "
-                    + "buildDate=%s, buildDirectory=%s%n",
-                msg.context, new String(msg.program), new String(msg.version),
-                new String(msg.buildDate), new String(msg.buildDirectory));
-        }
-
-        @Override
-        public void onSwInterfaceDetails(final SwInterfaceDetails msg) {
-            System.out.printf("Received SwInterfaceDetails: interfaceName=%s, l2AddressLength=%d, adminUpDown=%d, "
-                    + "linkUpDown=%d, linkSpeed=%d, linkMtu=%d%n",
-                new String(msg.interfaceName), msg.l2AddressLength, msg.adminUpDown,
-                msg.linkUpDown, msg.linkSpeed, (int) msg.linkMtu);
-        }
-
-        @Override
-        public void onError(VppCallbackException ex) {
-            System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n", ex.getMethodName(),
-                ex.getCtxId(), ex.getErrorCode());
-        }
-    }
-}
diff --git a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeNotificationTest.java b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeNotificationTest.java
deleted file mode 100644
index d84cb034..00000000
--- a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeNotificationTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.core.test;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCore;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.WantInterfaceEventsCallback;
-import io.fd.vpp.jvpp.core.callfacade.CallbackJVppCoreFacade;
-import io.fd.vpp.jvpp.core.dto.WantInterfaceEventsReply;
-
-public class CallbackJVppFacadeNotificationTest {
-
-    private static void testCallbackFacade() throws Exception {
-        System.out.println("Testing CallbackJVppFacade for notifications");
-
-        try (final JVppRegistry registry = new JVppRegistryImpl("CallbackFacadeTest");
-             final JVppCore jvpp = new JVppCoreImpl()) {
-            final CallbackJVppCoreFacade jvppCallbackFacade = new CallbackJVppCoreFacade(registry, jvpp);
-            System.out.println("Successfully connected to VPP");
-
-            final AutoCloseable notificationListenerReg =
-                jvppCallbackFacade.getNotificationRegistry().registerSwInterfaceSetFlagsNotificationCallback(
-                    NotificationUtils::printNotification
-                );
-
-            jvppCallbackFacade.wantInterfaceEvents(NotificationUtils.getEnableInterfaceNotificationsReq(),
-                new WantInterfaceEventsCallback() {
-                    @Override
-                    public void onWantInterfaceEventsReply(final WantInterfaceEventsReply reply) {
-                        System.out.println("Interface events started");
-                    }
-
-                    @Override
-                    public void onError(final VppCallbackException ex) {
-                        System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n",
-                            ex.getMethodName(), ex.getCtxId(), ex.getErrorCode());
-                    }
-                });
-
-            System.out.println("Changing interface configuration");
-            NotificationUtils.getChangeInterfaceState().send(jvpp);
-
-            Thread.sleep(1000);
-
-            jvppCallbackFacade.wantInterfaceEvents(NotificationUtils.getDisableInterfaceNotificationsReq(),
-                new WantInterfaceEventsCallback() {
-                    @Override
-                    public void onWantInterfaceEventsReply(final WantInterfaceEventsReply reply) {
-                        System.out.println("Interface events stopped");
-                    }
-
-                    @Override
-                    public void onError(final VppCallbackException ex) {
-                        System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n",
-                            ex.getMethodName(), ex.getCtxId(), ex.getErrorCode());
-                    }
-                });
-
-            notificationListenerReg.close();
-
-            Thread.sleep(2000);
-            System.out.println("Disconnecting...");
-        }
-        Thread.sleep(1000);
-    }
-
-    public static void main(String[] args) throws Exception {
-        testCallbackFacade();
-    }
-}
diff --git a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeTest.java b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeTest.java
deleted file mode 100644
index 9f7cb8de..00000000
--- a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.core.test;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.GetNodeIndexCallback;
-import io.fd.vpp.jvpp.core.callback.ShowVersionCallback;
-import io.fd.vpp.jvpp.core.callfacade.CallbackJVppCoreFacade;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
-import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
-
-/**
- * CallbackJVppFacade together with CallbackJVppFacadeCallback allow for setting different callback for each request.
- * This is more convenient than the approach shown in CallbackApiTest.
- */
-public class CallbackJVppFacadeTest {
-
-    private static ShowVersionCallback showVersionCallback1 = new ShowVersionCallback() {
-        @Override
-        public void onShowVersionReply(final ShowVersionReply msg) {
-            System.out.printf("ShowVersionCallback1 received ShowVersionReply: context=%d, program=%s,"
-                    + "version=%s, buildDate=%s, buildDirectory=%s%n", msg.context, new String(msg.program),
-                new String(msg.version), new String(msg.buildDate), new String(msg.buildDirectory));
-        }
-
-        @Override
-        public void onError(VppCallbackException ex) {
-            System.out.printf("Received onError exception in showVersionCallback1: call=%s, reply=%d, context=%d%n",
-                ex.getMethodName(), ex.getErrorCode(), ex.getCtxId());
-        }
-    };
-
-    private static ShowVersionCallback showVersionCallback2 = new ShowVersionCallback() {
-        @Override
-        public void onShowVersionReply(final ShowVersionReply msg) {
-            System.out.printf("ShowVersionCallback2 received ShowVersionReply: context=%d, program=%s,"
-                    + "version=%s, buildDate=%s, buildDirectory=%s%n", msg.context, new String(msg.program),
-                new String(msg.version), new String(msg.buildDate), new String(msg.buildDirectory));
-        }
-
-        @Override
-        public void onError(VppCallbackException ex) {
-            System.out.printf("Received onError exception in showVersionCallback2: call=%s, reply=%d, context=%d%n",
-                ex.getMethodName(), ex.getErrorCode(), ex.getCtxId());
-        }
-
-    };
-
-    private static GetNodeIndexCallback getNodeIndexCallback = new GetNodeIndexCallback() {
-        @Override
-        public void onGetNodeIndexReply(final GetNodeIndexReply msg) {
-            System.out.printf("Received GetNodeIndexReply: %s%n", msg);
-        }
-
-        @Override
-        public void onError(VppCallbackException ex) {
-            System.out.printf("Received onError exception in getNodeIndexCallback: call=%s, reply=%d, context=%d%n",
-                ex.getMethodName(), ex.getErrorCode(), ex.getCtxId());
-        }
-    };
-
-    private static void testCallbackFacade() throws Exception {
-        System.out.println("Testing CallbackJVppFacade");
-
-        try (final JVppRegistry registry = new JVppRegistryImpl("CallbackFacadeTest");
-             final CallbackJVppCoreFacade callbackFacade = new CallbackJVppCoreFacade(registry, new JVppCoreImpl())) {
-            System.out.println("Successfully connected to VPP");
-
-            callbackFacade.showVersion(showVersionCallback1);
-            callbackFacade.showVersion(showVersionCallback2);
-
-            GetNodeIndex getNodeIndexRequest = new GetNodeIndex();
-            getNodeIndexRequest.nodeName = "dummyNode".getBytes();
-            callbackFacade.getNodeIndex(getNodeIndexRequest, getNodeIndexCallback);
-
-            Thread.sleep(2000);
-            System.out.println("Disconnecting...");
-        }
-        Thread.sleep(1000);
-    }
-
-    public static void main(String[] args) throws Exception {
-        testCallbackFacade();
-    }
-}
diff --git a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackNotificationApiTest.java b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackNotificationApiTest.java
deleted file mode 100644
index a9f71f11..00000000
--- a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackNotificationApiTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.core.test;
-
-import static io.fd.vpp.jvpp.core.test.NotificationUtils.getChangeInterfaceState;
-import static io.fd.vpp.jvpp.core.test.NotificationUtils.getDisableInterfaceNotificationsReq;
-import static io.fd.vpp.jvpp.core.test.NotificationUtils.getEnableInterfaceNotificationsReq;
-import static io.fd.vpp.jvpp.core.test.NotificationUtils.printNotification;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.SwInterfaceSetFlagsCallback;
-import io.fd.vpp.jvpp.core.callback.SwInterfaceSetFlagsNotificationCallback;
-import io.fd.vpp.jvpp.core.callback.WantInterfaceEventsCallback;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsNotification;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsReply;
-import io.fd.vpp.jvpp.core.dto.WantInterfaceEventsReply;
-
-public class CallbackNotificationApiTest {
-
-    private static void testCallbackApi() throws Exception {
-        System.out.println("Testing Java callback API for notifications");
-        try (final JVppRegistry registry = new JVppRegistryImpl("CallbackNotificationTest");
-             final JVpp jvpp = new JVppCoreImpl()) {
-            registry.register(jvpp, new TestCallback());
-            System.out.println("Successfully connected to VPP");
-
-            getEnableInterfaceNotificationsReq().send(jvpp);
-            System.out.println("Interface notifications started");
-            // TODO test ifc dump which also triggers interface flags send
-
-            System.out.println("Changing interface configuration");
-            getChangeInterfaceState().send(jvpp);
-
-            // Notifications are received
-            Thread.sleep(500);
-
-            getDisableInterfaceNotificationsReq().send(jvpp);
-            System.out.println("Interface events stopped");
-
-            Thread.sleep(2000);
-            System.out.println("Disconnecting...");
-        }
-        Thread.sleep(1000);
-    }
-
-    public static void main(String[] args) throws Exception {
-        testCallbackApi();
-    }
-
-    private static class TestCallback implements SwInterfaceSetFlagsNotificationCallback,
-        WantInterfaceEventsCallback, SwInterfaceSetFlagsCallback {
-
-        @Override
-        public void onSwInterfaceSetFlagsNotification(
-            final SwInterfaceSetFlagsNotification msg) {
-            printNotification(msg);
-        }
-
-        @Override
-        public void onWantInterfaceEventsReply(final WantInterfaceEventsReply wantInterfaceEventsReply) {
-            System.out.println("Interface notification stream updated");
-        }
-
-        @Override
-        public void onSwInterfaceSetFlagsReply(final SwInterfaceSetFlagsReply swInterfaceSetFlagsReply) {
-            System.out.println("Interface flags set successfully");
-        }
-
-        @Override
-        public void onError(VppCallbackException ex) {
-            System.out.printf("Received onError exception in getNodeIndexCallback: call=%s, reply=%d, context=%d%n",
-                ex.getMethodName(), ex.getErrorCode(), ex.getCtxId());
-
-        }
-    }
-}
diff --git a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/ControlPingTest.java b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/ControlPingTest.java
deleted file mode 100644
index e97f4e3a..00000000
--- a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/ControlPingTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.core.test;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.callback.ControlPingCallback;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.dto.ControlPing;
-import io.fd.vpp.jvpp.dto.ControlPingReply;
-
-public class ControlPingTest {
-
-    private static void testControlPing() throws Exception {
-        System.out.println("Testing ControlPing using Java callback API");
-        try (JVppRegistry registry = new JVppRegistryImpl("ControlPingTest");
-             JVpp jvpp = new JVppCoreImpl()) {
-
-            registry.register(jvpp, new ControlPingCallback() {
-                @Override
-                public void onControlPingReply(final ControlPingReply reply) {
-                    System.out.printf("Received ControlPingReply: %s%n", reply);
-                }
-
-                @Override
-                public void onError(VppCallbackException ex) {
-                    System.out.printf("Received onError exception: call=%s, reply=%d, context=%d ", ex.getMethodName(),
-                        ex.getErrorCode(), ex.getCtxId());
-                }
-
-            });
-            System.out.println("Successfully connected to VPP");
-            Thread.sleep(1000);
-
-            System.out.println("Sending control ping using JVppRegistry");
-            registry.controlPing(jvpp.getClass());
-
-            Thread.sleep(2000);
-
-            System.out.println("Sending control ping using JVpp plugin");
-            jvpp.send(new ControlPing());
-
-            Thread.sleep(2000);
-            System.out.println("Disconnecting...");
-        }
-        Thread.sleep(1000);
-    }
-
-    public static void main(String[] args) throws Exception {
-        testControlPing();
-    }
-}
diff --git a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CreateSubInterfaceTest.java b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CreateSubInterfaceTest.java
deleted file mode 100644
index a96258f4..00000000
--- a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CreateSubInterfaceTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.core.test;
-
-import static java.util.Objects.requireNonNull;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.CreateSubif;
-import io.fd.vpp.jvpp.core.dto.CreateSubifReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
-
-/**
- * <p>Tests sub-interface creation.<br> Equivalent to:<br>
- *
- * <pre>{@code
- * vppctl create sub GigabitEthernet0/9/0 1 dot1q 100 inner-dot1q any
- * }
- * </pre>
- *
- * To verify invoke:<br>
- * <pre>{@code
- * vpp_api_test json
- * vat# sw_interface_dump
- * }
- */
-public class CreateSubInterfaceTest {
-
-    private static SwInterfaceDump createSwInterfaceDumpRequest(final String ifaceName) {
-        SwInterfaceDump request = new SwInterfaceDump();
-        request.nameFilter = ifaceName.getBytes();
-        request.nameFilterValid = 1;
-        return request;
-    }
-
-    private static void requireSingleIface(final SwInterfaceDetailsReplyDump response, final String ifaceName) {
-        if (response.swInterfaceDetails.size() != 1) {
-            throw new IllegalStateException(
-                String.format("Expected one interface matching filter %s but was %d", ifaceName,
-                    response.swInterfaceDetails.size()));
-        }
-    }
-
-    private static CreateSubif createSubifRequest(final int swIfIndex, final int subId) {
-        CreateSubif request = new CreateSubif();
-        request.swIfIndex = swIfIndex; // super interface id
-        request.subId = subId;
-        request.noTags = 0;
-        request.oneTag = 0;
-        request.twoTags = 1;
-        request.dot1Ad = 0;
-        request.exactMatch = 1;
-        request.defaultSub = 0;
-        request.outerVlanIdAny = 0;
-        request.innerVlanIdAny = 1;
-        request.outerVlanId = 100;
-        request.innerVlanId = 0;
-        return request;
-    }
-
-    private static void print(CreateSubifReply reply) {
-        System.out.printf("CreateSubifReply: %s%n", reply);
-    }
-
-    private static void testCreateSubInterface() throws Exception {
-        System.out.println("Testing sub-interface creation using Java callback API");
-        try (final JVppRegistry registry = new JVppRegistryImpl("CreateSubInterface");
-             final FutureJVppCoreFacade jvppFacade = new FutureJVppCoreFacade(registry, new JVppCoreImpl())) {
-            System.out.println("Successfully connected to VPP");
-            Thread.sleep(1000);
-
-            final String ifaceName = "GigabitEthernet0/8/0";
-
-            final SwInterfaceDetailsReplyDump swInterfaceDetails =
-                jvppFacade.swInterfaceDump(createSwInterfaceDumpRequest(ifaceName)).toCompletableFuture().get();
-
-            requireNonNull(swInterfaceDetails, "swInterfaceDump returned null");
-            requireNonNull(swInterfaceDetails.swInterfaceDetails, "swInterfaceDetails is null");
-            requireSingleIface(swInterfaceDetails, ifaceName);
-
-            final int swIfIndex = swInterfaceDetails.swInterfaceDetails.get(0).swIfIndex;
-            final int subId = 1;
-
-            final CreateSubifReply createSubifReply =
-                jvppFacade.createSubif(createSubifRequest(swIfIndex, subId)).toCompletableFuture().get();
-            print(createSubifReply);
-
-            final String subIfaceName = "GigabitEthernet0/8/0." + subId;
-            final SwInterfaceDetailsReplyDump subIface =
-                jvppFacade.swInterfaceDump(createSwInterfaceDumpRequest(subIfaceName)).toCompletableFuture().get();
-            requireNonNull(swInterfaceDetails, "swInterfaceDump returned null");
-            requireNonNull(subIface.swInterfaceDetails, "swInterfaceDump returned null");
-            requireSingleIface(swInterfaceDetails, ifaceName);
-
-            System.out.println("Disconnecting...");
-        }
-        Thread.sleep(1000);
-    }
-
-    public static void main(String[] args) throws Exception {
-        testCreateSubInterface();
-    }
-}
diff --git a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiNotificationTest.java b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiNotificationTest.java
deleted file mode 100644
index 9efeae19..00000000
--- a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiNotificationTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.core.test;
-
-import static io.fd.vpp.jvpp.core.test.NotificationUtils.getChangeInterfaceState;
-import static io.fd.vpp.jvpp.core.test.NotificationUtils.getDisableInterfaceNotificationsReq;
-import static io.fd.vpp.jvpp.core.test.NotificationUtils.getEnableInterfaceNotificationsReq;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
-
-public class FutureApiNotificationTest {
-
-    private static void testFutureApi() throws Exception {
-        System.out.println("Testing Java future API for notifications");
-        try (final JVppRegistry registry = new JVppRegistryImpl("FutureApiNotificationTest");
-             final FutureJVppCoreFacade jvppFacade = new FutureJVppCoreFacade(registry, new JVppCoreImpl());
-             final AutoCloseable notificationListenerReg =
-                 jvppFacade.getNotificationRegistry()
-                     .registerSwInterfaceSetFlagsNotificationCallback(NotificationUtils::printNotification)) {
-            System.out.println("Successfully connected to VPP");
-            jvppFacade.wantInterfaceEvents(getEnableInterfaceNotificationsReq()).toCompletableFuture().get();
-            System.out.println("Interface events started");
-
-            System.out.println("Changing interface configuration");
-            jvppFacade.swInterfaceSetFlags(getChangeInterfaceState()).toCompletableFuture().get();
-
-            Thread.sleep(1000);
-
-            jvppFacade.wantInterfaceEvents(getDisableInterfaceNotificationsReq()).toCompletableFuture().get();
-            System.out.println("Interface events stopped");
-            System.out.println("Disconnecting...");
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        testFutureApi();
-    }
-}
diff --git a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java
deleted file mode 100644
index f478bab4..00000000
--- a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.core.test;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.BridgeDomainDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.BridgeDomainDump;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
-import io.fd.vpp.jvpp.core.dto.ShowVersion;
-import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Future;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class FutureApiTest {
-
-    private static final Logger LOG = Logger.getLogger(FutureApiTest.class.getName());
-
-    private static void testShowVersion(final FutureJVppCoreFacade jvpp) throws Exception {
-        LOG.info("Sending ShowVersion request...");
-        final Future<ShowVersionReply> replyFuture = jvpp.showVersion(new ShowVersion()).toCompletableFuture();
-        final ShowVersionReply reply = replyFuture.get();
-        LOG.info(
-            String.format(
-                "Received ShowVersionReply: context=%d, program=%s, version=%s, buildDate=%s, buildDirectory=%s%n",
-                reply.context, new String(reply.program), new String(reply.version), new String(reply.buildDate),
-                new String(reply.buildDirectory)));
-    }
-
-    private static void testEmptyBridgeDomainDump(final FutureJVppCoreFacade jvpp) throws Exception {
-        LOG.info("Sending ShowVersion request...");
-        final BridgeDomainDump request = new BridgeDomainDump();
-        request.bdId = -1; // dump call
-
-        final CompletableFuture<BridgeDomainDetailsReplyDump>
-            replyFuture = jvpp.bridgeDomainDump(request).toCompletableFuture();
-        final BridgeDomainDetailsReplyDump reply = replyFuture.get();
-
-        if (reply == null || reply.bridgeDomainDetails == null) {
-            LOG.severe("Received null response for empty dump: " + reply);
-        } else {
-            LOG.info(
-                String.format(
-                    "Received empty bridge-domain dump reply with list of bridge-domains: %s, %s",
-                    reply.bridgeDomainDetails, reply.bridgeDomainSwIfDetails));
-        }
-    }
-
-    private static void testGetNodeIndex(final FutureJVppCoreFacade jvpp) {
-        LOG.info("Sending GetNodeIndex request...");
-        final GetNodeIndex request = new GetNodeIndex();
-        request.nodeName = "non-existing-node".getBytes();
-        final Future<GetNodeIndexReply> replyFuture = jvpp.getNodeIndex(request).toCompletableFuture();
-        try {
-            final GetNodeIndexReply reply = replyFuture.get();
-            LOG.info(
-                String.format(
-                    "Received GetNodeIndexReply: context=%d, nodeIndex=%d%n", reply.context, reply.nodeIndex));
-        } catch (Exception e) {
-            LOG.log(Level.SEVERE, "GetNodeIndex request failed", e);
-        }
-    }
-
-    private static void testSwInterfaceDump(final FutureJVppCoreFacade jvpp) throws Exception {
-        LOG.info("Sending SwInterfaceDump request...");
-        final SwInterfaceDump request = new SwInterfaceDump();
-        request.nameFilterValid = 0;
-        request.nameFilter = "".getBytes();
-
-        final Future<SwInterfaceDetailsReplyDump> replyFuture = jvpp.swInterfaceDump(request).toCompletableFuture();
-        final SwInterfaceDetailsReplyDump reply = replyFuture.get();
-        for (SwInterfaceDetails details : reply.swInterfaceDetails) {
-            Objects.requireNonNull(details, "reply.swInterfaceDetails contains null element!");
-            LOG.info(
-                String.format("Received SwInterfaceDetails: interfaceName=%s, l2AddressLength=%d, adminUpDown=%d, "
-                        + "linkUpDown=%d, linkSpeed=%d, linkMtu=%d%n",
-                    new String(details.interfaceName), details.l2AddressLength, details.adminUpDown,
-                    details.linkUpDown, details.linkSpeed, (int) details.linkMtu));
-        }
-    }
-
-    private static void testFutureApi() throws Exception {
-        LOG.info("Testing Java future API");
-        try (final JVppRegistry registry = new JVppRegistryImpl("FutureApiTest");
-             final FutureJVppCoreFacade jvppFacade = new FutureJVppCoreFacade(registry, new JVppCoreImpl())) {
-            LOG.info("Successfully connected to VPP");
-
-            testEmptyBridgeDomainDump(jvppFacade);
-            testShowVersion(jvppFacade);
-            testGetNodeIndex(jvppFacade);
-            testSwInterfaceDump(jvppFacade);
-
-            LOG.info("Disconnecting...");
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        testFutureApi();
-    }
-}
diff --git a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/L2AclTest.java b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/L2AclTest.java
deleted file mode 100644
index 6b3fa993..00000000
--- a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/L2AclTest.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.core.test;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
-import io.fd.vpp.jvpp.core.dto.ClassifySessionDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.ClassifySessionDump;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableIds;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableIdsReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableInfo;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableInfoReply;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
-import javax.xml.bind.DatatypeConverter;
-
-/**
- * <p>Tests L2 ACL creation and read.<br> Equivalent to the following vppctl commands:<br>
- *
- * <pre>{@code
- * vppctl classify table mask l2 src
- * vppctl classify session acl-hit-next deny opaque-index 0 table-index 0 match l2 src 01:02:03:04:05:06
- * vppctl set int input acl intfc local0 l2-table 0
- * vppctl sh class table verbose
- * }
- * </pre>
- */
-public class L2AclTest {
-
-    private static final int LOCAL0_IFACE_ID = 0;
-
-    private static ClassifyAddDelTable createClassifyTable() {
-        ClassifyAddDelTable request = new ClassifyAddDelTable();
-        request.isAdd = 1;
-        request.tableIndex = ~0; // default
-        request.nbuckets = 2;
-        request.memorySize = 2 << 20;
-        request.nextTableIndex = ~0; // default
-        request.missNextIndex = ~0; // default
-        request.skipNVectors = 0;
-        request.matchNVectors = 1;
-        request.mask =
-            new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
-                (byte) 0xff, (byte) 0xff, 0x00, 0x00, 0x00, 0x00};
-        return request;
-    }
-
-    private static ClassifyTableInfo createClassifyTableInfoRequest(final int tableId) {
-        ClassifyTableInfo request = new ClassifyTableInfo();
-        request.tableId = tableId;
-        return request;
-    }
-
-    private static ClassifyAddDelSession createClassifySession(final int tableIndex) {
-        ClassifyAddDelSession request = new ClassifyAddDelSession();
-        request.isAdd = 1;
-        request.tableIndex = tableIndex;
-        request.hitNextIndex = 0; // deny
-        request.opaqueIndex = 0;
-        request.advance = 0; // default
-        // match 01:02:03:04:05:06 mac address
-        request.match =
-            new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04,
-                (byte) 0x05, (byte) 0x06, 0x00, 0x00, 0x00, 0x00};
-        return request;
-    }
-
-    private static ClassifySessionDump createClassifySessionDumpRequest(final int newTableIndex) {
-        ClassifySessionDump request = new ClassifySessionDump();
-        request.tableId = newTableIndex;
-        return request;
-    }
-
-    private static InputAclSetInterface aclSetInterface() {
-        InputAclSetInterface request = new InputAclSetInterface();
-        request.isAdd = 1;
-        request.swIfIndex = LOCAL0_IFACE_ID;
-        request.ip4TableIndex = ~0; // skip
-        request.ip6TableIndex = ~0; // skip
-        request.l2TableIndex = 0;
-        return request;
-    }
-
-    private static ClassifyTableByInterface createClassifyTableByInterfaceRequest() {
-        ClassifyTableByInterface request = new ClassifyTableByInterface();
-        request.swIfIndex = LOCAL0_IFACE_ID;
-        return request;
-    }
-
-    private static void print(ClassifyAddDelTableReply reply) {
-        System.out.printf("ClassifyAddDelTableReply: %s%n", reply);
-    }
-
-    private static void print(ClassifyTableIdsReply reply) {
-        System.out.printf("ClassifyTableIdsReply: %s%n", reply);
-    }
-
-    private static void print(final ClassifyTableInfoReply reply) {
-        System.out.println(reply);
-        if (reply != null) {
-            System.out.println("Mask hex: " + DatatypeConverter.printHexBinary(reply.mask));
-        }
-    }
-
-    private static void print(ClassifyAddDelSessionReply reply) {
-        System.out.printf("ClassifyAddDelSessionReply: context=%s%n", reply);
-    }
-
-    private static void print(final ClassifySessionDetailsReplyDump reply) {
-        System.out.println(reply);
-        reply.classifySessionDetails.forEach(detail -> {
-            System.out.println(detail);
-            System.out.println("Match hex: " + DatatypeConverter.printHexBinary(detail.match));
-        });
-    }
-
-    private static void print(final InputAclSetInterfaceReply reply) {
-        System.out.printf("InputAclSetInterfaceReply: context=%s%n", reply);
-    }
-
-    private static void print(final ClassifyTableByInterfaceReply reply) {
-        System.out.printf("ClassifyAddDelTableReply: %s%n", reply);
-    }
-
-    private static void testL2Acl() throws Exception {
-        System.out.println("Testing L2 ACLs using Java callback API");
-        try (final JVppRegistry registry = new JVppRegistryImpl("L2AclTest");
-             final FutureJVppCoreFacade jvppFacade = new FutureJVppCoreFacade(registry, new JVppCoreImpl())) {
-
-            System.out.println("Successfully connected to VPP");
-            Thread.sleep(1000);
-
-            final ClassifyAddDelTableReply classifyAddDelTableReply =
-                jvppFacade.classifyAddDelTable(createClassifyTable()).toCompletableFuture().get();
-            print(classifyAddDelTableReply);
-
-            final ClassifyTableIdsReply classifyTableIdsReply =
-                jvppFacade.classifyTableIds(new ClassifyTableIds()).toCompletableFuture().get();
-            print(classifyTableIdsReply);
-
-            final ClassifyTableInfoReply classifyTableInfoReply =
-                jvppFacade.classifyTableInfo(createClassifyTableInfoRequest(classifyAddDelTableReply.newTableIndex))
-                    .toCompletableFuture().get();
-            print(classifyTableInfoReply);
-
-            final ClassifyAddDelSessionReply classifyAddDelSessionReply =
-                jvppFacade.classifyAddDelSession(createClassifySession(classifyAddDelTableReply.newTableIndex))
-                    .toCompletableFuture().get();
-            print(classifyAddDelSessionReply);
-
-            final ClassifySessionDetailsReplyDump classifySessionDetailsReplyDump =
-                jvppFacade.classifySessionDump(createClassifySessionDumpRequest(classifyAddDelTableReply.newTableIndex))
-                    .toCompletableFuture().get();
-            print(classifySessionDetailsReplyDump);
-
-            final InputAclSetInterfaceReply inputAclSetInterfaceReply =
-                jvppFacade.inputAclSetInterface(aclSetInterface()).toCompletableFuture().get();
-            print(inputAclSetInterfaceReply);
-
-            final ClassifyTableByInterfaceReply classifyTableByInterfaceReply =
-                jvppFacade.classifyTableByInterface(createClassifyTableByInterfaceRequest()).toCompletableFuture()
-                    .get();
-            print(classifyTableByInterfaceReply);
-
-            System.out.println("Disconnecting...");
-        }
-        Thread.sleep(1000);
-    }
-
-    public static void main(String[] args) throws Exception {
-        testL2Acl();
-    }
-}
diff --git a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/LispAdjacencyTest.java b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/LispAdjacencyTest.java
deleted file mode 100644
index d7f5039b..00000000
--- a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/LispAdjacencyTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.core.test;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.LispAddDelAdjacency;
-import io.fd.vpp.jvpp.core.dto.LispAddDelLocalEid;
-import io.fd.vpp.jvpp.core.dto.LispAddDelLocatorSet;
-import io.fd.vpp.jvpp.core.dto.LispAddDelRemoteMapping;
-import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGet;
-import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGetReply;
-import io.fd.vpp.jvpp.core.dto.LispEnableDisable;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.ExecutionException;
-import java.util.logging.Logger;
-
-/**
- * Tests lisp adjacency creation and read (custom vpe.api type support showcase).
- */
-public class LispAdjacencyTest {
-
-    private static final Logger LOG = Logger.getLogger(LispAdjacencyTest.class.getName());
-
-    private static void enableLisp(final FutureJVppCoreFacade jvpp) throws ExecutionException, InterruptedException {
-        final LispEnableDisable request = new LispEnableDisable();
-        request.isEn = 1;
-        jvpp.lispEnableDisable(request).toCompletableFuture().get();
-        LOG.info("Lisp enabled successfully");
-    }
-
-    private static void addLocatorSet(final FutureJVppCoreFacade jvpp) throws ExecutionException, InterruptedException {
-        final LispAddDelLocatorSet request = new LispAddDelLocatorSet();
-        request.isAdd = 1;
-        request.locatorSetName = "ls1".getBytes(StandardCharsets.UTF_8);
-        jvpp.lispAddDelLocatorSet(request).toCompletableFuture().get();
-        LOG.info("Locator set created successfully:" + request.toString());
-    }
-
-    private static void addLocalEid(final FutureJVppCoreFacade jvpp) throws ExecutionException, InterruptedException {
-        final LispAddDelLocalEid request = new LispAddDelLocalEid();
-        request.isAdd = 1;
-        request.locatorSetName = "ls1".getBytes(StandardCharsets.UTF_8);
-        request.eid = new byte[] {1, 2, 1, 10};
-        request.eidType = 0; // ip4
-        request.vni = 0;
-        request.prefixLen = 32;
-        jvpp.lispAddDelLocalEid(request).toCompletableFuture().get();
-        LOG.info("Local EID created successfully:" + request.toString());
-    }
-
-    private static void addRemoteMapping(final FutureJVppCoreFacade jvpp)
-        throws ExecutionException, InterruptedException {
-        final LispAddDelRemoteMapping request = new LispAddDelRemoteMapping();
-        request.isAdd = 1;
-        request.vni = 0;
-        request.eid = new byte[] {1, 2, 1, 20};
-        request.eidLen = 32;
-        request.rlocNum = 1;
-        request.rlocs = new byte[] {1, 1, 1, 1, 2, 1, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-        jvpp.lispAddDelRemoteMapping(request).toCompletableFuture().get();
-        LOG.info("Remote mapping created successfully:" + request.toString());
-    }
-
-    private static void addAdjacency(final FutureJVppCoreFacade jvpp) throws ExecutionException, InterruptedException {
-        final LispAddDelAdjacency request = new LispAddDelAdjacency();
-        request.isAdd = 1;
-        request.leid = new byte[] {1, 2, 1, 10};
-        request.leidLen = 32;
-        request.reid = new byte[] {1, 2, 1, 20};
-        request.reidLen = 32;
-        request.eidType = 0; // ip4
-        request.vni = 0;
-        jvpp.lispAddDelAdjacency(request).toCompletableFuture().get();
-        LOG.info("Lisp adjacency created successfully:" + request.toString());
-    }
-
-    private static void showAdjacencies(final FutureJVppCoreFacade jvpp)
-        throws ExecutionException, InterruptedException {
-        final LispAdjacenciesGetReply reply =
-            jvpp.lispAdjacenciesGet(new LispAdjacenciesGet()).toCompletableFuture().get();
-        LOG.info("Lisp adjacency received successfully:" + reply.toString());
-    }
-
-    private static void testAdjacency(final FutureJVppCoreFacade jvpp) throws Exception {
-        enableLisp(jvpp);
-        addLocatorSet(jvpp);
-        addLocalEid(jvpp);
-        addRemoteMapping(jvpp);
-        addAdjacency(jvpp);
-        showAdjacencies(jvpp);
-    }
-
-    private static void testFutureApi() throws Exception {
-        LOG.info("Create lisp adjacency test");
-        try (final JVppRegistry registry = new JVppRegistryImpl("LispAdjacencyTest");
-             final FutureJVppCoreFacade jvppFacade = new FutureJVppCoreFacade(registry, new JVppCoreImpl())) {
-            LOG.info("Successfully connected to VPP");
-
-            testAdjacency(jvppFacade);
-            LOG.info("Disconnecting...");
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        testFutureApi();
-    }
-}
diff --git a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/NotificationUtils.java b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/NotificationUtils.java
deleted file mode 100644
index f82946c3..00000000
--- a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/NotificationUtils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.core.test;
-
-import java.io.PrintStream;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlags;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsNotification;
-import io.fd.vpp.jvpp.core.dto.WantInterfaceEvents;
-
-final class NotificationUtils {
-
-    private NotificationUtils() {}
-
-    static PrintStream printNotification(final SwInterfaceSetFlagsNotification msg) {
-        return System.out.printf("Received interface notification: ifc: %s%n", msg);
-    }
-
-    static SwInterfaceSetFlags getChangeInterfaceState() {
-        final SwInterfaceSetFlags swInterfaceSetFlags = new SwInterfaceSetFlags();
-        swInterfaceSetFlags.swIfIndex = 0;
-        swInterfaceSetFlags.adminUpDown = 1;
-        swInterfaceSetFlags.deleted = 0;
-        return swInterfaceSetFlags;
-    }
-
-    static WantInterfaceEvents getEnableInterfaceNotificationsReq() {
-        WantInterfaceEvents wantInterfaceEvents = new WantInterfaceEvents();
-        wantInterfaceEvents.pid = 1;
-        wantInterfaceEvents.enableDisable = 1;
-        return wantInterfaceEvents;
-    }
-
-    static WantInterfaceEvents getDisableInterfaceNotificationsReq() {
-        WantInterfaceEvents wantInterfaceEvents = new WantInterfaceEvents();
-        wantInterfaceEvents.pid = 1;
-        wantInterfaceEvents.enableDisable = 0;
-        return wantInterfaceEvents;
-    }
-}
diff --git a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt
deleted file mode 100644
index 1344dc9e..00000000
--- a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-This package contains basic tests for jvpp. To run the tests:
-
-- Make sure VPP is running
-- From VPP's build-root/ folder execute:
-  - sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-17.01.jar:build-vpp-native/vpp-api/java/jvpp-core-17.01.jar io.fd.vpp.jvpp.core.test.[test name]
-
-Available tests:
-CallbackApiTest - Similar to ControlPingTest, invokes more complex calls (e.g. interface dump) using low level JVpp APIs
-CallbackJVppFacadeNotificationTest - Tests interface notifications using Callback based JVpp facade
-CallbackJVppFacadeTest - Execution of more complex calls using Callback based JVpp facade
-CallbackNotificationApiTest - Tests interface notifications using low level JVpp APIs
-ControlPingTest - Simple test executing a single control ping using low level JVpp APIs
-CreateSubInterfaceTest - Tests sub-interface creation
-FutureApiNotificationTest - Tests interface notifications using Future based JVpp facade
-FutureApiTest - Execution of more complex calls using Future based JVpp facade
-L2AclTest - Tests L2 ACL creation
-LispAdjacencyTest - Tests lisp adjacency creation and read (custom vpe.api type support showcase)
diff --git a/vpp-api/java/jvpp-core/jvpp_core.c b/vpp-api/java/jvpp-core/jvpp_core.c
deleted file mode 100644
index ef4cb8e3..00000000
--- a/vpp-api/java/jvpp-core/jvpp_core.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/vnet.h>
-
-#include <vpp/api/vpe_msg_enum.h>
-#define vl_typedefs             /* define message structures */
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_printfun
-
-#include <vnet/api_errno.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <jni.h>
-
-#include <jvpp-common/jvpp_common.h>
-
-// TODO: generate jvpp_plugin_name.c files (or at least reuse plugin's main structure)
-typedef struct {
-    /* Base message index for the jvpp-core plugin */
-    u16 msg_id_base;
-
-    /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
-
-    /* VPP api client index */
-    u32 my_client_index;
-
-    /* Callback object and class references enabling asynchronous Java calls */
-    jobject callbackObject;
-    jclass callbackClass;
-
-} core_main_t;
-
-core_main_t core_main __attribute__((aligned (64)));
-
-#include "io_fd_vpp_jvpp_core_JVppCoreImpl.h"
-#include "jvpp_core_gen.h"
-
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_core_JVppCoreImpl_init0
-(JNIEnv * env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
-    core_main_t * plugin_main = &core_main;
-    plugin_main->my_client_index = my_client_index;
-    plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
-
-    plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
-    plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
-
-    #define _(N,n)                                  \
-        vl_msg_api_set_handlers(VL_API_##N, #n,     \
-                vl_api_##n##_t_handler,             \
-                vl_noop_handler,                    \
-                vl_noop_handler,              \
-                vl_noop_handler,               \
-                sizeof(vl_api_##n##_t), 1);
-        foreach_api_reply_handler;
-    #undef _
-}
-
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_core_JVppCoreImpl_close0
-(JNIEnv *env, jclass clazz) {
-    core_main_t * plugin_main = &core_main;
-
-    // cleanup:
-    (*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
-    (*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
-
-    plugin_main->callbackClass = NULL;
-    plugin_main->callbackObject = NULL;
-}
-
-jint JNI_OnLoad(JavaVM *vm, void *reserved) {
-    JNIEnv* env;
-
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return JNI_EVERSION;
-    }
-
-    if (cache_class_references(env) != 0) {
-        clib_warning ("Failed to cache class references\n");
-        return JNI_ERR;
-    }
-
-    return JNI_VERSION_1_8;
-}
-
-void JNI_OnUnload(JavaVM *vm, void *reserved) {
-    JNIEnv* env;
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return;
-    }
-    delete_class_references(env);
-}
-
-
-
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java
deleted file mode 100644
index 55f25a7b..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp;
-
-import io.fd.vpp.jvpp.callback.JVppCallback;
-import io.fd.vpp.jvpp.dto.ControlPing;
-import io.fd.vpp.jvpp.dto.JVppRequest;
-
-/**
- * Base interface for plugin's Java API.
- */
-public interface JVpp extends AutoCloseable {
-
-    /**
-     * Sends request to vpp.
-     *
-     * @param request request to be sent
-     * @return unique identifer of message in message queue
-     * @throws VppInvocationException when message could not be sent
-     */
-    int send(final JVppRequest request) throws VppInvocationException;
-
-    /**
-     * Initializes plugin's Java API.
-     *
-     * @param registry     plugin registry
-     * @param callback     called by vpe.api message handlers
-     * @param queueAddress address of vpp shared memory queue
-     * @param clientIndex  vpp client identifier
-     */
-    void init(final JVppRegistry registry, final JVppCallback callback, final long queueAddress,
-              final int clientIndex);
-
-    /**
-     * Sends control_ping message.
-     *
-     * @param controlPing request DTO
-     * @return unique identifer of message in message queue
-     * @throws VppInvocationException when message could not be sent
-     */
-    int controlPing(final ControlPing controlPing) throws VppInvocationException;
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java
deleted file mode 100644
index 6535db02..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp;
-
-import io.fd.vpp.jvpp.callback.JVppCallback;
-
-/**
- * Manages VPP connection and stores plugin callbacks.
- */
-public interface JVppRegistry extends AutoCloseable {
-
-    /**
-     * Vpp connection managed by the registry.
-     *
-     * @return representation of vpp connection
-     */
-    VppConnection getConnection();
-
-    /**
-     * Registers callback and initializes Java API for given plugin.
-     *
-     * @param jvpp     plugin name
-     * @param callback callback provided by the plugin
-     * @throws NullPointerException     if name or callback is null
-     * @throws IllegalArgumentException if plugin was already registered
-     */
-    void register(final JVpp jvpp, final JVppCallback callback);
-
-    /**
-     * Unregisters callback for the given plugin.
-     *
-     * @param name plugin name
-     * @throws NullPointerException     if name is null
-     * @throws IllegalArgumentException if plugin was not registered
-     */
-    void unregister(final String name);
-
-    /**
-     * Returns callback registered for the plugin.
-     *
-     * @param name plugin name
-     * @return callback provided by the plugin
-     * @throws NullPointerException     if name is null
-     * @throws IllegalArgumentException if plugin was not registered
-     */
-    JVppCallback get(final String name);
-
-    /**
-     * Sends control ping. Reply handler calls callback registered for give plugin.
-     *
-     * Control ping is used for initial RX thread to Java thread attachment
-     * that takes place in the plugin's JNI lib
-     * and to wrap dump message replies in one list.
-     *
-     * VPP plugins don't have to provide special control ping, therefore
-     * it is necessary to providing control ping support in JVppRegistry.
-
-     * @param clazz identifies plugin that should receive ping callback
-     * @return unique identifier of message in message queue
-     */
-    int controlPing(final Class<? extends JVpp> clazz) throws VppInvocationException;
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java
deleted file mode 100644
index 98ef1c15..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp;
-
-import static java.util.Objects.requireNonNull;
-
-import io.fd.vpp.jvpp.callback.ControlPingCallback;
-import io.fd.vpp.jvpp.callback.JVppCallback;
-import io.fd.vpp.jvpp.dto.ControlPingReply;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Default implementation of JVppRegistry.
- */
-public final class JVppRegistryImpl implements JVppRegistry, ControlPingCallback {
-
-    private static final Logger LOG = Logger.getLogger(JVppRegistryImpl.class.getName());
-
-    private final VppJNIConnection connection;
-    // Unguarded concurrent map, no race conditions expected on top of that
-    private final Map<String, JVppCallback> pluginRegistry;
-    // Guarded by self
-    private final Map<Integer, ControlPingCallback> pingCalls;
-
-    public JVppRegistryImpl(final String clientName) throws IOException {
-        connection = new VppJNIConnection(clientName);
-        connection.connect();
-        pluginRegistry = new ConcurrentHashMap<>();
-        pingCalls = new HashMap<>();
-    }
-
-    @Override
-    public VppConnection getConnection() {
-        return connection;
-    }
-
-    @Override
-    public void register(final JVpp jvpp, final JVppCallback callback) {
-        requireNonNull(jvpp, "jvpp should not be null");
-        requireNonNull(callback, "Callback should not be null");
-        final String name = jvpp.getClass().getName();
-        if (pluginRegistry.containsKey(name)) {
-            throw new IllegalArgumentException(
-                String.format("Callback for plugin %s was already registered", name));
-        }
-        jvpp.init(this, callback, connection.getConnectionInfo().queueAddress,
-            connection.getConnectionInfo().clientIndex);
-        pluginRegistry.put(name, callback);
-    }
-
-    @Override
-    public void unregister(final String name) {
-        requireNonNull(name, "Plugin name should not be null");
-        final JVppCallback previous = pluginRegistry.remove(name);
-        assertPluginWasRegistered(name, previous);
-    }
-
-    @Override
-    public JVppCallback get(final String name) {
-        requireNonNull(name, "Plugin name should not be null");
-        JVppCallback value = pluginRegistry.get(name);
-        assertPluginWasRegistered(name, value);
-        return value;
-    }
-
-    private native int controlPing0() throws VppInvocationException;
-
-    @Override
-    public int controlPing(final Class<? extends JVpp> clazz) throws VppInvocationException {
-        connection.checkActive();
-        final String name = clazz.getName();
-
-        final ControlPingCallback callback = (ControlPingCallback) pluginRegistry.get(clazz.getName());
-        assertPluginWasRegistered(name, callback);
-
-        synchronized (pingCalls) {
-            int context = controlPing0();
-            if (context < 0) {
-                throw new VppInvocationException("controlPing", context);
-            }
-
-            pingCalls.put(context, callback);
-            return context;
-        }
-    }
-
-    @Override
-    public void onControlPingReply(final ControlPingReply reply) {
-        final ControlPingCallback callback;
-        synchronized (pingCalls) {
-            callback = pingCalls.remove(reply.context);
-            if (callback == null) {
-                LOG.log(Level.WARNING, "No callback was registered for reply context=" + reply.context + " Contexts waiting="
-                    + pingCalls.keySet());
-                return;
-            }
-        }
-        // pass the reply to the callback registered by the ping caller
-        callback.onControlPingReply(reply);
-    }
-
-    @Override
-    public void onError(final VppCallbackException ex) {
-        final int ctxId = ex.getCtxId();
-        final ControlPingCallback callback;
-
-        synchronized (pingCalls) {
-            callback = pingCalls.get(ctxId);
-        }
-        if (callback == null) {
-            LOG.log(Level.WARNING, "No callback was registered for reply id={0} ", ctxId);
-            return;
-        }
-        // pass the error to the callback registered by the ping caller
-        callback.onError(ex);
-    }
-
-    private static void assertPluginWasRegistered(final String name, final JVppCallback value) {
-        if (value == null) {
-            throw new IllegalArgumentException(String.format("Callback for plugin %s is not registered", name));
-        }
-    }
-
-    @Override
-    public void close() throws Exception {
-        connection.close();
-    }
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java
deleted file mode 100644
index ce6d1bfc..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.PosixFilePermission;
-import java.nio.file.attribute.PosixFilePermissions;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Utility class for loading JNI libraries.
- */
-public final class NativeLibraryLoader {
-
-    private static final Logger LOG = Logger.getLogger(NativeLibraryLoader.class.getName());
-
-    private NativeLibraryLoader() {
-        throw new UnsupportedOperationException("This utility class cannot be instantiated.");
-    }
-
-    /**
-     * Loads JNI library using class loader of the given class.
-     *
-     * @param libName name of the library to be loaded
-     */
-    public static void loadLibrary(final String libName, final Class clazz) throws IOException {
-        java.util.Objects.requireNonNull(libName, "libName should not be null");
-        java.util.Objects.requireNonNull(clazz, "clazz should not be null");
-        try (final InputStream is = clazz.getResourceAsStream('/' + libName)) {
-            if (is == null) {
-                throw new IOException("Failed to open library resource " + libName);
-            }
-            loadStream(libName, is);
-        }
-    }
-
-    private static void loadStream(final String libName, final InputStream is) throws IOException {
-        final Set<PosixFilePermission> perms = PosixFilePermissions.fromString("rwxr-x---");
-        final Path p = Files.createTempFile(libName, null, PosixFilePermissions.asFileAttribute(perms));
-        try {
-            Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
-            Runtime.getRuntime().load(p.toString());
-        } catch (Exception e) {
-            throw new IOException("Failed to load library " + p, e);
-        } finally {
-            try {
-                Files.deleteIfExists(p);
-            } catch (IOException e) {
-                LOG.log(Level.WARNING, String.format("Failed to delete temporary file %s.", p), e);
-            }
-        }
-    }
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java
deleted file mode 100644
index d71e3055..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp;
-
-/**
- * Base exception representing failed operation of JVpp request call
- */
-public abstract class VppBaseCallException extends Exception {
-    private final String methodName;
-    private final int errorCode;
-
-    /**
-     * Constructs an VppCallbackException with the specified api method name and error code.
-     *
-     * @param methodName name of a method, which invocation or execution failed
-     * @param errorCode  negative error code value associated with this failure
-     * @throws NullPointerException     if apiMethodName is null
-     */
-    public VppBaseCallException(final String methodName, final int errorCode) {
-        super(String.format("vppApi.%s failed with error code: %d", methodName, errorCode));
-        this.methodName = java.util.Objects.requireNonNull(methodName, "apiMethodName is null!");
-        this.errorCode = errorCode;
-        if(errorCode >= 0) {
-            throw new IllegalArgumentException("Error code must be < 0. Was " + errorCode +
-                    " for " + methodName );
-        }
-    }
-
-    /**
-     * Returns  name of a method, which invocation failed.
-     *
-     * @return method name
-     */
-    public String getMethodName() {
-        return methodName;
-    }
-
-    /**
-     * Returns the error code associated with this failure.
-     *
-     * @return a negative integer error code
-     */
-    public int getErrorCode() {
-        return errorCode;
-    }
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java
deleted file mode 100644
index ccfcbd3c..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp;
-
-/**
- * Callback Exception representing failed operation of JVpp request call
- */
-public class VppCallbackException extends VppBaseCallException {
-    private final int ctxId;
-
-    /**
-     * Constructs an VppCallbackException with the specified api method name and error code.
-     *
-     * @param methodName  name of a method, which invocation failed.
-     * @param ctxId      api request context identifier
-     * @param errorCode  negative error code value associated with this failure
-     * @throws NullPointerException     if apiMethodName is null
-     */
-    public VppCallbackException(final String methodName, final int ctxId, final int errorCode ){
-        super(methodName, errorCode);
-        this.ctxId = ctxId;
-    }
-
-    /**
-     * Returns api request context identifier.
-     *
-     * @return value of context identifier
-     */
-    public int getCtxId() {
-        return ctxId;
-    }
-
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java
deleted file mode 100644
index e6fd3bdb..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp;
-
-import java.io.IOException;
-
-/**
- * Representation of a management connection to VPP.
- */
-public interface VppConnection extends AutoCloseable {
-
-    /**
-     * Opens VppConnection for communication with VPP.
-     *
-     * @throws IOException if connection is not established
-     */
-    void connect() throws IOException;
-
-    /**
-     * Checks if this instance connection is active.
-     *
-     * @throws IllegalStateException if this instance was disconnected.
-     */
-    void checkActive();
-
-    /**
-     * Closes Vpp connection.
-     */
-    @Override
-    void close();
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java
deleted file mode 100644
index a7ccb197..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp;
-
-/**
- * Exception thrown when Vpp jAPI method invocation failed.
- */
-public class VppInvocationException extends VppBaseCallException {
-    /**
-     * Constructs an VppApiInvocationFailedException with the specified api method name and error code.
-     *
-     * @param methodName  name of a method, which invocation failed.
-     * @param errorCode  negative error code value associated with this failure
-     * @throws NullPointerException     if apiMethodName is null
-     */
-    public VppInvocationException(final String methodName, final int errorCode) {
-        super(methodName, errorCode);
-    }
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java
deleted file mode 100644
index 7178bcf7..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp;
-
-import static io.fd.vpp.jvpp.NativeLibraryLoader.loadLibrary;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * JNI based representation of a management connection to VPP.
- */
-public final class VppJNIConnection implements VppConnection {
-    private static final Logger LOG = Logger.getLogger(VppJNIConnection.class.getName());
-
-    static {
-        final String libName = "libjvpp_registry.so.0.0.0";
-        try {
-            loadLibrary(libName, VppJNIConnection.class);
-        } catch (IOException e) {
-            LOG.log(Level.SEVERE, String.format("Can't find vpp jni library: %s", libName), e);
-            throw new ExceptionInInitializerError(e);
-        }
-    }
-
-    private ConnectionInfo connectionInfo;
-
-    private final String clientName;
-    private volatile boolean disconnected = false;
-
-    /**
-     * Create VPPJNIConnection instance for client connecting to VPP.
-     *
-     * @param clientName client name instance to be used for communication. Single connection per clientName is
-     *                   allowed.
-     */
-    public VppJNIConnection(final String clientName) {
-        this.clientName = Objects.requireNonNull(clientName, "Null clientName");
-    }
-
-    /**
-     * Guarded by VppJNIConnection.class
-     */
-    private static final Map<String, VppJNIConnection> connections = new HashMap<>();
-
-    /**
-     * Initiate VPP connection for current instance
-     *
-     * Multiple instances are allowed since this class is not a singleton (VPP allows multiple management connections).
-     *
-     * However only a single connection per clientName is allowed.
-     *
-     * @throws IOException in case the connection could not be established
-     */
-
-    @Override
-    public void connect() throws IOException {
-        _connect();
-    }
-
-    private void _connect() throws IOException {
-        synchronized (VppJNIConnection.class) {
-            if (connections.containsKey(clientName)) {
-                throw new IOException("Client " + clientName + " already connected");
-            }
-
-            connectionInfo = clientConnect(clientName);
-            if (connectionInfo.status != 0) {
-                throw new IOException("Connection returned error " + connectionInfo.status);
-            }
-            connections.put(clientName, this);
-        }
-    }
-
-    @Override
-    public final void checkActive() {
-        if (disconnected) {
-            throw new IllegalStateException("Disconnected client " + clientName);
-        }
-    }
-
-    @Override
-    public final synchronized void close() {
-        if (!disconnected) {
-            disconnected = true;
-            try {
-                clientDisconnect();
-            } finally {
-                synchronized (VppJNIConnection.class) {
-                    connections.remove(clientName);
-                }
-            }
-        }
-    }
-
-    public ConnectionInfo getConnectionInfo() {
-        return connectionInfo;
-    }
-
-    /**
-     * VPP connection information used by plugins to reuse the connection.
-     */
-    public static final class ConnectionInfo {
-        public final long queueAddress;
-        public final int clientIndex;
-        public final int status; // FIXME throw exception instead
-
-        public ConnectionInfo(long queueAddress, int clientIndex, int status) {
-            this.queueAddress = queueAddress;
-            this.clientIndex = clientIndex;
-            this.status = status;
-        }
-    }
-
-    private static native ConnectionInfo clientConnect(String clientName);
-
-    private static native void clientDisconnect();
-
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java
deleted file mode 100644
index efddfdbb..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.callback;
-
-import io.fd.vpp.jvpp.dto.ControlPingReply;
-
-/**
- * Represents callback for control_ping message.
- */
-public interface ControlPingCallback extends JVppCallback {
-
-    void onControlPingReply(ControlPingReply reply);
-
-}
-
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java
deleted file mode 100644
index ae02063b..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.callback;
-import io.fd.vpp.jvpp.VppCallbackException;
-
-/**
- * Base JVppCallback interface
- */
-public interface JVppCallback {
-    /**
-     * onError callback handler used to report failing operation
-     * @param ex VppCallbackException object containing details about failing operation
-     */
-    void onError(VppCallbackException ex);
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java
deleted file mode 100644
index 8ab0cb21..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.callback;
-
-/**
-* Notification callback
-*/
-public interface JVppNotificationCallback {
-
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java
deleted file mode 100644
index 984e1674..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.dto;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.VppInvocationException;
-
-/**
- * Represents request DTO for control_ping message.
- */
-public final class ControlPing implements JVppRequest {
-
-    @Override
-    public int send(final JVpp jvpp) throws VppInvocationException {
-        return jvpp.controlPing(this);
-    }
-
-}
-
-
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java
deleted file mode 100644
index 61e4d0e4..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.dto;
-
-import java.util.Objects;
-
-/**
- * Represents reply DTO for control_ping message.
- */
-public final class ControlPingReply implements JVppReply<ControlPing> {
-
-    public int context;
-    public int clientIndex;
-    public int vpePid;
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        final ControlPingReply that = (ControlPingReply) o;
-        return context == that.context &&
-                clientIndex == that.clientIndex &&
-                vpePid == that.vpePid;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(context, clientIndex, vpePid);
-    }
-
-    @Override
-    public String toString() {
-        return "ControlPingReply{" +
-                "context=" + context +
-                ", clientIndex=" + clientIndex +
-                ", vpePid=" + vpePid +
-                '}';
-    }
-}
-
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java
deleted file mode 100644
index 60b98984..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.dto;
-
-/**
-* Base interface for all dump requests
-*/
-public interface JVppDump extends JVppRequest {
-
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppNotification.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppNotification.java
deleted file mode 100644
index 5554f501..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppNotification.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.dto;
-
-/**
-* Base interface for all notification DTOs
-*/
-public interface JVppNotification {
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java
deleted file mode 100644
index 73f512d4..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.dto;
-
-/**
-* Base interface for all reply DTOs
-*/
-public interface JVppReply<REQ extends JVppRequest> {
-
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java
deleted file mode 100644
index 15111395..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.dto;
-
-/**
-* Base interface for all dump replies
-*/
-public interface JVppReplyDump<REQ extends JVppRequest, RESP extends JVppReply<REQ>>
-    extends JVppReply<REQ> {
-
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java
deleted file mode 100644
index 9b301da2..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.dto;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.VppInvocationException;
-
-/**
-* Base interface for all request DTOs
-*/
-public interface JVppRequest {
-
-    /**
-     * Invoke current operation asynchronously on VPP
-     *
-     * @return context id of this request. Can be used to track incoming response
-     */
-    int send(JVpp jvpp) throws VppInvocationException;
-
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java
deleted file mode 100644
index e7df528a..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.future;
-
-
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.VppInvocationException;
-import io.fd.vpp.jvpp.dto.JVppDump;
-import io.fd.vpp.jvpp.dto.JVppReply;
-import io.fd.vpp.jvpp.dto.JVppReplyDump;
-import io.fd.vpp.jvpp.dto.JVppRequest;
-
-/**
- * Future facade on top of JVpp
- */
-public abstract class AbstractFutureJVppInvoker implements FutureJVppInvoker {
-
-    private final JVpp jvpp;
-    private final JVppRegistry registry;
-
-    /**
-     * Guarded by self
-     */
-    private final Map<Integer, CompletableFuture<? extends JVppReply<?>>> requests;
-
-    protected AbstractFutureJVppInvoker(final JVpp jvpp, final JVppRegistry registry,
-                                        final Map<Integer, CompletableFuture<? extends JVppReply<?>>> requestMap) {
-        this.jvpp =  Objects.requireNonNull(jvpp, "jvpp should not be null");
-        this.registry =  Objects.requireNonNull(registry, "registry should not be null");
-        // Request map represents the shared state between this facade and it's callback
-        // where facade puts futures in and callback completes + removes them
-        this.requests = Objects.requireNonNull(requestMap, "Null requestMap");
-    }
-
-    protected final Map<Integer, CompletableFuture<? extends JVppReply<?>>> getRequests() {
-        synchronized (requests) {
-            return requests;
-        }
-    }
-
-    // TODO use Optional in Future, java8
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <REQ extends JVppRequest, REPLY extends JVppReply<REQ>> CompletionStage<REPLY> send(REQ req) {
-        synchronized(requests) {
-            try {
-                final CompletableFuture<REPLY> replyCompletableFuture;
-                final int contextId = jvpp.send(req);
-
-                if(req instanceof JVppDump) {
-                    throw new IllegalArgumentException("Send with empty reply dump has to be used in case of dump calls");
-                }
-                replyCompletableFuture = new CompletableFuture<>();
-                requests.put(contextId, replyCompletableFuture);
-
-                // TODO in case of timeouts/missing replies, requests from the map are not removed
-                // consider adding cancel method, that would remove requests from the map and cancel
-                // associated replyCompletableFuture
-
-                return replyCompletableFuture;
-            } catch (VppInvocationException ex) {
-                final CompletableFuture<REPLY> replyCompletableFuture = new CompletableFuture<>();
-                replyCompletableFuture.completeExceptionally(ex);
-                return replyCompletableFuture;
-            }
-        }
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <REQ extends JVppRequest, REPLY extends JVppReply<REQ>, DUMP extends JVppReplyDump<REQ, REPLY>> CompletionStage<DUMP> send(
-            REQ req, DUMP emptyReplyDump) {
-        synchronized(requests) {
-            try {
-                final CompletableDumpFuture<DUMP> replyCompletableFuture;
-                final int contextId = jvpp.send(req);
-
-                if(!(req instanceof JVppDump)) {
-                    throw new IllegalArgumentException("Send without empty reply dump has to be used in case of regular calls");
-                }
-                replyCompletableFuture = new CompletableDumpFuture<>(contextId, emptyReplyDump);
-
-                requests.put(contextId, replyCompletableFuture);
-                requests.put(registry.controlPing(jvpp.getClass()), replyCompletableFuture);
-
-                // TODO in case of timeouts/missing replies, requests from the map are not removed
-                // consider adding cancel method, that would remove requests from the map and cancel
-                // associated replyCompletableFuture
-
-                return replyCompletableFuture;
-            } catch (VppInvocationException ex) {
-                final CompletableFuture<DUMP> replyCompletableFuture = new CompletableFuture<>();
-                replyCompletableFuture.completeExceptionally(ex);
-                return replyCompletableFuture;
-            }
-        }
-    }
-
-    public static final class CompletableDumpFuture<T extends JVppReplyDump<?, ?>> extends CompletableFuture<T> {
-        private final T replyDump;
-        private final int contextId;
-
-        public CompletableDumpFuture(final int contextId, final T emptyDump) {
-            this.contextId = contextId;
-            this.replyDump = emptyDump;
-        }
-
-        public int getContextId() {
-            return contextId;
-        }
-
-        public T getReplyDump() {
-            return replyDump;
-        }
-    }
-
-    @Override
-    public void close() throws Exception {
-        jvpp.close();
-    }
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java
deleted file mode 100644
index 7a48e418..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.future;
-
-
-import io.fd.vpp.jvpp.dto.JVppReply;
-import io.fd.vpp.jvpp.dto.JVppReplyDump;
-import io.fd.vpp.jvpp.dto.JVppRequest;
-
-import java.util.concurrent.CompletionStage;
-import io.fd.vpp.jvpp.notification.NotificationRegistryProvider;
-
-/**
-* Future facade on top of JVpp
-*/
-public interface FutureJVppInvoker extends NotificationRegistryProvider, AutoCloseable {
-
-    /**
-     * Invoke asynchronous operation on VPP
-     *
-     * @return CompletionStage with future result of an async VPP call
-     * @throws io.fd.vpp.jvpp.VppInvocationException when send request failed with details
-     */
-    <REQ extends JVppRequest, REPLY extends JVppReply<REQ>> CompletionStage<REPLY> send(REQ req);
-
-
-    /**
-     * Invoke asynchronous dump operation on VPP
-     *
-     * @return CompletionStage with aggregated future result of an async VPP dump call
-     * @throws io.fd.vpp.jvpp.VppInvocationException when send request failed with details
-     */
-    <REQ extends JVppRequest, REPLY extends JVppReply<REQ>, DUMP extends JVppReplyDump<REQ, REPLY>> CompletionStage<DUMP> send(
-            REQ req, DUMP emptyReplyDump);
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistry.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistry.java
deleted file mode 100644
index 3c72ff79..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistry.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.notification;
-
-/**
- * Base registry for notification callbacks.
- */
-public interface NotificationRegistry extends AutoCloseable {
-
-    void close();
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistryProvider.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistryProvider.java
deleted file mode 100644
index 4a6e06b7..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/NotificationRegistryProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.notification;
-
-/**
- * Provides notification registry
- */
-public interface NotificationRegistryProvider {
-
-    /**
-     * Get current notification registry instance
-     */
-    NotificationRegistry getNotificationRegistry();
-}
diff --git a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java b/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java
deleted file mode 100644
index 27b4d29f..00000000
--- a/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.vpp.jvpp.test;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-
-/**
- * Run using:
- * sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-16.09.jar io.fd.vpp.jvpp.test.ConnectionTest
- */
-public class ConnectionTest {
-
-    private static void testConnect() throws Exception {
-        System.out.println("Testing JNI connection with JVppRegistry");
-        final JVppRegistry registry = new JVppRegistryImpl("ConnectionTest");
-        try {
-            System.out.println("Successfully connected to vpp");
-            Thread.sleep(5000);
-            System.out.println("Disconnecting...");
-            Thread.sleep(1000);
-        } finally {
-            registry.close();
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        testConnect();
-    }
-}
diff --git a/vpp-api/java/jvpp-registry/jvpp_registry.c b/vpp-api/java/jvpp-registry/jvpp_registry.c
deleted file mode 100644
index cbd5e0ab..00000000
--- a/vpp-api/java/jvpp-registry/jvpp_registry.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#define _GNU_SOURCE /* for strcasestr(3) */
-#include <vnet/vnet.h>
-
-#define vl_api_version(n,v) static u32 vpe_api_version = (v);
-#include <vpp/api/vpe.api.h>
-#undef vl_api_version
-
-
-#include <jni.h>
-#include <jvpp-common/jvpp_common.h>
-#include "io_fd_vpp_jvpp_VppJNIConnection.h"
-#include "io_fd_vpp_jvpp_JVppRegistryImpl.h"
-
-#include <vpp/api/vpe_msg_enum.h>
-#define vl_typedefs             /* define message structures */
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_printfun
-
-vlib_main_t vlib_global_main;
-vlib_main_t **vlib_mains;
-
-/*
- * The Java runtime isn't compile w/ -fstack-protector,
- * so we have to supply missing external references for the
- * regular vpp libraries.
- */
-void __stack_chk_guard(void) __attribute__((weak));
-void __stack_chk_guard(void) {
-}
-
-typedef struct {
-    /* UThread attachment */
-    volatile u32 control_ping_result_ready;
-    volatile i32 control_ping_retval;
-
-    /* Control poing callback */
-    jobject registryObject;
-    jclass registryClass;
-    jclass controlPingReplyClass;
-    jclass callbackExceptionClass;
-
-    /* Thread cleanup */
-    pthread_key_t cleanup_rx_thread_key;
-
-    /* Connected indication */
-    volatile u8 is_connected;
-} jvpp_registry_main_t;
-
-jvpp_registry_main_t jvpp_registry_main __attribute__((aligned (64)));
-
-void vl_client_add_api_signatures(vl_api_memclnt_create_t *mp) {
-    /*
-     * Send the main API signature in slot 0. This bit of code must
-     * match the checks in ../vpe/api/api.c: vl_msg_api_version_check().
-     */
-    mp->api_versions[0] = clib_host_to_net_u32(vpe_api_version);
-}
-
-/* cleanup handler for RX thread */
-static_always_inline void cleanup_rx_thread(void *arg) {
-    jvpp_main_t * jm = &jvpp_main;
-    jvpp_registry_main_t * rm = &jvpp_registry_main;
-
-    vppjni_lock(jm, 99);
-
-    int getEnvStat = (*jm->jvm)->GetEnv(jm->jvm, (void **) &(jm->jenv),
-    JNI_VERSION_1_8);
-    if (getEnvStat == JNI_EVERSION) {
-        clib_warning("Unsupported JNI version\n");
-        rm->control_ping_retval = VNET_API_ERROR_UNSUPPORTED_JNI_VERSION;
-        goto out;
-    } else if (getEnvStat != JNI_EDETACHED) {
-        (*jm->jvm)->DetachCurrentThread(jm->jvm);
-    }
-    out: vppjni_unlock(jm);
-}
-
-static void vl_api_control_ping_reply_t_handler(
-        vl_api_control_ping_reply_t * mp) {
-    jvpp_main_t * jm = &jvpp_main;
-    jvpp_registry_main_t * rm = &jvpp_registry_main;
-    char was_thread_connected = 0;
-
-    // attach to java thread if not attached
-    int getEnvStat = (*jm->jvm)->GetEnv(jm->jvm, (void **) &(jm->jenv),
-            JNI_VERSION_1_8);
-    if (getEnvStat == JNI_EDETACHED) {
-        if ((*jm->jvm)->AttachCurrentThread(jm->jvm, (void **) &(jm->jenv),
-                NULL) != 0) {
-            clib_warning("Failed to attach thread\n");
-            rm->control_ping_retval =
-                    VNET_API_ERROR_FAILED_TO_ATTACH_TO_JAVA_THREAD;
-            goto out;
-        }
-
-        // workaround as we can't use pthread_cleanup_push
-        pthread_key_create(&rm->cleanup_rx_thread_key, cleanup_rx_thread);
-        // destructor is only called if the value of key is non null
-        pthread_setspecific(rm->cleanup_rx_thread_key, (void *) 1);
-        was_thread_connected = 1;
-    } else if (getEnvStat == JNI_EVERSION) {
-        clib_warning("Unsupported JNI version\n");
-        rm->control_ping_retval = VNET_API_ERROR_UNSUPPORTED_JNI_VERSION;
-        goto out;
-    }
-
-    if (was_thread_connected == 0) {
-        JNIEnv *env = jm->jenv;
-        if (mp->retval < 0) {
-            call_on_error("controlPing", mp->context, mp->retval,
-                    rm->registryClass, rm->registryObject,
-                    rm->callbackExceptionClass);
-        } else {
-            jmethodID constructor = (*env)->GetMethodID(env,
-                    rm->controlPingReplyClass, "<init>", "()V");
-            jmethodID callbackMethod = (*env)->GetMethodID(env,
-                    rm->registryClass, "onControlPingReply",
-                    "(Lio/fd/vpp/jvpp/dto/ControlPingReply;)V");
-
-            jobject dto = (*env)->NewObject(env, rm->controlPingReplyClass,
-                    constructor);
-
-            jfieldID contextFieldId = (*env)->GetFieldID(env,
-                    rm->controlPingReplyClass, "context", "I");
-            (*env)->SetIntField(env, dto, contextFieldId,
-                    clib_net_to_host_u32(mp->context));
-
-            jfieldID clientIndexFieldId = (*env)->GetFieldID(env,
-                    rm->controlPingReplyClass, "clientIndex", "I");
-            (*env)->SetIntField(env, dto, clientIndexFieldId,
-                    clib_net_to_host_u32(mp->client_index));
-
-            jfieldID vpePidFieldId = (*env)->GetFieldID(env,
-                    rm->controlPingReplyClass, "vpePid", "I");
-            (*env)->SetIntField(env, dto, vpePidFieldId,
-                    clib_net_to_host_u32(mp->vpe_pid));
-
-            (*env)->CallVoidMethod(env, rm->registryObject, callbackMethod,
-                    dto);
-            (*env)->DeleteLocalRef(env, dto);
-        }
-    }
-
-    out: rm->control_ping_result_ready = 1;
-}
-
-static int send_initial_control_ping() {
-    f64 timeout;
-    clib_time_t clib_time;
-    vl_api_control_ping_t * mp;
-    jvpp_main_t * jm = &jvpp_main;
-    jvpp_registry_main_t * rm = &jvpp_registry_main;
-
-    clib_time_init(&clib_time);
-
-    rm->control_ping_result_ready = 0;
-    mp = vl_msg_api_alloc(sizeof(*mp));
-    memset(mp, 0, sizeof(*mp));
-    mp->_vl_msg_id = ntohs(VL_API_CONTROL_PING);
-    mp->client_index = jm->my_client_index;
-
-    // send message:
-    vl_msg_api_send_shmem(jm->vl_input_queue, (u8 *) &mp);
-
-    // wait for results: Current time + 10 seconds is the timeout
-    timeout = clib_time_now(&clib_time) + 10.0;
-    int rv = VNET_API_ERROR_RESPONSE_NOT_READY;
-    while (clib_time_now(&clib_time) < timeout) {
-        if (rm->control_ping_result_ready == 1) {
-            rv = rm->control_ping_retval;
-            break;
-        }
-    }
-
-    if (rv != 0) {
-        clib_warning("common: first control ping failed: %d", rv);
-    }
-
-    return rv;
-}
-
-static int connect_to_vpe(char *name) {
-    jvpp_main_t * jm = &jvpp_main;
-    api_main_t * am = &api_main;
-
-    if (vl_client_connect_to_vlib("/vpe-api", name, 32) < 0)
-        return -1;
-
-    jm->my_client_index = am->my_client_index;
-
-    jm->vl_input_queue = am->shmem_hdr->vl_input_queue;
-
-    vl_msg_api_set_handlers(VL_API_CONTROL_PING_REPLY, "control_ping_reply",
-            vl_api_control_ping_reply_t_handler, vl_noop_handler,
-            vl_api_control_ping_reply_t_endian,
-            vl_api_control_ping_reply_t_print,
-            sizeof(vl_api_control_ping_reply_t), 1);
-
-    return send_initial_control_ping();
-}
-
-JNIEXPORT jobject JNICALL Java_io_fd_vpp_jvpp_VppJNIConnection_clientConnect(
-        JNIEnv *env, jclass obj, jstring clientName) {
-    int rv;
-    const char *client_name;
-    void vl_msg_reply_handler_hookup(void);
-    jvpp_main_t * jm = &jvpp_main;
-    jvpp_registry_main_t * rm = &jvpp_registry_main;
-
-    jclass connectionInfoClass = (*env)->FindClass(env,
-            "io/fd/vpp/jvpp/VppJNIConnection$ConnectionInfo");
-    jmethodID connectionInfoConstructor = (*env)->GetMethodID(env,
-            connectionInfoClass, "<init>", "(JII)V");
-
-    /*
-     * Bail out now if we're not running as root
-     */
-    if (geteuid() != 0) {
-        return (*env)->NewObject(env, connectionInfoClass,
-                connectionInfoConstructor, 0, 0,
-                VNET_API_ERROR_NOT_RUNNING_AS_ROOT);
-    }
-
-    if (rm->is_connected) {
-        return (*env)->NewObject(env, connectionInfoClass,
-                connectionInfoConstructor, 0, 0,
-                VNET_API_ERROR_ALREADY_CONNECTED);
-    }
-
-    client_name = (*env)->GetStringUTFChars(env, clientName, 0);
-    if (!client_name) {
-        return (*env)->NewObject(env, connectionInfoClass,
-                connectionInfoConstructor, 0, 0, VNET_API_ERROR_INVALID_VALUE);
-    }
-
-    rv = connect_to_vpe((char *) client_name);
-
-    if (rv < 0)
-        clib_warning("connection failed, rv %d", rv);
-
-    (*env)->ReleaseStringUTFChars(env, clientName, client_name);
-
-    return (*env)->NewObject(env, connectionInfoClass,
-            connectionInfoConstructor, (jlong) jm->vl_input_queue,
-            (jint) jm->my_client_index, (jint) rv);
-}
-
-JNIEXPORT jint JNICALL Java_io_fd_vpp_jvpp_JVppRegistryImpl_controlPing0(
-        JNIEnv *env, jobject regstryObject) {
-    jvpp_main_t * jm = &jvpp_main;
-    vl_api_control_ping_t * mp;
-    u32 my_context_id = vppjni_get_context_id(&jvpp_main);
-    jvpp_registry_main_t * rm = &jvpp_registry_main;
-
-    if (rm->registryObject == 0) {
-        rm->registryObject = (*env)->NewGlobalRef(env, regstryObject);
-    }
-    if (rm->registryClass == 0) {
-        rm->registryClass = (jclass) (*env)->NewGlobalRef(env,
-                (*env)->GetObjectClass(env, regstryObject));
-    }
-
-    mp = vl_msg_api_alloc(sizeof(*mp));
-    memset(mp, 0, sizeof(*mp));
-    mp->_vl_msg_id = ntohs(VL_API_CONTROL_PING);
-    mp->client_index = jm->my_client_index;
-    mp->context = clib_host_to_net_u32(my_context_id);
-
-    // send message:
-    vl_msg_api_send_shmem(jm->vl_input_queue, (u8 *) &mp);
-    return my_context_id;
-}
-
-JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_VppJNIConnection_clientDisconnect(
-        JNIEnv *env, jclass clazz) {
-    jvpp_registry_main_t * rm = &jvpp_registry_main;
-    rm->is_connected = 0; // TODO make thread safe
-    vl_client_disconnect_from_vlib();
-
-    // cleanup:
-    if (rm->registryObject) {
-        (*env)->DeleteGlobalRef(env, rm->registryObject);
-        rm->registryObject = 0;
-    }
-    if (rm->registryClass) {
-        (*env)->DeleteGlobalRef(env, rm->registryClass);
-        rm->registryClass = 0;
-    }
-}
-
-jint JNI_OnLoad(JavaVM *vm, void *reserved) {
-    jvpp_main_t * jm = &jvpp_main;
-    jvpp_registry_main_t * rm = &jvpp_registry_main;
-    JNIEnv* env;
-
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return JNI_EVERSION;
-    }
-
-    rm->controlPingReplyClass = (jclass) (*env)->NewGlobalRef(env,
-            (*env)->FindClass(env, "io/fd/vpp/jvpp/dto/ControlPingReply"));
-    if ((*env)->ExceptionCheck(env)) {
-        (*env)->ExceptionDescribe(env);
-        clib_warning("Failed to cache class references\n");
-        return JNI_ERR;
-    }
-
-    rm->callbackExceptionClass = (jclass) (*env)->NewGlobalRef(env,
-            (*env)->FindClass(env, "io/fd/vpp/jvpp/VppCallbackException"));
-    if ((*env)->ExceptionCheck(env)) {
-        (*env)->ExceptionDescribe(env);
-        return JNI_ERR;
-    }
-
-    jm->jvm = vm;
-    return JNI_VERSION_1_8;
-}
-
-void JNI_OnUnload(JavaVM *vm, void *reserved) {
-    jvpp_main_t * jm = &jvpp_main;
-    JNIEnv* env;
-    if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
-        return;
-    }
-
-    jm->jenv = NULL;
-    jm->jvm = NULL;
-}
diff --git a/vpp-api/java/jvpp/gen/jvpp_gen.py b/vpp-api/java/jvpp/gen/jvpp_gen.py
deleted file mode 100755
index 5f8df2a9..00000000
--- a/vpp-api/java/jvpp/gen/jvpp_gen.py
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-# l
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import argparse
-import importlib
-import sys
-import os
-import json
-
-from jvppgen import types_gen
-from jvppgen import callback_gen
-from jvppgen import notification_gen
-from jvppgen import dto_gen
-from jvppgen import jvpp_callback_facade_gen
-from jvppgen import jvpp_future_facade_gen
-from jvppgen import jvpp_impl_gen
-from jvppgen import jvpp_c_gen
-from jvppgen import util
-
-blacklist = [ "memclnt.api", "flowperpkt.api" ]
-
-# Invocation:
-# ~/Projects/vpp/vpp-api/jvpp/gen$ mkdir -p java/io/fd/vpp/jvpp && cd java/io/fd/vpp/jvpp
-# ~/Projects/vpp/vpp-api/jvpp/gen/java/io/fd/vpp/jvpp$ ../../../../jvpp_gen.py -idefs_api_vpp_papi.py
-#
-# Compilation:
-# ~/Projects/vpp/vpp-api/jvpp/gen/java/io/fd/vpp/jvpp$ javac *.java dto/*.java callback/*.java
-#
-# where
-# defs_api_vpp_papi.py - vpe.api in python format (generated by vppapigen)
-
-parser = argparse.ArgumentParser(description='VPP Java API generator')
-parser.add_argument('-i', action="store", dest="inputfiles", nargs='+')
-parser.add_argument('--plugin_name', action="store", dest="plugin_name")
-args = parser.parse_args()
-
-sys.path.append(".")
-
-print "Generating Java API for %s" % args.inputfiles
-print "inputfiles %s" % args.inputfiles
-plugin_name = args.plugin_name
-print "plugin_name %s" % plugin_name
-
-cfg = {}
-
-for inputfile in args.inputfiles:
-    if any(substring in inputfile for substring in blacklist):
-        print "WARNING: Imput file %s blacklisted" % inputfile
-        continue
-    _cfg = json.load(open(inputfile, 'r'))
-    if 'types' in cfg:
-        cfg['types'].extend(_cfg['types'])
-    else:
-        cfg['types'] = _cfg['types']
-    if 'messages' in cfg:
-        cfg['messages'].extend(_cfg['messages'])
-    else:
-        cfg['messages'] = _cfg['messages']
-
-
-def is_request_field(field_name):
-    return field_name not in {'_vl_msg_id', 'client_index', 'context'}
-
-
-def is_response_field(field_name):
-    return field_name not in {'_vl_msg_id'}
-
-
-def get_args(t, filter):
-    arg_list = []
-    for i in t:
-        if is_crc(i):
-            continue
-        if not filter(i[1]):
-            continue
-        arg_list.append(i[1])
-    return arg_list
-
-
-def get_types(t, filter):
-    types_list = []
-    lengths_list = []
-    crc = None
-    for i in t:
-        if is_crc(i):
-            crc = ('crc', i['crc'][2:])
-            continue
-        if not filter(i[1]):
-            continue
-        if len(i) is 3:  # array type
-            types_list.append(i[0] + '[]')
-            lengths_list.append((i[2], False))
-        elif len(i) is 4:  # variable length array type
-            types_list.append(i[0] + '[]')
-            lengths_list.append((i[3], True))
-        else:  # primitive type
-            types_list.append(i[0])
-            lengths_list.append((0, False))
-    return types_list, lengths_list, crc
-
-
-def is_crc(arg):
-    """ Check whether the argument inside message definition is just crc """
-    return 'crc' in arg
-
-
-def get_definitions(defs):
-    # Pass 1
-    func_list = []
-    func_name = {}
-    for a in defs:
-        java_name = util.underscore_to_camelcase(a[0])
-
-        # For replies include all the arguments except message_id
-        if util.is_reply(java_name):
-            types, lengths, crc = get_types(a[1:], is_response_field)
-            func_name[a[0]] = dict(
-                [('name', a[0]), ('java_name', java_name),
-                 ('args', get_args(a[1:], is_response_field)), ('full_args', get_args(a[1:], lambda x: True)),
-                 ('types', types), ('lengths', lengths), crc])
-        # For requests skip message_id, client_id and context
-        else:
-            types, lengths, crc = get_types(a[1:], is_request_field)
-            func_name[a[0]] = dict(
-                [('name', a[0]), ('java_name', java_name),
-                 ('args', get_args(a[1:], is_request_field)), ('full_args', get_args(a[1:], lambda x: True)),
-                 ('types', types), ('lengths', lengths), crc])
-
-        # Indexed by name
-        func_list.append(func_name[a[0]])
-    return func_list, func_name
-
-
-base_package = 'io.fd.vpp.jvpp'
-plugin_package = base_package + '.' + plugin_name
-types_package = 'types'
-dto_package = 'dto'
-callback_package = 'callback'
-notification_package = 'notification'
-future_package = 'future'
-# TODO find better package name
-callback_facade_package = 'callfacade'
-
-types_list, types_name = get_definitions(cfg['types'])
-
-types_gen.generate_types(types_list, plugin_package, types_package, args.inputfiles)
-
-func_list, func_name = get_definitions(cfg['messages'])
-
-dto_gen.generate_dtos(func_list, base_package, plugin_package, plugin_name.title(), dto_package, args.inputfiles)
-jvpp_impl_gen.generate_jvpp(func_list, base_package, plugin_package, plugin_name, dto_package, args.inputfiles)
-callback_gen.generate_callbacks(func_list, base_package, plugin_package, plugin_name.title(), callback_package, dto_package, args.inputfiles)
-notification_gen.generate_notification_registry(func_list, base_package, plugin_package, plugin_name.title(), notification_package, callback_package, dto_package, args.inputfiles)
-jvpp_c_gen.generate_jvpp(func_list, plugin_name, args.inputfiles)
-jvpp_future_facade_gen.generate_jvpp(func_list, base_package, plugin_package, plugin_name.title(), dto_package, callback_package, notification_package, future_package, args.inputfiles)
-jvpp_callback_facade_gen.generate_jvpp(func_list, base_package, plugin_package, plugin_name.title(), dto_package, callback_package, notification_package, callback_facade_package, args.inputfiles)
-
-print "Java API for %s generated successfully" % args.inputfiles
diff --git a/vpp-api/java/jvpp/gen/jvppgen/__init__.py b/vpp-api/java/jvpp/gen/jvppgen/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/vpp-api/java/jvpp/gen/jvppgen/callback_gen.py b/vpp-api/java/jvpp/gen/jvppgen/callback_gen.py
deleted file mode 100644
index 68f70126..00000000
--- a/vpp-api/java/jvpp/gen/jvppgen/callback_gen.py
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os
-import util
-from string import Template
-
-from util import remove_suffix
-
-callback_suffix = "Callback"
-
-callback_template = Template("""
-package $plugin_package.$callback_package;
-
-/**
- * <p>Represents callback for plugin's api file message.
- * <br>It was generated by callback_gen.py based on $inputfile preparsed data:
- * <pre>
-$docs
- * </pre>
- */
-public interface $cls_name extends $base_package.$callback_package.$callback_type {
-
-    $callback_method
-
-}
-""")
-
-global_callback_template = Template("""
-package $plugin_package.$callback_package;
-
-/**
- * <p>Global aggregated callback interface.
- * <br>It was generated by callback_gen.py based on $inputfile
- * <br>(python representation of api file generated by vppapigen).
- */
-public interface JVpp${plugin_name}GlobalCallback extends $base_package.$callback_package.ControlPingCallback, $callbacks {
-}
-""")
-
-
-def generate_callbacks(func_list, base_package, plugin_package, plugin_name, callback_package, dto_package, inputfile):
-    """ Generates callback interfaces """
-    print "Generating Callback interfaces"
-
-    if not os.path.exists(callback_package):
-        raise Exception("%s folder is missing" % callback_package)
-
-    callbacks = []
-    for func in func_list:
-
-        camel_case_name_with_suffix = util.underscore_to_camelcase_upper(func['name'])
-
-        if util.is_ignored(func['name']) or util.is_control_ping(camel_case_name_with_suffix):
-            continue
-        if not util.is_reply(camel_case_name_with_suffix) and not util.is_notification(func['name']):
-            continue
-
-        if util.is_reply(camel_case_name_with_suffix):
-            camel_case_name = util.remove_reply_suffix(camel_case_name_with_suffix)
-            callback_type = "JVppCallback"
-        else:
-            camel_case_name_with_suffix = util.add_notification_suffix(camel_case_name_with_suffix)
-            camel_case_name = camel_case_name_with_suffix
-            callback_type = "JVppNotificationCallback"
-
-        callbacks.append("{0}.{1}.{2}".format(plugin_package, callback_package, camel_case_name + callback_suffix))
-        callback_path = os.path.join(callback_package, camel_case_name + callback_suffix + ".java")
-        callback_file = open(callback_path, 'w')
-
-        reply_type = "%s.%s.%s" % (plugin_package, dto_package, camel_case_name_with_suffix)
-        method = "void on{0}({1} reply);".format(camel_case_name_with_suffix, reply_type)
-        callback_file.write(
-            callback_template.substitute(inputfile=inputfile,
-                                         docs=util.api_message_to_javadoc(func),
-                                         cls_name=camel_case_name + callback_suffix,
-                                         callback_method=method,
-                                         base_package=base_package,
-                                         plugin_package=plugin_package,
-                                         callback_package=callback_package,
-                                         callback_type=callback_type))
-        callback_file.flush()
-        callback_file.close()
-
-    callback_file = open(os.path.join(callback_package, "JVpp%sGlobalCallback.java" % plugin_name), 'w')
-    callback_file.write(global_callback_template.substitute(inputfile=inputfile,
-                                                            callbacks=", ".join(callbacks),
-                                                            base_package=base_package,
-                                                            plugin_package=plugin_package,
-                                                            plugin_name=plugin_name,
-                                                            callback_package=callback_package))
-    callback_file.flush()
-    callback_file.close()
diff --git a/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py b/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py
deleted file mode 100644
index a043c945..00000000
--- a/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py
+++ /dev/null
@@ -1,308 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os
-from string import Template
-
-import util
-
-dto_template = Template("""
-package $plugin_package.$dto_package;
-
-/**
- * <p>This class represents $description.
- * <br>It was generated by dto_gen.py based on $inputfile preparsed data:
- * <pre>
-$docs
- * </pre>
- */
-public final class $cls_name implements $base_package.$dto_package.$base_type {
-
-$fields
-$methods
-}
-""")
-
-field_template = Template("""    public $type $name;\n""")
-
-send_template = Template("""    @Override
-    public int send(final $base_package.JVpp jvpp) throws io.fd.vpp.jvpp.VppInvocationException {
-        return (($plugin_package.JVpp${plugin_name})jvpp).$method_name($args);
-    }""")
-
-
-def generate_dtos(func_list, base_package, plugin_package, plugin_name, dto_package, inputfile):
-    """ Generates dto objects in a dedicated package """
-    print "Generating DTOs"
-
-    if not os.path.exists(dto_package):
-        raise Exception("%s folder is missing" % dto_package)
-
-    for func in func_list:
-        camel_case_dto_name = util.underscore_to_camelcase_upper(func['name'])
-        camel_case_method_name = util.underscore_to_camelcase(func['name'])
-        dto_path = os.path.join(dto_package, camel_case_dto_name + ".java")
-
-        if util.is_ignored(func['name']) or util.is_control_ping(camel_case_dto_name):
-            continue
-
-        fields = generate_dto_fields(camel_case_dto_name, func)
-        methods = generate_dto_base_methods(camel_case_dto_name, func)
-        base_type = ""
-
-        # Generate request/reply or dump/dumpReply even if structure can be used as notification
-        if not util.is_just_notification(func["name"]):
-            if util.is_reply(camel_case_dto_name):
-                description = "reply DTO"
-                request_dto_name = get_request_name(camel_case_dto_name, func['name'])
-                if util.is_details(camel_case_dto_name):
-                    # FIXME assumption that dump calls end with "Dump" suffix. Not enforced in vpe.api
-                    base_type += "JVppReply<%s.%s.%s>" % (plugin_package, dto_package, request_dto_name + "Dump")
-                    generate_dump_reply_dto(request_dto_name, base_package, plugin_package, dto_package,
-                                            camel_case_dto_name, camel_case_method_name, func)
-                else:
-                    base_type += "JVppReply<%s.%s.%s>" % (plugin_package, dto_package, request_dto_name)
-            else:
-                args = "" if fields is "" else "this"
-                methods += send_template.substitute(method_name=camel_case_method_name,
-                                                    base_package=base_package,
-                                                    plugin_package=plugin_package,
-                                                    plugin_name=plugin_name,
-                                                    args=args)
-                if util.is_dump(camel_case_dto_name):
-                    base_type += "JVppDump"
-                    description = "dump request DTO"
-                else:
-                    base_type += "JVppRequest"
-                    description = "request DTO"
-
-            write_dto_file(base_package, plugin_package, base_type, camel_case_dto_name, description, dto_package,
-                           dto_path, fields, func, inputfile, methods)
-
-        # for structures that are also used as notifications, generate dedicated notification DTO
-        if util.is_notification(func["name"]):
-            base_type = "JVppNotification"
-            description = "notification DTO"
-            camel_case_dto_name = util.add_notification_suffix(camel_case_dto_name)
-            dto_path = os.path.join(dto_package, camel_case_dto_name + ".java")
-            methods = generate_dto_base_methods(camel_case_dto_name, func)
-            write_dto_file(base_package, plugin_package, base_type, camel_case_dto_name, description, dto_package,
-                           dto_path, fields, func, inputfile, methods)
-
-    flush_dump_reply_dtos(inputfile)
-
-
-def generate_dto_base_methods(camel_case_dto_name, func):
-    methods = generate_dto_hash(func)
-    methods += generate_dto_equals(camel_case_dto_name, func)
-    methods += generate_dto_tostring(camel_case_dto_name, func)
-    return methods
-
-
-def generate_dto_fields(camel_case_dto_name, func):
-    fields = ""
-    for t in zip(func['types'], func['args']):
-        # for retval don't generate dto field in Reply
-        field_name = util.underscore_to_camelcase(t[1])
-        if util.is_reply(camel_case_dto_name) and util.is_retval_field(field_name):
-            continue
-        fields += field_template.substitute(type=util.jni_2_java_type_mapping[t[0]],
-                                            name=field_name)
-    return fields
-
-
-tostring_field_template = Template("""                \"$field_name=\" + $field_name + ", " +\n""")
-tostring_array_field_template = Template("""                \"$field_name=\" + java.util.Arrays.toString($field_name) + ", " +\n""")
-tostring_template = Template("""    @Override
-    public String toString() {
-        return "$cls_name{" +
-$fields_tostring "}";
-    }\n\n""")
-
-
-def generate_dto_tostring(camel_case_dto_name, func):
-    tostring_fields = ""
-    for t in zip(func['types'], func['args']):
-
-        field_name = util.underscore_to_camelcase(t[1])
-        # for retval don't generate dto field in Reply
-        if util.is_retval_field(field_name):
-            continue
-
-        # handle array types
-        if util.is_array(util.jni_2_java_type_mapping[t[0]]):
-            tostring_fields += tostring_array_field_template.substitute(field_name=field_name)
-        else:
-            tostring_fields += tostring_field_template.substitute(field_name=field_name)
-
-    return tostring_template.substitute(cls_name=camel_case_dto_name,
-                                        fields_tostring=tostring_fields[:-8])
-
-equals_other_template = Template("""
-        final $cls_name other = ($cls_name) o;
-\n""")
-equals_field_template = Template("""        if (!java.util.Objects.equals(this.$field_name, other.$field_name)) {
-            return false;
-        }\n""")
-equals_array_field_template = Template("""        if (!java.util.Arrays.equals(this.$field_name, other.$field_name)) {
-            return false;
-        }\n""")
-equals_template = Template("""    @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-$comparisons
-        return true;
-    }\n\n""")
-
-
-def generate_dto_equals(camel_case_dto_name, func):
-    equals_fields = ""
-    for t in zip(func['types'], func['args']):
-        field_name = util.underscore_to_camelcase(t[1])
-        # for retval don't generate dto field in Reply
-        if util.is_retval_field(field_name):
-            continue
-
-        # handle array types
-        if util.is_array(util.jni_2_java_type_mapping[t[0]]):
-            equals_fields += equals_array_field_template.substitute(field_name=field_name)
-        else:
-            equals_fields += equals_field_template.substitute(field_name=field_name)
-
-    if equals_fields != "":
-        equals_fields = equals_other_template.substitute(cls_name=camel_case_dto_name) + equals_fields
-
-    return equals_template.substitute(comparisons=equals_fields)
-
-
-hash_template = Template("""    @Override
-    public int hashCode() {
-        return java.util.Objects.hash($fields);
-    }\n\n""")
-hash_single_array_type_template = Template("""    @Override
-    public int hashCode() {
-        return java.util.Arrays.hashCode($fields);
-    }\n\n""")
-
-
-def generate_dto_hash(func):
-    hash_fields = ""
-
-    # Special handling for hashCode in case just a single array field is present. Cannot use Objects.equals since the
-    # array is mistaken for a varargs parameter. Instead use Arrays.hashCode in such case.
-    if len(func['args']) == 1:
-        single_type = func['types'][0]
-        single_type_name = func['args'][0]
-        if util.is_array(util.jni_2_java_type_mapping[single_type]):
-            return hash_single_array_type_template.substitute(fields=util.underscore_to_camelcase(single_type_name))
-
-    for t in zip(func['types'], func['args']):
-        field_name = util.underscore_to_camelcase(t[1])
-        # for retval don't generate dto field in Reply
-        if util.is_retval_field(field_name):
-            continue
-
-        hash_fields += field_name + ", "
-
-    return hash_template.substitute(fields=hash_fields[:-2])
-
-
-def write_dto_file(base_package, plugin_package, base_type, camel_case_dto_name, description, dto_package, dto_path,
-                   fields, func, inputfile, methods):
-    dto_file = open(dto_path, 'w')
-    dto_file.write(dto_template.substitute(inputfile=inputfile,
-                                           description=description,
-                                           docs=util.api_message_to_javadoc(func),
-                                           cls_name=camel_case_dto_name,
-                                           fields=fields,
-                                           methods=methods,
-                                           base_package=base_package,
-                                           plugin_package=plugin_package,
-                                           base_type=base_type,
-                                           dto_package=dto_package))
-    dto_file.flush()
-    dto_file.close()
-
-
-dump_dto_suffix = "ReplyDump"
-dump_reply_artificial_dtos = {}
-
-
-# Returns request name or special one from unconventional_naming_rep_req map
-def get_request_name(camel_case_dto_name, func_name):
-    return util.underscore_to_camelcase_upper(
-        util.unconventional_naming_rep_req[func_name]) if func_name in util.unconventional_naming_rep_req \
-        else util.remove_reply_suffix(camel_case_dto_name)
-
-
-def flush_dump_reply_dtos(inputfile):
-    for dump_reply_artificial_dto in dump_reply_artificial_dtos.values():
-        dto_path = os.path.join(dump_reply_artificial_dto['dto_package'],
-                                dump_reply_artificial_dto['cls_name'] + ".java")
-        dto_file = open(dto_path, 'w')
-        dto_file.write(dto_template.substitute(inputfile=inputfile,
-                                               description="dump reply wrapper",
-                                               docs=dump_reply_artificial_dto['docs'],
-                                               cls_name=dump_reply_artificial_dto['cls_name'],
-                                               fields=dump_reply_artificial_dto['fields'],
-                                               methods=dump_reply_artificial_dto['methods'],
-                                               plugin_package=dump_reply_artificial_dto['plugin_package'],
-                                               base_package=dump_reply_artificial_dto['base_package'],
-                                               base_type=dump_reply_artificial_dto['base_type'],
-                                               dto_package=dump_reply_artificial_dto['dto_package']))
-        dto_file.flush()
-        dto_file.close()
-
-
-def generate_dump_reply_dto(request_dto_name, base_package, plugin_package, dto_package, camel_case_dto_name,
-                            camel_case_method_name, func):
-    base_type = "JVppReplyDump<%s.%s.%s, %s.%s.%s>" % (
-        plugin_package, dto_package, util.remove_reply_suffix(camel_case_dto_name) + "Dump",
-        plugin_package, dto_package, camel_case_dto_name)
-    fields = "    public java.util.List<%s> %s = new java.util.ArrayList<>();" % (camel_case_dto_name, camel_case_method_name)
-    cls_name = camel_case_dto_name + dump_dto_suffix
-    # using artificial type for fields, just to bypass the is_array check in base methods generators
-    # the type is not really used
-    artificial_type = 'u8'
-
-    # In case of already existing artificial reply dump DTO, just update it
-    # Used for sub-dump dtos
-    if request_dto_name in dump_reply_artificial_dtos.keys():
-        dump_reply_artificial_dtos[request_dto_name]['fields'] += '\n' + fields
-        dump_reply_artificial_dtos[request_dto_name]['field_names'].append(func['name'])
-        dump_reply_artificial_dtos[request_dto_name]['field_types'].append(artificial_type)
-        methods = '\n' + generate_dto_base_methods(dump_reply_artificial_dtos[request_dto_name]['cls_name'],
-                                            {'args': dump_reply_artificial_dtos[request_dto_name]['field_names'],
-                                             'types': dump_reply_artificial_dtos[request_dto_name]['field_types']})
-        dump_reply_artificial_dtos[request_dto_name]['methods'] = methods
-    else:
-        methods = '\n' + generate_dto_base_methods(cls_name, {'args': [func['name']],
-                                                              'types': [artificial_type]})
-        dump_reply_artificial_dtos[request_dto_name] = ({'docs': util.api_message_to_javadoc(func),
-                                                         'cls_name': cls_name,
-                                                         'fields': fields,
-                                                         'field_names': [func['name']],
-                                                         'field_types': [artificial_type],
-                                                         # strip too many newlines at the end of base method block
-                                                         'methods': methods,
-                                                         'plugin_package': plugin_package,
-                                                         'base_package': base_package,
-                                                         'base_type': base_type,
-                                                         'dto_package': dto_package})
diff --git a/vpp-api/java/jvpp/gen/jvppgen/jni_gen.py b/vpp-api/java/jvpp/gen/jvppgen/jni_gen.py
deleted file mode 100644
index 328cc8d3..00000000
--- a/vpp-api/java/jvpp/gen/jvppgen/jni_gen.py
+++ /dev/null
@@ -1,295 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from string import Template
-
-import util
-
-variable_length_array_value_template = Template("""mp->${length_var_name}""")
-variable_length_array_template = Template("""clib_net_to_host_${length_field_type}(${value})""")
-
-dto_field_id_template = Template("""
-    jfieldID ${field_reference_name}FieldId = (*env)->GetFieldID(env, ${class_ref_name}Class, "${field_name}", "${jni_signature}");""")
-
-default_dto_field_setter_template = Template("""
-    (*env)->Set${jni_setter}(env, ${object_name}, ${field_reference_name}FieldId, mp->${c_name});
-""")
-
-variable_length_array_value_template = Template("""mp->${length_var_name}""")
-variable_length_array_template = Template("""clib_net_to_host_${length_field_type}(${value})""")
-
-u16_dto_field_setter_template = Template("""
-    (*env)->Set${jni_setter}(env, ${object_name}, ${field_reference_name}FieldId, clib_net_to_host_u16(mp->${c_name}));
-""")
-
-u32_dto_field_setter_template = Template("""
-    (*env)->Set${jni_setter}(env, ${object_name}, ${field_reference_name}FieldId, clib_net_to_host_u32(mp->${c_name}));
-""")
-
-u64_dto_field_setter_template = Template("""
-    (*env)->Set${jni_setter}(env, ${object_name}, ${field_reference_name}FieldId, clib_net_to_host_u64(mp->${c_name}));
-""")
-
-u8_array_dto_field_setter_template = Template("""
-    jbyteArray ${field_reference_name} = (*env)->NewByteArray(env, ${field_length});
-    (*env)->SetByteArrayRegion(env, ${field_reference_name}, 0, ${field_length}, (const jbyte*)mp->${c_name});
-    (*env)->SetObjectField(env, ${object_name}, ${field_reference_name}FieldId, ${field_reference_name});
-    (*env)->DeleteLocalRef(env, ${field_reference_name});
-""")
-
-u16_array_dto_field_setter_template = Template("""
-    {
-        jshortArray ${field_reference_name} = (*env)->NewShortArray(env, ${field_length});
-        jshort * ${field_reference_name}ArrayElements = (*env)->GetShortArrayElements(env, ${field_reference_name}, NULL);
-        unsigned int _i;
-        for (_i = 0; _i < ${field_length}; _i++) {
-            ${field_reference_name}ArrayElements[_i] = clib_net_to_host_u16(mp->${c_name}[_i]);
-        }
-
-        (*env)->ReleaseShortArrayElements(env,  ${field_reference_name}, ${field_reference_name}ArrayElements, 0);
-        (*env)->SetObjectField(env, ${object_name}, ${field_reference_name}FieldId, ${field_reference_name});
-        (*env)->DeleteLocalRef(env, ${field_reference_name});
-    }
-""")
-
-u32_array_dto_field_setter_template = Template("""
-    {
-        jintArray ${field_reference_name} = (*env)->NewIntArray(env, ${field_length});
-        jint * ${field_reference_name}ArrayElements = (*env)->GetIntArrayElements(env, ${field_reference_name}, NULL);
-        unsigned int _i;
-        for (_i = 0; _i < ${field_length}; _i++) {
-            ${field_reference_name}ArrayElements[_i] = clib_net_to_host_u32(mp->${c_name}[_i]);
-        }
-
-        (*env)->ReleaseIntArrayElements(env,  ${field_reference_name}, ${field_reference_name}ArrayElements, 0);
-        (*env)->SetObjectField(env, ${object_name}, ${field_reference_name}FieldId, ${field_reference_name});
-        (*env)->DeleteLocalRef(env, ${field_reference_name});
-    }
-""")
-
-# For each u64 array we get its elements. Then we convert values to host byte order.
-# All changes to  jlong* buffer are written to jlongArray (isCopy is set to NULL)
-u64_array_dto_field_setter_template = Template("""
-    {
-        jlongArray ${field_reference_name} = (*env)->NewLongArray(env, ${field_length});
-        jlong * ${field_reference_name}ArrayElements = (*env)->GetLongArrayElements(env, ${field_reference_name}, NULL);
-        unsigned int _i;
-        for (_i = 0; _i < ${field_length}; _i++) {
-            ${field_reference_name}ArrayElements[_i] = clib_net_to_host_u64(mp->${c_name}[_i]);
-        }
-
-        (*env)->ReleaseLongArrayElements(env,  ${field_reference_name}, ${field_reference_name}ArrayElements, 0);
-        (*env)->SetObjectField(env, ${object_name}, ${field_reference_name}FieldId, ${field_reference_name});
-        (*env)->DeleteLocalRef(env, ${field_reference_name});
-    }
-""")
-
-dto_field_setter_templates = {'u8': default_dto_field_setter_template,
-                              'u16': u16_dto_field_setter_template,
-                              'u32': u32_dto_field_setter_template,
-                              'i32': u32_dto_field_setter_template,
-                              'u64': u64_dto_field_setter_template,
-                              'f64': default_dto_field_setter_template,  # fixme
-                              'u8[]': u8_array_dto_field_setter_template,
-                              'u16[]': u16_array_dto_field_setter_template,
-                              'u32[]': u32_array_dto_field_setter_template,
-                              'u64[]': u64_array_dto_field_setter_template
-                              }
-
-
-def jni_reply_handler_for_type(handler_name, ref_name, field_type, c_name, field_reference_name,
-                               field_name, field_length, is_variable_len_array, length_field_type,
-                               object_name="dto"):
-    """
-    Generates jni code that initializes a field of java object (dto or custom type).
-    To be used in reply message handlers.
-    :param field_type: type of the field to be initialized (as defined in vpe.api)
-    :param c_name: name of the message struct member that stores initialization value
-    :param field_reference_name: name of the field reference in generated code
-    :param field_name: name of the field (camelcase)
-    :param field_length: integer or name of variable that stores field length
-    :param object_name: name of the object to be initialized
-    """
-
-    # todo move validation to vppapigen
-    if field_type.endswith('[]') and field_length == '0':
-        raise Exception('Variable array \'%s\' defined in \'%s\' '
-                        'should have defined length (e.g. \'%s[%s_length]\''
-                        % (c_name, handler_name, c_name, c_name))
-
-    if is_variable_len_array:
-        length_var_name = field_length
-        field_length = variable_length_array_value_template.substitute(length_var_name=length_var_name)
-        if length_field_type != 'u8':  # we need net to host conversion:
-            field_length = variable_length_array_template.substitute(
-                    length_field_type=length_field_type, value=field_length)
-
-    # for retval don't generate setters
-    if util.is_retval_field(c_name):
-        return ""
-
-    jni_signature = util.jni_2_signature_mapping[field_type]
-    jni_setter = util.jni_field_accessors[field_type]
-
-    result = dto_field_id_template.substitute(
-            field_reference_name=field_reference_name,
-            field_name=field_name,
-            class_ref_name=ref_name,
-            jni_signature=jni_signature)
-
-    dto_setter_template = dto_field_setter_templates[field_type]
-
-    result += dto_setter_template.substitute(
-            jni_signature=jni_signature,
-            object_name=object_name,
-            field_reference_name=field_reference_name,
-            c_name=c_name,
-            jni_setter=jni_setter,
-            field_length=field_length)
-    return result
-
-
-request_field_identifier_template = Template("""
-    jfieldID ${field_reference_name}FieldId = (*env)->GetFieldID(env, ${object_name}Class, "${field_name}", "${jni_signature}");
-    ${jni_type} ${field_reference_name} = (*env)->Get${jni_getter}(env, ${object_name}, ${field_reference_name}FieldId);
-    """)
-
-array_length_enforcement_template = Template("""
-        size_t max_size = ${field_length};
-        if (cnt > max_size) cnt = max_size;""")
-
-u8_struct_setter_template = Template("""
-    mp->${c_name} = ${field_reference_name};""")
-
-u16_struct_setter_template = Template("""
-    mp->${c_name} = clib_host_to_net_u16(${field_reference_name});""")
-
-u32_struct_setter_template = Template("""
-    mp->${c_name} = clib_host_to_net_u32(${field_reference_name});""")
-
-i32_struct_setter_template = Template("""
-    mp->${c_name} = clib_host_to_net_i32(${field_reference_name});!""")
-
-u64_struct_setter_template = Template("""
-    mp->${c_name} = clib_host_to_net_u64(${field_reference_name});""")
-
-array_length_enforcement_template = Template("""
-        size_t max_size = ${field_length};
-        if (cnt > max_size) cnt = max_size;""")
-
-u8_array_struct_setter_template = Template("""
-    if (${field_reference_name}) {
-        jsize cnt = (*env)->GetArrayLength (env, ${field_reference_name});
-        ${field_length_check}
-        (*env)->GetByteArrayRegion(env, ${field_reference_name}, 0, cnt, (jbyte *)mp->${c_name});
-    }
-""")
-
-u16_array_struct_setter_template = Template("""
-    if (${field_reference_name}) {
-        jshort * ${field_reference_name}ArrayElements = (*env)->GetShortArrayElements(env, ${field_reference_name}, NULL);
-        size_t _i;
-        jsize cnt = (*env)->GetArrayLength (env, ${field_reference_name});
-        ${field_length_check}
-        for (_i = 0; _i < cnt; _i++) {
-            mp->${c_name}[_i] = clib_host_to_net_u16(${field_reference_name}ArrayElements[_i]);
-        }
-        (*env)->ReleaseShortArrayElements (env, ${field_reference_name}, ${field_reference_name}ArrayElements, 0);
-    }
-    """)
-
-u32_array_struct_setter_template = Template("""
-    if (${field_reference_name}) {
-        jint * ${field_reference_name}ArrayElements = (*env)->GetIntArrayElements(env, ${field_reference_name}, NULL);
-        size_t _i;
-        jsize cnt = (*env)->GetArrayLength (env, ${field_reference_name});
-        ${field_length_check}
-        for (_i = 0; _i < cnt; _i++) {
-            mp->${c_name}[_i] = clib_host_to_net_u32(${field_reference_name}ArrayElements[_i]);
-        }
-        (*env)->ReleaseIntArrayElements (env, ${field_reference_name}, ${field_reference_name}ArrayElements, 0);
-    }
-    """)
-
-u64_array_struct_setter_template = Template("""
-    if (${field_reference_name}) {
-        jlong * ${field_reference_name}ArrayElements = (*env)->GetLongArrayElements(env, ${field_reference_name}, NULL);
-        size_t _i;
-        jsize cnt = (*env)->GetArrayLength (env, ${field_reference_name});
-        ${field_length_check}
-        for (_i = 0; _i < cnt; _i++) {
-            mp->${c_name}[_i] = clib_host_to_net_u64(${field_reference_name}ArrayElements[_i]);
-        }
-        (*env)->ReleaseLongArrayElements (env, ${field_reference_name}, ${field_reference_name}ArrayElements, 0);
-    }
-    """)
-
-struct_setter_templates = {'u8': u8_struct_setter_template,
-                           'u16': u16_struct_setter_template,
-                           'u32': u32_struct_setter_template,
-                           'i32': u32_struct_setter_template,
-                           'u64': u64_struct_setter_template,
-                           'u8[]': u8_array_struct_setter_template,
-                           'u16[]': u16_array_struct_setter_template,
-                           'u32[]': u32_array_struct_setter_template,
-                           'u64[]': u64_array_struct_setter_template
-                           }
-
-
-def jni_request_binding_for_type(field_type, c_name, field_reference_name, field_name, field_length,
-                                 is_variable_len_array, object_name="request"):
-    """
-    Generates jni code that initializes C structure that corresponds to a field of java object
-    (dto or custom type). To be used in request message handlers.
-    :param field_type: type of the field to be initialized (as defined in vpe.api)
-    :param c_name: name of the message struct member to be initialized
-    :param field_reference_name: name of the field reference in generated code
-    :param field_name: name of the field (camelcase)
-    :param field_length: integer or name of variable that stores field length
-    :param object_name: name of the object to be initialized
-    """
-    # field identifiers
-    jni_type = util.vpp_2_jni_type_mapping[field_type]
-    jni_signature = util.jni_2_signature_mapping[field_type]
-    jni_getter = util.jni_field_accessors[field_type]
-
-    # field identifier
-    msg_initialization = request_field_identifier_template.substitute(
-            jni_type=jni_type,
-            field_reference_name=field_reference_name,
-            field_name=field_name,
-            jni_signature=jni_signature,
-            jni_getter=jni_getter,
-            object_name=object_name)
-
-    # field setter
-    field_length_check = ""
-
-    # check if we are processing variable length array:
-    if is_variable_len_array:
-        field_length = util.underscore_to_camelcase(field_length)
-
-    # enforce max length if array has fixed length or uses variable length syntax
-    if str(field_length) != "0":
-        field_length_check = array_length_enforcement_template.substitute(field_length=field_length)
-
-    struct_setter_template = struct_setter_templates[field_type]
-
-    msg_initialization += struct_setter_template.substitute(
-            c_name=c_name,
-            field_reference_name=field_reference_name,
-            field_length_check=field_length_check)
-
-    return msg_initialization
diff --git a/vpp-api/java/jvpp/gen/jvppgen/jvpp_c_gen.py b/vpp-api/java/jvpp/gen/jvppgen/jvpp_c_gen.py
deleted file mode 100644
index 5fc84c7b..00000000
--- a/vpp-api/java/jvpp/gen/jvppgen/jvpp_c_gen.py
+++ /dev/null
@@ -1,343 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-# l
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import os, util
-from string import Template
-
-import jni_gen
-
-
-def is_manually_generated(f_name, plugin_name):
-    return f_name in {'control_ping_reply'}
-
-
-class_reference_template = Template("""jclass ${ref_name}Class;
-""")
-
-find_class_invocation_template = Template("""
-    ${ref_name}Class = (jclass)(*env)->NewGlobalRef(env, (*env)->FindClass(env, "io/fd/vpp/jvpp/${plugin_name}/dto/${class_name}"));
-    if ((*env)->ExceptionCheck(env)) {
-        (*env)->ExceptionDescribe(env);
-        return JNI_ERR;
-    }""")
-
-find_class_template = Template("""
-    ${ref_name}Class = (jclass)(*env)->NewGlobalRef(env, (*env)->FindClass(env, "${class_name}"));
-    if ((*env)->ExceptionCheck(env)) {
-        (*env)->ExceptionDescribe(env);
-        return JNI_ERR;
-    }""")
-
-delete_class_invocation_template = Template("""
-    if (${ref_name}Class) {
-        (*env)->DeleteGlobalRef(env, ${ref_name}Class);
-    }""")
-
-class_cache_template = Template("""
-$class_references
-static int cache_class_references(JNIEnv* env) {
-    $find_class_invocations
-    return 0;
-}
-
-static void delete_class_references(JNIEnv* env) {
-    $delete_class_invocations
-}""")
-
-
-def generate_class_cache(func_list, plugin_name):
-    class_references = []
-    find_class_invocations = []
-    delete_class_invocations = []
-    for f in func_list:
-        c_name = f['name']
-        class_name = util.underscore_to_camelcase_upper(c_name)
-        ref_name = util.underscore_to_camelcase(c_name)
-
-        if util.is_ignored(c_name) or util.is_control_ping(class_name):
-            continue
-
-        if util.is_reply(class_name):
-            class_references.append(class_reference_template.substitute(
-                ref_name=ref_name))
-            find_class_invocations.append(find_class_invocation_template.substitute(
-                plugin_name=plugin_name,
-                ref_name=ref_name,
-                class_name=class_name))
-            delete_class_invocations.append(delete_class_invocation_template.substitute(ref_name=ref_name))
-        elif util.is_notification(c_name):
-            class_references.append(class_reference_template.substitute(
-                ref_name=util.add_notification_suffix(ref_name)))
-            find_class_invocations.append(find_class_invocation_template.substitute(
-                plugin_name=plugin_name,
-                ref_name=util.add_notification_suffix(ref_name),
-                class_name=util.add_notification_suffix(class_name)))
-            delete_class_invocations.append(delete_class_invocation_template.substitute(
-                ref_name=util.add_notification_suffix(ref_name)))
-
-    # add exception class to class cache
-    ref_name = 'callbackException'
-    class_name = 'io/fd/vpp/jvpp/VppCallbackException'
-    class_references.append(class_reference_template.substitute(
-            ref_name=ref_name))
-    find_class_invocations.append(find_class_template.substitute(
-            ref_name=ref_name,
-            class_name=class_name))
-    delete_class_invocations.append(delete_class_invocation_template.substitute(ref_name=ref_name))
-
-    return class_cache_template.substitute(
-        class_references="".join(class_references), find_class_invocations="".join(find_class_invocations),
-        delete_class_invocations="".join(delete_class_invocations))
-
-
-# TODO: cache method and field identifiers to achieve better performance
-# https://jira.fd.io/browse/HONEYCOMB-42
-request_class_template = Template("""
-    jclass requestClass = (*env)->FindClass(env, "io/fd/vpp/jvpp/${plugin_name}/dto/${java_name_upper}");""")
-
-request_field_identifier_template = Template("""
-    jfieldID ${field_reference_name}FieldId = (*env)->GetFieldID(env, ${object_name}Class, "${field_name}", "${jni_signature}");
-    ${jni_type} ${field_reference_name} = (*env)->Get${jni_getter}(env, ${object_name}, ${field_reference_name}FieldId);
-    """)
-
-
-jni_impl_template = Template("""
-/**
- * JNI binding for sending ${c_name} message.
- * Generated based on $inputfile preparsed data:
-$api_data
- */
-JNIEXPORT jint JNICALL Java_io_fd_vpp_jvpp_${plugin_name}_JVpp${java_plugin_name}Impl_${field_name}0
-(JNIEnv * env, jclass clazz$args) {
-    ${plugin_name}_main_t *plugin_main = &${plugin_name}_main;
-    vl_api_${c_name}_t * mp;
-    u32 my_context_id = vppjni_get_context_id (&jvpp_main);
-    $request_class
-
-    // create message:
-    mp = vl_msg_api_alloc(sizeof(*mp));
-    memset (mp, 0, sizeof (*mp));
-    mp->_vl_msg_id = ntohs (VL_API_${c_name_uppercase} + plugin_main->msg_id_base);
-    mp->client_index = plugin_main->my_client_index;
-    mp->context = clib_host_to_net_u32 (my_context_id);
-
-    $msg_initialization
-
-    // send message:
-    vl_msg_api_send_shmem (plugin_main->vl_input_queue, (u8 *)&mp);
-    if ((*env)->ExceptionCheck(env)) {
-        return JNI_ERR;
-    }
-    return my_context_id;
-}""")
-
-def generate_jni_impl(func_list, plugin_name, inputfile):
-    jni_impl = []
-    for f in func_list:
-        f_name = f['name']
-        camel_case_function_name = util.underscore_to_camelcase(f_name)
-        if is_manually_generated(f_name, plugin_name) or util.is_reply(camel_case_function_name) \
-                or util.is_ignored(f_name) or util.is_just_notification(f_name):
-            continue
-
-        arguments = ''
-        request_class = ''
-        msg_initialization = ''
-        f_name_uppercase = f_name.upper()
-
-        if f['args']:
-            arguments = ', jobject request'
-            camel_case_function_name_upper = util.underscore_to_camelcase_upper(f_name)
-
-            request_class = request_class_template.substitute(
-                    java_name_upper=camel_case_function_name_upper,
-                    plugin_name=plugin_name)
-
-            for t in zip(f['types'], f['args'], f['lengths']):
-                field_name = util.underscore_to_camelcase(t[1])
-                msg_initialization += jni_gen.jni_request_binding_for_type(field_type=t[0], c_name=t[1],
-                                                                           field_reference_name=field_name,
-                                                                           field_name=field_name,
-                                                                           field_length=t[2][0],
-                                                                           is_variable_len_array=t[2][1])
-
-        jni_impl.append(jni_impl_template.substitute(
-                inputfile=inputfile,
-                api_data=util.api_message_to_javadoc(f),
-                field_reference_name=camel_case_function_name,
-                field_name=camel_case_function_name,
-                c_name_uppercase=f_name_uppercase,
-                c_name=f_name,
-                plugin_name=plugin_name,
-                java_plugin_name=plugin_name.title(),
-                request_class=request_class,
-                msg_initialization=msg_initialization,
-                args=arguments))
-
-    return "\n".join(jni_impl)
-
-# code fragment for checking result of the operation before sending request reply
-callback_err_handler_template = Template("""
-    // for negative result don't send callback message but send error callback
-    if (mp->retval<0) {
-        call_on_error("${handler_name}", mp->context, mp->retval, plugin_main->callbackClass, plugin_main->callbackObject, callbackExceptionClass);
-        return;
-    }
-    if (mp->retval == VNET_API_ERROR_IN_PROGRESS) {
-        clib_warning("Result in progress");
-        return;
-    }
-""")
-
-msg_handler_template = Template("""
-/**
- * Handler for ${handler_name} message.
- * Generated based on $inputfile preparsed data:
-$api_data
- */
-static void vl_api_${handler_name}_t_handler (vl_api_${handler_name}_t * mp)
-{
-    ${plugin_name}_main_t *plugin_main = &${plugin_name}_main;
-    JNIEnv *env = jvpp_main.jenv;
-
-    $err_handler
-
-    jmethodID constructor = (*env)->GetMethodID(env, ${class_ref_name}Class, "<init>", "()V");
-    jmethodID callbackMethod = (*env)->GetMethodID(env, plugin_main->callbackClass, "on${dto_name}", "(Lio/fd/vpp/jvpp/${plugin_name}/dto/${dto_name};)V");
-
-    jobject dto = (*env)->NewObject(env, ${class_ref_name}Class, constructor);
-    $dto_setters
-
-    (*env)->CallVoidMethod(env, plugin_main->callbackObject, callbackMethod, dto);
-    // free DTO as per http://stackoverflow.com/questions/1340938/memory-leak-when-calling-java-code-from-c-using-jni
-    (*env)->DeleteLocalRef(env, dto);
-}""")
-
-
-def generate_msg_handlers(func_list, plugin_name, inputfile):
-    handlers = []
-    for f in func_list:
-        handler_name = f['name']
-        dto_name = util.underscore_to_camelcase_upper(handler_name)
-        ref_name = util.underscore_to_camelcase(handler_name)
-
-        if is_manually_generated(handler_name, plugin_name) or util.is_ignored(handler_name):
-            continue
-
-        if not util.is_reply(dto_name) and not util.is_notification(handler_name):
-            continue
-
-        if util.is_notification(handler_name):
-            dto_name = util.add_notification_suffix(dto_name)
-            ref_name = util.add_notification_suffix(ref_name)
-
-        dto_setters = ''
-        err_handler = ''
-        # dto setters
-        for t in zip(f['types'], f['args'], f['lengths']):
-            c_name = t[1]
-            java_name = util.underscore_to_camelcase(c_name)
-            field_length = t[2][0]
-            is_variable_len_array = t[2][1]
-            length_field_type = None
-            if is_variable_len_array:
-                length_field_type = f['types'][f['args'].index(field_length)]
-            dto_setters += jni_gen.jni_reply_handler_for_type(handler_name=handler_name, ref_name=ref_name,
-                                                              field_type=t[0], c_name=t[1],
-                                                              field_reference_name=java_name,
-                                                              field_name=java_name, field_length=field_length,
-                                                              is_variable_len_array=is_variable_len_array,
-                                                              length_field_type=length_field_type)
-
-            # for retval don't generate setters and generate retval check
-            if util.is_retval_field(c_name):
-                err_handler = callback_err_handler_template.substitute(
-                    handler_name=handler_name
-                )
-                continue
-
-        handlers.append(msg_handler_template.substitute(
-            inputfile=inputfile,
-            api_data=util.api_message_to_javadoc(f),
-            handler_name=handler_name,
-            plugin_name=plugin_name,
-            dto_name=dto_name,
-            class_ref_name=ref_name,
-            dto_setters=dto_setters,
-            err_handler=err_handler))
-
-    return "\n".join(handlers)
-
-
-handler_registration_template = Template("""_(${upercase_name}, ${name}) \\
-""")
-
-
-def generate_handler_registration(func_list):
-    handler_registration = ["#define foreach_api_reply_handler \\\n"]
-    for f in func_list:
-        name = f['name']
-        camelcase_name = util.underscore_to_camelcase(f['name'])
-
-        if (not util.is_reply(camelcase_name) and not util.is_notification(name)) or util.is_ignored(name) \
-                or util.is_control_ping(camelcase_name):
-            continue
-
-        handler_registration.append(handler_registration_template.substitute(
-            name=name,
-            upercase_name=name.upper()))
-
-    return "".join(handler_registration)
-
-
-jvpp_c_template = Template("""/**
- * This file contains JNI bindings for jvpp Java API.
- * It was generated by jvpp_c_gen.py based on $inputfile
- * (python representation of api file generated by vppapigen).
- */
-
-// JAVA class reference cache
-$class_cache
-
-// JNI bindings
-$jni_implementations
-
-// Message handlers
-$msg_handlers
-
-// Registration of message handlers in vlib
-$handler_registration
-""")
-
-def generate_jvpp(func_list, plugin_name, inputfile):
-    """ Generates jvpp C file """
-    print "Generating jvpp C"
-
-    class_cache = generate_class_cache(func_list, plugin_name)
-    jni_impl = generate_jni_impl(func_list, plugin_name, inputfile)
-    msg_handlers = generate_msg_handlers(func_list, plugin_name, inputfile)
-    handler_registration = generate_handler_registration(func_list)
-
-    jvpp_c_file = open("jvpp_%s_gen.h" % plugin_name, 'w')
-    jvpp_c_file.write(jvpp_c_template.substitute(
-            inputfile=inputfile,
-            class_cache=class_cache,
-            jni_implementations=jni_impl,
-            msg_handlers=msg_handlers,
-            handler_registration=handler_registration))
-    jvpp_c_file.flush()
-    jvpp_c_file.close()
-
diff --git a/vpp-api/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py b/vpp-api/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py
deleted file mode 100644
index ac096a71..00000000
--- a/vpp-api/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py
+++ /dev/null
@@ -1,324 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os, util
-from string import Template
-
-import callback_gen
-import dto_gen
-
-jvpp_ifc_template = Template("""
-package $plugin_package.$callback_facade_package;
-
-/**
- * <p>Callback Java API representation of $plugin_package plugin.
- * <br>It was generated by jvpp_callback_facade_gen.py based on $inputfile
- * <br>(python representation of api file generated by vppapigen).
- */
-public interface CallbackJVpp${plugin_name} extends $base_package.$notification_package.NotificationRegistryProvider, java.lang.AutoCloseable {
-
-    // TODO add send
-
-$methods
-}
-""")
-
-jvpp_impl_template = Template("""
-package $plugin_package.$callback_facade_package;
-
-/**
- * <p>Default implementation of Callback${plugin_name}JVpp interface.
- * <br>It was generated by jvpp_callback_facade_gen.py based on $inputfile
- * <br>(python representation of api file generated by vppapigen).
- */
-public final class CallbackJVpp${plugin_name}Facade implements CallbackJVpp${plugin_name} {
-
-    private final $plugin_package.JVpp${plugin_name} jvpp;
-    private final java.util.Map<Integer, $base_package.$callback_package.JVppCallback> callbacks;
-    private final $plugin_package.$notification_package.${plugin_name}NotificationRegistryImpl notificationRegistry = new $plugin_package.$notification_package.${plugin_name}NotificationRegistryImpl();
-    /**
-     * <p>Create CallbackJVpp${plugin_name}Facade object for provided JVpp instance.
-     * Constructor internally creates CallbackJVppFacadeCallback class for processing callbacks
-     * and then connects to provided JVpp instance
-     *
-     * @param jvpp provided $base_package.JVpp instance
-     *
-     * @throws java.io.IOException in case instance cannot connect to JVPP
-     */
-    public CallbackJVpp${plugin_name}Facade(final $base_package.JVppRegistry registry, final $plugin_package.JVpp${plugin_name} jvpp) throws java.io.IOException {
-        this.jvpp = java.util.Objects.requireNonNull(jvpp,"jvpp is null");
-        this.callbacks = new java.util.HashMap<>();
-        java.util.Objects.requireNonNull(registry, "JVppRegistry should not be null");
-        registry.register(jvpp, new CallbackJVpp${plugin_name}FacadeCallback(this.callbacks, notificationRegistry));
-    }
-
-    @Override
-    public $plugin_package.$notification_package.${plugin_name}NotificationRegistry getNotificationRegistry() {
-        return notificationRegistry;
-    }
-
-    @Override
-    public void close() throws Exception {
-        jvpp.close();
-    }
-
-    // TODO add send()
-
-$methods
-}
-""")
-
-method_template = Template(
-    """    void $name($plugin_package.$dto_package.$request request, $plugin_package.$callback_package.$callback callback) throws $base_package.VppInvocationException;""")
-
-method_impl_template = Template("""    public final void $name($plugin_package.$dto_package.$request request, $plugin_package.$callback_package.$callback callback) throws $base_package.VppInvocationException {
-        synchronized (callbacks) {
-            callbacks.put(jvpp.$name(request), callback);
-        }
-    }
-""")
-
-no_arg_method_template = Template("""    void $name($plugin_package.$callback_package.$callback callback) throws $base_package.VppInvocationException;""")
-no_arg_method_impl_template = Template("""    public final void $name($plugin_package.$callback_package.$callback callback) throws $base_package.VppInvocationException {
-        synchronized (callbacks) {
-            callbacks.put(jvpp.$name(), callback);
-        }
-    }
-""")
-
-
-def generate_jvpp(func_list, base_package, plugin_package, plugin_name, dto_package, callback_package, notification_package, callback_facade_package, inputfile):
-    """ Generates callback facade """
-    print "Generating JVpp callback facade"
-
-    if os.path.exists(callback_facade_package):
-        util.remove_folder(callback_facade_package)
-
-    os.mkdir(callback_facade_package)
-
-    methods = []
-    methods_impl = []
-    for func in func_list:
-
-        if util.is_notification(func['name']) or util.is_ignored(func['name']):
-            continue
-
-        camel_case_name = util.underscore_to_camelcase(func['name'])
-        camel_case_name_upper = util.underscore_to_camelcase_upper(func['name'])
-        if util.is_reply(camel_case_name) or util.is_control_ping(camel_case_name):
-            continue
-
-        # Strip suffix for dump calls
-        callback_type = get_request_name(camel_case_name_upper, func['name']) + callback_gen.callback_suffix
-
-        if len(func['args']) == 0:
-            methods.append(no_arg_method_template.substitute(name=camel_case_name,
-                                                             base_package=base_package,
-                                                             plugin_package=plugin_package,
-                                                             dto_package=dto_package,
-                                                             callback_package=callback_package,
-                                                             callback=callback_type))
-            methods_impl.append(no_arg_method_impl_template.substitute(name=camel_case_name,
-                                                                       base_package=base_package,
-                                                                       plugin_package=plugin_package,
-                                                                       dto_package=dto_package,
-                                                                       callback_package=callback_package,
-                                                                       callback=callback_type))
-        else:
-            methods.append(method_template.substitute(name=camel_case_name,
-                                                      request=camel_case_name_upper,
-                                                      base_package=base_package,
-                                                      plugin_package=plugin_package,
-                                                      dto_package=dto_package,
-                                                      callback_package=callback_package,
-                                                      callback=callback_type))
-            methods_impl.append(method_impl_template.substitute(name=camel_case_name,
-                                                                request=camel_case_name_upper,
-                                                                base_package=base_package,
-                                                                plugin_package=plugin_package,
-                                                                dto_package=dto_package,
-                                                                callback_package=callback_package,
-                                                                callback=callback_type))
-
-    join = os.path.join(callback_facade_package, "CallbackJVpp%s.java" % plugin_name)
-    jvpp_file = open(join, 'w')
-    jvpp_file.write(
-        jvpp_ifc_template.substitute(inputfile=inputfile,
-                                     methods="\n".join(methods),
-                                     base_package=base_package,
-                                     plugin_package=plugin_package,
-                                     plugin_name=plugin_name,
-                                     dto_package=dto_package,
-                                     notification_package=notification_package,
-                                     callback_facade_package=callback_facade_package))
-    jvpp_file.flush()
-    jvpp_file.close()
-
-    jvpp_file = open(os.path.join(callback_facade_package, "CallbackJVpp%sFacade.java" % plugin_name), 'w')
-    jvpp_file.write(jvpp_impl_template.substitute(inputfile=inputfile,
-                                                  methods="\n".join(methods_impl),
-                                                  base_package=base_package,
-                                                  plugin_package=plugin_package,
-                                                  plugin_name=plugin_name,
-                                                  dto_package=dto_package,
-                                                  notification_package=notification_package,
-                                                  callback_package=callback_package,
-                                                  callback_facade_package=callback_facade_package))
-    jvpp_file.flush()
-    jvpp_file.close()
-
-    generate_callback(func_list, base_package, plugin_package, plugin_name, dto_package, callback_package, notification_package, callback_facade_package, inputfile)
-
-
-jvpp_facade_callback_template = Template("""
-package $plugin_package.$callback_facade_package;
-
-/**
- * <p>Implementation of JVppGlobalCallback interface for Java Callback API.
- * <br>It was generated by jvpp_callback_facade_gen.py based on $inputfile
- * <br>(python representation of api file generated by vppapigen).
- */
-public final class CallbackJVpp${plugin_name}FacadeCallback implements $plugin_package.$callback_package.JVpp${plugin_name}GlobalCallback {
-
-    private final java.util.Map<Integer, $base_package.$callback_package.JVppCallback> requests;
-    private final $plugin_package.$notification_package.Global${plugin_name}NotificationCallback notificationCallback;
-    private static final java.util.logging.Logger LOG = java.util.logging.Logger.getLogger(CallbackJVpp${plugin_name}FacadeCallback.class.getName());
-
-    public CallbackJVpp${plugin_name}FacadeCallback(final java.util.Map<Integer, $base_package.$callback_package.JVppCallback> requestMap,
-                                      final $plugin_package.$notification_package.Global${plugin_name}NotificationCallback notificationCallback) {
-        this.requests = requestMap;
-        this.notificationCallback = notificationCallback;
-    }
-
-    @Override
-    public void onError($base_package.VppCallbackException reply) {
-
-        $base_package.$callback_package.JVppCallback failedCall;
-        synchronized(requests) {
-            failedCall = requests.remove(reply.getCtxId());
-        }
-
-        if(failedCall != null) {
-            try {
-                failedCall.onError(reply);
-            } catch(RuntimeException ex) {
-                ex.addSuppressed(reply);
-                LOG.log(java.util.logging.Level.WARNING, String.format("Callback: %s failed while handling exception: %s", failedCall, reply), ex);
-            }
-        }
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void onControlPingReply($base_package.$dto_package.ControlPingReply reply) {
-
-        $base_package.$callback_package.ControlPingCallback callback;
-        synchronized(requests) {
-            callback = ($base_package.$callback_package.ControlPingCallback) requests.remove(reply.context);
-        }
-
-        if(callback != null) {
-            callback.onControlPingReply(reply);
-        }
-    }
-
-$methods
-}
-""")
-
-jvpp_facade_callback_method_template = Template("""
-    @Override
-    @SuppressWarnings("unchecked")
-    public void on$callback_dto($plugin_package.$dto_package.$callback_dto reply) {
-
-        $plugin_package.$callback_package.$callback callback;
-        synchronized(requests) {
-            callback = ($plugin_package.$callback_package.$callback) requests.remove(reply.context);
-        }
-
-        if(callback != null) {
-            callback.on$callback_dto(reply);
-        }
-    }
-""")
-
-jvpp_facade_callback_notification_method_template = Template("""
-    @Override
-    @SuppressWarnings("unchecked")
-    public void on$callback_dto($plugin_package.$dto_package.$callback_dto notification) {
-        notificationCallback.on$callback_dto(notification);
-    }
-""")
-
-
-def generate_callback(func_list, base_package, plugin_package, plugin_name, dto_package, callback_package, notification_package, callback_facade_package, inputfile):
-    callbacks = []
-    for func in func_list:
-
-        camel_case_name_with_suffix = util.underscore_to_camelcase_upper(func['name'])
-
-        if util.is_ignored(func['name']) or util.is_control_ping(camel_case_name_with_suffix):
-            continue
-
-        if util.is_reply(camel_case_name_with_suffix):
-            callbacks.append(jvpp_facade_callback_method_template.substitute(plugin_package=plugin_package,
-                                                                             dto_package=dto_package,
-                                                                             callback_package=callback_package,
-                                                                             callback=util.remove_reply_suffix(camel_case_name_with_suffix) + callback_gen.callback_suffix,
-                                                                             callback_dto=camel_case_name_with_suffix))
-
-        if util.is_notification(func["name"]):
-            with_notification_suffix = util.add_notification_suffix(camel_case_name_with_suffix)
-            callbacks.append(jvpp_facade_callback_notification_method_template.substitute(plugin_package=plugin_package,
-                                                                             dto_package=dto_package,
-                                                                             callback_package=callback_package,
-                                                                             callback=with_notification_suffix + callback_gen.callback_suffix,
-                                                                             callback_dto=with_notification_suffix))
-
-    jvpp_file = open(os.path.join(callback_facade_package, "CallbackJVpp%sFacadeCallback.java" % plugin_name), 'w')
-    jvpp_file.write(jvpp_facade_callback_template.substitute(inputfile=inputfile,
-                                                             base_package=base_package,
-                                                             plugin_package=plugin_package,
-                                                             plugin_name=plugin_name,
-                                                             dto_package=dto_package,
-                                                             notification_package=notification_package,
-                                                             callback_package=callback_package,
-                                                             methods="".join(callbacks),
-                                                             callback_facade_package=callback_facade_package))
-    jvpp_file.flush()
-    jvpp_file.close()
-
-
-# Returns request name or special one from unconventional_naming_rep_req map
-def get_request_name(camel_case_dto_name, func_name):
-    if func_name in reverse_dict(util.unconventional_naming_rep_req):
-        request_name = util.underscore_to_camelcase_upper(reverse_dict(util.unconventional_naming_rep_req)[func_name])
-    else:
-        request_name = camel_case_dto_name
-    return remove_suffix(request_name)
-
-
-def reverse_dict(map):
-    return dict((v, k) for k, v in map.iteritems())
-
-
-def remove_suffix(name):
-    if util.is_reply(name):
-        return util.remove_reply_suffix(name)
-    else:
-        if util.is_dump(name):
-            return util.remove_suffix(name, util.dump_suffix)
-        else:
-            return name
diff --git a/vpp-api/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py b/vpp-api/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py
deleted file mode 100644
index ebb840f7..00000000
--- a/vpp-api/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py
+++ /dev/null
@@ -1,331 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os
-from string import Template
-
-import dto_gen
-import util
-
-jvpp_facade_callback_template = Template("""
-package $plugin_package.$future_package;
-
-/**
- * <p>Async facade callback setting values to future objects
- * <br>It was generated by jvpp_future_facade_gen.py based on $inputfile
- * <br>(python representation of api file generated by vppapigen).
- */
-public final class FutureJVpp${plugin_name}FacadeCallback implements $plugin_package.$callback_package.JVpp${plugin_name}GlobalCallback {
-
-    private final java.util.Map<java.lang.Integer, java.util.concurrent.CompletableFuture<? extends $base_package.$dto_package.JVppReply<?>>> requests;
-    private final $plugin_package.$notification_package.Global${plugin_name}NotificationCallback notificationCallback;
-
-    public FutureJVpp${plugin_name}FacadeCallback(
-        final java.util.Map<java.lang.Integer, java.util.concurrent.CompletableFuture<? extends $base_package.$dto_package.JVppReply<?>>> requestMap,
-        final $plugin_package.$notification_package.Global${plugin_name}NotificationCallback notificationCallback) {
-        this.requests = requestMap;
-        this.notificationCallback = notificationCallback;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void onError($base_package.VppCallbackException reply) {
-        final java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>> completableFuture;
-
-        synchronized(requests) {
-            completableFuture = (java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>>) requests.get(reply.getCtxId());
-        }
-
-        if(completableFuture != null) {
-            completableFuture.completeExceptionally(reply);
-
-            synchronized(requests) {
-                requests.remove(reply.getCtxId());
-            }
-        }
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void onControlPingReply($base_package.$dto_package.ControlPingReply reply) {
-        final java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>> completableFuture;
-
-        synchronized(requests) {
-            completableFuture = (java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>>) requests.get(reply.context);
-        }
-
-        if(completableFuture != null) {
-            // Finish dump call
-            if (completableFuture instanceof $base_package.$future_package.AbstractFutureJVppInvoker.CompletableDumpFuture) {
-                completableFuture.complete((($base_package.$future_package.AbstractFutureJVppInvoker.CompletableDumpFuture) completableFuture).getReplyDump());
-                // Remove future mapped to dump call context id
-                synchronized(requests) {
-                    requests.remove((($base_package.$future_package.AbstractFutureJVppInvoker.CompletableDumpFuture) completableFuture).getContextId());
-                }
-            } else {
-                completableFuture.complete(reply);
-            }
-
-            synchronized(requests) {
-                requests.remove(reply.context);
-            }
-        }
-    }
-
-$methods
-}
-""")
-
-jvpp_facade_callback_method_template = Template("""
-    @Override
-    @SuppressWarnings("unchecked")
-    public void on$callback_dto($plugin_package.$dto_package.$callback_dto reply) {
-        final java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>> completableFuture;
-
-        synchronized(requests) {
-            completableFuture = (java.util.concurrent.CompletableFuture<$base_package.$dto_package.JVppReply<?>>) requests.get(reply.context);
-        }
-
-        if(completableFuture != null) {
-            completableFuture.complete(reply);
-
-            synchronized(requests) {
-                requests.remove(reply.context);
-            }
-        }
-    }
-""")
-
-jvpp_facade_callback_notification_method_template = Template("""
-    @Override
-    public void on$callback_dto($plugin_package.$dto_package.$callback_dto notification) {
-        notificationCallback.on$callback_dto(notification);
-    }
-""")
-
-jvpp_facade_details_callback_method_template = Template("""
-    @Override
-    @SuppressWarnings("unchecked")
-    public void on$callback_dto($plugin_package.$dto_package.$callback_dto reply) {
-        final $base_package.$future_package.AbstractFutureJVppInvoker.CompletableDumpFuture<$plugin_package.$dto_package.$callback_dto_reply_dump> completableFuture;
-
-        synchronized(requests) {
-            completableFuture = ($base_package.$future_package.AbstractFutureJVppInvoker.CompletableDumpFuture<$plugin_package.$dto_package.$callback_dto_reply_dump>) requests.get(reply.context);
-        }
-
-        if(completableFuture != null) {
-            completableFuture.getReplyDump().$callback_dto_field.add(reply);
-        }
-    }
-""")
-
-
-def generate_jvpp(func_list, base_package, plugin_package, plugin_name, dto_package, callback_package, notification_package, future_facade_package, inputfile):
-    """ Generates JVpp interface and JNI implementation """
-    print "Generating JVpp future facade"
-
-    if not os.path.exists(future_facade_package):
-        raise Exception("%s folder is missing" % future_facade_package)
-
-    methods = []
-    methods_impl = []
-    callbacks = []
-    for func in func_list:
-        camel_case_name_with_suffix = util.underscore_to_camelcase_upper(func['name'])
-
-        if util.is_ignored(func['name']) or util.is_control_ping(camel_case_name_with_suffix):
-            continue
-
-        if not util.is_reply(camel_case_name_with_suffix) and not util.is_notification(func['name']):
-            continue
-
-        camel_case_method_name = util.underscore_to_camelcase(func['name'])
-
-        if not util.is_notification(func["name"]):
-            camel_case_request_method_name = util.remove_reply_suffix(util.underscore_to_camelcase(func['name']))
-            if util.is_details(camel_case_name_with_suffix):
-                camel_case_reply_name = get_standard_dump_reply_name(util.underscore_to_camelcase_upper(func['name']),
-                                                                     func['name'])
-                callbacks.append(jvpp_facade_details_callback_method_template.substitute(base_package=base_package,
-                                                                                         plugin_package=plugin_package,
-                                                                                         dto_package=dto_package,
-                                                                                         callback_dto=camel_case_name_with_suffix,
-                                                                                         callback_dto_field=camel_case_method_name,
-                                                                                         callback_dto_reply_dump=camel_case_reply_name + dto_gen.dump_dto_suffix,
-                                                                                         future_package=future_facade_package))
-
-                methods.append(future_jvpp_method_template.substitute(plugin_package=plugin_package,
-                                                                      dto_package=dto_package,
-                                                                      method_name=camel_case_request_method_name +
-                                                                                  util.underscore_to_camelcase_upper(util.dump_suffix),
-                                                                      reply_name=camel_case_reply_name + dto_gen.dump_dto_suffix,
-                                                                      request_name=util.remove_reply_suffix(camel_case_reply_name) +
-                                                                                   util.underscore_to_camelcase_upper(util.dump_suffix)))
-                methods_impl.append(future_jvpp_dump_method_impl_template.substitute(plugin_package=plugin_package,
-                                                                                     dto_package=dto_package,
-                                                                                     method_name=camel_case_request_method_name +
-                                                                                                 util.underscore_to_camelcase_upper(util.dump_suffix),
-                                                                                     reply_name=camel_case_reply_name + dto_gen.dump_dto_suffix,
-                                                                                     request_name=util.remove_reply_suffix(camel_case_reply_name) +
-                                                                                                  util.underscore_to_camelcase_upper(util.dump_suffix)))
-            else:
-                request_name = util.underscore_to_camelcase_upper(util.unconventional_naming_rep_req[func['name']]) \
-                    if func['name'] in util.unconventional_naming_rep_req else util.remove_reply_suffix(camel_case_name_with_suffix)
-
-                methods.append(future_jvpp_method_template.substitute(plugin_package=plugin_package,
-                                                                      dto_package=dto_package,
-                                                                      method_name=camel_case_request_method_name,
-                                                                      reply_name=camel_case_name_with_suffix,
-                                                                      request_name=request_name))
-                methods_impl.append(future_jvpp_method_impl_template.substitute(plugin_package=plugin_package,
-                                                                                dto_package=dto_package,
-                                                                                method_name=camel_case_request_method_name,
-                                                                                reply_name=camel_case_name_with_suffix,
-                                                                                request_name=request_name))
-
-                callbacks.append(jvpp_facade_callback_method_template.substitute(base_package=base_package,
-                                                                                 plugin_package=plugin_package,
-                                                                                 dto_package=dto_package,
-                                                                                 callback_dto=camel_case_name_with_suffix))
-
-        if util.is_notification(func["name"]):
-            callbacks.append(jvpp_facade_callback_notification_method_template.substitute(plugin_package=plugin_package,
-                                                                                          dto_package=dto_package,
-                                                                                          callback_dto=util.add_notification_suffix(camel_case_name_with_suffix)))
-
-    jvpp_file = open(os.path.join(future_facade_package, "FutureJVpp%sFacadeCallback.java" % plugin_name), 'w')
-    jvpp_file.write(jvpp_facade_callback_template.substitute(inputfile=inputfile,
-                                                             base_package=base_package,
-                                                             plugin_package=plugin_package,
-                                                             plugin_name=plugin_name,
-                                                             dto_package=dto_package,
-                                                             notification_package=notification_package,
-                                                             callback_package=callback_package,
-                                                             methods="".join(callbacks),
-                                                             future_package=future_facade_package))
-    jvpp_file.flush()
-    jvpp_file.close()
-
-    jvpp_file = open(os.path.join(future_facade_package, "FutureJVpp%s.java" % plugin_name), 'w')
-    jvpp_file.write(future_jvpp_template.substitute(inputfile=inputfile,
-                                                    base_package=base_package,
-                                                    plugin_package=plugin_package,
-                                                    plugin_name=plugin_name,
-                                                    notification_package=notification_package,
-                                                    methods="".join(methods),
-                                                    future_package=future_facade_package))
-    jvpp_file.flush()
-    jvpp_file.close()
-
-    jvpp_file = open(os.path.join(future_facade_package, "FutureJVpp%sFacade.java" % plugin_name), 'w')
-    jvpp_file.write(future_jvpp_facade_template.substitute(inputfile=inputfile,
-                                                           base_package=base_package,
-                                                           plugin_package=plugin_package,
-                                                           plugin_name=plugin_name,
-                                                           dto_package=dto_package,
-                                                           notification_package=notification_package,
-                                                           methods="".join(methods_impl),
-                                                           future_package=future_facade_package))
-    jvpp_file.flush()
-    jvpp_file.close()
-
-
-future_jvpp_template = Template('''
-package $plugin_package.$future_package;
-
-/**
- * <p>Async facade extension adding specific methods for each request invocation
- * <br>It was generated by jvpp_future_facade_gen.py based on $inputfile
- * <br>(python representation of api file generated by vppapigen).
- */
-public interface FutureJVpp${plugin_name} extends $base_package.$future_package.FutureJVppInvoker {
-$methods
-
-    @Override
-    public $plugin_package.$notification_package.${plugin_name}NotificationRegistry getNotificationRegistry();
-
-}
-''')
-
-future_jvpp_method_template = Template('''
-    java.util.concurrent.CompletionStage<$plugin_package.$dto_package.$reply_name> $method_name($plugin_package.$dto_package.$request_name request);
-''')
-
-
-future_jvpp_facade_template = Template('''
-package $plugin_package.$future_package;
-
-/**
- * <p>Implementation of FutureJVpp based on AbstractFutureJVppInvoker
- * <br>It was generated by jvpp_future_facade_gen.py based on $inputfile
- * <br>(python representation of api file generated by vppapigen).
- */
-public class FutureJVpp${plugin_name}Facade extends $base_package.$future_package.AbstractFutureJVppInvoker implements FutureJVpp${plugin_name} {
-
-    private final $plugin_package.$notification_package.${plugin_name}NotificationRegistryImpl notificationRegistry = new $plugin_package.$notification_package.${plugin_name}NotificationRegistryImpl();
-
-    /**
-     * <p>Create FutureJVpp${plugin_name}Facade object for provided JVpp instance.
-     * Constructor internally creates FutureJVppFacadeCallback class for processing callbacks
-     * and then connects to provided JVpp instance
-     *
-     * @param jvpp provided $base_package.JVpp instance
-     *
-     * @throws java.io.IOException in case instance cannot connect to JVPP
-     */
-    public FutureJVpp${plugin_name}Facade(final $base_package.JVppRegistry registry, final $base_package.JVpp jvpp) throws java.io.IOException {
-        super(jvpp, registry, new java.util.HashMap<>());
-        java.util.Objects.requireNonNull(registry, "JVppRegistry should not be null");
-        registry.register(jvpp, new FutureJVpp${plugin_name}FacadeCallback(getRequests(), notificationRegistry));
-    }
-
-    @Override
-    public $plugin_package.$notification_package.${plugin_name}NotificationRegistry getNotificationRegistry() {
-        return notificationRegistry;
-    }
-
-$methods
-}
-''')
-
-future_jvpp_method_impl_template = Template('''
-    @Override
-    public java.util.concurrent.CompletionStage<$plugin_package.$dto_package.$reply_name> $method_name($plugin_package.$dto_package.$request_name request) {
-        return send(request);
-    }
-''')
-
-future_jvpp_dump_method_impl_template = Template('''
-    @Override
-    public java.util.concurrent.CompletionStage<$plugin_package.$dto_package.$reply_name> $method_name($plugin_package.$dto_package.$request_name request) {
-        return send(request, new $plugin_package.$dto_package.$reply_name());
-    }
-''')
-
-
-# Returns request name or special one from unconventional_naming_rep_req map
-def get_standard_dump_reply_name(camel_case_dto_name, func_name):
-    # FIXME this is a hotfix for sub-details callbacks
-    # FIXME also for L2FibTableEntry
-    # It's all because unclear mapping between
-    #  request -> reply,
-    #  dump -> reply, details,
-    #  notification_start -> reply, notifications
-
-    # vpe.api needs to be "standardized" so we can parse the information and create maps before generating java code
-    suffix = func_name.split("_")[-1]
-    return util.underscore_to_camelcase_upper(
-        util.unconventional_naming_rep_req[func_name]) + util.underscore_to_camelcase_upper(suffix) if func_name in util.unconventional_naming_rep_req \
-        else camel_case_dto_name
diff --git a/vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py b/vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py
deleted file mode 100644
index 4146c141..00000000
--- a/vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py
+++ /dev/null
@@ -1,219 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os, util
-from string import Template
-
-jvpp_ifc_template = Template("""
-package $plugin_package;
-
-/**
- * <p>Java representation of plugin's api file.
- * <br>It was generated by jvpp_impl_gen.py based on $inputfile
- * <br>(python representation of api file generated by vppapigen).
- */
-public interface JVpp${plugin_name} extends $base_package.JVpp {
-
-    /**
-     * Generic dispatch method for sending requests to VPP
-     *
-     * @throws io.fd.vpp.jvpp.VppInvocationException if send request had failed
-     */
-    int send($base_package.$dto_package.JVppRequest request) throws io.fd.vpp.jvpp.VppInvocationException;
-
-$methods
-}
-""")
-
-jvpp_impl_template = Template("""
-package $plugin_package;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.PosixFilePermission;
-import java.nio.file.attribute.PosixFilePermissions;
-import java.util.Set;
-import java.util.logging.Logger;
-import $base_package.callback.JVppCallback;
-import $base_package.VppConnection;
-import $base_package.JVppRegistry;
-
-/**
- * <p>Default implementation of JVpp interface.
- * <br>It was generated by jvpp_impl_gen.py based on $inputfile
- * <br>(python representation of api file generated by vppapigen).
- */
-public final class JVpp${plugin_name}Impl implements $plugin_package.JVpp${plugin_name} {
-
-    private final static Logger LOG = Logger.getLogger(JVpp${plugin_name}Impl.class.getName());
-    private static final String LIBNAME = "libjvpp_${plugin_name_underscore}.so.0.0.0";
-
-    // FIXME using NativeLibraryLoader makes load fail could not find (WantInterfaceEventsReply).
-    static {
-        try {
-            loadLibrary();
-        } catch (Exception e) {
-            LOG.severe("Can't find jvpp jni library: " + LIBNAME);
-            throw new ExceptionInInitializerError(e);
-        }
-    }
-
-    private static void loadStream(final InputStream is) throws IOException {
-        final Set<PosixFilePermission> perms = PosixFilePermissions.fromString("rwxr-x---");
-        final Path p = Files.createTempFile(LIBNAME, null, PosixFilePermissions.asFileAttribute(perms));
-        try {
-            Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
-
-            try {
-                Runtime.getRuntime().load(p.toString());
-            } catch (UnsatisfiedLinkError e) {
-                throw new IOException("Failed to load library " + p, e);
-            }
-        } finally {
-            try {
-                Files.deleteIfExists(p);
-            } catch (IOException e) {
-            }
-        }
-    }
-
-    private static void loadLibrary() throws IOException {
-        try (final InputStream is = JVpp${plugin_name}Impl.class.getResourceAsStream('/' + LIBNAME)) {
-            if (is == null) {
-                throw new IOException("Failed to open library resource " + LIBNAME);
-            }
-            loadStream(is);
-        }
-    }
-
-    private VppConnection connection;
-    private JVppRegistry registry;
-
-    private static native void init0(final JVppCallback callback, final long queueAddress, final int clientIndex);
-    @Override
-    public void init(final JVppRegistry registry, final JVppCallback callback, final long queueAddress, final int clientIndex) {
-        this.registry = java.util.Objects.requireNonNull(registry, "registry should not be null");
-        this.connection = java.util.Objects.requireNonNull(registry.getConnection(), "connection should not be null");
-        connection.checkActive();
-        init0(callback, queueAddress, clientIndex);
-    }
-
-    private static native void close0();
-    @Override
-    public void close() {
-        close0();
-    }
-
-    @Override
-    public int send($base_package.$dto_package.JVppRequest request) throws io.fd.vpp.jvpp.VppInvocationException {
-        return request.send(this);
-    }
-
-    @Override
-    public final int controlPing(final io.fd.vpp.jvpp.dto.ControlPing controlPing) throws io.fd.vpp.jvpp.VppInvocationException {
-        return registry.controlPing(JVpp${plugin_name}Impl.class);
-    }
-
-$methods
-}
-""")
-
-method_template = Template("""    int $name($plugin_package.$dto_package.$request request) throws io.fd.vpp.jvpp.VppInvocationException;""")
-method_native_template = Template(
-    """    private static native int ${name}0($plugin_package.$dto_package.$request request);""")
-method_impl_template = Template("""    public final int $name($plugin_package.$dto_package.$request request) throws io.fd.vpp.jvpp.VppInvocationException {
-        java.util.Objects.requireNonNull(request,"Null request object");
-        connection.checkActive();
-        int result=${name}0(request);
-        if(result<0){
-            throw new io.fd.vpp.jvpp.VppInvocationException("${name}",result);
-        }
-        return result;
-    }
-""")
-
-no_arg_method_template = Template("""    int $name() throws io.fd.vpp.jvpp.VppInvocationException;""")
-no_arg_method_native_template = Template("""    private static native int ${name}0() throws io.fd.vpp.jvpp.VppInvocationException;""")
-no_arg_method_impl_template = Template("""    public final int $name() throws io.fd.vpp.jvpp.VppInvocationException {
-        connection.checkActive();
-        int result=${name}0();
-        if(result<0){
-            throw new io.fd.vpp.jvpp.VppInvocationException("${name}",result);
-        }
-        return result;
-    }
-""")
-
-
-def generate_jvpp(func_list, base_package, plugin_package, plugin_name_underscore, dto_package, inputfile):
-    """ Generates JVpp interface and JNI implementation """
-    print "Generating JVpp"
-    plugin_name = util.underscore_to_camelcase_upper(plugin_name_underscore)
-
-    methods = []
-    methods_impl = []
-    for func in func_list:
-
-        # Skip structures that are used only as notifications
-        if util.is_just_notification(func['name']) or util.is_ignored(func['name']):
-            continue
-
-        camel_case_name = util.underscore_to_camelcase(func['name'])
-        camel_case_name_upper = util.underscore_to_camelcase_upper(func['name'])
-        if util.is_reply(camel_case_name):
-            continue
-
-        if len(func['args']) == 0:
-            methods.append(no_arg_method_template.substitute(name=camel_case_name))
-            methods_impl.append(no_arg_method_native_template.substitute(name=camel_case_name))
-            methods_impl.append(no_arg_method_impl_template.substitute(name=camel_case_name))
-        else:
-            methods.append(method_template.substitute(name=camel_case_name,
-                                                      request=camel_case_name_upper,
-                                                      plugin_package=plugin_package,
-                                                      dto_package=dto_package))
-            methods_impl.append(method_native_template.substitute(name=camel_case_name,
-                                                                  request=camel_case_name_upper,
-                                                                  plugin_package=plugin_package,
-                                                                  dto_package=dto_package))
-            methods_impl.append(method_impl_template.substitute(name=camel_case_name,
-                                                                request=camel_case_name_upper,
-                                                                plugin_package=plugin_package,
-                                                                dto_package=dto_package))
-
-    jvpp_file = open("JVpp%s.java" % plugin_name, 'w')
-    jvpp_file.write(
-        jvpp_ifc_template.substitute(inputfile=inputfile,
-                                     methods="\n".join(methods),
-                                     base_package=base_package,
-                                     plugin_package=plugin_package,
-                                     plugin_name=plugin_name,
-                                     dto_package=dto_package))
-    jvpp_file.flush()
-    jvpp_file.close()
-
-    jvpp_file = open("JVpp%sImpl.java" % plugin_name, 'w')
-    jvpp_file.write(jvpp_impl_template.substitute(inputfile=inputfile,
-                                                  methods="\n".join(methods_impl),
-                                                  base_package=base_package,
-                                                  plugin_package=plugin_package,
-                                                  plugin_name=plugin_name,
-                                                  plugin_name_underscore=plugin_name_underscore,
-                                                  dto_package=dto_package))
-    jvpp_file.flush()
-    jvpp_file.close()
diff --git a/vpp-api/java/jvpp/gen/jvppgen/notification_gen.py b/vpp-api/java/jvpp/gen/jvppgen/notification_gen.py
deleted file mode 100644
index eb380fc8..00000000
--- a/vpp-api/java/jvpp/gen/jvppgen/notification_gen.py
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os
-
-import callback_gen
-import util
-from string import Template
-
-notification_registry_template = Template("""
-package $plugin_package.$notification_package;
-
-/**
- * <p>Registry for notification callbacks defined in ${plugin_name}.
- * <br>It was generated by notification_gen.py based on $inputfile
- * <br>(python representation of api file generated by vppapigen).
- */
-public interface ${plugin_name}NotificationRegistry extends $base_package.$notification_package.NotificationRegistry {
-
-    $register_callback_methods
-
-    @Override
-    void close();
-}
-""")
-
-global_notification_callback_template = Template("""
-package $plugin_package.$notification_package;
-
-/**
- * <p>Aggregated callback interface for notifications only.
- * <br>It was generated by notification_gen.py based on $inputfile
- * <br>(python representation of api file generated by vppapigen).
- */
-public interface Global${plugin_name}NotificationCallback$callbacks {
-
-}
-""")
-
-notification_registry_impl_template = Template("""
-package $plugin_package.$notification_package;
-
-/**
- * <p>Notification registry delegating notification processing to registered callbacks.
- * <br>It was generated by notification_gen.py based on $inputfile
- * <br>(python representation of api file generated by vppapigen).
- */
-public final class ${plugin_name}NotificationRegistryImpl implements ${plugin_name}NotificationRegistry, Global${plugin_name}NotificationCallback {
-
-    // TODO add a special NotificationCallback interface and only allow those to be registered
-    private final java.util.concurrent.ConcurrentMap<Class<? extends $base_package.$dto_package.JVppNotification>, $base_package.$callback_package.JVppNotificationCallback> registeredCallbacks =
-        new java.util.concurrent.ConcurrentHashMap<>();
-
-    $register_callback_methods
-    $handler_methods
-
-    @Override
-    public void close() {
-        registeredCallbacks.clear();
-    }
-}
-""")
-
-register_callback_impl_template = Template("""
-    public java.lang.AutoCloseable register$callback(final $plugin_package.$callback_package.$callback callback){
-        if(null != registeredCallbacks.putIfAbsent($plugin_package.$dto_package.$notification.class, callback)){
-            throw new IllegalArgumentException("Callback for " + $plugin_package.$dto_package.$notification.class +
-                "notification already registered");
-        }
-        return () -> registeredCallbacks.remove($plugin_package.$dto_package.$notification.class);
-    }
-""")
-
-handler_impl_template = Template("""
-    @Override
-    public void on$notification(
-        final $plugin_package.$dto_package.$notification notification) {
-        final $base_package.$callback_package.JVppNotificationCallback jVppNotificationCallback = registeredCallbacks.get($plugin_package.$dto_package.$notification.class);
-        if (null != jVppNotificationCallback) {
-            (($plugin_package.$callback_package.$callback) registeredCallbacks
-                .get($plugin_package.$dto_package.$notification.class))
-                .on$notification(notification);
-        }
-    }
-""")
-
-notification_provider_template = Template("""
-package $plugin_package.$notification_package;
-
- /**
- * Provides ${plugin_name}NotificationRegistry.
- * <br>The file was generated by notification_gen.py based on $inputfile
- * <br>(python representation of api file generated by vppapigen).
- */
-public interface ${plugin_name}NotificationRegistryProvider extends $base_package.$notification_package.NotificationRegistryProvider {
-
-    @Override
-    public ${plugin_name}NotificationRegistry getNotificationRegistry();
-}
-""")
-
-
-def generate_notification_registry(func_list, base_package, plugin_package, plugin_name, notification_package, callback_package, dto_package, inputfile):
-    """ Generates notification registry interface and implementation """
-    print "Generating Notification interfaces and implementation"
-
-    if not os.path.exists(notification_package):
-        raise Exception("%s folder is missing" % notification_package)
-
-    callbacks = []
-    register_callback_methods = []
-    register_callback_methods_impl = []
-    handler_methods = []
-    for func in func_list:
-
-        if not util.is_notification(func['name']):
-            continue
-
-        camel_case_name_with_suffix = util.underscore_to_camelcase_upper(func['name'])
-        notification_dto = util.add_notification_suffix(camel_case_name_with_suffix)
-        callback_ifc = notification_dto + callback_gen.callback_suffix
-        fully_qualified_callback_ifc = "{0}.{1}.{2}".format(plugin_package, callback_package, callback_ifc)
-        callbacks.append(fully_qualified_callback_ifc)
-
-        # TODO create NotificationListenerRegistration and return that instead of AutoCloseable to better indicate
-        # that the registration should be closed
-        register_callback_methods.append("java.lang.AutoCloseable register{0}({1} callback);"
-                                         .format(callback_ifc, fully_qualified_callback_ifc))
-        register_callback_methods_impl.append(register_callback_impl_template.substitute(plugin_package=plugin_package,
-                                                                                         callback_package=callback_package,
-                                                                                         dto_package=dto_package,
-                                                                                         notification=notification_dto,
-                                                                                         callback=callback_ifc))
-        handler_methods.append(handler_impl_template.substitute(base_package=base_package,
-                                                                plugin_package=plugin_package,
-                                                                callback_package=callback_package,
-                                                                dto_package=dto_package,
-                                                                notification=notification_dto,
-                                                                callback=callback_ifc))
-
-
-    callback_file = open(os.path.join(notification_package, "%sNotificationRegistry.java" % plugin_name), 'w')
-    callback_file.write(notification_registry_template.substitute(inputfile=inputfile,
-                                                                register_callback_methods="\n    ".join(register_callback_methods),
-                                                                base_package=base_package,
-                                                                plugin_package=plugin_package,
-                                                                plugin_name=plugin_name,
-                                                                notification_package=notification_package))
-    callback_file.flush()
-    callback_file.close()
-
-    callback_file = open(os.path.join(notification_package, "Global%sNotificationCallback.java" % plugin_name), 'w')
-
-    global_notification_callback_callbacks = ""
-    if (callbacks):
-        global_notification_callback_callbacks = " extends " + ", ".join(callbacks)
-
-    callback_file.write(global_notification_callback_template.substitute(inputfile=inputfile,
-                                                                       callbacks=global_notification_callback_callbacks,
-                                                                       plugin_package=plugin_package,
-                                                                       plugin_name=plugin_name,
-                                                                       notification_package=notification_package))
-    callback_file.flush()
-    callback_file.close()
-
-    callback_file = open(os.path.join(notification_package, "%sNotificationRegistryImpl.java" % plugin_name), 'w')
-    callback_file.write(notification_registry_impl_template.substitute(inputfile=inputfile,
-                                                                     callback_package=callback_package,
-                                                                     dto_package=dto_package,
-                                                                     register_callback_methods="".join(register_callback_methods_impl),
-                                                                     handler_methods="".join(handler_methods),
-                                                                     base_package=base_package,
-                                                                     plugin_package=plugin_package,
-                                                                     plugin_name=plugin_name,
-                                                                     notification_package=notification_package))
-    callback_file.flush()
-    callback_file.close()
-
-    callback_file = open(os.path.join(notification_package, "%sNotificationRegistryProvider.java" % plugin_name), 'w')
-    callback_file.write(notification_provider_template.substitute(inputfile=inputfile,
-                                                                     base_package=base_package,
-                                                                     plugin_package=plugin_package,
-                                                                     plugin_name=plugin_name,
-                                                                     notification_package=notification_package))
-    callback_file.flush()
-    callback_file.close()
-
diff --git a/vpp-api/java/jvpp/gen/jvppgen/types_gen.py b/vpp-api/java/jvpp/gen/jvppgen/types_gen.py
deleted file mode 100644
index d12fb3d7..00000000
--- a/vpp-api/java/jvpp/gen/jvppgen/types_gen.py
+++ /dev/null
@@ -1,227 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os
-from string import Template
-
-import util
-import jni_gen
-import dto_gen
-
-type_template = Template("""
-package $plugin_package.$type_package;
-
-/**
- * <p>This class represents $c_type_name type definition.
- * <br>It was generated by types_gen.py based on $inputfile preparsed data:
- * <pre>
-$docs
- * </pre>
- */
-public final class $java_type_name {
-$fields
-$methods
-}
-""")
-
-field_template = Template("""    public $type $name;\n""")
-
-
-def generate_type_fields(type_definition):
-    """
-    Generates fields for class representing typeonly definition
-    :param type_definition: python representation of typeonly definition
-    :return: string representing class fields
-    """
-    fields = ""
-    for t in zip(type_definition['types'], type_definition['args']):
-        field_name = util.underscore_to_camelcase(t[1])
-        fields += field_template.substitute(type=util.jni_2_java_type_mapping[t[0]],
-                                            name=field_name)
-    return fields
-
-object_struct_setter_template = Template("""
-    {
-        jclass ${field_reference_name}Class = (*env)->FindClass(env, "${class_FQN}");
-        memset (&(mp->${c_name}), 0, sizeof (mp->${c_name}));
-        ${struct_initialization}
-    }
-""")
-
-object_array_struct_setter_template = Template("""
-    {
-        jclass ${field_reference_name}ArrayElementClass = (*env)->FindClass(env, "${class_FQN}");
-        if (${field_reference_name}) {
-            size_t _i;
-            jsize cnt = (*env)->GetArrayLength (env, ${field_reference_name});
-            ${field_length_check}
-            for (_i = 0; _i < cnt; _i++) {
-                jobject ${field_reference_name}ArrayElement = (*env)->GetObjectArrayElement(env, ${field_reference_name}, _i);
-                memset (&(mp->${c_name}[_i]), 0, sizeof (mp->${c_name}[_i]));
-                ${struct_initialization}
-            }
-        }
-    }
-""")
-
-object_dto_field_setter_template = Template("""
-    {
-        jclass ${field_reference_name}Class = (*env)->FindClass(env, "${class_FQN}");
-        jmethodID ${field_reference_name}Constructor = (*env)->GetMethodID(env, ${field_reference_name}Class, "<init>", "()V");
-        jobject ${field_reference_name} = (*env)->NewObject(env, ${field_reference_name}Class,  ${field_reference_name}Constructor);
-        ${type_initialization}
-        (*env)->SetObjectField(env, dto, ${field_reference_name}FieldId, ${field_reference_name});
-    }
-""")
-
-object_array_dto_field_setter_template = Template("""
-    {
-        jclass ${field_reference_name}Class = (*env)->FindClass(env, "${class_FQN}");
-        jobjectArray ${field_reference_name} = (*env)->NewObjectArray(env, ${field_length}, ${field_reference_name}Class, 0);
-        unsigned int _i;
-        for (_i = 0; _i < ${field_length}; _i++) {
-            jmethodID ${field_reference_name}Constructor = (*env)->GetMethodID(env, ${field_reference_name}Class, "<init>", "()V");
-            jobject ${field_reference_name}ArrayElement = (*env)->NewObject(env, ${field_reference_name}Class,  ${field_reference_name}Constructor);
-            ${type_initialization}
-            (*env)->SetObjectArrayElement(env, ${field_reference_name}, _i, ${field_reference_name}ArrayElement);
-        }
-        (*env)->SetObjectField(env, dto, ${field_reference_name}FieldId, ${field_reference_name});
-    }
-""")
-
-
-def generate_struct_initialization(type_def, c_name_prefix, object_name, indent):
-    struct_initialization = ""
-    # field identifiers
-    for t in zip(type_def['types'], type_def['args'], type_def['lengths']):
-        field_reference_name = "${c_name}" + util.underscore_to_camelcase_upper(t[1])
-        field_name = util.underscore_to_camelcase(t[1])
-        struct_initialization += jni_gen.jni_request_binding_for_type(field_type=t[0], c_name=c_name_prefix + t[1],
-                                                                     field_reference_name=field_reference_name,
-                                                                     field_name=field_name,
-                                                                     field_length=t[2][0],
-                                                                     is_variable_len_array=t[2][1],
-                                                                     object_name=object_name)
-    return indent + struct_initialization.replace('\n', '\n' + indent)
-
-
-def generate_type_setter(handler_name, type_def, c_name_prefix, object_name, indent):
-    type_initialization = ""
-    for t in zip(type_def['types'], type_def['args'], type_def['lengths']):
-        field_length = t[2][0]
-        is_variable_len_array = t[2][1]
-        length_field_type = None
-        if is_variable_len_array:
-            length_field_type = type_def['types'][type_def['args'].index(field_length)]
-        type_initialization += jni_gen.jni_reply_handler_for_type(handler_name=handler_name,
-                                                                  ref_name="${field_reference_name}",
-                                                                  field_type=t[0], c_name=c_name_prefix + t[1],
-                                                                  field_reference_name="${c_name}" + util.underscore_to_camelcase_upper(t[1]),
-                                                                  field_name=util.underscore_to_camelcase(t[1]),
-                                                                  field_length=field_length,
-                                                                  is_variable_len_array=is_variable_len_array,
-                                                                  length_field_type=length_field_type,
-                                                                  object_name=object_name)
-    return indent + type_initialization.replace('\n', '\n' + indent)
-
-
-def generate_types(types_list, plugin_package, types_package, inputfile):
-    """
-    Generates Java representation of custom types defined in api file.
-    """
-
-    #
-    if not types_list:
-        print "Skipping custom types generation (%s does not define custom types)." % inputfile
-        return
-
-    print "Generating custom types"
-
-    if not os.path.exists(types_package):
-        raise Exception("%s folder is missing" % types_package)
-
-    for type in types_list:
-        c_type_name = type['name']
-        java_type_name = util.underscore_to_camelcase_upper(type['name'])
-        dto_path = os.path.join(types_package, java_type_name + ".java")
-
-        fields = generate_type_fields(type)
-
-        dto_file = open(dto_path, 'w')
-        dto_file.write(type_template.substitute(plugin_package=plugin_package,
-                                                type_package=types_package,
-                                                c_type_name=c_type_name,
-                                                inputfile=inputfile,
-                                                docs=util.api_message_to_javadoc(type),
-                                                java_type_name=java_type_name,
-                                                fields=fields,
-                                                methods=dto_gen.generate_dto_base_methods(java_type_name, type)
-                                                ))
-
-        # update type mappings:
-        # todo fix vpe.api to use type_name instead of vl_api_type_name_t
-        type_name = "vl_api_" + c_type_name + "_t"
-        java_fqn = "%s.%s.%s" % (plugin_package, types_package, java_type_name)
-        util.vpp_2_jni_type_mapping[type_name] = "jobject"
-        util.vpp_2_jni_type_mapping[type_name + "[]"] = "jobjectArray"
-        util.jni_2_java_type_mapping[type_name] = java_fqn
-        util.jni_2_java_type_mapping[type_name + "[]"] = java_fqn + "[]"
-        jni_name = java_fqn.replace('.', "/")
-        jni_signature = "L" + jni_name + ";"
-        util.jni_2_signature_mapping[type_name] = "L" + jni_name + ";"
-        util.jni_2_signature_mapping[type_name + "[]"] = "[" + jni_signature
-        util.jni_field_accessors[type_name] = "ObjectField"
-        util.jni_field_accessors[type_name + "[]"] = "ObjectField"
-
-        jni_gen.struct_setter_templates[type_name] = Template(
-                object_struct_setter_template.substitute(
-                        c_name="${c_name}",
-                        field_reference_name="${field_reference_name}",
-                        class_FQN=jni_name,
-                        struct_initialization=generate_struct_initialization(type, "${c_name}.",
-                                                                           "${field_reference_name}", ' ' * 4))
-        )
-
-        jni_gen.struct_setter_templates[type_name+ "[]"] = Template(
-                object_array_struct_setter_template.substitute(
-                        c_name="${c_name}",
-                        field_reference_name="${field_reference_name}",
-                        field_length_check="${field_length_check}",
-                        class_FQN=jni_name,
-                        struct_initialization=generate_struct_initialization(type, "${c_name}[_i].",
-                                                                           "${field_reference_name}ArrayElement", ' ' * 8))
-        )
-
-        jni_gen.dto_field_setter_templates[type_name] = Template(
-                object_dto_field_setter_template.substitute(
-                        field_reference_name="${field_reference_name}",
-                        field_length="${field_length}",
-                        class_FQN=jni_name,
-                        type_initialization=generate_type_setter(c_type_name, type, "${c_name}.",
-                                                                 "${field_reference_name}", ' ' * 4))
-        )
-
-        jni_gen.dto_field_setter_templates[type_name + "[]"] = Template(
-                object_array_dto_field_setter_template.substitute(
-                        field_reference_name="${field_reference_name}",
-                        field_length="${field_length}",
-                        class_FQN=jni_name,
-                        type_initialization=generate_type_setter(c_type_name, type, "${c_name}[_i].",
-                                                                 "${field_reference_name}ArrayElement", ' ' * 8))
-        )
-
-        dto_file.flush()
-        dto_file.close()
-
diff --git a/vpp-api/java/jvpp/gen/jvppgen/util.py b/vpp-api/java/jvpp/gen/jvppgen/util.py
deleted file mode 100644
index fc971c17..00000000
--- a/vpp-api/java/jvpp/gen/jvppgen/util.py
+++ /dev/null
@@ -1,220 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os, pprint
-from os import removedirs
-
-
-def underscore_to_camelcase(name):
-    name = name.title().replace("_", "")
-    return name[0].lower() + name[1:]
-
-
-def underscore_to_camelcase_upper(name):
-    name = name.title().replace("_", "")
-    return name[0].upper() + name[1:]
-
-
-def remove_folder(folder):
-    """ Remove folder with all its files """
-    for root, dirs, files in os.walk(folder, topdown=False):
-        for name in files:
-            os.remove(os.path.join(root, name))
-        removedirs(folder)
-
-
-reply_suffixes = ("reply", "details", "l2fibtableentry")
-
-
-def is_reply(name):
-    return name.lower().endswith(reply_suffixes)
-
-
-def is_details(name):
-    return name.lower().endswith(reply_suffixes[1]) or name.lower().endswith(reply_suffixes[2])
-
-
-def is_retval_field(name):
-    return name == 'retval'
-
-dump_suffix = "dump"
-
-
-def is_dump(name):
-    return name.lower().endswith(dump_suffix)
-
-
-def get_reply_suffix(name):
-    for reply_suffix in reply_suffixes:
-        if name.lower().endswith(reply_suffix):
-            if reply_suffix == reply_suffixes[2]:
-                # FIXME workaround for l2_fib_table_entry
-                return 'entry'
-            else:
-                return reply_suffix
-
-# Mapping according to:
-# http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/types.html
-#
-# Unsigned types are converted to signed java types that have the same size.
-# It is the API user responsibility to interpret them correctly.
-jni_2_java_type_mapping = {'u8': 'byte',
-                           'u8[]': 'byte[]',
-                           'i8': 'byte',
-                           'i8[]': 'byte[]',
-                           'u16': 'short',
-                           'u16[]': 'short[]',
-                           'i16': 'short',
-                           'i16[]': 'short[]',
-                           'u32': 'int',
-                           'u32[]': 'int[]',
-                           'i32': 'int',
-                           'i32[]': 'int[]',
-                           'u64': 'long',
-                           'u64[]': 'long[]',
-                           'i64': 'long',
-                           'i64[]': 'long[]',
-                           'f64': 'double',
-                           'f64[]': 'double[]'
-                           }
-
-vpp_2_jni_type_mapping = {'u8': 'jbyte',
-                          'u8[]': 'jbyteArray',
-                          'i8': 'jbyte',
-                          'u8[]': 'jbyteArray',
-                          'u16': 'jshort',
-                          'u16[]': 'jshortArray',
-                          'i16': 'jshort',
-                          'i16[]': 'jshortArray',
-                          'u32': 'jint',
-                          'u32[]': 'jintArray',
-                          'i32': 'jint',
-                          'i32[]': 'jintArray',
-                          'u64': 'jlong',
-                          'u64[]': 'jlongArray',
-                          'i64': 'jlong',
-                          'i64[]': 'jlongArray',
-                          'f64': 'jdouble',
-                          'f64[]': 'jdoubleArray'
-                          }
-
-# https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/types.html#type_signatures
-jni_2_signature_mapping = {'u8': 'B',
-                           'u8[]': '[B',
-                           'i8': 'B',
-                           'i8[]': '[B',
-                           'u16': 'S',
-                           'u16[]': '[S',
-                           'i16': 'S',
-                           'i16[]': '[S',
-                           'u32': 'I',
-                           'u32[]': '[I',
-                           'i32': 'I',
-                           'i32[]': '[I',
-                           'u64': 'J',
-                           'u64[]': '[J',
-                           'i64': 'J',
-                           'i64[]': '[J',
-                           'f64': 'D',
-                           'f64[]': '[D'
-                           }
-
-# https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html#Get_type_Field_routines
-jni_field_accessors =  {'u8': 'ByteField',
-                        'u8[]': 'ObjectField',
-                        'i8': 'ByteField',
-                        'i8[]': 'ObjectField',
-                        'u16': 'ShortField',
-                        'u16[]': 'ObjectField',
-                        'i16': 'ShortField',
-                        'i16[]': 'ObjectField',
-                        'u32': 'IntField',
-                        'u32[]': 'ObjectField',
-                        'i32': 'IntField',
-                        'i32[]': 'ObjectField',
-                        'u64': 'LongField',
-                        'u64[]': 'ObjectField',
-                        'i64': 'LongField',
-                        'i64[]': 'ObjectField',
-                        'f64': 'DoubleField',
-                        'f64[]': 'ObjectField'
-                        }
-
-
-# vpe.api calls that do not follow naming conventions and have to be handled exceptionally when finding reply -> request mapping
-# FIXME in vpe.api
-unconventional_naming_rep_req = {
-                                 'cli_reply': 'cli_request',
-                                 'vnet_summary_stats_reply': 'vnet_get_summary_stats',
-                                 # This below is actually a sub-details callback. We cannot derive the mapping of dump request
-                                 # belonging to this sub-details from naming conventions. We need special mapping
-                                 'bridge_domain_sw_if_details': 'bridge_domain',
-                                 # This is standard dump call + details reply. However it's not called details but entry
-                                 'l2_fib_table_entry': 'l2_fib_table'
-                                 }
-
-#
-# FIXME no convention in the naming of events (notifications) in vpe.api
-notifications_message_suffixes = ("event", "counters")
-notification_messages_reused = ["sw_interface_set_flags"]
-
-# messages that must be ignored. These messages are INSUFFICIENTLY marked as disabled in vpe.api
-# FIXME
-ignored_messages = ["is_address_reachable"]
-
-
-def is_notification(name):
-    """ Returns true if the structure is a notification regardless of its no other use """
-    return is_just_notification(name) or name.lower() in notification_messages_reused
-
-
-def is_just_notification(name):
-    """ Returns true if the structure is just a notification and has no other use """
-    return name.lower().endswith(notifications_message_suffixes)
-
-
-def is_ignored(param):
-    return param.lower() in ignored_messages
-
-
-def remove_reply_suffix(camel_case_name_with_suffix):
-    return remove_suffix(camel_case_name_with_suffix, get_reply_suffix(camel_case_name_with_suffix))
-
-
-def remove_suffix(camel_case_name_with_suffix, suffix):
-    suffix_length = len(suffix)
-    return camel_case_name_with_suffix[:-suffix_length] if suffix_length != 0 else camel_case_name_with_suffix
-
-
-def is_control_ping(camel_case_name_with_suffix):
-    return camel_case_name_with_suffix.lower().startswith("controlping");
-
-
-def api_message_to_javadoc(api_message):
-    """ Converts vpe.api message description to javadoc """
-    str = pprint.pformat(api_message, indent=4, width=120, depth=None)
-    return " * " + str.replace("\n", "\n * ")
-
-
-notification_dto_suffix = "Notification"
-
-
-def add_notification_suffix(camel_case_dto_name):
-    camel_case_dto_name += notification_dto_suffix
-    return camel_case_dto_name
-
-
-def is_array(java_type_as_string):
-    return java_type_as_string.endswith("[]")
diff --git a/vpp-api/java/m4/ax_check_java_home.m4 b/vpp-api/java/m4/ax_check_java_home.m4
deleted file mode 100644
index cfe8f589..00000000
--- a/vpp-api/java/m4/ax_check_java_home.m4
+++ /dev/null
@@ -1,80 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_check_java_home.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_JAVA_HOME
-#
-# DESCRIPTION
-#
-#   Check for Sun Java (JDK / JRE) installation, where the 'java' VM is in.
-#   If found, set environment variable JAVA_HOME = Java installation home,
-#   else left JAVA_HOME untouch, which in most case means JAVA_HOME is
-#   empty.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Gleen Salmon <gleensalmon@yahoo.com>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 6
-
-AU_ALIAS([AC_CHECK_JAVA_HOME], [AX_CHECK_JAVA_HOME])
-
-AC_DEFUN([AX_CHECK_JAVA_HOME],
-[AC_MSG_CHECKING([for JAVA_HOME])
-# We used a fake loop so that we can use "break" to exit when the result
-# is found.
-while true
-do
-  # If the user defined JAVA_HOME, don't touch it.
-  test "${JAVA_HOME+set}" = set && break
-
-  # On Mac OS X 10.5 and following, run /usr/libexec/java_home to get
-  # the value of JAVA_HOME to use.
-  # (http://developer.apple.com/library/mac/#qa/qa2001/qa1170.html).
-  JAVA_HOME=`/usr/libexec/java_home 2>/dev/null`
-  test x"$JAVA_HOME" != x && break
-
-  # See if we can find the java executable, and compute from there.
-  TRY_JAVA_HOME=`ls -dr /usr/java/* 2> /dev/null | head -n 1`
-  if test x$TRY_JAVA_HOME != x; then
-    PATH=$PATH:$TRY_JAVA_HOME/bin
-  fi
-  AC_PATH_PROG([JAVA_PATH_NAME], [java])
-  if test "x$JAVA_PATH_NAME" != x; then
-    JAVA_HOME=`echo $JAVA_PATH_NAME | sed "s/\(.*\)[[/]]bin[[/]]java.*/\1/"`
-    break
-  fi
-
-  AC_MSG_NOTICE([Could not compute JAVA_HOME])
-  break
-done
-AC_MSG_RESULT([$JAVA_HOME])
-])
diff --git a/vpp-api/java/m4/ax_check_java_plugin.m4 b/vpp-api/java/m4/ax_check_java_plugin.m4
deleted file mode 100644
index 920753e5..00000000
--- a/vpp-api/java/m4/ax_check_java_plugin.m4
+++ /dev/null
@@ -1,101 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_check_java_plugin.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_JAVA_PLUGIN(<shell-variable>)
-#
-# DESCRIPTION
-#
-#   This macro sets <shell-variable> to empty on failure and to a compatible
-#   version of plugin.jar otherwise. Directories searched are /usr/java/*
-#   and /usr/local/java/*, which are assumed to be j{dk,re} installations.
-#   Apply the shell variable as you see fit. If sun changes things so
-#   <jre>/lib/plugin.jar is not the magic file it will stop working.
-#
-#   This macro assumes that unzip, zipinfo or pkzipc is available (and can
-#   list the contents of the jar archive). The first two are assumed to work
-#   similarly enough to the infozip versisonms. The pkzipc version is
-#   assumed to work if I undertstand the documentation on pkware's site but
-#   YMMV. I do not have access to pwkware's version to test it.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Duncan Simpson <dps@simpson.demon.co.uk>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 7
-
-AU_ALIAS([DPS_CHECK_PLUGIN], [AX_CHECK_JAVA_PLUGIN])
-AC_DEFUN([AX_CHECK_JAVA_PLUGIN],
-[AC_REQUIRE([AC_PROG_AWK])
-AC_REQUIRE([AC_PROG_FGREP])
-AC_CHECK_PROG(ZIPINFO,[zipinfo unzip pkzipc])
-AC_MSG_CHECKING([for the java plugin])
-case "x$ZIPINFO" in
-[*/zipinfo)]
-	zipinf="zipinfo -1" ;;
-[*/unzip)]
-	zipinf="unzip -l";;
-[*/pkzipc)]
-	ziping="unzipc -view";;
-[x*)]
-	AC_MSG_RESULT([skiped, none of zipinfo, unzip and pkzipc found])
-	AC_SUBST($1,[])
-	zipinf="";;
-esac
-if test "x$zipinf" != "x"; then
-jplugin=""
-for jhome in `ls -dr /usr/java/* /usr/local/java/* 2> /dev/null`; do
-for jfile in lib/plugin.jar jre/lib/plugin.jar; do
-if test "x$jplugin" = "x" && test -f "$jhome/$jfile"; then
-eval "$zipinf $jhome/$jfile | $AWK '{ print \$NF; }' | $FGREP netscape/javascript/JSObject" >/dev/null 2>/dev/null
-if test $? -eq 0; then
-dnl Some version of gcj (and javac) refuse to work with some files
-dnl that pass this test. To stop this problem make sure that the compiler
-dnl still works with this jar file in the classpath
-cat << \EOF > Test.java
-/* [#]line __oline__ "configure" */
-public class Test {
-}
-EOF
-if eval "$JAVAC -classpath $jhome/$jfile Test.java 2>/dev/null >/dev/null" && test -f Test.class; then
-jplugin="$jhome/$jfile"
-fi
-rm -f Test.java Test.class
-fi; fi; done; done
-if test "x$jplugin" != "x"; then
-AC_SUBST($1,$jplugin)
-AC_MSG_RESULT($jplugin)
-else
-AC_MSG_RESULT([java plugin not found])
-AC_SUBST($1,[])
-fi
-fi
-])
diff --git a/vpp-api/java/m4/ax_java_check_class.m4 b/vpp-api/java/m4/ax_java_check_class.m4
deleted file mode 100644
index 917638ae..00000000
--- a/vpp-api/java/m4/ax_java_check_class.m4
+++ /dev/null
@@ -1,85 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_java_check_class.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_JAVA_CHECK_CLASS(<class>,<action-if-found>,<action-if-not-found>)
-#
-# DESCRIPTION
-#
-#   Test if a Java class is available. Based on AX_PROG_JAVAC_WORKS. This
-#   version uses a cache variable which is both compiler, options and
-#   classpath dependent (so if you switch from javac to gcj it correctly
-#   notices and redoes the test).
-#
-#   The macro tries to compile a minimal program importing <class>. Some
-#   newer compilers moan about the failure to use this but fail or produce a
-#   class file anyway. All moaing is sunk to /dev/null since I only wanted
-#   to know if the class could be imported. This is a recommended followup
-#   to AX_CHECK_JAVA_PLUGIN with classpath appropriately adjusted.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Duncan Simpson <dps@simpson.demon.co.uk>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 9
-
-AU_ALIAS([DPS_JAVA_CHECK_CLASS], [AX_JAVA_CHECK_CLASS])
-AC_DEFUN([AX_JAVA_CHECK_CLASS],[
-m4_define([cache_val],[m4_translit(ax_cv_have_java_class_$1, " ." ,"__")])
-if test "x$CLASSPATH" != "x"; then
-xtra=" with classpath ${CLASSPATH}"
-xopts=`echo ${CLASSPATH} | ${SED} 's/^ *://'`
-xopts="-classpath $xopts"
-else xtra=""; xopts=""; fi
-cache_var="cache_val"AS_TR_SH([_Jc_${JAVAC}_Cp_${CLASSPATH}])
-AC_CACHE_CHECK([if the $1 class is available$xtra], [$cache_var], [
-JAVA_TEST=Test.java
-CLASS_TEST=Test.class
-cat << \EOF > $JAVA_TEST
-/* [#]xline __oline__ "configure" */
-import $1;
-public class Test {
-}
-EOF
-if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $xopts $JAVA_TEST) >/dev/null 2>&1; then
-  eval "${cache_var}=yes"
-else
-  eval "${cache_var}=no"
-  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-  cat $JAVA_TEST >&AS_MESSAGE_LOG_FD
-fi
-rm -f $JAVA_TEST $CLASS_TEST
-])
-if eval 'test "x$'${cache_var}'" = "xyes"'; then
-$2
-true; else
-$3
-false; fi])
diff --git a/vpp-api/java/m4/ax_java_options.m4 b/vpp-api/java/m4/ax_java_options.m4
deleted file mode 100644
index 36c10d92..00000000
--- a/vpp-api/java/m4/ax_java_options.m4
+++ /dev/null
@@ -1,48 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_java_options.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_JAVA_OPTIONS
-#
-# DESCRIPTION
-#
-#   AX_JAVA_OPTIONS adds configure command line options used for Java m4
-#   macros. This Macro is optional.
-#
-#   Note: This is part of the set of autoconf M4 macros for Java programs.
-#   It is VERY IMPORTANT that you download the whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission. The
-#   general documentation, as well as the sample configure.in, is included
-#   in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Devin Weaver <ktohg@tritarget.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 6
-
-AU_ALIAS([AC_JAVA_OPTIONS], [AX_JAVA_OPTIONS])
-AC_DEFUN([AX_JAVA_OPTIONS],[
-AC_ARG_WITH(java-prefix,
-                        [  --with-java-prefix=PFX  prefix where Java runtime is installed (optional)])
-AC_ARG_WITH(javac-flags,
-                        [  --with-javac-flags=FLAGS flags to pass to the Java compiler (optional)])
-AC_ARG_WITH(java-flags,
-                        [  --with-java-flags=FLAGS flags to pass to the Java VM (optional)])
-JAVAPREFIX=$with_java_prefix
-JAVACFLAGS=$with_javac_flags
-JAVAFLAGS=$with_java_flags
-AC_SUBST(JAVAPREFIX)dnl
-AC_SUBST(JAVACFLAGS)dnl
-AC_SUBST(JAVAFLAGS)dnl
-AC_SUBST(JAVA)dnl
-AC_SUBST(JAVAC)dnl
-])
diff --git a/vpp-api/java/m4/ax_libgcj_jar.m4 b/vpp-api/java/m4/ax_libgcj_jar.m4
deleted file mode 100644
index 5e942857..00000000
--- a/vpp-api/java/m4/ax_libgcj_jar.m4
+++ /dev/null
@@ -1,83 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_libgcj_jar.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_LIBGCJ_JAR
-#
-# DESCRIPTION
-#
-#   Locate libgcj.jar so you can place it before everything else when using
-#   gcj.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Duncan Simpson <dps@simpson.demon.co.uk>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 9
-
-AU_ALIAS([DPS_LIBGCJ_JAR], [AX_LIBGCJ_JAR])
-AC_DEFUN([AX_LIBGCJ_JAR],
-[
-AC_REQUIRE([AC_EXEEXT])
-AC_REQUIRE([AX_PROG_JAVAC])
-AC_REQUIRE([AC_PROG_FGREP])
-AC_PROG_SED
-if test "x$SED" = "x"; then
-AC_MSG_WARN([sed not avaiable, so libgcj.jar test skipped])
-else
-AC_MSG_CHECKING([if $JAVAC is gcj]);
-jc=`eval "[echo x$JAVAC | $SED 's/^x.*\\/\\([^/]*\\)\$/x\\1/;s/^ *\\([^ ]*\\) .*$/\\1/;s/"$EXEEXT"$//']"`
-if test "x$jc" != "xxgcj"; then
-AC_MSG_RESULT(no)
-else
-AC_MSG_RESULT(yes)
-AC_MSG_CHECKING([libgcj.jar location])
-save_cp="$CLASSPATH";
-unset CLASSPATH;
-AC_MSG_CHECKING([gcj default classpath])
-cat << \EOF > Test.java
-/* [#]line __oline__ "configure" */
-public class Test {
-}
-EOF
-lgcj=`eval "[$JAVAC -v -C Test.java 2>&1 | $FGREP \\(system\\) | $SED 's/^ *\\([^ ]*\\) .*$/\\1/;s/\\.jar\\//.jar/']"`;
-if test -f Test.class && test "x$lgcj" != "x"; then
-AC_MSG_RESULT($lgcj)
-$1="$lgcj:"
-else
-AC_MSG_RESULT(failed)
-$1=""
-fi
-if test "x$save_cp" != "x"; then CLASSPATH="$save_cp"; fi
-rm -f Test.java Test.class
-fi
-fi
-])
diff --git a/vpp-api/java/m4/ax_prog_jar.m4 b/vpp-api/java/m4/ax_prog_jar.m4
deleted file mode 100644
index 3c60fcaf..00000000
--- a/vpp-api/java/m4/ax_prog_jar.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-# ===========================================================================
-#        http://www.gnu.org/software/autoconf-archive/ax_prog_jar.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAR
-#
-# DESCRIPTION
-#
-#   AX_PROG_JAR tests for an existing jar program. It uses the environment
-#   variable JAR then tests in sequence various common jar programs.
-#
-#   If you want to force a specific compiler:
-#
-#   - at the configure.in level, set JAR=yourcompiler before calling
-#   AX_PROG_JAR
-#
-#   - at the configure level, setenv JAR
-#
-#   You can use the JAR variable in your Makefile.in, with @JAR@.
-#
-#   Note: This macro depends on the autoconf M4 macros for Java programs. It
-#   is VERY IMPORTANT that you download that whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission.
-#
-#   The general documentation of those macros, as well as the sample
-#   configure.in, is included in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Egon Willighagen <e.willighagen@science.ru.nl>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 7
-
-AU_ALIAS([AC_PROG_JAR], [AX_PROG_JAR])
-AC_DEFUN([AX_PROG_JAR],[
-AS_IF([test "x$JAVAPREFIX" = x],
-      [test "x$JAR" = x && AC_CHECK_PROGS([JAR], [jar])],
-      [test "x$JAR" = x && AC_CHECK_PROGS([JAR], [jar], [], [$JAVAPREFIX/bin])])
-test "x$JAR" = x && AC_MSG_ERROR([no acceptable jar program found in \$PATH])
-AC_PROVIDE([$0])dnl
-])
diff --git a/vpp-api/java/m4/ax_prog_java.m4 b/vpp-api/java/m4/ax_prog_java.m4
deleted file mode 100644
index 03961db5..00000000
--- a/vpp-api/java/m4/ax_prog_java.m4
+++ /dev/null
@@ -1,115 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_prog_java.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAVA
-#
-# DESCRIPTION
-#
-#   Here is a summary of the main macros:
-#
-#   AX_PROG_JAVAC: finds a Java compiler.
-#
-#   AX_PROG_JAVA: finds a Java virtual machine.
-#
-#   AX_CHECK_CLASS: finds if we have the given class (beware of CLASSPATH!).
-#
-#   AX_CHECK_RQRD_CLASS: finds if we have the given class and stops
-#   otherwise.
-#
-#   AX_TRY_COMPILE_JAVA: attempt to compile user given source.
-#
-#   AX_TRY_RUN_JAVA: attempt to compile and run user given source.
-#
-#   AX_JAVA_OPTIONS: adds Java configure options.
-#
-#   AX_PROG_JAVA tests an existing Java virtual machine. It uses the
-#   environment variable JAVA then tests in sequence various common Java
-#   virtual machines. For political reasons, it starts with the free ones.
-#   You *must* call [AX_PROG_JAVAC] before.
-#
-#   If you want to force a specific VM:
-#
-#   - at the configure.in level, set JAVA=yourvm before calling AX_PROG_JAVA
-#
-#     (but after AC_INIT)
-#
-#   - at the configure level, setenv JAVA
-#
-#   You can use the JAVA variable in your Makefile.in, with @JAVA@.
-#
-#   *Warning*: its success or failure can depend on a proper setting of the
-#   CLASSPATH env. variable.
-#
-#   TODO: allow to exclude virtual machines (rationale: most Java programs
-#   cannot run with some VM like kaffe).
-#
-#   Note: This is part of the set of autoconf M4 macros for Java programs.
-#   It is VERY IMPORTANT that you download the whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission.
-#
-#   A Web page, with a link to the latest CVS snapshot is at
-#   <http://www.internatif.org/bortzmeyer/autoconf-Java/>.
-#
-#   This is a sample configure.in Process this file with autoconf to produce
-#   a configure script.
-#
-#     AC_INIT(UnTag.java)
-#
-#     dnl Checks for programs.
-#     AC_CHECK_CLASSPATH
-#     AX_PROG_JAVAC
-#     AX_PROG_JAVA
-#
-#     dnl Checks for classes
-#     AX_CHECK_RQRD_CLASS(org.xml.sax.Parser)
-#     AX_CHECK_RQRD_CLASS(com.jclark.xml.sax.Driver)
-#
-#     AC_OUTPUT(Makefile)
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 9
-
-AU_ALIAS([AC_PROG_JAVA], [AX_PROG_JAVA])
-AC_DEFUN([AX_PROG_JAVA],[
-m4_define([m4_ax_prog_java_list], [kaffe java])dnl
-AS_IF([test "x$JAVAPREFIX" = x],
-      [test x$JAVA = x && AC_CHECK_PROGS([JAVA], [m4_ax_prog_java_list])],
-      [test x$JAVA = x && AC_CHECK_PROGS([JAVA], [m4_ax_prog_java_list], [], [$JAVAPREFIX/bin])])
-test x$JAVA = x && AC_MSG_ERROR([no acceptable Java virtual machine found in \$PATH])
-m4_undefine([m4_ax_prog_java_list])dnl
-AX_PROG_JAVA_WORKS
-AC_PROVIDE([$0])dnl
-])
diff --git a/vpp-api/java/m4/ax_prog_java_cc.m4 b/vpp-api/java/m4/ax_prog_java_cc.m4
deleted file mode 100644
index 3df064ff..00000000
--- a/vpp-api/java/m4/ax_prog_java_cc.m4
+++ /dev/null
@@ -1,104 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_prog_java_cc.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAVA_CC
-#
-# DESCRIPTION
-#
-#   Finds the appropriate java compiler on your path. By preference the java
-#   compiler is gcj, then jikes then javac.
-#
-#   The macro can take one argument specifying a space separated list of
-#   java compiler names.
-#
-#   For example:
-#
-#     AX_PROG_JAVA_CC(javac, gcj)
-#
-#   The macro also sets the compiler options variable: JAVA_CC_OPTS to
-#   something sensible:
-#
-#    - for GCJ it sets it to: @GCJ_OPTS@
-#      (if GCJ_OPTS is not yet defined then it is set to "-C")
-#
-#    - no other compiler has applicable options yet
-#
-#   Here's an example configure.in:
-#
-#     AC_INIT(Makefile.in)
-#     AX_PROG_JAVA_CC()
-#     AC_OUTPUT(Makefile)
-#     dnl End.
-#
-#   And here's the start of the Makefile.in:
-#
-#     PROJECT_ROOT      := @srcdir@
-#     # Tool definitions.
-#     JAVAC             := @JAVA_CC@
-#     JAVAC_OPTS        := @JAVA_CC_OPTS@
-#     JAR_TOOL          := @jar_tool@
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Nic Ferrier <nferrier@tapsellferrier.co.uk>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-# AX_PROG_JAVA_CC([COMPILER ...])
-# --------------------------
-# COMPILER ... is a space separated list of java compilers to search for.
-# This just gives the user an opportunity to specify an alternative
-# search list for the java compiler.
-AU_ALIAS([AC_PROG_JAVA_CC], [AX_PROG_JAVA_CC])
-AC_DEFUN([AX_PROG_JAVA_CC],
-[AC_ARG_VAR([JAVA_CC],                [java compiler command])dnl
-AC_ARG_VAR([JAVA_CC_FLAGS],           [java compiler flags])dnl
-m4_ifval([$1],
-      [AC_CHECK_TOOLS(JAVA_CC, [$1])],
-[AC_CHECK_TOOL(JAVA_CC, gcj)
-if test -z "$JAVA_CC"; then
-  AC_CHECK_TOOL(JAVA_CC, javac)
-fi
-if test -z "$JAVA_CC"; then
-  AC_CHECK_TOOL(JAVA_CC, jikes)
-fi
-])
-
-if test "$JAVA_CC" = "gcj"; then
-   if test "$GCJ_OPTS" = ""; then
-      AC_SUBST(GCJ_OPTS,-C)
-   fi
-   AC_SUBST(JAVA_CC_OPTS, @GCJ_OPTS@,
-        [Define the compilation options for GCJ])
-fi
-test -z "$JAVA_CC" && AC_MSG_ERROR([no acceptable java compiler found in \$PATH])
-])# AX_PROG_JAVA_CC
diff --git a/vpp-api/java/m4/ax_prog_java_works.m4 b/vpp-api/java/m4/ax_prog_java_works.m4
deleted file mode 100644
index 54e132af..00000000
--- a/vpp-api/java/m4/ax_prog_java_works.m4
+++ /dev/null
@@ -1,134 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_prog_java_works.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAVA_WORKS
-#
-# DESCRIPTION
-#
-#   Internal use ONLY.
-#
-#   Note: This is part of the set of autoconf M4 macros for Java programs.
-#   It is VERY IMPORTANT that you download the whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission. The
-#   general documentation, as well as the sample configure.in, is included
-#   in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 9
-
-AU_ALIAS([AC_PROG_JAVA_WORKS], [AX_PROG_JAVA_WORKS])
-AC_DEFUN([AX_PROG_JAVA_WORKS], [
-AC_PATH_PROG(UUDECODE, uudecode, [no])
-if test x$UUDECODE != xno; then
-AC_CACHE_CHECK([if uudecode can decode base 64 file], ac_cv_prog_uudecode_base64, [
-dnl /**
-dnl  * Test.java: used to test if java compiler works.
-dnl  */
-dnl public class Test
-dnl {
-dnl
-dnl public static void
-dnl main( String[] argv )
-dnl {
-dnl     System.exit (0);
-dnl }
-dnl
-dnl }
-cat << \EOF > Test.uue
-begin-base64 644 Test.class
-yv66vgADAC0AFQcAAgEABFRlc3QHAAQBABBqYXZhL2xhbmcvT2JqZWN0AQAE
-bWFpbgEAFihbTGphdmEvbGFuZy9TdHJpbmc7KVYBAARDb2RlAQAPTGluZU51
-bWJlclRhYmxlDAAKAAsBAARleGl0AQAEKEkpVgoADQAJBwAOAQAQamF2YS9s
-YW5nL1N5c3RlbQEABjxpbml0PgEAAygpVgwADwAQCgADABEBAApTb3VyY2VG
-aWxlAQAJVGVzdC5qYXZhACEAAQADAAAAAAACAAkABQAGAAEABwAAACEAAQAB
-AAAABQO4AAyxAAAAAQAIAAAACgACAAAACgAEAAsAAQAPABAAAQAHAAAAIQAB
-AAEAAAAFKrcAErEAAAABAAgAAAAKAAIAAAAEAAQABAABABMAAAACABQ=
-====
-EOF
-if $UUDECODE Test.uue; then
-        ac_cv_prog_uudecode_base64=yes
-else
-        echo "configure: __oline__: uudecode had trouble decoding base 64 file 'Test.uue'" >&AS_MESSAGE_LOG_FD
-        echo "configure: failed file was:" >&AS_MESSAGE_LOG_FD
-        cat Test.uue >&AS_MESSAGE_LOG_FD
-        ac_cv_prog_uudecode_base64=no
-fi
-rm -f Test.uue])
-fi
-if test x$ac_cv_prog_uudecode_base64 != xyes; then
-        rm -f Test.class
-        AC_MSG_WARN([I have to compile Test.class from scratch])
-        if test x$ac_cv_prog_javac_works = xno; then
-                AC_MSG_ERROR([Cannot compile java source. $JAVAC does not work properly])
-        fi
-        if test x$ac_cv_prog_javac_works = x; then
-                AX_PROG_JAVAC
-        fi
-fi
-AC_CACHE_CHECK(if $JAVA works, ac_cv_prog_java_works, [
-JAVA_TEST=Test.java
-CLASS_TEST=Test.class
-TEST=Test
-changequote(, )dnl
-cat << \EOF > $JAVA_TEST
-/* [#]line __oline__ "configure" */
-public class Test {
-public static void main (String args[]) {
-        System.exit (0);
-} }
-EOF
-changequote([, ])dnl
-if test x$ac_cv_prog_uudecode_base64 != xyes; then
-        if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) && test -s $CLASS_TEST; then
-                :
-        else
-          echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-          cat $JAVA_TEST >&AS_MESSAGE_LOG_FD
-          AC_MSG_ERROR(The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?))
-        fi
-fi
-if AC_TRY_COMMAND($JAVA -classpath . $JAVAFLAGS $TEST) >/dev/null 2>&1; then
-  ac_cv_prog_java_works=yes
-else
-  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-  cat $JAVA_TEST >&AS_MESSAGE_LOG_FD
-  AC_MSG_ERROR(The Java VM $JAVA failed (see config.log, check the CLASSPATH?))
-fi
-rm -fr $JAVA_TEST $CLASS_TEST Test.uue
-])
-AC_PROVIDE([$0])dnl
-]
-)
diff --git a/vpp-api/java/m4/ax_prog_javac.m4 b/vpp-api/java/m4/ax_prog_javac.m4
deleted file mode 100644
index d061243c..00000000
--- a/vpp-api/java/m4/ax_prog_javac.m4
+++ /dev/null
@@ -1,79 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_prog_javac.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAVAC
-#
-# DESCRIPTION
-#
-#   AX_PROG_JAVAC tests an existing Java compiler. It uses the environment
-#   variable JAVAC then tests in sequence various common Java compilers. For
-#   political reasons, it starts with the free ones.
-#
-#   If you want to force a specific compiler:
-#
-#   - at the configure.in level, set JAVAC=yourcompiler before calling
-#   AX_PROG_JAVAC
-#
-#   - at the configure level, setenv JAVAC
-#
-#   You can use the JAVAC variable in your Makefile.in, with @JAVAC@.
-#
-#   *Warning*: its success or failure can depend on a proper setting of the
-#   CLASSPATH env. variable.
-#
-#   TODO: allow to exclude compilers (rationale: most Java programs cannot
-#   compile with some compilers like guavac).
-#
-#   Note: This is part of the set of autoconf M4 macros for Java programs.
-#   It is VERY IMPORTANT that you download the whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission. The
-#   general documentation, as well as the sample configure.in, is included
-#   in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 7
-
-AU_ALIAS([AC_PROG_JAVAC], [AX_PROG_JAVAC])
-AC_DEFUN([AX_PROG_JAVAC],[
-m4_define([m4_ax_prog_javac_list],["gcj -C" guavac jikes javac])dnl
-AS_IF([test "x$JAVAPREFIX" = x],
-      [test "x$JAVAC" = x && AC_CHECK_PROGS([JAVAC], [m4_ax_prog_javac_list])],
-      [test "x$JAVAC" = x && AC_CHECK_PROGS([JAVAC], [m4_ax_prog_javac_list], [], [$JAVAPREFIX/bin])])
-m4_undefine([m4_ax_prog_javac_list])dnl
-test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH])
-AX_PROG_JAVAC_WORKS
-AC_PROVIDE([$0])dnl
-])
diff --git a/vpp-api/java/m4/ax_prog_javac_works.m4 b/vpp-api/java/m4/ax_prog_javac_works.m4
deleted file mode 100644
index 7dfa1e37..00000000
--- a/vpp-api/java/m4/ax_prog_javac_works.m4
+++ /dev/null
@@ -1,72 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_prog_javac_works.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAVAC_WORKS
-#
-# DESCRIPTION
-#
-#   Internal use ONLY.
-#
-#   Note: This is part of the set of autoconf M4 macros for Java programs.
-#   It is VERY IMPORTANT that you download the whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission. The
-#   general documentation, as well as the sample configure.in, is included
-#   in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 6
-
-AU_ALIAS([AC_PROG_JAVAC_WORKS], [AX_PROG_JAVAC_WORKS])
-AC_DEFUN([AX_PROG_JAVAC_WORKS],[
-AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [
-JAVA_TEST=Test.java
-CLASS_TEST=Test.class
-cat << \EOF > $JAVA_TEST
-/* [#]line __oline__ "configure" */
-public class Test {
-}
-EOF
-if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) >/dev/null 2>&1; then
-  ac_cv_prog_javac_works=yes
-else
-  AC_MSG_ERROR([The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)])
-  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-  cat $JAVA_TEST >&AS_MESSAGE_LOG_FD
-fi
-rm -f $JAVA_TEST $CLASS_TEST
-])
-AC_PROVIDE([$0])dnl
-])
diff --git a/vpp-api/java/m4/ax_prog_javadoc.m4 b/vpp-api/java/m4/ax_prog_javadoc.m4
deleted file mode 100644
index bcb6045a..00000000
--- a/vpp-api/java/m4/ax_prog_javadoc.m4
+++ /dev/null
@@ -1,50 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_prog_javadoc.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAVADOC
-#
-# DESCRIPTION
-#
-#   AX_PROG_JAVADOC tests for an existing javadoc generator. It uses the
-#   environment variable JAVADOC then tests in sequence various common
-#   javadoc generator.
-#
-#   If you want to force a specific compiler:
-#
-#   - at the configure.in level, set JAVADOC=yourgenerator before calling
-#   AX_PROG_JAVADOC
-#
-#   - at the configure level, setenv JAVADOC
-#
-#   You can use the JAVADOC variable in your Makefile.in, with @JAVADOC@.
-#
-#   Note: This macro depends on the autoconf M4 macros for Java programs. It
-#   is VERY IMPORTANT that you download that whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission.
-#
-#   The general documentation of those macros, as well as the sample
-#   configure.in, is included in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Egon Willighagen <e.willighagen@science.ru.nl>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 8
-
-AU_ALIAS([AC_PROG_JAVADOC], [AX_PROG_JAVADOC])
-AC_DEFUN([AX_PROG_JAVADOC],[
-AS_IF([test "x$JAVAPREFIX" = x],
-      [test "x$JAVADOC" = x && AC_CHECK_PROGS([JAVADOC], [javadoc])],
-      [test "x$JAVADOC" = x && AC_CHECK_PROGS([JAVADOC], [javadoc], [], [$JAVAPREFIX/bin])])
-test "x$JAVADOC" = x && AC_MSG_ERROR([no acceptable javadoc generator found in \$PATH])
-AC_PROVIDE([$0])dnl
-])
diff --git a/vpp-api/java/m4/ax_prog_javah.m4 b/vpp-api/java/m4/ax_prog_javah.m4
deleted file mode 100644
index cefc616d..00000000
--- a/vpp-api/java/m4/ax_prog_javah.m4
+++ /dev/null
@@ -1,64 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_prog_javah.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_JAVAH
-#
-# DESCRIPTION
-#
-#   AX_PROG_JAVAH tests the availability of the javah header generator and
-#   looks for the jni.h header file. If available, JAVAH is set to the full
-#   path of javah and CPPFLAGS is updated accordingly.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Luc Maisonobe <luc@spaceroots.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 8
-
-AU_ALIAS([AC_PROG_JAVAH], [AX_PROG_JAVAH])
-AC_DEFUN([AX_PROG_JAVAH],[
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CPP])dnl
-AC_PATH_PROG(JAVAH,javah)
-AS_IF([test -n "$ac_cv_path_JAVAH"],
-      [
-        AC_TRY_CPP([#include <jni.h>],,[
-        ac_save_CPPFLAGS="$CPPFLAGS"
-		_ACJAVAH_FOLLOW_SYMLINKS("$ac_cv_path_JAVAH")
-        ax_prog_javah_bin_dir=`AS_DIRNAME([$_ACJAVAH_FOLLOWED])`
-        ac_dir="`AS_DIRNAME([$ax_prog_javah_bin_dir])`/include"
-        AS_CASE([$build_os],
-                [cygwin*],
-                [ac_machdep=win32],
-                [ac_machdep=`AS_ECHO($build_os) | sed 's,[[-0-9]].*,,'`])
-        CPPFLAGS="$ac_save_CPPFLAGS -I$ac_dir -I$ac_dir/$ac_machdep"
-        AC_TRY_CPP([#include <jni.h>],
-                   ac_save_CPPFLAGS="$CPPFLAGS",
-                   AC_MSG_WARN([unable to include <jni.h>]))
-        CPPFLAGS="$ac_save_CPPFLAGS"])
-      ])
-])
-
-AC_DEFUN([_ACJAVAH_FOLLOW_SYMLINKS],[
-# find the include directory relative to the javac executable
-_cur="$1"
-while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do
-        AC_MSG_CHECKING([symlink for $_cur])
-        _slink=`ls -ld "$_cur" | sed 's/.* -> //'`
-        case "$_slink" in
-        /*) _cur="$_slink";;
-        # 'X' avoids triggering unwanted echo options.
-        *) _cur=`echo "X$_cur" | sed -e 's/^X//' -e 's:[[^/]]*$::'`"$_slink";;
-        esac
-        AC_MSG_RESULT([$_cur])
-done
-_ACJAVAH_FOLLOWED="$_cur"
-])
diff --git a/vpp-api/java/m4/ax_try_compile_java.m4 b/vpp-api/java/m4/ax_try_compile_java.m4
deleted file mode 100644
index a8ed6b2a..00000000
--- a/vpp-api/java/m4/ax_try_compile_java.m4
+++ /dev/null
@@ -1,55 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_try_compile_java.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_TRY_COMPILE_JAVA
-#
-# DESCRIPTION
-#
-#   AX_TRY_COMPILE_JAVA attempt to compile user given source.
-#
-#   *Warning*: its success or failure can depend on a proper setting of the
-#   CLASSPATH env. variable.
-#
-#   Note: This is part of the set of autoconf M4 macros for Java programs.
-#   It is VERY IMPORTANT that you download the whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission. The
-#   general documentation, as well as the sample configure.in, is included
-#   in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Devin Weaver <ktohg@tritarget.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 8
-
-AU_ALIAS([AC_TRY_COMPILE_JAVA], [AX_TRY_COMPILE_JAVA])
-AC_DEFUN([AX_TRY_COMPILE_JAVA],[
-AC_REQUIRE([AX_PROG_JAVAC])dnl
-cat << \EOF > Test.java
-/* [#]line __oline__ "configure" */
-ifelse([$1], , , [import $1;])
-public class Test {
-[$2]
-}
-EOF
-if AC_TRY_COMMAND($JAVAC $JAVACFLAGS Test.java) && test -s Test.class
-then
-dnl Don't remove the temporary files here, so they can be examined.
-  ifelse([$3], , :, [$3])
-else
-  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-  cat Test.java >&AS_MESSAGE_LOG_FD
-ifelse([$4], , , [  rm -fr Test.java Test.class
-  $4
-])dnl
-fi
-rm -fr Test.java Test.class])
diff --git a/vpp-api/java/m4/ax_try_run_java.m4 b/vpp-api/java/m4/ax_try_run_java.m4
deleted file mode 100644
index c680f03f..00000000
--- a/vpp-api/java/m4/ax_try_run_java.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_try_run_java.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_TRY_RUN_JAVA
-#
-# DESCRIPTION
-#
-#   AX_TRY_RUN_JAVA attempt to compile and run user given source.
-#
-#   *Warning*: its success or failure can depend on a proper setting of the
-#   CLASSPATH env. variable.
-#
-#   Note: This is part of the set of autoconf M4 macros for Java programs.
-#   It is VERY IMPORTANT that you download the whole set, some macros depend
-#   on other. Unfortunately, the autoconf archive does not support the
-#   concept of set of macros, so I had to break it for submission. The
-#   general documentation, as well as the sample configure.in, is included
-#   in the AX_PROG_JAVA macro.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Devin Weaver <ktohg@tritarget.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 2
-
-AU_ALIAS([AC_TRY_RUN_JAVA], [AX_TRY_RUN_JAVA])
-AC_DEFUN([AX_TRY_RUN_JAVA],[
-AC_REQUIRE([AX_PROG_JAVAC])dnl
-AC_REQUIRE([AX_PROG_JAVA])dnl
-cat << \EOF > Test.java
-/* [#]line __oline__ "configure" */
-ifelse([$1], , , [include $1;])
-public class Test {
-[$2]
-}
-EOF
-if AC_TRY_COMMAND($JAVAC $JAVACFLAGS Test.java) && test -s Test.class && ($JAVA $JAVAFLAGS Test; exit) 2>/dev/null
-then
-dnl Don't remove the temporary files here, so they can be examined.
-  ifelse([$3], , :, [$3])
-else
-  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-  cat Test.java >&AS_MESSAGE_LOG_FD
-ifelse([$4], , , [  rm -fr Test.java Test.class
-  $4
-])dnl
-fi
-rm -fr Test.java Test.class])
diff --git a/vpp-api/lua/README.md b/vpp-api/lua/README.md
deleted file mode 100644
index 4ecdb34d..00000000
--- a/vpp-api/lua/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-This is the experimental version of Lua API, aimed for the luajit use.
-
-Please take a look and send the feedback to ayourtch@gmail.com.
-
-To run the examples here:
-
-1) install luajit - "sudo apt-get install luajit" on ubuntu
-
-2) "make build-vpp-api" in the top VPP directory
-
-3) "make run" in a separate terminal window
-   This ensures you have an instance of VPP running
-
-4) sudo luajit examples/example-cli.lua
-
-This will result in something like this:
-
-Version:
-00000000  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  ................
-00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  ................
-
-{ [1] = { ["luaapi_message_name"] = show_version_reply,["program"] = vpe,["version"] = ,["build_date"] = Fri Nov 25 10:58:48 UTC 2016,["retval"] = 0,["build_directory"] = /home/ubuntu/vpp,["_vl_msg_id"] = 170,["context"] = 0,} ,}
----
-{ [1] = { ["luaapi_message_name"] = cli_inband_reply,["_vl_msg_id"] = 94,["length"] = 66,["reply"] = vpp v built by ubuntu on vpp-toys at Fri Nov 25 10:58:48 UTC 2016
-,["retval"] = 0,["context"] = 0,} ,}
----
-
-5) You can also run the performance test bench:
-
-$ sudo luajit bench.lua
-10001 iterations, average speed 5624LL per second
-10001 iterations, average speed 6650LL per second
-10001 iterations, average speed 6053LL per second
-10001 iterations, average speed 7056LL per second
-10001 iterations, average speed 6388LL per second
-10001 iterations, average speed 5849LL per second
-10001 iterations, average speed 6321LL per second
-10001 iterations, average speed 6368LL per second
-10001 iterations, average speed 5958LL per second
-10001 iterations, average speed 6482LL per second
-Average tps across the tests: 6274LL
-
-Note: the above is run in an lxd container running inside 2-core
-xhyve VM on a Macbook Pro, so I would not take the performance numbers for granted :)
-
-The "examples" directory contains a few naive examples, as well as a couple of more 
-advanced ones - a tab-completing CLI for VPP that can call both the APIs and CLI,
-and also a small test utility which I use for automating some small tests using
-VPP.
-
diff --git a/vpp-api/lua/bench.lua b/vpp-api/lua/bench.lua
deleted file mode 100644
index 8e5a0b4b..00000000
--- a/vpp-api/lua/bench.lua
+++ /dev/null
@@ -1,70 +0,0 @@
---[[
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-]]
-
-local vpp = require "vpp-lapi"
-
-local ffi = require "ffi"
-
-ffi.cdef([[
-   struct timespec {
-               long tv_sec;        /* seconds */
-               long tv_nsec;       /* nanoseconds */
-           };
-
-   int clock_gettime(int clk_id, struct timespec *tp);
-]])
-
-
-local time_cache = ffi.new("struct timespec[1]")
-local time_cache_1 = time_cache[0]
-function get_ns()
-  ffi.C.clock_gettime(0, time_cache)
-  return time_cache_1.tv_nsec + 1000000000 * time_cache_1.tv_sec
-end
-
-function do_bench()
-  local cycle_start = get_ns()
-  local n_iterations =  10000
-  local count = 1
-  for i = 1,n_iterations do
-    -- print(i)
-    vpp:api_call("show_version")
-    count = count + 1
-    -- print(i, "done")
-  end
-  cycle_end = get_ns()
-  local tps = n_iterations*1000000000LL/(cycle_end - cycle_start)
-  print (tostring(count) .. " iterations, average speed " .. tostring(tps) .. " per second")
-  return tps
-end
-
-root_dir = "/home/ubuntu/vpp"
-pneum_path = root_dir .. "/build-root/install-vpp_lite_debug-native/vpp-api/lib64/libpneum.so"
-vpp:init({ pneum_path = pneum_path })
-vpp:json_api(root_dir .. "/build-root/install-vpp_lite_debug-native/vpp/vpp-api/vpe.api.json")
-
-vpp:connect("lua-bench")
-local n_tests = 10
-local tps_acc = 0LL
-for i=1,n_tests do
-  tps_acc = tps_acc + do_bench()
-end
-print("Average tps across the tests: " .. tostring(tps_acc/n_tests))
-
-vpp:disconnect()
-
-
diff --git a/vpp-api/lua/examples/cli/README.md b/vpp-api/lua/examples/cli/README.md
deleted file mode 100644
index 3a5f8ee9..00000000
--- a/vpp-api/lua/examples/cli/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a small experiment to have a wrapper CLI which can call both API functions as well as debug CLI.
-
-To facilitate tab completion and help, the API call names are broken up with spaces replacing the underscores.
-
-
diff --git a/vpp-api/lua/examples/cli/lua-cli.lua b/vpp-api/lua/examples/cli/lua-cli.lua
deleted file mode 100644
index b3a24d7d..00000000
--- a/vpp-api/lua/examples/cli/lua-cli.lua
+++ /dev/null
@@ -1,747 +0,0 @@
---[[
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-]]
-
--- Experimental prototype CLI using API to VPP, with tab completion
---
--- Written by Andrew Yourtchenko (ayourtch@cisco.com) 2010,2016
---
-
-vpp = require "vpp-lapi"
-
-
-local dotdotdot = "..."
-
--- First the "readline" routine
-
-readln = {
-split = function(str, pat)
-  local t = {}  -- NOTE: use {n = 0} in Lua-5.0
-  local fpat = "(.-)" .. pat
-  local last_end = 1
-  if str then
-    local s, e, cap = str:find(fpat, 1)
-    while s do
-      if s ~= 1 or cap ~= "" then
-        table.insert(t,cap)
-      end
-      last_end = e+1
-      s, e, cap = str:find(fpat, last_end)
-    end
-    if last_end <= #str then
-      cap = str:sub(last_end)
-      table.insert(t, cap)
-    end
-  end
-  return t
-end,
-
-reader = function()
-  local rl = {}
-
-  rl.init = function()
-    os.execute("stty -icanon min 1 -echo")
-    rl.rawmode = true
-  end
-
-  rl.done = function()
-    os.execute("stty icanon echo")
-    rl.rawmode = false
-  end
-
-  rl.prompt = ">"
-  rl.history = { "" }
-  rl.history_index = 1
-  rl.history_length = 1
-
-  rl.hide_cmd = function()
-    local bs = string.char(8) .. " " .. string.char(8)
-    for i = 1, #rl.command do
-      io.stdout:write(bs)
-    end
-  end
-
-  rl.show_cmd = function()
-    if rl.command then
-      io.stdout:write(rl.command)
-    end
-  end
-
-  rl.store_history = function(cmd)
-    if cmd == "" then
-      return
-    end
-    rl.history[rl.history_length] = cmd
-    rl.history_length = rl.history_length + 1
-    rl.history_index = rl.history_length
-    rl.history[rl.history_length] = ""
-  end
-
-  rl.readln = function()
-    local done = false
-    local need_prompt = true
-    rl.command = ""
-
-    if not rl.rawmode then
-      rl.init()
-    end
-
-    while not done do
-      if need_prompt then
-        io.stdout:write(rl.prompt)
-	io.stdout:write(rl.command)
-        need_prompt = false
-      end
-
-      local ch = io.stdin:read(1)
-      if ch:byte(1) == 27 then
-        -- CONTROL
-        local ch2 = io.stdin:read(1)
-        -- arrows
-        if ch2:byte(1) == 91 then
-          local ch3 = io.stdin:read(1)
-          local b = ch3:byte(1)
-          if b == 65 then
-            ch = "UP"
-          elseif b == 66 then
-            ch = "DOWN"
-          elseif b == 67 then
-            ch = "RIGHT"
-          elseif b == 68 then
-            ch = "LEFT"
-          end
-          -- print("Byte: " .. ch3:byte(1))
-          -- if ch3:byte(1)
-        end
-      end
-
-      if ch == "?" then
-        io.stdout:write(ch)
-        io.stdout:write("\n")
-        if rl.help then
-          rl.help(rl)
-        end
-        need_prompt = true
-      elseif ch == "\t" then
-        if rl.tab_complete then
-          rl.tab_complete(rl)
-        end
-        io.stdout:write("\n")
-        need_prompt = true
-      elseif ch == "\n" then
-        io.stdout:write(ch)
-        done = true
-      elseif ch == "\004" then
-        io.stdout:write("\n")
-        rl.command = nil
-	done = true
-      elseif ch == string.char(127) then
-        if rl.command ~= "" then
-          io.stdout:write(string.char(8) .. " " .. string.char(8))
-          rl.command = string.sub(rl.command, 1, -2)
-        end
-      elseif #ch > 1 then
-        -- control char
-        if ch == "UP" then
-          rl.hide_cmd()
-          if rl.history_index == #rl.history then
-            rl.history[rl.history_index] = rl.command
-          end
-          if rl.history_index > 1 then
-            rl.history_index = rl.history_index - 1
-            rl.command = rl.history[rl.history_index]
-          end
-          rl.show_cmd()
-        elseif ch == "DOWN" then
-          rl.hide_cmd()
-          if rl.history_index < rl.history_length then
-            rl.history_index = rl.history_index + 1
-            rl.command = rl.history[rl.history_index]
-          end
-          rl.show_cmd()
-        end
-      else
-        io.stdout:write(ch)
-        rl.command = rl.command .. ch
-      end
-    end
-    if rl.command then
-      rl.store_history(rl.command)
-    end
-    return rl.command
-  end
-  return rl
-end
-
-}
-
---[[
-
-r = reader()
-
-local done = false
-
-while not done do
-  local cmd = r.readln()
-  print("Command: " .. tostring(cmd))
-  if not cmd or cmd == "quit" then
-    done = true
-  end
-end
-
-r.done()
-
-]]
-
---------- MDS show tech parser
-
-local print_section = nil
-local list_sections = false
-
-local curr_section = "---"
-local curr_parser = nil
-
--- by default operate in batch mode
-local batch_mode = true
-
-local db = {}
-local device = {}
-device.output = {}
-local seen_section = {}
-
-function start_collection(name)
-  device = {}
-  seen_section = {}
-end
-
-function print_error(errmsg)
-  print("@#$:" .. errmsg)
-end
-
-function keys(tbl)
-  local t = {}
-  for k, v in pairs(tbl) do
-    table.insert(t, k)
-  end
-  return t
-end
-
-function tset (parent, ...)
-
-  -- print ('set', ...)
-
-  local len = select ('#', ...)
-  local key, value = select (len-1, ...)
-  local cutpoint, cutkey
-
-  for i=1,len-2 do
-
-    local key = select (i, ...)
-    local child = parent[key]
-
-    if value == nil then
-      if child == nil then  return
-      elseif next (child, next (child)) then  cutpoint = nil  cutkey = nil
-      elseif cutpoint == nil then  cutpoint = parent  cutkey = key  end
-
-    elseif child == nil then  child = {}  parent[key] = child  end
-
-    parent = child
-    end
-
-  if value == nil and cutpoint then  cutpoint[cutkey] = nil
-  else  parent[key] = value  return value  end
-  end
-
-
-function tget (parent, ...)
-  local len = select ('#', ...)
-  for i=1,len do
-    parent = parent[select (i, ...)]
-    if parent == nil then  break  end
-    end
-  return parent
-  end
-
-
-local pager_lines = 23
-local pager_printed = 0
-local pager_skipping = false
-local pager_filter_pipe = nil
-
-function pager_reset()
-  pager_printed = 0
-  pager_skipping = false
-  if pager_filter_pipe then
-    pager_filter_pipe:close()
-    pager_filter_pipe = nil
-  end
-end
-
-
-function print_more()
-  io.stdout:write(" --More-- ")
-end
-
-function print_nomore()
-  local bs = string.char(8)
-  local bs10 = bs ..  bs ..  bs ..  bs ..  bs ..  bs ..  bs ..  bs ..  bs ..  bs
-  io.stdout:write(bs10 .. "          " .. bs10)
-end
-
-function print_line(txt)
-  if pager_filter_pipe then
-    pager_filter_pipe:write(txt .. "\n")
-    return
-  end
-  if pager_printed >= pager_lines then
-    print_more()
-    local ch = io.stdin:read(1)
-    if ch == " " then
-      pager_printed = 0
-    elseif ch == "\n" then
-      pager_printed = pager_printed - 1
-    elseif ch == "q" then
-      pager_printed = 0
-      pager_skipping = true
-    end
-    print_nomore()
-  end
-  if not pager_skipping then
-    print(txt)
-    pager_printed = pager_printed + 1
-  else
-    -- skip printing
-  end
-end
-
-function paged_write(text)
-  local t = readln.split(text, "[\n]")
-  if string.sub(text, -1) == "\n" then
-    table.insert(t, "")
-  end
-  for i, v in ipairs(t) do
-    if i < #t then
-      print_line(v)
-    else
-      if pager_filter_pipe then
-        pager_filter_pipe:write(v)
-      else
-        io.stdout:write(v)
-      end
-    end
-  end
-end
-
-
-
-
-
-function get_choices(tbl, key)
-  local res = {}
-  for k, v in pairs(tbl) do
-    if string.sub(k, 1, #key) == key then
-      table.insert(res, k)
-    elseif 0 < #key and dotdotdot == k then
-      table.insert(res, k)
-    end
-  end
-  return res
-end
-
-function get_exact_choice(choices, val)
-  local exact_idx = nil
-  local substr_idx = nil
-  local substr_seen = false
-
-  if #choices == 1 then
-    if choices[1] == dotdotdot then
-      return 1
-    elseif string.sub(choices[1], 1, #val) == val then
-      return 1
-    else
-      return nil
-    end
-  else
-    for i, v in ipairs(choices) do
-      if v == val then
-        exact_idx = i
-        substr_seen = true
-      elseif choices[i] ~= dotdotdot and string.sub(choices[i], 1, #val) == val then
-        if substr_seen then
-          substr_idx = nil
-        else
-          substr_idx = i
-          substr_seen = true
-        end
-      elseif choices[i] == dotdotdot then
-        if substr_seen then
-          substr_idx = nil
-        else
-          substr_idx = i
-          substr_seen = true
-        end
-      end
-    end
-  end
-  return exact_idx or substr_idx
-end
-
-function device_cli_help(rl)
-  local key = readln.split(rl.command, "[ ]+")
-  local tree = rl.tree
-  local keylen = #key
-  local fullcmd = ""
-  local error = false
-  local terse = true
-
-  if ((#rl.command >= 1) and (string.sub(rl.command, -1) == " ")) or (#rl.command == 0) then
-    table.insert(key, "")
-    terse = false
-  end
-
-  for i, v in ipairs(key) do
-    local choices = get_choices(tree, v)
-    local idx = get_exact_choice(choices, v)
-    if idx then
-      local choice = choices[idx]
-      tree = tree[choice]
-      fullcmd = fullcmd .. choice .. " "
-    else
-      if i < #key then
-        error = true
-      end
-    end
-
-    if i == #key and not error then
-      for j, w in ipairs(choices) do
-        if terse then
-          paged_write(w .. "\t")
-        else
-          paged_write("  " .. w .. "\n")
-        end
-      end
-      paged_write("\n")
-      if terse then
-        paged_write(" \n")
-      end
-    end
-  end
-  pager_reset()
-end
-
-function device_cli_tab_complete(rl)
-  local key = readln.split(rl.command, "[ ]+")
-  local tree = rl.tree
-  local keylen = #key
-  local fullcmd = ""
-  local error = false
-
-  for i, v in ipairs(key) do
-    local choices = get_choices(tree, v)
-    local idx = get_exact_choice(choices, v)
-    if idx and choices[idx] ~= dotdotdot then
-      local choice = choices[idx]
-      tree = tree[choice]
-      -- print("level " .. i .. " '" .. choice .. "'")
-      fullcmd = fullcmd .. choice .. " "
-    else
-      -- print("level " .. i .. " : " .. table.concat(choices, " ") .. " ")
-      error = true
-    end
-  end
-  if not error then
-    rl.command = fullcmd
-  else
-    -- print("\n\nerror\n")
-  end
-  pager_reset()
-end
-
-function device_cli_exec(rl)
-
-  local cmd_nopipe = rl.command
-  local cmd_pipe = nil
-
-  local pipe1, pipe2 = string.find(rl.command, "[|]")
-  if pipe1 then
-    cmd_nopipe = string.sub(rl.command, 1, pipe1-1)
-    cmd_pipe = string.sub(rl.command, pipe2+1, -1)
-  end
-
-  local key = readln.split(cmd_nopipe .. " <cr>", "[ ]+")
-  local tree = rl.tree
-  local keylen = #key
-  local fullcmd = ""
-  local error = false
-  local func = nil
-
-  if cmd_pipe then
-    pager_filter_pipe = io.popen(cmd_pipe, "w")
-  end
-
-
-  rl.choices = {}
-
-  for i, v in ipairs(key) do
-    local choices = get_choices(tree, v)
-    local idx = get_exact_choice(choices, v)
-    if idx then
-      local choice = choices[idx]
-      if i == #key then
-        func = tree[choice]
-      else
-        if choice == dotdotdot then
-          -- keep the tree the same, update the choice value to match the input string
-          choices[idx] = v
-          choice = v
-        else
-          tree = tree[choice]
-        end
-      end
-      -- print("level " .. i .. " '" .. choice .. "'")
-      table.insert(rl.choices, choice)
-    else
-      -- print("level " .. i .. " : " .. table.concat(choices, " ") .. " ")
-      error = true
-      return nil
-    end
-  end
-  return func
-end
-
-function populate_tree(commands)
-  local tree = {}
-
-  for k, v in pairs(commands) do
-    local key = readln.split(k .. " <cr>", "[ ]+")
-    local xtree = tree
-    for i, kk in ipairs(key) do
-      if i == 1 and kk == "sh" then
-        kk = "show"
-      end
-      if i == #key then
-        if type(v) == "function" then
-          xtree[kk] = v
-        else
-          xtree[kk] = function(rl) paged_write(table.concat(v, "\n") .. "\n") end
-        end
-      else
-        if not xtree[kk] then
-          xtree[kk] = {}
-        end
-        xtree = xtree[kk]
-      end
-    end
-  end
-  return tree
-end
-
-function trim (s)
-  return (string.gsub(s, "^%s*(.-)%s*$", "%1"))
-end
-
-
-function init_vpp(vpp)
-  local root_dir = "/home/ubuntu/vpp"
-  local pneum_path = root_dir .. "/build-root/install-vpp_lite_debug-native/vpp-api/lib64/libpneum.so"
-
-  vpp:init({ pneum_path = pneum_path })
-
-  vpp:init({ pneum_path = pneum_path })
-  vpp:json_api(root_dir .. "/build-root/install-vpp_lite_debug-native/vpp/vpp-api/vpe.api.json")
-
-
-
-  vpp:connect("lua_cli")
-end
-
-function run_cli(vpp, cli)
-  local reply = vpp:api_call("cli_inband", { cmd = cli })
-  if reply and #reply == 1 then
-    local rep = reply[1]
-    if 0 == rep.retval then
-      return rep.reply
-    else
-      return "XXXXXLUACLI: API RETVAL ERROR : " .. tostring(rep.retval)
-    end
-  else
-    return "XXXXXLUACLI ERROR, RAW REPLY: " .. vpp.dump(reply)
-  end
-end
-
-
-function toprintablestring(s)
-  if type(s) == "string" then
-    return "\n"..vpp.hex_dump(s)
-  else
-    return tostring(s)
-  end
-end
-
-function interactive_cli(r)
-  while not done do
-    pager_reset()
-    local cmd = r.readln()
-    if not cmd then
-      done = true
-    elseif cmd == "quit" or cmd == "exit" then
-      done = true
-    else
-      local func = device_cli_exec(r)
-      if func then
-	func(r)
-      else
-	if trim(cmd) == "" then
-	else
-	  for i = 1, #r.prompt do
-	    paged_write(" ")
-	  end
-	  paged_write("^\n% Invalid input detected at '^' marker.\n\n")
-	end
-      end
-    end
-  end
-end
-
-device = {}
-device.output = {}
-
-init_vpp(vpp)
-cmds_str = run_cli(vpp, "?")
-vpp_cmds = readln.split(cmds_str, "\n")
-vpp_clis = {}
-
-for linenum, line in ipairs(vpp_cmds) do
-  local m,h = string.match(line, "^  (.-)  (.*)$")
-  if m and #m > 0 then
-    table.insert(vpp_clis, m)
-    device.output["vpp debug cli " .. m] = function(rl)
-      -- print("ARBITRARY CLI" .. vpp.dump(rl.choices))
-      print("LUACLI command: " .. table.concat(rl.choices, " "))
-      local sub = {}
-      --
-      for i=4, #rl.choices -1 do
-        table.insert(sub, rl.choices[i])
-      end
-      local cli = table.concat(sub, " ")
-      print("Running CLI: " .. tostring(cli))
-      paged_write(run_cli(vpp, cli))
-    end
-    device.output["vpp debug cli " .. m .. " " .. dotdotdot] = function(rl)
-      print("ARGH")
-    end
-
-    local ret = run_cli(vpp, "help " .. m)
-    device.output["help vpp debug cli " .. m] = { ret }
-  end
-end
-
-for linenum, line in ipairs(vpp_clis) do
-  -- print(line, ret)
-end
-
-for msgnum, msgname in pairs(vpp.msg_number_to_name) do
-  local cli, numspaces = string.gsub(msgname, "_", " ")
-  device.output["call " .. cli .. " " .. dotdotdot] = function(rl)
-    print("ARGH")
-  end
-  device.output["call " .. cli] = function(rl)
-    print("LUACLI command: " .. table.concat(rl.choices, " "))
-    print("Running API: " .. msgname) -- vpp.dump(rl.choices))
-    local out = {}
-    local args = {}
-    local ntaken = 0
-    local argname = ""
-    for i=(1+1+numspaces+1), #rl.choices-1 do
-      -- print(i, rl.choices[i])
-      if ntaken > 0 then
-        ntaken = ntaken -1
-      else
-        local fieldname = rl.choices[i]
-        local field = vpp.msg_name_to_fields[msgname][fieldname]
-        if field then
-          local s = rl.choices[i+1]
-          s=s:gsub("\\x(%x%x)",function (x) return string.char(tonumber(x,16)) end)
-          args[fieldname] = s
-          ntaken = 1
-        end
-      end
-    end
-    -- print("ARGS: ", vpp.dump(args))
-    local ret = vpp:api_call(msgname, args)
-    for i, reply in ipairs(ret) do
-      table.insert(out, "=================== Entry #" .. tostring(i))
-      for k, v in pairs(reply) do
-        table.insert(out, "   " .. tostring(k) .. " : " .. toprintablestring(v))
-      end
-    end
-    -- paged_write(vpp.dump(ret) .. "\n\n")
-    paged_write(table.concat(out, "\n").."\n\n")
-  end
-  device.output["call " .. cli .. " help"] = function(rl)
-    local out = {}
-    for k, v in pairs(vpp.msg_name_to_fields[msgname]) do
-      table.insert(out, tostring(k) .. " : " .. v["ctype"] .. " ; " .. tostring(vpp.dump(v)) )
-    end
-    -- paged_write(vpp.dump(vpp.msg_name_to_fields[msgname]) .. "\n\n")
-    paged_write(table.concat(out, "\n").."\n\n")
-  end
--- vpp.msg_name_to_number = {}
-end
-
-
-
-local r = readln.reader()
-local done = false
-
-r.prompt = "VPP(luaCLI)#"
-
-r.help = device_cli_help
-r.tab_complete = device_cli_tab_complete
-print("===== CLI view, use ^D to end =====")
-
-r.tree = populate_tree(device.output)
--- readln.pretty("xxxx", r.tree)
-
-
-for idx, an_arg in ipairs(arg) do
-  local fname = an_arg
-  if fname == "-i" then
-    pager_lines = 23
-    interactive_cli(r)
-  else
-    pager_lines = 100000000
-    for line in io.lines(fname) do
-      r.command = line
-      local func = device_cli_exec(r)
-      if func then
-	func(r)
-      end
-    end
-  end
-end
-
-if #arg == 0 then
-  print("You should specify '-i' as an argument for the interactive session,")
-  print("but with no other sources of commands, we start interactive session now anyway")
-   interactive_cli(r)
-end
-
-vpp:disconnect()
-r.done()
-
-
diff --git a/vpp-api/lua/examples/example-acl-plugin.lua b/vpp-api/lua/examples/example-acl-plugin.lua
deleted file mode 100644
index ca01f18d..00000000
--- a/vpp-api/lua/examples/example-acl-plugin.lua
+++ /dev/null
@@ -1,110 +0,0 @@
---[[
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-]]
-
-
-vpp = require "vpp-lapi"
-
-root_dir = "/home/ubuntu/vpp"
-pneum_path = root_dir .. "/build-root/install-vpp_debug-native/vpp-api/lib64/libpneum.so"
-
-vpp:init({ pneum_path = pneum_path })
-
-vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vlib-api/vlibmemory/memclnt.api")
-vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vpp/vpp-api/vpe.api")
-vpp:connect("aytest")
-vpp:consume_api(root_dir .. "/plugins/acl-plugin/acl/acl.api", "acl")
-
--- api calls
-reply = vpp:api_call("show_version")
-print("Version: ", reply[1].version)
-print(vpp.hex_dump(reply[1].version))
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 230 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 8 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 15 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_add", { context = 42, count = 2, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 } } })
-print(vpp.dump(reply))
-print("---")
-interface_acl_in = reply[1].acl_index
-
-reply = vpp:api_call("acl_add", { context = 42, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
-print(vpp.dump(reply))
-print("---")
-interface_acl_out = reply[1].acl_index
-
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_add", { context = 42, count = 0 })
-print(vpp.dump(reply))
-print("---")
-
-acl_index_to_delete = reply[1].acl_index
-print("Deleting " .. tostring(acl_index_to_delete))
-reply = vpp:api_call("acl_del", { context = 42, acl_index = acl_index_to_delete })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
-for ri, rv in ipairs(reply) do 
-  print("Reply message #" .. tostring(ri))
-  print(vpp.dump(rv))
-  for ai, av in ipairs(rv.r) do
-    print("ACL rule #" .. tostring(ai) .. " : " .. vpp.dump(av))
-  end
-   
-end
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
-print(vpp.dump(reply))
-print("---")
-
-
-vpp:disconnect()
-
-
diff --git a/vpp-api/lua/examples/example-classifier.lua b/vpp-api/lua/examples/example-classifier.lua
deleted file mode 100644
index ec9c3d3e..00000000
--- a/vpp-api/lua/examples/example-classifier.lua
+++ /dev/null
@@ -1,51 +0,0 @@
---[[
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-]]
-
-
-local vpp = require "vpp-lapi"
-local bit = require("bit")
-
-root_dir = "/home/ubuntu/vpp"
-pneum_path = root_dir .. "/build-root/install-vpp_lite_debug-native/vpp-api/lib64/libpneum.so"
-
-
-vpp:init({ pneum_path = pneum_path })
-
-vpp:json_api(root_dir .. "/build-root/install-vpp_lite_debug-native/vpp/vpp-api/vpe.api.json")
-
-vpp:connect("aytest")
-
--- api calls
-
-print("Calling API to add a new classifier table")
-reply = vpp:api_call("classify_add_del_table", {
-  context = 43,
-  memory_size = bit.lshift(2, 20),
-  client_index = 42,
-  is_add = 1,
-  nbuckets = 32,
-  skip_n_vectors = 0,
-  match_n_vectors = 1,
-  mask = "\255\255\255\255\255\255\255\255" .. "\255\255\255\255\255\255\255\255"
-})
-print(vpp.dump(reply))
-print("---")
-
-
-vpp:disconnect()
-
-
diff --git a/vpp-api/lua/examples/example-cli.lua b/vpp-api/lua/examples/example-cli.lua
deleted file mode 100644
index 8b84989f..00000000
--- a/vpp-api/lua/examples/example-cli.lua
+++ /dev/null
@@ -1,44 +0,0 @@
---[[
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-]]
-
-vpp = require "vpp-lapi"
-
-root_dir = "/home/ubuntu/vpp"
-pneum_path = root_dir .. "/build-root/install-vpp_lite_debug-native/vpp-api/lib64/libpneum.so"
-
-vpp:init({ pneum_path = pneum_path })
-
-vpp:json_api(root_dir .. "/build-root/install-vpp_lite_debug-native/vpp/vpp-api/vpe.api.json")
-
-vpp:connect("aytest")
-
--- api calls
-reply = vpp:api_call("show_version")
-print("Version: ", reply[1].version)
-print(vpp.hex_dump(reply[1].version))
-print(vpp.dump(reply))
-print("---")
-
-
-reply = vpp:api_call("cli_inband", { cmd = "show vers" }) 
-print(vpp.dump(reply))
-print("---")
-
-
-vpp:disconnect()
-
-
diff --git a/vpp-api/lua/examples/lute/README.md b/vpp-api/lua/examples/lute/README.md
deleted file mode 100644
index 8d37250a..00000000
--- a/vpp-api/lua/examples/lute/README.md
+++ /dev/null
@@ -1,66 +0,0 @@
-LUTE: Lua Unit Test Environment
-
-This is a small helper utility to automate some simple tests
-that one might need to do.
-
-Think of it as a hybrid of a screen and expect who
-also took some habits from HTML inline code.
-
-It is quite probably useless for building anything serious,
-but practice shows it is quite efficient at allowing
-convenient temporary quick tests, and for something
-that was written over a course of a couple of evenings it
-is quite a nice little helper tool.
-
-It allows do launch and drive multiple shell sessions,
-and by virtue of having been written in Lua, it of course
-also allows to add the business logic using the Lua code.
-
-If you launch the lute without parameters, it gives you
-the interactive shell to execute the commands in.
-
-If you launch it with an argument, it will attempt to
-read and execute the commands from the file.
-
-Commands:
-
-shell FOO
-
-  spawn a shell in a new PTY under the label FOO.
-
-run FOO bar
-
-  Send "bar" keystrokes followed by "ENTER" to the session FOO
-
-  Special case: "break" word on its own gets translated into ^C being sent.
-
-cd FOO
-
-  "change domain" into session FOO. All subsequent inputs will go,
-  line-buffered, into the session FOO. To jump back up, use ^D (Control-D),
-  or within the file, use ^D^D^D (caret D caret D caret D on its own line)
-
-expect FOO blablabla
-
-  Pause further interpretation of the batch mode until you see "blablabla"
-  in the output of session FOO, or until timeout happens.
-
-sleep N
-
-  Sleep an integer N seconds, if you are in batch mode.
-
-echo blabla
-
-  Echo the remainder of the line to standard output.
-
-For Lua code, there is a pre-existing pseudo-session called "lua",
-which accepts "run lua" command which does what you would expect
-(evaluate the rest of the string in Lua context - being the same
-as lute itself). Also you can do "cd lua" and get into a
-multiline-enabled interpreter shell.
-
-This way for the VPP case you can automate some of the things in your routine
-that you would have to have done manually, and test drive API as well
-as use the realistic native OS components to create the environment around it.
-
-
diff --git a/vpp-api/lua/examples/lute/lute.lua b/vpp-api/lua/examples/lute/lute.lua
deleted file mode 100644
index 89b9924b..00000000
--- a/vpp-api/lua/examples/lute/lute.lua
+++ /dev/null
@@ -1,777 +0,0 @@
---[[
-version = 1
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-]]
-
--- LUTE: Lua Unit Test Environment
--- AKA what happens when screen tries to marry with lua and expect,
--- but escapes mid-ceremony.
---
--- comments: @ayourtch
-
-ffi = require("ffi")
-
-vpp = {}
-function vpp.dump(o)
-   if type(o) == 'table' then
-      local s = '{ '
-      for k,v in pairs(o) do
-         if type(k) ~= 'number' then k = '"'..k..'"' end
-         s = s .. '['..k..'] = ' .. vpp.dump(v) .. ','
-      end
-      return s .. '} '
-   else
-      return tostring(o)
-   end
-end
-
-
-ffi.cdef([[
-
-int posix_openpt(int flags);
-int grantpt(int fd);
-int unlockpt(int fd);
-char *ptsname(int fd);
-
-typedef long pid_t;
-typedef long ssize_t;
-typedef long size_t;
-typedef int nfds_t;
-typedef long time_t;
-typedef long suseconds_t;
-
-pid_t fork(void);
-pid_t setsid(void);
-
-int close(int fd);
-int open(char *pathname, int flags);
-
-int dup2(int oldfd, int newfd);
-
-ssize_t read(int fd, void *buf, size_t count);
-ssize_t write(int fd, const void *buf, size_t count);
-
-struct pollfd {
-               int   fd;         /* file descriptor */
-               short events;     /* requested events */
-               short revents;    /* returned events */
-           };
-
-int poll(struct pollfd *fds, nfds_t nfds, int timeout);
-
-struct timeval {
-               time_t      tv_sec;     /* seconds */
-               suseconds_t tv_usec;    /* microseconds */
-           };
-
-int gettimeofday(struct timeval *tv, struct timezone *tz);
-
-int inet_pton(int af, const char *src, void *dst);
-
-]])
-
-ffi.cdef([[
-void *memset(void *s, int c, size_t n);
-void *memcpy(void *dest, void *src, size_t n);
-void *memmove(void *dest, const void *src, size_t n);
-void *memmem(const void *haystack, size_t haystacklen,
-        const void *needle, size_t needlelen);
-]])
-
-
-
-local O_RDWR = 2
-
-
-function os_time()
-  local tv = ffi.new("struct timeval[1]")
-  local ret = ffi.C.gettimeofday(tv, nil)
-  return tonumber(tv[0].tv_sec) + (tonumber(tv[0].tv_usec)/1000000.0)
-end
-
-function sleep(n)
-  local when_wakeup = os_time() + n
-  while os_time() <= when_wakeup do
-    ffi.C.poll(nil, 0, 10)
-  end
-end
-
-
-function c_str(text_in)
-  local text = text_in 
-  local c_str = ffi.new("char[?]", #text+1)
-  ffi.copy(c_str, text)
-  return c_str
-end
-
-function ip46(addr_text)
-  local out = ffi.new("char [200]")
-  local AF_INET6 = 10
-  local AF_INET = 2
-  local is_ip6 = ffi.C.inet_pton(AF_INET6, c_str(addr_text), out)
-  if is_ip6 == 1 then
-    return ffi.string(out, 16), true
-  end
-  local is_ip4 = ffi.C.inet_pton(AF_INET, c_str(addr_text), out)
-  if is_ip4 then
-    return (string.rep("4", 12).. ffi.string(out, 4)), false
-  end
-end
-
-function pty_master_open()
-  local fd = ffi.C.posix_openpt(O_RDWR)
-  ffi.C.grantpt(fd)
-  ffi.C.unlockpt(fd)
-  local p = ffi.C.ptsname(fd)
-  print("PTS:" .. ffi.string(p))
-  return fd, ffi.string(p)
-end
-
-function pty_run(cmd)
-  local master_fd, pts_name = pty_master_open()
-  local child_pid = ffi.C.fork()
-  if (child_pid == -1) then
-    print("Error fork()ing")
-    return -1
-  end 
- 
-  if child_pid ~= 0 then
-    -- print("Parent")
-    return master_fd, child_pid
-  end
-
-  -- print("Child")
-  if (ffi.C.setsid() == -1) then
-    print("Child error setsid")
-    os.exit(-1)
-  end
-
-  ffi.C.close(master_fd)
-
-  local slave_fd = ffi.C.open(c_str(pts_name), O_RDWR)
-  if slave_fd == -1 then
-    print("Child can not open slave fd")
-    os.exit(-2)
-  end
-
-  ffi.C.dup2(slave_fd, 0)
-  ffi.C.dup2(slave_fd, 1)
-  ffi.C.dup2(slave_fd, 2)
-  os.execute(cmd)
-end
-
-function readch()
-  local buf = ffi.new("char[1]")
-  local nread= ffi.C.read(0, buf, 1)
-  -- print("\nREADCH : " .. string.char(buf[0]))
-  return string.char(buf[0])
-end
-
-function stdout_write(str)
-  ffi.C.write(1, c_str(str), #str)
-end
-
-
-readln = {
-split = function(str, pat)
-  local t = {}  -- NOTE: use {n = 0} in Lua-5.0
-  local fpat = "(.-)" .. pat
-  local last_end = 1
-  if str then
-    local s, e, cap = str:find(fpat, 1)
-    while s do
-      if s ~= 1 or cap ~= "" then
-        table.insert(t,cap)
-      end
-      last_end = e+1
-      s, e, cap = str:find(fpat, last_end)
-    end
-    if last_end <= #str then
-      cap = str:sub(last_end)
-      table.insert(t, cap)
-    end
-  end
-  return t
-end,
-
-reader = function()
-  local rl = {}
-
-  rl.init = function()
-    os.execute("stty -icanon min 1 -echo")
-    rl.rawmode = true
-  end
-
-  rl.done = function()
-    os.execute("stty icanon echo")
-    rl.rawmode = false
-  end
-
-  rl.prompt = ">"
-  rl.history = { "" }
-  rl.history_index = 1
-  rl.history_length = 1
-
-  rl.hide_cmd = function()
-    local bs = string.char(8) .. " " .. string.char(8)
-    for i = 1, #rl.command do
-      stdout_write(bs)
-    end
-  end
-
-  rl.show_cmd = function()
-    if rl.command then
-      stdout_write(rl.command)
-    end
-  end
-
-  rl.store_history = function(cmd)
-    if cmd == "" then
-      return
-    end
-    rl.history[rl.history_length] = cmd
-    rl.history_length = rl.history_length + 1
-    rl.history_index = rl.history_length
-    rl.history[rl.history_length] = ""
-  end
-
-  rl.readln = function(stdin_select_fn, batch_cmd, batch_when, batch_expect)
-    local done = false
-    local need_prompt = true
-    rl.command = ""
-
-    if not rl.rawmode then
-      rl.init()
-    end
-
-    while not done do
-      local indent_value = #rl.prompt + #rl.command
-      if need_prompt then
-        stdout_write(rl.prompt)
-        stdout_write(rl.command)
-        need_prompt = false
-      end
-      if type(stdin_select_fn) == "function" then
-        while not stdin_select_fn(indent_value, batch_cmd, batch_when, batch_expect) do
-          stdout_write(rl.prompt)
-          stdout_write(rl.command)
-          indent_value = #rl.prompt + #rl.command
-        end
-        if batch_cmd and ((os_time() > batch_when) or (batch_expect and expect_success(batch_expect, buf, 0))) then
-          stdout_write("\n" .. rl.prompt .. batch_cmd .. "\n")
-          if batch_expect then
-            expect_done(batch_expect)
-          end
-          return batch_cmd, batch_expect
-        end
-      end
-      local ch = readch()
-      if ch:byte(1) == 27 then
-        -- CONTROL
-        local ch2 = readch()
-        -- arrows
-        if ch2:byte(1) == 91 then
-          local ch3 = readch()
-          local b = ch3:byte(1)
-          if b == 65 then
-            ch = "UP"
-          elseif b == 66 then
-            ch = "DOWN"
-          elseif b == 67 then
-            ch = "RIGHT"
-          elseif b == 68 then
-            ch = "LEFT"
-          end
-          -- print("Byte: " .. ch3:byte(1))
-          -- if ch3:byte(1)
-        end
-      end
-
-      if ch == "?" then
-        stdout_write(ch)
-        stdout_write("\n")
-        if rl.help then
-          rl.help(rl)
-        end
-        need_prompt = true
-      elseif ch == "\t" then
-        if rl.tab_complete then
-          rl.tab_complete(rl)
-        end
-        stdout_write("\n")
-        need_prompt = true
-      elseif ch == "\n" then
-        stdout_write(ch)
-        done = true
-      elseif ch == "\004" then
-        stdout_write("\n")
-        rl.command = nil
-        done = true
-      elseif ch == string.char(127) then
-        if rl.command ~= "" then
-          stdout_write(string.char(8) .. " " .. string.char(8))
-          rl.command = string.sub(rl.command, 1, -2)
-        end
-      elseif #ch > 1 then
-        -- control char
-        if ch == "UP" then
-          rl.hide_cmd()
-          if rl.history_index == #rl.history then
-            rl.history[rl.history_index] = rl.command
-          end
-          if rl.history_index > 1 then
-            rl.history_index = rl.history_index - 1
-            rl.command = rl.history[rl.history_index]
-          end
-          rl.show_cmd()
-        elseif ch == "DOWN" then
-          rl.hide_cmd()
-          if rl.history_index < rl.history_length then
-            rl.history_index = rl.history_index + 1
-            rl.command = rl.history[rl.history_index]
-          end
-          rl.show_cmd()
-        end
-      else
-        stdout_write(ch)
-        rl.command = rl.command .. ch
-      end
-    end
-    if rl.command then
-      rl.store_history(rl.command)
-    end
-    return rl.command
-  end
-  return rl
-end
-
-}
-
-local select_fds = {}
-local sessions = {}
-
-local line_erased = false
-
-function erase_line(indent)
-  if not line_erased then
-    line_erased = true
-    stdout_write(string.rep(string.char(8), indent)..string.rep(" ", indent)..string.rep(string.char(8), indent))
-  end
-end
-
-function do_select_stdin(indent, batch_cmd, batch_when, batch_expect)
-  while true do
-    local nfds = 1+#select_fds
-    local pfds = ffi.new("struct pollfd[?]", nfds)
-    pfds[0].fd = 0;
-    pfds[0].events = 1;
-    pfds[0].revents = 0;
-    for i = 1,#select_fds do
-      pfds[i].fd = select_fds[i].fd
-      pfds[i].events = 1
-      pfds[i].revents = 0
-    end
-    if batch_cmd and ((os_time() > batch_when) or (batch_expect and expect_success(batch_expect, buf, 0))) then
-      return true
-    end
-    while ffi.C.poll(pfds, nfds, 10) == 0 do
-      if batch_cmd and ((os_time() > batch_when) or (batch_expect and expect_success(batch_expect, buf, 0))) then
-        return true
-      end
-      if line_erased then
-        line_erased = false
-        return false
-      end
-    end
-    if pfds[0].revents == 1 then
-      return true
-    end
-    for i = 1,#select_fds do
-      if(pfds[i].revents > 0) then
-        if pfds[i].fd ~= select_fds[i].fd then
-          print("File descriptors unequal", pfds[i].fd, select_fds[i].fd)
-        end
-        select_fds[i].cb(select_fds[i], pfds[i].revents, indent)
-      end
-    end
-  end
-end
-
-local buf = ffi.new("char [32768]")
-
-function session_stdout_write(prefix, data)
-  data = prefix .. data:gsub("\n", "\n"..prefix):gsub("\n"..prefix.."$", "\n")
-  
-  stdout_write(data)
-end
-
-function expect_success(sok, buf, nread)
-  local expect_buf_sz = ffi.sizeof(sok.expect_buf) - 128
-  local expect_buf_avail = expect_buf_sz - sok.expect_buf_idx
-  -- print("EXPECT_SUCCESS: nread ".. tostring(nread).. " expect_buf_idx: " .. tostring(sok.expect_buf_idx) .. " expect_buf_avail: " .. tostring(expect_buf_avail) )
-  if expect_buf_avail < 0 then
-    print "EXPECT BUFFER OVERRUN ALREADY"
-    os.exit(1)
-  end
-  if expect_buf_avail < nread then
-    if (nread >= ffi.sizeof(sok.expect_buf)) then
-      print("Read too large of a chunk to fit into expect buffer")
-      return nil
-    end
-    local delta = nread - expect_buf_avail
-
-    ffi.C.memmove(sok.expect_buf, sok.expect_buf + delta, expect_buf_sz - delta)
-    sok.expect_buf_idx = sok.expect_buf_idx - delta
-    expect_buf_avail = nread 
-  end
-  if sok.expect_buf_idx + nread > expect_buf_sz then
-    print("ERROR, I have just overrun the buffer !")
-    os.exit(1)
-  end
-  ffi.C.memcpy(sok.expect_buf + sok.expect_buf_idx, buf, nread)
-  sok.expect_buf_idx = sok.expect_buf_idx + nread
-  if sok.expect_str == nil then
-    return true
-  end
-  local match_p = ffi.C.memmem(sok.expect_buf, sok.expect_buf_idx, sok.expect_str, sok.expect_str_len)
-  if match_p ~= nil then
-    return true
-  end
-  return false
-end
-
-function expect_done(sok)
-  local expect_buf_sz = ffi.sizeof(sok.expect_buf) - 128
-  if not sok.expect_str then 
-    return false
-  end
-  local match_p = ffi.C.memmem(sok.expect_buf, sok.expect_buf_idx, sok.expect_str, sok.expect_str_len)
-  if match_p ~= nil then
-    if sok.expect_cb then
-      sok.expect_cb(sok)
-    end
-    local match_idx = ffi.cast("char *", match_p) - ffi.cast("char *", sok.expect_buf)
-    ffi.C.memmove(sok.expect_buf, ffi.cast("char *", match_p) + sok.expect_str_len, expect_buf_sz - match_idx - sok.expect_str_len)
-    sok.expect_buf_idx = match_idx + sok.expect_str_len
-    sok.expect_success = true
-
-    sok.expect_str = nil
-    sok.expect_str_len = 0
-    return true
-  end
-end
-
-function slave_events(sok, revents, indent)
-  local fd = sok.fd
-  local nread = ffi.C.read(fd, buf, ffi.sizeof(buf)-128)
-  local idx = nread - 1
-  while idx >= 0 and buf[idx] ~= 10 do
-    idx = idx - 1
-  end
-  if idx >= 0 then
-    erase_line(indent)
-    session_stdout_write(sok.prefix, sok.buf .. ffi.string(buf, idx+1))
-    sok.buf = ""
-  end
-  sok.buf = sok.buf .. ffi.string(buf+idx+1, nread-idx-1)
-  -- print("\nRead: " .. tostring(nread))
-  -- stdout_write(ffi.string(buf, nread))
-  if expect_success(sok, buf, nread) then
-    return true
-  end
-  return false
-end
-
-
-function start_session(name)
-  local mfd, cpid = pty_run("/bin/bash")
-  local sok =  { ["fd"] = mfd, ["cb"] = slave_events, ["buf"] = "", ["prefix"] = name .. ":", ["expect_buf"] = ffi.new("char [165536]"), ["expect_buf_idx"] = 0, ["expect_str"] = nil }
-  table.insert(select_fds, sok)
-  sessions[name] = sok
-end
-
-function command_transform(exe)
-  if exe == "break" then
-    exe = string.char(3)
-  end
-  return exe
-end
-
-function session_write(a_session, a_str)
-  if has_session(a_session) then
-    return tonumber(ffi.C.write(sessions[a_session].fd, c_str(a_str), #a_str))
-  else
-    return 0
-  end
-end
-
-function session_exec(a_session, a_cmd)
-  local exe = command_transform(a_cmd) .. "\n"
-  session_write(a_session, exe)
-end
-
-function session_cmd(ui, a_session, a_cmd)
-  if not has_session(a_session) then
-    stdout_write("ERR: No such session '" .. tostring(a_session) .. "'\n")
-    return nil
-  end
-  if a_session == "lua" then
-    local func, msg = loadstring(ui.lua_acc .. a_cmd)
-    -- stdout_write("LOADSTR: " .. vpp.dump({ ret, msg }) .. "\n")
-    if not func and string.match(msg, "<eof>") then
-      if a_session ~= ui.in_session then
-         stdout_write("ERR LOADSTR: " .. tostring(msg) .. "\n")
-         return nil
-      end
-      ui.lua_acc = ui.lua_acc .. a_cmd  .. "\n"
-      return true
-    end
-    ui.lua_acc = ""
-    local ret, msg = pcall(func)
-    if ret then
-      return true
-    else
-      stdout_write("ERR: " .. msg .. "\n") 
-      return nil
-    end
-  else
-    session_exec(a_session, a_cmd)
-    if ui.session_cmd_delay then
-      return { "delay", ui.session_cmd_delay }
-    end
-    return true
-  end
-end
-
-function has_session(a_session)
-  if a_session == "lua" then
-    return true
-  end
-  return (sessions[a_session] ~= nil)
-end
-
-function command_match(list, input, output)
-  for i, v in ipairs(list) do
-    local m = {}
-    m[1], m[2], m[3], m[4], m[5], m[6], m[7], m[8], m[9] = string.match(input, v[1])
-    -- print("MATCH: ", vpp.dump(m))
-    if m[1] then
-       output["result"] = m
-       output["result_index"] = i
-       return m
-    end 
-  end
-  return nil
-end
-
-function cmd_spawn_shell(ui, a_arg)
-  start_session(a_arg[1])
-  return true
-end
-
-function cmd_run_cmd(ui, a_arg)
-  local a_sess = a_arg[1]
-  local a_cmd = a_arg[2]
-  return session_cmd(ui, a_sess, a_cmd)
-end
-
-function cmd_cd(ui, a_arg)
-  local a_sess = a_arg[1]
-  if has_session(a_sess) then
-    ui.in_session = a_sess
-    return true
-  else
-    stdout_write("ERR: Unknown session '".. tostring(a_sess) .. "'\n")
-    return nil
-  end
-end
-
-function cmd_sleep(ui, a_arg)
-  return { "delay", tonumber(a_arg[1]) }
-end
-
-function cmd_expect(ui, a_arg)
-  local a_sess = a_arg[1]
-  local a_expect = a_arg[2]
-  local sok = sessions[a_sess]
-  if not sok then
-    stdout_write("ERR: unknown session '" .. tostring(a_sess) .. "'\n")
-    return nil
-  end
-  sok.expect_str = c_str(a_expect)
-  sok.expect_str_len = #a_expect
-  return { "expect", a_sess }
-end
-
-function cmd_info(ui, a_arg)
-  local a_sess = a_arg[1]
-  local sok = sessions[a_sess]
-  if not sok then
-    stdout_write("ERR: unknown session '" .. tostring(a_sess) .. "'\n")
-    return nil
-  end
-  print("Info for session " .. tostring(a_sess) .. "\n")
-  print("Expect buffer index: " .. tostring(sok.expect_buf_idx))
-  print("Expect buffer: '" .. tostring(ffi.string(sok.expect_buf, sok.expect_buf_idx)) .. "'\n")
-  if sok.expect_str then
-    print("Expect string: '" .. tostring(ffi.string(sok.expect_str, sok.expect_str_len)) .. "'\n")
-  else
-    print("Expect string not set\n")
-  end
-end
-
-function cmd_echo(ui, a_arg)
-  local a_data = a_arg[1]
-  print("ECHO: " .. tostring(a_data))
-end
-
-main_command_table = {
-  { "^shell ([a-zA-Z0-9_]+)$", cmd_spawn_shell },
-  { "^run ([a-zA-Z0-9_]+) (.+)$", cmd_run_cmd },
-  { "^cd ([a-zA-Z0-9_]+)$", cmd_cd  },
-  { "^sleep ([0-9]+)$", cmd_sleep },
-  { "^expect ([a-zA-Z0-9_]+) (.-)$", cmd_expect },
-  { "^info ([a-zA-Z0-9_]+)$", cmd_info },
-  { "^echo (.-)$", cmd_echo }
-}
-
-
-
-function ui_set_prompt(ui)
-  if ui.in_session then 
-    if ui.in_session == "lua" then
-      if #ui.lua_acc > 0 then
-        ui.r.prompt = ui.in_session .. ">>"
-      else
-        ui.r.prompt = ui.in_session .. ">"
-      end 
-    else
-      ui.r.prompt = ui.in_session .. "> "
-    end
-  else
-    ui.r.prompt = "> "
-  end
-  return ui.r.prompt
-end
-
-function ui_run_command(ui, cmd)
-  -- stdout_write("Command: " .. tostring(cmd) .. "\n")
-  local ret = false
-  if ui.in_session then
-    if cmd then
-      if cmd == "^D^D^D" then
-        ui.in_session = nil
-        ret = true
-      else
-        ret = session_cmd(ui, ui.in_session, cmd)
-      end
-    else
-      ui.in_session = nil
-      ret = true
-    end
-  else  
-    if cmd then
-      local out = {}
-      if cmd == "" then
-        ret = true
-      end
-      if command_match(main_command_table, cmd, out) then
-        local i = out.result_index
-        local m = out.result
-        if main_command_table[i][2] then
-          ret = main_command_table[i][2](ui, m)
-        end
-      end
-    end
-    if not cmd or cmd == "quit" then
-      return "quit"
-    end
-  end
-  return ret
-end
-
-local ui = {}
-ui.in_session = nil
-ui.r = readln.reader() 
-ui.lua_acc = ""
-ui.session_cmd_delay = 0.3
-
-local lines = ""
-
-local done = false
--- a helper function which always returns nil
-local no_next_line = function() return nil end
-
--- a function which returns the next batch line
-local next_line = no_next_line
-
-local batchfile = arg[1]
-
-if batchfile then
-  local f = io.lines(batchfile)
-  next_line = function() 
-    local line = f()
-    if line then 
-      return line
-    else 
-      next_line = no_next_line
-      session_stdout_write(batchfile .. ":", "End of batch\n")
-      return nil
-    end
-  end
-end
-
-
-local batch_when = 0
-local batch_expect = nil
-while not done do
-  local prompt = ui_set_prompt(ui)
-  local batch_cmd = next_line() 
-  local cmd, expect_sok = ui.r.readln(do_select_stdin, batch_cmd, batch_when, batch_expect)
-  if expect_sok and not expect_success(expect_sok, buf, 0) then
-    if not cmd_ret and next_line ~= no_next_line then
-      print("ERR: expect timeout\n")
-      next_line = no_next_line
-    end
-  else 
-    local cmd_ret = ui_run_command(ui, cmd)
-    if not cmd_ret and next_line ~= no_next_line then
-      print("ERR: Error during batch execution\n")
-      next_line = no_next_line
-    end
-
-    if cmd_ret  == "quit" then
-      done = true
-    end
-    batch_expect = nil
-    batch_when = 0
-    if type(cmd_ret) == "table" then
-      if cmd_ret[1] == "delay" then
-	batch_when = os_time() + tonumber(cmd_ret[2])
-      end
-      if cmd_ret[1] == "expect" then
-	batch_expect = sessions[cmd_ret[2]]
-	batch_when = os_time() + 15
-      end
-    end
-  end
-end
-ui.r.done()
-
-os.exit(1)
-
-
-
diff --git a/vpp-api/lua/examples/lute/script-inout-acl-noacl.lute b/vpp-api/lua/examples/lute/script-inout-acl-noacl.lute
deleted file mode 100644
index a24d04bf..00000000
--- a/vpp-api/lua/examples/lute/script-inout-acl-noacl.lute
+++ /dev/null
@@ -1,329 +0,0 @@
-shell vppbuild
-run vppbuild stty -echo
-run vppbuild sudo -u ubuntu -i bash -c "(cd vpp && make plugins && echo ALLGOOD)"
-expect vppbuild ALLGOOD
-
-shell s0
-shell s1
-shell s2
-
-
-cd s1
-unshare -n /bin/bash
-/sbin/ifconfig -a
-^D^D^D
-
-cd s2
-unshare -n /bin/bash
-/sbin/ifconfig -a
-^D^D^D
-
-
-cd lua
-
-function session_get_bash_pid(s)
-  if not has_session(s) then
-    return nil
-  end
-  local fname = "/tmp/lute-"..s.."-pid.txt"
-
-  session_exec(s, "echo $$ >" .. fname)
-  -- it's a dirty hack but it's quick
-  sleep(0.5)
-  local pid = io.lines(fname)()
-  print("Got pid for " .. s .. " : " .. tostring(pid))
-  return(tonumber(pid))
-end
-
-function session_connect_with(s0, s1)
-  -- local pid0 = tostring(session_get_bash_pid(s0))
-  local pid1 = tostring(session_get_bash_pid(s1))
-  local eth_options = { "rx", "tx",  "sg", "tso", "ufo", "gso", "gro", "lro", "rxvlan", "txvlan", "rxhash" }
-  local this_end = s0 .. "_" .. s1
-  local other_end = s1 .. "_" .. s0
-  session_exec(s0, "ip link add name " .. this_end .. " type veth peer name " .. other_end)
-  session_exec(s0, "ip link set dev " .. this_end .. " up promisc on")
-  for i, option in ipairs(eth_options) do
-    session_exec(s0, "/sbin/ethtool --offload " .. this_end .. " " .. option .. " off")
-    session_exec(s0, "/sbin/ethtool --offload " .. other_end .. " " .. option .. " off")
-  end
-  session_exec(s0, "ip link set dev " .. other_end .. " up promisc on netns /proc/" .. pid1 .. "/ns/net")
-  sleep(0.5)
-end
-
-^D^D^D
-run lua session_connect_with("s0", "s1")
-run lua session_connect_with("s0", "s2")
-
-cd s1
-ip -6 addr add dev s1_s0 2001:db8:1::1/64
-ip -4 addr add dev s1_s0 192.0.2.1/24
-ip link set dev s1_s0 up promisc on
-^D^D^D
-
-cd s2
-ip -6 addr add dev s2_s0 2001:db8:1::2/64
-ip -6 addr add dev s2_s0 2001:db8:1::3/64
-ip -6 addr add dev s2_s0 2001:db8:1::4/64
-ip -4 addr add dev s2_s0 192.0.2.2/24
-ip -4 addr add dev s2_s0:1 192.0.2.3/24
-ip -4 addr add dev s2_s0:2 192.0.2.4/24
-ip link set dev s2_s0 up promisc on
-^D^D^D
-
-run s1 ip addr
-run s2 ip addr
-shell VPP
-cd VPP
-cd /home/ubuntu/vpp
-make debug 
-r
-^D^D^D
-expect VPP DBGvpp#
-
-cd lua
--- Initialization of the Lua environment for talking to VPP
-vpp = require("vpp-lapi")
-root_dir = "/home/ubuntu/vpp"
-pneum_path = root_dir .. "/build-root/install-vpp_debug-native/vpp-api/lib64/libpneum.so"
-vpp:init({ pneum_path = pneum_path })
-vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vlib-api/vlibmemory/memclnt.api")
-vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vpp/vpp-api/vpe.api")
-vpp:connect("aytest")
-vpp:consume_api(root_dir .. "/plugins/acl-plugin/acl/acl.api", "acl")
-
-^D^D^D
-
-cd lua
-
-reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s1", hw_addr = "AAAAAA" })
-vpp_if_to_s1 = reply[1].sw_if_index
-
-reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s2", hw_addr = "AAAAAA" })
-vpp_if_to_s2 = reply[1].sw_if_index
-
-ifaces = { vpp_if_to_s1, vpp_if_to_s2 }
-
-reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s1, admin_up_down = 1, link_up_down = 1 })
-print(vpp.dump(reply))
-reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s2, admin_up_down = 1, link_up_down = 1 })
-print(vpp.dump(reply))
-
-bd_id = 42
-
-reply = vpp:api_call("bridge_domain_add_del", { bd_id = bd_id, flood = 1, uu_flood = 1, forward = 1, learn = 1, arp_term = 0, is_add = 1 })
-print(vpp.dump(reply))
-
-for i, v in ipairs(ifaces) do
-  reply = vpp:api_call("sw_interface_set_l2_bridge", { rx_sw_if_index = v, bd_id = bd_id, shg = 0, bvi = 0, enable = 1 } )
-  print(vpp.dump(reply))
-end
-
-^D^D^D
-
-run s1 ping -c 3 192.0.2.2
-expect s1 packet loss
-run s1 ping -c 3 192.0.2.3
-expect s1 packet loss
-run s1 ping -c 3 192.0.2.4
-expect s1 packet loss
-run s1 ping6 -c 3 2001:db8:1::2
-expect s1 packet loss
-run s1 ping6 -c 3 2001:db8:1::3
-expect s1 packet loss
-run s1 ping6 -c 3 2001:db8:1::4
-expect s1 packet loss
-
-
-cd lua
---- ACL testing
-
---[[ temporary comment out
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 230 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 8 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 15 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_add_replace", { context = 42, count = 2, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 } } })
-print(vpp.dump(reply))
-print("---")
-interface_acl_in = reply[1].acl_index
-
-reply = vpp:api_call("acl_add_replace", { context = 42, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
-print(vpp.dump(reply))
-print("---")
-interface_acl_out = reply[1].acl_index
-
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_add_replace", { context = 42, count = 0 })
-print(vpp.dump(reply))
-print("---")
-
-acl_index_to_delete = reply[1].acl_index
-print("Deleting " .. tostring(acl_index_to_delete))
-reply = vpp:api_call("acl_del", { context = 42, acl_index = acl_index_to_delete })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
-for ri, rv in ipairs(reply) do
-  print("Reply message #" .. tostring(ri))
-  print(vpp.dump(rv))
-  for ai, av in ipairs(rv.r) do
-    print("ACL rule #" .. tostring(ai) .. " : " .. vpp.dump(av))
-  end
-
-end
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 4294967295 })
-print(vpp.dump(reply))
-print("---")
-
-
-]] -- end of comment out
-
----- Should be nothing ^^
-r = {
-  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
-  { is_permit = 0, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::3"), dst_ip_prefix_len = 128 },
-  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8::"), dst_ip_prefix_len = 32  },
-  { is_permit = 1, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.2"), dst_ip_prefix_len = 32},
-  { is_permit = 0, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.3"), dst_ip_prefix_len = 32 },
-}
-
-reply = vpp:api_call("acl_add_replace", { context = 42, count = 5, r = r })
-print(vpp.dump(reply))
-print("---")
-interface_acl_in = reply[1].acl_index
-
-reply = vpp:api_call("acl_add_replace", { context = 42, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
-print(vpp.dump(reply))
-print("---")
-interface_acl_out = reply[1].acl_in
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s1, is_add = 1, is_input = 1, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
---reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 0, acl_index = interface_acl_out })
--- print(vpp.dump(reply))
---print("---")
-
-^D^D^D
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::2
-expect s1 packet loss
-run VPP show trace
-expect VPP match: inacl 0 rule 0
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::3
-expect s1 packet loss
-run VPP show trace 
-expect VPP match: inacl 0 rule 1
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::4
-expect s1 packet loss
-run VPP show trace
-expect VPP match: inacl 0 rule 2
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping -c 3 192.0.2.2
-expect s1 packet loss
-run VPP show trace
-expect VPP match: inacl 0 rule 3
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping -c 3 192.0.2.3
-expect s1 packet loss
-run VPP show trace
-expect VPP match: inacl 0 rule 4
-
-
-cd lua
-
---- TEST OUTBOUND ACL
-
-r1 = {
-  { is_permit = 1, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
-  { is_permit = 0, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::4"), dst_ip_prefix_len = 128 }
-}
-
-reply = vpp:api_call("acl_add_replace", { context = 42, count = 3, r = r1 })
-print(vpp.dump(reply))
-print("---")
-interface_acl_out = reply[1].acl_index
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 0, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-
-
-^D^D^D
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::2
-expect s1 packet loss
-run VPP show trace
-expect VPP match: outacl 2 rule 0
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::3
-expect s1 packet loss
-run VPP show trace 
-expect VPP match: inacl 0 rule 1
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::4
-expect s1 packet loss
-run VPP show trace
-expect VPP match: outacl 2 rule 1
-
-run lua print("ALL GOOD!")
-
diff --git a/vpp-api/lua/examples/lute/script-inout-acl-old.lute b/vpp-api/lua/examples/lute/script-inout-acl-old.lute
deleted file mode 100644
index 9edebf02..00000000
--- a/vpp-api/lua/examples/lute/script-inout-acl-old.lute
+++ /dev/null
@@ -1,329 +0,0 @@
-shell vppbuild
-run vppbuild stty -echo
-run vppbuild sudo -u ubuntu -i bash -c "(cd vpp && make plugins && echo ALLGOOD)"
-expect vppbuild ALLGOOD
-
-shell s0
-shell s1
-shell s2
-
-
-cd s1
-unshare -n /bin/bash
-/sbin/ifconfig -a
-^D^D^D
-
-cd s2
-unshare -n /bin/bash
-/sbin/ifconfig -a
-^D^D^D
-
-
-cd lua
-
-function session_get_bash_pid(s)
-  if not has_session(s) then
-    return nil
-  end
-  local fname = "/tmp/lute-"..s.."-pid.txt"
-
-  session_exec(s, "echo $$ >" .. fname)
-  -- it's a dirty hack but it's quick
-  sleep(0.5)
-  local pid = io.lines(fname)()
-  print("Got pid for " .. s .. " : " .. tostring(pid))
-  return(tonumber(pid))
-end
-
-function session_connect_with(s0, s1)
-  -- local pid0 = tostring(session_get_bash_pid(s0))
-  local pid1 = tostring(session_get_bash_pid(s1))
-  local eth_options = { "rx", "tx",  "sg", "tso", "ufo", "gso", "gro", "lro", "rxvlan", "txvlan", "rxhash" }
-  local this_end = s0 .. "_" .. s1
-  local other_end = s1 .. "_" .. s0
-  session_exec(s0, "ip link add name " .. this_end .. " type veth peer name " .. other_end)
-  session_exec(s0, "ip link set dev " .. this_end .. " up promisc on")
-  for i, option in ipairs(eth_options) do
-    session_exec(s0, "/sbin/ethtool --offload " .. this_end .. " " .. option .. " off")
-    session_exec(s0, "/sbin/ethtool --offload " .. other_end .. " " .. option .. " off")
-  end
-  session_exec(s0, "ip link set dev " .. other_end .. " up promisc on netns /proc/" .. pid1 .. "/ns/net")
-  sleep(0.5)
-end
-
-^D^D^D
-run lua session_connect_with("s0", "s1")
-run lua session_connect_with("s0", "s2")
-
-cd s1
-ip -6 addr add dev s1_s0 2001:db8:1::1/64
-ip -4 addr add dev s1_s0 192.0.2.1/24
-ip link set dev s1_s0 up promisc on
-^D^D^D
-
-cd s2
-ip -6 addr add dev s2_s0 2001:db8:1::2/64
-ip -6 addr add dev s2_s0 2001:db8:1::3/64
-ip -6 addr add dev s2_s0 2001:db8:1::4/64
-ip -4 addr add dev s2_s0 192.0.2.2/24
-ip -4 addr add dev s2_s0:1 192.0.2.3/24
-ip -4 addr add dev s2_s0:2 192.0.2.4/24
-ip link set dev s2_s0 up promisc on
-^D^D^D
-
-run s1 ip addr
-run s2 ip addr
-shell VPP
-cd VPP
-cd /home/ubuntu/vpp
-make debug 
-r
-^D^D^D
-expect VPP DBGvpp#
-
-cd lua
--- Initialization of the Lua environment for talking to VPP
-vpp = require("vpp-lapi")
-root_dir = "/home/ubuntu/vpp"
-pneum_path = root_dir .. "/build-root/install-vpp_debug-native/vpp-api/lib64/libpneum.so"
-vpp:init({ pneum_path = pneum_path })
-vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vlib-api/vlibmemory/memclnt.api")
-vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vpp/vpp-api/vpe.api")
-vpp:connect("aytest")
-vpp:consume_api(root_dir .. "/plugins/acl-plugin/acl/acl.api", "acl")
-
-^D^D^D
-
-cd lua
-
-reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s1", hw_addr = "AAAAAA" })
-vpp_if_to_s1 = reply[1].sw_if_index
-
-reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s2", hw_addr = "AAAAAA" })
-vpp_if_to_s2 = reply[1].sw_if_index
-
-ifaces = { vpp_if_to_s1, vpp_if_to_s2 }
-
-reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s1, admin_up_down = 1, link_up_down = 1 })
-print(vpp.dump(reply))
-reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s2, admin_up_down = 1, link_up_down = 1 })
-print(vpp.dump(reply))
-
-bd_id = 42
-
-reply = vpp:api_call("bridge_domain_add_del", { bd_id = bd_id, flood = 1, uu_flood = 1, forward = 1, learn = 1, arp_term = 0, is_add = 1 })
-print(vpp.dump(reply))
-
-for i, v in ipairs(ifaces) do
-  reply = vpp:api_call("sw_interface_set_l2_bridge", { rx_sw_if_index = v, bd_id = bd_id, shg = 0, bvi = 0, enable = 1 } )
-  print(vpp.dump(reply))
-end
-
-^D^D^D
-
-run s1 ping -c 3 192.0.2.2
-expect s1 packet loss
-run s1 ping -c 3 192.0.2.3
-expect s1 packet loss
-run s1 ping -c 3 192.0.2.4
-expect s1 packet loss
-run s1 ping6 -c 3 2001:db8:1::2
-expect s1 packet loss
-run s1 ping6 -c 3 2001:db8:1::3
-expect s1 packet loss
-run s1 ping6 -c 3 2001:db8:1::4
-expect s1 packet loss
-
-
-cd lua
---- ACL testing
-
---[[ temporary comment out
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 230 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 8 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 15 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_add", { context = 42, count = 2, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 } } })
-print(vpp.dump(reply))
-print("---")
-interface_acl_in = reply[1].acl_index
-
-reply = vpp:api_call("acl_add", { context = 42, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
-print(vpp.dump(reply))
-print("---")
-interface_acl_out = reply[1].acl_index
-
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_add", { context = 42, count = 0 })
-print(vpp.dump(reply))
-print("---")
-
-acl_index_to_delete = reply[1].acl_index
-print("Deleting " .. tostring(acl_index_to_delete))
-reply = vpp:api_call("acl_del", { context = 42, acl_index = acl_index_to_delete })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
-for ri, rv in ipairs(reply) do
-  print("Reply message #" .. tostring(ri))
-  print(vpp.dump(rv))
-  for ai, av in ipairs(rv.r) do
-    print("ACL rule #" .. tostring(ai) .. " : " .. vpp.dump(av))
-  end
-
-end
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 4294967295 })
-print(vpp.dump(reply))
-print("---")
-
-
-]] -- end of comment out
-
----- Should be nothing ^^
-r = {
-  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
-  { is_permit = 0, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::3"), dst_ip_prefix_len = 128 },
-  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8::"), dst_ip_prefix_len = 32  },
-  { is_permit = 1, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.2"), dst_ip_prefix_len = 32},
-  { is_permit = 0, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.3"), dst_ip_prefix_len = 32 },
-}
-
-reply = vpp:api_call("acl_add", { context = 42, count = 5, r = r })
-print(vpp.dump(reply))
-print("---")
-interface_acl_in = reply[1].acl_index
-
-reply = vpp:api_call("acl_add", { context = 42, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
-print(vpp.dump(reply))
-print("---")
-interface_acl_out = reply[1].acl_in
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s1, is_add = 1, is_input = 1, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
---reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 0, acl_index = interface_acl_out })
--- print(vpp.dump(reply))
---print("---")
-
-^D^D^D
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::2
-expect s1 packet loss
-run VPP show trace
-expect VPP match: inacl 0 rule 0
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::3
-expect s1 packet loss
-run VPP show trace 
-expect VPP match: inacl 0 rule 1
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::4
-expect s1 packet loss
-run VPP show trace
-expect VPP match: inacl 0 rule 2
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping -c 3 192.0.2.2
-expect s1 packet loss
-run VPP show trace
-expect VPP match: inacl 0 rule 3
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping -c 3 192.0.2.3
-expect s1 packet loss
-run VPP show trace
-expect VPP match: inacl 0 rule 4
-
-
-cd lua
-
---- TEST OUTBOUND ACL
-
-r1 = {
-  { is_permit = 1, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
-  { is_permit = 0, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::4"), dst_ip_prefix_len = 128 }
-}
-
-reply = vpp:api_call("acl_add", { context = 42, count = 3, r = r1 })
-print(vpp.dump(reply))
-print("---")
-interface_acl_out = reply[1].acl_index
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 0, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-
-
-^D^D^D
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::2
-expect s1 packet loss
-run VPP show trace
-expect VPP match: outacl 2 rule 0
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::3
-expect s1 packet loss
-run VPP show trace 
-expect VPP match: inacl 0 rule 1
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::4
-expect s1 packet loss
-run VPP show trace
-expect VPP match: outacl 2 rule 1
-
-run lua print("ALL GOOD!")
-
diff --git a/vpp-api/lua/examples/lute/script-inout-acl.lute b/vpp-api/lua/examples/lute/script-inout-acl.lute
deleted file mode 100644
index d7e7423c..00000000
--- a/vpp-api/lua/examples/lute/script-inout-acl.lute
+++ /dev/null
@@ -1,329 +0,0 @@
-shell vppbuild
-run vppbuild stty -echo
-run vppbuild sudo -u ubuntu -i bash -c "(cd vpp && make plugins && echo ALLGOOD)"
-expect vppbuild ALLGOOD
-
-shell s0
-shell s1
-shell s2
-
-
-cd s1
-unshare -n /bin/bash
-/sbin/ifconfig -a
-^D^D^D
-
-cd s2
-unshare -n /bin/bash
-/sbin/ifconfig -a
-^D^D^D
-
-
-cd lua
-
-function session_get_bash_pid(s)
-  if not has_session(s) then
-    return nil
-  end
-  local fname = "/tmp/lute-"..s.."-pid.txt"
-
-  session_exec(s, "echo $$ >" .. fname)
-  -- it's a dirty hack but it's quick
-  sleep(0.5)
-  local pid = io.lines(fname)()
-  print("Got pid for " .. s .. " : " .. tostring(pid))
-  return(tonumber(pid))
-end
-
-function session_connect_with(s0, s1)
-  -- local pid0 = tostring(session_get_bash_pid(s0))
-  local pid1 = tostring(session_get_bash_pid(s1))
-  local eth_options = { "rx", "tx",  "sg", "tso", "ufo", "gso", "gro", "lro", "rxvlan", "txvlan", "rxhash" }
-  local this_end = s0 .. "_" .. s1
-  local other_end = s1 .. "_" .. s0
-  session_exec(s0, "ip link add name " .. this_end .. " type veth peer name " .. other_end)
-  session_exec(s0, "ip link set dev " .. this_end .. " up promisc on")
-  for i, option in ipairs(eth_options) do
-    session_exec(s0, "/sbin/ethtool --offload " .. this_end .. " " .. option .. " off")
-    session_exec(s0, "/sbin/ethtool --offload " .. other_end .. " " .. option .. " off")
-  end
-  session_exec(s0, "ip link set dev " .. other_end .. " up promisc on netns /proc/" .. pid1 .. "/ns/net")
-  sleep(0.5)
-end
-
-^D^D^D
-run lua session_connect_with("s0", "s1")
-run lua session_connect_with("s0", "s2")
-
-cd s1
-ip -6 addr add dev s1_s0 2001:db8:1::1/64
-ip -4 addr add dev s1_s0 192.0.2.1/24
-ip link set dev s1_s0 up promisc on
-^D^D^D
-
-cd s2
-ip -6 addr add dev s2_s0 2001:db8:1::2/64
-ip -6 addr add dev s2_s0 2001:db8:1::3/64
-ip -6 addr add dev s2_s0 2001:db8:1::4/64
-ip -4 addr add dev s2_s0 192.0.2.2/24
-ip -4 addr add dev s2_s0:1 192.0.2.3/24
-ip -4 addr add dev s2_s0:2 192.0.2.4/24
-ip link set dev s2_s0 up promisc on
-^D^D^D
-
-run s1 ip addr
-run s2 ip addr
-shell VPP
-cd VPP
-cd /home/ubuntu/vpp
-make debug 
-r
-^D^D^D
-expect VPP DBGvpp#
-
-cd lua
--- Initialization of the Lua environment for talking to VPP
-vpp = require("vpp-lapi")
-root_dir = "/home/ubuntu/vpp"
-pneum_path = root_dir .. "/build-root/install-vpp_debug-native/vpp-api/lib64/libpneum.so"
-vpp:init({ pneum_path = pneum_path })
-vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vlib-api/vlibmemory/memclnt.api")
-vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vpp/vpp-api/vpe.api")
-vpp:connect("aytest")
-vpp:consume_api(root_dir .. "/plugins/acl-plugin/acl/acl.api", "acl")
-
-^D^D^D
-
-cd lua
-
-reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s1", hw_addr = "AAAAAA" })
-vpp_if_to_s1 = reply[1].sw_if_index
-
-reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s2", hw_addr = "AAAAAA" })
-vpp_if_to_s2 = reply[1].sw_if_index
-
-ifaces = { vpp_if_to_s1, vpp_if_to_s2 }
-
-reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s1, admin_up_down = 1, link_up_down = 1 })
-print(vpp.dump(reply))
-reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s2, admin_up_down = 1, link_up_down = 1 })
-print(vpp.dump(reply))
-
-bd_id = 42
-
-reply = vpp:api_call("bridge_domain_add_del", { bd_id = bd_id, flood = 1, uu_flood = 1, forward = 1, learn = 1, arp_term = 0, is_add = 1 })
-print(vpp.dump(reply))
-
-for i, v in ipairs(ifaces) do
-  reply = vpp:api_call("sw_interface_set_l2_bridge", { rx_sw_if_index = v, bd_id = bd_id, shg = 0, bvi = 0, enable = 1 } )
-  print(vpp.dump(reply))
-end
-
-^D^D^D
-
-run s1 ping -c 3 192.0.2.2
-expect s1 packet loss
-run s1 ping -c 3 192.0.2.3
-expect s1 packet loss
-run s1 ping -c 3 192.0.2.4
-expect s1 packet loss
-run s1 ping6 -c 3 2001:db8:1::2
-expect s1 packet loss
-run s1 ping6 -c 3 2001:db8:1::3
-expect s1 packet loss
-run s1 ping6 -c 3 2001:db8:1::4
-expect s1 packet loss
-
-
-cd lua
---- ACL testing
-
---[[ temporary comment out
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 230 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 8 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 15 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_add_replace", { context = 42, acl_index = -1, count = 2, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 } } })
-print(vpp.dump(reply))
-print("---")
-interface_acl_in = reply[1].acl_index
-
-reply = vpp:api_call("acl_add_replace", { context = 42, acl_index = -1, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
-print(vpp.dump(reply))
-print("---")
-interface_acl_out = reply[1].acl_index
-
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_add_replace", { context = 42, acl_index = -1, count = 0 })
-print(vpp.dump(reply))
-print("---")
-
-acl_index_to_delete = reply[1].acl_index
-print("Deleting " .. tostring(acl_index_to_delete))
-reply = vpp:api_call("acl_del", { context = 42, acl_index = acl_index_to_delete })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
-for ri, rv in ipairs(reply) do
-  print("Reply message #" .. tostring(ri))
-  print(vpp.dump(rv))
-  for ai, av in ipairs(rv.r) do
-    print("ACL rule #" .. tostring(ai) .. " : " .. vpp.dump(av))
-  end
-
-end
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 4294967295 })
-print(vpp.dump(reply))
-print("---")
-
-
-]] -- end of comment out
-
----- Should be nothing ^^
-r = {
-  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
-  { is_permit = 0, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::3"), dst_ip_prefix_len = 128 },
-  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8::"), dst_ip_prefix_len = 32  },
-  { is_permit = 1, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.2"), dst_ip_prefix_len = 32},
-  { is_permit = 0, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.3"), dst_ip_prefix_len = 32 },
-}
-
-reply = vpp:api_call("acl_add_replace", { context = 42, acl_index = -1, count = 5, r = r })
-print(vpp.dump(reply))
-print("---")
-interface_acl_in = reply[1].acl_index
-
-reply = vpp:api_call("acl_add_replace", { context = 42, acl_index = -1, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
-print(vpp.dump(reply))
-print("---")
-interface_acl_out = reply[1].acl_in
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s1, is_add = 1, is_input = 1, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
---reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 0, acl_index = interface_acl_out })
--- print(vpp.dump(reply))
---print("---")
-
-^D^D^D
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::2
-expect s1 packet loss
-run VPP show trace
-expect VPP match: inacl 0 rule 0
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::3
-expect s1 packet loss
-run VPP show trace 
-expect VPP match: inacl 0 rule 1
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::4
-expect s1 packet loss
-run VPP show trace
-expect VPP match: inacl 0 rule 2
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping -c 3 192.0.2.2
-expect s1 packet loss
-run VPP show trace
-expect VPP match: inacl 0 rule 3
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping -c 3 192.0.2.3
-expect s1 packet loss
-run VPP show trace
-expect VPP match: inacl 0 rule 4
-
-
-cd lua
-
---- TEST OUTBOUND ACL
-
-r1 = {
-  { is_permit = 1, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
-  { is_permit = 0, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::4"), dst_ip_prefix_len = 128 }
-}
-
-reply = vpp:api_call("acl_add_replace", { context = 42, acl_index = -1, count = 3, r = r1 })
-print(vpp.dump(reply))
-print("---")
-interface_acl_out = reply[1].acl_index
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 0, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-
-
-^D^D^D
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::2
-expect s1 packet loss
-run VPP show trace
-expect VPP match: outacl 2 rule 0
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::3
-expect s1 packet loss
-run VPP show trace 
-expect VPP match: inacl 0 rule 1
-
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s1 ping6 -c 3 2001:db8:1::4
-expect s1 packet loss
-run VPP show trace
-expect VPP match: outacl 2 rule 1
-
-run lua print("ALL GOOD!")
-
diff --git a/vpp-api/lua/examples/lute/script.lute b/vpp-api/lua/examples/lute/script.lute
deleted file mode 100644
index c3dd90f2..00000000
--- a/vpp-api/lua/examples/lute/script.lute
+++ /dev/null
@@ -1,7 +0,0 @@
-shell s1
-expect s1 $
-run s1 echo testing123
-expect s1 $
-run s1 echo done
-quit
-
diff --git a/vpp-api/lua/examples/lute/sessions-acl.lute b/vpp-api/lua/examples/lute/sessions-acl.lute
deleted file mode 100644
index ac237ef9..00000000
--- a/vpp-api/lua/examples/lute/sessions-acl.lute
+++ /dev/null
@@ -1,308 +0,0 @@
-run lua -- collectgarbage("stop")
-
-shell vppbuild
-run vppbuild stty -echo
-run vppbuild sudo -u ubuntu -i bash -c "(cd vpp && make plugins && echo ALLGOOD)"
-expect vppbuild ALLGOOD
-
-shell s0
-shell s1
-shell s2
-
-
-cd s1
-unshare -n /bin/bash
-/sbin/ifconfig -a
-^D^D^D
-
-cd s2
-unshare -n /bin/bash
-/sbin/ifconfig -a
-^D^D^D
-
-
-cd lua
-
-function session_get_bash_pid(s)
-  if not has_session(s) then
-    return nil
-  end
-  local fname = "/tmp/lute-"..s.."-pid.txt"
-
-  session_exec(s, "echo $$ >" .. fname)
-  -- it's a dirty hack but it's quick
-  sleep(0.5)
-  local pid = io.lines(fname)()
-  print("Got pid for " .. s .. " : " .. tostring(pid))
-  return(tonumber(pid))
-end
-
-function session_connect_with(s0, s1)
-  -- local pid0 = tostring(session_get_bash_pid(s0))
-  local pid1 = tostring(session_get_bash_pid(s1))
-  local eth_options = { "rx", "tx",  "sg", "tso", "ufo", "gso", "gro", "lro", "rxvlan", "txvlan", "rxhash" }
-  local this_end = s0 .. "_" .. s1
-  local other_end = s1 .. "_" .. s0
-  session_exec(s0, "ip link add name " .. this_end .. " type veth peer name " .. other_end)
-  session_exec(s0, "ip link set dev " .. this_end .. " up promisc on")
-  for i, option in ipairs(eth_options) do
-    session_exec(s0, "/sbin/ethtool --offload " .. this_end .. " " .. option .. " off")
-    session_exec(s0, "/sbin/ethtool --offload " .. other_end .. " " .. option .. " off")
-  end
-  session_exec(s0, "ip link set dev " .. other_end .. " up promisc on netns /proc/" .. pid1 .. "/ns/net")
-  sleep(0.5)
-end
-
-^D^D^D
-run lua session_connect_with("s0", "s1")
-run lua session_connect_with("s0", "s2")
-
-cd s1
-ip -6 addr add dev s1_s0 2001:db8:1::1/64
-ip -4 addr add dev s1_s0 192.0.2.1/24
-ip link set dev s1_s0 up promisc on
-^D^D^D
-
-cd s2
-ip -6 addr add dev s2_s0 2001:db8:1::2/64
-ip -6 addr add dev s2_s0 2001:db8:1::3/64
-ip -6 addr add dev s2_s0 2001:db8:1::4/64
-ip -4 addr add dev s2_s0 192.0.2.2/24
-ip -4 addr add dev s2_s0:1 192.0.2.3/24
-ip -4 addr add dev s2_s0:2 192.0.2.4/24
-ip link set dev s2_s0 up promisc on
-^D^D^D
-
-run s1 ip addr
-run s2 ip addr
-shell VPP
-cd VPP
-cd /home/ubuntu/vpp
-make debug 
-r
-^D^D^D
-expect VPP DBGvpp#
-
-cd lua
--- Initialization of the Lua environment for talking to VPP
-vpp = require("vpp-lapi")
-root_dir = "/home/ubuntu/vpp"
-pneum_path = root_dir .. "/build-root/install-vpp_debug-native/vpp-api/lib64/libpneum.so"
-vpp:init({ pneum_path = pneum_path })
-vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vlib-api/vlibmemory/memclnt.api")
-vpp:consume_api(root_dir .. "/build-root/install-vpp_debug-native/vpp/vpp-api/vpe.api")
-vpp:connect("aytest")
-vpp:consume_api(root_dir .. "/plugins/acl-plugin/acl/acl.api", "acl")
-
-^D^D^D
-
-cd lua
-
-reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s1", hw_addr = "AAAAAA" })
-vpp_if_to_s1 = reply[1].sw_if_index
-
-reply = vpp:api_call("af_packet_create", { host_if_name = "s0_s2", hw_addr = "AAAAAA" })
-vpp_if_to_s2 = reply[1].sw_if_index
-
-ifaces = { vpp_if_to_s1, vpp_if_to_s2 }
-
-reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s1, admin_up_down = 1, link_up_down = 1 })
-print(vpp.dump(reply))
-reply = vpp:api_call("sw_interface_set_flags", { sw_if_index = vpp_if_to_s2, admin_up_down = 1, link_up_down = 1 })
-print(vpp.dump(reply))
-
-bd_id = 42
-
-reply = vpp:api_call("bridge_domain_add_del", { bd_id = bd_id, flood = 1, uu_flood = 1, forward = 1, learn = 1, arp_term = 0, is_add = 1 })
-print(vpp.dump(reply))
-
-for i, v in ipairs(ifaces) do
-  reply = vpp:api_call("sw_interface_set_l2_bridge", { rx_sw_if_index = v, bd_id = bd_id, shg = 0, bvi = 0, enable = 1 } )
-  print(vpp.dump(reply))
-end
-
-^D^D^D
-
-run s1 ping -c 3 192.0.2.2
-expect s1 packet loss
-run s1 ping -c 3 192.0.2.3
-expect s1 packet loss
-run s1 ping -c 3 192.0.2.4
-expect s1 packet loss
-run s1 ping6 -c 3 2001:db8:1::2
-expect s1 packet loss
-run s1 ping6 -c 3 2001:db8:1::3
-expect s1 packet loss
-run s1 ping6 -c 3 2001:db8:1::4
-expect s1 packet loss
-
-
-cd lua
---- ACL testing
-
---[[ temporary comment out
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 230 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 8 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = 15 })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_add", { context = 42, count = 2, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 } } })
-print(vpp.dump(reply))
-print("---")
-interface_acl_in = reply[1].acl_index
-
-reply = vpp:api_call("acl_add", { context = 42, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
-print(vpp.dump(reply))
-print("---")
-interface_acl_out = reply[1].acl_index
-
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 1, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = 0, is_add = 1, is_input = 0, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_add", { context = 42, count = 0 })
-print(vpp.dump(reply))
-print("---")
-
-acl_index_to_delete = reply[1].acl_index
-print("Deleting " .. tostring(acl_index_to_delete))
-reply = vpp:api_call("acl_del", { context = 42, acl_index = acl_index_to_delete })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
-for ri, rv in ipairs(reply) do
-  print("Reply message #" .. tostring(ri))
-  print(vpp.dump(rv))
-  for ai, av in ipairs(rv.r) do
-    print("ACL rule #" .. tostring(ai) .. " : " .. vpp.dump(av))
-  end
-
-end
-print("---")
-
-reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-reply = vpp:api_call("acl_del", { context = 42, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 0})
-print(vpp.dump(reply))
-print("---")
-
-reply = vpp:api_call("acl_dump", { context = 42, sw_if_index = 4294967295 })
-print(vpp.dump(reply))
-print("---")
-
-
-]] -- end of comment out
-
----- Should be nothing ^^
-r = {
-  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
-  { is_permit = 0, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8:1::3"), dst_ip_prefix_len = 128 },
-  { is_permit = 1, is_ipv6 = 1, dst_ip_addr = ip46("2001:db8::"), dst_ip_prefix_len = 32  },
-  { is_permit = 1, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.2"), dst_ip_prefix_len = 32},
-  { is_permit = 0, is_ipv6 = 0, dst_ip_addr = ip46("192.0.2.3"), dst_ip_prefix_len = 32 },
-}
-
-reply = vpp:api_call("acl_add", { context = 42, count = 5, r = r })
-print(vpp.dump(reply))
-print("---")
-interface_acl_in = reply[1].acl_index
-
-reply = vpp:api_call("acl_add", { context = 42, count = 3, r = { { is_permit = 1, is_ipv6 = 1 }, { is_permit = 0, is_ipv6 = 1 }, { is_permit = 1, is_ipv6 = 0 } } })
-print(vpp.dump(reply))
-print("---")
-interface_acl_out = reply[1].acl_in
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s1, is_add = 1, is_input = 1, acl_index = interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
---- TEST OUTBOUND ACL
-
-r1 = {
-  { is_permit = 1, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::2"), dst_ip_prefix_len = 128 },
-  { is_permit = 0, is_ipv6 = 1, src_ip_addr = ip46("2001:db8:1::1"), src_ip_prefix_len = 128, dst_ip_addr = ip46("2001:db8:1::4"), dst_ip_prefix_len = 128 },
-  { is_permit = 2, is_ipv6 = 0 }
-}
-
-reply = vpp:api_call("acl_add", { context = 42, count = 3, r = r1 })
-print(vpp.dump(reply))
-print("---")
-interface_acl_out = reply[1].acl_index
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 0, acl_index = interface_acl_out })
-print(vpp.dump(reply))
-print("---")
-
-r2 = {
-  { is_permit = 1, is_ipv6 = 1 },
-  { is_permit = 0, is_ipv6 = 0 }
-}
-
-reply = vpp:api_call("acl_add", { context = 42, count = 2, r = r2 })
-print(vpp.dump(reply))
-print("---")
-second_interface_acl_in = reply[1].acl_index
-
-reply = vpp:api_call("acl_interface_add_del", { context = 42, sw_if_index = vpp_if_to_s2, is_add = 1, is_input = 1, acl_index = second_interface_acl_in })
-print(vpp.dump(reply))
-print("---")
-
-^D^D^D
-
-run VPP show classify tables
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s2 nc -v -l -p 22
-run s1 nc 192.0.2.2 22
-run s1 echo
-sleep 1
-run s1 break
-sleep 1
-run VPP show trace
-expect VPP match: outacl 2 rule 2
-run VPP show classify tables
-
-
-run VPP show classify tables
-run VPP clear trace
-run VPP trace add af-packet-input 100
-run s2 nc -v -l -p 22
-run s1 nc 192.0.2.2 22
-run s1 echo
-sleep 1
-run s1 break
-sleep 1
-run VPP show trace
-expect VPP match: outacl 2 rule 2
-run VPP show classify tables
-
-
-run lua print("ALL GOOD!")
-
diff --git a/vpp-api/lua/vpp-lapi.lua b/vpp-api/lua/vpp-lapi.lua
deleted file mode 100644
index ebfd032b..00000000
--- a/vpp-api/lua/vpp-lapi.lua
+++ /dev/null
@@ -1,989 +0,0 @@
---[[
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-]]
-
--- json decode/encode from https://gist.github.com/tylerneylon/59f4bcf316be525b30ab
--- licensed by the author tylerneylon into public domain. Thanks!
-
-local json = {}
-
--- Internal functions.
-
-local function kind_of(obj)
-  if type(obj) ~= 'table' then return type(obj) end
-  local i = 1
-  for _ in pairs(obj) do
-    if obj[i] ~= nil then i = i + 1 else return 'table' end
-  end
-  if i == 1 then return 'table' else return 'array' end
-end
-
-local function escape_str(s)
-  local in_char  = {'\\', '"', '/', '\b', '\f', '\n', '\r', '\t'}
-  local out_char = {'\\', '"', '/',  'b',  'f',  'n',  'r',  't'}
-  for i, c in ipairs(in_char) do
-    s = s:gsub(c, '\\' .. out_char[i])
-  end
-  return s
-end
-
--- Returns pos, did_find; there are two cases:
--- 1. Delimiter found: pos = pos after leading space + delim; did_find = true.
--- 2. Delimiter not found: pos = pos after leading space;     did_find = false.
--- This throws an error if err_if_missing is true and the delim is not found.
-local function skip_delim(str, pos, delim, err_if_missing)
-  pos = pos + #str:match('^%s*', pos)
-  if str:sub(pos, pos) ~= delim then
-    if err_if_missing then
-      error('Expected ' .. delim .. ' near position ' .. pos)
-    end
-    return pos, false
-  end
-  return pos + 1, true
-end
-
--- Expects the given pos to be the first character after the opening quote.
--- Returns val, pos; the returned pos is after the closing quote character.
-local function parse_str_val(str, pos, val)
-  val = val or ''
-  local early_end_error = 'End of input found while parsing string.'
-  if pos > #str then error(early_end_error) end
-  local c = str:sub(pos, pos)
-  if c == '"'  then return val, pos + 1 end
-  if c ~= '\\' then return parse_str_val(str, pos + 1, val .. c) end
-  -- We must have a \ character.
-  local esc_map = {b = '\b', f = '\f', n = '\n', r = '\r', t = '\t'}
-  local nextc = str:sub(pos + 1, pos + 1)
-  if not nextc then error(early_end_error) end
-  return parse_str_val(str, pos + 2, val .. (esc_map[nextc] or nextc))
-end
-
--- Returns val, pos; the returned pos is after the number's final character.
-local function parse_num_val(str, pos)
-  local num_str = str:match('^-?%d+%.?%d*[eE]?[+-]?%d*', pos)
-  local val = tonumber(num_str)
-  if not val then error('Error parsing number at position ' .. pos .. '.') end
-  return val, pos + #num_str
-end
-
-
--- Public values and functions.
-
-function json.stringify(obj, as_key)
-  local s = {}  -- We'll build the string as an array of strings to be concatenated.
-  local kind = kind_of(obj)  -- This is 'array' if it's an array or type(obj) otherwise.
-  if kind == 'array' then
-    if as_key then error('Can\'t encode array as key.') end
-    s[#s + 1] = '['
-    for i, val in ipairs(obj) do
-      if i > 1 then s[#s + 1] = ', ' end
-      s[#s + 1] = json.stringify(val)
-    end
-    s[#s + 1] = ']'
-  elseif kind == 'table' then
-    if as_key then error('Can\'t encode table as key.') end
-    s[#s + 1] = '{'
-    for k, v in pairs(obj) do
-      if #s > 1 then s[#s + 1] = ', ' end
-      s[#s + 1] = json.stringify(k, true)
-      s[#s + 1] = ':'
-      s[#s + 1] = json.stringify(v)
-    end
-    s[#s + 1] = '}'
-  elseif kind == 'string' then
-    return '"' .. escape_str(obj) .. '"'
-  elseif kind == 'number' then
-    if as_key then return '"' .. tostring(obj) .. '"' end
-    return tostring(obj)
-  elseif kind == 'boolean' then
-    return tostring(obj)
-  elseif kind == 'nil' then
-    return 'null'
-  else
-    error('Unjsonifiable type: ' .. kind .. '.')
-  end
-  return table.concat(s)
-end
-
-json.null = {}  -- This is a one-off table to represent the null value.
-
-function json.parse(str, pos, end_delim)
-  pos = pos or 1
-  if pos > #str then error('Reached unexpected end of input.') end
-  local pos = pos + #str:match('^%s*', pos)  -- Skip whitespace.
-  local first = str:sub(pos, pos)
-  if first == '{' then  -- Parse an object.
-    local obj, key, delim_found = {}, true, true
-    pos = pos + 1
-    while true do
-      key, pos = json.parse(str, pos, '}')
-      if key == nil then return obj, pos end
-      if not delim_found then error('Comma missing between object items.') end
-      pos = skip_delim(str, pos, ':', true)  -- true -> error if missing.
-      obj[key], pos = json.parse(str, pos)
-      pos, delim_found = skip_delim(str, pos, ',')
-    end
-  elseif first == '[' then  -- Parse an array.
-    local arr, val, delim_found = {}, true, true
-    pos = pos + 1
-    while true do
-      val, pos = json.parse(str, pos, ']')
-      if val == nil then return arr, pos end
-      if not delim_found then error('Comma missing between array items.') end
-      arr[#arr + 1] = val
-      pos, delim_found = skip_delim(str, pos, ',')
-    end
-  elseif first == '"' then  -- Parse a string.
-    return parse_str_val(str, pos + 1)
-  elseif first == '-' or first:match('%d') then  -- Parse a number.
-    return parse_num_val(str, pos)
-  elseif first == end_delim then  -- End of an object or array.
-    return nil, pos + 1
-  else  -- Parse true, false, or null.
-    local literals = {['true'] = true, ['false'] = false, ['null'] = json.null}
-    for lit_str, lit_val in pairs(literals) do
-      local lit_end = pos + #lit_str - 1
-      if str:sub(pos, lit_end) == lit_str then return lit_val, lit_end + 1 end
-    end
-    local pos_info_str = 'position ' .. pos .. ': ' .. str:sub(pos, pos + 10)
-    error('Invalid json syntax starting at ' .. pos_info_str)
-  end
-end
-
-
-local vpp = {}
-
-local ffi = require("ffi")
-
---[[
-
-The basic type definitions. A bit of weird gymnastic with
-unionization of the hton* and ntoh* functions results
-is to make handling of signed and unsigned types a bit cleaner,
-essentially building typecasting into a C union.
-
-The vl_api_opaque_message_t is a synthetic type assumed to have
-enough storage to hold the entire API message regardless of the type.
-During the operation it is casted to the specific message struct types.
-
-]]
-
-
-ffi.cdef([[
-
-typedef uint8_t u8;
-typedef int8_t i8;
-typedef uint16_t u16;
-typedef int16_t i16;
-typedef uint32_t u32;
-typedef int32_t i32;
-typedef uint64_t u64;
-typedef int64_t i64;
-typedef double f64;
-typedef float f32;
-
-#pragma pack(1)
-typedef union {
-  u16 u16;
-  i16 i16;
-} lua_ui16t;
-
-#pragma pack(1)
-typedef union {
-  u32 u32;
-  i32 i32;
-} lua_ui32t;
-
-u16 ntohs(uint16_t hostshort);
-u16 htons(uint16_t hostshort);
-u32 htonl(uint32_t along);
-u32 ntohl(uint32_t along);
-void *memset(void *s, int c, size_t n);
-void *memcpy(void *dest, void *src, size_t n);
-
-#pragma pack(1)
-typedef struct _vl_api_opaque_message {
-  u16 _vl_msg_id;
-  u8  data[65536];
-} vl_api_opaque_message_t;
-]])
-
-
--- CRC-based version stuff
-
-local crc32c_table = ffi.new('const uint32_t[256]',
-  { 0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4,
-  0xC79A971F, 0x35F1141C, 0x26A1E7E8, 0xD4CA64EB,
-  0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B,
-  0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24,
-  0x105EC76F, 0xE235446C, 0xF165B798, 0x030E349B,
-  0xD7C45070, 0x25AFD373, 0x36FF2087, 0xC494A384,
-  0x9A879FA0, 0x68EC1CA3, 0x7BBCEF57, 0x89D76C54,
-  0x5D1D08BF, 0xAF768BBC, 0xBC267848, 0x4E4DFB4B,
-  0x20BD8EDE, 0xD2D60DDD, 0xC186FE29, 0x33ED7D2A,
-  0xE72719C1, 0x154C9AC2, 0x061C6936, 0xF477EA35,
-  0xAA64D611, 0x580F5512, 0x4B5FA6E6, 0xB93425E5,
-  0x6DFE410E, 0x9F95C20D, 0x8CC531F9, 0x7EAEB2FA,
-  0x30E349B1, 0xC288CAB2, 0xD1D83946, 0x23B3BA45,
-  0xF779DEAE, 0x05125DAD, 0x1642AE59, 0xE4292D5A,
-  0xBA3A117E, 0x4851927D, 0x5B016189, 0xA96AE28A,
-  0x7DA08661, 0x8FCB0562, 0x9C9BF696, 0x6EF07595,
-  0x417B1DBC, 0xB3109EBF, 0xA0406D4B, 0x522BEE48,
-  0x86E18AA3, 0x748A09A0, 0x67DAFA54, 0x95B17957,
-  0xCBA24573, 0x39C9C670, 0x2A993584, 0xD8F2B687,
-  0x0C38D26C, 0xFE53516F, 0xED03A29B, 0x1F682198,
-  0x5125DAD3, 0xA34E59D0, 0xB01EAA24, 0x42752927,
-  0x96BF4DCC, 0x64D4CECF, 0x77843D3B, 0x85EFBE38,
-  0xDBFC821C, 0x2997011F, 0x3AC7F2EB, 0xC8AC71E8,
-  0x1C661503, 0xEE0D9600, 0xFD5D65F4, 0x0F36E6F7,
-  0x61C69362, 0x93AD1061, 0x80FDE395, 0x72966096,
-  0xA65C047D, 0x5437877E, 0x4767748A, 0xB50CF789,
-  0xEB1FCBAD, 0x197448AE, 0x0A24BB5A, 0xF84F3859,
-  0x2C855CB2, 0xDEEEDFB1, 0xCDBE2C45, 0x3FD5AF46,
-  0x7198540D, 0x83F3D70E, 0x90A324FA, 0x62C8A7F9,
-  0xB602C312, 0x44694011, 0x5739B3E5, 0xA55230E6,
-  0xFB410CC2, 0x092A8FC1, 0x1A7A7C35, 0xE811FF36,
-  0x3CDB9BDD, 0xCEB018DE, 0xDDE0EB2A, 0x2F8B6829,
-  0x82F63B78, 0x709DB87B, 0x63CD4B8F, 0x91A6C88C,
-  0x456CAC67, 0xB7072F64, 0xA457DC90, 0x563C5F93,
-  0x082F63B7, 0xFA44E0B4, 0xE9141340, 0x1B7F9043,
-  0xCFB5F4A8, 0x3DDE77AB, 0x2E8E845F, 0xDCE5075C,
-  0x92A8FC17, 0x60C37F14, 0x73938CE0, 0x81F80FE3,
-  0x55326B08, 0xA759E80B, 0xB4091BFF, 0x466298FC,
-  0x1871A4D8, 0xEA1A27DB, 0xF94AD42F, 0x0B21572C,
-  0xDFEB33C7, 0x2D80B0C4, 0x3ED04330, 0xCCBBC033,
-  0xA24BB5A6, 0x502036A5, 0x4370C551, 0xB11B4652,
-  0x65D122B9, 0x97BAA1BA, 0x84EA524E, 0x7681D14D,
-  0x2892ED69, 0xDAF96E6A, 0xC9A99D9E, 0x3BC21E9D,
-  0xEF087A76, 0x1D63F975, 0x0E330A81, 0xFC588982,
-  0xB21572C9, 0x407EF1CA, 0x532E023E, 0xA145813D,
-  0x758FE5D6, 0x87E466D5, 0x94B49521, 0x66DF1622,
-  0x38CC2A06, 0xCAA7A905, 0xD9F75AF1, 0x2B9CD9F2,
-  0xFF56BD19, 0x0D3D3E1A, 0x1E6DCDEE, 0xEC064EED,
-  0xC38D26C4, 0x31E6A5C7, 0x22B65633, 0xD0DDD530,
-  0x0417B1DB, 0xF67C32D8, 0xE52CC12C, 0x1747422F,
-  0x49547E0B, 0xBB3FFD08, 0xA86F0EFC, 0x5A048DFF,
-  0x8ECEE914, 0x7CA56A17, 0x6FF599E3, 0x9D9E1AE0,
-  0xD3D3E1AB, 0x21B862A8, 0x32E8915C, 0xC083125F,
-  0x144976B4, 0xE622F5B7, 0xF5720643, 0x07198540,
-  0x590AB964, 0xAB613A67, 0xB831C993, 0x4A5A4A90,
-  0x9E902E7B, 0x6CFBAD78, 0x7FAB5E8C, 0x8DC0DD8F,
-  0xE330A81A, 0x115B2B19, 0x020BD8ED, 0xF0605BEE,
-  0x24AA3F05, 0xD6C1BC06, 0xC5914FF2, 0x37FACCF1,
-  0x69E9F0D5, 0x9B8273D6, 0x88D28022, 0x7AB90321,
-  0xAE7367CA, 0x5C18E4C9, 0x4F48173D, 0xBD23943E,
-  0xF36E6F75, 0x0105EC76, 0x12551F82, 0xE03E9C81,
-  0x34F4F86A, 0xC69F7B69, 0xD5CF889D, 0x27A40B9E,
-  0x79B737BA, 0x8BDCB4B9, 0x988C474D, 0x6AE7C44E,
-  0xBE2DA0A5, 0x4C4623A6, 0x5F16D052, 0xAD7D5351 }
-);
-
-local function CRC8(crc, d)
-  return bit.bxor(bit.rshift(crc, 8), crc32c_table[bit.band(0xff, bit.bxor(crc, d))])
-end
-
-local function CRC16(crc, d)
-  crc = CRC8(crc, bit.band(d, 0xFF))
-  d = bit.rshift(d, 8)
-  crc = CRC8(crc, bit.band(d, 0xFF))
-  return crc
-end
-
-local function string_crc(str, crc)
-  for i=1,#str do
-    -- print("S", i, string.byte(str, i), string.char(string.byte(str, i)))
-    crc = CRC8(crc, string.byte(str, i))
-  end
-  return crc
-end
-
-local tokens = {
-  { ["match"] =' ', ["act"]             = { }  },
-  { ["match"] ='\n', ["act"]             = { }  },
-  { ["match"] ="manual_endian", ["act"]  = { "NODE_MANUAL_ENDIAN", "MANUAL_ENDIAN",    276 } },
-  { ["match"] ="define", ["act"]         = { "NODE_DEFINE",        "DEFINE",           267 } },
-  { ["match"] ="dont_trace", ["act"]     = { "NODE_DONT_TRACE",    "DONT_TRACE",       279 } },
-  { ["match"] ="f64", ["act"]            = { "NODE_F64",           "PRIMTYPE",         string_crc } },
-  { ["match"] ="i16", ["act"]            = { "NODE_I16",           "PRIMTYPE",         string_crc } },
-  { ["match"] ="i32", ["act"]            = { "NODE_I32",           "PRIMTYPE",         string_crc } },
-  { ["match"] ="i64", ["act"]            = { "NODE_I64",           "PRIMTYPE",         string_crc } },
-  { ["match"] ="i8", ["act"]             = { "NODE_I8",            "PRIMTYPE",         string_crc } },
-  { ["match"] ="manual_print", ["act"]   = { "NODE_MANUAL_PRINT",  "MANUAL_PRINT",     275 } },
-  { ["match"] ="noversion", ["act"]      = { "NODE_NOVERSION",     "NOVERSION",        274 } },
-  { ["match"] ="packed", ["act"]         = { "NODE_PACKED",        "TPACKED",          266 } },
-  { ["match"] ="typeonly", ["act"]       = { "NODE_TYPEONLY",      "TYPEONLY",         278 } },
-  { ["match"] ="u16", ["act"]            = { "NODE_U16",           "PRIMTYPE",         string_crc } },
-  { ["match"] ="u32", ["act"]            = { "NODE_U32",           "PRIMTYPE",         string_crc } },
-  { ["match"] ="u64", ["act"]            = { "NODE_U64",           "PRIMTYPE",         string_crc } },
-  { ["match"] ="u8", ["act"]             = { "NODE_U8",            "PRIMTYPE",         string_crc } },
-  { ["match"] ="union", ["act"]          = { "NODE_UNION",         "UNION",            271 } },
-  { ["match"] ="uword", ["act"]          = { "NODE_UWORD",         "PRIMTYPE",         string_crc } },
-  { ["match"] ="%(", ["act"]             = { "NODE_LPAR",          "LPAR",             259 } },
-  { ["match"] ="%)", ["act"]             = { "NODE_RPAR",          "RPAR",             258 } },
-  { ["match"] =";", ["act"]              = { "NODE_SEMI",          "SEMI",             260 } },
-  { ["match"] ="%[", ["act"]             = { "NODE_LBRACK",        "LBRACK",           261 } },
-  { ["match"] ="%]", ["act"]             = { "NODE_RBRACK",        "RBRACK",           262 } },
-  { ["match"] ="%{", ["act"]             = { "NODE_LCURLY",        "LCURLY",           268 } },
-  { ["match"] ="%}", ["act"]             = { "NODE_RCURLY",        "RCURLY",           269 } },
-  { ["match"] ='%b""', ["act"]           = { "NODE_STRING",        "STRING",           string_crc } },
-  { ["match"] ='%b@@', ["act"]           = { "NODE_HELPER",        "HELPER_STRING",    string_crc } },
-  -- TODO: \ must be consumed
-  { ["match"] ='[_a-zA-Z][_a-zA-Z0-9]*',
-                       ["act"]           = { "NODE_NAME",          "NAME",             string_crc } },
-  { ["match"] ='[0-9]+', ["act"]         = { "NODE_NUMBER",        "NUMBER",           string_crc } },
-  { ["match"] ='#[^\n]+', ["act"]            = { "NODE_PRAGMA",        "PRAGMA",           nil } },
-}
-
-
-function vpp.crc_version_string(data)
-  local input_crc = 0
-  -- Get rid of comments
-  data = data:gsub("/%*.-%*/", "")
-  data = data:gsub("//[^\n]+", "")
-  -- print(data)
-  idx = 1
-  while (true) do
-    local matched = nil
-    for k, v in ipairs(tokens) do
-      if not matched then
-        local x, y, cap = string.find(data, v["match"], idx)
-        if x == idx then
-          matched = { ["node"] = v["act"], ["x"] = x, ["y"] = y, ["cap"] = cap, ["chars"] = string.sub(data, x, y)  }
-          -- print(k, v, x, y, cap, matched.chars, matched.node[0] )
-        end
-      end
-    end
-    if matched then
-      idx = idx + (matched.y - matched.x + 1)
-      if matched.node[1] then
-        local act = matched.node[3]
-        if type(act) == "function" then
-          input_crc = act(matched.chars, input_crc)
-        elseif type(act) == "number" then
-          input_crc = CRC16(input_crc, act)
-        end
-        -- print(vpp.dump(matched))
-      end
-    else
-      -- print("NOT MATCHED!")
-      local crc = CRC16(input_crc, 0xFFFFFFFF)
-      return string.sub(string.format("%x", crc), -8)
-    end
-  end
-end
-
-
-function vpp.dump(o)
-   if type(o) == 'table' then
-      local s = '{ '
-      for k,v in pairs(o) do
-         if type(k) ~= 'number' then k = '"'..k..'"' end
-         s = s .. '['..k..'] = ' .. vpp.dump(v) .. ','
-      end
-      return s .. '} '
-   else
-      return tostring(o)
-   end
-end
-
-function vpp.hex_dump(buf)
-  local ret = {}
-  for i=1,math.ceil(#buf/16) * 16 do
-    if (i-1) % 16 == 0 then table.insert(ret, string.format('%08X  ', i-1)) end
-    table.insert(ret, ( i > #buf and '   ' or string.format('%02X ', buf:byte(i)) ))
-    if i %  8 == 0 then table.insert(ret, ' ') end
-    if i % 16 == 0 then table.insert(ret, buf:sub(i-16+1, i):gsub('%c','.')..'\n' ) end
-  end
-  return table.concat(ret)
-end
-
-
-function vpp.c_str(text_in)
-  local text = text_in -- \000 will be helpfully added by ffi.copy
-  local c_str = ffi.new("char[?]", #text+1)
-  ffi.copy(c_str, text)
-  return c_str
-end
-
-
-function vpp.init(vpp, args)
-  local pneum_api = args.pneum_api or [[
- int cough_pneum_attach(char *pneum_path, char *cough_path);
- int pneum_connect(char *name, char *chroot_prefix, void *cb);
- int pneum_disconnect(void);
- int pneum_read(char **data, int *l);
- int pneum_write(char *data, int len);
- void pneum_free(char *data);
- uint32_t pneum_get_msg_index(unsigned char * name);
-]]
-
-  vpp.pneum_path = args.pneum_path
-  ffi.cdef(pneum_api)
-  local init_res = 0
-  vpp.pneum = ffi.load(vpp.pneum_path)
-  if (init_res < 0) then
-    return nil
-  end
-
-  vpp.next_msg_num = 1
-  vpp.msg_name_to_number = {}
-  vpp.msg_name_to_fields = {}
-  vpp.msg_number_to_name = {}
-  vpp.msg_number_to_type = {}
-  vpp.msg_number_to_pointer_type = {}
-  vpp.msg_name_to_crc = {}
-  vpp.c_type_to_fields = {}
-  vpp.events = {}
-  vpp.plugin_version = {}
-  vpp.is_connected = false
-
-
-  vpp.t_lua2c = {}
-  vpp.t_c2lua = {}
-  vpp.t_lua2c["u8"] = function(c_type, src, dst_c_ptr)
-    if type(src) == "string" then
-      -- ffi.copy adds a zero byte at the end. Grrr.
-      -- ffi.copy(dst_c_ptr, src)
-      ffi.C.memcpy(dst_c_ptr, vpp.c_str(src), #src)
-      return(#src)
-    elseif type(src) == "table" then
-      for i,v in ipairs(src) do
-        ffi.cast("u8 *", dst_c_ptr)[i-1] = v
-      end
-      return(#src)
-    else
-      return 1, src -- ffi.cast("u8", src)
-    end
-  end
-  vpp.t_c2lua["u8"] = function(c_type, src_ptr, src_len)
-    if src_len then
-      return ffi.string(src_ptr, src_len)
-    else
-      return (tonumber(src_ptr))
-    end
-  end
-
-  vpp.t_lua2c["u16"] = function(c_type, src, dst_c_ptr)
-    if type(src) == "table" then
-      for i,v in ipairs(src) do
-        ffi.cast("u16 *", dst_c_ptr)[i-1] = ffi.C.htons(v)
-      end
-      return(2 * #src)
-    else
-      return 2, (ffi.C.htons(src))
-    end
-  end
-  vpp.t_c2lua["u16"] = function(c_type, src_ptr, src_len)
-    if src_len then
-      local out = {}
-      for i = 0,src_len-1 do
-        out[i+1] = tonumber(ffi.C.ntohs(src_ptr[i]))
-      end
-      return out
-    else
-      return (tonumber(ffi.C.ntohs(src_ptr)))
-    end
-  end
-
-  vpp.t_lua2c["u32"] = function(c_type, src, dst_c_ptr)
-    if type(src) == "table" then
-      for i,v in ipairs(src) do
-        ffi.cast("u32 *", dst_c_ptr)[i-1] = ffi.C.htonl(v)
-      end
-      return(4 * #src)
-    else
-      return 4, (ffi.C.htonl(src))
-    end
-  end
-  vpp.t_c2lua["u32"] = function(c_type, src_ptr, src_len)
-    if src_len then
-      local out = {}
-      for i = 0,src_len-1 do
-        out[i+1] = tonumber(ffi.C.ntohl(src_ptr[i]))
-      end
-      return out
-    else
-      return (tonumber(ffi.C.ntohl(src_ptr)))
-    end
-  end
-  vpp.t_lua2c["i32"] = function(c_type, src, dst_c_ptr)
-    if type(src) == "table" then
-      for i,v in ipairs(src) do
-        ffi.cast("i32 *", dst_c_ptr)[i-1] = ffi.C.htonl(v)
-      end
-      return(4 * #src)
-    else
-      return 4, (ffi.C.htonl(src))
-    end
-  end
-  vpp.t_c2lua["i32"] = function(c_type, src_ptr, src_len)
-    local ntohl = function(src)
-      local u32val = ffi.cast("u32", src)
-      local ntohlval = (ffi.C.ntohl(u32val))
-      local out = tonumber(ffi.cast("i32", ntohlval + 0LL))
-      return out
-    end
-    if src_len then
-      local out = {}
-      for i = 0,src_len-1 do
-        out[i+1] = tonumber(ntohl(src_ptr[i]))
-      end
-    else
-      return (tonumber(ntohl(src_ptr)))
-    end
-  end
-
-  vpp.t_lua2c["u64"] = function(c_type, src, dst_c_ptr)
-    if type(src) == "table" then
-      for i,v in ipairs(src) do
-        ffi.cast("u64 *", dst_c_ptr)[i-1] = v --- FIXME ENDIAN
-      end
-      return(8 * #src)
-    else
-      return 8, ffi.cast("u64", src) --- FIXME ENDIAN
-    end
-  end
-  vpp.t_c2lua["u64"] = function(c_type, src_ptr, src_len)
-    if src_len then
-      local out = {}
-      for i = 0,src_len-1 do
-        out[i+1] = tonumber(src_ptr[i]) -- FIXME ENDIAN
-      end
-      return out
-    else
-      return (tonumber(src_ptr)) --FIXME ENDIAN
-    end
-  end
-
-
-
-
-  vpp.t_lua2c["__MSG__"] = function(c_type, src, dst_c_ptr)
-    local dst = ffi.cast(c_type .. " *", dst_c_ptr)
-    local additional_len = 0
-    local fields_info = vpp.c_type_to_fields[c_type]
-    -- print("__MSG__ type: " .. tostring(c_type))
-    ffi.C.memset(dst_c_ptr, 0, ffi.sizeof(dst[0]))
-    -- print(vpp.dump(fields_info))
-    -- print(vpp.dump(src))
-    for k,v in pairs(src) do
-      local field = fields_info[k]
-      if not field then
-        print("ERROR: field " .. tostring(k) .. " in message " .. tostring(c_type) .. " is unknown")
-      end
-      local lua2c = vpp.t_lua2c[field.c_type]
-      -- print("__MSG__ field " .. tostring(k) .. " : " .. vpp.dump(field))
-      -- if the field is not an array type, try to coerce the argument to a number
-      if not field.array and type(v) == "string" then
-        v = tonumber(v)
-      end
-      if not lua2c then
-        print("__MSG__ " .. tostring(c_type) .. " t_lua2c: can not store field " .. field.name ..
-              " type " .. field.c_type .. " dst " .. tostring(dst[k]))
-        return 0
-      end
-      local len = 0
-      local val = nil
-      if field.array and (type(v) == "table") then
-        -- print("NTFY: field " .. tostring(k) .. " in message " .. tostring(c_type) .. " is an array")
-        for field_i, field_v in ipairs(v) do
-          -- print("NTFY: setting member#" .. tostring(field_i) .. " to value " .. vpp.dump(field_v))
-          local field_len, field_val = lua2c(field.c_type, field_v, dst[k][field_i-1])
-          len = len + field_len
-        end
-      else
-        len, val = lua2c(field.c_type, v, dst[k])
-      end
-      if not field.array then
-        dst[k] = val
-      else
-        if 0 == field.array then
-          additional_len = additional_len + len
-          -- print("Adding " .. tostring(len) .. " bytes due to field " .. tostring(field.name))
-          -- If there is a variable storing the length
-          -- and the input table does not set it, do magic
-          if field.array_size and not src[field.array_size] then
-            local size_field = fields_info[field.array_size]
-            if size_field then
-              dst[field.array_size] = vpp.t_c2lua[size_field.c_type](size_field.c_type, len)
-            end
-          end
-        end
-      end
-      -- print("Full message:\n" .. vpp.hex_dump(ffi.string(ffi.cast('void *', req_store_cache), 64)))
-    end
-    return (ffi.sizeof(dst[0])+additional_len)
-  end
-
-  vpp.t_c2lua["__MSG__"] = function(c_type, src_ptr, src_len)
-    local out = {}
-    local reply_typed_ptr = ffi.cast(c_type .. " *", src_ptr)
-    local field_desc = vpp.c_type_to_fields[c_type]
-    if src_len then
-      for i = 0,src_len-1 do
-        out[i+1] = vpp.t_c2lua[c_type](c_type, src_ptr[i])
-      end
-      return out
-    end
-
-    for k, v in pairs(field_desc) do
-      local v_c2lua = vpp.t_c2lua[v.c_type]
-      if v_c2lua then
-        local len = v.array
-        -- print(dump(v))
-        if len then
-          local len_field_name = k .. "_length"
-          local len_field = field_desc[len_field_name]
-          if (len_field) then
-            local real_len = vpp.t_c2lua[len_field.c_type](len_field.c_type, reply_typed_ptr[len_field_name])
-            out[k] =  v_c2lua(v.c_type, reply_typed_ptr[k], real_len)
-          elseif len == 0 then
-            -- check if len = 0, then must be a field which contains the size
-            len_field =  field_desc[v.array_size]
-            local real_len = vpp.t_c2lua[len_field.c_type](len_field.c_type, reply_typed_ptr[v.array_size])
-            -- print("REAL length: " .. vpp.dump(v) .. " : " .. tostring(real_len))
-            out[k] = v_c2lua(v.c_type, reply_typed_ptr[k], real_len)
-          else
-            -- alas, just stuff the entire array
-            out[k] = v_c2lua(v.c_type, reply_typed_ptr[k], len)
-          end
-        else
-          out[k] =  v_c2lua(v.c_type, reply_typed_ptr[k])
-        end
-      else
-        out[k] = "<no accessor function for type " .. tostring(v.c_type) .. ">"
-      end
-      -- print(k, out[k])
-    end
-    return out
-  end
-
-  return vpp
-end
-
-function vpp.resolve_message_number(msgname)
-  local name = msgname .. "_" .. vpp.msg_name_to_crc[msgname]
-  local idx = vpp.pneum.pneum_get_msg_index(vpp.c_str(name))
-  if vpp.debug_dump then
-    print("Index for " .. tostring(name) .. " is " .. tostring(idx))
-  end
-  vpp.msg_name_to_number[msgname] = idx
-  vpp.msg_number_to_name[idx] = msgname
-  vpp.msg_number_to_type[idx] = "vl_api_" .. msgname .. "_t"
-  vpp.msg_number_to_pointer_type[idx] = vpp.msg_number_to_type[idx] .. " *"
-  ffi.cdef("\n\n enum { vl_msg_" .. msgname .. " = " .. idx .. " };\n\n")
-end
-
-function vpp.connect(vpp, client_name)
-    local name = "lua_client"
-    if client_name then
-      name = client_name
-    end
-    local ret = vpp.pneum.pneum_connect(vpp.c_str(client_name), nil, nil)
-    if tonumber(ret) == 0 then
-      vpp.is_connected = true
-    end
-    for k, v in pairs(vpp.msg_name_to_number) do
-      vpp.resolve_message_number(k)
-    end
-  end
-
-function vpp.disconnect(vpp)
-    vpp.pneum.pneum_disconnect()
-  end
-
-function vpp.json_api(vpp, path, plugin_name)
-    -- print("Consuming the VPP api from "..path)
-    local ffii = {}
-    local f = io.open(path, "r")
-    if not f then
-      print("Could not open " .. path)
-      return nil
-    end
-    local data = f:read("*all")
-    local json = json.parse(data)
-    if not (json.types or json.messages) then
-      print("Can not parse " .. path)
-      return nil
-    end
-
-    local all_types = {}
-
-    for i, v in ipairs(json.types) do
-      table.insert(all_types, { typeonly = 1, desc = v })
-    end
-    for i, v in ipairs(json.messages) do
-      table.insert(all_types, { typeonly = 0, desc = v })
-    end
-    for i, v in ipairs(all_types) do
-      local typeonly = v.typeonly
-      local name = v.desc[1]
-      local c_type = "vl_api_" .. name .. "_t"
-
-      local fields = {}
-      -- vpp.msg_name_to_fields[name] = fields
-      -- print("CTYPE " .. c_type)
-      vpp.c_type_to_fields[c_type] = fields
-      vpp.t_lua2c[c_type] = vpp.t_lua2c["__MSG__"]
-      vpp.t_c2lua[c_type] = vpp.t_c2lua["__MSG__"]
-
-      local cdef = { "\n\n#pragma pack(1)\ntypedef struct _vl_api_", name, " {\n" }
-      for ii, vv in ipairs(v.desc) do
-        if type(vv) == "table" then
-          if vv.crc then
-            vpp.msg_name_to_crc[name] = string.sub(vv.crc, 3) -- strip the leading 0x
-          else
-            local fieldtype = vv[1]
-            local fieldname = vv[2]
-            local fieldcount = vv[3]
-            local fieldcountvar = vv[4]
-            local fieldrec = { name = fieldname, c_type = fieldtype, array = fieldcount, array_size = fieldcountvar }
-            if fieldcount then
-              table.insert(cdef, "  " .. fieldtype .. " " .. fieldname .. "[" .. fieldcount .. "];\n")
-              if fieldtype == "u8" then
-                -- any array of bytes is treated as a string
-              elseif vpp.t_lua2c[fieldtype] then
-                -- print("Array of " .. fieldtype .. " is ok!")
-              else
-                print("Unknown array type: ", name,  " : " , fieldname, " : ", fieldtype, ":", fieldcount, ":", fieldcountvar)
-              end
-            else
-              table.insert(cdef, "  " .. fieldtype .. " " .. fieldname .. ";\n")
-            end
-            fields[fieldname] = fieldrec
-          end
-        end
-      end
-
-      table.insert(cdef, "} vl_api_" .. name .. "_t;")
-      table.insert(ffii, table.concat(cdef))
-
-      if typeonly == 0 then
-        -- we will want to resolve this later
-        if vpp.debug_dump then
-          print("Remember to resolve " .. name)
-        end
-        vpp.msg_name_to_number[name] = -1
-        if vpp.is_connected then
-          vpp.resolve_message_number(name)
-        end
-      end
-
-    end
-    local cdef_full = table.concat(ffii)
-    ffi.cdef(cdef_full)
-end
-
-function vpp.consume_api(vpp, path, plugin_name)
-    -- print("Consuming the VPP api from "..path)
-    local ffii = {}
-    local f = io.open(path, "r")
-    if not f then
-      print("Could not open " .. path)
-      return nil
-    end
-    local data = f:read("*all")
-    -- Remove all C comments
-    data = data:gsub("/%*.-%*/", "")
-    if vpp.is_connected and not plugin_name then
-      print(path .. ": must specify plugin name!")
-      return
-    end
-    if plugin_name then
-      vpp.plugin_version[plugin_name] = vpp.crc_version_string(data)
-      local full_plugin_name = plugin_name .. "_" .. vpp.plugin_version[plugin_name]
-      local reply = vpp:api_call("get_first_msg_id", { name = full_plugin_name } )
-      vpp.next_msg_num = tonumber(reply[1].first_msg_id)
-      print("Plugin " .. full_plugin_name .. " first message is " .. tostring(vpp.next_msg_num))
-    end
-    -- print ("data len: ", #data)
-    data = data:gsub("\n(.-)(%S+)%s*{([^}]*)}", function (preamble, name, members)
-      local _, typeonly = preamble:gsub("typeonly", "")
-      local maybe_msg_id_field = { [0] = "u16 _vl_msg_id;", "" }
-      local onedef = "\n\n#pragma pack(1)\ntypedef struct _vl_api_"..name.. " {\n" ..
-	   -- "   u16 _vl_msg_id;" ..
-           maybe_msg_id_field[typeonly] ..
-	   members:gsub("%[[a-zA-Z_]+]", "[0]") ..
-	   "} vl_api_" .. name .. "_t;"
-
-      local c_type = "vl_api_" .. name .. "_t"
-
-      local fields = {}
-      -- vpp.msg_name_to_fields[name] = fields
-      -- print("CTYPE " .. c_type)
-      vpp.c_type_to_fields[c_type] = fields
-      vpp.t_lua2c[c_type] = vpp.t_lua2c["__MSG__"]
-      vpp.t_c2lua[c_type] = vpp.t_c2lua["__MSG__"]
-      local mirec = { name = "_vl_msg_id", c_type = "u16", array = nil, array_size = nil }
-      if typeonly == 0 then
-        fields[mirec.name] = mirec
-      end
-
-      -- populate the field reflection table for the message
-      -- sets the various type information as well as the accessors for lua<->C conversion
-      members:gsub("(%S+)%s+(%S+);", function (fieldtype, fieldname)
-          local fieldcount = nil
-          local fieldcountvar = nil
-          -- data = data:gsub("%[[a-zA-Z_]+]", "[0]")
-          fieldname = fieldname:gsub("(%b[])", function(cnt)
-              fieldcount = tonumber(cnt:sub(2, -2));
-              if not fieldcount then
-                fieldcount = 0
-                fieldcountvar = cnt:sub(2, -2)
-              end
-              return ""
-            end)
-	  local fieldrec = { name = fieldname, c_type = fieldtype, array = fieldcount, array_size = fieldcountvar }
-          if fieldcount then
-            if fieldtype == "u8" then
-              -- any array of bytes is treated as a string
-            elseif vpp.t_lua2c[fieldtype] then
-              -- print("Array of " .. fieldtype .. " is ok!")
-            else
-              print("Unknown array type: ", name,  " : " , fieldname, " : ", fieldtype, ":", fieldcount, ":", fieldcountvar)
-            end
-          end
-	  fields[fieldname] = fieldrec
-	end)
-
-      -- print(dump(fields))
-
-      if typeonly == 0 then
-	local this_message_number = vpp.next_msg_num
-	vpp.next_msg_num = vpp.next_msg_num + 1
-	vpp.msg_name_to_number[name] = this_message_number
-	vpp.msg_number_to_name[this_message_number] = name
-	vpp.msg_number_to_type[this_message_number] = "vl_api_" .. name .. "_t"
-	vpp.msg_number_to_pointer_type[this_message_number] = vpp.msg_number_to_type[this_message_number] .. " *"
-	onedef = onedef .. "\n\n enum { vl_msg_" .. name .. " = " .. this_message_number .. " };\n\n"
-      end
-      table.insert(ffii, onedef);
-      return "";
-      end)
-    local cdef = table.concat(ffii)
-    -- print(cdef)
-    ffi.cdef(cdef)
-  end
-
-
-function vpp.lua2c(vpp, c_type, src, dst_c_ptr)
-  -- returns the number of bytes written to memory pointed by dst
-  local lua2c = vpp.t_lua2c[c_type]
-  if lua2c then
-    return(lua2c(c_type, src, dst_c_ptr))
-  else
-    print("vpp.lua2c: do not know how to store type " .. tostring(c_type))
-    local x = "a" .. nil
-    return 0
-  end
-end
-
-function vpp.c2lua(vpp, c_type, src_ptr, src_len)
-  -- returns the lua data structure
-  local c2lua = vpp.t_c2lua[c_type]
-  if c2lua then
-    return(c2lua(c_type, src_ptr, src_len))
-  else
-    print("vpp.c2lua: do not know how to load type " .. c_type)
-    return nil
-  end
-end
-
-local req_store_cache = ffi.new("vl_api_opaque_message_t[1]")
-
-function vpp.api_write(vpp, api_name, req_table)
-    local msg_num = vpp.msg_name_to_number[api_name]
-    if not msg_num then
-      print ("API call "..api_name.." is not known")
-      return nil
-    end
-
-    if not req_table then
-      req_table = {}
-    end
-    req_table._vl_msg_id = msg_num
-
-    local packed_len = vpp:lua2c(vpp.msg_number_to_type[msg_num], req_table, req_store_cache)
-    if vpp.debug_dump then
-      print("Write Message length: " .. tostring(packed_len) .. "\n" .. vpp.hex_dump(ffi.string(ffi.cast('void *', req_store_cache), packed_len)))
-    end
-
-    res = vpp.pneum.pneum_write(ffi.cast('void *', req_store_cache), packed_len)
-    return res
-  end
-
-local rep_store_cache = ffi.new("vl_api_opaque_message_t *[1]")
-local rep_len_cache = ffi.new("int[1]")
-
-function vpp.api_read(vpp)
-    local rep_type = "vl_api_opaque_message_t"
-    local rep = rep_store_cache
-    local replen = rep_len_cache
-    res = vpp.pneum.pneum_read(ffi.cast("void *", rep), replen)
-    if vpp.debug_dump then
-      print("Read Message length: " .. tostring(replen[0]) .. "\n" .. vpp.hex_dump(ffi.string(ffi.cast('void *', rep[0]), replen[0])))
-    end
-
-    local reply_msg_num = ffi.C.ntohs(rep[0]._vl_msg_id)
-    local reply_msg_name = vpp.msg_number_to_name[reply_msg_num]
-
-    local reply_typed_ptr = ffi.cast(vpp.msg_number_to_pointer_type[reply_msg_num], rep[0])
-    local out = vpp:c2lua(vpp.msg_number_to_type[reply_msg_num], rep[0], nil, replen[0])
-    if type(out) == "table" then
-      out["luaapi_message_name"] = reply_msg_name
-    end
-
-    vpp.pneum.pneum_free(ffi.cast('void *',rep[0]))
-
-    return reply_msg_name, out
-  end
-
-function vpp.api_call(vpp, api_name, req_table, options_in)
-    local msg_num = vpp.msg_name_to_number[api_name]
-    local end_message_name = api_name .."_reply"
-    local replies = {}
-    local cstruct = ""
-    local options = options_in or {}
-    if msg_num then
-      if vpp.debug_dump then
-        print("Message #" .. tostring(msg_num) .. " for name " .. tostring(api_name))
-      end
-      vpp:api_write(api_name, req_table)
-      if not vpp.msg_name_to_number[end_message_name] or options.force_ping then
-        end_message_name = "control_ping_reply"
-        vpp:api_write("control_ping")
-      end
-      repeat
-        reply_message_name, reply = vpp:api_read()
-        if reply and not reply.context then
-          -- there may be async events inbetween
-          table.insert(vpp.events, reply)
-        else
-          if reply_message_name ~= "control_ping_reply" then
-            -- do not insert the control ping encapsulation
-            table.insert(replies, reply)
-          end
-        end
-        -- print(reply)
-      until reply_message_name == end_message_name
-    else
-      print(api_name .. " is an unknown API call")
-      return nil
-    end
-    return replies
-  end
-
-return vpp
-- 
cgit 1.2.3-korg


From 5d22448922c52d2da0008b2ed2e2e20e08510229 Mon Sep 17 00:00:00 2001
From: Matus Fabian <matfabia@cisco.com>
Date: Mon, 2 Jan 2017 04:44:03 -0800
Subject: fix run-vat path

Change-Id: Idfe5050b2db35794687da797afdca60a707aa42c
Signed-off-by: Matus Fabian <matfabia@cisco.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 9187404c..447f809c 100644
--- a/Makefile
+++ b/Makefile
@@ -284,7 +284,7 @@ build-vat:
 	$(call make,$(PLATFORM)_debug,vpp-api-test-install)
 
 run-vat:
-	@sudo $(BR)/install-$(PLATFORM)_debug-native/vpp-api-test/bin/vpp_api_test
+	@sudo $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp_api_test
 
 pkg-deb:
 	$(call make,$(PLATFORM),install-deb)
-- 
cgit 1.2.3-korg


From b17402ecd0a1e163d845d3c9e1abfe98d7435ca8 Mon Sep 17 00:00:00 2001
From: Gabriel Ganne <gabriel.ganne@qosmos.com>
Date: Mon, 2 Jan 2017 16:44:21 +0100
Subject: preserve environment when make install-dep

for those who work behind a firewall/proxy-server

Change-Id: I099830d2da05296b2f109ca25576a1e865ddcce6
Signed-off-by: Gabriel Ganne <gabriel.ganne@qosmos.com>
---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 447f809c..6af33b08 100644
--- a/Makefile
+++ b/Makefile
@@ -157,10 +157,10 @@ ifeq ($(OS_VERSION_ID),14.04)
 endif
 	@sudo -E apt-get $(CONFIRM) $(FORCE) install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
-	@sudo yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
-	@sudo yum install $(CONFIRM) $(RPM_DEPENDS)
-	@sudo yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS)
-	@sudo debuginfo-install $(CONFIRM) glibc-2.17-106.el7_2.4.x86_64 openssl-libs-1.0.1e-51.el7_2.4.x86_64 zlib-1.2.7-15.el7.x86_64
+	@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
+	@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
+	@sudo -E yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS)
+	@sudo -E debuginfo-install $(CONFIRM) glibc-2.17-106.el7_2.4.x86_64 openssl-libs-1.0.1e-51.el7_2.4.x86_64 zlib-1.2.7-15.el7.x86_64
 else
 	$(error "This option currently works only on Ubuntu or Centos systems")
 endif
-- 
cgit 1.2.3-korg


From d995c757f05f78aa759b0a65c0a7e38088e690a9 Mon Sep 17 00:00:00 2001
From: Padraig Connolly <padraig.connolly@intel.com>
Date: Tue, 29 Nov 2016 17:17:20 +0000
Subject: vppctl: bash completion for vppctl commands

Added bash completion that will include all commands from build time
*Script takes list of commands generated by doxygen-siphon-list
*Configured doxygen-siphon makefile to generate just cli commands
*List of cli commands put in /usr/share/vpp
*Stopped siphon using doxygen bootstrap, uses main bootstrap instead
*Added rpm/deb check for installation of packages, separate from bootstrap
*NOTE: Once you have installed the vpp .deb/.rpm package you will have to
 restart bash

Change-Id: Ie503e80d5177481f6e7dbe59378f2e0d76f29152
Signed-off-by: Padraig Connolly <padraig.connolly@intel.com>
---
 Makefile                      | 46 ++++++++++++++++++++++++++++++++++++-------
 build-data/platforms.mk       |  8 ++++++++
 build-root/Makefile           |  3 ++-
 build-root/rpm/vpp.spec       |  6 ++++++
 doxygen/Makefile              | 25 ++++++++---------------
 src/scripts/vppctl_completion | 30 ++++++++++++++++++++++++++++
 6 files changed, 93 insertions(+), 25 deletions(-)
 create mode 100755 src/scripts/vppctl_completion

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6af33b08..7c3dded2 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,8 @@ endif
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
-DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf
+DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config doxygen graphviz
+DEB_DEPENDS += python-dev python-virtualenv python-pip python-pyparsing python-jinja2 lcov chrpath autoconf
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -41,9 +41,9 @@ else
 endif
 
 RPM_DEPENDS_GROUPS = 'Development Tools'
-RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
+RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils doxygen graphviz
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel python-virtualenv lcov chrpath
+RPM_DEPENDS += python-devel python-virtualenv pyparsing python-jinja2 lcov chrpath
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
@@ -183,6 +183,35 @@ distversion:	$(BR)/scripts/.version
 	$(BR)/scripts/verdist ${BR} ${prefix}-$(shell $(BR)/scripts/version rpm-version) ${verstring}
 	mv $(verstring).tar.gz $(BR)/rpm
 
+deb-depends-check:
+ifeq ($(OS_ID),ubuntu)
+	@MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
+	if [ -n "$$MISSING" ] ; then \
+	  echo "\nPlease install missing packages: \n$$MISSING\n" ; \
+	  echo "by executing \"make install-dep\"\n" ; \
+	exit 1 ; \
+	fi; \
+	exit 0
+endif
+
+rpm-depends-check:
+ifeq ($(OS_ID),centos)
+	@RPM_DEPENDS_ARRAY=($(RPM_DEPENDS)) ; \
+	for i in "$${!RPM_DEPENDS_ARRAY[@]}"; do \
+	  if ! yum list installed "$${RPM_DEPENDS_ARRAY[$$i]}" >/dev/null 2>&1; then \
+	    if ! [[ "$${RPM_DEPENDS_ARRAY[$$i]}" == *"://"* ]] ; then \
+	      MISSING="$$MISSING $${RPM_DEPENDS_ARRAY[$$i]}" ; \
+	    fi; \
+	  fi; \
+	done; \
+	if [ -n "$$MISSING" ] ; then \
+	  echo "\nPlease install missing packages: \n$$MISSING\n" ; \
+	  echo "by executing \"make install-dep\"\n" ; \
+	  exit 1 ; \
+	fi; \
+	exit 0
+endif
+
 build: $(BR)/.bootstrap.ok
 	$(call make,$(PLATFORM)_debug,vpp-install)
 
@@ -286,10 +315,10 @@ build-vat:
 run-vat:
 	@sudo $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp_api_test
 
-pkg-deb:
+pkg-deb: deb-depends-check doxygen-siphon-list
 	$(call make,$(PLATFORM),install-deb)
 
-pkg-rpm: dist
+pkg-rpm: dist rpm-depends-check doxygen-siphon-list
 	$(call make,$(PLATFORM),install-rpm)
 
 ctags: ctags.files
@@ -321,7 +350,7 @@ endef
 
 .PHONY: bootstrap-doxygen doxygen wipe-doxygen
 
-bootstrap-doxygen:
+bootstrap-doxygen: deb-depends-check rpm-depends-check
 	$(call make-doxy)
 
 doxygen:
@@ -330,6 +359,9 @@ doxygen:
 wipe-doxygen:
 	$(call make-doxy)
 
+doxygen-siphon-list:
+	$(call make-doxy)
+
 define banner
 	@echo "========================================================================"
 	@echo " $(1)"
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index e192155b..111a45dc 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -73,6 +73,14 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 									\
 	: and sysctl config ; 						\
 	echo ../../src/vpp/conf/80-vpp.conf /etc/sysctl.d 		\
+	   >> deb/debian/vpp.install ;				        \
+									\
+	: bash completion for vppctl ;                                  \
+	echo ../../src/scripts/vppctl_completion /etc/bash_completion.d \
+	   >> deb/debian/vpp.install ;    				\
+									\
+	: move dictionary of vppctl commands ;				\
+	echo ../docs/siphon_docs/clicmd.itemlist /usr/share/vpp		\
 	   >> deb/debian/vpp.install ;					\
 									\
 	: dev package needs a couple of additions ;			\
diff --git a/build-root/Makefile b/build-root/Makefile
index 6e26e90e..9fe03d66 100644
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -1141,7 +1141,8 @@ package_wipe_script =											\
   @message=$(if $(is_build_tool),"Wiping build $(PACKAGE)","Wiping build/install $(PACKAGE)") ;		\
   $(call build_msg_fn,$$message) ;									\
   $(BUILD_ENV) ;											\
-  rm -rf $(if $(is_build_tool),$(PACKAGE_BUILD_DIR),$(PACKAGE_INSTALL_DIR) $(PACKAGE_BUILD_DIR))
+  rm -rf $(if $(is_build_tool),$(PACKAGE_BUILD_DIR),$(PACKAGE_INSTALL_DIR) $(PACKAGE_BUILD_DIR));	\
+  rm -f $(MU_BUILD_ROOT_DIR)/docs/siphon_docs/clicmd.itemlist
 
 .PHONY: %-wipe
 %-wipe:
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index c3c0d927..07ea2c34 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -129,6 +129,8 @@ install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}/etc/
 # libraries
 #
 mkdir -p -m755 %{buildroot}%{_libdir}
+mkdir -p -m755 %{buildroot}/usr/share/vpp
+mkdir -p -m755 %{buildroot}/etc/bash_completion.d
 for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/lib* -type f -name '*.so.*.*.*' -print )
 do
 	install -p -m 755 $file %{buildroot}%{_libdir}
@@ -145,6 +147,8 @@ for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/vpp/api  -type
 do
 	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
 done
+install -p -m 644 %{_mu_build_dir}/../src/scripts/vppctl_completion %{buildroot}/etc/bash_completion.d
+install -p -m 644 %{_mu_build_dir}/docs/siphon_docs/clicmd.itemlist %{buildroot}/usr/share/vpp
 
 # Lua bindings
 mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/cli
@@ -273,6 +277,8 @@ fi
 %exclude %{_libdir}/vpp_api_test_plugins
 %{_libdir}/*
 /usr/share/vpp/api/*
+/etc/bash_completion.d/vppctl_completion
+/usr/share/vpp/clicmd.itemlist
 
 %files api-lua
 %defattr(644,root,root)
diff --git a/doxygen/Makefile b/doxygen/Makefile
index face5b44..18086626 100644
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -33,8 +33,6 @@ endif
 OS_ID ?= $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 
 # Package dependencies
-DOC_DEB_DEPENDS = doxygen graphviz python-pyparsing python-jinja2
-DOC_RPM_DEPENDS = doxygen graphviz pyparsing python-jinja2
 DOC_MAC_BIN_DEPENDS = doxygen dot git
 DOC_MAC_PY_DEPENDS = pyparsing jinja2
 
@@ -129,22 +127,11 @@ SIPHON_DOCS = $(addprefix $(SIPHON_OUTPUT)/,$(addsuffix .md,$(SIPHONS)))
 SIPHON_ITEMLIST = $(addprefix $(SIPHON_OUTPUT)/,$(addsuffix .itemlist,$(filter clicmd,$(SIPHONS))))
 
 $(BR)/.doxygen-bootstrap.ok: Makefile
-	@echo "Checking whether dependencies for Doxygen are installed..."
 ifeq ($(OS_ID),ubuntu)
-	@set -e; inst=; \
-		for i in $(DOC_DEB_DEPENDS); do \
-			dpkg-query --show $$i >/dev/null 2>&1 || inst="$$inst $$i"; \
-		done; \
-		if [ "$$inst" ]; then \
-			sudo apt-get update; \
-			sudo apt-get $(CONFIRM) $(FORCE) install $$inst; \
-		fi
 	@if [ ! -s /usr/lib/graphviz/config6a ]; then \
-		echo "Rebuidlding system Graphviz configuration."; \
+		echo "Rebuilding system Graphviz configuration."; \
 		sudo dot -c; \
 	fi
-else ifneq ("$(wildcard /etc/redhat-release)","")
-	@sudo yum install $(CONFIRM) $(DOC_RPM_DEPENDS)
 else ifeq ($(OS_ID),darwin)
 	@set -e; \
 	for bin in $(DOC_MAC_BIN_DEPENDS); do \
@@ -187,8 +174,7 @@ $(BR)/.doxygen-siphon.dep: Makefile \
 # Generate .siphon files that contain fragments of source file that
 # relate to the siphons we support.
 .NOTPARALLEL: $(SIPHON_FILES)
-$(SIPHON_FILES): $(BR)/.doxygen-bootstrap.ok \
-		$(DOXY_DIR)/siphon-generate \
+$(SIPHON_FILES):$(DOXY_DIR)/siphon-generate \
 		$(addprefix,$(WSROOT),$(DOXY_INPUT)) \
 		$(wildcard $(DOXY_DIR)/siphon/*.py)
 	@echo "Validating source tree..."
@@ -246,7 +232,12 @@ $(eval $(call siphon-process,itemlist,itemlist))
 
 # This target can be used just to generate the siphoned things
 .PHONY: doxygen-siphon
-doxygen-siphon: $(SIPHON_DOCS) $(SIPHON_ITEMLIST)
+doxygen-siphon: $(SIPHON_DOCS)
+
+# This target is used generate list of cli commands for use with
+# the bash completion element for vppctl
+.PHONY: doxygen-siphon-list
+doxygen-siphon-list: $(SIPHON_ITEMLIST)
 
 # Generate the doxygen docs
 .PHONY: doxygen
diff --git a/src/scripts/vppctl_completion b/src/scripts/vppctl_completion
new file mode 100755
index 00000000..7e60249f
--- /dev/null
+++ b/src/scripts/vppctl_completion
@@ -0,0 +1,30 @@
+#Copyright 2016 Intel Corporation
+#
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License.
+#You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS,
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#See the License for the specific language governing permissions and
+#limitations under the License.
+
+_vppctl()
+{
+    local cur prev num opts
+    COMPREPLY=( $(compgen -f ${cur}) )
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[@]:1}"
+    num="$((${#COMP_WORDS[@]}-1))"
+
+    VPP_CMD_LIST="$(cat /usr/share/vpp/clicmd.itemlist)"
+
+    opts="$(awk -v prev="^$prev" -v num=$num '{if($0 ~ prev) print $num}' <<< "${VPP_CMD_LIST}")"
+
+    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+
+}
+complete -F _vppctl vppctl
-- 
cgit 1.2.3-korg


From 6bbf83a01b813b3d50b27ab9001d25cae5c4592a Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Tue, 10 Jan 2017 10:39:21 +0100
Subject: Revert "vppctl: bash completion for vppctl commands"

This patch is causing build failures

This reverts commit d995c757f05f78aa759b0a65c0a7e38088e690a9.

Change-Id: I0c8d5a4208135d77aaa3a6a470d26140f7b74733
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                      | 46 +++++++------------------------------------
 build-data/platforms.mk       |  8 --------
 build-root/Makefile           |  3 +--
 build-root/rpm/vpp.spec       |  6 ------
 doxygen/Makefile              | 25 +++++++++++++++--------
 src/scripts/vppctl_completion | 30 ----------------------------
 6 files changed, 25 insertions(+), 93 deletions(-)
 delete mode 100755 src/scripts/vppctl_completion

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7c3dded2..6af33b08 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,8 @@ endif
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
-DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config doxygen graphviz
-DEB_DEPENDS += python-dev python-virtualenv python-pip python-pyparsing python-jinja2 lcov chrpath autoconf
+DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
+DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -41,9 +41,9 @@ else
 endif
 
 RPM_DEPENDS_GROUPS = 'Development Tools'
-RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils doxygen graphviz
+RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel python-virtualenv pyparsing python-jinja2 lcov chrpath
+RPM_DEPENDS += python-devel python-virtualenv lcov chrpath
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
@@ -183,35 +183,6 @@ distversion:	$(BR)/scripts/.version
 	$(BR)/scripts/verdist ${BR} ${prefix}-$(shell $(BR)/scripts/version rpm-version) ${verstring}
 	mv $(verstring).tar.gz $(BR)/rpm
 
-deb-depends-check:
-ifeq ($(OS_ID),ubuntu)
-	@MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
-	if [ -n "$$MISSING" ] ; then \
-	  echo "\nPlease install missing packages: \n$$MISSING\n" ; \
-	  echo "by executing \"make install-dep\"\n" ; \
-	exit 1 ; \
-	fi; \
-	exit 0
-endif
-
-rpm-depends-check:
-ifeq ($(OS_ID),centos)
-	@RPM_DEPENDS_ARRAY=($(RPM_DEPENDS)) ; \
-	for i in "$${!RPM_DEPENDS_ARRAY[@]}"; do \
-	  if ! yum list installed "$${RPM_DEPENDS_ARRAY[$$i]}" >/dev/null 2>&1; then \
-	    if ! [[ "$${RPM_DEPENDS_ARRAY[$$i]}" == *"://"* ]] ; then \
-	      MISSING="$$MISSING $${RPM_DEPENDS_ARRAY[$$i]}" ; \
-	    fi; \
-	  fi; \
-	done; \
-	if [ -n "$$MISSING" ] ; then \
-	  echo "\nPlease install missing packages: \n$$MISSING\n" ; \
-	  echo "by executing \"make install-dep\"\n" ; \
-	  exit 1 ; \
-	fi; \
-	exit 0
-endif
-
 build: $(BR)/.bootstrap.ok
 	$(call make,$(PLATFORM)_debug,vpp-install)
 
@@ -315,10 +286,10 @@ build-vat:
 run-vat:
 	@sudo $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp_api_test
 
-pkg-deb: deb-depends-check doxygen-siphon-list
+pkg-deb:
 	$(call make,$(PLATFORM),install-deb)
 
-pkg-rpm: dist rpm-depends-check doxygen-siphon-list
+pkg-rpm: dist
 	$(call make,$(PLATFORM),install-rpm)
 
 ctags: ctags.files
@@ -350,7 +321,7 @@ endef
 
 .PHONY: bootstrap-doxygen doxygen wipe-doxygen
 
-bootstrap-doxygen: deb-depends-check rpm-depends-check
+bootstrap-doxygen:
 	$(call make-doxy)
 
 doxygen:
@@ -359,9 +330,6 @@ doxygen:
 wipe-doxygen:
 	$(call make-doxy)
 
-doxygen-siphon-list:
-	$(call make-doxy)
-
 define banner
 	@echo "========================================================================"
 	@echo " $(1)"
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 111a45dc..e192155b 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -73,14 +73,6 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 									\
 	: and sysctl config ; 						\
 	echo ../../src/vpp/conf/80-vpp.conf /etc/sysctl.d 		\
-	   >> deb/debian/vpp.install ;				        \
-									\
-	: bash completion for vppctl ;                                  \
-	echo ../../src/scripts/vppctl_completion /etc/bash_completion.d \
-	   >> deb/debian/vpp.install ;    				\
-									\
-	: move dictionary of vppctl commands ;				\
-	echo ../docs/siphon_docs/clicmd.itemlist /usr/share/vpp		\
 	   >> deb/debian/vpp.install ;					\
 									\
 	: dev package needs a couple of additions ;			\
diff --git a/build-root/Makefile b/build-root/Makefile
index 9fe03d66..6e26e90e 100644
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -1141,8 +1141,7 @@ package_wipe_script =											\
   @message=$(if $(is_build_tool),"Wiping build $(PACKAGE)","Wiping build/install $(PACKAGE)") ;		\
   $(call build_msg_fn,$$message) ;									\
   $(BUILD_ENV) ;											\
-  rm -rf $(if $(is_build_tool),$(PACKAGE_BUILD_DIR),$(PACKAGE_INSTALL_DIR) $(PACKAGE_BUILD_DIR));	\
-  rm -f $(MU_BUILD_ROOT_DIR)/docs/siphon_docs/clicmd.itemlist
+  rm -rf $(if $(is_build_tool),$(PACKAGE_BUILD_DIR),$(PACKAGE_INSTALL_DIR) $(PACKAGE_BUILD_DIR))
 
 .PHONY: %-wipe
 %-wipe:
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index 07ea2c34..c3c0d927 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -129,8 +129,6 @@ install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}/etc/
 # libraries
 #
 mkdir -p -m755 %{buildroot}%{_libdir}
-mkdir -p -m755 %{buildroot}/usr/share/vpp
-mkdir -p -m755 %{buildroot}/etc/bash_completion.d
 for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/lib* -type f -name '*.so.*.*.*' -print )
 do
 	install -p -m 755 $file %{buildroot}%{_libdir}
@@ -147,8 +145,6 @@ for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/vpp/api  -type
 do
 	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
 done
-install -p -m 644 %{_mu_build_dir}/../src/scripts/vppctl_completion %{buildroot}/etc/bash_completion.d
-install -p -m 644 %{_mu_build_dir}/docs/siphon_docs/clicmd.itemlist %{buildroot}/usr/share/vpp
 
 # Lua bindings
 mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/cli
@@ -277,8 +273,6 @@ fi
 %exclude %{_libdir}/vpp_api_test_plugins
 %{_libdir}/*
 /usr/share/vpp/api/*
-/etc/bash_completion.d/vppctl_completion
-/usr/share/vpp/clicmd.itemlist
 
 %files api-lua
 %defattr(644,root,root)
diff --git a/doxygen/Makefile b/doxygen/Makefile
index 18086626..face5b44 100644
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -33,6 +33,8 @@ endif
 OS_ID ?= $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 
 # Package dependencies
+DOC_DEB_DEPENDS = doxygen graphviz python-pyparsing python-jinja2
+DOC_RPM_DEPENDS = doxygen graphviz pyparsing python-jinja2
 DOC_MAC_BIN_DEPENDS = doxygen dot git
 DOC_MAC_PY_DEPENDS = pyparsing jinja2
 
@@ -127,11 +129,22 @@ SIPHON_DOCS = $(addprefix $(SIPHON_OUTPUT)/,$(addsuffix .md,$(SIPHONS)))
 SIPHON_ITEMLIST = $(addprefix $(SIPHON_OUTPUT)/,$(addsuffix .itemlist,$(filter clicmd,$(SIPHONS))))
 
 $(BR)/.doxygen-bootstrap.ok: Makefile
+	@echo "Checking whether dependencies for Doxygen are installed..."
 ifeq ($(OS_ID),ubuntu)
+	@set -e; inst=; \
+		for i in $(DOC_DEB_DEPENDS); do \
+			dpkg-query --show $$i >/dev/null 2>&1 || inst="$$inst $$i"; \
+		done; \
+		if [ "$$inst" ]; then \
+			sudo apt-get update; \
+			sudo apt-get $(CONFIRM) $(FORCE) install $$inst; \
+		fi
 	@if [ ! -s /usr/lib/graphviz/config6a ]; then \
-		echo "Rebuilding system Graphviz configuration."; \
+		echo "Rebuidlding system Graphviz configuration."; \
 		sudo dot -c; \
 	fi
+else ifneq ("$(wildcard /etc/redhat-release)","")
+	@sudo yum install $(CONFIRM) $(DOC_RPM_DEPENDS)
 else ifeq ($(OS_ID),darwin)
 	@set -e; \
 	for bin in $(DOC_MAC_BIN_DEPENDS); do \
@@ -174,7 +187,8 @@ $(BR)/.doxygen-siphon.dep: Makefile \
 # Generate .siphon files that contain fragments of source file that
 # relate to the siphons we support.
 .NOTPARALLEL: $(SIPHON_FILES)
-$(SIPHON_FILES):$(DOXY_DIR)/siphon-generate \
+$(SIPHON_FILES): $(BR)/.doxygen-bootstrap.ok \
+		$(DOXY_DIR)/siphon-generate \
 		$(addprefix,$(WSROOT),$(DOXY_INPUT)) \
 		$(wildcard $(DOXY_DIR)/siphon/*.py)
 	@echo "Validating source tree..."
@@ -232,12 +246,7 @@ $(eval $(call siphon-process,itemlist,itemlist))
 
 # This target can be used just to generate the siphoned things
 .PHONY: doxygen-siphon
-doxygen-siphon: $(SIPHON_DOCS)
-
-# This target is used generate list of cli commands for use with
-# the bash completion element for vppctl
-.PHONY: doxygen-siphon-list
-doxygen-siphon-list: $(SIPHON_ITEMLIST)
+doxygen-siphon: $(SIPHON_DOCS) $(SIPHON_ITEMLIST)
 
 # Generate the doxygen docs
 .PHONY: doxygen
diff --git a/src/scripts/vppctl_completion b/src/scripts/vppctl_completion
deleted file mode 100755
index 7e60249f..00000000
--- a/src/scripts/vppctl_completion
+++ /dev/null
@@ -1,30 +0,0 @@
-#Copyright 2016 Intel Corporation
-#
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License.
-#You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
-
-_vppctl()
-{
-    local cur prev num opts
-    COMPREPLY=( $(compgen -f ${cur}) )
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[@]:1}"
-    num="$((${#COMP_WORDS[@]}-1))"
-
-    VPP_CMD_LIST="$(cat /usr/share/vpp/clicmd.itemlist)"
-
-    opts="$(awk -v prev="^$prev" -v num=$num '{if($0 ~ prev) print $num}' <<< "${VPP_CMD_LIST}")"
-
-    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-
-}
-complete -F _vppctl vppctl
-- 
cgit 1.2.3-korg


From 6484b3baa3ef3186dc11fbf7706494da95079626 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Sun, 15 Jan 2017 21:30:50 +0100
Subject: Toplevel Makefile cleanup

Change-Id: I2f4cb267dbb4d6e6fc6bef908c4bb548c5f37b35
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6af33b08..6e512fe5 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-WS_ROOT=$(CURDIR)
-BR=$(WS_ROOT)/build-root
+export WS_ROOT=$(CURDIR)
+export BR=$(WS_ROOT)/build-root
 CCACHE_DIR?=$(BR)/.ccache
 GDB?=gdb
 PLATFORM?=vpp
@@ -202,18 +202,17 @@ wipe-release: $(BR)/.bootstrap.ok
 
 rebuild-release: wipe-release build-release
 
-VPP_PYTHON_PREFIX=$(BR)/python
+export VPP_PYTHON_PREFIX=$(BR)/python
 
 define test
 	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
 	make -C test \
-	  BR=$(BR) \
 	  VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
 	  VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
 	  VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
 	  VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
 	  LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \
-	  WS_ROOT=$(WS_ROOT) V=$(V) TEST=$(TEST) VPP_PYTHON_PREFIX=$(VPP_PYTHON_PREFIX) $(3)
+	  $(3)
 endef
 
 test: bootstrap
@@ -229,16 +228,16 @@ test-wipe:
 	@make -C test wipe
 
 test-doc:
-	@make -C test WS_ROOT=$(WS_ROOT) BR=$(BR) VPP_PYTHON_PREFIX=$(VPP_PYTHON_PREFIX) doc
+	@make -C test doc
 
 test-wipe-doc:
-	@make -C test wipe-doc BR=$(BR)
+	@make -C test wipe-doc
 
 test-cov: bootstrap
 	$(call test,vpp_lite,vpp_lite_gcov,cov)
 
 test-wipe-cov:
-	@make -C test wipe-cov BR=$(BR)
+	@make -C test wipe-cov
 
 retest:
 	$(call test,vpp_lite,vpp_lite,retest)
@@ -316,7 +315,7 @@ fixstyle:
 export DOXY_DIR ?= $(WS_ROOT)/doxygen
 
 define make-doxy
-	@OS_ID="$(OS_ID)" WS_ROOT="$(WS_ROOT)" BR="$(BR)" make -C $(DOXY_DIR) $@
+	@OS_ID="$(OS_ID)" make -C $(DOXY_DIR) $@
 endef
 
 .PHONY: bootstrap-doxygen doxygen wipe-doxygen
-- 
cgit 1.2.3-korg


From 51a7c8b762d4340b64d868e8003bdcdd27effde1 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Mon, 16 Jan 2017 16:19:38 +0100
Subject: Add 'make test' to verify job

Change-Id: Iaab9c1a1c691a613d25ea28a22ac5db5943d8892
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6e512fe5..12f40483 100644
--- a/Makefile
+++ b/Makefile
@@ -356,5 +356,6 @@ ifeq ($(OS_ID),centos)
 	$(call banner,"Building rpm packages")
 	@make pkg-rpm
 endif
+	@make test
 
 
-- 
cgit 1.2.3-korg


From 72715ee4e2bba6fd4ce5c077bca68bb08ac729a0 Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Tue, 17 Jan 2017 10:37:05 +0100
Subject: make test: add checkstyle target

Change-Id: I59d3c3bc77474c96e1d6fa51811c1b13fb9a6c5b
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 Makefile         |  4 ++++
 test/Makefile    | 17 +++++++++++++++++
 test/test_bfd.py |  2 --
 test/util.py     |  3 ++-
 4 files changed, 23 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 12f40483..f1813a30 100644
--- a/Makefile
+++ b/Makefile
@@ -96,6 +96,7 @@ help:
 	@echo " test-wipe-doc       - wipe documentation for test framework"
 	@echo " test-cov            - generate code coverage report for test framework"
 	@echo " test-wipe-cov       - wipe code coverage report for test framework"
+	@echo " test-checkstyle     - check PEP8 compliance for test framework"
 	@echo ""
 	@echo "Make Arguments:"
 	@echo " V=[0|1]             - set build verbosity level"
@@ -239,6 +240,9 @@ test-cov: bootstrap
 test-wipe-cov:
 	@make -C test wipe-cov
 
+test-checkstyle:
+	@make -C test checkstyle
+
 retest:
 	$(call test,vpp_lite,vpp_lite,retest)
 
diff --git a/test/Makefile b/test/Makefile
index 543fe913..db64ad93 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -77,6 +77,20 @@ cov: wipe-cov reset verify-python-path $(PAPI_INSTALL_DONE)
 wipe-cov: wipe
 	@rm -rf $(BUILD_COV_DIR)
 
+.PHONY: checkstyle
+checkstyle: verify-python-path
+	@virtualenv $(PYTHON_VENV_PATH) -p python2.7
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install $(PYTHON_DEPENDS) pep8"
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate &&\
+		pep8 --show-source -v $(WS_ROOT)/test/*.py ||\
+		(echo \"*******************************************************************\" &&\
+		 echo \"* Test framework PEP8 compliance check FAILED \" &&\
+	         echo \"*******************************************************************\" &&\
+		 false)"
+	@echo "*******************************************************************"
+	@echo "* Test framework PEP8 compliance check passed"
+	@echo "*******************************************************************"
+
 help:
 	@echo "Running tests:"
 	@echo ""
@@ -106,3 +120,6 @@ help:
 	@echo " test-cov            - generate code coverage report for test framework"
 	@echo " test-wipe-cov       - wipe code coverage report for test framework"
 	@echo ""
+	@echo "Verifying code-style"
+	@echo " test-checkstyle     - check PEP8 compliance"
+	@echo ""
diff --git a/test/test_bfd.py b/test/test_bfd.py
index b6222524..b7832247 100644
--- a/test/test_bfd.py
+++ b/test/test_bfd.py
@@ -27,8 +27,6 @@ class BFDAPITestCase(VppTestCase):
             super(BFDAPITestCase, cls).tearDownClass()
             raise
 
-
-
     def test_add_bfd(self):
         """ create a BFD session """
         session = VppBFDUDPSession(self, self.pg0, self.pg0.remote_ip4)
diff --git a/test/util.py b/test/util.py
index ae887a54..79893602 100644
--- a/test/util.py
+++ b/test/util.py
@@ -41,7 +41,8 @@ def ip4_range(ip4, s, e):
 
 def ip4n_range(ip4n, s, e):
     ip4 = socket.inet_ntop(socket.AF_INET, ip4n)
-    return (socket.inet_pton(socket.AF_INET, ip) for ip in ip4_range(ip4, s, e))
+    return (socket.inet_pton(socket.AF_INET, ip)
+            for ip in ip4_range(ip4, s, e))
 
 
 class NumericConstant(object):
-- 
cgit 1.2.3-korg


From 2ce7f9834ab55728520bff0dd15f8d82c10b95a0 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Mon, 9 Jan 2017 20:24:50 +0100
Subject: Add dpdk development packaging

Change-Id: I6aa2a6709241d99ce734c29e47487eb456907351
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                              |  25 ++++---
 build-data/packages/dpdk.mk           |   6 +-
 build-data/packages/vpp.mk            |   3 +-
 build-data/platforms.mk               |   4 --
 build-root/Makefile                   |   1 -
 build-root/deb/debian/.gitignore      |   3 -
 build-root/deb/debian/control         |  17 +----
 build-root/deb/debian/rules           |   5 +-
 build-root/rpm/vpp.spec               |   1 -
 build-root/scripts/find-dpdk-contents |  29 --------
 dpdk/Makefile                         | 126 ++++++++++++++++++++++++++++++++--
 dpdk/deb/debian/compat                |   1 +
 dpdk/deb/debian/control               |  18 +++++
 dpdk/deb/debian/dkms/Makefile         |  10 +++
 dpdk/deb/debian/rules                 |  38 ++++++++++
 dpdk/deb/debian/vpp-dpdk-dkms.dkms    |   8 +++
 dpdk/dkms/Makefile                    |  10 ---
 dpdk/dkms/create_deb_manifest.sh      |  28 --------
 dpdk/rpm/vpp-dpdk.spec                |  26 +++++++
 19 files changed, 244 insertions(+), 115 deletions(-)
 delete mode 100755 build-root/scripts/find-dpdk-contents
 create mode 100755 dpdk/deb/debian/compat
 create mode 100644 dpdk/deb/debian/control
 create mode 100644 dpdk/deb/debian/dkms/Makefile
 create mode 100755 dpdk/deb/debian/rules
 create mode 100644 dpdk/deb/debian/vpp-dpdk-dkms.dkms
 delete mode 100644 dpdk/dkms/Makefile
 delete mode 100755 dpdk/dkms/create_deb_manifest.sh
 create mode 100644 dpdk/rpm/vpp-dpdk.spec

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f1813a30..71eec082 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,12 @@ OS_ID        = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"
 OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 endif
 
+ifeq ($(OS_ID),ubuntu)
+PKG=deb
+else ifeq ($(OS_ID),centos)
+PKG=rpm
+endif
+
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
@@ -84,6 +90,7 @@ help:
 	@echo " run-vat             - run vpp-api-test tool"
 	@echo " pkg-deb             - build DEB packages"
 	@echo " pkg-rpm             - build RPM packages"
+	@echo " dpdk-install-dev    - install DPDK development packages"
 	@echo " ctags               - (re)generate ctags database"
 	@echo " gtags               - (re)generate gtags database"
 	@echo " cscope              - (re)generate cscope database"
@@ -295,6 +302,9 @@ pkg-deb:
 pkg-rpm: dist
 	$(call make,$(PLATFORM),install-rpm)
 
+dpdk-install-dev:
+	make -C dpdk install-$(PKG)
+
 ctags: ctags.files
 	@ctags --totals --tag-relative -L $<
 	@rm $<
@@ -340,26 +350,19 @@ define banner
 	@echo " "
 endef
 
-verify: install-dep $(BR)/.bootstrap.ok
+verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev
 	$(call banner,"Building for PLATFORM=vpp using gcc")
 	@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
 	$(call banner,"Building for PLATFORM=vpp_lite using gcc")
 	@make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
-ifeq ($(OS_ID),ubuntu)
-ifeq ($(OS_VERSION_ID),16.04)
+ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 	$(call banner,"Installing dependencies")
 	@sudo -E apt-get update
 	@sudo -E apt-get $(CONFIRM) $(FORCE) install clang
 	$(call banner,"Building for PLATFORM=vpp using clang")
 	@make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
 endif
-	$(call banner,"Building deb packages")
-	@make pkg-deb
-endif
-ifeq ($(OS_ID),centos)
-	$(call banner,"Building rpm packages")
-	@make pkg-rpm
-endif
-	@make test
+	$(call banner,"Building $(PKG) packages")
+	@make pkg-$(PKG)
 
 
diff --git a/build-data/packages/dpdk.mk b/build-data/packages/dpdk.mk
index 2dcf4093..6c136824 100644
--- a/build-data/packages/dpdk.mk
+++ b/build-data/packages/dpdk.mk
@@ -42,8 +42,8 @@ ifneq ($(DPDK_MAKE_EXTRA_ARGS),)
 DPDK_MAKE_ARGS += DPDK_MAKE_EXTRA_ARGS="$(DPDK_MAKE_EXTRA_ARGS)"
 endif
 
-dpdk_configure = echo 
+dpdk_configure = echo
 
-dpdk_make_args = $(DPDK_MAKE_ARGS) config
+dpdk_make_args = $(DPDK_MAKE_ARGS) ebuild-build
 
-dpdk_install =  make $(DPDK_MAKE_ARGS) build
+dpdk_install =  make $(DPDK_MAKE_ARGS) ebuild-install
diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index fe68cd82..81aeab69 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -19,8 +19,9 @@ vpp_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
 vpp_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
 else
 vpp_configure_depend += dpdk-install
-vpp_CPPFLAGS += $(call installed_includes_fn, dpdk)
+vpp_CPPFLAGS += $(call installed_includes_fn, dpdk)/dpdk
 vpp_LDFLAGS += $(call installed_libs_fn, dpdk)
+vpp_CPPFLAGS += -I/usr/include/dpdk
 endif
 ifeq ($($(PLATFORM)_uses_dpdk_cryptodev),yes)
 vpp_configure_args += --with-dpdk-crypto
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 41836750..2351898e 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -63,10 +63,6 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	./scripts/find-vpp-api-python-contents $(INSTALL_PREFIX)$(ARCH)	\
 	 deb/debian/vpp-api-python.install ;				\
 									\
-	: dpdk headers ;						\
-	./scripts/find-dpdk-contents $(INSTALL_PREFIX)$(ARCH)		\
-	 deb/debian/vpp-dpdk-dev.install ;				\
-									\
 	: bin package needs startup config ; 				\
 	echo ../../src/vpp/conf/startup.conf /etc/vpp 			\
 	   >> deb/debian/vpp.install ;					\
diff --git a/build-root/Makefile b/build-root/Makefile
index 6e26e90e..8b83990e 100644
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -1167,5 +1167,4 @@ distclean:
 	rm -rf $(MU_BUILD_ROOT_DIR)/python
 	if [ -e /usr/bin/dh ];then (cd $(MU_BUILD_ROOT_DIR)/deb/;debian/rules clean); fi
 	rm -f $(MU_BUILD_ROOT_DIR)/deb/debian/*.install
-	rm -f $(MU_BUILD_ROOT_DIR)/deb/debian/*.dkms
 	rm -f $(MU_BUILD_ROOT_DIR)/deb/debian/changelog
diff --git a/build-root/deb/debian/.gitignore b/build-root/deb/debian/.gitignore
index c5e915a8..7b1028d6 100644
--- a/build-root/deb/debian/.gitignore
+++ b/build-root/deb/debian/.gitignore
@@ -3,12 +3,9 @@ files
 *debhelper*
 *.substvars
 *.install
-vpp-dpdk-dkms*
 vpp/
 vpp-dev/
 vpp-lib/
-vpp-dpdk-dev/
-vpp-dpdk-dkms/
 vpp-dbg/
 vppctl/
 vpp-api-lua/
diff --git a/build-root/deb/debian/control b/build-root/deb/debian/control
index 6d26266a..e90cfca8 100644
--- a/build-root/deb/debian/control
+++ b/build-root/deb/debian/control
@@ -2,7 +2,7 @@ Source: vpp
 Section: net
 Priority: extra
 Maintainer: Cisco OpenVPP Packaging Team <bogus.address@cisco.com>
-Build-Depends: debhelper (>= 9), dkms, dh-systemd, dh-python, chrpath
+Build-Depends: debhelper (>= 9), dh-systemd, dh-python, chrpath
 Standards-Version: 3.9.4
 
 Package: vpp
@@ -26,14 +26,6 @@ Description: Vector Packet Processing--development support
  This package contains development support files for the VPP libraries
  .
 
-Package: vpp-dpdk-dev
-Architecture: any
-Depends: ${misc:Depends}
-Description: Vector Packet Processing--development support
- This package contains dpdk header files which match the dpdk version
- compiled into the vpp executable
- .
-
 Package: vpp-lib
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -41,7 +33,6 @@ Description: Vector Packet Processing--runtime libraries
  This package contains the VPP shared libraries, including:
  .
  vppinfra - foundation library supporting vectors, hashes, bitmaps, pools, and string formatting.
- dpdk - DPDK library
  svm - vm library
  vlib - vector processing library
  vlib-api - binary API library
@@ -54,12 +45,6 @@ Description: Vector Packet Processing--runtime plugins
  This package contains VPP plugins
  .
 
-Package: vpp-dpdk-dkms
-Architecture: any
-Depends: ${misc:Depends}
-Description: DPDK 2.1 igb_uio_driver
- This package contains Linux kernel modules distributed with DPDK.
-
 Package: vpp-api-lua
 Architecture: any
 Depends: ${misc:Depends}, vpp (= ${source:Version})
diff --git a/build-root/deb/debian/rules b/build-root/deb/debian/rules
index 4c84fc32..7046105c 100755
--- a/build-root/deb/debian/rules
+++ b/build-root/deb/debian/rules
@@ -18,7 +18,7 @@ include /usr/share/dpkg/default.mk
 
 # main packaging script based on dh7 syntax
 %:
-	dh $@ --with dkms --with systemd,python2
+	dh $@ --with systemd,python2
 
 override_dh_install:
 	dh_install --exclude .git
@@ -31,6 +31,3 @@ override_dh_shlibdeps:
 
 override_dh_strip:
 	dh_strip --dbg-package=vpp-dbg
-
-override_dh_dkms:
-	dh_dkms -pvpp-dpdk-dkms
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index b3a337b1..9e3ad11b 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -43,7 +43,6 @@ Group: System Environment/Libraries
 %description lib
 This package contains the VPP shared libraries, including:
 vppinfra - foundation library supporting vectors, hashes, bitmaps, pools, and string formatting.
-dpdk - DPDK library
 svm - vm library
 vlib - vector processing library
 vlib-api - binary API library
diff --git a/build-root/scripts/find-dpdk-contents b/build-root/scripts/find-dpdk-contents
deleted file mode 100755
index c7065139..00000000
--- a/build-root/scripts/find-dpdk-contents
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# includes
-rm -rf dpdk-includes
-mkdir dpdk-includes
-(cd $1/dpdk/include; tar cfh - . | (cd ../../../dpdk-includes; tar xf -))
-
-# If CDPATH is set, the "Change Directory" builtin (cd) will output the
-# destination directory when a relative path is passed as an argument.
-# In this case, this has the negative side effect of polluting the "paths"
-# variable with the destination directory, breaking the package generation.
-#
-#   Patient:  Doctor!  Doctor!  It hurts when I do this...
-#    Doctor:  Don't do that!
-#
-unset CDPATH
-paths=`cd dpdk-includes; find . -type f -print`
-rm -f $2
-
-for path in $paths
-do
-    dir=`dirname $path`
-    if [ $dir = "." ] ; then
-        echo ../dpdk-includes/$path /usr/include/vpp-dpdk >> $2
-    else
-        echo ../dpdk-includes/$path /usr/include/vpp-dpdk/$dir >> $2
-    fi
-done        
-
diff --git a/dpdk/Makefile b/dpdk/Makefile
index 82804f20..f6f90e0d 100644
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -27,6 +27,7 @@ DPDK_MLX5_PMD         ?= n
 B := $(DPDK_BUILD_DIR)
 I := $(DPDK_INSTALL_DIR)
 DPDK_VERSION ?= 16.11
+PKG_SUFFIX ?= vpp1
 DPDK_BASE_URL ?= http://fast.dpdk.org/rel
 DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.xz
 DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL)
@@ -81,11 +82,11 @@ endif
 DPDK_MAKE_ARGS := -C $(DPDK_SOURCE) -j $(JOBS) \
 	T=$(DPDK_TARGET) \
 	RTE_CONFIG_TEMPLATE=../custom-config \
-	RTE_OUTPUT=$(I) \
 	EXTRA_CFLAGS="$(DPDK_EXTRA_CFLAGS)" \
 	EXTRA_LDFLAGS="$(DPDK_EXTRA_LDFLAGS)" \
 	CPU_CFLAGS="$(DPDK_CPU_CFLAGS)" \
 	CPU_LDFLAGS="$(DPDK_CPU_LDFLAGS)" \
+	DESTDIR=$(I) \
         $(DPDK_MAKE_EXTRA_ARGS)
 
 DPDK_SOURCE_FILES := $(shell  [ -e $(DPDK_SOURCE) ] && find $(DPDK_SOURCE) -name "*.[chS]")  
@@ -140,7 +141,6 @@ $(B)/custom-config: $(B)/.patch.ok Makefile
 	@rm -f .config.ok
 
 $(CURDIR)/$(DPDK_TARBALL):
-	@mkdir -p $(B)
 	@if [ -e $(DPDK_DOWNLOAD_DIR)/$(DPDK_TARBALL) ] ; \
 		then cp $(DPDK_DOWNLOAD_DIR)/$(DPDK_TARBALL) $(CURDIR) ; \
 		else curl -o $(CURDIR)/$(DPDK_TARBALL) -LO $(DPDK_TAR_URL) ; \
@@ -148,6 +148,7 @@ $(CURDIR)/$(DPDK_TARBALL):
 	@rm -f $(B)/.download.ok
 
 $(B)/.download.ok: $(CURDIR)/$(DPDK_TARBALL)
+	@mkdir -p $(B)
 	@openssl md5 $< | cut -f 2 -d " " - > $(B)/$(DPDK_TARBALL).md5sum
 	@([ "$$(<$(B)/$(DPDK_TARBALL).md5sum)" = "$(DPDK_$(DPDK_VERSION)_TARBALL_MD5_CKSUM)" ] || \
 	( echo "Bad Checksum! Please remove $< and retry" && \
@@ -168,7 +169,7 @@ extract: $(B)/.extract.ok
 $(B)/.patch.ok: $(B)/.extract.ok
 ifneq ($(wildcard $(CURDIR)/dpdk-$(DPDK_VERSION)_patches/*.patch),)
 	@echo --- patching ---
-	for f in $(CURDIR)/dpdk-$(DPDK_VERSION)_patches/*.patch ; do \
+	@for f in $(CURDIR)/dpdk-$(DPDK_VERSION)_patches/*.patch ; do \
 		echo Applying patch: $$(basename $$f) ; \
 		patch -p1 -d $(DPDK_SOURCE) < $$f ; \
 	done
@@ -188,13 +189,130 @@ config: $(B)/.config.ok
 $(B)/.build.ok: $(DPDK_SOURCE_FILES)
 	@if [ ! -e $(B)/.config.ok ] ; then echo 'Please run "make config" first' && false ; fi
 	@make $(DPDK_MAKE_ARGS) install
-	@dkms/create_deb_manifest.sh $(DPDK_VERSION) $(subst $(realpath ..)/,,$(B))
 	@touch $@
 
 .PHONY: build
 build: $(B)/.build.ok
 
+.PHONY: install
+install: $(B)/.build.ok
+
 .PHONY: clean
 clean:
 	@rm -rf $(B) $(I)
 
+##############################################################################
+# .deb packaging
+##############################################################################
+
+DEB_ARCH=$(shell dpkg --print-architecture 2> /dev/null)
+DEV_DEB=vpp-dpdk-dev_$(DPDK_VERSION)-$(PKG_SUFFIX)_$(DEB_ARCH).deb
+INSTALLED_DEB_VER=$(shell dpkg-query --showformat='$${Version}' --show vpp-dpdk-dev 2> /dev/null)
+
+.PHONY: build-deb install-deb check-deb
+
+deb/debian/changelog: Makefile
+	@echo "vpp-dpdk ($(DPDK_VERSION)-$(PKG_SUFFIX)) unstable; urgency=low" > $@
+	@echo "" >> $@
+	@echo "  * DPDK Release $(DPDK_VERSION)" >> $@
+	@echo "" >> $@
+	@echo " -- VPP Dev <vpp-dev@lists.fd.io>  $(shell date -R)" >> $@
+
+$(DEV_DEB): deb/debian/changelog
+	@cd deb && dpkg-buildpackage -b -uc -us
+	git clean -fdx deb
+
+build-deb: $(DEV_DEB)
+
+install-deb:
+ifneq ($(INSTALLED_DEB_VER),$(DPDK_VERSION)-$(PKG_SUFFIX))
+	@make $(DEV_DEB)
+	@sudo dpkg -i $(DEV_DEB)
+else
+	@echo "=========================================================="
+	@echo " Up-to-date DPDK package already installed"
+	@echo "=========================================================="
+endif
+
+check-deb:
+ifneq ($(INSTALLED_DEB_VER),$(DPDK_VERSION)-$(PKG_SUFFIX))
+	@echo "=========================================================="
+	@echo " Outdated DPDK package detected:"
+	@echo "  Installed: vpp-dpdk-dev $(INSTALLED_DEB_VER)"
+	@echo "  Current:   vpp-dpdk-dev $(DPDK_VERSION)-$(PKG_SUFFIX)"
+	@echo ""
+	@echo " Please upgrade by invoking 'make dpdk-install-dev'"
+	@echo " from the top level directory."
+	@echo "=========================================================="
+endif
+
+##############################################################################
+# .rpm packaging
+##############################################################################
+
+RPM_ARCH=$(shell rpm --eval "%{_arch}" 2> /dev/null)
+DEV_RPM=vpp-dpdk-devel-$(DPDK_VERSION)-$(PKG_SUFFIX).$(RPM_ARCH).rpm
+INSTALLED_RPM_VER=$(shell rpm -q --queryformat '%{VERSION}-%{RELEASE}' vpp-dpdk-devel | grep -v "not inst")
+
+.PHONY: build-rpm install-rpm check-rpm
+
+$(DEV_RPM): Makefile rpm/vpp-dpdk.spec
+	@rpmbuild -bb \
+	  --define "_topdir $(CURDIR)/rpm" \
+	  --define "_version $(DPDK_VERSION)" \
+	  --define "_release $(PKG_SUFFIX)" \
+	  $(CURDIR)/rpm/vpp-dpdk.spec
+	mv rpm/RPMS/$(RPM_ARCH)/*.rpm .
+	git clean -fdx rpm
+
+build-rpm: $(DEV_RPM)
+
+install-rpm:
+ifneq ($(INSTALLED_RPM_VER),$(DPDK_VERSION)-$(PKG_SUFFIX))
+	@make $(DEV_RPM)
+	sudo rpm -Uih $(DEV_RPM)
+else
+	@echo "=========================================================="
+	@echo " Up-to-date DPDK package already installed"
+	@echo "=========================================================="
+endif
+
+check-rpm:
+ifneq ($(INSTALLED_RPM_VER),$(DPDK_VERSION)-$(PKG_SUFFIX))
+	@echo "=========================================================="
+	@echo " Outdated DPDK package detected:"
+	@echo "  Installed: vpp-dpdk-devel $(INSTALLED_RPM_VER)"
+	@echo "  Current:   vpp-dpdk-devel $(DPDK_VERSION)-$(PKG_SUFFIX)"
+	@echo ""
+	@echo " Please upgrade by invoking 'make dpdk-install-dev'"
+	@echo " from the top level directory."
+	@echo "=========================================================="
+endif
+
+##############################################################################
+# ebuild support
+##############################################################################
+
+.PHONY: ebuild-build ebuild-install
+
+ebuild-build:
+ifeq ($(INSTALLED_DEB_VER)$(INSTALLED_RPM_VER),)
+	@echo "=========================================================="
+	@echo "Building DPDK from source. Consider installing development"
+	@echo "package by invoking 'make dpdk-install-dev' from the"
+	@echo "top level directory"
+	@echo "=========================================================="
+	make config
+else
+ifneq ($(INSTALLED_DEB_VER),)
+	make check-deb
+endif
+ifneq ($(INSTALLED_RPM_VER),)
+	make check-rpm
+endif
+endif
+
+ebuild-install:
+ifeq ($(INSTALLED_DEB_VER)$(INSTALLED_RPM_VER),)
+	make install
+endif
diff --git a/dpdk/deb/debian/compat b/dpdk/deb/debian/compat
new file mode 100755
index 00000000..ec635144
--- /dev/null
+++ b/dpdk/deb/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/dpdk/deb/debian/control b/dpdk/deb/debian/control
new file mode 100644
index 00000000..9ffa1a0a
--- /dev/null
+++ b/dpdk/deb/debian/control
@@ -0,0 +1,18 @@
+Source: vpp-dpdk
+Section: net
+Priority: extra
+Maintainer: vpp-dev@lists.fd.io
+Build-Depends: debhelper (>= 9), dkms
+Standards-Version: 3.9.4
+
+Package: vpp-dpdk-dev
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: DPDK Development Package for VPP
+Conflicts: dpdk, dpdk-dev, libdpdk-dev
+
+Package: vpp-dpdk-dkms
+Architecture: any
+Depends: ${misc:Depends}
+Description: DPDK Development Package for VPP - Kernel Modules
+Conflicts: dpdk-igb-uio-dkms
diff --git a/dpdk/deb/debian/dkms/Makefile b/dpdk/deb/debian/dkms/Makefile
new file mode 100644
index 00000000..452c7c26
--- /dev/null
+++ b/dpdk/deb/debian/dkms/Makefile
@@ -0,0 +1,10 @@
+obj-m:=igb_uio.o
+
+CONFIG_MODULE_SIG=n
+
+EXTRA_CFLAGS += -Winline -I$(PWD)
+
+default:
+	    $(MAKE) -C /lib/modules/$(shell uname -r)/build M=$(shell pwd) modules
+clean:
+	    $(MAKE) -C /lib/modules/$(shell uname -r)/build M=$(shell pwd) clean
diff --git a/dpdk/deb/debian/rules b/dpdk/deb/debian/rules
new file mode 100755
index 00000000..98b1048b
--- /dev/null
+++ b/dpdk/deb/debian/rules
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+DH_VERBOSE = 1
+PKG=vpp-dpdk
+
+VERSION = $(shell dpkg-parsechangelog | sed -nr '/^Version:/s/Version: //p')
+BASE_VER = $(word 1, $(subst -, ,$(VERSION)))
+
+export DPDK_BUILD_DIR=$(CURDIR)/_build
+export DPDK_INSTALL_DIR=$(CURDIR)/debian/tmp/usr
+
+SRC=_build/dpdk-$(BASE_VER)
+
+MAKE_ARGS=-C ..
+
+include /usr/share/dpkg/default.mk
+
+%:
+	dh $@ --with dkms
+
+override_dh_clean:
+	make $(MAKE_ARGS) clean
+
+override_dh_auto_configure:
+	make $(MAKE_ARGS) config
+
+override_dh_install:
+	make $(MAKE_ARGS) install
+	dh_install -p$(PKG)-dkms \
+	  $(SRC)/lib/librte_eal/common/include/rte_pci_dev_feature_defs.h \
+	  $(SRC)/lib/librte_eal/common/include/rte_pci_dev_features.h     \
+	  $(SRC)/lib/librte_eal/linuxapp/igb_uio/igb_uio.c                \
+	  $(SRC)/lib/librte_eal/linuxapp/igb_uio/compat.h                 \
+	  debian/dkms/Makefile                                            \
+	  /usr/src/$(PKG)-dkms-$(VERSION)
+	dh_install -p$(PKG)-dev --autodest /usr
+
+override_dh_dkms:
+	dh_dkms -p$(PKG)-dkms -V $(VERSION)
diff --git a/dpdk/deb/debian/vpp-dpdk-dkms.dkms b/dpdk/deb/debian/vpp-dpdk-dkms.dkms
new file mode 100644
index 00000000..a166c313
--- /dev/null
+++ b/dpdk/deb/debian/vpp-dpdk-dkms.dkms
@@ -0,0 +1,8 @@
+PACKAGE_VERSION=#MODULE_VERSION#
+PACKAGE_NAME="vpp-dpdk-dkms"
+CLEAN="make clean"
+BUILT_MODULE_NAME[0]="igb_uio"
+BUILT_MODULE_LOCATION[0]="./"
+DEST_MODULE_LOCATION[0]="/kernel/net"
+MAKE[1]="make"
+AUTOINSTALL="yes"
diff --git a/dpdk/dkms/Makefile b/dpdk/dkms/Makefile
deleted file mode 100644
index 452c7c26..00000000
--- a/dpdk/dkms/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-obj-m:=igb_uio.o
-
-CONFIG_MODULE_SIG=n
-
-EXTRA_CFLAGS += -Winline -I$(PWD)
-
-default:
-	    $(MAKE) -C /lib/modules/$(shell uname -r)/build M=$(shell pwd) modules
-clean:
-	    $(MAKE) -C /lib/modules/$(shell uname -r)/build M=$(shell pwd) clean
diff --git a/dpdk/dkms/create_deb_manifest.sh b/dpdk/dkms/create_deb_manifest.sh
deleted file mode 100755
index f8305588..00000000
--- a/dpdk/dkms/create_deb_manifest.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-VER=$1
-DPDK_ROOT=../../$2/dpdk-${VER}
-DEBIAN_DIR=../build-root/deb/debian
-SRC_DIR=/usr/src/vpp-dpdk-dkms-${VER}/
-
-
-cat > ${DEBIAN_DIR}/vpp-dpdk-dkms.install << _EOF_
-${DPDK_ROOT}/lib/librte_eal/common/include/rte_pci_dev_feature_defs.h ${SRC_DIR}
-${DPDK_ROOT}/lib/librte_eal/common/include/rte_pci_dev_features.h     ${SRC_DIR}
-${DPDK_ROOT}/lib/librte_eal/linuxapp/igb_uio/igb_uio.c                ${SRC_DIR}
-${DPDK_ROOT}/lib/librte_eal/linuxapp/igb_uio/compat.h                 ${SRC_DIR}
-../../dpdk/dkms/Makefile ${SRC_DIR}
-_EOF_
-
-
-# dkms config
-cat > ${DEBIAN_DIR}/vpp-dpdk-dkms.dkms << _EOF_
-PACKAGE_VERSION="${VER}"
-PACKAGE_NAME="vpp-dpdk-dkms"
-CLEAN="make clean"
-BUILT_MODULE_NAME[0]="igb_uio"
-BUILT_MODULE_LOCATION[0]="./"
-DEST_MODULE_LOCATION[0]="/kernel/net"
-MAKE[1]="make"
-AUTOINSTALL="yes"
-_EOF_
diff --git a/dpdk/rpm/vpp-dpdk.spec b/dpdk/rpm/vpp-dpdk.spec
new file mode 100644
index 00000000..cc617681
--- /dev/null
+++ b/dpdk/rpm/vpp-dpdk.spec
@@ -0,0 +1,26 @@
+%define _make_args	-C ../.. DPDK_BUILD_DIR=%{_topdir}/tmp DPDK_INSTALL_DIR=%{buildroot}/usr
+
+Name:		vpp-dpdk
+Version:	%{_version}
+Release:	%{_release}
+Summary:	DPDK development packages for VPP
+License:	BSD
+
+%description
+
+%package devel
+Summary: 	DPDK development package for VPP
+Group: 		Development/Libraries
+
+%description devel
+
+%install
+make %{_make_args} config
+make %{_make_args} install
+
+%files devel
+/usr/bin/*
+/usr/include/dpdk
+/usr/lib/*
+/usr/sbin/*
+/usr/share/dpdk
-- 
cgit 1.2.3-korg


From 898171afd9c7d37bc223c6520edad54980ad12fb Mon Sep 17 00:00:00 2001
From: Gabriel Ganne <gabriel.ganne@qosmos.com>
Date: Mon, 23 Jan 2017 12:08:58 +0100
Subject: fix OS_ID test in root Makefile

fixup for 2ce7f9834ab55728520bff0dd15f8d82c10b95a0

redhat, centos -> rpm
debian, ubuntu -> deb

Change-Id: I0a07d3689b2bb5656d1bc688677680f83ac2e0bb
Signed-off-by: Gabriel Ganne <gabriel.ganne@qosmos.com>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 71eec082..2af63403 100644
--- a/Makefile
+++ b/Makefile
@@ -30,9 +30,9 @@ OS_ID        = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"
 OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 endif
 
-ifeq ($(OS_ID),ubuntu)
+ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
 PKG=deb
-else ifeq ($(OS_ID),centos)
+else ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
 PKG=rpm
 endif
 
-- 
cgit 1.2.3-korg


From 3ad7704fbb273440d649b96478e8e302d1285170 Mon Sep 17 00:00:00 2001
From: Dave Barach <dave@barachs.net>
Date: Wed, 4 Jan 2017 17:24:32 -0500
Subject: Prep work for Coverity upload processing via Jenkins

Change-Id: I2575d780d19e12ddf8a77e5596e5d7cc3dbf4233
Signed-off-by: Dave Barach <dave@barachs.net>
---
 Makefile                             |  4 +++
 build-data/platforms/vpp.mk          |  6 ++++
 build-root/scripts/coverity-build.sh | 53 ++++++++++++++++++++++++++++++++++++
 src/vppinfra/error.h                 | 10 +++++++
 4 files changed, 73 insertions(+)
 create mode 100755 build-root/scripts/coverity-build.sh

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 2af63403..1a01846b 100644
--- a/Makefile
+++ b/Makefile
@@ -75,6 +75,7 @@ help:
 	@echo " wipe-release        - wipe all products of release build "
 	@echo " build               - build debug binaries"
 	@echo " build-release       - build release binaries"
+	@echo " build-coverity      - build coverity artifacts"
 	@echo " rebuild             - wipe and build debug binares"
 	@echo " rebuild-release     - wipe and build release binares"
 	@echo " run                 - run debug binary"
@@ -287,6 +288,9 @@ run-release:
 debug:
 	$(call run, $(BR)/install-$(PLATFORM)_debug-native,$(GDB) $(GDB_ARGS) --args)
 
+build-coverity: 
+	$(call make,$(PLATFORM)_coverity,install-packages)
+
 debug-release:
 	$(call run, $(BR)/install-$(PLATFORM)-native,$(GDB) $(GDB_ARGS) --args)
 
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 5b200587..ee307639 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -70,3 +70,9 @@ vpp_gcov_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \
 	-fPIC -Werror -fprofile-arcs -ftest-coverage
 vpp_gcov_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \
 	-fPIC -Werror -coverage
+
+vpp_coverity_TAG_CFLAGS = -g -O2 -march=$(MARCH) -mtune=$(MTUNE) \
+	-fPIC -Werror -D__COVERITY__
+vpp_coverity_TAG_LDFLAGS = -g -O2 -march=$(MARCH) -mtune=$(MTUNE) \
+	-fPIC -Werror -D__COVERITY__ 
+
diff --git a/build-root/scripts/coverity-build.sh b/build-root/scripts/coverity-build.sh
new file mode 100755
index 00000000..6e2c405a
--- /dev/null
+++ b/build-root/scripts/coverity-build.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+set -ex
+
+token=${COVERITY_TOKEN}
+email=dbarach@cisco.com
+project="fd.io VPP"
+project_encoded="fd.io+VPP"
+url=https://scan.coverity.com
+
+export COV_HOST=$(hostname -f)
+export COV_USER=vpp
+
+# Location of various directories
+
+# run script from .../build-root
+
+build_dir=`pwd`
+covdir="${build_dir}/cov-int"
+COVTOOLS="${COVTOOLS-/scratch/cov-analysis-latest}"
+
+# Before we run the build, check that we can submit one
+check=$(curl -s --form project="${project}" \
+	--form token="${token}" "${url}/api/upload_permitted")
+if [ "${check}" = "Access denied" ]; then
+	echo "Bad token or project name."
+	exit 1
+fi
+if [ "${check}" != '{"upload_permitted":true}' ]; then
+	echo "Upload not permitted; stop now..."
+        exit 1
+fi
+
+version=$(git describe)
+
+# Run the build
+cd ..
+"${COVTOOLS}/bin/cov-build" --dir "${covdir}" make bootstrap build-coverity
+cd ${build_dir}
+
+# Tar the build artifacts that scan wants
+tar -czf fd.io-vpp.tgz "$(basename ${covdir})"
+# rm -rf "${covdir}"
+
+# Submit the build
+echo curl --form token="${token}" \
+	--form email="${email}" \
+	--form file=@fd.io-vpp.tgz \
+	--form version="${version}" \
+	--form description="master:${version}"  \
+	"${url}/builds?project=${project_encoded}"
+
+# All done!
diff --git a/src/vppinfra/error.h b/src/vppinfra/error.h
index 63d73af3..e51f938e 100644
--- a/src/vppinfra/error.h
+++ b/src/vppinfra/error.h
@@ -190,6 +190,16 @@ do {							\
   _error_assert;				\
 })
 
+/*
+ * If we're running under Coverity, don't die on
+ * failed static assertions.
+ */
+#ifdef __COVERITY__
+#ifndef _Static_assert
+#define _Static_assert(x,y)
+#endif
+#endif
+
 #endif /* included_error_h */
 
 /*
-- 
cgit 1.2.3-korg


From eb82e7f27c6f8fe84838e6e2914579825c455632 Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Wed, 1 Feb 2017 16:08:51 -0800
Subject: Fix issue with apt-get update not being run on Ubuntu 16.04

Change-Id: Ic05b86c4ea9b62afbf03a2a36c4a2ef45f5c140b
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1a01846b..b50d2039 100644
--- a/Makefile
+++ b/Makefile
@@ -162,8 +162,8 @@ ifeq ($(OS_ID),ubuntu)
 ifeq ($(OS_VERSION_ID),14.04)
 	@sudo -E apt-get $(CONFIRM) $(FORCE) install software-properties-common
 	@sudo -E add-apt-repository ppa:openjdk-r/ppa $(CONFIRM)
-	@sudo -E apt-get update
 endif
+	@sudo -E apt-get update
 	@sudo -E apt-get $(CONFIRM) $(FORCE) install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
-- 
cgit 1.2.3-korg


From 104543fa6a836df84b5b6d9b1909df3d5226a1e7 Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Fri, 3 Feb 2017 07:29:43 +0100
Subject: make test: improve test filtering

Implement fine-grained test filtering by supporting more complicated
filters beside the original file name suffix filter.

Change-Id: If5a166d08cffe8c58cc6cf174e6df861c34dbaa6
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 Makefile          |  2 +-
 test/Makefile     | 12 ++++++++--
 test/framework.py | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 81 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b50d2039..bbbb2acf 100644
--- a/Makefile
+++ b/Makefile
@@ -115,7 +115,7 @@ help:
 	@echo "                       startup.conf file is present"
 	@echo " GDB=<path>          - gdb binary to use for debugging"
 	@echo " PLATFORM=<name>     - target platform. default is vpp"
-	@echo " TEST=<name>         - only run specific test"
+	@echo " TEST=<filter>       - apply filter to test set, see test-help"
 	@echo ""
 	@echo "Current Argument Values:"
 	@echo " V            = $(V)"
diff --git a/test/Makefile b/test/Makefile
index 7a18be1d..5c0d48f0 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -35,7 +35,7 @@ $(PAPI_INSTALL_DONE): $(PIP_PATCH_DONE)
 	@touch $@
 
 define retest-func
-	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py discover -p test_$(TEST)\"*.py\""
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py discover -p test_\"*.py\""
 endef
 
 test: reset verify-python-path $(PAPI_INSTALL_DONE)
@@ -111,7 +111,15 @@ help:
 	@echo "    DEBUG=gdbserver   - run gdb inside a gdb server, otherwise "
 	@echo "                        same as above"
 	@echo " STEP=[yes|no]        - ease debugging by stepping through a testcase "
-	@echo " TEST=<name>          - only run specific test"
+	@echo " TEST=<filter>        - filter the set of tests:"
+	@echo "    by file-name      - only run tests from specified file, e.g. TEST=test_bfd selects all tests from test_bfd.py"
+	@echo "    by file-suffix    - same as file-name, but 'test_' is omitted e.g. TEST=bfd selects all tests from test_bfd.py"
+	@echo "    by wildcard       - wildcard filter is <file>.<class>.<test function>, each can be replaced by '*'"
+	@echo "                        e.g. TEST='test_bfd.*.*' is equivalent to above example of filter by file-name"
+	@echo "                             TEST='bfd.*.*' is equivalent to above example of filter by file-suffix"
+	@echo "                             TEST='bfd.BFDAPITestCase.*' selects all tests from test_bfd.py which are part of BFDAPITestCase class"
+	@echo "                             TEST='bfd.BFDAPITestCase.test_add_bfd' selects a single test named test_add_bfd from test_bfd.py/BFDAPITestCase"
+	@echo "                             TEST='*.*.test_add_bfd' selects all test functions named test_add_bfd from all files/classes"
 	@echo ""
 	@echo "Creating test documentation"
 	@echo " test-doc            - generate documentation for test framework"
diff --git a/test/framework.py b/test/framework.py
index 8ceb33c3..889a3046 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -698,7 +698,7 @@ class VppTestResult(unittest.TestResult):
 
 class VppTestRunner(unittest.TextTestRunner):
     """
-    A basic test runner implementation which prints results on standard error.
+    A basic test runner implementation which prints results to standard error.
     """
     @property
     def resultclass(self):
@@ -713,6 +713,67 @@ class VppTestRunner(unittest.TextTestRunner):
                                             verbosity, failfast, buffer,
                                             resultclass)
 
+    test_option = "TEST"
+
+    def parse_test_option(self):
+        try:
+            f = os.getenv(self.test_option)
+        except:
+            f = None
+        filter_file_name = None
+        filter_class_name = None
+        filter_func_name = None
+        if f:
+            if '.' in f:
+                parts = f.split('.')
+                if len(parts) > 3:
+                    raise Exception("Unrecognized %s option: %s" %
+                                    (self.test_option, f))
+                if len(parts) > 2:
+                    if parts[2] not in ('*', ''):
+                        filter_func_name = parts[2]
+                if parts[1] not in ('*', ''):
+                    filter_class_name = parts[1]
+                if parts[0] not in ('*', ''):
+                    if parts[0].startswith('test_'):
+                        filter_file_name = parts[0]
+                    else:
+                        filter_file_name = 'test_%s' % parts[0]
+            else:
+                if f.startswith('test_'):
+                    filter_file_name = f
+                else:
+                    filter_file_name = 'test_%s' % f
+        return filter_file_name, filter_class_name, filter_func_name
+
+    def filter_tests(self, tests, filter_file, filter_class, filter_func):
+        result = unittest.suite.TestSuite()
+        for t in tests:
+            if isinstance(t, unittest.suite.TestSuite):
+                # this is a bunch of tests, recursively filter...
+                x = self.filter_tests(t, filter_file, filter_class,
+                                      filter_func)
+                if x.countTestCases() > 0:
+                    result.addTest(x)
+            elif isinstance(t, unittest.TestCase):
+                # this is a single test
+                parts = t.id().split('.')
+                # t.id() for common cases like this:
+                # test_classifier.TestClassifier.test_acl_ip
+                # apply filtering only if it is so
+                if len(parts) == 3:
+                    if filter_file and filter_file != parts[0]:
+                        continue
+                    if filter_class and filter_class != parts[1]:
+                        continue
+                    if filter_func and filter_func != parts[2]:
+                        continue
+                result.addTest(t)
+            else:
+                # unexpected object, don't touch it
+                result.addTest(t)
+        return result
+
     def run(self, test):
         """
         Run the tests
@@ -721,4 +782,11 @@ class VppTestRunner(unittest.TextTestRunner):
 
         """
         print("Running tests using custom test runner")  # debug message
-        return super(VppTestRunner, self).run(test)
+        filter_file, filter_class, filter_func = self.parse_test_option()
+        print("Active filters: file=%s, class=%s, function=%s" % (
+            filter_file, filter_class, filter_func))
+        filtered = self.filter_tests(test, filter_file, filter_class,
+                                     filter_func)
+        print("%s out of %s tests match specified filters" % (
+            filtered.countTestCases(), test.countTestCases()))
+        return super(VppTestRunner, self).run(filtered)
-- 
cgit 1.2.3-korg


From 6ca42d333b247eaee4995a7f779a43759a81909e Mon Sep 17 00:00:00 2001
From: Radu Nicolau <radu.nicolau@intel.com>
Date: Thu, 16 Feb 2017 13:54:42 +0000
Subject: dpdk: updated build to automatically download Intel(R) Multi-Buffer
 Crypto for IPsec Library

Change-Id: I58182edb7b0d314bb6dfa1daf7b00012196fd3e1
Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
---
 Makefile        |  2 +-
 dpdk/Makefile   | 22 ++++++++++++++++++++++
 src/Makefile.am |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index bbbb2acf..8122c6a4 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ endif
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf
+DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf nasm
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else
diff --git a/dpdk/Makefile b/dpdk/Makefile
index bdd7993a..f8f1ca13 100644
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -33,6 +33,12 @@ DPDK_16.07_TARBALL_MD5_CKSUM := 690a2bb570103e58d12f9806e8bf21be
 DPDK_16.11_TARBALL_MD5_CKSUM := 06c1c577795360719d0b4fafaeee21e9
 DPDK_17.02_TARBALL_MD5_CKSUM := 6b9f7387c35641f4e8dbba3e528f2376
 DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION)
+ifeq ($(DPDK_CRYPTO_SW_PMD),y)
+AESNIMB_LIB_TARBALL := v0.44.tar.gz
+AESNIMB_LIB_TARBALL_URL := http://github.com/01org/intel-ipsec-mb/archive/$(AESNIMB_LIB_TARBALL)
+AESNIMB_LIB_SOURCE := $(B)/intel-ipsec-mb-0.44
+export AESNI_MULTI_BUFFER_LIB_PATH=$(AESNIMB_LIB_SOURCE)
+endif
 
 ifneq (,$(findstring clang,$(CC)))
 DPDK_CC=clang
@@ -144,6 +150,12 @@ $(CURDIR)/$(DPDK_TARBALL):
 		then cp $(DPDK_DOWNLOAD_DIR)/$(DPDK_TARBALL) $(CURDIR) ; \
 		else curl -o $(CURDIR)/$(DPDK_TARBALL) -LO $(DPDK_TAR_URL) ; \
 	fi
+ifeq ($(DPDK_CRYPTO_SW_PMD),y)
+	@if [ -e $(DPDK_DOWNLOAD_DIR)/$(AESNIMB_LIB_TARBALL) ] ; \
+		then cp $(DPDK_DOWNLOAD_DIR)/$(AESNIMB_LIB_TARBALL) $(CURDIR) ; \
+		else curl -o $(CURDIR)/$(AESNIMB_LIB_TARBALL) -LO $(AESNIMB_LIB_TARBALL_URL) ; \
+	fi
+endif
 	@rm -f $(B)/.download.ok
 
 $(B)/.download.ok: $(CURDIR)/$(DPDK_TARBALL)
@@ -160,6 +172,10 @@ download: $(B)/.download.ok
 $(B)/.extract.ok: $(B)/.download.ok
 	@echo --- extracting $(DPDK_TARBALL) ---
 	@tar --directory $(B) --extract --file $(CURDIR)/$(DPDK_TARBALL)
+ifeq ($(DPDK_CRYPTO_SW_PMD),y)
+	@echo --- extracting $(AESNIMB_LIB_TARBALL) ---
+	@tar --directory $(B) --extract --file $(CURDIR)/$(AESNIMB_LIB_TARBALL)
+endif
 	@touch $@
 
 .PHONY: extract
@@ -179,6 +195,9 @@ endif
 patch: $(B)/.patch.ok
 
 $(B)/.config.ok: $(B)/.patch.ok $(B)/custom-config
+ifeq ($(DPDK_CRYPTO_SW_PMD),y)
+	@make -C $(AESNIMB_LIB_SOURCE)
+endif
 	@make $(DPDK_MAKE_ARGS) config
 	@touch $@
 
@@ -188,6 +207,9 @@ config: $(B)/.config.ok
 $(B)/.build.ok: $(DPDK_SOURCE_FILES)
 	@if [ ! -e $(B)/.config.ok ] ; then echo 'Please run "make config" first' && false ; fi
 	@make $(DPDK_MAKE_ARGS) install
+ifeq ($(DPDK_CRYPTO_SW_PMD),y)
+	@cp $(AESNIMB_LIB_SOURCE)/libIPSec_MB.a $(I)/lib/
+endif
 	@touch $@
 
 .PHONY: build
diff --git a/src/Makefile.am b/src/Makefile.am
index 7da86fcb..a0e62dbd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,7 @@ else
 DPDK_LD_FLAGS = -Wl,--whole-archive,-l:libdpdk.a,--no-whole-archive,-lm,-ldl
 endif
 if WITH_DPDK_CRYPTO_SW
-DPDK_LD_ADD = -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB
+DPDK_LD_ADD = -lIPSec_MB
 endif
 if WITH_DPDK_MLX5_PMD
 DPDK_LD_FLAGS += -libverbs -lmlx5 -lnuma
-- 
cgit 1.2.3-korg


From 974cdc6faacc49ef393eeea6e4c9643f767d2792 Mon Sep 17 00:00:00 2001
From: Filip Tehlar <ftehlar@cisco.com>
Date: Wed, 22 Feb 2017 18:09:49 +0100
Subject: Fix LISP and ONE crc marcos

Change-Id: Icd0dba04d8929456228136d1f25c459bffcc6a7a
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
---
 Makefile                    |  1 +
 src/vnet/lisp-cp/lisp_api.c |  2 +-
 src/vnet/lisp-cp/one.api    | 19 +++++++++++++++++--
 src/vnet/lisp-cp/one_api.c  | 16 ++++++++--------
 4 files changed, 27 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8122c6a4..9161a384 100644
--- a/Makefile
+++ b/Makefile
@@ -368,5 +368,6 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 endif
 	$(call banner,"Building $(PKG) packages")
 	@make pkg-$(PKG)
+	@make test
 
 
diff --git a/src/vnet/lisp-cp/lisp_api.c b/src/vnet/lisp-cp/lisp_api.c
index 6a8b4cc9..d91f9907 100644
--- a/src/vnet/lisp-cp/lisp_api.c
+++ b/src/vnet/lisp-cp/lisp_api.c
@@ -1278,7 +1278,7 @@ static void
 setup_message_id_table (api_main_t * am)
 {
 #define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_one;
+  foreach_vl_msg_name_crc_lisp;
 #undef _
 }
 
diff --git a/src/vnet/lisp-cp/one.api b/src/vnet/lisp-cp/one.api
index 38937a3e..14f6d47f 100644
--- a/src/vnet/lisp-cp/one.api
+++ b/src/vnet/lisp-cp/one.api
@@ -13,6 +13,13 @@
  * limitations under the License.
  */
 
+typeonly manual_print manual_endian define one_local_locator
+{
+  u32 sw_if_index;
+  u8 priority;
+  u8 weight;
+};
+
 /** \brief add or delete locator_set
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -28,7 +35,7 @@ manual_endian manual_print define one_add_del_locator_set
   u8 is_add;
   u8 locator_set_name[64];
   u32 locator_num;
-  vl_api_local_locator_t locators[locator_num];
+  vl_api_one_local_locator_t locators[locator_num];
 };
 
 /** \brief Reply for locator_set add/del
@@ -398,6 +405,14 @@ define show_one_map_request_mode_reply
   u8 mode;
 };
 
+typeonly manual_endian manual_print define one_remote_locator
+{
+  u8 is_ip4;
+  u8 priority;
+  u8 weight;
+  u8 addr[16];
+};
+
 /** \brief add or delete remote static mapping
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -430,7 +445,7 @@ manual_print manual_endian define one_add_del_remote_mapping
   u8 seid[16];
   u8 seid_len;
   u32 rloc_num;
-  vl_api_remote_locator_t rlocs[rloc_num];
+  vl_api_one_remote_locator_t rlocs[rloc_num];
 };
 
 /** \brief Reply for one_add_del_remote_mapping
diff --git a/src/vnet/lisp-cp/one_api.c b/src/vnet/lisp-cp/one_api.c
index 8fdf0821..d0a9309b 100644
--- a/src/vnet/lisp-cp/one_api.c
+++ b/src/vnet/lisp-cp/one_api.c
@@ -27,10 +27,10 @@
 
 #include <vnet/vnet_msg_enum.h>
 
-#define vl_api_remote_locator_t_endian vl_noop_handler
-#define vl_api_remote_locator_t_print vl_noop_handler
-#define vl_api_local_locator_t_endian vl_noop_handler
-#define vl_api_local_locator_t_print vl_noop_handler
+#define vl_api_one_remote_locator_t_endian vl_noop_handler
+#define vl_api_one_remote_locator_t_print vl_noop_handler
+#define vl_api_one_local_locator_t_endian vl_noop_handler
+#define vl_api_one_local_locator_t_print vl_noop_handler
 
 #define vl_api_one_add_del_locator_set_t_endian vl_noop_handler
 #define vl_api_one_add_del_locator_set_t_print vl_noop_handler
@@ -92,11 +92,11 @@ _(ONE_USE_PETR, one_use_petr)                                           \
 _(SHOW_ONE_USE_PETR, show_one_use_petr)                                 \
 
 static locator_t *
-unformat_one_locs (vl_api_remote_locator_t * rmt_locs, u32 rloc_num)
+unformat_one_locs (vl_api_one_remote_locator_t * rmt_locs, u32 rloc_num)
 {
   u32 i;
   locator_t *locs = 0, loc;
-  vl_api_remote_locator_t *r;
+  vl_api_one_remote_locator_t *r;
 
   for (i = 0; i < rloc_num; i++)
     {
@@ -121,7 +121,7 @@ vl_api_one_add_del_locator_set_t_handler (vl_api_one_add_del_locator_set_t *
   int rv = 0;
   vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
   locator_t locator;
-  vl_api_local_locator_t *ls_loc;
+  vl_api_one_local_locator_t *ls_loc;
   u32 ls_index = ~0, locator_num;
   u8 *locator_name = NULL;
   int i;
@@ -1271,7 +1271,7 @@ static void
 setup_message_id_table (api_main_t * am)
 {
 #define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_lisp;
+  foreach_vl_msg_name_crc_one;
 #undef _
 }
 
-- 
cgit 1.2.3-korg


From 871349371a62f1f20b159b6afead8e84f8a2322b Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Tue, 7 Mar 2017 11:39:27 +0100
Subject: make test: split into basic and extended tests

Implement plumbing to allow decorating tests as extended, e.g.:

@unittest.skipUnless(running_extended_tests(), "part of extended tests")

both methods and classes can be decorated this way.

Change make test and make test-debug to run only non-extended tests.
Introduce make test-all and make test-all-debug to run the full suite.
Run full suite as part of make verify.
Decorate most BFD tests as extended.

Change-Id: I3bc64f59e9fe238f7f767d7e043dc165d03e9dfa
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 Makefile          | 17 ++++++++++++++---
 test/Makefile     |  6 ++++--
 test/framework.py | 30 +++++++++++++++++++++++++++---
 test/test_bfd.py  | 35 +++++++++++++++++++++++++++++++++--
 4 files changed, 78 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 9161a384..7faba3b6 100644
--- a/Makefile
+++ b/Makefile
@@ -82,8 +82,10 @@ help:
 	@echo " run-release         - run release binary"
 	@echo " debug               - run debug binary with debugger"
 	@echo " debug-release       - run release binary with debugger"
-	@echo " test                - build and run functional tests"
-	@echo " test-debug          - build and run functional tests (debug build)"
+	@echo " test                - build and run (basic) functional tests"
+	@echo " test-debug          - build and run (basic) functional tests (debug build)"
+	@echo " test-all            - build and run (all) functional tests"
+	@echo " test-all-debug      - build and run (all) functional tests (debug build)"
 	@echo " test-wipe           - wipe files generated by unit tests"
 	@echo " retest              - run functional tests"
 	@echo " retest-debug        - run functional tests (debug build)"
@@ -221,6 +223,7 @@ define test
 	  VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
 	  VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
 	  LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \
+	  EXTENDED_TESTS=$(EXTENDED_TESTS) \
 	  $(3)
 endef
 
@@ -230,6 +233,14 @@ test: bootstrap
 test-debug: bootstrap
 	$(call test,vpp_lite,vpp_lite_debug,test)
 
+test-all: bootstrap
+	$(eval EXTENDED_TESTS=yes)
+	$(call test,vpp_lite,vpp_lite,test)
+
+test-all-debug: bootstrap
+	$(eval EXTENDED_TESTS=yes)
+	$(call test,vpp_lite,vpp_lite_debug,test)
+
 test-help:
 	@make -C test help
 
@@ -368,6 +379,6 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 endif
 	$(call banner,"Building $(PKG) packages")
 	@make pkg-$(PKG)
-	@make test
+	@make test-all
 
 
diff --git a/test/Makefile b/test/Makefile
index 52980b9e..1bb3c6c2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -119,8 +119,10 @@ checkstyle: verify-python-path
 help:
 	@echo "Running tests:"
 	@echo ""
-	@echo " test                - build and run functional tests"
-	@echo " test-debug          - build and run functional tests (debug build)"
+	@echo " test                - build and run (basic) functional tests"
+	@echo " test-debug          - build and run (basic) functional tests (debug build)"
+	@echo " test-all            - build and run (all) functional tests"
+	@echo " test-all-debug      - build and run (all) functional tests (debug build)"
 	@echo " retest              - run functional tests"
 	@echo " retest-debug        - run functional tests (debug build)"
 	@echo " test-wipe           - wipe (temporary) files generated by unit tests"
diff --git a/test/framework.py b/test/framework.py
index b7e6b4a0..6b1799a5 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -78,6 +78,15 @@ def pump_output(testclass):
         # of properly terminating the loop
 
 
+def running_extended_tests():
+    try:
+        s = os.getenv("EXTENDED_TESTS")
+        return True if s.lower() in ("y", "yes", "1") else False
+    except:
+        return False
+    return False
+
+
 class VppTestCase(unittest.TestCase):
     """This subclass is a base class for VPP test cases that are implemented as
     classes. It provides methods to create and run test case.
@@ -230,9 +239,6 @@ class VppTestCase(unittest.TestCase):
         cls.verbose = 0
         cls.vpp_dead = False
         cls.registry = VppObjectRegistry()
-        print(double_line_delim)
-        print(colorize(getdoc(cls).splitlines()[0], YELLOW))
-        print(double_line_delim)
         # need to catch exceptions here because if we raise, then the cleanup
         # doesn't get called and we might end with a zombie vpp
         try:
@@ -613,6 +619,22 @@ class VppTestCase(unittest.TestCase):
         time.sleep(timeout)
 
 
+class TestCasePrinter(object):
+    _shared_state = {}
+
+    def __init__(self):
+        self.__dict__ = self._shared_state
+        if not hasattr(self, "_test_case_set"):
+            self._test_case_set = set()
+
+    def print_test_case_heading_if_first_time(self, case):
+        if case.__class__ not in self._test_case_set:
+            print(double_line_delim)
+            print(colorize(getdoc(case.__class__).splitlines()[0], YELLOW))
+            print(double_line_delim)
+            self._test_case_set.add(case.__class__)
+
+
 class VppTestResult(unittest.TestResult):
     """
     @property result_string
@@ -641,6 +663,7 @@ class VppTestResult(unittest.TestResult):
         self.descriptions = descriptions
         self.verbosity = verbosity
         self.result_string = None
+        self.printer = TestCasePrinter()
 
     def addSuccess(self, test):
         """
@@ -740,6 +763,7 @@ class VppTestResult(unittest.TestResult):
         :param test:
 
         """
+        self.printer.print_test_case_heading_if_first_time(test)
         unittest.TestResult.startTest(self, test)
         if self.verbosity > 0:
             self.stream.writeln(
diff --git a/test/test_bfd.py b/test/test_bfd.py
index e7ebb214..5460a2b5 100644
--- a/test/test_bfd.py
+++ b/test/test_bfd.py
@@ -15,7 +15,7 @@ from scapy.layers.inet import UDP, IP
 from scapy.layers.inet6 import IPv6
 from bfd import VppBFDAuthKey, BFD, BFDAuthType, VppBFDUDPSession, \
     BFDDiagCode, BFDState, BFD_vpp_echo
-from framework import VppTestCase, VppTestRunner
+from framework import VppTestCase, VppTestRunner, running_extended_tests
 from vpp_pg_interface import CaptureTimeoutError
 from util import ppp
 from vpp_papi_provider import UnexpectedApiReturnValueError
@@ -40,6 +40,7 @@ class AuthKeyFactory(object):
                              conf_key_id=conf_key_id, key=key)
 
 
+@unittest.skipUnless(running_extended_tests(), "part of extended tests")
 class BFDAPITestCase(VppTestCase):
     """Bidirectional Forwarding Detection (BFD) - API"""
 
@@ -692,6 +693,7 @@ class BFD4TestCase(VppTestCase):
         bfd_session_up(self)
         bfd_session_down(self)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_hold_up(self):
         """ hold BFD session up """
         bfd_session_up(self)
@@ -701,6 +703,7 @@ class BFD4TestCase(VppTestCase):
         self.assert_equal(len(self.vapi.collect_events()), 0,
                           "number of bfd events")
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_slow_timer(self):
         """ verify slow periodic control frames while session down """
         packet_count = 3
@@ -715,6 +718,7 @@ class BFD4TestCase(VppTestCase):
                 time_diff, 0.70, 1.05, "time between slow packets")
             prev_packet = next_packet
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_zero_remote_min_rx(self):
         """ no packets when zero remote required min rx interval """
         bfd_session_up(self)
@@ -739,6 +743,7 @@ class BFD4TestCase(VppTestCase):
         self.assert_equal(
             len(self.vapi.collect_events()), 0, "number of bfd events")
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_conn_down(self):
         """ verify session goes down after inactivity """
         bfd_session_up(self)
@@ -748,6 +753,7 @@ class BFD4TestCase(VppTestCase):
         e = self.vapi.wait_for_event(1, "bfd_udp_session_details")
         verify_event(self, e, expected_state=BFDState.down)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_large_required_min_rx(self):
         """ large remote required min rx interval """
         bfd_session_up(self)
@@ -777,6 +783,7 @@ class BFD4TestCase(VppTestCase):
                 break
         self.assert_equal(count, 0, "number of packets received")
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_immediate_remote_min_rx_reduction(self):
         """ immediately honor remote required min rx reduction """
         self.vpp_session.remove_vpp_config()
@@ -809,6 +816,7 @@ class BFD4TestCase(VppTestCase):
                                  "time between BFD packets")
             reference_packet = p
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_modify_req_min_rx_double(self):
         """ modify session - double required min rx """
         bfd_session_up(self)
@@ -838,6 +846,7 @@ class BFD4TestCase(VppTestCase):
         self.assert_in_range(time_to_event, .9 * timeout,
                              1.1 * timeout, "session timeout")
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_modify_req_min_rx_halve(self):
         """ modify session - halve required min rx """
         self.vpp_session.modify_parameters(
@@ -878,6 +887,7 @@ class BFD4TestCase(VppTestCase):
                              "time before bfd session goes down")
         verify_event(self, e, expected_state=BFDState.down)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_modify_detect_mult(self):
         """ modify detect multiplier """
         bfd_session_up(self)
@@ -901,6 +911,7 @@ class BFD4TestCase(VppTestCase):
         self.assertNotIn("P", p.sprintf("%BFD.flags%"),
                          "Poll bit not set in BFD packet")
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_queued_poll(self):
         """ test poll sequence queueing """
         bfd_session_up(self)
@@ -966,6 +977,7 @@ class BFD4TestCase(VppTestCase):
         self.assertNotIn("P", p.sprintf("%BFD.flags%"),
                          "Poll bit set in BFD packet")
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_poll_response(self):
         """ test correct response to control frame with poll bit set """
         bfd_session_up(self)
@@ -976,6 +988,7 @@ class BFD4TestCase(VppTestCase):
             self, pcap_time_min=time.time() - self.vpp_clock_offset)
         self.assertIn("F", final.sprintf("%BFD.flags%"))
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_no_periodic_if_remote_demand(self):
         """ no periodic frames outside poll sequence if remote demand set """
         bfd_session_up(self)
@@ -1093,6 +1106,7 @@ class BFD4TestCase(VppTestCase):
                                   "number of bfd events")
             self.test_session.send_packet()
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_echo_fail(self):
         """ session goes down if echo function fails """
         bfd_session_up(self)
@@ -1132,6 +1146,7 @@ class BFD4TestCase(VppTestCase):
         self.assert_equal(events[0].state, BFDState.down, BFDState)
         self.assertTrue(verified_diag, "Incorrect diagnostics code received")
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_echo_stop(self):
         """ echo function stops if peer sets required min echo rx zero """
         bfd_session_up(self)
@@ -1162,6 +1177,7 @@ class BFD4TestCase(VppTestCase):
             events = self.vapi.collect_events()
             self.assert_equal(len(events), 0, "number of bfd events")
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_echo_source_removed(self):
         """ echo function stops if echo source is removed """
         bfd_session_up(self)
@@ -1192,6 +1208,7 @@ class BFD4TestCase(VppTestCase):
             events = self.vapi.collect_events()
             self.assert_equal(len(events), 0, "number of bfd events")
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_stale_echo(self):
         """ stale echo packets don't keep a session up """
         bfd_session_up(self)
@@ -1243,6 +1260,7 @@ class BFD4TestCase(VppTestCase):
             self.test_session.send_packet()
         self.assertTrue(timeout_ok, "Expected timeout event didn't occur")
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_invalid_echo_checksum(self):
         """ echo packets with invalid checksum don't keep a session up """
         bfd_session_up(self)
@@ -1291,6 +1309,7 @@ class BFD4TestCase(VppTestCase):
             self.test_session.send_packet()
         self.assertTrue(timeout_ok, "Expected timeout event didn't occur")
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_admin_up_down(self):
         """ put session admin-up and admin-down """
         bfd_session_up(self)
@@ -1328,6 +1347,7 @@ class BFD4TestCase(VppTestCase):
         e = self.vapi.wait_for_event(1, "bfd_udp_session_details")
         verify_event(self, e, expected_state=BFDState.up)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_config_change_remote_demand(self):
         """ configuration change while peer in demand mode """
         bfd_session_up(self)
@@ -1445,6 +1465,7 @@ class BFD6TestCase(VppTestCase):
         self.test_session.send_packet()
         self.assert_equal(self.vpp_session.state, BFDState.up, BFDState)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_hold_up(self):
         """ hold BFD session up """
         bfd_session_up(self)
@@ -1502,6 +1523,7 @@ class BFD6TestCase(VppTestCase):
         self.assert_equal(udp_sport_tx, udp_sport_rx, "UDP source port (== "
                           "ECHO packet identifier for test purposes)")
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_echo(self):
         """ echo function used """
         bfd_session_up(self)
@@ -1596,6 +1618,7 @@ class BFDSHA1TestCase(VppTestCase):
             bfd_key_id=self.vpp_session.bfd_key_id)
         bfd_session_up(self)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_hold_up(self):
         """ hold BFD session up """
         key = self.factory.create_random_key(self)
@@ -1614,6 +1637,7 @@ class BFDSHA1TestCase(VppTestCase):
             self.test_session.send_packet()
         self.assert_equal(self.vpp_session.state, BFDState.up, BFDState)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_hold_up_meticulous(self):
         """ hold BFD session up - meticulous auth """
         key = self.factory.create_random_key(
@@ -1635,6 +1659,7 @@ class BFDSHA1TestCase(VppTestCase):
             self.test_session.send_packet()
         self.assert_equal(self.vpp_session.state, BFDState.up, BFDState)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_send_bad_seq_number(self):
         """ session is not kept alive by msgs with bad sequence numbers"""
         key = self.factory.create_random_key(
@@ -1697,6 +1722,7 @@ class BFDSHA1TestCase(VppTestCase):
         wait_for_bfd_packet(self)
         self.assert_equal(self.vpp_session.state, BFDState.up, BFDState)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_mismatch_auth(self):
         """ session is not brought down by unauthenticated msg """
         key = self.factory.create_random_key(self)
@@ -1711,6 +1737,7 @@ class BFDSHA1TestCase(VppTestCase):
                                             legitimate_test_session,
                                             rogue_test_session)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_mismatch_bfd_key_id(self):
         """ session is not brought down by msg with non-existent key-id """
         key = self.factory.create_random_key(self)
@@ -1730,6 +1757,7 @@ class BFDSHA1TestCase(VppTestCase):
                                             legitimate_test_session,
                                             rogue_test_session)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_mismatched_auth_type(self):
         """ session is not brought down by msg with wrong auth type """
         key = self.factory.create_random_key(self)
@@ -1746,6 +1774,7 @@ class BFDSHA1TestCase(VppTestCase):
             vpp_session, legitimate_test_session, rogue_test_session,
             {'auth_type': BFDAuthType.keyed_md5})
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_restart(self):
         """ simulate remote peer restart and resynchronization """
         key = self.factory.create_random_key(
@@ -1761,7 +1790,7 @@ class BFDSHA1TestCase(VppTestCase):
         # don't send any packets for 2*detection_time
         detection_time = self.test_session.detect_mult *\
             self.vpp_session.required_min_rx / USEC_IN_SEC
-        self.sleep(2*detection_time, "simulating peer restart")
+        self.sleep(2 * detection_time, "simulating peer restart")
         events = self.vapi.collect_events()
         self.assert_equal(len(events), 1, "number of bfd events")
         verify_event(self, events[0], expected_state=BFDState.down)
@@ -1774,6 +1803,7 @@ class BFDSHA1TestCase(VppTestCase):
         bfd_session_up(self)
 
 
+@unittest.skipUnless(running_extended_tests(), "part of extended tests")
 class BFDAuthOnOffTestCase(VppTestCase):
     """Bidirectional Forwarding Detection (BFD) (changing auth) """
 
@@ -1981,6 +2011,7 @@ class BFDAuthOnOffTestCase(VppTestCase):
                           "number of bfd events")
 
 
+@unittest.skipUnless(running_extended_tests(), "part of extended tests")
 class BFDCLITestCase(VppTestCase):
     """Bidirectional Forwarding Detection (BFD) (CLI) """
     pg0 = None
-- 
cgit 1.2.3-korg


From a86e289570dfb7e02c47bed023c0669f3804a8bd Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Thu, 9 Mar 2017 08:01:52 +0100
Subject: make test: add make test-shell[-debug] targets

This starts a bash with the same environment as the test framework
uses, allowing easy debugging.

Change-Id: I956deda913b73dae5b1e1976417834ae4731f88a
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 Makefile      |  8 ++++++++
 test/Makefile | 13 +++++++++++++
 2 files changed, 21 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7faba3b6..f0173cc1 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,8 @@ help:
 	@echo " test-debug          - build and run (basic) functional tests (debug build)"
 	@echo " test-all            - build and run (all) functional tests"
 	@echo " test-all-debug      - build and run (all) functional tests (debug build)"
+	@echo " test-shell          - enter shell with test environment"
+	@echo " test-shell-debug    - enter shell with test environment (debug build)"
 	@echo " test-wipe           - wipe files generated by unit tests"
 	@echo " retest              - run functional tests"
 	@echo " retest-debug        - run functional tests (debug build)"
@@ -247,6 +249,12 @@ test-help:
 test-wipe:
 	@make -C test wipe
 
+test-shell: bootstrap
+	$(call test,vpp_lite,vpp_lite,shell)
+
+test-shell-debug: bootstrap
+	$(call test,vpp_lite,vpp_lite_debug,shell)
+
 test-doc:
 	@make -C test doc
 
diff --git a/test/Makefile b/test/Makefile
index 1bb3c6c2..02149803 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -68,6 +68,17 @@ test: verify-python-path verify-no-running-vpp reset $(PAPI_INSTALL_DONE)
 retest: verify-python-path verify-no-running-vpp reset
 	$(call retest-func)
 
+shell: verify-python-path $(PAPI_INSTALL_DONE)
+	@echo "source $(PYTHON_VENV_PATH)/bin/activate;\
+		echo '***';\
+		echo VPP_TEST_BUILD_DIR=$(VPP_TEST_BUILD_DIR);\
+		echo VPP_TEST_BIN=$(VPP_TEST_BIN);\
+		echo VPP_TEST_PLUGIN_PATH=$(VPP_TEST_PLUGIN_PATH);\
+		echo VPP_TEST_INSTALL_PATH=$(VPP_TEST_INSTALL_PATH);\
+		echo LD_LIBRARY_PATH=$(LD_LIBRARY_PATH);\
+		echo '***';\
+		exec </dev/tty" | bash -i
+
 .PHONY: wipe doc
 
 reset:
@@ -126,6 +137,8 @@ help:
 	@echo " retest              - run functional tests"
 	@echo " retest-debug        - run functional tests (debug build)"
 	@echo " test-wipe           - wipe (temporary) files generated by unit tests"
+	@echo " test-shell          - enter shell with test environment"
+	@echo " test-shell-debug    - enter shell with test environment (debug build)"
 	@echo ""
 	@echo "Arguments controlling test runs:"
 	@echo " V=[0|1|2]            - set test verbosity level"
-- 
cgit 1.2.3-korg


From 374e2c5fc30a5bfabfd2eb6c2d3ca5797402af16 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Thu, 9 Mar 2017 20:38:15 +0100
Subject: Retire vpp_lite

vpp_lite platform is not needed anymore as same efect can be
achieved with following startup.conf config:

plugins {
	plugin dpdk_plugin.so { disable }
}

Change-Id: I690ea8ceb1c6e1fe32e01e7da54e9958019a93bf
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                                        |   16 +-
 build-data/platforms/vpp.mk                     |    5 -
 build-data/platforms/vpp_lite.mk                |   50 -
 src/configure.ac                                |    4 +-
 src/plugins/Makefile.am                         |    6 +-
 src/plugins/ixge.am                             |   20 +
 src/plugins/ixge/ixge.c                         | 2947 +++++++++++++++++++++++
 src/plugins/ixge/ixge.h                         | 1293 ++++++++++
 src/vlib/buffer.c                               |    6 +
 src/vnet.am                                     |   14 +-
 src/vnet/devices/nic/ixge.c                     | 2938 ----------------------
 src/vnet/devices/nic/ixge.h                     | 1293 ----------
 src/vnet/devices/nic/sfp.c                      |  117 -
 src/vnet/devices/nic/sfp.h                      |  117 -
 src/vnet/ethernet/sfp.c                         |  117 +
 src/vnet/ethernet/sfp.h                         |  117 +
 src/vpp-api/lua/bench.lua                       |    4 +-
 src/vpp-api/lua/examples/cli/lua-cli.lua        |    4 +-
 src/vpp-api/lua/examples/example-classifier.lua |    4 +-
 src/vpp-api/lua/examples/example-cli.lua        |    4 +-
 src/vpp/vnet/main.c                             |    3 -
 test/framework.py                               |    4 +-
 22 files changed, 4529 insertions(+), 4554 deletions(-)
 delete mode 100644 build-data/platforms/vpp_lite.mk
 create mode 100644 src/plugins/ixge.am
 create mode 100644 src/plugins/ixge/ixge.c
 create mode 100644 src/plugins/ixge/ixge.h
 delete mode 100644 src/vnet/devices/nic/ixge.c
 delete mode 100644 src/vnet/devices/nic/ixge.h
 delete mode 100644 src/vnet/devices/nic/sfp.c
 delete mode 100644 src/vnet/devices/nic/sfp.h
 create mode 100644 src/vnet/ethernet/sfp.c
 create mode 100644 src/vnet/ethernet/sfp.h

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f0173cc1..1527d60a 100644
--- a/Makefile
+++ b/Makefile
@@ -230,18 +230,18 @@ define test
 endef
 
 test: bootstrap
-	$(call test,vpp_lite,vpp_lite,test)
+	$(call test,vpp,vpp,test)
 
 test-debug: bootstrap
-	$(call test,vpp_lite,vpp_lite_debug,test)
+	$(call test,vpp,vpp_debug,test)
 
 test-all: bootstrap
 	$(eval EXTENDED_TESTS=yes)
-	$(call test,vpp_lite,vpp_lite,test)
+	$(call test,vpp,vpp,test)
 
 test-all-debug: bootstrap
 	$(eval EXTENDED_TESTS=yes)
-	$(call test,vpp_lite,vpp_lite_debug,test)
+	$(call test,vpp,vpp_debug,test)
 
 test-help:
 	@make -C test help
@@ -262,7 +262,7 @@ test-wipe-doc:
 	@make -C test wipe-doc
 
 test-cov: bootstrap
-	$(call test,vpp_lite,vpp_lite_gcov,cov)
+	$(call test,vpp,vpp_gcov,cov)
 
 test-wipe-cov:
 	@make -C test wipe-cov
@@ -271,10 +271,10 @@ test-checkstyle:
 	@make -C test checkstyle
 
 retest:
-	$(call test,vpp_lite,vpp_lite,retest)
+	$(call test,vpp,vpp,retest)
 
 retest-debug:
-	$(call test,vpp_lite,vpp_lite_debug,retest)
+	$(call test,vpp,vpp_debug,retest)
 
 STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
@@ -376,8 +376,6 @@ endef
 verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev
 	$(call banner,"Building for PLATFORM=vpp using gcc")
 	@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
-	$(call banner,"Building for PLATFORM=vpp_lite using gcc")
-	@make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 	$(call banner,"Installing dependencies")
 	@sudo -E apt-get update
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 401a383a..c61375d8 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -35,11 +35,6 @@ vpp_uses_dpdk = yes
 
 vpp_root_packages = vpp gmod
 
-vpp_configure_args_vpp = --with-dpdk
-
-# Set these parameters carefully. The vlib_buffer_t is 128 bytes, i.e.
-vlib_configure_args_vpp = --with-pre-data=128
-
 # DPDK configuration parameters
 # vpp_uses_dpdk_cryptodev_sw = yes
 # vpp_uses_dpdk_mlx5_pmd = yes
diff --git a/build-data/platforms/vpp_lite.mk b/build-data/platforms/vpp_lite.mk
deleted file mode 100644
index a556b487..00000000
--- a/build-data/platforms/vpp_lite.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# vector packet processor
-vpp_lite_arch = native
-ifeq ($(shell uname -m),x86_64)
-vpp_lite_march = corei7				# Nehalem Instruction set
-vpp_lite_mtune = corei7-avx			# Optimize for Sandy Bridge
-else
-vpp_lite_march = native
-vpp_lite_mtune = generic
-endif
-vpp_lite_native_tools = vppapigen
-
-vpp_lite_uses_dpdk = no
-
-# Uncoment to enable building unit tests
-#vpp_lite_enable_tests = yes
-
-vpp_lite_root_packages = vpp gmod
-
-vlib_configure_args_vpp_lite = --with-pre-data=128
-
-vnet_configure_args_vpp_lite =
-vpp_configure_args_vpp_lite =
-
-vpp_lite_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
-	-fstack-protector-all -fPIC -Werror
-vpp_lite_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
-	-fstack-protector-all -fPIC -Werror
-
-vpp_lite_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE) \
-	-fstack-protector -fPIC -Werror
-vpp_lite_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE) \
-	-fstack-protector -fPIC -Werror
-
-vpp_lite_gcov_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \
-	-fPIC -Werror -fprofile-arcs -ftest-coverage
-vpp_lite_gcov_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \
-	-fPIC -Werror -coverage
diff --git a/src/configure.ac b/src/configure.ac
index c22d152e..d90740d9 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -97,7 +97,6 @@ DISABLE_ARG(papi,	[Disable Python API bindings])
 DISABLE_ARG(japi,	[Disable Java API bindings])
 
 # --with-X
-WITH_ARG(dpdk,		[Use use DPDK])
 WITH_ARG(dpdk_crypto_sw,[Use DPDK cryptodev SW PMDs])
 WITH_ARG(dpdk_mlx5_pmd,	[Use DPDK with mlx5 PMD])
 
@@ -130,7 +129,6 @@ AC_ARG_WITH(pre-data,
 AC_SUBST(PRE_DATA_SIZE,		[$with_pre_data])
 AC_SUBST(APICLI,		[-DVPP_API_TEST_BUILTIN=${n_with_apicli}])
 
-AC_DEFINE_UNQUOTED(DPDK, 		[${n_with_dpdk}])
 AC_DEFINE_UNQUOTED(DPDK_SHARED_LIB,	[${n_enable_dpdk_shared}])
 AC_DEFINE_UNQUOTED(DPDK_CRYPTO_SW,	[${n_with_dpdk_crypto_sw}])
 AC_DEFINE_UNQUOTED(WITH_LIBSSL,		[${n_with_libssl}])
@@ -147,9 +145,11 @@ AC_SUBST(AR_FLAGS)
 
 # Please keep alphabetical order
 PLUGIN_ENABLED(acl)
+PLUGIN_ENABLED(dpdk)
 PLUGIN_ENABLED(flowperpkt)
 PLUGIN_ENABLED(ila)
 PLUGIN_ENABLED(ioam)
+PLUGIN_ENABLED(ixge)
 PLUGIN_ENABLED(lb)
 PLUGIN_ENABLED(sixrd)
 PLUGIN_ENABLED(snat)
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 7b36049e..255e644f 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -33,7 +33,7 @@ if ENABLE_ACL_PLUGIN
 include acl.am
 endif
 
-if WITH_DPDK
+if ENABLE_DPDK_PLUGIN
 include dpdk.am
 endif
 
@@ -49,6 +49,10 @@ if ENABLE_IOAM_PLUGIN
 include ioam.am
 endif
 
+if ENABLE_IXGE_PLUGIN
+include ixge.am
+endif
+
 if ENABLE_LB_PLUGIN
 include lb.am
 endif
diff --git a/src/plugins/ixge.am b/src/plugins/ixge.am
new file mode 100644
index 00000000..7e61344b
--- /dev/null
+++ b/src/plugins/ixge.am
@@ -0,0 +1,20 @@
+# Copyright (c) 2016 Cisco Systems, Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+vppplugins_LTLIBRARIES += ixge_plugin.la
+
+ixge_plugin_la_SOURCES = ixge/ixge.c
+
+noinst_HEADERS += ixge/ixge.h
+
+# vi:syntax=automake
diff --git a/src/plugins/ixge/ixge.c b/src/plugins/ixge/ixge.c
new file mode 100644
index 00000000..4eebc457
--- /dev/null
+++ b/src/plugins/ixge/ixge.c
@@ -0,0 +1,2947 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ *   WARNING!
+ *   This driver is not intended for production use and it is unsupported.
+ *   It is provided for educational use only.
+ *   Please use supported DPDK driver instead.
+ */
+
+#if __x86_64__
+#include <vppinfra/vector.h>
+
+#ifndef CLIB_HAVE_VEC128
+#warning HACK: ixge driver wont really work, missing u32x4
+typedef unsigned long long u32x4;
+#endif
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlib/pci/pci.h>
+#include <vnet/vnet.h>
+#include <ixge/ixge.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/plugin/plugin.h>
+#include <vpp/app/version.h>
+
+#define IXGE_ALWAYS_POLL 0
+
+#define EVENT_SET_FLAGS 0
+#define IXGE_HWBP_RACE_ELOG 0
+
+#define PCI_VENDOR_ID_INTEL 0x8086
+
+/* 10 GIG E (XGE) PHY IEEE 802.3 clause 45 definitions. */
+#define XGE_PHY_DEV_TYPE_PMA_PMD 1
+#define XGE_PHY_DEV_TYPE_PHY_XS 4
+#define XGE_PHY_ID1 0x2
+#define XGE_PHY_ID2 0x3
+#define XGE_PHY_CONTROL 0x0
+#define XGE_PHY_CONTROL_RESET (1 << 15)
+
+ixge_main_t ixge_main;
+static vlib_node_registration_t ixge_input_node;
+static vlib_node_registration_t ixge_process_node;
+
+static void
+ixge_semaphore_get (ixge_device_t * xd)
+{
+  ixge_main_t *xm = &ixge_main;
+  vlib_main_t *vm = xm->vlib_main;
+  ixge_regs_t *r = xd->regs;
+  u32 i;
+
+  i = 0;
+  while (!(r->software_semaphore & (1 << 0)))
+    {
+      if (i > 0)
+	vlib_process_suspend (vm, 100e-6);
+      i++;
+    }
+  do
+    {
+      r->software_semaphore |= 1 << 1;
+    }
+  while (!(r->software_semaphore & (1 << 1)));
+}
+
+static void
+ixge_semaphore_release (ixge_device_t * xd)
+{
+  ixge_regs_t *r = xd->regs;
+  r->software_semaphore &= ~3;
+}
+
+static void
+ixge_software_firmware_sync (ixge_device_t * xd, u32 sw_mask)
+{
+  ixge_main_t *xm = &ixge_main;
+  vlib_main_t *vm = xm->vlib_main;
+  ixge_regs_t *r = xd->regs;
+  u32 fw_mask = sw_mask << 5;
+  u32 m, done = 0;
+
+  while (!done)
+    {
+      ixge_semaphore_get (xd);
+      m = r->software_firmware_sync;
+      done = (m & fw_mask) == 0;
+      if (done)
+	r->software_firmware_sync = m | sw_mask;
+      ixge_semaphore_release (xd);
+      if (!done)
+	vlib_process_suspend (vm, 10e-3);
+    }
+}
+
+static void
+ixge_software_firmware_sync_release (ixge_device_t * xd, u32 sw_mask)
+{
+  ixge_regs_t *r = xd->regs;
+  ixge_semaphore_get (xd);
+  r->software_firmware_sync &= ~sw_mask;
+  ixge_semaphore_release (xd);
+}
+
+u32
+ixge_read_write_phy_reg (ixge_device_t * xd, u32 dev_type, u32 reg_index,
+			 u32 v, u32 is_read)
+{
+  ixge_regs_t *r = xd->regs;
+  const u32 busy_bit = 1 << 30;
+  u32 x;
+
+  ASSERT (xd->phy_index < 2);
+  ixge_software_firmware_sync (xd, 1 << (1 + xd->phy_index));
+
+  ASSERT (reg_index < (1 << 16));
+  ASSERT (dev_type < (1 << 5));
+  if (!is_read)
+    r->xge_mac.phy_data = v;
+
+  /* Address cycle. */
+  x =
+    reg_index | (dev_type << 16) | (xd->
+				    phys[xd->phy_index].mdio_address << 21);
+  r->xge_mac.phy_command = x | busy_bit;
+  /* Busy wait timed to take 28e-6 secs.  No suspend. */
+  while (r->xge_mac.phy_command & busy_bit)
+    ;
+
+  r->xge_mac.phy_command = x | ((is_read ? 2 : 1) << 26) | busy_bit;
+  while (r->xge_mac.phy_command & busy_bit)
+    ;
+
+  if (is_read)
+    v = r->xge_mac.phy_data >> 16;
+
+  ixge_software_firmware_sync_release (xd, 1 << (1 + xd->phy_index));
+
+  return v;
+}
+
+static u32
+ixge_read_phy_reg (ixge_device_t * xd, u32 dev_type, u32 reg_index)
+{
+  return ixge_read_write_phy_reg (xd, dev_type, reg_index, 0,	/* is_read */
+				  1);
+}
+
+static void
+ixge_write_phy_reg (ixge_device_t * xd, u32 dev_type, u32 reg_index, u32 v)
+{
+  (void) ixge_read_write_phy_reg (xd, dev_type, reg_index, v,	/* is_read */
+				  0);
+}
+
+static void
+ixge_i2c_put_bits (i2c_bus_t * b, int scl, int sda)
+{
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, b->private_data);
+  u32 v;
+
+  v = 0;
+  v |= (sda != 0) << 3;
+  v |= (scl != 0) << 1;
+  xd->regs->i2c_control = v;
+}
+
+static void
+ixge_i2c_get_bits (i2c_bus_t * b, int *scl, int *sda)
+{
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, b->private_data);
+  u32 v;
+
+  v = xd->regs->i2c_control;
+  *sda = (v & (1 << 2)) != 0;
+  *scl = (v & (1 << 0)) != 0;
+}
+
+static u16
+ixge_read_eeprom (ixge_device_t * xd, u32 address)
+{
+  ixge_regs_t *r = xd->regs;
+  u32 v;
+  r->eeprom_read = (( /* start bit */ (1 << 0)) | (address << 2));
+  /* Wait for done bit. */
+  while (!((v = r->eeprom_read) & (1 << 1)))
+    ;
+  return v >> 16;
+}
+
+static void
+ixge_sfp_enable_disable_laser (ixge_device_t * xd, uword enable)
+{
+  u32 tx_disable_bit = 1 << 3;
+  if (enable)
+    xd->regs->sdp_control &= ~tx_disable_bit;
+  else
+    xd->regs->sdp_control |= tx_disable_bit;
+}
+
+static void
+ixge_sfp_enable_disable_10g (ixge_device_t * xd, uword enable)
+{
+  u32 is_10g_bit = 1 << 5;
+  if (enable)
+    xd->regs->sdp_control |= is_10g_bit;
+  else
+    xd->regs->sdp_control &= ~is_10g_bit;
+}
+
+static clib_error_t *
+ixge_sfp_phy_init_from_eeprom (ixge_device_t * xd, u16 sfp_type)
+{
+  u16 a, id, reg_values_addr = 0;
+
+  a = ixge_read_eeprom (xd, 0x2b);
+  if (a == 0 || a == 0xffff)
+    return clib_error_create ("no init sequence in eeprom");
+
+  while (1)
+    {
+      id = ixge_read_eeprom (xd, ++a);
+      if (id == 0xffff)
+	break;
+      reg_values_addr = ixge_read_eeprom (xd, ++a);
+      if (id == sfp_type)
+	break;
+    }
+  if (id != sfp_type)
+    return clib_error_create ("failed to find id 0x%x", sfp_type);
+
+  ixge_software_firmware_sync (xd, 1 << 3);
+  while (1)
+    {
+      u16 v = ixge_read_eeprom (xd, ++reg_values_addr);
+      if (v == 0xffff)
+	break;
+      xd->regs->core_analog_config = v;
+    }
+  ixge_software_firmware_sync_release (xd, 1 << 3);
+
+  /* Make sure laser is off.  We'll turn on the laser when
+     the interface is brought up. */
+  ixge_sfp_enable_disable_laser (xd, /* enable */ 0);
+  ixge_sfp_enable_disable_10g (xd, /* is_10g */ 1);
+
+  return 0;
+}
+
+static void
+ixge_sfp_device_up_down (ixge_device_t * xd, uword is_up)
+{
+  u32 v;
+
+  if (is_up)
+    {
+      /* pma/pmd 10g serial SFI. */
+      xd->regs->xge_mac.auto_negotiation_control2 &= ~(3 << 16);
+      xd->regs->xge_mac.auto_negotiation_control2 |= 2 << 16;
+
+      v = xd->regs->xge_mac.auto_negotiation_control;
+      v &= ~(7 << 13);
+      v |= (0 << 13);
+      /* Restart autoneg. */
+      v |= (1 << 12);
+      xd->regs->xge_mac.auto_negotiation_control = v;
+
+      while (!(xd->regs->xge_mac.link_partner_ability[0] & 0xf0000))
+	;
+
+      v = xd->regs->xge_mac.auto_negotiation_control;
+
+      /* link mode 10g sfi serdes */
+      v &= ~(7 << 13);
+      v |= (3 << 13);
+
+      /* Restart autoneg. */
+      v |= (1 << 12);
+      xd->regs->xge_mac.auto_negotiation_control = v;
+
+      xd->regs->xge_mac.link_status;
+    }
+
+  ixge_sfp_enable_disable_laser (xd, /* enable */ is_up);
+
+  /* Give time for link partner to notice that we're up. */
+  if (is_up && vlib_in_process_context (vlib_get_main ()))
+    {
+      vlib_process_suspend (vlib_get_main (), 300e-3);
+    }
+}
+
+always_inline ixge_dma_regs_t *
+get_dma_regs (ixge_device_t * xd, vlib_rx_or_tx_t rt, u32 qi)
+{
+  ixge_regs_t *r = xd->regs;
+  ASSERT (qi < 128);
+  if (rt == VLIB_RX)
+    return qi < 64 ? &r->rx_dma0[qi] : &r->rx_dma1[qi - 64];
+  else
+    return &r->tx_dma[qi];
+}
+
+static clib_error_t *
+ixge_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+  vnet_hw_interface_t *hif = vnet_get_hw_interface (vnm, hw_if_index);
+  uword is_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, hif->dev_instance);
+  ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_RX, 0);
+
+  if (is_up)
+    {
+      xd->regs->rx_enable |= 1;
+      xd->regs->tx_dma_control |= 1;
+      dr->control |= 1 << 25;
+      while (!(dr->control & (1 << 25)))
+	;
+    }
+  else
+    {
+      xd->regs->rx_enable &= ~1;
+      xd->regs->tx_dma_control &= ~1;
+    }
+
+  ixge_sfp_device_up_down (xd, is_up);
+
+  return /* no error */ 0;
+}
+
+static void
+ixge_sfp_phy_init (ixge_device_t * xd)
+{
+  ixge_phy_t *phy = xd->phys + xd->phy_index;
+  i2c_bus_t *ib = &xd->i2c_bus;
+
+  ib->private_data = xd->device_index;
+  ib->put_bits = ixge_i2c_put_bits;
+  ib->get_bits = ixge_i2c_get_bits;
+  vlib_i2c_init (ib);
+
+  vlib_i2c_read_eeprom (ib, 0x50, 0, 128, (u8 *) & xd->sfp_eeprom);
+
+  if (vlib_i2c_bus_timed_out (ib) || !sfp_eeprom_is_valid (&xd->sfp_eeprom))
+    xd->sfp_eeprom.id = SFP_ID_unknown;
+  else
+    {
+      /* FIXME 5 => SR/LR eeprom ID. */
+      clib_error_t *e =
+	ixge_sfp_phy_init_from_eeprom (xd, 5 + xd->pci_function);
+      if (e)
+	clib_error_report (e);
+    }
+
+  phy->mdio_address = ~0;
+}
+
+static void
+ixge_phy_init (ixge_device_t * xd)
+{
+  ixge_main_t *xm = &ixge_main;
+  vlib_main_t *vm = xm->vlib_main;
+  ixge_phy_t *phy = xd->phys + xd->phy_index;
+
+  switch (xd->device_id)
+    {
+    case IXGE_82599_sfp:
+    case IXGE_82599_sfp_em:
+    case IXGE_82599_sfp_fcoe:
+      /* others? */
+      return ixge_sfp_phy_init (xd);
+
+    default:
+      break;
+    }
+
+  /* Probe address of phy. */
+  {
+    u32 i, v;
+
+    phy->mdio_address = ~0;
+    for (i = 0; i < 32; i++)
+      {
+	phy->mdio_address = i;
+	v = ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PMA_PMD, XGE_PHY_ID1);
+	if (v != 0xffff && v != 0)
+	  break;
+      }
+
+    /* No PHY found? */
+    if (i >= 32)
+      return;
+  }
+
+  phy->id =
+    ((ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PMA_PMD, XGE_PHY_ID1) << 16) |
+     ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PMA_PMD, XGE_PHY_ID2));
+
+  {
+    ELOG_TYPE_DECLARE (e) =
+    {
+    .function = (char *) __FUNCTION__,.format =
+	"ixge %d, phy id 0x%d mdio address %d",.format_args = "i4i4i4",};
+    struct
+    {
+      u32 instance, id, address;
+    } *ed;
+    ed = ELOG_DATA (&vm->elog_main, e);
+    ed->instance = xd->device_index;
+    ed->id = phy->id;
+    ed->address = phy->mdio_address;
+  }
+
+  /* Reset phy. */
+  ixge_write_phy_reg (xd, XGE_PHY_DEV_TYPE_PHY_XS, XGE_PHY_CONTROL,
+		      XGE_PHY_CONTROL_RESET);
+
+  /* Wait for self-clearning reset bit to clear. */
+  do
+    {
+      vlib_process_suspend (vm, 1e-3);
+    }
+  while (ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PHY_XS, XGE_PHY_CONTROL) &
+	 XGE_PHY_CONTROL_RESET);
+}
+
+static u8 *
+format_ixge_rx_from_hw_descriptor (u8 * s, va_list * va)
+{
+  ixge_rx_from_hw_descriptor_t *d =
+    va_arg (*va, ixge_rx_from_hw_descriptor_t *);
+  u32 s0 = d->status[0], s2 = d->status[2];
+  u32 is_ip4, is_ip6, is_ip, is_tcp, is_udp;
+  uword indent = format_get_indent (s);
+
+  s = format (s, "%s-owned",
+	      (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE) ? "sw" :
+	      "hw");
+  s =
+    format (s, ", length this descriptor %d, l3 offset %d",
+	    d->n_packet_bytes_this_descriptor,
+	    IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s0));
+  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET)
+    s = format (s, ", end-of-packet");
+
+  s = format (s, "\n%U", format_white_space, indent);
+
+  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_ETHERNET_ERROR)
+    s = format (s, "layer2 error");
+
+  if (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_LAYER2)
+    {
+      s = format (s, "layer 2 type %d", (s0 & 0x1f));
+      return s;
+    }
+
+  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_VLAN)
+    s = format (s, "vlan header 0x%x\n%U", d->vlan_tag,
+		format_white_space, indent);
+
+  if ((is_ip4 = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4)))
+    {
+      s = format (s, "ip4%s",
+		  (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4_EXT) ? " options" :
+		  "");
+      if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED)
+	s = format (s, " checksum %s",
+		    (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR) ?
+		    "bad" : "ok");
+    }
+  if ((is_ip6 = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6)))
+    s = format (s, "ip6%s",
+		(s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6_EXT) ? " extended" :
+		"");
+  is_tcp = is_udp = 0;
+  if ((is_ip = (is_ip4 | is_ip6)))
+    {
+      is_tcp = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_TCP) != 0;
+      is_udp = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_UDP) != 0;
+      if (is_tcp)
+	s = format (s, ", tcp");
+      if (is_udp)
+	s = format (s, ", udp");
+    }
+
+  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED)
+    s = format (s, ", tcp checksum %s",
+		(s2 & IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR) ? "bad" :
+		"ok");
+  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED)
+    s = format (s, ", udp checksum %s",
+		(s2 & IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR) ? "bad" :
+		"ok");
+
+  return s;
+}
+
+static u8 *
+format_ixge_tx_descriptor (u8 * s, va_list * va)
+{
+  ixge_tx_descriptor_t *d = va_arg (*va, ixge_tx_descriptor_t *);
+  u32 s0 = d->status0, s1 = d->status1;
+  uword indent = format_get_indent (s);
+  u32 v;
+
+  s = format (s, "buffer 0x%Lx, %d packet bytes, %d bytes this buffer",
+	      d->buffer_address, s1 >> 14, d->n_bytes_this_buffer);
+
+  s = format (s, "\n%U", format_white_space, indent);
+
+  if ((v = (s0 >> 0) & 3))
+    s = format (s, "reserved 0x%x, ", v);
+
+  if ((v = (s0 >> 2) & 3))
+    s = format (s, "mac 0x%x, ", v);
+
+  if ((v = (s0 >> 4) & 0xf) != 3)
+    s = format (s, "type 0x%x, ", v);
+
+  s = format (s, "%s%s%s%s%s%s%s%s",
+	      (s0 & (1 << 8)) ? "eop, " : "",
+	      (s0 & (1 << 9)) ? "insert-fcs, " : "",
+	      (s0 & (1 << 10)) ? "reserved26, " : "",
+	      (s0 & (1 << 11)) ? "report-status, " : "",
+	      (s0 & (1 << 12)) ? "reserved28, " : "",
+	      (s0 & (1 << 13)) ? "is-advanced, " : "",
+	      (s0 & (1 << 14)) ? "vlan-enable, " : "",
+	      (s0 & (1 << 15)) ? "tx-segmentation, " : "");
+
+  if ((v = s1 & 0xf) != 0)
+    s = format (s, "status 0x%x, ", v);
+
+  if ((v = (s1 >> 4) & 0xf))
+    s = format (s, "context 0x%x, ", v);
+
+  if ((v = (s1 >> 8) & 0x3f))
+    s = format (s, "options 0x%x, ", v);
+
+  return s;
+}
+
+typedef struct
+{
+  ixge_descriptor_t before, after;
+
+  u32 buffer_index;
+
+  u16 device_index;
+
+  u8 queue_index;
+
+  u8 is_start_of_packet;
+
+  /* Copy of VLIB buffer; packet data stored in pre_data. */
+  vlib_buffer_t buffer;
+} ixge_rx_dma_trace_t;
+
+static u8 *
+format_ixge_rx_dma_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  vlib_node_t *node = va_arg (*va, vlib_node_t *);
+  vnet_main_t *vnm = vnet_get_main ();
+  ixge_rx_dma_trace_t *t = va_arg (*va, ixge_rx_dma_trace_t *);
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, t->device_index);
+  format_function_t *f;
+  uword indent = format_get_indent (s);
+
+  {
+    vnet_sw_interface_t *sw =
+      vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
+    s =
+      format (s, "%U rx queue %d", format_vnet_sw_interface_name, vnm, sw,
+	      t->queue_index);
+  }
+
+  s = format (s, "\n%Ubefore: %U",
+	      format_white_space, indent,
+	      format_ixge_rx_from_hw_descriptor, &t->before);
+  s = format (s, "\n%Uafter : head/tail address 0x%Lx/0x%Lx",
+	      format_white_space, indent,
+	      t->after.rx_to_hw.head_address, t->after.rx_to_hw.tail_address);
+
+  s = format (s, "\n%Ubuffer 0x%x: %U",
+	      format_white_space, indent,
+	      t->buffer_index, format_vlib_buffer, &t->buffer);
+
+  s = format (s, "\n%U", format_white_space, indent);
+
+  f = node->format_buffer;
+  if (!f || !t->is_start_of_packet)
+    f = format_hex_bytes;
+  s = format (s, "%U", f, t->buffer.pre_data, sizeof (t->buffer.pre_data));
+
+  return s;
+}
+
+#define foreach_ixge_error					\
+  _ (none, "no error")						\
+  _ (tx_full_drops, "tx ring full drops")			\
+  _ (ip4_checksum_error, "ip4 checksum errors")			\
+  _ (rx_alloc_fail, "rx buf alloc from free list failed")	\
+  _ (rx_alloc_no_physmem, "rx buf alloc failed no physmem")
+
+typedef enum
+{
+#define _(f,s) IXGE_ERROR_##f,
+  foreach_ixge_error
+#undef _
+    IXGE_N_ERROR,
+} ixge_error_t;
+
+always_inline void
+ixge_rx_next_and_error_from_status_x1 (ixge_device_t * xd,
+				       u32 s00, u32 s02,
+				       u8 * next0, u8 * error0, u32 * flags0)
+{
+  u8 is0_ip4, is0_ip6, n0, e0;
+  u32 f0;
+
+  e0 = IXGE_ERROR_none;
+  n0 = IXGE_RX_NEXT_ETHERNET_INPUT;
+
+  is0_ip4 = s02 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED;
+  n0 = is0_ip4 ? IXGE_RX_NEXT_IP4_INPUT : n0;
+
+  e0 = (is0_ip4 && (s02 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR)
+	? IXGE_ERROR_ip4_checksum_error : e0);
+
+  is0_ip6 = s00 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6;
+  n0 = is0_ip6 ? IXGE_RX_NEXT_IP6_INPUT : n0;
+
+  n0 = (xd->per_interface_next_index != ~0) ?
+    xd->per_interface_next_index : n0;
+
+  /* Check for error. */
+  n0 = e0 != IXGE_ERROR_none ? IXGE_RX_NEXT_DROP : n0;
+
+  f0 = ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
+		| IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
+	? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
+
+  f0 |= ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
+		 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
+	 ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
+
+  *error0 = e0;
+  *next0 = n0;
+  *flags0 = f0;
+}
+
+always_inline void
+ixge_rx_next_and_error_from_status_x2 (ixge_device_t * xd,
+				       u32 s00, u32 s02,
+				       u32 s10, u32 s12,
+				       u8 * next0, u8 * error0, u32 * flags0,
+				       u8 * next1, u8 * error1, u32 * flags1)
+{
+  u8 is0_ip4, is0_ip6, n0, e0;
+  u8 is1_ip4, is1_ip6, n1, e1;
+  u32 f0, f1;
+
+  e0 = e1 = IXGE_ERROR_none;
+  n0 = n1 = IXGE_RX_NEXT_IP4_INPUT;
+
+  is0_ip4 = s02 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED;
+  is1_ip4 = s12 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED;
+
+  n0 = is0_ip4 ? IXGE_RX_NEXT_IP4_INPUT : n0;
+  n1 = is1_ip4 ? IXGE_RX_NEXT_IP4_INPUT : n1;
+
+  e0 = (is0_ip4 && (s02 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR)
+	? IXGE_ERROR_ip4_checksum_error : e0);
+  e1 = (is1_ip4 && (s12 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR)
+	? IXGE_ERROR_ip4_checksum_error : e1);
+
+  is0_ip6 = s00 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6;
+  is1_ip6 = s10 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6;
+
+  n0 = is0_ip6 ? IXGE_RX_NEXT_IP6_INPUT : n0;
+  n1 = is1_ip6 ? IXGE_RX_NEXT_IP6_INPUT : n1;
+
+  n0 = (xd->per_interface_next_index != ~0) ?
+    xd->per_interface_next_index : n0;
+  n1 = (xd->per_interface_next_index != ~0) ?
+    xd->per_interface_next_index : n1;
+
+  /* Check for error. */
+  n0 = e0 != IXGE_ERROR_none ? IXGE_RX_NEXT_DROP : n0;
+  n1 = e1 != IXGE_ERROR_none ? IXGE_RX_NEXT_DROP : n1;
+
+  *error0 = e0;
+  *error1 = e1;
+
+  *next0 = n0;
+  *next1 = n1;
+
+  f0 = ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
+		| IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
+	? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
+  f1 = ((s12 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
+		| IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
+	? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
+
+  f0 |= ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
+		 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
+	 ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
+  f1 |= ((s12 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
+		 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
+	 ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
+
+  *flags0 = f0;
+  *flags1 = f1;
+}
+
+static void
+ixge_rx_trace (ixge_main_t * xm,
+	       ixge_device_t * xd,
+	       ixge_dma_queue_t * dq,
+	       ixge_descriptor_t * before_descriptors,
+	       u32 * before_buffers,
+	       ixge_descriptor_t * after_descriptors, uword n_descriptors)
+{
+  vlib_main_t *vm = xm->vlib_main;
+  vlib_node_runtime_t *node = dq->rx.node;
+  ixge_rx_from_hw_descriptor_t *bd;
+  ixge_rx_to_hw_descriptor_t *ad;
+  u32 *b, n_left, is_sop, next_index_sop;
+
+  n_left = n_descriptors;
+  b = before_buffers;
+  bd = &before_descriptors->rx_from_hw;
+  ad = &after_descriptors->rx_to_hw;
+  is_sop = dq->rx.is_start_of_packet;
+  next_index_sop = dq->rx.saved_start_of_packet_next_index;
+
+  while (n_left >= 2)
+    {
+      u32 bi0, bi1, flags0, flags1;
+      vlib_buffer_t *b0, *b1;
+      ixge_rx_dma_trace_t *t0, *t1;
+      u8 next0, error0, next1, error1;
+
+      bi0 = b[0];
+      bi1 = b[1];
+      n_left -= 2;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      ixge_rx_next_and_error_from_status_x2 (xd,
+					     bd[0].status[0], bd[0].status[2],
+					     bd[1].status[0], bd[1].status[2],
+					     &next0, &error0, &flags0,
+					     &next1, &error1, &flags1);
+
+      next_index_sop = is_sop ? next0 : next_index_sop;
+      vlib_trace_buffer (vm, node, next_index_sop, b0, /* follow_chain */ 0);
+      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+      t0->is_start_of_packet = is_sop;
+      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      next_index_sop = is_sop ? next1 : next_index_sop;
+      vlib_trace_buffer (vm, node, next_index_sop, b1, /* follow_chain */ 0);
+      t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
+      t1->is_start_of_packet = is_sop;
+      is_sop = (b1->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      t0->queue_index = dq->queue_index;
+      t1->queue_index = dq->queue_index;
+      t0->device_index = xd->device_index;
+      t1->device_index = xd->device_index;
+      t0->before.rx_from_hw = bd[0];
+      t1->before.rx_from_hw = bd[1];
+      t0->after.rx_to_hw = ad[0];
+      t1->after.rx_to_hw = ad[1];
+      t0->buffer_index = bi0;
+      t1->buffer_index = bi1;
+      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
+      memcpy (&t1->buffer, b1, sizeof (b1[0]) - sizeof (b0->pre_data));
+      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
+	      sizeof (t0->buffer.pre_data));
+      memcpy (t1->buffer.pre_data, b1->data + b1->current_data,
+	      sizeof (t1->buffer.pre_data));
+
+      b += 2;
+      bd += 2;
+      ad += 2;
+    }
+
+  while (n_left >= 1)
+    {
+      u32 bi0, flags0;
+      vlib_buffer_t *b0;
+      ixge_rx_dma_trace_t *t0;
+      u8 next0, error0;
+
+      bi0 = b[0];
+      n_left -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      ixge_rx_next_and_error_from_status_x1 (xd,
+					     bd[0].status[0], bd[0].status[2],
+					     &next0, &error0, &flags0);
+
+      next_index_sop = is_sop ? next0 : next_index_sop;
+      vlib_trace_buffer (vm, node, next_index_sop, b0, /* follow_chain */ 0);
+      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+      t0->is_start_of_packet = is_sop;
+      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      t0->queue_index = dq->queue_index;
+      t0->device_index = xd->device_index;
+      t0->before.rx_from_hw = bd[0];
+      t0->after.rx_to_hw = ad[0];
+      t0->buffer_index = bi0;
+      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
+      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
+	      sizeof (t0->buffer.pre_data));
+
+      b += 1;
+      bd += 1;
+      ad += 1;
+    }
+}
+
+typedef struct
+{
+  ixge_tx_descriptor_t descriptor;
+
+  u32 buffer_index;
+
+  u16 device_index;
+
+  u8 queue_index;
+
+  u8 is_start_of_packet;
+
+  /* Copy of VLIB buffer; packet data stored in pre_data. */
+  vlib_buffer_t buffer;
+} ixge_tx_dma_trace_t;
+
+static u8 *
+format_ixge_tx_dma_trace (u8 * s, va_list * va)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+  ixge_tx_dma_trace_t *t = va_arg (*va, ixge_tx_dma_trace_t *);
+  vnet_main_t *vnm = vnet_get_main ();
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, t->device_index);
+  format_function_t *f;
+  uword indent = format_get_indent (s);
+
+  {
+    vnet_sw_interface_t *sw =
+      vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
+    s =
+      format (s, "%U tx queue %d", format_vnet_sw_interface_name, vnm, sw,
+	      t->queue_index);
+  }
+
+  s = format (s, "\n%Udescriptor: %U",
+	      format_white_space, indent,
+	      format_ixge_tx_descriptor, &t->descriptor);
+
+  s = format (s, "\n%Ubuffer 0x%x: %U",
+	      format_white_space, indent,
+	      t->buffer_index, format_vlib_buffer, &t->buffer);
+
+  s = format (s, "\n%U", format_white_space, indent);
+
+  f = format_ethernet_header_with_length;
+  if (!f || !t->is_start_of_packet)
+    f = format_hex_bytes;
+  s = format (s, "%U", f, t->buffer.pre_data, sizeof (t->buffer.pre_data));
+
+  return s;
+}
+
+typedef struct
+{
+  vlib_node_runtime_t *node;
+
+  u32 is_start_of_packet;
+
+  u32 n_bytes_in_packet;
+
+  ixge_tx_descriptor_t *start_of_packet_descriptor;
+} ixge_tx_state_t;
+
+static void
+ixge_tx_trace (ixge_main_t * xm,
+	       ixge_device_t * xd,
+	       ixge_dma_queue_t * dq,
+	       ixge_tx_state_t * tx_state,
+	       ixge_tx_descriptor_t * descriptors,
+	       u32 * buffers, uword n_descriptors)
+{
+  vlib_main_t *vm = xm->vlib_main;
+  vlib_node_runtime_t *node = tx_state->node;
+  ixge_tx_descriptor_t *d;
+  u32 *b, n_left, is_sop;
+
+  n_left = n_descriptors;
+  b = buffers;
+  d = descriptors;
+  is_sop = tx_state->is_start_of_packet;
+
+  while (n_left >= 2)
+    {
+      u32 bi0, bi1;
+      vlib_buffer_t *b0, *b1;
+      ixge_tx_dma_trace_t *t0, *t1;
+
+      bi0 = b[0];
+      bi1 = b[1];
+      n_left -= 2;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+      t0->is_start_of_packet = is_sop;
+      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
+      t1->is_start_of_packet = is_sop;
+      is_sop = (b1->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      t0->queue_index = dq->queue_index;
+      t1->queue_index = dq->queue_index;
+      t0->device_index = xd->device_index;
+      t1->device_index = xd->device_index;
+      t0->descriptor = d[0];
+      t1->descriptor = d[1];
+      t0->buffer_index = bi0;
+      t1->buffer_index = bi1;
+      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
+      memcpy (&t1->buffer, b1, sizeof (b1[0]) - sizeof (b0->pre_data));
+      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
+	      sizeof (t0->buffer.pre_data));
+      memcpy (t1->buffer.pre_data, b1->data + b1->current_data,
+	      sizeof (t1->buffer.pre_data));
+
+      b += 2;
+      d += 2;
+    }
+
+  while (n_left >= 1)
+    {
+      u32 bi0;
+      vlib_buffer_t *b0;
+      ixge_tx_dma_trace_t *t0;
+
+      bi0 = b[0];
+      n_left -= 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
+      t0->is_start_of_packet = is_sop;
+      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      t0->queue_index = dq->queue_index;
+      t0->device_index = xd->device_index;
+      t0->descriptor = d[0];
+      t0->buffer_index = bi0;
+      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
+      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
+	      sizeof (t0->buffer.pre_data));
+
+      b += 1;
+      d += 1;
+    }
+}
+
+always_inline uword
+ixge_ring_sub (ixge_dma_queue_t * q, u32 i0, u32 i1)
+{
+  i32 d = i1 - i0;
+  ASSERT (i0 < q->n_descriptors);
+  ASSERT (i1 < q->n_descriptors);
+  return d < 0 ? q->n_descriptors + d : d;
+}
+
+always_inline uword
+ixge_ring_add (ixge_dma_queue_t * q, u32 i0, u32 i1)
+{
+  u32 d = i0 + i1;
+  ASSERT (i0 < q->n_descriptors);
+  ASSERT (i1 < q->n_descriptors);
+  d -= d >= q->n_descriptors ? q->n_descriptors : 0;
+  return d;
+}
+
+always_inline uword
+ixge_tx_descriptor_matches_template (ixge_main_t * xm,
+				     ixge_tx_descriptor_t * d)
+{
+  u32 cmp;
+
+  cmp = ((d->status0 & xm->tx_descriptor_template_mask.status0)
+	 ^ xm->tx_descriptor_template.status0);
+  if (cmp)
+    return 0;
+  cmp = ((d->status1 & xm->tx_descriptor_template_mask.status1)
+	 ^ xm->tx_descriptor_template.status1);
+  if (cmp)
+    return 0;
+
+  return 1;
+}
+
+static uword
+ixge_tx_no_wrap (ixge_main_t * xm,
+		 ixge_device_t * xd,
+		 ixge_dma_queue_t * dq,
+		 u32 * buffers,
+		 u32 start_descriptor_index,
+		 u32 n_descriptors, ixge_tx_state_t * tx_state)
+{
+  vlib_main_t *vm = xm->vlib_main;
+  ixge_tx_descriptor_t *d, *d_sop;
+  u32 n_left = n_descriptors;
+  u32 *to_free = vec_end (xm->tx_buffers_pending_free);
+  u32 *to_tx =
+    vec_elt_at_index (dq->descriptor_buffer_indices, start_descriptor_index);
+  u32 is_sop = tx_state->is_start_of_packet;
+  u32 len_sop = tx_state->n_bytes_in_packet;
+  u16 template_status = xm->tx_descriptor_template.status0;
+  u32 descriptor_prefetch_rotor = 0;
+
+  ASSERT (start_descriptor_index + n_descriptors <= dq->n_descriptors);
+  d = &dq->descriptors[start_descriptor_index].tx;
+  d_sop = is_sop ? d : tx_state->start_of_packet_descriptor;
+
+  while (n_left >= 4)
+    {
+      vlib_buffer_t *b0, *b1;
+      u32 bi0, fi0, len0;
+      u32 bi1, fi1, len1;
+      u8 is_eop0, is_eop1;
+
+      /* Prefetch next iteration. */
+      vlib_prefetch_buffer_with_index (vm, buffers[2], LOAD);
+      vlib_prefetch_buffer_with_index (vm, buffers[3], LOAD);
+
+      if ((descriptor_prefetch_rotor & 0x3) == 0)
+	CLIB_PREFETCH (d + 4, CLIB_CACHE_LINE_BYTES, STORE);
+
+      descriptor_prefetch_rotor += 2;
+
+      bi0 = buffers[0];
+      bi1 = buffers[1];
+
+      to_free[0] = fi0 = to_tx[0];
+      to_tx[0] = bi0;
+      to_free += fi0 != 0;
+
+      to_free[0] = fi1 = to_tx[1];
+      to_tx[1] = bi1;
+      to_free += fi1 != 0;
+
+      buffers += 2;
+      n_left -= 2;
+      to_tx += 2;
+
+      b0 = vlib_get_buffer (vm, bi0);
+      b1 = vlib_get_buffer (vm, bi1);
+
+      is_eop0 = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+      is_eop1 = (b1->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      len0 = b0->current_length;
+      len1 = b1->current_length;
+
+      ASSERT (ixge_tx_descriptor_matches_template (xm, d + 0));
+      ASSERT (ixge_tx_descriptor_matches_template (xm, d + 1));
+
+      d[0].buffer_address =
+	vlib_get_buffer_data_physical_address (vm, bi0) + b0->current_data;
+      d[1].buffer_address =
+	vlib_get_buffer_data_physical_address (vm, bi1) + b1->current_data;
+
+      d[0].n_bytes_this_buffer = len0;
+      d[1].n_bytes_this_buffer = len1;
+
+      d[0].status0 =
+	template_status | (is_eop0 <<
+			   IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET);
+      d[1].status0 =
+	template_status | (is_eop1 <<
+			   IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET);
+
+      len_sop = (is_sop ? 0 : len_sop) + len0;
+      d_sop[0].status1 =
+	IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET (len_sop);
+      d += 1;
+      d_sop = is_eop0 ? d : d_sop;
+
+      is_sop = is_eop0;
+
+      len_sop = (is_sop ? 0 : len_sop) + len1;
+      d_sop[0].status1 =
+	IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET (len_sop);
+      d += 1;
+      d_sop = is_eop1 ? d : d_sop;
+
+      is_sop = is_eop1;
+    }
+
+  while (n_left > 0)
+    {
+      vlib_buffer_t *b0;
+      u32 bi0, fi0, len0;
+      u8 is_eop0;
+
+      bi0 = buffers[0];
+
+      to_free[0] = fi0 = to_tx[0];
+      to_tx[0] = bi0;
+      to_free += fi0 != 0;
+
+      buffers += 1;
+      n_left -= 1;
+      to_tx += 1;
+
+      b0 = vlib_get_buffer (vm, bi0);
+
+      is_eop0 = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
+
+      len0 = b0->current_length;
+
+      ASSERT (ixge_tx_descriptor_matches_template (xm, d + 0));
+
+      d[0].buffer_address =
+	vlib_get_buffer_data_physical_address (vm, bi0) + b0->current_data;
+
+      d[0].n_bytes_this_buffer = len0;
+
+      d[0].status0 =
+	template_status | (is_eop0 <<
+			   IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET);
+
+      len_sop = (is_sop ? 0 : len_sop) + len0;
+      d_sop[0].status1 =
+	IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET (len_sop);
+      d += 1;
+      d_sop = is_eop0 ? d : d_sop;
+
+      is_sop = is_eop0;
+    }
+
+  if (tx_state->node->flags & VLIB_NODE_FLAG_TRACE)
+    {
+      to_tx =
+	vec_elt_at_index (dq->descriptor_buffer_indices,
+			  start_descriptor_index);
+      ixge_tx_trace (xm, xd, dq, tx_state,
+		     &dq->descriptors[start_descriptor_index].tx, to_tx,
+		     n_descriptors);
+    }
+
+  _vec_len (xm->tx_buffers_pending_free) =
+    to_free - xm->tx_buffers_pending_free;
+
+  /* When we are done d_sop can point to end of ring.  Wrap it if so. */
+  {
+    ixge_tx_descriptor_t *d_start = &dq->descriptors[0].tx;
+
+    ASSERT (d_sop - d_start <= dq->n_descriptors);
+    d_sop = d_sop - d_start == dq->n_descriptors ? d_start : d_sop;
+  }
+
+  tx_state->is_start_of_packet = is_sop;
+  tx_state->start_of_packet_descriptor = d_sop;
+  tx_state->n_bytes_in_packet = len_sop;
+
+  return n_descriptors;
+}
+
+static uword
+ixge_interface_tx (vlib_main_t * vm,
+		   vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  ixge_main_t *xm = &ixge_main;
+  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, rd->dev_instance);
+  ixge_dma_queue_t *dq;
+  u32 *from, n_left_tx, n_descriptors_to_tx, n_tail_drop;
+  u32 queue_index = 0;		/* fixme parameter */
+  ixge_tx_state_t tx_state;
+
+  tx_state.node = node;
+  tx_state.is_start_of_packet = 1;
+  tx_state.start_of_packet_descriptor = 0;
+  tx_state.n_bytes_in_packet = 0;
+
+  from = vlib_frame_vector_args (f);
+
+  dq = vec_elt_at_index (xd->dma_queues[VLIB_TX], queue_index);
+
+  dq->head_index = dq->tx.head_index_write_back[0];
+
+  /* Since head == tail means ring is empty we can send up to dq->n_descriptors - 1. */
+  n_left_tx = dq->n_descriptors - 1;
+  n_left_tx -= ixge_ring_sub (dq, dq->head_index, dq->tail_index);
+
+  _vec_len (xm->tx_buffers_pending_free) = 0;
+
+  n_descriptors_to_tx = f->n_vectors;
+  n_tail_drop = 0;
+  if (PREDICT_FALSE (n_descriptors_to_tx > n_left_tx))
+    {
+      i32 i, n_ok, i_eop, i_sop;
+
+      i_sop = i_eop = ~0;
+      for (i = n_left_tx - 1; i >= 0; i--)
+	{
+	  vlib_buffer_t *b = vlib_get_buffer (vm, from[i]);
+	  if (!(b->flags & VLIB_BUFFER_NEXT_PRESENT))
+	    {
+	      if (i_sop != ~0 && i_eop != ~0)
+		break;
+	      i_eop = i;
+	      i_sop = i + 1;
+	    }
+	}
+      if (i == 0)
+	n_ok = 0;
+      else
+	n_ok = i_eop + 1;
+
+      {
+	ELOG_TYPE_DECLARE (e) =
+	{
+	.function = (char *) __FUNCTION__,.format =
+	    "ixge %d, ring full to tx %d head %d tail %d",.format_args =
+	    "i2i2i2i2",};
+	struct
+	{
+	  u16 instance, to_tx, head, tail;
+	} *ed;
+	ed = ELOG_DATA (&vm->elog_main, e);
+	ed->instance = xd->device_index;
+	ed->to_tx = n_descriptors_to_tx;
+	ed->head = dq->head_index;
+	ed->tail = dq->tail_index;
+      }
+
+      if (n_ok < n_descriptors_to_tx)
+	{
+	  n_tail_drop = n_descriptors_to_tx - n_ok;
+	  vec_add (xm->tx_buffers_pending_free, from + n_ok, n_tail_drop);
+	  vlib_error_count (vm, ixge_input_node.index,
+			    IXGE_ERROR_tx_full_drops, n_tail_drop);
+	}
+
+      n_descriptors_to_tx = n_ok;
+    }
+
+  dq->tx.n_buffers_on_ring += n_descriptors_to_tx;
+
+  /* Process from tail to end of descriptor ring. */
+  if (n_descriptors_to_tx > 0 && dq->tail_index < dq->n_descriptors)
+    {
+      u32 n =
+	clib_min (dq->n_descriptors - dq->tail_index, n_descriptors_to_tx);
+      n = ixge_tx_no_wrap (xm, xd, dq, from, dq->tail_index, n, &tx_state);
+      from += n;
+      n_descriptors_to_tx -= n;
+      dq->tail_index += n;
+      ASSERT (dq->tail_index <= dq->n_descriptors);
+      if (dq->tail_index == dq->n_descriptors)
+	dq->tail_index = 0;
+    }
+
+  if (n_descriptors_to_tx > 0)
+    {
+      u32 n =
+	ixge_tx_no_wrap (xm, xd, dq, from, 0, n_descriptors_to_tx, &tx_state);
+      from += n;
+      ASSERT (n == n_descriptors_to_tx);
+      dq->tail_index += n;
+      ASSERT (dq->tail_index <= dq->n_descriptors);
+      if (dq->tail_index == dq->n_descriptors)
+	dq->tail_index = 0;
+    }
+
+  /* We should only get full packets. */
+  ASSERT (tx_state.is_start_of_packet);
+
+  /* Report status when last descriptor is done. */
+  {
+    u32 i = dq->tail_index == 0 ? dq->n_descriptors - 1 : dq->tail_index - 1;
+    ixge_tx_descriptor_t *d = &dq->descriptors[i].tx;
+    d->status0 |= IXGE_TX_DESCRIPTOR_STATUS0_REPORT_STATUS;
+  }
+
+  /* Give new descriptors to hardware. */
+  {
+    ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_TX, queue_index);
+
+    CLIB_MEMORY_BARRIER ();
+
+    dr->tail_index = dq->tail_index;
+  }
+
+  /* Free any buffers that are done. */
+  {
+    u32 n = _vec_len (xm->tx_buffers_pending_free);
+    if (n > 0)
+      {
+	vlib_buffer_free_no_next (vm, xm->tx_buffers_pending_free, n);
+	_vec_len (xm->tx_buffers_pending_free) = 0;
+	ASSERT (dq->tx.n_buffers_on_ring >= n);
+	dq->tx.n_buffers_on_ring -= (n - n_tail_drop);
+      }
+  }
+
+  return f->n_vectors;
+}
+
+static uword
+ixge_rx_queue_no_wrap (ixge_main_t * xm,
+		       ixge_device_t * xd,
+		       ixge_dma_queue_t * dq,
+		       u32 start_descriptor_index, u32 n_descriptors)
+{
+  vlib_main_t *vm = xm->vlib_main;
+  vlib_node_runtime_t *node = dq->rx.node;
+  ixge_descriptor_t *d;
+  static ixge_descriptor_t *d_trace_save;
+  static u32 *d_trace_buffers;
+  u32 n_descriptors_left = n_descriptors;
+  u32 *to_rx =
+    vec_elt_at_index (dq->descriptor_buffer_indices, start_descriptor_index);
+  u32 *to_add;
+  u32 bi_sop = dq->rx.saved_start_of_packet_buffer_index;
+  u32 bi_last = dq->rx.saved_last_buffer_index;
+  u32 next_index_sop = dq->rx.saved_start_of_packet_next_index;
+  u32 is_sop = dq->rx.is_start_of_packet;
+  u32 next_index, n_left_to_next, *to_next;
+  u32 n_packets = 0;
+  u32 n_bytes = 0;
+  u32 n_trace = vlib_get_trace_count (vm, node);
+  vlib_buffer_t *b_last, b_dummy;
+
+  ASSERT (start_descriptor_index + n_descriptors <= dq->n_descriptors);
+  d = &dq->descriptors[start_descriptor_index];
+
+  b_last = bi_last != ~0 ? vlib_get_buffer (vm, bi_last) : &b_dummy;
+  next_index = dq->rx.next_index;
+
+  if (n_trace > 0)
+    {
+      u32 n = clib_min (n_trace, n_descriptors);
+      if (d_trace_save)
+	{
+	  _vec_len (d_trace_save) = 0;
+	  _vec_len (d_trace_buffers) = 0;
+	}
+      vec_add (d_trace_save, (ixge_descriptor_t *) d, n);
+      vec_add (d_trace_buffers, to_rx, n);
+    }
+
+  {
+    uword l = vec_len (xm->rx_buffers_to_add);
+
+    if (l < n_descriptors_left)
+      {
+	u32 n_to_alloc = 2 * dq->n_descriptors - l;
+	u32 n_allocated;
+
+	vec_resize (xm->rx_buffers_to_add, n_to_alloc);
+
+	_vec_len (xm->rx_buffers_to_add) = l;
+	n_allocated = vlib_buffer_alloc_from_free_list
+	  (vm, xm->rx_buffers_to_add + l, n_to_alloc,
+	   xm->vlib_buffer_free_list_index);
+	_vec_len (xm->rx_buffers_to_add) += n_allocated;
+
+	/* Handle transient allocation failure */
+	if (PREDICT_FALSE (l + n_allocated <= n_descriptors_left))
+	  {
+	    if (n_allocated == 0)
+	      vlib_error_count (vm, ixge_input_node.index,
+				IXGE_ERROR_rx_alloc_no_physmem, 1);
+	    else
+	      vlib_error_count (vm, ixge_input_node.index,
+				IXGE_ERROR_rx_alloc_fail, 1);
+
+	    n_descriptors_left = l + n_allocated;
+	  }
+	n_descriptors = n_descriptors_left;
+      }
+
+    /* Add buffers from end of vector going backwards. */
+    to_add = vec_end (xm->rx_buffers_to_add) - 1;
+  }
+
+  while (n_descriptors_left > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_descriptors_left >= 4 && n_left_to_next >= 2)
+	{
+	  vlib_buffer_t *b0, *b1;
+	  u32 bi0, fi0, len0, l3_offset0, s20, s00, flags0;
+	  u32 bi1, fi1, len1, l3_offset1, s21, s01, flags1;
+	  u8 is_eop0, error0, next0;
+	  u8 is_eop1, error1, next1;
+	  ixge_descriptor_t d0, d1;
+
+	  vlib_prefetch_buffer_with_index (vm, to_rx[2], STORE);
+	  vlib_prefetch_buffer_with_index (vm, to_rx[3], STORE);
+
+	  CLIB_PREFETCH (d + 2, 32, STORE);
+
+	  d0.as_u32x4 = d[0].as_u32x4;
+	  d1.as_u32x4 = d[1].as_u32x4;
+
+	  s20 = d0.rx_from_hw.status[2];
+	  s21 = d1.rx_from_hw.status[2];
+
+	  s00 = d0.rx_from_hw.status[0];
+	  s01 = d1.rx_from_hw.status[0];
+
+	  if (!
+	      ((s20 & s21) & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE))
+	    goto found_hw_owned_descriptor_x2;
+
+	  bi0 = to_rx[0];
+	  bi1 = to_rx[1];
+
+	  ASSERT (to_add - 1 >= xm->rx_buffers_to_add);
+	  fi0 = to_add[0];
+	  fi1 = to_add[-1];
+
+	  to_rx[0] = fi0;
+	  to_rx[1] = fi1;
+	  to_rx += 2;
+	  to_add -= 2;
+
+	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
+		  vlib_buffer_is_known (vm, bi0));
+	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
+		  vlib_buffer_is_known (vm, bi1));
+	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
+		  vlib_buffer_is_known (vm, fi0));
+	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
+		  vlib_buffer_is_known (vm, fi1));
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /*
+	   * Turn this on if you run into
+	   * "bad monkey" contexts, and you want to know exactly
+	   * which nodes they've visited... See main.c...
+	   */
+	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b1);
+
+	  CLIB_PREFETCH (b0->data, CLIB_CACHE_LINE_BYTES, LOAD);
+	  CLIB_PREFETCH (b1->data, CLIB_CACHE_LINE_BYTES, LOAD);
+
+	  is_eop0 = (s20 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET) != 0;
+	  is_eop1 = (s21 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET) != 0;
+
+	  ixge_rx_next_and_error_from_status_x2 (xd, s00, s20, s01, s21,
+						 &next0, &error0, &flags0,
+						 &next1, &error1, &flags1);
+
+	  next0 = is_sop ? next0 : next_index_sop;
+	  next1 = is_eop0 ? next1 : next0;
+	  next_index_sop = next1;
+
+	  b0->flags |= flags0 | (!is_eop0 << VLIB_BUFFER_LOG2_NEXT_PRESENT);
+	  b1->flags |= flags1 | (!is_eop1 << VLIB_BUFFER_LOG2_NEXT_PRESENT);
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
+	  vnet_buffer (b1)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+	  vnet_buffer (b1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+
+	  b0->error = node->errors[error0];
+	  b1->error = node->errors[error1];
+
+	  len0 = d0.rx_from_hw.n_packet_bytes_this_descriptor;
+	  len1 = d1.rx_from_hw.n_packet_bytes_this_descriptor;
+	  n_bytes += len0 + len1;
+	  n_packets += is_eop0 + is_eop1;
+
+	  /* Give new buffers to hardware. */
+	  d0.rx_to_hw.tail_address =
+	    vlib_get_buffer_data_physical_address (vm, fi0);
+	  d1.rx_to_hw.tail_address =
+	    vlib_get_buffer_data_physical_address (vm, fi1);
+	  d0.rx_to_hw.head_address = d[0].rx_to_hw.tail_address;
+	  d1.rx_to_hw.head_address = d[1].rx_to_hw.tail_address;
+	  d[0].as_u32x4 = d0.as_u32x4;
+	  d[1].as_u32x4 = d1.as_u32x4;
+
+	  d += 2;
+	  n_descriptors_left -= 2;
+
+	  /* Point to either l2 or l3 header depending on next. */
+	  l3_offset0 = (is_sop && (next0 != IXGE_RX_NEXT_ETHERNET_INPUT))
+	    ? IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s00) : 0;
+	  l3_offset1 = (is_eop0 && (next1 != IXGE_RX_NEXT_ETHERNET_INPUT))
+	    ? IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s01) : 0;
+
+	  b0->current_length = len0 - l3_offset0;
+	  b1->current_length = len1 - l3_offset1;
+	  b0->current_data = l3_offset0;
+	  b1->current_data = l3_offset1;
+
+	  b_last->next_buffer = is_sop ? ~0 : bi0;
+	  b0->next_buffer = is_eop0 ? ~0 : bi1;
+	  bi_last = bi1;
+	  b_last = b1;
+
+	  if (CLIB_DEBUG > 0)
+	    {
+	      u32 bi_sop0 = is_sop ? bi0 : bi_sop;
+	      u32 bi_sop1 = is_eop0 ? bi1 : bi_sop0;
+
+	      if (is_eop0)
+		{
+		  u8 *msg = vlib_validate_buffer (vm, bi_sop0,
+						  /* follow_buffer_next */ 1);
+		  ASSERT (!msg);
+		}
+	      if (is_eop1)
+		{
+		  u8 *msg = vlib_validate_buffer (vm, bi_sop1,
+						  /* follow_buffer_next */ 1);
+		  ASSERT (!msg);
+		}
+	    }
+	  if (0)		/* "Dave" version */
+	    {
+	      u32 bi_sop0 = is_sop ? bi0 : bi_sop;
+	      u32 bi_sop1 = is_eop0 ? bi1 : bi_sop0;
+
+	      if (is_eop0)
+		{
+		  to_next[0] = bi_sop0;
+		  to_next++;
+		  n_left_to_next--;
+
+		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+						   to_next, n_left_to_next,
+						   bi_sop0, next0);
+		}
+	      if (is_eop1)
+		{
+		  to_next[0] = bi_sop1;
+		  to_next++;
+		  n_left_to_next--;
+
+		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+						   to_next, n_left_to_next,
+						   bi_sop1, next1);
+		}
+	      is_sop = is_eop1;
+	      bi_sop = bi_sop1;
+	    }
+	  if (1)		/* "Eliot" version */
+	    {
+	      /* Speculatively enqueue to cached next. */
+	      u8 saved_is_sop = is_sop;
+	      u32 bi_sop_save = bi_sop;
+
+	      bi_sop = saved_is_sop ? bi0 : bi_sop;
+	      to_next[0] = bi_sop;
+	      to_next += is_eop0;
+	      n_left_to_next -= is_eop0;
+
+	      bi_sop = is_eop0 ? bi1 : bi_sop;
+	      to_next[0] = bi_sop;
+	      to_next += is_eop1;
+	      n_left_to_next -= is_eop1;
+
+	      is_sop = is_eop1;
+
+	      if (PREDICT_FALSE
+		  (!(next0 == next_index && next1 == next_index)))
+		{
+		  /* Undo speculation. */
+		  to_next -= is_eop0 + is_eop1;
+		  n_left_to_next += is_eop0 + is_eop1;
+
+		  /* Re-do both descriptors being careful about where we enqueue. */
+		  bi_sop = saved_is_sop ? bi0 : bi_sop_save;
+		  if (is_eop0)
+		    {
+		      if (next0 != next_index)
+			vlib_set_next_frame_buffer (vm, node, next0, bi_sop);
+		      else
+			{
+			  to_next[0] = bi_sop;
+			  to_next += 1;
+			  n_left_to_next -= 1;
+			}
+		    }
+
+		  bi_sop = is_eop0 ? bi1 : bi_sop;
+		  if (is_eop1)
+		    {
+		      if (next1 != next_index)
+			vlib_set_next_frame_buffer (vm, node, next1, bi_sop);
+		      else
+			{
+			  to_next[0] = bi_sop;
+			  to_next += 1;
+			  n_left_to_next -= 1;
+			}
+		    }
+
+		  /* Switch cached next index when next for both packets is the same. */
+		  if (is_eop0 && is_eop1 && next0 == next1)
+		    {
+		      vlib_put_next_frame (vm, node, next_index,
+					   n_left_to_next);
+		      next_index = next0;
+		      vlib_get_next_frame (vm, node, next_index,
+					   to_next, n_left_to_next);
+		    }
+		}
+	    }
+	}
+
+      /* Bail out of dual loop and proceed with single loop. */
+    found_hw_owned_descriptor_x2:
+
+      while (n_descriptors_left > 0 && n_left_to_next > 0)
+	{
+	  vlib_buffer_t *b0;
+	  u32 bi0, fi0, len0, l3_offset0, s20, s00, flags0;
+	  u8 is_eop0, error0, next0;
+	  ixge_descriptor_t d0;
+
+	  d0.as_u32x4 = d[0].as_u32x4;
+
+	  s20 = d0.rx_from_hw.status[2];
+	  s00 = d0.rx_from_hw.status[0];
+
+	  if (!(s20 & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE))
+	    goto found_hw_owned_descriptor_x1;
+
+	  bi0 = to_rx[0];
+	  ASSERT (to_add >= xm->rx_buffers_to_add);
+	  fi0 = to_add[0];
+
+	  to_rx[0] = fi0;
+	  to_rx += 1;
+	  to_add -= 1;
+
+	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
+		  vlib_buffer_is_known (vm, bi0));
+	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
+		  vlib_buffer_is_known (vm, fi0));
+
+	  b0 = vlib_get_buffer (vm, bi0);
+
+	  /*
+	   * Turn this on if you run into
+	   * "bad monkey" contexts, and you want to know exactly
+	   * which nodes they've visited...
+	   */
+	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
+
+	  is_eop0 = (s20 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET) != 0;
+	  ixge_rx_next_and_error_from_status_x1
+	    (xd, s00, s20, &next0, &error0, &flags0);
+
+	  next0 = is_sop ? next0 : next_index_sop;
+	  next_index_sop = next0;
+
+	  b0->flags |= flags0 | (!is_eop0 << VLIB_BUFFER_LOG2_NEXT_PRESENT);
+
+	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
+	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+
+	  b0->error = node->errors[error0];
+
+	  len0 = d0.rx_from_hw.n_packet_bytes_this_descriptor;
+	  n_bytes += len0;
+	  n_packets += is_eop0;
+
+	  /* Give new buffer to hardware. */
+	  d0.rx_to_hw.tail_address =
+	    vlib_get_buffer_data_physical_address (vm, fi0);
+	  d0.rx_to_hw.head_address = d0.rx_to_hw.tail_address;
+	  d[0].as_u32x4 = d0.as_u32x4;
+
+	  d += 1;
+	  n_descriptors_left -= 1;
+
+	  /* Point to either l2 or l3 header depending on next. */
+	  l3_offset0 = (is_sop && (next0 != IXGE_RX_NEXT_ETHERNET_INPUT))
+	    ? IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s00) : 0;
+	  b0->current_length = len0 - l3_offset0;
+	  b0->current_data = l3_offset0;
+
+	  b_last->next_buffer = is_sop ? ~0 : bi0;
+	  bi_last = bi0;
+	  b_last = b0;
+
+	  bi_sop = is_sop ? bi0 : bi_sop;
+
+	  if (CLIB_DEBUG > 0 && is_eop0)
+	    {
+	      u8 *msg =
+		vlib_validate_buffer (vm, bi_sop, /* follow_buffer_next */ 1);
+	      ASSERT (!msg);
+	    }
+
+	  if (0)		/* "Dave" version */
+	    {
+	      if (is_eop0)
+		{
+		  to_next[0] = bi_sop;
+		  to_next++;
+		  n_left_to_next--;
+
+		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+						   to_next, n_left_to_next,
+						   bi_sop, next0);
+		}
+	    }
+	  if (1)		/* "Eliot" version */
+	    {
+	      if (PREDICT_TRUE (next0 == next_index))
+		{
+		  to_next[0] = bi_sop;
+		  to_next += is_eop0;
+		  n_left_to_next -= is_eop0;
+		}
+	      else
+		{
+		  if (next0 != next_index && is_eop0)
+		    vlib_set_next_frame_buffer (vm, node, next0, bi_sop);
+
+		  vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+		  next_index = next0;
+		  vlib_get_next_frame (vm, node, next_index,
+				       to_next, n_left_to_next);
+		}
+	    }
+	  is_sop = is_eop0;
+	}
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+found_hw_owned_descriptor_x1:
+  if (n_descriptors_left > 0)
+    vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+
+  _vec_len (xm->rx_buffers_to_add) = (to_add + 1) - xm->rx_buffers_to_add;
+
+  {
+    u32 n_done = n_descriptors - n_descriptors_left;
+
+    if (n_trace > 0 && n_done > 0)
+      {
+	u32 n = clib_min (n_trace, n_done);
+	ixge_rx_trace (xm, xd, dq,
+		       d_trace_save,
+		       d_trace_buffers,
+		       &dq->descriptors[start_descriptor_index], n);
+	vlib_set_trace_count (vm, node, n_trace - n);
+      }
+    if (d_trace_save)
+      {
+	_vec_len (d_trace_save) = 0;
+	_vec_len (d_trace_buffers) = 0;
+      }
+
+    /* Don't keep a reference to b_last if we don't have to.
+       Otherwise we can over-write a next_buffer pointer after already haven
+       enqueued a packet. */
+    if (is_sop)
+      {
+	b_last->next_buffer = ~0;
+	bi_last = ~0;
+      }
+
+    dq->rx.n_descriptors_done_this_call = n_done;
+    dq->rx.n_descriptors_done_total += n_done;
+    dq->rx.is_start_of_packet = is_sop;
+    dq->rx.saved_start_of_packet_buffer_index = bi_sop;
+    dq->rx.saved_last_buffer_index = bi_last;
+    dq->rx.saved_start_of_packet_next_index = next_index_sop;
+    dq->rx.next_index = next_index;
+    dq->rx.n_bytes += n_bytes;
+
+    return n_packets;
+  }
+}
+
+static uword
+ixge_rx_queue (ixge_main_t * xm,
+	       ixge_device_t * xd,
+	       vlib_node_runtime_t * node, u32 queue_index)
+{
+  ixge_dma_queue_t *dq =
+    vec_elt_at_index (xd->dma_queues[VLIB_RX], queue_index);
+  ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_RX, dq->queue_index);
+  uword n_packets = 0;
+  u32 hw_head_index, sw_head_index;
+
+  /* One time initialization. */
+  if (!dq->rx.node)
+    {
+      dq->rx.node = node;
+      dq->rx.is_start_of_packet = 1;
+      dq->rx.saved_start_of_packet_buffer_index = ~0;
+      dq->rx.saved_last_buffer_index = ~0;
+    }
+
+  dq->rx.next_index = node->cached_next_index;
+
+  dq->rx.n_descriptors_done_total = 0;
+  dq->rx.n_descriptors_done_this_call = 0;
+  dq->rx.n_bytes = 0;
+
+  /* Fetch head from hardware and compare to where we think we are. */
+  hw_head_index = dr->head_index;
+  sw_head_index = dq->head_index;
+
+  if (hw_head_index == sw_head_index)
+    goto done;
+
+  if (hw_head_index < sw_head_index)
+    {
+      u32 n_tried = dq->n_descriptors - sw_head_index;
+      n_packets += ixge_rx_queue_no_wrap (xm, xd, dq, sw_head_index, n_tried);
+      sw_head_index =
+	ixge_ring_add (dq, sw_head_index,
+		       dq->rx.n_descriptors_done_this_call);
+
+      if (dq->rx.n_descriptors_done_this_call != n_tried)
+	goto done;
+    }
+  if (hw_head_index >= sw_head_index)
+    {
+      u32 n_tried = hw_head_index - sw_head_index;
+      n_packets += ixge_rx_queue_no_wrap (xm, xd, dq, sw_head_index, n_tried);
+      sw_head_index =
+	ixge_ring_add (dq, sw_head_index,
+		       dq->rx.n_descriptors_done_this_call);
+    }
+
+done:
+  dq->head_index = sw_head_index;
+  dq->tail_index =
+    ixge_ring_add (dq, dq->tail_index, dq->rx.n_descriptors_done_total);
+
+  /* Give tail back to hardware. */
+  CLIB_MEMORY_BARRIER ();
+
+  dr->tail_index = dq->tail_index;
+
+  vlib_increment_combined_counter (vnet_main.
+				   interface_main.combined_sw_if_counters +
+				   VNET_INTERFACE_COUNTER_RX,
+				   0 /* cpu_index */ ,
+				   xd->vlib_sw_if_index, n_packets,
+				   dq->rx.n_bytes);
+
+  return n_packets;
+}
+
+static void
+ixge_interrupt (ixge_main_t * xm, ixge_device_t * xd, u32 i)
+{
+  vlib_main_t *vm = xm->vlib_main;
+  ixge_regs_t *r = xd->regs;
+
+  if (i != 20)
+    {
+      ELOG_TYPE_DECLARE (e) =
+      {
+	.function = (char *) __FUNCTION__,.format =
+	  "ixge %d, %s",.format_args = "i1t1",.n_enum_strings =
+	  16,.enum_strings =
+	{
+      "flow director",
+	    "rx miss",
+	    "pci exception",
+	    "mailbox",
+	    "link status change",
+	    "linksec key exchange",
+	    "manageability event",
+	    "reserved23",
+	    "sdp0",
+	    "sdp1",
+	    "sdp2",
+	    "sdp3",
+	    "ecc", "descriptor handler error", "tcp timer", "other",},};
+      struct
+      {
+	u8 instance;
+	u8 index;
+      } *ed;
+      ed = ELOG_DATA (&vm->elog_main, e);
+      ed->instance = xd->device_index;
+      ed->index = i - 16;
+    }
+  else
+    {
+      u32 v = r->xge_mac.link_status;
+      uword is_up = (v & (1 << 30)) != 0;
+
+      ELOG_TYPE_DECLARE (e) =
+      {
+      .function = (char *) __FUNCTION__,.format =
+	  "ixge %d, link status change 0x%x",.format_args = "i4i4",};
+      struct
+      {
+	u32 instance, link_status;
+      } *ed;
+      ed = ELOG_DATA (&vm->elog_main, e);
+      ed->instance = xd->device_index;
+      ed->link_status = v;
+      xd->link_status_at_last_link_change = v;
+
+      vlib_process_signal_event (vm, ixge_process_node.index,
+				 EVENT_SET_FLAGS,
+				 ((is_up << 31) | xd->vlib_hw_if_index));
+    }
+}
+
+always_inline u32
+clean_block (u32 * b, u32 * t, u32 n_left)
+{
+  u32 *t0 = t;
+
+  while (n_left >= 4)
+    {
+      u32 bi0, bi1, bi2, bi3;
+
+      t[0] = bi0 = b[0];
+      b[0] = 0;
+      t += bi0 != 0;
+
+      t[0] = bi1 = b[1];
+      b[1] = 0;
+      t += bi1 != 0;
+
+      t[0] = bi2 = b[2];
+      b[2] = 0;
+      t += bi2 != 0;
+
+      t[0] = bi3 = b[3];
+      b[3] = 0;
+      t += bi3 != 0;
+
+      b += 4;
+      n_left -= 4;
+    }
+
+  while (n_left > 0)
+    {
+      u32 bi0;
+
+      t[0] = bi0 = b[0];
+      b[0] = 0;
+      t += bi0 != 0;
+      b += 1;
+      n_left -= 1;
+    }
+
+  return t - t0;
+}
+
+static void
+ixge_tx_queue (ixge_main_t * xm, ixge_device_t * xd, u32 queue_index)
+{
+  vlib_main_t *vm = xm->vlib_main;
+  ixge_dma_queue_t *dq =
+    vec_elt_at_index (xd->dma_queues[VLIB_TX], queue_index);
+  u32 n_clean, *b, *t, *t0;
+  i32 n_hw_owned_descriptors;
+  i32 first_to_clean, last_to_clean;
+  u64 hwbp_race = 0;
+
+  /* Handle case where head write back pointer update
+   * arrives after the interrupt during high PCI bus loads.
+   */
+  while ((dq->head_index == dq->tx.head_index_write_back[0]) &&
+	 dq->tx.n_buffers_on_ring && (dq->head_index != dq->tail_index))
+    {
+      hwbp_race++;
+      if (IXGE_HWBP_RACE_ELOG && (hwbp_race == 1))
+	{
+	  ELOG_TYPE_DECLARE (e) =
+	  {
+	  .function = (char *) __FUNCTION__,.format =
+	      "ixge %d tx head index race: head %4d, tail %4d, buffs %4d",.format_args
+	      = "i4i4i4i4",};
+	  struct
+	  {
+	    u32 instance, head_index, tail_index, n_buffers_on_ring;
+	  } *ed;
+	  ed = ELOG_DATA (&vm->elog_main, e);
+	  ed->instance = xd->device_index;
+	  ed->head_index = dq->head_index;
+	  ed->tail_index = dq->tail_index;
+	  ed->n_buffers_on_ring = dq->tx.n_buffers_on_ring;
+	}
+    }
+
+  dq->head_index = dq->tx.head_index_write_back[0];
+  n_hw_owned_descriptors = ixge_ring_sub (dq, dq->head_index, dq->tail_index);
+  ASSERT (dq->tx.n_buffers_on_ring >= n_hw_owned_descriptors);
+  n_clean = dq->tx.n_buffers_on_ring - n_hw_owned_descriptors;
+
+  if (IXGE_HWBP_RACE_ELOG && hwbp_race)
+    {
+      ELOG_TYPE_DECLARE (e) =
+      {
+      .function = (char *) __FUNCTION__,.format =
+	  "ixge %d tx head index race: head %4d, hw_owned %4d, n_clean %4d, retries %d",.format_args
+	  = "i4i4i4i4i4",};
+      struct
+      {
+	u32 instance, head_index, n_hw_owned_descriptors, n_clean, retries;
+      } *ed;
+      ed = ELOG_DATA (&vm->elog_main, e);
+      ed->instance = xd->device_index;
+      ed->head_index = dq->head_index;
+      ed->n_hw_owned_descriptors = n_hw_owned_descriptors;
+      ed->n_clean = n_clean;
+      ed->retries = hwbp_race;
+    }
+
+  /*
+   * This function used to wait until hardware owned zero descriptors.
+   * At high PPS rates, that doesn't happen until the TX ring is
+   * completely full of descriptors which need to be cleaned up.
+   * That, in turn, causes TX ring-full drops and/or long RX service
+   * interruptions.
+   */
+  if (n_clean == 0)
+    return;
+
+  /* Clean the n_clean descriptors prior to the reported hardware head */
+  last_to_clean = dq->head_index - 1;
+  last_to_clean = (last_to_clean < 0) ? last_to_clean + dq->n_descriptors :
+    last_to_clean;
+
+  first_to_clean = (last_to_clean) - (n_clean - 1);
+  first_to_clean = (first_to_clean < 0) ? first_to_clean + dq->n_descriptors :
+    first_to_clean;
+
+  vec_resize (xm->tx_buffers_pending_free, dq->n_descriptors - 1);
+  t0 = t = xm->tx_buffers_pending_free;
+  b = dq->descriptor_buffer_indices + first_to_clean;
+
+  /* Wrap case: clean from first to end, then start to last */
+  if (first_to_clean > last_to_clean)
+    {
+      t += clean_block (b, t, (dq->n_descriptors - 1) - first_to_clean);
+      first_to_clean = 0;
+      b = dq->descriptor_buffer_indices;
+    }
+
+  /* Typical case: clean from first to last */
+  if (first_to_clean <= last_to_clean)
+    t += clean_block (b, t, (last_to_clean - first_to_clean) + 1);
+
+  if (t > t0)
+    {
+      u32 n = t - t0;
+      vlib_buffer_free_no_next (vm, t0, n);
+      ASSERT (dq->tx.n_buffers_on_ring >= n);
+      dq->tx.n_buffers_on_ring -= n;
+      _vec_len (xm->tx_buffers_pending_free) = 0;
+    }
+}
+
+/* RX queue interrupts 0 thru 7; TX 8 thru 15. */
+always_inline uword
+ixge_interrupt_is_rx_queue (uword i)
+{
+  return i < 8;
+}
+
+always_inline uword
+ixge_interrupt_is_tx_queue (uword i)
+{
+  return i >= 8 && i < 16;
+}
+
+always_inline uword
+ixge_tx_queue_to_interrupt (uword i)
+{
+  return 8 + i;
+}
+
+always_inline uword
+ixge_rx_queue_to_interrupt (uword i)
+{
+  return 0 + i;
+}
+
+always_inline uword
+ixge_interrupt_rx_queue (uword i)
+{
+  ASSERT (ixge_interrupt_is_rx_queue (i));
+  return i - 0;
+}
+
+always_inline uword
+ixge_interrupt_tx_queue (uword i)
+{
+  ASSERT (ixge_interrupt_is_tx_queue (i));
+  return i - 8;
+}
+
+static uword
+ixge_device_input (ixge_main_t * xm,
+		   ixge_device_t * xd, vlib_node_runtime_t * node)
+{
+  ixge_regs_t *r = xd->regs;
+  u32 i, s;
+  uword n_rx_packets = 0;
+
+  s = r->interrupt.status_write_1_to_set;
+  if (s)
+    r->interrupt.status_write_1_to_clear = s;
+
+  /* *INDENT-OFF* */
+  foreach_set_bit (i, s, ({
+    if (ixge_interrupt_is_rx_queue (i))
+      n_rx_packets += ixge_rx_queue (xm, xd, node, ixge_interrupt_rx_queue (i));
+
+    else if (ixge_interrupt_is_tx_queue (i))
+      ixge_tx_queue (xm, xd, ixge_interrupt_tx_queue (i));
+
+    else
+      ixge_interrupt (xm, xd, i);
+  }));
+  /* *INDENT-ON* */
+
+  return n_rx_packets;
+}
+
+static uword
+ixge_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * f)
+{
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd;
+  uword n_rx_packets = 0;
+
+  if (node->state == VLIB_NODE_STATE_INTERRUPT)
+    {
+      uword i;
+
+      /* Loop over devices with interrupts. */
+      /* *INDENT-OFF* */
+      foreach_set_bit (i, node->runtime_data[0], ({
+	xd = vec_elt_at_index (xm->devices, i);
+	n_rx_packets += ixge_device_input (xm, xd, node);
+
+	/* Re-enable interrupts since we're going to stay in interrupt mode. */
+	if (! (node->flags & VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE))
+	  xd->regs->interrupt.enable_write_1_to_set = ~0;
+      }));
+      /* *INDENT-ON* */
+
+      /* Clear mask of devices with pending interrupts. */
+      node->runtime_data[0] = 0;
+    }
+  else
+    {
+      /* Poll all devices for input/interrupts. */
+      vec_foreach (xd, xm->devices)
+      {
+	n_rx_packets += ixge_device_input (xm, xd, node);
+
+	/* Re-enable interrupts when switching out of polling mode. */
+	if (node->flags &
+	    VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE)
+	  xd->regs->interrupt.enable_write_1_to_set = ~0;
+      }
+    }
+
+  return n_rx_packets;
+}
+
+static char *ixge_error_strings[] = {
+#define _(n,s) s,
+  foreach_ixge_error
+#undef _
+};
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ixge_input_node, static) = {
+  .function = ixge_input,
+  .type = VLIB_NODE_TYPE_INPUT,
+  .name = "ixge-input",
+
+  /* Will be enabled if/when hardware is detected. */
+  .state = VLIB_NODE_STATE_DISABLED,
+
+  .format_buffer = format_ethernet_header_with_length,
+  .format_trace = format_ixge_rx_dma_trace,
+
+  .n_errors = IXGE_N_ERROR,
+  .error_strings = ixge_error_strings,
+
+  .n_next_nodes = IXGE_RX_N_NEXT,
+  .next_nodes = {
+    [IXGE_RX_NEXT_DROP] = "error-drop",
+    [IXGE_RX_NEXT_ETHERNET_INPUT] = "ethernet-input",
+    [IXGE_RX_NEXT_IP4_INPUT] = "ip4-input",
+    [IXGE_RX_NEXT_IP6_INPUT] = "ip6-input",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH_CLONE (ixge_input)
+CLIB_MULTIARCH_SELECT_FN (ixge_input)
+/* *INDENT-ON* */
+
+static u8 *
+format_ixge_device_name (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, i);
+  return format (s, "TenGigabitEthernet%U",
+		 format_vlib_pci_handle, &xd->pci_device.bus_address);
+}
+
+#define IXGE_COUNTER_IS_64_BIT (1 << 0)
+#define IXGE_COUNTER_NOT_CLEAR_ON_READ (1 << 1)
+
+static u8 ixge_counter_flags[] = {
+#define _(a,f) 0,
+#define _64(a,f) IXGE_COUNTER_IS_64_BIT,
+  foreach_ixge_counter
+#undef _
+#undef _64
+};
+
+static void
+ixge_update_counters (ixge_device_t * xd)
+{
+  /* Byte offset for counter registers. */
+  static u32 reg_offsets[] = {
+#define _(a,f) (a) / sizeof (u32),
+#define _64(a,f) _(a,f)
+    foreach_ixge_counter
+#undef _
+#undef _64
+  };
+  volatile u32 *r = (volatile u32 *) xd->regs;
+  int i;
+
+  for (i = 0; i < ARRAY_LEN (xd->counters); i++)
+    {
+      u32 o = reg_offsets[i];
+      xd->counters[i] += r[o];
+      if (ixge_counter_flags[i] & IXGE_COUNTER_NOT_CLEAR_ON_READ)
+	r[o] = 0;
+      if (ixge_counter_flags[i] & IXGE_COUNTER_IS_64_BIT)
+	xd->counters[i] += (u64) r[o + 1] << (u64) 32;
+    }
+}
+
+static u8 *
+format_ixge_device_id (u8 * s, va_list * args)
+{
+  u32 device_id = va_arg (*args, u32);
+  char *t = 0;
+  switch (device_id)
+    {
+#define _(f,n) case n: t = #f; break;
+      foreach_ixge_pci_device_id;
+#undef _
+    default:
+      t = 0;
+      break;
+    }
+  if (t == 0)
+    s = format (s, "unknown 0x%x", device_id);
+  else
+    s = format (s, "%s", t);
+  return s;
+}
+
+static u8 *
+format_ixge_link_status (u8 * s, va_list * args)
+{
+  ixge_device_t *xd = va_arg (*args, ixge_device_t *);
+  u32 v = xd->link_status_at_last_link_change;
+
+  s = format (s, "%s", (v & (1 << 30)) ? "up" : "down");
+
+  {
+    char *modes[] = {
+      "1g", "10g parallel", "10g serial", "autoneg",
+    };
+    char *speeds[] = {
+      "unknown", "100m", "1g", "10g",
+    };
+    s = format (s, ", mode %s, speed %s",
+		modes[(v >> 26) & 3], speeds[(v >> 28) & 3]);
+  }
+
+  return s;
+}
+
+static u8 *
+format_ixge_device (u8 * s, va_list * args)
+{
+  u32 dev_instance = va_arg (*args, u32);
+  CLIB_UNUSED (int verbose) = va_arg (*args, int);
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, dev_instance);
+  ixge_phy_t *phy = xd->phys + xd->phy_index;
+  uword indent = format_get_indent (s);
+
+  ixge_update_counters (xd);
+  xd->link_status_at_last_link_change = xd->regs->xge_mac.link_status;
+
+  s = format (s, "Intel 8259X: id %U\n%Ulink %U",
+	      format_ixge_device_id, xd->device_id,
+	      format_white_space, indent + 2, format_ixge_link_status, xd);
+
+  {
+
+    s = format (s, "\n%UPCIe %U", format_white_space, indent + 2,
+		format_vlib_pci_link_speed, &xd->pci_device);
+  }
+
+  s = format (s, "\n%U", format_white_space, indent + 2);
+  if (phy->mdio_address != ~0)
+    s = format (s, "PHY address %d, id 0x%x", phy->mdio_address, phy->id);
+  else if (xd->sfp_eeprom.id == SFP_ID_sfp)
+    s = format (s, "SFP %U", format_sfp_eeprom, &xd->sfp_eeprom);
+  else
+    s = format (s, "PHY not found");
+
+  /* FIXME */
+  {
+    ixge_dma_queue_t *dq = vec_elt_at_index (xd->dma_queues[VLIB_RX], 0);
+    ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_RX, 0);
+    u32 hw_head_index = dr->head_index;
+    u32 sw_head_index = dq->head_index;
+    u32 nitems;
+
+    nitems = ixge_ring_sub (dq, hw_head_index, sw_head_index);
+    s = format (s, "\n%U%d unprocessed, %d total buffers on rx queue 0 ring",
+		format_white_space, indent + 2, nitems, dq->n_descriptors);
+
+    s = format (s, "\n%U%d buffers in driver rx cache",
+		format_white_space, indent + 2,
+		vec_len (xm->rx_buffers_to_add));
+
+    s = format (s, "\n%U%d buffers on tx queue 0 ring",
+		format_white_space, indent + 2,
+		xd->dma_queues[VLIB_TX][0].tx.n_buffers_on_ring);
+  }
+  {
+    u32 i;
+    u64 v;
+    static char *names[] = {
+#define _(a,f) #f,
+#define _64(a,f) _(a,f)
+      foreach_ixge_counter
+#undef _
+#undef _64
+    };
+
+    for (i = 0; i < ARRAY_LEN (names); i++)
+      {
+	v = xd->counters[i] - xd->counters_last_clear[i];
+	if (v != 0)
+	  s = format (s, "\n%U%-40U%16Ld",
+		      format_white_space, indent + 2,
+		      format_c_identifier, names[i], v);
+      }
+  }
+
+  return s;
+}
+
+static void
+ixge_clear_hw_interface_counters (u32 instance)
+{
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, instance);
+  ixge_update_counters (xd);
+  memcpy (xd->counters_last_clear, xd->counters, sizeof (xd->counters));
+}
+
+/*
+ * Dynamically redirect all pkts from a specific interface
+ * to the specified node
+ */
+static void
+ixge_set_interface_next_node (vnet_main_t * vnm, u32 hw_if_index,
+			      u32 node_index)
+{
+  ixge_main_t *xm = &ixge_main;
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+  ixge_device_t *xd = vec_elt_at_index (xm->devices, hw->dev_instance);
+
+  /* Shut off redirection */
+  if (node_index == ~0)
+    {
+      xd->per_interface_next_index = node_index;
+      return;
+    }
+
+  xd->per_interface_next_index =
+    vlib_node_add_next (xm->vlib_main, ixge_input_node.index, node_index);
+}
+
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (ixge_device_class) = {
+  .name = "ixge",
+  .tx_function = ixge_interface_tx,
+  .format_device_name = format_ixge_device_name,
+  .format_device = format_ixge_device,
+  .format_tx_trace = format_ixge_tx_dma_trace,
+  .clear_counters = ixge_clear_hw_interface_counters,
+  .admin_up_down_function = ixge_interface_admin_up_down,
+  .rx_redirect_to_node = ixge_set_interface_next_node,
+  .flatten_output_chains = 1,
+};
+/* *INDENT-ON* */
+
+#define IXGE_N_BYTES_IN_RX_BUFFER  (2048)	// DAW-HACK: Set Rx buffer size so all packets < ETH_MTU_SIZE fit in the buffer (i.e. sop & eop for all descriptors).
+
+static clib_error_t *
+ixge_dma_init (ixge_device_t * xd, vlib_rx_or_tx_t rt, u32 queue_index)
+{
+  ixge_main_t *xm = &ixge_main;
+  vlib_main_t *vm = xm->vlib_main;
+  ixge_dma_queue_t *dq;
+  clib_error_t *error = 0;
+
+  vec_validate (xd->dma_queues[rt], queue_index);
+  dq = vec_elt_at_index (xd->dma_queues[rt], queue_index);
+
+  if (!xm->n_descriptors_per_cache_line)
+    xm->n_descriptors_per_cache_line =
+      CLIB_CACHE_LINE_BYTES / sizeof (dq->descriptors[0]);
+
+  if (!xm->n_bytes_in_rx_buffer)
+    xm->n_bytes_in_rx_buffer = IXGE_N_BYTES_IN_RX_BUFFER;
+  xm->n_bytes_in_rx_buffer = round_pow2 (xm->n_bytes_in_rx_buffer, 1024);
+  if (!xm->vlib_buffer_free_list_index)
+    {
+      xm->vlib_buffer_free_list_index =
+	vlib_buffer_get_or_create_free_list (vm, xm->n_bytes_in_rx_buffer,
+					     "ixge rx");
+      ASSERT (xm->vlib_buffer_free_list_index != 0);
+    }
+
+  if (!xm->n_descriptors[rt])
+    xm->n_descriptors[rt] = 4 * VLIB_FRAME_SIZE;
+
+  dq->queue_index = queue_index;
+  dq->n_descriptors =
+    round_pow2 (xm->n_descriptors[rt], xm->n_descriptors_per_cache_line);
+  dq->head_index = dq->tail_index = 0;
+
+  dq->descriptors = vlib_physmem_alloc_aligned (vm, &error,
+						dq->n_descriptors *
+						sizeof (dq->descriptors[0]),
+						128 /* per chip spec */ );
+  if (error)
+    return error;
+
+  memset (dq->descriptors, 0,
+	  dq->n_descriptors * sizeof (dq->descriptors[0]));
+  vec_resize (dq->descriptor_buffer_indices, dq->n_descriptors);
+
+  if (rt == VLIB_RX)
+    {
+      u32 n_alloc, i;
+
+      n_alloc = vlib_buffer_alloc_from_free_list
+	(vm, dq->descriptor_buffer_indices,
+	 vec_len (dq->descriptor_buffer_indices),
+	 xm->vlib_buffer_free_list_index);
+      ASSERT (n_alloc == vec_len (dq->descriptor_buffer_indices));
+      for (i = 0; i < n_alloc; i++)
+	{
+	  vlib_buffer_t *b =
+	    vlib_get_buffer (vm, dq->descriptor_buffer_indices[i]);
+	  dq->descriptors[i].rx_to_hw.tail_address =
+	    vlib_physmem_virtual_to_physical (vm, b->data);
+	}
+    }
+  else
+    {
+      u32 i;
+
+      dq->tx.head_index_write_back =
+	vlib_physmem_alloc (vm, &error, CLIB_CACHE_LINE_BYTES);
+
+      for (i = 0; i < dq->n_descriptors; i++)
+	dq->descriptors[i].tx = xm->tx_descriptor_template;
+
+      vec_validate (xm->tx_buffers_pending_free, dq->n_descriptors - 1);
+    }
+
+  {
+    ixge_dma_regs_t *dr = get_dma_regs (xd, rt, queue_index);
+    u64 a;
+
+    a = vlib_physmem_virtual_to_physical (vm, dq->descriptors);
+    dr->descriptor_address[0] = a & 0xFFFFFFFF;
+    dr->descriptor_address[1] = a >> (u64) 32;
+    dr->n_descriptor_bytes = dq->n_descriptors * sizeof (dq->descriptors[0]);
+    dq->head_index = dq->tail_index = 0;
+
+    if (rt == VLIB_RX)
+      {
+	ASSERT ((xm->n_bytes_in_rx_buffer / 1024) < 32);
+	dr->rx_split_control =
+	  ( /* buffer size */ ((xm->n_bytes_in_rx_buffer / 1024) << 0)
+	   | (			/* lo free descriptor threshold (units of 64 descriptors) */
+	       (1 << 22)) | (	/* descriptor type: advanced one buffer */
+			      (1 << 25)) | (	/* drop if no descriptors available */
+					     (1 << 28)));
+
+	/* Give hardware all but last 16 cache lines' worth of descriptors. */
+	dq->tail_index = dq->n_descriptors -
+	  16 * xm->n_descriptors_per_cache_line;
+      }
+    else
+      {
+	/* Make sure its initialized before hardware can get to it. */
+	dq->tx.head_index_write_back[0] = dq->head_index;
+
+	a =
+	  vlib_physmem_virtual_to_physical (vm, dq->tx.head_index_write_back);
+	dr->tx.head_index_write_back_address[0] = /* enable bit */ 1 | a;
+	dr->tx.head_index_write_back_address[1] = (u64) a >> (u64) 32;
+      }
+
+    /* DMA on 82599 does not work with [13] rx data write relaxed ordering
+       and [12] undocumented set. */
+    if (rt == VLIB_RX)
+      dr->dca_control &= ~((1 << 13) | (1 << 12));
+
+    CLIB_MEMORY_BARRIER ();
+
+    if (rt == VLIB_TX)
+      {
+	xd->regs->tx_dma_control |= (1 << 0);
+	dr->control |= ((32 << 0)	/* prefetch threshold */
+			| (64 << 8)	/* host threshold */
+			| (0 << 16) /* writeback threshold */ );
+      }
+
+    /* Enable this queue and wait for hardware to initialize
+       before adding to tail. */
+    if (rt == VLIB_TX)
+      {
+	dr->control |= 1 << 25;
+	while (!(dr->control & (1 << 25)))
+	  ;
+      }
+
+    /* Set head/tail indices and enable DMA. */
+    dr->head_index = dq->head_index;
+    dr->tail_index = dq->tail_index;
+  }
+
+  return error;
+}
+
+static u32
+ixge_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hw, u32 flags)
+{
+  ixge_device_t *xd;
+  ixge_regs_t *r;
+  u32 old;
+  ixge_main_t *xm = &ixge_main;
+
+  xd = vec_elt_at_index (xm->devices, hw->dev_instance);
+  r = xd->regs;
+
+  old = r->filter_control;
+
+  if (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL)
+    r->filter_control = old | (1 << 9) /* unicast promiscuous */ ;
+  else
+    r->filter_control = old & ~(1 << 9);
+
+  return old;
+}
+
+static void
+ixge_device_init (ixge_main_t * xm)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ixge_device_t *xd;
+
+  /* Reset chip(s). */
+  vec_foreach (xd, xm->devices)
+  {
+    ixge_regs_t *r = xd->regs;
+    const u32 reset_bit = (1 << 26) | (1 << 3);
+
+    r->control |= reset_bit;
+
+    /* No need to suspend.  Timed to take ~1e-6 secs */
+    while (r->control & reset_bit)
+      ;
+
+    /* Software loaded. */
+    r->extended_control |= (1 << 28);
+
+    ixge_phy_init (xd);
+
+    /* Register ethernet interface. */
+    {
+      u8 addr8[6];
+      u32 i, addr32[2];
+      clib_error_t *error;
+
+      addr32[0] = r->rx_ethernet_address0[0][0];
+      addr32[1] = r->rx_ethernet_address0[0][1];
+      for (i = 0; i < 6; i++)
+	addr8[i] = addr32[i / 4] >> ((i % 4) * 8);
+
+      error = ethernet_register_interface
+	(vnm, ixge_device_class.index, xd->device_index,
+	 /* ethernet address */ addr8,
+	 &xd->vlib_hw_if_index, ixge_flag_change);
+      if (error)
+	clib_error_report (error);
+    }
+
+    {
+      vnet_sw_interface_t *sw =
+	vnet_get_hw_sw_interface (vnm, xd->vlib_hw_if_index);
+      xd->vlib_sw_if_index = sw->sw_if_index;
+    }
+
+    ixge_dma_init (xd, VLIB_RX, /* queue_index */ 0);
+
+    xm->n_descriptors[VLIB_TX] = 20 * VLIB_FRAME_SIZE;
+
+    ixge_dma_init (xd, VLIB_TX, /* queue_index */ 0);
+
+    /* RX/TX queue 0 gets mapped to interrupt bits 0 & 8. */
+    r->interrupt.queue_mapping[0] = (( /* valid bit */ (1 << 7) |
+				      ixge_rx_queue_to_interrupt (0)) << 0);
+
+    r->interrupt.queue_mapping[0] |= (( /* valid bit */ (1 << 7) |
+				       ixge_tx_queue_to_interrupt (0)) << 8);
+
+    /* No use in getting too many interrupts.
+       Limit them to one every 3/4 ring size at line rate
+       min sized packets.
+       No need for this since kernel/vlib main loop provides adequate interrupt
+       limiting scheme. */
+    if (0)
+      {
+	f64 line_rate_max_pps =
+	  10e9 / (8 * (64 + /* interframe padding */ 20));
+	ixge_throttle_queue_interrupt (r, 0,
+				       .75 * xm->n_descriptors[VLIB_RX] /
+				       line_rate_max_pps);
+      }
+
+    /* Accept all multicast and broadcast packets. Should really add them
+       to the dst_ethernet_address register array. */
+    r->filter_control |= (1 << 10) | (1 << 8);
+
+    /* Enable frames up to size in mac frame size register. */
+    r->xge_mac.control |= 1 << 2;
+    r->xge_mac.rx_max_frame_size = (9216 + 14) << 16;
+
+    /* Enable all interrupts. */
+    if (!IXGE_ALWAYS_POLL)
+      r->interrupt.enable_write_1_to_set = ~0;
+  }
+}
+
+static uword
+ixge_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  ixge_main_t *xm = &ixge_main;
+  ixge_device_t *xd;
+  uword event_type, *event_data = 0;
+  f64 timeout, link_debounce_deadline;
+
+  ixge_device_init (xm);
+
+  /* Clear all counters. */
+  vec_foreach (xd, xm->devices)
+  {
+    ixge_update_counters (xd);
+    memset (xd->counters, 0, sizeof (xd->counters));
+  }
+
+  timeout = 30.0;
+  link_debounce_deadline = 1e70;
+
+  while (1)
+    {
+      /* 36 bit stat counters could overflow in ~50 secs.
+         We poll every 30 secs to be conservative. */
+      vlib_process_wait_for_event_or_clock (vm, timeout);
+
+      event_type = vlib_process_get_events (vm, &event_data);
+
+      switch (event_type)
+	{
+	case EVENT_SET_FLAGS:
+	  /* 1 ms */
+	  link_debounce_deadline = vlib_time_now (vm) + 1e-3;
+	  timeout = 1e-3;
+	  break;
+
+	case ~0:
+	  /* No events found: timer expired. */
+	  if (vlib_time_now (vm) > link_debounce_deadline)
+	    {
+	      vec_foreach (xd, xm->devices)
+	      {
+		ixge_regs_t *r = xd->regs;
+		u32 v = r->xge_mac.link_status;
+		uword is_up = (v & (1 << 30)) != 0;
+
+		vnet_hw_interface_set_flags
+		  (vnm, xd->vlib_hw_if_index,
+		   is_up ? VNET_HW_INTERFACE_FLAG_LINK_UP : 0);
+	      }
+	      link_debounce_deadline = 1e70;
+	      timeout = 30.0;
+	    }
+	  break;
+
+	default:
+	  ASSERT (0);
+	}
+
+      if (event_data)
+	_vec_len (event_data) = 0;
+
+      /* Query stats every 30 secs. */
+      {
+	f64 now = vlib_time_now (vm);
+	if (now - xm->time_last_stats_update > 30)
+	  {
+	    xm->time_last_stats_update = now;
+	    vec_foreach (xd, xm->devices) ixge_update_counters (xd);
+	  }
+      }
+    }
+
+  return 0;
+}
+
+static vlib_node_registration_t ixge_process_node = {
+  .function = ixge_process,
+  .type = VLIB_NODE_TYPE_PROCESS,
+  .name = "ixge-process",
+};
+
+clib_error_t *
+ixge_init (vlib_main_t * vm)
+{
+  ixge_main_t *xm = &ixge_main;
+  clib_error_t *error;
+
+  xm->vlib_main = vm;
+  memset (&xm->tx_descriptor_template, 0,
+	  sizeof (xm->tx_descriptor_template));
+  memset (&xm->tx_descriptor_template_mask, 0,
+	  sizeof (xm->tx_descriptor_template_mask));
+  xm->tx_descriptor_template.status0 =
+    (IXGE_TX_DESCRIPTOR_STATUS0_ADVANCED |
+     IXGE_TX_DESCRIPTOR_STATUS0_IS_ADVANCED |
+     IXGE_TX_DESCRIPTOR_STATUS0_INSERT_FCS);
+  xm->tx_descriptor_template_mask.status0 = 0xffff;
+  xm->tx_descriptor_template_mask.status1 = 0x00003fff;
+
+  xm->tx_descriptor_template_mask.status0 &=
+    ~(IXGE_TX_DESCRIPTOR_STATUS0_IS_END_OF_PACKET
+      | IXGE_TX_DESCRIPTOR_STATUS0_REPORT_STATUS);
+  xm->tx_descriptor_template_mask.status1 &=
+    ~(IXGE_TX_DESCRIPTOR_STATUS1_DONE);
+
+  error = vlib_call_init_function (vm, pci_bus_init);
+
+  return error;
+}
+
+VLIB_INIT_FUNCTION (ixge_init);
+
+
+static void
+ixge_pci_intr_handler (vlib_pci_device_t * dev)
+{
+  ixge_main_t *xm = &ixge_main;
+  vlib_main_t *vm = xm->vlib_main;
+
+  vlib_node_set_interrupt_pending (vm, ixge_input_node.index);
+
+  /* Let node know which device is interrupting. */
+  {
+    vlib_node_runtime_t *rt =
+      vlib_node_get_runtime (vm, ixge_input_node.index);
+    rt->runtime_data[0] |= 1 << dev->private_data;
+  }
+}
+
+static clib_error_t *
+ixge_pci_init (vlib_main_t * vm, vlib_pci_device_t * dev)
+{
+  ixge_main_t *xm = &ixge_main;
+  clib_error_t *error;
+  void *r;
+  ixge_device_t *xd;
+
+  /* Device found: make sure we have dma memory. */
+  if (unix_physmem_is_fake (vm))
+    return clib_error_return (0, "no physical memory available");
+
+  error = vlib_pci_map_resource (dev, 0, &r);
+  if (error)
+    return error;
+
+  vec_add2 (xm->devices, xd, 1);
+
+  if (vec_len (xm->devices) == 1)
+    {
+      ixge_input_node.function = ixge_input_multiarch_select ();
+    }
+
+  xd->pci_device = dev[0];
+  xd->device_id = xd->pci_device.config0.header.device_id;
+  xd->regs = r;
+  xd->device_index = xd - xm->devices;
+  xd->pci_function = dev->bus_address.function;
+  xd->per_interface_next_index = ~0;
+
+
+  /* Chip found so enable node. */
+  {
+    vlib_node_set_state (vm, ixge_input_node.index,
+			 (IXGE_ALWAYS_POLL
+			  ? VLIB_NODE_STATE_POLLING
+			  : VLIB_NODE_STATE_INTERRUPT));
+
+    dev->private_data = xd->device_index;
+  }
+
+  if (vec_len (xm->devices) == 1)
+    {
+      vlib_register_node (vm, &ixge_process_node);
+      xm->process_node_index = ixge_process_node.index;
+    }
+
+  error = vlib_pci_bus_master_enable (dev);
+
+  if (error)
+    return error;
+
+  return vlib_pci_intr_enable (dev);
+}
+
+/* *INDENT-OFF* */
+PCI_REGISTER_DEVICE (ixge_pci_device_registration,static) = {
+  .init_function = ixge_pci_init,
+  .interrupt_handler = ixge_pci_intr_handler,
+  .supported_devices = {
+#define _(t,i) { .vendor_id = PCI_VENDOR_ID_INTEL, .device_id = i, },
+    foreach_ixge_pci_device_id
+#undef _
+    { 0 },
+  },
+};
+/* *INDENT-ON* */
+
+void
+ixge_set_next_node (ixge_rx_next_t next, char *name)
+{
+  vlib_node_registration_t *r = &ixge_input_node;
+
+  switch (next)
+    {
+    case IXGE_RX_NEXT_IP4_INPUT:
+    case IXGE_RX_NEXT_IP6_INPUT:
+    case IXGE_RX_NEXT_ETHERNET_INPUT:
+      r->next_nodes[next] = name;
+      break;
+
+    default:
+      clib_warning ("%s: illegal next %d\n", __FUNCTION__, next);
+      break;
+    }
+}
+#endif
+
+/* *INDENT-OFF* */
+VLIB_PLUGIN_REGISTER () = {
+    .version = VPP_BUILD_VER,
+    .default_disabled = 1,
+};
+
+/* *INDENT-ON* */
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/ixge/ixge.h b/src/plugins/ixge/ixge.h
new file mode 100644
index 00000000..779603b3
--- /dev/null
+++ b/src/plugins/ixge/ixge.h
@@ -0,0 +1,1293 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_ixge_h
+#define included_ixge_h
+
+#include <vnet/vnet.h>
+#include <vlib/pci/pci.h>
+#include <vlib/i2c.h>
+#include <vnet/ethernet/sfp.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+
+typedef volatile struct
+{
+  /* [31:7] 128 byte aligned. */
+  u32 descriptor_address[2];
+  u32 n_descriptor_bytes;
+
+  /* [5] rx/tx descriptor dca enable
+     [6] rx packet head dca enable
+     [7] rx packet tail dca enable
+     [9] rx/tx descriptor relaxed order
+     [11] rx/tx descriptor write back relaxed order
+     [13] rx/tx data write/read relaxed order
+     [15] rx head data write relaxed order
+     [31:24] apic id for cpu's cache. */
+  u32 dca_control;
+
+  u32 head_index;
+
+  /* [4:0] tail buffer size (in 1k byte units)
+     [13:8] head buffer size (in 64 byte units)
+     [24:22] lo free descriptors threshold (units of 64 descriptors)
+     [27:25] descriptor type 0 = legacy, 1 = advanced one buffer (e.g. tail),
+     2 = advanced header splitting (head + tail), 5 = advanced header
+     splitting (head only).
+     [28] drop if no descriptors available. */
+  u32 rx_split_control;
+
+  u32 tail_index;
+    CLIB_PAD_FROM_TO (0x1c, 0x28);
+
+  /* [7:0] rx/tx prefetch threshold
+     [15:8] rx/tx host threshold
+     [24:16] rx/tx write back threshold
+     [25] rx/tx enable
+     [26] tx descriptor writeback flush
+     [30] rx strip vlan enable */
+  u32 control;
+
+  u32 rx_coallesce_control;
+
+  union
+  {
+    struct
+    {
+      /* packets bytes lo hi */
+      u32 stats[3];
+
+      u32 unused;
+    } rx;
+
+    struct
+    {
+      u32 unused[2];
+
+      /* [0] enables head write back. */
+      u32 head_index_write_back_address[2];
+    } tx;
+  };
+} ixge_dma_regs_t;
+
+/* Only advanced descriptors are supported. */
+typedef struct
+{
+  u64 tail_address;
+  u64 head_address;
+} ixge_rx_to_hw_descriptor_t;
+
+typedef struct
+{
+  u32 status[3];
+  u16 n_packet_bytes_this_descriptor;
+  u16 vlan_tag;
+} ixge_rx_from_hw_descriptor_t;
+
+#define IXGE_RX_DESCRIPTOR_STATUS0_IS_LAYER2 (1 << (4 + 11))
+/* Valid if not layer2. */
+#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4 (1 << (4 + 0))
+#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4_EXT (1 << (4 + 1))
+#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6 (1 << (4 + 2))
+#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6_EXT (1 << (4 + 3))
+#define IXGE_RX_DESCRIPTOR_STATUS0_IS_TCP (1 << (4 + 4))
+#define IXGE_RX_DESCRIPTOR_STATUS0_IS_UDP (1 << (4 + 5))
+#define IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET(s) (((s) >> 21) & 0x3ff)
+
+#define IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE (1 << (0 + 0))
+#define IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET (1 << (0 + 1))
+#define IXGE_RX_DESCRIPTOR_STATUS2_IS_VLAN (1 << (0 + 3))
+#define IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED (1 << (0 + 4))
+#define IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED (1 << (0 + 5))
+#define IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED (1 << (0 + 6))
+#define IXGE_RX_DESCRIPTOR_STATUS2_NOT_UNICAST (1 << (0 + 7))
+#define IXGE_RX_DESCRIPTOR_STATUS2_IS_DOUBLE_VLAN (1 << (0 + 9))
+#define IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR (1 << (0 + 10))
+#define IXGE_RX_DESCRIPTOR_STATUS2_ETHERNET_ERROR (1 << (20 + 9))
+#define IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR (1 << (20 + 10))
+#define IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR (1 << (20 + 11))
+
+/* For layer2 packets stats0 bottom 3 bits give ether type index from filter. */
+#define IXGE_RX_DESCRIPTOR_STATUS0_LAYER2_ETHERNET_TYPE(s) ((s) & 7)
+
+typedef struct
+{
+  u64 buffer_address;
+  u16 n_bytes_this_buffer;
+  u16 status0;
+  u32 status1;
+#define IXGE_TX_DESCRIPTOR_STATUS0_ADVANCED (3 << 4)
+#define IXGE_TX_DESCRIPTOR_STATUS0_IS_ADVANCED (1 << (8 + 5))
+#define IXGE_TX_DESCRIPTOR_STATUS0_LOG2_REPORT_STATUS (8 + 3)
+#define IXGE_TX_DESCRIPTOR_STATUS0_REPORT_STATUS (1 << IXGE_TX_DESCRIPTOR_STATUS0_LOG2_REPORT_STATUS)
+#define IXGE_TX_DESCRIPTOR_STATUS0_INSERT_FCS (1 << (8 + 1))
+#define IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET (8 + 0)
+#define IXGE_TX_DESCRIPTOR_STATUS0_IS_END_OF_PACKET (1 << IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET)
+#define IXGE_TX_DESCRIPTOR_STATUS1_DONE (1 << 0)
+#define IXGE_TX_DESCRIPTOR_STATUS1_CONTEXT(i) (/* valid */ (1 << 7) | ((i) << 4))
+#define IXGE_TX_DESCRIPTOR_STATUS1_IPSEC_OFFLOAD (1 << (8 + 2))
+#define IXGE_TX_DESCRIPTOR_STATUS1_INSERT_TCP_UDP_CHECKSUM (1 << (8 + 1))
+#define IXGE_TX_DESCRIPTOR_STATUS1_INSERT_IP4_CHECKSUM (1 << (8 + 0))
+#define IXGE_TX_DESCRIPTOR_STATUS0_N_BYTES_THIS_BUFFER(l) ((l) << 0)
+#define IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET(l) ((l) << 14)
+} ixge_tx_descriptor_t;
+
+typedef struct
+{
+  struct
+  {
+    u8 checksum_start_offset;
+    u8 checksum_insert_offset;
+    u16 checksum_end_offset;
+  } ip, tcp;
+  u32 status0;
+
+  u8 status1;
+
+  /* Byte offset after UDP/TCP header. */
+  u8 payload_offset;
+
+  u16 max_tcp_segment_size;
+} __attribute__ ((packed)) ixge_tx_context_descriptor_t;
+
+typedef union
+{
+  ixge_rx_to_hw_descriptor_t rx_to_hw;
+  ixge_rx_from_hw_descriptor_t rx_from_hw;
+  ixge_tx_descriptor_t tx;
+  u32x4 as_u32x4;
+} ixge_descriptor_t;
+
+typedef volatile struct
+{
+  /* [2] pcie master disable
+     [3] mac reset
+     [26] global device reset */
+  u32 control;
+  u32 control_alias;
+  /* [3:2] device id (0 or 1 for dual port chips)
+     [7] link is up
+     [17:10] num vfs
+     [18] io active
+     [19] pcie master enable status */
+  u32 status_read_only;
+    CLIB_PAD_FROM_TO (0xc, 0x18);
+  /* [14] pf reset done
+     [17] relaxed ordering disable
+     [26] extended vlan enable
+     [28] driver loaded */
+  u32 extended_control;
+    CLIB_PAD_FROM_TO (0x1c, 0x20);
+
+  /* software definable pins.
+     sdp_data [7:0]
+     sdp_is_output [15:8]
+     sdp_is_native [23:16]
+     sdp_function [31:24].
+   */
+  u32 sdp_control;
+    CLIB_PAD_FROM_TO (0x24, 0x28);
+
+  /* [0] i2c clock in
+     [1] i2c clock out
+     [2] i2c data in
+     [3] i2c data out */
+  u32 i2c_control;
+    CLIB_PAD_FROM_TO (0x2c, 0x4c);
+  u32 tcp_timer;
+
+    CLIB_PAD_FROM_TO (0x50, 0x200);
+
+  u32 led_control;
+
+    CLIB_PAD_FROM_TO (0x204, 0x600);
+  u32 core_spare;
+    CLIB_PAD_FROM_TO (0x604, 0x700);
+
+  struct
+  {
+    u32 vflr_events_clear[4];
+    u32 mailbox_interrupt_status[4];
+    u32 mailbox_interrupt_enable[4];
+      CLIB_PAD_FROM_TO (0x730, 0x800);
+  } pf_foo;
+
+  struct
+  {
+    u32 status_write_1_to_clear;
+      CLIB_PAD_FROM_TO (0x804, 0x808);
+    u32 status_write_1_to_set;
+      CLIB_PAD_FROM_TO (0x80c, 0x810);
+    u32 status_auto_clear_enable;
+      CLIB_PAD_FROM_TO (0x814, 0x820);
+
+    /* [11:3] minimum inter-interrupt interval
+       (2e-6 units; 20e-6 units for fast ethernet).
+       [15] low-latency interrupt moderation enable
+       [20:16] low-latency interrupt credit
+       [27:21] interval counter
+       [31] write disable for credit and counter (write only). */
+    u32 throttle0[24];
+
+    u32 enable_write_1_to_set;
+      CLIB_PAD_FROM_TO (0x884, 0x888);
+    u32 enable_write_1_to_clear;
+      CLIB_PAD_FROM_TO (0x88c, 0x890);
+    u32 enable_auto_clear;
+    u32 msi_to_eitr_select;
+    /* [3:0] spd 0-3 interrupt detection enable
+       [4] msi-x enable
+       [5] other clear disable (makes other bits in status not clear on read)
+       etc. */
+    u32 control;
+      CLIB_PAD_FROM_TO (0x89c, 0x900);
+
+    /* Defines interrupt mapping for 128 rx + 128 tx queues.
+       64 x 4 8 bit entries.
+       For register [i]:
+       [5:0] bit in interrupt status for rx queue 2*i + 0
+       [7] valid bit
+       [13:8] bit for tx queue 2*i + 0
+       [15] valid bit
+       similar for rx 2*i + 1 and tx 2*i + 1. */
+    u32 queue_mapping[64];
+
+    /* tcp timer [7:0] and other interrupts [15:8] */
+    u32 misc_mapping;
+      CLIB_PAD_FROM_TO (0xa04, 0xa90);
+
+    /* 64 interrupts determined by mappings. */
+    u32 status1_write_1_to_clear[4];
+    u32 enable1_write_1_to_set[4];
+    u32 enable1_write_1_to_clear[4];
+      CLIB_PAD_FROM_TO (0xac0, 0xad0);
+    u32 status1_enable_auto_clear[4];
+      CLIB_PAD_FROM_TO (0xae0, 0x1000);
+  } interrupt;
+
+  ixge_dma_regs_t rx_dma0[64];
+
+    CLIB_PAD_FROM_TO (0x2000, 0x2140);
+  u32 dcb_rx_packet_plane_t4_config[8];
+  u32 dcb_rx_packet_plane_t4_status[8];
+    CLIB_PAD_FROM_TO (0x2180, 0x2300);
+
+  /* reg i defines mapping for 4 rx queues starting at 4*i + 0. */
+  u32 rx_queue_stats_mapping[32];
+  u32 rx_queue_stats_control;
+
+    CLIB_PAD_FROM_TO (0x2384, 0x2410);
+  u32 fc_user_descriptor_ptr[2];
+  u32 fc_buffer_control;
+    CLIB_PAD_FROM_TO (0x241c, 0x2420);
+  u32 fc_rx_dma;
+    CLIB_PAD_FROM_TO (0x2424, 0x2430);
+  u32 dcb_packet_plane_control;
+    CLIB_PAD_FROM_TO (0x2434, 0x2f00);
+
+  u32 rx_dma_control;
+  u32 pf_queue_drop_enable;
+    CLIB_PAD_FROM_TO (0x2f08, 0x2f20);
+  u32 rx_dma_descriptor_cache_config;
+    CLIB_PAD_FROM_TO (0x2f24, 0x3000);
+
+  /* 1 bit. */
+  u32 rx_enable;
+    CLIB_PAD_FROM_TO (0x3004, 0x3008);
+  /* [15:0] ether type (little endian)
+     [31:16] opcode (big endian) */
+  u32 flow_control_control;
+    CLIB_PAD_FROM_TO (0x300c, 0x3020);
+  /* 3 bit traffic class for each of 8 priorities. */
+  u32 rx_priority_to_traffic_class;
+    CLIB_PAD_FROM_TO (0x3024, 0x3028);
+  u32 rx_coallesce_data_buffer_control;
+    CLIB_PAD_FROM_TO (0x302c, 0x3190);
+  u32 rx_packet_buffer_flush_detect;
+    CLIB_PAD_FROM_TO (0x3194, 0x3200);
+  u32 flow_control_tx_timers[4];	/* 2 timer values */
+    CLIB_PAD_FROM_TO (0x3210, 0x3220);
+  u32 flow_control_rx_threshold_lo[8];
+    CLIB_PAD_FROM_TO (0x3240, 0x3260);
+  u32 flow_control_rx_threshold_hi[8];
+    CLIB_PAD_FROM_TO (0x3280, 0x32a0);
+  u32 flow_control_refresh_threshold;
+    CLIB_PAD_FROM_TO (0x32a4, 0x3c00);
+  /* For each of 8 traffic classes (units of bytes). */
+  u32 rx_packet_buffer_size[8];
+    CLIB_PAD_FROM_TO (0x3c20, 0x3d00);
+  u32 flow_control_config;
+    CLIB_PAD_FROM_TO (0x3d04, 0x4200);
+
+  struct
+  {
+    u32 pcs_config;
+      CLIB_PAD_FROM_TO (0x4204, 0x4208);
+    u32 link_control;
+    u32 link_status;
+    u32 pcs_debug[2];
+    u32 auto_negotiation;
+    u32 link_partner_ability;
+    u32 auto_negotiation_tx_next_page;
+    u32 auto_negotiation_link_partner_next_page;
+      CLIB_PAD_FROM_TO (0x4228, 0x4240);
+  } gige_mac;
+
+  struct
+  {
+    /* [0] tx crc enable
+       [2] enable frames up to max frame size register [31:16]
+       [10] pad frames < 64 bytes if specified by user
+       [15] loopback enable
+       [16] mdc hi speed
+       [17] turn off mdc between mdio packets */
+    u32 control;
+
+    /* [5] rx symbol error (all bits clear on read)
+       [6] rx illegal symbol
+       [7] rx idle error
+       [8] rx local fault
+       [9] rx remote fault */
+    u32 status;
+
+    u32 pause_and_pace_control;
+      CLIB_PAD_FROM_TO (0x424c, 0x425c);
+    u32 phy_command;
+    u32 phy_data;
+      CLIB_PAD_FROM_TO (0x4264, 0x4268);
+
+    /* [31:16] max frame size in bytes. */
+    u32 rx_max_frame_size;
+      CLIB_PAD_FROM_TO (0x426c, 0x4288);
+
+    /* [0]
+       [2] pcs receive link up? (latch lo)
+       [7] local fault
+       [1]
+       [0] pcs 10g base r capable
+       [1] pcs 10g base x capable
+       [2] pcs 10g base w capable
+       [10] rx local fault
+       [11] tx local fault
+       [15:14] 2 => device present at this address (else not present) */
+    u32 xgxs_status[2];
+
+    u32 base_x_pcs_status;
+
+    /* [0] pass unrecognized flow control frames
+       [1] discard pause frames
+       [2] rx priority flow control enable (only in dcb mode)
+       [3] rx flow control enable. */
+    u32 flow_control;
+
+    /* [3:0] tx lanes change polarity
+       [7:4] rx lanes change polarity
+       [11:8] swizzle tx lanes
+       [15:12] swizzle rx lanes
+       4 x 2 bit tx lane swap
+       4 x 2 bit rx lane swap. */
+    u32 serdes_control;
+
+    u32 fifo_control;
+
+    /* [0] force link up
+       [1] autoneg ack2 bit to transmit
+       [6:2] autoneg selector field to transmit
+       [8:7] 10g pma/pmd type 0 => xaui, 1 kx4, 2 cx4
+       [9] 1g pma/pmd type 0 => sfi, 1 => kx/bx
+       [10] disable 10g on without main power
+       [11] restart autoneg on transition to dx power state
+       [12] restart autoneg
+       [15:13] link mode:
+       0 => 1g no autoneg
+       1 => 10g kx4 parallel link no autoneg
+       2 => 1g bx autoneg
+       3 => 10g sfi serdes
+       4 => kx4/kx/kr
+       5 => xgmii 1g/100m
+       6 => kx4/kx/kr 1g an
+       7 kx4/kx/kr sgmii.
+       [16] kr support
+       [17] fec requested
+       [18] fec ability
+       etc. */
+    u32 auto_negotiation_control;
+
+    /* [0] signal detect 1g/100m
+       [1] fec signal detect
+       [2] 10g serial pcs fec block lock
+       [3] 10g serial high error rate
+       [4] 10g serial pcs block lock
+       [5] kx/kx4/kr autoneg next page received
+       [6] kx/kx4/kr backplane autoneg next page received
+       [7] link status clear to read
+       [11:8] 10g signal detect (4 lanes) (for serial just lane 0)
+       [12] 10g serial signal detect
+       [16:13] 10g parallel lane sync status
+       [17] 10g parallel align status
+       [18] 1g sync status
+       [19] kx/kx4/kr backplane autoneg is idle
+       [20] 1g autoneg enabled
+       [21] 1g pcs enabled for sgmii
+       [22] 10g xgxs enabled
+       [23] 10g serial fec enabled (forward error detection)
+       [24] 10g kr pcs enabled
+       [25] sgmii enabled
+       [27:26] mac link mode
+       0 => 1g
+       1 => 10g parallel
+       2 => 10g serial
+       3 => autoneg
+       [29:28] link speed
+       1 => 100m
+       2 => 1g
+       3 => 10g
+       [30] link is up
+       [31] kx/kx4/kr backplane autoneg completed successfully. */
+    u32 link_status;
+
+    /* [17:16] pma/pmd for 10g serial
+       0 => kr, 2 => sfi
+       [18] disable dme pages */
+    u32 auto_negotiation_control2;
+
+      CLIB_PAD_FROM_TO (0x42ac, 0x42b0);
+    u32 link_partner_ability[2];
+      CLIB_PAD_FROM_TO (0x42b8, 0x42d0);
+    u32 manageability_control;
+    u32 link_partner_next_page[2];
+      CLIB_PAD_FROM_TO (0x42dc, 0x42e0);
+    u32 kr_pcs_control;
+    u32 kr_pcs_status;
+    u32 fec_status[2];
+      CLIB_PAD_FROM_TO (0x42f0, 0x4314);
+    u32 sgmii_control;
+      CLIB_PAD_FROM_TO (0x4318, 0x4324);
+    u32 link_status2;
+      CLIB_PAD_FROM_TO (0x4328, 0x4900);
+  } xge_mac;
+
+  u32 tx_dcb_control;
+  u32 tx_dcb_descriptor_plane_queue_select;
+  u32 tx_dcb_descriptor_plane_t1_config;
+  u32 tx_dcb_descriptor_plane_t1_status;
+    CLIB_PAD_FROM_TO (0x4910, 0x4950);
+
+  /* For each TC in units of 1k bytes. */
+  u32 tx_packet_buffer_thresholds[8];
+    CLIB_PAD_FROM_TO (0x4970, 0x4980);
+  struct
+  {
+    u32 mmw;
+    u32 config;
+    u32 status;
+    u32 rate_drift;
+  } dcb_tx_rate_scheduler;
+    CLIB_PAD_FROM_TO (0x4990, 0x4a80);
+  u32 tx_dma_control;
+    CLIB_PAD_FROM_TO (0x4a84, 0x4a88);
+  u32 tx_dma_tcp_flags_control[2];
+    CLIB_PAD_FROM_TO (0x4a90, 0x4b00);
+  u32 pf_mailbox[64];
+    CLIB_PAD_FROM_TO (0x4c00, 0x5000);
+
+  /* RX */
+  u32 checksum_control;
+    CLIB_PAD_FROM_TO (0x5004, 0x5008);
+  u32 rx_filter_control;
+    CLIB_PAD_FROM_TO (0x500c, 0x5010);
+  u32 management_vlan_tag[8];
+  u32 management_udp_tcp_ports[8];
+    CLIB_PAD_FROM_TO (0x5050, 0x5078);
+  /* little endian. */
+  u32 extended_vlan_ether_type;
+    CLIB_PAD_FROM_TO (0x507c, 0x5080);
+  /* [1] store/dma bad packets
+     [8] accept all multicast
+     [9] accept all unicast
+     [10] accept all broadcast. */
+  u32 filter_control;
+    CLIB_PAD_FROM_TO (0x5084, 0x5088);
+  /* [15:0] vlan ethernet type (0x8100) little endian
+     [28] cfi bit expected
+     [29] drop packets with unexpected cfi bit
+     [30] vlan filter enable. */
+  u32 vlan_control;
+    CLIB_PAD_FROM_TO (0x508c, 0x5090);
+  /* [1:0] hi bit of ethernet address for 12 bit index into multicast table
+     0 => 47, 1 => 46, 2 => 45, 3 => 43.
+     [2] enable multicast filter
+   */
+  u32 multicast_control;
+    CLIB_PAD_FROM_TO (0x5094, 0x5100);
+  u32 fcoe_rx_control;
+    CLIB_PAD_FROM_TO (0x5104, 0x5108);
+  u32 fc_flt_context;
+    CLIB_PAD_FROM_TO (0x510c, 0x5110);
+  u32 fc_filter_control;
+    CLIB_PAD_FROM_TO (0x5114, 0x5120);
+  u32 rx_message_type_lo;
+    CLIB_PAD_FROM_TO (0x5124, 0x5128);
+  /* [15:0] ethernet type (little endian)
+     [18:16] matche pri in vlan tag
+     [19] priority match enable
+     [25:20] virtualization pool
+     [26] pool enable
+     [27] is fcoe
+     [30] ieee 1588 timestamp enable
+     [31] filter enable.
+     (See ethernet_type_queue_select.) */
+  u32 ethernet_type_queue_filter[8];
+    CLIB_PAD_FROM_TO (0x5148, 0x5160);
+  /* [7:0] l2 ethernet type and
+     [15:8] l2 ethernet type or */
+  u32 management_decision_filters1[8];
+  u32 vf_vm_tx_switch_loopback_enable[2];
+  u32 rx_time_sync_control;
+    CLIB_PAD_FROM_TO (0x518c, 0x5190);
+  u32 management_ethernet_type_filters[4];
+  u32 rx_timestamp_attributes_lo;
+  u32 rx_timestamp_hi;
+  u32 rx_timestamp_attributes_hi;
+    CLIB_PAD_FROM_TO (0x51ac, 0x51b0);
+  u32 pf_virtual_control;
+    CLIB_PAD_FROM_TO (0x51b4, 0x51d8);
+  u32 fc_offset_parameter;
+    CLIB_PAD_FROM_TO (0x51dc, 0x51e0);
+  u32 vf_rx_enable[2];
+  u32 rx_timestamp_lo;
+    CLIB_PAD_FROM_TO (0x51ec, 0x5200);
+  /* 12 bits determined by multicast_control
+     lookup bits in this vector. */
+  u32 multicast_enable[128];
+
+  /* [0] ethernet address [31:0]
+     [1] [15:0] ethernet address [47:32]
+     [31] valid bit.
+     Index 0 is read from eeprom after reset. */
+  u32 rx_ethernet_address0[16][2];
+
+    CLIB_PAD_FROM_TO (0x5480, 0x5800);
+  u32 wake_up_control;
+    CLIB_PAD_FROM_TO (0x5804, 0x5808);
+  u32 wake_up_filter_control;
+    CLIB_PAD_FROM_TO (0x580c, 0x5818);
+  u32 multiple_rx_queue_command_82598;
+    CLIB_PAD_FROM_TO (0x581c, 0x5820);
+  u32 management_control;
+  u32 management_filter_control;
+    CLIB_PAD_FROM_TO (0x5828, 0x5838);
+  u32 wake_up_ip4_address_valid;
+    CLIB_PAD_FROM_TO (0x583c, 0x5840);
+  u32 wake_up_ip4_address_table[4];
+  u32 management_control_to_host;
+    CLIB_PAD_FROM_TO (0x5854, 0x5880);
+  u32 wake_up_ip6_address_table[4];
+
+  /* unicast_and broadcast_and vlan_and ip_address_and
+     etc. */
+  u32 management_decision_filters[8];
+
+  u32 management_ip4_or_ip6_address_filters[4][4];
+    CLIB_PAD_FROM_TO (0x58f0, 0x5900);
+  u32 wake_up_packet_length;
+    CLIB_PAD_FROM_TO (0x5904, 0x5910);
+  u32 management_ethernet_address_filters[4][2];
+    CLIB_PAD_FROM_TO (0x5930, 0x5a00);
+  u32 wake_up_packet_memory[32];
+    CLIB_PAD_FROM_TO (0x5a80, 0x5c00);
+  u32 redirection_table_82598[32];
+  u32 rss_random_keys_82598[10];
+    CLIB_PAD_FROM_TO (0x5ca8, 0x6000);
+
+  ixge_dma_regs_t tx_dma[128];
+
+  u32 pf_vm_vlan_insert[64];
+  u32 tx_dma_tcp_max_alloc_size_requests;
+    CLIB_PAD_FROM_TO (0x8104, 0x8110);
+  u32 vf_tx_enable[2];
+    CLIB_PAD_FROM_TO (0x8118, 0x8120);
+  /* [0] dcb mode enable
+     [1] virtualization mode enable
+     [3:2] number of tcs/qs per pool. */
+  u32 multiple_tx_queues_command;
+    CLIB_PAD_FROM_TO (0x8124, 0x8200);
+  u32 pf_vf_anti_spoof[8];
+  u32 pf_dma_tx_switch_control;
+    CLIB_PAD_FROM_TO (0x8224, 0x82e0);
+  u32 tx_strict_low_latency_queues[4];
+    CLIB_PAD_FROM_TO (0x82f0, 0x8600);
+  u32 tx_queue_stats_mapping_82599[32];
+  u32 tx_queue_packet_counts[32];
+  u32 tx_queue_byte_counts[32][2];
+
+  struct
+  {
+    u32 control;
+    u32 status;
+    u32 buffer_almost_full;
+      CLIB_PAD_FROM_TO (0x880c, 0x8810);
+    u32 buffer_min_ifg;
+      CLIB_PAD_FROM_TO (0x8814, 0x8900);
+  } tx_security;
+
+  struct
+  {
+    u32 index;
+    u32 salt;
+    u32 key[4];
+      CLIB_PAD_FROM_TO (0x8918, 0x8a00);
+  } tx_ipsec;
+
+  struct
+  {
+    u32 capabilities;
+    u32 control;
+    u32 tx_sci[2];
+    u32 sa;
+    u32 sa_pn[2];
+    u32 key[2][4];
+    /* untagged packets, encrypted packets, protected packets,
+       encrypted bytes, protected bytes */
+    u32 stats[5];
+      CLIB_PAD_FROM_TO (0x8a50, 0x8c00);
+  } tx_link_security;
+
+  struct
+  {
+    u32 control;
+    u32 timestamp_value[2];
+    u32 system_time[2];
+    u32 increment_attributes;
+    u32 time_adjustment_offset[2];
+    u32 aux_control;
+    u32 target_time[2][2];
+      CLIB_PAD_FROM_TO (0x8c34, 0x8c3c);
+    u32 aux_time_stamp[2][2];
+      CLIB_PAD_FROM_TO (0x8c4c, 0x8d00);
+  } tx_timesync;
+
+  struct
+  {
+    u32 control;
+    u32 status;
+      CLIB_PAD_FROM_TO (0x8d08, 0x8e00);
+  } rx_security;
+
+  struct
+  {
+    u32 index;
+    u32 ip_address[4];
+    u32 spi;
+    u32 ip_index;
+    u32 key[4];
+    u32 salt;
+    u32 mode;
+      CLIB_PAD_FROM_TO (0x8e34, 0x8f00);
+  } rx_ipsec;
+
+  struct
+  {
+    u32 capabilities;
+    u32 control;
+    u32 sci[2];
+    u32 sa[2];
+    u32 sa_pn[2];
+    u32 key[2][4];
+    /* see datasheet */
+    u32 stats[17];
+      CLIB_PAD_FROM_TO (0x8f84, 0x9000);
+  } rx_link_security;
+
+  /* 4 wake up, 2 management, 2 wake up. */
+  u32 flexible_filters[8][16][4];
+    CLIB_PAD_FROM_TO (0x9800, 0xa000);
+
+  /* 4096 bits. */
+  u32 vlan_filter[128];
+
+  /* [0] ethernet address [31:0]
+     [1] [15:0] ethernet address [47:32]
+     [31] valid bit.
+     Index 0 is read from eeprom after reset. */
+  u32 rx_ethernet_address1[128][2];
+
+  /* select one of 64 pools for each rx address. */
+  u32 rx_ethernet_address_pool_select[128][2];
+    CLIB_PAD_FROM_TO (0xaa00, 0xc800);
+  u32 tx_priority_to_traffic_class;
+    CLIB_PAD_FROM_TO (0xc804, 0xcc00);
+
+  /* In bytes units of 1k.  Total packet buffer is 160k. */
+  u32 tx_packet_buffer_size[8];
+
+    CLIB_PAD_FROM_TO (0xcc20, 0xcd10);
+  u32 tx_manageability_tc_mapping;
+    CLIB_PAD_FROM_TO (0xcd14, 0xcd20);
+  u32 dcb_tx_packet_plane_t2_config[8];
+  u32 dcb_tx_packet_plane_t2_status[8];
+    CLIB_PAD_FROM_TO (0xcd60, 0xce00);
+
+  u32 tx_flow_control_status;
+    CLIB_PAD_FROM_TO (0xce04, 0xd000);
+
+  ixge_dma_regs_t rx_dma1[64];
+
+  struct
+  {
+    /* Bigendian ip4 src/dst address. */
+    u32 src_address[128];
+    u32 dst_address[128];
+
+    /* TCP/UDP ports [15:0] src [31:16] dst; bigendian. */
+    u32 tcp_udp_port[128];
+
+    /* [1:0] protocol tcp, udp, sctp, other
+       [4:2] match priority (highest wins)
+       [13:8] pool
+       [25] src address match disable
+       [26] dst address match disable
+       [27] src port match disable
+       [28] dst port match disable
+       [29] protocol match disable
+       [30] pool match disable
+       [31] enable. */
+    u32 control[128];
+
+    /* [12] size bypass
+       [19:13] must be 0x80
+       [20] low-latency interrupt
+       [27:21] rx queue. */
+    u32 interrupt[128];
+  } ip4_filters;
+
+    CLIB_PAD_FROM_TO (0xea00, 0xeb00);
+  /* 4 bit rss output index indexed by 7 bit hash.
+     128 8 bit fields = 32 registers. */
+  u32 redirection_table_82599[32];
+
+  u32 rss_random_key_82599[10];
+    CLIB_PAD_FROM_TO (0xeba8, 0xec00);
+  /* [15:0] reserved
+     [22:16] rx queue index
+     [29] low-latency interrupt on match
+     [31] enable */
+  u32 ethernet_type_queue_select[8];
+    CLIB_PAD_FROM_TO (0xec20, 0xec30);
+  u32 syn_packet_queue_filter;
+    CLIB_PAD_FROM_TO (0xec34, 0xec60);
+  u32 immediate_interrupt_rx_vlan_priority;
+    CLIB_PAD_FROM_TO (0xec64, 0xec70);
+  u32 rss_queues_per_traffic_class;
+    CLIB_PAD_FROM_TO (0xec74, 0xec90);
+  u32 lli_size_threshold;
+    CLIB_PAD_FROM_TO (0xec94, 0xed00);
+
+  struct
+  {
+    u32 control;
+      CLIB_PAD_FROM_TO (0xed04, 0xed10);
+    u32 table[8];
+      CLIB_PAD_FROM_TO (0xed30, 0xee00);
+  } fcoe_redirection;
+
+  struct
+  {
+    /* [1:0] packet buffer allocation 0 => disabled, else 64k*2^(f-1)
+       [3] packet buffer initialization done
+       [4] perfetch match mode
+       [5] report status in rss field of rx descriptors
+       [7] report status always
+       [14:8] drop queue
+       [20:16] flex 2 byte packet offset (units of 2 bytes)
+       [27:24] max linked list length
+       [31:28] full threshold. */
+    u32 control;
+      CLIB_PAD_FROM_TO (0xee04, 0xee0c);
+
+    u32 data[8];
+
+    /* [1:0] 0 => no action, 1 => add, 2 => remove, 3 => query.
+       [2] valid filter found by query command
+       [3] filter update override
+       [4] ip6 adress table
+       [6:5] l4 protocol reserved, udp, tcp, sctp
+       [7] is ip6
+       [8] clear head/tail
+       [9] packet drop action
+       [10] matched packet generates low-latency interrupt
+       [11] last in linked list
+       [12] collision
+       [15] rx queue enable
+       [22:16] rx queue
+       [29:24] pool. */
+    u32 command;
+
+      CLIB_PAD_FROM_TO (0xee30, 0xee3c);
+    /* ip4 dst/src address, tcp ports, udp ports.
+       set bits mean bit is ignored. */
+    u32 ip4_masks[4];
+    u32 filter_length;
+    u32 usage_stats;
+    u32 failed_usage_stats;
+    u32 filters_match_stats;
+    u32 filters_miss_stats;
+      CLIB_PAD_FROM_TO (0xee60, 0xee68);
+    /* Lookup, signature. */
+    u32 hash_keys[2];
+    /* [15:0] ip6 src address 1 bit per byte
+       [31:16] ip6 dst address. */
+    u32 ip6_mask;
+    /* [0] vlan id
+       [1] vlan priority
+       [2] pool
+       [3] ip protocol
+       [4] flex
+       [5] dst ip6. */
+    u32 other_mask;
+      CLIB_PAD_FROM_TO (0xee78, 0xf000);
+  } flow_director;
+
+  struct
+  {
+    u32 l2_control[64];
+    u32 vlan_pool_filter[64];
+    u32 vlan_pool_filter_bitmap[128];
+    u32 dst_ethernet_address[128];
+    u32 mirror_rule[4];
+    u32 mirror_rule_vlan[8];
+    u32 mirror_rule_pool[8];
+      CLIB_PAD_FROM_TO (0xf650, 0x10010);
+  } pf_bar;
+
+  u32 eeprom_flash_control;
+  /* [0] start
+     [1] done
+     [15:2] address
+     [31:16] read data. */
+  u32 eeprom_read;
+    CLIB_PAD_FROM_TO (0x10018, 0x1001c);
+  u32 flash_access;
+    CLIB_PAD_FROM_TO (0x10020, 0x10114);
+  u32 flash_data;
+  u32 flash_control;
+  u32 flash_read_data;
+    CLIB_PAD_FROM_TO (0x10120, 0x1013c);
+  u32 flash_opcode;
+  u32 software_semaphore;
+    CLIB_PAD_FROM_TO (0x10144, 0x10148);
+  u32 firmware_semaphore;
+    CLIB_PAD_FROM_TO (0x1014c, 0x10160);
+  u32 software_firmware_sync;
+    CLIB_PAD_FROM_TO (0x10164, 0x10200);
+  u32 general_rx_control;
+    CLIB_PAD_FROM_TO (0x10204, 0x11000);
+
+  struct
+  {
+    u32 control;
+      CLIB_PAD_FROM_TO (0x11004, 0x11010);
+    /* [3:0] enable counters
+       [7:4] leaky bucket counter mode
+       [29] reset
+       [30] stop
+       [31] start. */
+    u32 counter_control;
+    /* [7:0],[15:8],[23:16],[31:24] event for counters 0-3.
+       event codes:
+       0x0 bad tlp
+       0x10 reqs that reached timeout
+       etc. */
+    u32 counter_event;
+      CLIB_PAD_FROM_TO (0x11018, 0x11020);
+    u32 counters_clear_on_read[4];
+    u32 counter_config[4];
+    struct
+    {
+      u32 address;
+      u32 data;
+    } indirect_access;
+      CLIB_PAD_FROM_TO (0x11048, 0x11050);
+    u32 extended_control;
+      CLIB_PAD_FROM_TO (0x11054, 0x11064);
+    u32 mirrored_revision_id;
+      CLIB_PAD_FROM_TO (0x11068, 0x11070);
+    u32 dca_requester_id_information;
+
+    /* [0] global disable
+       [4:1] mode: 0 => legacy, 1 => dca 1.0. */
+    u32 dca_control;
+      CLIB_PAD_FROM_TO (0x11078, 0x110b0);
+    /* [0] pci completion abort
+       [1] unsupported i/o address
+       [2] wrong byte enable
+       [3] pci timeout */
+    u32 pcie_interrupt_status;
+      CLIB_PAD_FROM_TO (0x110b4, 0x110b8);
+    u32 pcie_interrupt_enable;
+      CLIB_PAD_FROM_TO (0x110bc, 0x110c0);
+    u32 msi_x_pba_clear[8];
+      CLIB_PAD_FROM_TO (0x110e0, 0x12300);
+  } pcie;
+
+  u32 interrupt_throttle1[128 - 24];
+    CLIB_PAD_FROM_TO (0x124a0, 0x14f00);
+
+  u32 core_analog_config;
+    CLIB_PAD_FROM_TO (0x14f04, 0x14f10);
+  u32 core_common_config;
+    CLIB_PAD_FROM_TO (0x14f14, 0x15f14);
+
+  u32 link_sec_software_firmware_interface;
+} ixge_regs_t;
+
+typedef union
+{
+  struct
+  {
+    /* Addresses bigendian. */
+    union
+    {
+      struct
+      {
+	ip6_address_t src_address;
+	u32 unused[1];
+      } ip6;
+      struct
+      {
+	u32 unused[3];
+	ip4_address_t src_address, dst_address;
+      } ip4;
+    };
+
+    /* [15:0] src port (little endian).
+       [31:16] dst port. */
+    u32 tcp_udp_ports;
+
+    /* [15:0] vlan (cfi bit set to 0).
+       [31:16] flex bytes.  bigendian. */
+    u32 vlan_and_flex_word;
+
+    /* [14:0] hash
+       [15] bucket valid
+       [31:16] signature (signature filers)/sw-index (perfect match). */
+    u32 hash;
+  };
+
+  u32 as_u32[8];
+} ixge_flow_director_key_t;
+
+always_inline void
+ixge_throttle_queue_interrupt (ixge_regs_t * r,
+			       u32 queue_interrupt_index,
+			       f64 inter_interrupt_interval_in_secs)
+{
+  volatile u32 *tr =
+    (queue_interrupt_index < ARRAY_LEN (r->interrupt.throttle0)
+     ? &r->interrupt.throttle0[queue_interrupt_index]
+     : &r->interrupt_throttle1[queue_interrupt_index]);
+  ASSERT (queue_interrupt_index < 128);
+  u32 v;
+  i32 i, mask = (1 << 9) - 1;
+
+  i = flt_round_nearest (inter_interrupt_interval_in_secs / 2e-6);
+  i = i < 1 ? 1 : i;
+  i = i >= mask ? mask : i;
+
+  v = tr[0];
+  v &= ~(mask << 3);
+  v |= i << 3;
+  tr[0] = v;
+}
+
+#define foreach_ixge_counter				\
+  _ (0x40d0, rx_total_packets)				\
+  _64 (0x40c0, rx_total_bytes)				\
+  _ (0x41b0, rx_good_packets_before_filtering)		\
+  _64 (0x41b4, rx_good_bytes_before_filtering)		\
+  _ (0x2f50, rx_dma_good_packets)			\
+  _64 (0x2f54, rx_dma_good_bytes)			\
+  _ (0x2f5c, rx_dma_duplicated_good_packets)		\
+  _64 (0x2f60, rx_dma_duplicated_good_bytes)		\
+  _ (0x2f68, rx_dma_good_loopback_packets)		\
+  _64 (0x2f6c, rx_dma_good_loopback_bytes)		\
+  _ (0x2f74, rx_dma_good_duplicated_loopback_packets)	\
+  _64 (0x2f78, rx_dma_good_duplicated_loopback_bytes)	\
+  _ (0x4074, rx_good_packets)				\
+  _64 (0x4088, rx_good_bytes)				\
+  _ (0x407c, rx_multicast_packets)			\
+  _ (0x4078, rx_broadcast_packets)			\
+  _ (0x405c, rx_64_byte_packets)			\
+  _ (0x4060, rx_65_127_byte_packets)			\
+  _ (0x4064, rx_128_255_byte_packets)			\
+  _ (0x4068, rx_256_511_byte_packets)			\
+  _ (0x406c, rx_512_1023_byte_packets)			\
+  _ (0x4070, rx_gt_1023_byte_packets)			\
+  _ (0x4000, rx_crc_errors)				\
+  _ (0x4120, rx_ip_checksum_errors)			\
+  _ (0x4004, rx_illegal_symbol_errors)			\
+  _ (0x4008, rx_error_symbol_errors)			\
+  _ (0x4034, rx_mac_local_faults)			\
+  _ (0x4038, rx_mac_remote_faults)			\
+  _ (0x4040, rx_length_errors)				\
+  _ (0x41a4, rx_xons)					\
+  _ (0x41a8, rx_xoffs)					\
+  _ (0x40a4, rx_undersize_packets)			\
+  _ (0x40a8, rx_fragments)				\
+  _ (0x40ac, rx_oversize_packets)			\
+  _ (0x40b0, rx_jabbers)				\
+  _ (0x40b4, rx_management_packets)			\
+  _ (0x40b8, rx_management_drops)			\
+  _ (0x3fa0, rx_missed_packets_pool_0)			\
+  _ (0x40d4, tx_total_packets)				\
+  _ (0x4080, tx_good_packets)				\
+  _64 (0x4090, tx_good_bytes)				\
+  _ (0x40f0, tx_multicast_packets)			\
+  _ (0x40f4, tx_broadcast_packets)			\
+  _ (0x87a0, tx_dma_good_packets)			\
+  _64 (0x87a4, tx_dma_good_bytes)			\
+  _ (0x40d8, tx_64_byte_packets)			\
+  _ (0x40dc, tx_65_127_byte_packets)			\
+  _ (0x40e0, tx_128_255_byte_packets)			\
+  _ (0x40e4, tx_256_511_byte_packets)			\
+  _ (0x40e8, tx_512_1023_byte_packets)			\
+  _ (0x40ec, tx_gt_1023_byte_packets)			\
+  _ (0x4010, tx_undersize_drops)			\
+  _ (0x8780, switch_security_violation_packets)		\
+  _ (0x5118, fc_crc_errors)				\
+  _ (0x241c, fc_rx_drops)				\
+  _ (0x2424, fc_last_error_count)			\
+  _ (0x2428, fcoe_rx_packets)				\
+  _ (0x242c, fcoe_rx_dwords)				\
+  _ (0x8784, fcoe_tx_packets)				\
+  _ (0x8788, fcoe_tx_dwords)				\
+  _ (0x1030, queue_0_rx_count)				\
+  _ (0x1430, queue_0_drop_count)			\
+  _ (0x1070, queue_1_rx_count)				\
+  _ (0x1470, queue_1_drop_count)			\
+  _ (0x10b0, queue_2_rx_count)				\
+  _ (0x14b0, queue_2_drop_count)			\
+  _ (0x10f0, queue_3_rx_count)				\
+  _ (0x14f0, queue_3_drop_count)			\
+  _ (0x1130, queue_4_rx_count)				\
+  _ (0x1530, queue_4_drop_count)			\
+  _ (0x1170, queue_5_rx_count)				\
+  _ (0x1570, queue_5_drop_count)			\
+  _ (0x11b0, queue_6_rx_count)				\
+  _ (0x15b0, queue_6_drop_count)			\
+  _ (0x11f0, queue_7_rx_count)				\
+  _ (0x15f0, queue_7_drop_count)			\
+  _ (0x1230, queue_8_rx_count)				\
+  _ (0x1630, queue_8_drop_count)			\
+  _ (0x1270, queue_9_rx_count)				\
+  _ (0x1270, queue_9_drop_count)
+
+
+
+
+typedef enum
+{
+#define _(a,f) IXGE_COUNTER_##f,
+#define _64(a,f) _(a,f)
+  foreach_ixge_counter
+#undef _
+#undef _64
+    IXGE_N_COUNTER,
+} ixge_counter_type_t;
+
+typedef struct
+{
+  u32 mdio_address;
+
+  /* 32 bit ID read from ID registers. */
+  u32 id;
+} ixge_phy_t;
+
+typedef struct
+{
+  /* Cache aligned descriptors. */
+  ixge_descriptor_t *descriptors;
+
+  /* Number of descriptors in table. */
+  u32 n_descriptors;
+
+  /* Software head and tail pointers into descriptor ring. */
+  u32 head_index, tail_index;
+
+  /* Index into dma_queues vector. */
+  u32 queue_index;
+
+  /* Buffer indices corresponding to each active descriptor. */
+  u32 *descriptor_buffer_indices;
+
+  union
+  {
+    struct
+    {
+      u32 *volatile head_index_write_back;
+
+      u32 n_buffers_on_ring;
+    } tx;
+
+    struct
+    {
+      /* Buffer indices to use to replenish each descriptor. */
+      u32 *replenish_buffer_indices;
+
+      vlib_node_runtime_t *node;
+      u32 next_index;
+
+      u32 saved_start_of_packet_buffer_index;
+
+      u32 saved_start_of_packet_next_index;
+      u32 saved_last_buffer_index;
+
+      u32 is_start_of_packet;
+
+      u32 n_descriptors_done_total;
+
+      u32 n_descriptors_done_this_call;
+
+      u32 n_bytes;
+    } rx;
+  };
+} ixge_dma_queue_t;
+
+#define foreach_ixge_pci_device_id		\
+  _ (82598, 0x10b6)				\
+  _ (82598_bx, 0x1508)				\
+  _ (82598af_dual_port, 0x10c6)			\
+  _ (82598af_single_port, 0x10c7)		\
+  _ (82598at, 0x10c8)				\
+  _ (82598at2, 0x150b)				\
+  _ (82598eb_sfp_lom, 0x10db)			\
+  _ (82598eb_cx4, 0x10dd)			\
+  _ (82598_cx4_dual_port, 0x10ec)		\
+  _ (82598_da_dual_port, 0x10f1)		\
+  _ (82598_sr_dual_port_em, 0x10e1)		\
+  _ (82598eb_xf_lr, 0x10f4)			\
+  _ (82599_kx4, 0x10f7)				\
+  _ (82599_kx4_mezz, 0x1514)			\
+  _ (82599_kr, 0x1517)				\
+  _ (82599_combo_backplane, 0x10f8)		\
+  _ (82599_cx4, 0x10f9)				\
+  _ (82599_sfp, 0x10fb)				\
+  _ (82599_backplane_fcoe, 0x152a)		\
+  _ (82599_sfp_fcoe, 0x1529)			\
+  _ (82599_sfp_em, 0x1507)			\
+  _ (82599_xaui_lom, 0x10fc)			\
+  _ (82599_t3_lom, 0x151c)			\
+  _ (x540t, 0x1528)
+
+typedef enum
+{
+#define _(f,n) IXGE_##f = n,
+  foreach_ixge_pci_device_id
+#undef _
+} ixge_pci_device_id_t;
+
+typedef struct
+{
+  /* registers */
+  ixge_regs_t *regs;
+
+  /* Specific next index when using dynamic redirection */
+  u32 per_interface_next_index;
+
+  /* PCI bus info. */
+  vlib_pci_device_t pci_device;
+
+  /* From PCI config space header. */
+  ixge_pci_device_id_t device_id;
+
+  u16 device_index;
+
+  /* 0 or 1. */
+  u16 pci_function;
+
+  /* VLIB interface for this instance. */
+  u32 vlib_hw_if_index, vlib_sw_if_index;
+
+  ixge_dma_queue_t *dma_queues[VLIB_N_RX_TX];
+
+  /* Phy index (0 or 1) and address on MDI bus. */
+  u32 phy_index;
+  ixge_phy_t phys[2];
+
+  /* Value of link_status register at last link change. */
+  u32 link_status_at_last_link_change;
+
+  i2c_bus_t i2c_bus;
+  sfp_eeprom_t sfp_eeprom;
+
+  /* Counters. */
+  u64 counters[IXGE_N_COUNTER], counters_last_clear[IXGE_N_COUNTER];
+} ixge_device_t;
+
+typedef struct
+{
+  vlib_main_t *vlib_main;
+
+  /* Vector of devices. */
+  ixge_device_t *devices;
+
+  /* Descriptor ring sizes. */
+  u32 n_descriptors[VLIB_N_RX_TX];
+
+  /* RX buffer size.  Must be at least 1k; will be rounded to
+     next largest 1k size. */
+  u32 n_bytes_in_rx_buffer;
+
+  u32 n_descriptors_per_cache_line;
+
+  u32 vlib_buffer_free_list_index;
+
+  u32 process_node_index;
+
+  /* Template and mask for initializing/validating TX descriptors. */
+  ixge_tx_descriptor_t tx_descriptor_template, tx_descriptor_template_mask;
+
+  /* Vector of buffers for which TX is done and can be freed. */
+  u32 *tx_buffers_pending_free;
+
+  u32 *rx_buffers_to_add;
+
+  f64 time_last_stats_update;
+} ixge_main_t;
+
+ixge_main_t ixge_main;
+vnet_device_class_t ixge_device_class;
+
+typedef enum
+{
+  IXGE_RX_NEXT_IP4_INPUT,
+  IXGE_RX_NEXT_IP6_INPUT,
+  IXGE_RX_NEXT_ETHERNET_INPUT,
+  IXGE_RX_NEXT_DROP,
+  IXGE_RX_N_NEXT,
+} ixge_rx_next_t;
+
+void ixge_set_next_node (ixge_rx_next_t, char *);
+
+#endif /* included_ixge_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vlib/buffer.c b/src/vlib/buffer.c
index 6ba82584..a517a597 100644
--- a/src/vlib/buffer.c
+++ b/src/vlib/buffer.c
@@ -44,6 +44,7 @@
  */
 
 #include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
 
 uword
 vlib_buffer_length_in_chain_slow_path (vlib_main_t * vm,
@@ -583,6 +584,11 @@ alloc_from_free_list (vlib_main_t * vm,
 
   dst = alloc_buffers;
 
+  /* wait with buffer memory allocation as long as possible
+     in case external buffer manager takes over */
+  if (PREDICT_FALSE (vm->os_physmem_alloc_aligned == 0))
+    unix_physmem_init (vm, 0 /* fail_if_physical_memory_not_present */ );
+
   n_filled = fill_free_list (vm, free_list, n_alloc_buffers);
   if (n_filled == 0)
     return 0;
diff --git a/src/vnet.am b/src/vnet.am
index ca24c9c5..bc9655cc 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -114,14 +114,16 @@ libvnet_la_SOURCES +=				\
  vnet/ethernet/init.c				\
  vnet/ethernet/interface.c			\
  vnet/ethernet/node.c				\
- vnet/ethernet/pg.c
+ vnet/ethernet/pg.c				\
+ vnet/ethernet/sfp.c
 
 nobase_include_HEADERS +=			\
  vnet/ethernet/arp_packet.h			\
  vnet/ethernet/error.def			\
  vnet/ethernet/ethernet.h			\
  vnet/ethernet/packet.h				\
- vnet/ethernet/types.def
+ vnet/ethernet/types.def			\
+ vnet/ethernet/sfp.h
 
 ########################################
 # Layer 2 protocol: Ethernet bridging
@@ -792,14 +794,6 @@ nobase_include_HEADERS +=			\
   vnet/pg/pg.h					\
   vnet/pg/edit.h
 
-if !WITH_DPDK
-libvnet_la_SOURCES +=				\
-  vnet/devices/nic/ixge.c                       \
-  vnet/devices/nic/ixge.h                       \
-  vnet/devices/nic/sfp.c                        \
-  vnet/devices/nic/sfp.h
-endif
-
 ########################################
 # virtio
 ########################################
diff --git a/src/vnet/devices/nic/ixge.c b/src/vnet/devices/nic/ixge.c
deleted file mode 100644
index d4c4c6b7..00000000
--- a/src/vnet/devices/nic/ixge.c
+++ /dev/null
@@ -1,2938 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- *   WARNING!
- *   This driver is not intended for production use and it is unsupported.
- *   It is provided for educational use only.
- *   Please use supported DPDK driver instead.
- */
-
-#if __x86_64__
-#include <vppinfra/vector.h>
-
-#ifndef CLIB_HAVE_VEC128
-#warning HACK: ixge driver wont really work, missing u32x4
-typedef unsigned long long u32x4;
-#endif
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlib/pci/pci.h>
-#include <vnet/vnet.h>
-#include <vnet/devices/nic/ixge.h>
-#include <vnet/ethernet/ethernet.h>
-
-#define IXGE_ALWAYS_POLL 0
-
-#define EVENT_SET_FLAGS 0
-#define IXGE_HWBP_RACE_ELOG 0
-
-#define PCI_VENDOR_ID_INTEL 0x8086
-
-/* 10 GIG E (XGE) PHY IEEE 802.3 clause 45 definitions. */
-#define XGE_PHY_DEV_TYPE_PMA_PMD 1
-#define XGE_PHY_DEV_TYPE_PHY_XS 4
-#define XGE_PHY_ID1 0x2
-#define XGE_PHY_ID2 0x3
-#define XGE_PHY_CONTROL 0x0
-#define XGE_PHY_CONTROL_RESET (1 << 15)
-
-ixge_main_t ixge_main;
-static vlib_node_registration_t ixge_input_node;
-static vlib_node_registration_t ixge_process_node;
-
-static void
-ixge_semaphore_get (ixge_device_t * xd)
-{
-  ixge_main_t *xm = &ixge_main;
-  vlib_main_t *vm = xm->vlib_main;
-  ixge_regs_t *r = xd->regs;
-  u32 i;
-
-  i = 0;
-  while (!(r->software_semaphore & (1 << 0)))
-    {
-      if (i > 0)
-	vlib_process_suspend (vm, 100e-6);
-      i++;
-    }
-  do
-    {
-      r->software_semaphore |= 1 << 1;
-    }
-  while (!(r->software_semaphore & (1 << 1)));
-}
-
-static void
-ixge_semaphore_release (ixge_device_t * xd)
-{
-  ixge_regs_t *r = xd->regs;
-  r->software_semaphore &= ~3;
-}
-
-static void
-ixge_software_firmware_sync (ixge_device_t * xd, u32 sw_mask)
-{
-  ixge_main_t *xm = &ixge_main;
-  vlib_main_t *vm = xm->vlib_main;
-  ixge_regs_t *r = xd->regs;
-  u32 fw_mask = sw_mask << 5;
-  u32 m, done = 0;
-
-  while (!done)
-    {
-      ixge_semaphore_get (xd);
-      m = r->software_firmware_sync;
-      done = (m & fw_mask) == 0;
-      if (done)
-	r->software_firmware_sync = m | sw_mask;
-      ixge_semaphore_release (xd);
-      if (!done)
-	vlib_process_suspend (vm, 10e-3);
-    }
-}
-
-static void
-ixge_software_firmware_sync_release (ixge_device_t * xd, u32 sw_mask)
-{
-  ixge_regs_t *r = xd->regs;
-  ixge_semaphore_get (xd);
-  r->software_firmware_sync &= ~sw_mask;
-  ixge_semaphore_release (xd);
-}
-
-u32
-ixge_read_write_phy_reg (ixge_device_t * xd, u32 dev_type, u32 reg_index,
-			 u32 v, u32 is_read)
-{
-  ixge_regs_t *r = xd->regs;
-  const u32 busy_bit = 1 << 30;
-  u32 x;
-
-  ASSERT (xd->phy_index < 2);
-  ixge_software_firmware_sync (xd, 1 << (1 + xd->phy_index));
-
-  ASSERT (reg_index < (1 << 16));
-  ASSERT (dev_type < (1 << 5));
-  if (!is_read)
-    r->xge_mac.phy_data = v;
-
-  /* Address cycle. */
-  x =
-    reg_index | (dev_type << 16) | (xd->
-				    phys[xd->phy_index].mdio_address << 21);
-  r->xge_mac.phy_command = x | busy_bit;
-  /* Busy wait timed to take 28e-6 secs.  No suspend. */
-  while (r->xge_mac.phy_command & busy_bit)
-    ;
-
-  r->xge_mac.phy_command = x | ((is_read ? 2 : 1) << 26) | busy_bit;
-  while (r->xge_mac.phy_command & busy_bit)
-    ;
-
-  if (is_read)
-    v = r->xge_mac.phy_data >> 16;
-
-  ixge_software_firmware_sync_release (xd, 1 << (1 + xd->phy_index));
-
-  return v;
-}
-
-static u32
-ixge_read_phy_reg (ixge_device_t * xd, u32 dev_type, u32 reg_index)
-{
-  return ixge_read_write_phy_reg (xd, dev_type, reg_index, 0,	/* is_read */
-				  1);
-}
-
-static void
-ixge_write_phy_reg (ixge_device_t * xd, u32 dev_type, u32 reg_index, u32 v)
-{
-  (void) ixge_read_write_phy_reg (xd, dev_type, reg_index, v,	/* is_read */
-				  0);
-}
-
-static void
-ixge_i2c_put_bits (i2c_bus_t * b, int scl, int sda)
-{
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, b->private_data);
-  u32 v;
-
-  v = 0;
-  v |= (sda != 0) << 3;
-  v |= (scl != 0) << 1;
-  xd->regs->i2c_control = v;
-}
-
-static void
-ixge_i2c_get_bits (i2c_bus_t * b, int *scl, int *sda)
-{
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, b->private_data);
-  u32 v;
-
-  v = xd->regs->i2c_control;
-  *sda = (v & (1 << 2)) != 0;
-  *scl = (v & (1 << 0)) != 0;
-}
-
-static u16
-ixge_read_eeprom (ixge_device_t * xd, u32 address)
-{
-  ixge_regs_t *r = xd->regs;
-  u32 v;
-  r->eeprom_read = (( /* start bit */ (1 << 0)) | (address << 2));
-  /* Wait for done bit. */
-  while (!((v = r->eeprom_read) & (1 << 1)))
-    ;
-  return v >> 16;
-}
-
-static void
-ixge_sfp_enable_disable_laser (ixge_device_t * xd, uword enable)
-{
-  u32 tx_disable_bit = 1 << 3;
-  if (enable)
-    xd->regs->sdp_control &= ~tx_disable_bit;
-  else
-    xd->regs->sdp_control |= tx_disable_bit;
-}
-
-static void
-ixge_sfp_enable_disable_10g (ixge_device_t * xd, uword enable)
-{
-  u32 is_10g_bit = 1 << 5;
-  if (enable)
-    xd->regs->sdp_control |= is_10g_bit;
-  else
-    xd->regs->sdp_control &= ~is_10g_bit;
-}
-
-static clib_error_t *
-ixge_sfp_phy_init_from_eeprom (ixge_device_t * xd, u16 sfp_type)
-{
-  u16 a, id, reg_values_addr = 0;
-
-  a = ixge_read_eeprom (xd, 0x2b);
-  if (a == 0 || a == 0xffff)
-    return clib_error_create ("no init sequence in eeprom");
-
-  while (1)
-    {
-      id = ixge_read_eeprom (xd, ++a);
-      if (id == 0xffff)
-	break;
-      reg_values_addr = ixge_read_eeprom (xd, ++a);
-      if (id == sfp_type)
-	break;
-    }
-  if (id != sfp_type)
-    return clib_error_create ("failed to find id 0x%x", sfp_type);
-
-  ixge_software_firmware_sync (xd, 1 << 3);
-  while (1)
-    {
-      u16 v = ixge_read_eeprom (xd, ++reg_values_addr);
-      if (v == 0xffff)
-	break;
-      xd->regs->core_analog_config = v;
-    }
-  ixge_software_firmware_sync_release (xd, 1 << 3);
-
-  /* Make sure laser is off.  We'll turn on the laser when
-     the interface is brought up. */
-  ixge_sfp_enable_disable_laser (xd, /* enable */ 0);
-  ixge_sfp_enable_disable_10g (xd, /* is_10g */ 1);
-
-  return 0;
-}
-
-static void
-ixge_sfp_device_up_down (ixge_device_t * xd, uword is_up)
-{
-  u32 v;
-
-  if (is_up)
-    {
-      /* pma/pmd 10g serial SFI. */
-      xd->regs->xge_mac.auto_negotiation_control2 &= ~(3 << 16);
-      xd->regs->xge_mac.auto_negotiation_control2 |= 2 << 16;
-
-      v = xd->regs->xge_mac.auto_negotiation_control;
-      v &= ~(7 << 13);
-      v |= (0 << 13);
-      /* Restart autoneg. */
-      v |= (1 << 12);
-      xd->regs->xge_mac.auto_negotiation_control = v;
-
-      while (!(xd->regs->xge_mac.link_partner_ability[0] & 0xf0000))
-	;
-
-      v = xd->regs->xge_mac.auto_negotiation_control;
-
-      /* link mode 10g sfi serdes */
-      v &= ~(7 << 13);
-      v |= (3 << 13);
-
-      /* Restart autoneg. */
-      v |= (1 << 12);
-      xd->regs->xge_mac.auto_negotiation_control = v;
-
-      xd->regs->xge_mac.link_status;
-    }
-
-  ixge_sfp_enable_disable_laser (xd, /* enable */ is_up);
-
-  /* Give time for link partner to notice that we're up. */
-  if (is_up && vlib_in_process_context (vlib_get_main ()))
-    {
-      vlib_process_suspend (vlib_get_main (), 300e-3);
-    }
-}
-
-always_inline ixge_dma_regs_t *
-get_dma_regs (ixge_device_t * xd, vlib_rx_or_tx_t rt, u32 qi)
-{
-  ixge_regs_t *r = xd->regs;
-  ASSERT (qi < 128);
-  if (rt == VLIB_RX)
-    return qi < 64 ? &r->rx_dma0[qi] : &r->rx_dma1[qi - 64];
-  else
-    return &r->tx_dma[qi];
-}
-
-static clib_error_t *
-ixge_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
-{
-  vnet_hw_interface_t *hif = vnet_get_hw_interface (vnm, hw_if_index);
-  uword is_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, hif->dev_instance);
-  ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_RX, 0);
-
-  if (is_up)
-    {
-      xd->regs->rx_enable |= 1;
-      xd->regs->tx_dma_control |= 1;
-      dr->control |= 1 << 25;
-      while (!(dr->control & (1 << 25)))
-	;
-    }
-  else
-    {
-      xd->regs->rx_enable &= ~1;
-      xd->regs->tx_dma_control &= ~1;
-    }
-
-  ixge_sfp_device_up_down (xd, is_up);
-
-  return /* no error */ 0;
-}
-
-static void
-ixge_sfp_phy_init (ixge_device_t * xd)
-{
-  ixge_phy_t *phy = xd->phys + xd->phy_index;
-  i2c_bus_t *ib = &xd->i2c_bus;
-
-  ib->private_data = xd->device_index;
-  ib->put_bits = ixge_i2c_put_bits;
-  ib->get_bits = ixge_i2c_get_bits;
-  vlib_i2c_init (ib);
-
-  vlib_i2c_read_eeprom (ib, 0x50, 0, 128, (u8 *) & xd->sfp_eeprom);
-
-  if (vlib_i2c_bus_timed_out (ib) || !sfp_eeprom_is_valid (&xd->sfp_eeprom))
-    xd->sfp_eeprom.id = SFP_ID_unknown;
-  else
-    {
-      /* FIXME 5 => SR/LR eeprom ID. */
-      clib_error_t *e =
-	ixge_sfp_phy_init_from_eeprom (xd, 5 + xd->pci_function);
-      if (e)
-	clib_error_report (e);
-    }
-
-  phy->mdio_address = ~0;
-}
-
-static void
-ixge_phy_init (ixge_device_t * xd)
-{
-  ixge_main_t *xm = &ixge_main;
-  vlib_main_t *vm = xm->vlib_main;
-  ixge_phy_t *phy = xd->phys + xd->phy_index;
-
-  switch (xd->device_id)
-    {
-    case IXGE_82599_sfp:
-    case IXGE_82599_sfp_em:
-    case IXGE_82599_sfp_fcoe:
-      /* others? */
-      return ixge_sfp_phy_init (xd);
-
-    default:
-      break;
-    }
-
-  /* Probe address of phy. */
-  {
-    u32 i, v;
-
-    phy->mdio_address = ~0;
-    for (i = 0; i < 32; i++)
-      {
-	phy->mdio_address = i;
-	v = ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PMA_PMD, XGE_PHY_ID1);
-	if (v != 0xffff && v != 0)
-	  break;
-      }
-
-    /* No PHY found? */
-    if (i >= 32)
-      return;
-  }
-
-  phy->id =
-    ((ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PMA_PMD, XGE_PHY_ID1) << 16) |
-     ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PMA_PMD, XGE_PHY_ID2));
-
-  {
-    ELOG_TYPE_DECLARE (e) =
-    {
-    .function = (char *) __FUNCTION__,.format =
-	"ixge %d, phy id 0x%d mdio address %d",.format_args = "i4i4i4",};
-    struct
-    {
-      u32 instance, id, address;
-    } *ed;
-    ed = ELOG_DATA (&vm->elog_main, e);
-    ed->instance = xd->device_index;
-    ed->id = phy->id;
-    ed->address = phy->mdio_address;
-  }
-
-  /* Reset phy. */
-  ixge_write_phy_reg (xd, XGE_PHY_DEV_TYPE_PHY_XS, XGE_PHY_CONTROL,
-		      XGE_PHY_CONTROL_RESET);
-
-  /* Wait for self-clearning reset bit to clear. */
-  do
-    {
-      vlib_process_suspend (vm, 1e-3);
-    }
-  while (ixge_read_phy_reg (xd, XGE_PHY_DEV_TYPE_PHY_XS, XGE_PHY_CONTROL) &
-	 XGE_PHY_CONTROL_RESET);
-}
-
-static u8 *
-format_ixge_rx_from_hw_descriptor (u8 * s, va_list * va)
-{
-  ixge_rx_from_hw_descriptor_t *d =
-    va_arg (*va, ixge_rx_from_hw_descriptor_t *);
-  u32 s0 = d->status[0], s2 = d->status[2];
-  u32 is_ip4, is_ip6, is_ip, is_tcp, is_udp;
-  uword indent = format_get_indent (s);
-
-  s = format (s, "%s-owned",
-	      (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE) ? "sw" :
-	      "hw");
-  s =
-    format (s, ", length this descriptor %d, l3 offset %d",
-	    d->n_packet_bytes_this_descriptor,
-	    IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s0));
-  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET)
-    s = format (s, ", end-of-packet");
-
-  s = format (s, "\n%U", format_white_space, indent);
-
-  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_ETHERNET_ERROR)
-    s = format (s, "layer2 error");
-
-  if (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_LAYER2)
-    {
-      s = format (s, "layer 2 type %d", (s0 & 0x1f));
-      return s;
-    }
-
-  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_VLAN)
-    s = format (s, "vlan header 0x%x\n%U", d->vlan_tag,
-		format_white_space, indent);
-
-  if ((is_ip4 = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4)))
-    {
-      s = format (s, "ip4%s",
-		  (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4_EXT) ? " options" :
-		  "");
-      if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED)
-	s = format (s, " checksum %s",
-		    (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR) ?
-		    "bad" : "ok");
-    }
-  if ((is_ip6 = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6)))
-    s = format (s, "ip6%s",
-		(s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6_EXT) ? " extended" :
-		"");
-  is_tcp = is_udp = 0;
-  if ((is_ip = (is_ip4 | is_ip6)))
-    {
-      is_tcp = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_TCP) != 0;
-      is_udp = (s0 & IXGE_RX_DESCRIPTOR_STATUS0_IS_UDP) != 0;
-      if (is_tcp)
-	s = format (s, ", tcp");
-      if (is_udp)
-	s = format (s, ", udp");
-    }
-
-  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED)
-    s = format (s, ", tcp checksum %s",
-		(s2 & IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR) ? "bad" :
-		"ok");
-  if (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED)
-    s = format (s, ", udp checksum %s",
-		(s2 & IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR) ? "bad" :
-		"ok");
-
-  return s;
-}
-
-static u8 *
-format_ixge_tx_descriptor (u8 * s, va_list * va)
-{
-  ixge_tx_descriptor_t *d = va_arg (*va, ixge_tx_descriptor_t *);
-  u32 s0 = d->status0, s1 = d->status1;
-  uword indent = format_get_indent (s);
-  u32 v;
-
-  s = format (s, "buffer 0x%Lx, %d packet bytes, %d bytes this buffer",
-	      d->buffer_address, s1 >> 14, d->n_bytes_this_buffer);
-
-  s = format (s, "\n%U", format_white_space, indent);
-
-  if ((v = (s0 >> 0) & 3))
-    s = format (s, "reserved 0x%x, ", v);
-
-  if ((v = (s0 >> 2) & 3))
-    s = format (s, "mac 0x%x, ", v);
-
-  if ((v = (s0 >> 4) & 0xf) != 3)
-    s = format (s, "type 0x%x, ", v);
-
-  s = format (s, "%s%s%s%s%s%s%s%s",
-	      (s0 & (1 << 8)) ? "eop, " : "",
-	      (s0 & (1 << 9)) ? "insert-fcs, " : "",
-	      (s0 & (1 << 10)) ? "reserved26, " : "",
-	      (s0 & (1 << 11)) ? "report-status, " : "",
-	      (s0 & (1 << 12)) ? "reserved28, " : "",
-	      (s0 & (1 << 13)) ? "is-advanced, " : "",
-	      (s0 & (1 << 14)) ? "vlan-enable, " : "",
-	      (s0 & (1 << 15)) ? "tx-segmentation, " : "");
-
-  if ((v = s1 & 0xf) != 0)
-    s = format (s, "status 0x%x, ", v);
-
-  if ((v = (s1 >> 4) & 0xf))
-    s = format (s, "context 0x%x, ", v);
-
-  if ((v = (s1 >> 8) & 0x3f))
-    s = format (s, "options 0x%x, ", v);
-
-  return s;
-}
-
-typedef struct
-{
-  ixge_descriptor_t before, after;
-
-  u32 buffer_index;
-
-  u16 device_index;
-
-  u8 queue_index;
-
-  u8 is_start_of_packet;
-
-  /* Copy of VLIB buffer; packet data stored in pre_data. */
-  vlib_buffer_t buffer;
-} ixge_rx_dma_trace_t;
-
-static u8 *
-format_ixge_rx_dma_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  vlib_node_t *node = va_arg (*va, vlib_node_t *);
-  vnet_main_t *vnm = vnet_get_main ();
-  ixge_rx_dma_trace_t *t = va_arg (*va, ixge_rx_dma_trace_t *);
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, t->device_index);
-  format_function_t *f;
-  uword indent = format_get_indent (s);
-
-  {
-    vnet_sw_interface_t *sw =
-      vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
-    s =
-      format (s, "%U rx queue %d", format_vnet_sw_interface_name, vnm, sw,
-	      t->queue_index);
-  }
-
-  s = format (s, "\n%Ubefore: %U",
-	      format_white_space, indent,
-	      format_ixge_rx_from_hw_descriptor, &t->before);
-  s = format (s, "\n%Uafter : head/tail address 0x%Lx/0x%Lx",
-	      format_white_space, indent,
-	      t->after.rx_to_hw.head_address, t->after.rx_to_hw.tail_address);
-
-  s = format (s, "\n%Ubuffer 0x%x: %U",
-	      format_white_space, indent,
-	      t->buffer_index, format_vlib_buffer, &t->buffer);
-
-  s = format (s, "\n%U", format_white_space, indent);
-
-  f = node->format_buffer;
-  if (!f || !t->is_start_of_packet)
-    f = format_hex_bytes;
-  s = format (s, "%U", f, t->buffer.pre_data, sizeof (t->buffer.pre_data));
-
-  return s;
-}
-
-#define foreach_ixge_error					\
-  _ (none, "no error")						\
-  _ (tx_full_drops, "tx ring full drops")			\
-  _ (ip4_checksum_error, "ip4 checksum errors")			\
-  _ (rx_alloc_fail, "rx buf alloc from free list failed")	\
-  _ (rx_alloc_no_physmem, "rx buf alloc failed no physmem")
-
-typedef enum
-{
-#define _(f,s) IXGE_ERROR_##f,
-  foreach_ixge_error
-#undef _
-    IXGE_N_ERROR,
-} ixge_error_t;
-
-always_inline void
-ixge_rx_next_and_error_from_status_x1 (ixge_device_t * xd,
-				       u32 s00, u32 s02,
-				       u8 * next0, u8 * error0, u32 * flags0)
-{
-  u8 is0_ip4, is0_ip6, n0, e0;
-  u32 f0;
-
-  e0 = IXGE_ERROR_none;
-  n0 = IXGE_RX_NEXT_ETHERNET_INPUT;
-
-  is0_ip4 = s02 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED;
-  n0 = is0_ip4 ? IXGE_RX_NEXT_IP4_INPUT : n0;
-
-  e0 = (is0_ip4 && (s02 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR)
-	? IXGE_ERROR_ip4_checksum_error : e0);
-
-  is0_ip6 = s00 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6;
-  n0 = is0_ip6 ? IXGE_RX_NEXT_IP6_INPUT : n0;
-
-  n0 = (xd->per_interface_next_index != ~0) ?
-    xd->per_interface_next_index : n0;
-
-  /* Check for error. */
-  n0 = e0 != IXGE_ERROR_none ? IXGE_RX_NEXT_DROP : n0;
-
-  f0 = ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
-		| IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
-	? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
-
-  f0 |= ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
-		 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
-	 ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
-
-  *error0 = e0;
-  *next0 = n0;
-  *flags0 = f0;
-}
-
-always_inline void
-ixge_rx_next_and_error_from_status_x2 (ixge_device_t * xd,
-				       u32 s00, u32 s02,
-				       u32 s10, u32 s12,
-				       u8 * next0, u8 * error0, u32 * flags0,
-				       u8 * next1, u8 * error1, u32 * flags1)
-{
-  u8 is0_ip4, is0_ip6, n0, e0;
-  u8 is1_ip4, is1_ip6, n1, e1;
-  u32 f0, f1;
-
-  e0 = e1 = IXGE_ERROR_none;
-  n0 = n1 = IXGE_RX_NEXT_IP4_INPUT;
-
-  is0_ip4 = s02 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED;
-  is1_ip4 = s12 & IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED;
-
-  n0 = is0_ip4 ? IXGE_RX_NEXT_IP4_INPUT : n0;
-  n1 = is1_ip4 ? IXGE_RX_NEXT_IP4_INPUT : n1;
-
-  e0 = (is0_ip4 && (s02 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR)
-	? IXGE_ERROR_ip4_checksum_error : e0);
-  e1 = (is1_ip4 && (s12 & IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR)
-	? IXGE_ERROR_ip4_checksum_error : e1);
-
-  is0_ip6 = s00 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6;
-  is1_ip6 = s10 & IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6;
-
-  n0 = is0_ip6 ? IXGE_RX_NEXT_IP6_INPUT : n0;
-  n1 = is1_ip6 ? IXGE_RX_NEXT_IP6_INPUT : n1;
-
-  n0 = (xd->per_interface_next_index != ~0) ?
-    xd->per_interface_next_index : n0;
-  n1 = (xd->per_interface_next_index != ~0) ?
-    xd->per_interface_next_index : n1;
-
-  /* Check for error. */
-  n0 = e0 != IXGE_ERROR_none ? IXGE_RX_NEXT_DROP : n0;
-  n1 = e1 != IXGE_ERROR_none ? IXGE_RX_NEXT_DROP : n1;
-
-  *error0 = e0;
-  *error1 = e1;
-
-  *next0 = n0;
-  *next1 = n1;
-
-  f0 = ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
-		| IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
-	? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
-  f1 = ((s12 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
-		| IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
-	? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
-
-  f0 |= ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
-		 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
-	 ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
-  f1 |= ((s12 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
-		 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
-	 ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
-
-  *flags0 = f0;
-  *flags1 = f1;
-}
-
-static void
-ixge_rx_trace (ixge_main_t * xm,
-	       ixge_device_t * xd,
-	       ixge_dma_queue_t * dq,
-	       ixge_descriptor_t * before_descriptors,
-	       u32 * before_buffers,
-	       ixge_descriptor_t * after_descriptors, uword n_descriptors)
-{
-  vlib_main_t *vm = xm->vlib_main;
-  vlib_node_runtime_t *node = dq->rx.node;
-  ixge_rx_from_hw_descriptor_t *bd;
-  ixge_rx_to_hw_descriptor_t *ad;
-  u32 *b, n_left, is_sop, next_index_sop;
-
-  n_left = n_descriptors;
-  b = before_buffers;
-  bd = &before_descriptors->rx_from_hw;
-  ad = &after_descriptors->rx_to_hw;
-  is_sop = dq->rx.is_start_of_packet;
-  next_index_sop = dq->rx.saved_start_of_packet_next_index;
-
-  while (n_left >= 2)
-    {
-      u32 bi0, bi1, flags0, flags1;
-      vlib_buffer_t *b0, *b1;
-      ixge_rx_dma_trace_t *t0, *t1;
-      u8 next0, error0, next1, error1;
-
-      bi0 = b[0];
-      bi1 = b[1];
-      n_left -= 2;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      ixge_rx_next_and_error_from_status_x2 (xd,
-					     bd[0].status[0], bd[0].status[2],
-					     bd[1].status[0], bd[1].status[2],
-					     &next0, &error0, &flags0,
-					     &next1, &error1, &flags1);
-
-      next_index_sop = is_sop ? next0 : next_index_sop;
-      vlib_trace_buffer (vm, node, next_index_sop, b0, /* follow_chain */ 0);
-      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-      t0->is_start_of_packet = is_sop;
-      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      next_index_sop = is_sop ? next1 : next_index_sop;
-      vlib_trace_buffer (vm, node, next_index_sop, b1, /* follow_chain */ 0);
-      t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
-      t1->is_start_of_packet = is_sop;
-      is_sop = (b1->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      t0->queue_index = dq->queue_index;
-      t1->queue_index = dq->queue_index;
-      t0->device_index = xd->device_index;
-      t1->device_index = xd->device_index;
-      t0->before.rx_from_hw = bd[0];
-      t1->before.rx_from_hw = bd[1];
-      t0->after.rx_to_hw = ad[0];
-      t1->after.rx_to_hw = ad[1];
-      t0->buffer_index = bi0;
-      t1->buffer_index = bi1;
-      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
-      memcpy (&t1->buffer, b1, sizeof (b1[0]) - sizeof (b0->pre_data));
-      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
-	      sizeof (t0->buffer.pre_data));
-      memcpy (t1->buffer.pre_data, b1->data + b1->current_data,
-	      sizeof (t1->buffer.pre_data));
-
-      b += 2;
-      bd += 2;
-      ad += 2;
-    }
-
-  while (n_left >= 1)
-    {
-      u32 bi0, flags0;
-      vlib_buffer_t *b0;
-      ixge_rx_dma_trace_t *t0;
-      u8 next0, error0;
-
-      bi0 = b[0];
-      n_left -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      ixge_rx_next_and_error_from_status_x1 (xd,
-					     bd[0].status[0], bd[0].status[2],
-					     &next0, &error0, &flags0);
-
-      next_index_sop = is_sop ? next0 : next_index_sop;
-      vlib_trace_buffer (vm, node, next_index_sop, b0, /* follow_chain */ 0);
-      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-      t0->is_start_of_packet = is_sop;
-      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      t0->queue_index = dq->queue_index;
-      t0->device_index = xd->device_index;
-      t0->before.rx_from_hw = bd[0];
-      t0->after.rx_to_hw = ad[0];
-      t0->buffer_index = bi0;
-      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
-      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
-	      sizeof (t0->buffer.pre_data));
-
-      b += 1;
-      bd += 1;
-      ad += 1;
-    }
-}
-
-typedef struct
-{
-  ixge_tx_descriptor_t descriptor;
-
-  u32 buffer_index;
-
-  u16 device_index;
-
-  u8 queue_index;
-
-  u8 is_start_of_packet;
-
-  /* Copy of VLIB buffer; packet data stored in pre_data. */
-  vlib_buffer_t buffer;
-} ixge_tx_dma_trace_t;
-
-static u8 *
-format_ixge_tx_dma_trace (u8 * s, va_list * va)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
-  ixge_tx_dma_trace_t *t = va_arg (*va, ixge_tx_dma_trace_t *);
-  vnet_main_t *vnm = vnet_get_main ();
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, t->device_index);
-  format_function_t *f;
-  uword indent = format_get_indent (s);
-
-  {
-    vnet_sw_interface_t *sw =
-      vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
-    s =
-      format (s, "%U tx queue %d", format_vnet_sw_interface_name, vnm, sw,
-	      t->queue_index);
-  }
-
-  s = format (s, "\n%Udescriptor: %U",
-	      format_white_space, indent,
-	      format_ixge_tx_descriptor, &t->descriptor);
-
-  s = format (s, "\n%Ubuffer 0x%x: %U",
-	      format_white_space, indent,
-	      t->buffer_index, format_vlib_buffer, &t->buffer);
-
-  s = format (s, "\n%U", format_white_space, indent);
-
-  f = format_ethernet_header_with_length;
-  if (!f || !t->is_start_of_packet)
-    f = format_hex_bytes;
-  s = format (s, "%U", f, t->buffer.pre_data, sizeof (t->buffer.pre_data));
-
-  return s;
-}
-
-typedef struct
-{
-  vlib_node_runtime_t *node;
-
-  u32 is_start_of_packet;
-
-  u32 n_bytes_in_packet;
-
-  ixge_tx_descriptor_t *start_of_packet_descriptor;
-} ixge_tx_state_t;
-
-static void
-ixge_tx_trace (ixge_main_t * xm,
-	       ixge_device_t * xd,
-	       ixge_dma_queue_t * dq,
-	       ixge_tx_state_t * tx_state,
-	       ixge_tx_descriptor_t * descriptors,
-	       u32 * buffers, uword n_descriptors)
-{
-  vlib_main_t *vm = xm->vlib_main;
-  vlib_node_runtime_t *node = tx_state->node;
-  ixge_tx_descriptor_t *d;
-  u32 *b, n_left, is_sop;
-
-  n_left = n_descriptors;
-  b = buffers;
-  d = descriptors;
-  is_sop = tx_state->is_start_of_packet;
-
-  while (n_left >= 2)
-    {
-      u32 bi0, bi1;
-      vlib_buffer_t *b0, *b1;
-      ixge_tx_dma_trace_t *t0, *t1;
-
-      bi0 = b[0];
-      bi1 = b[1];
-      n_left -= 2;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-      t0->is_start_of_packet = is_sop;
-      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0]));
-      t1->is_start_of_packet = is_sop;
-      is_sop = (b1->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      t0->queue_index = dq->queue_index;
-      t1->queue_index = dq->queue_index;
-      t0->device_index = xd->device_index;
-      t1->device_index = xd->device_index;
-      t0->descriptor = d[0];
-      t1->descriptor = d[1];
-      t0->buffer_index = bi0;
-      t1->buffer_index = bi1;
-      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
-      memcpy (&t1->buffer, b1, sizeof (b1[0]) - sizeof (b0->pre_data));
-      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
-	      sizeof (t0->buffer.pre_data));
-      memcpy (t1->buffer.pre_data, b1->data + b1->current_data,
-	      sizeof (t1->buffer.pre_data));
-
-      b += 2;
-      d += 2;
-    }
-
-  while (n_left >= 1)
-    {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      ixge_tx_dma_trace_t *t0;
-
-      bi0 = b[0];
-      n_left -= 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-      t0->is_start_of_packet = is_sop;
-      is_sop = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      t0->queue_index = dq->queue_index;
-      t0->device_index = xd->device_index;
-      t0->descriptor = d[0];
-      t0->buffer_index = bi0;
-      memcpy (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data));
-      memcpy (t0->buffer.pre_data, b0->data + b0->current_data,
-	      sizeof (t0->buffer.pre_data));
-
-      b += 1;
-      d += 1;
-    }
-}
-
-always_inline uword
-ixge_ring_sub (ixge_dma_queue_t * q, u32 i0, u32 i1)
-{
-  i32 d = i1 - i0;
-  ASSERT (i0 < q->n_descriptors);
-  ASSERT (i1 < q->n_descriptors);
-  return d < 0 ? q->n_descriptors + d : d;
-}
-
-always_inline uword
-ixge_ring_add (ixge_dma_queue_t * q, u32 i0, u32 i1)
-{
-  u32 d = i0 + i1;
-  ASSERT (i0 < q->n_descriptors);
-  ASSERT (i1 < q->n_descriptors);
-  d -= d >= q->n_descriptors ? q->n_descriptors : 0;
-  return d;
-}
-
-always_inline uword
-ixge_tx_descriptor_matches_template (ixge_main_t * xm,
-				     ixge_tx_descriptor_t * d)
-{
-  u32 cmp;
-
-  cmp = ((d->status0 & xm->tx_descriptor_template_mask.status0)
-	 ^ xm->tx_descriptor_template.status0);
-  if (cmp)
-    return 0;
-  cmp = ((d->status1 & xm->tx_descriptor_template_mask.status1)
-	 ^ xm->tx_descriptor_template.status1);
-  if (cmp)
-    return 0;
-
-  return 1;
-}
-
-static uword
-ixge_tx_no_wrap (ixge_main_t * xm,
-		 ixge_device_t * xd,
-		 ixge_dma_queue_t * dq,
-		 u32 * buffers,
-		 u32 start_descriptor_index,
-		 u32 n_descriptors, ixge_tx_state_t * tx_state)
-{
-  vlib_main_t *vm = xm->vlib_main;
-  ixge_tx_descriptor_t *d, *d_sop;
-  u32 n_left = n_descriptors;
-  u32 *to_free = vec_end (xm->tx_buffers_pending_free);
-  u32 *to_tx =
-    vec_elt_at_index (dq->descriptor_buffer_indices, start_descriptor_index);
-  u32 is_sop = tx_state->is_start_of_packet;
-  u32 len_sop = tx_state->n_bytes_in_packet;
-  u16 template_status = xm->tx_descriptor_template.status0;
-  u32 descriptor_prefetch_rotor = 0;
-
-  ASSERT (start_descriptor_index + n_descriptors <= dq->n_descriptors);
-  d = &dq->descriptors[start_descriptor_index].tx;
-  d_sop = is_sop ? d : tx_state->start_of_packet_descriptor;
-
-  while (n_left >= 4)
-    {
-      vlib_buffer_t *b0, *b1;
-      u32 bi0, fi0, len0;
-      u32 bi1, fi1, len1;
-      u8 is_eop0, is_eop1;
-
-      /* Prefetch next iteration. */
-      vlib_prefetch_buffer_with_index (vm, buffers[2], LOAD);
-      vlib_prefetch_buffer_with_index (vm, buffers[3], LOAD);
-
-      if ((descriptor_prefetch_rotor & 0x3) == 0)
-	CLIB_PREFETCH (d + 4, CLIB_CACHE_LINE_BYTES, STORE);
-
-      descriptor_prefetch_rotor += 2;
-
-      bi0 = buffers[0];
-      bi1 = buffers[1];
-
-      to_free[0] = fi0 = to_tx[0];
-      to_tx[0] = bi0;
-      to_free += fi0 != 0;
-
-      to_free[0] = fi1 = to_tx[1];
-      to_tx[1] = bi1;
-      to_free += fi1 != 0;
-
-      buffers += 2;
-      n_left -= 2;
-      to_tx += 2;
-
-      b0 = vlib_get_buffer (vm, bi0);
-      b1 = vlib_get_buffer (vm, bi1);
-
-      is_eop0 = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-      is_eop1 = (b1->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      len0 = b0->current_length;
-      len1 = b1->current_length;
-
-      ASSERT (ixge_tx_descriptor_matches_template (xm, d + 0));
-      ASSERT (ixge_tx_descriptor_matches_template (xm, d + 1));
-
-      d[0].buffer_address =
-	vlib_get_buffer_data_physical_address (vm, bi0) + b0->current_data;
-      d[1].buffer_address =
-	vlib_get_buffer_data_physical_address (vm, bi1) + b1->current_data;
-
-      d[0].n_bytes_this_buffer = len0;
-      d[1].n_bytes_this_buffer = len1;
-
-      d[0].status0 =
-	template_status | (is_eop0 <<
-			   IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET);
-      d[1].status0 =
-	template_status | (is_eop1 <<
-			   IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET);
-
-      len_sop = (is_sop ? 0 : len_sop) + len0;
-      d_sop[0].status1 =
-	IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET (len_sop);
-      d += 1;
-      d_sop = is_eop0 ? d : d_sop;
-
-      is_sop = is_eop0;
-
-      len_sop = (is_sop ? 0 : len_sop) + len1;
-      d_sop[0].status1 =
-	IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET (len_sop);
-      d += 1;
-      d_sop = is_eop1 ? d : d_sop;
-
-      is_sop = is_eop1;
-    }
-
-  while (n_left > 0)
-    {
-      vlib_buffer_t *b0;
-      u32 bi0, fi0, len0;
-      u8 is_eop0;
-
-      bi0 = buffers[0];
-
-      to_free[0] = fi0 = to_tx[0];
-      to_tx[0] = bi0;
-      to_free += fi0 != 0;
-
-      buffers += 1;
-      n_left -= 1;
-      to_tx += 1;
-
-      b0 = vlib_get_buffer (vm, bi0);
-
-      is_eop0 = (b0->flags & VLIB_BUFFER_NEXT_PRESENT) == 0;
-
-      len0 = b0->current_length;
-
-      ASSERT (ixge_tx_descriptor_matches_template (xm, d + 0));
-
-      d[0].buffer_address =
-	vlib_get_buffer_data_physical_address (vm, bi0) + b0->current_data;
-
-      d[0].n_bytes_this_buffer = len0;
-
-      d[0].status0 =
-	template_status | (is_eop0 <<
-			   IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET);
-
-      len_sop = (is_sop ? 0 : len_sop) + len0;
-      d_sop[0].status1 =
-	IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET (len_sop);
-      d += 1;
-      d_sop = is_eop0 ? d : d_sop;
-
-      is_sop = is_eop0;
-    }
-
-  if (tx_state->node->flags & VLIB_NODE_FLAG_TRACE)
-    {
-      to_tx =
-	vec_elt_at_index (dq->descriptor_buffer_indices,
-			  start_descriptor_index);
-      ixge_tx_trace (xm, xd, dq, tx_state,
-		     &dq->descriptors[start_descriptor_index].tx, to_tx,
-		     n_descriptors);
-    }
-
-  _vec_len (xm->tx_buffers_pending_free) =
-    to_free - xm->tx_buffers_pending_free;
-
-  /* When we are done d_sop can point to end of ring.  Wrap it if so. */
-  {
-    ixge_tx_descriptor_t *d_start = &dq->descriptors[0].tx;
-
-    ASSERT (d_sop - d_start <= dq->n_descriptors);
-    d_sop = d_sop - d_start == dq->n_descriptors ? d_start : d_sop;
-  }
-
-  tx_state->is_start_of_packet = is_sop;
-  tx_state->start_of_packet_descriptor = d_sop;
-  tx_state->n_bytes_in_packet = len_sop;
-
-  return n_descriptors;
-}
-
-static uword
-ixge_interface_tx (vlib_main_t * vm,
-		   vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  ixge_main_t *xm = &ixge_main;
-  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, rd->dev_instance);
-  ixge_dma_queue_t *dq;
-  u32 *from, n_left_tx, n_descriptors_to_tx, n_tail_drop;
-  u32 queue_index = 0;		/* fixme parameter */
-  ixge_tx_state_t tx_state;
-
-  tx_state.node = node;
-  tx_state.is_start_of_packet = 1;
-  tx_state.start_of_packet_descriptor = 0;
-  tx_state.n_bytes_in_packet = 0;
-
-  from = vlib_frame_vector_args (f);
-
-  dq = vec_elt_at_index (xd->dma_queues[VLIB_TX], queue_index);
-
-  dq->head_index = dq->tx.head_index_write_back[0];
-
-  /* Since head == tail means ring is empty we can send up to dq->n_descriptors - 1. */
-  n_left_tx = dq->n_descriptors - 1;
-  n_left_tx -= ixge_ring_sub (dq, dq->head_index, dq->tail_index);
-
-  _vec_len (xm->tx_buffers_pending_free) = 0;
-
-  n_descriptors_to_tx = f->n_vectors;
-  n_tail_drop = 0;
-  if (PREDICT_FALSE (n_descriptors_to_tx > n_left_tx))
-    {
-      i32 i, n_ok, i_eop, i_sop;
-
-      i_sop = i_eop = ~0;
-      for (i = n_left_tx - 1; i >= 0; i--)
-	{
-	  vlib_buffer_t *b = vlib_get_buffer (vm, from[i]);
-	  if (!(b->flags & VLIB_BUFFER_NEXT_PRESENT))
-	    {
-	      if (i_sop != ~0 && i_eop != ~0)
-		break;
-	      i_eop = i;
-	      i_sop = i + 1;
-	    }
-	}
-      if (i == 0)
-	n_ok = 0;
-      else
-	n_ok = i_eop + 1;
-
-      {
-	ELOG_TYPE_DECLARE (e) =
-	{
-	.function = (char *) __FUNCTION__,.format =
-	    "ixge %d, ring full to tx %d head %d tail %d",.format_args =
-	    "i2i2i2i2",};
-	struct
-	{
-	  u16 instance, to_tx, head, tail;
-	} *ed;
-	ed = ELOG_DATA (&vm->elog_main, e);
-	ed->instance = xd->device_index;
-	ed->to_tx = n_descriptors_to_tx;
-	ed->head = dq->head_index;
-	ed->tail = dq->tail_index;
-      }
-
-      if (n_ok < n_descriptors_to_tx)
-	{
-	  n_tail_drop = n_descriptors_to_tx - n_ok;
-	  vec_add (xm->tx_buffers_pending_free, from + n_ok, n_tail_drop);
-	  vlib_error_count (vm, ixge_input_node.index,
-			    IXGE_ERROR_tx_full_drops, n_tail_drop);
-	}
-
-      n_descriptors_to_tx = n_ok;
-    }
-
-  dq->tx.n_buffers_on_ring += n_descriptors_to_tx;
-
-  /* Process from tail to end of descriptor ring. */
-  if (n_descriptors_to_tx > 0 && dq->tail_index < dq->n_descriptors)
-    {
-      u32 n =
-	clib_min (dq->n_descriptors - dq->tail_index, n_descriptors_to_tx);
-      n = ixge_tx_no_wrap (xm, xd, dq, from, dq->tail_index, n, &tx_state);
-      from += n;
-      n_descriptors_to_tx -= n;
-      dq->tail_index += n;
-      ASSERT (dq->tail_index <= dq->n_descriptors);
-      if (dq->tail_index == dq->n_descriptors)
-	dq->tail_index = 0;
-    }
-
-  if (n_descriptors_to_tx > 0)
-    {
-      u32 n =
-	ixge_tx_no_wrap (xm, xd, dq, from, 0, n_descriptors_to_tx, &tx_state);
-      from += n;
-      ASSERT (n == n_descriptors_to_tx);
-      dq->tail_index += n;
-      ASSERT (dq->tail_index <= dq->n_descriptors);
-      if (dq->tail_index == dq->n_descriptors)
-	dq->tail_index = 0;
-    }
-
-  /* We should only get full packets. */
-  ASSERT (tx_state.is_start_of_packet);
-
-  /* Report status when last descriptor is done. */
-  {
-    u32 i = dq->tail_index == 0 ? dq->n_descriptors - 1 : dq->tail_index - 1;
-    ixge_tx_descriptor_t *d = &dq->descriptors[i].tx;
-    d->status0 |= IXGE_TX_DESCRIPTOR_STATUS0_REPORT_STATUS;
-  }
-
-  /* Give new descriptors to hardware. */
-  {
-    ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_TX, queue_index);
-
-    CLIB_MEMORY_BARRIER ();
-
-    dr->tail_index = dq->tail_index;
-  }
-
-  /* Free any buffers that are done. */
-  {
-    u32 n = _vec_len (xm->tx_buffers_pending_free);
-    if (n > 0)
-      {
-	vlib_buffer_free_no_next (vm, xm->tx_buffers_pending_free, n);
-	_vec_len (xm->tx_buffers_pending_free) = 0;
-	ASSERT (dq->tx.n_buffers_on_ring >= n);
-	dq->tx.n_buffers_on_ring -= (n - n_tail_drop);
-      }
-  }
-
-  return f->n_vectors;
-}
-
-static uword
-ixge_rx_queue_no_wrap (ixge_main_t * xm,
-		       ixge_device_t * xd,
-		       ixge_dma_queue_t * dq,
-		       u32 start_descriptor_index, u32 n_descriptors)
-{
-  vlib_main_t *vm = xm->vlib_main;
-  vlib_node_runtime_t *node = dq->rx.node;
-  ixge_descriptor_t *d;
-  static ixge_descriptor_t *d_trace_save;
-  static u32 *d_trace_buffers;
-  u32 n_descriptors_left = n_descriptors;
-  u32 *to_rx =
-    vec_elt_at_index (dq->descriptor_buffer_indices, start_descriptor_index);
-  u32 *to_add;
-  u32 bi_sop = dq->rx.saved_start_of_packet_buffer_index;
-  u32 bi_last = dq->rx.saved_last_buffer_index;
-  u32 next_index_sop = dq->rx.saved_start_of_packet_next_index;
-  u32 is_sop = dq->rx.is_start_of_packet;
-  u32 next_index, n_left_to_next, *to_next;
-  u32 n_packets = 0;
-  u32 n_bytes = 0;
-  u32 n_trace = vlib_get_trace_count (vm, node);
-  vlib_buffer_t *b_last, b_dummy;
-
-  ASSERT (start_descriptor_index + n_descriptors <= dq->n_descriptors);
-  d = &dq->descriptors[start_descriptor_index];
-
-  b_last = bi_last != ~0 ? vlib_get_buffer (vm, bi_last) : &b_dummy;
-  next_index = dq->rx.next_index;
-
-  if (n_trace > 0)
-    {
-      u32 n = clib_min (n_trace, n_descriptors);
-      if (d_trace_save)
-	{
-	  _vec_len (d_trace_save) = 0;
-	  _vec_len (d_trace_buffers) = 0;
-	}
-      vec_add (d_trace_save, (ixge_descriptor_t *) d, n);
-      vec_add (d_trace_buffers, to_rx, n);
-    }
-
-  {
-    uword l = vec_len (xm->rx_buffers_to_add);
-
-    if (l < n_descriptors_left)
-      {
-	u32 n_to_alloc = 2 * dq->n_descriptors - l;
-	u32 n_allocated;
-
-	vec_resize (xm->rx_buffers_to_add, n_to_alloc);
-
-	_vec_len (xm->rx_buffers_to_add) = l;
-	n_allocated = vlib_buffer_alloc_from_free_list
-	  (vm, xm->rx_buffers_to_add + l, n_to_alloc,
-	   xm->vlib_buffer_free_list_index);
-	_vec_len (xm->rx_buffers_to_add) += n_allocated;
-
-	/* Handle transient allocation failure */
-	if (PREDICT_FALSE (l + n_allocated <= n_descriptors_left))
-	  {
-	    if (n_allocated == 0)
-	      vlib_error_count (vm, ixge_input_node.index,
-				IXGE_ERROR_rx_alloc_no_physmem, 1);
-	    else
-	      vlib_error_count (vm, ixge_input_node.index,
-				IXGE_ERROR_rx_alloc_fail, 1);
-
-	    n_descriptors_left = l + n_allocated;
-	  }
-	n_descriptors = n_descriptors_left;
-      }
-
-    /* Add buffers from end of vector going backwards. */
-    to_add = vec_end (xm->rx_buffers_to_add) - 1;
-  }
-
-  while (n_descriptors_left > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_descriptors_left >= 4 && n_left_to_next >= 2)
-	{
-	  vlib_buffer_t *b0, *b1;
-	  u32 bi0, fi0, len0, l3_offset0, s20, s00, flags0;
-	  u32 bi1, fi1, len1, l3_offset1, s21, s01, flags1;
-	  u8 is_eop0, error0, next0;
-	  u8 is_eop1, error1, next1;
-	  ixge_descriptor_t d0, d1;
-
-	  vlib_prefetch_buffer_with_index (vm, to_rx[2], STORE);
-	  vlib_prefetch_buffer_with_index (vm, to_rx[3], STORE);
-
-	  CLIB_PREFETCH (d + 2, 32, STORE);
-
-	  d0.as_u32x4 = d[0].as_u32x4;
-	  d1.as_u32x4 = d[1].as_u32x4;
-
-	  s20 = d0.rx_from_hw.status[2];
-	  s21 = d1.rx_from_hw.status[2];
-
-	  s00 = d0.rx_from_hw.status[0];
-	  s01 = d1.rx_from_hw.status[0];
-
-	  if (!
-	      ((s20 & s21) & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE))
-	    goto found_hw_owned_descriptor_x2;
-
-	  bi0 = to_rx[0];
-	  bi1 = to_rx[1];
-
-	  ASSERT (to_add - 1 >= xm->rx_buffers_to_add);
-	  fi0 = to_add[0];
-	  fi1 = to_add[-1];
-
-	  to_rx[0] = fi0;
-	  to_rx[1] = fi1;
-	  to_rx += 2;
-	  to_add -= 2;
-
-	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
-		  vlib_buffer_is_known (vm, bi0));
-	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
-		  vlib_buffer_is_known (vm, bi1));
-	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
-		  vlib_buffer_is_known (vm, fi0));
-	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
-		  vlib_buffer_is_known (vm, fi1));
-
-	  b0 = vlib_get_buffer (vm, bi0);
-	  b1 = vlib_get_buffer (vm, bi1);
-
-	  /*
-	   * Turn this on if you run into
-	   * "bad monkey" contexts, and you want to know exactly
-	   * which nodes they've visited... See main.c...
-	   */
-	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
-	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b1);
-
-	  CLIB_PREFETCH (b0->data, CLIB_CACHE_LINE_BYTES, LOAD);
-	  CLIB_PREFETCH (b1->data, CLIB_CACHE_LINE_BYTES, LOAD);
-
-	  is_eop0 = (s20 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET) != 0;
-	  is_eop1 = (s21 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET) != 0;
-
-	  ixge_rx_next_and_error_from_status_x2 (xd, s00, s20, s01, s21,
-						 &next0, &error0, &flags0,
-						 &next1, &error1, &flags1);
-
-	  next0 = is_sop ? next0 : next_index_sop;
-	  next1 = is_eop0 ? next1 : next0;
-	  next_index_sop = next1;
-
-	  b0->flags |= flags0 | (!is_eop0 << VLIB_BUFFER_LOG2_NEXT_PRESENT);
-	  b1->flags |= flags1 | (!is_eop1 << VLIB_BUFFER_LOG2_NEXT_PRESENT);
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
-	  vnet_buffer (b1)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-	  vnet_buffer (b1)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-
-	  b0->error = node->errors[error0];
-	  b1->error = node->errors[error1];
-
-	  len0 = d0.rx_from_hw.n_packet_bytes_this_descriptor;
-	  len1 = d1.rx_from_hw.n_packet_bytes_this_descriptor;
-	  n_bytes += len0 + len1;
-	  n_packets += is_eop0 + is_eop1;
-
-	  /* Give new buffers to hardware. */
-	  d0.rx_to_hw.tail_address =
-	    vlib_get_buffer_data_physical_address (vm, fi0);
-	  d1.rx_to_hw.tail_address =
-	    vlib_get_buffer_data_physical_address (vm, fi1);
-	  d0.rx_to_hw.head_address = d[0].rx_to_hw.tail_address;
-	  d1.rx_to_hw.head_address = d[1].rx_to_hw.tail_address;
-	  d[0].as_u32x4 = d0.as_u32x4;
-	  d[1].as_u32x4 = d1.as_u32x4;
-
-	  d += 2;
-	  n_descriptors_left -= 2;
-
-	  /* Point to either l2 or l3 header depending on next. */
-	  l3_offset0 = (is_sop && (next0 != IXGE_RX_NEXT_ETHERNET_INPUT))
-	    ? IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s00) : 0;
-	  l3_offset1 = (is_eop0 && (next1 != IXGE_RX_NEXT_ETHERNET_INPUT))
-	    ? IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s01) : 0;
-
-	  b0->current_length = len0 - l3_offset0;
-	  b1->current_length = len1 - l3_offset1;
-	  b0->current_data = l3_offset0;
-	  b1->current_data = l3_offset1;
-
-	  b_last->next_buffer = is_sop ? ~0 : bi0;
-	  b0->next_buffer = is_eop0 ? ~0 : bi1;
-	  bi_last = bi1;
-	  b_last = b1;
-
-	  if (CLIB_DEBUG > 0)
-	    {
-	      u32 bi_sop0 = is_sop ? bi0 : bi_sop;
-	      u32 bi_sop1 = is_eop0 ? bi1 : bi_sop0;
-
-	      if (is_eop0)
-		{
-		  u8 *msg = vlib_validate_buffer (vm, bi_sop0,
-						  /* follow_buffer_next */ 1);
-		  ASSERT (!msg);
-		}
-	      if (is_eop1)
-		{
-		  u8 *msg = vlib_validate_buffer (vm, bi_sop1,
-						  /* follow_buffer_next */ 1);
-		  ASSERT (!msg);
-		}
-	    }
-	  if (0)		/* "Dave" version */
-	    {
-	      u32 bi_sop0 = is_sop ? bi0 : bi_sop;
-	      u32 bi_sop1 = is_eop0 ? bi1 : bi_sop0;
-
-	      if (is_eop0)
-		{
-		  to_next[0] = bi_sop0;
-		  to_next++;
-		  n_left_to_next--;
-
-		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-						   to_next, n_left_to_next,
-						   bi_sop0, next0);
-		}
-	      if (is_eop1)
-		{
-		  to_next[0] = bi_sop1;
-		  to_next++;
-		  n_left_to_next--;
-
-		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-						   to_next, n_left_to_next,
-						   bi_sop1, next1);
-		}
-	      is_sop = is_eop1;
-	      bi_sop = bi_sop1;
-	    }
-	  if (1)		/* "Eliot" version */
-	    {
-	      /* Speculatively enqueue to cached next. */
-	      u8 saved_is_sop = is_sop;
-	      u32 bi_sop_save = bi_sop;
-
-	      bi_sop = saved_is_sop ? bi0 : bi_sop;
-	      to_next[0] = bi_sop;
-	      to_next += is_eop0;
-	      n_left_to_next -= is_eop0;
-
-	      bi_sop = is_eop0 ? bi1 : bi_sop;
-	      to_next[0] = bi_sop;
-	      to_next += is_eop1;
-	      n_left_to_next -= is_eop1;
-
-	      is_sop = is_eop1;
-
-	      if (PREDICT_FALSE
-		  (!(next0 == next_index && next1 == next_index)))
-		{
-		  /* Undo speculation. */
-		  to_next -= is_eop0 + is_eop1;
-		  n_left_to_next += is_eop0 + is_eop1;
-
-		  /* Re-do both descriptors being careful about where we enqueue. */
-		  bi_sop = saved_is_sop ? bi0 : bi_sop_save;
-		  if (is_eop0)
-		    {
-		      if (next0 != next_index)
-			vlib_set_next_frame_buffer (vm, node, next0, bi_sop);
-		      else
-			{
-			  to_next[0] = bi_sop;
-			  to_next += 1;
-			  n_left_to_next -= 1;
-			}
-		    }
-
-		  bi_sop = is_eop0 ? bi1 : bi_sop;
-		  if (is_eop1)
-		    {
-		      if (next1 != next_index)
-			vlib_set_next_frame_buffer (vm, node, next1, bi_sop);
-		      else
-			{
-			  to_next[0] = bi_sop;
-			  to_next += 1;
-			  n_left_to_next -= 1;
-			}
-		    }
-
-		  /* Switch cached next index when next for both packets is the same. */
-		  if (is_eop0 && is_eop1 && next0 == next1)
-		    {
-		      vlib_put_next_frame (vm, node, next_index,
-					   n_left_to_next);
-		      next_index = next0;
-		      vlib_get_next_frame (vm, node, next_index,
-					   to_next, n_left_to_next);
-		    }
-		}
-	    }
-	}
-
-      /* Bail out of dual loop and proceed with single loop. */
-    found_hw_owned_descriptor_x2:
-
-      while (n_descriptors_left > 0 && n_left_to_next > 0)
-	{
-	  vlib_buffer_t *b0;
-	  u32 bi0, fi0, len0, l3_offset0, s20, s00, flags0;
-	  u8 is_eop0, error0, next0;
-	  ixge_descriptor_t d0;
-
-	  d0.as_u32x4 = d[0].as_u32x4;
-
-	  s20 = d0.rx_from_hw.status[2];
-	  s00 = d0.rx_from_hw.status[0];
-
-	  if (!(s20 & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE))
-	    goto found_hw_owned_descriptor_x1;
-
-	  bi0 = to_rx[0];
-	  ASSERT (to_add >= xm->rx_buffers_to_add);
-	  fi0 = to_add[0];
-
-	  to_rx[0] = fi0;
-	  to_rx += 1;
-	  to_add -= 1;
-
-	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
-		  vlib_buffer_is_known (vm, bi0));
-	  ASSERT (VLIB_BUFFER_KNOWN_ALLOCATED ==
-		  vlib_buffer_is_known (vm, fi0));
-
-	  b0 = vlib_get_buffer (vm, bi0);
-
-	  /*
-	   * Turn this on if you run into
-	   * "bad monkey" contexts, and you want to know exactly
-	   * which nodes they've visited...
-	   */
-	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
-
-	  is_eop0 = (s20 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET) != 0;
-	  ixge_rx_next_and_error_from_status_x1
-	    (xd, s00, s20, &next0, &error0, &flags0);
-
-	  next0 = is_sop ? next0 : next_index_sop;
-	  next_index_sop = next0;
-
-	  b0->flags |= flags0 | (!is_eop0 << VLIB_BUFFER_LOG2_NEXT_PRESENT);
-
-	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = xd->vlib_sw_if_index;
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-
-	  b0->error = node->errors[error0];
-
-	  len0 = d0.rx_from_hw.n_packet_bytes_this_descriptor;
-	  n_bytes += len0;
-	  n_packets += is_eop0;
-
-	  /* Give new buffer to hardware. */
-	  d0.rx_to_hw.tail_address =
-	    vlib_get_buffer_data_physical_address (vm, fi0);
-	  d0.rx_to_hw.head_address = d0.rx_to_hw.tail_address;
-	  d[0].as_u32x4 = d0.as_u32x4;
-
-	  d += 1;
-	  n_descriptors_left -= 1;
-
-	  /* Point to either l2 or l3 header depending on next. */
-	  l3_offset0 = (is_sop && (next0 != IXGE_RX_NEXT_ETHERNET_INPUT))
-	    ? IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET (s00) : 0;
-	  b0->current_length = len0 - l3_offset0;
-	  b0->current_data = l3_offset0;
-
-	  b_last->next_buffer = is_sop ? ~0 : bi0;
-	  bi_last = bi0;
-	  b_last = b0;
-
-	  bi_sop = is_sop ? bi0 : bi_sop;
-
-	  if (CLIB_DEBUG > 0 && is_eop0)
-	    {
-	      u8 *msg =
-		vlib_validate_buffer (vm, bi_sop, /* follow_buffer_next */ 1);
-	      ASSERT (!msg);
-	    }
-
-	  if (0)		/* "Dave" version */
-	    {
-	      if (is_eop0)
-		{
-		  to_next[0] = bi_sop;
-		  to_next++;
-		  n_left_to_next--;
-
-		  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-						   to_next, n_left_to_next,
-						   bi_sop, next0);
-		}
-	    }
-	  if (1)		/* "Eliot" version */
-	    {
-	      if (PREDICT_TRUE (next0 == next_index))
-		{
-		  to_next[0] = bi_sop;
-		  to_next += is_eop0;
-		  n_left_to_next -= is_eop0;
-		}
-	      else
-		{
-		  if (next0 != next_index && is_eop0)
-		    vlib_set_next_frame_buffer (vm, node, next0, bi_sop);
-
-		  vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-		  next_index = next0;
-		  vlib_get_next_frame (vm, node, next_index,
-				       to_next, n_left_to_next);
-		}
-	    }
-	  is_sop = is_eop0;
-	}
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-found_hw_owned_descriptor_x1:
-  if (n_descriptors_left > 0)
-    vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-
-  _vec_len (xm->rx_buffers_to_add) = (to_add + 1) - xm->rx_buffers_to_add;
-
-  {
-    u32 n_done = n_descriptors - n_descriptors_left;
-
-    if (n_trace > 0 && n_done > 0)
-      {
-	u32 n = clib_min (n_trace, n_done);
-	ixge_rx_trace (xm, xd, dq,
-		       d_trace_save,
-		       d_trace_buffers,
-		       &dq->descriptors[start_descriptor_index], n);
-	vlib_set_trace_count (vm, node, n_trace - n);
-      }
-    if (d_trace_save)
-      {
-	_vec_len (d_trace_save) = 0;
-	_vec_len (d_trace_buffers) = 0;
-      }
-
-    /* Don't keep a reference to b_last if we don't have to.
-       Otherwise we can over-write a next_buffer pointer after already haven
-       enqueued a packet. */
-    if (is_sop)
-      {
-	b_last->next_buffer = ~0;
-	bi_last = ~0;
-      }
-
-    dq->rx.n_descriptors_done_this_call = n_done;
-    dq->rx.n_descriptors_done_total += n_done;
-    dq->rx.is_start_of_packet = is_sop;
-    dq->rx.saved_start_of_packet_buffer_index = bi_sop;
-    dq->rx.saved_last_buffer_index = bi_last;
-    dq->rx.saved_start_of_packet_next_index = next_index_sop;
-    dq->rx.next_index = next_index;
-    dq->rx.n_bytes += n_bytes;
-
-    return n_packets;
-  }
-}
-
-static uword
-ixge_rx_queue (ixge_main_t * xm,
-	       ixge_device_t * xd,
-	       vlib_node_runtime_t * node, u32 queue_index)
-{
-  ixge_dma_queue_t *dq =
-    vec_elt_at_index (xd->dma_queues[VLIB_RX], queue_index);
-  ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_RX, dq->queue_index);
-  uword n_packets = 0;
-  u32 hw_head_index, sw_head_index;
-
-  /* One time initialization. */
-  if (!dq->rx.node)
-    {
-      dq->rx.node = node;
-      dq->rx.is_start_of_packet = 1;
-      dq->rx.saved_start_of_packet_buffer_index = ~0;
-      dq->rx.saved_last_buffer_index = ~0;
-    }
-
-  dq->rx.next_index = node->cached_next_index;
-
-  dq->rx.n_descriptors_done_total = 0;
-  dq->rx.n_descriptors_done_this_call = 0;
-  dq->rx.n_bytes = 0;
-
-  /* Fetch head from hardware and compare to where we think we are. */
-  hw_head_index = dr->head_index;
-  sw_head_index = dq->head_index;
-
-  if (hw_head_index == sw_head_index)
-    goto done;
-
-  if (hw_head_index < sw_head_index)
-    {
-      u32 n_tried = dq->n_descriptors - sw_head_index;
-      n_packets += ixge_rx_queue_no_wrap (xm, xd, dq, sw_head_index, n_tried);
-      sw_head_index =
-	ixge_ring_add (dq, sw_head_index,
-		       dq->rx.n_descriptors_done_this_call);
-
-      if (dq->rx.n_descriptors_done_this_call != n_tried)
-	goto done;
-    }
-  if (hw_head_index >= sw_head_index)
-    {
-      u32 n_tried = hw_head_index - sw_head_index;
-      n_packets += ixge_rx_queue_no_wrap (xm, xd, dq, sw_head_index, n_tried);
-      sw_head_index =
-	ixge_ring_add (dq, sw_head_index,
-		       dq->rx.n_descriptors_done_this_call);
-    }
-
-done:
-  dq->head_index = sw_head_index;
-  dq->tail_index =
-    ixge_ring_add (dq, dq->tail_index, dq->rx.n_descriptors_done_total);
-
-  /* Give tail back to hardware. */
-  CLIB_MEMORY_BARRIER ();
-
-  dr->tail_index = dq->tail_index;
-
-  vlib_increment_combined_counter (vnet_main.
-				   interface_main.combined_sw_if_counters +
-				   VNET_INTERFACE_COUNTER_RX,
-				   0 /* cpu_index */ ,
-				   xd->vlib_sw_if_index, n_packets,
-				   dq->rx.n_bytes);
-
-  return n_packets;
-}
-
-static void
-ixge_interrupt (ixge_main_t * xm, ixge_device_t * xd, u32 i)
-{
-  vlib_main_t *vm = xm->vlib_main;
-  ixge_regs_t *r = xd->regs;
-
-  if (i != 20)
-    {
-      ELOG_TYPE_DECLARE (e) =
-      {
-	.function = (char *) __FUNCTION__,.format =
-	  "ixge %d, %s",.format_args = "i1t1",.n_enum_strings =
-	  16,.enum_strings =
-	{
-      "flow director",
-	    "rx miss",
-	    "pci exception",
-	    "mailbox",
-	    "link status change",
-	    "linksec key exchange",
-	    "manageability event",
-	    "reserved23",
-	    "sdp0",
-	    "sdp1",
-	    "sdp2",
-	    "sdp3",
-	    "ecc", "descriptor handler error", "tcp timer", "other",},};
-      struct
-      {
-	u8 instance;
-	u8 index;
-      } *ed;
-      ed = ELOG_DATA (&vm->elog_main, e);
-      ed->instance = xd->device_index;
-      ed->index = i - 16;
-    }
-  else
-    {
-      u32 v = r->xge_mac.link_status;
-      uword is_up = (v & (1 << 30)) != 0;
-
-      ELOG_TYPE_DECLARE (e) =
-      {
-      .function = (char *) __FUNCTION__,.format =
-	  "ixge %d, link status change 0x%x",.format_args = "i4i4",};
-      struct
-      {
-	u32 instance, link_status;
-      } *ed;
-      ed = ELOG_DATA (&vm->elog_main, e);
-      ed->instance = xd->device_index;
-      ed->link_status = v;
-      xd->link_status_at_last_link_change = v;
-
-      vlib_process_signal_event (vm, ixge_process_node.index,
-				 EVENT_SET_FLAGS,
-				 ((is_up << 31) | xd->vlib_hw_if_index));
-    }
-}
-
-always_inline u32
-clean_block (u32 * b, u32 * t, u32 n_left)
-{
-  u32 *t0 = t;
-
-  while (n_left >= 4)
-    {
-      u32 bi0, bi1, bi2, bi3;
-
-      t[0] = bi0 = b[0];
-      b[0] = 0;
-      t += bi0 != 0;
-
-      t[0] = bi1 = b[1];
-      b[1] = 0;
-      t += bi1 != 0;
-
-      t[0] = bi2 = b[2];
-      b[2] = 0;
-      t += bi2 != 0;
-
-      t[0] = bi3 = b[3];
-      b[3] = 0;
-      t += bi3 != 0;
-
-      b += 4;
-      n_left -= 4;
-    }
-
-  while (n_left > 0)
-    {
-      u32 bi0;
-
-      t[0] = bi0 = b[0];
-      b[0] = 0;
-      t += bi0 != 0;
-      b += 1;
-      n_left -= 1;
-    }
-
-  return t - t0;
-}
-
-static void
-ixge_tx_queue (ixge_main_t * xm, ixge_device_t * xd, u32 queue_index)
-{
-  vlib_main_t *vm = xm->vlib_main;
-  ixge_dma_queue_t *dq =
-    vec_elt_at_index (xd->dma_queues[VLIB_TX], queue_index);
-  u32 n_clean, *b, *t, *t0;
-  i32 n_hw_owned_descriptors;
-  i32 first_to_clean, last_to_clean;
-  u64 hwbp_race = 0;
-
-  /* Handle case where head write back pointer update
-   * arrives after the interrupt during high PCI bus loads.
-   */
-  while ((dq->head_index == dq->tx.head_index_write_back[0]) &&
-	 dq->tx.n_buffers_on_ring && (dq->head_index != dq->tail_index))
-    {
-      hwbp_race++;
-      if (IXGE_HWBP_RACE_ELOG && (hwbp_race == 1))
-	{
-	  ELOG_TYPE_DECLARE (e) =
-	  {
-	  .function = (char *) __FUNCTION__,.format =
-	      "ixge %d tx head index race: head %4d, tail %4d, buffs %4d",.format_args
-	      = "i4i4i4i4",};
-	  struct
-	  {
-	    u32 instance, head_index, tail_index, n_buffers_on_ring;
-	  } *ed;
-	  ed = ELOG_DATA (&vm->elog_main, e);
-	  ed->instance = xd->device_index;
-	  ed->head_index = dq->head_index;
-	  ed->tail_index = dq->tail_index;
-	  ed->n_buffers_on_ring = dq->tx.n_buffers_on_ring;
-	}
-    }
-
-  dq->head_index = dq->tx.head_index_write_back[0];
-  n_hw_owned_descriptors = ixge_ring_sub (dq, dq->head_index, dq->tail_index);
-  ASSERT (dq->tx.n_buffers_on_ring >= n_hw_owned_descriptors);
-  n_clean = dq->tx.n_buffers_on_ring - n_hw_owned_descriptors;
-
-  if (IXGE_HWBP_RACE_ELOG && hwbp_race)
-    {
-      ELOG_TYPE_DECLARE (e) =
-      {
-      .function = (char *) __FUNCTION__,.format =
-	  "ixge %d tx head index race: head %4d, hw_owned %4d, n_clean %4d, retries %d",.format_args
-	  = "i4i4i4i4i4",};
-      struct
-      {
-	u32 instance, head_index, n_hw_owned_descriptors, n_clean, retries;
-      } *ed;
-      ed = ELOG_DATA (&vm->elog_main, e);
-      ed->instance = xd->device_index;
-      ed->head_index = dq->head_index;
-      ed->n_hw_owned_descriptors = n_hw_owned_descriptors;
-      ed->n_clean = n_clean;
-      ed->retries = hwbp_race;
-    }
-
-  /*
-   * This function used to wait until hardware owned zero descriptors.
-   * At high PPS rates, that doesn't happen until the TX ring is
-   * completely full of descriptors which need to be cleaned up.
-   * That, in turn, causes TX ring-full drops and/or long RX service
-   * interruptions.
-   */
-  if (n_clean == 0)
-    return;
-
-  /* Clean the n_clean descriptors prior to the reported hardware head */
-  last_to_clean = dq->head_index - 1;
-  last_to_clean = (last_to_clean < 0) ? last_to_clean + dq->n_descriptors :
-    last_to_clean;
-
-  first_to_clean = (last_to_clean) - (n_clean - 1);
-  first_to_clean = (first_to_clean < 0) ? first_to_clean + dq->n_descriptors :
-    first_to_clean;
-
-  vec_resize (xm->tx_buffers_pending_free, dq->n_descriptors - 1);
-  t0 = t = xm->tx_buffers_pending_free;
-  b = dq->descriptor_buffer_indices + first_to_clean;
-
-  /* Wrap case: clean from first to end, then start to last */
-  if (first_to_clean > last_to_clean)
-    {
-      t += clean_block (b, t, (dq->n_descriptors - 1) - first_to_clean);
-      first_to_clean = 0;
-      b = dq->descriptor_buffer_indices;
-    }
-
-  /* Typical case: clean from first to last */
-  if (first_to_clean <= last_to_clean)
-    t += clean_block (b, t, (last_to_clean - first_to_clean) + 1);
-
-  if (t > t0)
-    {
-      u32 n = t - t0;
-      vlib_buffer_free_no_next (vm, t0, n);
-      ASSERT (dq->tx.n_buffers_on_ring >= n);
-      dq->tx.n_buffers_on_ring -= n;
-      _vec_len (xm->tx_buffers_pending_free) = 0;
-    }
-}
-
-/* RX queue interrupts 0 thru 7; TX 8 thru 15. */
-always_inline uword
-ixge_interrupt_is_rx_queue (uword i)
-{
-  return i < 8;
-}
-
-always_inline uword
-ixge_interrupt_is_tx_queue (uword i)
-{
-  return i >= 8 && i < 16;
-}
-
-always_inline uword
-ixge_tx_queue_to_interrupt (uword i)
-{
-  return 8 + i;
-}
-
-always_inline uword
-ixge_rx_queue_to_interrupt (uword i)
-{
-  return 0 + i;
-}
-
-always_inline uword
-ixge_interrupt_rx_queue (uword i)
-{
-  ASSERT (ixge_interrupt_is_rx_queue (i));
-  return i - 0;
-}
-
-always_inline uword
-ixge_interrupt_tx_queue (uword i)
-{
-  ASSERT (ixge_interrupt_is_tx_queue (i));
-  return i - 8;
-}
-
-static uword
-ixge_device_input (ixge_main_t * xm,
-		   ixge_device_t * xd, vlib_node_runtime_t * node)
-{
-  ixge_regs_t *r = xd->regs;
-  u32 i, s;
-  uword n_rx_packets = 0;
-
-  s = r->interrupt.status_write_1_to_set;
-  if (s)
-    r->interrupt.status_write_1_to_clear = s;
-
-  /* *INDENT-OFF* */
-  foreach_set_bit (i, s, ({
-    if (ixge_interrupt_is_rx_queue (i))
-      n_rx_packets += ixge_rx_queue (xm, xd, node, ixge_interrupt_rx_queue (i));
-
-    else if (ixge_interrupt_is_tx_queue (i))
-      ixge_tx_queue (xm, xd, ixge_interrupt_tx_queue (i));
-
-    else
-      ixge_interrupt (xm, xd, i);
-  }));
-  /* *INDENT-ON* */
-
-  return n_rx_packets;
-}
-
-static uword
-ixge_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * f)
-{
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd;
-  uword n_rx_packets = 0;
-
-  if (node->state == VLIB_NODE_STATE_INTERRUPT)
-    {
-      uword i;
-
-      /* Loop over devices with interrupts. */
-      /* *INDENT-OFF* */
-      foreach_set_bit (i, node->runtime_data[0], ({
-	xd = vec_elt_at_index (xm->devices, i);
-	n_rx_packets += ixge_device_input (xm, xd, node);
-
-	/* Re-enable interrupts since we're going to stay in interrupt mode. */
-	if (! (node->flags & VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE))
-	  xd->regs->interrupt.enable_write_1_to_set = ~0;
-      }));
-      /* *INDENT-ON* */
-
-      /* Clear mask of devices with pending interrupts. */
-      node->runtime_data[0] = 0;
-    }
-  else
-    {
-      /* Poll all devices for input/interrupts. */
-      vec_foreach (xd, xm->devices)
-      {
-	n_rx_packets += ixge_device_input (xm, xd, node);
-
-	/* Re-enable interrupts when switching out of polling mode. */
-	if (node->flags &
-	    VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE)
-	  xd->regs->interrupt.enable_write_1_to_set = ~0;
-      }
-    }
-
-  return n_rx_packets;
-}
-
-static char *ixge_error_strings[] = {
-#define _(n,s) s,
-  foreach_ixge_error
-#undef _
-};
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ixge_input_node, static) = {
-  .function = ixge_input,
-  .type = VLIB_NODE_TYPE_INPUT,
-  .name = "ixge-input",
-
-  /* Will be enabled if/when hardware is detected. */
-  .state = VLIB_NODE_STATE_DISABLED,
-
-  .format_buffer = format_ethernet_header_with_length,
-  .format_trace = format_ixge_rx_dma_trace,
-
-  .n_errors = IXGE_N_ERROR,
-  .error_strings = ixge_error_strings,
-
-  .n_next_nodes = IXGE_RX_N_NEXT,
-  .next_nodes = {
-    [IXGE_RX_NEXT_DROP] = "error-drop",
-    [IXGE_RX_NEXT_ETHERNET_INPUT] = "ethernet-input",
-    [IXGE_RX_NEXT_IP4_INPUT] = "ip4-input",
-    [IXGE_RX_NEXT_IP6_INPUT] = "ip6-input",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH_CLONE (ixge_input)
-CLIB_MULTIARCH_SELECT_FN (ixge_input)
-/* *INDENT-ON* */
-
-static u8 *
-format_ixge_device_name (u8 * s, va_list * args)
-{
-  u32 i = va_arg (*args, u32);
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, i);
-  return format (s, "TenGigabitEthernet%U",
-		 format_vlib_pci_handle, &xd->pci_device.bus_address);
-}
-
-#define IXGE_COUNTER_IS_64_BIT (1 << 0)
-#define IXGE_COUNTER_NOT_CLEAR_ON_READ (1 << 1)
-
-static u8 ixge_counter_flags[] = {
-#define _(a,f) 0,
-#define _64(a,f) IXGE_COUNTER_IS_64_BIT,
-  foreach_ixge_counter
-#undef _
-#undef _64
-};
-
-static void
-ixge_update_counters (ixge_device_t * xd)
-{
-  /* Byte offset for counter registers. */
-  static u32 reg_offsets[] = {
-#define _(a,f) (a) / sizeof (u32),
-#define _64(a,f) _(a,f)
-    foreach_ixge_counter
-#undef _
-#undef _64
-  };
-  volatile u32 *r = (volatile u32 *) xd->regs;
-  int i;
-
-  for (i = 0; i < ARRAY_LEN (xd->counters); i++)
-    {
-      u32 o = reg_offsets[i];
-      xd->counters[i] += r[o];
-      if (ixge_counter_flags[i] & IXGE_COUNTER_NOT_CLEAR_ON_READ)
-	r[o] = 0;
-      if (ixge_counter_flags[i] & IXGE_COUNTER_IS_64_BIT)
-	xd->counters[i] += (u64) r[o + 1] << (u64) 32;
-    }
-}
-
-static u8 *
-format_ixge_device_id (u8 * s, va_list * args)
-{
-  u32 device_id = va_arg (*args, u32);
-  char *t = 0;
-  switch (device_id)
-    {
-#define _(f,n) case n: t = #f; break;
-      foreach_ixge_pci_device_id;
-#undef _
-    default:
-      t = 0;
-      break;
-    }
-  if (t == 0)
-    s = format (s, "unknown 0x%x", device_id);
-  else
-    s = format (s, "%s", t);
-  return s;
-}
-
-static u8 *
-format_ixge_link_status (u8 * s, va_list * args)
-{
-  ixge_device_t *xd = va_arg (*args, ixge_device_t *);
-  u32 v = xd->link_status_at_last_link_change;
-
-  s = format (s, "%s", (v & (1 << 30)) ? "up" : "down");
-
-  {
-    char *modes[] = {
-      "1g", "10g parallel", "10g serial", "autoneg",
-    };
-    char *speeds[] = {
-      "unknown", "100m", "1g", "10g",
-    };
-    s = format (s, ", mode %s, speed %s",
-		modes[(v >> 26) & 3], speeds[(v >> 28) & 3]);
-  }
-
-  return s;
-}
-
-static u8 *
-format_ixge_device (u8 * s, va_list * args)
-{
-  u32 dev_instance = va_arg (*args, u32);
-  CLIB_UNUSED (int verbose) = va_arg (*args, int);
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, dev_instance);
-  ixge_phy_t *phy = xd->phys + xd->phy_index;
-  uword indent = format_get_indent (s);
-
-  ixge_update_counters (xd);
-  xd->link_status_at_last_link_change = xd->regs->xge_mac.link_status;
-
-  s = format (s, "Intel 8259X: id %U\n%Ulink %U",
-	      format_ixge_device_id, xd->device_id,
-	      format_white_space, indent + 2, format_ixge_link_status, xd);
-
-  {
-
-    s = format (s, "\n%UPCIe %U", format_white_space, indent + 2,
-		format_vlib_pci_link_speed, &xd->pci_device);
-  }
-
-  s = format (s, "\n%U", format_white_space, indent + 2);
-  if (phy->mdio_address != ~0)
-    s = format (s, "PHY address %d, id 0x%x", phy->mdio_address, phy->id);
-  else if (xd->sfp_eeprom.id == SFP_ID_sfp)
-    s = format (s, "SFP %U", format_sfp_eeprom, &xd->sfp_eeprom);
-  else
-    s = format (s, "PHY not found");
-
-  /* FIXME */
-  {
-    ixge_dma_queue_t *dq = vec_elt_at_index (xd->dma_queues[VLIB_RX], 0);
-    ixge_dma_regs_t *dr = get_dma_regs (xd, VLIB_RX, 0);
-    u32 hw_head_index = dr->head_index;
-    u32 sw_head_index = dq->head_index;
-    u32 nitems;
-
-    nitems = ixge_ring_sub (dq, hw_head_index, sw_head_index);
-    s = format (s, "\n%U%d unprocessed, %d total buffers on rx queue 0 ring",
-		format_white_space, indent + 2, nitems, dq->n_descriptors);
-
-    s = format (s, "\n%U%d buffers in driver rx cache",
-		format_white_space, indent + 2,
-		vec_len (xm->rx_buffers_to_add));
-
-    s = format (s, "\n%U%d buffers on tx queue 0 ring",
-		format_white_space, indent + 2,
-		xd->dma_queues[VLIB_TX][0].tx.n_buffers_on_ring);
-  }
-  {
-    u32 i;
-    u64 v;
-    static char *names[] = {
-#define _(a,f) #f,
-#define _64(a,f) _(a,f)
-      foreach_ixge_counter
-#undef _
-#undef _64
-    };
-
-    for (i = 0; i < ARRAY_LEN (names); i++)
-      {
-	v = xd->counters[i] - xd->counters_last_clear[i];
-	if (v != 0)
-	  s = format (s, "\n%U%-40U%16Ld",
-		      format_white_space, indent + 2,
-		      format_c_identifier, names[i], v);
-      }
-  }
-
-  return s;
-}
-
-static void
-ixge_clear_hw_interface_counters (u32 instance)
-{
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, instance);
-  ixge_update_counters (xd);
-  memcpy (xd->counters_last_clear, xd->counters, sizeof (xd->counters));
-}
-
-/*
- * Dynamically redirect all pkts from a specific interface
- * to the specified node
- */
-static void
-ixge_set_interface_next_node (vnet_main_t * vnm, u32 hw_if_index,
-			      u32 node_index)
-{
-  ixge_main_t *xm = &ixge_main;
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  ixge_device_t *xd = vec_elt_at_index (xm->devices, hw->dev_instance);
-
-  /* Shut off redirection */
-  if (node_index == ~0)
-    {
-      xd->per_interface_next_index = node_index;
-      return;
-    }
-
-  xd->per_interface_next_index =
-    vlib_node_add_next (xm->vlib_main, ixge_input_node.index, node_index);
-}
-
-
-/* *INDENT-OFF* */
-VNET_DEVICE_CLASS (ixge_device_class) = {
-  .name = "ixge",
-  .tx_function = ixge_interface_tx,
-  .format_device_name = format_ixge_device_name,
-  .format_device = format_ixge_device,
-  .format_tx_trace = format_ixge_tx_dma_trace,
-  .clear_counters = ixge_clear_hw_interface_counters,
-  .admin_up_down_function = ixge_interface_admin_up_down,
-  .rx_redirect_to_node = ixge_set_interface_next_node,
-  .flatten_output_chains = 1,
-};
-/* *INDENT-ON* */
-
-#define IXGE_N_BYTES_IN_RX_BUFFER  (2048)	// DAW-HACK: Set Rx buffer size so all packets < ETH_MTU_SIZE fit in the buffer (i.e. sop & eop for all descriptors).
-
-static clib_error_t *
-ixge_dma_init (ixge_device_t * xd, vlib_rx_or_tx_t rt, u32 queue_index)
-{
-  ixge_main_t *xm = &ixge_main;
-  vlib_main_t *vm = xm->vlib_main;
-  ixge_dma_queue_t *dq;
-  clib_error_t *error = 0;
-
-  vec_validate (xd->dma_queues[rt], queue_index);
-  dq = vec_elt_at_index (xd->dma_queues[rt], queue_index);
-
-  if (!xm->n_descriptors_per_cache_line)
-    xm->n_descriptors_per_cache_line =
-      CLIB_CACHE_LINE_BYTES / sizeof (dq->descriptors[0]);
-
-  if (!xm->n_bytes_in_rx_buffer)
-    xm->n_bytes_in_rx_buffer = IXGE_N_BYTES_IN_RX_BUFFER;
-  xm->n_bytes_in_rx_buffer = round_pow2 (xm->n_bytes_in_rx_buffer, 1024);
-  if (!xm->vlib_buffer_free_list_index)
-    {
-      xm->vlib_buffer_free_list_index =
-	vlib_buffer_get_or_create_free_list (vm, xm->n_bytes_in_rx_buffer,
-					     "ixge rx");
-      ASSERT (xm->vlib_buffer_free_list_index != 0);
-    }
-
-  if (!xm->n_descriptors[rt])
-    xm->n_descriptors[rt] = 4 * VLIB_FRAME_SIZE;
-
-  dq->queue_index = queue_index;
-  dq->n_descriptors =
-    round_pow2 (xm->n_descriptors[rt], xm->n_descriptors_per_cache_line);
-  dq->head_index = dq->tail_index = 0;
-
-  dq->descriptors = vlib_physmem_alloc_aligned (vm, &error,
-						dq->n_descriptors *
-						sizeof (dq->descriptors[0]),
-						128 /* per chip spec */ );
-  if (error)
-    return error;
-
-  memset (dq->descriptors, 0,
-	  dq->n_descriptors * sizeof (dq->descriptors[0]));
-  vec_resize (dq->descriptor_buffer_indices, dq->n_descriptors);
-
-  if (rt == VLIB_RX)
-    {
-      u32 n_alloc, i;
-
-      n_alloc = vlib_buffer_alloc_from_free_list
-	(vm, dq->descriptor_buffer_indices,
-	 vec_len (dq->descriptor_buffer_indices),
-	 xm->vlib_buffer_free_list_index);
-      ASSERT (n_alloc == vec_len (dq->descriptor_buffer_indices));
-      for (i = 0; i < n_alloc; i++)
-	{
-	  vlib_buffer_t *b =
-	    vlib_get_buffer (vm, dq->descriptor_buffer_indices[i]);
-	  dq->descriptors[i].rx_to_hw.tail_address =
-	    vlib_physmem_virtual_to_physical (vm, b->data);
-	}
-    }
-  else
-    {
-      u32 i;
-
-      dq->tx.head_index_write_back =
-	vlib_physmem_alloc (vm, &error, CLIB_CACHE_LINE_BYTES);
-
-      for (i = 0; i < dq->n_descriptors; i++)
-	dq->descriptors[i].tx = xm->tx_descriptor_template;
-
-      vec_validate (xm->tx_buffers_pending_free, dq->n_descriptors - 1);
-    }
-
-  {
-    ixge_dma_regs_t *dr = get_dma_regs (xd, rt, queue_index);
-    u64 a;
-
-    a = vlib_physmem_virtual_to_physical (vm, dq->descriptors);
-    dr->descriptor_address[0] = a & 0xFFFFFFFF;
-    dr->descriptor_address[1] = a >> (u64) 32;
-    dr->n_descriptor_bytes = dq->n_descriptors * sizeof (dq->descriptors[0]);
-    dq->head_index = dq->tail_index = 0;
-
-    if (rt == VLIB_RX)
-      {
-	ASSERT ((xm->n_bytes_in_rx_buffer / 1024) < 32);
-	dr->rx_split_control =
-	  ( /* buffer size */ ((xm->n_bytes_in_rx_buffer / 1024) << 0)
-	   | (			/* lo free descriptor threshold (units of 64 descriptors) */
-	       (1 << 22)) | (	/* descriptor type: advanced one buffer */
-			      (1 << 25)) | (	/* drop if no descriptors available */
-					     (1 << 28)));
-
-	/* Give hardware all but last 16 cache lines' worth of descriptors. */
-	dq->tail_index = dq->n_descriptors -
-	  16 * xm->n_descriptors_per_cache_line;
-      }
-    else
-      {
-	/* Make sure its initialized before hardware can get to it. */
-	dq->tx.head_index_write_back[0] = dq->head_index;
-
-	a =
-	  vlib_physmem_virtual_to_physical (vm, dq->tx.head_index_write_back);
-	dr->tx.head_index_write_back_address[0] = /* enable bit */ 1 | a;
-	dr->tx.head_index_write_back_address[1] = (u64) a >> (u64) 32;
-      }
-
-    /* DMA on 82599 does not work with [13] rx data write relaxed ordering
-       and [12] undocumented set. */
-    if (rt == VLIB_RX)
-      dr->dca_control &= ~((1 << 13) | (1 << 12));
-
-    CLIB_MEMORY_BARRIER ();
-
-    if (rt == VLIB_TX)
-      {
-	xd->regs->tx_dma_control |= (1 << 0);
-	dr->control |= ((32 << 0)	/* prefetch threshold */
-			| (64 << 8)	/* host threshold */
-			| (0 << 16) /* writeback threshold */ );
-      }
-
-    /* Enable this queue and wait for hardware to initialize
-       before adding to tail. */
-    if (rt == VLIB_TX)
-      {
-	dr->control |= 1 << 25;
-	while (!(dr->control & (1 << 25)))
-	  ;
-      }
-
-    /* Set head/tail indices and enable DMA. */
-    dr->head_index = dq->head_index;
-    dr->tail_index = dq->tail_index;
-  }
-
-  return error;
-}
-
-static u32
-ixge_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hw, u32 flags)
-{
-  ixge_device_t *xd;
-  ixge_regs_t *r;
-  u32 old;
-  ixge_main_t *xm = &ixge_main;
-
-  xd = vec_elt_at_index (xm->devices, hw->dev_instance);
-  r = xd->regs;
-
-  old = r->filter_control;
-
-  if (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL)
-    r->filter_control = old | (1 << 9) /* unicast promiscuous */ ;
-  else
-    r->filter_control = old & ~(1 << 9);
-
-  return old;
-}
-
-static void
-ixge_device_init (ixge_main_t * xm)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ixge_device_t *xd;
-
-  /* Reset chip(s). */
-  vec_foreach (xd, xm->devices)
-  {
-    ixge_regs_t *r = xd->regs;
-    const u32 reset_bit = (1 << 26) | (1 << 3);
-
-    r->control |= reset_bit;
-
-    /* No need to suspend.  Timed to take ~1e-6 secs */
-    while (r->control & reset_bit)
-      ;
-
-    /* Software loaded. */
-    r->extended_control |= (1 << 28);
-
-    ixge_phy_init (xd);
-
-    /* Register ethernet interface. */
-    {
-      u8 addr8[6];
-      u32 i, addr32[2];
-      clib_error_t *error;
-
-      addr32[0] = r->rx_ethernet_address0[0][0];
-      addr32[1] = r->rx_ethernet_address0[0][1];
-      for (i = 0; i < 6; i++)
-	addr8[i] = addr32[i / 4] >> ((i % 4) * 8);
-
-      error = ethernet_register_interface
-	(vnm, ixge_device_class.index, xd->device_index,
-	 /* ethernet address */ addr8,
-	 &xd->vlib_hw_if_index, ixge_flag_change);
-      if (error)
-	clib_error_report (error);
-    }
-
-    {
-      vnet_sw_interface_t *sw =
-	vnet_get_hw_sw_interface (vnm, xd->vlib_hw_if_index);
-      xd->vlib_sw_if_index = sw->sw_if_index;
-    }
-
-    ixge_dma_init (xd, VLIB_RX, /* queue_index */ 0);
-
-    xm->n_descriptors[VLIB_TX] = 20 * VLIB_FRAME_SIZE;
-
-    ixge_dma_init (xd, VLIB_TX, /* queue_index */ 0);
-
-    /* RX/TX queue 0 gets mapped to interrupt bits 0 & 8. */
-    r->interrupt.queue_mapping[0] = (( /* valid bit */ (1 << 7) |
-				      ixge_rx_queue_to_interrupt (0)) << 0);
-
-    r->interrupt.queue_mapping[0] |= (( /* valid bit */ (1 << 7) |
-				       ixge_tx_queue_to_interrupt (0)) << 8);
-
-    /* No use in getting too many interrupts.
-       Limit them to one every 3/4 ring size at line rate
-       min sized packets.
-       No need for this since kernel/vlib main loop provides adequate interrupt
-       limiting scheme. */
-    if (0)
-      {
-	f64 line_rate_max_pps =
-	  10e9 / (8 * (64 + /* interframe padding */ 20));
-	ixge_throttle_queue_interrupt (r, 0,
-				       .75 * xm->n_descriptors[VLIB_RX] /
-				       line_rate_max_pps);
-      }
-
-    /* Accept all multicast and broadcast packets. Should really add them
-       to the dst_ethernet_address register array. */
-    r->filter_control |= (1 << 10) | (1 << 8);
-
-    /* Enable frames up to size in mac frame size register. */
-    r->xge_mac.control |= 1 << 2;
-    r->xge_mac.rx_max_frame_size = (9216 + 14) << 16;
-
-    /* Enable all interrupts. */
-    if (!IXGE_ALWAYS_POLL)
-      r->interrupt.enable_write_1_to_set = ~0;
-  }
-}
-
-static uword
-ixge_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  ixge_main_t *xm = &ixge_main;
-  ixge_device_t *xd;
-  uword event_type, *event_data = 0;
-  f64 timeout, link_debounce_deadline;
-
-  ixge_device_init (xm);
-
-  /* Clear all counters. */
-  vec_foreach (xd, xm->devices)
-  {
-    ixge_update_counters (xd);
-    memset (xd->counters, 0, sizeof (xd->counters));
-  }
-
-  timeout = 30.0;
-  link_debounce_deadline = 1e70;
-
-  while (1)
-    {
-      /* 36 bit stat counters could overflow in ~50 secs.
-         We poll every 30 secs to be conservative. */
-      vlib_process_wait_for_event_or_clock (vm, timeout);
-
-      event_type = vlib_process_get_events (vm, &event_data);
-
-      switch (event_type)
-	{
-	case EVENT_SET_FLAGS:
-	  /* 1 ms */
-	  link_debounce_deadline = vlib_time_now (vm) + 1e-3;
-	  timeout = 1e-3;
-	  break;
-
-	case ~0:
-	  /* No events found: timer expired. */
-	  if (vlib_time_now (vm) > link_debounce_deadline)
-	    {
-	      vec_foreach (xd, xm->devices)
-	      {
-		ixge_regs_t *r = xd->regs;
-		u32 v = r->xge_mac.link_status;
-		uword is_up = (v & (1 << 30)) != 0;
-
-		vnet_hw_interface_set_flags
-		  (vnm, xd->vlib_hw_if_index,
-		   is_up ? VNET_HW_INTERFACE_FLAG_LINK_UP : 0);
-	      }
-	      link_debounce_deadline = 1e70;
-	      timeout = 30.0;
-	    }
-	  break;
-
-	default:
-	  ASSERT (0);
-	}
-
-      if (event_data)
-	_vec_len (event_data) = 0;
-
-      /* Query stats every 30 secs. */
-      {
-	f64 now = vlib_time_now (vm);
-	if (now - xm->time_last_stats_update > 30)
-	  {
-	    xm->time_last_stats_update = now;
-	    vec_foreach (xd, xm->devices) ixge_update_counters (xd);
-	  }
-      }
-    }
-
-  return 0;
-}
-
-static vlib_node_registration_t ixge_process_node = {
-  .function = ixge_process,
-  .type = VLIB_NODE_TYPE_PROCESS,
-  .name = "ixge-process",
-};
-
-clib_error_t *
-ixge_init (vlib_main_t * vm)
-{
-  ixge_main_t *xm = &ixge_main;
-  clib_error_t *error;
-
-  xm->vlib_main = vm;
-  memset (&xm->tx_descriptor_template, 0,
-	  sizeof (xm->tx_descriptor_template));
-  memset (&xm->tx_descriptor_template_mask, 0,
-	  sizeof (xm->tx_descriptor_template_mask));
-  xm->tx_descriptor_template.status0 =
-    (IXGE_TX_DESCRIPTOR_STATUS0_ADVANCED |
-     IXGE_TX_DESCRIPTOR_STATUS0_IS_ADVANCED |
-     IXGE_TX_DESCRIPTOR_STATUS0_INSERT_FCS);
-  xm->tx_descriptor_template_mask.status0 = 0xffff;
-  xm->tx_descriptor_template_mask.status1 = 0x00003fff;
-
-  xm->tx_descriptor_template_mask.status0 &=
-    ~(IXGE_TX_DESCRIPTOR_STATUS0_IS_END_OF_PACKET
-      | IXGE_TX_DESCRIPTOR_STATUS0_REPORT_STATUS);
-  xm->tx_descriptor_template_mask.status1 &=
-    ~(IXGE_TX_DESCRIPTOR_STATUS1_DONE);
-
-  error = vlib_call_init_function (vm, pci_bus_init);
-
-  return error;
-}
-
-VLIB_INIT_FUNCTION (ixge_init);
-
-
-static void
-ixge_pci_intr_handler (vlib_pci_device_t * dev)
-{
-  ixge_main_t *xm = &ixge_main;
-  vlib_main_t *vm = xm->vlib_main;
-
-  vlib_node_set_interrupt_pending (vm, ixge_input_node.index);
-
-  /* Let node know which device is interrupting. */
-  {
-    vlib_node_runtime_t *rt =
-      vlib_node_get_runtime (vm, ixge_input_node.index);
-    rt->runtime_data[0] |= 1 << dev->private_data;
-  }
-}
-
-static clib_error_t *
-ixge_pci_init (vlib_main_t * vm, vlib_pci_device_t * dev)
-{
-  ixge_main_t *xm = &ixge_main;
-  clib_error_t *error;
-  void *r;
-  ixge_device_t *xd;
-
-  /* Device found: make sure we have dma memory. */
-  if (unix_physmem_is_fake (vm))
-    return clib_error_return (0, "no physical memory available");
-
-  error = vlib_pci_map_resource (dev, 0, &r);
-  if (error)
-    return error;
-
-  vec_add2 (xm->devices, xd, 1);
-
-  if (vec_len (xm->devices) == 1)
-    {
-      ixge_input_node.function = ixge_input_multiarch_select ();
-    }
-
-  xd->pci_device = dev[0];
-  xd->device_id = xd->pci_device.config0.header.device_id;
-  xd->regs = r;
-  xd->device_index = xd - xm->devices;
-  xd->pci_function = dev->bus_address.function;
-  xd->per_interface_next_index = ~0;
-
-
-  /* Chip found so enable node. */
-  {
-    vlib_node_set_state (vm, ixge_input_node.index,
-			 (IXGE_ALWAYS_POLL
-			  ? VLIB_NODE_STATE_POLLING
-			  : VLIB_NODE_STATE_INTERRUPT));
-
-    dev->private_data = xd->device_index;
-  }
-
-  if (vec_len (xm->devices) == 1)
-    {
-      vlib_register_node (vm, &ixge_process_node);
-      xm->process_node_index = ixge_process_node.index;
-    }
-
-  error = vlib_pci_bus_master_enable (dev);
-
-  if (error)
-    return error;
-
-  return vlib_pci_intr_enable (dev);
-}
-
-/* *INDENT-OFF* */
-PCI_REGISTER_DEVICE (ixge_pci_device_registration,static) = {
-  .init_function = ixge_pci_init,
-  .interrupt_handler = ixge_pci_intr_handler,
-  .supported_devices = {
-#define _(t,i) { .vendor_id = PCI_VENDOR_ID_INTEL, .device_id = i, },
-    foreach_ixge_pci_device_id
-#undef _
-    { 0 },
-  },
-};
-/* *INDENT-ON* */
-
-void
-ixge_set_next_node (ixge_rx_next_t next, char *name)
-{
-  vlib_node_registration_t *r = &ixge_input_node;
-
-  switch (next)
-    {
-    case IXGE_RX_NEXT_IP4_INPUT:
-    case IXGE_RX_NEXT_IP6_INPUT:
-    case IXGE_RX_NEXT_ETHERNET_INPUT:
-      r->next_nodes[next] = name;
-      break;
-
-    default:
-      clib_warning ("%s: illegal next %d\n", __FUNCTION__, next);
-      break;
-    }
-}
-#endif
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/vnet/devices/nic/ixge.h b/src/vnet/devices/nic/ixge.h
deleted file mode 100644
index a8e652dc..00000000
--- a/src/vnet/devices/nic/ixge.h
+++ /dev/null
@@ -1,1293 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_ixge_h
-#define included_ixge_h
-
-#include <vnet/vnet.h>
-#include <vlib/pci/pci.h>
-#include <vlib/i2c.h>
-#include <vnet/devices/nic/sfp.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-
-typedef volatile struct
-{
-  /* [31:7] 128 byte aligned. */
-  u32 descriptor_address[2];
-  u32 n_descriptor_bytes;
-
-  /* [5] rx/tx descriptor dca enable
-     [6] rx packet head dca enable
-     [7] rx packet tail dca enable
-     [9] rx/tx descriptor relaxed order
-     [11] rx/tx descriptor write back relaxed order
-     [13] rx/tx data write/read relaxed order
-     [15] rx head data write relaxed order
-     [31:24] apic id for cpu's cache. */
-  u32 dca_control;
-
-  u32 head_index;
-
-  /* [4:0] tail buffer size (in 1k byte units)
-     [13:8] head buffer size (in 64 byte units)
-     [24:22] lo free descriptors threshold (units of 64 descriptors)
-     [27:25] descriptor type 0 = legacy, 1 = advanced one buffer (e.g. tail),
-     2 = advanced header splitting (head + tail), 5 = advanced header
-     splitting (head only).
-     [28] drop if no descriptors available. */
-  u32 rx_split_control;
-
-  u32 tail_index;
-    CLIB_PAD_FROM_TO (0x1c, 0x28);
-
-  /* [7:0] rx/tx prefetch threshold
-     [15:8] rx/tx host threshold
-     [24:16] rx/tx write back threshold
-     [25] rx/tx enable
-     [26] tx descriptor writeback flush
-     [30] rx strip vlan enable */
-  u32 control;
-
-  u32 rx_coallesce_control;
-
-  union
-  {
-    struct
-    {
-      /* packets bytes lo hi */
-      u32 stats[3];
-
-      u32 unused;
-    } rx;
-
-    struct
-    {
-      u32 unused[2];
-
-      /* [0] enables head write back. */
-      u32 head_index_write_back_address[2];
-    } tx;
-  };
-} ixge_dma_regs_t;
-
-/* Only advanced descriptors are supported. */
-typedef struct
-{
-  u64 tail_address;
-  u64 head_address;
-} ixge_rx_to_hw_descriptor_t;
-
-typedef struct
-{
-  u32 status[3];
-  u16 n_packet_bytes_this_descriptor;
-  u16 vlan_tag;
-} ixge_rx_from_hw_descriptor_t;
-
-#define IXGE_RX_DESCRIPTOR_STATUS0_IS_LAYER2 (1 << (4 + 11))
-/* Valid if not layer2. */
-#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4 (1 << (4 + 0))
-#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP4_EXT (1 << (4 + 1))
-#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6 (1 << (4 + 2))
-#define IXGE_RX_DESCRIPTOR_STATUS0_IS_IP6_EXT (1 << (4 + 3))
-#define IXGE_RX_DESCRIPTOR_STATUS0_IS_TCP (1 << (4 + 4))
-#define IXGE_RX_DESCRIPTOR_STATUS0_IS_UDP (1 << (4 + 5))
-#define IXGE_RX_DESCRIPTOR_STATUS0_L3_OFFSET(s) (((s) >> 21) & 0x3ff)
-
-#define IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE (1 << (0 + 0))
-#define IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET (1 << (0 + 1))
-#define IXGE_RX_DESCRIPTOR_STATUS2_IS_VLAN (1 << (0 + 3))
-#define IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED (1 << (0 + 4))
-#define IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED (1 << (0 + 5))
-#define IXGE_RX_DESCRIPTOR_STATUS2_IS_IP4_CHECKSUMMED (1 << (0 + 6))
-#define IXGE_RX_DESCRIPTOR_STATUS2_NOT_UNICAST (1 << (0 + 7))
-#define IXGE_RX_DESCRIPTOR_STATUS2_IS_DOUBLE_VLAN (1 << (0 + 9))
-#define IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR (1 << (0 + 10))
-#define IXGE_RX_DESCRIPTOR_STATUS2_ETHERNET_ERROR (1 << (20 + 9))
-#define IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR (1 << (20 + 10))
-#define IXGE_RX_DESCRIPTOR_STATUS2_IP4_CHECKSUM_ERROR (1 << (20 + 11))
-
-/* For layer2 packets stats0 bottom 3 bits give ether type index from filter. */
-#define IXGE_RX_DESCRIPTOR_STATUS0_LAYER2_ETHERNET_TYPE(s) ((s) & 7)
-
-typedef struct
-{
-  u64 buffer_address;
-  u16 n_bytes_this_buffer;
-  u16 status0;
-  u32 status1;
-#define IXGE_TX_DESCRIPTOR_STATUS0_ADVANCED (3 << 4)
-#define IXGE_TX_DESCRIPTOR_STATUS0_IS_ADVANCED (1 << (8 + 5))
-#define IXGE_TX_DESCRIPTOR_STATUS0_LOG2_REPORT_STATUS (8 + 3)
-#define IXGE_TX_DESCRIPTOR_STATUS0_REPORT_STATUS (1 << IXGE_TX_DESCRIPTOR_STATUS0_LOG2_REPORT_STATUS)
-#define IXGE_TX_DESCRIPTOR_STATUS0_INSERT_FCS (1 << (8 + 1))
-#define IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET (8 + 0)
-#define IXGE_TX_DESCRIPTOR_STATUS0_IS_END_OF_PACKET (1 << IXGE_TX_DESCRIPTOR_STATUS0_LOG2_IS_END_OF_PACKET)
-#define IXGE_TX_DESCRIPTOR_STATUS1_DONE (1 << 0)
-#define IXGE_TX_DESCRIPTOR_STATUS1_CONTEXT(i) (/* valid */ (1 << 7) | ((i) << 4))
-#define IXGE_TX_DESCRIPTOR_STATUS1_IPSEC_OFFLOAD (1 << (8 + 2))
-#define IXGE_TX_DESCRIPTOR_STATUS1_INSERT_TCP_UDP_CHECKSUM (1 << (8 + 1))
-#define IXGE_TX_DESCRIPTOR_STATUS1_INSERT_IP4_CHECKSUM (1 << (8 + 0))
-#define IXGE_TX_DESCRIPTOR_STATUS0_N_BYTES_THIS_BUFFER(l) ((l) << 0)
-#define IXGE_TX_DESCRIPTOR_STATUS1_N_BYTES_IN_PACKET(l) ((l) << 14)
-} ixge_tx_descriptor_t;
-
-typedef struct
-{
-  struct
-  {
-    u8 checksum_start_offset;
-    u8 checksum_insert_offset;
-    u16 checksum_end_offset;
-  } ip, tcp;
-  u32 status0;
-
-  u8 status1;
-
-  /* Byte offset after UDP/TCP header. */
-  u8 payload_offset;
-
-  u16 max_tcp_segment_size;
-} __attribute__ ((packed)) ixge_tx_context_descriptor_t;
-
-typedef union
-{
-  ixge_rx_to_hw_descriptor_t rx_to_hw;
-  ixge_rx_from_hw_descriptor_t rx_from_hw;
-  ixge_tx_descriptor_t tx;
-  u32x4 as_u32x4;
-} ixge_descriptor_t;
-
-typedef volatile struct
-{
-  /* [2] pcie master disable
-     [3] mac reset
-     [26] global device reset */
-  u32 control;
-  u32 control_alias;
-  /* [3:2] device id (0 or 1 for dual port chips)
-     [7] link is up
-     [17:10] num vfs
-     [18] io active
-     [19] pcie master enable status */
-  u32 status_read_only;
-    CLIB_PAD_FROM_TO (0xc, 0x18);
-  /* [14] pf reset done
-     [17] relaxed ordering disable
-     [26] extended vlan enable
-     [28] driver loaded */
-  u32 extended_control;
-    CLIB_PAD_FROM_TO (0x1c, 0x20);
-
-  /* software definable pins.
-     sdp_data [7:0]
-     sdp_is_output [15:8]
-     sdp_is_native [23:16]
-     sdp_function [31:24].
-   */
-  u32 sdp_control;
-    CLIB_PAD_FROM_TO (0x24, 0x28);
-
-  /* [0] i2c clock in
-     [1] i2c clock out
-     [2] i2c data in
-     [3] i2c data out */
-  u32 i2c_control;
-    CLIB_PAD_FROM_TO (0x2c, 0x4c);
-  u32 tcp_timer;
-
-    CLIB_PAD_FROM_TO (0x50, 0x200);
-
-  u32 led_control;
-
-    CLIB_PAD_FROM_TO (0x204, 0x600);
-  u32 core_spare;
-    CLIB_PAD_FROM_TO (0x604, 0x700);
-
-  struct
-  {
-    u32 vflr_events_clear[4];
-    u32 mailbox_interrupt_status[4];
-    u32 mailbox_interrupt_enable[4];
-      CLIB_PAD_FROM_TO (0x730, 0x800);
-  } pf_foo;
-
-  struct
-  {
-    u32 status_write_1_to_clear;
-      CLIB_PAD_FROM_TO (0x804, 0x808);
-    u32 status_write_1_to_set;
-      CLIB_PAD_FROM_TO (0x80c, 0x810);
-    u32 status_auto_clear_enable;
-      CLIB_PAD_FROM_TO (0x814, 0x820);
-
-    /* [11:3] minimum inter-interrupt interval
-       (2e-6 units; 20e-6 units for fast ethernet).
-       [15] low-latency interrupt moderation enable
-       [20:16] low-latency interrupt credit
-       [27:21] interval counter
-       [31] write disable for credit and counter (write only). */
-    u32 throttle0[24];
-
-    u32 enable_write_1_to_set;
-      CLIB_PAD_FROM_TO (0x884, 0x888);
-    u32 enable_write_1_to_clear;
-      CLIB_PAD_FROM_TO (0x88c, 0x890);
-    u32 enable_auto_clear;
-    u32 msi_to_eitr_select;
-    /* [3:0] spd 0-3 interrupt detection enable
-       [4] msi-x enable
-       [5] other clear disable (makes other bits in status not clear on read)
-       etc. */
-    u32 control;
-      CLIB_PAD_FROM_TO (0x89c, 0x900);
-
-    /* Defines interrupt mapping for 128 rx + 128 tx queues.
-       64 x 4 8 bit entries.
-       For register [i]:
-       [5:0] bit in interrupt status for rx queue 2*i + 0
-       [7] valid bit
-       [13:8] bit for tx queue 2*i + 0
-       [15] valid bit
-       similar for rx 2*i + 1 and tx 2*i + 1. */
-    u32 queue_mapping[64];
-
-    /* tcp timer [7:0] and other interrupts [15:8] */
-    u32 misc_mapping;
-      CLIB_PAD_FROM_TO (0xa04, 0xa90);
-
-    /* 64 interrupts determined by mappings. */
-    u32 status1_write_1_to_clear[4];
-    u32 enable1_write_1_to_set[4];
-    u32 enable1_write_1_to_clear[4];
-      CLIB_PAD_FROM_TO (0xac0, 0xad0);
-    u32 status1_enable_auto_clear[4];
-      CLIB_PAD_FROM_TO (0xae0, 0x1000);
-  } interrupt;
-
-  ixge_dma_regs_t rx_dma0[64];
-
-    CLIB_PAD_FROM_TO (0x2000, 0x2140);
-  u32 dcb_rx_packet_plane_t4_config[8];
-  u32 dcb_rx_packet_plane_t4_status[8];
-    CLIB_PAD_FROM_TO (0x2180, 0x2300);
-
-  /* reg i defines mapping for 4 rx queues starting at 4*i + 0. */
-  u32 rx_queue_stats_mapping[32];
-  u32 rx_queue_stats_control;
-
-    CLIB_PAD_FROM_TO (0x2384, 0x2410);
-  u32 fc_user_descriptor_ptr[2];
-  u32 fc_buffer_control;
-    CLIB_PAD_FROM_TO (0x241c, 0x2420);
-  u32 fc_rx_dma;
-    CLIB_PAD_FROM_TO (0x2424, 0x2430);
-  u32 dcb_packet_plane_control;
-    CLIB_PAD_FROM_TO (0x2434, 0x2f00);
-
-  u32 rx_dma_control;
-  u32 pf_queue_drop_enable;
-    CLIB_PAD_FROM_TO (0x2f08, 0x2f20);
-  u32 rx_dma_descriptor_cache_config;
-    CLIB_PAD_FROM_TO (0x2f24, 0x3000);
-
-  /* 1 bit. */
-  u32 rx_enable;
-    CLIB_PAD_FROM_TO (0x3004, 0x3008);
-  /* [15:0] ether type (little endian)
-     [31:16] opcode (big endian) */
-  u32 flow_control_control;
-    CLIB_PAD_FROM_TO (0x300c, 0x3020);
-  /* 3 bit traffic class for each of 8 priorities. */
-  u32 rx_priority_to_traffic_class;
-    CLIB_PAD_FROM_TO (0x3024, 0x3028);
-  u32 rx_coallesce_data_buffer_control;
-    CLIB_PAD_FROM_TO (0x302c, 0x3190);
-  u32 rx_packet_buffer_flush_detect;
-    CLIB_PAD_FROM_TO (0x3194, 0x3200);
-  u32 flow_control_tx_timers[4];	/* 2 timer values */
-    CLIB_PAD_FROM_TO (0x3210, 0x3220);
-  u32 flow_control_rx_threshold_lo[8];
-    CLIB_PAD_FROM_TO (0x3240, 0x3260);
-  u32 flow_control_rx_threshold_hi[8];
-    CLIB_PAD_FROM_TO (0x3280, 0x32a0);
-  u32 flow_control_refresh_threshold;
-    CLIB_PAD_FROM_TO (0x32a4, 0x3c00);
-  /* For each of 8 traffic classes (units of bytes). */
-  u32 rx_packet_buffer_size[8];
-    CLIB_PAD_FROM_TO (0x3c20, 0x3d00);
-  u32 flow_control_config;
-    CLIB_PAD_FROM_TO (0x3d04, 0x4200);
-
-  struct
-  {
-    u32 pcs_config;
-      CLIB_PAD_FROM_TO (0x4204, 0x4208);
-    u32 link_control;
-    u32 link_status;
-    u32 pcs_debug[2];
-    u32 auto_negotiation;
-    u32 link_partner_ability;
-    u32 auto_negotiation_tx_next_page;
-    u32 auto_negotiation_link_partner_next_page;
-      CLIB_PAD_FROM_TO (0x4228, 0x4240);
-  } gige_mac;
-
-  struct
-  {
-    /* [0] tx crc enable
-       [2] enable frames up to max frame size register [31:16]
-       [10] pad frames < 64 bytes if specified by user
-       [15] loopback enable
-       [16] mdc hi speed
-       [17] turn off mdc between mdio packets */
-    u32 control;
-
-    /* [5] rx symbol error (all bits clear on read)
-       [6] rx illegal symbol
-       [7] rx idle error
-       [8] rx local fault
-       [9] rx remote fault */
-    u32 status;
-
-    u32 pause_and_pace_control;
-      CLIB_PAD_FROM_TO (0x424c, 0x425c);
-    u32 phy_command;
-    u32 phy_data;
-      CLIB_PAD_FROM_TO (0x4264, 0x4268);
-
-    /* [31:16] max frame size in bytes. */
-    u32 rx_max_frame_size;
-      CLIB_PAD_FROM_TO (0x426c, 0x4288);
-
-    /* [0]
-       [2] pcs receive link up? (latch lo)
-       [7] local fault
-       [1]
-       [0] pcs 10g base r capable
-       [1] pcs 10g base x capable
-       [2] pcs 10g base w capable
-       [10] rx local fault
-       [11] tx local fault
-       [15:14] 2 => device present at this address (else not present) */
-    u32 xgxs_status[2];
-
-    u32 base_x_pcs_status;
-
-    /* [0] pass unrecognized flow control frames
-       [1] discard pause frames
-       [2] rx priority flow control enable (only in dcb mode)
-       [3] rx flow control enable. */
-    u32 flow_control;
-
-    /* [3:0] tx lanes change polarity
-       [7:4] rx lanes change polarity
-       [11:8] swizzle tx lanes
-       [15:12] swizzle rx lanes
-       4 x 2 bit tx lane swap
-       4 x 2 bit rx lane swap. */
-    u32 serdes_control;
-
-    u32 fifo_control;
-
-    /* [0] force link up
-       [1] autoneg ack2 bit to transmit
-       [6:2] autoneg selector field to transmit
-       [8:7] 10g pma/pmd type 0 => xaui, 1 kx4, 2 cx4
-       [9] 1g pma/pmd type 0 => sfi, 1 => kx/bx
-       [10] disable 10g on without main power
-       [11] restart autoneg on transition to dx power state
-       [12] restart autoneg
-       [15:13] link mode:
-       0 => 1g no autoneg
-       1 => 10g kx4 parallel link no autoneg
-       2 => 1g bx autoneg
-       3 => 10g sfi serdes
-       4 => kx4/kx/kr
-       5 => xgmii 1g/100m
-       6 => kx4/kx/kr 1g an
-       7 kx4/kx/kr sgmii.
-       [16] kr support
-       [17] fec requested
-       [18] fec ability
-       etc. */
-    u32 auto_negotiation_control;
-
-    /* [0] signal detect 1g/100m
-       [1] fec signal detect
-       [2] 10g serial pcs fec block lock
-       [3] 10g serial high error rate
-       [4] 10g serial pcs block lock
-       [5] kx/kx4/kr autoneg next page received
-       [6] kx/kx4/kr backplane autoneg next page received
-       [7] link status clear to read
-       [11:8] 10g signal detect (4 lanes) (for serial just lane 0)
-       [12] 10g serial signal detect
-       [16:13] 10g parallel lane sync status
-       [17] 10g parallel align status
-       [18] 1g sync status
-       [19] kx/kx4/kr backplane autoneg is idle
-       [20] 1g autoneg enabled
-       [21] 1g pcs enabled for sgmii
-       [22] 10g xgxs enabled
-       [23] 10g serial fec enabled (forward error detection)
-       [24] 10g kr pcs enabled
-       [25] sgmii enabled
-       [27:26] mac link mode
-       0 => 1g
-       1 => 10g parallel
-       2 => 10g serial
-       3 => autoneg
-       [29:28] link speed
-       1 => 100m
-       2 => 1g
-       3 => 10g
-       [30] link is up
-       [31] kx/kx4/kr backplane autoneg completed successfully. */
-    u32 link_status;
-
-    /* [17:16] pma/pmd for 10g serial
-       0 => kr, 2 => sfi
-       [18] disable dme pages */
-    u32 auto_negotiation_control2;
-
-      CLIB_PAD_FROM_TO (0x42ac, 0x42b0);
-    u32 link_partner_ability[2];
-      CLIB_PAD_FROM_TO (0x42b8, 0x42d0);
-    u32 manageability_control;
-    u32 link_partner_next_page[2];
-      CLIB_PAD_FROM_TO (0x42dc, 0x42e0);
-    u32 kr_pcs_control;
-    u32 kr_pcs_status;
-    u32 fec_status[2];
-      CLIB_PAD_FROM_TO (0x42f0, 0x4314);
-    u32 sgmii_control;
-      CLIB_PAD_FROM_TO (0x4318, 0x4324);
-    u32 link_status2;
-      CLIB_PAD_FROM_TO (0x4328, 0x4900);
-  } xge_mac;
-
-  u32 tx_dcb_control;
-  u32 tx_dcb_descriptor_plane_queue_select;
-  u32 tx_dcb_descriptor_plane_t1_config;
-  u32 tx_dcb_descriptor_plane_t1_status;
-    CLIB_PAD_FROM_TO (0x4910, 0x4950);
-
-  /* For each TC in units of 1k bytes. */
-  u32 tx_packet_buffer_thresholds[8];
-    CLIB_PAD_FROM_TO (0x4970, 0x4980);
-  struct
-  {
-    u32 mmw;
-    u32 config;
-    u32 status;
-    u32 rate_drift;
-  } dcb_tx_rate_scheduler;
-    CLIB_PAD_FROM_TO (0x4990, 0x4a80);
-  u32 tx_dma_control;
-    CLIB_PAD_FROM_TO (0x4a84, 0x4a88);
-  u32 tx_dma_tcp_flags_control[2];
-    CLIB_PAD_FROM_TO (0x4a90, 0x4b00);
-  u32 pf_mailbox[64];
-    CLIB_PAD_FROM_TO (0x4c00, 0x5000);
-
-  /* RX */
-  u32 checksum_control;
-    CLIB_PAD_FROM_TO (0x5004, 0x5008);
-  u32 rx_filter_control;
-    CLIB_PAD_FROM_TO (0x500c, 0x5010);
-  u32 management_vlan_tag[8];
-  u32 management_udp_tcp_ports[8];
-    CLIB_PAD_FROM_TO (0x5050, 0x5078);
-  /* little endian. */
-  u32 extended_vlan_ether_type;
-    CLIB_PAD_FROM_TO (0x507c, 0x5080);
-  /* [1] store/dma bad packets
-     [8] accept all multicast
-     [9] accept all unicast
-     [10] accept all broadcast. */
-  u32 filter_control;
-    CLIB_PAD_FROM_TO (0x5084, 0x5088);
-  /* [15:0] vlan ethernet type (0x8100) little endian
-     [28] cfi bit expected
-     [29] drop packets with unexpected cfi bit
-     [30] vlan filter enable. */
-  u32 vlan_control;
-    CLIB_PAD_FROM_TO (0x508c, 0x5090);
-  /* [1:0] hi bit of ethernet address for 12 bit index into multicast table
-     0 => 47, 1 => 46, 2 => 45, 3 => 43.
-     [2] enable multicast filter
-   */
-  u32 multicast_control;
-    CLIB_PAD_FROM_TO (0x5094, 0x5100);
-  u32 fcoe_rx_control;
-    CLIB_PAD_FROM_TO (0x5104, 0x5108);
-  u32 fc_flt_context;
-    CLIB_PAD_FROM_TO (0x510c, 0x5110);
-  u32 fc_filter_control;
-    CLIB_PAD_FROM_TO (0x5114, 0x5120);
-  u32 rx_message_type_lo;
-    CLIB_PAD_FROM_TO (0x5124, 0x5128);
-  /* [15:0] ethernet type (little endian)
-     [18:16] matche pri in vlan tag
-     [19] priority match enable
-     [25:20] virtualization pool
-     [26] pool enable
-     [27] is fcoe
-     [30] ieee 1588 timestamp enable
-     [31] filter enable.
-     (See ethernet_type_queue_select.) */
-  u32 ethernet_type_queue_filter[8];
-    CLIB_PAD_FROM_TO (0x5148, 0x5160);
-  /* [7:0] l2 ethernet type and
-     [15:8] l2 ethernet type or */
-  u32 management_decision_filters1[8];
-  u32 vf_vm_tx_switch_loopback_enable[2];
-  u32 rx_time_sync_control;
-    CLIB_PAD_FROM_TO (0x518c, 0x5190);
-  u32 management_ethernet_type_filters[4];
-  u32 rx_timestamp_attributes_lo;
-  u32 rx_timestamp_hi;
-  u32 rx_timestamp_attributes_hi;
-    CLIB_PAD_FROM_TO (0x51ac, 0x51b0);
-  u32 pf_virtual_control;
-    CLIB_PAD_FROM_TO (0x51b4, 0x51d8);
-  u32 fc_offset_parameter;
-    CLIB_PAD_FROM_TO (0x51dc, 0x51e0);
-  u32 vf_rx_enable[2];
-  u32 rx_timestamp_lo;
-    CLIB_PAD_FROM_TO (0x51ec, 0x5200);
-  /* 12 bits determined by multicast_control
-     lookup bits in this vector. */
-  u32 multicast_enable[128];
-
-  /* [0] ethernet address [31:0]
-     [1] [15:0] ethernet address [47:32]
-     [31] valid bit.
-     Index 0 is read from eeprom after reset. */
-  u32 rx_ethernet_address0[16][2];
-
-    CLIB_PAD_FROM_TO (0x5480, 0x5800);
-  u32 wake_up_control;
-    CLIB_PAD_FROM_TO (0x5804, 0x5808);
-  u32 wake_up_filter_control;
-    CLIB_PAD_FROM_TO (0x580c, 0x5818);
-  u32 multiple_rx_queue_command_82598;
-    CLIB_PAD_FROM_TO (0x581c, 0x5820);
-  u32 management_control;
-  u32 management_filter_control;
-    CLIB_PAD_FROM_TO (0x5828, 0x5838);
-  u32 wake_up_ip4_address_valid;
-    CLIB_PAD_FROM_TO (0x583c, 0x5840);
-  u32 wake_up_ip4_address_table[4];
-  u32 management_control_to_host;
-    CLIB_PAD_FROM_TO (0x5854, 0x5880);
-  u32 wake_up_ip6_address_table[4];
-
-  /* unicast_and broadcast_and vlan_and ip_address_and
-     etc. */
-  u32 management_decision_filters[8];
-
-  u32 management_ip4_or_ip6_address_filters[4][4];
-    CLIB_PAD_FROM_TO (0x58f0, 0x5900);
-  u32 wake_up_packet_length;
-    CLIB_PAD_FROM_TO (0x5904, 0x5910);
-  u32 management_ethernet_address_filters[4][2];
-    CLIB_PAD_FROM_TO (0x5930, 0x5a00);
-  u32 wake_up_packet_memory[32];
-    CLIB_PAD_FROM_TO (0x5a80, 0x5c00);
-  u32 redirection_table_82598[32];
-  u32 rss_random_keys_82598[10];
-    CLIB_PAD_FROM_TO (0x5ca8, 0x6000);
-
-  ixge_dma_regs_t tx_dma[128];
-
-  u32 pf_vm_vlan_insert[64];
-  u32 tx_dma_tcp_max_alloc_size_requests;
-    CLIB_PAD_FROM_TO (0x8104, 0x8110);
-  u32 vf_tx_enable[2];
-    CLIB_PAD_FROM_TO (0x8118, 0x8120);
-  /* [0] dcb mode enable
-     [1] virtualization mode enable
-     [3:2] number of tcs/qs per pool. */
-  u32 multiple_tx_queues_command;
-    CLIB_PAD_FROM_TO (0x8124, 0x8200);
-  u32 pf_vf_anti_spoof[8];
-  u32 pf_dma_tx_switch_control;
-    CLIB_PAD_FROM_TO (0x8224, 0x82e0);
-  u32 tx_strict_low_latency_queues[4];
-    CLIB_PAD_FROM_TO (0x82f0, 0x8600);
-  u32 tx_queue_stats_mapping_82599[32];
-  u32 tx_queue_packet_counts[32];
-  u32 tx_queue_byte_counts[32][2];
-
-  struct
-  {
-    u32 control;
-    u32 status;
-    u32 buffer_almost_full;
-      CLIB_PAD_FROM_TO (0x880c, 0x8810);
-    u32 buffer_min_ifg;
-      CLIB_PAD_FROM_TO (0x8814, 0x8900);
-  } tx_security;
-
-  struct
-  {
-    u32 index;
-    u32 salt;
-    u32 key[4];
-      CLIB_PAD_FROM_TO (0x8918, 0x8a00);
-  } tx_ipsec;
-
-  struct
-  {
-    u32 capabilities;
-    u32 control;
-    u32 tx_sci[2];
-    u32 sa;
-    u32 sa_pn[2];
-    u32 key[2][4];
-    /* untagged packets, encrypted packets, protected packets,
-       encrypted bytes, protected bytes */
-    u32 stats[5];
-      CLIB_PAD_FROM_TO (0x8a50, 0x8c00);
-  } tx_link_security;
-
-  struct
-  {
-    u32 control;
-    u32 timestamp_value[2];
-    u32 system_time[2];
-    u32 increment_attributes;
-    u32 time_adjustment_offset[2];
-    u32 aux_control;
-    u32 target_time[2][2];
-      CLIB_PAD_FROM_TO (0x8c34, 0x8c3c);
-    u32 aux_time_stamp[2][2];
-      CLIB_PAD_FROM_TO (0x8c4c, 0x8d00);
-  } tx_timesync;
-
-  struct
-  {
-    u32 control;
-    u32 status;
-      CLIB_PAD_FROM_TO (0x8d08, 0x8e00);
-  } rx_security;
-
-  struct
-  {
-    u32 index;
-    u32 ip_address[4];
-    u32 spi;
-    u32 ip_index;
-    u32 key[4];
-    u32 salt;
-    u32 mode;
-      CLIB_PAD_FROM_TO (0x8e34, 0x8f00);
-  } rx_ipsec;
-
-  struct
-  {
-    u32 capabilities;
-    u32 control;
-    u32 sci[2];
-    u32 sa[2];
-    u32 sa_pn[2];
-    u32 key[2][4];
-    /* see datasheet */
-    u32 stats[17];
-      CLIB_PAD_FROM_TO (0x8f84, 0x9000);
-  } rx_link_security;
-
-  /* 4 wake up, 2 management, 2 wake up. */
-  u32 flexible_filters[8][16][4];
-    CLIB_PAD_FROM_TO (0x9800, 0xa000);
-
-  /* 4096 bits. */
-  u32 vlan_filter[128];
-
-  /* [0] ethernet address [31:0]
-     [1] [15:0] ethernet address [47:32]
-     [31] valid bit.
-     Index 0 is read from eeprom after reset. */
-  u32 rx_ethernet_address1[128][2];
-
-  /* select one of 64 pools for each rx address. */
-  u32 rx_ethernet_address_pool_select[128][2];
-    CLIB_PAD_FROM_TO (0xaa00, 0xc800);
-  u32 tx_priority_to_traffic_class;
-    CLIB_PAD_FROM_TO (0xc804, 0xcc00);
-
-  /* In bytes units of 1k.  Total packet buffer is 160k. */
-  u32 tx_packet_buffer_size[8];
-
-    CLIB_PAD_FROM_TO (0xcc20, 0xcd10);
-  u32 tx_manageability_tc_mapping;
-    CLIB_PAD_FROM_TO (0xcd14, 0xcd20);
-  u32 dcb_tx_packet_plane_t2_config[8];
-  u32 dcb_tx_packet_plane_t2_status[8];
-    CLIB_PAD_FROM_TO (0xcd60, 0xce00);
-
-  u32 tx_flow_control_status;
-    CLIB_PAD_FROM_TO (0xce04, 0xd000);
-
-  ixge_dma_regs_t rx_dma1[64];
-
-  struct
-  {
-    /* Bigendian ip4 src/dst address. */
-    u32 src_address[128];
-    u32 dst_address[128];
-
-    /* TCP/UDP ports [15:0] src [31:16] dst; bigendian. */
-    u32 tcp_udp_port[128];
-
-    /* [1:0] protocol tcp, udp, sctp, other
-       [4:2] match priority (highest wins)
-       [13:8] pool
-       [25] src address match disable
-       [26] dst address match disable
-       [27] src port match disable
-       [28] dst port match disable
-       [29] protocol match disable
-       [30] pool match disable
-       [31] enable. */
-    u32 control[128];
-
-    /* [12] size bypass
-       [19:13] must be 0x80
-       [20] low-latency interrupt
-       [27:21] rx queue. */
-    u32 interrupt[128];
-  } ip4_filters;
-
-    CLIB_PAD_FROM_TO (0xea00, 0xeb00);
-  /* 4 bit rss output index indexed by 7 bit hash.
-     128 8 bit fields = 32 registers. */
-  u32 redirection_table_82599[32];
-
-  u32 rss_random_key_82599[10];
-    CLIB_PAD_FROM_TO (0xeba8, 0xec00);
-  /* [15:0] reserved
-     [22:16] rx queue index
-     [29] low-latency interrupt on match
-     [31] enable */
-  u32 ethernet_type_queue_select[8];
-    CLIB_PAD_FROM_TO (0xec20, 0xec30);
-  u32 syn_packet_queue_filter;
-    CLIB_PAD_FROM_TO (0xec34, 0xec60);
-  u32 immediate_interrupt_rx_vlan_priority;
-    CLIB_PAD_FROM_TO (0xec64, 0xec70);
-  u32 rss_queues_per_traffic_class;
-    CLIB_PAD_FROM_TO (0xec74, 0xec90);
-  u32 lli_size_threshold;
-    CLIB_PAD_FROM_TO (0xec94, 0xed00);
-
-  struct
-  {
-    u32 control;
-      CLIB_PAD_FROM_TO (0xed04, 0xed10);
-    u32 table[8];
-      CLIB_PAD_FROM_TO (0xed30, 0xee00);
-  } fcoe_redirection;
-
-  struct
-  {
-    /* [1:0] packet buffer allocation 0 => disabled, else 64k*2^(f-1)
-       [3] packet buffer initialization done
-       [4] perfetch match mode
-       [5] report status in rss field of rx descriptors
-       [7] report status always
-       [14:8] drop queue
-       [20:16] flex 2 byte packet offset (units of 2 bytes)
-       [27:24] max linked list length
-       [31:28] full threshold. */
-    u32 control;
-      CLIB_PAD_FROM_TO (0xee04, 0xee0c);
-
-    u32 data[8];
-
-    /* [1:0] 0 => no action, 1 => add, 2 => remove, 3 => query.
-       [2] valid filter found by query command
-       [3] filter update override
-       [4] ip6 adress table
-       [6:5] l4 protocol reserved, udp, tcp, sctp
-       [7] is ip6
-       [8] clear head/tail
-       [9] packet drop action
-       [10] matched packet generates low-latency interrupt
-       [11] last in linked list
-       [12] collision
-       [15] rx queue enable
-       [22:16] rx queue
-       [29:24] pool. */
-    u32 command;
-
-      CLIB_PAD_FROM_TO (0xee30, 0xee3c);
-    /* ip4 dst/src address, tcp ports, udp ports.
-       set bits mean bit is ignored. */
-    u32 ip4_masks[4];
-    u32 filter_length;
-    u32 usage_stats;
-    u32 failed_usage_stats;
-    u32 filters_match_stats;
-    u32 filters_miss_stats;
-      CLIB_PAD_FROM_TO (0xee60, 0xee68);
-    /* Lookup, signature. */
-    u32 hash_keys[2];
-    /* [15:0] ip6 src address 1 bit per byte
-       [31:16] ip6 dst address. */
-    u32 ip6_mask;
-    /* [0] vlan id
-       [1] vlan priority
-       [2] pool
-       [3] ip protocol
-       [4] flex
-       [5] dst ip6. */
-    u32 other_mask;
-      CLIB_PAD_FROM_TO (0xee78, 0xf000);
-  } flow_director;
-
-  struct
-  {
-    u32 l2_control[64];
-    u32 vlan_pool_filter[64];
-    u32 vlan_pool_filter_bitmap[128];
-    u32 dst_ethernet_address[128];
-    u32 mirror_rule[4];
-    u32 mirror_rule_vlan[8];
-    u32 mirror_rule_pool[8];
-      CLIB_PAD_FROM_TO (0xf650, 0x10010);
-  } pf_bar;
-
-  u32 eeprom_flash_control;
-  /* [0] start
-     [1] done
-     [15:2] address
-     [31:16] read data. */
-  u32 eeprom_read;
-    CLIB_PAD_FROM_TO (0x10018, 0x1001c);
-  u32 flash_access;
-    CLIB_PAD_FROM_TO (0x10020, 0x10114);
-  u32 flash_data;
-  u32 flash_control;
-  u32 flash_read_data;
-    CLIB_PAD_FROM_TO (0x10120, 0x1013c);
-  u32 flash_opcode;
-  u32 software_semaphore;
-    CLIB_PAD_FROM_TO (0x10144, 0x10148);
-  u32 firmware_semaphore;
-    CLIB_PAD_FROM_TO (0x1014c, 0x10160);
-  u32 software_firmware_sync;
-    CLIB_PAD_FROM_TO (0x10164, 0x10200);
-  u32 general_rx_control;
-    CLIB_PAD_FROM_TO (0x10204, 0x11000);
-
-  struct
-  {
-    u32 control;
-      CLIB_PAD_FROM_TO (0x11004, 0x11010);
-    /* [3:0] enable counters
-       [7:4] leaky bucket counter mode
-       [29] reset
-       [30] stop
-       [31] start. */
-    u32 counter_control;
-    /* [7:0],[15:8],[23:16],[31:24] event for counters 0-3.
-       event codes:
-       0x0 bad tlp
-       0x10 reqs that reached timeout
-       etc. */
-    u32 counter_event;
-      CLIB_PAD_FROM_TO (0x11018, 0x11020);
-    u32 counters_clear_on_read[4];
-    u32 counter_config[4];
-    struct
-    {
-      u32 address;
-      u32 data;
-    } indirect_access;
-      CLIB_PAD_FROM_TO (0x11048, 0x11050);
-    u32 extended_control;
-      CLIB_PAD_FROM_TO (0x11054, 0x11064);
-    u32 mirrored_revision_id;
-      CLIB_PAD_FROM_TO (0x11068, 0x11070);
-    u32 dca_requester_id_information;
-
-    /* [0] global disable
-       [4:1] mode: 0 => legacy, 1 => dca 1.0. */
-    u32 dca_control;
-      CLIB_PAD_FROM_TO (0x11078, 0x110b0);
-    /* [0] pci completion abort
-       [1] unsupported i/o address
-       [2] wrong byte enable
-       [3] pci timeout */
-    u32 pcie_interrupt_status;
-      CLIB_PAD_FROM_TO (0x110b4, 0x110b8);
-    u32 pcie_interrupt_enable;
-      CLIB_PAD_FROM_TO (0x110bc, 0x110c0);
-    u32 msi_x_pba_clear[8];
-      CLIB_PAD_FROM_TO (0x110e0, 0x12300);
-  } pcie;
-
-  u32 interrupt_throttle1[128 - 24];
-    CLIB_PAD_FROM_TO (0x124a0, 0x14f00);
-
-  u32 core_analog_config;
-    CLIB_PAD_FROM_TO (0x14f04, 0x14f10);
-  u32 core_common_config;
-    CLIB_PAD_FROM_TO (0x14f14, 0x15f14);
-
-  u32 link_sec_software_firmware_interface;
-} ixge_regs_t;
-
-typedef union
-{
-  struct
-  {
-    /* Addresses bigendian. */
-    union
-    {
-      struct
-      {
-	ip6_address_t src_address;
-	u32 unused[1];
-      } ip6;
-      struct
-      {
-	u32 unused[3];
-	ip4_address_t src_address, dst_address;
-      } ip4;
-    };
-
-    /* [15:0] src port (little endian).
-       [31:16] dst port. */
-    u32 tcp_udp_ports;
-
-    /* [15:0] vlan (cfi bit set to 0).
-       [31:16] flex bytes.  bigendian. */
-    u32 vlan_and_flex_word;
-
-    /* [14:0] hash
-       [15] bucket valid
-       [31:16] signature (signature filers)/sw-index (perfect match). */
-    u32 hash;
-  };
-
-  u32 as_u32[8];
-} ixge_flow_director_key_t;
-
-always_inline void
-ixge_throttle_queue_interrupt (ixge_regs_t * r,
-			       u32 queue_interrupt_index,
-			       f64 inter_interrupt_interval_in_secs)
-{
-  volatile u32 *tr =
-    (queue_interrupt_index < ARRAY_LEN (r->interrupt.throttle0)
-     ? &r->interrupt.throttle0[queue_interrupt_index]
-     : &r->interrupt_throttle1[queue_interrupt_index]);
-  ASSERT (queue_interrupt_index < 128);
-  u32 v;
-  i32 i, mask = (1 << 9) - 1;
-
-  i = flt_round_nearest (inter_interrupt_interval_in_secs / 2e-6);
-  i = i < 1 ? 1 : i;
-  i = i >= mask ? mask : i;
-
-  v = tr[0];
-  v &= ~(mask << 3);
-  v |= i << 3;
-  tr[0] = v;
-}
-
-#define foreach_ixge_counter				\
-  _ (0x40d0, rx_total_packets)				\
-  _64 (0x40c0, rx_total_bytes)				\
-  _ (0x41b0, rx_good_packets_before_filtering)		\
-  _64 (0x41b4, rx_good_bytes_before_filtering)		\
-  _ (0x2f50, rx_dma_good_packets)			\
-  _64 (0x2f54, rx_dma_good_bytes)			\
-  _ (0x2f5c, rx_dma_duplicated_good_packets)		\
-  _64 (0x2f60, rx_dma_duplicated_good_bytes)		\
-  _ (0x2f68, rx_dma_good_loopback_packets)		\
-  _64 (0x2f6c, rx_dma_good_loopback_bytes)		\
-  _ (0x2f74, rx_dma_good_duplicated_loopback_packets)	\
-  _64 (0x2f78, rx_dma_good_duplicated_loopback_bytes)	\
-  _ (0x4074, rx_good_packets)				\
-  _64 (0x4088, rx_good_bytes)				\
-  _ (0x407c, rx_multicast_packets)			\
-  _ (0x4078, rx_broadcast_packets)			\
-  _ (0x405c, rx_64_byte_packets)			\
-  _ (0x4060, rx_65_127_byte_packets)			\
-  _ (0x4064, rx_128_255_byte_packets)			\
-  _ (0x4068, rx_256_511_byte_packets)			\
-  _ (0x406c, rx_512_1023_byte_packets)			\
-  _ (0x4070, rx_gt_1023_byte_packets)			\
-  _ (0x4000, rx_crc_errors)				\
-  _ (0x4120, rx_ip_checksum_errors)			\
-  _ (0x4004, rx_illegal_symbol_errors)			\
-  _ (0x4008, rx_error_symbol_errors)			\
-  _ (0x4034, rx_mac_local_faults)			\
-  _ (0x4038, rx_mac_remote_faults)			\
-  _ (0x4040, rx_length_errors)				\
-  _ (0x41a4, rx_xons)					\
-  _ (0x41a8, rx_xoffs)					\
-  _ (0x40a4, rx_undersize_packets)			\
-  _ (0x40a8, rx_fragments)				\
-  _ (0x40ac, rx_oversize_packets)			\
-  _ (0x40b0, rx_jabbers)				\
-  _ (0x40b4, rx_management_packets)			\
-  _ (0x40b8, rx_management_drops)			\
-  _ (0x3fa0, rx_missed_packets_pool_0)			\
-  _ (0x40d4, tx_total_packets)				\
-  _ (0x4080, tx_good_packets)				\
-  _64 (0x4090, tx_good_bytes)				\
-  _ (0x40f0, tx_multicast_packets)			\
-  _ (0x40f4, tx_broadcast_packets)			\
-  _ (0x87a0, tx_dma_good_packets)			\
-  _64 (0x87a4, tx_dma_good_bytes)			\
-  _ (0x40d8, tx_64_byte_packets)			\
-  _ (0x40dc, tx_65_127_byte_packets)			\
-  _ (0x40e0, tx_128_255_byte_packets)			\
-  _ (0x40e4, tx_256_511_byte_packets)			\
-  _ (0x40e8, tx_512_1023_byte_packets)			\
-  _ (0x40ec, tx_gt_1023_byte_packets)			\
-  _ (0x4010, tx_undersize_drops)			\
-  _ (0x8780, switch_security_violation_packets)		\
-  _ (0x5118, fc_crc_errors)				\
-  _ (0x241c, fc_rx_drops)				\
-  _ (0x2424, fc_last_error_count)			\
-  _ (0x2428, fcoe_rx_packets)				\
-  _ (0x242c, fcoe_rx_dwords)				\
-  _ (0x8784, fcoe_tx_packets)				\
-  _ (0x8788, fcoe_tx_dwords)				\
-  _ (0x1030, queue_0_rx_count)				\
-  _ (0x1430, queue_0_drop_count)			\
-  _ (0x1070, queue_1_rx_count)				\
-  _ (0x1470, queue_1_drop_count)			\
-  _ (0x10b0, queue_2_rx_count)				\
-  _ (0x14b0, queue_2_drop_count)			\
-  _ (0x10f0, queue_3_rx_count)				\
-  _ (0x14f0, queue_3_drop_count)			\
-  _ (0x1130, queue_4_rx_count)				\
-  _ (0x1530, queue_4_drop_count)			\
-  _ (0x1170, queue_5_rx_count)				\
-  _ (0x1570, queue_5_drop_count)			\
-  _ (0x11b0, queue_6_rx_count)				\
-  _ (0x15b0, queue_6_drop_count)			\
-  _ (0x11f0, queue_7_rx_count)				\
-  _ (0x15f0, queue_7_drop_count)			\
-  _ (0x1230, queue_8_rx_count)				\
-  _ (0x1630, queue_8_drop_count)			\
-  _ (0x1270, queue_9_rx_count)				\
-  _ (0x1270, queue_9_drop_count)
-
-
-
-
-typedef enum
-{
-#define _(a,f) IXGE_COUNTER_##f,
-#define _64(a,f) _(a,f)
-  foreach_ixge_counter
-#undef _
-#undef _64
-    IXGE_N_COUNTER,
-} ixge_counter_type_t;
-
-typedef struct
-{
-  u32 mdio_address;
-
-  /* 32 bit ID read from ID registers. */
-  u32 id;
-} ixge_phy_t;
-
-typedef struct
-{
-  /* Cache aligned descriptors. */
-  ixge_descriptor_t *descriptors;
-
-  /* Number of descriptors in table. */
-  u32 n_descriptors;
-
-  /* Software head and tail pointers into descriptor ring. */
-  u32 head_index, tail_index;
-
-  /* Index into dma_queues vector. */
-  u32 queue_index;
-
-  /* Buffer indices corresponding to each active descriptor. */
-  u32 *descriptor_buffer_indices;
-
-  union
-  {
-    struct
-    {
-      u32 *volatile head_index_write_back;
-
-      u32 n_buffers_on_ring;
-    } tx;
-
-    struct
-    {
-      /* Buffer indices to use to replenish each descriptor. */
-      u32 *replenish_buffer_indices;
-
-      vlib_node_runtime_t *node;
-      u32 next_index;
-
-      u32 saved_start_of_packet_buffer_index;
-
-      u32 saved_start_of_packet_next_index;
-      u32 saved_last_buffer_index;
-
-      u32 is_start_of_packet;
-
-      u32 n_descriptors_done_total;
-
-      u32 n_descriptors_done_this_call;
-
-      u32 n_bytes;
-    } rx;
-  };
-} ixge_dma_queue_t;
-
-#define foreach_ixge_pci_device_id		\
-  _ (82598, 0x10b6)				\
-  _ (82598_bx, 0x1508)				\
-  _ (82598af_dual_port, 0x10c6)			\
-  _ (82598af_single_port, 0x10c7)		\
-  _ (82598at, 0x10c8)				\
-  _ (82598at2, 0x150b)				\
-  _ (82598eb_sfp_lom, 0x10db)			\
-  _ (82598eb_cx4, 0x10dd)			\
-  _ (82598_cx4_dual_port, 0x10ec)		\
-  _ (82598_da_dual_port, 0x10f1)		\
-  _ (82598_sr_dual_port_em, 0x10e1)		\
-  _ (82598eb_xf_lr, 0x10f4)			\
-  _ (82599_kx4, 0x10f7)				\
-  _ (82599_kx4_mezz, 0x1514)			\
-  _ (82599_kr, 0x1517)				\
-  _ (82599_combo_backplane, 0x10f8)		\
-  _ (82599_cx4, 0x10f9)				\
-  _ (82599_sfp, 0x10fb)				\
-  _ (82599_backplane_fcoe, 0x152a)		\
-  _ (82599_sfp_fcoe, 0x1529)			\
-  _ (82599_sfp_em, 0x1507)			\
-  _ (82599_xaui_lom, 0x10fc)			\
-  _ (82599_t3_lom, 0x151c)			\
-  _ (x540t, 0x1528)
-
-typedef enum
-{
-#define _(f,n) IXGE_##f = n,
-  foreach_ixge_pci_device_id
-#undef _
-} ixge_pci_device_id_t;
-
-typedef struct
-{
-  /* registers */
-  ixge_regs_t *regs;
-
-  /* Specific next index when using dynamic redirection */
-  u32 per_interface_next_index;
-
-  /* PCI bus info. */
-  vlib_pci_device_t pci_device;
-
-  /* From PCI config space header. */
-  ixge_pci_device_id_t device_id;
-
-  u16 device_index;
-
-  /* 0 or 1. */
-  u16 pci_function;
-
-  /* VLIB interface for this instance. */
-  u32 vlib_hw_if_index, vlib_sw_if_index;
-
-  ixge_dma_queue_t *dma_queues[VLIB_N_RX_TX];
-
-  /* Phy index (0 or 1) and address on MDI bus. */
-  u32 phy_index;
-  ixge_phy_t phys[2];
-
-  /* Value of link_status register at last link change. */
-  u32 link_status_at_last_link_change;
-
-  i2c_bus_t i2c_bus;
-  sfp_eeprom_t sfp_eeprom;
-
-  /* Counters. */
-  u64 counters[IXGE_N_COUNTER], counters_last_clear[IXGE_N_COUNTER];
-} ixge_device_t;
-
-typedef struct
-{
-  vlib_main_t *vlib_main;
-
-  /* Vector of devices. */
-  ixge_device_t *devices;
-
-  /* Descriptor ring sizes. */
-  u32 n_descriptors[VLIB_N_RX_TX];
-
-  /* RX buffer size.  Must be at least 1k; will be rounded to
-     next largest 1k size. */
-  u32 n_bytes_in_rx_buffer;
-
-  u32 n_descriptors_per_cache_line;
-
-  u32 vlib_buffer_free_list_index;
-
-  u32 process_node_index;
-
-  /* Template and mask for initializing/validating TX descriptors. */
-  ixge_tx_descriptor_t tx_descriptor_template, tx_descriptor_template_mask;
-
-  /* Vector of buffers for which TX is done and can be freed. */
-  u32 *tx_buffers_pending_free;
-
-  u32 *rx_buffers_to_add;
-
-  f64 time_last_stats_update;
-} ixge_main_t;
-
-ixge_main_t ixge_main;
-vnet_device_class_t ixge_device_class;
-
-typedef enum
-{
-  IXGE_RX_NEXT_IP4_INPUT,
-  IXGE_RX_NEXT_IP6_INPUT,
-  IXGE_RX_NEXT_ETHERNET_INPUT,
-  IXGE_RX_NEXT_DROP,
-  IXGE_RX_N_NEXT,
-} ixge_rx_next_t;
-
-void ixge_set_next_node (ixge_rx_next_t, char *);
-
-#endif /* included_ixge_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/vnet/devices/nic/sfp.c b/src/vnet/devices/nic/sfp.c
deleted file mode 100644
index 9e9c008d..00000000
--- a/src/vnet/devices/nic/sfp.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vnet/devices/nic/sfp.h>
-
-static u8 *
-format_space_terminated (u8 * s, va_list * args)
-{
-  u32 l = va_arg (*args, u32);
-  u8 *v = va_arg (*args, u8 *);
-  u8 *p;
-
-  for (p = v + l - 1; p >= v && p[0] == ' '; p--)
-    ;
-  vec_add (s, v, clib_min (p - v + 1, l));
-  return s;
-}
-
-static u8 *
-format_sfp_id (u8 * s, va_list * args)
-{
-  u32 id = va_arg (*args, u32);
-  char *t = 0;
-  switch (id)
-    {
-#define _(f) case SFP_ID_##f: t = #f; break;
-      foreach_sfp_id
-#undef _
-    default:
-      return format (s, "unknown 0x%x", id);
-    }
-  return format (s, "%s", t);
-}
-
-static u8 *
-format_sfp_compatibility (u8 * s, va_list * args)
-{
-  u32 c = va_arg (*args, u32);
-  char *t = 0;
-  switch (c)
-    {
-#define _(a,b,f) case SFP_COMPATIBILITY_##f: t = #f; break;
-      foreach_sfp_compatibility
-#undef _
-    default:
-      return format (s, "unknown 0x%x", c);
-    }
-  return format (s, "%s", t);
-}
-
-u32
-sfp_is_comatible (sfp_eeprom_t * e, sfp_compatibility_t c)
-{
-  static struct
-  {
-    u8 byte, bit;
-  } t[] =
-  {
-#define _(a,b,f) { .byte = a, .bit = b, },
-    foreach_sfp_compatibility
-#undef _
-  };
-
-  ASSERT (c < ARRAY_LEN (t));
-  return (e->compatibility[t[c].byte] & (1 << t[c].bit)) != 0;
-}
-
-u8 *
-format_sfp_eeprom (u8 * s, va_list * args)
-{
-  sfp_eeprom_t *e = va_arg (*args, sfp_eeprom_t *);
-  uword indent = format_get_indent (s);
-  int i;
-
-  if (e->id != SFP_ID_sfp)
-    s = format (s, "id %U, ", format_sfp_id, e->id);
-
-  s = format (s, "compatibility:");
-  for (i = 0; i < SFP_N_COMPATIBILITY; i++)
-    if (sfp_is_comatible (e, i))
-      s = format (s, " %U", format_sfp_compatibility, i);
-
-  s = format (s, "\n%Uvendor: %U, part %U",
-	      format_white_space, indent,
-	      format_space_terminated, sizeof (e->vendor_name),
-	      e->vendor_name, format_space_terminated,
-	      sizeof (e->vendor_part_number), e->vendor_part_number);
-  s =
-    format (s, "\n%Urevision: %U, serial: %U, date code: %U",
-	    format_white_space, indent, format_space_terminated,
-	    sizeof (e->vendor_revision), e->vendor_revision,
-	    format_space_terminated, sizeof (e->vendor_serial_number),
-	    e->vendor_serial_number, format_space_terminated,
-	    sizeof (e->vendor_date_code), e->vendor_date_code);
-
-  return s;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/vnet/devices/nic/sfp.h b/src/vnet/devices/nic/sfp.h
deleted file mode 100644
index a1ac7997..00000000
--- a/src/vnet/devices/nic/sfp.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef included_vnet_optics_sfp_h
-#define included_vnet_optics_sfp_h
-
-#include <vppinfra/format.h>
-
-#define foreach_sfp_id				\
-  _ (unknown)					\
-  _ (gbic)					\
-  _ (on_motherboard)				\
-  _ (sfp)
-
-typedef enum
-{
-#define _(f) SFP_ID_##f,
-  foreach_sfp_id
-#undef _
-} sfp_id_t;
-
-typedef struct
-{
-  u8 id;
-  u8 extended_id;
-  u8 connector_type;
-  u8 compatibility[8];
-  u8 encoding;
-  u8 nominal_bit_rate_100mbits_per_sec;
-  u8 reserved13;
-  u8 link_length[5];
-  u8 reserved19;
-  u8 vendor_name[16];
-  u8 reserved36;
-  u8 vendor_oui[3];
-  u8 vendor_part_number[16];
-  u8 vendor_revision[4];
-  /* 16 bit value network byte order. */
-  u8 laser_wavelength_in_nm[2];
-  u8 reserved62;
-  u8 checksum_0_to_62;
-
-  u8 options[2];
-  u8 max_bit_rate_margin_percent;
-  u8 min_bit_rate_margin_percent;
-  u8 vendor_serial_number[16];
-  u8 vendor_date_code[8];
-  u8 reserved92[3];
-  u8 checksum_63_to_94;
-  u8 vendor_specific[32];
-  u8 reserved128[384];
-
-  /* Vendor specific data follows. */
-  u8 vendor_specific1[0];
-} sfp_eeprom_t;
-
-always_inline uword
-sfp_eeprom_is_valid (sfp_eeprom_t * e)
-{
-  int i;
-  u8 sum = 0;
-  for (i = 0; i < 63; i++)
-    sum += ((u8 *) e)[i];
-  return sum == e->checksum_0_to_62;
-}
-
-/* _ (byte_index, bit_index, name) */
-#define foreach_sfp_compatibility		\
-  _ (0, 4, 10g_base_sr)				\
-  _ (0, 5, 10g_base_lr)				\
-  _ (1, 2, oc48_long_reach)			\
-  _ (1, 1, oc48_intermediate_reach)		\
-  _ (1, 0, oc48_short_reach)			\
-  _ (2, 6, oc12_long_reach)			\
-  _ (2, 5, oc12_intermediate_reach)		\
-  _ (2, 4, oc12_short_reach)			\
-  _ (2, 2, oc3_long_reach)			\
-  _ (2, 1, oc3_intermediate_reach)		\
-  _ (2, 0, oc3_short_reach)			\
-  _ (3, 3, 1g_base_t)				\
-  _ (3, 2, 1g_base_cx)				\
-  _ (3, 1, 1g_base_lx)				\
-  _ (3, 0, 1g_base_sx)
-
-typedef enum
-{
-#define _(a,b,f) SFP_COMPATIBILITY_##f,
-  foreach_sfp_compatibility
-#undef _
-    SFP_N_COMPATIBILITY,
-} sfp_compatibility_t;
-
-u32 sfp_is_comatible (sfp_eeprom_t * e, sfp_compatibility_t c);
-
-format_function_t format_sfp_eeprom;
-
-#endif /* included_vnet_optics_sfp_h */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/vnet/ethernet/sfp.c b/src/vnet/ethernet/sfp.c
new file mode 100644
index 00000000..624740e3
--- /dev/null
+++ b/src/vnet/ethernet/sfp.c
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/ethernet/sfp.h>
+
+static u8 *
+format_space_terminated (u8 * s, va_list * args)
+{
+  u32 l = va_arg (*args, u32);
+  u8 *v = va_arg (*args, u8 *);
+  u8 *p;
+
+  for (p = v + l - 1; p >= v && p[0] == ' '; p--)
+    ;
+  vec_add (s, v, clib_min (p - v + 1, l));
+  return s;
+}
+
+static u8 *
+format_sfp_id (u8 * s, va_list * args)
+{
+  u32 id = va_arg (*args, u32);
+  char *t = 0;
+  switch (id)
+    {
+#define _(f) case SFP_ID_##f: t = #f; break;
+      foreach_sfp_id
+#undef _
+    default:
+      return format (s, "unknown 0x%x", id);
+    }
+  return format (s, "%s", t);
+}
+
+static u8 *
+format_sfp_compatibility (u8 * s, va_list * args)
+{
+  u32 c = va_arg (*args, u32);
+  char *t = 0;
+  switch (c)
+    {
+#define _(a,b,f) case SFP_COMPATIBILITY_##f: t = #f; break;
+      foreach_sfp_compatibility
+#undef _
+    default:
+      return format (s, "unknown 0x%x", c);
+    }
+  return format (s, "%s", t);
+}
+
+u32
+sfp_is_comatible (sfp_eeprom_t * e, sfp_compatibility_t c)
+{
+  static struct
+  {
+    u8 byte, bit;
+  } t[] =
+  {
+#define _(a,b,f) { .byte = a, .bit = b, },
+    foreach_sfp_compatibility
+#undef _
+  };
+
+  ASSERT (c < ARRAY_LEN (t));
+  return (e->compatibility[t[c].byte] & (1 << t[c].bit)) != 0;
+}
+
+u8 *
+format_sfp_eeprom (u8 * s, va_list * args)
+{
+  sfp_eeprom_t *e = va_arg (*args, sfp_eeprom_t *);
+  uword indent = format_get_indent (s);
+  int i;
+
+  if (e->id != SFP_ID_sfp)
+    s = format (s, "id %U, ", format_sfp_id, e->id);
+
+  s = format (s, "compatibility:");
+  for (i = 0; i < SFP_N_COMPATIBILITY; i++)
+    if (sfp_is_comatible (e, i))
+      s = format (s, " %U", format_sfp_compatibility, i);
+
+  s = format (s, "\n%Uvendor: %U, part %U",
+	      format_white_space, indent,
+	      format_space_terminated, sizeof (e->vendor_name),
+	      e->vendor_name, format_space_terminated,
+	      sizeof (e->vendor_part_number), e->vendor_part_number);
+  s =
+    format (s, "\n%Urevision: %U, serial: %U, date code: %U",
+	    format_white_space, indent, format_space_terminated,
+	    sizeof (e->vendor_revision), e->vendor_revision,
+	    format_space_terminated, sizeof (e->vendor_serial_number),
+	    e->vendor_serial_number, format_space_terminated,
+	    sizeof (e->vendor_date_code), e->vendor_date_code);
+
+  return s;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/ethernet/sfp.h b/src/vnet/ethernet/sfp.h
new file mode 100644
index 00000000..a1ac7997
--- /dev/null
+++ b/src/vnet/ethernet/sfp.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef included_vnet_optics_sfp_h
+#define included_vnet_optics_sfp_h
+
+#include <vppinfra/format.h>
+
+#define foreach_sfp_id				\
+  _ (unknown)					\
+  _ (gbic)					\
+  _ (on_motherboard)				\
+  _ (sfp)
+
+typedef enum
+{
+#define _(f) SFP_ID_##f,
+  foreach_sfp_id
+#undef _
+} sfp_id_t;
+
+typedef struct
+{
+  u8 id;
+  u8 extended_id;
+  u8 connector_type;
+  u8 compatibility[8];
+  u8 encoding;
+  u8 nominal_bit_rate_100mbits_per_sec;
+  u8 reserved13;
+  u8 link_length[5];
+  u8 reserved19;
+  u8 vendor_name[16];
+  u8 reserved36;
+  u8 vendor_oui[3];
+  u8 vendor_part_number[16];
+  u8 vendor_revision[4];
+  /* 16 bit value network byte order. */
+  u8 laser_wavelength_in_nm[2];
+  u8 reserved62;
+  u8 checksum_0_to_62;
+
+  u8 options[2];
+  u8 max_bit_rate_margin_percent;
+  u8 min_bit_rate_margin_percent;
+  u8 vendor_serial_number[16];
+  u8 vendor_date_code[8];
+  u8 reserved92[3];
+  u8 checksum_63_to_94;
+  u8 vendor_specific[32];
+  u8 reserved128[384];
+
+  /* Vendor specific data follows. */
+  u8 vendor_specific1[0];
+} sfp_eeprom_t;
+
+always_inline uword
+sfp_eeprom_is_valid (sfp_eeprom_t * e)
+{
+  int i;
+  u8 sum = 0;
+  for (i = 0; i < 63; i++)
+    sum += ((u8 *) e)[i];
+  return sum == e->checksum_0_to_62;
+}
+
+/* _ (byte_index, bit_index, name) */
+#define foreach_sfp_compatibility		\
+  _ (0, 4, 10g_base_sr)				\
+  _ (0, 5, 10g_base_lr)				\
+  _ (1, 2, oc48_long_reach)			\
+  _ (1, 1, oc48_intermediate_reach)		\
+  _ (1, 0, oc48_short_reach)			\
+  _ (2, 6, oc12_long_reach)			\
+  _ (2, 5, oc12_intermediate_reach)		\
+  _ (2, 4, oc12_short_reach)			\
+  _ (2, 2, oc3_long_reach)			\
+  _ (2, 1, oc3_intermediate_reach)		\
+  _ (2, 0, oc3_short_reach)			\
+  _ (3, 3, 1g_base_t)				\
+  _ (3, 2, 1g_base_cx)				\
+  _ (3, 1, 1g_base_lx)				\
+  _ (3, 0, 1g_base_sx)
+
+typedef enum
+{
+#define _(a,b,f) SFP_COMPATIBILITY_##f,
+  foreach_sfp_compatibility
+#undef _
+    SFP_N_COMPATIBILITY,
+} sfp_compatibility_t;
+
+u32 sfp_is_comatible (sfp_eeprom_t * e, sfp_compatibility_t c);
+
+format_function_t format_sfp_eeprom;
+
+#endif /* included_vnet_optics_sfp_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp-api/lua/bench.lua b/src/vpp-api/lua/bench.lua
index 8e5a0b4b..c7231b90 100644
--- a/src/vpp-api/lua/bench.lua
+++ b/src/vpp-api/lua/bench.lua
@@ -53,9 +53,9 @@ function do_bench()
 end
 
 root_dir = "/home/ubuntu/vpp"
-pneum_path = root_dir .. "/build-root/install-vpp_lite_debug-native/vpp-api/lib64/libpneum.so"
+pneum_path = root_dir .. "/build-root/install-vpp_debug-native/vpp-api/lib64/libpneum.so"
 vpp:init({ pneum_path = pneum_path })
-vpp:json_api(root_dir .. "/build-root/install-vpp_lite_debug-native/vpp/vpp-api/vpe.api.json")
+vpp:json_api(root_dir .. "/build-root/install-vpp_debug-native/vpp/vpp-api/vpe.api.json")
 
 vpp:connect("lua-bench")
 local n_tests = 10
diff --git a/src/vpp-api/lua/examples/cli/lua-cli.lua b/src/vpp-api/lua/examples/cli/lua-cli.lua
index b3a24d7d..4a27af53 100644
--- a/src/vpp-api/lua/examples/cli/lua-cli.lua
+++ b/src/vpp-api/lua/examples/cli/lua-cli.lua
@@ -557,12 +557,12 @@ end
 
 function init_vpp(vpp)
   local root_dir = "/home/ubuntu/vpp"
-  local pneum_path = root_dir .. "/build-root/install-vpp_lite_debug-native/vpp-api/lib64/libpneum.so"
+  local pneum_path = root_dir .. "/build-root/install-vpp_debug-native/vpp-api/lib64/libpneum.so"
 
   vpp:init({ pneum_path = pneum_path })
 
   vpp:init({ pneum_path = pneum_path })
-  vpp:json_api(root_dir .. "/build-root/install-vpp_lite_debug-native/vpp/vpp-api/vpe.api.json")
+  vpp:json_api(root_dir .. "/build-root/install-vpp_debug-native/vpp/vpp-api/vpe.api.json")
 
 
 
diff --git a/src/vpp-api/lua/examples/example-classifier.lua b/src/vpp-api/lua/examples/example-classifier.lua
index ec9c3d3e..b1270757 100644
--- a/src/vpp-api/lua/examples/example-classifier.lua
+++ b/src/vpp-api/lua/examples/example-classifier.lua
@@ -20,12 +20,12 @@ local vpp = require "vpp-lapi"
 local bit = require("bit")
 
 root_dir = "/home/ubuntu/vpp"
-pneum_path = root_dir .. "/build-root/install-vpp_lite_debug-native/vpp-api/lib64/libpneum.so"
+pneum_path = root_dir .. "/build-root/install-vpp_debug-native/vpp-api/lib64/libpneum.so"
 
 
 vpp:init({ pneum_path = pneum_path })
 
-vpp:json_api(root_dir .. "/build-root/install-vpp_lite_debug-native/vpp/vpp-api/vpe.api.json")
+vpp:json_api(root_dir .. "/build-root/install-vpp_debug-native/vpp/vpp-api/vpe.api.json")
 
 vpp:connect("aytest")
 
diff --git a/src/vpp-api/lua/examples/example-cli.lua b/src/vpp-api/lua/examples/example-cli.lua
index 8b84989f..85425caf 100644
--- a/src/vpp-api/lua/examples/example-cli.lua
+++ b/src/vpp-api/lua/examples/example-cli.lua
@@ -18,11 +18,11 @@
 vpp = require "vpp-lapi"
 
 root_dir = "/home/ubuntu/vpp"
-pneum_path = root_dir .. "/build-root/install-vpp_lite_debug-native/vpp-api/lib64/libpneum.so"
+pneum_path = root_dir .. "/build-root/install-vpp_debug-native/vpp-api/lib64/libpneum.so"
 
 vpp:init({ pneum_path = pneum_path })
 
-vpp:json_api(root_dir .. "/build-root/install-vpp_lite_debug-native/vpp/vpp-api/vpe.api.json")
+vpp:json_api(root_dir .. "/build-root/install-vpp_debug-native/vpp/vpp-api/vpe.api.json")
 
 vpp:connect("aytest")
 
diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c
index a566d956..d6a12325 100644
--- a/src/vpp/vnet/main.c
+++ b/src/vpp/vnet/main.c
@@ -199,9 +199,6 @@ defaulted:
     {
       vm->init_functions_called = hash_create (0, /* value bytes */ 0);
       vpe_main_init (vm);
-#if DPDK == 0
-      unix_physmem_init (vm, 0 /* fail_if_physical_memory_not_present */ );
-#endif
       return vlib_unix_main (argc, argv);
     }
   else
diff --git a/test/framework.py b/test/framework.py
index 6b1799a5..a0284e37 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -157,7 +157,9 @@ class VppTestCase(unittest.TestCase):
         cls.vpp_cmdline = [cls.vpp_bin, "unix",
                            "{", "nodaemon", debug_cli, coredump_size, "}",
                            "api-trace", "{", "on", "}",
-                           "api-segment", "{", "prefix", cls.shm_prefix, "}"]
+                           "api-segment", "{", "prefix", cls.shm_prefix, "}",
+                           "plugins", "{", "plugin", "dpdk_plugin.so", "{",
+                           "disable", "}", "}"]
         if cls.plugin_path is not None:
             cls.vpp_cmdline.extend(["plugin_path", cls.plugin_path])
         cls.logger.info("vpp_cmdline: %s" % cls.vpp_cmdline)
-- 
cgit 1.2.3-korg


From c563e0e11e0725b6cb85b4f1c405084385612b2f Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Sat, 11 Mar 2017 15:26:36 -0500
Subject: Nasm > 2.11.06 required for sw_crypto.

Change-Id: I7583d3074478579a841c7827a12a4a8fc74d9d61
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1527d60a..ebf94db7 100644
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,7 @@ RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
 RPM_DEPENDS += python-devel python-virtualenv lcov chrpath
+RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
-- 
cgit 1.2.3-korg


From 3cc4971882235a539bc6177e8e4b4d92129b3a12 Mon Sep 17 00:00:00 2001
From: Ole Troan <ot@cisco.com>
Date: Wed, 8 Mar 2017 12:02:24 +0100
Subject: Python API: Change from cPython to CFFI.

Change-Id: I03e52466fb3f909ae52b8fba601168f3eadbd972
Signed-off-by: Ole Troan <ot@cisco.com>
---
 Makefile                                 |   5 +-
 build-root/rpm/vpp.spec                  |  12 +-
 src/Makefile.am                          |   1 +
 src/configure.ac                         |   9 +
 src/vpp-api.am                           |  45 +++
 src/vpp-api/pneum/pneum.c                | 488 ++++++++++++++++++++++++
 src/vpp-api/pneum/pneum.h                |  37 ++
 src/vpp-api/pneum/test_pneum.c           | 143 +++++++
 src/vpp-api/python/Makefile.am           |  57 +--
 src/vpp-api/python/pneum/pneum.c         | 467 -----------------------
 src/vpp-api/python/pneum/pneum.h         |  34 --
 src/vpp-api/python/pneum/test_pneum.c    | 143 -------
 src/vpp-api/python/setup.cfg             |   2 +-
 src/vpp-api/python/setup.py              |  15 +-
 src/vpp-api/python/vpp_papi.py           | 635 +++++++++++++++++++++++++++++++
 src/vpp-api/python/vpp_papi/__init__.py  |   3 -
 src/vpp-api/python/vpp_papi/pneum_wrap.c | 226 -----------
 src/vpp-api/python/vpp_papi/vpp_papi.py  | 599 -----------------------------
 test/Makefile                            |   2 +-
 test/vpp_papi_provider.py                |   2 +-
 20 files changed, 1380 insertions(+), 1545 deletions(-)
 create mode 100644 src/vpp-api.am
 create mode 100644 src/vpp-api/pneum/pneum.c
 create mode 100644 src/vpp-api/pneum/pneum.h
 create mode 100644 src/vpp-api/pneum/test_pneum.c
 delete mode 100644 src/vpp-api/python/pneum/pneum.c
 delete mode 100644 src/vpp-api/python/pneum/pneum.h
 delete mode 100644 src/vpp-api/python/pneum/test_pneum.c
 create mode 100644 src/vpp-api/python/vpp_papi.py
 delete mode 100644 src/vpp-api/python/vpp_papi/__init__.py
 delete mode 100644 src/vpp-api/python/vpp_papi/pneum_wrap.c
 delete mode 100644 src/vpp-api/python/vpp_papi/vpp_papi.py

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ebf94db7..f47c98a5 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,8 @@ endif
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf nasm
+DEB_DEPENDS += lcov chrpath autoconf nasm
+DEB_DEPENDS += python-dev python-virtualenv python-pip libffi6
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -49,7 +50,7 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel python-virtualenv lcov chrpath
+RPM_DEPENDS += python-devel python-virtualenv lcov chrpath libffi-devel
 RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index 7bc18ca4..7fa97888 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -162,8 +162,8 @@ do
 done
 
 # Python bindings
-mkdir -p -m755 %{buildroot}%{python2_sitelib}
-install -p -m 666 %{_mu_build_dir}/%{_vpp_install_dir}/*/lib/python2.7/site-packages/vpp_papi-*.egg %{buildroot}%{python2_sitelib}
+cd %{_mu_build_dir}/../src/vpp-api/python
+%py2_install
 
 #
 # devel
@@ -226,15 +226,9 @@ done
 sysctl --system
 %systemd_post vpp.service
 
-%post api-python
-easy_install -z %{python2_sitelib}/vpp_papi-*.egg
-
 %preun
 %systemd_preun vpp.service
 
-%preun api-python
-easy_install -mxNq vpp_papi
-
 %postun
 %systemd_postun
 
@@ -285,7 +279,7 @@ fi
 
 %files api-python
 %defattr(644,root,root)
-%{python2_sitelib}/vpp_papi-*.egg
+%{python2_sitelib}/*
 
 %files devel
 %defattr(-,bin,bin)
diff --git a/src/Makefile.am b/src/Makefile.am
index 5daaa48e..41076e0e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,6 +72,7 @@ include uri.am
 SUBDIRS += plugins
 
 if ENABLE_PAPI
+include vpp-api.am
 SUBDIRS += vpp-api/python
 endif
 
diff --git a/src/configure.ac b/src/configure.ac
index d90740d9..5e02adc1 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -201,6 +201,15 @@ AM_COND_IF([ENABLE_JAPI],
   AC_SUBST(JAR)
 ])
 
+###############################################################################
+# PYTHON
+###############################################################################
+
+AM_COND_IF([ENABLE_PAPI],
+[
+  AM_PATH_PYTHON
+])
+
 ###############################################################################
 # Output
 ###############################################################################
diff --git a/src/vpp-api.am b/src/vpp-api.am
new file mode 100644
index 00000000..0e05d60d
--- /dev/null
+++ b/src/vpp-api.am
@@ -0,0 +1,45 @@
+# Copyright (c) 2017 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# VPP API C wrapper extension
+#
+lib_LTLIBRARIES += libpneum.la
+libpneum_la_SOURCES = vpp-api/pneum/pneum.c
+libpneum_la_LIBADD = \
+  $(top_builddir)/libvppinfra.la \
+  $(top_builddir)/libvlibmemoryclient.la \
+  $(top_builddir)/libvlibapi.la \
+  $(top_builddir)/libsvm.la \
+  -lpthread -lm -lrt
+
+libpneum_la_LDFLAGS = -module
+libpneum_la_CPPFLAGS =
+
+nobase_include_HEADERS += vpp-api/pneum/pneum.h
+
+#
+# Test client
+#
+if ENABLE_TESTS
+noinst_PROGRAMS += test_pneum
+test_pneum_SOURCES = vpp-api/pneum/pneum.c vpp-api/pneum/test_pneum.c
+test_pneum_LDADD = \
+  $(top_builddir)/libvppinfra.la \
+  $(top_builddir)/libvlibmemoryclient.la \
+  $(top_builddir)/libvlibapi.la \
+  $(top_builddir)/libsvm.la \
+  -lpthread -lm -lrt
+endif
+
+# vi:syntax=automake
diff --git a/src/vpp-api/pneum/pneum.c b/src/vpp-api/pneum/pneum.c
new file mode 100644
index 00000000..cbae5cff
--- /dev/null
+++ b/src/vpp-api/pneum/pneum.c
@@ -0,0 +1,488 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <vnet/vnet.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#include <vpp/api/vpe_msg_enum.h>
+
+#include "pneum.h"
+
+/*
+ * Asynchronous mode:
+ *  Client registers a callback. All messages are sent to the callback.
+ * Synchronous mode:
+ *  Client calls blocking read().
+ *  Clients are expected to collate events on a queue.
+ *  pneum_write() -> suspends RX thread
+ *  pneum_read() -> resumes RX thread
+ */
+
+#define vl_typedefs             /* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun             /* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_endianfun
+
+vlib_main_t vlib_global_main;
+vlib_main_t **vlib_mains;
+
+typedef struct {
+  u8 connected_to_vlib;
+  pthread_t rx_thread_handle;
+  pthread_t timeout_thread_handle;
+  pthread_mutex_t queue_lock;
+  pthread_cond_t suspend_cv;
+  pthread_cond_t resume_cv;
+  pthread_mutex_t timeout_lock;
+  pthread_cond_t timeout_cv;
+  pthread_cond_t timeout_cancel_cv;
+  pthread_cond_t terminate_cv;
+} pneum_main_t;
+
+pneum_main_t pneum_main;
+pneum_callback_t pneum_callback;
+u16 read_timeout = 0;
+bool rx_is_running = false;
+
+static void
+init (void)
+{
+  pneum_main_t *pm = &pneum_main;
+  memset(pm, 0, sizeof(*pm));
+  pthread_mutex_init(&pm->queue_lock, NULL);
+  pthread_cond_init(&pm->suspend_cv, NULL);
+  pthread_cond_init(&pm->resume_cv, NULL);
+  pthread_mutex_init(&pm->timeout_lock, NULL);
+  pthread_cond_init(&pm->timeout_cv, NULL);
+  pthread_cond_init(&pm->timeout_cancel_cv, NULL);
+  pthread_cond_init(&pm->terminate_cv, NULL);
+}
+
+static void
+cleanup (void)
+{
+  pneum_main_t *pm = &pneum_main;
+  pthread_cond_destroy(&pm->suspend_cv);
+  pthread_cond_destroy(&pm->resume_cv);
+  pthread_cond_destroy(&pm->timeout_cv);
+  pthread_cond_destroy(&pm->timeout_cancel_cv);
+  pthread_cond_destroy(&pm->terminate_cv);
+  pthread_mutex_destroy(&pm->queue_lock);
+  pthread_mutex_destroy(&pm->timeout_lock);
+  memset (pm, 0, sizeof (*pm));
+}
+
+/*
+ * Satisfy external references when -lvlib is not available.
+ */
+void vlib_cli_output (struct vlib_main_t * vm, char * fmt, ...)
+{
+  clib_warning ("vlib_cli_output called...");
+}
+
+void
+pneum_free (void * msg)
+{
+  vl_msg_api_free (msg);
+}
+
+static void
+pneum_api_handler (void *msg)
+{
+  u16 id = ntohs(*((u16 *)msg));
+  msgbuf_t *msgbuf = (msgbuf_t *)(((u8 *)msg) - offsetof(msgbuf_t, data));
+  int l = ntohl(msgbuf->data_len);
+  if (l == 0)
+    clib_warning("Message ID %d has wrong length: %d\n", id, l);
+
+  /* Call Python callback */
+  ASSERT(pneum_callback);
+  (pneum_callback)(msg, l);
+  pneum_free(msg);
+}
+
+static void *
+pneum_rx_thread_fn (void *arg)
+{
+  unix_shared_memory_queue_t *q;
+  pneum_main_t *pm = &pneum_main;
+  api_main_t *am = &api_main;
+  uword msg;
+
+  q = am->vl_input_queue;
+
+  while (1)
+    while (!unix_shared_memory_queue_sub(q, (u8 *)&msg, 0))
+      {
+	u16 id = ntohs(*((u16 *)msg));
+	switch (id) {
+	case VL_API_RX_THREAD_EXIT:
+	  vl_msg_api_free((void *) msg);
+	  /* signal waiting threads that this thread is about to terminate */
+	  pthread_mutex_lock(&pm->queue_lock);
+	  pthread_cond_signal(&pm->terminate_cv);
+	  pthread_mutex_unlock(&pm->queue_lock);
+	  pthread_exit(0);
+	  return 0;
+	  break;
+
+	case VL_API_MEMCLNT_RX_THREAD_SUSPEND:
+	  vl_msg_api_free((void * )msg);
+	  /* Suspend thread and signal reader */
+	  pthread_mutex_lock(&pm->queue_lock);
+	  pthread_cond_signal(&pm->suspend_cv);
+	  /* Wait for the resume signal */
+	  pthread_cond_wait (&pm->resume_cv, &pm->queue_lock);
+	  pthread_mutex_unlock(&pm->queue_lock);
+	  break;
+
+	case VL_API_MEMCLNT_READ_TIMEOUT:
+	  clib_warning("Received read timeout in async thread\n");
+	  vl_msg_api_free((void *) msg);
+	  break;
+
+	default:
+	  pneum_api_handler((void *)msg);
+	}
+      }
+}
+
+static void *
+pneum_timeout_thread_fn (void *arg)
+{
+  vl_api_memclnt_read_timeout_t *ep;
+  pneum_main_t *pm = &pneum_main;
+  api_main_t *am = &api_main;
+  struct timespec ts;
+  struct timeval tv;
+  u16 timeout;
+  int rv;
+
+  while (1)
+    {
+      /* Wait for poke */
+      pthread_mutex_lock(&pm->timeout_lock);
+      pthread_cond_wait (&pm->timeout_cv, &pm->timeout_lock);
+      timeout = read_timeout;
+      gettimeofday(&tv, NULL);
+      ts.tv_sec = tv.tv_sec + timeout;
+      ts.tv_nsec = 0;
+      rv = pthread_cond_timedwait (&pm->timeout_cancel_cv,
+				   &pm->timeout_lock, &ts);
+      pthread_mutex_unlock(&pm->timeout_lock);
+      if (rv == ETIMEDOUT)
+	{
+	  ep = vl_msg_api_alloc (sizeof (*ep));
+	  ep->_vl_msg_id = ntohs(VL_API_MEMCLNT_READ_TIMEOUT);
+	  vl_msg_api_send_shmem(am->vl_input_queue, (u8 *)&ep);
+	}
+    }
+  pthread_exit(0);
+}
+
+void
+pneum_rx_suspend (void)
+{
+  api_main_t *am = &api_main;
+  pneum_main_t *pm = &pneum_main;
+  vl_api_memclnt_rx_thread_suspend_t *ep;
+
+  if (!pm->rx_thread_handle) return;
+  pthread_mutex_lock(&pm->queue_lock);
+  if (rx_is_running)
+    {
+      ep = vl_msg_api_alloc (sizeof (*ep));
+      ep->_vl_msg_id = ntohs(VL_API_MEMCLNT_RX_THREAD_SUSPEND);
+      vl_msg_api_send_shmem(am->vl_input_queue, (u8 *)&ep);
+      /* Wait for RX thread to tell us it has suspendend */
+      pthread_cond_wait(&pm->suspend_cv, &pm->queue_lock);
+      rx_is_running = false;
+    }
+  pthread_mutex_unlock(&pm->queue_lock);
+}
+
+void
+pneum_rx_resume (void)
+{
+  pneum_main_t *pm = &pneum_main;
+  if (!pm->rx_thread_handle) return;
+  pthread_mutex_lock(&pm->queue_lock);
+  if (rx_is_running) return;
+  pthread_cond_signal(&pm->resume_cv);
+  rx_is_running = true;
+  pthread_mutex_unlock(&pm->queue_lock);
+}
+
+static uword *
+pneum_msg_table_get_hash (void)
+{
+  api_main_t *am = &api_main;
+  return (am->msg_index_by_name_and_crc);
+}
+
+int
+pneum_msg_table_size(void)
+{
+  api_main_t *am = &api_main;
+  return hash_elts(am->msg_index_by_name_and_crc);
+}
+
+int
+pneum_connect (char * name, char * chroot_prefix, pneum_callback_t cb,
+               int rx_qlen)
+{
+  int rv = 0;
+  pneum_main_t *pm = &pneum_main;
+
+  init();
+  if (chroot_prefix != NULL)
+    vl_set_memory_root_path (chroot_prefix);
+
+  if ((rv = vl_client_api_map("/vpe-api"))) {
+    clib_warning ("vl_client_api map rv %d", rv);
+    return rv;
+  }
+
+  if (vl_client_connect(name, 0, rx_qlen) < 0) {
+    vl_client_api_unmap();
+    return (-1);
+  }
+
+  if (cb) {
+    /* Start the rx queue thread */
+    rv = pthread_create(&pm->rx_thread_handle, NULL, pneum_rx_thread_fn, 0);
+    if (rv) {
+      clib_warning("pthread_create returned %d", rv);
+      vl_client_api_unmap();
+      return (-1);
+    }
+    pneum_callback = cb;
+    rx_is_running = true;
+  }
+
+  /* Start read timeout thread */
+  rv = pthread_create(&pm->timeout_thread_handle, NULL,
+		      pneum_timeout_thread_fn, 0);
+  if (rv) {
+    clib_warning("pthread_create returned %d", rv);
+    vl_client_api_unmap();
+    return (-1);
+  }
+
+  pm->connected_to_vlib = 1;
+
+  return (0);
+}
+
+int
+pneum_disconnect (void)
+{
+  api_main_t *am = &api_main;
+  pneum_main_t *pm = &pneum_main;
+
+  if (!pm->connected_to_vlib) return 0;
+
+  if (pm->rx_thread_handle) {
+    vl_api_rx_thread_exit_t *ep;
+    uword junk;
+    ep = vl_msg_api_alloc (sizeof (*ep));
+    ep->_vl_msg_id = ntohs(VL_API_RX_THREAD_EXIT);
+    vl_msg_api_send_shmem(am->vl_input_queue, (u8 *)&ep);
+
+    /* wait (with timeout) until RX thread has finished */
+    struct timespec ts;
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    ts.tv_sec = tv.tv_sec + 5;
+    ts.tv_nsec = 0;
+    pthread_mutex_lock(&pm->queue_lock);
+    int rv = pthread_cond_timedwait(&pm->terminate_cv, &pm->queue_lock, &ts);
+    pthread_mutex_unlock(&pm->queue_lock);
+    /* now join so we wait until thread has -really- finished */
+    if (rv == ETIMEDOUT)
+      pthread_cancel(pm->rx_thread_handle);
+    else
+      pthread_join(pm->rx_thread_handle, (void **) &junk);
+  }
+  if (pm->timeout_thread_handle)
+    pthread_cancel(pm->timeout_thread_handle);
+
+  vl_client_disconnect();
+  vl_client_api_unmap();
+  pneum_callback = 0;
+
+  cleanup();
+
+  return (0);
+}
+
+static void
+set_timeout (unsigned short timeout)
+{
+  pneum_main_t *pm = &pneum_main;
+  pthread_mutex_lock(&pm->timeout_lock);
+  read_timeout = timeout;
+  pthread_cond_signal(&pm->timeout_cv);
+  pthread_mutex_unlock(&pm->timeout_lock);
+}
+
+static void
+unset_timeout (void)
+{
+  pneum_main_t *pm = &pneum_main;
+  pthread_mutex_lock(&pm->timeout_lock);
+  pthread_cond_signal(&pm->timeout_cancel_cv);
+  pthread_mutex_unlock(&pm->timeout_lock);
+}
+
+int
+pneum_read (char **p, int *l, u16 timeout)
+{
+  unix_shared_memory_queue_t *q;
+  api_main_t *am = &api_main;
+  pneum_main_t *pm = &pneum_main;
+  uword msg;
+  msgbuf_t *msgbuf;
+
+  if (!pm->connected_to_vlib) return -1;
+
+  *l = 0;
+
+  if (am->our_pid == 0) return (-1);
+
+  /* Poke timeout thread */
+  if (timeout)
+    set_timeout(timeout);
+
+  q = am->vl_input_queue;
+  int rv = unix_shared_memory_queue_sub(q, (u8 *)&msg, 0);
+  if (rv == 0) {
+    u16 msg_id = ntohs(*((u16 *)msg));
+    switch (msg_id) {
+    case VL_API_RX_THREAD_EXIT:
+      printf("Received thread exit\n");
+      return -1;
+    case VL_API_MEMCLNT_RX_THREAD_SUSPEND:
+      printf("Received thread suspend\n");
+      goto error;
+    case VL_API_MEMCLNT_READ_TIMEOUT:
+      printf("Received read timeout %ds\n", timeout);
+      goto error;
+
+    default:
+      msgbuf = (msgbuf_t *)(((u8 *)msg) - offsetof(msgbuf_t, data));
+      *l = ntohl(msgbuf->data_len);
+      if (*l == 0) {
+	printf("Unregistered API message: %d\n", msg_id);
+	goto error;
+      }
+    }
+    *p = (char *)msg;
+
+    /* Let timeout notification thread know we're done */
+    unset_timeout();
+
+  } else {
+    printf("Read failed with %d\n", rv);
+  }
+  return (rv);
+
+ error:
+  vl_msg_api_free((void *) msg);
+  /* Client might forget to resume RX thread on failure */
+  pneum_rx_resume ();
+  return -1;
+}
+
+/*
+ * XXX: Makes the assumption that client_index is the first member
+ */
+typedef VL_API_PACKED(struct _vl_api_header {
+  u16 _vl_msg_id;
+  u32 client_index;
+}) vl_api_header_t;
+
+static unsigned int
+pneum_client_index (void)
+{
+  return (api_main.my_client_index);
+}
+
+int
+pneum_write (char *p, int l)
+{
+  int rv = -1;
+  api_main_t *am = &api_main;
+  vl_api_header_t *mp = vl_msg_api_alloc(l);
+  unix_shared_memory_queue_t *q;
+  pneum_main_t *pm = &pneum_main;
+
+  if (!pm->connected_to_vlib) return -1;
+  if (!mp) return (-1);
+
+  memcpy(mp, p, l);
+  mp->client_index = pneum_client_index();
+  q = am->shmem_hdr->vl_input_queue;
+  rv = unix_shared_memory_queue_add(q, (u8 *)&mp, 0);
+  if (rv != 0) {
+    clib_warning("vpe_api_write fails: %d\n", rv);
+    /* Clear message */
+    pneum_free(mp);
+  }
+  return (rv);
+}
+
+int
+pneum_get_msg_index (unsigned char * name)
+{
+  return vl_api_get_msg_index (name);
+}
+
+int
+pneum_msg_table_max_index(void)
+{
+  int max = 0;
+  hash_pair_t *hp;
+  uword *h = pneum_msg_table_get_hash();
+  hash_foreach_pair (hp, h,
+  ({
+    if (hp->value[0] > max)
+      max = hp->value[0];
+  }));
+
+  return max;
+}
+
+void
+pneum_set_error_handler (pneum_error_callback_t cb)
+{
+  if (cb) clib_error_register_handler (cb, 0);
+}
diff --git a/src/vpp-api/pneum/pneum.h b/src/vpp-api/pneum/pneum.h
new file mode 100644
index 00000000..669298df
--- /dev/null
+++ b/src/vpp-api/pneum/pneum.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_pneum_h
+#define included_pneum_h
+
+#include <stdint.h>
+#include <vppinfra/types.h>
+
+typedef void (*pneum_callback_t)(unsigned char * data, int len);
+typedef void (*pneum_error_callback_t)(void *, unsigned char *, int);
+int pneum_connect(char * name, char * chroot_prefix, pneum_callback_t cb,
+    int rx_qlen);
+int pneum_disconnect(void);
+int pneum_read(char **data, int *l, unsigned short timeout);
+int pneum_write(char *data, int len);
+void pneum_free(void * msg);
+
+int pneum_get_msg_index(unsigned char * name);
+int pneum_msg_table_size(void);
+int pneum_msg_table_max_index(void);
+
+void pneum_rx_suspend (void);
+void pneum_rx_resume (void);
+void pneum_set_error_handler(pneum_error_callback_t);
+#endif
diff --git a/src/vpp-api/pneum/test_pneum.c b/src/vpp-api/pneum/test_pneum.c
new file mode 100644
index 00000000..334e58e9
--- /dev/null
+++ b/src/vpp-api/pneum/test_pneum.c
@@ -0,0 +1,143 @@
+/*
+ *------------------------------------------------------------------
+ * test_pneum.c
+ * 
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. 
+ *------------------------------------------------------------------
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <netdb.h>
+
+#include <time.h>       /* time_t, time (for timestamp in second) */
+#include <sys/timeb.h>  /* ftime, timeb (for timestamp in millisecond) */
+#include <sys/time.h>   /* gettimeofday, timeval (for timestamp in microsecond) */
+
+#include <vnet/vnet.h>
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vnet/ip/ip.h>
+
+#include <vpp/api/vpe_msg_enum.h>
+#include <signal.h>
+#include <setjmp.h>
+#include "pneum.h"
+
+#define vl_typedefs             /* define message structures */
+#include <vpp/api/vpe_all_api_h.h> 
+#undef vl_typedefs
+
+/* we are not linking with vlib */
+vlib_main_t vlib_global_main;
+vlib_main_t **vlib_mains;
+
+volatile int sigterm_received = 0;
+volatile u32 result_ready;
+volatile u16 result_msg_id;
+
+/* M_NOALLOC: construct, but don't yet send a message */
+
+#define M_NOALLOC(T,t)                          \
+  do {						\
+    result_ready = 0;                           \
+    memset (mp, 0, sizeof (*mp));		\
+    mp->_vl_msg_id = ntohs (VL_API_##T);	\
+    mp->client_index = am->my_client_index;	\
+  } while(0);
+
+
+
+int
+wrap_pneum_callback (char *data, int len)
+{
+  //printf("Callback %d\n", len);
+  result_ready = 1;
+  result_msg_id = ntohs(*((u16 *)data));
+  return (0);
+}
+
+int main (int argc, char ** argv)
+{
+  api_main_t * am = &api_main;
+  vl_api_show_version_t message;
+  vl_api_show_version_t *mp;
+  int async = 1;
+  int rv = pneum_connect("pneum_client", NULL, NULL, 32 /* rx queue-length*/);
+
+  if (rv != 0) {
+    printf("Connect failed: %d\n", rv);
+    exit(rv);
+  }
+ 
+ struct timeb timer_msec;
+  long long int timestamp_msec_start; /* timestamp in millisecond. */
+  if (!ftime(&timer_msec)) {
+    timestamp_msec_start = ((long long int) timer_msec.time) * 1000ll + 
+      (long long int) timer_msec.millitm;
+  }
+  else {
+    timestamp_msec_start = -1;
+  }
+
+ 
+  /*
+   * Test vpe_api_write and vpe_api_read to send and recv message for an
+   * API 
+   */
+  int i;
+  long int no_msgs = 10000;
+  mp = &message;
+
+  for (i = 0; i < no_msgs; i++) {
+    /* Construct the API message */
+    M_NOALLOC(SHOW_VERSION, show_version);
+    pneum_write((char *)mp, sizeof(*mp));
+#ifndef __COVERITY__
+    /* As given, async is always 1. Shut up Coverity about it */
+    if (!async)
+      while (result_ready == 0);
+#endif
+  }
+  if (async) {
+    vl_api_control_ping_t control;
+    vl_api_control_ping_t *mp;
+    mp = &control;
+    M_NOALLOC(CONTROL_PING, control_ping);
+    pneum_write((char *)mp, sizeof(*mp));
+
+    while (result_msg_id != VL_API_CONTROL_PING_REPLY);
+  }
+
+  long long int timestamp_msec_end; /* timestamp in millisecond. */
+  if (!ftime(&timer_msec)) {
+    timestamp_msec_end = ((long long int) timer_msec.time) * 1000ll + 
+      (long long int) timer_msec.millitm;
+  }
+  else {
+    timestamp_msec_end = -1;
+  }
+  
+  printf("Took %lld msec, %lld msgs/msec \n", (timestamp_msec_end - timestamp_msec_start),
+	 no_msgs/(timestamp_msec_end - timestamp_msec_start));
+  fformat(stdout, "Exiting...\n");
+  pneum_disconnect();
+  exit (0);
+}
diff --git a/src/vpp-api/python/Makefile.am b/src/vpp-api/python/Makefile.am
index 54076822..6f5beb69 100644
--- a/src/vpp-api/python/Makefile.am
+++ b/src/vpp-api/python/Makefile.am
@@ -11,52 +11,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I m4
-AM_LIBTOOLFLAGS = --quiet
-AM_CFLAGS = -Wall -I${top_srcdir} -I${top_builddir}
-
-BUILT_SOURCES =
-bin_PROGRAMS =
-CLEANFILES =
-lib_LTLIBRARIES =
-noinst_PROGRAMS =
-nobase_include_HEADERS = pneum/pneum.h
-
-#
-# Python / C extension
-#
-lib_LTLIBRARIES += libpneum.la
-libpneum_la_SOURCES = pneum/pneum.c
-libpneum_la_LIBADD = \
-  $(top_builddir)/libvppinfra.la \
-  $(top_builddir)/libvlibmemoryclient.la \
-  $(top_builddir)/libvlibapi.la \
-  $(top_builddir)/libsvm.la \
-  -lpthread -lm -lrt
-
-libpneum_la_LDFLAGS = -module
-libpneum_la_CPPFLAGS =
-
-# TODO: Support both Python 2 and 3.
-install-exec-local: $(lib_LTLIBRARIES)
-	cd $(srcdir);							\
-	mkdir -p $(pythondir);						\
-	mkdir -p $(pyexecdir); 						\
-	PYTHONUSERBASE=$(prefix)					\
-	python setup.py build_ext -L $(libdir)				\
-	-I $(prefix)/include/ install --user
-
-#
-# Test client
-#
-if ENABLE_TESTS
-noinst_PROGRAMS += test_pneum
-test_pneum_SOURCES = pneum/pneum.c pneum/test_pneum.c
-test_pneum_LDADD = \
-  $(top_builddir)/libvppinfra.la \
-  $(top_builddir)/libvlibmemoryclient.la \
-  $(top_builddir)/libvlibapi.la \
-  $(top_builddir)/libsvm.la \
-  -lpthread -lm -lrt
-endif
+install-exec-local:
+	(cd $(srcdir) ; $(PYTHON) $(srcdir)/setup.py build              \
+	--build-base $(shell readlink -f $(builddir))/build             \
+	install                                                         \
+	--root /                                                        \
+	--prefix $(DESTDIR)$(prefix)                                    \
+	--single-version-externally-managed                             \
+	--verbose)
diff --git a/src/vpp-api/python/pneum/pneum.c b/src/vpp-api/python/pneum/pneum.c
deleted file mode 100644
index da9d69df..00000000
--- a/src/vpp-api/python/pneum/pneum.c
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <signal.h>
-#include <stdbool.h>
-#include <vnet/vnet.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-
-#include <vpp/api/vpe_msg_enum.h>
-
-#include "pneum.h"
-
-/*
- * Asynchronous mode:
- *  Client registers a callback. All messages are sent to the callback.
- * Synchronous mode:
- *  Client calls blocking read().
- *  Clients are expected to collate events on a queue.
- *  pneum_write() -> suspends RX thread
- *  pneum_read() -> resumes RX thread
- */
-
-#define vl_typedefs             /* define message structures */
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun             /* define message structures */
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-vlib_main_t vlib_global_main;
-vlib_main_t **vlib_mains;
-
-typedef struct {
-  u8 connected_to_vlib;
-  pthread_t rx_thread_handle;
-  pthread_t timeout_thread_handle;
-  pthread_mutex_t queue_lock;
-  pthread_cond_t suspend_cv;
-  pthread_cond_t resume_cv;
-  pthread_mutex_t timeout_lock;
-  pthread_cond_t timeout_cv;
-  pthread_cond_t timeout_cancel_cv;
-  pthread_cond_t terminate_cv;
-} pneum_main_t;
-
-pneum_main_t pneum_main;
-pneum_callback_t pneum_callback;
-u16 read_timeout = 0;
-bool rx_is_running = false;
-
-static void
-init (void)
-{
-  pneum_main_t *pm = &pneum_main;
-  memset(pm, 0, sizeof(*pm));
-  pthread_mutex_init(&pm->queue_lock, NULL);
-  pthread_cond_init(&pm->suspend_cv, NULL);
-  pthread_cond_init(&pm->resume_cv, NULL);
-  pthread_mutex_init(&pm->timeout_lock, NULL);
-  pthread_cond_init(&pm->timeout_cv, NULL);
-  pthread_cond_init(&pm->timeout_cancel_cv, NULL);
-  pthread_cond_init(&pm->terminate_cv, NULL);
-}
-
-static void
-cleanup (void)
-{
-  pneum_main_t *pm = &pneum_main;
-  pthread_cond_destroy(&pm->suspend_cv);
-  pthread_cond_destroy(&pm->resume_cv);
-  pthread_cond_destroy(&pm->timeout_cv);
-  pthread_cond_destroy(&pm->timeout_cancel_cv);
-  pthread_cond_destroy(&pm->terminate_cv);
-  pthread_mutex_destroy(&pm->queue_lock);
-  pthread_mutex_destroy(&pm->timeout_lock);
-  memset (pm, 0, sizeof (*pm));
-}
-
-/*
- * Satisfy external references when -lvlib is not available.
- */
-void vlib_cli_output (struct vlib_main_t * vm, char * fmt, ...)
-{
-  clib_warning ("vlib_cli_output called...");
-}
-
-void
-pneum_free (void * msg)
-{
-  vl_msg_api_free (msg);
-}
-
-static void
-pneum_api_handler (void *msg)
-{
-  u16 id = ntohs(*((u16 *)msg));
-  msgbuf_t *msgbuf = (msgbuf_t *)(((u8 *)msg) - offsetof(msgbuf_t, data));
-  int l = ntohl(msgbuf->data_len);
-  if (l == 0)
-    clib_warning("Message ID %d has wrong length: %d\n", id, l);
-
-  /* Call Python callback */
-  ASSERT(pneum_callback);
-  (pneum_callback)(msg, l);
-  pneum_free(msg);
-}
-
-static void *
-pneum_rx_thread_fn (void *arg)
-{
-  unix_shared_memory_queue_t *q;
-  pneum_main_t *pm = &pneum_main;
-  api_main_t *am = &api_main;
-  uword msg;
-
-  q = am->vl_input_queue;
-
-  while (1)
-    while (!unix_shared_memory_queue_sub(q, (u8 *)&msg, 0))
-      {
-	u16 id = ntohs(*((u16 *)msg));
-	switch (id) {
-	case VL_API_RX_THREAD_EXIT:
-	  vl_msg_api_free((void *) msg);
-	  /* signal waiting threads that this thread is about to terminate */
-	  pthread_mutex_lock(&pm->queue_lock);
-	  pthread_cond_signal(&pm->terminate_cv);
-	  pthread_mutex_unlock(&pm->queue_lock);
-	  pthread_exit(0);
-	  return 0;
-	  break;
-
-	case VL_API_MEMCLNT_RX_THREAD_SUSPEND:
-	  vl_msg_api_free((void * )msg);
-	  /* Suspend thread and signal reader */
-	  pthread_mutex_lock(&pm->queue_lock);
-	  pthread_cond_signal(&pm->suspend_cv);
-	  /* Wait for the resume signal */
-	  pthread_cond_wait (&pm->resume_cv, &pm->queue_lock);
-	  pthread_mutex_unlock(&pm->queue_lock);
-	  break;
-
-	case VL_API_MEMCLNT_READ_TIMEOUT:
-	  clib_warning("Received read timeout in async thread\n");
-	  vl_msg_api_free((void *) msg);
-	  break;
-
-	default:
-	  pneum_api_handler((void *)msg);
-	}
-      }
-}
-
-static void *
-pneum_timeout_thread_fn (void *arg)
-{
-  vl_api_memclnt_read_timeout_t *ep;
-  pneum_main_t *pm = &pneum_main;
-  api_main_t *am = &api_main;
-  struct timespec ts;
-  struct timeval tv;
-  u16 timeout;
-  int rv;
-
-  while (1)
-    {
-      /* Wait for poke */
-      pthread_mutex_lock(&pm->timeout_lock);
-      pthread_cond_wait (&pm->timeout_cv, &pm->timeout_lock);
-      timeout = read_timeout;
-      gettimeofday(&tv, NULL);
-      ts.tv_sec = tv.tv_sec + timeout;
-      ts.tv_nsec = 0;
-      rv = pthread_cond_timedwait (&pm->timeout_cancel_cv,
-				   &pm->timeout_lock, &ts);
-      pthread_mutex_unlock(&pm->timeout_lock);
-      if (rv == ETIMEDOUT)
-	{
-	  ep = vl_msg_api_alloc (sizeof (*ep));
-	  ep->_vl_msg_id = ntohs(VL_API_MEMCLNT_READ_TIMEOUT);
-	  vl_msg_api_send_shmem(am->vl_input_queue, (u8 *)&ep);
-	}
-    }
-  pthread_exit(0);
-}
-
-void
-pneum_rx_suspend (void)
-{
-  api_main_t *am = &api_main;
-  pneum_main_t *pm = &pneum_main;
-  vl_api_memclnt_rx_thread_suspend_t *ep;
-
-  if (!pm->rx_thread_handle) return;
-  pthread_mutex_lock(&pm->queue_lock);
-  if (rx_is_running)
-    {
-      ep = vl_msg_api_alloc (sizeof (*ep));
-      ep->_vl_msg_id = ntohs(VL_API_MEMCLNT_RX_THREAD_SUSPEND);
-      vl_msg_api_send_shmem(am->vl_input_queue, (u8 *)&ep);
-      /* Wait for RX thread to tell us it has suspendend */
-      pthread_cond_wait(&pm->suspend_cv, &pm->queue_lock);
-      rx_is_running = false;
-    }
-  pthread_mutex_unlock(&pm->queue_lock);
-}
-
-void
-pneum_rx_resume (void)
-{
-  pneum_main_t *pm = &pneum_main;
-  if (!pm->rx_thread_handle) return;
-  pthread_mutex_lock(&pm->queue_lock);
-  if (rx_is_running) return;
-  pthread_cond_signal(&pm->resume_cv);
-  rx_is_running = true;
-  pthread_mutex_unlock(&pm->queue_lock);
-}
-
-uword *
-pneum_msg_table_get_hash (void)
-{
-  api_main_t *am = &api_main;
-  return (am->msg_index_by_name_and_crc);
-}
-
-int
-pneum_msg_table_size(void)
-{
-  api_main_t *am = &api_main;
-  return hash_elts(am->msg_index_by_name_and_crc);
-}
-
-int
-pneum_connect (char * name, char * chroot_prefix, pneum_callback_t cb,
-               int rx_qlen)
-{
-  int rv = 0;
-  pneum_main_t *pm = &pneum_main;
-
-  init();
-  if (chroot_prefix != NULL)
-    vl_set_memory_root_path (chroot_prefix);
-
-  if ((rv = vl_client_api_map("/vpe-api"))) {
-    clib_warning ("vl_client_api map rv %d", rv);
-    return rv;
-  }
-
-  if (vl_client_connect(name, 0, rx_qlen) < 0) {
-    vl_client_api_unmap();
-    return (-1);
-  }
-
-  if (cb) {
-    /* Start the rx queue thread */
-    rv = pthread_create(&pm->rx_thread_handle, NULL, pneum_rx_thread_fn, 0);
-    if (rv) {
-      clib_warning("pthread_create returned %d", rv);
-      vl_client_api_unmap();
-      return (-1);
-    }
-    pneum_callback = cb;
-    rx_is_running = true;
-  }
-
-  /* Start read timeout thread */
-  rv = pthread_create(&pm->timeout_thread_handle, NULL,
-		      pneum_timeout_thread_fn, 0);
-  if (rv) {
-    clib_warning("pthread_create returned %d", rv);
-    vl_client_api_unmap();
-    return (-1);
-  }
-
-  pm->connected_to_vlib = 1;
-
-  return (0);
-}
-
-int
-pneum_disconnect (void)
-{
-  api_main_t *am = &api_main;
-  pneum_main_t *pm = &pneum_main;
-
-  if (!pm->connected_to_vlib) return 0;
-
-  if (pm->rx_thread_handle) {
-    vl_api_rx_thread_exit_t *ep;
-    uword junk;
-    ep = vl_msg_api_alloc (sizeof (*ep));
-    ep->_vl_msg_id = ntohs(VL_API_RX_THREAD_EXIT);
-    vl_msg_api_send_shmem(am->vl_input_queue, (u8 *)&ep);
-
-    /* wait (with timeout) until RX thread has finished */
-    struct timespec ts;
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    ts.tv_sec = tv.tv_sec + 5;
-    ts.tv_nsec = 0;
-    pthread_mutex_lock(&pm->queue_lock);
-    int rv = pthread_cond_timedwait(&pm->terminate_cv, &pm->queue_lock, &ts);
-    pthread_mutex_unlock(&pm->queue_lock);
-    /* now join so we wait until thread has -really- finished */
-    if (rv == ETIMEDOUT)
-      pthread_cancel(pm->rx_thread_handle);
-    else
-      pthread_join(pm->rx_thread_handle, (void **) &junk);
-  }
-  if (pm->timeout_thread_handle)
-    pthread_cancel(pm->timeout_thread_handle);
-
-  vl_client_disconnect();
-  vl_client_api_unmap();
-  pneum_callback = 0;
-
-  cleanup();
-
-  return (0);
-}
-
-static void
-set_timeout (unsigned short timeout)
-{
-  pneum_main_t *pm = &pneum_main;
-  pthread_mutex_lock(&pm->timeout_lock);
-  read_timeout = timeout;
-  pthread_cond_signal(&pm->timeout_cv);
-  pthread_mutex_unlock(&pm->timeout_lock);
-}
-
-static void
-unset_timeout (void)
-{
-  pneum_main_t *pm = &pneum_main;
-  pthread_mutex_lock(&pm->timeout_lock);
-  pthread_cond_signal(&pm->timeout_cancel_cv);
-  pthread_mutex_unlock(&pm->timeout_lock);
-}
-
-int
-pneum_read (char **p, int *l, u16 timeout)
-{
-  unix_shared_memory_queue_t *q;
-  api_main_t *am = &api_main;
-  pneum_main_t *pm = &pneum_main;
-  uword msg;
-  msgbuf_t *msgbuf;
-
-  if (!pm->connected_to_vlib) return -1;
-
-  *l = 0;
-
-  if (am->our_pid == 0) return (-1);
-
-  /* Poke timeout thread */
-  if (timeout)
-    set_timeout(timeout);
-
-  q = am->vl_input_queue;
-  int rv = unix_shared_memory_queue_sub(q, (u8 *)&msg, 0);
-  if (rv == 0) {
-    u16 msg_id = ntohs(*((u16 *)msg));
-    switch (msg_id) {
-    case VL_API_RX_THREAD_EXIT:
-      printf("Received thread exit\n");
-      return -1;
-    case VL_API_MEMCLNT_RX_THREAD_SUSPEND:
-      printf("Received thread suspend\n");
-      goto error;
-    case VL_API_MEMCLNT_READ_TIMEOUT:
-      printf("Received read timeout %ds\n", timeout);
-      goto error;
-
-    default:
-      msgbuf = (msgbuf_t *)(((u8 *)msg) - offsetof(msgbuf_t, data));
-      *l = ntohl(msgbuf->data_len);
-      if (*l == 0) {
-	printf("Unregistered API message: %d\n", msg_id);
-	goto error;
-      }
-    }
-    *p = (char *)msg;
-
-    /* Let timeout notification thread know we're done */
-    unset_timeout();
-
-  } else {
-    printf("Read failed with %d\n", rv);
-  }
-  return (rv);
-
- error:
-  vl_msg_api_free((void *) msg);
-  /* Client might forget to resume RX thread on failure */
-  pneum_rx_resume ();
-  return -1;
-}
-
-/*
- * XXX: Makes the assumption that client_index is the first member
- */
-typedef VL_API_PACKED(struct _vl_api_header {
-  u16 _vl_msg_id;
-  u32 client_index;
-}) vl_api_header_t;
-
-static unsigned int
-pneum_client_index (void)
-{
-  return (api_main.my_client_index);
-}
-
-int
-pneum_write (char *p, int l)
-{
-  int rv = -1;
-  api_main_t *am = &api_main;
-  vl_api_header_t *mp = vl_msg_api_alloc(l);
-  unix_shared_memory_queue_t *q;
-  pneum_main_t *pm = &pneum_main;
-
-  if (!pm->connected_to_vlib) return -1;
-  if (!mp) return (-1);
-
-  memcpy(mp, p, l);
-  mp->client_index = pneum_client_index();
-  q = am->shmem_hdr->vl_input_queue;
-  rv = unix_shared_memory_queue_add(q, (u8 *)&mp, 0);
-  if (rv != 0) {
-    clib_warning("vpe_api_write fails: %d\n", rv);
-    /* Clear message */
-    pneum_free(mp);
-  }
-  return (rv);
-}
-
-uint32_t
-pneum_get_msg_index (unsigned char * name)
-{
-  return vl_api_get_msg_index (name);
-}
diff --git a/src/vpp-api/python/pneum/pneum.h b/src/vpp-api/python/pneum/pneum.h
deleted file mode 100644
index c4b55ae0..00000000
--- a/src/vpp-api/python/pneum/pneum.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_pneum_h
-#define included_pneum_h
-
-#include <stdint.h>
-#include <vppinfra/types.h>
-
-typedef void (*pneum_callback_t)(unsigned char * data, int len);
-int pneum_connect(char * name, char * chroot_prefix, pneum_callback_t cb,
-    int rx_qlen);
-int pneum_disconnect(void);
-int pneum_read(char **data, int *l, unsigned short timeout);
-int pneum_write(char *data, int len);
-void pneum_free(void * msg);
-uword * pneum_msg_table_get_hash (void);
-int pneum_msg_table_size(void);
-uint32_t pneum_get_msg_index(unsigned char * name);
-void pneum_rx_suspend (void);
-void pneum_rx_resume (void);
-
-#endif
diff --git a/src/vpp-api/python/pneum/test_pneum.c b/src/vpp-api/python/pneum/test_pneum.c
deleted file mode 100644
index 334e58e9..00000000
--- a/src/vpp-api/python/pneum/test_pneum.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *------------------------------------------------------------------
- * test_pneum.c
- * 
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License. 
- *------------------------------------------------------------------
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <netdb.h>
-
-#include <time.h>       /* time_t, time (for timestamp in second) */
-#include <sys/timeb.h>  /* ftime, timeb (for timestamp in millisecond) */
-#include <sys/time.h>   /* gettimeofday, timeval (for timestamp in microsecond) */
-
-#include <vnet/vnet.h>
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibapi/api.h>
-#include <vlibmemory/api.h>
-#include <vnet/ip/ip.h>
-
-#include <vpp/api/vpe_msg_enum.h>
-#include <signal.h>
-#include <setjmp.h>
-#include "pneum.h"
-
-#define vl_typedefs             /* define message structures */
-#include <vpp/api/vpe_all_api_h.h> 
-#undef vl_typedefs
-
-/* we are not linking with vlib */
-vlib_main_t vlib_global_main;
-vlib_main_t **vlib_mains;
-
-volatile int sigterm_received = 0;
-volatile u32 result_ready;
-volatile u16 result_msg_id;
-
-/* M_NOALLOC: construct, but don't yet send a message */
-
-#define M_NOALLOC(T,t)                          \
-  do {						\
-    result_ready = 0;                           \
-    memset (mp, 0, sizeof (*mp));		\
-    mp->_vl_msg_id = ntohs (VL_API_##T);	\
-    mp->client_index = am->my_client_index;	\
-  } while(0);
-
-
-
-int
-wrap_pneum_callback (char *data, int len)
-{
-  //printf("Callback %d\n", len);
-  result_ready = 1;
-  result_msg_id = ntohs(*((u16 *)data));
-  return (0);
-}
-
-int main (int argc, char ** argv)
-{
-  api_main_t * am = &api_main;
-  vl_api_show_version_t message;
-  vl_api_show_version_t *mp;
-  int async = 1;
-  int rv = pneum_connect("pneum_client", NULL, NULL, 32 /* rx queue-length*/);
-
-  if (rv != 0) {
-    printf("Connect failed: %d\n", rv);
-    exit(rv);
-  }
- 
- struct timeb timer_msec;
-  long long int timestamp_msec_start; /* timestamp in millisecond. */
-  if (!ftime(&timer_msec)) {
-    timestamp_msec_start = ((long long int) timer_msec.time) * 1000ll + 
-      (long long int) timer_msec.millitm;
-  }
-  else {
-    timestamp_msec_start = -1;
-  }
-
- 
-  /*
-   * Test vpe_api_write and vpe_api_read to send and recv message for an
-   * API 
-   */
-  int i;
-  long int no_msgs = 10000;
-  mp = &message;
-
-  for (i = 0; i < no_msgs; i++) {
-    /* Construct the API message */
-    M_NOALLOC(SHOW_VERSION, show_version);
-    pneum_write((char *)mp, sizeof(*mp));
-#ifndef __COVERITY__
-    /* As given, async is always 1. Shut up Coverity about it */
-    if (!async)
-      while (result_ready == 0);
-#endif
-  }
-  if (async) {
-    vl_api_control_ping_t control;
-    vl_api_control_ping_t *mp;
-    mp = &control;
-    M_NOALLOC(CONTROL_PING, control_ping);
-    pneum_write((char *)mp, sizeof(*mp));
-
-    while (result_msg_id != VL_API_CONTROL_PING_REPLY);
-  }
-
-  long long int timestamp_msec_end; /* timestamp in millisecond. */
-  if (!ftime(&timer_msec)) {
-    timestamp_msec_end = ((long long int) timer_msec.time) * 1000ll + 
-      (long long int) timer_msec.millitm;
-  }
-  else {
-    timestamp_msec_end = -1;
-  }
-  
-  printf("Took %lld msec, %lld msgs/msec \n", (timestamp_msec_end - timestamp_msec_start),
-	 no_msgs/(timestamp_msec_end - timestamp_msec_start));
-  fformat(stdout, "Exiting...\n");
-  pneum_disconnect();
-  exit (0);
-}
diff --git a/src/vpp-api/python/setup.cfg b/src/vpp-api/python/setup.cfg
index d645be77..79bc6784 100644
--- a/src/vpp-api/python/setup.cfg
+++ b/src/vpp-api/python/setup.cfg
@@ -2,4 +2,4 @@
 # This flag says that the code is written to work on both Python 2 and Python
 # 3. If at all possible, it is good practice to do this. If you cannot, you
 # will need to generate wheels for each Python version that you support.
-universal=0
+universal=1
diff --git a/src/vpp-api/python/setup.py b/src/vpp-api/python/setup.py
index 8a34d501..28c2ecce 100644
--- a/src/vpp-api/python/setup.py
+++ b/src/vpp-api/python/setup.py
@@ -13,23 +13,18 @@
 # limitations under the License.
 
 try:
-    from setuptools import setup, Extension
+    from setuptools import setup
 except ImportError:
-    from distutils.core import setup, Extension
+    from distutils.core import setup
 
 setup (name = 'vpp_papi',
-       version = '1.3',
+       version = '1.4',
        description = 'VPP Python binding',
        author = 'Ole Troan',
        author_email = 'ot@cisco.com',
        test_suite = 'tests',
-       packages=['vpp_papi'],
-       ext_modules = [
-           Extension(
-               'vpp_api',
-               sources = ['vpp_papi/pneum_wrap.c'],
-               libraries = ['pneum'],
-           )],
+       install_requires=['cffi'],
+       py_modules=['vpp_papi'],
        long_description = '''VPP Python language binding.''',
        zip_safe = True,
 )
diff --git a/src/vpp-api/python/vpp_papi.py b/src/vpp-api/python/vpp_papi.py
new file mode 100644
index 00000000..81f6903b
--- /dev/null
+++ b/src/vpp-api/python/vpp_papi.py
@@ -0,0 +1,635 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+from __future__ import print_function
+import sys, os, logging, collections, struct, json, threading, glob
+import atexit, Queue
+
+from cffi import FFI
+ffi = FFI()
+ffi.cdef("""
+typedef void (*pneum_callback_t)(unsigned char * data, int len);
+typedef void (*pneum_error_callback_t)(void *, unsigned char *, int);
+int pneum_connect(char * name, char * chroot_prefix, pneum_callback_t cb,
+    int rx_qlen);
+int pneum_disconnect(void);
+int pneum_read(char **data, int *l, unsigned short timeout);
+int pneum_write(char *data, int len);
+void pneum_free(void * msg);
+
+int pneum_get_msg_index(unsigned char * name);
+int pneum_msg_table_size(void);
+int pneum_msg_table_max_index(void);
+
+void pneum_rx_suspend (void);
+void pneum_rx_resume (void);
+void pneum_set_error_handler(pneum_error_callback_t);
+ """)
+
+# Barfs on failure, no need to check success.
+vpp_api = ffi.dlopen('libpneum.so')
+
+def vpp_atexit(self):
+    """Clean up VPP connection on shutdown."""
+    if self.connected:
+        self.logger.debug('Cleaning up VPP on exit')
+        self.disconnect()
+
+vpp_object = None
+
+@ffi.callback("void(unsigned char *, int)")
+def pneum_callback_sync(data, len):
+    vpp_object.msg_handler_sync(ffi.buffer(data, len))
+@ffi.callback("void(unsigned char *, int)")
+def pneum_callback_async(data, len):
+    vpp_object.msg_handler_async(ffi.buffer(data, len))
+@ffi.callback("void(void *, unsigned char *, int)")
+def pneum_error_handler(arg, msg, msg_len):
+    vpp_object.logger.warning("PNEUM: %s", ffi.string(msg, msg_len))
+
+class Empty(object):
+    pass
+
+
+class FuncWrapper(object):
+    def __init__(self, func):
+        self._func = func
+        self.__name__ = func.__name__
+
+    def __call__(self, **kwargs):
+        return self._func(**kwargs)
+
+
+class VPP():
+    """VPP interface.
+
+    This class provides the APIs to VPP.  The APIs are loaded
+    from provided .api.json files and makes functions accordingly.
+    These functions are documented in the VPP .api files, as they
+    are dynamically created.
+
+    Additionally, VPP can send callback messages; this class
+    provides a means to register a callback function to receive
+    these messages in a background thread.
+    """
+    def __init__(self, apifiles = None, testmode = False, async_thread = True,
+                 logger = logging.getLogger('vpp_papi'), loglevel = 'debug'):
+        """Create a VPP API object.
+
+        apifiles is a list of files containing API
+        descriptions that will be loaded - methods will be
+        dynamically created reflecting these APIs.  If not
+        provided this will load the API files from VPP's
+        default install location.
+        """
+        global vpp_object
+        vpp_object = self
+        self.logger = logger
+        logging.basicConfig(level=getattr(logging, loglevel.upper()))
+
+        self.messages = {}
+        self.id_names = []
+        self.id_msgdef = []
+        self.buffersize = 10000
+        self.connected = False
+        self.header = struct.Struct('>HI')
+        self.apifiles = []
+        self.event_callback = None
+        self.message_queue = Queue.Queue()
+        self.read_timeout = 0
+        self.vpp_api = vpp_api
+        if async_thread:
+            self.event_thread = threading.Thread(target=self.thread_msg_handler)
+            self.event_thread.daemon = True
+            self.event_thread.start()
+
+        if not apifiles:
+            # Pick up API definitions from default directory
+            apifiles = glob.glob('/usr/share/vpp/api/*.api.json')
+
+        for file in apifiles:
+            with open(file) as apidef_file:
+                api = json.load(apidef_file)
+                for t in api['types']:
+                    self.add_type(t[0], t[1:])
+
+                for m in api['messages']:
+                    self.add_message(m[0], m[1:])
+	self.apifiles = apifiles
+
+        # Basic sanity check
+        if len(self.messages) == 0 and not testmode:
+            raise ValueError(1, 'Missing JSON message definitions')
+
+        # Make sure we allow VPP to clean up the message rings.
+        atexit.register(vpp_atexit, self)
+
+        # Register error handler
+        vpp_api.pneum_set_error_handler(pneum_error_handler)
+
+    class ContextId(object):
+        """Thread-safe provider of unique context IDs."""
+        def __init__(self):
+            self.context = 0
+	    self.lock = threading.Lock()
+        def __call__(self):
+            """Get a new unique (or, at least, not recently used) context."""
+	    with self.lock:
+		self.context += 1
+		return self.context
+    get_context = ContextId()
+
+    def status(self):
+        """Debug function: report current VPP API status to stdout."""
+        print('Connected') if self.connected else print('Not Connected')
+        print('Read API definitions from', ', '.join(self.apifiles))
+
+    def __struct (self, t, n = None, e = -1, vl = None):
+        """Create a packing structure for a message."""
+        base_types = { 'u8' : 'B',
+                       'u16' : 'H',
+                       'u32' : 'I',
+                       'i32' : 'i',
+                       'u64' : 'Q',
+                       'f64' : 'd',
+                       }
+        pack = None
+        if t in base_types:
+            pack = base_types[t]
+            if not vl:
+                if e > 0 and t == 'u8':
+                    # Fixed byte array
+                    return struct.Struct('>' + str(e) + 's')
+                if e > 0:
+                    # Fixed array of base type
+                    return [e, struct.Struct('>' + base_types[t])]
+                elif e == 0:
+                    # Old style variable array
+                    return [-1, struct.Struct('>' + base_types[t])]
+            else:
+                # Variable length array
+                return [vl, struct.Struct('>s')] if t == 'u8' else \
+                    [vl, struct.Struct('>' + base_types[t])]
+
+            return struct.Struct('>' + base_types[t])
+
+        if t in self.messages:
+            ### Return a list in case of array ###
+            if e > 0 and not vl:
+                return [e, lambda self, encode, buf, offset, args: (
+                    self.__struct_type(encode, self.messages[t], buf, offset,
+                                       args))]
+            if vl:
+                return [vl, lambda self, encode, buf, offset, args: (
+                    self.__struct_type(encode, self.messages[t], buf, offset,
+                                       args))]
+            elif e == 0:
+                # Old style VLA
+                raise NotImplementedError(1, 'No support for compound types ' + t)
+            return lambda self, encode, buf, offset, args: (
+                self.__struct_type(encode, self.messages[t], buf, offset, args)
+            )
+
+        raise ValueError(1, 'Invalid message type: ' + t)
+
+    def __struct_type(self, encode, msgdef, buf, offset, kwargs):
+        """Get a message packer or unpacker."""
+        if encode:
+            return self.__struct_type_encode(msgdef, buf, offset, kwargs)
+        else:
+            return self.__struct_type_decode(msgdef, buf, offset)
+
+    def __struct_type_encode(self, msgdef, buf, offset, kwargs):
+        off = offset
+        size = 0
+
+        for k in kwargs:
+            if k not in msgdef['args']:
+                raise ValueError(1, 'Invalid field-name in message call ' + k)
+
+        for k,v in msgdef['args'].iteritems():
+            off += size
+            if k in kwargs:
+                if type(v) is list:
+                    if callable(v[1]):
+                        e = kwargs[v[0]] if v[0] in kwargs else v[0]
+                        size = 0
+                        for i in range(e):
+                            size += v[1](self, True, buf, off + size,
+                                         kwargs[k][i])
+                    else:
+                        if v[0] in kwargs:
+                            l = kwargs[v[0]]
+                        else:
+                            l = len(kwargs[k])
+                        if v[1].size == 1:
+                            buf[off:off + l] = bytearray(kwargs[k])
+                            size = l
+                        else:
+                            size = 0
+                            for i in kwargs[k]:
+                                v[1].pack_into(buf, off + size, i)
+                                size += v[1].size
+                else:
+                    if callable(v):
+                        size = v(self, True, buf, off, kwargs[k])
+                    else:
+                        v.pack_into(buf, off, kwargs[k])
+                        size = v.size
+            else:
+                size = v.size if not type(v) is list else 0
+
+        return off + size - offset
+
+
+    def __getitem__(self, name):
+        if name in self.messages:
+            return self.messages[name]
+        return None
+
+    def encode(self, msgdef, kwargs):
+        # Make suitably large buffer
+        buf = bytearray(self.buffersize)
+        offset = 0
+        size = self.__struct_type(True, msgdef, buf, offset, kwargs)
+        return buf[:offset + size]
+
+    def decode(self, msgdef, buf):
+        return self.__struct_type(False, msgdef, buf, 0, None)[1]
+
+    def __struct_type_decode(self, msgdef, buf, offset):
+        res = []
+        off = offset
+        size = 0
+        for k,v in msgdef['args'].iteritems():
+            off += size
+            if type(v) is list:
+                lst = []
+                if callable(v[1]): # compound type
+                    size = 0
+                    if v[0] in msgdef['args']: # vla
+                        e = res[v[2]]
+                    else: # fixed array
+                        e = v[0]
+                    res.append(lst)
+                    for i in range(e):
+                        (s,l) = v[1](self, False, buf, off + size, None)
+                        lst.append(l)
+                        size += s
+                    continue
+                if v[1].size == 1:
+                    if type(v[0]) is int:
+                        size = len(buf) - off
+                    else:
+                        size = res[v[2]]
+                    res.append(buf[off:off + size])
+                else:
+                    e = v[0] if type(v[0]) is int else res[v[2]]
+                    if e == -1:
+                        e = (len(buf) - off) / v[1].size
+                    lst = []
+                    res.append(lst)
+                    size = 0
+                    for i in range(e):
+                        lst.append(v[1].unpack_from(buf, off + size)[0])
+                        size += v[1].size
+            else:
+                if callable(v):
+                    (s,l) = v(self, False, buf, off, None)
+                    res.append(l)
+                    size += s
+                else:
+                    res.append(v.unpack_from(buf, off)[0])
+                    size = v.size
+
+        return off + size - offset, msgdef['return_tuple']._make(res)
+
+    def ret_tup(self, name):
+        if name in self.messages and 'return_tuple' in self.messages[name]:
+            return self.messages[name]['return_tuple']
+        return None
+
+    def add_message(self, name, msgdef, typeonly = False):
+        if name in self.messages:
+            raise ValueError('Duplicate message name: ' + name)
+
+        args = collections.OrderedDict()
+        argtypes = collections.OrderedDict()
+        fields = []
+        msg = {}
+        for i, f in enumerate(msgdef):
+            if type(f) is dict and 'crc' in f:
+                msg['crc'] = f['crc']
+                continue
+            field_type = f[0]
+            field_name = f[1]
+            if len(f) == 3 and f[2] == 0 and i != len(msgdef) - 2:
+                raise ValueError('Variable Length Array must be last: ' + name)
+            args[field_name] = self.__struct(*f)
+            argtypes[field_name] = field_type
+            if len(f) == 4: # Find offset to # elements field
+                args[field_name].append(args.keys().index(f[3]) - i)
+            fields.append(field_name)
+        msg['return_tuple'] = collections.namedtuple(name, fields,
+                                                     rename = True)
+        self.messages[name] = msg
+        self.messages[name]['args'] = args
+        self.messages[name]['argtypes'] = argtypes
+        self.messages[name]['typeonly'] = typeonly
+        return self.messages[name]
+
+    def add_type(self, name, typedef):
+        return self.add_message('vl_api_' + name + '_t', typedef, typeonly=True)
+
+    def make_function(self, name, i, msgdef, multipart, async):
+        if (async):
+            f = lambda **kwargs: (self._call_vpp_async(i, msgdef, **kwargs))
+        else:
+            f = lambda **kwargs: (self._call_vpp(i, msgdef, multipart, **kwargs))
+        args = self.messages[name]['args']
+        argtypes = self.messages[name]['argtypes']
+        f.__name__ = str(name)
+        f.__doc__ = ", ".join(["%s %s" % (argtypes[k], k) for k in args.keys()])
+        return f
+
+    @property
+    def api(self):
+        if not hasattr(self, "_api"):
+            raise Exception("Not connected, api definitions not available")
+        return self._api
+
+    def _register_functions(self, async=False):
+        self.id_names = [None] * (self.vpp_dictionary_maxid + 1)
+        self.id_msgdef = [None] * (self.vpp_dictionary_maxid + 1)
+        self._api = Empty()
+        for name, msgdef in self.messages.iteritems():
+            if self.messages[name]['typeonly']: continue
+            crc = self.messages[name]['crc']
+            n = name + '_' + crc[2:]
+            i = vpp_api.pneum_get_msg_index(bytes(n))
+            if i > 0:
+                self.id_msgdef[i] = msgdef
+                self.id_names[i] = name
+                multipart = True if name.find('_dump') > 0 else False
+                f = self.make_function(name, i, msgdef, multipart, async)
+                setattr(self._api, name, FuncWrapper(f))
+
+                # old API stuff starts here - will be removed in 17.07
+                if hasattr(self, name):
+                    raise NameError(
+                        3, "Conflicting name in JSON definition: `%s'" % name)
+                setattr(self, name, f)
+                # old API stuff ends here
+            else:
+                self.logger.debug('No such message type or failed CRC checksum: %s', n)
+
+    def _write (self, buf):
+        """Send a binary-packed message to VPP."""
+        if not self.connected:
+            raise IOError(1, 'Not connected')
+        return vpp_api.pneum_write(str(buf), len(buf))
+
+    def _read (self):
+        if not self.connected:
+            raise IOError(1, 'Not connected')
+        mem = ffi.new("char **")
+        size = ffi.new("int *")
+        rv = vpp_api.pneum_read(mem, size, self.read_timeout)
+        if rv:
+            raise IOError(rv, 'pneum_read filed')
+        msg = bytes(ffi.buffer(mem[0], size[0]))
+        vpp_api.pneum_free(mem[0])
+        return msg
+
+    def connect_internal(self, name, msg_handler, chroot_prefix, rx_qlen, async):
+	rv = vpp_api.pneum_connect(name, chroot_prefix, msg_handler, rx_qlen)
+        if rv != 0:
+            raise IOError(2, 'Connect failed')
+        self.connected = True
+
+        self.vpp_dictionary_maxid = vpp_api.pneum_msg_table_max_index()
+        self._register_functions(async=async)
+
+        # Initialise control ping
+        crc = self.messages['control_ping']['crc']
+        self.control_ping_index = \
+                                  vpp_api.pneum_get_msg_index(
+                                      bytes('control_ping' + '_' + crc[2:]))
+        self.control_ping_msgdef = self.messages['control_ping']
+
+    def connect(self, name, chroot_prefix = ffi.NULL,
+                async = False, rx_qlen = 32):
+        """Attach to VPP.
+
+        name - the name of the client.
+        chroot_prefix - if VPP is chroot'ed, the prefix of the jail
+        async - if true, messages are sent without waiting for a reply
+        rx_qlen - the length of the VPP message receive queue between
+        client and server.
+        """
+        msg_handler = pneum_callback_sync if not async \
+                      else pneum_callback_async
+        return self.connect_internal(name, msg_handler, chroot_prefix, rx_qlen,
+                                     async)
+
+    def connect_sync (self, name, chroot_prefix = ffi.NULL, rx_qlen = 32):
+        """Attach to VPP in synchronous mode. Application must poll for events.
+
+        name - the name of the client.
+        chroot_prefix - if VPP is chroot'ed, the prefix of the jail
+        rx_qlen - the length of the VPP message receive queue between
+        client and server.
+        """
+
+        return self.connect_internal(name, ffi.NULL, chroot_prefix, rx_qlen,
+                                     async=False)
+
+    def disconnect(self):
+        """Detach from VPP."""
+        rv = vpp_api.pneum_disconnect()
+        self.connected = False
+        return rv
+
+    def msg_handler_sync(self, msg):
+        """Process an incoming message from VPP in sync mode.
+
+        The message may be a reply or it may be an async notification.
+        """
+        r = self.decode_incoming_msg(msg)
+        if r is None:
+            return
+
+        # If we have a context, then use the context to find any
+        # request waiting for a reply
+        context = 0
+        if hasattr(r, 'context') and r.context > 0:
+            context = r.context
+
+        msgname = type(r).__name__
+
+        if context == 0:
+            # No context -> async notification that we feed to the callback
+            self.message_queue.put_nowait(r)
+        else:
+            raise IOError(2, 'RPC reply message received in event handler')
+
+    def decode_incoming_msg(self, msg):
+        if not msg:
+            self.logger.warning('vpp_api.read failed')
+            return
+
+        i, ci = self.header.unpack_from(msg, 0)
+        if self.id_names[i] == 'rx_thread_exit':
+            return
+
+        #
+        # Decode message and returns a tuple.
+        #
+        msgdef = self.id_msgdef[i]
+        if not msgdef:
+            raise IOError(2, 'Reply message undefined')
+
+        r = self.decode(msgdef, msg)
+
+        return r
+
+    def msg_handler_async(self, msg):
+        """Process a message from VPP in async mode.
+
+        In async mode, all messages are returned to the callback.
+        """
+        r = self.decode_incoming_msg(msg)
+        if r is None:
+            return
+
+        msgname = type(r).__name__
+
+	if self.event_callback:
+	    self.event_callback(msgname, r)
+
+    def _control_ping(self, context):
+        """Send a ping command."""
+        self._call_vpp_async(self.control_ping_index,
+			     self.control_ping_msgdef,
+                             context=context)
+
+    def _call_vpp(self, i, msgdef, multipart, **kwargs):
+        """Given a message, send the message and await a reply.
+
+        msgdef - the message packing definition
+        i - the message type index
+        multipart - True if the message returns multiple
+        messages in return.
+        context - context number - chosen at random if not
+        supplied.
+        The remainder of the kwargs are the arguments to the API call.
+
+        The return value is the message or message array containing
+        the response.  It will raise an IOError exception if there was
+        no response within the timeout window.
+        """
+
+        if not 'context' in kwargs:
+            context = self.get_context()
+            kwargs['context'] = context
+        else:
+            context = kwargs['context']
+        kwargs['_vl_msg_id'] = i
+        b = self.encode(msgdef, kwargs)
+
+        vpp_api.pneum_rx_suspend()
+        self._write(b)
+
+        if multipart:
+            # Send a ping after the request - we use its response
+            # to detect that we have seen all results.
+            self._control_ping(context)
+
+        # Block until we get a reply.
+        rl = []
+        while (True):
+            msg = self._read()
+            if not msg:
+                print('PNEUM ERROR: OH MY GOD')
+                raise IOError(2, 'PNEUM read failed')
+
+            r = self.decode_incoming_msg(msg)
+            msgname = type(r).__name__
+            if not context in r or r.context == 0 or context != r.context:
+                self.message_queue.put_nowait(r)
+                continue
+
+            if not multipart:
+                rl = r
+                break
+            if msgname == 'control_ping_reply':
+                break
+
+            rl.append(r)
+
+        vpp_api.pneum_rx_resume()
+
+        return rl
+
+    def _call_vpp_async(self, i, msgdef, **kwargs):
+        """Given a message, send the message and await a reply.
+
+        msgdef - the message packing definition
+        i - the message type index
+        context - context number - chosen at random if not
+        supplied.
+        The remainder of the kwargs are the arguments to the API call.
+        """
+        if not 'context' in kwargs:
+            context = self.get_context()
+            kwargs['context'] = context
+        else:
+            context = kwargs['context']
+        kwargs['_vl_msg_id'] = i
+        b = self.encode(msgdef, kwargs)
+
+        self._write(b)
+
+    def register_event_callback(self, callback):
+        """Register a callback for async messages.
+
+        This will be called for async notifications in sync mode,
+        and all messages in async mode.  In sync mode, replies to
+        requests will not come here.
+
+        callback is a fn(msg_type_name, msg_type) that will be
+        called when a message comes in.  While this function is
+        executing, note that (a) you are in a background thread and
+        may wish to use threading.Lock to protect your datastructures,
+        and (b) message processing from VPP will stop (so if you take
+        a long while about it you may provoke reply timeouts or cause
+        VPP to fill the RX buffer).  Passing None will disable the
+        callback.
+        """
+        self.event_callback = callback
+
+    def thread_msg_handler(self):
+        """Python thread calling the user registerd message handler.
+
+        This is to emulate the old style event callback scheme. Modern
+        clients should provide their own thread to poll the event
+        queue.
+        """
+        while True:
+            r = self.message_queue.get()
+            msgname = type(r).__name__
+	    if self.event_callback:
+	        self.event_callback(msgname, r)
diff --git a/src/vpp-api/python/vpp_papi/__init__.py b/src/vpp-api/python/vpp_papi/__init__.py
deleted file mode 100644
index 6688ffb8..00000000
--- a/src/vpp-api/python/vpp_papi/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
-from . vpp_papi import *
-
diff --git a/src/vpp-api/python/vpp_papi/pneum_wrap.c b/src/vpp-api/python/vpp_papi/pneum_wrap.c
deleted file mode 100644
index c5a7eea1..00000000
--- a/src/vpp-api/python/vpp_papi/pneum_wrap.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <Python.h>
-#include "../pneum/pneum.h"
-#include <vppinfra/hash.h>
-
-static PyObject *pneum_callback = NULL;
-
-static void
-wrap_pneum_callback (unsigned char * data, int len)
-{
-  PyGILState_STATE gstate;
-  PyObject *result;//, *arglist;
-
-  gstate = PyGILState_Ensure();
-
-  /* Time to call the callback */
-#if PY_VERSION_HEX >= 0x03000000
-  result = PyObject_CallFunction(pneum_callback, "y#", data, len);
-#else
-  result = PyObject_CallFunction(pneum_callback, "s#", data, len);
-#endif
-  if (result)
-    Py_DECREF(result);
-  else
-    PyErr_Print();
-
-  PyGILState_Release(gstate);
-}
-
-static PyObject *
-wrap_connect (PyObject *self, PyObject *args, PyObject *kw)
-{
-  char * name, * chroot_prefix = NULL;
-  int rx_qlen = 32; /* default rx queue length */
-  int rv;
-  PyObject * temp = NULL;
-  pneum_callback_t cb = NULL;
-
-  if (!PyArg_ParseTuple(args, "sOzi:wrap_connect",
-			&name, &temp, &chroot_prefix, &rx_qlen))
-    return (NULL);
-
-  if (temp != Py_None)
-    {
-      if (!PyCallable_Check(temp))
-	{
-	  PyErr_SetString(PyExc_TypeError, "parameter must be callable");
-	  return NULL;
-	}
-
-      Py_XINCREF(temp);         /* Add a reference to new callback */
-      Py_XDECREF(pneum_callback);  /* Dispose of previous callback */
-      pneum_callback = temp;       /* Remember new callback */
-      cb = wrap_pneum_callback;
-    }
-  Py_BEGIN_ALLOW_THREADS
-  rv = pneum_connect(name, chroot_prefix, cb, rx_qlen);
-  Py_END_ALLOW_THREADS
-  return PyLong_FromLong(rv);
-}
-
-static PyObject *
-wrap_disconnect (PyObject *self, PyObject *args)
-{
-  int rv;
-  Py_BEGIN_ALLOW_THREADS
-  rv = pneum_disconnect();
-  Py_END_ALLOW_THREADS
-  return PyLong_FromLong(rv);
-}
-
-static PyObject *
-wrap_write (PyObject *self, PyObject *args)
-{
-  char *data;
-  int len, rv;
-
-  if (!PyArg_ParseTuple(args, "s#", &data, &len))
-    return NULL;
-
-  Py_BEGIN_ALLOW_THREADS
-  rv = pneum_write(data, len);
-  Py_END_ALLOW_THREADS
-
-  return PyLong_FromLong(rv);
-}
-
-static PyObject *
-wrap_read (PyObject *self, PyObject *args)
-{
-  char *data;
-  int len, rv;
-  unsigned short timeout;
-
-  if (!PyArg_ParseTuple(args, "H", &timeout))
-    return (NULL);
-  Py_BEGIN_ALLOW_THREADS
-  rv = pneum_read(&data, &len, timeout);
-  Py_END_ALLOW_THREADS
-
-  if (rv != 0) { Py_RETURN_NONE; }
-#if PY_VERSION_HEX >= 0x03000000
-  PyObject *ret = Py_BuildValue("y#", data, len);
-#else
-  PyObject *ret = Py_BuildValue("s#", data, len);
-#endif
-  pneum_free(data);
-  if (!ret) { Py_RETURN_NONE; }
-
-  return ret;
-}
-
-static PyObject *
-wrap_msg_table (PyObject *self, PyObject *args)
-{
-  int i = 0, rv = 0;
-  hash_pair_t *hp;
-  uword *h = pneum_msg_table_get_hash();
-  PyObject *ret = PyList_New(pneum_msg_table_size());
-  if (!ret) goto error;
-  hash_foreach_pair (hp, h,
-  ({
-    PyObject *item = PyTuple_New(2);
-    if (!item) goto error;
-    rv = PyTuple_SetItem(item, 0, PyLong_FromLong((u32)hp->value[0]));
-    if (rv) goto error;
-    rv = PyTuple_SetItem(item, 1, PyString_FromString((char *)hp->key));
-    if (rv) goto error;
-    PyList_SetItem(ret, i, item);
-    i++;
-  }));
-
-  return ret;
-
- error:
-  /* TODO: Raise exception */
-  printf("msg_table failed");
-  Py_RETURN_NONE;
-}
-
-static PyObject *
-wrap_suspend (PyObject *self, PyObject *args)
-{
-  Py_BEGIN_ALLOW_THREADS
-  pneum_rx_suspend();
-  Py_END_ALLOW_THREADS
-  Py_RETURN_NONE;
-}
-
-static PyObject *
-wrap_resume (PyObject *self, PyObject *args)
-{
-  Py_BEGIN_ALLOW_THREADS
-  pneum_rx_resume();
-  Py_END_ALLOW_THREADS
-  Py_RETURN_NONE;
-}
-
-static PyMethodDef vpp_api_Methods[] = {
-  {"connect", wrap_connect, METH_VARARGS, "Connect to the VPP API."},
-  {"disconnect", wrap_disconnect, METH_VARARGS, "Disconnect from the VPP API."},
-  {"write", wrap_write, METH_VARARGS, "Write data to the VPP API."},
-  {"read", wrap_read, METH_VARARGS, "Read data from the VPP API."},
-  {"msg_table", wrap_msg_table, METH_VARARGS, "Get API dictionary."},
-  {"suspend", wrap_suspend, METH_VARARGS, "Suspend RX thread."},
-  {"resume", wrap_resume, METH_VARARGS, "Resume RX thread."},
-  {NULL, NULL, 0, NULL}        /* Sentinel */
-};
-
-#if PY_VERSION_HEX >= 0x03000000
-PyMODINIT_FUNC
-PyInit_vpp_api (void)
-#else
-void
-initvpp_api (void)
-#endif
-{
-#if PY_VERSION_HEX >= 0x03000000
-  static struct PyModuleDef vpp_api_module = {
-#if PY_VERSION_HEX >= 0x03020000
-    PyModuleDef_HEAD_INIT,
-#else
-    {
-      PyObject_HEAD_INIT(NULL)
-      NULL, /* m_init */
-      0,    /* m_index */
-      NULL, /* m_copy */
-    },
-#endif
-    (char *) "vpp_api",
-    NULL,
-    -1,
-    vpp_api_Methods,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-  };
-#endif
-
-  /* Ensure threading is initialised */
-  if (!PyEval_ThreadsInitialized()) {
-    PyEval_InitThreads();
-  }
-
-#if PY_VERSION_HEX >= 0x03000000
-  return PyModule_Create(&vpp_api_module);
-#else
-  Py_InitModule((char *) "vpp_api", vpp_api_Methods);
-  return;
-#endif
-}
diff --git a/src/vpp-api/python/vpp_papi/vpp_papi.py b/src/vpp-api/python/vpp_papi/vpp_papi.py
deleted file mode 100644
index 0c40f171..00000000
--- a/src/vpp-api/python/vpp_papi/vpp_papi.py
+++ /dev/null
@@ -1,599 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-from __future__ import print_function
-import sys, os, logging, collections, struct, json, threading, glob
-import atexit, Queue
-
-logging.basicConfig(level=logging.DEBUG)
-import vpp_api
-
-def eprint(*args, **kwargs):
-    """Print critical diagnostics to stderr."""
-    print(*args, file=sys.stderr, **kwargs)
-
-def vpp_atexit(self):
-    """Clean up VPP connection on shutdown."""
-    if self.connected:
-        eprint ('Cleaning up VPP on exit')
-        self.disconnect()
-
-
-class Empty(object):
-    pass
-
-
-class FuncWrapper(object):
-    def __init__(self, func):
-        self._func = func
-        self.__name__ = func.__name__
-
-    def __call__(self, **kwargs):
-        return self._func(**kwargs)
-
-
-class VPP():
-    """VPP interface.
-
-    This class provides the APIs to VPP.  The APIs are loaded
-    from provided .api.json files and makes functions accordingly.
-    These functions are documented in the VPP .api files, as they
-    are dynamically created.
-
-    Additionally, VPP can send callback messages; this class
-    provides a means to register a callback function to receive
-    these messages in a background thread.
-    """
-    def __init__(self, apifiles = None, testmode = False, async_thread = True):
-        """Create a VPP API object.
-
-        apifiles is a list of files containing API
-        descriptions that will be loaded - methods will be
-        dynamically created reflecting these APIs.  If not
-        provided this will load the API files from VPP's
-        default install location.
-        """
-        self.messages = {}
-        self.id_names = []
-        self.id_msgdef = []
-        self.buffersize = 10000
-        self.connected = False
-        self.header = struct.Struct('>HI')
-        self.apifiles = []
-        self.event_callback = None
-        self.message_queue = Queue.Queue()
-        self.read_timeout = 0
-        self.vpp_api = vpp_api
-        if async_thread:
-            self.event_thread = threading.Thread(target=self.thread_msg_handler)
-            self.event_thread.daemon = True
-            self.event_thread.start()
-
-        if not apifiles:
-            # Pick up API definitions from default directory
-            apifiles = glob.glob('/usr/share/vpp/api/*.api.json')
-
-        for file in apifiles:
-            with open(file) as apidef_file:
-                api = json.load(apidef_file)
-                for t in api['types']:
-                    self.add_type(t[0], t[1:])
-
-                for m in api['messages']:
-                    self.add_message(m[0], m[1:])
-	self.apifiles = apifiles
-
-        # Basic sanity check
-        if len(self.messages) == 0 and not testmode:
-            raise ValueError(1, 'Missing JSON message definitions')
-
-        # Make sure we allow VPP to clean up the message rings.
-        atexit.register(vpp_atexit, self)
-
-    class ContextId(object):
-        """Thread-safe provider of unique context IDs."""
-        def __init__(self):
-            self.context = 0
-	    self.lock = threading.Lock()
-        def __call__(self):
-            """Get a new unique (or, at least, not recently used) context."""
-	    with self.lock:
-		self.context += 1
-		return self.context
-    get_context = ContextId()
-
-    def status(self):
-        """Debug function: report current VPP API status to stdout."""
-        print('Connected') if self.connected else print('Not Connected')
-        print('Read API definitions from', ', '.join(self.apifiles))
-
-    def __struct (self, t, n = None, e = -1, vl = None):
-        """Create a packing structure for a message."""
-        base_types = { 'u8' : 'B',
-                       'u16' : 'H',
-                       'u32' : 'I',
-                       'i32' : 'i',
-                       'u64' : 'Q',
-                       'f64' : 'd',
-                       }
-        pack = None
-        if t in base_types:
-            pack = base_types[t]
-            if not vl:
-                if e > 0 and t == 'u8':
-                    # Fixed byte array
-                    return struct.Struct('>' + str(e) + 's')
-                if e > 0:
-                    # Fixed array of base type
-                    return [e, struct.Struct('>' + base_types[t])]
-                elif e == 0:
-                    # Old style variable array
-                    return [-1, struct.Struct('>' + base_types[t])]
-            else:
-                # Variable length array
-                return [vl, struct.Struct('>s')] if t == 'u8' else \
-                    [vl, struct.Struct('>' + base_types[t])]
-
-            return struct.Struct('>' + base_types[t])
-
-        if t in self.messages:
-            ### Return a list in case of array ###
-            if e > 0 and not vl:
-                return [e, lambda self, encode, buf, offset, args: (
-                    self.__struct_type(encode, self.messages[t], buf, offset,
-                                       args))]
-            if vl:
-                return [vl, lambda self, encode, buf, offset, args: (
-                    self.__struct_type(encode, self.messages[t], buf, offset,
-                                       args))]
-            elif e == 0:
-                # Old style VLA
-                raise NotImplementedError(1, 'No support for compound types ' + t)
-            return lambda self, encode, buf, offset, args: (
-                self.__struct_type(encode, self.messages[t], buf, offset, args)
-            )
-
-        raise ValueError(1, 'Invalid message type: ' + t)
-
-    def __struct_type(self, encode, msgdef, buf, offset, kwargs):
-        """Get a message packer or unpacker."""
-        if encode:
-            return self.__struct_type_encode(msgdef, buf, offset, kwargs)
-        else:
-            return self.__struct_type_decode(msgdef, buf, offset)
-
-    def __struct_type_encode(self, msgdef, buf, offset, kwargs):
-        off = offset
-        size = 0
-
-        for k in kwargs:
-            if k not in msgdef['args']:
-                raise ValueError(1, 'Invalid field-name in message call ' + k)
-
-        for k,v in msgdef['args'].iteritems():
-            off += size
-            if k in kwargs:
-                if type(v) is list:
-                    if callable(v[1]):
-                        e = kwargs[v[0]] if v[0] in kwargs else v[0]
-                        size = 0
-                        for i in range(e):
-                            size += v[1](self, True, buf, off + size,
-                                         kwargs[k][i])
-                    else:
-                        if v[0] in kwargs:
-                            l = kwargs[v[0]]
-                        else:
-                            l = len(kwargs[k])
-                        if v[1].size == 1:
-                            buf[off:off + l] = bytearray(kwargs[k])
-                            size = l
-                        else:
-                            size = 0
-                            for i in kwargs[k]:
-                                v[1].pack_into(buf, off + size, i)
-                                size += v[1].size
-                else:
-                    if callable(v):
-                        size = v(self, True, buf, off, kwargs[k])
-                    else:
-                        v.pack_into(buf, off, kwargs[k])
-                        size = v.size
-            else:
-                size = v.size if not type(v) is list else 0
-
-        return off + size - offset
-
-
-    def __getitem__(self, name):
-        if name in self.messages:
-            return self.messages[name]
-        return None
-
-    def encode(self, msgdef, kwargs):
-        # Make suitably large buffer
-        buf = bytearray(self.buffersize)
-        offset = 0
-        size = self.__struct_type(True, msgdef, buf, offset, kwargs)
-        return buf[:offset + size]
-
-    def decode(self, msgdef, buf):
-        return self.__struct_type(False, msgdef, buf, 0, None)[1]
-
-    def __struct_type_decode(self, msgdef, buf, offset):
-        res = []
-        off = offset
-        size = 0
-        for k,v in msgdef['args'].iteritems():
-            off += size
-            if type(v) is list:
-                lst = []
-                if callable(v[1]): # compound type
-                    size = 0
-                    if v[0] in msgdef['args']: # vla
-                        e = res[v[2]]
-                    else: # fixed array
-                        e = v[0]
-                    res.append(lst)
-                    for i in range(e):
-                        (s,l) = v[1](self, False, buf, off + size, None)
-                        lst.append(l)
-                        size += s
-                    continue
-                if v[1].size == 1:
-                    if type(v[0]) is int:
-                        size = len(buf) - off
-                    else:
-                        size = res[v[2]]
-                    res.append(buf[off:off + size])
-                else:
-                    e = v[0] if type(v[0]) is int else res[v[2]]
-                    if e == -1:
-                        e = (len(buf) - off) / v[1].size
-                    lst = []
-                    res.append(lst)
-                    size = 0
-                    for i in range(e):
-                        lst.append(v[1].unpack_from(buf, off + size)[0])
-                        size += v[1].size
-            else:
-                if callable(v):
-                    (s,l) = v(self, False, buf, off, None)
-                    res.append(l)
-                    size += s
-                else:
-                    res.append(v.unpack_from(buf, off)[0])
-                    size = v.size
-
-        return off + size - offset, msgdef['return_tuple']._make(res)
-
-    def ret_tup(self, name):
-        if name in self.messages and 'return_tuple' in self.messages[name]:
-            return self.messages[name]['return_tuple']
-        return None
-
-    def add_message(self, name, msgdef):
-        if name in self.messages:
-            raise ValueError('Duplicate message name: ' + name)
-
-        args = collections.OrderedDict()
-        argtypes = collections.OrderedDict()
-        fields = []
-        msg = {}
-        for i, f in enumerate(msgdef):
-            if type(f) is dict and 'crc' in f:
-                msg['crc'] = f['crc']
-                continue
-            field_type = f[0]
-            field_name = f[1]
-            if len(f) == 3 and f[2] == 0 and i != len(msgdef) - 2:
-                raise ValueError('Variable Length Array must be last: ' + name)
-            args[field_name] = self.__struct(*f)
-            argtypes[field_name] = field_type
-            if len(f) == 4: # Find offset to # elements field
-                args[field_name].append(args.keys().index(f[3]) - i)
-            fields.append(field_name)
-        msg['return_tuple'] = collections.namedtuple(name, fields,
-                                                     rename = True)
-        self.messages[name] = msg
-        self.messages[name]['args'] = args
-        self.messages[name]['argtypes'] = argtypes
-        return self.messages[name]
-
-    def add_type(self, name, typedef):
-        return self.add_message('vl_api_' + name + '_t', typedef)
-
-    def make_function(self, name, i, msgdef, multipart, async):
-        if (async):
-            f = lambda **kwargs: (self._call_vpp_async(i, msgdef, **kwargs))
-        else:
-            f = lambda **kwargs: (self._call_vpp(i, msgdef, multipart, **kwargs))
-        args = self.messages[name]['args']
-        argtypes = self.messages[name]['argtypes']
-        f.__name__ = str(name)
-        f.__doc__ = ", ".join(["%s %s" % (argtypes[k], k) for k in args.keys()])
-        return f
-
-    @property
-    def api(self):
-        if not hasattr(self, "_api"):
-            raise Exception("Not connected, api definitions not available")
-        return self._api
-
-    def _register_functions(self, async=False):
-        self.id_names = [None] * (self.vpp_dictionary_maxid + 1)
-        self.id_msgdef = [None] * (self.vpp_dictionary_maxid + 1)
-        self._api = Empty()
-        for name, msgdef in self.messages.iteritems():
-            if name in self.vpp_dictionary:
-                if self.messages[name]['crc'] != self.vpp_dictionary[name]['crc']:
-                    raise ValueError(3, 'Failed CRC checksum ' + name +
-                                     ' ' + self.messages[name]['crc'] +
-                                     ' ' + self.vpp_dictionary[name]['crc'])
-                i = self.vpp_dictionary[name]['id']
-                self.id_msgdef[i] = msgdef
-                self.id_names[i] = name
-                multipart = True if name.find('_dump') > 0 else False
-                f = self.make_function(name, i, msgdef, multipart, async)
-                setattr(self._api, name, FuncWrapper(f))
-
-                # old API stuff starts here - will be removed in 17.07
-                if hasattr(self, name):
-                    raise NameError(
-                        3, "Conflicting name in JSON definition: `%s'" % name)
-                setattr(self, name, f)
-                # old API stuff ends here
-
-    def _write (self, buf):
-        """Send a binary-packed message to VPP."""
-        if not self.connected:
-            raise IOError(1, 'Not connected')
-        return vpp_api.write(str(buf))
-
-    def _read (self):
-        if not self.connected:
-            raise IOError(1, 'Not connected')
-
-        return vpp_api.read(self.read_timeout)
-
-    def _load_dictionary(self):
-        self.vpp_dictionary = {}
-        self.vpp_dictionary_maxid = 0
-        d = vpp_api.msg_table()
-
-        if not d:
-            raise IOError(3, 'Cannot get VPP API dictionary')
-        for i,n in d:
-            name, crc =  n.rsplit('_', 1)
-            crc = '0x' + crc
-            self.vpp_dictionary[name] = { 'id' : i, 'crc' : crc }
-            self.vpp_dictionary_maxid = max(self.vpp_dictionary_maxid, i)
-
-    def connect_internal(self, name, msg_handler, chroot_prefix, rx_qlen, async):
-	rv = vpp_api.connect(name, msg_handler, chroot_prefix, rx_qlen)
-        if rv != 0:
-            raise IOError(2, 'Connect failed')
-        self.connected = True
-
-        self._load_dictionary()
-        self._register_functions(async=async)
-
-        # Initialise control ping
-        self.control_ping_index = self.vpp_dictionary['control_ping']['id']
-        self.control_ping_msgdef = self.messages['control_ping']
-
-    def connect(self, name, chroot_prefix = None, async = False, rx_qlen = 32):
-        """Attach to VPP.
-
-        name - the name of the client.
-        chroot_prefix - if VPP is chroot'ed, the prefix of the jail
-        async - if true, messages are sent without waiting for a reply
-        rx_qlen - the length of the VPP message receive queue between
-        client and server.
-        """
-        msg_handler = self.msg_handler_sync if not async \
-                      else self.msg_handler_async
-        return self.connect_internal(name, msg_handler, chroot_prefix, rx_qlen,
-                                     async)
-
-    def connect_sync (self, name, chroot_prefix = None, rx_qlen = 32):
-        """Attach to VPP in synchronous mode. Application must poll for events.
-
-        name - the name of the client.
-        chroot_prefix - if VPP is chroot'ed, the prefix of the jail
-        rx_qlen - the length of the VPP message receive queue between
-        client and server.
-        """
-
-        return self.connect_internal(name, None, chroot_prefix, rx_qlen,
-                                     async=False)
-
-    def disconnect(self):
-        """Detach from VPP."""
-        rv = vpp_api.disconnect()
-        self.connected = False
-        return rv
-
-    def msg_handler_sync(self, msg):
-        """Process an incoming message from VPP in sync mode.
-
-        The message may be a reply or it may be an async notification.
-        """
-        r = self.decode_incoming_msg(msg)
-        if r is None:
-            return
-
-        # If we have a context, then use the context to find any
-        # request waiting for a reply
-        context = 0
-        if hasattr(r, 'context') and r.context > 0:
-            context = r.context
-
-        msgname = type(r).__name__
-
-        if context == 0:
-            # No context -> async notification that we feed to the callback
-            self.message_queue.put_nowait(r)
-        else:
-            raise IOError(2, 'RPC reply message received in event handler')
-
-    def decode_incoming_msg(self, msg):
-        if not msg:
-            eprint('vpp_api.read failed')
-            return
-
-        i, ci = self.header.unpack_from(msg, 0)
-        if self.id_names[i] == 'rx_thread_exit':
-            return
-
-        #
-        # Decode message and returns a tuple.
-        #
-        msgdef = self.id_msgdef[i]
-        if not msgdef:
-            raise IOError(2, 'Reply message undefined')
-
-        r = self.decode(msgdef, msg)
-
-        return r
-
-    def msg_handler_async(self, msg):
-        """Process a message from VPP in async mode.
-
-        In async mode, all messages are returned to the callback.
-        """
-        r = self.decode_incoming_msg(msg)
-        if r is None:
-            return
-
-        msgname = type(r).__name__
-
-	if self.event_callback:
-	    self.event_callback(msgname, r)
-
-    def _control_ping(self, context):
-        """Send a ping command."""
-        self._call_vpp_async(self.control_ping_index,
-			     self.control_ping_msgdef,
-                             context=context)
-
-    def _call_vpp(self, i, msgdef, multipart, **kwargs):
-        """Given a message, send the message and await a reply.
-
-        msgdef - the message packing definition
-        i - the message type index
-        multipart - True if the message returns multiple
-        messages in return.
-        context - context number - chosen at random if not
-        supplied.
-        The remainder of the kwargs are the arguments to the API call.
-
-        The return value is the message or message array containing
-        the response.  It will raise an IOError exception if there was
-        no response within the timeout window.
-        """
-
-        if not 'context' in kwargs:
-            context = self.get_context()
-            kwargs['context'] = context
-        else:
-            context = kwargs['context']
-        kwargs['_vl_msg_id'] = i
-        b = self.encode(msgdef, kwargs)
-
-        vpp_api.suspend()
-        self._write(b)
-
-        if multipart:
-            # Send a ping after the request - we use its response
-            # to detect that we have seen all results.
-            self._control_ping(context)
-
-        # Block until we get a reply.
-        rl = []
-        while (True):
-            msg = self._read()
-            if not msg:
-                print('PNEUM ERROR: OH MY GOD')
-                raise IOError(2, 'PNEUM read failed')
-
-            r = self.decode_incoming_msg(msg)
-            msgname = type(r).__name__
-            if not context in r or r.context == 0 or context != r.context:
-                self.message_queue.put_nowait(r)
-                continue
-
-            if not multipart:
-                rl = r
-                break
-            if msgname == 'control_ping_reply':
-                break
-
-            rl.append(r)
-
-        vpp_api.resume()
-
-        return rl
-
-    def _call_vpp_async(self, i, msgdef, **kwargs):
-        """Given a message, send the message and await a reply.
-
-        msgdef - the message packing definition
-        i - the message type index
-        context - context number - chosen at random if not
-        supplied.
-        The remainder of the kwargs are the arguments to the API call.
-        """
-        if not 'context' in kwargs:
-            context = self.get_context()
-            kwargs['context'] = context
-        else:
-            context = kwargs['context']
-        kwargs['_vl_msg_id'] = i
-        b = self.encode(msgdef, kwargs)
-
-        self._write(b)
-
-    def register_event_callback(self, callback):
-        """Register a callback for async messages.
-
-        This will be called for async notifications in sync mode,
-        and all messages in async mode.  In sync mode, replies to
-        requests will not come here.
-
-        callback is a fn(msg_type_name, msg_type) that will be
-        called when a message comes in.  While this function is
-        executing, note that (a) you are in a background thread and
-        may wish to use threading.Lock to protect your datastructures,
-        and (b) message processing from VPP will stop (so if you take
-        a long while about it you may provoke reply timeouts or cause
-        VPP to fill the RX buffer).  Passing None will disable the
-        callback.
-        """
-        self.event_callback = callback
-
-    def thread_msg_handler(self):
-        """Python thread calling the user registerd message handler.
-
-        This is to emulate the old style event callback scheme. Modern
-        clients should provide their own thread to poll the event
-        queue.
-        """
-        while True:
-            r = self.message_queue.get()
-            msgname = type(r).__name__
-	    if self.event_callback:
-	        self.event_callback(msgname, r)
diff --git a/test/Makefile b/test/Makefile
index 8594633b..4338e096 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -30,7 +30,7 @@ UNITTEST_EXTRA_OPTS="-f"
 endif
 
 PYTHON_VENV_PATH=$(VPP_PYTHON_PREFIX)/virtualenv
-PYTHON_DEPENDS=scapy==2.3.3 pexpect subprocess32 git+https://github.com/klement/py-lispnetworking@setup
+PYTHON_DEPENDS=scapy==2.3.3 pexpect subprocess32 cffi git+https://github.com/klement/py-lispnetworking@setup
 SCAPY_SOURCE=$(PYTHON_VENV_PATH)/lib/python2.7/site-packages/
 BUILD_COV_DIR = $(BR)/test-cov
 
diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 2d683dc2..7f9e2ae1 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -55,7 +55,7 @@ class VppPapiProvider(object):
             for filename in fnmatch.filter(filenames, '*.api.json'):
                 jsonfiles.append(os.path.join(root, filename))
 
-        self.vpp = VPP(jsonfiles)
+        self.vpp = VPP(jsonfiles, logger=test_class.logger)
         self._events = deque()
 
     def __enter__(self):
-- 
cgit 1.2.3-korg


From d2b792b778887baafba1a53372318ef33f303232 Mon Sep 17 00:00:00 2001
From: "Alexander Popovsky (apopovsk)" <apopovsk@cisco.com>
Date: Thu, 16 Mar 2017 18:21:14 -0700
Subject: Add epel-rpm-macros for CentOS/RHEL install-dep

%py2_install is required by vpp-api-python and is not available on
bare CentOS/RHEL install, causing 'fg: no job control' error.
Added 'epel-rpm-macros' to the list of EPEL dependencies

Change-Id: I1e09d7d825d9d8db06e7385d2b8d5579c8ce748b
Signed-off-by: Alexander Popovsky (apopovsk) <apopovsk@cisco.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f47c98a5..44547067 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
 RPM_DEPENDS += python-devel python-virtualenv lcov chrpath libffi-devel
 RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
-EPEL_DEPENDS = libconfuse-devel ganglia-devel
+EPEL_DEPENDS = libconfuse-devel ganglia-devel epel-rpm-macros
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
-- 
cgit 1.2.3-korg


From 993e0edf4e8078d10ddd5efa8156d62ce8f9d0c5 Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Thu, 16 Mar 2017 09:14:59 +0100
Subject: make test: support out-of-tree tests

env EXTERN_TESTS="/path/to/extra/tests" make test

causes to run the default test set and tests collected from
test_*.py files under subtree specified in EXTERN_TESTS.

Change-Id: I58c5471dd6010730278a5b47d4318737d920bc28
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 Makefile          |  5 +++--
 test/Makefile     | 11 ++++++++---
 test/run_tests.py | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 61 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 44547067..36d37bf6 100644
--- a/Makefile
+++ b/Makefile
@@ -222,6 +222,7 @@ export VPP_PYTHON_PREFIX=$(BR)/python
 define test
 	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
 	make -C test \
+	  TEST_DIR=$(WS_ROOT)/test \
 	  VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
 	  VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
 	  VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
@@ -252,10 +253,10 @@ test-wipe:
 	@make -C test wipe
 
 test-shell: bootstrap
-	$(call test,vpp_lite,vpp_lite,shell)
+	$(call test,vpp,vpp,shell)
 
 test-shell-debug: bootstrap
-	$(call test,vpp_lite,vpp_lite_debug,shell)
+	$(call test,vpp,vpp_debug,shell)
 
 test-doc:
 	@make -C test doc
diff --git a/test/Makefile b/test/Makefile
index 4338e096..c65eaae6 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -23,10 +23,15 @@ verify-no-running-vpp:
 		false; \
 	fi
 
-UNITTEST_EXTRA_OPTS=""
+UNITTEST_EXTRA_OPTS=
+UNITTEST_FAILFAST_OPTS=
 
 ifeq ($(FAILFAST),1)
-UNITTEST_EXTRA_OPTS="-f"
+UNITTEST_EXTRA_OPTS=-f
+endif
+
+ifneq ($(EXTERN_TESTS),)
+UNITTEST_EXTRA_OPTS=$(UNITTEST_FAILFAST_OPTS) -d $(EXTERN_TESTS)
 endif
 
 PYTHON_VENV_PATH=$(VPP_PYTHON_PREFIX)/virtualenv
@@ -59,7 +64,7 @@ $(PAPI_INSTALL_DONE): $(PIP_PATCH_DONE)
 	@touch $@
 
 define retest-func
-	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py discover $(UNITTEST_EXTRA_OPTS) -p test_\"*.py\""
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py -d $(TEST_DIR) $(UNITTEST_EXTRA_OPTS)"
 endef
 
 .PHONY: sanity
diff --git a/test/run_tests.py b/test/run_tests.py
index 8f2174b1..39b09368 100644
--- a/test/run_tests.py
+++ b/test/run_tests.py
@@ -1,12 +1,61 @@
 #!/usr/bin/env python
 
+import sys
 import os
 import unittest
+import argparse
+import importlib
 from framework import VppTestRunner
 
+
+def add_from_dir(suite, directory):
+    do_insert = True
+    for _f in os.listdir(directory):
+        f = "%s/%s" % (directory, _f)
+        if os.path.isdir(f):
+            add_from_dir(suite, f)
+            continue
+        if not os.path.isfile(f):
+            continue
+        if do_insert:
+            sys.path.insert(0, directory)
+            do_insert = False
+        if not _f.startswith("test_") or not _f.endswith(".py"):
+            continue
+        name = "".join(f.split("/")[-1].split(".")[:-1])
+        if name in sys.modules:
+            raise Exception("Duplicate test module `%s' found!" % name)
+        module = importlib.import_module(name)
+        for name, cls in module.__dict__.items():
+            if not isinstance(cls, type):
+                continue
+            if not issubclass(cls, unittest.TestCase):
+                continue
+            if name == "VppTestCase":
+                continue
+            for method in dir(cls):
+                if not callable(getattr(cls, method)):
+                    continue
+                if method.startswith("test_"):
+                    suite.addTest(cls(method))
+
 if __name__ == '__main__':
     try:
         verbose = int(os.getenv("V", 0))
     except:
         verbose = 0
-    unittest.main(testRunner=VppTestRunner, module=None, verbosity=verbose)
+
+    parser = argparse.ArgumentParser(description="VPP unit tests")
+    parser.add_argument("-f", "--failfast", action='count',
+                        help="fast failure flag")
+    parser.add_argument("-d", "--dir", action='append', type=str,
+                        help="directory containing test files "
+                             "(may be specified multiple times)")
+    args = parser.parse_args()
+    failfast = True if args.failfast == 1 else False
+
+    suite = unittest.TestSuite()
+    for d in args.dir:
+        print("Adding tests from directory tree %s" % d)
+        add_from_dir(suite, d)
+    VppTestRunner(verbosity=verbose, failfast=failfast).run(suite)
-- 
cgit 1.2.3-korg


From 88d38c4f013543f7d29185a62ae3ec055edefe1a Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Tue, 21 Mar 2017 08:27:18 +0100
Subject: make test: run all tests in test-cov target

Change-Id: I7040c1ecc8b6e5e883420c1c81aa8b70e56263e5
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 36d37bf6..91c80bfd 100644
--- a/Makefile
+++ b/Makefile
@@ -265,6 +265,7 @@ test-wipe-doc:
 	@make -C test wipe-doc
 
 test-cov: bootstrap
+	$(eval EXTENDED_TESTS=yes)
 	$(call test,vpp,vpp_gcov,cov)
 
 test-wipe-cov:
-- 
cgit 1.2.3-korg


From 9f81d4fe5cfab856e23926bfdb11c03c04838478 Mon Sep 17 00:00:00 2001
From: Ole Troan <ot@cisco.com>
Date: Sat, 25 Mar 2017 19:25:05 +0100
Subject: Python-API: debian packaging now depends on python-all (for pybuild)

Change-Id: I6b1dd6bdf03fa506c4b114d15800d9fe03e36395
Signed-off-by: Ole Troan <ot@cisco.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 91c80bfd..ac571a65 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += lcov chrpath autoconf nasm
-DEB_DEPENDS += python-dev python-virtualenv python-pip libffi6
+DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else
-- 
cgit 1.2.3-korg


From 70efbfcd49aaee207ff3d33ac60083fedd9f1eec Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Mon, 20 Mar 2017 19:19:51 -0400
Subject: Check for missing deps on  bootstrap target for Centos and Fedora.

Change-Id: I823a066417fb6205d1e6b0fdf1de17b054f6d312
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 Makefile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ac571a65..bdf20e89 100644
--- a/Makefile
+++ b/Makefile
@@ -143,6 +143,21 @@ ifeq ($(OS_ID),ubuntu)
 	  exit 1 ; \
 	fi ; \
 	exit 0
+else ifneq ("$(wildcard /etc/redhat-release)","")
+	@for i in $(RPM_DEPENDS) $(EPEL_DEPENDS) ; do \
+	    RPM=$$(basename -s .rpm "$${i##*/}" | cut -d- -f1,2,3)  ;	\
+	    if [[ "$$RPM" =~ "epel-release-latest" ]] ; then		\
+	        MISSING+=$$(rpm -q epel-release | grep "^package") ;	\
+	    else							\
+		MISSING+=$$(rpm -q $$RPM | grep "^package")	   ;    \
+	    fi							   ;    \
+	done							   ;	\
+	if [ -n "$$MISSING" ] ; then \
+	  echo "Please install missing RPMs: \n$$MISSING\n" ; \
+	  echo "by executing \"make install-dep\"\n" ; \
+	  exit 1 ; \
+	fi ; \
+	exit 0
 endif
 	@echo "SOURCE_PATH = $(WS_ROOT)"                   > $(BR)/build-config.mk
 	@echo "#!/bin/bash\n"                              > $(BR)/path_setup
-- 
cgit 1.2.3-korg


From 28ea2515e55764cf3ffdb5334fece5836750edd1 Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Wed, 29 Mar 2017 10:40:16 -0400
Subject: Fix for dependency problem with Fedora 25

Change-Id: I0e86f8eb6d62c6a109876b5bf35cc62ab617608e
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index bdf20e89..8964329b 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ endif
 
 ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
 PKG=deb
-else ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
+else ifeq ($(filter rhel centos fedora,$(OS_ID)),$(OS_ID))
 PKG=rpm
 endif
 
@@ -50,7 +50,15 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel python-virtualenv lcov chrpath libffi-devel
+RPM_DEPENDS += python-devel
+ifeq ($(OS_ID)),fedora)
+ifeq ($(OS_VERSION_ID),25)
+	RPM_DEPENDS += python2-virtualenv
+else
+	RPM_DEPENDS += python-virtualenv
+endif
+endif
+RPM_DEPENDS += lcov chrpath libffi-devel
 RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
 EPEL_DEPENDS = libconfuse-devel ganglia-devel epel-rpm-macros
 
-- 
cgit 1.2.3-korg


From 937bf30183d39859c4a0717fa1a801cd556cfcfa Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@localhost.localdomain>
Date: Fri, 7 Apr 2017 01:48:47 +0000
Subject: make test: python interpreter customization

Allow using custom python interpreter via 'PYTHON' env variable.
E.g. env PYTHON=pypy make test.
Get latest pip automatically to properly function in environments,
where old pip is available and a proxy is required. This allows
testing pypy in a centos vagrant-provided vm.

Change-Id: I67a658fc927303468cc67f0ac192317ca2907625
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile      |  1 +
 test/Makefile | 24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8964329b..133c3d45 100644
--- a/Makefile
+++ b/Makefile
@@ -252,6 +252,7 @@ define test
 	  VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
 	  LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \
 	  EXTENDED_TESTS=$(EXTENDED_TESTS) \
+	  PYTHON=$(PYTHON) \
 	  $(3)
 endef
 
diff --git a/test/Makefile b/test/Makefile
index 787dd9d1..da45fb83 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -36,17 +36,29 @@ endif
 
 PYTHON_VENV_PATH=$(VPP_PYTHON_PREFIX)/virtualenv
 PYTHON_DEPENDS=scapy==2.3.3 pexpect subprocess32 cffi git+https://github.com/klement/py-lispnetworking@setup
-SCAPY_SOURCE=$(PYTHON_VENV_PATH)/lib/python2.7/site-packages/
-BUILD_COV_DIR = $(BR)/test-cov
+SCAPY_SOURCE=$(shell find $(PYTHON_VENV_PATH) -name site-packages)
+BUILD_COV_DIR=$(BR)/test-cov
 
+GET_PIP_SCRIPT=$(VPP_PYTHON_PREFIX)/get-pip.py
 PIP_INSTALL_DONE=$(VPP_PYTHON_PREFIX)/pip-install.done
 PIP_PATCH_DONE=$(VPP_PYTHON_PREFIX)/pip-patch.done
 PAPI_INSTALL_DONE=$(VPP_PYTHON_PREFIX)/papi-install.done
 
 PAPI_INSTALL_FLAGS=$(PIP_INSTALL_DONE) $(PIP_PATCH_DONE) $(PAPI_INSTALL_DONE)
 
-$(PIP_INSTALL_DONE):
-	@virtualenv $(PYTHON_VENV_PATH) -p python2.7
+ifeq ($(PYTHON),)
+PYTHON_INTERP=python2.7
+else
+PYTHON_INTERP=$(PYTHON)
+endif
+
+$(GET_PIP_SCRIPT):
+	@mkdir -p $(VPP_PYTHON_PREFIX)
+	@bash -c "cd $(VPP_PYTHON_PREFIX) && curl -O https://bootstrap.pypa.io/get-pip.py"
+
+$(PIP_INSTALL_DONE): $(GET_PIP_SCRIPT)
+	@virtualenv $(PYTHON_VENV_PATH) -p $(PYTHON_INTERP)
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python $(GET_PIP_SCRIPT)"
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install $(PYTHON_DEPENDS)"
 	@touch $@
 
@@ -114,7 +126,7 @@ wipe: reset
 	@rm -f $(PAPI_INSTALL_FLAGS)
 
 doc: verify-python-path $(PIP_PATCH_DONE)
-	@virtualenv $(PYTHON_VENV_PATH) -p python2.7
+	@virtualenv $(PYTHON_VENV_PATH) -p $(PYTHON_INTERP)
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install sphinx sphinx-rtd-theme"
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && make -C doc WS_ROOT=$(WS_ROOT) BR=$(BR) NO_VPP_PAPI=1 html"
 
@@ -139,7 +151,7 @@ wipe-cov: wipe
 
 .PHONY: checkstyle
 checkstyle: verify-python-path
-	@virtualenv $(PYTHON_VENV_PATH) -p python2.7
+	@virtualenv $(PYTHON_VENV_PATH) -p $(PYTHON_INTERP)
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install pep8"
 	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate &&\
 		pep8 --show-source -v $(WS_ROOT)/test/*.py ||\
-- 
cgit 1.2.3-korg


From c06eeb0e3c9c1a9fa8f913e2d785b03220bfdabd Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Tue, 18 Apr 2017 15:26:39 +0200
Subject: Fix "make dist" to include version number, docouple it from rpm
 packaging

Change-Id: If2f9976d668089026c97b897cf449bff09050631
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                   |  28 +++--
 build-data/platforms.mk    |  17 ---
 build-root/rpm/vpp.service |  14 ---
 build-root/rpm/vpp.spec    | 298 --------------------------------------------
 build-root/scripts/verdist |  31 -----
 extras/rpm/Makefile        |  30 +++++
 extras/rpm/vpp.service     |  14 +++
 extras/rpm/vpp.spec        | 299 +++++++++++++++++++++++++++++++++++++++++++++
 src/scripts/version        |  12 +-
 9 files changed, 367 insertions(+), 376 deletions(-)
 delete mode 100644 build-root/rpm/vpp.service
 delete mode 100644 build-root/rpm/vpp.spec
 delete mode 100755 build-root/scripts/verdist
 create mode 100644 extras/rpm/Makefile
 create mode 100644 extras/rpm/vpp.service
 create mode 100644 extras/rpm/vpp.spec

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 133c3d45..791127a7 100644
--- a/Makefile
+++ b/Makefile
@@ -214,18 +214,30 @@ else
 	$(shell $(BR)/scripts/version > $(BR)/scripts/.version)
 endif
 
-dist:	$(BR)/scripts/.version
-	$(MAKE) verstring=$(PLATFORM)-$(shell cat $(BR)/scripts/.version) prefix=$(PLATFORM) distversion
-
-distversion:	$(BR)/scripts/.version
-	$(BR)/scripts/verdist ${BR} ${prefix}-$(shell $(BR)/scripts/version rpm-version) ${verstring}
-	mv $(verstring).tar.gz $(BR)/rpm
+DIST_FILE = $(BR)/vpp-$(shell src/scripts/version).tar
+DIST_SUBDIR = vpp-$(shell src/scripts/version|cut -f1 -d-)
+
+dist:
+	@git archive \
+	  --prefix=$(DIST_SUBDIR)/ \
+	  --format=tar \
+	  -o $(DIST_FILE) \
+	  HEAD
+	@git describe > $(BR)/.version
+	@tar --append \
+	  --file $(DIST_FILE) \
+	  --transform='s,.*/.version,$(DIST_SUBDIR)/src/scripts/.version,' \
+	  $(BR)/.version
+	@$(RM) $(BR)/.version $(DIST_FILE).xz
+	@xz -v --threads=0 $(DIST_FILE)
+	@$(RM) $(BR)/vpp-latest.tar.xz
+	@ln -rs $(DIST_FILE).xz $(BR)/vpp-latest.tar.xz
 
 build: $(BR)/.bootstrap.ok
 	$(call make,$(PLATFORM)_debug,vpp-install)
 
 wipedist:
-	$(RM) $(BR)/scripts/.version $(BR)/rpm/*.tar.gz
+	@$(RM) $(BR)/*.tar.xz
 
 wipe: wipedist $(BR)/.bootstrap.ok
 	$(call make,$(PLATFORM)_debug,vpp-wipe)
@@ -351,7 +363,7 @@ pkg-deb:
 	$(call make,$(PLATFORM),install-deb)
 
 pkg-rpm: dist
-	$(call make,$(PLATFORM),install-rpm)
+	make -C extras/rpm
 
 dpdk-install-dev:
 	make -C dpdk install-$(PKG)
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index f491ee59..7904cc40 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -94,20 +94,3 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	dpkg-buildpackage -us -uc -b					\
 	)
 
-.PHONY: install-rpm
-install-rpm: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
-	@$(BUILD_ENV) ;							\
-	set -eu$(BUILD_DEBUG) ;						\
-	$(MAKE) -C $(MU_BUILD_ROOT_DIR)					\
-	    $(patsubst %,%-install,					\
-	      $(ROOT_PACKAGES))	|| exit 1;				\
-									\
-	cd rpm ;							\
-	mkdir -p SOURCES ;                                              \
-	if test -f *.tar.gz ; then mv *.tar.gz SOURCES ; fi ;           \
-	rpmbuild -bb --define "_topdir $$PWD" --define			\
-		"_install_dir $(INSTALL_PREFIX)$(ARCH)"                 \
-		--define "_mu_build_root_dir $(MU_BUILD_ROOT_DIR)"      \
-		vpp.spec ;                                              \
-	mv $$(find RPMS -name \*.rpm -type f) ..
-
diff --git a/build-root/rpm/vpp.service b/build-root/rpm/vpp.service
deleted file mode 100644
index 40bf9d48..00000000
--- a/build-root/rpm/vpp.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Vector Packet Processing Process
-After=syslog.target network.target auditd.service
-
-[Service]
-ExecStartPre=-/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api
-ExecStartPre=-/sbin/modprobe uio_pci_generic
-ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf
-Type=simple
-Restart=on-failure
-RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
deleted file mode 100644
index 2cfe67c5..00000000
--- a/build-root/rpm/vpp.spec
+++ /dev/null
@@ -1,298 +0,0 @@
-%define _mu_build_dir    %{_mu_build_root_dir}
-%define _vpp_install_dir %{_install_dir}
-%define _vpp_build_dir   build-tool-native
-%define _unitdir         /lib/systemd/system
-%define _topdir          %(pwd)
-%define _builddir        %{_topdir}
-%define _version         %(../scripts/version rpm-version)
-%define _release         %(../scripts/version rpm-release)
-
-# Failsafe backport of Python2-macros for RHEL <= 6
-%{!?python_sitelib: %global python_sitelib      %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch:    %global python_sitearch     %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%{!?python_version: %global python_version      %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])")}
-%{!?__python2:      %global __python2       %{__python}}
-%{!?python2_sitelib:    %global python2_sitelib     %{python_sitelib}}
-%{!?python2_sitearch:   %global python2_sitearch    %{python_sitearch}}
-%{!?python2_version:    %global python2_version     %{python_version}}
-
-%{!?python2_minor_version: %define python2_minor_version %(%{__python} -c "import sys ; print sys.version[2:3]")}
-
-%{?systemd_requires}
-
-Name: vpp
-Summary: Vector Packet Processing
-License: MIT
-Version: %{_version}
-Release: %{_release}
-Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python
-BuildRequires: systemd, chrpath
-
-Source: %{name}-%{_version}-%{_release}.tar.gz
-
-%description
-This package provides VPP executables: vpp, vpp_api_test, vpp_json_test
-vpp - the vector packet engine
-vpp_api_test - vector packet engine API test tool
-vpp_json_test - vector packet engine JSON test tool
-
-%package lib
-Summary: VPP libraries
-Group: System Environment/Libraries
-
-%description lib
-This package contains the VPP shared libraries, including:
-vppinfra - foundation library supporting vectors, hashes, bitmaps, pools, and string formatting.
-svm - vm library
-vlib - vector processing library
-vlib-api - binary API library
-vnet -  network stack library
-
-%package devel
-Summary: VPP header files, static libraries
-Group: Development/Libraries
-Requires: vpp-lib
-
-%description devel
-This package contains the header files for VPP.
-Install this package if you want to write a
-program for compilation and linking with vpp lib.
-vlib
-vlibmemory
-vnet - devices, classify, dhcp, ethernet flow, gre, ip, etc.
-vpp-api
-vppinfra
-
-%package plugins
-Summary: Vector Packet Processing--runtime plugins
-Group: System Environment/Libraries
-Requires: vpp = %{_version}-%{_release}
-%description plugins
-This package contains VPP plugins
-
-%package api-lua
-Summary: VPP api lua bindings
-Group: Development/Libraries
-Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
-
-%description api-lua
-This package contains the lua bindings for the vpp api
-
-%package api-java
-Summary: VPP api java bindings
-Group: Development/Libraries
-Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
-
-%description api-java
-This package contains the java bindings for the vpp api
-
-%package api-python
-Summary: VPP api python bindings
-Group: Development/Libraries
-Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}, python-setuptools libffi-devel
-
-%description api-python
-This package contains the python bindings for the vpp api
-
-%prep
-%setup -q -n %{name}-%{_version}
-
-%pre
-# Add the vpp group
-groupadd -f -r vpp
-
-%build
-cd %{_mu_build_dir}/../src/vpp-api/python && %py2_build
-
-%install
-#
-# binaries
-#
-mkdir -p -m755 %{buildroot}%{_bindir}
-mkdir -p -m755 %{buildroot}%{_unitdir}
-install -p -m 755 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/bin/* %{buildroot}%{_bindir}
-
-# api
-mkdir -p -m755 %{buildroot}/usr/share/vpp/api
-
-#
-# configs
-#
-mkdir -p -m755 %{buildroot}/etc/vpp
-mkdir -p -m755 %{buildroot}/etc/sysctl.d
-install -p -m 644 %{_mu_build_dir}/rpm/vpp.service %{buildroot}%{_unitdir}
-install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/startup.conf %{buildroot}/etc/vpp/startup.conf
-install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
-#
-# libraries
-#
-mkdir -p -m755 %{buildroot}%{_libdir}
-mkdir -p -m755 %{buildroot}/etc/bash_completion.d
-mkdir -p -m755 %{buildroot}/usr/share/vpp
-for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/lib* -type f -name '*.so.*.*.*' -print )
-do
-	install -p -m 755 $file %{buildroot}%{_libdir}
-done
-for file in $(cd %{buildroot}%{_libdir} && find . -type f -print | sed -e 's/^\.\///')
-do
-	# make lib symlinks
-	( cd %{buildroot}%{_libdir} && 
-          ln -fs $file $(echo $file | sed -e 's/\(\.so\.[0-9]\+\).*/\1/') )
-	( cd %{buildroot}%{_libdir} && 
-          ln -fs $file $(echo $file | sed -e 's/\(\.so\)\.[0-9]\+.*/\1/') )
-done
-for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/vpp/api  -type f -name '*.api.json' -print )
-do
-	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
-done
-install -p -m 644 %{_mu_build_dir}/../src/scripts/vppctl_completion %{buildroot}/etc/bash_completion.d
-install -p -m 644 %{_mu_build_dir}/../src/scripts/vppctl-cmd-list %{buildroot}/usr/share/vpp
-
-# Lua bindings
-mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/cli
-mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/lute
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua && git ls-files .)
-do
-	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua/$file \
-	   %{buildroot}/usr/share/doc/vpp/examples/lua/$file
-done
-
-# Java bindings
-mkdir -p -m755 %{buildroot}/usr/share/java
-for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/java -type f -name '*.jar' -print )
-do
-	install -p -m 644 $file %{buildroot}/usr/share/java
-done
-
-# Python bindings
-cd %{_mu_build_dir}/../src/vpp-api/python && %py2_install
-
-#
-# devel
-#
-for dir in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/include/ -maxdepth 0 -type d -print | grep -v dpdk)
-do
-	for subdir in $(cd ${dir} && find . -type d -print)
-	do
-		mkdir -p -m755 %{buildroot}/usr/include/${subdir}
-	done
-	for file in $(cd ${dir} && find . -type f -print)
-	do
-		install -p -m 644 $dir/$file %{buildroot}%{_includedir}/$file
-	done
-done
-
-mkdir -p -m755 %{buildroot}%{python2_sitelib}/jvppgen
-install -p -m755 %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin
-for i in $(ls %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do
-   install -p -m666 ${i} %{buildroot}%{python2_sitelib}/jvppgen
-done;
-
-# sample plugin
-mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/sample
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin && git ls-files .)
-do
-	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin/$file \
-	   %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/$file
-done
-
-
-#
-# vpp-plugins
-# 
-mkdir -p -m755 %{buildroot}/usr/lib/vpp_plugins
-mkdir -p -m755 %{buildroot}/usr/lib/vpp_api_test_plugins
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins && find -type f -print)
-do
-        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins/$file \
-           %{buildroot}/usr/lib/vpp_plugins/$file
-done
-
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins && find -type f -print)
-do
-        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins/$file \
-           %{buildroot}/usr/lib/vpp_api_test_plugins/$file
-done
-
-for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/plugins -type f -name '*.api.json' -print )
-do
-	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
-done
-
-#
-# remove RPATH from ELF binaries
-#
-%{_mu_build_dir}/scripts/remove-rpath %{buildroot}
-
-%post
-sysctl --system
-%systemd_post vpp.service
-
-%preun
-%systemd_preun vpp.service
-
-%postun
-%systemd_postun
-
-# Unbind user-mode PCI drivers
-removed=
-pci_dirs=`find /sys/bus/pci/drivers -type d -name igb_uio -o -name uio_pci_generic -o -name vfio-pci`
-for d in $pci_dirs; do
-    for f in ${d}/*; do
-        [ -e "${f}/config" ] || continue
-        echo ${f##*/} > ${d}/unbind
-        basename `dirname ${f}` | xargs echo -n "Removing driver"; echo " for PCI ID" `basename ${f}`
-        removed=y
-    done
-done
-if [ -n "${removed}" ]; then
-    echo "There are changes in PCI drivers, rescaning"
-    echo 1 > /sys/bus/pci/rescan
-else
-    echo "There weren't PCI devices binded"
-fi
-
-%files
-%defattr(-,bin,bin)
-%{_unitdir}/vpp.service
-/usr/bin/vpp*
-/usr/bin/svm*
-/usr/bin/elftool
-%config /etc/sysctl.d/80-vpp.conf
-%config /etc/vpp/startup.conf
-/usr/share/vpp/api/*
-
-%files lib
-%defattr(-,bin,bin)
-%exclude %{_libdir}/vpp_plugins
-%exclude %{_libdir}/vpp_api_test_plugins
-%{_libdir}/*
-/usr/share/vpp/api/*
-/etc/bash_completion.d/vppctl_completion
-/usr/share/vpp/vppctl-cmd-list
-
-%files api-lua
-%defattr(644,root,root,644)
-/usr/share/doc/vpp/examples/lua
-
-%files api-java
-%defattr(644,root,root)
-/usr/share/java/*
-
-%files api-python
-%defattr(644,root,root)
-%{python2_sitelib}/vpp_papi*
-
-%files devel
-%defattr(-,bin,bin)
-/usr/bin/vppapigen
-/usr/bin/jvpp_gen.py
-%{_includedir}/*
-%{python2_sitelib}/jvppgen/*
-/usr/share/doc/vpp/examples/sample-plugin
-
-%files plugins
-%defattr(-,bin,bin)
-/usr/lib/vpp_plugins/*
-/usr/lib/vpp_api_test_plugins/*
-/usr/share/vpp/api/*
diff --git a/build-root/scripts/verdist b/build-root/scripts/verdist
deleted file mode 100755
index 9d1f1b5a..00000000
--- a/build-root/scripts/verdist
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-#
-# Add version to dist tarball.
-#
-BR=$1
-prefix=$2
-verstring=$3
-BASE=`pwd`
-
-git rev-parse 2> /dev/null
-if [ $? == 0 ]; then
-    git archive --prefix=${prefix}/ HEAD | gzip -9 > ${verstring}.tar.gz
-else
-    cd ..
-    tar -c ${prefix} | gzip -9 > ${verstring}.tar.gz
-    cp ${verstring}.tar.gz $BASE
-    cd $BASE
-fi
-
-mkdir ${BASE}/tmp
-cd ${BASE}/tmp
-tar -xzf ${BASE}/${verstring}.tar.gz
-rm ${BASE}/${verstring}.tar.gz
-
-cp ${BR}/scripts/.version ${BASE}/tmp/${prefix}/build-root/scripts
-tar -c ${prefix} | gzip -9 > ${verstring}.tar.gz
-mv ${verstring}.tar.gz ${BASE}
-
-cd ${BASE}
-rm -rf tmp
diff --git a/extras/rpm/Makefile b/extras/rpm/Makefile
new file mode 100644
index 00000000..1dcbb203
--- /dev/null
+++ b/extras/rpm/Makefile
@@ -0,0 +1,30 @@
+# Copyright (c) 2017 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+TARBALL=$(shell realpath ../../build-root/vpp-latest.tar.xz)
+
+BASENAME=$(shell basename $(TARBALL) | sed -e s/.tar.\*//)
+VERSION=$(shell echo $(BASENAME) | cut -f2 -d-)
+RELEASE=$(shell echo $(BASENAME) | cut -f3- -d- | sed -e s/-/_/g)
+
+all:
+	@echo $(TARBALL)
+	mkdir -p SOURCES RPMS
+	cp $(TARBALL) SOURCES/vpp-latest.tar.xz
+	rpmbuild -bb \
+	  --define "_topdir $(PWD)" \
+	  --define "_version $(VERSION)" \
+	  --define "_release $(RELEASE)" \
+	  vpp.spec
+	mv $$(find RPMS -name \*.rpm -type f) .
diff --git a/extras/rpm/vpp.service b/extras/rpm/vpp.service
new file mode 100644
index 00000000..40bf9d48
--- /dev/null
+++ b/extras/rpm/vpp.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Vector Packet Processing Process
+After=syslog.target network.target auditd.service
+
+[Service]
+ExecStartPre=-/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api
+ExecStartPre=-/sbin/modprobe uio_pci_generic
+ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf
+Type=simple
+Restart=on-failure
+RestartSec=5s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
new file mode 100644
index 00000000..55b20109
--- /dev/null
+++ b/extras/rpm/vpp.spec
@@ -0,0 +1,299 @@
+%define _vpp_build_dir   build-tool-native
+%define _unitdir         /lib/systemd/system
+%define _topdir          %(pwd)
+%define _builddir        %{_topdir}
+%define _mu_build_dir    %{_topdir}/%{name}-%{_version}/build-root
+%define _vpp_install_dir install-vpp-native
+
+# Failsafe backport of Python2-macros for RHEL <= 6
+%{!?python_sitelib: %global python_sitelib      %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch:    %global python_sitearch     %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%{!?python_version: %global python_version      %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])")}
+%{!?__python2:      %global __python2       %{__python}}
+%{!?python2_sitelib:    %global python2_sitelib     %{python_sitelib}}
+%{!?python2_sitearch:   %global python2_sitearch    %{python_sitearch}}
+%{!?python2_version:    %global python2_version     %{python_version}}
+
+%{!?python2_minor_version: %define python2_minor_version %(%{__python} -c "import sys ; print sys.version[2:3]")}
+
+%{?systemd_requires}
+
+Name: vpp
+Summary: Vector Packet Processing
+License: MIT
+Version: %{_version}
+Release: %{_release}
+Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python
+BuildRequires: systemd, chrpath
+
+# Source: %{name}-%{_version}-%{_release}.tar.xz
+Source: vpp-latest.tar.xz
+
+%description
+This package provides VPP executables: vpp, vpp_api_test, vpp_json_test
+vpp - the vector packet engine
+vpp_api_test - vector packet engine API test tool
+vpp_json_test - vector packet engine JSON test tool
+
+%package lib
+Summary: VPP libraries
+Group: System Environment/Libraries
+
+%description lib
+This package contains the VPP shared libraries, including:
+vppinfra - foundation library supporting vectors, hashes, bitmaps, pools, and string formatting.
+svm - vm library
+vlib - vector processing library
+vlib-api - binary API library
+vnet -  network stack library
+
+%package devel
+Summary: VPP header files, static libraries
+Group: Development/Libraries
+Requires: vpp-lib
+
+%description devel
+This package contains the header files for VPP.
+Install this package if you want to write a
+program for compilation and linking with vpp lib.
+vlib
+vlibmemory
+vnet - devices, classify, dhcp, ethernet flow, gre, ip, etc.
+vpp-api
+vppinfra
+
+%package plugins
+Summary: Vector Packet Processing--runtime plugins
+Group: System Environment/Libraries
+Requires: vpp = %{_version}-%{_release}
+%description plugins
+This package contains VPP plugins
+
+%package api-lua
+Summary: VPP api lua bindings
+Group: Development/Libraries
+Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
+
+%description api-lua
+This package contains the lua bindings for the vpp api
+
+%package api-java
+Summary: VPP api java bindings
+Group: Development/Libraries
+Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
+
+%description api-java
+This package contains the java bindings for the vpp api
+
+%package api-python
+Summary: VPP api python bindings
+Group: Development/Libraries
+Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}, python-setuptools libffi-devel
+
+%description api-python
+This package contains the python bindings for the vpp api
+
+%prep
+%setup -q -n %{name}-%{_version}
+
+%pre
+# Add the vpp group
+groupadd -f -r vpp
+
+%build
+make bootstrap
+make -C build-root PLATFORM=vpp TAG=vpp install-packages
+cd %{_mu_build_dir}/../src/vpp-api/python && %py2_build
+
+%install
+#
+# binaries
+#
+mkdir -p -m755 %{buildroot}%{_bindir}
+mkdir -p -m755 %{buildroot}%{_unitdir}
+install -p -m 755 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/bin/* %{buildroot}%{_bindir}
+
+# api
+mkdir -p -m755 %{buildroot}/usr/share/vpp/api
+
+#
+# configs
+#
+mkdir -p -m755 %{buildroot}/etc/vpp
+mkdir -p -m755 %{buildroot}/etc/sysctl.d
+install -p -m 644 %{_topdir}/vpp.service %{buildroot}%{_unitdir}
+install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/startup.conf %{buildroot}/etc/vpp/startup.conf
+install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
+#
+# libraries
+#
+mkdir -p -m755 %{buildroot}%{_libdir}
+mkdir -p -m755 %{buildroot}/etc/bash_completion.d
+mkdir -p -m755 %{buildroot}/usr/share/vpp
+for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/lib* -type f -name '*.so.*.*.*' -print )
+do
+	install -p -m 755 $file %{buildroot}%{_libdir}
+done
+for file in $(cd %{buildroot}%{_libdir} && find . -type f -print | sed -e 's/^\.\///')
+do
+	# make lib symlinks
+	( cd %{buildroot}%{_libdir} && 
+          ln -fs $file $(echo $file | sed -e 's/\(\.so\.[0-9]\+\).*/\1/') )
+	( cd %{buildroot}%{_libdir} && 
+          ln -fs $file $(echo $file | sed -e 's/\(\.so\)\.[0-9]\+.*/\1/') )
+done
+for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/vpp/api  -type f -name '*.api.json' -print )
+do
+	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
+done
+install -p -m 644 %{_mu_build_dir}/../src/scripts/vppctl_completion %{buildroot}/etc/bash_completion.d
+install -p -m 644 %{_mu_build_dir}/../src/scripts/vppctl-cmd-list %{buildroot}/usr/share/vpp
+
+# Lua bindings
+mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/cli
+mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/lute
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua && git ls-files .)
+do
+	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua/$file \
+	   %{buildroot}/usr/share/doc/vpp/examples/lua/$file
+done
+
+# Java bindings
+mkdir -p -m755 %{buildroot}/usr/share/java
+for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/java -type f -name '*.jar' -print )
+do
+	install -p -m 644 $file %{buildroot}/usr/share/java
+done
+
+# Python bindings
+cd %{_mu_build_dir}/../src/vpp-api/python && %py2_install
+
+#
+# devel
+#
+for dir in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/include/ -maxdepth 0 -type d -print | grep -v dpdk)
+do
+	for subdir in $(cd ${dir} && find . -type d -print)
+	do
+		mkdir -p -m755 %{buildroot}/usr/include/${subdir}
+	done
+	for file in $(cd ${dir} && find . -type f -print)
+	do
+		install -p -m 644 $dir/$file %{buildroot}%{_includedir}/$file
+	done
+done
+
+mkdir -p -m755 %{buildroot}%{python2_sitelib}/jvppgen
+install -p -m755 %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin
+for i in $(ls %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do
+   install -p -m666 ${i} %{buildroot}%{python2_sitelib}/jvppgen
+done;
+
+# sample plugin
+mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/sample
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin && git ls-files .)
+do
+	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin/$file \
+	   %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/$file
+done
+
+
+#
+# vpp-plugins
+# 
+mkdir -p -m755 %{buildroot}/usr/lib/vpp_plugins
+mkdir -p -m755 %{buildroot}/usr/lib/vpp_api_test_plugins
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins && find -type f -print)
+do
+        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins/$file \
+           %{buildroot}/usr/lib/vpp_plugins/$file
+done
+
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins && find -type f -print)
+do
+        install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins/$file \
+           %{buildroot}/usr/lib/vpp_api_test_plugins/$file
+done
+
+for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/plugins -type f -name '*.api.json' -print )
+do
+	install -p -m 644 $file %{buildroot}/usr/share/vpp/api
+done
+
+#
+# remove RPATH from ELF binaries
+#
+%{_mu_build_dir}/scripts/remove-rpath %{buildroot}
+
+%post
+sysctl --system
+%systemd_post vpp.service
+
+%preun
+%systemd_preun vpp.service
+
+%postun
+%systemd_postun
+
+# Unbind user-mode PCI drivers
+removed=
+pci_dirs=`find /sys/bus/pci/drivers -type d -name igb_uio -o -name uio_pci_generic -o -name vfio-pci`
+for d in $pci_dirs; do
+    for f in ${d}/*; do
+        [ -e "${f}/config" ] || continue
+        echo ${f##*/} > ${d}/unbind
+        basename `dirname ${f}` | xargs echo -n "Removing driver"; echo " for PCI ID" `basename ${f}`
+        removed=y
+    done
+done
+if [ -n "${removed}" ]; then
+    echo "There are changes in PCI drivers, rescaning"
+    echo 1 > /sys/bus/pci/rescan
+else
+    echo "There weren't PCI devices binded"
+fi
+
+%files
+%defattr(-,bin,bin)
+%{_unitdir}/vpp.service
+/usr/bin/vpp*
+/usr/bin/svm*
+/usr/bin/elftool
+%config /etc/sysctl.d/80-vpp.conf
+%config /etc/vpp/startup.conf
+/usr/share/vpp/api/*
+
+%files lib
+%defattr(-,bin,bin)
+%exclude %{_libdir}/vpp_plugins
+%exclude %{_libdir}/vpp_api_test_plugins
+%{_libdir}/*
+/usr/share/vpp/api/*
+/etc/bash_completion.d/vppctl_completion
+/usr/share/vpp/vppctl-cmd-list
+
+%files api-lua
+%defattr(644,root,root,644)
+/usr/share/doc/vpp/examples/lua
+
+%files api-java
+%defattr(644,root,root)
+/usr/share/java/*
+
+%files api-python
+%defattr(644,root,root)
+%{python2_sitelib}/vpp_papi*
+
+%files devel
+%defattr(-,bin,bin)
+/usr/bin/vppapigen
+/usr/bin/jvpp_gen.py
+%{_includedir}/*
+%{python2_sitelib}/jvppgen/*
+/usr/share/doc/vpp/examples/sample-plugin
+
+%files plugins
+%defattr(-,bin,bin)
+/usr/lib/vpp_plugins/*
+/usr/lib/vpp_api_test_plugins/*
+/usr/share/vpp/api/*
diff --git a/src/scripts/version b/src/scripts/version
index d92eb8b7..d8728a9f 100755
--- a/src/scripts/version
+++ b/src/scripts/version
@@ -4,16 +4,12 @@ path=$( cd "$(dirname "${BASH_SOURCE}")" ; pwd -P )
 
 cd "$path"
 
-git rev-parse 2> /dev/null
-if [ $? == 0 ]; then
-    vstring=$(git describe)
-elif [ -f .version ]; then
+if [ -f .version ]; then
     vstring=$(cat .version)
 else
-    if [ -f ../rpm/*.gz ]; then
-        vstring=$(ls ../rpm/*.gz)
-    else
-        exit 1
+    vstring=$(git describe)
+    if [ $? != 0 ]; then
+      exit 1
     fi
 fi
 
-- 
cgit 1.2.3-korg


From 0bc5063ae9c52c18d353b3bd238630f3fd6839b7 Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Wed, 19 Apr 2017 08:09:01 +0200
Subject: disable extended BFD tests in verify job

Change-Id: I14484137fde8d6e77fc5905943657089347629fb
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 791127a7..44ae20e4 100644
--- a/Makefile
+++ b/Makefile
@@ -425,6 +425,6 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 endif
 	$(call banner,"Building $(PKG) packages")
 	@make pkg-$(PKG)
-	@make test-all
+	@make test
 
 
-- 
cgit 1.2.3-korg


From 686c1c8454803e48d45428a720f129f24dc981f7 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Wed, 19 Apr 2017 14:09:07 +0200
Subject: Extend ebuild to specify "configure" subdir, enable verify for
 sample-plugin

Change-Id: I2056e5d19bc3713e7a13e015dabf3b2431800973
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                                        | 2 ++
 build-data/packages/sample-plugin.mk            | 5 +++++
 build-root/Makefile                             | 6 ++++--
 src/examples/sample-plugin/sample/sample_test.c | 2 --
 4 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 build-data/packages/sample-plugin.mk

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 44ae20e4..f9a90d49 100644
--- a/Makefile
+++ b/Makefile
@@ -423,6 +423,8 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 	$(call banner,"Building for PLATFORM=vpp using clang")
 	@make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
 endif
+	$(call banner,"Building sample-plugin")
+	@make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
 	$(call banner,"Building $(PKG) packages")
 	@make pkg-$(PKG)
 	@make test
diff --git a/build-data/packages/sample-plugin.mk b/build-data/packages/sample-plugin.mk
new file mode 100644
index 00000000..fd1ee321
--- /dev/null
+++ b/build-data/packages/sample-plugin.mk
@@ -0,0 +1,5 @@
+sample-plugin_source = src
+sample-plugin_configure_subdir = examples/sample-plugin
+sample-plugin_configure_depend = vpp-install
+sample-plugin_CPPFLAGS = $(call installed_includes_fn, vpp)
+sample-plugin_LDFLAGS = $(call installed_libs_fn, vpp)
diff --git a/build-root/Makefile b/build-root/Makefile
index 8b83990e..f2f77804 100644
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -579,7 +579,7 @@ image_extra_dependencies = $($(PLATFORM)_image_extra_dependencies)
 ### dbarach
 
 configure_package_gnu =						\
-  s=$(call find_source_fn,$(PACKAGE_SOURCE)) ;			\
+  s=$(call find_source_fn,$(PACKAGE_SOURCE))$(PACKAGE_SUBDIR) ;	\
   if [ ! -f $$s/configure ] ; then				\
     autoreconf -i -f $$s ;					\
   fi ;								\
@@ -635,7 +635,8 @@ configure_check_timestamp =						\
   mkdir -p $(PACKAGE_INSTALL_DIR) ;					\
   conf="$(TIMESTAMP_DIR)/$(CONFIGURE_TIMESTAMP)" ;			\
   dirs="$(call package_mk_fn,$(PACKAGE))				\
-	$(wildcard $(call find_source_fn,$(PACKAGE_SOURCE))/configure)	\
+	$(wildcard $(call find_source_fn,				\
+	             $(PACKAGE_SOURCE))$(PACKAGE_SUBDIR)/configure)	\
        $(MU_BUILD_ROOT_DIR)/config.site" ;				\
   if [[ $(call find_newer_fn, $${conf}, $${dirs}, $?) ]]; then		\
     $(configure_package) ;						\
@@ -747,6 +748,7 @@ GIT = git
 # Multiple packages may use a single source tree.
 # For example, gcc-bootstrap package shares gcc source.
 PACKAGE_SOURCE = $(if $($(PACKAGE)_source),$($(PACKAGE)_source),$(PACKAGE))
+PACKAGE_SUBDIR = $(if $($(PACKAGE)_configure_subdir),/$($(PACKAGE)_configure_subdir),)
 
 # Use git to download source if directory is not found
 find_source_for_package =									\
diff --git a/src/examples/sample-plugin/sample/sample_test.c b/src/examples/sample-plugin/sample/sample_test.c
index b3e71c76..2298675b 100644
--- a/src/examples/sample-plugin/sample/sample_test.c
+++ b/src/examples/sample-plugin/sample/sample_test.c
@@ -92,9 +92,7 @@ _(SAMPLE_MACSWAP_ENABLE_DISABLE_REPLY, sample_macswap_enable_disable_reply)
 
 static int api_sample_macswap_enable_disable (vat_main_t * vam)
 {
-    sample_test_main_t * sm = &sample_test_main;
     unformat_input_t * i = vam->input;
-    f64 timeout;
     int enable_disable = 1;
     u32 sw_if_index = ~0;
     vl_api_sample_macswap_enable_disable_t * mp;
-- 
cgit 1.2.3-korg


From 342089672d7bbbd10066b725345b466d62846f19 Mon Sep 17 00:00:00 2001
From: "Igor Mikhailov (imichail)" <imichail@cisco.com>
Date: Tue, 2 May 2017 00:03:09 -0700
Subject: Fix RPM_DEPENDS for all rpm distros after 28ea251

Change-Id: I58ffdf75f361ff830c2b0c6400ccd012a4d16d3d
Signed-off-by: Igor Mikhailov (imichail) <imichail@cisco.com>
---
 Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f9a90d49..55365b47 100644
--- a/Makefile
+++ b/Makefile
@@ -51,13 +51,11 @@ RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
 RPM_DEPENDS += python-devel
-ifeq ($(OS_ID)),fedora)
-ifeq ($(OS_VERSION_ID),25)
+ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
 	RPM_DEPENDS += python2-virtualenv
 else
 	RPM_DEPENDS += python-virtualenv
 endif
-endif
 RPM_DEPENDS += lcov chrpath libffi-devel
 RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
 EPEL_DEPENDS = libconfuse-devel ganglia-devel epel-rpm-macros
-- 
cgit 1.2.3-korg


From 1989bce006a28781156a61ced693775a6f5aba95 Mon Sep 17 00:00:00 2001
From: "Igor Mikhailov (imichail)" <imichail@cisco.com>
Date: Thu, 4 May 2017 00:09:42 -0700
Subject: lcov is an EPEL rpm (at least for Centos)

Change-Id: I064a78df6a2cf734bb7c54f80682690c203a0a98
Signed-off-by: Igor Mikhailov (imichail) <imichail@cisco.com>
---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 55365b47..8240e789 100644
--- a/Makefile
+++ b/Makefile
@@ -56,9 +56,14 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
 else
 	RPM_DEPENDS += python-virtualenv
 endif
-RPM_DEPENDS += lcov chrpath libffi-devel
+RPM_DEPENDS += chrpath libffi-devel
 RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
 EPEL_DEPENDS = libconfuse-devel ganglia-devel epel-rpm-macros
+ifeq ($(OS_ID),centos)
+	EPEL_DEPENDS += lcov
+else
+	RPM_DEPENDS += lcov
+endif
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
-- 
cgit 1.2.3-korg


From 7bee80c823ca77de3aca803fdede77e4c7385a52 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Wed, 26 Apr 2017 15:32:12 +0200
Subject: Fix remaining 32-bit compile issues

Change-Id: I9664214652229b663c3e3ba7406b4ede96bfb123
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                                 |  8 ++++----
 build-data/platforms/vpp.mk              |  5 +++++
 src/plugins/dpdk/buffer.c                |  6 +++---
 src/plugins/ixge/ixge.c                  |  5 +++--
 src/svm/svm.c                            | 11 ++++++-----
 src/svm/svmtool.c                        |  4 ++--
 src/tools/vppapigen/gram.y               |  6 +++---
 src/tools/vppapigen/node.c               |  4 ++--
 src/uri/uri_tcp_test.c                   | 21 ++++++++++++---------
 src/uri/uri_udp_test.c                   | 15 +++++++++------
 src/vat/api_format.c                     | 10 +++++-----
 src/vlib/threads.c                       |  2 +-
 src/vlibmemory/memory_client.c           |  2 +-
 src/vlibmemory/memory_vlib.c             |  3 ++-
 src/vnet/devices/virtio/vhost-user.c     |  2 +-
 src/vnet/session/application_interface.c |  2 +-
 src/vnet/session/session_api.c           | 14 +++++++-------
 src/vnet/tcp/builtin_client.c            | 19 +++++++++++--------
 src/vnet/tcp/builtin_server.c            |  2 +-
 src/vppinfra/mheap.c                     |  2 +-
 20 files changed, 80 insertions(+), 63 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8240e789..b344f377 100644
--- a/Makefile
+++ b/Makefile
@@ -263,9 +263,9 @@ define test
 	  TEST_DIR=$(WS_ROOT)/test \
 	  VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
 	  VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
-	  VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
+	  VPP_TEST_PLUGIN_PATH=$(wildcard $(BR)/install-$(2)-native/vpp/lib*/vpp_plugins) \
 	  VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
-	  LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \
+	  LD_LIBRARY_PATH=$(subst $(subst ,, ),:,$(wildcard $(BR)/install-$(2)-native/vpp/lib*/)) \
 	  EXTENDED_TESTS=$(EXTENDED_TESTS) \
 	  PYTHON=$(PYTHON) \
 	  $(3)
@@ -325,12 +325,12 @@ define run
 	@echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
 	@echo "         Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
 	@cd $(STARTUP_DIR) && \
-	  sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) plugin_path $(1)/vpp/lib64/vpp_plugins
+	  sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) plugin_path $(wildcard $(1)/vpp/lib*/vpp_plugins)
 endef
 else
 define run
 	@cd $(STARTUP_DIR) && \
-	  sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(1)/vpp/lib64/vpp_plugins
+	  sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(wildcard $(1)/vpp/lib*/vpp_plugins)
 endef
 endif
 
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 5aafdd76..4577fa2e 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -46,6 +46,11 @@ vpp_root_packages = vpp gmod
 # vpp_dpdk_lib_dir = /usr/lib
 # vpp_dpdk_shared_lib = yes
 
+# load balancer plugin is not portable on 32 bit platform
+ifeq ($(MACHINE),i686)
+vpp_configure_args_vpp = --disable-lb-plugin
+endif
+
 vpp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
 	-fstack-protector-all -fPIC -Werror
 vpp_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c
index c80b3fa8..2d4762ab 100644
--- a/src/plugins/dpdk/buffer.c
+++ b/src/plugins/dpdk/buffer.c
@@ -455,8 +455,8 @@ vlib_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs,
 	uword save_vpm_start, save_vpm_end, save_vpm_size;
 	struct rte_mempool_memhdr *memhdr;
 
-	this_pool_start = ~0ULL;
-	this_pool_end = 0LL;
+	this_pool_start = ~0;
+	this_pool_end = 0;
 
 	STAILQ_FOREACH (memhdr, &rmp->mem_list, next)
 	{
@@ -465,7 +465,7 @@ vlib_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs,
 	  if (((uword) memhdr->addr) < this_pool_start)
 	    this_pool_start = (uword) (memhdr->addr);
 	}
-	ASSERT (this_pool_start < ~0ULL && this_pool_end > 0);
+	ASSERT (this_pool_start < ~0 && this_pool_end > 0);
 	this_pool_size = this_pool_end - this_pool_start;
 
 	if (CLIB_DEBUG > 1)
diff --git a/src/plugins/ixge/ixge.c b/src/plugins/ixge/ixge.c
index 08f5b692..0d287250 100644
--- a/src/plugins/ixge/ixge.c
+++ b/src/plugins/ixge/ixge.c
@@ -20,7 +20,7 @@
  *   Please use supported DPDK driver instead.
  */
 
-#if __x86_64__
+#if __x86_64__ || __i386__
 #include <vppinfra/vector.h>
 
 #ifndef CLIB_HAVE_VEC128
@@ -2929,7 +2929,6 @@ ixge_set_next_node (ixge_rx_next_t next, char *name)
       break;
     }
 }
-#endif
 
 /* *INDENT-OFF* */
 VLIB_PLUGIN_REGISTER () = {
@@ -2937,8 +2936,10 @@ VLIB_PLUGIN_REGISTER () = {
     .default_disabled = 1,
     .description = "Intel 82599 Family Native Driver (experimental)",
 };
+#endif
 
 /* *INDENT-ON* */
+
 /*
  * fd.io coding-style-patch-verification: ON
  *
diff --git a/src/svm/svm.c b/src/svm/svm.c
index 97add5a7..c96135cf 100644
--- a/src/svm/svm.c
+++ b/src/svm/svm.c
@@ -491,7 +491,7 @@ svm_map_region (svm_map_region_args_t * a)
 	  return (0);
 	}
 
-      rp = mmap ((void *) a->baseva, a->size,
+      rp = mmap (uword_to_pointer (a->baseva, void *), a->size,
 		 PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, svm_fd, 0);
 
       if (rp == (svm_region_t *) MAP_FAILED)
@@ -533,9 +533,10 @@ svm_map_region (svm_map_region_args_t * a)
       rp->virtual_size = a->size;
 
       rp->region_heap =
-	mheap_alloc_with_flags ((void *) (a->baseva + MMAP_PAGESIZE),
-				(a->pvt_heap_size != 0) ?
-				a->pvt_heap_size : SVM_PVT_MHEAP_SIZE,
+	mheap_alloc_with_flags (uword_to_pointer
+				(a->baseva + MMAP_PAGESIZE, void *),
+				(a->pvt_heap_size !=
+				 0) ? a->pvt_heap_size : SVM_PVT_MHEAP_SIZE,
 				MHEAP_FLAG_DISABLE_VM);
       oldheap = svm_push_pvt_heap (rp);
 
@@ -661,7 +662,7 @@ svm_map_region (svm_map_region_args_t * a)
       a->size = rp->virtual_size;
       munmap (rp, MMAP_PAGESIZE);
 
-      rp = (void *) mmap ((void *) a->baseva, a->size,
+      rp = (void *) mmap (uword_to_pointer (a->baseva, void *), a->size,
 			  PROT_READ | PROT_WRITE,
 			  MAP_SHARED | MAP_FIXED, svm_fd, 0);
       if ((uword) rp == (uword) MAP_FAILED)
diff --git a/src/svm/svmtool.c b/src/svm/svmtool.c
index b3195514..01ae4221 100644
--- a/src/svm/svmtool.c
+++ b/src/svm/svmtool.c
@@ -172,7 +172,7 @@ svm_map_region_nolock (svm_map_region_args_t * a)
   a->size = rp->virtual_size;
   munmap (rp, MMAP_PAGESIZE);
 
-  rp = (void *) mmap ((void *) a->baseva, a->size,
+  rp = (void *) mmap (uword_to_pointer (a->baseva, void *), a->size,
 		      PROT_READ | PROT_WRITE,
 		      MAP_SHARED | MAP_FIXED, svm_fd, 0);
   if ((uword) rp == (uword) MAP_FAILED)
@@ -401,7 +401,7 @@ repair (char *chroot_path, int crash_root_region)
   a->size = root_rp->virtual_size;
   munmap (root_rp, MMAP_PAGESIZE);
 
-  root_rp = (void *) mmap ((void *) a->baseva, a->size,
+  root_rp = (void *) mmap (uword_to_pointer (a->baseva, void *), a->size,
 			   PROT_READ | PROT_WRITE,
 			   MAP_SHARED | MAP_FIXED, svm_fd, 0);
   if ((uword) root_rp == (uword) MAP_FAILED)
diff --git a/src/tools/vppapigen/gram.y b/src/tools/vppapigen/gram.y
index 9cea6023..52bb65c5 100644
--- a/src/tools/vppapigen/gram.y
+++ b/src/tools/vppapigen/gram.y
@@ -53,9 +53,9 @@ stmt:     flist defn            {$$ = set_flags($1, $2);}
         | defn                  {$$ = $1;}
           ;
 
-flist:    flist flag            {$$ = (YYSTYPE)(unsigned long long)
-                                     ((unsigned long long) $1 
-                                    | (unsigned long long) $2);}
+flist:    flist flag            {$$ = (YYSTYPE)(unsigned long)
+                                     ((unsigned long) $1 
+                                    | (unsigned long) $2);}
         | flag                  {$$ = $1;}
           ;
 
diff --git a/src/tools/vppapigen/node.c b/src/tools/vppapigen/node.c
index 9f234037..15868ee5 100644
--- a/src/tools/vppapigen/node.c
+++ b/src/tools/vppapigen/node.c
@@ -397,7 +397,7 @@ void node_define_generate (node_t *this, enum passid which, FILE *fp)
 	    fprintf(fp, ",\n");
         }
 	indent_me(fp);
-	fprintf (fp, "{\"crc\" : \"0x%08x\"}\n", (u32)(u64)CDATA3);
+	fprintf (fp, "{\"crc\" : \"0x%08x\"}\n", (u32)(uword)CDATA3);
         indent -= 4;
 	indent_me(fp);
         fprintf(fp, "]");
@@ -1219,7 +1219,7 @@ void generate_msg_name_crc_list (YYSTYPE a1, FILE *fp)
             if (!(np->flags & NODE_FLAG_TYPEONLY)) {
                 fprintf (fp, "\\\n_(VL_API_%s, %s, %08x) ",
                          uppercase (np->data[0]), (i8 *) np->data[0],
-                         (u32)(u64)np->data[3]);
+                         (u32)(uword)np->data[3]);
             }
         }
         np = np->peer;
diff --git a/src/uri/uri_tcp_test.c b/src/uri/uri_tcp_test.c
index b15fd6ce..22f246e5 100755
--- a/src/uri/uri_tcp_test.c
+++ b/src/uri/uri_tcp_test.c
@@ -262,7 +262,8 @@ vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t *
     }
 
   utm->our_event_queue =
-    (unix_shared_memory_queue_t *) mp->app_event_queue_address;
+    uword_to_pointer (mp->app_event_queue_address,
+		      unix_shared_memory_queue_t *);
   utm->state = STATE_ATTACHED;
 }
 
@@ -524,8 +525,9 @@ vl_api_connect_uri_reply_t_handler (vl_api_connect_uri_reply_t * mp)
       return;
     }
 
-  utm->vpp_event_queue = (unix_shared_memory_queue_t *)
-    mp->vpp_event_queue_address;
+  utm->vpp_event_queue =
+    uword_to_pointer (mp->vpp_event_queue_address,
+		      unix_shared_memory_queue_t *);
 
   /*
    * Setup session
@@ -534,9 +536,9 @@ vl_api_connect_uri_reply_t_handler (vl_api_connect_uri_reply_t * mp)
   pool_get (utm->sessions, session);
   session_index = session - utm->sessions;
 
-  rx_fifo = (svm_fifo_t *) mp->server_rx_fifo;
+  rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *);
   rx_fifo->client_session_index = session_index;
-  tx_fifo = (svm_fifo_t *) mp->server_tx_fifo;
+  tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *);
   tx_fifo->client_session_index = session_index;
 
   session->server_rx_fifo = rx_fifo;
@@ -858,16 +860,17 @@ vl_api_accept_session_t_handler (vl_api_accept_session_t * mp)
   ip_str = format (0, "%U", format_ip46_address, &mp->ip, mp->is_ip4);
   clib_warning ("Accepted session from: %s:%d", ip_str,
 		clib_net_to_host_u16 (mp->port));
-  utm->vpp_event_queue = (unix_shared_memory_queue_t *)
-    mp->vpp_event_queue_address;
+  utm->vpp_event_queue =
+    uword_to_pointer (mp->vpp_event_queue_address,
+		      unix_shared_memory_queue_t *);
 
   /* Allocate local session and set it up */
   pool_get (utm->sessions, session);
   session_index = session - utm->sessions;
 
-  rx_fifo = (svm_fifo_t *) mp->server_rx_fifo;
+  rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *);
   rx_fifo->client_session_index = session_index;
-  tx_fifo = (svm_fifo_t *) mp->server_tx_fifo;
+  tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *);
   tx_fifo->client_session_index = session_index;
 
   session->server_rx_fifo = rx_fifo;
diff --git a/src/uri/uri_udp_test.c b/src/uri/uri_udp_test.c
index 266215c8..8fb12ed2 100644
--- a/src/uri/uri_udp_test.c
+++ b/src/uri/uri_udp_test.c
@@ -232,7 +232,8 @@ vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t *
     }
 
   utm->our_event_queue =
-    (unix_shared_memory_queue_t *) mp->app_event_queue_address;
+    uword_to_pointer (mp->app_event_queue_address,
+		      unix_shared_memory_queue_t *);
 }
 
 static void
@@ -581,7 +582,8 @@ send_reply:
 
   vec_free (a->segment_name);
 
-  client_q = (unix_shared_memory_queue_t *) mp->client_queue_address;
+  client_q =
+    uword_to_pointer (mp->client_queue_address, unix_shared_memory_queue_t *);
   vl_msg_api_send_shmem (client_q, (u8 *) & rmp);
 }
 
@@ -608,14 +610,15 @@ vl_api_accept_session_t_handler (vl_api_accept_session_t * mp)
   if (start_time == 0.0)
     start_time = clib_time_now (&utm->clib_time);
 
-  utm->vpp_event_queue = (unix_shared_memory_queue_t *)
-    mp->vpp_event_queue_address;
+  utm->vpp_event_queue =
+    uword_to_pointer (mp->vpp_event_queue_address,
+		      unix_shared_memory_queue_t *);
 
   pool_get (utm->sessions, session);
 
-  rx_fifo = (svm_fifo_t *) mp->server_rx_fifo;
+  rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *);
   rx_fifo->client_session_index = session - utm->sessions;
-  tx_fifo = (svm_fifo_t *) mp->server_tx_fifo;
+  tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *);
   tx_fifo->client_session_index = session - utm->sessions;
 
   session->server_rx_fifo = rx_fifo;
diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index 28b227b4..495b660e 100644
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -1037,7 +1037,7 @@ vl_api_cli_reply_t_handler (vl_api_cli_reply_t * mp)
   i32 retval = ntohl (mp->retval);
 
   vam->retval = retval;
-  vam->shmem_result = (u8 *) mp->reply_in_shmem;
+  vam->shmem_result = uword_to_pointer (mp->reply_in_shmem, u8 *);
   vam->result_ready = 1;
 }
 
@@ -1058,7 +1058,7 @@ vl_api_cli_reply_t_handler_json (vl_api_cli_reply_t * mp)
   pthread_mutex_lock (&am->vlib_rp->mutex);
   oldheap = svm_push_data_heap (am->vlib_rp);
 
-  reply = (u8 *) (mp->reply_in_shmem);
+  reply = uword_to_pointer (mp->reply_in_shmem, u8 *);
   vec_free (reply);
 
   svm_pop_heap (oldheap);
@@ -2405,7 +2405,7 @@ static void vl_api_get_node_graph_reply_t_handler
   if (retval != 0)
     return;
 
-  reply = (u8 *) (mp->reply_in_shmem);
+  reply = uword_to_pointer (mp->reply_in_shmem, u8 *);
   pvt_copy = vec_dup (reply);
 
   /* Toss the shared-memory original... */
@@ -2456,7 +2456,7 @@ static void vl_api_get_node_graph_reply_t_handler_json
   vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
   vat_json_object_add_uint (&node, "reply_in_shmem", mp->reply_in_shmem);
 
-  reply = (u8 *) (mp->reply_in_shmem);
+  reply = uword_to_pointer (mp->reply_in_shmem, u8 *);
 
   /* Toss the shared-memory original... */
   pthread_mutex_lock (&am->vlib_rp->mutex);
@@ -4959,7 +4959,7 @@ exec (vat_main_t * vam)
   svm_pop_heap (oldheap);
   pthread_mutex_unlock (&am->vlib_rp->mutex);
 
-  mp->cmd_in_shmem = (u64) cmd;
+  mp->cmd_in_shmem = pointer_to_uword (cmd);
   S (mp);
   timeout = vat_time_now (vam) + 10.0;
 
diff --git a/src/vlib/threads.c b/src/vlib/threads.c
index 4a111f8d..9ccfd3a2 100644
--- a/src/vlib/threads.c
+++ b/src/vlib/threads.c
@@ -1125,7 +1125,7 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
 
 VLIB_EARLY_CONFIG_FUNCTION (cpu_config, "cpu");
 
-#if !defined (__x86_64__) && !defined (__aarch64__) && !defined (__powerpc64__) && !defined(__arm__)
+#if !defined (__x86_64__) && !defined (__i386__) && !defined (__aarch64__) && !defined (__powerpc64__) && !defined(__arm__)
 void
 __sync_fetch_and_add_8 (void)
 {
diff --git a/src/vlibmemory/memory_client.c b/src/vlibmemory/memory_client.c
index d48a4fa1..a162d6bb 100644
--- a/src/vlibmemory/memory_client.c
+++ b/src/vlibmemory/memory_client.c
@@ -137,7 +137,7 @@ vl_api_memclnt_create_reply_t_handler (vl_api_memclnt_create_reply_t * mp)
   am->msg_index_by_name_and_crc = hash_create_string (0, sizeof (uword));
 
   /* Recreate the vnet-side API message handler table */
-  tblv = (u8 *) mp->message_table;
+  tblv = uword_to_pointer (mp->message_table, u8 *);
   serialize_open_vector (sm, tblv);
   unserialize_integer (sm, &nmsgs, sizeof (u32));
 
diff --git a/src/vlibmemory/memory_vlib.c b/src/vlibmemory/memory_vlib.c
index 29a5c2c2..acba8b3f 100644
--- a/src/vlibmemory/memory_vlib.c
+++ b/src/vlibmemory/memory_vlib.c
@@ -216,7 +216,8 @@ vl_api_memclnt_create_t_handler (vl_api_memclnt_create_t * mp)
      am->shmem_hdr->application_restarts);
   rp->context = mp->context;
   rp->response = ntohl (rv);
-  rp->message_table = (u64) am->serialized_message_table_in_shmem;
+  rp->message_table =
+    pointer_to_uword (am->serialized_message_table_in_shmem);
 
   vl_msg_api_send_shmem (q, (u8 *) & rp);
 }
diff --git a/src/vnet/devices/virtio/vhost-user.c b/src/vnet/devices/virtio/vhost-user.c
index acc7bf82..6ccc0d87 100644
--- a/src/vnet/devices/virtio/vhost-user.c
+++ b/src/vnet/devices/virtio/vhost-user.c
@@ -719,7 +719,7 @@ vhost_user_log_dirty_pages_2 (vhost_user_intf_t * vui,
     }
   if (is_host_address)
     {
-      addr = (u64) map_user_mem (vui, (uword) addr);
+      addr = pointer_to_uword (map_user_mem (vui, (uword) addr));
     }
   if (PREDICT_FALSE ((addr + len - 1) / VHOST_LOG_PAGE / 8 >= vui->log_size))
     {
diff --git a/src/vnet/session/application_interface.c b/src/vnet/session/application_interface.c
index ad44baa1..f74b0cfe 100644
--- a/src/vnet/session/application_interface.c
+++ b/src/vnet/session/application_interface.c
@@ -247,7 +247,7 @@ vnet_application_attach (vnet_app_attach_args_t * a)
 			      a->session_cb_vft)))
     return rv;
 
-  a->app_event_queue_address = (u64) app->event_queue;
+  a->app_event_queue_address = pointer_to_uword (app->event_queue);
   sm = segment_manager_get (app->first_segment_manager);
   segment_manager_get_segment_info (sm->segment_indices[0],
 				    &seg_name, &a->segment_size);
diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c
index 5a02a08e..8266922c 100755
--- a/src/vnet/session/session_api.c
+++ b/src/vnet/session/session_api.c
@@ -102,9 +102,9 @@ send_session_accept_callback (stream_session_t * s)
   tc = tp_vft->get_connection (s->connection_index, s->thread_index);
   mp->listener_handle = listen_session_get_handle (listener);
   mp->handle = stream_session_handle (s);
-  mp->server_rx_fifo = (u64) s->server_rx_fifo;
-  mp->server_tx_fifo = (u64) s->server_tx_fifo;
-  mp->vpp_event_queue_address = (u64) vpp_queue;
+  mp->server_rx_fifo = pointer_to_uword (s->server_rx_fifo);
+  mp->server_tx_fifo = pointer_to_uword (s->server_tx_fifo);
+  mp->vpp_event_queue_address = pointer_to_uword (vpp_queue);
   mp->port = tc->rmt_port;
   mp->is_ip4 = tc->is_ip4;
   clib_memcpy (&mp->ip, &tc->rmt_ip, sizeof (tc->rmt_ip));
@@ -172,10 +172,10 @@ send_session_connected_callback (u32 app_index, u32 api_context,
   if (!is_fail)
     {
       vpp_queue = session_manager_get_vpp_event_queue (s->thread_index);
-      mp->server_rx_fifo = (u64) s->server_rx_fifo;
-      mp->server_tx_fifo = (u64) s->server_tx_fifo;
+      mp->server_rx_fifo = pointer_to_uword (s->server_rx_fifo);
+      mp->server_tx_fifo = pointer_to_uword (s->server_tx_fifo);
       mp->handle = stream_session_handle (s);
-      mp->vpp_event_queue_address = (u64) vpp_queue;
+      mp->vpp_event_queue_address = pointer_to_uword (vpp_queue);
       mp->retval = 0;
     }
   else
@@ -225,7 +225,7 @@ redirect_connect_callback (u32 server_api_client_index, void *mp_arg)
     }
 
   /* Tell the server the client's API queue address, so it can reply */
-  mp->client_queue_address = (u64) client_q;
+  mp->client_queue_address = pointer_to_uword (client_q);
   app = application_lookup (mp->client_index);
   if (!app)
     {
diff --git a/src/vnet/tcp/builtin_client.c b/src/vnet/tcp/builtin_client.c
index 32d69a96..6f890874 100644
--- a/src/vnet/tcp/builtin_client.c
+++ b/src/vnet/tcp/builtin_client.c
@@ -274,11 +274,12 @@ vl_api_connect_uri_reply_t_handler (vl_api_connect_uri_reply_t * mp)
       return;
     }
 
-  tm->our_event_queue = (unix_shared_memory_queue_t *)
-    mp->vpp_event_queue_address;
-
-  tm->vpp_event_queue = (unix_shared_memory_queue_t *)
-    mp->vpp_event_queue_address;
+  tm->our_event_queue =
+    uword_to_pointer (mp->vpp_event_queue_address,
+		      unix_shared_memory_queue_t *);
+  tm->vpp_event_queue =
+    uword_to_pointer (mp->vpp_event_queue_address,
+		      unix_shared_memory_queue_t *);
 
   /*
    * Setup session
@@ -288,9 +289,11 @@ vl_api_connect_uri_reply_t_handler (vl_api_connect_uri_reply_t * mp)
   session_index = session - tm->sessions;
   session->bytes_to_receive = session->bytes_to_send = tm->bytes_to_send;
 
-  session->server_rx_fifo = (svm_fifo_t *) mp->server_rx_fifo;
+  session->server_rx_fifo =
+    uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *);
   session->server_rx_fifo->client_session_index = session_index;
-  session->server_tx_fifo = (svm_fifo_t *) mp->server_tx_fifo;
+  session->server_tx_fifo =
+    uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *);
   session->server_tx_fifo->client_session_index = session_index;
   session->vpp_session_handle = mp->handle;
 
@@ -321,7 +324,7 @@ create_api_loopback (tclient_main_t * tm)
   memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = VL_API_MEMCLNT_CREATE;
   mp->context = 0xFEEDFACE;
-  mp->input_queue = (u64) tm->vl_input_queue;
+  mp->input_queue = pointer_to_uword (tm->vl_input_queue);
   strncpy ((char *) mp->name, "tcp_tester", sizeof (mp->name) - 1);
 
   vl_api_memclnt_create_t_handler (mp);
diff --git a/src/vnet/tcp/builtin_server.c b/src/vnet/tcp/builtin_server.c
index 34682699..621ce02a 100644
--- a/src/vnet/tcp/builtin_server.c
+++ b/src/vnet/tcp/builtin_server.c
@@ -244,7 +244,7 @@ create_api_loopback (vlib_main_t * vm)
   memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = VL_API_MEMCLNT_CREATE;
   mp->context = 0xFEEDFACE;
-  mp->input_queue = (u64) bsm->vl_input_queue;
+  mp->input_queue = pointer_to_uword (bsm->vl_input_queue);
   strncpy ((char *) mp->name, "tcp_test_server", sizeof (mp->name) - 1);
 
   vl_api_memclnt_create_t_handler (mp);
diff --git a/src/vppinfra/mheap.c b/src/vppinfra/mheap.c
index b8828f9e..192732db 100644
--- a/src/vppinfra/mheap.c
+++ b/src/vppinfra/mheap.c
@@ -304,7 +304,7 @@ mheap_small_object_cache_mask (mheap_small_object_cache_t * c, uword bin)
   uword mask;
 
 /* $$$$ ELIOT FIXME: add Altivec version of this routine */
-#if !defined (CLIB_HAVE_VEC128) || defined (__ALTIVEC__)
+#if !defined (CLIB_HAVE_VEC128) || defined (__ALTIVEC__) || defined (__i386__)
   mask = 0;
 #else
   u8x16 b = u8x16_splat (bin);
-- 
cgit 1.2.3-korg


From ee29dd2811f6d10b99c9dd58878434957c83f194 Mon Sep 17 00:00:00 2001
From: "Igor Mikhailov (imichail)" <imichail@cisco.com>
Date: Tue, 9 May 2017 23:27:14 -0700
Subject: Generate test paths for lib and lib64 subdirectories

wildcard produces empty paths when 'make test' is run
from a clean tree: install-<tag>-native directories
don't exist yet.

Change-Id: I3b3bbd86cf7eda18f2c698f85b834f82b1a19065
Signed-off-by: Igor Mikhailov (imichail) <imichail@cisco.com>
---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b344f377..6a128fa8 100644
--- a/Makefile
+++ b/Makefile
@@ -257,15 +257,18 @@ rebuild-release: wipe-release build-release
 
 export VPP_PYTHON_PREFIX=$(BR)/python
 
+libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3)))
+
 define test
 	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
+	$(eval libs:=lib lib64)
 	make -C test \
 	  TEST_DIR=$(WS_ROOT)/test \
 	  VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
 	  VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
-	  VPP_TEST_PLUGIN_PATH=$(wildcard $(BR)/install-$(2)-native/vpp/lib*/vpp_plugins) \
+	  VPP_TEST_PLUGIN_PATH=$(call libexpand,$(libs),$(2),vpp_plugins) \
 	  VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
-	  LD_LIBRARY_PATH=$(subst $(subst ,, ),:,$(wildcard $(BR)/install-$(2)-native/vpp/lib*/)) \
+	  LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \
 	  EXTENDED_TESTS=$(EXTENDED_TESTS) \
 	  PYTHON=$(PYTHON) \
 	  $(3)
-- 
cgit 1.2.3-korg


From fa7f9fddf27efb33ab34fc7fe7fa58b1c7a240d0 Mon Sep 17 00:00:00 2001
From: Dave Wallace <dwallacelf@gmail.com>
Date: Thu, 18 May 2017 01:03:15 -0400
Subject: Add indent to DEB_DEPENDS missing in vagrant box.

Change-Id: Icb9412ed09095443c20ae1fe2b71b646bbe580b0
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6a128fa8..f494f79e 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ endif
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += lcov chrpath autoconf nasm
+DEB_DEPENDS += lcov chrpath autoconf nasm indent
 DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
-- 
cgit 1.2.3-korg


From bc1c848772dc9101b3d034634ee69ab6cc0dba14 Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Wed, 17 May 2017 19:00:07 -0400
Subject: Remove specific versions of some packages. Add lcov for rhel. Correct
 fedora Development tools group and rpm-build.

Change-Id: I0a19e239e6bc4f34f3aacfbb7e08e2abbdc061ed
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f494f79e..41e3e711 100644
--- a/Makefile
+++ b/Makefile
@@ -47,19 +47,20 @@ else
 	DEB_DEPENDS += default-jdk-headless
 endif
 
-RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
 RPM_DEPENDS += python-devel
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
 	RPM_DEPENDS += python2-virtualenv
+	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else
 	RPM_DEPENDS += python-virtualenv
+	RPM_DEPENDS_GROUPS = 'Development Tools'
 endif
-RPM_DEPENDS += chrpath libffi-devel
+RPM_DEPENDS += chrpath libffi-devel rpm-build
 RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
 EPEL_DEPENDS = libconfuse-devel ganglia-devel epel-rpm-macros
-ifeq ($(OS_ID),centos)
+ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
 	EPEL_DEPENDS += lcov
 else
 	RPM_DEPENDS += lcov
@@ -201,7 +202,7 @@ else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
 	@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
 	@sudo -E yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS)
-	@sudo -E debuginfo-install $(CONFIRM) glibc-2.17-106.el7_2.4.x86_64 openssl-libs-1.0.1e-51.el7_2.4.x86_64 zlib-1.2.7-15.el7.x86_64
+	@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib
 else
 	$(error "This option currently works only on Ubuntu or Centos systems")
 endif
-- 
cgit 1.2.3-korg


From aade2c5a703b7d68fb2532e30bf84ab05e2ad152 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Mon, 22 May 2017 16:56:54 +0200
Subject: Disable "make test" for CentOS

Due to issues with python on centos we cannot reliably
execute "make test". To be removed after problem is solved.

Change-Id: I92d2b647c72a8ba58cf8a9d4b443357e61ef403f
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 41e3e711..aa15731f 100644
--- a/Makefile
+++ b/Makefile
@@ -434,6 +434,8 @@ endif
 	@make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
 	$(call banner,"Building $(PKG) packages")
 	@make pkg-$(PKG)
+ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 	@make test
+endif
 
 
-- 
cgit 1.2.3-korg


From 9b6463d72d1cff53476d465ce1a16be9c4b4b5c0 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Mon, 29 May 2017 12:29:05 +0200
Subject: Add Debian Jessie support in toplevel makefile

Change-Id: I805800503f5330c14d2e654c02bf43e21e7ce917
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index aa15731f..946a8583 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,9 @@ DEB_DEPENDS += lcov chrpath autoconf nasm indent
 DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
+	DEB_DEPENDS += openjdk-8-jdk-headless
+	APT_ARGS = -t jessie-backports
 else
 	DEB_DEPENDS += default-jdk-headless
 endif
@@ -147,7 +150,7 @@ $(BR)/.bootstrap.ok:
 ifeq ($(findstring y,$(UNATTENDED)),y)
 	make install-dep
 endif
-ifeq ($(OS_ID),ubuntu)
+ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
 	@MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
 	if [ -n "$$MISSING" ] ; then \
 	  echo "\nPlease install missing packages: \n$$MISSING\n" ; \
@@ -191,20 +194,24 @@ endif
 bootstrap: $(BR)/.bootstrap.ok
 
 install-dep:
-ifeq ($(OS_ID),ubuntu)
+ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
 ifeq ($(OS_VERSION_ID),14.04)
 	@sudo -E apt-get $(CONFIRM) $(FORCE) install software-properties-common
 	@sudo -E add-apt-repository ppa:openjdk-r/ppa $(CONFIRM)
+endif
+ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
+	@grep -q jessie-backports /etc/apt/sources.list /etc/apt/sources.list.d/* 2> /dev/null \
+           || ( echo "Please install jessie-backports" ; exit 1 )
 endif
 	@sudo -E apt-get update
-	@sudo -E apt-get $(CONFIRM) $(FORCE) install $(DEB_DEPENDS)
+	@sudo -E apt-get $(APT_ARGS) $(CONFIRM) $(FORCE) install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
 	@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
 	@sudo -E yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS)
 	@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib
 else
-	$(error "This option currently works only on Ubuntu or Centos systems")
+	$(error "This option currently works only on Ubuntu, Debian or Centos systems")
 endif
 
 define make
-- 
cgit 1.2.3-korg


From 0e2e10b77d63196bfb93ae5be1251bbc1a1b561a Mon Sep 17 00:00:00 2001
From: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
Date: Wed, 22 Mar 2017 15:22:14 +0000
Subject: dpdk: build sw cryptodev support with make verify

Change-Id: Ica95b5d3d44563c93c89b2a3233171c3aa1f048d
Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
---
 Makefile      | 12 +++++++-----
 dpdk/Makefile | 13 +++++++++----
 2 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 946a8583..f78549f4 100644
--- a/Makefile
+++ b/Makefile
@@ -427,22 +427,24 @@ define banner
 	@echo " "
 endef
 
-verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev
+verify: install-dep $(BR)/.bootstrap.ok
+	make -C dpdk install-$(PKG) DPDK_CRYPTO_SW_PMD=y
 	$(call banner,"Building for PLATFORM=vpp using gcc")
-	@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
+	@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages \
+	      vpp_uses_dpdk_cryptodev_sw=yes
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 	$(call banner,"Installing dependencies")
 	@sudo -E apt-get update
 	@sudo -E apt-get $(CONFIRM) $(FORCE) install clang
 	$(call banner,"Building for PLATFORM=vpp using clang")
-	@make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
+	@make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang \
+	      wipe-all install-packages vpp_uses_dpdk_cryptodev_sw=yes
 endif
 	$(call banner,"Building sample-plugin")
 	@make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
 	$(call banner,"Building $(PKG) packages")
-	@make pkg-$(PKG)
+	@make pkg-$(PKG) vpp_uses_dpdk_cryptodev_sw=yes
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 	@make test
 endif
 
-
diff --git a/dpdk/Makefile b/dpdk/Makefile
index c6968d7c..495b4919 100644
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -26,7 +26,7 @@ DPDK_MLX5_PMD         ?= n
 B := $(DPDK_BUILD_DIR)
 I := $(DPDK_INSTALL_DIR)
 DPDK_VERSION ?= 17.05
-PKG_SUFFIX ?= vpp3
+PKG_SUFFIX ?= vpp4
 DPDK_BASE_URL ?= http://fast.dpdk.org/rel
 DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.xz
 DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL)
@@ -41,6 +41,7 @@ AESNIMB_LIB_SOURCE := $(B)/intel-ipsec-mb-0.44-gcm.2
 ISA_L_CRYPTO_LIB_TARBALL := isa_l_crypto.tar.gz
 ISA_L_CRYPTO_LIB_TARBALL_URL := http://github.com/01org/isa-l_crypto/archive/master.tar.gz
 ISA_L_CRYPTO_LIB_SOURCE := $(B)/isa-l_crypto-master
+ISA_L_CRYPTO_INSTALL_DIR := $(ISA_L_CRYPTO_LIB_SOURCE)/install
 endif
 
 ifneq (,$(findstring clang,$(CC)))
@@ -90,8 +91,8 @@ DPDK_EXTRA_CFLAGS := -g -O0
 endif
 
 ifeq ($(DPDK_CRYPTO_SW_PMD),y)
-DPDK_EXTRA_CFLAGS += -I$(I)/include
-DPDK_EXTRA_LDFLAGS += -L$(I)/lib
+DPDK_EXTRA_CFLAGS += -I$(ISA_L_CRYPTO_INSTALL_DIR)/include
+DPDK_EXTRA_LDFLAGS += -L$(ISA_L_CRYPTO_INSTALL_DIR)/lib
 DPDK_MAKE_EXTRA_ARGS += AESNI_MULTI_BUFFER_LIB_PATH=$(AESNIMB_LIB_SOURCE)
 endif
 
@@ -167,12 +168,14 @@ $(CURDIR)/$(AESNIMB_LIB_TARBALL):
 		then cp $(DPDK_DOWNLOAD_DIR)/$(AESNIMB_LIB_TARBALL) $(CURDIR) ; \
 		else curl -o $@ -LO $(AESNIMB_LIB_TARBALL_URL) ; \
 	fi
+	@rm -f $(B)/.download.ok
 
 $(CURDIR)/$(ISA_L_CRYPTO_LIB_TARBALL):
 	@if [ -e $(DPDK_DOWNLOAD_DIR)/$(ISA_L_CRYPTO_LIB_TARBALL) ] ; \
 		then cp $(DPDK_DOWNLOAD_DIR)/$(ISA_L_CRYPTO_LIB_TARBALL) $(CURDIR) ; \
 		else curl -o $@ -LO $(ISA_L_CRYPTO_LIB_TARBALL_URL) ; \
 	fi
+	@rm -f $(B)/.download.ok
 
 DPDK_DOWNLOADS = $(CURDIR)/$(DPDK_TARBALL)
 ifeq ($(DPDK_CRYPTO_SW_PMD),y)
@@ -233,8 +236,10 @@ ifeq ($(DPDK_CRYPTO_SW_PMD),y)
 	make -C $(AESNIMB_LIB_SOURCE) -j NO_GCM=y
 	cp $(AESNIMB_LIB_SOURCE)/libIPSec_MB.a $(I)/lib/
 	# Build ISA-L Crypto library
-	cd $(ISA_L_CRYPTO_LIB_SOURCE) && ./autogen.sh && ./configure --prefix=$(I)
+	cd $(ISA_L_CRYPTO_LIB_SOURCE) && ./autogen.sh && \
+	  ./configure --prefix=$(ISA_L_CRYPTO_INSTALL_DIR) CFLAGS='-fPIC -DPIC -O2'
 	make -C $(ISA_L_CRYPTO_LIB_SOURCE) -j install
+	cp $(ISA_L_CRYPTO_INSTALL_DIR)/lib/libisal_crypto.* $(I)/lib/
 endif
 	@make $(DPDK_MAKE_ARGS) install
 	@touch $@
-- 
cgit 1.2.3-korg


From ad625f55db7f63eaae9835452727445649836414 Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Wed, 31 May 2017 15:23:59 +0000
Subject: Revert "dpdk: build sw cryptodev support with make verify"

This reverts commit 0e2e10b77d63196bfb93ae5be1251bbc1a1b561a.

Change-Id: I3c1737f391b6ed127f92416f06449216e79859bb
Signed-off-by: Peter Mikus <pmikus@cisco.com>
---
 Makefile      | 12 +++++-------
 dpdk/Makefile | 13 ++++---------
 2 files changed, 9 insertions(+), 16 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f78549f4..946a8583 100644
--- a/Makefile
+++ b/Makefile
@@ -427,24 +427,22 @@ define banner
 	@echo " "
 endef
 
-verify: install-dep $(BR)/.bootstrap.ok
-	make -C dpdk install-$(PKG) DPDK_CRYPTO_SW_PMD=y
+verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev
 	$(call banner,"Building for PLATFORM=vpp using gcc")
-	@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages \
-	      vpp_uses_dpdk_cryptodev_sw=yes
+	@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 	$(call banner,"Installing dependencies")
 	@sudo -E apt-get update
 	@sudo -E apt-get $(CONFIRM) $(FORCE) install clang
 	$(call banner,"Building for PLATFORM=vpp using clang")
-	@make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang \
-	      wipe-all install-packages vpp_uses_dpdk_cryptodev_sw=yes
+	@make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
 endif
 	$(call banner,"Building sample-plugin")
 	@make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
 	$(call banner,"Building $(PKG) packages")
-	@make pkg-$(PKG) vpp_uses_dpdk_cryptodev_sw=yes
+	@make pkg-$(PKG)
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 	@make test
 endif
 
+
diff --git a/dpdk/Makefile b/dpdk/Makefile
index 495b4919..d781ed5d 100644
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -26,7 +26,7 @@ DPDK_MLX5_PMD         ?= n
 B := $(DPDK_BUILD_DIR)
 I := $(DPDK_INSTALL_DIR)
 DPDK_VERSION ?= 17.05
-PKG_SUFFIX ?= vpp4
+PKG_SUFFIX ?= vpp5
 DPDK_BASE_URL ?= http://fast.dpdk.org/rel
 DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.xz
 DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL)
@@ -41,7 +41,6 @@ AESNIMB_LIB_SOURCE := $(B)/intel-ipsec-mb-0.44-gcm.2
 ISA_L_CRYPTO_LIB_TARBALL := isa_l_crypto.tar.gz
 ISA_L_CRYPTO_LIB_TARBALL_URL := http://github.com/01org/isa-l_crypto/archive/master.tar.gz
 ISA_L_CRYPTO_LIB_SOURCE := $(B)/isa-l_crypto-master
-ISA_L_CRYPTO_INSTALL_DIR := $(ISA_L_CRYPTO_LIB_SOURCE)/install
 endif
 
 ifneq (,$(findstring clang,$(CC)))
@@ -91,8 +90,8 @@ DPDK_EXTRA_CFLAGS := -g -O0
 endif
 
 ifeq ($(DPDK_CRYPTO_SW_PMD),y)
-DPDK_EXTRA_CFLAGS += -I$(ISA_L_CRYPTO_INSTALL_DIR)/include
-DPDK_EXTRA_LDFLAGS += -L$(ISA_L_CRYPTO_INSTALL_DIR)/lib
+DPDK_EXTRA_CFLAGS += -I$(I)/include
+DPDK_EXTRA_LDFLAGS += -L$(I)/lib
 DPDK_MAKE_EXTRA_ARGS += AESNI_MULTI_BUFFER_LIB_PATH=$(AESNIMB_LIB_SOURCE)
 endif
 
@@ -168,14 +167,12 @@ $(CURDIR)/$(AESNIMB_LIB_TARBALL):
 		then cp $(DPDK_DOWNLOAD_DIR)/$(AESNIMB_LIB_TARBALL) $(CURDIR) ; \
 		else curl -o $@ -LO $(AESNIMB_LIB_TARBALL_URL) ; \
 	fi
-	@rm -f $(B)/.download.ok
 
 $(CURDIR)/$(ISA_L_CRYPTO_LIB_TARBALL):
 	@if [ -e $(DPDK_DOWNLOAD_DIR)/$(ISA_L_CRYPTO_LIB_TARBALL) ] ; \
 		then cp $(DPDK_DOWNLOAD_DIR)/$(ISA_L_CRYPTO_LIB_TARBALL) $(CURDIR) ; \
 		else curl -o $@ -LO $(ISA_L_CRYPTO_LIB_TARBALL_URL) ; \
 	fi
-	@rm -f $(B)/.download.ok
 
 DPDK_DOWNLOADS = $(CURDIR)/$(DPDK_TARBALL)
 ifeq ($(DPDK_CRYPTO_SW_PMD),y)
@@ -236,10 +233,8 @@ ifeq ($(DPDK_CRYPTO_SW_PMD),y)
 	make -C $(AESNIMB_LIB_SOURCE) -j NO_GCM=y
 	cp $(AESNIMB_LIB_SOURCE)/libIPSec_MB.a $(I)/lib/
 	# Build ISA-L Crypto library
-	cd $(ISA_L_CRYPTO_LIB_SOURCE) && ./autogen.sh && \
-	  ./configure --prefix=$(ISA_L_CRYPTO_INSTALL_DIR) CFLAGS='-fPIC -DPIC -O2'
+	cd $(ISA_L_CRYPTO_LIB_SOURCE) && ./autogen.sh && ./configure --prefix=$(I)
 	make -C $(ISA_L_CRYPTO_LIB_SOURCE) -j install
-	cp $(ISA_L_CRYPTO_INSTALL_DIR)/lib/libisal_crypto.* $(I)/lib/
 endif
 	@make $(DPDK_MAKE_ARGS) install
 	@touch $@
-- 
cgit 1.2.3-korg


From d6ad5a51130018113648f4c7220996b2c43c8cfb Mon Sep 17 00:00:00 2001
From: Marco Varlese <marco.varlese@suse.com>
Date: Thu, 1 Jun 2017 15:20:15 +0200
Subject: Support to install dependencies on openSUSE distribution

This patch allows to use the "make install-dep" on openSUSE.

Change-Id: Ib0586ffebbf882032468e4f4c0df2d5d8e99d7c9
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 946a8583..1b51d8f3 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ endif
 
 ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
 PKG=deb
-else ifeq ($(filter rhel centos fedora,$(OS_ID)),$(OS_ID))
+else ifeq ($(filter rhel centos fedora opensuse,$(OS_ID)),$(OS_ID))
 PKG=rpm
 endif
 
@@ -69,6 +69,10 @@ else
 	RPM_DEPENDS += lcov
 endif
 
+RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
+RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel
+RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow
+
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
 endif
@@ -210,6 +214,8 @@ else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
 	@sudo -E yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS)
 	@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib
+else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
+	@sudo -E zypper -n install -y $(RPM_SUSE_DEPENDS)
 else
 	$(error "This option currently works only on Ubuntu, Debian or Centos systems")
 endif
-- 
cgit 1.2.3-korg


From 0dc3f191947a9b8e914fa188f4652f700ff06944 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Wed, 31 May 2017 19:25:08 +0200
Subject: Add option to build sample plugin in top-level makefile

Change-Id: Ibf15eeb5fef2a3761089e6386783a1606d2e2b79
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1b51d8f3..3ef236a6 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ export BR=$(WS_ROOT)/build-root
 CCACHE_DIR?=$(BR)/.ccache
 GDB?=gdb
 PLATFORM?=vpp
+SAMPLE_PLUGIN?=no
 
 MINIMAL_STARTUP_CONF="unix { interactive }"
 
@@ -82,6 +83,12 @@ CONFIRM=-y
 FORCE=--force-yes
 endif
 
+TARGETS = vpp
+
+ifneq ($(SAMPLE_PLUGIN),no)
+TARGETS += sample-plugin
+endif
+
 .PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
 .PHONY: ctags cscope
@@ -141,14 +148,16 @@ help:
 	@echo " GDB=<path>          - gdb binary to use for debugging"
 	@echo " PLATFORM=<name>     - target platform. default is vpp"
 	@echo " TEST=<filter>       - apply filter to test set, see test-help"
+	@echo " SAMPLE_PLUGIN=yes   - in addition build/run/debug sample plugin"
 	@echo ""
 	@echo "Current Argument Values:"
-	@echo " V            = $(V)"
-	@echo " STARTUP_CONF = $(STARTUP_CONF)"
-	@echo " STARTUP_DIR  = $(STARTUP_DIR)"
-	@echo " GDB          = $(GDB)"
-	@echo " PLATFORM     = $(PLATFORM)"
-	@echo " DPDK_VERSION = $(DPDK_VERSION)"
+	@echo " V                 = $(V)"
+	@echo " STARTUP_CONF      = $(STARTUP_CONF)"
+	@echo " STARTUP_DIR       = $(STARTUP_DIR)"
+	@echo " GDB               = $(GDB)"
+	@echo " PLATFORM          = $(PLATFORM)"
+	@echo " DPDK_VERSION      = $(DPDK_VERSION)"
+	@echo " SAMPLE_PLUGIN     = $(SAMPLE_PLUGIN)"
 
 $(BR)/.bootstrap.ok:
 ifeq ($(findstring y,$(UNATTENDED)),y)
@@ -251,21 +260,21 @@ dist:
 	@ln -rs $(DIST_FILE).xz $(BR)/vpp-latest.tar.xz
 
 build: $(BR)/.bootstrap.ok
-	$(call make,$(PLATFORM)_debug,vpp-install)
+	$(call make,$(PLATFORM)_debug,$(addsuffix -install,$(TARGETS)))
 
 wipedist:
 	@$(RM) $(BR)/*.tar.xz
 
 wipe: wipedist $(BR)/.bootstrap.ok
-	$(call make,$(PLATFORM)_debug,vpp-wipe)
+	$(call make,$(PLATFORM)_debug,$(addsuffix -wipe,$(TARGETS)))
 
 rebuild: wipe build
 
 build-release: $(BR)/.bootstrap.ok
-	$(call make,$(PLATFORM),vpp-install)
+	$(call make,$(PLATFORM),$(addsuffix -install,$(TARGETS)))
 
 wipe-release: $(BR)/.bootstrap.ok
-	$(call make,$(PLATFORM),vpp-wipe)
+	$(call make,$(PLATFORM),$(addsuffix -wipe,$(TARGETS)))
 
 rebuild-release: wipe-release build-release
 
@@ -342,12 +351,14 @@ define run
 	@echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
 	@echo "         Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
 	@cd $(STARTUP_DIR) && \
-	  sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) plugin_path $(wildcard $(1)/vpp/lib*/vpp_plugins)
+	  sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) \
+	    plugin_path $(subst $(subst ,, ),:,$(wildcard $(1)/*/lib*/vpp_plugins))
 endef
 else
 define run
 	@cd $(STARTUP_DIR) && \
-	  sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(wildcard $(1)/vpp/lib*/vpp_plugins)
+	  sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') \
+	    plugin_path $(subst $(subst ,, ),:,$(wildcard $(1)/*/lib*/vpp_plugins))
 endef
 endif
 
-- 
cgit 1.2.3-korg


From aad20988b6a0a5058e520948d2a5835cfbc3b523 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Tue, 20 Jun 2017 16:35:29 +0200
Subject: Rewrite vppctl in C

- removes python dependency
- removes vpp_api_test dependency
- communicates over unix socket
- properly detects terminal size and type
- responds on terminal resize

Change-Id: I46c0a49f9b5f9ef8a0a31faec4fc5d49aa3ee02e
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile                  |   2 +-
 src/vpp.am                |   4 +
 src/vpp/app/vppctl.c      | 322 ++++++++++++++++++++++++++++++++++++++++++++++
 src/vpp/conf/startup.conf |   1 +
 4 files changed, 328 insertions(+), 1 deletion(-)
 create mode 100644 src/vpp/app/vppctl.c

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 3ef236a6..af946959 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ GDB?=gdb
 PLATFORM?=vpp
 SAMPLE_PLUGIN?=no
 
-MINIMAL_STARTUP_CONF="unix { interactive }"
+MINIMAL_STARTUP_CONF="unix { interactive cli-listen /run/vpp/cli.sock gid $(shell id -g) }"
 
 GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
 
diff --git a/src/vpp.am b/src/vpp.am
index 1c95949a..614bd26a 100644
--- a/src/vpp.am
+++ b/src/vpp.am
@@ -85,6 +85,10 @@ bin_vpp_LDADD = \
 
 bin_vpp_LDFLAGS = -Wl,--export-dynamic
 
+bin_PROGRAMS += bin/vppctl
+bin_vppctl_SOURCES = vpp/app/vppctl.c
+bin_vppctl_LDADD = libvppinfra.la
+
 if ENABLE_TESTS
 noinst_PROGRAMS += bin/test_client
 
diff --git a/src/vpp/app/vppctl.c b/src/vpp/app/vppctl.c
new file mode 100644
index 00000000..a8f3eab0
--- /dev/null
+++ b/src/vpp/app/vppctl.c
@@ -0,0 +1,322 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/epoll.h>
+#include <sys/ioctl.h>
+#include <signal.h>
+#include <termios.h>
+#include <unistd.h>
+#include <string.h>
+
+#define DEBUG 0
+
+#if DEBUG
+#define TELCMDS
+#define TELOPTS
+#endif
+
+#include <arpa/telnet.h>
+
+#include <vppinfra/mem.h>
+#include <vppinfra/format.h>
+#include <vppinfra/socket.h>
+
+#define SOCKET_FILE "/run/vpp/cli.sock"
+
+volatile int window_resized = 0;
+struct termios orig_tio;
+
+static void
+send_ttype (clib_socket_t * s, int is_dumb)
+{
+  clib_socket_tx_add_formatted (s, "%c%c%c" "%c%s" "%c%c",
+				IAC, SB, TELOPT_TTYPE,
+				0, is_dumb ? "dumb" : getenv ("TERM"),
+				IAC, SE);
+  clib_socket_tx (s);
+}
+
+static void
+send_naws (clib_socket_t * s)
+{
+  struct winsize ws;
+
+  if (ioctl (STDIN_FILENO, TIOCGWINSZ, &ws) < 0)
+    {
+      clib_unix_warning ("ioctl(TIOCGWINSZ)");
+      return;
+    }
+
+  clib_socket_tx_add_formatted (s, "%c%c%c" "%c%c%c%c" "%c%c",
+				IAC, SB, TELOPT_NAWS,
+				ws.ws_col >> 8, ws.ws_col & 0xff,
+				ws.ws_row >> 8, ws.ws_row & 0xff, IAC, SE);
+  clib_socket_tx (s);
+}
+
+static void
+signal_handler_winch (int signum)
+{
+  window_resized = 1;
+}
+
+static void
+signal_handler_term (int signum)
+{
+  tcsetattr (STDIN_FILENO, TCSAFLUSH, &orig_tio);
+}
+
+static u8 *
+process_input (u8 * str, clib_socket_t * s, int is_interactive)
+{
+  int i = 0;
+
+  while (i < vec_len (s->rx_buffer))
+    {
+      if (s->rx_buffer[i] == IAC)
+	{
+	  if (s->rx_buffer[i + 1] == SB)
+	    {
+	      u8 *sb = 0;
+	      char opt = s->rx_buffer[i + 2];
+	      i += 3;
+	      while (s->rx_buffer[i] != IAC)
+		vec_add1 (sb, s->rx_buffer[i++]);
+
+#if DEBUG
+	      clib_warning ("SB %s\n  %U", TELOPT (opt),
+			    format_hexdump, sb, vec_len (sb));
+#endif
+	      vec_free (sb);
+	      i += 2;
+	      if (opt == TELOPT_TTYPE)
+		send_ttype (s, !is_interactive);
+	      else if (is_interactive && opt == TELOPT_NAWS)
+		send_naws (s);
+	    }
+	  else
+	    {
+#if DEBUG
+	      clib_warning ("IAC at %d, IAC %s %s", i,
+			    TELCMD (s->rx_buffer[i + 1]),
+			    TELOPT (s->rx_buffer[i + 2]));
+#endif
+	      i += 3;
+	    }
+	}
+      else
+	vec_add1 (str, s->rx_buffer[i++]);
+    }
+  vec_reset_length (s->rx_buffer);
+  return str;
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  clib_socket_t _s = { 0 }, *s = &_s;
+  clib_error_t *error = 0;
+  struct epoll_event event;
+  struct sigaction sa;
+  struct termios tio;
+  int efd = -1;
+  u8 *str = 0;
+  u8 *cmd = 0;
+  int do_quit = 0;
+
+
+  clib_mem_init (0, 64ULL << 10);
+
+  /* process command line */
+  argc--;
+  argv++;
+
+  if (argc > 1 && strcmp (argv[0], "-s") == 0)
+    {
+      s->config = argv[1];
+      argc -= 2;
+      argv += 2;
+    }
+  else
+    s->config = SOCKET_FILE;
+
+  while (argc--)
+    cmd = format (cmd, "%s%c", (argv++)[0], argc ? ' ' : 0);
+
+  s->flags = SOCKET_IS_CLIENT;
+
+  error = clib_socket_init (s);
+  if (error)
+    goto done;
+
+  /* Capture terminal resize events */
+  memset (&sa, 0, sizeof (struct sigaction));
+  sa.sa_handler = signal_handler_winch;
+
+  if (sigaction (SIGWINCH, &sa, 0) < 0)
+    {
+      error = clib_error_return_unix (0, "sigaction");
+      goto done;
+    }
+
+  sa.sa_handler = signal_handler_term;
+  if (sigaction (SIGTERM, &sa, 0) < 0)
+    {
+      error = clib_error_return_unix (0, "sigaction");
+      goto done;
+    }
+
+  /* Save the original tty state so we can restore it later */
+  tcgetattr (STDIN_FILENO, &orig_tio);
+
+  /* Tweak the tty settings */
+  tio = orig_tio;
+  /* echo off, canonical mode off, ext'd input processing off */
+  tio.c_lflag &= ~(ECHO | ICANON | IEXTEN);
+  tio.c_cc[VMIN] = 1;		/* 1 byte at a time */
+  tio.c_cc[VTIME] = 0;		/* no timer */
+  tcsetattr (STDIN_FILENO, TCSAFLUSH, &tio);
+
+  efd = epoll_create1 (0);
+
+  /* register STDIN */
+  event.events = EPOLLIN | EPOLLPRI | EPOLLERR;
+  event.data.fd = STDIN_FILENO;
+  if (epoll_ctl (efd, EPOLL_CTL_ADD, STDIN_FILENO, &event) != 0)
+    {
+      error = clib_error_return_unix (0, "epoll_ctl[%d]", STDIN_FILENO);
+      goto done;
+    }
+
+  /* register socket */
+  event.events = EPOLLIN | EPOLLPRI | EPOLLERR;
+  event.data.fd = s->fd;
+  if (epoll_ctl (efd, EPOLL_CTL_ADD, s->fd, &event) != 0)
+    {
+      error = clib_error_return_unix (0, "epoll_ctl[%d]", s->fd);
+      goto done;
+    }
+
+  while (1)
+    {
+      int n;
+
+      if (window_resized)
+	{
+	  window_resized = 0;
+	  send_naws (s);
+	}
+
+      if ((n = epoll_wait (efd, &event, 1, -1)) < 0)
+	{
+	  /* maybe we received signal */
+	  if (errno == EINTR)
+	    continue;
+
+	  error = clib_error_return_unix (0, "epoll_wait");
+	  goto done;
+	}
+
+      if (n == 0)
+	continue;
+
+      if (event.data.fd == STDIN_FILENO)
+	{
+	  int n;
+	  char c[100];
+
+	  n = read (STDIN_FILENO, c, sizeof (c));
+	  if (n > 0)
+	    {
+	      memcpy (clib_socket_tx_add (s, n), c, n);
+	      error = clib_socket_tx (s);
+	      if (error)
+		goto done;
+	    }
+	  else if (n < 0)
+	    clib_warning ("read rv=%d", n);
+	}
+      else if (event.data.fd == s->fd)
+	{
+	  error = clib_socket_rx (s, 100);
+	  if (error)
+	    break;
+
+	  if (clib_socket_rx_end_of_file (s))
+	    break;
+
+	  str = process_input (str, s, cmd == 0);
+
+	  if (vec_len (str) > 0)
+	    {
+	      n = write (STDOUT_FILENO, str, vec_len (str));
+	      if (n < 0)
+		{
+		  error = clib_error_return_unix (0, "write");
+		  goto done;
+		}
+	      vec_reset_length (str);
+	    }
+
+	  if (do_quit)
+	    {
+	      clib_socket_tx_add_formatted (s, "q\n");
+	      clib_socket_tx (s);
+	      do_quit = 0;
+	    }
+	  if (cmd)
+	    {
+	      clib_socket_tx_add_formatted (s, "%s\n", cmd);
+	      clib_socket_tx (s);
+	      vec_free (cmd);
+	      do_quit = 1;
+	    }
+	}
+      else
+	{
+	  error = clib_error_return (0, "unknown fd");
+	  goto done;
+	}
+    }
+
+  error = clib_socket_close (s);
+
+done:
+  vec_free (cmd);
+  vec_free (str);
+  if (efd > -1)
+    close (efd);
+
+  if (error)
+    {
+      clib_error_report (error);
+      return 1;
+    }
+  tcsetattr (STDIN_FILENO, TCSAFLUSH, &orig_tio);
+  return 0;
+}
+
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp/conf/startup.conf b/src/vpp/conf/startup.conf
index f671439b..1d22358d 100644
--- a/src/vpp/conf/startup.conf
+++ b/src/vpp/conf/startup.conf
@@ -3,6 +3,7 @@ unix {
   nodaemon
   log /tmp/vpp.log
   full-coredump
+  cli-listen /run/vpp/cli.sock
 }
 
 api-trace {
-- 
cgit 1.2.3-korg


From b1dab65a087856dc4add42586517c29734c4e1d3 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Fri, 30 Jun 2017 11:51:41 +0200
Subject: top-level Makefile improvements

- auto-execute startup.vpp file if exists
- add DPDK_CONFIG=<string> to speficy custom config for autogenerated
  startup.conf, e.g. DPDK_CONFIG="no-pci"
- add DISABLED_PLUGINS=<comma separated list> option

e.g.

make DISABLED_PLUGINS=dpdk,acl run

or
export DISABLED_PLUGINS=dpdk,acl
make run

Change-Id: Ib0891d27aeae16b69b67c4c3e893bb3dbde5e7e1
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 47 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index af946959..0d21f335 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,25 @@ GDB?=gdb
 PLATFORM?=vpp
 SAMPLE_PLUGIN?=no
 
-MINIMAL_STARTUP_CONF="unix { interactive cli-listen /run/vpp/cli.sock gid $(shell id -g) }"
+,:=,
+define disable_plugins
+$(if $(1), \
+  "plugins {" \
+  $(patsubst %,"plugin %_plugin.so { disable }",$(subst $(,), ,$(1))) \
+  " }" \
+  ,)
+endef
+
+MINIMAL_STARTUP_CONF="							\
+unix { 									\
+	interactive 							\
+	cli-listen /run/vpp/cli.sock					\
+	gid $(shell id -g)						\
+	$(if $(wildcard startup.vpp),"exec startup.vpp",)		\
+}									\
+$(if $(DPDK_CONFIG), "dpdk { $(DPDK_CONFIG) }",)			\
+$(call disable_plugins,$(DISABLED_PLUGINS))				\
+"
 
 GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
 
@@ -139,16 +157,21 @@ help:
 	@echo " test-checkstyle     - check PEP8 compliance for test framework"
 	@echo ""
 	@echo "Make Arguments:"
-	@echo " V=[0|1]             - set build verbosity level"
-	@echo " STARTUP_CONF=<path> - startup configuration file"
-	@echo "                       (e.g. /etc/vpp/startup.conf)"
-	@echo " STARTUP_DIR=<path>  - startup drectory (e.g. /etc/vpp)"
-	@echo "                       It also sets STARTUP_CONF if"
-	@echo "                       startup.conf file is present"
-	@echo " GDB=<path>          - gdb binary to use for debugging"
-	@echo " PLATFORM=<name>     - target platform. default is vpp"
-	@echo " TEST=<filter>       - apply filter to test set, see test-help"
-	@echo " SAMPLE_PLUGIN=yes   - in addition build/run/debug sample plugin"
+	@echo " V=[0|1]                  - set build verbosity level"
+	@echo " STARTUP_CONF=<path>      - startup configuration file"
+	@echo "                            (e.g. /etc/vpp/startup.conf)"
+	@echo " STARTUP_DIR=<path>       - startup drectory (e.g. /etc/vpp)"
+	@echo "                            It also sets STARTUP_CONF if"
+	@echo "                            startup.conf file is present"
+	@echo " GDB=<path>               - gdb binary to use for debugging"
+	@echo " PLATFORM=<name>          - target platform. default is vpp"
+	@echo " TEST=<filter>            - apply filter to test set, see test-help"
+	@echo " DPDK_CONFIG=<conf>       - add specified dpdk config commands to"
+	@echo "                            autogenerated startup.conf"
+	@echo "                            (e.g. \"no-pci\" )"
+	@echo " SAMPLE_PLUGIN=yes        - in addition build/run/debug sample plugin"
+	@echo " DISABLED_PLUGINS=<list>  - comma separated list of plugins which"
+	@echo "                            should not be loaded"
 	@echo ""
 	@echo "Current Argument Values:"
 	@echo " V                 = $(V)"
@@ -157,7 +180,9 @@ help:
 	@echo " GDB               = $(GDB)"
 	@echo " PLATFORM          = $(PLATFORM)"
 	@echo " DPDK_VERSION      = $(DPDK_VERSION)"
+	@echo " DPDK_CONFIG       = $(DPDK_CONFIG)"
 	@echo " SAMPLE_PLUGIN     = $(SAMPLE_PLUGIN)"
+	@echo " DISABLED_PLUGINS  = $(DISABLED_PLUGINS)"
 
 $(BR)/.bootstrap.ok:
 ifeq ($(findstring y,$(UNATTENDED)),y)
-- 
cgit 1.2.3-korg


From d756b35032cdf7fdaaf0d6611388a54d32d72e92 Mon Sep 17 00:00:00 2001
From: Dave Wallace <dwallacelf@gmail.com>
Date: Mon, 3 Jul 2017 13:11:38 -0400
Subject: Fix unlinking of /dev/shm files.

- api-segment prefix not used when unlinking shm files
- unlink root region on exit if no clients referenced
- stale reference to freed segment name
- don't add fake client to /db unless CLIB_DEBUG > 2
- turn off the gmond plugin
- clean up unused vars in vpp/api

Change-Id: I66451fcfd6ee64a12466c2d6c209050e3cdb74b7
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Signed-off-by: Dave Barach <dave@barachs.net>
---
 Makefile                    |  9 +++++++--
 build-data/platforms/vpp.mk |  2 +-
 src/svm/ssvm.c              | 11 ++++++++++-
 src/svm/svm.c               | 38 +++++++++++++++++++++++++++++++-------
 src/svm/svm_fifo_segment.c  |  2 +-
 src/svm/svmdb.c             | 15 ++++++++++-----
 src/vlib/buffer.h           | 18 +++++++++---------
 src/vpp.am                  |  6 +++---
 src/vpp/api/api.c           |  1 -
 src/vpp/api/api_main.c      |  2 --
 src/vpp/api/custom_dump.c   |  8 +-------
 src/vpp/stats/stats.c       |  1 -
 12 files changed, 73 insertions(+), 40 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0d21f335..46c51dd8 100644
--- a/Makefile
+++ b/Makefile
@@ -55,8 +55,10 @@ else ifeq ($(filter rhel centos fedora opensuse,$(OS_ID)),$(OS_ID))
 PKG=rpm
 endif
 
+# +libganglia1-dev if building the gmond plugin
+
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
-DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
+DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += lcov chrpath autoconf nasm indent
 DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6
@@ -79,9 +81,12 @@ else
 	RPM_DEPENDS += python-virtualenv
 	RPM_DEPENDS_GROUPS = 'Development Tools'
 endif
+
+# +ganglia-devel if building the ganglia plugin
+
 RPM_DEPENDS += chrpath libffi-devel rpm-build
 RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
-EPEL_DEPENDS = libconfuse-devel ganglia-devel epel-rpm-macros
+EPEL_DEPENDS = libconfuse-devel epel-rpm-macros
 ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
 	EPEL_DEPENDS += lcov
 else
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 4577fa2e..acbe0e7f 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -36,7 +36,7 @@ vpp_uses_dpdk = yes
 # Uncoment to enable building unit tests
 # vpp_enable_tests = yes
 
-vpp_root_packages = vpp gmod
+vpp_root_packages = vpp
 
 # DPDK configuration parameters
 # vpp_uses_dpdk_cryptodev_sw = yes
diff --git a/src/svm/ssvm.c b/src/svm/ssvm.c
index 6cda1f27..23e3cf44 100644
--- a/src/svm/ssvm.c
+++ b/src/svm/ssvm.c
@@ -29,6 +29,9 @@ ssvm_master_init (ssvm_private_t * ssvm, u32 master_index)
   if (ssvm->ssvm_size == 0)
     return SSVM_API_ERROR_NO_SIZE;
 
+  if (CLIB_DEBUG > 1)
+    clib_warning ("[%d] creating segment '%s'", getpid (), ssvm->name);
+
   ssvm_filename = format (0, "/dev/shm/%s%c", ssvm->name, 0);
 
   unlink ((char *) ssvm_filename);
@@ -176,12 +179,18 @@ ssvm_delete (ssvm_private_t * ssvm)
 
   fn = format (0, "/dev/shm/%s%c", ssvm->name, 0);
 
+  if (CLIB_DEBUG > 1)
+    clib_warning ("[%d] unlinking ssvm (%s) backing file '%s'", getpid (),
+		  ssvm->name, fn);
+
   /* Throw away the backing file */
   if (unlink ((char *) fn) < 0)
     clib_unix_warning ("unlink segment '%s'", ssvm->name);
 
-  munmap ((void *) ssvm->requested_va, ssvm->ssvm_size);
   vec_free (fn);
+  vec_free (ssvm->name);
+
+  munmap ((void *) ssvm->requested_va, ssvm->ssvm_size);
 }
 
 
diff --git a/src/svm/svm.c b/src/svm/svm.c
index c96135cf..600fa744 100644
--- a/src/svm/svm.c
+++ b/src/svm/svm.c
@@ -458,14 +458,15 @@ svm_map_region (svm_map_region_args_t * a)
   struct stat stat;
   struct timespec ts, tsrem;
 
-  if (CLIB_DEBUG > 1)
-    clib_warning ("[%d] map region %s", getpid (), a->name);
-
   ASSERT ((a->size & ~(MMAP_PAGESIZE - 1)) == a->size);
   ASSERT (a->name);
 
   shm_name = shm_name_from_svm_map_region_args (a);
 
+  if (CLIB_DEBUG > 1)
+    clib_warning ("[%d] map region %s: shm_open (%s)",
+		  getpid (), a->name, shm_name);
+
   svm_fd = shm_open ((char *) shm_name, O_RDWR | O_CREAT | O_EXCL, 0777);
 
   if (svm_fd >= 0)
@@ -947,6 +948,29 @@ svm_region_find_or_create (svm_map_region_args_t * a)
   return (rp);
 }
 
+void
+svm_region_unlink (svm_region_t * rp)
+{
+  svm_map_region_args_t _a, *a = &_a;
+  svm_main_region_t *mp;
+  u8 *shm_name;
+
+  ASSERT (root_rp);
+  ASSERT (rp);
+  ASSERT (vec_c_string_is_terminated (rp->region_name));
+
+  mp = root_rp->data_base;
+  ASSERT (mp);
+
+  a->root_path = (char *) mp->root_path;
+  a->name = rp->region_name;
+  shm_name = shm_name_from_svm_map_region_args (a);
+  if (CLIB_DEBUG > 1)
+    clib_warning ("[%d] shm_unlink (%s)", getpid (), shm_name);
+  shm_unlink ((const char *) shm_name);
+  vec_free (shm_name);
+}
+
 /*
  * svm_region_unmap
  *
@@ -1056,7 +1080,7 @@ found:
       vec_free (name);
 
       region_unlock (rp);
-      shm_unlink (rp->region_name);
+      svm_region_unlink (rp);
       munmap ((void *) virtual_base, virtual_size);
       region_unlock (root_rp);
       svm_pop_heap (oldheap);
@@ -1071,9 +1095,6 @@ found:
 
 /*
  * svm_region_exit
- * There is no clean way to unlink the
- * root region when all clients go away,
- * so remove the pid entry and call it a day.
  */
 void
 svm_region_exit ()
@@ -1116,6 +1137,9 @@ svm_region_exit ()
 
 found:
 
+  if (vec_len (root_rp->client_pids) == 0)
+    svm_region_unlink (root_rp);
+
   region_unlock (root_rp);
   svm_pop_heap (oldheap);
 
diff --git a/src/svm/svm_fifo_segment.c b/src/svm/svm_fifo_segment.c
index 69d4ecb9..c80374a7 100644
--- a/src/svm/svm_fifo_segment.c
+++ b/src/svm/svm_fifo_segment.c
@@ -105,7 +105,7 @@ svm_fifo_segment_create (svm_fifo_segment_create_args_t * a)
   s->ssvm.ssvm_size = a->segment_size;
   s->ssvm.i_am_master = 1;
   s->ssvm.my_pid = getpid ();
-  s->ssvm.name = (u8 *) a->segment_name;
+  s->ssvm.name = format (0, "%s", a->segment_name);
   s->ssvm.requested_va = sm->next_baseva;
 
   rv = ssvm_master_init (&s->ssvm, s - sm->segments);
diff --git a/src/svm/svmdb.c b/src/svm/svmdb.c
index 03dfe7c3..043b0924 100644
--- a/src/svm/svmdb.c
+++ b/src/svm/svmdb.c
@@ -106,11 +106,16 @@ svmdb_map (svmdb_map_args_t * dba)
     }
   /* Nope, it's our problem... */
 
-  /* Add a bogus client (pid=0) so the svm won't be deallocated */
-  oldheap = svm_push_pvt_heap (db_rp);
-  vec_add1 (client->db_rp->client_pids, 0);
-  svm_pop_heap (oldheap);
-
+  if (CLIB_DEBUG > 2)
+    {
+      /* Add a bogus client (pid=0) so the svm won't be deallocated */
+      clib_warning
+	("[%d] adding fake client (pid=0) so '%s' won't be unlinked",
+	 getpid (), db_rp->region_name);
+      oldheap = svm_push_pvt_heap (db_rp);
+      vec_add1 (client->db_rp->client_pids, 0);
+      svm_pop_heap (oldheap);
+    }
   oldheap = svm_push_data_heap (db_rp);
 
   vec_validate (hp, 0);
diff --git a/src/vlib/buffer.h b/src/vlib/buffer.h
index c810db4e..77528e77 100644
--- a/src/vlib/buffer.h
+++ b/src/vlib/buffer.h
@@ -87,17 +87,17 @@ typedef struct
 /* any change to the following line requres update of
  * vlib_buffer_get_free_list_index(...) and
  * vlib_buffer_set_free_list_index(...) functions */
-#define VLIB_BUFFER_FREE_LIST_INDEX_MASK ((1 << 4) - 1)
+#define VLIB_BUFFER_FREE_LIST_INDEX_MASK ((1 << 5) - 1)
 
-#define VLIB_BUFFER_IS_TRACED (1 << 4)
-#define VLIB_BUFFER_LOG2_NEXT_PRESENT (5)
+#define VLIB_BUFFER_IS_TRACED (1 << 5)
+#define VLIB_BUFFER_LOG2_NEXT_PRESENT (6)
 #define VLIB_BUFFER_NEXT_PRESENT (1 << VLIB_BUFFER_LOG2_NEXT_PRESENT)
-#define VLIB_BUFFER_IS_RECYCLED (1 << 6)
-#define VLIB_BUFFER_TOTAL_LENGTH_VALID (1 << 7)
-#define VLIB_BUFFER_REPL_FAIL (1 << 8)
-#define VLIB_BUFFER_RECYCLE (1 << 9)
-#define VLIB_BUFFER_FLOW_REPORT (1 << 10)
-#define VLIB_BUFFER_EXT_HDR_VALID (1 << 11)
+#define VLIB_BUFFER_IS_RECYCLED (1 << 7)
+#define VLIB_BUFFER_TOTAL_LENGTH_VALID (1 << 8)
+#define VLIB_BUFFER_REPL_FAIL (1 << 9)
+#define VLIB_BUFFER_RECYCLE (1 << 10)
+#define VLIB_BUFFER_FLOW_REPORT (1 << 11)
+#define VLIB_BUFFER_EXT_HDR_VALID (1 << 12)
 
   /* User defined buffer flags. */
 #define LOG2_VLIB_BUFFER_FLAG_USER(n) (32 - (n))
diff --git a/src/vpp.am b/src/vpp.am
index 614bd26a..10a4e311 100644
--- a/src/vpp.am
+++ b/src/vpp.am
@@ -33,11 +33,11 @@ if WITH_APICLI
   vpp/api/plugin.h
 endif
 
-# comment out to disable stats upload to gmond
+# uncomment to enable stats upload to gmond
+# bin_vpp_SOURCES +=				\
+#  vpp/api/gmon.c
 
 bin_vpp_CFLAGS = @APICLI@
-bin_vpp_SOURCES +=				\
-  vpp/api/gmon.c
 
 nobase_include_HEADERS +=			\
   vpp/api/vpe_all_api_h.h			\
diff --git a/src/vpp/api/api.c b/src/vpp/api/api.c
index de9a2477..4e892431 100644
--- a/src/vpp/api/api.c
+++ b/src/vpp/api/api.c
@@ -686,7 +686,6 @@ static void
 
   BAD_SW_IF_INDEX_LABEL;
 
-out:
   REPLY_MACRO (VL_API_PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY);
 }
 
diff --git a/src/vpp/api/api_main.c b/src/vpp/api/api_main.c
index ac09cd15..c355a5fd 100644
--- a/src/vpp/api/api_main.c
+++ b/src/vpp/api/api_main.c
@@ -232,8 +232,6 @@ unformat_sw_if_index (unformat_input_t * input, va_list * args)
   u32 *result = va_arg (*args, u32 *);
   vnet_main_t *vnm = vnet_get_main ();
   u32 sw_if_index = ~0;
-  u8 *if_name;
-  uword *p;
 
   if (unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
     {
diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c
index 3ac8874e..7f3a58d9 100644
--- a/src/vpp/api/custom_dump.c
+++ b/src/vpp/api/custom_dump.c
@@ -1174,7 +1174,6 @@ static void *vl_api_sr_policy_mod_t_print
   (vl_api_sr_policy_mod_t * mp, void *handle)
 {
   u8 *s;
-  u32 weight;
 
   ip6_address_t *segments = 0, *seg;
   ip6_address_t *this_address = (ip6_address_t *) mp->segments;
@@ -1216,8 +1215,6 @@ static void *vl_api_sr_policy_del_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: sr_policy_del ");
-  u8 bsid_addr[16];
-  u32 sr_policy_index;
   s = format (s, "To be delivered. Good luck.");
   FINISH;
 }
@@ -2432,7 +2429,7 @@ static void *vl_api_lisp_add_del_remote_mapping_t_print
   (vl_api_lisp_add_del_remote_mapping_t * mp, void *handle)
 {
   u8 *s;
-  u32 i, rloc_num = 0;
+  u32 rloc_num = 0;
 
   s = format (0, "SCRIPT: lisp_add_del_remote_mapping ");
 
@@ -2574,7 +2571,6 @@ static void *vl_api_lisp_add_del_locator_set_t_print
   (vl_api_lisp_add_del_locator_set_t * mp, void *handle)
 {
   u8 *s;
-  u32 loc_num = 0, i;
 
   s = format (0, "SCRIPT: lisp_add_del_locator_set ");
 
@@ -2583,8 +2579,6 @@ static void *vl_api_lisp_add_del_locator_set_t_print
 
   s = format (s, "locator-set %s ", mp->locator_set_name);
 
-  loc_num = clib_net_to_host_u32 (mp->locator_num);
-
   FINISH;
 }
 
diff --git a/src/vpp/stats/stats.c b/src/vpp/stats/stats.c
index 38821da7..422b7b3b 100644
--- a/src/vpp/stats/stats.c
+++ b/src/vpp/stats/stats.c
@@ -577,7 +577,6 @@ do_ip4_fibs (stats_main_t * sm)
   ip4_route_t *r;
   fib_table_t *fib;
   ip4_fib_t *v4_fib;
-  ip_lookup_main_t *lm = &im4->lookup_main;
   static uword *results;
   vl_api_vnet_ip4_fib_counters_t *mp = 0;
   u32 items_this_message;
-- 
cgit 1.2.3-korg


From 8d48722b0932e7857f93c4e06ba9b2dff8bd5cad Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Tue, 18 Jul 2017 15:48:03 -0400
Subject: Enable build from dist tarball independent of git. This is necessary
 for downstream builds from source rpm.

JIRA: VPP-498

Change-Id: I30ea51a19b153dc35ececbbca79b940fe4e3bc8a
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 Makefile | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 46c51dd8..09a802a2 100644
--- a/Makefile
+++ b/Makefile
@@ -274,12 +274,17 @@ DIST_FILE = $(BR)/vpp-$(shell src/scripts/version).tar
 DIST_SUBDIR = vpp-$(shell src/scripts/version|cut -f1 -d-)
 
 dist:
-	@git archive \
-	  --prefix=$(DIST_SUBDIR)/ \
-	  --format=tar \
-	  -o $(DIST_FILE) \
-	  HEAD
-	@git describe > $(BR)/.version
+	@if git rev-parse 2> /dev/null ; then \
+	    git archive \
+	      --prefix=$(DIST_SUBDIR)/ \
+	      --format=tar \
+	      -o $(DIST_FILE) \
+	    HEAD ; \
+	    git describe > $(BR)/.version ; \
+	else \
+	    (cd .. ; tar -cf $(DIST_FILE) $(DIST_SUBDIR) --exclude=*.tar) ; \
+	    src/scripts/version > $(BR)/.version ; \
+	fi
 	@tar --append \
 	  --file $(DIST_FILE) \
 	  --transform='s,.*/.version,$(DIST_SUBDIR)/src/scripts/.version,' \
-- 
cgit 1.2.3-korg


From 024e23ddd96f3281f46208d5294a9a3b5e6de0c7 Mon Sep 17 00:00:00 2001
From: Marco Varlese <marco.varlese@suse.com>
Date: Wed, 2 Aug 2017 14:16:31 +0200
Subject: Added NASM package to support SW crypto

Change-Id: Idd6614b80e456eb40c760024b563ffd0e5c313ec
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 09a802a2..2c43a0ee 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ endif
 
 RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
 RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel
-RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow
+RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
-- 
cgit 1.2.3-korg


From 33129bb9a3e954b7c9ba7a72f16550b1cf91dc9e Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Tue, 1 Aug 2017 12:46:41 -0400
Subject: Fix nasm deps for Fedora.

Fedora 24 and 25 distro already includes nasm 2.12 but Centos does not as yet.

Change-Id: I060ea8b7b7892ac8444d850398ed1c9100631fbc
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 2c43a0ee..c8eba6e3 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,11 @@ endif
 # +ganglia-devel if building the ganglia plugin
 
 RPM_DEPENDS += chrpath libffi-devel rpm-build
-RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
+ifeq ($(OS_ID),fedora)
+	RPM_DEPENDS += nasm
+else
+	RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
+endif
 EPEL_DEPENDS = libconfuse-devel epel-rpm-macros
 ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
 	EPEL_DEPENDS += lcov
-- 
cgit 1.2.3-korg


From b60f4965bf6f51eb746e18fa0307af8e3444bf96 Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Wed, 19 Jul 2017 19:17:15 -0400
Subject: Create source rpm.

Use actual file name for tarball.
Includes required modifications in spec file for unpacking srpm.
Spec file source references actual dist tarball name
so it matches the revision and release while building from srpm.

JIRA: VPP-498

Change-Id: I8b55a69f060b7864527b94d8c5b0a2ebccc306b1
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 Makefile            |  3 +++
 extras/rpm/Makefile | 22 +++++++++++++++++++---
 extras/rpm/vpp.spec |  4 ++--
 3 files changed, 24 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c8eba6e3..1cce928a 100644
--- a/Makefile
+++ b/Makefile
@@ -435,6 +435,9 @@ pkg-deb:
 pkg-rpm: dist
 	make -C extras/rpm
 
+pkg-srpm: dist
+	make -C extras/rpm srpm
+
 dpdk-install-dev:
 	make -C dpdk install-$(PKG)
 
diff --git a/extras/rpm/Makefile b/extras/rpm/Makefile
index 1dcbb203..534e4d43 100644
--- a/extras/rpm/Makefile
+++ b/extras/rpm/Makefile
@@ -17,11 +17,27 @@ TARBALL=$(shell realpath ../../build-root/vpp-latest.tar.xz)
 BASENAME=$(shell basename $(TARBALL) | sed -e s/.tar.\*//)
 VERSION=$(shell echo $(BASENAME) | cut -f2 -d-)
 RELEASE=$(shell echo $(BASENAME) | cut -f3- -d- | sed -e s/-/_/g)
+PC=%
 
-all:
+all: RPM
+
+srpm:
+	@echo $(TARBALL)
+	mkdir -p rpmbuild/{RPMS,SRPMS,BUILD,SOURCES,SPECS}
+	cp $(TARBALL) rpmbuild/SOURCES/vpp-$(VERSION)-$(RELEASE).tar.xz
+	cp vpp.spec rpmbuild/SOURCES
+	sed -i '1s/^/$(PC)define _version $(VERSION)\n/' rpmbuild/SOURCES/vpp.spec
+	sed -i '1s/^/$(PC)define _release $(RELEASE)\n/' rpmbuild/SOURCES/vpp.spec
+	sed -i '/define _topdir/d' rpmbuild/SOURCES/vpp.spec
+	rpmbuild -bs \
+	  --define "_topdir rpmbuild" \
+	  rpmbuild/SOURCES/vpp.spec
+	mv $$(find rpmbuild/SRPMS -name \*.src.rpm -type f) .
+
+RPM:
 	@echo $(TARBALL)
-	mkdir -p SOURCES RPMS
-	cp $(TARBALL) SOURCES/vpp-latest.tar.xz
+	mkdir -p RPMS SOURCES
+	cp $(TARBALL) SOURCES/vpp-$(VERSION)-$(RELEASE).tar.xz
 	rpmbuild -bb \
 	  --define "_topdir $(PWD)" \
 	  --define "_version $(VERSION)" \
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index 3644570d..ffb6382f 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -30,8 +30,8 @@ Release: %{_release}
 Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python
 BuildRequires: systemd, chrpath
 
-# Source: %{name}-%{_version}-%{_release}.tar.xz
-Source: vpp-latest.tar.xz
+Source: %{name}-%{_version}-%{_release}.tar.xz
+# Source: vpp-latest.tar.xz
 
 %description
 This package provides VPP executables: vpp, vpp_api_test, vpp_json_test
-- 
cgit 1.2.3-korg


From f413bef1358e014c9a6cb75bd2ec3e1f351e64ff Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Tue, 15 Aug 2017 07:09:02 +0200
Subject: make test: collect symlinks to failed tests

Compress files in temporary directories of failed tests and symlink
the directories under /tmp/vpp-failed-unittests location - preparation
for jenkins archivation. Automatically cleanup the directory at start
of test run.

The compression is performed only when environment variable
COMPRESS_FAILED_TEST_LOGS is set to one of "yes", "y", "1".
This is set in verify target, but left unset by default, so when
invoking make test by hand, files won't be compressed.

Change-Id: I84c8f1c6aa79aa9c0b753357022b1f195f17a283
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 Makefile                        |  2 +-
 test/Makefile                   |  7 ++++++-
 test/framework.py               | 22 +++++++++++++++++++++-
 test/scripts/compress_failed.sh | 21 +++++++++++++++++++++
 4 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100755 test/scripts/compress_failed.sh

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1cce928a..c1a7cbb5 100644
--- a/Makefile
+++ b/Makefile
@@ -501,7 +501,7 @@ endif
 	$(call banner,"Building $(PKG) packages")
 	@make pkg-$(PKG)
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
-	@make test
+	@make COMPRESS_FAILED_TEST_LOGS=yes test
 endif
 
 
diff --git a/test/Makefile b/test/Makefile
index 33779dce..72b4dac7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,7 @@
 .PHONY: verify-python-path
 
+VPP_TEST_FAILED_DIR=/tmp/vpp-failed-unittests/
+
 verify-python-path:
 ifndef VPP_PYTHON_PREFIX
 	$(error VPP_PYTHON_PREFIX is not set)
@@ -84,7 +86,8 @@ $(PAPI_INSTALL_DONE): $(PIP_PATCH_DONE)
 	@touch $@
 
 define retest-func
-	@scripts/setsid_wrapper.sh $(FORCE_FOREGROUND) $(PYTHON_VENV_PATH)/bin/activate python run_tests.py -d $(TEST_DIR) $(UNITTEST_EXTRA_OPTS)
+	@env VPP_TEST_FAILED_DIR=$(VPP_TEST_FAILED_DIR) scripts/setsid_wrapper.sh $(FORCE_FOREGROUND) $(PYTHON_VENV_PATH)/bin/activate python run_tests.py -d $(TEST_DIR) $(UNITTEST_EXTRA_OPTS)
+	@env VPP_TEST_FAILED_DIR=$(VPP_TEST_FAILED_DIR) scripts/compress_failed.sh
 endef
 
 .PHONY: sanity
@@ -129,6 +132,8 @@ shell: verify-python-path $(PAPI_INSTALL_DONE)
 reset:
 	@rm -f /dev/shm/vpp-unittest-*
 	@rm -rf /tmp/vpp-unittest-*
+	@rm -rf $(VPP_TEST_FAILED_DIR)
+	@mkdir $(VPP_TEST_FAILED_DIR)
 
 wipe: reset
 	@rm -rf $(PYTHON_VENV_PATH)
diff --git a/test/framework.py b/test/framework.py
index 89d95cb3..008bda3b 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -275,7 +275,7 @@ class VppTestCase(unittest.TestCase):
         gc.collect()  # run garbage collection first
         cls.logger = getLogger(cls.__name__)
         cls.tempdir = tempfile.mkdtemp(
-            prefix='vpp-unittest-' + cls.__name__ + '-')
+            prefix='vpp-unittest-%s-' % cls.__name__)
         cls.file_handler = FileHandler("%s/log.txt" % cls.tempdir)
         cls.file_handler.setFormatter(
             Formatter(fmt='%(asctime)s,%(msecs)03d %(message)s',
@@ -781,6 +781,24 @@ class VppTestResult(unittest.TestResult):
         unittest.TestResult.addSkip(self, test, reason)
         self.result_string = colorize("SKIP", YELLOW)
 
+    def symlink_failed(self, test):
+        logger = None
+        if hasattr(test, 'logger'):
+            logger = test.logger
+        if hasattr(test, 'tempdir'):
+            try:
+                failed_dir = os.getenv('VPP_TEST_FAILED_DIR')
+                link_path = '%s/%s-FAILED' % (failed_dir,
+                                              test.tempdir.split("/")[-1])
+                if logger:
+                    logger.debug("creating a link to the failed test")
+                    logger.debug("os.symlink(%s, %s)" %
+                                 (test.tempdir, link_path))
+                os.symlink(test.tempdir, link_path)
+            except Exception as e:
+                if logger:
+                    logger.error(e)
+
     def addFailure(self, test, err):
         """
         Record a test failed result
@@ -800,6 +818,7 @@ class VppTestResult(unittest.TestResult):
         if hasattr(test, 'tempdir'):
             self.result_string = colorize("FAIL", RED) + \
                 ' [ temp dir used by test case: ' + test.tempdir + ' ]'
+            self.symlink_failed(test)
         else:
             self.result_string = colorize("FAIL", RED) + ' [no temp dir]'
 
@@ -822,6 +841,7 @@ class VppTestResult(unittest.TestResult):
         if hasattr(test, 'tempdir'):
             self.result_string = colorize("ERROR", RED) + \
                 ' [ temp dir used by test case: ' + test.tempdir + ' ]'
+            self.symlink_failed(test)
         else:
             self.result_string = colorize("ERROR", RED) + ' [no temp dir]'
 
diff --git a/test/scripts/compress_failed.sh b/test/scripts/compress_failed.sh
new file mode 100755
index 00000000..6076b3b3
--- /dev/null
+++ b/test/scripts/compress_failed.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ "$(ls -A ${VPP_TEST_FAILED_DIR})" ]
+then
+	if [ "${COMPRESS_FAILED_TEST_LOGS}" == "yes" ]
+	then
+		echo -n "Compressing files in temporary directories from failed test runs..."
+		cd ${VPP_TEST_FAILED_DIR}
+		for d in *
+		do
+			cd ${d}
+			find . ! -path . -print0 | xargs -0 -n1 gzip
+			cd ${VPP_TEST_FAILED_DIR}
+		done
+		echo "done."
+	else
+		echo "Not compressing files in temporary directories from failed test runs."
+	fi
+else
+	echo "No symlinks to failed tests' temporary directories found in ${VPP_TEST_FAILED_DIR}."
+fi
-- 
cgit 1.2.3-korg


From acdc306093aaea2633cf765307d6cb7c1b80081c Mon Sep 17 00:00:00 2001
From: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
Date: Thu, 24 Aug 2017 14:09:17 +0100
Subject: dpdk: required changes for 17.08

DPDK 17.08 breaks ethdev and cryptodev APIs.

Address those changes while keeping backwards compatibility for
DPDK 17.02 and 17.05.

Change-Id: Idd6ac264d0d047fe586c41d4c4ca74e8fc778a54
Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
---
 Makefile                             |   6 +-
 dpdk/Makefile                        |  47 +++++---
 src/configure.ac                     |  70 ++++++++++--
 src/plugins/dpdk.am                  |  16 ++-
 src/plugins/dpdk/device/common.c     |  28 ++++-
 src/plugins/dpdk/device/dpdk.h       |   7 ++
 src/plugins/dpdk/ipsec/cli.c         |  15 +++
 src/plugins/dpdk/ipsec/esp.h         | 212 ++++++++++++++++++++++++++++++-----
 src/plugins/dpdk/ipsec/esp_decrypt.c | 140 ++++++++++-------------
 src/plugins/dpdk/ipsec/esp_encrypt.c | 106 +++++++-----------
 src/plugins/dpdk/ipsec/ipsec.c       | 130 +++++++++++++++++----
 src/plugins/dpdk/ipsec/ipsec.h       |  33 ++++--
 12 files changed, 567 insertions(+), 243 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c1a7cbb5..6ac6f6e7 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ endif
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += lcov chrpath autoconf nasm indent
+DEB_DEPENDS += lcov chrpath autoconf nasm indent libnuma-dev
 DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
@@ -73,7 +73,7 @@ endif
 
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel
+RPM_DEPENDS += python-devel numactl-devel
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
@@ -99,7 +99,7 @@ endif
 
 RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
 RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel
-RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm
+RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm numactl-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
diff --git a/dpdk/Makefile b/dpdk/Makefile
index 2e4b0e96..8d5b42ef 100644
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -35,17 +35,27 @@ DPDK_17.08_TARBALL_MD5_CKSUM := 0641f59ea8ea98afefa7cfa2699f6241
 DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION)
 MACHINE=$(shell uname -m)
 
+AESNI ?= n
+ISA_L_CRYPTO_LIB := n
+
+IPSEC_MB_VER ?= 0.46
+ISA_L_CRYPTO_VER := 2.18.0
+
 ifeq ($(MACHINE),$(filter $(MACHINE),x86_64))
-AESNI := y
-else
-AESNI := n
+AESNI = y
+# DPDK pre 17.08 depends on ISA-L Crypto library for GCM PMD
+  ifneq ($(firstword $(sort $(DPDK_VERSION), 17.08)), 17.08)
+  ISA_L_CRYPTO_LIB = y
+  IPSEC_MB_VER = 0.45
+  $(info Building ISA-L Crypto $(ISA_L_CRYPTO_VER) library)
+  endif
+$(info Building IPSec-MB $(IPSEC_MB_VER) library)
 endif
 
-IPSEC_MB_VER := 0.45
 AESNIMB_LIB_TARBALL := v$(IPSEC_MB_VER).tar.gz
 AESNIMB_LIB_TARBALL_URL := http://github.com/01org/intel-ipsec-mb/archive/$(AESNIMB_LIB_TARBALL)
 AESNIMB_LIB_SOURCE := $(B)/intel-ipsec-mb-$(IPSEC_MB_VER)
-ISA_L_CRYPTO_VER := 2.18.0
+
 ISA_L_CRYPTO_LIB_TARBALL := v$(ISA_L_CRYPTO_VER).tar.gz
 ISA_L_CRYPTO_LIB_TARBALL_URL := http://github.com/01org/isa-l_crypto/archive/$(ISA_L_CRYPTO_LIB_TARBALL)
 ISA_L_CRYPTO_LIB_SOURCE := $(B)/isa-l_crypto-$(ISA_L_CRYPTO_VER)
@@ -100,8 +110,10 @@ else
 DPDK_EXTRA_CFLAGS := -g -O0
 endif
 
+ifeq ($(ISA_L_CRYPTO_LIB),y)
 DPDK_EXTRA_CFLAGS += -I$(ISA_L_CRYPTO_INSTALL_DIR)/include -Wl,-z,muldefs
 DPDK_EXTRA_LDFLAGS += -L$(I)/lib
+endif
 DPDK_MAKE_EXTRA_ARGS += AESNI_MULTI_BUFFER_LIB_PATH=$(AESNIMB_LIB_SOURCE)
 
 # assemble DPDK make arguments
@@ -185,6 +197,8 @@ $(CURDIR)/$(ISA_L_CRYPTO_LIB_TARBALL):
 DPDK_DOWNLOADS = $(CURDIR)/$(DPDK_TARBALL)
 ifeq ($(AESNI),y)
 DPDK_DOWNLOADS += $(CURDIR)/$(AESNIMB_LIB_TARBALL)
+endif
+ifeq ($(ISA_L_CRYPTO_LIB),y)
 DPDK_DOWNLOADS += $(CURDIR)/$(ISA_L_CRYPTO_LIB_TARBALL)
 endif
 
@@ -205,10 +219,12 @@ $(B)/.extract.ok: $(B)/.download.ok
 ifeq ($(AESNI),y)
 	@echo --- extracting $(AESNIMB_LIB_TARBALL) ---
 	@tar --directory $(B) --extract --file $(CURDIR)/$(AESNIMB_LIB_TARBALL)
+endif
+ifeq ($(ISA_L_CRYPTO_LIB),y)
 	@echo --- extracting $(ISA_L_CRYPTO_LIB_TARBALL) ---
 	@tar --directory $(B) --extract --file $(CURDIR)/$(ISA_L_CRYPTO_LIB_TARBALL)
-	@touch $@
 endif
+	@touch $@
 
 .PHONY: extract
 extract: $(B)/.extract.ok
@@ -233,17 +249,11 @@ $(B)/.config.ok: $(B)/.patch.ok $(B)/custom-config
 .PHONY: config
 config: $(B)/.config.ok
 
-# Order matters
-ifeq ($(AESNI),y)
-BUILD_TARGETS += build-ipsec-mb build-isal-crypto build-dpdk
-else
-BUILD_TARGETS += build-dpdk
-endif
-
 .PHONY: build-ipsec-mb
 build-ipsec-mb:
 	mkdir -p $(I)/lib/
-	make -C $(AESNIMB_LIB_SOURCE) -j NO_GCM=y
+	# Do not build GCM stuff if we are building ISA_L
+	make -C $(AESNIMB_LIB_SOURCE) -j NO_GCM=$(ISA_L_CRYPTO_LIB)
 	cp $(AESNIMB_LIB_SOURCE)/libIPSec_MB.a $(I)/lib/
 
 .PHONY: build-isal-crypto
@@ -260,6 +270,15 @@ build-dpdk:
 	@if [ ! -e $(B)/.config.ok ] ; then echo 'Please run "make config" first' && false ; fi
 	@make $(DPDK_MAKE_ARGS) install
 
+# Order matters
+ifeq ($(AESNI),y)
+BUILD_TARGETS += build-ipsec-mb
+endif
+ifeq ($(ISA_L_CRYPTO_LIB),y)
+BUILD_TARGETS += build-isal-crypto
+endif
+BUILD_TARGETS += build-dpdk
+
 $(B)/.build.ok: $(BUILD_TARGETS)
 	@touch $@
 
diff --git a/src/configure.ac b/src/configure.ac
index 4c2d3b47..6b6d9636 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -97,6 +97,26 @@ AC_DEFUN([DPDK_IS_PMD_ENABLED],
   m4_append_uniq([list_of_with], [$2], [, ])
 ])
 
+AC_DEFUN([DETECT_DPDK_IS_1702_OR_1705],
+[
+  AC_MSG_CHECKING([for RTE_VERSION 17.02/17.05 in rte_version.h])
+  AC_TRY_RUN(
+    [
+    #include <rte_version.h>
+    int main()
+    {
+      return ((RTE_VER_YEAR != 17) ||
+	      (RTE_VER_MONTH != 2 && RTE_VER_MONTH != 5));
+    }
+    ],
+    [dpdk_is_1702_or_1705=yes]
+    [AC_MSG_RESULT([yes])],
+    [dpdk_is_1702_or_1705=no]
+    [AC_MSG_RESULT([no])]
+  )
+  AM_CONDITIONAL(DPDK_IS_1702_OR_1705, test "$dpdk_is_1702_or_1705" = "yes")
+])
+
 ###############################################################################
 # configure arguments
 ###############################################################################
@@ -185,34 +205,64 @@ AM_COND_IF([ENABLE_DPDK_SHARED],
     [AC_MSG_ERROR([DPDK shared library not found])],)
 ])
 
+with_aesni_mb_lib=no
+with_isa_l_crypto_lib=no
+
 DPDK_IS_PMD_ENABLED(LIBRTE_PMD_AESNI_MB, dpdk_aesni_mb_pmd)
+DPDK_IS_PMD_ENABLED(LIBRTE_PMD_AESNI_GCM, dpdk_aesni_gcm_pmd)
+
+DETECT_DPDK_IS_1702_OR_1705()
+
 AM_COND_IF([WITH_DPDK_AESNI_MB_PMD],
 [
-  AC_CHECK_LIB([IPSec_MB], [submit_job_sse], [],
+  AC_CHECK_LIB([IPSec_MB], [submit_job_sse],
+	       [with_aesni_mb_lib=yes],
 	       [AC_MSG_ERROR([IPSec_MB library not found])])
 ])
 
-DPDK_IS_PMD_ENABLED(LIBRTE_PMD_AESNI_GCM, dpdk_aesni_gcm_pmd)
 AM_COND_IF([WITH_DPDK_AESNI_GCM_PMD],
 [
-  AC_CHECK_LIB([isal_crypto], [aesni_gcm128_init], [],
-	       [AC_MSG_ERROR([isal_crypto library not found])])
+  AM_COND_IF([DPDK_IS_1702_OR_1705],
+  [
+    AC_CHECK_LIB([isal_crypto], [aesni_gcm128_init],
+		 [with_isa_l_crypto_lib=yes],
+		 [AC_MSG_ERROR([isal_crypto library not found])])
+  ],
+  [
+    AC_CHECK_LIB([IPSec_MB], [submit_job_sse],
+		 [with_aesni_mb_lib=yes],
+		 [AC_MSG_ERROR([IPSec_MB library not found])])
+  ])
 ])
 
-DPDK_IS_PMD_ENABLED(LIBRTE_MLX5_PMD, dpdk_mlx5_pmd)
-AM_COND_IF([WITH_DPDK_MLX5_PMD],
+m4_append([list_of_with], [aesni_mb_lib], [, ])
+AM_CONDITIONAL(WITH_AESNI_MB_LIB, test "$with_aesni_mb_lib" = "yes")
+
+m4_append([list_of_with], [isa_l_crypto_lib], [, ])
+AM_CONDITIONAL(WITH_ISA_L_CRYPTO_LIB, test "$with_isa_l_crypto_lib" = "yes")
+
+
+with_ibverbs_lib=no
+DPDK_IS_PMD_ENABLED(LIBRTE_MLX4_PMD, dpdk_mlx4_pmd)
+AM_COND_IF([WITH_DPDK_MLX4_PMD],
 [
-  AC_CHECK_LIB([ibverbs], [ibv_fork_init], [],
+  AC_CHECK_LIB([ibverbs], [ibv_fork_init],
+	       [with_ibverbs_lib=yes],
 	       [AC_MSG_ERROR([ibverbs library not found])])
 ])
 
-DPDK_IS_PMD_ENABLED(LIBRTE_MLX4_PMD, dpdk_mlx4_pmd)
-AM_COND_IF([WITH_DPDK_MLX4_PMD],
+DPDK_IS_PMD_ENABLED(LIBRTE_MLX5_PMD, dpdk_mlx5_pmd)
+AM_COND_IF([WITH_DPDK_MLX5_PMD],
 [
-  AC_CHECK_LIB([ibverbs], [ibv_fork_init], [],
+  AC_CHECK_LIB([ibverbs], [ibv_fork_init],
+	       [with_ibverbs_lib=yes],
 	       [AC_MSG_ERROR([ibverbs library not found])])
 ])
 
+m4_append([list_of_with], [ibverbs_lib], [, ])
+AM_CONDITIONAL(WITH_IBVERBS_LIB, test "$with_ibverbs_lib" = "yes")
+
+
 AM_COND_IF([ENABLE_G2],
 [
   PKG_CHECK_MODULES(g2, gtk+-2.0)
diff --git a/src/plugins/dpdk.am b/src/plugins/dpdk.am
index 3a1ffeeb..15195a21 100644
--- a/src/plugins/dpdk.am
+++ b/src/plugins/dpdk.am
@@ -19,20 +19,24 @@ dpdk_plugin_la_LDFLAGS = $(AM_LDFLAGS) -ldpdk
 else
 dpdk_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,--whole-archive,-l:libdpdk.a,--no-whole-archive
 endif
-if WITH_DPDK_AESNI_MB_PMD
+if WITH_AESNI_MB_LIB
 dpdk_plugin_la_LDFLAGS += -Wl,--exclude-libs,libIPSec_MB.a,-l:libIPSec_MB.a
 endif
-if WITH_DPDK_AESNI_GCM_PMD
+if WITH_ISA_L_CRYPTO_LIB
 dpdk_plugin_la_LDFLAGS += -Wl,--exclude-libs,libisal_crypto.a,-l:libisal_crypto.a
 endif
-dpdk_plugin_la_LDFLAGS += -Wl,-lm,-ldl
-if WITH_DPDK_MLX5_PMD
+if WITH_IBVERBS_LIB
 dpdk_plugin_la_LDFLAGS += -Wl,-libverbs
 endif
-if WITH_DPDK_MLX4_PMD
-dpdk_plugin_la_LDFLAGS += -Wl,-libverbs
+if DPDK_IS_1702_OR_1705
+dpdk_plugin_la_CFLAGS = $(AM_CFLAGS) -DDPDK_VOID_CALLBACK=1 -DDPDK_NO_AEAD=1
+else
+dpdk_plugin_la_CFLAGS = $(AM_CFLAGS) -DDPDK_VOID_CALLBACK=0 -DDPDK_NO_AEAD=0
+dpdk_plugin_la_LDFLAGS += -Wl,-lnuma
 endif
 
+dpdk_plugin_la_LDFLAGS += -Wl,-lm,-ldl
+
 dpdk_plugin_la_SOURCES =					\
   dpdk/main.c							\
   dpdk/buffer.c							\
diff --git a/src/plugins/dpdk/device/common.c b/src/plugins/dpdk/device/common.c
index df52c58f..2707b4d8 100644
--- a/src/plugins/dpdk/device/common.c
+++ b/src/plugins/dpdk/device/common.c
@@ -181,9 +181,9 @@ dpdk_device_stop (dpdk_device_t * xd)
     }
 }
 
-void
-dpdk_port_state_callback (uint8_t port_id,
-			  enum rte_eth_event_type type, void *param)
+always_inline int
+dpdk_port_state_callback_inline (uint8_t port_id,
+				 enum rte_eth_event_type type, void *param)
 {
   struct rte_eth_link link;
   vlib_main_t *vm = vlib_get_main ();
@@ -193,7 +193,7 @@ dpdk_port_state_callback (uint8_t port_id,
   if (type != RTE_ETH_EVENT_INTR_LSC)
     {
       clib_warning ("Unknown event %d received for port %d", type, port_id);
-      return;
+      return -1;
     }
 
   rte_eth_link_get_nowait (port_id, &link);
@@ -238,8 +238,28 @@ dpdk_port_state_callback (uint8_t port_id,
       else
 	clib_warning ("Port %d Link Down\n\n", port_id);
     }
+
+  return 0;
+}
+
+#if DPDK_VOID_CALLBACK
+void
+dpdk_port_state_callback (uint8_t port_id,
+			  enum rte_eth_event_type type, void *param)
+{
+  dpdk_port_state_callback_inline (port_id, type, param);
 }
 
+#else
+int
+dpdk_port_state_callback (uint8_t port_id,
+			  enum rte_eth_event_type type,
+			  void *param,
+			  void *ret_param __attribute__ ((unused)))
+{
+  return dpdk_port_state_callback_inline (port_id, type, param);
+}
+#endif
 /*
  * fd.io coding-style-patch-verification: ON
  *
diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h
index 29a2c760..1e34e3fb 100644
--- a/src/plugins/dpdk/device/dpdk.h
+++ b/src/plugins/dpdk/device/dpdk.h
@@ -418,8 +418,15 @@ typedef struct
 void dpdk_device_setup (dpdk_device_t * xd);
 void dpdk_device_start (dpdk_device_t * xd);
 void dpdk_device_stop (dpdk_device_t * xd);
+
+#if DPDK_VOID_CALLBACK
 void dpdk_port_state_callback (uint8_t port_id,
 			       enum rte_eth_event_type type, void *param);
+#else
+int dpdk_port_state_callback (uint8_t port_id,
+			      enum rte_eth_event_type type,
+			      void *param, void *ret_param);
+#endif
 
 #define foreach_dpdk_error						\
   _(NONE, "no error")							\
diff --git a/src/plugins/dpdk/ipsec/cli.c b/src/plugins/dpdk/ipsec/cli.c
index a9314065..a9cf2502 100644
--- a/src/plugins/dpdk/ipsec/cli.c
+++ b/src/plugins/dpdk/ipsec/cli.c
@@ -86,13 +86,28 @@ dpdk_ipsec_show_mapping (vlib_main_t * vm, u16 detail_display)
 	  hash_foreach (key, data, cwm->algo_qp_map,
 	  ({
 	    cap.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC;
+#if DPDK_NO_AEAD
 	    cap.sym.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER;
 	    cap.sym.cipher.algo = p_key->cipher_algo;
+#else
+	    if (p_key->is_aead)
+	      {
+		cap.sym.xform_type = RTE_CRYPTO_SYM_XFORM_AEAD;
+		cap.sym.aead.algo = p_key->cipher_algo;
+	      }
+	    else
+	      {
+		cap.sym.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+		cap.sym.cipher.algo = p_key->cipher_algo;
+	      }
+#endif
 	    check_algo_is_supported (&cap, cipher_str);
+
 	    cap.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC;
 	    cap.sym.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH;
 	    cap.sym.auth.algo = p_key->auth_algo;
 	    check_algo_is_supported (&cap, auth_str);
+
 	    vlib_cli_output (vm, "%u\t%10s\t%15s\t%3s\t%u\t%u\n",
 			     vlib_mains[i]->thread_index, cipher_str, auth_str,
 			     p_key->is_outbound ? "out" : "in",
diff --git a/src/plugins/dpdk/ipsec/esp.h b/src/plugins/dpdk/ipsec/esp.h
index 56f0c756..308a66af 100644
--- a/src/plugins/dpdk/ipsec/esp.h
+++ b/src/plugins/dpdk/ipsec/esp.h
@@ -22,6 +22,9 @@
 typedef struct
 {
   enum rte_crypto_cipher_algorithm algo;
+#if ! DPDK_NO_AEAD
+  enum rte_crypto_aead_algorithm aead_algo;
+#endif
   u8 key_len;
   u8 iv_len;
 } dpdk_esp_crypto_alg_t;
@@ -65,7 +68,11 @@ dpdk_esp_init ()
   c->iv_len = 16;
 
   c = &em->esp_crypto_algs[IPSEC_CRYPTO_ALG_AES_GCM_128];
+#if DPDK_NO_AEAD
   c->algo = RTE_CRYPTO_CIPHER_AES_GCM;
+#else
+  c->aead_algo = RTE_CRYPTO_AEAD_AES_GCM;
+#endif
   c->key_len = 16;
   c->iv_len = 8;
 
@@ -90,42 +97,68 @@ dpdk_esp_init ()
   i = &em->esp_integ_algs[IPSEC_INTEG_ALG_SHA_512_256];
   i->algo = RTE_CRYPTO_AUTH_SHA512_HMAC;
   i->trunc_size = 32;
-
+#if DPDK_NO_AEAD
   i = &em->esp_integ_algs[IPSEC_INTEG_ALG_AES_GCM_128];
   i->algo = RTE_CRYPTO_AUTH_AES_GCM;
   i->trunc_size = 16;
+#endif
 }
 
 static_always_inline int
 translate_crypto_algo (ipsec_crypto_alg_t crypto_algo,
-		       struct rte_crypto_sym_xform *cipher_xform)
+		       struct rte_crypto_sym_xform *xform, u8 use_esn)
 {
+#if ! DPDK_NO_AEAD
+  const u16 iv_off =
+    sizeof (struct rte_crypto_op) + sizeof (struct rte_crypto_sym_op) +
+    offsetof (dpdk_cop_priv_t, cb);
+#endif
+
+  xform->type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+
   switch (crypto_algo)
     {
     case IPSEC_CRYPTO_ALG_NONE:
-      cipher_xform->cipher.algo = RTE_CRYPTO_CIPHER_NULL;
+#if ! DPDK_NO_AEAD
+      xform->cipher.iv.offset = iv_off;
+      xform->cipher.iv.length = 0;
+#endif
+      xform->cipher.algo = RTE_CRYPTO_CIPHER_NULL;
       break;
     case IPSEC_CRYPTO_ALG_AES_CBC_128:
     case IPSEC_CRYPTO_ALG_AES_CBC_192:
     case IPSEC_CRYPTO_ALG_AES_CBC_256:
-      cipher_xform->cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
+#if ! DPDK_NO_AEAD
+      xform->cipher.iv.offset = iv_off;
+      xform->cipher.iv.length = 16;
+#endif
+      xform->cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
       break;
     case IPSEC_CRYPTO_ALG_AES_GCM_128:
-      cipher_xform->cipher.algo = RTE_CRYPTO_CIPHER_AES_GCM;
+#if DPDK_NO_AEAD
+      xform->cipher.algo = RTE_CRYPTO_CIPHER_AES_GCM;
+#else
+      xform->type = RTE_CRYPTO_SYM_XFORM_AEAD;
+      xform->aead.algo = RTE_CRYPTO_AEAD_AES_GCM;
+      xform->aead.iv.offset = iv_off;
+      xform->aead.iv.length = 12;	/* GCM IV, not ESP IV */
+      xform->aead.digest_length = 16;
+      xform->aead.aad_length = use_esn ? 12 : 8;
+#endif
       break;
     default:
       return -1;
     }
 
-  cipher_xform->type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-
   return 0;
 }
 
 static_always_inline int
 translate_integ_algo (ipsec_integ_alg_t integ_alg,
-		      struct rte_crypto_sym_xform *auth_xform, int use_esn)
+		      struct rte_crypto_sym_xform *auth_xform, u8 use_esn)
 {
+  auth_xform->type = RTE_CRYPTO_SYM_XFORM_AUTH;
+
   switch (integ_alg)
     {
     case IPSEC_INTEG_ALG_NONE:
@@ -152,21 +185,21 @@ translate_integ_algo (ipsec_integ_alg_t integ_alg,
       auth_xform->auth.algo = RTE_CRYPTO_AUTH_SHA512_HMAC;
       auth_xform->auth.digest_length = 32;
       break;
+#if DPDK_NO_AEAD
     case IPSEC_INTEG_ALG_AES_GCM_128:
       auth_xform->auth.algo = RTE_CRYPTO_AUTH_AES_GCM;
       auth_xform->auth.digest_length = 16;
       auth_xform->auth.add_auth_data_length = use_esn ? 12 : 8;
       break;
+#endif
     default:
       return -1;
     }
 
-  auth_xform->type = RTE_CRYPTO_SYM_XFORM_AUTH;
-
   return 0;
 }
 
-static_always_inline int
+static_always_inline i32
 create_sym_sess (ipsec_sa_t * sa, crypto_sa_session_t * sa_sess,
 		 u8 is_outbound)
 {
@@ -178,6 +211,10 @@ create_sym_sess (ipsec_sa_t * sa, crypto_sa_session_t * sa_sess,
   struct rte_crypto_sym_xform *xfs;
   uword key = 0, *data;
   crypto_worker_qp_key_t *p_key = (crypto_worker_qp_key_t *) & key;
+#if ! DPDK_NO_AEAD
+  i32 socket_id = rte_socket_id ();
+  i32 ret;
+#endif
 
   if (sa->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
     {
@@ -190,15 +227,7 @@ create_sym_sess (ipsec_sa_t * sa, crypto_sa_session_t * sa_sess,
       sa->salt = random_u32 (&seed);
     }
 
-  cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-  cipher_xform.cipher.key.data = sa->crypto_key;
-  cipher_xform.cipher.key.length = sa->crypto_key_len;
-
-  auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-  auth_xform.auth.key.data = sa->integ_key;
-  auth_xform.auth.key.length = sa->integ_key_len;
-
-  if (translate_crypto_algo (sa->crypto_alg, &cipher_xform) < 0)
+  if (translate_crypto_algo (sa->crypto_alg, &cipher_xform, sa->use_esn) < 0)
     return -1;
   p_key->cipher_algo = cipher_xform.cipher.algo;
 
@@ -206,19 +235,44 @@ create_sym_sess (ipsec_sa_t * sa, crypto_sa_session_t * sa_sess,
     return -1;
   p_key->auth_algo = auth_xform.auth.algo;
 
-  if (is_outbound)
+#if ! DPDK_NO_AEAD
+  if (sa->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
     {
-      cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
-      auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
-      cipher_xform.next = &auth_xform;
+      cipher_xform.aead.key.data = sa->crypto_key;
+      cipher_xform.aead.key.length = sa->crypto_key_len;
+
+      if (is_outbound)
+	cipher_xform.cipher.op = RTE_CRYPTO_AEAD_OP_ENCRYPT;
+      else
+	cipher_xform.cipher.op = RTE_CRYPTO_AEAD_OP_DECRYPT;
+      cipher_xform.next = NULL;
       xfs = &cipher_xform;
+      p_key->is_aead = 1;
     }
-  else
+  else				/* Cipher + Auth */
+#endif
     {
-      cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_DECRYPT;
-      auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_VERIFY;
-      auth_xform.next = &cipher_xform;
-      xfs = &auth_xform;
+      cipher_xform.cipher.key.data = sa->crypto_key;
+      cipher_xform.cipher.key.length = sa->crypto_key_len;
+
+      auth_xform.auth.key.data = sa->integ_key;
+      auth_xform.auth.key.length = sa->integ_key_len;
+
+      if (is_outbound)
+	{
+	  cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+	  auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+	  cipher_xform.next = &auth_xform;
+	  xfs = &cipher_xform;
+	}
+      else
+	{
+	  cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_DECRYPT;
+	  auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_VERIFY;
+	  auth_xform.next = &cipher_xform;
+	  xfs = &auth_xform;
+	}
+      p_key->is_aead = 0;
     }
 
   p_key->is_outbound = is_outbound;
@@ -227,17 +281,115 @@ create_sym_sess (ipsec_sa_t * sa, crypto_sa_session_t * sa_sess,
   if (!data)
     return -1;
 
+#if DPDK_NO_AEAD
   sa_sess->sess =
     rte_cryptodev_sym_session_create (cwm->qp_data[*data].dev_id, xfs);
-
   if (!sa_sess->sess)
     return -1;
+#else
+  sa_sess->sess =
+    rte_cryptodev_sym_session_create (dcm->sess_h_pools[socket_id]);
+  if (!sa_sess->sess)
+    return -1;
+
+  ret =
+    rte_cryptodev_sym_session_init (cwm->qp_data[*data].dev_id, sa_sess->sess,
+				    xfs, dcm->sess_pools[socket_id]);
+  if (ret)
+    return -1;
+#endif
 
   sa_sess->qp_index = (u8) * data;
 
   return 0;
 }
 
+static_always_inline void
+crypto_set_icb (dpdk_gcm_cnt_blk * icb, u32 salt, u32 seq, u32 seq_hi)
+{
+  icb->salt = salt;
+  icb->iv[0] = seq;
+  icb->iv[1] = seq_hi;
+#if DPDK_NO_AEAD
+  icb->cnt = clib_host_to_net_u32 (1);
+#endif
+}
+
+#define __unused __attribute__((unused))
+static_always_inline void
+crypto_op_setup (u8 is_aead, struct rte_mbuf *mb0,
+		 struct rte_crypto_op *cop, void *session,
+		 u32 cipher_off, u32 cipher_len,
+		 u8 * icb __unused, u32 iv_size __unused,
+		 u32 auth_off, u32 auth_len,
+		 u8 * aad __unused, u32 aad_size __unused,
+		 u8 * digest, u64 digest_paddr, u32 digest_size __unused)
+{
+  struct rte_crypto_sym_op *sym_cop;
+
+  sym_cop = (struct rte_crypto_sym_op *) (cop + 1);
+
+  sym_cop->m_src = mb0;
+  rte_crypto_op_attach_sym_session (cop, session);
+
+  if (!digest_paddr)
+    digest_paddr =
+      rte_pktmbuf_mtophys_offset (mb0, (uintptr_t) digest - (uintptr_t) mb0);
+
+#if DPDK_NO_AEAD
+  sym_cop->cipher.data.offset = cipher_off;
+  sym_cop->cipher.data.length = cipher_len;
+
+  sym_cop->cipher.iv.data = icb;
+  sym_cop->cipher.iv.phys_addr =
+    cop->phys_addr + (uintptr_t) icb - (uintptr_t) cop;
+  sym_cop->cipher.iv.length = iv_size;
+
+  if (is_aead)
+    {
+      sym_cop->auth.aad.data = aad;
+      sym_cop->auth.aad.phys_addr =
+	cop->phys_addr + (uintptr_t) aad - (uintptr_t) cop;
+      sym_cop->auth.aad.length = aad_size;
+    }
+  else
+    {
+      sym_cop->auth.data.offset = auth_off;
+      sym_cop->auth.data.length = auth_len;
+    }
+
+  sym_cop->auth.digest.data = digest;
+  sym_cop->auth.digest.phys_addr = digest_paddr;
+  sym_cop->auth.digest.length = digest_size;
+#else /* ! DPDK_NO_AEAD */
+  if (is_aead)
+    {
+      sym_cop->aead.data.offset = cipher_off;
+      sym_cop->aead.data.length = cipher_len;
+
+      sym_cop->aead.aad.data = aad;
+      sym_cop->aead.aad.phys_addr =
+	cop->phys_addr + (uintptr_t) aad - (uintptr_t) cop;
+
+      sym_cop->aead.digest.data = digest;
+      sym_cop->aead.digest.phys_addr = digest_paddr;
+    }
+  else
+    {
+      sym_cop->cipher.data.offset = cipher_off;
+      sym_cop->cipher.data.length = cipher_len;
+
+      sym_cop->auth.data.offset = auth_off;
+      sym_cop->auth.data.length = auth_len;
+
+      sym_cop->auth.digest.data = digest;
+      sym_cop->auth.digest.phys_addr = digest_paddr;
+    }
+#endif /* DPDK_NO_AEAD */
+}
+
+#undef __unused
+
 #endif /* __DPDK_ESP_H__ */
 
 /*
diff --git a/src/plugins/dpdk/ipsec/esp_decrypt.c b/src/plugins/dpdk/ipsec/esp_decrypt.c
index 9377970a..c4f295d3 100644
--- a/src/plugins/dpdk/ipsec/esp_decrypt.c
+++ b/src/plugins/dpdk/ipsec/esp_decrypt.c
@@ -44,8 +44,7 @@ typedef enum {
  _(NOT_IP, "Not IP packet (dropped)")	         \
  _(ENQ_FAIL, "Enqueue failed (buffer full)")     \
  _(NO_CRYPTODEV, "Cryptodev not configured")     \
- _(BAD_LEN, "Invalid ciphertext length")         \
- _(UNSUPPORTED, "Cipher/Auth not supported")
+ _(BAD_LEN, "Invalid ciphertext length")
 
 
 typedef enum {
@@ -122,7 +121,7 @@ dpdk_esp_decrypt_node_fn (vlib_main_t * vm,
 
       while (n_left_from > 0 && n_left_to_next > 0)
 	{
-	  u32 bi0, sa_index0 = ~0, seq, icv_size, iv_size;
+	  u32 bi0, sa_index0 = ~0, seq, trunc_size, iv_size;
 	  vlib_buffer_t * b0;
 	  esp_header_t * esp0;
 	  ipsec_sa_t * sa0;
@@ -169,18 +168,6 @@ dpdk_esp_decrypt_node_fn (vlib_main_t * vm,
 
 	  sa0->total_data_size += b0->current_length;
 
-	  if (PREDICT_FALSE(sa0->integ_alg == IPSEC_INTEG_ALG_NONE) ||
-		  PREDICT_FALSE(sa0->crypto_alg == IPSEC_CRYPTO_ALG_NONE))
-	    {
-	      clib_warning ("SPI %u : only cipher + auth supported", sa0->spi);
-	      vlib_node_increment_counter (vm, dpdk_esp_decrypt_node.index,
-					   ESP_DECRYPT_ERROR_UNSUPPORTED, 1);
-	      to_next[0] = bi0;
-	      to_next += 1;
-	      n_left_to_next -= 1;
-	      goto trace;
-	    }
-
 	  sa_sess = pool_elt_at_index(cwm->sa_sess_d[0], sa_index0);
 
 	  if (PREDICT_FALSE(!sa_sess->sess))
@@ -211,7 +198,10 @@ dpdk_esp_decrypt_node_fn (vlib_main_t * vm,
 
 	  rte_crypto_op_attach_sym_session(cop, sess);
 
-	  icv_size = em->esp_integ_algs[sa0->integ_alg].trunc_size;
+	  if (sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
+	    trunc_size = 16;
+	  else
+	    trunc_size = em->esp_integ_algs[sa0->integ_alg].trunc_size;
 	  iv_size = em->esp_crypto_algs[sa0->crypto_alg].iv_len;
 
 	  /* Convert vlib buffer to mbuf */
@@ -222,7 +212,7 @@ dpdk_esp_decrypt_node_fn (vlib_main_t * vm,
 
 	  /* Outer IP header has already been stripped */
 	  u16 payload_len = rte_pktmbuf_pkt_len(mb0) - sizeof (esp_header_t) -
-	      iv_size - icv_size;
+	      iv_size - trunc_size;
 
 	  if ((payload_len & (BLOCK_SIZE - 1)) || (payload_len <= 0))
 	    {
@@ -242,84 +232,64 @@ dpdk_esp_decrypt_node_fn (vlib_main_t * vm,
 
 	  struct rte_crypto_sym_op *sym_cop = (struct rte_crypto_sym_op *)(cop + 1);
 
-	  sym_cop->m_src = mb0;
-	  sym_cop->cipher.data.offset = sizeof (esp_header_t) + iv_size;
-	  sym_cop->cipher.data.length = payload_len;
+	  u8 is_aead = sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128;
+	  u32 cipher_off, cipher_len;
+	  u32 auth_off = 0, auth_len = 0, aad_size = 0;
+	  u8 *aad = NULL, *digest = NULL;
+	  u64 digest_paddr = 0;
 
           u8 *iv = rte_pktmbuf_mtod_offset(mb0, void*, sizeof (esp_header_t));
-          dpdk_cop_priv_t * priv = (dpdk_cop_priv_t *)(sym_cop + 1);
+          dpdk_cop_priv_t *priv = (dpdk_cop_priv_t *)(sym_cop + 1);
+          dpdk_gcm_cnt_blk *icb = &priv->cb;
+
+	  cipher_off = sizeof (esp_header_t) + iv_size;
+	  cipher_len = payload_len;
 
-          if (sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
+          digest =
+	    vlib_buffer_get_current (b0) + sizeof(esp_header_t) +
+	    iv_size + payload_len;
+
+          if (is_aead)
             {
-              dpdk_gcm_cnt_blk *icb = &priv->cb;
-              icb->salt = sa0->salt;
-              clib_memcpy(icb->iv, iv, 8);
-              icb->cnt = clib_host_to_net_u32(1);
-              sym_cop->cipher.iv.data = (u8 *)icb;
-              sym_cop->cipher.iv.phys_addr = cop->phys_addr +
-		(uintptr_t)icb - (uintptr_t)cop;
-              sym_cop->cipher.iv.length = 16;
-
-              u8 *aad = priv->aad;
-              clib_memcpy(aad, iv - sizeof(esp_header_t), 8);
-              sym_cop->auth.aad.data = aad;
-              sym_cop->auth.aad.phys_addr = cop->phys_addr +
-                  (uintptr_t)aad - (uintptr_t)cop;
-              if (sa0->use_esn)
-                {
-                  *((u32*)&aad[8]) = sa0->seq_hi;
-                  sym_cop->auth.aad.length = 12;
-                }
-              else
-                {
-                  sym_cop->auth.aad.length = 8;
-                }
+	      u32 *_iv = (u32 *) iv;
 
-              sym_cop->auth.digest.data = rte_pktmbuf_mtod_offset(mb0, void*,
-                       rte_pktmbuf_pkt_len(mb0) - icv_size);
-              sym_cop->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(mb0,
-                       rte_pktmbuf_pkt_len(mb0) - icv_size);
-              sym_cop->auth.digest.length = icv_size;
+	      crypto_set_icb (icb, sa0->salt, _iv[0], _iv[1]);
+	      iv_size = 16;
 
+              aad = priv->aad;
+              clib_memcpy(aad, esp0, 8);
+	      aad_size = 8;
+              if (sa0->use_esn)
+		{
+		  *((u32*)&aad[8]) = sa0->seq_hi;
+		  aad_size = 12;
+		}
             }
           else
             {
-              sym_cop->cipher.iv.data = rte_pktmbuf_mtod_offset(mb0, void*,
-                       sizeof (esp_header_t));
-              sym_cop->cipher.iv.phys_addr = rte_pktmbuf_mtophys_offset(mb0,
-                       sizeof (esp_header_t));
-              sym_cop->cipher.iv.length = iv_size;
+	      clib_memcpy(icb, iv, 16);
+
+	      auth_off = 0;
+	      auth_len = sizeof(esp_header_t) + iv_size + payload_len;
 
               if (sa0->use_esn)
                 {
                   dpdk_cop_priv_t* priv = (dpdk_cop_priv_t*) (sym_cop + 1);
-                  u8* payload_end = rte_pktmbuf_mtod_offset(
-                      mb0, u8*, sizeof(esp_header_t) + iv_size + payload_len);
-
-                  clib_memcpy (priv->icv, payload_end, icv_size);
-                  *((u32*) payload_end) = sa0->seq_hi;
-                  sym_cop->auth.data.offset = 0;
-                  sym_cop->auth.data.length = sizeof(esp_header_t) + iv_size
-                      + payload_len + sizeof(sa0->seq_hi);
-                  sym_cop->auth.digest.data = priv->icv;
-                  sym_cop->auth.digest.phys_addr = cop->phys_addr
-                      + (uintptr_t) priv->icv - (uintptr_t) cop;
-                  sym_cop->auth.digest.length = icv_size;
-                }
-              else
-                {
-                  sym_cop->auth.data.offset = 0;
-                  sym_cop->auth.data.length = sizeof(esp_header_t) +
-                           iv_size + payload_len;
-
-                  sym_cop->auth.digest.data = rte_pktmbuf_mtod_offset(mb0, void*,
-                           rte_pktmbuf_pkt_len(mb0) - icv_size);
-                  sym_cop->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(mb0,
-                           rte_pktmbuf_pkt_len(mb0) - icv_size);
-                  sym_cop->auth.digest.length = icv_size;
+
+                  clib_memcpy (priv->icv, digest, trunc_size);
+                  *((u32*) digest) = sa0->seq_hi;
+		  auth_len += sizeof(sa0->seq_hi);
+
+                  digest = priv->icv;
+		  digest_paddr =
+		    cop->phys_addr + (uintptr_t) priv->icv - (uintptr_t) cop;
                 }
             }
 
+	  crypto_op_setup (is_aead, mb0, cop, sess,
+			   cipher_off, cipher_len, (u8 *) icb, iv_size,
+			   auth_off, auth_len, aad, aad_size,
+			   digest, digest_paddr, trunc_size);
 trace:
 	  if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
 	    {
@@ -339,6 +309,9 @@ trace:
     {
       u32 enq;
 
+      if (!n_cop_qp[i])
+	continue;
+
       qpd = vec_elt_at_index(cwm->qp_data, i);
       enq = rte_cryptodev_enqueue_burst(qpd->dev_id, qpd->qp_id,
 					qpd->cops, n_cop_qp[i]);
@@ -433,7 +406,7 @@ dpdk_esp_decrypt_post_node_fn (vlib_main_t * vm,
       while (n_left_from > 0 && n_left_to_next > 0)
 	{
 	  esp_footer_t * f0;
-	  u32 bi0, next0, icv_size, iv_size;
+	  u32 bi0, next0, trunc_size, iv_size;
 	  vlib_buffer_t * b0 = 0;
 	  ip4_header_t *ih4 = 0, *oh4 = 0;
 	  ip6_header_t *ih6 = 0, *oh6 = 0;
@@ -455,7 +428,10 @@ dpdk_esp_decrypt_post_node_fn (vlib_main_t * vm,
 	  to_next[0] = bi0;
 	  to_next += 1;
 
-	  icv_size = em->esp_integ_algs[sa0->integ_alg].trunc_size;
+	  if (sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
+	    trunc_size = 16;
+	  else
+	    trunc_size = em->esp_integ_algs[sa0->integ_alg].trunc_size;
 	  iv_size = em->esp_crypto_algs[sa0->crypto_alg].iv_len;
 
 	  if (sa0->use_anti_replay)
@@ -472,7 +448,7 @@ dpdk_esp_decrypt_post_node_fn (vlib_main_t * vm,
 	  ih4 = (ip4_header_t *) (b0->data + sizeof(ethernet_header_t));
 	  vlib_buffer_advance (b0, sizeof (esp_header_t) + iv_size);
 
-	  b0->current_length -= (icv_size + 2);
+	  b0->current_length -= (trunc_size + 2);
 	  b0->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
 	  f0 = (esp_footer_t *) ((u8 *) vlib_buffer_get_current (b0) +
 				 b0->current_length);
diff --git a/src/plugins/dpdk/ipsec/esp_encrypt.c b/src/plugins/dpdk/ipsec/esp_encrypt.c
index ac552f6c..6de444fd 100644
--- a/src/plugins/dpdk/ipsec/esp_encrypt.c
+++ b/src/plugins/dpdk/ipsec/esp_encrypt.c
@@ -43,8 +43,7 @@ typedef enum
  _(RX_PKTS, "ESP pkts received")                    \
  _(SEQ_CYCLED, "sequence number cycled")            \
  _(ENQ_FAIL, "Enqueue failed (buffer full)")        \
- _(NO_CRYPTODEV, "Cryptodev not configured")        \
- _(UNSUPPORTED, "Cipher/Auth not supported")
+ _(NO_CRYPTODEV, "Cryptodev not configured")
 
 
 typedef enum
@@ -142,6 +141,7 @@ dpdk_esp_encrypt_node_fn (vlib_main_t * vm,
 	  const int BLOCK_SIZE = 16;
 	  u32 iv_size;
 	  u16 orig_sz;
+	  u8 trunc_size;
 	  crypto_sa_session_t *sa_sess;
 	  void *sess;
 	  struct rte_crypto_op *cop = 0;
@@ -199,6 +199,11 @@ dpdk_esp_encrypt_node_fn (vlib_main_t * vm,
 
 	  ssize_t adv;
 	  iv_size = em->esp_crypto_algs[sa0->crypto_alg].iv_len;
+	  if (sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
+	    trunc_size = 16;
+	  else
+	    trunc_size = em->esp_integ_algs[sa0->integ_alg].trunc_size;
+
 	  ih0 = vlib_buffer_get_current (b0);
 	  orig_sz = b0->current_length;
 	  is_ipv6 = (ih0->ip4.ip_version_and_header_length & 0xF0) == 0x60;
@@ -314,9 +319,6 @@ dpdk_esp_encrypt_node_fn (vlib_main_t * vm,
 	      transport_mode = 1;
 	    }
 
-	  ASSERT (sa0->crypto_alg < IPSEC_CRYPTO_N_ALG);
-	  ASSERT (sa0->crypto_alg != IPSEC_CRYPTO_ALG_NONE);
-
 	  int blocks = 1 + (orig_sz + 1) / BLOCK_SIZE;
 
 	  /* pad packet in input buffer */
@@ -330,8 +332,7 @@ dpdk_esp_encrypt_node_fn (vlib_main_t * vm,
 	  f0 = vlib_buffer_get_current (b0) + b0->current_length + pad_bytes;
 	  f0->pad_length = pad_bytes;
 	  f0->next_header = next_hdr_type;
-	  b0->current_length += pad_bytes + 2 +
-	    em->esp_integ_algs[sa0->integ_alg].trunc_size;
+	  b0->current_length += pad_bytes + 2 + trunc_size;
 
 	  vnet_buffer (b0)->sw_if_index[VLIB_RX] =
 	    vnet_buffer (b0)->sw_if_index[VLIB_RX];
@@ -349,88 +350,64 @@ dpdk_esp_encrypt_node_fn (vlib_main_t * vm,
 	  mb0->pkt_len = b0->current_length;
 	  mb0->data_off = RTE_PKTMBUF_HEADROOM + b0->current_data;
 
-	  rte_crypto_op_attach_sym_session (cop, sess);
+	  dpdk_gcm_cnt_blk *icb = &priv->cb;
 
-	  sym_cop->m_src = mb0;
+	  crypto_set_icb (icb, sa0->salt, sa0->seq, sa0->seq_hi);
 
-	  dpdk_gcm_cnt_blk *icb = &priv->cb;
-	  icb->salt = sa0->salt;
-	  icb->iv[0] = sa0->seq;
-	  icb->iv[1] = sa0->seq_hi;
-	  icb->cnt = clib_host_to_net_u32 (1);
+	  u8 is_aead = sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128;
+	  u32 cipher_off, cipher_len;
+	  u32 auth_off = 0, auth_len = 0, aad_size = 0;
+	  u8 *aad = NULL, *digest = NULL;
 
-	  if (sa0->crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
+	  if (is_aead)
 	    {
 	      u32 *esp_iv =
 		(u32 *) (b0->data + b0->current_data + ip_hdr_size +
 			 sizeof (esp_header_t));
 	      esp_iv[0] = sa0->seq;
 	      esp_iv[1] = sa0->seq_hi;
-	      sym_cop->cipher.data.offset =
-		ip_hdr_size + sizeof (esp_header_t) + iv_size;
-	      sym_cop->cipher.data.length = BLOCK_SIZE * blocks;
-	      sym_cop->cipher.iv.length = 16;
-	    }
-	  else
-	    {
-	      sym_cop->cipher.data.offset =
-		ip_hdr_size + sizeof (esp_header_t);
-	      sym_cop->cipher.data.length = BLOCK_SIZE * blocks + iv_size;
-	      sym_cop->cipher.iv.length = iv_size;
-	    }
 
-	  sym_cop->cipher.iv.data = (u8 *) icb;
-	  sym_cop->cipher.iv.phys_addr = cop->phys_addr + (uintptr_t) icb
-	    - (uintptr_t) cop;
+	      cipher_off = ip_hdr_size + sizeof (esp_header_t) + iv_size;
+	      cipher_len = BLOCK_SIZE * blocks;
+	      iv_size = 16;	/* GCM IV size, not ESP IV size */
 
-
-	  ASSERT (sa0->integ_alg < IPSEC_INTEG_N_ALG);
-	  ASSERT (sa0->integ_alg != IPSEC_INTEG_ALG_NONE);
-
-	  if (PREDICT_FALSE (sa0->integ_alg == IPSEC_INTEG_ALG_AES_GCM_128))
-	    {
-	      u8 *aad = priv->aad;
+	      aad = priv->aad;
 	      clib_memcpy (aad, vlib_buffer_get_current (b0) + ip_hdr_size,
 			   8);
-	      sym_cop->auth.aad.data = aad;
-	      sym_cop->auth.aad.phys_addr = cop->phys_addr +
-		(uintptr_t) aad - (uintptr_t) cop;
-
+	      aad_size = 8;
 	      if (PREDICT_FALSE (sa0->use_esn))
 		{
 		  *((u32 *) & aad[8]) = sa0->seq_hi;
-		  sym_cop->auth.aad.length = 12;
-		}
-	      else
-		{
-		  sym_cop->auth.aad.length = 8;
+		  aad_size = 12;
 		}
+
+	      digest =
+		vlib_buffer_get_current (b0) + b0->current_length -
+		trunc_size;
 	    }
 	  else
 	    {
-	      sym_cop->auth.data.offset = ip_hdr_size;
-	      sym_cop->auth.data.length = b0->current_length - ip_hdr_size
-		- em->esp_integ_algs[sa0->integ_alg].trunc_size;
+	      cipher_off = ip_hdr_size + sizeof (esp_header_t);
+	      cipher_len = BLOCK_SIZE * blocks + iv_size;
+
+	      auth_off = ip_hdr_size;
+	      auth_len = b0->current_length - ip_hdr_size - trunc_size;
+
+	      digest =
+		vlib_buffer_get_current (b0) + b0->current_length -
+		trunc_size;
 
 	      if (PREDICT_FALSE (sa0->use_esn))
 		{
-		  u8 *payload_end =
-		    vlib_buffer_get_current (b0) + b0->current_length;
-		  *((u32 *) payload_end) = sa0->seq_hi;
-		  sym_cop->auth.data.length += sizeof (sa0->seq_hi);
+		  *((u32 *) digest) = sa0->seq_hi;
+		  auth_len += sizeof (sa0->seq_hi);
 		}
 	    }
-	  sym_cop->auth.digest.data = vlib_buffer_get_current (b0) +
-	    b0->current_length -
-	    em->esp_integ_algs[sa0->integ_alg].trunc_size;
-	  sym_cop->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset (mb0,
-								       b0->current_length
-								       -
-								       em->esp_integ_algs
-								       [sa0->integ_alg].trunc_size);
-	  sym_cop->auth.digest.length =
-	    em->esp_integ_algs[sa0->integ_alg].trunc_size;
 
+	  crypto_op_setup (is_aead, mb0, cop, sess,
+			   cipher_off, cipher_len, (u8 *) icb, iv_size,
+			   auth_off, auth_len, aad, aad_size,
+			   digest, 0, trunc_size);
 
 	  if (PREDICT_FALSE (is_ipv6))
 	    {
@@ -470,6 +447,9 @@ dpdk_esp_encrypt_node_fn (vlib_main_t * vm,
     {
       u32 enq;
 
+      if (!n_cop_qp[i])
+	continue;
+
       qpd = vec_elt_at_index(cwm->qp_data, i);
       enq = rte_cryptodev_enqueue_burst(qpd->dev_id, qpd->qp_id,
 					qpd->cops, n_cop_qp[i]);
diff --git a/src/plugins/dpdk/ipsec/ipsec.c b/src/plugins/dpdk/ipsec/ipsec.c
index 7066564d..c922940c 100644
--- a/src/plugins/dpdk/ipsec/ipsec.c
+++ b/src/plugins/dpdk/ipsec/ipsec.c
@@ -56,18 +56,23 @@ add_del_sa_sess (u32 sa_index, u8 is_add)
 	  else
 	    {
 	      u8 dev_id;
+	      i32 ret;
 
 	      sa_sess = pool_elt_at_index (cwm->sa_sess_d[is_outbound], sa_index);
 	      dev_id = cwm->qp_data[sa_sess->qp_index].dev_id;
 
 	      if (!sa_sess->sess)
 		continue;
-
-	      if (rte_cryptodev_sym_session_free(dev_id, sa_sess->sess))
-		{
-		  clib_warning("failed to free session");
-		  return -1;
-		}
+#if DPDK_NO_AEAD
+	      ret = (rte_cryptodev_sym_session_free(dev_id, sa_sess->sess) == NULL);
+	      ASSERT (ret);
+#else
+	      ret = rte_cryptodev_sym_session_clear(dev_id, sa_sess->sess);
+	      ASSERT (!ret);
+
+	      ret = rte_cryptodev_sym_session_free(sa_sess->sess);
+	      ASSERT (!ret);
+#endif
 	      memset(sa_sess, 0, sizeof(sa_sess[0]));
 	    }
 	}
@@ -94,7 +99,7 @@ update_qp_data (crypto_worker_main_t * cwm,
     }
   /* *INDENT-ON* */
 
-  vec_add2 (cwm->qp_data, qpd, 1);
+  vec_add2_aligned (cwm->qp_data, qpd, 1, CLIB_CACHE_LINE_BYTES);
 
   qpd->dev_id = cdev_id;
   qpd->qp_id = qp_id;
@@ -119,6 +124,9 @@ add_mapping (crypto_worker_main_t * cwm,
   p_key->cipher_algo = (u8) cipher_cap->sym.cipher.algo;
   p_key->auth_algo = (u8) auth_cap->sym.auth.algo;
   p_key->is_outbound = is_outbound;
+#if ! DPDK_NO_AEAD
+  p_key->is_aead = cipher_cap->sym.xform_type == RTE_CRYPTO_SYM_XFORM_AEAD;
+#endif
 
   ret = hash_get (cwm->algo_qp_map, key);
   if (ret)
@@ -147,6 +155,20 @@ add_cdev_mapping (crypto_worker_main_t * cwm,
 
   for (i = dev_info->capabilities; i->op != RTE_CRYPTO_OP_TYPE_UNDEFINED; i++)
     {
+#if ! DPDK_NO_AEAD
+      if (i->sym.xform_type == RTE_CRYPTO_SYM_XFORM_AEAD)
+	{
+	  struct rte_cryptodev_capabilities none = { 0 };
+
+	  if (check_algo_is_supported (i, NULL) != 0)
+	    continue;
+
+	  none.sym.auth.algo = RTE_CRYPTO_AUTH_NULL;
+
+	  mapped |= add_mapping (cwm, cdev_id, qp, is_outbound, i, &none);
+	  continue;
+	}
+#endif
       if (i->sym.xform_type != RTE_CRYPTO_SYM_XFORM_CIPHER)
 	continue;
 
@@ -205,17 +227,23 @@ dpdk_ipsec_check_support (ipsec_sa_t * sa)
     {
       if (sa->integ_alg != IPSEC_INTEG_ALG_NONE)
 	return clib_error_return (0, "unsupported integ-alg %U with "
-				  "crypto-algo aes-gcm-128",
+				  "crypto-alg aes-gcm-128",
 				  format_ipsec_integ_alg, sa->integ_alg);
+#if DPDK_NO_AEAD
       sa->integ_alg = IPSEC_INTEG_ALG_AES_GCM_128;
+#endif
     }
-  else
-    {
-      if (sa->integ_alg == IPSEC_INTEG_ALG_NONE ||
-	  sa->integ_alg == IPSEC_INTEG_ALG_AES_GCM_128)
-	return clib_error_return (0, "unsupported integ-alg %U",
-				  format_ipsec_integ_alg, sa->integ_alg);
-    }
+#if DPDK_NO_AEAD
+  else if (sa->crypto_alg == IPSEC_CRYPTO_ALG_NONE ||
+	   sa->integ_alg == IPSEC_INTEG_ALG_NONE ||
+	   sa->integ_alg == IPSEC_INTEG_ALG_AES_GCM_128)
+#else
+  else if (sa->integ_alg == IPSEC_INTEG_ALG_NONE)
+#endif
+    return clib_error_return (0,
+			      "unsupported integ-alg %U with crypto-alg %U",
+			      format_ipsec_integ_alg, sa->integ_alg,
+			      format_ipsec_crypto_alg, sa->crypto_alg);
 
   return 0;
 }
@@ -233,6 +261,10 @@ dpdk_ipsec_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
   struct rte_mempool *rmp;
   i32 dev_id, ret;
   u32 i, skip_master;
+#if ! DPDK_NO_AEAD
+  u32 max_sess_size = 0, sess_size;
+  i8 socket_id;
+#endif
 
   if (check_cryptodev_queues () < 0)
     {
@@ -297,9 +329,10 @@ dpdk_ipsec_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
 
       dev_conf.socket_id = rte_cryptodev_socket_id (dev_id);
       dev_conf.nb_queue_pairs = cdev_info.max_nb_queue_pairs;
+#if DPDK_NO_AEAD
       dev_conf.session_mp.nb_objs = DPDK_CRYPTO_NB_SESS_OBJS;
       dev_conf.session_mp.cache_size = DPDK_CRYPTO_CACHE_SIZE;
-
+#endif
       ret = rte_cryptodev_configure (dev_id, &dev_conf);
       if (ret < 0)
 	{
@@ -310,16 +343,26 @@ dpdk_ipsec_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
       qp_conf.nb_descriptors = DPDK_CRYPTO_N_QUEUE_DESC;
       for (qp = 0; qp < dev_conf.nb_queue_pairs; qp++)
 	{
+#if DPDK_NO_AEAD
 	  ret = rte_cryptodev_queue_pair_setup (dev_id, qp, &qp_conf,
 						dev_conf.socket_id);
+#else
+	  ret = rte_cryptodev_queue_pair_setup (dev_id, qp, &qp_conf,
+						dev_conf.socket_id, NULL);
+#endif
 	  if (ret < 0)
 	    {
 	      clib_warning ("cryptodev %u qp %u setup error", dev_id, qp);
 	      goto error;
 	    }
 	}
-      vec_validate_aligned (dcm->cop_pools, dev_conf.socket_id,
-			    CLIB_CACHE_LINE_BYTES);
+      vec_validate (dcm->cop_pools, dev_conf.socket_id);
+
+#if ! DPDK_NO_AEAD
+      sess_size = rte_cryptodev_get_private_session_size (dev_id);
+      if (sess_size > max_sess_size)
+	max_sess_size = sess_size;
+#endif
 
       if (!vec_elt (dcm->cop_pools, dev_conf.socket_id))
 	{
@@ -333,14 +376,14 @@ dpdk_ipsec_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
 					   DPDK_CRYPTO_CACHE_SIZE,
 					   DPDK_CRYPTO_PRIV_SIZE,
 					   dev_conf.socket_id);
-	  vec_free (pool_name);
 
 	  if (!rmp)
 	    {
-	      clib_warning ("failed to allocate mempool on socket %u",
-			    dev_conf.socket_id);
+	      clib_warning ("failed to allocate %s", pool_name);
+	      vec_free (pool_name);
 	      goto error;
 	    }
+	  vec_free (pool_name);
 	  vec_elt (dcm->cop_pools, dev_conf.socket_id) = rmp;
 	}
 
@@ -348,6 +391,51 @@ dpdk_ipsec_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
 	       DPDK_CRYPTO_NB_SESS_OBJS, DPDK_CRYPTO_CACHE_SIZE);
     }
 
+#if ! DPDK_NO_AEAD
+  /* *INDENT-OFF* */
+  vec_foreach_index (socket_id, dcm->cop_pools)
+    {
+      u8 *pool_name;
+
+      if (!vec_elt (dcm->cop_pools, socket_id))
+	continue;
+
+      vec_validate (dcm->sess_h_pools, socket_id);
+      pool_name = format (0, "crypto_sess_h_socket%u%c",
+			      socket_id, 0);
+      rmp =
+	rte_mempool_create((i8 *)pool_name, DPDK_CRYPTO_NB_SESS_OBJS,
+			   rte_cryptodev_get_header_session_size (),
+			   512, 0, NULL, NULL, NULL, NULL,
+			   socket_id, 0);
+      if (!rmp)
+	{
+	  clib_warning ("failed to allocate %s", pool_name);
+	  vec_free (pool_name);
+	  goto error;
+	}
+      vec_free (pool_name);
+      vec_elt (dcm->sess_h_pools, socket_id) = rmp;
+
+      vec_validate (dcm->sess_pools, socket_id);
+      pool_name = format (0, "crypto_sess_socket%u%c",
+			      socket_id, 0);
+      rmp =
+	rte_mempool_create((i8 *)pool_name, DPDK_CRYPTO_NB_SESS_OBJS,
+			   max_sess_size, 512, 0, NULL, NULL, NULL, NULL,
+			   socket_id, 0);
+      if (!rmp)
+	{
+	  clib_warning ("failed to allocate %s", pool_name);
+	  vec_free (pool_name);
+	  goto error;
+	}
+      vec_free (pool_name);
+      vec_elt (dcm->sess_pools, socket_id) = rmp;
+    }
+  /* *INDENT-ON* */
+#endif
+
   dpdk_esp_init ();
 
   /* Add new next node and set as default */
diff --git a/src/plugins/dpdk/ipsec/ipsec.h b/src/plugins/dpdk/ipsec/ipsec.h
index d7940345..a94dd682 100644
--- a/src/plugins/dpdk/ipsec/ipsec.h
+++ b/src/plugins/dpdk/ipsec/ipsec.h
@@ -53,6 +53,7 @@ typedef struct
   u8 cipher_algo;
   u8 auth_algo;
   u8 is_outbound;
+  u8 is_aead;
 } crypto_worker_qp_key_t;
 
 typedef struct
@@ -81,6 +82,8 @@ typedef struct
 
 typedef struct
 {
+  struct rte_mempool **sess_h_pools;
+  struct rte_mempool **sess_pools;
   struct rte_mempool **cop_pools;
   crypto_worker_main_t *workers_main;
   u8 enabled;
@@ -146,12 +149,14 @@ check_algo_is_supported (const struct rte_cryptodev_capabilities *cap,
 {
   struct
   {
-    uint8_t cipher_algo;
     enum rte_crypto_sym_xform_type type;
     union
     {
       enum rte_crypto_auth_algorithm auth;
       enum rte_crypto_cipher_algorithm cipher;
+#if ! DPDK_NO_AEAD
+      enum rte_crypto_aead_algorithm aead;
+#endif
     };
     char *name;
   } supported_algo[] =
@@ -162,15 +167,18 @@ check_algo_is_supported (const struct rte_cryptodev_capabilities *cap,
     {
     .type = RTE_CRYPTO_SYM_XFORM_CIPHER,.cipher =
 	RTE_CRYPTO_CIPHER_AES_CBC,.name = "AES_CBC"},
+#if DPDK_NO_AEAD
     {
     .type = RTE_CRYPTO_SYM_XFORM_CIPHER,.cipher =
-	RTE_CRYPTO_CIPHER_AES_CTR,.name = "AES_CTR"},
+	RTE_CRYPTO_CIPHER_AES_GCM,.name = "AES-GCM"},
+#else
     {
-    .type = RTE_CRYPTO_SYM_XFORM_CIPHER,.cipher =
-	RTE_CRYPTO_CIPHER_3DES_CBC,.name = "3DES-CBC"},
+    .type = RTE_CRYPTO_SYM_XFORM_AEAD,.aead =
+	RTE_CRYPTO_AEAD_AES_GCM,.name = "AES-GCM"},
+#endif
     {
-    .type = RTE_CRYPTO_SYM_XFORM_CIPHER,.cipher =
-	RTE_CRYPTO_CIPHER_AES_GCM,.name = "AES-GCM"},
+    .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
+	RTE_CRYPTO_AUTH_NULL,.name = "NULL"},
     {
     .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
 	RTE_CRYPTO_AUTH_SHA1_HMAC,.name = "HMAC-SHA1"},
@@ -183,15 +191,16 @@ check_algo_is_supported (const struct rte_cryptodev_capabilities *cap,
     {
     .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
 	RTE_CRYPTO_AUTH_SHA512_HMAC,.name = "HMAC-SHA512"},
-    {
-    .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
-	RTE_CRYPTO_AUTH_AES_XCBC_MAC,.name = "AES-XCBC-MAC"},
+#if DPDK_NO_AEAD
     {
     .type = RTE_CRYPTO_SYM_XFORM_AUTH,.auth =
 	RTE_CRYPTO_AUTH_AES_GCM,.name = "AES-GCM"},
+#endif
     {
       /* tail */
-  .type = RTE_CRYPTO_SYM_XFORM_NOT_SPECIFIED},};
+    .type = RTE_CRYPTO_SYM_XFORM_NOT_SPECIFIED}
+  };
+
   uint32_t i = 0;
 
   if (cap->op != RTE_CRYPTO_OP_TYPE_SYMMETRIC)
@@ -203,6 +212,10 @@ check_algo_is_supported (const struct rte_cryptodev_capabilities *cap,
 	{
 	  if ((cap->sym.xform_type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
 	       cap->sym.cipher.algo == supported_algo[i].cipher) ||
+#if ! DPDK_NO_AEAD
+	      (cap->sym.xform_type == RTE_CRYPTO_SYM_XFORM_AEAD &&
+	       cap->sym.aead.algo == supported_algo[i].aead) ||
+#endif
 	      (cap->sym.xform_type == RTE_CRYPTO_SYM_XFORM_AUTH &&
 	       cap->sym.auth.algo == supported_algo[i].auth))
 	    {
-- 
cgit 1.2.3-korg


From 27de761048e561f849fdda690d69e5644a9360d4 Mon Sep 17 00:00:00 2001
From: Marco Varlese <marco.varlese@suse.com>
Date: Fri, 25 Aug 2017 17:00:51 +0200
Subject: Fixed the SUSE dependency on libnuma

Change-Id: I0de13c7fac91c7fc2fcbc9e765ae37720a583aaf
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6ac6f6e7..ea9d6bee 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ endif
 
 RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
 RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel
-RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm numactl-devel
+RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
-- 
cgit 1.2.3-korg


From bd8e242024fcc2daffa77bdd6e2da1296ace5c69 Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Thu, 3 Aug 2017 11:04:24 -0400
Subject: Add Build Requirements from Makefile to spec file.

JIRA: VPP-498

Changes to build to help with downstream distro builds
for Fedora, Centos and RHEL distros.
Add nasm, automake, libtool, byacc, bison and flex.
Remove libconfuse and dependencies.
Remove epel-release rpm and dependencies.
Add conditionals to work around Python 2 packaging
inconsistency in Fed 25.
Add numactl to rpm requirements.

Change-Id: Ia39f8b931dc87e42df56414d38662eb33c7a4ca7
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 Makefile            | 25 ++++++++++---------------
 extras/rpm/vpp.spec | 29 +++++++++++++++++++++++------
 2 files changed, 33 insertions(+), 21 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ea9d6bee..e5eb1b33 100644
--- a/Makefile
+++ b/Makefile
@@ -72,12 +72,18 @@ else
 endif
 
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
-RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel numactl-devel
+RPM_DEPENDS += openssl-devel
+RPM_DEPENDS += numactl-devel
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
+	RPM_DEPENDS += python-devel
+	RPM_DEPENDS += python2-virtualenv
+	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
+else ifeq ($(shell if [ "$(OS_VERSION_ID)" -gt "25" ] ; then echo "y" ; fi),"y")
+	RPM_DEPENDS += python2-devel
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else
+	RPM_DEPENDS += python-devel
 	RPM_DEPENDS += python-virtualenv
 	RPM_DEPENDS_GROUPS = 'Development Tools'
 endif
@@ -90,12 +96,6 @@ ifeq ($(OS_ID),fedora)
 else
 	RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
 endif
-EPEL_DEPENDS = libconfuse-devel epel-rpm-macros
-ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
-	EPEL_DEPENDS += lcov
-else
-	RPM_DEPENDS += lcov
-endif
 
 RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
 RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel
@@ -206,13 +206,9 @@ ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
 	fi ; \
 	exit 0
 else ifneq ("$(wildcard /etc/redhat-release)","")
-	@for i in $(RPM_DEPENDS) $(EPEL_DEPENDS) ; do \
+	@for i in $(RPM_DEPENDS) ; do \
 	    RPM=$$(basename -s .rpm "$${i##*/}" | cut -d- -f1,2,3)  ;	\
-	    if [[ "$$RPM" =~ "epel-release-latest" ]] ; then		\
-	        MISSING+=$$(rpm -q epel-release | grep "^package") ;	\
-	    else							\
-		MISSING+=$$(rpm -q $$RPM | grep "^package")	   ;    \
-	    fi							   ;    \
+	    MISSING+=$$(rpm -q $$RPM | grep "^package")	   ;    \
 	done							   ;	\
 	if [ -n "$$MISSING" ] ; then \
 	  echo "Please install missing RPMs: \n$$MISSING\n" ; \
@@ -255,7 +251,6 @@ endif
 else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
 	@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
-	@sudo -E yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS)
 	@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib
 else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
 	@sudo -E zypper -n install -y $(RPM_SUSE_DEPENDS)
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index ffb6382f..439e6bda 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -29,6 +29,21 @@ Version: %{_version}
 Release: %{_release}
 Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python
 BuildRequires: systemd, chrpath
+BuildRequires: libffi-devel, openssl-devel
+%if 0%{?fedora} >= 26
+BuildRequires: python2-devel, python2-virtualenv
+%else
+%if 0%{?fedora} == 25
+BuildRequires: python-devel, python2-virtualenv
+%else
+BuildRequires: python-devel, python-virtualenv
+%endif
+%endif
+BuildRequires: glibc-static, java-1.8.0-openjdk, java-1.8.0-openjdk-devel yum-utils, redhat-lsb
+BuildRequires: apr-devel
+BuildRequires: nasm
+BuildRequires: numactl-devel
+BuildRequires: autoconf automake libtool byacc bison flex
 
 Source: %{name}-%{_version}-%{_release}.tar.xz
 # Source: vpp-latest.tar.xz
@@ -156,10 +171,11 @@ install -p -m 644 %{_mu_build_dir}/../src/scripts/vppctl-cmd-list %{buildroot}/u
 # Lua bindings
 mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/cli
 mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/lute
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua && git ls-files .)
+# for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua && git ls-files .)
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua && find . -type f -regex '.*/*.[luteamd]' -print | sed -e 's/^\.\///')
 do
-	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua/$file \
-	   %{buildroot}/usr/share/doc/vpp/examples/lua/$file
+	( cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/vpp-api/lua && install -p -m 644 $file \
+	   %{buildroot}/usr/share/doc/vpp/examples/lua/$file )
 done
 
 # Java bindings
@@ -195,10 +211,11 @@ done;
 
 # sample plugin
 mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/sample
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin && git ls-files .)
+#for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin && git ls-files .)
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin && find . -type f -regex '.*/*.[acdhimp]' -print | sed -e 's/^\.\///')
 do
-	install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin/$file \
-	   %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/$file
+	( cd %{_mu_build_dir}/%{_vpp_install_dir}/../../src/examples/sample-plugin && install -p -m 644 $file \
+	   %{buildroot}/usr/share/doc/vpp/examples/sample-plugin/$file )
 done
 
 
-- 
cgit 1.2.3-korg


From 78d5abea8584041b872def163c39464087eed9ef Mon Sep 17 00:00:00 2001
From: Gabriel Ganne <gabriel.ganne@enea.com>
Date: Tue, 29 Aug 2017 11:29:38 +0200
Subject: silence makefile warning on ubuntu

shell error on ubuntu when OS_VERSION_ID == 16.04:
/bin/sh: 1: [: Illegal number: 16.04

Change-Id: I8db55f751ad7fb677a6565cbbce93a9bc08060b7
Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e5eb1b33..1548f368 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
 	RPM_DEPENDS += python-devel
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
-else ifeq ($(shell if [ "$(OS_VERSION_ID)" -gt "25" ] ; then echo "y" ; fi),"y")
+else ifeq ($(shell if [ $(echo "$(OS_VERSION_ID) > 25" | bc) -eq 1 ] ; then echo "y" ; fi),"y")
 	RPM_DEPENDS += python2-devel
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
-- 
cgit 1.2.3-korg


From e58c93b2764eb306d286531a2b920c6de080cb77 Mon Sep 17 00:00:00 2001
From: Gabriel Ganne <gabriel.ganne@enea.com>
Date: Wed, 30 Aug 2017 19:44:56 +0200
Subject: add bc to dependency list

replace $(echo "..." | bc) by `echo ... | bc` as they do not seem to
behave the same way.

Change-Id: Ib8f13f0c8213aaae89d65559427e01bc40f4e8d1
Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1548f368..5ca2debf 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += lcov chrpath autoconf nasm indent libnuma-dev
-DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6
+DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 bc
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
@@ -74,11 +74,12 @@ endif
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel
 RPM_DEPENDS += numactl-devel
+RPM_DEPENDS += bc
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
 	RPM_DEPENDS += python-devel
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
-else ifeq ($(shell if [ $(echo "$(OS_VERSION_ID) > 25" | bc) -eq 1 ] ; then echo "y" ; fi),"y")
+else ifeq ($(shell if [ `echo "$(OS_VERSION_ID) > 25" | bc` -eq 1 ] ; then echo "y" ; fi),"y")
 	RPM_DEPENDS += python2-devel
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
@@ -99,7 +100,7 @@ endif
 
 RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
 RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel
-RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel
+RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel bc
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
-- 
cgit 1.2.3-korg


From 1211beb572bb6185633de9b262f0bf087fc912f5 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Thu, 31 Aug 2017 11:23:10 +0200
Subject: Revert "add bc to dependency list"

Adding new dependency is not right solution to this problem.

This reverts commit e58c93b2764eb306d286531a2b920c6de080cb77.

Change-Id: I08f2af5cf9c26c4302b0dbaccebbb52f0614f80f
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5ca2debf..1548f368 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += lcov chrpath autoconf nasm indent libnuma-dev
-DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 bc
+DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
@@ -74,12 +74,11 @@ endif
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel
 RPM_DEPENDS += numactl-devel
-RPM_DEPENDS += bc
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
 	RPM_DEPENDS += python-devel
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
-else ifeq ($(shell if [ `echo "$(OS_VERSION_ID) > 25" | bc` -eq 1 ] ; then echo "y" ; fi),"y")
+else ifeq ($(shell if [ $(echo "$(OS_VERSION_ID) > 25" | bc) -eq 1 ] ; then echo "y" ; fi),"y")
 	RPM_DEPENDS += python2-devel
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
@@ -100,7 +99,7 @@ endif
 
 RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
 RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel
-RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel bc
+RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
-- 
cgit 1.2.3-korg


From 3ea5eeb35266e5278c1e4e226e53edaaadd74662 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Thu, 31 Aug 2017 11:33:34 +0200
Subject: Do arithemtric comparison in Makefile without using bc

Change-Id: I245f56814ba3911b832e7450d42c58f235bc6dc2
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1548f368..8eaf5157 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
 	RPM_DEPENDS += python-devel
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
-else ifeq ($(shell if [ $(echo "$(OS_VERSION_ID) > 25" | bc) -eq 1 ] ; then echo "y" ; fi),"y")
+else ifeq ($(shell test $($(OS_VERSION_ID) -gt 25; echo $$?)),0)
 	RPM_DEPENDS += python2-devel
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
-- 
cgit 1.2.3-korg


From da78c85c5504f0a429d1feb57b6789254f60177d Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Thu, 31 Aug 2017 10:22:57 -0400
Subject: Add explicit check for Fedora.

Change-Id: I0a5aece190ccc82f0f840e3bc75e1d27433f5b47
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8eaf5157..44578063 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
 	RPM_DEPENDS += python-devel
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
-else ifeq ($(shell test $($(OS_VERSION_ID) -gt 25; echo $$?)),0)
+else ifeq ($(shell if [ "$(OS_ID)" = "fedora" ]; then test $(OS_VERSION_ID) -gt 25; echo $$?; fi),0)
 	RPM_DEPENDS += python2-devel
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
-- 
cgit 1.2.3-korg


From 555d92030142ad318049011477a99d7064bd3738 Mon Sep 17 00:00:00 2001
From: Gabriel Ganne <gabriel.ganne@enea.com>
Date: Wed, 6 Sep 2017 10:44:07 +0200
Subject: add apr-devel to rpm dependency list for centos-7

Error mesasge:
...
rpmbuild -bb \
  --define "_topdir /home/gannega/vpp" \
  --define "_version 17.10" \
  --define "_release rc0~269_g030ab48" \
  vpp.spec
error: Failed build dependencies:
        apr-devel is needed by vpp-17.10-rc0~269_g030ab48.x86_64

Change-Id: I7c09b65dcc9e57cae3da396c0165b8a4c85a8c2b
Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 44578063..01da7d12 100644
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,7 @@ else
 endif
 
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
+RPM_DEPENDS += apr-devel
 RPM_DEPENDS += openssl-devel
 RPM_DEPENDS += numactl-devel
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
-- 
cgit 1.2.3-korg


From 4b0ac82a739bf7f1233ebb61269e27aa4cf9ab36 Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Tue, 29 Aug 2017 16:07:51 -0400
Subject: Add option to build without multi-buffer crypto.

JIRA VPP-498

This patch also allows RPMs to be built without multi-
buffer crypto for some RPM based downstream distros that
don't have sufficiently new nasm or don't have an USA
export license for multi-buffer crypto.

The default is to build WITH multi-buffer crypto
for x86-64. This patch allows optional building without
multi-buffer crypto.

To build without multi-buffer crypto, set the AESNI
environment variable to n.
To build rpm packages without multi-buffer crypto,
build the rpms with the option turned off.

make build AESNI=n

or..

make pkg-rpm --without aesni

---How to test this patch on a Centos build.---

Build as above and verify that nasm isn't executed during
the build process.
vpp may be installed and the dpdk plugin may be inspected to
verify that the multi-buffer code isn't present.

Change-Id: I8c5cfd4cdd9eb2b96772a687eaa54560806e001b
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 Makefile            |  3 ++-
 dpdk/Makefile       |  5 +++--
 extras/rpm/vpp.spec | 12 ++++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 01da7d12..c08115d4 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ CCACHE_DIR?=$(BR)/.ccache
 GDB?=gdb
 PLATFORM?=vpp
 SAMPLE_PLUGIN?=no
+export AESNI?=y
 
 ,:=,
 define disable_plugins
@@ -94,7 +95,7 @@ endif
 RPM_DEPENDS += chrpath libffi-devel rpm-build
 ifeq ($(OS_ID),fedora)
 	RPM_DEPENDS += nasm
-else
+else ifeq ($(findstring y,$(AESNI)),y)
 	RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
 endif
 
diff --git a/dpdk/Makefile b/dpdk/Makefile
index afe50c4b..4e0ad4f3 100644
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -34,14 +34,13 @@ DPDK_17.08_TARBALL_MD5_CKSUM := 0641f59ea8ea98afefa7cfa2699f6241
 DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION)
 MACHINE=$(shell uname -m)
 
-AESNI ?= n
 ISA_L_CRYPTO_LIB := n
 
 IPSEC_MB_VER ?= 0.46
 ISA_L_CRYPTO_VER := 2.18.0
 
 ifeq ($(MACHINE),$(filter $(MACHINE),x86_64))
-AESNI = y
+  AESNI ?= y
 # DPDK pre 17.08 depends on ISA-L Crypto library for GCM PMD
   ifneq ($(firstword $(sort $(DPDK_VERSION), 17.08)), 17.08)
   ISA_L_CRYPTO_LIB = y
@@ -49,6 +48,8 @@ AESNI = y
   $(info Building ISA-L Crypto $(ISA_L_CRYPTO_VER) library)
   endif
 $(info Building IPSec-MB $(IPSEC_MB_VER) library)
+else
+  AESNI ?= N
 endif
 
 AESNIMB_LIB_TARBALL := v$(IPSEC_MB_VER).tar.gz
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index 439e6bda..6c14b039 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -1,3 +1,4 @@
+%bcond_without aesni
 %define _vpp_build_dir   build-tool-native
 %define _unitdir         /lib/systemd/system
 %define _topdir          %(pwd)
@@ -41,7 +42,9 @@ BuildRequires: python-devel, python-virtualenv
 %endif
 BuildRequires: glibc-static, java-1.8.0-openjdk, java-1.8.0-openjdk-devel yum-utils, redhat-lsb
 BuildRequires: apr-devel
+%if %{with aesni}
 BuildRequires: nasm
+%endif
 BuildRequires: numactl-devel
 BuildRequires: autoconf automake libtool byacc bison flex
 
@@ -120,8 +123,13 @@ This package contains the python bindings for the vpp api
 groupadd -f -r vpp
 
 %build
-make bootstrap
-make -C build-root PLATFORM=vpp TAG=%{_vpp_tag} install-packages
+%if %{with aesni}
+    make bootstrap
+    make -C build-root PLATFORM=vpp TAG=%{_vpp_tag} install-packages
+%else
+    make bootstrap AESNI=n
+    make -C build-root PLATFORM=vpp AESNI=n TAG=%{_vpp_tag} install-packages
+%endif
 cd %{_mu_build_dir}/../src/vpp-api/python && %py2_build
 
 %install
-- 
cgit 1.2.3-korg


From 8f2a4eafeaa439432107563033728e09665c16d9 Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Thu, 4 May 2017 06:15:18 +0200
Subject: Add new C API

Change-Id: I717ce3cd7c867c155de149ec56623269d26d0ff7
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 .gitignore                                |    1 +
 Makefile                                  |   11 +-
 src/Makefile.am                           |    2 +
 src/configure.ac                          |    2 +-
 src/vlibmemory/unix_shared_memory_queue.c |   65 ++
 src/vlibmemory/unix_shared_memory_queue.h |   11 +-
 src/vpp-api/vapi/Makefile.am              |   63 ++
 src/vpp-api/vapi/libvapiclient.map        |   41 +
 src/vpp-api/vapi/vapi.c                   |  895 ++++++++++++++++++++++
 src/vpp-api/vapi/vapi.h                   |  285 +++++++
 src/vpp-api/vapi/vapi_c_gen.py            |  809 ++++++++++++++++++++
 src/vpp-api/vapi/vapi_dbg.h               |   76 ++
 src/vpp-api/vapi/vapi_internal.h          |  126 ++++
 src/vpp-api/vapi/vapi_json_parser.py      |  303 ++++++++
 test/Makefile                             |    6 +-
 test/ext/Makefile                         |   17 +
 test/ext/vapi_test.c                      | 1152 +++++++++++++++++++++++++++++
 test/scripts/test-loop.sh                 |   14 +-
 test/test_vapi.py                         |   78 ++
 19 files changed, 3943 insertions(+), 14 deletions(-)
 create mode 100644 src/vpp-api/vapi/Makefile.am
 create mode 100644 src/vpp-api/vapi/libvapiclient.map
 create mode 100644 src/vpp-api/vapi/vapi.c
 create mode 100644 src/vpp-api/vapi/vapi.h
 create mode 100755 src/vpp-api/vapi/vapi_c_gen.py
 create mode 100644 src/vpp-api/vapi/vapi_dbg.h
 create mode 100644 src/vpp-api/vapi/vapi_internal.h
 create mode 100644 src/vpp-api/vapi/vapi_json_parser.py
 create mode 100644 test/ext/Makefile
 create mode 100644 test/ext/vapi_test.c
 create mode 100644 test/test_vapi.py

(limited to 'Makefile')

diff --git a/.gitignore b/.gitignore
index ba4e104a..5a6266d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@
 /build-root/test-doc/
 /build-root/test-cov/
 /build-root/python/
+/build-root/vapi_test/
 /build-config.mk
 /dpdk/*.tar.gz
 /dpdk/*.tar.xz
diff --git a/Makefile b/Makefile
index c08115d4..c46fa6bb 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += lcov chrpath autoconf nasm indent libnuma-dev
-DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6
+DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
@@ -76,6 +76,7 @@ RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += apr-devel
 RPM_DEPENDS += openssl-devel
 RPM_DEPENDS += numactl-devel
+RPM_DEPENDS += check
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
 	RPM_DEPENDS += python-devel
 	RPM_DEPENDS += python2-virtualenv
@@ -101,7 +102,13 @@ endif
 
 RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
 RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel
-RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel
+RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel python3
+
+ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
+	RPM_DEPENDS += python34
+else
+	RPM_DEPENDS += python3
+endif
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
diff --git a/src/Makefile.am b/src/Makefile.am
index 41076e0e..7b35e50c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -80,6 +80,8 @@ if ENABLE_JAPI
 SUBDIRS += vpp-api/java
 endif
 
+SUBDIRS += vpp-api/vapi
+
 ###############################################################################
 # API
 ###############################################################################
diff --git a/src/configure.ac b/src/configure.ac
index 6b6d9636..2efb23ad 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3,7 +3,7 @@ LT_INIT
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_SILENT_RULES([yes])
-AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile vpp-api/java/Makefile])
+AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile vpp-api/java/Makefile vpp-api/vapi/Makefile])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_PROG_CC
diff --git a/src/vlibmemory/unix_shared_memory_queue.c b/src/vlibmemory/unix_shared_memory_queue.c
index e86edec3..4db4851c 100644
--- a/src/vlibmemory/unix_shared_memory_queue.c
+++ b/src/vlibmemory/unix_shared_memory_queue.c
@@ -234,6 +234,71 @@ unix_shared_memory_queue_add (unix_shared_memory_queue_t * q,
   return 0;
 }
 
+/*
+ * unix_shared_memory_queue_add2
+ */
+int
+unix_shared_memory_queue_add2 (unix_shared_memory_queue_t * q, u8 * elem,
+			       u8 * elem2, int nowait)
+{
+  i8 *tailp;
+  int need_broadcast = 0;
+
+  if (nowait)
+    {
+      /* zero on success */
+      if (pthread_mutex_trylock (&q->mutex))
+	{
+	  return (-1);
+	}
+    }
+  else
+    pthread_mutex_lock (&q->mutex);
+
+  if (PREDICT_FALSE (q->cursize + 1 == q->maxsize))
+    {
+      if (nowait)
+	{
+	  pthread_mutex_unlock (&q->mutex);
+	  return (-2);
+	}
+      while (q->cursize + 1 == q->maxsize)
+	{
+	  (void) pthread_cond_wait (&q->condvar, &q->mutex);
+	}
+    }
+
+  tailp = (i8 *) (&q->data[0] + q->elsize * q->tail);
+  clib_memcpy (tailp, elem, q->elsize);
+
+  q->tail++;
+  q->cursize++;
+
+  if (q->tail == q->maxsize)
+    q->tail = 0;
+
+  need_broadcast = (q->cursize == 1);
+
+  tailp = (i8 *) (&q->data[0] + q->elsize * q->tail);
+  clib_memcpy (tailp, elem2, q->elsize);
+
+  q->tail++;
+  q->cursize++;
+
+  if (q->tail == q->maxsize)
+    q->tail = 0;
+
+  if (need_broadcast)
+    {
+      (void) pthread_cond_broadcast (&q->condvar);
+      if (q->signal_when_queue_non_empty)
+	kill (q->consumer_pid, q->signal_when_queue_non_empty);
+    }
+  pthread_mutex_unlock (&q->mutex);
+
+  return 0;
+}
+
 /*
  * unix_shared_memory_queue_sub
  */
diff --git a/src/vlibmemory/unix_shared_memory_queue.h b/src/vlibmemory/unix_shared_memory_queue.h
index 13800065..27de3218 100644
--- a/src/vlibmemory/unix_shared_memory_queue.h
+++ b/src/vlibmemory/unix_shared_memory_queue.h
@@ -21,7 +21,6 @@
 #define included_unix_shared_memory_queue_h
 
 #include <pthread.h>
-#include <vppinfra/mem.h>
 
 typedef struct _unix_shared_memory_queue
 {
@@ -43,10 +42,12 @@ unix_shared_memory_queue_t *unix_shared_memory_queue_init (int nels,
 							   int
 							   signal_when_queue_non_empty);
 void unix_shared_memory_queue_free (unix_shared_memory_queue_t * q);
-int unix_shared_memory_queue_add (unix_shared_memory_queue_t * q,
-				  u8 * elem, int nowait);
-int unix_shared_memory_queue_sub (unix_shared_memory_queue_t * q,
-				  u8 * elem, int nowait);
+int unix_shared_memory_queue_add (unix_shared_memory_queue_t * q, u8 * elem,
+				  int nowait);
+int unix_shared_memory_queue_add2 (unix_shared_memory_queue_t * q, u8 * elem,
+				   u8 * elem2, int nowait);
+int unix_shared_memory_queue_sub (unix_shared_memory_queue_t * q, u8 * elem,
+				  int nowait);
 void unix_shared_memory_queue_lock (unix_shared_memory_queue_t * q);
 void unix_shared_memory_queue_unlock (unix_shared_memory_queue_t * q);
 int unix_shared_memory_queue_is_full (unix_shared_memory_queue_t * q);
diff --git a/src/vpp-api/vapi/Makefile.am b/src/vpp-api/vapi/Makefile.am
new file mode 100644
index 00000000..ce681c38
--- /dev/null
+++ b/src/vpp-api/vapi/Makefile.am
@@ -0,0 +1,63 @@
+# Copyright (c) 2017 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
+AM_LIBTOOLFLAGS = --quiet
+
+AM_CFLAGS = -Wall -I${top_srcdir} -I${top_builddir} -I. -I$(top_srcdir)/vpp-api/vapi
+
+AM_LDFLAGS = -shared -avoid-version -rpath /none -no-undefined
+
+bin_PROGRAMS =
+noinst_LTLIBRARIES =
+CLEANDIRS =
+
+%.api.vapi.h: %.api.json vapi_c_gen.py
+	@echo "  VAPI C GEN $< " $@ ;			\
+	mkdir -p `dirname $@` ;				\
+        $(top_srcdir)/vpp-api/vapi/vapi_c_gen.py $<
+
+%.api.json:
+	find $(top_builddir) -name '$@' | xargs ln -s
+
+BUILT_SOURCES = $(shell find $(top_builddir) -name '*.api.json' | xargs -n1 basename) \
+  $(patsubst %.api.json,%.api.vapi.h,$(JSON_FILES))
+
+vapi.c: $(BUILT_SOURCES)
+
+JSON_FILES = $(wildcard *.api.json)
+
+
+lib_LTLIBRARIES = libvapiclient.la
+
+libvapiclient_la_SOURCES = vapi.c
+
+libvapiclient_la_LIBADD = -lpthread -lm -lrt \
+  $(top_builddir)/libvppinfra.la \
+  $(top_builddir)/libvlibmemoryclient.la \
+  $(top_builddir)/libsvm.la
+
+libvapiclient_la_LDFLAGS = \
+  -Wl,-L$(top_builddir)/.libs,--whole-archive,--no-whole-archive \
+  -Wl,--version-script=$(srcdir)/libvapiclient.map,-lrt
+
+libvapiclient_la_CPPFLAGS = -I. -I$(top_builddir)/vpp-api/vapi
+
+nobase_include_HEADERS = ${top_srcdir}/vpp-api/client/vppapiclient.h \
+  vapi.h \
+  vapi_dbg.h \
+  vapi_internal.h \
+  $(patsubst %.api.json,%.api.vapi.h,$(JSON_FILES))
+
+# vi:syntax=automake
diff --git a/src/vpp-api/vapi/libvapiclient.map b/src/vpp-api/vapi/libvapiclient.map
new file mode 100644
index 00000000..53733002
--- /dev/null
+++ b/src/vpp-api/vapi/libvapiclient.map
@@ -0,0 +1,41 @@
+
+VAPICLIENT_17.07 {
+	global:
+	vapi_msg_alloc;
+	vapi_msg_free;
+	vapi_ctx_alloc;
+	vapi_ctx_free;
+	vapi_is_msg_available;
+	vapi_connect;
+	vapi_disconnect;
+	vapi_get_fd;
+	vapi_send;
+	vapi_send2;
+	vapi_recv;
+	vapi_wait;
+	vapi_dispatch_one;
+	vapi_dispatch;
+	vapi_set_event_cb;
+	vapi_clear_event_cb;
+	vapi_set_generic_event_cb;
+	vapi_clear_generic_event_cb;
+	vapi_get_client_index;
+	vapi_register_msg;
+	vapi_get_client_index;
+	vapi_is_nonblocking;
+	vapi_requests_full;
+	vapi_gen_req_context;
+	vapi_producer_lock;
+	vapi_send_with_control_ping;
+	vapi_store_request;
+	vapi_is_nonblocking;
+	vapi_producer_unlock;
+	vapi_lookup_vl_msg_id;
+	vapi_lookup_vapi_msg_id_t;
+	vapi_msg_is_with_context;
+	vapi_get_context_offset;
+	vapi_msg_id_control_ping;
+	vapi_msg_id_control_ping_reply;
+
+	local: *;
+};
diff --git a/src/vpp-api/vapi/vapi.c b/src/vpp-api/vapi/vapi.c
new file mode 100644
index 00000000..b9c81a13
--- /dev/null
+++ b/src/vpp-api/vapi/vapi.c
@@ -0,0 +1,895 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <arpa/inet.h>
+#include <stddef.h>
+#include <assert.h>
+
+#include <vpp-api/vapi/vapi_dbg.h>
+#include <vpp-api/vapi/vapi.h>
+#include <vpp-api/vapi/vapi_internal.h>
+#include <vppinfra/types.h>
+#include <vlibapi/api_common.h>
+#include <vlibmemory/api_common.h>
+
+/* we need to use control pings for some stuff and because we're forced to put
+ * the code in headers, we need a way to be able to grab the ids of these
+ * messages - so declare them here as extern */
+vapi_msg_id_t vapi_msg_id_control_ping = 0;
+vapi_msg_id_t vapi_msg_id_control_ping_reply = 0;
+
+struct
+{
+  size_t count;
+  vapi_message_desc_t **msgs;
+  size_t max_len_name_with_crc;
+} __vapi_metadata;
+
+typedef struct
+{
+  u32 context;
+  vapi_cb_t callback;
+  void *callback_ctx;
+  bool is_dump;
+} vapi_req_t;
+
+static const u32 context_counter_mask = (1 << 31);
+
+typedef struct
+{
+  vapi_error_e (*cb) (vapi_ctx_t ctx, void *callback_ctx, vapi_msg_id_t id,
+		      void *payload);
+  void *ctx;
+} vapi_generic_cb_with_ctx;
+
+typedef struct
+{
+  vapi_error_e (*cb) (vapi_ctx_t ctx, void *callback_ctx, void *payload);
+  void *ctx;
+} vapi_event_cb_with_ctx;
+
+struct vapi_ctx_s
+{
+  vapi_mode_e mode;
+  int requests_size;		/* size of the requests array (circular queue) */
+  int requests_start;		/* index of first request */
+  int requests_count;		/* number of used slots */
+  vapi_req_t *requests;
+  u32 context_counter;
+  vapi_generic_cb_with_ctx generic_cb;
+  vapi_event_cb_with_ctx *event_cbs;
+  u16 *vapi_msg_id_t_to_vl_msg_id;
+  u16 vl_msg_id_max;
+  vapi_msg_id_t *vl_msg_id_to_vapi_msg_t;
+  bool connected;
+  pthread_mutex_t requests_mutex;
+};
+
+u32
+vapi_gen_req_context (vapi_ctx_t ctx)
+{
+  ++ctx->context_counter;
+  ctx->context_counter %= context_counter_mask;
+  return ctx->context_counter | context_counter_mask;
+}
+
+size_t
+vapi_get_request_count (vapi_ctx_t ctx)
+{
+  return ctx->requests_count;
+}
+
+bool
+vapi_requests_full (vapi_ctx_t ctx)
+{
+  return (ctx->requests_count == ctx->requests_size);
+}
+
+static bool
+vapi_requests_empty (vapi_ctx_t ctx)
+{
+  return (0 == ctx->requests_count);
+}
+
+static int
+vapi_requests_end (vapi_ctx_t ctx)
+{
+  return (ctx->requests_start + ctx->requests_count) % ctx->requests_size;
+}
+
+void
+vapi_store_request (vapi_ctx_t ctx, u32 context, bool is_dump,
+		    vapi_cb_t callback, void *callback_ctx)
+{
+  assert (!vapi_requests_full (ctx));
+  /* if the mutex is not held, bad things will happen */
+  assert (0 != pthread_mutex_trylock (&ctx->requests_mutex));
+  const int requests_end = vapi_requests_end (ctx);
+  vapi_req_t *slot = &ctx->requests[requests_end];
+  slot->is_dump = is_dump;
+  slot->context = context;
+  slot->callback = callback;
+  slot->callback_ctx = callback_ctx;
+  VAPI_DBG ("stored@%d: context:%x (start is @%d)", requests_end, context,
+	    ctx->requests_start);
+  ++ctx->requests_count;
+  assert (!vapi_requests_empty (ctx));
+}
+
+#if VAPI_DEBUG_ALLOC
+struct to_be_freed_s;
+struct to_be_freed_s
+{
+  void *v;
+  struct to_be_freed_s *next;
+};
+
+static struct to_be_freed_s *to_be_freed = NULL;
+
+void
+vapi_add_to_be_freed (void *v)
+{
+  struct to_be_freed_s *prev = NULL;
+  struct to_be_freed_s *tmp;
+  tmp = to_be_freed;
+  while (tmp && tmp->v)
+    {
+      prev = tmp;
+      tmp = tmp->next;
+    }
+  if (!tmp)
+    {
+      if (!prev)
+	{
+	  tmp = to_be_freed = calloc (1, sizeof (*to_be_freed));
+	}
+      else
+	{
+	  tmp = prev->next = calloc (1, sizeof (*to_be_freed));
+	}
+    }
+  VAPI_DBG ("To be freed %p", v);
+  tmp->v = v;
+}
+
+void
+vapi_trace_free (void *v)
+{
+  struct to_be_freed_s *tmp = to_be_freed;
+  while (tmp && tmp->v != v)
+    {
+      tmp = tmp->next;
+    }
+  if (tmp && tmp->v == v)
+    {
+      VAPI_DBG ("Freed %p", v);
+      tmp->v = NULL;
+    }
+  else
+    {
+      VAPI_ERR ("Trying to free untracked pointer %p", v);
+      abort ();
+    }
+}
+
+void
+vapi_to_be_freed_validate ()
+{
+  struct to_be_freed_s *tmp = to_be_freed;
+  while (tmp)
+    {
+      if (tmp->v)
+	{
+	  VAPI_ERR ("Unfreed msg %p!", tmp->v);
+	}
+      tmp = tmp->next;
+    }
+}
+
+#endif
+
+void *
+vapi_msg_alloc (vapi_ctx_t ctx, size_t size)
+{
+  if (!ctx->connected)
+    {
+      return NULL;
+    }
+  void *rv = vl_msg_api_alloc_or_null (size);
+  return rv;
+}
+
+void
+vapi_msg_free (vapi_ctx_t ctx, void *msg)
+{
+  if (!ctx->connected)
+    {
+      return;
+    }
+#if VAPI_DEBUG_ALLOC
+  vapi_trace_free (msg);
+#endif
+  vl_msg_api_free (msg);
+}
+
+vapi_error_e
+vapi_ctx_alloc (vapi_ctx_t * result)
+{
+  vapi_ctx_t ctx = calloc (1, sizeof (struct vapi_ctx_s));
+  if (!ctx)
+    {
+      return VAPI_ENOMEM;
+    }
+  ctx->context_counter = 0;
+  ctx->vapi_msg_id_t_to_vl_msg_id =
+    malloc (__vapi_metadata.count *
+	    sizeof (*ctx->vapi_msg_id_t_to_vl_msg_id));
+  if (!ctx->vapi_msg_id_t_to_vl_msg_id)
+    {
+      goto fail;
+    }
+  ctx->event_cbs = calloc (__vapi_metadata.count, sizeof (*ctx->event_cbs));
+  if (!ctx->event_cbs)
+    {
+      goto fail;
+    }
+  pthread_mutex_init (&ctx->requests_mutex, NULL);
+  *result = ctx;
+  return VAPI_OK;
+fail:
+  vapi_ctx_free (ctx);
+  return VAPI_ENOMEM;
+}
+
+void
+vapi_ctx_free (vapi_ctx_t ctx)
+{
+  assert (!ctx->connected);
+  free (ctx->requests);
+  free (ctx->vapi_msg_id_t_to_vl_msg_id);
+  free (ctx->event_cbs);
+  free (ctx->vl_msg_id_to_vapi_msg_t);
+  pthread_mutex_destroy (&ctx->requests_mutex);
+  free (ctx);
+}
+
+bool
+vapi_is_msg_available (vapi_ctx_t ctx, vapi_msg_id_t id)
+{
+  return vapi_lookup_vl_msg_id (ctx, id) != UINT16_MAX;
+}
+
+vapi_error_e
+vapi_connect (vapi_ctx_t ctx, const char *name,
+	      const char *chroot_prefix,
+	      int max_outstanding_requests,
+	      int response_queue_size, vapi_mode_e mode)
+{
+  if (response_queue_size <= 0 || max_outstanding_requests <= 0)
+    {
+      return VAPI_EINVAL;
+    }
+  ctx->requests_size = max_outstanding_requests;
+  const size_t size = ctx->requests_size * sizeof (*ctx->requests);
+  void *tmp = realloc (ctx->requests, size);
+  if (!tmp)
+    {
+      return VAPI_ENOMEM;
+    }
+  ctx->requests = tmp;
+  memset (ctx->requests, 0, size);
+  ctx->requests_start = ctx->requests_count = 0;
+  if (chroot_prefix)
+    {
+      VAPI_DBG ("set memory root path `%s'", chroot_prefix);
+      vl_set_memory_root_path ((char *) chroot_prefix);
+    }
+  static char api_map[] = "/vpe-api";
+  VAPI_DBG ("client api map `%s'", api_map);
+  if ((vl_client_api_map (api_map)) < 0)
+    {
+      return VAPI_EMAP_FAIL;
+    }
+  VAPI_DBG ("connect client `%s'", name);
+  if (vl_client_connect ((char *) name, 0, response_queue_size) < 0)
+    {
+      vl_client_api_unmap ();
+      return VAPI_ECON_FAIL;
+    }
+#if VAPI_DEBUG_CONNECT
+  VAPI_DBG ("start probing messages");
+#endif
+  int rv;
+  int i;
+  for (i = 0; i < __vapi_metadata.count; ++i)
+    {
+      vapi_message_desc_t *m = __vapi_metadata.msgs[i];
+      u8 scratch[m->name_with_crc_len + 1];
+      memcpy (scratch, m->name_with_crc, m->name_with_crc_len + 1);
+      u32 id = vl_api_get_msg_index (scratch);
+      if (~0 != id)
+	{
+	  if (id > UINT16_MAX)
+	    {
+	      VAPI_ERR ("Returned vl_msg_id `%u' > UINT16MAX `%u'!", id,
+			UINT16_MAX);
+	      rv = VAPI_EINVAL;
+	      goto fail;
+	    }
+	  if (id > ctx->vl_msg_id_max)
+	    {
+	      vapi_msg_id_t *tmp = realloc (ctx->vl_msg_id_to_vapi_msg_t,
+					    sizeof
+					    (*ctx->vl_msg_id_to_vapi_msg_t) *
+					    (id + 1));
+	      if (!tmp)
+		{
+		  rv = VAPI_ENOMEM;
+		  goto fail;
+		}
+	      ctx->vl_msg_id_to_vapi_msg_t = tmp;
+	      ctx->vl_msg_id_max = id;
+	    }
+	  ctx->vl_msg_id_to_vapi_msg_t[id] = m->id;
+	  ctx->vapi_msg_id_t_to_vl_msg_id[m->id] = id;
+#if VAPI_DEBUG_CONNECT
+	  VAPI_DBG ("Message `%s' has vl_msg_id `%u'", m->name_with_crc,
+		    (unsigned) id);
+#endif
+	}
+      else
+	{
+	  ctx->vapi_msg_id_t_to_vl_msg_id[m->id] = UINT16_MAX;
+	  VAPI_DBG ("Message `%s' not available", m->name_with_crc);
+	}
+    }
+#if VAPI_DEBUG_CONNECT
+  VAPI_DBG ("finished probing messages");
+#endif
+  if (!vapi_is_msg_available (ctx, vapi_msg_id_control_ping) ||
+      !vapi_is_msg_available (ctx, vapi_msg_id_control_ping_reply))
+    {
+      VAPI_ERR
+	("control ping or control ping reply not available, cannot connect");
+      rv = VAPI_EINCOMPATIBLE;
+      goto fail;
+    }
+  ctx->mode = mode;
+  ctx->connected = true;
+  return VAPI_OK;
+fail:
+  vl_client_disconnect ();
+  vl_client_api_unmap ();
+  return rv;
+}
+
+vapi_error_e
+vapi_disconnect (vapi_ctx_t ctx)
+{
+  if (!ctx->connected)
+    {
+      return VAPI_EINVAL;
+    }
+  vl_client_disconnect ();
+  vl_client_api_unmap ();
+#if VAPI_DEBUG_ALLOC
+  vapi_to_be_freed_validate ();
+#endif
+  ctx->connected = false;
+  return VAPI_OK;
+}
+
+vapi_error_e
+vapi_get_fd (vapi_ctx_t ctx, int *fd)
+{
+  return VAPI_ENOTSUP;
+}
+
+vapi_error_e
+vapi_send (vapi_ctx_t ctx, void *msg)
+{
+  vapi_error_e rv = VAPI_OK;
+  if (!ctx || !msg || !ctx->connected)
+    {
+      rv = VAPI_EINVAL;
+      goto out;
+    }
+  int tmp;
+  unix_shared_memory_queue_t *q = api_main.shmem_hdr->vl_input_queue;
+#if VAPI_DEBUG
+  unsigned msgid = be16toh (*(u16 *) msg);
+  if (msgid <= ctx->vl_msg_id_max)
+    {
+      vapi_msg_id_t id = ctx->vl_msg_id_to_vapi_msg_t[msgid];
+      if (id < __vapi_metadata.count)
+	{
+	  VAPI_DBG ("send msg %u[%s]", msgid, __vapi_metadata.msgs[id]->name);
+	}
+      else
+	{
+	  VAPI_DBG ("send msg %u[UNKNOWN]", msgid);
+	}
+    }
+  else
+    {
+      VAPI_DBG ("send msg %u[UNKNOWN]", msgid);
+    }
+#endif
+  tmp = unix_shared_memory_queue_add (q, (u8 *) & msg,
+				      VAPI_MODE_BLOCKING ==
+				      ctx->mode ? 0 : 1);
+  if (tmp < 0)
+    {
+      rv = VAPI_EAGAIN;
+    }
+out:
+  VAPI_DBG ("vapi_send() rv = %d", rv);
+  return rv;
+}
+
+vapi_error_e
+vapi_send2 (vapi_ctx_t ctx, void *msg1, void *msg2)
+{
+  vapi_error_e rv = VAPI_OK;
+  if (!ctx || !msg1 || !msg2 || !ctx->connected)
+    {
+      rv = VAPI_EINVAL;
+      goto out;
+    }
+  unix_shared_memory_queue_t *q = api_main.shmem_hdr->vl_input_queue;
+#if VAPI_DEBUG
+  unsigned msgid1 = be16toh (*(u16 *) msg1);
+  unsigned msgid2 = be16toh (*(u16 *) msg2);
+  const char *name1 = "UNKNOWN";
+  const char *name2 = "UNKNOWN";
+  if (msgid1 <= ctx->vl_msg_id_max)
+    {
+      vapi_msg_id_t id = ctx->vl_msg_id_to_vapi_msg_t[msgid1];
+      if (id < __vapi_metadata.count)
+	{
+	  name1 = __vapi_metadata.msgs[id]->name;
+	}
+    }
+  if (msgid2 <= ctx->vl_msg_id_max)
+    {
+      vapi_msg_id_t id = ctx->vl_msg_id_to_vapi_msg_t[msgid2];
+      if (id < __vapi_metadata.count)
+	{
+	  name2 = __vapi_metadata.msgs[id]->name;
+	}
+    }
+  VAPI_DBG ("send two: %u[%s], %u[%s]", msgid1, name1, msgid2, name2);
+#endif
+  int tmp = unix_shared_memory_queue_add2 (q, (u8 *) & msg1, (u8 *) & msg2,
+					   VAPI_MODE_BLOCKING ==
+					   ctx->mode ? 0 : 1);
+  if (tmp < 0)
+    {
+      rv = VAPI_EAGAIN;
+    }
+out:
+  VAPI_DBG ("vapi_send() rv = %d", rv);
+  return rv;
+}
+
+vapi_error_e
+vapi_recv (vapi_ctx_t ctx, void **msg, size_t * msg_size)
+{
+  if (!ctx || !ctx->connected || !msg || !msg_size)
+    {
+      return VAPI_EINVAL;
+    }
+  vapi_error_e rv = VAPI_OK;
+  api_main_t *am = &api_main;
+  uword data;
+
+  if (am->our_pid == 0)
+    {
+      return VAPI_EINVAL;
+    }
+
+  unix_shared_memory_queue_t *q = am->vl_input_queue;
+  VAPI_DBG ("doing shm queue sub");
+  int tmp = unix_shared_memory_queue_sub (q, (u8 *) & data, 0);
+  if (tmp == 0)
+    {
+#if VAPI_DEBUG_ALLOC
+      vapi_add_to_be_freed ((void *) data);
+#endif
+      msgbuf_t *msgbuf =
+	(msgbuf_t *) ((u8 *) data - offsetof (msgbuf_t, data));
+      if (!msgbuf->data_len)
+	{
+	  vapi_msg_free (ctx, (u8 *) data);
+	  return VAPI_EAGAIN;
+	}
+      *msg = (u8 *) data;
+      *msg_size = ntohl (msgbuf->data_len);
+      VAPI_DBG ("recv msg %p", *msg);
+    }
+  else
+    {
+      rv = VAPI_EAGAIN;
+    }
+  return rv;
+}
+
+vapi_error_e
+vapi_wait (vapi_ctx_t ctx, vapi_wait_mode_e mode)
+{
+  /* FIXME */
+  return VAPI_ENOTSUP;
+}
+
+static vapi_error_e
+vapi_dispatch_response (vapi_ctx_t ctx, vapi_msg_id_t id,
+			u32 context, void *msg)
+{
+  int mrv;
+  if (0 != (mrv = pthread_mutex_lock (&ctx->requests_mutex)))
+    {
+      VAPI_DBG ("pthread_mutex_lock() failed, rv=%d:%s", mrv, strerror (mrv));
+      return VAPI_MUTEX_FAILURE;
+    }
+  int tmp = ctx->requests_start;
+  const int requests_end = vapi_requests_end (ctx);
+  while (ctx->requests[tmp].context != context && tmp != requests_end)
+    {
+      ++tmp;
+      if (tmp == ctx->requests_size)
+	{
+	  tmp = 0;
+	}
+    }
+  VAPI_DBG ("dispatch, search from %d, %s at %d", ctx->requests_start,
+	    ctx->requests[tmp].context == context ? "matched" : "stopped",
+	    tmp);
+  vapi_error_e rv = VAPI_OK;
+  if (ctx->requests[tmp].context == context)
+    {
+      while (ctx->requests_start != tmp)
+	{
+	  VAPI_ERR ("No response to req with context=%u",
+		    (unsigned) ctx->requests[tmp].context);
+	  ctx->requests[ctx->requests_start].callback (ctx,
+						       ctx->requests
+						       [ctx->
+							requests_start].callback_ctx,
+						       VAPI_ENORESP, true,
+						       NULL);
+	  memset (&ctx->requests[ctx->requests_start], 0,
+		  sizeof (ctx->requests[ctx->requests_start]));
+	  ++ctx->requests_start;
+	  --ctx->requests_count;
+	  if (ctx->requests_start == ctx->requests_size)
+	    {
+	      ctx->requests_start = 0;
+	    }
+	}
+      // now ctx->requests_start == tmp
+      int payload_offset = vapi_get_payload_offset (id);
+      void *payload = ((u8 *) msg) + payload_offset;
+      bool is_last = true;
+      if (ctx->requests[tmp].is_dump)
+	{
+	  if (vapi_msg_id_control_ping_reply == id)
+	    {
+	      payload = NULL;
+	    }
+	  else
+	    {
+	      is_last = false;
+	    }
+	}
+      if (payload_offset != -1)
+	{
+	  rv =
+	    ctx->requests[tmp].callback (ctx, ctx->requests[tmp].callback_ctx,
+					 VAPI_OK, is_last, payload);
+	}
+      else
+	{
+	  /* this is a message without payload, so bend the callback a little
+	   */
+	  rv =
+	    ((vapi_error_e (*)(vapi_ctx_t, void *, vapi_error_e, bool))
+	     ctx->requests[tmp].callback) (ctx,
+					   ctx->requests[tmp].callback_ctx,
+					   VAPI_OK, is_last);
+	}
+      if (is_last)
+	{
+	  memset (&ctx->requests[ctx->requests_start], 0,
+		  sizeof (ctx->requests[ctx->requests_start]));
+	  ++ctx->requests_start;
+	  --ctx->requests_count;
+	  if (ctx->requests_start == ctx->requests_size)
+	    {
+	      ctx->requests_start = 0;
+	    }
+	}
+      VAPI_DBG ("after dispatch, req start = %d, end = %d, count = %d",
+		ctx->requests_start, requests_end, ctx->requests_count);
+    }
+  if (0 != (mrv = pthread_mutex_unlock (&ctx->requests_mutex)))
+    {
+      VAPI_DBG ("pthread_mutex_unlock() failed, rv=%d:%s", mrv,
+		strerror (mrv));
+      abort ();			/* this really shouldn't happen */
+    }
+  return rv;
+}
+
+static vapi_error_e
+vapi_dispatch_event (vapi_ctx_t ctx, vapi_msg_id_t id, void *msg)
+{
+  if (ctx->event_cbs[id].cb)
+    {
+      return ctx->event_cbs[id].cb (ctx, ctx->event_cbs[id].ctx, msg);
+    }
+  else if (ctx->generic_cb.cb)
+    {
+      return ctx->generic_cb.cb (ctx, ctx->generic_cb.ctx, id, msg);
+    }
+  else
+    {
+      VAPI_DBG
+	("No handler/generic handler for msg id %u[%s], message ignored",
+	 (unsigned) id, __vapi_metadata.msgs[id]->name);
+    }
+  return VAPI_OK;
+}
+
+static bool
+vapi_msg_is_with_context (vapi_msg_id_t id)
+{
+  assert (id <= __vapi_metadata.count);
+  return __vapi_metadata.msgs[id]->has_context;
+}
+
+vapi_error_e
+vapi_dispatch_one (vapi_ctx_t ctx)
+{
+  VAPI_DBG ("vapi_dispatch_one()");
+  void *msg;
+  size_t size;
+  vapi_error_e rv = vapi_recv (ctx, &msg, &size);
+  if (VAPI_OK != rv)
+    {
+      VAPI_DBG ("vapi_recv failed with rv=%d", rv);
+      return rv;
+    }
+  u16 vpp_id = be16toh (*(u16 *) msg);
+  if (vpp_id > ctx->vl_msg_id_max)
+    {
+      VAPI_ERR ("Unknown msg ID received, id `%u', out of range <0,%u>",
+		(unsigned) vpp_id, (unsigned) ctx->vl_msg_id_max);
+      vapi_msg_free (ctx, msg);
+      return VAPI_EINVAL;
+    }
+  if (~0 == (unsigned) ctx->vl_msg_id_to_vapi_msg_t[vpp_id])
+    {
+      VAPI_ERR ("Unknown msg ID received, id `%u' marked as not supported",
+		(unsigned) vpp_id);
+      vapi_msg_free (ctx, msg);
+      return VAPI_EINVAL;
+    }
+  const vapi_msg_id_t id = ctx->vl_msg_id_to_vapi_msg_t[vpp_id];
+  const size_t expect_size = vapi_get_message_size (id);
+  if (size < expect_size)
+    {
+      VAPI_ERR
+	("Invalid msg received, unexpected size `%zu' < expected min `%zu'",
+	 size, expect_size);
+      vapi_msg_free (ctx, msg);
+      return VAPI_EINVAL;
+    }
+  u32 context;
+  vapi_get_swap_to_host_func (id) (msg);
+  if (vapi_msg_is_with_context (id))
+    {
+      context = *(u32 *) (((u8 *) msg) + vapi_get_context_offset (id));
+      /* is this a message originating from VAPI? */
+      VAPI_DBG ("dispatch, context is %x", context);
+      if (context & context_counter_mask)
+	{
+	  rv = vapi_dispatch_response (ctx, id, context, msg);
+	  goto done;
+	}
+    }
+  rv = vapi_dispatch_event (ctx, id, msg);
+
+done:
+  vapi_msg_free (ctx, msg);
+  return rv;
+}
+
+vapi_error_e
+vapi_dispatch (vapi_ctx_t ctx)
+{
+  vapi_error_e rv = VAPI_OK;
+  while (!vapi_requests_empty (ctx))
+    {
+      rv = vapi_dispatch_one (ctx);
+      if (VAPI_OK != rv)
+	{
+	  return rv;
+	}
+    }
+  return rv;
+}
+
+void
+vapi_set_event_cb (vapi_ctx_t ctx, vapi_msg_id_t id,
+		   vapi_event_cb callback, void *callback_ctx)
+{
+  vapi_event_cb_with_ctx *c = &ctx->event_cbs[id];
+  c->cb = callback;
+  c->ctx = callback_ctx;
+}
+
+void
+vapi_clear_event_cb (vapi_ctx_t ctx, vapi_msg_id_t id)
+{
+  vapi_set_event_cb (ctx, id, NULL, NULL);
+}
+
+void
+vapi_set_generic_event_cb (vapi_ctx_t ctx, vapi_generic_event_cb callback,
+			   void *callback_ctx)
+{
+  ctx->generic_cb.cb = callback;
+  ctx->generic_cb.ctx = callback_ctx;
+}
+
+void
+vapi_clear_generic_event_cb (vapi_ctx_t ctx)
+{
+  ctx->generic_cb.cb = NULL;
+  ctx->generic_cb.ctx = NULL;
+}
+
+u16
+vapi_lookup_vl_msg_id (vapi_ctx_t ctx, vapi_msg_id_t id)
+{
+  assert (id < __vapi_metadata.count);
+  return ctx->vapi_msg_id_t_to_vl_msg_id[id];
+}
+
+int
+vapi_get_client_index (vapi_ctx_t ctx)
+{
+  return api_main.my_client_index;
+}
+
+bool
+vapi_is_nonblocking (vapi_ctx_t ctx)
+{
+  return (VAPI_MODE_NONBLOCKING == ctx->mode);
+}
+
+bool vapi_requests_full (vapi_ctx_t ctx);
+
+size_t vapi_get_request_count (vapi_ctx_t ctx);
+
+size_t
+vapi_get_max_request_count (vapi_ctx_t ctx)
+{
+  return ctx->requests_size - 1;
+}
+
+int
+vapi_get_payload_offset (vapi_msg_id_t id)
+{
+  assert (id < __vapi_metadata.count);
+  return __vapi_metadata.msgs[id]->payload_offset;
+}
+
+void (*vapi_get_swap_to_host_func (vapi_msg_id_t id)) (void *msg)
+{
+  assert (id < __vapi_metadata.count);
+  return __vapi_metadata.msgs[id]->swap_to_host;
+}
+
+void (*vapi_get_swap_to_be_func (vapi_msg_id_t id)) (void *msg)
+{
+  assert (id < __vapi_metadata.count);
+  return __vapi_metadata.msgs[id]->swap_to_be;
+}
+
+size_t
+vapi_get_message_size (vapi_msg_id_t id)
+{
+  assert (id < __vapi_metadata.count);
+  return __vapi_metadata.msgs[id]->size;
+}
+
+size_t
+vapi_get_context_offset (vapi_msg_id_t id)
+{
+  assert (id < __vapi_metadata.count);
+  return __vapi_metadata.msgs[id]->context_offset;
+}
+
+vapi_msg_id_t
+vapi_register_msg (vapi_message_desc_t * msg)
+{
+  int i = 0;
+  for (i = 0; i < __vapi_metadata.count; ++i)
+    {
+      if (!strcmp
+	  (msg->name_with_crc, __vapi_metadata.msgs[i]->name_with_crc))
+	{
+	  /* this happens if somebody is linking together several objects while
+	   * using the static inline headers, just fill in the already
+	   * assigned id here so that all the objects are in sync */
+	  msg->id = __vapi_metadata.msgs[i]->id;
+	  return msg->id;
+	}
+    }
+  vapi_msg_id_t id = __vapi_metadata.count;
+  ++__vapi_metadata.count;
+  __vapi_metadata.msgs =
+    realloc (__vapi_metadata.msgs,
+	     sizeof (*__vapi_metadata.msgs) * __vapi_metadata.count);
+  __vapi_metadata.msgs[id] = msg;
+  size_t s = strlen (msg->name_with_crc);
+  if (s > __vapi_metadata.max_len_name_with_crc)
+    {
+      __vapi_metadata.max_len_name_with_crc = s;
+    }
+  msg->id = id;
+  return id;
+}
+
+vapi_error_e
+vapi_producer_lock (vapi_ctx_t ctx)
+{
+  int mrv;
+  if (0 != (mrv = pthread_mutex_lock (&ctx->requests_mutex)))
+    {
+      VAPI_DBG ("pthread_mutex_lock() failed, rv=%d:%s", mrv, strerror (mrv));
+      (void) mrv;		/* avoid warning if the above debug is not enabled */
+      return VAPI_MUTEX_FAILURE;
+    }
+  return VAPI_OK;
+}
+
+vapi_error_e
+vapi_producer_unlock (vapi_ctx_t ctx)
+{
+  int mrv;
+  if (0 != (mrv = pthread_mutex_unlock (&ctx->requests_mutex)))
+    {
+      VAPI_DBG ("pthread_mutex_unlock() failed, rv=%d:%s", mrv,
+		strerror (mrv));
+      (void) mrv;		/* avoid warning if the above debug is not enabled */
+      return VAPI_MUTEX_FAILURE;
+    }
+  return VAPI_OK;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp-api/vapi/vapi.h b/src/vpp-api/vapi/vapi.h
new file mode 100644
index 00000000..1e1d567a
--- /dev/null
+++ b/src/vpp-api/vapi/vapi.h
@@ -0,0 +1,285 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef vpp_api_h_included
+#define vpp_api_h_included
+
+#include <string.h>
+#include <stdbool.h>
+#include <vppinfra/types.h>
+
+/**
+ * @file vapi.h
+ *
+ * common vpp api C declarations
+ *
+ * This file declares the common C API functions. These include connect,
+ * disconnect and utility functions as well as the low-level vapi_send and
+ * vapi_recv API. This is only the transport layer.
+ *
+ * Message formats and higher-level APIs are generated by running the
+ * vapi_c_gen.py script (which is run for in-tree APIs as part of the build
+ * process). It's not recommended to mix the higher and lower level APIs. Due
+ * to version issues, the higher-level APIs are not part of the shared library.
+ */
+
+typedef enum
+{
+  VAPI_OK = 0,	      /**< success */
+  VAPI_EINVAL,	      /**< invalid value encountered */
+  VAPI_EAGAIN,	      /**< operation would block */
+  VAPI_ENOTSUP,	      /**< operation not supported */
+  VAPI_ENOMEM,	      /**< out of memory */
+  VAPI_ENORESP,	      /**< no response to request */
+  VAPI_EMAP_FAIL,     /**< failure while mapping api */
+  VAPI_ECON_FAIL,     /**< failure while connecting to vpp */
+  VAPI_EINCOMPATIBLE, /**< fundamental incompatibility while connecting to vpp
+                           (control ping/control ping reply mismatch) */
+  VAPI_MUTEX_FAILURE, /**< failure manipulating internal mutex(es) */
+  VAPI_EUSER,	      /**< user error used for breaking dispatch,
+                           never used by VAPI */
+} vapi_error_e;
+
+typedef enum
+{
+  VAPI_MODE_BLOCKING = 1,    /**< operations block until response received */
+  VAPI_MODE_NONBLOCKING = 2, /**< operations never block */
+} vapi_mode_e;
+
+typedef enum
+{
+  VAPI_WAIT_FOR_READ,	    /**< wait until a message can be read */
+  VAPI_WAIT_FOR_WRITE,	    /**< wait until a message can be written */
+  VAPI_WAIT_FOR_READ_WRITE, /**< wait until a read or write can be done */
+} vapi_wait_mode_e;
+
+typedef int vapi_msg_id_t;
+typedef struct vapi_ctx_s *vapi_ctx_t;
+
+/**
+ * @brief allocate vapi message of given size
+ *
+ * @note message must be freed by vapi_msg_free if not consumed by vapi_send
+ * call
+ *
+ * @param ctx opaque vapi context
+ *
+ * @return pointer to message or NULL if out of memory
+ */
+void *vapi_msg_alloc (vapi_ctx_t ctx, size_t size);
+
+/**
+ * @brief free a vapi message
+ *
+ * @note messages received by vapi_recv must be freed when no longer needed
+ *
+ * @param ctx opaque vapi context
+ * @param msg message to be freed
+ */
+void vapi_msg_free (vapi_ctx_t ctx, void *msg);
+
+/**
+ * @brief allocate vapi context
+ *
+ * @param[out] pointer to result variable
+ *
+ * @return VAPI_OK on success, other error code on error
+ */
+vapi_error_e vapi_ctx_alloc (vapi_ctx_t * result);
+
+/**
+ * @brief free vapi context
+ */
+void vapi_ctx_free (vapi_ctx_t ctx);
+
+/**
+ * @brief check if message identified by it's message id is known by the vpp to
+ * which the connection is open
+ */
+bool vapi_is_msg_available (vapi_ctx_t ctx, vapi_msg_id_t type);
+
+/**
+ * @brief connect to vpp
+ *
+ * @param ctx opaque vapi context, must be allocated using vapi_ctx_alloc first
+ * @param name application name
+ * @param chroot_prefix shared memory prefix
+ * @param max_outstanding_requests max number of outstanding requests queued
+ * @param response_queue_size size of the response queue
+ * @param mode mode of operation - blocking or nonblocking
+ *
+ * @return VAPI_OK on success, other error code on error
+ */
+vapi_error_e vapi_connect (vapi_ctx_t ctx, const char *name,
+			   const char *chroot_prefix,
+			   int max_outstanding_requests,
+			   int response_queue_size, vapi_mode_e mode);
+
+/**
+ * @brief disconnect from vpp
+ *
+ * @param ctx opaque vapi context
+ *
+ * @return VAPI_OK on success, other error code on error
+ */
+vapi_error_e vapi_disconnect (vapi_ctx_t ctx);
+
+/**
+ * @brief get event file descriptor
+ *
+ * @note this file descriptor becomes readable when messages (from vpp)
+ * are waiting in queue
+ *
+ * @param ctx opaque vapi context
+ * @param[out] fd pointer to result variable
+ *
+ * @return VAPI_OK on success, other error code on error
+ */
+vapi_error_e vapi_get_fd (vapi_ctx_t ctx, int *fd);
+
+/**
+ * @brief low-level api for sending messages to vpp
+ *
+ * @note it is not recommended to use this api directly, use generated api
+ * instead
+ *
+ * @param ctx opaque vapi context
+ * @param msg message to send
+ *
+ * @return VAPI_OK on success, other error code on error
+ */
+vapi_error_e vapi_send (vapi_ctx_t ctx, void *msg);
+
+/**
+ * @brief low-level api for atomically sending two messages to vpp - either
+ * both messages are sent or neither one is
+ *
+ * @note it is not recommended to use this api directly, use generated api
+ * instead
+ *
+ * @param ctx opaque vapi context
+ * @param msg1 first message to send
+ * @param msg2 second message to send
+ *
+ * @return VAPI_OK on success, other error code on error
+ */
+vapi_error_e vapi_send2 (vapi_ctx_t ctx, void *msg1, void *msg2);
+
+/**
+ * @brief low-level api for reading messages from vpp
+ *
+ * @note it is not recommended to use this api directly, use generated api
+ * instead
+ *
+ * @param ctx opaque vapi context
+ * @param[out] msg pointer to result variable containing message
+ * @param[out] msg_size pointer to result variable containing message size
+ *
+ * @return VAPI_OK on success, other error code on error
+ */
+vapi_error_e vapi_recv (vapi_ctx_t ctx, void **msg, size_t * msg_size);
+
+/**
+ * @brief wait for connection to become readable or writable
+ *
+ * @param ctx opaque vapi context
+ * @param mode type of property to wait for - readability, writability or both
+ *
+ * @return VAPI_OK on success, other error code on error
+ */
+vapi_error_e vapi_wait (vapi_ctx_t ctx, vapi_wait_mode_e mode);
+
+/**
+ * @brief pick next message sent by vpp and call the appropriate callback
+ *
+ * @return VAPI_OK on success, other error code on error
+ */
+vapi_error_e vapi_dispatch_one (vapi_ctx_t ctx);
+
+/**
+ * @brief loop vapi_dispatch_one until responses to all currently outstanding
+ * requests have been received and their callbacks called
+ *
+ * @note the dispatch loop is interrupted if any error is encountered or
+ * returned from the callback, in which case this error is returned as the
+ * result of vapi_dispatch. In this case it might be necessary to call dispatch
+ * again to process the remaining messages. Returning VAPI_EUSER from
+ * a callback allows the user to break the dispatch loop (and distinguish
+ * this case in the calling code from other failures). VAPI never returns
+ * VAPI_EUSER on its own.
+ *
+ * @return VAPI_OK on success, other error code on error
+ */
+vapi_error_e vapi_dispatch (vapi_ctx_t ctx);
+
+/** generic vapi event callback */
+typedef vapi_error_e (*vapi_event_cb) (vapi_ctx_t ctx, void *callback_ctx,
+				       void *payload);
+
+/**
+ * @brief set event callback to call when message with given id is dispatched
+ *
+ * @param ctx opaque vapi context
+ * @param id message id
+ * @param callback callback
+ * @param callback_ctx context pointer stored and passed to callback
+ */
+void vapi_set_event_cb (vapi_ctx_t ctx, vapi_msg_id_t id,
+			vapi_event_cb callback, void *callback_ctx);
+
+/**
+ * @brief clear event callback for given message id
+ *
+ * @param ctx opaque vapi context
+ * @param id message id
+ */
+void vapi_clear_event_cb (vapi_ctx_t ctx, vapi_msg_id_t id);
+
+/** generic vapi event callback */
+typedef vapi_error_e (*vapi_generic_event_cb) (vapi_ctx_t ctx,
+					       void *callback_ctx,
+					       vapi_msg_id_t id, void *msg);
+/**
+ * @brief set generic event callback
+ *
+ * @note this callback is called by dispatch if no message-type specific
+ * callback is set (so it's a fallback callback)
+ *
+ * @param ctx opaque vapi context
+ * @param callback callback
+ * @param callback_ctx context pointer stored and passed to callback
+ */
+void vapi_set_generic_event_cb (vapi_ctx_t ctx,
+				vapi_generic_event_cb callback,
+				void *callback_ctx);
+
+/**
+ * @brief clear generic event callback
+ *
+ * @param ctx opaque vapi context
+ */
+void vapi_clear_generic_event_cb (vapi_ctx_t ctx);
+
+#endif
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp-api/vapi/vapi_c_gen.py b/src/vpp-api/vapi/vapi_c_gen.py
new file mode 100755
index 00000000..2bc1eef8
--- /dev/null
+++ b/src/vpp-api/vapi/vapi_c_gen.py
@@ -0,0 +1,809 @@
+#!/usr/bin/env python3
+
+import argparse
+import os
+import sys
+import logging
+from vapi_json_parser import Field, Struct, Message, JsonParser,\
+    SimpleType, StructType
+
+
+class CField(Field):
+    def __init__(
+            self,
+            field_name,
+            field_type,
+            array_len=None,
+            nelem_field=None):
+        super().__init__(field_name, field_type, array_len, nelem_field)
+
+    def get_c_def(self):
+        if self.len is not None:
+            return "%s %s[%d]" % (self.type.get_c_name(), self.name, self.len)
+        else:
+            return "%s %s" % (self.type.get_c_name(), self.name)
+
+    def get_swap_to_be_code(self, struct, var):
+        if self.len is not None:
+            if self.len > 0:
+                return "do { int i; for (i = 0; i < %d; ++i) { %s } }"\
+                    " while(0);" % (
+                        self.len,
+                        self.type.get_swap_to_be_code(struct, "%s[i]" % var))
+            else:
+                if self.nelem_field.needs_byte_swap():
+                    nelem_field = "%s(%s%s)" % (
+                        self.nelem_field.type.get_swap_to_host_func_name(),
+                        struct, self.nelem_field.name)
+                else:
+                    nelem_field = "%s%s" % (struct, self.nelem_field.name)
+                return (
+                    "do { int i; for (i = 0; i < %s; ++i) { %s } }"
+                    " while(0);" %
+                    (nelem_field, self.type.get_swap_to_be_code(
+                        struct, "%s[i]" % var)))
+        return self.type.get_swap_to_be_code(struct, "%s" % var)
+
+    def get_swap_to_host_code(self, struct, var):
+        if self.len is not None:
+            if self.len > 0:
+                return "do { int i; for (i = 0; i < %d; ++i) { %s } }"\
+                    " while(0);" % (
+                        self.len,
+                        self.type.get_swap_to_host_code(struct, "%s[i]" % var))
+            else:
+                # nelem_field already swapped to host here...
+                return (
+                    "do { int i; for (i = 0; i < %s%s; ++i) { %s } }"
+                    " while(0);" %
+                    (struct, self.nelem_field.name,
+                     self.type.get_swap_to_host_code(
+                         struct, "%s[i]" % var)))
+        return self.type.get_swap_to_host_code(struct, "%s" % var)
+
+    def needs_byte_swap(self):
+        return self.type.needs_byte_swap()
+
+
+class CStruct(Struct):
+    def __init__(self, name, fields):
+        super().__init__(name, fields)
+
+    def get_c_def(self):
+        return "\n".join([
+            "typedef struct __attribute__((__packed__)) {",
+            "%s;" % ";\n".join(["  %s" % x.get_c_def()
+                                for x in self.fields]),
+            "} %s;" % self.get_c_name()])
+
+
+class CSimpleType (SimpleType):
+
+    swap_to_be_dict = {
+        'i16': 'htobe16', 'u16': 'htobe16',
+        'i32': 'htobe32', 'u32': 'htobe32',
+        'i64': 'htobe64', 'u64': 'htobe64',
+    }
+
+    swap_to_host_dict = {
+        'i16': 'be16toh', 'u16': 'be16toh',
+        'i32': 'be32toh', 'u32': 'be32toh',
+        'i64': 'be64toh', 'u64': 'be64toh',
+    }
+
+    def __init__(self, name):
+        super().__init__(name)
+
+    def get_c_name(self):
+        return self.name
+
+    def get_swap_to_be_func_name(self):
+        return self.swap_to_be_dict[self.name]
+
+    def get_swap_to_host_func_name(self):
+        return self.swap_to_host_dict[self.name]
+
+    def get_swap_to_be_code(self, struct, var):
+        x = "%s%s" % (struct, var)
+        return "%s = %s(%s);" % (x, self.get_swap_to_be_func_name(), x)
+
+    def get_swap_to_host_code(self, struct, var):
+        x = "%s%s" % (struct, var)
+        return "%s = %s(%s);" % (x, self.get_swap_to_host_func_name(), x)
+
+    def needs_byte_swap(self):
+        try:
+            self.get_swap_to_host_func_name()
+            return True
+        except:
+            pass
+        return False
+
+
+class CStructType (StructType, CStruct):
+    def __init__(self, definition, typedict, field_class):
+        super().__init__(definition, typedict, field_class)
+
+    def get_c_name(self):
+        return "vapi_type_%s" % self.name
+
+    def get_swap_to_be_func_name(self):
+        return "%s_hton" % self.get_c_name()
+
+    def get_swap_to_host_func_name(self):
+        return "%s_ntoh" % self.get_c_name()
+
+    def get_swap_to_be_func_decl(self):
+        return "void %s(%s *msg)" % (
+            self.get_swap_to_be_func_name(), self.get_c_name())
+
+    def get_swap_to_be_func_def(self):
+        return "%s\n{\n%s\n}" % (
+            self.get_swap_to_be_func_decl(),
+            "\n".join([
+                "  %s" % p.get_swap_to_be_code("msg->", "%s" % p.name)
+                for p in self.fields if p.needs_byte_swap()]),
+        )
+
+    def get_swap_to_host_func_decl(self):
+        return "void %s(%s *msg)" % (
+            self.get_swap_to_host_func_name(), self.get_c_name())
+
+    def get_swap_to_host_func_def(self):
+        return "%s\n{\n%s\n}" % (
+            self.get_swap_to_host_func_decl(),
+            "\n".join([
+                "  %s" % p.get_swap_to_host_code("msg->", "%s" % p.name)
+                for p in self.fields if p.needs_byte_swap()]),
+        )
+
+    def get_swap_to_be_code(self, struct, var):
+        return "%s(&%s%s);" % (self.get_swap_to_be_func_name(), struct, var)
+
+    def get_swap_to_host_code(self, struct, var):
+        return "%s(&%s%s);" % (self.get_swap_to_host_func_name(), struct, var)
+
+    def needs_byte_swap(self):
+        for f in self.fields:
+            if f.needs_byte_swap():
+                return True
+        return False
+
+
+class CMessage (Message):
+    def __init__(self, logger, definition, typedict,
+                 struct_type_class, simple_type_class, field_class):
+        super().__init__(logger, definition, typedict, struct_type_class,
+                         simple_type_class, field_class)
+        self.payload_members = [
+            "  %s" % p.get_c_def()
+            for p in self.fields
+            if p.type != self.header
+        ]
+
+    def has_payload(self):
+        return len(self.payload_members) > 0
+
+    def get_msg_id_name(self):
+        return "vapi_msg_id_%s" % self.name
+
+    def get_c_name(self):
+        return "vapi_msg_%s" % self.name
+
+    def get_payload_struct_name(self):
+        return "vapi_payload_%s" % self.name
+
+    def get_alloc_func_vla_field_length_name(self, field):
+        return "%s_array_size" % field.name
+
+    def get_alloc_func_name(self):
+        return "vapi_alloc_%s" % self.name
+
+    def get_alloc_func_decl(self):
+        return "%s* %s(struct vapi_ctx_s *ctx%s)" % (
+            self.get_c_name(),
+            self.get_alloc_func_name(),
+            "".join([", size_t %s" %
+                     self.get_alloc_func_vla_field_length_name(f)
+                     for f in self.fields
+                     if f.nelem_field is not None]))
+
+    def get_alloc_func_def(self):
+        extra = []
+        if self.header.has_field('client_index'):
+            extra.append(
+                "  msg->header.client_index = vapi_get_client_index(ctx);")
+        if self.header.has_field('context'):
+            extra.append("  msg->header.context = 0;")
+        return "\n".join([
+            "%s" % self.get_alloc_func_decl(),
+            "{",
+            "  %s *msg = NULL;" % self.get_c_name(),
+            "  const size_t size = sizeof(%s)%s;" % (
+                self.get_c_name(),
+                "".join([
+                    " + sizeof(msg->payload.%s[0]) * %s" % (
+                        f.name,
+                        self.get_alloc_func_vla_field_length_name(f))
+                    for f in self.fields
+                    if f.nelem_field is not None
+                ])),
+            "  msg = vapi_msg_alloc(ctx, size);",
+            "  if (!msg) {",
+            "    return NULL;",
+            "  }",
+        ] + extra + [
+            "  msg->header._vl_msg_id = vapi_lookup_vl_msg_id(ctx, %s);" %
+            self.get_msg_id_name(),
+            "\n".join(["  msg->payload.%s = %s;" % (
+                f.nelem_field.name,
+                self.get_alloc_func_vla_field_length_name(f))
+                for f in self.fields
+                if f.nelem_field is not None]),
+            "  return msg;",
+            "}"])
+
+    def get_calc_msg_size_func_name(self):
+        return "vapi_calc_%s_msg_size" % self.name
+
+    def get_calc_msg_size_func_decl(self):
+        return "uword %s(%s *msg)" % (
+            self.get_calc_msg_size_func_name(),
+            self.get_c_name())
+
+    def get_calc_msg_size_func_def(self):
+        return "\n".join([
+            "%s" % self.get_calc_msg_size_func_decl(),
+            "{",
+            "  return sizeof(*msg)%s;" %
+            "".join(["+ msg->payload.%s * sizeof(msg->payload.%s[0])" % (
+                    f.nelem_field.name,
+                    f.name)
+                for f in self.fields
+                if f.nelem_field is not None
+            ]),
+            "}",
+        ])
+
+    def get_c_def(self):
+        if self.has_payload():
+            return "\n".join([
+                "typedef struct __attribute__ ((__packed__)) {",
+                "%s; " %
+                ";\n".join(self.payload_members),
+                "} %s;" % self.get_payload_struct_name(),
+                "",
+                "typedef struct __attribute__ ((__packed__)) {",
+                ("  %s %s;" % (self.header.get_c_name(),
+                               self.fields[0].name)
+                    if self.header is not None else ""),
+                "  %s payload;" % self.get_payload_struct_name(),
+                "} %s;" % self.get_c_name(), ])
+        else:
+            return "\n".join([
+                "typedef struct __attribute__ ((__packed__)) {",
+                ("  %s %s;" % (self.header.get_c_name(),
+                               self.fields[0].name)
+                    if self.header is not None else ""),
+                "} %s;" % self.get_c_name(), ])
+
+    def get_swap_payload_to_host_func_name(self):
+        return "%s_payload_ntoh" % self.get_c_name()
+
+    def get_swap_payload_to_be_func_name(self):
+        return "%s_payload_hton" % self.get_c_name()
+
+    def get_swap_payload_to_host_func_decl(self):
+        return "void %s(%s *payload)" % (
+            self.get_swap_payload_to_host_func_name(),
+            self.get_payload_struct_name())
+
+    def get_swap_payload_to_be_func_decl(self):
+        return "void %s(%s *payload)" % (
+            self.get_swap_payload_to_be_func_name(),
+            self.get_payload_struct_name())
+
+    def get_swap_payload_to_be_func_def(self):
+        return "%s\n{\n%s\n}" % (
+            self.get_swap_payload_to_be_func_decl(),
+            "\n".join([
+                "  %s" % p.get_swap_to_be_code("payload->", "%s" % p.name)
+                for p in self.fields
+                if p.needs_byte_swap() and p.type != self.header]),
+        )
+
+    def get_swap_payload_to_host_func_def(self):
+        return "%s\n{\n%s\n}" % (
+            self.get_swap_payload_to_host_func_decl(),
+            "\n".join([
+                "  %s" % p.get_swap_to_host_code("payload->", "%s" % p.name)
+                for p in self.fields
+                if p.needs_byte_swap() and p.type != self.header]),
+        )
+
+    def get_swap_to_host_func_name(self):
+        return "%s_ntoh" % self.get_c_name()
+
+    def get_swap_to_be_func_name(self):
+        return "%s_hton" % self.get_c_name()
+
+    def get_swap_to_host_func_decl(self):
+        return "void %s(%s *msg)" % (
+            self.get_swap_to_host_func_name(), self.get_c_name())
+
+    def get_swap_to_be_func_decl(self):
+        return "void %s(%s *msg)" % (
+            self.get_swap_to_be_func_name(), self.get_c_name())
+
+    def get_swap_to_be_func_def(self):
+        return "\n".join([
+            "%s" % self.get_swap_to_be_func_decl(),
+            "{",
+            ("  VAPI_DBG(\"Swapping `%s'@%%p to big endian\", msg);" %
+                self.get_c_name()),
+            "  %s(&msg->header);" % self.header.get_swap_to_be_func_name()
+            if self.header is not None else "",
+            "  %s(&msg->payload);" % self.get_swap_payload_to_be_func_name()
+            if self.has_payload() else "",
+            "}",
+        ])
+
+    def get_swap_to_host_func_def(self):
+        return "\n".join([
+            "%s" % self.get_swap_to_host_func_decl(),
+            "{",
+            ("  VAPI_DBG(\"Swapping `%s'@%%p to host byte order\", msg);" %
+                self.get_c_name()),
+            "  %s(&msg->header);" % self.header.get_swap_to_host_func_name()
+            if self.header is not None else "",
+            "  %s(&msg->payload);" % self.get_swap_payload_to_host_func_name()
+            if self.has_payload() else "",
+            "}",
+        ])
+
+    def get_op_func_name(self):
+        return "vapi_%s" % self.name
+
+    def get_op_func_decl(self):
+        if self.reply.has_payload():
+            return "vapi_error_e %s(%s)" % (
+                self.get_op_func_name(),
+                ",\n  ".join([
+                    'struct vapi_ctx_s *ctx',
+                    '%s *msg' % self.get_c_name(),
+                    'vapi_error_e (*callback)(struct vapi_ctx_s *ctx',
+                    '                         void *callback_ctx',
+                    '                         vapi_error_e rv',
+                    '                         bool is_last',
+                    '                         %s *reply)' %
+                    self.reply.get_payload_struct_name(),
+                    'void *callback_ctx',
+                ])
+            )
+        else:
+            return "vapi_error_e %s(%s)" % (
+                self.get_op_func_name(),
+                ",\n  ".join([
+                    'struct vapi_ctx_s *ctx',
+                    '%s *msg' % self.get_c_name(),
+                    'vapi_error_e (*callback)(struct vapi_ctx_s *ctx',
+                    '                         void *callback_ctx',
+                    '                         vapi_error_e rv',
+                    '                         bool is_last)',
+                    'void *callback_ctx',
+                ])
+            )
+
+    def get_op_func_def(self):
+        return "\n".join([
+            "%s" % self.get_op_func_decl(),
+            "{",
+            "  if (!msg || !callback) {",
+            "    return VAPI_EINVAL;",
+            "  }",
+            "  if (vapi_is_nonblocking(ctx) && vapi_requests_full(ctx)) {",
+            "    return VAPI_EAGAIN;",
+            "  }",
+            "  vapi_error_e rv;",
+            "  if (VAPI_OK != (rv = vapi_producer_lock (ctx))) {",
+            "    return rv;",
+            "  }",
+            "  u32 req_context = vapi_gen_req_context(ctx);",
+            "  msg->header.context = req_context;",
+            "  %s(msg);" % self.get_swap_to_be_func_name(),
+            ("  if (VAPI_OK == (rv = vapi_send_with_control_ping "
+                "(ctx, msg, req_context))) {"
+                if self.is_dump() else
+                "  if (VAPI_OK == (rv = vapi_send (ctx, msg))) {"
+             ),
+            ("    vapi_store_request(ctx, req_context, %s, "
+             "(vapi_cb_t)callback, callback_ctx);" %
+             ("true" if self.is_dump() else "false")),
+            "    if (VAPI_OK != vapi_producer_unlock (ctx)) {",
+            "      abort (); /* this really shouldn't happen */",
+            "    }",
+            "    if (vapi_is_nonblocking(ctx)) {",
+            "      rv = VAPI_OK;",
+            "    } else {",
+            "      rv = vapi_dispatch(ctx);",
+            "    }",
+            "  } else {",
+            "    %s(msg);" % self.get_swap_to_host_func_name(),
+            "    if (VAPI_OK != vapi_producer_unlock (ctx)) {",
+            "      abort (); /* this really shouldn't happen */",
+            "    }",
+            "  }",
+            "  return rv;",
+            "}",
+            "",
+        ])
+
+    def get_event_cb_func_decl(self):
+        if not self.is_reply():
+            raise Exception(
+                "Cannot register event callback for non-reply function")
+        if self.has_payload():
+            return "\n".join([
+                "void vapi_set_%s_event_cb (" %
+                self.get_c_name(),
+                "  struct vapi_ctx_s *ctx, ",
+                ("  vapi_error_e (*callback)(struct vapi_ctx_s *ctx, "
+                 "void *callback_ctx, %s *payload)," %
+                 self.get_payload_struct_name()),
+                "  void *callback_ctx)",
+            ])
+        else:
+            return "\n".join([
+                "void vapi_set_%s_event_cb (" %
+                self.get_c_name(),
+                "  struct vapi_ctx_s *ctx, ",
+                "  vapi_error_e (*callback)(struct vapi_ctx_s *ctx, "
+                "void *callback_ctx),",
+                "  void *callback_ctx)",
+            ])
+
+    def get_event_cb_func_def(self):
+        if not self.is_reply():
+            raise Exception(
+                "Cannot register event callback for non-reply function")
+        return "\n".join([
+            "%s" % self.get_event_cb_func_decl(),
+            "{",
+            ("  vapi_set_event_cb(ctx, %s, (vapi_event_cb)callback, "
+             "callback_ctx);" %
+             self.get_msg_id_name()),
+            "}"])
+
+    def get_c_metadata_struct_name(self):
+        return "__vapi_metadata_%s" % self.name
+
+    def get_c_constructor(self):
+        has_context = False
+        if self.header is not None:
+            has_context = self.header.has_field('context')
+        return '\n'.join([
+            'static void __attribute__((constructor)) __vapi_constructor_%s()'
+            % self.name,
+            '{',
+            '  static const char name[] = "%s";' % self.name,
+            '  static const char name_with_crc[] = "%s_%s";'
+            % (self.name, self.crc[2:]),
+            '  static vapi_message_desc_t %s = {' %
+            self.get_c_metadata_struct_name(),
+            '    name,',
+            '    sizeof(name) - 1,',
+            '    name_with_crc,',
+            '    sizeof(name_with_crc) - 1,',
+            '    true,' if has_context else '    false,',
+            '    offsetof(%s, context),' % self.header.get_c_name()
+            if has_context else '    0,',
+            ('    offsetof(%s, payload),' % self.get_c_name())
+            if self.has_payload() else '-1,',
+            '    sizeof(%s),' % self.get_c_name(),
+            '    (generic_swap_fn_t)%s,' % self.get_swap_to_be_func_name(),
+            '    (generic_swap_fn_t)%s,' % self.get_swap_to_host_func_name(),
+            '    ~0,',
+            '  };',
+            '',
+            '  %s = vapi_register_msg(&%s);' %
+            (self.get_msg_id_name(), self.get_c_metadata_struct_name()),
+            '  VAPI_DBG("Assigned msg id %%d to %s", %s);' %
+            (self.name, self.get_msg_id_name()),
+            '}',
+        ])
+
+
+vapi_send_with_control_ping = """
+static inline vapi_error_e
+vapi_send_with_control_ping (vapi_ctx_t ctx, void *msg, u32 context)
+{
+  vapi_msg_control_ping *ping = vapi_alloc_control_ping (ctx);
+  if (!ping)
+    {
+      return VAPI_ENOMEM;
+    }
+  ping->header.context = context;
+  vapi_msg_control_ping_hton (ping);
+  return vapi_send2 (ctx, msg, ping);
+}
+"""
+
+
+def gen_json_header(parser, logger, j, io):
+    logger.info("Generating header `%s'" % io.name)
+    orig_stdout = sys.stdout
+    sys.stdout = io
+    include_guard = "__included_%s" % (
+        j.replace(".", "_").replace("/", "_").replace("-", "_"))
+    print("#ifndef %s" % include_guard)
+    print("#define %s" % include_guard)
+    print("")
+    print("#include <vapi_internal.h>")
+    print("")
+    if io.name == "vpe.api.vapi.h":
+        print("static inline vapi_error_e vapi_send_with_control_ping "
+              "(vapi_ctx_t ctx, void * msg, u32 context);")
+        print("")
+    for m in parser.messages_by_json[j].values():
+        print("extern vapi_msg_id_t %s;" % m.get_msg_id_name())
+    print("")
+    for t in parser.types_by_json[j].values():
+        try:
+            print("%s" % t.get_c_def())
+            print("")
+        except:
+            pass
+    for t in parser.types_by_json[j].values():
+        print("%s;" % t.get_swap_to_be_func_decl())
+        print("")
+        print("%s;" % t.get_swap_to_host_func_decl())
+        print("")
+    for m in parser.messages_by_json[j].values():
+        print("%s" % m.get_c_def())
+        print("")
+    for m in parser.messages_by_json[j].values():
+        if not m.is_reply():
+            print("%s;" % m.get_alloc_func_decl())
+            print("")
+            print("%s;" % m.get_op_func_decl())
+        if m.has_payload():
+            print("%s;" % m.get_swap_payload_to_be_func_decl())
+            print("")
+            print("%s;" % m.get_swap_payload_to_host_func_decl())
+            print("")
+        print("%s;" % m.get_calc_msg_size_func_decl())
+        print("")
+        print("%s;" % m.get_swap_to_host_func_decl())
+        print("")
+        print("%s;" % m.get_swap_to_be_func_decl())
+        print("")
+    for m in parser.messages_by_json[j].values():
+        if not m.is_reply():
+            continue
+        print("%s;" % m.get_event_cb_func_decl())
+        print("")
+
+    if io.name == "vpe.api.vapi.h":
+        print("%s" % vapi_send_with_control_ping)
+        print("")
+
+    print("#endif")
+    sys.stdout = orig_stdout
+
+
+def gen_json_code(parser, logger, j, io):
+    logger.info("Generating code `%s'" % io.name)
+    orig_stdout = sys.stdout
+    sys.stdout = io
+    print("#include <%s>" % json_to_header_name(j))
+    print("#include <stdlib.h>")
+    print("#include <stddef.h>")
+    print("#include <arpa/inet.h>")
+    print("#include <vapi_internal.h>")
+    print("#include <vapi_dbg.h>")
+    print("")
+    for t in parser.types_by_json[j].values():
+        print("%s" % t.get_swap_to_be_func_def())
+        print("")
+        print("%s" % t.get_swap_to_host_func_def())
+        print("")
+    for m in parser.messages_by_json[j].values():
+        if m.has_payload():
+            print("%s" % m.get_swap_payload_to_be_func_def())
+            print("")
+            print("%s" % m.get_swap_payload_to_host_func_def())
+            print("")
+        print("%s" % m.get_calc_msg_size_func_def())
+        print("")
+        print("%s" % m.get_swap_to_be_func_def())
+        print("")
+        print("%s" % m.get_swap_to_host_func_def())
+        print("")
+    for m in parser.messages_by_json[j].values():
+        if m.is_reply():
+            continue
+        print("%s" % m.get_alloc_func_def())
+        print("")
+        print("%s" % m.get_op_func_def())
+        print("")
+    print("")
+    for m in parser.messages_by_json[j].values():
+        print("%s" % m.get_c_constructor())
+        print("")
+    print("")
+    for m in parser.messages_by_json[j].values():
+        if not m.is_reply():
+            continue
+        print("%s;" % m.get_event_cb_func_def())
+        print("")
+    print("")
+    for m in parser.messages_by_json[j].values():
+        print("vapi_msg_id_t %s;" % m.get_msg_id_name())
+    sys.stdout = orig_stdout
+
+
+def gen_json_unified_header(parser, logger, j, io):
+    logger.info("Generating header `%s'" % io.name)
+    orig_stdout = sys.stdout
+    sys.stdout = io
+    include_guard = "__included_%s" % (
+        j.replace(".", "_").replace("/", "_").replace("-", "_"))
+    print("#ifndef %s" % include_guard)
+    print("#define %s" % include_guard)
+    print("")
+    print("#include <vapi_internal.h>")
+    print("#include <vapi.h>")
+    print("#include <stdlib.h>")
+    print("#include <stddef.h>")
+    print("#include <arpa/inet.h>")
+    print("#include <vapi_dbg.h>")
+    if io.name == "vpe.api.vapi.h":
+        print("")
+        print("static inline vapi_error_e vapi_send_with_control_ping "
+              "(vapi_ctx_t ctx, void * msg, u32 context);")
+    else:
+        print("#include <vpe.api.vapi.h>")
+    print("")
+    for m in parser.messages_by_json[j].values():
+        print("extern vapi_msg_id_t %s;" % m.get_msg_id_name())
+    print("")
+    print("#define DEFINE_VAPI_MSG_IDS_%s\\" %
+          j.replace(".", "_").replace("/", "_").replace("-", "_").upper())
+    print("\\\n".join([
+        "  vapi_msg_id_t %s;" % m.get_msg_id_name()
+        for m in parser.messages_by_json[j].values()
+    ]))
+    print("")
+    print("")
+    for t in parser.types_by_json[j].values():
+        try:
+            print("%s" % t.get_c_def())
+            print("")
+        except:
+            pass
+    for m in parser.messages_by_json[j].values():
+        print("%s" % m.get_c_def())
+        print("")
+
+    print("")
+    function_attrs = "static inline "
+    for t in parser.types_by_json[j].values():
+        print("%s%s" % (function_attrs, t.get_swap_to_be_func_def()))
+        print("")
+        print("%s%s" % (function_attrs, t.get_swap_to_host_func_def()))
+        print("")
+    for m in parser.messages_by_json[j].values():
+        if m.has_payload():
+            print("%s%s" % (function_attrs,
+                            m.get_swap_payload_to_be_func_def()))
+            print("")
+            print("%s%s" % (function_attrs,
+                            m.get_swap_payload_to_host_func_def()))
+            print("")
+        print("%s%s" % (function_attrs, m.get_calc_msg_size_func_def()))
+        print("")
+        print("%s%s" % (function_attrs, m.get_swap_to_be_func_def()))
+        print("")
+        print("%s%s" % (function_attrs, m.get_swap_to_host_func_def()))
+        print("")
+    for m in parser.messages_by_json[j].values():
+        if m.is_reply():
+            continue
+        print("%s%s" % (function_attrs, m.get_alloc_func_def()))
+        print("")
+        print("%s%s" % (function_attrs, m.get_op_func_def()))
+        print("")
+    print("")
+    for m in parser.messages_by_json[j].values():
+        print("%s" % m.get_c_constructor())
+        print("")
+    print("")
+    for m in parser.messages_by_json[j].values():
+        if not m.is_reply():
+            continue
+        print("%s%s;" % (function_attrs, m.get_event_cb_func_def()))
+        print("")
+    print("")
+
+    if io.name == "vpe.api.vapi.h":
+        print("%s" % vapi_send_with_control_ping)
+        print("")
+
+    print("#endif")
+    sys.stdout = orig_stdout
+
+
+def json_to_header_name(json_name):
+    if json_name.endswith(".json"):
+        return "%s.vapi.h" % os.path.splitext(json_name)[0]
+    raise Exception("Unexpected json name `%s'!" % json_name)
+
+
+def json_to_code_name(json_name):
+    if json_name.endswith(".json"):
+        return "%s.vapi.c" % os.path.splitext(json_name)[0]
+    raise Exception("Unexpected json name `%s'!" % json_name)
+
+
+def gen_c_headers_and_code(parser, logger, prefix):
+    if prefix == "" or prefix is None:
+        prefix = ""
+    else:
+        prefix = "%s/" % prefix
+    for j in parser.json_files:
+        with open('%s%s' % (prefix, json_to_header_name(j)), "w") as io:
+            gen_json_header(parser, logger, j, io)
+        with open('%s%s' % (prefix, json_to_code_name(j)), "w") as io:
+            gen_json_code(parser, logger, j, io)
+
+
+def gen_c_unified_headers(parser, logger, prefix):
+    if prefix == "" or prefix is None:
+        prefix = ""
+    else:
+        prefix = "%s/" % prefix
+    for j in parser.json_files:
+        with open('%s%s' % (prefix, json_to_header_name(j)), "w") as io:
+            gen_json_unified_header(parser, logger, j, io)
+
+
+if __name__ == '__main__':
+    try:
+        verbose = int(os.getenv("V", 0))
+    except:
+        verbose = 0
+
+    if verbose >= 2:
+        log_level = 10
+    elif verbose == 1:
+        log_level = 20
+    else:
+        log_level = 40
+
+    logging.basicConfig(stream=sys.stdout, level=log_level)
+    logger = logging.getLogger("VAPI C GEN")
+    logger.setLevel(log_level)
+
+    argparser = argparse.ArgumentParser(description="VPP JSON API parser")
+    argparser.add_argument('files', metavar='api-file', action='append',
+                           type=str, help='json api file'
+                           '(may be specified multiple times)')
+    argparser.add_argument('--prefix', action='store', default=None,
+                           help='path prefix')
+    args = argparser.parse_args()
+
+    jsonparser = JsonParser(logger, args.files,
+                            simple_type_class=CSimpleType,
+                            struct_type_class=CStructType,
+                            field_class=CField,
+                            message_class=CMessage)
+
+    # not using the model of having separate generated header and code files
+    # with generated symbols present in shared library (per discussion with
+    # Damjan), to avoid symbol version issues in .so
+    # gen_c_headers_and_code(jsonparser, logger, args.prefix)
+
+    gen_c_unified_headers(jsonparser, logger, args.prefix)
+
+    for e in jsonparser.exceptions:
+        logger.error(e)
diff --git a/src/vpp-api/vapi/vapi_dbg.h b/src/vpp-api/vapi/vapi_dbg.h
new file mode 100644
index 00000000..95a80089
--- /dev/null
+++ b/src/vpp-api/vapi/vapi_dbg.h
@@ -0,0 +1,76 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef __included_vapi_debug_h__
+#define __included_vapi_debug_h__
+
+/* controls debug prints */
+#define VAPI_DEBUG (0)
+#define VAPI_DEBUG_CONNECT (0)
+#define VAPI_DEBUG_ALLOC (0)
+
+#if VAPI_DEBUG
+#include <stdio.h>
+#define VAPI_DEBUG_FILE_DEF           \
+  static const char *__file = NULL;   \
+  {                                   \
+    __file = strrchr (__FILE__, '/'); \
+    if (__file)                       \
+      {                               \
+        ++__file;                     \
+      }                               \
+    else                              \
+      {                               \
+        __file = __FILE__;            \
+      }                               \
+  }
+
+#define VAPI_DBG(fmt, ...)                                       \
+  do                                                             \
+    {                                                            \
+      VAPI_DEBUG_FILE_DEF                                        \
+      printf ("DBG:%s:%d:%s():" fmt, __file, __LINE__, __func__, \
+              ##__VA_ARGS__);                                    \
+      printf ("\n");                                             \
+      fflush (stdout);                                           \
+    }                                                            \
+  while (0);
+
+#define VAPI_ERR(fmt, ...)                                       \
+  do                                                             \
+    {                                                            \
+      VAPI_DEBUG_FILE_DEF                                        \
+      printf ("ERR:%s:%d:%s():" fmt, __file, __LINE__, __func__, \
+              ##__VA_ARGS__);                                    \
+      printf ("\n");                                             \
+      fflush (stdout);                                           \
+    }                                                            \
+  while (0);
+#else
+#define VAPI_DBG(...)
+#define VAPI_ERR(...)
+#endif
+
+#endif /* __included_vapi_debug_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vpp-api/vapi/vapi_internal.h b/src/vpp-api/vapi/vapi_internal.h
new file mode 100644
index 00000000..5b85788d
--- /dev/null
+++ b/src/vpp-api/vapi/vapi_internal.h
@@ -0,0 +1,126 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef VAPI_INTERNAL_H
+#define VAPI_INTERNAL_H
+
+#include <string.h>
+#include <vppinfra/types.h>
+
+/**
+ * @file vapi_internal.h
+ *
+ * internal vpp api C declarations
+ *
+ * This file contains internal vpp api C declarations. It's not intended to be
+ * used by the client programmer and the API defined here might change at any
+ * time..
+ */
+
+struct vapi_ctx_s;
+
+typedef struct __attribute__ ((__packed__))
+{
+  u16 _vl_msg_id;
+  u32 context;
+} vapi_type_msg_header1_t;
+
+typedef struct __attribute__ ((__packed__))
+{
+  u16 _vl_msg_id;
+  u32 client_index;
+  u32 context;
+} vapi_type_msg_header2_t;
+
+static inline void
+vapi_type_msg_header1_t_hton (vapi_type_msg_header1_t * h)
+{
+  h->_vl_msg_id = htobe16 (h->_vl_msg_id);
+}
+
+static inline void
+vapi_type_msg_header1_t_ntoh (vapi_type_msg_header1_t * h)
+{
+  h->_vl_msg_id = be16toh (h->_vl_msg_id);
+}
+
+static inline void
+vapi_type_msg_header2_t_hton (vapi_type_msg_header2_t * h)
+{
+  h->_vl_msg_id = htobe16 (h->_vl_msg_id);
+}
+
+static inline void
+vapi_type_msg_header2_t_ntoh (vapi_type_msg_header2_t * h)
+{
+  h->_vl_msg_id = be16toh (h->_vl_msg_id);
+}
+
+
+#include <vapi.h>
+
+typedef vapi_error_e (*vapi_cb_t) (struct vapi_ctx_s *, void *, vapi_error_e,
+				   bool, void *);
+
+typedef void (*generic_swap_fn_t) (void *payload);
+
+typedef struct
+{
+  const char *name;
+  size_t name_len;
+  const char *name_with_crc;
+  size_t name_with_crc_len;
+  bool has_context;
+  size_t context_offset;
+  size_t payload_offset;
+  size_t size;
+  generic_swap_fn_t swap_to_be;
+  generic_swap_fn_t swap_to_host;
+  vapi_msg_id_t id;		/* assigned at run-time */
+} vapi_message_desc_t;
+
+typedef struct
+{
+  const char *name;
+  int payload_offset;
+  size_t size;
+  void (*swap_to_be) (void *payload);
+  void (*swap_to_host) (void *payload);
+} vapi_event_desc_t;
+
+extern bool *__vapi_msg_is_with_context;
+
+vapi_msg_id_t vapi_register_msg (vapi_message_desc_t * msg);
+u16 vapi_lookup_vl_msg_id (vapi_ctx_t ctx, vapi_msg_id_t id);
+int vapi_get_client_index (vapi_ctx_t ctx);
+bool vapi_is_nonblocking (vapi_ctx_t ctx);
+bool vapi_requests_full (vapi_ctx_t ctx);
+size_t vapi_get_request_count (vapi_ctx_t ctx);
+size_t vapi_get_max_request_count (vapi_ctx_t ctx);
+u32 vapi_gen_req_context (vapi_ctx_t ctx);
+void vapi_store_request (vapi_ctx_t ctx, u32 context, bool is_dump,
+			 vapi_cb_t callback, void *callback_ctx);
+int vapi_get_payload_offset (vapi_msg_id_t id);
+void (*vapi_get_swap_to_host_func (vapi_msg_id_t id)) (void *payload);
+void (*vapi_get_swap_to_be_func (vapi_msg_id_t id)) (void *payload);
+size_t vapi_get_message_size (vapi_msg_id_t id);
+size_t vapi_get_context_offset (vapi_msg_id_t id);
+
+vapi_error_e vapi_producer_lock (vapi_ctx_t ctx);
+vapi_error_e vapi_producer_unlock (vapi_ctx_t ctx);
+
+#endif
diff --git a/src/vpp-api/vapi/vapi_json_parser.py b/src/vpp-api/vapi/vapi_json_parser.py
new file mode 100644
index 00000000..57a22383
--- /dev/null
+++ b/src/vpp-api/vapi/vapi_json_parser.py
@@ -0,0 +1,303 @@
+#!/usr/bin/env python3
+
+import json
+
+
+def msg_is_reply(name):
+    return name.endswith('_reply') or name.endswith('_details') \
+        or name.endswith('_event') or name.endswith('_counters')
+
+
+class ParseError (Exception):
+    pass
+
+
+magic_prefix = "vl_api_"
+magic_suffix = "_t"
+
+
+def remove_magic(what):
+    if what.startswith(magic_prefix) and what.endswith(magic_suffix):
+        return what[len(magic_prefix): - len(magic_suffix)]
+    return what
+
+
+class Field:
+
+    def __init__(
+            self,
+            field_name,
+            field_type,
+            array_len=None,
+            nelem_field=None):
+        self.name = field_name
+        self.type = field_type
+        self.len = array_len
+        self.nelem_field = nelem_field
+
+    def __str__(self):
+        if self.len is None:
+            return "name: %s, type: %s" % (self.name, self.type)
+        elif self.len > 0:
+            return "name: %s, type: %s, length: %s" % (self.name, self.type,
+                                                       self.len)
+        else:
+            return ("name: %s, type: %s, variable length stored in: %s" %
+                    (self.name, self.type, self.nelem_field))
+
+
+class Type:
+    def __init__(self, name):
+        self.name = name
+
+
+class SimpleType (Type):
+
+    def __init__(self, name):
+        super().__init__(name)
+
+    def __str__(self):
+        return self.name
+
+
+def get_msg_header_defs(struct_type_class, field_class, typedict):
+    return [
+        struct_type_class(['msg_header1_t',
+                           ['u16', '_vl_msg_id'],
+                           ['u32', 'context'],
+                           ],
+                          typedict, field_class
+                          ),
+        struct_type_class(['msg_header2_t',
+                           ['u16', '_vl_msg_id'],
+                           ['u32', 'client_index'],
+                           ['u32', 'context'],
+                           ],
+                          typedict, field_class
+                          ),
+    ]
+
+
+class Struct:
+
+    def __init__(self, name, fields):
+        self.name = name
+        self.fields = fields
+        self.field_names = [n.name for n in self.fields]
+
+
+class Message:
+
+    def __init__(self, logger, definition, typedict,
+                 struct_type_class, simple_type_class, field_class):
+        self.logger = logger
+        m = definition
+        logger.debug("Parsing message definition `%s'" % m)
+        name = m[0]
+        self.name = name
+        logger.debug("Message name is `%s'" % name)
+        ignore = True
+        self.header = None
+        fields = []
+        for header in get_msg_header_defs(struct_type_class, field_class,
+                                          typedict):
+            logger.debug("Probing header `%s'" % header.name)
+            if header.is_part_of_def(m[1:]):
+                self.header = header
+                logger.debug("Found header `%s'" % header.name)
+                fields.append(field_class(field_name='header',
+                                          field_type=self.header))
+                ignore = False
+                break
+        if ignore and not msg_is_reply(name):
+            raise ParseError("While parsing message `%s': could not find all "
+                             "common header fields" % name)
+        for field in m[1:]:
+            if len(field) == 1 and 'crc' in field:
+                self.crc = field['crc']
+                logger.debug("Found CRC `%s'" % self.crc)
+                continue
+            else:
+                field_type = field[0]
+                if field_type in typedict:
+                    field_type = typedict[field_type]
+                else:
+                    field_type = typedict[remove_magic(field_type)]
+                if len(field) == 2:
+                    if self.header is not None and\
+                            self.header.has_field(field[1]):
+                        continue
+                    p = field_class(field_name=field[1],
+                                    field_type=field_type)
+                elif len(field) == 3:
+                    if field[2] == 0:
+                        raise ParseError(
+                            "While parsing message `%s': variable length "
+                            "array `%s' doesn't have reference to member "
+                            "containing the actual length" % (
+                                name, field[1]))
+                    p = field_class(
+                        field_name=field[1],
+                        field_type=field_type,
+                        array_len=field[2])
+                elif len(field) == 4:
+                    nelem_field = None
+                    for f in fields:
+                        if f.name == field[3]:
+                            nelem_field = f
+                    if nelem_field is None:
+                        raise ParseError(
+                            "While parsing message `%s': couldn't find "
+                            "variable length array `%s' member containing "
+                            "the actual length `%s'" % (
+                                name, field[1], field[3]))
+                    p = field_class(
+                        field_name=field[1],
+                        field_type=field_type,
+                        array_len=field[2],
+                        nelem_field=nelem_field)
+                else:
+                    raise Exception("Don't know how to parse message "
+                                    "definition for message `%s': `%s'" %
+                                    (m, m[1:]))
+                logger.debug("Parsed field `%s'" % p)
+                fields.append(p)
+        self.fields = fields
+
+    def is_dump(self):
+        return self.name.endswith('_dump')
+
+    def is_reply(self):
+        return msg_is_reply(self.name)
+
+
+class StructType (Type, Struct):
+
+    def __init__(self, definition, typedict, field_class):
+        t = definition
+        name = t[0]
+        fields = []
+        for field in t[1:]:
+            if len(field) == 1 and 'crc' in field:
+                self.crc = field['crc']
+                continue
+            elif len(field) == 2:
+                p = field_class(field_name=field[1],
+                                field_type=typedict[field[0]])
+            elif len(field) == 3:
+                if field[2] == 0:
+                    raise ParseError("While parsing type `%s': array `%s' has "
+                                     "variable length" % (name, field[1]))
+                p = field_class(field_name=field[1],
+                                field_type=typedict[field[0]],
+                                array_len=field[2])
+            else:
+                raise ParseError(
+                    "Don't know how to parse type definition for "
+                    "type `%s': `%s'" % (t, t[1:]))
+            fields.append(p)
+        Type.__init__(self, name)
+        Struct.__init__(self, name, fields)
+
+    def has_field(self, name):
+        return name in self.field_names
+
+    def is_part_of_def(self, definition):
+        for idx in range(len(self.fields)):
+            field = definition[idx]
+            p = self.fields[idx]
+            if field[1] != p.name:
+                return False
+            if field[0] != p.type.name:
+                raise ParseError(
+                    "Unexpected field type `%s' (should be `%s'), "
+                    "while parsing msg/def/field `%s/%s/%s'" %
+                    (field[0], p.type, p.name, definition, field))
+        return True
+
+
+class JsonParser:
+    def __init__(self, logger, files, simple_type_class=SimpleType,
+                 struct_type_class=StructType, field_class=Field,
+                 message_class=Message):
+        self.messages = {}
+        self.types = {
+            x: simple_type_class(x) for x in [
+                'i8', 'i16', 'i32', 'i64',
+                'u8', 'u16', 'u32', 'u64',
+                'f64'
+            ]
+        }
+
+        self.simple_type_class = simple_type_class
+        self.struct_type_class = struct_type_class
+        self.field_class = field_class
+        self.message_class = message_class
+
+        self.exceptions = []
+        self.json_files = []
+        self.types_by_json = {}
+        self.messages_by_json = {}
+        self.logger = logger
+        for f in files:
+            self.parse_json_file(f)
+        self.finalize_parsing()
+
+    def parse_json_file(self, path):
+        self.logger.info("Parsing json api file: `%s'" % path)
+        self.json_files.append(path)
+        self.types_by_json[path] = {}
+        self.messages_by_json[path] = {}
+        with open(path) as f:
+            j = json.load(f)
+            for t in j['types']:
+                try:
+                    type_ = self.struct_type_class(t, self.types,
+                                                   self.field_class)
+                    if type_.name in self.types:
+                        raise ParseError("Duplicate type `%s'" % type_.name)
+                except ParseError as e:
+                    self.exceptions.append(e)
+                    continue
+                self.types[type_.name] = type_
+                self.types_by_json[path][type_.name] = type_
+            for m in j['messages']:
+                try:
+                    msg = self.message_class(self.logger, m, self.types,
+                                             self.struct_type_class,
+                                             self.simple_type_class,
+                                             self.field_class)
+                    if msg.name in self.messages:
+                        raise ParseError("Duplicate message `%s'" % msg.name)
+                except ParseError as e:
+                    self.exceptions.append(e)
+                    continue
+                self.messages[msg.name] = msg
+                self.messages_by_json[path][msg.name] = msg
+
+    def get_reply(self, message):
+        if self.messages[message].is_dump():
+            return self.messages["%s_details" % message[:-len("_dump")]]
+        return self.messages["%s_reply" % message]
+
+    def finalize_parsing(self):
+        if len(self.messages) == 0:
+            for e in self.exceptions:
+                self.logger.error(e)
+            raise Exception("No messages parsed.")
+        for jn, j in self.messages_by_json.items():
+            remove = []
+            for n, m in j.items():
+                try:
+                    if not m.is_reply():
+                        try:
+                            m.reply = self.get_reply(n)
+                        except:
+                            raise ParseError(
+                                "Cannot find reply to message `%s'" % n)
+                except ParseError as e:
+                    self.exceptions.append(e)
+                    remove.append(n)
+
+            self.messages_by_json[jn] = {
+                k: v for k, v in j.items() if k not in remove}
diff --git a/test/Makefile b/test/Makefile
index 72b4dac7..132ebee6 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -107,7 +107,11 @@ sanity: verify-no-running-vpp
 	         echo \"*******************************************************************\" &&\
 		 false)"
 
-test: verify-python-path $(PAPI_INSTALL_DONE) sanity reset 
+.PHONY: ext
+ext:
+	make -C ext
+
+test: verify-python-path $(PAPI_INSTALL_DONE) ext sanity reset
 	$(call retest-func)
 
 retest: verify-python-path sanity reset
diff --git a/test/ext/Makefile b/test/ext/Makefile
new file mode 100644
index 00000000..4a45fef6
--- /dev/null
+++ b/test/ext/Makefile
@@ -0,0 +1,17 @@
+BINDIR = $(BR)/vapi_test/
+BIN = $(addprefix $(BINDIR), vapi_test)
+LIBS = -L$(VPP_TEST_BUILD_DIR)/vpp/.libs/ -L$(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi/.libs/ -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lsubunit -lrt -lm -lvapiclient
+CFLAGS = -ggdb -O0 -Wall -pthread -I$(WS_ROOT)/src -I$(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi -I$(WS_ROOT)/src/vpp-api/vapi/
+
+all: $(BIN)
+
+$(BINDIR):
+	mkdir -p $(BINDIR)
+
+SRC = vapi_test.c
+
+$(BIN): $(SRC) $(BINDIR) $(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi/.libs/libvapiclient.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libvppinfra.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libvlibmemoryclient.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libsvm.so
+	gcc -ggdb -o $@ $(SRC) $(CFLAGS) $(LIBS)
+
+clean:
+	rm -rf $(BINDIR)
diff --git a/test/ext/vapi_test.c b/test/ext/vapi_test.c
new file mode 100644
index 00000000..eca6be7d
--- /dev/null
+++ b/test/ext/vapi_test.c
@@ -0,0 +1,1152 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <endian.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <assert.h>
+#include <setjmp.h>
+#include <check.h>
+#include <vpp-api/vapi/vapi.h>
+#include <vpe.api.vapi.h>
+#include <interface.api.vapi.h>
+#include <l2.api.vapi.h>
+#include <stats.api.vapi.h>
+
+DEFINE_VAPI_MSG_IDS_VPE_API_JSON;
+DEFINE_VAPI_MSG_IDS_INTERFACE_API_JSON;
+DEFINE_VAPI_MSG_IDS_L2_API_JSON;
+DEFINE_VAPI_MSG_IDS_STATS_API_JSON;
+
+static char *app_name = NULL;
+static char *api_prefix = NULL;
+static const int max_outstanding_requests = 64;
+static const int response_queue_size = 32;
+
+START_TEST (test_invalid_values)
+{
+  vapi_ctx_t ctx;
+  vapi_error_e rv = vapi_ctx_alloc (&ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  vapi_msg_show_version *sv = vapi_alloc_show_version (ctx);
+  ck_assert_ptr_eq (NULL, sv);
+  rv = vapi_send (ctx, sv);
+  ck_assert_int_eq (VAPI_EINVAL, rv);
+  rv = vapi_connect (ctx, app_name, api_prefix, max_outstanding_requests,
+		     response_queue_size, VAPI_MODE_BLOCKING);
+  ck_assert_int_eq (VAPI_OK, rv);
+  rv = vapi_send (ctx, NULL);
+  ck_assert_int_eq (VAPI_EINVAL, rv);
+  rv = vapi_send (NULL, NULL);
+  ck_assert_int_eq (VAPI_EINVAL, rv);
+  rv = vapi_recv (NULL, NULL, NULL);
+  ck_assert_int_eq (VAPI_EINVAL, rv);
+  rv = vapi_recv (ctx, NULL, NULL);
+  ck_assert_int_eq (VAPI_EINVAL, rv);
+  vapi_msg_show_version_reply *reply;
+  rv = vapi_recv (ctx, (void **) &reply, NULL);
+  ck_assert_int_eq (VAPI_EINVAL, rv);
+  rv = vapi_disconnect (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  vapi_ctx_free (ctx);
+}
+
+END_TEST;
+
+START_TEST (test_hton_1)
+{
+  const u16 _vl_msg_id = 1;
+  vapi_type_msg_header1_t h;
+  h._vl_msg_id = _vl_msg_id;
+  vapi_type_msg_header1_t_hton (&h);
+  ck_assert_int_eq (be16toh (h._vl_msg_id), _vl_msg_id);
+}
+
+END_TEST;
+
+START_TEST (test_hton_2)
+{
+  const u16 _vl_msg_id = 1;
+  const u32 client_index = 3;
+  vapi_type_msg_header2_t h;
+  h._vl_msg_id = _vl_msg_id;
+  h.client_index = client_index;
+  vapi_type_msg_header2_t_hton (&h);
+  ck_assert_int_eq (be16toh (h._vl_msg_id), _vl_msg_id);
+  ck_assert_int_eq (h.client_index, client_index);
+}
+
+END_TEST;
+
+START_TEST (test_hton_3)
+{
+  const size_t data_size = 10;
+  vapi_msg_vnet_interface_combined_counters *m =
+    malloc (sizeof (vapi_msg_vnet_interface_combined_counters) +
+	    data_size * sizeof (vapi_type_vlib_counter));
+  ck_assert_ptr_ne (NULL, m);
+  vapi_payload_vnet_interface_combined_counters *p = &m->payload;
+  const u16 _vl_msg_id = 1;
+  p->_vl_msg_id = _vl_msg_id;
+  const u32 first_sw_if_index = 2;
+  p->first_sw_if_index = first_sw_if_index;
+  p->count = data_size;
+  const u64 packets = 1234;
+  const u64 bytes = 2345;
+  int i;
+  for (i = 0; i < data_size; ++i)
+    {
+      p->data[i].packets = packets;
+      p->data[i].bytes = bytes;
+    }
+  vapi_msg_vnet_interface_combined_counters_hton (m);
+  ck_assert_int_eq (_vl_msg_id, be16toh (p->_vl_msg_id));
+  ck_assert_int_eq (first_sw_if_index, be32toh (p->first_sw_if_index));
+  ck_assert_int_eq (data_size, be32toh (p->count));
+  for (i = 0; i < data_size; ++i)
+    {
+      ck_assert_int_eq (packets, be64toh (p->data[i].packets));
+      ck_assert_int_eq (bytes, be64toh (p->data[i].bytes));
+    }
+  free (p);
+}
+
+END_TEST;
+
+#define verify_hton_swap(expr, value)           \
+  if (4 == sizeof (expr))                       \
+    {                                           \
+      ck_assert_int_eq (expr, htobe32 (value)); \
+    }                                           \
+  else if (2 == sizeof (expr))                  \
+    {                                           \
+      ck_assert_int_eq (expr, htobe16 (value)); \
+    }                                           \
+  else                                          \
+    {                                           \
+      ck_assert_int_eq (expr, value);           \
+    }
+
+START_TEST (test_hton_4)
+{
+  const int vla_count = 3;
+  char x[sizeof (vapi_msg_bridge_domain_details) +
+	 vla_count * sizeof (vapi_type_bridge_domain_sw_if)];
+  vapi_msg_bridge_domain_details *d = (void *) x;
+  int cnt = 1;
+  d->header._vl_msg_id = cnt++;
+  d->header.context = cnt++;
+  d->payload.bd_id = cnt++;
+  d->payload.flood = cnt++;
+  d->payload.uu_flood = cnt++;
+  d->payload.forward = cnt++;
+  d->payload.learn = cnt++;
+  d->payload.arp_term = cnt++;
+  d->payload.mac_age = cnt++;
+  d->payload.bvi_sw_if_index = cnt++;
+  d->payload.n_sw_ifs = vla_count;
+  int i;
+  for (i = 0; i < vla_count; ++i)
+    {
+      vapi_type_bridge_domain_sw_if *det = &d->payload.sw_if_details[i];
+      det->context = cnt++;
+      det->sw_if_index = cnt++;
+      det->shg = cnt++;
+    }
+  ck_assert_int_eq (sizeof (x), vapi_calc_bridge_domain_details_msg_size (d));
+  vapi_msg_bridge_domain_details_hton (d);
+  int tmp = 1;
+  verify_hton_swap (d->header._vl_msg_id, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->header.context, tmp);
+  ++tmp;
+  verify_hton_swap (d->payload.bd_id, tmp);
+  ++tmp;
+  verify_hton_swap (d->payload.flood, tmp);
+  ++tmp;
+  verify_hton_swap (d->payload.uu_flood, tmp);
+  ++tmp;
+  verify_hton_swap (d->payload.forward, tmp);
+  ++tmp;
+  verify_hton_swap (d->payload.learn, tmp);
+  ++tmp;
+  verify_hton_swap (d->payload.arp_term, tmp);
+  ++tmp;
+  verify_hton_swap (d->payload.mac_age, tmp);
+  ++tmp;
+  verify_hton_swap (d->payload.bvi_sw_if_index, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.n_sw_ifs, htobe32 (vla_count));
+  for (i = 0; i < vla_count; ++i)
+    {
+      vapi_type_bridge_domain_sw_if *det = &d->payload.sw_if_details[i];
+      verify_hton_swap (det->context, tmp);
+      ++tmp;
+      verify_hton_swap (det->sw_if_index, tmp);
+      ++tmp;
+      verify_hton_swap (det->shg, tmp);
+      ++tmp;
+    }
+  vapi_msg_bridge_domain_details_ntoh (d);
+  tmp = 1;
+  ck_assert_int_eq (d->header._vl_msg_id, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->header.context, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.bd_id, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.flood, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.uu_flood, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.forward, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.learn, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.arp_term, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.mac_age, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.bvi_sw_if_index, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.n_sw_ifs, vla_count);
+  for (i = 0; i < vla_count; ++i)
+    {
+      vapi_type_bridge_domain_sw_if *det = &d->payload.sw_if_details[i];
+      ck_assert_int_eq (det->context, tmp);
+      ++tmp;
+      ck_assert_int_eq (det->sw_if_index, tmp);
+      ++tmp;
+      ck_assert_int_eq (det->shg, tmp);
+      ++tmp;
+    }
+  ck_assert_int_eq (sizeof (x), vapi_calc_bridge_domain_details_msg_size (d));
+}
+
+END_TEST;
+
+START_TEST (test_ntoh_1)
+{
+  const u16 _vl_msg_id = 1;
+  vapi_type_msg_header1_t h;
+  h._vl_msg_id = _vl_msg_id;
+  vapi_type_msg_header1_t_ntoh (&h);
+  ck_assert_int_eq (htobe16 (h._vl_msg_id), _vl_msg_id);
+}
+
+END_TEST;
+
+START_TEST (test_ntoh_2)
+{
+  const u16 _vl_msg_id = 1;
+  const u32 client_index = 3;
+  vapi_type_msg_header2_t h;
+  h._vl_msg_id = _vl_msg_id;
+  h.client_index = client_index;
+  vapi_type_msg_header2_t_ntoh (&h);
+  ck_assert_int_eq (htobe16 (h._vl_msg_id), _vl_msg_id);
+  ck_assert_int_eq (h.client_index, client_index);
+}
+
+END_TEST;
+
+START_TEST (test_ntoh_3)
+{
+  const size_t data_size = 10;
+  vapi_msg_vnet_interface_combined_counters *m =
+    malloc (sizeof (vapi_msg_vnet_interface_combined_counters) +
+	    data_size * sizeof (vapi_type_vlib_counter));
+  ck_assert_ptr_ne (NULL, m);
+  vapi_payload_vnet_interface_combined_counters *p = &m->payload;
+  const u16 _vl_msg_id = 1;
+  p->_vl_msg_id = _vl_msg_id;
+  const u32 first_sw_if_index = 2;
+  p->first_sw_if_index = first_sw_if_index;
+  const size_t be_data_size = htobe32 (data_size);
+  p->count = be_data_size;
+  const u64 packets = 1234;
+  const u64 bytes = 2345;
+  int i;
+  for (i = 0; i < data_size; ++i)
+    {
+      p->data[i].packets = packets;
+      p->data[i].bytes = bytes;
+    }
+  vapi_msg_vnet_interface_combined_counters_ntoh (m);
+  ck_assert_int_eq (_vl_msg_id, be16toh (p->_vl_msg_id));
+  ck_assert_int_eq (first_sw_if_index, be32toh (p->first_sw_if_index));
+  ck_assert_int_eq (be_data_size, be32toh (p->count));
+  for (i = 0; i < data_size; ++i)
+    {
+      ck_assert_int_eq (packets, htobe64 (p->data[i].packets));
+      ck_assert_int_eq (bytes, htobe64 (p->data[i].bytes));
+    }
+  free (p);
+}
+
+END_TEST;
+
+#define verify_ntoh_swap(expr, value)           \
+  if (4 == sizeof (expr))                       \
+    {                                           \
+      ck_assert_int_eq (expr, be32toh (value)); \
+    }                                           \
+  else if (2 == sizeof (expr))                  \
+    {                                           \
+      ck_assert_int_eq (expr, be16toh (value)); \
+    }                                           \
+  else                                          \
+    {                                           \
+      ck_assert_int_eq (expr, value);           \
+    }
+
+START_TEST (test_ntoh_4)
+{
+  const int vla_count = 3;
+  char x[sizeof (vapi_msg_bridge_domain_details) +
+	 vla_count * sizeof (vapi_type_bridge_domain_sw_if)];
+  vapi_msg_bridge_domain_details *d = (void *) x;
+  int cnt = 1;
+  d->header._vl_msg_id = cnt++;
+  d->header.context = cnt++;
+  d->payload.bd_id = cnt++;
+  d->payload.flood = cnt++;
+  d->payload.uu_flood = cnt++;
+  d->payload.forward = cnt++;
+  d->payload.learn = cnt++;
+  d->payload.arp_term = cnt++;
+  d->payload.mac_age = cnt++;
+  d->payload.bvi_sw_if_index = cnt++;
+  d->payload.n_sw_ifs = htobe32 (vla_count);
+  int i;
+  for (i = 0; i < vla_count; ++i)
+    {
+      vapi_type_bridge_domain_sw_if *det = &d->payload.sw_if_details[i];
+      det->context = cnt++;
+      det->sw_if_index = cnt++;
+      det->shg = cnt++;
+    }
+  vapi_msg_bridge_domain_details_ntoh (d);
+  ck_assert_int_eq (sizeof (x), vapi_calc_bridge_domain_details_msg_size (d));
+  int tmp = 1;
+  verify_ntoh_swap (d->header._vl_msg_id, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->header.context, tmp);
+  ++tmp;
+  verify_ntoh_swap (d->payload.bd_id, tmp);
+  ++tmp;
+  verify_ntoh_swap (d->payload.flood, tmp);
+  ++tmp;
+  verify_ntoh_swap (d->payload.uu_flood, tmp);
+  ++tmp;
+  verify_ntoh_swap (d->payload.forward, tmp);
+  ++tmp;
+  verify_ntoh_swap (d->payload.learn, tmp);
+  ++tmp;
+  verify_ntoh_swap (d->payload.arp_term, tmp);
+  ++tmp;
+  verify_ntoh_swap (d->payload.mac_age, tmp);
+  ++tmp;
+  verify_ntoh_swap (d->payload.bvi_sw_if_index, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.n_sw_ifs, vla_count);
+  for (i = 0; i < vla_count; ++i)
+    {
+      vapi_type_bridge_domain_sw_if *det = &d->payload.sw_if_details[i];
+      verify_ntoh_swap (det->context, tmp);
+      ++tmp;
+      verify_ntoh_swap (det->sw_if_index, tmp);
+      ++tmp;
+      verify_ntoh_swap (det->shg, tmp);
+      ++tmp;
+    }
+  vapi_msg_bridge_domain_details_hton (d);
+  tmp = 1;
+  ck_assert_int_eq (d->header._vl_msg_id, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->header.context, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.bd_id, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.flood, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.uu_flood, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.forward, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.learn, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.arp_term, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.mac_age, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.bvi_sw_if_index, tmp);
+  ++tmp;
+  ck_assert_int_eq (d->payload.n_sw_ifs, htobe32 (vla_count));
+  for (i = 0; i < vla_count; ++i)
+    {
+      vapi_type_bridge_domain_sw_if *det = &d->payload.sw_if_details[i];
+      ck_assert_int_eq (det->context, tmp);
+      ++tmp;
+      ck_assert_int_eq (det->sw_if_index, tmp);
+      ++tmp;
+      ck_assert_int_eq (det->shg, tmp);
+      ++tmp;
+    }
+}
+
+END_TEST;
+
+vapi_error_e
+show_version_cb (vapi_ctx_t ctx, void *caller_ctx,
+		 vapi_error_e rv, bool is_last,
+		 vapi_payload_show_version_reply * p)
+{
+  ck_assert_int_eq (VAPI_OK, rv);
+  ck_assert_int_eq (true, is_last);
+  ck_assert_str_eq ("vpe", (char *) p->program);
+  printf
+    ("show_version_reply: program: `%s', version: `%s', build directory: "
+     "`%s', build date: `%s'\n", p->program, p->version, p->build_directory,
+     p->build_date);
+  ++*(int *) caller_ctx;
+  return VAPI_OK;
+}
+
+typedef struct
+{
+  int called;
+  int expected_retval;
+  u32 *sw_if_index_storage;
+} test_create_loopback_ctx_t;
+
+vapi_error_e
+loopback_create_cb (vapi_ctx_t ctx, void *caller_ctx,
+		    vapi_error_e rv, bool is_last,
+		    vapi_payload_create_loopback_reply * p)
+{
+  test_create_loopback_ctx_t *clc = caller_ctx;
+  ck_assert_int_eq (clc->expected_retval, p->retval);
+  *clc->sw_if_index_storage = p->sw_if_index;
+  ++clc->called;
+  return VAPI_OK;
+}
+
+typedef struct
+{
+  int called;
+  int expected_retval;
+  u32 *sw_if_index_storage;
+} test_delete_loopback_ctx_t;
+
+vapi_error_e
+loopback_delete_cb (vapi_ctx_t ctx, void *caller_ctx,
+		    vapi_error_e rv, bool is_last,
+		    vapi_payload_delete_loopback_reply * p)
+{
+  test_delete_loopback_ctx_t *dlc = caller_ctx;
+  ck_assert_int_eq (dlc->expected_retval, p->retval);
+  ++dlc->called;
+  return VAPI_OK;
+}
+
+START_TEST (test_connect)
+{
+  vapi_ctx_t ctx;
+  vapi_error_e rv = vapi_ctx_alloc (&ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  rv = vapi_connect (ctx, app_name, api_prefix, max_outstanding_requests,
+		     response_queue_size, VAPI_MODE_BLOCKING);
+  ck_assert_int_eq (VAPI_OK, rv);
+  rv = vapi_disconnect (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  vapi_ctx_free (ctx);
+}
+
+END_TEST;
+
+vapi_ctx_t ctx;
+
+void
+setup_blocking (void)
+{
+  vapi_error_e rv = vapi_ctx_alloc (&ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  rv = vapi_connect (ctx, app_name, api_prefix, max_outstanding_requests,
+		     response_queue_size, VAPI_MODE_BLOCKING);
+  ck_assert_int_eq (VAPI_OK, rv);
+}
+
+void
+setup_nonblocking (void)
+{
+  vapi_error_e rv = vapi_ctx_alloc (&ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  rv = vapi_connect (ctx, app_name, api_prefix, max_outstanding_requests,
+		     response_queue_size, VAPI_MODE_NONBLOCKING);
+  ck_assert_int_eq (VAPI_OK, rv);
+}
+
+void
+teardown (void)
+{
+  vapi_disconnect (ctx);
+  vapi_ctx_free (ctx);
+}
+
+START_TEST (test_show_version_1)
+{
+  printf ("--- Basic show version message - reply test ---\n");
+  vapi_msg_show_version *sv = vapi_alloc_show_version (ctx);
+  ck_assert_ptr_ne (NULL, sv);
+  vapi_msg_show_version_hton (sv);
+  vapi_error_e rv = vapi_send (ctx, sv);
+  ck_assert_int_eq (VAPI_OK, rv);
+  vapi_msg_show_version_reply *resp;
+  size_t size;
+  rv = vapi_recv (ctx, (void *) &resp, &size);
+  ck_assert_int_eq (VAPI_OK, rv);
+  vapi_payload_show_version_reply *payload = &resp->payload;
+  int dummy;
+  show_version_cb (NULL, &dummy, VAPI_OK, true, payload);
+  vapi_msg_free (ctx, resp);
+}
+
+END_TEST;
+
+START_TEST (test_show_version_2)
+{
+  int called = 0;
+  printf ("--- Show version via blocking callback API ---\n");
+  const int attempts = response_queue_size * 4;
+  int i = 0;
+  for (i = 0; i < attempts; ++i)
+    {
+      vapi_msg_show_version *sv = vapi_alloc_show_version (ctx);
+      ck_assert_ptr_ne (NULL, sv);
+      vapi_error_e rv = vapi_show_version (ctx, sv, show_version_cb, &called);
+      ck_assert_int_eq (VAPI_OK, rv);
+    }
+  ck_assert_int_eq (attempts, called);
+}
+
+END_TEST;
+
+typedef struct
+{
+  bool last_called;
+  size_t num_ifs;
+  u32 *sw_if_indexes;
+  bool *seen;
+  int called;
+} sw_interface_dump_ctx;
+
+vapi_error_e
+sw_interface_dump_cb (struct vapi_ctx_s *ctx, void *callback_ctx,
+		      vapi_error_e rv, bool is_last,
+		      vapi_payload_sw_interface_details * reply)
+{
+  sw_interface_dump_ctx *dctx = callback_ctx;
+  ck_assert_int_eq (false, dctx->last_called);
+  if (is_last)
+    {
+      ck_assert (NULL == reply);
+      dctx->last_called = true;
+    }
+  else
+    {
+      ck_assert (reply);
+      printf ("Interface dump entry: [%u]: %s\n", reply->sw_if_index,
+	      reply->interface_name);
+      size_t i = 0;
+      for (i = 0; i < dctx->num_ifs; ++i)
+	{
+	  if (dctx->sw_if_indexes[i] == reply->sw_if_index)
+	    {
+	      ck_assert_int_eq (false, dctx->seen[i]);
+	      dctx->seen[i] = true;
+	    }
+	}
+    }
+  ++dctx->called;
+  return VAPI_OK;
+}
+
+START_TEST (test_loopbacks_1)
+{
+  printf ("--- Create/delete loopbacks using blocking API ---\n");
+  const size_t num_ifs = 5;
+  u8 mac_addresses[num_ifs][6];
+  memset (&mac_addresses, 0, sizeof (mac_addresses));
+  u32 sw_if_indexes[num_ifs];
+  memset (&sw_if_indexes, 0xff, sizeof (sw_if_indexes));
+  test_create_loopback_ctx_t clcs[num_ifs];
+  memset (&clcs, 0, sizeof (clcs));
+  test_delete_loopback_ctx_t dlcs[num_ifs];
+  memset (&dlcs, 0, sizeof (dlcs));
+  int i;
+  for (i = 0; i < num_ifs; ++i)
+    {
+      memcpy (&mac_addresses[i], "\1\2\3\4\5\6", 6);
+      mac_addresses[i][5] = i;
+      clcs[i].sw_if_index_storage = &sw_if_indexes[i];
+    }
+  for (i = 0; i < num_ifs; ++i)
+    {
+      vapi_msg_create_loopback *cl = vapi_alloc_create_loopback (ctx);
+      memcpy (cl->payload.mac_address, mac_addresses[i],
+	      sizeof (cl->payload.mac_address));
+      vapi_error_e rv =
+	vapi_create_loopback (ctx, cl, loopback_create_cb, &clcs[i]);
+      ck_assert_int_eq (VAPI_OK, rv);
+    }
+  for (i = 0; i < num_ifs; ++i)
+    {
+      ck_assert_int_eq (1, clcs[i].called);
+      printf ("Created loopback with MAC %02x:%02x:%02x:%02x:%02x:%02x --> "
+	      "sw_if_index %u\n",
+	      mac_addresses[i][0], mac_addresses[i][1], mac_addresses[i][2],
+	      mac_addresses[i][3], mac_addresses[i][4], mac_addresses[i][5],
+	      sw_if_indexes[i]);
+    }
+  bool seen[num_ifs];
+  sw_interface_dump_ctx dctx = { false, num_ifs, sw_if_indexes, seen, 0 };
+  vapi_msg_sw_interface_dump *dump;
+  vapi_error_e rv;
+  const int attempts = response_queue_size * 4;
+  for (i = 0; i < attempts; ++i)
+    {
+      dctx.last_called = false;
+      memset (&seen, 0, sizeof (seen));
+      dump = vapi_alloc_sw_interface_dump (ctx);
+      dump->payload.name_filter_valid = 0;
+      memset (dump->payload.name_filter, 0,
+	      sizeof (dump->payload.name_filter));
+      while (VAPI_EAGAIN ==
+	     (rv =
+	      vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb,
+				      &dctx)))
+	;
+      ck_assert_int_eq (true, dctx.last_called);
+      int j = 0;
+      for (j = 0; j < num_ifs; ++j)
+	{
+	  ck_assert_int_eq (true, seen[j]);
+	}
+    }
+  memset (&seen, 0, sizeof (seen));
+  for (i = 0; i < num_ifs; ++i)
+    {
+      vapi_msg_delete_loopback *dl = vapi_alloc_delete_loopback (ctx);
+      dl->payload.sw_if_index = sw_if_indexes[i];
+      vapi_error_e rv =
+	vapi_delete_loopback (ctx, dl, loopback_delete_cb, &dlcs[i]);
+      ck_assert_int_eq (VAPI_OK, rv);
+    }
+  for (i = 0; i < num_ifs; ++i)
+    {
+      ck_assert_int_eq (1, dlcs[i].called);
+      printf ("Deleted loopback with sw_if_index %u\n", sw_if_indexes[i]);
+    }
+  dctx.last_called = false;
+  memset (&seen, 0, sizeof (seen));
+  dump = vapi_alloc_sw_interface_dump (ctx);
+  dump->payload.name_filter_valid = 0;
+  memset (dump->payload.name_filter, 0, sizeof (dump->payload.name_filter));
+  while (VAPI_EAGAIN ==
+	 (rv =
+	  vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx)))
+    ;
+  ck_assert_int_eq (true, dctx.last_called);
+  for (i = 0; i < num_ifs; ++i)
+    {
+      ck_assert_int_eq (false, seen[i]);
+    }
+}
+
+END_TEST;
+
+START_TEST (test_show_version_3)
+{
+  printf ("--- Show version via async callback ---\n");
+  int called = 0;
+  vapi_error_e rv;
+  vapi_msg_show_version *sv = vapi_alloc_show_version (ctx);
+  ck_assert_ptr_ne (NULL, sv);
+  while (VAPI_EAGAIN ==
+	 (rv = vapi_show_version (ctx, sv, show_version_cb, &called)))
+    ;
+  ck_assert_int_eq (VAPI_OK, rv);
+  ck_assert_int_eq (0, called);
+  rv = vapi_dispatch (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  ck_assert_int_eq (1, called);
+  called = 0;
+  rv = vapi_dispatch (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  ck_assert_int_eq (0, called);
+}
+
+END_TEST;
+
+START_TEST (test_show_version_4)
+{
+  printf ("--- Show version via async callback - multiple messages ---\n");
+  vapi_error_e rv;
+  const size_t num_req = 5;
+  int contexts[num_req];
+  memset (contexts, 0, sizeof (contexts));
+  int i;
+  for (i = 0; i < num_req; ++i)
+    {
+      vapi_msg_show_version *sv = vapi_alloc_show_version (ctx);
+      ck_assert_ptr_ne (NULL, sv);
+      while (VAPI_EAGAIN ==
+	     (rv =
+	      vapi_show_version (ctx, sv, show_version_cb, &contexts[i])))
+	;
+      ck_assert_int_eq (VAPI_OK, rv);
+      int j;
+      for (j = 0; j < num_req; ++j)
+	{
+	  ck_assert_int_eq (0, contexts[j]);
+	}
+    }
+  rv = vapi_dispatch (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  for (i = 0; i < num_req; ++i)
+    {
+      ck_assert_int_eq (1, contexts[i]);
+    }
+  memset (contexts, 0, sizeof (contexts));
+  rv = vapi_dispatch (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  for (i = 0; i < num_req; ++i)
+    {
+      ck_assert_int_eq (0, contexts[i]);
+    }
+}
+
+END_TEST;
+
+START_TEST (test_loopbacks_2)
+{
+  printf ("--- Create/delete loopbacks using non-blocking API ---\n");
+  vapi_error_e rv;
+  const size_t num_ifs = 5;
+  u8 mac_addresses[num_ifs][6];
+  memset (&mac_addresses, 0, sizeof (mac_addresses));
+  u32 sw_if_indexes[num_ifs];
+  memset (&sw_if_indexes, 0xff, sizeof (sw_if_indexes));
+  test_create_loopback_ctx_t clcs[num_ifs];
+  memset (&clcs, 0, sizeof (clcs));
+  test_delete_loopback_ctx_t dlcs[num_ifs];
+  memset (&dlcs, 0, sizeof (dlcs));
+  int i;
+  for (i = 0; i < num_ifs; ++i)
+    {
+      memcpy (&mac_addresses[i], "\1\2\3\4\5\6", 6);
+      mac_addresses[i][5] = i;
+      clcs[i].sw_if_index_storage = &sw_if_indexes[i];
+    }
+  for (i = 0; i < num_ifs; ++i)
+    {
+      vapi_msg_create_loopback *cl = vapi_alloc_create_loopback (ctx);
+      memcpy (cl->payload.mac_address, mac_addresses[i],
+	      sizeof (cl->payload.mac_address));
+      while (VAPI_EAGAIN ==
+	     (rv =
+	      vapi_create_loopback (ctx, cl, loopback_create_cb, &clcs[i])))
+	;
+      ck_assert_int_eq (VAPI_OK, rv);
+    }
+  rv = vapi_dispatch (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  for (i = 0; i < num_ifs; ++i)
+    {
+      ck_assert_int_eq (1, clcs[i].called);
+      printf ("Loopback with MAC %02x:%02x:%02x:%02x:%02x:%02x --> "
+	      "sw_if_index %u\n",
+	      mac_addresses[i][0], mac_addresses[i][1], mac_addresses[i][2],
+	      mac_addresses[i][3], mac_addresses[i][4], mac_addresses[i][5],
+	      sw_if_indexes[i]);
+    }
+  bool seen[num_ifs];
+  memset (&seen, 0, sizeof (seen));
+  sw_interface_dump_ctx dctx = { false, num_ifs, sw_if_indexes, seen, 0 };
+  vapi_msg_sw_interface_dump *dump = vapi_alloc_sw_interface_dump (ctx);
+  dump->payload.name_filter_valid = 0;
+  memset (dump->payload.name_filter, 0, sizeof (dump->payload.name_filter));
+  while (VAPI_EAGAIN ==
+	 (rv =
+	  vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx)))
+    ;
+  for (i = 0; i < num_ifs; ++i)
+    {
+      ck_assert_int_eq (false, seen[i]);
+    }
+  memset (&seen, 0, sizeof (seen));
+  ck_assert_int_eq (false, dctx.last_called);
+  rv = vapi_dispatch (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  for (i = 0; i < num_ifs; ++i)
+    {
+      ck_assert_int_eq (true, seen[i]);
+    }
+  memset (&seen, 0, sizeof (seen));
+  ck_assert_int_eq (true, dctx.last_called);
+  for (i = 0; i < num_ifs; ++i)
+    {
+      vapi_msg_delete_loopback *dl = vapi_alloc_delete_loopback (ctx);
+      dl->payload.sw_if_index = sw_if_indexes[i];
+      while (VAPI_EAGAIN ==
+	     (rv =
+	      vapi_delete_loopback (ctx, dl, loopback_delete_cb, &dlcs[i])))
+	;
+      ck_assert_int_eq (VAPI_OK, rv);
+    }
+  rv = vapi_dispatch (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  for (i = 0; i < num_ifs; ++i)
+    {
+      ck_assert_int_eq (1, dlcs[i].called);
+      printf ("Deleted loopback with sw_if_index %u\n", sw_if_indexes[i]);
+    }
+  memset (&seen, 0, sizeof (seen));
+  dctx.last_called = false;
+  dump = vapi_alloc_sw_interface_dump (ctx);
+  dump->payload.name_filter_valid = 0;
+  memset (dump->payload.name_filter, 0, sizeof (dump->payload.name_filter));
+  while (VAPI_EAGAIN ==
+	 (rv =
+	  vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx)))
+    ;
+  rv = vapi_dispatch (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  for (i = 0; i < num_ifs; ++i)
+    {
+      ck_assert_int_eq (false, seen[i]);
+    }
+  memset (&seen, 0, sizeof (seen));
+  ck_assert_int_eq (true, dctx.last_called);
+}
+
+END_TEST;
+
+vapi_error_e
+interface_simple_stats_cb (vapi_ctx_t ctx, void *callback_ctx,
+			   vapi_error_e rv, bool is_last,
+			   vapi_payload_want_interface_simple_stats_reply *
+			   payload)
+{
+  return VAPI_OK;
+}
+
+vapi_error_e
+simple_counters_cb (vapi_ctx_t ctx, void *callback_ctx,
+		    vapi_payload_vnet_interface_simple_counters * payload)
+{
+  int *called = callback_ctx;
+  ++*called;
+  printf ("simple counters: first_sw_if_index=%u\n",
+	  payload->first_sw_if_index);
+  return VAPI_OK;
+}
+
+START_TEST (test_stats_1)
+{
+  printf ("--- Receive stats using generic blocking API ---\n");
+  vapi_msg_want_interface_simple_stats *ws =
+    vapi_alloc_want_interface_simple_stats (ctx);
+  ws->payload.enable_disable = 1;
+  ws->payload.pid = getpid ();
+  vapi_error_e rv;
+  rv = vapi_want_interface_simple_stats (ctx, ws, interface_simple_stats_cb,
+					 NULL);
+  ck_assert_int_eq (VAPI_OK, rv);
+  int called = 0;
+  vapi_set_event_cb (ctx, vapi_msg_id_vnet_interface_simple_counters,
+		     (vapi_event_cb) simple_counters_cb, &called);
+  rv = vapi_dispatch_one (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  ck_assert_int_eq (1, called);
+}
+
+END_TEST;
+
+START_TEST (test_stats_2)
+{
+  printf ("--- Receive stats using stat-specific blocking API ---\n");
+  vapi_msg_want_interface_simple_stats *ws =
+    vapi_alloc_want_interface_simple_stats (ctx);
+  ws->payload.enable_disable = 1;
+  ws->payload.pid = getpid ();
+  vapi_error_e rv;
+  rv = vapi_want_interface_simple_stats (ctx, ws, interface_simple_stats_cb,
+					 NULL);
+  ck_assert_int_eq (VAPI_OK, rv);
+  int called = 0;
+  vapi_set_vapi_msg_vnet_interface_simple_counters_event_cb (ctx,
+							     simple_counters_cb,
+							     &called);
+  rv = vapi_dispatch_one (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  ck_assert_int_eq (1, called);
+}
+
+END_TEST;
+
+vapi_error_e
+generic_cb (vapi_ctx_t ctx, void *callback_ctx, vapi_msg_id_t id, void *msg)
+{
+  int *called = callback_ctx;
+  ck_assert_int_eq (0, *called);
+  ++*called;
+  ck_assert_int_eq (id, vapi_msg_id_show_version_reply);
+  ck_assert_ptr_ne (NULL, msg);
+  vapi_msg_show_version_reply *reply = msg;
+  ck_assert_str_eq ("vpe", (char *) reply->payload.program);
+  return VAPI_OK;
+}
+
+START_TEST (test_show_version_5)
+{
+  printf ("--- Receive show version using generic callback - nonblocking "
+	  "API ---\n");
+  vapi_error_e rv;
+  vapi_msg_show_version *sv = vapi_alloc_show_version (ctx);
+  ck_assert_ptr_ne (NULL, sv);
+  vapi_msg_show_version_hton (sv);
+  while (VAPI_EAGAIN == (rv = vapi_send (ctx, sv)))
+    ;
+  ck_assert_int_eq (VAPI_OK, rv);
+  int called = 0;
+  vapi_set_generic_event_cb (ctx, generic_cb, &called);
+  ck_assert_int_eq (VAPI_OK, rv);
+  rv = vapi_dispatch_one (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  ck_assert_int_eq (1, called);
+  sv = vapi_alloc_show_version (ctx);
+  ck_assert_ptr_ne (NULL, sv);
+  vapi_msg_show_version_hton (sv);
+  while (VAPI_EAGAIN == (rv = vapi_send (ctx, sv)))
+    ;
+  ck_assert_int_eq (VAPI_OK, rv);
+  vapi_clear_generic_event_cb (ctx);
+  rv = vapi_dispatch_one (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  ck_assert_int_eq (1, called);	/* needs to remain unchanged */
+}
+
+END_TEST;
+
+vapi_error_e
+combined_counters_cb (struct vapi_ctx_s *ctx, void *callback_ctx,
+		      vapi_payload_vnet_interface_combined_counters * payload)
+{
+  int *called = callback_ctx;
+  ++*called;
+  printf ("combined counters: first_sw_if_index=%u\n",
+	  payload->first_sw_if_index);
+  return VAPI_OK;
+}
+
+vapi_error_e
+stats_cb (vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv,
+	  bool is_last, vapi_payload_want_stats_reply * payload)
+{
+  return VAPI_OK;
+}
+
+START_TEST (test_stats_3)
+{
+  printf ("--- Receive multiple stats using stat-specific non-blocking API "
+	  "---\n");
+  vapi_msg_want_stats *ws = vapi_alloc_want_stats (ctx);
+  ws->payload.enable_disable = 1;
+  ws->payload.pid = getpid ();
+  vapi_error_e rv;
+  rv = vapi_want_stats (ctx, ws, stats_cb, NULL);
+  ck_assert_int_eq (VAPI_OK, rv);
+  int called = 0;
+  int called2 = 0;
+  vapi_set_vapi_msg_vnet_interface_simple_counters_event_cb (ctx,
+							     simple_counters_cb,
+							     &called);
+  vapi_set_vapi_msg_vnet_interface_combined_counters_event_cb (ctx,
+							       combined_counters_cb,
+							       &called2);
+  while (!called || !called2)
+    {
+      if (VAPI_EAGAIN != (rv = vapi_dispatch_one (ctx)))
+	{
+	  ck_assert_int_eq (VAPI_OK, rv);
+	}
+    }
+}
+
+END_TEST;
+
+vapi_error_e
+show_version_no_cb (vapi_ctx_t ctx, void *caller_ctx,
+		    vapi_error_e rv, bool is_last,
+		    vapi_payload_show_version_reply * p)
+{
+  ck_assert_int_eq (VAPI_ENORESP, rv);
+  ck_assert_int_eq (true, is_last);
+  ck_assert_ptr_eq (NULL, p);
+  ++*(int *) caller_ctx;
+  return VAPI_OK;
+}
+
+START_TEST (test_no_response_1)
+{
+  printf ("--- Simulate no response to regular message ---\n");
+  vapi_error_e rv;
+  vapi_msg_show_version *sv = vapi_alloc_show_version (ctx);
+  ck_assert_ptr_ne (NULL, sv);
+  sv->header._vl_msg_id = ~0;	/* malformed ID causes vpp to drop the msg */
+  int called = 0;
+  while (VAPI_EAGAIN ==
+	 (rv = vapi_show_version (ctx, sv, show_version_no_cb, &called)))
+    ;
+  ck_assert_int_eq (VAPI_OK, rv);
+  sv = vapi_alloc_show_version (ctx);
+  ck_assert_ptr_ne (NULL, sv);
+  while (VAPI_EAGAIN ==
+	 (rv = vapi_show_version (ctx, sv, show_version_cb, &called)))
+    ;
+  ck_assert_int_eq (VAPI_OK, rv);
+  rv = vapi_dispatch (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  ck_assert_int_eq (2, called);
+}
+
+END_TEST;
+
+vapi_error_e
+no_msg_cb (struct vapi_ctx_s *ctx, void *callback_ctx,
+	   vapi_error_e rv, bool is_last,
+	   vapi_payload_sw_interface_details * reply)
+{
+  int *called = callback_ctx;
+  ++*called;
+  ck_assert_int_eq (VAPI_OK, rv);
+  ck_assert_int_eq (true, is_last);
+  ck_assert_ptr_eq (NULL, reply);
+  return VAPI_OK;
+}
+
+START_TEST (test_no_response_2)
+{
+  printf ("--- Simulate no response to dump message ---\n");
+  vapi_error_e rv;
+  vapi_msg_sw_interface_dump *dump = vapi_alloc_sw_interface_dump (ctx);
+  dump->header._vl_msg_id = ~0;	/* malformed ID causes vpp to drop the msg */
+  int no_called = 0;
+  while (VAPI_EAGAIN ==
+	 (rv = vapi_sw_interface_dump (ctx, dump, no_msg_cb, &no_called)))
+    ;
+  ck_assert_int_eq (VAPI_OK, rv);
+  rv = vapi_dispatch (ctx);
+  ck_assert_int_eq (VAPI_OK, rv);
+  ck_assert_int_eq (1, no_called);
+}
+
+END_TEST;
+Suite *
+test_suite (void)
+{
+  Suite *s = suite_create ("VAPI test");
+
+  TCase *tc_negative = tcase_create ("Negative tests");
+  tcase_add_test (tc_negative, test_invalid_values);
+  suite_add_tcase (s, tc_negative);
+
+  TCase *tc_swap = tcase_create ("Byteswap tests");
+  tcase_add_test (tc_swap, test_hton_1);
+  tcase_add_test (tc_swap, test_hton_2);
+  tcase_add_test (tc_swap, test_hton_3);
+  tcase_add_test (tc_swap, test_hton_4);
+  tcase_add_test (tc_swap, test_ntoh_1);
+  tcase_add_test (tc_swap, test_ntoh_2);
+  tcase_add_test (tc_swap, test_ntoh_3);
+  tcase_add_test (tc_swap, test_ntoh_4);
+  suite_add_tcase (s, tc_swap);
+
+  TCase *tc_connect = tcase_create ("Connect");
+  tcase_add_test (tc_connect, test_connect);
+  suite_add_tcase (s, tc_connect);
+
+  TCase *tc_block = tcase_create ("Blocking API");
+  tcase_set_timeout (tc_block, 25);
+  tcase_add_checked_fixture (tc_block, setup_blocking, teardown);
+  tcase_add_test (tc_block, test_show_version_1);
+  tcase_add_test (tc_block, test_show_version_2);
+  tcase_add_test (tc_block, test_loopbacks_1);
+  tcase_add_test (tc_block, test_stats_1);
+  tcase_add_test (tc_block, test_stats_2);
+  suite_add_tcase (s, tc_block);
+
+  TCase *tc_nonblock = tcase_create ("Nonblocking API");
+  tcase_set_timeout (tc_nonblock, 25);
+  tcase_add_checked_fixture (tc_nonblock, setup_nonblocking, teardown);
+  tcase_add_test (tc_nonblock, test_show_version_3);
+  tcase_add_test (tc_nonblock, test_show_version_4);
+  tcase_add_test (tc_nonblock, test_show_version_5);
+  tcase_add_test (tc_nonblock, test_loopbacks_2);
+  tcase_add_test (tc_nonblock, test_stats_3);
+  tcase_add_test (tc_nonblock, test_no_response_1);
+  tcase_add_test (tc_nonblock, test_no_response_2);
+  suite_add_tcase (s, tc_nonblock);
+
+  return s;
+}
+
+int
+main (int argc, char *argv[])
+{
+  if (3 != argc)
+    {
+      printf ("Invalid argc==`%d'\n", argc);
+      return EXIT_FAILURE;
+    }
+  app_name = argv[1];
+  api_prefix = argv[2];
+  printf ("App name: `%s', API prefix: `%s'\n", app_name, api_prefix);
+
+  int number_failed;
+  Suite *s;
+  SRunner *sr;
+
+  s = test_suite ();
+  sr = srunner_create (s);
+
+  srunner_run_all (sr, CK_NORMAL);
+  number_failed = srunner_ntests_failed (sr);
+  srunner_free (sr);
+  return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/test/scripts/test-loop.sh b/test/scripts/test-loop.sh
index 17dc7c39..51f5d5ce 100755
--- a/test/scripts/test-loop.sh
+++ b/test/scripts/test-loop.sh
@@ -3,14 +3,15 @@
 function usage() {
  echo "$0" 1>&2
  echo "" 1>&2
- echo "Usage: $0 [-p <pre-exec-cmd>] [-m <email>] -- <make test options>" 1>&2
+ echo "Usage: $0 [-p <pre-exec-cmd>] [-m <email>] -- <make test options|verify>" 1>&2
  echo "" 1>&2
  echo "Parameters:" 1>&2
  echo "    -p <pre-exec-cmd> - run a command before each test loop (e.g. 'git pull')" 1>&2
  echo "    -m <email>        - if set, email is sent to this address on failure" 1>&2
  echo "" 1>&2
- echo "Example:" 1>&2
- echo "    $0 -m <somebody@cisco.com> -- test-debug TEST=l2bd"
+ echo "Examples:" 1>&2
+ echo "    $0 -m <somebody@cisco.com> -- test-debug TEST=l2bd" 1>&2
+ echo "    $0 -m <somebody@cisco.com> -- verify" 1>&2
  exit 1;
 }
 
@@ -44,8 +45,11 @@ shift $((OPTIND-1))
 
 if ! echo $* | grep test >/dev/null
 then
-        echo "Error: command line doesn't look right - should contain \`test' token..." >&2
-	usage
+	if ! echo $* | grep verify >/dev/null
+	then
+		echo "Error: command line doesn't look right - should contain \`test' or \`verify' token..." >&2
+		usage
+	fi
 fi
 
 function finish {
diff --git a/test/test_vapi.py b/test/test_vapi.py
new file mode 100644
index 00000000..86c1ee06
--- /dev/null
+++ b/test/test_vapi.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+""" VAPI test """
+
+from __future__ import division
+import unittest
+import os
+import signal
+import subprocess
+from threading import Thread
+from log import single_line_delim
+from framework import VppTestCase, running_extended_tests, VppTestRunner
+
+
+class Worker(Thread):
+    def __init__(self, args, logger):
+        self.logger = logger
+        self.args = args
+        self.result = None
+        super(Worker, self).__init__()
+
+    def run(self):
+        executable = self.args[0]
+        self.logger.debug("Running executable w/args `%s'" % self.args)
+        env = os.environ.copy()
+        env["CK_LOG_FILE_NAME"] = "-"
+        self.process = subprocess.Popen(
+            self.args, shell=False, env=env, preexec_fn=os.setpgrp,
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        out, err = self.process.communicate()
+        self.logger.debug("Finished running `%s'" % executable)
+        self.logger.info("Return code is `%s'" % self.process.returncode)
+        self.logger.info(single_line_delim)
+        self.logger.info("Executable `%s' wrote to stdout:" % executable)
+        self.logger.info(single_line_delim)
+        self.logger.info(out)
+        self.logger.info(single_line_delim)
+        self.logger.info("Executable `%s' wrote to stderr:" % executable)
+        self.logger.info(single_line_delim)
+        self.logger.error(err)
+        self.logger.info(single_line_delim)
+        self.result = self.process.returncode
+
+
+@unittest.skipUnless(running_extended_tests(), "part of extended tests")
+class VAPITestCase(VppTestCase):
+    """ VAPI test """
+
+    def test_vapi(self):
+        """ run VAPI tests """
+        var = "BR"
+        built_root = os.getenv(var, None)
+        self.assertIsNotNone(built_root,
+                             "Environment variable `%s' not set" % var)
+        executable = "%s/vapi_test/vapi_test" % built_root
+        worker = Worker(
+            [executable, "vapi client", self.shm_prefix], self.logger)
+        worker.start()
+        timeout = 45
+        worker.join(timeout)
+        self.logger.info("Worker result is `%s'" % worker.result)
+        error = False
+        if worker.result is None:
+            try:
+                error = True
+                self.logger.error(
+                    "Timeout! Worker did not finish in %ss" % timeout)
+                os.killpg(os.getpgid(worker.process.pid), signal.SIGTERM)
+                worker.join()
+            except:
+                raise Exception("Couldn't kill worker-spawned process")
+        if error:
+            raise Exception(
+                "Timeout! Worker did not finish in %ss" % timeout)
+        self.assert_equal(worker.result, 0, "Binary test return code")
+
+
+if __name__ == '__main__':
+    unittest.main(testRunner=VppTestRunner)
-- 
cgit 1.2.3-korg


From 440751b91804947a7c9b533570531cac79629016 Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Mon, 11 Sep 2017 08:58:23 -0400
Subject: Use openssl 1.0 compat RPM for Fedora 26 and newer.

This is just a workaround until VPP is compatible with OpenSSL 1.1.

JIRA: VPP-569

Change-Id: I8d2a113dc9400fd7e8e6850de5d91f40380455ce
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 Makefile            | 4 +++-
 extras/rpm/vpp.spec | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c46fa6bb..dbd2fc22 100644
--- a/Makefile
+++ b/Makefile
@@ -74,18 +74,20 @@ endif
 
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += apr-devel
-RPM_DEPENDS += openssl-devel
 RPM_DEPENDS += numactl-devel
 RPM_DEPENDS += check
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
+	RPM_DEPENDS += openssl-devel
 	RPM_DEPENDS += python-devel
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else ifeq ($(shell if [ "$(OS_ID)" = "fedora" ]; then test $(OS_VERSION_ID) -gt 25; echo $$?; fi),0)
+	RPM_DEPENDS += compat-openssl10-devel
 	RPM_DEPENDS += python2-devel
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else
+	RPM_DEPENDS += openssl-devel
 	RPM_DEPENDS += python-devel
 	RPM_DEPENDS += python-virtualenv
 	RPM_DEPENDS_GROUPS = 'Development Tools'
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index 86c0dbc9..a319ba73 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -30,16 +30,19 @@ Version: %{_version}
 Release: %{_release}
 Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python
 BuildRequires: systemd, chrpath
-BuildRequires: libffi-devel, openssl-devel
 %if 0%{?fedora} >= 26
+BuildRequires: compat-openssl10-devel
 BuildRequires: python2-devel, python2-virtualenv
 %else
 %if 0%{?fedora} == 25
+BuildRequires: openssl-devel
 BuildRequires: python-devel, python2-virtualenv
 %else
+BuildREquires: openssl-devel
 BuildRequires: python-devel, python-virtualenv
 %endif
 %endif
+BuildRequires: libffi-devel
 BuildRequires: glibc-static, java-1.8.0-openjdk, java-1.8.0-openjdk-devel yum-utils, redhat-lsb
 BuildRequires: apr-devel
 %if %{with aesni}
-- 
cgit 1.2.3-korg


From e6f3b467947038a924a71d884ee924a9bc8de9f8 Mon Sep 17 00:00:00 2001
From: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Date: Thu, 21 Sep 2017 13:15:53 +0100
Subject: Fix for ssl dependency on debian 9

Change-Id: I32f46c5a6f0e43e7f3e38b05d9607d43faf41501
Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
---
 Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index dbd2fc22..b8aca470 100644
--- a/Makefile
+++ b/Makefile
@@ -58,18 +58,23 @@ endif
 
 # +libganglia1-dev if building the gmond plugin
 
-DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
+DEB_DEPENDS  = curl build-essential autoconf automake bison ccache
 DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += lcov chrpath autoconf nasm indent libnuma-dev
 DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
+	DEB_DEPENDS += libssl-dev
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
 	DEB_DEPENDS += openjdk-8-jdk-headless
+	DEB_DEPENDS += libssl-dev
 	APT_ARGS = -t jessie-backports
-else
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
 	DEB_DEPENDS += default-jdk-headless
+	DEB_DEPENDS += libssl1.0-dev
+else 
+	DEB_DEPENDS += libssl-dev
 endif
 
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
-- 
cgit 1.2.3-korg


From dc33d4ccb3712ab313f9d471cde35ef208aa0e29 Mon Sep 17 00:00:00 2001
From: Marco Varlese <marco.varlese@suse.com>
Date: Fri, 22 Sep 2017 17:53:53 +0200
Subject: openSUSE build fix

* Fixed package dependency
* Fixed bash unary operation error

Change-Id: I782dda8ffd807931241fa6034c110f5fedbeca8e
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
---
 Makefile                | 2 +-
 extras/vagrant/build.sh | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b8aca470..cc26ea52 100644
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ else ifeq ($(findstring y,$(AESNI)),y)
 endif
 
 RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
-RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel
+RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool make openssl-devel
 RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel python3
 
 ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
diff --git a/extras/vagrant/build.sh b/extras/vagrant/build.sh
index 34873f96..fcfd52aa 100755
--- a/extras/vagrant/build.sh
+++ b/extras/vagrant/build.sh
@@ -72,12 +72,14 @@ fi
 # Build and install packaging
 $SUDOCMD make bootstrap
 
-if [ $DISTRIB_ID == "Ubuntu" ]; then
+if [ "$DISTRIB_ID" == "Ubuntu" ]; then
     $SUDOCMD make pkg-deb
-elif [ $DISTRIB_ID == "debian" ]; then
+elif [ "$DISTRIB_ID" == "debian" ]; then
     $SUDOCMD make pkg-deb
-elif [ $DISTRIB_ID == "CentOS" ]; then
+elif [ "$DISTRIB_ID" == "CentOS" ]; then
     (cd $VPP_DIR/vnet ;$SUDOCMD aclocal;$SUDOCMD automake -a)
     $SUDOCMD make pkg-rpm
+elif [ "$DISTRIB_ID" == "opensuse" ]; then
+    $SUDOCMD make build-release
 fi
 
-- 
cgit 1.2.3-korg


From f91fe3b060d58713d24e302abaf950556c26601e Mon Sep 17 00:00:00 2001
From: Dave Wallace <dwallacelf@gmail.com>
Date: Mon, 25 Sep 2017 15:00:36 -0400
Subject: Fix Ubuntu java dependency regression.

- introduced by e6f3b467 "Fix for ssl dependency on debian 9"

Change-Id: If41e517b2a55d2028ade6671f407831cfcf205c4
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index cc26ea52..1a03470f 100644
--- a/Makefile
+++ b/Makefile
@@ -74,6 +74,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
 	DEB_DEPENDS += default-jdk-headless
 	DEB_DEPENDS += libssl1.0-dev
 else 
+	DEB_DEPENDS += default-jdk-headless
 	DEB_DEPENDS += libssl-dev
 endif
 
-- 
cgit 1.2.3-korg


From 625a9fac5034d4121b882c1ba0e90faae7f42881 Mon Sep 17 00:00:00 2001
From: Marco Varlese <marco.varlese@suse.com>
Date: Mon, 25 Sep 2017 10:05:01 +0200
Subject: Fix SUSE dependencies to contemplate both python and python3 scripts.

Change-Id: Ib677955448833dfeb1291490340f5ea1e417213b
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1a03470f..bd800768 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ endif
 
 RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
 RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool make openssl-devel
-RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel python3
+RPM_SUSE_DEPENDS += python-devel python3-devel python-pip python3-pip python-rpm-macros shadow nasm libnuma-devel python3
 
 ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
 	RPM_DEPENDS += python34
-- 
cgit 1.2.3-korg


From a5081a7ac3e013febda1b8b61aed1dc9cd8321ef Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Thu, 28 Sep 2017 06:31:53 +0200
Subject: drop python3 dependency (VPP-1010)

Change-Id: I99c2c1d0d5b96f33efdb58dd3a2897a752e65349
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 Makefile                             |  8 +-------
 src/vpp-api/vapi/vapi_c_gen.py       | 16 +++++++++-------
 src/vpp-api/vapi/vapi_cpp_gen.py     | 17 +++++++++--------
 src/vpp-api/vapi/vapi_json_parser.py | 14 +++++++-------
 4 files changed, 26 insertions(+), 29 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index bd800768..aaa6aee6 100644
--- a/Makefile
+++ b/Makefile
@@ -110,13 +110,7 @@ endif
 
 RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
 RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool make openssl-devel
-RPM_SUSE_DEPENDS += python-devel python3-devel python-pip python3-pip python-rpm-macros shadow nasm libnuma-devel python3
-
-ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
-	RPM_DEPENDS += python34
-else
-	RPM_DEPENDS += python3
-endif
+RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
diff --git a/src/vpp-api/vapi/vapi_c_gen.py b/src/vpp-api/vapi/vapi_c_gen.py
index ef6e2663..d7a7272a 100755
--- a/src/vpp-api/vapi/vapi_c_gen.py
+++ b/src/vpp-api/vapi/vapi_c_gen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2
 
 import argparse
 import os
@@ -15,7 +15,8 @@ class CField(Field):
             field_type,
             array_len=None,
             nelem_field=None):
-        super().__init__(field_name, field_type, array_len, nelem_field)
+        super(CField, self).__init__(
+            field_name, field_type, array_len, nelem_field)
 
     def get_c_def(self):
         if self.len is not None:
@@ -67,7 +68,7 @@ class CField(Field):
 
 class CStruct(Struct):
     def __init__(self, name, fields):
-        super().__init__(name, fields)
+        super(CStruct, self).__init__(name, fields)
 
     def get_c_def(self):
         return "\n".join([
@@ -92,7 +93,7 @@ class CSimpleType (SimpleType):
     }
 
     def __init__(self, name):
-        super().__init__(name)
+        super(CSimpleType, self).__init__(name)
 
     def get_c_name(self):
         return self.name
@@ -122,7 +123,7 @@ class CSimpleType (SimpleType):
 
 class CStructType (StructType, CStruct):
     def __init__(self, definition, typedict, field_class):
-        super().__init__(definition, typedict, field_class)
+        super(CStructType, self).__init__(definition, typedict, field_class)
 
     def get_c_name(self):
         return "vapi_type_%s" % self.name
@@ -173,8 +174,9 @@ class CStructType (StructType, CStruct):
 class CMessage (Message):
     def __init__(self, logger, definition, typedict,
                  struct_type_class, simple_type_class, field_class):
-        super().__init__(logger, definition, typedict, struct_type_class,
-                         simple_type_class, field_class)
+        super(CMessage, self).__init__(logger, definition, typedict,
+                                       struct_type_class, simple_type_class,
+                                       field_class)
         self.payload_members = [
             "  %s" % p.get_c_def()
             for p in self.fields
diff --git a/src/vpp-api/vapi/vapi_cpp_gen.py b/src/vpp-api/vapi/vapi_cpp_gen.py
index 6e9f5d3f..3010f3e1 100755
--- a/src/vpp-api/vapi/vapi_cpp_gen.py
+++ b/src/vpp-api/vapi/vapi_cpp_gen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2
 
 import argparse
 import os
@@ -16,30 +16,31 @@ class CppField(CField):
             field_type,
             array_len=None,
             nelem_field=None):
-        super().__init__(field_name, field_type, array_len, nelem_field)
+        super(CppField, self).__init__(
+            field_name, field_type, array_len, nelem_field)
 
 
 class CppStruct(CStruct):
     def __init__(self, name, fields):
-        super().__init__(name, fields)
+        super(CppStruct, self).__init__(name, fields)
 
 
 class CppSimpleType (CSimpleType):
-
     def __init__(self, name):
-        super().__init__(name)
+        super(CppSimpleType, self).__init__(name)
 
 
 class CppStructType (CStructType, CppStruct):
     def __init__(self, definition, typedict, field_class):
-        super().__init__(definition, typedict, field_class)
+        super(CppStructType, self).__init__(definition, typedict, field_class)
 
 
 class CppMessage (CMessage):
     def __init__(self, logger, definition, typedict,
                  struct_type_class, simple_type_class, field_class):
-        super().__init__(logger, definition, typedict, struct_type_class,
-                         simple_type_class, field_class)
+        super(CppMessage, self).__init__(
+            logger, definition, typedict, struct_type_class,
+            simple_type_class, field_class)
 
     def get_swap_to_be_template_instantiation(self):
         return "\n".join([
diff --git a/src/vpp-api/vapi/vapi_json_parser.py b/src/vpp-api/vapi/vapi_json_parser.py
index 1e17c7a5..4e62720d 100644
--- a/src/vpp-api/vapi/vapi_json_parser.py
+++ b/src/vpp-api/vapi/vapi_json_parser.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2
 
 import json
 
@@ -22,7 +22,7 @@ def remove_magic(what):
     return what
 
 
-class Field:
+class Field(object):
 
     def __init__(
             self,
@@ -46,7 +46,7 @@ class Field:
                     (self.name, self.type, self.nelem_field))
 
 
-class Type:
+class Type(object):
     def __init__(self, name):
         self.name = name
 
@@ -54,7 +54,7 @@ class Type:
 class SimpleType (Type):
 
     def __init__(self, name):
-        super().__init__(name)
+        super(SimpleType, self).__init__(name)
 
     def __str__(self):
         return self.name
@@ -78,7 +78,7 @@ def get_msg_header_defs(struct_type_class, field_class, typedict):
     ]
 
 
-class Struct:
+class Struct(object):
 
     def __init__(self, name, fields):
         self.name = name
@@ -86,7 +86,7 @@ class Struct:
         self.field_names = [n.name for n in self.fields]
 
 
-class Message:
+class Message(object):
 
     def __init__(self, logger, definition, typedict,
                  struct_type_class, simple_type_class, field_class):
@@ -217,7 +217,7 @@ class StructType (Type, Struct):
         return True
 
 
-class JsonParser:
+class JsonParser(object):
     def __init__(self, logger, files, simple_type_class=SimpleType,
                  struct_type_class=StructType, field_class=Field,
                  message_class=Message):
-- 
cgit 1.2.3-korg


From dfa0d20405a18a1a8f4fd0c8266b9c3dc63c3e2e Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Mon, 9 Oct 2017 15:03:55 -0400
Subject: Deps added to Makefile must also be in spec file.

Deps are required for Fedora too.

This patch should be in version 17.10 because it
fixes breaking rpm builds in some circumstances.

JIRA: VPP-1015

Change-Id: I10807069742cdd6b09a0f34d9d05e9cae4146ec3
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 Makefile            | 5 ++++-
 extras/rpm/vpp.spec | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index aaa6aee6..021e2133 100644
--- a/Makefile
+++ b/Makefile
@@ -81,13 +81,16 @@ endif
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += apr-devel
 RPM_DEPENDS += numactl-devel
-RPM_DEPENDS += check
+RPM_DEPENDS += check check-devel
+
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
+	RPM_DEPENDS += subunit subunit-devel
 	RPM_DEPENDS += openssl-devel
 	RPM_DEPENDS += python-devel
 	RPM_DEPENDS += python2-virtualenv
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else ifeq ($(shell if [ "$(OS_ID)" = "fedora" ]; then test $(OS_VERSION_ID) -gt 25; echo $$?; fi),0)
+	RPM_DEPENDS += subunit subunit-devel
 	RPM_DEPENDS += compat-openssl10-devel
 	RPM_DEPENDS += python2-devel
 	RPM_DEPENDS += python2-virtualenv
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index d611ac5c..7490a165 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -31,6 +31,10 @@ Version: %{_version}
 Release: %{_release}
 Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python
 BuildRequires: systemd, chrpath
+BuildRequires: check, check-devel
+%if  0%{?fedora} >= 25
+BuildRequires: subunit, subunit-devel
+%endif
 %if 0%{?fedora} >= 26
 BuildRequires: compat-openssl10-devel
 BuildRequires: python2-devel, python2-virtualenv
-- 
cgit 1.2.3-korg